diff --git a/.editorconfig b/.editorconfig
index ef6e90b2..7692ac78 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -6,27 +6,5 @@ root = true
 [*]
 charset = utf-8
 end_of_line = lf
+trim_trailing_whitespaces = true
 indent_style = tab
-trim_trailing_whitespace = true
-insert_final_newline = true
-quote_type = single
-max_line_length = off
-
-[*.js]
-quote_type = double
-ij_javascript_use_double_quotes = true
-
-[*.yml]
-indent_style = space
-indent_size = 2
-
-[*.xml]
-indent_style = space
-indent_size = 2
-
-[*.json]
-indent_style = space
-indent_size = 2
-
-[composer.json]
-indent_size = 4
diff --git a/.tx/config b/.tx/config
index 8542c680..710a560e 100644
--- a/.tx/config
+++ b/.tx/config
@@ -1,399 +1,399 @@
 [main]
-host = https://api.transifex.com
+host = https://www.transifex.com
 
-[o:Friendica:p:friendica:r:addon_advancedcontentfilter_messagespo]
+[friendica.addon_advancedcontentfilter_messagespo]
 file_filter = advancedcontentfilter/lang/<lang>/messages.po
 source_file = advancedcontentfilter/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_blackout_messagespo]
+[friendica.addon_blackout_messagespo]
 file_filter = blackout/lang/<lang>/messages.po
 source_file = blackout/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_blockem_messagespo]
+[friendica.addon_blockem_messagespo]
 file_filter = blockem/lang/<lang>/messages.po
 source_file = blockem/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_blogger_messagespo]
+[friendica.addon_blogger_messagespo]
 file_filter = blogger/lang/<lang>/messages.po
 source_file = blogger/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_buffer_messagespo]
+[friendica.addon_buffer_messagespo]
 file_filter = buffer/lang/<lang>/messages.po
 source_file = buffer/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_buglink_messagespo]
+[friendica.addon_buglink_messagespo]
 file_filter = buglink/lang/<lang>/messages.po
 source_file = buglink/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_catavatar_messagespo]
+[friendica.addon_catavatar_messagespo]
 file_filter = catavatar/lang/<lang>/messages.po
 source_file = catavatar/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_cookienotice_messagespo]
+[friendica.addon_cookienotice_messagespo]
 file_filter = cookienotice/lang/<lang>/messages.po
 source_file = cookienotice/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_curweather_messagespo]
+[friendica.addon_curweather_messagespo]
 file_filter = curweather/lang/<lang>/messages.po
 source_file = curweather/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_diaspora_messagespo]
+[friendica.addon_diaspora_messagespo]
 file_filter = diaspora/lang/<lang>/messages.po
 source_file = diaspora/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_dwpost_messagespo]
+[friendica.addon_dwpost_messagespo]
 file_filter = dwpost/lang/<lang>/messages.po
 source_file = dwpost/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_forumdirectory_messagespo]
+[friendica.addon_forumdirectory_messagespo]
 file_filter = forumdirectory/lang/<lang>/messages.po
 source_file = forumdirectory/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_fromapp_messagespo]
+[friendica.addon_fromapp_messagespo]
 file_filter = fromapp/lang/<lang>/messages.po
 source_file = fromapp/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_fromgplus_messagespo]
+[friendica.addon_fromgplus_messagespo]
 file_filter = fromgplus/lang/<lang>/messages.po
 source_file = fromgplus/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_geonames_messagespo]
+[friendica.addon_geonames_messagespo]
 file_filter = geonames/lang/<lang>/messages.po
 source_file = geonames/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_gnot_messagespo]
+[friendica.addon_gnot_messagespo]
 file_filter = gnot/lang/<lang>/messages.po
 source_file = gnot/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_gravatar_messagespo]
+[friendica.addon_gravatar_messagespo]
 file_filter = gravatar/lang/<lang>/messages.po
 source_file = gravatar/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_group_text_messagespo]
+[friendica.addon_group_text_messagespo]
 file_filter = group_text/lang/<lang>/messages.po
 source_file = group_text/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_ifttt_messagespo]
+[friendica.addon_ifttt_messagespo]
 file_filter = ifttt/lang/<lang>/messages.po
 source_file = ifttt/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_ijpost_messagespo]
+[friendica.addon_ijpost_messagespo]
 file_filter = ijpost/lang/<lang>/messages.po
 source_file = ijpost/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_impressum_messagespo]
+[friendica.addon_impressum_messagespo]
 file_filter = impressum/lang/<lang>/messages.po
 source_file = impressum/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_infiniteimprobabilitydrive_messagespo]
+[friendica.addon_infiniteimprobabilitydrive_messagespo]
 file_filter = infiniteimprobabilitydrive/lang/<lang>/messages.po
 source_file = infiniteimprobabilitydrive/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_irc_messagespo]
+[friendica.addon_irc_messagespo]
 file_filter = irc/lang/<lang>/messages.po
 source_file = irc/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_jappixmini_messagespo]
+[friendica.addon_jappixmini_messagespo]
 file_filter = jappixmini/lang/<lang>/messages.po
 source_file = jappixmini/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_js_upload_messagespo]
+[friendica.addon_js_upload_messagespo]
 file_filter = js_upload/lang/<lang>/messages.po
 source_file = js_upload/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_krynn_messagespo]
+[friendica.addon_krynn_messagespo]
 file_filter = krynn/lang/<lang>/messages.po
 source_file = krynn/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_langfilter_messagespo]
+[friendica.addon_langfilter_messagespo]
 file_filter = langfilter/lang/<lang>/messages.po
 source_file = langfilter/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_libertree_messagespo]
+[friendica.addon_libertree_messagespo]
 file_filter = libertree/lang/<lang>/messages.po
 source_file = libertree/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_libravatar_messagespo]
+[friendica.addon_libravatar_messagespo]
 file_filter = libravatar/lang/<lang>/messages.po
 source_file = libravatar/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_ljpost_messagespo]
+[friendica.addon_ljpost_messagespo]
 file_filter = ljpost/lang/<lang>/messages.po
 source_file = ljpost/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_mailstream_messagespo]
+[friendica.addon_mailstream_messagespo]
 file_filter = mailstream/lang/<lang>/messages.po
 source_file = mailstream/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_mathjax_messagespo]
+[friendica.addon_mathjax_messagespo]
 file_filter = mathjax/lang/<lang>/messages.po
 source_file = mathjax/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_membersince_messagespo]
+[friendica.addon_membersince_messagespo]
 file_filter = membersince/lang/<lang>/messages.po
 source_file = membersince/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_morechoice_messagespo]
+[friendica.addon_morechoice_messagespo]
 file_filter = morechoice/lang/<lang>/messages.po
 source_file = morechoice/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_morepokes_messagespo]
+[friendica.addon_morepokes_messagespo]
 file_filter = morepokes/lang/<lang>/messages.po
 source_file = morepokes/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_newmemberwidget_messagespo]
+[friendica.addon_newmemberwidget_messagespo]
 file_filter = newmemberwidget/lang/<lang>/messages.po
 source_file = newmemberwidget/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_notifyall_messagespo]
+[friendica.addon_notifyall_messagespo]
 file_filter = notifyall/lang/<lang>/messages.po
 source_file = notifyall/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_notimeline_messagespo]
+[friendica.addon_notimeline_messagespo]
 file_filter = notimeline/lang/<lang>/messages.po
 source_file = notimeline/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_nsfw_messagespo]
+[friendica.addon_nsfw_messagespo]
 file_filter = nsfw/lang/<lang>/messages.po
 source_file = nsfw/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_numfriends_messagespo]
+[friendica.addon_numfriends_messagespo]
 file_filter = numfriends/lang/<lang>/messages.po
 source_file = numfriends/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_openstreetmap_messagespo]
+[friendica.addon_openstreetmap_messagespo]
 file_filter = openstreetmap/lang/<lang>/messages.po
 source_file = openstreetmap/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_pageheader_messagespo]
+[friendica.addon_pageheader_messagespo]
 file_filter = pageheader/lang/<lang>/messages.po
 source_file = pageheader/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_piwik_messagespo]
+[friendica.addon_piwik_messagespo]
 file_filter = piwik/lang/<lang>/messages.po
 source_file = piwik/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_planets_messagespo]
+[friendica.addon_planets_messagespo]
 file_filter = planets/lang/<lang>/messages.po
 source_file = planets/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_public_server_messagespo]
+[friendica.addon_public_server_messagespo]
 file_filter = public_server/lang/<lang>/messages.po
 source_file = public_server/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_pumpio_messagespo]
+[friendica.addon_pumpio_messagespo]
 file_filter = pumpio/lang/<lang>/messages.po
 source_file = pumpio/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_qcomment_messagespo]
+[friendica.addon_qcomment_messagespo]
 file_filter = qcomment/lang/<lang>/messages.po
 source_file = qcomment/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_randplace_messagespo]
+[friendica.addon_randplace_messagespo]
 file_filter = randplace/lang/<lang>/messages.po
 source_file = randplace/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_remote_permissions_messagespo]
+[friendica.addon_remote_permissions_messagespo]
 file_filter = remote_permissions/lang/<lang>/messages.po
 source_file = remote_permissions/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_rendertime_messagespo]
+[friendica.addon_rendertime_messagespo]
 file_filter = rendertime/lang/<lang>/messages.po
 source_file = rendertime/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_securemail_messagespo]
+[friendica.addon_securemail_messagespo]
 file_filter = securemail/lang/<lang>/messages.po
 source_file = securemail/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_showmore_messagespo]
+[friendica.addon_showmore_messagespo]
 file_filter = showmore/lang/<lang>/messages.po
 source_file = showmore/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_smileybutton_messagespo]
+[friendica.addon_smileybutton_messagespo]
 file_filter = smileybutton/lang/<lang>/messages.po
 source_file = smileybutton/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_startpage_messagespo]
+[friendica.addon_startpage_messagespo]
 file_filter = startpage/lang/<lang>/messages.po
 source_file = startpage/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_statusnet_messagespo]
+[friendica.addon_statusnet_messagespo]
 file_filter = statusnet/lang/<lang>/messages.po
 source_file = statusnet/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_superblock_messagespo]
+[friendica.addon_superblock_messagespo]
 file_filter = superblock/lang/<lang>/messages.po
 source_file = superblock/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_testdrive_messagespo]
+[friendica.addon_testdrive_messagespo]
 file_filter = testdrive/lang/<lang>/messages.po
 source_file = testdrive/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_tictac_messagespo]
+[friendica.addon_tictac_messagespo]
 file_filter = tictac/lang/<lang>/messages.po
 source_file = tictac/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_tumblr_messagespo]
+[friendica.addon_tumblr_messagespo]
 file_filter = tumblr/lang/<lang>/messages.po
 source_file = tumblr/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_twitter_messagespo]
+[friendica.addon_twitter_messagespo]
 file_filter = twitter/lang/<lang>/messages.po
 source_file = twitter/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_viewsrc_messagespo]
+[friendica.addon_viewsrc_messagespo]
 file_filter = viewsrc/lang/<lang>/messages.po
 source_file = viewsrc/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_webrtc_messagespo]
+[friendica.addon_webrtc_messagespo]
 file_filter = webrtc/lang/<lang>/messages.po
 source_file = webrtc/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_widgets_messagespo]
+[friendica.addon_widgets_messagespo]
 file_filter = widgets/lang/<lang>/messages.po
 source_file = widgets/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_windowsphonepush_messagespo]
+[friendica.addon_windowsphonepush_messagespo]
 file_filter = windowsphonepush/lang/<lang>/messages.po
 source_file = windowsphonepush/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_wppost_messagespo]
+[friendica.addon_wppost_messagespo]
 file_filter = wppost/lang/<lang>/messages.po
 source_file = wppost/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
-[o:Friendica:p:friendica:r:addon_xmpp_messagespo]
+[friendica.addon_xmpp_messagespo]
 file_filter = xmpp/lang/<lang>/messages.po
 source_file = xmpp/lang/C/messages.po
 source_lang = en
-type        = PO
+type = PO
 
diff --git a/.woodpecker/.code_standards_check.yml b/.woodpecker/.code_standards_check.yml
deleted file mode 100644
index 8e0f7dc7..00000000
--- a/.woodpecker/.code_standards_check.yml
+++ /dev/null
@@ -1,69 +0,0 @@
-skip_clone: true
-
-pipeline:
-  clone_friendica_base:
-    image: alpine/git
-    commands:
-      - git clone https://github.com/friendica/friendica.git .
-      - git checkout $CI_COMMIT_BRANCH
-    when:
-      event: pull_request
-  clone_friendica_addon:
-    image: alpine/git
-    commands:
-      - git config --global user.email "no-reply@friendi.ca"
-      - git config --global user.name "Friendica"
-      - git clone $CI_REPO_CLONE_URL addon
-      - cd addon/
-      - git checkout $CI_COMMIT_BRANCH
-      - git fetch origin $CI_COMMIT_REF
-      - git merge $CI_COMMIT_SHA
-    when:
-      event: pull_request
-  restore_cache:
-    image: meltwater/drone-cache:dev
-    settings:
-      backend: "filesystem"
-      restore: true
-      cache_key: '{{ .Repo.Name }}_phpcs_{{ arch }}_{{ os }}'
-      archive_format: "gzip"
-      mount:
-        - '.composer'
-    volumes:
-      - /tmp/drone-cache:/tmp/cache
-    when:
-      event: pull_request
-  composer_install:
-    image: composer
-    commands:
-      - export COMPOSER_HOME=.composer
-      - ./bin/composer.phar run cs:install
-    when:
-      event: pull_request
-  rebuild_cache:
-    image: meltwater/drone-cache:dev
-    settings:
-      backend: "filesystem"
-      rebuild: true
-      cache_key: '{{ .Repo.Name }}_phpcs_{{ arch }}_{{ os }}'
-      archive_format: "gzip"
-      mount:
-        - '.composer'
-    volumes:
-      - /tmp/drone-cache:/tmp/cache
-    when:
-      event: pull_request
-  check:
-    image: friendicaci/php-cs
-    commands:
-      - cd addon/
-      - if [ ! -z "$${CI_COMMIT_PULL_REQUEST}" ]; then
-          git fetch --no-tags origin ${CI_COMMIT_TARGET_BRANCH};
-          export CHANGED_FILES="$(git diff --name-status $(git merge-base FETCH_HEAD origin/${CI_COMMIT_TARGET_BRANCH})..${CI_COMMIT_SHA} | grep ^A | cut -f2 | sed -e "s/^/addon\\//")";
-        else
-          export CHANGED_FILES="$(git diff --name-status ${CI_COMMIT_SHA} | grep ^A | cut -f2 | sed -e "s/^/addon\\//")";
-        fi
-      - cd ../
-      - /check-php-cs.sh
-    when:
-      event: pull_request
diff --git a/.woodpecker/.continuous-deployment.yml b/.woodpecker/.continuous-deployment.yml
deleted file mode 100644
index d1202978..00000000
--- a/.woodpecker/.continuous-deployment.yml
+++ /dev/null
@@ -1,112 +0,0 @@
-# This prevents executing this pipeline at other servers than ci.friendi.ca
-labels:
-  location: friendica
-  type: releaser
-
-skip_clone: true
-
-pipeline:
-  clone_friendica_base:
-    image: alpine/git
-    commands:
-      - git clone https://github.com/friendica/friendica.git .
-      - git checkout $CI_COMMIT_BRANCH
-    when:
-      repo: friendica/friendica-addons
-      branch: [ develop, '*-rc' ]
-      event: push
-  clone_friendica_addon:
-    image: alpine/git
-    commands:
-      - git config --global user.email "no-reply@friendi.ca"
-      - git config --global user.name "Friendica"
-      - git clone $CI_REPO_CLONE_URL addon
-      - cd addon/
-      - git checkout $CI_COMMIT_BRANCH
-      - git fetch origin $CI_COMMIT_REF
-      - git merge $CI_COMMIT_SHA
-    when:
-      repo: friendica/friendica-addons
-      branch: [ develop, '*-rc' ]
-      event: push
-  restore_cache:
-    image: meltwater/drone-cache:dev
-    settings:
-      backend: "filesystem"
-      restore: true
-      cache_key: "{{ .Repo.Name }}_php7.4_{{ arch }}_{{ os }}"
-      archive_format: "gzip"
-      mount:
-        - '.composer'
-    volumes:
-      - /tmp/drone-cache:/tmp/cache
-    when:
-      repo: friendica/friendica-addons
-      branch: [ develop, '*-rc' ]
-      event: push
-  composer_install:
-    image: friendicaci/php8.2:php8.2.16
-    commands:
-      - export COMPOSER_HOME=.composer
-      - composer validate
-      - composer install --no-dev --optimize-autoloader
-    volumes:
-      - /etc/hosts:/etc/hosts
-    when:
-      repo: friendica/friendica-addons
-      branch: [ develop, '*-rc' ]
-      event: push
-  create_artifacts:
-    image: debian
-    commands:
-      - apt-get update
-      - apt-get install bzip2
-      - mkdir ./build
-      - export VERSION="$(cat VERSION)"
-      - export RELEASE="friendica-addons-$VERSION"
-      - export ARTIFACT="$RELEASE.tar.gz"
-      - tar
-        --exclude='.tx'
-        --exclude='.git'
-        --exclude='.editorconfig'
-        --exclude='.gitattributes'
-        --exclude='.gitignore'
-        --exclude='.woodpecker'
-        --exclude='**/*/messages.po'
-        -cvzf ./build/$ARTIFACT addon/
-      - cd ./build
-      - sha256sum "$ARTIFACT" > "$ARTIFACT.sum256"
-      - chmod 664 ./*
-      - ls -lh
-      - cat "$ARTIFACT.sum256"
-      - sha256sum "$ARTIFACT"
-    when:
-      repo: friendica/friendica-addons
-      branch: [ develop, '*-rc' ]
-      event: push
-  sign_artifacts:
-    image: plugins/gpgsign
-    settings:
-      key:
-        from_secret: gpg_key
-      passphrase:
-        from_secret: gpg_password
-      files:
-        - build/*
-      exclude:
-        - build/*.sum256
-      detach_sign: true
-    when:
-      repo: friendica/friendica-addons
-      branch: [ develop, '*-rc' ]
-      event: push
-  publish_artifacts:
-    image: alpine
-    commands:
-      - cp -fr build/* /tmp/friendica_files/
-    volumes:
-      - files:/tmp/friendica_files
-    when:
-      repo: friendica/friendica-addons
-      branch: [ develop, '*-rc' ]
-      event: push
diff --git a/.woodpecker/.messages.po_check.yml b/.woodpecker/.messages.po_check.yml
deleted file mode 100644
index ea9fa4d5..00000000
--- a/.woodpecker/.messages.po_check.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-skip_clone: true
-
-pipeline:
-  clone_friendica_base:
-    image: alpine/git
-    commands:
-      - git clone https://github.com/friendica/friendica.git .
-      - git checkout $CI_COMMIT_BRANCH
-    when:
-      event: pull_request
-  clone_friendica_addon:
-    image: alpine/git
-    commands:
-      - git config --global user.email "no-reply@friendi.ca"
-      - git config --global user.name "Friendica"
-      - git clone $CI_REPO_CLONE_URL addon
-      - cd addon/
-      - git checkout $CI_COMMIT_BRANCH
-      - git fetch origin $CI_COMMIT_REF
-      - git merge $CI_COMMIT_SHA
-    when:
-      event: pull_request
-  build_xgettext:
-    image: friendicaci/transifex
-    commands:
-      - /xgettext-addon.sh
-    when:
-      event: pull_request
-  check:
-    image: friendicaci/transifex
-    commands:
-      - /check-addons.sh
-    when:
-      event: pull_request
-
-branches:
-  exclude: [ stable ]
diff --git a/.woodpecker/.phpunit.yml b/.woodpecker/.phpunit.yml
deleted file mode 100644
index 0c25a2bd..00000000
--- a/.woodpecker/.phpunit.yml
+++ /dev/null
@@ -1,115 +0,0 @@
-matrix:
-  include:
-    - PHP_MAJOR_VERSION: 7.4
-      PHP_VERSION: 7.4.33
-    - PHP_MAJOR_VERSION: 8.0
-      PHP_VERSION: 8.0.30
-    - PHP_MAJOR_VERSION: 8.1
-      PHP_VERSION: 8.1.27
-    - PHP_MAJOR_VERSION: 8.2
-      PHP_VERSION: 8.2.16
-    - PHP_MAJOR_VERSION: 8.3
-      PHP_VERSION: 8.3.3
-
-# This forces PHP Unit executions at the "opensocial" labeled location (because of much more power...)
-labels:
-  location: opensocial
-
-skip_clone: true
-
-pipeline:
-  clone_friendica_base:
-    image: alpine/git
-    commands:
-      - git clone https://github.com/friendica/friendica.git .
-      - git checkout $CI_COMMIT_BRANCH
-  clone_friendica_addon:
-    image: alpine/git
-    commands:
-      - git config --global user.email "no-reply@friendi.ca"
-      - git config --global user.name "Friendica"
-      - git clone $CI_REPO_CLONE_URL addon
-      - cd addon/
-      - git checkout $CI_COMMIT_BRANCH
-      - git fetch origin $CI_COMMIT_REF
-      - git merge $CI_COMMIT_SHA
-  restore_cache:
-    image: meltwater/drone-cache:dev
-    settings:
-      backend: "filesystem"
-      restore: true
-      cache_key: "{{ .Repo.Name }}_php${PHP_MAJOR_VERSION}_{{ arch }}_{{ os }}"
-      archive_format: "gzip"
-      mount:
-        - '.composer'
-    volumes:
-      - /tmp/drone-cache:/tmp/cache
-  composer_install:
-    image: friendicaci/php${PHP_MAJOR_VERSION}:php${PHP_VERSION}
-    commands:
-      - export COMPOSER_HOME=.composer
-      - ./bin/composer.phar validate
-      - ./bin/composer.phar install --prefer-dist
-    volumes:
-      - /etc/hosts:/etc/hosts
-  rebuild_cache:
-    image: meltwater/drone-cache:dev
-    settings:
-      backend: "filesystem"
-      rebuild: true
-      cache_key: "{{ .Repo.Name }}_php${PHP_MAJOR_VERSION}_{{ arch }}_{{ os }}"
-      archive_format: "gzip"
-      mount:
-        - '.composer'
-    volumes:
-      - /tmp/drone-cache:/tmp/cache
-  test:
-    image: friendicaci/php${PHP_MAJOR_VERSION}:php${PHP_VERSION}
-    environment:
-      MYSQL_HOST: "mariadb"
-      MYSQL_PORT: "3306"
-      MYSQL_DATABASE: "test"
-      MYSQL_PASSWORD: "test"
-      MYSQL_USER: "test"
-      REDIS_HOST: "redis"
-      MEMCACHED_HOST: "memcached"
-      MEMCACHE_HOST: "memcached"
-    commands:
-      - cp config/local-sample.config.php config/local.config.php
-      - if ! bin/wait-for-connection $MYSQL_HOST $MYSQL_PORT 300; then echo "[ERROR] Waited 300 seconds, no response" >&2; exit 1; fi
-      - mysql -h$MYSQL_HOST -P$MYSQL_PORT -p$MYSQL_PASSWORD -u$MYSQL_USER $MYSQL_DATABASE < database.sql
-      - if [ "${PHP_MAJOR_VERSION}" = "8.2" -a "${CI_REPO}" = "friendica/friendica-addons" ]; then
-          phpenmod xdebug;
-          export XDEBUG_MODE=coverage;
-          phpunit --configuration tests/phpunit-addons.xml --coverage-clover clover.xml;
-        else
-          phpunit --configuration tests/phpunit-addons.xml;
-        fi
-  codecov:
-    image: friendicaci/codecov
-    when:
-      matrix:
-        PHP_MAJOR_VERSION: 8.2
-        PHP_VERSION: 8.2.16
-      repo:
-        - friendica/friendica-addons
-    commands:
-      - codecov -R '.' -Z -f 'clover.xml'
-    secrets:
-      - source: codecov-token
-        target: codecov_token
-
-services:
-  mariadb:
-    image: mariadb:latest
-    environment:
-      MYSQL_ALLOW_EMPTY_PASSWORD: "true"
-      MYSQL_DATABASE: "test"
-      MYSQL_PASSWORD: "test"
-      MYSQL_USER: "test"
-
-  memcached:
-    image: memcached
-
-  redis:
-    image: redis
diff --git a/.woodpecker/.releaser.yml b/.woodpecker/.releaser.yml
deleted file mode 100644
index 68bdfb21..00000000
--- a/.woodpecker/.releaser.yml
+++ /dev/null
@@ -1,105 +0,0 @@
-# This prevents executing this pipeline at other servers than ci.friendi.ca
-labels:
-  location: friendica
-  type: releaser
-
-skip_clone: true
-
-pipeline:
-  clone_friendica_base:
-    image: alpine/git
-    commands:
-      - git clone https://github.com/friendica/friendica.git .
-      - git checkout $CI_COMMIT_BRANCH
-    when:
-      repo: friendica/friendica-addons
-      event: tag
-  clone_friendica_addon:
-    image: alpine/git
-    commands:
-      - git config --global user.email "no-reply@friendi.ca"
-      - git config --global user.name "Friendica"
-      - git clone $CI_REPO_CLONE_URL addon
-      - cd addon/
-      - git checkout $CI_COMMIT_BRANCH
-      - git fetch origin $CI_COMMIT_REF
-      - git merge $CI_COMMIT_SHA
-    when:
-      repo: friendica/friendica-addons
-      event: tag
-  restore_cache:
-    image: meltwater/drone-cache:dev
-    settings:
-      backend: "filesystem"
-      restore: true
-      cache_key: "{{ .Repo.Name }}_php7.4_{{ arch }}_{{ os }}"
-      archive_format: "gzip"
-      mount:
-        - '.composer'
-    volumes:
-      - /tmp/drone-cache:/tmp/cache
-    when:
-      repo: friendica/friendica-addons
-      event: tag
-  composer_install:
-    image: friendicaci/php8.2:php8.2.16
-    commands:
-      - export COMPOSER_HOME=.composer
-      - composer validate
-      - composer install --no-dev --optimize-autoloader
-    when:
-      repo: friendica/friendica-addons
-      event: tag
-    volumes:
-      - /etc/hosts:/etc/hosts
-  create_artifacts:
-    image: debian
-    commands:
-      - apt-get update
-      - apt-get install bzip2
-      - mkdir ./build
-      - export VERSION="$(cat VERSION)"
-      - export RELEASE="friendica-addons-$VERSION"
-      - export ARTIFACT="$RELEASE.tar.gz"
-      - tar
-        --exclude='.tx'
-        --exclude='.git'
-        --exclude='.editorconfig'
-        --exclude='.gitattributes'
-        --exclude='.gitignore'
-        --exclude='.woodpecker'
-        --exclude='**/*/messages.po'
-        -cvzf ./build/$ARTIFACT addon/
-      - cd ./build
-      - sha256sum "$ARTIFACT" > "$ARTIFACT.sum256"
-      - chmod 664 ./*
-      - ls -lh
-      - cat "$ARTIFACT.sum256"
-      - sha256sum "$ARTIFACT"
-    when:
-      repo: friendica/friendica-addons
-      event: tag
-  sign_artifacts:
-    image: plugins/gpgsign
-    settings:
-      key:
-        from_secret: gpg_key
-      passphrase:
-        from_secret: gpg_password
-      files:
-        - build/*
-      exclude:
-        - build/*.sum256
-      detach_sign: true
-    when:
-      repo: friendica/friendica-addons
-      event: tag
-  publish_artifacts:
-    image: alpine
-    commands:
-      - cp -fr build/* /tmp/friendica_files/
-    volumes:
-      - files:/tmp/friendica_files
-    when:
-      repo: friendica/friendica-addons
-      event: tag
diff --git a/README.md b/README.md
index 6a3202bb..21c0ed52 100644
--- a/README.md
+++ b/README.md
@@ -6,24 +6,22 @@ You can add these addons to the /addon directory of your Friendica installation
 
 After uploading the addons to your server, you need to activate the desired addons in the Admin panel. Addons not activated have no effect on your node.
 
-## Issues
-
-Please report any issues you have with addons of Friendica from this repository in [the main issue tracker of the project](https://github.com/friendica/friendica/issues).
+You can find more addons in the [Friendica Addon listing](https://addons.friendi.ca) in cases the addon developers have choosen not to include them here.
 
 ## Connectors
 
-Among these addons there are also the [connectors](https://github.com/friendica/friendica/blob/stable/doc/Connectors.md) for various other networks (e.g. Twitter, pump.io, Google+) that are needed for communication when the protocol is not supported by Friendica core (DFRN, OStatus and Diaspora).
+Among these addons there are also the [connectors](https://github.com/friendica/friendica/blob/master/doc/Connectors.md) for various other networks (e.g. Twitter, pump.io, Google+) that are needed for communication when the protocol is not supported by Friendica core (DFRN, OStatus and Diaspora).
 
 For communication with contacts in networks supporting those (e.g. GNU social, Diaspora and red#matrix) you just need to access the page configuration in the Admin panel and enable them. For networks where communication is only possible the API access to a remote account, you need to activate the fitting connectors.
 
 ## Development
 
 The addon interface of Friendica is very flexible and powerful, so if you are missing functionality, your chances are high it may be added with an addon.
-See the [documentation](https://github.com/friendica/friendica/blob/stable/doc/Addons.md) for more information on the addon development.
+See the [documentation](https://github.com/friendica/friendica/blob/master/doc/Addons.md) for more information on the addon development.
 
 ## Translation
 
 Addons can be translated like any other part of Friendica.
 Translation for addons is done at [the Transifex Friendica page](https://www.transifex.com/Friendica/friendica/dashboard/).
 
-Read more about the workflow in the [Friendica translation documentation](https://github.com/friendica/friendica/blob/stable/doc/translations.md#addon).
+Read more about the workflow in the [Friendica translation documentation](https://github.com/friendica/friendica/blob/master/doc/translations.md#addon).
diff --git a/advancedcontentfilter/advancedcontentfilter.js b/advancedcontentfilter/advancedcontentfilter.js
index a8fc1c65..e3c2da54 100644
--- a/advancedcontentfilter/advancedcontentfilter.js
+++ b/advancedcontentfilter/advancedcontentfilter.js
@@ -54,7 +54,7 @@ new Vue({
 					self.rules.push(responseJSON.rule);
 					self.resetForm();
 				}, function (response) {
-					self.errorMessage = response.responseJSON.exception[0].message;
+					self.errorMessage = response.responseJSON.message;
 				});
 			}
 		},
@@ -74,7 +74,7 @@ new Vue({
 				self.rules[self.editedIndex] = rule;
 				self.resetForm();
 			}, function (response) {
-				self.errorMessage = response.responseJSON.exception[0].message;
+				self.errorMessage = response.responseJSON.message;
 			});
 		},
 
@@ -124,7 +124,7 @@ new Vue({
 
 	// These render functions have been compiled from templates/advancedcontentfilter.vue, check this file out for instructions
 	render: function () {
-		with(this){return _c('div',{attrs:{"id":"rules"}},[_c('p',[_c('a',{attrs:{"href":"settings/addons"}},[_v("🔙 "+_s(messages.backtosettings))])]),_c('h1',[_v(_s(messages.title)+" "),_c('a',{staticClass:"btn btn-default btn-sm",attrs:{"href":"advancedcontentfilter/help","title":messages.help}},[_c('i',{staticClass:"fa fa-question fa-2x",attrs:{"aria-hidden":"true"}})])]),_c('div',[_v(_s(messages.intro))]),_c('h2',[_v(_s(messages.your_rules)+" "),_c('button',{staticClass:"btn btn-primary btn-sm",attrs:{"title":messages.add_a_rule},on:{"click":function($event){showModal = true}}},[_c('i',{staticClass:"fa fa-plus fa-2x",attrs:{"aria-hidden":"true"}})])]),(rules.length === 0)?_c('div',{},[_v(_s(messages.no_rules))]):_e(),_c('ul',{staticClass:"list-group"},_l((rules),function(rule){return _c('li',{staticClass:"list-group-item"},[_c('p',{staticClass:"pull-right"},[(parseInt(rule.active))?_c('button',{staticClass:"btn btn-xs btn-primary",attrs:{"type":"button","aria-label":messages.disable_this_rule,"title":messages.disable_this_rule},on:{"click":function($event){toggleActive(rule)}}},[_c('i',{staticClass:"fa fa-toggle-on",attrs:{"aria-hidden":"true"}}),_v(" "+_s(messages.enabled))]):_c('button',{staticClass:"btn btn-xs btn-default",attrs:{"type":"button","aria-label":messages.enable_this_rule,"title":messages.enable_this_rule},on:{"click":function($event){toggleActive(rule)}}},[_c('i',{staticClass:"fa fa-toggle-off",attrs:{"aria-hidden":"true"}}),_v(" "+_s(messages.disabled))]),_v(" "),_c('button',{staticClass:"btn btn-xs btn-primary",attrs:{"type":"button","aria-label":messages.edit_this_rule,"title":messages.edit_this_rule},on:{"click":function($event){editRule(rule)}}},[_c('i',{staticClass:"fa fa-pencil",attrs:{"aria-hidden":"true"}})]),_v(" "),_c('button',{staticClass:"btn btn-xs btn-default",attrs:{"type":"button","aria-label":messages.delete_this_rule,"title":messages.delete_this_rule},on:{"click":function($event){deleteRule(rule)}}},[_c('i',{staticClass:"fa fa-trash-o",attrs:{"aria-hidden":"true"}})])]),_c('h3',{staticClass:"list-group-item-heading"},[_v(_s(messages.rule)+" #"+_s(rule.id)+": "+_s(rule.name))]),(rule.expression)?_c('pre',{staticClass:"list-group-item-text"},[_v(_s(rule.expression))]):_e()])})),_c('div',{ref:"vuemodal",staticClass:"modal fade",attrs:{"tabindex":"-1","role":"dialog"}},[_c('div',{staticClass:"modal-dialog",attrs:{"role":"document"}},[_c('div',{staticClass:"modal-content"},[_c('div',{staticClass:"modal-header"},[(currentTheme === 'frio')?_c('button',{staticClass:"close",attrs:{"type":"button","data-dismiss":"modal","aria-label":messages.close},on:{"click":function($event){showModal = false}}},[_c('span',{attrs:{"aria-hidden":"true"}},[_v("×")])]):_e(),(rule.id)?_c('h3',[_v(_s(messages.edit_the_rule)+" \""+_s(rule.name)+"\"")]):_e(),(!rule.id)?_c('h3',[_v(_s(messages.add_a_rule))]):_e()]),_c('div',{staticClass:"modal-body"},[_c('form',[(errorMessage)?_c('div',{staticClass:"alert alert-danger",attrs:{"role":"alert"}},[_v(_s(errorMessage))]):_e(),_c('div',{staticClass:"form-group"},[_c('input',{directives:[{name:"model",rawName:"v-model",value:(rule.name),expression:"rule.name"}],staticClass:"form-control",attrs:{"placeholder":messages.rule_name},domProps:{"value":(rule.name)},on:{"input":function($event){if($event.target.composing)return;$set(rule, "name", $event.target.value)}}})]),_c('div',{staticClass:"form-group"},[_c('input',{directives:[{name:"model",rawName:"v-model",value:(rule.expression),expression:"rule.expression"}],staticClass:"form-control",attrs:{"placeholder":messages.rule_expression},domProps:{"value":(rule.expression)},on:{"input":function($event){if($event.target.composing)return;$set(rule, "expression", $event.target.value)}}})])])]),_c('div',{staticClass:"modal-footer"},[_c('button',{staticClass:"btn btn-default",attrs:{"type":"button","data-dismiss":"modal","aria-label":"Close"},on:{"click":function($event){resetForm()}}},[_v(_s(messages.cancel))]),(rule.id)?_c('button',{staticClass:"btn btn-primary",attrs:{"slot":"button","type":"button"},on:{"click":function($event){saveRule(rule)}},slot:"button"},[_v(_s(messages.save_this_rule))]):_e(),(!rule.id)?_c('button',{staticClass:"btn btn-primary",attrs:{"slot":"button","type":"button"},on:{"click":function($event){addRule()}},slot:"button"},[_v(_s(messages.add_a_rule))]):_e()])])])]),_c('form',{staticClass:"form-inline",on:{"submit":function($event){$event.preventDefault();showVariables()}}},[_c('fieldset',[_c('legend',[_v("Show post variables")]),_c('div',{staticClass:"form-group",staticStyle:{"width":"50%"}},[_c('label',{staticClass:"sr-only",attrs:{"for":"itemUrl"}},[_v("Post URL or item guid")]),_c('input',{directives:[{name:"model",rawName:"v-model",value:(itemUrl),expression:"itemUrl"}],staticClass:"form-control",staticStyle:{"width":"100%"},attrs:{"id":"itemUrl","placeholder":"Post URL or item guid"},domProps:{"value":(itemUrl)},on:{"input":function($event){if($event.target.composing)return;itemUrl=$event.target.value}}})]),_c('button',{staticClass:"btn btn-primary",attrs:{"type":"submit"}},[_v("Show Variables")])])]),_c('pre',{},[_v(_s(itemJson))])])}
+		with(this){return _c('div',{attrs:{"id":"rules"}},[_c('p',[_c('a',{attrs:{"href":"settings/addon"}},[_v("🔙 "+_s(messages.backtosettings))])]),_c('h1',[_v(_s(messages.title)+" "),_c('a',{staticClass:"btn btn-default btn-sm",attrs:{"href":"advancedcontentfilter/help","title":messages.help}},[_c('i',{staticClass:"fa fa-question fa-2x",attrs:{"aria-hidden":"true"}})])]),_c('div',[_v(_s(messages.intro))]),_c('h2',[_v(_s(messages.your_rules)+" "),_c('button',{staticClass:"btn btn-primary btn-sm",attrs:{"title":messages.add_a_rule},on:{"click":function($event){showModal = true}}},[_c('i',{staticClass:"fa fa-plus fa-2x",attrs:{"aria-hidden":"true"}})])]),(rules.length === 0)?_c('div',{},[_v(_s(messages.no_rules))]):_e(),_c('ul',{staticClass:"list-group"},_l((rules),function(rule){return _c('li',{staticClass:"list-group-item"},[_c('p',{staticClass:"pull-right"},[(parseInt(rule.active))?_c('button',{staticClass:"btn btn-xs btn-primary",attrs:{"type":"button","aria-label":messages.disable_this_rule,"title":messages.disable_this_rule},on:{"click":function($event){toggleActive(rule)}}},[_c('i',{staticClass:"fa fa-toggle-on",attrs:{"aria-hidden":"true"}}),_v(" "+_s(messages.enabled))]):_c('button',{staticClass:"btn btn-xs btn-default",attrs:{"type":"button","aria-label":messages.enable_this_rule,"title":messages.enable_this_rule},on:{"click":function($event){toggleActive(rule)}}},[_c('i',{staticClass:"fa fa-toggle-off",attrs:{"aria-hidden":"true"}}),_v(" "+_s(messages.disabled))]),_v(" "),_c('button',{staticClass:"btn btn-xs btn-primary",attrs:{"type":"button","aria-label":messages.edit_this_rule,"title":messages.edit_this_rule},on:{"click":function($event){editRule(rule)}}},[_c('i',{staticClass:"fa fa-pencil",attrs:{"aria-hidden":"true"}})]),_v(" "),_c('button',{staticClass:"btn btn-xs btn-default",attrs:{"type":"button","aria-label":messages.delete_this_rule,"title":messages.delete_this_rule},on:{"click":function($event){deleteRule(rule)}}},[_c('i',{staticClass:"fa fa-trash-o",attrs:{"aria-hidden":"true"}})])]),_c('h3',{staticClass:"list-group-item-heading"},[_v(_s(messages.rule)+" #"+_s(rule.id)+": "+_s(rule.name))]),(rule.expression)?_c('pre',{staticClass:"list-group-item-text"},[_v(_s(rule.expression))]):_e()])})),_c('div',{ref:"vuemodal",staticClass:"modal fade",attrs:{"tabindex":"-1","role":"dialog"}},[_c('div',{staticClass:"modal-dialog",attrs:{"role":"document"}},[_c('div',{staticClass:"modal-content"},[_c('div',{staticClass:"modal-header"},[(currentTheme === 'frio')?_c('button',{staticClass:"close",attrs:{"type":"button","data-dismiss":"modal","aria-label":messages.close},on:{"click":function($event){showModal = false}}},[_c('span',{attrs:{"aria-hidden":"true"}},[_v("×")])]):_e(),(rule.id)?_c('h3',[_v(_s(messages.edit_the_rule)+" \""+_s(rule.name)+"\"")]):_e(),(!rule.id)?_c('h3',[_v(_s(messages.add_a_rule))]):_e()]),_c('div',{staticClass:"modal-body"},[_c('form',[(errorMessage)?_c('div',{staticClass:"alert alert-danger",attrs:{"role":"alert"}},[_v(_s(errorMessage))]):_e(),_c('div',{staticClass:"form-group"},[_c('input',{directives:[{name:"model",rawName:"v-model",value:(rule.name),expression:"rule.name"}],staticClass:"form-control",attrs:{"placeholder":messages.rule_name},domProps:{"value":(rule.name)},on:{"input":function($event){if($event.target.composing)return;$set(rule, "name", $event.target.value)}}})]),_c('div',{staticClass:"form-group"},[_c('input',{directives:[{name:"model",rawName:"v-model",value:(rule.expression),expression:"rule.expression"}],staticClass:"form-control",attrs:{"placeholder":messages.rule_expression},domProps:{"value":(rule.expression)},on:{"input":function($event){if($event.target.composing)return;$set(rule, "expression", $event.target.value)}}})])])]),_c('div',{staticClass:"modal-footer"},[_c('button',{staticClass:"btn btn-default",attrs:{"type":"button","data-dismiss":"modal","aria-label":"Close"},on:{"click":function($event){resetForm()}}},[_v(_s(messages.cancel))]),(rule.id)?_c('button',{staticClass:"btn btn-primary",attrs:{"slot":"button","type":"button"},on:{"click":function($event){saveRule(rule)}},slot:"button"},[_v(_s(messages.save_this_rule))]):_e(),(!rule.id)?_c('button',{staticClass:"btn btn-primary",attrs:{"slot":"button","type":"button"},on:{"click":function($event){addRule()}},slot:"button"},[_v(_s(messages.add_a_rule))]):_e()])])])]),_c('form',{staticClass:"form-inline",on:{"submit":function($event){$event.preventDefault();showVariables()}}},[_c('fieldset',[_c('legend',[_v("Show post variables")]),_c('div',{staticClass:"form-group",staticStyle:{"width":"50%"}},[_c('label',{staticClass:"sr-only",attrs:{"for":"itemUrl"}},[_v("Post URL or item guid")]),_c('input',{directives:[{name:"model",rawName:"v-model",value:(itemUrl),expression:"itemUrl"}],staticClass:"form-control",staticStyle:{"width":"100%"},attrs:{"id":"itemUrl","placeholder":"Post URL or item guid"},domProps:{"value":(itemUrl)},on:{"input":function($event){if($event.target.composing)return;itemUrl=$event.target.value}}})]),_c('button',{staticClass:"btn btn-primary",attrs:{"type":"submit"}},[_v("Show Variables")])])]),_c('pre',{},[_v(_s(itemJson))])])}
 	},
 
 	staticRenderFns: [
diff --git a/advancedcontentfilter/advancedcontentfilter.php b/advancedcontentfilter/advancedcontentfilter.php
index 418b253e..dbbfb2e2 100644
--- a/advancedcontentfilter/advancedcontentfilter.php
+++ b/advancedcontentfilter/advancedcontentfilter.php
@@ -36,17 +36,16 @@
 use Friendica\App;
 use Friendica\BaseModule;
 use Friendica\Content\Text\Markdown;
+use Friendica\Core\Cache;
 use Friendica\Core\Hook;
+use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
 use Friendica\Database\DBStructure;
-use Friendica\DI;
 use Friendica\Model\Item;
-use Friendica\Model\Post;
-use Friendica\Model\Tag;
-use Friendica\Model\User;
-use Friendica\Module\Security\Login;
+use Friendica\Model\Term;
+use Friendica\Module\Login;
 use Friendica\Network\HTTPException;
 use Friendica\Util\DateTimeFormat;
 use Psr\Http\Message\ResponseInterface;
@@ -55,67 +54,49 @@ use Symfony\Component\ExpressionLanguage;
 
 require_once __DIR__ . DIRECTORY_SEPARATOR . 'vendor' . DIRECTORY_SEPARATOR . 'autoload.php';
 
-function advancedcontentfilter_install()
+function advancedcontentfilter_install(App $a)
 {
 	Hook::register('dbstructure_definition'     , __FILE__, 'advancedcontentfilter_dbstructure_definition');
 	Hook::register('prepare_body_content_filter', __FILE__, 'advancedcontentfilter_prepare_body_content_filter');
 	Hook::register('addon_settings'             , __FILE__, 'advancedcontentfilter_addon_settings');
 
-	Hook::add('dbstructure_definition'          , __FILE__, 'advancedcontentfilter_dbstructure_definition');
-	DBStructure::performUpdate();
+	DBStructure::update($a->getBasePath(), false, true);
 
-	Logger::notice('installed advancedcontentfilter');
+	Logger::log("installed advancedcontentfilter");
+}
+
+function advancedcontentfilter_uninstall()
+{
+	Hook::unregister('dbstructure_definition'     , __FILE__, 'advancedcontentfilter_dbstructure_definition');
+	Hook::unregister('prepare_body_content_filter', __FILE__, 'advancedcontentfilter_prepare_body_content_filter');
+	Hook::unregister('addon_settings'             , __FILE__, 'advancedcontentfilter_addon_settings');
 }
 
 /*
  * Hooks
  */
 
-function advancedcontentfilter_dbstructure_definition(&$database)
+function advancedcontentfilter_dbstructure_definition(App $a, &$database)
 {
-	$database['advancedcontentfilter_rules'] = [
-		'comment' => 'Advancedcontentfilter addon rules',
-		'fields' => [
-			'id'         => ['type' => 'int unsigned', 'not null' => '1', 'extra' => 'auto_increment', 'primary' => '1', 'comment' => 'Auto incremented rule id'],
-			'uid'        => ['type' => 'int unsigned', 'not null' => '1', 'comment' => 'Owner user id'],
-			'name'       => ['type' => 'varchar(255)', 'not null' => '1', 'comment' => 'Rule name'],
-			'expression' => ['type' => 'mediumtext'  , 'not null' => '1', 'comment' => 'Expression text'],
-			'serialized' => ['type' => 'mediumtext'  , 'not null' => '1', 'comment' => 'Serialized parsed expression'],
-			'active'     => ['type' => 'boolean'     , 'not null' => '1', 'default' => '1', 'comment' => 'Whether the rule is active or not'],
-			'created'    => ['type' => 'datetime'    , 'not null' => '1', 'default' => DBA::NULL_DATETIME, 'comment' => 'Creation date'],
+	$database["advancedcontentfilter_rules"] = [
+		"comment" => "Advancedcontentfilter addon rules",
+		"fields" => [
+			"id"         => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => "Auto incremented rule id"],
+			"uid"        => ["type" => "int unsigned", "not null" => "1", "comment" => "Owner user id"],
+			"name"       => ["type" => "varchar(255)", "not null" => "1", "comment" => "Rule name"],
+			"expression" => ["type" => "mediumtext"  , "not null" => "1", "comment" => "Expression text"],
+			"serialized" => ["type" => "mediumtext"  , "not null" => "1", "comment" => "Serialized parsed expression"],
+			"active"     => ["type" => "boolean"     , "not null" => "1", "default" => "1", "comment" => "Whether the rule is active or not"],
+			"created"    => ["type" => "datetime"    , "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => "Creation date"],
 		],
-		'indexes' => [
-			'PRIMARY' => ['id'],
-			'uid_active' => ['uid', 'active'],
+		"indexes" => [
+			"PRIMARY" => ["id"],
+			"uid_active" => ["uid", "active"],
 		]
 	];
 }
 
-/**
- * @param array $item Prepared by either Model\Item::prepareBody or advancedcontentfilter_prepare_item_row
- * @return array
- */
-function advancedcontentfilter_get_filter_fields(array $item)
-{
-	$vars = [];
-
-	// Convert the language JSON text into a filterable format
-	if (!empty($item['language']) && ($languages = json_decode($item['language'], true))) {
-		foreach ($languages as $key => $value) {
-			$vars['language_' . strtolower($key)] = $value;
-		}
-	}
-
-	foreach ($item as $key => $value) {
-		$vars[str_replace('-', '_', $key)] = $value;
-	}
-
-	ksort($vars);
-
-	return $vars;
-}
-
-function advancedcontentfilter_prepare_body_content_filter(&$hook_data)
+function advancedcontentfilter_prepare_body_content_filter(App $a, &$hook_data)
 {
 	static $expressionLanguage;
 
@@ -123,21 +104,22 @@ function advancedcontentfilter_prepare_body_content_filter(&$hook_data)
 		$expressionLanguage = new ExpressionLanguage\ExpressionLanguage();
 	}
 
-	if (!DI::userSession()->getLocalUserId()) {
+	if (!local_user()) {
 		return;
 	}
 
-	$vars = advancedcontentfilter_get_filter_fields($hook_data['item']);
+	$vars = [];
+	foreach ($hook_data['item'] as $key => $value) {
+		$vars[str_replace('-', '_', $key)] = $value;
+	}
 
-	$rules = DI::cache()->get('rules_' . DI::userSession()->getLocalUserId());
+	$rules = Cache::get('rules_' . local_user());
 	if (!isset($rules)) {
 		$rules = DBA::toArray(DBA::select(
 			'advancedcontentfilter_rules',
 			['name', 'expression', 'serialized'],
-			['uid' => DI::userSession()->getLocalUserId(), 'active' => true]
+			['uid' => local_user(), 'active' => true]
 		));
-
-		DI::cache()->set('rules_' . DI::userSession()->getLocalUserId(), $rules);
 	}
 
 	if ($rules) {
@@ -155,7 +137,7 @@ function advancedcontentfilter_prepare_body_content_filter(&$hook_data)
 			}
 
 			if ($found) {
-				$hook_data['filter_reasons'][] = DI::l10n()->t('Filtered by rule: %s', $rule['name']);
+				$hook_data['filter_reasons'][] = L10n::t('Filtered by rule: %s', $rule['name']);
 				break;
 			}
 		}
@@ -163,34 +145,31 @@ function advancedcontentfilter_prepare_body_content_filter(&$hook_data)
 }
 
 
-function advancedcontentfilter_addon_settings(array &$data)
+function advancedcontentfilter_addon_settings(App $a, &$s)
 {
-	if (!DI::userSession()->getLocalUserId()) {
+	if (!local_user()) {
 		return;
 	}
 
-	$data = [
-		'addon' => 'advancedcontentfilter',
-		'title' => DI::l10n()->t('Advanced Content Filter'),
-		'href'  => 'advancedcontentfilter',
-	];
+	$advancedcontentfilter = L10n::t('Advanced Content Filter');
+
+	$s .= <<<HTML
+		<span class="settings-block fakelink" style="display: block;"><h3><a href="advancedcontentfilter">$advancedcontentfilter <i class="glyphicon glyphicon-share"></i></a></h3></span>
+HTML;
+
+	return;
 }
 
 /*
  * Module
  */
 
-/**
- * This is a statement rather than an actual function definition. The simple
- * existence of this method is checked to figure out if the addon offers a
- * module.
- */
 function advancedcontentfilter_module() {}
 
-function advancedcontentfilter_init()
+function advancedcontentfilter_init(App $a)
 {
-	if (DI::args()->getArgc() > 1 && DI::args()->getArgv()[1] == 'api') {
-		$slim = \Slim\Factory\AppFactory::create();
+	if ($a->argc > 1 && $a->argv[1] == 'api') {
+		$slim = new \Slim\App();
 
 		require __DIR__ . '/src/middlewares.php';
 
@@ -201,16 +180,14 @@ function advancedcontentfilter_init()
 	}
 }
 
-function advancedcontentfilter_content()
+function advancedcontentfilter_content(App $a)
 {
-	if (!DI::userSession()->getLocalUserId()) {
-		return Login::form('/' . implode('/', DI::args()->getArgv()));
+	if (!local_user()) {
+		return Login::form('/' . implode('/', $a->argv));
 	}
 
-	if (DI::args()->getArgc() > 1 && DI::args()->getArgv()[1] == 'help') {
-		$user = User::getById(DI::userSession()->getLocalUserId());
-
-		$lang = $user['language'];
+	if ($a->argc > 1 && $a->argv[1] == 'help') {
+		$lang = $a->user['language'];
 
 		$default_dir = 'addon/advancedcontentfilter/doc/';
 		$help_file = 'advancedcontentfilter.md';
@@ -230,30 +207,30 @@ function advancedcontentfilter_content()
 		$t = Renderer::getMarkupTemplate('settings.tpl', 'addon/advancedcontentfilter/');
 		return Renderer::replaceMacros($t, [
 			'$messages' => [
-				'backtosettings'    => DI::l10n()->t('Back to Addon Settings'),
-				'title'             => DI::l10n()->t('Advanced Content Filter'),
-				'add_a_rule'        => DI::l10n()->t('Add a Rule'),
-				'help'              => DI::l10n()->t('Help'),
-				'intro'             => DI::l10n()->t('Add and manage your personal content filter rules in this screen. Rules have a name and an arbitrary expression that will be matched against post data. For a complete reference of the available operations and variables, check the help page.'),
-				'your_rules'        => DI::l10n()->t('Your rules'),
-				'no_rules'          => DI::l10n()->t('You have no rules yet! Start adding one by clicking on the button above next to the title.'),
-				'disabled'          => DI::l10n()->t('Disabled'),
-				'enabled'           => DI::l10n()->t('Enabled'),
-				'disable_this_rule' => DI::l10n()->t('Disable this rule'),
-				'enable_this_rule'  => DI::l10n()->t('Enable this rule'),
-				'edit_this_rule'    => DI::l10n()->t('Edit this rule'),
-				'edit_the_rule'     => DI::l10n()->t('Edit the rule'),
-				'save_this_rule'    => DI::l10n()->t('Save this rule'),
-				'delete_this_rule'  => DI::l10n()->t('Delete this rule'),
-				'rule'              => DI::l10n()->t('Rule'),
-				'close'             => DI::l10n()->t('Close'),
-				'addtitle'          => DI::l10n()->t('Add new rule'),
-				'rule_name'         => DI::l10n()->t('Rule Name'),
-				'rule_expression'   => DI::l10n()->t('Rule Expression'),
-				'cancel'            => DI::l10n()->t('Cancel'),
+				'backtosettings'    => L10n::t('Back to Addon Settings'),
+				'title'             => L10n::t('Advanced Content Filter'),
+				'add_a_rule'        => L10n::t('Add a Rule'),
+				'help'              => L10n::t('Help'),
+				'intro'             => L10n::t('Add and manage your personal content filter rules in this screen. Rules have a name and an arbitrary expression that will be matched against post data. For a complete reference of the available operations and variables, check the help page.'),
+				'your_rules'        => L10n::t('Your rules'),
+				'no_rules'          => L10n::t('You have no rules yet! Start adding one by clicking on the button above next to the title.'),
+				'disabled'          => L10n::t('Disabled'),
+				'enabled'           => L10n::t('Enabled'),
+				'disable_this_rule' => L10n::t('Disable this rule'),
+				'enable_this_rule'  => L10n::t('Enable this rule'),
+				'edit_this_rule'    => L10n::t('Edit this rule'),
+				'edit_the_rule'     => L10n::t('Edit the rule'),
+				'save_this_rule'    => L10n::t('Save this rule'),
+				'delete_this_rule'  => L10n::t('Delete this rule'),
+				'rule'              => L10n::t('Rule'),
+				'close'             => L10n::t('Close'),
+				'addtitle'          => L10n::t('Add new rule'),
+				'rule_name'         => L10n::t('Rule Name'),
+				'rule_expression'   => L10n::t('Rule Expression'),
+				'cancel'            => L10n::t('Cancel'),
 			],
-			'$current_theme' => DI::app()->getCurrentTheme(),
-			'$rules' => DBA::toArray(DBA::select('advancedcontentfilter_rules', [], ['uid' => DI::userSession()->getLocalUserId()])),
+			'$current_theme' => $a->getCurrentTheme(),
+			'$rules' => advancedcontentfilter_get_rules(),
 			'$form_security_token' => BaseModule::getFormSecurityToken()
 		]);
 	}
@@ -271,20 +248,29 @@ function advancedcontentfilter_build_fields($data)
 	}
 
 	if (!empty($data['expression'])) {
-		// Using a dummy item to validate the field existence
-		$condition = ["(`uid` = ? OR `uid` = 0)", DI::userSession()->getLocalUserId()];
-		$params = ['order' => ['uid' => true]];
-		$item_row = Post::selectFirstForUser(DI::userSession()->getLocalUserId(), [], $condition, $params);
-
-		if (!DBA::isResult($item_row)) {
-			throw new HTTPException\NotFoundException(DI::l10n()->t('This addon requires this node having at least one post'));
-		}
+		$allowed_keys = [
+			'author_id', 'author_link', 'author_name', 'author_avatar',
+			'owner_id', 'owner_link', 'owner_name', 'owner_avatar',
+			'contact_id', 'uid', 'id', 'parent', 'uri',
+			'thr_parent', 'parent_uri',
+			'content_warning',
+			'commented', 'created', 'edited', 'received',
+			'verb', 'object_type', 'postopts', 'plink', 'guid', 'wall', 'private', 'starred',
+			'title', 'body',
+			'file', 'event_id', 'location', 'coord', 'app', 'attach',
+			'rendered_hash', 'rendered_html', 'object',
+			'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid',
+			'item_id', 'item_network', 'author_thumb', 'owner_thumb',
+			'network', 'url', 'name', 'writable', 'self',
+			'cid', 'alias',
+			'event_created', 'event_edited', 'event_start', 'event_finish', 'event_summary',
+			'event_desc', 'event_location', 'event_type', 'event_nofinish', 'event_adjust', 'event_ignore',
+			'children', 'pagedrop', 'tags', 'hashtags', 'mentions',
+		];
 
 		$expressionLanguage = new ExpressionLanguage\ExpressionLanguage();
-		$parsedExpression = $expressionLanguage->parse(
-			$data['expression'],
-			array_keys(advancedcontentfilter_get_filter_fields(advancedcontentfilter_prepare_item_row($item_row)))
-		);
+
+		$parsedExpression = $expressionLanguage->parse($data['expression'], $allowed_keys);
 
 		$serialized = serialize($parsedExpression->getNodes());
 
@@ -305,38 +291,36 @@ function advancedcontentfilter_build_fields($data)
  * API
  */
 
-function advancedcontentfilter_get_rules(ServerRequestInterface $request, ResponseInterface $response): ResponseInterface
+function advancedcontentfilter_get_rules()
 {
-	if (!DI::userSession()->getLocalUserId()) {
-		throw new HTTPException\UnauthorizedException(DI::l10n()->t('You must be logged in to use this method'));
+	if (!local_user()) {
+		throw new HTTPException\UnauthorizedException(L10n::t('You must be logged in to use this method'));
 	}
 
-	$rules = DBA::toArray(DBA::select('advancedcontentfilter_rules', [], ['uid' => DI::userSession()->getLocalUserId()]));
+	$rules = DBA::toArray(DBA::select('advancedcontentfilter_rules', [], ['uid' => local_user()]));
 
-	$response->getBody()->write(json_encode($rules));
-	return $response->withHeader('Content-Type', 'application/json');
+	return json_encode($rules);
 }
 
 function advancedcontentfilter_get_rules_id(ServerRequestInterface $request, ResponseInterface $response, $args)
 {
-	if (!DI::userSession()->getLocalUserId()) {
-		throw new HTTPException\UnauthorizedException(DI::l10n()->t('You must be logged in to use this method'));
+	if (!local_user()) {
+		throw new HTTPException\UnauthorizedException(L10n::t('You must be logged in to use this method'));
 	}
 
-	$rule = DBA::selectFirst('advancedcontentfilter_rules', [], ['id' => $args['id'], 'uid' => DI::userSession()->getLocalUserId()]);
+	$rule = DBA::selectFirst('advancedcontentfilter_rules', [], ['id' => $args['id'], 'uid' => local_user()]);
 
-	$response->getBody()->write(json_encode($rule));
-	return $response->withHeader('Content-Type', 'application/json');
+	return json_encode($rule);
 }
 
-function advancedcontentfilter_post_rules(ServerRequestInterface $request, ResponseInterface $response)
+function advancedcontentfilter_post_rules(ServerRequestInterface $request)
 {
-	if (!DI::userSession()->getLocalUserId()) {
-		throw new HTTPException\UnauthorizedException(DI::l10n()->t('You must be logged in to use this method'));
+	if (!local_user()) {
+		throw new HTTPException\UnauthorizedException(L10n::t('You must be logged in to use this method'));
 	}
 
 	if (!BaseModule::checkFormSecurityToken()) {
-		throw new HTTPException\BadRequestException(DI::l10n()->t('Invalid form security token, please refresh the page.'));
+		throw new HTTPException\BadRequestException(L10n::t('Invalid form security token, please refresh the page.'));
 	}
 
 	$data = json_decode($request->getBody(), true);
@@ -344,40 +328,37 @@ function advancedcontentfilter_post_rules(ServerRequestInterface $request, Respo
 	try {
 		$fields = advancedcontentfilter_build_fields($data);
 	} catch (Exception $e) {
-		throw new HTTPException\BadRequestException($e->getMessage(), $e);
+		throw new HTTPException\BadRequestException($e->getMessage(), 0, $e);
 	}
 
 	if (empty($fields['name']) || empty($fields['expression'])) {
-		throw new HTTPException\BadRequestException(DI::l10n()->t('The rule name and expression are required.'));
+		throw new HTTPException\BadRequestException(L10n::t('The rule name and expression are required.'));
 	}
 
-	$fields['uid'] = DI::userSession()->getLocalUserId();
+	$fields['uid'] = local_user();
 	$fields['created'] = DateTimeFormat::utcNow();
 
 	if (!DBA::insert('advancedcontentfilter_rules', $fields)) {
-		throw new HTTPException\ServiceUnavailableException(DBA::errorMessage());
+		throw new HTTPException\ServiceUnavaiableException(DBA::errorMessage());
 	}
 
 	$rule = DBA::selectFirst('advancedcontentfilter_rules', [], ['id' => DBA::lastInsertId()]);
 
-	DI::cache()->delete('rules_' . DI::userSession()->getLocalUserId());
-
-	$response->getBody()->write(json_encode(['message' => DI::l10n()->t('Rule successfully added'), 'rule' => $rule]));
-	return $response->withHeader('Content-Type', 'application/json');
+	return json_encode(['message' => L10n::t('Rule successfully added'), 'rule' => $rule]);
 }
 
 function advancedcontentfilter_put_rules_id(ServerRequestInterface $request, ResponseInterface $response, $args)
 {
-	if (!DI::userSession()->getLocalUserId()) {
-		throw new HTTPException\UnauthorizedException(DI::l10n()->t('You must be logged in to use this method'));
+	if (!local_user()) {
+		throw new HTTPException\UnauthorizedException(L10n::t('You must be logged in to use this method'));
 	}
 
 	if (!BaseModule::checkFormSecurityToken()) {
-		throw new HTTPException\BadRequestException(DI::l10n()->t('Invalid form security token, please refresh the page.'));
+		throw new HTTPException\BadRequestException(L10n::t('Invalid form security token, please refresh the page.'));
 	}
 
-	if (!DBA::exists('advancedcontentfilter_rules', ['id' => $args['id'], 'uid' => DI::userSession()->getLocalUserId()])) {
-		throw new HTTPException\NotFoundException(DI::l10n()->t('Rule doesn\'t exist or doesn\'t belong to you.'));
+	if (!DBA::exists('advancedcontentfilter_rules', ['id' => $args['id'], 'uid' => local_user()])) {
+		throw new HTTPException\NotFoundException(L10n::t('Rule doesn\'t exist or doesn\'t belong to you.'));
 	}
 
 	$data = json_decode($request->getBody(), true);
@@ -385,83 +366,65 @@ function advancedcontentfilter_put_rules_id(ServerRequestInterface $request, Res
 	try {
 		$fields = advancedcontentfilter_build_fields($data);
 	} catch (Exception $e) {
-		throw new HTTPException\BadRequestException($e->getMessage(), $e);
+		throw new HTTPException\BadRequestException($e->getMessage(), 0, $e);
 	}
 
 	if (!DBA::update('advancedcontentfilter_rules', $fields, ['id' => $args['id']])) {
-		throw new HTTPException\ServiceUnavailableException(DBA::errorMessage());
+		throw new HTTPException\ServiceUnavaiableException(DBA::errorMessage());
 	}
 
-	DI::cache()->delete('rules_' . DI::userSession()->getLocalUserId());
-
-	$response->getBody()->write(json_encode(['message' => DI::l10n()->t('Rule successfully updated')]));
-	return $response->withHeader('Content-Type', 'application/json');
+	return json_encode(['message' => L10n::t('Rule successfully updated')]);
 }
 
 function advancedcontentfilter_delete_rules_id(ServerRequestInterface $request, ResponseInterface $response, $args)
 {
-	if (!DI::userSession()->getLocalUserId()) {
-		throw new HTTPException\UnauthorizedException(DI::l10n()->t('You must be logged in to use this method'));
+	if (!local_user()) {
+		throw new HTTPException\UnauthorizedException(L10n::t('You must be logged in to use this method'));
 	}
 
 	if (!BaseModule::checkFormSecurityToken()) {
-		throw new HTTPException\BadRequestException(DI::l10n()->t('Invalid form security token, please refresh the page.'));
+		throw new HTTPException\BadRequestException(L10n::t('Invalid form security token, please refresh the page.'));
 	}
 
-	if (!DBA::exists('advancedcontentfilter_rules', ['id' => $args['id'], 'uid' => DI::userSession()->getLocalUserId()])) {
-		throw new HTTPException\NotFoundException(DI::l10n()->t('Rule doesn\'t exist or doesn\'t belong to you.'));
+	if (!DBA::exists('advancedcontentfilter_rules', ['id' => $args['id'], 'uid' => local_user()])) {
+		throw new HTTPException\NotFoundException(L10n::t('Rule doesn\'t exist or doesn\'t belong to you.'));
 	}
 
 	if (!DBA::delete('advancedcontentfilter_rules', ['id' => $args['id']])) {
-		throw new HTTPException\ServiceUnavailableException(DBA::errorMessage());
+		throw new HTTPException\ServiceUnavaiableException(DBA::errorMessage());
 	}
 
-	DI::cache()->delete('rules_' . DI::userSession()->getLocalUserId());
-
-	$response->getBody()->write(json_encode(['message' => DI::l10n()->t('Rule successfully deleted')]));
-	return $response->withHeader('Content-Type', 'application/json');
+	return json_encode(['message' => L10n::t('Rule successfully deleted')]);
 }
 
 function advancedcontentfilter_get_variables_guid(ServerRequestInterface $request, ResponseInterface $response, $args)
 {
-	if (!DI::userSession()->getLocalUserId()) {
-		throw new HTTPException\UnauthorizedException(DI::l10n()->t('You must be logged in to use this method'));
+	if (!local_user()) {
+		throw new HTTPException\UnauthorizedException(L10n::t('You must be logged in to use this method'));
 	}
 
 	if (!isset($args['guid'])) {
-		throw new HTTPException\BadRequestException(DI::l10n()->t('Missing argument: guid.'));
+		throw new HTTPException\BadRequestException(L10n::t('Missing argument: guid.'));
 	}
 
-	$condition = ["`guid` = ? AND (`uid` = ? OR `uid` = 0)", $args['guid'], DI::userSession()->getLocalUserId()];
+	$condition = ["`guid` = ? AND (`uid` = ? OR `uid` = 0)", $args['guid'], local_user()];
 	$params = ['order' => ['uid' => true]];
-	$item_row = Post::selectFirstForUser(DI::userSession()->getLocalUserId(), [], $condition, $params);
+	$item = Item::selectFirstForUser(local_user(), [], $condition, $params);
 
-	if (!DBA::isResult($item_row)) {
-		throw new HTTPException\NotFoundException(DI::l10n()->t('Unknown post with guid: %s', $args['guid']));
+	if (!DBA::isResult($item)) {
+		throw new HTTPException\NotFoundException(L10n::t('Unknown post with guid: %s', $args['guid']));
 	}
 
-	$return = advancedcontentfilter_get_filter_fields(advancedcontentfilter_prepare_item_row($item_row));
+	$tags = Term::populateTagsFromItem($item);
 
-	$response->getBody()->write(json_encode(['variables' => str_replace('\\\'', '\'', var_export($return, true))]));
-	return $response->withHeader('Content-Type', 'application/json');
-}
-
-/**
- * This mimimcs the processing performed in Model\Item::prepareBody
- *
- * @param array $item_row
- * @return array
- * @throws HTTPException\InternalServerErrorException
- * @throws ImagickException
- */
-function advancedcontentfilter_prepare_item_row(array $item_row): array
-{
-	$tags = Tag::populateFromItem($item_row);
-
-	$item_row['tags'] = $tags['tags'];
-	$item_row['hashtags'] = $tags['hashtags'];
-	$item_row['mentions'] = $tags['mentions'];
-	$item_row['attachments'] = DI::postMediaRepository()->splitAttachments($item_row['uri-id']);
-
-	return $item_row;
+	$item['tags'] = $tags['tags'];
+	$item['hashtags'] = $tags['hashtags'];
+	$item['mentions'] = $tags['mentions'];
+
+	$return = [];
+	foreach ($item as $key => $value) {
+		$return[str_replace('-', '_', $key)] = $value;
+	}
+
+	return json_encode(['variables' => str_replace('\\\'', '\'', var_export($return, true))]);
 }
diff --git a/advancedcontentfilter/asset/vue/dist/vue.js b/advancedcontentfilter/asset/vue/dist/vue.js
deleted file mode 100644
index 04bcb375..00000000
--- a/advancedcontentfilter/asset/vue/dist/vue.js
+++ /dev/null
@@ -1,11894 +0,0 @@
-/*!
- * Vue.js v2.7.13
- * (c) 2014-2022 Evan You
- * Released under the MIT License.
- */
-(function (global, factory) {
-  typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
-  typeof define === 'function' && define.amd ? define(factory) :
-  (global = typeof globalThis !== 'undefined' ? globalThis : global || self, global.Vue = factory());
-})(this, (function () { 'use strict';
-
-  var emptyObject = Object.freeze({});
-  var isArray = Array.isArray;
-  // These helpers produce better VM code in JS engines due to their
-  // explicitness and function inlining.
-  function isUndef(v) {
-      return v === undefined || v === null;
-  }
-  function isDef(v) {
-      return v !== undefined && v !== null;
-  }
-  function isTrue(v) {
-      return v === true;
-  }
-  function isFalse(v) {
-      return v === false;
-  }
-  /**
-   * Check if value is primitive.
-   */
-  function isPrimitive(value) {
-      return (typeof value === 'string' ||
-          typeof value === 'number' ||
-          // $flow-disable-line
-          typeof value === 'symbol' ||
-          typeof value === 'boolean');
-  }
-  function isFunction(value) {
-      return typeof value === 'function';
-  }
-  /**
-   * Quick object check - this is primarily used to tell
-   * objects from primitive values when we know the value
-   * is a JSON-compliant type.
-   */
-  function isObject(obj) {
-      return obj !== null && typeof obj === 'object';
-  }
-  /**
-   * Get the raw type string of a value, e.g., [object Object].
-   */
-  var _toString = Object.prototype.toString;
-  function toRawType(value) {
-      return _toString.call(value).slice(8, -1);
-  }
-  /**
-   * Strict object type check. Only returns true
-   * for plain JavaScript objects.
-   */
-  function isPlainObject(obj) {
-      return _toString.call(obj) === '[object Object]';
-  }
-  function isRegExp(v) {
-      return _toString.call(v) === '[object RegExp]';
-  }
-  /**
-   * Check if val is a valid array index.
-   */
-  function isValidArrayIndex(val) {
-      var n = parseFloat(String(val));
-      return n >= 0 && Math.floor(n) === n && isFinite(val);
-  }
-  function isPromise(val) {
-      return (isDef(val) &&
-          typeof val.then === 'function' &&
-          typeof val.catch === 'function');
-  }
-  /**
-   * Convert a value to a string that is actually rendered.
-   */
-  function toString(val) {
-      return val == null
-          ? ''
-          : Array.isArray(val) || (isPlainObject(val) && val.toString === _toString)
-              ? JSON.stringify(val, null, 2)
-              : String(val);
-  }
-  /**
-   * Convert an input value to a number for persistence.
-   * If the conversion fails, return original string.
-   */
-  function toNumber(val) {
-      var n = parseFloat(val);
-      return isNaN(n) ? val : n;
-  }
-  /**
-   * Make a map and return a function for checking if a key
-   * is in that map.
-   */
-  function makeMap(str, expectsLowerCase) {
-      var map = Object.create(null);
-      var list = str.split(',');
-      for (var i = 0; i < list.length; i++) {
-          map[list[i]] = true;
-      }
-      return expectsLowerCase ? function (val) { return map[val.toLowerCase()]; } : function (val) { return map[val]; };
-  }
-  /**
-   * Check if a tag is a built-in tag.
-   */
-  var isBuiltInTag = makeMap('slot,component', true);
-  /**
-   * Check if an attribute is a reserved attribute.
-   */
-  var isReservedAttribute = makeMap('key,ref,slot,slot-scope,is');
-  /**
-   * Remove an item from an array.
-   */
-  function remove$2(arr, item) {
-      var len = arr.length;
-      if (len) {
-          // fast path for the only / last item
-          if (item === arr[len - 1]) {
-              arr.length = len - 1;
-              return;
-          }
-          var index = arr.indexOf(item);
-          if (index > -1) {
-              return arr.splice(index, 1);
-          }
-      }
-  }
-  /**
-   * Check whether an object has the property.
-   */
-  var hasOwnProperty = Object.prototype.hasOwnProperty;
-  function hasOwn(obj, key) {
-      return hasOwnProperty.call(obj, key);
-  }
-  /**
-   * Create a cached version of a pure function.
-   */
-  function cached(fn) {
-      var cache = Object.create(null);
-      return function cachedFn(str) {
-          var hit = cache[str];
-          return hit || (cache[str] = fn(str));
-      };
-  }
-  /**
-   * Camelize a hyphen-delimited string.
-   */
-  var camelizeRE = /-(\w)/g;
-  var camelize = cached(function (str) {
-      return str.replace(camelizeRE, function (_, c) { return (c ? c.toUpperCase() : ''); });
-  });
-  /**
-   * Capitalize a string.
-   */
-  var capitalize = cached(function (str) {
-      return str.charAt(0).toUpperCase() + str.slice(1);
-  });
-  /**
-   * Hyphenate a camelCase string.
-   */
-  var hyphenateRE = /\B([A-Z])/g;
-  var hyphenate = cached(function (str) {
-      return str.replace(hyphenateRE, '-$1').toLowerCase();
-  });
-  /**
-   * Simple bind polyfill for environments that do not support it,
-   * e.g., PhantomJS 1.x. Technically, we don't need this anymore
-   * since native bind is now performant enough in most browsers.
-   * But removing it would mean breaking code that was able to run in
-   * PhantomJS 1.x, so this must be kept for backward compatibility.
-   */
-  /* istanbul ignore next */
-  function polyfillBind(fn, ctx) {
-      function boundFn(a) {
-          var l = arguments.length;
-          return l
-              ? l > 1
-                  ? fn.apply(ctx, arguments)
-                  : fn.call(ctx, a)
-              : fn.call(ctx);
-      }
-      boundFn._length = fn.length;
-      return boundFn;
-  }
-  function nativeBind(fn, ctx) {
-      return fn.bind(ctx);
-  }
-  // @ts-expect-error bind cannot be `undefined`
-  var bind$1 = Function.prototype.bind ? nativeBind : polyfillBind;
-  /**
-   * Convert an Array-like object to a real Array.
-   */
-  function toArray(list, start) {
-      start = start || 0;
-      var i = list.length - start;
-      var ret = new Array(i);
-      while (i--) {
-          ret[i] = list[i + start];
-      }
-      return ret;
-  }
-  /**
-   * Mix properties into target object.
-   */
-  function extend(to, _from) {
-      for (var key in _from) {
-          to[key] = _from[key];
-      }
-      return to;
-  }
-  /**
-   * Merge an Array of Objects into a single Object.
-   */
-  function toObject(arr) {
-      var res = {};
-      for (var i = 0; i < arr.length; i++) {
-          if (arr[i]) {
-              extend(res, arr[i]);
-          }
-      }
-      return res;
-  }
-  /* eslint-disable no-unused-vars */
-  /**
-   * Perform no operation.
-   * Stubbing args to make Flow happy without leaving useless transpiled code
-   * with ...rest (https://flow.org/blog/2017/05/07/Strict-Function-Call-Arity/).
-   */
-  function noop(a, b, c) { }
-  /**
-   * Always return false.
-   */
-  var no = function (a, b, c) { return false; };
-  /* eslint-enable no-unused-vars */
-  /**
-   * Return the same value.
-   */
-  var identity = function (_) { return _; };
-  /**
-   * Generate a string containing static keys from compiler modules.
-   */
-  function genStaticKeys$1(modules) {
-      return modules
-          .reduce(function (keys, m) {
-          return keys.concat(m.staticKeys || []);
-      }, [])
-          .join(',');
-  }
-  /**
-   * Check if two values are loosely equal - that is,
-   * if they are plain objects, do they have the same shape?
-   */
-  function looseEqual(a, b) {
-      if (a === b)
-          return true;
-      var isObjectA = isObject(a);
-      var isObjectB = isObject(b);
-      if (isObjectA && isObjectB) {
-          try {
-              var isArrayA = Array.isArray(a);
-              var isArrayB = Array.isArray(b);
-              if (isArrayA && isArrayB) {
-                  return (a.length === b.length &&
-                      a.every(function (e, i) {
-                          return looseEqual(e, b[i]);
-                      }));
-              }
-              else if (a instanceof Date && b instanceof Date) {
-                  return a.getTime() === b.getTime();
-              }
-              else if (!isArrayA && !isArrayB) {
-                  var keysA = Object.keys(a);
-                  var keysB = Object.keys(b);
-                  return (keysA.length === keysB.length &&
-                      keysA.every(function (key) {
-                          return looseEqual(a[key], b[key]);
-                      }));
-              }
-              else {
-                  /* istanbul ignore next */
-                  return false;
-              }
-          }
-          catch (e) {
-              /* istanbul ignore next */
-              return false;
-          }
-      }
-      else if (!isObjectA && !isObjectB) {
-          return String(a) === String(b);
-      }
-      else {
-          return false;
-      }
-  }
-  /**
-   * Return the first index at which a loosely equal value can be
-   * found in the array (if value is a plain object, the array must
-   * contain an object of the same shape), or -1 if it is not present.
-   */
-  function looseIndexOf(arr, val) {
-      for (var i = 0; i < arr.length; i++) {
-          if (looseEqual(arr[i], val))
-              return i;
-      }
-      return -1;
-  }
-  /**
-   * Ensure a function is called only once.
-   */
-  function once(fn) {
-      var called = false;
-      return function () {
-          if (!called) {
-              called = true;
-              fn.apply(this, arguments);
-          }
-      };
-  }
-  // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/is#polyfill
-  function hasChanged(x, y) {
-      if (x === y) {
-          return x === 0 && 1 / x !== 1 / y;
-      }
-      else {
-          return x === x || y === y;
-      }
-  }
-
-  var SSR_ATTR = 'data-server-rendered';
-  var ASSET_TYPES = ['component', 'directive', 'filter'];
-  var LIFECYCLE_HOOKS = [
-      'beforeCreate',
-      'created',
-      'beforeMount',
-      'mounted',
-      'beforeUpdate',
-      'updated',
-      'beforeDestroy',
-      'destroyed',
-      'activated',
-      'deactivated',
-      'errorCaptured',
-      'serverPrefetch',
-      'renderTracked',
-      'renderTriggered'
-  ];
-
-  var config = {
-      /**
-       * Option merge strategies (used in core/util/options)
-       */
-      // $flow-disable-line
-      optionMergeStrategies: Object.create(null),
-      /**
-       * Whether to suppress warnings.
-       */
-      silent: false,
-      /**
-       * Show production mode tip message on boot?
-       */
-      productionTip: true,
-      /**
-       * Whether to enable devtools
-       */
-      devtools: true,
-      /**
-       * Whether to record perf
-       */
-      performance: false,
-      /**
-       * Error handler for watcher errors
-       */
-      errorHandler: null,
-      /**
-       * Warn handler for watcher warns
-       */
-      warnHandler: null,
-      /**
-       * Ignore certain custom elements
-       */
-      ignoredElements: [],
-      /**
-       * Custom user key aliases for v-on
-       */
-      // $flow-disable-line
-      keyCodes: Object.create(null),
-      /**
-       * Check if a tag is reserved so that it cannot be registered as a
-       * component. This is platform-dependent and may be overwritten.
-       */
-      isReservedTag: no,
-      /**
-       * Check if an attribute is reserved so that it cannot be used as a component
-       * prop. This is platform-dependent and may be overwritten.
-       */
-      isReservedAttr: no,
-      /**
-       * Check if a tag is an unknown element.
-       * Platform-dependent.
-       */
-      isUnknownElement: no,
-      /**
-       * Get the namespace of an element
-       */
-      getTagNamespace: noop,
-      /**
-       * Parse the real tag name for the specific platform.
-       */
-      parsePlatformTagName: identity,
-      /**
-       * Check if an attribute must be bound using property, e.g. value
-       * Platform-dependent.
-       */
-      mustUseProp: no,
-      /**
-       * Perform updates asynchronously. Intended to be used by Vue Test Utils
-       * This will significantly reduce performance if set to false.
-       */
-      async: true,
-      /**
-       * Exposed for legacy reasons
-       */
-      _lifecycleHooks: LIFECYCLE_HOOKS
-  };
-
-  /**
-   * unicode letters used for parsing html tags, component names and property paths.
-   * using https://www.w3.org/TR/html53/semantics-scripting.html#potentialcustomelementname
-   * skipping \u10000-\uEFFFF due to it freezing up PhantomJS
-   */
-  var unicodeRegExp = /a-zA-Z\u00B7\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u037D\u037F-\u1FFF\u200C-\u200D\u203F-\u2040\u2070-\u218F\u2C00-\u2FEF\u3001-\uD7FF\uF900-\uFDCF\uFDF0-\uFFFD/;
-  /**
-   * Check if a string starts with $ or _
-   */
-  function isReserved(str) {
-      var c = (str + '').charCodeAt(0);
-      return c === 0x24 || c === 0x5f;
-  }
-  /**
-   * Define a property.
-   */
-  function def(obj, key, val, enumerable) {
-      Object.defineProperty(obj, key, {
-          value: val,
-          enumerable: !!enumerable,
-          writable: true,
-          configurable: true
-      });
-  }
-  /**
-   * Parse simple path.
-   */
-  var bailRE = new RegExp("[^".concat(unicodeRegExp.source, ".$_\\d]"));
-  function parsePath(path) {
-      if (bailRE.test(path)) {
-          return;
-      }
-      var segments = path.split('.');
-      return function (obj) {
-          for (var i = 0; i < segments.length; i++) {
-              if (!obj)
-                  return;
-              obj = obj[segments[i]];
-          }
-          return obj;
-      };
-  }
-
-  // can we use __proto__?
-  var hasProto = '__proto__' in {};
-  // Browser environment sniffing
-  var inBrowser = typeof window !== 'undefined';
-  var UA = inBrowser && window.navigator.userAgent.toLowerCase();
-  var isIE = UA && /msie|trident/.test(UA);
-  var isIE9 = UA && UA.indexOf('msie 9.0') > 0;
-  var isEdge = UA && UA.indexOf('edge/') > 0;
-  UA && UA.indexOf('android') > 0;
-  var isIOS = UA && /iphone|ipad|ipod|ios/.test(UA);
-  UA && /chrome\/\d+/.test(UA) && !isEdge;
-  UA && /phantomjs/.test(UA);
-  var isFF = UA && UA.match(/firefox\/(\d+)/);
-  // Firefox has a "watch" function on Object.prototype...
-  // @ts-expect-error firebox support
-  var nativeWatch = {}.watch;
-  var supportsPassive = false;
-  if (inBrowser) {
-      try {
-          var opts = {};
-          Object.defineProperty(opts, 'passive', {
-              get: function () {
-                  /* istanbul ignore next */
-                  supportsPassive = true;
-              }
-          }); // https://github.com/facebook/flow/issues/285
-          window.addEventListener('test-passive', null, opts);
-      }
-      catch (e) { }
-  }
-  // this needs to be lazy-evaled because vue may be required before
-  // vue-server-renderer can set VUE_ENV
-  var _isServer;
-  var isServerRendering = function () {
-      if (_isServer === undefined) {
-          /* istanbul ignore if */
-          if (!inBrowser && typeof global !== 'undefined') {
-              // detect presence of vue-server-renderer and avoid
-              // Webpack shimming the process
-              _isServer =
-                  global['process'] && global['process'].env.VUE_ENV === 'server';
-          }
-          else {
-              _isServer = false;
-          }
-      }
-      return _isServer;
-  };
-  // detect devtools
-  var devtools = inBrowser && window.__VUE_DEVTOOLS_GLOBAL_HOOK__;
-  /* istanbul ignore next */
-  function isNative(Ctor) {
-      return typeof Ctor === 'function' && /native code/.test(Ctor.toString());
-  }
-  var hasSymbol = typeof Symbol !== 'undefined' &&
-      isNative(Symbol) &&
-      typeof Reflect !== 'undefined' &&
-      isNative(Reflect.ownKeys);
-  var _Set; // $flow-disable-line
-  /* istanbul ignore if */ if (typeof Set !== 'undefined' && isNative(Set)) {
-      // use native Set when available.
-      _Set = Set;
-  }
-  else {
-      // a non-standard Set polyfill that only works with primitive keys.
-      _Set = /** @class */ (function () {
-          function Set() {
-              this.set = Object.create(null);
-          }
-          Set.prototype.has = function (key) {
-              return this.set[key] === true;
-          };
-          Set.prototype.add = function (key) {
-              this.set[key] = true;
-          };
-          Set.prototype.clear = function () {
-              this.set = Object.create(null);
-          };
-          return Set;
-      }());
-  }
-
-  var currentInstance = null;
-  /**
-   * This is exposed for compatibility with v3 (e.g. some functions in VueUse
-   * relies on it). Do not use this internally, just use `currentInstance`.
-   *
-   * @internal this function needs manual type declaration because it relies
-   * on previously manually authored types from Vue 2
-   */
-  function getCurrentInstance() {
-      return currentInstance && { proxy: currentInstance };
-  }
-  /**
-   * @internal
-   */
-  function setCurrentInstance(vm) {
-      if (vm === void 0) { vm = null; }
-      if (!vm)
-          currentInstance && currentInstance._scope.off();
-      currentInstance = vm;
-      vm && vm._scope.on();
-  }
-
-  /**
-   * @internal
-   */
-  var VNode = /** @class */ (function () {
-      function VNode(tag, data, children, text, elm, context, componentOptions, asyncFactory) {
-          this.tag = tag;
-          this.data = data;
-          this.children = children;
-          this.text = text;
-          this.elm = elm;
-          this.ns = undefined;
-          this.context = context;
-          this.fnContext = undefined;
-          this.fnOptions = undefined;
-          this.fnScopeId = undefined;
-          this.key = data && data.key;
-          this.componentOptions = componentOptions;
-          this.componentInstance = undefined;
-          this.parent = undefined;
-          this.raw = false;
-          this.isStatic = false;
-          this.isRootInsert = true;
-          this.isComment = false;
-          this.isCloned = false;
-          this.isOnce = false;
-          this.asyncFactory = asyncFactory;
-          this.asyncMeta = undefined;
-          this.isAsyncPlaceholder = false;
-      }
-      Object.defineProperty(VNode.prototype, "child", {
-          // DEPRECATED: alias for componentInstance for backwards compat.
-          /* istanbul ignore next */
-          get: function () {
-              return this.componentInstance;
-          },
-          enumerable: false,
-          configurable: true
-      });
-      return VNode;
-  }());
-  var createEmptyVNode = function (text) {
-      if (text === void 0) { text = ''; }
-      var node = new VNode();
-      node.text = text;
-      node.isComment = true;
-      return node;
-  };
-  function createTextVNode(val) {
-      return new VNode(undefined, undefined, undefined, String(val));
-  }
-  // optimized shallow clone
-  // used for static nodes and slot nodes because they may be reused across
-  // multiple renders, cloning them avoids errors when DOM manipulations rely
-  // on their elm reference.
-  function cloneVNode(vnode) {
-      var cloned = new VNode(vnode.tag, vnode.data, 
-      // #7975
-      // clone children array to avoid mutating original in case of cloning
-      // a child.
-      vnode.children && vnode.children.slice(), vnode.text, vnode.elm, vnode.context, vnode.componentOptions, vnode.asyncFactory);
-      cloned.ns = vnode.ns;
-      cloned.isStatic = vnode.isStatic;
-      cloned.key = vnode.key;
-      cloned.isComment = vnode.isComment;
-      cloned.fnContext = vnode.fnContext;
-      cloned.fnOptions = vnode.fnOptions;
-      cloned.fnScopeId = vnode.fnScopeId;
-      cloned.asyncMeta = vnode.asyncMeta;
-      cloned.isCloned = true;
-      return cloned;
-  }
-
-  /* not type checking this file because flow doesn't play well with Proxy */
-  var initProxy;
-  {
-      var allowedGlobals_1 = makeMap('Infinity,undefined,NaN,isFinite,isNaN,' +
-          'parseFloat,parseInt,decodeURI,decodeURIComponent,encodeURI,encodeURIComponent,' +
-          'Math,Number,Date,Array,Object,Boolean,String,RegExp,Map,Set,JSON,Intl,BigInt,' +
-          'require' // for Webpack/Browserify
-      );
-      var warnNonPresent_1 = function (target, key) {
-          warn$2("Property or method \"".concat(key, "\" is not defined on the instance but ") +
-              'referenced during render. Make sure that this property is reactive, ' +
-              'either in the data option, or for class-based components, by ' +
-              'initializing the property. ' +
-              'See: https://v2.vuejs.org/v2/guide/reactivity.html#Declaring-Reactive-Properties.', target);
-      };
-      var warnReservedPrefix_1 = function (target, key) {
-          warn$2("Property \"".concat(key, "\" must be accessed with \"$data.").concat(key, "\" because ") +
-              'properties starting with "$" or "_" are not proxied in the Vue instance to ' +
-              'prevent conflicts with Vue internals. ' +
-              'See: https://v2.vuejs.org/v2/api/#data', target);
-      };
-      var hasProxy_1 = typeof Proxy !== 'undefined' && isNative(Proxy);
-      if (hasProxy_1) {
-          var isBuiltInModifier_1 = makeMap('stop,prevent,self,ctrl,shift,alt,meta,exact');
-          config.keyCodes = new Proxy(config.keyCodes, {
-              set: function (target, key, value) {
-                  if (isBuiltInModifier_1(key)) {
-                      warn$2("Avoid overwriting built-in modifier in config.keyCodes: .".concat(key));
-                      return false;
-                  }
-                  else {
-                      target[key] = value;
-                      return true;
-                  }
-              }
-          });
-      }
-      var hasHandler_1 = {
-          has: function (target, key) {
-              var has = key in target;
-              var isAllowed = allowedGlobals_1(key) ||
-                  (typeof key === 'string' &&
-                      key.charAt(0) === '_' &&
-                      !(key in target.$data));
-              if (!has && !isAllowed) {
-                  if (key in target.$data)
-                      warnReservedPrefix_1(target, key);
-                  else
-                      warnNonPresent_1(target, key);
-              }
-              return has || !isAllowed;
-          }
-      };
-      var getHandler_1 = {
-          get: function (target, key) {
-              if (typeof key === 'string' && !(key in target)) {
-                  if (key in target.$data)
-                      warnReservedPrefix_1(target, key);
-                  else
-                      warnNonPresent_1(target, key);
-              }
-              return target[key];
-          }
-      };
-      initProxy = function initProxy(vm) {
-          if (hasProxy_1) {
-              // determine which proxy handler to use
-              var options = vm.$options;
-              var handlers = options.render && options.render._withStripped ? getHandler_1 : hasHandler_1;
-              vm._renderProxy = new Proxy(vm, handlers);
-          }
-          else {
-              vm._renderProxy = vm;
-          }
-      };
-  }
-
-  /******************************************************************************
-  Copyright (c) Microsoft Corporation.
-
-  Permission to use, copy, modify, and/or distribute this software for any
-  purpose with or without fee is hereby granted.
-
-  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
-  REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-  AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
-  INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-  LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-  OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-  PERFORMANCE OF THIS SOFTWARE.
-  ***************************************************************************** */
-
-  var __assign = function() {
-      __assign = Object.assign || function __assign(t) {
-          for (var s, i = 1, n = arguments.length; i < n; i++) {
-              s = arguments[i];
-              for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
-          }
-          return t;
-      };
-      return __assign.apply(this, arguments);
-  };
-
-  var uid$2 = 0;
-  var pendingCleanupDeps = [];
-  var cleanupDeps = function () {
-      for (var i = 0; i < pendingCleanupDeps.length; i++) {
-          var dep = pendingCleanupDeps[i];
-          dep.subs = dep.subs.filter(function (s) { return s; });
-          dep._pending = false;
-      }
-      pendingCleanupDeps.length = 0;
-  };
-  /**
-   * A dep is an observable that can have multiple
-   * directives subscribing to it.
-   * @internal
-   */
-  var Dep = /** @class */ (function () {
-      function Dep() {
-          // pending subs cleanup
-          this._pending = false;
-          this.id = uid$2++;
-          this.subs = [];
-      }
-      Dep.prototype.addSub = function (sub) {
-          this.subs.push(sub);
-      };
-      Dep.prototype.removeSub = function (sub) {
-          // #12696 deps with massive amount of subscribers are extremely slow to
-          // clean up in Chromium
-          // to workaround this, we unset the sub for now, and clear them on
-          // next scheduler flush.
-          this.subs[this.subs.indexOf(sub)] = null;
-          if (!this._pending) {
-              this._pending = true;
-              pendingCleanupDeps.push(this);
-          }
-      };
-      Dep.prototype.depend = function (info) {
-          if (Dep.target) {
-              Dep.target.addDep(this);
-              if (info && Dep.target.onTrack) {
-                  Dep.target.onTrack(__assign({ effect: Dep.target }, info));
-              }
-          }
-      };
-      Dep.prototype.notify = function (info) {
-          // stabilize the subscriber list first
-          var subs = this.subs.filter(function (s) { return s; });
-          if (!config.async) {
-              // subs aren't sorted in scheduler if not running async
-              // we need to sort them now to make sure they fire in correct
-              // order
-              subs.sort(function (a, b) { return a.id - b.id; });
-          }
-          for (var i = 0, l = subs.length; i < l; i++) {
-              var sub = subs[i];
-              if (info) {
-                  sub.onTrigger &&
-                      sub.onTrigger(__assign({ effect: subs[i] }, info));
-              }
-              sub.update();
-          }
-      };
-      return Dep;
-  }());
-  // The current target watcher being evaluated.
-  // This is globally unique because only one watcher
-  // can be evaluated at a time.
-  Dep.target = null;
-  var targetStack = [];
-  function pushTarget(target) {
-      targetStack.push(target);
-      Dep.target = target;
-  }
-  function popTarget() {
-      targetStack.pop();
-      Dep.target = targetStack[targetStack.length - 1];
-  }
-
-  /*
-   * not type checking this file because flow doesn't play well with
-   * dynamically accessing methods on Array prototype
-   */
-  var arrayProto = Array.prototype;
-  var arrayMethods = Object.create(arrayProto);
-  var methodsToPatch = [
-      'push',
-      'pop',
-      'shift',
-      'unshift',
-      'splice',
-      'sort',
-      'reverse'
-  ];
-  /**
-   * Intercept mutating methods and emit events
-   */
-  methodsToPatch.forEach(function (method) {
-      // cache original method
-      var original = arrayProto[method];
-      def(arrayMethods, method, function mutator() {
-          var args = [];
-          for (var _i = 0; _i < arguments.length; _i++) {
-              args[_i] = arguments[_i];
-          }
-          var result = original.apply(this, args);
-          var ob = this.__ob__;
-          var inserted;
-          switch (method) {
-              case 'push':
-              case 'unshift':
-                  inserted = args;
-                  break;
-              case 'splice':
-                  inserted = args.slice(2);
-                  break;
-          }
-          if (inserted)
-              ob.observeArray(inserted);
-          // notify change
-          {
-              ob.dep.notify({
-                  type: "array mutation" /* TriggerOpTypes.ARRAY_MUTATION */,
-                  target: this,
-                  key: method
-              });
-          }
-          return result;
-      });
-  });
-
-  var rawMap = new WeakMap();
-  function reactive(target) {
-      makeReactive(target, false);
-      return target;
-  }
-  /**
-   * Return a shallowly-reactive copy of the original object, where only the root
-   * level properties are reactive. It also does not auto-unwrap refs (even at the
-   * root level).
-   */
-  function shallowReactive(target) {
-      makeReactive(target, true);
-      def(target, "__v_isShallow" /* ReactiveFlags.IS_SHALLOW */, true);
-      return target;
-  }
-  function makeReactive(target, shallow) {
-      // if trying to observe a readonly proxy, return the readonly version.
-      if (!isReadonly(target)) {
-          {
-              if (isArray(target)) {
-                  warn$2("Avoid using Array as root value for ".concat(shallow ? "shallowReactive()" : "reactive()", " as it cannot be tracked in watch() or watchEffect(). Use ").concat(shallow ? "shallowRef()" : "ref()", " instead. This is a Vue-2-only limitation."));
-              }
-              var existingOb = target && target.__ob__;
-              if (existingOb && existingOb.shallow !== shallow) {
-                  warn$2("Target is already a ".concat(existingOb.shallow ? "" : "non-", "shallow reactive object, and cannot be converted to ").concat(shallow ? "" : "non-", "shallow."));
-              }
-          }
-          var ob = observe(target, shallow, isServerRendering() /* ssr mock reactivity */);
-          if (!ob) {
-              if (target == null || isPrimitive(target)) {
-                  warn$2("value cannot be made reactive: ".concat(String(target)));
-              }
-              if (isCollectionType(target)) {
-                  warn$2("Vue 2 does not support reactive collection types such as Map or Set.");
-              }
-          }
-      }
-  }
-  function isReactive(value) {
-      if (isReadonly(value)) {
-          return isReactive(value["__v_raw" /* ReactiveFlags.RAW */]);
-      }
-      return !!(value && value.__ob__);
-  }
-  function isShallow(value) {
-      return !!(value && value.__v_isShallow);
-  }
-  function isReadonly(value) {
-      return !!(value && value.__v_isReadonly);
-  }
-  function isProxy(value) {
-      return isReactive(value) || isReadonly(value);
-  }
-  function toRaw(observed) {
-      var raw = observed && observed["__v_raw" /* ReactiveFlags.RAW */];
-      return raw ? toRaw(raw) : observed;
-  }
-  function markRaw(value) {
-      if (isObject(value)) {
-          rawMap.set(value, true);
-      }
-      return value;
-  }
-  /**
-   * @internal
-   */
-  function isCollectionType(value) {
-      var type = toRawType(value);
-      return (type === 'Map' || type === 'WeakMap' || type === 'Set' || type === 'WeakSet');
-  }
-
-  var arrayKeys = Object.getOwnPropertyNames(arrayMethods);
-  var NO_INIITIAL_VALUE = {};
-  /**
-   * In some cases we may want to disable observation inside a component's
-   * update computation.
-   */
-  var shouldObserve = true;
-  function toggleObserving(value) {
-      shouldObserve = value;
-  }
-  // ssr mock dep
-  var mockDep = {
-      notify: noop,
-      depend: noop,
-      addSub: noop,
-      removeSub: noop
-  };
-  /**
-   * Observer class that is attached to each observed
-   * object. Once attached, the observer converts the target
-   * object's property keys into getter/setters that
-   * collect dependencies and dispatch updates.
-   */
-  var Observer = /** @class */ (function () {
-      function Observer(value, shallow, mock) {
-          if (shallow === void 0) { shallow = false; }
-          if (mock === void 0) { mock = false; }
-          this.value = value;
-          this.shallow = shallow;
-          this.mock = mock;
-          // this.value = value
-          this.dep = mock ? mockDep : new Dep();
-          this.vmCount = 0;
-          def(value, '__ob__', this);
-          if (isArray(value)) {
-              if (!mock) {
-                  if (hasProto) {
-                      value.__proto__ = arrayMethods;
-                      /* eslint-enable no-proto */
-                  }
-                  else {
-                      for (var i = 0, l = arrayKeys.length; i < l; i++) {
-                          var key = arrayKeys[i];
-                          def(value, key, arrayMethods[key]);
-                      }
-                  }
-              }
-              if (!shallow) {
-                  this.observeArray(value);
-              }
-          }
-          else {
-              /**
-               * Walk through all properties and convert them into
-               * getter/setters. This method should only be called when
-               * value type is Object.
-               */
-              var keys = Object.keys(value);
-              for (var i = 0; i < keys.length; i++) {
-                  var key = keys[i];
-                  defineReactive(value, key, NO_INIITIAL_VALUE, undefined, shallow, mock);
-              }
-          }
-      }
-      /**
-       * Observe a list of Array items.
-       */
-      Observer.prototype.observeArray = function (value) {
-          for (var i = 0, l = value.length; i < l; i++) {
-              observe(value[i], false, this.mock);
-          }
-      };
-      return Observer;
-  }());
-  // helpers
-  /**
-   * Attempt to create an observer instance for a value,
-   * returns the new observer if successfully observed,
-   * or the existing observer if the value already has one.
-   */
-  function observe(value, shallow, ssrMockReactivity) {
-      if (value && hasOwn(value, '__ob__') && value.__ob__ instanceof Observer) {
-          return value.__ob__;
-      }
-      if (shouldObserve &&
-          (ssrMockReactivity || !isServerRendering()) &&
-          (isArray(value) || isPlainObject(value)) &&
-          Object.isExtensible(value) &&
-          !value.__v_skip /* ReactiveFlags.SKIP */ &&
-          !rawMap.has(value) &&
-          !isRef(value) &&
-          !(value instanceof VNode)) {
-          return new Observer(value, shallow, ssrMockReactivity);
-      }
-  }
-  /**
-   * Define a reactive property on an Object.
-   */
-  function defineReactive(obj, key, val, customSetter, shallow, mock) {
-      var dep = new Dep();
-      var property = Object.getOwnPropertyDescriptor(obj, key);
-      if (property && property.configurable === false) {
-          return;
-      }
-      // cater for pre-defined getter/setters
-      var getter = property && property.get;
-      var setter = property && property.set;
-      if ((!getter || setter) &&
-          (val === NO_INIITIAL_VALUE || arguments.length === 2)) {
-          val = obj[key];
-      }
-      var childOb = !shallow && observe(val, false, mock);
-      Object.defineProperty(obj, key, {
-          enumerable: true,
-          configurable: true,
-          get: function reactiveGetter() {
-              var value = getter ? getter.call(obj) : val;
-              if (Dep.target) {
-                  {
-                      dep.depend({
-                          target: obj,
-                          type: "get" /* TrackOpTypes.GET */,
-                          key: key
-                      });
-                  }
-                  if (childOb) {
-                      childOb.dep.depend();
-                      if (isArray(value)) {
-                          dependArray(value);
-                      }
-                  }
-              }
-              return isRef(value) && !shallow ? value.value : value;
-          },
-          set: function reactiveSetter(newVal) {
-              var value = getter ? getter.call(obj) : val;
-              if (!hasChanged(value, newVal)) {
-                  return;
-              }
-              if (customSetter) {
-                  customSetter();
-              }
-              if (setter) {
-                  setter.call(obj, newVal);
-              }
-              else if (getter) {
-                  // #7981: for accessor properties without setter
-                  return;
-              }
-              else if (!shallow && isRef(value) && !isRef(newVal)) {
-                  value.value = newVal;
-                  return;
-              }
-              else {
-                  val = newVal;
-              }
-              childOb = !shallow && observe(newVal, false, mock);
-              {
-                  dep.notify({
-                      type: "set" /* TriggerOpTypes.SET */,
-                      target: obj,
-                      key: key,
-                      newValue: newVal,
-                      oldValue: value
-                  });
-              }
-          }
-      });
-      return dep;
-  }
-  function set(target, key, val) {
-      if ((isUndef(target) || isPrimitive(target))) {
-          warn$2("Cannot set reactive property on undefined, null, or primitive value: ".concat(target));
-      }
-      if (isReadonly(target)) {
-          warn$2("Set operation on key \"".concat(key, "\" failed: target is readonly."));
-          return;
-      }
-      var ob = target.__ob__;
-      if (isArray(target) && isValidArrayIndex(key)) {
-          target.length = Math.max(target.length, key);
-          target.splice(key, 1, val);
-          // when mocking for SSR, array methods are not hijacked
-          if (ob && !ob.shallow && ob.mock) {
-              observe(val, false, true);
-          }
-          return val;
-      }
-      if (key in target && !(key in Object.prototype)) {
-          target[key] = val;
-          return val;
-      }
-      if (target._isVue || (ob && ob.vmCount)) {
-          warn$2('Avoid adding reactive properties to a Vue instance or its root $data ' +
-                  'at runtime - declare it upfront in the data option.');
-          return val;
-      }
-      if (!ob) {
-          target[key] = val;
-          return val;
-      }
-      defineReactive(ob.value, key, val, undefined, ob.shallow, ob.mock);
-      {
-          ob.dep.notify({
-              type: "add" /* TriggerOpTypes.ADD */,
-              target: target,
-              key: key,
-              newValue: val,
-              oldValue: undefined
-          });
-      }
-      return val;
-  }
-  function del(target, key) {
-      if ((isUndef(target) || isPrimitive(target))) {
-          warn$2("Cannot delete reactive property on undefined, null, or primitive value: ".concat(target));
-      }
-      if (isArray(target) && isValidArrayIndex(key)) {
-          target.splice(key, 1);
-          return;
-      }
-      var ob = target.__ob__;
-      if (target._isVue || (ob && ob.vmCount)) {
-          warn$2('Avoid deleting properties on a Vue instance or its root $data ' +
-                  '- just set it to null.');
-          return;
-      }
-      if (isReadonly(target)) {
-          warn$2("Delete operation on key \"".concat(key, "\" failed: target is readonly."));
-          return;
-      }
-      if (!hasOwn(target, key)) {
-          return;
-      }
-      delete target[key];
-      if (!ob) {
-          return;
-      }
-      {
-          ob.dep.notify({
-              type: "delete" /* TriggerOpTypes.DELETE */,
-              target: target,
-              key: key
-          });
-      }
-  }
-  /**
-   * Collect dependencies on array elements when the array is touched, since
-   * we cannot intercept array element access like property getters.
-   */
-  function dependArray(value) {
-      for (var e = void 0, i = 0, l = value.length; i < l; i++) {
-          e = value[i];
-          if (e && e.__ob__) {
-              e.__ob__.dep.depend();
-          }
-          if (isArray(e)) {
-              dependArray(e);
-          }
-      }
-  }
-
-  /**
-   * @internal
-   */
-  var RefFlag = "__v_isRef";
-  function isRef(r) {
-      return !!(r && r.__v_isRef === true);
-  }
-  function ref$1(value) {
-      return createRef(value, false);
-  }
-  function shallowRef(value) {
-      return createRef(value, true);
-  }
-  function createRef(rawValue, shallow) {
-      if (isRef(rawValue)) {
-          return rawValue;
-      }
-      var ref = {};
-      def(ref, RefFlag, true);
-      def(ref, "__v_isShallow" /* ReactiveFlags.IS_SHALLOW */, shallow);
-      def(ref, 'dep', defineReactive(ref, 'value', rawValue, null, shallow, isServerRendering()));
-      return ref;
-  }
-  function triggerRef(ref) {
-      if (!ref.dep) {
-          warn$2("received object is not a triggerable ref.");
-      }
-      {
-          ref.dep &&
-              ref.dep.notify({
-                  type: "set" /* TriggerOpTypes.SET */,
-                  target: ref,
-                  key: 'value'
-              });
-      }
-  }
-  function unref(ref) {
-      return isRef(ref) ? ref.value : ref;
-  }
-  function proxyRefs(objectWithRefs) {
-      if (isReactive(objectWithRefs)) {
-          return objectWithRefs;
-      }
-      var proxy = {};
-      var keys = Object.keys(objectWithRefs);
-      for (var i = 0; i < keys.length; i++) {
-          proxyWithRefUnwrap(proxy, objectWithRefs, keys[i]);
-      }
-      return proxy;
-  }
-  function proxyWithRefUnwrap(target, source, key) {
-      Object.defineProperty(target, key, {
-          enumerable: true,
-          configurable: true,
-          get: function () {
-              var val = source[key];
-              if (isRef(val)) {
-                  return val.value;
-              }
-              else {
-                  var ob = val && val.__ob__;
-                  if (ob)
-                      ob.dep.depend();
-                  return val;
-              }
-          },
-          set: function (value) {
-              var oldValue = source[key];
-              if (isRef(oldValue) && !isRef(value)) {
-                  oldValue.value = value;
-              }
-              else {
-                  source[key] = value;
-              }
-          }
-      });
-  }
-  function customRef(factory) {
-      var dep = new Dep();
-      var _a = factory(function () {
-          {
-              dep.depend({
-                  target: ref,
-                  type: "get" /* TrackOpTypes.GET */,
-                  key: 'value'
-              });
-          }
-      }, function () {
-          {
-              dep.notify({
-                  target: ref,
-                  type: "set" /* TriggerOpTypes.SET */,
-                  key: 'value'
-              });
-          }
-      }), get = _a.get, set = _a.set;
-      var ref = {
-          get value() {
-              return get();
-          },
-          set value(newVal) {
-              set(newVal);
-          }
-      };
-      def(ref, RefFlag, true);
-      return ref;
-  }
-  function toRefs(object) {
-      if (!isReactive(object)) {
-          warn$2("toRefs() expects a reactive object but received a plain one.");
-      }
-      var ret = isArray(object) ? new Array(object.length) : {};
-      for (var key in object) {
-          ret[key] = toRef(object, key);
-      }
-      return ret;
-  }
-  function toRef(object, key, defaultValue) {
-      var val = object[key];
-      if (isRef(val)) {
-          return val;
-      }
-      var ref = {
-          get value() {
-              var val = object[key];
-              return val === undefined ? defaultValue : val;
-          },
-          set value(newVal) {
-              object[key] = newVal;
-          }
-      };
-      def(ref, RefFlag, true);
-      return ref;
-  }
-
-  var rawToReadonlyMap = new WeakMap();
-  var rawToShallowReadonlyMap = new WeakMap();
-  function readonly(target) {
-      return createReadonly(target, false);
-  }
-  function createReadonly(target, shallow) {
-      if (!isPlainObject(target)) {
-          {
-              if (isArray(target)) {
-                  warn$2("Vue 2 does not support readonly arrays.");
-              }
-              else if (isCollectionType(target)) {
-                  warn$2("Vue 2 does not support readonly collection types such as Map or Set.");
-              }
-              else {
-                  warn$2("value cannot be made readonly: ".concat(typeof target));
-              }
-          }
-          return target;
-      }
-      // already a readonly object
-      if (isReadonly(target)) {
-          return target;
-      }
-      // already has a readonly proxy
-      var map = shallow ? rawToShallowReadonlyMap : rawToReadonlyMap;
-      var existingProxy = map.get(target);
-      if (existingProxy) {
-          return existingProxy;
-      }
-      var proxy = Object.create(Object.getPrototypeOf(target));
-      map.set(target, proxy);
-      def(proxy, "__v_isReadonly" /* ReactiveFlags.IS_READONLY */, true);
-      def(proxy, "__v_raw" /* ReactiveFlags.RAW */, target);
-      if (isRef(target)) {
-          def(proxy, RefFlag, true);
-      }
-      if (shallow || isShallow(target)) {
-          def(proxy, "__v_isShallow" /* ReactiveFlags.IS_SHALLOW */, true);
-      }
-      var keys = Object.keys(target);
-      for (var i = 0; i < keys.length; i++) {
-          defineReadonlyProperty(proxy, target, keys[i], shallow);
-      }
-      return proxy;
-  }
-  function defineReadonlyProperty(proxy, target, key, shallow) {
-      Object.defineProperty(proxy, key, {
-          enumerable: true,
-          configurable: true,
-          get: function () {
-              var val = target[key];
-              return shallow || !isPlainObject(val) ? val : readonly(val);
-          },
-          set: function () {
-              warn$2("Set operation on key \"".concat(key, "\" failed: target is readonly."));
-          }
-      });
-  }
-  /**
-   * Returns a reactive-copy of the original object, where only the root level
-   * properties are readonly, and does NOT unwrap refs nor recursively convert
-   * returned properties.
-   * This is used for creating the props proxy object for stateful components.
-   */
-  function shallowReadonly(target) {
-      return createReadonly(target, true);
-  }
-
-  function computed(getterOrOptions, debugOptions) {
-      var getter;
-      var setter;
-      var onlyGetter = isFunction(getterOrOptions);
-      if (onlyGetter) {
-          getter = getterOrOptions;
-          setter = function () {
-                  warn$2('Write operation failed: computed value is readonly');
-              }
-              ;
-      }
-      else {
-          getter = getterOrOptions.get;
-          setter = getterOrOptions.set;
-      }
-      var watcher = isServerRendering()
-          ? null
-          : new Watcher(currentInstance, getter, noop, { lazy: true });
-      if (watcher && debugOptions) {
-          watcher.onTrack = debugOptions.onTrack;
-          watcher.onTrigger = debugOptions.onTrigger;
-      }
-      var ref = {
-          // some libs rely on the presence effect for checking computed refs
-          // from normal refs, but the implementation doesn't matter
-          effect: watcher,
-          get value() {
-              if (watcher) {
-                  if (watcher.dirty) {
-                      watcher.evaluate();
-                  }
-                  if (Dep.target) {
-                      if (Dep.target.onTrack) {
-                          Dep.target.onTrack({
-                              effect: Dep.target,
-                              target: ref,
-                              type: "get" /* TrackOpTypes.GET */,
-                              key: 'value'
-                          });
-                      }
-                      watcher.depend();
-                  }
-                  return watcher.value;
-              }
-              else {
-                  return getter();
-              }
-          },
-          set value(newVal) {
-              setter(newVal);
-          }
-      };
-      def(ref, RefFlag, true);
-      def(ref, "__v_isReadonly" /* ReactiveFlags.IS_READONLY */, onlyGetter);
-      return ref;
-  }
-
-  var mark;
-  var measure;
-  {
-      var perf_1 = inBrowser && window.performance;
-      /* istanbul ignore if */
-      if (perf_1 &&
-          // @ts-ignore
-          perf_1.mark &&
-          // @ts-ignore
-          perf_1.measure &&
-          // @ts-ignore
-          perf_1.clearMarks &&
-          // @ts-ignore
-          perf_1.clearMeasures) {
-          mark = function (tag) { return perf_1.mark(tag); };
-          measure = function (name, startTag, endTag) {
-              perf_1.measure(name, startTag, endTag);
-              perf_1.clearMarks(startTag);
-              perf_1.clearMarks(endTag);
-              // perf.clearMeasures(name)
-          };
-      }
-  }
-
-  var normalizeEvent = cached(function (name) {
-      var passive = name.charAt(0) === '&';
-      name = passive ? name.slice(1) : name;
-      var once = name.charAt(0) === '~'; // Prefixed last, checked first
-      name = once ? name.slice(1) : name;
-      var capture = name.charAt(0) === '!';
-      name = capture ? name.slice(1) : name;
-      return {
-          name: name,
-          once: once,
-          capture: capture,
-          passive: passive
-      };
-  });
-  function createFnInvoker(fns, vm) {
-      function invoker() {
-          var fns = invoker.fns;
-          if (isArray(fns)) {
-              var cloned = fns.slice();
-              for (var i = 0; i < cloned.length; i++) {
-                  invokeWithErrorHandling(cloned[i], null, arguments, vm, "v-on handler");
-              }
-          }
-          else {
-              // return handler return value for single handlers
-              return invokeWithErrorHandling(fns, null, arguments, vm, "v-on handler");
-          }
-      }
-      invoker.fns = fns;
-      return invoker;
-  }
-  function updateListeners(on, oldOn, add, remove, createOnceHandler, vm) {
-      var name, cur, old, event;
-      for (name in on) {
-          cur = on[name];
-          old = oldOn[name];
-          event = normalizeEvent(name);
-          if (isUndef(cur)) {
-              warn$2("Invalid handler for event \"".concat(event.name, "\": got ") + String(cur), vm);
-          }
-          else if (isUndef(old)) {
-              if (isUndef(cur.fns)) {
-                  cur = on[name] = createFnInvoker(cur, vm);
-              }
-              if (isTrue(event.once)) {
-                  cur = on[name] = createOnceHandler(event.name, cur, event.capture);
-              }
-              add(event.name, cur, event.capture, event.passive, event.params);
-          }
-          else if (cur !== old) {
-              old.fns = cur;
-              on[name] = old;
-          }
-      }
-      for (name in oldOn) {
-          if (isUndef(on[name])) {
-              event = normalizeEvent(name);
-              remove(event.name, oldOn[name], event.capture);
-          }
-      }
-  }
-
-  function mergeVNodeHook(def, hookKey, hook) {
-      if (def instanceof VNode) {
-          def = def.data.hook || (def.data.hook = {});
-      }
-      var invoker;
-      var oldHook = def[hookKey];
-      function wrappedHook() {
-          hook.apply(this, arguments);
-          // important: remove merged hook to ensure it's called only once
-          // and prevent memory leak
-          remove$2(invoker.fns, wrappedHook);
-      }
-      if (isUndef(oldHook)) {
-          // no existing hook
-          invoker = createFnInvoker([wrappedHook]);
-      }
-      else {
-          /* istanbul ignore if */
-          if (isDef(oldHook.fns) && isTrue(oldHook.merged)) {
-              // already a merged invoker
-              invoker = oldHook;
-              invoker.fns.push(wrappedHook);
-          }
-          else {
-              // existing plain hook
-              invoker = createFnInvoker([oldHook, wrappedHook]);
-          }
-      }
-      invoker.merged = true;
-      def[hookKey] = invoker;
-  }
-
-  function extractPropsFromVNodeData(data, Ctor, tag) {
-      // we are only extracting raw values here.
-      // validation and default values are handled in the child
-      // component itself.
-      var propOptions = Ctor.options.props;
-      if (isUndef(propOptions)) {
-          return;
-      }
-      var res = {};
-      var attrs = data.attrs, props = data.props;
-      if (isDef(attrs) || isDef(props)) {
-          for (var key in propOptions) {
-              var altKey = hyphenate(key);
-              {
-                  var keyInLowerCase = key.toLowerCase();
-                  if (key !== keyInLowerCase && attrs && hasOwn(attrs, keyInLowerCase)) {
-                      tip("Prop \"".concat(keyInLowerCase, "\" is passed to component ") +
-                          "".concat(formatComponentName(
-                          // @ts-expect-error tag is string
-                          tag || Ctor), ", but the declared prop name is") +
-                          " \"".concat(key, "\". ") +
-                          "Note that HTML attributes are case-insensitive and camelCased " +
-                          "props need to use their kebab-case equivalents when using in-DOM " +
-                          "templates. You should probably use \"".concat(altKey, "\" instead of \"").concat(key, "\"."));
-                  }
-              }
-              checkProp(res, props, key, altKey, true) ||
-                  checkProp(res, attrs, key, altKey, false);
-          }
-      }
-      return res;
-  }
-  function checkProp(res, hash, key, altKey, preserve) {
-      if (isDef(hash)) {
-          if (hasOwn(hash, key)) {
-              res[key] = hash[key];
-              if (!preserve) {
-                  delete hash[key];
-              }
-              return true;
-          }
-          else if (hasOwn(hash, altKey)) {
-              res[key] = hash[altKey];
-              if (!preserve) {
-                  delete hash[altKey];
-              }
-              return true;
-          }
-      }
-      return false;
-  }
-
-  // The template compiler attempts to minimize the need for normalization by
-  // statically analyzing the template at compile time.
-  //
-  // For plain HTML markup, normalization can be completely skipped because the
-  // generated render function is guaranteed to return Array<VNode>. There are
-  // two cases where extra normalization is needed:
-  // 1. When the children contains components - because a functional component
-  // may return an Array instead of a single root. In this case, just a simple
-  // normalization is needed - if any child is an Array, we flatten the whole
-  // thing with Array.prototype.concat. It is guaranteed to be only 1-level deep
-  // because functional components already normalize their own children.
-  function simpleNormalizeChildren(children) {
-      for (var i = 0; i < children.length; i++) {
-          if (isArray(children[i])) {
-              return Array.prototype.concat.apply([], children);
-          }
-      }
-      return children;
-  }
-  // 2. When the children contains constructs that always generated nested Arrays,
-  // e.g. <template>, <slot>, v-for, or when the children is provided by user
-  // with hand-written render functions / JSX. In such cases a full normalization
-  // is needed to cater to all possible types of children values.
-  function normalizeChildren(children) {
-      return isPrimitive(children)
-          ? [createTextVNode(children)]
-          : isArray(children)
-              ? normalizeArrayChildren(children)
-              : undefined;
-  }
-  function isTextNode(node) {
-      return isDef(node) && isDef(node.text) && isFalse(node.isComment);
-  }
-  function normalizeArrayChildren(children, nestedIndex) {
-      var res = [];
-      var i, c, lastIndex, last;
-      for (i = 0; i < children.length; i++) {
-          c = children[i];
-          if (isUndef(c) || typeof c === 'boolean')
-              continue;
-          lastIndex = res.length - 1;
-          last = res[lastIndex];
-          //  nested
-          if (isArray(c)) {
-              if (c.length > 0) {
-                  c = normalizeArrayChildren(c, "".concat(nestedIndex || '', "_").concat(i));
-                  // merge adjacent text nodes
-                  if (isTextNode(c[0]) && isTextNode(last)) {
-                      res[lastIndex] = createTextVNode(last.text + c[0].text);
-                      c.shift();
-                  }
-                  res.push.apply(res, c);
-              }
-          }
-          else if (isPrimitive(c)) {
-              if (isTextNode(last)) {
-                  // merge adjacent text nodes
-                  // this is necessary for SSR hydration because text nodes are
-                  // essentially merged when rendered to HTML strings
-                  res[lastIndex] = createTextVNode(last.text + c);
-              }
-              else if (c !== '') {
-                  // convert primitive to vnode
-                  res.push(createTextVNode(c));
-              }
-          }
-          else {
-              if (isTextNode(c) && isTextNode(last)) {
-                  // merge adjacent text nodes
-                  res[lastIndex] = createTextVNode(last.text + c.text);
-              }
-              else {
-                  // default key for nested array children (likely generated by v-for)
-                  if (isTrue(children._isVList) &&
-                      isDef(c.tag) &&
-                      isUndef(c.key) &&
-                      isDef(nestedIndex)) {
-                      c.key = "__vlist".concat(nestedIndex, "_").concat(i, "__");
-                  }
-                  res.push(c);
-              }
-          }
-      }
-      return res;
-  }
-
-  var SIMPLE_NORMALIZE = 1;
-  var ALWAYS_NORMALIZE = 2;
-  // wrapper function for providing a more flexible interface
-  // without getting yelled at by flow
-  function createElement$1(context, tag, data, children, normalizationType, alwaysNormalize) {
-      if (isArray(data) || isPrimitive(data)) {
-          normalizationType = children;
-          children = data;
-          data = undefined;
-      }
-      if (isTrue(alwaysNormalize)) {
-          normalizationType = ALWAYS_NORMALIZE;
-      }
-      return _createElement(context, tag, data, children, normalizationType);
-  }
-  function _createElement(context, tag, data, children, normalizationType) {
-      if (isDef(data) && isDef(data.__ob__)) {
-          warn$2("Avoid using observed data object as vnode data: ".concat(JSON.stringify(data), "\n") + 'Always create fresh vnode data objects in each render!', context);
-          return createEmptyVNode();
-      }
-      // object syntax in v-bind
-      if (isDef(data) && isDef(data.is)) {
-          tag = data.is;
-      }
-      if (!tag) {
-          // in case of component :is set to falsy value
-          return createEmptyVNode();
-      }
-      // warn against non-primitive key
-      if (isDef(data) && isDef(data.key) && !isPrimitive(data.key)) {
-          warn$2('Avoid using non-primitive value as key, ' +
-              'use string/number value instead.', context);
-      }
-      // support single function children as default scoped slot
-      if (isArray(children) && isFunction(children[0])) {
-          data = data || {};
-          data.scopedSlots = { default: children[0] };
-          children.length = 0;
-      }
-      if (normalizationType === ALWAYS_NORMALIZE) {
-          children = normalizeChildren(children);
-      }
-      else if (normalizationType === SIMPLE_NORMALIZE) {
-          children = simpleNormalizeChildren(children);
-      }
-      var vnode, ns;
-      if (typeof tag === 'string') {
-          var Ctor = void 0;
-          ns = (context.$vnode && context.$vnode.ns) || config.getTagNamespace(tag);
-          if (config.isReservedTag(tag)) {
-              // platform built-in elements
-              if (isDef(data) &&
-                  isDef(data.nativeOn) &&
-                  data.tag !== 'component') {
-                  warn$2("The .native modifier for v-on is only valid on components but it was used on <".concat(tag, ">."), context);
-              }
-              vnode = new VNode(config.parsePlatformTagName(tag), data, children, undefined, undefined, context);
-          }
-          else if ((!data || !data.pre) &&
-              isDef((Ctor = resolveAsset(context.$options, 'components', tag)))) {
-              // component
-              vnode = createComponent(Ctor, data, context, children, tag);
-          }
-          else {
-              // unknown or unlisted namespaced elements
-              // check at runtime because it may get assigned a namespace when its
-              // parent normalizes children
-              vnode = new VNode(tag, data, children, undefined, undefined, context);
-          }
-      }
-      else {
-          // direct component options / constructor
-          vnode = createComponent(tag, data, context, children);
-      }
-      if (isArray(vnode)) {
-          return vnode;
-      }
-      else if (isDef(vnode)) {
-          if (isDef(ns))
-              applyNS(vnode, ns);
-          if (isDef(data))
-              registerDeepBindings(data);
-          return vnode;
-      }
-      else {
-          return createEmptyVNode();
-      }
-  }
-  function applyNS(vnode, ns, force) {
-      vnode.ns = ns;
-      if (vnode.tag === 'foreignObject') {
-          // use default namespace inside foreignObject
-          ns = undefined;
-          force = true;
-      }
-      if (isDef(vnode.children)) {
-          for (var i = 0, l = vnode.children.length; i < l; i++) {
-              var child = vnode.children[i];
-              if (isDef(child.tag) &&
-                  (isUndef(child.ns) || (isTrue(force) && child.tag !== 'svg'))) {
-                  applyNS(child, ns, force);
-              }
-          }
-      }
-  }
-  // ref #5318
-  // necessary to ensure parent re-render when deep bindings like :style and
-  // :class are used on slot nodes
-  function registerDeepBindings(data) {
-      if (isObject(data.style)) {
-          traverse(data.style);
-      }
-      if (isObject(data.class)) {
-          traverse(data.class);
-      }
-  }
-
-  /**
-   * Runtime helper for rendering v-for lists.
-   */
-  function renderList(val, render) {
-      var ret = null, i, l, keys, key;
-      if (isArray(val) || typeof val === 'string') {
-          ret = new Array(val.length);
-          for (i = 0, l = val.length; i < l; i++) {
-              ret[i] = render(val[i], i);
-          }
-      }
-      else if (typeof val === 'number') {
-          ret = new Array(val);
-          for (i = 0; i < val; i++) {
-              ret[i] = render(i + 1, i);
-          }
-      }
-      else if (isObject(val)) {
-          if (hasSymbol && val[Symbol.iterator]) {
-              ret = [];
-              var iterator = val[Symbol.iterator]();
-              var result = iterator.next();
-              while (!result.done) {
-                  ret.push(render(result.value, ret.length));
-                  result = iterator.next();
-              }
-          }
-          else {
-              keys = Object.keys(val);
-              ret = new Array(keys.length);
-              for (i = 0, l = keys.length; i < l; i++) {
-                  key = keys[i];
-                  ret[i] = render(val[key], key, i);
-              }
-          }
-      }
-      if (!isDef(ret)) {
-          ret = [];
-      }
-      ret._isVList = true;
-      return ret;
-  }
-
-  /**
-   * Runtime helper for rendering <slot>
-   */
-  function renderSlot(name, fallbackRender, props, bindObject) {
-      var scopedSlotFn = this.$scopedSlots[name];
-      var nodes;
-      if (scopedSlotFn) {
-          // scoped slot
-          props = props || {};
-          if (bindObject) {
-              if (!isObject(bindObject)) {
-                  warn$2('slot v-bind without argument expects an Object', this);
-              }
-              props = extend(extend({}, bindObject), props);
-          }
-          nodes =
-              scopedSlotFn(props) ||
-                  (isFunction(fallbackRender) ? fallbackRender() : fallbackRender);
-      }
-      else {
-          nodes =
-              this.$slots[name] ||
-                  (isFunction(fallbackRender) ? fallbackRender() : fallbackRender);
-      }
-      var target = props && props.slot;
-      if (target) {
-          return this.$createElement('template', { slot: target }, nodes);
-      }
-      else {
-          return nodes;
-      }
-  }
-
-  /**
-   * Runtime helper for resolving filters
-   */
-  function resolveFilter(id) {
-      return resolveAsset(this.$options, 'filters', id, true) || identity;
-  }
-
-  function isKeyNotMatch(expect, actual) {
-      if (isArray(expect)) {
-          return expect.indexOf(actual) === -1;
-      }
-      else {
-          return expect !== actual;
-      }
-  }
-  /**
-   * Runtime helper for checking keyCodes from config.
-   * exposed as Vue.prototype._k
-   * passing in eventKeyName as last argument separately for backwards compat
-   */
-  function checkKeyCodes(eventKeyCode, key, builtInKeyCode, eventKeyName, builtInKeyName) {
-      var mappedKeyCode = config.keyCodes[key] || builtInKeyCode;
-      if (builtInKeyName && eventKeyName && !config.keyCodes[key]) {
-          return isKeyNotMatch(builtInKeyName, eventKeyName);
-      }
-      else if (mappedKeyCode) {
-          return isKeyNotMatch(mappedKeyCode, eventKeyCode);
-      }
-      else if (eventKeyName) {
-          return hyphenate(eventKeyName) !== key;
-      }
-      return eventKeyCode === undefined;
-  }
-
-  /**
-   * Runtime helper for merging v-bind="object" into a VNode's data.
-   */
-  function bindObjectProps(data, tag, value, asProp, isSync) {
-      if (value) {
-          if (!isObject(value)) {
-              warn$2('v-bind without argument expects an Object or Array value', this);
-          }
-          else {
-              if (isArray(value)) {
-                  value = toObject(value);
-              }
-              var hash = void 0;
-              var _loop_1 = function (key) {
-                  if (key === 'class' || key === 'style' || isReservedAttribute(key)) {
-                      hash = data;
-                  }
-                  else {
-                      var type = data.attrs && data.attrs.type;
-                      hash =
-                          asProp || config.mustUseProp(tag, type, key)
-                              ? data.domProps || (data.domProps = {})
-                              : data.attrs || (data.attrs = {});
-                  }
-                  var camelizedKey = camelize(key);
-                  var hyphenatedKey = hyphenate(key);
-                  if (!(camelizedKey in hash) && !(hyphenatedKey in hash)) {
-                      hash[key] = value[key];
-                      if (isSync) {
-                          var on = data.on || (data.on = {});
-                          on["update:".concat(key)] = function ($event) {
-                              value[key] = $event;
-                          };
-                      }
-                  }
-              };
-              for (var key in value) {
-                  _loop_1(key);
-              }
-          }
-      }
-      return data;
-  }
-
-  /**
-   * Runtime helper for rendering static trees.
-   */
-  function renderStatic(index, isInFor) {
-      var cached = this._staticTrees || (this._staticTrees = []);
-      var tree = cached[index];
-      // if has already-rendered static tree and not inside v-for,
-      // we can reuse the same tree.
-      if (tree && !isInFor) {
-          return tree;
-      }
-      // otherwise, render a fresh tree.
-      tree = cached[index] = this.$options.staticRenderFns[index].call(this._renderProxy, this._c, this // for render fns generated for functional component templates
-      );
-      markStatic$1(tree, "__static__".concat(index), false);
-      return tree;
-  }
-  /**
-   * Runtime helper for v-once.
-   * Effectively it means marking the node as static with a unique key.
-   */
-  function markOnce(tree, index, key) {
-      markStatic$1(tree, "__once__".concat(index).concat(key ? "_".concat(key) : ""), true);
-      return tree;
-  }
-  function markStatic$1(tree, key, isOnce) {
-      if (isArray(tree)) {
-          for (var i = 0; i < tree.length; i++) {
-              if (tree[i] && typeof tree[i] !== 'string') {
-                  markStaticNode(tree[i], "".concat(key, "_").concat(i), isOnce);
-              }
-          }
-      }
-      else {
-          markStaticNode(tree, key, isOnce);
-      }
-  }
-  function markStaticNode(node, key, isOnce) {
-      node.isStatic = true;
-      node.key = key;
-      node.isOnce = isOnce;
-  }
-
-  function bindObjectListeners(data, value) {
-      if (value) {
-          if (!isPlainObject(value)) {
-              warn$2('v-on without argument expects an Object value', this);
-          }
-          else {
-              var on = (data.on = data.on ? extend({}, data.on) : {});
-              for (var key in value) {
-                  var existing = on[key];
-                  var ours = value[key];
-                  on[key] = existing ? [].concat(existing, ours) : ours;
-              }
-          }
-      }
-      return data;
-  }
-
-  function resolveScopedSlots(fns, res, 
-  // the following are added in 2.6
-  hasDynamicKeys, contentHashKey) {
-      res = res || { $stable: !hasDynamicKeys };
-      for (var i = 0; i < fns.length; i++) {
-          var slot = fns[i];
-          if (isArray(slot)) {
-              resolveScopedSlots(slot, res, hasDynamicKeys);
-          }
-          else if (slot) {
-              // marker for reverse proxying v-slot without scope on this.$slots
-              // @ts-expect-error
-              if (slot.proxy) {
-                  // @ts-expect-error
-                  slot.fn.proxy = true;
-              }
-              res[slot.key] = slot.fn;
-          }
-      }
-      if (contentHashKey) {
-          res.$key = contentHashKey;
-      }
-      return res;
-  }
-
-  // helper to process dynamic keys for dynamic arguments in v-bind and v-on.
-  function bindDynamicKeys(baseObj, values) {
-      for (var i = 0; i < values.length; i += 2) {
-          var key = values[i];
-          if (typeof key === 'string' && key) {
-              baseObj[values[i]] = values[i + 1];
-          }
-          else if (key !== '' && key !== null) {
-              // null is a special value for explicitly removing a binding
-              warn$2("Invalid value for dynamic directive argument (expected string or null): ".concat(key), this);
-          }
-      }
-      return baseObj;
-  }
-  // helper to dynamically append modifier runtime markers to event names.
-  // ensure only append when value is already string, otherwise it will be cast
-  // to string and cause the type check to miss.
-  function prependModifier(value, symbol) {
-      return typeof value === 'string' ? symbol + value : value;
-  }
-
-  function installRenderHelpers(target) {
-      target._o = markOnce;
-      target._n = toNumber;
-      target._s = toString;
-      target._l = renderList;
-      target._t = renderSlot;
-      target._q = looseEqual;
-      target._i = looseIndexOf;
-      target._m = renderStatic;
-      target._f = resolveFilter;
-      target._k = checkKeyCodes;
-      target._b = bindObjectProps;
-      target._v = createTextVNode;
-      target._e = createEmptyVNode;
-      target._u = resolveScopedSlots;
-      target._g = bindObjectListeners;
-      target._d = bindDynamicKeys;
-      target._p = prependModifier;
-  }
-
-  /**
-   * Runtime helper for resolving raw children VNodes into a slot object.
-   */
-  function resolveSlots(children, context) {
-      if (!children || !children.length) {
-          return {};
-      }
-      var slots = {};
-      for (var i = 0, l = children.length; i < l; i++) {
-          var child = children[i];
-          var data = child.data;
-          // remove slot attribute if the node is resolved as a Vue slot node
-          if (data && data.attrs && data.attrs.slot) {
-              delete data.attrs.slot;
-          }
-          // named slots should only be respected if the vnode was rendered in the
-          // same context.
-          if ((child.context === context || child.fnContext === context) &&
-              data &&
-              data.slot != null) {
-              var name_1 = data.slot;
-              var slot = slots[name_1] || (slots[name_1] = []);
-              if (child.tag === 'template') {
-                  slot.push.apply(slot, child.children || []);
-              }
-              else {
-                  slot.push(child);
-              }
-          }
-          else {
-              (slots.default || (slots.default = [])).push(child);
-          }
-      }
-      // ignore slots that contains only whitespace
-      for (var name_2 in slots) {
-          if (slots[name_2].every(isWhitespace)) {
-              delete slots[name_2];
-          }
-      }
-      return slots;
-  }
-  function isWhitespace(node) {
-      return (node.isComment && !node.asyncFactory) || node.text === ' ';
-  }
-
-  function isAsyncPlaceholder(node) {
-      // @ts-expect-error not really boolean type
-      return node.isComment && node.asyncFactory;
-  }
-
-  function normalizeScopedSlots(ownerVm, scopedSlots, normalSlots, prevScopedSlots) {
-      var res;
-      var hasNormalSlots = Object.keys(normalSlots).length > 0;
-      var isStable = scopedSlots ? !!scopedSlots.$stable : !hasNormalSlots;
-      var key = scopedSlots && scopedSlots.$key;
-      if (!scopedSlots) {
-          res = {};
-      }
-      else if (scopedSlots._normalized) {
-          // fast path 1: child component re-render only, parent did not change
-          return scopedSlots._normalized;
-      }
-      else if (isStable &&
-          prevScopedSlots &&
-          prevScopedSlots !== emptyObject &&
-          key === prevScopedSlots.$key &&
-          !hasNormalSlots &&
-          !prevScopedSlots.$hasNormal) {
-          // fast path 2: stable scoped slots w/ no normal slots to proxy,
-          // only need to normalize once
-          return prevScopedSlots;
-      }
-      else {
-          res = {};
-          for (var key_1 in scopedSlots) {
-              if (scopedSlots[key_1] && key_1[0] !== '$') {
-                  res[key_1] = normalizeScopedSlot(ownerVm, normalSlots, key_1, scopedSlots[key_1]);
-              }
-          }
-      }
-      // expose normal slots on scopedSlots
-      for (var key_2 in normalSlots) {
-          if (!(key_2 in res)) {
-              res[key_2] = proxyNormalSlot(normalSlots, key_2);
-          }
-      }
-      // avoriaz seems to mock a non-extensible $scopedSlots object
-      // and when that is passed down this would cause an error
-      if (scopedSlots && Object.isExtensible(scopedSlots)) {
-          scopedSlots._normalized = res;
-      }
-      def(res, '$stable', isStable);
-      def(res, '$key', key);
-      def(res, '$hasNormal', hasNormalSlots);
-      return res;
-  }
-  function normalizeScopedSlot(vm, normalSlots, key, fn) {
-      var normalized = function () {
-          var cur = currentInstance;
-          setCurrentInstance(vm);
-          var res = arguments.length ? fn.apply(null, arguments) : fn({});
-          res =
-              res && typeof res === 'object' && !isArray(res)
-                  ? [res] // single vnode
-                  : normalizeChildren(res);
-          var vnode = res && res[0];
-          setCurrentInstance(cur);
-          return res &&
-              (!vnode ||
-                  (res.length === 1 && vnode.isComment && !isAsyncPlaceholder(vnode))) // #9658, #10391
-              ? undefined
-              : res;
-      };
-      // this is a slot using the new v-slot syntax without scope. although it is
-      // compiled as a scoped slot, render fn users would expect it to be present
-      // on this.$slots because the usage is semantically a normal slot.
-      if (fn.proxy) {
-          Object.defineProperty(normalSlots, key, {
-              get: normalized,
-              enumerable: true,
-              configurable: true
-          });
-      }
-      return normalized;
-  }
-  function proxyNormalSlot(slots, key) {
-      return function () { return slots[key]; };
-  }
-
-  function initSetup(vm) {
-      var options = vm.$options;
-      var setup = options.setup;
-      if (setup) {
-          var ctx = (vm._setupContext = createSetupContext(vm));
-          setCurrentInstance(vm);
-          pushTarget();
-          var setupResult = invokeWithErrorHandling(setup, null, [vm._props || shallowReactive({}), ctx], vm, "setup");
-          popTarget();
-          setCurrentInstance();
-          if (isFunction(setupResult)) {
-              // render function
-              // @ts-ignore
-              options.render = setupResult;
-          }
-          else if (isObject(setupResult)) {
-              // bindings
-              if (setupResult instanceof VNode) {
-                  warn$2("setup() should not return VNodes directly - " +
-                      "return a render function instead.");
-              }
-              vm._setupState = setupResult;
-              // __sfc indicates compiled bindings from <script setup>
-              if (!setupResult.__sfc) {
-                  for (var key in setupResult) {
-                      if (!isReserved(key)) {
-                          proxyWithRefUnwrap(vm, setupResult, key);
-                      }
-                      else {
-                          warn$2("Avoid using variables that start with _ or $ in setup().");
-                      }
-                  }
-              }
-              else {
-                  // exposed for compiled render fn
-                  var proxy = (vm._setupProxy = {});
-                  for (var key in setupResult) {
-                      if (key !== '__sfc') {
-                          proxyWithRefUnwrap(proxy, setupResult, key);
-                      }
-                  }
-              }
-          }
-          else if (setupResult !== undefined) {
-              warn$2("setup() should return an object. Received: ".concat(setupResult === null ? 'null' : typeof setupResult));
-          }
-      }
-  }
-  function createSetupContext(vm) {
-      var exposeCalled = false;
-      return {
-          get attrs() {
-              if (!vm._attrsProxy) {
-                  var proxy = (vm._attrsProxy = {});
-                  def(proxy, '_v_attr_proxy', true);
-                  syncSetupProxy(proxy, vm.$attrs, emptyObject, vm, '$attrs');
-              }
-              return vm._attrsProxy;
-          },
-          get listeners() {
-              if (!vm._listenersProxy) {
-                  var proxy = (vm._listenersProxy = {});
-                  syncSetupProxy(proxy, vm.$listeners, emptyObject, vm, '$listeners');
-              }
-              return vm._listenersProxy;
-          },
-          get slots() {
-              return initSlotsProxy(vm);
-          },
-          emit: bind$1(vm.$emit, vm),
-          expose: function (exposed) {
-              {
-                  if (exposeCalled) {
-                      warn$2("expose() should be called only once per setup().", vm);
-                  }
-                  exposeCalled = true;
-              }
-              if (exposed) {
-                  Object.keys(exposed).forEach(function (key) {
-                      return proxyWithRefUnwrap(vm, exposed, key);
-                  });
-              }
-          }
-      };
-  }
-  function syncSetupProxy(to, from, prev, instance, type) {
-      var changed = false;
-      for (var key in from) {
-          if (!(key in to)) {
-              changed = true;
-              defineProxyAttr(to, key, instance, type);
-          }
-          else if (from[key] !== prev[key]) {
-              changed = true;
-          }
-      }
-      for (var key in to) {
-          if (!(key in from)) {
-              changed = true;
-              delete to[key];
-          }
-      }
-      return changed;
-  }
-  function defineProxyAttr(proxy, key, instance, type) {
-      Object.defineProperty(proxy, key, {
-          enumerable: true,
-          configurable: true,
-          get: function () {
-              return instance[type][key];
-          }
-      });
-  }
-  function initSlotsProxy(vm) {
-      if (!vm._slotsProxy) {
-          syncSetupSlots((vm._slotsProxy = {}), vm.$scopedSlots);
-      }
-      return vm._slotsProxy;
-  }
-  function syncSetupSlots(to, from) {
-      for (var key in from) {
-          to[key] = from[key];
-      }
-      for (var key in to) {
-          if (!(key in from)) {
-              delete to[key];
-          }
-      }
-  }
-  /**
-   * @internal use manual type def because public setup context type relies on
-   * legacy VNode types
-   */
-  function useSlots() {
-      return getContext().slots;
-  }
-  /**
-   * @internal use manual type def because public setup context type relies on
-   * legacy VNode types
-   */
-  function useAttrs() {
-      return getContext().attrs;
-  }
-  /**
-   * Vue 2 only
-   * @internal use manual type def because public setup context type relies on
-   * legacy VNode types
-   */
-  function useListeners() {
-      return getContext().listeners;
-  }
-  function getContext() {
-      if (!currentInstance) {
-          warn$2("useContext() called without active instance.");
-      }
-      var vm = currentInstance;
-      return vm._setupContext || (vm._setupContext = createSetupContext(vm));
-  }
-  /**
-   * Runtime helper for merging default declarations. Imported by compiled code
-   * only.
-   * @internal
-   */
-  function mergeDefaults(raw, defaults) {
-      var props = isArray(raw)
-          ? raw.reduce(function (normalized, p) { return ((normalized[p] = {}), normalized); }, {})
-          : raw;
-      for (var key in defaults) {
-          var opt = props[key];
-          if (opt) {
-              if (isArray(opt) || isFunction(opt)) {
-                  props[key] = { type: opt, default: defaults[key] };
-              }
-              else {
-                  opt.default = defaults[key];
-              }
-          }
-          else if (opt === null) {
-              props[key] = { default: defaults[key] };
-          }
-          else {
-              warn$2("props default key \"".concat(key, "\" has no corresponding declaration."));
-          }
-      }
-      return props;
-  }
-
-  function initRender(vm) {
-      vm._vnode = null; // the root of the child tree
-      vm._staticTrees = null; // v-once cached trees
-      var options = vm.$options;
-      var parentVnode = (vm.$vnode = options._parentVnode); // the placeholder node in parent tree
-      var renderContext = parentVnode && parentVnode.context;
-      vm.$slots = resolveSlots(options._renderChildren, renderContext);
-      vm.$scopedSlots = parentVnode
-          ? normalizeScopedSlots(vm.$parent, parentVnode.data.scopedSlots, vm.$slots)
-          : emptyObject;
-      // bind the createElement fn to this instance
-      // so that we get proper render context inside it.
-      // args order: tag, data, children, normalizationType, alwaysNormalize
-      // internal version is used by render functions compiled from templates
-      // @ts-expect-error
-      vm._c = function (a, b, c, d) { return createElement$1(vm, a, b, c, d, false); };
-      // normalization is always applied for the public version, used in
-      // user-written render functions.
-      // @ts-expect-error
-      vm.$createElement = function (a, b, c, d) { return createElement$1(vm, a, b, c, d, true); };
-      // $attrs & $listeners are exposed for easier HOC creation.
-      // they need to be reactive so that HOCs using them are always updated
-      var parentData = parentVnode && parentVnode.data;
-      /* istanbul ignore else */
-      {
-          defineReactive(vm, '$attrs', (parentData && parentData.attrs) || emptyObject, function () {
-              !isUpdatingChildComponent && warn$2("$attrs is readonly.", vm);
-          }, true);
-          defineReactive(vm, '$listeners', options._parentListeners || emptyObject, function () {
-              !isUpdatingChildComponent && warn$2("$listeners is readonly.", vm);
-          }, true);
-      }
-  }
-  var currentRenderingInstance = null;
-  function renderMixin(Vue) {
-      // install runtime convenience helpers
-      installRenderHelpers(Vue.prototype);
-      Vue.prototype.$nextTick = function (fn) {
-          return nextTick(fn, this);
-      };
-      Vue.prototype._render = function () {
-          var vm = this;
-          var _a = vm.$options, render = _a.render, _parentVnode = _a._parentVnode;
-          if (_parentVnode && vm._isMounted) {
-              vm.$scopedSlots = normalizeScopedSlots(vm.$parent, _parentVnode.data.scopedSlots, vm.$slots, vm.$scopedSlots);
-              if (vm._slotsProxy) {
-                  syncSetupSlots(vm._slotsProxy, vm.$scopedSlots);
-              }
-          }
-          // set parent vnode. this allows render functions to have access
-          // to the data on the placeholder node.
-          vm.$vnode = _parentVnode;
-          // render self
-          var vnode;
-          try {
-              // There's no need to maintain a stack because all render fns are called
-              // separately from one another. Nested component's render fns are called
-              // when parent component is patched.
-              setCurrentInstance(vm);
-              currentRenderingInstance = vm;
-              vnode = render.call(vm._renderProxy, vm.$createElement);
-          }
-          catch (e) {
-              handleError(e, vm, "render");
-              // return error render result,
-              // or previous vnode to prevent render error causing blank component
-              /* istanbul ignore else */
-              if (vm.$options.renderError) {
-                  try {
-                      vnode = vm.$options.renderError.call(vm._renderProxy, vm.$createElement, e);
-                  }
-                  catch (e) {
-                      handleError(e, vm, "renderError");
-                      vnode = vm._vnode;
-                  }
-              }
-              else {
-                  vnode = vm._vnode;
-              }
-          }
-          finally {
-              currentRenderingInstance = null;
-              setCurrentInstance();
-          }
-          // if the returned array contains only a single node, allow it
-          if (isArray(vnode) && vnode.length === 1) {
-              vnode = vnode[0];
-          }
-          // return empty vnode in case the render function errored out
-          if (!(vnode instanceof VNode)) {
-              if (isArray(vnode)) {
-                  warn$2('Multiple root nodes returned from render function. Render function ' +
-                      'should return a single root node.', vm);
-              }
-              vnode = createEmptyVNode();
-          }
-          // set parent
-          vnode.parent = _parentVnode;
-          return vnode;
-      };
-  }
-
-  function ensureCtor(comp, base) {
-      if (comp.__esModule || (hasSymbol && comp[Symbol.toStringTag] === 'Module')) {
-          comp = comp.default;
-      }
-      return isObject(comp) ? base.extend(comp) : comp;
-  }
-  function createAsyncPlaceholder(factory, data, context, children, tag) {
-      var node = createEmptyVNode();
-      node.asyncFactory = factory;
-      node.asyncMeta = { data: data, context: context, children: children, tag: tag };
-      return node;
-  }
-  function resolveAsyncComponent(factory, baseCtor) {
-      if (isTrue(factory.error) && isDef(factory.errorComp)) {
-          return factory.errorComp;
-      }
-      if (isDef(factory.resolved)) {
-          return factory.resolved;
-      }
-      var owner = currentRenderingInstance;
-      if (owner && isDef(factory.owners) && factory.owners.indexOf(owner) === -1) {
-          // already pending
-          factory.owners.push(owner);
-      }
-      if (isTrue(factory.loading) && isDef(factory.loadingComp)) {
-          return factory.loadingComp;
-      }
-      if (owner && !isDef(factory.owners)) {
-          var owners_1 = (factory.owners = [owner]);
-          var sync_1 = true;
-          var timerLoading_1 = null;
-          var timerTimeout_1 = null;
-          owner.$on('hook:destroyed', function () { return remove$2(owners_1, owner); });
-          var forceRender_1 = function (renderCompleted) {
-              for (var i = 0, l = owners_1.length; i < l; i++) {
-                  owners_1[i].$forceUpdate();
-              }
-              if (renderCompleted) {
-                  owners_1.length = 0;
-                  if (timerLoading_1 !== null) {
-                      clearTimeout(timerLoading_1);
-                      timerLoading_1 = null;
-                  }
-                  if (timerTimeout_1 !== null) {
-                      clearTimeout(timerTimeout_1);
-                      timerTimeout_1 = null;
-                  }
-              }
-          };
-          var resolve = once(function (res) {
-              // cache resolved
-              factory.resolved = ensureCtor(res, baseCtor);
-              // invoke callbacks only if this is not a synchronous resolve
-              // (async resolves are shimmed as synchronous during SSR)
-              if (!sync_1) {
-                  forceRender_1(true);
-              }
-              else {
-                  owners_1.length = 0;
-              }
-          });
-          var reject_1 = once(function (reason) {
-              warn$2("Failed to resolve async component: ".concat(String(factory)) +
-                      (reason ? "\nReason: ".concat(reason) : ''));
-              if (isDef(factory.errorComp)) {
-                  factory.error = true;
-                  forceRender_1(true);
-              }
-          });
-          var res_1 = factory(resolve, reject_1);
-          if (isObject(res_1)) {
-              if (isPromise(res_1)) {
-                  // () => Promise
-                  if (isUndef(factory.resolved)) {
-                      res_1.then(resolve, reject_1);
-                  }
-              }
-              else if (isPromise(res_1.component)) {
-                  res_1.component.then(resolve, reject_1);
-                  if (isDef(res_1.error)) {
-                      factory.errorComp = ensureCtor(res_1.error, baseCtor);
-                  }
-                  if (isDef(res_1.loading)) {
-                      factory.loadingComp = ensureCtor(res_1.loading, baseCtor);
-                      if (res_1.delay === 0) {
-                          factory.loading = true;
-                      }
-                      else {
-                          // @ts-expect-error NodeJS timeout type
-                          timerLoading_1 = setTimeout(function () {
-                              timerLoading_1 = null;
-                              if (isUndef(factory.resolved) && isUndef(factory.error)) {
-                                  factory.loading = true;
-                                  forceRender_1(false);
-                              }
-                          }, res_1.delay || 200);
-                      }
-                  }
-                  if (isDef(res_1.timeout)) {
-                      // @ts-expect-error NodeJS timeout type
-                      timerTimeout_1 = setTimeout(function () {
-                          timerTimeout_1 = null;
-                          if (isUndef(factory.resolved)) {
-                              reject_1("timeout (".concat(res_1.timeout, "ms)") );
-                          }
-                      }, res_1.timeout);
-                  }
-              }
-          }
-          sync_1 = false;
-          // return in case resolved synchronously
-          return factory.loading ? factory.loadingComp : factory.resolved;
-      }
-  }
-
-  function getFirstComponentChild(children) {
-      if (isArray(children)) {
-          for (var i = 0; i < children.length; i++) {
-              var c = children[i];
-              if (isDef(c) && (isDef(c.componentOptions) || isAsyncPlaceholder(c))) {
-                  return c;
-              }
-          }
-      }
-  }
-
-  function initEvents(vm) {
-      vm._events = Object.create(null);
-      vm._hasHookEvent = false;
-      // init parent attached events
-      var listeners = vm.$options._parentListeners;
-      if (listeners) {
-          updateComponentListeners(vm, listeners);
-      }
-  }
-  var target$1;
-  function add$1(event, fn) {
-      target$1.$on(event, fn);
-  }
-  function remove$1(event, fn) {
-      target$1.$off(event, fn);
-  }
-  function createOnceHandler$1(event, fn) {
-      var _target = target$1;
-      return function onceHandler() {
-          var res = fn.apply(null, arguments);
-          if (res !== null) {
-              _target.$off(event, onceHandler);
-          }
-      };
-  }
-  function updateComponentListeners(vm, listeners, oldListeners) {
-      target$1 = vm;
-      updateListeners(listeners, oldListeners || {}, add$1, remove$1, createOnceHandler$1, vm);
-      target$1 = undefined;
-  }
-  function eventsMixin(Vue) {
-      var hookRE = /^hook:/;
-      Vue.prototype.$on = function (event, fn) {
-          var vm = this;
-          if (isArray(event)) {
-              for (var i = 0, l = event.length; i < l; i++) {
-                  vm.$on(event[i], fn);
-              }
-          }
-          else {
-              (vm._events[event] || (vm._events[event] = [])).push(fn);
-              // optimize hook:event cost by using a boolean flag marked at registration
-              // instead of a hash lookup
-              if (hookRE.test(event)) {
-                  vm._hasHookEvent = true;
-              }
-          }
-          return vm;
-      };
-      Vue.prototype.$once = function (event, fn) {
-          var vm = this;
-          function on() {
-              vm.$off(event, on);
-              fn.apply(vm, arguments);
-          }
-          on.fn = fn;
-          vm.$on(event, on);
-          return vm;
-      };
-      Vue.prototype.$off = function (event, fn) {
-          var vm = this;
-          // all
-          if (!arguments.length) {
-              vm._events = Object.create(null);
-              return vm;
-          }
-          // array of events
-          if (isArray(event)) {
-              for (var i_1 = 0, l = event.length; i_1 < l; i_1++) {
-                  vm.$off(event[i_1], fn);
-              }
-              return vm;
-          }
-          // specific event
-          var cbs = vm._events[event];
-          if (!cbs) {
-              return vm;
-          }
-          if (!fn) {
-              vm._events[event] = null;
-              return vm;
-          }
-          // specific handler
-          var cb;
-          var i = cbs.length;
-          while (i--) {
-              cb = cbs[i];
-              if (cb === fn || cb.fn === fn) {
-                  cbs.splice(i, 1);
-                  break;
-              }
-          }
-          return vm;
-      };
-      Vue.prototype.$emit = function (event) {
-          var vm = this;
-          {
-              var lowerCaseEvent = event.toLowerCase();
-              if (lowerCaseEvent !== event && vm._events[lowerCaseEvent]) {
-                  tip("Event \"".concat(lowerCaseEvent, "\" is emitted in component ") +
-                      "".concat(formatComponentName(vm), " but the handler is registered for \"").concat(event, "\". ") +
-                      "Note that HTML attributes are case-insensitive and you cannot use " +
-                      "v-on to listen to camelCase events when using in-DOM templates. " +
-                      "You should probably use \"".concat(hyphenate(event), "\" instead of \"").concat(event, "\"."));
-              }
-          }
-          var cbs = vm._events[event];
-          if (cbs) {
-              cbs = cbs.length > 1 ? toArray(cbs) : cbs;
-              var args = toArray(arguments, 1);
-              var info = "event handler for \"".concat(event, "\"");
-              for (var i = 0, l = cbs.length; i < l; i++) {
-                  invokeWithErrorHandling(cbs[i], vm, args, vm, info);
-              }
-          }
-          return vm;
-      };
-  }
-
-  var activeInstance = null;
-  var isUpdatingChildComponent = false;
-  function setActiveInstance(vm) {
-      var prevActiveInstance = activeInstance;
-      activeInstance = vm;
-      return function () {
-          activeInstance = prevActiveInstance;
-      };
-  }
-  function initLifecycle(vm) {
-      var options = vm.$options;
-      // locate first non-abstract parent
-      var parent = options.parent;
-      if (parent && !options.abstract) {
-          while (parent.$options.abstract && parent.$parent) {
-              parent = parent.$parent;
-          }
-          parent.$children.push(vm);
-      }
-      vm.$parent = parent;
-      vm.$root = parent ? parent.$root : vm;
-      vm.$children = [];
-      vm.$refs = {};
-      vm._provided = parent ? parent._provided : Object.create(null);
-      vm._watcher = null;
-      vm._inactive = null;
-      vm._directInactive = false;
-      vm._isMounted = false;
-      vm._isDestroyed = false;
-      vm._isBeingDestroyed = false;
-  }
-  function lifecycleMixin(Vue) {
-      Vue.prototype._update = function (vnode, hydrating) {
-          var vm = this;
-          var prevEl = vm.$el;
-          var prevVnode = vm._vnode;
-          var restoreActiveInstance = setActiveInstance(vm);
-          vm._vnode = vnode;
-          // Vue.prototype.__patch__ is injected in entry points
-          // based on the rendering backend used.
-          if (!prevVnode) {
-              // initial render
-              vm.$el = vm.__patch__(vm.$el, vnode, hydrating, false /* removeOnly */);
-          }
-          else {
-              // updates
-              vm.$el = vm.__patch__(prevVnode, vnode);
-          }
-          restoreActiveInstance();
-          // update __vue__ reference
-          if (prevEl) {
-              prevEl.__vue__ = null;
-          }
-          if (vm.$el) {
-              vm.$el.__vue__ = vm;
-          }
-          // if parent is an HOC, update its $el as well
-          var wrapper = vm;
-          while (wrapper &&
-              wrapper.$vnode &&
-              wrapper.$parent &&
-              wrapper.$vnode === wrapper.$parent._vnode) {
-              wrapper.$parent.$el = wrapper.$el;
-              wrapper = wrapper.$parent;
-          }
-          // updated hook is called by the scheduler to ensure that children are
-          // updated in a parent's updated hook.
-      };
-      Vue.prototype.$forceUpdate = function () {
-          var vm = this;
-          if (vm._watcher) {
-              vm._watcher.update();
-          }
-      };
-      Vue.prototype.$destroy = function () {
-          var vm = this;
-          if (vm._isBeingDestroyed) {
-              return;
-          }
-          callHook$1(vm, 'beforeDestroy');
-          vm._isBeingDestroyed = true;
-          // remove self from parent
-          var parent = vm.$parent;
-          if (parent && !parent._isBeingDestroyed && !vm.$options.abstract) {
-              remove$2(parent.$children, vm);
-          }
-          // teardown scope. this includes both the render watcher and other
-          // watchers created
-          vm._scope.stop();
-          // remove reference from data ob
-          // frozen object may not have observer.
-          if (vm._data.__ob__) {
-              vm._data.__ob__.vmCount--;
-          }
-          // call the last hook...
-          vm._isDestroyed = true;
-          // invoke destroy hooks on current rendered tree
-          vm.__patch__(vm._vnode, null);
-          // fire destroyed hook
-          callHook$1(vm, 'destroyed');
-          // turn off all instance listeners.
-          vm.$off();
-          // remove __vue__ reference
-          if (vm.$el) {
-              vm.$el.__vue__ = null;
-          }
-          // release circular reference (#6759)
-          if (vm.$vnode) {
-              vm.$vnode.parent = null;
-          }
-      };
-  }
-  function mountComponent(vm, el, hydrating) {
-      vm.$el = el;
-      if (!vm.$options.render) {
-          // @ts-expect-error invalid type
-          vm.$options.render = createEmptyVNode;
-          {
-              /* istanbul ignore if */
-              if ((vm.$options.template && vm.$options.template.charAt(0) !== '#') ||
-                  vm.$options.el ||
-                  el) {
-                  warn$2('You are using the runtime-only build of Vue where the template ' +
-                      'compiler is not available. Either pre-compile the templates into ' +
-                      'render functions, or use the compiler-included build.', vm);
-              }
-              else {
-                  warn$2('Failed to mount component: template or render function not defined.', vm);
-              }
-          }
-      }
-      callHook$1(vm, 'beforeMount');
-      var updateComponent;
-      /* istanbul ignore if */
-      if (config.performance && mark) {
-          updateComponent = function () {
-              var name = vm._name;
-              var id = vm._uid;
-              var startTag = "vue-perf-start:".concat(id);
-              var endTag = "vue-perf-end:".concat(id);
-              mark(startTag);
-              var vnode = vm._render();
-              mark(endTag);
-              measure("vue ".concat(name, " render"), startTag, endTag);
-              mark(startTag);
-              vm._update(vnode, hydrating);
-              mark(endTag);
-              measure("vue ".concat(name, " patch"), startTag, endTag);
-          };
-      }
-      else {
-          updateComponent = function () {
-              vm._update(vm._render(), hydrating);
-          };
-      }
-      var watcherOptions = {
-          before: function () {
-              if (vm._isMounted && !vm._isDestroyed) {
-                  callHook$1(vm, 'beforeUpdate');
-              }
-          }
-      };
-      {
-          watcherOptions.onTrack = function (e) { return callHook$1(vm, 'renderTracked', [e]); };
-          watcherOptions.onTrigger = function (e) { return callHook$1(vm, 'renderTriggered', [e]); };
-      }
-      // we set this to vm._watcher inside the watcher's constructor
-      // since the watcher's initial patch may call $forceUpdate (e.g. inside child
-      // component's mounted hook), which relies on vm._watcher being already defined
-      new Watcher(vm, updateComponent, noop, watcherOptions, true /* isRenderWatcher */);
-      hydrating = false;
-      // flush buffer for flush: "pre" watchers queued in setup()
-      var preWatchers = vm._preWatchers;
-      if (preWatchers) {
-          for (var i = 0; i < preWatchers.length; i++) {
-              preWatchers[i].run();
-          }
-      }
-      // manually mounted instance, call mounted on self
-      // mounted is called for render-created child components in its inserted hook
-      if (vm.$vnode == null) {
-          vm._isMounted = true;
-          callHook$1(vm, 'mounted');
-      }
-      return vm;
-  }
-  function updateChildComponent(vm, propsData, listeners, parentVnode, renderChildren) {
-      {
-          isUpdatingChildComponent = true;
-      }
-      // determine whether component has slot children
-      // we need to do this before overwriting $options._renderChildren.
-      // check if there are dynamic scopedSlots (hand-written or compiled but with
-      // dynamic slot names). Static scoped slots compiled from template has the
-      // "$stable" marker.
-      var newScopedSlots = parentVnode.data.scopedSlots;
-      var oldScopedSlots = vm.$scopedSlots;
-      var hasDynamicScopedSlot = !!((newScopedSlots && !newScopedSlots.$stable) ||
-          (oldScopedSlots !== emptyObject && !oldScopedSlots.$stable) ||
-          (newScopedSlots && vm.$scopedSlots.$key !== newScopedSlots.$key) ||
-          (!newScopedSlots && vm.$scopedSlots.$key));
-      // Any static slot children from the parent may have changed during parent's
-      // update. Dynamic scoped slots may also have changed. In such cases, a forced
-      // update is necessary to ensure correctness.
-      var needsForceUpdate = !!(renderChildren || // has new static slots
-          vm.$options._renderChildren || // has old static slots
-          hasDynamicScopedSlot);
-      var prevVNode = vm.$vnode;
-      vm.$options._parentVnode = parentVnode;
-      vm.$vnode = parentVnode; // update vm's placeholder node without re-render
-      if (vm._vnode) {
-          // update child tree's parent
-          vm._vnode.parent = parentVnode;
-      }
-      vm.$options._renderChildren = renderChildren;
-      // update $attrs and $listeners hash
-      // these are also reactive so they may trigger child update if the child
-      // used them during render
-      var attrs = parentVnode.data.attrs || emptyObject;
-      if (vm._attrsProxy) {
-          // force update if attrs are accessed and has changed since it may be
-          // passed to a child component.
-          if (syncSetupProxy(vm._attrsProxy, attrs, (prevVNode.data && prevVNode.data.attrs) || emptyObject, vm, '$attrs')) {
-              needsForceUpdate = true;
-          }
-      }
-      vm.$attrs = attrs;
-      // update listeners
-      listeners = listeners || emptyObject;
-      var prevListeners = vm.$options._parentListeners;
-      if (vm._listenersProxy) {
-          syncSetupProxy(vm._listenersProxy, listeners, prevListeners || emptyObject, vm, '$listeners');
-      }
-      vm.$listeners = vm.$options._parentListeners = listeners;
-      updateComponentListeners(vm, listeners, prevListeners);
-      // update props
-      if (propsData && vm.$options.props) {
-          toggleObserving(false);
-          var props = vm._props;
-          var propKeys = vm.$options._propKeys || [];
-          for (var i = 0; i < propKeys.length; i++) {
-              var key = propKeys[i];
-              var propOptions = vm.$options.props; // wtf flow?
-              props[key] = validateProp(key, propOptions, propsData, vm);
-          }
-          toggleObserving(true);
-          // keep a copy of raw propsData
-          vm.$options.propsData = propsData;
-      }
-      // resolve slots + force update if has children
-      if (needsForceUpdate) {
-          vm.$slots = resolveSlots(renderChildren, parentVnode.context);
-          vm.$forceUpdate();
-      }
-      {
-          isUpdatingChildComponent = false;
-      }
-  }
-  function isInInactiveTree(vm) {
-      while (vm && (vm = vm.$parent)) {
-          if (vm._inactive)
-              return true;
-      }
-      return false;
-  }
-  function activateChildComponent(vm, direct) {
-      if (direct) {
-          vm._directInactive = false;
-          if (isInInactiveTree(vm)) {
-              return;
-          }
-      }
-      else if (vm._directInactive) {
-          return;
-      }
-      if (vm._inactive || vm._inactive === null) {
-          vm._inactive = false;
-          for (var i = 0; i < vm.$children.length; i++) {
-              activateChildComponent(vm.$children[i]);
-          }
-          callHook$1(vm, 'activated');
-      }
-  }
-  function deactivateChildComponent(vm, direct) {
-      if (direct) {
-          vm._directInactive = true;
-          if (isInInactiveTree(vm)) {
-              return;
-          }
-      }
-      if (!vm._inactive) {
-          vm._inactive = true;
-          for (var i = 0; i < vm.$children.length; i++) {
-              deactivateChildComponent(vm.$children[i]);
-          }
-          callHook$1(vm, 'deactivated');
-      }
-  }
-  function callHook$1(vm, hook, args, setContext) {
-      if (setContext === void 0) { setContext = true; }
-      // #7573 disable dep collection when invoking lifecycle hooks
-      pushTarget();
-      var prev = currentInstance;
-      setContext && setCurrentInstance(vm);
-      var handlers = vm.$options[hook];
-      var info = "".concat(hook, " hook");
-      if (handlers) {
-          for (var i = 0, j = handlers.length; i < j; i++) {
-              invokeWithErrorHandling(handlers[i], vm, args || null, vm, info);
-          }
-      }
-      if (vm._hasHookEvent) {
-          vm.$emit('hook:' + hook);
-      }
-      setContext && setCurrentInstance(prev);
-      popTarget();
-  }
-
-  var MAX_UPDATE_COUNT = 100;
-  var queue = [];
-  var activatedChildren = [];
-  var has = {};
-  var circular = {};
-  var waiting = false;
-  var flushing = false;
-  var index$1 = 0;
-  /**
-   * Reset the scheduler's state.
-   */
-  function resetSchedulerState() {
-      index$1 = queue.length = activatedChildren.length = 0;
-      has = {};
-      {
-          circular = {};
-      }
-      waiting = flushing = false;
-  }
-  // Async edge case #6566 requires saving the timestamp when event listeners are
-  // attached. However, calling performance.now() has a perf overhead especially
-  // if the page has thousands of event listeners. Instead, we take a timestamp
-  // every time the scheduler flushes and use that for all event listeners
-  // attached during that flush.
-  var currentFlushTimestamp = 0;
-  // Async edge case fix requires storing an event listener's attach timestamp.
-  var getNow = Date.now;
-  // Determine what event timestamp the browser is using. Annoyingly, the
-  // timestamp can either be hi-res (relative to page load) or low-res
-  // (relative to UNIX epoch), so in order to compare time we have to use the
-  // same timestamp type when saving the flush timestamp.
-  // All IE versions use low-res event timestamps, and have problematic clock
-  // implementations (#9632)
-  if (inBrowser && !isIE) {
-      var performance_1 = window.performance;
-      if (performance_1 &&
-          typeof performance_1.now === 'function' &&
-          getNow() > document.createEvent('Event').timeStamp) {
-          // if the event timestamp, although evaluated AFTER the Date.now(), is
-          // smaller than it, it means the event is using a hi-res timestamp,
-          // and we need to use the hi-res version for event listener timestamps as
-          // well.
-          getNow = function () { return performance_1.now(); };
-      }
-  }
-  var sortCompareFn = function (a, b) {
-      if (a.post) {
-          if (!b.post)
-              return 1;
-      }
-      else if (b.post) {
-          return -1;
-      }
-      return a.id - b.id;
-  };
-  /**
-   * Flush both queues and run the watchers.
-   */
-  function flushSchedulerQueue() {
-      currentFlushTimestamp = getNow();
-      flushing = true;
-      var watcher, id;
-      // Sort queue before flush.
-      // This ensures that:
-      // 1. Components are updated from parent to child. (because parent is always
-      //    created before the child)
-      // 2. A component's user watchers are run before its render watcher (because
-      //    user watchers are created before the render watcher)
-      // 3. If a component is destroyed during a parent component's watcher run,
-      //    its watchers can be skipped.
-      queue.sort(sortCompareFn);
-      // do not cache length because more watchers might be pushed
-      // as we run existing watchers
-      for (index$1 = 0; index$1 < queue.length; index$1++) {
-          watcher = queue[index$1];
-          if (watcher.before) {
-              watcher.before();
-          }
-          id = watcher.id;
-          has[id] = null;
-          watcher.run();
-          // in dev build, check and stop circular updates.
-          if (has[id] != null) {
-              circular[id] = (circular[id] || 0) + 1;
-              if (circular[id] > MAX_UPDATE_COUNT) {
-                  warn$2('You may have an infinite update loop ' +
-                      (watcher.user
-                          ? "in watcher with expression \"".concat(watcher.expression, "\"")
-                          : "in a component render function."), watcher.vm);
-                  break;
-              }
-          }
-      }
-      // keep copies of post queues before resetting state
-      var activatedQueue = activatedChildren.slice();
-      var updatedQueue = queue.slice();
-      resetSchedulerState();
-      // call component updated and activated hooks
-      callActivatedHooks(activatedQueue);
-      callUpdatedHooks(updatedQueue);
-      cleanupDeps();
-      // devtool hook
-      /* istanbul ignore if */
-      if (devtools && config.devtools) {
-          devtools.emit('flush');
-      }
-  }
-  function callUpdatedHooks(queue) {
-      var i = queue.length;
-      while (i--) {
-          var watcher = queue[i];
-          var vm = watcher.vm;
-          if (vm && vm._watcher === watcher && vm._isMounted && !vm._isDestroyed) {
-              callHook$1(vm, 'updated');
-          }
-      }
-  }
-  /**
-   * Queue a kept-alive component that was activated during patch.
-   * The queue will be processed after the entire tree has been patched.
-   */
-  function queueActivatedComponent(vm) {
-      // setting _inactive to false here so that a render function can
-      // rely on checking whether it's in an inactive tree (e.g. router-view)
-      vm._inactive = false;
-      activatedChildren.push(vm);
-  }
-  function callActivatedHooks(queue) {
-      for (var i = 0; i < queue.length; i++) {
-          queue[i]._inactive = true;
-          activateChildComponent(queue[i], true /* true */);
-      }
-  }
-  /**
-   * Push a watcher into the watcher queue.
-   * Jobs with duplicate IDs will be skipped unless it's
-   * pushed when the queue is being flushed.
-   */
-  function queueWatcher(watcher) {
-      var id = watcher.id;
-      if (has[id] != null) {
-          return;
-      }
-      if (watcher === Dep.target && watcher.noRecurse) {
-          return;
-      }
-      has[id] = true;
-      if (!flushing) {
-          queue.push(watcher);
-      }
-      else {
-          // if already flushing, splice the watcher based on its id
-          // if already past its id, it will be run next immediately.
-          var i = queue.length - 1;
-          while (i > index$1 && queue[i].id > watcher.id) {
-              i--;
-          }
-          queue.splice(i + 1, 0, watcher);
-      }
-      // queue the flush
-      if (!waiting) {
-          waiting = true;
-          if (!config.async) {
-              flushSchedulerQueue();
-              return;
-          }
-          nextTick(flushSchedulerQueue);
-      }
-  }
-
-  var WATCHER = "watcher";
-  var WATCHER_CB = "".concat(WATCHER, " callback");
-  var WATCHER_GETTER = "".concat(WATCHER, " getter");
-  var WATCHER_CLEANUP = "".concat(WATCHER, " cleanup");
-  // Simple effect.
-  function watchEffect(effect, options) {
-      return doWatch(effect, null, options);
-  }
-  function watchPostEffect(effect, options) {
-      return doWatch(effect, null, (__assign(__assign({}, options), { flush: 'post' }) ));
-  }
-  function watchSyncEffect(effect, options) {
-      return doWatch(effect, null, (__assign(__assign({}, options), { flush: 'sync' }) ));
-  }
-  // initial value for watchers to trigger on undefined initial values
-  var INITIAL_WATCHER_VALUE = {};
-  // implementation
-  function watch(source, cb, options) {
-      if (typeof cb !== 'function') {
-          warn$2("`watch(fn, options?)` signature has been moved to a separate API. " +
-              "Use `watchEffect(fn, options?)` instead. `watch` now only " +
-              "supports `watch(source, cb, options?) signature.");
-      }
-      return doWatch(source, cb, options);
-  }
-  function doWatch(source, cb, _a) {
-      var _b = _a === void 0 ? emptyObject : _a, immediate = _b.immediate, deep = _b.deep, _c = _b.flush, flush = _c === void 0 ? 'pre' : _c, onTrack = _b.onTrack, onTrigger = _b.onTrigger;
-      if (!cb) {
-          if (immediate !== undefined) {
-              warn$2("watch() \"immediate\" option is only respected when using the " +
-                  "watch(source, callback, options?) signature.");
-          }
-          if (deep !== undefined) {
-              warn$2("watch() \"deep\" option is only respected when using the " +
-                  "watch(source, callback, options?) signature.");
-          }
-      }
-      var warnInvalidSource = function (s) {
-          warn$2("Invalid watch source: ".concat(s, ". A watch source can only be a getter/effect ") +
-              "function, a ref, a reactive object, or an array of these types.");
-      };
-      var instance = currentInstance;
-      var call = function (fn, type, args) {
-          if (args === void 0) { args = null; }
-          return invokeWithErrorHandling(fn, null, args, instance, type);
-      };
-      var getter;
-      var forceTrigger = false;
-      var isMultiSource = false;
-      if (isRef(source)) {
-          getter = function () { return source.value; };
-          forceTrigger = isShallow(source);
-      }
-      else if (isReactive(source)) {
-          getter = function () {
-              source.__ob__.dep.depend();
-              return source;
-          };
-          deep = true;
-      }
-      else if (isArray(source)) {
-          isMultiSource = true;
-          forceTrigger = source.some(function (s) { return isReactive(s) || isShallow(s); });
-          getter = function () {
-              return source.map(function (s) {
-                  if (isRef(s)) {
-                      return s.value;
-                  }
-                  else if (isReactive(s)) {
-                      return traverse(s);
-                  }
-                  else if (isFunction(s)) {
-                      return call(s, WATCHER_GETTER);
-                  }
-                  else {
-                      warnInvalidSource(s);
-                  }
-              });
-          };
-      }
-      else if (isFunction(source)) {
-          if (cb) {
-              // getter with cb
-              getter = function () { return call(source, WATCHER_GETTER); };
-          }
-          else {
-              // no cb -> simple effect
-              getter = function () {
-                  if (instance && instance._isDestroyed) {
-                      return;
-                  }
-                  if (cleanup) {
-                      cleanup();
-                  }
-                  return call(source, WATCHER, [onCleanup]);
-              };
-          }
-      }
-      else {
-          getter = noop;
-          warnInvalidSource(source);
-      }
-      if (cb && deep) {
-          var baseGetter_1 = getter;
-          getter = function () { return traverse(baseGetter_1()); };
-      }
-      var cleanup;
-      var onCleanup = function (fn) {
-          cleanup = watcher.onStop = function () {
-              call(fn, WATCHER_CLEANUP);
-          };
-      };
-      // in SSR there is no need to setup an actual effect, and it should be noop
-      // unless it's eager
-      if (isServerRendering()) {
-          // we will also not call the invalidate callback (+ runner is not set up)
-          onCleanup = noop;
-          if (!cb) {
-              getter();
-          }
-          else if (immediate) {
-              call(cb, WATCHER_CB, [
-                  getter(),
-                  isMultiSource ? [] : undefined,
-                  onCleanup
-              ]);
-          }
-          return noop;
-      }
-      var watcher = new Watcher(currentInstance, getter, noop, {
-          lazy: true
-      });
-      watcher.noRecurse = !cb;
-      var oldValue = isMultiSource ? [] : INITIAL_WATCHER_VALUE;
-      // overwrite default run
-      watcher.run = function () {
-          if (!watcher.active) {
-              return;
-          }
-          if (cb) {
-              // watch(source, cb)
-              var newValue = watcher.get();
-              if (deep ||
-                  forceTrigger ||
-                  (isMultiSource
-                      ? newValue.some(function (v, i) {
-                          return hasChanged(v, oldValue[i]);
-                      })
-                      : hasChanged(newValue, oldValue))) {
-                  // cleanup before running cb again
-                  if (cleanup) {
-                      cleanup();
-                  }
-                  call(cb, WATCHER_CB, [
-                      newValue,
-                      // pass undefined as the old value when it's changed for the first time
-                      oldValue === INITIAL_WATCHER_VALUE ? undefined : oldValue,
-                      onCleanup
-                  ]);
-                  oldValue = newValue;
-              }
-          }
-          else {
-              // watchEffect
-              watcher.get();
-          }
-      };
-      if (flush === 'sync') {
-          watcher.update = watcher.run;
-      }
-      else if (flush === 'post') {
-          watcher.post = true;
-          watcher.update = function () { return queueWatcher(watcher); };
-      }
-      else {
-          // pre
-          watcher.update = function () {
-              if (instance && instance === currentInstance && !instance._isMounted) {
-                  // pre-watcher triggered before
-                  var buffer = instance._preWatchers || (instance._preWatchers = []);
-                  if (buffer.indexOf(watcher) < 0)
-                      buffer.push(watcher);
-              }
-              else {
-                  queueWatcher(watcher);
-              }
-          };
-      }
-      {
-          watcher.onTrack = onTrack;
-          watcher.onTrigger = onTrigger;
-      }
-      // initial run
-      if (cb) {
-          if (immediate) {
-              watcher.run();
-          }
-          else {
-              oldValue = watcher.get();
-          }
-      }
-      else if (flush === 'post' && instance) {
-          instance.$once('hook:mounted', function () { return watcher.get(); });
-      }
-      else {
-          watcher.get();
-      }
-      return function () {
-          watcher.teardown();
-      };
-  }
-
-  var activeEffectScope;
-  var EffectScope = /** @class */ (function () {
-      function EffectScope(detached) {
-          if (detached === void 0) { detached = false; }
-          this.detached = detached;
-          /**
-           * @internal
-           */
-          this.active = true;
-          /**
-           * @internal
-           */
-          this.effects = [];
-          /**
-           * @internal
-           */
-          this.cleanups = [];
-          this.parent = activeEffectScope;
-          if (!detached && activeEffectScope) {
-              this.index =
-                  (activeEffectScope.scopes || (activeEffectScope.scopes = [])).push(this) - 1;
-          }
-      }
-      EffectScope.prototype.run = function (fn) {
-          if (this.active) {
-              var currentEffectScope = activeEffectScope;
-              try {
-                  activeEffectScope = this;
-                  return fn();
-              }
-              finally {
-                  activeEffectScope = currentEffectScope;
-              }
-          }
-          else {
-              warn$2("cannot run an inactive effect scope.");
-          }
-      };
-      /**
-       * This should only be called on non-detached scopes
-       * @internal
-       */
-      EffectScope.prototype.on = function () {
-          activeEffectScope = this;
-      };
-      /**
-       * This should only be called on non-detached scopes
-       * @internal
-       */
-      EffectScope.prototype.off = function () {
-          activeEffectScope = this.parent;
-      };
-      EffectScope.prototype.stop = function (fromParent) {
-          if (this.active) {
-              var i = void 0, l = void 0;
-              for (i = 0, l = this.effects.length; i < l; i++) {
-                  this.effects[i].teardown();
-              }
-              for (i = 0, l = this.cleanups.length; i < l; i++) {
-                  this.cleanups[i]();
-              }
-              if (this.scopes) {
-                  for (i = 0, l = this.scopes.length; i < l; i++) {
-                      this.scopes[i].stop(true);
-                  }
-              }
-              // nested scope, dereference from parent to avoid memory leaks
-              if (!this.detached && this.parent && !fromParent) {
-                  // optimized O(1) removal
-                  var last = this.parent.scopes.pop();
-                  if (last && last !== this) {
-                      this.parent.scopes[this.index] = last;
-                      last.index = this.index;
-                  }
-              }
-              this.parent = undefined;
-              this.active = false;
-          }
-      };
-      return EffectScope;
-  }());
-  function effectScope(detached) {
-      return new EffectScope(detached);
-  }
-  /**
-   * @internal
-   */
-  function recordEffectScope(effect, scope) {
-      if (scope === void 0) { scope = activeEffectScope; }
-      if (scope && scope.active) {
-          scope.effects.push(effect);
-      }
-  }
-  function getCurrentScope() {
-      return activeEffectScope;
-  }
-  function onScopeDispose(fn) {
-      if (activeEffectScope) {
-          activeEffectScope.cleanups.push(fn);
-      }
-      else {
-          warn$2("onScopeDispose() is called when there is no active effect scope" +
-              " to be associated with.");
-      }
-  }
-
-  function provide(key, value) {
-      if (!currentInstance) {
-          {
-              warn$2("provide() can only be used inside setup().");
-          }
-      }
-      else {
-          // TS doesn't allow symbol as index type
-          resolveProvided(currentInstance)[key] = value;
-      }
-  }
-  function resolveProvided(vm) {
-      // by default an instance inherits its parent's provides object
-      // but when it needs to provide values of its own, it creates its
-      // own provides object using parent provides object as prototype.
-      // this way in `inject` we can simply look up injections from direct
-      // parent and let the prototype chain do the work.
-      var existing = vm._provided;
-      var parentProvides = vm.$parent && vm.$parent._provided;
-      if (parentProvides === existing) {
-          return (vm._provided = Object.create(parentProvides));
-      }
-      else {
-          return existing;
-      }
-  }
-  function inject(key, defaultValue, treatDefaultAsFactory) {
-      if (treatDefaultAsFactory === void 0) { treatDefaultAsFactory = false; }
-      // fallback to `currentRenderingInstance` so that this can be called in
-      // a functional component
-      var instance = currentInstance;
-      if (instance) {
-          // #2400
-          // to support `app.use` plugins,
-          // fallback to appContext's `provides` if the instance is at root
-          var provides = instance.$parent && instance.$parent._provided;
-          if (provides && key in provides) {
-              // TS doesn't allow symbol as index type
-              return provides[key];
-          }
-          else if (arguments.length > 1) {
-              return treatDefaultAsFactory && isFunction(defaultValue)
-                  ? defaultValue.call(instance)
-                  : defaultValue;
-          }
-          else {
-              warn$2("injection \"".concat(String(key), "\" not found."));
-          }
-      }
-      else {
-          warn$2("inject() can only be used inside setup() or functional components.");
-      }
-  }
-
-  /**
-   * @internal this function needs manual public type declaration because it relies
-   * on previously manually authored types from Vue 2
-   */
-  function h(type, props, children) {
-      if (!currentInstance) {
-          warn$2("globally imported h() can only be invoked when there is an active " +
-                  "component instance, e.g. synchronously in a component's render or setup function.");
-      }
-      return createElement$1(currentInstance, type, props, children, 2, true);
-  }
-
-  function handleError(err, vm, info) {
-      // Deactivate deps tracking while processing error handler to avoid possible infinite rendering.
-      // See: https://github.com/vuejs/vuex/issues/1505
-      pushTarget();
-      try {
-          if (vm) {
-              var cur = vm;
-              while ((cur = cur.$parent)) {
-                  var hooks = cur.$options.errorCaptured;
-                  if (hooks) {
-                      for (var i = 0; i < hooks.length; i++) {
-                          try {
-                              var capture = hooks[i].call(cur, err, vm, info) === false;
-                              if (capture)
-                                  return;
-                          }
-                          catch (e) {
-                              globalHandleError(e, cur, 'errorCaptured hook');
-                          }
-                      }
-                  }
-              }
-          }
-          globalHandleError(err, vm, info);
-      }
-      finally {
-          popTarget();
-      }
-  }
-  function invokeWithErrorHandling(handler, context, args, vm, info) {
-      var res;
-      try {
-          res = args ? handler.apply(context, args) : handler.call(context);
-          if (res && !res._isVue && isPromise(res) && !res._handled) {
-              res.catch(function (e) { return handleError(e, vm, info + " (Promise/async)"); });
-              res._handled = true;
-          }
-      }
-      catch (e) {
-          handleError(e, vm, info);
-      }
-      return res;
-  }
-  function globalHandleError(err, vm, info) {
-      if (config.errorHandler) {
-          try {
-              return config.errorHandler.call(null, err, vm, info);
-          }
-          catch (e) {
-              // if the user intentionally throws the original error in the handler,
-              // do not log it twice
-              if (e !== err) {
-                  logError(e, null, 'config.errorHandler');
-              }
-          }
-      }
-      logError(err, vm, info);
-  }
-  function logError(err, vm, info) {
-      {
-          warn$2("Error in ".concat(info, ": \"").concat(err.toString(), "\""), vm);
-      }
-      /* istanbul ignore else */
-      if (inBrowser && typeof console !== 'undefined') {
-          console.error(err);
-      }
-      else {
-          throw err;
-      }
-  }
-
-  /* globals MutationObserver */
-  var isUsingMicroTask = false;
-  var callbacks = [];
-  var pending = false;
-  function flushCallbacks() {
-      pending = false;
-      var copies = callbacks.slice(0);
-      callbacks.length = 0;
-      for (var i = 0; i < copies.length; i++) {
-          copies[i]();
-      }
-  }
-  // Here we have async deferring wrappers using microtasks.
-  // In 2.5 we used (macro) tasks (in combination with microtasks).
-  // However, it has subtle problems when state is changed right before repaint
-  // (e.g. #6813, out-in transitions).
-  // Also, using (macro) tasks in event handler would cause some weird behaviors
-  // that cannot be circumvented (e.g. #7109, #7153, #7546, #7834, #8109).
-  // So we now use microtasks everywhere, again.
-  // A major drawback of this tradeoff is that there are some scenarios
-  // where microtasks have too high a priority and fire in between supposedly
-  // sequential events (e.g. #4521, #6690, which have workarounds)
-  // or even between bubbling of the same event (#6566).
-  var timerFunc;
-  // The nextTick behavior leverages the microtask queue, which can be accessed
-  // via either native Promise.then or MutationObserver.
-  // MutationObserver has wider support, however it is seriously bugged in
-  // UIWebView in iOS >= 9.3.3 when triggered in touch event handlers. It
-  // completely stops working after triggering a few times... so, if native
-  // Promise is available, we will use it:
-  /* istanbul ignore next, $flow-disable-line */
-  if (typeof Promise !== 'undefined' && isNative(Promise)) {
-      var p_1 = Promise.resolve();
-      timerFunc = function () {
-          p_1.then(flushCallbacks);
-          // In problematic UIWebViews, Promise.then doesn't completely break, but
-          // it can get stuck in a weird state where callbacks are pushed into the
-          // microtask queue but the queue isn't being flushed, until the browser
-          // needs to do some other work, e.g. handle a timer. Therefore we can
-          // "force" the microtask queue to be flushed by adding an empty timer.
-          if (isIOS)
-              setTimeout(noop);
-      };
-      isUsingMicroTask = true;
-  }
-  else if (!isIE &&
-      typeof MutationObserver !== 'undefined' &&
-      (isNative(MutationObserver) ||
-          // PhantomJS and iOS 7.x
-          MutationObserver.toString() === '[object MutationObserverConstructor]')) {
-      // Use MutationObserver where native Promise is not available,
-      // e.g. PhantomJS, iOS7, Android 4.4
-      // (#6466 MutationObserver is unreliable in IE11)
-      var counter_1 = 1;
-      var observer = new MutationObserver(flushCallbacks);
-      var textNode_1 = document.createTextNode(String(counter_1));
-      observer.observe(textNode_1, {
-          characterData: true
-      });
-      timerFunc = function () {
-          counter_1 = (counter_1 + 1) % 2;
-          textNode_1.data = String(counter_1);
-      };
-      isUsingMicroTask = true;
-  }
-  else if (typeof setImmediate !== 'undefined' && isNative(setImmediate)) {
-      // Fallback to setImmediate.
-      // Technically it leverages the (macro) task queue,
-      // but it is still a better choice than setTimeout.
-      timerFunc = function () {
-          setImmediate(flushCallbacks);
-      };
-  }
-  else {
-      // Fallback to setTimeout.
-      timerFunc = function () {
-          setTimeout(flushCallbacks, 0);
-      };
-  }
-  /**
-   * @internal
-   */
-  function nextTick(cb, ctx) {
-      var _resolve;
-      callbacks.push(function () {
-          if (cb) {
-              try {
-                  cb.call(ctx);
-              }
-              catch (e) {
-                  handleError(e, ctx, 'nextTick');
-              }
-          }
-          else if (_resolve) {
-              _resolve(ctx);
-          }
-      });
-      if (!pending) {
-          pending = true;
-          timerFunc();
-      }
-      // $flow-disable-line
-      if (!cb && typeof Promise !== 'undefined') {
-          return new Promise(function (resolve) {
-              _resolve = resolve;
-          });
-      }
-  }
-
-  function useCssModule(name) {
-      /* istanbul ignore else */
-      {
-          {
-              warn$2("useCssModule() is not supported in the global build.");
-          }
-          return emptyObject;
-      }
-  }
-
-  /**
-   * Runtime helper for SFC's CSS variable injection feature.
-   * @private
-   */
-  function useCssVars(getter) {
-      if (!inBrowser && !false)
-          return;
-      var instance = currentInstance;
-      if (!instance) {
-          warn$2("useCssVars is called without current active component instance.");
-          return;
-      }
-      watchPostEffect(function () {
-          var el = instance.$el;
-          var vars = getter(instance, instance._setupProxy);
-          if (el && el.nodeType === 1) {
-              var style = el.style;
-              for (var key in vars) {
-                  style.setProperty("--".concat(key), vars[key]);
-              }
-          }
-      });
-  }
-
-  /**
-   * v3-compatible async component API.
-   * @internal the type is manually declared in <root>/types/v3-define-async-component.d.ts
-   * because it relies on existing manual types
-   */
-  function defineAsyncComponent(source) {
-      if (isFunction(source)) {
-          source = { loader: source };
-      }
-      var loader = source.loader, loadingComponent = source.loadingComponent, errorComponent = source.errorComponent, _a = source.delay, delay = _a === void 0 ? 200 : _a, timeout = source.timeout, // undefined = never times out
-      _b = source.suspensible, // undefined = never times out
-      suspensible = _b === void 0 ? false : _b, // in Vue 3 default is true
-      userOnError = source.onError;
-      if (suspensible) {
-          warn$2("The suspensiblbe option for async components is not supported in Vue2. It is ignored.");
-      }
-      var pendingRequest = null;
-      var retries = 0;
-      var retry = function () {
-          retries++;
-          pendingRequest = null;
-          return load();
-      };
-      var load = function () {
-          var thisRequest;
-          return (pendingRequest ||
-              (thisRequest = pendingRequest =
-                  loader()
-                      .catch(function (err) {
-                      err = err instanceof Error ? err : new Error(String(err));
-                      if (userOnError) {
-                          return new Promise(function (resolve, reject) {
-                              var userRetry = function () { return resolve(retry()); };
-                              var userFail = function () { return reject(err); };
-                              userOnError(err, userRetry, userFail, retries + 1);
-                          });
-                      }
-                      else {
-                          throw err;
-                      }
-                  })
-                      .then(function (comp) {
-                      if (thisRequest !== pendingRequest && pendingRequest) {
-                          return pendingRequest;
-                      }
-                      if (!comp) {
-                          warn$2("Async component loader resolved to undefined. " +
-                              "If you are using retry(), make sure to return its return value.");
-                      }
-                      // interop module default
-                      if (comp &&
-                          (comp.__esModule || comp[Symbol.toStringTag] === 'Module')) {
-                          comp = comp.default;
-                      }
-                      if (comp && !isObject(comp) && !isFunction(comp)) {
-                          throw new Error("Invalid async component load result: ".concat(comp));
-                      }
-                      return comp;
-                  })));
-      };
-      return function () {
-          var component = load();
-          return {
-              component: component,
-              delay: delay,
-              timeout: timeout,
-              error: errorComponent,
-              loading: loadingComponent
-          };
-      };
-  }
-
-  function createLifeCycle(hookName) {
-      return function (fn, target) {
-          if (target === void 0) { target = currentInstance; }
-          if (!target) {
-              warn$2("".concat(formatName(hookName), " is called when there is no active component instance to be ") +
-                      "associated with. " +
-                      "Lifecycle injection APIs can only be used during execution of setup().");
-              return;
-          }
-          return injectHook(target, hookName, fn);
-      };
-  }
-  function formatName(name) {
-      if (name === 'beforeDestroy') {
-          name = 'beforeUnmount';
-      }
-      else if (name === 'destroyed') {
-          name = 'unmounted';
-      }
-      return "on".concat(name[0].toUpperCase() + name.slice(1));
-  }
-  function injectHook(instance, hookName, fn) {
-      var options = instance.$options;
-      options[hookName] = mergeLifecycleHook(options[hookName], fn);
-  }
-  var onBeforeMount = createLifeCycle('beforeMount');
-  var onMounted = createLifeCycle('mounted');
-  var onBeforeUpdate = createLifeCycle('beforeUpdate');
-  var onUpdated = createLifeCycle('updated');
-  var onBeforeUnmount = createLifeCycle('beforeDestroy');
-  var onUnmounted = createLifeCycle('destroyed');
-  var onActivated = createLifeCycle('activated');
-  var onDeactivated = createLifeCycle('deactivated');
-  var onServerPrefetch = createLifeCycle('serverPrefetch');
-  var onRenderTracked = createLifeCycle('renderTracked');
-  var onRenderTriggered = createLifeCycle('renderTriggered');
-  var injectErrorCapturedHook = createLifeCycle('errorCaptured');
-  function onErrorCaptured(hook, target) {
-      if (target === void 0) { target = currentInstance; }
-      injectErrorCapturedHook(hook, target);
-  }
-
-  /**
-   * Note: also update dist/vue.runtime.mjs when adding new exports to this file.
-   */
-  var version = '2.7.13';
-  /**
-   * @internal type is manually declared in <root>/types/v3-define-component.d.ts
-   */
-  function defineComponent(options) {
-      return options;
-  }
-
-  var vca = /*#__PURE__*/Object.freeze({
-    __proto__: null,
-    version: version,
-    defineComponent: defineComponent,
-    ref: ref$1,
-    shallowRef: shallowRef,
-    isRef: isRef,
-    toRef: toRef,
-    toRefs: toRefs,
-    unref: unref,
-    proxyRefs: proxyRefs,
-    customRef: customRef,
-    triggerRef: triggerRef,
-    reactive: reactive,
-    isReactive: isReactive,
-    isReadonly: isReadonly,
-    isShallow: isShallow,
-    isProxy: isProxy,
-    shallowReactive: shallowReactive,
-    markRaw: markRaw,
-    toRaw: toRaw,
-    readonly: readonly,
-    shallowReadonly: shallowReadonly,
-    computed: computed,
-    watch: watch,
-    watchEffect: watchEffect,
-    watchPostEffect: watchPostEffect,
-    watchSyncEffect: watchSyncEffect,
-    EffectScope: EffectScope,
-    effectScope: effectScope,
-    onScopeDispose: onScopeDispose,
-    getCurrentScope: getCurrentScope,
-    provide: provide,
-    inject: inject,
-    h: h,
-    getCurrentInstance: getCurrentInstance,
-    useSlots: useSlots,
-    useAttrs: useAttrs,
-    useListeners: useListeners,
-    mergeDefaults: mergeDefaults,
-    nextTick: nextTick,
-    set: set,
-    del: del,
-    useCssModule: useCssModule,
-    useCssVars: useCssVars,
-    defineAsyncComponent: defineAsyncComponent,
-    onBeforeMount: onBeforeMount,
-    onMounted: onMounted,
-    onBeforeUpdate: onBeforeUpdate,
-    onUpdated: onUpdated,
-    onBeforeUnmount: onBeforeUnmount,
-    onUnmounted: onUnmounted,
-    onActivated: onActivated,
-    onDeactivated: onDeactivated,
-    onServerPrefetch: onServerPrefetch,
-    onRenderTracked: onRenderTracked,
-    onRenderTriggered: onRenderTriggered,
-    onErrorCaptured: onErrorCaptured
-  });
-
-  var seenObjects = new _Set();
-  /**
-   * Recursively traverse an object to evoke all converted
-   * getters, so that every nested property inside the object
-   * is collected as a "deep" dependency.
-   */
-  function traverse(val) {
-      _traverse(val, seenObjects);
-      seenObjects.clear();
-      return val;
-  }
-  function _traverse(val, seen) {
-      var i, keys;
-      var isA = isArray(val);
-      if ((!isA && !isObject(val)) ||
-          val.__v_skip /* ReactiveFlags.SKIP */ ||
-          Object.isFrozen(val) ||
-          val instanceof VNode) {
-          return;
-      }
-      if (val.__ob__) {
-          var depId = val.__ob__.dep.id;
-          if (seen.has(depId)) {
-              return;
-          }
-          seen.add(depId);
-      }
-      if (isA) {
-          i = val.length;
-          while (i--)
-              _traverse(val[i], seen);
-      }
-      else if (isRef(val)) {
-          _traverse(val.value, seen);
-      }
-      else {
-          keys = Object.keys(val);
-          i = keys.length;
-          while (i--)
-              _traverse(val[keys[i]], seen);
-      }
-  }
-
-  var uid$1 = 0;
-  /**
-   * A watcher parses an expression, collects dependencies,
-   * and fires callback when the expression value changes.
-   * This is used for both the $watch() api and directives.
-   * @internal
-   */
-  var Watcher = /** @class */ (function () {
-      function Watcher(vm, expOrFn, cb, options, isRenderWatcher) {
-          recordEffectScope(this, 
-          // if the active effect scope is manually created (not a component scope),
-          // prioritize it
-          activeEffectScope && !activeEffectScope._vm
-              ? activeEffectScope
-              : vm
-                  ? vm._scope
-                  : undefined);
-          if ((this.vm = vm) && isRenderWatcher) {
-              vm._watcher = this;
-          }
-          // options
-          if (options) {
-              this.deep = !!options.deep;
-              this.user = !!options.user;
-              this.lazy = !!options.lazy;
-              this.sync = !!options.sync;
-              this.before = options.before;
-              {
-                  this.onTrack = options.onTrack;
-                  this.onTrigger = options.onTrigger;
-              }
-          }
-          else {
-              this.deep = this.user = this.lazy = this.sync = false;
-          }
-          this.cb = cb;
-          this.id = ++uid$1; // uid for batching
-          this.active = true;
-          this.post = false;
-          this.dirty = this.lazy; // for lazy watchers
-          this.deps = [];
-          this.newDeps = [];
-          this.depIds = new _Set();
-          this.newDepIds = new _Set();
-          this.expression = expOrFn.toString() ;
-          // parse expression for getter
-          if (isFunction(expOrFn)) {
-              this.getter = expOrFn;
-          }
-          else {
-              this.getter = parsePath(expOrFn);
-              if (!this.getter) {
-                  this.getter = noop;
-                  warn$2("Failed watching path: \"".concat(expOrFn, "\" ") +
-                          'Watcher only accepts simple dot-delimited paths. ' +
-                          'For full control, use a function instead.', vm);
-              }
-          }
-          this.value = this.lazy ? undefined : this.get();
-      }
-      /**
-       * Evaluate the getter, and re-collect dependencies.
-       */
-      Watcher.prototype.get = function () {
-          pushTarget(this);
-          var value;
-          var vm = this.vm;
-          try {
-              value = this.getter.call(vm, vm);
-          }
-          catch (e) {
-              if (this.user) {
-                  handleError(e, vm, "getter for watcher \"".concat(this.expression, "\""));
-              }
-              else {
-                  throw e;
-              }
-          }
-          finally {
-              // "touch" every property so they are all tracked as
-              // dependencies for deep watching
-              if (this.deep) {
-                  traverse(value);
-              }
-              popTarget();
-              this.cleanupDeps();
-          }
-          return value;
-      };
-      /**
-       * Add a dependency to this directive.
-       */
-      Watcher.prototype.addDep = function (dep) {
-          var id = dep.id;
-          if (!this.newDepIds.has(id)) {
-              this.newDepIds.add(id);
-              this.newDeps.push(dep);
-              if (!this.depIds.has(id)) {
-                  dep.addSub(this);
-              }
-          }
-      };
-      /**
-       * Clean up for dependency collection.
-       */
-      Watcher.prototype.cleanupDeps = function () {
-          var i = this.deps.length;
-          while (i--) {
-              var dep = this.deps[i];
-              if (!this.newDepIds.has(dep.id)) {
-                  dep.removeSub(this);
-              }
-          }
-          var tmp = this.depIds;
-          this.depIds = this.newDepIds;
-          this.newDepIds = tmp;
-          this.newDepIds.clear();
-          tmp = this.deps;
-          this.deps = this.newDeps;
-          this.newDeps = tmp;
-          this.newDeps.length = 0;
-      };
-      /**
-       * Subscriber interface.
-       * Will be called when a dependency changes.
-       */
-      Watcher.prototype.update = function () {
-          /* istanbul ignore else */
-          if (this.lazy) {
-              this.dirty = true;
-          }
-          else if (this.sync) {
-              this.run();
-          }
-          else {
-              queueWatcher(this);
-          }
-      };
-      /**
-       * Scheduler job interface.
-       * Will be called by the scheduler.
-       */
-      Watcher.prototype.run = function () {
-          if (this.active) {
-              var value = this.get();
-              if (value !== this.value ||
-                  // Deep watchers and watchers on Object/Arrays should fire even
-                  // when the value is the same, because the value may
-                  // have mutated.
-                  isObject(value) ||
-                  this.deep) {
-                  // set new value
-                  var oldValue = this.value;
-                  this.value = value;
-                  if (this.user) {
-                      var info = "callback for watcher \"".concat(this.expression, "\"");
-                      invokeWithErrorHandling(this.cb, this.vm, [value, oldValue], this.vm, info);
-                  }
-                  else {
-                      this.cb.call(this.vm, value, oldValue);
-                  }
-              }
-          }
-      };
-      /**
-       * Evaluate the value of the watcher.
-       * This only gets called for lazy watchers.
-       */
-      Watcher.prototype.evaluate = function () {
-          this.value = this.get();
-          this.dirty = false;
-      };
-      /**
-       * Depend on all deps collected by this watcher.
-       */
-      Watcher.prototype.depend = function () {
-          var i = this.deps.length;
-          while (i--) {
-              this.deps[i].depend();
-          }
-      };
-      /**
-       * Remove self from all dependencies' subscriber list.
-       */
-      Watcher.prototype.teardown = function () {
-          if (this.vm && !this.vm._isBeingDestroyed) {
-              remove$2(this.vm._scope.effects, this);
-          }
-          if (this.active) {
-              var i = this.deps.length;
-              while (i--) {
-                  this.deps[i].removeSub(this);
-              }
-              this.active = false;
-              if (this.onStop) {
-                  this.onStop();
-              }
-          }
-      };
-      return Watcher;
-  }());
-
-  var sharedPropertyDefinition = {
-      enumerable: true,
-      configurable: true,
-      get: noop,
-      set: noop
-  };
-  function proxy(target, sourceKey, key) {
-      sharedPropertyDefinition.get = function proxyGetter() {
-          return this[sourceKey][key];
-      };
-      sharedPropertyDefinition.set = function proxySetter(val) {
-          this[sourceKey][key] = val;
-      };
-      Object.defineProperty(target, key, sharedPropertyDefinition);
-  }
-  function initState(vm) {
-      var opts = vm.$options;
-      if (opts.props)
-          initProps$1(vm, opts.props);
-      // Composition API
-      initSetup(vm);
-      if (opts.methods)
-          initMethods(vm, opts.methods);
-      if (opts.data) {
-          initData(vm);
-      }
-      else {
-          var ob = observe((vm._data = {}));
-          ob && ob.vmCount++;
-      }
-      if (opts.computed)
-          initComputed$1(vm, opts.computed);
-      if (opts.watch && opts.watch !== nativeWatch) {
-          initWatch(vm, opts.watch);
-      }
-  }
-  function initProps$1(vm, propsOptions) {
-      var propsData = vm.$options.propsData || {};
-      var props = (vm._props = shallowReactive({}));
-      // cache prop keys so that future props updates can iterate using Array
-      // instead of dynamic object key enumeration.
-      var keys = (vm.$options._propKeys = []);
-      var isRoot = !vm.$parent;
-      // root instance props should be converted
-      if (!isRoot) {
-          toggleObserving(false);
-      }
-      var _loop_1 = function (key) {
-          keys.push(key);
-          var value = validateProp(key, propsOptions, propsData, vm);
-          /* istanbul ignore else */
-          {
-              var hyphenatedKey = hyphenate(key);
-              if (isReservedAttribute(hyphenatedKey) ||
-                  config.isReservedAttr(hyphenatedKey)) {
-                  warn$2("\"".concat(hyphenatedKey, "\" is a reserved attribute and cannot be used as component prop."), vm);
-              }
-              defineReactive(props, key, value, function () {
-                  if (!isRoot && !isUpdatingChildComponent) {
-                      warn$2("Avoid mutating a prop directly since the value will be " +
-                          "overwritten whenever the parent component re-renders. " +
-                          "Instead, use a data or computed property based on the prop's " +
-                          "value. Prop being mutated: \"".concat(key, "\""), vm);
-                  }
-              });
-          }
-          // static props are already proxied on the component's prototype
-          // during Vue.extend(). We only need to proxy props defined at
-          // instantiation here.
-          if (!(key in vm)) {
-              proxy(vm, "_props", key);
-          }
-      };
-      for (var key in propsOptions) {
-          _loop_1(key);
-      }
-      toggleObserving(true);
-  }
-  function initData(vm) {
-      var data = vm.$options.data;
-      data = vm._data = isFunction(data) ? getData(data, vm) : data || {};
-      if (!isPlainObject(data)) {
-          data = {};
-          warn$2('data functions should return an object:\n' +
-                  'https://v2.vuejs.org/v2/guide/components.html#data-Must-Be-a-Function', vm);
-      }
-      // proxy data on instance
-      var keys = Object.keys(data);
-      var props = vm.$options.props;
-      var methods = vm.$options.methods;
-      var i = keys.length;
-      while (i--) {
-          var key = keys[i];
-          {
-              if (methods && hasOwn(methods, key)) {
-                  warn$2("Method \"".concat(key, "\" has already been defined as a data property."), vm);
-              }
-          }
-          if (props && hasOwn(props, key)) {
-              warn$2("The data property \"".concat(key, "\" is already declared as a prop. ") +
-                      "Use prop default value instead.", vm);
-          }
-          else if (!isReserved(key)) {
-              proxy(vm, "_data", key);
-          }
-      }
-      // observe data
-      var ob = observe(data);
-      ob && ob.vmCount++;
-  }
-  function getData(data, vm) {
-      // #7573 disable dep collection when invoking data getters
-      pushTarget();
-      try {
-          return data.call(vm, vm);
-      }
-      catch (e) {
-          handleError(e, vm, "data()");
-          return {};
-      }
-      finally {
-          popTarget();
-      }
-  }
-  var computedWatcherOptions = { lazy: true };
-  function initComputed$1(vm, computed) {
-      // $flow-disable-line
-      var watchers = (vm._computedWatchers = Object.create(null));
-      // computed properties are just getters during SSR
-      var isSSR = isServerRendering();
-      for (var key in computed) {
-          var userDef = computed[key];
-          var getter = isFunction(userDef) ? userDef : userDef.get;
-          if (getter == null) {
-              warn$2("Getter is missing for computed property \"".concat(key, "\"."), vm);
-          }
-          if (!isSSR) {
-              // create internal watcher for the computed property.
-              watchers[key] = new Watcher(vm, getter || noop, noop, computedWatcherOptions);
-          }
-          // component-defined computed properties are already defined on the
-          // component prototype. We only need to define computed properties defined
-          // at instantiation here.
-          if (!(key in vm)) {
-              defineComputed(vm, key, userDef);
-          }
-          else {
-              if (key in vm.$data) {
-                  warn$2("The computed property \"".concat(key, "\" is already defined in data."), vm);
-              }
-              else if (vm.$options.props && key in vm.$options.props) {
-                  warn$2("The computed property \"".concat(key, "\" is already defined as a prop."), vm);
-              }
-              else if (vm.$options.methods && key in vm.$options.methods) {
-                  warn$2("The computed property \"".concat(key, "\" is already defined as a method."), vm);
-              }
-          }
-      }
-  }
-  function defineComputed(target, key, userDef) {
-      var shouldCache = !isServerRendering();
-      if (isFunction(userDef)) {
-          sharedPropertyDefinition.get = shouldCache
-              ? createComputedGetter(key)
-              : createGetterInvoker(userDef);
-          sharedPropertyDefinition.set = noop;
-      }
-      else {
-          sharedPropertyDefinition.get = userDef.get
-              ? shouldCache && userDef.cache !== false
-                  ? createComputedGetter(key)
-                  : createGetterInvoker(userDef.get)
-              : noop;
-          sharedPropertyDefinition.set = userDef.set || noop;
-      }
-      if (sharedPropertyDefinition.set === noop) {
-          sharedPropertyDefinition.set = function () {
-              warn$2("Computed property \"".concat(key, "\" was assigned to but it has no setter."), this);
-          };
-      }
-      Object.defineProperty(target, key, sharedPropertyDefinition);
-  }
-  function createComputedGetter(key) {
-      return function computedGetter() {
-          var watcher = this._computedWatchers && this._computedWatchers[key];
-          if (watcher) {
-              if (watcher.dirty) {
-                  watcher.evaluate();
-              }
-              if (Dep.target) {
-                  if (Dep.target.onTrack) {
-                      Dep.target.onTrack({
-                          effect: Dep.target,
-                          target: this,
-                          type: "get" /* TrackOpTypes.GET */,
-                          key: key
-                      });
-                  }
-                  watcher.depend();
-              }
-              return watcher.value;
-          }
-      };
-  }
-  function createGetterInvoker(fn) {
-      return function computedGetter() {
-          return fn.call(this, this);
-      };
-  }
-  function initMethods(vm, methods) {
-      var props = vm.$options.props;
-      for (var key in methods) {
-          {
-              if (typeof methods[key] !== 'function') {
-                  warn$2("Method \"".concat(key, "\" has type \"").concat(typeof methods[key], "\" in the component definition. ") +
-                      "Did you reference the function correctly?", vm);
-              }
-              if (props && hasOwn(props, key)) {
-                  warn$2("Method \"".concat(key, "\" has already been defined as a prop."), vm);
-              }
-              if (key in vm && isReserved(key)) {
-                  warn$2("Method \"".concat(key, "\" conflicts with an existing Vue instance method. ") +
-                      "Avoid defining component methods that start with _ or $.");
-              }
-          }
-          vm[key] = typeof methods[key] !== 'function' ? noop : bind$1(methods[key], vm);
-      }
-  }
-  function initWatch(vm, watch) {
-      for (var key in watch) {
-          var handler = watch[key];
-          if (isArray(handler)) {
-              for (var i = 0; i < handler.length; i++) {
-                  createWatcher(vm, key, handler[i]);
-              }
-          }
-          else {
-              createWatcher(vm, key, handler);
-          }
-      }
-  }
-  function createWatcher(vm, expOrFn, handler, options) {
-      if (isPlainObject(handler)) {
-          options = handler;
-          handler = handler.handler;
-      }
-      if (typeof handler === 'string') {
-          handler = vm[handler];
-      }
-      return vm.$watch(expOrFn, handler, options);
-  }
-  function stateMixin(Vue) {
-      // flow somehow has problems with directly declared definition object
-      // when using Object.defineProperty, so we have to procedurally build up
-      // the object here.
-      var dataDef = {};
-      dataDef.get = function () {
-          return this._data;
-      };
-      var propsDef = {};
-      propsDef.get = function () {
-          return this._props;
-      };
-      {
-          dataDef.set = function () {
-              warn$2('Avoid replacing instance root $data. ' +
-                  'Use nested data properties instead.', this);
-          };
-          propsDef.set = function () {
-              warn$2("$props is readonly.", this);
-          };
-      }
-      Object.defineProperty(Vue.prototype, '$data', dataDef);
-      Object.defineProperty(Vue.prototype, '$props', propsDef);
-      Vue.prototype.$set = set;
-      Vue.prototype.$delete = del;
-      Vue.prototype.$watch = function (expOrFn, cb, options) {
-          var vm = this;
-          if (isPlainObject(cb)) {
-              return createWatcher(vm, expOrFn, cb, options);
-          }
-          options = options || {};
-          options.user = true;
-          var watcher = new Watcher(vm, expOrFn, cb, options);
-          if (options.immediate) {
-              var info = "callback for immediate watcher \"".concat(watcher.expression, "\"");
-              pushTarget();
-              invokeWithErrorHandling(cb, vm, [watcher.value], vm, info);
-              popTarget();
-          }
-          return function unwatchFn() {
-              watcher.teardown();
-          };
-      };
-  }
-
-  function initProvide(vm) {
-      var provideOption = vm.$options.provide;
-      if (provideOption) {
-          var provided = isFunction(provideOption)
-              ? provideOption.call(vm)
-              : provideOption;
-          if (!isObject(provided)) {
-              return;
-          }
-          var source = resolveProvided(vm);
-          // IE9 doesn't support Object.getOwnPropertyDescriptors so we have to
-          // iterate the keys ourselves.
-          var keys = hasSymbol ? Reflect.ownKeys(provided) : Object.keys(provided);
-          for (var i = 0; i < keys.length; i++) {
-              var key = keys[i];
-              Object.defineProperty(source, key, Object.getOwnPropertyDescriptor(provided, key));
-          }
-      }
-  }
-  function initInjections(vm) {
-      var result = resolveInject(vm.$options.inject, vm);
-      if (result) {
-          toggleObserving(false);
-          Object.keys(result).forEach(function (key) {
-              /* istanbul ignore else */
-              {
-                  defineReactive(vm, key, result[key], function () {
-                      warn$2("Avoid mutating an injected value directly since the changes will be " +
-                          "overwritten whenever the provided component re-renders. " +
-                          "injection being mutated: \"".concat(key, "\""), vm);
-                  });
-              }
-          });
-          toggleObserving(true);
-      }
-  }
-  function resolveInject(inject, vm) {
-      if (inject) {
-          // inject is :any because flow is not smart enough to figure out cached
-          var result = Object.create(null);
-          var keys = hasSymbol ? Reflect.ownKeys(inject) : Object.keys(inject);
-          for (var i = 0; i < keys.length; i++) {
-              var key = keys[i];
-              // #6574 in case the inject object is observed...
-              if (key === '__ob__')
-                  continue;
-              var provideKey = inject[key].from;
-              if (provideKey in vm._provided) {
-                  result[key] = vm._provided[provideKey];
-              }
-              else if ('default' in inject[key]) {
-                  var provideDefault = inject[key].default;
-                  result[key] = isFunction(provideDefault)
-                      ? provideDefault.call(vm)
-                      : provideDefault;
-              }
-              else {
-                  warn$2("Injection \"".concat(key, "\" not found"), vm);
-              }
-          }
-          return result;
-      }
-  }
-
-  var uid = 0;
-  function initMixin$1(Vue) {
-      Vue.prototype._init = function (options) {
-          var vm = this;
-          // a uid
-          vm._uid = uid++;
-          var startTag, endTag;
-          /* istanbul ignore if */
-          if (config.performance && mark) {
-              startTag = "vue-perf-start:".concat(vm._uid);
-              endTag = "vue-perf-end:".concat(vm._uid);
-              mark(startTag);
-          }
-          // a flag to mark this as a Vue instance without having to do instanceof
-          // check
-          vm._isVue = true;
-          // avoid instances from being observed
-          vm.__v_skip = true;
-          // effect scope
-          vm._scope = new EffectScope(true /* detached */);
-          vm._scope._vm = true;
-          // merge options
-          if (options && options._isComponent) {
-              // optimize internal component instantiation
-              // since dynamic options merging is pretty slow, and none of the
-              // internal component options needs special treatment.
-              initInternalComponent(vm, options);
-          }
-          else {
-              vm.$options = mergeOptions(resolveConstructorOptions(vm.constructor), options || {}, vm);
-          }
-          /* istanbul ignore else */
-          {
-              initProxy(vm);
-          }
-          // expose real self
-          vm._self = vm;
-          initLifecycle(vm);
-          initEvents(vm);
-          initRender(vm);
-          callHook$1(vm, 'beforeCreate', undefined, false /* setContext */);
-          initInjections(vm); // resolve injections before data/props
-          initState(vm);
-          initProvide(vm); // resolve provide after data/props
-          callHook$1(vm, 'created');
-          /* istanbul ignore if */
-          if (config.performance && mark) {
-              vm._name = formatComponentName(vm, false);
-              mark(endTag);
-              measure("vue ".concat(vm._name, " init"), startTag, endTag);
-          }
-          if (vm.$options.el) {
-              vm.$mount(vm.$options.el);
-          }
-      };
-  }
-  function initInternalComponent(vm, options) {
-      var opts = (vm.$options = Object.create(vm.constructor.options));
-      // doing this because it's faster than dynamic enumeration.
-      var parentVnode = options._parentVnode;
-      opts.parent = options.parent;
-      opts._parentVnode = parentVnode;
-      var vnodeComponentOptions = parentVnode.componentOptions;
-      opts.propsData = vnodeComponentOptions.propsData;
-      opts._parentListeners = vnodeComponentOptions.listeners;
-      opts._renderChildren = vnodeComponentOptions.children;
-      opts._componentTag = vnodeComponentOptions.tag;
-      if (options.render) {
-          opts.render = options.render;
-          opts.staticRenderFns = options.staticRenderFns;
-      }
-  }
-  function resolveConstructorOptions(Ctor) {
-      var options = Ctor.options;
-      if (Ctor.super) {
-          var superOptions = resolveConstructorOptions(Ctor.super);
-          var cachedSuperOptions = Ctor.superOptions;
-          if (superOptions !== cachedSuperOptions) {
-              // super option changed,
-              // need to resolve new options.
-              Ctor.superOptions = superOptions;
-              // check if there are any late-modified/attached options (#4976)
-              var modifiedOptions = resolveModifiedOptions(Ctor);
-              // update base extend options
-              if (modifiedOptions) {
-                  extend(Ctor.extendOptions, modifiedOptions);
-              }
-              options = Ctor.options = mergeOptions(superOptions, Ctor.extendOptions);
-              if (options.name) {
-                  options.components[options.name] = Ctor;
-              }
-          }
-      }
-      return options;
-  }
-  function resolveModifiedOptions(Ctor) {
-      var modified;
-      var latest = Ctor.options;
-      var sealed = Ctor.sealedOptions;
-      for (var key in latest) {
-          if (latest[key] !== sealed[key]) {
-              if (!modified)
-                  modified = {};
-              modified[key] = latest[key];
-          }
-      }
-      return modified;
-  }
-
-  function FunctionalRenderContext(data, props, children, parent, Ctor) {
-      var _this = this;
-      var options = Ctor.options;
-      // ensure the createElement function in functional components
-      // gets a unique context - this is necessary for correct named slot check
-      var contextVm;
-      if (hasOwn(parent, '_uid')) {
-          contextVm = Object.create(parent);
-          contextVm._original = parent;
-      }
-      else {
-          // the context vm passed in is a functional context as well.
-          // in this case we want to make sure we are able to get a hold to the
-          // real context instance.
-          contextVm = parent;
-          // @ts-ignore
-          parent = parent._original;
-      }
-      var isCompiled = isTrue(options._compiled);
-      var needNormalization = !isCompiled;
-      this.data = data;
-      this.props = props;
-      this.children = children;
-      this.parent = parent;
-      this.listeners = data.on || emptyObject;
-      this.injections = resolveInject(options.inject, parent);
-      this.slots = function () {
-          if (!_this.$slots) {
-              normalizeScopedSlots(parent, data.scopedSlots, (_this.$slots = resolveSlots(children, parent)));
-          }
-          return _this.$slots;
-      };
-      Object.defineProperty(this, 'scopedSlots', {
-          enumerable: true,
-          get: function () {
-              return normalizeScopedSlots(parent, data.scopedSlots, this.slots());
-          }
-      });
-      // support for compiled functional template
-      if (isCompiled) {
-          // exposing $options for renderStatic()
-          this.$options = options;
-          // pre-resolve slots for renderSlot()
-          this.$slots = this.slots();
-          this.$scopedSlots = normalizeScopedSlots(parent, data.scopedSlots, this.$slots);
-      }
-      if (options._scopeId) {
-          this._c = function (a, b, c, d) {
-              var vnode = createElement$1(contextVm, a, b, c, d, needNormalization);
-              if (vnode && !isArray(vnode)) {
-                  vnode.fnScopeId = options._scopeId;
-                  vnode.fnContext = parent;
-              }
-              return vnode;
-          };
-      }
-      else {
-          this._c = function (a, b, c, d) {
-              return createElement$1(contextVm, a, b, c, d, needNormalization);
-          };
-      }
-  }
-  installRenderHelpers(FunctionalRenderContext.prototype);
-  function createFunctionalComponent(Ctor, propsData, data, contextVm, children) {
-      var options = Ctor.options;
-      var props = {};
-      var propOptions = options.props;
-      if (isDef(propOptions)) {
-          for (var key in propOptions) {
-              props[key] = validateProp(key, propOptions, propsData || emptyObject);
-          }
-      }
-      else {
-          if (isDef(data.attrs))
-              mergeProps(props, data.attrs);
-          if (isDef(data.props))
-              mergeProps(props, data.props);
-      }
-      var renderContext = new FunctionalRenderContext(data, props, children, contextVm, Ctor);
-      var vnode = options.render.call(null, renderContext._c, renderContext);
-      if (vnode instanceof VNode) {
-          return cloneAndMarkFunctionalResult(vnode, data, renderContext.parent, options, renderContext);
-      }
-      else if (isArray(vnode)) {
-          var vnodes = normalizeChildren(vnode) || [];
-          var res = new Array(vnodes.length);
-          for (var i = 0; i < vnodes.length; i++) {
-              res[i] = cloneAndMarkFunctionalResult(vnodes[i], data, renderContext.parent, options, renderContext);
-          }
-          return res;
-      }
-  }
-  function cloneAndMarkFunctionalResult(vnode, data, contextVm, options, renderContext) {
-      // #7817 clone node before setting fnContext, otherwise if the node is reused
-      // (e.g. it was from a cached normal slot) the fnContext causes named slots
-      // that should not be matched to match.
-      var clone = cloneVNode(vnode);
-      clone.fnContext = contextVm;
-      clone.fnOptions = options;
-      {
-          (clone.devtoolsMeta = clone.devtoolsMeta || {}).renderContext =
-              renderContext;
-      }
-      if (data.slot) {
-          (clone.data || (clone.data = {})).slot = data.slot;
-      }
-      return clone;
-  }
-  function mergeProps(to, from) {
-      for (var key in from) {
-          to[camelize(key)] = from[key];
-      }
-  }
-
-  function getComponentName(options) {
-      return options.name || options.__name || options._componentTag;
-  }
-  // inline hooks to be invoked on component VNodes during patch
-  var componentVNodeHooks = {
-      init: function (vnode, hydrating) {
-          if (vnode.componentInstance &&
-              !vnode.componentInstance._isDestroyed &&
-              vnode.data.keepAlive) {
-              // kept-alive components, treat as a patch
-              var mountedNode = vnode; // work around flow
-              componentVNodeHooks.prepatch(mountedNode, mountedNode);
-          }
-          else {
-              var child = (vnode.componentInstance = createComponentInstanceForVnode(vnode, activeInstance));
-              child.$mount(hydrating ? vnode.elm : undefined, hydrating);
-          }
-      },
-      prepatch: function (oldVnode, vnode) {
-          var options = vnode.componentOptions;
-          var child = (vnode.componentInstance = oldVnode.componentInstance);
-          updateChildComponent(child, options.propsData, // updated props
-          options.listeners, // updated listeners
-          vnode, // new parent vnode
-          options.children // new children
-          );
-      },
-      insert: function (vnode) {
-          var context = vnode.context, componentInstance = vnode.componentInstance;
-          if (!componentInstance._isMounted) {
-              componentInstance._isMounted = true;
-              callHook$1(componentInstance, 'mounted');
-          }
-          if (vnode.data.keepAlive) {
-              if (context._isMounted) {
-                  // vue-router#1212
-                  // During updates, a kept-alive component's child components may
-                  // change, so directly walking the tree here may call activated hooks
-                  // on incorrect children. Instead we push them into a queue which will
-                  // be processed after the whole patch process ended.
-                  queueActivatedComponent(componentInstance);
-              }
-              else {
-                  activateChildComponent(componentInstance, true /* direct */);
-              }
-          }
-      },
-      destroy: function (vnode) {
-          var componentInstance = vnode.componentInstance;
-          if (!componentInstance._isDestroyed) {
-              if (!vnode.data.keepAlive) {
-                  componentInstance.$destroy();
-              }
-              else {
-                  deactivateChildComponent(componentInstance, true /* direct */);
-              }
-          }
-      }
-  };
-  var hooksToMerge = Object.keys(componentVNodeHooks);
-  function createComponent(Ctor, data, context, children, tag) {
-      if (isUndef(Ctor)) {
-          return;
-      }
-      var baseCtor = context.$options._base;
-      // plain options object: turn it into a constructor
-      if (isObject(Ctor)) {
-          Ctor = baseCtor.extend(Ctor);
-      }
-      // if at this stage it's not a constructor or an async component factory,
-      // reject.
-      if (typeof Ctor !== 'function') {
-          {
-              warn$2("Invalid Component definition: ".concat(String(Ctor)), context);
-          }
-          return;
-      }
-      // async component
-      var asyncFactory;
-      // @ts-expect-error
-      if (isUndef(Ctor.cid)) {
-          asyncFactory = Ctor;
-          Ctor = resolveAsyncComponent(asyncFactory, baseCtor);
-          if (Ctor === undefined) {
-              // return a placeholder node for async component, which is rendered
-              // as a comment node but preserves all the raw information for the node.
-              // the information will be used for async server-rendering and hydration.
-              return createAsyncPlaceholder(asyncFactory, data, context, children, tag);
-          }
-      }
-      data = data || {};
-      // resolve constructor options in case global mixins are applied after
-      // component constructor creation
-      resolveConstructorOptions(Ctor);
-      // transform component v-model data into props & events
-      if (isDef(data.model)) {
-          // @ts-expect-error
-          transformModel(Ctor.options, data);
-      }
-      // extract props
-      // @ts-expect-error
-      var propsData = extractPropsFromVNodeData(data, Ctor, tag);
-      // functional component
-      // @ts-expect-error
-      if (isTrue(Ctor.options.functional)) {
-          return createFunctionalComponent(Ctor, propsData, data, context, children);
-      }
-      // extract listeners, since these needs to be treated as
-      // child component listeners instead of DOM listeners
-      var listeners = data.on;
-      // replace with listeners with .native modifier
-      // so it gets processed during parent component patch.
-      data.on = data.nativeOn;
-      // @ts-expect-error
-      if (isTrue(Ctor.options.abstract)) {
-          // abstract components do not keep anything
-          // other than props & listeners & slot
-          // work around flow
-          var slot = data.slot;
-          data = {};
-          if (slot) {
-              data.slot = slot;
-          }
-      }
-      // install component management hooks onto the placeholder node
-      installComponentHooks(data);
-      // return a placeholder vnode
-      // @ts-expect-error
-      var name = getComponentName(Ctor.options) || tag;
-      var vnode = new VNode(
-      // @ts-expect-error
-      "vue-component-".concat(Ctor.cid).concat(name ? "-".concat(name) : ''), data, undefined, undefined, undefined, context, 
-      // @ts-expect-error
-      { Ctor: Ctor, propsData: propsData, listeners: listeners, tag: tag, children: children }, asyncFactory);
-      return vnode;
-  }
-  function createComponentInstanceForVnode(
-  // we know it's MountedComponentVNode but flow doesn't
-  vnode, 
-  // activeInstance in lifecycle state
-  parent) {
-      var options = {
-          _isComponent: true,
-          _parentVnode: vnode,
-          parent: parent
-      };
-      // check inline-template render functions
-      var inlineTemplate = vnode.data.inlineTemplate;
-      if (isDef(inlineTemplate)) {
-          options.render = inlineTemplate.render;
-          options.staticRenderFns = inlineTemplate.staticRenderFns;
-      }
-      return new vnode.componentOptions.Ctor(options);
-  }
-  function installComponentHooks(data) {
-      var hooks = data.hook || (data.hook = {});
-      for (var i = 0; i < hooksToMerge.length; i++) {
-          var key = hooksToMerge[i];
-          var existing = hooks[key];
-          var toMerge = componentVNodeHooks[key];
-          // @ts-expect-error
-          if (existing !== toMerge && !(existing && existing._merged)) {
-              hooks[key] = existing ? mergeHook(toMerge, existing) : toMerge;
-          }
-      }
-  }
-  function mergeHook(f1, f2) {
-      var merged = function (a, b) {
-          // flow complains about extra args which is why we use any
-          f1(a, b);
-          f2(a, b);
-      };
-      merged._merged = true;
-      return merged;
-  }
-  // transform component v-model info (value and callback) into
-  // prop and event handler respectively.
-  function transformModel(options, data) {
-      var prop = (options.model && options.model.prop) || 'value';
-      var event = (options.model && options.model.event) || 'input';
-      (data.attrs || (data.attrs = {}))[prop] = data.model.value;
-      var on = data.on || (data.on = {});
-      var existing = on[event];
-      var callback = data.model.callback;
-      if (isDef(existing)) {
-          if (isArray(existing)
-              ? existing.indexOf(callback) === -1
-              : existing !== callback) {
-              on[event] = [callback].concat(existing);
-          }
-      }
-      else {
-          on[event] = callback;
-      }
-  }
-
-  var warn$2 = noop;
-  var tip = noop;
-  var generateComponentTrace; // work around flow check
-  var formatComponentName;
-  {
-      var hasConsole_1 = typeof console !== 'undefined';
-      var classifyRE_1 = /(?:^|[-_])(\w)/g;
-      var classify_1 = function (str) {
-          return str.replace(classifyRE_1, function (c) { return c.toUpperCase(); }).replace(/[-_]/g, '');
-      };
-      warn$2 = function (msg, vm) {
-          if (vm === void 0) { vm = currentInstance; }
-          var trace = vm ? generateComponentTrace(vm) : '';
-          if (config.warnHandler) {
-              config.warnHandler.call(null, msg, vm, trace);
-          }
-          else if (hasConsole_1 && !config.silent) {
-              console.error("[Vue warn]: ".concat(msg).concat(trace));
-          }
-      };
-      tip = function (msg, vm) {
-          if (hasConsole_1 && !config.silent) {
-              console.warn("[Vue tip]: ".concat(msg) + (vm ? generateComponentTrace(vm) : ''));
-          }
-      };
-      formatComponentName = function (vm, includeFile) {
-          if (vm.$root === vm) {
-              return '<Root>';
-          }
-          var options = isFunction(vm) && vm.cid != null
-              ? vm.options
-              : vm._isVue
-                  ? vm.$options || vm.constructor.options
-                  : vm;
-          var name = getComponentName(options);
-          var file = options.__file;
-          if (!name && file) {
-              var match = file.match(/([^/\\]+)\.vue$/);
-              name = match && match[1];
-          }
-          return ((name ? "<".concat(classify_1(name), ">") : "<Anonymous>") +
-              (file && includeFile !== false ? " at ".concat(file) : ''));
-      };
-      var repeat_1 = function (str, n) {
-          var res = '';
-          while (n) {
-              if (n % 2 === 1)
-                  res += str;
-              if (n > 1)
-                  str += str;
-              n >>= 1;
-          }
-          return res;
-      };
-      generateComponentTrace = function (vm) {
-          if (vm._isVue && vm.$parent) {
-              var tree = [];
-              var currentRecursiveSequence = 0;
-              while (vm) {
-                  if (tree.length > 0) {
-                      var last = tree[tree.length - 1];
-                      if (last.constructor === vm.constructor) {
-                          currentRecursiveSequence++;
-                          vm = vm.$parent;
-                          continue;
-                      }
-                      else if (currentRecursiveSequence > 0) {
-                          tree[tree.length - 1] = [last, currentRecursiveSequence];
-                          currentRecursiveSequence = 0;
-                      }
-                  }
-                  tree.push(vm);
-                  vm = vm.$parent;
-              }
-              return ('\n\nfound in\n\n' +
-                  tree
-                      .map(function (vm, i) {
-                      return "".concat(i === 0 ? '---> ' : repeat_1(' ', 5 + i * 2)).concat(isArray(vm)
-                          ? "".concat(formatComponentName(vm[0]), "... (").concat(vm[1], " recursive calls)")
-                          : formatComponentName(vm));
-                  })
-                      .join('\n'));
-          }
-          else {
-              return "\n\n(found in ".concat(formatComponentName(vm), ")");
-          }
-      };
-  }
-
-  /**
-   * Option overwriting strategies are functions that handle
-   * how to merge a parent option value and a child option
-   * value into the final value.
-   */
-  var strats = config.optionMergeStrategies;
-  /**
-   * Options with restrictions
-   */
-  {
-      strats.el = strats.propsData = function (parent, child, vm, key) {
-          if (!vm) {
-              warn$2("option \"".concat(key, "\" can only be used during instance ") +
-                  'creation with the `new` keyword.');
-          }
-          return defaultStrat(parent, child);
-      };
-  }
-  /**
-   * Helper that recursively merges two data objects together.
-   */
-  function mergeData(to, from) {
-      if (!from)
-          return to;
-      var key, toVal, fromVal;
-      var keys = hasSymbol
-          ? Reflect.ownKeys(from)
-          : Object.keys(from);
-      for (var i = 0; i < keys.length; i++) {
-          key = keys[i];
-          // in case the object is already observed...
-          if (key === '__ob__')
-              continue;
-          toVal = to[key];
-          fromVal = from[key];
-          if (!hasOwn(to, key)) {
-              set(to, key, fromVal);
-          }
-          else if (toVal !== fromVal &&
-              isPlainObject(toVal) &&
-              isPlainObject(fromVal)) {
-              mergeData(toVal, fromVal);
-          }
-      }
-      return to;
-  }
-  /**
-   * Data
-   */
-  function mergeDataOrFn(parentVal, childVal, vm) {
-      if (!vm) {
-          // in a Vue.extend merge, both should be functions
-          if (!childVal) {
-              return parentVal;
-          }
-          if (!parentVal) {
-              return childVal;
-          }
-          // when parentVal & childVal are both present,
-          // we need to return a function that returns the
-          // merged result of both functions... no need to
-          // check if parentVal is a function here because
-          // it has to be a function to pass previous merges.
-          return function mergedDataFn() {
-              return mergeData(isFunction(childVal) ? childVal.call(this, this) : childVal, isFunction(parentVal) ? parentVal.call(this, this) : parentVal);
-          };
-      }
-      else {
-          return function mergedInstanceDataFn() {
-              // instance merge
-              var instanceData = isFunction(childVal)
-                  ? childVal.call(vm, vm)
-                  : childVal;
-              var defaultData = isFunction(parentVal)
-                  ? parentVal.call(vm, vm)
-                  : parentVal;
-              if (instanceData) {
-                  return mergeData(instanceData, defaultData);
-              }
-              else {
-                  return defaultData;
-              }
-          };
-      }
-  }
-  strats.data = function (parentVal, childVal, vm) {
-      if (!vm) {
-          if (childVal && typeof childVal !== 'function') {
-              warn$2('The "data" option should be a function ' +
-                      'that returns a per-instance value in component ' +
-                      'definitions.', vm);
-              return parentVal;
-          }
-          return mergeDataOrFn(parentVal, childVal);
-      }
-      return mergeDataOrFn(parentVal, childVal, vm);
-  };
-  /**
-   * Hooks and props are merged as arrays.
-   */
-  function mergeLifecycleHook(parentVal, childVal) {
-      var res = childVal
-          ? parentVal
-              ? parentVal.concat(childVal)
-              : isArray(childVal)
-                  ? childVal
-                  : [childVal]
-          : parentVal;
-      return res ? dedupeHooks(res) : res;
-  }
-  function dedupeHooks(hooks) {
-      var res = [];
-      for (var i = 0; i < hooks.length; i++) {
-          if (res.indexOf(hooks[i]) === -1) {
-              res.push(hooks[i]);
-          }
-      }
-      return res;
-  }
-  LIFECYCLE_HOOKS.forEach(function (hook) {
-      strats[hook] = mergeLifecycleHook;
-  });
-  /**
-   * Assets
-   *
-   * When a vm is present (instance creation), we need to do
-   * a three-way merge between constructor options, instance
-   * options and parent options.
-   */
-  function mergeAssets(parentVal, childVal, vm, key) {
-      var res = Object.create(parentVal || null);
-      if (childVal) {
-          assertObjectType(key, childVal, vm);
-          return extend(res, childVal);
-      }
-      else {
-          return res;
-      }
-  }
-  ASSET_TYPES.forEach(function (type) {
-      strats[type + 's'] = mergeAssets;
-  });
-  /**
-   * Watchers.
-   *
-   * Watchers hashes should not overwrite one
-   * another, so we merge them as arrays.
-   */
-  strats.watch = function (parentVal, childVal, vm, key) {
-      // work around Firefox's Object.prototype.watch...
-      //@ts-expect-error work around
-      if (parentVal === nativeWatch)
-          parentVal = undefined;
-      //@ts-expect-error work around
-      if (childVal === nativeWatch)
-          childVal = undefined;
-      /* istanbul ignore if */
-      if (!childVal)
-          return Object.create(parentVal || null);
-      {
-          assertObjectType(key, childVal, vm);
-      }
-      if (!parentVal)
-          return childVal;
-      var ret = {};
-      extend(ret, parentVal);
-      for (var key_1 in childVal) {
-          var parent_1 = ret[key_1];
-          var child = childVal[key_1];
-          if (parent_1 && !isArray(parent_1)) {
-              parent_1 = [parent_1];
-          }
-          ret[key_1] = parent_1 ? parent_1.concat(child) : isArray(child) ? child : [child];
-      }
-      return ret;
-  };
-  /**
-   * Other object hashes.
-   */
-  strats.props =
-      strats.methods =
-          strats.inject =
-              strats.computed =
-                  function (parentVal, childVal, vm, key) {
-                      if (childVal && true) {
-                          assertObjectType(key, childVal, vm);
-                      }
-                      if (!parentVal)
-                          return childVal;
-                      var ret = Object.create(null);
-                      extend(ret, parentVal);
-                      if (childVal)
-                          extend(ret, childVal);
-                      return ret;
-                  };
-  strats.provide = mergeDataOrFn;
-  /**
-   * Default strategy.
-   */
-  var defaultStrat = function (parentVal, childVal) {
-      return childVal === undefined ? parentVal : childVal;
-  };
-  /**
-   * Validate component names
-   */
-  function checkComponents(options) {
-      for (var key in options.components) {
-          validateComponentName(key);
-      }
-  }
-  function validateComponentName(name) {
-      if (!new RegExp("^[a-zA-Z][\\-\\.0-9_".concat(unicodeRegExp.source, "]*$")).test(name)) {
-          warn$2('Invalid component name: "' +
-              name +
-              '". Component names ' +
-              'should conform to valid custom element name in html5 specification.');
-      }
-      if (isBuiltInTag(name) || config.isReservedTag(name)) {
-          warn$2('Do not use built-in or reserved HTML elements as component ' +
-              'id: ' +
-              name);
-      }
-  }
-  /**
-   * Ensure all props option syntax are normalized into the
-   * Object-based format.
-   */
-  function normalizeProps(options, vm) {
-      var props = options.props;
-      if (!props)
-          return;
-      var res = {};
-      var i, val, name;
-      if (isArray(props)) {
-          i = props.length;
-          while (i--) {
-              val = props[i];
-              if (typeof val === 'string') {
-                  name = camelize(val);
-                  res[name] = { type: null };
-              }
-              else {
-                  warn$2('props must be strings when using array syntax.');
-              }
-          }
-      }
-      else if (isPlainObject(props)) {
-          for (var key in props) {
-              val = props[key];
-              name = camelize(key);
-              res[name] = isPlainObject(val) ? val : { type: val };
-          }
-      }
-      else {
-          warn$2("Invalid value for option \"props\": expected an Array or an Object, " +
-              "but got ".concat(toRawType(props), "."), vm);
-      }
-      options.props = res;
-  }
-  /**
-   * Normalize all injections into Object-based format
-   */
-  function normalizeInject(options, vm) {
-      var inject = options.inject;
-      if (!inject)
-          return;
-      var normalized = (options.inject = {});
-      if (isArray(inject)) {
-          for (var i = 0; i < inject.length; i++) {
-              normalized[inject[i]] = { from: inject[i] };
-          }
-      }
-      else if (isPlainObject(inject)) {
-          for (var key in inject) {
-              var val = inject[key];
-              normalized[key] = isPlainObject(val)
-                  ? extend({ from: key }, val)
-                  : { from: val };
-          }
-      }
-      else {
-          warn$2("Invalid value for option \"inject\": expected an Array or an Object, " +
-              "but got ".concat(toRawType(inject), "."), vm);
-      }
-  }
-  /**
-   * Normalize raw function directives into object format.
-   */
-  function normalizeDirectives$1(options) {
-      var dirs = options.directives;
-      if (dirs) {
-          for (var key in dirs) {
-              var def = dirs[key];
-              if (isFunction(def)) {
-                  dirs[key] = { bind: def, update: def };
-              }
-          }
-      }
-  }
-  function assertObjectType(name, value, vm) {
-      if (!isPlainObject(value)) {
-          warn$2("Invalid value for option \"".concat(name, "\": expected an Object, ") +
-              "but got ".concat(toRawType(value), "."), vm);
-      }
-  }
-  /**
-   * Merge two option objects into a new one.
-   * Core utility used in both instantiation and inheritance.
-   */
-  function mergeOptions(parent, child, vm) {
-      {
-          checkComponents(child);
-      }
-      if (isFunction(child)) {
-          // @ts-expect-error
-          child = child.options;
-      }
-      normalizeProps(child, vm);
-      normalizeInject(child, vm);
-      normalizeDirectives$1(child);
-      // Apply extends and mixins on the child options,
-      // but only if it is a raw options object that isn't
-      // the result of another mergeOptions call.
-      // Only merged options has the _base property.
-      if (!child._base) {
-          if (child.extends) {
-              parent = mergeOptions(parent, child.extends, vm);
-          }
-          if (child.mixins) {
-              for (var i = 0, l = child.mixins.length; i < l; i++) {
-                  parent = mergeOptions(parent, child.mixins[i], vm);
-              }
-          }
-      }
-      var options = {};
-      var key;
-      for (key in parent) {
-          mergeField(key);
-      }
-      for (key in child) {
-          if (!hasOwn(parent, key)) {
-              mergeField(key);
-          }
-      }
-      function mergeField(key) {
-          var strat = strats[key] || defaultStrat;
-          options[key] = strat(parent[key], child[key], vm, key);
-      }
-      return options;
-  }
-  /**
-   * Resolve an asset.
-   * This function is used because child instances need access
-   * to assets defined in its ancestor chain.
-   */
-  function resolveAsset(options, type, id, warnMissing) {
-      /* istanbul ignore if */
-      if (typeof id !== 'string') {
-          return;
-      }
-      var assets = options[type];
-      // check local registration variations first
-      if (hasOwn(assets, id))
-          return assets[id];
-      var camelizedId = camelize(id);
-      if (hasOwn(assets, camelizedId))
-          return assets[camelizedId];
-      var PascalCaseId = capitalize(camelizedId);
-      if (hasOwn(assets, PascalCaseId))
-          return assets[PascalCaseId];
-      // fallback to prototype chain
-      var res = assets[id] || assets[camelizedId] || assets[PascalCaseId];
-      if (warnMissing && !res) {
-          warn$2('Failed to resolve ' + type.slice(0, -1) + ': ' + id);
-      }
-      return res;
-  }
-
-  function validateProp(key, propOptions, propsData, vm) {
-      var prop = propOptions[key];
-      var absent = !hasOwn(propsData, key);
-      var value = propsData[key];
-      // boolean casting
-      var booleanIndex = getTypeIndex(Boolean, prop.type);
-      if (booleanIndex > -1) {
-          if (absent && !hasOwn(prop, 'default')) {
-              value = false;
-          }
-          else if (value === '' || value === hyphenate(key)) {
-              // only cast empty string / same name to boolean if
-              // boolean has higher priority
-              var stringIndex = getTypeIndex(String, prop.type);
-              if (stringIndex < 0 || booleanIndex < stringIndex) {
-                  value = true;
-              }
-          }
-      }
-      // check default value
-      if (value === undefined) {
-          value = getPropDefaultValue(vm, prop, key);
-          // since the default value is a fresh copy,
-          // make sure to observe it.
-          var prevShouldObserve = shouldObserve;
-          toggleObserving(true);
-          observe(value);
-          toggleObserving(prevShouldObserve);
-      }
-      {
-          assertProp(prop, key, value, vm, absent);
-      }
-      return value;
-  }
-  /**
-   * Get the default value of a prop.
-   */
-  function getPropDefaultValue(vm, prop, key) {
-      // no default, return undefined
-      if (!hasOwn(prop, 'default')) {
-          return undefined;
-      }
-      var def = prop.default;
-      // warn against non-factory defaults for Object & Array
-      if (isObject(def)) {
-          warn$2('Invalid default value for prop "' +
-              key +
-              '": ' +
-              'Props with type Object/Array must use a factory function ' +
-              'to return the default value.', vm);
-      }
-      // the raw prop value was also undefined from previous render,
-      // return previous default value to avoid unnecessary watcher trigger
-      if (vm &&
-          vm.$options.propsData &&
-          vm.$options.propsData[key] === undefined &&
-          vm._props[key] !== undefined) {
-          return vm._props[key];
-      }
-      // call factory function for non-Function types
-      // a value is Function if its prototype is function even across different execution context
-      return isFunction(def) && getType(prop.type) !== 'Function'
-          ? def.call(vm)
-          : def;
-  }
-  /**
-   * Assert whether a prop is valid.
-   */
-  function assertProp(prop, name, value, vm, absent) {
-      if (prop.required && absent) {
-          warn$2('Missing required prop: "' + name + '"', vm);
-          return;
-      }
-      if (value == null && !prop.required) {
-          return;
-      }
-      var type = prop.type;
-      var valid = !type || type === true;
-      var expectedTypes = [];
-      if (type) {
-          if (!isArray(type)) {
-              type = [type];
-          }
-          for (var i = 0; i < type.length && !valid; i++) {
-              var assertedType = assertType(value, type[i], vm);
-              expectedTypes.push(assertedType.expectedType || '');
-              valid = assertedType.valid;
-          }
-      }
-      var haveExpectedTypes = expectedTypes.some(function (t) { return t; });
-      if (!valid && haveExpectedTypes) {
-          warn$2(getInvalidTypeMessage(name, value, expectedTypes), vm);
-          return;
-      }
-      var validator = prop.validator;
-      if (validator) {
-          if (!validator(value)) {
-              warn$2('Invalid prop: custom validator check failed for prop "' + name + '".', vm);
-          }
-      }
-  }
-  var simpleCheckRE = /^(String|Number|Boolean|Function|Symbol|BigInt)$/;
-  function assertType(value, type, vm) {
-      var valid;
-      var expectedType = getType(type);
-      if (simpleCheckRE.test(expectedType)) {
-          var t = typeof value;
-          valid = t === expectedType.toLowerCase();
-          // for primitive wrapper objects
-          if (!valid && t === 'object') {
-              valid = value instanceof type;
-          }
-      }
-      else if (expectedType === 'Object') {
-          valid = isPlainObject(value);
-      }
-      else if (expectedType === 'Array') {
-          valid = isArray(value);
-      }
-      else {
-          try {
-              valid = value instanceof type;
-          }
-          catch (e) {
-              warn$2('Invalid prop type: "' + String(type) + '" is not a constructor', vm);
-              valid = false;
-          }
-      }
-      return {
-          valid: valid,
-          expectedType: expectedType
-      };
-  }
-  var functionTypeCheckRE = /^\s*function (\w+)/;
-  /**
-   * Use function string name to check built-in types,
-   * because a simple equality check will fail when running
-   * across different vms / iframes.
-   */
-  function getType(fn) {
-      var match = fn && fn.toString().match(functionTypeCheckRE);
-      return match ? match[1] : '';
-  }
-  function isSameType(a, b) {
-      return getType(a) === getType(b);
-  }
-  function getTypeIndex(type, expectedTypes) {
-      if (!isArray(expectedTypes)) {
-          return isSameType(expectedTypes, type) ? 0 : -1;
-      }
-      for (var i = 0, len = expectedTypes.length; i < len; i++) {
-          if (isSameType(expectedTypes[i], type)) {
-              return i;
-          }
-      }
-      return -1;
-  }
-  function getInvalidTypeMessage(name, value, expectedTypes) {
-      var message = "Invalid prop: type check failed for prop \"".concat(name, "\".") +
-          " Expected ".concat(expectedTypes.map(capitalize).join(', '));
-      var expectedType = expectedTypes[0];
-      var receivedType = toRawType(value);
-      // check if we need to specify expected value
-      if (expectedTypes.length === 1 &&
-          isExplicable(expectedType) &&
-          isExplicable(typeof value) &&
-          !isBoolean(expectedType, receivedType)) {
-          message += " with value ".concat(styleValue(value, expectedType));
-      }
-      message += ", got ".concat(receivedType, " ");
-      // check if we need to specify received value
-      if (isExplicable(receivedType)) {
-          message += "with value ".concat(styleValue(value, receivedType), ".");
-      }
-      return message;
-  }
-  function styleValue(value, type) {
-      if (type === 'String') {
-          return "\"".concat(value, "\"");
-      }
-      else if (type === 'Number') {
-          return "".concat(Number(value));
-      }
-      else {
-          return "".concat(value);
-      }
-  }
-  var EXPLICABLE_TYPES = ['string', 'number', 'boolean'];
-  function isExplicable(value) {
-      return EXPLICABLE_TYPES.some(function (elem) { return value.toLowerCase() === elem; });
-  }
-  function isBoolean() {
-      var args = [];
-      for (var _i = 0; _i < arguments.length; _i++) {
-          args[_i] = arguments[_i];
-      }
-      return args.some(function (elem) { return elem.toLowerCase() === 'boolean'; });
-  }
-
-  function Vue(options) {
-      if (!(this instanceof Vue)) {
-          warn$2('Vue is a constructor and should be called with the `new` keyword');
-      }
-      this._init(options);
-  }
-  //@ts-expect-error Vue has function type
-  initMixin$1(Vue);
-  //@ts-expect-error Vue has function type
-  stateMixin(Vue);
-  //@ts-expect-error Vue has function type
-  eventsMixin(Vue);
-  //@ts-expect-error Vue has function type
-  lifecycleMixin(Vue);
-  //@ts-expect-error Vue has function type
-  renderMixin(Vue);
-
-  function initUse(Vue) {
-      Vue.use = function (plugin) {
-          var installedPlugins = this._installedPlugins || (this._installedPlugins = []);
-          if (installedPlugins.indexOf(plugin) > -1) {
-              return this;
-          }
-          // additional parameters
-          var args = toArray(arguments, 1);
-          args.unshift(this);
-          if (isFunction(plugin.install)) {
-              plugin.install.apply(plugin, args);
-          }
-          else if (isFunction(plugin)) {
-              plugin.apply(null, args);
-          }
-          installedPlugins.push(plugin);
-          return this;
-      };
-  }
-
-  function initMixin(Vue) {
-      Vue.mixin = function (mixin) {
-          this.options = mergeOptions(this.options, mixin);
-          return this;
-      };
-  }
-
-  function initExtend(Vue) {
-      /**
-       * Each instance constructor, including Vue, has a unique
-       * cid. This enables us to create wrapped "child
-       * constructors" for prototypal inheritance and cache them.
-       */
-      Vue.cid = 0;
-      var cid = 1;
-      /**
-       * Class inheritance
-       */
-      Vue.extend = function (extendOptions) {
-          extendOptions = extendOptions || {};
-          var Super = this;
-          var SuperId = Super.cid;
-          var cachedCtors = extendOptions._Ctor || (extendOptions._Ctor = {});
-          if (cachedCtors[SuperId]) {
-              return cachedCtors[SuperId];
-          }
-          var name = getComponentName(extendOptions) || getComponentName(Super.options);
-          if (name) {
-              validateComponentName(name);
-          }
-          var Sub = function VueComponent(options) {
-              this._init(options);
-          };
-          Sub.prototype = Object.create(Super.prototype);
-          Sub.prototype.constructor = Sub;
-          Sub.cid = cid++;
-          Sub.options = mergeOptions(Super.options, extendOptions);
-          Sub['super'] = Super;
-          // For props and computed properties, we define the proxy getters on
-          // the Vue instances at extension time, on the extended prototype. This
-          // avoids Object.defineProperty calls for each instance created.
-          if (Sub.options.props) {
-              initProps(Sub);
-          }
-          if (Sub.options.computed) {
-              initComputed(Sub);
-          }
-          // allow further extension/mixin/plugin usage
-          Sub.extend = Super.extend;
-          Sub.mixin = Super.mixin;
-          Sub.use = Super.use;
-          // create asset registers, so extended classes
-          // can have their private assets too.
-          ASSET_TYPES.forEach(function (type) {
-              Sub[type] = Super[type];
-          });
-          // enable recursive self-lookup
-          if (name) {
-              Sub.options.components[name] = Sub;
-          }
-          // keep a reference to the super options at extension time.
-          // later at instantiation we can check if Super's options have
-          // been updated.
-          Sub.superOptions = Super.options;
-          Sub.extendOptions = extendOptions;
-          Sub.sealedOptions = extend({}, Sub.options);
-          // cache constructor
-          cachedCtors[SuperId] = Sub;
-          return Sub;
-      };
-  }
-  function initProps(Comp) {
-      var props = Comp.options.props;
-      for (var key in props) {
-          proxy(Comp.prototype, "_props", key);
-      }
-  }
-  function initComputed(Comp) {
-      var computed = Comp.options.computed;
-      for (var key in computed) {
-          defineComputed(Comp.prototype, key, computed[key]);
-      }
-  }
-
-  function initAssetRegisters(Vue) {
-      /**
-       * Create asset registration methods.
-       */
-      ASSET_TYPES.forEach(function (type) {
-          // @ts-expect-error function is not exact same type
-          Vue[type] = function (id, definition) {
-              if (!definition) {
-                  return this.options[type + 's'][id];
-              }
-              else {
-                  /* istanbul ignore if */
-                  if (type === 'component') {
-                      validateComponentName(id);
-                  }
-                  if (type === 'component' && isPlainObject(definition)) {
-                      // @ts-expect-error
-                      definition.name = definition.name || id;
-                      definition = this.options._base.extend(definition);
-                  }
-                  if (type === 'directive' && isFunction(definition)) {
-                      definition = { bind: definition, update: definition };
-                  }
-                  this.options[type + 's'][id] = definition;
-                  return definition;
-              }
-          };
-      });
-  }
-
-  function _getComponentName(opts) {
-      return opts && (getComponentName(opts.Ctor.options) || opts.tag);
-  }
-  function matches(pattern, name) {
-      if (isArray(pattern)) {
-          return pattern.indexOf(name) > -1;
-      }
-      else if (typeof pattern === 'string') {
-          return pattern.split(',').indexOf(name) > -1;
-      }
-      else if (isRegExp(pattern)) {
-          return pattern.test(name);
-      }
-      /* istanbul ignore next */
-      return false;
-  }
-  function pruneCache(keepAliveInstance, filter) {
-      var cache = keepAliveInstance.cache, keys = keepAliveInstance.keys, _vnode = keepAliveInstance._vnode;
-      for (var key in cache) {
-          var entry = cache[key];
-          if (entry) {
-              var name_1 = entry.name;
-              if (name_1 && !filter(name_1)) {
-                  pruneCacheEntry(cache, key, keys, _vnode);
-              }
-          }
-      }
-  }
-  function pruneCacheEntry(cache, key, keys, current) {
-      var entry = cache[key];
-      if (entry && (!current || entry.tag !== current.tag)) {
-          // @ts-expect-error can be undefined
-          entry.componentInstance.$destroy();
-      }
-      cache[key] = null;
-      remove$2(keys, key);
-  }
-  var patternTypes = [String, RegExp, Array];
-  // TODO defineComponent
-  var KeepAlive = {
-      name: 'keep-alive',
-      abstract: true,
-      props: {
-          include: patternTypes,
-          exclude: patternTypes,
-          max: [String, Number]
-      },
-      methods: {
-          cacheVNode: function () {
-              var _a = this, cache = _a.cache, keys = _a.keys, vnodeToCache = _a.vnodeToCache, keyToCache = _a.keyToCache;
-              if (vnodeToCache) {
-                  var tag = vnodeToCache.tag, componentInstance = vnodeToCache.componentInstance, componentOptions = vnodeToCache.componentOptions;
-                  cache[keyToCache] = {
-                      name: _getComponentName(componentOptions),
-                      tag: tag,
-                      componentInstance: componentInstance
-                  };
-                  keys.push(keyToCache);
-                  // prune oldest entry
-                  if (this.max && keys.length > parseInt(this.max)) {
-                      pruneCacheEntry(cache, keys[0], keys, this._vnode);
-                  }
-                  this.vnodeToCache = null;
-              }
-          }
-      },
-      created: function () {
-          this.cache = Object.create(null);
-          this.keys = [];
-      },
-      destroyed: function () {
-          for (var key in this.cache) {
-              pruneCacheEntry(this.cache, key, this.keys);
-          }
-      },
-      mounted: function () {
-          var _this = this;
-          this.cacheVNode();
-          this.$watch('include', function (val) {
-              pruneCache(_this, function (name) { return matches(val, name); });
-          });
-          this.$watch('exclude', function (val) {
-              pruneCache(_this, function (name) { return !matches(val, name); });
-          });
-      },
-      updated: function () {
-          this.cacheVNode();
-      },
-      render: function () {
-          var slot = this.$slots.default;
-          var vnode = getFirstComponentChild(slot);
-          var componentOptions = vnode && vnode.componentOptions;
-          if (componentOptions) {
-              // check pattern
-              var name_2 = _getComponentName(componentOptions);
-              var _a = this, include = _a.include, exclude = _a.exclude;
-              if (
-              // not included
-              (include && (!name_2 || !matches(include, name_2))) ||
-                  // excluded
-                  (exclude && name_2 && matches(exclude, name_2))) {
-                  return vnode;
-              }
-              var _b = this, cache = _b.cache, keys = _b.keys;
-              var key = vnode.key == null
-                  ? // same constructor may get registered as different local components
-                      // so cid alone is not enough (#3269)
-                      componentOptions.Ctor.cid +
-                          (componentOptions.tag ? "::".concat(componentOptions.tag) : '')
-                  : vnode.key;
-              if (cache[key]) {
-                  vnode.componentInstance = cache[key].componentInstance;
-                  // make current key freshest
-                  remove$2(keys, key);
-                  keys.push(key);
-              }
-              else {
-                  // delay setting the cache until update
-                  this.vnodeToCache = vnode;
-                  this.keyToCache = key;
-              }
-              // @ts-expect-error can vnode.data can be undefined
-              vnode.data.keepAlive = true;
-          }
-          return vnode || (slot && slot[0]);
-      }
-  };
-
-  var builtInComponents = {
-      KeepAlive: KeepAlive
-  };
-
-  function initGlobalAPI(Vue) {
-      // config
-      var configDef = {};
-      configDef.get = function () { return config; };
-      {
-          configDef.set = function () {
-              warn$2('Do not replace the Vue.config object, set individual fields instead.');
-          };
-      }
-      Object.defineProperty(Vue, 'config', configDef);
-      // exposed util methods.
-      // NOTE: these are not considered part of the public API - avoid relying on
-      // them unless you are aware of the risk.
-      Vue.util = {
-          warn: warn$2,
-          extend: extend,
-          mergeOptions: mergeOptions,
-          defineReactive: defineReactive
-      };
-      Vue.set = set;
-      Vue.delete = del;
-      Vue.nextTick = nextTick;
-      // 2.6 explicit observable API
-      Vue.observable = function (obj) {
-          observe(obj);
-          return obj;
-      };
-      Vue.options = Object.create(null);
-      ASSET_TYPES.forEach(function (type) {
-          Vue.options[type + 's'] = Object.create(null);
-      });
-      // this is used to identify the "base" constructor to extend all plain-object
-      // components with in Weex's multi-instance scenarios.
-      Vue.options._base = Vue;
-      extend(Vue.options.components, builtInComponents);
-      initUse(Vue);
-      initMixin(Vue);
-      initExtend(Vue);
-      initAssetRegisters(Vue);
-  }
-
-  initGlobalAPI(Vue);
-  Object.defineProperty(Vue.prototype, '$isServer', {
-      get: isServerRendering
-  });
-  Object.defineProperty(Vue.prototype, '$ssrContext', {
-      get: function () {
-          /* istanbul ignore next */
-          return this.$vnode && this.$vnode.ssrContext;
-      }
-  });
-  // expose FunctionalRenderContext for ssr runtime helper installation
-  Object.defineProperty(Vue, 'FunctionalRenderContext', {
-      value: FunctionalRenderContext
-  });
-  Vue.version = version;
-
-  // these are reserved for web because they are directly compiled away
-  // during template compilation
-  var isReservedAttr = makeMap('style,class');
-  // attributes that should be using props for binding
-  var acceptValue = makeMap('input,textarea,option,select,progress');
-  var mustUseProp = function (tag, type, attr) {
-      return ((attr === 'value' && acceptValue(tag) && type !== 'button') ||
-          (attr === 'selected' && tag === 'option') ||
-          (attr === 'checked' && tag === 'input') ||
-          (attr === 'muted' && tag === 'video'));
-  };
-  var isEnumeratedAttr = makeMap('contenteditable,draggable,spellcheck');
-  var isValidContentEditableValue = makeMap('events,caret,typing,plaintext-only');
-  var convertEnumeratedValue = function (key, value) {
-      return isFalsyAttrValue(value) || value === 'false'
-          ? 'false'
-          : // allow arbitrary string value for contenteditable
-              key === 'contenteditable' && isValidContentEditableValue(value)
-                  ? value
-                  : 'true';
-  };
-  var isBooleanAttr = makeMap('allowfullscreen,async,autofocus,autoplay,checked,compact,controls,declare,' +
-      'default,defaultchecked,defaultmuted,defaultselected,defer,disabled,' +
-      'enabled,formnovalidate,hidden,indeterminate,inert,ismap,itemscope,loop,multiple,' +
-      'muted,nohref,noresize,noshade,novalidate,nowrap,open,pauseonexit,readonly,' +
-      'required,reversed,scoped,seamless,selected,sortable,' +
-      'truespeed,typemustmatch,visible');
-  var xlinkNS = 'http://www.w3.org/1999/xlink';
-  var isXlink = function (name) {
-      return name.charAt(5) === ':' && name.slice(0, 5) === 'xlink';
-  };
-  var getXlinkProp = function (name) {
-      return isXlink(name) ? name.slice(6, name.length) : '';
-  };
-  var isFalsyAttrValue = function (val) {
-      return val == null || val === false;
-  };
-
-  function genClassForVnode(vnode) {
-      var data = vnode.data;
-      var parentNode = vnode;
-      var childNode = vnode;
-      while (isDef(childNode.componentInstance)) {
-          childNode = childNode.componentInstance._vnode;
-          if (childNode && childNode.data) {
-              data = mergeClassData(childNode.data, data);
-          }
-      }
-      // @ts-expect-error parentNode.parent not VNodeWithData
-      while (isDef((parentNode = parentNode.parent))) {
-          if (parentNode && parentNode.data) {
-              data = mergeClassData(data, parentNode.data);
-          }
-      }
-      return renderClass(data.staticClass, data.class);
-  }
-  function mergeClassData(child, parent) {
-      return {
-          staticClass: concat(child.staticClass, parent.staticClass),
-          class: isDef(child.class) ? [child.class, parent.class] : parent.class
-      };
-  }
-  function renderClass(staticClass, dynamicClass) {
-      if (isDef(staticClass) || isDef(dynamicClass)) {
-          return concat(staticClass, stringifyClass(dynamicClass));
-      }
-      /* istanbul ignore next */
-      return '';
-  }
-  function concat(a, b) {
-      return a ? (b ? a + ' ' + b : a) : b || '';
-  }
-  function stringifyClass(value) {
-      if (Array.isArray(value)) {
-          return stringifyArray(value);
-      }
-      if (isObject(value)) {
-          return stringifyObject(value);
-      }
-      if (typeof value === 'string') {
-          return value;
-      }
-      /* istanbul ignore next */
-      return '';
-  }
-  function stringifyArray(value) {
-      var res = '';
-      var stringified;
-      for (var i = 0, l = value.length; i < l; i++) {
-          if (isDef((stringified = stringifyClass(value[i]))) && stringified !== '') {
-              if (res)
-                  res += ' ';
-              res += stringified;
-          }
-      }
-      return res;
-  }
-  function stringifyObject(value) {
-      var res = '';
-      for (var key in value) {
-          if (value[key]) {
-              if (res)
-                  res += ' ';
-              res += key;
-          }
-      }
-      return res;
-  }
-
-  var namespaceMap = {
-      svg: 'http://www.w3.org/2000/svg',
-      math: 'http://www.w3.org/1998/Math/MathML'
-  };
-  var isHTMLTag = makeMap('html,body,base,head,link,meta,style,title,' +
-      'address,article,aside,footer,header,h1,h2,h3,h4,h5,h6,hgroup,nav,section,' +
-      'div,dd,dl,dt,figcaption,figure,picture,hr,img,li,main,ol,p,pre,ul,' +
-      'a,b,abbr,bdi,bdo,br,cite,code,data,dfn,em,i,kbd,mark,q,rp,rt,rtc,ruby,' +
-      's,samp,small,span,strong,sub,sup,time,u,var,wbr,area,audio,map,track,video,' +
-      'embed,object,param,source,canvas,script,noscript,del,ins,' +
-      'caption,col,colgroup,table,thead,tbody,td,th,tr,' +
-      'button,datalist,fieldset,form,input,label,legend,meter,optgroup,option,' +
-      'output,progress,select,textarea,' +
-      'details,dialog,menu,menuitem,summary,' +
-      'content,element,shadow,template,blockquote,iframe,tfoot');
-  // this map is intentionally selective, only covering SVG elements that may
-  // contain child elements.
-  var isSVG = makeMap('svg,animate,circle,clippath,cursor,defs,desc,ellipse,filter,font-face,' +
-      'foreignobject,g,glyph,image,line,marker,mask,missing-glyph,path,pattern,' +
-      'polygon,polyline,rect,switch,symbol,text,textpath,tspan,use,view', true);
-  var isPreTag = function (tag) { return tag === 'pre'; };
-  var isReservedTag = function (tag) {
-      return isHTMLTag(tag) || isSVG(tag);
-  };
-  function getTagNamespace(tag) {
-      if (isSVG(tag)) {
-          return 'svg';
-      }
-      // basic support for MathML
-      // note it doesn't support other MathML elements being component roots
-      if (tag === 'math') {
-          return 'math';
-      }
-  }
-  var unknownElementCache = Object.create(null);
-  function isUnknownElement(tag) {
-      /* istanbul ignore if */
-      if (!inBrowser) {
-          return true;
-      }
-      if (isReservedTag(tag)) {
-          return false;
-      }
-      tag = tag.toLowerCase();
-      /* istanbul ignore if */
-      if (unknownElementCache[tag] != null) {
-          return unknownElementCache[tag];
-      }
-      var el = document.createElement(tag);
-      if (tag.indexOf('-') > -1) {
-          // http://stackoverflow.com/a/28210364/1070244
-          return (unknownElementCache[tag] =
-              el.constructor === window.HTMLUnknownElement ||
-                  el.constructor === window.HTMLElement);
-      }
-      else {
-          return (unknownElementCache[tag] = /HTMLUnknownElement/.test(el.toString()));
-      }
-  }
-  var isTextInputType = makeMap('text,number,password,search,email,tel,url');
-
-  /**
-   * Query an element selector if it's not an element already.
-   */
-  function query(el) {
-      if (typeof el === 'string') {
-          var selected = document.querySelector(el);
-          if (!selected) {
-              warn$2('Cannot find element: ' + el);
-              return document.createElement('div');
-          }
-          return selected;
-      }
-      else {
-          return el;
-      }
-  }
-
-  function createElement(tagName, vnode) {
-      var elm = document.createElement(tagName);
-      if (tagName !== 'select') {
-          return elm;
-      }
-      // false or null will remove the attribute but undefined will not
-      if (vnode.data &&
-          vnode.data.attrs &&
-          vnode.data.attrs.multiple !== undefined) {
-          elm.setAttribute('multiple', 'multiple');
-      }
-      return elm;
-  }
-  function createElementNS(namespace, tagName) {
-      return document.createElementNS(namespaceMap[namespace], tagName);
-  }
-  function createTextNode(text) {
-      return document.createTextNode(text);
-  }
-  function createComment(text) {
-      return document.createComment(text);
-  }
-  function insertBefore(parentNode, newNode, referenceNode) {
-      parentNode.insertBefore(newNode, referenceNode);
-  }
-  function removeChild(node, child) {
-      node.removeChild(child);
-  }
-  function appendChild(node, child) {
-      node.appendChild(child);
-  }
-  function parentNode(node) {
-      return node.parentNode;
-  }
-  function nextSibling(node) {
-      return node.nextSibling;
-  }
-  function tagName(node) {
-      return node.tagName;
-  }
-  function setTextContent(node, text) {
-      node.textContent = text;
-  }
-  function setStyleScope(node, scopeId) {
-      node.setAttribute(scopeId, '');
-  }
-
-  var nodeOps = /*#__PURE__*/Object.freeze({
-    __proto__: null,
-    createElement: createElement,
-    createElementNS: createElementNS,
-    createTextNode: createTextNode,
-    createComment: createComment,
-    insertBefore: insertBefore,
-    removeChild: removeChild,
-    appendChild: appendChild,
-    parentNode: parentNode,
-    nextSibling: nextSibling,
-    tagName: tagName,
-    setTextContent: setTextContent,
-    setStyleScope: setStyleScope
-  });
-
-  var ref = {
-      create: function (_, vnode) {
-          registerRef(vnode);
-      },
-      update: function (oldVnode, vnode) {
-          if (oldVnode.data.ref !== vnode.data.ref) {
-              registerRef(oldVnode, true);
-              registerRef(vnode);
-          }
-      },
-      destroy: function (vnode) {
-          registerRef(vnode, true);
-      }
-  };
-  function registerRef(vnode, isRemoval) {
-      var ref = vnode.data.ref;
-      if (!isDef(ref))
-          return;
-      var vm = vnode.context;
-      var refValue = vnode.componentInstance || vnode.elm;
-      var value = isRemoval ? null : refValue;
-      var $refsValue = isRemoval ? undefined : refValue;
-      if (isFunction(ref)) {
-          invokeWithErrorHandling(ref, vm, [value], vm, "template ref function");
-          return;
-      }
-      var isFor = vnode.data.refInFor;
-      var _isString = typeof ref === 'string' || typeof ref === 'number';
-      var _isRef = isRef(ref);
-      var refs = vm.$refs;
-      if (_isString || _isRef) {
-          if (isFor) {
-              var existing = _isString ? refs[ref] : ref.value;
-              if (isRemoval) {
-                  isArray(existing) && remove$2(existing, refValue);
-              }
-              else {
-                  if (!isArray(existing)) {
-                      if (_isString) {
-                          refs[ref] = [refValue];
-                          setSetupRef(vm, ref, refs[ref]);
-                      }
-                      else {
-                          ref.value = [refValue];
-                      }
-                  }
-                  else if (!existing.includes(refValue)) {
-                      existing.push(refValue);
-                  }
-              }
-          }
-          else if (_isString) {
-              if (isRemoval && refs[ref] !== refValue) {
-                  return;
-              }
-              refs[ref] = $refsValue;
-              setSetupRef(vm, ref, value);
-          }
-          else if (_isRef) {
-              if (isRemoval && ref.value !== refValue) {
-                  return;
-              }
-              ref.value = value;
-          }
-          else {
-              warn$2("Invalid template ref type: ".concat(typeof ref));
-          }
-      }
-  }
-  function setSetupRef(_a, key, val) {
-      var _setupState = _a._setupState;
-      if (_setupState && hasOwn(_setupState, key)) {
-          if (isRef(_setupState[key])) {
-              _setupState[key].value = val;
-          }
-          else {
-              _setupState[key] = val;
-          }
-      }
-  }
-
-  /**
-   * Virtual DOM patching algorithm based on Snabbdom by
-   * Simon Friis Vindum (@paldepind)
-   * Licensed under the MIT License
-   * https://github.com/paldepind/snabbdom/blob/master/LICENSE
-   *
-   * modified by Evan You (@yyx990803)
-   *
-   * Not type-checking this because this file is perf-critical and the cost
-   * of making flow understand it is not worth it.
-   */
-  var emptyNode = new VNode('', {}, []);
-  var hooks = ['create', 'activate', 'update', 'remove', 'destroy'];
-  function sameVnode(a, b) {
-      return (a.key === b.key &&
-          a.asyncFactory === b.asyncFactory &&
-          ((a.tag === b.tag &&
-              a.isComment === b.isComment &&
-              isDef(a.data) === isDef(b.data) &&
-              sameInputType(a, b)) ||
-              (isTrue(a.isAsyncPlaceholder) && isUndef(b.asyncFactory.error))));
-  }
-  function sameInputType(a, b) {
-      if (a.tag !== 'input')
-          return true;
-      var i;
-      var typeA = isDef((i = a.data)) && isDef((i = i.attrs)) && i.type;
-      var typeB = isDef((i = b.data)) && isDef((i = i.attrs)) && i.type;
-      return typeA === typeB || (isTextInputType(typeA) && isTextInputType(typeB));
-  }
-  function createKeyToOldIdx(children, beginIdx, endIdx) {
-      var i, key;
-      var map = {};
-      for (i = beginIdx; i <= endIdx; ++i) {
-          key = children[i].key;
-          if (isDef(key))
-              map[key] = i;
-      }
-      return map;
-  }
-  function createPatchFunction(backend) {
-      var i, j;
-      var cbs = {};
-      var modules = backend.modules, nodeOps = backend.nodeOps;
-      for (i = 0; i < hooks.length; ++i) {
-          cbs[hooks[i]] = [];
-          for (j = 0; j < modules.length; ++j) {
-              if (isDef(modules[j][hooks[i]])) {
-                  cbs[hooks[i]].push(modules[j][hooks[i]]);
-              }
-          }
-      }
-      function emptyNodeAt(elm) {
-          return new VNode(nodeOps.tagName(elm).toLowerCase(), {}, [], undefined, elm);
-      }
-      function createRmCb(childElm, listeners) {
-          function remove() {
-              if (--remove.listeners === 0) {
-                  removeNode(childElm);
-              }
-          }
-          remove.listeners = listeners;
-          return remove;
-      }
-      function removeNode(el) {
-          var parent = nodeOps.parentNode(el);
-          // element may have already been removed due to v-html / v-text
-          if (isDef(parent)) {
-              nodeOps.removeChild(parent, el);
-          }
-      }
-      function isUnknownElement(vnode, inVPre) {
-          return (!inVPre &&
-              !vnode.ns &&
-              !(config.ignoredElements.length &&
-                  config.ignoredElements.some(function (ignore) {
-                      return isRegExp(ignore)
-                          ? ignore.test(vnode.tag)
-                          : ignore === vnode.tag;
-                  })) &&
-              config.isUnknownElement(vnode.tag));
-      }
-      var creatingElmInVPre = 0;
-      function createElm(vnode, insertedVnodeQueue, parentElm, refElm, nested, ownerArray, index) {
-          if (isDef(vnode.elm) && isDef(ownerArray)) {
-              // This vnode was used in a previous render!
-              // now it's used as a new node, overwriting its elm would cause
-              // potential patch errors down the road when it's used as an insertion
-              // reference node. Instead, we clone the node on-demand before creating
-              // associated DOM element for it.
-              vnode = ownerArray[index] = cloneVNode(vnode);
-          }
-          vnode.isRootInsert = !nested; // for transition enter check
-          if (createComponent(vnode, insertedVnodeQueue, parentElm, refElm)) {
-              return;
-          }
-          var data = vnode.data;
-          var children = vnode.children;
-          var tag = vnode.tag;
-          if (isDef(tag)) {
-              {
-                  if (data && data.pre) {
-                      creatingElmInVPre++;
-                  }
-                  if (isUnknownElement(vnode, creatingElmInVPre)) {
-                      warn$2('Unknown custom element: <' +
-                          tag +
-                          '> - did you ' +
-                          'register the component correctly? For recursive components, ' +
-                          'make sure to provide the "name" option.', vnode.context);
-                  }
-              }
-              vnode.elm = vnode.ns
-                  ? nodeOps.createElementNS(vnode.ns, tag)
-                  : nodeOps.createElement(tag, vnode);
-              setScope(vnode);
-              createChildren(vnode, children, insertedVnodeQueue);
-              if (isDef(data)) {
-                  invokeCreateHooks(vnode, insertedVnodeQueue);
-              }
-              insert(parentElm, vnode.elm, refElm);
-              if (data && data.pre) {
-                  creatingElmInVPre--;
-              }
-          }
-          else if (isTrue(vnode.isComment)) {
-              vnode.elm = nodeOps.createComment(vnode.text);
-              insert(parentElm, vnode.elm, refElm);
-          }
-          else {
-              vnode.elm = nodeOps.createTextNode(vnode.text);
-              insert(parentElm, vnode.elm, refElm);
-          }
-      }
-      function createComponent(vnode, insertedVnodeQueue, parentElm, refElm) {
-          var i = vnode.data;
-          if (isDef(i)) {
-              var isReactivated = isDef(vnode.componentInstance) && i.keepAlive;
-              if (isDef((i = i.hook)) && isDef((i = i.init))) {
-                  i(vnode, false /* hydrating */);
-              }
-              // after calling the init hook, if the vnode is a child component
-              // it should've created a child instance and mounted it. the child
-              // component also has set the placeholder vnode's elm.
-              // in that case we can just return the element and be done.
-              if (isDef(vnode.componentInstance)) {
-                  initComponent(vnode, insertedVnodeQueue);
-                  insert(parentElm, vnode.elm, refElm);
-                  if (isTrue(isReactivated)) {
-                      reactivateComponent(vnode, insertedVnodeQueue, parentElm, refElm);
-                  }
-                  return true;
-              }
-          }
-      }
-      function initComponent(vnode, insertedVnodeQueue) {
-          if (isDef(vnode.data.pendingInsert)) {
-              insertedVnodeQueue.push.apply(insertedVnodeQueue, vnode.data.pendingInsert);
-              vnode.data.pendingInsert = null;
-          }
-          vnode.elm = vnode.componentInstance.$el;
-          if (isPatchable(vnode)) {
-              invokeCreateHooks(vnode, insertedVnodeQueue);
-              setScope(vnode);
-          }
-          else {
-              // empty component root.
-              // skip all element-related modules except for ref (#3455)
-              registerRef(vnode);
-              // make sure to invoke the insert hook
-              insertedVnodeQueue.push(vnode);
-          }
-      }
-      function reactivateComponent(vnode, insertedVnodeQueue, parentElm, refElm) {
-          var i;
-          // hack for #4339: a reactivated component with inner transition
-          // does not trigger because the inner node's created hooks are not called
-          // again. It's not ideal to involve module-specific logic in here but
-          // there doesn't seem to be a better way to do it.
-          var innerNode = vnode;
-          while (innerNode.componentInstance) {
-              innerNode = innerNode.componentInstance._vnode;
-              if (isDef((i = innerNode.data)) && isDef((i = i.transition))) {
-                  for (i = 0; i < cbs.activate.length; ++i) {
-                      cbs.activate[i](emptyNode, innerNode);
-                  }
-                  insertedVnodeQueue.push(innerNode);
-                  break;
-              }
-          }
-          // unlike a newly created component,
-          // a reactivated keep-alive component doesn't insert itself
-          insert(parentElm, vnode.elm, refElm);
-      }
-      function insert(parent, elm, ref) {
-          if (isDef(parent)) {
-              if (isDef(ref)) {
-                  if (nodeOps.parentNode(ref) === parent) {
-                      nodeOps.insertBefore(parent, elm, ref);
-                  }
-              }
-              else {
-                  nodeOps.appendChild(parent, elm);
-              }
-          }
-      }
-      function createChildren(vnode, children, insertedVnodeQueue) {
-          if (isArray(children)) {
-              {
-                  checkDuplicateKeys(children);
-              }
-              for (var i_1 = 0; i_1 < children.length; ++i_1) {
-                  createElm(children[i_1], insertedVnodeQueue, vnode.elm, null, true, children, i_1);
-              }
-          }
-          else if (isPrimitive(vnode.text)) {
-              nodeOps.appendChild(vnode.elm, nodeOps.createTextNode(String(vnode.text)));
-          }
-      }
-      function isPatchable(vnode) {
-          while (vnode.componentInstance) {
-              vnode = vnode.componentInstance._vnode;
-          }
-          return isDef(vnode.tag);
-      }
-      function invokeCreateHooks(vnode, insertedVnodeQueue) {
-          for (var i_2 = 0; i_2 < cbs.create.length; ++i_2) {
-              cbs.create[i_2](emptyNode, vnode);
-          }
-          i = vnode.data.hook; // Reuse variable
-          if (isDef(i)) {
-              if (isDef(i.create))
-                  i.create(emptyNode, vnode);
-              if (isDef(i.insert))
-                  insertedVnodeQueue.push(vnode);
-          }
-      }
-      // set scope id attribute for scoped CSS.
-      // this is implemented as a special case to avoid the overhead
-      // of going through the normal attribute patching process.
-      function setScope(vnode) {
-          var i;
-          if (isDef((i = vnode.fnScopeId))) {
-              nodeOps.setStyleScope(vnode.elm, i);
-          }
-          else {
-              var ancestor = vnode;
-              while (ancestor) {
-                  if (isDef((i = ancestor.context)) && isDef((i = i.$options._scopeId))) {
-                      nodeOps.setStyleScope(vnode.elm, i);
-                  }
-                  ancestor = ancestor.parent;
-              }
-          }
-          // for slot content they should also get the scopeId from the host instance.
-          if (isDef((i = activeInstance)) &&
-              i !== vnode.context &&
-              i !== vnode.fnContext &&
-              isDef((i = i.$options._scopeId))) {
-              nodeOps.setStyleScope(vnode.elm, i);
-          }
-      }
-      function addVnodes(parentElm, refElm, vnodes, startIdx, endIdx, insertedVnodeQueue) {
-          for (; startIdx <= endIdx; ++startIdx) {
-              createElm(vnodes[startIdx], insertedVnodeQueue, parentElm, refElm, false, vnodes, startIdx);
-          }
-      }
-      function invokeDestroyHook(vnode) {
-          var i, j;
-          var data = vnode.data;
-          if (isDef(data)) {
-              if (isDef((i = data.hook)) && isDef((i = i.destroy)))
-                  i(vnode);
-              for (i = 0; i < cbs.destroy.length; ++i)
-                  cbs.destroy[i](vnode);
-          }
-          if (isDef((i = vnode.children))) {
-              for (j = 0; j < vnode.children.length; ++j) {
-                  invokeDestroyHook(vnode.children[j]);
-              }
-          }
-      }
-      function removeVnodes(vnodes, startIdx, endIdx) {
-          for (; startIdx <= endIdx; ++startIdx) {
-              var ch = vnodes[startIdx];
-              if (isDef(ch)) {
-                  if (isDef(ch.tag)) {
-                      removeAndInvokeRemoveHook(ch);
-                      invokeDestroyHook(ch);
-                  }
-                  else {
-                      // Text node
-                      removeNode(ch.elm);
-                  }
-              }
-          }
-      }
-      function removeAndInvokeRemoveHook(vnode, rm) {
-          if (isDef(rm) || isDef(vnode.data)) {
-              var i_3;
-              var listeners = cbs.remove.length + 1;
-              if (isDef(rm)) {
-                  // we have a recursively passed down rm callback
-                  // increase the listeners count
-                  rm.listeners += listeners;
-              }
-              else {
-                  // directly removing
-                  rm = createRmCb(vnode.elm, listeners);
-              }
-              // recursively invoke hooks on child component root node
-              if (isDef((i_3 = vnode.componentInstance)) &&
-                  isDef((i_3 = i_3._vnode)) &&
-                  isDef(i_3.data)) {
-                  removeAndInvokeRemoveHook(i_3, rm);
-              }
-              for (i_3 = 0; i_3 < cbs.remove.length; ++i_3) {
-                  cbs.remove[i_3](vnode, rm);
-              }
-              if (isDef((i_3 = vnode.data.hook)) && isDef((i_3 = i_3.remove))) {
-                  i_3(vnode, rm);
-              }
-              else {
-                  rm();
-              }
-          }
-          else {
-              removeNode(vnode.elm);
-          }
-      }
-      function updateChildren(parentElm, oldCh, newCh, insertedVnodeQueue, removeOnly) {
-          var oldStartIdx = 0;
-          var newStartIdx = 0;
-          var oldEndIdx = oldCh.length - 1;
-          var oldStartVnode = oldCh[0];
-          var oldEndVnode = oldCh[oldEndIdx];
-          var newEndIdx = newCh.length - 1;
-          var newStartVnode = newCh[0];
-          var newEndVnode = newCh[newEndIdx];
-          var oldKeyToIdx, idxInOld, vnodeToMove, refElm;
-          // removeOnly is a special flag used only by <transition-group>
-          // to ensure removed elements stay in correct relative positions
-          // during leaving transitions
-          var canMove = !removeOnly;
-          {
-              checkDuplicateKeys(newCh);
-          }
-          while (oldStartIdx <= oldEndIdx && newStartIdx <= newEndIdx) {
-              if (isUndef(oldStartVnode)) {
-                  oldStartVnode = oldCh[++oldStartIdx]; // Vnode has been moved left
-              }
-              else if (isUndef(oldEndVnode)) {
-                  oldEndVnode = oldCh[--oldEndIdx];
-              }
-              else if (sameVnode(oldStartVnode, newStartVnode)) {
-                  patchVnode(oldStartVnode, newStartVnode, insertedVnodeQueue, newCh, newStartIdx);
-                  oldStartVnode = oldCh[++oldStartIdx];
-                  newStartVnode = newCh[++newStartIdx];
-              }
-              else if (sameVnode(oldEndVnode, newEndVnode)) {
-                  patchVnode(oldEndVnode, newEndVnode, insertedVnodeQueue, newCh, newEndIdx);
-                  oldEndVnode = oldCh[--oldEndIdx];
-                  newEndVnode = newCh[--newEndIdx];
-              }
-              else if (sameVnode(oldStartVnode, newEndVnode)) {
-                  // Vnode moved right
-                  patchVnode(oldStartVnode, newEndVnode, insertedVnodeQueue, newCh, newEndIdx);
-                  canMove &&
-                      nodeOps.insertBefore(parentElm, oldStartVnode.elm, nodeOps.nextSibling(oldEndVnode.elm));
-                  oldStartVnode = oldCh[++oldStartIdx];
-                  newEndVnode = newCh[--newEndIdx];
-              }
-              else if (sameVnode(oldEndVnode, newStartVnode)) {
-                  // Vnode moved left
-                  patchVnode(oldEndVnode, newStartVnode, insertedVnodeQueue, newCh, newStartIdx);
-                  canMove &&
-                      nodeOps.insertBefore(parentElm, oldEndVnode.elm, oldStartVnode.elm);
-                  oldEndVnode = oldCh[--oldEndIdx];
-                  newStartVnode = newCh[++newStartIdx];
-              }
-              else {
-                  if (isUndef(oldKeyToIdx))
-                      oldKeyToIdx = createKeyToOldIdx(oldCh, oldStartIdx, oldEndIdx);
-                  idxInOld = isDef(newStartVnode.key)
-                      ? oldKeyToIdx[newStartVnode.key]
-                      : findIdxInOld(newStartVnode, oldCh, oldStartIdx, oldEndIdx);
-                  if (isUndef(idxInOld)) {
-                      // New element
-                      createElm(newStartVnode, insertedVnodeQueue, parentElm, oldStartVnode.elm, false, newCh, newStartIdx);
-                  }
-                  else {
-                      vnodeToMove = oldCh[idxInOld];
-                      if (sameVnode(vnodeToMove, newStartVnode)) {
-                          patchVnode(vnodeToMove, newStartVnode, insertedVnodeQueue, newCh, newStartIdx);
-                          oldCh[idxInOld] = undefined;
-                          canMove &&
-                              nodeOps.insertBefore(parentElm, vnodeToMove.elm, oldStartVnode.elm);
-                      }
-                      else {
-                          // same key but different element. treat as new element
-                          createElm(newStartVnode, insertedVnodeQueue, parentElm, oldStartVnode.elm, false, newCh, newStartIdx);
-                      }
-                  }
-                  newStartVnode = newCh[++newStartIdx];
-              }
-          }
-          if (oldStartIdx > oldEndIdx) {
-              refElm = isUndef(newCh[newEndIdx + 1]) ? null : newCh[newEndIdx + 1].elm;
-              addVnodes(parentElm, refElm, newCh, newStartIdx, newEndIdx, insertedVnodeQueue);
-          }
-          else if (newStartIdx > newEndIdx) {
-              removeVnodes(oldCh, oldStartIdx, oldEndIdx);
-          }
-      }
-      function checkDuplicateKeys(children) {
-          var seenKeys = {};
-          for (var i_4 = 0; i_4 < children.length; i_4++) {
-              var vnode = children[i_4];
-              var key = vnode.key;
-              if (isDef(key)) {
-                  if (seenKeys[key]) {
-                      warn$2("Duplicate keys detected: '".concat(key, "'. This may cause an update error."), vnode.context);
-                  }
-                  else {
-                      seenKeys[key] = true;
-                  }
-              }
-          }
-      }
-      function findIdxInOld(node, oldCh, start, end) {
-          for (var i_5 = start; i_5 < end; i_5++) {
-              var c = oldCh[i_5];
-              if (isDef(c) && sameVnode(node, c))
-                  return i_5;
-          }
-      }
-      function patchVnode(oldVnode, vnode, insertedVnodeQueue, ownerArray, index, removeOnly) {
-          if (oldVnode === vnode) {
-              return;
-          }
-          if (isDef(vnode.elm) && isDef(ownerArray)) {
-              // clone reused vnode
-              vnode = ownerArray[index] = cloneVNode(vnode);
-          }
-          var elm = (vnode.elm = oldVnode.elm);
-          if (isTrue(oldVnode.isAsyncPlaceholder)) {
-              if (isDef(vnode.asyncFactory.resolved)) {
-                  hydrate(oldVnode.elm, vnode, insertedVnodeQueue);
-              }
-              else {
-                  vnode.isAsyncPlaceholder = true;
-              }
-              return;
-          }
-          // reuse element for static trees.
-          // note we only do this if the vnode is cloned -
-          // if the new node is not cloned it means the render functions have been
-          // reset by the hot-reload-api and we need to do a proper re-render.
-          if (isTrue(vnode.isStatic) &&
-              isTrue(oldVnode.isStatic) &&
-              vnode.key === oldVnode.key &&
-              (isTrue(vnode.isCloned) || isTrue(vnode.isOnce))) {
-              vnode.componentInstance = oldVnode.componentInstance;
-              return;
-          }
-          var i;
-          var data = vnode.data;
-          if (isDef(data) && isDef((i = data.hook)) && isDef((i = i.prepatch))) {
-              i(oldVnode, vnode);
-          }
-          var oldCh = oldVnode.children;
-          var ch = vnode.children;
-          if (isDef(data) && isPatchable(vnode)) {
-              for (i = 0; i < cbs.update.length; ++i)
-                  cbs.update[i](oldVnode, vnode);
-              if (isDef((i = data.hook)) && isDef((i = i.update)))
-                  i(oldVnode, vnode);
-          }
-          if (isUndef(vnode.text)) {
-              if (isDef(oldCh) && isDef(ch)) {
-                  if (oldCh !== ch)
-                      updateChildren(elm, oldCh, ch, insertedVnodeQueue, removeOnly);
-              }
-              else if (isDef(ch)) {
-                  {
-                      checkDuplicateKeys(ch);
-                  }
-                  if (isDef(oldVnode.text))
-                      nodeOps.setTextContent(elm, '');
-                  addVnodes(elm, null, ch, 0, ch.length - 1, insertedVnodeQueue);
-              }
-              else if (isDef(oldCh)) {
-                  removeVnodes(oldCh, 0, oldCh.length - 1);
-              }
-              else if (isDef(oldVnode.text)) {
-                  nodeOps.setTextContent(elm, '');
-              }
-          }
-          else if (oldVnode.text !== vnode.text) {
-              nodeOps.setTextContent(elm, vnode.text);
-          }
-          if (isDef(data)) {
-              if (isDef((i = data.hook)) && isDef((i = i.postpatch)))
-                  i(oldVnode, vnode);
-          }
-      }
-      function invokeInsertHook(vnode, queue, initial) {
-          // delay insert hooks for component root nodes, invoke them after the
-          // element is really inserted
-          if (isTrue(initial) && isDef(vnode.parent)) {
-              vnode.parent.data.pendingInsert = queue;
-          }
-          else {
-              for (var i_6 = 0; i_6 < queue.length; ++i_6) {
-                  queue[i_6].data.hook.insert(queue[i_6]);
-              }
-          }
-      }
-      var hydrationBailed = false;
-      // list of modules that can skip create hook during hydration because they
-      // are already rendered on the client or has no need for initialization
-      // Note: style is excluded because it relies on initial clone for future
-      // deep updates (#7063).
-      var isRenderedModule = makeMap('attrs,class,staticClass,staticStyle,key');
-      // Note: this is a browser-only function so we can assume elms are DOM nodes.
-      function hydrate(elm, vnode, insertedVnodeQueue, inVPre) {
-          var i;
-          var tag = vnode.tag, data = vnode.data, children = vnode.children;
-          inVPre = inVPre || (data && data.pre);
-          vnode.elm = elm;
-          if (isTrue(vnode.isComment) && isDef(vnode.asyncFactory)) {
-              vnode.isAsyncPlaceholder = true;
-              return true;
-          }
-          // assert node match
-          {
-              if (!assertNodeMatch(elm, vnode, inVPre)) {
-                  return false;
-              }
-          }
-          if (isDef(data)) {
-              if (isDef((i = data.hook)) && isDef((i = i.init)))
-                  i(vnode, true /* hydrating */);
-              if (isDef((i = vnode.componentInstance))) {
-                  // child component. it should have hydrated its own tree.
-                  initComponent(vnode, insertedVnodeQueue);
-                  return true;
-              }
-          }
-          if (isDef(tag)) {
-              if (isDef(children)) {
-                  // empty element, allow client to pick up and populate children
-                  if (!elm.hasChildNodes()) {
-                      createChildren(vnode, children, insertedVnodeQueue);
-                  }
-                  else {
-                      // v-html and domProps: innerHTML
-                      if (isDef((i = data)) &&
-                          isDef((i = i.domProps)) &&
-                          isDef((i = i.innerHTML))) {
-                          if (i !== elm.innerHTML) {
-                              /* istanbul ignore if */
-                              if (typeof console !== 'undefined' &&
-                                  !hydrationBailed) {
-                                  hydrationBailed = true;
-                                  console.warn('Parent: ', elm);
-                                  console.warn('server innerHTML: ', i);
-                                  console.warn('client innerHTML: ', elm.innerHTML);
-                              }
-                              return false;
-                          }
-                      }
-                      else {
-                          // iterate and compare children lists
-                          var childrenMatch = true;
-                          var childNode = elm.firstChild;
-                          for (var i_7 = 0; i_7 < children.length; i_7++) {
-                              if (!childNode ||
-                                  !hydrate(childNode, children[i_7], insertedVnodeQueue, inVPre)) {
-                                  childrenMatch = false;
-                                  break;
-                              }
-                              childNode = childNode.nextSibling;
-                          }
-                          // if childNode is not null, it means the actual childNodes list is
-                          // longer than the virtual children list.
-                          if (!childrenMatch || childNode) {
-                              /* istanbul ignore if */
-                              if (typeof console !== 'undefined' &&
-                                  !hydrationBailed) {
-                                  hydrationBailed = true;
-                                  console.warn('Parent: ', elm);
-                                  console.warn('Mismatching childNodes vs. VNodes: ', elm.childNodes, children);
-                              }
-                              return false;
-                          }
-                      }
-                  }
-              }
-              if (isDef(data)) {
-                  var fullInvoke = false;
-                  for (var key in data) {
-                      if (!isRenderedModule(key)) {
-                          fullInvoke = true;
-                          invokeCreateHooks(vnode, insertedVnodeQueue);
-                          break;
-                      }
-                  }
-                  if (!fullInvoke && data['class']) {
-                      // ensure collecting deps for deep class bindings for future updates
-                      traverse(data['class']);
-                  }
-              }
-          }
-          else if (elm.data !== vnode.text) {
-              elm.data = vnode.text;
-          }
-          return true;
-      }
-      function assertNodeMatch(node, vnode, inVPre) {
-          if (isDef(vnode.tag)) {
-              return (vnode.tag.indexOf('vue-component') === 0 ||
-                  (!isUnknownElement(vnode, inVPre) &&
-                      vnode.tag.toLowerCase() ===
-                          (node.tagName && node.tagName.toLowerCase())));
-          }
-          else {
-              return node.nodeType === (vnode.isComment ? 8 : 3);
-          }
-      }
-      return function patch(oldVnode, vnode, hydrating, removeOnly) {
-          if (isUndef(vnode)) {
-              if (isDef(oldVnode))
-                  invokeDestroyHook(oldVnode);
-              return;
-          }
-          var isInitialPatch = false;
-          var insertedVnodeQueue = [];
-          if (isUndef(oldVnode)) {
-              // empty mount (likely as component), create new root element
-              isInitialPatch = true;
-              createElm(vnode, insertedVnodeQueue);
-          }
-          else {
-              var isRealElement = isDef(oldVnode.nodeType);
-              if (!isRealElement && sameVnode(oldVnode, vnode)) {
-                  // patch existing root node
-                  patchVnode(oldVnode, vnode, insertedVnodeQueue, null, null, removeOnly);
-              }
-              else {
-                  if (isRealElement) {
-                      // mounting to a real element
-                      // check if this is server-rendered content and if we can perform
-                      // a successful hydration.
-                      if (oldVnode.nodeType === 1 && oldVnode.hasAttribute(SSR_ATTR)) {
-                          oldVnode.removeAttribute(SSR_ATTR);
-                          hydrating = true;
-                      }
-                      if (isTrue(hydrating)) {
-                          if (hydrate(oldVnode, vnode, insertedVnodeQueue)) {
-                              invokeInsertHook(vnode, insertedVnodeQueue, true);
-                              return oldVnode;
-                          }
-                          else {
-                              warn$2('The client-side rendered virtual DOM tree is not matching ' +
-                                  'server-rendered content. This is likely caused by incorrect ' +
-                                  'HTML markup, for example nesting block-level elements inside ' +
-                                  '<p>, or missing <tbody>. Bailing hydration and performing ' +
-                                  'full client-side render.');
-                          }
-                      }
-                      // either not server-rendered, or hydration failed.
-                      // create an empty node and replace it
-                      oldVnode = emptyNodeAt(oldVnode);
-                  }
-                  // replacing existing element
-                  var oldElm = oldVnode.elm;
-                  var parentElm = nodeOps.parentNode(oldElm);
-                  // create new node
-                  createElm(vnode, insertedVnodeQueue, 
-                  // extremely rare edge case: do not insert if old element is in a
-                  // leaving transition. Only happens when combining transition +
-                  // keep-alive + HOCs. (#4590)
-                  oldElm._leaveCb ? null : parentElm, nodeOps.nextSibling(oldElm));
-                  // update parent placeholder node element, recursively
-                  if (isDef(vnode.parent)) {
-                      var ancestor = vnode.parent;
-                      var patchable = isPatchable(vnode);
-                      while (ancestor) {
-                          for (var i_8 = 0; i_8 < cbs.destroy.length; ++i_8) {
-                              cbs.destroy[i_8](ancestor);
-                          }
-                          ancestor.elm = vnode.elm;
-                          if (patchable) {
-                              for (var i_9 = 0; i_9 < cbs.create.length; ++i_9) {
-                                  cbs.create[i_9](emptyNode, ancestor);
-                              }
-                              // #6513
-                              // invoke insert hooks that may have been merged by create hooks.
-                              // e.g. for directives that uses the "inserted" hook.
-                              var insert_1 = ancestor.data.hook.insert;
-                              if (insert_1.merged) {
-                                  // start at index 1 to avoid re-invoking component mounted hook
-                                  for (var i_10 = 1; i_10 < insert_1.fns.length; i_10++) {
-                                      insert_1.fns[i_10]();
-                                  }
-                              }
-                          }
-                          else {
-                              registerRef(ancestor);
-                          }
-                          ancestor = ancestor.parent;
-                      }
-                  }
-                  // destroy old node
-                  if (isDef(parentElm)) {
-                      removeVnodes([oldVnode], 0, 0);
-                  }
-                  else if (isDef(oldVnode.tag)) {
-                      invokeDestroyHook(oldVnode);
-                  }
-              }
-          }
-          invokeInsertHook(vnode, insertedVnodeQueue, isInitialPatch);
-          return vnode.elm;
-      };
-  }
-
-  var directives$1 = {
-      create: updateDirectives,
-      update: updateDirectives,
-      destroy: function unbindDirectives(vnode) {
-          // @ts-expect-error emptyNode is not VNodeWithData
-          updateDirectives(vnode, emptyNode);
-      }
-  };
-  function updateDirectives(oldVnode, vnode) {
-      if (oldVnode.data.directives || vnode.data.directives) {
-          _update(oldVnode, vnode);
-      }
-  }
-  function _update(oldVnode, vnode) {
-      var isCreate = oldVnode === emptyNode;
-      var isDestroy = vnode === emptyNode;
-      var oldDirs = normalizeDirectives(oldVnode.data.directives, oldVnode.context);
-      var newDirs = normalizeDirectives(vnode.data.directives, vnode.context);
-      var dirsWithInsert = [];
-      var dirsWithPostpatch = [];
-      var key, oldDir, dir;
-      for (key in newDirs) {
-          oldDir = oldDirs[key];
-          dir = newDirs[key];
-          if (!oldDir) {
-              // new directive, bind
-              callHook(dir, 'bind', vnode, oldVnode);
-              if (dir.def && dir.def.inserted) {
-                  dirsWithInsert.push(dir);
-              }
-          }
-          else {
-              // existing directive, update
-              dir.oldValue = oldDir.value;
-              dir.oldArg = oldDir.arg;
-              callHook(dir, 'update', vnode, oldVnode);
-              if (dir.def && dir.def.componentUpdated) {
-                  dirsWithPostpatch.push(dir);
-              }
-          }
-      }
-      if (dirsWithInsert.length) {
-          var callInsert = function () {
-              for (var i = 0; i < dirsWithInsert.length; i++) {
-                  callHook(dirsWithInsert[i], 'inserted', vnode, oldVnode);
-              }
-          };
-          if (isCreate) {
-              mergeVNodeHook(vnode, 'insert', callInsert);
-          }
-          else {
-              callInsert();
-          }
-      }
-      if (dirsWithPostpatch.length) {
-          mergeVNodeHook(vnode, 'postpatch', function () {
-              for (var i = 0; i < dirsWithPostpatch.length; i++) {
-                  callHook(dirsWithPostpatch[i], 'componentUpdated', vnode, oldVnode);
-              }
-          });
-      }
-      if (!isCreate) {
-          for (key in oldDirs) {
-              if (!newDirs[key]) {
-                  // no longer present, unbind
-                  callHook(oldDirs[key], 'unbind', oldVnode, oldVnode, isDestroy);
-              }
-          }
-      }
-  }
-  var emptyModifiers = Object.create(null);
-  function normalizeDirectives(dirs, vm) {
-      var res = Object.create(null);
-      if (!dirs) {
-          // $flow-disable-line
-          return res;
-      }
-      var i, dir;
-      for (i = 0; i < dirs.length; i++) {
-          dir = dirs[i];
-          if (!dir.modifiers) {
-              // $flow-disable-line
-              dir.modifiers = emptyModifiers;
-          }
-          res[getRawDirName(dir)] = dir;
-          if (vm._setupState && vm._setupState.__sfc) {
-              var setupDef = dir.def || resolveAsset(vm, '_setupState', 'v-' + dir.name);
-              if (typeof setupDef === 'function') {
-                  dir.def = {
-                      bind: setupDef,
-                      update: setupDef,
-                  };
-              }
-              else {
-                  dir.def = setupDef;
-              }
-          }
-          dir.def = dir.def || resolveAsset(vm.$options, 'directives', dir.name, true);
-      }
-      // $flow-disable-line
-      return res;
-  }
-  function getRawDirName(dir) {
-      return (dir.rawName || "".concat(dir.name, ".").concat(Object.keys(dir.modifiers || {}).join('.')));
-  }
-  function callHook(dir, hook, vnode, oldVnode, isDestroy) {
-      var fn = dir.def && dir.def[hook];
-      if (fn) {
-          try {
-              fn(vnode.elm, dir, vnode, oldVnode, isDestroy);
-          }
-          catch (e) {
-              handleError(e, vnode.context, "directive ".concat(dir.name, " ").concat(hook, " hook"));
-          }
-      }
-  }
-
-  var baseModules = [ref, directives$1];
-
-  function updateAttrs(oldVnode, vnode) {
-      var opts = vnode.componentOptions;
-      if (isDef(opts) && opts.Ctor.options.inheritAttrs === false) {
-          return;
-      }
-      if (isUndef(oldVnode.data.attrs) && isUndef(vnode.data.attrs)) {
-          return;
-      }
-      var key, cur, old;
-      var elm = vnode.elm;
-      var oldAttrs = oldVnode.data.attrs || {};
-      var attrs = vnode.data.attrs || {};
-      // clone observed objects, as the user probably wants to mutate it
-      if (isDef(attrs.__ob__) || isTrue(attrs._v_attr_proxy)) {
-          attrs = vnode.data.attrs = extend({}, attrs);
-      }
-      for (key in attrs) {
-          cur = attrs[key];
-          old = oldAttrs[key];
-          if (old !== cur) {
-              setAttr(elm, key, cur, vnode.data.pre);
-          }
-      }
-      // #4391: in IE9, setting type can reset value for input[type=radio]
-      // #6666: IE/Edge forces progress value down to 1 before setting a max
-      /* istanbul ignore if */
-      if ((isIE || isEdge) && attrs.value !== oldAttrs.value) {
-          setAttr(elm, 'value', attrs.value);
-      }
-      for (key in oldAttrs) {
-          if (isUndef(attrs[key])) {
-              if (isXlink(key)) {
-                  elm.removeAttributeNS(xlinkNS, getXlinkProp(key));
-              }
-              else if (!isEnumeratedAttr(key)) {
-                  elm.removeAttribute(key);
-              }
-          }
-      }
-  }
-  function setAttr(el, key, value, isInPre) {
-      if (isInPre || el.tagName.indexOf('-') > -1) {
-          baseSetAttr(el, key, value);
-      }
-      else if (isBooleanAttr(key)) {
-          // set attribute for blank value
-          // e.g. <option disabled>Select one</option>
-          if (isFalsyAttrValue(value)) {
-              el.removeAttribute(key);
-          }
-          else {
-              // technically allowfullscreen is a boolean attribute for <iframe>,
-              // but Flash expects a value of "true" when used on <embed> tag
-              value = key === 'allowfullscreen' && el.tagName === 'EMBED' ? 'true' : key;
-              el.setAttribute(key, value);
-          }
-      }
-      else if (isEnumeratedAttr(key)) {
-          el.setAttribute(key, convertEnumeratedValue(key, value));
-      }
-      else if (isXlink(key)) {
-          if (isFalsyAttrValue(value)) {
-              el.removeAttributeNS(xlinkNS, getXlinkProp(key));
-          }
-          else {
-              el.setAttributeNS(xlinkNS, key, value);
-          }
-      }
-      else {
-          baseSetAttr(el, key, value);
-      }
-  }
-  function baseSetAttr(el, key, value) {
-      if (isFalsyAttrValue(value)) {
-          el.removeAttribute(key);
-      }
-      else {
-          // #7138: IE10 & 11 fires input event when setting placeholder on
-          // <textarea>... block the first input event and remove the blocker
-          // immediately.
-          /* istanbul ignore if */
-          if (isIE &&
-              !isIE9 &&
-              el.tagName === 'TEXTAREA' &&
-              key === 'placeholder' &&
-              value !== '' &&
-              !el.__ieph) {
-              var blocker_1 = function (e) {
-                  e.stopImmediatePropagation();
-                  el.removeEventListener('input', blocker_1);
-              };
-              el.addEventListener('input', blocker_1);
-              // $flow-disable-line
-              el.__ieph = true; /* IE placeholder patched */
-          }
-          el.setAttribute(key, value);
-      }
-  }
-  var attrs = {
-      create: updateAttrs,
-      update: updateAttrs
-  };
-
-  function updateClass(oldVnode, vnode) {
-      var el = vnode.elm;
-      var data = vnode.data;
-      var oldData = oldVnode.data;
-      if (isUndef(data.staticClass) &&
-          isUndef(data.class) &&
-          (isUndef(oldData) ||
-              (isUndef(oldData.staticClass) && isUndef(oldData.class)))) {
-          return;
-      }
-      var cls = genClassForVnode(vnode);
-      // handle transition classes
-      var transitionClass = el._transitionClasses;
-      if (isDef(transitionClass)) {
-          cls = concat(cls, stringifyClass(transitionClass));
-      }
-      // set the class
-      if (cls !== el._prevClass) {
-          el.setAttribute('class', cls);
-          el._prevClass = cls;
-      }
-  }
-  var klass$1 = {
-      create: updateClass,
-      update: updateClass
-  };
-
-  var validDivisionCharRE = /[\w).+\-_$\]]/;
-  function parseFilters(exp) {
-      var inSingle = false;
-      var inDouble = false;
-      var inTemplateString = false;
-      var inRegex = false;
-      var curly = 0;
-      var square = 0;
-      var paren = 0;
-      var lastFilterIndex = 0;
-      var c, prev, i, expression, filters;
-      for (i = 0; i < exp.length; i++) {
-          prev = c;
-          c = exp.charCodeAt(i);
-          if (inSingle) {
-              if (c === 0x27 && prev !== 0x5c)
-                  inSingle = false;
-          }
-          else if (inDouble) {
-              if (c === 0x22 && prev !== 0x5c)
-                  inDouble = false;
-          }
-          else if (inTemplateString) {
-              if (c === 0x60 && prev !== 0x5c)
-                  inTemplateString = false;
-          }
-          else if (inRegex) {
-              if (c === 0x2f && prev !== 0x5c)
-                  inRegex = false;
-          }
-          else if (c === 0x7c && // pipe
-              exp.charCodeAt(i + 1) !== 0x7c &&
-              exp.charCodeAt(i - 1) !== 0x7c &&
-              !curly &&
-              !square &&
-              !paren) {
-              if (expression === undefined) {
-                  // first filter, end of expression
-                  lastFilterIndex = i + 1;
-                  expression = exp.slice(0, i).trim();
-              }
-              else {
-                  pushFilter();
-              }
-          }
-          else {
-              switch (c) {
-                  case 0x22:
-                      inDouble = true;
-                      break; // "
-                  case 0x27:
-                      inSingle = true;
-                      break; // '
-                  case 0x60:
-                      inTemplateString = true;
-                      break; // `
-                  case 0x28:
-                      paren++;
-                      break; // (
-                  case 0x29:
-                      paren--;
-                      break; // )
-                  case 0x5b:
-                      square++;
-                      break; // [
-                  case 0x5d:
-                      square--;
-                      break; // ]
-                  case 0x7b:
-                      curly++;
-                      break; // {
-                  case 0x7d:
-                      curly--;
-                      break; // }
-              }
-              if (c === 0x2f) {
-                  // /
-                  var j = i - 1;
-                  var p 
-                  // find first non-whitespace prev char
-                  = void 0;
-                  // find first non-whitespace prev char
-                  for (; j >= 0; j--) {
-                      p = exp.charAt(j);
-                      if (p !== ' ')
-                          break;
-                  }
-                  if (!p || !validDivisionCharRE.test(p)) {
-                      inRegex = true;
-                  }
-              }
-          }
-      }
-      if (expression === undefined) {
-          expression = exp.slice(0, i).trim();
-      }
-      else if (lastFilterIndex !== 0) {
-          pushFilter();
-      }
-      function pushFilter() {
-          (filters || (filters = [])).push(exp.slice(lastFilterIndex, i).trim());
-          lastFilterIndex = i + 1;
-      }
-      if (filters) {
-          for (i = 0; i < filters.length; i++) {
-              expression = wrapFilter(expression, filters[i]);
-          }
-      }
-      return expression;
-  }
-  function wrapFilter(exp, filter) {
-      var i = filter.indexOf('(');
-      if (i < 0) {
-          // _f: resolveFilter
-          return "_f(\"".concat(filter, "\")(").concat(exp, ")");
-      }
-      else {
-          var name_1 = filter.slice(0, i);
-          var args = filter.slice(i + 1);
-          return "_f(\"".concat(name_1, "\")(").concat(exp).concat(args !== ')' ? ',' + args : args);
-      }
-  }
-
-  /* eslint-disable no-unused-vars */
-  function baseWarn(msg, range) {
-      console.error("[Vue compiler]: ".concat(msg));
-  }
-  /* eslint-enable no-unused-vars */
-  function pluckModuleFunction(modules, key) {
-      return modules ? modules.map(function (m) { return m[key]; }).filter(function (_) { return _; }) : [];
-  }
-  function addProp(el, name, value, range, dynamic) {
-      (el.props || (el.props = [])).push(rangeSetItem({ name: name, value: value, dynamic: dynamic }, range));
-      el.plain = false;
-  }
-  function addAttr(el, name, value, range, dynamic) {
-      var attrs = dynamic
-          ? el.dynamicAttrs || (el.dynamicAttrs = [])
-          : el.attrs || (el.attrs = []);
-      attrs.push(rangeSetItem({ name: name, value: value, dynamic: dynamic }, range));
-      el.plain = false;
-  }
-  // add a raw attr (use this in preTransforms)
-  function addRawAttr(el, name, value, range) {
-      el.attrsMap[name] = value;
-      el.attrsList.push(rangeSetItem({ name: name, value: value }, range));
-  }
-  function addDirective(el, name, rawName, value, arg, isDynamicArg, modifiers, range) {
-      (el.directives || (el.directives = [])).push(rangeSetItem({
-          name: name,
-          rawName: rawName,
-          value: value,
-          arg: arg,
-          isDynamicArg: isDynamicArg,
-          modifiers: modifiers
-      }, range));
-      el.plain = false;
-  }
-  function prependModifierMarker(symbol, name, dynamic) {
-      return dynamic ? "_p(".concat(name, ",\"").concat(symbol, "\")") : symbol + name; // mark the event as captured
-  }
-  function addHandler(el, name, value, modifiers, important, warn, range, dynamic) {
-      modifiers = modifiers || emptyObject;
-      // warn prevent and passive modifier
-      /* istanbul ignore if */
-      if (warn && modifiers.prevent && modifiers.passive) {
-          warn("passive and prevent can't be used together. " +
-              "Passive handler can't prevent default event.", range);
-      }
-      // normalize click.right and click.middle since they don't actually fire
-      // this is technically browser-specific, but at least for now browsers are
-      // the only target envs that have right/middle clicks.
-      if (modifiers.right) {
-          if (dynamic) {
-              name = "(".concat(name, ")==='click'?'contextmenu':(").concat(name, ")");
-          }
-          else if (name === 'click') {
-              name = 'contextmenu';
-              delete modifiers.right;
-          }
-      }
-      else if (modifiers.middle) {
-          if (dynamic) {
-              name = "(".concat(name, ")==='click'?'mouseup':(").concat(name, ")");
-          }
-          else if (name === 'click') {
-              name = 'mouseup';
-          }
-      }
-      // check capture modifier
-      if (modifiers.capture) {
-          delete modifiers.capture;
-          name = prependModifierMarker('!', name, dynamic);
-      }
-      if (modifiers.once) {
-          delete modifiers.once;
-          name = prependModifierMarker('~', name, dynamic);
-      }
-      /* istanbul ignore if */
-      if (modifiers.passive) {
-          delete modifiers.passive;
-          name = prependModifierMarker('&', name, dynamic);
-      }
-      var events;
-      if (modifiers.native) {
-          delete modifiers.native;
-          events = el.nativeEvents || (el.nativeEvents = {});
-      }
-      else {
-          events = el.events || (el.events = {});
-      }
-      var newHandler = rangeSetItem({ value: value.trim(), dynamic: dynamic }, range);
-      if (modifiers !== emptyObject) {
-          newHandler.modifiers = modifiers;
-      }
-      var handlers = events[name];
-      /* istanbul ignore if */
-      if (Array.isArray(handlers)) {
-          important ? handlers.unshift(newHandler) : handlers.push(newHandler);
-      }
-      else if (handlers) {
-          events[name] = important ? [newHandler, handlers] : [handlers, newHandler];
-      }
-      else {
-          events[name] = newHandler;
-      }
-      el.plain = false;
-  }
-  function getRawBindingAttr(el, name) {
-      return (el.rawAttrsMap[':' + name] ||
-          el.rawAttrsMap['v-bind:' + name] ||
-          el.rawAttrsMap[name]);
-  }
-  function getBindingAttr(el, name, getStatic) {
-      var dynamicValue = getAndRemoveAttr(el, ':' + name) || getAndRemoveAttr(el, 'v-bind:' + name);
-      if (dynamicValue != null) {
-          return parseFilters(dynamicValue);
-      }
-      else if (getStatic !== false) {
-          var staticValue = getAndRemoveAttr(el, name);
-          if (staticValue != null) {
-              return JSON.stringify(staticValue);
-          }
-      }
-  }
-  // note: this only removes the attr from the Array (attrsList) so that it
-  // doesn't get processed by processAttrs.
-  // By default it does NOT remove it from the map (attrsMap) because the map is
-  // needed during codegen.
-  function getAndRemoveAttr(el, name, removeFromMap) {
-      var val;
-      if ((val = el.attrsMap[name]) != null) {
-          var list = el.attrsList;
-          for (var i = 0, l = list.length; i < l; i++) {
-              if (list[i].name === name) {
-                  list.splice(i, 1);
-                  break;
-              }
-          }
-      }
-      if (removeFromMap) {
-          delete el.attrsMap[name];
-      }
-      return val;
-  }
-  function getAndRemoveAttrByRegex(el, name) {
-      var list = el.attrsList;
-      for (var i = 0, l = list.length; i < l; i++) {
-          var attr = list[i];
-          if (name.test(attr.name)) {
-              list.splice(i, 1);
-              return attr;
-          }
-      }
-  }
-  function rangeSetItem(item, range) {
-      if (range) {
-          if (range.start != null) {
-              item.start = range.start;
-          }
-          if (range.end != null) {
-              item.end = range.end;
-          }
-      }
-      return item;
-  }
-
-  /**
-   * Cross-platform code generation for component v-model
-   */
-  function genComponentModel(el, value, modifiers) {
-      var _a = modifiers || {}, number = _a.number, trim = _a.trim;
-      var baseValueExpression = '$$v';
-      var valueExpression = baseValueExpression;
-      if (trim) {
-          valueExpression =
-              "(typeof ".concat(baseValueExpression, " === 'string'") +
-                  "? ".concat(baseValueExpression, ".trim()") +
-                  ": ".concat(baseValueExpression, ")");
-      }
-      if (number) {
-          valueExpression = "_n(".concat(valueExpression, ")");
-      }
-      var assignment = genAssignmentCode(value, valueExpression);
-      el.model = {
-          value: "(".concat(value, ")"),
-          expression: JSON.stringify(value),
-          callback: "function (".concat(baseValueExpression, ") {").concat(assignment, "}")
-      };
-  }
-  /**
-   * Cross-platform codegen helper for generating v-model value assignment code.
-   */
-  function genAssignmentCode(value, assignment) {
-      var res = parseModel(value);
-      if (res.key === null) {
-          return "".concat(value, "=").concat(assignment);
-      }
-      else {
-          return "$set(".concat(res.exp, ", ").concat(res.key, ", ").concat(assignment, ")");
-      }
-  }
-  /**
-   * Parse a v-model expression into a base path and a final key segment.
-   * Handles both dot-path and possible square brackets.
-   *
-   * Possible cases:
-   *
-   * - test
-   * - test[key]
-   * - test[test1[key]]
-   * - test["a"][key]
-   * - xxx.test[a[a].test1[key]]
-   * - test.xxx.a["asa"][test1[key]]
-   *
-   */
-  var len, str, chr, index, expressionPos, expressionEndPos;
-  function parseModel(val) {
-      // Fix https://github.com/vuejs/vue/pull/7730
-      // allow v-model="obj.val " (trailing whitespace)
-      val = val.trim();
-      len = val.length;
-      if (val.indexOf('[') < 0 || val.lastIndexOf(']') < len - 1) {
-          index = val.lastIndexOf('.');
-          if (index > -1) {
-              return {
-                  exp: val.slice(0, index),
-                  key: '"' + val.slice(index + 1) + '"'
-              };
-          }
-          else {
-              return {
-                  exp: val,
-                  key: null
-              };
-          }
-      }
-      str = val;
-      index = expressionPos = expressionEndPos = 0;
-      while (!eof()) {
-          chr = next();
-          /* istanbul ignore if */
-          if (isStringStart(chr)) {
-              parseString(chr);
-          }
-          else if (chr === 0x5b) {
-              parseBracket(chr);
-          }
-      }
-      return {
-          exp: val.slice(0, expressionPos),
-          key: val.slice(expressionPos + 1, expressionEndPos)
-      };
-  }
-  function next() {
-      return str.charCodeAt(++index);
-  }
-  function eof() {
-      return index >= len;
-  }
-  function isStringStart(chr) {
-      return chr === 0x22 || chr === 0x27;
-  }
-  function parseBracket(chr) {
-      var inBracket = 1;
-      expressionPos = index;
-      while (!eof()) {
-          chr = next();
-          if (isStringStart(chr)) {
-              parseString(chr);
-              continue;
-          }
-          if (chr === 0x5b)
-              inBracket++;
-          if (chr === 0x5d)
-              inBracket--;
-          if (inBracket === 0) {
-              expressionEndPos = index;
-              break;
-          }
-      }
-  }
-  function parseString(chr) {
-      var stringQuote = chr;
-      while (!eof()) {
-          chr = next();
-          if (chr === stringQuote) {
-              break;
-          }
-      }
-  }
-
-  var warn$1;
-  // in some cases, the event used has to be determined at runtime
-  // so we used some reserved tokens during compile.
-  var RANGE_TOKEN = '__r';
-  var CHECKBOX_RADIO_TOKEN = '__c';
-  function model$1(el, dir, _warn) {
-      warn$1 = _warn;
-      var value = dir.value;
-      var modifiers = dir.modifiers;
-      var tag = el.tag;
-      var type = el.attrsMap.type;
-      {
-          // inputs with type="file" are read only and setting the input's
-          // value will throw an error.
-          if (tag === 'input' && type === 'file') {
-              warn$1("<".concat(el.tag, " v-model=\"").concat(value, "\" type=\"file\">:\n") +
-                  "File inputs are read only. Use a v-on:change listener instead.", el.rawAttrsMap['v-model']);
-          }
-      }
-      if (el.component) {
-          genComponentModel(el, value, modifiers);
-          // component v-model doesn't need extra runtime
-          return false;
-      }
-      else if (tag === 'select') {
-          genSelect(el, value, modifiers);
-      }
-      else if (tag === 'input' && type === 'checkbox') {
-          genCheckboxModel(el, value, modifiers);
-      }
-      else if (tag === 'input' && type === 'radio') {
-          genRadioModel(el, value, modifiers);
-      }
-      else if (tag === 'input' || tag === 'textarea') {
-          genDefaultModel(el, value, modifiers);
-      }
-      else if (!config.isReservedTag(tag)) {
-          genComponentModel(el, value, modifiers);
-          // component v-model doesn't need extra runtime
-          return false;
-      }
-      else {
-          warn$1("<".concat(el.tag, " v-model=\"").concat(value, "\">: ") +
-              "v-model is not supported on this element type. " +
-              "If you are working with contenteditable, it's recommended to " +
-              'wrap a library dedicated for that purpose inside a custom component.', el.rawAttrsMap['v-model']);
-      }
-      // ensure runtime directive metadata
-      return true;
-  }
-  function genCheckboxModel(el, value, modifiers) {
-      var number = modifiers && modifiers.number;
-      var valueBinding = getBindingAttr(el, 'value') || 'null';
-      var trueValueBinding = getBindingAttr(el, 'true-value') || 'true';
-      var falseValueBinding = getBindingAttr(el, 'false-value') || 'false';
-      addProp(el, 'checked', "Array.isArray(".concat(value, ")") +
-          "?_i(".concat(value, ",").concat(valueBinding, ")>-1") +
-          (trueValueBinding === 'true'
-              ? ":(".concat(value, ")")
-              : ":_q(".concat(value, ",").concat(trueValueBinding, ")")));
-      addHandler(el, 'change', "var $$a=".concat(value, ",") +
-          '$$el=$event.target,' +
-          "$$c=$$el.checked?(".concat(trueValueBinding, "):(").concat(falseValueBinding, ");") +
-          'if(Array.isArray($$a)){' +
-          "var $$v=".concat(number ? '_n(' + valueBinding + ')' : valueBinding, ",") +
-          '$$i=_i($$a,$$v);' +
-          "if($$el.checked){$$i<0&&(".concat(genAssignmentCode(value, '$$a.concat([$$v])'), ")}") +
-          "else{$$i>-1&&(".concat(genAssignmentCode(value, '$$a.slice(0,$$i).concat($$a.slice($$i+1))'), ")}") +
-          "}else{".concat(genAssignmentCode(value, '$$c'), "}"), null, true);
-  }
-  function genRadioModel(el, value, modifiers) {
-      var number = modifiers && modifiers.number;
-      var valueBinding = getBindingAttr(el, 'value') || 'null';
-      valueBinding = number ? "_n(".concat(valueBinding, ")") : valueBinding;
-      addProp(el, 'checked', "_q(".concat(value, ",").concat(valueBinding, ")"));
-      addHandler(el, 'change', genAssignmentCode(value, valueBinding), null, true);
-  }
-  function genSelect(el, value, modifiers) {
-      var number = modifiers && modifiers.number;
-      var selectedVal = "Array.prototype.filter" +
-          ".call($event.target.options,function(o){return o.selected})" +
-          ".map(function(o){var val = \"_value\" in o ? o._value : o.value;" +
-          "return ".concat(number ? '_n(val)' : 'val', "})");
-      var assignment = '$event.target.multiple ? $$selectedVal : $$selectedVal[0]';
-      var code = "var $$selectedVal = ".concat(selectedVal, ";");
-      code = "".concat(code, " ").concat(genAssignmentCode(value, assignment));
-      addHandler(el, 'change', code, null, true);
-  }
-  function genDefaultModel(el, value, modifiers) {
-      var type = el.attrsMap.type;
-      // warn if v-bind:value conflicts with v-model
-      // except for inputs with v-bind:type
-      {
-          var value_1 = el.attrsMap['v-bind:value'] || el.attrsMap[':value'];
-          var typeBinding = el.attrsMap['v-bind:type'] || el.attrsMap[':type'];
-          if (value_1 && !typeBinding) {
-              var binding = el.attrsMap['v-bind:value'] ? 'v-bind:value' : ':value';
-              warn$1("".concat(binding, "=\"").concat(value_1, "\" conflicts with v-model on the same element ") +
-                  'because the latter already expands to a value binding internally', el.rawAttrsMap[binding]);
-          }
-      }
-      var _a = modifiers || {}, lazy = _a.lazy, number = _a.number, trim = _a.trim;
-      var needCompositionGuard = !lazy && type !== 'range';
-      var event = lazy ? 'change' : type === 'range' ? RANGE_TOKEN : 'input';
-      var valueExpression = '$event.target.value';
-      if (trim) {
-          valueExpression = "$event.target.value.trim()";
-      }
-      if (number) {
-          valueExpression = "_n(".concat(valueExpression, ")");
-      }
-      var code = genAssignmentCode(value, valueExpression);
-      if (needCompositionGuard) {
-          code = "if($event.target.composing)return;".concat(code);
-      }
-      addProp(el, 'value', "(".concat(value, ")"));
-      addHandler(el, event, code, null, true);
-      if (trim || number) {
-          addHandler(el, 'blur', '$forceUpdate()');
-      }
-  }
-
-  // normalize v-model event tokens that can only be determined at runtime.
-  // it's important to place the event as the first in the array because
-  // the whole point is ensuring the v-model callback gets called before
-  // user-attached handlers.
-  function normalizeEvents(on) {
-      /* istanbul ignore if */
-      if (isDef(on[RANGE_TOKEN])) {
-          // IE input[type=range] only supports `change` event
-          var event_1 = isIE ? 'change' : 'input';
-          on[event_1] = [].concat(on[RANGE_TOKEN], on[event_1] || []);
-          delete on[RANGE_TOKEN];
-      }
-      // This was originally intended to fix #4521 but no longer necessary
-      // after 2.5. Keeping it for backwards compat with generated code from < 2.4
-      /* istanbul ignore if */
-      if (isDef(on[CHECKBOX_RADIO_TOKEN])) {
-          on.change = [].concat(on[CHECKBOX_RADIO_TOKEN], on.change || []);
-          delete on[CHECKBOX_RADIO_TOKEN];
-      }
-  }
-  var target;
-  function createOnceHandler(event, handler, capture) {
-      var _target = target; // save current target element in closure
-      return function onceHandler() {
-          var res = handler.apply(null, arguments);
-          if (res !== null) {
-              remove(event, onceHandler, capture, _target);
-          }
-      };
-  }
-  // #9446: Firefox <= 53 (in particular, ESR 52) has incorrect Event.timeStamp
-  // implementation and does not fire microtasks in between event propagation, so
-  // safe to exclude.
-  var useMicrotaskFix = isUsingMicroTask && !(isFF && Number(isFF[1]) <= 53);
-  function add(name, handler, capture, passive) {
-      // async edge case #6566: inner click event triggers patch, event handler
-      // attached to outer element during patch, and triggered again. This
-      // happens because browsers fire microtask ticks between event propagation.
-      // the solution is simple: we save the timestamp when a handler is attached,
-      // and the handler would only fire if the event passed to it was fired
-      // AFTER it was attached.
-      if (useMicrotaskFix) {
-          var attachedTimestamp_1 = currentFlushTimestamp;
-          var original_1 = handler;
-          //@ts-expect-error
-          handler = original_1._wrapper = function (e) {
-              if (
-              // no bubbling, should always fire.
-              // this is just a safety net in case event.timeStamp is unreliable in
-              // certain weird environments...
-              e.target === e.currentTarget ||
-                  // event is fired after handler attachment
-                  e.timeStamp >= attachedTimestamp_1 ||
-                  // bail for environments that have buggy event.timeStamp implementations
-                  // #9462 iOS 9 bug: event.timeStamp is 0 after history.pushState
-                  // #9681 QtWebEngine event.timeStamp is negative value
-                  e.timeStamp <= 0 ||
-                  // #9448 bail if event is fired in another document in a multi-page
-                  // electron/nw.js app, since event.timeStamp will be using a different
-                  // starting reference
-                  e.target.ownerDocument !== document) {
-                  return original_1.apply(this, arguments);
-              }
-          };
-      }
-      target.addEventListener(name, handler, supportsPassive ? { capture: capture, passive: passive } : capture);
-  }
-  function remove(name, handler, capture, _target) {
-      (_target || target).removeEventListener(name, 
-      //@ts-expect-error
-      handler._wrapper || handler, capture);
-  }
-  function updateDOMListeners(oldVnode, vnode) {
-      if (isUndef(oldVnode.data.on) && isUndef(vnode.data.on)) {
-          return;
-      }
-      var on = vnode.data.on || {};
-      var oldOn = oldVnode.data.on || {};
-      // vnode is empty when removing all listeners,
-      // and use old vnode dom element
-      target = vnode.elm || oldVnode.elm;
-      normalizeEvents(on);
-      updateListeners(on, oldOn, add, remove, createOnceHandler, vnode.context);
-      target = undefined;
-  }
-  var events = {
-      create: updateDOMListeners,
-      update: updateDOMListeners,
-      // @ts-expect-error emptyNode has actually data
-      destroy: function (vnode) { return updateDOMListeners(vnode, emptyNode); }
-  };
-
-  var svgContainer;
-  function updateDOMProps(oldVnode, vnode) {
-      if (isUndef(oldVnode.data.domProps) && isUndef(vnode.data.domProps)) {
-          return;
-      }
-      var key, cur;
-      var elm = vnode.elm;
-      var oldProps = oldVnode.data.domProps || {};
-      var props = vnode.data.domProps || {};
-      // clone observed objects, as the user probably wants to mutate it
-      if (isDef(props.__ob__) || isTrue(props._v_attr_proxy)) {
-          props = vnode.data.domProps = extend({}, props);
-      }
-      for (key in oldProps) {
-          if (!(key in props)) {
-              elm[key] = '';
-          }
-      }
-      for (key in props) {
-          cur = props[key];
-          // ignore children if the node has textContent or innerHTML,
-          // as these will throw away existing DOM nodes and cause removal errors
-          // on subsequent patches (#3360)
-          if (key === 'textContent' || key === 'innerHTML') {
-              if (vnode.children)
-                  vnode.children.length = 0;
-              if (cur === oldProps[key])
-                  continue;
-              // #6601 work around Chrome version <= 55 bug where single textNode
-              // replaced by innerHTML/textContent retains its parentNode property
-              if (elm.childNodes.length === 1) {
-                  elm.removeChild(elm.childNodes[0]);
-              }
-          }
-          if (key === 'value' && elm.tagName !== 'PROGRESS') {
-              // store value as _value as well since
-              // non-string values will be stringified
-              elm._value = cur;
-              // avoid resetting cursor position when value is the same
-              var strCur = isUndef(cur) ? '' : String(cur);
-              if (shouldUpdateValue(elm, strCur)) {
-                  elm.value = strCur;
-              }
-          }
-          else if (key === 'innerHTML' &&
-              isSVG(elm.tagName) &&
-              isUndef(elm.innerHTML)) {
-              // IE doesn't support innerHTML for SVG elements
-              svgContainer = svgContainer || document.createElement('div');
-              svgContainer.innerHTML = "<svg>".concat(cur, "</svg>");
-              var svg = svgContainer.firstChild;
-              while (elm.firstChild) {
-                  elm.removeChild(elm.firstChild);
-              }
-              while (svg.firstChild) {
-                  elm.appendChild(svg.firstChild);
-              }
-          }
-          else if (
-          // skip the update if old and new VDOM state is the same.
-          // `value` is handled separately because the DOM value may be temporarily
-          // out of sync with VDOM state due to focus, composition and modifiers.
-          // This  #4521 by skipping the unnecessary `checked` update.
-          cur !== oldProps[key]) {
-              // some property updates can throw
-              // e.g. `value` on <progress> w/ non-finite value
-              try {
-                  elm[key] = cur;
-              }
-              catch (e) { }
-          }
-      }
-  }
-  function shouldUpdateValue(elm, checkVal) {
-      return (
-      //@ts-expect-error
-      !elm.composing &&
-          (elm.tagName === 'OPTION' ||
-              isNotInFocusAndDirty(elm, checkVal) ||
-              isDirtyWithModifiers(elm, checkVal)));
-  }
-  function isNotInFocusAndDirty(elm, checkVal) {
-      // return true when textbox (.number and .trim) loses focus and its value is
-      // not equal to the updated value
-      var notInFocus = true;
-      // #6157
-      // work around IE bug when accessing document.activeElement in an iframe
-      try {
-          notInFocus = document.activeElement !== elm;
-      }
-      catch (e) { }
-      return notInFocus && elm.value !== checkVal;
-  }
-  function isDirtyWithModifiers(elm, newVal) {
-      var value = elm.value;
-      var modifiers = elm._vModifiers; // injected by v-model runtime
-      if (isDef(modifiers)) {
-          if (modifiers.number) {
-              return toNumber(value) !== toNumber(newVal);
-          }
-          if (modifiers.trim) {
-              return value.trim() !== newVal.trim();
-          }
-      }
-      return value !== newVal;
-  }
-  var domProps = {
-      create: updateDOMProps,
-      update: updateDOMProps
-  };
-
-  var parseStyleText = cached(function (cssText) {
-      var res = {};
-      var listDelimiter = /;(?![^(]*\))/g;
-      var propertyDelimiter = /:(.+)/;
-      cssText.split(listDelimiter).forEach(function (item) {
-          if (item) {
-              var tmp = item.split(propertyDelimiter);
-              tmp.length > 1 && (res[tmp[0].trim()] = tmp[1].trim());
-          }
-      });
-      return res;
-  });
-  // merge static and dynamic style data on the same vnode
-  function normalizeStyleData(data) {
-      var style = normalizeStyleBinding(data.style);
-      // static style is pre-processed into an object during compilation
-      // and is always a fresh object, so it's safe to merge into it
-      return data.staticStyle ? extend(data.staticStyle, style) : style;
-  }
-  // normalize possible array / string values into Object
-  function normalizeStyleBinding(bindingStyle) {
-      if (Array.isArray(bindingStyle)) {
-          return toObject(bindingStyle);
-      }
-      if (typeof bindingStyle === 'string') {
-          return parseStyleText(bindingStyle);
-      }
-      return bindingStyle;
-  }
-  /**
-   * parent component style should be after child's
-   * so that parent component's style could override it
-   */
-  function getStyle(vnode, checkChild) {
-      var res = {};
-      var styleData;
-      if (checkChild) {
-          var childNode = vnode;
-          while (childNode.componentInstance) {
-              childNode = childNode.componentInstance._vnode;
-              if (childNode &&
-                  childNode.data &&
-                  (styleData = normalizeStyleData(childNode.data))) {
-                  extend(res, styleData);
-              }
-          }
-      }
-      if ((styleData = normalizeStyleData(vnode.data))) {
-          extend(res, styleData);
-      }
-      var parentNode = vnode;
-      // @ts-expect-error parentNode.parent not VNodeWithData
-      while ((parentNode = parentNode.parent)) {
-          if (parentNode.data && (styleData = normalizeStyleData(parentNode.data))) {
-              extend(res, styleData);
-          }
-      }
-      return res;
-  }
-
-  var cssVarRE = /^--/;
-  var importantRE = /\s*!important$/;
-  var setProp = function (el, name, val) {
-      /* istanbul ignore if */
-      if (cssVarRE.test(name)) {
-          el.style.setProperty(name, val);
-      }
-      else if (importantRE.test(val)) {
-          el.style.setProperty(hyphenate(name), val.replace(importantRE, ''), 'important');
-      }
-      else {
-          var normalizedName = normalize(name);
-          if (Array.isArray(val)) {
-              // Support values array created by autoprefixer, e.g.
-              // {display: ["-webkit-box", "-ms-flexbox", "flex"]}
-              // Set them one by one, and the browser will only set those it can recognize
-              for (var i = 0, len = val.length; i < len; i++) {
-                  el.style[normalizedName] = val[i];
-              }
-          }
-          else {
-              el.style[normalizedName] = val;
-          }
-      }
-  };
-  var vendorNames = ['Webkit', 'Moz', 'ms'];
-  var emptyStyle;
-  var normalize = cached(function (prop) {
-      emptyStyle = emptyStyle || document.createElement('div').style;
-      prop = camelize(prop);
-      if (prop !== 'filter' && prop in emptyStyle) {
-          return prop;
-      }
-      var capName = prop.charAt(0).toUpperCase() + prop.slice(1);
-      for (var i = 0; i < vendorNames.length; i++) {
-          var name_1 = vendorNames[i] + capName;
-          if (name_1 in emptyStyle) {
-              return name_1;
-          }
-      }
-  });
-  function updateStyle(oldVnode, vnode) {
-      var data = vnode.data;
-      var oldData = oldVnode.data;
-      if (isUndef(data.staticStyle) &&
-          isUndef(data.style) &&
-          isUndef(oldData.staticStyle) &&
-          isUndef(oldData.style)) {
-          return;
-      }
-      var cur, name;
-      var el = vnode.elm;
-      var oldStaticStyle = oldData.staticStyle;
-      var oldStyleBinding = oldData.normalizedStyle || oldData.style || {};
-      // if static style exists, stylebinding already merged into it when doing normalizeStyleData
-      var oldStyle = oldStaticStyle || oldStyleBinding;
-      var style = normalizeStyleBinding(vnode.data.style) || {};
-      // store normalized style under a different key for next diff
-      // make sure to clone it if it's reactive, since the user likely wants
-      // to mutate it.
-      vnode.data.normalizedStyle = isDef(style.__ob__) ? extend({}, style) : style;
-      var newStyle = getStyle(vnode, true);
-      for (name in oldStyle) {
-          if (isUndef(newStyle[name])) {
-              setProp(el, name, '');
-          }
-      }
-      for (name in newStyle) {
-          cur = newStyle[name];
-          if (cur !== oldStyle[name]) {
-              // ie9 setting to null has no effect, must use empty string
-              setProp(el, name, cur == null ? '' : cur);
-          }
-      }
-  }
-  var style$1 = {
-      create: updateStyle,
-      update: updateStyle
-  };
-
-  var whitespaceRE$1 = /\s+/;
-  /**
-   * Add class with compatibility for SVG since classList is not supported on
-   * SVG elements in IE
-   */
-  function addClass(el, cls) {
-      /* istanbul ignore if */
-      if (!cls || !(cls = cls.trim())) {
-          return;
-      }
-      /* istanbul ignore else */
-      if (el.classList) {
-          if (cls.indexOf(' ') > -1) {
-              cls.split(whitespaceRE$1).forEach(function (c) { return el.classList.add(c); });
-          }
-          else {
-              el.classList.add(cls);
-          }
-      }
-      else {
-          var cur = " ".concat(el.getAttribute('class') || '', " ");
-          if (cur.indexOf(' ' + cls + ' ') < 0) {
-              el.setAttribute('class', (cur + cls).trim());
-          }
-      }
-  }
-  /**
-   * Remove class with compatibility for SVG since classList is not supported on
-   * SVG elements in IE
-   */
-  function removeClass(el, cls) {
-      /* istanbul ignore if */
-      if (!cls || !(cls = cls.trim())) {
-          return;
-      }
-      /* istanbul ignore else */
-      if (el.classList) {
-          if (cls.indexOf(' ') > -1) {
-              cls.split(whitespaceRE$1).forEach(function (c) { return el.classList.remove(c); });
-          }
-          else {
-              el.classList.remove(cls);
-          }
-          if (!el.classList.length) {
-              el.removeAttribute('class');
-          }
-      }
-      else {
-          var cur = " ".concat(el.getAttribute('class') || '', " ");
-          var tar = ' ' + cls + ' ';
-          while (cur.indexOf(tar) >= 0) {
-              cur = cur.replace(tar, ' ');
-          }
-          cur = cur.trim();
-          if (cur) {
-              el.setAttribute('class', cur);
-          }
-          else {
-              el.removeAttribute('class');
-          }
-      }
-  }
-
-  function resolveTransition(def) {
-      if (!def) {
-          return;
-      }
-      /* istanbul ignore else */
-      if (typeof def === 'object') {
-          var res = {};
-          if (def.css !== false) {
-              extend(res, autoCssTransition(def.name || 'v'));
-          }
-          extend(res, def);
-          return res;
-      }
-      else if (typeof def === 'string') {
-          return autoCssTransition(def);
-      }
-  }
-  var autoCssTransition = cached(function (name) {
-      return {
-          enterClass: "".concat(name, "-enter"),
-          enterToClass: "".concat(name, "-enter-to"),
-          enterActiveClass: "".concat(name, "-enter-active"),
-          leaveClass: "".concat(name, "-leave"),
-          leaveToClass: "".concat(name, "-leave-to"),
-          leaveActiveClass: "".concat(name, "-leave-active")
-      };
-  });
-  var hasTransition = inBrowser && !isIE9;
-  var TRANSITION = 'transition';
-  var ANIMATION = 'animation';
-  // Transition property/event sniffing
-  var transitionProp = 'transition';
-  var transitionEndEvent = 'transitionend';
-  var animationProp = 'animation';
-  var animationEndEvent = 'animationend';
-  if (hasTransition) {
-      /* istanbul ignore if */
-      if (window.ontransitionend === undefined &&
-          window.onwebkittransitionend !== undefined) {
-          transitionProp = 'WebkitTransition';
-          transitionEndEvent = 'webkitTransitionEnd';
-      }
-      if (window.onanimationend === undefined &&
-          window.onwebkitanimationend !== undefined) {
-          animationProp = 'WebkitAnimation';
-          animationEndEvent = 'webkitAnimationEnd';
-      }
-  }
-  // binding to window is necessary to make hot reload work in IE in strict mode
-  var raf = inBrowser
-      ? window.requestAnimationFrame
-          ? window.requestAnimationFrame.bind(window)
-          : setTimeout
-      : /* istanbul ignore next */ function (/* istanbul ignore next */ fn) { return fn(); };
-  function nextFrame(fn) {
-      raf(function () {
-          // @ts-expect-error
-          raf(fn);
-      });
-  }
-  function addTransitionClass(el, cls) {
-      var transitionClasses = el._transitionClasses || (el._transitionClasses = []);
-      if (transitionClasses.indexOf(cls) < 0) {
-          transitionClasses.push(cls);
-          addClass(el, cls);
-      }
-  }
-  function removeTransitionClass(el, cls) {
-      if (el._transitionClasses) {
-          remove$2(el._transitionClasses, cls);
-      }
-      removeClass(el, cls);
-  }
-  function whenTransitionEnds(el, expectedType, cb) {
-      var _a = getTransitionInfo(el, expectedType), type = _a.type, timeout = _a.timeout, propCount = _a.propCount;
-      if (!type)
-          return cb();
-      var event = type === TRANSITION ? transitionEndEvent : animationEndEvent;
-      var ended = 0;
-      var end = function () {
-          el.removeEventListener(event, onEnd);
-          cb();
-      };
-      var onEnd = function (e) {
-          if (e.target === el) {
-              if (++ended >= propCount) {
-                  end();
-              }
-          }
-      };
-      setTimeout(function () {
-          if (ended < propCount) {
-              end();
-          }
-      }, timeout + 1);
-      el.addEventListener(event, onEnd);
-  }
-  var transformRE = /\b(transform|all)(,|$)/;
-  function getTransitionInfo(el, expectedType) {
-      var styles = window.getComputedStyle(el);
-      // JSDOM may return undefined for transition properties
-      var transitionDelays = (styles[transitionProp + 'Delay'] || '').split(', ');
-      var transitionDurations = (styles[transitionProp + 'Duration'] || '').split(', ');
-      var transitionTimeout = getTimeout(transitionDelays, transitionDurations);
-      var animationDelays = (styles[animationProp + 'Delay'] || '').split(', ');
-      var animationDurations = (styles[animationProp + 'Duration'] || '').split(', ');
-      var animationTimeout = getTimeout(animationDelays, animationDurations);
-      var type;
-      var timeout = 0;
-      var propCount = 0;
-      /* istanbul ignore if */
-      if (expectedType === TRANSITION) {
-          if (transitionTimeout > 0) {
-              type = TRANSITION;
-              timeout = transitionTimeout;
-              propCount = transitionDurations.length;
-          }
-      }
-      else if (expectedType === ANIMATION) {
-          if (animationTimeout > 0) {
-              type = ANIMATION;
-              timeout = animationTimeout;
-              propCount = animationDurations.length;
-          }
-      }
-      else {
-          timeout = Math.max(transitionTimeout, animationTimeout);
-          type =
-              timeout > 0
-                  ? transitionTimeout > animationTimeout
-                      ? TRANSITION
-                      : ANIMATION
-                  : null;
-          propCount = type
-              ? type === TRANSITION
-                  ? transitionDurations.length
-                  : animationDurations.length
-              : 0;
-      }
-      var hasTransform = type === TRANSITION && transformRE.test(styles[transitionProp + 'Property']);
-      return {
-          type: type,
-          timeout: timeout,
-          propCount: propCount,
-          hasTransform: hasTransform
-      };
-  }
-  function getTimeout(delays, durations) {
-      /* istanbul ignore next */
-      while (delays.length < durations.length) {
-          delays = delays.concat(delays);
-      }
-      return Math.max.apply(null, durations.map(function (d, i) {
-          return toMs(d) + toMs(delays[i]);
-      }));
-  }
-  // Old versions of Chromium (below 61.0.3163.100) formats floating pointer numbers
-  // in a locale-dependent way, using a comma instead of a dot.
-  // If comma is not replaced with a dot, the input will be rounded down (i.e. acting
-  // as a floor function) causing unexpected behaviors
-  function toMs(s) {
-      return Number(s.slice(0, -1).replace(',', '.')) * 1000;
-  }
-
-  function enter(vnode, toggleDisplay) {
-      var el = vnode.elm;
-      // call leave callback now
-      if (isDef(el._leaveCb)) {
-          el._leaveCb.cancelled = true;
-          el._leaveCb();
-      }
-      var data = resolveTransition(vnode.data.transition);
-      if (isUndef(data)) {
-          return;
-      }
-      /* istanbul ignore if */
-      if (isDef(el._enterCb) || el.nodeType !== 1) {
-          return;
-      }
-      var css = data.css, type = data.type, enterClass = data.enterClass, enterToClass = data.enterToClass, enterActiveClass = data.enterActiveClass, appearClass = data.appearClass, appearToClass = data.appearToClass, appearActiveClass = data.appearActiveClass, beforeEnter = data.beforeEnter, enter = data.enter, afterEnter = data.afterEnter, enterCancelled = data.enterCancelled, beforeAppear = data.beforeAppear, appear = data.appear, afterAppear = data.afterAppear, appearCancelled = data.appearCancelled, duration = data.duration;
-      // activeInstance will always be the <transition> component managing this
-      // transition. One edge case to check is when the <transition> is placed
-      // as the root node of a child component. In that case we need to check
-      // <transition>'s parent for appear check.
-      var context = activeInstance;
-      var transitionNode = activeInstance.$vnode;
-      while (transitionNode && transitionNode.parent) {
-          context = transitionNode.context;
-          transitionNode = transitionNode.parent;
-      }
-      var isAppear = !context._isMounted || !vnode.isRootInsert;
-      if (isAppear && !appear && appear !== '') {
-          return;
-      }
-      var startClass = isAppear && appearClass ? appearClass : enterClass;
-      var activeClass = isAppear && appearActiveClass ? appearActiveClass : enterActiveClass;
-      var toClass = isAppear && appearToClass ? appearToClass : enterToClass;
-      var beforeEnterHook = isAppear ? beforeAppear || beforeEnter : beforeEnter;
-      var enterHook = isAppear ? (isFunction(appear) ? appear : enter) : enter;
-      var afterEnterHook = isAppear ? afterAppear || afterEnter : afterEnter;
-      var enterCancelledHook = isAppear
-          ? appearCancelled || enterCancelled
-          : enterCancelled;
-      var explicitEnterDuration = toNumber(isObject(duration) ? duration.enter : duration);
-      if (explicitEnterDuration != null) {
-          checkDuration(explicitEnterDuration, 'enter', vnode);
-      }
-      var expectsCSS = css !== false && !isIE9;
-      var userWantsControl = getHookArgumentsLength(enterHook);
-      var cb = (el._enterCb = once(function () {
-          if (expectsCSS) {
-              removeTransitionClass(el, toClass);
-              removeTransitionClass(el, activeClass);
-          }
-          // @ts-expect-error
-          if (cb.cancelled) {
-              if (expectsCSS) {
-                  removeTransitionClass(el, startClass);
-              }
-              enterCancelledHook && enterCancelledHook(el);
-          }
-          else {
-              afterEnterHook && afterEnterHook(el);
-          }
-          el._enterCb = null;
-      }));
-      if (!vnode.data.show) {
-          // remove pending leave element on enter by injecting an insert hook
-          mergeVNodeHook(vnode, 'insert', function () {
-              var parent = el.parentNode;
-              var pendingNode = parent && parent._pending && parent._pending[vnode.key];
-              if (pendingNode &&
-                  pendingNode.tag === vnode.tag &&
-                  pendingNode.elm._leaveCb) {
-                  pendingNode.elm._leaveCb();
-              }
-              enterHook && enterHook(el, cb);
-          });
-      }
-      // start enter transition
-      beforeEnterHook && beforeEnterHook(el);
-      if (expectsCSS) {
-          addTransitionClass(el, startClass);
-          addTransitionClass(el, activeClass);
-          nextFrame(function () {
-              removeTransitionClass(el, startClass);
-              // @ts-expect-error
-              if (!cb.cancelled) {
-                  addTransitionClass(el, toClass);
-                  if (!userWantsControl) {
-                      if (isValidDuration(explicitEnterDuration)) {
-                          setTimeout(cb, explicitEnterDuration);
-                      }
-                      else {
-                          whenTransitionEnds(el, type, cb);
-                      }
-                  }
-              }
-          });
-      }
-      if (vnode.data.show) {
-          toggleDisplay && toggleDisplay();
-          enterHook && enterHook(el, cb);
-      }
-      if (!expectsCSS && !userWantsControl) {
-          cb();
-      }
-  }
-  function leave(vnode, rm) {
-      var el = vnode.elm;
-      // call enter callback now
-      if (isDef(el._enterCb)) {
-          el._enterCb.cancelled = true;
-          el._enterCb();
-      }
-      var data = resolveTransition(vnode.data.transition);
-      if (isUndef(data) || el.nodeType !== 1) {
-          return rm();
-      }
-      /* istanbul ignore if */
-      if (isDef(el._leaveCb)) {
-          return;
-      }
-      var css = data.css, type = data.type, leaveClass = data.leaveClass, leaveToClass = data.leaveToClass, leaveActiveClass = data.leaveActiveClass, beforeLeave = data.beforeLeave, leave = data.leave, afterLeave = data.afterLeave, leaveCancelled = data.leaveCancelled, delayLeave = data.delayLeave, duration = data.duration;
-      var expectsCSS = css !== false && !isIE9;
-      var userWantsControl = getHookArgumentsLength(leave);
-      var explicitLeaveDuration = toNumber(isObject(duration) ? duration.leave : duration);
-      if (isDef(explicitLeaveDuration)) {
-          checkDuration(explicitLeaveDuration, 'leave', vnode);
-      }
-      var cb = (el._leaveCb = once(function () {
-          if (el.parentNode && el.parentNode._pending) {
-              el.parentNode._pending[vnode.key] = null;
-          }
-          if (expectsCSS) {
-              removeTransitionClass(el, leaveToClass);
-              removeTransitionClass(el, leaveActiveClass);
-          }
-          // @ts-expect-error
-          if (cb.cancelled) {
-              if (expectsCSS) {
-                  removeTransitionClass(el, leaveClass);
-              }
-              leaveCancelled && leaveCancelled(el);
-          }
-          else {
-              rm();
-              afterLeave && afterLeave(el);
-          }
-          el._leaveCb = null;
-      }));
-      if (delayLeave) {
-          delayLeave(performLeave);
-      }
-      else {
-          performLeave();
-      }
-      function performLeave() {
-          // the delayed leave may have already been cancelled
-          // @ts-expect-error
-          if (cb.cancelled) {
-              return;
-          }
-          // record leaving element
-          if (!vnode.data.show && el.parentNode) {
-              (el.parentNode._pending || (el.parentNode._pending = {}))[vnode.key] =
-                  vnode;
-          }
-          beforeLeave && beforeLeave(el);
-          if (expectsCSS) {
-              addTransitionClass(el, leaveClass);
-              addTransitionClass(el, leaveActiveClass);
-              nextFrame(function () {
-                  removeTransitionClass(el, leaveClass);
-                  // @ts-expect-error
-                  if (!cb.cancelled) {
-                      addTransitionClass(el, leaveToClass);
-                      if (!userWantsControl) {
-                          if (isValidDuration(explicitLeaveDuration)) {
-                              setTimeout(cb, explicitLeaveDuration);
-                          }
-                          else {
-                              whenTransitionEnds(el, type, cb);
-                          }
-                      }
-                  }
-              });
-          }
-          leave && leave(el, cb);
-          if (!expectsCSS && !userWantsControl) {
-              cb();
-          }
-      }
-  }
-  // only used in dev mode
-  function checkDuration(val, name, vnode) {
-      if (typeof val !== 'number') {
-          warn$2("<transition> explicit ".concat(name, " duration is not a valid number - ") +
-              "got ".concat(JSON.stringify(val), "."), vnode.context);
-      }
-      else if (isNaN(val)) {
-          warn$2("<transition> explicit ".concat(name, " duration is NaN - ") +
-              'the duration expression might be incorrect.', vnode.context);
-      }
-  }
-  function isValidDuration(val) {
-      return typeof val === 'number' && !isNaN(val);
-  }
-  /**
-   * Normalize a transition hook's argument length. The hook may be:
-   * - a merged hook (invoker) with the original in .fns
-   * - a wrapped component method (check ._length)
-   * - a plain function (.length)
-   */
-  function getHookArgumentsLength(fn) {
-      if (isUndef(fn)) {
-          return false;
-      }
-      // @ts-expect-error
-      var invokerFns = fn.fns;
-      if (isDef(invokerFns)) {
-          // invoker
-          return getHookArgumentsLength(Array.isArray(invokerFns) ? invokerFns[0] : invokerFns);
-      }
-      else {
-          // @ts-expect-error
-          return (fn._length || fn.length) > 1;
-      }
-  }
-  function _enter(_, vnode) {
-      if (vnode.data.show !== true) {
-          enter(vnode);
-      }
-  }
-  var transition = inBrowser
-      ? {
-          create: _enter,
-          activate: _enter,
-          remove: function (vnode, rm) {
-              /* istanbul ignore else */
-              if (vnode.data.show !== true) {
-                  // @ts-expect-error
-                  leave(vnode, rm);
-              }
-              else {
-                  rm();
-              }
-          }
-      }
-      : {};
-
-  var platformModules = [attrs, klass$1, events, domProps, style$1, transition];
-
-  // the directive module should be applied last, after all
-  // built-in modules have been applied.
-  var modules$1 = platformModules.concat(baseModules);
-  var patch = createPatchFunction({ nodeOps: nodeOps, modules: modules$1 });
-
-  /**
-   * Not type checking this file because flow doesn't like attaching
-   * properties to Elements.
-   */
-  /* istanbul ignore if */
-  if (isIE9) {
-      // http://www.matts411.com/post/internet-explorer-9-oninput/
-      document.addEventListener('selectionchange', function () {
-          var el = document.activeElement;
-          // @ts-expect-error
-          if (el && el.vmodel) {
-              trigger(el, 'input');
-          }
-      });
-  }
-  var directive = {
-      inserted: function (el, binding, vnode, oldVnode) {
-          if (vnode.tag === 'select') {
-              // #6903
-              if (oldVnode.elm && !oldVnode.elm._vOptions) {
-                  mergeVNodeHook(vnode, 'postpatch', function () {
-                      directive.componentUpdated(el, binding, vnode);
-                  });
-              }
-              else {
-                  setSelected(el, binding, vnode.context);
-              }
-              el._vOptions = [].map.call(el.options, getValue);
-          }
-          else if (vnode.tag === 'textarea' || isTextInputType(el.type)) {
-              el._vModifiers = binding.modifiers;
-              if (!binding.modifiers.lazy) {
-                  el.addEventListener('compositionstart', onCompositionStart);
-                  el.addEventListener('compositionend', onCompositionEnd);
-                  // Safari < 10.2 & UIWebView doesn't fire compositionend when
-                  // switching focus before confirming composition choice
-                  // this also fixes the issue where some browsers e.g. iOS Chrome
-                  // fires "change" instead of "input" on autocomplete.
-                  el.addEventListener('change', onCompositionEnd);
-                  /* istanbul ignore if */
-                  if (isIE9) {
-                      el.vmodel = true;
-                  }
-              }
-          }
-      },
-      componentUpdated: function (el, binding, vnode) {
-          if (vnode.tag === 'select') {
-              setSelected(el, binding, vnode.context);
-              // in case the options rendered by v-for have changed,
-              // it's possible that the value is out-of-sync with the rendered options.
-              // detect such cases and filter out values that no longer has a matching
-              // option in the DOM.
-              var prevOptions_1 = el._vOptions;
-              var curOptions_1 = (el._vOptions = [].map.call(el.options, getValue));
-              if (curOptions_1.some(function (o, i) { return !looseEqual(o, prevOptions_1[i]); })) {
-                  // trigger change event if
-                  // no matching option found for at least one value
-                  var needReset = el.multiple
-                      ? binding.value.some(function (v) { return hasNoMatchingOption(v, curOptions_1); })
-                      : binding.value !== binding.oldValue &&
-                          hasNoMatchingOption(binding.value, curOptions_1);
-                  if (needReset) {
-                      trigger(el, 'change');
-                  }
-              }
-          }
-      }
-  };
-  function setSelected(el, binding, vm) {
-      actuallySetSelected(el, binding, vm);
-      /* istanbul ignore if */
-      if (isIE || isEdge) {
-          setTimeout(function () {
-              actuallySetSelected(el, binding, vm);
-          }, 0);
-      }
-  }
-  function actuallySetSelected(el, binding, vm) {
-      var value = binding.value;
-      var isMultiple = el.multiple;
-      if (isMultiple && !Array.isArray(value)) {
-          warn$2("<select multiple v-model=\"".concat(binding.expression, "\"> ") +
-                  "expects an Array value for its binding, but got ".concat(Object.prototype.toString
-                      .call(value)
-                      .slice(8, -1)), vm);
-          return;
-      }
-      var selected, option;
-      for (var i = 0, l = el.options.length; i < l; i++) {
-          option = el.options[i];
-          if (isMultiple) {
-              selected = looseIndexOf(value, getValue(option)) > -1;
-              if (option.selected !== selected) {
-                  option.selected = selected;
-              }
-          }
-          else {
-              if (looseEqual(getValue(option), value)) {
-                  if (el.selectedIndex !== i) {
-                      el.selectedIndex = i;
-                  }
-                  return;
-              }
-          }
-      }
-      if (!isMultiple) {
-          el.selectedIndex = -1;
-      }
-  }
-  function hasNoMatchingOption(value, options) {
-      return options.every(function (o) { return !looseEqual(o, value); });
-  }
-  function getValue(option) {
-      return '_value' in option ? option._value : option.value;
-  }
-  function onCompositionStart(e) {
-      e.target.composing = true;
-  }
-  function onCompositionEnd(e) {
-      // prevent triggering an input event for no reason
-      if (!e.target.composing)
-          return;
-      e.target.composing = false;
-      trigger(e.target, 'input');
-  }
-  function trigger(el, type) {
-      var e = document.createEvent('HTMLEvents');
-      e.initEvent(type, true, true);
-      el.dispatchEvent(e);
-  }
-
-  // recursively search for possible transition defined inside the component root
-  function locateNode(vnode) {
-      // @ts-expect-error
-      return vnode.componentInstance && (!vnode.data || !vnode.data.transition)
-          ? locateNode(vnode.componentInstance._vnode)
-          : vnode;
-  }
-  var show = {
-      bind: function (el, _a, vnode) {
-          var value = _a.value;
-          vnode = locateNode(vnode);
-          var transition = vnode.data && vnode.data.transition;
-          var originalDisplay = (el.__vOriginalDisplay =
-              el.style.display === 'none' ? '' : el.style.display);
-          if (value && transition) {
-              vnode.data.show = true;
-              enter(vnode, function () {
-                  el.style.display = originalDisplay;
-              });
-          }
-          else {
-              el.style.display = value ? originalDisplay : 'none';
-          }
-      },
-      update: function (el, _a, vnode) {
-          var value = _a.value, oldValue = _a.oldValue;
-          /* istanbul ignore if */
-          if (!value === !oldValue)
-              return;
-          vnode = locateNode(vnode);
-          var transition = vnode.data && vnode.data.transition;
-          if (transition) {
-              vnode.data.show = true;
-              if (value) {
-                  enter(vnode, function () {
-                      el.style.display = el.__vOriginalDisplay;
-                  });
-              }
-              else {
-                  leave(vnode, function () {
-                      el.style.display = 'none';
-                  });
-              }
-          }
-          else {
-              el.style.display = value ? el.__vOriginalDisplay : 'none';
-          }
-      },
-      unbind: function (el, binding, vnode, oldVnode, isDestroy) {
-          if (!isDestroy) {
-              el.style.display = el.__vOriginalDisplay;
-          }
-      }
-  };
-
-  var platformDirectives = {
-      model: directive,
-      show: show
-  };
-
-  // Provides transition support for a single element/component.
-  var transitionProps = {
-      name: String,
-      appear: Boolean,
-      css: Boolean,
-      mode: String,
-      type: String,
-      enterClass: String,
-      leaveClass: String,
-      enterToClass: String,
-      leaveToClass: String,
-      enterActiveClass: String,
-      leaveActiveClass: String,
-      appearClass: String,
-      appearActiveClass: String,
-      appearToClass: String,
-      duration: [Number, String, Object]
-  };
-  // in case the child is also an abstract component, e.g. <keep-alive>
-  // we want to recursively retrieve the real component to be rendered
-  function getRealChild(vnode) {
-      var compOptions = vnode && vnode.componentOptions;
-      if (compOptions && compOptions.Ctor.options.abstract) {
-          return getRealChild(getFirstComponentChild(compOptions.children));
-      }
-      else {
-          return vnode;
-      }
-  }
-  function extractTransitionData(comp) {
-      var data = {};
-      var options = comp.$options;
-      // props
-      for (var key in options.propsData) {
-          data[key] = comp[key];
-      }
-      // events.
-      // extract listeners and pass them directly to the transition methods
-      var listeners = options._parentListeners;
-      for (var key in listeners) {
-          data[camelize(key)] = listeners[key];
-      }
-      return data;
-  }
-  function placeholder(h, rawChild) {
-      // @ts-expect-error
-      if (/\d-keep-alive$/.test(rawChild.tag)) {
-          return h('keep-alive', {
-              props: rawChild.componentOptions.propsData
-          });
-      }
-  }
-  function hasParentTransition(vnode) {
-      while ((vnode = vnode.parent)) {
-          if (vnode.data.transition) {
-              return true;
-          }
-      }
-  }
-  function isSameChild(child, oldChild) {
-      return oldChild.key === child.key && oldChild.tag === child.tag;
-  }
-  var isNotTextNode = function (c) { return c.tag || isAsyncPlaceholder(c); };
-  var isVShowDirective = function (d) { return d.name === 'show'; };
-  var Transition = {
-      name: 'transition',
-      props: transitionProps,
-      abstract: true,
-      render: function (h) {
-          var _this = this;
-          var children = this.$slots.default;
-          if (!children) {
-              return;
-          }
-          // filter out text nodes (possible whitespaces)
-          children = children.filter(isNotTextNode);
-          /* istanbul ignore if */
-          if (!children.length) {
-              return;
-          }
-          // warn multiple elements
-          if (children.length > 1) {
-              warn$2('<transition> can only be used on a single element. Use ' +
-                  '<transition-group> for lists.', this.$parent);
-          }
-          var mode = this.mode;
-          // warn invalid mode
-          if (mode && mode !== 'in-out' && mode !== 'out-in') {
-              warn$2('invalid <transition> mode: ' + mode, this.$parent);
-          }
-          var rawChild = children[0];
-          // if this is a component root node and the component's
-          // parent container node also has transition, skip.
-          if (hasParentTransition(this.$vnode)) {
-              return rawChild;
-          }
-          // apply transition data to child
-          // use getRealChild() to ignore abstract components e.g. keep-alive
-          var child = getRealChild(rawChild);
-          /* istanbul ignore if */
-          if (!child) {
-              return rawChild;
-          }
-          if (this._leaving) {
-              return placeholder(h, rawChild);
-          }
-          // ensure a key that is unique to the vnode type and to this transition
-          // component instance. This key will be used to remove pending leaving nodes
-          // during entering.
-          var id = "__transition-".concat(this._uid, "-");
-          child.key =
-              child.key == null
-                  ? child.isComment
-                      ? id + 'comment'
-                      : id + child.tag
-                  : isPrimitive(child.key)
-                      ? String(child.key).indexOf(id) === 0
-                          ? child.key
-                          : id + child.key
-                      : child.key;
-          var data = ((child.data || (child.data = {})).transition =
-              extractTransitionData(this));
-          var oldRawChild = this._vnode;
-          var oldChild = getRealChild(oldRawChild);
-          // mark v-show
-          // so that the transition module can hand over the control to the directive
-          if (child.data.directives && child.data.directives.some(isVShowDirective)) {
-              child.data.show = true;
-          }
-          if (oldChild &&
-              oldChild.data &&
-              !isSameChild(child, oldChild) &&
-              !isAsyncPlaceholder(oldChild) &&
-              // #6687 component root is a comment node
-              !(oldChild.componentInstance &&
-                  oldChild.componentInstance._vnode.isComment)) {
-              // replace old child transition data with fresh one
-              // important for dynamic transitions!
-              var oldData = (oldChild.data.transition = extend({}, data));
-              // handle transition mode
-              if (mode === 'out-in') {
-                  // return placeholder node and queue update when leave finishes
-                  this._leaving = true;
-                  mergeVNodeHook(oldData, 'afterLeave', function () {
-                      _this._leaving = false;
-                      _this.$forceUpdate();
-                  });
-                  return placeholder(h, rawChild);
-              }
-              else if (mode === 'in-out') {
-                  if (isAsyncPlaceholder(child)) {
-                      return oldRawChild;
-                  }
-                  var delayedLeave_1;
-                  var performLeave = function () {
-                      delayedLeave_1();
-                  };
-                  mergeVNodeHook(data, 'afterEnter', performLeave);
-                  mergeVNodeHook(data, 'enterCancelled', performLeave);
-                  mergeVNodeHook(oldData, 'delayLeave', function (leave) {
-                      delayedLeave_1 = leave;
-                  });
-              }
-          }
-          return rawChild;
-      }
-  };
-
-  // Provides transition support for list items.
-  var props = extend({
-      tag: String,
-      moveClass: String
-  }, transitionProps);
-  delete props.mode;
-  var TransitionGroup = {
-      props: props,
-      beforeMount: function () {
-          var _this = this;
-          var update = this._update;
-          this._update = function (vnode, hydrating) {
-              var restoreActiveInstance = setActiveInstance(_this);
-              // force removing pass
-              _this.__patch__(_this._vnode, _this.kept, false, // hydrating
-              true // removeOnly (!important, avoids unnecessary moves)
-              );
-              _this._vnode = _this.kept;
-              restoreActiveInstance();
-              update.call(_this, vnode, hydrating);
-          };
-      },
-      render: function (h) {
-          var tag = this.tag || this.$vnode.data.tag || 'span';
-          var map = Object.create(null);
-          var prevChildren = (this.prevChildren = this.children);
-          var rawChildren = this.$slots.default || [];
-          var children = (this.children = []);
-          var transitionData = extractTransitionData(this);
-          for (var i = 0; i < rawChildren.length; i++) {
-              var c = rawChildren[i];
-              if (c.tag) {
-                  if (c.key != null && String(c.key).indexOf('__vlist') !== 0) {
-                      children.push(c);
-                      map[c.key] = c;
-                      (c.data || (c.data = {})).transition = transitionData;
-                  }
-                  else {
-                      var opts = c.componentOptions;
-                      var name_1 = opts
-                          ? getComponentName(opts.Ctor.options) || opts.tag || ''
-                          : c.tag;
-                      warn$2("<transition-group> children must be keyed: <".concat(name_1, ">"));
-                  }
-              }
-          }
-          if (prevChildren) {
-              var kept = [];
-              var removed = [];
-              for (var i = 0; i < prevChildren.length; i++) {
-                  var c = prevChildren[i];
-                  c.data.transition = transitionData;
-                  // @ts-expect-error .getBoundingClientRect is not typed in Node
-                  c.data.pos = c.elm.getBoundingClientRect();
-                  if (map[c.key]) {
-                      kept.push(c);
-                  }
-                  else {
-                      removed.push(c);
-                  }
-              }
-              this.kept = h(tag, null, kept);
-              this.removed = removed;
-          }
-          return h(tag, null, children);
-      },
-      updated: function () {
-          var children = this.prevChildren;
-          var moveClass = this.moveClass || (this.name || 'v') + '-move';
-          if (!children.length || !this.hasMove(children[0].elm, moveClass)) {
-              return;
-          }
-          // we divide the work into three loops to avoid mixing DOM reads and writes
-          // in each iteration - which helps prevent layout thrashing.
-          children.forEach(callPendingCbs);
-          children.forEach(recordPosition);
-          children.forEach(applyTranslation);
-          // force reflow to put everything in position
-          // assign to this to avoid being removed in tree-shaking
-          // $flow-disable-line
-          this._reflow = document.body.offsetHeight;
-          children.forEach(function (c) {
-              if (c.data.moved) {
-                  var el_1 = c.elm;
-                  var s = el_1.style;
-                  addTransitionClass(el_1, moveClass);
-                  s.transform = s.WebkitTransform = s.transitionDuration = '';
-                  el_1.addEventListener(transitionEndEvent, (el_1._moveCb = function cb(e) {
-                      if (e && e.target !== el_1) {
-                          return;
-                      }
-                      if (!e || /transform$/.test(e.propertyName)) {
-                          el_1.removeEventListener(transitionEndEvent, cb);
-                          el_1._moveCb = null;
-                          removeTransitionClass(el_1, moveClass);
-                      }
-                  }));
-              }
-          });
-      },
-      methods: {
-          hasMove: function (el, moveClass) {
-              /* istanbul ignore if */
-              if (!hasTransition) {
-                  return false;
-              }
-              /* istanbul ignore if */
-              if (this._hasMove) {
-                  return this._hasMove;
-              }
-              // Detect whether an element with the move class applied has
-              // CSS transitions. Since the element may be inside an entering
-              // transition at this very moment, we make a clone of it and remove
-              // all other transition classes applied to ensure only the move class
-              // is applied.
-              var clone = el.cloneNode();
-              if (el._transitionClasses) {
-                  el._transitionClasses.forEach(function (cls) {
-                      removeClass(clone, cls);
-                  });
-              }
-              addClass(clone, moveClass);
-              clone.style.display = 'none';
-              this.$el.appendChild(clone);
-              var info = getTransitionInfo(clone);
-              this.$el.removeChild(clone);
-              return (this._hasMove = info.hasTransform);
-          }
-      }
-  };
-  function callPendingCbs(c) {
-      /* istanbul ignore if */
-      if (c.elm._moveCb) {
-          c.elm._moveCb();
-      }
-      /* istanbul ignore if */
-      if (c.elm._enterCb) {
-          c.elm._enterCb();
-      }
-  }
-  function recordPosition(c) {
-      c.data.newPos = c.elm.getBoundingClientRect();
-  }
-  function applyTranslation(c) {
-      var oldPos = c.data.pos;
-      var newPos = c.data.newPos;
-      var dx = oldPos.left - newPos.left;
-      var dy = oldPos.top - newPos.top;
-      if (dx || dy) {
-          c.data.moved = true;
-          var s = c.elm.style;
-          s.transform = s.WebkitTransform = "translate(".concat(dx, "px,").concat(dy, "px)");
-          s.transitionDuration = '0s';
-      }
-  }
-
-  var platformComponents = {
-      Transition: Transition,
-      TransitionGroup: TransitionGroup
-  };
-
-  // install platform specific utils
-  Vue.config.mustUseProp = mustUseProp;
-  Vue.config.isReservedTag = isReservedTag;
-  Vue.config.isReservedAttr = isReservedAttr;
-  Vue.config.getTagNamespace = getTagNamespace;
-  Vue.config.isUnknownElement = isUnknownElement;
-  // install platform runtime directives & components
-  extend(Vue.options.directives, platformDirectives);
-  extend(Vue.options.components, platformComponents);
-  // install platform patch function
-  Vue.prototype.__patch__ = inBrowser ? patch : noop;
-  // public mount method
-  Vue.prototype.$mount = function (el, hydrating) {
-      el = el && inBrowser ? query(el) : undefined;
-      return mountComponent(this, el, hydrating);
-  };
-  // devtools global hook
-  /* istanbul ignore next */
-  if (inBrowser) {
-      setTimeout(function () {
-          if (config.devtools) {
-              if (devtools) {
-                  devtools.emit('init', Vue);
-              }
-              else {
-                  // @ts-expect-error
-                  console[console.info ? 'info' : 'log']('Download the Vue Devtools extension for a better development experience:\n' +
-                      'https://github.com/vuejs/vue-devtools');
-              }
-          }
-          if (config.productionTip !== false &&
-              typeof console !== 'undefined') {
-              // @ts-expect-error
-              console[console.info ? 'info' : 'log']("You are running Vue in development mode.\n" +
-                  "Make sure to turn on production mode when deploying for production.\n" +
-                  "See more tips at https://vuejs.org/guide/deployment.html");
-          }
-      }, 0);
-  }
-
-  var defaultTagRE = /\{\{((?:.|\r?\n)+?)\}\}/g;
-  var regexEscapeRE = /[-.*+?^${}()|[\]\/\\]/g;
-  var buildRegex = cached(function (delimiters) {
-      var open = delimiters[0].replace(regexEscapeRE, '\\$&');
-      var close = delimiters[1].replace(regexEscapeRE, '\\$&');
-      return new RegExp(open + '((?:.|\\n)+?)' + close, 'g');
-  });
-  function parseText(text, delimiters) {
-      //@ts-expect-error
-      var tagRE = delimiters ? buildRegex(delimiters) : defaultTagRE;
-      if (!tagRE.test(text)) {
-          return;
-      }
-      var tokens = [];
-      var rawTokens = [];
-      var lastIndex = (tagRE.lastIndex = 0);
-      var match, index, tokenValue;
-      while ((match = tagRE.exec(text))) {
-          index = match.index;
-          // push text token
-          if (index > lastIndex) {
-              rawTokens.push((tokenValue = text.slice(lastIndex, index)));
-              tokens.push(JSON.stringify(tokenValue));
-          }
-          // tag token
-          var exp = parseFilters(match[1].trim());
-          tokens.push("_s(".concat(exp, ")"));
-          rawTokens.push({ '@binding': exp });
-          lastIndex = index + match[0].length;
-      }
-      if (lastIndex < text.length) {
-          rawTokens.push((tokenValue = text.slice(lastIndex)));
-          tokens.push(JSON.stringify(tokenValue));
-      }
-      return {
-          expression: tokens.join('+'),
-          tokens: rawTokens
-      };
-  }
-
-  function transformNode$1(el, options) {
-      var warn = options.warn || baseWarn;
-      var staticClass = getAndRemoveAttr(el, 'class');
-      if (staticClass) {
-          var res = parseText(staticClass, options.delimiters);
-          if (res) {
-              warn("class=\"".concat(staticClass, "\": ") +
-                  'Interpolation inside attributes has been removed. ' +
-                  'Use v-bind or the colon shorthand instead. For example, ' +
-                  'instead of <div class="{{ val }}">, use <div :class="val">.', el.rawAttrsMap['class']);
-          }
-      }
-      if (staticClass) {
-          el.staticClass = JSON.stringify(staticClass.replace(/\s+/g, ' ').trim());
-      }
-      var classBinding = getBindingAttr(el, 'class', false /* getStatic */);
-      if (classBinding) {
-          el.classBinding = classBinding;
-      }
-  }
-  function genData$2(el) {
-      var data = '';
-      if (el.staticClass) {
-          data += "staticClass:".concat(el.staticClass, ",");
-      }
-      if (el.classBinding) {
-          data += "class:".concat(el.classBinding, ",");
-      }
-      return data;
-  }
-  var klass = {
-      staticKeys: ['staticClass'],
-      transformNode: transformNode$1,
-      genData: genData$2
-  };
-
-  function transformNode(el, options) {
-      var warn = options.warn || baseWarn;
-      var staticStyle = getAndRemoveAttr(el, 'style');
-      if (staticStyle) {
-          /* istanbul ignore if */
-          {
-              var res = parseText(staticStyle, options.delimiters);
-              if (res) {
-                  warn("style=\"".concat(staticStyle, "\": ") +
-                      'Interpolation inside attributes has been removed. ' +
-                      'Use v-bind or the colon shorthand instead. For example, ' +
-                      'instead of <div style="{{ val }}">, use <div :style="val">.', el.rawAttrsMap['style']);
-              }
-          }
-          el.staticStyle = JSON.stringify(parseStyleText(staticStyle));
-      }
-      var styleBinding = getBindingAttr(el, 'style', false /* getStatic */);
-      if (styleBinding) {
-          el.styleBinding = styleBinding;
-      }
-  }
-  function genData$1(el) {
-      var data = '';
-      if (el.staticStyle) {
-          data += "staticStyle:".concat(el.staticStyle, ",");
-      }
-      if (el.styleBinding) {
-          data += "style:(".concat(el.styleBinding, "),");
-      }
-      return data;
-  }
-  var style = {
-      staticKeys: ['staticStyle'],
-      transformNode: transformNode,
-      genData: genData$1
-  };
-
-  var decoder;
-  var he = {
-      decode: function (html) {
-          decoder = decoder || document.createElement('div');
-          decoder.innerHTML = html;
-          return decoder.textContent;
-      }
-  };
-
-  var isUnaryTag = makeMap('area,base,br,col,embed,frame,hr,img,input,isindex,keygen,' +
-      'link,meta,param,source,track,wbr');
-  // Elements that you can, intentionally, leave open
-  // (and which close themselves)
-  var canBeLeftOpenTag = makeMap('colgroup,dd,dt,li,options,p,td,tfoot,th,thead,tr,source');
-  // HTML5 tags https://html.spec.whatwg.org/multipage/indices.html#elements-3
-  // Phrasing Content https://html.spec.whatwg.org/multipage/dom.html#phrasing-content
-  var isNonPhrasingTag = makeMap('address,article,aside,base,blockquote,body,caption,col,colgroup,dd,' +
-      'details,dialog,div,dl,dt,fieldset,figcaption,figure,footer,form,' +
-      'h1,h2,h3,h4,h5,h6,head,header,hgroup,hr,html,legend,li,menuitem,meta,' +
-      'optgroup,option,param,rp,rt,source,style,summary,tbody,td,tfoot,th,thead,' +
-      'title,tr,track');
-
-  /**
-   * Not type-checking this file because it's mostly vendor code.
-   */
-  // Regular Expressions for parsing tags and attributes
-  var attribute = /^\s*([^\s"'<>\/=]+)(?:\s*(=)\s*(?:"([^"]*)"+|'([^']*)'+|([^\s"'=<>`]+)))?/;
-  var dynamicArgAttribute = /^\s*((?:v-[\w-]+:|@|:|#)\[[^=]+?\][^\s"'<>\/=]*)(?:\s*(=)\s*(?:"([^"]*)"+|'([^']*)'+|([^\s"'=<>`]+)))?/;
-  var ncname = "[a-zA-Z_][\\-\\.0-9_a-zA-Z".concat(unicodeRegExp.source, "]*");
-  var qnameCapture = "((?:".concat(ncname, "\\:)?").concat(ncname, ")");
-  var startTagOpen = new RegExp("^<".concat(qnameCapture));
-  var startTagClose = /^\s*(\/?)>/;
-  var endTag = new RegExp("^<\\/".concat(qnameCapture, "[^>]*>"));
-  var doctype = /^<!DOCTYPE [^>]+>/i;
-  // #7298: escape - to avoid being passed as HTML comment when inlined in page
-  var comment = /^<!\--/;
-  var conditionalComment = /^<!\[/;
-  // Special Elements (can contain anything)
-  var isPlainTextElement = makeMap('script,style,textarea', true);
-  var reCache = {};
-  var decodingMap = {
-      '&lt;': '<',
-      '&gt;': '>',
-      '&quot;': '"',
-      '&amp;': '&',
-      '&#10;': '\n',
-      '&#9;': '\t',
-      '&#39;': "'"
-  };
-  var encodedAttr = /&(?:lt|gt|quot|amp|#39);/g;
-  var encodedAttrWithNewLines = /&(?:lt|gt|quot|amp|#39|#10|#9);/g;
-  // #5992
-  var isIgnoreNewlineTag = makeMap('pre,textarea', true);
-  var shouldIgnoreFirstNewline = function (tag, html) {
-      return tag && isIgnoreNewlineTag(tag) && html[0] === '\n';
-  };
-  function decodeAttr(value, shouldDecodeNewlines) {
-      var re = shouldDecodeNewlines ? encodedAttrWithNewLines : encodedAttr;
-      return value.replace(re, function (match) { return decodingMap[match]; });
-  }
-  function parseHTML(html, options) {
-      var stack = [];
-      var expectHTML = options.expectHTML;
-      var isUnaryTag = options.isUnaryTag || no;
-      var canBeLeftOpenTag = options.canBeLeftOpenTag || no;
-      var index = 0;
-      var last, lastTag;
-      var _loop_1 = function () {
-          last = html;
-          // Make sure we're not in a plaintext content element like script/style
-          if (!lastTag || !isPlainTextElement(lastTag)) {
-              var textEnd = html.indexOf('<');
-              if (textEnd === 0) {
-                  // Comment:
-                  if (comment.test(html)) {
-                      var commentEnd = html.indexOf('-->');
-                      if (commentEnd >= 0) {
-                          if (options.shouldKeepComment && options.comment) {
-                              options.comment(html.substring(4, commentEnd), index, index + commentEnd + 3);
-                          }
-                          advance(commentEnd + 3);
-                          return "continue";
-                      }
-                  }
-                  // http://en.wikipedia.org/wiki/Conditional_comment#Downlevel-revealed_conditional_comment
-                  if (conditionalComment.test(html)) {
-                      var conditionalEnd = html.indexOf(']>');
-                      if (conditionalEnd >= 0) {
-                          advance(conditionalEnd + 2);
-                          return "continue";
-                      }
-                  }
-                  // Doctype:
-                  var doctypeMatch = html.match(doctype);
-                  if (doctypeMatch) {
-                      advance(doctypeMatch[0].length);
-                      return "continue";
-                  }
-                  // End tag:
-                  var endTagMatch = html.match(endTag);
-                  if (endTagMatch) {
-                      var curIndex = index;
-                      advance(endTagMatch[0].length);
-                      parseEndTag(endTagMatch[1], curIndex, index);
-                      return "continue";
-                  }
-                  // Start tag:
-                  var startTagMatch = parseStartTag();
-                  if (startTagMatch) {
-                      handleStartTag(startTagMatch);
-                      if (shouldIgnoreFirstNewline(startTagMatch.tagName, html)) {
-                          advance(1);
-                      }
-                      return "continue";
-                  }
-              }
-              var text = void 0, rest = void 0, next = void 0;
-              if (textEnd >= 0) {
-                  rest = html.slice(textEnd);
-                  while (!endTag.test(rest) &&
-                      !startTagOpen.test(rest) &&
-                      !comment.test(rest) &&
-                      !conditionalComment.test(rest)) {
-                      // < in plain text, be forgiving and treat it as text
-                      next = rest.indexOf('<', 1);
-                      if (next < 0)
-                          break;
-                      textEnd += next;
-                      rest = html.slice(textEnd);
-                  }
-                  text = html.substring(0, textEnd);
-              }
-              if (textEnd < 0) {
-                  text = html;
-              }
-              if (text) {
-                  advance(text.length);
-              }
-              if (options.chars && text) {
-                  options.chars(text, index - text.length, index);
-              }
-          }
-          else {
-              var endTagLength_1 = 0;
-              var stackedTag_1 = lastTag.toLowerCase();
-              var reStackedTag = reCache[stackedTag_1] ||
-                  (reCache[stackedTag_1] = new RegExp('([\\s\\S]*?)(</' + stackedTag_1 + '[^>]*>)', 'i'));
-              var rest = html.replace(reStackedTag, function (all, text, endTag) {
-                  endTagLength_1 = endTag.length;
-                  if (!isPlainTextElement(stackedTag_1) && stackedTag_1 !== 'noscript') {
-                      text = text
-                          .replace(/<!\--([\s\S]*?)-->/g, '$1') // #7298
-                          .replace(/<!\[CDATA\[([\s\S]*?)]]>/g, '$1');
-                  }
-                  if (shouldIgnoreFirstNewline(stackedTag_1, text)) {
-                      text = text.slice(1);
-                  }
-                  if (options.chars) {
-                      options.chars(text);
-                  }
-                  return '';
-              });
-              index += html.length - rest.length;
-              html = rest;
-              parseEndTag(stackedTag_1, index - endTagLength_1, index);
-          }
-          if (html === last) {
-              options.chars && options.chars(html);
-              if (!stack.length && options.warn) {
-                  options.warn("Mal-formatted tag at end of template: \"".concat(html, "\""), {
-                      start: index + html.length
-                  });
-              }
-              return "break";
-          }
-      };
-      while (html) {
-          var state_1 = _loop_1();
-          if (state_1 === "break")
-              break;
-      }
-      // Clean up any remaining tags
-      parseEndTag();
-      function advance(n) {
-          index += n;
-          html = html.substring(n);
-      }
-      function parseStartTag() {
-          var start = html.match(startTagOpen);
-          if (start) {
-              var match = {
-                  tagName: start[1],
-                  attrs: [],
-                  start: index
-              };
-              advance(start[0].length);
-              var end = void 0, attr = void 0;
-              while (!(end = html.match(startTagClose)) &&
-                  (attr = html.match(dynamicArgAttribute) || html.match(attribute))) {
-                  attr.start = index;
-                  advance(attr[0].length);
-                  attr.end = index;
-                  match.attrs.push(attr);
-              }
-              if (end) {
-                  match.unarySlash = end[1];
-                  advance(end[0].length);
-                  match.end = index;
-                  return match;
-              }
-          }
-      }
-      function handleStartTag(match) {
-          var tagName = match.tagName;
-          var unarySlash = match.unarySlash;
-          if (expectHTML) {
-              if (lastTag === 'p' && isNonPhrasingTag(tagName)) {
-                  parseEndTag(lastTag);
-              }
-              if (canBeLeftOpenTag(tagName) && lastTag === tagName) {
-                  parseEndTag(tagName);
-              }
-          }
-          var unary = isUnaryTag(tagName) || !!unarySlash;
-          var l = match.attrs.length;
-          var attrs = new Array(l);
-          for (var i = 0; i < l; i++) {
-              var args = match.attrs[i];
-              var value = args[3] || args[4] || args[5] || '';
-              var shouldDecodeNewlines = tagName === 'a' && args[1] === 'href'
-                  ? options.shouldDecodeNewlinesForHref
-                  : options.shouldDecodeNewlines;
-              attrs[i] = {
-                  name: args[1],
-                  value: decodeAttr(value, shouldDecodeNewlines)
-              };
-              if (options.outputSourceRange) {
-                  attrs[i].start = args.start + args[0].match(/^\s*/).length;
-                  attrs[i].end = args.end;
-              }
-          }
-          if (!unary) {
-              stack.push({
-                  tag: tagName,
-                  lowerCasedTag: tagName.toLowerCase(),
-                  attrs: attrs,
-                  start: match.start,
-                  end: match.end
-              });
-              lastTag = tagName;
-          }
-          if (options.start) {
-              options.start(tagName, attrs, unary, match.start, match.end);
-          }
-      }
-      function parseEndTag(tagName, start, end) {
-          var pos, lowerCasedTagName;
-          if (start == null)
-              start = index;
-          if (end == null)
-              end = index;
-          // Find the closest opened tag of the same type
-          if (tagName) {
-              lowerCasedTagName = tagName.toLowerCase();
-              for (pos = stack.length - 1; pos >= 0; pos--) {
-                  if (stack[pos].lowerCasedTag === lowerCasedTagName) {
-                      break;
-                  }
-              }
-          }
-          else {
-              // If no tag name is provided, clean shop
-              pos = 0;
-          }
-          if (pos >= 0) {
-              // Close all the open elements, up the stack
-              for (var i = stack.length - 1; i >= pos; i--) {
-                  if ((i > pos || !tagName) && options.warn) {
-                      options.warn("tag <".concat(stack[i].tag, "> has no matching end tag."), {
-                          start: stack[i].start,
-                          end: stack[i].end
-                      });
-                  }
-                  if (options.end) {
-                      options.end(stack[i].tag, start, end);
-                  }
-              }
-              // Remove the open elements from the stack
-              stack.length = pos;
-              lastTag = pos && stack[pos - 1].tag;
-          }
-          else if (lowerCasedTagName === 'br') {
-              if (options.start) {
-                  options.start(tagName, [], true, start, end);
-              }
-          }
-          else if (lowerCasedTagName === 'p') {
-              if (options.start) {
-                  options.start(tagName, [], false, start, end);
-              }
-              if (options.end) {
-                  options.end(tagName, start, end);
-              }
-          }
-      }
-  }
-
-  var onRE = /^@|^v-on:/;
-  var dirRE = /^v-|^@|^:|^#/;
-  var forAliasRE = /([\s\S]*?)\s+(?:in|of)\s+([\s\S]*)/;
-  var forIteratorRE = /,([^,\}\]]*)(?:,([^,\}\]]*))?$/;
-  var stripParensRE = /^\(|\)$/g;
-  var dynamicArgRE = /^\[.*\]$/;
-  var argRE = /:(.*)$/;
-  var bindRE = /^:|^\.|^v-bind:/;
-  var modifierRE = /\.[^.\]]+(?=[^\]]*$)/g;
-  var slotRE = /^v-slot(:|$)|^#/;
-  var lineBreakRE = /[\r\n]/;
-  var whitespaceRE = /[ \f\t\r\n]+/g;
-  var invalidAttributeRE = /[\s"'<>\/=]/;
-  var decodeHTMLCached = cached(he.decode);
-  var emptySlotScopeToken = "_empty_";
-  // configurable state
-  var warn;
-  var delimiters;
-  var transforms;
-  var preTransforms;
-  var postTransforms;
-  var platformIsPreTag;
-  var platformMustUseProp;
-  var platformGetTagNamespace;
-  var maybeComponent;
-  function createASTElement(tag, attrs, parent) {
-      return {
-          type: 1,
-          tag: tag,
-          attrsList: attrs,
-          attrsMap: makeAttrsMap(attrs),
-          rawAttrsMap: {},
-          parent: parent,
-          children: []
-      };
-  }
-  /**
-   * Convert HTML string to AST.
-   */
-  function parse(template, options) {
-      warn = options.warn || baseWarn;
-      platformIsPreTag = options.isPreTag || no;
-      platformMustUseProp = options.mustUseProp || no;
-      platformGetTagNamespace = options.getTagNamespace || no;
-      var isReservedTag = options.isReservedTag || no;
-      maybeComponent = function (el) {
-          return !!(el.component ||
-              el.attrsMap[':is'] ||
-              el.attrsMap['v-bind:is'] ||
-              !(el.attrsMap.is ? isReservedTag(el.attrsMap.is) : isReservedTag(el.tag)));
-      };
-      transforms = pluckModuleFunction(options.modules, 'transformNode');
-      preTransforms = pluckModuleFunction(options.modules, 'preTransformNode');
-      postTransforms = pluckModuleFunction(options.modules, 'postTransformNode');
-      delimiters = options.delimiters;
-      var stack = [];
-      var preserveWhitespace = options.preserveWhitespace !== false;
-      var whitespaceOption = options.whitespace;
-      var root;
-      var currentParent;
-      var inVPre = false;
-      var inPre = false;
-      var warned = false;
-      function warnOnce(msg, range) {
-          if (!warned) {
-              warned = true;
-              warn(msg, range);
-          }
-      }
-      function closeElement(element) {
-          trimEndingWhitespace(element);
-          if (!inVPre && !element.processed) {
-              element = processElement(element, options);
-          }
-          // tree management
-          if (!stack.length && element !== root) {
-              // allow root elements with v-if, v-else-if and v-else
-              if (root.if && (element.elseif || element.else)) {
-                  {
-                      checkRootConstraints(element);
-                  }
-                  addIfCondition(root, {
-                      exp: element.elseif,
-                      block: element
-                  });
-              }
-              else {
-                  warnOnce("Component template should contain exactly one root element. " +
-                      "If you are using v-if on multiple elements, " +
-                      "use v-else-if to chain them instead.", { start: element.start });
-              }
-          }
-          if (currentParent && !element.forbidden) {
-              if (element.elseif || element.else) {
-                  processIfConditions(element, currentParent);
-              }
-              else {
-                  if (element.slotScope) {
-                      // scoped slot
-                      // keep it in the children list so that v-else(-if) conditions can
-                      // find it as the prev node.
-                      var name_1 = element.slotTarget || '"default"';
-                      (currentParent.scopedSlots || (currentParent.scopedSlots = {}))[name_1] = element;
-                  }
-                  currentParent.children.push(element);
-                  element.parent = currentParent;
-              }
-          }
-          // final children cleanup
-          // filter out scoped slots
-          element.children = element.children.filter(function (c) { return !c.slotScope; });
-          // remove trailing whitespace node again
-          trimEndingWhitespace(element);
-          // check pre state
-          if (element.pre) {
-              inVPre = false;
-          }
-          if (platformIsPreTag(element.tag)) {
-              inPre = false;
-          }
-          // apply post-transforms
-          for (var i = 0; i < postTransforms.length; i++) {
-              postTransforms[i](element, options);
-          }
-      }
-      function trimEndingWhitespace(el) {
-          // remove trailing whitespace node
-          if (!inPre) {
-              var lastNode = void 0;
-              while ((lastNode = el.children[el.children.length - 1]) &&
-                  lastNode.type === 3 &&
-                  lastNode.text === ' ') {
-                  el.children.pop();
-              }
-          }
-      }
-      function checkRootConstraints(el) {
-          if (el.tag === 'slot' || el.tag === 'template') {
-              warnOnce("Cannot use <".concat(el.tag, "> as component root element because it may ") +
-                  'contain multiple nodes.', { start: el.start });
-          }
-          if (el.attrsMap.hasOwnProperty('v-for')) {
-              warnOnce('Cannot use v-for on stateful component root element because ' +
-                  'it renders multiple elements.', el.rawAttrsMap['v-for']);
-          }
-      }
-      parseHTML(template, {
-          warn: warn,
-          expectHTML: options.expectHTML,
-          isUnaryTag: options.isUnaryTag,
-          canBeLeftOpenTag: options.canBeLeftOpenTag,
-          shouldDecodeNewlines: options.shouldDecodeNewlines,
-          shouldDecodeNewlinesForHref: options.shouldDecodeNewlinesForHref,
-          shouldKeepComment: options.comments,
-          outputSourceRange: options.outputSourceRange,
-          start: function (tag, attrs, unary, start, end) {
-              // check namespace.
-              // inherit parent ns if there is one
-              var ns = (currentParent && currentParent.ns) || platformGetTagNamespace(tag);
-              // handle IE svg bug
-              /* istanbul ignore if */
-              if (isIE && ns === 'svg') {
-                  attrs = guardIESVGBug(attrs);
-              }
-              var element = createASTElement(tag, attrs, currentParent);
-              if (ns) {
-                  element.ns = ns;
-              }
-              {
-                  if (options.outputSourceRange) {
-                      element.start = start;
-                      element.end = end;
-                      element.rawAttrsMap = element.attrsList.reduce(function (cumulated, attr) {
-                          cumulated[attr.name] = attr;
-                          return cumulated;
-                      }, {});
-                  }
-                  attrs.forEach(function (attr) {
-                      if (invalidAttributeRE.test(attr.name)) {
-                          warn("Invalid dynamic argument expression: attribute names cannot contain " +
-                              "spaces, quotes, <, >, / or =.", options.outputSourceRange
-                              ? {
-                                  start: attr.start + attr.name.indexOf("["),
-                                  end: attr.start + attr.name.length
-                              }
-                              : undefined);
-                      }
-                  });
-              }
-              if (isForbiddenTag(element) && !isServerRendering()) {
-                  element.forbidden = true;
-                  warn('Templates should only be responsible for mapping the state to the ' +
-                          'UI. Avoid placing tags with side-effects in your templates, such as ' +
-                          "<".concat(tag, ">") +
-                          ', as they will not be parsed.', { start: element.start });
-              }
-              // apply pre-transforms
-              for (var i = 0; i < preTransforms.length; i++) {
-                  element = preTransforms[i](element, options) || element;
-              }
-              if (!inVPre) {
-                  processPre(element);
-                  if (element.pre) {
-                      inVPre = true;
-                  }
-              }
-              if (platformIsPreTag(element.tag)) {
-                  inPre = true;
-              }
-              if (inVPre) {
-                  processRawAttrs(element);
-              }
-              else if (!element.processed) {
-                  // structural directives
-                  processFor(element);
-                  processIf(element);
-                  processOnce(element);
-              }
-              if (!root) {
-                  root = element;
-                  {
-                      checkRootConstraints(root);
-                  }
-              }
-              if (!unary) {
-                  currentParent = element;
-                  stack.push(element);
-              }
-              else {
-                  closeElement(element);
-              }
-          },
-          end: function (tag, start, end) {
-              var element = stack[stack.length - 1];
-              // pop stack
-              stack.length -= 1;
-              currentParent = stack[stack.length - 1];
-              if (options.outputSourceRange) {
-                  element.end = end;
-              }
-              closeElement(element);
-          },
-          chars: function (text, start, end) {
-              if (!currentParent) {
-                  {
-                      if (text === template) {
-                          warnOnce('Component template requires a root element, rather than just text.', { start: start });
-                      }
-                      else if ((text = text.trim())) {
-                          warnOnce("text \"".concat(text, "\" outside root element will be ignored."), {
-                              start: start
-                          });
-                      }
-                  }
-                  return;
-              }
-              // IE textarea placeholder bug
-              /* istanbul ignore if */
-              if (isIE &&
-                  currentParent.tag === 'textarea' &&
-                  currentParent.attrsMap.placeholder === text) {
-                  return;
-              }
-              var children = currentParent.children;
-              if (inPre || text.trim()) {
-                  text = isTextTag(currentParent)
-                      ? text
-                      : decodeHTMLCached(text);
-              }
-              else if (!children.length) {
-                  // remove the whitespace-only node right after an opening tag
-                  text = '';
-              }
-              else if (whitespaceOption) {
-                  if (whitespaceOption === 'condense') {
-                      // in condense mode, remove the whitespace node if it contains
-                      // line break, otherwise condense to a single space
-                      text = lineBreakRE.test(text) ? '' : ' ';
-                  }
-                  else {
-                      text = ' ';
-                  }
-              }
-              else {
-                  text = preserveWhitespace ? ' ' : '';
-              }
-              if (text) {
-                  if (!inPre && whitespaceOption === 'condense') {
-                      // condense consecutive whitespaces into single space
-                      text = text.replace(whitespaceRE, ' ');
-                  }
-                  var res = void 0;
-                  var child = void 0;
-                  if (!inVPre && text !== ' ' && (res = parseText(text, delimiters))) {
-                      child = {
-                          type: 2,
-                          expression: res.expression,
-                          tokens: res.tokens,
-                          text: text
-                      };
-                  }
-                  else if (text !== ' ' ||
-                      !children.length ||
-                      children[children.length - 1].text !== ' ') {
-                      child = {
-                          type: 3,
-                          text: text
-                      };
-                  }
-                  if (child) {
-                      if (options.outputSourceRange) {
-                          child.start = start;
-                          child.end = end;
-                      }
-                      children.push(child);
-                  }
-              }
-          },
-          comment: function (text, start, end) {
-              // adding anything as a sibling to the root node is forbidden
-              // comments should still be allowed, but ignored
-              if (currentParent) {
-                  var child = {
-                      type: 3,
-                      text: text,
-                      isComment: true
-                  };
-                  if (options.outputSourceRange) {
-                      child.start = start;
-                      child.end = end;
-                  }
-                  currentParent.children.push(child);
-              }
-          }
-      });
-      return root;
-  }
-  function processPre(el) {
-      if (getAndRemoveAttr(el, 'v-pre') != null) {
-          el.pre = true;
-      }
-  }
-  function processRawAttrs(el) {
-      var list = el.attrsList;
-      var len = list.length;
-      if (len) {
-          var attrs = (el.attrs = new Array(len));
-          for (var i = 0; i < len; i++) {
-              attrs[i] = {
-                  name: list[i].name,
-                  value: JSON.stringify(list[i].value)
-              };
-              if (list[i].start != null) {
-                  attrs[i].start = list[i].start;
-                  attrs[i].end = list[i].end;
-              }
-          }
-      }
-      else if (!el.pre) {
-          // non root node in pre blocks with no attributes
-          el.plain = true;
-      }
-  }
-  function processElement(element, options) {
-      processKey(element);
-      // determine whether this is a plain element after
-      // removing structural attributes
-      element.plain =
-          !element.key && !element.scopedSlots && !element.attrsList.length;
-      processRef(element);
-      processSlotContent(element);
-      processSlotOutlet(element);
-      processComponent(element);
-      for (var i = 0; i < transforms.length; i++) {
-          element = transforms[i](element, options) || element;
-      }
-      processAttrs(element);
-      return element;
-  }
-  function processKey(el) {
-      var exp = getBindingAttr(el, 'key');
-      if (exp) {
-          {
-              if (el.tag === 'template') {
-                  warn("<template> cannot be keyed. Place the key on real elements instead.", getRawBindingAttr(el, 'key'));
-              }
-              if (el.for) {
-                  var iterator = el.iterator2 || el.iterator1;
-                  var parent_1 = el.parent;
-                  if (iterator &&
-                      iterator === exp &&
-                      parent_1 &&
-                      parent_1.tag === 'transition-group') {
-                      warn("Do not use v-for index as key on <transition-group> children, " +
-                          "this is the same as not using keys.", getRawBindingAttr(el, 'key'), true /* tip */);
-                  }
-              }
-          }
-          el.key = exp;
-      }
-  }
-  function processRef(el) {
-      var ref = getBindingAttr(el, 'ref');
-      if (ref) {
-          el.ref = ref;
-          el.refInFor = checkInFor(el);
-      }
-  }
-  function processFor(el) {
-      var exp;
-      if ((exp = getAndRemoveAttr(el, 'v-for'))) {
-          var res = parseFor(exp);
-          if (res) {
-              extend(el, res);
-          }
-          else {
-              warn("Invalid v-for expression: ".concat(exp), el.rawAttrsMap['v-for']);
-          }
-      }
-  }
-  function parseFor(exp) {
-      var inMatch = exp.match(forAliasRE);
-      if (!inMatch)
-          return;
-      var res = {};
-      res.for = inMatch[2].trim();
-      var alias = inMatch[1].trim().replace(stripParensRE, '');
-      var iteratorMatch = alias.match(forIteratorRE);
-      if (iteratorMatch) {
-          res.alias = alias.replace(forIteratorRE, '').trim();
-          res.iterator1 = iteratorMatch[1].trim();
-          if (iteratorMatch[2]) {
-              res.iterator2 = iteratorMatch[2].trim();
-          }
-      }
-      else {
-          res.alias = alias;
-      }
-      return res;
-  }
-  function processIf(el) {
-      var exp = getAndRemoveAttr(el, 'v-if');
-      if (exp) {
-          el.if = exp;
-          addIfCondition(el, {
-              exp: exp,
-              block: el
-          });
-      }
-      else {
-          if (getAndRemoveAttr(el, 'v-else') != null) {
-              el.else = true;
-          }
-          var elseif = getAndRemoveAttr(el, 'v-else-if');
-          if (elseif) {
-              el.elseif = elseif;
-          }
-      }
-  }
-  function processIfConditions(el, parent) {
-      var prev = findPrevElement(parent.children);
-      if (prev && prev.if) {
-          addIfCondition(prev, {
-              exp: el.elseif,
-              block: el
-          });
-      }
-      else {
-          warn("v-".concat(el.elseif ? 'else-if="' + el.elseif + '"' : 'else', " ") +
-              "used on element <".concat(el.tag, "> without corresponding v-if."), el.rawAttrsMap[el.elseif ? 'v-else-if' : 'v-else']);
-      }
-  }
-  function findPrevElement(children) {
-      var i = children.length;
-      while (i--) {
-          if (children[i].type === 1) {
-              return children[i];
-          }
-          else {
-              if (children[i].text !== ' ') {
-                  warn("text \"".concat(children[i].text.trim(), "\" between v-if and v-else(-if) ") +
-                      "will be ignored.", children[i]);
-              }
-              children.pop();
-          }
-      }
-  }
-  function addIfCondition(el, condition) {
-      if (!el.ifConditions) {
-          el.ifConditions = [];
-      }
-      el.ifConditions.push(condition);
-  }
-  function processOnce(el) {
-      var once = getAndRemoveAttr(el, 'v-once');
-      if (once != null) {
-          el.once = true;
-      }
-  }
-  // handle content being passed to a component as slot,
-  // e.g. <template slot="xxx">, <div slot-scope="xxx">
-  function processSlotContent(el) {
-      var slotScope;
-      if (el.tag === 'template') {
-          slotScope = getAndRemoveAttr(el, 'scope');
-          /* istanbul ignore if */
-          if (slotScope) {
-              warn("the \"scope\" attribute for scoped slots have been deprecated and " +
-                  "replaced by \"slot-scope\" since 2.5. The new \"slot-scope\" attribute " +
-                  "can also be used on plain elements in addition to <template> to " +
-                  "denote scoped slots.", el.rawAttrsMap['scope'], true);
-          }
-          el.slotScope = slotScope || getAndRemoveAttr(el, 'slot-scope');
-      }
-      else if ((slotScope = getAndRemoveAttr(el, 'slot-scope'))) {
-          /* istanbul ignore if */
-          if (el.attrsMap['v-for']) {
-              warn("Ambiguous combined usage of slot-scope and v-for on <".concat(el.tag, "> ") +
-                  "(v-for takes higher priority). Use a wrapper <template> for the " +
-                  "scoped slot to make it clearer.", el.rawAttrsMap['slot-scope'], true);
-          }
-          el.slotScope = slotScope;
-      }
-      // slot="xxx"
-      var slotTarget = getBindingAttr(el, 'slot');
-      if (slotTarget) {
-          el.slotTarget = slotTarget === '""' ? '"default"' : slotTarget;
-          el.slotTargetDynamic = !!(el.attrsMap[':slot'] || el.attrsMap['v-bind:slot']);
-          // preserve slot as an attribute for native shadow DOM compat
-          // only for non-scoped slots.
-          if (el.tag !== 'template' && !el.slotScope) {
-              addAttr(el, 'slot', slotTarget, getRawBindingAttr(el, 'slot'));
-          }
-      }
-      // 2.6 v-slot syntax
-      {
-          if (el.tag === 'template') {
-              // v-slot on <template>
-              var slotBinding = getAndRemoveAttrByRegex(el, slotRE);
-              if (slotBinding) {
-                  {
-                      if (el.slotTarget || el.slotScope) {
-                          warn("Unexpected mixed usage of different slot syntaxes.", el);
-                      }
-                      if (el.parent && !maybeComponent(el.parent)) {
-                          warn("<template v-slot> can only appear at the root level inside " +
-                              "the receiving component", el);
-                      }
-                  }
-                  var _a = getSlotName(slotBinding), name_2 = _a.name, dynamic = _a.dynamic;
-                  el.slotTarget = name_2;
-                  el.slotTargetDynamic = dynamic;
-                  el.slotScope = slotBinding.value || emptySlotScopeToken; // force it into a scoped slot for perf
-              }
-          }
-          else {
-              // v-slot on component, denotes default slot
-              var slotBinding = getAndRemoveAttrByRegex(el, slotRE);
-              if (slotBinding) {
-                  {
-                      if (!maybeComponent(el)) {
-                          warn("v-slot can only be used on components or <template>.", slotBinding);
-                      }
-                      if (el.slotScope || el.slotTarget) {
-                          warn("Unexpected mixed usage of different slot syntaxes.", el);
-                      }
-                      if (el.scopedSlots) {
-                          warn("To avoid scope ambiguity, the default slot should also use " +
-                              "<template> syntax when there are other named slots.", slotBinding);
-                      }
-                  }
-                  // add the component's children to its default slot
-                  var slots = el.scopedSlots || (el.scopedSlots = {});
-                  var _b = getSlotName(slotBinding), name_3 = _b.name, dynamic = _b.dynamic;
-                  var slotContainer_1 = (slots[name_3] = createASTElement('template', [], el));
-                  slotContainer_1.slotTarget = name_3;
-                  slotContainer_1.slotTargetDynamic = dynamic;
-                  slotContainer_1.children = el.children.filter(function (c) {
-                      if (!c.slotScope) {
-                          c.parent = slotContainer_1;
-                          return true;
-                      }
-                  });
-                  slotContainer_1.slotScope = slotBinding.value || emptySlotScopeToken;
-                  // remove children as they are returned from scopedSlots now
-                  el.children = [];
-                  // mark el non-plain so data gets generated
-                  el.plain = false;
-              }
-          }
-      }
-  }
-  function getSlotName(binding) {
-      var name = binding.name.replace(slotRE, '');
-      if (!name) {
-          if (binding.name[0] !== '#') {
-              name = 'default';
-          }
-          else {
-              warn("v-slot shorthand syntax requires a slot name.", binding);
-          }
-      }
-      return dynamicArgRE.test(name)
-          ? // dynamic [name]
-              { name: name.slice(1, -1), dynamic: true }
-          : // static name
-              { name: "\"".concat(name, "\""), dynamic: false };
-  }
-  // handle <slot/> outlets
-  function processSlotOutlet(el) {
-      if (el.tag === 'slot') {
-          el.slotName = getBindingAttr(el, 'name');
-          if (el.key) {
-              warn("`key` does not work on <slot> because slots are abstract outlets " +
-                  "and can possibly expand into multiple elements. " +
-                  "Use the key on a wrapping element instead.", getRawBindingAttr(el, 'key'));
-          }
-      }
-  }
-  function processComponent(el) {
-      var binding;
-      if ((binding = getBindingAttr(el, 'is'))) {
-          el.component = binding;
-      }
-      if (getAndRemoveAttr(el, 'inline-template') != null) {
-          el.inlineTemplate = true;
-      }
-  }
-  function processAttrs(el) {
-      var list = el.attrsList;
-      var i, l, name, rawName, value, modifiers, syncGen, isDynamic;
-      for (i = 0, l = list.length; i < l; i++) {
-          name = rawName = list[i].name;
-          value = list[i].value;
-          if (dirRE.test(name)) {
-              // mark element as dynamic
-              el.hasBindings = true;
-              // modifiers
-              modifiers = parseModifiers(name.replace(dirRE, ''));
-              // support .foo shorthand syntax for the .prop modifier
-              if (modifiers) {
-                  name = name.replace(modifierRE, '');
-              }
-              if (bindRE.test(name)) {
-                  // v-bind
-                  name = name.replace(bindRE, '');
-                  value = parseFilters(value);
-                  isDynamic = dynamicArgRE.test(name);
-                  if (isDynamic) {
-                      name = name.slice(1, -1);
-                  }
-                  if (value.trim().length === 0) {
-                      warn("The value for a v-bind expression cannot be empty. Found in \"v-bind:".concat(name, "\""));
-                  }
-                  if (modifiers) {
-                      if (modifiers.prop && !isDynamic) {
-                          name = camelize(name);
-                          if (name === 'innerHtml')
-                              name = 'innerHTML';
-                      }
-                      if (modifiers.camel && !isDynamic) {
-                          name = camelize(name);
-                      }
-                      if (modifiers.sync) {
-                          syncGen = genAssignmentCode(value, "$event");
-                          if (!isDynamic) {
-                              addHandler(el, "update:".concat(camelize(name)), syncGen, null, false, warn, list[i]);
-                              if (hyphenate(name) !== camelize(name)) {
-                                  addHandler(el, "update:".concat(hyphenate(name)), syncGen, null, false, warn, list[i]);
-                              }
-                          }
-                          else {
-                              // handler w/ dynamic event name
-                              addHandler(el, "\"update:\"+(".concat(name, ")"), syncGen, null, false, warn, list[i], true // dynamic
-                              );
-                          }
-                      }
-                  }
-                  if ((modifiers && modifiers.prop) ||
-                      (!el.component && platformMustUseProp(el.tag, el.attrsMap.type, name))) {
-                      addProp(el, name, value, list[i], isDynamic);
-                  }
-                  else {
-                      addAttr(el, name, value, list[i], isDynamic);
-                  }
-              }
-              else if (onRE.test(name)) {
-                  // v-on
-                  name = name.replace(onRE, '');
-                  isDynamic = dynamicArgRE.test(name);
-                  if (isDynamic) {
-                      name = name.slice(1, -1);
-                  }
-                  addHandler(el, name, value, modifiers, false, warn, list[i], isDynamic);
-              }
-              else {
-                  // normal directives
-                  name = name.replace(dirRE, '');
-                  // parse arg
-                  var argMatch = name.match(argRE);
-                  var arg = argMatch && argMatch[1];
-                  isDynamic = false;
-                  if (arg) {
-                      name = name.slice(0, -(arg.length + 1));
-                      if (dynamicArgRE.test(arg)) {
-                          arg = arg.slice(1, -1);
-                          isDynamic = true;
-                      }
-                  }
-                  addDirective(el, name, rawName, value, arg, isDynamic, modifiers, list[i]);
-                  if (name === 'model') {
-                      checkForAliasModel(el, value);
-                  }
-              }
-          }
-          else {
-              // literal attribute
-              {
-                  var res = parseText(value, delimiters);
-                  if (res) {
-                      warn("".concat(name, "=\"").concat(value, "\": ") +
-                          'Interpolation inside attributes has been removed. ' +
-                          'Use v-bind or the colon shorthand instead. For example, ' +
-                          'instead of <div id="{{ val }}">, use <div :id="val">.', list[i]);
-                  }
-              }
-              addAttr(el, name, JSON.stringify(value), list[i]);
-              // #6887 firefox doesn't update muted state if set via attribute
-              // even immediately after element creation
-              if (!el.component &&
-                  name === 'muted' &&
-                  platformMustUseProp(el.tag, el.attrsMap.type, name)) {
-                  addProp(el, name, 'true', list[i]);
-              }
-          }
-      }
-  }
-  function checkInFor(el) {
-      var parent = el;
-      while (parent) {
-          if (parent.for !== undefined) {
-              return true;
-          }
-          parent = parent.parent;
-      }
-      return false;
-  }
-  function parseModifiers(name) {
-      var match = name.match(modifierRE);
-      if (match) {
-          var ret_1 = {};
-          match.forEach(function (m) {
-              ret_1[m.slice(1)] = true;
-          });
-          return ret_1;
-      }
-  }
-  function makeAttrsMap(attrs) {
-      var map = {};
-      for (var i = 0, l = attrs.length; i < l; i++) {
-          if (map[attrs[i].name] && !isIE && !isEdge) {
-              warn('duplicate attribute: ' + attrs[i].name, attrs[i]);
-          }
-          map[attrs[i].name] = attrs[i].value;
-      }
-      return map;
-  }
-  // for script (e.g. type="x/template") or style, do not decode content
-  function isTextTag(el) {
-      return el.tag === 'script' || el.tag === 'style';
-  }
-  function isForbiddenTag(el) {
-      return (el.tag === 'style' ||
-          (el.tag === 'script' &&
-              (!el.attrsMap.type || el.attrsMap.type === 'text/javascript')));
-  }
-  var ieNSBug = /^xmlns:NS\d+/;
-  var ieNSPrefix = /^NS\d+:/;
-  /* istanbul ignore next */
-  function guardIESVGBug(attrs) {
-      var res = [];
-      for (var i = 0; i < attrs.length; i++) {
-          var attr = attrs[i];
-          if (!ieNSBug.test(attr.name)) {
-              attr.name = attr.name.replace(ieNSPrefix, '');
-              res.push(attr);
-          }
-      }
-      return res;
-  }
-  function checkForAliasModel(el, value) {
-      var _el = el;
-      while (_el) {
-          if (_el.for && _el.alias === value) {
-              warn("<".concat(el.tag, " v-model=\"").concat(value, "\">: ") +
-                  "You are binding v-model directly to a v-for iteration alias. " +
-                  "This will not be able to modify the v-for source array because " +
-                  "writing to the alias is like modifying a function local variable. " +
-                  "Consider using an array of objects and use v-model on an object property instead.", el.rawAttrsMap['v-model']);
-          }
-          _el = _el.parent;
-      }
-  }
-
-  /**
-   * Expand input[v-model] with dynamic type bindings into v-if-else chains
-   * Turn this:
-   *   <input v-model="data[type]" :type="type">
-   * into this:
-   *   <input v-if="type === 'checkbox'" type="checkbox" v-model="data[type]">
-   *   <input v-else-if="type === 'radio'" type="radio" v-model="data[type]">
-   *   <input v-else :type="type" v-model="data[type]">
-   */
-  function preTransformNode(el, options) {
-      if (el.tag === 'input') {
-          var map = el.attrsMap;
-          if (!map['v-model']) {
-              return;
-          }
-          var typeBinding = void 0;
-          if (map[':type'] || map['v-bind:type']) {
-              typeBinding = getBindingAttr(el, 'type');
-          }
-          if (!map.type && !typeBinding && map['v-bind']) {
-              typeBinding = "(".concat(map['v-bind'], ").type");
-          }
-          if (typeBinding) {
-              var ifCondition = getAndRemoveAttr(el, 'v-if', true);
-              var ifConditionExtra = ifCondition ? "&&(".concat(ifCondition, ")") : "";
-              var hasElse = getAndRemoveAttr(el, 'v-else', true) != null;
-              var elseIfCondition = getAndRemoveAttr(el, 'v-else-if', true);
-              // 1. checkbox
-              var branch0 = cloneASTElement(el);
-              // process for on the main node
-              processFor(branch0);
-              addRawAttr(branch0, 'type', 'checkbox');
-              processElement(branch0, options);
-              branch0.processed = true; // prevent it from double-processed
-              branch0.if = "(".concat(typeBinding, ")==='checkbox'") + ifConditionExtra;
-              addIfCondition(branch0, {
-                  exp: branch0.if,
-                  block: branch0
-              });
-              // 2. add radio else-if condition
-              var branch1 = cloneASTElement(el);
-              getAndRemoveAttr(branch1, 'v-for', true);
-              addRawAttr(branch1, 'type', 'radio');
-              processElement(branch1, options);
-              addIfCondition(branch0, {
-                  exp: "(".concat(typeBinding, ")==='radio'") + ifConditionExtra,
-                  block: branch1
-              });
-              // 3. other
-              var branch2 = cloneASTElement(el);
-              getAndRemoveAttr(branch2, 'v-for', true);
-              addRawAttr(branch2, ':type', typeBinding);
-              processElement(branch2, options);
-              addIfCondition(branch0, {
-                  exp: ifCondition,
-                  block: branch2
-              });
-              if (hasElse) {
-                  branch0.else = true;
-              }
-              else if (elseIfCondition) {
-                  branch0.elseif = elseIfCondition;
-              }
-              return branch0;
-          }
-      }
-  }
-  function cloneASTElement(el) {
-      return createASTElement(el.tag, el.attrsList.slice(), el.parent);
-  }
-  var model = {
-      preTransformNode: preTransformNode
-  };
-
-  var modules = [klass, style, model];
-
-  function text(el, dir) {
-      if (dir.value) {
-          addProp(el, 'textContent', "_s(".concat(dir.value, ")"), dir);
-      }
-  }
-
-  function html(el, dir) {
-      if (dir.value) {
-          addProp(el, 'innerHTML', "_s(".concat(dir.value, ")"), dir);
-      }
-  }
-
-  var directives = {
-      model: model$1,
-      text: text,
-      html: html
-  };
-
-  var baseOptions = {
-      expectHTML: true,
-      modules: modules,
-      directives: directives,
-      isPreTag: isPreTag,
-      isUnaryTag: isUnaryTag,
-      mustUseProp: mustUseProp,
-      canBeLeftOpenTag: canBeLeftOpenTag,
-      isReservedTag: isReservedTag,
-      getTagNamespace: getTagNamespace,
-      staticKeys: genStaticKeys$1(modules)
-  };
-
-  var isStaticKey;
-  var isPlatformReservedTag;
-  var genStaticKeysCached = cached(genStaticKeys);
-  /**
-   * Goal of the optimizer: walk the generated template AST tree
-   * and detect sub-trees that are purely static, i.e. parts of
-   * the DOM that never needs to change.
-   *
-   * Once we detect these sub-trees, we can:
-   *
-   * 1. Hoist them into constants, so that we no longer need to
-   *    create fresh nodes for them on each re-render;
-   * 2. Completely skip them in the patching process.
-   */
-  function optimize(root, options) {
-      if (!root)
-          return;
-      isStaticKey = genStaticKeysCached(options.staticKeys || '');
-      isPlatformReservedTag = options.isReservedTag || no;
-      // first pass: mark all non-static nodes.
-      markStatic(root);
-      // second pass: mark static roots.
-      markStaticRoots(root, false);
-  }
-  function genStaticKeys(keys) {
-      return makeMap('type,tag,attrsList,attrsMap,plain,parent,children,attrs,start,end,rawAttrsMap' +
-          (keys ? ',' + keys : ''));
-  }
-  function markStatic(node) {
-      node.static = isStatic(node);
-      if (node.type === 1) {
-          // do not make component slot content static. this avoids
-          // 1. components not able to mutate slot nodes
-          // 2. static slot content fails for hot-reloading
-          if (!isPlatformReservedTag(node.tag) &&
-              node.tag !== 'slot' &&
-              node.attrsMap['inline-template'] == null) {
-              return;
-          }
-          for (var i = 0, l = node.children.length; i < l; i++) {
-              var child = node.children[i];
-              markStatic(child);
-              if (!child.static) {
-                  node.static = false;
-              }
-          }
-          if (node.ifConditions) {
-              for (var i = 1, l = node.ifConditions.length; i < l; i++) {
-                  var block = node.ifConditions[i].block;
-                  markStatic(block);
-                  if (!block.static) {
-                      node.static = false;
-                  }
-              }
-          }
-      }
-  }
-  function markStaticRoots(node, isInFor) {
-      if (node.type === 1) {
-          if (node.static || node.once) {
-              node.staticInFor = isInFor;
-          }
-          // For a node to qualify as a static root, it should have children that
-          // are not just static text. Otherwise the cost of hoisting out will
-          // outweigh the benefits and it's better off to just always render it fresh.
-          if (node.static &&
-              node.children.length &&
-              !(node.children.length === 1 && node.children[0].type === 3)) {
-              node.staticRoot = true;
-              return;
-          }
-          else {
-              node.staticRoot = false;
-          }
-          if (node.children) {
-              for (var i = 0, l = node.children.length; i < l; i++) {
-                  markStaticRoots(node.children[i], isInFor || !!node.for);
-              }
-          }
-          if (node.ifConditions) {
-              for (var i = 1, l = node.ifConditions.length; i < l; i++) {
-                  markStaticRoots(node.ifConditions[i].block, isInFor);
-              }
-          }
-      }
-  }
-  function isStatic(node) {
-      if (node.type === 2) {
-          // expression
-          return false;
-      }
-      if (node.type === 3) {
-          // text
-          return true;
-      }
-      return !!(node.pre ||
-          (!node.hasBindings && // no dynamic bindings
-              !node.if &&
-              !node.for && // not v-if or v-for or v-else
-              !isBuiltInTag(node.tag) && // not a built-in
-              isPlatformReservedTag(node.tag) && // not a component
-              !isDirectChildOfTemplateFor(node) &&
-              Object.keys(node).every(isStaticKey)));
-  }
-  function isDirectChildOfTemplateFor(node) {
-      while (node.parent) {
-          node = node.parent;
-          if (node.tag !== 'template') {
-              return false;
-          }
-          if (node.for) {
-              return true;
-          }
-      }
-      return false;
-  }
-
-  var fnExpRE = /^([\w$_]+|\([^)]*?\))\s*=>|^function(?:\s+[\w$]+)?\s*\(/;
-  var fnInvokeRE = /\([^)]*?\);*$/;
-  var simplePathRE = /^[A-Za-z_$][\w$]*(?:\.[A-Za-z_$][\w$]*|\['[^']*?']|\["[^"]*?"]|\[\d+]|\[[A-Za-z_$][\w$]*])*$/;
-  // KeyboardEvent.keyCode aliases
-  var keyCodes = {
-      esc: 27,
-      tab: 9,
-      enter: 13,
-      space: 32,
-      up: 38,
-      left: 37,
-      right: 39,
-      down: 40,
-      delete: [8, 46]
-  };
-  // KeyboardEvent.key aliases
-  var keyNames = {
-      // #7880: IE11 and Edge use `Esc` for Escape key name.
-      esc: ['Esc', 'Escape'],
-      tab: 'Tab',
-      enter: 'Enter',
-      // #9112: IE11 uses `Spacebar` for Space key name.
-      space: [' ', 'Spacebar'],
-      // #7806: IE11 uses key names without `Arrow` prefix for arrow keys.
-      up: ['Up', 'ArrowUp'],
-      left: ['Left', 'ArrowLeft'],
-      right: ['Right', 'ArrowRight'],
-      down: ['Down', 'ArrowDown'],
-      // #9112: IE11 uses `Del` for Delete key name.
-      delete: ['Backspace', 'Delete', 'Del']
-  };
-  // #4868: modifiers that prevent the execution of the listener
-  // need to explicitly return null so that we can determine whether to remove
-  // the listener for .once
-  var genGuard = function (condition) { return "if(".concat(condition, ")return null;"); };
-  var modifierCode = {
-      stop: '$event.stopPropagation();',
-      prevent: '$event.preventDefault();',
-      self: genGuard("$event.target !== $event.currentTarget"),
-      ctrl: genGuard("!$event.ctrlKey"),
-      shift: genGuard("!$event.shiftKey"),
-      alt: genGuard("!$event.altKey"),
-      meta: genGuard("!$event.metaKey"),
-      left: genGuard("'button' in $event && $event.button !== 0"),
-      middle: genGuard("'button' in $event && $event.button !== 1"),
-      right: genGuard("'button' in $event && $event.button !== 2")
-  };
-  function genHandlers(events, isNative) {
-      var prefix = isNative ? 'nativeOn:' : 'on:';
-      var staticHandlers = "";
-      var dynamicHandlers = "";
-      for (var name_1 in events) {
-          var handlerCode = genHandler(events[name_1]);
-          //@ts-expect-error
-          if (events[name_1] && events[name_1].dynamic) {
-              dynamicHandlers += "".concat(name_1, ",").concat(handlerCode, ",");
-          }
-          else {
-              staticHandlers += "\"".concat(name_1, "\":").concat(handlerCode, ",");
-          }
-      }
-      staticHandlers = "{".concat(staticHandlers.slice(0, -1), "}");
-      if (dynamicHandlers) {
-          return prefix + "_d(".concat(staticHandlers, ",[").concat(dynamicHandlers.slice(0, -1), "])");
-      }
-      else {
-          return prefix + staticHandlers;
-      }
-  }
-  function genHandler(handler) {
-      if (!handler) {
-          return 'function(){}';
-      }
-      if (Array.isArray(handler)) {
-          return "[".concat(handler.map(function (handler) { return genHandler(handler); }).join(','), "]");
-      }
-      var isMethodPath = simplePathRE.test(handler.value);
-      var isFunctionExpression = fnExpRE.test(handler.value);
-      var isFunctionInvocation = simplePathRE.test(handler.value.replace(fnInvokeRE, ''));
-      if (!handler.modifiers) {
-          if (isMethodPath || isFunctionExpression) {
-              return handler.value;
-          }
-          return "function($event){".concat(isFunctionInvocation ? "return ".concat(handler.value) : handler.value, "}"); // inline statement
-      }
-      else {
-          var code = '';
-          var genModifierCode = '';
-          var keys = [];
-          var _loop_1 = function (key) {
-              if (modifierCode[key]) {
-                  genModifierCode += modifierCode[key];
-                  // left/right
-                  if (keyCodes[key]) {
-                      keys.push(key);
-                  }
-              }
-              else if (key === 'exact') {
-                  var modifiers_1 = handler.modifiers;
-                  genModifierCode += genGuard(['ctrl', 'shift', 'alt', 'meta']
-                      .filter(function (keyModifier) { return !modifiers_1[keyModifier]; })
-                      .map(function (keyModifier) { return "$event.".concat(keyModifier, "Key"); })
-                      .join('||'));
-              }
-              else {
-                  keys.push(key);
-              }
-          };
-          for (var key in handler.modifiers) {
-              _loop_1(key);
-          }
-          if (keys.length) {
-              code += genKeyFilter(keys);
-          }
-          // Make sure modifiers like prevent and stop get executed after key filtering
-          if (genModifierCode) {
-              code += genModifierCode;
-          }
-          var handlerCode = isMethodPath
-              ? "return ".concat(handler.value, ".apply(null, arguments)")
-              : isFunctionExpression
-                  ? "return (".concat(handler.value, ").apply(null, arguments)")
-                  : isFunctionInvocation
-                      ? "return ".concat(handler.value)
-                      : handler.value;
-          return "function($event){".concat(code).concat(handlerCode, "}");
-      }
-  }
-  function genKeyFilter(keys) {
-      return (
-      // make sure the key filters only apply to KeyboardEvents
-      // #9441: can't use 'keyCode' in $event because Chrome autofill fires fake
-      // key events that do not have keyCode property...
-      "if(!$event.type.indexOf('key')&&" +
-          "".concat(keys.map(genFilterCode).join('&&'), ")return null;"));
-  }
-  function genFilterCode(key) {
-      var keyVal = parseInt(key, 10);
-      if (keyVal) {
-          return "$event.keyCode!==".concat(keyVal);
-      }
-      var keyCode = keyCodes[key];
-      var keyName = keyNames[key];
-      return ("_k($event.keyCode," +
-          "".concat(JSON.stringify(key), ",") +
-          "".concat(JSON.stringify(keyCode), ",") +
-          "$event.key," +
-          "".concat(JSON.stringify(keyName)) +
-          ")");
-  }
-
-  function on(el, dir) {
-      if (dir.modifiers) {
-          warn$2("v-on without argument does not support modifiers.");
-      }
-      el.wrapListeners = function (code) { return "_g(".concat(code, ",").concat(dir.value, ")"); };
-  }
-
-  function bind(el, dir) {
-      el.wrapData = function (code) {
-          return "_b(".concat(code, ",'").concat(el.tag, "',").concat(dir.value, ",").concat(dir.modifiers && dir.modifiers.prop ? 'true' : 'false').concat(dir.modifiers && dir.modifiers.sync ? ',true' : '', ")");
-      };
-  }
-
-  var baseDirectives = {
-      on: on,
-      bind: bind,
-      cloak: noop
-  };
-
-  var CodegenState = /** @class */ (function () {
-      function CodegenState(options) {
-          this.options = options;
-          this.warn = options.warn || baseWarn;
-          this.transforms = pluckModuleFunction(options.modules, 'transformCode');
-          this.dataGenFns = pluckModuleFunction(options.modules, 'genData');
-          this.directives = extend(extend({}, baseDirectives), options.directives);
-          var isReservedTag = options.isReservedTag || no;
-          this.maybeComponent = function (el) {
-              return !!el.component || !isReservedTag(el.tag);
-          };
-          this.onceId = 0;
-          this.staticRenderFns = [];
-          this.pre = false;
-      }
-      return CodegenState;
-  }());
-  function generate(ast, options) {
-      var state = new CodegenState(options);
-      // fix #11483, Root level <script> tags should not be rendered.
-      var code = ast
-          ? ast.tag === 'script'
-              ? 'null'
-              : genElement(ast, state)
-          : '_c("div")';
-      return {
-          render: "with(this){return ".concat(code, "}"),
-          staticRenderFns: state.staticRenderFns
-      };
-  }
-  function genElement(el, state) {
-      if (el.parent) {
-          el.pre = el.pre || el.parent.pre;
-      }
-      if (el.staticRoot && !el.staticProcessed) {
-          return genStatic(el, state);
-      }
-      else if (el.once && !el.onceProcessed) {
-          return genOnce(el, state);
-      }
-      else if (el.for && !el.forProcessed) {
-          return genFor(el, state);
-      }
-      else if (el.if && !el.ifProcessed) {
-          return genIf(el, state);
-      }
-      else if (el.tag === 'template' && !el.slotTarget && !state.pre) {
-          return genChildren(el, state) || 'void 0';
-      }
-      else if (el.tag === 'slot') {
-          return genSlot(el, state);
-      }
-      else {
-          // component or element
-          var code = void 0;
-          if (el.component) {
-              code = genComponent(el.component, el, state);
-          }
-          else {
-              var data = void 0;
-              var maybeComponent = state.maybeComponent(el);
-              if (!el.plain || (el.pre && maybeComponent)) {
-                  data = genData(el, state);
-              }
-              var tag 
-              // check if this is a component in <script setup>
-              = void 0;
-              // check if this is a component in <script setup>
-              var bindings = state.options.bindings;
-              if (maybeComponent && bindings && bindings.__isScriptSetup !== false) {
-                  tag = checkBindingType(bindings, el.tag);
-              }
-              if (!tag)
-                  tag = "'".concat(el.tag, "'");
-              var children = el.inlineTemplate ? null : genChildren(el, state, true);
-              code = "_c(".concat(tag).concat(data ? ",".concat(data) : '' // data
-              ).concat(children ? ",".concat(children) : '' // children
-              , ")");
-          }
-          // module transforms
-          for (var i = 0; i < state.transforms.length; i++) {
-              code = state.transforms[i](el, code);
-          }
-          return code;
-      }
-  }
-  function checkBindingType(bindings, key) {
-      var camelName = camelize(key);
-      var PascalName = capitalize(camelName);
-      var checkType = function (type) {
-          if (bindings[key] === type) {
-              return key;
-          }
-          if (bindings[camelName] === type) {
-              return camelName;
-          }
-          if (bindings[PascalName] === type) {
-              return PascalName;
-          }
-      };
-      var fromConst = checkType("setup-const" /* BindingTypes.SETUP_CONST */) ||
-          checkType("setup-reactive-const" /* BindingTypes.SETUP_REACTIVE_CONST */);
-      if (fromConst) {
-          return fromConst;
-      }
-      var fromMaybeRef = checkType("setup-let" /* BindingTypes.SETUP_LET */) ||
-          checkType("setup-ref" /* BindingTypes.SETUP_REF */) ||
-          checkType("setup-maybe-ref" /* BindingTypes.SETUP_MAYBE_REF */);
-      if (fromMaybeRef) {
-          return fromMaybeRef;
-      }
-  }
-  // hoist static sub-trees out
-  function genStatic(el, state) {
-      el.staticProcessed = true;
-      // Some elements (templates) need to behave differently inside of a v-pre
-      // node.  All pre nodes are static roots, so we can use this as a location to
-      // wrap a state change and reset it upon exiting the pre node.
-      var originalPreState = state.pre;
-      if (el.pre) {
-          state.pre = el.pre;
-      }
-      state.staticRenderFns.push("with(this){return ".concat(genElement(el, state), "}"));
-      state.pre = originalPreState;
-      return "_m(".concat(state.staticRenderFns.length - 1).concat(el.staticInFor ? ',true' : '', ")");
-  }
-  // v-once
-  function genOnce(el, state) {
-      el.onceProcessed = true;
-      if (el.if && !el.ifProcessed) {
-          return genIf(el, state);
-      }
-      else if (el.staticInFor) {
-          var key = '';
-          var parent_1 = el.parent;
-          while (parent_1) {
-              if (parent_1.for) {
-                  key = parent_1.key;
-                  break;
-              }
-              parent_1 = parent_1.parent;
-          }
-          if (!key) {
-              state.warn("v-once can only be used inside v-for that is keyed. ", el.rawAttrsMap['v-once']);
-              return genElement(el, state);
-          }
-          return "_o(".concat(genElement(el, state), ",").concat(state.onceId++, ",").concat(key, ")");
-      }
-      else {
-          return genStatic(el, state);
-      }
-  }
-  function genIf(el, state, altGen, altEmpty) {
-      el.ifProcessed = true; // avoid recursion
-      return genIfConditions(el.ifConditions.slice(), state, altGen, altEmpty);
-  }
-  function genIfConditions(conditions, state, altGen, altEmpty) {
-      if (!conditions.length) {
-          return altEmpty || '_e()';
-      }
-      var condition = conditions.shift();
-      if (condition.exp) {
-          return "(".concat(condition.exp, ")?").concat(genTernaryExp(condition.block), ":").concat(genIfConditions(conditions, state, altGen, altEmpty));
-      }
-      else {
-          return "".concat(genTernaryExp(condition.block));
-      }
-      // v-if with v-once should generate code like (a)?_m(0):_m(1)
-      function genTernaryExp(el) {
-          return altGen
-              ? altGen(el, state)
-              : el.once
-                  ? genOnce(el, state)
-                  : genElement(el, state);
-      }
-  }
-  function genFor(el, state, altGen, altHelper) {
-      var exp = el.for;
-      var alias = el.alias;
-      var iterator1 = el.iterator1 ? ",".concat(el.iterator1) : '';
-      var iterator2 = el.iterator2 ? ",".concat(el.iterator2) : '';
-      if (state.maybeComponent(el) &&
-          el.tag !== 'slot' &&
-          el.tag !== 'template' &&
-          !el.key) {
-          state.warn("<".concat(el.tag, " v-for=\"").concat(alias, " in ").concat(exp, "\">: component lists rendered with ") +
-              "v-for should have explicit keys. " +
-              "See https://vuejs.org/guide/list.html#key for more info.", el.rawAttrsMap['v-for'], true /* tip */);
-      }
-      el.forProcessed = true; // avoid recursion
-      return ("".concat(altHelper || '_l', "((").concat(exp, "),") +
-          "function(".concat(alias).concat(iterator1).concat(iterator2, "){") +
-          "return ".concat((altGen || genElement)(el, state)) +
-          '})');
-  }
-  function genData(el, state) {
-      var data = '{';
-      // directives first.
-      // directives may mutate the el's other properties before they are generated.
-      var dirs = genDirectives(el, state);
-      if (dirs)
-          data += dirs + ',';
-      // key
-      if (el.key) {
-          data += "key:".concat(el.key, ",");
-      }
-      // ref
-      if (el.ref) {
-          data += "ref:".concat(el.ref, ",");
-      }
-      if (el.refInFor) {
-          data += "refInFor:true,";
-      }
-      // pre
-      if (el.pre) {
-          data += "pre:true,";
-      }
-      // record original tag name for components using "is" attribute
-      if (el.component) {
-          data += "tag:\"".concat(el.tag, "\",");
-      }
-      // module data generation functions
-      for (var i = 0; i < state.dataGenFns.length; i++) {
-          data += state.dataGenFns[i](el);
-      }
-      // attributes
-      if (el.attrs) {
-          data += "attrs:".concat(genProps(el.attrs), ",");
-      }
-      // DOM props
-      if (el.props) {
-          data += "domProps:".concat(genProps(el.props), ",");
-      }
-      // event handlers
-      if (el.events) {
-          data += "".concat(genHandlers(el.events, false), ",");
-      }
-      if (el.nativeEvents) {
-          data += "".concat(genHandlers(el.nativeEvents, true), ",");
-      }
-      // slot target
-      // only for non-scoped slots
-      if (el.slotTarget && !el.slotScope) {
-          data += "slot:".concat(el.slotTarget, ",");
-      }
-      // scoped slots
-      if (el.scopedSlots) {
-          data += "".concat(genScopedSlots(el, el.scopedSlots, state), ",");
-      }
-      // component v-model
-      if (el.model) {
-          data += "model:{value:".concat(el.model.value, ",callback:").concat(el.model.callback, ",expression:").concat(el.model.expression, "},");
-      }
-      // inline-template
-      if (el.inlineTemplate) {
-          var inlineTemplate = genInlineTemplate(el, state);
-          if (inlineTemplate) {
-              data += "".concat(inlineTemplate, ",");
-          }
-      }
-      data = data.replace(/,$/, '') + '}';
-      // v-bind dynamic argument wrap
-      // v-bind with dynamic arguments must be applied using the same v-bind object
-      // merge helper so that class/style/mustUseProp attrs are handled correctly.
-      if (el.dynamicAttrs) {
-          data = "_b(".concat(data, ",\"").concat(el.tag, "\",").concat(genProps(el.dynamicAttrs), ")");
-      }
-      // v-bind data wrap
-      if (el.wrapData) {
-          data = el.wrapData(data);
-      }
-      // v-on data wrap
-      if (el.wrapListeners) {
-          data = el.wrapListeners(data);
-      }
-      return data;
-  }
-  function genDirectives(el, state) {
-      var dirs = el.directives;
-      if (!dirs)
-          return;
-      var res = 'directives:[';
-      var hasRuntime = false;
-      var i, l, dir, needRuntime;
-      for (i = 0, l = dirs.length; i < l; i++) {
-          dir = dirs[i];
-          needRuntime = true;
-          var gen = state.directives[dir.name];
-          if (gen) {
-              // compile-time directive that manipulates AST.
-              // returns true if it also needs a runtime counterpart.
-              needRuntime = !!gen(el, dir, state.warn);
-          }
-          if (needRuntime) {
-              hasRuntime = true;
-              res += "{name:\"".concat(dir.name, "\",rawName:\"").concat(dir.rawName, "\"").concat(dir.value
-                  ? ",value:(".concat(dir.value, "),expression:").concat(JSON.stringify(dir.value))
-                  : '').concat(dir.arg ? ",arg:".concat(dir.isDynamicArg ? dir.arg : "\"".concat(dir.arg, "\"")) : '').concat(dir.modifiers ? ",modifiers:".concat(JSON.stringify(dir.modifiers)) : '', "},");
-          }
-      }
-      if (hasRuntime) {
-          return res.slice(0, -1) + ']';
-      }
-  }
-  function genInlineTemplate(el, state) {
-      var ast = el.children[0];
-      if ((el.children.length !== 1 || ast.type !== 1)) {
-          state.warn('Inline-template components must have exactly one child element.', { start: el.start });
-      }
-      if (ast && ast.type === 1) {
-          var inlineRenderFns = generate(ast, state.options);
-          return "inlineTemplate:{render:function(){".concat(inlineRenderFns.render, "},staticRenderFns:[").concat(inlineRenderFns.staticRenderFns
-              .map(function (code) { return "function(){".concat(code, "}"); })
-              .join(','), "]}");
-      }
-  }
-  function genScopedSlots(el, slots, state) {
-      // by default scoped slots are considered "stable", this allows child
-      // components with only scoped slots to skip forced updates from parent.
-      // but in some cases we have to bail-out of this optimization
-      // for example if the slot contains dynamic names, has v-if or v-for on them...
-      var needsForceUpdate = el.for ||
-          Object.keys(slots).some(function (key) {
-              var slot = slots[key];
-              return (slot.slotTargetDynamic || slot.if || slot.for || containsSlotChild(slot) // is passing down slot from parent which may be dynamic
-              );
-          });
-      // #9534: if a component with scoped slots is inside a conditional branch,
-      // it's possible for the same component to be reused but with different
-      // compiled slot content. To avoid that, we generate a unique key based on
-      // the generated code of all the slot contents.
-      var needsKey = !!el.if;
-      // OR when it is inside another scoped slot or v-for (the reactivity may be
-      // disconnected due to the intermediate scope variable)
-      // #9438, #9506
-      // TODO: this can be further optimized by properly analyzing in-scope bindings
-      // and skip force updating ones that do not actually use scope variables.
-      if (!needsForceUpdate) {
-          var parent_2 = el.parent;
-          while (parent_2) {
-              if ((parent_2.slotScope && parent_2.slotScope !== emptySlotScopeToken) ||
-                  parent_2.for) {
-                  needsForceUpdate = true;
-                  break;
-              }
-              if (parent_2.if) {
-                  needsKey = true;
-              }
-              parent_2 = parent_2.parent;
-          }
-      }
-      var generatedSlots = Object.keys(slots)
-          .map(function (key) { return genScopedSlot(slots[key], state); })
-          .join(',');
-      return "scopedSlots:_u([".concat(generatedSlots, "]").concat(needsForceUpdate ? ",null,true" : "").concat(!needsForceUpdate && needsKey ? ",null,false,".concat(hash(generatedSlots)) : "", ")");
-  }
-  function hash(str) {
-      var hash = 5381;
-      var i = str.length;
-      while (i) {
-          hash = (hash * 33) ^ str.charCodeAt(--i);
-      }
-      return hash >>> 0;
-  }
-  function containsSlotChild(el) {
-      if (el.type === 1) {
-          if (el.tag === 'slot') {
-              return true;
-          }
-          return el.children.some(containsSlotChild);
-      }
-      return false;
-  }
-  function genScopedSlot(el, state) {
-      var isLegacySyntax = el.attrsMap['slot-scope'];
-      if (el.if && !el.ifProcessed && !isLegacySyntax) {
-          return genIf(el, state, genScopedSlot, "null");
-      }
-      if (el.for && !el.forProcessed) {
-          return genFor(el, state, genScopedSlot);
-      }
-      var slotScope = el.slotScope === emptySlotScopeToken ? "" : String(el.slotScope);
-      var fn = "function(".concat(slotScope, "){") +
-          "return ".concat(el.tag === 'template'
-              ? el.if && isLegacySyntax
-                  ? "(".concat(el.if, ")?").concat(genChildren(el, state) || 'undefined', ":undefined")
-                  : genChildren(el, state) || 'undefined'
-              : genElement(el, state), "}");
-      // reverse proxy v-slot without scope on this.$slots
-      var reverseProxy = slotScope ? "" : ",proxy:true";
-      return "{key:".concat(el.slotTarget || "\"default\"", ",fn:").concat(fn).concat(reverseProxy, "}");
-  }
-  function genChildren(el, state, checkSkip, altGenElement, altGenNode) {
-      var children = el.children;
-      if (children.length) {
-          var el_1 = children[0];
-          // optimize single v-for
-          if (children.length === 1 &&
-              el_1.for &&
-              el_1.tag !== 'template' &&
-              el_1.tag !== 'slot') {
-              var normalizationType_1 = checkSkip
-                  ? state.maybeComponent(el_1)
-                      ? ",1"
-                      : ",0"
-                  : "";
-              return "".concat((altGenElement || genElement)(el_1, state)).concat(normalizationType_1);
-          }
-          var normalizationType = checkSkip
-              ? getNormalizationType(children, state.maybeComponent)
-              : 0;
-          var gen_1 = altGenNode || genNode;
-          return "[".concat(children.map(function (c) { return gen_1(c, state); }).join(','), "]").concat(normalizationType ? ",".concat(normalizationType) : '');
-      }
-  }
-  // determine the normalization needed for the children array.
-  // 0: no normalization needed
-  // 1: simple normalization needed (possible 1-level deep nested array)
-  // 2: full normalization needed
-  function getNormalizationType(children, maybeComponent) {
-      var res = 0;
-      for (var i = 0; i < children.length; i++) {
-          var el = children[i];
-          if (el.type !== 1) {
-              continue;
-          }
-          if (needsNormalization(el) ||
-              (el.ifConditions &&
-                  el.ifConditions.some(function (c) { return needsNormalization(c.block); }))) {
-              res = 2;
-              break;
-          }
-          if (maybeComponent(el) ||
-              (el.ifConditions && el.ifConditions.some(function (c) { return maybeComponent(c.block); }))) {
-              res = 1;
-          }
-      }
-      return res;
-  }
-  function needsNormalization(el) {
-      return el.for !== undefined || el.tag === 'template' || el.tag === 'slot';
-  }
-  function genNode(node, state) {
-      if (node.type === 1) {
-          return genElement(node, state);
-      }
-      else if (node.type === 3 && node.isComment) {
-          return genComment(node);
-      }
-      else {
-          return genText(node);
-      }
-  }
-  function genText(text) {
-      return "_v(".concat(text.type === 2
-          ? text.expression // no need for () because already wrapped in _s()
-          : transformSpecialNewlines(JSON.stringify(text.text)), ")");
-  }
-  function genComment(comment) {
-      return "_e(".concat(JSON.stringify(comment.text), ")");
-  }
-  function genSlot(el, state) {
-      var slotName = el.slotName || '"default"';
-      var children = genChildren(el, state);
-      var res = "_t(".concat(slotName).concat(children ? ",function(){return ".concat(children, "}") : '');
-      var attrs = el.attrs || el.dynamicAttrs
-          ? genProps((el.attrs || []).concat(el.dynamicAttrs || []).map(function (attr) { return ({
-              // slot props are camelized
-              name: camelize(attr.name),
-              value: attr.value,
-              dynamic: attr.dynamic
-          }); }))
-          : null;
-      var bind = el.attrsMap['v-bind'];
-      if ((attrs || bind) && !children) {
-          res += ",null";
-      }
-      if (attrs) {
-          res += ",".concat(attrs);
-      }
-      if (bind) {
-          res += "".concat(attrs ? '' : ',null', ",").concat(bind);
-      }
-      return res + ')';
-  }
-  // componentName is el.component, take it as argument to shun flow's pessimistic refinement
-  function genComponent(componentName, el, state) {
-      var children = el.inlineTemplate ? null : genChildren(el, state, true);
-      return "_c(".concat(componentName, ",").concat(genData(el, state)).concat(children ? ",".concat(children) : '', ")");
-  }
-  function genProps(props) {
-      var staticProps = "";
-      var dynamicProps = "";
-      for (var i = 0; i < props.length; i++) {
-          var prop = props[i];
-          var value = transformSpecialNewlines(prop.value);
-          if (prop.dynamic) {
-              dynamicProps += "".concat(prop.name, ",").concat(value, ",");
-          }
-          else {
-              staticProps += "\"".concat(prop.name, "\":").concat(value, ",");
-          }
-      }
-      staticProps = "{".concat(staticProps.slice(0, -1), "}");
-      if (dynamicProps) {
-          return "_d(".concat(staticProps, ",[").concat(dynamicProps.slice(0, -1), "])");
-      }
-      else {
-          return staticProps;
-      }
-  }
-  // #3895, #4268
-  function transformSpecialNewlines(text) {
-      return text.replace(/\u2028/g, '\\u2028').replace(/\u2029/g, '\\u2029');
-  }
-
-  // these keywords should not appear inside expressions, but operators like
-  // typeof, instanceof and in are allowed
-  var prohibitedKeywordRE = new RegExp('\\b' +
-      ('do,if,for,let,new,try,var,case,else,with,await,break,catch,class,const,' +
-          'super,throw,while,yield,delete,export,import,return,switch,default,' +
-          'extends,finally,continue,debugger,function,arguments')
-          .split(',')
-          .join('\\b|\\b') +
-      '\\b');
-  // these unary operators should not be used as property/method names
-  var unaryOperatorsRE = new RegExp('\\b' +
-      'delete,typeof,void'.split(',').join('\\s*\\([^\\)]*\\)|\\b') +
-      '\\s*\\([^\\)]*\\)');
-  // strip strings in expressions
-  var stripStringRE = /'(?:[^'\\]|\\.)*'|"(?:[^"\\]|\\.)*"|`(?:[^`\\]|\\.)*\$\{|\}(?:[^`\\]|\\.)*`|`(?:[^`\\]|\\.)*`/g;
-  // detect problematic expressions in a template
-  function detectErrors(ast, warn) {
-      if (ast) {
-          checkNode(ast, warn);
-      }
-  }
-  function checkNode(node, warn) {
-      if (node.type === 1) {
-          for (var name_1 in node.attrsMap) {
-              if (dirRE.test(name_1)) {
-                  var value = node.attrsMap[name_1];
-                  if (value) {
-                      var range = node.rawAttrsMap[name_1];
-                      if (name_1 === 'v-for') {
-                          checkFor(node, "v-for=\"".concat(value, "\""), warn, range);
-                      }
-                      else if (name_1 === 'v-slot' || name_1[0] === '#') {
-                          checkFunctionParameterExpression(value, "".concat(name_1, "=\"").concat(value, "\""), warn, range);
-                      }
-                      else if (onRE.test(name_1)) {
-                          checkEvent(value, "".concat(name_1, "=\"").concat(value, "\""), warn, range);
-                      }
-                      else {
-                          checkExpression(value, "".concat(name_1, "=\"").concat(value, "\""), warn, range);
-                      }
-                  }
-              }
-          }
-          if (node.children) {
-              for (var i = 0; i < node.children.length; i++) {
-                  checkNode(node.children[i], warn);
-              }
-          }
-      }
-      else if (node.type === 2) {
-          checkExpression(node.expression, node.text, warn, node);
-      }
-  }
-  function checkEvent(exp, text, warn, range) {
-      var stripped = exp.replace(stripStringRE, '');
-      var keywordMatch = stripped.match(unaryOperatorsRE);
-      if (keywordMatch && stripped.charAt(keywordMatch.index - 1) !== '$') {
-          warn("avoid using JavaScript unary operator as property name: " +
-              "\"".concat(keywordMatch[0], "\" in expression ").concat(text.trim()), range);
-      }
-      checkExpression(exp, text, warn, range);
-  }
-  function checkFor(node, text, warn, range) {
-      checkExpression(node.for || '', text, warn, range);
-      checkIdentifier(node.alias, 'v-for alias', text, warn, range);
-      checkIdentifier(node.iterator1, 'v-for iterator', text, warn, range);
-      checkIdentifier(node.iterator2, 'v-for iterator', text, warn, range);
-  }
-  function checkIdentifier(ident, type, text, warn, range) {
-      if (typeof ident === 'string') {
-          try {
-              new Function("var ".concat(ident, "=_"));
-          }
-          catch (e) {
-              warn("invalid ".concat(type, " \"").concat(ident, "\" in expression: ").concat(text.trim()), range);
-          }
-      }
-  }
-  function checkExpression(exp, text, warn, range) {
-      try {
-          new Function("return ".concat(exp));
-      }
-      catch (e) {
-          var keywordMatch = exp
-              .replace(stripStringRE, '')
-              .match(prohibitedKeywordRE);
-          if (keywordMatch) {
-              warn("avoid using JavaScript keyword as property name: " +
-                  "\"".concat(keywordMatch[0], "\"\n  Raw expression: ").concat(text.trim()), range);
-          }
-          else {
-              warn("invalid expression: ".concat(e.message, " in\n\n") +
-                  "    ".concat(exp, "\n\n") +
-                  "  Raw expression: ".concat(text.trim(), "\n"), range);
-          }
-      }
-  }
-  function checkFunctionParameterExpression(exp, text, warn, range) {
-      try {
-          new Function(exp, '');
-      }
-      catch (e) {
-          warn("invalid function parameter expression: ".concat(e.message, " in\n\n") +
-              "    ".concat(exp, "\n\n") +
-              "  Raw expression: ".concat(text.trim(), "\n"), range);
-      }
-  }
-
-  var range = 2;
-  function generateCodeFrame(source, start, end) {
-      if (start === void 0) { start = 0; }
-      if (end === void 0) { end = source.length; }
-      var lines = source.split(/\r?\n/);
-      var count = 0;
-      var res = [];
-      for (var i = 0; i < lines.length; i++) {
-          count += lines[i].length + 1;
-          if (count >= start) {
-              for (var j = i - range; j <= i + range || end > count; j++) {
-                  if (j < 0 || j >= lines.length)
-                      continue;
-                  res.push("".concat(j + 1).concat(repeat(" ", 3 - String(j + 1).length), "|  ").concat(lines[j]));
-                  var lineLength = lines[j].length;
-                  if (j === i) {
-                      // push underline
-                      var pad = start - (count - lineLength) + 1;
-                      var length_1 = end > count ? lineLength - pad : end - start;
-                      res.push("   |  " + repeat(" ", pad) + repeat("^", length_1));
-                  }
-                  else if (j > i) {
-                      if (end > count) {
-                          var length_2 = Math.min(end - count, lineLength);
-                          res.push("   |  " + repeat("^", length_2));
-                      }
-                      count += lineLength + 1;
-                  }
-              }
-              break;
-          }
-      }
-      return res.join('\n');
-  }
-  function repeat(str, n) {
-      var result = '';
-      if (n > 0) {
-          // eslint-disable-next-line no-constant-condition
-          while (true) {
-              // eslint-disable-line
-              if (n & 1)
-                  result += str;
-              n >>>= 1;
-              if (n <= 0)
-                  break;
-              str += str;
-          }
-      }
-      return result;
-  }
-
-  function createFunction(code, errors) {
-      try {
-          return new Function(code);
-      }
-      catch (err) {
-          errors.push({ err: err, code: code });
-          return noop;
-      }
-  }
-  function createCompileToFunctionFn(compile) {
-      var cache = Object.create(null);
-      return function compileToFunctions(template, options, vm) {
-          options = extend({}, options);
-          var warn = options.warn || warn$2;
-          delete options.warn;
-          /* istanbul ignore if */
-          {
-              // detect possible CSP restriction
-              try {
-                  new Function('return 1');
-              }
-              catch (e) {
-                  if (e.toString().match(/unsafe-eval|CSP/)) {
-                      warn('It seems you are using the standalone build of Vue.js in an ' +
-                          'environment with Content Security Policy that prohibits unsafe-eval. ' +
-                          'The template compiler cannot work in this environment. Consider ' +
-                          'relaxing the policy to allow unsafe-eval or pre-compiling your ' +
-                          'templates into render functions.');
-                  }
-              }
-          }
-          // check cache
-          var key = options.delimiters
-              ? String(options.delimiters) + template
-              : template;
-          if (cache[key]) {
-              return cache[key];
-          }
-          // compile
-          var compiled = compile(template, options);
-          // check compilation errors/tips
-          {
-              if (compiled.errors && compiled.errors.length) {
-                  if (options.outputSourceRange) {
-                      compiled.errors.forEach(function (e) {
-                          warn("Error compiling template:\n\n".concat(e.msg, "\n\n") +
-                              generateCodeFrame(template, e.start, e.end), vm);
-                      });
-                  }
-                  else {
-                      warn("Error compiling template:\n\n".concat(template, "\n\n") +
-                          compiled.errors.map(function (e) { return "- ".concat(e); }).join('\n') +
-                          '\n', vm);
-                  }
-              }
-              if (compiled.tips && compiled.tips.length) {
-                  if (options.outputSourceRange) {
-                      compiled.tips.forEach(function (e) { return tip(e.msg, vm); });
-                  }
-                  else {
-                      compiled.tips.forEach(function (msg) { return tip(msg, vm); });
-                  }
-              }
-          }
-          // turn code into functions
-          var res = {};
-          var fnGenErrors = [];
-          res.render = createFunction(compiled.render, fnGenErrors);
-          res.staticRenderFns = compiled.staticRenderFns.map(function (code) {
-              return createFunction(code, fnGenErrors);
-          });
-          // check function generation errors.
-          // this should only happen if there is a bug in the compiler itself.
-          // mostly for codegen development use
-          /* istanbul ignore if */
-          {
-              if ((!compiled.errors || !compiled.errors.length) && fnGenErrors.length) {
-                  warn("Failed to generate render function:\n\n" +
-                      fnGenErrors
-                          .map(function (_a) {
-                          var err = _a.err, code = _a.code;
-                          return "".concat(err.toString(), " in\n\n").concat(code, "\n");
-                      })
-                          .join('\n'), vm);
-              }
-          }
-          return (cache[key] = res);
-      };
-  }
-
-  function createCompilerCreator(baseCompile) {
-      return function createCompiler(baseOptions) {
-          function compile(template, options) {
-              var finalOptions = Object.create(baseOptions);
-              var errors = [];
-              var tips = [];
-              var warn = function (msg, range, tip) {
-                  (tip ? tips : errors).push(msg);
-              };
-              if (options) {
-                  if (options.outputSourceRange) {
-                      // $flow-disable-line
-                      var leadingSpaceLength_1 = template.match(/^\s*/)[0].length;
-                      warn = function (msg, range, tip) {
-                          var data = typeof msg === 'string' ? { msg: msg } : msg;
-                          if (range) {
-                              if (range.start != null) {
-                                  data.start = range.start + leadingSpaceLength_1;
-                              }
-                              if (range.end != null) {
-                                  data.end = range.end + leadingSpaceLength_1;
-                              }
-                          }
-                          (tip ? tips : errors).push(data);
-                      };
-                  }
-                  // merge custom modules
-                  if (options.modules) {
-                      finalOptions.modules = (baseOptions.modules || []).concat(options.modules);
-                  }
-                  // merge custom directives
-                  if (options.directives) {
-                      finalOptions.directives = extend(Object.create(baseOptions.directives || null), options.directives);
-                  }
-                  // copy other options
-                  for (var key in options) {
-                      if (key !== 'modules' && key !== 'directives') {
-                          finalOptions[key] = options[key];
-                      }
-                  }
-              }
-              finalOptions.warn = warn;
-              var compiled = baseCompile(template.trim(), finalOptions);
-              {
-                  detectErrors(compiled.ast, warn);
-              }
-              compiled.errors = errors;
-              compiled.tips = tips;
-              return compiled;
-          }
-          return {
-              compile: compile,
-              compileToFunctions: createCompileToFunctionFn(compile)
-          };
-      };
-  }
-
-  // `createCompilerCreator` allows creating compilers that use alternative
-  // parser/optimizer/codegen, e.g the SSR optimizing compiler.
-  // Here we just export a default compiler using the default parts.
-  var createCompiler = createCompilerCreator(function baseCompile(template, options) {
-      var ast = parse(template.trim(), options);
-      if (options.optimize !== false) {
-          optimize(ast, options);
-      }
-      var code = generate(ast, options);
-      return {
-          ast: ast,
-          render: code.render,
-          staticRenderFns: code.staticRenderFns
-      };
-  });
-
-  var _a = createCompiler(baseOptions), compileToFunctions = _a.compileToFunctions;
-
-  // check whether current browser encodes a char inside attribute values
-  var div;
-  function getShouldDecode(href) {
-      div = div || document.createElement('div');
-      div.innerHTML = href ? "<a href=\"\n\"/>" : "<div a=\"\n\"/>";
-      return div.innerHTML.indexOf('&#10;') > 0;
-  }
-  // #3663: IE encodes newlines inside attribute values while other browsers don't
-  var shouldDecodeNewlines = inBrowser ? getShouldDecode(false) : false;
-  // #6828: chrome encodes content in a[href]
-  var shouldDecodeNewlinesForHref = inBrowser
-      ? getShouldDecode(true)
-      : false;
-
-  var idToTemplate = cached(function (id) {
-      var el = query(id);
-      return el && el.innerHTML;
-  });
-  var mount = Vue.prototype.$mount;
-  Vue.prototype.$mount = function (el, hydrating) {
-      el = el && query(el);
-      /* istanbul ignore if */
-      if (el === document.body || el === document.documentElement) {
-          warn$2("Do not mount Vue to <html> or <body> - mount to normal elements instead.");
-          return this;
-      }
-      var options = this.$options;
-      // resolve template/el and convert to render function
-      if (!options.render) {
-          var template = options.template;
-          if (template) {
-              if (typeof template === 'string') {
-                  if (template.charAt(0) === '#') {
-                      template = idToTemplate(template);
-                      /* istanbul ignore if */
-                      if (!template) {
-                          warn$2("Template element not found or is empty: ".concat(options.template), this);
-                      }
-                  }
-              }
-              else if (template.nodeType) {
-                  template = template.innerHTML;
-              }
-              else {
-                  {
-                      warn$2('invalid template option:' + template, this);
-                  }
-                  return this;
-              }
-          }
-          else if (el) {
-              // @ts-expect-error
-              template = getOuterHTML(el);
-          }
-          if (template) {
-              /* istanbul ignore if */
-              if (config.performance && mark) {
-                  mark('compile');
-              }
-              var _a = compileToFunctions(template, {
-                  outputSourceRange: true,
-                  shouldDecodeNewlines: shouldDecodeNewlines,
-                  shouldDecodeNewlinesForHref: shouldDecodeNewlinesForHref,
-                  delimiters: options.delimiters,
-                  comments: options.comments
-              }, this), render = _a.render, staticRenderFns = _a.staticRenderFns;
-              options.render = render;
-              options.staticRenderFns = staticRenderFns;
-              /* istanbul ignore if */
-              if (config.performance && mark) {
-                  mark('compile end');
-                  measure("vue ".concat(this._name, " compile"), 'compile', 'compile end');
-              }
-          }
-      }
-      return mount.call(this, el, hydrating);
-  };
-  /**
-   * Get outerHTML of elements, taking care
-   * of SVG elements in IE as well.
-   */
-  function getOuterHTML(el) {
-      if (el.outerHTML) {
-          return el.outerHTML;
-      }
-      else {
-          var container = document.createElement('div');
-          container.appendChild(el.cloneNode(true));
-          return container.innerHTML;
-      }
-  }
-  Vue.compile = compileToFunctions;
-
-  // export type EffectScheduler = (...args: any[]) => any
-  /**
-   * @internal since we are not exposing this in Vue 2, it's used only for
-   * internal testing.
-   */
-  function effect(fn, scheduler) {
-      var watcher = new Watcher(currentInstance, fn, noop, {
-          sync: true
-      });
-      if (scheduler) {
-          watcher.update = function () {
-              scheduler(function () { return watcher.run(); });
-          };
-      }
-  }
-
-  extend(Vue, vca);
-  Vue.effect = effect;
-
-  return Vue;
-
-}));
diff --git a/advancedcontentfilter/asset/vue/dist/vue.min.js b/advancedcontentfilter/asset/vue/dist/vue.min.js
deleted file mode 100644
index 72d8a13e..00000000
--- a/advancedcontentfilter/asset/vue/dist/vue.min.js
+++ /dev/null
@@ -1,11 +0,0 @@
-/*!
- * Vue.js v2.7.13
- * (c) 2014-2022 Evan You
- * Released under the MIT License.
- */
-/*!
- * Vue.js v2.7.13
- * (c) 2014-2022 Evan You
- * Released under the MIT License.
- */
-!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e():"function"==typeof define&&define.amd?define(e):(t="undefined"!=typeof globalThis?globalThis:t||self).Vue=e()}(this,(function(){"use strict";var t=Object.freeze({}),e=Array.isArray;function n(t){return null==t}function r(t){return null!=t}function o(t){return!0===t}function i(t){return"string"==typeof t||"number"==typeof t||"symbol"==typeof t||"boolean"==typeof t}function a(t){return"function"==typeof t}function s(t){return null!==t&&"object"==typeof t}var c=Object.prototype.toString;function u(t){return"[object Object]"===c.call(t)}function l(t){var e=parseFloat(String(t));return e>=0&&Math.floor(e)===e&&isFinite(t)}function f(t){return r(t)&&"function"==typeof t.then&&"function"==typeof t.catch}function d(t){return null==t?"":Array.isArray(t)||u(t)&&t.toString===c?JSON.stringify(t,null,2):String(t)}function p(t){var e=parseFloat(t);return isNaN(e)?t:e}function v(t,e){for(var n=Object.create(null),r=t.split(","),o=0;o<r.length;o++)n[r[o]]=!0;return e?function(t){return n[t.toLowerCase()]}:function(t){return n[t]}}var h=v("slot,component",!0),m=v("key,ref,slot,slot-scope,is");function g(t,e){var n=t.length;if(n){if(e===t[n-1])return void(t.length=n-1);var r=t.indexOf(e);if(r>-1)return t.splice(r,1)}}var y=Object.prototype.hasOwnProperty;function _(t,e){return y.call(t,e)}function b(t){var e=Object.create(null);return function(n){return e[n]||(e[n]=t(n))}}var $=/-(\w)/g,w=b((function(t){return t.replace($,(function(t,e){return e?e.toUpperCase():""}))})),x=b((function(t){return t.charAt(0).toUpperCase()+t.slice(1)})),C=/\B([A-Z])/g,k=b((function(t){return t.replace(C,"-$1").toLowerCase()}));var S=Function.prototype.bind?function(t,e){return t.bind(e)}:function(t,e){function n(n){var r=arguments.length;return r?r>1?t.apply(e,arguments):t.call(e,n):t.call(e)}return n._length=t.length,n};function O(t,e){e=e||0;for(var n=t.length-e,r=new Array(n);n--;)r[n]=t[n+e];return r}function T(t,e){for(var n in e)t[n]=e[n];return t}function A(t){for(var e={},n=0;n<t.length;n++)t[n]&&T(e,t[n]);return e}function j(t,e,n){}var E=function(t,e,n){return!1},N=function(t){return t};function P(t,e){if(t===e)return!0;var n=s(t),r=s(e);if(!n||!r)return!n&&!r&&String(t)===String(e);try{var o=Array.isArray(t),i=Array.isArray(e);if(o&&i)return t.length===e.length&&t.every((function(t,n){return P(t,e[n])}));if(t instanceof Date&&e instanceof Date)return t.getTime()===e.getTime();if(o||i)return!1;var a=Object.keys(t),c=Object.keys(e);return a.length===c.length&&a.every((function(n){return P(t[n],e[n])}))}catch(t){return!1}}function D(t,e){for(var n=0;n<t.length;n++)if(P(t[n],e))return n;return-1}function M(t){var e=!1;return function(){e||(e=!0,t.apply(this,arguments))}}function I(t,e){return t===e?0===t&&1/t!=1/e:t==t||e==e}var L="data-server-rendered",R=["component","directive","filter"],F=["beforeCreate","created","beforeMount","mounted","beforeUpdate","updated","beforeDestroy","destroyed","activated","deactivated","errorCaptured","serverPrefetch","renderTracked","renderTriggered"],H={optionMergeStrategies:Object.create(null),silent:!1,productionTip:!1,devtools:!1,performance:!1,errorHandler:null,warnHandler:null,ignoredElements:[],keyCodes:Object.create(null),isReservedTag:E,isReservedAttr:E,isUnknownElement:E,getTagNamespace:j,parsePlatformTagName:N,mustUseProp:E,async:!0,_lifecycleHooks:F},B=/a-zA-Z\u00B7\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u037D\u037F-\u1FFF\u200C-\u200D\u203F-\u2040\u2070-\u218F\u2C00-\u2FEF\u3001-\uD7FF\uF900-\uFDCF\uFDF0-\uFFFD/;function U(t){var e=(t+"").charCodeAt(0);return 36===e||95===e}function z(t,e,n,r){Object.defineProperty(t,e,{value:n,enumerable:!!r,writable:!0,configurable:!0})}var V=new RegExp("[^".concat(B.source,".$_\\d]"));var K="__proto__"in{},J="undefined"!=typeof window,W=J&&window.navigator.userAgent.toLowerCase(),q=W&&/msie|trident/.test(W),Z=W&&W.indexOf("msie 9.0")>0,G=W&&W.indexOf("edge/")>0;W&&W.indexOf("android");var X=W&&/iphone|ipad|ipod|ios/.test(W);W&&/chrome\/\d+/.test(W),W&&/phantomjs/.test(W);var Y,Q=W&&W.match(/firefox\/(\d+)/),tt={}.watch,et=!1;if(J)try{var nt={};Object.defineProperty(nt,"passive",{get:function(){et=!0}}),window.addEventListener("test-passive",null,nt)}catch(t){}var rt=function(){return void 0===Y&&(Y=!J&&"undefined"!=typeof global&&(global.process&&"server"===global.process.env.VUE_ENV)),Y},ot=J&&window.__VUE_DEVTOOLS_GLOBAL_HOOK__;function it(t){return"function"==typeof t&&/native code/.test(t.toString())}var at,st="undefined"!=typeof Symbol&&it(Symbol)&&"undefined"!=typeof Reflect&&it(Reflect.ownKeys);at="undefined"!=typeof Set&&it(Set)?Set:function(){function t(){this.set=Object.create(null)}return t.prototype.has=function(t){return!0===this.set[t]},t.prototype.add=function(t){this.set[t]=!0},t.prototype.clear=function(){this.set=Object.create(null)},t}();var ct=null;function ut(t){void 0===t&&(t=null),t||ct&&ct._scope.off(),ct=t,t&&t._scope.on()}var lt=function(){function t(t,e,n,r,o,i,a,s){this.tag=t,this.data=e,this.children=n,this.text=r,this.elm=o,this.ns=void 0,this.context=i,this.fnContext=void 0,this.fnOptions=void 0,this.fnScopeId=void 0,this.key=e&&e.key,this.componentOptions=a,this.componentInstance=void 0,this.parent=void 0,this.raw=!1,this.isStatic=!1,this.isRootInsert=!0,this.isComment=!1,this.isCloned=!1,this.isOnce=!1,this.asyncFactory=s,this.asyncMeta=void 0,this.isAsyncPlaceholder=!1}return Object.defineProperty(t.prototype,"child",{get:function(){return this.componentInstance},enumerable:!1,configurable:!0}),t}(),ft=function(t){void 0===t&&(t="");var e=new lt;return e.text=t,e.isComment=!0,e};function dt(t){return new lt(void 0,void 0,void 0,String(t))}function pt(t){var e=new lt(t.tag,t.data,t.children&&t.children.slice(),t.text,t.elm,t.context,t.componentOptions,t.asyncFactory);return e.ns=t.ns,e.isStatic=t.isStatic,e.key=t.key,e.isComment=t.isComment,e.fnContext=t.fnContext,e.fnOptions=t.fnOptions,e.fnScopeId=t.fnScopeId,e.asyncMeta=t.asyncMeta,e.isCloned=!0,e}var vt=0,ht=[],mt=function(){function t(){this._pending=!1,this.id=vt++,this.subs=[]}return t.prototype.addSub=function(t){this.subs.push(t)},t.prototype.removeSub=function(t){this.subs[this.subs.indexOf(t)]=null,this._pending||(this._pending=!0,ht.push(this))},t.prototype.depend=function(e){t.target&&t.target.addDep(this)},t.prototype.notify=function(t){for(var e=this.subs.filter((function(t){return t})),n=0,r=e.length;n<r;n++){e[n].update()}},t}();mt.target=null;var gt=[];function yt(t){gt.push(t),mt.target=t}function _t(){gt.pop(),mt.target=gt[gt.length-1]}var bt=Array.prototype,$t=Object.create(bt);["push","pop","shift","unshift","splice","sort","reverse"].forEach((function(t){var e=bt[t];z($t,t,(function(){for(var n=[],r=0;r<arguments.length;r++)n[r]=arguments[r];var o,i=e.apply(this,n),a=this.__ob__;switch(t){case"push":case"unshift":o=n;break;case"splice":o=n.slice(2)}return o&&a.observeArray(o),a.dep.notify(),i}))}));var wt=new WeakMap;function xt(t){return Ct(t,!0),z(t,"__v_isShallow",!0),t}function Ct(t,e){Ot(t)||Dt(t,e,rt())}function kt(t){return Ot(t)?kt(t.__v_raw):!(!t||!t.__ob__)}function St(t){return!(!t||!t.__v_isShallow)}function Ot(t){return!(!t||!t.__v_isReadonly)}var Tt=Object.getOwnPropertyNames($t),At={},jt=!0;function Et(t){jt=t}var Nt={notify:j,depend:j,addSub:j,removeSub:j},Pt=function(){function t(t,n,r){if(void 0===n&&(n=!1),void 0===r&&(r=!1),this.value=t,this.shallow=n,this.mock=r,this.dep=r?Nt:new mt,this.vmCount=0,z(t,"__ob__",this),e(t)){if(!r)if(K)t.__proto__=$t;else for(var o=0,i=Tt.length;o<i;o++){z(t,s=Tt[o],$t[s])}n||this.observeArray(t)}else{var a=Object.keys(t);for(o=0;o<a.length;o++){var s;Mt(t,s=a[o],At,void 0,n,r)}}}return t.prototype.observeArray=function(t){for(var e=0,n=t.length;e<n;e++)Dt(t[e],!1,this.mock)},t}();function Dt(t,n,r){return t&&_(t,"__ob__")&&t.__ob__ instanceof Pt?t.__ob__:!jt||!r&&rt()||!e(t)&&!u(t)||!Object.isExtensible(t)||t.__v_skip||wt.has(t)||Ht(t)||t instanceof lt?void 0:new Pt(t,n,r)}function Mt(t,n,r,o,i,a){var s=new mt,c=Object.getOwnPropertyDescriptor(t,n);if(!c||!1!==c.configurable){var u=c&&c.get,l=c&&c.set;u&&!l||r!==At&&2!==arguments.length||(r=t[n]);var f=!i&&Dt(r,!1,a);return Object.defineProperty(t,n,{enumerable:!0,configurable:!0,get:function(){var n=u?u.call(t):r;return mt.target&&(s.depend(),f&&(f.dep.depend(),e(n)&&Rt(n))),Ht(n)&&!i?n.value:n},set:function(e){var n=u?u.call(t):r;if(I(n,e)){if(l)l.call(t,e);else{if(u)return;if(!i&&Ht(n)&&!Ht(e))return void(n.value=e);r=e}f=!i&&Dt(e,!1,a),s.notify()}}}),s}}function It(t,n,r){if(!Ot(t)){var o=t.__ob__;return e(t)&&l(n)?(t.length=Math.max(t.length,n),t.splice(n,1,r),o&&!o.shallow&&o.mock&&Dt(r,!1,!0),r):n in t&&!(n in Object.prototype)?(t[n]=r,r):t._isVue||o&&o.vmCount?r:o?(Mt(o.value,n,r,void 0,o.shallow,o.mock),o.dep.notify(),r):(t[n]=r,r)}}function Lt(t,n){if(e(t)&&l(n))t.splice(n,1);else{var r=t.__ob__;t._isVue||r&&r.vmCount||Ot(t)||_(t,n)&&(delete t[n],r&&r.dep.notify())}}function Rt(t){for(var n=void 0,r=0,o=t.length;r<o;r++)(n=t[r])&&n.__ob__&&n.__ob__.dep.depend(),e(n)&&Rt(n)}var Ft="__v_isRef";function Ht(t){return!(!t||!0!==t.__v_isRef)}function Bt(t,e){if(Ht(t))return t;var n={};return z(n,Ft,!0),z(n,"__v_isShallow",e),z(n,"dep",Mt(n,"value",t,null,e,rt())),n}function Ut(t,e,n){Object.defineProperty(t,n,{enumerable:!0,configurable:!0,get:function(){var t=e[n];if(Ht(t))return t.value;var r=t&&t.__ob__;return r&&r.dep.depend(),t},set:function(t){var r=e[n];Ht(r)&&!Ht(t)?r.value=t:e[n]=t}})}function zt(t,e,n){var r=t[e];if(Ht(r))return r;var o={get value(){var r=t[e];return void 0===r?n:r},set value(n){t[e]=n}};return z(o,Ft,!0),o}var Vt=new WeakMap,Kt=new WeakMap;function Jt(t){return Wt(t,!1)}function Wt(t,e){if(!u(t))return t;if(Ot(t))return t;var n=e?Kt:Vt,r=n.get(t);if(r)return r;var o=Object.create(Object.getPrototypeOf(t));n.set(t,o),z(o,"__v_isReadonly",!0),z(o,"__v_raw",t),Ht(t)&&z(o,Ft,!0),(e||St(t))&&z(o,"__v_isShallow",!0);for(var i=Object.keys(t),a=0;a<i.length;a++)qt(o,t,i[a],e);return o}function qt(t,e,n,r){Object.defineProperty(t,n,{enumerable:!0,configurable:!0,get:function(){var t=e[n];return r||!u(t)?t:Jt(t)},set:function(){}})}var Zt=b((function(t){var e="&"===t.charAt(0),n="~"===(t=e?t.slice(1):t).charAt(0),r="!"===(t=n?t.slice(1):t).charAt(0);return{name:t=r?t.slice(1):t,once:n,capture:r,passive:e}}));function Gt(t,n){function r(){var t=r.fns;if(!e(t))return hn(t,null,arguments,n,"v-on handler");for(var o=t.slice(),i=0;i<o.length;i++)hn(o[i],null,arguments,n,"v-on handler")}return r.fns=t,r}function Xt(t,e,r,i,a,s){var c,u,l,f;for(c in t)u=t[c],l=e[c],f=Zt(c),n(u)||(n(l)?(n(u.fns)&&(u=t[c]=Gt(u,s)),o(f.once)&&(u=t[c]=a(f.name,u,f.capture)),r(f.name,u,f.capture,f.passive,f.params)):u!==l&&(l.fns=u,t[c]=l));for(c in e)n(t[c])&&i((f=Zt(c)).name,e[c],f.capture)}function Yt(t,e,i){var a;t instanceof lt&&(t=t.data.hook||(t.data.hook={}));var s=t[e];function c(){i.apply(this,arguments),g(a.fns,c)}n(s)?a=Gt([c]):r(s.fns)&&o(s.merged)?(a=s).fns.push(c):a=Gt([s,c]),a.merged=!0,t[e]=a}function Qt(t,e,n,o,i){if(r(e)){if(_(e,n))return t[n]=e[n],i||delete e[n],!0;if(_(e,o))return t[n]=e[o],i||delete e[o],!0}return!1}function te(t){return i(t)?[dt(t)]:e(t)?ne(t):void 0}function ee(t){return r(t)&&r(t.text)&&!1===t.isComment}function ne(t,a){var s,c,u,l,f=[];for(s=0;s<t.length;s++)n(c=t[s])||"boolean"==typeof c||(l=f[u=f.length-1],e(c)?c.length>0&&(ee((c=ne(c,"".concat(a||"","_").concat(s)))[0])&&ee(l)&&(f[u]=dt(l.text+c[0].text),c.shift()),f.push.apply(f,c)):i(c)?ee(l)?f[u]=dt(l.text+c):""!==c&&f.push(dt(c)):ee(c)&&ee(l)?f[u]=dt(l.text+c.text):(o(t._isVList)&&r(c.tag)&&n(c.key)&&r(a)&&(c.key="__vlist".concat(a,"_").concat(s,"__")),f.push(c)));return f}function re(t,n,c,u,l,f){return(e(c)||i(c))&&(l=u,u=c,c=void 0),o(f)&&(l=2),function(t,n,o,i,c){if(r(o)&&r(o.__ob__))return ft();r(o)&&r(o.is)&&(n=o.is);if(!n)return ft();e(i)&&a(i[0])&&((o=o||{}).scopedSlots={default:i[0]},i.length=0);2===c?i=te(i):1===c&&(i=function(t){for(var n=0;n<t.length;n++)if(e(t[n]))return Array.prototype.concat.apply([],t);return t}(i));var u,l;if("string"==typeof n){var f=void 0;l=t.$vnode&&t.$vnode.ns||H.getTagNamespace(n),u=H.isReservedTag(n)?new lt(H.parsePlatformTagName(n),o,i,void 0,void 0,t):o&&o.pre||!r(f=$r(t.$options,"components",n))?new lt(n,o,i,void 0,void 0,t):fr(f,o,t,i,n)}else u=fr(n,o,t,i);return e(u)?u:r(u)?(r(l)&&oe(u,l),r(o)&&function(t){s(t.style)&&Vn(t.style);s(t.class)&&Vn(t.class)}(o),u):ft()}(t,n,c,u,l)}function oe(t,e,i){if(t.ns=e,"foreignObject"===t.tag&&(e=void 0,i=!0),r(t.children))for(var a=0,s=t.children.length;a<s;a++){var c=t.children[a];r(c.tag)&&(n(c.ns)||o(i)&&"svg"!==c.tag)&&oe(c,e,i)}}function ie(t,n){var o,i,a,c,u=null;if(e(t)||"string"==typeof t)for(u=new Array(t.length),o=0,i=t.length;o<i;o++)u[o]=n(t[o],o);else if("number"==typeof t)for(u=new Array(t),o=0;o<t;o++)u[o]=n(o+1,o);else if(s(t))if(st&&t[Symbol.iterator]){u=[];for(var l=t[Symbol.iterator](),f=l.next();!f.done;)u.push(n(f.value,u.length)),f=l.next()}else for(a=Object.keys(t),u=new Array(a.length),o=0,i=a.length;o<i;o++)c=a[o],u[o]=n(t[c],c,o);return r(u)||(u=[]),u._isVList=!0,u}function ae(t,e,n,r){var o,i=this.$scopedSlots[t];i?(n=n||{},r&&(n=T(T({},r),n)),o=i(n)||(a(e)?e():e)):o=this.$slots[t]||(a(e)?e():e);var s=n&&n.slot;return s?this.$createElement("template",{slot:s},o):o}function se(t){return $r(this.$options,"filters",t)||N}function ce(t,n){return e(t)?-1===t.indexOf(n):t!==n}function ue(t,e,n,r,o){var i=H.keyCodes[e]||n;return o&&r&&!H.keyCodes[e]?ce(o,r):i?ce(i,t):r?k(r)!==e:void 0===t}function le(t,n,r,o,i){if(r)if(s(r)){e(r)&&(r=A(r));var a=void 0,c=function(e){if("class"===e||"style"===e||m(e))a=t;else{var s=t.attrs&&t.attrs.type;a=o||H.mustUseProp(n,s,e)?t.domProps||(t.domProps={}):t.attrs||(t.attrs={})}var c=w(e),u=k(e);c in a||u in a||(a[e]=r[e],i&&((t.on||(t.on={}))["update:".concat(e)]=function(t){r[e]=t}))};for(var u in r)c(u)}else;return t}function fe(t,e){var n=this._staticTrees||(this._staticTrees=[]),r=n[t];return r&&!e||pe(r=n[t]=this.$options.staticRenderFns[t].call(this._renderProxy,this._c,this),"__static__".concat(t),!1),r}function de(t,e,n){return pe(t,"__once__".concat(e).concat(n?"_".concat(n):""),!0),t}function pe(t,n,r){if(e(t))for(var o=0;o<t.length;o++)t[o]&&"string"!=typeof t[o]&&ve(t[o],"".concat(n,"_").concat(o),r);else ve(t,n,r)}function ve(t,e,n){t.isStatic=!0,t.key=e,t.isOnce=n}function he(t,e){if(e)if(u(e)){var n=t.on=t.on?T({},t.on):{};for(var r in e){var o=n[r],i=e[r];n[r]=o?[].concat(o,i):i}}else;return t}function me(t,n,r,o){n=n||{$stable:!r};for(var i=0;i<t.length;i++){var a=t[i];e(a)?me(a,n,r):a&&(a.proxy&&(a.fn.proxy=!0),n[a.key]=a.fn)}return o&&(n.$key=o),n}function ge(t,e){for(var n=0;n<e.length;n+=2){var r=e[n];"string"==typeof r&&r&&(t[e[n]]=e[n+1])}return t}function ye(t,e){return"string"==typeof t?e+t:t}function _e(t){t._o=de,t._n=p,t._s=d,t._l=ie,t._t=ae,t._q=P,t._i=D,t._m=fe,t._f=se,t._k=ue,t._b=le,t._v=dt,t._e=ft,t._u=me,t._g=he,t._d=ge,t._p=ye}function be(t,e){if(!t||!t.length)return{};for(var n={},r=0,o=t.length;r<o;r++){var i=t[r],a=i.data;if(a&&a.attrs&&a.attrs.slot&&delete a.attrs.slot,i.context!==e&&i.fnContext!==e||!a||null==a.slot)(n.default||(n.default=[])).push(i);else{var s=a.slot,c=n[s]||(n[s]=[]);"template"===i.tag?c.push.apply(c,i.children||[]):c.push(i)}}for(var u in n)n[u].every($e)&&delete n[u];return n}function $e(t){return t.isComment&&!t.asyncFactory||" "===t.text}function we(t){return t.isComment&&t.asyncFactory}function xe(e,n,r,o){var i,a=Object.keys(r).length>0,s=n?!!n.$stable:!a,c=n&&n.$key;if(n){if(n._normalized)return n._normalized;if(s&&o&&o!==t&&c===o.$key&&!a&&!o.$hasNormal)return o;for(var u in i={},n)n[u]&&"$"!==u[0]&&(i[u]=Ce(e,r,u,n[u]))}else i={};for(var l in r)l in i||(i[l]=ke(r,l));return n&&Object.isExtensible(n)&&(n._normalized=i),z(i,"$stable",s),z(i,"$key",c),z(i,"$hasNormal",a),i}function Ce(t,n,r,o){var i=function(){var n=ct;ut(t);var r=arguments.length?o.apply(null,arguments):o({}),i=(r=r&&"object"==typeof r&&!e(r)?[r]:te(r))&&r[0];return ut(n),r&&(!i||1===r.length&&i.isComment&&!we(i))?void 0:r};return o.proxy&&Object.defineProperty(n,r,{get:i,enumerable:!0,configurable:!0}),i}function ke(t,e){return function(){return t[e]}}function Se(e){return{get attrs(){if(!e._attrsProxy){var n=e._attrsProxy={};z(n,"_v_attr_proxy",!0),Oe(n,e.$attrs,t,e,"$attrs")}return e._attrsProxy},get listeners(){e._listenersProxy||Oe(e._listenersProxy={},e.$listeners,t,e,"$listeners");return e._listenersProxy},get slots(){return function(t){t._slotsProxy||Ae(t._slotsProxy={},t.$scopedSlots);return t._slotsProxy}(e)},emit:S(e.$emit,e),expose:function(t){t&&Object.keys(t).forEach((function(n){return Ut(e,t,n)}))}}}function Oe(t,e,n,r,o){var i=!1;for(var a in e)a in t?e[a]!==n[a]&&(i=!0):(i=!0,Te(t,a,r,o));for(var a in t)a in e||(i=!0,delete t[a]);return i}function Te(t,e,n,r){Object.defineProperty(t,e,{enumerable:!0,configurable:!0,get:function(){return n[r][e]}})}function Ae(t,e){for(var n in e)t[n]=e[n];for(var n in t)n in e||delete t[n]}function je(){var t=ct;return t._setupContext||(t._setupContext=Se(t))}var Ee,Ne=null;function Pe(t,e){return(t.__esModule||st&&"Module"===t[Symbol.toStringTag])&&(t=t.default),s(t)?e.extend(t):t}function De(t){if(e(t))for(var n=0;n<t.length;n++){var o=t[n];if(r(o)&&(r(o.componentOptions)||we(o)))return o}}function Me(t,e){Ee.$on(t,e)}function Ie(t,e){Ee.$off(t,e)}function Le(t,e){var n=Ee;return function r(){var o=e.apply(null,arguments);null!==o&&n.$off(t,r)}}function Re(t,e,n){Ee=t,Xt(e,n||{},Me,Ie,Le,t),Ee=void 0}var Fe=null;function He(t){var e=Fe;return Fe=t,function(){Fe=e}}function Be(t){for(;t&&(t=t.$parent);)if(t._inactive)return!0;return!1}function Ue(t,e){if(e){if(t._directInactive=!1,Be(t))return}else if(t._directInactive)return;if(t._inactive||null===t._inactive){t._inactive=!1;for(var n=0;n<t.$children.length;n++)Ue(t.$children[n]);Ve(t,"activated")}}function ze(t,e){if(!(e&&(t._directInactive=!0,Be(t))||t._inactive)){t._inactive=!0;for(var n=0;n<t.$children.length;n++)ze(t.$children[n]);Ve(t,"deactivated")}}function Ve(t,e,n,r){void 0===r&&(r=!0),yt();var o=ct;r&&ut(t);var i=t.$options[e],a="".concat(e," hook");if(i)for(var s=0,c=i.length;s<c;s++)hn(i[s],t,n||null,t,a);t._hasHookEvent&&t.$emit("hook:"+e),r&&ut(o),_t()}var Ke=[],Je=[],We={},qe=!1,Ze=!1,Ge=0;var Xe=0,Ye=Date.now;if(J&&!q){var Qe=window.performance;Qe&&"function"==typeof Qe.now&&Ye()>document.createEvent("Event").timeStamp&&(Ye=function(){return Qe.now()})}var tn=function(t,e){if(t.post){if(!e.post)return 1}else if(e.post)return-1;return t.id-e.id};function en(){var t,e;for(Xe=Ye(),Ze=!0,Ke.sort(tn),Ge=0;Ge<Ke.length;Ge++)(t=Ke[Ge]).before&&t.before(),e=t.id,We[e]=null,t.run();var n=Je.slice(),r=Ke.slice();Ge=Ke.length=Je.length=0,We={},qe=Ze=!1,function(t){for(var e=0;e<t.length;e++)t[e]._inactive=!0,Ue(t[e],!0)}(n),function(t){var e=t.length;for(;e--;){var n=t[e],r=n.vm;r&&r._watcher===n&&r._isMounted&&!r._isDestroyed&&Ve(r,"updated")}}(r),function(){for(var t=0;t<ht.length;t++){var e=ht[t];e.subs=e.subs.filter((function(t){return t})),e._pending=!1}ht.length=0}(),ot&&H.devtools&&ot.emit("flush")}function nn(t){var e=t.id;if(null==We[e]&&(t!==mt.target||!t.noRecurse)){if(We[e]=!0,Ze){for(var n=Ke.length-1;n>Ge&&Ke[n].id>t.id;)n--;Ke.splice(n+1,0,t)}else Ke.push(t);qe||(qe=!0,On(en))}}var rn="watcher",on="".concat(rn," callback"),an="".concat(rn," getter"),sn="".concat(rn," cleanup");function cn(t,e){return fn(t,null,{flush:"post"})}var un,ln={};function fn(n,r,o){var i=void 0===o?t:o,s=i.immediate,c=i.deep,u=i.flush,l=void 0===u?"pre":u;i.onTrack,i.onTrigger;var f,d,p=ct,v=function(t,e,n){return void 0===n&&(n=null),hn(t,null,n,p,e)},h=!1,m=!1;if(Ht(n)?(f=function(){return n.value},h=St(n)):kt(n)?(f=function(){return n.__ob__.dep.depend(),n},c=!0):e(n)?(m=!0,h=n.some((function(t){return kt(t)||St(t)})),f=function(){return n.map((function(t){return Ht(t)?t.value:kt(t)?Vn(t):a(t)?v(t,an):void 0}))}):f=a(n)?r?function(){return v(n,an)}:function(){if(!p||!p._isDestroyed)return d&&d(),v(n,rn,[y])}:j,r&&c){var g=f;f=function(){return Vn(g())}}var y=function(t){d=_.onStop=function(){v(t,sn)}};if(rt())return y=j,r?s&&v(r,on,[f(),m?[]:void 0,y]):f(),j;var _=new Wn(ct,f,j,{lazy:!0});_.noRecurse=!r;var b=m?[]:ln;return _.run=function(){if(_.active)if(r){var t=_.get();(c||h||(m?t.some((function(t,e){return I(t,b[e])})):I(t,b)))&&(d&&d(),v(r,on,[t,b===ln?void 0:b,y]),b=t)}else _.get()},"sync"===l?_.update=_.run:"post"===l?(_.post=!0,_.update=function(){return nn(_)}):_.update=function(){if(p&&p===ct&&!p._isMounted){var t=p._preWatchers||(p._preWatchers=[]);t.indexOf(_)<0&&t.push(_)}else nn(_)},r?s?_.run():b=_.get():"post"===l&&p?p.$once("hook:mounted",(function(){return _.get()})):_.get(),function(){_.teardown()}}var dn=function(){function t(t){void 0===t&&(t=!1),this.detached=t,this.active=!0,this.effects=[],this.cleanups=[],this.parent=un,!t&&un&&(this.index=(un.scopes||(un.scopes=[])).push(this)-1)}return t.prototype.run=function(t){if(this.active){var e=un;try{return un=this,t()}finally{un=e}}},t.prototype.on=function(){un=this},t.prototype.off=function(){un=this.parent},t.prototype.stop=function(t){if(this.active){var e=void 0,n=void 0;for(e=0,n=this.effects.length;e<n;e++)this.effects[e].teardown();for(e=0,n=this.cleanups.length;e<n;e++)this.cleanups[e]();if(this.scopes)for(e=0,n=this.scopes.length;e<n;e++)this.scopes[e].stop(!0);if(!this.detached&&this.parent&&!t){var r=this.parent.scopes.pop();r&&r!==this&&(this.parent.scopes[this.index]=r,r.index=this.index)}this.parent=void 0,this.active=!1}},t}();function pn(t){var e=t._provided,n=t.$parent&&t.$parent._provided;return n===e?t._provided=Object.create(n):e}function vn(t,e,n){yt();try{if(e)for(var r=e;r=r.$parent;){var o=r.$options.errorCaptured;if(o)for(var i=0;i<o.length;i++)try{if(!1===o[i].call(r,t,e,n))return}catch(t){mn(t,r,"errorCaptured hook")}}mn(t,e,n)}finally{_t()}}function hn(t,e,n,r,o){var i;try{(i=n?t.apply(e,n):t.call(e))&&!i._isVue&&f(i)&&!i._handled&&(i.catch((function(t){return vn(t,r,o+" (Promise/async)")})),i._handled=!0)}catch(t){vn(t,r,o)}return i}function mn(t,e,n){if(H.errorHandler)try{return H.errorHandler.call(null,t,e,n)}catch(e){e!==t&&gn(e)}gn(t)}function gn(t,e,n){if(!J||"undefined"==typeof console)throw t;console.error(t)}var yn,_n=!1,bn=[],$n=!1;function wn(){$n=!1;var t=bn.slice(0);bn.length=0;for(var e=0;e<t.length;e++)t[e]()}if("undefined"!=typeof Promise&&it(Promise)){var xn=Promise.resolve();yn=function(){xn.then(wn),X&&setTimeout(j)},_n=!0}else if(q||"undefined"==typeof MutationObserver||!it(MutationObserver)&&"[object MutationObserverConstructor]"!==MutationObserver.toString())yn="undefined"!=typeof setImmediate&&it(setImmediate)?function(){setImmediate(wn)}:function(){setTimeout(wn,0)};else{var Cn=1,kn=new MutationObserver(wn),Sn=document.createTextNode(String(Cn));kn.observe(Sn,{characterData:!0}),yn=function(){Cn=(Cn+1)%2,Sn.data=String(Cn)},_n=!0}function On(t,e){var n;if(bn.push((function(){if(t)try{t.call(e)}catch(t){vn(t,e,"nextTick")}else n&&n(e)})),$n||($n=!0,yn()),!t&&"undefined"!=typeof Promise)return new Promise((function(t){n=t}))}function Tn(t){return function(e,n){if(void 0===n&&(n=ct),n)return function(t,e,n){var r=t.$options;r[e]=gr(r[e],n)}(n,t,e)}}var An=Tn("beforeMount"),jn=Tn("mounted"),En=Tn("beforeUpdate"),Nn=Tn("updated"),Pn=Tn("beforeDestroy"),Dn=Tn("destroyed"),Mn=Tn("activated"),In=Tn("deactivated"),Ln=Tn("serverPrefetch"),Rn=Tn("renderTracked"),Fn=Tn("renderTriggered"),Hn=Tn("errorCaptured");var Bn="2.7.13";var Un=Object.freeze({__proto__:null,version:Bn,defineComponent:function(t){return t},ref:function(t){return Bt(t,!1)},shallowRef:function(t){return Bt(t,!0)},isRef:Ht,toRef:zt,toRefs:function(t){var n=e(t)?new Array(t.length):{};for(var r in t)n[r]=zt(t,r);return n},unref:function(t){return Ht(t)?t.value:t},proxyRefs:function(t){if(kt(t))return t;for(var e={},n=Object.keys(t),r=0;r<n.length;r++)Ut(e,t,n[r]);return e},customRef:function(t){var e=new mt,n=t((function(){e.depend()}),(function(){e.notify()})),r=n.get,o=n.set,i={get value(){return r()},set value(t){o(t)}};return z(i,Ft,!0),i},triggerRef:function(t){t.dep&&t.dep.notify()},reactive:function(t){return Ct(t,!1),t},isReactive:kt,isReadonly:Ot,isShallow:St,isProxy:function(t){return kt(t)||Ot(t)},shallowReactive:xt,markRaw:function(t){return s(t)&&wt.set(t,!0),t},toRaw:function t(e){var n=e&&e.__v_raw;return n?t(n):e},readonly:Jt,shallowReadonly:function(t){return Wt(t,!0)},computed:function(t,e){var n,r,o=a(t);o?(n=t,r=j):(n=t.get,r=t.set);var i=rt()?null:new Wn(ct,n,j,{lazy:!0}),s={effect:i,get value(){return i?(i.dirty&&i.evaluate(),mt.target&&i.depend(),i.value):n()},set value(t){r(t)}};return z(s,Ft,!0),z(s,"__v_isReadonly",o),s},watch:function(t,e,n){return fn(t,e,n)},watchEffect:function(t,e){return fn(t,null,e)},watchPostEffect:cn,watchSyncEffect:function(t,e){return fn(t,null,{flush:"sync"})},EffectScope:dn,effectScope:function(t){return new dn(t)},onScopeDispose:function(t){un&&un.cleanups.push(t)},getCurrentScope:function(){return un},provide:function(t,e){ct&&(pn(ct)[t]=e)},inject:function(t,e,n){void 0===n&&(n=!1);var r=ct;if(r){var o=r.$parent&&r.$parent._provided;if(o&&t in o)return o[t];if(arguments.length>1)return n&&a(e)?e.call(r):e}},h:function(t,e,n){return re(ct,t,e,n,2,!0)},getCurrentInstance:function(){return ct&&{proxy:ct}},useSlots:function(){return je().slots},useAttrs:function(){return je().attrs},useListeners:function(){return je().listeners},mergeDefaults:function(t,n){var r=e(t)?t.reduce((function(t,e){return t[e]={},t}),{}):t;for(var o in n){var i=r[o];i?e(i)||a(i)?r[o]={type:i,default:n[o]}:i.default=n[o]:null===i&&(r[o]={default:n[o]})}return r},nextTick:On,set:It,del:Lt,useCssModule:function(e){return t},useCssVars:function(t){if(J){var e=ct;e&&cn((function(){var n=e.$el,r=t(e,e._setupProxy);if(n&&1===n.nodeType){var o=n.style;for(var i in r)o.setProperty("--".concat(i),r[i])}}))}},defineAsyncComponent:function(t){a(t)&&(t={loader:t});var e=t.loader,n=t.loadingComponent,r=t.errorComponent,o=t.delay,i=void 0===o?200:o,s=t.timeout;t.suspensible;var c=t.onError,u=null,l=0,f=function(){var t;return u||(t=u=e().catch((function(t){if(t=t instanceof Error?t:new Error(String(t)),c)return new Promise((function(e,n){c(t,(function(){return e((l++,u=null,f()))}),(function(){return n(t)}),l+1)}));throw t})).then((function(e){return t!==u&&u?u:(e&&(e.__esModule||"Module"===e[Symbol.toStringTag])&&(e=e.default),e)})))};return function(){return{component:f(),delay:i,timeout:s,error:r,loading:n}}},onBeforeMount:An,onMounted:jn,onBeforeUpdate:En,onUpdated:Nn,onBeforeUnmount:Pn,onUnmounted:Dn,onActivated:Mn,onDeactivated:In,onServerPrefetch:Ln,onRenderTracked:Rn,onRenderTriggered:Fn,onErrorCaptured:function(t,e){void 0===e&&(e=ct),Hn(t,e)}}),zn=new at;function Vn(t){return Kn(t,zn),zn.clear(),t}function Kn(t,n){var r,o,i=e(t);if(!(!i&&!s(t)||t.__v_skip||Object.isFrozen(t)||t instanceof lt)){if(t.__ob__){var a=t.__ob__.dep.id;if(n.has(a))return;n.add(a)}if(i)for(r=t.length;r--;)Kn(t[r],n);else if(Ht(t))Kn(t.value,n);else for(r=(o=Object.keys(t)).length;r--;)Kn(t[o[r]],n)}}var Jn=0,Wn=function(){function t(t,e,n,r,o){!function(t,e){void 0===e&&(e=un),e&&e.active&&e.effects.push(t)}(this,un&&!un._vm?un:t?t._scope:void 0),(this.vm=t)&&o&&(t._watcher=this),r?(this.deep=!!r.deep,this.user=!!r.user,this.lazy=!!r.lazy,this.sync=!!r.sync,this.before=r.before):this.deep=this.user=this.lazy=this.sync=!1,this.cb=n,this.id=++Jn,this.active=!0,this.post=!1,this.dirty=this.lazy,this.deps=[],this.newDeps=[],this.depIds=new at,this.newDepIds=new at,this.expression="",a(e)?this.getter=e:(this.getter=function(t){if(!V.test(t)){var e=t.split(".");return function(t){for(var n=0;n<e.length;n++){if(!t)return;t=t[e[n]]}return t}}}(e),this.getter||(this.getter=j)),this.value=this.lazy?void 0:this.get()}return t.prototype.get=function(){var t;yt(this);var e=this.vm;try{t=this.getter.call(e,e)}catch(t){if(!this.user)throw t;vn(t,e,'getter for watcher "'.concat(this.expression,'"'))}finally{this.deep&&Vn(t),_t(),this.cleanupDeps()}return t},t.prototype.addDep=function(t){var e=t.id;this.newDepIds.has(e)||(this.newDepIds.add(e),this.newDeps.push(t),this.depIds.has(e)||t.addSub(this))},t.prototype.cleanupDeps=function(){for(var t=this.deps.length;t--;){var e=this.deps[t];this.newDepIds.has(e.id)||e.removeSub(this)}var n=this.depIds;this.depIds=this.newDepIds,this.newDepIds=n,this.newDepIds.clear(),n=this.deps,this.deps=this.newDeps,this.newDeps=n,this.newDeps.length=0},t.prototype.update=function(){this.lazy?this.dirty=!0:this.sync?this.run():nn(this)},t.prototype.run=function(){if(this.active){var t=this.get();if(t!==this.value||s(t)||this.deep){var e=this.value;if(this.value=t,this.user){var n='callback for watcher "'.concat(this.expression,'"');hn(this.cb,this.vm,[t,e],this.vm,n)}else this.cb.call(this.vm,t,e)}}},t.prototype.evaluate=function(){this.value=this.get(),this.dirty=!1},t.prototype.depend=function(){for(var t=this.deps.length;t--;)this.deps[t].depend()},t.prototype.teardown=function(){if(this.vm&&!this.vm._isBeingDestroyed&&g(this.vm._scope.effects,this),this.active){for(var t=this.deps.length;t--;)this.deps[t].removeSub(this);this.active=!1,this.onStop&&this.onStop()}},t}(),qn={enumerable:!0,configurable:!0,get:j,set:j};function Zn(t,e,n){qn.get=function(){return this[e][n]},qn.set=function(t){this[e][n]=t},Object.defineProperty(t,n,qn)}function Gn(t){var n=t.$options;if(n.props&&function(t,e){var n=t.$options.propsData||{},r=t._props=xt({}),o=t.$options._propKeys=[];t.$parent&&Et(!1);var i=function(i){o.push(i);var a=wr(i,e,n,t);Mt(r,i,a),i in t||Zn(t,"_props",i)};for(var a in e)i(a);Et(!0)}(t,n.props),function(t){var e=t.$options,n=e.setup;if(n){var r=t._setupContext=Se(t);ut(t),yt();var o=hn(n,null,[t._props||xt({}),r],t,"setup");if(_t(),ut(),a(o))e.render=o;else if(s(o))if(t._setupState=o,o.__sfc){var i=t._setupProxy={};for(var c in o)"__sfc"!==c&&Ut(i,o,c)}else for(var c in o)U(c)||Ut(t,o,c)}}(t),n.methods&&function(t,e){for(var n in t.$options.props,e)t[n]="function"!=typeof e[n]?j:S(e[n],t)}(t,n.methods),n.data)!function(t){var e=t.$options.data;u(e=t._data=a(e)?function(t,e){yt();try{return t.call(e,e)}catch(t){return vn(t,e,"data()"),{}}finally{_t()}}(e,t):e||{})||(e={});var n=Object.keys(e),r=t.$options.props;t.$options.methods;var o=n.length;for(;o--;){var i=n[o];r&&_(r,i)||U(i)||Zn(t,"_data",i)}var s=Dt(e);s&&s.vmCount++}(t);else{var r=Dt(t._data={});r&&r.vmCount++}n.computed&&function(t,e){var n=t._computedWatchers=Object.create(null),r=rt();for(var o in e){var i=e[o],s=a(i)?i:i.get;r||(n[o]=new Wn(t,s||j,j,Xn)),o in t||Yn(t,o,i)}}(t,n.computed),n.watch&&n.watch!==tt&&function(t,n){for(var r in n){var o=n[r];if(e(o))for(var i=0;i<o.length;i++)er(t,r,o[i]);else er(t,r,o)}}(t,n.watch)}var Xn={lazy:!0};function Yn(t,e,n){var r=!rt();a(n)?(qn.get=r?Qn(e):tr(n),qn.set=j):(qn.get=n.get?r&&!1!==n.cache?Qn(e):tr(n.get):j,qn.set=n.set||j),Object.defineProperty(t,e,qn)}function Qn(t){return function(){var e=this._computedWatchers&&this._computedWatchers[t];if(e)return e.dirty&&e.evaluate(),mt.target&&e.depend(),e.value}}function tr(t){return function(){return t.call(this,this)}}function er(t,e,n,r){return u(n)&&(r=n,n=n.handler),"string"==typeof n&&(n=t[n]),t.$watch(e,n,r)}function nr(t,e){if(t){for(var n=Object.create(null),r=st?Reflect.ownKeys(t):Object.keys(t),o=0;o<r.length;o++){var i=r[o];if("__ob__"!==i){var s=t[i].from;if(s in e._provided)n[i]=e._provided[s];else if("default"in t[i]){var c=t[i].default;n[i]=a(c)?c.call(e):c}}}return n}}var rr=0;function or(t){var e=t.options;if(t.super){var n=or(t.super);if(n!==t.superOptions){t.superOptions=n;var r=function(t){var e,n=t.options,r=t.sealedOptions;for(var o in n)n[o]!==r[o]&&(e||(e={}),e[o]=n[o]);return e}(t);r&&T(t.extendOptions,r),(e=t.options=br(n,t.extendOptions)).name&&(e.components[e.name]=t)}}return e}function ir(n,r,i,a,s){var c,u=this,l=s.options;_(a,"_uid")?(c=Object.create(a))._original=a:(c=a,a=a._original);var f=o(l._compiled),d=!f;this.data=n,this.props=r,this.children=i,this.parent=a,this.listeners=n.on||t,this.injections=nr(l.inject,a),this.slots=function(){return u.$slots||xe(a,n.scopedSlots,u.$slots=be(i,a)),u.$slots},Object.defineProperty(this,"scopedSlots",{enumerable:!0,get:function(){return xe(a,n.scopedSlots,this.slots())}}),f&&(this.$options=l,this.$slots=this.slots(),this.$scopedSlots=xe(a,n.scopedSlots,this.$slots)),l._scopeId?this._c=function(t,n,r,o){var i=re(c,t,n,r,o,d);return i&&!e(i)&&(i.fnScopeId=l._scopeId,i.fnContext=a),i}:this._c=function(t,e,n,r){return re(c,t,e,n,r,d)}}function ar(t,e,n,r,o){var i=pt(t);return i.fnContext=n,i.fnOptions=r,e.slot&&((i.data||(i.data={})).slot=e.slot),i}function sr(t,e){for(var n in e)t[w(n)]=e[n]}function cr(t){return t.name||t.__name||t._componentTag}_e(ir.prototype);var ur={init:function(t,e){if(t.componentInstance&&!t.componentInstance._isDestroyed&&t.data.keepAlive){var n=t;ur.prepatch(n,n)}else{(t.componentInstance=function(t,e){var n={_isComponent:!0,_parentVnode:t,parent:e},o=t.data.inlineTemplate;r(o)&&(n.render=o.render,n.staticRenderFns=o.staticRenderFns);return new t.componentOptions.Ctor(n)}(t,Fe)).$mount(e?t.elm:void 0,e)}},prepatch:function(e,n){var r=n.componentOptions;!function(e,n,r,o,i){var a=o.data.scopedSlots,s=e.$scopedSlots,c=!!(a&&!a.$stable||s!==t&&!s.$stable||a&&e.$scopedSlots.$key!==a.$key||!a&&e.$scopedSlots.$key),u=!!(i||e.$options._renderChildren||c),l=e.$vnode;e.$options._parentVnode=o,e.$vnode=o,e._vnode&&(e._vnode.parent=o),e.$options._renderChildren=i;var f=o.data.attrs||t;e._attrsProxy&&Oe(e._attrsProxy,f,l.data&&l.data.attrs||t,e,"$attrs")&&(u=!0),e.$attrs=f,r=r||t;var d=e.$options._parentListeners;if(e._listenersProxy&&Oe(e._listenersProxy,r,d||t,e,"$listeners"),e.$listeners=e.$options._parentListeners=r,Re(e,r,d),n&&e.$options.props){Et(!1);for(var p=e._props,v=e.$options._propKeys||[],h=0;h<v.length;h++){var m=v[h],g=e.$options.props;p[m]=wr(m,g,n,e)}Et(!0),e.$options.propsData=n}u&&(e.$slots=be(i,o.context),e.$forceUpdate())}(n.componentInstance=e.componentInstance,r.propsData,r.listeners,n,r.children)},insert:function(t){var e,n=t.context,r=t.componentInstance;r._isMounted||(r._isMounted=!0,Ve(r,"mounted")),t.data.keepAlive&&(n._isMounted?((e=r)._inactive=!1,Je.push(e)):Ue(r,!0))},destroy:function(t){var e=t.componentInstance;e._isDestroyed||(t.data.keepAlive?ze(e,!0):e.$destroy())}},lr=Object.keys(ur);function fr(i,a,c,u,l){if(!n(i)){var d=c.$options._base;if(s(i)&&(i=d.extend(i)),"function"==typeof i){var p;if(n(i.cid)&&(i=function(t,e){if(o(t.error)&&r(t.errorComp))return t.errorComp;if(r(t.resolved))return t.resolved;var i=Ne;if(i&&r(t.owners)&&-1===t.owners.indexOf(i)&&t.owners.push(i),o(t.loading)&&r(t.loadingComp))return t.loadingComp;if(i&&!r(t.owners)){var a=t.owners=[i],c=!0,u=null,l=null;i.$on("hook:destroyed",(function(){return g(a,i)}));var d=function(t){for(var e=0,n=a.length;e<n;e++)a[e].$forceUpdate();t&&(a.length=0,null!==u&&(clearTimeout(u),u=null),null!==l&&(clearTimeout(l),l=null))},p=M((function(n){t.resolved=Pe(n,e),c?a.length=0:d(!0)})),v=M((function(e){r(t.errorComp)&&(t.error=!0,d(!0))})),h=t(p,v);return s(h)&&(f(h)?n(t.resolved)&&h.then(p,v):f(h.component)&&(h.component.then(p,v),r(h.error)&&(t.errorComp=Pe(h.error,e)),r(h.loading)&&(t.loadingComp=Pe(h.loading,e),0===h.delay?t.loading=!0:u=setTimeout((function(){u=null,n(t.resolved)&&n(t.error)&&(t.loading=!0,d(!1))}),h.delay||200)),r(h.timeout)&&(l=setTimeout((function(){l=null,n(t.resolved)&&v(null)}),h.timeout)))),c=!1,t.loading?t.loadingComp:t.resolved}}(p=i,d),void 0===i))return function(t,e,n,r,o){var i=ft();return i.asyncFactory=t,i.asyncMeta={data:e,context:n,children:r,tag:o},i}(p,a,c,u,l);a=a||{},or(i),r(a.model)&&function(t,n){var o=t.model&&t.model.prop||"value",i=t.model&&t.model.event||"input";(n.attrs||(n.attrs={}))[o]=n.model.value;var a=n.on||(n.on={}),s=a[i],c=n.model.callback;r(s)?(e(s)?-1===s.indexOf(c):s!==c)&&(a[i]=[c].concat(s)):a[i]=c}(i.options,a);var v=function(t,e,o){var i=e.options.props;if(!n(i)){var a={},s=t.attrs,c=t.props;if(r(s)||r(c))for(var u in i){var l=k(u);Qt(a,c,u,l,!0)||Qt(a,s,u,l,!1)}return a}}(a,i);if(o(i.options.functional))return function(n,o,i,a,s){var c=n.options,u={},l=c.props;if(r(l))for(var f in l)u[f]=wr(f,l,o||t);else r(i.attrs)&&sr(u,i.attrs),r(i.props)&&sr(u,i.props);var d=new ir(i,u,s,a,n),p=c.render.call(null,d._c,d);if(p instanceof lt)return ar(p,i,d.parent,c);if(e(p)){for(var v=te(p)||[],h=new Array(v.length),m=0;m<v.length;m++)h[m]=ar(v[m],i,d.parent,c);return h}}(i,v,a,c,u);var h=a.on;if(a.on=a.nativeOn,o(i.options.abstract)){var m=a.slot;a={},m&&(a.slot=m)}!function(t){for(var e=t.hook||(t.hook={}),n=0;n<lr.length;n++){var r=lr[n],o=e[r],i=ur[r];o===i||o&&o._merged||(e[r]=o?dr(i,o):i)}}(a);var y=cr(i.options)||l;return new lt("vue-component-".concat(i.cid).concat(y?"-".concat(y):""),a,void 0,void 0,void 0,c,{Ctor:i,propsData:v,listeners:h,tag:l,children:u},p)}}}function dr(t,e){var n=function(n,r){t(n,r),e(n,r)};return n._merged=!0,n}var pr=j,vr=H.optionMergeStrategies;function hr(t,e){if(!e)return t;for(var n,r,o,i=st?Reflect.ownKeys(e):Object.keys(e),a=0;a<i.length;a++)"__ob__"!==(n=i[a])&&(r=t[n],o=e[n],_(t,n)?r!==o&&u(r)&&u(o)&&hr(r,o):It(t,n,o));return t}function mr(t,e,n){return n?function(){var r=a(e)?e.call(n,n):e,o=a(t)?t.call(n,n):t;return r?hr(r,o):o}:e?t?function(){return hr(a(e)?e.call(this,this):e,a(t)?t.call(this,this):t)}:e:t}function gr(t,n){var r=n?t?t.concat(n):e(n)?n:[n]:t;return r?function(t){for(var e=[],n=0;n<t.length;n++)-1===e.indexOf(t[n])&&e.push(t[n]);return e}(r):r}function yr(t,e,n,r){var o=Object.create(t||null);return e?T(o,e):o}vr.data=function(t,e,n){return n?mr(t,e,n):e&&"function"!=typeof e?t:mr(t,e)},F.forEach((function(t){vr[t]=gr})),R.forEach((function(t){vr[t+"s"]=yr})),vr.watch=function(t,n,r,o){if(t===tt&&(t=void 0),n===tt&&(n=void 0),!n)return Object.create(t||null);if(!t)return n;var i={};for(var a in T(i,t),n){var s=i[a],c=n[a];s&&!e(s)&&(s=[s]),i[a]=s?s.concat(c):e(c)?c:[c]}return i},vr.props=vr.methods=vr.inject=vr.computed=function(t,e,n,r){if(!t)return e;var o=Object.create(null);return T(o,t),e&&T(o,e),o},vr.provide=mr;var _r=function(t,e){return void 0===e?t:e};function br(t,n,r){if(a(n)&&(n=n.options),function(t,n){var r=t.props;if(r){var o,i,a={};if(e(r))for(o=r.length;o--;)"string"==typeof(i=r[o])&&(a[w(i)]={type:null});else if(u(r))for(var s in r)i=r[s],a[w(s)]=u(i)?i:{type:i};t.props=a}}(n),function(t,n){var r=t.inject;if(r){var o=t.inject={};if(e(r))for(var i=0;i<r.length;i++)o[r[i]]={from:r[i]};else if(u(r))for(var a in r){var s=r[a];o[a]=u(s)?T({from:a},s):{from:s}}}}(n),function(t){var e=t.directives;if(e)for(var n in e){var r=e[n];a(r)&&(e[n]={bind:r,update:r})}}(n),!n._base&&(n.extends&&(t=br(t,n.extends,r)),n.mixins))for(var o=0,i=n.mixins.length;o<i;o++)t=br(t,n.mixins[o],r);var s,c={};for(s in t)l(s);for(s in n)_(t,s)||l(s);function l(e){var o=vr[e]||_r;c[e]=o(t[e],n[e],r,e)}return c}function $r(t,e,n,r){if("string"==typeof n){var o=t[e];if(_(o,n))return o[n];var i=w(n);if(_(o,i))return o[i];var a=x(i);return _(o,a)?o[a]:o[n]||o[i]||o[a]}}function wr(t,e,n,r){var o=e[t],i=!_(n,t),s=n[t],c=Sr(Boolean,o.type);if(c>-1)if(i&&!_(o,"default"))s=!1;else if(""===s||s===k(t)){var u=Sr(String,o.type);(u<0||c<u)&&(s=!0)}if(void 0===s){s=function(t,e,n){if(!_(e,"default"))return;var r=e.default;if(t&&t.$options.propsData&&void 0===t.$options.propsData[n]&&void 0!==t._props[n])return t._props[n];return a(r)&&"Function"!==Cr(e.type)?r.call(t):r}(r,o,t);var l=jt;Et(!0),Dt(s),Et(l)}return s}var xr=/^\s*function (\w+)/;function Cr(t){var e=t&&t.toString().match(xr);return e?e[1]:""}function kr(t,e){return Cr(t)===Cr(e)}function Sr(t,n){if(!e(n))return kr(n,t)?0:-1;for(var r=0,o=n.length;r<o;r++)if(kr(n[r],t))return r;return-1}function Or(t){this._init(t)}function Tr(t){t.cid=0;var e=1;t.extend=function(t){t=t||{};var n=this,r=n.cid,o=t._Ctor||(t._Ctor={});if(o[r])return o[r];var i=cr(t)||cr(n.options),a=function(t){this._init(t)};return(a.prototype=Object.create(n.prototype)).constructor=a,a.cid=e++,a.options=br(n.options,t),a.super=n,a.options.props&&function(t){var e=t.options.props;for(var n in e)Zn(t.prototype,"_props",n)}(a),a.options.computed&&function(t){var e=t.options.computed;for(var n in e)Yn(t.prototype,n,e[n])}(a),a.extend=n.extend,a.mixin=n.mixin,a.use=n.use,R.forEach((function(t){a[t]=n[t]})),i&&(a.options.components[i]=a),a.superOptions=n.options,a.extendOptions=t,a.sealedOptions=T({},a.options),o[r]=a,a}}function Ar(t){return t&&(cr(t.Ctor.options)||t.tag)}function jr(t,n){return e(t)?t.indexOf(n)>-1:"string"==typeof t?t.split(",").indexOf(n)>-1:(r=t,"[object RegExp]"===c.call(r)&&t.test(n));var r}function Er(t,e){var n=t.cache,r=t.keys,o=t._vnode;for(var i in n){var a=n[i];if(a){var s=a.name;s&&!e(s)&&Nr(n,i,r,o)}}}function Nr(t,e,n,r){var o=t[e];!o||r&&o.tag===r.tag||o.componentInstance.$destroy(),t[e]=null,g(n,e)}!function(e){e.prototype._init=function(e){var n=this;n._uid=rr++,n._isVue=!0,n.__v_skip=!0,n._scope=new dn(!0),n._scope._vm=!0,e&&e._isComponent?function(t,e){var n=t.$options=Object.create(t.constructor.options),r=e._parentVnode;n.parent=e.parent,n._parentVnode=r;var o=r.componentOptions;n.propsData=o.propsData,n._parentListeners=o.listeners,n._renderChildren=o.children,n._componentTag=o.tag,e.render&&(n.render=e.render,n.staticRenderFns=e.staticRenderFns)}(n,e):n.$options=br(or(n.constructor),e||{},n),n._renderProxy=n,n._self=n,function(t){var e=t.$options,n=e.parent;if(n&&!e.abstract){for(;n.$options.abstract&&n.$parent;)n=n.$parent;n.$children.push(t)}t.$parent=n,t.$root=n?n.$root:t,t.$children=[],t.$refs={},t._provided=n?n._provided:Object.create(null),t._watcher=null,t._inactive=null,t._directInactive=!1,t._isMounted=!1,t._isDestroyed=!1,t._isBeingDestroyed=!1}(n),function(t){t._events=Object.create(null),t._hasHookEvent=!1;var e=t.$options._parentListeners;e&&Re(t,e)}(n),function(e){e._vnode=null,e._staticTrees=null;var n=e.$options,r=e.$vnode=n._parentVnode,o=r&&r.context;e.$slots=be(n._renderChildren,o),e.$scopedSlots=r?xe(e.$parent,r.data.scopedSlots,e.$slots):t,e._c=function(t,n,r,o){return re(e,t,n,r,o,!1)},e.$createElement=function(t,n,r,o){return re(e,t,n,r,o,!0)};var i=r&&r.data;Mt(e,"$attrs",i&&i.attrs||t,null,!0),Mt(e,"$listeners",n._parentListeners||t,null,!0)}(n),Ve(n,"beforeCreate",void 0,!1),function(t){var e=nr(t.$options.inject,t);e&&(Et(!1),Object.keys(e).forEach((function(n){Mt(t,n,e[n])})),Et(!0))}(n),Gn(n),function(t){var e=t.$options.provide;if(e){var n=a(e)?e.call(t):e;if(!s(n))return;for(var r=pn(t),o=st?Reflect.ownKeys(n):Object.keys(n),i=0;i<o.length;i++){var c=o[i];Object.defineProperty(r,c,Object.getOwnPropertyDescriptor(n,c))}}}(n),Ve(n,"created"),n.$options.el&&n.$mount(n.$options.el)}}(Or),function(t){var e={get:function(){return this._data}},n={get:function(){return this._props}};Object.defineProperty(t.prototype,"$data",e),Object.defineProperty(t.prototype,"$props",n),t.prototype.$set=It,t.prototype.$delete=Lt,t.prototype.$watch=function(t,e,n){var r=this;if(u(e))return er(r,t,e,n);(n=n||{}).user=!0;var o=new Wn(r,t,e,n);if(n.immediate){var i='callback for immediate watcher "'.concat(o.expression,'"');yt(),hn(e,r,[o.value],r,i),_t()}return function(){o.teardown()}}}(Or),function(t){var n=/^hook:/;t.prototype.$on=function(t,r){var o=this;if(e(t))for(var i=0,a=t.length;i<a;i++)o.$on(t[i],r);else(o._events[t]||(o._events[t]=[])).push(r),n.test(t)&&(o._hasHookEvent=!0);return o},t.prototype.$once=function(t,e){var n=this;function r(){n.$off(t,r),e.apply(n,arguments)}return r.fn=e,n.$on(t,r),n},t.prototype.$off=function(t,n){var r=this;if(!arguments.length)return r._events=Object.create(null),r;if(e(t)){for(var o=0,i=t.length;o<i;o++)r.$off(t[o],n);return r}var a,s=r._events[t];if(!s)return r;if(!n)return r._events[t]=null,r;for(var c=s.length;c--;)if((a=s[c])===n||a.fn===n){s.splice(c,1);break}return r},t.prototype.$emit=function(t){var e=this,n=e._events[t];if(n){n=n.length>1?O(n):n;for(var r=O(arguments,1),o='event handler for "'.concat(t,'"'),i=0,a=n.length;i<a;i++)hn(n[i],e,r,e,o)}return e}}(Or),function(t){t.prototype._update=function(t,e){var n=this,r=n.$el,o=n._vnode,i=He(n);n._vnode=t,n.$el=o?n.__patch__(o,t):n.__patch__(n.$el,t,e,!1),i(),r&&(r.__vue__=null),n.$el&&(n.$el.__vue__=n);for(var a=n;a&&a.$vnode&&a.$parent&&a.$vnode===a.$parent._vnode;)a.$parent.$el=a.$el,a=a.$parent},t.prototype.$forceUpdate=function(){this._watcher&&this._watcher.update()},t.prototype.$destroy=function(){var t=this;if(!t._isBeingDestroyed){Ve(t,"beforeDestroy"),t._isBeingDestroyed=!0;var e=t.$parent;!e||e._isBeingDestroyed||t.$options.abstract||g(e.$children,t),t._scope.stop(),t._data.__ob__&&t._data.__ob__.vmCount--,t._isDestroyed=!0,t.__patch__(t._vnode,null),Ve(t,"destroyed"),t.$off(),t.$el&&(t.$el.__vue__=null),t.$vnode&&(t.$vnode.parent=null)}}}(Or),function(t){_e(t.prototype),t.prototype.$nextTick=function(t){return On(t,this)},t.prototype._render=function(){var t,n=this,r=n.$options,o=r.render,i=r._parentVnode;i&&n._isMounted&&(n.$scopedSlots=xe(n.$parent,i.data.scopedSlots,n.$slots,n.$scopedSlots),n._slotsProxy&&Ae(n._slotsProxy,n.$scopedSlots)),n.$vnode=i;try{ut(n),Ne=n,t=o.call(n._renderProxy,n.$createElement)}catch(e){vn(e,n,"render"),t=n._vnode}finally{Ne=null,ut()}return e(t)&&1===t.length&&(t=t[0]),t instanceof lt||(t=ft()),t.parent=i,t}}(Or);var Pr=[String,RegExp,Array],Dr={name:"keep-alive",abstract:!0,props:{include:Pr,exclude:Pr,max:[String,Number]},methods:{cacheVNode:function(){var t=this,e=t.cache,n=t.keys,r=t.vnodeToCache,o=t.keyToCache;if(r){var i=r.tag,a=r.componentInstance,s=r.componentOptions;e[o]={name:Ar(s),tag:i,componentInstance:a},n.push(o),this.max&&n.length>parseInt(this.max)&&Nr(e,n[0],n,this._vnode),this.vnodeToCache=null}}},created:function(){this.cache=Object.create(null),this.keys=[]},destroyed:function(){for(var t in this.cache)Nr(this.cache,t,this.keys)},mounted:function(){var t=this;this.cacheVNode(),this.$watch("include",(function(e){Er(t,(function(t){return jr(e,t)}))})),this.$watch("exclude",(function(e){Er(t,(function(t){return!jr(e,t)}))}))},updated:function(){this.cacheVNode()},render:function(){var t=this.$slots.default,e=De(t),n=e&&e.componentOptions;if(n){var r=Ar(n),o=this.include,i=this.exclude;if(o&&(!r||!jr(o,r))||i&&r&&jr(i,r))return e;var a=this.cache,s=this.keys,c=null==e.key?n.Ctor.cid+(n.tag?"::".concat(n.tag):""):e.key;a[c]?(e.componentInstance=a[c].componentInstance,g(s,c),s.push(c)):(this.vnodeToCache=e,this.keyToCache=c),e.data.keepAlive=!0}return e||t&&t[0]}},Mr={KeepAlive:Dr};!function(t){var e={get:function(){return H}};Object.defineProperty(t,"config",e),t.util={warn:pr,extend:T,mergeOptions:br,defineReactive:Mt},t.set=It,t.delete=Lt,t.nextTick=On,t.observable=function(t){return Dt(t),t},t.options=Object.create(null),R.forEach((function(e){t.options[e+"s"]=Object.create(null)})),t.options._base=t,T(t.options.components,Mr),function(t){t.use=function(t){var e=this._installedPlugins||(this._installedPlugins=[]);if(e.indexOf(t)>-1)return this;var n=O(arguments,1);return n.unshift(this),a(t.install)?t.install.apply(t,n):a(t)&&t.apply(null,n),e.push(t),this}}(t),function(t){t.mixin=function(t){return this.options=br(this.options,t),this}}(t),Tr(t),function(t){R.forEach((function(e){t[e]=function(t,n){return n?("component"===e&&u(n)&&(n.name=n.name||t,n=this.options._base.extend(n)),"directive"===e&&a(n)&&(n={bind:n,update:n}),this.options[e+"s"][t]=n,n):this.options[e+"s"][t]}}))}(t)}(Or),Object.defineProperty(Or.prototype,"$isServer",{get:rt}),Object.defineProperty(Or.prototype,"$ssrContext",{get:function(){return this.$vnode&&this.$vnode.ssrContext}}),Object.defineProperty(Or,"FunctionalRenderContext",{value:ir}),Or.version=Bn;var Ir=v("style,class"),Lr=v("input,textarea,option,select,progress"),Rr=function(t,e,n){return"value"===n&&Lr(t)&&"button"!==e||"selected"===n&&"option"===t||"checked"===n&&"input"===t||"muted"===n&&"video"===t},Fr=v("contenteditable,draggable,spellcheck"),Hr=v("events,caret,typing,plaintext-only"),Br=v("allowfullscreen,async,autofocus,autoplay,checked,compact,controls,declare,default,defaultchecked,defaultmuted,defaultselected,defer,disabled,enabled,formnovalidate,hidden,indeterminate,inert,ismap,itemscope,loop,multiple,muted,nohref,noresize,noshade,novalidate,nowrap,open,pauseonexit,readonly,required,reversed,scoped,seamless,selected,sortable,truespeed,typemustmatch,visible"),Ur="http://www.w3.org/1999/xlink",zr=function(t){return":"===t.charAt(5)&&"xlink"===t.slice(0,5)},Vr=function(t){return zr(t)?t.slice(6,t.length):""},Kr=function(t){return null==t||!1===t};function Jr(t){for(var e=t.data,n=t,o=t;r(o.componentInstance);)(o=o.componentInstance._vnode)&&o.data&&(e=Wr(o.data,e));for(;r(n=n.parent);)n&&n.data&&(e=Wr(e,n.data));return function(t,e){if(r(t)||r(e))return qr(t,Zr(e));return""}(e.staticClass,e.class)}function Wr(t,e){return{staticClass:qr(t.staticClass,e.staticClass),class:r(t.class)?[t.class,e.class]:e.class}}function qr(t,e){return t?e?t+" "+e:t:e||""}function Zr(t){return Array.isArray(t)?function(t){for(var e,n="",o=0,i=t.length;o<i;o++)r(e=Zr(t[o]))&&""!==e&&(n&&(n+=" "),n+=e);return n}(t):s(t)?function(t){var e="";for(var n in t)t[n]&&(e&&(e+=" "),e+=n);return e}(t):"string"==typeof t?t:""}var Gr={svg:"http://www.w3.org/2000/svg",math:"http://www.w3.org/1998/Math/MathML"},Xr=v("html,body,base,head,link,meta,style,title,address,article,aside,footer,header,h1,h2,h3,h4,h5,h6,hgroup,nav,section,div,dd,dl,dt,figcaption,figure,picture,hr,img,li,main,ol,p,pre,ul,a,b,abbr,bdi,bdo,br,cite,code,data,dfn,em,i,kbd,mark,q,rp,rt,rtc,ruby,s,samp,small,span,strong,sub,sup,time,u,var,wbr,area,audio,map,track,video,embed,object,param,source,canvas,script,noscript,del,ins,caption,col,colgroup,table,thead,tbody,td,th,tr,button,datalist,fieldset,form,input,label,legend,meter,optgroup,option,output,progress,select,textarea,details,dialog,menu,menuitem,summary,content,element,shadow,template,blockquote,iframe,tfoot"),Yr=v("svg,animate,circle,clippath,cursor,defs,desc,ellipse,filter,font-face,foreignobject,g,glyph,image,line,marker,mask,missing-glyph,path,pattern,polygon,polyline,rect,switch,symbol,text,textpath,tspan,use,view",!0),Qr=function(t){return Xr(t)||Yr(t)};function to(t){return Yr(t)?"svg":"math"===t?"math":void 0}var eo=Object.create(null);var no=v("text,number,password,search,email,tel,url");function ro(t){if("string"==typeof t){var e=document.querySelector(t);return e||document.createElement("div")}return t}var oo=Object.freeze({__proto__:null,createElement:function(t,e){var n=document.createElement(t);return"select"!==t||e.data&&e.data.attrs&&void 0!==e.data.attrs.multiple&&n.setAttribute("multiple","multiple"),n},createElementNS:function(t,e){return document.createElementNS(Gr[t],e)},createTextNode:function(t){return document.createTextNode(t)},createComment:function(t){return document.createComment(t)},insertBefore:function(t,e,n){t.insertBefore(e,n)},removeChild:function(t,e){t.removeChild(e)},appendChild:function(t,e){t.appendChild(e)},parentNode:function(t){return t.parentNode},nextSibling:function(t){return t.nextSibling},tagName:function(t){return t.tagName},setTextContent:function(t,e){t.textContent=e},setStyleScope:function(t,e){t.setAttribute(e,"")}}),io={create:function(t,e){ao(e)},update:function(t,e){t.data.ref!==e.data.ref&&(ao(t,!0),ao(e))},destroy:function(t){ao(t,!0)}};function ao(t,n){var o=t.data.ref;if(r(o)){var i=t.context,s=t.componentInstance||t.elm,c=n?null:s,u=n?void 0:s;if(a(o))hn(o,i,[c],i,"template ref function");else{var l=t.data.refInFor,f="string"==typeof o||"number"==typeof o,d=Ht(o),p=i.$refs;if(f||d)if(l){var v=f?p[o]:o.value;n?e(v)&&g(v,s):e(v)?v.includes(s)||v.push(s):f?(p[o]=[s],so(i,o,p[o])):o.value=[s]}else if(f){if(n&&p[o]!==s)return;p[o]=u,so(i,o,c)}else if(d){if(n&&o.value!==s)return;o.value=c}}}}function so(t,e,n){var r=t._setupState;r&&_(r,e)&&(Ht(r[e])?r[e].value=n:r[e]=n)}var co=new lt("",{},[]),uo=["create","activate","update","remove","destroy"];function lo(t,e){return t.key===e.key&&t.asyncFactory===e.asyncFactory&&(t.tag===e.tag&&t.isComment===e.isComment&&r(t.data)===r(e.data)&&function(t,e){if("input"!==t.tag)return!0;var n,o=r(n=t.data)&&r(n=n.attrs)&&n.type,i=r(n=e.data)&&r(n=n.attrs)&&n.type;return o===i||no(o)&&no(i)}(t,e)||o(t.isAsyncPlaceholder)&&n(e.asyncFactory.error))}function fo(t,e,n){var o,i,a={};for(o=e;o<=n;++o)r(i=t[o].key)&&(a[i]=o);return a}var po={create:vo,update:vo,destroy:function(t){vo(t,co)}};function vo(t,e){(t.data.directives||e.data.directives)&&function(t,e){var n,r,o,i=t===co,a=e===co,s=mo(t.data.directives,t.context),c=mo(e.data.directives,e.context),u=[],l=[];for(n in c)r=s[n],o=c[n],r?(o.oldValue=r.value,o.oldArg=r.arg,yo(o,"update",e,t),o.def&&o.def.componentUpdated&&l.push(o)):(yo(o,"bind",e,t),o.def&&o.def.inserted&&u.push(o));if(u.length){var f=function(){for(var n=0;n<u.length;n++)yo(u[n],"inserted",e,t)};i?Yt(e,"insert",f):f()}l.length&&Yt(e,"postpatch",(function(){for(var n=0;n<l.length;n++)yo(l[n],"componentUpdated",e,t)}));if(!i)for(n in s)c[n]||yo(s[n],"unbind",t,t,a)}(t,e)}var ho=Object.create(null);function mo(t,e){var n,r,o=Object.create(null);if(!t)return o;for(n=0;n<t.length;n++){if((r=t[n]).modifiers||(r.modifiers=ho),o[go(r)]=r,e._setupState&&e._setupState.__sfc){var i=r.def||$r(e,"_setupState","v-"+r.name);r.def="function"==typeof i?{bind:i,update:i}:i}r.def=r.def||$r(e.$options,"directives",r.name)}return o}function go(t){return t.rawName||"".concat(t.name,".").concat(Object.keys(t.modifiers||{}).join("."))}function yo(t,e,n,r,o){var i=t.def&&t.def[e];if(i)try{i(n.elm,t,n,r,o)}catch(r){vn(r,n.context,"directive ".concat(t.name," ").concat(e," hook"))}}var _o=[io,po];function bo(t,e){var i=e.componentOptions;if(!(r(i)&&!1===i.Ctor.options.inheritAttrs||n(t.data.attrs)&&n(e.data.attrs))){var a,s,c=e.elm,u=t.data.attrs||{},l=e.data.attrs||{};for(a in(r(l.__ob__)||o(l._v_attr_proxy))&&(l=e.data.attrs=T({},l)),l)s=l[a],u[a]!==s&&$o(c,a,s,e.data.pre);for(a in(q||G)&&l.value!==u.value&&$o(c,"value",l.value),u)n(l[a])&&(zr(a)?c.removeAttributeNS(Ur,Vr(a)):Fr(a)||c.removeAttribute(a))}}function $o(t,e,n,r){r||t.tagName.indexOf("-")>-1?wo(t,e,n):Br(e)?Kr(n)?t.removeAttribute(e):(n="allowfullscreen"===e&&"EMBED"===t.tagName?"true":e,t.setAttribute(e,n)):Fr(e)?t.setAttribute(e,function(t,e){return Kr(e)||"false"===e?"false":"contenteditable"===t&&Hr(e)?e:"true"}(e,n)):zr(e)?Kr(n)?t.removeAttributeNS(Ur,Vr(e)):t.setAttributeNS(Ur,e,n):wo(t,e,n)}function wo(t,e,n){if(Kr(n))t.removeAttribute(e);else{if(q&&!Z&&"TEXTAREA"===t.tagName&&"placeholder"===e&&""!==n&&!t.__ieph){var r=function(e){e.stopImmediatePropagation(),t.removeEventListener("input",r)};t.addEventListener("input",r),t.__ieph=!0}t.setAttribute(e,n)}}var xo={create:bo,update:bo};function Co(t,e){var o=e.elm,i=e.data,a=t.data;if(!(n(i.staticClass)&&n(i.class)&&(n(a)||n(a.staticClass)&&n(a.class)))){var s=Jr(e),c=o._transitionClasses;r(c)&&(s=qr(s,Zr(c))),s!==o._prevClass&&(o.setAttribute("class",s),o._prevClass=s)}}var ko,So,Oo,To,Ao,jo,Eo={create:Co,update:Co},No=/[\w).+\-_$\]]/;function Po(t){var e,n,r,o,i,a=!1,s=!1,c=!1,u=!1,l=0,f=0,d=0,p=0;for(r=0;r<t.length;r++)if(n=e,e=t.charCodeAt(r),a)39===e&&92!==n&&(a=!1);else if(s)34===e&&92!==n&&(s=!1);else if(c)96===e&&92!==n&&(c=!1);else if(u)47===e&&92!==n&&(u=!1);else if(124!==e||124===t.charCodeAt(r+1)||124===t.charCodeAt(r-1)||l||f||d){switch(e){case 34:s=!0;break;case 39:a=!0;break;case 96:c=!0;break;case 40:d++;break;case 41:d--;break;case 91:f++;break;case 93:f--;break;case 123:l++;break;case 125:l--}if(47===e){for(var v=r-1,h=void 0;v>=0&&" "===(h=t.charAt(v));v--);h&&No.test(h)||(u=!0)}}else void 0===o?(p=r+1,o=t.slice(0,r).trim()):m();function m(){(i||(i=[])).push(t.slice(p,r).trim()),p=r+1}if(void 0===o?o=t.slice(0,r).trim():0!==p&&m(),i)for(r=0;r<i.length;r++)o=Do(o,i[r]);return o}function Do(t,e){var n=e.indexOf("(");if(n<0)return'_f("'.concat(e,'")(').concat(t,")");var r=e.slice(0,n),o=e.slice(n+1);return'_f("'.concat(r,'")(').concat(t).concat(")"!==o?","+o:o)}function Mo(t,e){console.error("[Vue compiler]: ".concat(t))}function Io(t,e){return t?t.map((function(t){return t[e]})).filter((function(t){return t})):[]}function Lo(t,e,n,r,o){(t.props||(t.props=[])).push(Jo({name:e,value:n,dynamic:o},r)),t.plain=!1}function Ro(t,e,n,r,o){(o?t.dynamicAttrs||(t.dynamicAttrs=[]):t.attrs||(t.attrs=[])).push(Jo({name:e,value:n,dynamic:o},r)),t.plain=!1}function Fo(t,e,n,r){t.attrsMap[e]=n,t.attrsList.push(Jo({name:e,value:n},r))}function Ho(t,e,n,r,o,i,a,s){(t.directives||(t.directives=[])).push(Jo({name:e,rawName:n,value:r,arg:o,isDynamicArg:i,modifiers:a},s)),t.plain=!1}function Bo(t,e,n){return n?"_p(".concat(e,',"').concat(t,'")'):t+e}function Uo(e,n,r,o,i,a,s,c){var u;(o=o||t).right?c?n="(".concat(n,")==='click'?'contextmenu':(").concat(n,")"):"click"===n&&(n="contextmenu",delete o.right):o.middle&&(c?n="(".concat(n,")==='click'?'mouseup':(").concat(n,")"):"click"===n&&(n="mouseup")),o.capture&&(delete o.capture,n=Bo("!",n,c)),o.once&&(delete o.once,n=Bo("~",n,c)),o.passive&&(delete o.passive,n=Bo("&",n,c)),o.native?(delete o.native,u=e.nativeEvents||(e.nativeEvents={})):u=e.events||(e.events={});var l=Jo({value:r.trim(),dynamic:c},s);o!==t&&(l.modifiers=o);var f=u[n];Array.isArray(f)?i?f.unshift(l):f.push(l):u[n]=f?i?[l,f]:[f,l]:l,e.plain=!1}function zo(t,e,n){var r=Vo(t,":"+e)||Vo(t,"v-bind:"+e);if(null!=r)return Po(r);if(!1!==n){var o=Vo(t,e);if(null!=o)return JSON.stringify(o)}}function Vo(t,e,n){var r;if(null!=(r=t.attrsMap[e]))for(var o=t.attrsList,i=0,a=o.length;i<a;i++)if(o[i].name===e){o.splice(i,1);break}return n&&delete t.attrsMap[e],r}function Ko(t,e){for(var n=t.attrsList,r=0,o=n.length;r<o;r++){var i=n[r];if(e.test(i.name))return n.splice(r,1),i}}function Jo(t,e){return e&&(null!=e.start&&(t.start=e.start),null!=e.end&&(t.end=e.end)),t}function Wo(t,e,n){var r=n||{},o=r.number,i="$$v",a=i;r.trim&&(a="(typeof ".concat(i," === 'string'")+"? ".concat(i,".trim()")+": ".concat(i,")")),o&&(a="_n(".concat(a,")"));var s=qo(e,a);t.model={value:"(".concat(e,")"),expression:JSON.stringify(e),callback:"function (".concat(i,") {").concat(s,"}")}}function qo(t,e){var n=function(t){if(t=t.trim(),ko=t.length,t.indexOf("[")<0||t.lastIndexOf("]")<ko-1)return(To=t.lastIndexOf("."))>-1?{exp:t.slice(0,To),key:'"'+t.slice(To+1)+'"'}:{exp:t,key:null};So=t,To=Ao=jo=0;for(;!Go();)Xo(Oo=Zo())?Qo(Oo):91===Oo&&Yo(Oo);return{exp:t.slice(0,Ao),key:t.slice(Ao+1,jo)}}(t);return null===n.key?"".concat(t,"=").concat(e):"$set(".concat(n.exp,", ").concat(n.key,", ").concat(e,")")}function Zo(){return So.charCodeAt(++To)}function Go(){return To>=ko}function Xo(t){return 34===t||39===t}function Yo(t){var e=1;for(Ao=To;!Go();)if(Xo(t=Zo()))Qo(t);else if(91===t&&e++,93===t&&e--,0===e){jo=To;break}}function Qo(t){for(var e=t;!Go()&&(t=Zo())!==e;);}var ti,ei="__r";function ni(t,e,n){var r=ti;return function o(){var i=e.apply(null,arguments);null!==i&&ii(t,o,n,r)}}var ri=_n&&!(Q&&Number(Q[1])<=53);function oi(t,e,n,r){if(ri){var o=Xe,i=e;e=i._wrapper=function(t){if(t.target===t.currentTarget||t.timeStamp>=o||t.timeStamp<=0||t.target.ownerDocument!==document)return i.apply(this,arguments)}}ti.addEventListener(t,e,et?{capture:n,passive:r}:n)}function ii(t,e,n,r){(r||ti).removeEventListener(t,e._wrapper||e,n)}function ai(t,e){if(!n(t.data.on)||!n(e.data.on)){var o=e.data.on||{},i=t.data.on||{};ti=e.elm||t.elm,function(t){if(r(t.__r)){var e=q?"change":"input";t[e]=[].concat(t.__r,t[e]||[]),delete t.__r}r(t.__c)&&(t.change=[].concat(t.__c,t.change||[]),delete t.__c)}(o),Xt(o,i,oi,ii,ni,e.context),ti=void 0}}var si,ci={create:ai,update:ai,destroy:function(t){return ai(t,co)}};function ui(t,e){if(!n(t.data.domProps)||!n(e.data.domProps)){var i,a,s=e.elm,c=t.data.domProps||{},u=e.data.domProps||{};for(i in(r(u.__ob__)||o(u._v_attr_proxy))&&(u=e.data.domProps=T({},u)),c)i in u||(s[i]="");for(i in u){if(a=u[i],"textContent"===i||"innerHTML"===i){if(e.children&&(e.children.length=0),a===c[i])continue;1===s.childNodes.length&&s.removeChild(s.childNodes[0])}if("value"===i&&"PROGRESS"!==s.tagName){s._value=a;var l=n(a)?"":String(a);li(s,l)&&(s.value=l)}else if("innerHTML"===i&&Yr(s.tagName)&&n(s.innerHTML)){(si=si||document.createElement("div")).innerHTML="<svg>".concat(a,"</svg>");for(var f=si.firstChild;s.firstChild;)s.removeChild(s.firstChild);for(;f.firstChild;)s.appendChild(f.firstChild)}else if(a!==c[i])try{s[i]=a}catch(t){}}}}function li(t,e){return!t.composing&&("OPTION"===t.tagName||function(t,e){var n=!0;try{n=document.activeElement!==t}catch(t){}return n&&t.value!==e}(t,e)||function(t,e){var n=t.value,o=t._vModifiers;if(r(o)){if(o.number)return p(n)!==p(e);if(o.trim)return n.trim()!==e.trim()}return n!==e}(t,e))}var fi={create:ui,update:ui},di=b((function(t){var e={},n=/:(.+)/;return t.split(/;(?![^(]*\))/g).forEach((function(t){if(t){var r=t.split(n);r.length>1&&(e[r[0].trim()]=r[1].trim())}})),e}));function pi(t){var e=vi(t.style);return t.staticStyle?T(t.staticStyle,e):e}function vi(t){return Array.isArray(t)?A(t):"string"==typeof t?di(t):t}var hi,mi=/^--/,gi=/\s*!important$/,yi=function(t,e,n){if(mi.test(e))t.style.setProperty(e,n);else if(gi.test(n))t.style.setProperty(k(e),n.replace(gi,""),"important");else{var r=bi(e);if(Array.isArray(n))for(var o=0,i=n.length;o<i;o++)t.style[r]=n[o];else t.style[r]=n}},_i=["Webkit","Moz","ms"],bi=b((function(t){if(hi=hi||document.createElement("div").style,"filter"!==(t=w(t))&&t in hi)return t;for(var e=t.charAt(0).toUpperCase()+t.slice(1),n=0;n<_i.length;n++){var r=_i[n]+e;if(r in hi)return r}}));function $i(t,e){var o=e.data,i=t.data;if(!(n(o.staticStyle)&&n(o.style)&&n(i.staticStyle)&&n(i.style))){var a,s,c=e.elm,u=i.staticStyle,l=i.normalizedStyle||i.style||{},f=u||l,d=vi(e.data.style)||{};e.data.normalizedStyle=r(d.__ob__)?T({},d):d;var p=function(t,e){var n,r={};if(e)for(var o=t;o.componentInstance;)(o=o.componentInstance._vnode)&&o.data&&(n=pi(o.data))&&T(r,n);(n=pi(t.data))&&T(r,n);for(var i=t;i=i.parent;)i.data&&(n=pi(i.data))&&T(r,n);return r}(e,!0);for(s in f)n(p[s])&&yi(c,s,"");for(s in p)(a=p[s])!==f[s]&&yi(c,s,null==a?"":a)}}var wi={create:$i,update:$i},xi=/\s+/;function Ci(t,e){if(e&&(e=e.trim()))if(t.classList)e.indexOf(" ")>-1?e.split(xi).forEach((function(e){return t.classList.add(e)})):t.classList.add(e);else{var n=" ".concat(t.getAttribute("class")||""," ");n.indexOf(" "+e+" ")<0&&t.setAttribute("class",(n+e).trim())}}function ki(t,e){if(e&&(e=e.trim()))if(t.classList)e.indexOf(" ")>-1?e.split(xi).forEach((function(e){return t.classList.remove(e)})):t.classList.remove(e),t.classList.length||t.removeAttribute("class");else{for(var n=" ".concat(t.getAttribute("class")||""," "),r=" "+e+" ";n.indexOf(r)>=0;)n=n.replace(r," ");(n=n.trim())?t.setAttribute("class",n):t.removeAttribute("class")}}function Si(t){if(t){if("object"==typeof t){var e={};return!1!==t.css&&T(e,Oi(t.name||"v")),T(e,t),e}return"string"==typeof t?Oi(t):void 0}}var Oi=b((function(t){return{enterClass:"".concat(t,"-enter"),enterToClass:"".concat(t,"-enter-to"),enterActiveClass:"".concat(t,"-enter-active"),leaveClass:"".concat(t,"-leave"),leaveToClass:"".concat(t,"-leave-to"),leaveActiveClass:"".concat(t,"-leave-active")}})),Ti=J&&!Z,Ai="transition",ji="animation",Ei="transition",Ni="transitionend",Pi="animation",Di="animationend";Ti&&(void 0===window.ontransitionend&&void 0!==window.onwebkittransitionend&&(Ei="WebkitTransition",Ni="webkitTransitionEnd"),void 0===window.onanimationend&&void 0!==window.onwebkitanimationend&&(Pi="WebkitAnimation",Di="webkitAnimationEnd"));var Mi=J?window.requestAnimationFrame?window.requestAnimationFrame.bind(window):setTimeout:function(t){return t()};function Ii(t){Mi((function(){Mi(t)}))}function Li(t,e){var n=t._transitionClasses||(t._transitionClasses=[]);n.indexOf(e)<0&&(n.push(e),Ci(t,e))}function Ri(t,e){t._transitionClasses&&g(t._transitionClasses,e),ki(t,e)}function Fi(t,e,n){var r=Bi(t,e),o=r.type,i=r.timeout,a=r.propCount;if(!o)return n();var s=o===Ai?Ni:Di,c=0,u=function(){t.removeEventListener(s,l),n()},l=function(e){e.target===t&&++c>=a&&u()};setTimeout((function(){c<a&&u()}),i+1),t.addEventListener(s,l)}var Hi=/\b(transform|all)(,|$)/;function Bi(t,e){var n,r=window.getComputedStyle(t),o=(r[Ei+"Delay"]||"").split(", "),i=(r[Ei+"Duration"]||"").split(", "),a=Ui(o,i),s=(r[Pi+"Delay"]||"").split(", "),c=(r[Pi+"Duration"]||"").split(", "),u=Ui(s,c),l=0,f=0;return e===Ai?a>0&&(n=Ai,l=a,f=i.length):e===ji?u>0&&(n=ji,l=u,f=c.length):f=(n=(l=Math.max(a,u))>0?a>u?Ai:ji:null)?n===Ai?i.length:c.length:0,{type:n,timeout:l,propCount:f,hasTransform:n===Ai&&Hi.test(r[Ei+"Property"])}}function Ui(t,e){for(;t.length<e.length;)t=t.concat(t);return Math.max.apply(null,e.map((function(e,n){return zi(e)+zi(t[n])})))}function zi(t){return 1e3*Number(t.slice(0,-1).replace(",","."))}function Vi(t,e){var o=t.elm;r(o._leaveCb)&&(o._leaveCb.cancelled=!0,o._leaveCb());var i=Si(t.data.transition);if(!n(i)&&!r(o._enterCb)&&1===o.nodeType){for(var c=i.css,u=i.type,l=i.enterClass,f=i.enterToClass,d=i.enterActiveClass,v=i.appearClass,h=i.appearToClass,m=i.appearActiveClass,g=i.beforeEnter,y=i.enter,_=i.afterEnter,b=i.enterCancelled,$=i.beforeAppear,w=i.appear,x=i.afterAppear,C=i.appearCancelled,k=i.duration,S=Fe,O=Fe.$vnode;O&&O.parent;)S=O.context,O=O.parent;var T=!S._isMounted||!t.isRootInsert;if(!T||w||""===w){var A=T&&v?v:l,j=T&&m?m:d,E=T&&h?h:f,N=T&&$||g,P=T&&a(w)?w:y,D=T&&x||_,I=T&&C||b,L=p(s(k)?k.enter:k),R=!1!==c&&!Z,F=Wi(P),H=o._enterCb=M((function(){R&&(Ri(o,E),Ri(o,j)),H.cancelled?(R&&Ri(o,A),I&&I(o)):D&&D(o),o._enterCb=null}));t.data.show||Yt(t,"insert",(function(){var e=o.parentNode,n=e&&e._pending&&e._pending[t.key];n&&n.tag===t.tag&&n.elm._leaveCb&&n.elm._leaveCb(),P&&P(o,H)})),N&&N(o),R&&(Li(o,A),Li(o,j),Ii((function(){Ri(o,A),H.cancelled||(Li(o,E),F||(Ji(L)?setTimeout(H,L):Fi(o,u,H)))}))),t.data.show&&(e&&e(),P&&P(o,H)),R||F||H()}}}function Ki(t,e){var o=t.elm;r(o._enterCb)&&(o._enterCb.cancelled=!0,o._enterCb());var i=Si(t.data.transition);if(n(i)||1!==o.nodeType)return e();if(!r(o._leaveCb)){var a=i.css,c=i.type,u=i.leaveClass,l=i.leaveToClass,f=i.leaveActiveClass,d=i.beforeLeave,v=i.leave,h=i.afterLeave,m=i.leaveCancelled,g=i.delayLeave,y=i.duration,_=!1!==a&&!Z,b=Wi(v),$=p(s(y)?y.leave:y),w=o._leaveCb=M((function(){o.parentNode&&o.parentNode._pending&&(o.parentNode._pending[t.key]=null),_&&(Ri(o,l),Ri(o,f)),w.cancelled?(_&&Ri(o,u),m&&m(o)):(e(),h&&h(o)),o._leaveCb=null}));g?g(x):x()}function x(){w.cancelled||(!t.data.show&&o.parentNode&&((o.parentNode._pending||(o.parentNode._pending={}))[t.key]=t),d&&d(o),_&&(Li(o,u),Li(o,f),Ii((function(){Ri(o,u),w.cancelled||(Li(o,l),b||(Ji($)?setTimeout(w,$):Fi(o,c,w)))}))),v&&v(o,w),_||b||w())}}function Ji(t){return"number"==typeof t&&!isNaN(t)}function Wi(t){if(n(t))return!1;var e=t.fns;return r(e)?Wi(Array.isArray(e)?e[0]:e):(t._length||t.length)>1}function qi(t,e){!0!==e.data.show&&Vi(e)}var Zi=function(t){var a,s,c={},u=t.modules,l=t.nodeOps;for(a=0;a<uo.length;++a)for(c[uo[a]]=[],s=0;s<u.length;++s)r(u[s][uo[a]])&&c[uo[a]].push(u[s][uo[a]]);function f(t){var e=l.parentNode(t);r(e)&&l.removeChild(e,t)}function d(t,e,n,i,a,s,u){if(r(t.elm)&&r(s)&&(t=s[u]=pt(t)),t.isRootInsert=!a,!function(t,e,n,i){var a=t.data;if(r(a)){var s=r(t.componentInstance)&&a.keepAlive;if(r(a=a.hook)&&r(a=a.init)&&a(t,!1),r(t.componentInstance))return p(t,e),h(n,t.elm,i),o(s)&&function(t,e,n,o){var i,a=t;for(;a.componentInstance;)if(r(i=(a=a.componentInstance._vnode).data)&&r(i=i.transition)){for(i=0;i<c.activate.length;++i)c.activate[i](co,a);e.push(a);break}h(n,t.elm,o)}(t,e,n,i),!0}}(t,e,n,i)){var f=t.data,d=t.children,v=t.tag;r(v)?(t.elm=t.ns?l.createElementNS(t.ns,v):l.createElement(v,t),_(t),m(t,d,e),r(f)&&y(t,e),h(n,t.elm,i)):o(t.isComment)?(t.elm=l.createComment(t.text),h(n,t.elm,i)):(t.elm=l.createTextNode(t.text),h(n,t.elm,i))}}function p(t,e){r(t.data.pendingInsert)&&(e.push.apply(e,t.data.pendingInsert),t.data.pendingInsert=null),t.elm=t.componentInstance.$el,g(t)?(y(t,e),_(t)):(ao(t),e.push(t))}function h(t,e,n){r(t)&&(r(n)?l.parentNode(n)===t&&l.insertBefore(t,e,n):l.appendChild(t,e))}function m(t,n,r){if(e(n))for(var o=0;o<n.length;++o)d(n[o],r,t.elm,null,!0,n,o);else i(t.text)&&l.appendChild(t.elm,l.createTextNode(String(t.text)))}function g(t){for(;t.componentInstance;)t=t.componentInstance._vnode;return r(t.tag)}function y(t,e){for(var n=0;n<c.create.length;++n)c.create[n](co,t);r(a=t.data.hook)&&(r(a.create)&&a.create(co,t),r(a.insert)&&e.push(t))}function _(t){var e;if(r(e=t.fnScopeId))l.setStyleScope(t.elm,e);else for(var n=t;n;)r(e=n.context)&&r(e=e.$options._scopeId)&&l.setStyleScope(t.elm,e),n=n.parent;r(e=Fe)&&e!==t.context&&e!==t.fnContext&&r(e=e.$options._scopeId)&&l.setStyleScope(t.elm,e)}function b(t,e,n,r,o,i){for(;r<=o;++r)d(n[r],i,t,e,!1,n,r)}function $(t){var e,n,o=t.data;if(r(o))for(r(e=o.hook)&&r(e=e.destroy)&&e(t),e=0;e<c.destroy.length;++e)c.destroy[e](t);if(r(e=t.children))for(n=0;n<t.children.length;++n)$(t.children[n])}function w(t,e,n){for(;e<=n;++e){var o=t[e];r(o)&&(r(o.tag)?(x(o),$(o)):f(o.elm))}}function x(t,e){if(r(e)||r(t.data)){var n,o=c.remove.length+1;for(r(e)?e.listeners+=o:e=function(t,e){function n(){0==--n.listeners&&f(t)}return n.listeners=e,n}(t.elm,o),r(n=t.componentInstance)&&r(n=n._vnode)&&r(n.data)&&x(n,e),n=0;n<c.remove.length;++n)c.remove[n](t,e);r(n=t.data.hook)&&r(n=n.remove)?n(t,e):e()}else f(t.elm)}function C(t,e,n,o){for(var i=n;i<o;i++){var a=e[i];if(r(a)&&lo(t,a))return i}}function k(t,e,i,a,s,u){if(t!==e){r(e.elm)&&r(a)&&(e=a[s]=pt(e));var f=e.elm=t.elm;if(o(t.isAsyncPlaceholder))r(e.asyncFactory.resolved)?T(t.elm,e,i):e.isAsyncPlaceholder=!0;else if(o(e.isStatic)&&o(t.isStatic)&&e.key===t.key&&(o(e.isCloned)||o(e.isOnce)))e.componentInstance=t.componentInstance;else{var p,v=e.data;r(v)&&r(p=v.hook)&&r(p=p.prepatch)&&p(t,e);var h=t.children,m=e.children;if(r(v)&&g(e)){for(p=0;p<c.update.length;++p)c.update[p](t,e);r(p=v.hook)&&r(p=p.update)&&p(t,e)}n(e.text)?r(h)&&r(m)?h!==m&&function(t,e,o,i,a){for(var s,c,u,f=0,p=0,v=e.length-1,h=e[0],m=e[v],g=o.length-1,y=o[0],_=o[g],$=!a;f<=v&&p<=g;)n(h)?h=e[++f]:n(m)?m=e[--v]:lo(h,y)?(k(h,y,i,o,p),h=e[++f],y=o[++p]):lo(m,_)?(k(m,_,i,o,g),m=e[--v],_=o[--g]):lo(h,_)?(k(h,_,i,o,g),$&&l.insertBefore(t,h.elm,l.nextSibling(m.elm)),h=e[++f],_=o[--g]):lo(m,y)?(k(m,y,i,o,p),$&&l.insertBefore(t,m.elm,h.elm),m=e[--v],y=o[++p]):(n(s)&&(s=fo(e,f,v)),n(c=r(y.key)?s[y.key]:C(y,e,f,v))?d(y,i,t,h.elm,!1,o,p):lo(u=e[c],y)?(k(u,y,i,o,p),e[c]=void 0,$&&l.insertBefore(t,u.elm,h.elm)):d(y,i,t,h.elm,!1,o,p),y=o[++p]);f>v?b(t,n(o[g+1])?null:o[g+1].elm,o,p,g,i):p>g&&w(e,f,v)}(f,h,m,i,u):r(m)?(r(t.text)&&l.setTextContent(f,""),b(f,null,m,0,m.length-1,i)):r(h)?w(h,0,h.length-1):r(t.text)&&l.setTextContent(f,""):t.text!==e.text&&l.setTextContent(f,e.text),r(v)&&r(p=v.hook)&&r(p=p.postpatch)&&p(t,e)}}}function S(t,e,n){if(o(n)&&r(t.parent))t.parent.data.pendingInsert=e;else for(var i=0;i<e.length;++i)e[i].data.hook.insert(e[i])}var O=v("attrs,class,staticClass,staticStyle,key");function T(t,e,n,i){var a,s=e.tag,c=e.data,u=e.children;if(i=i||c&&c.pre,e.elm=t,o(e.isComment)&&r(e.asyncFactory))return e.isAsyncPlaceholder=!0,!0;if(r(c)&&(r(a=c.hook)&&r(a=a.init)&&a(e,!0),r(a=e.componentInstance)))return p(e,n),!0;if(r(s)){if(r(u))if(t.hasChildNodes())if(r(a=c)&&r(a=a.domProps)&&r(a=a.innerHTML)){if(a!==t.innerHTML)return!1}else{for(var l=!0,f=t.firstChild,d=0;d<u.length;d++){if(!f||!T(f,u[d],n,i)){l=!1;break}f=f.nextSibling}if(!l||f)return!1}else m(e,u,n);if(r(c)){var v=!1;for(var h in c)if(!O(h)){v=!0,y(e,n);break}!v&&c.class&&Vn(c.class)}}else t.data!==e.text&&(t.data=e.text);return!0}return function(t,e,i,a){if(!n(e)){var s,u=!1,f=[];if(n(t))u=!0,d(e,f);else{var p=r(t.nodeType);if(!p&&lo(t,e))k(t,e,f,null,null,a);else{if(p){if(1===t.nodeType&&t.hasAttribute(L)&&(t.removeAttribute(L),i=!0),o(i)&&T(t,e,f))return S(e,f,!0),t;s=t,t=new lt(l.tagName(s).toLowerCase(),{},[],void 0,s)}var v=t.elm,h=l.parentNode(v);if(d(e,f,v._leaveCb?null:h,l.nextSibling(v)),r(e.parent))for(var m=e.parent,y=g(e);m;){for(var _=0;_<c.destroy.length;++_)c.destroy[_](m);if(m.elm=e.elm,y){for(var b=0;b<c.create.length;++b)c.create[b](co,m);var x=m.data.hook.insert;if(x.merged)for(var C=1;C<x.fns.length;C++)x.fns[C]()}else ao(m);m=m.parent}r(h)?w([t],0,0):r(t.tag)&&$(t)}}return S(e,f,u),e.elm}r(t)&&$(t)}}({nodeOps:oo,modules:[xo,Eo,ci,fi,wi,J?{create:qi,activate:qi,remove:function(t,e){!0!==t.data.show?Ki(t,e):e()}}:{}].concat(_o)});Z&&document.addEventListener("selectionchange",(function(){var t=document.activeElement;t&&t.vmodel&&ra(t,"input")}));var Gi={inserted:function(t,e,n,r){"select"===n.tag?(r.elm&&!r.elm._vOptions?Yt(n,"postpatch",(function(){Gi.componentUpdated(t,e,n)})):Xi(t,e,n.context),t._vOptions=[].map.call(t.options,ta)):("textarea"===n.tag||no(t.type))&&(t._vModifiers=e.modifiers,e.modifiers.lazy||(t.addEventListener("compositionstart",ea),t.addEventListener("compositionend",na),t.addEventListener("change",na),Z&&(t.vmodel=!0)))},componentUpdated:function(t,e,n){if("select"===n.tag){Xi(t,e,n.context);var r=t._vOptions,o=t._vOptions=[].map.call(t.options,ta);if(o.some((function(t,e){return!P(t,r[e])})))(t.multiple?e.value.some((function(t){return Qi(t,o)})):e.value!==e.oldValue&&Qi(e.value,o))&&ra(t,"change")}}};function Xi(t,e,n){Yi(t,e),(q||G)&&setTimeout((function(){Yi(t,e)}),0)}function Yi(t,e,n){var r=e.value,o=t.multiple;if(!o||Array.isArray(r)){for(var i,a,s=0,c=t.options.length;s<c;s++)if(a=t.options[s],o)i=D(r,ta(a))>-1,a.selected!==i&&(a.selected=i);else if(P(ta(a),r))return void(t.selectedIndex!==s&&(t.selectedIndex=s));o||(t.selectedIndex=-1)}}function Qi(t,e){return e.every((function(e){return!P(e,t)}))}function ta(t){return"_value"in t?t._value:t.value}function ea(t){t.target.composing=!0}function na(t){t.target.composing&&(t.target.composing=!1,ra(t.target,"input"))}function ra(t,e){var n=document.createEvent("HTMLEvents");n.initEvent(e,!0,!0),t.dispatchEvent(n)}function oa(t){return!t.componentInstance||t.data&&t.data.transition?t:oa(t.componentInstance._vnode)}var ia={bind:function(t,e,n){var r=e.value,o=(n=oa(n)).data&&n.data.transition,i=t.__vOriginalDisplay="none"===t.style.display?"":t.style.display;r&&o?(n.data.show=!0,Vi(n,(function(){t.style.display=i}))):t.style.display=r?i:"none"},update:function(t,e,n){var r=e.value;!r!=!e.oldValue&&((n=oa(n)).data&&n.data.transition?(n.data.show=!0,r?Vi(n,(function(){t.style.display=t.__vOriginalDisplay})):Ki(n,(function(){t.style.display="none"}))):t.style.display=r?t.__vOriginalDisplay:"none")},unbind:function(t,e,n,r,o){o||(t.style.display=t.__vOriginalDisplay)}},aa={model:Gi,show:ia},sa={name:String,appear:Boolean,css:Boolean,mode:String,type:String,enterClass:String,leaveClass:String,enterToClass:String,leaveToClass:String,enterActiveClass:String,leaveActiveClass:String,appearClass:String,appearActiveClass:String,appearToClass:String,duration:[Number,String,Object]};function ca(t){var e=t&&t.componentOptions;return e&&e.Ctor.options.abstract?ca(De(e.children)):t}function ua(t){var e={},n=t.$options;for(var r in n.propsData)e[r]=t[r];var o=n._parentListeners;for(var r in o)e[w(r)]=o[r];return e}function la(t,e){if(/\d-keep-alive$/.test(e.tag))return t("keep-alive",{props:e.componentOptions.propsData})}var fa=function(t){return t.tag||we(t)},da=function(t){return"show"===t.name},pa={name:"transition",props:sa,abstract:!0,render:function(t){var e=this,n=this.$slots.default;if(n&&(n=n.filter(fa)).length){var r=this.mode,o=n[0];if(function(t){for(;t=t.parent;)if(t.data.transition)return!0}(this.$vnode))return o;var a=ca(o);if(!a)return o;if(this._leaving)return la(t,o);var s="__transition-".concat(this._uid,"-");a.key=null==a.key?a.isComment?s+"comment":s+a.tag:i(a.key)?0===String(a.key).indexOf(s)?a.key:s+a.key:a.key;var c=(a.data||(a.data={})).transition=ua(this),u=this._vnode,l=ca(u);if(a.data.directives&&a.data.directives.some(da)&&(a.data.show=!0),l&&l.data&&!function(t,e){return e.key===t.key&&e.tag===t.tag}(a,l)&&!we(l)&&(!l.componentInstance||!l.componentInstance._vnode.isComment)){var f=l.data.transition=T({},c);if("out-in"===r)return this._leaving=!0,Yt(f,"afterLeave",(function(){e._leaving=!1,e.$forceUpdate()})),la(t,o);if("in-out"===r){if(we(a))return u;var d,p=function(){d()};Yt(c,"afterEnter",p),Yt(c,"enterCancelled",p),Yt(f,"delayLeave",(function(t){d=t}))}}return o}}},va=T({tag:String,moveClass:String},sa);delete va.mode;var ha={props:va,beforeMount:function(){var t=this,e=this._update;this._update=function(n,r){var o=He(t);t.__patch__(t._vnode,t.kept,!1,!0),t._vnode=t.kept,o(),e.call(t,n,r)}},render:function(t){for(var e=this.tag||this.$vnode.data.tag||"span",n=Object.create(null),r=this.prevChildren=this.children,o=this.$slots.default||[],i=this.children=[],a=ua(this),s=0;s<o.length;s++){(l=o[s]).tag&&null!=l.key&&0!==String(l.key).indexOf("__vlist")&&(i.push(l),n[l.key]=l,(l.data||(l.data={})).transition=a)}if(r){var c=[],u=[];for(s=0;s<r.length;s++){var l;(l=r[s]).data.transition=a,l.data.pos=l.elm.getBoundingClientRect(),n[l.key]?c.push(l):u.push(l)}this.kept=t(e,null,c),this.removed=u}return t(e,null,i)},updated:function(){var t=this.prevChildren,e=this.moveClass||(this.name||"v")+"-move";t.length&&this.hasMove(t[0].elm,e)&&(t.forEach(ma),t.forEach(ga),t.forEach(ya),this._reflow=document.body.offsetHeight,t.forEach((function(t){if(t.data.moved){var n=t.elm,r=n.style;Li(n,e),r.transform=r.WebkitTransform=r.transitionDuration="",n.addEventListener(Ni,n._moveCb=function t(r){r&&r.target!==n||r&&!/transform$/.test(r.propertyName)||(n.removeEventListener(Ni,t),n._moveCb=null,Ri(n,e))})}})))},methods:{hasMove:function(t,e){if(!Ti)return!1;if(this._hasMove)return this._hasMove;var n=t.cloneNode();t._transitionClasses&&t._transitionClasses.forEach((function(t){ki(n,t)})),Ci(n,e),n.style.display="none",this.$el.appendChild(n);var r=Bi(n);return this.$el.removeChild(n),this._hasMove=r.hasTransform}}};function ma(t){t.elm._moveCb&&t.elm._moveCb(),t.elm._enterCb&&t.elm._enterCb()}function ga(t){t.data.newPos=t.elm.getBoundingClientRect()}function ya(t){var e=t.data.pos,n=t.data.newPos,r=e.left-n.left,o=e.top-n.top;if(r||o){t.data.moved=!0;var i=t.elm.style;i.transform=i.WebkitTransform="translate(".concat(r,"px,").concat(o,"px)"),i.transitionDuration="0s"}}var _a={Transition:pa,TransitionGroup:ha};Or.config.mustUseProp=Rr,Or.config.isReservedTag=Qr,Or.config.isReservedAttr=Ir,Or.config.getTagNamespace=to,Or.config.isUnknownElement=function(t){if(!J)return!0;if(Qr(t))return!1;if(t=t.toLowerCase(),null!=eo[t])return eo[t];var e=document.createElement(t);return t.indexOf("-")>-1?eo[t]=e.constructor===window.HTMLUnknownElement||e.constructor===window.HTMLElement:eo[t]=/HTMLUnknownElement/.test(e.toString())},T(Or.options.directives,aa),T(Or.options.components,_a),Or.prototype.__patch__=J?Zi:j,Or.prototype.$mount=function(t,e){return function(t,e,n){var r;t.$el=e,t.$options.render||(t.$options.render=ft),Ve(t,"beforeMount"),r=function(){t._update(t._render(),n)},new Wn(t,r,j,{before:function(){t._isMounted&&!t._isDestroyed&&Ve(t,"beforeUpdate")}},!0),n=!1;var o=t._preWatchers;if(o)for(var i=0;i<o.length;i++)o[i].run();return null==t.$vnode&&(t._isMounted=!0,Ve(t,"mounted")),t}(this,t=t&&J?ro(t):void 0,e)},J&&setTimeout((function(){H.devtools&&ot&&ot.emit("init",Or)}),0);var ba=/\{\{((?:.|\r?\n)+?)\}\}/g,$a=/[-.*+?^${}()|[\]\/\\]/g,wa=b((function(t){var e=t[0].replace($a,"\\$&"),n=t[1].replace($a,"\\$&");return new RegExp(e+"((?:.|\\n)+?)"+n,"g")}));var xa={staticKeys:["staticClass"],transformNode:function(t,e){e.warn;var n=Vo(t,"class");n&&(t.staticClass=JSON.stringify(n.replace(/\s+/g," ").trim()));var r=zo(t,"class",!1);r&&(t.classBinding=r)},genData:function(t){var e="";return t.staticClass&&(e+="staticClass:".concat(t.staticClass,",")),t.classBinding&&(e+="class:".concat(t.classBinding,",")),e}};var Ca,ka={staticKeys:["staticStyle"],transformNode:function(t,e){e.warn;var n=Vo(t,"style");n&&(t.staticStyle=JSON.stringify(di(n)));var r=zo(t,"style",!1);r&&(t.styleBinding=r)},genData:function(t){var e="";return t.staticStyle&&(e+="staticStyle:".concat(t.staticStyle,",")),t.styleBinding&&(e+="style:(".concat(t.styleBinding,"),")),e}},Sa=function(t){return(Ca=Ca||document.createElement("div")).innerHTML=t,Ca.textContent},Oa=v("area,base,br,col,embed,frame,hr,img,input,isindex,keygen,link,meta,param,source,track,wbr"),Ta=v("colgroup,dd,dt,li,options,p,td,tfoot,th,thead,tr,source"),Aa=v("address,article,aside,base,blockquote,body,caption,col,colgroup,dd,details,dialog,div,dl,dt,fieldset,figcaption,figure,footer,form,h1,h2,h3,h4,h5,h6,head,header,hgroup,hr,html,legend,li,menuitem,meta,optgroup,option,param,rp,rt,source,style,summary,tbody,td,tfoot,th,thead,title,tr,track"),ja=/^\s*([^\s"'<>\/=]+)(?:\s*(=)\s*(?:"([^"]*)"+|'([^']*)'+|([^\s"'=<>`]+)))?/,Ea=/^\s*((?:v-[\w-]+:|@|:|#)\[[^=]+?\][^\s"'<>\/=]*)(?:\s*(=)\s*(?:"([^"]*)"+|'([^']*)'+|([^\s"'=<>`]+)))?/,Na="[a-zA-Z_][\\-\\.0-9_a-zA-Z".concat(B.source,"]*"),Pa="((?:".concat(Na,"\\:)?").concat(Na,")"),Da=new RegExp("^<".concat(Pa)),Ma=/^\s*(\/?)>/,Ia=new RegExp("^<\\/".concat(Pa,"[^>]*>")),La=/^<!DOCTYPE [^>]+>/i,Ra=/^<!\--/,Fa=/^<!\[/,Ha=v("script,style,textarea",!0),Ba={},Ua={"&lt;":"<","&gt;":">","&quot;":'"',"&amp;":"&","&#10;":"\n","&#9;":"\t","&#39;":"'"},za=/&(?:lt|gt|quot|amp|#39);/g,Va=/&(?:lt|gt|quot|amp|#39|#10|#9);/g,Ka=v("pre,textarea",!0),Ja=function(t,e){return t&&Ka(t)&&"\n"===e[0]};function Wa(t,e){var n=e?Va:za;return t.replace(n,(function(t){return Ua[t]}))}function qa(t,e){for(var n,r,o=[],i=e.expectHTML,a=e.isUnaryTag||E,s=e.canBeLeftOpenTag||E,c=0,u=function(){if(n=t,r&&Ha(r)){var u=0,d=r.toLowerCase(),p=Ba[d]||(Ba[d]=new RegExp("([\\s\\S]*?)(</"+d+"[^>]*>)","i"));w=t.replace(p,(function(t,n,r){return u=r.length,Ha(d)||"noscript"===d||(n=n.replace(/<!\--([\s\S]*?)-->/g,"$1").replace(/<!\[CDATA\[([\s\S]*?)]]>/g,"$1")),Ja(d,n)&&(n=n.slice(1)),e.chars&&e.chars(n),""}));c+=t.length-w.length,t=w,f(d,c-u,c)}else{var v=t.indexOf("<");if(0===v){if(Ra.test(t)){var h=t.indexOf("--\x3e");if(h>=0)return e.shouldKeepComment&&e.comment&&e.comment(t.substring(4,h),c,c+h+3),l(h+3),"continue"}if(Fa.test(t)){var m=t.indexOf("]>");if(m>=0)return l(m+2),"continue"}var g=t.match(La);if(g)return l(g[0].length),"continue";var y=t.match(Ia);if(y){var _=c;return l(y[0].length),f(y[1],_,c),"continue"}var b=function(){var e=t.match(Da);if(e){var n={tagName:e[1],attrs:[],start:c};l(e[0].length);for(var r=void 0,o=void 0;!(r=t.match(Ma))&&(o=t.match(Ea)||t.match(ja));)o.start=c,l(o[0].length),o.end=c,n.attrs.push(o);if(r)return n.unarySlash=r[1],l(r[0].length),n.end=c,n}}();if(b)return function(t){var n=t.tagName,c=t.unarySlash;i&&("p"===r&&Aa(n)&&f(r),s(n)&&r===n&&f(n));for(var u=a(n)||!!c,l=t.attrs.length,d=new Array(l),p=0;p<l;p++){var v=t.attrs[p],h=v[3]||v[4]||v[5]||"",m="a"===n&&"href"===v[1]?e.shouldDecodeNewlinesForHref:e.shouldDecodeNewlines;d[p]={name:v[1],value:Wa(h,m)}}u||(o.push({tag:n,lowerCasedTag:n.toLowerCase(),attrs:d,start:t.start,end:t.end}),r=n);e.start&&e.start(n,d,u,t.start,t.end)}(b),Ja(b.tagName,t)&&l(1),"continue"}var $=void 0,w=void 0,x=void 0;if(v>=0){for(w=t.slice(v);!(Ia.test(w)||Da.test(w)||Ra.test(w)||Fa.test(w)||(x=w.indexOf("<",1))<0);)v+=x,w=t.slice(v);$=t.substring(0,v)}v<0&&($=t),$&&l($.length),e.chars&&$&&e.chars($,c-$.length,c)}if(t===n)return e.chars&&e.chars(t),"break"};t;){if("break"===u())break}function l(e){c+=e,t=t.substring(e)}function f(t,n,i){var a,s;if(null==n&&(n=c),null==i&&(i=c),t)for(s=t.toLowerCase(),a=o.length-1;a>=0&&o[a].lowerCasedTag!==s;a--);else a=0;if(a>=0){for(var u=o.length-1;u>=a;u--)e.end&&e.end(o[u].tag,n,i);o.length=a,r=a&&o[a-1].tag}else"br"===s?e.start&&e.start(t,[],!0,n,i):"p"===s&&(e.start&&e.start(t,[],!1,n,i),e.end&&e.end(t,n,i))}f()}var Za,Ga,Xa,Ya,Qa,ts,es,ns,rs=/^@|^v-on:/,os=/^v-|^@|^:|^#/,is=/([\s\S]*?)\s+(?:in|of)\s+([\s\S]*)/,as=/,([^,\}\]]*)(?:,([^,\}\]]*))?$/,ss=/^\(|\)$/g,cs=/^\[.*\]$/,us=/:(.*)$/,ls=/^:|^\.|^v-bind:/,fs=/\.[^.\]]+(?=[^\]]*$)/g,ds=/^v-slot(:|$)|^#/,ps=/[\r\n]/,vs=/[ \f\t\r\n]+/g,hs=b(Sa),ms="_empty_";function gs(t,e,n){return{type:1,tag:t,attrsList:e,attrsMap:Cs(e),rawAttrsMap:{},parent:n,children:[]}}function ys(t,e){Za=e.warn||Mo,ts=e.isPreTag||E,es=e.mustUseProp||E,ns=e.getTagNamespace||E,e.isReservedTag,Xa=Io(e.modules,"transformNode"),Ya=Io(e.modules,"preTransformNode"),Qa=Io(e.modules,"postTransformNode"),Ga=e.delimiters;var n,r,o=[],i=!1!==e.preserveWhitespace,a=e.whitespace,s=!1,c=!1;function u(t){if(l(t),s||t.processed||(t=_s(t,e)),o.length||t===n||n.if&&(t.elseif||t.else)&&$s(n,{exp:t.elseif,block:t}),r&&!t.forbidden)if(t.elseif||t.else)a=t,u=function(t){for(var e=t.length;e--;){if(1===t[e].type)return t[e];t.pop()}}(r.children),u&&u.if&&$s(u,{exp:a.elseif,block:a});else{if(t.slotScope){var i=t.slotTarget||'"default"';(r.scopedSlots||(r.scopedSlots={}))[i]=t}r.children.push(t),t.parent=r}var a,u;t.children=t.children.filter((function(t){return!t.slotScope})),l(t),t.pre&&(s=!1),ts(t.tag)&&(c=!1);for(var f=0;f<Qa.length;f++)Qa[f](t,e)}function l(t){if(!c)for(var e=void 0;(e=t.children[t.children.length-1])&&3===e.type&&" "===e.text;)t.children.pop()}return qa(t,{warn:Za,expectHTML:e.expectHTML,isUnaryTag:e.isUnaryTag,canBeLeftOpenTag:e.canBeLeftOpenTag,shouldDecodeNewlines:e.shouldDecodeNewlines,shouldDecodeNewlinesForHref:e.shouldDecodeNewlinesForHref,shouldKeepComment:e.comments,outputSourceRange:e.outputSourceRange,start:function(t,i,a,l,f){var d=r&&r.ns||ns(t);q&&"svg"===d&&(i=function(t){for(var e=[],n=0;n<t.length;n++){var r=t[n];ks.test(r.name)||(r.name=r.name.replace(Ss,""),e.push(r))}return e}(i));var p,v=gs(t,i,r);d&&(v.ns=d),"style"!==(p=v).tag&&("script"!==p.tag||p.attrsMap.type&&"text/javascript"!==p.attrsMap.type)||rt()||(v.forbidden=!0);for(var h=0;h<Ya.length;h++)v=Ya[h](v,e)||v;s||(!function(t){null!=Vo(t,"v-pre")&&(t.pre=!0)}(v),v.pre&&(s=!0)),ts(v.tag)&&(c=!0),s?function(t){var e=t.attrsList,n=e.length;if(n)for(var r=t.attrs=new Array(n),o=0;o<n;o++)r[o]={name:e[o].name,value:JSON.stringify(e[o].value)},null!=e[o].start&&(r[o].start=e[o].start,r[o].end=e[o].end);else t.pre||(t.plain=!0)}(v):v.processed||(bs(v),function(t){var e=Vo(t,"v-if");if(e)t.if=e,$s(t,{exp:e,block:t});else{null!=Vo(t,"v-else")&&(t.else=!0);var n=Vo(t,"v-else-if");n&&(t.elseif=n)}}(v),function(t){null!=Vo(t,"v-once")&&(t.once=!0)}(v)),n||(n=v),a?u(v):(r=v,o.push(v))},end:function(t,e,n){var i=o[o.length-1];o.length-=1,r=o[o.length-1],u(i)},chars:function(t,e,n){if(r&&(!q||"textarea"!==r.tag||r.attrsMap.placeholder!==t)){var o,u=r.children;if(t=c||t.trim()?"script"===(o=r).tag||"style"===o.tag?t:hs(t):u.length?a?"condense"===a&&ps.test(t)?"":" ":i?" ":"":""){c||"condense"!==a||(t=t.replace(vs," "));var l=void 0,f=void 0;!s&&" "!==t&&(l=function(t,e){var n=e?wa(e):ba;if(n.test(t)){for(var r,o,i,a=[],s=[],c=n.lastIndex=0;r=n.exec(t);){(o=r.index)>c&&(s.push(i=t.slice(c,o)),a.push(JSON.stringify(i)));var u=Po(r[1].trim());a.push("_s(".concat(u,")")),s.push({"@binding":u}),c=o+r[0].length}return c<t.length&&(s.push(i=t.slice(c)),a.push(JSON.stringify(i))),{expression:a.join("+"),tokens:s}}}(t,Ga))?f={type:2,expression:l.expression,tokens:l.tokens,text:t}:" "===t&&u.length&&" "===u[u.length-1].text||(f={type:3,text:t}),f&&u.push(f)}}},comment:function(t,e,n){if(r){var o={type:3,text:t,isComment:!0};r.children.push(o)}}}),n}function _s(t,e){var n,r;(r=zo(n=t,"key"))&&(n.key=r),t.plain=!t.key&&!t.scopedSlots&&!t.attrsList.length,function(t){var e=zo(t,"ref");e&&(t.ref=e,t.refInFor=function(t){var e=t;for(;e;){if(void 0!==e.for)return!0;e=e.parent}return!1}(t))}(t),function(t){var e;"template"===t.tag?(e=Vo(t,"scope"),t.slotScope=e||Vo(t,"slot-scope")):(e=Vo(t,"slot-scope"))&&(t.slotScope=e);var n=zo(t,"slot");n&&(t.slotTarget='""'===n?'"default"':n,t.slotTargetDynamic=!(!t.attrsMap[":slot"]&&!t.attrsMap["v-bind:slot"]),"template"===t.tag||t.slotScope||Ro(t,"slot",n,function(t,e){return t.rawAttrsMap[":"+e]||t.rawAttrsMap["v-bind:"+e]||t.rawAttrsMap[e]}(t,"slot")));if("template"===t.tag){if(a=Ko(t,ds)){var r=ws(a),o=r.name,i=r.dynamic;t.slotTarget=o,t.slotTargetDynamic=i,t.slotScope=a.value||ms}}else{var a;if(a=Ko(t,ds)){var s=t.scopedSlots||(t.scopedSlots={}),c=ws(a),u=c.name,l=(i=c.dynamic,s[u]=gs("template",[],t));l.slotTarget=u,l.slotTargetDynamic=i,l.children=t.children.filter((function(t){if(!t.slotScope)return t.parent=l,!0})),l.slotScope=a.value||ms,t.children=[],t.plain=!1}}}(t),function(t){"slot"===t.tag&&(t.slotName=zo(t,"name"))}(t),function(t){var e;(e=zo(t,"is"))&&(t.component=e);null!=Vo(t,"inline-template")&&(t.inlineTemplate=!0)}(t);for(var o=0;o<Xa.length;o++)t=Xa[o](t,e)||t;return function(t){var e,n,r,o,i,a,s,c,u=t.attrsList;for(e=0,n=u.length;e<n;e++)if(r=o=u[e].name,i=u[e].value,os.test(r))if(t.hasBindings=!0,(a=xs(r.replace(os,"")))&&(r=r.replace(fs,"")),ls.test(r))r=r.replace(ls,""),i=Po(i),(c=cs.test(r))&&(r=r.slice(1,-1)),a&&(a.prop&&!c&&"innerHtml"===(r=w(r))&&(r="innerHTML"),a.camel&&!c&&(r=w(r)),a.sync&&(s=qo(i,"$event"),c?Uo(t,'"update:"+('.concat(r,")"),s,null,!1,0,u[e],!0):(Uo(t,"update:".concat(w(r)),s,null,!1,0,u[e]),k(r)!==w(r)&&Uo(t,"update:".concat(k(r)),s,null,!1,0,u[e])))),a&&a.prop||!t.component&&es(t.tag,t.attrsMap.type,r)?Lo(t,r,i,u[e],c):Ro(t,r,i,u[e],c);else if(rs.test(r))r=r.replace(rs,""),(c=cs.test(r))&&(r=r.slice(1,-1)),Uo(t,r,i,a,!1,0,u[e],c);else{var l=(r=r.replace(os,"")).match(us),f=l&&l[1];c=!1,f&&(r=r.slice(0,-(f.length+1)),cs.test(f)&&(f=f.slice(1,-1),c=!0)),Ho(t,r,o,i,f,c,a,u[e])}else Ro(t,r,JSON.stringify(i),u[e]),!t.component&&"muted"===r&&es(t.tag,t.attrsMap.type,r)&&Lo(t,r,"true",u[e])}(t),t}function bs(t){var e;if(e=Vo(t,"v-for")){var n=function(t){var e=t.match(is);if(!e)return;var n={};n.for=e[2].trim();var r=e[1].trim().replace(ss,""),o=r.match(as);o?(n.alias=r.replace(as,"").trim(),n.iterator1=o[1].trim(),o[2]&&(n.iterator2=o[2].trim())):n.alias=r;return n}(e);n&&T(t,n)}}function $s(t,e){t.ifConditions||(t.ifConditions=[]),t.ifConditions.push(e)}function ws(t){var e=t.name.replace(ds,"");return e||"#"!==t.name[0]&&(e="default"),cs.test(e)?{name:e.slice(1,-1),dynamic:!0}:{name:'"'.concat(e,'"'),dynamic:!1}}function xs(t){var e=t.match(fs);if(e){var n={};return e.forEach((function(t){n[t.slice(1)]=!0})),n}}function Cs(t){for(var e={},n=0,r=t.length;n<r;n++)e[t[n].name]=t[n].value;return e}var ks=/^xmlns:NS\d+/,Ss=/^NS\d+:/;function Os(t){return gs(t.tag,t.attrsList.slice(),t.parent)}var Ts=[xa,ka,{preTransformNode:function(t,e){if("input"===t.tag){var n=t.attrsMap;if(!n["v-model"])return;var r=void 0;if((n[":type"]||n["v-bind:type"])&&(r=zo(t,"type")),n.type||r||!n["v-bind"]||(r="(".concat(n["v-bind"],").type")),r){var o=Vo(t,"v-if",!0),i=o?"&&(".concat(o,")"):"",a=null!=Vo(t,"v-else",!0),s=Vo(t,"v-else-if",!0),c=Os(t);bs(c),Fo(c,"type","checkbox"),_s(c,e),c.processed=!0,c.if="(".concat(r,")==='checkbox'")+i,$s(c,{exp:c.if,block:c});var u=Os(t);Vo(u,"v-for",!0),Fo(u,"type","radio"),_s(u,e),$s(c,{exp:"(".concat(r,")==='radio'")+i,block:u});var l=Os(t);return Vo(l,"v-for",!0),Fo(l,":type",r),_s(l,e),$s(c,{exp:o,block:l}),a?c.else=!0:s&&(c.elseif=s),c}}}}];var As,js,Es={model:function(t,e,n){var r=e.value,o=e.modifiers,i=t.tag,a=t.attrsMap.type;if(t.component)return Wo(t,r,o),!1;if("select"===i)!function(t,e,n){var r=n&&n.number,o='Array.prototype.filter.call($event.target.options,function(o){return o.selected}).map(function(o){var val = "_value" in o ? o._value : o.value;'+"return ".concat(r?"_n(val)":"val","})"),i="$event.target.multiple ? $$selectedVal : $$selectedVal[0]",a="var $$selectedVal = ".concat(o,";");a="".concat(a," ").concat(qo(e,i)),Uo(t,"change",a,null,!0)}(t,r,o);else if("input"===i&&"checkbox"===a)!function(t,e,n){var r=n&&n.number,o=zo(t,"value")||"null",i=zo(t,"true-value")||"true",a=zo(t,"false-value")||"false";Lo(t,"checked","Array.isArray(".concat(e,")")+"?_i(".concat(e,",").concat(o,")>-1")+("true"===i?":(".concat(e,")"):":_q(".concat(e,",").concat(i,")"))),Uo(t,"change","var $$a=".concat(e,",")+"$$el=$event.target,"+"$$c=$$el.checked?(".concat(i,"):(").concat(a,");")+"if(Array.isArray($$a)){"+"var $$v=".concat(r?"_n("+o+")":o,",")+"$$i=_i($$a,$$v);"+"if($$el.checked){$$i<0&&(".concat(qo(e,"$$a.concat([$$v])"),")}")+"else{$$i>-1&&(".concat(qo(e,"$$a.slice(0,$$i).concat($$a.slice($$i+1))"),")}")+"}else{".concat(qo(e,"$$c"),"}"),null,!0)}(t,r,o);else if("input"===i&&"radio"===a)!function(t,e,n){var r=n&&n.number,o=zo(t,"value")||"null";o=r?"_n(".concat(o,")"):o,Lo(t,"checked","_q(".concat(e,",").concat(o,")")),Uo(t,"change",qo(e,o),null,!0)}(t,r,o);else if("input"===i||"textarea"===i)!function(t,e,n){var r=t.attrsMap.type,o=n||{},i=o.lazy,a=o.number,s=o.trim,c=!i&&"range"!==r,u=i?"change":"range"===r?ei:"input",l="$event.target.value";s&&(l="$event.target.value.trim()");a&&(l="_n(".concat(l,")"));var f=qo(e,l);c&&(f="if($event.target.composing)return;".concat(f));Lo(t,"value","(".concat(e,")")),Uo(t,u,f,null,!0),(s||a)&&Uo(t,"blur","$forceUpdate()")}(t,r,o);else if(!H.isReservedTag(i))return Wo(t,r,o),!1;return!0},text:function(t,e){e.value&&Lo(t,"textContent","_s(".concat(e.value,")"),e)},html:function(t,e){e.value&&Lo(t,"innerHTML","_s(".concat(e.value,")"),e)}},Ns={expectHTML:!0,modules:Ts,directives:Es,isPreTag:function(t){return"pre"===t},isUnaryTag:Oa,mustUseProp:Rr,canBeLeftOpenTag:Ta,isReservedTag:Qr,getTagNamespace:to,staticKeys:function(t){return t.reduce((function(t,e){return t.concat(e.staticKeys||[])}),[]).join(",")}(Ts)},Ps=b((function(t){return v("type,tag,attrsList,attrsMap,plain,parent,children,attrs,start,end,rawAttrsMap"+(t?","+t:""))}));function Ds(t,e){t&&(As=Ps(e.staticKeys||""),js=e.isReservedTag||E,Ms(t),Is(t,!1))}function Ms(t){if(t.static=function(t){if(2===t.type)return!1;if(3===t.type)return!0;return!(!t.pre&&(t.hasBindings||t.if||t.for||h(t.tag)||!js(t.tag)||function(t){for(;t.parent;){if("template"!==(t=t.parent).tag)return!1;if(t.for)return!0}return!1}(t)||!Object.keys(t).every(As)))}(t),1===t.type){if(!js(t.tag)&&"slot"!==t.tag&&null==t.attrsMap["inline-template"])return;for(var e=0,n=t.children.length;e<n;e++){var r=t.children[e];Ms(r),r.static||(t.static=!1)}if(t.ifConditions)for(e=1,n=t.ifConditions.length;e<n;e++){var o=t.ifConditions[e].block;Ms(o),o.static||(t.static=!1)}}}function Is(t,e){if(1===t.type){if((t.static||t.once)&&(t.staticInFor=e),t.static&&t.children.length&&(1!==t.children.length||3!==t.children[0].type))return void(t.staticRoot=!0);if(t.staticRoot=!1,t.children)for(var n=0,r=t.children.length;n<r;n++)Is(t.children[n],e||!!t.for);if(t.ifConditions)for(n=1,r=t.ifConditions.length;n<r;n++)Is(t.ifConditions[n].block,e)}}var Ls=/^([\w$_]+|\([^)]*?\))\s*=>|^function(?:\s+[\w$]+)?\s*\(/,Rs=/\([^)]*?\);*$/,Fs=/^[A-Za-z_$][\w$]*(?:\.[A-Za-z_$][\w$]*|\['[^']*?']|\["[^"]*?"]|\[\d+]|\[[A-Za-z_$][\w$]*])*$/,Hs={esc:27,tab:9,enter:13,space:32,up:38,left:37,right:39,down:40,delete:[8,46]},Bs={esc:["Esc","Escape"],tab:"Tab",enter:"Enter",space:[" ","Spacebar"],up:["Up","ArrowUp"],left:["Left","ArrowLeft"],right:["Right","ArrowRight"],down:["Down","ArrowDown"],delete:["Backspace","Delete","Del"]},Us=function(t){return"if(".concat(t,")return null;")},zs={stop:"$event.stopPropagation();",prevent:"$event.preventDefault();",self:Us("$event.target !== $event.currentTarget"),ctrl:Us("!$event.ctrlKey"),shift:Us("!$event.shiftKey"),alt:Us("!$event.altKey"),meta:Us("!$event.metaKey"),left:Us("'button' in $event && $event.button !== 0"),middle:Us("'button' in $event && $event.button !== 1"),right:Us("'button' in $event && $event.button !== 2")};function Vs(t,e){var n=e?"nativeOn:":"on:",r="",o="";for(var i in t){var a=Ks(t[i]);t[i]&&t[i].dynamic?o+="".concat(i,",").concat(a,","):r+='"'.concat(i,'":').concat(a,",")}return r="{".concat(r.slice(0,-1),"}"),o?n+"_d(".concat(r,",[").concat(o.slice(0,-1),"])"):n+r}function Ks(t){if(!t)return"function(){}";if(Array.isArray(t))return"[".concat(t.map((function(t){return Ks(t)})).join(","),"]");var e=Fs.test(t.value),n=Ls.test(t.value),r=Fs.test(t.value.replace(Rs,""));if(t.modifiers){var o="",i="",a=[],s=function(e){if(zs[e])i+=zs[e],Hs[e]&&a.push(e);else if("exact"===e){var n=t.modifiers;i+=Us(["ctrl","shift","alt","meta"].filter((function(t){return!n[t]})).map((function(t){return"$event.".concat(t,"Key")})).join("||"))}else a.push(e)};for(var c in t.modifiers)s(c);a.length&&(o+=function(t){return"if(!$event.type.indexOf('key')&&"+"".concat(t.map(Js).join("&&"),")return null;")}(a)),i&&(o+=i);var u=e?"return ".concat(t.value,".apply(null, arguments)"):n?"return (".concat(t.value,").apply(null, arguments)"):r?"return ".concat(t.value):t.value;return"function($event){".concat(o).concat(u,"}")}return e||n?t.value:"function($event){".concat(r?"return ".concat(t.value):t.value,"}")}function Js(t){var e=parseInt(t,10);if(e)return"$event.keyCode!==".concat(e);var n=Hs[t],r=Bs[t];return"_k($event.keyCode,"+"".concat(JSON.stringify(t),",")+"".concat(JSON.stringify(n),",")+"$event.key,"+"".concat(JSON.stringify(r))+")"}var Ws={on:function(t,e){t.wrapListeners=function(t){return"_g(".concat(t,",").concat(e.value,")")}},bind:function(t,e){t.wrapData=function(n){return"_b(".concat(n,",'").concat(t.tag,"',").concat(e.value,",").concat(e.modifiers&&e.modifiers.prop?"true":"false").concat(e.modifiers&&e.modifiers.sync?",true":"",")")}},cloak:j},qs=function(t){this.options=t,this.warn=t.warn||Mo,this.transforms=Io(t.modules,"transformCode"),this.dataGenFns=Io(t.modules,"genData"),this.directives=T(T({},Ws),t.directives);var e=t.isReservedTag||E;this.maybeComponent=function(t){return!!t.component||!e(t.tag)},this.onceId=0,this.staticRenderFns=[],this.pre=!1};function Zs(t,e){var n=new qs(e),r=t?"script"===t.tag?"null":Gs(t,n):'_c("div")';return{render:"with(this){return ".concat(r,"}"),staticRenderFns:n.staticRenderFns}}function Gs(t,e){if(t.parent&&(t.pre=t.pre||t.parent.pre),t.staticRoot&&!t.staticProcessed)return Xs(t,e);if(t.once&&!t.onceProcessed)return Ys(t,e);if(t.for&&!t.forProcessed)return ec(t,e);if(t.if&&!t.ifProcessed)return Qs(t,e);if("template"!==t.tag||t.slotTarget||e.pre){if("slot"===t.tag)return function(t,e){var n=t.slotName||'"default"',r=ic(t,e),o="_t(".concat(n).concat(r?",function(){return ".concat(r,"}"):""),i=t.attrs||t.dynamicAttrs?cc((t.attrs||[]).concat(t.dynamicAttrs||[]).map((function(t){return{name:w(t.name),value:t.value,dynamic:t.dynamic}}))):null,a=t.attrsMap["v-bind"];!i&&!a||r||(o+=",null");i&&(o+=",".concat(i));a&&(o+="".concat(i?"":",null",",").concat(a));return o+")"}(t,e);var n=void 0;if(t.component)n=function(t,e,n){var r=e.inlineTemplate?null:ic(e,n,!0);return"_c(".concat(t,",").concat(nc(e,n)).concat(r?",".concat(r):"",")")}(t.component,t,e);else{var r=void 0,o=e.maybeComponent(t);(!t.plain||t.pre&&o)&&(r=nc(t,e));var i=void 0,a=e.options.bindings;o&&a&&!1!==a.__isScriptSetup&&(i=function(t,e){var n=w(e),r=x(n),o=function(o){return t[e]===o?e:t[n]===o?n:t[r]===o?r:void 0},i=o("setup-const")||o("setup-reactive-const");if(i)return i;var a=o("setup-let")||o("setup-ref")||o("setup-maybe-ref");if(a)return a}(a,t.tag)),i||(i="'".concat(t.tag,"'"));var s=t.inlineTemplate?null:ic(t,e,!0);n="_c(".concat(i).concat(r?",".concat(r):"").concat(s?",".concat(s):"",")")}for(var c=0;c<e.transforms.length;c++)n=e.transforms[c](t,n);return n}return ic(t,e)||"void 0"}function Xs(t,e){t.staticProcessed=!0;var n=e.pre;return t.pre&&(e.pre=t.pre),e.staticRenderFns.push("with(this){return ".concat(Gs(t,e),"}")),e.pre=n,"_m(".concat(e.staticRenderFns.length-1).concat(t.staticInFor?",true":"",")")}function Ys(t,e){if(t.onceProcessed=!0,t.if&&!t.ifProcessed)return Qs(t,e);if(t.staticInFor){for(var n="",r=t.parent;r;){if(r.for){n=r.key;break}r=r.parent}return n?"_o(".concat(Gs(t,e),",").concat(e.onceId++,",").concat(n,")"):Gs(t,e)}return Xs(t,e)}function Qs(t,e,n,r){return t.ifProcessed=!0,tc(t.ifConditions.slice(),e,n,r)}function tc(t,e,n,r){if(!t.length)return r||"_e()";var o=t.shift();return o.exp?"(".concat(o.exp,")?").concat(i(o.block),":").concat(tc(t,e,n,r)):"".concat(i(o.block));function i(t){return n?n(t,e):t.once?Ys(t,e):Gs(t,e)}}function ec(t,e,n,r){var o=t.for,i=t.alias,a=t.iterator1?",".concat(t.iterator1):"",s=t.iterator2?",".concat(t.iterator2):"";return t.forProcessed=!0,"".concat(r||"_l","((").concat(o,"),")+"function(".concat(i).concat(a).concat(s,"){")+"return ".concat((n||Gs)(t,e))+"})"}function nc(t,e){var n="{",r=function(t,e){var n=t.directives;if(!n)return;var r,o,i,a,s="directives:[",c=!1;for(r=0,o=n.length;r<o;r++){i=n[r],a=!0;var u=e.directives[i.name];u&&(a=!!u(t,i,e.warn)),a&&(c=!0,s+='{name:"'.concat(i.name,'",rawName:"').concat(i.rawName,'"').concat(i.value?",value:(".concat(i.value,"),expression:").concat(JSON.stringify(i.value)):"").concat(i.arg?",arg:".concat(i.isDynamicArg?i.arg:'"'.concat(i.arg,'"')):"").concat(i.modifiers?",modifiers:".concat(JSON.stringify(i.modifiers)):"","},"))}if(c)return s.slice(0,-1)+"]"}(t,e);r&&(n+=r+","),t.key&&(n+="key:".concat(t.key,",")),t.ref&&(n+="ref:".concat(t.ref,",")),t.refInFor&&(n+="refInFor:true,"),t.pre&&(n+="pre:true,"),t.component&&(n+='tag:"'.concat(t.tag,'",'));for(var o=0;o<e.dataGenFns.length;o++)n+=e.dataGenFns[o](t);if(t.attrs&&(n+="attrs:".concat(cc(t.attrs),",")),t.props&&(n+="domProps:".concat(cc(t.props),",")),t.events&&(n+="".concat(Vs(t.events,!1),",")),t.nativeEvents&&(n+="".concat(Vs(t.nativeEvents,!0),",")),t.slotTarget&&!t.slotScope&&(n+="slot:".concat(t.slotTarget,",")),t.scopedSlots&&(n+="".concat(function(t,e,n){var r=t.for||Object.keys(e).some((function(t){var n=e[t];return n.slotTargetDynamic||n.if||n.for||rc(n)})),o=!!t.if;if(!r)for(var i=t.parent;i;){if(i.slotScope&&i.slotScope!==ms||i.for){r=!0;break}i.if&&(o=!0),i=i.parent}var a=Object.keys(e).map((function(t){return oc(e[t],n)})).join(",");return"scopedSlots:_u([".concat(a,"]").concat(r?",null,true":"").concat(!r&&o?",null,false,".concat(function(t){var e=5381,n=t.length;for(;n;)e=33*e^t.charCodeAt(--n);return e>>>0}(a)):"",")")}(t,t.scopedSlots,e),",")),t.model&&(n+="model:{value:".concat(t.model.value,",callback:").concat(t.model.callback,",expression:").concat(t.model.expression,"},")),t.inlineTemplate){var i=function(t,e){var n=t.children[0];if(n&&1===n.type){var r=Zs(n,e.options);return"inlineTemplate:{render:function(){".concat(r.render,"},staticRenderFns:[").concat(r.staticRenderFns.map((function(t){return"function(){".concat(t,"}")})).join(","),"]}")}}(t,e);i&&(n+="".concat(i,","))}return n=n.replace(/,$/,"")+"}",t.dynamicAttrs&&(n="_b(".concat(n,',"').concat(t.tag,'",').concat(cc(t.dynamicAttrs),")")),t.wrapData&&(n=t.wrapData(n)),t.wrapListeners&&(n=t.wrapListeners(n)),n}function rc(t){return 1===t.type&&("slot"===t.tag||t.children.some(rc))}function oc(t,e){var n=t.attrsMap["slot-scope"];if(t.if&&!t.ifProcessed&&!n)return Qs(t,e,oc,"null");if(t.for&&!t.forProcessed)return ec(t,e,oc);var r=t.slotScope===ms?"":String(t.slotScope),o="function(".concat(r,"){")+"return ".concat("template"===t.tag?t.if&&n?"(".concat(t.if,")?").concat(ic(t,e)||"undefined",":undefined"):ic(t,e)||"undefined":Gs(t,e),"}"),i=r?"":",proxy:true";return"{key:".concat(t.slotTarget||'"default"',",fn:").concat(o).concat(i,"}")}function ic(t,e,n,r,o){var i=t.children;if(i.length){var a=i[0];if(1===i.length&&a.for&&"template"!==a.tag&&"slot"!==a.tag){var s=n?e.maybeComponent(a)?",1":",0":"";return"".concat((r||Gs)(a,e)).concat(s)}var c=n?function(t,e){for(var n=0,r=0;r<t.length;r++){var o=t[r];if(1===o.type){if(ac(o)||o.ifConditions&&o.ifConditions.some((function(t){return ac(t.block)}))){n=2;break}(e(o)||o.ifConditions&&o.ifConditions.some((function(t){return e(t.block)})))&&(n=1)}}return n}(i,e.maybeComponent):0,u=o||sc;return"[".concat(i.map((function(t){return u(t,e)})).join(","),"]").concat(c?",".concat(c):"")}}function ac(t){return void 0!==t.for||"template"===t.tag||"slot"===t.tag}function sc(t,e){return 1===t.type?Gs(t,e):3===t.type&&t.isComment?function(t){return"_e(".concat(JSON.stringify(t.text),")")}(t):function(t){return"_v(".concat(2===t.type?t.expression:uc(JSON.stringify(t.text)),")")}(t)}function cc(t){for(var e="",n="",r=0;r<t.length;r++){var o=t[r],i=uc(o.value);o.dynamic?n+="".concat(o.name,",").concat(i,","):e+='"'.concat(o.name,'":').concat(i,",")}return e="{".concat(e.slice(0,-1),"}"),n?"_d(".concat(e,",[").concat(n.slice(0,-1),"])"):e}function uc(t){return t.replace(/\u2028/g,"\\u2028").replace(/\u2029/g,"\\u2029")}function lc(t,e){try{return new Function(t)}catch(n){return e.push({err:n,code:t}),j}}function fc(t){var e=Object.create(null);return function(n,r,o){(r=T({},r)).warn,delete r.warn;var i=r.delimiters?String(r.delimiters)+n:n;if(e[i])return e[i];var a=t(n,r),s={},c=[];return s.render=lc(a.render,c),s.staticRenderFns=a.staticRenderFns.map((function(t){return lc(t,c)})),e[i]=s}}new RegExp("\\b"+"do,if,for,let,new,try,var,case,else,with,await,break,catch,class,const,super,throw,while,yield,delete,export,import,return,switch,default,extends,finally,continue,debugger,function,arguments".split(",").join("\\b|\\b")+"\\b"),new RegExp("\\b"+"delete,typeof,void".split(",").join("\\s*\\([^\\)]*\\)|\\b")+"\\s*\\([^\\)]*\\)");var dc,pc,vc=(dc=function(t,e){var n=ys(t.trim(),e);!1!==e.optimize&&Ds(n,e);var r=Zs(n,e);return{ast:n,render:r.render,staticRenderFns:r.staticRenderFns}},function(t){function e(e,n){var r=Object.create(t),o=[],i=[];if(n)for(var a in n.modules&&(r.modules=(t.modules||[]).concat(n.modules)),n.directives&&(r.directives=T(Object.create(t.directives||null),n.directives)),n)"modules"!==a&&"directives"!==a&&(r[a]=n[a]);r.warn=function(t,e,n){(n?i:o).push(t)};var s=dc(e.trim(),r);return s.errors=o,s.tips=i,s}return{compile:e,compileToFunctions:fc(e)}}),hc=vc(Ns).compileToFunctions;function mc(t){return(pc=pc||document.createElement("div")).innerHTML=t?'<a href="\n"/>':'<div a="\n"/>',pc.innerHTML.indexOf("&#10;")>0}var gc=!!J&&mc(!1),yc=!!J&&mc(!0),_c=b((function(t){var e=ro(t);return e&&e.innerHTML})),bc=Or.prototype.$mount;return Or.prototype.$mount=function(t,e){if((t=t&&ro(t))===document.body||t===document.documentElement)return this;var n=this.$options;if(!n.render){var r=n.template;if(r)if("string"==typeof r)"#"===r.charAt(0)&&(r=_c(r));else{if(!r.nodeType)return this;r=r.innerHTML}else t&&(r=function(t){if(t.outerHTML)return t.outerHTML;var e=document.createElement("div");return e.appendChild(t.cloneNode(!0)),e.innerHTML}(t));if(r){var o=hc(r,{outputSourceRange:!1,shouldDecodeNewlines:gc,shouldDecodeNewlinesForHref:yc,delimiters:n.delimiters,comments:n.comments},this),i=o.render,a=o.staticRenderFns;n.render=i,n.staticRenderFns=a}}return bc.call(this,t,e)},Or.compile=hc,T(Or,Un),Or.effect=function(t,e){var n=new Wn(ct,t,j,{sync:!0});e&&(n.update=function(){e((function(){return n.run()}))})},Or}));
\ No newline at end of file
diff --git a/advancedcontentfilter/composer.json b/advancedcontentfilter/composer.json
index b9ab1900..93b19cd5 100644
--- a/advancedcontentfilter/composer.json
+++ b/advancedcontentfilter/composer.json
@@ -1,27 +1,25 @@
 {
-    "name": "friendica-addons/advancedcontentfilter",
-    "description": "Advanced Content Filter addon for Friendica",
-    "type": "friendica-addon",
-    "authors": [
-        {
-            "name": "Hypolite Petovan",
-            "email": "hypolite@mrpetovan.com",
-            "homepage": "https://friendica.mrpetovan.com/profile/hypolite",
-            "role": "Developer"
-        }
-    ],
-    "require": {
-        "slim/slim": "^4",
-        "symfony/expression-language": "^3.4"
-    },
-    "license": "3-clause BSD license",
-    "minimum-stability": "stable",
-    "config": {
-        "platform": {
-            "php": "7.4"
-        },
-        "optimize-autoloader": true,
-        "autoloader-suffix": "AdvancedContentFilterAddon",
-        "preferred-install": "dist"
-    }
+	"name": "friendica-addons/advancedcontentfilter",
+	"description": "Advanced Content Filter addon for Friendica",
+	"type": "friendica-addon",
+	"authors": [
+		{
+			"name": "Hypolite Petovan",
+			"email": "hypolite@mrpetovan.com",
+			"homepage": "https://friendica.mrpetovan.com/profile/hypolite",
+			"role": "Developer"
+		}
+	],
+	"require": {
+		"php": ">=5.6.0",
+		"slim/slim": "^3.1",
+		"symfony/expression-language": "^3.4"
+	},
+	"license": "3-clause BSD license",
+	"minimum-stability": "stable",
+	"config": {
+		"optimize-autoloader": true,
+		"autoloader-suffix": "AdvancedContentFilterAddon",
+		"preferred-install": "dist"
+	}
 }
diff --git a/advancedcontentfilter/composer.lock b/advancedcontentfilter/composer.lock
index 6dbd17ba..0b0114db 100644
--- a/advancedcontentfilter/composer.lock
+++ b/advancedcontentfilter/composer.lock
@@ -1,11 +1,42 @@
 {
     "_readme": [
         "This file locks the dependencies of your project to a known state",
-        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
+        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "a7276eb2d2108a26699f69c750d02d27",
+    "content-hash": "d0e3662dd9d910ffe4f71d325bc39319",
     "packages": [
+        {
+            "name": "container-interop/container-interop",
+            "version": "1.2.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/container-interop/container-interop.git",
+                "reference": "79cbf1341c22ec75643d841642dd5d6acd83bdb8"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/container-interop/container-interop/zipball/79cbf1341c22ec75643d841642dd5d6acd83bdb8",
+                "reference": "79cbf1341c22ec75643d841642dd5d6acd83bdb8",
+                "shasum": ""
+            },
+            "require": {
+                "psr/container": "^1.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Interop\\Container\\": "src/Interop/Container/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "Promoting the interoperability of container objects (DIC, SL, etc.)",
+            "homepage": "https://github.com/container-interop/container-interop",
+            "time": "2017-02-14T19:40:03+00:00"
+        },
         {
             "name": "nikic/fast-route",
             "version": "v1.3.0",
@@ -52,6 +83,56 @@
             ],
             "time": "2018-02-13T20:26:39+00:00"
         },
+        {
+            "name": "pimple/pimple",
+            "version": "v3.2.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/silexphp/Pimple.git",
+                "reference": "9e403941ef9d65d20cba7d54e29fe906db42cf32"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/silexphp/Pimple/zipball/9e403941ef9d65d20cba7d54e29fe906db42cf32",
+                "reference": "9e403941ef9d65d20cba7d54e29fe906db42cf32",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0",
+                "psr/container": "^1.0"
+            },
+            "require-dev": {
+                "symfony/phpunit-bridge": "^3.2"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.2.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Pimple": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                }
+            ],
+            "description": "Pimple, a simple Dependency Injection Container",
+            "homepage": "http://pimple.sensiolabs.org",
+            "keywords": [
+                "container",
+                "dependency injection"
+            ],
+            "time": "2018-01-21T07:42:36+00:00"
+        },
         {
             "name": "psr/cache",
             "version": "1.0.1",
@@ -100,22 +181,27 @@
         },
         {
             "name": "psr/container",
-            "version": "1.1.2",
+            "version": "1.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/container.git",
-                "reference": "513e0666f7216c7459170d56df27dfcefe1689ea"
+                "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/container/zipball/513e0666f7216c7459170d56df27dfcefe1689ea",
-                "reference": "513e0666f7216c7459170d56df27dfcefe1689ea",
+                "url": "https://api.github.com/repos/php-fig/container/zipball/b7ce3b176482dbbc1245ebf52b181af44c2cf55f",
+                "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.4.0"
+                "php": ">=5.3.0"
             },
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
             "autoload": {
                 "psr-4": {
                     "Psr\\Container\\": "src/"
@@ -128,7 +214,7 @@
             "authors": [
                 {
                     "name": "PHP-FIG",
-                    "homepage": "https://www.php-fig.org/"
+                    "homepage": "http://www.php-fig.org/"
                 }
             ],
             "description": "Common Container Interface (PHP FIG PSR-11)",
@@ -140,25 +226,24 @@
                 "container-interop",
                 "psr"
             ],
-            "time": "2021-11-05T16:50:12+00:00"
+            "time": "2017-02-14T16:28:37+00:00"
         },
         {
-            "name": "psr/http-factory",
-            "version": "1.0.2",
+            "name": "psr/http-message",
+            "version": "1.0.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/php-fig/http-factory.git",
-                "reference": "e616d01114759c4c489f93b099585439f795fe35"
+                "url": "https://github.com/php-fig/http-message.git",
+                "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/http-factory/zipball/e616d01114759c4c489f93b099585439f795fe35",
-                "reference": "e616d01114759c4c489f93b099585439f795fe35",
+                "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363",
+                "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.0.0",
-                "psr/http-message": "^1.0 || ^2.0"
+                "php": ">=5.3.0"
             },
             "type": "library",
             "extra": {
@@ -178,58 +263,7 @@
             "authors": [
                 {
                     "name": "PHP-FIG",
-                    "homepage": "https://www.php-fig.org/"
-                }
-            ],
-            "description": "Common interfaces for PSR-7 HTTP message factories",
-            "keywords": [
-                "factory",
-                "http",
-                "message",
-                "psr",
-                "psr-17",
-                "psr-7",
-                "request",
-                "response"
-            ],
-            "time": "2023-04-10T20:10:41+00:00"
-        },
-        {
-            "name": "psr/http-message",
-            "version": "2.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/php-fig/http-message.git",
-                "reference": "402d35bcb92c70c026d1a6a9883f06b2ead23d71"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/http-message/zipball/402d35bcb92c70c026d1a6a9883f06b2ead23d71",
-                "reference": "402d35bcb92c70c026d1a6a9883f06b2ead23d71",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.2 || ^8.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Psr\\Http\\Message\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "PHP-FIG",
-                    "homepage": "https://www.php-fig.org/"
+                    "homepage": "http://www.php-fig.org/"
                 }
             ],
             "description": "Common interface for HTTP messages",
@@ -242,126 +276,20 @@
                 "request",
                 "response"
             ],
-            "time": "2023-04-04T09:54:51+00:00"
-        },
-        {
-            "name": "psr/http-server-handler",
-            "version": "1.0.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/php-fig/http-server-handler.git",
-                "reference": "84c4fb66179be4caaf8e97bd239203245302e7d4"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/http-server-handler/zipball/84c4fb66179be4caaf8e97bd239203245302e7d4",
-                "reference": "84c4fb66179be4caaf8e97bd239203245302e7d4",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.0",
-                "psr/http-message": "^1.0 || ^2.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Psr\\Http\\Server\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "PHP-FIG",
-                    "homepage": "https://www.php-fig.org/"
-                }
-            ],
-            "description": "Common interface for HTTP server-side request handler",
-            "keywords": [
-                "handler",
-                "http",
-                "http-interop",
-                "psr",
-                "psr-15",
-                "psr-7",
-                "request",
-                "response",
-                "server"
-            ],
-            "time": "2023-04-10T20:06:20+00:00"
-        },
-        {
-            "name": "psr/http-server-middleware",
-            "version": "1.0.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/php-fig/http-server-middleware.git",
-                "reference": "c1481f747daaa6a0782775cd6a8c26a1bf4a3829"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/http-server-middleware/zipball/c1481f747daaa6a0782775cd6a8c26a1bf4a3829",
-                "reference": "c1481f747daaa6a0782775cd6a8c26a1bf4a3829",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.0",
-                "psr/http-message": "^1.0 || ^2.0",
-                "psr/http-server-handler": "^1.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Psr\\Http\\Server\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "PHP-FIG",
-                    "homepage": "https://www.php-fig.org/"
-                }
-            ],
-            "description": "Common interface for HTTP server-side middleware",
-            "keywords": [
-                "http",
-                "http-interop",
-                "middleware",
-                "psr",
-                "psr-15",
-                "psr-7",
-                "request",
-                "response"
-            ],
-            "time": "2023-04-11T06:14:47+00:00"
+            "time": "2016-08-06T14:39:51+00:00"
         },
         {
             "name": "psr/log",
-            "version": "1.1.4",
+            "version": "1.0.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/log.git",
-                "reference": "d49695b909c3b7628b6289db5479a1c204601f11"
+                "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/log/zipball/d49695b909c3b7628b6289db5479a1c204601f11",
-                "reference": "d49695b909c3b7628b6289db5479a1c204601f11",
+                "url": "https://api.github.com/repos/php-fig/log/zipball/4ebe3a8bf773a19edfe0a84b6585ba3d401b724d",
+                "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d",
                 "shasum": ""
             },
             "require": {
@@ -370,7 +298,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.1.x-dev"
+                    "dev-master": "1.0.x-dev"
                 }
             },
             "autoload": {
@@ -385,7 +313,7 @@
             "authors": [
                 {
                     "name": "PHP-FIG",
-                    "homepage": "https://www.php-fig.org/"
+                    "homepage": "http://www.php-fig.org/"
                 }
             ],
             "description": "Common interface for logging libraries",
@@ -395,55 +323,84 @@
                 "psr",
                 "psr-3"
             ],
-            "time": "2021-05-03T11:20:27+00:00"
+            "time": "2016-10-10T12:19:37+00:00"
         },
         {
-            "name": "slim/slim",
-            "version": "4.13.0",
+            "name": "psr/simple-cache",
+            "version": "1.0.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/slimphp/Slim.git",
-                "reference": "038fd5713d5a41636fdff0e8dcceedecdd17fc17"
+                "url": "https://github.com/php-fig/simple-cache.git",
+                "reference": "408d5eafb83c57f6365a3ca330ff23aa4a5fa39b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/slimphp/Slim/zipball/038fd5713d5a41636fdff0e8dcceedecdd17fc17",
-                "reference": "038fd5713d5a41636fdff0e8dcceedecdd17fc17",
+                "url": "https://api.github.com/repos/php-fig/simple-cache/zipball/408d5eafb83c57f6365a3ca330ff23aa4a5fa39b",
+                "reference": "408d5eafb83c57f6365a3ca330ff23aa4a5fa39b",
                 "shasum": ""
             },
             "require": {
-                "ext-json": "*",
-                "nikic/fast-route": "^1.3",
-                "php": "^7.4 || ^8.0",
-                "psr/container": "^1.0 || ^2.0",
-                "psr/http-factory": "^1.0",
-                "psr/http-message": "^1.1 || ^2.0",
-                "psr/http-server-handler": "^1.0",
-                "psr/http-server-middleware": "^1.0",
-                "psr/log": "^1.1 || ^2.0 || ^3.0"
+                "php": ">=5.3.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\SimpleCache\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "http://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interfaces for simple caching",
+            "keywords": [
+                "cache",
+                "caching",
+                "psr",
+                "psr-16",
+                "simple-cache"
+            ],
+            "time": "2017-10-23T01:57:42+00:00"
+        },
+        {
+            "name": "slim/slim",
+            "version": "3.9.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/slimphp/Slim.git",
+                "reference": "4086d0106cf5a7135c69fce4161fe355a8feb118"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/slimphp/Slim/zipball/4086d0106cf5a7135c69fce4161fe355a8feb118",
+                "reference": "4086d0106cf5a7135c69fce4161fe355a8feb118",
+                "shasum": ""
+            },
+            "require": {
+                "container-interop/container-interop": "^1.2",
+                "nikic/fast-route": "^1.0",
+                "php": ">=5.5.0",
+                "pimple/pimple": "^3.0",
+                "psr/container": "^1.0",
+                "psr/http-message": "^1.0"
+            },
+            "provide": {
+                "psr/http-message-implementation": "1.0"
             },
             "require-dev": {
-                "adriansuter/php-autoload-override": "^1.4",
-                "ext-simplexml": "*",
-                "guzzlehttp/psr7": "^2.6",
-                "httpsoft/http-message": "^1.1",
-                "httpsoft/http-server-request": "^1.1",
-                "laminas/laminas-diactoros": "^2.17 || ^3",
-                "nyholm/psr7": "^1.8",
-                "nyholm/psr7-server": "^1.1",
-                "phpspec/prophecy": "^1.19",
-                "phpspec/prophecy-phpunit": "^2.1",
-                "phpstan/phpstan": "^1.10",
-                "phpunit/phpunit": "^9.6",
-                "slim/http": "^1.3",
-                "slim/psr7": "^1.6",
-                "squizlabs/php_codesniffer": "^3.9"
-            },
-            "suggest": {
-                "ext-simplexml": "Needed to support XML format in BodyParsingMiddleware",
-                "ext-xml": "Needed to support XML format in BodyParsingMiddleware",
-                "php-di/php-di": "PHP-DI is the recommended container library to be used with Slim",
-                "slim/psr7": "Slim PSR-7 implementation. See https://www.slimframework.com/docs/v4/start/installation.html for more information."
+                "phpunit/phpunit": "^4.0",
+                "squizlabs/php_codesniffer": "^2.5"
             },
             "type": "library",
             "autoload": {
@@ -456,100 +413,77 @@
                 "MIT"
             ],
             "authors": [
-                {
-                    "name": "Josh Lockhart",
-                    "email": "hello@joshlockhart.com",
-                    "homepage": "https://joshlockhart.com"
-                },
-                {
-                    "name": "Andrew Smith",
-                    "email": "a.smith@silentworks.co.uk",
-                    "homepage": "http://silentworks.co.uk"
-                },
                 {
                     "name": "Rob Allen",
                     "email": "rob@akrabat.com",
                     "homepage": "http://akrabat.com"
                 },
                 {
-                    "name": "Pierre Berube",
-                    "email": "pierre@lgse.com",
-                    "homepage": "http://www.lgse.com"
+                    "name": "Josh Lockhart",
+                    "email": "hello@joshlockhart.com",
+                    "homepage": "https://joshlockhart.com"
                 },
                 {
                     "name": "Gabriel Manricks",
                     "email": "gmanricks@me.com",
                     "homepage": "http://gabrielmanricks.com"
+                },
+                {
+                    "name": "Andrew Smith",
+                    "email": "a.smith@silentworks.co.uk",
+                    "homepage": "http://silentworks.co.uk"
                 }
             ],
             "description": "Slim is a PHP micro framework that helps you quickly write simple yet powerful web applications and APIs",
-            "homepage": "https://www.slimframework.com",
+            "homepage": "https://slimframework.com",
             "keywords": [
                 "api",
                 "framework",
                 "micro",
                 "router"
             ],
-            "funding": [
-                {
-                    "url": "https://opencollective.com/slimphp",
-                    "type": "open_collective"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/slim/slim",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2024-03-03T21:25:30+00:00"
+            "time": "2017-11-26T19:13:09+00:00"
         },
         {
             "name": "symfony/cache",
-            "version": "v4.4.48",
+            "version": "v3.4.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/cache.git",
-                "reference": "3b98ed664887ad197b8ede3da2432787212eb915"
+                "reference": "13255ddd056e49f3154747943f8ee175d555d394"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/cache/zipball/3b98ed664887ad197b8ede3da2432787212eb915",
-                "reference": "3b98ed664887ad197b8ede3da2432787212eb915",
+                "url": "https://api.github.com/repos/symfony/cache/zipball/13255ddd056e49f3154747943f8ee175d555d394",
+                "reference": "13255ddd056e49f3154747943f8ee175d555d394",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1.3",
-                "psr/cache": "^1.0|^2.0",
-                "psr/log": "^1|^2|^3",
-                "symfony/cache-contracts": "^1.1.7|^2",
-                "symfony/polyfill-php73": "^1.9",
-                "symfony/polyfill-php80": "^1.16",
-                "symfony/service-contracts": "^1.1|^2",
-                "symfony/var-exporter": "^4.2|^5.0"
+                "php": "^5.5.9|>=7.0.8",
+                "psr/cache": "~1.0",
+                "psr/log": "~1.0",
+                "psr/simple-cache": "^1.0",
+                "symfony/polyfill-apcu": "~1.1"
             },
             "conflict": {
-                "doctrine/dbal": "<2.7",
-                "symfony/dependency-injection": "<3.4",
-                "symfony/http-kernel": "<4.4|>=5.0",
-                "symfony/var-dumper": "<4.4"
+                "symfony/var-dumper": "<3.3"
             },
             "provide": {
-                "psr/cache-implementation": "1.0|2.0",
-                "psr/simple-cache-implementation": "1.0|2.0",
-                "symfony/cache-implementation": "1.0|2.0"
+                "psr/cache-implementation": "1.0",
+                "psr/simple-cache-implementation": "1.0"
             },
             "require-dev": {
                 "cache/integration-tests": "dev-master",
-                "doctrine/cache": "^1.6|^2.0",
-                "doctrine/dbal": "^2.7|^3.0",
-                "predis/predis": "^1.1",
-                "psr/simple-cache": "^1.0|^2.0",
-                "symfony/config": "^4.2|^5.0",
-                "symfony/dependency-injection": "^3.4|^4.1|^5.0",
-                "symfony/filesystem": "^4.4|^5.0",
-                "symfony/http-kernel": "^4.4",
-                "symfony/var-dumper": "^4.4|^5.0"
+                "doctrine/cache": "~1.6",
+                "doctrine/dbal": "~2.4",
+                "predis/predis": "~1.0"
             },
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.4-dev"
+                }
+            },
             "autoload": {
                 "psr-4": {
                     "Symfony\\Component\\Cache\\": ""
@@ -572,188 +506,38 @@
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Provides extended PSR-6, PSR-16 (and tags) implementations",
+            "description": "Symfony Cache component with PSR-6, PSR-16, and tags",
             "homepage": "https://symfony.com",
             "keywords": [
                 "caching",
                 "psr6"
             ],
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2022-10-17T20:21:54+00:00"
-        },
-        {
-            "name": "symfony/cache-contracts",
-            "version": "v2.5.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/cache-contracts.git",
-                "reference": "64be4a7acb83b6f2bf6de9a02cee6dad41277ebc"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/cache-contracts/zipball/64be4a7acb83b6f2bf6de9a02cee6dad41277ebc",
-                "reference": "64be4a7acb83b6f2bf6de9a02cee6dad41277ebc",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.2.5",
-                "psr/cache": "^1.0|^2.0|^3.0"
-            },
-            "suggest": {
-                "symfony/cache-implementation": ""
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "2.5-dev"
-                },
-                "thanks": {
-                    "name": "symfony/contracts",
-                    "url": "https://github.com/symfony/contracts"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Contracts\\Cache\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Generic abstractions related to caching",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "abstractions",
-                "contracts",
-                "decoupling",
-                "interfaces",
-                "interoperability",
-                "standards"
-            ],
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2022-01-02T09:53:40+00:00"
-        },
-        {
-            "name": "symfony/deprecation-contracts",
-            "version": "v2.5.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/deprecation-contracts.git",
-                "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/e8b495ea28c1d97b5e0c121748d6f9b53d075c66",
-                "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.1"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "2.5-dev"
-                },
-                "thanks": {
-                    "name": "symfony/contracts",
-                    "url": "https://github.com/symfony/contracts"
-                }
-            },
-            "autoload": {
-                "files": [
-                    "function.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "A generic function and convention to trigger deprecation notices",
-            "homepage": "https://symfony.com",
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2022-01-02T09:53:40+00:00"
+            "time": "2018-04-02T14:35:16+00:00"
         },
         {
             "name": "symfony/expression-language",
-            "version": "v3.4.47",
+            "version": "v3.4.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/expression-language.git",
-                "reference": "de38e66398fca1fcb9c48e80279910e6889cb28f"
+                "reference": "867e4d1f5d4e52435a8ffff6b24fd6a801582241"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/expression-language/zipball/de38e66398fca1fcb9c48e80279910e6889cb28f",
-                "reference": "de38e66398fca1fcb9c48e80279910e6889cb28f",
+                "url": "https://api.github.com/repos/symfony/expression-language/zipball/867e4d1f5d4e52435a8ffff6b24fd6a801582241",
+                "reference": "867e4d1f5d4e52435a8ffff6b24fd6a801582241",
                 "shasum": ""
             },
             "require": {
                 "php": "^5.5.9|>=7.0.8",
-                "symfony/cache": "~3.1|~4.0",
-                "symfony/polyfill-php70": "~1.6"
+                "symfony/cache": "~3.1|~4.0"
             },
             "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.4-dev"
+                }
+            },
             "autoload": {
                 "psr-4": {
                     "Symfony\\Component\\ExpressionLanguage\\": ""
@@ -778,345 +562,37 @@
             ],
             "description": "Symfony ExpressionLanguage Component",
             "homepage": "https://symfony.com",
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2020-10-24T10:57:07+00:00"
+            "time": "2018-01-03T07:37:34+00:00"
         },
         {
-            "name": "symfony/polyfill-php70",
-            "version": "v1.20.0",
+            "name": "symfony/polyfill-apcu",
+            "version": "v1.7.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/symfony/polyfill-php70.git",
-                "reference": "5f03a781d984aae42cebd18e7912fa80f02ee644"
+                "url": "https://github.com/symfony/polyfill-apcu.git",
+                "reference": "e8ae2136ddb53dea314df56fcd88e318ab936c00"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/5f03a781d984aae42cebd18e7912fa80f02ee644",
-                "reference": "5f03a781d984aae42cebd18e7912fa80f02ee644",
+                "url": "https://api.github.com/repos/symfony/polyfill-apcu/zipball/e8ae2136ddb53dea314df56fcd88e318ab936c00",
+                "reference": "e8ae2136ddb53dea314df56fcd88e318ab936c00",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1"
-            },
-            "type": "metapackage",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "1.20-dev"
-                },
-                "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill backporting some PHP 7.0+ features to lower PHP versions",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "polyfill",
-                "portable",
-                "shim"
-            ],
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2020-10-23T14:02:19+00:00"
-        },
-        {
-            "name": "symfony/polyfill-php73",
-            "version": "v1.29.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-php73.git",
-                "reference": "21bd091060673a1177ae842c0ef8fe30893114d2"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/21bd091060673a1177ae842c0ef8fe30893114d2",
-                "reference": "21bd091060673a1177ae842c0ef8fe30893114d2",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.1"
-            },
-            "type": "library",
-            "extra": {
-                "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
-                }
-            },
-            "autoload": {
-                "files": [
-                    "bootstrap.php"
-                ],
-                "psr-4": {
-                    "Symfony\\Polyfill\\Php73\\": ""
-                },
-                "classmap": [
-                    "Resources/stubs"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill backporting some PHP 7.3+ features to lower PHP versions",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "polyfill",
-                "portable",
-                "shim"
-            ],
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2024-01-29T20:11:03+00:00"
-        },
-        {
-            "name": "symfony/polyfill-php80",
-            "version": "v1.29.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-php80.git",
-                "reference": "87b68208d5c1188808dd7839ee1e6c8ec3b02f1b"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/87b68208d5c1188808dd7839ee1e6c8ec3b02f1b",
-                "reference": "87b68208d5c1188808dd7839ee1e6c8ec3b02f1b",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.1"
-            },
-            "type": "library",
-            "extra": {
-                "thanks": {
-                    "name": "symfony/polyfill",
-                    "url": "https://github.com/symfony/polyfill"
-                }
-            },
-            "autoload": {
-                "files": [
-                    "bootstrap.php"
-                ],
-                "psr-4": {
-                    "Symfony\\Polyfill\\Php80\\": ""
-                },
-                "classmap": [
-                    "Resources/stubs"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Ion Bazan",
-                    "email": "ion.bazan@gmail.com"
-                },
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "polyfill",
-                "portable",
-                "shim"
-            ],
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2024-01-29T20:11:03+00:00"
-        },
-        {
-            "name": "symfony/service-contracts",
-            "version": "v2.5.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/service-contracts.git",
-                "reference": "4b426aac47d6427cc1a1d0f7e2ac724627f5966c"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/4b426aac47d6427cc1a1d0f7e2ac724627f5966c",
-                "reference": "4b426aac47d6427cc1a1d0f7e2ac724627f5966c",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.2.5",
-                "psr/container": "^1.1",
-                "symfony/deprecation-contracts": "^2.1|^3"
-            },
-            "conflict": {
-                "ext-psr": "<1.1|>=2"
-            },
-            "suggest": {
-                "symfony/service-implementation": ""
+                "php": ">=5.3.3"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "2.5-dev"
-                },
-                "thanks": {
-                    "name": "symfony/contracts",
-                    "url": "https://github.com/symfony/contracts"
+                    "dev-master": "1.7-dev"
                 }
             },
             "autoload": {
                 "psr-4": {
-                    "Symfony\\Contracts\\Service\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
+                    "Symfony\\Polyfill\\Apcu\\": ""
                 },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Generic abstractions related to writing services",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "abstractions",
-                "contracts",
-                "decoupling",
-                "interfaces",
-                "interoperability",
-                "standards"
-            ],
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2022-05-30T19:17:29+00:00"
-        },
-        {
-            "name": "symfony/var-exporter",
-            "version": "v5.4.35",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/var-exporter.git",
-                "reference": "abb0a151b62d6b07e816487e20040464af96cae7"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/var-exporter/zipball/abb0a151b62d6b07e816487e20040464af96cae7",
-                "reference": "abb0a151b62d6b07e816487e20040464af96cae7",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.2.5",
-                "symfony/polyfill-php80": "^1.16"
-            },
-            "require-dev": {
-                "symfony/var-dumper": "^4.4.9|^5.0.9|^6.0"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\VarExporter\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
+                "files": [
+                    "bootstrap.php"
                 ]
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -1133,31 +609,16 @@
                     "homepage": "https://symfony.com/contributors"
                 }
             ],
-            "description": "Allows exporting any serializable PHP data structure to plain PHP code",
+            "description": "Symfony polyfill backporting apcu_* functions to lower PHP versions",
             "homepage": "https://symfony.com",
             "keywords": [
-                "clone",
-                "construct",
-                "export",
-                "hydrate",
-                "instantiate",
-                "serialize"
+                "apcu",
+                "compatibility",
+                "polyfill",
+                "portable",
+                "shim"
             ],
-            "funding": [
-                {
-                    "url": "https://symfony.com/sponsor",
-                    "type": "custom"
-                },
-                {
-                    "url": "https://github.com/fabpot",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2024-01-23T13:51:25+00:00"
+            "time": "2018-01-30T19:27:44+00:00"
         }
     ],
     "packages-dev": [],
@@ -1166,10 +627,8 @@
     "stability-flags": [],
     "prefer-stable": false,
     "prefer-lowest": false,
-    "platform": [],
-    "platform-dev": [],
-    "platform-overrides": {
-        "php": "7.4"
+    "platform": {
+        "php": ">=5.6.0"
     },
-    "plugin-api-version": "1.1.0"
+    "platform-dev": []
 }
diff --git a/advancedcontentfilter/doc/advancedcontentfilter.md b/advancedcontentfilter/doc/advancedcontentfilter.md
index fa2becfa..41320fa3 100644
--- a/advancedcontentfilter/doc/advancedcontentfilter.md
+++ b/advancedcontentfilter/doc/advancedcontentfilter.md
@@ -34,14 +34,6 @@ If the expression using a post variables returns `true`, the post will be collap
 
 A post will be collapsed if at least one rule matches, but all matching rule names will be displayed above the collapsed content.
 
-## Examples
-
-1. Collapse posts with specific domains `body matches "/\\.example\\.com/"`
-2. Collapse posts that contains the words `body matches "/Guten Morgen/"`
-3. Collapse posts with the word facebook that have a space in front and after the word `body matches "//s facebook/s /"`
-4. Collapse posts that contains more than 1 image `body matches "/(?:(?:(?:\\[url(?:=.*)?\\])?\\[img(?:=.*)?\\].*\\[\\/img\\]\\s*(?:\\[\\/url\\])?)\\s*){2}/"`
-
-
 ## Expression Syntax
 
 ### Supported Literals
@@ -330,7 +322,7 @@ You can also retrieve the variables of a specific post by pasting its URL below
 		<th>rendered_html</th>
 		<td>string</td>
 		<td>
-			Over-compensation #&lt;a href="https://friendica.mrpetovan.com/search?tag=Street" class="tag" title="Street"&gt;Street&lt;/a&gt; #&lt;a href="https://friendica.mrpetovan.com/search?tag=Night" class="tag" title="Night"&gt;Night&lt;/a&gt; #&lt;a href="https://friendica.mrpetovan.com/search?tag=CarLights" class="tag" title="CarLights"&gt;CarLights&lt;/a&gt; #&lt;a href="https://friendica.mrpetovan.com/search?tag=Jeep" class="tag" title="Jeep"&gt;Jeep&lt;/a&gt; #&lt;a href="https://friendica.mrpetovan.com/search?tag=NoPeople" class="tag" title="NoPeople"&gt;NoPeople&lt;/a&gt; #&lt;a href="https://friendica.mrpetovan.com/search?tag=Close" class="tag" title="Close"&gt;Close&lt;/a&gt;-up &lt;div class="type-link"&gt;&lt;a href="https://www.eyeem.com/p/120800309" target="_blank" rel="noopener noreferrer"&gt;&lt;img src="https://friendica.mrpetovan.com/proxy/bb/aHR0cHM6Ly9jZG4uZXllZW0uY29tL3RodW1iL2IyZjAxOTczOGNiZWVmMDZlMmY4Yzk1MTdjNjI4NmE4YWRjZDNhMDAtMTUyMjE4NDgyMDY0MS82NDAvNDgw" alt="" title="Over-compensation Street Night Car Lights Jeep No | EyeEm" class="attachment-image"&gt;&lt;/a&gt;&lt;br&gt;&lt;h4&gt;&lt;a href="https://www.eyeem.com/p/120800309"&gt;Over-compensation Street Night Car Lights Jeep No | EyeEm&lt;/a&gt;&lt;/h4&gt;&lt;blockquote&gt;Photo by @&lt;a href="https://twitter.com/MrPetovan" class="userinfo mention" title="MrPetovan"&gt;MrPetovan&lt;/a&gt;&lt;/blockquote&gt;&lt;sup&gt;&lt;a href="https://www.eyeem.com/p/120800309"&gt;www.eyeem.com&lt;/a&gt;&lt;/sup&gt;&lt;/div&gt;
+			Over-compensation #&lt;a href="https://friendica.mrpetovan.com/search?tag=Street" class="tag" title="Street"&gt;Street&lt;/a&gt; #&lt;a href="https://friendica.mrpetovan.com/search?tag=Night" class="tag" title="Night"&gt;Night&lt;/a&gt; #&lt;a href="https://friendica.mrpetovan.com/search?tag=CarLights" class="tag" title="CarLights"&gt;CarLights&lt;/a&gt; #&lt;a href="https://friendica.mrpetovan.com/search?tag=Jeep" class="tag" title="Jeep"&gt;Jeep&lt;/a&gt; #&lt;a href="https://friendica.mrpetovan.com/search?tag=NoPeople" class="tag" title="NoPeople"&gt;NoPeople&lt;/a&gt; #&lt;a href="https://friendica.mrpetovan.com/search?tag=Close" class="tag" title="Close"&gt;Close&lt;/a&gt;-up &lt;div class="type-link"&gt;&lt;a href="https://www.eyeem.com/p/120800309" target="_blank"&gt;&lt;img src="https://friendica.mrpetovan.com/proxy/bb/aHR0cHM6Ly9jZG4uZXllZW0uY29tL3RodW1iL2IyZjAxOTczOGNiZWVmMDZlMmY4Yzk1MTdjNjI4NmE4YWRjZDNhMDAtMTUyMjE4NDgyMDY0MS82NDAvNDgw" alt="" title="Over-compensation Street Night Car Lights Jeep No | EyeEm" class="attachment-image"&gt;&lt;/a&gt;&lt;br&gt;&lt;h4&gt;&lt;a href="https://www.eyeem.com/p/120800309"&gt;Over-compensation Street Night Car Lights Jeep No | EyeEm&lt;/a&gt;&lt;/h4&gt;&lt;blockquote&gt;Photo by @&lt;a href="https://twitter.com/MrPetovan" class="userinfo mention" title="MrPetovan"&gt;MrPetovan&lt;/a&gt;&lt;/blockquote&gt;&lt;sup&gt;&lt;a href="https://www.eyeem.com/p/120800309"&gt;www.eyeem.com&lt;/a&gt;&lt;/sup&gt;&lt;/div&gt;
 		</td>
 	</tr>
 	<tr>
@@ -458,6 +450,11 @@ You can also retrieve the variables of a specific post by pasting its URL below
 		<td>string</td>
 		<td>null</td>
 	</tr>
+	<tr>
+		<th>event_adjust</th>
+		<td>boolean</td>
+		<td>null</td>
+	</tr>
 	<tr>
 		<th>event_ignore</th>
 		<td>boolean</td>
@@ -473,14 +470,14 @@ You can also retrieve the variables of a specific post by pasting its URL below
 		<td>list</td>
 		<td>
 			<ol start="0">
-				<li>#&lt;a href="https://friendica.mrpetovan.com/search?tag=Street" target="_blank" rel="noopener noreferrer"&gt;street&lt;/a&gt;</li>
-				<li>#&lt;a href="https://friendica.mrpetovan.com/search?tag=Night" target="_blank" rel="noopener noreferrer"&gt;night&lt;/a&gt;</li>
-				<li>#&lt;a href="https://friendica.mrpetovan.com/search?tag=CarLights" target="_blank" rel="noopener noreferrer"&gt;carlights&lt;/a&gt;</li>
-				<li>#&lt;a href="https://friendica.mrpetovan.com/search?tag=Jeep" target="_blank" rel="noopener noreferrer"&gt;jeep&lt;/a&gt;</li>
-				<li>#&lt;a href="https://friendica.mrpetovan.com/search?tag=NoPeople" target="_blank" rel="noopener noreferrer"&gt;nopeople&lt;/a&gt;</li>
-				<li>#&lt;a href="https://friendica.mrpetovan.com/search?tag=Close" target="_blank" rel="noopener noreferrer"&gt;close&lt;/a&gt;</li>
-				<li>@&lt;a href="https://twitter.com/MrPetovan" target="_blank" rel="noopener noreferrer"&gt;mrpetovan&lt;/a&gt;</li>
-				<li>#&lt;a href="https://friendica.mrpetovan.com/search?tag=Close-up" target="_blank" rel="noopener noreferrer"&gt;close-up&lt;/a&gt;</li>
+				<li>#&lt;a href="https://friendica.mrpetovan.com/search?tag=Street" target="_blank"&gt;street&lt;/a&gt;</li>
+				<li>#&lt;a href="https://friendica.mrpetovan.com/search?tag=Night" target="_blank"&gt;night&lt;/a&gt;</li>
+				<li>#&lt;a href="https://friendica.mrpetovan.com/search?tag=CarLights" target="_blank"&gt;carlights&lt;/a&gt;</li>
+				<li>#&lt;a href="https://friendica.mrpetovan.com/search?tag=Jeep" target="_blank"&gt;jeep&lt;/a&gt;</li>
+				<li>#&lt;a href="https://friendica.mrpetovan.com/search?tag=NoPeople" target="_blank"&gt;nopeople&lt;/a&gt;</li>
+				<li>#&lt;a href="https://friendica.mrpetovan.com/search?tag=Close" target="_blank"&gt;close&lt;/a&gt;</li>
+				<li>@&lt;a href="https://twitter.com/MrPetovan" target="_blank"&gt;mrpetovan&lt;/a&gt;</li>
+				<li>#&lt;a href="https://friendica.mrpetovan.com/search?tag=Close-up" target="_blank"&gt;close-up&lt;/a&gt;</li>
 			</ol>
 		</td>
 	</tr>
@@ -489,13 +486,13 @@ You can also retrieve the variables of a specific post by pasting its URL below
 		<td>list</td>
 		<td>
 			<ol start="0">
-				<li>#&lt;a href="https://friendica.mrpetovan.com/search?tag=Street" target="_blank" rel="noopener noreferrer"&gt;street&lt;/a&gt;</li>
-				<li>#&lt;a href="https://friendica.mrpetovan.com/search?tag=Night" target="_blank" rel="noopener noreferrer"&gt;night&lt;/a&gt;</li>
-				<li>#&lt;a href="https://friendica.mrpetovan.com/search?tag=CarLights" target="_blank" rel="noopener noreferrer"&gt;carlights&lt;/a&gt;</li>
-				<li>#&lt;a href="https://friendica.mrpetovan.com/search?tag=Jeep" target="_blank" rel="noopener noreferrer"&gt;jeep&lt;/a&gt;</li>
-				<li>#&lt;a href="https://friendica.mrpetovan.com/search?tag=NoPeople" target="_blank" rel="noopener noreferrer"&gt;nopeople&lt;/a&gt;</li>
-				<li>#&lt;a href="https://friendica.mrpetovan.com/search?tag=Close" target="_blank" rel="noopener noreferrer"&gt;close&lt;/a&gt;</li>
-				<li>#&lt;a href="https://friendica.mrpetovan.com/search?tag=Close-up" target="_blank" rel="noopener noreferrer"&gt;close-up&lt;/a&gt;</li>
+				<li>#&lt;a href="https://friendica.mrpetovan.com/search?tag=Street" target="_blank"&gt;street&lt;/a&gt;</li>
+				<li>#&lt;a href="https://friendica.mrpetovan.com/search?tag=Night" target="_blank"&gt;night&lt;/a&gt;</li>
+				<li>#&lt;a href="https://friendica.mrpetovan.com/search?tag=CarLights" target="_blank"&gt;carlights&lt;/a&gt;</li>
+				<li>#&lt;a href="https://friendica.mrpetovan.com/search?tag=Jeep" target="_blank"&gt;jeep&lt;/a&gt;</li>
+				<li>#&lt;a href="https://friendica.mrpetovan.com/search?tag=NoPeople" target="_blank"&gt;nopeople&lt;/a&gt;</li>
+				<li>#&lt;a href="https://friendica.mrpetovan.com/search?tag=Close" target="_blank"&gt;close&lt;/a&gt;</li>
+				<li>#&lt;a href="https://friendica.mrpetovan.com/search?tag=Close-up" target="_blank"&gt;close-up&lt;/a&gt;</li>
 			</ol>
 		</td>
 	</tr>
@@ -504,9 +501,9 @@ You can also retrieve the variables of a specific post by pasting its URL below
 		<td>string</td>
 		<td>
 			<ol start="0">
-				<li>@&lt;a href="https://twitter.com/MrPetovan" target="_blank" rel="noopener noreferrer"&gt;mrpetovan&lt;/a&gt;</li>
+				<li>@&lt;a href="https://twitter.com/MrPetovan" target="_blank"&gt;mrpetovan&lt;/a&gt;</li>
 			</ol>
 		</td>
 	</tr>
 </tbody>
-</table>
+</table>
\ No newline at end of file
diff --git a/advancedcontentfilter/lang/C/messages.po b/advancedcontentfilter/lang/C/messages.po
index 68b42ed3..74bbaeb1 100644
--- a/advancedcontentfilter/lang/C/messages.po
+++ b/advancedcontentfilter/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-11 08:54-0400\n"
+"POT-Creation-Date: 2018-04-17 04:04+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,145 +17,147 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: advancedcontentfilter.php:154
+#: advancedcontentfilter.php:134
 #, php-format
 msgid "Filtered by rule: %s"
 msgstr ""
 
-#: advancedcontentfilter.php:170 advancedcontentfilter.php:225
+#: advancedcontentfilter.php:147 advancedcontentfilter.php:204
 msgid "Advanced Content Filter"
 msgstr ""
 
-#: advancedcontentfilter.php:224
+#: advancedcontentfilter.php:203
 msgid "Back to Addon Settings"
 msgstr ""
 
-#: advancedcontentfilter.php:226
+#: advancedcontentfilter.php:205
 msgid "Add a Rule"
 msgstr ""
 
-#: advancedcontentfilter.php:227
+#: advancedcontentfilter.php:206
 msgid "Help"
 msgstr ""
 
-#: advancedcontentfilter.php:228
+#: advancedcontentfilter.php:207
 msgid ""
 "Add and manage your personal content filter rules in this screen. Rules have "
 "a name and an arbitrary expression that will be matched against post data. "
 "For a complete reference of the available operations and variables, check "
-"the help page."
+"the <a href=\"advancedcontentfilter/help\">help page</a>."
 msgstr ""
 
-#: advancedcontentfilter.php:229
+#: advancedcontentfilter.php:208
 msgid "Your rules"
 msgstr ""
 
-#: advancedcontentfilter.php:230
+#: advancedcontentfilter.php:209
 msgid ""
 "You have no rules yet! Start adding one by clicking on the button above next "
 "to the title."
 msgstr ""
 
-#: advancedcontentfilter.php:231
+#: advancedcontentfilter.php:210
 msgid "Disabled"
 msgstr ""
 
-#: advancedcontentfilter.php:232
+#: advancedcontentfilter.php:211
 msgid "Enabled"
 msgstr ""
 
-#: advancedcontentfilter.php:233
+#: advancedcontentfilter.php:212
 msgid "Disable this rule"
 msgstr ""
 
-#: advancedcontentfilter.php:234
+#: advancedcontentfilter.php:213
 msgid "Enable this rule"
 msgstr ""
 
-#: advancedcontentfilter.php:235
+#: advancedcontentfilter.php:214
 msgid "Edit this rule"
 msgstr ""
 
-#: advancedcontentfilter.php:236
+#: advancedcontentfilter.php:215
 msgid "Edit the rule"
 msgstr ""
 
-#: advancedcontentfilter.php:237
+#: advancedcontentfilter.php:216
 msgid "Save this rule"
 msgstr ""
 
-#: advancedcontentfilter.php:238
+#: advancedcontentfilter.php:217
 msgid "Delete this rule"
 msgstr ""
 
-#: advancedcontentfilter.php:239
+#: advancedcontentfilter.php:218
 msgid "Rule"
 msgstr ""
 
-#: advancedcontentfilter.php:240
+#: advancedcontentfilter.php:219
 msgid "Close"
 msgstr ""
 
-#: advancedcontentfilter.php:241
+#: advancedcontentfilter.php:220
 msgid "Add new rule"
 msgstr ""
 
-#: advancedcontentfilter.php:242
+#: advancedcontentfilter.php:221
 msgid "Rule Name"
 msgstr ""
 
-#: advancedcontentfilter.php:243
+#: advancedcontentfilter.php:222
 msgid "Rule Expression"
 msgstr ""
 
-#: advancedcontentfilter.php:244
+#: advancedcontentfilter.php:223
+msgid ""
+"<p>Examples:</p><ul><li><pre>author_link == 'https://friendica.mrpetovan.com/"
+"profile/hypolite'</pre></li><li>tags</li></ul>"
+msgstr ""
+
+#: advancedcontentfilter.php:224
 msgid "Cancel"
 msgstr ""
 
-#: advancedcontentfilter.php:295
-msgid "This addon requires this node having at least one post"
-msgstr ""
-
-#: advancedcontentfilter.php:325 advancedcontentfilter.php:336
-#: advancedcontentfilter.php:347 advancedcontentfilter.php:383
-#: advancedcontentfilter.php:414 advancedcontentfilter.php:437
+#: advancedcontentfilter.php:290 advancedcontentfilter.php:301
+#: advancedcontentfilter.php:312 advancedcontentfilter.php:346
+#: advancedcontentfilter.php:375 advancedcontentfilter.php:396
 msgid "You must be logged in to use this method"
 msgstr ""
 
-#: advancedcontentfilter.php:351 advancedcontentfilter.php:387
-#: advancedcontentfilter.php:418
+#: advancedcontentfilter.php:316 advancedcontentfilter.php:350
+#: advancedcontentfilter.php:379
 msgid "Invalid form security token, please refresh the page."
 msgstr ""
 
-#: advancedcontentfilter.php:363
+#: advancedcontentfilter.php:328
 msgid "The rule name and expression are required."
 msgstr ""
 
-#: advancedcontentfilter.php:377
+#: advancedcontentfilter.php:340
 msgid "Rule successfully added"
 msgstr ""
 
-#: advancedcontentfilter.php:391 advancedcontentfilter.php:422
+#: advancedcontentfilter.php:354 advancedcontentfilter.php:383
 msgid "Rule doesn't exist or doesn't belong to you."
 msgstr ""
 
-#: advancedcontentfilter.php:408
+#: advancedcontentfilter.php:369
 msgid "Rule successfully updated"
 msgstr ""
 
-#: advancedcontentfilter.php:431
+#: advancedcontentfilter.php:390
 msgid "Rule successfully deleted"
 msgstr ""
 
-#: advancedcontentfilter.php:441
+#: advancedcontentfilter.php:400
 msgid "Missing argument: guid."
 msgstr ""
 
-#: advancedcontentfilter.php:449
+#: advancedcontentfilter.php:406
 #, php-format
 msgid "Unknown post with guid: %s"
 msgstr ""
 
-#: src/middlewares.php:49
+#: src/middlewares.php:28
 msgid "Method not found"
 msgstr ""
diff --git a/advancedcontentfilter/lang/ar/messages.po b/advancedcontentfilter/lang/ar/messages.po
deleted file mode 100644
index 41594438..00000000
--- a/advancedcontentfilter/lang/ar/messages.po
+++ /dev/null
@@ -1,166 +0,0 @@
-# ADDON advancedcontentfilter
-# Copyright (C)
-# This file is distributed under the same license as the Friendica advancedcontentfilter addon package.
-# 
-# 
-# Translators:
-# Farida Khalaf <faridakhalaf@hotmail.com>, 2021
-# abidin toumi <abidin24@tutanota.com>, 2021
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-25 13:15+0000\n"
-"PO-Revision-Date: 2018-05-24 06:41+0000\n"
-"Last-Translator: abidin toumi <abidin24@tutanota.com>, 2021\n"
-"Language-Team: Arabic (https://www.transifex.com/Friendica/teams/12172/ar/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ar\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-
-#: advancedcontentfilter.php:153
-#, php-format
-msgid "Filtered by rule: %s"
-msgstr "رشّح حسب القاعدة: %s"
-
-#: advancedcontentfilter.php:167 advancedcontentfilter.php:224
-msgid "Advanced Content Filter"
-msgstr "ترشيح المحتوى المتقدم"
-
-#: advancedcontentfilter.php:223
-msgid "Back to Addon Settings"
-msgstr "الرجوع إلى إعدادات الإضافات"
-
-#: advancedcontentfilter.php:225
-msgid "Add a Rule"
-msgstr "أضف قاعدة"
-
-#: advancedcontentfilter.php:226
-msgid "Help"
-msgstr "مساعدة"
-
-#: advancedcontentfilter.php:227
-msgid ""
-"Add and manage your personal content filter rules in this screen. Rules have"
-" a name and an arbitrary expression that will be matched against post data. "
-"For a complete reference of the available operations and variables, check "
-"the help page."
-msgstr ""
-"إضافة وإدارة قواعد ترشيح المحتوى الشخصية هنا.\n"
-" القواعد لها اسم وتعبير سيتم مطابقته مع بيانات المشاركة. للحصول على مرجع كامل للعمليات والمتغيرات المتاحة ، راجع صفحة المساعدة."
-
-#: advancedcontentfilter.php:228
-msgid "Your rules"
-msgstr "القواعد"
-
-#: advancedcontentfilter.php:229
-msgid ""
-"You have no rules yet! Start adding one by clicking on the button above next"
-" to the title."
-msgstr ""
-"لا يوجد قواعد!\n"
-"أضف واحدة من خلال النقر على الزر أعلاه بجوار العنوان."
-
-#: advancedcontentfilter.php:230
-msgid "Disabled"
-msgstr "معطل"
-
-#: advancedcontentfilter.php:231
-msgid "Enabled"
-msgstr "مفعل"
-
-#: advancedcontentfilter.php:232
-msgid "Disable this rule"
-msgstr "عطّل القاعدة"
-
-#: advancedcontentfilter.php:233
-msgid "Enable this rule"
-msgstr "فعّل القاعدة"
-
-#: advancedcontentfilter.php:234
-msgid "Edit this rule"
-msgstr "عدّل هذه القاعدة"
-
-#: advancedcontentfilter.php:235
-msgid "Edit the rule"
-msgstr "عدّل القاعدة"
-
-#: advancedcontentfilter.php:236
-msgid "Save this rule"
-msgstr "احفظ هذه القاعدة"
-
-#: advancedcontentfilter.php:237
-msgid "Delete this rule"
-msgstr "احذف هذه القاعدة"
-
-#: advancedcontentfilter.php:238
-msgid "Rule"
-msgstr "القاعدة"
-
-#: advancedcontentfilter.php:239
-msgid "Close"
-msgstr "اغلق"
-
-#: advancedcontentfilter.php:240
-msgid "Add new rule"
-msgstr "أضف قاعدة جديدة"
-
-#: advancedcontentfilter.php:241
-msgid "Rule Name"
-msgstr "اسم القاعدة"
-
-#: advancedcontentfilter.php:242
-msgid "Rule Expression"
-msgstr "تعبير القاعدة"
-
-#: advancedcontentfilter.php:243
-msgid "Cancel"
-msgstr "الغ"
-
-#: advancedcontentfilter.php:310 advancedcontentfilter.php:321
-#: advancedcontentfilter.php:332 advancedcontentfilter.php:366
-#: advancedcontentfilter.php:395 advancedcontentfilter.php:416
-msgid "You must be logged in to use this method"
-msgstr "عليك الولوج لاستخدام هذه الطريقة"
-
-#: advancedcontentfilter.php:336 advancedcontentfilter.php:370
-#: advancedcontentfilter.php:399
-msgid "Invalid form security token, please refresh the page."
-msgstr "رمز أمان النموذج غير صالح ، يرجى تحديث الصفحة."
-
-#: advancedcontentfilter.php:348
-msgid "The rule name and expression are required."
-msgstr "يلزم اسم وتعبير للقاعدة."
-
-#: advancedcontentfilter.php:360
-msgid "Rule successfully added"
-msgstr "نجحت إضافة القاعدة"
-
-#: advancedcontentfilter.php:374 advancedcontentfilter.php:403
-msgid "Rule doesn't exist or doesn't belong to you."
-msgstr "القاعدة غير موجودة أو لا تنتمي إليك."
-
-#: advancedcontentfilter.php:389
-msgid "Rule successfully updated"
-msgstr "نجح تحديث القاعدة"
-
-#: advancedcontentfilter.php:410
-msgid "Rule successfully deleted"
-msgstr "نجح حذف القاعدة"
-
-#: advancedcontentfilter.php:420
-msgid "Missing argument: guid."
-msgstr "معامل ناقص: دليل."
-
-#: advancedcontentfilter.php:428
-#, php-format
-msgid "Unknown post with guid: %s"
-msgstr "مشاركة غير معروفة ذات الدليل: 1%s"
-
-#: src/middlewares.php:49
-msgid "Method not found"
-msgstr "لم يُعثر على التطبيق"
diff --git a/advancedcontentfilter/lang/ar/strings.php b/advancedcontentfilter/lang/ar/strings.php
deleted file mode 100644
index ddb0fdaf..00000000
--- a/advancedcontentfilter/lang/ar/strings.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_ar")) {
-function string_plural_select_ar($n){
-	$n = intval($n);
-	if ($n==0) { return 0; } else if ($n==1) { return 1; } else if ($n==2) { return 2; } else if ($n%100>=3 && $n%100<=10) { return 3; } else if ($n%100>=11 && $n%100<=99) { return 4; } else  { return 5; }
-}}
-$a->strings['Filtered by rule: %s'] = 'رشّح حسب القاعدة: %s';
-$a->strings['Advanced Content Filter'] = 'ترشيح المحتوى المتقدم';
-$a->strings['Back to Addon Settings'] = 'الرجوع إلى إعدادات الإضافات';
-$a->strings['Add a Rule'] = 'أضف قاعدة';
-$a->strings['Help'] = 'مساعدة';
-$a->strings['Add and manage your personal content filter rules in this screen. Rules have a name and an arbitrary expression that will be matched against post data. For a complete reference of the available operations and variables, check the help page.'] = 'إضافة وإدارة قواعد ترشيح المحتوى الشخصية هنا.
- القواعد لها اسم وتعبير سيتم مطابقته مع بيانات المشاركة. للحصول على مرجع كامل للعمليات والمتغيرات المتاحة ، راجع صفحة المساعدة.';
-$a->strings['Your rules'] = 'القواعد';
-$a->strings['You have no rules yet! Start adding one by clicking on the button above next to the title.'] = 'لا يوجد قواعد!
-أضف واحدة من خلال النقر على الزر أعلاه بجوار العنوان.';
-$a->strings['Disabled'] = 'معطل';
-$a->strings['Enabled'] = 'مفعل';
-$a->strings['Disable this rule'] = 'عطّل القاعدة';
-$a->strings['Enable this rule'] = 'فعّل القاعدة';
-$a->strings['Edit this rule'] = 'عدّل هذه القاعدة';
-$a->strings['Edit the rule'] = 'عدّل القاعدة';
-$a->strings['Save this rule'] = 'احفظ هذه القاعدة';
-$a->strings['Delete this rule'] = 'احذف هذه القاعدة';
-$a->strings['Rule'] = 'القاعدة';
-$a->strings['Close'] = 'اغلق';
-$a->strings['Add new rule'] = 'أضف قاعدة جديدة';
-$a->strings['Rule Name'] = 'اسم القاعدة';
-$a->strings['Rule Expression'] = 'تعبير القاعدة';
-$a->strings['Cancel'] = 'الغ';
-$a->strings['You must be logged in to use this method'] = 'عليك الولوج لاستخدام هذه الطريقة';
-$a->strings['Invalid form security token, please refresh the page.'] = 'رمز أمان النموذج غير صالح ، يرجى تحديث الصفحة.';
-$a->strings['The rule name and expression are required.'] = 'يلزم اسم وتعبير للقاعدة.';
-$a->strings['Rule successfully added'] = 'نجحت إضافة القاعدة';
-$a->strings['Rule doesn\'t exist or doesn\'t belong to you.'] = 'القاعدة غير موجودة أو لا تنتمي إليك.';
-$a->strings['Rule successfully updated'] = 'نجح تحديث القاعدة';
-$a->strings['Rule successfully deleted'] = 'نجح حذف القاعدة';
-$a->strings['Missing argument: guid.'] = 'معامل ناقص: دليل.';
-$a->strings['Unknown post with guid: %s'] = 'مشاركة غير معروفة ذات الدليل: 1%s';
-$a->strings['Method not found'] = 'لم يُعثر على التطبيق';
diff --git a/advancedcontentfilter/lang/ca/strings.php b/advancedcontentfilter/lang/ca/strings.php
index c74161c0..9afcfdb2 100644
--- a/advancedcontentfilter/lang/ca/strings.php
+++ b/advancedcontentfilter/lang/ca/strings.php
@@ -3,38 +3,39 @@
 if(! function_exists("string_plural_select_ca")) {
 function string_plural_select_ca($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Filtered by rule: %s'] = 'Filtrat per regla: %s';
-$a->strings['Advanced Content Filter'] = 'Contingut avançat Filtre';
-$a->strings['Back to Addon Settings'] = 'Torna Addon Configuració';
-$a->strings['Add a Rule'] = 'Afegiu una regla';
-$a->strings['Help'] = 'Ajuda';
-$a->strings['Add and manage your personal content filter rules in this screen. Rules have a name and an arbitrary expression that will be matched against post data. For a complete reference of the available operations and variables, check the <a href="advancedcontentfilter/help">help page</a>.'] = 'Afegiu i gestioneu les vostres regles de filtre de contingut personal en aquesta pantalla. Les regles tenen un nom i una expressió arbitrària que es combinen amb les dades de la publicació. Per obtenir una referència completa de les variables i operacions disponibles, comproveu el botó <a href="advancedcontentfilter/help">pàgina d’ajuda</a>.';
-$a->strings['Your rules'] = 'Les seves normes';
-$a->strings['You have no rules yet! Start adding one by clicking on the button above next to the title.'] = 'Encara no teniu normes. Comenceu a afegir-ne un fent clic al botó situat al costat del títol.';
-$a->strings['Disabled'] = 'Desactivat';
-$a->strings['Enabled'] = 'Permetre';
-$a->strings['Disable this rule'] = 'Desactiva aquesta regla';
-$a->strings['Enable this rule'] = 'Activa aquesta regla';
-$a->strings['Edit this rule'] = 'Edita aquesta regla';
-$a->strings['Edit the rule'] = 'Edita la regla';
-$a->strings['Save this rule'] = 'Deseu aquesta regla';
-$a->strings['Delete this rule'] = 'Suprimeix aquesta regla';
-$a->strings['Rule'] = 'Regla';
-$a->strings['Close'] = 'Tancar';
-$a->strings['Add new rule'] = 'Add nova regla';
-$a->strings['Rule Name'] = 'Nom de la regla';
-$a->strings['Rule Expression'] = 'Expressió de regla';
-$a->strings['<p>Examples:</p><ul><li><pre>author_link == \'https://friendica.mrpetovan.com/profile/hypolite\'</pre></li><li>tags</li></ul>'] = '<p>Exemples:</p><ul><li><pre>author_link == \'https://friendica.mrpetovan.com/profile/hypolite\'</pre></li><li>tags</li></ul>';
-$a->strings['Cancel'] = 'cancel·lar';
-$a->strings['You must be logged in to use this method'] = 'Per utilitzar aquest mètode, heu d’iniciar sessió';
-$a->strings['Invalid form security token, please refresh the page.'] = 'El testimoni de seguretat del formulari no és vàlid. Actualitza la pàgina';
-$a->strings['The rule name and expression are required.'] = 'El nom i l’expressió de la regla són obligatoris';
-$a->strings['Rule successfully added'] = 'La regla s\'ha afegit correctament';
-$a->strings['Rule doesn\'t exist or doesn\'t belong to you.'] = 'La regla no existeix o no us pertany.';
-$a->strings['Rule successfully updated'] = 'La regla s\'ha actualitzat correctament';
-$a->strings['Rule successfully deleted'] = 'S\'ha suprimit la regla correctament';
-$a->strings['Missing argument: guid.'] = 'Falta un argument: guia';
-$a->strings['Unknown post with guid: %s'] = 'Publicació desconeguda amb guia: %s';
-$a->strings['Method not found'] = 'Mètode no trobat';
+;
+$a->strings["Filtered by rule: %s"] = "Filtrat per regla: %s";
+$a->strings["Advanced Content Filter"] = "Contingut avançat Filtre";
+$a->strings["Back to Addon Settings"] = "Torna Addon Configuració";
+$a->strings["Add a Rule"] = "Afegiu una regla";
+$a->strings["Help"] = "Ajuda";
+$a->strings["Add and manage your personal content filter rules in this screen. Rules have a name and an arbitrary expression that will be matched against post data. For a complete reference of the available operations and variables, check the <a href=\"advancedcontentfilter/help\">help page</a>."] = "Afegiu i gestioneu les vostres regles de filtre de contingut personal en aquesta pantalla. Les regles tenen un nom i una expressió arbitrària que es combinen amb les dades de la publicació. Per obtenir una referència completa de les variables i operacions disponibles, comproveu el botó <a href=\"advancedcontentfilter/help\">pàgina d’ajuda</a>.";
+$a->strings["Your rules"] = "Les seves normes";
+$a->strings["You have no rules yet! Start adding one by clicking on the button above next to the title."] = "Encara no teniu normes. Comenceu a afegir-ne un fent clic al botó situat al costat del títol.";
+$a->strings["Disabled"] = "Desactivat";
+$a->strings["Enabled"] = "Permetre";
+$a->strings["Disable this rule"] = "Desactiva aquesta regla";
+$a->strings["Enable this rule"] = "Activa aquesta regla";
+$a->strings["Edit this rule"] = "Edita aquesta regla";
+$a->strings["Edit the rule"] = "Edita la regla";
+$a->strings["Save this rule"] = "Deseu aquesta regla";
+$a->strings["Delete this rule"] = "Suprimeix aquesta regla";
+$a->strings["Rule"] = "Regla";
+$a->strings["Close"] = "Tancar";
+$a->strings["Add new rule"] = "Add nova regla";
+$a->strings["Rule Name"] = "Nom de la regla";
+$a->strings["Rule Expression"] = "Expressió de regla";
+$a->strings["<p>Examples:</p><ul><li><pre>author_link == 'https://friendica.mrpetovan.com/profile/hypolite'</pre></li><li>tags</li></ul>"] = "<p>Exemples:</p><ul><li><pre>author_link == 'https://friendica.mrpetovan.com/profile/hypolite'</pre></li><li>tags</li></ul>";
+$a->strings["Cancel"] = "cancel·lar";
+$a->strings["You must be logged in to use this method"] = "Per utilitzar aquest mètode, heu d’iniciar sessió";
+$a->strings["Invalid form security token, please refresh the page."] = "El testimoni de seguretat del formulari no és vàlid. Actualitza la pàgina";
+$a->strings["The rule name and expression are required."] = "El nom i l’expressió de la regla són obligatoris";
+$a->strings["Rule successfully added"] = "La regla s'ha afegit correctament";
+$a->strings["Rule doesn't exist or doesn't belong to you."] = "La regla no existeix o no us pertany.";
+$a->strings["Rule successfully updated"] = "La regla s'ha actualitzat correctament";
+$a->strings["Rule successfully deleted"] = "S'ha suprimit la regla correctament";
+$a->strings["Missing argument: guid."] = "Falta un argument: guia";
+$a->strings["Unknown post with guid: %s"] = "Publicació desconeguda amb guia: %s";
+$a->strings["Method not found"] = "Mètode no trobat";
diff --git a/advancedcontentfilter/lang/cs/strings.php b/advancedcontentfilter/lang/cs/strings.php
index cc96e2a3..08349a45 100644
--- a/advancedcontentfilter/lang/cs/strings.php
+++ b/advancedcontentfilter/lang/cs/strings.php
@@ -3,38 +3,39 @@
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
 	$n = intval($n);
-	if (($n == 1 && $n % 1 == 0)) { return 0; } else if (($n >= 2 && $n <= 4 && $n % 1 == 0)) { return 1; } else if (($n % 1 != 0 )) { return 2; } else  { return 3; }
+	return ($n == 1 && $n % 1 == 0) ? 0 : ($n >= 2 && $n <= 4 && $n % 1 == 0) ? 1: ($n % 1 != 0 ) ? 2 : 3;;
 }}
-$a->strings['Filtered by rule: %s'] = 'Filtrováno podle pravidla: %s';
-$a->strings['Advanced Content Filter'] = 'Rozšířený filtr obsahu';
-$a->strings['Back to Addon Settings'] = 'Zpět na nastavení doplňku';
-$a->strings['Add a Rule'] = 'Přidat pravidlo';
-$a->strings['Help'] = 'Nápověda';
-$a->strings['Add and manage your personal content filter rules in this screen. Rules have a name and an arbitrary expression that will be matched against post data. For a complete reference of the available operations and variables, check the <a href="advancedcontentfilter/help">help page</a>.'] = 'Přidávejte a spravujte Vaše osobní pravidla pro filtrování obsahu na této obrazovce. Pravidla mají název a libovolný výraz, který bude porovnán s daty příspěvku. Pro úplnou referenci dostupných operací a proměnných navštivte <a href="advancedcontentfilter/help">stránku nápovědy</a>.';
-$a->strings['Your rules'] = 'Vaše pravidla';
-$a->strings['You have no rules yet! Start adding one by clicking on the button above next to the title.'] = 'Ještě nemáte žádná pravidla! Přidejte první kliknutím na tlačítko nahoře vedle nadpisu.';
-$a->strings['Disabled'] = 'Zakázáno';
-$a->strings['Enabled'] = 'Povoleno';
-$a->strings['Disable this rule'] = 'Zakázat toto pravidlo';
-$a->strings['Enable this rule'] = 'Povolit toto pravidlo';
-$a->strings['Edit this rule'] = 'Upravit toto pravidlo';
-$a->strings['Edit the rule'] = 'Upravit pravidlo';
-$a->strings['Save this rule'] = 'Uložit toto pravidlo';
-$a->strings['Delete this rule'] = 'Smazat toto pravidlo';
-$a->strings['Rule'] = 'Pravidlo';
-$a->strings['Close'] = 'Zavřít';
-$a->strings['Add new rule'] = 'Přidat nové pravidlo';
-$a->strings['Rule Name'] = 'Název pravidla';
-$a->strings['Rule Expression'] = 'Výraz pravidla';
-$a->strings['<p>Examples:</p><ul><li><pre>author_link == \'https://friendica.mrpetovan.com/profile/hypolite\'</pre></li><li>tags</li></ul>'] = '<p>Příklady:</p><ul><li><pre>author_link == \'https://friendica.mrpetovan.com/profile/hypolite\'</pre></li><li>tags</li></ul>';
-$a->strings['Cancel'] = 'Zrušit';
-$a->strings['You must be logged in to use this method'] = 'Pro použití této metody musíte být přihlášen/a';
-$a->strings['Invalid form security token, please refresh the page.'] = 'Neplatná forma bezpečnostního tokenu, prosím obnovte stránku.';
-$a->strings['The rule name and expression are required.'] = 'Je požadován název pravidla a výraz.';
-$a->strings['Rule successfully added'] = 'Pravidlo úspěšně přidáno';
-$a->strings['Rule doesn\'t exist or doesn\'t belong to you.'] = 'Pravidlo buď neexistuje, nebo Vám nepatří.';
-$a->strings['Rule successfully updated'] = 'Pravidlo úspěšně aktualizováno';
-$a->strings['Rule successfully deleted'] = 'Pravidlo úspěšně smazáno';
-$a->strings['Missing argument: guid.'] = 'Chybí argument: guid.';
-$a->strings['Unknown post with guid: %s'] = 'Neznámý pžíspěvek s číslem guid: %s';
-$a->strings['Method not found'] = 'Metoda nenalezena';
+;
+$a->strings["Filtered by rule: %s"] = "Filtrováno podle pravidla: %s";
+$a->strings["Advanced Content Filter"] = "Rozšířený filtr obsahu";
+$a->strings["Back to Addon Settings"] = "Zpět na nastavení doplňku";
+$a->strings["Add a Rule"] = "Přidat pravidlo";
+$a->strings["Help"] = "Nápověda";
+$a->strings["Add and manage your personal content filter rules in this screen. Rules have a name and an arbitrary expression that will be matched against post data. For a complete reference of the available operations and variables, check the <a href=\"advancedcontentfilter/help\">help page</a>."] = "Přidávejte a spravujte Vaše osobní pravidla pro filtrování obsahu na této obrazovce. Pravidla mají název a libovolný výraz, který bude porovnán s daty příspěvku. Pro úplnou referenci dostupných operací a proměnných navštivte <a href=\"advancedcontentfilter/help\">stránku nápovědy</a>.";
+$a->strings["Your rules"] = "Vaše pravidla";
+$a->strings["You have no rules yet! Start adding one by clicking on the button above next to the title."] = "Ještě nemáte žádná pravidla! Přidejte první kliknutím na tlačítko nahoře vedle nadpisu.";
+$a->strings["Disabled"] = "Zakázáno";
+$a->strings["Enabled"] = "Povoleno";
+$a->strings["Disable this rule"] = "Zakázat toto pravidlo";
+$a->strings["Enable this rule"] = "Povolit toto pravidlo";
+$a->strings["Edit this rule"] = "Upravit toto pravidlo";
+$a->strings["Edit the rule"] = "Upravit pravidlo";
+$a->strings["Save this rule"] = "Uložit toto pravidlo";
+$a->strings["Delete this rule"] = "Smazat toto pravidlo";
+$a->strings["Rule"] = "Pravidlo";
+$a->strings["Close"] = "Zavřít";
+$a->strings["Add new rule"] = "Přidat nové pravidlo";
+$a->strings["Rule Name"] = "Název pravidla";
+$a->strings["Rule Expression"] = "Výraz pravidla";
+$a->strings["<p>Examples:</p><ul><li><pre>author_link == 'https://friendica.mrpetovan.com/profile/hypolite'</pre></li><li>tags</li></ul>"] = "<p>Příklady:</p><ul><li><pre>author_link == 'https://friendica.mrpetovan.com/profile/hypolite'</pre></li><li>tags</li></ul>";
+$a->strings["Cancel"] = "Zrušit";
+$a->strings["You must be logged in to use this method"] = "Pro použití této metody musíte být přihlášen/a";
+$a->strings["Invalid form security token, please refresh the page."] = "Neplatná forma bezpečnostního tokenu, prosím obnovte stránku.";
+$a->strings["The rule name and expression are required."] = "Je požadován název pravidla a výraz.";
+$a->strings["Rule successfully added"] = "Pravidlo úspěšně přidáno";
+$a->strings["Rule doesn't exist or doesn't belong to you."] = "Pravidlo buď neexistuje, nebo Vám nepatří.";
+$a->strings["Rule successfully updated"] = "Pravidlo úspěšně aktualizováno";
+$a->strings["Rule successfully deleted"] = "Pravidlo úspěšně smazáno";
+$a->strings["Missing argument: guid."] = "Chybí argument: guid.";
+$a->strings["Unknown post with guid: %s"] = "Neznámý pžíspěvek s číslem guid: %s";
+$a->strings["Method not found"] = "Metoda nenalezena";
diff --git a/advancedcontentfilter/lang/da-dk/messages.po b/advancedcontentfilter/lang/da-dk/messages.po
deleted file mode 100644
index 70ef462e..00000000
--- a/advancedcontentfilter/lang/da-dk/messages.po
+++ /dev/null
@@ -1,157 +0,0 @@
-# ADDON advancedcontentfilter
-# Copyright (C)
-# This file is distributed under the same license as the Friendica advancedcontentfilter addon package.
-# 
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:13-0500\n"
-"PO-Revision-Date: 2018-05-24 06:41+0000\n"
-"Language-Team: Danish (Denmark) (https://www.transifex.com/Friendica/teams/12172/da_DK/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: da_DK\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: advancedcontentfilter.php:154
-#, php-format
-msgid "Filtered by rule: %s"
-msgstr ""
-
-#: advancedcontentfilter.php:170 advancedcontentfilter.php:225
-msgid "Advanced Content Filter"
-msgstr ""
-
-#: advancedcontentfilter.php:224
-msgid "Back to Addon Settings"
-msgstr ""
-
-#: advancedcontentfilter.php:226
-msgid "Add a Rule"
-msgstr ""
-
-#: advancedcontentfilter.php:227
-msgid "Help"
-msgstr ""
-
-#: advancedcontentfilter.php:228
-msgid ""
-"Add and manage your personal content filter rules in this screen. Rules have"
-" a name and an arbitrary expression that will be matched against post data. "
-"For a complete reference of the available operations and variables, check "
-"the help page."
-msgstr ""
-
-#: advancedcontentfilter.php:229
-msgid "Your rules"
-msgstr ""
-
-#: advancedcontentfilter.php:230
-msgid ""
-"You have no rules yet! Start adding one by clicking on the button above next"
-" to the title."
-msgstr ""
-
-#: advancedcontentfilter.php:231
-msgid "Disabled"
-msgstr ""
-
-#: advancedcontentfilter.php:232
-msgid "Enabled"
-msgstr ""
-
-#: advancedcontentfilter.php:233
-msgid "Disable this rule"
-msgstr ""
-
-#: advancedcontentfilter.php:234
-msgid "Enable this rule"
-msgstr ""
-
-#: advancedcontentfilter.php:235
-msgid "Edit this rule"
-msgstr ""
-
-#: advancedcontentfilter.php:236
-msgid "Edit the rule"
-msgstr ""
-
-#: advancedcontentfilter.php:237
-msgid "Save this rule"
-msgstr ""
-
-#: advancedcontentfilter.php:238
-msgid "Delete this rule"
-msgstr ""
-
-#: advancedcontentfilter.php:239
-msgid "Rule"
-msgstr ""
-
-#: advancedcontentfilter.php:240
-msgid "Close"
-msgstr ""
-
-#: advancedcontentfilter.php:241
-msgid "Add new rule"
-msgstr ""
-
-#: advancedcontentfilter.php:242
-msgid "Rule Name"
-msgstr ""
-
-#: advancedcontentfilter.php:243
-msgid "Rule Expression"
-msgstr ""
-
-#: advancedcontentfilter.php:244
-msgid "Cancel"
-msgstr ""
-
-#: advancedcontentfilter.php:312 advancedcontentfilter.php:323
-#: advancedcontentfilter.php:334 advancedcontentfilter.php:370
-#: advancedcontentfilter.php:401 advancedcontentfilter.php:424
-msgid "You must be logged in to use this method"
-msgstr ""
-
-#: advancedcontentfilter.php:338 advancedcontentfilter.php:374
-#: advancedcontentfilter.php:405
-msgid "Invalid form security token, please refresh the page."
-msgstr ""
-
-#: advancedcontentfilter.php:350
-msgid "The rule name and expression are required."
-msgstr ""
-
-#: advancedcontentfilter.php:364
-msgid "Rule successfully added"
-msgstr ""
-
-#: advancedcontentfilter.php:378 advancedcontentfilter.php:409
-msgid "Rule doesn't exist or doesn't belong to you."
-msgstr ""
-
-#: advancedcontentfilter.php:395
-msgid "Rule successfully updated"
-msgstr ""
-
-#: advancedcontentfilter.php:418
-msgid "Rule successfully deleted"
-msgstr ""
-
-#: advancedcontentfilter.php:428
-msgid "Missing argument: guid."
-msgstr ""
-
-#: advancedcontentfilter.php:436
-#, php-format
-msgid "Unknown post with guid: %s"
-msgstr ""
-
-#: src/middlewares.php:49
-msgid "Method not found"
-msgstr ""
diff --git a/advancedcontentfilter/lang/da-dk/strings.php b/advancedcontentfilter/lang/da-dk/strings.php
deleted file mode 100644
index 09554750..00000000
--- a/advancedcontentfilter/lang/da-dk/strings.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_da_dk")) {
-function string_plural_select_da_dk($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
diff --git a/advancedcontentfilter/lang/de/messages.po b/advancedcontentfilter/lang/de/messages.po
index e338fb61..c6f84ac1 100644
--- a/advancedcontentfilter/lang/de/messages.po
+++ b/advancedcontentfilter/lang/de/messages.po
@@ -3,64 +3,61 @@
 # This file is distributed under the same license as the Friendica advancedcontentfilter addon package.
 # 
 # 
-# Translators:
-# Ulf Rompe <transifex.com@rompe.org>, 2019
-# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2022
-# 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-11 08:54-0400\n"
-"PO-Revision-Date: 2018-05-24 06:41+0000\n"
-"Last-Translator: Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2022\n"
-"Language-Team: German (https://app.transifex.com/Friendica/teams/12172/de/)\n"
+"POT-Creation-Date: 2018-04-17 04:04+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2018\n"
+"Language-Team: German (https://www.transifex.com/Friendica/teams/12172/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: advancedcontentfilter.php:154
+#: advancedcontentfilter.php:134
 #, php-format
 msgid "Filtered by rule: %s"
 msgstr "Nach dieser Regel gefiltert: %s"
 
-#: advancedcontentfilter.php:170 advancedcontentfilter.php:225
+#: advancedcontentfilter.php:147 advancedcontentfilter.php:204
 msgid "Advanced Content Filter"
 msgstr "Erweiterter Inhaltsfilter"
 
-#: advancedcontentfilter.php:224
+#: advancedcontentfilter.php:203
 msgid "Back to Addon Settings"
 msgstr "Zurück zu den Addon Einstellungen"
 
-#: advancedcontentfilter.php:226
+#: advancedcontentfilter.php:205
 msgid "Add a Rule"
 msgstr "Eine Regel hinzufügen"
 
-#: advancedcontentfilter.php:227
+#: advancedcontentfilter.php:206
 msgid "Help"
 msgstr "Hilfe"
 
-#: advancedcontentfilter.php:228
+#: advancedcontentfilter.php:207
 msgid ""
 "Add and manage your personal content filter rules in this screen. Rules have"
 " a name and an arbitrary expression that will be matched against post data. "
 "For a complete reference of the available operations and variables, check "
-"the help page."
+"the <a href=\"advancedcontentfilter/help\">help page</a>."
 msgstr ""
 "Auf dieser Seite kannst du deine persönlichen Filterregeln verwalten. Regeln"
 " müssen einen Namen und einen frei wählbaren Ausdruck besitzen. Dieser "
 "Ausdruck wird mit den Daten der Beiträge abgeglichen und diese dann "
 "gegebenenfalls gefiltert. Für eine Übersicht der verfügbaren Operatoren für "
-"die Filter, wirf bitte einen Blick auf die Hilfsseite des Addons."
+"die Filter, wirf bitte einen Blick auf die <a "
+"href=\"advancedcontentfilter/help\">Hilfsseite</a> des Addons."
 
-#: advancedcontentfilter.php:229
+#: advancedcontentfilter.php:208
 msgid "Your rules"
 msgstr "Deine Regeln"
 
-#: advancedcontentfilter.php:230
+#: advancedcontentfilter.php:209
 msgid ""
 "You have no rules yet! Start adding one by clicking on the button above next"
 " to the title."
@@ -68,108 +65,110 @@ msgstr ""
 "Du hast bisher noch keine Regeln definiert. Um eine neue Regel zu erstellen,"
 " verwende bitte den Button neben dem Titel."
 
-#: advancedcontentfilter.php:231
+#: advancedcontentfilter.php:210
 msgid "Disabled"
 msgstr "Deaktiviert"
 
-#: advancedcontentfilter.php:232
+#: advancedcontentfilter.php:211
 msgid "Enabled"
 msgstr "Aktiv"
 
-#: advancedcontentfilter.php:233
+#: advancedcontentfilter.php:212
 msgid "Disable this rule"
 msgstr "Diese Regel deaktivieren"
 
-#: advancedcontentfilter.php:234
+#: advancedcontentfilter.php:213
 msgid "Enable this rule"
 msgstr "Diese Regel aktivieren"
 
-#: advancedcontentfilter.php:235
+#: advancedcontentfilter.php:214
 msgid "Edit this rule"
 msgstr "Diese Regel bearbeiten"
 
-#: advancedcontentfilter.php:236
+#: advancedcontentfilter.php:215
 msgid "Edit the rule"
 msgstr "Die Regel bearbeiten"
 
-#: advancedcontentfilter.php:237
+#: advancedcontentfilter.php:216
 msgid "Save this rule"
 msgstr "Regel speichern"
 
-#: advancedcontentfilter.php:238
+#: advancedcontentfilter.php:217
 msgid "Delete this rule"
 msgstr "Diese Regel löschen"
 
-#: advancedcontentfilter.php:239
+#: advancedcontentfilter.php:218
 msgid "Rule"
 msgstr "Regel"
 
-#: advancedcontentfilter.php:240
+#: advancedcontentfilter.php:219
 msgid "Close"
 msgstr "Schließen"
 
-#: advancedcontentfilter.php:241
+#: advancedcontentfilter.php:220
 msgid "Add new rule"
 msgstr "Neue Regel hinzufügen"
 
-#: advancedcontentfilter.php:242
+#: advancedcontentfilter.php:221
 msgid "Rule Name"
 msgstr "Name der Regel"
 
-#: advancedcontentfilter.php:243
+#: advancedcontentfilter.php:222
 msgid "Rule Expression"
 msgstr "Ausdruck der Regel"
 
-#: advancedcontentfilter.php:244
+#: advancedcontentfilter.php:223
+msgid ""
+"<p>Examples:</p><ul><li><pre>author_link == "
+"'https://friendica.mrpetovan.com/profile/hypolite'</pre></li><li>tags</li></ul>"
+msgstr ""
+"<p>Ein Beispiel:</p><ul><li><pre>author_link == "
+"'https://friendica.mrpetovan.com/profile/hypolite'</pre></li><li>tags</li></ul>"
+
+#: advancedcontentfilter.php:224
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: advancedcontentfilter.php:295
-msgid "This addon requires this node having at least one post"
-msgstr ""
-"Dieses Addon funktioniert nur, wenn auf diesem Knoten mindestens ein Beitrag"
-" existiert."
-
-#: advancedcontentfilter.php:325 advancedcontentfilter.php:336
-#: advancedcontentfilter.php:347 advancedcontentfilter.php:383
-#: advancedcontentfilter.php:414 advancedcontentfilter.php:437
+#: advancedcontentfilter.php:290 advancedcontentfilter.php:301
+#: advancedcontentfilter.php:312 advancedcontentfilter.php:346
+#: advancedcontentfilter.php:375 advancedcontentfilter.php:396
 msgid "You must be logged in to use this method"
-msgstr "Du musst angemeldet sein, um diese Methode verwenden zu können "
+msgstr "Du musst angemeldet sein um diese Methode verwenden zu können "
 
-#: advancedcontentfilter.php:351 advancedcontentfilter.php:387
-#: advancedcontentfilter.php:418
+#: advancedcontentfilter.php:316 advancedcontentfilter.php:350
+#: advancedcontentfilter.php:379
 msgid "Invalid form security token, please refresh the page."
 msgstr "Ungültiges Sciherheitstoken, bitte die Seite neu laden."
 
-#: advancedcontentfilter.php:363
+#: advancedcontentfilter.php:328
 msgid "The rule name and expression are required."
 msgstr "Der Name der Regel und der Ausdruck sind erforderlich."
 
-#: advancedcontentfilter.php:377
+#: advancedcontentfilter.php:340
 msgid "Rule successfully added"
 msgstr "Regel erfolgreich hinzugefügt."
 
-#: advancedcontentfilter.php:391 advancedcontentfilter.php:422
+#: advancedcontentfilter.php:354 advancedcontentfilter.php:383
 msgid "Rule doesn't exist or doesn't belong to you."
 msgstr "Entweder existiert die Regel nicht, oder sie gehört dir nicht."
 
-#: advancedcontentfilter.php:408
+#: advancedcontentfilter.php:369
 msgid "Rule successfully updated"
 msgstr "Regel wurde erfolgreich aktualisiert."
 
-#: advancedcontentfilter.php:431
+#: advancedcontentfilter.php:390
 msgid "Rule successfully deleted"
 msgstr "Regel erfolgreich gelöscht."
 
-#: advancedcontentfilter.php:441
+#: advancedcontentfilter.php:400
 msgid "Missing argument: guid."
 msgstr "Fehlendes Argument: guid."
 
-#: advancedcontentfilter.php:449
+#: advancedcontentfilter.php:406
 #, php-format
 msgid "Unknown post with guid: %s"
 msgstr "Unbekannter Beitrag mit der guid: %s"
 
-#: src/middlewares.php:49
+#: src/middlewares.php:28
 msgid "Method not found"
 msgstr "Methode nicht gefunden"
diff --git a/advancedcontentfilter/lang/de/strings.php b/advancedcontentfilter/lang/de/strings.php
index c50ecf33..80b2ecd7 100644
--- a/advancedcontentfilter/lang/de/strings.php
+++ b/advancedcontentfilter/lang/de/strings.php
@@ -3,38 +3,39 @@
 if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Filtered by rule: %s'] = 'Nach dieser Regel gefiltert: %s';
-$a->strings['Advanced Content Filter'] = 'Erweiterter Inhaltsfilter';
-$a->strings['Back to Addon Settings'] = 'Zurück zu den Addon Einstellungen';
-$a->strings['Add a Rule'] = 'Eine Regel hinzufügen';
-$a->strings['Help'] = 'Hilfe';
-$a->strings['Add and manage your personal content filter rules in this screen. Rules have a name and an arbitrary expression that will be matched against post data. For a complete reference of the available operations and variables, check the help page.'] = 'Auf dieser Seite kannst du deine persönlichen Filterregeln verwalten. Regeln müssen einen Namen und einen frei wählbaren Ausdruck besitzen. Dieser Ausdruck wird mit den Daten der Beiträge abgeglichen und diese dann gegebenenfalls gefiltert. Für eine Übersicht der verfügbaren Operatoren für die Filter, wirf bitte einen Blick auf die Hilfsseite des Addons.';
-$a->strings['Your rules'] = 'Deine Regeln';
-$a->strings['You have no rules yet! Start adding one by clicking on the button above next to the title.'] = 'Du hast bisher noch keine Regeln definiert. Um eine neue Regel zu erstellen, verwende bitte den Button neben dem Titel.';
-$a->strings['Disabled'] = 'Deaktiviert';
-$a->strings['Enabled'] = 'Aktiv';
-$a->strings['Disable this rule'] = 'Diese Regel deaktivieren';
-$a->strings['Enable this rule'] = 'Diese Regel aktivieren';
-$a->strings['Edit this rule'] = 'Diese Regel bearbeiten';
-$a->strings['Edit the rule'] = 'Die Regel bearbeiten';
-$a->strings['Save this rule'] = 'Regel speichern';
-$a->strings['Delete this rule'] = 'Diese Regel löschen';
-$a->strings['Rule'] = 'Regel';
-$a->strings['Close'] = 'Schließen';
-$a->strings['Add new rule'] = 'Neue Regel hinzufügen';
-$a->strings['Rule Name'] = 'Name der Regel';
-$a->strings['Rule Expression'] = 'Ausdruck der Regel';
-$a->strings['Cancel'] = 'Abbrechen';
-$a->strings['This addon requires this node having at least one post'] = 'Dieses Addon funktioniert nur, wenn auf diesem Knoten mindestens ein Beitrag existiert.';
-$a->strings['You must be logged in to use this method'] = 'Du musst angemeldet sein, um diese Methode verwenden zu können ';
-$a->strings['Invalid form security token, please refresh the page.'] = 'Ungültiges Sciherheitstoken, bitte die Seite neu laden.';
-$a->strings['The rule name and expression are required.'] = 'Der Name der Regel und der Ausdruck sind erforderlich.';
-$a->strings['Rule successfully added'] = 'Regel erfolgreich hinzugefügt.';
-$a->strings['Rule doesn\'t exist or doesn\'t belong to you.'] = 'Entweder existiert die Regel nicht, oder sie gehört dir nicht.';
-$a->strings['Rule successfully updated'] = 'Regel wurde erfolgreich aktualisiert.';
-$a->strings['Rule successfully deleted'] = 'Regel erfolgreich gelöscht.';
-$a->strings['Missing argument: guid.'] = 'Fehlendes Argument: guid.';
-$a->strings['Unknown post with guid: %s'] = 'Unbekannter Beitrag mit der guid: %s';
-$a->strings['Method not found'] = 'Methode nicht gefunden';
+;
+$a->strings["Filtered by rule: %s"] = "Nach dieser Regel gefiltert: %s";
+$a->strings["Advanced Content Filter"] = "Erweiterter Inhaltsfilter";
+$a->strings["Back to Addon Settings"] = "Zurück zu den Addon Einstellungen";
+$a->strings["Add a Rule"] = "Eine Regel hinzufügen";
+$a->strings["Help"] = "Hilfe";
+$a->strings["Add and manage your personal content filter rules in this screen. Rules have a name and an arbitrary expression that will be matched against post data. For a complete reference of the available operations and variables, check the <a href=\"advancedcontentfilter/help\">help page</a>."] = "Auf dieser Seite kannst du deine persönlichen Filterregeln verwalten. Regeln müssen einen Namen und einen frei wählbaren Ausdruck besitzen. Dieser Ausdruck wird mit den Daten der Beiträge abgeglichen und diese dann gegebenenfalls gefiltert. Für eine Übersicht der verfügbaren Operatoren für die Filter, wirf bitte einen Blick auf die <a href=\"advancedcontentfilter/help\">Hilfsseite</a> des Addons.";
+$a->strings["Your rules"] = "Deine Regeln";
+$a->strings["You have no rules yet! Start adding one by clicking on the button above next to the title."] = "Du hast bisher noch keine Regeln definiert. Um eine neue Regel zu erstellen, verwende bitte den Button neben dem Titel.";
+$a->strings["Disabled"] = "Deaktiviert";
+$a->strings["Enabled"] = "Aktiv";
+$a->strings["Disable this rule"] = "Diese Regel deaktivieren";
+$a->strings["Enable this rule"] = "Diese Regel aktivieren";
+$a->strings["Edit this rule"] = "Diese Regel bearbeiten";
+$a->strings["Edit the rule"] = "Die Regel bearbeiten";
+$a->strings["Save this rule"] = "Regel speichern";
+$a->strings["Delete this rule"] = "Diese Regel löschen";
+$a->strings["Rule"] = "Regel";
+$a->strings["Close"] = "Schließen";
+$a->strings["Add new rule"] = "Neue Regel hinzufügen";
+$a->strings["Rule Name"] = "Name der Regel";
+$a->strings["Rule Expression"] = "Ausdruck der Regel";
+$a->strings["<p>Examples:</p><ul><li><pre>author_link == 'https://friendica.mrpetovan.com/profile/hypolite'</pre></li><li>tags</li></ul>"] = "<p>Ein Beispiel:</p><ul><li><pre>author_link == 'https://friendica.mrpetovan.com/profile/hypolite'</pre></li><li>tags</li></ul>";
+$a->strings["Cancel"] = "Abbrechen";
+$a->strings["You must be logged in to use this method"] = "Du musst angemeldet sein um diese Methode verwenden zu können ";
+$a->strings["Invalid form security token, please refresh the page."] = "Ungültiges Sciherheitstoken, bitte die Seite neu laden.";
+$a->strings["The rule name and expression are required."] = "Der Name der Regel und der Ausdruck sind erforderlich.";
+$a->strings["Rule successfully added"] = "Regel erfolgreich hinzugefügt.";
+$a->strings["Rule doesn't exist or doesn't belong to you."] = "Entweder existiert die Regel nicht, oder sie gehört dir nicht.";
+$a->strings["Rule successfully updated"] = "Regel wurde erfolgreich aktualisiert.";
+$a->strings["Rule successfully deleted"] = "Regel erfolgreich gelöscht.";
+$a->strings["Missing argument: guid."] = "Fehlendes Argument: guid.";
+$a->strings["Unknown post with guid: %s"] = "Unbekannter Beitrag mit der guid: %s";
+$a->strings["Method not found"] = "Methode nicht gefunden";
diff --git a/advancedcontentfilter/lang/en-gb/strings.php b/advancedcontentfilter/lang/en-gb/strings.php
index e8609311..7fe5be6f 100644
--- a/advancedcontentfilter/lang/en-gb/strings.php
+++ b/advancedcontentfilter/lang/en-gb/strings.php
@@ -3,38 +3,39 @@
 if(! function_exists("string_plural_select_en_gb")) {
 function string_plural_select_en_gb($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Filtered by rule: %s'] = 'Filtered by rule: %s';
-$a->strings['Advanced Content Filter'] = 'Advanced Content Filter';
-$a->strings['Back to Addon Settings'] = 'Back to addon settings';
-$a->strings['Add a Rule'] = 'Add a rule';
-$a->strings['Help'] = 'Help';
-$a->strings['Add and manage your personal content filter rules in this screen. Rules have a name and an arbitrary expression that will be matched against post data. For a complete reference of the available operations and variables, check the <a href="advancedcontentfilter/help">help page</a>.'] = 'Add and manage your personal content filter rules in this screen. Rules have a name and an arbitrary expression that will be matched against post data. For a complete reference of the available operations and variables, check the <a href="advancedcontentfilter/help">help page</a>.';
-$a->strings['Your rules'] = 'Your rules';
-$a->strings['You have no rules yet! Start adding one by clicking on the button above next to the title.'] = 'You have no rules yet! Start adding one by clicking on the button above next to the title.';
-$a->strings['Disabled'] = 'Disabled';
-$a->strings['Enabled'] = 'Enabled';
-$a->strings['Disable this rule'] = 'Disable this rule';
-$a->strings['Enable this rule'] = 'Enable this rule';
-$a->strings['Edit this rule'] = 'Edit this rule';
-$a->strings['Edit the rule'] = 'Edit the rule';
-$a->strings['Save this rule'] = 'Save this rule';
-$a->strings['Delete this rule'] = 'Delete this rule';
-$a->strings['Rule'] = 'Rule';
-$a->strings['Close'] = 'Close';
-$a->strings['Add new rule'] = 'Add new rule';
-$a->strings['Rule Name'] = 'Rule name';
-$a->strings['Rule Expression'] = 'Rule expression';
-$a->strings['<p>Examples:</p><ul><li><pre>author_link == \'https://friendica.mrpetovan.com/profile/hypolite\'</pre></li><li>tags</li></ul>'] = '<p>Examples:</p><ul><li><pre>author_link == \'https://friendica.mrpetovan.com/profile/hypolite\'</pre></li><li>tags</li></ul>';
-$a->strings['Cancel'] = 'Cancel';
-$a->strings['You must be logged in to use this method'] = 'You must be logged in to use this method';
-$a->strings['Invalid form security token, please refresh the page.'] = 'Invalid form security token, please refresh the page.';
-$a->strings['The rule name and expression are required.'] = 'The rule name and expression are required.';
-$a->strings['Rule successfully added'] = 'Rule successfully added';
-$a->strings['Rule doesn\'t exist or doesn\'t belong to you.'] = 'Rule doesn\'t exist or doesn\'t belong to you.';
-$a->strings['Rule successfully updated'] = 'Rule successfully updated';
-$a->strings['Rule successfully deleted'] = 'Rule successfully deleted';
-$a->strings['Missing argument: guid.'] = 'Missing argument: Global Unique Identifier (GUID).';
-$a->strings['Unknown post with guid: %s'] = 'Unknown post with Global Unique Identifier (GUID): %s';
-$a->strings['Method not found'] = 'Method not found';
+;
+$a->strings["Filtered by rule: %s"] = "Filtered by rule: %s";
+$a->strings["Advanced Content Filter"] = "Advanced Content Filter";
+$a->strings["Back to Addon Settings"] = "Back to addon settings";
+$a->strings["Add a Rule"] = "Add a rule";
+$a->strings["Help"] = "Help";
+$a->strings["Add and manage your personal content filter rules in this screen. Rules have a name and an arbitrary expression that will be matched against post data. For a complete reference of the available operations and variables, check the <a href=\"advancedcontentfilter/help\">help page</a>."] = "Add and manage your personal content filter rules in this screen. Rules have a name and an arbitrary expression that will be matched against post data. For a complete reference of the available operations and variables, check the <a href=\"advancedcontentfilter/help\">help page</a>.";
+$a->strings["Your rules"] = "Your rules";
+$a->strings["You have no rules yet! Start adding one by clicking on the button above next to the title."] = "You have no rules yet! Start adding one by clicking on the button above next to the title.";
+$a->strings["Disabled"] = "Disabled";
+$a->strings["Enabled"] = "Enabled";
+$a->strings["Disable this rule"] = "Disable this rule";
+$a->strings["Enable this rule"] = "Enable this rule";
+$a->strings["Edit this rule"] = "Edit this rule";
+$a->strings["Edit the rule"] = "Edit the rule";
+$a->strings["Save this rule"] = "Save this rule";
+$a->strings["Delete this rule"] = "Delete this rule";
+$a->strings["Rule"] = "Rule";
+$a->strings["Close"] = "Close";
+$a->strings["Add new rule"] = "Add new rule";
+$a->strings["Rule Name"] = "Rule name";
+$a->strings["Rule Expression"] = "Rule expression";
+$a->strings["<p>Examples:</p><ul><li><pre>author_link == 'https://friendica.mrpetovan.com/profile/hypolite'</pre></li><li>tags</li></ul>"] = "<p>Examples:</p><ul><li><pre>author_link == 'https://friendica.mrpetovan.com/profile/hypolite'</pre></li><li>tags</li></ul>";
+$a->strings["Cancel"] = "Cancel";
+$a->strings["You must be logged in to use this method"] = "You must be logged in to use this method";
+$a->strings["Invalid form security token, please refresh the page."] = "Invalid form security token, please refresh the page.";
+$a->strings["The rule name and expression are required."] = "The rule name and expression are required.";
+$a->strings["Rule successfully added"] = "Rule successfully added";
+$a->strings["Rule doesn't exist or doesn't belong to you."] = "Rule doesn't exist or doesn't belong to you.";
+$a->strings["Rule successfully updated"] = "Rule successfully updated";
+$a->strings["Rule successfully deleted"] = "Rule successfully deleted";
+$a->strings["Missing argument: guid."] = "Missing argument: Global Unique Identifier (GUID).";
+$a->strings["Unknown post with guid: %s"] = "Unknown post with Global Unique Identifier (GUID): %s";
+$a->strings["Method not found"] = "Method not found";
diff --git a/advancedcontentfilter/lang/es/messages.po b/advancedcontentfilter/lang/es/messages.po
deleted file mode 100644
index 3699d4b6..00000000
--- a/advancedcontentfilter/lang/es/messages.po
+++ /dev/null
@@ -1,173 +0,0 @@
-# ADDON advancedcontentfilter
-# Copyright (C)
-# This file is distributed under the same license as the Friendica advancedcontentfilter addon package.
-# 
-# 
-# Translators:
-# Albert, 2018
-# Yasmine A <yasmine.elachkar@gmail.com>, 2018
-# Julio Cova, 2019
-# Boris Daniel Martinez Millàn <borisdanielmartinezmillan@gmail.com>, 2021
-# Senex Petrovic <javierruizo@hotmail.com>, 2021
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2018-05-24 06:41+0000\n"
-"Last-Translator: Senex Petrovic <javierruizo@hotmail.com>, 2021\n"
-"Language-Team: Spanish (https://www.transifex.com/Friendica/teams/12172/es/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: es\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: src/middlewares.php:49
-msgid "Method not found"
-msgstr "Método no encontrado"
-
-#: advancedcontentfilter.php:136
-#, php-format
-msgid "Filtered by rule: %s"
-msgstr "Filtrado por la regla: %s"
-
-#: advancedcontentfilter.php:150 advancedcontentfilter.php:207
-msgid "Advanced Content Filter"
-msgstr "Filtro de contenido avanzado"
-
-#: advancedcontentfilter.php:206
-msgid "Back to Addon Settings"
-msgstr "Volver a Ajustes de Complemento"
-
-#: advancedcontentfilter.php:208
-msgid "Add a Rule"
-msgstr "Añadir una regla"
-
-#: advancedcontentfilter.php:209
-msgid "Help"
-msgstr "Ayuda"
-
-#: advancedcontentfilter.php:210
-msgid ""
-"Add and manage your personal content filter rules in this screen. Rules have"
-" a name and an arbitrary expression that will be matched against post data. "
-"For a complete reference of the available operations and variables, check "
-"the help page."
-msgstr ""
-"Agregue y administre sus reglas de filtrado de contenido personal en esta "
-"pantalla. Las reglas tienen un nombre y una expresión arbitraria que se "
-"comparará con los datos de la publicación. Para obtener una referencia "
-"completa de las operaciones y variables disponibles, consulte la página de "
-"ayuda."
-
-#: advancedcontentfilter.php:211
-msgid "Your rules"
-msgstr "Tus reglas"
-
-#: advancedcontentfilter.php:212
-msgid ""
-"You have no rules yet! Start adding one by clicking on the button above next"
-" to the title."
-msgstr ""
-"¡Aún no tienes reglas! Empieza añadiendo una haciendo clic en el botón de "
-"arriba al lado del título. "
-
-#: advancedcontentfilter.php:213
-msgid "Disabled"
-msgstr "Desactivado"
-
-#: advancedcontentfilter.php:214
-msgid "Enabled"
-msgstr "Activado"
-
-#: advancedcontentfilter.php:215
-msgid "Disable this rule"
-msgstr "Desactivar esta regla"
-
-#: advancedcontentfilter.php:216
-msgid "Enable this rule"
-msgstr "Activar esta regla"
-
-#: advancedcontentfilter.php:217
-msgid "Edit this rule"
-msgstr "Editar esta regla"
-
-#: advancedcontentfilter.php:218
-msgid "Edit the rule"
-msgstr "Editar regla"
-
-#: advancedcontentfilter.php:219
-msgid "Save this rule"
-msgstr "Guardar esta regla"
-
-#: advancedcontentfilter.php:220
-msgid "Delete this rule"
-msgstr "Borrar esta regla"
-
-#: advancedcontentfilter.php:221
-msgid "Rule"
-msgstr "Regla"
-
-#: advancedcontentfilter.php:222
-msgid "Close"
-msgstr "Cerrar"
-
-#: advancedcontentfilter.php:223
-msgid "Add new rule"
-msgstr "Agregar nueva regla"
-
-#: advancedcontentfilter.php:224
-msgid "Rule Name"
-msgstr "Nombre de la regla"
-
-#: advancedcontentfilter.php:225
-msgid "Rule Expression"
-msgstr "Expresión de la regla"
-
-#: advancedcontentfilter.php:226
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: advancedcontentfilter.php:293 advancedcontentfilter.php:304
-#: advancedcontentfilter.php:315 advancedcontentfilter.php:349
-#: advancedcontentfilter.php:378 advancedcontentfilter.php:399
-msgid "You must be logged in to use this method"
-msgstr "Debe estar registrado para usar este método"
-
-#: advancedcontentfilter.php:319 advancedcontentfilter.php:353
-#: advancedcontentfilter.php:382
-msgid "Invalid form security token, please refresh the page."
-msgstr ""
-"Token de seguridad de formulario inválido, por favor actualice la página."
-
-#: advancedcontentfilter.php:331
-msgid "The rule name and expression are required."
-msgstr "El nombre y la expresión de la regla son obligatorios."
-
-#: advancedcontentfilter.php:343
-msgid "Rule successfully added"
-msgstr "Regla añadida exitosamente"
-
-#: advancedcontentfilter.php:357 advancedcontentfilter.php:386
-msgid "Rule doesn't exist or doesn't belong to you."
-msgstr "La regla no existe o no te pertenece."
-
-#: advancedcontentfilter.php:372
-msgid "Rule successfully updated"
-msgstr "Regla actualizada exitosamente"
-
-#: advancedcontentfilter.php:393
-msgid "Rule successfully deleted"
-msgstr "Regla eliminada exitosamente"
-
-#: advancedcontentfilter.php:403
-msgid "Missing argument: guid."
-msgstr "Algumento faltante: guía"
-
-#: advancedcontentfilter.php:411
-#, php-format
-msgid "Unknown post with guid: %s"
-msgstr "Publicacion desconocida con la guía: %s"
diff --git a/advancedcontentfilter/lang/es/strings.php b/advancedcontentfilter/lang/es/strings.php
deleted file mode 100644
index daf0c6dc..00000000
--- a/advancedcontentfilter/lang/es/strings.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_es")) {
-function string_plural_select_es($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Method not found'] = 'Método no encontrado';
-$a->strings['Filtered by rule: %s'] = 'Filtrado por la regla: %s';
-$a->strings['Advanced Content Filter'] = 'Filtro de contenido avanzado';
-$a->strings['Back to Addon Settings'] = 'Volver a Ajustes de Complemento';
-$a->strings['Add a Rule'] = 'Añadir una regla';
-$a->strings['Help'] = 'Ayuda';
-$a->strings['Add and manage your personal content filter rules in this screen. Rules have a name and an arbitrary expression that will be matched against post data. For a complete reference of the available operations and variables, check the help page.'] = 'Agregue y administre sus reglas de filtrado de contenido personal en esta pantalla. Las reglas tienen un nombre y una expresión arbitraria que se comparará con los datos de la publicación. Para obtener una referencia completa de las operaciones y variables disponibles, consulte la página de ayuda.';
-$a->strings['Your rules'] = 'Tus reglas';
-$a->strings['You have no rules yet! Start adding one by clicking on the button above next to the title.'] = '¡Aún no tienes reglas! Empieza añadiendo una haciendo clic en el botón de arriba al lado del título. ';
-$a->strings['Disabled'] = 'Desactivado';
-$a->strings['Enabled'] = 'Activado';
-$a->strings['Disable this rule'] = 'Desactivar esta regla';
-$a->strings['Enable this rule'] = 'Activar esta regla';
-$a->strings['Edit this rule'] = 'Editar esta regla';
-$a->strings['Edit the rule'] = 'Editar regla';
-$a->strings['Save this rule'] = 'Guardar esta regla';
-$a->strings['Delete this rule'] = 'Borrar esta regla';
-$a->strings['Rule'] = 'Regla';
-$a->strings['Close'] = 'Cerrar';
-$a->strings['Add new rule'] = 'Agregar nueva regla';
-$a->strings['Rule Name'] = 'Nombre de la regla';
-$a->strings['Rule Expression'] = 'Expresión de la regla';
-$a->strings['Cancel'] = 'Cancelar';
-$a->strings['You must be logged in to use this method'] = 'Debe estar registrado para usar este método';
-$a->strings['Invalid form security token, please refresh the page.'] = 'Token de seguridad de formulario inválido, por favor actualice la página.';
-$a->strings['The rule name and expression are required.'] = 'El nombre y la expresión de la regla son obligatorios.';
-$a->strings['Rule successfully added'] = 'Regla añadida exitosamente';
-$a->strings['Rule doesn\'t exist or doesn\'t belong to you.'] = 'La regla no existe o no te pertenece.';
-$a->strings['Rule successfully updated'] = 'Regla actualizada exitosamente';
-$a->strings['Rule successfully deleted'] = 'Regla eliminada exitosamente';
-$a->strings['Missing argument: guid.'] = 'Algumento faltante: guía';
-$a->strings['Unknown post with guid: %s'] = 'Publicacion desconocida con la guía: %s';
diff --git a/advancedcontentfilter/lang/fi/strings.php b/advancedcontentfilter/lang/fi/strings.php
index f7bb14d6..17e3acc5 100644
--- a/advancedcontentfilter/lang/fi/strings.php
+++ b/advancedcontentfilter/lang/fi/strings.php
@@ -3,20 +3,39 @@
 if(! function_exists("string_plural_select_fi")) {
 function string_plural_select_fi($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Add a Rule'] = 'Lisää sääntö';
-$a->strings['Your rules'] = 'Sääntösi';
-$a->strings['Disabled'] = 'Ei käytössä';
-$a->strings['Enabled'] = 'Käytössä';
-$a->strings['Enable this rule'] = 'Ota tämä sääntö käyttöön';
-$a->strings['Edit this rule'] = 'Muokkaa tätä sääntöä';
-$a->strings['Edit the rule'] = 'Muokkaa sääntöä';
-$a->strings['Save this rule'] = 'Tallenna tämä sääntö';
-$a->strings['Delete this rule'] = 'Poista tämä sääntö';
-$a->strings['Rule'] = 'Sääntö';
-$a->strings['Close'] = 'Sulje';
-$a->strings['Add new rule'] = 'Lisää uusi sääntö';
-$a->strings['Rule successfully added'] = 'Sääntö lisätty';
-$a->strings['Rule successfully updated'] = 'Sääntö päivitetty';
-$a->strings['Rule successfully deleted'] = 'Sääntö poistettu';
+;
+$a->strings["Filtered by rule: %s"] = "";
+$a->strings["Advanced Content Filter"] = "";
+$a->strings["Back to Addon Settings"] = "";
+$a->strings["Add a Rule"] = "Lisää sääntö";
+$a->strings["Help"] = "";
+$a->strings["Add and manage your personal content filter rules in this screen. Rules have a name and an arbitrary expression that will be matched against post data. For a complete reference of the available operations and variables, check the <a href=\"advancedcontentfilter/help\">help page</a>."] = "";
+$a->strings["Your rules"] = "Sääntösi";
+$a->strings["You have no rules yet! Start adding one by clicking on the button above next to the title."] = "";
+$a->strings["Disabled"] = "Ei käytössä";
+$a->strings["Enabled"] = "Käytössä";
+$a->strings["Disable this rule"] = "";
+$a->strings["Enable this rule"] = "Ota tämä sääntö käyttöön";
+$a->strings["Edit this rule"] = "Muokkaa tätä sääntöä";
+$a->strings["Edit the rule"] = "Muokkaa sääntöä";
+$a->strings["Save this rule"] = "Tallenna tämä sääntö";
+$a->strings["Delete this rule"] = "Poista tämä sääntö";
+$a->strings["Rule"] = "Sääntö";
+$a->strings["Close"] = "Sulje";
+$a->strings["Add new rule"] = "Lisää uusi sääntö";
+$a->strings["Rule Name"] = "";
+$a->strings["Rule Expression"] = "";
+$a->strings["<p>Examples:</p><ul><li><pre>author_link == 'https://friendica.mrpetovan.com/profile/hypolite'</pre></li><li>tags</li></ul>"] = "";
+$a->strings["Cancel"] = "";
+$a->strings["You must be logged in to use this method"] = "";
+$a->strings["Invalid form security token, please refresh the page."] = "";
+$a->strings["The rule name and expression are required."] = "";
+$a->strings["Rule successfully added"] = "Sääntö lisätty";
+$a->strings["Rule doesn't exist or doesn't belong to you."] = "";
+$a->strings["Rule successfully updated"] = "Sääntö päivitetty";
+$a->strings["Rule successfully deleted"] = "Sääntö poistettu";
+$a->strings["Missing argument: guid."] = "";
+$a->strings["Unknown post with guid: %s"] = "";
+$a->strings["Method not found"] = "";
diff --git a/advancedcontentfilter/lang/fr/messages.po b/advancedcontentfilter/lang/fr/messages.po
index 4d6355cb..c3698c66 100644
--- a/advancedcontentfilter/lang/fr/messages.po
+++ b/advancedcontentfilter/lang/fr/messages.po
@@ -7,62 +7,60 @@
 # Marie Olive <lacellule101@gmail.com>, 2018
 # Vladimir Núñez <lapoubelle111@gmail.com>, 2018
 # Phigger Phigger <automates@lepouete.fr>, 2019
-# Wil Tur <wiltur@yargl.com>, 2021
-# Hypolite Petovan <hypolite@mrpetovan.com>, 2022
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-11 08:54-0400\n"
+"POT-Creation-Date: 2018-04-17 04:04+0200\n"
 "PO-Revision-Date: 2018-05-24 06:41+0000\n"
-"Last-Translator: Hypolite Petovan <hypolite@mrpetovan.com>, 2022\n"
+"Last-Translator: Phigger Phigger <automates@lepouete.fr>, 2019\n"
 "Language-Team: French (https://www.transifex.com/Friendica/teams/12172/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fr\n"
-"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: advancedcontentfilter.php:154
+#: advancedcontentfilter.php:134
 #, php-format
 msgid "Filtered by rule: %s"
 msgstr "Filtré par règle:%s"
 
-#: advancedcontentfilter.php:170 advancedcontentfilter.php:225
+#: advancedcontentfilter.php:147 advancedcontentfilter.php:204
 msgid "Advanced Content Filter"
 msgstr "Filtre avancé de contenu"
 
-#: advancedcontentfilter.php:224
+#: advancedcontentfilter.php:203
 msgid "Back to Addon Settings"
 msgstr "Retour aux paramètres de l'extension"
 
-#: advancedcontentfilter.php:226
+#: advancedcontentfilter.php:205
 msgid "Add a Rule"
 msgstr "Ajouter une règle"
 
-#: advancedcontentfilter.php:227
+#: advancedcontentfilter.php:206
 msgid "Help"
 msgstr "Aide"
 
-#: advancedcontentfilter.php:228
+#: advancedcontentfilter.php:207
 msgid ""
 "Add and manage your personal content filter rules in this screen. Rules have"
 " a name and an arbitrary expression that will be matched against post data. "
 "For a complete reference of the available operations and variables, check "
-"the help page."
+"the <a href=\"advancedcontentfilter/help\">help page</a>."
 msgstr ""
-"Cet écran permet d'ajouter et de gérer vos règles de filtrage de contenu "
-"personnelles. Les règles ont un nom et une expression arbitraire qui sera "
-"comparée aux données des messages. Pour une référence complète des "
-"opérations et variables disponibles, consultez la page d'aide."
+"Dans cet écran, ajoutez et gérez votre règle personnelle de filtre de "
+"contenu. Les règles portent un nom et contiennent une expression arbitraire "
+"qui sera appliquée aux données du post. Pour une liste complète des "
+"opérations disponibles, voyez la page d'aide"
 
-#: advancedcontentfilter.php:229
+#: advancedcontentfilter.php:208
 msgid "Your rules"
 msgstr "Vos règles"
 
-#: advancedcontentfilter.php:230
+#: advancedcontentfilter.php:209
 msgid ""
 "You have no rules yet! Start adding one by clicking on the button above next"
 " to the title."
@@ -70,108 +68,110 @@ msgstr ""
 "Vous n'avez encore aucune règle! Ajoutez-en une en cliquant le bouton au-"
 "dessus près du titre"
 
-#: advancedcontentfilter.php:231
+#: advancedcontentfilter.php:210
 msgid "Disabled"
 msgstr "Désactivé"
 
-#: advancedcontentfilter.php:232
+#: advancedcontentfilter.php:211
 msgid "Enabled"
 msgstr "Activé"
 
-#: advancedcontentfilter.php:233
+#: advancedcontentfilter.php:212
 msgid "Disable this rule"
 msgstr "Désactiver cette règle"
 
-#: advancedcontentfilter.php:234
+#: advancedcontentfilter.php:213
 msgid "Enable this rule"
 msgstr "Activer cette règle"
 
-#: advancedcontentfilter.php:235
+#: advancedcontentfilter.php:214
 msgid "Edit this rule"
 msgstr "Modifier cette règle"
 
-#: advancedcontentfilter.php:236
+#: advancedcontentfilter.php:215
 msgid "Edit the rule"
 msgstr "Modifier la règle"
 
-#: advancedcontentfilter.php:237
+#: advancedcontentfilter.php:216
 msgid "Save this rule"
 msgstr "Enregistrer cette règle"
 
-#: advancedcontentfilter.php:238
+#: advancedcontentfilter.php:217
 msgid "Delete this rule"
 msgstr "Supprimer cette règle"
 
-#: advancedcontentfilter.php:239
+#: advancedcontentfilter.php:218
 msgid "Rule"
 msgstr "Règle"
 
-#: advancedcontentfilter.php:240
+#: advancedcontentfilter.php:219
 msgid "Close"
 msgstr "Fermer"
 
-#: advancedcontentfilter.php:241
+#: advancedcontentfilter.php:220
 msgid "Add new rule"
 msgstr "Ajouter nouvelle règle"
 
-#: advancedcontentfilter.php:242
+#: advancedcontentfilter.php:221
 msgid "Rule Name"
 msgstr "Nommer règle"
 
-#: advancedcontentfilter.php:243
+#: advancedcontentfilter.php:222
 msgid "Rule Expression"
 msgstr "Expression de règle"
 
-#: advancedcontentfilter.php:244
+#: advancedcontentfilter.php:223
+msgid ""
+"<p>Examples:</p><ul><li><pre>author_link == "
+"'https://friendica.mrpetovan.com/profile/hypolite'</pre></li><li>tags</li></ul>"
+msgstr ""
+"<p>Exemples :</p><ul><li><pre>author_link == "
+"'https://friendica.mrpetovan.com/profile/hypolite'</pre></li><li>tags</li></ul>"
+
+#: advancedcontentfilter.php:224
 msgid "Cancel"
 msgstr "Annuler"
 
-#: advancedcontentfilter.php:295
-msgid "This addon requires this node having at least one post"
-msgstr ""
-"Cette extension requiert au moins une publication sur ce serveur pour "
-"fonctionner"
-
-#: advancedcontentfilter.php:325 advancedcontentfilter.php:336
-#: advancedcontentfilter.php:347 advancedcontentfilter.php:383
-#: advancedcontentfilter.php:414 advancedcontentfilter.php:437
+#: advancedcontentfilter.php:290 advancedcontentfilter.php:301
+#: advancedcontentfilter.php:312 advancedcontentfilter.php:346
+#: advancedcontentfilter.php:375 advancedcontentfilter.php:396
 msgid "You must be logged in to use this method"
 msgstr "Vous devez être connecté pour utiliser cette méthode"
 
-#: advancedcontentfilter.php:351 advancedcontentfilter.php:387
-#: advancedcontentfilter.php:418
+#: advancedcontentfilter.php:316 advancedcontentfilter.php:350
+#: advancedcontentfilter.php:379
 msgid "Invalid form security token, please refresh the page."
 msgstr "Formulaire token de sécurité invalide, rafraîchissez la page"
 
-#: advancedcontentfilter.php:363
+#: advancedcontentfilter.php:328
 msgid "The rule name and expression are required."
 msgstr "Le nom et l'expression de cette règle sont requis"
 
-#: advancedcontentfilter.php:377
+#: advancedcontentfilter.php:340
 msgid "Rule successfully added"
 msgstr "Règle bien ajoutée"
 
-#: advancedcontentfilter.php:391 advancedcontentfilter.php:422
+#: advancedcontentfilter.php:354 advancedcontentfilter.php:383
 msgid "Rule doesn't exist or doesn't belong to you."
 msgstr "Cette règle n'existe pas ou ne vous appartient pas"
 
-#: advancedcontentfilter.php:408
+#: advancedcontentfilter.php:369
 msgid "Rule successfully updated"
 msgstr "Règle bien mise à jour"
 
-#: advancedcontentfilter.php:431
+#: advancedcontentfilter.php:390
 msgid "Rule successfully deleted"
 msgstr "Règle bien supprimée"
 
-#: advancedcontentfilter.php:441
+#: advancedcontentfilter.php:400
 msgid "Missing argument: guid."
 msgstr "Argument manquant: "
 
-#: advancedcontentfilter.php:449
+#: advancedcontentfilter.php:406
 #, php-format
 msgid "Unknown post with guid: %s"
 msgstr "Post inconnu avec guid : %s"
 
-#: src/middlewares.php:49
+#: src/middlewares.php:28
 msgid "Method not found"
 msgstr "Méthode non trouvée"
diff --git a/advancedcontentfilter/lang/fr/strings.php b/advancedcontentfilter/lang/fr/strings.php
index bf31165a..95f39f66 100644
--- a/advancedcontentfilter/lang/fr/strings.php
+++ b/advancedcontentfilter/lang/fr/strings.php
@@ -3,38 +3,39 @@
 if(! function_exists("string_plural_select_fr")) {
 function string_plural_select_fr($n){
 	$n = intval($n);
-	if (($n == 0 || $n == 1)) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
+	return ($n > 1);;
 }}
-$a->strings['Filtered by rule: %s'] = 'Filtré par règle:%s';
-$a->strings['Advanced Content Filter'] = 'Filtre avancé de contenu';
-$a->strings['Back to Addon Settings'] = 'Retour aux paramètres de l\'extension';
-$a->strings['Add a Rule'] = 'Ajouter une règle';
-$a->strings['Help'] = 'Aide';
-$a->strings['Add and manage your personal content filter rules in this screen. Rules have a name and an arbitrary expression that will be matched against post data. For a complete reference of the available operations and variables, check the help page.'] = 'Cet écran permet d\'ajouter et de gérer vos règles de filtrage de contenu personnelles. Les règles ont un nom et une expression arbitraire qui sera comparée aux données des messages. Pour une référence complète des opérations et variables disponibles, consultez la page d\'aide.';
-$a->strings['Your rules'] = 'Vos règles';
-$a->strings['You have no rules yet! Start adding one by clicking on the button above next to the title.'] = 'Vous n\'avez encore aucune règle! Ajoutez-en une en cliquant le bouton au-dessus près du titre';
-$a->strings['Disabled'] = 'Désactivé';
-$a->strings['Enabled'] = 'Activé';
-$a->strings['Disable this rule'] = 'Désactiver cette règle';
-$a->strings['Enable this rule'] = 'Activer cette règle';
-$a->strings['Edit this rule'] = 'Modifier cette règle';
-$a->strings['Edit the rule'] = 'Modifier la règle';
-$a->strings['Save this rule'] = 'Enregistrer cette règle';
-$a->strings['Delete this rule'] = 'Supprimer cette règle';
-$a->strings['Rule'] = 'Règle';
-$a->strings['Close'] = 'Fermer';
-$a->strings['Add new rule'] = 'Ajouter nouvelle règle';
-$a->strings['Rule Name'] = 'Nommer règle';
-$a->strings['Rule Expression'] = 'Expression de règle';
-$a->strings['Cancel'] = 'Annuler';
-$a->strings['This addon requires this node having at least one post'] = 'Cette extension requiert au moins une publication sur ce serveur pour fonctionner';
-$a->strings['You must be logged in to use this method'] = 'Vous devez être connecté pour utiliser cette méthode';
-$a->strings['Invalid form security token, please refresh the page.'] = 'Formulaire token de sécurité invalide, rafraîchissez la page';
-$a->strings['The rule name and expression are required.'] = 'Le nom et l\'expression de cette règle sont requis';
-$a->strings['Rule successfully added'] = 'Règle bien ajoutée';
-$a->strings['Rule doesn\'t exist or doesn\'t belong to you.'] = 'Cette règle n\'existe pas ou ne vous appartient pas';
-$a->strings['Rule successfully updated'] = 'Règle bien mise à jour';
-$a->strings['Rule successfully deleted'] = 'Règle bien supprimée';
-$a->strings['Missing argument: guid.'] = 'Argument manquant: ';
-$a->strings['Unknown post with guid: %s'] = 'Post inconnu avec guid : %s';
-$a->strings['Method not found'] = 'Méthode non trouvée';
+;
+$a->strings["Filtered by rule: %s"] = "Filtré par règle:%s";
+$a->strings["Advanced Content Filter"] = "Filtre avancé de contenu";
+$a->strings["Back to Addon Settings"] = "Retour aux paramètres de l'extension";
+$a->strings["Add a Rule"] = "Ajouter une règle";
+$a->strings["Help"] = "Aide";
+$a->strings["Add and manage your personal content filter rules in this screen. Rules have a name and an arbitrary expression that will be matched against post data. For a complete reference of the available operations and variables, check the <a href=\"advancedcontentfilter/help\">help page</a>."] = "Dans cet écran, ajoutez et gérez votre règle personnelle de filtre de contenu. Les règles portent un nom et contiennent une expression arbitraire qui sera appliquée aux données du post. Pour une liste complète des opérations disponibles, voyez la page d'aide";
+$a->strings["Your rules"] = "Vos règles";
+$a->strings["You have no rules yet! Start adding one by clicking on the button above next to the title."] = "Vous n'avez encore aucune règle! Ajoutez-en une en cliquant le bouton au-dessus près du titre";
+$a->strings["Disabled"] = "Désactivé";
+$a->strings["Enabled"] = "Activé";
+$a->strings["Disable this rule"] = "Désactiver cette règle";
+$a->strings["Enable this rule"] = "Activer cette règle";
+$a->strings["Edit this rule"] = "Modifier cette règle";
+$a->strings["Edit the rule"] = "Modifier la règle";
+$a->strings["Save this rule"] = "Enregistrer cette règle";
+$a->strings["Delete this rule"] = "Supprimer cette règle";
+$a->strings["Rule"] = "Règle";
+$a->strings["Close"] = "Fermer";
+$a->strings["Add new rule"] = "Ajouter nouvelle règle";
+$a->strings["Rule Name"] = "Nommer règle";
+$a->strings["Rule Expression"] = "Expression de règle";
+$a->strings["<p>Examples:</p><ul><li><pre>author_link == 'https://friendica.mrpetovan.com/profile/hypolite'</pre></li><li>tags</li></ul>"] = "<p>Exemples :</p><ul><li><pre>author_link == 'https://friendica.mrpetovan.com/profile/hypolite'</pre></li><li>tags</li></ul>";
+$a->strings["Cancel"] = "Annuler";
+$a->strings["You must be logged in to use this method"] = "Vous devez être connecté pour utiliser cette méthode";
+$a->strings["Invalid form security token, please refresh the page."] = "Formulaire token de sécurité invalide, rafraîchissez la page";
+$a->strings["The rule name and expression are required."] = "Le nom et l'expression de cette règle sont requis";
+$a->strings["Rule successfully added"] = "Règle bien ajoutée";
+$a->strings["Rule doesn't exist or doesn't belong to you."] = "Cette règle n'existe pas ou ne vous appartient pas";
+$a->strings["Rule successfully updated"] = "Règle bien mise à jour";
+$a->strings["Rule successfully deleted"] = "Règle bien supprimée";
+$a->strings["Missing argument: guid."] = "Argument manquant: ";
+$a->strings["Unknown post with guid: %s"] = "Post inconnu avec guid : %s";
+$a->strings["Method not found"] = "Méthode non trouvée";
diff --git a/advancedcontentfilter/lang/hu/messages.po b/advancedcontentfilter/lang/hu/messages.po
deleted file mode 100644
index 74570518..00000000
--- a/advancedcontentfilter/lang/hu/messages.po
+++ /dev/null
@@ -1,173 +0,0 @@
-# ADDON advancedcontentfilter
-# Copyright (C)
-# This file is distributed under the same license as the Friendica advancedcontentfilter addon package.
-# 
-# 
-# Translators:
-# Balázs Úr, 2022
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-11 08:54-0400\n"
-"PO-Revision-Date: 2018-05-24 06:41+0000\n"
-"Last-Translator: Balázs Úr, 2022\n"
-"Language-Team: Hungarian (https://www.transifex.com/Friendica/teams/12172/hu/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: hu\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: advancedcontentfilter.php:154
-#, php-format
-msgid "Filtered by rule: %s"
-msgstr "Szűrve a szabály alapján: %s"
-
-#: advancedcontentfilter.php:170 advancedcontentfilter.php:225
-msgid "Advanced Content Filter"
-msgstr "Speciális tartalomszűrő"
-
-#: advancedcontentfilter.php:224
-msgid "Back to Addon Settings"
-msgstr "Vissza a bővítménybeállításokhoz"
-
-#: advancedcontentfilter.php:226
-msgid "Add a Rule"
-msgstr "Szabály hozzáadása"
-
-#: advancedcontentfilter.php:227
-msgid "Help"
-msgstr "Súgó"
-
-#: advancedcontentfilter.php:228
-msgid ""
-"Add and manage your personal content filter rules in this screen. Rules have"
-" a name and an arbitrary expression that will be matched against post data. "
-"For a complete reference of the available operations and variables, check "
-"the help page."
-msgstr ""
-"Személyes tartalomszűrő szabályok hozzáadása és kezelése ezen a képernyőn. A"
-" szabályoknak van nevük és egy tetszőleges kifejezésük, amely a bejegyzés "
-"adataira lesz illesztve. Az elérhető műveletek és változók teljes "
-"hivatkozásáért nézze meg a súgóoldalt."
-
-#: advancedcontentfilter.php:229
-msgid "Your rules"
-msgstr "Az Ön szabályai"
-
-#: advancedcontentfilter.php:230
-msgid ""
-"You have no rules yet! Start adding one by clicking on the button above next"
-" to the title."
-msgstr ""
-"Még nincsenek szabályai! Kezdje meg egy szabály hozzáadását a cím mellett "
-"lévő fenti gombra kattintva."
-
-#: advancedcontentfilter.php:231
-msgid "Disabled"
-msgstr "Letiltva"
-
-#: advancedcontentfilter.php:232
-msgid "Enabled"
-msgstr "Engedélyezve"
-
-#: advancedcontentfilter.php:233
-msgid "Disable this rule"
-msgstr "A szabály letiltása"
-
-#: advancedcontentfilter.php:234
-msgid "Enable this rule"
-msgstr "A szabály engedélyezése"
-
-#: advancedcontentfilter.php:235
-msgid "Edit this rule"
-msgstr "A szabály szerkesztése"
-
-#: advancedcontentfilter.php:236
-msgid "Edit the rule"
-msgstr "A szabály szerkesztése"
-
-#: advancedcontentfilter.php:237
-msgid "Save this rule"
-msgstr "A szabály mentése"
-
-#: advancedcontentfilter.php:238
-msgid "Delete this rule"
-msgstr "A szabály törlése"
-
-#: advancedcontentfilter.php:239
-msgid "Rule"
-msgstr "Szabály"
-
-#: advancedcontentfilter.php:240
-msgid "Close"
-msgstr "Bezárás"
-
-#: advancedcontentfilter.php:241
-msgid "Add new rule"
-msgstr "Új szabály hozzáadása"
-
-#: advancedcontentfilter.php:242
-msgid "Rule Name"
-msgstr "Szabály neve"
-
-#: advancedcontentfilter.php:243
-msgid "Rule Expression"
-msgstr "Szabály kifejezése"
-
-#: advancedcontentfilter.php:244
-msgid "Cancel"
-msgstr "Mégse"
-
-#: advancedcontentfilter.php:295
-msgid "This addon requires this node having at least one post"
-msgstr ""
-"Ez a bővítmény megköveteli, hogy ennek a csomópontnak legalább egy "
-"bejegyzése legyen"
-
-#: advancedcontentfilter.php:325 advancedcontentfilter.php:336
-#: advancedcontentfilter.php:347 advancedcontentfilter.php:383
-#: advancedcontentfilter.php:414 advancedcontentfilter.php:437
-msgid "You must be logged in to use this method"
-msgstr "Bejelentkezve kell lennie a módszer használatához"
-
-#: advancedcontentfilter.php:351 advancedcontentfilter.php:387
-#: advancedcontentfilter.php:418
-msgid "Invalid form security token, please refresh the page."
-msgstr "Érvénytelen űrlap biztonsági token. Frissítse az oldalt."
-
-#: advancedcontentfilter.php:363
-msgid "The rule name and expression are required."
-msgstr "A szabály neve és kifejezése kötelező."
-
-#: advancedcontentfilter.php:377
-msgid "Rule successfully added"
-msgstr "A szabály sikeresen hozzáadva"
-
-#: advancedcontentfilter.php:391 advancedcontentfilter.php:422
-msgid "Rule doesn't exist or doesn't belong to you."
-msgstr "A szabály nem létezik vagy nem Önhöz tatozik."
-
-#: advancedcontentfilter.php:408
-msgid "Rule successfully updated"
-msgstr "A szabály sikeresen frissítve"
-
-#: advancedcontentfilter.php:431
-msgid "Rule successfully deleted"
-msgstr "A szabály sikeresen törölve"
-
-#: advancedcontentfilter.php:441
-msgid "Missing argument: guid."
-msgstr "Hiányzó argumentum: guid."
-
-#: advancedcontentfilter.php:449
-#, php-format
-msgid "Unknown post with guid: %s"
-msgstr "Ismeretlen bejegyzés a következő guid azonosítóval: %s"
-
-#: src/middlewares.php:49
-msgid "Method not found"
-msgstr "A módszer nem található"
diff --git a/advancedcontentfilter/lang/hu/strings.php b/advancedcontentfilter/lang/hu/strings.php
deleted file mode 100644
index ba50caee..00000000
--- a/advancedcontentfilter/lang/hu/strings.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_hu")) {
-function string_plural_select_hu($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Filtered by rule: %s'] = 'Szűrve a szabály alapján: %s';
-$a->strings['Advanced Content Filter'] = 'Speciális tartalomszűrő';
-$a->strings['Back to Addon Settings'] = 'Vissza a bővítménybeállításokhoz';
-$a->strings['Add a Rule'] = 'Szabály hozzáadása';
-$a->strings['Help'] = 'Súgó';
-$a->strings['Add and manage your personal content filter rules in this screen. Rules have a name and an arbitrary expression that will be matched against post data. For a complete reference of the available operations and variables, check the help page.'] = 'Személyes tartalomszűrő szabályok hozzáadása és kezelése ezen a képernyőn. A szabályoknak van nevük és egy tetszőleges kifejezésük, amely a bejegyzés adataira lesz illesztve. Az elérhető műveletek és változók teljes hivatkozásáért nézze meg a súgóoldalt.';
-$a->strings['Your rules'] = 'Az Ön szabályai';
-$a->strings['You have no rules yet! Start adding one by clicking on the button above next to the title.'] = 'Még nincsenek szabályai! Kezdje meg egy szabály hozzáadását a cím mellett lévő fenti gombra kattintva.';
-$a->strings['Disabled'] = 'Letiltva';
-$a->strings['Enabled'] = 'Engedélyezve';
-$a->strings['Disable this rule'] = 'A szabály letiltása';
-$a->strings['Enable this rule'] = 'A szabály engedélyezése';
-$a->strings['Edit this rule'] = 'A szabály szerkesztése';
-$a->strings['Edit the rule'] = 'A szabály szerkesztése';
-$a->strings['Save this rule'] = 'A szabály mentése';
-$a->strings['Delete this rule'] = 'A szabály törlése';
-$a->strings['Rule'] = 'Szabály';
-$a->strings['Close'] = 'Bezárás';
-$a->strings['Add new rule'] = 'Új szabály hozzáadása';
-$a->strings['Rule Name'] = 'Szabály neve';
-$a->strings['Rule Expression'] = 'Szabály kifejezése';
-$a->strings['Cancel'] = 'Mégse';
-$a->strings['This addon requires this node having at least one post'] = 'Ez a bővítmény megköveteli, hogy ennek a csomópontnak legalább egy bejegyzése legyen';
-$a->strings['You must be logged in to use this method'] = 'Bejelentkezve kell lennie a módszer használatához';
-$a->strings['Invalid form security token, please refresh the page.'] = 'Érvénytelen űrlap biztonsági token. Frissítse az oldalt.';
-$a->strings['The rule name and expression are required.'] = 'A szabály neve és kifejezése kötelező.';
-$a->strings['Rule successfully added'] = 'A szabály sikeresen hozzáadva';
-$a->strings['Rule doesn\'t exist or doesn\'t belong to you.'] = 'A szabály nem létezik vagy nem Önhöz tatozik.';
-$a->strings['Rule successfully updated'] = 'A szabály sikeresen frissítve';
-$a->strings['Rule successfully deleted'] = 'A szabály sikeresen törölve';
-$a->strings['Missing argument: guid.'] = 'Hiányzó argumentum: guid.';
-$a->strings['Unknown post with guid: %s'] = 'Ismeretlen bejegyzés a következő guid azonosítóval: %s';
-$a->strings['Method not found'] = 'A módszer nem található';
diff --git a/advancedcontentfilter/lang/it/messages.po b/advancedcontentfilter/lang/it/messages.po
index f32c5b94..95f14912 100644
--- a/advancedcontentfilter/lang/it/messages.po
+++ b/advancedcontentfilter/lang/it/messages.po
@@ -3,63 +3,60 @@
 # This file is distributed under the same license as the Friendica advancedcontentfilter addon package.
 # 
 # 
-# Translators:
-# fabrixxm <fabrix.xm@gmail.com>, 2018
-# Sylke Vicious <silkevicious@gmail.com>, 2021
-# 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-11 08:54-0400\n"
-"PO-Revision-Date: 2018-05-24 06:41+0000\n"
-"Last-Translator: Sylke Vicious <silkevicious@gmail.com>, 2021\n"
-"Language-Team: Italian (https://app.transifex.com/Friendica/teams/12172/it/)\n"
+"POT-Creation-Date: 2018-04-17 04:04+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fabrixxm <fabrix.xm@gmail.com>, 2018\n"
+"Language-Team: Italian (https://www.transifex.com/Friendica/teams/12172/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: it\n"
-"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: advancedcontentfilter.php:154
+#: advancedcontentfilter.php:134
 #, php-format
 msgid "Filtered by rule: %s"
 msgstr "Filtrato dalla regola: %s"
 
-#: advancedcontentfilter.php:170 advancedcontentfilter.php:225
+#: advancedcontentfilter.php:147 advancedcontentfilter.php:204
 msgid "Advanced Content Filter"
 msgstr "Filtro Avanzato Contenuti"
 
-#: advancedcontentfilter.php:224
+#: advancedcontentfilter.php:203
 msgid "Back to Addon Settings"
 msgstr "Torna alle impostazioni del componente aggiuntivo"
 
-#: advancedcontentfilter.php:226
+#: advancedcontentfilter.php:205
 msgid "Add a Rule"
 msgstr "Aggiungi una regola"
 
-#: advancedcontentfilter.php:227
+#: advancedcontentfilter.php:206
 msgid "Help"
 msgstr "Aiuto"
 
-#: advancedcontentfilter.php:228
+#: advancedcontentfilter.php:207
 msgid ""
 "Add and manage your personal content filter rules in this screen. Rules have"
 " a name and an arbitrary expression that will be matched against post data. "
 "For a complete reference of the available operations and variables, check "
-"the help page."
+"the <a href=\"advancedcontentfilter/help\">help page</a>."
 msgstr ""
 "Aggiungi e gestisci le tue regole personali di filtro contenuti in questa "
 "schermata. Le regole hanno un nome e un'espressione arbitraria che sarà "
 "confrontata con i dati del messaggio. Per un elenco completo delle "
-"operazioni e variabili disponibili, controlla la pagina di aiuto."
+"operazioni disponibili, controlla la <a "
+"href=\"advancedcontentfilter/help\">pagina di aiuto</a>."
 
-#: advancedcontentfilter.php:229
+#: advancedcontentfilter.php:208
 msgid "Your rules"
 msgstr "Le tue regole"
 
-#: advancedcontentfilter.php:230
+#: advancedcontentfilter.php:209
 msgid ""
 "You have no rules yet! Start adding one by clicking on the button above next"
 " to the title."
@@ -67,106 +64,110 @@ msgstr ""
 "Non hai ancora nessuna regola! Aggiungine una cliccando sul bottone qui "
 "sopra a fianco al titolo."
 
-#: advancedcontentfilter.php:231
+#: advancedcontentfilter.php:210
 msgid "Disabled"
 msgstr "Disabilitato"
 
-#: advancedcontentfilter.php:232
+#: advancedcontentfilter.php:211
 msgid "Enabled"
 msgstr "Abilitato"
 
-#: advancedcontentfilter.php:233
+#: advancedcontentfilter.php:212
 msgid "Disable this rule"
 msgstr "Diabilita questa regola"
 
-#: advancedcontentfilter.php:234
+#: advancedcontentfilter.php:213
 msgid "Enable this rule"
 msgstr "Abilita questa regola"
 
-#: advancedcontentfilter.php:235
+#: advancedcontentfilter.php:214
 msgid "Edit this rule"
 msgstr "Modifica questa regola"
 
-#: advancedcontentfilter.php:236
+#: advancedcontentfilter.php:215
 msgid "Edit the rule"
 msgstr "Modifica la regola"
 
-#: advancedcontentfilter.php:237
+#: advancedcontentfilter.php:216
 msgid "Save this rule"
 msgstr "Salva questa regola"
 
-#: advancedcontentfilter.php:238
+#: advancedcontentfilter.php:217
 msgid "Delete this rule"
 msgstr "Elimina questa regola"
 
-#: advancedcontentfilter.php:239
+#: advancedcontentfilter.php:218
 msgid "Rule"
 msgstr "Regola"
 
-#: advancedcontentfilter.php:240
+#: advancedcontentfilter.php:219
 msgid "Close"
 msgstr "Chiudi"
 
-#: advancedcontentfilter.php:241
+#: advancedcontentfilter.php:220
 msgid "Add new rule"
 msgstr "Aggiungi nuova regola"
 
-#: advancedcontentfilter.php:242
+#: advancedcontentfilter.php:221
 msgid "Rule Name"
 msgstr "Nome Regola"
 
-#: advancedcontentfilter.php:243
+#: advancedcontentfilter.php:222
 msgid "Rule Expression"
 msgstr "Espressione Regola"
 
-#: advancedcontentfilter.php:244
+#: advancedcontentfilter.php:223
+msgid ""
+"<p>Examples:</p><ul><li><pre>author_link == "
+"'https://friendica.mrpetovan.com/profile/hypolite'</pre></li><li>tags</li></ul>"
+msgstr ""
+"<p>Esempi:</p><ul><li><pre>author_link == "
+"'https://friendica.mrpetovan.com/profile/hypolite'</pre></li><li>tags</li></ul>"
+
+#: advancedcontentfilter.php:224
 msgid "Cancel"
 msgstr "Annulla"
 
-#: advancedcontentfilter.php:295
-msgid "This addon requires this node having at least one post"
-msgstr ""
-
-#: advancedcontentfilter.php:325 advancedcontentfilter.php:336
-#: advancedcontentfilter.php:347 advancedcontentfilter.php:383
-#: advancedcontentfilter.php:414 advancedcontentfilter.php:437
+#: advancedcontentfilter.php:290 advancedcontentfilter.php:301
+#: advancedcontentfilter.php:312 advancedcontentfilter.php:346
+#: advancedcontentfilter.php:375 advancedcontentfilter.php:396
 msgid "You must be logged in to use this method"
 msgstr "Devi essere autenticato per usare questo metodo"
 
-#: advancedcontentfilter.php:351 advancedcontentfilter.php:387
-#: advancedcontentfilter.php:418
+#: advancedcontentfilter.php:316 advancedcontentfilter.php:350
+#: advancedcontentfilter.php:379
 msgid "Invalid form security token, please refresh the page."
 msgstr "Token di sicurezza invalido, aggiorna la pagina."
 
-#: advancedcontentfilter.php:363
+#: advancedcontentfilter.php:328
 msgid "The rule name and expression are required."
 msgstr "Il nome e l'espressione della regola sono richiesti."
 
-#: advancedcontentfilter.php:377
+#: advancedcontentfilter.php:340
 msgid "Rule successfully added"
 msgstr "Regola aggiunta con successo"
 
-#: advancedcontentfilter.php:391 advancedcontentfilter.php:422
+#: advancedcontentfilter.php:354 advancedcontentfilter.php:383
 msgid "Rule doesn't exist or doesn't belong to you."
 msgstr "La regola non esiste o non ti appartiene."
 
-#: advancedcontentfilter.php:408
+#: advancedcontentfilter.php:369
 msgid "Rule successfully updated"
 msgstr "Regola aggiornata con successo"
 
-#: advancedcontentfilter.php:431
+#: advancedcontentfilter.php:390
 msgid "Rule successfully deleted"
 msgstr "Regola eliminata con successo"
 
-#: advancedcontentfilter.php:441
+#: advancedcontentfilter.php:400
 msgid "Missing argument: guid."
 msgstr "Argomento mancante: guid."
 
-#: advancedcontentfilter.php:449
+#: advancedcontentfilter.php:406
 #, php-format
 msgid "Unknown post with guid: %s"
 msgstr "Messaggio con guid %s sconosciuto"
 
-#: src/middlewares.php:49
+#: src/middlewares.php:28
 msgid "Method not found"
 msgstr "Metodo non trovato"
diff --git a/advancedcontentfilter/lang/it/strings.php b/advancedcontentfilter/lang/it/strings.php
index 5cc01739..b5ef1f08 100644
--- a/advancedcontentfilter/lang/it/strings.php
+++ b/advancedcontentfilter/lang/it/strings.php
@@ -3,37 +3,39 @@
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
 	$n = intval($n);
-	if ($n == 1) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
+	return ($n != 1);;
 }}
-$a->strings['Filtered by rule: %s'] = 'Filtrato dalla regola: %s';
-$a->strings['Advanced Content Filter'] = 'Filtro Avanzato Contenuti';
-$a->strings['Back to Addon Settings'] = 'Torna alle impostazioni del componente aggiuntivo';
-$a->strings['Add a Rule'] = 'Aggiungi una regola';
-$a->strings['Help'] = 'Aiuto';
-$a->strings['Add and manage your personal content filter rules in this screen. Rules have a name and an arbitrary expression that will be matched against post data. For a complete reference of the available operations and variables, check the help page.'] = 'Aggiungi e gestisci le tue regole personali di filtro contenuti in questa schermata. Le regole hanno un nome e un\'espressione arbitraria che sarà confrontata con i dati del messaggio. Per un elenco completo delle operazioni e variabili disponibili, controlla la pagina di aiuto.';
-$a->strings['Your rules'] = 'Le tue regole';
-$a->strings['You have no rules yet! Start adding one by clicking on the button above next to the title.'] = 'Non hai ancora nessuna regola! Aggiungine una cliccando sul bottone qui sopra a fianco al titolo.';
-$a->strings['Disabled'] = 'Disabilitato';
-$a->strings['Enabled'] = 'Abilitato';
-$a->strings['Disable this rule'] = 'Diabilita questa regola';
-$a->strings['Enable this rule'] = 'Abilita questa regola';
-$a->strings['Edit this rule'] = 'Modifica questa regola';
-$a->strings['Edit the rule'] = 'Modifica la regola';
-$a->strings['Save this rule'] = 'Salva questa regola';
-$a->strings['Delete this rule'] = 'Elimina questa regola';
-$a->strings['Rule'] = 'Regola';
-$a->strings['Close'] = 'Chiudi';
-$a->strings['Add new rule'] = 'Aggiungi nuova regola';
-$a->strings['Rule Name'] = 'Nome Regola';
-$a->strings['Rule Expression'] = 'Espressione Regola';
-$a->strings['Cancel'] = 'Annulla';
-$a->strings['You must be logged in to use this method'] = 'Devi essere autenticato per usare questo metodo';
-$a->strings['Invalid form security token, please refresh the page.'] = 'Token di sicurezza invalido, aggiorna la pagina.';
-$a->strings['The rule name and expression are required.'] = 'Il nome e l\'espressione della regola sono richiesti.';
-$a->strings['Rule successfully added'] = 'Regola aggiunta con successo';
-$a->strings['Rule doesn\'t exist or doesn\'t belong to you.'] = 'La regola non esiste o non ti appartiene.';
-$a->strings['Rule successfully updated'] = 'Regola aggiornata con successo';
-$a->strings['Rule successfully deleted'] = 'Regola eliminata con successo';
-$a->strings['Missing argument: guid.'] = 'Argomento mancante: guid.';
-$a->strings['Unknown post with guid: %s'] = 'Messaggio con guid %s sconosciuto';
-$a->strings['Method not found'] = 'Metodo non trovato';
+;
+$a->strings["Filtered by rule: %s"] = "Filtrato dalla regola: %s";
+$a->strings["Advanced Content Filter"] = "Filtro Avanzato Contenuti";
+$a->strings["Back to Addon Settings"] = "Torna alle impostazioni del componente aggiuntivo";
+$a->strings["Add a Rule"] = "Aggiungi una regola";
+$a->strings["Help"] = "Aiuto";
+$a->strings["Add and manage your personal content filter rules in this screen. Rules have a name and an arbitrary expression that will be matched against post data. For a complete reference of the available operations and variables, check the <a href=\"advancedcontentfilter/help\">help page</a>."] = "Aggiungi e gestisci le tue regole personali di filtro contenuti in questa schermata. Le regole hanno un nome e un'espressione arbitraria che sarà confrontata con i dati del messaggio. Per un elenco completo delle operazioni disponibili, controlla la <a href=\"advancedcontentfilter/help\">pagina di aiuto</a>.";
+$a->strings["Your rules"] = "Le tue regole";
+$a->strings["You have no rules yet! Start adding one by clicking on the button above next to the title."] = "Non hai ancora nessuna regola! Aggiungine una cliccando sul bottone qui sopra a fianco al titolo.";
+$a->strings["Disabled"] = "Disabilitato";
+$a->strings["Enabled"] = "Abilitato";
+$a->strings["Disable this rule"] = "Diabilita questa regola";
+$a->strings["Enable this rule"] = "Abilita questa regola";
+$a->strings["Edit this rule"] = "Modifica questa regola";
+$a->strings["Edit the rule"] = "Modifica la regola";
+$a->strings["Save this rule"] = "Salva questa regola";
+$a->strings["Delete this rule"] = "Elimina questa regola";
+$a->strings["Rule"] = "Regola";
+$a->strings["Close"] = "Chiudi";
+$a->strings["Add new rule"] = "Aggiungi nuova regola";
+$a->strings["Rule Name"] = "Nome Regola";
+$a->strings["Rule Expression"] = "Espressione Regola";
+$a->strings["<p>Examples:</p><ul><li><pre>author_link == 'https://friendica.mrpetovan.com/profile/hypolite'</pre></li><li>tags</li></ul>"] = "<p>Esempi:</p><ul><li><pre>author_link == 'https://friendica.mrpetovan.com/profile/hypolite'</pre></li><li>tags</li></ul>";
+$a->strings["Cancel"] = "Annulla";
+$a->strings["You must be logged in to use this method"] = "Devi essere autenticato per usare questo metodo";
+$a->strings["Invalid form security token, please refresh the page."] = "Token di sicurezza invalido, aggiorna la pagina.";
+$a->strings["The rule name and expression are required."] = "Il nome e l'espressione della regola sono richiesti.";
+$a->strings["Rule successfully added"] = "Regola aggiunta con successo";
+$a->strings["Rule doesn't exist or doesn't belong to you."] = "La regola non esiste o non ti appartiene.";
+$a->strings["Rule successfully updated"] = "Regola aggiornata con successo";
+$a->strings["Rule successfully deleted"] = "Regola eliminata con successo";
+$a->strings["Missing argument: guid."] = "Argomento mancante: guid.";
+$a->strings["Unknown post with guid: %s"] = "Messaggio con guid %s sconosciuto";
+$a->strings["Method not found"] = "Metodo non trovato";
diff --git a/advancedcontentfilter/lang/nl/strings.php b/advancedcontentfilter/lang/nl/strings.php
index d430eaf4..6c40c028 100644
--- a/advancedcontentfilter/lang/nl/strings.php
+++ b/advancedcontentfilter/lang/nl/strings.php
@@ -3,38 +3,39 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Filtered by rule: %s'] = 'Gefilterd volgens regel: %s';
-$a->strings['Advanced Content Filter'] = 'Geavanceerd filter voor berichtsinhoud';
-$a->strings['Back to Addon Settings'] = 'Terug naar Addon instellingen';
-$a->strings['Add a Rule'] = 'Filterregel toevoegen';
-$a->strings['Help'] = 'Help';
-$a->strings['Add and manage your personal content filter rules in this screen. Rules have a name and an arbitrary expression that will be matched against post data. For a complete reference of the available operations and variables, check the <a href="advancedcontentfilter/help">help page</a>.'] = 'Beheer de filterregels van je persoonlijke filter voor berichtsinhoud in dit scherm. Regels hebben een naam en bewoording welke we automatisch controleren door te vergelijken met de inhoud van elk bericht. Voor een compleet naslagwerk van de beschikbare bewerkingen en variabelen, zie de  <a href="advancedcontentfilter/help">help pagina</a>.';
-$a->strings['Your rules'] = 'Jouw regels';
-$a->strings['You have no rules yet! Start adding one by clicking on the button above next to the title.'] = 'Je hebt nog geen regels! Klik op de knop bovenin naast de titel om een regel toe te voegen.';
-$a->strings['Disabled'] = 'Uitgeschakeld';
-$a->strings['Enabled'] = 'Geactiveerd';
-$a->strings['Disable this rule'] = 'Deze regel uitschakelen';
-$a->strings['Enable this rule'] = 'Deze regel inschakelen';
-$a->strings['Edit this rule'] = 'Regel bewerken';
-$a->strings['Edit the rule'] = 'Regel bewerken';
-$a->strings['Save this rule'] = 'Deze regel opslaan';
-$a->strings['Delete this rule'] = 'Deze regel verwijderen';
-$a->strings['Rule'] = 'Regel';
-$a->strings['Close'] = 'Sluiten';
-$a->strings['Add new rule'] = 'Voeg nieuwe regel toe';
-$a->strings['Rule Name'] = 'Regel naam';
-$a->strings['Rule Expression'] = 'Regel bewoording';
-$a->strings['<p>Examples:</p><ul><li><pre>author_link == \'https://friendica.mrpetovan.com/profile/hypolite\'</pre></li><li>tags</li></ul>'] = '<p>Voorbeelden:</p><ul><li><pre>author_link == \'https://friendica.mrpetovan.com/profile/hypolite\'</pre></li><li>label</li></ul>';
-$a->strings['Cancel'] = 'Annuleren';
-$a->strings['You must be logged in to use this method'] = 'Je moet ingelogd zijn om deze methode te gebruiken';
-$a->strings['Invalid form security token, please refresh the page.'] = 'Ongeldige formulier beveiligings token, vernieuw de pagina a.u.b.';
-$a->strings['The rule name and expression are required.'] = 'De regelnaam en bewoording zijn vereist.';
-$a->strings['Rule successfully added'] = 'Regel succesvol toegevoegd';
-$a->strings['Rule doesn\'t exist or doesn\'t belong to you.'] = 'Deze regel bestaat niet, of is niet van jou.';
-$a->strings['Rule successfully updated'] = 'Regel succesvol opgeslagen';
-$a->strings['Rule successfully deleted'] = 'Regel succesvol verwijderd';
-$a->strings['Missing argument: guid.'] = 'Parameter guid niet aanwezig';
-$a->strings['Unknown post with guid: %s'] = 'Onbekend bericht met guid: %s';
-$a->strings['Method not found'] = 'Methode niet gevonden';
+;
+$a->strings["Filtered by rule: %s"] = "Gefilterd volgens regel: %s";
+$a->strings["Advanced Content Filter"] = "Geavanceerd filter voor berichtsinhoud";
+$a->strings["Back to Addon Settings"] = "Terug naar Addon instellingen";
+$a->strings["Add a Rule"] = "Filterregel toevoegen";
+$a->strings["Help"] = "Help";
+$a->strings["Add and manage your personal content filter rules in this screen. Rules have a name and an arbitrary expression that will be matched against post data. For a complete reference of the available operations and variables, check the <a href=\"advancedcontentfilter/help\">help page</a>."] = "Beheer de filterregels van je persoonlijke filter voor berichtsinhoud in dit scherm. Regels hebben een naam en bewoording welke we automatisch controleren door te vergelijken met de inhoud van elk bericht. Voor een compleet naslagwerk van de beschikbare bewerkingen en variabelen, zie de  <a href=\"advancedcontentfilter/help\">help pagina</a>.";
+$a->strings["Your rules"] = "Jouw regels";
+$a->strings["You have no rules yet! Start adding one by clicking on the button above next to the title."] = "Je hebt nog geen regels! Klik op de knop bovenin naast de titel om een regel toe te voegen.";
+$a->strings["Disabled"] = "Uitgeschakeld";
+$a->strings["Enabled"] = "Geactiveerd";
+$a->strings["Disable this rule"] = "Deze regel uitschakelen";
+$a->strings["Enable this rule"] = "Deze regel inschakelen";
+$a->strings["Edit this rule"] = "Regel bewerken";
+$a->strings["Edit the rule"] = "Regel bewerken";
+$a->strings["Save this rule"] = "Deze regel opslaan";
+$a->strings["Delete this rule"] = "Deze regel verwijderen";
+$a->strings["Rule"] = "Regel";
+$a->strings["Close"] = "Sluiten";
+$a->strings["Add new rule"] = "Voeg nieuwe regel toe";
+$a->strings["Rule Name"] = "Regel naam";
+$a->strings["Rule Expression"] = "Regel bewoording";
+$a->strings["<p>Examples:</p><ul><li><pre>author_link == 'https://friendica.mrpetovan.com/profile/hypolite'</pre></li><li>tags</li></ul>"] = "<p>Voorbeelden:</p><ul><li><pre>author_link == 'https://friendica.mrpetovan.com/profile/hypolite'</pre></li><li>label</li></ul>";
+$a->strings["Cancel"] = "Annuleren";
+$a->strings["You must be logged in to use this method"] = "Je moet ingelogd zijn om deze methode te gebruiken";
+$a->strings["Invalid form security token, please refresh the page."] = "Ongeldige formulier beveiligings token, vernieuw de pagina a.u.b.";
+$a->strings["The rule name and expression are required."] = "De regelnaam en bewoording zijn vereist.";
+$a->strings["Rule successfully added"] = "Regel succesvol toegevoegd";
+$a->strings["Rule doesn't exist or doesn't belong to you."] = "Deze regel bestaat niet, of is niet van jou.";
+$a->strings["Rule successfully updated"] = "Regel succesvol opgeslagen";
+$a->strings["Rule successfully deleted"] = "Regel succesvol verwijderd";
+$a->strings["Missing argument: guid."] = "Parameter guid niet aanwezig";
+$a->strings["Unknown post with guid: %s"] = "Onbekend bericht met guid: %s";
+$a->strings["Method not found"] = "Methode niet gevonden";
diff --git a/advancedcontentfilter/lang/pl/messages.po b/advancedcontentfilter/lang/pl/messages.po
index 5fc9ca65..a31cac58 100644
--- a/advancedcontentfilter/lang/pl/messages.po
+++ b/advancedcontentfilter/lang/pl/messages.po
@@ -3,19 +3,14 @@
 # This file is distributed under the same license as the Friendica advancedcontentfilter addon package.
 # 
 # 
-# Translators:
-# Waldemar Stoczkowski, 2018
-# Joe Doe, 2021
-# Piotr Strębski <strebski@gmail.com>, 2022
-# 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-11 08:54-0400\n"
-"PO-Revision-Date: 2018-05-24 06:41+0000\n"
-"Last-Translator: Piotr Strębski <strebski@gmail.com>, 2022\n"
+"POT-Creation-Date: 2018-04-17 04:04+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>, 2018\n"
 "Language-Team: Polish (https://www.transifex.com/Friendica/teams/12172/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,44 +18,44 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
-#: advancedcontentfilter.php:154
+#: advancedcontentfilter.php:134
 #, php-format
 msgid "Filtered by rule: %s"
 msgstr " Filtruj według reguły: %s"
 
-#: advancedcontentfilter.php:170 advancedcontentfilter.php:225
+#: advancedcontentfilter.php:147 advancedcontentfilter.php:204
 msgid "Advanced Content Filter"
 msgstr "Zaawansowany filtr zawartości"
 
-#: advancedcontentfilter.php:224
+#: advancedcontentfilter.php:203
 msgid "Back to Addon Settings"
 msgstr "Powrót do ustawień dodatków"
 
-#: advancedcontentfilter.php:226
+#: advancedcontentfilter.php:205
 msgid "Add a Rule"
 msgstr "Dodaj regułę"
 
-#: advancedcontentfilter.php:227
+#: advancedcontentfilter.php:206
 msgid "Help"
 msgstr "Pomoc"
 
-#: advancedcontentfilter.php:228
+#: advancedcontentfilter.php:207
 msgid ""
 "Add and manage your personal content filter rules in this screen. Rules have"
 " a name and an arbitrary expression that will be matched against post data. "
 "For a complete reference of the available operations and variables, check "
-"the help page."
+"the <a href=\"advancedcontentfilter/help\">help page</a>."
 msgstr ""
-"Na tym ekranie możesz zarządzać swoimi osobistymi regułami filtrowania "
-"treści. Reguły składają się z nazwy oraz dowolnego wyrażenia, do którego "
-"przyrównywane będą posty. Aby uzyskć więcej informacji na temat dostępnych "
-"opracji oraz zmiennych, zapoznaj się ze stronę pomocy."
+"Dodaj i zarządzaj regułami filtrowania treści osobistych na tym ekranie. "
+"Reguły mają nazwę i dowolne wyrażenie, które zostanie dopasowane do danych "
+"postów. Aby uzyskać pełne informacje o dostępnych operacjach i zmiennych, "
+"sprawdź <a href=\"advancedcontentfilter/help\">stronę pomocy</a>."
 
-#: advancedcontentfilter.php:229
+#: advancedcontentfilter.php:208
 msgid "Your rules"
 msgstr "Twoje zasady"
 
-#: advancedcontentfilter.php:230
+#: advancedcontentfilter.php:209
 msgid ""
 "You have no rules yet! Start adding one by clicking on the button above next"
 " to the title."
@@ -68,106 +63,110 @@ msgstr ""
 "Nie masz jeszcze żadnych zasad! Zacznij dodawać jedną, klikając przycisk "
 "znajdujący się nad tytułem."
 
-#: advancedcontentfilter.php:231
+#: advancedcontentfilter.php:210
 msgid "Disabled"
 msgstr "Wyłącz"
 
-#: advancedcontentfilter.php:232
+#: advancedcontentfilter.php:211
 msgid "Enabled"
 msgstr "Włącz"
 
-#: advancedcontentfilter.php:233
+#: advancedcontentfilter.php:212
 msgid "Disable this rule"
 msgstr "Wyłącz tę regułę"
 
-#: advancedcontentfilter.php:234
+#: advancedcontentfilter.php:213
 msgid "Enable this rule"
 msgstr "Włącz tę regułę"
 
-#: advancedcontentfilter.php:235
+#: advancedcontentfilter.php:214
 msgid "Edit this rule"
 msgstr "Edytuj tę regułę"
 
-#: advancedcontentfilter.php:236
+#: advancedcontentfilter.php:215
 msgid "Edit the rule"
 msgstr "Edytuj regułę"
 
-#: advancedcontentfilter.php:237
+#: advancedcontentfilter.php:216
 msgid "Save this rule"
 msgstr "Zapisz tę regułę"
 
-#: advancedcontentfilter.php:238
+#: advancedcontentfilter.php:217
 msgid "Delete this rule"
 msgstr "Usuń tę regułę"
 
-#: advancedcontentfilter.php:239
+#: advancedcontentfilter.php:218
 msgid "Rule"
 msgstr "Reguła"
 
-#: advancedcontentfilter.php:240
+#: advancedcontentfilter.php:219
 msgid "Close"
 msgstr "Zamknij"
 
-#: advancedcontentfilter.php:241
+#: advancedcontentfilter.php:220
 msgid "Add new rule"
 msgstr "Dodaj nową regułę"
 
-#: advancedcontentfilter.php:242
+#: advancedcontentfilter.php:221
 msgid "Rule Name"
 msgstr "Nazwa reguły"
 
-#: advancedcontentfilter.php:243
+#: advancedcontentfilter.php:222
 msgid "Rule Expression"
 msgstr "Wyrażanie reguły"
 
-#: advancedcontentfilter.php:244
+#: advancedcontentfilter.php:223
+msgid ""
+"<p>Examples:</p><ul><li><pre>author_link == "
+"'https://friendica.mrpetovan.com/profile/hypolite'</pre></li><li>tags</li></ul>"
+msgstr ""
+"<p>przykład</p><ul><li><pre>author_link == "
+"'https://friendica.mrpetovan.com/profile/hypolite'</pre></li><li>tagi</li></ul>"
+
+#: advancedcontentfilter.php:224
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: advancedcontentfilter.php:295
-msgid "This addon requires this node having at least one post"
-msgstr "Ten dodatek wymaga, aby ten węzeł miał co najmniej jeden wpis"
-
-#: advancedcontentfilter.php:325 advancedcontentfilter.php:336
-#: advancedcontentfilter.php:347 advancedcontentfilter.php:383
-#: advancedcontentfilter.php:414 advancedcontentfilter.php:437
+#: advancedcontentfilter.php:290 advancedcontentfilter.php:301
+#: advancedcontentfilter.php:312 advancedcontentfilter.php:346
+#: advancedcontentfilter.php:375 advancedcontentfilter.php:396
 msgid "You must be logged in to use this method"
 msgstr "Musisz być zalogowany, aby skorzystać z tej metody"
 
-#: advancedcontentfilter.php:351 advancedcontentfilter.php:387
-#: advancedcontentfilter.php:418
+#: advancedcontentfilter.php:316 advancedcontentfilter.php:350
+#: advancedcontentfilter.php:379
 msgid "Invalid form security token, please refresh the page."
 msgstr "Nieprawidłowy token zabezpieczający formularz, odśwież stronę."
 
-#: advancedcontentfilter.php:363
+#: advancedcontentfilter.php:328
 msgid "The rule name and expression are required."
 msgstr "Nazwa reguły i wyrażenie są wymagane."
 
-#: advancedcontentfilter.php:377
+#: advancedcontentfilter.php:340
 msgid "Rule successfully added"
 msgstr "Reguła została pomyślnie dodana"
 
-#: advancedcontentfilter.php:391 advancedcontentfilter.php:422
+#: advancedcontentfilter.php:354 advancedcontentfilter.php:383
 msgid "Rule doesn't exist or doesn't belong to you."
 msgstr "Reguła nie istnieje lub nie należy do ciebie."
 
-#: advancedcontentfilter.php:408
+#: advancedcontentfilter.php:369
 msgid "Rule successfully updated"
 msgstr "Reguła została pomyślnie zaktualizowana"
 
-#: advancedcontentfilter.php:431
+#: advancedcontentfilter.php:390
 msgid "Rule successfully deleted"
 msgstr "Reguła została pomyślnie usunięta"
 
-#: advancedcontentfilter.php:441
+#: advancedcontentfilter.php:400
 msgid "Missing argument: guid."
 msgstr "Brakujący argument: guid."
 
-#: advancedcontentfilter.php:449
+#: advancedcontentfilter.php:406
 #, php-format
 msgid "Unknown post with guid: %s"
 msgstr "Nieznany post z guid:%s"
 
-#: src/middlewares.php:49
+#: src/middlewares.php:28
 msgid "Method not found"
 msgstr "Nie znaleziono metody"
diff --git a/advancedcontentfilter/lang/pl/strings.php b/advancedcontentfilter/lang/pl/strings.php
index 625819c1..0ddf8c45 100644
--- a/advancedcontentfilter/lang/pl/strings.php
+++ b/advancedcontentfilter/lang/pl/strings.php
@@ -3,38 +3,39 @@
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
 	$n = intval($n);
-	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
+	return ($n==1 ? 0 : ($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14) ? 1 : $n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14) ? 2 : 3);;
 }}
-$a->strings['Filtered by rule: %s'] = ' Filtruj według reguły: %s';
-$a->strings['Advanced Content Filter'] = 'Zaawansowany filtr zawartości';
-$a->strings['Back to Addon Settings'] = 'Powrót do ustawień dodatków';
-$a->strings['Add a Rule'] = 'Dodaj regułę';
-$a->strings['Help'] = 'Pomoc';
-$a->strings['Add and manage your personal content filter rules in this screen. Rules have a name and an arbitrary expression that will be matched against post data. For a complete reference of the available operations and variables, check the help page.'] = 'Na tym ekranie możesz zarządzać swoimi osobistymi regułami filtrowania treści. Reguły składają się z nazwy oraz dowolnego wyrażenia, do którego przyrównywane będą posty. Aby uzyskć więcej informacji na temat dostępnych opracji oraz zmiennych, zapoznaj się ze stronę pomocy.';
-$a->strings['Your rules'] = 'Twoje zasady';
-$a->strings['You have no rules yet! Start adding one by clicking on the button above next to the title.'] = 'Nie masz jeszcze żadnych zasad! Zacznij dodawać jedną, klikając przycisk znajdujący się nad tytułem.';
-$a->strings['Disabled'] = 'Wyłącz';
-$a->strings['Enabled'] = 'Włącz';
-$a->strings['Disable this rule'] = 'Wyłącz tę regułę';
-$a->strings['Enable this rule'] = 'Włącz tę regułę';
-$a->strings['Edit this rule'] = 'Edytuj tę regułę';
-$a->strings['Edit the rule'] = 'Edytuj regułę';
-$a->strings['Save this rule'] = 'Zapisz tę regułę';
-$a->strings['Delete this rule'] = 'Usuń tę regułę';
-$a->strings['Rule'] = 'Reguła';
-$a->strings['Close'] = 'Zamknij';
-$a->strings['Add new rule'] = 'Dodaj nową regułę';
-$a->strings['Rule Name'] = 'Nazwa reguły';
-$a->strings['Rule Expression'] = 'Wyrażanie reguły';
-$a->strings['Cancel'] = 'Anuluj';
-$a->strings['This addon requires this node having at least one post'] = 'Ten dodatek wymaga, aby ten węzeł miał co najmniej jeden wpis';
-$a->strings['You must be logged in to use this method'] = 'Musisz być zalogowany, aby skorzystać z tej metody';
-$a->strings['Invalid form security token, please refresh the page.'] = 'Nieprawidłowy token zabezpieczający formularz, odśwież stronę.';
-$a->strings['The rule name and expression are required.'] = 'Nazwa reguły i wyrażenie są wymagane.';
-$a->strings['Rule successfully added'] = 'Reguła została pomyślnie dodana';
-$a->strings['Rule doesn\'t exist or doesn\'t belong to you.'] = 'Reguła nie istnieje lub nie należy do ciebie.';
-$a->strings['Rule successfully updated'] = 'Reguła została pomyślnie zaktualizowana';
-$a->strings['Rule successfully deleted'] = 'Reguła została pomyślnie usunięta';
-$a->strings['Missing argument: guid.'] = 'Brakujący argument: guid.';
-$a->strings['Unknown post with guid: %s'] = 'Nieznany post z guid:%s';
-$a->strings['Method not found'] = 'Nie znaleziono metody';
+;
+$a->strings["Filtered by rule: %s"] = " Filtruj według reguły: %s";
+$a->strings["Advanced Content Filter"] = "Zaawansowany filtr zawartości";
+$a->strings["Back to Addon Settings"] = "Powrót do ustawień dodatków";
+$a->strings["Add a Rule"] = "Dodaj regułę";
+$a->strings["Help"] = "Pomoc";
+$a->strings["Add and manage your personal content filter rules in this screen. Rules have a name and an arbitrary expression that will be matched against post data. For a complete reference of the available operations and variables, check the <a href=\"advancedcontentfilter/help\">help page</a>."] = "Dodaj i zarządzaj regułami filtrowania treści osobistych na tym ekranie. Reguły mają nazwę i dowolne wyrażenie, które zostanie dopasowane do danych postów. Aby uzyskać pełne informacje o dostępnych operacjach i zmiennych, sprawdź <a href=\"advancedcontentfilter/help\">stronę pomocy</a>.";
+$a->strings["Your rules"] = "Twoje zasady";
+$a->strings["You have no rules yet! Start adding one by clicking on the button above next to the title."] = "Nie masz jeszcze żadnych zasad! Zacznij dodawać jedną, klikając przycisk znajdujący się nad tytułem.";
+$a->strings["Disabled"] = "Wyłącz";
+$a->strings["Enabled"] = "Włącz";
+$a->strings["Disable this rule"] = "Wyłącz tę regułę";
+$a->strings["Enable this rule"] = "Włącz tę regułę";
+$a->strings["Edit this rule"] = "Edytuj tę regułę";
+$a->strings["Edit the rule"] = "Edytuj regułę";
+$a->strings["Save this rule"] = "Zapisz tę regułę";
+$a->strings["Delete this rule"] = "Usuń tę regułę";
+$a->strings["Rule"] = "Reguła";
+$a->strings["Close"] = "Zamknij";
+$a->strings["Add new rule"] = "Dodaj nową regułę";
+$a->strings["Rule Name"] = "Nazwa reguły";
+$a->strings["Rule Expression"] = "Wyrażanie reguły";
+$a->strings["<p>Examples:</p><ul><li><pre>author_link == 'https://friendica.mrpetovan.com/profile/hypolite'</pre></li><li>tags</li></ul>"] = "<p>przykład</p><ul><li><pre>author_link == 'https://friendica.mrpetovan.com/profile/hypolite'</pre></li><li>tagi</li></ul>";
+$a->strings["Cancel"] = "Anuluj";
+$a->strings["You must be logged in to use this method"] = "Musisz być zalogowany, aby skorzystać z tej metody";
+$a->strings["Invalid form security token, please refresh the page."] = "Nieprawidłowy token zabezpieczający formularz, odśwież stronę.";
+$a->strings["The rule name and expression are required."] = "Nazwa reguły i wyrażenie są wymagane.";
+$a->strings["Rule successfully added"] = "Reguła została pomyślnie dodana";
+$a->strings["Rule doesn't exist or doesn't belong to you."] = "Reguła nie istnieje lub nie należy do ciebie.";
+$a->strings["Rule successfully updated"] = "Reguła została pomyślnie zaktualizowana";
+$a->strings["Rule successfully deleted"] = "Reguła została pomyślnie usunięta";
+$a->strings["Missing argument: guid."] = "Brakujący argument: guid.";
+$a->strings["Unknown post with guid: %s"] = "Nieznany post z guid:%s";
+$a->strings["Method not found"] = "Nie znaleziono metody";
diff --git a/advancedcontentfilter/lang/ru/messages.po b/advancedcontentfilter/lang/ru/messages.po
deleted file mode 100644
index 8c7b2a8f..00000000
--- a/advancedcontentfilter/lang/ru/messages.po
+++ /dev/null
@@ -1,173 +0,0 @@
-# ADDON advancedcontentfilter
-# Copyright (C)
-# This file is distributed under the same license as the Friendica advancedcontentfilter addon package.
-# 
-# 
-# Translators:
-# Alexey Adamov <2077@tutanota.com>, 2019
-# Eugene Veresk <eugene.vereshchagin@gmail.com>, 2020
-# Alexander An <ravnina@gmail.com>, 2022
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-11 08:54-0400\n"
-"PO-Revision-Date: 2018-05-24 06:41+0000\n"
-"Last-Translator: Alexander An <ravnina@gmail.com>, 2022\n"
-"Language-Team: Russian (https://www.transifex.com/Friendica/teams/12172/ru/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ru\n"
-"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
-
-#: advancedcontentfilter.php:154
-#, php-format
-msgid "Filtered by rule: %s"
-msgstr "Отфильтровано по правилу: %s"
-
-#: advancedcontentfilter.php:170 advancedcontentfilter.php:225
-msgid "Advanced Content Filter"
-msgstr "Расширенный фильтр содержимого"
-
-#: advancedcontentfilter.php:224
-msgid "Back to Addon Settings"
-msgstr "Вернуться к настройкам дополнений"
-
-#: advancedcontentfilter.php:226
-msgid "Add a Rule"
-msgstr "Добавить правило"
-
-#: advancedcontentfilter.php:227
-msgid "Help"
-msgstr "Помощь"
-
-#: advancedcontentfilter.php:228
-msgid ""
-"Add and manage your personal content filter rules in this screen. Rules have"
-" a name and an arbitrary expression that will be matched against post data. "
-"For a complete reference of the available operations and variables, check "
-"the help page."
-msgstr ""
-"Добавляйте и управляйте своими собственными фильтрами на этой странице. У "
-"правил есть имя и произвольное выражение, которое будет сопоставляться с "
-"данными поста. Для полной ссылки на доступные операции и переменные, "
-"посмотрите страницу справки."
-
-#: advancedcontentfilter.php:229
-msgid "Your rules"
-msgstr "Ваши правила"
-
-#: advancedcontentfilter.php:230
-msgid ""
-"You have no rules yet! Start adding one by clicking on the button above next"
-" to the title."
-msgstr ""
-"У Вас нет ни одного правила. Начните добавление первого с нажатия на кнопку "
-"выше, рядом с названием."
-
-#: advancedcontentfilter.php:231
-msgid "Disabled"
-msgstr "Отключено"
-
-#: advancedcontentfilter.php:232
-msgid "Enabled"
-msgstr "Включено"
-
-#: advancedcontentfilter.php:233
-msgid "Disable this rule"
-msgstr "Отключить это правило"
-
-#: advancedcontentfilter.php:234
-msgid "Enable this rule"
-msgstr "Включить это правило"
-
-#: advancedcontentfilter.php:235
-msgid "Edit this rule"
-msgstr "Изменить это правило"
-
-#: advancedcontentfilter.php:236
-msgid "Edit the rule"
-msgstr "Изменить правило"
-
-#: advancedcontentfilter.php:237
-msgid "Save this rule"
-msgstr "Сохранить это правило"
-
-#: advancedcontentfilter.php:238
-msgid "Delete this rule"
-msgstr "Удалить это правило"
-
-#: advancedcontentfilter.php:239
-msgid "Rule"
-msgstr "Правило"
-
-#: advancedcontentfilter.php:240
-msgid "Close"
-msgstr "Закрыть"
-
-#: advancedcontentfilter.php:241
-msgid "Add new rule"
-msgstr "Добавить новое правило"
-
-#: advancedcontentfilter.php:242
-msgid "Rule Name"
-msgstr "Название правила"
-
-#: advancedcontentfilter.php:243
-msgid "Rule Expression"
-msgstr "Содержание правила"
-
-#: advancedcontentfilter.php:244
-msgid "Cancel"
-msgstr "Отмена"
-
-#: advancedcontentfilter.php:295
-msgid "This addon requires this node having at least one post"
-msgstr "Это дополнение требует наличия хотя бы одной записи на этом узле."
-
-#: advancedcontentfilter.php:325 advancedcontentfilter.php:336
-#: advancedcontentfilter.php:347 advancedcontentfilter.php:383
-#: advancedcontentfilter.php:414 advancedcontentfilter.php:437
-msgid "You must be logged in to use this method"
-msgstr "Вы должны авторизоваться для использования этого метода"
-
-#: advancedcontentfilter.php:351 advancedcontentfilter.php:387
-#: advancedcontentfilter.php:418
-msgid "Invalid form security token, please refresh the page."
-msgstr "Неверный ключ, пожалуйста, перезагрузите страницу"
-
-#: advancedcontentfilter.php:363
-msgid "The rule name and expression are required."
-msgstr "Требуется ввести название и значение правила."
-
-#: advancedcontentfilter.php:377
-msgid "Rule successfully added"
-msgstr "Правило успешно добавлено"
-
-#: advancedcontentfilter.php:391 advancedcontentfilter.php:422
-msgid "Rule doesn't exist or doesn't belong to you."
-msgstr "Правило не найдено или доступ к нему закрыт"
-
-#: advancedcontentfilter.php:408
-msgid "Rule successfully updated"
-msgstr "Правило успешно обновлено"
-
-#: advancedcontentfilter.php:431
-msgid "Rule successfully deleted"
-msgstr "Правило успешно удалено"
-
-#: advancedcontentfilter.php:441
-msgid "Missing argument: guid."
-msgstr "Отсутствующий аргумент: guid."
-
-#: advancedcontentfilter.php:449
-#, php-format
-msgid "Unknown post with guid: %s"
-msgstr "Неизвестный пост в ID: %s"
-
-#: src/middlewares.php:49
-msgid "Method not found"
-msgstr "Метод не найден"
diff --git a/advancedcontentfilter/lang/ru/strings.php b/advancedcontentfilter/lang/ru/strings.php
deleted file mode 100644
index a2b225a8..00000000
--- a/advancedcontentfilter/lang/ru/strings.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_ru")) {
-function string_plural_select_ru($n){
-	$n = intval($n);
-	if ($n%10==1 && $n%100!=11) { return 0; } else if ($n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14)) { return 1; } else if ($n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)) { return 2; } else  { return 3; }
-}}
-$a->strings['Filtered by rule: %s'] = 'Отфильтровано по правилу: %s';
-$a->strings['Advanced Content Filter'] = 'Расширенный фильтр содержимого';
-$a->strings['Back to Addon Settings'] = 'Вернуться к настройкам дополнений';
-$a->strings['Add a Rule'] = 'Добавить правило';
-$a->strings['Help'] = 'Помощь';
-$a->strings['Add and manage your personal content filter rules in this screen. Rules have a name and an arbitrary expression that will be matched against post data. For a complete reference of the available operations and variables, check the help page.'] = 'Добавляйте и управляйте своими собственными фильтрами на этой странице. У правил есть имя и произвольное выражение, которое будет сопоставляться с данными поста. Для полной ссылки на доступные операции и переменные, посмотрите страницу справки.';
-$a->strings['Your rules'] = 'Ваши правила';
-$a->strings['You have no rules yet! Start adding one by clicking on the button above next to the title.'] = 'У Вас нет ни одного правила. Начните добавление первого с нажатия на кнопку выше, рядом с названием.';
-$a->strings['Disabled'] = 'Отключено';
-$a->strings['Enabled'] = 'Включено';
-$a->strings['Disable this rule'] = 'Отключить это правило';
-$a->strings['Enable this rule'] = 'Включить это правило';
-$a->strings['Edit this rule'] = 'Изменить это правило';
-$a->strings['Edit the rule'] = 'Изменить правило';
-$a->strings['Save this rule'] = 'Сохранить это правило';
-$a->strings['Delete this rule'] = 'Удалить это правило';
-$a->strings['Rule'] = 'Правило';
-$a->strings['Close'] = 'Закрыть';
-$a->strings['Add new rule'] = 'Добавить новое правило';
-$a->strings['Rule Name'] = 'Название правила';
-$a->strings['Rule Expression'] = 'Содержание правила';
-$a->strings['Cancel'] = 'Отмена';
-$a->strings['This addon requires this node having at least one post'] = 'Это дополнение требует наличия хотя бы одной записи на этом узле.';
-$a->strings['You must be logged in to use this method'] = 'Вы должны авторизоваться для использования этого метода';
-$a->strings['Invalid form security token, please refresh the page.'] = 'Неверный ключ, пожалуйста, перезагрузите страницу';
-$a->strings['The rule name and expression are required.'] = 'Требуется ввести название и значение правила.';
-$a->strings['Rule successfully added'] = 'Правило успешно добавлено';
-$a->strings['Rule doesn\'t exist or doesn\'t belong to you.'] = 'Правило не найдено или доступ к нему закрыт';
-$a->strings['Rule successfully updated'] = 'Правило успешно обновлено';
-$a->strings['Rule successfully deleted'] = 'Правило успешно удалено';
-$a->strings['Missing argument: guid.'] = 'Отсутствующий аргумент: guid.';
-$a->strings['Unknown post with guid: %s'] = 'Неизвестный пост в ID: %s';
-$a->strings['Method not found'] = 'Метод не найден';
diff --git a/advancedcontentfilter/lang/sv/messages.po b/advancedcontentfilter/lang/sv/messages.po
index 4630af72..49deb133 100644
--- a/advancedcontentfilter/lang/sv/messages.po
+++ b/advancedcontentfilter/lang/sv/messages.po
@@ -5,16 +5,15 @@
 # 
 # Translators:
 # Bjoessi <torbjorn.andersson@syte.se>, 2019
-# Viktor Nilsson, 2022
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-05-11 08:54-0400\n"
+"POT-Creation-Date: 2018-04-17 04:04+0200\n"
 "PO-Revision-Date: 2018-05-24 06:41+0000\n"
-"Last-Translator: Viktor Nilsson, 2022\n"
+"Last-Translator: Bjoessi <torbjorn.andersson@syte.se>, 2019\n"
 "Language-Team: Swedish (https://www.transifex.com/Friendica/teams/12172/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,44 +21,44 @@ msgstr ""
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: advancedcontentfilter.php:154
+#: advancedcontentfilter.php:134
 #, php-format
 msgid "Filtered by rule: %s"
 msgstr "Filtrerat efter regel: %s"
 
-#: advancedcontentfilter.php:170 advancedcontentfilter.php:225
+#: advancedcontentfilter.php:147 advancedcontentfilter.php:204
 msgid "Advanced Content Filter"
 msgstr "Avancerat innehållsfiter"
 
-#: advancedcontentfilter.php:224
+#: advancedcontentfilter.php:203
 msgid "Back to Addon Settings"
 msgstr "TIllbaka till Tilläggsinställningar"
 
-#: advancedcontentfilter.php:226
+#: advancedcontentfilter.php:205
 msgid "Add a Rule"
 msgstr "Lägg till en regel"
 
-#: advancedcontentfilter.php:227
+#: advancedcontentfilter.php:206
 msgid "Help"
 msgstr "Hjälp"
 
-#: advancedcontentfilter.php:228
+#: advancedcontentfilter.php:207
 msgid ""
 "Add and manage your personal content filter rules in this screen. Rules have"
 " a name and an arbitrary expression that will be matched against post data. "
 "For a complete reference of the available operations and variables, check "
-"the help page."
+"the <a href=\"advancedcontentfilter/help\">help page</a>."
 msgstr ""
 "Lägg till och hantera dina personliga regler för innehållsfilter i det här "
-"fönstret. Regler har ett namn och ett filteruttryck som jämförs mot "
-"inläggets innehåll. Förteckning över alla operander och variabler finns att "
-"hitta på <a href=\"advancedcontentfilter/help\">hjälpsidan</a>."
+"fönstret. Regler har ett namn och ett valfritt uttryck och kommer jämföras "
+"mot inläggets innehåll. Förteckning av alla operander och variabler finns "
+"att hitta på <a href=\"advancedcontentfilter/help\">hjälpsidan</a>."
 
-#: advancedcontentfilter.php:229
+#: advancedcontentfilter.php:208
 msgid "Your rules"
 msgstr "Dina regler"
 
-#: advancedcontentfilter.php:230
+#: advancedcontentfilter.php:209
 msgid ""
 "You have no rules yet! Start adding one by clicking on the button above next"
 " to the title."
@@ -67,106 +66,110 @@ msgstr ""
 "Du har inga regler än! Lägg till regler genom att klicka på knappen ovanför,"
 " bredvid överskriften."
 
-#: advancedcontentfilter.php:231
+#: advancedcontentfilter.php:210
 msgid "Disabled"
 msgstr "Inaktiverad"
 
-#: advancedcontentfilter.php:232
+#: advancedcontentfilter.php:211
 msgid "Enabled"
 msgstr "Aktiverad"
 
-#: advancedcontentfilter.php:233
+#: advancedcontentfilter.php:212
 msgid "Disable this rule"
 msgstr "Inaktivera den här regeln"
 
-#: advancedcontentfilter.php:234
+#: advancedcontentfilter.php:213
 msgid "Enable this rule"
 msgstr "Aktivera den här regeln"
 
-#: advancedcontentfilter.php:235
+#: advancedcontentfilter.php:214
 msgid "Edit this rule"
 msgstr "Redigera den här regeln"
 
-#: advancedcontentfilter.php:236
+#: advancedcontentfilter.php:215
 msgid "Edit the rule"
 msgstr "Redigera den här regeln"
 
-#: advancedcontentfilter.php:237
+#: advancedcontentfilter.php:216
 msgid "Save this rule"
 msgstr "Spara den här regeln"
 
-#: advancedcontentfilter.php:238
+#: advancedcontentfilter.php:217
 msgid "Delete this rule"
 msgstr "Ta bort den här regeln"
 
-#: advancedcontentfilter.php:239
+#: advancedcontentfilter.php:218
 msgid "Rule"
 msgstr "Regel"
 
-#: advancedcontentfilter.php:240
+#: advancedcontentfilter.php:219
 msgid "Close"
 msgstr "Stäng"
 
-#: advancedcontentfilter.php:241
+#: advancedcontentfilter.php:220
 msgid "Add new rule"
 msgstr "Lägg till ny regel"
 
-#: advancedcontentfilter.php:242
+#: advancedcontentfilter.php:221
 msgid "Rule Name"
 msgstr "Regelnamn"
 
-#: advancedcontentfilter.php:243
+#: advancedcontentfilter.php:222
 msgid "Rule Expression"
 msgstr "Regeluttryck"
 
-#: advancedcontentfilter.php:244
+#: advancedcontentfilter.php:223
+msgid ""
+"<p>Examples:</p><ul><li><pre>author_link == "
+"'https://friendica.mrpetovan.com/profile/hypolite'</pre></li><li>tags</li></ul>"
+msgstr ""
+"<p>Exempel:</p><ul><li><pre>author_link == "
+"'https://friendica.mrpetovan.com/profile/hypolite'</pre></li><li>taggar</li></ul>"
+
+#: advancedcontentfilter.php:224
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: advancedcontentfilter.php:295
-msgid "This addon requires this node having at least one post"
-msgstr "Detta tillägg kräver att denna nod har åtminstone ett inlägg"
-
-#: advancedcontentfilter.php:325 advancedcontentfilter.php:336
-#: advancedcontentfilter.php:347 advancedcontentfilter.php:383
-#: advancedcontentfilter.php:414 advancedcontentfilter.php:437
+#: advancedcontentfilter.php:290 advancedcontentfilter.php:301
+#: advancedcontentfilter.php:312 advancedcontentfilter.php:346
+#: advancedcontentfilter.php:375 advancedcontentfilter.php:396
 msgid "You must be logged in to use this method"
 msgstr "Du måste vara inloggad för att använda den här funktionen"
 
-#: advancedcontentfilter.php:351 advancedcontentfilter.php:387
-#: advancedcontentfilter.php:418
+#: advancedcontentfilter.php:316 advancedcontentfilter.php:350
+#: advancedcontentfilter.php:379
 msgid "Invalid form security token, please refresh the page."
 msgstr "Felaktigt säkerhetsformulärstecken, vänligen uppdatera sidan."
 
-#: advancedcontentfilter.php:363
+#: advancedcontentfilter.php:328
 msgid "The rule name and expression are required."
 msgstr "Regelns namn och uttryck krävs."
 
-#: advancedcontentfilter.php:377
+#: advancedcontentfilter.php:340
 msgid "Rule successfully added"
 msgstr "Regeln kunde läggas till"
 
-#: advancedcontentfilter.php:391 advancedcontentfilter.php:422
+#: advancedcontentfilter.php:354 advancedcontentfilter.php:383
 msgid "Rule doesn't exist or doesn't belong to you."
 msgstr "Regeln finns inte eller tillhör inte dig."
 
-#: advancedcontentfilter.php:408
+#: advancedcontentfilter.php:369
 msgid "Rule successfully updated"
 msgstr "Uppdatering av regel lyckades"
 
-#: advancedcontentfilter.php:431
+#: advancedcontentfilter.php:390
 msgid "Rule successfully deleted"
 msgstr "Borttagning av regel lyckades"
 
-#: advancedcontentfilter.php:441
+#: advancedcontentfilter.php:400
 msgid "Missing argument: guid."
 msgstr "Argument saknas: guid."
 
-#: advancedcontentfilter.php:449
+#: advancedcontentfilter.php:406
 #, php-format
 msgid "Unknown post with guid: %s"
 msgstr "Okänt inlägg med guid: %s"
 
-#: src/middlewares.php:49
+#: src/middlewares.php:28
 msgid "Method not found"
 msgstr "Metod hittades inte"
diff --git a/advancedcontentfilter/lang/sv/strings.php b/advancedcontentfilter/lang/sv/strings.php
index b50e9aab..8ceea2db 100644
--- a/advancedcontentfilter/lang/sv/strings.php
+++ b/advancedcontentfilter/lang/sv/strings.php
@@ -3,38 +3,39 @@
 if(! function_exists("string_plural_select_sv")) {
 function string_plural_select_sv($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Filtered by rule: %s'] = 'Filtrerat efter regel: %s';
-$a->strings['Advanced Content Filter'] = 'Avancerat innehållsfiter';
-$a->strings['Back to Addon Settings'] = 'TIllbaka till Tilläggsinställningar';
-$a->strings['Add a Rule'] = 'Lägg till en regel';
-$a->strings['Help'] = 'Hjälp';
-$a->strings['Add and manage your personal content filter rules in this screen. Rules have a name and an arbitrary expression that will be matched against post data. For a complete reference of the available operations and variables, check the help page.'] = 'Lägg till och hantera dina personliga regler för innehållsfilter i det här fönstret. Regler har ett namn och ett filteruttryck som jämförs mot inläggets innehåll. Förteckning över alla operander och variabler finns att hitta på <a href="advancedcontentfilter/help">hjälpsidan</a>.';
-$a->strings['Your rules'] = 'Dina regler';
-$a->strings['You have no rules yet! Start adding one by clicking on the button above next to the title.'] = 'Du har inga regler än! Lägg till regler genom att klicka på knappen ovanför, bredvid överskriften.';
-$a->strings['Disabled'] = 'Inaktiverad';
-$a->strings['Enabled'] = 'Aktiverad';
-$a->strings['Disable this rule'] = 'Inaktivera den här regeln';
-$a->strings['Enable this rule'] = 'Aktivera den här regeln';
-$a->strings['Edit this rule'] = 'Redigera den här regeln';
-$a->strings['Edit the rule'] = 'Redigera den här regeln';
-$a->strings['Save this rule'] = 'Spara den här regeln';
-$a->strings['Delete this rule'] = 'Ta bort den här regeln';
-$a->strings['Rule'] = 'Regel';
-$a->strings['Close'] = 'Stäng';
-$a->strings['Add new rule'] = 'Lägg till ny regel';
-$a->strings['Rule Name'] = 'Regelnamn';
-$a->strings['Rule Expression'] = 'Regeluttryck';
-$a->strings['Cancel'] = 'Avbryt';
-$a->strings['This addon requires this node having at least one post'] = 'Detta tillägg kräver att denna nod har åtminstone ett inlägg';
-$a->strings['You must be logged in to use this method'] = 'Du måste vara inloggad för att använda den här funktionen';
-$a->strings['Invalid form security token, please refresh the page.'] = 'Felaktigt säkerhetsformulärstecken, vänligen uppdatera sidan.';
-$a->strings['The rule name and expression are required.'] = 'Regelns namn och uttryck krävs.';
-$a->strings['Rule successfully added'] = 'Regeln kunde läggas till';
-$a->strings['Rule doesn\'t exist or doesn\'t belong to you.'] = 'Regeln finns inte eller tillhör inte dig.';
-$a->strings['Rule successfully updated'] = 'Uppdatering av regel lyckades';
-$a->strings['Rule successfully deleted'] = 'Borttagning av regel lyckades';
-$a->strings['Missing argument: guid.'] = 'Argument saknas: guid.';
-$a->strings['Unknown post with guid: %s'] = 'Okänt inlägg med guid: %s';
-$a->strings['Method not found'] = 'Metod hittades inte';
+;
+$a->strings["Filtered by rule: %s"] = "Filtrerat efter regel: %s";
+$a->strings["Advanced Content Filter"] = "Avancerat innehållsfiter";
+$a->strings["Back to Addon Settings"] = "TIllbaka till Tilläggsinställningar";
+$a->strings["Add a Rule"] = "Lägg till en regel";
+$a->strings["Help"] = "Hjälp";
+$a->strings["Add and manage your personal content filter rules in this screen. Rules have a name and an arbitrary expression that will be matched against post data. For a complete reference of the available operations and variables, check the <a href=\"advancedcontentfilter/help\">help page</a>."] = "Lägg till och hantera dina personliga regler för innehållsfilter i det här fönstret. Regler har ett namn och ett valfritt uttryck och kommer jämföras mot inläggets innehåll. Förteckning av alla operander och variabler finns att hitta på <a href=\"advancedcontentfilter/help\">hjälpsidan</a>.";
+$a->strings["Your rules"] = "Dina regler";
+$a->strings["You have no rules yet! Start adding one by clicking on the button above next to the title."] = "Du har inga regler än! Lägg till regler genom att klicka på knappen ovanför, bredvid överskriften.";
+$a->strings["Disabled"] = "Inaktiverad";
+$a->strings["Enabled"] = "Aktiverad";
+$a->strings["Disable this rule"] = "Inaktivera den här regeln";
+$a->strings["Enable this rule"] = "Aktivera den här regeln";
+$a->strings["Edit this rule"] = "Redigera den här regeln";
+$a->strings["Edit the rule"] = "Redigera den här regeln";
+$a->strings["Save this rule"] = "Spara den här regeln";
+$a->strings["Delete this rule"] = "Ta bort den här regeln";
+$a->strings["Rule"] = "Regel";
+$a->strings["Close"] = "Stäng";
+$a->strings["Add new rule"] = "Lägg till ny regel";
+$a->strings["Rule Name"] = "Regelnamn";
+$a->strings["Rule Expression"] = "Regeluttryck";
+$a->strings["<p>Examples:</p><ul><li><pre>author_link == 'https://friendica.mrpetovan.com/profile/hypolite'</pre></li><li>tags</li></ul>"] = "<p>Exempel:</p><ul><li><pre>author_link == 'https://friendica.mrpetovan.com/profile/hypolite'</pre></li><li>taggar</li></ul>";
+$a->strings["Cancel"] = "Avbryt";
+$a->strings["You must be logged in to use this method"] = "Du måste vara inloggad för att använda den här funktionen";
+$a->strings["Invalid form security token, please refresh the page."] = "Felaktigt säkerhetsformulärstecken, vänligen uppdatera sidan.";
+$a->strings["The rule name and expression are required."] = "Regelns namn och uttryck krävs.";
+$a->strings["Rule successfully added"] = "Regeln kunde läggas till";
+$a->strings["Rule doesn't exist or doesn't belong to you."] = "Regeln finns inte eller tillhör inte dig.";
+$a->strings["Rule successfully updated"] = "Uppdatering av regel lyckades";
+$a->strings["Rule successfully deleted"] = "Borttagning av regel lyckades";
+$a->strings["Missing argument: guid."] = "Argument saknas: guid.";
+$a->strings["Unknown post with guid: %s"] = "Okänt inlägg med guid: %s";
+$a->strings["Method not found"] = "Metod hittades inte";
diff --git a/advancedcontentfilter/lang/zh-cn/messages.po b/advancedcontentfilter/lang/zh-cn/messages.po
deleted file mode 100644
index febadeef..00000000
--- a/advancedcontentfilter/lang/zh-cn/messages.po
+++ /dev/null
@@ -1,171 +0,0 @@
-# ADDON advancedcontentfilter
-# Copyright (C)
-# This file is distributed under the same license as the Friendica advancedcontentfilter addon package.
-# 
-# 
-# Translators:
-# Tom <hxxtom@gmail.com>, 2020
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-04-17 04:04+0200\n"
-"PO-Revision-Date: 2018-05-24 06:41+0000\n"
-"Last-Translator: Tom <hxxtom@gmail.com>, 2020\n"
-"Language-Team: Chinese (China) (https://www.transifex.com/Friendica/teams/12172/zh_CN/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: zh_CN\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-
-#: advancedcontentfilter.php:134
-#, php-format
-msgid "Filtered by rule: %s"
-msgstr "通过规则过滤：%s"
-
-#: advancedcontentfilter.php:147 advancedcontentfilter.php:204
-msgid "Advanced Content Filter"
-msgstr "高级内容过滤"
-
-#: advancedcontentfilter.php:203
-msgid "Back to Addon Settings"
-msgstr "返回扩展设置"
-
-#: advancedcontentfilter.php:205
-msgid "Add a Rule"
-msgstr "添加规则"
-
-#: advancedcontentfilter.php:206
-msgid "Help"
-msgstr "帮助"
-
-#: advancedcontentfilter.php:207
-msgid ""
-"Add and manage your personal content filter rules in this screen. Rules have"
-" a name and an arbitrary expression that will be matched against post data. "
-"For a complete reference of the available operations and variables, check "
-"the <a href=\"advancedcontentfilter/help\">help page</a>."
-msgstr ""
-"在此界面上添加和管理你的个人内容过滤规则。规则要有名称和能匹配帖子内容的任意表达式。完整可用的运算符和变量，请查看<a "
-"href=\"advancedcontentfilter/help\">帮助页面</a>。"
-
-#: advancedcontentfilter.php:208
-msgid "Your rules"
-msgstr "你的规则"
-
-#: advancedcontentfilter.php:209
-msgid ""
-"You have no rules yet! Start adding one by clicking on the button above next"
-" to the title."
-msgstr "你还没有规则！点击标题上方的按钮开始新增规则。"
-
-#: advancedcontentfilter.php:210
-msgid "Disabled"
-msgstr "禁用"
-
-#: advancedcontentfilter.php:211
-msgid "Enabled"
-msgstr "启用"
-
-#: advancedcontentfilter.php:212
-msgid "Disable this rule"
-msgstr "禁用此规则"
-
-#: advancedcontentfilter.php:213
-msgid "Enable this rule"
-msgstr "启用此规则"
-
-#: advancedcontentfilter.php:214
-msgid "Edit this rule"
-msgstr "编辑此规则"
-
-#: advancedcontentfilter.php:215
-msgid "Edit the rule"
-msgstr "编辑规则"
-
-#: advancedcontentfilter.php:216
-msgid "Save this rule"
-msgstr "保存规则"
-
-#: advancedcontentfilter.php:217
-msgid "Delete this rule"
-msgstr "删除此规则"
-
-#: advancedcontentfilter.php:218
-msgid "Rule"
-msgstr "规则"
-
-#: advancedcontentfilter.php:219
-msgid "Close"
-msgstr "关闭"
-
-#: advancedcontentfilter.php:220
-msgid "Add new rule"
-msgstr "新增规则"
-
-#: advancedcontentfilter.php:221
-msgid "Rule Name"
-msgstr "规则名"
-
-#: advancedcontentfilter.php:222
-msgid "Rule Expression"
-msgstr "规则表达式"
-
-#: advancedcontentfilter.php:223
-msgid ""
-"<p>Examples:</p><ul><li><pre>author_link == "
-"'https://friendica.mrpetovan.com/profile/hypolite'</pre></li><li>tags</li></ul>"
-msgstr ""
-"<p>例子：</p><ul><li><pre>author_link == "
-"'https://friendica.mrpetovan.com/profile/hypolite</pre></li><li>tags</li></ul>"
-
-#: advancedcontentfilter.php:224
-msgid "Cancel"
-msgstr "取消"
-
-#: advancedcontentfilter.php:290 advancedcontentfilter.php:301
-#: advancedcontentfilter.php:312 advancedcontentfilter.php:346
-#: advancedcontentfilter.php:375 advancedcontentfilter.php:396
-msgid "You must be logged in to use this method"
-msgstr "使用此模式您必须先登录。"
-
-#: advancedcontentfilter.php:316 advancedcontentfilter.php:350
-#: advancedcontentfilter.php:379
-msgid "Invalid form security token, please refresh the page."
-msgstr "无效的安全令牌，请刷新页面。"
-
-#: advancedcontentfilter.php:328
-msgid "The rule name and expression are required."
-msgstr "规则名和表达式必填。"
-
-#: advancedcontentfilter.php:340
-msgid "Rule successfully added"
-msgstr "规则添加成功。"
-
-#: advancedcontentfilter.php:354 advancedcontentfilter.php:383
-msgid "Rule doesn't exist or doesn't belong to you."
-msgstr "规则不存在或不属于你。"
-
-#: advancedcontentfilter.php:369
-msgid "Rule successfully updated"
-msgstr "规则更新成功"
-
-#: advancedcontentfilter.php:390
-msgid "Rule successfully deleted"
-msgstr "规则删除成功"
-
-#: advancedcontentfilter.php:400
-msgid "Missing argument: guid."
-msgstr "缺少参数：guid。"
-
-#: advancedcontentfilter.php:406
-#, php-format
-msgid "Unknown post with guid: %s"
-msgstr "未知帖子 guid：%s"
-
-#: src/middlewares.php:28
-msgid "Method not found"
-msgstr "未找到模式"
diff --git a/advancedcontentfilter/lang/zh-cn/strings.php b/advancedcontentfilter/lang/zh-cn/strings.php
deleted file mode 100644
index 38564446..00000000
--- a/advancedcontentfilter/lang/zh-cn/strings.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_zh_cn")) {
-function string_plural_select_zh_cn($n){
-	$n = intval($n);
-	return intval(0);
-}}
-$a->strings['Filtered by rule: %s'] = '通过规则过滤：%s';
-$a->strings['Advanced Content Filter'] = '高级内容过滤';
-$a->strings['Back to Addon Settings'] = '返回扩展设置';
-$a->strings['Add a Rule'] = '添加规则';
-$a->strings['Help'] = '帮助';
-$a->strings['Add and manage your personal content filter rules in this screen. Rules have a name and an arbitrary expression that will be matched against post data. For a complete reference of the available operations and variables, check the <a href="advancedcontentfilter/help">help page</a>.'] = '在此界面上添加和管理你的个人内容过滤规则。规则要有名称和能匹配帖子内容的任意表达式。完整可用的运算符和变量，请查看<a href="advancedcontentfilter/help">帮助页面</a>。';
-$a->strings['Your rules'] = '你的规则';
-$a->strings['You have no rules yet! Start adding one by clicking on the button above next to the title.'] = '你还没有规则！点击标题上方的按钮开始新增规则。';
-$a->strings['Disabled'] = '禁用';
-$a->strings['Enabled'] = '启用';
-$a->strings['Disable this rule'] = '禁用此规则';
-$a->strings['Enable this rule'] = '启用此规则';
-$a->strings['Edit this rule'] = '编辑此规则';
-$a->strings['Edit the rule'] = '编辑规则';
-$a->strings['Save this rule'] = '保存规则';
-$a->strings['Delete this rule'] = '删除此规则';
-$a->strings['Rule'] = '规则';
-$a->strings['Close'] = '关闭';
-$a->strings['Add new rule'] = '新增规则';
-$a->strings['Rule Name'] = '规则名';
-$a->strings['Rule Expression'] = '规则表达式';
-$a->strings['<p>Examples:</p><ul><li><pre>author_link == \'https://friendica.mrpetovan.com/profile/hypolite\'</pre></li><li>tags</li></ul>'] = '<p>例子：</p><ul><li><pre>author_link == \'https://friendica.mrpetovan.com/profile/hypolite</pre></li><li>tags</li></ul>';
-$a->strings['Cancel'] = '取消';
-$a->strings['You must be logged in to use this method'] = '使用此模式您必须先登录。';
-$a->strings['Invalid form security token, please refresh the page.'] = '无效的安全令牌，请刷新页面。';
-$a->strings['The rule name and expression are required.'] = '规则名和表达式必填。';
-$a->strings['Rule successfully added'] = '规则添加成功。';
-$a->strings['Rule doesn\'t exist or doesn\'t belong to you.'] = '规则不存在或不属于你。';
-$a->strings['Rule successfully updated'] = '规则更新成功';
-$a->strings['Rule successfully deleted'] = '规则删除成功';
-$a->strings['Missing argument: guid.'] = '缺少参数：guid。';
-$a->strings['Unknown post with guid: %s'] = '未知帖子 guid：%s';
-$a->strings['Method not found'] = '未找到模式';
diff --git a/advancedcontentfilter/src/middlewares.php b/advancedcontentfilter/src/middlewares.php
index 2b831473..32e8cb99 100644
--- a/advancedcontentfilter/src/middlewares.php
+++ b/advancedcontentfilter/src/middlewares.php
@@ -1,32 +1,31 @@
 <?php
-/**
- * @copyright Copyright (C) 2020, Friendica
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- *
- */
+use Friendica\Core\L10n;
 
-use Friendica\DI;
+$container = $slim->getContainer();
 
-/** @var $slim \Slim\App */
+// Error handler based off https://stackoverflow.com/a/48135009/757392
+$container['errorHandler'] = function () {
+	return function(Psr\Http\Message\RequestInterface $request, Psr\Http\Message\ResponseInterface $response, Exception $exception)
+	{
+		$responseCode = 500;
 
-/**
- * The routing middleware should be added before the ErrorMiddleware
- * Otherwise exceptions thrown from it will not be handled
- */
-$slim->addRoutingMiddleware();
+		if (is_a($exception, 'Friendica\Network\HTTPException')) {
+			$responseCode = $exception->httpcode;
+		}
 
-$errorMiddleware = $slim->addErrorMiddleware(true, true, true, DI::logger());
+		$errors['message'] = $exception->getMessage();
+
+		$errors['responseCode'] = $responseCode;
+
+		return $response
+				->withStatus($responseCode)
+				->withJson($errors);
+	};
+};
+
+$container['notFoundHandler'] = function () {
+	return function ()
+	{
+		throw new \Friendica\Network\HTTPException\NotFoundException(L10n::t('Method not found'));
+	};
+};
diff --git a/advancedcontentfilter/src/routes.php b/advancedcontentfilter/src/routes.php
index a46f1b4b..969ced68 100644
--- a/advancedcontentfilter/src/routes.php
+++ b/advancedcontentfilter/src/routes.php
@@ -1,36 +1,22 @@
 <?php
-/**
- * @copyright Copyright (C) 2020, Friendica
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- *
- */
+
+// Routes
 
 /* @var $slim Slim\App */
-$slim->group('/advancedcontentfilter/api', function (\Slim\Routing\RouteCollectorProxy $app) {
-	$app->group('/rules', function (\Slim\Routing\RouteCollectorProxy $app) {
-		$app->get('', 'advancedcontentfilter_get_rules');
-		$app->post('', 'advancedcontentfilter_post_rules');
+$slim->group('/advancedcontentfilter/api', function () {
+	/* @var $this Slim\App */
+	$this->group('/rules', function () {
+		/* @var $this Slim\App */
+		$this->get('', 'advancedcontentfilter_get_rules');
+		$this->post('', 'advancedcontentfilter_post_rules');
 
-		$app->get('/{id}', 'advancedcontentfilter_get_rules_id');
-		$app->put('/{id}', 'advancedcontentfilter_put_rules_id');
-		$app->delete('/{id}', 'advancedcontentfilter_delete_rules_id');
+		$this->get('/{id}', 'advancedcontentfilter_get_rules_id');
+		$this->put('/{id}', 'advancedcontentfilter_put_rules_id');
+		$this->delete('/{id}', 'advancedcontentfilter_delete_rules_id');
 	});
 
-	$app->group('/variables', function (\Slim\Routing\RouteCollectorProxy $app) {
-		$app->get('/{guid}', 'advancedcontentfilter_get_variables_guid');
+	$this->group('/variables', function () {
+		/* @var $this Slim\App */
+		$this->get('/{guid}', 'advancedcontentfilter_get_variables_guid');
 	});
 });
diff --git a/advancedcontentfilter/templates/advancedcontentfilter.vue b/advancedcontentfilter/templates/advancedcontentfilter.vue
index 6dfe0ddc..fded67a9 100644
--- a/advancedcontentfilter/templates/advancedcontentfilter.vue
+++ b/advancedcontentfilter/templates/advancedcontentfilter.vue
@@ -7,7 +7,7 @@
 	3. Replace the render and staticRenderFns members in advancedcontentfilter.js by the contents of the anonymous() functions
 -->
 <div id="rules">
-	<p><a href="settings/addons">🔙 {{ messages.backtosettings }}</a></p>
+	<p><a href="settings/addon">🔙 {{ messages.backtosettings }}</a></p>
 	<h1>
 		{{ messages.title }}
 		&nbsp;
diff --git a/advancedcontentfilter/templates/settings.tpl b/advancedcontentfilter/templates/settings.tpl
index 8b82e595..9ae56c3b 100644
--- a/advancedcontentfilter/templates/settings.tpl
+++ b/advancedcontentfilter/templates/settings.tpl
@@ -3,7 +3,7 @@
 	<div id="rules"></div>
 
 	<script>
-		var existingRules = {{$rules|json_encode nofilter}};
+		var existingRules = {{$rules nofilter}};
 
 		var messages = {
 	{{foreach $messages as $key => $value}}
@@ -17,6 +17,6 @@
 	</script>
 
 	<!-- JS -->
-	<script src="{{$baseurl}}/addon/advancedcontentfilter/asset/vue/dist/vue.min.js"></script>
+	<script src="{{$baseurl}}/view/asset/vue/dist/vue.min.js"></script>
 	<script src="{{$baseurl}}/addon/advancedcontentfilter/advancedcontentfilter.js"></script>
 </div>
diff --git a/advancedcontentfilter/vendor/composer/ClassLoader.php b/advancedcontentfilter/vendor/composer/ClassLoader.php
index 03b9bb9c..dc02dfb1 100644
--- a/advancedcontentfilter/vendor/composer/ClassLoader.php
+++ b/advancedcontentfilter/vendor/composer/ClassLoader.php
@@ -60,7 +60,7 @@ class ClassLoader
     public function getPrefixes()
     {
         if (!empty($this->prefixesPsr0)) {
-            return call_user_func_array('array_merge', array_values($this->prefixesPsr0));
+            return call_user_func_array('array_merge', $this->prefixesPsr0);
         }
 
         return array();
@@ -279,7 +279,7 @@ class ClassLoader
      */
     public function setApcuPrefix($apcuPrefix)
     {
-        $this->apcuPrefix = function_exists('apcu_fetch') && filter_var(ini_get('apc.enabled'), FILTER_VALIDATE_BOOLEAN) ? $apcuPrefix : null;
+        $this->apcuPrefix = function_exists('apcu_fetch') && ini_get('apc.enabled') ? $apcuPrefix : null;
     }
 
     /**
@@ -377,7 +377,7 @@ class ClassLoader
             $subPath = $class;
             while (false !== $lastPos = strrpos($subPath, '\\')) {
                 $subPath = substr($subPath, 0, $lastPos);
-                $search = $subPath . '\\';
+                $search = $subPath.'\\';
                 if (isset($this->prefixDirsPsr4[$search])) {
                     $pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1);
                     foreach ($this->prefixDirsPsr4[$search] as $dir) {
diff --git a/advancedcontentfilter/vendor/composer/autoload_classmap.php b/advancedcontentfilter/vendor/composer/autoload_classmap.php
index 9f79be5c..4f884be1 100644
--- a/advancedcontentfilter/vendor/composer/autoload_classmap.php
+++ b/advancedcontentfilter/vendor/composer/autoload_classmap.php
@@ -6,7 +6,6 @@ $vendorDir = dirname(dirname(__FILE__));
 $baseDir = dirname($vendorDir);
 
 return array(
-    'Attribute' => $vendorDir . '/symfony/polyfill-php80/Resources/stubs/Attribute.php',
     'FastRoute\\BadRouteException' => $vendorDir . '/nikic/fast-route/src/BadRouteException.php',
     'FastRoute\\DataGenerator' => $vendorDir . '/nikic/fast-route/src/DataGenerator.php',
     'FastRoute\\DataGenerator\\CharCountBased' => $vendorDir . '/nikic/fast-route/src/DataGenerator/CharCountBased.php',
@@ -24,8 +23,27 @@ return array(
     'FastRoute\\RouteCollector' => $vendorDir . '/nikic/fast-route/src/RouteCollector.php',
     'FastRoute\\RouteParser' => $vendorDir . '/nikic/fast-route/src/RouteParser.php',
     'FastRoute\\RouteParser\\Std' => $vendorDir . '/nikic/fast-route/src/RouteParser/Std.php',
-    'JsonException' => $vendorDir . '/symfony/polyfill-php73/Resources/stubs/JsonException.php',
-    'PhpToken' => $vendorDir . '/symfony/polyfill-php80/Resources/stubs/PhpToken.php',
+    'Interop\\Container\\ContainerInterface' => $vendorDir . '/container-interop/container-interop/src/Interop/Container/ContainerInterface.php',
+    'Interop\\Container\\Exception\\ContainerException' => $vendorDir . '/container-interop/container-interop/src/Interop/Container/Exception/ContainerException.php',
+    'Interop\\Container\\Exception\\NotFoundException' => $vendorDir . '/container-interop/container-interop/src/Interop/Container/Exception/NotFoundException.php',
+    'Pimple\\Container' => $vendorDir . '/pimple/pimple/src/Pimple/Container.php',
+    'Pimple\\Exception\\ExpectedInvokableException' => $vendorDir . '/pimple/pimple/src/Pimple/Exception/ExpectedInvokableException.php',
+    'Pimple\\Exception\\FrozenServiceException' => $vendorDir . '/pimple/pimple/src/Pimple/Exception/FrozenServiceException.php',
+    'Pimple\\Exception\\InvalidServiceIdentifierException' => $vendorDir . '/pimple/pimple/src/Pimple/Exception/InvalidServiceIdentifierException.php',
+    'Pimple\\Exception\\UnknownIdentifierException' => $vendorDir . '/pimple/pimple/src/Pimple/Exception/UnknownIdentifierException.php',
+    'Pimple\\Psr11\\Container' => $vendorDir . '/pimple/pimple/src/Pimple/Psr11/Container.php',
+    'Pimple\\Psr11\\ServiceLocator' => $vendorDir . '/pimple/pimple/src/Pimple/Psr11/ServiceLocator.php',
+    'Pimple\\ServiceIterator' => $vendorDir . '/pimple/pimple/src/Pimple/ServiceIterator.php',
+    'Pimple\\ServiceProviderInterface' => $vendorDir . '/pimple/pimple/src/Pimple/ServiceProviderInterface.php',
+    'Pimple\\Tests\\Fixtures\\Invokable' => $vendorDir . '/pimple/pimple/src/Pimple/Tests/Fixtures/Invokable.php',
+    'Pimple\\Tests\\Fixtures\\NonInvokable' => $vendorDir . '/pimple/pimple/src/Pimple/Tests/Fixtures/NonInvokable.php',
+    'Pimple\\Tests\\Fixtures\\PimpleServiceProvider' => $vendorDir . '/pimple/pimple/src/Pimple/Tests/Fixtures/PimpleServiceProvider.php',
+    'Pimple\\Tests\\Fixtures\\Service' => $vendorDir . '/pimple/pimple/src/Pimple/Tests/Fixtures/Service.php',
+    'Pimple\\Tests\\PimpleServiceProviderInterfaceTest' => $vendorDir . '/pimple/pimple/src/Pimple/Tests/PimpleServiceProviderInterfaceTest.php',
+    'Pimple\\Tests\\PimpleTest' => $vendorDir . '/pimple/pimple/src/Pimple/Tests/PimpleTest.php',
+    'Pimple\\Tests\\Psr11\\ContainerTest' => $vendorDir . '/pimple/pimple/src/Pimple/Tests/Psr11/ContainerTest.php',
+    'Pimple\\Tests\\Psr11\\ServiceLocatorTest' => $vendorDir . '/pimple/pimple/src/Pimple/Tests/Psr11/ServiceLocatorTest.php',
+    'Pimple\\Tests\\ServiceIteratorTest' => $vendorDir . '/pimple/pimple/src/Pimple/Tests/ServiceIteratorTest.php',
     'Psr\\Cache\\CacheException' => $vendorDir . '/psr/cache/src/CacheException.php',
     'Psr\\Cache\\CacheItemInterface' => $vendorDir . '/psr/cache/src/CacheItemInterface.php',
     'Psr\\Cache\\CacheItemPoolInterface' => $vendorDir . '/psr/cache/src/CacheItemPoolInterface.php',
@@ -34,20 +52,12 @@ return array(
     'Psr\\Container\\ContainerInterface' => $vendorDir . '/psr/container/src/ContainerInterface.php',
     'Psr\\Container\\NotFoundExceptionInterface' => $vendorDir . '/psr/container/src/NotFoundExceptionInterface.php',
     'Psr\\Http\\Message\\MessageInterface' => $vendorDir . '/psr/http-message/src/MessageInterface.php',
-    'Psr\\Http\\Message\\RequestFactoryInterface' => $vendorDir . '/psr/http-factory/src/RequestFactoryInterface.php',
     'Psr\\Http\\Message\\RequestInterface' => $vendorDir . '/psr/http-message/src/RequestInterface.php',
-    'Psr\\Http\\Message\\ResponseFactoryInterface' => $vendorDir . '/psr/http-factory/src/ResponseFactoryInterface.php',
     'Psr\\Http\\Message\\ResponseInterface' => $vendorDir . '/psr/http-message/src/ResponseInterface.php',
-    'Psr\\Http\\Message\\ServerRequestFactoryInterface' => $vendorDir . '/psr/http-factory/src/ServerRequestFactoryInterface.php',
     'Psr\\Http\\Message\\ServerRequestInterface' => $vendorDir . '/psr/http-message/src/ServerRequestInterface.php',
-    'Psr\\Http\\Message\\StreamFactoryInterface' => $vendorDir . '/psr/http-factory/src/StreamFactoryInterface.php',
     'Psr\\Http\\Message\\StreamInterface' => $vendorDir . '/psr/http-message/src/StreamInterface.php',
-    'Psr\\Http\\Message\\UploadedFileFactoryInterface' => $vendorDir . '/psr/http-factory/src/UploadedFileFactoryInterface.php',
     'Psr\\Http\\Message\\UploadedFileInterface' => $vendorDir . '/psr/http-message/src/UploadedFileInterface.php',
-    'Psr\\Http\\Message\\UriFactoryInterface' => $vendorDir . '/psr/http-factory/src/UriFactoryInterface.php',
     'Psr\\Http\\Message\\UriInterface' => $vendorDir . '/psr/http-message/src/UriInterface.php',
-    'Psr\\Http\\Server\\MiddlewareInterface' => $vendorDir . '/psr/http-server-middleware/src/MiddlewareInterface.php',
-    'Psr\\Http\\Server\\RequestHandlerInterface' => $vendorDir . '/psr/http-server-handler/src/RequestHandlerInterface.php',
     'Psr\\Log\\AbstractLogger' => $vendorDir . '/psr/log/Psr/Log/AbstractLogger.php',
     'Psr\\Log\\InvalidArgumentException' => $vendorDir . '/psr/log/Psr/Log/InvalidArgumentException.php',
     'Psr\\Log\\LogLevel' => $vendorDir . '/psr/log/Psr/Log/LogLevel.php',
@@ -56,100 +66,71 @@ return array(
     'Psr\\Log\\LoggerInterface' => $vendorDir . '/psr/log/Psr/Log/LoggerInterface.php',
     'Psr\\Log\\LoggerTrait' => $vendorDir . '/psr/log/Psr/Log/LoggerTrait.php',
     'Psr\\Log\\NullLogger' => $vendorDir . '/psr/log/Psr/Log/NullLogger.php',
-    'Psr\\Log\\Test\\DummyTest' => $vendorDir . '/psr/log/Psr/Log/Test/DummyTest.php',
+    'Psr\\Log\\Test\\DummyTest' => $vendorDir . '/psr/log/Psr/Log/Test/LoggerInterfaceTest.php',
     'Psr\\Log\\Test\\LoggerInterfaceTest' => $vendorDir . '/psr/log/Psr/Log/Test/LoggerInterfaceTest.php',
-    'Psr\\Log\\Test\\TestLogger' => $vendorDir . '/psr/log/Psr/Log/Test/TestLogger.php',
+    'Psr\\SimpleCache\\CacheException' => $vendorDir . '/psr/simple-cache/src/CacheException.php',
+    'Psr\\SimpleCache\\CacheInterface' => $vendorDir . '/psr/simple-cache/src/CacheInterface.php',
+    'Psr\\SimpleCache\\InvalidArgumentException' => $vendorDir . '/psr/simple-cache/src/InvalidArgumentException.php',
     'Slim\\App' => $vendorDir . '/slim/slim/Slim/App.php',
     'Slim\\CallableResolver' => $vendorDir . '/slim/slim/Slim/CallableResolver.php',
-    'Slim\\Error\\AbstractErrorRenderer' => $vendorDir . '/slim/slim/Slim/Error/AbstractErrorRenderer.php',
-    'Slim\\Error\\Renderers\\HtmlErrorRenderer' => $vendorDir . '/slim/slim/Slim/Error/Renderers/HtmlErrorRenderer.php',
-    'Slim\\Error\\Renderers\\JsonErrorRenderer' => $vendorDir . '/slim/slim/Slim/Error/Renderers/JsonErrorRenderer.php',
-    'Slim\\Error\\Renderers\\PlainTextErrorRenderer' => $vendorDir . '/slim/slim/Slim/Error/Renderers/PlainTextErrorRenderer.php',
-    'Slim\\Error\\Renderers\\XmlErrorRenderer' => $vendorDir . '/slim/slim/Slim/Error/Renderers/XmlErrorRenderer.php',
-    'Slim\\Exception\\HttpBadRequestException' => $vendorDir . '/slim/slim/Slim/Exception/HttpBadRequestException.php',
-    'Slim\\Exception\\HttpException' => $vendorDir . '/slim/slim/Slim/Exception/HttpException.php',
-    'Slim\\Exception\\HttpForbiddenException' => $vendorDir . '/slim/slim/Slim/Exception/HttpForbiddenException.php',
-    'Slim\\Exception\\HttpGoneException' => $vendorDir . '/slim/slim/Slim/Exception/HttpGoneException.php',
-    'Slim\\Exception\\HttpInternalServerErrorException' => $vendorDir . '/slim/slim/Slim/Exception/HttpInternalServerErrorException.php',
-    'Slim\\Exception\\HttpMethodNotAllowedException' => $vendorDir . '/slim/slim/Slim/Exception/HttpMethodNotAllowedException.php',
-    'Slim\\Exception\\HttpNotFoundException' => $vendorDir . '/slim/slim/Slim/Exception/HttpNotFoundException.php',
-    'Slim\\Exception\\HttpNotImplementedException' => $vendorDir . '/slim/slim/Slim/Exception/HttpNotImplementedException.php',
-    'Slim\\Exception\\HttpSpecializedException' => $vendorDir . '/slim/slim/Slim/Exception/HttpSpecializedException.php',
-    'Slim\\Exception\\HttpTooManyRequestsException' => $vendorDir . '/slim/slim/Slim/Exception/HttpTooManyRequestsException.php',
-    'Slim\\Exception\\HttpUnauthorizedException' => $vendorDir . '/slim/slim/Slim/Exception/HttpUnauthorizedException.php',
-    'Slim\\Factory\\AppFactory' => $vendorDir . '/slim/slim/Slim/Factory/AppFactory.php',
-    'Slim\\Factory\\Psr17\\GuzzlePsr17Factory' => $vendorDir . '/slim/slim/Slim/Factory/Psr17/GuzzlePsr17Factory.php',
-    'Slim\\Factory\\Psr17\\HttpSoftPsr17Factory' => $vendorDir . '/slim/slim/Slim/Factory/Psr17/HttpSoftPsr17Factory.php',
-    'Slim\\Factory\\Psr17\\LaminasDiactorosPsr17Factory' => $vendorDir . '/slim/slim/Slim/Factory/Psr17/LaminasDiactorosPsr17Factory.php',
-    'Slim\\Factory\\Psr17\\NyholmPsr17Factory' => $vendorDir . '/slim/slim/Slim/Factory/Psr17/NyholmPsr17Factory.php',
-    'Slim\\Factory\\Psr17\\Psr17Factory' => $vendorDir . '/slim/slim/Slim/Factory/Psr17/Psr17Factory.php',
-    'Slim\\Factory\\Psr17\\Psr17FactoryProvider' => $vendorDir . '/slim/slim/Slim/Factory/Psr17/Psr17FactoryProvider.php',
-    'Slim\\Factory\\Psr17\\ServerRequestCreator' => $vendorDir . '/slim/slim/Slim/Factory/Psr17/ServerRequestCreator.php',
-    'Slim\\Factory\\Psr17\\SlimHttpPsr17Factory' => $vendorDir . '/slim/slim/Slim/Factory/Psr17/SlimHttpPsr17Factory.php',
-    'Slim\\Factory\\Psr17\\SlimHttpServerRequestCreator' => $vendorDir . '/slim/slim/Slim/Factory/Psr17/SlimHttpServerRequestCreator.php',
-    'Slim\\Factory\\Psr17\\SlimPsr17Factory' => $vendorDir . '/slim/slim/Slim/Factory/Psr17/SlimPsr17Factory.php',
-    'Slim\\Factory\\ServerRequestCreatorFactory' => $vendorDir . '/slim/slim/Slim/Factory/ServerRequestCreatorFactory.php',
-    'Slim\\Handlers\\ErrorHandler' => $vendorDir . '/slim/slim/Slim/Handlers/ErrorHandler.php',
-    'Slim\\Handlers\\Strategies\\RequestHandler' => $vendorDir . '/slim/slim/Slim/Handlers/Strategies/RequestHandler.php',
+    'Slim\\CallableResolverAwareTrait' => $vendorDir . '/slim/slim/Slim/CallableResolverAwareTrait.php',
+    'Slim\\Collection' => $vendorDir . '/slim/slim/Slim/Collection.php',
+    'Slim\\Container' => $vendorDir . '/slim/slim/Slim/Container.php',
+    'Slim\\DefaultServicesProvider' => $vendorDir . '/slim/slim/Slim/DefaultServicesProvider.php',
+    'Slim\\DeferredCallable' => $vendorDir . '/slim/slim/Slim/DeferredCallable.php',
+    'Slim\\Exception\\ContainerException' => $vendorDir . '/slim/slim/Slim/Exception/ContainerException.php',
+    'Slim\\Exception\\ContainerValueNotFoundException' => $vendorDir . '/slim/slim/Slim/Exception/ContainerValueNotFoundException.php',
+    'Slim\\Exception\\InvalidMethodException' => $vendorDir . '/slim/slim/Slim/Exception/InvalidMethodException.php',
+    'Slim\\Exception\\MethodNotAllowedException' => $vendorDir . '/slim/slim/Slim/Exception/MethodNotAllowedException.php',
+    'Slim\\Exception\\NotFoundException' => $vendorDir . '/slim/slim/Slim/Exception/NotFoundException.php',
+    'Slim\\Exception\\SlimException' => $vendorDir . '/slim/slim/Slim/Exception/SlimException.php',
+    'Slim\\Handlers\\AbstractError' => $vendorDir . '/slim/slim/Slim/Handlers/AbstractError.php',
+    'Slim\\Handlers\\AbstractHandler' => $vendorDir . '/slim/slim/Slim/Handlers/AbstractHandler.php',
+    'Slim\\Handlers\\Error' => $vendorDir . '/slim/slim/Slim/Handlers/Error.php',
+    'Slim\\Handlers\\NotAllowed' => $vendorDir . '/slim/slim/Slim/Handlers/NotAllowed.php',
+    'Slim\\Handlers\\NotFound' => $vendorDir . '/slim/slim/Slim/Handlers/NotFound.php',
+    'Slim\\Handlers\\PhpError' => $vendorDir . '/slim/slim/Slim/Handlers/PhpError.php',
     'Slim\\Handlers\\Strategies\\RequestResponse' => $vendorDir . '/slim/slim/Slim/Handlers/Strategies/RequestResponse.php',
     'Slim\\Handlers\\Strategies\\RequestResponseArgs' => $vendorDir . '/slim/slim/Slim/Handlers/Strategies/RequestResponseArgs.php',
-    'Slim\\Handlers\\Strategies\\RequestResponseNamedArgs' => $vendorDir . '/slim/slim/Slim/Handlers/Strategies/RequestResponseNamedArgs.php',
-    'Slim\\Interfaces\\AdvancedCallableResolverInterface' => $vendorDir . '/slim/slim/Slim/Interfaces/AdvancedCallableResolverInterface.php',
+    'Slim\\Http\\Body' => $vendorDir . '/slim/slim/Slim/Http/Body.php',
+    'Slim\\Http\\Cookies' => $vendorDir . '/slim/slim/Slim/Http/Cookies.php',
+    'Slim\\Http\\Environment' => $vendorDir . '/slim/slim/Slim/Http/Environment.php',
+    'Slim\\Http\\Headers' => $vendorDir . '/slim/slim/Slim/Http/Headers.php',
+    'Slim\\Http\\Message' => $vendorDir . '/slim/slim/Slim/Http/Message.php',
+    'Slim\\Http\\Request' => $vendorDir . '/slim/slim/Slim/Http/Request.php',
+    'Slim\\Http\\RequestBody' => $vendorDir . '/slim/slim/Slim/Http/RequestBody.php',
+    'Slim\\Http\\Response' => $vendorDir . '/slim/slim/Slim/Http/Response.php',
+    'Slim\\Http\\Stream' => $vendorDir . '/slim/slim/Slim/Http/Stream.php',
+    'Slim\\Http\\UploadedFile' => $vendorDir . '/slim/slim/Slim/Http/UploadedFile.php',
+    'Slim\\Http\\Uri' => $vendorDir . '/slim/slim/Slim/Http/Uri.php',
     'Slim\\Interfaces\\CallableResolverInterface' => $vendorDir . '/slim/slim/Slim/Interfaces/CallableResolverInterface.php',
-    'Slim\\Interfaces\\DispatcherInterface' => $vendorDir . '/slim/slim/Slim/Interfaces/DispatcherInterface.php',
-    'Slim\\Interfaces\\ErrorHandlerInterface' => $vendorDir . '/slim/slim/Slim/Interfaces/ErrorHandlerInterface.php',
-    'Slim\\Interfaces\\ErrorRendererInterface' => $vendorDir . '/slim/slim/Slim/Interfaces/ErrorRendererInterface.php',
+    'Slim\\Interfaces\\CollectionInterface' => $vendorDir . '/slim/slim/Slim/Interfaces/CollectionInterface.php',
+    'Slim\\Interfaces\\Http\\CookiesInterface' => $vendorDir . '/slim/slim/Slim/Interfaces/Http/CookiesInterface.php',
+    'Slim\\Interfaces\\Http\\EnvironmentInterface' => $vendorDir . '/slim/slim/Slim/Interfaces/Http/EnvironmentInterface.php',
+    'Slim\\Interfaces\\Http\\HeadersInterface' => $vendorDir . '/slim/slim/Slim/Interfaces/Http/HeadersInterface.php',
     'Slim\\Interfaces\\InvocationStrategyInterface' => $vendorDir . '/slim/slim/Slim/Interfaces/InvocationStrategyInterface.php',
-    'Slim\\Interfaces\\MiddlewareDispatcherInterface' => $vendorDir . '/slim/slim/Slim/Interfaces/MiddlewareDispatcherInterface.php',
-    'Slim\\Interfaces\\Psr17FactoryInterface' => $vendorDir . '/slim/slim/Slim/Interfaces/Psr17FactoryInterface.php',
-    'Slim\\Interfaces\\Psr17FactoryProviderInterface' => $vendorDir . '/slim/slim/Slim/Interfaces/Psr17FactoryProviderInterface.php',
-    'Slim\\Interfaces\\RequestHandlerInvocationStrategyInterface' => $vendorDir . '/slim/slim/Slim/Interfaces/RequestHandlerInvocationStrategyInterface.php',
-    'Slim\\Interfaces\\RouteCollectorInterface' => $vendorDir . '/slim/slim/Slim/Interfaces/RouteCollectorInterface.php',
-    'Slim\\Interfaces\\RouteCollectorProxyInterface' => $vendorDir . '/slim/slim/Slim/Interfaces/RouteCollectorProxyInterface.php',
     'Slim\\Interfaces\\RouteGroupInterface' => $vendorDir . '/slim/slim/Slim/Interfaces/RouteGroupInterface.php',
     'Slim\\Interfaces\\RouteInterface' => $vendorDir . '/slim/slim/Slim/Interfaces/RouteInterface.php',
-    'Slim\\Interfaces\\RouteParserInterface' => $vendorDir . '/slim/slim/Slim/Interfaces/RouteParserInterface.php',
-    'Slim\\Interfaces\\RouteResolverInterface' => $vendorDir . '/slim/slim/Slim/Interfaces/RouteResolverInterface.php',
-    'Slim\\Interfaces\\ServerRequestCreatorInterface' => $vendorDir . '/slim/slim/Slim/Interfaces/ServerRequestCreatorInterface.php',
-    'Slim\\Logger' => $vendorDir . '/slim/slim/Slim/Logger.php',
-    'Slim\\MiddlewareDispatcher' => $vendorDir . '/slim/slim/Slim/MiddlewareDispatcher.php',
-    'Slim\\Middleware\\BodyParsingMiddleware' => $vendorDir . '/slim/slim/Slim/Middleware/BodyParsingMiddleware.php',
-    'Slim\\Middleware\\ContentLengthMiddleware' => $vendorDir . '/slim/slim/Slim/Middleware/ContentLengthMiddleware.php',
-    'Slim\\Middleware\\ErrorMiddleware' => $vendorDir . '/slim/slim/Slim/Middleware/ErrorMiddleware.php',
-    'Slim\\Middleware\\MethodOverrideMiddleware' => $vendorDir . '/slim/slim/Slim/Middleware/MethodOverrideMiddleware.php',
-    'Slim\\Middleware\\OutputBufferingMiddleware' => $vendorDir . '/slim/slim/Slim/Middleware/OutputBufferingMiddleware.php',
-    'Slim\\Middleware\\RoutingMiddleware' => $vendorDir . '/slim/slim/Slim/Middleware/RoutingMiddleware.php',
-    'Slim\\ResponseEmitter' => $vendorDir . '/slim/slim/Slim/ResponseEmitter.php',
-    'Slim\\Routing\\Dispatcher' => $vendorDir . '/slim/slim/Slim/Routing/Dispatcher.php',
-    'Slim\\Routing\\FastRouteDispatcher' => $vendorDir . '/slim/slim/Slim/Routing/FastRouteDispatcher.php',
-    'Slim\\Routing\\Route' => $vendorDir . '/slim/slim/Slim/Routing/Route.php',
-    'Slim\\Routing\\RouteCollector' => $vendorDir . '/slim/slim/Slim/Routing/RouteCollector.php',
-    'Slim\\Routing\\RouteCollectorProxy' => $vendorDir . '/slim/slim/Slim/Routing/RouteCollectorProxy.php',
-    'Slim\\Routing\\RouteContext' => $vendorDir . '/slim/slim/Slim/Routing/RouteContext.php',
-    'Slim\\Routing\\RouteGroup' => $vendorDir . '/slim/slim/Slim/Routing/RouteGroup.php',
-    'Slim\\Routing\\RouteParser' => $vendorDir . '/slim/slim/Slim/Routing/RouteParser.php',
-    'Slim\\Routing\\RouteResolver' => $vendorDir . '/slim/slim/Slim/Routing/RouteResolver.php',
-    'Slim\\Routing\\RouteRunner' => $vendorDir . '/slim/slim/Slim/Routing/RouteRunner.php',
-    'Slim\\Routing\\RoutingResults' => $vendorDir . '/slim/slim/Slim/Routing/RoutingResults.php',
-    'Stringable' => $vendorDir . '/symfony/polyfill-php80/Resources/stubs/Stringable.php',
+    'Slim\\Interfaces\\RouterInterface' => $vendorDir . '/slim/slim/Slim/Interfaces/RouterInterface.php',
+    'Slim\\MiddlewareAwareTrait' => $vendorDir . '/slim/slim/Slim/MiddlewareAwareTrait.php',
+    'Slim\\Routable' => $vendorDir . '/slim/slim/Slim/Routable.php',
+    'Slim\\Route' => $vendorDir . '/slim/slim/Slim/Route.php',
+    'Slim\\RouteGroup' => $vendorDir . '/slim/slim/Slim/RouteGroup.php',
+    'Slim\\Router' => $vendorDir . '/slim/slim/Slim/Router.php',
     'Symfony\\Component\\Cache\\Adapter\\AbstractAdapter' => $vendorDir . '/symfony/cache/Adapter/AbstractAdapter.php',
-    'Symfony\\Component\\Cache\\Adapter\\AbstractTagAwareAdapter' => $vendorDir . '/symfony/cache/Adapter/AbstractTagAwareAdapter.php',
     'Symfony\\Component\\Cache\\Adapter\\AdapterInterface' => $vendorDir . '/symfony/cache/Adapter/AdapterInterface.php',
     'Symfony\\Component\\Cache\\Adapter\\ApcuAdapter' => $vendorDir . '/symfony/cache/Adapter/ApcuAdapter.php',
     'Symfony\\Component\\Cache\\Adapter\\ArrayAdapter' => $vendorDir . '/symfony/cache/Adapter/ArrayAdapter.php',
     'Symfony\\Component\\Cache\\Adapter\\ChainAdapter' => $vendorDir . '/symfony/cache/Adapter/ChainAdapter.php',
     'Symfony\\Component\\Cache\\Adapter\\DoctrineAdapter' => $vendorDir . '/symfony/cache/Adapter/DoctrineAdapter.php',
     'Symfony\\Component\\Cache\\Adapter\\FilesystemAdapter' => $vendorDir . '/symfony/cache/Adapter/FilesystemAdapter.php',
-    'Symfony\\Component\\Cache\\Adapter\\FilesystemTagAwareAdapter' => $vendorDir . '/symfony/cache/Adapter/FilesystemTagAwareAdapter.php',
     'Symfony\\Component\\Cache\\Adapter\\MemcachedAdapter' => $vendorDir . '/symfony/cache/Adapter/MemcachedAdapter.php',
     'Symfony\\Component\\Cache\\Adapter\\NullAdapter' => $vendorDir . '/symfony/cache/Adapter/NullAdapter.php',
     'Symfony\\Component\\Cache\\Adapter\\PdoAdapter' => $vendorDir . '/symfony/cache/Adapter/PdoAdapter.php',
     'Symfony\\Component\\Cache\\Adapter\\PhpArrayAdapter' => $vendorDir . '/symfony/cache/Adapter/PhpArrayAdapter.php',
     'Symfony\\Component\\Cache\\Adapter\\PhpFilesAdapter' => $vendorDir . '/symfony/cache/Adapter/PhpFilesAdapter.php',
     'Symfony\\Component\\Cache\\Adapter\\ProxyAdapter' => $vendorDir . '/symfony/cache/Adapter/ProxyAdapter.php',
-    'Symfony\\Component\\Cache\\Adapter\\Psr16Adapter' => $vendorDir . '/symfony/cache/Adapter/Psr16Adapter.php',
     'Symfony\\Component\\Cache\\Adapter\\RedisAdapter' => $vendorDir . '/symfony/cache/Adapter/RedisAdapter.php',
-    'Symfony\\Component\\Cache\\Adapter\\RedisTagAwareAdapter' => $vendorDir . '/symfony/cache/Adapter/RedisTagAwareAdapter.php',
     'Symfony\\Component\\Cache\\Adapter\\SimpleCacheAdapter' => $vendorDir . '/symfony/cache/Adapter/SimpleCacheAdapter.php',
     'Symfony\\Component\\Cache\\Adapter\\TagAwareAdapter' => $vendorDir . '/symfony/cache/Adapter/TagAwareAdapter.php',
     'Symfony\\Component\\Cache\\Adapter\\TagAwareAdapterInterface' => $vendorDir . '/symfony/cache/Adapter/TagAwareAdapterInterface.php',
@@ -158,21 +139,10 @@ return array(
     'Symfony\\Component\\Cache\\Adapter\\TraceableTagAwareAdapter' => $vendorDir . '/symfony/cache/Adapter/TraceableTagAwareAdapter.php',
     'Symfony\\Component\\Cache\\CacheItem' => $vendorDir . '/symfony/cache/CacheItem.php',
     'Symfony\\Component\\Cache\\DataCollector\\CacheDataCollector' => $vendorDir . '/symfony/cache/DataCollector/CacheDataCollector.php',
-    'Symfony\\Component\\Cache\\DependencyInjection\\CacheCollectorPass' => $vendorDir . '/symfony/cache/DependencyInjection/CacheCollectorPass.php',
-    'Symfony\\Component\\Cache\\DependencyInjection\\CachePoolClearerPass' => $vendorDir . '/symfony/cache/DependencyInjection/CachePoolClearerPass.php',
-    'Symfony\\Component\\Cache\\DependencyInjection\\CachePoolPass' => $vendorDir . '/symfony/cache/DependencyInjection/CachePoolPass.php',
-    'Symfony\\Component\\Cache\\DependencyInjection\\CachePoolPrunerPass' => $vendorDir . '/symfony/cache/DependencyInjection/CachePoolPrunerPass.php',
     'Symfony\\Component\\Cache\\DoctrineProvider' => $vendorDir . '/symfony/cache/DoctrineProvider.php',
     'Symfony\\Component\\Cache\\Exception\\CacheException' => $vendorDir . '/symfony/cache/Exception/CacheException.php',
     'Symfony\\Component\\Cache\\Exception\\InvalidArgumentException' => $vendorDir . '/symfony/cache/Exception/InvalidArgumentException.php',
-    'Symfony\\Component\\Cache\\Exception\\LogicException' => $vendorDir . '/symfony/cache/Exception/LogicException.php',
-    'Symfony\\Component\\Cache\\LockRegistry' => $vendorDir . '/symfony/cache/LockRegistry.php',
-    'Symfony\\Component\\Cache\\Marshaller\\DefaultMarshaller' => $vendorDir . '/symfony/cache/Marshaller/DefaultMarshaller.php',
-    'Symfony\\Component\\Cache\\Marshaller\\DeflateMarshaller' => $vendorDir . '/symfony/cache/Marshaller/DeflateMarshaller.php',
-    'Symfony\\Component\\Cache\\Marshaller\\MarshallerInterface' => $vendorDir . '/symfony/cache/Marshaller/MarshallerInterface.php',
-    'Symfony\\Component\\Cache\\Marshaller\\TagAwareMarshaller' => $vendorDir . '/symfony/cache/Marshaller/TagAwareMarshaller.php',
     'Symfony\\Component\\Cache\\PruneableInterface' => $vendorDir . '/symfony/cache/PruneableInterface.php',
-    'Symfony\\Component\\Cache\\Psr16Cache' => $vendorDir . '/symfony/cache/Psr16Cache.php',
     'Symfony\\Component\\Cache\\ResettableInterface' => $vendorDir . '/symfony/cache/ResettableInterface.php',
     'Symfony\\Component\\Cache\\Simple\\AbstractCache' => $vendorDir . '/symfony/cache/Simple/AbstractCache.php',
     'Symfony\\Component\\Cache\\Simple\\ApcuCache' => $vendorDir . '/symfony/cache/Simple/ApcuCache.php',
@@ -189,22 +159,17 @@ return array(
     'Symfony\\Component\\Cache\\Simple\\RedisCache' => $vendorDir . '/symfony/cache/Simple/RedisCache.php',
     'Symfony\\Component\\Cache\\Simple\\TraceableCache' => $vendorDir . '/symfony/cache/Simple/TraceableCache.php',
     'Symfony\\Component\\Cache\\Simple\\TraceableCacheEvent' => $vendorDir . '/symfony/cache/Simple/TraceableCache.php',
-    'Symfony\\Component\\Cache\\Traits\\AbstractAdapterTrait' => $vendorDir . '/symfony/cache/Traits/AbstractAdapterTrait.php',
     'Symfony\\Component\\Cache\\Traits\\AbstractTrait' => $vendorDir . '/symfony/cache/Traits/AbstractTrait.php',
     'Symfony\\Component\\Cache\\Traits\\ApcuTrait' => $vendorDir . '/symfony/cache/Traits/ApcuTrait.php',
     'Symfony\\Component\\Cache\\Traits\\ArrayTrait' => $vendorDir . '/symfony/cache/Traits/ArrayTrait.php',
-    'Symfony\\Component\\Cache\\Traits\\ContractsTrait' => $vendorDir . '/symfony/cache/Traits/ContractsTrait.php',
     'Symfony\\Component\\Cache\\Traits\\DoctrineTrait' => $vendorDir . '/symfony/cache/Traits/DoctrineTrait.php',
     'Symfony\\Component\\Cache\\Traits\\FilesystemCommonTrait' => $vendorDir . '/symfony/cache/Traits/FilesystemCommonTrait.php',
     'Symfony\\Component\\Cache\\Traits\\FilesystemTrait' => $vendorDir . '/symfony/cache/Traits/FilesystemTrait.php',
-    'Symfony\\Component\\Cache\\Traits\\LazyValue' => $vendorDir . '/symfony/cache/Traits/PhpFilesTrait.php',
     'Symfony\\Component\\Cache\\Traits\\MemcachedTrait' => $vendorDir . '/symfony/cache/Traits/MemcachedTrait.php',
     'Symfony\\Component\\Cache\\Traits\\PdoTrait' => $vendorDir . '/symfony/cache/Traits/PdoTrait.php',
     'Symfony\\Component\\Cache\\Traits\\PhpArrayTrait' => $vendorDir . '/symfony/cache/Traits/PhpArrayTrait.php',
     'Symfony\\Component\\Cache\\Traits\\PhpFilesTrait' => $vendorDir . '/symfony/cache/Traits/PhpFilesTrait.php',
     'Symfony\\Component\\Cache\\Traits\\ProxyTrait' => $vendorDir . '/symfony/cache/Traits/ProxyTrait.php',
-    'Symfony\\Component\\Cache\\Traits\\RedisClusterNodeProxy' => $vendorDir . '/symfony/cache/Traits/RedisClusterNodeProxy.php',
-    'Symfony\\Component\\Cache\\Traits\\RedisClusterProxy' => $vendorDir . '/symfony/cache/Traits/RedisClusterProxy.php',
     'Symfony\\Component\\Cache\\Traits\\RedisProxy' => $vendorDir . '/symfony/cache/Traits/RedisProxy.php',
     'Symfony\\Component\\Cache\\Traits\\RedisTrait' => $vendorDir . '/symfony/cache/Traits/RedisTrait.php',
     'Symfony\\Component\\ExpressionLanguage\\Compiler' => $vendorDir . '/symfony/expression-language/Compiler.php',
@@ -232,32 +197,5 @@ return array(
     'Symfony\\Component\\ExpressionLanguage\\SyntaxError' => $vendorDir . '/symfony/expression-language/SyntaxError.php',
     'Symfony\\Component\\ExpressionLanguage\\Token' => $vendorDir . '/symfony/expression-language/Token.php',
     'Symfony\\Component\\ExpressionLanguage\\TokenStream' => $vendorDir . '/symfony/expression-language/TokenStream.php',
-    'Symfony\\Component\\VarExporter\\Exception\\ClassNotFoundException' => $vendorDir . '/symfony/var-exporter/Exception/ClassNotFoundException.php',
-    'Symfony\\Component\\VarExporter\\Exception\\ExceptionInterface' => $vendorDir . '/symfony/var-exporter/Exception/ExceptionInterface.php',
-    'Symfony\\Component\\VarExporter\\Exception\\NotInstantiableTypeException' => $vendorDir . '/symfony/var-exporter/Exception/NotInstantiableTypeException.php',
-    'Symfony\\Component\\VarExporter\\Instantiator' => $vendorDir . '/symfony/var-exporter/Instantiator.php',
-    'Symfony\\Component\\VarExporter\\Internal\\Exporter' => $vendorDir . '/symfony/var-exporter/Internal/Exporter.php',
-    'Symfony\\Component\\VarExporter\\Internal\\Hydrator' => $vendorDir . '/symfony/var-exporter/Internal/Hydrator.php',
-    'Symfony\\Component\\VarExporter\\Internal\\Reference' => $vendorDir . '/symfony/var-exporter/Internal/Reference.php',
-    'Symfony\\Component\\VarExporter\\Internal\\Registry' => $vendorDir . '/symfony/var-exporter/Internal/Registry.php',
-    'Symfony\\Component\\VarExporter\\Internal\\Values' => $vendorDir . '/symfony/var-exporter/Internal/Values.php',
-    'Symfony\\Component\\VarExporter\\VarExporter' => $vendorDir . '/symfony/var-exporter/VarExporter.php',
-    'Symfony\\Contracts\\Cache\\CacheInterface' => $vendorDir . '/symfony/cache-contracts/CacheInterface.php',
-    'Symfony\\Contracts\\Cache\\CacheTrait' => $vendorDir . '/symfony/cache-contracts/CacheTrait.php',
-    'Symfony\\Contracts\\Cache\\CallbackInterface' => $vendorDir . '/symfony/cache-contracts/CallbackInterface.php',
-    'Symfony\\Contracts\\Cache\\ItemInterface' => $vendorDir . '/symfony/cache-contracts/ItemInterface.php',
-    'Symfony\\Contracts\\Cache\\TagAwareCacheInterface' => $vendorDir . '/symfony/cache-contracts/TagAwareCacheInterface.php',
-    'Symfony\\Contracts\\Service\\Attribute\\Required' => $vendorDir . '/symfony/service-contracts/Attribute/Required.php',
-    'Symfony\\Contracts\\Service\\Attribute\\SubscribedService' => $vendorDir . '/symfony/service-contracts/Attribute/SubscribedService.php',
-    'Symfony\\Contracts\\Service\\ResetInterface' => $vendorDir . '/symfony/service-contracts/ResetInterface.php',
-    'Symfony\\Contracts\\Service\\ServiceLocatorTrait' => $vendorDir . '/symfony/service-contracts/ServiceLocatorTrait.php',
-    'Symfony\\Contracts\\Service\\ServiceProviderInterface' => $vendorDir . '/symfony/service-contracts/ServiceProviderInterface.php',
-    'Symfony\\Contracts\\Service\\ServiceSubscriberInterface' => $vendorDir . '/symfony/service-contracts/ServiceSubscriberInterface.php',
-    'Symfony\\Contracts\\Service\\ServiceSubscriberTrait' => $vendorDir . '/symfony/service-contracts/ServiceSubscriberTrait.php',
-    'Symfony\\Contracts\\Service\\Test\\ServiceLocatorTest' => $vendorDir . '/symfony/service-contracts/Test/ServiceLocatorTest.php',
-    'Symfony\\Polyfill\\Php73\\Php73' => $vendorDir . '/symfony/polyfill-php73/Php73.php',
-    'Symfony\\Polyfill\\Php80\\Php80' => $vendorDir . '/symfony/polyfill-php80/Php80.php',
-    'Symfony\\Polyfill\\Php80\\PhpToken' => $vendorDir . '/symfony/polyfill-php80/PhpToken.php',
-    'UnhandledMatchError' => $vendorDir . '/symfony/polyfill-php80/Resources/stubs/UnhandledMatchError.php',
-    'ValueError' => $vendorDir . '/symfony/polyfill-php80/Resources/stubs/ValueError.php',
+    'Symfony\\Polyfill\\Apcu\\Apcu' => $vendorDir . '/symfony/polyfill-apcu/Apcu.php',
 );
diff --git a/advancedcontentfilter/vendor/composer/autoload_files.php b/advancedcontentfilter/vendor/composer/autoload_files.php
index a5d3b964..a6b8b352 100644
--- a/advancedcontentfilter/vendor/composer/autoload_files.php
+++ b/advancedcontentfilter/vendor/composer/autoload_files.php
@@ -6,8 +6,6 @@ $vendorDir = dirname(dirname(__FILE__));
 $baseDir = dirname($vendorDir);
 
 return array(
-    'a4a119a56e50fbb293281d9a48007e0e' => $vendorDir . '/symfony/polyfill-php80/bootstrap.php',
-    '6e3fae29631ef280660b3cdad06f25a8' => $vendorDir . '/symfony/deprecation-contracts/function.php',
-    '0d59ee240a4cd96ddbb4ff164fccea4d' => $vendorDir . '/symfony/polyfill-php73/bootstrap.php',
+    '32dcc8afd4335739640db7d200c1971d' => $vendorDir . '/symfony/polyfill-apcu/bootstrap.php',
     '253c157292f75eb38082b5acb06f3f01' => $vendorDir . '/nikic/fast-route/src/functions.php',
 );
diff --git a/advancedcontentfilter/vendor/composer/autoload_namespaces.php b/advancedcontentfilter/vendor/composer/autoload_namespaces.php
index b7fc0125..c3cd0229 100644
--- a/advancedcontentfilter/vendor/composer/autoload_namespaces.php
+++ b/advancedcontentfilter/vendor/composer/autoload_namespaces.php
@@ -6,4 +6,5 @@ $vendorDir = dirname(dirname(__FILE__));
 $baseDir = dirname($vendorDir);
 
 return array(
+    'Pimple' => array($vendorDir . '/pimple/pimple/src'),
 );
diff --git a/advancedcontentfilter/vendor/composer/autoload_psr4.php b/advancedcontentfilter/vendor/composer/autoload_psr4.php
index 3d716d56..f466cc18 100644
--- a/advancedcontentfilter/vendor/composer/autoload_psr4.php
+++ b/advancedcontentfilter/vendor/composer/autoload_psr4.php
@@ -6,18 +6,15 @@ $vendorDir = dirname(dirname(__FILE__));
 $baseDir = dirname($vendorDir);
 
 return array(
-    'Symfony\\Polyfill\\Php80\\' => array($vendorDir . '/symfony/polyfill-php80'),
-    'Symfony\\Polyfill\\Php73\\' => array($vendorDir . '/symfony/polyfill-php73'),
-    'Symfony\\Contracts\\Service\\' => array($vendorDir . '/symfony/service-contracts'),
-    'Symfony\\Contracts\\Cache\\' => array($vendorDir . '/symfony/cache-contracts'),
-    'Symfony\\Component\\VarExporter\\' => array($vendorDir . '/symfony/var-exporter'),
+    'Symfony\\Polyfill\\Apcu\\' => array($vendorDir . '/symfony/polyfill-apcu'),
     'Symfony\\Component\\ExpressionLanguage\\' => array($vendorDir . '/symfony/expression-language'),
     'Symfony\\Component\\Cache\\' => array($vendorDir . '/symfony/cache'),
     'Slim\\' => array($vendorDir . '/slim/slim/Slim'),
+    'Psr\\SimpleCache\\' => array($vendorDir . '/psr/simple-cache/src'),
     'Psr\\Log\\' => array($vendorDir . '/psr/log/Psr/Log'),
-    'Psr\\Http\\Server\\' => array($vendorDir . '/psr/http-server-handler/src', $vendorDir . '/psr/http-server-middleware/src'),
-    'Psr\\Http\\Message\\' => array($vendorDir . '/psr/http-factory/src', $vendorDir . '/psr/http-message/src'),
+    'Psr\\Http\\Message\\' => array($vendorDir . '/psr/http-message/src'),
     'Psr\\Container\\' => array($vendorDir . '/psr/container/src'),
     'Psr\\Cache\\' => array($vendorDir . '/psr/cache/src'),
+    'Interop\\Container\\' => array($vendorDir . '/container-interop/container-interop/src/Interop/Container'),
     'FastRoute\\' => array($vendorDir . '/nikic/fast-route/src'),
 );
diff --git a/advancedcontentfilter/vendor/composer/autoload_real.php b/advancedcontentfilter/vendor/composer/autoload_real.php
index d6532d7d..6d7169ae 100644
--- a/advancedcontentfilter/vendor/composer/autoload_real.php
+++ b/advancedcontentfilter/vendor/composer/autoload_real.php
@@ -13,9 +13,6 @@ class ComposerAutoloaderInitAdvancedContentFilterAddon
         }
     }
 
-    /**
-     * @return \Composer\Autoload\ClassLoader
-     */
     public static function getLoader()
     {
         if (null !== self::$loader) {
diff --git a/advancedcontentfilter/vendor/composer/autoload_static.php b/advancedcontentfilter/vendor/composer/autoload_static.php
index 57172a1a..e7c2f8de 100644
--- a/advancedcontentfilter/vendor/composer/autoload_static.php
+++ b/advancedcontentfilter/vendor/composer/autoload_static.php
@@ -7,32 +7,30 @@ namespace Composer\Autoload;
 class ComposerStaticInitAdvancedContentFilterAddon
 {
     public static $files = array (
-        'a4a119a56e50fbb293281d9a48007e0e' => __DIR__ . '/..' . '/symfony/polyfill-php80/bootstrap.php',
-        '6e3fae29631ef280660b3cdad06f25a8' => __DIR__ . '/..' . '/symfony/deprecation-contracts/function.php',
-        '0d59ee240a4cd96ddbb4ff164fccea4d' => __DIR__ . '/..' . '/symfony/polyfill-php73/bootstrap.php',
+        '32dcc8afd4335739640db7d200c1971d' => __DIR__ . '/..' . '/symfony/polyfill-apcu/bootstrap.php',
         '253c157292f75eb38082b5acb06f3f01' => __DIR__ . '/..' . '/nikic/fast-route/src/functions.php',
     );
 
     public static $prefixLengthsPsr4 = array (
         'S' => 
         array (
-            'Symfony\\Polyfill\\Php80\\' => 23,
-            'Symfony\\Polyfill\\Php73\\' => 23,
-            'Symfony\\Contracts\\Service\\' => 26,
-            'Symfony\\Contracts\\Cache\\' => 24,
-            'Symfony\\Component\\VarExporter\\' => 30,
+            'Symfony\\Polyfill\\Apcu\\' => 22,
             'Symfony\\Component\\ExpressionLanguage\\' => 37,
             'Symfony\\Component\\Cache\\' => 24,
             'Slim\\' => 5,
         ),
         'P' => 
         array (
+            'Psr\\SimpleCache\\' => 16,
             'Psr\\Log\\' => 8,
-            'Psr\\Http\\Server\\' => 16,
             'Psr\\Http\\Message\\' => 17,
             'Psr\\Container\\' => 14,
             'Psr\\Cache\\' => 10,
         ),
+        'I' => 
+        array (
+            'Interop\\Container\\' => 18,
+        ),
         'F' => 
         array (
             'FastRoute\\' => 10,
@@ -40,25 +38,9 @@ class ComposerStaticInitAdvancedContentFilterAddon
     );
 
     public static $prefixDirsPsr4 = array (
-        'Symfony\\Polyfill\\Php80\\' => 
+        'Symfony\\Polyfill\\Apcu\\' => 
         array (
-            0 => __DIR__ . '/..' . '/symfony/polyfill-php80',
-        ),
-        'Symfony\\Polyfill\\Php73\\' => 
-        array (
-            0 => __DIR__ . '/..' . '/symfony/polyfill-php73',
-        ),
-        'Symfony\\Contracts\\Service\\' => 
-        array (
-            0 => __DIR__ . '/..' . '/symfony/service-contracts',
-        ),
-        'Symfony\\Contracts\\Cache\\' => 
-        array (
-            0 => __DIR__ . '/..' . '/symfony/cache-contracts',
-        ),
-        'Symfony\\Component\\VarExporter\\' => 
-        array (
-            0 => __DIR__ . '/..' . '/symfony/var-exporter',
+            0 => __DIR__ . '/..' . '/symfony/polyfill-apcu',
         ),
         'Symfony\\Component\\ExpressionLanguage\\' => 
         array (
@@ -72,19 +54,17 @@ class ComposerStaticInitAdvancedContentFilterAddon
         array (
             0 => __DIR__ . '/..' . '/slim/slim/Slim',
         ),
+        'Psr\\SimpleCache\\' => 
+        array (
+            0 => __DIR__ . '/..' . '/psr/simple-cache/src',
+        ),
         'Psr\\Log\\' => 
         array (
             0 => __DIR__ . '/..' . '/psr/log/Psr/Log',
         ),
-        'Psr\\Http\\Server\\' => 
-        array (
-            0 => __DIR__ . '/..' . '/psr/http-server-handler/src',
-            1 => __DIR__ . '/..' . '/psr/http-server-middleware/src',
-        ),
         'Psr\\Http\\Message\\' => 
         array (
-            0 => __DIR__ . '/..' . '/psr/http-factory/src',
-            1 => __DIR__ . '/..' . '/psr/http-message/src',
+            0 => __DIR__ . '/..' . '/psr/http-message/src',
         ),
         'Psr\\Container\\' => 
         array (
@@ -94,14 +74,27 @@ class ComposerStaticInitAdvancedContentFilterAddon
         array (
             0 => __DIR__ . '/..' . '/psr/cache/src',
         ),
+        'Interop\\Container\\' => 
+        array (
+            0 => __DIR__ . '/..' . '/container-interop/container-interop/src/Interop/Container',
+        ),
         'FastRoute\\' => 
         array (
             0 => __DIR__ . '/..' . '/nikic/fast-route/src',
         ),
     );
 
+    public static $prefixesPsr0 = array (
+        'P' => 
+        array (
+            'Pimple' => 
+            array (
+                0 => __DIR__ . '/..' . '/pimple/pimple/src',
+            ),
+        ),
+    );
+
     public static $classMap = array (
-        'Attribute' => __DIR__ . '/..' . '/symfony/polyfill-php80/Resources/stubs/Attribute.php',
         'FastRoute\\BadRouteException' => __DIR__ . '/..' . '/nikic/fast-route/src/BadRouteException.php',
         'FastRoute\\DataGenerator' => __DIR__ . '/..' . '/nikic/fast-route/src/DataGenerator.php',
         'FastRoute\\DataGenerator\\CharCountBased' => __DIR__ . '/..' . '/nikic/fast-route/src/DataGenerator/CharCountBased.php',
@@ -119,8 +112,27 @@ class ComposerStaticInitAdvancedContentFilterAddon
         'FastRoute\\RouteCollector' => __DIR__ . '/..' . '/nikic/fast-route/src/RouteCollector.php',
         'FastRoute\\RouteParser' => __DIR__ . '/..' . '/nikic/fast-route/src/RouteParser.php',
         'FastRoute\\RouteParser\\Std' => __DIR__ . '/..' . '/nikic/fast-route/src/RouteParser/Std.php',
-        'JsonException' => __DIR__ . '/..' . '/symfony/polyfill-php73/Resources/stubs/JsonException.php',
-        'PhpToken' => __DIR__ . '/..' . '/symfony/polyfill-php80/Resources/stubs/PhpToken.php',
+        'Interop\\Container\\ContainerInterface' => __DIR__ . '/..' . '/container-interop/container-interop/src/Interop/Container/ContainerInterface.php',
+        'Interop\\Container\\Exception\\ContainerException' => __DIR__ . '/..' . '/container-interop/container-interop/src/Interop/Container/Exception/ContainerException.php',
+        'Interop\\Container\\Exception\\NotFoundException' => __DIR__ . '/..' . '/container-interop/container-interop/src/Interop/Container/Exception/NotFoundException.php',
+        'Pimple\\Container' => __DIR__ . '/..' . '/pimple/pimple/src/Pimple/Container.php',
+        'Pimple\\Exception\\ExpectedInvokableException' => __DIR__ . '/..' . '/pimple/pimple/src/Pimple/Exception/ExpectedInvokableException.php',
+        'Pimple\\Exception\\FrozenServiceException' => __DIR__ . '/..' . '/pimple/pimple/src/Pimple/Exception/FrozenServiceException.php',
+        'Pimple\\Exception\\InvalidServiceIdentifierException' => __DIR__ . '/..' . '/pimple/pimple/src/Pimple/Exception/InvalidServiceIdentifierException.php',
+        'Pimple\\Exception\\UnknownIdentifierException' => __DIR__ . '/..' . '/pimple/pimple/src/Pimple/Exception/UnknownIdentifierException.php',
+        'Pimple\\Psr11\\Container' => __DIR__ . '/..' . '/pimple/pimple/src/Pimple/Psr11/Container.php',
+        'Pimple\\Psr11\\ServiceLocator' => __DIR__ . '/..' . '/pimple/pimple/src/Pimple/Psr11/ServiceLocator.php',
+        'Pimple\\ServiceIterator' => __DIR__ . '/..' . '/pimple/pimple/src/Pimple/ServiceIterator.php',
+        'Pimple\\ServiceProviderInterface' => __DIR__ . '/..' . '/pimple/pimple/src/Pimple/ServiceProviderInterface.php',
+        'Pimple\\Tests\\Fixtures\\Invokable' => __DIR__ . '/..' . '/pimple/pimple/src/Pimple/Tests/Fixtures/Invokable.php',
+        'Pimple\\Tests\\Fixtures\\NonInvokable' => __DIR__ . '/..' . '/pimple/pimple/src/Pimple/Tests/Fixtures/NonInvokable.php',
+        'Pimple\\Tests\\Fixtures\\PimpleServiceProvider' => __DIR__ . '/..' . '/pimple/pimple/src/Pimple/Tests/Fixtures/PimpleServiceProvider.php',
+        'Pimple\\Tests\\Fixtures\\Service' => __DIR__ . '/..' . '/pimple/pimple/src/Pimple/Tests/Fixtures/Service.php',
+        'Pimple\\Tests\\PimpleServiceProviderInterfaceTest' => __DIR__ . '/..' . '/pimple/pimple/src/Pimple/Tests/PimpleServiceProviderInterfaceTest.php',
+        'Pimple\\Tests\\PimpleTest' => __DIR__ . '/..' . '/pimple/pimple/src/Pimple/Tests/PimpleTest.php',
+        'Pimple\\Tests\\Psr11\\ContainerTest' => __DIR__ . '/..' . '/pimple/pimple/src/Pimple/Tests/Psr11/ContainerTest.php',
+        'Pimple\\Tests\\Psr11\\ServiceLocatorTest' => __DIR__ . '/..' . '/pimple/pimple/src/Pimple/Tests/Psr11/ServiceLocatorTest.php',
+        'Pimple\\Tests\\ServiceIteratorTest' => __DIR__ . '/..' . '/pimple/pimple/src/Pimple/Tests/ServiceIteratorTest.php',
         'Psr\\Cache\\CacheException' => __DIR__ . '/..' . '/psr/cache/src/CacheException.php',
         'Psr\\Cache\\CacheItemInterface' => __DIR__ . '/..' . '/psr/cache/src/CacheItemInterface.php',
         'Psr\\Cache\\CacheItemPoolInterface' => __DIR__ . '/..' . '/psr/cache/src/CacheItemPoolInterface.php',
@@ -129,20 +141,12 @@ class ComposerStaticInitAdvancedContentFilterAddon
         'Psr\\Container\\ContainerInterface' => __DIR__ . '/..' . '/psr/container/src/ContainerInterface.php',
         'Psr\\Container\\NotFoundExceptionInterface' => __DIR__ . '/..' . '/psr/container/src/NotFoundExceptionInterface.php',
         'Psr\\Http\\Message\\MessageInterface' => __DIR__ . '/..' . '/psr/http-message/src/MessageInterface.php',
-        'Psr\\Http\\Message\\RequestFactoryInterface' => __DIR__ . '/..' . '/psr/http-factory/src/RequestFactoryInterface.php',
         'Psr\\Http\\Message\\RequestInterface' => __DIR__ . '/..' . '/psr/http-message/src/RequestInterface.php',
-        'Psr\\Http\\Message\\ResponseFactoryInterface' => __DIR__ . '/..' . '/psr/http-factory/src/ResponseFactoryInterface.php',
         'Psr\\Http\\Message\\ResponseInterface' => __DIR__ . '/..' . '/psr/http-message/src/ResponseInterface.php',
-        'Psr\\Http\\Message\\ServerRequestFactoryInterface' => __DIR__ . '/..' . '/psr/http-factory/src/ServerRequestFactoryInterface.php',
         'Psr\\Http\\Message\\ServerRequestInterface' => __DIR__ . '/..' . '/psr/http-message/src/ServerRequestInterface.php',
-        'Psr\\Http\\Message\\StreamFactoryInterface' => __DIR__ . '/..' . '/psr/http-factory/src/StreamFactoryInterface.php',
         'Psr\\Http\\Message\\StreamInterface' => __DIR__ . '/..' . '/psr/http-message/src/StreamInterface.php',
-        'Psr\\Http\\Message\\UploadedFileFactoryInterface' => __DIR__ . '/..' . '/psr/http-factory/src/UploadedFileFactoryInterface.php',
         'Psr\\Http\\Message\\UploadedFileInterface' => __DIR__ . '/..' . '/psr/http-message/src/UploadedFileInterface.php',
-        'Psr\\Http\\Message\\UriFactoryInterface' => __DIR__ . '/..' . '/psr/http-factory/src/UriFactoryInterface.php',
         'Psr\\Http\\Message\\UriInterface' => __DIR__ . '/..' . '/psr/http-message/src/UriInterface.php',
-        'Psr\\Http\\Server\\MiddlewareInterface' => __DIR__ . '/..' . '/psr/http-server-middleware/src/MiddlewareInterface.php',
-        'Psr\\Http\\Server\\RequestHandlerInterface' => __DIR__ . '/..' . '/psr/http-server-handler/src/RequestHandlerInterface.php',
         'Psr\\Log\\AbstractLogger' => __DIR__ . '/..' . '/psr/log/Psr/Log/AbstractLogger.php',
         'Psr\\Log\\InvalidArgumentException' => __DIR__ . '/..' . '/psr/log/Psr/Log/InvalidArgumentException.php',
         'Psr\\Log\\LogLevel' => __DIR__ . '/..' . '/psr/log/Psr/Log/LogLevel.php',
@@ -151,100 +155,71 @@ class ComposerStaticInitAdvancedContentFilterAddon
         'Psr\\Log\\LoggerInterface' => __DIR__ . '/..' . '/psr/log/Psr/Log/LoggerInterface.php',
         'Psr\\Log\\LoggerTrait' => __DIR__ . '/..' . '/psr/log/Psr/Log/LoggerTrait.php',
         'Psr\\Log\\NullLogger' => __DIR__ . '/..' . '/psr/log/Psr/Log/NullLogger.php',
-        'Psr\\Log\\Test\\DummyTest' => __DIR__ . '/..' . '/psr/log/Psr/Log/Test/DummyTest.php',
+        'Psr\\Log\\Test\\DummyTest' => __DIR__ . '/..' . '/psr/log/Psr/Log/Test/LoggerInterfaceTest.php',
         'Psr\\Log\\Test\\LoggerInterfaceTest' => __DIR__ . '/..' . '/psr/log/Psr/Log/Test/LoggerInterfaceTest.php',
-        'Psr\\Log\\Test\\TestLogger' => __DIR__ . '/..' . '/psr/log/Psr/Log/Test/TestLogger.php',
+        'Psr\\SimpleCache\\CacheException' => __DIR__ . '/..' . '/psr/simple-cache/src/CacheException.php',
+        'Psr\\SimpleCache\\CacheInterface' => __DIR__ . '/..' . '/psr/simple-cache/src/CacheInterface.php',
+        'Psr\\SimpleCache\\InvalidArgumentException' => __DIR__ . '/..' . '/psr/simple-cache/src/InvalidArgumentException.php',
         'Slim\\App' => __DIR__ . '/..' . '/slim/slim/Slim/App.php',
         'Slim\\CallableResolver' => __DIR__ . '/..' . '/slim/slim/Slim/CallableResolver.php',
-        'Slim\\Error\\AbstractErrorRenderer' => __DIR__ . '/..' . '/slim/slim/Slim/Error/AbstractErrorRenderer.php',
-        'Slim\\Error\\Renderers\\HtmlErrorRenderer' => __DIR__ . '/..' . '/slim/slim/Slim/Error/Renderers/HtmlErrorRenderer.php',
-        'Slim\\Error\\Renderers\\JsonErrorRenderer' => __DIR__ . '/..' . '/slim/slim/Slim/Error/Renderers/JsonErrorRenderer.php',
-        'Slim\\Error\\Renderers\\PlainTextErrorRenderer' => __DIR__ . '/..' . '/slim/slim/Slim/Error/Renderers/PlainTextErrorRenderer.php',
-        'Slim\\Error\\Renderers\\XmlErrorRenderer' => __DIR__ . '/..' . '/slim/slim/Slim/Error/Renderers/XmlErrorRenderer.php',
-        'Slim\\Exception\\HttpBadRequestException' => __DIR__ . '/..' . '/slim/slim/Slim/Exception/HttpBadRequestException.php',
-        'Slim\\Exception\\HttpException' => __DIR__ . '/..' . '/slim/slim/Slim/Exception/HttpException.php',
-        'Slim\\Exception\\HttpForbiddenException' => __DIR__ . '/..' . '/slim/slim/Slim/Exception/HttpForbiddenException.php',
-        'Slim\\Exception\\HttpGoneException' => __DIR__ . '/..' . '/slim/slim/Slim/Exception/HttpGoneException.php',
-        'Slim\\Exception\\HttpInternalServerErrorException' => __DIR__ . '/..' . '/slim/slim/Slim/Exception/HttpInternalServerErrorException.php',
-        'Slim\\Exception\\HttpMethodNotAllowedException' => __DIR__ . '/..' . '/slim/slim/Slim/Exception/HttpMethodNotAllowedException.php',
-        'Slim\\Exception\\HttpNotFoundException' => __DIR__ . '/..' . '/slim/slim/Slim/Exception/HttpNotFoundException.php',
-        'Slim\\Exception\\HttpNotImplementedException' => __DIR__ . '/..' . '/slim/slim/Slim/Exception/HttpNotImplementedException.php',
-        'Slim\\Exception\\HttpSpecializedException' => __DIR__ . '/..' . '/slim/slim/Slim/Exception/HttpSpecializedException.php',
-        'Slim\\Exception\\HttpTooManyRequestsException' => __DIR__ . '/..' . '/slim/slim/Slim/Exception/HttpTooManyRequestsException.php',
-        'Slim\\Exception\\HttpUnauthorizedException' => __DIR__ . '/..' . '/slim/slim/Slim/Exception/HttpUnauthorizedException.php',
-        'Slim\\Factory\\AppFactory' => __DIR__ . '/..' . '/slim/slim/Slim/Factory/AppFactory.php',
-        'Slim\\Factory\\Psr17\\GuzzlePsr17Factory' => __DIR__ . '/..' . '/slim/slim/Slim/Factory/Psr17/GuzzlePsr17Factory.php',
-        'Slim\\Factory\\Psr17\\HttpSoftPsr17Factory' => __DIR__ . '/..' . '/slim/slim/Slim/Factory/Psr17/HttpSoftPsr17Factory.php',
-        'Slim\\Factory\\Psr17\\LaminasDiactorosPsr17Factory' => __DIR__ . '/..' . '/slim/slim/Slim/Factory/Psr17/LaminasDiactorosPsr17Factory.php',
-        'Slim\\Factory\\Psr17\\NyholmPsr17Factory' => __DIR__ . '/..' . '/slim/slim/Slim/Factory/Psr17/NyholmPsr17Factory.php',
-        'Slim\\Factory\\Psr17\\Psr17Factory' => __DIR__ . '/..' . '/slim/slim/Slim/Factory/Psr17/Psr17Factory.php',
-        'Slim\\Factory\\Psr17\\Psr17FactoryProvider' => __DIR__ . '/..' . '/slim/slim/Slim/Factory/Psr17/Psr17FactoryProvider.php',
-        'Slim\\Factory\\Psr17\\ServerRequestCreator' => __DIR__ . '/..' . '/slim/slim/Slim/Factory/Psr17/ServerRequestCreator.php',
-        'Slim\\Factory\\Psr17\\SlimHttpPsr17Factory' => __DIR__ . '/..' . '/slim/slim/Slim/Factory/Psr17/SlimHttpPsr17Factory.php',
-        'Slim\\Factory\\Psr17\\SlimHttpServerRequestCreator' => __DIR__ . '/..' . '/slim/slim/Slim/Factory/Psr17/SlimHttpServerRequestCreator.php',
-        'Slim\\Factory\\Psr17\\SlimPsr17Factory' => __DIR__ . '/..' . '/slim/slim/Slim/Factory/Psr17/SlimPsr17Factory.php',
-        'Slim\\Factory\\ServerRequestCreatorFactory' => __DIR__ . '/..' . '/slim/slim/Slim/Factory/ServerRequestCreatorFactory.php',
-        'Slim\\Handlers\\ErrorHandler' => __DIR__ . '/..' . '/slim/slim/Slim/Handlers/ErrorHandler.php',
-        'Slim\\Handlers\\Strategies\\RequestHandler' => __DIR__ . '/..' . '/slim/slim/Slim/Handlers/Strategies/RequestHandler.php',
+        'Slim\\CallableResolverAwareTrait' => __DIR__ . '/..' . '/slim/slim/Slim/CallableResolverAwareTrait.php',
+        'Slim\\Collection' => __DIR__ . '/..' . '/slim/slim/Slim/Collection.php',
+        'Slim\\Container' => __DIR__ . '/..' . '/slim/slim/Slim/Container.php',
+        'Slim\\DefaultServicesProvider' => __DIR__ . '/..' . '/slim/slim/Slim/DefaultServicesProvider.php',
+        'Slim\\DeferredCallable' => __DIR__ . '/..' . '/slim/slim/Slim/DeferredCallable.php',
+        'Slim\\Exception\\ContainerException' => __DIR__ . '/..' . '/slim/slim/Slim/Exception/ContainerException.php',
+        'Slim\\Exception\\ContainerValueNotFoundException' => __DIR__ . '/..' . '/slim/slim/Slim/Exception/ContainerValueNotFoundException.php',
+        'Slim\\Exception\\InvalidMethodException' => __DIR__ . '/..' . '/slim/slim/Slim/Exception/InvalidMethodException.php',
+        'Slim\\Exception\\MethodNotAllowedException' => __DIR__ . '/..' . '/slim/slim/Slim/Exception/MethodNotAllowedException.php',
+        'Slim\\Exception\\NotFoundException' => __DIR__ . '/..' . '/slim/slim/Slim/Exception/NotFoundException.php',
+        'Slim\\Exception\\SlimException' => __DIR__ . '/..' . '/slim/slim/Slim/Exception/SlimException.php',
+        'Slim\\Handlers\\AbstractError' => __DIR__ . '/..' . '/slim/slim/Slim/Handlers/AbstractError.php',
+        'Slim\\Handlers\\AbstractHandler' => __DIR__ . '/..' . '/slim/slim/Slim/Handlers/AbstractHandler.php',
+        'Slim\\Handlers\\Error' => __DIR__ . '/..' . '/slim/slim/Slim/Handlers/Error.php',
+        'Slim\\Handlers\\NotAllowed' => __DIR__ . '/..' . '/slim/slim/Slim/Handlers/NotAllowed.php',
+        'Slim\\Handlers\\NotFound' => __DIR__ . '/..' . '/slim/slim/Slim/Handlers/NotFound.php',
+        'Slim\\Handlers\\PhpError' => __DIR__ . '/..' . '/slim/slim/Slim/Handlers/PhpError.php',
         'Slim\\Handlers\\Strategies\\RequestResponse' => __DIR__ . '/..' . '/slim/slim/Slim/Handlers/Strategies/RequestResponse.php',
         'Slim\\Handlers\\Strategies\\RequestResponseArgs' => __DIR__ . '/..' . '/slim/slim/Slim/Handlers/Strategies/RequestResponseArgs.php',
-        'Slim\\Handlers\\Strategies\\RequestResponseNamedArgs' => __DIR__ . '/..' . '/slim/slim/Slim/Handlers/Strategies/RequestResponseNamedArgs.php',
-        'Slim\\Interfaces\\AdvancedCallableResolverInterface' => __DIR__ . '/..' . '/slim/slim/Slim/Interfaces/AdvancedCallableResolverInterface.php',
+        'Slim\\Http\\Body' => __DIR__ . '/..' . '/slim/slim/Slim/Http/Body.php',
+        'Slim\\Http\\Cookies' => __DIR__ . '/..' . '/slim/slim/Slim/Http/Cookies.php',
+        'Slim\\Http\\Environment' => __DIR__ . '/..' . '/slim/slim/Slim/Http/Environment.php',
+        'Slim\\Http\\Headers' => __DIR__ . '/..' . '/slim/slim/Slim/Http/Headers.php',
+        'Slim\\Http\\Message' => __DIR__ . '/..' . '/slim/slim/Slim/Http/Message.php',
+        'Slim\\Http\\Request' => __DIR__ . '/..' . '/slim/slim/Slim/Http/Request.php',
+        'Slim\\Http\\RequestBody' => __DIR__ . '/..' . '/slim/slim/Slim/Http/RequestBody.php',
+        'Slim\\Http\\Response' => __DIR__ . '/..' . '/slim/slim/Slim/Http/Response.php',
+        'Slim\\Http\\Stream' => __DIR__ . '/..' . '/slim/slim/Slim/Http/Stream.php',
+        'Slim\\Http\\UploadedFile' => __DIR__ . '/..' . '/slim/slim/Slim/Http/UploadedFile.php',
+        'Slim\\Http\\Uri' => __DIR__ . '/..' . '/slim/slim/Slim/Http/Uri.php',
         'Slim\\Interfaces\\CallableResolverInterface' => __DIR__ . '/..' . '/slim/slim/Slim/Interfaces/CallableResolverInterface.php',
-        'Slim\\Interfaces\\DispatcherInterface' => __DIR__ . '/..' . '/slim/slim/Slim/Interfaces/DispatcherInterface.php',
-        'Slim\\Interfaces\\ErrorHandlerInterface' => __DIR__ . '/..' . '/slim/slim/Slim/Interfaces/ErrorHandlerInterface.php',
-        'Slim\\Interfaces\\ErrorRendererInterface' => __DIR__ . '/..' . '/slim/slim/Slim/Interfaces/ErrorRendererInterface.php',
+        'Slim\\Interfaces\\CollectionInterface' => __DIR__ . '/..' . '/slim/slim/Slim/Interfaces/CollectionInterface.php',
+        'Slim\\Interfaces\\Http\\CookiesInterface' => __DIR__ . '/..' . '/slim/slim/Slim/Interfaces/Http/CookiesInterface.php',
+        'Slim\\Interfaces\\Http\\EnvironmentInterface' => __DIR__ . '/..' . '/slim/slim/Slim/Interfaces/Http/EnvironmentInterface.php',
+        'Slim\\Interfaces\\Http\\HeadersInterface' => __DIR__ . '/..' . '/slim/slim/Slim/Interfaces/Http/HeadersInterface.php',
         'Slim\\Interfaces\\InvocationStrategyInterface' => __DIR__ . '/..' . '/slim/slim/Slim/Interfaces/InvocationStrategyInterface.php',
-        'Slim\\Interfaces\\MiddlewareDispatcherInterface' => __DIR__ . '/..' . '/slim/slim/Slim/Interfaces/MiddlewareDispatcherInterface.php',
-        'Slim\\Interfaces\\Psr17FactoryInterface' => __DIR__ . '/..' . '/slim/slim/Slim/Interfaces/Psr17FactoryInterface.php',
-        'Slim\\Interfaces\\Psr17FactoryProviderInterface' => __DIR__ . '/..' . '/slim/slim/Slim/Interfaces/Psr17FactoryProviderInterface.php',
-        'Slim\\Interfaces\\RequestHandlerInvocationStrategyInterface' => __DIR__ . '/..' . '/slim/slim/Slim/Interfaces/RequestHandlerInvocationStrategyInterface.php',
-        'Slim\\Interfaces\\RouteCollectorInterface' => __DIR__ . '/..' . '/slim/slim/Slim/Interfaces/RouteCollectorInterface.php',
-        'Slim\\Interfaces\\RouteCollectorProxyInterface' => __DIR__ . '/..' . '/slim/slim/Slim/Interfaces/RouteCollectorProxyInterface.php',
         'Slim\\Interfaces\\RouteGroupInterface' => __DIR__ . '/..' . '/slim/slim/Slim/Interfaces/RouteGroupInterface.php',
         'Slim\\Interfaces\\RouteInterface' => __DIR__ . '/..' . '/slim/slim/Slim/Interfaces/RouteInterface.php',
-        'Slim\\Interfaces\\RouteParserInterface' => __DIR__ . '/..' . '/slim/slim/Slim/Interfaces/RouteParserInterface.php',
-        'Slim\\Interfaces\\RouteResolverInterface' => __DIR__ . '/..' . '/slim/slim/Slim/Interfaces/RouteResolverInterface.php',
-        'Slim\\Interfaces\\ServerRequestCreatorInterface' => __DIR__ . '/..' . '/slim/slim/Slim/Interfaces/ServerRequestCreatorInterface.php',
-        'Slim\\Logger' => __DIR__ . '/..' . '/slim/slim/Slim/Logger.php',
-        'Slim\\MiddlewareDispatcher' => __DIR__ . '/..' . '/slim/slim/Slim/MiddlewareDispatcher.php',
-        'Slim\\Middleware\\BodyParsingMiddleware' => __DIR__ . '/..' . '/slim/slim/Slim/Middleware/BodyParsingMiddleware.php',
-        'Slim\\Middleware\\ContentLengthMiddleware' => __DIR__ . '/..' . '/slim/slim/Slim/Middleware/ContentLengthMiddleware.php',
-        'Slim\\Middleware\\ErrorMiddleware' => __DIR__ . '/..' . '/slim/slim/Slim/Middleware/ErrorMiddleware.php',
-        'Slim\\Middleware\\MethodOverrideMiddleware' => __DIR__ . '/..' . '/slim/slim/Slim/Middleware/MethodOverrideMiddleware.php',
-        'Slim\\Middleware\\OutputBufferingMiddleware' => __DIR__ . '/..' . '/slim/slim/Slim/Middleware/OutputBufferingMiddleware.php',
-        'Slim\\Middleware\\RoutingMiddleware' => __DIR__ . '/..' . '/slim/slim/Slim/Middleware/RoutingMiddleware.php',
-        'Slim\\ResponseEmitter' => __DIR__ . '/..' . '/slim/slim/Slim/ResponseEmitter.php',
-        'Slim\\Routing\\Dispatcher' => __DIR__ . '/..' . '/slim/slim/Slim/Routing/Dispatcher.php',
-        'Slim\\Routing\\FastRouteDispatcher' => __DIR__ . '/..' . '/slim/slim/Slim/Routing/FastRouteDispatcher.php',
-        'Slim\\Routing\\Route' => __DIR__ . '/..' . '/slim/slim/Slim/Routing/Route.php',
-        'Slim\\Routing\\RouteCollector' => __DIR__ . '/..' . '/slim/slim/Slim/Routing/RouteCollector.php',
-        'Slim\\Routing\\RouteCollectorProxy' => __DIR__ . '/..' . '/slim/slim/Slim/Routing/RouteCollectorProxy.php',
-        'Slim\\Routing\\RouteContext' => __DIR__ . '/..' . '/slim/slim/Slim/Routing/RouteContext.php',
-        'Slim\\Routing\\RouteGroup' => __DIR__ . '/..' . '/slim/slim/Slim/Routing/RouteGroup.php',
-        'Slim\\Routing\\RouteParser' => __DIR__ . '/..' . '/slim/slim/Slim/Routing/RouteParser.php',
-        'Slim\\Routing\\RouteResolver' => __DIR__ . '/..' . '/slim/slim/Slim/Routing/RouteResolver.php',
-        'Slim\\Routing\\RouteRunner' => __DIR__ . '/..' . '/slim/slim/Slim/Routing/RouteRunner.php',
-        'Slim\\Routing\\RoutingResults' => __DIR__ . '/..' . '/slim/slim/Slim/Routing/RoutingResults.php',
-        'Stringable' => __DIR__ . '/..' . '/symfony/polyfill-php80/Resources/stubs/Stringable.php',
+        'Slim\\Interfaces\\RouterInterface' => __DIR__ . '/..' . '/slim/slim/Slim/Interfaces/RouterInterface.php',
+        'Slim\\MiddlewareAwareTrait' => __DIR__ . '/..' . '/slim/slim/Slim/MiddlewareAwareTrait.php',
+        'Slim\\Routable' => __DIR__ . '/..' . '/slim/slim/Slim/Routable.php',
+        'Slim\\Route' => __DIR__ . '/..' . '/slim/slim/Slim/Route.php',
+        'Slim\\RouteGroup' => __DIR__ . '/..' . '/slim/slim/Slim/RouteGroup.php',
+        'Slim\\Router' => __DIR__ . '/..' . '/slim/slim/Slim/Router.php',
         'Symfony\\Component\\Cache\\Adapter\\AbstractAdapter' => __DIR__ . '/..' . '/symfony/cache/Adapter/AbstractAdapter.php',
-        'Symfony\\Component\\Cache\\Adapter\\AbstractTagAwareAdapter' => __DIR__ . '/..' . '/symfony/cache/Adapter/AbstractTagAwareAdapter.php',
         'Symfony\\Component\\Cache\\Adapter\\AdapterInterface' => __DIR__ . '/..' . '/symfony/cache/Adapter/AdapterInterface.php',
         'Symfony\\Component\\Cache\\Adapter\\ApcuAdapter' => __DIR__ . '/..' . '/symfony/cache/Adapter/ApcuAdapter.php',
         'Symfony\\Component\\Cache\\Adapter\\ArrayAdapter' => __DIR__ . '/..' . '/symfony/cache/Adapter/ArrayAdapter.php',
         'Symfony\\Component\\Cache\\Adapter\\ChainAdapter' => __DIR__ . '/..' . '/symfony/cache/Adapter/ChainAdapter.php',
         'Symfony\\Component\\Cache\\Adapter\\DoctrineAdapter' => __DIR__ . '/..' . '/symfony/cache/Adapter/DoctrineAdapter.php',
         'Symfony\\Component\\Cache\\Adapter\\FilesystemAdapter' => __DIR__ . '/..' . '/symfony/cache/Adapter/FilesystemAdapter.php',
-        'Symfony\\Component\\Cache\\Adapter\\FilesystemTagAwareAdapter' => __DIR__ . '/..' . '/symfony/cache/Adapter/FilesystemTagAwareAdapter.php',
         'Symfony\\Component\\Cache\\Adapter\\MemcachedAdapter' => __DIR__ . '/..' . '/symfony/cache/Adapter/MemcachedAdapter.php',
         'Symfony\\Component\\Cache\\Adapter\\NullAdapter' => __DIR__ . '/..' . '/symfony/cache/Adapter/NullAdapter.php',
         'Symfony\\Component\\Cache\\Adapter\\PdoAdapter' => __DIR__ . '/..' . '/symfony/cache/Adapter/PdoAdapter.php',
         'Symfony\\Component\\Cache\\Adapter\\PhpArrayAdapter' => __DIR__ . '/..' . '/symfony/cache/Adapter/PhpArrayAdapter.php',
         'Symfony\\Component\\Cache\\Adapter\\PhpFilesAdapter' => __DIR__ . '/..' . '/symfony/cache/Adapter/PhpFilesAdapter.php',
         'Symfony\\Component\\Cache\\Adapter\\ProxyAdapter' => __DIR__ . '/..' . '/symfony/cache/Adapter/ProxyAdapter.php',
-        'Symfony\\Component\\Cache\\Adapter\\Psr16Adapter' => __DIR__ . '/..' . '/symfony/cache/Adapter/Psr16Adapter.php',
         'Symfony\\Component\\Cache\\Adapter\\RedisAdapter' => __DIR__ . '/..' . '/symfony/cache/Adapter/RedisAdapter.php',
-        'Symfony\\Component\\Cache\\Adapter\\RedisTagAwareAdapter' => __DIR__ . '/..' . '/symfony/cache/Adapter/RedisTagAwareAdapter.php',
         'Symfony\\Component\\Cache\\Adapter\\SimpleCacheAdapter' => __DIR__ . '/..' . '/symfony/cache/Adapter/SimpleCacheAdapter.php',
         'Symfony\\Component\\Cache\\Adapter\\TagAwareAdapter' => __DIR__ . '/..' . '/symfony/cache/Adapter/TagAwareAdapter.php',
         'Symfony\\Component\\Cache\\Adapter\\TagAwareAdapterInterface' => __DIR__ . '/..' . '/symfony/cache/Adapter/TagAwareAdapterInterface.php',
@@ -253,21 +228,10 @@ class ComposerStaticInitAdvancedContentFilterAddon
         'Symfony\\Component\\Cache\\Adapter\\TraceableTagAwareAdapter' => __DIR__ . '/..' . '/symfony/cache/Adapter/TraceableTagAwareAdapter.php',
         'Symfony\\Component\\Cache\\CacheItem' => __DIR__ . '/..' . '/symfony/cache/CacheItem.php',
         'Symfony\\Component\\Cache\\DataCollector\\CacheDataCollector' => __DIR__ . '/..' . '/symfony/cache/DataCollector/CacheDataCollector.php',
-        'Symfony\\Component\\Cache\\DependencyInjection\\CacheCollectorPass' => __DIR__ . '/..' . '/symfony/cache/DependencyInjection/CacheCollectorPass.php',
-        'Symfony\\Component\\Cache\\DependencyInjection\\CachePoolClearerPass' => __DIR__ . '/..' . '/symfony/cache/DependencyInjection/CachePoolClearerPass.php',
-        'Symfony\\Component\\Cache\\DependencyInjection\\CachePoolPass' => __DIR__ . '/..' . '/symfony/cache/DependencyInjection/CachePoolPass.php',
-        'Symfony\\Component\\Cache\\DependencyInjection\\CachePoolPrunerPass' => __DIR__ . '/..' . '/symfony/cache/DependencyInjection/CachePoolPrunerPass.php',
         'Symfony\\Component\\Cache\\DoctrineProvider' => __DIR__ . '/..' . '/symfony/cache/DoctrineProvider.php',
         'Symfony\\Component\\Cache\\Exception\\CacheException' => __DIR__ . '/..' . '/symfony/cache/Exception/CacheException.php',
         'Symfony\\Component\\Cache\\Exception\\InvalidArgumentException' => __DIR__ . '/..' . '/symfony/cache/Exception/InvalidArgumentException.php',
-        'Symfony\\Component\\Cache\\Exception\\LogicException' => __DIR__ . '/..' . '/symfony/cache/Exception/LogicException.php',
-        'Symfony\\Component\\Cache\\LockRegistry' => __DIR__ . '/..' . '/symfony/cache/LockRegistry.php',
-        'Symfony\\Component\\Cache\\Marshaller\\DefaultMarshaller' => __DIR__ . '/..' . '/symfony/cache/Marshaller/DefaultMarshaller.php',
-        'Symfony\\Component\\Cache\\Marshaller\\DeflateMarshaller' => __DIR__ . '/..' . '/symfony/cache/Marshaller/DeflateMarshaller.php',
-        'Symfony\\Component\\Cache\\Marshaller\\MarshallerInterface' => __DIR__ . '/..' . '/symfony/cache/Marshaller/MarshallerInterface.php',
-        'Symfony\\Component\\Cache\\Marshaller\\TagAwareMarshaller' => __DIR__ . '/..' . '/symfony/cache/Marshaller/TagAwareMarshaller.php',
         'Symfony\\Component\\Cache\\PruneableInterface' => __DIR__ . '/..' . '/symfony/cache/PruneableInterface.php',
-        'Symfony\\Component\\Cache\\Psr16Cache' => __DIR__ . '/..' . '/symfony/cache/Psr16Cache.php',
         'Symfony\\Component\\Cache\\ResettableInterface' => __DIR__ . '/..' . '/symfony/cache/ResettableInterface.php',
         'Symfony\\Component\\Cache\\Simple\\AbstractCache' => __DIR__ . '/..' . '/symfony/cache/Simple/AbstractCache.php',
         'Symfony\\Component\\Cache\\Simple\\ApcuCache' => __DIR__ . '/..' . '/symfony/cache/Simple/ApcuCache.php',
@@ -284,22 +248,17 @@ class ComposerStaticInitAdvancedContentFilterAddon
         'Symfony\\Component\\Cache\\Simple\\RedisCache' => __DIR__ . '/..' . '/symfony/cache/Simple/RedisCache.php',
         'Symfony\\Component\\Cache\\Simple\\TraceableCache' => __DIR__ . '/..' . '/symfony/cache/Simple/TraceableCache.php',
         'Symfony\\Component\\Cache\\Simple\\TraceableCacheEvent' => __DIR__ . '/..' . '/symfony/cache/Simple/TraceableCache.php',
-        'Symfony\\Component\\Cache\\Traits\\AbstractAdapterTrait' => __DIR__ . '/..' . '/symfony/cache/Traits/AbstractAdapterTrait.php',
         'Symfony\\Component\\Cache\\Traits\\AbstractTrait' => __DIR__ . '/..' . '/symfony/cache/Traits/AbstractTrait.php',
         'Symfony\\Component\\Cache\\Traits\\ApcuTrait' => __DIR__ . '/..' . '/symfony/cache/Traits/ApcuTrait.php',
         'Symfony\\Component\\Cache\\Traits\\ArrayTrait' => __DIR__ . '/..' . '/symfony/cache/Traits/ArrayTrait.php',
-        'Symfony\\Component\\Cache\\Traits\\ContractsTrait' => __DIR__ . '/..' . '/symfony/cache/Traits/ContractsTrait.php',
         'Symfony\\Component\\Cache\\Traits\\DoctrineTrait' => __DIR__ . '/..' . '/symfony/cache/Traits/DoctrineTrait.php',
         'Symfony\\Component\\Cache\\Traits\\FilesystemCommonTrait' => __DIR__ . '/..' . '/symfony/cache/Traits/FilesystemCommonTrait.php',
         'Symfony\\Component\\Cache\\Traits\\FilesystemTrait' => __DIR__ . '/..' . '/symfony/cache/Traits/FilesystemTrait.php',
-        'Symfony\\Component\\Cache\\Traits\\LazyValue' => __DIR__ . '/..' . '/symfony/cache/Traits/PhpFilesTrait.php',
         'Symfony\\Component\\Cache\\Traits\\MemcachedTrait' => __DIR__ . '/..' . '/symfony/cache/Traits/MemcachedTrait.php',
         'Symfony\\Component\\Cache\\Traits\\PdoTrait' => __DIR__ . '/..' . '/symfony/cache/Traits/PdoTrait.php',
         'Symfony\\Component\\Cache\\Traits\\PhpArrayTrait' => __DIR__ . '/..' . '/symfony/cache/Traits/PhpArrayTrait.php',
         'Symfony\\Component\\Cache\\Traits\\PhpFilesTrait' => __DIR__ . '/..' . '/symfony/cache/Traits/PhpFilesTrait.php',
         'Symfony\\Component\\Cache\\Traits\\ProxyTrait' => __DIR__ . '/..' . '/symfony/cache/Traits/ProxyTrait.php',
-        'Symfony\\Component\\Cache\\Traits\\RedisClusterNodeProxy' => __DIR__ . '/..' . '/symfony/cache/Traits/RedisClusterNodeProxy.php',
-        'Symfony\\Component\\Cache\\Traits\\RedisClusterProxy' => __DIR__ . '/..' . '/symfony/cache/Traits/RedisClusterProxy.php',
         'Symfony\\Component\\Cache\\Traits\\RedisProxy' => __DIR__ . '/..' . '/symfony/cache/Traits/RedisProxy.php',
         'Symfony\\Component\\Cache\\Traits\\RedisTrait' => __DIR__ . '/..' . '/symfony/cache/Traits/RedisTrait.php',
         'Symfony\\Component\\ExpressionLanguage\\Compiler' => __DIR__ . '/..' . '/symfony/expression-language/Compiler.php',
@@ -327,34 +286,7 @@ class ComposerStaticInitAdvancedContentFilterAddon
         'Symfony\\Component\\ExpressionLanguage\\SyntaxError' => __DIR__ . '/..' . '/symfony/expression-language/SyntaxError.php',
         'Symfony\\Component\\ExpressionLanguage\\Token' => __DIR__ . '/..' . '/symfony/expression-language/Token.php',
         'Symfony\\Component\\ExpressionLanguage\\TokenStream' => __DIR__ . '/..' . '/symfony/expression-language/TokenStream.php',
-        'Symfony\\Component\\VarExporter\\Exception\\ClassNotFoundException' => __DIR__ . '/..' . '/symfony/var-exporter/Exception/ClassNotFoundException.php',
-        'Symfony\\Component\\VarExporter\\Exception\\ExceptionInterface' => __DIR__ . '/..' . '/symfony/var-exporter/Exception/ExceptionInterface.php',
-        'Symfony\\Component\\VarExporter\\Exception\\NotInstantiableTypeException' => __DIR__ . '/..' . '/symfony/var-exporter/Exception/NotInstantiableTypeException.php',
-        'Symfony\\Component\\VarExporter\\Instantiator' => __DIR__ . '/..' . '/symfony/var-exporter/Instantiator.php',
-        'Symfony\\Component\\VarExporter\\Internal\\Exporter' => __DIR__ . '/..' . '/symfony/var-exporter/Internal/Exporter.php',
-        'Symfony\\Component\\VarExporter\\Internal\\Hydrator' => __DIR__ . '/..' . '/symfony/var-exporter/Internal/Hydrator.php',
-        'Symfony\\Component\\VarExporter\\Internal\\Reference' => __DIR__ . '/..' . '/symfony/var-exporter/Internal/Reference.php',
-        'Symfony\\Component\\VarExporter\\Internal\\Registry' => __DIR__ . '/..' . '/symfony/var-exporter/Internal/Registry.php',
-        'Symfony\\Component\\VarExporter\\Internal\\Values' => __DIR__ . '/..' . '/symfony/var-exporter/Internal/Values.php',
-        'Symfony\\Component\\VarExporter\\VarExporter' => __DIR__ . '/..' . '/symfony/var-exporter/VarExporter.php',
-        'Symfony\\Contracts\\Cache\\CacheInterface' => __DIR__ . '/..' . '/symfony/cache-contracts/CacheInterface.php',
-        'Symfony\\Contracts\\Cache\\CacheTrait' => __DIR__ . '/..' . '/symfony/cache-contracts/CacheTrait.php',
-        'Symfony\\Contracts\\Cache\\CallbackInterface' => __DIR__ . '/..' . '/symfony/cache-contracts/CallbackInterface.php',
-        'Symfony\\Contracts\\Cache\\ItemInterface' => __DIR__ . '/..' . '/symfony/cache-contracts/ItemInterface.php',
-        'Symfony\\Contracts\\Cache\\TagAwareCacheInterface' => __DIR__ . '/..' . '/symfony/cache-contracts/TagAwareCacheInterface.php',
-        'Symfony\\Contracts\\Service\\Attribute\\Required' => __DIR__ . '/..' . '/symfony/service-contracts/Attribute/Required.php',
-        'Symfony\\Contracts\\Service\\Attribute\\SubscribedService' => __DIR__ . '/..' . '/symfony/service-contracts/Attribute/SubscribedService.php',
-        'Symfony\\Contracts\\Service\\ResetInterface' => __DIR__ . '/..' . '/symfony/service-contracts/ResetInterface.php',
-        'Symfony\\Contracts\\Service\\ServiceLocatorTrait' => __DIR__ . '/..' . '/symfony/service-contracts/ServiceLocatorTrait.php',
-        'Symfony\\Contracts\\Service\\ServiceProviderInterface' => __DIR__ . '/..' . '/symfony/service-contracts/ServiceProviderInterface.php',
-        'Symfony\\Contracts\\Service\\ServiceSubscriberInterface' => __DIR__ . '/..' . '/symfony/service-contracts/ServiceSubscriberInterface.php',
-        'Symfony\\Contracts\\Service\\ServiceSubscriberTrait' => __DIR__ . '/..' . '/symfony/service-contracts/ServiceSubscriberTrait.php',
-        'Symfony\\Contracts\\Service\\Test\\ServiceLocatorTest' => __DIR__ . '/..' . '/symfony/service-contracts/Test/ServiceLocatorTest.php',
-        'Symfony\\Polyfill\\Php73\\Php73' => __DIR__ . '/..' . '/symfony/polyfill-php73/Php73.php',
-        'Symfony\\Polyfill\\Php80\\Php80' => __DIR__ . '/..' . '/symfony/polyfill-php80/Php80.php',
-        'Symfony\\Polyfill\\Php80\\PhpToken' => __DIR__ . '/..' . '/symfony/polyfill-php80/PhpToken.php',
-        'UnhandledMatchError' => __DIR__ . '/..' . '/symfony/polyfill-php80/Resources/stubs/UnhandledMatchError.php',
-        'ValueError' => __DIR__ . '/..' . '/symfony/polyfill-php80/Resources/stubs/ValueError.php',
+        'Symfony\\Polyfill\\Apcu\\Apcu' => __DIR__ . '/..' . '/symfony/polyfill-apcu/Apcu.php',
     );
 
     public static function getInitializer(ClassLoader $loader)
@@ -362,6 +294,7 @@ class ComposerStaticInitAdvancedContentFilterAddon
         return \Closure::bind(function () use ($loader) {
             $loader->prefixLengthsPsr4 = ComposerStaticInitAdvancedContentFilterAddon::$prefixLengthsPsr4;
             $loader->prefixDirsPsr4 = ComposerStaticInitAdvancedContentFilterAddon::$prefixDirsPsr4;
+            $loader->prefixesPsr0 = ComposerStaticInitAdvancedContentFilterAddon::$prefixesPsr0;
             $loader->classMap = ComposerStaticInitAdvancedContentFilterAddon::$classMap;
 
         }, null, ClassLoader::class);
diff --git a/advancedcontentfilter/vendor/composer/installed.json b/advancedcontentfilter/vendor/composer/installed.json
index 07e02c7f..8e6b80dc 100644
--- a/advancedcontentfilter/vendor/composer/installed.json
+++ b/advancedcontentfilter/vendor/composer/installed.json
@@ -1,4 +1,37 @@
 [
+    {
+        "name": "container-interop/container-interop",
+        "version": "1.2.0",
+        "version_normalized": "1.2.0.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/container-interop/container-interop.git",
+            "reference": "79cbf1341c22ec75643d841642dd5d6acd83bdb8"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/container-interop/container-interop/zipball/79cbf1341c22ec75643d841642dd5d6acd83bdb8",
+            "reference": "79cbf1341c22ec75643d841642dd5d6acd83bdb8",
+            "shasum": ""
+        },
+        "require": {
+            "psr/container": "^1.0"
+        },
+        "time": "2017-02-14T19:40:03+00:00",
+        "type": "library",
+        "installation-source": "dist",
+        "autoload": {
+            "psr-4": {
+                "Interop\\Container\\": "src/Interop/Container/"
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "description": "Promoting the interoperability of container objects (DIC, SL, etc.)",
+        "homepage": "https://github.com/container-interop/container-interop"
+    },
     {
         "name": "nikic/fast-route",
         "version": "v1.3.0",
@@ -47,6 +80,58 @@
             "routing"
         ]
     },
+    {
+        "name": "pimple/pimple",
+        "version": "v3.2.3",
+        "version_normalized": "3.2.3.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/silexphp/Pimple.git",
+            "reference": "9e403941ef9d65d20cba7d54e29fe906db42cf32"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/silexphp/Pimple/zipball/9e403941ef9d65d20cba7d54e29fe906db42cf32",
+            "reference": "9e403941ef9d65d20cba7d54e29fe906db42cf32",
+            "shasum": ""
+        },
+        "require": {
+            "php": ">=5.3.0",
+            "psr/container": "^1.0"
+        },
+        "require-dev": {
+            "symfony/phpunit-bridge": "^3.2"
+        },
+        "time": "2018-01-21T07:42:36+00:00",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "3.2.x-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "psr-0": {
+                "Pimple": "src/"
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "Fabien Potencier",
+                "email": "fabien@symfony.com"
+            }
+        ],
+        "description": "Pimple, a simple Dependency Injection Container",
+        "homepage": "http://pimple.sensiolabs.org",
+        "keywords": [
+            "container",
+            "dependency injection"
+        ]
+    },
     {
         "name": "psr/cache",
         "version": "1.0.1",
@@ -97,24 +182,29 @@
     },
     {
         "name": "psr/container",
-        "version": "1.1.2",
-        "version_normalized": "1.1.2.0",
+        "version": "1.0.0",
+        "version_normalized": "1.0.0.0",
         "source": {
             "type": "git",
             "url": "https://github.com/php-fig/container.git",
-            "reference": "513e0666f7216c7459170d56df27dfcefe1689ea"
+            "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/php-fig/container/zipball/513e0666f7216c7459170d56df27dfcefe1689ea",
-            "reference": "513e0666f7216c7459170d56df27dfcefe1689ea",
+            "url": "https://api.github.com/repos/php-fig/container/zipball/b7ce3b176482dbbc1245ebf52b181af44c2cf55f",
+            "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f",
             "shasum": ""
         },
         "require": {
-            "php": ">=7.4.0"
+            "php": ">=5.3.0"
         },
-        "time": "2021-11-05T16:50:12+00:00",
+        "time": "2017-02-14T16:28:37+00:00",
         "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "1.0.x-dev"
+            }
+        },
         "installation-source": "dist",
         "autoload": {
             "psr-4": {
@@ -128,7 +218,7 @@
         "authors": [
             {
                 "name": "PHP-FIG",
-                "homepage": "https://www.php-fig.org/"
+                "homepage": "http://www.php-fig.org/"
             }
         ],
         "description": "Common Container Interface (PHP FIG PSR-11)",
@@ -142,25 +232,24 @@
         ]
     },
     {
-        "name": "psr/http-factory",
-        "version": "1.0.2",
-        "version_normalized": "1.0.2.0",
+        "name": "psr/http-message",
+        "version": "1.0.1",
+        "version_normalized": "1.0.1.0",
         "source": {
             "type": "git",
-            "url": "https://github.com/php-fig/http-factory.git",
-            "reference": "e616d01114759c4c489f93b099585439f795fe35"
+            "url": "https://github.com/php-fig/http-message.git",
+            "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/php-fig/http-factory/zipball/e616d01114759c4c489f93b099585439f795fe35",
-            "reference": "e616d01114759c4c489f93b099585439f795fe35",
+            "url": "https://api.github.com/repos/php-fig/http-message/zipball/f6561bf28d520154e4b0ec72be95418abe6d9363",
+            "reference": "f6561bf28d520154e4b0ec72be95418abe6d9363",
             "shasum": ""
         },
         "require": {
-            "php": ">=7.0.0",
-            "psr/http-message": "^1.0 || ^2.0"
+            "php": ">=5.3.0"
         },
-        "time": "2023-04-10T20:10:41+00:00",
+        "time": "2016-08-06T14:39:51+00:00",
         "type": "library",
         "extra": {
             "branch-alias": {
@@ -180,60 +269,7 @@
         "authors": [
             {
                 "name": "PHP-FIG",
-                "homepage": "https://www.php-fig.org/"
-            }
-        ],
-        "description": "Common interfaces for PSR-7 HTTP message factories",
-        "keywords": [
-            "factory",
-            "http",
-            "message",
-            "psr",
-            "psr-17",
-            "psr-7",
-            "request",
-            "response"
-        ]
-    },
-    {
-        "name": "psr/http-message",
-        "version": "2.0",
-        "version_normalized": "2.0.0.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/php-fig/http-message.git",
-            "reference": "402d35bcb92c70c026d1a6a9883f06b2ead23d71"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/php-fig/http-message/zipball/402d35bcb92c70c026d1a6a9883f06b2ead23d71",
-            "reference": "402d35bcb92c70c026d1a6a9883f06b2ead23d71",
-            "shasum": ""
-        },
-        "require": {
-            "php": "^7.2 || ^8.0"
-        },
-        "time": "2023-04-04T09:54:51+00:00",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "2.0.x-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Psr\\Http\\Message\\": "src/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "PHP-FIG",
-                "homepage": "https://www.php-fig.org/"
+                "homepage": "http://www.php-fig.org/"
             }
         ],
         "description": "Common interface for HTTP messages",
@@ -247,139 +283,29 @@
             "response"
         ]
     },
-    {
-        "name": "psr/http-server-handler",
-        "version": "1.0.2",
-        "version_normalized": "1.0.2.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/php-fig/http-server-handler.git",
-            "reference": "84c4fb66179be4caaf8e97bd239203245302e7d4"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/php-fig/http-server-handler/zipball/84c4fb66179be4caaf8e97bd239203245302e7d4",
-            "reference": "84c4fb66179be4caaf8e97bd239203245302e7d4",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=7.0",
-            "psr/http-message": "^1.0 || ^2.0"
-        },
-        "time": "2023-04-10T20:06:20+00:00",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "1.0.x-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Psr\\Http\\Server\\": "src/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "PHP-FIG",
-                "homepage": "https://www.php-fig.org/"
-            }
-        ],
-        "description": "Common interface for HTTP server-side request handler",
-        "keywords": [
-            "handler",
-            "http",
-            "http-interop",
-            "psr",
-            "psr-15",
-            "psr-7",
-            "request",
-            "response",
-            "server"
-        ]
-    },
-    {
-        "name": "psr/http-server-middleware",
-        "version": "1.0.2",
-        "version_normalized": "1.0.2.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/php-fig/http-server-middleware.git",
-            "reference": "c1481f747daaa6a0782775cd6a8c26a1bf4a3829"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/php-fig/http-server-middleware/zipball/c1481f747daaa6a0782775cd6a8c26a1bf4a3829",
-            "reference": "c1481f747daaa6a0782775cd6a8c26a1bf4a3829",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=7.0",
-            "psr/http-message": "^1.0 || ^2.0",
-            "psr/http-server-handler": "^1.0"
-        },
-        "time": "2023-04-11T06:14:47+00:00",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "1.0.x-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Psr\\Http\\Server\\": "src/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "PHP-FIG",
-                "homepage": "https://www.php-fig.org/"
-            }
-        ],
-        "description": "Common interface for HTTP server-side middleware",
-        "keywords": [
-            "http",
-            "http-interop",
-            "middleware",
-            "psr",
-            "psr-15",
-            "psr-7",
-            "request",
-            "response"
-        ]
-    },
     {
         "name": "psr/log",
-        "version": "1.1.4",
-        "version_normalized": "1.1.4.0",
+        "version": "1.0.2",
+        "version_normalized": "1.0.2.0",
         "source": {
             "type": "git",
             "url": "https://github.com/php-fig/log.git",
-            "reference": "d49695b909c3b7628b6289db5479a1c204601f11"
+            "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/php-fig/log/zipball/d49695b909c3b7628b6289db5479a1c204601f11",
-            "reference": "d49695b909c3b7628b6289db5479a1c204601f11",
+            "url": "https://api.github.com/repos/php-fig/log/zipball/4ebe3a8bf773a19edfe0a84b6585ba3d401b724d",
+            "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d",
             "shasum": ""
         },
         "require": {
             "php": ">=5.3.0"
         },
-        "time": "2021-05-03T11:20:27+00:00",
+        "time": "2016-10-10T12:19:37+00:00",
         "type": "library",
         "extra": {
             "branch-alias": {
-                "dev-master": "1.1.x-dev"
+                "dev-master": "1.0.x-dev"
             }
         },
         "installation-source": "dist",
@@ -395,7 +321,7 @@
         "authors": [
             {
                 "name": "PHP-FIG",
-                "homepage": "https://www.php-fig.org/"
+                "homepage": "http://www.php-fig.org/"
             }
         ],
         "description": "Common interface for logging libraries",
@@ -407,55 +333,86 @@
         ]
     },
     {
-        "name": "slim/slim",
-        "version": "4.13.0",
-        "version_normalized": "4.13.0.0",
+        "name": "psr/simple-cache",
+        "version": "1.0.1",
+        "version_normalized": "1.0.1.0",
         "source": {
             "type": "git",
-            "url": "https://github.com/slimphp/Slim.git",
-            "reference": "038fd5713d5a41636fdff0e8dcceedecdd17fc17"
+            "url": "https://github.com/php-fig/simple-cache.git",
+            "reference": "408d5eafb83c57f6365a3ca330ff23aa4a5fa39b"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/slimphp/Slim/zipball/038fd5713d5a41636fdff0e8dcceedecdd17fc17",
-            "reference": "038fd5713d5a41636fdff0e8dcceedecdd17fc17",
+            "url": "https://api.github.com/repos/php-fig/simple-cache/zipball/408d5eafb83c57f6365a3ca330ff23aa4a5fa39b",
+            "reference": "408d5eafb83c57f6365a3ca330ff23aa4a5fa39b",
             "shasum": ""
         },
         "require": {
-            "ext-json": "*",
-            "nikic/fast-route": "^1.3",
-            "php": "^7.4 || ^8.0",
-            "psr/container": "^1.0 || ^2.0",
-            "psr/http-factory": "^1.0",
-            "psr/http-message": "^1.1 || ^2.0",
-            "psr/http-server-handler": "^1.0",
-            "psr/http-server-middleware": "^1.0",
-            "psr/log": "^1.1 || ^2.0 || ^3.0"
+            "php": ">=5.3.0"
+        },
+        "time": "2017-10-23T01:57:42+00:00",
+        "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "1.0.x-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "psr-4": {
+                "Psr\\SimpleCache\\": "src/"
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "PHP-FIG",
+                "homepage": "http://www.php-fig.org/"
+            }
+        ],
+        "description": "Common interfaces for simple caching",
+        "keywords": [
+            "cache",
+            "caching",
+            "psr",
+            "psr-16",
+            "simple-cache"
+        ]
+    },
+    {
+        "name": "slim/slim",
+        "version": "3.9.2",
+        "version_normalized": "3.9.2.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/slimphp/Slim.git",
+            "reference": "4086d0106cf5a7135c69fce4161fe355a8feb118"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/slimphp/Slim/zipball/4086d0106cf5a7135c69fce4161fe355a8feb118",
+            "reference": "4086d0106cf5a7135c69fce4161fe355a8feb118",
+            "shasum": ""
+        },
+        "require": {
+            "container-interop/container-interop": "^1.2",
+            "nikic/fast-route": "^1.0",
+            "php": ">=5.5.0",
+            "pimple/pimple": "^3.0",
+            "psr/container": "^1.0",
+            "psr/http-message": "^1.0"
+        },
+        "provide": {
+            "psr/http-message-implementation": "1.0"
         },
         "require-dev": {
-            "adriansuter/php-autoload-override": "^1.4",
-            "ext-simplexml": "*",
-            "guzzlehttp/psr7": "^2.6",
-            "httpsoft/http-message": "^1.1",
-            "httpsoft/http-server-request": "^1.1",
-            "laminas/laminas-diactoros": "^2.17 || ^3",
-            "nyholm/psr7": "^1.8",
-            "nyholm/psr7-server": "^1.1",
-            "phpspec/prophecy": "^1.19",
-            "phpspec/prophecy-phpunit": "^2.1",
-            "phpstan/phpstan": "^1.10",
-            "phpunit/phpunit": "^9.6",
-            "slim/http": "^1.3",
-            "slim/psr7": "^1.6",
-            "squizlabs/php_codesniffer": "^3.9"
+            "phpunit/phpunit": "^4.0",
+            "squizlabs/php_codesniffer": "^2.5"
         },
-        "suggest": {
-            "ext-simplexml": "Needed to support XML format in BodyParsingMiddleware",
-            "ext-xml": "Needed to support XML format in BodyParsingMiddleware",
-            "php-di/php-di": "PHP-DI is the recommended container library to be used with Slim",
-            "slim/psr7": "Slim PSR-7 implementation. See https://www.slimframework.com/docs/v4/start/installation.html for more information."
-        },
-        "time": "2024-03-03T21:25:30+00:00",
+        "time": "2017-11-26T19:13:09+00:00",
         "type": "library",
         "installation-source": "dist",
         "autoload": {
@@ -468,101 +425,78 @@
             "MIT"
         ],
         "authors": [
-            {
-                "name": "Josh Lockhart",
-                "email": "hello@joshlockhart.com",
-                "homepage": "https://joshlockhart.com"
-            },
-            {
-                "name": "Andrew Smith",
-                "email": "a.smith@silentworks.co.uk",
-                "homepage": "http://silentworks.co.uk"
-            },
             {
                 "name": "Rob Allen",
                 "email": "rob@akrabat.com",
                 "homepage": "http://akrabat.com"
             },
             {
-                "name": "Pierre Berube",
-                "email": "pierre@lgse.com",
-                "homepage": "http://www.lgse.com"
+                "name": "Josh Lockhart",
+                "email": "hello@joshlockhart.com",
+                "homepage": "https://joshlockhart.com"
             },
             {
                 "name": "Gabriel Manricks",
                 "email": "gmanricks@me.com",
                 "homepage": "http://gabrielmanricks.com"
+            },
+            {
+                "name": "Andrew Smith",
+                "email": "a.smith@silentworks.co.uk",
+                "homepage": "http://silentworks.co.uk"
             }
         ],
         "description": "Slim is a PHP micro framework that helps you quickly write simple yet powerful web applications and APIs",
-        "homepage": "https://www.slimframework.com",
+        "homepage": "https://slimframework.com",
         "keywords": [
             "api",
             "framework",
             "micro",
             "router"
-        ],
-        "funding": [
-            {
-                "url": "https://opencollective.com/slimphp",
-                "type": "open_collective"
-            },
-            {
-                "url": "https://tidelift.com/funding/github/packagist/slim/slim",
-                "type": "tidelift"
-            }
         ]
     },
     {
         "name": "symfony/cache",
-        "version": "v4.4.48",
-        "version_normalized": "4.4.48.0",
+        "version": "v3.4.8",
+        "version_normalized": "3.4.8.0",
         "source": {
             "type": "git",
             "url": "https://github.com/symfony/cache.git",
-            "reference": "3b98ed664887ad197b8ede3da2432787212eb915"
+            "reference": "13255ddd056e49f3154747943f8ee175d555d394"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/symfony/cache/zipball/3b98ed664887ad197b8ede3da2432787212eb915",
-            "reference": "3b98ed664887ad197b8ede3da2432787212eb915",
+            "url": "https://api.github.com/repos/symfony/cache/zipball/13255ddd056e49f3154747943f8ee175d555d394",
+            "reference": "13255ddd056e49f3154747943f8ee175d555d394",
             "shasum": ""
         },
         "require": {
-            "php": ">=7.1.3",
-            "psr/cache": "^1.0|^2.0",
-            "psr/log": "^1|^2|^3",
-            "symfony/cache-contracts": "^1.1.7|^2",
-            "symfony/polyfill-php73": "^1.9",
-            "symfony/polyfill-php80": "^1.16",
-            "symfony/service-contracts": "^1.1|^2",
-            "symfony/var-exporter": "^4.2|^5.0"
+            "php": "^5.5.9|>=7.0.8",
+            "psr/cache": "~1.0",
+            "psr/log": "~1.0",
+            "psr/simple-cache": "^1.0",
+            "symfony/polyfill-apcu": "~1.1"
         },
         "conflict": {
-            "doctrine/dbal": "<2.7",
-            "symfony/dependency-injection": "<3.4",
-            "symfony/http-kernel": "<4.4|>=5.0",
-            "symfony/var-dumper": "<4.4"
+            "symfony/var-dumper": "<3.3"
         },
         "provide": {
-            "psr/cache-implementation": "1.0|2.0",
-            "psr/simple-cache-implementation": "1.0|2.0",
-            "symfony/cache-implementation": "1.0|2.0"
+            "psr/cache-implementation": "1.0",
+            "psr/simple-cache-implementation": "1.0"
         },
         "require-dev": {
             "cache/integration-tests": "dev-master",
-            "doctrine/cache": "^1.6|^2.0",
-            "doctrine/dbal": "^2.7|^3.0",
-            "predis/predis": "^1.1",
-            "psr/simple-cache": "^1.0|^2.0",
-            "symfony/config": "^4.2|^5.0",
-            "symfony/dependency-injection": "^3.4|^4.1|^5.0",
-            "symfony/filesystem": "^4.4|^5.0",
-            "symfony/http-kernel": "^4.4",
-            "symfony/var-dumper": "^4.4|^5.0"
+            "doctrine/cache": "~1.6",
+            "doctrine/dbal": "~2.4",
+            "predis/predis": "~1.0"
         },
-        "time": "2022-10-17T20:21:54+00:00",
+        "time": "2018-04-02T14:35:16+00:00",
         "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "3.4-dev"
+            }
+        },
         "installation-source": "dist",
         "autoload": {
             "psr-4": {
@@ -586,193 +520,39 @@
                 "homepage": "https://symfony.com/contributors"
             }
         ],
-        "description": "Provides extended PSR-6, PSR-16 (and tags) implementations",
+        "description": "Symfony Cache component with PSR-6, PSR-16, and tags",
         "homepage": "https://symfony.com",
         "keywords": [
             "caching",
             "psr6"
-        ],
-        "funding": [
-            {
-                "url": "https://symfony.com/sponsor",
-                "type": "custom"
-            },
-            {
-                "url": "https://github.com/fabpot",
-                "type": "github"
-            },
-            {
-                "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                "type": "tidelift"
-            }
-        ]
-    },
-    {
-        "name": "symfony/cache-contracts",
-        "version": "v2.5.2",
-        "version_normalized": "2.5.2.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/symfony/cache-contracts.git",
-            "reference": "64be4a7acb83b6f2bf6de9a02cee6dad41277ebc"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/symfony/cache-contracts/zipball/64be4a7acb83b6f2bf6de9a02cee6dad41277ebc",
-            "reference": "64be4a7acb83b6f2bf6de9a02cee6dad41277ebc",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=7.2.5",
-            "psr/cache": "^1.0|^2.0|^3.0"
-        },
-        "suggest": {
-            "symfony/cache-implementation": ""
-        },
-        "time": "2022-01-02T09:53:40+00:00",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-main": "2.5-dev"
-            },
-            "thanks": {
-                "name": "symfony/contracts",
-                "url": "https://github.com/symfony/contracts"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Symfony\\Contracts\\Cache\\": ""
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Nicolas Grekas",
-                "email": "p@tchwork.com"
-            },
-            {
-                "name": "Symfony Community",
-                "homepage": "https://symfony.com/contributors"
-            }
-        ],
-        "description": "Generic abstractions related to caching",
-        "homepage": "https://symfony.com",
-        "keywords": [
-            "abstractions",
-            "contracts",
-            "decoupling",
-            "interfaces",
-            "interoperability",
-            "standards"
-        ],
-        "funding": [
-            {
-                "url": "https://symfony.com/sponsor",
-                "type": "custom"
-            },
-            {
-                "url": "https://github.com/fabpot",
-                "type": "github"
-            },
-            {
-                "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                "type": "tidelift"
-            }
-        ]
-    },
-    {
-        "name": "symfony/deprecation-contracts",
-        "version": "v2.5.2",
-        "version_normalized": "2.5.2.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/symfony/deprecation-contracts.git",
-            "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/e8b495ea28c1d97b5e0c121748d6f9b53d075c66",
-            "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=7.1"
-        },
-        "time": "2022-01-02T09:53:40+00:00",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-main": "2.5-dev"
-            },
-            "thanks": {
-                "name": "symfony/contracts",
-                "url": "https://github.com/symfony/contracts"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "files": [
-                "function.php"
-            ]
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Nicolas Grekas",
-                "email": "p@tchwork.com"
-            },
-            {
-                "name": "Symfony Community",
-                "homepage": "https://symfony.com/contributors"
-            }
-        ],
-        "description": "A generic function and convention to trigger deprecation notices",
-        "homepage": "https://symfony.com",
-        "funding": [
-            {
-                "url": "https://symfony.com/sponsor",
-                "type": "custom"
-            },
-            {
-                "url": "https://github.com/fabpot",
-                "type": "github"
-            },
-            {
-                "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                "type": "tidelift"
-            }
         ]
     },
     {
         "name": "symfony/expression-language",
-        "version": "v3.4.47",
-        "version_normalized": "3.4.47.0",
+        "version": "v3.4.8",
+        "version_normalized": "3.4.8.0",
         "source": {
             "type": "git",
             "url": "https://github.com/symfony/expression-language.git",
-            "reference": "de38e66398fca1fcb9c48e80279910e6889cb28f"
+            "reference": "867e4d1f5d4e52435a8ffff6b24fd6a801582241"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/symfony/expression-language/zipball/de38e66398fca1fcb9c48e80279910e6889cb28f",
-            "reference": "de38e66398fca1fcb9c48e80279910e6889cb28f",
+            "url": "https://api.github.com/repos/symfony/expression-language/zipball/867e4d1f5d4e52435a8ffff6b24fd6a801582241",
+            "reference": "867e4d1f5d4e52435a8ffff6b24fd6a801582241",
             "shasum": ""
         },
         "require": {
             "php": "^5.5.9|>=7.0.8",
-            "symfony/cache": "~3.1|~4.0",
-            "symfony/polyfill-php70": "~1.6"
+            "symfony/cache": "~3.1|~4.0"
         },
-        "time": "2020-10-24T10:57:07+00:00",
+        "time": "2018-01-03T07:37:34+00:00",
         "type": "library",
+        "extra": {
+            "branch-alias": {
+                "dev-master": "3.4-dev"
+            }
+        },
         "installation-source": "dist",
         "autoload": {
             "psr-4": {
@@ -797,355 +577,40 @@
             }
         ],
         "description": "Symfony ExpressionLanguage Component",
-        "homepage": "https://symfony.com",
-        "funding": [
-            {
-                "url": "https://symfony.com/sponsor",
-                "type": "custom"
-            },
-            {
-                "url": "https://github.com/fabpot",
-                "type": "github"
-            },
-            {
-                "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                "type": "tidelift"
-            }
-        ]
+        "homepage": "https://symfony.com"
     },
     {
-        "name": "symfony/polyfill-php70",
-        "version": "v1.20.0",
-        "version_normalized": "1.20.0.0",
+        "name": "symfony/polyfill-apcu",
+        "version": "v1.7.0",
+        "version_normalized": "1.7.0.0",
         "source": {
             "type": "git",
-            "url": "https://github.com/symfony/polyfill-php70.git",
-            "reference": "5f03a781d984aae42cebd18e7912fa80f02ee644"
+            "url": "https://github.com/symfony/polyfill-apcu.git",
+            "reference": "e8ae2136ddb53dea314df56fcd88e318ab936c00"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/5f03a781d984aae42cebd18e7912fa80f02ee644",
-            "reference": "5f03a781d984aae42cebd18e7912fa80f02ee644",
+            "url": "https://api.github.com/repos/symfony/polyfill-apcu/zipball/e8ae2136ddb53dea314df56fcd88e318ab936c00",
+            "reference": "e8ae2136ddb53dea314df56fcd88e318ab936c00",
             "shasum": ""
         },
         "require": {
-            "php": ">=7.1"
+            "php": ">=5.3.3"
         },
-        "time": "2020-10-23T14:02:19+00:00",
-        "type": "metapackage",
-        "extra": {
-            "branch-alias": {
-                "dev-main": "1.20-dev"
-            },
-            "thanks": {
-                "name": "symfony/polyfill",
-                "url": "https://github.com/symfony/polyfill"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Nicolas Grekas",
-                "email": "p@tchwork.com"
-            },
-            {
-                "name": "Symfony Community",
-                "homepage": "https://symfony.com/contributors"
-            }
-        ],
-        "description": "Symfony polyfill backporting some PHP 7.0+ features to lower PHP versions",
-        "homepage": "https://symfony.com",
-        "keywords": [
-            "compatibility",
-            "polyfill",
-            "portable",
-            "shim"
-        ],
-        "funding": [
-            {
-                "url": "https://symfony.com/sponsor",
-                "type": "custom"
-            },
-            {
-                "url": "https://github.com/fabpot",
-                "type": "github"
-            },
-            {
-                "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                "type": "tidelift"
-            }
-        ]
-    },
-    {
-        "name": "symfony/polyfill-php73",
-        "version": "v1.29.0",
-        "version_normalized": "1.29.0.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/symfony/polyfill-php73.git",
-            "reference": "21bd091060673a1177ae842c0ef8fe30893114d2"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/21bd091060673a1177ae842c0ef8fe30893114d2",
-            "reference": "21bd091060673a1177ae842c0ef8fe30893114d2",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=7.1"
-        },
-        "time": "2024-01-29T20:11:03+00:00",
-        "type": "library",
-        "extra": {
-            "thanks": {
-                "name": "symfony/polyfill",
-                "url": "https://github.com/symfony/polyfill"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "files": [
-                "bootstrap.php"
-            ],
-            "psr-4": {
-                "Symfony\\Polyfill\\Php73\\": ""
-            },
-            "classmap": [
-                "Resources/stubs"
-            ]
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Nicolas Grekas",
-                "email": "p@tchwork.com"
-            },
-            {
-                "name": "Symfony Community",
-                "homepage": "https://symfony.com/contributors"
-            }
-        ],
-        "description": "Symfony polyfill backporting some PHP 7.3+ features to lower PHP versions",
-        "homepage": "https://symfony.com",
-        "keywords": [
-            "compatibility",
-            "polyfill",
-            "portable",
-            "shim"
-        ],
-        "funding": [
-            {
-                "url": "https://symfony.com/sponsor",
-                "type": "custom"
-            },
-            {
-                "url": "https://github.com/fabpot",
-                "type": "github"
-            },
-            {
-                "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                "type": "tidelift"
-            }
-        ]
-    },
-    {
-        "name": "symfony/polyfill-php80",
-        "version": "v1.29.0",
-        "version_normalized": "1.29.0.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/symfony/polyfill-php80.git",
-            "reference": "87b68208d5c1188808dd7839ee1e6c8ec3b02f1b"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/87b68208d5c1188808dd7839ee1e6c8ec3b02f1b",
-            "reference": "87b68208d5c1188808dd7839ee1e6c8ec3b02f1b",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=7.1"
-        },
-        "time": "2024-01-29T20:11:03+00:00",
-        "type": "library",
-        "extra": {
-            "thanks": {
-                "name": "symfony/polyfill",
-                "url": "https://github.com/symfony/polyfill"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "files": [
-                "bootstrap.php"
-            ],
-            "psr-4": {
-                "Symfony\\Polyfill\\Php80\\": ""
-            },
-            "classmap": [
-                "Resources/stubs"
-            ]
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Ion Bazan",
-                "email": "ion.bazan@gmail.com"
-            },
-            {
-                "name": "Nicolas Grekas",
-                "email": "p@tchwork.com"
-            },
-            {
-                "name": "Symfony Community",
-                "homepage": "https://symfony.com/contributors"
-            }
-        ],
-        "description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions",
-        "homepage": "https://symfony.com",
-        "keywords": [
-            "compatibility",
-            "polyfill",
-            "portable",
-            "shim"
-        ],
-        "funding": [
-            {
-                "url": "https://symfony.com/sponsor",
-                "type": "custom"
-            },
-            {
-                "url": "https://github.com/fabpot",
-                "type": "github"
-            },
-            {
-                "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                "type": "tidelift"
-            }
-        ]
-    },
-    {
-        "name": "symfony/service-contracts",
-        "version": "v2.5.2",
-        "version_normalized": "2.5.2.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/symfony/service-contracts.git",
-            "reference": "4b426aac47d6427cc1a1d0f7e2ac724627f5966c"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/symfony/service-contracts/zipball/4b426aac47d6427cc1a1d0f7e2ac724627f5966c",
-            "reference": "4b426aac47d6427cc1a1d0f7e2ac724627f5966c",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=7.2.5",
-            "psr/container": "^1.1",
-            "symfony/deprecation-contracts": "^2.1|^3"
-        },
-        "conflict": {
-            "ext-psr": "<1.1|>=2"
-        },
-        "suggest": {
-            "symfony/service-implementation": ""
-        },
-        "time": "2022-05-30T19:17:29+00:00",
+        "time": "2018-01-30T19:27:44+00:00",
         "type": "library",
         "extra": {
             "branch-alias": {
-                "dev-main": "2.5-dev"
-            },
-            "thanks": {
-                "name": "symfony/contracts",
-                "url": "https://github.com/symfony/contracts"
+                "dev-master": "1.7-dev"
             }
         },
         "installation-source": "dist",
         "autoload": {
             "psr-4": {
-                "Symfony\\Contracts\\Service\\": ""
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Nicolas Grekas",
-                "email": "p@tchwork.com"
+                "Symfony\\Polyfill\\Apcu\\": ""
             },
-            {
-                "name": "Symfony Community",
-                "homepage": "https://symfony.com/contributors"
-            }
-        ],
-        "description": "Generic abstractions related to writing services",
-        "homepage": "https://symfony.com",
-        "keywords": [
-            "abstractions",
-            "contracts",
-            "decoupling",
-            "interfaces",
-            "interoperability",
-            "standards"
-        ],
-        "funding": [
-            {
-                "url": "https://symfony.com/sponsor",
-                "type": "custom"
-            },
-            {
-                "url": "https://github.com/fabpot",
-                "type": "github"
-            },
-            {
-                "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                "type": "tidelift"
-            }
-        ]
-    },
-    {
-        "name": "symfony/var-exporter",
-        "version": "v5.4.35",
-        "version_normalized": "5.4.35.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/symfony/var-exporter.git",
-            "reference": "abb0a151b62d6b07e816487e20040464af96cae7"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/symfony/var-exporter/zipball/abb0a151b62d6b07e816487e20040464af96cae7",
-            "reference": "abb0a151b62d6b07e816487e20040464af96cae7",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=7.2.5",
-            "symfony/polyfill-php80": "^1.16"
-        },
-        "require-dev": {
-            "symfony/var-dumper": "^4.4.9|^5.0.9|^6.0"
-        },
-        "time": "2024-01-23T13:51:25+00:00",
-        "type": "library",
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Symfony\\Component\\VarExporter\\": ""
-            },
-            "exclude-from-classmap": [
-                "/Tests/"
+            "files": [
+                "bootstrap.php"
             ]
         },
         "notification-url": "https://packagist.org/downloads/",
@@ -1162,29 +627,14 @@
                 "homepage": "https://symfony.com/contributors"
             }
         ],
-        "description": "Allows exporting any serializable PHP data structure to plain PHP code",
+        "description": "Symfony polyfill backporting apcu_* functions to lower PHP versions",
         "homepage": "https://symfony.com",
         "keywords": [
-            "clone",
-            "construct",
-            "export",
-            "hydrate",
-            "instantiate",
-            "serialize"
-        ],
-        "funding": [
-            {
-                "url": "https://symfony.com/sponsor",
-                "type": "custom"
-            },
-            {
-                "url": "https://github.com/fabpot",
-                "type": "github"
-            },
-            {
-                "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
-                "type": "tidelift"
-            }
+            "apcu",
+            "compatibility",
+            "polyfill",
+            "portable",
+            "shim"
         ]
     }
 ]
diff --git a/advancedcontentfilter/vendor/container-interop/container-interop/.gitignore b/advancedcontentfilter/vendor/container-interop/container-interop/.gitignore
new file mode 100644
index 00000000..b2395aa0
--- /dev/null
+++ b/advancedcontentfilter/vendor/container-interop/container-interop/.gitignore
@@ -0,0 +1,3 @@
+composer.lock
+composer.phar
+/vendor/
diff --git a/advancedcontentfilter/vendor/container-interop/container-interop/LICENSE b/advancedcontentfilter/vendor/container-interop/container-interop/LICENSE
new file mode 100644
index 00000000..7671d902
--- /dev/null
+++ b/advancedcontentfilter/vendor/container-interop/container-interop/LICENSE
@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2013 container-interop
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/advancedcontentfilter/vendor/container-interop/container-interop/README.md b/advancedcontentfilter/vendor/container-interop/container-interop/README.md
new file mode 100644
index 00000000..cdd7a44c
--- /dev/null
+++ b/advancedcontentfilter/vendor/container-interop/container-interop/README.md
@@ -0,0 +1,148 @@
+# Container Interoperability
+
+[![Latest Stable Version](https://poser.pugx.org/container-interop/container-interop/v/stable.png)](https://packagist.org/packages/container-interop/container-interop)
+[![Total Downloads](https://poser.pugx.org/container-interop/container-interop/downloads.svg)](https://packagist.org/packages/container-interop/container-interop)
+
+## Deprecation warning!
+
+Starting Feb. 13th 2017, container-interop is officially deprecated in favor of [PSR-11](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-11-container.md).
+Container-interop has been the test-bed of PSR-11. From v1.2, container-interop directly extends PSR-11 interfaces.
+Therefore, all containers implementing container-interop are now *de-facto* compatible with PSR-11.
+
+- Projects implementing container-interop interfaces are encouraged to directly implement PSR-11 interfaces instead.
+- Projects consuming container-interop interfaces are very strongly encouraged to directly type-hint on PSR-11 interfaces, in order to be compatible with PSR-11 containers that are not compatible with container-interop.
+
+Regarding the delegate lookup feature, that is present in container-interop and not in PSR-11, the feature is actually a design pattern. It is therefore not deprecated. Documentation regarding this design pattern will be migrated from this repository into a separate website in the future.
+
+## About
+
+*container-interop* tries to identify and standardize features in *container* objects (service locators,
+dependency injection containers, etc.) to achieve interoperability.
+
+Through discussions and trials, we try to create a standard, made of common interfaces but also recommendations.
+
+If PHP projects that provide container implementations begin to adopt these common standards, then PHP
+applications and projects that use containers can depend on the common interfaces instead of specific
+implementations. This facilitates a high-level of interoperability and flexibility that allows users to consume
+*any* container implementation that can be adapted to these interfaces.
+
+The work done in this project is not officially endorsed by the [PHP-FIG](http://www.php-fig.org/), but it is being
+worked on by members of PHP-FIG and other good developers. We adhere to the spirit and ideals of PHP-FIG, and hope
+this project will pave the way for one or more future PSRs.
+
+
+## Installation
+
+You can install this package through Composer:
+
+```json
+composer require container-interop/container-interop
+```
+
+The packages adheres to the [SemVer](http://semver.org/) specification, and there will be full backward compatibility
+between minor versions.
+
+## Standards
+
+### Available
+
+- [`ContainerInterface`](src/Interop/Container/ContainerInterface.php).
+[Description](docs/ContainerInterface.md) [Meta Document](docs/ContainerInterface-meta.md).
+Describes the interface of a container that exposes methods to read its entries.
+- [*Delegate lookup feature*](docs/Delegate-lookup.md).
+[Meta Document](docs/Delegate-lookup-meta.md).
+Describes the ability for a container to delegate the lookup of its dependencies to a third-party container. This
+feature lets several containers work together in a single application.
+
+### Proposed
+
+View open [request for comments](https://github.com/container-interop/container-interop/labels/RFC)
+
+## Compatible projects
+
+### Projects implementing `ContainerInterface`
+
+- [Acclimate](https://github.com/jeremeamia/acclimate-container): Adapters for
+  Aura.Di, Laravel, Nette DI, Pimple, Symfony DI, ZF2 Service manager, ZF2
+  Dependency injection and any container using `ArrayAccess`
+- [Aura.Di](https://github.com/auraphp/Aura.Di)
+- [auryn-container-interop](https://github.com/elazar/auryn-container-interop)
+- [Burlap](https://github.com/codeeverything/burlap)
+- [Chernozem](https://github.com/pyrsmk/Chernozem)
+- [Data Manager](https://github.com/chrismichaels84/data-manager)
+- [Disco](https://github.com/bitexpert/disco)
+- [InDI](https://github.com/idealogica/indi)
+- [League/Container](http://container.thephpleague.com/)
+- [Mouf](http://mouf-php.com)
+- [Njasm Container](https://github.com/njasm/container)
+- [PHP-DI](http://php-di.org)
+- [Picotainer](https://github.com/thecodingmachine/picotainer)
+- [PimpleInterop](https://github.com/moufmouf/pimple-interop)
+- [Pimple3-ContainerInterop](https://github.com/Sam-Burns/pimple3-containerinterop) (using Pimple v3)
+- [SitePoint Container](https://github.com/sitepoint/Container)
+- [Thruster Container](https://github.com/ThrusterIO/container) (PHP7 only)
+- [Ultra-Lite Container](https://github.com/ultra-lite/container)
+- [Unbox](https://github.com/mindplay-dk/unbox)
+- [XStatic](https://github.com/jeremeamia/xstatic)
+- [Zend\ServiceManager](https://github.com/zendframework/zend-servicemanager)
+- [Zit](https://github.com/inxilpro/Zit)
+
+### Projects implementing the *delegate lookup* feature
+
+- [Aura.Di](https://github.com/auraphp/Aura.Di)
+- [Burlap](https://github.com/codeeverything/burlap)
+- [Chernozem](https://github.com/pyrsmk/Chernozem)
+- [InDI](https://github.com/idealogica/indi)
+- [League/Container](http://container.thephpleague.com/)
+- [Mouf](http://mouf-php.com)
+- [Picotainer](https://github.com/thecodingmachine/picotainer)
+- [PHP-DI](http://php-di.org)
+- [PimpleInterop](https://github.com/moufmouf/pimple-interop)
+- [Ultra-Lite Container](https://github.com/ultra-lite/container)
+
+### Middlewares implementing `ContainerInterface`
+
+- [Alias-Container](https://github.com/thecodingmachine/alias-container): add
+  aliases support to any container
+- [Prefixer-Container](https://github.com/thecodingmachine/prefixer-container):
+  dynamically prefix identifiers
+- [Lazy-Container](https://github.com/snapshotpl/lazy-container): lazy services
+
+### Projects using `ContainerInterface`
+
+The list below contains only a sample of all the projects consuming `ContainerInterface`. For a more complete list have a look [here](http://packanalyst.com/class?q=Interop%5CContainer%5CContainerInterface).
+
+| | Downloads |
+| --- | --- |
+| [Adroit](https://github.com/bitexpert/adroit) | ![](https://img.shields.io/packagist/dt/bitexpert/adroit.svg) |
+| [Behat](https://github.com/Behat/Behat/pull/974) | ![](https://img.shields.io/packagist/dt/behat/behat.svg) |
+| [blast-facades](https://github.com/phpthinktank/blast-facades): Minimize complexity and represent dependencies as facades. | ![](https://img.shields.io/packagist/dt/blast/facades.svg) |
+| [interop.silex.di](https://github.com/thecodingmachine/interop.silex.di): an extension to [Silex](http://silex.sensiolabs.org/) that adds support for any *container-interop* compatible container | ![](https://img.shields.io/packagist/dt/mouf/interop.silex.di.svg) |
+| [mindplay/walkway](https://github.com/mindplay-dk/walkway): a modular request router | ![](https://img.shields.io/packagist/dt/mindplay/walkway.svg) |
+| [mindplay/middleman](https://github.com/mindplay-dk/middleman): minimalist PSR-7 middleware dispatcher | ![](https://img.shields.io/packagist/dt/mindplay/middleman.svg) |
+| [PHP-DI/Invoker](https://github.com/PHP-DI/Invoker): extensible and configurable invoker/dispatcher | ![](https://img.shields.io/packagist/dt/php-di/invoker.svg) |
+| [Prophiler](https://github.com/fabfuel/prophiler) | ![](https://img.shields.io/packagist/dt/fabfuel/prophiler.svg) |
+| [Silly](https://github.com/mnapoli/silly): CLI micro-framework | ![](https://img.shields.io/packagist/dt/mnapoli/silly.svg) |
+| [Slim v3](https://github.com/slimphp/Slim) | ![](https://img.shields.io/packagist/dt/slim/slim.svg) |
+| [Splash](http://mouf-php.com/packages/mouf/mvc.splash-common/version/8.0-dev/README.md) | ![](https://img.shields.io/packagist/dt/mouf/mvc.splash-common.svg) |
+| [Woohoo Labs. Harmony](https://github.com/woohoolabs/harmony): a flexible micro-framework | ![](https://img.shields.io/packagist/dt/woohoolabs/harmony.svg) |
+| [zend-expressive](https://github.com/zendframework/zend-expressive) | ![](https://img.shields.io/packagist/dt/zendframework/zend-expressive.svg) |
+
+
+## Workflow
+
+Everyone is welcome to join and contribute.
+
+The general workflow looks like this:
+
+1. Someone opens a discussion (GitHub issue) to suggest an interface
+1. Feedback is gathered
+1. The interface is added to a development branch
+1. We release alpha versions so that the interface can be experimented with
+1. Discussions and edits ensue until the interface is deemed stable by a general consensus
+1. A new minor version of the package is released
+
+We try to not break BC by creating new interfaces instead of editing existing ones.
+
+While we currently work on interfaces, we are open to anything that might help towards interoperability, may that
+be code, best practices, etc.
diff --git a/advancedcontentfilter/vendor/container-interop/container-interop/composer.json b/advancedcontentfilter/vendor/container-interop/container-interop/composer.json
new file mode 100644
index 00000000..855f7667
--- /dev/null
+++ b/advancedcontentfilter/vendor/container-interop/container-interop/composer.json
@@ -0,0 +1,15 @@
+{
+    "name": "container-interop/container-interop",
+    "type": "library",
+    "description": "Promoting the interoperability of container objects (DIC, SL, etc.)",
+    "homepage": "https://github.com/container-interop/container-interop",
+    "license": "MIT",
+    "autoload": {
+        "psr-4": {
+            "Interop\\Container\\": "src/Interop/Container/"
+        }
+    },
+    "require": {
+        "psr/container": "^1.0"
+    }
+}
diff --git a/advancedcontentfilter/vendor/container-interop/container-interop/docs/ContainerInterface-meta.md b/advancedcontentfilter/vendor/container-interop/container-interop/docs/ContainerInterface-meta.md
new file mode 100644
index 00000000..59f3d559
--- /dev/null
+++ b/advancedcontentfilter/vendor/container-interop/container-interop/docs/ContainerInterface-meta.md
@@ -0,0 +1,114 @@
+# ContainerInterface Meta Document
+
+## Introduction
+
+This document describes the process and discussions that lead to the `ContainerInterface`.
+Its goal is to explain the reasons behind each decision.
+
+## Goal
+
+The goal set by `ContainerInterface` is to standardize how frameworks and libraries make use of a
+container to obtain objects and parameters.
+
+By standardizing such a behavior, frameworks and libraries using the `ContainerInterface`
+could work with any compatible container.
+That would allow end users to choose their own container based on their own preferences.
+
+It is important to distinguish the two usages of a container:
+
+- configuring entries
+- fetching entries
+
+Most of the time, those two sides are not used by the same party.
+While it is often end users who tend to configure entries, it is generally the framework that fetch
+entries to build the application.
+
+This is why this interface focuses only on how entries can be fetched from a container.
+
+## Interface name
+
+The interface name has been thoroughly discussed and was decided by a vote.
+
+The list of options considered with their respective votes are:
+
+- `ContainerInterface`: +8
+- `ProviderInterface`: +2
+- `LocatorInterface`: 0
+- `ReadableContainerInterface`: -5
+- `ServiceLocatorInterface`: -6
+- `ObjectFactory`: -6
+- `ObjectStore`: -8
+- `ConsumerInterface`: -9
+
+[Full results of the vote](https://github.com/container-interop/container-interop/wiki/%231-interface-name:-Vote)
+
+The complete discussion can be read in [the issue #1](https://github.com/container-interop/container-interop/issues/1).
+
+## Interface methods
+
+The choice of which methods the interface would contain was made after a statistical analysis of existing containers.
+The results of this analysis are available [in this document](https://gist.github.com/mnapoli/6159681).
+
+The summary of the analysis showed that:
+
+- all containers offer a method to get an entry by its id
+- a large majority name such method `get()`
+- for all containers, the `get()` method has 1 mandatory parameter of type string
+- some containers have an optional additional argument for `get()`, but it doesn't have the same purpose between containers
+- a large majority of the containers offer a method to test if it can return an entry by its id
+- a majority name such method `has()`
+- for all containers offering `has()`, the method has exactly 1 parameter of type string
+- a large majority of the containers throw an exception rather than returning null when an entry is not found in `get()`
+- a large majority of the containers don't implement `ArrayAccess`
+
+The question of whether to include methods to define entries has been discussed in
+[issue #1](https://github.com/container-interop/container-interop/issues/1).
+It has been judged that such methods do not belong in the interface described here because it is out of its scope
+(see the "Goal" section).
+
+As a result, the `ContainerInterface` contains two methods:
+
+- `get()`, returning anything, with one mandatory string parameter. Should throw an exception if the entry is not found.
+- `has()`, returning a boolean, with one mandatory string parameter.
+
+### Number of parameters in `get()` method
+
+While `ContainerInterface` only defines one mandatory parameter in `get()`, it is not incompatible with
+existing containers that have additional optional parameters. PHP allows an implementation to offer more parameters
+as long as they are optional, because the implementation *does* satisfy the interface.
+
+This issue has been discussed in [issue #6](https://github.com/container-interop/container-interop/issues/6).
+
+### Type of the `$id` parameter
+
+The type of the `$id` parameter in `get()` and `has()` has been discussed in
+[issue #6](https://github.com/container-interop/container-interop/issues/6).
+While `string` is used in all the containers that were analyzed, it was suggested that allowing
+anything (such as objects) could allow containers to offer a more advanced query API.
+
+An example given was to use the container as an object builder. The `$id` parameter would then be an
+object that would describe how to create an instance.
+
+The conclusion of the discussion was that this was beyond the scope of getting entries from a container without
+knowing how the container provided them, and it was more fit for a factory.
+
+## Contributors
+
+Are listed here all people that contributed in the discussions or votes, by alphabetical order:
+
+- [Amy Stephen](https://github.com/AmyStephen)
+- [David Négrier](https://github.com/moufmouf)
+- [Don Gilbert](https://github.com/dongilbert)
+- [Jason Judge](https://github.com/judgej)
+- [Jeremy Lindblom](https://github.com/jeremeamia)
+- [Marco Pivetta](https://github.com/Ocramius)
+- [Matthieu Napoli](https://github.com/mnapoli)
+- [Paul M. Jones](https://github.com/pmjones)
+- [Stephan Hochdörfer](https://github.com/shochdoerfer)
+- [Taylor Otwell](https://github.com/taylorotwell)
+
+## Relevant links
+
+- [`ContainerInterface.php`](https://github.com/container-interop/container-interop/blob/master/src/Interop/Container/ContainerInterface.php)
+- [List of all issues](https://github.com/container-interop/container-interop/issues?labels=ContainerInterface&milestone=&page=1&state=closed)
+- [Vote for the interface name](https://github.com/container-interop/container-interop/wiki/%231-interface-name:-Vote)
diff --git a/advancedcontentfilter/vendor/container-interop/container-interop/docs/ContainerInterface.md b/advancedcontentfilter/vendor/container-interop/container-interop/docs/ContainerInterface.md
new file mode 100644
index 00000000..bda973d6
--- /dev/null
+++ b/advancedcontentfilter/vendor/container-interop/container-interop/docs/ContainerInterface.md
@@ -0,0 +1,158 @@
+Container interface
+===================
+
+This document describes a common interface for dependency injection containers.
+
+The goal set by `ContainerInterface` is to standardize how frameworks and libraries make use of a
+container to obtain objects and parameters (called *entries* in the rest of this document).
+
+The key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT", "SHOULD",
+"SHOULD NOT", "RECOMMENDED", "MAY", and "OPTIONAL" in this document are to be
+interpreted as described in [RFC 2119][].
+
+The word `implementor` in this document is to be interpreted as someone
+implementing the `ContainerInterface` in a dependency injection-related library or framework.
+Users of dependency injections containers (DIC) are referred to as `user`.
+
+[RFC 2119]: http://tools.ietf.org/html/rfc2119
+
+1. Specification
+-----------------
+
+### 1.1 Basics
+
+- The `Interop\Container\ContainerInterface` exposes two methods : `get` and `has`.
+
+- `get` takes one mandatory parameter: an entry identifier. It MUST be a string.
+  A call to `get` can return anything (a *mixed* value), or throws an exception if the identifier
+  is not known to the container. Two successive calls to `get` with the same
+  identifier SHOULD return the same value. However, depending on the `implementor`
+  design and/or `user` configuration, different values might be returned, so
+  `user` SHOULD NOT rely on getting the same value on 2 successive calls.
+  While `ContainerInterface` only defines one mandatory parameter in `get()`, implementations
+  MAY accept additional optional parameters.
+
+- `has` takes one unique parameter: an entry identifier. It MUST return `true`
+  if an entry identifier is known to the container and `false` if it is not.
+  `has($id)` returning true does not mean that `get($id)` will not throw an exception.
+  It does however mean that `get($id)` will not throw a `NotFoundException`.
+
+### 1.2 Exceptions
+
+Exceptions directly thrown by the container MUST implement the
+[`Interop\Container\Exception\ContainerException`](../src/Interop/Container/Exception/ContainerException.php).
+
+A call to the `get` method with a non-existing id SHOULD throw a
+[`Interop\Container\Exception\NotFoundException`](../src/Interop/Container/Exception/NotFoundException.php).
+
+### 1.3 Additional features
+
+This section describes additional features that MAY be added to a container. Containers are not
+required to implement these features to respect the ContainerInterface.
+
+#### 1.3.1 Delegate lookup feature
+
+The goal of the *delegate lookup* feature is to allow several containers to share entries.
+Containers implementing this feature can perform dependency lookups in other containers.
+
+Containers implementing this feature will offer a greater lever of interoperability
+with other containers. Implementation of this feature is therefore RECOMMENDED.
+
+A container implementing this feature:
+
+- MUST implement the `ContainerInterface`
+- MUST provide a way to register a delegate container (using a constructor parameter, or a setter,
+  or any possible way). The delegate container MUST implement the `ContainerInterface`.
+
+When a container is configured to use a delegate container for dependencies:
+
+- Calls to the `get` method should only return an entry if the entry is part of the container.
+  If the entry is not part of the container, an exception should be thrown
+  (as requested by the `ContainerInterface`).
+- Calls to the `has` method should only return `true` if the entry is part of the container.
+  If the entry is not part of the container, `false` should be returned.
+- If the fetched entry has dependencies, **instead** of performing
+  the dependency lookup in the container, the lookup is performed on the *delegate container*.
+
+Important! By default, the lookup SHOULD be performed on the delegate container **only**, not on the container itself.
+
+It is however allowed for containers to provide exception cases for special entries, and a way to lookup
+into the same container (or another container) instead of the delegate container.
+
+2. Package
+----------
+
+The interfaces and classes described as well as relevant exception are provided as part of the
+[container-interop/container-interop](https://packagist.org/packages/container-interop/container-interop) package.
+
+3. `Interop\Container\ContainerInterface`
+-----------------------------------------
+
+```php
+<?php
+namespace Interop\Container;
+
+use Interop\Container\Exception\ContainerException;
+use Interop\Container\Exception\NotFoundException;
+
+/**
+ * Describes the interface of a container that exposes methods to read its entries.
+ */
+interface ContainerInterface
+{
+    /**
+     * Finds an entry of the container by its identifier and returns it.
+     *
+     * @param string $id Identifier of the entry to look for.
+     *
+     * @throws NotFoundException  No entry was found for this identifier.
+     * @throws ContainerException Error while retrieving the entry.
+     *
+     * @return mixed Entry.
+     */
+    public function get($id);
+
+    /**
+     * Returns true if the container can return an entry for the given identifier.
+     * Returns false otherwise.
+     *
+     * `has($id)` returning true does not mean that `get($id)` will not throw an exception.
+     * It does however mean that `get($id)` will not throw a `NotFoundException`.
+     *
+     * @param string $id Identifier of the entry to look for.
+     *
+     * @return boolean
+     */
+    public function has($id);
+}
+```
+
+4. `Interop\Container\Exception\ContainerException`
+---------------------------------------------------
+
+```php
+<?php
+namespace Interop\Container\Exception;
+
+/**
+ * Base interface representing a generic exception in a container.
+ */
+interface ContainerException
+{
+}
+```
+
+5. `Interop\Container\Exception\NotFoundException`
+---------------------------------------------------
+
+```php
+<?php
+namespace Interop\Container\Exception;
+
+/**
+ * No entry was found in the container.
+ */
+interface NotFoundException extends ContainerException
+{
+}
+```
diff --git a/advancedcontentfilter/vendor/container-interop/container-interop/docs/Delegate-lookup-meta.md b/advancedcontentfilter/vendor/container-interop/container-interop/docs/Delegate-lookup-meta.md
new file mode 100644
index 00000000..6048b73e
--- /dev/null
+++ b/advancedcontentfilter/vendor/container-interop/container-interop/docs/Delegate-lookup-meta.md
@@ -0,0 +1,259 @@
+Delegate lookup feature Meta Document
+=====================================
+
+1. Summary
+----------
+
+This document describes the *delegate lookup feature*.
+Containers are not required to implement this feature to respect the `ContainerInterface`.
+However, containers implementing this feature will offer a greater lever of interoperability
+with other containers, allowing multiple containers to share entries in the same application.
+Implementation of this feature is therefore recommanded.
+
+2. Why Bother?
+--------------
+
+The [`ContainerInterface`](../src/Interop/Container/ContainerInterface.php) ([meta doc](ContainerInterface.md))
+standardizes how frameworks and libraries make use of a container to obtain objects and parameters.
+
+By standardizing such a behavior, frameworks and libraries relying on the `ContainerInterface`
+could work with any compatible container.
+That would allow end users to choose their own container based on their own preferences.
+
+The `ContainerInterface` is also enough if we want to have several containers side-by-side in the same
+application. For instance, this is what the [CompositeContainer](https://github.com/jeremeamia/acclimate-container/blob/master/src/CompositeContainer.php) 
+class of [Acclimate](https://github.com/jeremeamia/acclimate-container) is designed for:
+
+![Side by side containers](images/side_by_side_containers.png)
+
+However, an instance in container 1 cannot reference an instance in container 2.
+
+It would be better if an instance of container 1 could reference an instance in container 2,
+and the opposite should be true. 
+
+![Interoperating containers](images/interoperating_containers.png)
+
+In the sample above, entry 1 in container 1 is referencing entry 3 in container 2.
+
+3. Scope
+--------
+
+### 3.1 Goals
+
+The goal of the *delegate lookup* feature is to allow several containers to share entries.
+
+4. Approaches
+-------------
+
+### 4.1 Chosen Approach
+
+Containers implementing this feature can perform dependency lookups in other containers.
+
+A container implementing this feature:
+
+- must implement the `ContainerInterface`
+- must provide a way to register a *delegate container* (using a constructor parameter, or a setter, or any
+possible way). The *delegate container* must implement the `ContainerInterface`.
+
+When a *delegate container* is configured on a container:
+
+- Calls to the `get` method should only return an entry if the entry is part of the container.
+If the entry is not part of the container, an exception should be thrown (as required in the `ContainerInterface`).
+- Calls to the `has` method should only return *true* if the entry is part of the container.
+If the entry is not part of the container, *false* should be returned.
+ - Finally, the important part: if the entry we are fetching has dependencies,
+**instead** of perfoming the dependency lookup in the container, the lookup is performed on the *delegate container*.
+
+Important! By default, the lookup should be performed on the delegate container **only**, not on the container itself.
+
+It is however allowed for containers to provide exception cases for special entries, and a way to lookup into 
+the same container (or another container) instead of the delegate container.
+
+### 4.2 Typical usage
+
+The *delegate container* will usually be a composite container. A composite container is a container that
+contains several other containers. When performing a lookup on a composite container, the inner containers are 
+queried until one container returns an entry.
+An inner container implementing the *delegate lookup feature* will return entries it contains, but if these
+entries have dependencies, the dependencies lookup calls will be performed on the composite container, giving
+a chance to all containers to answer.
+
+Interestingly enough, the order in which containers are added in the composite container matters. Indeed,
+the first containers to be added in the composite container can "override" the entries of containers with
+lower priority.
+
+![Containers priority](images/priority.png)
+
+In the example above, "container 2" contains a controller "myController" and the controller is referencing an 
+"entityManager" entry. "Container 1" contains also an entry named "entityManager".
+Without the *delegate lookup* feature, when requesting the "myController" instance to container 2, it would take 
+in charge the instanciation of both entries.
+
+However, using the *delegate lookup* feature, here is what happens when we ask the composite container for the 
+"myController" instance:
+
+- The composite container asks container 1 if if contains the "myController" instance. The answer is no.
+- The composite container asks container 2 if if contains the "myController" instance. The answer is yes.
+- The composite container performs a `get` call on container 2 for the "myController" instance.
+- Container 2 sees that "myController" has a dependency on "entityManager".
+- Container 2 delegates the lookup of "entityManager" to the composite container.
+- The composite container asks container 1 if if contains the "entityManager" instance. The answer is yes.
+- The composite container performs a `get` call on container 1 for the "entityManager" instance.
+
+In the end, we get a controller instanciated by container 2 that references an entityManager instanciated
+by container 1.
+
+### 4.3 Alternative: the fallback strategy
+
+The first proposed approach we tried was to perform all the lookups in the "local" container,
+and if a lookup fails in the container, to use the delegate container. In this scenario, the
+delegate container is used in "fallback" mode.
+
+This strategy has been described in @moufmouf blog post: http://mouf-php.com/container-interop-whats-next (solution 1).
+It was also discussed [here](https://github.com/container-interop/container-interop/pull/8#issuecomment-33570697) and
+[here](https://github.com/container-interop/container-interop/pull/20#issuecomment-56599631).
+
+Problems with this strategy:
+
+- Heavy problem regarding infinite loops
+- Unable to overload a container entry with the delegate container entry
+
+### 4.4 Alternative: force implementing an interface
+
+The first proposed approach was to develop a `ParentAwareContainerInterface` interface.
+It was proposed here: https://github.com/container-interop/container-interop/pull/8
+
+The interface would have had the behaviour of the delegate lookup feature but would have forced the addition of
+a `setParentContainter` method:
+
+```php
+interface ParentAwareContainerInterface extends ReadableContainerInterface {
+    /**
+     * Sets the parent container associated to that container. This container will call
+     * the parent container to fetch dependencies.
+     *
+     * @param ContainerInterface $container
+     */
+    public function setParentContainer(ContainerInterface $container);
+}
+```
+
+The interface idea was first questioned by @Ocramius [here](https://github.com/container-interop/container-interop/pull/8#issuecomment-51721777).
+@Ocramius expressed the idea that an interface should not contain setters, otherwise, it is forcing implementation
+details on the class implementing the interface. 
+Then @mnapoli made a proposal for a "convention" [here](https://github.com/container-interop/container-interop/pull/8#issuecomment-51841079),
+this idea was further discussed until all participants in the discussion agreed to remove the interface idea
+and replace it with a "standard" feature.
+
+**Pros:**
+
+If we had had an interface, we could have delegated the registration of the delegate/composite container to the
+the delegate/composite container itself.
+For instance:
+
+```php
+$containerA = new ContainerA();
+$containerB = new ContainerB();
+
+$compositeContainer = new CompositeContainer([$containerA, $containerB]);
+
+// The call to 'setParentContainer' is delegated to the CompositeContainer
+// It is not the responsibility of the user anymore.
+class CompositeContainer {
+	...
+	
+	public function __construct($containers) {
+		foreach ($containers as $container) {
+			if ($container instanceof ParentAwareContainerInterface) {
+				$container->setParentContainer($this);
+			}
+		}
+		...
+	}
+}
+
+``` 
+
+**Cons:**
+
+Cons have been extensively discussed [here](https://github.com/container-interop/container-interop/pull/8#issuecomment-51721777).
+Basically, forcing a setter into an interface is a bad idea. Setters are similar to constructor arguments,
+and it's a bad idea to standardize a constructor: how the delegate container is configured into a container is an implementation detail. This outweights the benefits of the interface.
+
+### 4.4 Alternative: no exception case for delegate lookups
+
+Originally, the proposed wording for delegate lookup calls was:
+
+> Important! The lookup MUST be performed on the delegate container **only**, not on the container itself.
+
+This was later replaced by:
+
+> Important! By default, the lookup SHOULD be performed on the delegate container **only**, not on the container itself.
+>
+> It is however allowed for containers to provide exception cases for special entries, and a way to lookup 
+> into the same container (or another container) instead of the delegate container.
+
+Exception cases have been allowed to avoid breaking dependencies with some services that must be provided
+by the container (on @njasm proposal). This was proposed here: https://github.com/container-interop/container-interop/pull/20#issuecomment-56597235
+
+### 4.5 Alternative: having one of the containers act as the composite container
+
+In real-life scenarios, we usually have a big framework (Symfony 2, Zend Framework 2, etc...) and we want to
+add another DI container to this container. Most of the time, the "big" framework will be responsible for
+creating the controller's instances, using it's own DI container. Until *container-interop* is fully adopted,
+the "big" framework will not be aware of the existence of a composite container that it should use instead
+of its own container.
+
+For this real-life use cases, @mnapoli and @moufmouf proposed to extend the "big" framework's DI container
+to make it act as a composite container.
+
+This has been discussed [here](https://github.com/container-interop/container-interop/pull/8#issuecomment-40367194) 
+and [here](http://mouf-php.com/container-interop-whats-next#solution4).
+
+This was implemented in Symfony 2 using:
+
+- [interop.symfony.di](https://github.com/thecodingmachine/interop.symfony.di/tree/v0.1.0)
+- [framework interop](https://github.com/mnapoli/framework-interop/)
+
+This was implemented in Silex using:
+
+- [interop.silex.di](https://github.com/thecodingmachine/interop.silex.di)
+
+Having a container act as the composite container is not part of the delegate lookup standard because it is
+simply a temporary design pattern used to make existing frameworks that do not support yet ContainerInterop
+play nice with other DI containers.
+
+
+5. Implementations
+------------------
+
+The following projects already implement the delegate lookup feature:
+
+- [Mouf](http://mouf-php.com), through the [`setDelegateLookupContainer` method](https://github.com/thecodingmachine/mouf/blob/2.0/src/Mouf/MoufManager.php#L2120)
+- [PHP-DI](http://php-di.org/), through the [`$wrapperContainer` parameter of the constructor](https://github.com/mnapoli/PHP-DI/blob/master/src/DI/Container.php#L72)
+- [pimple-interop](https://github.com/moufmouf/pimple-interop), through the [`$container` parameter of the constructor](https://github.com/moufmouf/pimple-interop/blob/master/src/Interop/Container/Pimple/PimpleInterop.php#L62)
+
+6. People
+---------
+
+Are listed here all people that contributed in the discussions, by alphabetical order:
+
+- [Alexandru Pătrănescu](https://github.com/drealecs)
+- [Ben Peachey](https://github.com/potherca)
+- [David Négrier](https://github.com/moufmouf)
+- [Jeremy Lindblom](https://github.com/jeremeamia)
+- [Marco Pivetta](https://github.com/Ocramius)
+- [Matthieu Napoli](https://github.com/mnapoli)
+- [Nelson J Morais](https://github.com/njasm)
+- [Phil Sturgeon](https://github.com/philsturgeon)
+- [Stephan Hochdörfer](https://github.com/shochdoerfer)
+
+7. Relevant Links
+-----------------
+
+_**Note:** Order descending chronologically._
+
+- [Pull request on the delegate lookup feature](https://github.com/container-interop/container-interop/pull/20)
+- [Pull request on the interface idea](https://github.com/container-interop/container-interop/pull/8)
+- [Original article exposing the delegate lookup idea along many others](http://mouf-php.com/container-interop-whats-next)
+
diff --git a/advancedcontentfilter/vendor/container-interop/container-interop/docs/Delegate-lookup.md b/advancedcontentfilter/vendor/container-interop/container-interop/docs/Delegate-lookup.md
new file mode 100644
index 00000000..f64a8f78
--- /dev/null
+++ b/advancedcontentfilter/vendor/container-interop/container-interop/docs/Delegate-lookup.md
@@ -0,0 +1,60 @@
+Delegate lookup feature
+=======================
+
+This document describes a standard for dependency injection containers.
+
+The goal set by the *delegate lookup* feature is to allow several containers to share entries.
+Containers implementing this feature can perform dependency lookups in other containers.
+
+Containers implementing this feature will offer a greater lever of interoperability
+with other containers. Implementation of this feature is therefore RECOMMENDED.
+
+The key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT", "SHOULD",
+"SHOULD NOT", "RECOMMENDED", "MAY", and "OPTIONAL" in this document are to be
+interpreted as described in [RFC 2119][].
+
+The word `implementor` in this document is to be interpreted as someone
+implementing the delegate lookup feature in a dependency injection-related library or framework.
+Users of dependency injections containers (DIC) are referred to as `user`.
+
+[RFC 2119]: http://tools.ietf.org/html/rfc2119
+
+1. Vocabulary
+-------------
+
+In a dependency injection container, the container is used to fetch entries.
+Entries can have dependencies on other entries. Usually, these other entries are fetched by the container.
+
+The *delegate lookup* feature is the ability for a container to fetch dependencies in
+another container. In the rest of the document, the word "container" will reference the container
+implemented by the implementor. The word "delegate container" will reference the container we are
+fetching the dependencies from.
+
+2. Specification
+----------------
+
+A container implementing the *delegate lookup* feature:
+
+- MUST implement the [`ContainerInterface`](ContainerInterface.md)
+- MUST provide a way to register a delegate container (using a constructor parameter, or a setter,
+  or any possible way). The delegate container MUST implement the [`ContainerInterface`](ContainerInterface.md).
+
+When a container is configured to use a delegate container for dependencies:
+
+- Calls to the `get` method should only return an entry if the entry is part of the container.
+  If the entry is not part of the container, an exception should be thrown
+  (as requested by the [`ContainerInterface`](ContainerInterface.md)).
+- Calls to the `has` method should only return `true` if the entry is part of the container.
+  If the entry is not part of the container, `false` should be returned.
+- If the fetched entry has dependencies, **instead** of performing
+  the dependency lookup in the container, the lookup is performed on the *delegate container*.
+
+Important: By default, the dependency lookups SHOULD be performed on the delegate container **only**, not on the container itself.
+
+It is however allowed for containers to provide exception cases for special entries, and a way to lookup
+into the same container (or another container) instead of the delegate container.
+
+3. Package / Interface
+----------------------
+
+This feature is not tied to any code, interface or package.
diff --git a/advancedcontentfilter/vendor/container-interop/container-interop/docs/images/interoperating_containers.png b/advancedcontentfilter/vendor/container-interop/container-interop/docs/images/interoperating_containers.png
new file mode 100644
index 00000000..1d3fdd0d
Binary files /dev/null and b/advancedcontentfilter/vendor/container-interop/container-interop/docs/images/interoperating_containers.png differ
diff --git a/advancedcontentfilter/vendor/container-interop/container-interop/docs/images/priority.png b/advancedcontentfilter/vendor/container-interop/container-interop/docs/images/priority.png
new file mode 100644
index 00000000..d02cb7d1
Binary files /dev/null and b/advancedcontentfilter/vendor/container-interop/container-interop/docs/images/priority.png differ
diff --git a/advancedcontentfilter/vendor/container-interop/container-interop/docs/images/side_by_side_containers.png b/advancedcontentfilter/vendor/container-interop/container-interop/docs/images/side_by_side_containers.png
new file mode 100644
index 00000000..87884bc2
Binary files /dev/null and b/advancedcontentfilter/vendor/container-interop/container-interop/docs/images/side_by_side_containers.png differ
diff --git a/advancedcontentfilter/vendor/container-interop/container-interop/src/Interop/Container/ContainerInterface.php b/advancedcontentfilter/vendor/container-interop/container-interop/src/Interop/Container/ContainerInterface.php
new file mode 100644
index 00000000..a75468f6
--- /dev/null
+++ b/advancedcontentfilter/vendor/container-interop/container-interop/src/Interop/Container/ContainerInterface.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * @license http://www.opensource.org/licenses/mit-license.php MIT (see the LICENSE file)
+ */
+
+namespace Interop\Container;
+
+use Psr\Container\ContainerInterface as PsrContainerInterface;
+
+/**
+ * Describes the interface of a container that exposes methods to read its entries.
+ */
+interface ContainerInterface extends PsrContainerInterface
+{
+}
diff --git a/advancedcontentfilter/vendor/container-interop/container-interop/src/Interop/Container/Exception/ContainerException.php b/advancedcontentfilter/vendor/container-interop/container-interop/src/Interop/Container/Exception/ContainerException.php
new file mode 100644
index 00000000..3964061a
--- /dev/null
+++ b/advancedcontentfilter/vendor/container-interop/container-interop/src/Interop/Container/Exception/ContainerException.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * @license http://www.opensource.org/licenses/mit-license.php MIT (see the LICENSE file)
+ */
+
+namespace Interop\Container\Exception;
+
+use Psr\Container\ContainerExceptionInterface as PsrContainerException;
+
+/**
+ * Base interface representing a generic exception in a container.
+ */
+interface ContainerException extends PsrContainerException
+{
+}
diff --git a/advancedcontentfilter/vendor/container-interop/container-interop/src/Interop/Container/Exception/NotFoundException.php b/advancedcontentfilter/vendor/container-interop/container-interop/src/Interop/Container/Exception/NotFoundException.php
new file mode 100644
index 00000000..031b3ab4
--- /dev/null
+++ b/advancedcontentfilter/vendor/container-interop/container-interop/src/Interop/Container/Exception/NotFoundException.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * @license http://www.opensource.org/licenses/mit-license.php MIT (see the LICENSE file)
+ */
+
+namespace Interop\Container\Exception;
+
+use Psr\Container\NotFoundExceptionInterface as PsrNotFoundException;
+
+/**
+ * No entry was found in the container.
+ */
+interface NotFoundException extends ContainerException, PsrNotFoundException
+{
+}
diff --git a/advancedcontentfilter/vendor/pimple/pimple/.gitignore b/advancedcontentfilter/vendor/pimple/pimple/.gitignore
new file mode 100644
index 00000000..c089b095
--- /dev/null
+++ b/advancedcontentfilter/vendor/pimple/pimple/.gitignore
@@ -0,0 +1,3 @@
+phpunit.xml
+composer.lock
+/vendor/
diff --git a/advancedcontentfilter/vendor/pimple/pimple/.travis.yml b/advancedcontentfilter/vendor/pimple/pimple/.travis.yml
new file mode 100644
index 00000000..196f7fc1
--- /dev/null
+++ b/advancedcontentfilter/vendor/pimple/pimple/.travis.yml
@@ -0,0 +1,40 @@
+language: php
+
+env:
+  matrix:
+    - PIMPLE_EXT=no
+    - PIMPLE_EXT=yes
+  global:
+    - REPORT_EXIT_STATUS=1
+
+php:
+  - 5.3
+  - 5.4
+  - 5.5
+  - 5.6
+  - 7.0
+  - 7.1
+
+before_script:
+  - composer self-update
+  - COMPOSER_ROOT_VERSION=dev-master composer install
+  - if [ "$PIMPLE_EXT" == "yes" ]; then sh -c "cd ext/pimple && phpize && ./configure && make && sudo make install"; fi
+  - if [ "$PIMPLE_EXT" == "yes" ]; then echo "extension=pimple.so" >> `php --ini | grep "Loaded Configuration" | sed -e "s|.*:\s*||"`; fi
+
+script:
+  - cd ext/pimple
+  - if [ "$PIMPLE_EXT" == "yes" ]; then yes n | make test | tee output ; grep -E 'Tests failed +. +0' output; fi
+  - if [ "$PIMPLE_EXT" == "yes" ]; then export SYMFONY_DEPRECATIONS_HELPER=weak; fi
+  - cd ../..
+  - ./vendor/bin/simple-phpunit
+
+matrix:
+  include:
+    - php: hhvm
+      dist: trusty
+      env: PIMPLE_EXT=no
+  exclude:
+    - php: 7.0
+      env: PIMPLE_EXT=yes
+    - php: 7.1
+      env: PIMPLE_EXT=yes
diff --git a/advancedcontentfilter/vendor/pimple/pimple/CHANGELOG b/advancedcontentfilter/vendor/pimple/pimple/CHANGELOG
new file mode 100644
index 00000000..ba56760c
--- /dev/null
+++ b/advancedcontentfilter/vendor/pimple/pimple/CHANGELOG
@@ -0,0 +1,59 @@
+* 3.2.3 (2017-XX-XX)
+
+ * n/a
+
+* 3.2.2 (2017-07-23)
+
+ * reverted extending a protected closure throws an exception (deprecated it instead)
+
+* 3.2.1 (2017-07-17)
+
+ * fixed PHP error
+
+* 3.2.0 (2017-07-17)
+
+ * added a PSR-11 service locator
+ * added a PSR-11 wrapper
+ * added ServiceIterator
+ * fixed extending a protected closure (now throws InvalidServiceIdentifierException)
+
+* 3.1.0 (2017-07-03)
+
+ * deprecated the C extension
+ * added support for PSR-11 exceptions
+
+* 3.0.2 (2015-09-11)
+
+ * refactored the C extension
+ * minor non-significant changes
+
+* 3.0.1 (2015-07-30)
+
+ * simplified some code
+ * fixed a segfault in the C extension
+
+* 3.0.0 (2014-07-24)
+
+ * removed the Pimple class alias (use Pimple\Container instead)
+
+* 2.1.1 (2014-07-24)
+
+ * fixed compiler warnings for the C extension
+ * fixed code when dealing with circular references
+
+* 2.1.0 (2014-06-24)
+
+ * moved the Pimple to Pimple\Container (with a BC layer -- Pimple is now a
+   deprecated alias which will be removed in Pimple 3.0)
+ * added Pimple\ServiceProviderInterface (and Pimple::register())
+
+* 2.0.0 (2014-02-10)
+
+ * changed extend to automatically re-assign the extended service and keep it as shared or factory
+   (to keep BC, extend still returns the extended service)
+ * changed services to be shared by default (use factory() for factory
+   services)
+
+* 1.0.0
+
+ * initial version
diff --git a/advancedcontentfilter/vendor/pimple/pimple/LICENSE b/advancedcontentfilter/vendor/pimple/pimple/LICENSE
new file mode 100644
index 00000000..e02dc5a7
--- /dev/null
+++ b/advancedcontentfilter/vendor/pimple/pimple/LICENSE
@@ -0,0 +1,19 @@
+Copyright (c) 2009-2017 Fabien Potencier
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/advancedcontentfilter/vendor/pimple/pimple/README.rst b/advancedcontentfilter/vendor/pimple/pimple/README.rst
new file mode 100644
index 00000000..a03b6d3a
--- /dev/null
+++ b/advancedcontentfilter/vendor/pimple/pimple/README.rst
@@ -0,0 +1,326 @@
+Pimple
+======
+
+.. caution::
+
+    This is the documentation for Pimple 3.x. If you are using Pimple 1.x, read
+    the `Pimple 1.x documentation`_. Reading the Pimple 1.x code is also a good
+    way to learn more about how to create a simple Dependency Injection
+    Container (recent versions of Pimple are more focused on performance).
+
+Pimple is a small Dependency Injection Container for PHP.
+
+Installation
+------------
+
+Before using Pimple in your project, add it to your ``composer.json`` file:
+
+.. code-block:: bash
+
+    $ ./composer.phar require pimple/pimple "^3.0"
+
+Usage
+-----
+
+Creating a container is a matter of creating a ``Container`` instance:
+
+.. code-block:: php
+
+    use Pimple\Container;
+
+    $container = new Container();
+
+As many other dependency injection containers, Pimple manages two different
+kind of data: **services** and **parameters**.
+
+Defining Services
+~~~~~~~~~~~~~~~~~
+
+A service is an object that does something as part of a larger system. Examples
+of services: a database connection, a templating engine, or a mailer. Almost
+any **global** object can be a service.
+
+Services are defined by **anonymous functions** that return an instance of an
+object:
+
+.. code-block:: php
+
+    // define some services
+    $container['session_storage'] = function ($c) {
+        return new SessionStorage('SESSION_ID');
+    };
+
+    $container['session'] = function ($c) {
+        return new Session($c['session_storage']);
+    };
+
+Notice that the anonymous function has access to the current container
+instance, allowing references to other services or parameters.
+
+As objects are only created when you get them, the order of the definitions
+does not matter.
+
+Using the defined services is also very easy:
+
+.. code-block:: php
+
+    // get the session object
+    $session = $container['session'];
+
+    // the above call is roughly equivalent to the following code:
+    // $storage = new SessionStorage('SESSION_ID');
+    // $session = new Session($storage);
+
+Defining Factory Services
+~~~~~~~~~~~~~~~~~~~~~~~~~
+
+By default, each time you get a service, Pimple returns the **same instance**
+of it. If you want a different instance to be returned for all calls, wrap your
+anonymous function with the ``factory()`` method
+
+.. code-block:: php
+
+    $container['session'] = $container->factory(function ($c) {
+        return new Session($c['session_storage']);
+    });
+
+Now, each call to ``$container['session']`` returns a new instance of the
+session.
+
+Defining Parameters
+~~~~~~~~~~~~~~~~~~~
+
+Defining a parameter allows to ease the configuration of your container from
+the outside and to store global values:
+
+.. code-block:: php
+
+    // define some parameters
+    $container['cookie_name'] = 'SESSION_ID';
+    $container['session_storage_class'] = 'SessionStorage';
+
+If you change the ``session_storage`` service definition like below:
+
+.. code-block:: php
+
+    $container['session_storage'] = function ($c) {
+        return new $c['session_storage_class']($c['cookie_name']);
+    };
+
+You can now easily change the cookie name by overriding the
+``cookie_name`` parameter instead of redefining the service
+definition.
+
+Protecting Parameters
+~~~~~~~~~~~~~~~~~~~~~
+
+Because Pimple sees anonymous functions as service definitions, you need to
+wrap anonymous functions with the ``protect()`` method to store them as
+parameters:
+
+.. code-block:: php
+
+    $container['random_func'] = $container->protect(function () {
+        return rand();
+    });
+
+Modifying Services after Definition
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+In some cases you may want to modify a service definition after it has been
+defined. You can use the ``extend()`` method to define additional code to be
+run on your service just after it is created:
+
+.. code-block:: php
+
+    $container['session_storage'] = function ($c) {
+        return new $c['session_storage_class']($c['cookie_name']);
+    };
+
+    $container->extend('session_storage', function ($storage, $c) {
+        $storage->...();
+
+        return $storage;
+    });
+
+The first argument is the name of the service to extend, the second a function
+that gets access to the object instance and the container.
+
+Extending a Container
+~~~~~~~~~~~~~~~~~~~~~
+
+If you use the same libraries over and over, you might want to reuse some
+services from one project to the next one; package your services into a
+**provider** by implementing ``Pimple\ServiceProviderInterface``:
+
+.. code-block:: php
+
+    use Pimple\Container;
+
+    class FooProvider implements Pimple\ServiceProviderInterface
+    {
+        public function register(Container $pimple)
+        {
+            // register some services and parameters
+            // on $pimple
+        }
+    }
+
+Then, register the provider on a Container:
+
+.. code-block:: php
+
+    $pimple->register(new FooProvider());
+
+Fetching the Service Creation Function
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+When you access an object, Pimple automatically calls the anonymous function
+that you defined, which creates the service object for you. If you want to get
+raw access to this function, you can use the ``raw()`` method:
+
+.. code-block:: php
+
+    $container['session'] = function ($c) {
+        return new Session($c['session_storage']);
+    };
+
+    $sessionFunction = $container->raw('session');
+
+PSR-11 compatibility
+--------------------
+
+For historical reasons, the ``Container`` class does not implement the PSR-11
+``ContainerInterface``. However, Pimple provides a helper class that will let
+you decouple your code from the Pimple container class.
+
+The PSR-11 container class
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The ``Pimple\Psr11\Container`` class lets you access the content of an
+underlying Pimple container using ``Psr\Container\ContainerInterface``
+methods:
+
+.. code-block:: php
+
+    use Pimple\Container;
+    use Pimple\Psr11\Container as PsrContainer;
+
+    $container = new Container();
+    $container['service'] = function ($c) {
+        return new Service();
+    };
+    $psr11 = new PsrContainer($container);
+
+    $controller = function (PsrContainer $container) {
+        $service = $container->get('service');
+    };
+    $controller($psr11);
+
+Using the PSR-11 ServiceLocator
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Sometimes, a service needs access to several other services without being sure
+that all of them will actually be used. In those cases, you may want the
+instantiation of the services to be lazy.
+
+The traditional solution is to inject the entire service container to get only
+the services really needed. However, this is not recommended because it gives
+services a too broad access to the rest of the application and it hides their
+actual dependencies.
+
+The ``ServiceLocator`` is intended to solve this problem by giving access to a
+set of predefined services while instantiating them only when actually needed.
+
+It also allows you to make your services available under a different name than
+the one used to register them. For instance, you may want to use an object
+that expects an instance of ``EventDispatcherInterface`` to be available under
+the name ``event_dispatcher`` while your event dispatcher has been
+registered under the name ``dispatcher``:
+
+.. code-block:: php
+
+    use Monolog\Logger;
+    use Pimple\Psr11\ServiceLocator;
+    use Psr\Container\ContainerInterface;
+    use Symfony\Component\EventDispatcher\EventDispatcher;
+
+    class MyService
+    {
+        /**
+         * "logger" must be an instance of Psr\Log\LoggerInterface
+         * "event_dispatcher" must be an instance of Symfony\Component\EventDispatcher\EventDispatcherInterface
+         */
+        private $services;
+
+        public function __construct(ContainerInterface $services)
+        {
+            $this->services = $services;
+        }
+    }
+
+    $container['logger'] = function ($c) {
+        return new Monolog\Logger();
+    };
+    $container['dispatcher'] = function () {
+        return new EventDispatcher();
+    };
+
+    $container['service'] = function ($c) {
+        $locator = new ServiceLocator($c, array('logger', 'event_dispatcher' => 'dispatcher'));
+
+        return new MyService($locator);
+    };
+
+Referencing a Collection of Services Lazily
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Passing a collection of services instances in an array may prove inefficient
+if the class that consumes the collection only needs to iterate over it at a
+later stage, when one of its method is called. It can also lead to problems
+if there is a circular dependency between one of the services stored in the
+collection and the class that consumes it.
+
+The ``ServiceIterator`` class helps you solve these issues. It receives a
+list of service names during instantiation and will retrieve the services
+when iterated over:
+
+.. code-block:: php
+
+    use Pimple\Container;
+    use Pimple\ServiceIterator;
+
+    class AuthorizationService
+    {
+        private $voters;
+
+        public function __construct($voters)
+        {
+            $this->voters = $voters;
+        }
+
+        public function canAccess($resource)
+        {
+            foreach ($this->voters as $voter) {
+                if (true === $voter->canAccess($resource) {
+                    return true;
+                }
+            }
+
+            return false;
+        }
+    }
+
+    $container = new Container();
+
+    $container['voter1'] = function ($c) {
+        return new SomeVoter();
+    }
+    $container['voter2'] = function ($c) {
+        return new SomeOtherVoter($c['auth']);
+    }
+    $container['auth'] = function ($c) {
+        return new AuthorizationService(new ServiceIterator($c, array('voter1', 'voter2'));
+    }
+
+.. _Pimple 1.x documentation: https://github.com/silexphp/Pimple/tree/1.1
diff --git a/advancedcontentfilter/vendor/pimple/pimple/composer.json b/advancedcontentfilter/vendor/pimple/pimple/composer.json
new file mode 100644
index 00000000..dabf190a
--- /dev/null
+++ b/advancedcontentfilter/vendor/pimple/pimple/composer.json
@@ -0,0 +1,29 @@
+{
+    "name": "pimple/pimple",
+    "type": "library",
+    "description": "Pimple, a simple Dependency Injection Container",
+    "keywords": ["dependency injection", "container"],
+    "homepage": "http://pimple.sensiolabs.org",
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "Fabien Potencier",
+            "email": "fabien@symfony.com"
+        }
+    ],
+    "require": {
+        "php": ">=5.3.0",
+        "psr/container": "^1.0"
+    },
+    "require-dev": {
+        "symfony/phpunit-bridge": "^3.2"
+    },
+    "autoload": {
+        "psr-0": { "Pimple": "src/" }
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "3.2.x-dev"
+        }
+    }
+}
diff --git a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/.gitignore b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/.gitignore
new file mode 100644
index 00000000..1861088a
--- /dev/null
+++ b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/.gitignore
@@ -0,0 +1,30 @@
+*.sw*
+.deps
+Makefile
+Makefile.fragments
+Makefile.global
+Makefile.objects
+acinclude.m4
+aclocal.m4
+build/
+config.cache
+config.guess
+config.h
+config.h.in
+config.log
+config.nice
+config.status
+config.sub
+configure
+configure.in
+install-sh
+libtool
+ltmain.sh
+missing
+mkinstalldirs
+run-tests.php
+*.loT
+.libs/
+modules/
+*.la
+*.lo
diff --git a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/README.md b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/README.md
new file mode 100644
index 00000000..7b39eb29
--- /dev/null
+++ b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/README.md
@@ -0,0 +1,12 @@
+This is Pimple 2 implemented in C
+
+* PHP >= 5.3
+* Not tested under Windows, might work
+
+Install
+=======
+
+    > phpize
+    > ./configure
+    > make
+    > make install
diff --git a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/config.m4 b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/config.m4
new file mode 100644
index 00000000..3a6e9aae
--- /dev/null
+++ b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/config.m4
@@ -0,0 +1,63 @@
+dnl $Id$
+dnl config.m4 for extension pimple
+
+dnl Comments in this file start with the string 'dnl'.
+dnl Remove where necessary. This file will not work
+dnl without editing.
+
+dnl If your extension references something external, use with:
+
+dnl PHP_ARG_WITH(pimple, for pimple support,
+dnl Make sure that the comment is aligned:
+dnl [  --with-pimple             Include pimple support])
+
+dnl Otherwise use enable:
+
+PHP_ARG_ENABLE(pimple, whether to enable pimple support,
+dnl Make sure that the comment is aligned:
+[  --enable-pimple           Enable pimple support])
+
+if test "$PHP_PIMPLE" != "no"; then
+  dnl Write more examples of tests here...
+
+  dnl # --with-pimple -> check with-path
+  dnl SEARCH_PATH="/usr/local /usr"     # you might want to change this
+  dnl SEARCH_FOR="/include/pimple.h"  # you most likely want to change this
+  dnl if test -r $PHP_PIMPLE/$SEARCH_FOR; then # path given as parameter
+  dnl   PIMPLE_DIR=$PHP_PIMPLE
+  dnl else # search default path list
+  dnl   AC_MSG_CHECKING([for pimple files in default path])
+  dnl   for i in $SEARCH_PATH ; do
+  dnl     if test -r $i/$SEARCH_FOR; then
+  dnl       PIMPLE_DIR=$i
+  dnl       AC_MSG_RESULT(found in $i)
+  dnl     fi
+  dnl   done
+  dnl fi
+  dnl
+  dnl if test -z "$PIMPLE_DIR"; then
+  dnl   AC_MSG_RESULT([not found])
+  dnl   AC_MSG_ERROR([Please reinstall the pimple distribution])
+  dnl fi
+
+  dnl # --with-pimple -> add include path
+  dnl PHP_ADD_INCLUDE($PIMPLE_DIR/include)
+
+  dnl # --with-pimple -> check for lib and symbol presence
+  dnl LIBNAME=pimple # you may want to change this
+  dnl LIBSYMBOL=pimple # you most likely want to change this
+
+  dnl PHP_CHECK_LIBRARY($LIBNAME,$LIBSYMBOL,
+  dnl [
+  dnl   PHP_ADD_LIBRARY_WITH_PATH($LIBNAME, $PIMPLE_DIR/lib, PIMPLE_SHARED_LIBADD)
+  dnl   AC_DEFINE(HAVE_PIMPLELIB,1,[ ])
+  dnl ],[
+  dnl   AC_MSG_ERROR([wrong pimple lib version or lib not found])
+  dnl ],[
+  dnl   -L$PIMPLE_DIR/lib -lm
+  dnl ])
+  dnl
+  dnl PHP_SUBST(PIMPLE_SHARED_LIBADD)
+
+  PHP_NEW_EXTENSION(pimple, pimple.c, $ext_shared)
+fi
diff --git a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/config.w32 b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/config.w32
new file mode 100644
index 00000000..39857b32
--- /dev/null
+++ b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/config.w32
@@ -0,0 +1,13 @@
+// $Id$
+// vim:ft=javascript
+
+// If your extension references something external, use ARG_WITH
+// ARG_WITH("pimple", "for pimple support", "no");
+
+// Otherwise, use ARG_ENABLE
+// ARG_ENABLE("pimple", "enable pimple support", "no");
+
+if (PHP_PIMPLE != "no") {
+	EXTENSION("pimple", "pimple.c");
+}
+
diff --git a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/php_pimple.h b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/php_pimple.h
new file mode 100644
index 00000000..eed7c173
--- /dev/null
+++ b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/php_pimple.h
@@ -0,0 +1,137 @@
+
+/*
+ * This file is part of Pimple.
+ *
+ * Copyright (c) 2014 Fabien Potencier
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is furnished
+ * to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef PHP_PIMPLE_H
+#define PHP_PIMPLE_H
+
+extern zend_module_entry pimple_module_entry;
+#define phpext_pimple_ptr &pimple_module_entry
+
+#ifdef PHP_WIN32
+#	define PHP_PIMPLE_API __declspec(dllexport)
+#elif defined(__GNUC__) && __GNUC__ >= 4
+#	define PHP_PIMPLE_API __attribute__ ((visibility("default")))
+#else
+#	define PHP_PIMPLE_API
+#endif
+
+#ifdef ZTS
+#include "TSRM.h"
+#endif
+
+#define PIMPLE_VERSION "3.2.3-DEV"
+
+#define PIMPLE_NS "Pimple"
+#define PSR_CONTAINER_NS "Psr\\Container"
+#define PIMPLE_EXCEPTION_NS "Pimple\\Exception"
+
+#define PIMPLE_DEFAULT_ZVAL_CACHE_NUM   5
+#define PIMPLE_DEFAULT_ZVAL_VALUES_NUM 10
+
+#define PIMPLE_DEPRECATE do { \
+	int er = EG(error_reporting); \
+	EG(error_reporting) = 0;\
+	php_error(E_DEPRECATED, "The Pimple C extension is deprecated since version 3.1 and will be removed in 4.0."); \
+	EG(error_reporting) = er; \
+} while (0);
+
+zend_module_entry *get_module(void);
+
+PHP_MINIT_FUNCTION(pimple);
+PHP_MINFO_FUNCTION(pimple);
+
+PHP_METHOD(FrozenServiceException, __construct);
+PHP_METHOD(InvalidServiceIdentifierException, __construct);
+PHP_METHOD(UnknownIdentifierException, __construct);
+
+PHP_METHOD(Pimple, __construct);
+PHP_METHOD(Pimple, factory);
+PHP_METHOD(Pimple, protect);
+PHP_METHOD(Pimple, raw);
+PHP_METHOD(Pimple, extend);
+PHP_METHOD(Pimple, keys);
+PHP_METHOD(Pimple, register);
+PHP_METHOD(Pimple, offsetSet);
+PHP_METHOD(Pimple, offsetUnset);
+PHP_METHOD(Pimple, offsetGet);
+PHP_METHOD(Pimple, offsetExists);
+
+PHP_METHOD(PimpleClosure, invoker);
+
+typedef struct _pimple_bucket_value {
+	zval *value; /* Must be the first element */
+	zval *raw;
+	zend_object_handle handle_num;
+	enum {
+		PIMPLE_IS_PARAM   = 0,
+		PIMPLE_IS_SERVICE = 2
+	} type;
+	zend_bool initialized;
+	zend_fcall_info_cache fcc;
+} pimple_bucket_value;
+
+typedef struct _pimple_object {
+	zend_object zobj;
+	HashTable values;
+	HashTable factories;
+	HashTable protected;
+} pimple_object;
+
+typedef struct _pimple_closure_object {
+	zend_object zobj;
+	zval *callable;
+	zval *factory;
+} pimple_closure_object;
+
+static const char sensiolabs_logo[] = "<img src=\"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAHYAAAAUCAMAAABvRTlyAAAAz1BMVEUAAAAAAAAAAAAsThWB5j4AAACD6T8AAACC6D+C6D6C6D+C6D4AAAAAAACC6D4AAAAAAACC6D8AAAAAAAAAAAAAAAAAAAAAAACC6D4AAAAAAAAAAACC6D4AAAAAAAAAAAAAAAAAAAAAAACC6D8AAACC6D4AAAAAAAAAAAAAAAAAAACC6D8AAACC6D6C6D+B6D+C6D+C6D+C6D8AAACC6D6C6D4AAACC6D/K/2KC6D+B6D6C6D6C6D+C6D8sTxUyWRhEeiEAAACC6D+C5z6B6D7drnEVAAAAQXRSTlMAE3oCNSUuDHFHzxaF9UFsu+irX+zlKzYimaJXktyOSFD6BolxqT7QGMMdarMIpuO28r9EolXKgR16OphfXYd4V14GtB4AAAMpSURBVEjHvVSJctowEF1jjME2RziMwUCoMfd9heZqG4n//6buLpJjkmYm03byZmxJa2nf6u2uQcG2bfhqRN4LoTKBzyGDm68M7mAwcOEdjo4zhA/Rf9Go/CVtTgiRhXfIC3EDH8F/eUX1/9KexRo+QgOdtHDsEe/sM7QT32/+K61Z1LFXcXJxN4pTbu1aTQUzuy2PIA0rDo0/0Aa5XFaJvKaVTrubywXvaa1Wq4Vu/Snr3Y7Aojh4VccwykW2N2oQ8wmjyut6+Q1t5ywIG5Npj1sh5E0B7YOzFDjfuRfaOh3O+MbbVNfTWS9COZk3Obd2su5d0a6IU9KLREbw8gEehWSr1r2sPWciXLG38r5NdW0xu9eioU87omjC9yNaMi5GNf6WppVSOqXCFkmCvMB3p9SROLoYQn5pDgQOujA1xjYvqH+plUdkwnmII8VxR/PKYkrfLLomhVlE3b/LhNbNr7hp0H2JaOc4v8dFB58HSsFTSafaqtY1sT3GO8wsy5rhokYPlRJdjPMajyYqTt1EHF/2uqSWQWmAjCUSmQ1MS3g8Btf1XOsy7YIC0CB1b5Xw1Vhba0zbxiCAQLH9TNPmHJXQUtJAN0KcDsoqLxsNvJrJExa7mKIdp2lRE2WexiS4pqWk/0jROlw6K6bV9YOBDGAuqMJ0bnuUKGB0L27bxgRhGEbzihbhxxXaQC88Vkwq8ldCi86RApWUb0Q+4VDosBCc+1s81lUdnBavH4Zp2mm3O44USwOfvSo9oBiwpFg71lMS1VKJLKljS3j9p+fOTvXXlsSNuEv6YPaZda9uRope0VJfKdo7fPiYfSmvFjXQbkhY0d9hCbBWIktRgEDieDhf1N3wbbkmNNgRy8hyl620yGQat/grV3HMpc2HDKTVmOPFz6ylPCKt/nXcAyV260jaAowwIW0YuBzrOgb/KrddZS9OmJaLgpWK4JX2DDuklcLZSDGcn8Vmx9YDNvT6UsjyBApRyFQVX7Vxm9TGxE16nmfRd8/zQoDmggQOTRh5Hv8pMt9Q/L2JmSwkMCE7dA4BuDjHJwfu0Om4QAhOjrN5XkIatglfiN/bUPdCQFjTYgAAAABJRU5ErkJggg==\">";
+
+static void pimple_exception_call_parent_constructor(zval *this_ptr, const char *format, const char *arg1 TSRMLS_DC);
+
+static int pimple_zval_to_pimpleval(zval *_zval, pimple_bucket_value *_pimple_bucket_value TSRMLS_DC);
+static int pimple_zval_is_valid_callback(zval *_zval, pimple_bucket_value *_pimple_bucket_value TSRMLS_DC);
+
+static void pimple_bucket_dtor(pimple_bucket_value *bucket);
+static void pimple_free_bucket(pimple_bucket_value *bucket);
+
+static zval *pimple_object_read_dimension(zval *object, zval *offset, int type TSRMLS_DC);
+static void pimple_object_write_dimension(zval *object, zval *offset, zval *value TSRMLS_DC);
+static int pimple_object_has_dimension(zval *object, zval *offset, int check_empty TSRMLS_DC);
+static void pimple_object_unset_dimension(zval *object, zval *offset TSRMLS_DC);
+static zend_object_value pimple_object_create(zend_class_entry *ce TSRMLS_DC);
+static void pimple_free_object_storage(pimple_object *obj TSRMLS_DC);
+
+static void pimple_closure_free_object_storage(pimple_closure_object *obj TSRMLS_DC);
+static zend_object_value pimple_closure_object_create(zend_class_entry *ce TSRMLS_DC);
+static zend_function *pimple_closure_get_constructor(zval * TSRMLS_DC);
+static int pimple_closure_get_closure(zval *obj, zend_class_entry **ce_ptr, union _zend_function **fptr_ptr, zval **zobj_ptr TSRMLS_DC);
+
+#ifdef ZTS
+#define PIMPLE_G(v) TSRMG(pimple_globals_id, zend_pimple_globals *, v)
+#else
+#define PIMPLE_G(v) (pimple_globals.v)
+#endif
+
+#endif	/* PHP_PIMPLE_H */
+
diff --git a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/pimple.c b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/pimple.c
new file mode 100644
index 00000000..c80499b3
--- /dev/null
+++ b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/pimple.c
@@ -0,0 +1,1114 @@
+
+/*
+ * This file is part of Pimple.
+ *
+ * Copyright (c) 2014 Fabien Potencier
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is furnished
+ * to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "php.h"
+#include "php_ini.h"
+#include "ext/standard/info.h"
+#include "php_pimple.h"
+#include "pimple_compat.h"
+#include "zend_interfaces.h"
+#include "zend.h"
+#include "Zend/zend_closures.h"
+#include "ext/spl/spl_exceptions.h"
+#include "Zend/zend_exceptions.h"
+#include "main/php_output.h"
+#include "SAPI.h"
+
+static zend_class_entry *pimple_ce_PsrContainerInterface;
+static zend_class_entry *pimple_ce_PsrContainerExceptionInterface;
+static zend_class_entry *pimple_ce_PsrNotFoundExceptionInterface;
+
+static zend_class_entry *pimple_ce_ExpectedInvokableException;
+static zend_class_entry *pimple_ce_FrozenServiceException;
+static zend_class_entry *pimple_ce_InvalidServiceIdentifierException;
+static zend_class_entry *pimple_ce_UnknownIdentifierException;
+
+static zend_class_entry *pimple_ce;
+static zend_object_handlers pimple_object_handlers;
+static zend_class_entry *pimple_closure_ce;
+static zend_class_entry *pimple_serviceprovider_ce;
+static zend_object_handlers pimple_closure_object_handlers;
+static zend_internal_function pimple_closure_invoker_function;
+
+#define FETCH_DIM_HANDLERS_VARS 	pimple_object *pimple_obj = NULL; \
+									ulong index; \
+									pimple_obj = (pimple_object *)zend_object_store_get_object(object TSRMLS_CC); \
+
+#define PIMPLE_OBJECT_HANDLE_INHERITANCE_OBJECT_HANDLERS	do { \
+	if (ce != pimple_ce) { \
+		zend_hash_find(&ce->function_table, ZEND_STRS("offsetget"), (void **)&function); \
+		if (function->common.scope != ce) { /* if the function is not defined in this actual class */ \
+			pimple_object_handlers.read_dimension = pimple_object_read_dimension; /* then overwrite the handler to use custom one */ \
+		} \
+		zend_hash_find(&ce->function_table, ZEND_STRS("offsetset"), (void **)&function); \
+		if (function->common.scope != ce) { \
+			pimple_object_handlers.write_dimension = pimple_object_write_dimension; \
+		} \
+		zend_hash_find(&ce->function_table, ZEND_STRS("offsetexists"), (void **)&function); \
+		if (function->common.scope != ce) { \
+			pimple_object_handlers.has_dimension = pimple_object_has_dimension; \
+		} \
+		zend_hash_find(&ce->function_table, ZEND_STRS("offsetunset"), (void **)&function); \
+		if (function->common.scope != ce) { \
+			pimple_object_handlers.unset_dimension = pimple_object_unset_dimension; \
+		} \
+	} else { \
+		pimple_object_handlers.read_dimension = pimple_object_read_dimension; \
+		pimple_object_handlers.write_dimension = pimple_object_write_dimension; \
+		pimple_object_handlers.has_dimension = pimple_object_has_dimension; \
+		pimple_object_handlers.unset_dimension = pimple_object_unset_dimension; \
+	}\
+											} while(0);
+
+#define PIMPLE_CALL_CB	do { \
+			zend_fcall_info_argn(&fci TSRMLS_CC, 1, &object); \
+			fci.size           = sizeof(fci); \
+			fci.object_ptr     = retval->fcc.object_ptr; \
+			fci.function_name  = retval->value; \
+			fci.no_separation  = 1; \
+			fci.retval_ptr_ptr = &retval_ptr_ptr; \
+\
+			zend_call_function(&fci, &retval->fcc TSRMLS_CC); \
+			efree(fci.params); \
+			if (EG(exception)) { \
+				return EG(uninitialized_zval_ptr); \
+			} \
+						} while(0);
+
+
+/* Psr\Container\ContainerInterface */
+ZEND_BEGIN_ARG_INFO_EX(arginfo_pimple_PsrContainerInterface_get, 0, 0, 1)
+ZEND_ARG_INFO(0, id)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_pimple_PsrContainerInterface_has, 0, 0, 1)
+ZEND_ARG_INFO(0, id)
+ZEND_END_ARG_INFO()
+
+static const zend_function_entry pimple_ce_PsrContainerInterface_functions[] = {
+	PHP_ABSTRACT_ME(ContainerInterface, get, arginfo_pimple_PsrContainerInterface_get)
+	PHP_ABSTRACT_ME(ContainerInterface, has, arginfo_pimple_PsrContainerInterface_has)
+	PHP_FE_END
+};
+
+/* Psr\Container\ContainerExceptionInterface */
+static const zend_function_entry pimple_ce_PsrContainerExceptionInterface_functions[] = {
+	PHP_FE_END
+};
+
+/* Psr\Container\NotFoundExceptionInterface */
+static const zend_function_entry pimple_ce_PsrNotFoundExceptionInterface_functions[] = {
+	PHP_FE_END
+};
+
+/* Pimple\Exception\FrozenServiceException */
+ZEND_BEGIN_ARG_INFO_EX(arginfo_FrozenServiceException___construct, 0, 0, 1)
+ZEND_ARG_INFO(0, id)
+ZEND_END_ARG_INFO()
+
+static const zend_function_entry pimple_ce_FrozenServiceException_functions[] = {
+	PHP_ME(FrozenServiceException, __construct, arginfo_FrozenServiceException___construct, ZEND_ACC_PUBLIC)
+	PHP_FE_END
+};
+
+/* Pimple\Exception\InvalidServiceIdentifierException */
+ZEND_BEGIN_ARG_INFO_EX(arginfo_InvalidServiceIdentifierException___construct, 0, 0, 1)
+ZEND_ARG_INFO(0, id)
+ZEND_END_ARG_INFO()
+
+static const zend_function_entry pimple_ce_InvalidServiceIdentifierException_functions[] = {
+	PHP_ME(InvalidServiceIdentifierException, __construct, arginfo_InvalidServiceIdentifierException___construct, ZEND_ACC_PUBLIC)
+	PHP_FE_END
+};
+
+/* Pimple\Exception\UnknownIdentifierException */
+ZEND_BEGIN_ARG_INFO_EX(arginfo_UnknownIdentifierException___construct, 0, 0, 1)
+ZEND_ARG_INFO(0, id)
+ZEND_END_ARG_INFO()
+
+static const zend_function_entry pimple_ce_UnknownIdentifierException_functions[] = {
+	PHP_ME(UnknownIdentifierException, __construct, arginfo_UnknownIdentifierException___construct, ZEND_ACC_PUBLIC)
+	PHP_FE_END
+};
+
+/* Pimple\Container */
+ZEND_BEGIN_ARG_INFO_EX(arginfo___construct, 0, 0, 0)
+ZEND_ARG_ARRAY_INFO(0, value, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_offsetset, 0, 0, 2)
+ZEND_ARG_INFO(0, offset)
+ZEND_ARG_INFO(0, value)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_offsetget, 0, 0, 1)
+ZEND_ARG_INFO(0, offset)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_offsetexists, 0, 0, 1)
+ZEND_ARG_INFO(0, offset)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_offsetunset, 0, 0, 1)
+ZEND_ARG_INFO(0, offset)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_factory, 0, 0, 1)
+ZEND_ARG_INFO(0, callable)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_protect, 0, 0, 1)
+ZEND_ARG_INFO(0, callable)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_raw, 0, 0, 1)
+ZEND_ARG_INFO(0, id)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_extend, 0, 0, 2)
+ZEND_ARG_INFO(0, id)
+ZEND_ARG_INFO(0, callable)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_keys, 0, 0, 0)
+ZEND_END_ARG_INFO()
+
+ZEND_BEGIN_ARG_INFO_EX(arginfo_register, 0, 0, 1)
+ZEND_ARG_OBJ_INFO(0, provider, Pimple\\ServiceProviderInterface, 0)
+ZEND_ARG_ARRAY_INFO(0, values, 1)
+ZEND_END_ARG_INFO()
+
+static const zend_function_entry pimple_ce_functions[] = {
+	PHP_ME(Pimple, __construct,	arginfo___construct, ZEND_ACC_PUBLIC)
+	PHP_ME(Pimple, factory,         arginfo_factory,         ZEND_ACC_PUBLIC)
+	PHP_ME(Pimple, protect,         arginfo_protect,         ZEND_ACC_PUBLIC)
+	PHP_ME(Pimple, raw,             arginfo_raw,             ZEND_ACC_PUBLIC)
+	PHP_ME(Pimple, extend,          arginfo_extend,          ZEND_ACC_PUBLIC)
+	PHP_ME(Pimple, keys,            arginfo_keys,            ZEND_ACC_PUBLIC)
+	PHP_ME(Pimple, register,		arginfo_register,		 ZEND_ACC_PUBLIC)
+
+	PHP_ME(Pimple, offsetSet,       arginfo_offsetset,       ZEND_ACC_PUBLIC)
+	PHP_ME(Pimple, offsetGet,       arginfo_offsetget,       ZEND_ACC_PUBLIC)
+	PHP_ME(Pimple, offsetExists,    arginfo_offsetexists,    ZEND_ACC_PUBLIC)
+	PHP_ME(Pimple, offsetUnset,     arginfo_offsetunset,     ZEND_ACC_PUBLIC)
+	PHP_FE_END
+};
+
+/* Pimple\ServiceProviderInterface */
+ZEND_BEGIN_ARG_INFO_EX(arginfo_serviceprovider_register, 0, 0, 1)
+ZEND_ARG_OBJ_INFO(0, pimple, Pimple\\Container, 0)
+ZEND_END_ARG_INFO()
+
+static const zend_function_entry pimple_serviceprovider_iface_ce_functions[] = {
+	PHP_ABSTRACT_ME(ServiceProviderInterface, register, arginfo_serviceprovider_register)
+	PHP_FE_END
+};
+
+/* parent::__construct(sprintf("Something with %s", $arg1)) */
+static void pimple_exception_call_parent_constructor(zval *this_ptr, const char *format, const char *arg1 TSRMLS_DC)
+{
+	zend_class_entry *ce = Z_OBJCE_P(this_ptr);
+	char *message = NULL;
+	int message_len;
+	zval *constructor_arg;
+
+	message_len = spprintf(&message, 0, format, arg1);
+	ALLOC_INIT_ZVAL(constructor_arg);
+	ZVAL_STRINGL(constructor_arg, message, message_len, 1);
+
+	zend_call_method_with_1_params(&this_ptr, ce, &ce->parent->constructor, "__construct", NULL, constructor_arg);
+
+	efree(message);
+	zval_ptr_dtor(&constructor_arg);
+}
+
+/**
+ * Pass a single string parameter to exception constructor and throw
+ */
+static void pimple_throw_exception_string(zend_class_entry *ce, const char *message, zend_uint message_len TSRMLS_DC)
+{
+	zval *exception, *param;
+
+	ALLOC_INIT_ZVAL(exception);
+	object_init_ex(exception, ce);
+
+	ALLOC_INIT_ZVAL(param);
+	ZVAL_STRINGL(param, message, message_len, 1);
+
+	zend_call_method_with_1_params(&exception, ce, &ce->constructor, "__construct", NULL, param);
+
+	zend_throw_exception_object(exception TSRMLS_CC);
+
+	zval_ptr_dtor(&param);
+}
+
+static void pimple_closure_free_object_storage(pimple_closure_object *obj TSRMLS_DC)
+{
+	zend_object_std_dtor(&obj->zobj TSRMLS_CC);
+	if (obj->factory) {
+		zval_ptr_dtor(&obj->factory);
+	}
+	if (obj->callable) {
+		zval_ptr_dtor(&obj->callable);
+	}
+	efree(obj);
+}
+
+static void pimple_free_object_storage(pimple_object *obj TSRMLS_DC)
+{
+	zend_hash_destroy(&obj->factories);
+	zend_hash_destroy(&obj->protected);
+	zend_hash_destroy(&obj->values);
+	zend_object_std_dtor(&obj->zobj TSRMLS_CC);
+	efree(obj);
+}
+
+static void pimple_free_bucket(pimple_bucket_value *bucket)
+{
+	if (bucket->raw) {
+		zval_ptr_dtor(&bucket->raw);
+	}
+}
+
+static zend_object_value pimple_closure_object_create(zend_class_entry *ce TSRMLS_DC)
+{
+	zend_object_value retval;
+	pimple_closure_object *pimple_closure_obj = NULL;
+
+	pimple_closure_obj = ecalloc(1, sizeof(pimple_closure_object));
+	ZEND_OBJ_INIT(&pimple_closure_obj->zobj, ce);
+
+	pimple_closure_object_handlers.get_constructor = pimple_closure_get_constructor;
+	retval.handlers = &pimple_closure_object_handlers;
+	retval.handle   = zend_objects_store_put(pimple_closure_obj, (zend_objects_store_dtor_t) zend_objects_destroy_object, (zend_objects_free_object_storage_t) pimple_closure_free_object_storage, NULL TSRMLS_CC);
+
+	return retval;
+}
+
+static zend_function *pimple_closure_get_constructor(zval *obj TSRMLS_DC)
+{
+	zend_error(E_ERROR, "Pimple\\ContainerClosure is an internal class and cannot be instantiated");
+
+	return NULL;
+}
+
+static int pimple_closure_get_closure(zval *obj, zend_class_entry **ce_ptr, union _zend_function **fptr_ptr, zval **zobj_ptr TSRMLS_DC)
+{
+	*zobj_ptr = obj;
+	*ce_ptr   = Z_OBJCE_P(obj);
+	*fptr_ptr = (zend_function *)&pimple_closure_invoker_function;
+
+	return SUCCESS;
+}
+
+static zend_object_value pimple_object_create(zend_class_entry *ce TSRMLS_DC)
+{
+	zend_object_value retval;
+	pimple_object *pimple_obj  = NULL;
+	zend_function *function    = NULL;
+
+	pimple_obj = emalloc(sizeof(pimple_object));
+	ZEND_OBJ_INIT(&pimple_obj->zobj, ce);
+
+	PIMPLE_OBJECT_HANDLE_INHERITANCE_OBJECT_HANDLERS
+
+	retval.handlers = &pimple_object_handlers;
+	retval.handle   = zend_objects_store_put(pimple_obj, (zend_objects_store_dtor_t) zend_objects_destroy_object, (zend_objects_free_object_storage_t) pimple_free_object_storage, NULL TSRMLS_CC);
+
+	zend_hash_init(&pimple_obj->factories, PIMPLE_DEFAULT_ZVAL_CACHE_NUM, NULL, (dtor_func_t)pimple_bucket_dtor, 0);
+	zend_hash_init(&pimple_obj->protected, PIMPLE_DEFAULT_ZVAL_CACHE_NUM, NULL, (dtor_func_t)pimple_bucket_dtor, 0);
+	zend_hash_init(&pimple_obj->values, PIMPLE_DEFAULT_ZVAL_VALUES_NUM, NULL, (dtor_func_t)pimple_bucket_dtor, 0);
+
+	return retval;
+}
+
+static void pimple_object_write_dimension(zval *object, zval *offset, zval *value TSRMLS_DC)
+{
+	FETCH_DIM_HANDLERS_VARS
+
+	pimple_bucket_value pimple_value = {0}, *found_value = NULL;
+	ulong hash;
+
+	pimple_zval_to_pimpleval(value, &pimple_value TSRMLS_CC);
+
+	if (!offset) {/* $p[] = 'foo' when not overloaded */
+		zend_hash_next_index_insert(&pimple_obj->values, (void *)&pimple_value, sizeof(pimple_bucket_value), NULL);
+		Z_ADDREF_P(value);
+		return;
+	}
+
+	switch (Z_TYPE_P(offset)) {
+	case IS_STRING:
+		hash = zend_hash_func(Z_STRVAL_P(offset), Z_STRLEN_P(offset)+1);
+		zend_hash_quick_find(&pimple_obj->values, Z_STRVAL_P(offset), Z_STRLEN_P(offset)+1, hash, (void **)&found_value);
+		if (found_value && found_value->type == PIMPLE_IS_SERVICE && found_value->initialized == 1) {
+			pimple_free_bucket(&pimple_value);
+			pimple_throw_exception_string(pimple_ce_FrozenServiceException, Z_STRVAL_P(offset), Z_STRLEN_P(offset) TSRMLS_CC);
+			return;
+		}
+		if (zend_hash_quick_update(&pimple_obj->values, Z_STRVAL_P(offset), Z_STRLEN_P(offset)+1, hash, (void *)&pimple_value, sizeof(pimple_bucket_value), NULL) == FAILURE) {
+			pimple_free_bucket(&pimple_value);
+			return;
+		}
+		Z_ADDREF_P(value);
+	break;
+	case IS_DOUBLE:
+	case IS_BOOL:
+	case IS_LONG:
+		if (Z_TYPE_P(offset) == IS_DOUBLE) {
+			index = (ulong)Z_DVAL_P(offset);
+		} else {
+			index = Z_LVAL_P(offset);
+		}
+		zend_hash_index_find(&pimple_obj->values, index, (void **)&found_value);
+		if (found_value && found_value->type == PIMPLE_IS_SERVICE && found_value->initialized == 1) {
+			pimple_free_bucket(&pimple_value);
+			convert_to_string(offset);
+			pimple_throw_exception_string(pimple_ce_FrozenServiceException, Z_STRVAL_P(offset), Z_STRLEN_P(offset) TSRMLS_CC);
+			return;
+		}
+		if (zend_hash_index_update(&pimple_obj->values, index, (void *)&pimple_value, sizeof(pimple_bucket_value), NULL) == FAILURE) {
+			pimple_free_bucket(&pimple_value);
+			return;
+		}
+		Z_ADDREF_P(value);
+	break;
+	case IS_NULL: /* $p[] = 'foo' when overloaded */
+		zend_hash_next_index_insert(&pimple_obj->values, (void *)&pimple_value, sizeof(pimple_bucket_value), NULL);
+		Z_ADDREF_P(value);
+	break;
+	default:
+		pimple_free_bucket(&pimple_value);
+		zend_error(E_WARNING, "Unsupported offset type");
+	}
+}
+
+static void pimple_object_unset_dimension(zval *object, zval *offset TSRMLS_DC)
+{
+	FETCH_DIM_HANDLERS_VARS
+
+	switch (Z_TYPE_P(offset)) {
+	case IS_STRING:
+		zend_symtable_del(&pimple_obj->values, Z_STRVAL_P(offset), Z_STRLEN_P(offset)+1);
+		zend_symtable_del(&pimple_obj->factories, Z_STRVAL_P(offset), Z_STRLEN_P(offset)+1);
+		zend_symtable_del(&pimple_obj->protected, Z_STRVAL_P(offset), Z_STRLEN_P(offset)+1);
+	break;
+	case IS_DOUBLE:
+	case IS_BOOL:
+	case IS_LONG:
+		if (Z_TYPE_P(offset) == IS_DOUBLE) {
+			index = (ulong)Z_DVAL_P(offset);
+		} else {
+			index = Z_LVAL_P(offset);
+		}
+		zend_hash_index_del(&pimple_obj->values, index);
+		zend_hash_index_del(&pimple_obj->factories, index);
+		zend_hash_index_del(&pimple_obj->protected, index);
+	break;
+	default:
+		zend_error(E_WARNING, "Unsupported offset type");
+	}
+}
+
+static int pimple_object_has_dimension(zval *object, zval *offset, int check_empty TSRMLS_DC)
+{
+	FETCH_DIM_HANDLERS_VARS
+
+	pimple_bucket_value *retval = NULL;
+
+	switch (Z_TYPE_P(offset)) {
+	case IS_STRING:
+		if (zend_symtable_find(&pimple_obj->values, Z_STRVAL_P(offset), Z_STRLEN_P(offset)+1, (void **)&retval) == SUCCESS) {
+			switch (check_empty) {
+			case 0: /* isset */
+				return 1; /* Differs from PHP behavior (Z_TYPE_P(retval->value) != IS_NULL;) */
+			case 1: /* empty */
+			default:
+				return zend_is_true(retval->value);
+			}
+		}
+		return 0;
+	break;
+	case IS_DOUBLE:
+	case IS_BOOL:
+	case IS_LONG:
+		if (Z_TYPE_P(offset) == IS_DOUBLE) {
+			index = (ulong)Z_DVAL_P(offset);
+		} else {
+			index = Z_LVAL_P(offset);
+		}
+		if (zend_hash_index_find(&pimple_obj->values, index, (void **)&retval) == SUCCESS) {
+			switch (check_empty) {
+				case 0: /* isset */
+					return 1; /* Differs from PHP behavior (Z_TYPE_P(retval->value) != IS_NULL;)*/
+				case 1: /* empty */
+				default:
+					return zend_is_true(retval->value);
+			}
+		}
+		return 0;
+	break;
+	default:
+		zend_error(E_WARNING, "Unsupported offset type");
+		return 0;
+	}
+}
+
+static zval *pimple_object_read_dimension(zval *object, zval *offset, int type TSRMLS_DC)
+{
+	FETCH_DIM_HANDLERS_VARS
+
+	pimple_bucket_value *retval = NULL;
+	zend_fcall_info fci         = {0};
+	zval *retval_ptr_ptr        = NULL;
+
+	switch (Z_TYPE_P(offset)) {
+	case IS_STRING:
+		if (zend_symtable_find(&pimple_obj->values, Z_STRVAL_P(offset), Z_STRLEN_P(offset)+1, (void **)&retval) == FAILURE) {
+			pimple_throw_exception_string(pimple_ce_UnknownIdentifierException, Z_STRVAL_P(offset), Z_STRLEN_P(offset) TSRMLS_CC);
+
+			return EG(uninitialized_zval_ptr);
+		}
+	break;
+	case IS_DOUBLE:
+	case IS_BOOL:
+	case IS_LONG:
+		if (Z_TYPE_P(offset) == IS_DOUBLE) {
+			index = (ulong)Z_DVAL_P(offset);
+		} else {
+			index = Z_LVAL_P(offset);
+		}
+		if (zend_hash_index_find(&pimple_obj->values, index, (void **)&retval) == FAILURE) {
+			return EG(uninitialized_zval_ptr);
+		}
+	break;
+	case IS_NULL: /* $p[][3] = 'foo' first dim access */
+		return EG(uninitialized_zval_ptr);
+	break;
+	default:
+		zend_error(E_WARNING, "Unsupported offset type");
+		return EG(uninitialized_zval_ptr);
+	}
+
+	if(retval->type == PIMPLE_IS_PARAM) {
+		return retval->value;
+	}
+
+	if (zend_hash_index_exists(&pimple_obj->protected, retval->handle_num)) {
+		/* Service is protected, return the value every time */
+		return retval->value;
+	}
+
+	if (zend_hash_index_exists(&pimple_obj->factories, retval->handle_num)) {
+		/* Service is a factory, call it every time and never cache its result */
+		PIMPLE_CALL_CB
+		Z_DELREF_P(retval_ptr_ptr); /* fetch dim addr will increment refcount */
+		return retval_ptr_ptr;
+	}
+
+	if (retval->initialized == 1) {
+		/* Service has already been called, return its cached value */
+		return retval->value;
+	}
+
+	ALLOC_INIT_ZVAL(retval->raw);
+	MAKE_COPY_ZVAL(&retval->value, retval->raw);
+
+	PIMPLE_CALL_CB
+
+	retval->initialized = 1;
+	zval_ptr_dtor(&retval->value);
+	retval->value = retval_ptr_ptr;
+
+	return retval->value;
+}
+
+static int pimple_zval_is_valid_callback(zval *_zval, pimple_bucket_value *_pimple_bucket_value TSRMLS_DC)
+{
+	if (Z_TYPE_P(_zval) != IS_OBJECT) {
+		return FAILURE;
+	}
+
+	if (_pimple_bucket_value->fcc.called_scope) {
+		return SUCCESS;
+	}
+
+	if (Z_OBJ_HANDLER_P(_zval, get_closure) && Z_OBJ_HANDLER_P(_zval, get_closure)(_zval, &_pimple_bucket_value->fcc.calling_scope, &_pimple_bucket_value->fcc.function_handler, &_pimple_bucket_value->fcc.object_ptr TSRMLS_CC) == SUCCESS) {
+		_pimple_bucket_value->fcc.called_scope = _pimple_bucket_value->fcc.calling_scope;
+		return SUCCESS;
+	} else {
+		return FAILURE;
+	}
+}
+
+static int pimple_zval_to_pimpleval(zval *_zval, pimple_bucket_value *_pimple_bucket_value TSRMLS_DC)
+{
+	_pimple_bucket_value->value = _zval;
+
+	if (Z_TYPE_P(_zval) != IS_OBJECT) {
+		return PIMPLE_IS_PARAM;
+	}
+
+	if (pimple_zval_is_valid_callback(_zval, _pimple_bucket_value TSRMLS_CC) == SUCCESS) {
+		_pimple_bucket_value->type       = PIMPLE_IS_SERVICE;
+		_pimple_bucket_value->handle_num = Z_OBJ_HANDLE_P(_zval);
+	}
+
+	return PIMPLE_IS_SERVICE;
+}
+
+static void pimple_bucket_dtor(pimple_bucket_value *bucket)
+{
+	zval_ptr_dtor(&bucket->value);
+	pimple_free_bucket(bucket);
+}
+
+PHP_METHOD(FrozenServiceException, __construct)
+{
+	char *id = NULL;
+	int id_len;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &id, &id_len) == FAILURE) {
+		return;
+	}
+	pimple_exception_call_parent_constructor(getThis(), "Cannot override frozen service \"%s\".", id TSRMLS_CC);
+}
+
+PHP_METHOD(InvalidServiceIdentifierException, __construct)
+{
+	char *id = NULL;
+	int id_len;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &id, &id_len) == FAILURE) {
+		return;
+	}
+	pimple_exception_call_parent_constructor(getThis(), "Identifier \"%s\" does not contain an object definition.", id TSRMLS_CC);
+}
+
+PHP_METHOD(UnknownIdentifierException, __construct)
+{
+	char *id = NULL;
+	int id_len;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &id, &id_len) == FAILURE) {
+		return;
+	}
+	pimple_exception_call_parent_constructor(getThis(), "Identifier \"%s\" is not defined.", id TSRMLS_CC);
+}
+
+PHP_METHOD(Pimple, protect)
+{
+	zval *protected     = NULL;
+	pimple_object *pobj = NULL;
+	pimple_bucket_value bucket = {0};
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &protected) == FAILURE) {
+		return;
+	}
+
+	if (pimple_zval_is_valid_callback(protected, &bucket TSRMLS_CC) == FAILURE) {
+		pimple_free_bucket(&bucket);
+		zend_throw_exception(pimple_ce_ExpectedInvokableException, "Callable is not a Closure or invokable object.", 0 TSRMLS_CC);
+		return;
+	}
+
+	pimple_zval_to_pimpleval(protected, &bucket TSRMLS_CC);
+	pobj = (pimple_object *)zend_object_store_get_object(getThis() TSRMLS_CC);
+
+	if (zend_hash_index_update(&pobj->protected, bucket.handle_num, (void *)&bucket, sizeof(pimple_bucket_value), NULL) == SUCCESS) {
+		Z_ADDREF_P(protected);
+		RETURN_ZVAL(protected, 1 , 0);
+	} else {
+		pimple_free_bucket(&bucket);
+	}
+	RETURN_FALSE;
+}
+
+PHP_METHOD(Pimple, raw)
+{
+	zval *offset = NULL;
+	pimple_object *pobj        = NULL;
+	pimple_bucket_value *value = NULL;
+	ulong index;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &offset) == FAILURE) {
+		return;
+	}
+
+	pobj = zend_object_store_get_object(getThis() TSRMLS_CC);
+
+	switch (Z_TYPE_P(offset)) {
+		case IS_STRING:
+			if (zend_symtable_find(&pobj->values, Z_STRVAL_P(offset), Z_STRLEN_P(offset)+1, (void *)&value) == FAILURE) {
+				pimple_throw_exception_string(pimple_ce_UnknownIdentifierException, Z_STRVAL_P(offset), Z_STRLEN_P(offset) TSRMLS_CC);
+				RETURN_NULL();
+			}
+		break;
+		case IS_DOUBLE:
+		case IS_BOOL:
+		case IS_LONG:
+			if (Z_TYPE_P(offset) == IS_DOUBLE) {
+				index = (ulong)Z_DVAL_P(offset);
+			} else {
+				index = Z_LVAL_P(offset);
+			}
+			if (zend_hash_index_find(&pobj->values, index, (void *)&value) == FAILURE) {
+				RETURN_NULL();
+			}
+		break;
+		case IS_NULL:
+		default:
+			zend_error(E_WARNING, "Unsupported offset type");
+	}
+
+	if (value->raw) {
+		RETVAL_ZVAL(value->raw, 1, 0);
+	} else {
+		RETVAL_ZVAL(value->value, 1, 0);
+	}
+}
+
+PHP_METHOD(Pimple, extend)
+{
+	zval *offset = NULL, *callable = NULL, *pimple_closure_obj = NULL;
+	pimple_bucket_value bucket = {0}, *value = NULL;
+	pimple_object *pobj          = NULL;
+	pimple_closure_object *pcobj = NULL;
+	ulong index;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "zz", &offset, &callable) == FAILURE) {
+		return;
+	}
+
+	pobj = zend_object_store_get_object(getThis() TSRMLS_CC);
+
+	switch (Z_TYPE_P(offset)) {
+		case IS_STRING:
+			if (zend_symtable_find(&pobj->values, Z_STRVAL_P(offset), Z_STRLEN_P(offset)+1, (void *)&value) == FAILURE) {
+				pimple_throw_exception_string(pimple_ce_UnknownIdentifierException, Z_STRVAL_P(offset), Z_STRLEN_P(offset) TSRMLS_CC);
+				RETURN_NULL();
+			}
+
+			if (value->type != PIMPLE_IS_SERVICE) {
+				pimple_throw_exception_string(pimple_ce_InvalidServiceIdentifierException, Z_STRVAL_P(offset), Z_STRLEN_P(offset) TSRMLS_CC);
+				RETURN_NULL();
+			}
+			if (zend_hash_index_exists(&pobj->protected, value->handle_num)) {
+				int er = EG(error_reporting);
+				EG(error_reporting) = 0;
+				php_error(E_DEPRECATED, "How Pimple behaves when extending protected closures will be fixed in Pimple 4. Are you sure \"%s\" should be protected?", Z_STRVAL_P(offset));
+				EG(error_reporting) = er;
+			}
+		break;
+		case IS_DOUBLE:
+		case IS_BOOL:
+		case IS_LONG:
+			if (Z_TYPE_P(offset) == IS_DOUBLE) {
+				index = (ulong)Z_DVAL_P(offset);
+			} else {
+				index = Z_LVAL_P(offset);
+			}
+			if (zend_hash_index_find(&pobj->values, index, (void *)&value) == FAILURE) {
+				convert_to_string(offset);
+				pimple_throw_exception_string(pimple_ce_UnknownIdentifierException, Z_STRVAL_P(offset), Z_STRLEN_P(offset) TSRMLS_CC);
+				RETURN_NULL();
+			}
+			if (value->type != PIMPLE_IS_SERVICE) {
+				convert_to_string(offset);
+				pimple_throw_exception_string(pimple_ce_InvalidServiceIdentifierException, Z_STRVAL_P(offset), Z_STRLEN_P(offset) TSRMLS_CC);
+				RETURN_NULL();
+			}
+			if (zend_hash_index_exists(&pobj->protected, value->handle_num)) {
+				int er = EG(error_reporting);
+				EG(error_reporting) = 0;
+				php_error(E_DEPRECATED, "How Pimple behaves when extending protected closures will be fixed in Pimple 4. Are you sure \"%ld\" should be protected?", index);
+				EG(error_reporting) = er;
+			}
+		break;
+		case IS_NULL:
+		default:
+			zend_error(E_WARNING, "Unsupported offset type");
+	}
+
+	if (pimple_zval_is_valid_callback(callable, &bucket TSRMLS_CC) == FAILURE) {
+		pimple_free_bucket(&bucket);
+		zend_throw_exception(pimple_ce_ExpectedInvokableException, "Extension service definition is not a Closure or invokable object.", 0 TSRMLS_CC);
+		RETURN_NULL();
+	}
+	pimple_free_bucket(&bucket);
+
+	ALLOC_INIT_ZVAL(pimple_closure_obj);
+	object_init_ex(pimple_closure_obj, pimple_closure_ce);
+
+	pcobj = zend_object_store_get_object(pimple_closure_obj TSRMLS_CC);
+	pcobj->callable = callable;
+	pcobj->factory  = value->value;
+	Z_ADDREF_P(callable);
+	Z_ADDREF_P(value->value);
+
+	if (zend_hash_index_exists(&pobj->factories, value->handle_num)) {
+		pimple_zval_to_pimpleval(pimple_closure_obj, &bucket TSRMLS_CC);
+		zend_hash_index_del(&pobj->factories, value->handle_num);
+		zend_hash_index_update(&pobj->factories, bucket.handle_num, (void *)&bucket, sizeof(pimple_bucket_value), NULL);
+		Z_ADDREF_P(pimple_closure_obj);
+	}
+
+	pimple_object_write_dimension(getThis(), offset, pimple_closure_obj TSRMLS_CC);
+
+	RETVAL_ZVAL(pimple_closure_obj, 1, 1);
+}
+
+PHP_METHOD(Pimple, keys)
+{
+	HashPosition pos;
+	pimple_object *pobj = NULL;
+	zval **value        = NULL;
+	zval *endval        = NULL;
+	char *str_index     = NULL;
+	int str_len;
+	ulong num_index;
+
+	if (zend_parse_parameters_none() == FAILURE) {
+		return;
+	}
+
+	pobj = zend_object_store_get_object(getThis() TSRMLS_CC);
+	array_init_size(return_value, zend_hash_num_elements(&pobj->values));
+
+	zend_hash_internal_pointer_reset_ex(&pobj->values, &pos);
+
+	while(zend_hash_get_current_data_ex(&pobj->values, (void **)&value, &pos) == SUCCESS) {
+		MAKE_STD_ZVAL(endval);
+		switch (zend_hash_get_current_key_ex(&pobj->values, &str_index, (uint *)&str_len, &num_index, 0, &pos)) {
+			case HASH_KEY_IS_STRING:
+				ZVAL_STRINGL(endval, str_index, str_len - 1, 1);
+				zend_hash_next_index_insert(Z_ARRVAL_P(return_value), &endval, sizeof(zval *), NULL);
+			break;
+			case HASH_KEY_IS_LONG:
+				ZVAL_LONG(endval, num_index);
+				zend_hash_next_index_insert(Z_ARRVAL_P(return_value), &endval, sizeof(zval *), NULL);
+			break;
+		}
+	zend_hash_move_forward_ex(&pobj->values, &pos);
+	}
+}
+
+PHP_METHOD(Pimple, factory)
+{
+	zval *factory       = NULL;
+	pimple_object *pobj = NULL;
+	pimple_bucket_value bucket = {0};
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &factory) == FAILURE) {
+		return;
+	}
+
+	if (pimple_zval_is_valid_callback(factory, &bucket TSRMLS_CC) == FAILURE) {
+		pimple_free_bucket(&bucket);
+		zend_throw_exception(pimple_ce_ExpectedInvokableException, "Service definition is not a Closure or invokable object.", 0 TSRMLS_CC);
+		return;
+	}
+
+	pimple_zval_to_pimpleval(factory, &bucket TSRMLS_CC);
+	pobj = (pimple_object *)zend_object_store_get_object(getThis() TSRMLS_CC);
+
+	if (zend_hash_index_update(&pobj->factories, bucket.handle_num, (void *)&bucket, sizeof(pimple_bucket_value), NULL) == SUCCESS) {
+		Z_ADDREF_P(factory);
+		RETURN_ZVAL(factory, 1 , 0);
+	} else {
+		pimple_free_bucket(&bucket);
+	}
+
+	RETURN_FALSE;
+}
+
+PHP_METHOD(Pimple, offsetSet)
+{
+	zval *offset = NULL, *value = NULL;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "zz", &offset, &value) == FAILURE) {
+		return;
+	}
+
+	pimple_object_write_dimension(getThis(), offset, value TSRMLS_CC);
+}
+
+PHP_METHOD(Pimple, offsetGet)
+{
+	zval *offset = NULL, *retval = NULL;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &offset) == FAILURE) {
+		return;
+	}
+
+	retval = pimple_object_read_dimension(getThis(), offset, 0 TSRMLS_CC);
+
+	RETVAL_ZVAL(retval, 1, 0);
+}
+
+PHP_METHOD(Pimple, offsetUnset)
+{
+	zval *offset = NULL;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &offset) == FAILURE) {
+		return;
+	}
+
+	pimple_object_unset_dimension(getThis(), offset TSRMLS_CC);
+}
+
+PHP_METHOD(Pimple, offsetExists)
+{
+	zval *offset = NULL;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &offset) == FAILURE) {
+		return;
+	}
+
+	RETVAL_BOOL(pimple_object_has_dimension(getThis(), offset, 1 TSRMLS_CC));
+}
+
+PHP_METHOD(Pimple, register)
+{
+	zval *provider;
+	zval **data;
+	zval *retval = NULL;
+	zval key;
+
+	HashTable *array = NULL;
+	HashPosition pos;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O|h", &provider, pimple_serviceprovider_ce, &array) == FAILURE) {
+		return;
+	}
+
+	RETVAL_ZVAL(getThis(), 1, 0);
+
+	zend_call_method_with_1_params(&provider, Z_OBJCE_P(provider), NULL, "register", &retval, getThis());
+
+	if (retval) {
+		zval_ptr_dtor(&retval);
+	}
+
+	if (!array) {
+		return;
+	}
+
+	zend_hash_internal_pointer_reset_ex(array, &pos);
+
+	while(zend_hash_get_current_data_ex(array, (void **)&data, &pos) == SUCCESS) {
+		zend_hash_get_current_key_zval_ex(array, &key, &pos);
+		pimple_object_write_dimension(getThis(), &key, *data TSRMLS_CC);
+		zend_hash_move_forward_ex(array, &pos);
+	}
+}
+
+PHP_METHOD(Pimple, __construct)
+{
+	zval *values = NULL, **pData = NULL, offset;
+	HashPosition pos;
+	char *str_index = NULL;
+	zend_uint str_length;
+	ulong num_index;
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|a!", &values) == FAILURE) {
+		return;
+	}
+
+	PIMPLE_DEPRECATE
+
+	if (!values) {
+		return;
+	}
+
+	zend_hash_internal_pointer_reset_ex(Z_ARRVAL_P(values), &pos);
+	while (zend_hash_has_more_elements_ex(Z_ARRVAL_P(values), &pos) == SUCCESS) {
+			zend_hash_get_current_data_ex(Z_ARRVAL_P(values), (void **)&pData, &pos);
+			zend_hash_get_current_key_ex(Z_ARRVAL_P(values), &str_index, &str_length, &num_index, 0, &pos);
+			INIT_ZVAL(offset);
+			if (zend_hash_get_current_key_type_ex(Z_ARRVAL_P(values), &pos) == HASH_KEY_IS_LONG) {
+				ZVAL_LONG(&offset, num_index);
+			} else {
+				ZVAL_STRINGL(&offset, str_index, (str_length - 1), 0);
+			}
+		pimple_object_write_dimension(getThis(), &offset, *pData TSRMLS_CC);
+		zend_hash_move_forward_ex(Z_ARRVAL_P(values), &pos);
+	}
+}
+
+/*
+ * This is PHP code snippet handling extend()s calls :
+
+  $extended = function ($c) use ($callable, $factory) {
+      return $callable($factory($c), $c);
+  };
+
+ */
+PHP_METHOD(PimpleClosure, invoker)
+{
+	pimple_closure_object *pcobj = NULL;
+	zval *arg = NULL, *retval = NULL, *newretval = NULL;
+	zend_fcall_info fci        = {0};
+	zval **args[2];
+
+	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &arg) == FAILURE) {
+		return;
+	}
+
+	pcobj = zend_object_store_get_object(getThis() TSRMLS_CC);
+
+	fci.function_name = pcobj->factory;
+	args[0] = &arg;
+	zend_fcall_info_argp(&fci TSRMLS_CC, 1, args);
+	fci.retval_ptr_ptr = &retval;
+	fci.size = sizeof(fci);
+
+	if (zend_call_function(&fci, NULL TSRMLS_CC) == FAILURE || EG(exception)) {
+		efree(fci.params);
+		return; /* Should here return default zval */
+	}
+
+	efree(fci.params);
+	memset(&fci, 0, sizeof(fci));
+	fci.size = sizeof(fci);
+
+	fci.function_name = pcobj->callable;
+	args[0] = &retval;
+	args[1] = &arg;
+	zend_fcall_info_argp(&fci TSRMLS_CC, 2, args);
+	fci.retval_ptr_ptr = &newretval;
+
+	if (zend_call_function(&fci, NULL TSRMLS_CC) == FAILURE || EG(exception)) {
+		efree(fci.params);
+		zval_ptr_dtor(&retval);
+		return;
+	}
+
+	efree(fci.params);
+	zval_ptr_dtor(&retval);
+
+	RETVAL_ZVAL(newretval, 1 ,1);
+}
+
+PHP_MINIT_FUNCTION(pimple)
+{
+	zend_class_entry tmp_ce_PsrContainerInterface, tmp_ce_PsrContainerExceptionInterface, tmp_ce_PsrNotFoundExceptionInterface;
+	zend_class_entry tmp_ce_ExpectedInvokableException, tmp_ce_FrozenServiceException, tmp_ce_InvalidServiceIdentifierException, tmp_ce_UnknownIdentifierException;
+	zend_class_entry tmp_pimple_ce, tmp_pimple_closure_ce, tmp_pimple_serviceprovider_iface_ce;
+
+	/* Psr\Container namespace */
+	INIT_NS_CLASS_ENTRY(tmp_ce_PsrContainerInterface,          PSR_CONTAINER_NS, "ContainerInterface",           pimple_ce_PsrContainerInterface_functions);
+	INIT_NS_CLASS_ENTRY(tmp_ce_PsrContainerExceptionInterface, PSR_CONTAINER_NS, "ContainerExceptionInterface", pimple_ce_PsrContainerExceptionInterface_functions);
+	INIT_NS_CLASS_ENTRY(tmp_ce_PsrNotFoundExceptionInterface,  PSR_CONTAINER_NS, "NotFoundExceptionInterface",  pimple_ce_PsrNotFoundExceptionInterface_functions);
+
+	pimple_ce_PsrContainerInterface          = zend_register_internal_interface(&tmp_ce_PsrContainerInterface TSRMLS_CC);
+	pimple_ce_PsrContainerExceptionInterface = zend_register_internal_interface(&tmp_ce_PsrContainerExceptionInterface TSRMLS_CC);
+	pimple_ce_PsrNotFoundExceptionInterface  = zend_register_internal_interface(&tmp_ce_PsrNotFoundExceptionInterface TSRMLS_CC);
+
+	zend_class_implements(pimple_ce_PsrNotFoundExceptionInterface TSRMLS_CC, 1, pimple_ce_PsrContainerExceptionInterface);
+
+	/* Pimple\Exception namespace */
+	INIT_NS_CLASS_ENTRY(tmp_ce_ExpectedInvokableException,        PIMPLE_EXCEPTION_NS, "ExpectedInvokableException",         NULL);
+	INIT_NS_CLASS_ENTRY(tmp_ce_FrozenServiceException,            PIMPLE_EXCEPTION_NS, "FrozenServiceException",             pimple_ce_FrozenServiceException_functions);
+	INIT_NS_CLASS_ENTRY(tmp_ce_InvalidServiceIdentifierException, PIMPLE_EXCEPTION_NS, "InvalidServiceIdentifierException", pimple_ce_InvalidServiceIdentifierException_functions);
+	INIT_NS_CLASS_ENTRY(tmp_ce_UnknownIdentifierException,        PIMPLE_EXCEPTION_NS, "UnknownIdentifierException",         pimple_ce_UnknownIdentifierException_functions);
+
+	pimple_ce_ExpectedInvokableException        = zend_register_internal_class_ex(&tmp_ce_ExpectedInvokableException, spl_ce_InvalidArgumentException, NULL TSRMLS_CC);
+	pimple_ce_FrozenServiceException            = zend_register_internal_class_ex(&tmp_ce_FrozenServiceException, spl_ce_RuntimeException, NULL TSRMLS_CC);
+	pimple_ce_InvalidServiceIdentifierException = zend_register_internal_class_ex(&tmp_ce_InvalidServiceIdentifierException, spl_ce_InvalidArgumentException, NULL TSRMLS_CC);
+	pimple_ce_UnknownIdentifierException        = zend_register_internal_class_ex(&tmp_ce_UnknownIdentifierException, spl_ce_InvalidArgumentException, NULL TSRMLS_CC);
+
+	zend_class_implements(pimple_ce_ExpectedInvokableException TSRMLS_CC,        1, pimple_ce_PsrContainerExceptionInterface);
+	zend_class_implements(pimple_ce_FrozenServiceException TSRMLS_CC,            1, pimple_ce_PsrContainerExceptionInterface);
+	zend_class_implements(pimple_ce_InvalidServiceIdentifierException TSRMLS_CC, 1, pimple_ce_PsrContainerExceptionInterface);
+	zend_class_implements(pimple_ce_UnknownIdentifierException TSRMLS_CC,        1, pimple_ce_PsrNotFoundExceptionInterface);
+
+    /* Pimple namespace */
+	INIT_NS_CLASS_ENTRY(tmp_pimple_ce, PIMPLE_NS, "Container", pimple_ce_functions);
+	INIT_NS_CLASS_ENTRY(tmp_pimple_closure_ce, PIMPLE_NS, "ContainerClosure", NULL);
+	INIT_NS_CLASS_ENTRY(tmp_pimple_serviceprovider_iface_ce, PIMPLE_NS, "ServiceProviderInterface", pimple_serviceprovider_iface_ce_functions);
+
+	tmp_pimple_ce.create_object         = pimple_object_create;
+	tmp_pimple_closure_ce.create_object = pimple_closure_object_create;
+
+	pimple_ce = zend_register_internal_class(&tmp_pimple_ce TSRMLS_CC);
+	zend_class_implements(pimple_ce TSRMLS_CC, 1, zend_ce_arrayaccess);
+
+	pimple_closure_ce = zend_register_internal_class(&tmp_pimple_closure_ce TSRMLS_CC);
+	pimple_closure_ce->ce_flags |= ZEND_ACC_FINAL_CLASS;
+
+	pimple_serviceprovider_ce = zend_register_internal_interface(&tmp_pimple_serviceprovider_iface_ce TSRMLS_CC);
+
+	memcpy(&pimple_closure_object_handlers, zend_get_std_object_handlers(), sizeof(*zend_get_std_object_handlers()));
+	pimple_object_handlers                     = std_object_handlers;
+	pimple_closure_object_handlers.get_closure = pimple_closure_get_closure;
+
+	pimple_closure_invoker_function.function_name     = "Pimple closure internal invoker";
+	pimple_closure_invoker_function.fn_flags         |= ZEND_ACC_CLOSURE;
+	pimple_closure_invoker_function.handler           = ZEND_MN(PimpleClosure_invoker);
+	pimple_closure_invoker_function.num_args          = 1;
+	pimple_closure_invoker_function.required_num_args = 1;
+	pimple_closure_invoker_function.scope             = pimple_closure_ce;
+	pimple_closure_invoker_function.type              = ZEND_INTERNAL_FUNCTION;
+	pimple_closure_invoker_function.module            = &pimple_module_entry;
+
+	return SUCCESS;
+}
+
+PHP_MINFO_FUNCTION(pimple)
+{
+	php_info_print_table_start();
+	php_info_print_table_header(2, "SensioLabs Pimple C support", "enabled");
+	php_info_print_table_row(2, "Pimple supported version", PIMPLE_VERSION);
+	php_info_print_table_end();
+
+	php_info_print_box_start(0);
+	php_write((void *)ZEND_STRL("SensioLabs Pimple C support developed by Julien Pauli") TSRMLS_CC);
+	if (!sapi_module.phpinfo_as_text) {
+		php_write((void *)ZEND_STRL(sensiolabs_logo) TSRMLS_CC);
+	}
+	php_info_print_box_end();
+}
+
+zend_module_entry pimple_module_entry = {
+	STANDARD_MODULE_HEADER,
+	"pimple",
+	NULL,
+	PHP_MINIT(pimple),
+	NULL,
+	NULL,
+	NULL,
+	PHP_MINFO(pimple),
+	PIMPLE_VERSION,
+	STANDARD_MODULE_PROPERTIES
+};
+
+#ifdef COMPILE_DL_PIMPLE
+ZEND_GET_MODULE(pimple)
+#endif
diff --git a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/pimple_compat.h b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/pimple_compat.h
new file mode 100644
index 00000000..d234e174
--- /dev/null
+++ b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/pimple_compat.h
@@ -0,0 +1,81 @@
+
+/*
+ * This file is part of Pimple.
+ *
+ * Copyright (c) 2014 Fabien Potencier
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is furnished
+ * to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef PIMPLE_COMPAT_H_
+#define PIMPLE_COMPAT_H_
+
+#include "Zend/zend_extensions.h" /* for ZEND_EXTENSION_API_NO */
+
+#define PHP_5_0_X_API_NO		220040412
+#define PHP_5_1_X_API_NO		220051025
+#define PHP_5_2_X_API_NO		220060519
+#define PHP_5_3_X_API_NO		220090626
+#define PHP_5_4_X_API_NO		220100525
+#define PHP_5_5_X_API_NO		220121212
+#define PHP_5_6_X_API_NO		220131226
+
+#define IS_PHP_56 ZEND_EXTENSION_API_NO == PHP_5_6_X_API_NO
+#define IS_AT_LEAST_PHP_56 ZEND_EXTENSION_API_NO >= PHP_5_6_X_API_NO
+
+#define IS_PHP_55 ZEND_EXTENSION_API_NO == PHP_5_5_X_API_NO
+#define IS_AT_LEAST_PHP_55 ZEND_EXTENSION_API_NO >= PHP_5_5_X_API_NO
+
+#define IS_PHP_54 ZEND_EXTENSION_API_NO == PHP_5_4_X_API_NO
+#define IS_AT_LEAST_PHP_54 ZEND_EXTENSION_API_NO >= PHP_5_4_X_API_NO
+
+#define IS_PHP_53 ZEND_EXTENSION_API_NO == PHP_5_3_X_API_NO
+#define IS_AT_LEAST_PHP_53 ZEND_EXTENSION_API_NO >= PHP_5_3_X_API_NO
+
+#if IS_PHP_53
+#define object_properties_init(obj, ce) do { \
+		 zend_hash_copy(obj->properties, &ce->default_properties, zval_copy_property_ctor(ce), NULL, sizeof(zval *)); \
+		} while (0);
+#endif
+
+#define ZEND_OBJ_INIT(obj, ce) do { \
+		zend_object_std_init(obj, ce TSRMLS_CC); \
+		object_properties_init((obj), (ce)); \
+	} while(0);
+
+#if IS_PHP_53 || IS_PHP_54
+static void zend_hash_get_current_key_zval_ex(const HashTable *ht, zval *key, HashPosition *pos) {
+    Bucket *p;
+
+    p = pos ? (*pos) : ht->pInternalPointer;
+
+    if (!p) {
+        Z_TYPE_P(key) = IS_NULL;
+    } else if (p->nKeyLength) {
+        Z_TYPE_P(key) = IS_STRING;
+        Z_STRVAL_P(key) = estrndup(p->arKey, p->nKeyLength - 1);
+        Z_STRLEN_P(key) = p->nKeyLength - 1;
+    } else {
+        Z_TYPE_P(key) = IS_LONG;
+        Z_LVAL_P(key) = p->h;
+    }
+}
+#endif
+
+#endif /* PIMPLE_COMPAT_H_ */
diff --git a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/001.phpt b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/001.phpt
new file mode 100644
index 00000000..0809ea23
--- /dev/null
+++ b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/001.phpt
@@ -0,0 +1,45 @@
+--TEST--
+Test for read_dim/write_dim handlers
+--SKIPIF--
+<?php if (!extension_loaded("pimple")) print "skip"; ?>
+--FILE--
+<?php 
+$p = new Pimple\Container();
+$p[42] = 'foo';
+$p['foo'] = 42;
+
+echo $p[42];
+echo "\n";
+echo $p['foo'];
+echo "\n";
+try {
+	var_dump($p['nonexistant']);
+	echo "Exception excpected";
+} catch (InvalidArgumentException $e) { }
+
+$p[54.2] = 'foo2';
+echo $p[54];
+echo "\n";
+$p[242.99] = 'foo99';
+echo $p[242];
+
+echo "\n";
+
+$p[5] = 'bar';
+$p[5] = 'baz';
+echo $p[5];
+
+echo "\n";
+
+$p['str'] = 'str';
+$p['str'] = 'strstr';
+echo $p['str'];
+?>
+
+--EXPECTF--
+foo
+42
+foo2
+foo99
+baz
+strstr
\ No newline at end of file
diff --git a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/002.phpt b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/002.phpt
new file mode 100644
index 00000000..7b56d2c1
--- /dev/null
+++ b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/002.phpt
@@ -0,0 +1,15 @@
+--TEST--
+Test for constructor
+--SKIPIF--
+<?php if (!extension_loaded("pimple")) print "skip"; ?>
+--FILE--
+<?php 
+$p = new Pimple\Container();
+var_dump($p[42]);
+
+$p = new Pimple\Container(array(42=>'foo'));
+var_dump($p[42]);
+?>
+--EXPECT--
+NULL
+string(3) "foo"
diff --git a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/003.phpt b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/003.phpt
new file mode 100644
index 00000000..a22cfa35
--- /dev/null
+++ b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/003.phpt
@@ -0,0 +1,16 @@
+--TEST--
+Test empty dimensions
+--SKIPIF--
+<?php if (!extension_loaded("pimple")) print "skip"; ?>
+--FILE--
+<?php 
+$p = new Pimple\Container();
+$p[] = 42;
+var_dump($p[0]);
+$p[41] = 'foo';
+$p[] = 'bar';
+var_dump($p[42]);
+?>
+--EXPECT--
+int(42)
+string(3) "bar"
\ No newline at end of file
diff --git a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/004.phpt b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/004.phpt
new file mode 100644
index 00000000..1e1d2513
--- /dev/null
+++ b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/004.phpt
@@ -0,0 +1,30 @@
+--TEST--
+Test has/unset dim handlers
+--SKIPIF--
+<?php if (!extension_loaded("pimple")) print "skip"; ?>
+--FILE--
+<?php 
+$p = new Pimple\Container();
+$p[] = 42;
+var_dump($p[0]);
+unset($p[0]);
+var_dump($p[0]);
+$p['foo'] = 'bar';
+var_dump(isset($p['foo']));
+unset($p['foo']);
+try {
+	var_dump($p['foo']);
+	echo "Excpected exception";
+} catch (InvalidArgumentException $e) { }
+var_dump(isset($p['bar']));
+$p['bar'] = NULL;
+var_dump(isset($p['bar']));
+var_dump(empty($p['bar']));
+?>
+--EXPECT--
+int(42)
+NULL
+bool(true)
+bool(false)
+bool(true)
+bool(true)
\ No newline at end of file
diff --git a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/005.phpt b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/005.phpt
new file mode 100644
index 00000000..0479ee05
--- /dev/null
+++ b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/005.phpt
@@ -0,0 +1,27 @@
+--TEST--
+Test simple class inheritance
+--SKIPIF--
+<?php if (!extension_loaded("pimple")) print "skip"; ?>
+--FILE--
+<?php 
+class MyPimple extends Pimple\Container
+{
+	public $someAttr = 'fooAttr';
+
+    public function offsetget($o)
+    {
+        var_dump("hit");
+        return parent::offsetget($o);
+    }
+}
+
+$p = new MyPimple;
+$p[42] = 'foo';
+echo $p[42];
+echo "\n";
+echo $p->someAttr;
+?>
+--EXPECT--
+string(3) "hit"
+foo
+fooAttr
\ No newline at end of file
diff --git a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/006.phpt b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/006.phpt
new file mode 100644
index 00000000..cfe8a119
--- /dev/null
+++ b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/006.phpt
@@ -0,0 +1,51 @@
+--TEST--
+Test complex class inheritance
+--SKIPIF--
+<?php if (!extension_loaded("pimple")) print "skip"; ?>
+--FILE--
+<?php 
+class MyPimple extends Pimple\Container
+{
+    public function offsetget($o)
+    {
+        var_dump("hit offsetget in " . __CLASS__);
+        return parent::offsetget($o);
+    }
+}
+
+class TestPimple extends MyPimple
+{
+    public function __construct($values)
+    {
+        array_shift($values);
+        parent::__construct($values);
+    }
+    
+    public function offsetget($o)
+    {
+        var_dump('hit offsetget in ' . __CLASS__);
+        return parent::offsetget($o);
+    }
+    
+    public function offsetset($o, $v)
+    {
+        var_dump('hit offsetset');
+        return parent::offsetset($o, $v);
+    }
+}
+
+$defaultValues = array('foo' => 'bar', 88 => 'baz');
+
+$p = new TestPimple($defaultValues);
+$p[42] = 'foo';
+var_dump($p[42]);
+var_dump($p[0]);
+?>
+--EXPECT--
+string(13) "hit offsetset"
+string(27) "hit offsetget in TestPimple"
+string(25) "hit offsetget in MyPimple"
+string(3) "foo"
+string(27) "hit offsetget in TestPimple"
+string(25) "hit offsetget in MyPimple"
+string(3) "baz"
\ No newline at end of file
diff --git a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/007.phpt b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/007.phpt
new file mode 100644
index 00000000..5aac6838
--- /dev/null
+++ b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/007.phpt
@@ -0,0 +1,22 @@
+--TEST--
+Test for read_dim/write_dim handlers
+--SKIPIF--
+<?php if (!extension_loaded("pimple")) print "skip"; ?>
+--FILE--
+<?php 
+$p = new Pimple\Container();
+$p[42] = 'foo';
+$p['foo'] = 42;
+
+echo $p[42];
+echo "\n";
+echo $p['foo'];
+echo "\n";
+try {
+	var_dump($p['nonexistant']);
+	echo "Exception excpected";
+} catch (InvalidArgumentException $e) { }
+?>
+--EXPECTF--
+foo
+42
\ No newline at end of file
diff --git a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/008.phpt b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/008.phpt
new file mode 100644
index 00000000..db7eeec4
--- /dev/null
+++ b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/008.phpt
@@ -0,0 +1,29 @@
+--TEST--
+Test frozen services
+--SKIPIF--
+<?php if (!extension_loaded("pimple")) print "skip"; ?>
+--FILE--
+<?php 
+$p = new Pimple\Container();
+$p[42] = 'foo';
+$p[42] = 'bar';
+
+$p['foo'] = function () { };
+$p['foo'] = function () { };
+
+$a = $p['foo'];
+
+try {
+	$p['foo'] = function () { };
+	echo "Exception excpected";
+} catch (RuntimeException $e) { }
+
+$p[42] = function() { };
+$a = $p[42];
+
+try {
+	$p[42] = function () { };
+	echo "Exception excpected";
+} catch (RuntimeException $e) { }
+?>
+--EXPECTF--
diff --git a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/009.phpt b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/009.phpt
new file mode 100644
index 00000000..bb05ea29
--- /dev/null
+++ b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/009.phpt
@@ -0,0 +1,13 @@
+--TEST--
+Test service is called as callback, and only once
+--SKIPIF--
+<?php if (!extension_loaded("pimple")) print "skip"; ?>
+--FILE--
+<?php 
+$p = new Pimple\Container();
+$p['foo'] = function($arg) use ($p) { var_dump($p === $arg); };
+$a = $p['foo'];
+$b = $p['foo']; /* should return not calling the callback */
+?>
+--EXPECTF--
+bool(true)
\ No newline at end of file
diff --git a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/010.phpt b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/010.phpt
new file mode 100644
index 00000000..badce014
--- /dev/null
+++ b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/010.phpt
@@ -0,0 +1,45 @@
+--TEST--
+Test service is called as callback for every callback type
+--SKIPIF--
+<?php if (!extension_loaded("pimple")) print "skip"; ?>
+--FILE--
+<?php
+function callme()
+{
+    return 'called';
+}
+
+$a = function() { return 'called'; };
+
+class Foo
+{
+    public static function bar()
+    {
+        return 'called';
+    }
+}
+ 
+$p = new Pimple\Container();
+$p['foo'] = 'callme';
+echo $p['foo'] . "\n";
+
+$p['bar'] = $a;
+echo $p['bar'] . "\n";
+
+$p['baz'] = "Foo::bar";
+echo $p['baz'] . "\n";
+
+$p['foobar'] = array('Foo', 'bar');
+var_dump($p['foobar']);
+
+?>
+--EXPECTF--
+callme
+called
+Foo::bar
+array(2) {
+  [0]=>
+  string(3) "Foo"
+  [1]=>
+  string(3) "bar"
+}
\ No newline at end of file
diff --git a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/011.phpt b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/011.phpt
new file mode 100644
index 00000000..6682ab8e
--- /dev/null
+++ b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/011.phpt
@@ -0,0 +1,19 @@
+--TEST--
+Test service callback throwing an exception
+--SKIPIF--
+<?php if (!extension_loaded("pimple")) print "skip"; ?>
+--FILE--
+<?php
+class CallBackException extends RuntimeException { }
+
+$p = new Pimple\Container();
+$p['foo'] = function () { throw new CallBackException; };
+try {
+	echo $p['foo'] . "\n";
+	echo "should not come here";
+} catch (CallBackException $e) {
+	echo "all right!";
+}
+?>
+--EXPECTF--
+all right!
\ No newline at end of file
diff --git a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/012.phpt b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/012.phpt
new file mode 100644
index 00000000..4c6ac486
--- /dev/null
+++ b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/012.phpt
@@ -0,0 +1,28 @@
+--TEST--
+Test service factory
+--SKIPIF--
+<?php if (!extension_loaded("pimple")) print "skip"; ?>
+--FILE--
+<?php
+
+$p = new Pimple\Container();
+
+$p->factory($f = function() { var_dump('called-1'); return 'ret-1';});
+
+$p[] = $f;
+
+$p[] = function () { var_dump('called-2'); return 'ret-2'; };
+
+var_dump($p[0]);
+var_dump($p[0]);
+var_dump($p[1]);
+var_dump($p[1]);
+?>
+--EXPECTF--
+string(8) "called-1"
+string(5) "ret-1"
+string(8) "called-1"
+string(5) "ret-1"
+string(8) "called-2"
+string(5) "ret-2"
+string(5) "ret-2"
\ No newline at end of file
diff --git a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/013.phpt b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/013.phpt
new file mode 100644
index 00000000..f419958c
--- /dev/null
+++ b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/013.phpt
@@ -0,0 +1,33 @@
+--TEST--
+Test keys()
+--SKIPIF--
+<?php if (!extension_loaded("pimple")) print "skip"; ?>
+--FILE--
+<?php
+
+$p = new Pimple\Container();
+
+var_dump($p->keys());
+
+$p['foo'] = 'bar';
+$p[] = 'foo';
+
+var_dump($p->keys());
+
+unset($p['foo']);
+
+var_dump($p->keys());
+?>
+--EXPECTF--
+array(0) {
+}
+array(2) {
+  [0]=>
+  string(3) "foo"
+  [1]=>
+  int(0)
+}
+array(1) {
+  [0]=>
+  int(0)
+}
\ No newline at end of file
diff --git a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/014.phpt b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/014.phpt
new file mode 100644
index 00000000..ac937213
--- /dev/null
+++ b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/014.phpt
@@ -0,0 +1,30 @@
+--TEST--
+Test raw()
+--SKIPIF--
+<?php if (!extension_loaded("pimple")) print "skip"; ?>
+--FILE--
+<?php
+
+$p = new Pimple\Container();
+$f = function () { var_dump('called-2'); return 'ret-2'; };
+
+$p['foo'] = $f;
+$p[42]    = $f;
+
+var_dump($p['foo']);
+var_dump($p->raw('foo'));
+var_dump($p[42]);
+
+unset($p['foo']);
+
+try {
+	$p->raw('foo');
+	echo "expected exception";
+} catch (InvalidArgumentException $e) { }
+--EXPECTF--
+string(8) "called-2"
+string(5) "ret-2"
+object(Closure)#%i (0) {
+}
+string(8) "called-2"
+string(5) "ret-2"
\ No newline at end of file
diff --git a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/015.phpt b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/015.phpt
new file mode 100644
index 00000000..314f008a
--- /dev/null
+++ b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/015.phpt
@@ -0,0 +1,17 @@
+--TEST--
+Test protect()
+--SKIPIF--
+<?php if (!extension_loaded("pimple")) print "skip"; ?>
+--FILE--
+<?php
+
+$p = new Pimple\Container();
+$f = function () { return 'foo'; };
+$p['foo'] = $f;
+
+$p->protect($f);
+
+var_dump($p['foo']);
+--EXPECTF--
+object(Closure)#%i (0) {
+}
\ No newline at end of file
diff --git a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/016.phpt b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/016.phpt
new file mode 100644
index 00000000..e55edb0a
--- /dev/null
+++ b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/016.phpt
@@ -0,0 +1,24 @@
+--TEST--
+Test extend()
+--SKIPIF--
+<?php if (!extension_loaded("pimple")) print "skip"; ?>
+--FILE--
+<?php
+/*
+ This is part of Pimple::extend() code :
+
+          $extended = function ($c) use ($callable, $factory) {
+             return $callable($factory($c), $c);
+          };
+*/
+
+$p = new Pimple\Container();
+$p[12] = function ($v) { var_dump($v); return 'foo';}; /* $factory in code above */
+
+$c = $p->extend(12, function ($w) { var_dump($w); return 'bar'; }); /* $callable in code above */
+
+var_dump($c('param'));
+--EXPECTF--
+string(5) "param"
+string(3) "foo"
+string(3) "bar"
\ No newline at end of file
diff --git a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/017.phpt b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/017.phpt
new file mode 100644
index 00000000..bac23ce0
--- /dev/null
+++ b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/017.phpt
@@ -0,0 +1,17 @@
+--TEST--
+Test extend() with exception in service extension
+--SKIPIF--
+<?php if (!extension_loaded("pimple")) print "skip"; ?>
+--FILE--
+<?php
+
+$p = new Pimple\Container();
+$p[12] = function ($v) { return 'foo';};
+
+$c = $p->extend(12, function ($w) { throw new BadMethodCallException; });
+
+try {
+	$p[12];
+	echo "Exception expected";
+} catch (BadMethodCallException $e) { }
+--EXPECTF--
diff --git a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/017_1.phpt b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/017_1.phpt
new file mode 100644
index 00000000..8f881d6e
--- /dev/null
+++ b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/017_1.phpt
@@ -0,0 +1,17 @@
+--TEST--
+Test extend() with exception in service factory
+--SKIPIF--
+<?php if (!extension_loaded("pimple")) print "skip"; ?>
+--FILE--
+<?php
+
+$p = new Pimple\Container();
+$p[12] = function ($v) { throw new BadMethodCallException; };
+
+$c = $p->extend(12, function ($w) { return 'foobar'; });
+
+try {
+	$p[12];
+	echo "Exception expected";
+} catch (BadMethodCallException $e) { }
+--EXPECTF--
diff --git a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/018.phpt b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/018.phpt
new file mode 100644
index 00000000..27c12a14
--- /dev/null
+++ b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/018.phpt
@@ -0,0 +1,23 @@
+--TEST--
+Test register()
+--SKIPIF--
+<?php if (!extension_loaded("pimple")) print "skip"; ?>
+--FILE--
+<?php
+
+class Foo implements Pimple\ServiceProviderInterface
+{
+    public function register(Pimple\Container $p)
+    {
+        var_dump($p);
+    }
+}
+
+$p = new Pimple\Container();
+$p->register(new Foo, array(42 => 'bar'));
+
+var_dump($p[42]);
+--EXPECTF--
+object(Pimple\Container)#1 (0) {
+}
+string(3) "bar"
\ No newline at end of file
diff --git a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/019.phpt b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/019.phpt
new file mode 100644
index 00000000..28a9aeca
--- /dev/null
+++ b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/019.phpt
@@ -0,0 +1,18 @@
+--TEST--
+Test register() returns static and is a fluent interface
+--SKIPIF--
+<?php if (!extension_loaded("pimple")) print "skip"; ?>
+--FILE--
+<?php
+
+class Foo implements Pimple\ServiceProviderInterface
+{
+    public function register(Pimple\Container $p)
+    {
+    }
+}
+
+$p = new Pimple\Container();
+var_dump($p === $p->register(new Foo));
+--EXPECTF--
+bool(true)
diff --git a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/bench.phpb b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/bench.phpb
new file mode 100644
index 00000000..8f983e65
--- /dev/null
+++ b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/bench.phpb
@@ -0,0 +1,51 @@
+<?php
+
+if (!class_exists('Pimple\Container')) {
+    require_once __DIR__ . '/../../../src/Pimple/Container.php';
+} else {
+    echo "pimple-c extension detected, using...\n\n";
+}
+
+$time = microtime(true);
+
+function foo() { }
+$factory = function () { };
+
+for ($i=0; $i<10000; $i++) {
+
+$p = new Pimple\Container;
+
+$p['foo'] = 'bar';
+
+if (!isset($p[3])) {
+    $p[3] = $p['foo'];
+    $p[]  = 'bar';
+}
+
+$p[2] = 42;
+
+if (isset($p[2])) {
+	unset($p[2]);
+}
+
+$p[42] = $p['foo'];
+
+$p['cb'] = function($arg) { };
+
+$p[] = $p['cb'];
+
+echo $p['cb'];
+echo $p['cb'];
+echo $p['cb'];
+
+//$p->factory($factory);
+
+$p['factory'] = $factory;
+
+echo $p['factory'];
+echo $p['factory'];
+echo $p['factory'];
+
+}
+
+echo microtime(true)  - $time;
diff --git a/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/bench_shared.phpb b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/bench_shared.phpb
new file mode 100644
index 00000000..aec541f0
--- /dev/null
+++ b/advancedcontentfilter/vendor/pimple/pimple/ext/pimple/tests/bench_shared.phpb
@@ -0,0 +1,25 @@
+<?php
+
+if (!class_exists('Pimple\Container')) {
+    require_once __DIR__ . '/../../../src/Pimple/Container.php';
+} else {
+    echo "pimple-c extension detected, using...\n\n";
+}
+
+$time = microtime(true);
+
+
+$service = function ($arg) { return "I'm a service"; };
+
+for ($i=0; $i<10000; $i++) {
+
+$p = new Pimple\Container;
+$p['my_service'] = $service;
+
+$a = $p['my_service'];
+$b = $p['my_service'];
+
+}
+
+echo microtime(true) - $time;
+?>
diff --git a/advancedcontentfilter/vendor/pimple/pimple/phpunit.xml.dist b/advancedcontentfilter/vendor/pimple/pimple/phpunit.xml.dist
new file mode 100644
index 00000000..5c8d487f
--- /dev/null
+++ b/advancedcontentfilter/vendor/pimple/pimple/phpunit.xml.dist
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
+         backupGlobals="false"
+         colors="true"
+         bootstrap="vendor/autoload.php"
+>
+    <testsuites>
+        <testsuite name="Pimple Test Suite">
+            <directory>./src/Pimple/Tests</directory>
+        </testsuite>
+    </testsuites>
+</phpunit>
diff --git a/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Container.php b/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Container.php
new file mode 100644
index 00000000..707b92b8
--- /dev/null
+++ b/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Container.php
@@ -0,0 +1,298 @@
+<?php
+
+/*
+ * This file is part of Pimple.
+ *
+ * Copyright (c) 2009 Fabien Potencier
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is furnished
+ * to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+namespace Pimple;
+
+use Pimple\Exception\ExpectedInvokableException;
+use Pimple\Exception\FrozenServiceException;
+use Pimple\Exception\InvalidServiceIdentifierException;
+use Pimple\Exception\UnknownIdentifierException;
+
+/**
+ * Container main class.
+ *
+ * @author Fabien Potencier
+ */
+class Container implements \ArrayAccess
+{
+    private $values = array();
+    private $factories;
+    private $protected;
+    private $frozen = array();
+    private $raw = array();
+    private $keys = array();
+
+    /**
+     * Instantiates the container.
+     *
+     * Objects and parameters can be passed as argument to the constructor.
+     *
+     * @param array $values The parameters or objects
+     */
+    public function __construct(array $values = array())
+    {
+        $this->factories = new \SplObjectStorage();
+        $this->protected = new \SplObjectStorage();
+
+        foreach ($values as $key => $value) {
+            $this->offsetSet($key, $value);
+        }
+    }
+
+    /**
+     * Sets a parameter or an object.
+     *
+     * Objects must be defined as Closures.
+     *
+     * Allowing any PHP callable leads to difficult to debug problems
+     * as function names (strings) are callable (creating a function with
+     * the same name as an existing parameter would break your container).
+     *
+     * @param string $id    The unique identifier for the parameter or object
+     * @param mixed  $value The value of the parameter or a closure to define an object
+     *
+     * @throws FrozenServiceException Prevent override of a frozen service
+     */
+    public function offsetSet($id, $value)
+    {
+        if (isset($this->frozen[$id])) {
+            throw new FrozenServiceException($id);
+        }
+
+        $this->values[$id] = $value;
+        $this->keys[$id] = true;
+    }
+
+    /**
+     * Gets a parameter or an object.
+     *
+     * @param string $id The unique identifier for the parameter or object
+     *
+     * @return mixed The value of the parameter or an object
+     *
+     * @throws UnknownIdentifierException If the identifier is not defined
+     */
+    public function offsetGet($id)
+    {
+        if (!isset($this->keys[$id])) {
+            throw new UnknownIdentifierException($id);
+        }
+
+        if (
+            isset($this->raw[$id])
+            || !\is_object($this->values[$id])
+            || isset($this->protected[$this->values[$id]])
+            || !\method_exists($this->values[$id], '__invoke')
+        ) {
+            return $this->values[$id];
+        }
+
+        if (isset($this->factories[$this->values[$id]])) {
+            return $this->values[$id]($this);
+        }
+
+        $raw = $this->values[$id];
+        $val = $this->values[$id] = $raw($this);
+        $this->raw[$id] = $raw;
+
+        $this->frozen[$id] = true;
+
+        return $val;
+    }
+
+    /**
+     * Checks if a parameter or an object is set.
+     *
+     * @param string $id The unique identifier for the parameter or object
+     *
+     * @return bool
+     */
+    public function offsetExists($id)
+    {
+        return isset($this->keys[$id]);
+    }
+
+    /**
+     * Unsets a parameter or an object.
+     *
+     * @param string $id The unique identifier for the parameter or object
+     */
+    public function offsetUnset($id)
+    {
+        if (isset($this->keys[$id])) {
+            if (\is_object($this->values[$id])) {
+                unset($this->factories[$this->values[$id]], $this->protected[$this->values[$id]]);
+            }
+
+            unset($this->values[$id], $this->frozen[$id], $this->raw[$id], $this->keys[$id]);
+        }
+    }
+
+    /**
+     * Marks a callable as being a factory service.
+     *
+     * @param callable $callable A service definition to be used as a factory
+     *
+     * @return callable The passed callable
+     *
+     * @throws ExpectedInvokableException Service definition has to be a closure or an invokable object
+     */
+    public function factory($callable)
+    {
+        if (!\method_exists($callable, '__invoke')) {
+            throw new ExpectedInvokableException('Service definition is not a Closure or invokable object.');
+        }
+
+        $this->factories->attach($callable);
+
+        return $callable;
+    }
+
+    /**
+     * Protects a callable from being interpreted as a service.
+     *
+     * This is useful when you want to store a callable as a parameter.
+     *
+     * @param callable $callable A callable to protect from being evaluated
+     *
+     * @return callable The passed callable
+     *
+     * @throws ExpectedInvokableException Service definition has to be a closure or an invokable object
+     */
+    public function protect($callable)
+    {
+        if (!\method_exists($callable, '__invoke')) {
+            throw new ExpectedInvokableException('Callable is not a Closure or invokable object.');
+        }
+
+        $this->protected->attach($callable);
+
+        return $callable;
+    }
+
+    /**
+     * Gets a parameter or the closure defining an object.
+     *
+     * @param string $id The unique identifier for the parameter or object
+     *
+     * @return mixed The value of the parameter or the closure defining an object
+     *
+     * @throws UnknownIdentifierException If the identifier is not defined
+     */
+    public function raw($id)
+    {
+        if (!isset($this->keys[$id])) {
+            throw new UnknownIdentifierException($id);
+        }
+
+        if (isset($this->raw[$id])) {
+            return $this->raw[$id];
+        }
+
+        return $this->values[$id];
+    }
+
+    /**
+     * Extends an object definition.
+     *
+     * Useful when you want to extend an existing object definition,
+     * without necessarily loading that object.
+     *
+     * @param string   $id       The unique identifier for the object
+     * @param callable $callable A service definition to extend the original
+     *
+     * @return callable The wrapped callable
+     *
+     * @throws UnknownIdentifierException        If the identifier is not defined
+     * @throws FrozenServiceException            If the service is frozen
+     * @throws InvalidServiceIdentifierException If the identifier belongs to a parameter
+     * @throws ExpectedInvokableException        If the extension callable is not a closure or an invokable object
+     */
+    public function extend($id, $callable)
+    {
+        if (!isset($this->keys[$id])) {
+            throw new UnknownIdentifierException($id);
+        }
+
+        if (isset($this->frozen[$id])) {
+            throw new FrozenServiceException($id);
+        }
+
+        if (!\is_object($this->values[$id]) || !\method_exists($this->values[$id], '__invoke')) {
+            throw new InvalidServiceIdentifierException($id);
+        }
+
+        if (isset($this->protected[$this->values[$id]])) {
+            @\trigger_error(\sprintf('How Pimple behaves when extending protected closures will be fixed in Pimple 4. Are you sure "%s" should be protected?', $id), \E_USER_DEPRECATED);
+        }
+
+        if (!\is_object($callable) || !\method_exists($callable, '__invoke')) {
+            throw new ExpectedInvokableException('Extension service definition is not a Closure or invokable object.');
+        }
+
+        $factory = $this->values[$id];
+
+        $extended = function ($c) use ($callable, $factory) {
+            return $callable($factory($c), $c);
+        };
+
+        if (isset($this->factories[$factory])) {
+            $this->factories->detach($factory);
+            $this->factories->attach($extended);
+        }
+
+        return $this[$id] = $extended;
+    }
+
+    /**
+     * Returns all defined value names.
+     *
+     * @return array An array of value names
+     */
+    public function keys()
+    {
+        return \array_keys($this->values);
+    }
+
+    /**
+     * Registers a service provider.
+     *
+     * @param ServiceProviderInterface $provider A ServiceProviderInterface instance
+     * @param array                    $values   An array of values that customizes the provider
+     *
+     * @return static
+     */
+    public function register(ServiceProviderInterface $provider, array $values = array())
+    {
+        $provider->register($this);
+
+        foreach ($values as $key => $value) {
+            $this[$key] = $value;
+        }
+
+        return $this;
+    }
+}
diff --git a/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Exception/ExpectedInvokableException.php b/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Exception/ExpectedInvokableException.php
new file mode 100644
index 00000000..7228421b
--- /dev/null
+++ b/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Exception/ExpectedInvokableException.php
@@ -0,0 +1,38 @@
+<?php
+
+/*
+ * This file is part of Pimple.
+ *
+ * Copyright (c) 2009 Fabien Potencier
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is furnished
+ * to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+namespace Pimple\Exception;
+
+use Psr\Container\ContainerExceptionInterface;
+
+/**
+ * A closure or invokable object was expected.
+ *
+ * @author Pascal Luna <skalpa@zetareticuli.org>
+ */
+class ExpectedInvokableException extends \InvalidArgumentException implements ContainerExceptionInterface
+{
+}
diff --git a/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Exception/FrozenServiceException.php b/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Exception/FrozenServiceException.php
new file mode 100644
index 00000000..e4d2f6d3
--- /dev/null
+++ b/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Exception/FrozenServiceException.php
@@ -0,0 +1,45 @@
+<?php
+
+/*
+ * This file is part of Pimple.
+ *
+ * Copyright (c) 2009 Fabien Potencier
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is furnished
+ * to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+namespace Pimple\Exception;
+
+use Psr\Container\ContainerExceptionInterface;
+
+/**
+ * An attempt to modify a frozen service was made.
+ *
+ * @author Pascal Luna <skalpa@zetareticuli.org>
+ */
+class FrozenServiceException extends \RuntimeException implements ContainerExceptionInterface
+{
+    /**
+     * @param string $id Identifier of the frozen service
+     */
+    public function __construct($id)
+    {
+        parent::__construct(\sprintf('Cannot override frozen service "%s".', $id));
+    }
+}
diff --git a/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Exception/InvalidServiceIdentifierException.php b/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Exception/InvalidServiceIdentifierException.php
new file mode 100644
index 00000000..91e82f98
--- /dev/null
+++ b/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Exception/InvalidServiceIdentifierException.php
@@ -0,0 +1,45 @@
+<?php
+
+/*
+ * This file is part of Pimple.
+ *
+ * Copyright (c) 2009 Fabien Potencier
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is furnished
+ * to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+namespace Pimple\Exception;
+
+use Psr\Container\NotFoundExceptionInterface;
+
+/**
+ * An attempt to perform an operation that requires a service identifier was made.
+ *
+ * @author Pascal Luna <skalpa@zetareticuli.org>
+ */
+class InvalidServiceIdentifierException extends \InvalidArgumentException implements NotFoundExceptionInterface
+{
+    /**
+     * @param string $id The invalid identifier
+     */
+    public function __construct($id)
+    {
+        parent::__construct(\sprintf('Identifier "%s" does not contain an object definition.', $id));
+    }
+}
diff --git a/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Exception/UnknownIdentifierException.php b/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Exception/UnknownIdentifierException.php
new file mode 100644
index 00000000..fb6b626e
--- /dev/null
+++ b/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Exception/UnknownIdentifierException.php
@@ -0,0 +1,45 @@
+<?php
+
+/*
+ * This file is part of Pimple.
+ *
+ * Copyright (c) 2009 Fabien Potencier
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is furnished
+ * to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+namespace Pimple\Exception;
+
+use Psr\Container\NotFoundExceptionInterface;
+
+/**
+ * The identifier of a valid service or parameter was expected.
+ *
+ * @author Pascal Luna <skalpa@zetareticuli.org>
+ */
+class UnknownIdentifierException extends \InvalidArgumentException implements NotFoundExceptionInterface
+{
+    /**
+     * @param string $id The unknown identifier
+     */
+    public function __construct($id)
+    {
+        parent::__construct(\sprintf('Identifier "%s" is not defined.', $id));
+    }
+}
diff --git a/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Psr11/Container.php b/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Psr11/Container.php
new file mode 100644
index 00000000..cadbfffa
--- /dev/null
+++ b/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Psr11/Container.php
@@ -0,0 +1,55 @@
+<?php
+
+/*
+ * This file is part of Pimple.
+ *
+ * Copyright (c) 2009-2017 Fabien Potencier
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is furnished
+ * to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+namespace Pimple\Psr11;
+
+use Pimple\Container as PimpleContainer;
+use Psr\Container\ContainerInterface;
+
+/**
+ * PSR-11 compliant wrapper.
+ *
+ * @author Pascal Luna <skalpa@zetareticuli.org>
+ */
+final class Container implements ContainerInterface
+{
+    private $pimple;
+
+    public function __construct(PimpleContainer $pimple)
+    {
+        $this->pimple = $pimple;
+    }
+
+    public function get($id)
+    {
+        return $this->pimple[$id];
+    }
+
+    public function has($id)
+    {
+        return isset($this->pimple[$id]);
+    }
+}
diff --git a/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Psr11/ServiceLocator.php b/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Psr11/ServiceLocator.php
new file mode 100644
index 00000000..3361c6f1
--- /dev/null
+++ b/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Psr11/ServiceLocator.php
@@ -0,0 +1,75 @@
+<?php
+
+/*
+ * This file is part of Pimple.
+ *
+ * Copyright (c) 2009 Fabien Potencier
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is furnished
+ * to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+namespace Pimple\Psr11;
+
+use Pimple\Container as PimpleContainer;
+use Pimple\Exception\UnknownIdentifierException;
+use Psr\Container\ContainerInterface;
+
+/**
+ * Pimple PSR-11 service locator.
+ *
+ * @author Pascal Luna <skalpa@zetareticuli.org>
+ */
+class ServiceLocator implements ContainerInterface
+{
+    private $container;
+    private $aliases = array();
+
+    /**
+     * @param PimpleContainer $container The Container instance used to locate services
+     * @param array           $ids       Array of service ids that can be located. String keys can be used to define aliases
+     */
+    public function __construct(PimpleContainer $container, array $ids)
+    {
+        $this->container = $container;
+
+        foreach ($ids as $key => $id) {
+            $this->aliases[\is_int($key) ? $id : $key] = $id;
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function get($id)
+    {
+        if (!isset($this->aliases[$id])) {
+            throw new UnknownIdentifierException($id);
+        }
+
+        return $this->container[$this->aliases[$id]];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function has($id)
+    {
+        return isset($this->aliases[$id]) && isset($this->container[$this->aliases[$id]]);
+    }
+}
diff --git a/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/ServiceIterator.php b/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/ServiceIterator.php
new file mode 100644
index 00000000..5cde5188
--- /dev/null
+++ b/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/ServiceIterator.php
@@ -0,0 +1,69 @@
+<?php
+
+/*
+ * This file is part of Pimple.
+ *
+ * Copyright (c) 2009 Fabien Potencier
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is furnished
+ * to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+namespace Pimple;
+
+/**
+ * Lazy service iterator.
+ *
+ * @author Pascal Luna <skalpa@zetareticuli.org>
+ */
+final class ServiceIterator implements \Iterator
+{
+    private $container;
+    private $ids;
+
+    public function __construct(Container $container, array $ids)
+    {
+        $this->container = $container;
+        $this->ids = $ids;
+    }
+
+    public function rewind()
+    {
+        \reset($this->ids);
+    }
+
+    public function current()
+    {
+        return $this->container[\current($this->ids)];
+    }
+
+    public function key()
+    {
+        return \current($this->ids);
+    }
+
+    public function next()
+    {
+        \next($this->ids);
+    }
+
+    public function valid()
+    {
+        return null !== \key($this->ids);
+    }
+}
diff --git a/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/ServiceProviderInterface.php b/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/ServiceProviderInterface.php
new file mode 100644
index 00000000..c004594b
--- /dev/null
+++ b/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/ServiceProviderInterface.php
@@ -0,0 +1,46 @@
+<?php
+
+/*
+ * This file is part of Pimple.
+ *
+ * Copyright (c) 2009 Fabien Potencier
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is furnished
+ * to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+namespace Pimple;
+
+/**
+ * Pimple service provider interface.
+ *
+ * @author  Fabien Potencier
+ * @author  Dominik Zogg
+ */
+interface ServiceProviderInterface
+{
+    /**
+     * Registers services on the given container.
+     *
+     * This method should only be used to configure services and parameters.
+     * It should not get services.
+     *
+     * @param Container $pimple A container instance
+     */
+    public function register(Container $pimple);
+}
diff --git a/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Tests/Fixtures/Invokable.php b/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Tests/Fixtures/Invokable.php
new file mode 100644
index 00000000..aba453bf
--- /dev/null
+++ b/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Tests/Fixtures/Invokable.php
@@ -0,0 +1,38 @@
+<?php
+
+/*
+ * This file is part of Pimple.
+ *
+ * Copyright (c) 2009 Fabien Potencier
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is furnished
+ * to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+namespace Pimple\Tests\Fixtures;
+
+class Invokable
+{
+    public function __invoke($value = null)
+    {
+        $service = new Service();
+        $service->value = $value;
+
+        return $service;
+    }
+}
diff --git a/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Tests/Fixtures/NonInvokable.php b/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Tests/Fixtures/NonInvokable.php
new file mode 100644
index 00000000..33cd4e54
--- /dev/null
+++ b/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Tests/Fixtures/NonInvokable.php
@@ -0,0 +1,34 @@
+<?php
+
+/*
+ * This file is part of Pimple.
+ *
+ * Copyright (c) 2009 Fabien Potencier
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is furnished
+ * to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+namespace Pimple\Tests\Fixtures;
+
+class NonInvokable
+{
+    public function __call($a, $b)
+    {
+    }
+}
diff --git a/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Tests/Fixtures/PimpleServiceProvider.php b/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Tests/Fixtures/PimpleServiceProvider.php
new file mode 100644
index 00000000..0c910af7
--- /dev/null
+++ b/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Tests/Fixtures/PimpleServiceProvider.php
@@ -0,0 +1,54 @@
+<?php
+
+/*
+ * This file is part of Pimple.
+ *
+ * Copyright (c) 2009 Fabien Potencier
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is furnished
+ * to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+namespace Pimple\Tests\Fixtures;
+
+use Pimple\Container;
+use Pimple\ServiceProviderInterface;
+
+class PimpleServiceProvider implements ServiceProviderInterface
+{
+    /**
+     * Registers services on the given container.
+     *
+     * This method should only be used to configure services and parameters.
+     * It should not get services.
+     *
+     * @param Container $pimple An Container instance
+     */
+    public function register(Container $pimple)
+    {
+        $pimple['param'] = 'value';
+
+        $pimple['service'] = function () {
+            return new Service();
+        };
+
+        $pimple['factory'] = $pimple->factory(function () {
+            return new Service();
+        });
+    }
+}
diff --git a/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Tests/Fixtures/Service.php b/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Tests/Fixtures/Service.php
new file mode 100644
index 00000000..d71b184d
--- /dev/null
+++ b/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Tests/Fixtures/Service.php
@@ -0,0 +1,35 @@
+<?php
+
+/*
+ * This file is part of Pimple.
+ *
+ * Copyright (c) 2009 Fabien Potencier
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is furnished
+ * to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+namespace Pimple\Tests\Fixtures;
+
+/**
+ * @author  Igor Wiedler <igor@wiedler.ch>
+ */
+class Service
+{
+    public $value;
+}
diff --git a/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Tests/PimpleServiceProviderInterfaceTest.php b/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Tests/PimpleServiceProviderInterfaceTest.php
new file mode 100644
index 00000000..8e5c4c73
--- /dev/null
+++ b/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Tests/PimpleServiceProviderInterfaceTest.php
@@ -0,0 +1,76 @@
+<?php
+
+/*
+ * This file is part of Pimple.
+ *
+ * Copyright (c) 2009 Fabien Potencier
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is furnished
+ * to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+namespace Pimple\Tests;
+
+use Pimple\Container;
+
+/**
+ * @author  Dominik Zogg <dominik.zogg@gmail.com>
+ */
+class PimpleServiceProviderInterfaceTest extends \PHPUnit_Framework_TestCase
+{
+    public function testProvider()
+    {
+        $pimple = new Container();
+
+        $pimpleServiceProvider = new Fixtures\PimpleServiceProvider();
+        $pimpleServiceProvider->register($pimple);
+
+        $this->assertEquals('value', $pimple['param']);
+        $this->assertInstanceOf('Pimple\Tests\Fixtures\Service', $pimple['service']);
+
+        $serviceOne = $pimple['factory'];
+        $this->assertInstanceOf('Pimple\Tests\Fixtures\Service', $serviceOne);
+
+        $serviceTwo = $pimple['factory'];
+        $this->assertInstanceOf('Pimple\Tests\Fixtures\Service', $serviceTwo);
+
+        $this->assertNotSame($serviceOne, $serviceTwo);
+    }
+
+    public function testProviderWithRegisterMethod()
+    {
+        $pimple = new Container();
+
+        $pimple->register(new Fixtures\PimpleServiceProvider(), array(
+            'anotherParameter' => 'anotherValue',
+        ));
+
+        $this->assertEquals('value', $pimple['param']);
+        $this->assertEquals('anotherValue', $pimple['anotherParameter']);
+
+        $this->assertInstanceOf('Pimple\Tests\Fixtures\Service', $pimple['service']);
+
+        $serviceOne = $pimple['factory'];
+        $this->assertInstanceOf('Pimple\Tests\Fixtures\Service', $serviceOne);
+
+        $serviceTwo = $pimple['factory'];
+        $this->assertInstanceOf('Pimple\Tests\Fixtures\Service', $serviceTwo);
+
+        $this->assertNotSame($serviceOne, $serviceTwo);
+    }
+}
diff --git a/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Tests/PimpleTest.php b/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Tests/PimpleTest.php
new file mode 100644
index 00000000..acb66e00
--- /dev/null
+++ b/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Tests/PimpleTest.php
@@ -0,0 +1,589 @@
+<?php
+
+/*
+ * This file is part of Pimple.
+ *
+ * Copyright (c) 2009 Fabien Potencier
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is furnished
+ * to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+namespace Pimple\Tests;
+
+use Pimple\Container;
+
+/**
+ * @author Igor Wiedler <igor@wiedler.ch>
+ */
+class PimpleTest extends \PHPUnit_Framework_TestCase
+{
+    public function testWithString()
+    {
+        $pimple = new Container();
+        $pimple['param'] = 'value';
+
+        $this->assertEquals('value', $pimple['param']);
+    }
+
+    public function testWithClosure()
+    {
+        $pimple = new Container();
+        $pimple['service'] = function () {
+            return new Fixtures\Service();
+        };
+
+        $this->assertInstanceOf('Pimple\Tests\Fixtures\Service', $pimple['service']);
+    }
+
+    public function testServicesShouldBeDifferent()
+    {
+        $pimple = new Container();
+        $pimple['service'] = $pimple->factory(function () {
+            return new Fixtures\Service();
+        });
+
+        $serviceOne = $pimple['service'];
+        $this->assertInstanceOf('Pimple\Tests\Fixtures\Service', $serviceOne);
+
+        $serviceTwo = $pimple['service'];
+        $this->assertInstanceOf('Pimple\Tests\Fixtures\Service', $serviceTwo);
+
+        $this->assertNotSame($serviceOne, $serviceTwo);
+    }
+
+    public function testShouldPassContainerAsParameter()
+    {
+        $pimple = new Container();
+        $pimple['service'] = function () {
+            return new Fixtures\Service();
+        };
+        $pimple['container'] = function ($container) {
+            return $container;
+        };
+
+        $this->assertNotSame($pimple, $pimple['service']);
+        $this->assertSame($pimple, $pimple['container']);
+    }
+
+    public function testIsset()
+    {
+        $pimple = new Container();
+        $pimple['param'] = 'value';
+        $pimple['service'] = function () {
+            return new Fixtures\Service();
+        };
+
+        $pimple['null'] = null;
+
+        $this->assertTrue(isset($pimple['param']));
+        $this->assertTrue(isset($pimple['service']));
+        $this->assertTrue(isset($pimple['null']));
+        $this->assertFalse(isset($pimple['non_existent']));
+    }
+
+    public function testConstructorInjection()
+    {
+        $params = array('param' => 'value');
+        $pimple = new Container($params);
+
+        $this->assertSame($params['param'], $pimple['param']);
+    }
+
+    /**
+     * @expectedException \Pimple\Exception\UnknownIdentifierException
+     * @expectedExceptionMessage Identifier "foo" is not defined.
+     */
+    public function testOffsetGetValidatesKeyIsPresent()
+    {
+        $pimple = new Container();
+        echo $pimple['foo'];
+    }
+
+    /**
+     * @group legacy
+     * @expectedException \InvalidArgumentException
+     * @expectedExceptionMessage Identifier "foo" is not defined.
+     */
+    public function testLegacyOffsetGetValidatesKeyIsPresent()
+    {
+        $pimple = new Container();
+        echo $pimple['foo'];
+    }
+
+    public function testOffsetGetHonorsNullValues()
+    {
+        $pimple = new Container();
+        $pimple['foo'] = null;
+        $this->assertNull($pimple['foo']);
+    }
+
+    public function testUnset()
+    {
+        $pimple = new Container();
+        $pimple['param'] = 'value';
+        $pimple['service'] = function () {
+            return new Fixtures\Service();
+        };
+
+        unset($pimple['param'], $pimple['service']);
+        $this->assertFalse(isset($pimple['param']));
+        $this->assertFalse(isset($pimple['service']));
+    }
+
+    /**
+     * @dataProvider serviceDefinitionProvider
+     */
+    public function testShare($service)
+    {
+        $pimple = new Container();
+        $pimple['shared_service'] = $service;
+
+        $serviceOne = $pimple['shared_service'];
+        $this->assertInstanceOf('Pimple\Tests\Fixtures\Service', $serviceOne);
+
+        $serviceTwo = $pimple['shared_service'];
+        $this->assertInstanceOf('Pimple\Tests\Fixtures\Service', $serviceTwo);
+
+        $this->assertSame($serviceOne, $serviceTwo);
+    }
+
+    /**
+     * @dataProvider serviceDefinitionProvider
+     */
+    public function testProtect($service)
+    {
+        $pimple = new Container();
+        $pimple['protected'] = $pimple->protect($service);
+
+        $this->assertSame($service, $pimple['protected']);
+    }
+
+    public function testGlobalFunctionNameAsParameterValue()
+    {
+        $pimple = new Container();
+        $pimple['global_function'] = 'strlen';
+        $this->assertSame('strlen', $pimple['global_function']);
+    }
+
+    public function testRaw()
+    {
+        $pimple = new Container();
+        $pimple['service'] = $definition = $pimple->factory(function () { return 'foo'; });
+        $this->assertSame($definition, $pimple->raw('service'));
+    }
+
+    public function testRawHonorsNullValues()
+    {
+        $pimple = new Container();
+        $pimple['foo'] = null;
+        $this->assertNull($pimple->raw('foo'));
+    }
+
+    public function testFluentRegister()
+    {
+        $pimple = new Container();
+        $this->assertSame($pimple, $pimple->register($this->getMockBuilder('Pimple\ServiceProviderInterface')->getMock()));
+    }
+
+    /**
+     * @expectedException \Pimple\Exception\UnknownIdentifierException
+     * @expectedExceptionMessage Identifier "foo" is not defined.
+     */
+    public function testRawValidatesKeyIsPresent()
+    {
+        $pimple = new Container();
+        $pimple->raw('foo');
+    }
+
+    /**
+     * @group legacy
+     * @expectedException \InvalidArgumentException
+     * @expectedExceptionMessage Identifier "foo" is not defined.
+     */
+    public function testLegacyRawValidatesKeyIsPresent()
+    {
+        $pimple = new Container();
+        $pimple->raw('foo');
+    }
+
+    /**
+     * @dataProvider serviceDefinitionProvider
+     */
+    public function testExtend($service)
+    {
+        $pimple = new Container();
+        $pimple['shared_service'] = function () {
+            return new Fixtures\Service();
+        };
+        $pimple['factory_service'] = $pimple->factory(function () {
+            return new Fixtures\Service();
+        });
+
+        $pimple->extend('shared_service', $service);
+        $serviceOne = $pimple['shared_service'];
+        $this->assertInstanceOf('Pimple\Tests\Fixtures\Service', $serviceOne);
+        $serviceTwo = $pimple['shared_service'];
+        $this->assertInstanceOf('Pimple\Tests\Fixtures\Service', $serviceTwo);
+        $this->assertSame($serviceOne, $serviceTwo);
+        $this->assertSame($serviceOne->value, $serviceTwo->value);
+
+        $pimple->extend('factory_service', $service);
+        $serviceOne = $pimple['factory_service'];
+        $this->assertInstanceOf('Pimple\Tests\Fixtures\Service', $serviceOne);
+        $serviceTwo = $pimple['factory_service'];
+        $this->assertInstanceOf('Pimple\Tests\Fixtures\Service', $serviceTwo);
+        $this->assertNotSame($serviceOne, $serviceTwo);
+        $this->assertNotSame($serviceOne->value, $serviceTwo->value);
+    }
+
+    public function testExtendDoesNotLeakWithFactories()
+    {
+        if (extension_loaded('pimple')) {
+            $this->markTestSkipped('Pimple extension does not support this test');
+        }
+        $pimple = new Container();
+
+        $pimple['foo'] = $pimple->factory(function () { return; });
+        $pimple['foo'] = $pimple->extend('foo', function ($foo, $pimple) { return; });
+        unset($pimple['foo']);
+
+        $p = new \ReflectionProperty($pimple, 'values');
+        $p->setAccessible(true);
+        $this->assertEmpty($p->getValue($pimple));
+
+        $p = new \ReflectionProperty($pimple, 'factories');
+        $p->setAccessible(true);
+        $this->assertCount(0, $p->getValue($pimple));
+    }
+
+    /**
+     * @expectedException \Pimple\Exception\UnknownIdentifierException
+     * @expectedExceptionMessage Identifier "foo" is not defined.
+     */
+    public function testExtendValidatesKeyIsPresent()
+    {
+        $pimple = new Container();
+        $pimple->extend('foo', function () {});
+    }
+
+    /**
+     * @group legacy
+     * @expectedException \InvalidArgumentException
+     * @expectedExceptionMessage Identifier "foo" is not defined.
+     */
+    public function testLegacyExtendValidatesKeyIsPresent()
+    {
+        $pimple = new Container();
+        $pimple->extend('foo', function () {});
+    }
+
+    public function testKeys()
+    {
+        $pimple = new Container();
+        $pimple['foo'] = 123;
+        $pimple['bar'] = 123;
+
+        $this->assertEquals(array('foo', 'bar'), $pimple->keys());
+    }
+
+    /** @test */
+    public function settingAnInvokableObjectShouldTreatItAsFactory()
+    {
+        $pimple = new Container();
+        $pimple['invokable'] = new Fixtures\Invokable();
+
+        $this->assertInstanceOf('Pimple\Tests\Fixtures\Service', $pimple['invokable']);
+    }
+
+    /** @test */
+    public function settingNonInvokableObjectShouldTreatItAsParameter()
+    {
+        $pimple = new Container();
+        $pimple['non_invokable'] = new Fixtures\NonInvokable();
+
+        $this->assertInstanceOf('Pimple\Tests\Fixtures\NonInvokable', $pimple['non_invokable']);
+    }
+
+    /**
+     * @dataProvider badServiceDefinitionProvider
+     * @expectedException \Pimple\Exception\ExpectedInvokableException
+     * @expectedExceptionMessage Service definition is not a Closure or invokable object.
+     */
+    public function testFactoryFailsForInvalidServiceDefinitions($service)
+    {
+        $pimple = new Container();
+        $pimple->factory($service);
+    }
+
+    /**
+     * @group legacy
+     * @dataProvider badServiceDefinitionProvider
+     * @expectedException \InvalidArgumentException
+     * @expectedExceptionMessage Service definition is not a Closure or invokable object.
+     */
+    public function testLegacyFactoryFailsForInvalidServiceDefinitions($service)
+    {
+        $pimple = new Container();
+        $pimple->factory($service);
+    }
+
+    /**
+     * @dataProvider badServiceDefinitionProvider
+     * @expectedException \Pimple\Exception\ExpectedInvokableException
+     * @expectedExceptionMessage Callable is not a Closure or invokable object.
+     */
+    public function testProtectFailsForInvalidServiceDefinitions($service)
+    {
+        $pimple = new Container();
+        $pimple->protect($service);
+    }
+
+    /**
+     * @group legacy
+     * @dataProvider badServiceDefinitionProvider
+     * @expectedException \InvalidArgumentException
+     * @expectedExceptionMessage Callable is not a Closure or invokable object.
+     */
+    public function testLegacyProtectFailsForInvalidServiceDefinitions($service)
+    {
+        $pimple = new Container();
+        $pimple->protect($service);
+    }
+
+    /**
+     * @dataProvider badServiceDefinitionProvider
+     * @expectedException \Pimple\Exception\InvalidServiceIdentifierException
+     * @expectedExceptionMessage Identifier "foo" does not contain an object definition.
+     */
+    public function testExtendFailsForKeysNotContainingServiceDefinitions($service)
+    {
+        $pimple = new Container();
+        $pimple['foo'] = $service;
+        $pimple->extend('foo', function () {});
+    }
+
+    /**
+     * @group legacy
+     * @dataProvider badServiceDefinitionProvider
+     * @expectedException \InvalidArgumentException
+     * @expectedExceptionMessage Identifier "foo" does not contain an object definition.
+     */
+    public function testLegacyExtendFailsForKeysNotContainingServiceDefinitions($service)
+    {
+        $pimple = new Container();
+        $pimple['foo'] = $service;
+        $pimple->extend('foo', function () {});
+    }
+
+    /**
+     * @group legacy
+     * @expectedDeprecation How Pimple behaves when extending protected closures will be fixed in Pimple 4. Are you sure "foo" should be protected?
+     */
+    public function testExtendingProtectedClosureDeprecation()
+    {
+        $pimple = new Container();
+        $pimple['foo'] = $pimple->protect(function () {
+            return 'bar';
+        });
+
+        $pimple->extend('foo', function ($value) {
+            return $value.'-baz';
+        });
+
+        $this->assertSame('bar-baz', $pimple['foo']);
+    }
+
+    /**
+     * @dataProvider badServiceDefinitionProvider
+     * @expectedException \Pimple\Exception\ExpectedInvokableException
+     * @expectedExceptionMessage Extension service definition is not a Closure or invokable object.
+     */
+    public function testExtendFailsForInvalidServiceDefinitions($service)
+    {
+        $pimple = new Container();
+        $pimple['foo'] = function () {};
+        $pimple->extend('foo', $service);
+    }
+
+    /**
+     * @group legacy
+     * @dataProvider badServiceDefinitionProvider
+     * @expectedException \InvalidArgumentException
+     * @expectedExceptionMessage Extension service definition is not a Closure or invokable object.
+     */
+    public function testLegacyExtendFailsForInvalidServiceDefinitions($service)
+    {
+        $pimple = new Container();
+        $pimple['foo'] = function () {};
+        $pimple->extend('foo', $service);
+    }
+
+    /**
+     * @expectedException \Pimple\Exception\FrozenServiceException
+     * @expectedExceptionMessage Cannot override frozen service "foo".
+     */
+    public function testExtendFailsIfFrozenServiceIsNonInvokable()
+    {
+        $pimple = new Container();
+        $pimple['foo'] = function () {
+            return new Fixtures\NonInvokable();
+        };
+        $foo = $pimple['foo'];
+
+        $pimple->extend('foo', function () {});
+    }
+
+    /**
+     * @expectedException \Pimple\Exception\FrozenServiceException
+     * @expectedExceptionMessage Cannot override frozen service "foo".
+     */
+    public function testExtendFailsIfFrozenServiceIsInvokable()
+    {
+        $pimple = new Container();
+        $pimple['foo'] = function () {
+            return new Fixtures\Invokable();
+        };
+        $foo = $pimple['foo'];
+
+        $pimple->extend('foo', function () {});
+    }
+
+    /**
+     * Provider for invalid service definitions.
+     */
+    public function badServiceDefinitionProvider()
+    {
+        return array(
+          array(123),
+          array(new Fixtures\NonInvokable()),
+        );
+    }
+
+    /**
+     * Provider for service definitions.
+     */
+    public function serviceDefinitionProvider()
+    {
+        return array(
+            array(function ($value) {
+                $service = new Fixtures\Service();
+                $service->value = $value;
+
+                return $service;
+            }),
+            array(new Fixtures\Invokable()),
+        );
+    }
+
+    public function testDefiningNewServiceAfterFreeze()
+    {
+        $pimple = new Container();
+        $pimple['foo'] = function () {
+            return 'foo';
+        };
+        $foo = $pimple['foo'];
+
+        $pimple['bar'] = function () {
+            return 'bar';
+        };
+        $this->assertSame('bar', $pimple['bar']);
+    }
+
+    /**
+     * @expectedException \Pimple\Exception\FrozenServiceException
+     * @expectedExceptionMessage Cannot override frozen service "foo".
+     */
+    public function testOverridingServiceAfterFreeze()
+    {
+        $pimple = new Container();
+        $pimple['foo'] = function () {
+            return 'foo';
+        };
+        $foo = $pimple['foo'];
+
+        $pimple['foo'] = function () {
+            return 'bar';
+        };
+    }
+
+    /**
+     * @group legacy
+     * @expectedException \RuntimeException
+     * @expectedExceptionMessage Cannot override frozen service "foo".
+     */
+    public function testLegacyOverridingServiceAfterFreeze()
+    {
+        $pimple = new Container();
+        $pimple['foo'] = function () {
+            return 'foo';
+        };
+        $foo = $pimple['foo'];
+
+        $pimple['foo'] = function () {
+            return 'bar';
+        };
+    }
+
+    public function testRemovingServiceAfterFreeze()
+    {
+        $pimple = new Container();
+        $pimple['foo'] = function () {
+            return 'foo';
+        };
+        $foo = $pimple['foo'];
+
+        unset($pimple['foo']);
+        $pimple['foo'] = function () {
+            return 'bar';
+        };
+        $this->assertSame('bar', $pimple['foo']);
+    }
+
+    public function testExtendingService()
+    {
+        $pimple = new Container();
+        $pimple['foo'] = function () {
+            return 'foo';
+        };
+        $pimple['foo'] = $pimple->extend('foo', function ($foo, $app) {
+            return "$foo.bar";
+        });
+        $pimple['foo'] = $pimple->extend('foo', function ($foo, $app) {
+            return "$foo.baz";
+        });
+        $this->assertSame('foo.bar.baz', $pimple['foo']);
+    }
+
+    public function testExtendingServiceAfterOtherServiceFreeze()
+    {
+        $pimple = new Container();
+        $pimple['foo'] = function () {
+            return 'foo';
+        };
+        $pimple['bar'] = function () {
+            return 'bar';
+        };
+        $foo = $pimple['foo'];
+
+        $pimple['bar'] = $pimple->extend('bar', function ($bar, $app) {
+            return "$bar.baz";
+        });
+        $this->assertSame('bar.baz', $pimple['bar']);
+    }
+}
diff --git a/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Tests/Psr11/ContainerTest.php b/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Tests/Psr11/ContainerTest.php
new file mode 100644
index 00000000..7ca2d7ff
--- /dev/null
+++ b/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Tests/Psr11/ContainerTest.php
@@ -0,0 +1,77 @@
+<?php
+
+/*
+ * This file is part of Pimple.
+ *
+ * Copyright (c) 2009-2017 Fabien Potencier
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is furnished
+ * to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+namespace Pimple\Tests\Psr11;
+
+use PHPUnit\Framework\TestCase;
+use Pimple\Container;
+use Pimple\Psr11\Container as PsrContainer;
+use Pimple\Tests\Fixtures\Service;
+
+class ContainerTest extends TestCase
+{
+    public function testGetReturnsExistingService()
+    {
+        $pimple = new Container();
+        $pimple['service'] = function () {
+            return new Service();
+        };
+        $psr = new PsrContainer($pimple);
+
+        $this->assertSame($pimple['service'], $psr->get('service'));
+    }
+
+    /**
+     * @expectedException \Psr\Container\NotFoundExceptionInterface
+     * @expectedExceptionMessage Identifier "service" is not defined.
+     */
+    public function testGetThrowsExceptionIfServiceIsNotFound()
+    {
+        $pimple = new Container();
+        $psr = new PsrContainer($pimple);
+
+        $psr->get('service');
+    }
+
+    public function testHasReturnsTrueIfServiceExists()
+    {
+        $pimple = new Container();
+        $pimple['service'] = function () {
+            return new Service();
+        };
+        $psr = new PsrContainer($pimple);
+
+        $this->assertTrue($psr->has('service'));
+    }
+
+    public function testHasReturnsFalseIfServiceDoesNotExist()
+    {
+        $pimple = new Container();
+        $psr = new PsrContainer($pimple);
+
+        $this->assertFalse($psr->has('service'));
+    }
+}
diff --git a/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Tests/Psr11/ServiceLocatorTest.php b/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Tests/Psr11/ServiceLocatorTest.php
new file mode 100644
index 00000000..c9a08125
--- /dev/null
+++ b/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Tests/Psr11/ServiceLocatorTest.php
@@ -0,0 +1,134 @@
+<?php
+
+/*
+ * This file is part of Pimple.
+ *
+ * Copyright (c) 2009 Fabien Potencier
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is furnished
+ * to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+namespace Pimple\Tests\Psr11;
+
+use PHPUnit\Framework\TestCase;
+use Pimple\Container;
+use Pimple\Psr11\ServiceLocator;
+use Pimple\Tests\Fixtures;
+
+/**
+ * ServiceLocator test case.
+ *
+ * @author Pascal Luna <skalpa@zetareticuli.org>
+ */
+class ServiceLocatorTest extends TestCase
+{
+    public function testCanAccessServices()
+    {
+        $pimple = new Container();
+        $pimple['service'] = function () {
+            return new Fixtures\Service();
+        };
+        $locator = new ServiceLocator($pimple, array('service'));
+
+        $this->assertSame($pimple['service'], $locator->get('service'));
+    }
+
+    public function testCanAccessAliasedServices()
+    {
+        $pimple = new Container();
+        $pimple['service'] = function () {
+            return new Fixtures\Service();
+        };
+        $locator = new ServiceLocator($pimple, array('alias' => 'service'));
+
+        $this->assertSame($pimple['service'], $locator->get('alias'));
+    }
+
+    /**
+     * @expectedException \Pimple\Exception\UnknownIdentifierException
+     * @expectedExceptionMessage Identifier "service" is not defined.
+     */
+    public function testCannotAccessAliasedServiceUsingRealIdentifier()
+    {
+        $pimple = new Container();
+        $pimple['service'] = function () {
+            return new Fixtures\Service();
+        };
+        $locator = new ServiceLocator($pimple, array('alias' => 'service'));
+
+        $service = $locator->get('service');
+    }
+
+    /**
+     * @expectedException \Pimple\Exception\UnknownIdentifierException
+     * @expectedExceptionMessage Identifier "foo" is not defined.
+     */
+    public function testGetValidatesServiceCanBeLocated()
+    {
+        $pimple = new Container();
+        $pimple['service'] = function () {
+            return new Fixtures\Service();
+        };
+        $locator = new ServiceLocator($pimple, array('alias' => 'service'));
+
+        $service = $locator->get('foo');
+    }
+
+    /**
+     * @expectedException \Pimple\Exception\UnknownIdentifierException
+     * @expectedExceptionMessage Identifier "invalid" is not defined.
+     */
+    public function testGetValidatesTargetServiceExists()
+    {
+        $pimple = new Container();
+        $pimple['service'] = function () {
+            return new Fixtures\Service();
+        };
+        $locator = new ServiceLocator($pimple, array('alias' => 'invalid'));
+
+        $service = $locator->get('alias');
+    }
+
+    public function testHasValidatesServiceCanBeLocated()
+    {
+        $pimple = new Container();
+        $pimple['service1'] = function () {
+            return new Fixtures\Service();
+        };
+        $pimple['service2'] = function () {
+            return new Fixtures\Service();
+        };
+        $locator = new ServiceLocator($pimple, array('service1'));
+
+        $this->assertTrue($locator->has('service1'));
+        $this->assertFalse($locator->has('service2'));
+    }
+
+    public function testHasChecksIfTargetServiceExists()
+    {
+        $pimple = new Container();
+        $pimple['service'] = function () {
+            return new Fixtures\Service();
+        };
+        $locator = new ServiceLocator($pimple, array('foo' => 'service', 'bar' => 'invalid'));
+
+        $this->assertTrue($locator->has('foo'));
+        $this->assertFalse($locator->has('bar'));
+    }
+}
diff --git a/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Tests/ServiceIteratorTest.php b/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Tests/ServiceIteratorTest.php
new file mode 100644
index 00000000..5dd52f0d
--- /dev/null
+++ b/advancedcontentfilter/vendor/pimple/pimple/src/Pimple/Tests/ServiceIteratorTest.php
@@ -0,0 +1,52 @@
+<?php
+
+/*
+ * This file is part of Pimple.
+ *
+ * Copyright (c) 2009 Fabien Potencier
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is furnished
+ * to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+namespace Pimple\Tests;
+
+use PHPUnit\Framework\TestCase;
+use Pimple\Container;
+use Pimple\ServiceIterator;
+use Pimple\Tests\Fixtures\Service;
+
+class ServiceIteratorTest extends TestCase
+{
+    public function testIsIterable()
+    {
+        $pimple = new Container();
+        $pimple['service1'] = function () {
+            return new Service();
+        };
+        $pimple['service2'] = function () {
+            return new Service();
+        };
+        $pimple['service3'] = function () {
+            return new Service();
+        };
+        $iterator = new ServiceIterator($pimple, array('service1', 'service2'));
+
+        $this->assertSame(array('service1' => $pimple['service1'], 'service2' => $pimple['service2']), iterator_to_array($iterator));
+    }
+}
diff --git a/advancedcontentfilter/vendor/psr/container/README.md b/advancedcontentfilter/vendor/psr/container/README.md
index 1b9d9e57..084f6df5 100644
--- a/advancedcontentfilter/vendor/psr/container/README.md
+++ b/advancedcontentfilter/vendor/psr/container/README.md
@@ -1,13 +1,5 @@
-Container interface
-==============
+# PSR Container
 
-This repository holds all interfaces related to [PSR-11 (Container Interface)][psr-url].
-
-Note that this is not a Container implementation of its own. It is merely abstractions that describe the components of a Dependency Injection Container.
-
-The installable [package][package-url] and [implementations][implementation-url] are listed on Packagist.
-
-[psr-url]: https://www.php-fig.org/psr/psr-11/
-[package-url]: https://packagist.org/packages/psr/container
-[implementation-url]: https://packagist.org/providers/psr/container-implementation
+This repository holds all interfaces/classes/traits related to [PSR-11](https://github.com/container-interop/fig-standards/blob/master/proposed/container.md).
 
+Note that this is not a container implementation of its own. See the specification for more details.
diff --git a/advancedcontentfilter/vendor/psr/container/composer.json b/advancedcontentfilter/vendor/psr/container/composer.json
index 017f41ea..b8ee0126 100644
--- a/advancedcontentfilter/vendor/psr/container/composer.json
+++ b/advancedcontentfilter/vendor/psr/container/composer.json
@@ -8,15 +8,20 @@
     "authors": [
         {
             "name": "PHP-FIG",
-            "homepage": "https://www.php-fig.org/"
+            "homepage": "http://www.php-fig.org/"
         }
     ],
     "require": {
-        "php": ">=7.4.0"
+        "php": ">=5.3.0"
     },
     "autoload": {
         "psr-4": {
             "Psr\\Container\\": "src/"
         }
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "1.0.x-dev"
+        }
     }
 }
diff --git a/advancedcontentfilter/vendor/psr/container/src/ContainerExceptionInterface.php b/advancedcontentfilter/vendor/psr/container/src/ContainerExceptionInterface.php
index 0f213f2f..d35c6b4d 100644
--- a/advancedcontentfilter/vendor/psr/container/src/ContainerExceptionInterface.php
+++ b/advancedcontentfilter/vendor/psr/container/src/ContainerExceptionInterface.php
@@ -1,12 +1,13 @@
 <?php
+/**
+ * @license http://www.opensource.org/licenses/mit-license.php MIT (see the LICENSE file)
+ */
 
 namespace Psr\Container;
 
-use Throwable;
-
 /**
  * Base interface representing a generic exception in a container.
  */
-interface ContainerExceptionInterface extends Throwable
+interface ContainerExceptionInterface
 {
 }
diff --git a/advancedcontentfilter/vendor/psr/container/src/ContainerInterface.php b/advancedcontentfilter/vendor/psr/container/src/ContainerInterface.php
index cf8e7fd3..c3a7206f 100644
--- a/advancedcontentfilter/vendor/psr/container/src/ContainerInterface.php
+++ b/advancedcontentfilter/vendor/psr/container/src/ContainerInterface.php
@@ -1,6 +1,7 @@
 <?php
-
-declare(strict_types=1);
+/**
+ * @license http://www.opensource.org/licenses/mit-license.php MIT (see the LICENSE file)
+ */
 
 namespace Psr\Container;
 
@@ -19,7 +20,7 @@ interface ContainerInterface
      *
      * @return mixed Entry.
      */
-    public function get(string $id);
+    public function get($id);
 
     /**
      * Returns true if the container can return an entry for the given identifier.
@@ -32,5 +33,5 @@ interface ContainerInterface
      *
      * @return bool
      */
-    public function has(string $id);
+    public function has($id);
 }
diff --git a/advancedcontentfilter/vendor/psr/container/src/NotFoundExceptionInterface.php b/advancedcontentfilter/vendor/psr/container/src/NotFoundExceptionInterface.php
index 650bf464..6566704e 100644
--- a/advancedcontentfilter/vendor/psr/container/src/NotFoundExceptionInterface.php
+++ b/advancedcontentfilter/vendor/psr/container/src/NotFoundExceptionInterface.php
@@ -1,4 +1,7 @@
 <?php
+/**
+ * @license http://www.opensource.org/licenses/mit-license.php MIT (see the LICENSE file)
+ */
 
 namespace Psr\Container;
 
diff --git a/advancedcontentfilter/vendor/psr/http-factory/LICENSE b/advancedcontentfilter/vendor/psr/http-factory/LICENSE
deleted file mode 100644
index 3f1559b2..00000000
--- a/advancedcontentfilter/vendor/psr/http-factory/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2018 PHP-FIG
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/advancedcontentfilter/vendor/psr/http-factory/README.md b/advancedcontentfilter/vendor/psr/http-factory/README.md
deleted file mode 100644
index bf8913b5..00000000
--- a/advancedcontentfilter/vendor/psr/http-factory/README.md
+++ /dev/null
@@ -1,12 +0,0 @@
-HTTP Factories
-==============
-
-This repository holds all interfaces related to [PSR-17 (HTTP Factories)][psr-url].
-
-Note that this is not a HTTP Factory implementation of its own. It is merely interfaces that describe the components of a HTTP Factory.
-
-The installable [package][package-url] and [implementations][implementation-url] are listed on Packagist.
-
-[psr-url]: https://www.php-fig.org/psr/psr-17/
-[package-url]: https://packagist.org/packages/psr/http-factory
-[implementation-url]: https://packagist.org/providers/psr/http-factory-implementation
diff --git a/advancedcontentfilter/vendor/psr/http-factory/composer.json b/advancedcontentfilter/vendor/psr/http-factory/composer.json
deleted file mode 100644
index d1bbddee..00000000
--- a/advancedcontentfilter/vendor/psr/http-factory/composer.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "name": "psr/http-factory",
-    "description": "Common interfaces for PSR-7 HTTP message factories",
-    "keywords": [
-        "psr",
-        "psr-7",
-        "psr-17",
-        "http",
-        "factory",
-        "message",
-        "request",
-        "response"
-    ],
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "PHP-FIG",
-            "homepage": "https://www.php-fig.org/"
-        }
-    ],
-    "require": {
-        "php": ">=7.0.0",
-        "psr/http-message": "^1.0 || ^2.0"
-    },
-    "autoload": {
-        "psr-4": {
-            "Psr\\Http\\Message\\": "src/"
-        }
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "1.0.x-dev"
-        }
-    }
-}
diff --git a/advancedcontentfilter/vendor/psr/http-factory/src/RequestFactoryInterface.php b/advancedcontentfilter/vendor/psr/http-factory/src/RequestFactoryInterface.php
deleted file mode 100644
index cb39a08b..00000000
--- a/advancedcontentfilter/vendor/psr/http-factory/src/RequestFactoryInterface.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-namespace Psr\Http\Message;
-
-interface RequestFactoryInterface
-{
-    /**
-     * Create a new request.
-     *
-     * @param string $method The HTTP method associated with the request.
-     * @param UriInterface|string $uri The URI associated with the request. If
-     *     the value is a string, the factory MUST create a UriInterface
-     *     instance based on it.
-     *
-     * @return RequestInterface
-     */
-    public function createRequest(string $method, $uri): RequestInterface;
-}
diff --git a/advancedcontentfilter/vendor/psr/http-factory/src/ResponseFactoryInterface.php b/advancedcontentfilter/vendor/psr/http-factory/src/ResponseFactoryInterface.php
deleted file mode 100644
index 212562f0..00000000
--- a/advancedcontentfilter/vendor/psr/http-factory/src/ResponseFactoryInterface.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-namespace Psr\Http\Message;
-
-interface ResponseFactoryInterface
-{
-    /**
-     * Create a new response.
-     *
-     * @param int $code HTTP status code; defaults to 200
-     * @param string $reasonPhrase Reason phrase to associate with status code
-     *     in generated response; if none is provided implementations MAY use
-     *     the defaults as suggested in the HTTP specification.
-     *
-     * @return ResponseInterface
-     */
-    public function createResponse(int $code = 200, string $reasonPhrase = ''): ResponseInterface;
-}
diff --git a/advancedcontentfilter/vendor/psr/http-factory/src/ServerRequestFactoryInterface.php b/advancedcontentfilter/vendor/psr/http-factory/src/ServerRequestFactoryInterface.php
deleted file mode 100644
index 9fe031a8..00000000
--- a/advancedcontentfilter/vendor/psr/http-factory/src/ServerRequestFactoryInterface.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-namespace Psr\Http\Message;
-
-interface ServerRequestFactoryInterface
-{
-    /**
-     * Create a new server request.
-     *
-     * Note that server-params are taken precisely as given - no parsing/processing
-     * of the given values is performed, and, in particular, no attempt is made to
-     * determine the HTTP method or URI, which must be provided explicitly.
-     *
-     * @param string $method The HTTP method associated with the request.
-     * @param UriInterface|string $uri The URI associated with the request. If
-     *     the value is a string, the factory MUST create a UriInterface
-     *     instance based on it.
-     * @param array $serverParams Array of SAPI parameters with which to seed
-     *     the generated request instance.
-     *
-     * @return ServerRequestInterface
-     */
-    public function createServerRequest(string $method, $uri, array $serverParams = []): ServerRequestInterface;
-}
diff --git a/advancedcontentfilter/vendor/psr/http-factory/src/StreamFactoryInterface.php b/advancedcontentfilter/vendor/psr/http-factory/src/StreamFactoryInterface.php
deleted file mode 100644
index 90e3240c..00000000
--- a/advancedcontentfilter/vendor/psr/http-factory/src/StreamFactoryInterface.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-namespace Psr\Http\Message;
-
-interface StreamFactoryInterface
-{
-    /**
-     * Create a new stream from a string.
-     *
-     * The stream SHOULD be created with a temporary resource.
-     *
-     * @param string $content String content with which to populate the stream.
-     *
-     * @return StreamInterface
-     */
-    public function createStream(string $content = ''): StreamInterface;
-
-    /**
-     * Create a stream from an existing file.
-     *
-     * The file MUST be opened using the given mode, which may be any mode
-     * supported by the `fopen` function.
-     *
-     * The `$filename` MAY be any string supported by `fopen()`.
-     *
-     * @param string $filename Filename or stream URI to use as basis of stream.
-     * @param string $mode Mode with which to open the underlying filename/stream.
-     *
-     * @return StreamInterface
-     * @throws \RuntimeException If the file cannot be opened.
-     * @throws \InvalidArgumentException If the mode is invalid.
-     */
-    public function createStreamFromFile(string $filename, string $mode = 'r'): StreamInterface;
-
-    /**
-     * Create a new stream from an existing resource.
-     *
-     * The stream MUST be readable and may be writable.
-     *
-     * @param resource $resource PHP resource to use as basis of stream.
-     *
-     * @return StreamInterface
-     */
-    public function createStreamFromResource($resource): StreamInterface;
-}
diff --git a/advancedcontentfilter/vendor/psr/http-factory/src/UploadedFileFactoryInterface.php b/advancedcontentfilter/vendor/psr/http-factory/src/UploadedFileFactoryInterface.php
deleted file mode 100644
index 7db4e30a..00000000
--- a/advancedcontentfilter/vendor/psr/http-factory/src/UploadedFileFactoryInterface.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-namespace Psr\Http\Message;
-
-interface UploadedFileFactoryInterface
-{
-    /**
-     * Create a new uploaded file.
-     *
-     * If a size is not provided it will be determined by checking the size of
-     * the file.
-     *
-     * @see http://php.net/manual/features.file-upload.post-method.php
-     * @see http://php.net/manual/features.file-upload.errors.php
-     *
-     * @param StreamInterface $stream Underlying stream representing the
-     *     uploaded file content.
-     * @param int $size in bytes
-     * @param int $error PHP file upload error
-     * @param string $clientFilename Filename as provided by the client, if any.
-     * @param string $clientMediaType Media type as provided by the client, if any.
-     *
-     * @return UploadedFileInterface
-     *
-     * @throws \InvalidArgumentException If the file resource is not readable.
-     */
-    public function createUploadedFile(
-        StreamInterface $stream,
-        int $size = null,
-        int $error = \UPLOAD_ERR_OK,
-        string $clientFilename = null,
-        string $clientMediaType = null
-    ): UploadedFileInterface;
-}
diff --git a/advancedcontentfilter/vendor/psr/http-factory/src/UriFactoryInterface.php b/advancedcontentfilter/vendor/psr/http-factory/src/UriFactoryInterface.php
deleted file mode 100644
index 06df0b46..00000000
--- a/advancedcontentfilter/vendor/psr/http-factory/src/UriFactoryInterface.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-namespace Psr\Http\Message;
-
-interface UriFactoryInterface
-{
-    /**
-     * Create a new URI.
-     *
-     * @param string $uri
-     *
-     * @return UriInterface
-     *
-     * @throws \InvalidArgumentException If the given URI cannot be parsed.
-     */
-    public function createUri(string $uri = ''): UriInterface;
-}
diff --git a/advancedcontentfilter/vendor/psr/http-message/README.md b/advancedcontentfilter/vendor/psr/http-message/README.md
index 2668be6c..28185338 100644
--- a/advancedcontentfilter/vendor/psr/http-message/README.md
+++ b/advancedcontentfilter/vendor/psr/http-message/README.md
@@ -10,7 +10,4 @@ interface that describes a HTTP message. See the specification for more details.
 Usage
 -----
 
-Before reading the usage guide we recommend reading the PSR-7 interfaces method list:
-
-* [`PSR-7 Interfaces Method List`](docs/PSR7-Interfaces.md)
-* [`PSR-7 Usage Guide`](docs/PSR7-Usage.md)
\ No newline at end of file
+We'll certainly need some stuff in here.
\ No newline at end of file
diff --git a/advancedcontentfilter/vendor/psr/http-message/composer.json b/advancedcontentfilter/vendor/psr/http-message/composer.json
index c66e5aba..b0d2937a 100644
--- a/advancedcontentfilter/vendor/psr/http-message/composer.json
+++ b/advancedcontentfilter/vendor/psr/http-message/composer.json
@@ -7,11 +7,11 @@
     "authors": [
         {
             "name": "PHP-FIG",
-            "homepage": "https://www.php-fig.org/"
+            "homepage": "http://www.php-fig.org/"
         }
     ],
     "require": {
-        "php": "^7.2 || ^8.0"
+        "php": ">=5.3.0"
     },
     "autoload": {
         "psr-4": {
@@ -20,7 +20,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.0.x-dev"
+            "dev-master": "1.0.x-dev"
         }
     }
 }
diff --git a/advancedcontentfilter/vendor/psr/http-message/docs/PSR7-Interfaces.md b/advancedcontentfilter/vendor/psr/http-message/docs/PSR7-Interfaces.md
deleted file mode 100644
index 3a7e7dda..00000000
--- a/advancedcontentfilter/vendor/psr/http-message/docs/PSR7-Interfaces.md
+++ /dev/null
@@ -1,130 +0,0 @@
-# Interfaces
-
-The purpose of this list is to help in finding the methods when working with PSR-7. This can be considered as a cheatsheet for PSR-7 interfaces.
-
-The interfaces defined in PSR-7 are the following:
-
-| Class Name | Description |
-|---|---|
-| [Psr\Http\Message\MessageInterface](http://www.php-fig.org/psr/psr-7/#psrhttpmessagemessageinterface) | Representation of a HTTP message |
-| [Psr\Http\Message\RequestInterface](http://www.php-fig.org/psr/psr-7/#psrhttpmessagerequestinterface) | Representation of an outgoing, client-side request. |
-| [Psr\Http\Message\ServerRequestInterface](http://www.php-fig.org/psr/psr-7/#psrhttpmessageserverrequestinterface) | Representation of an incoming, server-side HTTP request. | 
-| [Psr\Http\Message\ResponseInterface](http://www.php-fig.org/psr/psr-7/#psrhttpmessageresponseinterface) | Representation of an outgoing, server-side response. |
-| [Psr\Http\Message\StreamInterface](http://www.php-fig.org/psr/psr-7/#psrhttpmessagestreaminterface) | Describes a data stream |
-| [Psr\Http\Message\UriInterface](http://www.php-fig.org/psr/psr-7/#psrhttpmessageuriinterface) | Value object representing a URI. |
-| [Psr\Http\Message\UploadedFileInterface](http://www.php-fig.org/psr/psr-7/#psrhttpmessageuploadedfileinterface) | Value object representing a file uploaded through an HTTP request. |
-
-## `Psr\Http\Message\MessageInterface` Methods
-
-| Method Name                        | Description | Notes |
-|------------------------------------| ----------- | ----- |
-| `getProtocolVersion()`             | Retrieve HTTP protocol version          |  1.0 or 1.1 |
-| `withProtocolVersion($version)`    | Returns new message instance with given HTTP protocol version          |      |
-| `getHeaders()`                     | Retrieve all HTTP Headers               | [Request Header List](https://en.wikipedia.org/wiki/List_of_HTTP_header_fields#Request_fields), [Response Header List](https://en.wikipedia.org/wiki/List_of_HTTP_header_fields#Response_fields)      |
-| `hasHeader($name)`                 | Checks if HTTP Header with given name exists  | |
-| `getHeader($name)`                 | Retrieves a array with the values for a single header | |
-| `getHeaderLine($name)`             | Retrieves a comma-separated string of the values for a single header |  |
-| `withHeader($name, $value)`        | Returns new message instance with given HTTP Header | if the header existed in the original instance, replaces the header value from the original message with the value provided when creating the new instance. |
-| `withAddedHeader($name, $value)`   | Returns new message instance with appended value to given header | If header already exists value will be appended, if not a new header will be created |
-| `withoutHeader($name)`             | Removes HTTP Header with given name| |
-| `getBody()`                        | Retrieves the HTTP Message Body | Returns object implementing `StreamInterface`|
-| `withBody(StreamInterface $body)`  | Returns new message instance with given HTTP Message Body | |
-
-
-## `Psr\Http\Message\RequestInterface` Methods
-
-Same methods as `Psr\Http\Message\MessageInterface`  + the following methods:
-
-| Method Name                        | Description | Notes |
-|------------------------------------| ----------- | ----- |
-| `getRequestTarget()`                | Retrieves the message's request target              | origin-form, absolute-form, authority-form, asterisk-form ([RFC7230](https://www.rfc-editor.org/rfc/rfc7230.txt)) |
-| `withRequestTarget($requestTarget)` | Return a new message instance with the specific request-target |      |
-| `getMethod()`                       | Retrieves the HTTP method of the request.  |  GET, HEAD, POST, PUT, DELETE, CONNECT, OPTIONS, TRACE (defined in [RFC7231](https://tools.ietf.org/html/rfc7231)), PATCH (defined in [RFC5789](https://tools.ietf.org/html/rfc5789)) |
-| `withMethod($method)`               | Returns a new message instance with the provided HTTP method  | |
-| `getUri()`                 | Retrieves the URI instance | |
-| `withUri(UriInterface $uri, $preserveHost = false)` | Returns a new message instance with the provided URI |  |
-
-
-## `Psr\Http\Message\ServerRequestInterface` Methods
-
-Same methods as `Psr\Http\Message\RequestInterface`  + the following methods:
-
-| Method Name                        | Description | Notes |
-|------------------------------------| ----------- | ----- |
-| `getServerParams() `               | Retrieve server parameters  | Typically derived from `$_SERVER`  |
-| `getCookieParams()`                | Retrieves cookies sent by the client to the server. | Typically derived from `$_COOKIES` |
-| `withCookieParams(array $cookies)` |  Returns a new request instance with the specified cookies      |   | 
-| `withQueryParams(array $query)` | Returns a new request instance with the specified query string arguments  |  |
-| `getUploadedFiles()` | Retrieve normalized file upload data  |  |
-| `withUploadedFiles(array $uploadedFiles)` | Returns a new request instance with the specified uploaded files  |  |
-| `getParsedBody()` | Retrieve any parameters provided in the request body  |  |
-| `withParsedBody($data)` | Returns a new request instance with the specified body parameters  |  |
-| `getAttributes()` | Retrieve attributes derived from the request  |  |
-| `getAttribute($name, $default = null)` | Retrieve a single derived request attribute  |  |
-| `withAttribute($name, $value)` | Returns a new request instance with the specified derived request attribute  |  |
-| `withoutAttribute($name)` | Returns a new request instance that without the specified derived request attribute  |  |
-
-## `Psr\Http\Message\ResponseInterface` Methods:
-
-Same methods as `Psr\Http\Message\MessageInterface`  + the following methods:
-
-| Method Name                        | Description | Notes |
-|------------------------------------| ----------- | ----- |
-| `getStatusCode()` | Gets the response status code. | |
-| `withStatus($code, $reasonPhrase = '')` | Returns a new response instance with the specified status code and, optionally, reason phrase. | |
-| `getReasonPhrase()` | Gets the response reason phrase associated with the status code. | |
-
-##  `Psr\Http\Message\StreamInterface` Methods
-
-| Method Name                        | Description | Notes |
-|------------------------------------| ----------- | ----- |
-| `__toString()` | Reads all data from the stream into a string, from the beginning to end. | |
-| `close()` | Closes the stream and any underlying resources. | |
-| `detach()` | Separates any underlying resources from the stream. | |
-| `getSize()` | Get the size of the stream if known. | |
-| `eof()` | Returns true if the stream is at the end of the stream.| |
-| `isSeekable()` |  Returns whether or not the stream is seekable. | |
-| `seek($offset, $whence = SEEK_SET)` | Seek to a position in the stream. | |
-| `rewind()` | Seek to the beginning of the stream. | |
-| `isWritable()` | Returns whether or not the stream is writable. | |
-| `write($string)` | Write data to the stream. | |
-| `isReadable()` | Returns whether or not the stream is readable. | |
-| `read($length)` | Read data from the stream. | |
-| `getContents()` | Returns the remaining contents in a string | |
-| `getMetadata($key = null)()` | Get stream metadata as an associative array or retrieve a specific key. | |
-
-## `Psr\Http\Message\UriInterface` Methods
-
-| Method Name                        | Description | Notes |
-|------------------------------------| ----------- | ----- |
-| `getScheme()` | Retrieve the scheme component of the URI. | |
-| `getAuthority()` | Retrieve the authority component of the URI. | |
-| `getUserInfo()` | Retrieve the user information component of the URI. | |
-| `getHost()` | Retrieve the host component of the URI. | |
-| `getPort()` | Retrieve the port component of the URI. | |
-| `getPath()` | Retrieve the path component of the URI. | |
-| `getQuery()` | Retrieve the query string of the URI. | |
-| `getFragment()` | Retrieve the fragment component of the URI. | |
-| `withScheme($scheme)` | Return an instance with the specified scheme. | |
-| `withUserInfo($user, $password = null)` | Return an instance with the specified user information. | |
-| `withHost($host)` | Return an instance with the specified host. | |
-| `withPort($port)` | Return an instance with the specified port. | |
-| `withPath($path)` | Return an instance with the specified path. | |
-| `withQuery($query)` | Return an instance with the specified query string. | |
-| `withFragment($fragment)` | Return an instance with the specified URI fragment. | |
-| `__toString()` | Return the string representation as a URI reference. | |
-
-## `Psr\Http\Message\UploadedFileInterface` Methods
-
-| Method Name                        | Description | Notes |
-|------------------------------------| ----------- | ----- |
-| `getStream()` | Retrieve a stream representing the uploaded file. | |
-| `moveTo($targetPath)` | Move the uploaded file to a new location. | |
-| `getSize()` | Retrieve the file size. | |
-| `getError()` | Retrieve the error associated with the uploaded file. | |
-| `getClientFilename()` | Retrieve the filename sent by the client. | |
-| `getClientMediaType()` | Retrieve the media type sent by the client. | |
-
-> `RequestInterface`, `ServerRequestInterface`, `ResponseInterface` extend `MessageInterface`  because the `Request` and the `Response` are `HTTP Messages`.
-> When using `ServerRequestInterface`, both `RequestInterface` and `Psr\Http\Message\MessageInterface` methods are considered.
-
diff --git a/advancedcontentfilter/vendor/psr/http-message/docs/PSR7-Usage.md b/advancedcontentfilter/vendor/psr/http-message/docs/PSR7-Usage.md
deleted file mode 100644
index b6d048a3..00000000
--- a/advancedcontentfilter/vendor/psr/http-message/docs/PSR7-Usage.md
+++ /dev/null
@@ -1,159 +0,0 @@
-### PSR-7 Usage
-
-All PSR-7 applications comply with these interfaces 
-They were created to establish a standard between middleware implementations.
-
-> `RequestInterface`, `ServerRequestInterface`, `ResponseInterface` extend `MessageInterface`  because the `Request` and the `Response` are `HTTP Messages`.
-> When using `ServerRequestInterface`, both `RequestInterface` and `Psr\Http\Message\MessageInterface` methods are considered.
-
-
-The following examples will illustrate how basic operations are done in PSR-7.
-
-##### Examples
-
-
-For this examples to work (at least) a PSR-7 implementation package is required. (eg: zendframework/zend-diactoros, guzzlehttp/psr7, slim/slim, etc)
-All PSR-7 implementations should have the same behaviour.
-
-The following will be assumed: 
-`$request` is an object of `Psr\Http\Message\RequestInterface` and
-
-`$response` is an object implementing `Psr\Http\Message\RequestInterface`
-
-
-### Working with HTTP Headers
-
-#### Adding headers to response:
-
-```php
-$response->withHeader('My-Custom-Header', 'My Custom Message');
-```
-
-#### Appending values to headers
-
-```php
-$response->withAddedHeader('My-Custom-Header', 'The second message');
-```
-
-#### Checking if header exists:
-
-```php
-$request->hasHeader('My-Custom-Header'); // will return false
-$response->hasHeader('My-Custom-Header'); // will return true
-```
-
-> Note: My-Custom-Header was only added in the Response
-
-#### Getting comma-separated values from a header (also applies to request)
-
-```php
-// getting value from request headers
-$request->getHeaderLine('Content-Type'); // will return: "text/html; charset=UTF-8"
-// getting value from response headers
-$response->getHeaderLine('My-Custom-Header'); // will return:  "My Custom Message; The second message"
-```
-
-#### Getting array of value from a header (also applies to request)
-```php
-// getting value from request headers
-$request->getHeader('Content-Type'); // will return: ["text/html", "charset=UTF-8"]
-// getting value from response headers
-$response->getHeader('My-Custom-Header'); // will return:  ["My Custom Message",  "The second message"]
-```
-
-#### Removing headers from HTTP Messages
-```php
-// removing a header from Request, removing deprecated "Content-MD5" header
-$request->withoutHeader('Content-MD5'); 
-
-// removing a header from Response
-// effect: the browser won't know the size of the stream
-// the browser will download the stream till it ends
-$response->withoutHeader('Content-Length');
-```
-
-### Working with HTTP Message Body
-
-When working with the PSR-7 there are two methods of implementation:
-#### 1. Getting the body separately
-
-> This method makes the body handling easier to understand and is useful when repeatedly calling body methods. (You only call `getBody()` once). Using this method mistakes like `$response->write()` are also prevented.
-
-```php
-$body = $response->getBody();
-// operations on body, eg. read, write, seek
-// ...
-// replacing the old body
-$response->withBody($body); 
-// this last statement is optional as we working with objects
-// in this case the "new" body is same with the "old" one
-// the $body variable has the same value as the one in $request, only the reference is passed
-```
-
-#### 2. Working directly on response
-
-> This method is useful when only performing few operations as the `$request->getBody()` statement fragment is required
-
-```php
-$response->getBody()->write('hello');
-```
-
-### Getting the body contents
-
-The following snippet gets the contents of a stream contents.
-> Note: Streams must be rewinded, if content was written into streams, it will be ignored when calling `getContents()` because the stream pointer is set to the last character, which is `\0` - meaning end of stream.
-```php 
-$body = $response->getBody();
-$body->rewind(); // or $body->seek(0);
-$bodyText = $body->getContents();
-```
-> Note: If `$body->seek(1)` is called before `$body->getContents()`, the first character will be ommited as the starting pointer is set to `1`, not `0`. This is why using `$body->rewind()` is recommended.
-
-### Append to body
-
-```php
-$response->getBody()->write('Hello'); // writing directly
-$body = $request->getBody(); // which is a `StreamInterface`
-$body->write('xxxxx');
-```
-
-### Prepend to body
-Prepending is different when it comes to streams. The content must be copied before writing the content to be prepended.
-The following example will explain the behaviour of streams.
-
-```php
-// assuming our response is initially empty
-$body = $repsonse->getBody();
-// writing the string "abcd"
-$body->write('abcd');
-
-// seeking to start of stream
-$body->seek(0);
-// writing 'ef'
-$body->write('ef'); // at this point the stream contains "efcd"
-```
-
-#### Prepending by rewriting separately
-
-```php
-// assuming our response body stream only contains: "abcd"
-$body = $response->getBody();
-$body->rewind();
-$contents = $body->getContents(); // abcd
-// seeking the stream to beginning
-$body->rewind();
-$body->write('ef'); // stream contains "efcd"
-$body->write($contents); // stream contains "efabcd"
-```
-
-> Note: `getContents()` seeks the stream while reading it, therefore if the second `rewind()` method call was not present the stream would have resulted in `abcdefabcd` because the `write()` method appends to stream if not preceeded by `rewind()` or `seek(0)`.
-
-#### Prepending by using contents as a string
-```php
-$body = $response->getBody();
-$body->rewind();
-$contents = $body->getContents(); // efabcd
-$contents = 'ef'.$contents;
-$body->rewind();
-$body->write($contents);
-```
diff --git a/advancedcontentfilter/vendor/psr/http-message/src/MessageInterface.php b/advancedcontentfilter/vendor/psr/http-message/src/MessageInterface.php
index a83c9851..dd46e5ec 100644
--- a/advancedcontentfilter/vendor/psr/http-message/src/MessageInterface.php
+++ b/advancedcontentfilter/vendor/psr/http-message/src/MessageInterface.php
@@ -23,7 +23,7 @@ interface MessageInterface
      *
      * @return string HTTP protocol version.
      */
-    public function getProtocolVersion(): string;
+    public function getProtocolVersion();
 
     /**
      * Return an instance with the specified HTTP protocol version.
@@ -38,7 +38,7 @@ interface MessageInterface
      * @param string $version HTTP protocol version
      * @return static
      */
-    public function withProtocolVersion(string $version): MessageInterface;
+    public function withProtocolVersion($version);
 
     /**
      * Retrieves all message header values.
@@ -65,7 +65,7 @@ interface MessageInterface
      *     key MUST be a header name, and each value MUST be an array of strings
      *     for that header.
      */
-    public function getHeaders(): array;
+    public function getHeaders();
 
     /**
      * Checks if a header exists by the given case-insensitive name.
@@ -75,7 +75,7 @@ interface MessageInterface
      *     name using a case-insensitive string comparison. Returns false if
      *     no matching header name is found in the message.
      */
-    public function hasHeader(string $name): bool;
+    public function hasHeader($name);
 
     /**
      * Retrieves a message header value by the given case-insensitive name.
@@ -91,7 +91,7 @@ interface MessageInterface
      *    header. If the header does not appear in the message, this method MUST
      *    return an empty array.
      */
-    public function getHeader(string $name): array;
+    public function getHeader($name);
 
     /**
      * Retrieves a comma-separated string of the values for a single header.
@@ -112,7 +112,7 @@ interface MessageInterface
      *    concatenated together using a comma. If the header does not appear in
      *    the message, this method MUST return an empty string.
      */
-    public function getHeaderLine(string $name): string;
+    public function getHeaderLine($name);
 
     /**
      * Return an instance with the provided value replacing the specified header.
@@ -129,7 +129,7 @@ interface MessageInterface
      * @return static
      * @throws \InvalidArgumentException for invalid header names or values.
      */
-    public function withHeader(string $name, $value): MessageInterface;
+    public function withHeader($name, $value);
 
     /**
      * Return an instance with the specified header appended with the given value.
@@ -147,7 +147,7 @@ interface MessageInterface
      * @return static
      * @throws \InvalidArgumentException for invalid header names or values.
      */
-    public function withAddedHeader(string $name, $value): MessageInterface;
+    public function withAddedHeader($name, $value);
 
     /**
      * Return an instance without the specified header.
@@ -161,14 +161,14 @@ interface MessageInterface
      * @param string $name Case-insensitive header field name to remove.
      * @return static
      */
-    public function withoutHeader(string $name): MessageInterface;
+    public function withoutHeader($name);
 
     /**
      * Gets the body of the message.
      *
      * @return StreamInterface Returns the body as a stream.
      */
-    public function getBody(): StreamInterface;
+    public function getBody();
 
     /**
      * Return an instance with the specified message body.
@@ -183,5 +183,5 @@ interface MessageInterface
      * @return static
      * @throws \InvalidArgumentException When the body is not valid.
      */
-    public function withBody(StreamInterface $body): MessageInterface;
+    public function withBody(StreamInterface $body);
 }
diff --git a/advancedcontentfilter/vendor/psr/http-message/src/RequestInterface.php b/advancedcontentfilter/vendor/psr/http-message/src/RequestInterface.php
index 33f85e55..a96d4fd6 100644
--- a/advancedcontentfilter/vendor/psr/http-message/src/RequestInterface.php
+++ b/advancedcontentfilter/vendor/psr/http-message/src/RequestInterface.php
@@ -39,7 +39,7 @@ interface RequestInterface extends MessageInterface
      *
      * @return string
      */
-    public function getRequestTarget(): string;
+    public function getRequestTarget();
 
     /**
      * Return an instance with the specific request-target.
@@ -55,18 +55,17 @@ interface RequestInterface extends MessageInterface
      *
      * @link http://tools.ietf.org/html/rfc7230#section-5.3 (for the various
      *     request-target forms allowed in request messages)
-     * @param string $requestTarget
+     * @param mixed $requestTarget
      * @return static
      */
-    public function withRequestTarget(string $requestTarget): RequestInterface;
-
+    public function withRequestTarget($requestTarget);
 
     /**
      * Retrieves the HTTP method of the request.
      *
      * @return string Returns the request method.
      */
-    public function getMethod(): string;
+    public function getMethod();
 
     /**
      * Return an instance with the provided HTTP method.
@@ -83,7 +82,7 @@ interface RequestInterface extends MessageInterface
      * @return static
      * @throws \InvalidArgumentException for invalid HTTP methods.
      */
-    public function withMethod(string $method): RequestInterface;
+    public function withMethod($method);
 
     /**
      * Retrieves the URI instance.
@@ -94,7 +93,7 @@ interface RequestInterface extends MessageInterface
      * @return UriInterface Returns a UriInterface instance
      *     representing the URI of the request.
      */
-    public function getUri(): UriInterface;
+    public function getUri();
 
     /**
      * Returns an instance with the provided URI.
@@ -126,5 +125,5 @@ interface RequestInterface extends MessageInterface
      * @param bool $preserveHost Preserve the original state of the Host header.
      * @return static
      */
-    public function withUri(UriInterface $uri, bool $preserveHost = false): RequestInterface;
+    public function withUri(UriInterface $uri, $preserveHost = false);
 }
diff --git a/advancedcontentfilter/vendor/psr/http-message/src/ResponseInterface.php b/advancedcontentfilter/vendor/psr/http-message/src/ResponseInterface.php
index e9299a91..c306514e 100644
--- a/advancedcontentfilter/vendor/psr/http-message/src/ResponseInterface.php
+++ b/advancedcontentfilter/vendor/psr/http-message/src/ResponseInterface.php
@@ -27,7 +27,7 @@ interface ResponseInterface extends MessageInterface
      *
      * @return int Status code.
      */
-    public function getStatusCode(): int;
+    public function getStatusCode();
 
     /**
      * Return an instance with the specified status code and, optionally, reason phrase.
@@ -49,7 +49,7 @@ interface ResponseInterface extends MessageInterface
      * @return static
      * @throws \InvalidArgumentException For invalid status code arguments.
      */
-    public function withStatus(int $code, string $reasonPhrase = ''): ResponseInterface;
+    public function withStatus($code, $reasonPhrase = '');
 
     /**
      * Gets the response reason phrase associated with the status code.
@@ -64,5 +64,5 @@ interface ResponseInterface extends MessageInterface
      * @link http://www.iana.org/assignments/http-status-codes/http-status-codes.xhtml
      * @return string Reason phrase; must return an empty string if none present.
      */
-    public function getReasonPhrase(): string;
+    public function getReasonPhrase();
 }
diff --git a/advancedcontentfilter/vendor/psr/http-message/src/ServerRequestInterface.php b/advancedcontentfilter/vendor/psr/http-message/src/ServerRequestInterface.php
index 8625d0e1..02512340 100644
--- a/advancedcontentfilter/vendor/psr/http-message/src/ServerRequestInterface.php
+++ b/advancedcontentfilter/vendor/psr/http-message/src/ServerRequestInterface.php
@@ -51,7 +51,7 @@ interface ServerRequestInterface extends RequestInterface
      *
      * @return array
      */
-    public function getServerParams(): array;
+    public function getServerParams();
 
     /**
      * Retrieve cookies.
@@ -63,7 +63,7 @@ interface ServerRequestInterface extends RequestInterface
      *
      * @return array
      */
-    public function getCookieParams(): array;
+    public function getCookieParams();
 
     /**
      * Return an instance with the specified cookies.
@@ -82,7 +82,7 @@ interface ServerRequestInterface extends RequestInterface
      * @param array $cookies Array of key/value pairs representing cookies.
      * @return static
      */
-    public function withCookieParams(array $cookies): ServerRequestInterface;
+    public function withCookieParams(array $cookies);
 
     /**
      * Retrieve query string arguments.
@@ -96,7 +96,7 @@ interface ServerRequestInterface extends RequestInterface
      *
      * @return array
      */
-    public function getQueryParams(): array;
+    public function getQueryParams();
 
     /**
      * Return an instance with the specified query string arguments.
@@ -120,7 +120,7 @@ interface ServerRequestInterface extends RequestInterface
      *     $_GET.
      * @return static
      */
-    public function withQueryParams(array $query): ServerRequestInterface;
+    public function withQueryParams(array $query);
 
     /**
      * Retrieve normalized file upload data.
@@ -134,7 +134,7 @@ interface ServerRequestInterface extends RequestInterface
      * @return array An array tree of UploadedFileInterface instances; an empty
      *     array MUST be returned if no data is present.
      */
-    public function getUploadedFiles(): array;
+    public function getUploadedFiles();
 
     /**
      * Create a new instance with the specified uploaded files.
@@ -147,7 +147,7 @@ interface ServerRequestInterface extends RequestInterface
      * @return static
      * @throws \InvalidArgumentException if an invalid structure is provided.
      */
-    public function withUploadedFiles(array $uploadedFiles): ServerRequestInterface;
+    public function withUploadedFiles(array $uploadedFiles);
 
     /**
      * Retrieve any parameters provided in the request body.
@@ -194,7 +194,7 @@ interface ServerRequestInterface extends RequestInterface
      * @throws \InvalidArgumentException if an unsupported argument type is
      *     provided.
      */
-    public function withParsedBody($data): ServerRequestInterface;
+    public function withParsedBody($data);
 
     /**
      * Retrieve attributes derived from the request.
@@ -207,7 +207,7 @@ interface ServerRequestInterface extends RequestInterface
      *
      * @return array Attributes derived from the request.
      */
-    public function getAttributes(): array;
+    public function getAttributes();
 
     /**
      * Retrieve a single derived request attribute.
@@ -224,7 +224,7 @@ interface ServerRequestInterface extends RequestInterface
      * @param mixed $default Default value to return if the attribute does not exist.
      * @return mixed
      */
-    public function getAttribute(string $name, $default = null);
+    public function getAttribute($name, $default = null);
 
     /**
      * Return an instance with the specified derived request attribute.
@@ -241,7 +241,7 @@ interface ServerRequestInterface extends RequestInterface
      * @param mixed $value The value of the attribute.
      * @return static
      */
-    public function withAttribute(string $name, $value): ServerRequestInterface;
+    public function withAttribute($name, $value);
 
     /**
      * Return an instance that removes the specified derived request attribute.
@@ -257,5 +257,5 @@ interface ServerRequestInterface extends RequestInterface
      * @param string $name The attribute name.
      * @return static
      */
-    public function withoutAttribute(string $name): ServerRequestInterface;
+    public function withoutAttribute($name);
 }
diff --git a/advancedcontentfilter/vendor/psr/http-message/src/StreamInterface.php b/advancedcontentfilter/vendor/psr/http-message/src/StreamInterface.php
index a62aabb8..f68f3912 100644
--- a/advancedcontentfilter/vendor/psr/http-message/src/StreamInterface.php
+++ b/advancedcontentfilter/vendor/psr/http-message/src/StreamInterface.php
@@ -25,14 +25,14 @@ interface StreamInterface
      * @see http://php.net/manual/en/language.oop5.magic.php#object.tostring
      * @return string
      */
-    public function __toString(): string;
+    public function __toString();
 
     /**
      * Closes the stream and any underlying resources.
      *
      * @return void
      */
-    public function close(): void;
+    public function close();
 
     /**
      * Separates any underlying resources from the stream.
@@ -48,7 +48,7 @@ interface StreamInterface
      *
      * @return int|null Returns the size in bytes if known, or null if unknown.
      */
-    public function getSize(): ?int;
+    public function getSize();
 
     /**
      * Returns the current position of the file read/write pointer
@@ -56,21 +56,21 @@ interface StreamInterface
      * @return int Position of the file pointer
      * @throws \RuntimeException on error.
      */
-    public function tell(): int;
+    public function tell();
 
     /**
      * Returns true if the stream is at the end of the stream.
      *
      * @return bool
      */
-    public function eof(): bool;
+    public function eof();
 
     /**
      * Returns whether or not the stream is seekable.
      *
      * @return bool
      */
-    public function isSeekable(): bool;
+    public function isSeekable();
 
     /**
      * Seek to a position in the stream.
@@ -84,7 +84,7 @@ interface StreamInterface
      *     SEEK_END: Set position to end-of-stream plus offset.
      * @throws \RuntimeException on failure.
      */
-    public function seek(int $offset, int $whence = SEEK_SET): void;
+    public function seek($offset, $whence = SEEK_SET);
 
     /**
      * Seek to the beginning of the stream.
@@ -96,14 +96,14 @@ interface StreamInterface
      * @link http://www.php.net/manual/en/function.fseek.php
      * @throws \RuntimeException on failure.
      */
-    public function rewind(): void;
+    public function rewind();
 
     /**
      * Returns whether or not the stream is writable.
      *
      * @return bool
      */
-    public function isWritable(): bool;
+    public function isWritable();
 
     /**
      * Write data to the stream.
@@ -112,14 +112,14 @@ interface StreamInterface
      * @return int Returns the number of bytes written to the stream.
      * @throws \RuntimeException on failure.
      */
-    public function write(string $string): int;
+    public function write($string);
 
     /**
      * Returns whether or not the stream is readable.
      *
      * @return bool
      */
-    public function isReadable(): bool;
+    public function isReadable();
 
     /**
      * Read data from the stream.
@@ -131,7 +131,7 @@ interface StreamInterface
      *     if no bytes are available.
      * @throws \RuntimeException if an error occurs.
      */
-    public function read(int $length): string;
+    public function read($length);
 
     /**
      * Returns the remaining contents in a string
@@ -140,7 +140,7 @@ interface StreamInterface
      * @throws \RuntimeException if unable to read or an error occurs while
      *     reading.
      */
-    public function getContents(): string;
+    public function getContents();
 
     /**
      * Get stream metadata as an associative array or retrieve a specific key.
@@ -149,10 +149,10 @@ interface StreamInterface
      * stream_get_meta_data() function.
      *
      * @link http://php.net/manual/en/function.stream-get-meta-data.php
-     * @param string|null $key Specific metadata to retrieve.
+     * @param string $key Specific metadata to retrieve.
      * @return array|mixed|null Returns an associative array if no key is
      *     provided. Returns a specific key value if a key is provided and the
      *     value is found, or null if the key is not found.
      */
-    public function getMetadata(?string $key = null);
+    public function getMetadata($key = null);
 }
diff --git a/advancedcontentfilter/vendor/psr/http-message/src/UploadedFileInterface.php b/advancedcontentfilter/vendor/psr/http-message/src/UploadedFileInterface.php
index dd19d653..f8a6901e 100644
--- a/advancedcontentfilter/vendor/psr/http-message/src/UploadedFileInterface.php
+++ b/advancedcontentfilter/vendor/psr/http-message/src/UploadedFileInterface.php
@@ -28,7 +28,7 @@ interface UploadedFileInterface
      * @throws \RuntimeException in cases when no stream is available or can be
      *     created.
      */
-    public function getStream(): StreamInterface;
+    public function getStream();
 
     /**
      * Move the uploaded file to a new location.
@@ -62,7 +62,7 @@ interface UploadedFileInterface
      * @throws \RuntimeException on any error during the move operation, or on
      *     the second or subsequent call to the method.
      */
-    public function moveTo(string $targetPath): void;
+    public function moveTo($targetPath);
     
     /**
      * Retrieve the file size.
@@ -73,7 +73,7 @@ interface UploadedFileInterface
      *
      * @return int|null The file size in bytes or null if unknown.
      */
-    public function getSize(): ?int;
+    public function getSize();
     
     /**
      * Retrieve the error associated with the uploaded file.
@@ -89,7 +89,7 @@ interface UploadedFileInterface
      * @see http://php.net/manual/en/features.file-upload.errors.php
      * @return int One of PHP's UPLOAD_ERR_XXX constants.
      */
-    public function getError(): int;
+    public function getError();
     
     /**
      * Retrieve the filename sent by the client.
@@ -104,7 +104,7 @@ interface UploadedFileInterface
      * @return string|null The filename sent by the client or null if none
      *     was provided.
      */
-    public function getClientFilename(): ?string;
+    public function getClientFilename();
     
     /**
      * Retrieve the media type sent by the client.
@@ -119,5 +119,5 @@ interface UploadedFileInterface
      * @return string|null The media type sent by the client or null if none
      *     was provided.
      */
-    public function getClientMediaType(): ?string;
+    public function getClientMediaType();
 }
diff --git a/advancedcontentfilter/vendor/psr/http-message/src/UriInterface.php b/advancedcontentfilter/vendor/psr/http-message/src/UriInterface.php
index 15e2cf28..9d7ab9ea 100644
--- a/advancedcontentfilter/vendor/psr/http-message/src/UriInterface.php
+++ b/advancedcontentfilter/vendor/psr/http-message/src/UriInterface.php
@@ -1,5 +1,4 @@
 <?php
-
 namespace Psr\Http\Message;
 
 /**
@@ -38,7 +37,7 @@ interface UriInterface
      * @see https://tools.ietf.org/html/rfc3986#section-3.1
      * @return string The URI scheme.
      */
-    public function getScheme(): string;
+    public function getScheme();
 
     /**
      * Retrieve the authority component of the URI.
@@ -58,7 +57,7 @@ interface UriInterface
      * @see https://tools.ietf.org/html/rfc3986#section-3.2
      * @return string The URI authority, in "[user-info@]host[:port]" format.
      */
-    public function getAuthority(): string;
+    public function getAuthority();
 
     /**
      * Retrieve the user information component of the URI.
@@ -75,7 +74,7 @@ interface UriInterface
      *
      * @return string The URI user information, in "username[:password]" format.
      */
-    public function getUserInfo(): string;
+    public function getUserInfo();
 
     /**
      * Retrieve the host component of the URI.
@@ -88,7 +87,7 @@ interface UriInterface
      * @see http://tools.ietf.org/html/rfc3986#section-3.2.2
      * @return string The URI host.
      */
-    public function getHost(): string;
+    public function getHost();
 
     /**
      * Retrieve the port component of the URI.
@@ -105,7 +104,7 @@ interface UriInterface
      *
      * @return null|int The URI port.
      */
-    public function getPort(): ?int;
+    public function getPort();
 
     /**
      * Retrieve the path component of the URI.
@@ -132,7 +131,7 @@ interface UriInterface
      * @see https://tools.ietf.org/html/rfc3986#section-3.3
      * @return string The URI path.
      */
-    public function getPath(): string;
+    public function getPath();
 
     /**
      * Retrieve the query string of the URI.
@@ -154,7 +153,7 @@ interface UriInterface
      * @see https://tools.ietf.org/html/rfc3986#section-3.4
      * @return string The URI query string.
      */
-    public function getQuery(): string;
+    public function getQuery();
 
     /**
      * Retrieve the fragment component of the URI.
@@ -172,7 +171,7 @@ interface UriInterface
      * @see https://tools.ietf.org/html/rfc3986#section-3.5
      * @return string The URI fragment.
      */
-    public function getFragment(): string;
+    public function getFragment();
 
     /**
      * Return an instance with the specified scheme.
@@ -189,7 +188,7 @@ interface UriInterface
      * @return static A new instance with the specified scheme.
      * @throws \InvalidArgumentException for invalid or unsupported schemes.
      */
-    public function withScheme(string $scheme): UriInterface;
+    public function withScheme($scheme);
 
     /**
      * Return an instance with the specified user information.
@@ -205,7 +204,7 @@ interface UriInterface
      * @param null|string $password The password associated with $user.
      * @return static A new instance with the specified user information.
      */
-    public function withUserInfo(string $user, ?string $password = null): UriInterface;
+    public function withUserInfo($user, $password = null);
 
     /**
      * Return an instance with the specified host.
@@ -219,7 +218,7 @@ interface UriInterface
      * @return static A new instance with the specified host.
      * @throws \InvalidArgumentException for invalid hostnames.
      */
-    public function withHost(string $host): UriInterface;
+    public function withHost($host);
 
     /**
      * Return an instance with the specified port.
@@ -238,7 +237,7 @@ interface UriInterface
      * @return static A new instance with the specified port.
      * @throws \InvalidArgumentException for invalid ports.
      */
-    public function withPort(?int $port): UriInterface;
+    public function withPort($port);
 
     /**
      * Return an instance with the specified path.
@@ -262,7 +261,7 @@ interface UriInterface
      * @return static A new instance with the specified path.
      * @throws \InvalidArgumentException for invalid paths.
      */
-    public function withPath(string $path): UriInterface;
+    public function withPath($path);
 
     /**
      * Return an instance with the specified query string.
@@ -279,7 +278,7 @@ interface UriInterface
      * @return static A new instance with the specified query string.
      * @throws \InvalidArgumentException for invalid query strings.
      */
-    public function withQuery(string $query): UriInterface;
+    public function withQuery($query);
 
     /**
      * Return an instance with the specified URI fragment.
@@ -295,7 +294,7 @@ interface UriInterface
      * @param string $fragment The fragment to use with the new instance.
      * @return static A new instance with the specified fragment.
      */
-    public function withFragment(string $fragment): UriInterface;
+    public function withFragment($fragment);
 
     /**
      * Return the string representation as a URI reference.
@@ -320,5 +319,5 @@ interface UriInterface
      * @see http://tools.ietf.org/html/rfc3986#section-4.1
      * @return string
      */
-    public function __toString(): string;
+    public function __toString();
 }
diff --git a/advancedcontentfilter/vendor/psr/http-server-handler/LICENSE b/advancedcontentfilter/vendor/psr/http-server-handler/LICENSE
deleted file mode 100644
index b71ec5df..00000000
--- a/advancedcontentfilter/vendor/psr/http-server-handler/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2016 PHP Framework Interoperability Group
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/advancedcontentfilter/vendor/psr/http-server-handler/README.md b/advancedcontentfilter/vendor/psr/http-server-handler/README.md
deleted file mode 100644
index 111a9ed2..00000000
--- a/advancedcontentfilter/vendor/psr/http-server-handler/README.md
+++ /dev/null
@@ -1,12 +0,0 @@
-HTTP Server Request Handlers for Middleware
-===========================================
-
-This repository holds the `RequestHandlerInterface` related to [PSR-15 (HTTP Server Request Handlers)][psr-url].
-
-Note that this is not a Server Request Handler implementation of its own. It is merely the interface that describe a Server Request Handler.
-
-The installable [package][package-url] and [implementations][implementation-url] are listed on Packagist.
-
-[psr-url]: https://www.php-fig.org/psr/psr-15/
-[package-url]: https://packagist.org/packages/psr/http-server-handler
-[implementation-url]: https://packagist.org/providers/psr/http-server-handler-implementation
diff --git a/advancedcontentfilter/vendor/psr/http-server-handler/composer.json b/advancedcontentfilter/vendor/psr/http-server-handler/composer.json
deleted file mode 100644
index c54b2dee..00000000
--- a/advancedcontentfilter/vendor/psr/http-server-handler/composer.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-    "name": "psr/http-server-handler",
-    "description": "Common interface for HTTP server-side request handler",
-    "keywords": [
-        "psr",
-        "psr-7",
-        "psr-15",
-        "http-interop",
-        "http",
-        "server",
-        "handler",
-        "request",
-        "response"
-    ],
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "PHP-FIG",
-            "homepage": "https://www.php-fig.org/"
-        }
-    ],
-    "require": {
-        "php": ">=7.0",
-        "psr/http-message": "^1.0 || ^2.0"
-    },
-    "autoload": {
-        "psr-4": {
-            "Psr\\Http\\Server\\": "src/"
-        }
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "1.0.x-dev"
-        }
-    }
-}
diff --git a/advancedcontentfilter/vendor/psr/http-server-handler/src/RequestHandlerInterface.php b/advancedcontentfilter/vendor/psr/http-server-handler/src/RequestHandlerInterface.php
deleted file mode 100644
index 83911e26..00000000
--- a/advancedcontentfilter/vendor/psr/http-server-handler/src/RequestHandlerInterface.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-namespace Psr\Http\Server;
-
-use Psr\Http\Message\ResponseInterface;
-use Psr\Http\Message\ServerRequestInterface;
-
-/**
- * Handles a server request and produces a response.
- *
- * An HTTP request handler process an HTTP request in order to produce an
- * HTTP response.
- */
-interface RequestHandlerInterface
-{
-    /**
-     * Handles a request and produces a response.
-     *
-     * May call other collaborating code to generate the response.
-     */
-    public function handle(ServerRequestInterface $request): ResponseInterface;
-}
diff --git a/advancedcontentfilter/vendor/psr/http-server-middleware/LICENSE b/advancedcontentfilter/vendor/psr/http-server-middleware/LICENSE
deleted file mode 100644
index b71ec5df..00000000
--- a/advancedcontentfilter/vendor/psr/http-server-middleware/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2016 PHP Framework Interoperability Group
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/advancedcontentfilter/vendor/psr/http-server-middleware/README.md b/advancedcontentfilter/vendor/psr/http-server-middleware/README.md
deleted file mode 100644
index 7b0a9550..00000000
--- a/advancedcontentfilter/vendor/psr/http-server-middleware/README.md
+++ /dev/null
@@ -1,12 +0,0 @@
-HTTP Server Middleware
-==============
-
-This repository holds the `MiddlewareInterface` related to [PSR-15 (HTTP Server Request Handlers)][psr-url].
-
-Note that this is not a Middleware implementation of its own. It is merely the interface that describe a Middleware.
-
-The installable [package][package-url] and [implementations][implementation-url] are listed on Packagist.
-
-[psr-url]: https://www.php-fig.org/psr/psr-15/
-[package-url]: https://packagist.org/packages/psr/http-server-middleware
-[implementation-url]: https://packagist.org/providers/psr/http-server-middleware-implementation
diff --git a/advancedcontentfilter/vendor/psr/http-server-middleware/composer.json b/advancedcontentfilter/vendor/psr/http-server-middleware/composer.json
deleted file mode 100644
index 15116714..00000000
--- a/advancedcontentfilter/vendor/psr/http-server-middleware/composer.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-    "name": "psr/http-server-middleware",
-    "description": "Common interface for HTTP server-side middleware",
-    "keywords": [
-        "psr",
-        "psr-7",
-        "psr-15",
-        "http-interop",
-        "http",
-        "middleware",
-        "request",
-        "response"
-    ],
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "PHP-FIG",
-            "homepage": "https://www.php-fig.org/"
-        }
-    ],
-    "require": {
-        "php": ">=7.0",
-        "psr/http-message": "^1.0 || ^2.0",
-        "psr/http-server-handler": "^1.0"
-    },
-    "autoload": {
-        "psr-4": {
-            "Psr\\Http\\Server\\": "src/"
-        }
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "1.0.x-dev"
-        }
-    }
-}
diff --git a/advancedcontentfilter/vendor/psr/http-server-middleware/src/MiddlewareInterface.php b/advancedcontentfilter/vendor/psr/http-server-middleware/src/MiddlewareInterface.php
deleted file mode 100644
index a6c14f8c..00000000
--- a/advancedcontentfilter/vendor/psr/http-server-middleware/src/MiddlewareInterface.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-namespace Psr\Http\Server;
-
-use Psr\Http\Message\ResponseInterface;
-use Psr\Http\Message\ServerRequestInterface;
-
-/**
- * Participant in processing a server request and response.
- *
- * An HTTP middleware component participates in processing an HTTP message:
- * by acting on the request, generating the response, or forwarding the
- * request to a subsequent middleware and possibly acting on its response.
- */
-interface MiddlewareInterface
-{
-    /**
-     * Process an incoming server request.
-     *
-     * Processes an incoming server request in order to produce a response.
-     * If unable to produce the response itself, it may delegate to the provided
-     * request handler to do so.
-     */
-    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface;
-}
diff --git a/advancedcontentfilter/vendor/psr/log/.gitignore b/advancedcontentfilter/vendor/psr/log/.gitignore
new file mode 100644
index 00000000..22d0d82f
--- /dev/null
+++ b/advancedcontentfilter/vendor/psr/log/.gitignore
@@ -0,0 +1 @@
+vendor
diff --git a/advancedcontentfilter/vendor/psr/log/Psr/Log/AbstractLogger.php b/advancedcontentfilter/vendor/psr/log/Psr/Log/AbstractLogger.php
index e02f9daf..90e721af 100644
--- a/advancedcontentfilter/vendor/psr/log/Psr/Log/AbstractLogger.php
+++ b/advancedcontentfilter/vendor/psr/log/Psr/Log/AbstractLogger.php
@@ -14,8 +14,8 @@ abstract class AbstractLogger implements LoggerInterface
     /**
      * System is unusable.
      *
-     * @param string  $message
-     * @param mixed[] $context
+     * @param string $message
+     * @param array  $context
      *
      * @return void
      */
@@ -30,8 +30,8 @@ abstract class AbstractLogger implements LoggerInterface
      * Example: Entire website down, database unavailable, etc. This should
      * trigger the SMS alerts and wake you up.
      *
-     * @param string  $message
-     * @param mixed[] $context
+     * @param string $message
+     * @param array  $context
      *
      * @return void
      */
@@ -45,8 +45,8 @@ abstract class AbstractLogger implements LoggerInterface
      *
      * Example: Application component unavailable, unexpected exception.
      *
-     * @param string  $message
-     * @param mixed[] $context
+     * @param string $message
+     * @param array  $context
      *
      * @return void
      */
@@ -59,8 +59,8 @@ abstract class AbstractLogger implements LoggerInterface
      * Runtime errors that do not require immediate action but should typically
      * be logged and monitored.
      *
-     * @param string  $message
-     * @param mixed[] $context
+     * @param string $message
+     * @param array  $context
      *
      * @return void
      */
@@ -75,8 +75,8 @@ abstract class AbstractLogger implements LoggerInterface
      * Example: Use of deprecated APIs, poor use of an API, undesirable things
      * that are not necessarily wrong.
      *
-     * @param string  $message
-     * @param mixed[] $context
+     * @param string $message
+     * @param array  $context
      *
      * @return void
      */
@@ -88,8 +88,8 @@ abstract class AbstractLogger implements LoggerInterface
     /**
      * Normal but significant events.
      *
-     * @param string  $message
-     * @param mixed[] $context
+     * @param string $message
+     * @param array  $context
      *
      * @return void
      */
@@ -103,8 +103,8 @@ abstract class AbstractLogger implements LoggerInterface
      *
      * Example: User logs in, SQL logs.
      *
-     * @param string  $message
-     * @param mixed[] $context
+     * @param string $message
+     * @param array  $context
      *
      * @return void
      */
@@ -116,8 +116,8 @@ abstract class AbstractLogger implements LoggerInterface
     /**
      * Detailed debug information.
      *
-     * @param string  $message
-     * @param mixed[] $context
+     * @param string $message
+     * @param array  $context
      *
      * @return void
      */
diff --git a/advancedcontentfilter/vendor/psr/log/Psr/Log/LoggerAwareTrait.php b/advancedcontentfilter/vendor/psr/log/Psr/Log/LoggerAwareTrait.php
index 82bf45c8..639f79bd 100644
--- a/advancedcontentfilter/vendor/psr/log/Psr/Log/LoggerAwareTrait.php
+++ b/advancedcontentfilter/vendor/psr/log/Psr/Log/LoggerAwareTrait.php
@@ -10,7 +10,7 @@ trait LoggerAwareTrait
     /**
      * The logger instance.
      *
-     * @var LoggerInterface|null
+     * @var LoggerInterface
      */
     protected $logger;
 
diff --git a/advancedcontentfilter/vendor/psr/log/Psr/Log/LoggerInterface.php b/advancedcontentfilter/vendor/psr/log/Psr/Log/LoggerInterface.php
index 2206cfde..5ea72438 100644
--- a/advancedcontentfilter/vendor/psr/log/Psr/Log/LoggerInterface.php
+++ b/advancedcontentfilter/vendor/psr/log/Psr/Log/LoggerInterface.php
@@ -22,8 +22,8 @@ interface LoggerInterface
     /**
      * System is unusable.
      *
-     * @param string  $message
-     * @param mixed[] $context
+     * @param string $message
+     * @param array  $context
      *
      * @return void
      */
@@ -35,8 +35,8 @@ interface LoggerInterface
      * Example: Entire website down, database unavailable, etc. This should
      * trigger the SMS alerts and wake you up.
      *
-     * @param string  $message
-     * @param mixed[] $context
+     * @param string $message
+     * @param array  $context
      *
      * @return void
      */
@@ -47,8 +47,8 @@ interface LoggerInterface
      *
      * Example: Application component unavailable, unexpected exception.
      *
-     * @param string  $message
-     * @param mixed[] $context
+     * @param string $message
+     * @param array  $context
      *
      * @return void
      */
@@ -58,8 +58,8 @@ interface LoggerInterface
      * Runtime errors that do not require immediate action but should typically
      * be logged and monitored.
      *
-     * @param string  $message
-     * @param mixed[] $context
+     * @param string $message
+     * @param array  $context
      *
      * @return void
      */
@@ -71,8 +71,8 @@ interface LoggerInterface
      * Example: Use of deprecated APIs, poor use of an API, undesirable things
      * that are not necessarily wrong.
      *
-     * @param string  $message
-     * @param mixed[] $context
+     * @param string $message
+     * @param array  $context
      *
      * @return void
      */
@@ -81,8 +81,8 @@ interface LoggerInterface
     /**
      * Normal but significant events.
      *
-     * @param string  $message
-     * @param mixed[] $context
+     * @param string $message
+     * @param array  $context
      *
      * @return void
      */
@@ -93,8 +93,8 @@ interface LoggerInterface
      *
      * Example: User logs in, SQL logs.
      *
-     * @param string  $message
-     * @param mixed[] $context
+     * @param string $message
+     * @param array  $context
      *
      * @return void
      */
@@ -103,8 +103,8 @@ interface LoggerInterface
     /**
      * Detailed debug information.
      *
-     * @param string  $message
-     * @param mixed[] $context
+     * @param string $message
+     * @param array  $context
      *
      * @return void
      */
@@ -113,13 +113,11 @@ interface LoggerInterface
     /**
      * Logs with an arbitrary level.
      *
-     * @param mixed   $level
-     * @param string  $message
-     * @param mixed[] $context
+     * @param mixed  $level
+     * @param string $message
+     * @param array  $context
      *
      * @return void
-     *
-     * @throws \Psr\Log\InvalidArgumentException
      */
     public function log($level, $message, array $context = array());
 }
diff --git a/advancedcontentfilter/vendor/psr/log/Psr/Log/LoggerTrait.php b/advancedcontentfilter/vendor/psr/log/Psr/Log/LoggerTrait.php
index e392fef0..867225df 100644
--- a/advancedcontentfilter/vendor/psr/log/Psr/Log/LoggerTrait.php
+++ b/advancedcontentfilter/vendor/psr/log/Psr/Log/LoggerTrait.php
@@ -135,8 +135,6 @@ trait LoggerTrait
      * @param array  $context
      *
      * @return void
-     *
-     * @throws \Psr\Log\InvalidArgumentException
      */
     abstract public function log($level, $message, array $context = array());
 }
diff --git a/advancedcontentfilter/vendor/psr/log/Psr/Log/NullLogger.php b/advancedcontentfilter/vendor/psr/log/Psr/Log/NullLogger.php
index c8f7293b..d8cd682c 100644
--- a/advancedcontentfilter/vendor/psr/log/Psr/Log/NullLogger.php
+++ b/advancedcontentfilter/vendor/psr/log/Psr/Log/NullLogger.php
@@ -20,8 +20,6 @@ class NullLogger extends AbstractLogger
      * @param array  $context
      *
      * @return void
-     *
-     * @throws \Psr\Log\InvalidArgumentException
      */
     public function log($level, $message, array $context = array())
     {
diff --git a/advancedcontentfilter/vendor/psr/log/Psr/Log/Test/DummyTest.php b/advancedcontentfilter/vendor/psr/log/Psr/Log/Test/DummyTest.php
deleted file mode 100644
index 9638c110..00000000
--- a/advancedcontentfilter/vendor/psr/log/Psr/Log/Test/DummyTest.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-namespace Psr\Log\Test;
-
-/**
- * This class is internal and does not follow the BC promise.
- *
- * Do NOT use this class in any way.
- *
- * @internal
- */
-class DummyTest
-{
-    public function __toString()
-    {
-        return 'DummyTest';
-    }
-}
diff --git a/advancedcontentfilter/vendor/psr/log/Psr/Log/Test/LoggerInterfaceTest.php b/advancedcontentfilter/vendor/psr/log/Psr/Log/Test/LoggerInterfaceTest.php
index e1e5354d..a0391a52 100644
--- a/advancedcontentfilter/vendor/psr/log/Psr/Log/Test/LoggerInterfaceTest.php
+++ b/advancedcontentfilter/vendor/psr/log/Psr/Log/Test/LoggerInterfaceTest.php
@@ -4,7 +4,6 @@ namespace Psr\Log\Test;
 
 use Psr\Log\LoggerInterface;
 use Psr\Log\LogLevel;
-use PHPUnit\Framework\TestCase;
 
 /**
  * Provides a base test class for ensuring compliance with the LoggerInterface.
@@ -12,7 +11,7 @@ use PHPUnit\Framework\TestCase;
  * Implementors can extend the class and implement abstract methods to run this
  * as part of their test suite.
  */
-abstract class LoggerInterfaceTest extends TestCase
+abstract class LoggerInterfaceTest extends \PHPUnit_Framework_TestCase
 {
     /**
      * @return LoggerInterface
@@ -102,9 +101,6 @@ abstract class LoggerInterfaceTest extends TestCase
 
     public function testContextCanContainAnything()
     {
-        $closed = fopen('php://memory', 'r');
-        fclose($closed);
-
         $context = array(
             'bool' => true,
             'null' => null,
@@ -114,7 +110,6 @@ abstract class LoggerInterfaceTest extends TestCase
             'nested' => array('with object' => new DummyTest),
             'object' => new \DateTime,
             'resource' => fopen('php://memory', 'r'),
-            'closed' => $closed,
         );
 
         $this->getLogger()->warning('Crazy context data', $context);
@@ -136,3 +131,10 @@ abstract class LoggerInterfaceTest extends TestCase
         $this->assertEquals($expected, $this->getLogs());
     }
 }
+
+class DummyTest
+{
+    public function __toString()
+    {
+    }
+}
diff --git a/advancedcontentfilter/vendor/psr/log/Psr/Log/Test/TestLogger.php b/advancedcontentfilter/vendor/psr/log/Psr/Log/Test/TestLogger.php
deleted file mode 100644
index 1be32304..00000000
--- a/advancedcontentfilter/vendor/psr/log/Psr/Log/Test/TestLogger.php
+++ /dev/null
@@ -1,147 +0,0 @@
-<?php
-
-namespace Psr\Log\Test;
-
-use Psr\Log\AbstractLogger;
-
-/**
- * Used for testing purposes.
- *
- * It records all records and gives you access to them for verification.
- *
- * @method bool hasEmergency($record)
- * @method bool hasAlert($record)
- * @method bool hasCritical($record)
- * @method bool hasError($record)
- * @method bool hasWarning($record)
- * @method bool hasNotice($record)
- * @method bool hasInfo($record)
- * @method bool hasDebug($record)
- *
- * @method bool hasEmergencyRecords()
- * @method bool hasAlertRecords()
- * @method bool hasCriticalRecords()
- * @method bool hasErrorRecords()
- * @method bool hasWarningRecords()
- * @method bool hasNoticeRecords()
- * @method bool hasInfoRecords()
- * @method bool hasDebugRecords()
- *
- * @method bool hasEmergencyThatContains($message)
- * @method bool hasAlertThatContains($message)
- * @method bool hasCriticalThatContains($message)
- * @method bool hasErrorThatContains($message)
- * @method bool hasWarningThatContains($message)
- * @method bool hasNoticeThatContains($message)
- * @method bool hasInfoThatContains($message)
- * @method bool hasDebugThatContains($message)
- *
- * @method bool hasEmergencyThatMatches($message)
- * @method bool hasAlertThatMatches($message)
- * @method bool hasCriticalThatMatches($message)
- * @method bool hasErrorThatMatches($message)
- * @method bool hasWarningThatMatches($message)
- * @method bool hasNoticeThatMatches($message)
- * @method bool hasInfoThatMatches($message)
- * @method bool hasDebugThatMatches($message)
- *
- * @method bool hasEmergencyThatPasses($message)
- * @method bool hasAlertThatPasses($message)
- * @method bool hasCriticalThatPasses($message)
- * @method bool hasErrorThatPasses($message)
- * @method bool hasWarningThatPasses($message)
- * @method bool hasNoticeThatPasses($message)
- * @method bool hasInfoThatPasses($message)
- * @method bool hasDebugThatPasses($message)
- */
-class TestLogger extends AbstractLogger
-{
-    /**
-     * @var array
-     */
-    public $records = [];
-
-    public $recordsByLevel = [];
-
-    /**
-     * @inheritdoc
-     */
-    public function log($level, $message, array $context = [])
-    {
-        $record = [
-            'level' => $level,
-            'message' => $message,
-            'context' => $context,
-        ];
-
-        $this->recordsByLevel[$record['level']][] = $record;
-        $this->records[] = $record;
-    }
-
-    public function hasRecords($level)
-    {
-        return isset($this->recordsByLevel[$level]);
-    }
-
-    public function hasRecord($record, $level)
-    {
-        if (is_string($record)) {
-            $record = ['message' => $record];
-        }
-        return $this->hasRecordThatPasses(function ($rec) use ($record) {
-            if ($rec['message'] !== $record['message']) {
-                return false;
-            }
-            if (isset($record['context']) && $rec['context'] !== $record['context']) {
-                return false;
-            }
-            return true;
-        }, $level);
-    }
-
-    public function hasRecordThatContains($message, $level)
-    {
-        return $this->hasRecordThatPasses(function ($rec) use ($message) {
-            return strpos($rec['message'], $message) !== false;
-        }, $level);
-    }
-
-    public function hasRecordThatMatches($regex, $level)
-    {
-        return $this->hasRecordThatPasses(function ($rec) use ($regex) {
-            return preg_match($regex, $rec['message']) > 0;
-        }, $level);
-    }
-
-    public function hasRecordThatPasses(callable $predicate, $level)
-    {
-        if (!isset($this->recordsByLevel[$level])) {
-            return false;
-        }
-        foreach ($this->recordsByLevel[$level] as $i => $rec) {
-            if (call_user_func($predicate, $rec, $i)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    public function __call($method, $args)
-    {
-        if (preg_match('/(.*)(Debug|Info|Notice|Warning|Error|Critical|Alert|Emergency)(.*)/', $method, $matches) > 0) {
-            $genericMethod = $matches[1] . ('Records' !== $matches[3] ? 'Record' : '') . $matches[3];
-            $level = strtolower($matches[2]);
-            if (method_exists($this, $genericMethod)) {
-                $args[] = $level;
-                return call_user_func_array([$this, $genericMethod], $args);
-            }
-        }
-        throw new \BadMethodCallException('Call to undefined method ' . get_class($this) . '::' . $method . '()');
-    }
-
-    public function reset()
-    {
-        $this->records = [];
-        $this->recordsByLevel = [];
-    }
-}
diff --git a/advancedcontentfilter/vendor/psr/log/README.md b/advancedcontentfilter/vendor/psr/log/README.md
index a9f20c43..574bc1cb 100644
--- a/advancedcontentfilter/vendor/psr/log/README.md
+++ b/advancedcontentfilter/vendor/psr/log/README.md
@@ -7,13 +7,6 @@ This repository holds all interfaces/classes/traits related to
 Note that this is not a logger of its own. It is merely an interface that
 describes a logger. See the specification for more details.
 
-Installation
-------------
-
-```bash
-composer require psr/log
-```
-
 Usage
 -----
 
@@ -38,12 +31,6 @@ class Foo
         if ($this->logger) {
             $this->logger->info('Doing work');
         }
-           
-        try {
-            $this->doSomethingElse();
-        } catch (Exception $exception) {
-            $this->logger->error('Oh no!', array('exception' => $exception));
-        }
 
         // do something useful
     }
diff --git a/advancedcontentfilter/vendor/psr/log/composer.json b/advancedcontentfilter/vendor/psr/log/composer.json
index ca056953..87934d70 100644
--- a/advancedcontentfilter/vendor/psr/log/composer.json
+++ b/advancedcontentfilter/vendor/psr/log/composer.json
@@ -7,7 +7,7 @@
     "authors": [
         {
             "name": "PHP-FIG",
-            "homepage": "https://www.php-fig.org/"
+            "homepage": "http://www.php-fig.org/"
         }
     ],
     "require": {
@@ -20,7 +20,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.1.x-dev"
+            "dev-master": "1.0.x-dev"
         }
     }
 }
diff --git a/advancedcontentfilter/vendor/slim/slim/CHANGELOG.md b/advancedcontentfilter/vendor/slim/slim/CHANGELOG.md
deleted file mode 100644
index 6bcb127d..00000000
--- a/advancedcontentfilter/vendor/slim/slim/CHANGELOG.md
+++ /dev/null
@@ -1,237 +0,0 @@
-# Changelog
-
-# 4.11.0 - 2022-11-06
-- [3180: Declare types](https://github.com/slimphp/Slim/pull/3180) thanks to @nbayramberdiyev
-- [3181: Update laminas/laminas-diactoros requirement from ^2.8 to ^2.9](https://github.com/slimphp/Slim/pull/3181) thanks to @dependabot[bot]
-- [3182: Update guzzlehttp/psr7 requirement from ^2.1 to ^2.2](https://github.com/slimphp/Slim/pull/3182) thanks to @dependabot[bot]
-- [3183: Update phpstan/phpstan requirement from ^1.4 to ^1.5](https://github.com/slimphp/Slim/pull/3183) thanks to @dependabot[bot]
-- [3184: Update adriansuter/php-autoload-override requirement from ^1.2 to ^1.3](https://github.com/slimphp/Slim/pull/3184) thanks to @dependabot[bot]
-- [3189: Update phpstan/phpstan requirement from ^1.5 to ^1.6](https://github.com/slimphp/Slim/pull/3189) thanks to @dependabot[bot]
-- [3191: Adding property types to Middleware classes](https://github.com/slimphp/Slim/pull/3191) thanks to @ashleycoles
-- [3193: Handlers types](https://github.com/slimphp/Slim/pull/3193) thanks to @ashleycoles
-- [3194: Adding types to AbstractErrorRenderer](https://github.com/slimphp/Slim/pull/3194) thanks to @ashleycoles
-- [3195: Adding prop types for Exception classes](https://github.com/slimphp/Slim/pull/3195) thanks to @ashleycoles
-- [3196: Adding property type declarations for Factory classes](https://github.com/slimphp/Slim/pull/3196) thanks to @ashleycoles
-- [3197: Remove redundant docblock types](https://github.com/slimphp/Slim/pull/3197) thanks to @theodorejb
-- [3199: Update laminas/laminas-diactoros requirement from ^2.9 to ^2.11](https://github.com/slimphp/Slim/pull/3199) thanks to @dependabot[bot]
-- [3200: Update phpstan/phpstan requirement from ^1.6 to ^1.7](https://github.com/slimphp/Slim/pull/3200) thanks to @dependabot[bot]
-- [3205: Update guzzlehttp/psr7 requirement from ^2.2 to ^2.4](https://github.com/slimphp/Slim/pull/3205) thanks to @dependabot[bot]
-- [3206: Update squizlabs/php_codesniffer requirement from ^3.6 to ^3.7](https://github.com/slimphp/Slim/pull/3206) thanks to @dependabot[bot]
-- [3207: Update phpstan/phpstan requirement from ^1.7 to ^1.8](https://github.com/slimphp/Slim/pull/3207) thanks to @dependabot[bot]
-- [3211: Assign null coalescing to coalesce equal](https://github.com/slimphp/Slim/pull/3211) thanks to @MathiasReker
-- [3213: Void return](https://github.com/slimphp/Slim/pull/3213) thanks to @MathiasReker
-- [3214: Is null](https://github.com/slimphp/Slim/pull/3214) thanks to @MathiasReker
-- [3216: Refactor](https://github.com/slimphp/Slim/pull/3216) thanks to @mehdihasanpour
-- [3218: Refactor some code](https://github.com/slimphp/Slim/pull/3218) thanks to @mehdihasanpour
-- [3221: Cleanup](https://github.com/slimphp/Slim/pull/3221) thanks to @mehdihasanpour
-- [3225: Update laminas/laminas-diactoros requirement from ^2.11 to ^2.14](https://github.com/slimphp/Slim/pull/3225) thanks to @dependabot[bot]
-- [3228: Using assertSame to let assert equal be restricted](https://github.com/slimphp/Slim/pull/3228) thanks to @peter279k
-- [3229: Update laminas/laminas-diactoros requirement from ^2.14 to ^2.17](https://github.com/slimphp/Slim/pull/3229) thanks to @dependabot[bot]
-- [3235: Persist routes indexed by name in RouteCollector for improved performance.](https://github.com/slimphp/Slim/pull/3235) thanks to @BusterNeece
-
-# 4.10.0 - 2022-03-14
-- [3120: Add a new PSR-17 factory to Psr17FactoryProvider](https://github.com/slimphp/Slim/pull/3120) thanks to @solventt
-- [3123: Replace deprecated setMethods() in tests](https://github.com/slimphp/Slim/pull/3123) thanks to @solventt
-- [3126: Update guzzlehttp/psr7 requirement from ^2.0 to ^2.1](https://github.com/slimphp/Slim/pull/3126) thanks to @dependabot[bot]
-- [3127: PHPStan v1.0](https://github.com/slimphp/Slim/pull/3127) thanks to @t0mmy742
-- [3128: Update phpstan/phpstan requirement from ^1.0 to ^1.2](https://github.com/slimphp/Slim/pull/3128) thanks to @dependabot[bot]
-- [3129: Deprecate PHP 7.3](https://github.com/slimphp/Slim/pull/3129) thanks to @l0gicgate
-- [3130: Removed double defined PHP 7.4](https://github.com/slimphp/Slim/pull/3130) thanks to @flangofas
-- [3132: Add new `RequestResponseNamedArgs` route strategy](https://github.com/slimphp/Slim/pull/3132) thanks to @adoy
-- [3133: Improve typehinting for `RouteParserInterface`](https://github.com/slimphp/Slim/pull/3133) thanks to @jerowork
-- [3135: Update phpstan/phpstan requirement from ^1.2 to ^1.3](https://github.com/slimphp/Slim/pull/3135) thanks to @dependabot[bot]
-- [3137: Update phpspec/prophecy requirement from ^1.14 to ^1.15](https://github.com/slimphp/Slim/pull/3137) thanks to @dependabot[bot]
-- [3138: Update license year](https://github.com/slimphp/Slim/pull/3138) thanks to @Awilum
-- [3139: Fixed #1730 (reintroduced in 4.x)](https://github.com/slimphp/Slim/pull/3139) thanks to @adoy
-- [3145: Update phpstan/phpstan requirement from ^1.3 to ^1.4](https://github.com/slimphp/Slim/pull/3145) thanks to @dependabot[bot]
-- [3146: Inherit HttpException from RuntimeException](https://github.com/slimphp/Slim/pull/3146) thanks to @nbayramberdiyev
-- [3148: Upgrade to HTML5](https://github.com/slimphp/Slim/pull/3148) thanks to @nbayramberdiyev
-- [3172: Update nyholm/psr7 requirement from ^1.4 to ^1.5](https://github.com/slimphp/Slim/pull/3172) thanks to @dependabot[bot]
-
-# 4.9.0 - 2021-10-05
-- [3058: Implement exception class for Gone Http error](https://github.com/slimphp/Slim/pull/3058) thanks to @TheKernelPanic
-- [3086: Update slim/psr7 requirement from ^1.3 to ^1.4](https://github.com/slimphp/Slim/pull/3086) thanks to @dependabot[bot]
-- [3087: Update nyholm/psr7-server requirement from ^1.0.1 to ^1.0.2](https://github.com/slimphp/Slim/pull/3087) thanks to @dependabot[bot]
-- [3093: Update phpstan/phpstan requirement from ^0.12.85 to ^0.12.90](https://github.com/slimphp/Slim/pull/3093) thanks to @dependabot[bot]
-- [3099: Allow updated psr log](https://github.com/slimphp/Slim/pull/3099) thanks to @t0mmy742
-- [3104: Drop php7.2](https://github.com/slimphp/Slim/pull/3104) thanks to @t0mmy742
-- [3106: Use PSR-17 factory from Guzzle/psr7 2.0](https://github.com/slimphp/Slim/pull/3106) thanks to @t0mmy742
-- [3108: Update README file](https://github.com/slimphp/Slim/pull/3108) thanks to @t0mmy742
-- [3112: Update laminas/laminas-diactoros requirement from ^2.6 to ^2.8](https://github.com/slimphp/Slim/pull/3112) thanks to @dependabot[bot]
-- [3114: Update slim/psr7 requirement from ^1.4 to ^1.5](https://github.com/slimphp/Slim/pull/3114) thanks to @dependabot[bot]
-- [3115: Update phpstan/phpstan requirement from ^0.12.96 to ^0.12.99](https://github.com/slimphp/Slim/pull/3115) thanks to @dependabot[bot]
-- [3116: Remove Zend Diactoros references](https://github.com/slimphp/Slim/pull/3116) thanks to @l0gicgate
-
-# 4.8.0 - 2021-05-19
-- [3034: Fix phpunit dependency version](https://github.com/slimphp/Slim/pull/3034) thanks to @l0gicgate
-- [3037: Replace Travis by GitHub Actions](https://github.com/slimphp/Slim/pull/3037) thanks to @t0mmy742
-- [3043: Cover App creation from AppFactory with empty Container](https://github.com/slimphp/Slim/pull/3043) thanks to @t0mmy742
-- [3045: Update phpstan/phpstan requirement from ^0.12.58 to ^0.12.64](https://github.com/slimphp/Slim/pull/3045) thanks to @dependabot-preview[bot]
-- [3047: documentation: min php 7.2 required](https://github.com/slimphp/Slim/pull/3047) thanks to @Rotzbua
-- [3054: Update phpstan/phpstan requirement from ^0.12.64 to ^0.12.70](https://github.com/slimphp/Slim/pull/3054) thanks to @dependabot-preview[bot]
-- [3056: Fix docblock in ErrorMiddleware](https://github.com/slimphp/Slim/pull/3056) thanks to @piotr-cz
-- [3060: Update phpstan/phpstan requirement from ^0.12.70 to ^0.12.80](https://github.com/slimphp/Slim/pull/3060) thanks to @dependabot-preview[bot]
-- [3061: Update nyholm/psr7 requirement from ^1.3 to ^1.4](https://github.com/slimphp/Slim/pull/3061) thanks to @dependabot-preview[bot]
-- [3063: Allow ^1.0 || ^2.0 in psr/container](https://github.com/slimphp/Slim/pull/3063) thanks to @Ayesh
-- [3069: Classname/Method Callable Arrays](https://github.com/slimphp/Slim/pull/3069) thanks to @ddrv
-- [3078: Update squizlabs/php&#95;codesniffer requirement from ^3.5 to ^3.6](https://github.com/slimphp/Slim/pull/3078) thanks to @dependabot[bot]
-- [3079: Update phpspec/prophecy requirement from ^1.12 to ^1.13](https://github.com/slimphp/Slim/pull/3079) thanks to @dependabot[bot]
-- [3080: Update guzzlehttp/psr7 requirement from ^1.7 to ^1.8](https://github.com/slimphp/Slim/pull/3080) thanks to @dependabot[bot]
-- [3082: Update phpstan/phpstan requirement from ^0.12.80 to ^0.12.85](https://github.com/slimphp/Slim/pull/3082) thanks to @dependabot[bot]
-
-# 4.7.0 - 2020-11-30
-
-### Fixed
-- [3027: Fix: FastRoute dispatcher and data generator should match](https://github.com/slimphp/Slim/pull/3027) thanks to @edudobay
-
-### Added
-- [3015: PHP 8 support](https://github.com/slimphp/Slim/pull/3015) thanks to @edudobay
-
-### Optimizations
-- [3024: Randomize tests](https://github.com/slimphp/Slim/pull/3024) thanks to @pawel-slowik
-
-## 4.6.0 - 2020-11-15
-
-### Fixed
-- [2942: Fix PHPdoc for error handlers in ErrorMiddleware ](https://github.com/slimphp/Slim/pull/2942) thanks to @TiMESPLiNTER
-- [2944: Remove unused function in ErrorHandler](https://github.com/slimphp/Slim/pull/2944) thanks to @l0gicgate
-- [2960: Fix phpstan 0.12 errors](https://github.com/slimphp/Slim/pull/2960) thanks to @adriansuter
-- [2982: Removing cloning statements in tests](https://github.com/slimphp/Slim/pull/2982) thanks to @l0gicgate
-- [3017: Fix request creator factory test](https://github.com/slimphp/Slim/pull/3017) thanks to @pawel-slowik
-- [3022: Ensure RouteParser Always Present After Routing](https://github.com/slimphp/Slim/pull/3022) thanks to @l0gicgate
-
-### Added
-- [2949: Add the support in composer.json](https://github.com/slimphp/Slim/pull/2949) thanks to @ddrv
-- [2958: Strict empty string content type checking in BodyParsingMiddleware::getMediaType](https://github.com/slimphp/Slim/pull/2958) thanks to @Ayesh
-- [2997: Add hints to methods](https://github.com/slimphp/Slim/pull/2997) thanks to @evgsavosin - [3000: Fix route controller test](https://github.com/slimphp/Slim/pull/3000) thanks to @pawel-slowik
-- [3001: Add missing `$strategy` parameter in a Route test](https://github.com/slimphp/Slim/pull/3001) thanks to @pawel-slowik
-
-### Optimizations
-- [2951: Minor optimizations in if() blocks](https://github.com/slimphp/Slim/pull/2951) thanks to @Ayesh
-- [2959: Micro optimization: Declare closures in BodyParsingMiddleware as static](https://github.com/slimphp/Slim/pull/2959) thanks to @Ayesh
-- [2978: Split the routing results to its own function.](https://github.com/slimphp/Slim/pull/2978) thanks to @dlundgren
-
-### Dependencies Updated
-- [2953: Update nyholm/psr7-server requirement from ^0.4.1](https://github.com/slimphp/Slim/pull/2953) thanks to @dependabot-preview[bot]
-- [2954: Update laminas/laminas-diactoros requirement from ^2.1 to ^2.3](https://github.com/slimphp/Slim/pull/2954) thanks to @dependabot-preview[bot]
-- [2955: Update guzzlehttp/psr7 requirement from ^1.5 to ^1.6](https://github.com/slimphp/Slim/pull/2955) thanks to @dependabot-preview[bot]
-- [2956: Update slim/psr7 requirement from ^1.0 to ^1.1](https://github.com/slimphp/Slim/pull/2956) thanks to @dependabot-preview[bot]
-- [2957: Update nyholm/psr7 requirement from ^1.1 to ^1.2](https://github.com/slimphp/Slim/pull/2957) thanks to @dependabot-preview[bot]
-- [2963: Update phpstan/phpstan requirement from ^0.12.23 to ^0.12.25](https://github.com/slimphp/Slim/pull/2963) thanks to @dependabot-preview[bot]
-- [2965: Update adriansuter/php-autoload-override requirement from ^1.0 to ^1.1](https://github.com/slimphp/Slim/pull/2965) thanks to @dependabot-preview[bot]
-- [2967: Update nyholm/psr7 requirement from ^1.2 to ^1.3](https://github.com/slimphp/Slim/pull/2967) thanks to @dependabot-preview[bot]
-- [2969: Update nyholm/psr7-server requirement from ^0.4.1 to ^1.0.0](https://github.com/slimphp/Slim/pull/2969) thanks to @dependabot-preview[bot]
-- [2970: Update phpstan/phpstan requirement from ^0.12.25 to ^0.12.26](https://github.com/slimphp/Slim/pull/2970) thanks to @dependabot-preview[bot]
-- [2971: Update phpstan/phpstan requirement from ^0.12.26 to ^0.12.27](https://github.com/slimphp/Slim/pull/2971) thanks to @dependabot-preview[bot]
-- [2972: Update phpstan/phpstan requirement from ^0.12.27 to ^0.12.28](https://github.com/slimphp/Slim/pull/2972) thanks to @dependabot-preview[bot]
-- [2973: Update phpstan/phpstan requirement from ^0.12.28 to ^0.12.29](https://github.com/slimphp/Slim/pull/2973) thanks to @dependabot-preview[bot]
-- [2975: Update phpstan/phpstan requirement from ^0.12.29 to ^0.12.30](https://github.com/slimphp/Slim/pull/2975) thanks to @dependabot-preview[bot]
-- [2976: Update phpstan/phpstan requirement from ^0.12.30 to ^0.12.31](https://github.com/slimphp/Slim/pull/2976) thanks to @dependabot-preview[bot]
-- [2980: Update phpstan/phpstan requirement from ^0.12.31 to ^0.12.32](https://github.com/slimphp/Slim/pull/2980) thanks to @dependabot-preview[bot]
-- [2981: Update phpspec/prophecy requirement from ^1.10 to ^1.11](https://github.com/slimphp/Slim/pull/2981) thanks to @dependabot-preview[bot]
-- [2986: Update phpstan/phpstan requirement from ^0.12.32 to ^0.12.33](https://github.com/slimphp/Slim/pull/2986) thanks to @dependabot-preview[bot]
-- [2990: Update phpstan/phpstan requirement from ^0.12.33 to ^0.12.34](https://github.com/slimphp/Slim/pull/2990) thanks to @dependabot-preview[bot]
-- [2991: Update phpstan/phpstan requirement from ^0.12.34 to ^0.12.35](https://github.com/slimphp/Slim/pull/2991) thanks to @dependabot-preview[bot]
-- [2993: Update phpstan/phpstan requirement from ^0.12.35 to ^0.12.36](https://github.com/slimphp/Slim/pull/2993) thanks to @dependabot-preview[bot]
-- [2995: Update phpstan/phpstan requirement from ^0.12.36 to ^0.12.37](https://github.com/slimphp/Slim/pull/2995) thanks to @dependabot-preview[bot]
-- [3010: Update guzzlehttp/psr7 requirement from ^1.6 to ^1.7](https://github.com/slimphp/Slim/pull/3010) thanks to @dependabot-preview[bot]
-- [3011: Update phpspec/prophecy requirement from ^1.11 to ^1.12](https://github.com/slimphp/Slim/pull/3011) thanks to @dependabot-preview[bot]
-- [3012: Update slim/http requirement from ^1.0 to ^1.1](https://github.com/slimphp/Slim/pull/3012) thanks to @dependabot-preview[bot]
-- [3013: Update slim/psr7 requirement from ^1.1 to ^1.2](https://github.com/slimphp/Slim/pull/3013) thanks to @dependabot-preview[bot]
-- [3014: Update laminas/laminas-diactoros requirement from ^2.3 to ^2.4](https://github.com/slimphp/Slim/pull/3014) thanks to @dependabot-preview[bot]
-- [3018: Update phpstan/phpstan requirement from ^0.12.37 to ^0.12.54](https://github.com/slimphp/Slim/pull/3018) thanks to @dependabot-preview[bot]
-
-## 4.5.0 - 2020-04-14
-
-### Added
-- [2928](https://github.com/slimphp/Slim/pull/2928) Test against PHP 7.4
-- [2937](https://github.com/slimphp/Slim/pull/2937) Add support for PSR-3
-
-### Fixed
-- [2916](https://github.com/slimphp/Slim/pull/2916) Rename phpcs.xml to phpcs.xml.dist
-- [2917](https://github.com/slimphp/Slim/pull/2917) Update .editorconfig
-- [2925](https://github.com/slimphp/Slim/pull/2925) ResponseEmitter: Don't remove Content-Type and Content-Length when body is empt
-- [2932](https://github.com/slimphp/Slim/pull/2932) Update the Tidelift enterprise language
-- [2938](https://github.com/slimphp/Slim/pull/2938) Modify usage of deprecated expectExceptionMessageRegExp() method
-
-## 4.4.0 - 2020-01-04
-
-### Added
-- [2862](https://github.com/slimphp/Slim/pull/2862) Optionally handle subclasses of exceptions in custom error handler
-- [2869](https://github.com/slimphp/Slim/pull/2869) php-di/php-di added in composer suggestion
-- [2874](https://github.com/slimphp/Slim/pull/2874) Add `null` to param type-hints
-- [2889](https://github.com/slimphp/Slim/pull/2889) Make `RouteContext` attributes customizable and change default to use private names
-- [2907](https://github.com/slimphp/Slim/pull/2907) Migrate to PSR-12 convention
-- [2910](https://github.com/slimphp/Slim/pull/2910) Migrate Zend to Laminas
-- [2912](https://github.com/slimphp/Slim/pull/2912) Add Laminas PSR17 Factory
-- [2913](https://github.com/slimphp/Slim/pull/2913) Update php-autoload-override version
-- [2914](https://github.com/slimphp/Slim/pull/2914) Added ability to add handled exceptions as an array
-
-### Fixed
-- [2864](https://github.com/slimphp/Slim/pull/2864) Optimize error message in error handling if displayErrorDetails was not set
-- [2876](https://github.com/slimphp/Slim/pull/2876) Update links from http to https
-- [2877](https://github.com/slimphp/Slim/pull/2877) Fix docblock for `Slim\Routing\RouteCollector::cacheFile`
-- [2878](https://github.com/slimphp/Slim/pull/2878) check body is writable only on ouput buffering append
-- [2896](https://github.com/slimphp/Slim/pull/2896) Render errors uniformly
-- [2902](https://github.com/slimphp/Slim/pull/2902) Fix prophecies
-- [2908](https://github.com/slimphp/Slim/pull/2908) Use autoload-dev for `Slim\Tests` namespace
-
-### Removed
-- [2871](https://github.com/slimphp/Slim/pull/2871) Remove explicit type-hint
-- [2872](https://github.com/slimphp/Slim/pull/2872) Remove type-hint
-
-## 4.3.0 - 2019-10-05
-
-### Added
-- [2819](https://github.com/slimphp/Slim/pull/2819) Added description to addRoutingMiddleware()
-- [2820](https://github.com/slimphp/Slim/pull/2820) Update link to homepage in composer.json
-- [2828](https://github.com/slimphp/Slim/pull/2828) Allow URIs with leading multi-slashes
-- [2832](https://github.com/slimphp/Slim/pull/2832) Refactor `FastRouteDispatcher`
-- [2835](https://github.com/slimphp/Slim/pull/2835) Rename `pathFor` to `urlFor` in docblock
-- [2846](https://github.com/slimphp/Slim/pull/2846) Correcting the branch name as per issue-2843
-- [2849](https://github.com/slimphp/Slim/pull/2849) Create class alias for FastRoute\RouteCollector
-- [2855](https://github.com/slimphp/Slim/pull/2855) Add list of allowed methods to HttpMethodNotAllowedException
-- [2860](https://github.com/slimphp/Slim/pull/2860) Add base path to `$request` and use `RouteContext` to read
-
-### Fixed
-- [2839](https://github.com/slimphp/Slim/pull/2839) Fix description for handler signature in phpdocs
-- [2844](https://github.com/slimphp/Slim/pull/2844) Handle base path by routeCollector instead of RouteCollectorProxy
-- [2845](https://github.com/slimphp/Slim/pull/2845) Fix composer scripts
-- [2851](https://github.com/slimphp/Slim/pull/2851) Fix example of 'Hello World' app
-- [2854](https://github.com/slimphp/Slim/pull/2854) Fix undefined property in tests
-
-### Removed
-- [2853](https://github.com/slimphp/Slim/pull/2853) Remove unused classes
-
-## 4.2.0 - 2019-08-20
-
-### Added
-- [2787](https://github.com/slimphp/Slim/pull/2787) Add an advanced callable resolver
-- [2791](https://github.com/slimphp/Slim/pull/2791) Add `inferPrivatePropertyTypeFromConstructor` to phpstan
-- [2793](https://github.com/slimphp/Slim/pull/2793) Add ability to configure application via a container in `AppFactory`
-- [2798](https://github.com/slimphp/Slim/pull/2798) Add PSR-7 Agnostic Body Parsing Middleware
-- [2801](https://github.com/slimphp/Slim/pull/2801) Add `setLogErrorRenderer()` method to `ErrorHandler`
-- [2807](https://github.com/slimphp/Slim/pull/2807) Add check for Slim callable notation if no resolver given
-- [2803](https://github.com/slimphp/Slim/pull/2803) Add ability to emit non seekable streams in `ResponseEmitter`
-- [2817](https://github.com/slimphp/Slim/pull/2817) Add the ability to pass in a custom `MiddlewareDispatcherInterface` to the `App`
-
-### Fixed
-- [2789](https://github.com/slimphp/Slim/pull/2789) Fix Cookie header detection in `ResponseEmitter`
-- [2796](https://github.com/slimphp/Slim/pull/2796) Fix http message format
-- [2800](https://github.com/slimphp/Slim/pull/2800) Fix null comparisons more clear in `ErrorHandler`
-- [2802](https://github.com/slimphp/Slim/pull/2802) Fix incorrect search of a header in stack
-- [2806](https://github.com/slimphp/Slim/pull/2806) Simplify `Route::prepare()` method argument preparation
-- [2809](https://github.com/slimphp/Slim/pull/2809) Eliminate a duplicate code via HOF in `MiddlewareDispatcher`
-- [2816](https://github.com/slimphp/Slim/pull/2816) Fix RouteCollectorProxy::redirect() bug
-
-### Removed
-- [2811](https://github.com/slimphp/Slim/pull/2811) Remove `DeferredCallable`
-
-## 4.1.0 - 2019-08-06
-
-### Added
-- [#2779](https://github.com/slimphp/Slim/pull/2774) Add support for Slim callables `Class:method` resolution & Container Closure auto-binding in `MiddlewareDispatcher`
-- [#2774](https://github.com/slimphp/Slim/pull/2774) Add possibility for custom `RequestHandler` invocation strategies
-
-### Fixed
-- [#2776](https://github.com/slimphp/Slim/pull/2774) Fix group middleware on multiple nested groups
diff --git a/advancedcontentfilter/vendor/slim/slim/LICENSE.md b/advancedcontentfilter/vendor/slim/slim/LICENSE.md
index d6fd559c..682c21dc 100644
--- a/advancedcontentfilter/vendor/slim/slim/LICENSE.md
+++ b/advancedcontentfilter/vendor/slim/slim/LICENSE.md
@@ -1,4 +1,4 @@
-Copyright (c) 2011-2022 Josh Lockhart
+Copyright (c) 2011-2017 Josh Lockhart
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/advancedcontentfilter/vendor/slim/slim/MAINTAINERS.md b/advancedcontentfilter/vendor/slim/slim/MAINTAINERS.md
deleted file mode 100644
index 2b8ad049..00000000
--- a/advancedcontentfilter/vendor/slim/slim/MAINTAINERS.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# Maintainers
-
-There aren't many rules for maintainers of Slim to remember; what we have is listed here.
-
-## We don't merge our own PRs
-
-Our code is better if more than one set of eyes looks at it. Therefore we do not merge our own pull requests unless there is an exceptional circumstance. This helps to spot errors in the patch and also enables us to share information about the project around the maintainer team.
-
-## PRs tagged `WIP` are not ready to be merged
-
-Sometimes it's helpful to collaborate on a patch before it's ready to be merged. We use the text `WIP` (for _Work in Progress_) in the title to mark these PRs. 
-
-If a PR has `WIP` in its title, then it is not to be merged. The person who raised the PR will remove the `WIP` text when they are ready for a full review and merge.
-
-## Assign a merged PR to a milestone
-
-By ensuring that all merged PRs are assigned to a milestone, we can easily find which PRs were in which release.
diff --git a/advancedcontentfilter/vendor/slim/slim/SECURITY.md b/advancedcontentfilter/vendor/slim/slim/SECURITY.md
deleted file mode 100644
index a5b6df0b..00000000
--- a/advancedcontentfilter/vendor/slim/slim/SECURITY.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# Security Policy
-
-### Supported Versions
-
-
-| Version | Supported          |
-| ------- | ------------------ |
-| 3.x.x   | :white_check_mark: |
-| 4.x.x   | :white_check_mark: |
-
-
-### Reporting a Vulnerability
-
-To report a vulnerability please send an email to security@slimframework.com
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/App.php b/advancedcontentfilter/vendor/slim/slim/Slim/App.php
index ebcc751f..c5a0f2d3 100644
--- a/advancedcontentfilter/vendor/slim/slim/Slim/App.php
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/App.php
@@ -1,216 +1,696 @@
 <?php
-
 /**
  * Slim Framework (https://slimframework.com)
  *
- * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
+ * @link      https://github.com/slimphp/Slim
+ * @copyright Copyright (c) 2011-2017 Josh Lockhart
+ * @license   https://github.com/slimphp/Slim/blob/3.x/LICENSE.md (MIT License)
  */
-
-declare(strict_types=1);
-
 namespace Slim;
 
-use Psr\Container\ContainerInterface;
-use Psr\Http\Message\ResponseFactoryInterface;
-use Psr\Http\Message\ResponseInterface;
+use Exception;
+use Slim\Exception\InvalidMethodException;
+use Slim\Http\Response;
+use Throwable;
+use Closure;
+use InvalidArgumentException;
+use Psr\Http\Message\RequestInterface;
 use Psr\Http\Message\ServerRequestInterface;
-use Psr\Http\Server\MiddlewareInterface;
-use Psr\Http\Server\RequestHandlerInterface;
-use Psr\Log\LoggerInterface;
-use Slim\Factory\ServerRequestCreatorFactory;
-use Slim\Interfaces\CallableResolverInterface;
-use Slim\Interfaces\MiddlewareDispatcherInterface;
-use Slim\Interfaces\RouteCollectorInterface;
-use Slim\Interfaces\RouteResolverInterface;
-use Slim\Middleware\BodyParsingMiddleware;
-use Slim\Middleware\ErrorMiddleware;
-use Slim\Middleware\RoutingMiddleware;
-use Slim\Routing\RouteCollectorProxy;
-use Slim\Routing\RouteResolver;
-use Slim\Routing\RouteRunner;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Container\ContainerInterface;
+use FastRoute\Dispatcher;
+use Slim\Exception\SlimException;
+use Slim\Exception\MethodNotAllowedException;
+use Slim\Exception\NotFoundException;
+use Slim\Http\Uri;
+use Slim\Http\Headers;
+use Slim\Http\Body;
+use Slim\Http\Request;
+use Slim\Interfaces\Http\EnvironmentInterface;
+use Slim\Interfaces\RouteGroupInterface;
+use Slim\Interfaces\RouteInterface;
+use Slim\Interfaces\RouterInterface;
 
-use function strtoupper;
-
-class App extends RouteCollectorProxy implements RequestHandlerInterface
+/**
+ * App
+ *
+ * This is the primary class with which you instantiate,
+ * configure, and run a Slim Framework application.
+ * The \Slim\App class also accepts Slim Framework middleware.
+ *
+ * @property-read callable $errorHandler
+ * @property-read callable $phpErrorHandler
+ * @property-read callable $notFoundHandler function($request, $response)
+ * @property-read callable $notAllowedHandler function($request, $response, $allowedHttpMethods)
+ */
+class App
 {
+    use MiddlewareAwareTrait;
+
     /**
      * Current version
      *
      * @var string
      */
-    public const VERSION = '4.12.0';
+    const VERSION = '3.9.2';
 
-    protected RouteResolverInterface $routeResolver;
+    /**
+     * Container
+     *
+     * @var ContainerInterface
+     */
+    private $container;
 
-    protected MiddlewareDispatcherInterface $middlewareDispatcher;
+    /********************************************************************************
+     * Constructor
+     *******************************************************************************/
 
-    public function __construct(
-        ResponseFactoryInterface $responseFactory,
-        ?ContainerInterface $container = null,
-        ?CallableResolverInterface $callableResolver = null,
-        ?RouteCollectorInterface $routeCollector = null,
-        ?RouteResolverInterface $routeResolver = null,
-        ?MiddlewareDispatcherInterface $middlewareDispatcher = null
-    ) {
-        parent::__construct(
-            $responseFactory,
-            $callableResolver ?? new CallableResolver($container),
-            $container,
-            $routeCollector
-        );
+    /**
+     * Create new application
+     *
+     * @param ContainerInterface|array $container Either a ContainerInterface or an associative array of app settings
+     * @throws InvalidArgumentException when no container is provided that implements ContainerInterface
+     */
+    public function __construct($container = [])
+    {
+        if (is_array($container)) {
+            $container = new Container($container);
+        }
+        if (!$container instanceof ContainerInterface) {
+            throw new InvalidArgumentException('Expected a ContainerInterface');
+        }
+        $this->container = $container;
+    }
 
-        $this->routeResolver = $routeResolver ?? new RouteResolver($this->routeCollector);
-        $routeRunner = new RouteRunner($this->routeResolver, $this->routeCollector->getRouteParser(), $this);
+    /**
+     * Enable access to the DI container by consumers of $app
+     *
+     * @return ContainerInterface
+     */
+    public function getContainer()
+    {
+        return $this->container;
+    }
 
-        if (!$middlewareDispatcher) {
-            $middlewareDispatcher = new MiddlewareDispatcher($routeRunner, $this->callableResolver, $container);
-        } else {
-            $middlewareDispatcher->seedMiddlewareStack($routeRunner);
+    /**
+     * Add middleware
+     *
+     * This method prepends new middleware to the app's middleware stack.
+     *
+     * @param  callable|string    $callable The callback routine
+     *
+     * @return static
+     */
+    public function add($callable)
+    {
+        return $this->addMiddleware(new DeferredCallable($callable, $this->container));
+    }
+
+    /**
+     * Calling a non-existant method on App checks to see if there's an item
+     * in the container that is callable and if so, calls it.
+     *
+     * @param  string $method
+     * @param  array $args
+     * @return mixed
+     */
+    public function __call($method, $args)
+    {
+        if ($this->container->has($method)) {
+            $obj = $this->container->get($method);
+            if (is_callable($obj)) {
+                return call_user_func_array($obj, $args);
+            }
         }
 
-        $this->middlewareDispatcher = $middlewareDispatcher;
+        throw new \BadMethodCallException("Method $method is not a valid method");
     }
 
-    /**
-     * @return RouteResolverInterface
-     */
-    public function getRouteResolver(): RouteResolverInterface
-    {
-        return $this->routeResolver;
-    }
+    /********************************************************************************
+     * Router proxy methods
+     *******************************************************************************/
 
     /**
-     * @return MiddlewareDispatcherInterface
-     */
-    public function getMiddlewareDispatcher(): MiddlewareDispatcherInterface
-    {
-        return $this->middlewareDispatcher;
-    }
-
-    /**
-     * @param MiddlewareInterface|string|callable $middleware
-     */
-    public function add($middleware): self
-    {
-        $this->middlewareDispatcher->add($middleware);
-        return $this;
-    }
-
-    /**
-     * @param MiddlewareInterface $middleware
-     */
-    public function addMiddleware(MiddlewareInterface $middleware): self
-    {
-        $this->middlewareDispatcher->addMiddleware($middleware);
-        return $this;
-    }
-
-    /**
-     * Add the Slim built-in routing middleware to the app middleware stack
+     * Add GET route
      *
-     * This method can be used to control middleware order and is not required for default routing operation.
+     * @param  string $pattern  The route URI pattern
+     * @param  callable|string  $callable The route callback routine
      *
-     * @return RoutingMiddleware
+     * @return \Slim\Interfaces\RouteInterface
      */
-    public function addRoutingMiddleware(): RoutingMiddleware
+    public function get($pattern, $callable)
     {
-        $routingMiddleware = new RoutingMiddleware(
-            $this->getRouteResolver(),
-            $this->getRouteCollector()->getRouteParser()
-        );
-        $this->add($routingMiddleware);
-        return $routingMiddleware;
+        return $this->map(['GET'], $pattern, $callable);
     }
 
     /**
-     * Add the Slim built-in error middleware to the app middleware stack
+     * Add POST route
      *
-     * @param bool                 $displayErrorDetails
-     * @param bool                 $logErrors
-     * @param bool                 $logErrorDetails
-     * @param LoggerInterface|null $logger
+     * @param  string $pattern  The route URI pattern
+     * @param  callable|string  $callable The route callback routine
      *
-     * @return ErrorMiddleware
+     * @return \Slim\Interfaces\RouteInterface
      */
-    public function addErrorMiddleware(
-        bool $displayErrorDetails,
-        bool $logErrors,
-        bool $logErrorDetails,
-        ?LoggerInterface $logger = null
-    ): ErrorMiddleware {
-        $errorMiddleware = new ErrorMiddleware(
-            $this->getCallableResolver(),
-            $this->getResponseFactory(),
-            $displayErrorDetails,
-            $logErrors,
-            $logErrorDetails,
-            $logger
-        );
-        $this->add($errorMiddleware);
-        return $errorMiddleware;
+    public function post($pattern, $callable)
+    {
+        return $this->map(['POST'], $pattern, $callable);
     }
 
     /**
-     * Add the Slim body parsing middleware to the app middleware stack
+     * Add PUT route
      *
-     * @param callable[] $bodyParsers
+     * @param  string $pattern  The route URI pattern
+     * @param  callable|string  $callable The route callback routine
      *
-     * @return BodyParsingMiddleware
+     * @return \Slim\Interfaces\RouteInterface
      */
-    public function addBodyParsingMiddleware(array $bodyParsers = []): BodyParsingMiddleware
+    public function put($pattern, $callable)
     {
-        $bodyParsingMiddleware = new BodyParsingMiddleware($bodyParsers);
-        $this->add($bodyParsingMiddleware);
-        return $bodyParsingMiddleware;
+        return $this->map(['PUT'], $pattern, $callable);
     }
 
+    /**
+     * Add PATCH route
+     *
+     * @param  string $pattern  The route URI pattern
+     * @param  callable|string  $callable The route callback routine
+     *
+     * @return \Slim\Interfaces\RouteInterface
+     */
+    public function patch($pattern, $callable)
+    {
+        return $this->map(['PATCH'], $pattern, $callable);
+    }
+
+    /**
+     * Add DELETE route
+     *
+     * @param  string $pattern  The route URI pattern
+     * @param  callable|string  $callable The route callback routine
+     *
+     * @return \Slim\Interfaces\RouteInterface
+     */
+    public function delete($pattern, $callable)
+    {
+        return $this->map(['DELETE'], $pattern, $callable);
+    }
+
+    /**
+     * Add OPTIONS route
+     *
+     * @param  string $pattern  The route URI pattern
+     * @param  callable|string  $callable The route callback routine
+     *
+     * @return \Slim\Interfaces\RouteInterface
+     */
+    public function options($pattern, $callable)
+    {
+        return $this->map(['OPTIONS'], $pattern, $callable);
+    }
+
+    /**
+     * Add route for any HTTP method
+     *
+     * @param  string $pattern  The route URI pattern
+     * @param  callable|string  $callable The route callback routine
+     *
+     * @return \Slim\Interfaces\RouteInterface
+     */
+    public function any($pattern, $callable)
+    {
+        return $this->map(['GET', 'POST', 'PUT', 'PATCH', 'DELETE', 'OPTIONS'], $pattern, $callable);
+    }
+
+    /**
+     * Add route with multiple methods
+     *
+     * @param  string[] $methods  Numeric array of HTTP method names
+     * @param  string   $pattern  The route URI pattern
+     * @param  callable|string    $callable The route callback routine
+     *
+     * @return RouteInterface
+     */
+    public function map(array $methods, $pattern, $callable)
+    {
+        if ($callable instanceof Closure) {
+            $callable = $callable->bindTo($this->container);
+        }
+
+        $route = $this->container->get('router')->map($methods, $pattern, $callable);
+        if (is_callable([$route, 'setContainer'])) {
+            $route->setContainer($this->container);
+        }
+
+        if (is_callable([$route, 'setOutputBuffering'])) {
+            $route->setOutputBuffering($this->container->get('settings')['outputBuffering']);
+        }
+
+        return $route;
+    }
+
+    /**
+     * Route Groups
+     *
+     * This method accepts a route pattern and a callback. All route
+     * declarations in the callback will be prepended by the group(s)
+     * that it is in.
+     *
+     * @param string   $pattern
+     * @param callable $callable
+     *
+     * @return RouteGroupInterface
+     */
+    public function group($pattern, $callable)
+    {
+        /** @var RouteGroup $group */
+        $group = $this->container->get('router')->pushGroup($pattern, $callable);
+        $group->setContainer($this->container);
+        $group($this);
+        $this->container->get('router')->popGroup();
+        return $group;
+    }
+
+    /********************************************************************************
+     * Runner
+     *******************************************************************************/
+
     /**
      * Run application
      *
      * This method traverses the application middleware stack and then sends the
      * resultant Response object to the HTTP client.
      *
-     * @param ServerRequestInterface|null $request
-     * @return void
+     * @param bool|false $silent
+     * @return ResponseInterface
+     *
+     * @throws Exception
+     * @throws MethodNotAllowedException
+     * @throws NotFoundException
      */
-    public function run(?ServerRequestInterface $request = null): void
+    public function run($silent = false)
     {
-        if (!$request) {
-            $serverRequestCreator = ServerRequestCreatorFactory::create();
-            $request = $serverRequestCreator->createServerRequestFromGlobals();
+        $response = $this->container->get('response');
+
+        try {
+            ob_start();
+            $response = $this->process($this->container->get('request'), $response);
+        } catch (InvalidMethodException $e) {
+            $response = $this->processInvalidMethod($e->getRequest(), $response);
+        } finally {
+            $output = ob_get_clean();
         }
 
-        $response = $this->handle($request);
-        $responseEmitter = new ResponseEmitter();
-        $responseEmitter->emit($response);
+        if (!empty($output) && $response->getBody()->isWritable()) {
+            $outputBuffering = $this->container->get('settings')['outputBuffering'];
+            if ($outputBuffering === 'prepend') {
+                // prepend output buffer content
+                $body = new Http\Body(fopen('php://temp', 'r+'));
+                $body->write($output . $response->getBody());
+                $response = $response->withBody($body);
+            } elseif ($outputBuffering === 'append') {
+                // append output buffer content
+                $response->getBody()->write($output);
+            }
+        }
+
+        $response = $this->finalize($response);
+
+        if (!$silent) {
+            $this->respond($response);
+        }
+
+        return $response;
     }
 
     /**
-     * Handle a request
+     * Pull route info for a request with a bad method to decide whether to
+     * return a not-found error (default) or a bad-method error, then run
+     * the handler for that error, returning the resulting response.
+     *
+     * Used for cases where an incoming request has an unrecognized method,
+     * rather than throwing an exception and not catching it all the way up.
+     *
+     * @param ServerRequestInterface $request
+     * @param ResponseInterface $response
+     * @return ResponseInterface
+     */
+    protected function processInvalidMethod(ServerRequestInterface $request, ResponseInterface $response)
+    {
+        $router = $this->container->get('router');
+        if (is_callable([$request->getUri(), 'getBasePath']) && is_callable([$router, 'setBasePath'])) {
+            $router->setBasePath($request->getUri()->getBasePath());
+        }
+
+        $request = $this->dispatchRouterAndPrepareRoute($request, $router);
+        $routeInfo = $request->getAttribute('routeInfo', [RouterInterface::DISPATCH_STATUS => Dispatcher::NOT_FOUND]);
+
+        if ($routeInfo[RouterInterface::DISPATCH_STATUS] === Dispatcher::METHOD_NOT_ALLOWED) {
+            return $this->handleException(
+                new MethodNotAllowedException($request, $response, $routeInfo[RouterInterface::ALLOWED_METHODS]),
+                $request,
+                $response
+            );
+        }
+
+        return $this->handleException(new NotFoundException($request, $response), $request, $response);
+    }
+
+    /**
+     * Process a request
      *
      * This method traverses the application middleware stack and then returns the
      * resultant Response object.
      *
      * @param ServerRequestInterface $request
+     * @param ResponseInterface $response
      * @return ResponseInterface
+     *
+     * @throws Exception
+     * @throws MethodNotAllowedException
+     * @throws NotFoundException
      */
-    public function handle(ServerRequestInterface $request): ResponseInterface
+    public function process(ServerRequestInterface $request, ResponseInterface $response)
     {
-        $response = $this->middlewareDispatcher->handle($request);
+        // Ensure basePath is set
+        $router = $this->container->get('router');
+        if (is_callable([$request->getUri(), 'getBasePath']) && is_callable([$router, 'setBasePath'])) {
+            $router->setBasePath($request->getUri()->getBasePath());
+        }
 
-        /**
-         * This is to be in compliance with RFC 2616, Section 9.
-         * If the incoming request method is HEAD, we need to ensure that the response body
-         * is empty as the request may fall back on a GET route handler due to FastRoute's
-         * routing logic which could potentially append content to the response body
-         * https://www.w3.org/Protocols/rfc2616/rfc2616-sec9.html#sec9.4
-         */
-        $method = strtoupper($request->getMethod());
-        if ($method === 'HEAD') {
-            $emptyBody = $this->responseFactory->createResponse()->getBody();
-            return $response->withBody($emptyBody);
+        // Dispatch the Router first if the setting for this is on
+        if ($this->container->get('settings')['determineRouteBeforeAppMiddleware'] === true) {
+            // Dispatch router (note: you won't be able to alter routes after this)
+            $request = $this->dispatchRouterAndPrepareRoute($request, $router);
+        }
+
+        // Traverse middleware stack
+        try {
+            $response = $this->callMiddlewareStack($request, $response);
+        } catch (Exception $e) {
+            $response = $this->handleException($e, $request, $response);
+        } catch (Throwable $e) {
+            $response = $this->handlePhpError($e, $request, $response);
         }
 
         return $response;
     }
+
+    /**
+     * Send the response to the client
+     *
+     * @param ResponseInterface $response
+     */
+    public function respond(ResponseInterface $response)
+    {
+        // Send response
+        if (!headers_sent()) {
+            // Headers
+            foreach ($response->getHeaders() as $name => $values) {
+                foreach ($values as $value) {
+                    header(sprintf('%s: %s', $name, $value), false);
+                }
+            }
+
+            // Set the status _after_ the headers, because of PHP's "helpful" behavior with location headers.
+            // See https://github.com/slimphp/Slim/issues/1730
+
+            // Status
+            header(sprintf(
+                'HTTP/%s %s %s',
+                $response->getProtocolVersion(),
+                $response->getStatusCode(),
+                $response->getReasonPhrase()
+            ));
+        }
+
+        // Body
+        if (!$this->isEmptyResponse($response)) {
+            $body = $response->getBody();
+            if ($body->isSeekable()) {
+                $body->rewind();
+            }
+            $settings       = $this->container->get('settings');
+            $chunkSize      = $settings['responseChunkSize'];
+
+            $contentLength  = $response->getHeaderLine('Content-Length');
+            if (!$contentLength) {
+                $contentLength = $body->getSize();
+            }
+
+
+            if (isset($contentLength)) {
+                $amountToRead = $contentLength;
+                while ($amountToRead > 0 && !$body->eof()) {
+                    $data = $body->read(min($chunkSize, $amountToRead));
+                    echo $data;
+
+                    $amountToRead -= strlen($data);
+
+                    if (connection_status() != CONNECTION_NORMAL) {
+                        break;
+                    }
+                }
+            } else {
+                while (!$body->eof()) {
+                    echo $body->read($chunkSize);
+                    if (connection_status() != CONNECTION_NORMAL) {
+                        break;
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * Invoke application
+     *
+     * This method implements the middleware interface. It receives
+     * Request and Response objects, and it returns a Response object
+     * after compiling the routes registered in the Router and dispatching
+     * the Request object to the appropriate Route callback routine.
+     *
+     * @param  ServerRequestInterface $request  The most recent Request object
+     * @param  ResponseInterface      $response The most recent Response object
+     *
+     * @return ResponseInterface
+     * @throws MethodNotAllowedException
+     * @throws NotFoundException
+     */
+    public function __invoke(ServerRequestInterface $request, ResponseInterface $response)
+    {
+        // Get the route info
+        $routeInfo = $request->getAttribute('routeInfo');
+
+        /** @var \Slim\Interfaces\RouterInterface $router */
+        $router = $this->container->get('router');
+
+        // If router hasn't been dispatched or the URI changed then dispatch
+        if (null === $routeInfo || ($routeInfo['request'] !== [$request->getMethod(), (string) $request->getUri()])) {
+            $request = $this->dispatchRouterAndPrepareRoute($request, $router);
+            $routeInfo = $request->getAttribute('routeInfo');
+        }
+
+        if ($routeInfo[0] === Dispatcher::FOUND) {
+            $route = $router->lookupRoute($routeInfo[1]);
+            return $route->run($request, $response);
+        } elseif ($routeInfo[0] === Dispatcher::METHOD_NOT_ALLOWED) {
+            if (!$this->container->has('notAllowedHandler')) {
+                throw new MethodNotAllowedException($request, $response, $routeInfo[1]);
+            }
+            /** @var callable $notAllowedHandler */
+            $notAllowedHandler = $this->container->get('notAllowedHandler');
+            return $notAllowedHandler($request, $response, $routeInfo[1]);
+        }
+
+        if (!$this->container->has('notFoundHandler')) {
+            throw new NotFoundException($request, $response);
+        }
+        /** @var callable $notFoundHandler */
+        $notFoundHandler = $this->container->get('notFoundHandler');
+        return $notFoundHandler($request, $response);
+    }
+
+    /**
+     * Perform a sub-request from within an application route
+     *
+     * This method allows you to prepare and initiate a sub-request, run within
+     * the context of the current request. This WILL NOT issue a remote HTTP
+     * request. Instead, it will route the provided URL, method, headers,
+     * cookies, body, and server variables against the set of registered
+     * application routes. The result response object is returned.
+     *
+     * @param  string            $method      The request method (e.g., GET, POST, PUT, etc.)
+     * @param  string            $path        The request URI path
+     * @param  string            $query       The request URI query string
+     * @param  array             $headers     The request headers (key-value array)
+     * @param  array             $cookies     The request cookies (key-value array)
+     * @param  string            $bodyContent The request body
+     * @param  ResponseInterface $response     The response object (optional)
+     * @return ResponseInterface
+     */
+    public function subRequest(
+        $method,
+        $path,
+        $query = '',
+        array $headers = [],
+        array $cookies = [],
+        $bodyContent = '',
+        ResponseInterface $response = null
+    ) {
+        $env = $this->container->get('environment');
+        $uri = Uri::createFromEnvironment($env)->withPath($path)->withQuery($query);
+        $headers = new Headers($headers);
+        $serverParams = $env->all();
+        $body = new Body(fopen('php://temp', 'r+'));
+        $body->write($bodyContent);
+        $body->rewind();
+        $request = new Request($method, $uri, $headers, $cookies, $serverParams, $body);
+
+        if (!$response) {
+            $response = $this->container->get('response');
+        }
+
+        return $this($request, $response);
+    }
+
+    /**
+     * Dispatch the router to find the route. Prepare the route for use.
+     *
+     * @param ServerRequestInterface $request
+     * @param RouterInterface        $router
+     * @return ServerRequestInterface
+     */
+    protected function dispatchRouterAndPrepareRoute(ServerRequestInterface $request, RouterInterface $router)
+    {
+        $routeInfo = $router->dispatch($request);
+
+        if ($routeInfo[0] === Dispatcher::FOUND) {
+            $routeArguments = [];
+            foreach ($routeInfo[2] as $k => $v) {
+                $routeArguments[$k] = urldecode($v);
+            }
+
+            $route = $router->lookupRoute($routeInfo[1]);
+            $route->prepare($request, $routeArguments);
+
+            // add route to the request's attributes in case a middleware or handler needs access to the route
+            $request = $request->withAttribute('route', $route);
+        }
+
+        $routeInfo['request'] = [$request->getMethod(), (string) $request->getUri()];
+
+        return $request->withAttribute('routeInfo', $routeInfo);
+    }
+
+    /**
+     * Finalize response
+     *
+     * @param ResponseInterface $response
+     * @return ResponseInterface
+     */
+    protected function finalize(ResponseInterface $response)
+    {
+        // stop PHP sending a Content-Type automatically
+        ini_set('default_mimetype', '');
+
+        if ($this->isEmptyResponse($response)) {
+            return $response->withoutHeader('Content-Type')->withoutHeader('Content-Length');
+        }
+
+        // Add Content-Length header if `addContentLengthHeader` setting is set
+        if (isset($this->container->get('settings')['addContentLengthHeader']) &&
+            $this->container->get('settings')['addContentLengthHeader'] == true) {
+            if (ob_get_length() > 0) {
+                throw new \RuntimeException("Unexpected data in output buffer. " .
+                    "Maybe you have characters before an opening <?php tag?");
+            }
+            $size = $response->getBody()->getSize();
+            if ($size !== null && !$response->hasHeader('Content-Length')) {
+                $response = $response->withHeader('Content-Length', (string) $size);
+            }
+        }
+
+        return $response;
+    }
+
+    /**
+     * Helper method, which returns true if the provided response must not output a body and false
+     * if the response could have a body.
+     *
+     * @see https://tools.ietf.org/html/rfc7231
+     *
+     * @param ResponseInterface $response
+     * @return bool
+     */
+    protected function isEmptyResponse(ResponseInterface $response)
+    {
+        if (method_exists($response, 'isEmpty')) {
+            return $response->isEmpty();
+        }
+
+        return in_array($response->getStatusCode(), [204, 205, 304]);
+    }
+
+    /**
+     * Call relevant handler from the Container if needed. If it doesn't exist,
+     * then just re-throw.
+     *
+     * @param  Exception $e
+     * @param  ServerRequestInterface $request
+     * @param  ResponseInterface $response
+     *
+     * @return ResponseInterface
+     * @throws Exception if a handler is needed and not found
+     */
+    protected function handleException(Exception $e, ServerRequestInterface $request, ResponseInterface $response)
+    {
+        if ($e instanceof MethodNotAllowedException) {
+            $handler = 'notAllowedHandler';
+            $params = [$e->getRequest(), $e->getResponse(), $e->getAllowedMethods()];
+        } elseif ($e instanceof NotFoundException) {
+            $handler = 'notFoundHandler';
+            $params = [$e->getRequest(), $e->getResponse(), $e];
+        } elseif ($e instanceof SlimException) {
+            // This is a Stop exception and contains the response
+            return $e->getResponse();
+        } else {
+            // Other exception, use $request and $response params
+            $handler = 'errorHandler';
+            $params = [$request, $response, $e];
+        }
+
+        if ($this->container->has($handler)) {
+            $callable = $this->container->get($handler);
+            // Call the registered handler
+            return call_user_func_array($callable, $params);
+        }
+
+        // No handlers found, so just throw the exception
+        throw $e;
+    }
+
+    /**
+     * Call relevant handler from the Container if needed. If it doesn't exist,
+     * then just re-throw.
+     *
+     * @param  Throwable $e
+     * @param  ServerRequestInterface $request
+     * @param  ResponseInterface $response
+     * @return ResponseInterface
+     * @throws Throwable
+     */
+    protected function handlePhpError(Throwable $e, ServerRequestInterface $request, ResponseInterface $response)
+    {
+        $handler = 'phpErrorHandler';
+        $params = [$request, $response, $e];
+
+        if ($this->container->has($handler)) {
+            $callable = $this->container->get($handler);
+            // Call the registered handler
+            return call_user_func_array($callable, $params);
+        }
+
+        // No handlers found, so just throw the exception
+        throw $e;
+    }
 }
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/CallableResolver.php b/advancedcontentfilter/vendor/slim/slim/Slim/CallableResolver.php
index 66f225de..2211a329 100644
--- a/advancedcontentfilter/vendor/slim/slim/Slim/CallableResolver.php
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/CallableResolver.php
@@ -1,193 +1,110 @@
 <?php
-
 /**
  * Slim Framework (https://slimframework.com)
  *
- * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
+ * @link      https://github.com/slimphp/Slim
+ * @copyright Copyright (c) 2011-2017 Josh Lockhart
+ * @license   https://github.com/slimphp/Slim/blob/3.x/LICENSE.md (MIT License)
  */
-
-declare(strict_types=1);
-
 namespace Slim;
 
-use Closure;
-use Psr\Container\ContainerInterface;
-use Psr\Http\Server\MiddlewareInterface;
-use Psr\Http\Server\RequestHandlerInterface;
 use RuntimeException;
-use Slim\Interfaces\AdvancedCallableResolverInterface;
+use Psr\Container\ContainerInterface;
+use Slim\Interfaces\CallableResolverInterface;
 
-use function class_exists;
-use function is_array;
-use function is_callable;
-use function is_object;
-use function is_string;
-use function json_encode;
-use function preg_match;
-use function sprintf;
-
-final class CallableResolver implements AdvancedCallableResolverInterface
+/**
+ * This class resolves a string of the format 'class:method' into a closure
+ * that can be dispatched.
+ */
+final class CallableResolver implements CallableResolverInterface
 {
-    public static string $callablePattern = '!^([^\:]+)\:([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)$!';
+    const CALLABLE_PATTERN = '!^([^\:]+)\:([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)$!';
 
-    private ?ContainerInterface $container;
+    /**
+     * @var ContainerInterface
+     */
+    private $container;
 
-    public function __construct(?ContainerInterface $container = null)
+    /**
+     * @param ContainerInterface $container
+     */
+    public function __construct(ContainerInterface $container)
     {
         $this->container = $container;
     }
 
     /**
-     * {@inheritdoc}
+     * Resolve toResolve into a closure so that the router can dispatch.
+     *
+     * If toResolve is of the format 'class:method', then try to extract 'class'
+     * from the container otherwise instantiate it and then dispatch 'method'.
+     *
+     * @param mixed $toResolve
+     *
+     * @return callable
+     *
+     * @throws RuntimeException if the callable does not exist
+     * @throws RuntimeException if the callable is not resolvable
      */
-    public function resolve($toResolve): callable
+    public function resolve($toResolve)
     {
-        $toResolve = $this->prepareToResolve($toResolve);
         if (is_callable($toResolve)) {
-            return $this->bindToContainer($toResolve);
+            return $toResolve;
         }
-        $resolved = $toResolve;
-        if (is_string($toResolve)) {
-            $resolved = $this->resolveSlimNotation($toResolve);
-            $resolved[1] ??= '__invoke';
+
+        if (!is_string($toResolve)) {
+            $this->assertCallable($toResolve);
         }
-        $callable = $this->assertCallable($resolved, $toResolve);
-        return $this->bindToContainer($callable);
-    }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function resolveRoute($toResolve): callable
-    {
-        return $this->resolveByPredicate($toResolve, [$this, 'isRoute'], 'handle');
-    }
+        // check for slim callable as "class:method"
+        if (preg_match(self::CALLABLE_PATTERN, $toResolve, $matches)) {
+            $resolved = $this->resolveCallable($matches[1], $matches[2]);
+            $this->assertCallable($resolved);
 
-    /**
-     * {@inheritdoc}
-     */
-    public function resolveMiddleware($toResolve): callable
-    {
-        return $this->resolveByPredicate($toResolve, [$this, 'isMiddleware'], 'process');
-    }
-
-    /**
-     * @param string|callable $toResolve
-     *
-     * @throws RuntimeException
-     */
-    private function resolveByPredicate($toResolve, callable $predicate, string $defaultMethod): callable
-    {
-        $toResolve = $this->prepareToResolve($toResolve);
-        if (is_callable($toResolve)) {
-            return $this->bindToContainer($toResolve);
+            return $resolved;
         }
-        $resolved = $toResolve;
-        if ($predicate($toResolve)) {
-            $resolved = [$toResolve, $defaultMethod];
-        }
-        if (is_string($toResolve)) {
-            [$instance, $method] = $this->resolveSlimNotation($toResolve);
-            if ($method === null && $predicate($instance)) {
-                $method = $defaultMethod;
-            }
-            $resolved = [$instance, $method ?? '__invoke'];
-        }
-        $callable = $this->assertCallable($resolved, $toResolve);
-        return $this->bindToContainer($callable);
-    }
 
-    /**
-     * @param mixed $toResolve
-     */
-    private function isRoute($toResolve): bool
-    {
-        return $toResolve instanceof RequestHandlerInterface;
-    }
+        $resolved = $this->resolveCallable($toResolve);
+        $this->assertCallable($resolved);
 
-    /**
-     * @param mixed $toResolve
-     */
-    private function isMiddleware($toResolve): bool
-    {
-        return $toResolve instanceof MiddlewareInterface;
-    }
-
-    /**
-     * @throws RuntimeException
-     *
-     * @return array{object, string|null} [Instance, Method Name]
-     */
-    private function resolveSlimNotation(string $toResolve): array
-    {
-        preg_match(CallableResolver::$callablePattern, $toResolve, $matches);
-        [$class, $method] = $matches ? [$matches[1], $matches[2]] : [$toResolve, null];
-
-        /** @var string $class */
-        /** @var string|null $method */
-        if ($this->container && $this->container->has($class)) {
-            $instance = $this->container->get($class);
-            if (!is_object($instance)) {
-                throw new RuntimeException(sprintf('%s container entry is not an object', $class));
-            }
-        } else {
-            if (!class_exists($class)) {
-                if ($method) {
-                    $class .= '::' . $method . '()';
-                }
-                throw new RuntimeException(sprintf('Callable %s does not exist', $class));
-            }
-            $instance = new $class($this->container);
-        }
-        return [$instance, $method];
-    }
-
-    /**
-     * @param mixed $resolved
-     * @param mixed $toResolve
-     *
-     * @throws RuntimeException
-     */
-    private function assertCallable($resolved, $toResolve): callable
-    {
-        if (!is_callable($resolved)) {
-            if (is_callable($toResolve) || is_object($toResolve) || is_array($toResolve)) {
-                $formatedToResolve = ($toResolveJson = json_encode($toResolve)) !== false ? $toResolveJson : '';
-            } else {
-                $formatedToResolve = is_string($toResolve) ? $toResolve : '';
-            }
-            throw new RuntimeException(sprintf('%s is not resolvable', $formatedToResolve));
-        }
         return $resolved;
     }
 
-    private function bindToContainer(callable $callable): callable
+    /**
+     * Check if string is something in the DIC
+     * that's callable or is a class name which has an __invoke() method.
+     *
+     * @param string $class
+     * @param string $method
+     * @return callable
+     *
+     * @throws \RuntimeException if the callable does not exist
+     */
+    protected function resolveCallable($class, $method = '__invoke')
     {
-        if (is_array($callable) && $callable[0] instanceof Closure) {
-            $callable = $callable[0];
+        if ($this->container->has($class)) {
+            return [$this->container->get($class), $method];
         }
-        if ($this->container && $callable instanceof Closure) {
-            /** @var Closure $callable */
-            $callable = $callable->bindTo($this->container);
+
+        if (!class_exists($class)) {
+            throw new RuntimeException(sprintf('Callable %s does not exist', $class));
         }
-        return $callable;
+
+        return [new $class($this->container), $method];
     }
 
     /**
-     * @param string|callable $toResolve
-     * @return string|callable
+     * @param Callable $callable
+     *
+     * @throws \RuntimeException if the callable is not resolvable
      */
-    private function prepareToResolve($toResolve)
+    protected function assertCallable($callable)
     {
-        if (!is_array($toResolve)) {
-            return $toResolve;
+        if (!is_callable($callable)) {
+            throw new RuntimeException(sprintf(
+                '%s is not resolvable',
+                is_array($callable) || is_object($callable) ? json_encode($callable) : $callable
+            ));
         }
-        $candidate = $toResolve;
-        $class = array_shift($candidate);
-        $method = array_shift($candidate);
-        if (is_string($class) && is_string($method)) {
-            return $class . ':' . $method;
-        }
-        return $toResolve;
     }
 }
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/CallableResolverAwareTrait.php b/advancedcontentfilter/vendor/slim/slim/Slim/CallableResolverAwareTrait.php
new file mode 100644
index 00000000..ffb4eb28
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/CallableResolverAwareTrait.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * Slim Framework (https://slimframework.com)
+ *
+ * @link      https://github.com/slimphp/Slim
+ * @copyright Copyright (c) 2011-2017 Josh Lockhart
+ * @license   https://github.com/slimphp/Slim/blob/3.x/LICENSE.md (MIT License)
+ */
+namespace Slim;
+
+use RuntimeException;
+use Psr\Container\ContainerInterface;
+use Slim\Interfaces\CallableResolverInterface;
+
+/**
+ * ResolveCallable
+ *
+ * This is an internal class that enables resolution of 'class:method' strings
+ * into a closure. This class is an implementation detail and is used only inside
+ * of the Slim application.
+ *
+ * @property ContainerInterface $container
+ */
+trait CallableResolverAwareTrait
+{
+    /**
+     * Resolve a string of the format 'class:method' into a closure that the
+     * router can dispatch.
+     *
+     * @param callable|string $callable
+     *
+     * @return \Closure
+     *
+     * @throws RuntimeException If the string cannot be resolved as a callable
+     */
+    protected function resolveCallable($callable)
+    {
+        if (!$this->container instanceof ContainerInterface) {
+            return $callable;
+        }
+
+        /** @var CallableResolverInterface $resolver */
+        $resolver = $this->container->get('callableResolver');
+
+        return $resolver->resolve($callable);
+    }
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Collection.php b/advancedcontentfilter/vendor/slim/slim/Slim/Collection.php
new file mode 100644
index 00000000..728bb73e
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Collection.php
@@ -0,0 +1,202 @@
+<?php
+/**
+ * Slim Framework (https://slimframework.com)
+ *
+ * @link      https://github.com/slimphp/Slim
+ * @copyright Copyright (c) 2011-2017 Josh Lockhart
+ * @license   https://github.com/slimphp/Slim/blob/3.x/LICENSE.md (MIT License)
+ */
+namespace Slim;
+
+use ArrayIterator;
+use Slim\Interfaces\CollectionInterface;
+
+/**
+ * Collection
+ *
+ * This class provides a common interface used by many other
+ * classes in a Slim application that manage "collections"
+ * of data that must be inspected and/or manipulated
+ */
+class Collection implements CollectionInterface
+{
+    /**
+     * The source data
+     *
+     * @var array
+     */
+    protected $data = [];
+
+    /**
+     * Create new collection
+     *
+     * @param array $items Pre-populate collection with this key-value array
+     */
+    public function __construct(array $items = [])
+    {
+        $this->replace($items);
+    }
+
+    /********************************************************************************
+     * Collection interface
+     *******************************************************************************/
+
+    /**
+     * Set collection item
+     *
+     * @param string $key   The data key
+     * @param mixed  $value The data value
+     */
+    public function set($key, $value)
+    {
+        $this->data[$key] = $value;
+    }
+
+    /**
+     * Get collection item for key
+     *
+     * @param string $key     The data key
+     * @param mixed  $default The default value to return if data key does not exist
+     *
+     * @return mixed The key's value, or the default value
+     */
+    public function get($key, $default = null)
+    {
+        return $this->has($key) ? $this->data[$key] : $default;
+    }
+
+    /**
+     * Add item to collection, replacing existing items with the same data key
+     *
+     * @param array $items Key-value array of data to append to this collection
+     */
+    public function replace(array $items)
+    {
+        foreach ($items as $key => $value) {
+            $this->set($key, $value);
+        }
+    }
+
+    /**
+     * Get all items in collection
+     *
+     * @return array The collection's source data
+     */
+    public function all()
+    {
+        return $this->data;
+    }
+
+    /**
+     * Get collection keys
+     *
+     * @return array The collection's source data keys
+     */
+    public function keys()
+    {
+        return array_keys($this->data);
+    }
+
+    /**
+     * Does this collection have a given key?
+     *
+     * @param string $key The data key
+     *
+     * @return bool
+     */
+    public function has($key)
+    {
+        return array_key_exists($key, $this->data);
+    }
+
+    /**
+     * Remove item from collection
+     *
+     * @param string $key The data key
+     */
+    public function remove($key)
+    {
+        unset($this->data[$key]);
+    }
+
+    /**
+     * Remove all items from collection
+     */
+    public function clear()
+    {
+        $this->data = [];
+    }
+
+    /********************************************************************************
+     * ArrayAccess interface
+     *******************************************************************************/
+
+    /**
+     * Does this collection have a given key?
+     *
+     * @param  string $key The data key
+     *
+     * @return bool
+     */
+    public function offsetExists($key)
+    {
+        return $this->has($key);
+    }
+
+    /**
+     * Get collection item for key
+     *
+     * @param string $key The data key
+     *
+     * @return mixed The key's value, or the default value
+     */
+    public function offsetGet($key)
+    {
+        return $this->get($key);
+    }
+
+    /**
+     * Set collection item
+     *
+     * @param string $key   The data key
+     * @param mixed  $value The data value
+     */
+    public function offsetSet($key, $value)
+    {
+        $this->set($key, $value);
+    }
+
+    /**
+     * Remove item from collection
+     *
+     * @param string $key The data key
+     */
+    public function offsetUnset($key)
+    {
+        $this->remove($key);
+    }
+
+    /**
+     * Get number of items in collection
+     *
+     * @return int
+     */
+    public function count()
+    {
+        return count($this->data);
+    }
+
+    /********************************************************************************
+     * IteratorAggregate interface
+     *******************************************************************************/
+
+    /**
+     * Get collection iterator
+     *
+     * @return \ArrayIterator
+     */
+    public function getIterator()
+    {
+        return new ArrayIterator($this->data);
+    }
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Container.php b/advancedcontentfilter/vendor/slim/slim/Slim/Container.php
new file mode 100644
index 00000000..1f713ac4
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Container.php
@@ -0,0 +1,179 @@
+<?php
+/**
+ * Slim Framework (https://slimframework.com)
+ *
+ * @link      https://github.com/slimphp/Slim
+ * @copyright Copyright (c) 2011-2017 Josh Lockhart
+ * @license   https://github.com/slimphp/Slim/blob/3.x/LICENSE.md (MIT License)
+ */
+namespace Slim;
+
+use Interop\Container\ContainerInterface;
+use Interop\Container\Exception\ContainerException;
+use Pimple\Container as PimpleContainer;
+use Slim\Exception\ContainerValueNotFoundException;
+use Slim\Exception\ContainerException as SlimContainerException;
+
+/**
+ * Slim's default DI container is Pimple.
+ *
+ * Slim\App expects a container that implements Psr\Container\ContainerInterface
+ * with these service keys configured and ready for use:
+ *
+ *  - settings: an array or instance of \ArrayAccess
+ *  - environment: an instance of \Slim\Interfaces\Http\EnvironmentInterface
+ *  - request: an instance of \Psr\Http\Message\ServerRequestInterface
+ *  - response: an instance of \Psr\Http\Message\ResponseInterface
+ *  - router: an instance of \Slim\Interfaces\RouterInterface
+ *  - foundHandler: an instance of \Slim\Interfaces\InvocationStrategyInterface
+ *  - errorHandler: a callable with the signature: function($request, $response, $exception)
+ *  - notFoundHandler: a callable with the signature: function($request, $response)
+ *  - notAllowedHandler: a callable with the signature: function($request, $response, $allowedHttpMethods)
+ *  - callableResolver: an instance of \Slim\Interfaces\CallableResolverInterface
+ *
+ * @property-read array settings
+ * @property-read \Slim\Interfaces\Http\EnvironmentInterface environment
+ * @property-read \Psr\Http\Message\ServerRequestInterface request
+ * @property-read \Psr\Http\Message\ResponseInterface response
+ * @property-read \Slim\Interfaces\RouterInterface router
+ * @property-read \Slim\Interfaces\InvocationStrategyInterface foundHandler
+ * @property-read callable errorHandler
+ * @property-read callable notFoundHandler
+ * @property-read callable notAllowedHandler
+ * @property-read \Slim\Interfaces\CallableResolverInterface callableResolver
+ */
+class Container extends PimpleContainer implements ContainerInterface
+{
+    /**
+     * Default settings
+     *
+     * @var array
+     */
+    private $defaultSettings = [
+        'httpVersion' => '1.1',
+        'responseChunkSize' => 4096,
+        'outputBuffering' => 'append',
+        'determineRouteBeforeAppMiddleware' => false,
+        'displayErrorDetails' => false,
+        'addContentLengthHeader' => true,
+        'routerCacheFile' => false,
+    ];
+
+    /**
+     * Create new container
+     *
+     * @param array $values The parameters or objects.
+     */
+    public function __construct(array $values = [])
+    {
+        parent::__construct($values);
+
+        $userSettings = isset($values['settings']) ? $values['settings'] : [];
+        $this->registerDefaultServices($userSettings);
+    }
+
+    /**
+     * This function registers the default services that Slim needs to work.
+     *
+     * All services are shared - that is, they are registered such that the
+     * same instance is returned on subsequent calls.
+     *
+     * @param array $userSettings Associative array of application settings
+     *
+     * @return void
+     */
+    private function registerDefaultServices($userSettings)
+    {
+        $defaultSettings = $this->defaultSettings;
+
+        /**
+         * This service MUST return an array or an
+         * instance of \ArrayAccess.
+         *
+         * @return array|\ArrayAccess
+         */
+        $this['settings'] = function () use ($userSettings, $defaultSettings) {
+            return new Collection(array_merge($defaultSettings, $userSettings));
+        };
+
+        $defaultProvider = new DefaultServicesProvider();
+        $defaultProvider->register($this);
+    }
+
+    /********************************************************************************
+     * Methods to satisfy Psr\Container\ContainerInterface
+     *******************************************************************************/
+
+    /**
+     * Finds an entry of the container by its identifier and returns it.
+     *
+     * @param string $id Identifier of the entry to look for.
+     *
+     * @throws ContainerValueNotFoundException  No entry was found for this identifier.
+     * @throws ContainerException               Error while retrieving the entry.
+     *
+     * @return mixed Entry.
+     */
+    public function get($id)
+    {
+        if (!$this->offsetExists($id)) {
+            throw new ContainerValueNotFoundException(sprintf('Identifier "%s" is not defined.', $id));
+        }
+        try {
+            return $this->offsetGet($id);
+        } catch (\InvalidArgumentException $exception) {
+            if ($this->exceptionThrownByContainer($exception)) {
+                throw new SlimContainerException(
+                    sprintf('Container error while retrieving "%s"', $id),
+                    null,
+                    $exception
+                );
+            } else {
+                throw $exception;
+            }
+        }
+    }
+
+    /**
+     * Tests whether an exception needs to be recast for compliance with Container-Interop.  This will be if the
+     * exception was thrown by Pimple.
+     *
+     * @param \InvalidArgumentException $exception
+     *
+     * @return bool
+     */
+    private function exceptionThrownByContainer(\InvalidArgumentException $exception)
+    {
+        $trace = $exception->getTrace()[0];
+
+        return $trace['class'] === PimpleContainer::class && $trace['function'] === 'offsetGet';
+    }
+
+    /**
+     * Returns true if the container can return an entry for the given identifier.
+     * Returns false otherwise.
+     *
+     * @param string $id Identifier of the entry to look for.
+     *
+     * @return boolean
+     */
+    public function has($id)
+    {
+        return $this->offsetExists($id);
+    }
+
+
+    /********************************************************************************
+     * Magic methods for convenience
+     *******************************************************************************/
+
+    public function __get($name)
+    {
+        return $this->get($name);
+    }
+
+    public function __isset($name)
+    {
+        return $this->has($name);
+    }
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/DefaultServicesProvider.php b/advancedcontentfilter/vendor/slim/slim/Slim/DefaultServicesProvider.php
new file mode 100644
index 00000000..13fe1fb3
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/DefaultServicesProvider.php
@@ -0,0 +1,211 @@
+<?php
+/**
+ * Slim Framework (https://slimframework.com)
+ *
+ * @link      https://github.com/slimphp/Slim
+ * @copyright Copyright (c) 2011-2017 Josh Lockhart
+ * @license   https://github.com/slimphp/Slim/blob/3.x/LICENSE.md (MIT License)
+ */
+namespace Slim;
+
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Slim\Handlers\PhpError;
+use Slim\Handlers\Error;
+use Slim\Handlers\NotFound;
+use Slim\Handlers\NotAllowed;
+use Slim\Handlers\Strategies\RequestResponse;
+use Slim\Http\Environment;
+use Slim\Http\Headers;
+use Slim\Http\Request;
+use Slim\Http\Response;
+use Slim\Interfaces\CallableResolverInterface;
+use Slim\Interfaces\Http\EnvironmentInterface;
+use Slim\Interfaces\InvocationStrategyInterface;
+use Slim\Interfaces\RouterInterface;
+
+/**
+ * Slim's default Service Provider.
+ */
+class DefaultServicesProvider
+{
+    /**
+     * Register Slim's default services.
+     *
+     * @param Container $container A DI container implementing ArrayAccess and container-interop.
+     */
+    public function register($container)
+    {
+        if (!isset($container['environment'])) {
+            /**
+             * This service MUST return a shared instance
+             * of \Slim\Interfaces\Http\EnvironmentInterface.
+             *
+             * @return EnvironmentInterface
+             */
+            $container['environment'] = function () {
+                return new Environment($_SERVER);
+            };
+        }
+
+        if (!isset($container['request'])) {
+            /**
+             * PSR-7 Request object
+             *
+             * @param Container $container
+             *
+             * @return ServerRequestInterface
+             */
+            $container['request'] = function ($container) {
+                return Request::createFromEnvironment($container->get('environment'));
+            };
+        }
+
+        if (!isset($container['response'])) {
+            /**
+             * PSR-7 Response object
+             *
+             * @param Container $container
+             *
+             * @return ResponseInterface
+             */
+            $container['response'] = function ($container) {
+                $headers = new Headers(['Content-Type' => 'text/html; charset=UTF-8']);
+                $response = new Response(200, $headers);
+
+                return $response->withProtocolVersion($container->get('settings')['httpVersion']);
+            };
+        }
+
+        if (!isset($container['router'])) {
+            /**
+             * This service MUST return a SHARED instance
+             * of \Slim\Interfaces\RouterInterface.
+             *
+             * @param Container $container
+             *
+             * @return RouterInterface
+             */
+            $container['router'] = function ($container) {
+                $routerCacheFile = false;
+                if (isset($container->get('settings')['routerCacheFile'])) {
+                    $routerCacheFile = $container->get('settings')['routerCacheFile'];
+                }
+
+
+                $router = (new Router)->setCacheFile($routerCacheFile);
+                if (method_exists($router, 'setContainer')) {
+                    $router->setContainer($container);
+                }
+
+                return $router;
+            };
+        }
+
+        if (!isset($container['foundHandler'])) {
+            /**
+             * This service MUST return a SHARED instance
+             * of \Slim\Interfaces\InvocationStrategyInterface.
+             *
+             * @return InvocationStrategyInterface
+             */
+            $container['foundHandler'] = function () {
+                return new RequestResponse;
+            };
+        }
+
+        if (!isset($container['phpErrorHandler'])) {
+            /**
+             * This service MUST return a callable
+             * that accepts three arguments:
+             *
+             * 1. Instance of \Psr\Http\Message\ServerRequestInterface
+             * 2. Instance of \Psr\Http\Message\ResponseInterface
+             * 3. Instance of \Error
+             *
+             * The callable MUST return an instance of
+             * \Psr\Http\Message\ResponseInterface.
+             *
+             * @param Container $container
+             *
+             * @return callable
+             */
+            $container['phpErrorHandler'] = function ($container) {
+                return new PhpError($container->get('settings')['displayErrorDetails']);
+            };
+        }
+
+        if (!isset($container['errorHandler'])) {
+            /**
+             * This service MUST return a callable
+             * that accepts three arguments:
+             *
+             * 1. Instance of \Psr\Http\Message\ServerRequestInterface
+             * 2. Instance of \Psr\Http\Message\ResponseInterface
+             * 3. Instance of \Exception
+             *
+             * The callable MUST return an instance of
+             * \Psr\Http\Message\ResponseInterface.
+             *
+             * @param Container $container
+             *
+             * @return callable
+             */
+            $container['errorHandler'] = function ($container) {
+                return new Error(
+                    $container->get('settings')['displayErrorDetails']
+                );
+            };
+        }
+
+        if (!isset($container['notFoundHandler'])) {
+            /**
+             * This service MUST return a callable
+             * that accepts two arguments:
+             *
+             * 1. Instance of \Psr\Http\Message\ServerRequestInterface
+             * 2. Instance of \Psr\Http\Message\ResponseInterface
+             *
+             * The callable MUST return an instance of
+             * \Psr\Http\Message\ResponseInterface.
+             *
+             * @return callable
+             */
+            $container['notFoundHandler'] = function () {
+                return new NotFound;
+            };
+        }
+
+        if (!isset($container['notAllowedHandler'])) {
+            /**
+             * This service MUST return a callable
+             * that accepts three arguments:
+             *
+             * 1. Instance of \Psr\Http\Message\ServerRequestInterface
+             * 2. Instance of \Psr\Http\Message\ResponseInterface
+             * 3. Array of allowed HTTP methods
+             *
+             * The callable MUST return an instance of
+             * \Psr\Http\Message\ResponseInterface.
+             *
+             * @return callable
+             */
+            $container['notAllowedHandler'] = function () {
+                return new NotAllowed;
+            };
+        }
+
+        if (!isset($container['callableResolver'])) {
+            /**
+             * Instance of \Slim\Interfaces\CallableResolverInterface
+             *
+             * @param Container $container
+             *
+             * @return CallableResolverInterface
+             */
+            $container['callableResolver'] = function ($container) {
+                return new CallableResolver($container);
+            };
+        }
+    }
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/DeferredCallable.php b/advancedcontentfilter/vendor/slim/slim/Slim/DeferredCallable.php
new file mode 100644
index 00000000..22887c0f
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/DeferredCallable.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Slim Framework (https://slimframework.com)
+ *
+ * @link      https://github.com/slimphp/Slim
+ * @copyright Copyright (c) 2011-2017 Josh Lockhart
+ * @license   https://github.com/slimphp/Slim/blob/3.x/LICENSE.md (MIT License)
+ */
+
+namespace Slim;
+
+use Closure;
+use Psr\Container\ContainerInterface;
+
+class DeferredCallable
+{
+    use CallableResolverAwareTrait;
+
+    private $callable;
+    /** @var  ContainerInterface */
+    private $container;
+
+    /**
+     * DeferredMiddleware constructor.
+     * @param callable|string $callable
+     * @param ContainerInterface $container
+     */
+    public function __construct($callable, ContainerInterface $container = null)
+    {
+        $this->callable = $callable;
+        $this->container = $container;
+    }
+
+    public function __invoke()
+    {
+        $callable = $this->resolveCallable($this->callable);
+        if ($callable instanceof Closure) {
+            $callable = $callable->bindTo($this->container);
+        }
+
+        $args = func_get_args();
+
+        return call_user_func_array($callable, $args);
+    }
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Error/AbstractErrorRenderer.php b/advancedcontentfilter/vendor/slim/slim/Slim/Error/AbstractErrorRenderer.php
deleted file mode 100644
index 90b290d4..00000000
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Error/AbstractErrorRenderer.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-/**
- * Slim Framework (https://slimframework.com)
- *
- * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
- */
-
-declare(strict_types=1);
-
-namespace Slim\Error;
-
-use Slim\Exception\HttpException;
-use Slim\Interfaces\ErrorRendererInterface;
-use Throwable;
-
-/**
- * Abstract Slim application error renderer
- *
- * It outputs the error message and diagnostic information in one of the following formats:
- * JSON, XML, Plain Text or HTML
- */
-abstract class AbstractErrorRenderer implements ErrorRendererInterface
-{
-    protected string $defaultErrorTitle = 'Slim Application Error';
-
-    protected string $defaultErrorDescription = 'A website error has occurred. Sorry for the temporary inconvenience.';
-
-    protected function getErrorTitle(Throwable $exception): string
-    {
-        if ($exception instanceof HttpException) {
-            return $exception->getTitle();
-        }
-
-        return $this->defaultErrorTitle;
-    }
-
-    protected function getErrorDescription(Throwable $exception): string
-    {
-        if ($exception instanceof HttpException) {
-            return $exception->getDescription();
-        }
-
-        return $this->defaultErrorDescription;
-    }
-}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Error/Renderers/HtmlErrorRenderer.php b/advancedcontentfilter/vendor/slim/slim/Slim/Error/Renderers/HtmlErrorRenderer.php
deleted file mode 100644
index e030522a..00000000
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Error/Renderers/HtmlErrorRenderer.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-
-/**
- * Slim Framework (https://slimframework.com)
- *
- * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
- */
-
-declare(strict_types=1);
-
-namespace Slim\Error\Renderers;
-
-use Slim\Error\AbstractErrorRenderer;
-use Throwable;
-
-use function get_class;
-use function htmlentities;
-use function sprintf;
-
-/**
- * Default Slim application HTML Error Renderer
- */
-class HtmlErrorRenderer extends AbstractErrorRenderer
-{
-    public function __invoke(Throwable $exception, bool $displayErrorDetails): string
-    {
-        if ($displayErrorDetails) {
-            $html = '<p>The application could not run because of the following error:</p>';
-            $html .= '<h2>Details</h2>';
-            $html .= $this->renderExceptionFragment($exception);
-        } else {
-            $html = "<p>{$this->getErrorDescription($exception)}</p>";
-        }
-
-        return $this->renderHtmlBody($this->getErrorTitle($exception), $html);
-    }
-
-    private function renderExceptionFragment(Throwable $exception): string
-    {
-        $html = sprintf('<div><strong>Type:</strong> %s</div>', get_class($exception));
-
-        /** @var int|string $code */
-        $code = $exception->getCode();
-        $html .= sprintf('<div><strong>Code:</strong> %s</div>', $code);
-
-        $html .= sprintf('<div><strong>Message:</strong> %s</div>', htmlentities($exception->getMessage()));
-
-        $html .= sprintf('<div><strong>File:</strong> %s</div>', $exception->getFile());
-
-        $html .= sprintf('<div><strong>Line:</strong> %s</div>', $exception->getLine());
-
-        $html .= '<h2>Trace</h2>';
-        $html .= sprintf('<pre>%s</pre>', htmlentities($exception->getTraceAsString()));
-
-        return $html;
-    }
-
-    public function renderHtmlBody(string $title = '', string $html = ''): string
-    {
-        return sprintf(
-            '<!doctype html>' .
-            '<html lang="en">' .
-            '    <head>' .
-            '        <meta charset="utf-8">' .
-            '        <meta name="viewport" content="width=device-width, initial-scale=1">' .
-            '        <title>%s</title>' .
-            '        <style>' .
-            '            body{margin:0;padding:30px;font:12px/1.5 Helvetica,Arial,Verdana,sans-serif}' .
-            '            h1{margin:0;font-size:48px;font-weight:normal;line-height:48px}' .
-            '            strong{display:inline-block;width:65px}' .
-            '        </style>' .
-            '    </head>' .
-            '    <body>' .
-            '        <h1>%s</h1>' .
-            '        <div>%s</div>' .
-            '        <a href="#" onclick="window.history.go(-1)">Go Back</a>' .
-            '    </body>' .
-            '</html>',
-            $title,
-            $title,
-            $html
-        );
-    }
-}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Error/Renderers/JsonErrorRenderer.php b/advancedcontentfilter/vendor/slim/slim/Slim/Error/Renderers/JsonErrorRenderer.php
deleted file mode 100644
index 63d905b3..00000000
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Error/Renderers/JsonErrorRenderer.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-
-/**
- * Slim Framework (https://slimframework.com)
- *
- * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
- */
-
-declare(strict_types=1);
-
-namespace Slim\Error\Renderers;
-
-use Slim\Error\AbstractErrorRenderer;
-use Throwable;
-
-use function get_class;
-use function json_encode;
-
-use const JSON_PRETTY_PRINT;
-use const JSON_UNESCAPED_SLASHES;
-
-/**
- * Default Slim application JSON Error Renderer
- */
-class JsonErrorRenderer extends AbstractErrorRenderer
-{
-    public function __invoke(Throwable $exception, bool $displayErrorDetails): string
-    {
-        $error = ['message' => $this->getErrorTitle($exception)];
-
-        if ($displayErrorDetails) {
-            $error['exception'] = [];
-            do {
-                $error['exception'][] = $this->formatExceptionFragment($exception);
-            } while ($exception = $exception->getPrevious());
-        }
-
-        return (string) json_encode($error, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES);
-    }
-
-    /**
-     * @return array<string|int>
-     */
-    private function formatExceptionFragment(Throwable $exception): array
-    {
-        /** @var int|string $code */
-        $code = $exception->getCode();
-        return [
-            'type' => get_class($exception),
-            'code' => $code,
-            'message' => $exception->getMessage(),
-            'file' => $exception->getFile(),
-            'line' => $exception->getLine(),
-        ];
-    }
-}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Error/Renderers/PlainTextErrorRenderer.php b/advancedcontentfilter/vendor/slim/slim/Slim/Error/Renderers/PlainTextErrorRenderer.php
deleted file mode 100644
index 3d80c74b..00000000
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Error/Renderers/PlainTextErrorRenderer.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-
-/**
- * Slim Framework (https://slimframework.com)
- *
- * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
- */
-
-declare(strict_types=1);
-
-namespace Slim\Error\Renderers;
-
-use Slim\Error\AbstractErrorRenderer;
-use Throwable;
-
-use function get_class;
-use function htmlentities;
-use function sprintf;
-
-/**
- * Default Slim application Plain Text Error Renderer
- */
-class PlainTextErrorRenderer extends AbstractErrorRenderer
-{
-    public function __invoke(Throwable $exception, bool $displayErrorDetails): string
-    {
-        $text = "{$this->getErrorTitle($exception)}\n";
-
-        if ($displayErrorDetails) {
-            $text .= $this->formatExceptionFragment($exception);
-
-            while ($exception = $exception->getPrevious()) {
-                $text .= "\nPrevious Error:\n";
-                $text .= $this->formatExceptionFragment($exception);
-            }
-        }
-
-        return $text;
-    }
-
-    private function formatExceptionFragment(Throwable $exception): string
-    {
-        $text = sprintf("Type: %s\n", get_class($exception));
-
-        $code = $exception->getCode();
-        /** @var int|string $code */
-        $text .= sprintf("Code: %s\n", $code);
-
-        $text .= sprintf("Message: %s\n", htmlentities($exception->getMessage()));
-
-        $text .= sprintf("File: %s\n", $exception->getFile());
-
-        $text .= sprintf("Line: %s\n", $exception->getLine());
-
-        $text .= sprintf('Trace: %s', $exception->getTraceAsString());
-
-        return $text;
-    }
-}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Error/Renderers/XmlErrorRenderer.php b/advancedcontentfilter/vendor/slim/slim/Slim/Error/Renderers/XmlErrorRenderer.php
deleted file mode 100644
index 1171b79b..00000000
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Error/Renderers/XmlErrorRenderer.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-
-/**
- * Slim Framework (https://slimframework.com)
- *
- * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
- */
-
-declare(strict_types=1);
-
-namespace Slim\Error\Renderers;
-
-use Slim\Error\AbstractErrorRenderer;
-use Throwable;
-
-use function get_class;
-use function sprintf;
-use function str_replace;
-
-/**
- * Default Slim application XML Error Renderer
- */
-class XmlErrorRenderer extends AbstractErrorRenderer
-{
-    public function __invoke(Throwable $exception, bool $displayErrorDetails): string
-    {
-        $xml = '<' . '?xml version="1.0" encoding="UTF-8" standalone="yes"?' . ">\n";
-        $xml .= "<error>\n  <message>" . $this->createCdataSection($this->getErrorTitle($exception)) . "</message>\n";
-
-        if ($displayErrorDetails) {
-            do {
-                $xml .= "  <exception>\n";
-                $xml .= '    <type>' . get_class($exception) . "</type>\n";
-                $xml .= '    <code>' . $exception->getCode() . "</code>\n";
-                $xml .= '    <message>' . $this->createCdataSection($exception->getMessage()) . "</message>\n";
-                $xml .= '    <file>' . $exception->getFile() . "</file>\n";
-                $xml .= '    <line>' . $exception->getLine() . "</line>\n";
-                $xml .= "  </exception>\n";
-            } while ($exception = $exception->getPrevious());
-        }
-
-        $xml .= '</error>';
-
-        return $xml;
-    }
-
-    /**
-     * Returns a CDATA section with the given content.
-     */
-    private function createCdataSection(string $content): string
-    {
-        return sprintf('<![CDATA[%s]]>', str_replace(']]>', ']]]]><![CDATA[>', $content));
-    }
-}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Exception/ContainerException.php b/advancedcontentfilter/vendor/slim/slim/Slim/Exception/ContainerException.php
new file mode 100644
index 00000000..06163f1d
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Exception/ContainerException.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Slim Framework (https://slimframework.com)
+ *
+ * @link      https://github.com/slimphp/Slim
+ * @copyright Copyright (c) 2011-2017 Josh Lockhart
+ * @license   https://github.com/slimphp/Slim/blob/3.x/LICENSE.md (MIT License)
+ */
+namespace Slim\Exception;
+
+use InvalidArgumentException;
+use Interop\Container\Exception\ContainerException as InteropContainerException;
+
+/**
+ * Container Exception
+ */
+class ContainerException extends InvalidArgumentException implements InteropContainerException
+{
+
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Exception/ContainerValueNotFoundException.php b/advancedcontentfilter/vendor/slim/slim/Slim/Exception/ContainerValueNotFoundException.php
new file mode 100644
index 00000000..33de07e3
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Exception/ContainerValueNotFoundException.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Slim Framework (https://slimframework.com)
+ *
+ * @link      https://github.com/slimphp/Slim
+ * @copyright Copyright (c) 2011-2017 Josh Lockhart
+ * @license   https://github.com/slimphp/Slim/blob/3.x/LICENSE.md (MIT License)
+ */
+namespace Slim\Exception;
+
+use RuntimeException;
+use Interop\Container\Exception\NotFoundException as InteropNotFoundException;
+
+/**
+ * Not Found Exception
+ */
+class ContainerValueNotFoundException extends RuntimeException implements InteropNotFoundException
+{
+
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Exception/HttpBadRequestException.php b/advancedcontentfilter/vendor/slim/slim/Slim/Exception/HttpBadRequestException.php
deleted file mode 100644
index 9be551cf..00000000
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Exception/HttpBadRequestException.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-/**
- * Slim Framework (https://slimframework.com)
- *
- * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
- */
-
-declare(strict_types=1);
-
-namespace Slim\Exception;
-
-class HttpBadRequestException extends HttpSpecializedException
-{
-    /**
-     * @var int
-     */
-    protected $code = 400;
-
-    /**
-     * @var string
-     */
-    protected $message = 'Bad request.';
-
-    protected string $title = '400 Bad Request';
-    protected string $description = 'The server cannot or will not process ' .
-        'the request due to an apparent client error.';
-}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Exception/HttpException.php b/advancedcontentfilter/vendor/slim/slim/Slim/Exception/HttpException.php
deleted file mode 100644
index d9dbd6cb..00000000
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Exception/HttpException.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-
-/**
- * Slim Framework (https://slimframework.com)
- *
- * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
- */
-
-declare(strict_types=1);
-
-namespace Slim\Exception;
-
-use Psr\Http\Message\ServerRequestInterface;
-use RuntimeException;
-use Throwable;
-
-/**
- * @method int getCode()
- */
-class HttpException extends RuntimeException
-{
-    protected ServerRequestInterface $request;
-
-    protected string $title = '';
-
-    protected string $description = '';
-
-    public function __construct(
-        ServerRequestInterface $request,
-        string $message = '',
-        int $code = 0,
-        ?Throwable $previous = null
-    ) {
-        parent::__construct($message, $code, $previous);
-        $this->request = $request;
-    }
-
-    public function getRequest(): ServerRequestInterface
-    {
-        return $this->request;
-    }
-
-    public function getTitle(): string
-    {
-        return $this->title;
-    }
-
-    public function setTitle(string $title): self
-    {
-        $this->title = $title;
-        return $this;
-    }
-
-    public function getDescription(): string
-    {
-        return $this->description;
-    }
-
-    public function setDescription(string $description): self
-    {
-        $this->description = $description;
-        return $this;
-    }
-}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Exception/HttpForbiddenException.php b/advancedcontentfilter/vendor/slim/slim/Slim/Exception/HttpForbiddenException.php
deleted file mode 100644
index dd3bb230..00000000
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Exception/HttpForbiddenException.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-/**
- * Slim Framework (https://slimframework.com)
- *
- * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
- */
-
-declare(strict_types=1);
-
-namespace Slim\Exception;
-
-class HttpForbiddenException extends HttpSpecializedException
-{
-    /**
-     * @var int
-     */
-    protected $code = 403;
-
-    /**
-     * @var string
-     */
-    protected $message = 'Forbidden.';
-
-    protected string $title = '403 Forbidden';
-    protected string $description = 'You are not permitted to perform the requested operation.';
-}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Exception/HttpGoneException.php b/advancedcontentfilter/vendor/slim/slim/Slim/Exception/HttpGoneException.php
deleted file mode 100644
index 42899e1e..00000000
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Exception/HttpGoneException.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-/**
- * Slim Framework (https://slimframework.com)
- *
- * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
- */
-
-declare(strict_types=1);
-
-namespace Slim\Exception;
-
-class HttpGoneException extends HttpSpecializedException
-{
-    /**
-     * @var int
-     */
-    protected $code = 410;
-
-    /**
-     * @var string
-     */
-    protected $message = 'Gone.';
-
-    protected string $title = '410 Gone';
-    protected string $description = 'The target resource is no longer available at the origin server.';
-}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Exception/HttpInternalServerErrorException.php b/advancedcontentfilter/vendor/slim/slim/Slim/Exception/HttpInternalServerErrorException.php
deleted file mode 100644
index b4322619..00000000
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Exception/HttpInternalServerErrorException.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-/**
- * Slim Framework (https://slimframework.com)
- *
- * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
- */
-
-declare(strict_types=1);
-
-namespace Slim\Exception;
-
-class HttpInternalServerErrorException extends HttpSpecializedException
-{
-    /**
-     * @var int
-     */
-    protected $code = 500;
-
-    /**
-     * @var string
-     */
-    protected $message = 'Internal server error.';
-
-    protected string $title = '500 Internal Server Error';
-    protected string $description = 'Unexpected condition encountered preventing server from fulfilling request.';
-}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Exception/HttpMethodNotAllowedException.php b/advancedcontentfilter/vendor/slim/slim/Slim/Exception/HttpMethodNotAllowedException.php
deleted file mode 100644
index 30aaaa74..00000000
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Exception/HttpMethodNotAllowedException.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-
-/**
- * Slim Framework (https://slimframework.com)
- *
- * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
- */
-
-declare(strict_types=1);
-
-namespace Slim\Exception;
-
-use function implode;
-
-class HttpMethodNotAllowedException extends HttpSpecializedException
-{
-    /**
-     * @var string[]
-     */
-    protected array $allowedMethods = [];
-
-    /**
-     * @var int
-     */
-    protected $code = 405;
-
-    /**
-     * @var string
-     */
-    protected $message = 'Method not allowed.';
-
-    protected string $title = '405 Method Not Allowed';
-    protected string $description = 'The request method is not supported for the requested resource.';
-
-    /**
-     * @return string[]
-     */
-    public function getAllowedMethods(): array
-    {
-        return $this->allowedMethods;
-    }
-
-    /**
-     * @param string[] $methods
-     */
-    public function setAllowedMethods(array $methods): self
-    {
-        $this->allowedMethods = $methods;
-        $this->message = 'Method not allowed. Must be one of: ' . implode(', ', $methods);
-        return $this;
-    }
-}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Exception/HttpNotFoundException.php b/advancedcontentfilter/vendor/slim/slim/Slim/Exception/HttpNotFoundException.php
deleted file mode 100644
index 865146d6..00000000
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Exception/HttpNotFoundException.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-/**
- * Slim Framework (https://slimframework.com)
- *
- * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
- */
-
-declare(strict_types=1);
-
-namespace Slim\Exception;
-
-class HttpNotFoundException extends HttpSpecializedException
-{
-    /**
-     * @var int
-     */
-    protected $code = 404;
-
-    /**
-     * @var string
-     */
-    protected $message = 'Not found.';
-
-    protected string $title = '404 Not Found';
-    protected string $description = 'The requested resource could not be found. Please verify the URI and try again.';
-}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Exception/HttpNotImplementedException.php b/advancedcontentfilter/vendor/slim/slim/Slim/Exception/HttpNotImplementedException.php
deleted file mode 100644
index 607a6f49..00000000
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Exception/HttpNotImplementedException.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-/**
- * Slim Framework (https://slimframework.com)
- *
- * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
- */
-
-declare(strict_types=1);
-
-namespace Slim\Exception;
-
-class HttpNotImplementedException extends HttpSpecializedException
-{
-    /**
-     * @var int
-     */
-    protected $code = 501;
-
-    /**
-     * @var string
-     */
-    protected $message = 'Not implemented.';
-
-    protected string $title = '501 Not Implemented';
-    protected string $description = 'The server does not support the functionality required to fulfill the request.';
-}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Exception/HttpSpecializedException.php b/advancedcontentfilter/vendor/slim/slim/Slim/Exception/HttpSpecializedException.php
deleted file mode 100644
index 945e1ad4..00000000
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Exception/HttpSpecializedException.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-/**
- * Slim Framework (https://slimframework.com)
- *
- * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
- */
-
-declare(strict_types=1);
-
-namespace Slim\Exception;
-
-use Psr\Http\Message\ServerRequestInterface;
-use Throwable;
-
-abstract class HttpSpecializedException extends HttpException
-{
-    /**
-     * @param ServerRequestInterface $request
-     * @param string|null            $message
-     * @param Throwable|null         $previous
-     */
-    public function __construct(ServerRequestInterface $request, ?string $message = null, ?Throwable $previous = null)
-    {
-        if ($message !== null) {
-            $this->message = $message;
-        }
-
-        parent::__construct($request, $this->message, $this->code, $previous);
-    }
-}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Exception/HttpTooManyRequestsException.php b/advancedcontentfilter/vendor/slim/slim/Slim/Exception/HttpTooManyRequestsException.php
deleted file mode 100644
index be4b29bb..00000000
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Exception/HttpTooManyRequestsException.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-/**
- * Slim Framework (https://slimframework.com)
- *
- * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
- */
-
-declare(strict_types=1);
-
-namespace Slim\Exception;
-
-class HttpTooManyRequestsException extends HttpSpecializedException
-{
-    /**
-     * @var int
-     */
-    protected $code = 429;
-
-    /**
-     * @var string
-     */
-    protected $message = 'Too many requests.';
-
-    protected string $title = '429 Too Many Requests';
-    protected string $description = 'The client application has surpassed its rate limit, ' .
-                                    'or number of requests they can send in a given period of time.';
-}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Exception/HttpUnauthorizedException.php b/advancedcontentfilter/vendor/slim/slim/Slim/Exception/HttpUnauthorizedException.php
deleted file mode 100644
index 07bd70d0..00000000
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Exception/HttpUnauthorizedException.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-/**
- * Slim Framework (https://slimframework.com)
- *
- * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
- */
-
-declare(strict_types=1);
-
-namespace Slim\Exception;
-
-class HttpUnauthorizedException extends HttpSpecializedException
-{
-    /**
-     * @var int
-     */
-    protected $code = 401;
-
-    /**
-     * @var string
-     */
-    protected $message = 'Unauthorized.';
-
-    protected string $title = '401 Unauthorized';
-    protected string $description = 'The request requires valid user authentication.';
-}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Exception/InvalidMethodException.php b/advancedcontentfilter/vendor/slim/slim/Slim/Exception/InvalidMethodException.php
new file mode 100644
index 00000000..4aabf833
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Exception/InvalidMethodException.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Slim Framework (https://slimframework.com)
+ *
+ * @link      https://github.com/slimphp/Slim
+ * @copyright Copyright (c) 2011-2017 Josh Lockhart
+ * @license   https://github.com/slimphp/Slim/blob/3.x/LICENSE.md (MIT License)
+ */
+namespace Slim\Exception;
+
+use Psr\Http\Message\ServerRequestInterface;
+
+class InvalidMethodException extends \InvalidArgumentException
+{
+    protected $request;
+
+    public function __construct(ServerRequestInterface $request, $method)
+    {
+        $this->request = $request;
+        parent::__construct(sprintf('Unsupported HTTP method "%s" provided', $method));
+    }
+
+    public function getRequest()
+    {
+        return $this->request;
+    }
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Exception/MethodNotAllowedException.php b/advancedcontentfilter/vendor/slim/slim/Slim/Exception/MethodNotAllowedException.php
new file mode 100644
index 00000000..951f5dfb
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Exception/MethodNotAllowedException.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Slim Framework (https://slimframework.com)
+ *
+ * @link      https://github.com/slimphp/Slim
+ * @copyright Copyright (c) 2011-2017 Josh Lockhart
+ * @license   https://github.com/slimphp/Slim/blob/3.x/LICENSE.md (MIT License)
+ */
+namespace Slim\Exception;
+
+use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Message\ResponseInterface;
+
+class MethodNotAllowedException extends SlimException
+{
+    /**
+     * HTTP methods allowed
+     *
+     * @var string[]
+     */
+    protected $allowedMethods;
+
+    /**
+     * Create new exception
+     *
+     * @param ServerRequestInterface $request
+     * @param ResponseInterface $response
+     * @param string[] $allowedMethods
+     */
+    public function __construct(ServerRequestInterface $request, ResponseInterface $response, array $allowedMethods)
+    {
+        parent::__construct($request, $response);
+        $this->allowedMethods = $allowedMethods;
+    }
+
+    /**
+     * Get allowed methods
+     *
+     * @return string[]
+     */
+    public function getAllowedMethods()
+    {
+        return $this->allowedMethods;
+    }
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Exception/NotFoundException.php b/advancedcontentfilter/vendor/slim/slim/Slim/Exception/NotFoundException.php
new file mode 100644
index 00000000..9e72e14e
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Exception/NotFoundException.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * Slim Framework (https://slimframework.com)
+ *
+ * @link      https://github.com/slimphp/Slim
+ * @copyright Copyright (c) 2011-2017 Josh Lockhart
+ * @license   https://github.com/slimphp/Slim/blob/3.x/LICENSE.md (MIT License)
+ */
+namespace Slim\Exception;
+
+class NotFoundException extends SlimException
+{
+
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Exception/SlimException.php b/advancedcontentfilter/vendor/slim/slim/Slim/Exception/SlimException.php
new file mode 100644
index 00000000..2480d73b
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Exception/SlimException.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * Slim Framework (https://slimframework.com)
+ *
+ * @link      https://github.com/slimphp/Slim
+ * @copyright Copyright (c) 2011-2017 Josh Lockhart
+ * @license   https://github.com/slimphp/Slim/blob/3.x/LICENSE.md (MIT License)
+ */
+namespace Slim\Exception;
+
+use Exception;
+use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Message\ResponseInterface;
+
+/**
+ * Stop Exception
+ *
+ * This Exception is thrown when the Slim application needs to abort
+ * processing and return control flow to the outer PHP script.
+ */
+class SlimException extends Exception
+{
+    /**
+     * A request object
+     *
+     * @var ServerRequestInterface
+     */
+    protected $request;
+
+    /**
+     * A response object to send to the HTTP client
+     *
+     * @var ResponseInterface
+     */
+    protected $response;
+
+    /**
+     * Create new exception
+     *
+     * @param ServerRequestInterface $request
+     * @param ResponseInterface $response
+     */
+    public function __construct(ServerRequestInterface $request, ResponseInterface $response)
+    {
+        parent::__construct();
+        $this->request = $request;
+        $this->response = $response;
+    }
+
+    /**
+     * Get request
+     *
+     * @return ServerRequestInterface
+     */
+    public function getRequest()
+    {
+        return $this->request;
+    }
+
+    /**
+     * Get response
+     *
+     * @return ResponseInterface
+     */
+    public function getResponse()
+    {
+        return $this->response;
+    }
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Factory/AppFactory.php b/advancedcontentfilter/vendor/slim/slim/Slim/Factory/AppFactory.php
deleted file mode 100644
index 6fc5f86e..00000000
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Factory/AppFactory.php
+++ /dev/null
@@ -1,206 +0,0 @@
-<?php
-
-/**
- * Slim Framework (https://slimframework.com)
- *
- * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
- */
-
-declare(strict_types=1);
-
-namespace Slim\Factory;
-
-use Psr\Container\ContainerInterface;
-use Psr\Http\Message\ResponseFactoryInterface;
-use Psr\Http\Message\StreamFactoryInterface;
-use RuntimeException;
-use Slim\App;
-use Slim\Factory\Psr17\Psr17Factory;
-use Slim\Factory\Psr17\Psr17FactoryProvider;
-use Slim\Factory\Psr17\SlimHttpPsr17Factory;
-use Slim\Interfaces\CallableResolverInterface;
-use Slim\Interfaces\MiddlewareDispatcherInterface;
-use Slim\Interfaces\Psr17FactoryProviderInterface;
-use Slim\Interfaces\RouteCollectorInterface;
-use Slim\Interfaces\RouteResolverInterface;
-
-class AppFactory
-{
-    protected static ?Psr17FactoryProviderInterface $psr17FactoryProvider = null;
-
-    protected static ?ResponseFactoryInterface $responseFactory = null;
-
-    protected static ?StreamFactoryInterface $streamFactory = null;
-
-    protected static ?ContainerInterface $container = null;
-
-    protected static ?CallableResolverInterface $callableResolver = null;
-
-    protected static ?RouteCollectorInterface $routeCollector = null;
-
-    protected static ?RouteResolverInterface $routeResolver = null;
-
-    protected static ?MiddlewareDispatcherInterface $middlewareDispatcher = null;
-
-    protected static bool $slimHttpDecoratorsAutomaticDetectionEnabled = true;
-
-    public static function create(
-        ?ResponseFactoryInterface $responseFactory = null,
-        ?ContainerInterface $container = null,
-        ?CallableResolverInterface $callableResolver = null,
-        ?RouteCollectorInterface $routeCollector = null,
-        ?RouteResolverInterface $routeResolver = null,
-        ?MiddlewareDispatcherInterface $middlewareDispatcher = null
-    ): App {
-        static::$responseFactory = $responseFactory ?? static::$responseFactory;
-        return new App(
-            self::determineResponseFactory(),
-            $container ?? static::$container,
-            $callableResolver ?? static::$callableResolver,
-            $routeCollector ?? static::$routeCollector,
-            $routeResolver ?? static::$routeResolver,
-            $middlewareDispatcher ?? static::$middlewareDispatcher
-        );
-    }
-
-    public static function createFromContainer(ContainerInterface $container): App
-    {
-        $responseFactory = $container->has(ResponseFactoryInterface::class)
-        && (
-            $responseFactoryFromContainer = $container->get(ResponseFactoryInterface::class)
-        ) instanceof ResponseFactoryInterface
-            ? $responseFactoryFromContainer
-            : self::determineResponseFactory();
-
-        $callableResolver = $container->has(CallableResolverInterface::class)
-        && (
-            $callableResolverFromContainer = $container->get(CallableResolverInterface::class)
-        ) instanceof CallableResolverInterface
-            ? $callableResolverFromContainer
-            : null;
-
-        $routeCollector = $container->has(RouteCollectorInterface::class)
-        && (
-            $routeCollectorFromContainer = $container->get(RouteCollectorInterface::class)
-        ) instanceof RouteCollectorInterface
-            ? $routeCollectorFromContainer
-            : null;
-
-        $routeResolver = $container->has(RouteResolverInterface::class)
-        && (
-            $routeResolverFromContainer = $container->get(RouteResolverInterface::class)
-        ) instanceof RouteResolverInterface
-            ? $routeResolverFromContainer
-            : null;
-
-        $middlewareDispatcher = $container->has(MiddlewareDispatcherInterface::class)
-        && (
-            $middlewareDispatcherFromContainer = $container->get(MiddlewareDispatcherInterface::class)
-        ) instanceof MiddlewareDispatcherInterface
-            ? $middlewareDispatcherFromContainer
-            : null;
-
-        return new App(
-            $responseFactory,
-            $container,
-            $callableResolver,
-            $routeCollector,
-            $routeResolver,
-            $middlewareDispatcher
-        );
-    }
-
-    /**
-     * @throws RuntimeException
-     */
-    public static function determineResponseFactory(): ResponseFactoryInterface
-    {
-        if (static::$responseFactory) {
-            if (static::$streamFactory) {
-                return static::attemptResponseFactoryDecoration(static::$responseFactory, static::$streamFactory);
-            }
-            return static::$responseFactory;
-        }
-
-        $psr17FactoryProvider = static::$psr17FactoryProvider ?? new Psr17FactoryProvider();
-
-        /** @var Psr17Factory $psr17factory */
-        foreach ($psr17FactoryProvider->getFactories() as $psr17factory) {
-            if ($psr17factory::isResponseFactoryAvailable()) {
-                $responseFactory = $psr17factory::getResponseFactory();
-
-                if (static::$streamFactory || $psr17factory::isStreamFactoryAvailable()) {
-                    $streamFactory = static::$streamFactory ?? $psr17factory::getStreamFactory();
-                    return static::attemptResponseFactoryDecoration($responseFactory, $streamFactory);
-                }
-
-                return $responseFactory;
-            }
-        }
-
-        throw new RuntimeException(
-            "Could not detect any PSR-17 ResponseFactory implementations. " .
-            "Please install a supported implementation in order to use `AppFactory::create()`. " .
-            "See https://github.com/slimphp/Slim/blob/4.x/README.md for a list of supported implementations."
-        );
-    }
-
-    protected static function attemptResponseFactoryDecoration(
-        ResponseFactoryInterface $responseFactory,
-        StreamFactoryInterface $streamFactory
-    ): ResponseFactoryInterface {
-        if (
-            static::$slimHttpDecoratorsAutomaticDetectionEnabled
-            && SlimHttpPsr17Factory::isResponseFactoryAvailable()
-        ) {
-            return SlimHttpPsr17Factory::createDecoratedResponseFactory($responseFactory, $streamFactory);
-        }
-
-        return $responseFactory;
-    }
-
-    public static function setPsr17FactoryProvider(Psr17FactoryProviderInterface $psr17FactoryProvider): void
-    {
-        static::$psr17FactoryProvider = $psr17FactoryProvider;
-    }
-
-    public static function setResponseFactory(ResponseFactoryInterface $responseFactory): void
-    {
-        static::$responseFactory = $responseFactory;
-    }
-
-    public static function setStreamFactory(StreamFactoryInterface $streamFactory): void
-    {
-        static::$streamFactory = $streamFactory;
-    }
-
-    public static function setContainer(ContainerInterface $container): void
-    {
-        static::$container = $container;
-    }
-
-    public static function setCallableResolver(CallableResolverInterface $callableResolver): void
-    {
-        static::$callableResolver = $callableResolver;
-    }
-
-    public static function setRouteCollector(RouteCollectorInterface $routeCollector): void
-    {
-        static::$routeCollector = $routeCollector;
-    }
-
-    public static function setRouteResolver(RouteResolverInterface $routeResolver): void
-    {
-        static::$routeResolver = $routeResolver;
-    }
-
-    public static function setMiddlewareDispatcher(MiddlewareDispatcherInterface $middlewareDispatcher): void
-    {
-        static::$middlewareDispatcher = $middlewareDispatcher;
-    }
-
-    public static function setSlimHttpDecoratorsAutomaticDetection(bool $enabled): void
-    {
-        static::$slimHttpDecoratorsAutomaticDetectionEnabled = $enabled;
-    }
-}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Factory/Psr17/GuzzlePsr17Factory.php b/advancedcontentfilter/vendor/slim/slim/Slim/Factory/Psr17/GuzzlePsr17Factory.php
deleted file mode 100644
index 32a548a6..00000000
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Factory/Psr17/GuzzlePsr17Factory.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-/**
- * Slim Framework (https://slimframework.com)
- *
- * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
- */
-
-declare(strict_types=1);
-
-namespace Slim\Factory\Psr17;
-
-class GuzzlePsr17Factory extends Psr17Factory
-{
-    protected static string $responseFactoryClass = 'GuzzleHttp\Psr7\HttpFactory';
-    protected static string $streamFactoryClass = 'GuzzleHttp\Psr7\HttpFactory';
-    protected static string $serverRequestCreatorClass = 'GuzzleHttp\Psr7\ServerRequest';
-    protected static string $serverRequestCreatorMethod = 'fromGlobals';
-}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Factory/Psr17/HttpSoftPsr17Factory.php b/advancedcontentfilter/vendor/slim/slim/Slim/Factory/Psr17/HttpSoftPsr17Factory.php
deleted file mode 100644
index c305d7c1..00000000
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Factory/Psr17/HttpSoftPsr17Factory.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-/**
- * Slim Framework (https://slimframework.com)
- *
- * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
- */
-
-declare(strict_types=1);
-
-namespace Slim\Factory\Psr17;
-
-class HttpSoftPsr17Factory extends Psr17Factory
-{
-    protected static string $responseFactoryClass = 'HttpSoft\Message\ResponseFactory';
-    protected static string $streamFactoryClass = 'HttpSoft\Message\StreamFactory';
-    protected static string $serverRequestCreatorClass = 'HttpSoft\ServerRequest\ServerRequestCreator';
-    protected static string $serverRequestCreatorMethod = 'createFromGlobals';
-}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Factory/Psr17/LaminasDiactorosPsr17Factory.php b/advancedcontentfilter/vendor/slim/slim/Slim/Factory/Psr17/LaminasDiactorosPsr17Factory.php
deleted file mode 100644
index e6a9db1a..00000000
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Factory/Psr17/LaminasDiactorosPsr17Factory.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-/**
- * Slim Framework (https://slimframework.com)
- *
- * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
- */
-
-declare(strict_types=1);
-
-namespace Slim\Factory\Psr17;
-
-class LaminasDiactorosPsr17Factory extends Psr17Factory
-{
-    protected static string $responseFactoryClass = 'Laminas\Diactoros\ResponseFactory';
-    protected static string $streamFactoryClass = 'Laminas\Diactoros\StreamFactory';
-    protected static string $serverRequestCreatorClass = 'Laminas\Diactoros\ServerRequestFactory';
-    protected static string $serverRequestCreatorMethod = 'fromGlobals';
-}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Factory/Psr17/NyholmPsr17Factory.php b/advancedcontentfilter/vendor/slim/slim/Slim/Factory/Psr17/NyholmPsr17Factory.php
deleted file mode 100644
index ba11095a..00000000
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Factory/Psr17/NyholmPsr17Factory.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Slim\Factory\Psr17;
-
-use Slim\Interfaces\ServerRequestCreatorInterface;
-
-class NyholmPsr17Factory extends Psr17Factory
-{
-    protected static string $responseFactoryClass = 'Nyholm\Psr7\Factory\Psr17Factory';
-    protected static string $streamFactoryClass = 'Nyholm\Psr7\Factory\Psr17Factory';
-    protected static string $serverRequestCreatorClass = 'Nyholm\Psr7Server\ServerRequestCreator';
-    protected static string $serverRequestCreatorMethod = 'fromGlobals';
-
-    /**
-     * {@inheritdoc}
-     */
-    public static function getServerRequestCreator(): ServerRequestCreatorInterface
-    {
-        /*
-         * Nyholm Psr17Factory implements all factories in one unified
-         * factory which implements all of the PSR-17 factory interfaces
-         */
-        $psr17Factory = new static::$responseFactoryClass();
-
-        $serverRequestCreator = new static::$serverRequestCreatorClass(
-            $psr17Factory,
-            $psr17Factory,
-            $psr17Factory,
-            $psr17Factory
-        );
-
-        return new ServerRequestCreator($serverRequestCreator, static::$serverRequestCreatorMethod);
-    }
-}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Factory/Psr17/Psr17Factory.php b/advancedcontentfilter/vendor/slim/slim/Slim/Factory/Psr17/Psr17Factory.php
deleted file mode 100644
index 97977f9b..00000000
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Factory/Psr17/Psr17Factory.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-
-/**
- * Slim Framework (https://slimframework.com)
- *
- * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
- */
-
-declare(strict_types=1);
-
-namespace Slim\Factory\Psr17;
-
-use Psr\Http\Message\ResponseFactoryInterface;
-use Psr\Http\Message\StreamFactoryInterface;
-use RuntimeException;
-use Slim\Interfaces\Psr17FactoryInterface;
-use Slim\Interfaces\ServerRequestCreatorInterface;
-
-use function class_exists;
-use function get_called_class;
-
-abstract class Psr17Factory implements Psr17FactoryInterface
-{
-    protected static string $responseFactoryClass;
-
-    protected static string $streamFactoryClass;
-
-    protected static string $serverRequestCreatorClass;
-
-    protected static string $serverRequestCreatorMethod;
-
-    /**
-     * {@inheritdoc}
-     */
-    public static function getResponseFactory(): ResponseFactoryInterface
-    {
-        if (
-            !static::isResponseFactoryAvailable()
-            || !(($responseFactory = new static::$responseFactoryClass()) instanceof ResponseFactoryInterface)
-        ) {
-            throw new RuntimeException(get_called_class() . ' could not instantiate a response factory.');
-        }
-
-        return $responseFactory;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public static function getStreamFactory(): StreamFactoryInterface
-    {
-        if (
-            !static::isStreamFactoryAvailable()
-            || !(($streamFactory = new static::$streamFactoryClass()) instanceof StreamFactoryInterface)
-        ) {
-            throw new RuntimeException(get_called_class() . ' could not instantiate a stream factory.');
-        }
-
-        return $streamFactory;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public static function getServerRequestCreator(): ServerRequestCreatorInterface
-    {
-        if (!static::isServerRequestCreatorAvailable()) {
-            throw new RuntimeException(get_called_class() . ' could not instantiate a server request creator.');
-        }
-
-        return new ServerRequestCreator(static::$serverRequestCreatorClass, static::$serverRequestCreatorMethod);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public static function isResponseFactoryAvailable(): bool
-    {
-        return static::$responseFactoryClass && class_exists(static::$responseFactoryClass);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public static function isStreamFactoryAvailable(): bool
-    {
-        return static::$streamFactoryClass && class_exists(static::$streamFactoryClass);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public static function isServerRequestCreatorAvailable(): bool
-    {
-        return (
-            static::$serverRequestCreatorClass
-            && static::$serverRequestCreatorMethod
-            && class_exists(static::$serverRequestCreatorClass)
-        );
-    }
-}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Factory/Psr17/Psr17FactoryProvider.php b/advancedcontentfilter/vendor/slim/slim/Slim/Factory/Psr17/Psr17FactoryProvider.php
deleted file mode 100644
index 436d2af0..00000000
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Factory/Psr17/Psr17FactoryProvider.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-
-/**
- * Slim Framework (https://slimframework.com)
- *
- * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
- */
-
-declare(strict_types=1);
-
-namespace Slim\Factory\Psr17;
-
-use Slim\Interfaces\Psr17FactoryProviderInterface;
-
-use function array_unshift;
-
-class Psr17FactoryProvider implements Psr17FactoryProviderInterface
-{
-    /**
-     * @var string[]
-     */
-    protected static array $factories = [
-        SlimPsr17Factory::class,
-        HttpSoftPsr17Factory::class,
-        NyholmPsr17Factory::class,
-        LaminasDiactorosPsr17Factory::class,
-        GuzzlePsr17Factory::class,
-    ];
-
-    /**
-     * {@inheritdoc}
-     */
-    public static function getFactories(): array
-    {
-        return static::$factories;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public static function setFactories(array $factories): void
-    {
-        static::$factories = $factories;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public static function addFactory(string $factory): void
-    {
-        array_unshift(static::$factories, $factory);
-    }
-}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Factory/Psr17/ServerRequestCreator.php b/advancedcontentfilter/vendor/slim/slim/Slim/Factory/Psr17/ServerRequestCreator.php
deleted file mode 100644
index 0fc6c066..00000000
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Factory/Psr17/ServerRequestCreator.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-/**
- * Slim Framework (https://slimframework.com)
- *
- * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
- */
-
-declare(strict_types=1);
-
-namespace Slim\Factory\Psr17;
-
-use Closure;
-use Psr\Http\Message\ServerRequestInterface;
-use Slim\Interfaces\ServerRequestCreatorInterface;
-
-class ServerRequestCreator implements ServerRequestCreatorInterface
-{
-    /**
-     * @var object|string
-     */
-    protected $serverRequestCreator;
-
-    protected string $serverRequestCreatorMethod;
-
-    /**
-     * @param object|string $serverRequestCreator
-     */
-    public function __construct($serverRequestCreator, string $serverRequestCreatorMethod)
-    {
-        $this->serverRequestCreator = $serverRequestCreator;
-        $this->serverRequestCreatorMethod = $serverRequestCreatorMethod;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function createServerRequestFromGlobals(): ServerRequestInterface
-    {
-        /** @var callable $callable */
-        $callable = [$this->serverRequestCreator, $this->serverRequestCreatorMethod];
-        return (Closure::fromCallable($callable))();
-    }
-}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Factory/Psr17/SlimHttpPsr17Factory.php b/advancedcontentfilter/vendor/slim/slim/Slim/Factory/Psr17/SlimHttpPsr17Factory.php
deleted file mode 100644
index 5d636318..00000000
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Factory/Psr17/SlimHttpPsr17Factory.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-/**
- * Slim Framework (https://slimframework.com)
- *
- * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
- */
-
-declare(strict_types=1);
-
-namespace Slim\Factory\Psr17;
-
-use Psr\Http\Message\ResponseFactoryInterface;
-use Psr\Http\Message\StreamFactoryInterface;
-use RuntimeException;
-
-class SlimHttpPsr17Factory extends Psr17Factory
-{
-    protected static string $responseFactoryClass = 'Slim\Http\Factory\DecoratedResponseFactory';
-
-    /**
-     * @throws RuntimeException when the factory could not be instantiated
-     */
-    public static function createDecoratedResponseFactory(
-        ResponseFactoryInterface $responseFactory,
-        StreamFactoryInterface $streamFactory
-    ): ResponseFactoryInterface {
-        if (
-            !((
-                $decoratedResponseFactory = new static::$responseFactoryClass($responseFactory, $streamFactory)
-                ) instanceof ResponseFactoryInterface
-            )
-        ) {
-            throw new RuntimeException(get_called_class() . ' could not instantiate a decorated response factory.');
-        }
-
-        return $decoratedResponseFactory;
-    }
-}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Factory/Psr17/SlimHttpServerRequestCreator.php b/advancedcontentfilter/vendor/slim/slim/Slim/Factory/Psr17/SlimHttpServerRequestCreator.php
deleted file mode 100644
index eb50d484..00000000
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Factory/Psr17/SlimHttpServerRequestCreator.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-
-/**
- * Slim Framework (https://slimframework.com)
- *
- * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
- */
-
-declare(strict_types=1);
-
-namespace Slim\Factory\Psr17;
-
-use Psr\Http\Message\ServerRequestInterface;
-use RuntimeException;
-use Slim\Interfaces\ServerRequestCreatorInterface;
-
-use function class_exists;
-
-class SlimHttpServerRequestCreator implements ServerRequestCreatorInterface
-{
-    protected ServerRequestCreatorInterface $serverRequestCreator;
-
-    protected static string $serverRequestDecoratorClass = 'Slim\Http\ServerRequest';
-
-    public function __construct(ServerRequestCreatorInterface $serverRequestCreator)
-    {
-        $this->serverRequestCreator = $serverRequestCreator;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function createServerRequestFromGlobals(): ServerRequestInterface
-    {
-        if (!static::isServerRequestDecoratorAvailable()) {
-            throw new RuntimeException('The Slim-Http ServerRequest decorator is not available.');
-        }
-
-        $request = $this->serverRequestCreator->createServerRequestFromGlobals();
-
-        if (
-            !((
-                $decoratedServerRequest = new static::$serverRequestDecoratorClass($request)
-                ) instanceof ServerRequestInterface)
-        ) {
-            throw new RuntimeException(get_called_class() . ' could not instantiate a decorated server request.');
-        }
-
-        return $decoratedServerRequest;
-    }
-
-    public static function isServerRequestDecoratorAvailable(): bool
-    {
-        return class_exists(static::$serverRequestDecoratorClass);
-    }
-}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Factory/Psr17/SlimPsr17Factory.php b/advancedcontentfilter/vendor/slim/slim/Slim/Factory/Psr17/SlimPsr17Factory.php
deleted file mode 100644
index 46c46f9c..00000000
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Factory/Psr17/SlimPsr17Factory.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-/**
- * Slim Framework (https://slimframework.com)
- *
- * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
- */
-
-declare(strict_types=1);
-
-namespace Slim\Factory\Psr17;
-
-class SlimPsr17Factory extends Psr17Factory
-{
-    protected static string $responseFactoryClass = 'Slim\Psr7\Factory\ResponseFactory';
-    protected static string $streamFactoryClass = 'Slim\Psr7\Factory\StreamFactory';
-    protected static string $serverRequestCreatorClass = 'Slim\Psr7\Factory\ServerRequestFactory';
-    protected static string $serverRequestCreatorMethod = 'createFromGlobals';
-}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Factory/ServerRequestCreatorFactory.php b/advancedcontentfilter/vendor/slim/slim/Slim/Factory/ServerRequestCreatorFactory.php
deleted file mode 100644
index 94f639d2..00000000
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Factory/ServerRequestCreatorFactory.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-
-/**
- * Slim Framework (https://slimframework.com)
- *
- * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
- */
-
-declare(strict_types=1);
-
-namespace Slim\Factory;
-
-use RuntimeException;
-use Slim\Factory\Psr17\Psr17Factory;
-use Slim\Factory\Psr17\Psr17FactoryProvider;
-use Slim\Factory\Psr17\SlimHttpServerRequestCreator;
-use Slim\Interfaces\Psr17FactoryProviderInterface;
-use Slim\Interfaces\ServerRequestCreatorInterface;
-
-class ServerRequestCreatorFactory
-{
-    protected static ?Psr17FactoryProviderInterface $psr17FactoryProvider = null;
-
-    protected static ?ServerRequestCreatorInterface $serverRequestCreator = null;
-
-    protected static bool $slimHttpDecoratorsAutomaticDetectionEnabled = true;
-
-    public static function create(): ServerRequestCreatorInterface
-    {
-        return static::determineServerRequestCreator();
-    }
-
-    /**
-     * @throws RuntimeException
-     */
-    public static function determineServerRequestCreator(): ServerRequestCreatorInterface
-    {
-        if (static::$serverRequestCreator) {
-            return static::attemptServerRequestCreatorDecoration(static::$serverRequestCreator);
-        }
-
-        $psr17FactoryProvider = static::$psr17FactoryProvider ?? new Psr17FactoryProvider();
-
-        /** @var Psr17Factory $psr17Factory */
-        foreach ($psr17FactoryProvider->getFactories() as $psr17Factory) {
-            if ($psr17Factory::isServerRequestCreatorAvailable()) {
-                $serverRequestCreator = $psr17Factory::getServerRequestCreator();
-                return static::attemptServerRequestCreatorDecoration($serverRequestCreator);
-            }
-        }
-
-        throw new RuntimeException(
-            "Could not detect any ServerRequest creator implementations. " .
-            "Please install a supported implementation in order to use `App::run()` " .
-            "without having to pass in a `ServerRequest` object. " .
-            "See https://github.com/slimphp/Slim/blob/4.x/README.md for a list of supported implementations."
-        );
-    }
-
-    protected static function attemptServerRequestCreatorDecoration(
-        ServerRequestCreatorInterface $serverRequestCreator
-    ): ServerRequestCreatorInterface {
-        if (
-            static::$slimHttpDecoratorsAutomaticDetectionEnabled
-            && SlimHttpServerRequestCreator::isServerRequestDecoratorAvailable()
-        ) {
-            return new SlimHttpServerRequestCreator($serverRequestCreator);
-        }
-
-        return $serverRequestCreator;
-    }
-
-    public static function setPsr17FactoryProvider(Psr17FactoryProviderInterface $psr17FactoryProvider): void
-    {
-        static::$psr17FactoryProvider = $psr17FactoryProvider;
-    }
-
-    public static function setServerRequestCreator(ServerRequestCreatorInterface $serverRequestCreator): void
-    {
-        self::$serverRequestCreator = $serverRequestCreator;
-    }
-
-    public static function setSlimHttpDecoratorsAutomaticDetection(bool $enabled): void
-    {
-        static::$slimHttpDecoratorsAutomaticDetectionEnabled = $enabled;
-    }
-}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Handlers/AbstractError.php b/advancedcontentfilter/vendor/slim/slim/Slim/Handlers/AbstractError.php
new file mode 100644
index 00000000..42f8dde3
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Handlers/AbstractError.php
@@ -0,0 +1,99 @@
+<?php
+/**
+ * Slim Framework (https://slimframework.com)
+ *
+ * @link      https://github.com/slimphp/Slim
+ * @copyright Copyright (c) 2011-2017 Josh Lockhart
+ * @license   https://github.com/slimphp/Slim/blob/3.x/LICENSE.md (MIT License)
+ */
+namespace Slim\Handlers;
+
+/**
+ * Abstract Slim application error handler
+ */
+abstract class AbstractError extends AbstractHandler
+{
+    /**
+     * @var bool
+     */
+    protected $displayErrorDetails;
+
+    /**
+     * Constructor
+     *
+     * @param bool $displayErrorDetails Set to true to display full details
+     */
+    public function __construct($displayErrorDetails = false)
+    {
+        $this->displayErrorDetails = (bool) $displayErrorDetails;
+    }
+
+    /**
+     * Write to the error log if displayErrorDetails is false
+     *
+     * @param \Exception|\Throwable $throwable
+     *
+     * @return void
+     */
+    protected function writeToErrorLog($throwable)
+    {
+        if ($this->displayErrorDetails) {
+            return;
+        }
+
+        $message = 'Slim Application Error:' . PHP_EOL;
+        $message .= $this->renderThrowableAsText($throwable);
+        while ($throwable = $throwable->getPrevious()) {
+            $message .= PHP_EOL . 'Previous error:' . PHP_EOL;
+            $message .= $this->renderThrowableAsText($throwable);
+        }
+
+        $message .= PHP_EOL . 'View in rendered output by enabling the "displayErrorDetails" setting.' . PHP_EOL;
+
+        $this->logError($message);
+    }
+
+    /**
+     * Render error as Text.
+     *
+     * @param \Exception|\Throwable $throwable
+     *
+     * @return string
+     */
+    protected function renderThrowableAsText($throwable)
+    {
+        $text = sprintf('Type: %s' . PHP_EOL, get_class($throwable));
+
+        if ($code = $throwable->getCode()) {
+            $text .= sprintf('Code: %s' . PHP_EOL, $code);
+        }
+
+        if ($message = $throwable->getMessage()) {
+            $text .= sprintf('Message: %s' . PHP_EOL, htmlentities($message));
+        }
+
+        if ($file = $throwable->getFile()) {
+            $text .= sprintf('File: %s' . PHP_EOL, $file);
+        }
+
+        if ($line = $throwable->getLine()) {
+            $text .= sprintf('Line: %s' . PHP_EOL, $line);
+        }
+
+        if ($trace = $throwable->getTraceAsString()) {
+            $text .= sprintf('Trace: %s', $trace);
+        }
+
+        return $text;
+    }
+
+    /**
+     * Wraps the error_log function so that this can be easily tested
+     *
+     * @param $message
+     */
+    protected function logError($message)
+    {
+        error_log($message);
+    }
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Handlers/AbstractHandler.php b/advancedcontentfilter/vendor/slim/slim/Slim/Handlers/AbstractHandler.php
new file mode 100644
index 00000000..b166a156
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Handlers/AbstractHandler.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * Slim Framework (https://slimframework.com)
+ *
+ * @link      https://github.com/slimphp/Slim
+ * @copyright Copyright (c) 2011-2017 Josh Lockhart
+ * @license   https://github.com/slimphp/Slim/blob/3.x/LICENSE.md (MIT License)
+ */
+namespace Slim\Handlers;
+
+use Psr\Http\Message\ServerRequestInterface;
+
+/**
+ * Abstract Slim application handler
+ */
+abstract class AbstractHandler
+{
+    /**
+     * Known handled content types
+     *
+     * @var array
+     */
+    protected $knownContentTypes = [
+        'application/json',
+        'application/xml',
+        'text/xml',
+        'text/html',
+    ];
+
+    /**
+     * Determine which content type we know about is wanted using Accept header
+     *
+     * Note: This method is a bare-bones implementation designed specifically for
+     * Slim's error handling requirements. Consider a fully-feature solution such
+     * as willdurand/negotiation for any other situation.
+     *
+     * @param ServerRequestInterface $request
+     * @return string
+     */
+    protected function determineContentType(ServerRequestInterface $request)
+    {
+        $acceptHeader = $request->getHeaderLine('Accept');
+        $selectedContentTypes = array_intersect(explode(',', $acceptHeader), $this->knownContentTypes);
+
+        if (count($selectedContentTypes)) {
+            return current($selectedContentTypes);
+        }
+
+        // handle +json and +xml specially
+        if (preg_match('/\+(json|xml)/', $acceptHeader, $matches)) {
+            $mediaType = 'application/' . $matches[1];
+            if (in_array($mediaType, $this->knownContentTypes)) {
+                return $mediaType;
+            }
+        }
+
+        return 'text/html';
+    }
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Handlers/Error.php b/advancedcontentfilter/vendor/slim/slim/Slim/Handlers/Error.php
new file mode 100644
index 00000000..dd0bc8d4
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Handlers/Error.php
@@ -0,0 +1,224 @@
+<?php
+/**
+ * Slim Framework (https://slimframework.com)
+ *
+ * @link      https://github.com/slimphp/Slim
+ * @copyright Copyright (c) 2011-2017 Josh Lockhart
+ * @license   https://github.com/slimphp/Slim/blob/3.x/LICENSE.md (MIT License)
+ */
+namespace Slim\Handlers;
+
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Slim\Http\Body;
+use UnexpectedValueException;
+
+/**
+ * Default Slim application error handler
+ *
+ * It outputs the error message and diagnostic information in either JSON, XML,
+ * or HTML based on the Accept header.
+ */
+class Error extends AbstractError
+{
+    /**
+     * Invoke error handler
+     *
+     * @param ServerRequestInterface $request   The most recent Request object
+     * @param ResponseInterface      $response  The most recent Response object
+     * @param \Exception             $exception The caught Exception object
+     *
+     * @return ResponseInterface
+     * @throws UnexpectedValueException
+     */
+    public function __invoke(ServerRequestInterface $request, ResponseInterface $response, \Exception $exception)
+    {
+        $contentType = $this->determineContentType($request);
+        switch ($contentType) {
+            case 'application/json':
+                $output = $this->renderJsonErrorMessage($exception);
+                break;
+
+            case 'text/xml':
+            case 'application/xml':
+                $output = $this->renderXmlErrorMessage($exception);
+                break;
+
+            case 'text/html':
+                $output = $this->renderHtmlErrorMessage($exception);
+                break;
+
+            default:
+                throw new UnexpectedValueException('Cannot render unknown content type ' . $contentType);
+        }
+
+        $this->writeToErrorLog($exception);
+
+        $body = new Body(fopen('php://temp', 'r+'));
+        $body->write($output);
+
+        return $response
+                ->withStatus(500)
+                ->withHeader('Content-type', $contentType)
+                ->withBody($body);
+    }
+
+    /**
+     * Render HTML error page
+     *
+     * @param  \Exception $exception
+     *
+     * @return string
+     */
+    protected function renderHtmlErrorMessage(\Exception $exception)
+    {
+        $title = 'Slim Application Error';
+
+        if ($this->displayErrorDetails) {
+            $html = '<p>The application could not run because of the following error:</p>';
+            $html .= '<h2>Details</h2>';
+            $html .= $this->renderHtmlException($exception);
+
+            while ($exception = $exception->getPrevious()) {
+                $html .= '<h2>Previous exception</h2>';
+                $html .= $this->renderHtmlExceptionOrError($exception);
+            }
+        } else {
+            $html = '<p>A website error has occurred. Sorry for the temporary inconvenience.</p>';
+        }
+
+        $output = sprintf(
+            "<html><head><meta http-equiv='Content-Type' content='text/html; charset=utf-8'>" .
+            "<title>%s</title><style>body{margin:0;padding:30px;font:12px/1.5 Helvetica,Arial,Verdana," .
+            "sans-serif;}h1{margin:0;font-size:48px;font-weight:normal;line-height:48px;}strong{" .
+            "display:inline-block;width:65px;}</style></head><body><h1>%s</h1>%s</body></html>",
+            $title,
+            $title,
+            $html
+        );
+
+        return $output;
+    }
+
+    /**
+     * Render exception as HTML.
+     *
+     * Provided for backwards compatibility; use renderHtmlExceptionOrError().
+     *
+     * @param \Exception $exception
+     *
+     * @return string
+     */
+    protected function renderHtmlException(\Exception $exception)
+    {
+        return $this->renderHtmlExceptionOrError($exception);
+    }
+
+    /**
+     * Render exception or error as HTML.
+     *
+     * @param \Exception|\Error $exception
+     *
+     * @return string
+     */
+    protected function renderHtmlExceptionOrError($exception)
+    {
+        if (!$exception instanceof \Exception && !$exception instanceof \Error) {
+            throw new \RuntimeException("Unexpected type. Expected Exception or Error.");
+        }
+
+        $html = sprintf('<div><strong>Type:</strong> %s</div>', get_class($exception));
+
+        if (($code = $exception->getCode())) {
+            $html .= sprintf('<div><strong>Code:</strong> %s</div>', $code);
+        }
+
+        if (($message = $exception->getMessage())) {
+            $html .= sprintf('<div><strong>Message:</strong> %s</div>', htmlentities($message));
+        }
+
+        if (($file = $exception->getFile())) {
+            $html .= sprintf('<div><strong>File:</strong> %s</div>', $file);
+        }
+
+        if (($line = $exception->getLine())) {
+            $html .= sprintf('<div><strong>Line:</strong> %s</div>', $line);
+        }
+
+        if (($trace = $exception->getTraceAsString())) {
+            $html .= '<h2>Trace</h2>';
+            $html .= sprintf('<pre>%s</pre>', htmlentities($trace));
+        }
+
+        return $html;
+    }
+
+    /**
+     * Render JSON error
+     *
+     * @param \Exception $exception
+     *
+     * @return string
+     */
+    protected function renderJsonErrorMessage(\Exception $exception)
+    {
+        $error = [
+            'message' => 'Slim Application Error',
+        ];
+
+        if ($this->displayErrorDetails) {
+            $error['exception'] = [];
+
+            do {
+                $error['exception'][] = [
+                    'type' => get_class($exception),
+                    'code' => $exception->getCode(),
+                    'message' => $exception->getMessage(),
+                    'file' => $exception->getFile(),
+                    'line' => $exception->getLine(),
+                    'trace' => explode("\n", $exception->getTraceAsString()),
+                ];
+            } while ($exception = $exception->getPrevious());
+        }
+
+        return json_encode($error, JSON_PRETTY_PRINT);
+    }
+
+    /**
+     * Render XML error
+     *
+     * @param \Exception $exception
+     *
+     * @return string
+     */
+    protected function renderXmlErrorMessage(\Exception $exception)
+    {
+        $xml = "<error>\n  <message>Slim Application Error</message>\n";
+        if ($this->displayErrorDetails) {
+            do {
+                $xml .= "  <exception>\n";
+                $xml .= "    <type>" . get_class($exception) . "</type>\n";
+                $xml .= "    <code>" . $exception->getCode() . "</code>\n";
+                $xml .= "    <message>" . $this->createCdataSection($exception->getMessage()) . "</message>\n";
+                $xml .= "    <file>" . $exception->getFile() . "</file>\n";
+                $xml .= "    <line>" . $exception->getLine() . "</line>\n";
+                $xml .= "    <trace>" . $this->createCdataSection($exception->getTraceAsString()) . "</trace>\n";
+                $xml .= "  </exception>\n";
+            } while ($exception = $exception->getPrevious());
+        }
+        $xml .= "</error>";
+
+        return $xml;
+    }
+
+    /**
+     * Returns a CDATA section with the given content.
+     *
+     * @param  string $content
+     * @return string
+     */
+    private function createCdataSection($content)
+    {
+        return sprintf('<![CDATA[%s]]>', str_replace(']]>', ']]]]><![CDATA[>', $content));
+    }
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Handlers/ErrorHandler.php b/advancedcontentfilter/vendor/slim/slim/Slim/Handlers/ErrorHandler.php
deleted file mode 100644
index f9606e36..00000000
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Handlers/ErrorHandler.php
+++ /dev/null
@@ -1,308 +0,0 @@
-<?php
-
-/**
- * Slim Framework (https://slimframework.com)
- *
- * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
- */
-
-declare(strict_types=1);
-
-namespace Slim\Handlers;
-
-use Psr\Http\Message\ResponseFactoryInterface;
-use Psr\Http\Message\ResponseInterface;
-use Psr\Http\Message\ServerRequestInterface;
-use Psr\Log\LoggerInterface;
-use RuntimeException;
-use Slim\Error\Renderers\HtmlErrorRenderer;
-use Slim\Error\Renderers\JsonErrorRenderer;
-use Slim\Error\Renderers\PlainTextErrorRenderer;
-use Slim\Error\Renderers\XmlErrorRenderer;
-use Slim\Exception\HttpException;
-use Slim\Exception\HttpMethodNotAllowedException;
-use Slim\Interfaces\CallableResolverInterface;
-use Slim\Interfaces\ErrorHandlerInterface;
-use Slim\Interfaces\ErrorRendererInterface;
-use Slim\Logger;
-use Throwable;
-
-use function array_intersect;
-use function array_key_exists;
-use function array_keys;
-use function call_user_func;
-use function count;
-use function current;
-use function explode;
-use function implode;
-use function next;
-use function preg_match;
-
-/**
- * Default Slim application error handler
- *
- * It outputs the error message and diagnostic information in one of the following formats:
- * JSON, XML, Plain Text or HTML based on the Accept header.
- */
-class ErrorHandler implements ErrorHandlerInterface
-{
-    protected string $defaultErrorRendererContentType = 'text/html';
-
-    /**
-     * @var ErrorRendererInterface|string|callable
-     */
-    protected $defaultErrorRenderer = HtmlErrorRenderer::class;
-
-    /**
-     * @var ErrorRendererInterface|string|callable
-     */
-    protected $logErrorRenderer = PlainTextErrorRenderer::class;
-
-    /**
-     * @var array<string|callable>
-     */
-    protected array $errorRenderers = [
-        'application/json' => JsonErrorRenderer::class,
-        'application/xml' => XmlErrorRenderer::class,
-        'text/xml' => XmlErrorRenderer::class,
-        'text/html' => HtmlErrorRenderer::class,
-        'text/plain' => PlainTextErrorRenderer::class,
-    ];
-
-    protected bool $displayErrorDetails = false;
-
-    protected bool $logErrors;
-
-    protected bool $logErrorDetails = false;
-
-    protected ?string $contentType = null;
-
-    protected ?string $method = null;
-
-    protected ServerRequestInterface $request;
-
-    protected Throwable $exception;
-
-    protected int $statusCode;
-
-    protected CallableResolverInterface $callableResolver;
-
-    protected ResponseFactoryInterface $responseFactory;
-
-    protected LoggerInterface $logger;
-
-    public function __construct(
-        CallableResolverInterface $callableResolver,
-        ResponseFactoryInterface $responseFactory,
-        ?LoggerInterface $logger = null
-    ) {
-        $this->callableResolver = $callableResolver;
-        $this->responseFactory = $responseFactory;
-        $this->logger = $logger ?: $this->getDefaultLogger();
-    }
-
-    /**
-     * Invoke error handler
-     *
-     * @param ServerRequestInterface $request             The most recent Request object
-     * @param Throwable              $exception           The caught Exception object
-     * @param bool                   $displayErrorDetails Whether or not to display the error details
-     * @param bool                   $logErrors           Whether or not to log errors
-     * @param bool                   $logErrorDetails     Whether or not to log error details
-     */
-    public function __invoke(
-        ServerRequestInterface $request,
-        Throwable $exception,
-        bool $displayErrorDetails,
-        bool $logErrors,
-        bool $logErrorDetails
-    ): ResponseInterface {
-        $this->displayErrorDetails = $displayErrorDetails;
-        $this->logErrors = $logErrors;
-        $this->logErrorDetails = $logErrorDetails;
-        $this->request = $request;
-        $this->exception = $exception;
-        $this->method = $request->getMethod();
-        $this->statusCode = $this->determineStatusCode();
-        if ($this->contentType === null) {
-            $this->contentType = $this->determineContentType($request);
-        }
-
-        if ($logErrors) {
-            $this->writeToErrorLog();
-        }
-
-        return $this->respond();
-    }
-
-    /**
-     * Force the content type for all error handler responses.
-     *
-     * @param string|null $contentType The content type
-     */
-    public function forceContentType(?string $contentType): void
-    {
-        $this->contentType = $contentType;
-    }
-
-    protected function determineStatusCode(): int
-    {
-        if ($this->method === 'OPTIONS') {
-            return 200;
-        }
-
-        if ($this->exception instanceof HttpException) {
-            return $this->exception->getCode();
-        }
-
-        return 500;
-    }
-
-    /**
-     * Determine which content type we know about is wanted using Accept header
-     *
-     * Note: This method is a bare-bones implementation designed specifically for
-     * Slim's error handling requirements. Consider a fully-feature solution such
-     * as willdurand/negotiation for any other situation.
-     */
-    protected function determineContentType(ServerRequestInterface $request): ?string
-    {
-        $acceptHeader = $request->getHeaderLine('Accept');
-        $selectedContentTypes = array_intersect(
-            explode(',', $acceptHeader),
-            array_keys($this->errorRenderers)
-        );
-        $count = count($selectedContentTypes);
-
-        if ($count) {
-            $current = current($selectedContentTypes);
-
-            /**
-             * Ensure other supported content types take precedence over text/plain
-             * when multiple content types are provided via Accept header.
-             */
-            if ($current === 'text/plain' && $count > 1) {
-                $next = next($selectedContentTypes);
-                if (is_string($next)) {
-                    return $next;
-                }
-            }
-
-            if (is_string($current)) {
-                return $current;
-            }
-        }
-
-        if (preg_match('/\+(json|xml)/', $acceptHeader, $matches)) {
-            $mediaType = 'application/' . $matches[1];
-            if (array_key_exists($mediaType, $this->errorRenderers)) {
-                return $mediaType;
-            }
-        }
-
-        return null;
-    }
-
-    /**
-     * Determine which renderer to use based on content type
-     *
-     * @throws RuntimeException
-     */
-    protected function determineRenderer(): callable
-    {
-        if ($this->contentType !== null && array_key_exists($this->contentType, $this->errorRenderers)) {
-            $renderer = $this->errorRenderers[$this->contentType];
-        } else {
-            $renderer = $this->defaultErrorRenderer;
-        }
-
-        return $this->callableResolver->resolve($renderer);
-    }
-
-    /**
-     * Register an error renderer for a specific content-type
-     *
-     * @param string  $contentType  The content-type this renderer should be registered to
-     * @param ErrorRendererInterface|string|callable $errorRenderer The error renderer
-     */
-    public function registerErrorRenderer(string $contentType, $errorRenderer): void
-    {
-        $this->errorRenderers[$contentType] = $errorRenderer;
-    }
-
-    /**
-     * Set the default error renderer
-     *
-     * @param string                                 $contentType   The content type of the default error renderer
-     * @param ErrorRendererInterface|string|callable $errorRenderer The default error renderer
-     */
-    public function setDefaultErrorRenderer(string $contentType, $errorRenderer): void
-    {
-        $this->defaultErrorRendererContentType = $contentType;
-        $this->defaultErrorRenderer = $errorRenderer;
-    }
-
-    /**
-     * Set the renderer for the error logger
-     *
-     * @param ErrorRendererInterface|string|callable $logErrorRenderer
-     */
-    public function setLogErrorRenderer($logErrorRenderer): void
-    {
-        $this->logErrorRenderer = $logErrorRenderer;
-    }
-
-    /**
-     * Write to the error log if $logErrors has been set to true
-     */
-    protected function writeToErrorLog(): void
-    {
-        $renderer = $this->callableResolver->resolve($this->logErrorRenderer);
-        $error = $renderer($this->exception, $this->logErrorDetails);
-        if (!$this->displayErrorDetails) {
-            $error .= "\nTips: To display error details in HTTP response ";
-            $error .= 'set "displayErrorDetails" to true in the ErrorHandler constructor.';
-        }
-        $this->logError($error);
-    }
-
-    /**
-     * Wraps the error_log function so that this can be easily tested
-     */
-    protected function logError(string $error): void
-    {
-        $this->logger->error($error);
-    }
-
-    /**
-     * Returns a default logger implementation.
-     */
-    protected function getDefaultLogger(): LoggerInterface
-    {
-        return new Logger();
-    }
-
-    protected function respond(): ResponseInterface
-    {
-        $response = $this->responseFactory->createResponse($this->statusCode);
-        if ($this->contentType !== null && array_key_exists($this->contentType, $this->errorRenderers)) {
-            $response = $response->withHeader('Content-type', $this->contentType);
-        } else {
-            $response = $response->withHeader('Content-type', $this->defaultErrorRendererContentType);
-        }
-
-        if ($this->exception instanceof HttpMethodNotAllowedException) {
-            $allowedMethods = implode(', ', $this->exception->getAllowedMethods());
-            $response = $response->withHeader('Allow', $allowedMethods);
-        }
-
-        $renderer = $this->determineRenderer();
-        $body = call_user_func($renderer, $this->exception, $this->displayErrorDetails);
-        if ($body !== false) {
-            /** @var string $body */
-            $response->getBody()->write($body);
-        }
-
-        return $response;
-    }
-}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Handlers/NotAllowed.php b/advancedcontentfilter/vendor/slim/slim/Slim/Handlers/NotAllowed.php
new file mode 100644
index 00000000..345f0ff8
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Handlers/NotAllowed.php
@@ -0,0 +1,147 @@
+<?php
+/**
+ * Slim Framework (https://slimframework.com)
+ *
+ * @link      https://github.com/slimphp/Slim
+ * @copyright Copyright (c) 2011-2017 Josh Lockhart
+ * @license   https://github.com/slimphp/Slim/blob/3.x/LICENSE.md (MIT License)
+ */
+namespace Slim\Handlers;
+
+use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Message\ResponseInterface;
+use Slim\Http\Body;
+use UnexpectedValueException;
+
+/**
+ * Default Slim application not allowed handler
+ *
+ * It outputs a simple message in either JSON, XML or HTML based on the
+ * Accept header.
+ */
+class NotAllowed extends AbstractHandler
+{
+    /**
+     * Invoke error handler
+     *
+     * @param  ServerRequestInterface $request  The most recent Request object
+     * @param  ResponseInterface      $response The most recent Response object
+     * @param  string[]               $methods  Allowed HTTP methods
+     *
+     * @return ResponseInterface
+     * @throws UnexpectedValueException
+     */
+    public function __invoke(ServerRequestInterface $request, ResponseInterface $response, array $methods)
+    {
+        if ($request->getMethod() === 'OPTIONS') {
+            $status = 200;
+            $contentType = 'text/plain';
+            $output = $this->renderPlainOptionsMessage($methods);
+        } else {
+            $status = 405;
+            $contentType = $this->determineContentType($request);
+            switch ($contentType) {
+                case 'application/json':
+                    $output = $this->renderJsonNotAllowedMessage($methods);
+                    break;
+
+                case 'text/xml':
+                case 'application/xml':
+                    $output = $this->renderXmlNotAllowedMessage($methods);
+                    break;
+
+                case 'text/html':
+                    $output = $this->renderHtmlNotAllowedMessage($methods);
+                    break;
+                default:
+                    throw new UnexpectedValueException('Cannot render unknown content type ' . $contentType);
+            }
+        }
+
+        $body = new Body(fopen('php://temp', 'r+'));
+        $body->write($output);
+        $allow = implode(', ', $methods);
+
+        return $response
+                ->withStatus($status)
+                ->withHeader('Content-type', $contentType)
+                ->withHeader('Allow', $allow)
+                ->withBody($body);
+    }
+
+    /**
+     * Render PLAIN message for OPTIONS response
+     *
+     * @param  array                  $methods
+     * @return string
+     */
+    protected function renderPlainOptionsMessage($methods)
+    {
+        $allow = implode(', ', $methods);
+
+        return 'Allowed methods: ' . $allow;
+    }
+
+    /**
+     * Render JSON not allowed message
+     *
+     * @param  array                  $methods
+     * @return string
+     */
+    protected function renderJsonNotAllowedMessage($methods)
+    {
+        $allow = implode(', ', $methods);
+
+        return '{"message":"Method not allowed. Must be one of: ' . $allow . '"}';
+    }
+
+    /**
+     * Render XML not allowed message
+     *
+     * @param  array                  $methods
+     * @return string
+     */
+    protected function renderXmlNotAllowedMessage($methods)
+    {
+        $allow = implode(', ', $methods);
+
+        return "<root><message>Method not allowed. Must be one of: $allow</message></root>";
+    }
+
+    /**
+     * Render HTML not allowed message
+     *
+     * @param  array                  $methods
+     * @return string
+     */
+    protected function renderHtmlNotAllowedMessage($methods)
+    {
+        $allow = implode(', ', $methods);
+        $output = <<<END
+<html>
+    <head>
+        <title>Method not allowed</title>
+        <style>
+            body{
+                margin:0;
+                padding:30px;
+                font:12px/1.5 Helvetica,Arial,Verdana,sans-serif;
+            }
+            h1{
+                margin:0;
+                font-size:48px;
+                font-weight:normal;
+                line-height:48px;
+            }
+        </style>
+    </head>
+    <body>
+        <h1>Method not allowed</h1>
+        <p>Method not allowed. Must be one of: <strong>$allow</strong></p>
+    </body>
+</html>
+END;
+
+        return $output;
+    }
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Handlers/NotFound.php b/advancedcontentfilter/vendor/slim/slim/Slim/Handlers/NotFound.php
new file mode 100644
index 00000000..b3330321
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Handlers/NotFound.php
@@ -0,0 +1,141 @@
+<?php
+/**
+ * Slim Framework (https://slimframework.com)
+ *
+ * @link      https://github.com/slimphp/Slim
+ * @copyright Copyright (c) 2011-2017 Josh Lockhart
+ * @license   https://github.com/slimphp/Slim/blob/3.x/LICENSE.md (MIT License)
+ */
+namespace Slim\Handlers;
+
+use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Message\ResponseInterface;
+use Slim\Http\Body;
+use UnexpectedValueException;
+
+/**
+ * Default Slim application not found handler.
+ *
+ * It outputs a simple message in either JSON, XML or HTML based on the
+ * Accept header.
+ */
+class NotFound extends AbstractHandler
+{
+    /**
+     * Invoke not found handler
+     *
+     * @param  ServerRequestInterface $request  The most recent Request object
+     * @param  ResponseInterface      $response The most recent Response object
+     *
+     * @return ResponseInterface
+     * @throws UnexpectedValueException
+     */
+    public function __invoke(ServerRequestInterface $request, ResponseInterface $response)
+    {
+        if ($request->getMethod() === 'OPTIONS') {
+            $contentType = 'text/plain';
+            $output = $this->renderPlainNotFoundOutput();
+        } else {
+            $contentType = $this->determineContentType($request);
+            switch ($contentType) {
+                case 'application/json':
+                    $output = $this->renderJsonNotFoundOutput();
+                    break;
+
+                case 'text/xml':
+                case 'application/xml':
+                    $output = $this->renderXmlNotFoundOutput();
+                    break;
+
+                case 'text/html':
+                    $output = $this->renderHtmlNotFoundOutput($request);
+                    break;
+
+                default:
+                    throw new UnexpectedValueException('Cannot render unknown content type ' . $contentType);
+            }
+        }
+
+        $body = new Body(fopen('php://temp', 'r+'));
+        $body->write($output);
+
+        return $response->withStatus(404)
+                        ->withHeader('Content-Type', $contentType)
+                        ->withBody($body);
+    }
+
+    /**
+     * Render plain not found message
+     *
+     * @return ResponseInterface
+     */
+    protected function renderPlainNotFoundOutput()
+    {
+        return 'Not found';
+    }
+
+    /**
+     * Return a response for application/json content not found
+     *
+     * @return ResponseInterface
+     */
+    protected function renderJsonNotFoundOutput()
+    {
+        return '{"message":"Not found"}';
+    }
+
+    /**
+     * Return a response for xml content not found
+     *
+     * @return ResponseInterface
+     */
+    protected function renderXmlNotFoundOutput()
+    {
+        return '<root><message>Not found</message></root>';
+    }
+
+    /**
+     * Return a response for text/html content not found
+     *
+     * @param  ServerRequestInterface $request  The most recent Request object
+     *
+     * @return ResponseInterface
+     */
+    protected function renderHtmlNotFoundOutput(ServerRequestInterface $request)
+    {
+        $homeUrl = (string)($request->getUri()->withPath('')->withQuery('')->withFragment(''));
+        return <<<END
+<html>
+    <head>
+        <title>Page Not Found</title>
+        <style>
+            body{
+                margin:0;
+                padding:30px;
+                font:12px/1.5 Helvetica,Arial,Verdana,sans-serif;
+            }
+            h1{
+                margin:0;
+                font-size:48px;
+                font-weight:normal;
+                line-height:48px;
+            }
+            strong{
+                display:inline-block;
+                width:65px;
+            }
+        </style>
+    </head>
+    <body>
+        <h1>Page Not Found</h1>
+        <p>
+            The page you are looking for could not be found. Check the address bar
+            to ensure your URL is spelled correctly. If all else fails, you can
+            visit our home page at the link below.
+        </p>
+        <a href='$homeUrl'>Visit the Home Page</a>
+    </body>
+</html>
+END;
+    }
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Handlers/PhpError.php b/advancedcontentfilter/vendor/slim/slim/Slim/Handlers/PhpError.php
new file mode 100644
index 00000000..3ecce30c
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Handlers/PhpError.php
@@ -0,0 +1,205 @@
+<?php
+/**
+ * Slim Framework (https://slimframework.com)
+ *
+ * @link      https://github.com/slimphp/Slim
+ * @copyright Copyright (c) 2011-2017 Josh Lockhart
+ * @license   https://github.com/slimphp/Slim/blob/3.x/LICENSE.md (MIT License)
+ */
+namespace Slim\Handlers;
+
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\ServerRequestInterface;
+use Slim\Http\Body;
+use UnexpectedValueException;
+
+/**
+ * Default Slim application error handler for PHP 7+ Throwables
+ *
+ * It outputs the error message and diagnostic information in either JSON, XML,
+ * or HTML based on the Accept header.
+ */
+class PhpError extends AbstractError
+{
+    /**
+     * Invoke error handler
+     *
+     * @param ServerRequestInterface $request   The most recent Request object
+     * @param ResponseInterface      $response  The most recent Response object
+     * @param \Throwable             $error     The caught Throwable object
+     *
+     * @return ResponseInterface
+     * @throws UnexpectedValueException
+     */
+    public function __invoke(ServerRequestInterface $request, ResponseInterface $response, \Throwable $error)
+    {
+        $contentType = $this->determineContentType($request);
+        switch ($contentType) {
+            case 'application/json':
+                $output = $this->renderJsonErrorMessage($error);
+                break;
+
+            case 'text/xml':
+            case 'application/xml':
+                $output = $this->renderXmlErrorMessage($error);
+                break;
+
+            case 'text/html':
+                $output = $this->renderHtmlErrorMessage($error);
+                break;
+            default:
+                throw new UnexpectedValueException('Cannot render unknown content type ' . $contentType);
+        }
+
+        $this->writeToErrorLog($error);
+
+        $body = new Body(fopen('php://temp', 'r+'));
+        $body->write($output);
+
+        return $response
+                ->withStatus(500)
+                ->withHeader('Content-type', $contentType)
+                ->withBody($body);
+    }
+
+    /**
+     * Render HTML error page
+     *
+     * @param \Throwable $error
+     *
+     * @return string
+     */
+    protected function renderHtmlErrorMessage(\Throwable $error)
+    {
+        $title = 'Slim Application Error';
+
+        if ($this->displayErrorDetails) {
+            $html = '<p>The application could not run because of the following error:</p>';
+            $html .= '<h2>Details</h2>';
+            $html .= $this->renderHtmlError($error);
+
+            while ($error = $error->getPrevious()) {
+                $html .= '<h2>Previous error</h2>';
+                $html .= $this->renderHtmlError($error);
+            }
+        } else {
+            $html = '<p>A website error has occurred. Sorry for the temporary inconvenience.</p>';
+        }
+
+        $output = sprintf(
+            "<html><head><meta http-equiv='Content-Type' content='text/html; charset=utf-8'>" .
+            "<title>%s</title><style>body{margin:0;padding:30px;font:12px/1.5 Helvetica,Arial,Verdana," .
+            "sans-serif;}h1{margin:0;font-size:48px;font-weight:normal;line-height:48px;}strong{" .
+            "display:inline-block;width:65px;}</style></head><body><h1>%s</h1>%s</body></html>",
+            $title,
+            $title,
+            $html
+        );
+
+        return $output;
+    }
+
+    /**
+     * Render error as HTML.
+     *
+     * @param \Throwable $error
+     *
+     * @return string
+     */
+    protected function renderHtmlError(\Throwable $error)
+    {
+        $html = sprintf('<div><strong>Type:</strong> %s</div>', get_class($error));
+
+        if (($code = $error->getCode())) {
+            $html .= sprintf('<div><strong>Code:</strong> %s</div>', $code);
+        }
+
+        if (($message = $error->getMessage())) {
+            $html .= sprintf('<div><strong>Message:</strong> %s</div>', htmlentities($message));
+        }
+
+        if (($file = $error->getFile())) {
+            $html .= sprintf('<div><strong>File:</strong> %s</div>', $file);
+        }
+
+        if (($line = $error->getLine())) {
+            $html .= sprintf('<div><strong>Line:</strong> %s</div>', $line);
+        }
+
+        if (($trace = $error->getTraceAsString())) {
+            $html .= '<h2>Trace</h2>';
+            $html .= sprintf('<pre>%s</pre>', htmlentities($trace));
+        }
+
+        return $html;
+    }
+
+    /**
+     * Render JSON error
+     *
+     * @param \Throwable $error
+     *
+     * @return string
+     */
+    protected function renderJsonErrorMessage(\Throwable $error)
+    {
+        $json = [
+            'message' => 'Slim Application Error',
+        ];
+
+        if ($this->displayErrorDetails) {
+            $json['error'] = [];
+
+            do {
+                $json['error'][] = [
+                    'type' => get_class($error),
+                    'code' => $error->getCode(),
+                    'message' => $error->getMessage(),
+                    'file' => $error->getFile(),
+                    'line' => $error->getLine(),
+                    'trace' => explode("\n", $error->getTraceAsString()),
+                ];
+            } while ($error = $error->getPrevious());
+        }
+
+        return json_encode($json, JSON_PRETTY_PRINT);
+    }
+
+    /**
+     * Render XML error
+     *
+     * @param \Throwable $error
+     *
+     * @return string
+     */
+    protected function renderXmlErrorMessage(\Throwable $error)
+    {
+        $xml = "<error>\n  <message>Slim Application Error</message>\n";
+        if ($this->displayErrorDetails) {
+            do {
+                $xml .= "  <error>\n";
+                $xml .= "    <type>" . get_class($error) . "</type>\n";
+                $xml .= "    <code>" . $error->getCode() . "</code>\n";
+                $xml .= "    <message>" . $this->createCdataSection($error->getMessage()) . "</message>\n";
+                $xml .= "    <file>" . $error->getFile() . "</file>\n";
+                $xml .= "    <line>" . $error->getLine() . "</line>\n";
+                $xml .= "    <trace>" . $this->createCdataSection($error->getTraceAsString()) . "</trace>\n";
+                $xml .= "  </error>\n";
+            } while ($error = $error->getPrevious());
+        }
+        $xml .= "</error>";
+
+        return $xml;
+    }
+
+    /**
+     * Returns a CDATA section with the given content.
+     *
+     * @param  string $content
+     * @return string
+     */
+    private function createCdataSection($content)
+    {
+        return sprintf('<![CDATA[%s]]>', str_replace(']]>', ']]]]><![CDATA[>', $content));
+    }
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Handlers/Strategies/RequestHandler.php b/advancedcontentfilter/vendor/slim/slim/Slim/Handlers/Strategies/RequestHandler.php
deleted file mode 100644
index ea88a5f1..00000000
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Handlers/Strategies/RequestHandler.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-/**
- * Slim Framework (https://slimframework.com)
- *
- * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
- */
-
-declare(strict_types=1);
-
-namespace Slim\Handlers\Strategies;
-
-use Psr\Http\Message\ResponseInterface;
-use Psr\Http\Message\ServerRequestInterface;
-use Slim\Interfaces\RequestHandlerInvocationStrategyInterface;
-
-/**
- * PSR-15 RequestHandler invocation strategy
- */
-class RequestHandler implements RequestHandlerInvocationStrategyInterface
-{
-    protected bool $appendRouteArgumentsToRequestAttributes;
-
-    public function __construct(bool $appendRouteArgumentsToRequestAttributes = false)
-    {
-        $this->appendRouteArgumentsToRequestAttributes = $appendRouteArgumentsToRequestAttributes;
-    }
-
-    /**
-     * Invoke a route callable that implements RequestHandlerInterface
-     *
-     * @param array<string, string>  $routeArguments
-     */
-    public function __invoke(
-        callable $callable,
-        ServerRequestInterface $request,
-        ResponseInterface $response,
-        array $routeArguments
-    ): ResponseInterface {
-        if ($this->appendRouteArgumentsToRequestAttributes) {
-            foreach ($routeArguments as $k => $v) {
-                $request = $request->withAttribute($k, $v);
-            }
-        }
-
-        return $callable($request);
-    }
-}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Handlers/Strategies/RequestResponse.php b/advancedcontentfilter/vendor/slim/slim/Slim/Handlers/Strategies/RequestResponse.php
index 45b2c05a..ad99b56e 100644
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Handlers/Strategies/RequestResponse.php
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Handlers/Strategies/RequestResponse.php
@@ -1,13 +1,11 @@
 <?php
-
 /**
  * Slim Framework (https://slimframework.com)
  *
- * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
+ * @link      https://github.com/slimphp/Slim
+ * @copyright Copyright (c) 2011-2017 Josh Lockhart
+ * @license   https://github.com/slimphp/Slim/blob/3.x/LICENSE.md (MIT License)
  */
-
-declare(strict_types=1);
-
 namespace Slim\Handlers\Strategies;
 
 use Psr\Http\Message\ResponseInterface;
@@ -23,18 +21,23 @@ class RequestResponse implements InvocationStrategyInterface
      * Invoke a route callable with request, response, and all route parameters
      * as an array of arguments.
      *
-     * @param array<string, string>  $routeArguments
+     * @param array|callable         $callable
+     * @param ServerRequestInterface $request
+     * @param ResponseInterface      $response
+     * @param array                  $routeArguments
+     *
+     * @return mixed
      */
     public function __invoke(
         callable $callable,
         ServerRequestInterface $request,
         ResponseInterface $response,
         array $routeArguments
-    ): ResponseInterface {
+    ) {
         foreach ($routeArguments as $k => $v) {
             $request = $request->withAttribute($k, $v);
         }
 
-        return $callable($request, $response, $routeArguments);
+        return call_user_func($callable, $request, $response, $routeArguments);
     }
 }
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Handlers/Strategies/RequestResponseArgs.php b/advancedcontentfilter/vendor/slim/slim/Slim/Handlers/Strategies/RequestResponseArgs.php
index c4ab16df..739cc7ee 100644
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Handlers/Strategies/RequestResponseArgs.php
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Handlers/Strategies/RequestResponseArgs.php
@@ -1,38 +1,42 @@
 <?php
-
 /**
  * Slim Framework (https://slimframework.com)
  *
- * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
+ * @link      https://github.com/slimphp/Slim
+ * @copyright Copyright (c) 2011-2017 Josh Lockhart
+ * @license   https://github.com/slimphp/Slim/blob/3.x/LICENSE.md (MIT License)
  */
-
-declare(strict_types=1);
-
 namespace Slim\Handlers\Strategies;
 
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Slim\Interfaces\InvocationStrategyInterface;
 
-use function array_values;
-
 /**
  * Route callback strategy with route parameters as individual arguments.
  */
 class RequestResponseArgs implements InvocationStrategyInterface
 {
+
     /**
      * Invoke a route callable with request, response and all route parameters
      * as individual arguments.
      *
-     * @param array<string, string>  $routeArguments
+     * @param array|callable         $callable
+     * @param ServerRequestInterface $request
+     * @param ResponseInterface      $response
+     * @param array                  $routeArguments
+     *
+     * @return mixed
      */
     public function __invoke(
         callable $callable,
         ServerRequestInterface $request,
         ResponseInterface $response,
         array $routeArguments
-    ): ResponseInterface {
-        return $callable($request, $response, ...array_values($routeArguments));
+    ) {
+        array_unshift($routeArguments, $request, $response);
+
+        return call_user_func_array($callable, $routeArguments);
     }
 }
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Handlers/Strategies/RequestResponseNamedArgs.php b/advancedcontentfilter/vendor/slim/slim/Slim/Handlers/Strategies/RequestResponseNamedArgs.php
deleted file mode 100644
index 651111dd..00000000
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Handlers/Strategies/RequestResponseNamedArgs.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-/**
- * Slim Framework (https://slimframework.com)
- *
- * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
- */
-
-declare(strict_types=1);
-
-namespace Slim\Handlers\Strategies;
-
-use Psr\Http\Message\ResponseInterface;
-use Psr\Http\Message\ServerRequestInterface;
-use Slim\Interfaces\InvocationStrategyInterface;
-use RuntimeException;
-
-/**
- * Route callback strategy with route parameters as individual arguments.
- */
-class RequestResponseNamedArgs implements InvocationStrategyInterface
-{
-    public function __construct()
-    {
-        if (PHP_VERSION_ID < 80000) {
-            throw new RuntimeException('Named arguments are only available for PHP >= 8.0.0');
-        }
-    }
-
-    /**
-     * Invoke a route callable with request, response and all route parameters
-     * as individual arguments.
-     *
-     * @param array<string, string>  $routeArguments
-     */
-    public function __invoke(
-        callable $callable,
-        ServerRequestInterface $request,
-        ResponseInterface $response,
-        array $routeArguments
-    ): ResponseInterface {
-        return $callable($request, $response, ...$routeArguments);
-    }
-}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Http/Body.php b/advancedcontentfilter/vendor/slim/slim/Slim/Http/Body.php
new file mode 100644
index 00000000..7a7b4df8
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Http/Body.php
@@ -0,0 +1,22 @@
+<?php
+/**
+ * Slim Framework (https://slimframework.com)
+ *
+ * @link      https://github.com/slimphp/Slim
+ * @copyright Copyright (c) 2011-2017 Josh Lockhart
+ * @license   https://github.com/slimphp/Slim/blob/3.x/LICENSE.md (MIT License)
+ */
+namespace Slim\Http;
+
+/**
+ * Body
+ *
+ * This class represents an HTTP message body and encapsulates a
+ * streamable resource according to the PSR-7 standard.
+ *
+ * @link https://github.com/php-fig/http-message/blob/master/src/StreamInterface.php
+ */
+class Body extends Stream
+{
+
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Http/Cookies.php b/advancedcontentfilter/vendor/slim/slim/Slim/Http/Cookies.php
new file mode 100644
index 00000000..c07c96f2
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Http/Cookies.php
@@ -0,0 +1,195 @@
+<?php
+/**
+ * Slim Framework (https://slimframework.com)
+ *
+ * @link      https://github.com/slimphp/Slim
+ * @copyright Copyright (c) 2011-2017 Josh Lockhart
+ * @license   https://github.com/slimphp/Slim/blob/3.x/LICENSE.md (MIT License)
+ */
+namespace Slim\Http;
+
+use InvalidArgumentException;
+use Slim\Interfaces\Http\CookiesInterface;
+
+/**
+ * Cookie helper
+ */
+class Cookies implements CookiesInterface
+{
+    /**
+     * Cookies from HTTP request
+     *
+     * @var array
+     */
+    protected $requestCookies = [];
+
+    /**
+     * Cookies for HTTP response
+     *
+     * @var array
+     */
+    protected $responseCookies = [];
+
+    /**
+     * Default cookie properties
+     *
+     * @var array
+     */
+    protected $defaults = [
+        'value' => '',
+        'domain' => null,
+        'hostonly' => null,
+        'path' => null,
+        'expires' => null,
+        'secure' => false,
+        'httponly' => false
+    ];
+
+    /**
+     * Create new cookies helper
+     *
+     * @param array $cookies
+     */
+    public function __construct(array $cookies = [])
+    {
+        $this->requestCookies = $cookies;
+    }
+
+    /**
+     * Set default cookie properties
+     *
+     * @param array $settings
+     */
+    public function setDefaults(array $settings)
+    {
+        $this->defaults = array_replace($this->defaults, $settings);
+    }
+
+    /**
+     * Get request cookie
+     *
+     * @param  string $name    Cookie name
+     * @param  mixed  $default Cookie default value
+     *
+     * @return mixed Cookie value if present, else default
+     */
+    public function get($name, $default = null)
+    {
+        return isset($this->requestCookies[$name]) ? $this->requestCookies[$name] : $default;
+    }
+
+    /**
+     * Set response cookie
+     *
+     * @param string       $name  Cookie name
+     * @param string|array $value Cookie value, or cookie properties
+     */
+    public function set($name, $value)
+    {
+        if (!is_array($value)) {
+            $value = ['value' => (string)$value];
+        }
+        $this->responseCookies[$name] = array_replace($this->defaults, $value);
+    }
+
+    /**
+     * Convert to `Set-Cookie` headers
+     *
+     * @return string[]
+     */
+    public function toHeaders()
+    {
+        $headers = [];
+        foreach ($this->responseCookies as $name => $properties) {
+            $headers[] = $this->toHeader($name, $properties);
+        }
+
+        return $headers;
+    }
+
+    /**
+     * Convert to `Set-Cookie` header
+     *
+     * @param  string $name       Cookie name
+     * @param  array  $properties Cookie properties
+     *
+     * @return string
+     */
+    protected function toHeader($name, array $properties)
+    {
+        $result = urlencode($name) . '=' . urlencode($properties['value']);
+
+        if (isset($properties['domain'])) {
+            $result .= '; domain=' . $properties['domain'];
+        }
+
+        if (isset($properties['path'])) {
+            $result .= '; path=' . $properties['path'];
+        }
+
+        if (isset($properties['expires'])) {
+            if (is_string($properties['expires'])) {
+                $timestamp = strtotime($properties['expires']);
+            } else {
+                $timestamp = (int)$properties['expires'];
+            }
+            if ($timestamp !== 0) {
+                $result .= '; expires=' . gmdate('D, d-M-Y H:i:s e', $timestamp);
+            }
+        }
+
+        if (isset($properties['secure']) && $properties['secure']) {
+            $result .= '; secure';
+        }
+
+        if (isset($properties['hostonly']) && $properties['hostonly']) {
+            $result .= '; HostOnly';
+        }
+
+        if (isset($properties['httponly']) && $properties['httponly']) {
+            $result .= '; HttpOnly';
+        }
+
+        return $result;
+    }
+
+    /**
+     * Parse HTTP request `Cookie:` header and extract
+     * into a PHP associative array.
+     *
+     * @param  string $header The raw HTTP request `Cookie:` header
+     *
+     * @return array Associative array of cookie names and values
+     *
+     * @throws InvalidArgumentException if the cookie data cannot be parsed
+     */
+    public static function parseHeader($header)
+    {
+        if (is_array($header) === true) {
+            $header = isset($header[0]) ? $header[0] : '';
+        }
+
+        if (is_string($header) === false) {
+            throw new InvalidArgumentException('Cannot parse Cookie data. Header value must be a string.');
+        }
+
+        $header = rtrim($header, "\r\n");
+        $pieces = preg_split('@[;]\s*@', $header);
+        $cookies = [];
+
+        foreach ($pieces as $cookie) {
+            $cookie = explode('=', $cookie, 2);
+
+            if (count($cookie) === 2) {
+                $key = urldecode($cookie[0]);
+                $value = urldecode($cookie[1]);
+
+                if (!isset($cookies[$key])) {
+                    $cookies[$key] = $value;
+                }
+            }
+        }
+
+        return $cookies;
+    }
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Http/Environment.php b/advancedcontentfilter/vendor/slim/slim/Slim/Http/Environment.php
new file mode 100644
index 00000000..cd452fcf
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Http/Environment.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Slim Framework (https://slimframework.com)
+ *
+ * @link      https://github.com/slimphp/Slim
+ * @copyright Copyright (c) 2011-2017 Josh Lockhart
+ * @license   https://github.com/slimphp/Slim/blob/3.x/LICENSE.md (MIT License)
+ */
+namespace Slim\Http;
+
+use Slim\Collection;
+use Slim\Interfaces\Http\EnvironmentInterface;
+
+/**
+ * Environment
+ *
+ * This class decouples the Slim application from the global PHP environment.
+ * This is particularly useful for unit testing, but it also lets us create
+ * custom sub-requests.
+ */
+class Environment extends Collection implements EnvironmentInterface
+{
+    /**
+     * Create mock environment
+     *
+     * @param  array $userData Array of custom environment keys and values
+     *
+     * @return self
+     */
+    public static function mock(array $userData = [])
+    {
+        //Validates if default protocol is HTTPS to set default port 443
+        if ((isset($userData['HTTPS']) && $userData['HTTPS'] !== 'off') ||
+            ((isset($userData['REQUEST_SCHEME']) && $userData['REQUEST_SCHEME'] === 'https'))) {
+            $defscheme = 'https';
+            $defport = 443;
+        } else {
+            $defscheme = 'http';
+            $defport = 80;
+        }
+
+        $data = array_merge([
+            'SERVER_PROTOCOL'      => 'HTTP/1.1',
+            'REQUEST_METHOD'       => 'GET',
+            'REQUEST_SCHEME'       => $defscheme,
+            'SCRIPT_NAME'          => '',
+            'REQUEST_URI'          => '',
+            'QUERY_STRING'         => '',
+            'SERVER_NAME'          => 'localhost',
+            'SERVER_PORT'          => $defport,
+            'HTTP_HOST'            => 'localhost',
+            'HTTP_ACCEPT'          => 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8',
+            'HTTP_ACCEPT_LANGUAGE' => 'en-US,en;q=0.8',
+            'HTTP_ACCEPT_CHARSET'  => 'ISO-8859-1,utf-8;q=0.7,*;q=0.3',
+            'HTTP_USER_AGENT'      => 'Slim Framework',
+            'REMOTE_ADDR'          => '127.0.0.1',
+            'REQUEST_TIME'         => time(),
+            'REQUEST_TIME_FLOAT'   => microtime(true),
+        ], $userData);
+
+        return new static($data);
+    }
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Http/Headers.php b/advancedcontentfilter/vendor/slim/slim/Slim/Http/Headers.php
new file mode 100644
index 00000000..ef50f84b
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Http/Headers.php
@@ -0,0 +1,222 @@
+<?php
+/**
+ * Slim Framework (https://slimframework.com)
+ *
+ * @link      https://github.com/slimphp/Slim
+ * @copyright Copyright (c) 2011-2017 Josh Lockhart
+ * @license   https://github.com/slimphp/Slim/blob/3.x/LICENSE.md (MIT License)
+ */
+namespace Slim\Http;
+
+use Slim\Collection;
+use Slim\Interfaces\Http\HeadersInterface;
+
+/**
+ * Headers
+ *
+ * This class represents a collection of HTTP headers
+ * that is used in both the HTTP request and response objects.
+ * It also enables header name case-insensitivity when
+ * getting or setting a header value.
+ *
+ * Each HTTP header can have multiple values. This class
+ * stores values into an array for each header name. When
+ * you request a header value, you receive an array of values
+ * for that header.
+ */
+class Headers extends Collection implements HeadersInterface
+{
+    /**
+     * Special HTTP headers that do not have the "HTTP_" prefix
+     *
+     * @var array
+     */
+    protected static $special = [
+        'CONTENT_TYPE' => 1,
+        'CONTENT_LENGTH' => 1,
+        'PHP_AUTH_USER' => 1,
+        'PHP_AUTH_PW' => 1,
+        'PHP_AUTH_DIGEST' => 1,
+        'AUTH_TYPE' => 1,
+    ];
+
+    /**
+     * Create new headers collection with data extracted from
+     * the application Environment object
+     *
+     * @param Environment $environment The Slim application Environment
+     *
+     * @return self
+     */
+    public static function createFromEnvironment(Environment $environment)
+    {
+        $data = [];
+        $environment = self::determineAuthorization($environment);
+        foreach ($environment as $key => $value) {
+            $key = strtoupper($key);
+            if (isset(static::$special[$key]) || strpos($key, 'HTTP_') === 0) {
+                if ($key !== 'HTTP_CONTENT_LENGTH') {
+                    $data[$key] =  $value;
+                }
+            }
+        }
+
+        return new static($data);
+    }
+
+    /**
+     * If HTTP_AUTHORIZATION does not exist tries to get it from
+     * getallheaders() when available.
+     *
+     * @param Environment $environment The Slim application Environment
+     *
+     * @return Environment
+     */
+
+    public static function determineAuthorization(Environment $environment)
+    {
+        $authorization = $environment->get('HTTP_AUTHORIZATION');
+
+        if (empty($authorization) && is_callable('getallheaders')) {
+            $headers = getallheaders();
+            $headers = array_change_key_case($headers, CASE_LOWER);
+            if (isset($headers['authorization'])) {
+                $environment->set('HTTP_AUTHORIZATION', $headers['authorization']);
+            }
+        }
+
+        return $environment;
+    }
+
+    /**
+     * Return array of HTTP header names and values.
+     * This method returns the _original_ header name
+     * as specified by the end user.
+     *
+     * @return array
+     */
+    public function all()
+    {
+        $all = parent::all();
+        $out = [];
+        foreach ($all as $key => $props) {
+            $out[$props['originalKey']] = $props['value'];
+        }
+
+        return $out;
+    }
+
+    /**
+     * Set HTTP header value
+     *
+     * This method sets a header value. It replaces
+     * any values that may already exist for the header name.
+     *
+     * @param string $key   The case-insensitive header name
+     * @param string $value The header value
+     */
+    public function set($key, $value)
+    {
+        if (!is_array($value)) {
+            $value = [$value];
+        }
+        parent::set($this->normalizeKey($key), [
+            'value' => $value,
+            'originalKey' => $key
+        ]);
+    }
+
+    /**
+     * Get HTTP header value
+     *
+     * @param  string  $key     The case-insensitive header name
+     * @param  mixed   $default The default value if key does not exist
+     *
+     * @return string[]
+     */
+    public function get($key, $default = null)
+    {
+        if ($this->has($key)) {
+            return parent::get($this->normalizeKey($key))['value'];
+        }
+
+        return $default;
+    }
+
+    /**
+     * Get HTTP header key as originally specified
+     *
+     * @param  string   $key     The case-insensitive header name
+     * @param  mixed    $default The default value if key does not exist
+     *
+     * @return string
+     */
+    public function getOriginalKey($key, $default = null)
+    {
+        if ($this->has($key)) {
+            return parent::get($this->normalizeKey($key))['originalKey'];
+        }
+
+        return $default;
+    }
+
+    /**
+     * Add HTTP header value
+     *
+     * This method appends a header value. Unlike the set() method,
+     * this method _appends_ this new value to any values
+     * that already exist for this header name.
+     *
+     * @param string       $key   The case-insensitive header name
+     * @param array|string $value The new header value(s)
+     */
+    public function add($key, $value)
+    {
+        $oldValues = $this->get($key, []);
+        $newValues = is_array($value) ? $value : [$value];
+        $this->set($key, array_merge($oldValues, array_values($newValues)));
+    }
+
+    /**
+     * Does this collection have a given header?
+     *
+     * @param  string $key The case-insensitive header name
+     *
+     * @return bool
+     */
+    public function has($key)
+    {
+        return parent::has($this->normalizeKey($key));
+    }
+
+    /**
+     * Remove header from collection
+     *
+     * @param  string $key The case-insensitive header name
+     */
+    public function remove($key)
+    {
+        parent::remove($this->normalizeKey($key));
+    }
+
+    /**
+     * Normalize header name
+     *
+     * This method transforms header names into a
+     * normalized form. This is how we enable case-insensitive
+     * header names in the other methods in this class.
+     *
+     * @param  string $key The case-insensitive header name
+     *
+     * @return string Normalized header name
+     */
+    public function normalizeKey($key)
+    {
+        $key = strtr(strtolower($key), '_', '-');
+        if (strpos($key, 'http-') === 0) {
+            $key = substr($key, 5);
+        }
+
+        return $key;
+    }
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Http/Message.php b/advancedcontentfilter/vendor/slim/slim/Slim/Http/Message.php
new file mode 100644
index 00000000..9195fb5b
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Http/Message.php
@@ -0,0 +1,305 @@
+<?php
+/**
+ * Slim Framework (https://slimframework.com)
+ *
+ * @link      https://github.com/slimphp/Slim
+ * @copyright Copyright (c) 2011-2017 Josh Lockhart
+ * @license   https://github.com/slimphp/Slim/blob/3.x/LICENSE.md (MIT License)
+ */
+namespace Slim\Http;
+
+use InvalidArgumentException;
+use Psr\Http\Message\MessageInterface;
+use Psr\Http\Message\StreamInterface;
+
+/**
+ * Abstract message (base class for Request and Response)
+ *
+ * This class represents a general HTTP message. It provides common properties and methods for
+ * the HTTP request and response, as defined in the PSR-7 MessageInterface.
+ *
+ * @link https://github.com/php-fig/http-message/blob/master/src/MessageInterface.php
+ * @see Slim\Http\Request
+ * @see Slim\Http\Response
+ */
+abstract class Message implements MessageInterface
+{
+    /**
+     * Protocol version
+     *
+     * @var string
+     */
+    protected $protocolVersion = '1.1';
+
+    /**
+     * A map of valid protocol versions
+     *
+     * @var array
+     */
+    protected static $validProtocolVersions = [
+        '1.0' => true,
+        '1.1' => true,
+        '2.0' => true,
+        '2' => true,
+    ];
+
+    /**
+     * Headers
+     *
+     * @var \Slim\Interfaces\Http\HeadersInterface
+     */
+    protected $headers;
+
+    /**
+     * Body object
+     *
+     * @var \Psr\Http\Message\StreamInterface
+     */
+    protected $body;
+
+
+    /**
+     * Disable magic setter to ensure immutability
+     */
+    public function __set($name, $value)
+    {
+        // Do nothing
+    }
+
+    /*******************************************************************************
+     * Protocol
+     ******************************************************************************/
+
+    /**
+     * Retrieves the HTTP protocol version as a string.
+     *
+     * The string MUST contain only the HTTP version number (e.g., "1.1", "1.0").
+     *
+     * @return string HTTP protocol version.
+     */
+    public function getProtocolVersion()
+    {
+        return $this->protocolVersion;
+    }
+
+    /**
+     * Return an instance with the specified HTTP protocol version.
+     *
+     * The version string MUST contain only the HTTP version number (e.g.,
+     * "1.1", "1.0").
+     *
+     * This method MUST be implemented in such a way as to retain the
+     * immutability of the message, and MUST return an instance that has the
+     * new protocol version.
+     *
+     * @param string $version HTTP protocol version
+     * @return static
+     * @throws InvalidArgumentException if the http version is an invalid number
+     */
+    public function withProtocolVersion($version)
+    {
+        if (!isset(self::$validProtocolVersions[$version])) {
+            throw new InvalidArgumentException(
+                'Invalid HTTP version. Must be one of: '
+                . implode(', ', array_keys(self::$validProtocolVersions))
+            );
+        }
+        $clone = clone $this;
+        $clone->protocolVersion = $version;
+
+        return $clone;
+    }
+
+    /*******************************************************************************
+     * Headers
+     ******************************************************************************/
+
+    /**
+     * Retrieves all message header values.
+     *
+     * The keys represent the header name as it will be sent over the wire, and
+     * each value is an array of strings associated with the header.
+     *
+     *     // Represent the headers as a string
+     *     foreach ($message->getHeaders() as $name => $values) {
+     *         echo $name . ": " . implode(", ", $values);
+     *     }
+     *
+     *     // Emit headers iteratively:
+     *     foreach ($message->getHeaders() as $name => $values) {
+     *         foreach ($values as $value) {
+     *             header(sprintf('%s: %s', $name, $value), false);
+     *         }
+     *     }
+     *
+     * While header names are not case-sensitive, getHeaders() will preserve the
+     * exact case in which headers were originally specified.
+     *
+     * @return array Returns an associative array of the message's headers. Each
+     *     key MUST be a header name, and each value MUST be an array of strings
+     *     for that header.
+     */
+    public function getHeaders()
+    {
+        return $this->headers->all();
+    }
+
+    /**
+     * Checks if a header exists by the given case-insensitive name.
+     *
+     * @param string $name Case-insensitive header field name.
+     * @return bool Returns true if any header names match the given header
+     *     name using a case-insensitive string comparison. Returns false if
+     *     no matching header name is found in the message.
+     */
+    public function hasHeader($name)
+    {
+        return $this->headers->has($name);
+    }
+
+    /**
+     * Retrieves a message header value by the given case-insensitive name.
+     *
+     * This method returns an array of all the header values of the given
+     * case-insensitive header name.
+     *
+     * If the header does not appear in the message, this method MUST return an
+     * empty array.
+     *
+     * @param string $name Case-insensitive header field name.
+     * @return string[] An array of string values as provided for the given
+     *    header. If the header does not appear in the message, this method MUST
+     *    return an empty array.
+     */
+    public function getHeader($name)
+    {
+        return $this->headers->get($name, []);
+    }
+
+    /**
+     * Retrieves a comma-separated string of the values for a single header.
+     *
+     * This method returns all of the header values of the given
+     * case-insensitive header name as a string concatenated together using
+     * a comma.
+     *
+     * NOTE: Not all header values may be appropriately represented using
+     * comma concatenation. For such headers, use getHeader() instead
+     * and supply your own delimiter when concatenating.
+     *
+     * If the header does not appear in the message, this method MUST return
+     * an empty string.
+     *
+     * @param string $name Case-insensitive header field name.
+     * @return string A string of values as provided for the given header
+     *    concatenated together using a comma. If the header does not appear in
+     *    the message, this method MUST return an empty string.
+     */
+    public function getHeaderLine($name)
+    {
+        return implode(',', $this->headers->get($name, []));
+    }
+
+    /**
+     * Return an instance with the provided value replacing the specified header.
+     *
+     * While header names are case-insensitive, the casing of the header will
+     * be preserved by this function, and returned from getHeaders().
+     *
+     * This method MUST be implemented in such a way as to retain the
+     * immutability of the message, and MUST return an instance that has the
+     * new and/or updated header and value.
+     *
+     * @param string $name Case-insensitive header field name.
+     * @param string|string[] $value Header value(s).
+     * @return static
+     * @throws \InvalidArgumentException for invalid header names or values.
+     */
+    public function withHeader($name, $value)
+    {
+        $clone = clone $this;
+        $clone->headers->set($name, $value);
+
+        return $clone;
+    }
+
+    /**
+     * Return an instance with the specified header appended with the given value.
+     *
+     * Existing values for the specified header will be maintained. The new
+     * value(s) will be appended to the existing list. If the header did not
+     * exist previously, it will be added.
+     *
+     * This method MUST be implemented in such a way as to retain the
+     * immutability of the message, and MUST return an instance that has the
+     * new header and/or value.
+     *
+     * @param string $name Case-insensitive header field name to add.
+     * @param string|string[] $value Header value(s).
+     * @return static
+     * @throws \InvalidArgumentException for invalid header names or values.
+     */
+    public function withAddedHeader($name, $value)
+    {
+        $clone = clone $this;
+        $clone->headers->add($name, $value);
+
+        return $clone;
+    }
+
+    /**
+     * Return an instance without the specified header.
+     *
+     * Header resolution MUST be done without case-sensitivity.
+     *
+     * This method MUST be implemented in such a way as to retain the
+     * immutability of the message, and MUST return an instance that removes
+     * the named header.
+     *
+     * @param string $name Case-insensitive header field name to remove.
+     * @return static
+     */
+    public function withoutHeader($name)
+    {
+        $clone = clone $this;
+        $clone->headers->remove($name);
+
+        return $clone;
+    }
+
+    /*******************************************************************************
+     * Body
+     ******************************************************************************/
+
+    /**
+     * Gets the body of the message.
+     *
+     * @return StreamInterface Returns the body as a stream.
+     */
+    public function getBody()
+    {
+        return $this->body;
+    }
+
+    /**
+     * Return an instance with the specified message body.
+     *
+     * The body MUST be a StreamInterface object.
+     *
+     * This method MUST be implemented in such a way as to retain the
+     * immutability of the message, and MUST return a new instance that has the
+     * new body stream.
+     *
+     * @param StreamInterface $body Body.
+     * @return static
+     * @throws \InvalidArgumentException When the body is not valid.
+     */
+    public function withBody(StreamInterface $body)
+    {
+        // TODO: Test for invalid body?
+        $clone = clone $this;
+        $clone->body = $body;
+
+        return $clone;
+    }
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Http/Request.php b/advancedcontentfilter/vendor/slim/slim/Slim/Http/Request.php
new file mode 100644
index 00000000..4bea07e9
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Http/Request.php
@@ -0,0 +1,1227 @@
+<?php
+/**
+ * Slim Framework (https://slimframework.com)
+ *
+ * @link      https://github.com/slimphp/Slim
+ * @copyright Copyright (c) 2011-2017 Josh Lockhart
+ * @license   https://github.com/slimphp/Slim/blob/3.x/LICENSE.md (MIT License)
+ */
+namespace Slim\Http;
+
+use Closure;
+use InvalidArgumentException;
+use Psr\Http\Message\UploadedFileInterface;
+use RuntimeException;
+use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Message\UriInterface;
+use Psr\Http\Message\StreamInterface;
+use Slim\Collection;
+use Slim\Exception\InvalidMethodException;
+use Slim\Interfaces\Http\HeadersInterface;
+
+/**
+ * Request
+ *
+ * This class represents an HTTP request. It manages
+ * the request method, URI, headers, cookies, and body
+ * according to the PSR-7 standard.
+ *
+ * @link https://github.com/php-fig/http-message/blob/master/src/MessageInterface.php
+ * @link https://github.com/php-fig/http-message/blob/master/src/RequestInterface.php
+ * @link https://github.com/php-fig/http-message/blob/master/src/ServerRequestInterface.php
+ */
+class Request extends Message implements ServerRequestInterface
+{
+    /**
+     * The request method
+     *
+     * @var string
+     */
+    protected $method;
+
+    /**
+     * The original request method (ignoring override)
+     *
+     * @var string
+     */
+    protected $originalMethod;
+
+    /**
+     * The request URI object
+     *
+     * @var \Psr\Http\Message\UriInterface
+     */
+    protected $uri;
+
+    /**
+     * The request URI target (path + query string)
+     *
+     * @var string
+     */
+    protected $requestTarget;
+
+    /**
+     * The request query string params
+     *
+     * @var array
+     */
+    protected $queryParams;
+
+    /**
+     * The request cookies
+     *
+     * @var array
+     */
+    protected $cookies;
+
+    /**
+     * The server environment variables at the time the request was created.
+     *
+     * @var array
+     */
+    protected $serverParams;
+
+    /**
+     * The request attributes (route segment names and values)
+     *
+     * @var \Slim\Collection
+     */
+    protected $attributes;
+
+    /**
+     * The request body parsed (if possible) into a PHP array or object
+     *
+     * @var null|array|object
+     */
+    protected $bodyParsed = false;
+
+    /**
+     * List of request body parsers (e.g., url-encoded, JSON, XML, multipart)
+     *
+     * @var callable[]
+     */
+    protected $bodyParsers = [];
+
+    /**
+     * List of uploaded files
+     *
+     * @var UploadedFileInterface[]
+     */
+    protected $uploadedFiles;
+
+    /**
+     * Valid request methods
+     *
+     * @var string[]
+     * @deprecated
+     */
+    protected $validMethods = [
+        'CONNECT' => 1,
+        'DELETE' => 1,
+        'GET' => 1,
+        'HEAD' => 1,
+        'OPTIONS' => 1,
+        'PATCH' => 1,
+        'POST' => 1,
+        'PUT' => 1,
+        'TRACE' => 1,
+    ];
+
+    /**
+     * Create new HTTP request with data extracted from the application
+     * Environment object
+     *
+     * @param  Environment $environment The Slim application Environment
+     *
+     * @return static
+     */
+    public static function createFromEnvironment(Environment $environment)
+    {
+        $method = $environment['REQUEST_METHOD'];
+        $uri = Uri::createFromEnvironment($environment);
+        $headers = Headers::createFromEnvironment($environment);
+        $cookies = Cookies::parseHeader($headers->get('Cookie', []));
+        $serverParams = $environment->all();
+        $body = new RequestBody();
+        $uploadedFiles = UploadedFile::createFromEnvironment($environment);
+
+        $request = new static($method, $uri, $headers, $cookies, $serverParams, $body, $uploadedFiles);
+
+        if ($method === 'POST' &&
+            in_array($request->getMediaType(), ['application/x-www-form-urlencoded', 'multipart/form-data'])
+        ) {
+            // parsed body must be $_POST
+            $request = $request->withParsedBody($_POST);
+        }
+        return $request;
+    }
+
+    /**
+     * Create new HTTP request.
+     *
+     * Adds a host header when none was provided and a host is defined in uri.
+     *
+     * @param string           $method        The request method
+     * @param UriInterface     $uri           The request URI object
+     * @param HeadersInterface $headers       The request headers collection
+     * @param array            $cookies       The request cookies collection
+     * @param array            $serverParams  The server environment variables
+     * @param StreamInterface  $body          The request body object
+     * @param array            $uploadedFiles The request uploadedFiles collection
+     * @throws InvalidMethodException on invalid HTTP method
+     */
+    public function __construct(
+        $method,
+        UriInterface $uri,
+        HeadersInterface $headers,
+        array $cookies,
+        array $serverParams,
+        StreamInterface $body,
+        array $uploadedFiles = []
+    ) {
+        try {
+            $this->originalMethod = $this->filterMethod($method);
+        } catch (InvalidMethodException $e) {
+            $this->originalMethod = $method;
+        }
+
+        $this->uri = $uri;
+        $this->headers = $headers;
+        $this->cookies = $cookies;
+        $this->serverParams = $serverParams;
+        $this->attributes = new Collection();
+        $this->body = $body;
+        $this->uploadedFiles = $uploadedFiles;
+
+        if (isset($serverParams['SERVER_PROTOCOL'])) {
+            $this->protocolVersion = str_replace('HTTP/', '', $serverParams['SERVER_PROTOCOL']);
+        }
+
+        if (!$this->headers->has('Host') || $this->uri->getHost() !== '') {
+            $this->headers->set('Host', $this->uri->getHost());
+        }
+
+        $this->registerMediaTypeParser('application/json', function ($input) {
+            $result = json_decode($input, true);
+            if (!is_array($result)) {
+                return null;
+            }
+            return $result;
+        });
+
+        $this->registerMediaTypeParser('application/xml', function ($input) {
+            $backup = libxml_disable_entity_loader(true);
+            $backup_errors = libxml_use_internal_errors(true);
+            $result = simplexml_load_string($input);
+            libxml_disable_entity_loader($backup);
+            libxml_clear_errors();
+            libxml_use_internal_errors($backup_errors);
+            if ($result === false) {
+                return null;
+            }
+            return $result;
+        });
+
+        $this->registerMediaTypeParser('text/xml', function ($input) {
+            $backup = libxml_disable_entity_loader(true);
+            $backup_errors = libxml_use_internal_errors(true);
+            $result = simplexml_load_string($input);
+            libxml_disable_entity_loader($backup);
+            libxml_clear_errors();
+            libxml_use_internal_errors($backup_errors);
+            if ($result === false) {
+                return null;
+            }
+            return $result;
+        });
+
+        $this->registerMediaTypeParser('application/x-www-form-urlencoded', function ($input) {
+            parse_str($input, $data);
+            return $data;
+        });
+
+        // if the request had an invalid method, we can throw it now
+        if (isset($e) && $e instanceof InvalidMethodException) {
+            throw $e;
+        }
+    }
+
+    /**
+     * This method is applied to the cloned object
+     * after PHP performs an initial shallow-copy. This
+     * method completes a deep-copy by creating new objects
+     * for the cloned object's internal reference pointers.
+     */
+    public function __clone()
+    {
+        $this->headers = clone $this->headers;
+        $this->attributes = clone $this->attributes;
+        $this->body = clone $this->body;
+    }
+
+    /*******************************************************************************
+     * Method
+     ******************************************************************************/
+
+    /**
+     * Retrieves the HTTP method of the request.
+     *
+     * @return string Returns the request method.
+     */
+    public function getMethod()
+    {
+        if ($this->method === null) {
+            $this->method = $this->originalMethod;
+            $customMethod = $this->getHeaderLine('X-Http-Method-Override');
+
+            if ($customMethod) {
+                $this->method = $this->filterMethod($customMethod);
+            } elseif ($this->originalMethod === 'POST') {
+                $overrideMethod = $this->filterMethod($this->getParsedBodyParam('_METHOD'));
+                if ($overrideMethod !== null) {
+                    $this->method = $overrideMethod;
+                }
+
+                if ($this->getBody()->eof()) {
+                    $this->getBody()->rewind();
+                }
+            }
+        }
+
+        return $this->method;
+    }
+
+    /**
+     * Get the original HTTP method (ignore override).
+     *
+     * Note: This method is not part of the PSR-7 standard.
+     *
+     * @return string
+     */
+    public function getOriginalMethod()
+    {
+        return $this->originalMethod;
+    }
+
+    /**
+     * Return an instance with the provided HTTP method.
+     *
+     * While HTTP method names are typically all uppercase characters, HTTP
+     * method names are case-sensitive and thus implementations SHOULD NOT
+     * modify the given string.
+     *
+     * This method MUST be implemented in such a way as to retain the
+     * immutability of the message, and MUST return an instance that has the
+     * changed request method.
+     *
+     * @param string $method Case-sensitive method.
+     * @return static
+     * @throws \InvalidArgumentException for invalid HTTP methods.
+     */
+    public function withMethod($method)
+    {
+        $method = $this->filterMethod($method);
+        $clone = clone $this;
+        $clone->originalMethod = $method;
+        $clone->method = $method;
+
+        return $clone;
+    }
+
+    /**
+     * Validate the HTTP method
+     *
+     * @param  null|string $method
+     * @return null|string
+     * @throws \InvalidArgumentException on invalid HTTP method.
+     */
+    protected function filterMethod($method)
+    {
+        if ($method === null) {
+            return $method;
+        }
+
+        if (!is_string($method)) {
+            throw new InvalidArgumentException(sprintf(
+                'Unsupported HTTP method; must be a string, received %s',
+                (is_object($method) ? get_class($method) : gettype($method))
+            ));
+        }
+
+        $method = strtoupper($method);
+        if (preg_match("/^[!#$%&'*+.^_`|~0-9a-z-]+$/i", $method) !== 1) {
+            throw new InvalidMethodException($this, $method);
+        }
+
+        return $method;
+    }
+
+    /**
+     * Does this request use a given method?
+     *
+     * Note: This method is not part of the PSR-7 standard.
+     *
+     * @param  string $method HTTP method
+     * @return bool
+     */
+    public function isMethod($method)
+    {
+        return $this->getMethod() === $method;
+    }
+
+    /**
+     * Is this a GET request?
+     *
+     * Note: This method is not part of the PSR-7 standard.
+     *
+     * @return bool
+     */
+    public function isGet()
+    {
+        return $this->isMethod('GET');
+    }
+
+    /**
+     * Is this a POST request?
+     *
+     * Note: This method is not part of the PSR-7 standard.
+     *
+     * @return bool
+     */
+    public function isPost()
+    {
+        return $this->isMethod('POST');
+    }
+
+    /**
+     * Is this a PUT request?
+     *
+     * Note: This method is not part of the PSR-7 standard.
+     *
+     * @return bool
+     */
+    public function isPut()
+    {
+        return $this->isMethod('PUT');
+    }
+
+    /**
+     * Is this a PATCH request?
+     *
+     * Note: This method is not part of the PSR-7 standard.
+     *
+     * @return bool
+     */
+    public function isPatch()
+    {
+        return $this->isMethod('PATCH');
+    }
+
+    /**
+     * Is this a DELETE request?
+     *
+     * Note: This method is not part of the PSR-7 standard.
+     *
+     * @return bool
+     */
+    public function isDelete()
+    {
+        return $this->isMethod('DELETE');
+    }
+
+    /**
+     * Is this a HEAD request?
+     *
+     * Note: This method is not part of the PSR-7 standard.
+     *
+     * @return bool
+     */
+    public function isHead()
+    {
+        return $this->isMethod('HEAD');
+    }
+
+    /**
+     * Is this a OPTIONS request?
+     *
+     * Note: This method is not part of the PSR-7 standard.
+     *
+     * @return bool
+     */
+    public function isOptions()
+    {
+        return $this->isMethod('OPTIONS');
+    }
+
+    /**
+     * Is this an XHR request?
+     *
+     * Note: This method is not part of the PSR-7 standard.
+     *
+     * @return bool
+     */
+    public function isXhr()
+    {
+        return $this->getHeaderLine('X-Requested-With') === 'XMLHttpRequest';
+    }
+
+    /*******************************************************************************
+     * URI
+     ******************************************************************************/
+
+    /**
+     * Retrieves the message's request target.
+     *
+     * Retrieves the message's request-target either as it will appear (for
+     * clients), as it appeared at request (for servers), or as it was
+     * specified for the instance (see withRequestTarget()).
+     *
+     * In most cases, this will be the origin-form of the composed URI,
+     * unless a value was provided to the concrete implementation (see
+     * withRequestTarget() below).
+     *
+     * If no URI is available, and no request-target has been specifically
+     * provided, this method MUST return the string "/".
+     *
+     * @return string
+     */
+    public function getRequestTarget()
+    {
+        if ($this->requestTarget) {
+            return $this->requestTarget;
+        }
+
+        if ($this->uri === null) {
+            return '/';
+        }
+
+        $basePath = $this->uri->getBasePath();
+        $path = $this->uri->getPath();
+        $path = $basePath . '/' . ltrim($path, '/');
+
+        $query = $this->uri->getQuery();
+        if ($query) {
+            $path .= '?' . $query;
+        }
+        $this->requestTarget = $path;
+
+        return $this->requestTarget;
+    }
+
+    /**
+     * Return an instance with the specific request-target.
+     *
+     * If the request needs a non-origin-form request-target — e.g., for
+     * specifying an absolute-form, authority-form, or asterisk-form —
+     * this method may be used to create an instance with the specified
+     * request-target, verbatim.
+     *
+     * This method MUST be implemented in such a way as to retain the
+     * immutability of the message, and MUST return an instance that has the
+     * changed request target.
+     *
+     * @link http://tools.ietf.org/html/rfc7230#section-2.7 (for the various
+     *     request-target forms allowed in request messages)
+     * @param mixed $requestTarget
+     * @return static
+     * @throws InvalidArgumentException if the request target is invalid
+     */
+    public function withRequestTarget($requestTarget)
+    {
+        if (preg_match('#\s#', $requestTarget)) {
+            throw new InvalidArgumentException(
+                'Invalid request target provided; must be a string and cannot contain whitespace'
+            );
+        }
+        $clone = clone $this;
+        $clone->requestTarget = $requestTarget;
+
+        return $clone;
+    }
+
+    /**
+     * Retrieves the URI instance.
+     *
+     * This method MUST return a UriInterface instance.
+     *
+     * @link http://tools.ietf.org/html/rfc3986#section-4.3
+     * @return UriInterface Returns a UriInterface instance
+     *     representing the URI of the request.
+     */
+    public function getUri()
+    {
+        return $this->uri;
+    }
+
+    /**
+     * Returns an instance with the provided URI.
+     *
+     * This method MUST update the Host header of the returned request by
+     * default if the URI contains a host component. If the URI does not
+     * contain a host component, any pre-existing Host header MUST be carried
+     * over to the returned request.
+     *
+     * You can opt-in to preserving the original state of the Host header by
+     * setting `$preserveHost` to `true`. When `$preserveHost` is set to
+     * `true`, this method interacts with the Host header in the following ways:
+     *
+     * - If the the Host header is missing or empty, and the new URI contains
+     *   a host component, this method MUST update the Host header in the returned
+     *   request.
+     * - If the Host header is missing or empty, and the new URI does not contain a
+     *   host component, this method MUST NOT update the Host header in the returned
+     *   request.
+     * - If a Host header is present and non-empty, this method MUST NOT update
+     *   the Host header in the returned request.
+     *
+     * This method MUST be implemented in such a way as to retain the
+     * immutability of the message, and MUST return an instance that has the
+     * new UriInterface instance.
+     *
+     * @link http://tools.ietf.org/html/rfc3986#section-4.3
+     * @param UriInterface $uri New request URI to use.
+     * @param bool $preserveHost Preserve the original state of the Host header.
+     * @return static
+     */
+    public function withUri(UriInterface $uri, $preserveHost = false)
+    {
+        $clone = clone $this;
+        $clone->uri = $uri;
+
+        if (!$preserveHost) {
+            if ($uri->getHost() !== '') {
+                $clone->headers->set('Host', $uri->getHost());
+            }
+        } else {
+            if ($uri->getHost() !== '' && (!$this->hasHeader('Host') || $this->getHeaderLine('Host') === '')) {
+                $clone->headers->set('Host', $uri->getHost());
+            }
+        }
+
+        return $clone;
+    }
+
+    /**
+     * Get request content type.
+     *
+     * Note: This method is not part of the PSR-7 standard.
+     *
+     * @return string|null The request content type, if known
+     */
+    public function getContentType()
+    {
+        $result = $this->getHeader('Content-Type');
+
+        return $result ? $result[0] : null;
+    }
+
+    /**
+     * Get request media type, if known.
+     *
+     * Note: This method is not part of the PSR-7 standard.
+     *
+     * @return string|null The request media type, minus content-type params
+     */
+    public function getMediaType()
+    {
+        $contentType = $this->getContentType();
+        if ($contentType) {
+            $contentTypeParts = preg_split('/\s*[;,]\s*/', $contentType);
+
+            return strtolower($contentTypeParts[0]);
+        }
+
+        return null;
+    }
+
+    /**
+     * Get request media type params, if known.
+     *
+     * Note: This method is not part of the PSR-7 standard.
+     *
+     * @return array
+     */
+    public function getMediaTypeParams()
+    {
+        $contentType = $this->getContentType();
+        $contentTypeParams = [];
+        if ($contentType) {
+            $contentTypeParts = preg_split('/\s*[;,]\s*/', $contentType);
+            $contentTypePartsLength = count($contentTypeParts);
+            for ($i = 1; $i < $contentTypePartsLength; $i++) {
+                $paramParts = explode('=', $contentTypeParts[$i]);
+                $contentTypeParams[strtolower($paramParts[0])] = $paramParts[1];
+            }
+        }
+
+        return $contentTypeParams;
+    }
+
+    /**
+     * Get request content character set, if known.
+     *
+     * Note: This method is not part of the PSR-7 standard.
+     *
+     * @return string|null
+     */
+    public function getContentCharset()
+    {
+        $mediaTypeParams = $this->getMediaTypeParams();
+        if (isset($mediaTypeParams['charset'])) {
+            return $mediaTypeParams['charset'];
+        }
+
+        return null;
+    }
+
+    /**
+     * Get request content length, if known.
+     *
+     * Note: This method is not part of the PSR-7 standard.
+     *
+     * @return int|null
+     */
+    public function getContentLength()
+    {
+        $result = $this->headers->get('Content-Length');
+
+        return $result ? (int)$result[0] : null;
+    }
+
+    /*******************************************************************************
+     * Cookies
+     ******************************************************************************/
+
+    /**
+     * Retrieve cookies.
+     *
+     * Retrieves cookies sent by the client to the server.
+     *
+     * The data MUST be compatible with the structure of the $_COOKIE
+     * superglobal.
+     *
+     * @return array
+     */
+    public function getCookieParams()
+    {
+        return $this->cookies;
+    }
+
+    /**
+     * Fetch cookie value from cookies sent by the client to the server.
+     *
+     * Note: This method is not part of the PSR-7 standard.
+     *
+     * @param string $key     The attribute name.
+     * @param mixed  $default Default value to return if the attribute does not exist.
+     *
+     * @return mixed
+     */
+    public function getCookieParam($key, $default = null)
+    {
+        $cookies = $this->getCookieParams();
+        $result = $default;
+        if (isset($cookies[$key])) {
+            $result = $cookies[$key];
+        }
+
+        return $result;
+    }
+
+    /**
+     * Return an instance with the specified cookies.
+     *
+     * The data IS NOT REQUIRED to come from the $_COOKIE superglobal, but MUST
+     * be compatible with the structure of $_COOKIE. Typically, this data will
+     * be injected at instantiation.
+     *
+     * This method MUST NOT update the related Cookie header of the request
+     * instance, nor related values in the server params.
+     *
+     * This method MUST be implemented in such a way as to retain the
+     * immutability of the message, and MUST return an instance that has the
+     * updated cookie values.
+     *
+     * @param array $cookies Array of key/value pairs representing cookies.
+     * @return static
+     */
+    public function withCookieParams(array $cookies)
+    {
+        $clone = clone $this;
+        $clone->cookies = $cookies;
+
+        return $clone;
+    }
+
+    /*******************************************************************************
+     * Query Params
+     ******************************************************************************/
+
+    /**
+     * Retrieve query string arguments.
+     *
+     * Retrieves the deserialized query string arguments, if any.
+     *
+     * Note: the query params might not be in sync with the URI or server
+     * params. If you need to ensure you are only getting the original
+     * values, you may need to parse the query string from `getUri()->getQuery()`
+     * or from the `QUERY_STRING` server param.
+     *
+     * @return array
+     */
+    public function getQueryParams()
+    {
+        if (is_array($this->queryParams)) {
+            return $this->queryParams;
+        }
+
+        if ($this->uri === null) {
+            return [];
+        }
+
+        parse_str($this->uri->getQuery(), $this->queryParams); // <-- URL decodes data
+
+        return $this->queryParams;
+    }
+
+    /**
+     * Return an instance with the specified query string arguments.
+     *
+     * These values SHOULD remain immutable over the course of the incoming
+     * request. They MAY be injected during instantiation, such as from PHP's
+     * $_GET superglobal, or MAY be derived from some other value such as the
+     * URI. In cases where the arguments are parsed from the URI, the data
+     * MUST be compatible with what PHP's parse_str() would return for
+     * purposes of how duplicate query parameters are handled, and how nested
+     * sets are handled.
+     *
+     * Setting query string arguments MUST NOT change the URI stored by the
+     * request, nor the values in the server params.
+     *
+     * This method MUST be implemented in such a way as to retain the
+     * immutability of the message, and MUST return an instance that has the
+     * updated query string arguments.
+     *
+     * @param array $query Array of query string arguments, typically from
+     *     $_GET.
+     * @return static
+     */
+    public function withQueryParams(array $query)
+    {
+        $clone = clone $this;
+        $clone->queryParams = $query;
+
+        return $clone;
+    }
+
+    /*******************************************************************************
+     * File Params
+     ******************************************************************************/
+
+    /**
+     * Retrieve normalized file upload data.
+     *
+     * This method returns upload metadata in a normalized tree, with each leaf
+     * an instance of Psr\Http\Message\UploadedFileInterface.
+     *
+     * These values MAY be prepared from $_FILES or the message body during
+     * instantiation, or MAY be injected via withUploadedFiles().
+     *
+     * @return array An array tree of UploadedFileInterface instances; an empty
+     *     array MUST be returned if no data is present.
+     */
+    public function getUploadedFiles()
+    {
+        return $this->uploadedFiles;
+    }
+
+    /**
+     * Create a new instance with the specified uploaded files.
+     *
+     * This method MUST be implemented in such a way as to retain the
+     * immutability of the message, and MUST return an instance that has the
+     * updated body parameters.
+     *
+     * @param array $uploadedFiles An array tree of UploadedFileInterface instances.
+     * @return static
+     * @throws \InvalidArgumentException if an invalid structure is provided.
+     */
+    public function withUploadedFiles(array $uploadedFiles)
+    {
+        $clone = clone $this;
+        $clone->uploadedFiles = $uploadedFiles;
+
+        return $clone;
+    }
+
+    /*******************************************************************************
+     * Server Params
+     ******************************************************************************/
+
+    /**
+     * Retrieve server parameters.
+     *
+     * Retrieves data related to the incoming request environment,
+     * typically derived from PHP's $_SERVER superglobal. The data IS NOT
+     * REQUIRED to originate from $_SERVER.
+     *
+     * @return array
+     */
+    public function getServerParams()
+    {
+        return $this->serverParams;
+    }
+
+    /**
+     * Retrieve a server parameter.
+     *
+     * Note: This method is not part of the PSR-7 standard.
+     *
+     * @param  string $key
+     * @param  mixed  $default
+     * @return mixed
+     */
+    public function getServerParam($key, $default = null)
+    {
+        $serverParams = $this->getServerParams();
+
+        return isset($serverParams[$key]) ? $serverParams[$key] : $default;
+    }
+
+    /*******************************************************************************
+     * Attributes
+     ******************************************************************************/
+
+    /**
+     * Retrieve attributes derived from the request.
+     *
+     * The request "attributes" may be used to allow injection of any
+     * parameters derived from the request: e.g., the results of path
+     * match operations; the results of decrypting cookies; the results of
+     * deserializing non-form-encoded message bodies; etc. Attributes
+     * will be application and request specific, and CAN be mutable.
+     *
+     * @return array Attributes derived from the request.
+     */
+    public function getAttributes()
+    {
+        return $this->attributes->all();
+    }
+
+    /**
+     * Retrieve a single derived request attribute.
+     *
+     * Retrieves a single derived request attribute as described in
+     * getAttributes(). If the attribute has not been previously set, returns
+     * the default value as provided.
+     *
+     * This method obviates the need for a hasAttribute() method, as it allows
+     * specifying a default value to return if the attribute is not found.
+     *
+     * @see getAttributes()
+     * @param string $name The attribute name.
+     * @param mixed $default Default value to return if the attribute does not exist.
+     * @return mixed
+     */
+    public function getAttribute($name, $default = null)
+    {
+        return $this->attributes->get($name, $default);
+    }
+
+    /**
+     * Return an instance with the specified derived request attribute.
+     *
+     * This method allows setting a single derived request attribute as
+     * described in getAttributes().
+     *
+     * This method MUST be implemented in such a way as to retain the
+     * immutability of the message, and MUST return an instance that has the
+     * updated attribute.
+     *
+     * @see getAttributes()
+     * @param string $name The attribute name.
+     * @param mixed $value The value of the attribute.
+     * @return static
+     */
+    public function withAttribute($name, $value)
+    {
+        $clone = clone $this;
+        $clone->attributes->set($name, $value);
+
+        return $clone;
+    }
+
+    /**
+     * Create a new instance with the specified derived request attributes.
+     *
+     * Note: This method is not part of the PSR-7 standard.
+     *
+     * This method allows setting all new derived request attributes as
+     * described in getAttributes().
+     *
+     * This method MUST be implemented in such a way as to retain the
+     * immutability of the message, and MUST return a new instance that has the
+     * updated attributes.
+     *
+     * @param  array $attributes New attributes
+     * @return static
+     */
+    public function withAttributes(array $attributes)
+    {
+        $clone = clone $this;
+        $clone->attributes = new Collection($attributes);
+
+        return $clone;
+    }
+
+    /**
+     * Return an instance that removes the specified derived request attribute.
+     *
+     * This method allows removing a single derived request attribute as
+     * described in getAttributes().
+     *
+     * This method MUST be implemented in such a way as to retain the
+     * immutability of the message, and MUST return an instance that removes
+     * the attribute.
+     *
+     * @see getAttributes()
+     * @param string $name The attribute name.
+     * @return static
+     */
+    public function withoutAttribute($name)
+    {
+        $clone = clone $this;
+        $clone->attributes->remove($name);
+
+        return $clone;
+    }
+
+    /*******************************************************************************
+     * Body
+     ******************************************************************************/
+
+    /**
+     * Retrieve any parameters provided in the request body.
+     *
+     * If the request Content-Type is either application/x-www-form-urlencoded
+     * or multipart/form-data, and the request method is POST, this method MUST
+     * return the contents of $_POST.
+     *
+     * Otherwise, this method may return any results of deserializing
+     * the request body content; as parsing returns structured content, the
+     * potential types MUST be arrays or objects only. A null value indicates
+     * the absence of body content.
+     *
+     * @return null|array|object The deserialized body parameters, if any.
+     *     These will typically be an array or object.
+     * @throws RuntimeException if the request body media type parser returns an invalid value
+     */
+    public function getParsedBody()
+    {
+        if ($this->bodyParsed !== false) {
+            return $this->bodyParsed;
+        }
+
+        if (!$this->body) {
+            return null;
+        }
+
+        $mediaType = $this->getMediaType();
+
+        // look for a media type with a structured syntax suffix (RFC 6839)
+        $parts = explode('+', $mediaType);
+        if (count($parts) >= 2) {
+            $mediaType = 'application/' . $parts[count($parts)-1];
+        }
+
+        if (isset($this->bodyParsers[$mediaType]) === true) {
+            $body = (string)$this->getBody();
+            $parsed = $this->bodyParsers[$mediaType]($body);
+
+            if (!is_null($parsed) && !is_object($parsed) && !is_array($parsed)) {
+                throw new RuntimeException(
+                    'Request body media type parser return value must be an array, an object, or null'
+                );
+            }
+            $this->bodyParsed = $parsed;
+            return $this->bodyParsed;
+        }
+
+        return null;
+    }
+
+    /**
+     * Return an instance with the specified body parameters.
+     *
+     * These MAY be injected during instantiation.
+     *
+     * If the request Content-Type is either application/x-www-form-urlencoded
+     * or multipart/form-data, and the request method is POST, use this method
+     * ONLY to inject the contents of $_POST.
+     *
+     * The data IS NOT REQUIRED to come from $_POST, but MUST be the results of
+     * deserializing the request body content. Deserialization/parsing returns
+     * structured data, and, as such, this method ONLY accepts arrays or objects,
+     * or a null value if nothing was available to parse.
+     *
+     * As an example, if content negotiation determines that the request data
+     * is a JSON payload, this method could be used to create a request
+     * instance with the deserialized parameters.
+     *
+     * This method MUST be implemented in such a way as to retain the
+     * immutability of the message, and MUST return an instance that has the
+     * updated body parameters.
+     *
+     * @param null|array|object $data The deserialized body data. This will
+     *     typically be in an array or object.
+     * @return static
+     * @throws \InvalidArgumentException if an unsupported argument type is
+     *     provided.
+     */
+    public function withParsedBody($data)
+    {
+        if (!is_null($data) && !is_object($data) && !is_array($data)) {
+            throw new InvalidArgumentException('Parsed body value must be an array, an object, or null');
+        }
+
+        $clone = clone $this;
+        $clone->bodyParsed = $data;
+
+        return $clone;
+    }
+
+    /**
+     * Force Body to be parsed again.
+     *
+     * Note: This method is not part of the PSR-7 standard.
+     *
+     * @return $this
+     */
+    public function reparseBody()
+    {
+        $this->bodyParsed = false;
+
+        return $this;
+    }
+
+    /**
+     * Register media type parser.
+     *
+     * Note: This method is not part of the PSR-7 standard.
+     *
+     * @param string   $mediaType A HTTP media type (excluding content-type
+     *     params).
+     * @param callable $callable  A callable that returns parsed contents for
+     *     media type.
+     */
+    public function registerMediaTypeParser($mediaType, callable $callable)
+    {
+        if ($callable instanceof Closure) {
+            $callable = $callable->bindTo($this);
+        }
+        $this->bodyParsers[(string)$mediaType] = $callable;
+    }
+
+    /*******************************************************************************
+     * Parameters (e.g., POST and GET data)
+     ******************************************************************************/
+
+    /**
+     * Fetch request parameter value from body or query string (in that order).
+     *
+     * Note: This method is not part of the PSR-7 standard.
+     *
+     * @param  string $key The parameter key.
+     * @param  string $default The default value.
+     *
+     * @return mixed The parameter value.
+     */
+    public function getParam($key, $default = null)
+    {
+        $postParams = $this->getParsedBody();
+        $getParams = $this->getQueryParams();
+        $result = $default;
+        if (is_array($postParams) && isset($postParams[$key])) {
+            $result = $postParams[$key];
+        } elseif (is_object($postParams) && property_exists($postParams, $key)) {
+            $result = $postParams->$key;
+        } elseif (isset($getParams[$key])) {
+            $result = $getParams[$key];
+        }
+
+        return $result;
+    }
+
+    /**
+     * Fetch parameter value from request body.
+     *
+     * Note: This method is not part of the PSR-7 standard.
+     *
+     * @param string $key
+     * @param mixed $default
+     *
+     * @return mixed
+     */
+    public function getParsedBodyParam($key, $default = null)
+    {
+        $postParams = $this->getParsedBody();
+        $result = $default;
+        if (is_array($postParams) && isset($postParams[$key])) {
+            $result = $postParams[$key];
+        } elseif (is_object($postParams) && property_exists($postParams, $key)) {
+            $result = $postParams->$key;
+        }
+
+        return $result;
+    }
+
+    /**
+     * Fetch parameter value from query string.
+     *
+     * Note: This method is not part of the PSR-7 standard.
+     *
+     * @param string $key
+     * @param mixed $default
+     *
+     * @return mixed
+     */
+    public function getQueryParam($key, $default = null)
+    {
+        $getParams = $this->getQueryParams();
+        $result = $default;
+        if (isset($getParams[$key])) {
+            $result = $getParams[$key];
+        }
+
+        return $result;
+    }
+
+    /**
+     * Fetch associative array of body and query string parameters.
+     *
+     * Note: This method is not part of the PSR-7 standard.
+     *
+     * @param array|null $only list the keys to retrieve.
+     * @return array|null
+     */
+    public function getParams(array $only = null)
+    {
+        $params = $this->getQueryParams();
+        $postParams = $this->getParsedBody();
+        if ($postParams) {
+            $params = array_merge($params, (array)$postParams);
+        }
+
+        if ($only) {
+            $onlyParams = [];
+            foreach ($only as $key) {
+                if (array_key_exists($key, $params)) {
+                    $onlyParams[$key] = $params[$key];
+                }
+            }
+            return $onlyParams;
+        }
+
+        return $params;
+    }
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Http/RequestBody.php b/advancedcontentfilter/vendor/slim/slim/Slim/Http/RequestBody.php
new file mode 100644
index 00000000..50887fdd
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Http/RequestBody.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Slim Framework (https://slimframework.com)
+ *
+ * @link      https://github.com/slimphp/Slim
+ * @copyright Copyright (c) 2011-2017 Josh Lockhart
+ * @license   https://github.com/slimphp/Slim/blob/3.x/LICENSE.md (MIT License)
+ */
+namespace Slim\Http;
+
+/**
+ * Provides a PSR-7 implementation of a reusable raw request body
+ */
+class RequestBody extends Body
+{
+    /**
+     * Create a new RequestBody.
+     */
+    public function __construct()
+    {
+        $stream = fopen('php://temp', 'w+');
+        stream_copy_to_stream(fopen('php://input', 'r'), $stream);
+        rewind($stream);
+
+        parent::__construct($stream);
+    }
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Http/Response.php b/advancedcontentfilter/vendor/slim/slim/Slim/Http/Response.php
new file mode 100644
index 00000000..d8fb8dcb
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Http/Response.php
@@ -0,0 +1,508 @@
+<?php
+/**
+ * Slim Framework (https://slimframework.com)
+ *
+ * @link      https://github.com/slimphp/Slim
+ * @copyright Copyright (c) 2011-2017 Josh Lockhart
+ * @license   https://github.com/slimphp/Slim/blob/3.x/LICENSE.md (MIT License)
+ */
+namespace Slim\Http;
+
+use InvalidArgumentException;
+use Psr\Http\Message\ResponseInterface;
+use Psr\Http\Message\StreamInterface;
+use Psr\Http\Message\UriInterface;
+use Slim\Interfaces\Http\HeadersInterface;
+
+/**
+ * Response
+ *
+ * This class represents an HTTP response. It manages
+ * the response status, headers, and body
+ * according to the PSR-7 standard.
+ *
+ * @link https://github.com/php-fig/http-message/blob/master/src/MessageInterface.php
+ * @link https://github.com/php-fig/http-message/blob/master/src/ResponseInterface.php
+ */
+class Response extends Message implements ResponseInterface
+{
+    /**
+     * Status code
+     *
+     * @var int
+     */
+    protected $status = 200;
+
+    /**
+     * Reason phrase
+     *
+     * @var string
+     */
+    protected $reasonPhrase = '';
+
+    /**
+     * Status codes and reason phrases
+     *
+     * @var array
+     */
+    protected static $messages = [
+        //Informational 1xx
+        100 => 'Continue',
+        101 => 'Switching Protocols',
+        102 => 'Processing',
+        //Successful 2xx
+        200 => 'OK',
+        201 => 'Created',
+        202 => 'Accepted',
+        203 => 'Non-Authoritative Information',
+        204 => 'No Content',
+        205 => 'Reset Content',
+        206 => 'Partial Content',
+        207 => 'Multi-Status',
+        208 => 'Already Reported',
+        226 => 'IM Used',
+        //Redirection 3xx
+        300 => 'Multiple Choices',
+        301 => 'Moved Permanently',
+        302 => 'Found',
+        303 => 'See Other',
+        304 => 'Not Modified',
+        305 => 'Use Proxy',
+        306 => '(Unused)',
+        307 => 'Temporary Redirect',
+        308 => 'Permanent Redirect',
+        //Client Error 4xx
+        400 => 'Bad Request',
+        401 => 'Unauthorized',
+        402 => 'Payment Required',
+        403 => 'Forbidden',
+        404 => 'Not Found',
+        405 => 'Method Not Allowed',
+        406 => 'Not Acceptable',
+        407 => 'Proxy Authentication Required',
+        408 => 'Request Timeout',
+        409 => 'Conflict',
+        410 => 'Gone',
+        411 => 'Length Required',
+        412 => 'Precondition Failed',
+        413 => 'Request Entity Too Large',
+        414 => 'Request-URI Too Long',
+        415 => 'Unsupported Media Type',
+        416 => 'Requested Range Not Satisfiable',
+        417 => 'Expectation Failed',
+        418 => 'I\'m a teapot',
+        421 => 'Misdirected Request',
+        422 => 'Unprocessable Entity',
+        423 => 'Locked',
+        424 => 'Failed Dependency',
+        426 => 'Upgrade Required',
+        428 => 'Precondition Required',
+        429 => 'Too Many Requests',
+        431 => 'Request Header Fields Too Large',
+        444 => 'Connection Closed Without Response',
+        451 => 'Unavailable For Legal Reasons',
+        499 => 'Client Closed Request',
+        //Server Error 5xx
+        500 => 'Internal Server Error',
+        501 => 'Not Implemented',
+        502 => 'Bad Gateway',
+        503 => 'Service Unavailable',
+        504 => 'Gateway Timeout',
+        505 => 'HTTP Version Not Supported',
+        506 => 'Variant Also Negotiates',
+        507 => 'Insufficient Storage',
+        508 => 'Loop Detected',
+        510 => 'Not Extended',
+        511 => 'Network Authentication Required',
+        599 => 'Network Connect Timeout Error',
+    ];
+
+    /**
+     * EOL characters used for HTTP response.
+     *
+     * @var string
+     */
+     const EOL = "\r\n";
+
+    /**
+     * Create new HTTP response.
+     *
+     * @param int                   $status  The response status code.
+     * @param HeadersInterface|null $headers The response headers.
+     * @param StreamInterface|null  $body    The response body.
+     */
+    public function __construct($status = 200, HeadersInterface $headers = null, StreamInterface $body = null)
+    {
+        $this->status = $this->filterStatus($status);
+        $this->headers = $headers ? $headers : new Headers();
+        $this->body = $body ? $body : new Body(fopen('php://temp', 'r+'));
+    }
+
+    /**
+     * This method is applied to the cloned object
+     * after PHP performs an initial shallow-copy. This
+     * method completes a deep-copy by creating new objects
+     * for the cloned object's internal reference pointers.
+     */
+    public function __clone()
+    {
+        $this->headers = clone $this->headers;
+    }
+
+    /*******************************************************************************
+     * Status
+     ******************************************************************************/
+
+    /**
+     * Gets the response status code.
+     *
+     * The status code is a 3-digit integer result code of the server's attempt
+     * to understand and satisfy the request.
+     *
+     * @return int Status code.
+     */
+    public function getStatusCode()
+    {
+        return $this->status;
+    }
+
+    /**
+     * Return an instance with the specified status code and, optionally, reason phrase.
+     *
+     * If no reason phrase is specified, implementations MAY choose to default
+     * to the RFC 7231 or IANA recommended reason phrase for the response's
+     * status code.
+     *
+     * This method MUST be implemented in such a way as to retain the
+     * immutability of the message, and MUST return an instance that has the
+     * updated status and reason phrase.
+     *
+     * @link http://tools.ietf.org/html/rfc7231#section-6
+     * @link http://www.iana.org/assignments/http-status-codes/http-status-codes.xhtml
+     * @param int $code The 3-digit integer result code to set.
+     * @param string $reasonPhrase The reason phrase to use with the
+     *     provided status code; if none is provided, implementations MAY
+     *     use the defaults as suggested in the HTTP specification.
+     * @return static
+     * @throws \InvalidArgumentException For invalid status code arguments.
+     */
+    public function withStatus($code, $reasonPhrase = '')
+    {
+        $code = $this->filterStatus($code);
+
+        if (!is_string($reasonPhrase) && !method_exists($reasonPhrase, '__toString')) {
+            throw new InvalidArgumentException('ReasonPhrase must be a string');
+        }
+
+        $clone = clone $this;
+        $clone->status = $code;
+        if ($reasonPhrase === '' && isset(static::$messages[$code])) {
+            $reasonPhrase = static::$messages[$code];
+        }
+
+        if ($reasonPhrase === '') {
+            throw new InvalidArgumentException('ReasonPhrase must be supplied for this code');
+        }
+
+        $clone->reasonPhrase = $reasonPhrase;
+
+        return $clone;
+    }
+
+    /**
+     * Filter HTTP status code.
+     *
+     * @param  int $status HTTP status code.
+     * @return int
+     * @throws \InvalidArgumentException If an invalid HTTP status code is provided.
+     */
+    protected function filterStatus($status)
+    {
+        if (!is_integer($status) || $status<100 || $status>599) {
+            throw new InvalidArgumentException('Invalid HTTP status code');
+        }
+
+        return $status;
+    }
+
+    /**
+     * Gets the response reason phrase associated with the status code.
+     *
+     * Because a reason phrase is not a required element in a response
+     * status line, the reason phrase value MAY be null. Implementations MAY
+     * choose to return the default RFC 7231 recommended reason phrase (or those
+     * listed in the IANA HTTP Status Code Registry) for the response's
+     * status code.
+     *
+     * @link http://tools.ietf.org/html/rfc7231#section-6
+     * @link http://www.iana.org/assignments/http-status-codes/http-status-codes.xhtml
+     * @return string Reason phrase; must return an empty string if none present.
+     */
+    public function getReasonPhrase()
+    {
+        if ($this->reasonPhrase) {
+            return $this->reasonPhrase;
+        }
+        if (isset(static::$messages[$this->status])) {
+            return static::$messages[$this->status];
+        }
+        return '';
+    }
+
+    /*******************************************************************************
+     * Headers
+     ******************************************************************************/
+
+    /**
+     * Return an instance with the provided value replacing the specified header.
+     *
+     * If a Location header is set and the status code is 200, then set the status
+     * code to 302 to mimic what PHP does. See https://github.com/slimphp/Slim/issues/1730
+     *
+     * @param string $name Case-insensitive header field name.
+     * @param string|string[] $value Header value(s).
+     * @return static
+     * @throws \InvalidArgumentException for invalid header names or values.
+     */
+    public function withHeader($name, $value)
+    {
+        $clone = clone $this;
+        $clone->headers->set($name, $value);
+
+        if ($clone->getStatusCode() === 200 && strtolower($name) === 'location') {
+            $clone = $clone->withStatus(302);
+        }
+
+        return $clone;
+    }
+
+
+    /*******************************************************************************
+     * Body
+     ******************************************************************************/
+
+    /**
+     * Write data to the response body.
+     *
+     * Note: This method is not part of the PSR-7 standard.
+     *
+     * Proxies to the underlying stream and writes the provided data to it.
+     *
+     * @param string $data
+     * @return $this
+     */
+    public function write($data)
+    {
+        $this->getBody()->write($data);
+
+        return $this;
+    }
+
+    /*******************************************************************************
+     * Response Helpers
+     ******************************************************************************/
+
+    /**
+     * Redirect.
+     *
+     * Note: This method is not part of the PSR-7 standard.
+     *
+     * This method prepares the response object to return an HTTP Redirect
+     * response to the client.
+     *
+     * @param  string|UriInterface $url    The redirect destination.
+     * @param  int|null            $status The redirect HTTP status code.
+     * @return static
+     */
+    public function withRedirect($url, $status = null)
+    {
+        $responseWithRedirect = $this->withHeader('Location', (string)$url);
+
+        if (is_null($status) && $this->getStatusCode() === 200) {
+            $status = 302;
+        }
+
+        if (!is_null($status)) {
+            return $responseWithRedirect->withStatus($status);
+        }
+
+        return $responseWithRedirect;
+    }
+
+    /**
+     * Json.
+     *
+     * Note: This method is not part of the PSR-7 standard.
+     *
+     * This method prepares the response object to return an HTTP Json
+     * response to the client.
+     *
+     * @param  mixed  $data   The data
+     * @param  int    $status The HTTP status code.
+     * @param  int    $encodingOptions Json encoding options
+     * @throws \RuntimeException
+     * @return static
+     */
+    public function withJson($data, $status = null, $encodingOptions = 0)
+    {
+        $response = $this->withBody(new Body(fopen('php://temp', 'r+')));
+        $response->body->write($json = json_encode($data, $encodingOptions));
+
+        // Ensure that the json encoding passed successfully
+        if ($json === false) {
+            throw new \RuntimeException(json_last_error_msg(), json_last_error());
+        }
+
+        $responseWithJson = $response->withHeader('Content-Type', 'application/json;charset=utf-8');
+        if (isset($status)) {
+            return $responseWithJson->withStatus($status);
+        }
+        return $responseWithJson;
+    }
+
+    /**
+     * Is this response empty?
+     *
+     * Note: This method is not part of the PSR-7 standard.
+     *
+     * @return bool
+     */
+    public function isEmpty()
+    {
+        return in_array($this->getStatusCode(), [204, 205, 304]);
+    }
+
+    /**
+     * Is this response informational?
+     *
+     * Note: This method is not part of the PSR-7 standard.
+     *
+     * @return bool
+     */
+    public function isInformational()
+    {
+        return $this->getStatusCode() >= 100 && $this->getStatusCode() < 200;
+    }
+
+    /**
+     * Is this response OK?
+     *
+     * Note: This method is not part of the PSR-7 standard.
+     *
+     * @return bool
+     */
+    public function isOk()
+    {
+        return $this->getStatusCode() === 200;
+    }
+
+    /**
+     * Is this response successful?
+     *
+     * Note: This method is not part of the PSR-7 standard.
+     *
+     * @return bool
+     */
+    public function isSuccessful()
+    {
+        return $this->getStatusCode() >= 200 && $this->getStatusCode() < 300;
+    }
+
+    /**
+     * Is this response a redirect?
+     *
+     * Note: This method is not part of the PSR-7 standard.
+     *
+     * @return bool
+     */
+    public function isRedirect()
+    {
+        return in_array($this->getStatusCode(), [301, 302, 303, 307]);
+    }
+
+    /**
+     * Is this response a redirection?
+     *
+     * Note: This method is not part of the PSR-7 standard.
+     *
+     * @return bool
+     */
+    public function isRedirection()
+    {
+        return $this->getStatusCode() >= 300 && $this->getStatusCode() < 400;
+    }
+
+    /**
+     * Is this response forbidden?
+     *
+     * Note: This method is not part of the PSR-7 standard.
+     *
+     * @return bool
+     * @api
+     */
+    public function isForbidden()
+    {
+        return $this->getStatusCode() === 403;
+    }
+
+    /**
+     * Is this response not Found?
+     *
+     * Note: This method is not part of the PSR-7 standard.
+     *
+     * @return bool
+     */
+    public function isNotFound()
+    {
+        return $this->getStatusCode() === 404;
+    }
+
+    /**
+     * Is this response a client error?
+     *
+     * Note: This method is not part of the PSR-7 standard.
+     *
+     * @return bool
+     */
+    public function isClientError()
+    {
+        return $this->getStatusCode() >= 400 && $this->getStatusCode() < 500;
+    }
+
+    /**
+     * Is this response a server error?
+     *
+     * Note: This method is not part of the PSR-7 standard.
+     *
+     * @return bool
+     */
+    public function isServerError()
+    {
+        return $this->getStatusCode() >= 500 && $this->getStatusCode() < 600;
+    }
+
+    /**
+     * Convert response to string.
+     *
+     * Note: This method is not part of the PSR-7 standard.
+     *
+     * @return string
+     */
+    public function __toString()
+    {
+        $output = sprintf(
+            'HTTP/%s %s %s',
+            $this->getProtocolVersion(),
+            $this->getStatusCode(),
+            $this->getReasonPhrase()
+        );
+        $output .= Response::EOL;
+        foreach ($this->getHeaders() as $name => $values) {
+            $output .= sprintf('%s: %s', $name, $this->getHeaderLine($name)) . Response::EOL;
+        }
+        $output .= Response::EOL;
+        $output .= (string)$this->getBody();
+
+        return $output;
+    }
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Http/Stream.php b/advancedcontentfilter/vendor/slim/slim/Slim/Http/Stream.php
new file mode 100644
index 00000000..27c7a764
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Http/Stream.php
@@ -0,0 +1,450 @@
+<?php
+/**
+ * Slim Framework (https://slimframework.com)
+ *
+ * @link      https://github.com/slimphp/Slim
+ * @copyright Copyright (c) 2011-2017 Josh Lockhart
+ * @license   https://github.com/slimphp/Slim/blob/3.x/LICENSE.md (MIT License)
+ */
+namespace Slim\Http;
+
+use InvalidArgumentException;
+use Psr\Http\Message\StreamInterface;
+use RuntimeException;
+
+/**
+ * Represents a data stream as defined in PSR-7.
+ *
+ * @link https://github.com/php-fig/http-message/blob/master/src/StreamInterface.php
+ */
+class Stream implements StreamInterface
+{
+    /**
+     * Bit mask to determine if the stream is a pipe
+     *
+     * This is octal as per header stat.h
+     */
+    const FSTAT_MODE_S_IFIFO = 0010000;
+
+    /**
+     * Resource modes
+     *
+     * @var  array
+     * @link http://php.net/manual/function.fopen.php
+     */
+    protected static $modes = [
+        'readable' => ['r', 'r+', 'w+', 'a+', 'x+', 'c+'],
+        'writable' => ['r+', 'w', 'w+', 'a', 'a+', 'x', 'x+', 'c', 'c+'],
+    ];
+
+    /**
+     * The underlying stream resource
+     *
+     * @var resource
+     */
+    protected $stream;
+
+    /**
+     * Stream metadata
+     *
+     * @var array
+     */
+    protected $meta;
+
+    /**
+     * Is this stream readable?
+     *
+     * @var bool
+     */
+    protected $readable;
+
+    /**
+     * Is this stream writable?
+     *
+     * @var bool
+     */
+    protected $writable;
+
+    /**
+     * Is this stream seekable?
+     *
+     * @var bool
+     */
+    protected $seekable;
+
+    /**
+     * The size of the stream if known
+     *
+     * @var null|int
+     */
+    protected $size;
+
+    /**
+     * Is this stream a pipe?
+     *
+     * @var bool
+     */
+    protected $isPipe;
+
+    /**
+     * Create a new Stream.
+     *
+     * @param  resource $stream A PHP resource handle.
+     *
+     * @throws InvalidArgumentException If argument is not a resource.
+     */
+    public function __construct($stream)
+    {
+        $this->attach($stream);
+    }
+
+    /**
+     * Get stream metadata as an associative array or retrieve a specific key.
+     *
+     * The keys returned are identical to the keys returned from PHP's
+     * stream_get_meta_data() function.
+     *
+     * @link http://php.net/manual/en/function.stream-get-meta-data.php
+     *
+     * @param string $key Specific metadata to retrieve.
+     *
+     * @return array|mixed|null Returns an associative array if no key is
+     *     provided. Returns a specific key value if a key is provided and the
+     *     value is found, or null if the key is not found.
+     */
+    public function getMetadata($key = null)
+    {
+        $this->meta = stream_get_meta_data($this->stream);
+        if (is_null($key) === true) {
+            return $this->meta;
+        }
+
+        return isset($this->meta[$key]) ? $this->meta[$key] : null;
+    }
+
+    /**
+     * Is a resource attached to this stream?
+     *
+     * Note: This method is not part of the PSR-7 standard.
+     *
+     * @return bool
+     */
+    protected function isAttached()
+    {
+        return is_resource($this->stream);
+    }
+
+    /**
+     * Attach new resource to this object.
+     *
+     * Note: This method is not part of the PSR-7 standard.
+     *
+     * @param resource $newStream A PHP resource handle.
+     *
+     * @throws InvalidArgumentException If argument is not a valid PHP resource.
+     */
+    protected function attach($newStream)
+    {
+        if (is_resource($newStream) === false) {
+            throw new InvalidArgumentException(__METHOD__ . ' argument must be a valid PHP resource');
+        }
+
+        if ($this->isAttached() === true) {
+            $this->detach();
+        }
+
+        $this->stream = $newStream;
+    }
+
+    /**
+     * Separates any underlying resources from the stream.
+     *
+     * After the stream has been detached, the stream is in an unusable state.
+     *
+     * @return resource|null Underlying PHP stream, if any
+     */
+    public function detach()
+    {
+        $oldResource = $this->stream;
+        $this->stream = null;
+        $this->meta = null;
+        $this->readable = null;
+        $this->writable = null;
+        $this->seekable = null;
+        $this->size = null;
+        $this->isPipe = null;
+
+        return $oldResource;
+    }
+
+    /**
+     * Reads all data from the stream into a string, from the beginning to end.
+     *
+     * This method MUST attempt to seek to the beginning of the stream before
+     * reading data and read the stream until the end is reached.
+     *
+     * Warning: This could attempt to load a large amount of data into memory.
+     *
+     * This method MUST NOT raise an exception in order to conform with PHP's
+     * string casting operations.
+     *
+     * @see http://php.net/manual/en/language.oop5.magic.php#object.tostring
+     * @return string
+     */
+    public function __toString()
+    {
+        if (!$this->isAttached()) {
+            return '';
+        }
+
+        try {
+            $this->rewind();
+            return $this->getContents();
+        } catch (RuntimeException $e) {
+            return '';
+        }
+    }
+
+    /**
+     * Closes the stream and any underlying resources.
+     */
+    public function close()
+    {
+        if ($this->isAttached() === true) {
+            if ($this->isPipe()) {
+                pclose($this->stream);
+            } else {
+                fclose($this->stream);
+            }
+        }
+
+        $this->detach();
+    }
+
+    /**
+     * Get the size of the stream if known.
+     *
+     * @return int|null Returns the size in bytes if known, or null if unknown.
+     */
+    public function getSize()
+    {
+        if (!$this->size && $this->isAttached() === true) {
+            $stats = fstat($this->stream);
+            $this->size = isset($stats['size']) && !$this->isPipe() ? $stats['size'] : null;
+        }
+
+        return $this->size;
+    }
+
+    /**
+     * Returns the current position of the file read/write pointer
+     *
+     * @return int Position of the file pointer
+     *
+     * @throws RuntimeException on error.
+     */
+    public function tell()
+    {
+        if (!$this->isAttached() || ($position = ftell($this->stream)) === false || $this->isPipe()) {
+            throw new RuntimeException('Could not get the position of the pointer in stream');
+        }
+
+        return $position;
+    }
+
+    /**
+     * Returns true if the stream is at the end of the stream.
+     *
+     * @return bool
+     */
+    public function eof()
+    {
+        return $this->isAttached() ? feof($this->stream) : true;
+    }
+
+    /**
+     * Returns whether or not the stream is readable.
+     *
+     * @return bool
+     */
+    public function isReadable()
+    {
+        if ($this->readable === null) {
+            if ($this->isPipe()) {
+                $this->readable = true;
+            } else {
+                $this->readable = false;
+                if ($this->isAttached()) {
+                    $meta = $this->getMetadata();
+                    foreach (self::$modes['readable'] as $mode) {
+                        if (strpos($meta['mode'], $mode) === 0) {
+                            $this->readable = true;
+                            break;
+                        }
+                    }
+                }
+            }
+        }
+
+        return $this->readable;
+    }
+
+    /**
+     * Returns whether or not the stream is writable.
+     *
+     * @return bool
+     */
+    public function isWritable()
+    {
+        if ($this->writable === null) {
+            $this->writable = false;
+            if ($this->isAttached()) {
+                $meta = $this->getMetadata();
+                foreach (self::$modes['writable'] as $mode) {
+                    if (strpos($meta['mode'], $mode) === 0) {
+                        $this->writable = true;
+                        break;
+                    }
+                }
+            }
+        }
+
+        return $this->writable;
+    }
+
+    /**
+     * Returns whether or not the stream is seekable.
+     *
+     * @return bool
+     */
+    public function isSeekable()
+    {
+        if ($this->seekable === null) {
+            $this->seekable = false;
+            if ($this->isAttached()) {
+                $meta = $this->getMetadata();
+                $this->seekable = !$this->isPipe() && $meta['seekable'];
+            }
+        }
+
+        return $this->seekable;
+    }
+
+    /**
+     * Seek to a position in the stream.
+     *
+     * @link http://www.php.net/manual/en/function.fseek.php
+     *
+     * @param int $offset Stream offset
+     * @param int $whence Specifies how the cursor position will be calculated
+     *     based on the seek offset. Valid values are identical to the built-in
+     *     PHP $whence values for `fseek()`.  SEEK_SET: Set position equal to
+     *     offset bytes SEEK_CUR: Set position to current location plus offset
+     *     SEEK_END: Set position to end-of-stream plus offset.
+     *
+     * @throws RuntimeException on failure.
+     */
+    public function seek($offset, $whence = SEEK_SET)
+    {
+        // Note that fseek returns 0 on success!
+        if (!$this->isSeekable() || fseek($this->stream, $offset, $whence) === -1) {
+            throw new RuntimeException('Could not seek in stream');
+        }
+    }
+
+    /**
+     * Seek to the beginning of the stream.
+     *
+     * If the stream is not seekable, this method will raise an exception;
+     * otherwise, it will perform a seek(0).
+     *
+     * @see seek()
+     *
+     * @link http://www.php.net/manual/en/function.fseek.php
+     *
+     * @throws RuntimeException on failure.
+     */
+    public function rewind()
+    {
+        if (!$this->isSeekable() || rewind($this->stream) === false) {
+            throw new RuntimeException('Could not rewind stream');
+        }
+    }
+
+    /**
+     * Read data from the stream.
+     *
+     * @param int $length Read up to $length bytes from the object and return
+     *     them. Fewer than $length bytes may be returned if underlying stream
+     *     call returns fewer bytes.
+     *
+     * @return string Returns the data read from the stream, or an empty string
+     *     if no bytes are available.
+     *
+     * @throws RuntimeException if an error occurs.
+     */
+    public function read($length)
+    {
+        if (!$this->isReadable() || ($data = fread($this->stream, $length)) === false) {
+            throw new RuntimeException('Could not read from stream');
+        }
+
+        return $data;
+    }
+
+    /**
+     * Write data to the stream.
+     *
+     * @param string $string The string that is to be written.
+     *
+     * @return int Returns the number of bytes written to the stream.
+     *
+     * @throws RuntimeException on failure.
+     */
+    public function write($string)
+    {
+        if (!$this->isWritable() || ($written = fwrite($this->stream, $string)) === false) {
+            throw new RuntimeException('Could not write to stream');
+        }
+
+        // reset size so that it will be recalculated on next call to getSize()
+        $this->size = null;
+
+        return $written;
+    }
+
+    /**
+     * Returns the remaining contents in a string
+     *
+     * @return string
+     *
+     * @throws RuntimeException if unable to read or an error occurs while
+     *     reading.
+     */
+    public function getContents()
+    {
+        if (!$this->isReadable() || ($contents = stream_get_contents($this->stream)) === false) {
+            throw new RuntimeException('Could not get contents of stream');
+        }
+
+        return $contents;
+    }
+
+    /**
+     * Returns whether or not the stream is a pipe.
+     *
+     * @return bool
+     */
+    public function isPipe()
+    {
+        if ($this->isPipe === null) {
+            $this->isPipe = false;
+            if ($this->isAttached()) {
+                $mode = fstat($this->stream)['mode'];
+                $this->isPipe = ($mode & self::FSTAT_MODE_S_IFIFO) !== 0;
+            }
+        }
+
+        return $this->isPipe;
+    }
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Http/UploadedFile.php b/advancedcontentfilter/vendor/slim/slim/Slim/Http/UploadedFile.php
new file mode 100644
index 00000000..ae5dfb65
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Http/UploadedFile.php
@@ -0,0 +1,327 @@
+<?php
+/**
+ * Slim Framework (https://slimframework.com)
+ *
+ * @link      https://github.com/slimphp/Slim
+ * @copyright Copyright (c) 2011-2017 Josh Lockhart
+ * @license   https://github.com/slimphp/Slim/blob/3.x/LICENSE.md (MIT License)
+ */
+namespace Slim\Http;
+
+use RuntimeException;
+use InvalidArgumentException;
+use Psr\Http\Message\StreamInterface;
+use Psr\Http\Message\UploadedFileInterface;
+
+/**
+ * Represents Uploaded Files.
+ *
+ * It manages and normalizes uploaded files according to the PSR-7 standard.
+ *
+ * @link https://github.com/php-fig/http-message/blob/master/src/UploadedFileInterface.php
+ * @link https://github.com/php-fig/http-message/blob/master/src/StreamInterface.php
+ */
+class UploadedFile implements UploadedFileInterface
+{
+    /**
+     * The client-provided full path to the file
+     *
+     * @note this is public to maintain BC with 3.1.0 and earlier.
+     *
+     * @var string
+     */
+    public $file;
+    /**
+     * The client-provided file name.
+     *
+     * @var string
+     */
+    protected $name;
+    /**
+     * The client-provided media type of the file.
+     *
+     * @var string
+     */
+    protected $type;
+    /**
+     * The size of the file in bytes.
+     *
+     * @var int
+     */
+    protected $size;
+    /**
+     * A valid PHP UPLOAD_ERR_xxx code for the file upload.
+     *
+     * @var int
+     */
+    protected $error = UPLOAD_ERR_OK;
+    /**
+     * Indicates if the upload is from a SAPI environment.
+     *
+     * @var bool
+     */
+    protected $sapi = false;
+    /**
+     * An optional StreamInterface wrapping the file resource.
+     *
+     * @var StreamInterface
+     */
+    protected $stream;
+    /**
+     * Indicates if the uploaded file has already been moved.
+     *
+     * @var bool
+     */
+    protected $moved = false;
+
+    /**
+     * Create a normalized tree of UploadedFile instances from the Environment.
+     *
+     * @param Environment $env The environment
+     *
+     * @return array|null A normalized tree of UploadedFile instances or null if none are provided.
+     */
+    public static function createFromEnvironment(Environment $env)
+    {
+        if (is_array($env['slim.files']) && $env->has('slim.files')) {
+            return $env['slim.files'];
+        } elseif (isset($_FILES)) {
+            return static::parseUploadedFiles($_FILES);
+        }
+
+        return [];
+    }
+
+    /**
+     * Parse a non-normalized, i.e. $_FILES superglobal, tree of uploaded file data.
+     *
+     * @param array $uploadedFiles The non-normalized tree of uploaded file data.
+     *
+     * @return array A normalized tree of UploadedFile instances.
+     */
+    private static function parseUploadedFiles(array $uploadedFiles)
+    {
+        $parsed = [];
+        foreach ($uploadedFiles as $field => $uploadedFile) {
+            if (!isset($uploadedFile['error'])) {
+                if (is_array($uploadedFile)) {
+                    $parsed[$field] = static::parseUploadedFiles($uploadedFile);
+                }
+                continue;
+            }
+
+            $parsed[$field] = [];
+            if (!is_array($uploadedFile['error'])) {
+                $parsed[$field] = new static(
+                    $uploadedFile['tmp_name'],
+                    isset($uploadedFile['name']) ? $uploadedFile['name'] : null,
+                    isset($uploadedFile['type']) ? $uploadedFile['type'] : null,
+                    isset($uploadedFile['size']) ? $uploadedFile['size'] : null,
+                    $uploadedFile['error'],
+                    true
+                );
+            } else {
+                $subArray = [];
+                foreach ($uploadedFile['error'] as $fileIdx => $error) {
+                    // normalise subarray and re-parse to move the input's keyname up a level
+                    $subArray[$fileIdx]['name'] = $uploadedFile['name'][$fileIdx];
+                    $subArray[$fileIdx]['type'] = $uploadedFile['type'][$fileIdx];
+                    $subArray[$fileIdx]['tmp_name'] = $uploadedFile['tmp_name'][$fileIdx];
+                    $subArray[$fileIdx]['error'] = $uploadedFile['error'][$fileIdx];
+                    $subArray[$fileIdx]['size'] = $uploadedFile['size'][$fileIdx];
+
+                    $parsed[$field] = static::parseUploadedFiles($subArray);
+                }
+            }
+        }
+
+        return $parsed;
+    }
+
+    /**
+     * Construct a new UploadedFile instance.
+     *
+     * @param string      $file The full path to the uploaded file provided by the client.
+     * @param string|null $name The file name.
+     * @param string|null $type The file media type.
+     * @param int|null    $size The file size in bytes.
+     * @param int         $error The UPLOAD_ERR_XXX code representing the status of the upload.
+     * @param bool        $sapi Indicates if the upload is in a SAPI environment.
+     */
+    public function __construct($file, $name = null, $type = null, $size = null, $error = UPLOAD_ERR_OK, $sapi = false)
+    {
+        $this->file = $file;
+        $this->name = $name;
+        $this->type = $type;
+        $this->size = $size;
+        $this->error = $error;
+        $this->sapi = $sapi;
+    }
+
+    /**
+     * Retrieve a stream representing the uploaded file.
+     *
+     * This method MUST return a StreamInterface instance, representing the
+     * uploaded file. The purpose of this method is to allow utilizing native PHP
+     * stream functionality to manipulate the file upload, such as
+     * stream_copy_to_stream() (though the result will need to be decorated in a
+     * native PHP stream wrapper to work with such functions).
+     *
+     * If the moveTo() method has been called previously, this method MUST raise
+     * an exception.
+     *
+     * @return StreamInterface Stream representation of the uploaded file.
+     * @throws \RuntimeException in cases when no stream is available or can be
+     *     created.
+     */
+    public function getStream()
+    {
+        if ($this->moved) {
+            throw new \RuntimeException(sprintf('Uploaded file %1s has already been moved', $this->name));
+        }
+        if ($this->stream === null) {
+            $this->stream = new Stream(fopen($this->file, 'r'));
+        }
+
+        return $this->stream;
+    }
+
+    /**
+     * Move the uploaded file to a new location.
+     *
+     * Use this method as an alternative to move_uploaded_file(). This method is
+     * guaranteed to work in both SAPI and non-SAPI environments.
+     * Implementations must determine which environment they are in, and use the
+     * appropriate method (move_uploaded_file(), rename(), or a stream
+     * operation) to perform the operation.
+     *
+     * $targetPath may be an absolute path, or a relative path. If it is a
+     * relative path, resolution should be the same as used by PHP's rename()
+     * function.
+     *
+     * The original file or stream MUST be removed on completion.
+     *
+     * If this method is called more than once, any subsequent calls MUST raise
+     * an exception.
+     *
+     * When used in an SAPI environment where $_FILES is populated, when writing
+     * files via moveTo(), is_uploaded_file() and move_uploaded_file() SHOULD be
+     * used to ensure permissions and upload status are verified correctly.
+     *
+     * If you wish to move to a stream, use getStream(), as SAPI operations
+     * cannot guarantee writing to stream destinations.
+     *
+     * @see http://php.net/is_uploaded_file
+     * @see http://php.net/move_uploaded_file
+     *
+     * @param string $targetPath Path to which to move the uploaded file.
+     *
+     * @throws InvalidArgumentException if the $path specified is invalid.
+     * @throws RuntimeException on any error during the move operation, or on
+     *     the second or subsequent call to the method.
+     */
+    public function moveTo($targetPath)
+    {
+        if ($this->moved) {
+            throw new RuntimeException('Uploaded file already moved');
+        }
+
+        $targetIsStream = strpos($targetPath, '://') > 0;
+        if (!$targetIsStream && !is_writable(dirname($targetPath))) {
+            throw new InvalidArgumentException('Upload target path is not writable');
+        }
+
+        if ($targetIsStream) {
+            if (!copy($this->file, $targetPath)) {
+                throw new RuntimeException(sprintf('Error moving uploaded file %1s to %2s', $this->name, $targetPath));
+            }
+            if (!unlink($this->file)) {
+                throw new RuntimeException(sprintf('Error removing uploaded file %1s', $this->name));
+            }
+        } elseif ($this->sapi) {
+            if (!is_uploaded_file($this->file)) {
+                throw new RuntimeException(sprintf('%1s is not a valid uploaded file', $this->file));
+            }
+
+            if (!move_uploaded_file($this->file, $targetPath)) {
+                throw new RuntimeException(sprintf('Error moving uploaded file %1s to %2s', $this->name, $targetPath));
+            }
+        } else {
+            if (!rename($this->file, $targetPath)) {
+                throw new RuntimeException(sprintf('Error moving uploaded file %1s to %2s', $this->name, $targetPath));
+            }
+        }
+
+        $this->moved = true;
+    }
+
+    /**
+     * Retrieve the error associated with the uploaded file.
+     *
+     * The return value MUST be one of PHP's UPLOAD_ERR_XXX constants.
+     *
+     * If the file was uploaded successfully, this method MUST return
+     * UPLOAD_ERR_OK.
+     *
+     * Implementations SHOULD return the value stored in the "error" key of
+     * the file in the $_FILES array.
+     *
+     * @see http://php.net/manual/en/features.file-upload.errors.php
+     *
+     * @return int One of PHP's UPLOAD_ERR_XXX constants.
+     */
+    public function getError()
+    {
+        return $this->error;
+    }
+
+    /**
+     * Retrieve the filename sent by the client.
+     *
+     * Do not trust the value returned by this method. A client could send
+     * a malicious filename with the intention to corrupt or hack your
+     * application.
+     *
+     * Implementations SHOULD return the value stored in the "name" key of
+     * the file in the $_FILES array.
+     *
+     * @return string|null The filename sent by the client or null if none
+     *     was provided.
+     */
+    public function getClientFilename()
+    {
+        return $this->name;
+    }
+
+    /**
+     * Retrieve the media type sent by the client.
+     *
+     * Do not trust the value returned by this method. A client could send
+     * a malicious media type with the intention to corrupt or hack your
+     * application.
+     *
+     * Implementations SHOULD return the value stored in the "type" key of
+     * the file in the $_FILES array.
+     *
+     * @return string|null The media type sent by the client or null if none
+     *     was provided.
+     */
+    public function getClientMediaType()
+    {
+        return $this->type;
+    }
+
+    /**
+     * Retrieve the file size.
+     *
+     * Implementations SHOULD return the value stored in the "size" key of
+     * the file in the $_FILES array if available, as PHP calculates this based
+     * on the actual size transmitted.
+     *
+     * @return int|null The file size in bytes or null if unknown.
+     */
+    public function getSize()
+    {
+        return $this->size;
+    }
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Http/Uri.php b/advancedcontentfilter/vendor/slim/slim/Slim/Http/Uri.php
new file mode 100644
index 00000000..fb0f04b5
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Http/Uri.php
@@ -0,0 +1,845 @@
+<?php
+/**
+ * Slim Framework (https://slimframework.com)
+ *
+ * @link      https://github.com/slimphp/Slim
+ * @copyright Copyright (c) 2011-2017 Josh Lockhart
+ * @license   https://github.com/slimphp/Slim/blob/3.x/LICENSE.md (MIT License)
+ */
+namespace Slim\Http;
+
+use InvalidArgumentException;
+use \Psr\Http\Message\UriInterface;
+use Slim\Http\Environment;
+
+/**
+ * Value object representing a URI.
+ *
+ * This interface is meant to represent URIs according to RFC 3986 and to
+ * provide methods for most common operations. Additional functionality for
+ * working with URIs can be provided on top of the interface or externally.
+ * Its primary use is for HTTP requests, but may also be used in other
+ * contexts.
+ *
+ * Instances of this interface are considered immutable; all methods that
+ * might change state MUST be implemented such that they retain the internal
+ * state of the current instance and return an instance that contains the
+ * changed state.
+ *
+ * Typically the Host header will be also be present in the request message.
+ * For server-side requests, the scheme will typically be discoverable in the
+ * server parameters.
+ *
+ * @link http://tools.ietf.org/html/rfc3986 (the URI specification)
+ */
+class Uri implements UriInterface
+{
+    /**
+     * Uri scheme (without "://" suffix)
+     *
+     * @var string
+     */
+    protected $scheme = '';
+
+    /**
+     * Uri user
+     *
+     * @var string
+     */
+    protected $user = '';
+
+    /**
+     * Uri password
+     *
+     * @var string
+     */
+    protected $password = '';
+
+    /**
+     * Uri host
+     *
+     * @var string
+     */
+    protected $host = '';
+
+    /**
+     * Uri port number
+     *
+     * @var null|int
+     */
+    protected $port;
+
+    /**
+     * Uri base path
+     *
+     * @var string
+     */
+    protected $basePath = '';
+
+    /**
+     * Uri path
+     *
+     * @var string
+     */
+    protected $path = '';
+
+    /**
+     * Uri query string (without "?" prefix)
+     *
+     * @var string
+     */
+    protected $query = '';
+
+    /**
+     * Uri fragment string (without "#" prefix)
+     *
+     * @var string
+     */
+    protected $fragment = '';
+
+    /**
+     * Create new Uri.
+     *
+     * @param string $scheme   Uri scheme.
+     * @param string $host     Uri host.
+     * @param int    $port     Uri port number.
+     * @param string $path     Uri path.
+     * @param string $query    Uri query string.
+     * @param string $fragment Uri fragment.
+     * @param string $user     Uri user.
+     * @param string $password Uri password.
+     */
+    public function __construct(
+        $scheme,
+        $host,
+        $port = null,
+        $path = '/',
+        $query = '',
+        $fragment = '',
+        $user = '',
+        $password = ''
+    ) {
+        $this->scheme = $this->filterScheme($scheme);
+        $this->host = $host;
+        $this->port = $this->filterPort($port);
+        $this->path = empty($path) ? '/' : $this->filterPath($path);
+        $this->query = $this->filterQuery($query);
+        $this->fragment = $this->filterQuery($fragment);
+        $this->user = $user;
+        $this->password = $password;
+    }
+
+    /**
+     * Create new Uri from string.
+     *
+     * @param  string $uri Complete Uri string
+     *     (i.e., https://user:pass@host:443/path?query).
+     *
+     * @return self
+     */
+    public static function createFromString($uri)
+    {
+        if (!is_string($uri) && !method_exists($uri, '__toString')) {
+            throw new InvalidArgumentException('Uri must be a string');
+        }
+
+        $parts = parse_url($uri);
+        $scheme = isset($parts['scheme']) ? $parts['scheme'] : '';
+        $user = isset($parts['user']) ? $parts['user'] : '';
+        $pass = isset($parts['pass']) ? $parts['pass'] : '';
+        $host = isset($parts['host']) ? $parts['host'] : '';
+        $port = isset($parts['port']) ? $parts['port'] : null;
+        $path = isset($parts['path']) ? $parts['path'] : '';
+        $query = isset($parts['query']) ? $parts['query'] : '';
+        $fragment = isset($parts['fragment']) ? $parts['fragment'] : '';
+
+        return new static($scheme, $host, $port, $path, $query, $fragment, $user, $pass);
+    }
+
+    /**
+     * Create new Uri from environment.
+     *
+     * @param Environment $env
+     *
+     * @return self
+     */
+    public static function createFromEnvironment(Environment $env)
+    {
+        // Scheme
+        $isSecure = $env->get('HTTPS');
+        $scheme = (empty($isSecure) || $isSecure === 'off') ? 'http' : 'https';
+
+        // Authority: Username and password
+        $username = $env->get('PHP_AUTH_USER', '');
+        $password = $env->get('PHP_AUTH_PW', '');
+
+        // Authority: Host
+        if ($env->has('HTTP_HOST')) {
+            $host = $env->get('HTTP_HOST');
+        } else {
+            $host = $env->get('SERVER_NAME');
+        }
+
+        // Authority: Port
+        $port = (int)$env->get('SERVER_PORT', 80);
+        if (preg_match('/^(\[[a-fA-F0-9:.]+\])(:\d+)?\z/', $host, $matches)) {
+            $host = $matches[1];
+
+            if (isset($matches[2])) {
+                $port = (int) substr($matches[2], 1);
+            }
+        } else {
+            $pos = strpos($host, ':');
+            if ($pos !== false) {
+                $port = (int) substr($host, $pos + 1);
+                $host = strstr($host, ':', true);
+            }
+        }
+
+        // Path
+        $requestScriptName = parse_url($env->get('SCRIPT_NAME'), PHP_URL_PATH);
+        $requestScriptDir = dirname($requestScriptName);
+
+        // parse_url() requires a full URL. As we don't extract the domain name or scheme,
+        // we use a stand-in.
+        $requestUri = parse_url('http://example.com' . $env->get('REQUEST_URI'), PHP_URL_PATH);
+
+        $basePath = '';
+        $virtualPath = $requestUri;
+        if (stripos($requestUri, $requestScriptName) === 0) {
+            $basePath = $requestScriptName;
+        } elseif ($requestScriptDir !== '/' && stripos($requestUri, $requestScriptDir) === 0) {
+            $basePath = $requestScriptDir;
+        }
+
+        if ($basePath) {
+            $virtualPath = ltrim(substr($requestUri, strlen($basePath)), '/');
+        }
+
+        // Query string
+        $queryString = $env->get('QUERY_STRING', '');
+        if ($queryString === '') {
+            $queryString = parse_url('http://example.com' . $env->get('REQUEST_URI'), PHP_URL_QUERY);
+        }
+
+        // Fragment
+        $fragment = '';
+
+        // Build Uri
+        $uri = new static($scheme, $host, $port, $virtualPath, $queryString, $fragment, $username, $password);
+        if ($basePath) {
+            $uri = $uri->withBasePath($basePath);
+        }
+
+        return $uri;
+    }
+
+    /********************************************************************************
+     * Scheme
+     *******************************************************************************/
+
+    /**
+     * Retrieve the scheme component of the URI.
+     *
+     * If no scheme is present, this method MUST return an empty string.
+     *
+     * The value returned MUST be normalized to lowercase, per RFC 3986
+     * Section 3.1.
+     *
+     * The trailing ":" character is not part of the scheme and MUST NOT be
+     * added.
+     *
+     * @see https://tools.ietf.org/html/rfc3986#section-3.1
+     * @return string The URI scheme.
+     */
+    public function getScheme()
+    {
+        return $this->scheme;
+    }
+
+    /**
+     * Return an instance with the specified scheme.
+     *
+     * This method MUST retain the state of the current instance, and return
+     * an instance that contains the specified scheme.
+     *
+     * Implementations MUST support the schemes "http" and "https" case
+     * insensitively, and MAY accommodate other schemes if required.
+     *
+     * An empty scheme is equivalent to removing the scheme.
+     *
+     * @param string $scheme The scheme to use with the new instance.
+     * @return self A new instance with the specified scheme.
+     * @throws \InvalidArgumentException for invalid or unsupported schemes.
+     */
+    public function withScheme($scheme)
+    {
+        $scheme = $this->filterScheme($scheme);
+        $clone = clone $this;
+        $clone->scheme = $scheme;
+
+        return $clone;
+    }
+
+    /**
+     * Filter Uri scheme.
+     *
+     * @param  string $scheme Raw Uri scheme.
+     * @return string
+     *
+     * @throws InvalidArgumentException If the Uri scheme is not a string.
+     * @throws InvalidArgumentException If Uri scheme is not "", "https", or "http".
+     */
+    protected function filterScheme($scheme)
+    {
+        static $valid = [
+            '' => true,
+            'https' => true,
+            'http' => true,
+        ];
+
+        if (!is_string($scheme) && !method_exists($scheme, '__toString')) {
+            throw new InvalidArgumentException('Uri scheme must be a string');
+        }
+
+        $scheme = str_replace('://', '', strtolower((string)$scheme));
+        if (!isset($valid[$scheme])) {
+            throw new InvalidArgumentException('Uri scheme must be one of: "", "https", "http"');
+        }
+
+        return $scheme;
+    }
+
+    /********************************************************************************
+     * Authority
+     *******************************************************************************/
+
+    /**
+     * Retrieve the authority component of the URI.
+     *
+     * If no authority information is present, this method MUST return an empty
+     * string.
+     *
+     * The authority syntax of the URI is:
+     *
+     * <pre>
+     * [user-info@]host[:port]
+     * </pre>
+     *
+     * If the port component is not set or is the standard port for the current
+     * scheme, it SHOULD NOT be included.
+     *
+     * @see https://tools.ietf.org/html/rfc3986#section-3.2
+     * @return string The URI authority, in "[user-info@]host[:port]" format.
+     */
+    public function getAuthority()
+    {
+        $userInfo = $this->getUserInfo();
+        $host = $this->getHost();
+        $port = $this->getPort();
+
+        return ($userInfo ? $userInfo . '@' : '') . $host . ($port !== null ? ':' . $port : '');
+    }
+
+    /**
+     * Retrieve the user information component of the URI.
+     *
+     * If no user information is present, this method MUST return an empty
+     * string.
+     *
+     * If a user is present in the URI, this will return that value;
+     * additionally, if the password is also present, it will be appended to the
+     * user value, with a colon (":") separating the values.
+     *
+     * The trailing "@" character is not part of the user information and MUST
+     * NOT be added.
+     *
+     * @return string The URI user information, in "username[:password]" format.
+     */
+    public function getUserInfo()
+    {
+        return $this->user . ($this->password ? ':' . $this->password : '');
+    }
+
+    /**
+     * Return an instance with the specified user information.
+     *
+     * This method MUST retain the state of the current instance, and return
+     * an instance that contains the specified user information.
+     *
+     * Password is optional, but the user information MUST include the
+     * user; an empty string for the user is equivalent to removing user
+     * information.
+     *
+     * @param string $user The user name to use for authority.
+     * @param null|string $password The password associated with $user.
+     * @return self A new instance with the specified user information.
+     */
+    public function withUserInfo($user, $password = null)
+    {
+        $clone = clone $this;
+        $clone->user = $this->filterUserInfo($user);
+        if ($clone->user) {
+            $clone->password = $password ? $this->filterUserInfo($password) : '';
+        } else {
+            $clone->password = '';
+        }
+
+        return $clone;
+    }
+
+    /**
+     * Filters the user info string.
+     *
+     * @param string $query The raw uri query string.
+     * @return string The percent-encoded query string.
+     */
+    protected function filterUserInfo($query)
+    {
+        return preg_replace_callback(
+            '/(?:[^a-zA-Z0-9_\-\.~!\$&\'\(\)\*\+,;=]+|%(?![A-Fa-f0-9]{2}))/u',
+            function ($match) {
+                return rawurlencode($match[0]);
+            },
+            $query
+        );
+    }
+
+    /**
+     * Retrieve the host component of the URI.
+     *
+     * If no host is present, this method MUST return an empty string.
+     *
+     * The value returned MUST be normalized to lowercase, per RFC 3986
+     * Section 3.2.2.
+     *
+     * @see http://tools.ietf.org/html/rfc3986#section-3.2.2
+     * @return string The URI host.
+     */
+    public function getHost()
+    {
+        return $this->host;
+    }
+
+    /**
+     * Return an instance with the specified host.
+     *
+     * This method MUST retain the state of the current instance, and return
+     * an instance that contains the specified host.
+     *
+     * An empty host value is equivalent to removing the host.
+     *
+     * @param string $host The hostname to use with the new instance.
+     * @return self A new instance with the specified host.
+     * @throws \InvalidArgumentException for invalid hostnames.
+     */
+    public function withHost($host)
+    {
+        $clone = clone $this;
+        $clone->host = $host;
+
+        return $clone;
+    }
+
+    /**
+     * Retrieve the port component of the URI.
+     *
+     * If a port is present, and it is non-standard for the current scheme,
+     * this method MUST return it as an integer. If the port is the standard port
+     * used with the current scheme, this method SHOULD return null.
+     *
+     * If no port is present, and no scheme is present, this method MUST return
+     * a null value.
+     *
+     * If no port is present, but a scheme is present, this method MAY return
+     * the standard port for that scheme, but SHOULD return null.
+     *
+     * @return null|int The URI port.
+     */
+    public function getPort()
+    {
+        return $this->port && !$this->hasStandardPort() ? $this->port : null;
+    }
+
+    /**
+     * Return an instance with the specified port.
+     *
+     * This method MUST retain the state of the current instance, and return
+     * an instance that contains the specified port.
+     *
+     * Implementations MUST raise an exception for ports outside the
+     * established TCP and UDP port ranges.
+     *
+     * A null value provided for the port is equivalent to removing the port
+     * information.
+     *
+     * @param null|int $port The port to use with the new instance; a null value
+     *     removes the port information.
+     * @return self A new instance with the specified port.
+     * @throws \InvalidArgumentException for invalid ports.
+     */
+    public function withPort($port)
+    {
+        $port = $this->filterPort($port);
+        $clone = clone $this;
+        $clone->port = $port;
+
+        return $clone;
+    }
+
+    /**
+     * Does this Uri use a standard port?
+     *
+     * @return bool
+     */
+    protected function hasStandardPort()
+    {
+        return ($this->scheme === 'http' && $this->port === 80) || ($this->scheme === 'https' && $this->port === 443);
+    }
+
+    /**
+     * Filter Uri port.
+     *
+     * @param  null|int $port The Uri port number.
+     * @return null|int
+     *
+     * @throws InvalidArgumentException If the port is invalid.
+     */
+    protected function filterPort($port)
+    {
+        if (is_null($port) || (is_integer($port) && ($port >= 1 && $port <= 65535))) {
+            return $port;
+        }
+
+        throw new InvalidArgumentException('Uri port must be null or an integer between 1 and 65535 (inclusive)');
+    }
+
+    /********************************************************************************
+     * Path
+     *******************************************************************************/
+
+    /**
+     * Retrieve the path component of the URI.
+     *
+     * The path can either be empty or absolute (starting with a slash) or
+     * rootless (not starting with a slash). Implementations MUST support all
+     * three syntaxes.
+     *
+     * Normally, the empty path "" and absolute path "/" are considered equal as
+     * defined in RFC 7230 Section 2.7.3. But this method MUST NOT automatically
+     * do this normalization because in contexts with a trimmed base path, e.g.
+     * the front controller, this difference becomes significant. It's the task
+     * of the user to handle both "" and "/".
+     *
+     * The value returned MUST be percent-encoded, but MUST NOT double-encode
+     * any characters. To determine what characters to encode, please refer to
+     * RFC 3986, Sections 2 and 3.3.
+     *
+     * As an example, if the value should include a slash ("/") not intended as
+     * delimiter between path segments, that value MUST be passed in encoded
+     * form (e.g., "%2F") to the instance.
+     *
+     * @see https://tools.ietf.org/html/rfc3986#section-2
+     * @see https://tools.ietf.org/html/rfc3986#section-3.3
+     * @return string The URI path.
+     */
+    public function getPath()
+    {
+        return $this->path;
+    }
+
+    /**
+     * Return an instance with the specified path.
+     *
+     * This method MUST retain the state of the current instance, and return
+     * an instance that contains the specified path.
+     *
+     * The path can either be empty or absolute (starting with a slash) or
+     * rootless (not starting with a slash). Implementations MUST support all
+     * three syntaxes.
+     *
+     * If the path is intended to be domain-relative rather than path relative then
+     * it must begin with a slash ("/"). Paths not starting with a slash ("/")
+     * are assumed to be relative to some base path known to the application or
+     * consumer.
+     *
+     * Users can provide both encoded and decoded path characters.
+     * Implementations ensure the correct encoding as outlined in getPath().
+     *
+     * @param string $path The path to use with the new instance.
+     * @return self A new instance with the specified path.
+     * @throws \InvalidArgumentException for invalid paths.
+     */
+    public function withPath($path)
+    {
+        if (!is_string($path)) {
+            throw new InvalidArgumentException('Uri path must be a string');
+        }
+
+        $clone = clone $this;
+        $clone->path = $this->filterPath($path);
+
+        // if the path is absolute, then clear basePath
+        if (substr($path, 0, 1) == '/') {
+            $clone->basePath = '';
+        }
+
+        return $clone;
+    }
+
+    /**
+     * Retrieve the base path segment of the URI.
+     *
+     * Note: This method is not part of the PSR-7 standard.
+     *
+     * This method MUST return a string; if no path is present it MUST return
+     * an empty string.
+     *
+     * @return string The base path segment of the URI.
+     */
+    public function getBasePath()
+    {
+        return $this->basePath;
+    }
+
+    /**
+     * Set base path.
+     *
+     * Note: This method is not part of the PSR-7 standard.
+     *
+     * @param  string $basePath
+     * @return self
+     */
+    public function withBasePath($basePath)
+    {
+        if (!is_string($basePath)) {
+            throw new InvalidArgumentException('Uri path must be a string');
+        }
+        if (!empty($basePath)) {
+            $basePath = '/' . trim($basePath, '/'); // <-- Trim on both sides
+        }
+        $clone = clone $this;
+
+        if ($basePath !== '/') {
+            $clone->basePath = $this->filterPath($basePath);
+        }
+
+        return $clone;
+    }
+
+    /**
+     * Filter Uri path.
+     *
+     * This method percent-encodes all reserved
+     * characters in the provided path string. This method
+     * will NOT double-encode characters that are already
+     * percent-encoded.
+     *
+     * @param  string $path The raw uri path.
+     * @return string       The RFC 3986 percent-encoded uri path.
+     * @link   http://www.faqs.org/rfcs/rfc3986.html
+     */
+    protected function filterPath($path)
+    {
+        return preg_replace_callback(
+            '/(?:[^a-zA-Z0-9_\-\.~:@&=\+\$,\/;%]+|%(?![A-Fa-f0-9]{2}))/',
+            function ($match) {
+                return rawurlencode($match[0]);
+            },
+            $path
+        );
+    }
+
+    /********************************************************************************
+     * Query
+     *******************************************************************************/
+
+    /**
+     * Retrieve the query string of the URI.
+     *
+     * If no query string is present, this method MUST return an empty string.
+     *
+     * The leading "?" character is not part of the query and MUST NOT be
+     * added.
+     *
+     * The value returned MUST be percent-encoded, but MUST NOT double-encode
+     * any characters. To determine what characters to encode, please refer to
+     * RFC 3986, Sections 2 and 3.4.
+     *
+     * As an example, if a value in a key/value pair of the query string should
+     * include an ampersand ("&") not intended as a delimiter between values,
+     * that value MUST be passed in encoded form (e.g., "%26") to the instance.
+     *
+     * @see https://tools.ietf.org/html/rfc3986#section-2
+     * @see https://tools.ietf.org/html/rfc3986#section-3.4
+     * @return string The URI query string.
+     */
+    public function getQuery()
+    {
+        return $this->query;
+    }
+
+    /**
+     * Return an instance with the specified query string.
+     *
+     * This method MUST retain the state of the current instance, and return
+     * an instance that contains the specified query string.
+     *
+     * Users can provide both encoded and decoded query characters.
+     * Implementations ensure the correct encoding as outlined in getQuery().
+     *
+     * An empty query string value is equivalent to removing the query string.
+     *
+     * @param string $query The query string to use with the new instance.
+     * @return self A new instance with the specified query string.
+     * @throws \InvalidArgumentException for invalid query strings.
+     */
+    public function withQuery($query)
+    {
+        if (!is_string($query) && !method_exists($query, '__toString')) {
+            throw new InvalidArgumentException('Uri query must be a string');
+        }
+        $query = ltrim((string)$query, '?');
+        $clone = clone $this;
+        $clone->query = $this->filterQuery($query);
+
+        return $clone;
+    }
+
+    /**
+     * Filters the query string or fragment of a URI.
+     *
+     * @param string $query The raw uri query string.
+     * @return string The percent-encoded query string.
+     */
+    protected function filterQuery($query)
+    {
+        return preg_replace_callback(
+            '/(?:[^a-zA-Z0-9_\-\.~!\$&\'\(\)\*\+,;=%:@\/\?]+|%(?![A-Fa-f0-9]{2}))/',
+            function ($match) {
+                return rawurlencode($match[0]);
+            },
+            $query
+        );
+    }
+
+    /********************************************************************************
+     * Fragment
+     *******************************************************************************/
+
+    /**
+     * Retrieve the fragment component of the URI.
+     *
+     * If no fragment is present, this method MUST return an empty string.
+     *
+     * The leading "#" character is not part of the fragment and MUST NOT be
+     * added.
+     *
+     * The value returned MUST be percent-encoded, but MUST NOT double-encode
+     * any characters. To determine what characters to encode, please refer to
+     * RFC 3986, Sections 2 and 3.5.
+     *
+     * @see https://tools.ietf.org/html/rfc3986#section-2
+     * @see https://tools.ietf.org/html/rfc3986#section-3.5
+     * @return string The URI fragment.
+     */
+    public function getFragment()
+    {
+        return $this->fragment;
+    }
+
+    /**
+     * Return an instance with the specified URI fragment.
+     *
+     * This method MUST retain the state of the current instance, and return
+     * an instance that contains the specified URI fragment.
+     *
+     * Users can provide both encoded and decoded fragment characters.
+     * Implementations ensure the correct encoding as outlined in getFragment().
+     *
+     * An empty fragment value is equivalent to removing the fragment.
+     *
+     * @param string $fragment The fragment to use with the new instance.
+     * @return self A new instance with the specified fragment.
+     */
+    public function withFragment($fragment)
+    {
+        if (!is_string($fragment) && !method_exists($fragment, '__toString')) {
+            throw new InvalidArgumentException('Uri fragment must be a string');
+        }
+        $fragment = ltrim((string)$fragment, '#');
+        $clone = clone $this;
+        $clone->fragment = $this->filterQuery($fragment);
+
+        return $clone;
+    }
+
+    /********************************************************************************
+     * Helpers
+     *******************************************************************************/
+
+    /**
+     * Return the string representation as a URI reference.
+     *
+     * Depending on which components of the URI are present, the resulting
+     * string is either a full URI or relative reference according to RFC 3986,
+     * Section 4.1. The method concatenates the various components of the URI,
+     * using the appropriate delimiters:
+     *
+     * - If a scheme is present, it MUST be suffixed by ":".
+     * - If an authority is present, it MUST be prefixed by "//".
+     * - The path can be concatenated without delimiters. But there are two
+     *   cases where the path has to be adjusted to make the URI reference
+     *   valid as PHP does not allow to throw an exception in __toString():
+     *     - If the path is rootless and an authority is present, the path MUST
+     *       be prefixed by "/".
+     *     - If the path is starting with more than one "/" and no authority is
+     *       present, the starting slashes MUST be reduced to one.
+     * - If a query is present, it MUST be prefixed by "?".
+     * - If a fragment is present, it MUST be prefixed by "#".
+     *
+     * @see http://tools.ietf.org/html/rfc3986#section-4.1
+     * @return string
+     */
+    public function __toString()
+    {
+        $scheme = $this->getScheme();
+        $authority = $this->getAuthority();
+        $basePath = $this->getBasePath();
+        $path = $this->getPath();
+        $query = $this->getQuery();
+        $fragment = $this->getFragment();
+
+        $path = $basePath . '/' . ltrim($path, '/');
+
+        return ($scheme ? $scheme . ':' : '')
+            . ($authority ? '//' . $authority : '')
+            . $path
+            . ($query ? '?' . $query : '')
+            . ($fragment ? '#' . $fragment : '');
+    }
+
+    /**
+     * Return the fully qualified base URL.
+     *
+     * Note that this method never includes a trailing /
+     *
+     * This method is not part of PSR-7.
+     *
+     * @return string
+     */
+    public function getBaseUrl()
+    {
+        $scheme = $this->getScheme();
+        $authority = $this->getAuthority();
+        $basePath = $this->getBasePath();
+
+        if ($authority && substr($basePath, 0, 1) !== '/') {
+            $basePath = $basePath . '/' . $basePath;
+        }
+
+        return ($scheme ? $scheme . ':' : '')
+            . ($authority ? '//' . $authority : '')
+            . rtrim($basePath, '/');
+    }
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/AdvancedCallableResolverInterface.php b/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/AdvancedCallableResolverInterface.php
deleted file mode 100644
index aa1d897d..00000000
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/AdvancedCallableResolverInterface.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-/**
- * Slim Framework (https://slimframework.com)
- *
- * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
- */
-
-declare(strict_types=1);
-
-namespace Slim\Interfaces;
-
-interface AdvancedCallableResolverInterface extends CallableResolverInterface
-{
-    /**
-     * Resolve $toResolve into a callable
-     *
-     * @param string|callable $toResolve
-     */
-    public function resolveRoute($toResolve): callable;
-
-    /**
-     * Resolve $toResolve into a callable
-     *
-     * @param string|callable $toResolve
-     */
-    public function resolveMiddleware($toResolve): callable;
-}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/CallableResolverInterface.php b/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/CallableResolverInterface.php
index 92bfda43..17d81dbe 100644
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/CallableResolverInterface.php
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/CallableResolverInterface.php
@@ -1,21 +1,27 @@
 <?php
-
 /**
  * Slim Framework (https://slimframework.com)
  *
- * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
+ * @link      https://github.com/slimphp/Slim
+ * @copyright Copyright (c) 2011-2017 Josh Lockhart
+ * @license   https://github.com/slimphp/Slim/blob/3.x/LICENSE.md (MIT License)
  */
-
-declare(strict_types=1);
-
 namespace Slim\Interfaces;
 
+/**
+ * Resolves a callable.
+ *
+ * @package Slim
+ * @since 3.0.0
+ */
 interface CallableResolverInterface
 {
     /**
-     * Resolve $toResolve into a callable
+     * Invoke the resolved callable.
      *
-     * @param string|callable $toResolve
+     * @param mixed $toResolve
+     *
+     * @return callable
      */
-    public function resolve($toResolve): callable;
+    public function resolve($toResolve);
 }
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/CollectionInterface.php b/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/CollectionInterface.php
new file mode 100644
index 00000000..be995bf4
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/CollectionInterface.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Slim Framework (https://slimframework.com)
+ *
+ * @link      https://github.com/slimphp/Slim
+ * @copyright Copyright (c) 2011-2017 Josh Lockhart
+ * @license   https://github.com/slimphp/Slim/blob/3.x/LICENSE.md (MIT License)
+ */
+namespace Slim\Interfaces;
+
+/**
+ * Collection Interface
+ *
+ * @package Slim
+ * @since   3.0.0
+ */
+interface CollectionInterface extends \ArrayAccess, \Countable, \IteratorAggregate
+{
+    public function set($key, $value);
+
+    public function get($key, $default = null);
+
+    public function replace(array $items);
+
+    public function all();
+
+    public function has($key);
+
+    public function remove($key);
+
+    public function clear();
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/DispatcherInterface.php b/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/DispatcherInterface.php
deleted file mode 100644
index 63133793..00000000
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/DispatcherInterface.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-/**
- * Slim Framework (https://slimframework.com)
- *
- * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
- */
-
-declare(strict_types=1);
-
-namespace Slim\Interfaces;
-
-use Slim\Routing\RoutingResults;
-
-interface DispatcherInterface
-{
-    /**
-     * Get routing results for a given request method and uri
-     */
-    public function dispatch(string $method, string $uri): RoutingResults;
-
-    /**
-     * Get allowed methods for a given uri
-     *
-     * @return string[]
-     */
-    public function getAllowedMethods(string $uri): array;
-}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/ErrorHandlerInterface.php b/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/ErrorHandlerInterface.php
deleted file mode 100644
index 8950e6ec..00000000
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/ErrorHandlerInterface.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-/**
- * Slim Framework (https://slimframework.com)
- *
- * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
- */
-
-declare(strict_types=1);
-
-namespace Slim\Interfaces;
-
-use Psr\Http\Message\ResponseInterface;
-use Psr\Http\Message\ServerRequestInterface;
-use Throwable;
-
-interface ErrorHandlerInterface
-{
-    public function __invoke(
-        ServerRequestInterface $request,
-        Throwable $exception,
-        bool $displayErrorDetails,
-        bool $logErrors,
-        bool $logErrorDetails
-    ): ResponseInterface;
-}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/ErrorRendererInterface.php b/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/ErrorRendererInterface.php
deleted file mode 100644
index 05be6559..00000000
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/ErrorRendererInterface.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-/**
- * Slim Framework (https://slimframework.com)
- *
- * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
- */
-
-declare(strict_types=1);
-
-namespace Slim\Interfaces;
-
-use Throwable;
-
-interface ErrorRendererInterface
-{
-    public function __invoke(Throwable $exception, bool $displayErrorDetails): string;
-}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/Http/CookiesInterface.php b/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/Http/CookiesInterface.php
new file mode 100644
index 00000000..206175ad
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/Http/CookiesInterface.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Slim Framework (https://slimframework.com)
+ *
+ * @link      https://github.com/slimphp/Slim
+ * @copyright Copyright (c) 2011-2017 Josh Lockhart
+ * @license   https://github.com/slimphp/Slim/blob/3.x/LICENSE.md (MIT License)
+ */
+namespace Slim\Interfaces\Http;
+
+/**
+ * Cookies Interface
+ *
+ * @package Slim
+ * @since   3.0.0
+ */
+interface CookiesInterface
+{
+    public function get($name, $default = null);
+    public function set($name, $value);
+    public function toHeaders();
+    public static function parseHeader($header);
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/Http/EnvironmentInterface.php b/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/Http/EnvironmentInterface.php
new file mode 100644
index 00000000..af19d28b
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/Http/EnvironmentInterface.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Slim Framework (https://slimframework.com)
+ *
+ * @link      https://github.com/slimphp/Slim
+ * @copyright Copyright (c) 2011-2017 Josh Lockhart
+ * @license   https://github.com/slimphp/Slim/blob/3.x/LICENSE.md (MIT License)
+ */
+namespace Slim\Interfaces\Http;
+
+/**
+ * Environment Interface
+ *
+ * @package Slim
+ * @since   3.0.0
+ */
+interface EnvironmentInterface
+{
+    public static function mock(array $settings = []);
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/Http/HeadersInterface.php b/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/Http/HeadersInterface.php
new file mode 100644
index 00000000..b737705a
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/Http/HeadersInterface.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Slim Framework (https://slimframework.com)
+ *
+ * @link      https://github.com/slimphp/Slim
+ * @copyright Copyright (c) 2011-2017 Josh Lockhart
+ * @license   https://github.com/slimphp/Slim/blob/3.x/LICENSE.md (MIT License)
+ */
+namespace Slim\Interfaces\Http;
+
+use Slim\Interfaces\CollectionInterface;
+
+/**
+ * Headers Interface
+ *
+ * @package Slim
+ * @since   3.0.0
+ */
+interface HeadersInterface extends CollectionInterface
+{
+    public function add($key, $value);
+
+    public function normalizeKey($key);
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/InvocationStrategyInterface.php b/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/InvocationStrategyInterface.php
index 88d6476e..14a92c1d 100644
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/InvocationStrategyInterface.php
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/InvocationStrategyInterface.php
@@ -1,13 +1,11 @@
 <?php
-
 /**
  * Slim Framework (https://slimframework.com)
  *
- * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
+ * @link      https://github.com/slimphp/Slim
+ * @copyright Copyright (c) 2011-2017 Josh Lockhart
+ * @license   https://github.com/slimphp/Slim/blob/3.x/LICENSE.md (MIT License)
  */
-
-declare(strict_types=1);
-
 namespace Slim\Interfaces;
 
 use Psr\Http\Message\ResponseInterface;
@@ -21,17 +19,17 @@ interface InvocationStrategyInterface
     /**
      * Invoke a route callable.
      *
-     * @param callable               $callable       The callable to invoke using the strategy.
-     * @param ServerRequestInterface $request        The request object.
-     * @param ResponseInterface      $response       The response object.
-     * @param array<string, string>  $routeArguments The route's placeholder arguments
+     * @param callable               $callable The callable to invoke using the strategy.
+     * @param ServerRequestInterface $request The request object.
+     * @param ResponseInterface      $response The response object.
+     * @param array                  $routeArguments The route's placholder arguments
      *
-     * @return ResponseInterface The response from the callable.
+     * @return ResponseInterface|string The response from the callable.
      */
     public function __invoke(
         callable $callable,
         ServerRequestInterface $request,
         ResponseInterface $response,
         array $routeArguments
-    ): ResponseInterface;
+    );
 }
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/MiddlewareDispatcherInterface.php b/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/MiddlewareDispatcherInterface.php
deleted file mode 100644
index aa7a26ad..00000000
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/MiddlewareDispatcherInterface.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-/**
- * Slim Framework (https://slimframework.com)
- *
- * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
- */
-
-declare(strict_types=1);
-
-namespace Slim\Interfaces;
-
-use Psr\Http\Server\MiddlewareInterface;
-use Psr\Http\Server\RequestHandlerInterface;
-
-interface MiddlewareDispatcherInterface extends RequestHandlerInterface
-{
-    /**
-     * Add a new middleware to the stack
-     *
-     * Middleware are organized as a stack. That means middleware
-     * that have been added before will be executed after the newly
-     * added one (last in, first out).
-     *
-     * @param MiddlewareInterface|string|callable $middleware
-     */
-    public function add($middleware): self;
-
-    /**
-     * Add a new middleware to the stack
-     *
-     * Middleware are organized as a stack. That means middleware
-     * that have been added before will be executed after the newly
-     * added one (last in, first out).
-     */
-    public function addMiddleware(MiddlewareInterface $middleware): self;
-
-    /**
-     * Seed the middleware stack with the inner request handler
-     */
-    public function seedMiddlewareStack(RequestHandlerInterface $kernel): void;
-}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/Psr17FactoryInterface.php b/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/Psr17FactoryInterface.php
deleted file mode 100644
index 8cf01028..00000000
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/Psr17FactoryInterface.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-/**
- * Slim Framework (https://slimframework.com)
- *
- * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
- */
-
-declare(strict_types=1);
-
-namespace Slim\Interfaces;
-
-use Psr\Http\Message\ResponseFactoryInterface;
-use Psr\Http\Message\StreamFactoryInterface;
-use RuntimeException;
-
-interface Psr17FactoryInterface
-{
-    /**
-     * @throws RuntimeException when the factory could not be instantiated
-     */
-    public static function getResponseFactory(): ResponseFactoryInterface;
-
-    /**
-     * @throws RuntimeException when the factory could not be instantiated
-     */
-    public static function getStreamFactory(): StreamFactoryInterface;
-
-    /**
-     * @throws RuntimeException when the factory could not be instantiated
-     */
-    public static function getServerRequestCreator(): ServerRequestCreatorInterface;
-
-    /**
-     * Is the PSR-17 ResponseFactory available
-     */
-    public static function isResponseFactoryAvailable(): bool;
-
-    /**
-     * Is the PSR-17 StreamFactory available
-     */
-    public static function isStreamFactoryAvailable(): bool;
-
-    /**
-     * Is the ServerRequest creator available
-     */
-    public static function isServerRequestCreatorAvailable(): bool;
-}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/Psr17FactoryProviderInterface.php b/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/Psr17FactoryProviderInterface.php
deleted file mode 100644
index c7b87aa7..00000000
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/Psr17FactoryProviderInterface.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-/**
- * Slim Framework (https://slimframework.com)
- *
- * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
- */
-
-declare(strict_types=1);
-
-namespace Slim\Interfaces;
-
-interface Psr17FactoryProviderInterface
-{
-    /**
-     * @return string[]
-     */
-    public static function getFactories(): array;
-
-    /**
-     * @param string[] $factories
-     */
-    public static function setFactories(array $factories): void;
-
-    public static function addFactory(string $factory): void;
-}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/RequestHandlerInvocationStrategyInterface.php b/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/RequestHandlerInvocationStrategyInterface.php
deleted file mode 100644
index ec98fc6d..00000000
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/RequestHandlerInvocationStrategyInterface.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-/**
- * Slim Framework (https://slimframework.com)
- *
- * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
- */
-
-declare(strict_types=1);
-
-namespace Slim\Interfaces;
-
-interface RequestHandlerInvocationStrategyInterface extends InvocationStrategyInterface
-{
-}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/RouteCollectorInterface.php b/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/RouteCollectorInterface.php
deleted file mode 100644
index 921a2365..00000000
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/RouteCollectorInterface.php
+++ /dev/null
@@ -1,102 +0,0 @@
-<?php
-
-/**
- * Slim Framework (https://slimframework.com)
- *
- * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
- */
-
-declare(strict_types=1);
-
-namespace Slim\Interfaces;
-
-use InvalidArgumentException;
-use RuntimeException;
-
-interface RouteCollectorInterface
-{
-    /**
-     * Get the route parser
-     */
-    public function getRouteParser(): RouteParserInterface;
-
-    /**
-     * Get default route invocation strategy
-     */
-    public function getDefaultInvocationStrategy(): InvocationStrategyInterface;
-
-    /**
-     * Set default route invocation strategy
-     */
-    public function setDefaultInvocationStrategy(InvocationStrategyInterface $strategy): RouteCollectorInterface;
-
-    /**
-     * Get path to FastRoute cache file
-     */
-    public function getCacheFile(): ?string;
-
-    /**
-     * Set path to FastRoute cache file
-     *
-     * @throws InvalidArgumentException
-     * @throws RuntimeException
-     */
-    public function setCacheFile(string $cacheFile): RouteCollectorInterface;
-
-    /**
-     * Get the base path used in pathFor()
-     */
-    public function getBasePath(): string;
-
-    /**
-     * Set the base path used in pathFor()
-     */
-    public function setBasePath(string $basePath): RouteCollectorInterface;
-
-    /**
-     * Get route objects
-     *
-     * @return RouteInterface[]
-     */
-    public function getRoutes(): array;
-
-    /**
-     * Get named route object
-     *
-     * @param string $name Route name
-     *
-     * @throws RuntimeException   If named route does not exist
-     */
-    public function getNamedRoute(string $name): RouteInterface;
-
-    /**
-     * Remove named route
-     *
-     * @param string $name Route name
-     *
-     * @throws RuntimeException   If named route does not exist
-     */
-    public function removeNamedRoute(string $name): RouteCollectorInterface;
-
-    /**
-     * Lookup a route via the route's unique identifier
-     *
-     * @throws RuntimeException   If route of identifier does not exist
-     */
-    public function lookupRoute(string $identifier): RouteInterface;
-
-    /**
-     * Add route group
-     * @param string|callable $callable
-     */
-    public function group(string $pattern, $callable): RouteGroupInterface;
-
-    /**
-     * Add route
-     *
-     * @param string[]        $methods Array of HTTP methods
-     * @param string          $pattern The route pattern
-     * @param callable|string $handler The route callable
-     */
-    public function map(array $methods, string $pattern, $handler): RouteInterface;
-}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/RouteCollectorProxyInterface.php b/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/RouteCollectorProxyInterface.php
deleted file mode 100644
index fcbed92b..00000000
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/RouteCollectorProxyInterface.php
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-
-/**
- * Slim Framework (https://slimframework.com)
- *
- * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
- */
-
-declare(strict_types=1);
-
-namespace Slim\Interfaces;
-
-use Psr\Container\ContainerInterface;
-use Psr\Http\Message\ResponseFactoryInterface;
-use Psr\Http\Message\UriInterface;
-
-interface RouteCollectorProxyInterface
-{
-    public function getResponseFactory(): ResponseFactoryInterface;
-
-    public function getCallableResolver(): CallableResolverInterface;
-
-    public function getContainer(): ?ContainerInterface;
-
-    public function getRouteCollector(): RouteCollectorInterface;
-
-    /**
-     * Get the RouteCollectorProxy's base path
-     */
-    public function getBasePath(): string;
-
-    /**
-     * Set the RouteCollectorProxy's base path
-     */
-    public function setBasePath(string $basePath): RouteCollectorProxyInterface;
-
-    /**
-     * Add GET route
-     *
-     * @param  string          $pattern  The route URI pattern
-     * @param  callable|string $callable The route callback routine
-     */
-    public function get(string $pattern, $callable): RouteInterface;
-
-    /**
-     * Add POST route
-     *
-     * @param  string          $pattern  The route URI pattern
-     * @param  callable|string $callable The route callback routine
-     */
-    public function post(string $pattern, $callable): RouteInterface;
-
-    /**
-     * Add PUT route
-     *
-     * @param  string          $pattern  The route URI pattern
-     * @param  callable|string $callable The route callback routine
-     */
-    public function put(string $pattern, $callable): RouteInterface;
-
-    /**
-     * Add PATCH route
-     *
-     * @param  string          $pattern  The route URI pattern
-     * @param  callable|string $callable The route callback routine
-     */
-    public function patch(string $pattern, $callable): RouteInterface;
-
-    /**
-     * Add DELETE route
-     *
-     * @param  string          $pattern  The route URI pattern
-     * @param  callable|string $callable The route callback routine
-     */
-    public function delete(string $pattern, $callable): RouteInterface;
-
-    /**
-     * Add OPTIONS route
-     *
-     * @param  string          $pattern  The route URI pattern
-     * @param  callable|string $callable The route callback routine
-     */
-    public function options(string $pattern, $callable): RouteInterface;
-
-    /**
-     * Add route for any HTTP method
-     *
-     * @param  string          $pattern  The route URI pattern
-     * @param  callable|string $callable The route callback routine
-     */
-    public function any(string $pattern, $callable): RouteInterface;
-
-    /**
-     * Add route with multiple methods
-     *
-     * @param  string[]        $methods  Numeric array of HTTP method names
-     * @param  string          $pattern  The route URI pattern
-     * @param  callable|string $callable The route callback routine
-     */
-    public function map(array $methods, string $pattern, $callable): RouteInterface;
-
-    /**
-     * Route Groups
-     *
-     * This method accepts a route pattern and a callback. All route
-     * declarations in the callback will be prepended by the group(s)
-     * that it is in.
-     * @param string|callable $callable
-     */
-    public function group(string $pattern, $callable): RouteGroupInterface;
-
-    /**
-     * Add a route that sends an HTTP redirect
-     *
-     * @param string|UriInterface $to
-     */
-    public function redirect(string $from, $to, int $status = 302): RouteInterface;
-}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/RouteGroupInterface.php b/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/RouteGroupInterface.php
index 0411ce94..5ed33037 100644
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/RouteGroupInterface.php
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/RouteGroupInterface.php
@@ -1,41 +1,46 @@
 <?php
-
 /**
  * Slim Framework (https://slimframework.com)
  *
- * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
+ * @link      https://github.com/slimphp/Slim
+ * @copyright Copyright (c) 2011-2017 Josh Lockhart
+ * @license   https://github.com/slimphp/Slim/blob/3.x/LICENSE.md (MIT License)
  */
-
-declare(strict_types=1);
-
 namespace Slim\Interfaces;
 
-use Psr\Http\Server\MiddlewareInterface;
-use Slim\MiddlewareDispatcher;
+use Slim\App;
 
+/**
+ * RouteGroup Interface
+ *
+ * @package Slim
+ * @since   3.0.0
+ */
 interface RouteGroupInterface
 {
-    public function collectRoutes(): RouteGroupInterface;
-
     /**
-     * Add middleware to the route group
+     * Get route pattern
      *
-     * @param MiddlewareInterface|string|callable $middleware
+     * @return string
      */
-    public function add($middleware): RouteGroupInterface;
+    public function getPattern();
 
     /**
-     * Add middleware to the route group
+     * Prepend middleware to the group middleware collection
+     *
+     * @param callable|string $callable The callback routine
+     *
+     * @return RouteGroupInterface
      */
-    public function addMiddleware(MiddlewareInterface $middleware): RouteGroupInterface;
+    public function add($callable);
 
     /**
-     * Append the group's middleware to the MiddlewareDispatcher
+     * Execute route group callable in the context of the Slim App
+     *
+     * This method invokes the route group object's callable, collecting
+     * nested route objects
+     *
+     * @param App $app
      */
-    public function appendMiddlewareToDispatcher(MiddlewareDispatcher $dispatcher): RouteGroupInterface;
-
-    /**
-     * Get the RouteGroup's pattern
-     */
-    public function getPattern(): string;
+    public function __invoke(App $app);
 }
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/RouteInterface.php b/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/RouteInterface.php
index c1533312..64be5341 100644
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/RouteInterface.php
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/RouteInterface.php
@@ -1,116 +1,115 @@
 <?php
-
 /**
  * Slim Framework (https://slimframework.com)
  *
- * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
+ * @link      https://github.com/slimphp/Slim
+ * @copyright Copyright (c) 2011-2017 Josh Lockhart
+ * @license   https://github.com/slimphp/Slim/blob/3.x/LICENSE.md (MIT License)
  */
-
-declare(strict_types=1);
-
 namespace Slim\Interfaces;
 
-use Psr\Http\Message\ResponseInterface;
+use InvalidArgumentException;
 use Psr\Http\Message\ServerRequestInterface;
-use Psr\Http\Server\MiddlewareInterface;
+use Psr\Http\Message\ResponseInterface;
 
+/**
+ * Route Interface
+ *
+ * @package Slim
+ * @since   3.0.0
+ */
 interface RouteInterface
 {
-    /**
-     * Get route invocation strategy
-     */
-    public function getInvocationStrategy(): InvocationStrategyInterface;
-
-    /**
-     * Set route invocation strategy
-     */
-    public function setInvocationStrategy(InvocationStrategyInterface $invocationStrategy): RouteInterface;
-
-    /**
-     * Get route methods
-     *
-     * @return string[]
-     */
-    public function getMethods(): array;
-
-    /**
-     * Get route pattern
-     */
-    public function getPattern(): string;
-
-    /**
-     * Set route pattern
-     */
-    public function setPattern(string $pattern): RouteInterface;
-
-    /**
-     * Get route callable
-     *
-     * @return callable|string
-     */
-    public function getCallable();
-
-    /**
-     * Set route callable
-     *
-     * @param callable|string $callable
-     */
-    public function setCallable($callable): RouteInterface;
-
-    /**
-     * Get route name
-     */
-    public function getName(): ?string;
-
-    /**
-     * Set route name
-     *
-     * @return static
-     */
-    public function setName(string $name): RouteInterface;
-
-    /**
-     * Get the route's unique identifier
-     */
-    public function getIdentifier(): string;
 
     /**
      * Retrieve a specific route argument
+     *
+     * @param string $name
+     * @param string|null $default
+     *
+     * @return string|null
      */
-    public function getArgument(string $name, ?string $default = null): ?string;
+    public function getArgument($name, $default = null);
 
     /**
      * Get route arguments
      *
-     * @return array<string, string>
+     * @return string[]
      */
-    public function getArguments(): array;
+    public function getArguments();
+
+    /**
+     * Get route name
+     *
+     * @return null|string
+     */
+    public function getName();
+
+    /**
+     * Get route pattern
+     *
+     * @return string
+     */
+    public function getPattern();
 
     /**
      * Set a route argument
+     *
+     * @param string $name
+     * @param string $value
+     *
+     * @return self
      */
-    public function setArgument(string $name, string $value): RouteInterface;
+    public function setArgument($name, $value);
 
     /**
      * Replace route arguments
      *
-     * @param array<string, string> $arguments
+     * @param string[] $arguments
+     *
+     * @return self
      */
-    public function setArguments(array $arguments): self;
+    public function setArguments(array $arguments);
 
     /**
-     * @param MiddlewareInterface|string|callable $middleware
+     * Set output buffering mode
+     *
+     * One of: false, 'prepend' or 'append'
+     *
+     * @param boolean|string $mode
+     *
+     * @throws InvalidArgumentException If an unknown buffering mode is specified
      */
-    public function add($middleware): self;
+    public function setOutputBuffering($mode);
 
-    public function addMiddleware(MiddlewareInterface $middleware): self;
+    /**
+     * Set route name
+     *
+     * @param string $name
+     *
+     * @return static
+     * @throws InvalidArgumentException if the route name is not a string
+     */
+    public function setName($name);
+
+    /**
+     * Add middleware
+     *
+     * This method prepends new middleware to the route's middleware stack.
+     *
+     * @param callable|string $callable The callback routine
+     *
+     * @return RouteInterface
+     */
+    public function add($callable);
 
     /**
      * Prepare the route for use
      *
-     * @param array<string, string> $arguments
+     * @param ServerRequestInterface $request
+     * @param array $arguments
      */
-    public function prepare(array $arguments): self;
+    public function prepare(ServerRequestInterface $request, array $arguments);
 
     /**
      * Run route
@@ -118,6 +117,24 @@ interface RouteInterface
      * This method traverses the middleware stack, including the route's callable
      * and captures the resultant HTTP response object. It then sends the response
      * back to the Application.
+     *
+     * @param ServerRequestInterface $request
+     * @param ResponseInterface $response
+     * @return ResponseInterface
      */
-    public function run(ServerRequestInterface $request): ResponseInterface;
+    public function run(ServerRequestInterface $request, ResponseInterface $response);
+
+    /**
+     * Dispatch route callable against current Request and Response objects
+     *
+     * This method invokes the route object's callable. If middleware is
+     * registered for the route, each callable middleware is invoked in
+     * the order specified.
+     *
+     * @param ServerRequestInterface $request  The current Request object
+     * @param ResponseInterface      $response The current Response object
+     *
+     * @return ResponseInterface
+     */
+    public function __invoke(ServerRequestInterface $request, ResponseInterface $response);
 }
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/RouteParserInterface.php b/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/RouteParserInterface.php
deleted file mode 100644
index 03d93266..00000000
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/RouteParserInterface.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-
-/**
- * Slim Framework (https://slimframework.com)
- *
- * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
- */
-
-declare(strict_types=1);
-
-namespace Slim\Interfaces;
-
-use InvalidArgumentException;
-use Psr\Http\Message\UriInterface;
-use RuntimeException;
-
-interface RouteParserInterface
-{
-    /**
-     * Build the path for a named route excluding the base path
-     *
-     * @param string                $routeName   Route name
-     * @param array<string, string> $data        Named argument replacement data
-     * @param array<string, string> $queryParams Optional query string parameters
-     *
-     * @throws RuntimeException         If named route does not exist
-     * @throws InvalidArgumentException If required data not provided
-     */
-    public function relativeUrlFor(string $routeName, array $data = [], array $queryParams = []): string;
-
-    /**
-     * Build the path for a named route including the base path
-     *
-     * @param string                $routeName   Route name
-     * @param array<string, string> $data        Named argument replacement data
-     * @param array<string, string> $queryParams Optional query string parameters
-     *
-     * @throws RuntimeException         If named route does not exist
-     * @throws InvalidArgumentException If required data not provided
-     */
-    public function urlFor(string $routeName, array $data = [], array $queryParams = []): string;
-
-    /**
-     * Get fully qualified URL for named route
-     *
-     * @param UriInterface              $uri
-     * @param string                    $routeName   Route name
-     * @param array<string, string>     $data        Named argument replacement data
-     * @param array<string, string>     $queryParams Optional query string parameters
-     */
-    public function fullUrlFor(UriInterface $uri, string $routeName, array $data = [], array $queryParams = []): string;
-}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/RouteResolverInterface.php b/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/RouteResolverInterface.php
deleted file mode 100644
index 256a3599..00000000
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/RouteResolverInterface.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Slim\Interfaces;
-
-use Slim\Routing\RoutingResults;
-
-interface RouteResolverInterface
-{
-    /**
-     * @param string $uri Should be ServerRequestInterface::getUri()->getPath()
-     */
-    public function computeRoutingResults(string $uri, string $method): RoutingResults;
-
-    public function resolveRoute(string $identifier): RouteInterface;
-}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/RouterInterface.php b/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/RouterInterface.php
new file mode 100644
index 00000000..2ab8b678
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/RouterInterface.php
@@ -0,0 +1,111 @@
+<?php
+/**
+ * Slim Framework (https://slimframework.com)
+ *
+ * @link      https://github.com/slimphp/Slim
+ * @copyright Copyright (c) 2011-2017 Josh Lockhart
+ * @license   https://github.com/slimphp/Slim/blob/3.x/LICENSE.md (MIT License)
+ */
+namespace Slim\Interfaces;
+
+use RuntimeException;
+use InvalidArgumentException;
+use Psr\Http\Message\ServerRequestInterface;
+
+/**
+ * Router Interface
+ *
+ * @package Slim
+ * @since   3.0.0
+ */
+interface RouterInterface
+{
+    // array keys from route result
+    const DISPATCH_STATUS = 0;
+    const ALLOWED_METHODS = 1;
+
+    /**
+     * Add route
+     *
+     * @param string[] $methods Array of HTTP methods
+     * @param string   $pattern The route pattern
+     * @param callable $handler The route callable
+     *
+     * @return RouteInterface
+     */
+    public function map($methods, $pattern, $handler);
+
+    /**
+     * Dispatch router for HTTP request
+     *
+     * @param  ServerRequestInterface $request The current HTTP request object
+     *
+     * @return array
+     *
+     * @link   https://github.com/nikic/FastRoute/blob/master/src/Dispatcher.php
+     */
+    public function dispatch(ServerRequestInterface $request);
+
+    /**
+     * Add a route group to the array
+     *
+     * @param string   $pattern The group pattern
+     * @param callable $callable A group callable
+     *
+     * @return RouteGroupInterface
+     */
+    public function pushGroup($pattern, $callable);
+
+    /**
+     * Removes the last route group from the array
+     *
+     * @return bool True if successful, else False
+     */
+    public function popGroup();
+
+    /**
+     * Get named route object
+     *
+     * @param string $name        Route name
+     *
+     * @return \Slim\Interfaces\RouteInterface
+     *
+     * @throws RuntimeException   If named route does not exist
+     */
+    public function getNamedRoute($name);
+
+    /**
+     * @param $identifier
+     *
+     * @return \Slim\Interfaces\RouteInterface
+     */
+    public function lookupRoute($identifier);
+
+    /**
+     * Build the path for a named route excluding the base path
+     *
+     * @param string $name        Route name
+     * @param array  $data        Named argument replacement data
+     * @param array  $queryParams Optional query string parameters
+     *
+     * @return string
+     *
+     * @throws RuntimeException         If named route does not exist
+     * @throws InvalidArgumentException If required data not provided
+     */
+    public function relativePathFor($name, array $data = [], array $queryParams = []);
+
+    /**
+     * Build the path for a named route including the base path
+     *
+     * @param string $name        Route name
+     * @param array  $data        Named argument replacement data
+     * @param array  $queryParams Optional query string parameters
+     *
+     * @return string
+     *
+     * @throws RuntimeException         If named route does not exist
+     * @throws InvalidArgumentException If required data not provided
+     */
+    public function pathFor($name, array $data = [], array $queryParams = []);
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/ServerRequestCreatorInterface.php b/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/ServerRequestCreatorInterface.php
deleted file mode 100644
index 54d231ed..00000000
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Interfaces/ServerRequestCreatorInterface.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-/**
- * Slim Framework (https://slimframework.com)
- *
- * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
- */
-
-declare(strict_types=1);
-
-namespace Slim\Interfaces;
-
-use Psr\Http\Message\ServerRequestInterface;
-
-interface ServerRequestCreatorInterface
-{
-    public function createServerRequestFromGlobals(): ServerRequestInterface;
-}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Logger.php b/advancedcontentfilter/vendor/slim/slim/Slim/Logger.php
deleted file mode 100644
index 31282175..00000000
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Logger.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/**
- * Slim Framework (https://slimframework.com)
- *
- * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
- */
-
-declare(strict_types=1);
-
-namespace Slim;
-
-use Psr\Log\AbstractLogger;
-use Psr\Log\InvalidArgumentException;
-use Stringable;
-
-use function error_log;
-
-class Logger extends AbstractLogger
-{
-    /**
-     * @param mixed             $level
-     * @param string|Stringable $message
-     * @param array<mixed>      $context
-     *
-     * @throws InvalidArgumentException
-     */
-    public function log($level, $message, array $context = []): void
-    {
-        error_log((string) $message);
-    }
-}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Middleware/BodyParsingMiddleware.php b/advancedcontentfilter/vendor/slim/slim/Slim/Middleware/BodyParsingMiddleware.php
deleted file mode 100644
index 9a90f30c..00000000
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Middleware/BodyParsingMiddleware.php
+++ /dev/null
@@ -1,196 +0,0 @@
-<?php
-
-/**
- * Slim Framework (https://slimframework.com)
- *
- * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
- */
-
-declare(strict_types=1);
-
-namespace Slim\Middleware;
-
-use Psr\Http\Message\ResponseInterface;
-use Psr\Http\Message\ServerRequestInterface;
-use Psr\Http\Server\MiddlewareInterface;
-use Psr\Http\Server\RequestHandlerInterface;
-use RuntimeException;
-
-use function count;
-use function explode;
-use function is_array;
-use function is_null;
-use function is_object;
-use function is_string;
-use function json_decode;
-use function libxml_clear_errors;
-use function libxml_disable_entity_loader;
-use function libxml_use_internal_errors;
-use function parse_str;
-use function simplexml_load_string;
-use function strtolower;
-use function trim;
-
-use const LIBXML_VERSION;
-
-class BodyParsingMiddleware implements MiddlewareInterface
-{
-    /**
-     * @var callable[]
-     */
-    protected array $bodyParsers;
-
-    /**
-     * @param callable[] $bodyParsers list of body parsers as an associative array of mediaType => callable
-     */
-    public function __construct(array $bodyParsers = [])
-    {
-        $this->registerDefaultBodyParsers();
-
-        foreach ($bodyParsers as $mediaType => $parser) {
-            $this->registerBodyParser($mediaType, $parser);
-        }
-    }
-
-    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
-    {
-        $parsedBody = $request->getParsedBody();
-
-        if (empty($parsedBody)) {
-            $parsedBody = $this->parseBody($request);
-            $request = $request->withParsedBody($parsedBody);
-        }
-
-        return $handler->handle($request);
-    }
-
-    /**
-     * @param string   $mediaType A HTTP media type (excluding content-type params).
-     * @param callable $callable  A callable that returns parsed contents for media type.
-     */
-    public function registerBodyParser(string $mediaType, callable $callable): self
-    {
-        $this->bodyParsers[$mediaType] = $callable;
-        return $this;
-    }
-
-    /**
-     * @param string   $mediaType A HTTP media type (excluding content-type params).
-     */
-    public function hasBodyParser(string $mediaType): bool
-    {
-        return isset($this->bodyParsers[$mediaType]);
-    }
-
-    /**
-     * @param string    $mediaType A HTTP media type (excluding content-type params).
-     * @throws RuntimeException
-     */
-    public function getBodyParser(string $mediaType): callable
-    {
-        if (!isset($this->bodyParsers[$mediaType])) {
-            throw new RuntimeException('No parser for type ' . $mediaType);
-        }
-        return $this->bodyParsers[$mediaType];
-    }
-
-    protected function registerDefaultBodyParsers(): void
-    {
-        $this->registerBodyParser('application/json', static function ($input) {
-            $result = json_decode($input, true);
-
-            if (!is_array($result)) {
-                return null;
-            }
-
-            return $result;
-        });
-
-        $this->registerBodyParser('application/x-www-form-urlencoded', static function ($input) {
-            parse_str($input, $data);
-            return $data;
-        });
-
-        $xmlCallable = static function ($input) {
-            $backup = self::disableXmlEntityLoader(true);
-            $backup_errors = libxml_use_internal_errors(true);
-            $result = simplexml_load_string($input);
-
-            self::disableXmlEntityLoader($backup);
-            libxml_clear_errors();
-            libxml_use_internal_errors($backup_errors);
-
-            if ($result === false) {
-                return null;
-            }
-
-            return $result;
-        };
-
-        $this->registerBodyParser('application/xml', $xmlCallable);
-        $this->registerBodyParser('text/xml', $xmlCallable);
-    }
-
-    /**
-     * @return null|array<mixed>|object
-     */
-    protected function parseBody(ServerRequestInterface $request)
-    {
-        $mediaType = $this->getMediaType($request);
-        if ($mediaType === null) {
-            return null;
-        }
-
-        // Check if this specific media type has a parser registered first
-        if (!isset($this->bodyParsers[$mediaType])) {
-            // If not, look for a media type with a structured syntax suffix (RFC 6839)
-            $parts = explode('+', $mediaType);
-            if (count($parts) >= 2) {
-                $mediaType = 'application/' . $parts[count($parts) - 1];
-            }
-        }
-
-        if (isset($this->bodyParsers[$mediaType])) {
-            $body = (string)$request->getBody();
-            $parsed = $this->bodyParsers[$mediaType]($body);
-
-            if ($parsed !== null && !is_object($parsed) && !is_array($parsed)) {
-                throw new RuntimeException(
-                    'Request body media type parser return value must be an array, an object, or null'
-                );
-            }
-
-            return $parsed;
-        }
-
-        return null;
-    }
-
-    /**
-     * @return string|null The serverRequest media type, minus content-type params
-     */
-    protected function getMediaType(ServerRequestInterface $request): ?string
-    {
-        $contentType = $request->getHeader('Content-Type')[0] ?? null;
-
-        if (is_string($contentType) && trim($contentType) !== '') {
-            $contentTypeParts = explode(';', $contentType);
-            return strtolower(trim($contentTypeParts[0]));
-        }
-
-        return null;
-    }
-
-    protected static function disableXmlEntityLoader(bool $disable): bool
-    {
-        if (LIBXML_VERSION >= 20900) {
-            // libxml >= 2.9.0 disables entity loading by default, so it is
-            // safe to skip the real call (deprecated in PHP 8).
-            return true;
-        }
-
-        // @codeCoverageIgnoreStart
-        return libxml_disable_entity_loader($disable);
-        // @codeCoverageIgnoreEnd
-    }
-}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Middleware/ContentLengthMiddleware.php b/advancedcontentfilter/vendor/slim/slim/Slim/Middleware/ContentLengthMiddleware.php
deleted file mode 100644
index 8fa13bcf..00000000
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Middleware/ContentLengthMiddleware.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/**
- * Slim Framework (https://slimframework.com)
- *
- * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
- */
-
-declare(strict_types=1);
-
-namespace Slim\Middleware;
-
-use Psr\Http\Message\ResponseInterface;
-use Psr\Http\Message\ServerRequestInterface;
-use Psr\Http\Server\MiddlewareInterface;
-use Psr\Http\Server\RequestHandlerInterface;
-
-class ContentLengthMiddleware implements MiddlewareInterface
-{
-    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
-    {
-        $response = $handler->handle($request);
-
-        // Add Content-Length header if not already added
-        $size = $response->getBody()->getSize();
-        if ($size !== null && !$response->hasHeader('Content-Length')) {
-            $response = $response->withHeader('Content-Length', (string) $size);
-        }
-
-        return $response;
-    }
-}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Middleware/ErrorMiddleware.php b/advancedcontentfilter/vendor/slim/slim/Slim/Middleware/ErrorMiddleware.php
deleted file mode 100644
index 2eb5cc96..00000000
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Middleware/ErrorMiddleware.php
+++ /dev/null
@@ -1,212 +0,0 @@
-<?php
-
-/**
- * Slim Framework (https://slimframework.com)
- *
- * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
- */
-
-declare(strict_types=1);
-
-namespace Slim\Middleware;
-
-use Psr\Http\Message\ResponseFactoryInterface;
-use Psr\Http\Message\ResponseInterface;
-use Psr\Http\Message\ServerRequestInterface;
-use Psr\Http\Server\MiddlewareInterface;
-use Psr\Http\Server\RequestHandlerInterface;
-use Psr\Log\LoggerInterface;
-use Slim\Exception\HttpException;
-use Slim\Handlers\ErrorHandler;
-use Slim\Interfaces\CallableResolverInterface;
-use Slim\Interfaces\ErrorHandlerInterface;
-use Throwable;
-
-use function get_class;
-use function is_subclass_of;
-
-class ErrorMiddleware implements MiddlewareInterface
-{
-    protected CallableResolverInterface $callableResolver;
-
-    protected ResponseFactoryInterface $responseFactory;
-
-    protected bool $displayErrorDetails;
-
-    protected bool $logErrors;
-
-    protected bool $logErrorDetails;
-
-    protected ?LoggerInterface $logger = null;
-
-    /**
-     * @var ErrorHandlerInterface[]|callable[]|string[]
-     */
-    protected array $handlers = [];
-
-    /**
-     * @var ErrorHandlerInterface[]|callable[]|string[]
-     */
-    protected array $subClassHandlers = [];
-
-    /**
-     * @var ErrorHandlerInterface|callable|string|null
-     */
-    protected $defaultErrorHandler;
-
-    public function __construct(
-        CallableResolverInterface $callableResolver,
-        ResponseFactoryInterface $responseFactory,
-        bool $displayErrorDetails,
-        bool $logErrors,
-        bool $logErrorDetails,
-        ?LoggerInterface $logger = null
-    ) {
-        $this->callableResolver = $callableResolver;
-        $this->responseFactory = $responseFactory;
-        $this->displayErrorDetails = $displayErrorDetails;
-        $this->logErrors = $logErrors;
-        $this->logErrorDetails = $logErrorDetails;
-        $this->logger = $logger;
-    }
-
-    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
-    {
-        try {
-            return $handler->handle($request);
-        } catch (Throwable $e) {
-            return $this->handleException($request, $e);
-        }
-    }
-
-    public function handleException(ServerRequestInterface $request, Throwable $exception): ResponseInterface
-    {
-        if ($exception instanceof HttpException) {
-            $request = $exception->getRequest();
-        }
-
-        $exceptionType = get_class($exception);
-        $handler = $this->getErrorHandler($exceptionType);
-
-        return $handler($request, $exception, $this->displayErrorDetails, $this->logErrors, $this->logErrorDetails);
-    }
-
-    /**
-     * Get callable to handle scenarios where an error
-     * occurs when processing the current request.
-     *
-     * @param string $type Exception/Throwable name. ie: RuntimeException::class
-     * @return callable|ErrorHandler
-     */
-    public function getErrorHandler(string $type)
-    {
-        if (isset($this->handlers[$type])) {
-            return $this->callableResolver->resolve($this->handlers[$type]);
-        }
-
-        if (isset($this->subClassHandlers[$type])) {
-            return $this->callableResolver->resolve($this->subClassHandlers[$type]);
-        }
-
-        foreach ($this->subClassHandlers as $class => $handler) {
-            if (is_subclass_of($type, $class)) {
-                return $this->callableResolver->resolve($handler);
-            }
-        }
-
-        return $this->getDefaultErrorHandler();
-    }
-
-    /**
-     * Get default error handler
-     *
-     * @return ErrorHandler|callable
-     */
-    public function getDefaultErrorHandler()
-    {
-        if ($this->defaultErrorHandler === null) {
-            $this->defaultErrorHandler = new ErrorHandler(
-                $this->callableResolver,
-                $this->responseFactory,
-                $this->logger
-            );
-        }
-
-        return $this->callableResolver->resolve($this->defaultErrorHandler);
-    }
-
-    /**
-     * Set callable as the default Slim application error handler.
-     *
-     * The callable signature MUST match the ErrorHandlerInterface
-     *
-     * @see \Slim\Interfaces\ErrorHandlerInterface
-     *
-     * 1. Instance of \Psr\Http\Message\ServerRequestInterface
-     * 2. Instance of \Throwable
-     * 3. Boolean $displayErrorDetails
-     * 4. Boolean $logErrors
-     * 5. Boolean $logErrorDetails
-     *
-     * The callable MUST return an instance of
-     * \Psr\Http\Message\ResponseInterface.
-     *
-     * @param string|callable|ErrorHandler $handler
-     */
-    public function setDefaultErrorHandler($handler): self
-    {
-        $this->defaultErrorHandler = $handler;
-        return $this;
-    }
-
-    /**
-     * Set callable to handle scenarios where an error
-     * occurs when processing the current request.
-     *
-     * The callable signature MUST match the ErrorHandlerInterface
-     *
-     * Pass true to $handleSubclasses to make the handler handle all subclasses of
-     * the type as well. Pass an array of classes to make the same function handle multiple exceptions.
-     *
-     * @see \Slim\Interfaces\ErrorHandlerInterface
-     *
-     * 1. Instance of \Psr\Http\Message\ServerRequestInterface
-     * 2. Instance of \Throwable
-     * 3. Boolean $displayErrorDetails
-     * 4. Boolean $logErrors
-     * 5. Boolean $logErrorDetails
-     *
-     * The callable MUST return an instance of
-     * \Psr\Http\Message\ResponseInterface.
-     *
-     * @param string|string[] $typeOrTypes Exception/Throwable name.
-     * ie: RuntimeException::class or an array of classes
-     * ie: [HttpNotFoundException::class, HttpMethodNotAllowedException::class]
-     * @param string|callable|ErrorHandlerInterface $handler
-     */
-    public function setErrorHandler($typeOrTypes, $handler, bool $handleSubclasses = false): self
-    {
-        if (is_array($typeOrTypes)) {
-            foreach ($typeOrTypes as $type) {
-                $this->addErrorHandler($type, $handler, $handleSubclasses);
-            }
-        } else {
-            $this->addErrorHandler($typeOrTypes, $handler, $handleSubclasses);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Used internally to avoid code repetition when passing multiple exceptions to setErrorHandler().
-     * @param string|callable|ErrorHandlerInterface $handler
-     */
-    private function addErrorHandler(string $type, $handler, bool $handleSubclasses): void
-    {
-        if ($handleSubclasses) {
-            $this->subClassHandlers[$type] = $handler;
-        } else {
-            $this->handlers[$type] = $handler;
-        }
-    }
-}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Middleware/MethodOverrideMiddleware.php b/advancedcontentfilter/vendor/slim/slim/Slim/Middleware/MethodOverrideMiddleware.php
deleted file mode 100644
index 079a1f18..00000000
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Middleware/MethodOverrideMiddleware.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-/**
- * Slim Framework (https://slimframework.com)
- *
- * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
- */
-
-declare(strict_types=1);
-
-namespace Slim\Middleware;
-
-use Psr\Http\Message\ResponseInterface;
-use Psr\Http\Message\ServerRequestInterface;
-use Psr\Http\Server\MiddlewareInterface;
-use Psr\Http\Server\RequestHandlerInterface;
-
-use function is_array;
-use function strtoupper;
-
-class MethodOverrideMiddleware implements MiddlewareInterface
-{
-    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
-    {
-        $methodHeader = $request->getHeaderLine('X-Http-Method-Override');
-
-        if ($methodHeader) {
-            $request = $request->withMethod($methodHeader);
-        } elseif (strtoupper($request->getMethod()) === 'POST') {
-            $body = $request->getParsedBody();
-
-            if (is_array($body) && !empty($body['_METHOD'])) {
-                $request = $request->withMethod($body['_METHOD']);
-            }
-
-            if ($request->getBody()->eof()) {
-                $request->getBody()->rewind();
-            }
-        }
-
-        return $handler->handle($request);
-    }
-}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Middleware/OutputBufferingMiddleware.php b/advancedcontentfilter/vendor/slim/slim/Slim/Middleware/OutputBufferingMiddleware.php
deleted file mode 100644
index 69ee1f6f..00000000
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Middleware/OutputBufferingMiddleware.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-
-/**
- * Slim Framework (https://slimframework.com)
- *
- * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
- */
-
-declare(strict_types=1);
-
-namespace Slim\Middleware;
-
-use InvalidArgumentException;
-use Psr\Http\Message\ResponseInterface;
-use Psr\Http\Message\ServerRequestInterface;
-use Psr\Http\Message\StreamFactoryInterface;
-use Psr\Http\Server\MiddlewareInterface;
-use Psr\Http\Server\RequestHandlerInterface;
-use Throwable;
-
-use function in_array;
-use function ob_end_clean;
-use function ob_get_clean;
-use function ob_start;
-
-class OutputBufferingMiddleware implements MiddlewareInterface
-{
-    public const APPEND = 'append';
-    public const PREPEND = 'prepend';
-
-    protected StreamFactoryInterface $streamFactory;
-
-    protected string $style;
-
-    /**
-     * @param string $style Either "append" or "prepend"
-     */
-    public function __construct(StreamFactoryInterface $streamFactory, string $style = 'append')
-    {
-        $this->streamFactory = $streamFactory;
-        $this->style = $style;
-
-        if (!in_array($style, [static::APPEND, static::PREPEND], true)) {
-            throw new InvalidArgumentException("Invalid style `{$style}`. Must be `append` or `prepend`");
-        }
-    }
-
-    /**
-     * @throws Throwable
-     */
-    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
-    {
-        try {
-            ob_start();
-            $response = $handler->handle($request);
-            $output = ob_get_clean();
-        } catch (Throwable $e) {
-            ob_end_clean();
-            throw $e;
-        }
-
-        if (!empty($output)) {
-            if ($this->style === static::PREPEND) {
-                $body = $this->streamFactory->createStream();
-                $body->write($output . $response->getBody());
-                $response = $response->withBody($body);
-            } elseif ($this->style === static::APPEND && $response->getBody()->isWritable()) {
-                $response->getBody()->write($output);
-            }
-        }
-
-        return $response;
-    }
-}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Middleware/RoutingMiddleware.php b/advancedcontentfilter/vendor/slim/slim/Slim/Middleware/RoutingMiddleware.php
deleted file mode 100644
index a3d3085b..00000000
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Middleware/RoutingMiddleware.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-
-/**
- * Slim Framework (https://slimframework.com)
- *
- * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
- */
-
-declare(strict_types=1);
-
-namespace Slim\Middleware;
-
-use Psr\Http\Message\ResponseInterface;
-use Psr\Http\Message\ServerRequestInterface;
-use Psr\Http\Server\MiddlewareInterface;
-use Psr\Http\Server\RequestHandlerInterface;
-use RuntimeException;
-use Slim\Exception\HttpMethodNotAllowedException;
-use Slim\Exception\HttpNotFoundException;
-use Slim\Interfaces\RouteParserInterface;
-use Slim\Interfaces\RouteResolverInterface;
-use Slim\Routing\RouteContext;
-use Slim\Routing\RoutingResults;
-
-class RoutingMiddleware implements MiddlewareInterface
-{
-    protected RouteResolverInterface $routeResolver;
-
-    protected RouteParserInterface $routeParser;
-
-    public function __construct(RouteResolverInterface $routeResolver, RouteParserInterface $routeParser)
-    {
-        $this->routeResolver = $routeResolver;
-        $this->routeParser = $routeParser;
-    }
-
-    /**
-     * @throws HttpNotFoundException
-     * @throws HttpMethodNotAllowedException
-     * @throws RuntimeException
-     */
-    public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
-    {
-        $request = $this->performRouting($request);
-        return $handler->handle($request);
-    }
-
-    /**
-     * Perform routing
-     *
-     * @param  ServerRequestInterface $request PSR7 Server Request
-     *
-     * @throws HttpNotFoundException
-     * @throws HttpMethodNotAllowedException
-     * @throws RuntimeException
-     */
-    public function performRouting(ServerRequestInterface $request): ServerRequestInterface
-    {
-        $request = $request->withAttribute(RouteContext::ROUTE_PARSER, $this->routeParser);
-
-        $routingResults = $this->resolveRoutingResultsFromRequest($request);
-        $routeStatus = $routingResults->getRouteStatus();
-
-        $request = $request->withAttribute(RouteContext::ROUTING_RESULTS, $routingResults);
-
-        switch ($routeStatus) {
-            case RoutingResults::FOUND:
-                $routeArguments = $routingResults->getRouteArguments();
-                $routeIdentifier = $routingResults->getRouteIdentifier() ?? '';
-                $route = $this->routeResolver
-                    ->resolveRoute($routeIdentifier)
-                    ->prepare($routeArguments);
-                return $request->withAttribute(RouteContext::ROUTE, $route);
-
-            case RoutingResults::NOT_FOUND:
-                throw new HttpNotFoundException($request);
-
-            case RoutingResults::METHOD_NOT_ALLOWED:
-                $exception = new HttpMethodNotAllowedException($request);
-                $exception->setAllowedMethods($routingResults->getAllowedMethods());
-                throw $exception;
-
-            default:
-                throw new RuntimeException('An unexpected error occurred while performing routing.');
-        }
-    }
-
-    /**
-     * Resolves the route from the given request
-     */
-    protected function resolveRoutingResultsFromRequest(ServerRequestInterface $request): RoutingResults
-    {
-        return $this->routeResolver->computeRoutingResults(
-            $request->getUri()->getPath(),
-            $request->getMethod()
-        );
-    }
-}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/MiddlewareAwareTrait.php b/advancedcontentfilter/vendor/slim/slim/Slim/MiddlewareAwareTrait.php
new file mode 100644
index 00000000..8b8a1755
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/MiddlewareAwareTrait.php
@@ -0,0 +1,121 @@
+<?php
+/**
+ * Slim Framework (https://slimframework.com)
+ *
+ * @link      https://github.com/slimphp/Slim
+ * @copyright Copyright (c) 2011-2017 Josh Lockhart
+ * @license   https://github.com/slimphp/Slim/blob/3.x/LICENSE.md (MIT License)
+ */
+namespace Slim;
+
+use RuntimeException;
+use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Message\ResponseInterface;
+use UnexpectedValueException;
+
+/**
+ * Middleware
+ *
+ * This is an internal class that enables concentric middleware layers. This
+ * class is an implementation detail and is used only inside of the Slim
+ * application; it is not visible to—and should not be used by—end users.
+ */
+trait MiddlewareAwareTrait
+{
+    /**
+     * Tip of the middleware call stack
+     *
+     * @var callable
+     */
+    protected $tip;
+
+    /**
+     * Middleware stack lock
+     *
+     * @var bool
+     */
+    protected $middlewareLock = false;
+
+    /**
+     * Add middleware
+     *
+     * This method prepends new middleware to the application middleware stack.
+     *
+     * @param callable $callable Any callable that accepts three arguments:
+     *                           1. A Request object
+     *                           2. A Response object
+     *                           3. A "next" middleware callable
+     * @return static
+     *
+     * @throws RuntimeException         If middleware is added while the stack is dequeuing
+     * @throws UnexpectedValueException If the middleware doesn't return a Psr\Http\Message\ResponseInterface
+     */
+    protected function addMiddleware(callable $callable)
+    {
+        if ($this->middlewareLock) {
+            throw new RuntimeException('Middleware can’t be added once the stack is dequeuing');
+        }
+
+        if (is_null($this->tip)) {
+            $this->seedMiddlewareStack();
+        }
+        $next = $this->tip;
+        $this->tip = function (
+            ServerRequestInterface $request,
+            ResponseInterface $response
+        ) use (
+            $callable,
+            $next
+        ) {
+            $result = call_user_func($callable, $request, $response, $next);
+            if ($result instanceof ResponseInterface === false) {
+                throw new UnexpectedValueException(
+                    'Middleware must return instance of \Psr\Http\Message\ResponseInterface'
+                );
+            }
+
+            return $result;
+        };
+
+        return $this;
+    }
+
+    /**
+     * Seed middleware stack with first callable
+     *
+     * @param callable $kernel The last item to run as middleware
+     *
+     * @throws RuntimeException if the stack is seeded more than once
+     */
+    protected function seedMiddlewareStack(callable $kernel = null)
+    {
+        if (!is_null($this->tip)) {
+            throw new RuntimeException('MiddlewareStack can only be seeded once.');
+        }
+        if ($kernel === null) {
+            $kernel = $this;
+        }
+        $this->tip = $kernel;
+    }
+
+    /**
+     * Call middleware stack
+     *
+     * @param  ServerRequestInterface $request A request object
+     * @param  ResponseInterface      $response A response object
+     *
+     * @return ResponseInterface
+     */
+    public function callMiddlewareStack(ServerRequestInterface $request, ResponseInterface $response)
+    {
+        if (is_null($this->tip)) {
+            $this->seedMiddlewareStack();
+        }
+        /** @var callable $start */
+        $start = $this->tip;
+        $this->middlewareLock = true;
+        $response = $start($request, $response);
+        $this->middlewareLock = false;
+        return $response;
+    }
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/MiddlewareDispatcher.php b/advancedcontentfilter/vendor/slim/slim/Slim/MiddlewareDispatcher.php
deleted file mode 100644
index 7e056441..00000000
--- a/advancedcontentfilter/vendor/slim/slim/Slim/MiddlewareDispatcher.php
+++ /dev/null
@@ -1,275 +0,0 @@
-<?php
-
-/**
- * Slim Framework (https://slimframework.com)
- *
- * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
- */
-
-declare(strict_types=1);
-
-namespace Slim;
-
-use Closure;
-use Psr\Container\ContainerInterface;
-use Psr\Http\Message\ResponseInterface;
-use Psr\Http\Message\ServerRequestInterface;
-use Psr\Http\Server\MiddlewareInterface;
-use Psr\Http\Server\RequestHandlerInterface;
-use RuntimeException;
-use Slim\Interfaces\AdvancedCallableResolverInterface;
-use Slim\Interfaces\CallableResolverInterface;
-use Slim\Interfaces\MiddlewareDispatcherInterface;
-
-use function class_exists;
-use function function_exists;
-use function is_callable;
-use function is_string;
-use function preg_match;
-use function sprintf;
-
-class MiddlewareDispatcher implements MiddlewareDispatcherInterface
-{
-    /**
-     * Tip of the middleware call stack
-     */
-    protected RequestHandlerInterface $tip;
-
-    protected ?CallableResolverInterface $callableResolver;
-
-    protected ?ContainerInterface $container;
-
-    public function __construct(
-        RequestHandlerInterface $kernel,
-        ?CallableResolverInterface $callableResolver = null,
-        ?ContainerInterface $container = null
-    ) {
-        $this->seedMiddlewareStack($kernel);
-        $this->callableResolver = $callableResolver;
-        $this->container = $container;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function seedMiddlewareStack(RequestHandlerInterface $kernel): void
-    {
-        $this->tip = $kernel;
-    }
-
-    /**
-     * Invoke the middleware stack
-     */
-    public function handle(ServerRequestInterface $request): ResponseInterface
-    {
-        return $this->tip->handle($request);
-    }
-
-    /**
-     * Add a new middleware to the stack
-     *
-     * Middleware are organized as a stack. That means middleware
-     * that have been added before will be executed after the newly
-     * added one (last in, first out).
-     *
-     * @param MiddlewareInterface|string|callable $middleware
-     */
-    public function add($middleware): MiddlewareDispatcherInterface
-    {
-        if ($middleware instanceof MiddlewareInterface) {
-            return $this->addMiddleware($middleware);
-        }
-
-        if (is_string($middleware)) {
-            return $this->addDeferred($middleware);
-        }
-
-        if (is_callable($middleware)) {
-            return $this->addCallable($middleware);
-        }
-
-        /** @phpstan-ignore-next-line */
-        throw new RuntimeException(
-            'A middleware must be an object/class name referencing an implementation of ' .
-            'MiddlewareInterface or a callable with a matching signature.'
-        );
-    }
-
-    /**
-     * Add a new middleware to the stack
-     *
-     * Middleware are organized as a stack. That means middleware
-     * that have been added before will be executed after the newly
-     * added one (last in, first out).
-     */
-    public function addMiddleware(MiddlewareInterface $middleware): MiddlewareDispatcherInterface
-    {
-        $next = $this->tip;
-        $this->tip = new class ($middleware, $next) implements RequestHandlerInterface {
-            private MiddlewareInterface $middleware;
-
-            private RequestHandlerInterface $next;
-
-            public function __construct(MiddlewareInterface $middleware, RequestHandlerInterface $next)
-            {
-                $this->middleware = $middleware;
-                $this->next = $next;
-            }
-
-            public function handle(ServerRequestInterface $request): ResponseInterface
-            {
-                return $this->middleware->process($request, $this->next);
-            }
-        };
-
-        return $this;
-    }
-
-    /**
-     * Add a new middleware by class name
-     *
-     * Middleware are organized as a stack. That means middleware
-     * that have been added before will be executed after the newly
-     * added one (last in, first out).
-     */
-    public function addDeferred(string $middleware): self
-    {
-        $next = $this->tip;
-        $this->tip = new class (
-            $middleware,
-            $next,
-            $this->container,
-            $this->callableResolver
-        ) implements RequestHandlerInterface {
-            private string $middleware;
-
-            private RequestHandlerInterface $next;
-
-            private ?ContainerInterface $container;
-
-            private ?CallableResolverInterface $callableResolver;
-
-            public function __construct(
-                string $middleware,
-                RequestHandlerInterface $next,
-                ?ContainerInterface $container = null,
-                ?CallableResolverInterface $callableResolver = null
-            ) {
-                $this->middleware = $middleware;
-                $this->next = $next;
-                $this->container = $container;
-                $this->callableResolver = $callableResolver;
-            }
-
-            public function handle(ServerRequestInterface $request): ResponseInterface
-            {
-                if ($this->callableResolver instanceof AdvancedCallableResolverInterface) {
-                    $callable = $this->callableResolver->resolveMiddleware($this->middleware);
-                    return $callable($request, $this->next);
-                }
-
-                $callable = null;
-
-                if ($this->callableResolver instanceof CallableResolverInterface) {
-                    try {
-                        $callable = $this->callableResolver->resolve($this->middleware);
-                    } catch (RuntimeException $e) {
-                        // Do Nothing
-                    }
-                }
-
-                if (!$callable) {
-                    $resolved = $this->middleware;
-                    $instance = null;
-                    $method = null;
-
-                    // Check for Slim callable as `class:method`
-                    if (preg_match(CallableResolver::$callablePattern, $resolved, $matches)) {
-                        $resolved = $matches[1];
-                        $method = $matches[2];
-                    }
-
-                    if ($this->container && $this->container->has($resolved)) {
-                        $instance = $this->container->get($resolved);
-                        if ($instance instanceof MiddlewareInterface) {
-                            return $instance->process($request, $this->next);
-                        }
-                    } elseif (!function_exists($resolved)) {
-                        if (!class_exists($resolved)) {
-                            throw new RuntimeException(sprintf('Middleware %s does not exist', $resolved));
-                        }
-                        $instance = new $resolved($this->container);
-                    }
-
-                    if ($instance && $instance instanceof MiddlewareInterface) {
-                        return $instance->process($request, $this->next);
-                    }
-
-                    $callable = $instance ?? $resolved;
-                    if ($instance && $method) {
-                        $callable = [$instance, $method];
-                    }
-
-                    if ($this->container && $callable instanceof Closure) {
-                        $callable = $callable->bindTo($this->container);
-                    }
-                }
-
-                if (!is_callable($callable)) {
-                    throw new RuntimeException(
-                        sprintf(
-                            'Middleware %s is not resolvable',
-                            $this->middleware
-                        )
-                    );
-                }
-
-                return $callable($request, $this->next);
-            }
-        };
-
-        return $this;
-    }
-
-    /**
-     * Add a (non-standard) callable middleware to the stack
-     *
-     * Middleware are organized as a stack. That means middleware
-     * that have been added before will be executed after the newly
-     * added one (last in, first out).
-     */
-    public function addCallable(callable $middleware): self
-    {
-        $next = $this->tip;
-
-        if ($this->container && $middleware instanceof Closure) {
-            /** @var Closure $middleware */
-            $middleware = $middleware->bindTo($this->container);
-        }
-
-        $this->tip = new class ($middleware, $next) implements RequestHandlerInterface {
-            /**
-             * @var callable
-             */
-            private $middleware;
-
-            /**
-             * @var RequestHandlerInterface
-             */
-            private $next;
-
-            public function __construct(callable $middleware, RequestHandlerInterface $next)
-            {
-                $this->middleware = $middleware;
-                $this->next = $next;
-            }
-
-            public function handle(ServerRequestInterface $request): ResponseInterface
-            {
-                return ($this->middleware)($request, $this->next);
-            }
-        };
-
-        return $this;
-    }
-}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/ResponseEmitter.php b/advancedcontentfilter/vendor/slim/slim/Slim/ResponseEmitter.php
deleted file mode 100644
index fac36e9e..00000000
--- a/advancedcontentfilter/vendor/slim/slim/Slim/ResponseEmitter.php
+++ /dev/null
@@ -1,136 +0,0 @@
-<?php
-
-/**
- * Slim Framework (https://slimframework.com)
- *
- * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
- */
-
-declare(strict_types=1);
-
-namespace Slim;
-
-use Psr\Http\Message\ResponseInterface;
-
-use function connection_status;
-use function header;
-use function headers_sent;
-use function in_array;
-use function min;
-use function sprintf;
-use function strlen;
-use function strtolower;
-
-use const CONNECTION_NORMAL;
-
-class ResponseEmitter
-{
-    private int $responseChunkSize;
-
-    public function __construct(int $responseChunkSize = 4096)
-    {
-        $this->responseChunkSize = $responseChunkSize;
-    }
-
-    /**
-     * Send the response the client
-     */
-    public function emit(ResponseInterface $response): void
-    {
-        $isEmpty = $this->isResponseEmpty($response);
-        if (headers_sent() === false) {
-            $this->emitHeaders($response);
-
-            // Set the status _after_ the headers, because of PHP's "helpful" behavior with location headers.
-            // See https://github.com/slimphp/Slim/issues/1730
-
-            $this->emitStatusLine($response);
-        }
-
-        if (!$isEmpty) {
-            $this->emitBody($response);
-        }
-    }
-
-    /**
-     * Emit Response Headers
-     */
-    private function emitHeaders(ResponseInterface $response): void
-    {
-        foreach ($response->getHeaders() as $name => $values) {
-            $first = strtolower($name) !== 'set-cookie';
-            foreach ($values as $value) {
-                $header = sprintf('%s: %s', $name, $value);
-                header($header, $first);
-                $first = false;
-            }
-        }
-    }
-
-    /**
-     * Emit Status Line
-     */
-    private function emitStatusLine(ResponseInterface $response): void
-    {
-        $statusLine = sprintf(
-            'HTTP/%s %s %s',
-            $response->getProtocolVersion(),
-            $response->getStatusCode(),
-            $response->getReasonPhrase()
-        );
-        header($statusLine, true, $response->getStatusCode());
-    }
-
-    /**
-     * Emit Body
-     */
-    private function emitBody(ResponseInterface $response): void
-    {
-        $body = $response->getBody();
-        if ($body->isSeekable()) {
-            $body->rewind();
-        }
-
-        $amountToRead = (int) $response->getHeaderLine('Content-Length');
-        if (!$amountToRead) {
-            $amountToRead = $body->getSize();
-        }
-
-        if ($amountToRead) {
-            while ($amountToRead > 0 && !$body->eof()) {
-                $length = min($this->responseChunkSize, $amountToRead);
-                $data = $body->read($length);
-                echo $data;
-
-                $amountToRead -= strlen($data);
-
-                if (connection_status() !== CONNECTION_NORMAL) {
-                    break;
-                }
-            }
-        } else {
-            while (!$body->eof()) {
-                echo $body->read($this->responseChunkSize);
-                if (connection_status() !== CONNECTION_NORMAL) {
-                    break;
-                }
-            }
-        }
-    }
-
-    /**
-     * Asserts response body is empty or status code is 204, 205 or 304
-     */
-    public function isResponseEmpty(ResponseInterface $response): bool
-    {
-        if (in_array($response->getStatusCode(), [204, 205, 304], true)) {
-            return true;
-        }
-        $stream = $response->getBody();
-        $seekable = $stream->isSeekable();
-        if ($seekable) {
-            $stream->rewind();
-        }
-        return $seekable ? $stream->read(1) === '' : $stream->eof();
-    }
-}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Routable.php b/advancedcontentfilter/vendor/slim/slim/Slim/Routable.php
new file mode 100644
index 00000000..c912db43
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Routable.php
@@ -0,0 +1,106 @@
+<?php
+/**
+ * Slim Framework (https://slimframework.com)
+ *
+ * @link      https://github.com/slimphp/Slim
+ * @copyright Copyright (c) 2011-2017 Josh Lockhart
+ * @license   https://github.com/slimphp/Slim/blob/3.x/LICENSE.md (MIT License)
+ */
+namespace Slim;
+
+use Psr\Container\ContainerInterface;
+
+/**
+ * A routable, middleware-aware object
+ *
+ * @package Slim
+ * @since   3.0.0
+ */
+abstract class Routable
+{
+    use CallableResolverAwareTrait;
+
+    /**
+     * Route callable
+     *
+     * @var callable
+     */
+    protected $callable;
+
+    /**
+     * Container
+     *
+     * @var ContainerInterface
+     */
+    protected $container;
+
+    /**
+     * Route middleware
+     *
+     * @var callable[]
+     */
+    protected $middleware = [];
+
+    /**
+     * Route pattern
+     *
+     * @var string
+     */
+    protected $pattern;
+
+    /**
+     * Get the middleware registered for the group
+     *
+     * @return callable[]
+     */
+    public function getMiddleware()
+    {
+        return $this->middleware;
+    }
+
+    /**
+     * Get the route pattern
+     *
+     * @return string
+     */
+    public function getPattern()
+    {
+        return $this->pattern;
+    }
+
+    /**
+     * Set container for use with resolveCallable
+     *
+     * @param ContainerInterface $container
+     *
+     * @return self
+     */
+    public function setContainer(ContainerInterface $container)
+    {
+        $this->container = $container;
+        return $this;
+    }
+
+    /**
+     * Prepend middleware to the middleware collection
+     *
+     * @param callable|string $callable The callback routine
+     *
+     * @return static
+     */
+    public function add($callable)
+    {
+        $this->middleware[] = new DeferredCallable($callable, $this->container);
+        return $this;
+    }
+
+    /**
+     * Set the route pattern
+     *
+     * @param string $newPattern
+     */
+    public function setPattern($newPattern)
+    {
+        $this->pattern = $newPattern;
+    }
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Route.php b/advancedcontentfilter/vendor/slim/slim/Slim/Route.php
new file mode 100644
index 00000000..fa8be4e4
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Route.php
@@ -0,0 +1,349 @@
+<?php
+/**
+ * Slim Framework (https://slimframework.com)
+ *
+ * @link      https://github.com/slimphp/Slim
+ * @copyright Copyright (c) 2011-2017 Josh Lockhart
+ * @license   https://github.com/slimphp/Slim/blob/3.x/LICENSE.md (MIT License)
+ */
+namespace Slim;
+
+use InvalidArgumentException;
+use Psr\Http\Message\ServerRequestInterface;
+use Psr\Http\Message\ResponseInterface;
+use Slim\Handlers\Strategies\RequestResponse;
+use Slim\Interfaces\InvocationStrategyInterface;
+use Slim\Interfaces\RouteInterface;
+
+/**
+ * Route
+ */
+class Route extends Routable implements RouteInterface
+{
+    use MiddlewareAwareTrait;
+
+    /**
+     * HTTP methods supported by this route
+     *
+     * @var string[]
+     */
+    protected $methods = [];
+
+    /**
+     * Route identifier
+     *
+     * @var string
+     */
+    protected $identifier;
+
+    /**
+     * Route name
+     *
+     * @var null|string
+     */
+    protected $name;
+
+    /**
+     * Parent route groups
+     *
+     * @var RouteGroup[]
+     */
+    protected $groups;
+
+    private $finalized = false;
+
+    /**
+     * Output buffering mode
+     *
+     * One of: false, 'prepend' or 'append'
+     *
+     * @var boolean|string
+     */
+    protected $outputBuffering = 'append';
+
+    /**
+     * Route parameters
+     *
+     * @var array
+     */
+    protected $arguments = [];
+
+    /**
+     * The callable payload
+     *
+     * @var callable
+     */
+    protected $callable;
+
+    /**
+     * Create new route
+     *
+     * @param string|string[]   $methods The route HTTP methods
+     * @param string            $pattern The route pattern
+     * @param callable          $callable The route callable
+     * @param RouteGroup[]      $groups The parent route groups
+     * @param int               $identifier The route identifier
+     */
+    public function __construct($methods, $pattern, $callable, $groups = [], $identifier = 0)
+    {
+        $this->methods  = is_string($methods) ? [$methods] : $methods;
+        $this->pattern  = $pattern;
+        $this->callable = $callable;
+        $this->groups   = $groups;
+        $this->identifier = 'route' . $identifier;
+    }
+
+    /**
+     * Finalize the route in preparation for dispatching
+     */
+    public function finalize()
+    {
+        if ($this->finalized) {
+            return;
+        }
+
+        $groupMiddleware = [];
+        foreach ($this->getGroups() as $group) {
+            $groupMiddleware = array_merge($group->getMiddleware(), $groupMiddleware);
+        }
+
+        $this->middleware = array_merge($this->middleware, $groupMiddleware);
+
+        foreach ($this->getMiddleware() as $middleware) {
+            $this->addMiddleware($middleware);
+        }
+
+        $this->finalized = true;
+    }
+
+    /**
+     * Get route callable
+     *
+     * @return callable
+     */
+    public function getCallable()
+    {
+        return $this->callable;
+    }
+
+    /**
+     * This method enables you to override the Route's callable
+     *
+     * @param string|\Closure $callable
+     */
+    public function setCallable($callable)
+    {
+        $this->callable = $callable;
+    }
+
+    /**
+     * Get route methods
+     *
+     * @return string[]
+     */
+    public function getMethods()
+    {
+        return $this->methods;
+    }
+
+    /**
+     * Get parent route groups
+     *
+     * @return RouteGroup[]
+     */
+    public function getGroups()
+    {
+        return $this->groups;
+    }
+
+    /**
+     * Get route name
+     *
+     * @return null|string
+     */
+    public function getName()
+    {
+        return $this->name;
+    }
+
+    /**
+     * Get route identifier
+     *
+     * @return string
+     */
+    public function getIdentifier()
+    {
+        return $this->identifier;
+    }
+
+    /**
+     * Get output buffering mode
+     *
+     * @return boolean|string
+     */
+    public function getOutputBuffering()
+    {
+        return $this->outputBuffering;
+    }
+
+    /**
+     * Set output buffering mode
+     *
+     * One of: false, 'prepend' or 'append'
+     *
+     * @param boolean|string $mode
+     *
+     * @throws InvalidArgumentException If an unknown buffering mode is specified
+     */
+    public function setOutputBuffering($mode)
+    {
+        if (!in_array($mode, [false, 'prepend', 'append'], true)) {
+            throw new InvalidArgumentException('Unknown output buffering mode');
+        }
+        $this->outputBuffering = $mode;
+    }
+
+    /**
+     * Set route name
+     *
+     * @param string $name
+     *
+     * @return self
+     *
+     * @throws InvalidArgumentException if the route name is not a string
+     */
+    public function setName($name)
+    {
+        if (!is_string($name)) {
+            throw new InvalidArgumentException('Route name must be a string');
+        }
+        $this->name = $name;
+        return $this;
+    }
+
+    /**
+     * Set a route argument
+     *
+     * @param string $name
+     * @param string $value
+     *
+     * @return self
+     */
+    public function setArgument($name, $value)
+    {
+        $this->arguments[$name] = $value;
+        return $this;
+    }
+
+    /**
+     * Replace route arguments
+     *
+     * @param array $arguments
+     *
+     * @return self
+     */
+    public function setArguments(array $arguments)
+    {
+        $this->arguments = $arguments;
+        return $this;
+    }
+
+    /**
+     * Retrieve route arguments
+     *
+     * @return array
+     */
+    public function getArguments()
+    {
+        return $this->arguments;
+    }
+
+    /**
+     * Retrieve a specific route argument
+     *
+     * @param string $name
+     * @param string|null $default
+     *
+     * @return mixed
+     */
+    public function getArgument($name, $default = null)
+    {
+        if (array_key_exists($name, $this->arguments)) {
+            return $this->arguments[$name];
+        }
+        return $default;
+    }
+
+    /********************************************************************************
+     * Route Runner
+     *******************************************************************************/
+
+    /**
+     * Prepare the route for use
+     *
+     * @param ServerRequestInterface $request
+     * @param array $arguments
+     */
+    public function prepare(ServerRequestInterface $request, array $arguments)
+    {
+        // Add the arguments
+        foreach ($arguments as $k => $v) {
+            $this->setArgument($k, $v);
+        }
+    }
+
+    /**
+     * Run route
+     *
+     * This method traverses the middleware stack, including the route's callable
+     * and captures the resultant HTTP response object. It then sends the response
+     * back to the Application.
+     *
+     * @param ServerRequestInterface $request
+     * @param ResponseInterface      $response
+     *
+     * @return ResponseInterface
+     */
+    public function run(ServerRequestInterface $request, ResponseInterface $response)
+    {
+        // Finalise route now that we are about to run it
+        $this->finalize();
+
+        // Traverse middleware stack and fetch updated response
+        return $this->callMiddlewareStack($request, $response);
+    }
+
+    /**
+     * Dispatch route callable against current Request and Response objects
+     *
+     * This method invokes the route object's callable. If middleware is
+     * registered for the route, each callable middleware is invoked in
+     * the order specified.
+     *
+     * @param ServerRequestInterface $request  The current Request object
+     * @param ResponseInterface      $response The current Response object
+     * @return \Psr\Http\Message\ResponseInterface
+     * @throws \Exception  if the route callable throws an exception
+     */
+    public function __invoke(ServerRequestInterface $request, ResponseInterface $response)
+    {
+        $this->callable = $this->resolveCallable($this->callable);
+
+        /** @var InvocationStrategyInterface $handler */
+        $handler = isset($this->container) ? $this->container->get('foundHandler') : new RequestResponse();
+
+        $newResponse = $handler($this->callable, $request, $response, $this->arguments);
+
+        if ($newResponse instanceof ResponseInterface) {
+            // if route callback returns a ResponseInterface, then use it
+            $response = $newResponse;
+        } elseif (is_string($newResponse)) {
+            // if route callback returns a string, then append it to the response
+            if ($response->getBody()->isWritable()) {
+                $response->getBody()->write($newResponse);
+            }
+        }
+
+        return $response;
+    }
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/RouteGroup.php b/advancedcontentfilter/vendor/slim/slim/Slim/RouteGroup.php
new file mode 100644
index 00000000..8260bbd6
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/RouteGroup.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * Slim Framework (https://slimframework.com)
+ *
+ * @link      https://github.com/slimphp/Slim
+ * @copyright Copyright (c) 2011-2017 Josh Lockhart
+ * @license   https://github.com/slimphp/Slim/blob/3.x/LICENSE.md (MIT License)
+ */
+namespace Slim;
+
+use Closure;
+use Slim\Interfaces\RouteGroupInterface;
+
+/**
+ * A collector for Routable objects with a common middleware stack
+ *
+ * @package Slim
+ */
+class RouteGroup extends Routable implements RouteGroupInterface
+{
+    /**
+     * Create a new RouteGroup
+     *
+     * @param string   $pattern  The pattern prefix for the group
+     * @param callable $callable The group callable
+     */
+    public function __construct($pattern, $callable)
+    {
+        $this->pattern = $pattern;
+        $this->callable = $callable;
+    }
+
+    /**
+     * Invoke the group to register any Routable objects within it.
+     *
+     * @param App $app The App instance to bind/pass to the group callable
+     */
+    public function __invoke(App $app = null)
+    {
+        $callable = $this->resolveCallable($this->callable);
+        if ($callable instanceof Closure && $app !== null) {
+            $callable = $callable->bindTo($app);
+        }
+
+        $callable($app);
+    }
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Router.php b/advancedcontentfilter/vendor/slim/slim/Slim/Router.php
new file mode 100644
index 00000000..83116288
--- /dev/null
+++ b/advancedcontentfilter/vendor/slim/slim/Slim/Router.php
@@ -0,0 +1,455 @@
+<?php
+/**
+ * Slim Framework (https://slimframework.com)
+ *
+ * @link      https://github.com/slimphp/Slim
+ * @copyright Copyright (c) 2011-2017 Josh Lockhart
+ * @license   https://github.com/slimphp/Slim/blob/3.x/LICENSE.md (MIT License)
+ */
+namespace Slim;
+
+use FastRoute\Dispatcher;
+use Psr\Container\ContainerInterface;
+use InvalidArgumentException;
+use RuntimeException;
+use Psr\Http\Message\ServerRequestInterface;
+use FastRoute\RouteCollector;
+use FastRoute\RouteParser;
+use FastRoute\RouteParser\Std as StdParser;
+use Slim\Interfaces\RouteGroupInterface;
+use Slim\Interfaces\RouterInterface;
+use Slim\Interfaces\RouteInterface;
+
+/**
+ * Router
+ *
+ * This class organizes Slim application route objects. It is responsible
+ * for registering route objects, assigning names to route objects,
+ * finding routes that match the current HTTP request, and creating
+ * URLs for a named route.
+ */
+class Router implements RouterInterface
+{
+    /**
+     * Container Interface
+     *
+     * @var ContainerInterface
+     */
+    protected $container;
+
+    /**
+     * Parser
+     *
+     * @var \FastRoute\RouteParser
+     */
+    protected $routeParser;
+
+    /**
+     * Base path used in pathFor()
+     *
+     * @var string
+     */
+    protected $basePath = '';
+
+    /**
+     * Path to fast route cache file. Set to false to disable route caching
+     *
+     * @var string|False
+     */
+    protected $cacheFile = false;
+
+    /**
+     * Routes
+     *
+     * @var Route[]
+     */
+    protected $routes = [];
+
+    /**
+     * Route counter incrementer
+     * @var int
+     */
+    protected $routeCounter = 0;
+
+    /**
+     * Route groups
+     *
+     * @var RouteGroup[]
+     */
+    protected $routeGroups = [];
+
+    /**
+     * @var \FastRoute\Dispatcher
+     */
+    protected $dispatcher;
+
+    /**
+     * Create new router
+     *
+     * @param RouteParser   $parser
+     */
+    public function __construct(RouteParser $parser = null)
+    {
+        $this->routeParser = $parser ?: new StdParser;
+    }
+
+    /**
+     * Set the base path used in pathFor()
+     *
+     * @param string $basePath
+     *
+     * @return self
+     */
+    public function setBasePath($basePath)
+    {
+        if (!is_string($basePath)) {
+            throw new InvalidArgumentException('Router basePath must be a string');
+        }
+
+        $this->basePath = $basePath;
+
+        return $this;
+    }
+
+    /**
+     * Set path to fast route cache file. If this is false then route caching is disabled.
+     *
+     * @param string|false $cacheFile
+     *
+     * @return self
+     */
+    public function setCacheFile($cacheFile)
+    {
+        if (!is_string($cacheFile) && $cacheFile !== false) {
+            throw new InvalidArgumentException('Router cacheFile must be a string or false');
+        }
+
+        $this->cacheFile = $cacheFile;
+
+        if ($cacheFile !== false && !is_writable(dirname($cacheFile))) {
+            throw new RuntimeException('Router cacheFile directory must be writable');
+        }
+
+
+        return $this;
+    }
+
+    /**
+     * @param ContainerInterface $container
+     */
+    public function setContainer(ContainerInterface $container)
+    {
+        $this->container = $container;
+    }
+
+    /**
+     * Add route
+     *
+     * @param  string[] $methods Array of HTTP methods
+     * @param  string   $pattern The route pattern
+     * @param  callable $handler The route callable
+     *
+     * @return RouteInterface
+     *
+     * @throws InvalidArgumentException if the route pattern isn't a string
+     */
+    public function map($methods, $pattern, $handler)
+    {
+        if (!is_string($pattern)) {
+            throw new InvalidArgumentException('Route pattern must be a string');
+        }
+
+        // Prepend parent group pattern(s)
+        if ($this->routeGroups) {
+            $pattern = $this->processGroups() . $pattern;
+        }
+
+        // According to RFC methods are defined in uppercase (See RFC 7231)
+        $methods = array_map("strtoupper", $methods);
+
+        // Add route
+        $route = $this->createRoute($methods, $pattern, $handler);
+        $this->routes[$route->getIdentifier()] = $route;
+        $this->routeCounter++;
+
+        return $route;
+    }
+
+    /**
+     * Dispatch router for HTTP request
+     *
+     * @param  ServerRequestInterface $request The current HTTP request object
+     *
+     * @return array
+     *
+     * @link   https://github.com/nikic/FastRoute/blob/master/src/Dispatcher.php
+     */
+    public function dispatch(ServerRequestInterface $request)
+    {
+        $uri = '/' . ltrim($request->getUri()->getPath(), '/');
+
+        return $this->createDispatcher()->dispatch(
+            $request->getMethod(),
+            $uri
+        );
+    }
+
+    /**
+     * Create a new Route object
+     *
+     * @param  string[] $methods Array of HTTP methods
+     * @param  string   $pattern The route pattern
+     * @param  callable $callable The route callable
+     *
+     * @return \Slim\Interfaces\RouteInterface
+     */
+    protected function createRoute($methods, $pattern, $callable)
+    {
+        $route = new Route($methods, $pattern, $callable, $this->routeGroups, $this->routeCounter);
+        if (!empty($this->container)) {
+            $route->setContainer($this->container);
+        }
+
+        return $route;
+    }
+
+    /**
+     * @return \FastRoute\Dispatcher
+     */
+    protected function createDispatcher()
+    {
+        if ($this->dispatcher) {
+            return $this->dispatcher;
+        }
+
+        $routeDefinitionCallback = function (RouteCollector $r) {
+            foreach ($this->getRoutes() as $route) {
+                $r->addRoute($route->getMethods(), $route->getPattern(), $route->getIdentifier());
+            }
+        };
+
+        if ($this->cacheFile) {
+            $this->dispatcher = \FastRoute\cachedDispatcher($routeDefinitionCallback, [
+                'routeParser' => $this->routeParser,
+                'cacheFile' => $this->cacheFile,
+            ]);
+        } else {
+            $this->dispatcher = \FastRoute\simpleDispatcher($routeDefinitionCallback, [
+                'routeParser' => $this->routeParser,
+            ]);
+        }
+
+        return $this->dispatcher;
+    }
+
+    /**
+     * @param \FastRoute\Dispatcher $dispatcher
+     */
+    public function setDispatcher(Dispatcher $dispatcher)
+    {
+        $this->dispatcher = $dispatcher;
+    }
+
+    /**
+     * Get route objects
+     *
+     * @return Route[]
+     */
+    public function getRoutes()
+    {
+        return $this->routes;
+    }
+
+    /**
+     * Get named route object
+     *
+     * @param string $name        Route name
+     *
+     * @return Route
+     *
+     * @throws RuntimeException   If named route does not exist
+     */
+    public function getNamedRoute($name)
+    {
+        foreach ($this->routes as $route) {
+            if ($name == $route->getName()) {
+                return $route;
+            }
+        }
+        throw new RuntimeException('Named route does not exist for name: ' . $name);
+    }
+
+    /**
+     * Remove named route
+     *
+     * @param string $name        Route name
+     *
+     * @throws RuntimeException   If named route does not exist
+     */
+    public function removeNamedRoute($name)
+    {
+        $route = $this->getNamedRoute($name);
+
+        // no exception, route exists, now remove by id
+        unset($this->routes[$route->getIdentifier()]);
+    }
+
+    /**
+     * Process route groups
+     *
+     * @return string A group pattern to prefix routes with
+     */
+    protected function processGroups()
+    {
+        $pattern = "";
+        foreach ($this->routeGroups as $group) {
+            $pattern .= $group->getPattern();
+        }
+        return $pattern;
+    }
+
+    /**
+     * Add a route group to the array
+     *
+     * @param string   $pattern
+     * @param callable $callable
+     *
+     * @return RouteGroupInterface
+     */
+    public function pushGroup($pattern, $callable)
+    {
+        $group = new RouteGroup($pattern, $callable);
+        array_push($this->routeGroups, $group);
+        return $group;
+    }
+
+    /**
+     * Removes the last route group from the array
+     *
+     * @return RouteGroup|bool The RouteGroup if successful, else False
+     */
+    public function popGroup()
+    {
+        $group = array_pop($this->routeGroups);
+        return $group instanceof RouteGroup ? $group : false;
+    }
+
+    /**
+     * @param $identifier
+     * @return \Slim\Interfaces\RouteInterface
+     */
+    public function lookupRoute($identifier)
+    {
+        if (!isset($this->routes[$identifier])) {
+            throw new RuntimeException('Route not found, looks like your route cache is stale.');
+        }
+        return $this->routes[$identifier];
+    }
+
+    /**
+     * Build the path for a named route excluding the base path
+     *
+     * @param string $name        Route name
+     * @param array  $data        Named argument replacement data
+     * @param array  $queryParams Optional query string parameters
+     *
+     * @return string
+     *
+     * @throws RuntimeException         If named route does not exist
+     * @throws InvalidArgumentException If required data not provided
+     */
+    public function relativePathFor($name, array $data = [], array $queryParams = [])
+    {
+        $route = $this->getNamedRoute($name);
+        $pattern = $route->getPattern();
+
+        $routeDatas = $this->routeParser->parse($pattern);
+        // $routeDatas is an array of all possible routes that can be made. There is
+        // one routedata for each optional parameter plus one for no optional parameters.
+        //
+        // The most specific is last, so we look for that first.
+        $routeDatas = array_reverse($routeDatas);
+
+        $segments = [];
+        foreach ($routeDatas as $routeData) {
+            foreach ($routeData as $item) {
+                if (is_string($item)) {
+                    // this segment is a static string
+                    $segments[] = $item;
+                    continue;
+                }
+
+                // This segment has a parameter: first element is the name
+                if (!array_key_exists($item[0], $data)) {
+                    // we don't have a data element for this segment: cancel
+                    // testing this routeData item, so that we can try a less
+                    // specific routeData item.
+                    $segments = [];
+                    $segmentName = $item[0];
+                    break;
+                }
+                $segments[] = $data[$item[0]];
+            }
+            if (!empty($segments)) {
+                // we found all the parameters for this route data, no need to check
+                // less specific ones
+                break;
+            }
+        }
+
+        if (empty($segments)) {
+            throw new InvalidArgumentException('Missing data for URL segment: ' . $segmentName);
+        }
+        $url = implode('', $segments);
+
+        if ($queryParams) {
+            $url .= '?' . http_build_query($queryParams);
+        }
+
+        return $url;
+    }
+
+
+    /**
+     * Build the path for a named route including the base path
+     *
+     * @param string $name        Route name
+     * @param array  $data        Named argument replacement data
+     * @param array  $queryParams Optional query string parameters
+     *
+     * @return string
+     *
+     * @throws RuntimeException         If named route does not exist
+     * @throws InvalidArgumentException If required data not provided
+     */
+    public function pathFor($name, array $data = [], array $queryParams = [])
+    {
+        $url = $this->relativePathFor($name, $data, $queryParams);
+
+        if ($this->basePath) {
+            $url = $this->basePath . $url;
+        }
+
+        return $url;
+    }
+
+    /**
+     * Build the path for a named route.
+     *
+     * This method is deprecated. Use pathFor() from now on.
+     *
+     * @param string $name        Route name
+     * @param array  $data        Named argument replacement data
+     * @param array  $queryParams Optional query string parameters
+     *
+     * @return string
+     *
+     * @throws RuntimeException         If named route does not exist
+     * @throws InvalidArgumentException If required data not provided
+     */
+    public function urlFor($name, array $data = [], array $queryParams = [])
+    {
+        trigger_error('urlFor() is deprecated. Use pathFor() instead.', E_USER_DEPRECATED);
+        return $this->pathFor($name, $data, $queryParams);
+    }
+}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Routing/Dispatcher.php b/advancedcontentfilter/vendor/slim/slim/Slim/Routing/Dispatcher.php
deleted file mode 100644
index e33eac39..00000000
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Routing/Dispatcher.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Slim\Routing;
-
-use FastRoute\DataGenerator\GroupCountBased;
-use FastRoute\RouteCollector as FastRouteCollector;
-use FastRoute\RouteParser\Std;
-use Slim\Interfaces\DispatcherInterface;
-use Slim\Interfaces\RouteCollectorInterface;
-
-class Dispatcher implements DispatcherInterface
-{
-    private RouteCollectorInterface $routeCollector;
-
-    private ?FastRouteDispatcher $dispatcher = null;
-
-    public function __construct(RouteCollectorInterface $routeCollector)
-    {
-        $this->routeCollector = $routeCollector;
-    }
-
-    protected function createDispatcher(): FastRouteDispatcher
-    {
-        if ($this->dispatcher) {
-            return $this->dispatcher;
-        }
-
-        $routeDefinitionCallback = function (FastRouteCollector $r): void {
-            $basePath = $this->routeCollector->getBasePath();
-
-            foreach ($this->routeCollector->getRoutes() as $route) {
-                $r->addRoute($route->getMethods(), $basePath . $route->getPattern(), $route->getIdentifier());
-            }
-        };
-
-        $cacheFile = $this->routeCollector->getCacheFile();
-        if ($cacheFile) {
-            /** @var FastRouteDispatcher $dispatcher */
-            $dispatcher = \FastRoute\cachedDispatcher($routeDefinitionCallback, [
-                'dataGenerator' => GroupCountBased::class,
-                'dispatcher' => FastRouteDispatcher::class,
-                'routeParser' => new Std(),
-                'cacheFile' => $cacheFile,
-            ]);
-        } else {
-            /** @var FastRouteDispatcher $dispatcher */
-            $dispatcher = \FastRoute\simpleDispatcher($routeDefinitionCallback, [
-                'dataGenerator' => GroupCountBased::class,
-                'dispatcher' => FastRouteDispatcher::class,
-                'routeParser' => new Std(),
-            ]);
-        }
-
-        $this->dispatcher = $dispatcher;
-        return $this->dispatcher;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function dispatch(string $method, string $uri): RoutingResults
-    {
-        $dispatcher = $this->createDispatcher();
-        $results = $dispatcher->dispatch($method, $uri);
-        return new RoutingResults($this, $method, $uri, $results[0], $results[1], $results[2]);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getAllowedMethods(string $uri): array
-    {
-        $dispatcher = $this->createDispatcher();
-        return $dispatcher->getAllowedMethods($uri);
-    }
-}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Routing/FastRouteDispatcher.php b/advancedcontentfilter/vendor/slim/slim/Slim/Routing/FastRouteDispatcher.php
deleted file mode 100644
index 797746bb..00000000
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Routing/FastRouteDispatcher.php
+++ /dev/null
@@ -1,109 +0,0 @@
-<?php
-
-/**
- * Slim Framework (https://slimframework.com)
- *
- * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
- */
-
-declare(strict_types=1);
-
-namespace Slim\Routing;
-
-use FastRoute\Dispatcher\GroupCountBased;
-
-class FastRouteDispatcher extends GroupCountBased
-{
-    /**
-     * @var string[][]
-     */
-    private array $allowedMethods = [];
-
-    /**
-     * @param string $httpMethod
-     * @param string $uri
-     *
-     * @return array{int, string|null, array<string, string>}
-     */
-    public function dispatch($httpMethod, $uri): array
-    {
-        $routingResults = $this->routingResults($httpMethod, $uri);
-        if ($routingResults[0] === self::FOUND) {
-            return $routingResults;
-        }
-
-        // For HEAD requests, attempt fallback to GET
-        if ($httpMethod === 'HEAD') {
-            $routingResults = $this->routingResults('GET', $uri);
-            if ($routingResults[0] === self::FOUND) {
-                return $routingResults;
-            }
-        }
-
-        // If nothing else matches, try fallback routes
-        $routingResults = $this->routingResults('*', $uri);
-        if ($routingResults[0] === self::FOUND) {
-            return $routingResults;
-        }
-
-        if (!empty($this->getAllowedMethods($uri))) {
-            return [self::METHOD_NOT_ALLOWED, null, []];
-        }
-
-        return [self::NOT_FOUND, null, []];
-    }
-
-    /**
-     * @param string $httpMethod
-     * @param string $uri
-     *
-     * @return array{int, string|null, array<string, string>}
-     */
-    private function routingResults(string $httpMethod, string $uri): array
-    {
-        if (isset($this->staticRouteMap[$httpMethod][$uri])) {
-            /** @var string $routeIdentifier */
-            $routeIdentifier = $this->staticRouteMap[$httpMethod][$uri];
-            return [self::FOUND, $routeIdentifier, []];
-        }
-
-        if (isset($this->variableRouteData[$httpMethod])) {
-            /** @var array{0: int, 1?: string, 2?: array<string, string>} $result */
-            $result = $this->dispatchVariableRoute($this->variableRouteData[$httpMethod], $uri);
-            if ($result[0] === self::FOUND) {
-                /** @var array{int, string, array<string, string>} $result */
-                return [self::FOUND, $result[1], $result[2]];
-            }
-        }
-
-        return [self::NOT_FOUND, null, []];
-    }
-
-    /**
-     * @param string $uri
-     *
-     * @return string[]
-     */
-    public function getAllowedMethods(string $uri): array
-    {
-        if (isset($this->allowedMethods[$uri])) {
-            return $this->allowedMethods[$uri];
-        }
-
-        $allowedMethods = [];
-        foreach ($this->staticRouteMap as $method => $uriMap) {
-            if (isset($uriMap[$uri])) {
-                $allowedMethods[$method] = true;
-            }
-        }
-
-        foreach ($this->variableRouteData as $method => $routeData) {
-            $result = $this->dispatchVariableRoute($routeData, $uri);
-            if ($result[0] === self::FOUND) {
-                $allowedMethods[$method] = true;
-            }
-        }
-
-        return $this->allowedMethods[$uri] = array_keys($allowedMethods);
-    }
-}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Routing/Route.php b/advancedcontentfilter/vendor/slim/slim/Slim/Routing/Route.php
deleted file mode 100644
index 2cd9fa56..00000000
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Routing/Route.php
+++ /dev/null
@@ -1,360 +0,0 @@
-<?php
-
-/**
- * Slim Framework (https://slimframework.com)
- *
- * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
- */
-
-declare(strict_types=1);
-
-namespace Slim\Routing;
-
-use Psr\Container\ContainerInterface;
-use Psr\Http\Message\ResponseFactoryInterface;
-use Psr\Http\Message\ResponseInterface;
-use Psr\Http\Message\ServerRequestInterface;
-use Psr\Http\Server\MiddlewareInterface;
-use Psr\Http\Server\RequestHandlerInterface;
-use Slim\Handlers\Strategies\RequestHandler;
-use Slim\Handlers\Strategies\RequestResponse;
-use Slim\Interfaces\AdvancedCallableResolverInterface;
-use Slim\Interfaces\CallableResolverInterface;
-use Slim\Interfaces\InvocationStrategyInterface;
-use Slim\Interfaces\RequestHandlerInvocationStrategyInterface;
-use Slim\Interfaces\RouteGroupInterface;
-use Slim\Interfaces\RouteInterface;
-use Slim\MiddlewareDispatcher;
-
-use function array_key_exists;
-use function array_replace;
-use function array_reverse;
-use function class_implements;
-use function in_array;
-use function is_array;
-
-class Route implements RouteInterface, RequestHandlerInterface
-{
-    /**
-     * HTTP methods supported by this route
-     *
-     * @var string[]
-     */
-    protected array $methods = [];
-
-    /**
-     * Route identifier
-     */
-    protected string $identifier;
-
-    /**
-     * Route name
-     */
-    protected ?string $name = null;
-
-    /**
-     * Parent route groups
-     *
-     * @var RouteGroupInterface[]
-     */
-    protected array $groups;
-
-    protected InvocationStrategyInterface $invocationStrategy;
-
-    /**
-     * Route parameters
-     *
-     * @var array<string, string>
-     */
-    protected array $arguments = [];
-
-    /**
-     * Route arguments parameters
-     *
-     * @var string[]
-     */
-    protected array $savedArguments = [];
-
-    /**
-     * Container
-     */
-    protected ?ContainerInterface $container = null;
-
-    protected MiddlewareDispatcher $middlewareDispatcher;
-
-    /**
-     * Route callable
-     *
-     * @var callable|string
-     */
-    protected $callable;
-
-    protected CallableResolverInterface $callableResolver;
-
-    protected ResponseFactoryInterface $responseFactory;
-
-    /**
-     * Route pattern
-     */
-    protected string $pattern;
-
-    protected bool $groupMiddlewareAppended = false;
-
-    /**
-     * @param string[]                         $methods    The route HTTP methods
-     * @param string                           $pattern    The route pattern
-     * @param callable|string                  $callable   The route callable
-     * @param ResponseFactoryInterface         $responseFactory
-     * @param CallableResolverInterface        $callableResolver
-     * @param ContainerInterface|null          $container
-     * @param InvocationStrategyInterface|null $invocationStrategy
-     * @param RouteGroupInterface[]            $groups     The parent route groups
-     * @param int                              $identifier The route identifier
-     */
-    public function __construct(
-        array $methods,
-        string $pattern,
-        $callable,
-        ResponseFactoryInterface $responseFactory,
-        CallableResolverInterface $callableResolver,
-        ?ContainerInterface $container = null,
-        ?InvocationStrategyInterface $invocationStrategy = null,
-        array $groups = [],
-        int $identifier = 0
-    ) {
-        $this->methods = $methods;
-        $this->pattern = $pattern;
-        $this->callable = $callable;
-        $this->responseFactory = $responseFactory;
-        $this->callableResolver = $callableResolver;
-        $this->container = $container;
-        $this->invocationStrategy = $invocationStrategy ?? new RequestResponse();
-        $this->groups = $groups;
-        $this->identifier = 'route' . $identifier;
-        $this->middlewareDispatcher = new MiddlewareDispatcher($this, $callableResolver, $container);
-    }
-
-    public function getCallableResolver(): CallableResolverInterface
-    {
-        return $this->callableResolver;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getInvocationStrategy(): InvocationStrategyInterface
-    {
-        return $this->invocationStrategy;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setInvocationStrategy(InvocationStrategyInterface $invocationStrategy): RouteInterface
-    {
-        $this->invocationStrategy = $invocationStrategy;
-        return $this;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getMethods(): array
-    {
-        return $this->methods;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getPattern(): string
-    {
-        return $this->pattern;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setPattern(string $pattern): RouteInterface
-    {
-        $this->pattern = $pattern;
-        return $this;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getCallable()
-    {
-        return $this->callable;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setCallable($callable): RouteInterface
-    {
-        $this->callable = $callable;
-        return $this;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getName(): ?string
-    {
-        return $this->name;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setName(string $name): RouteInterface
-    {
-        $this->name = $name;
-        return $this;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getIdentifier(): string
-    {
-        return $this->identifier;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getArgument(string $name, ?string $default = null): ?string
-    {
-        if (array_key_exists($name, $this->arguments)) {
-            return $this->arguments[$name];
-        }
-        return $default;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getArguments(): array
-    {
-        return $this->arguments;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setArguments(array $arguments, bool $includeInSavedArguments = true): RouteInterface
-    {
-        if ($includeInSavedArguments) {
-            $this->savedArguments = $arguments;
-        }
-
-        $this->arguments = $arguments;
-        return $this;
-    }
-
-    /**
-     * @return RouteGroupInterface[]
-     */
-    public function getGroups(): array
-    {
-        return $this->groups;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function add($middleware): RouteInterface
-    {
-        $this->middlewareDispatcher->add($middleware);
-        return $this;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function addMiddleware(MiddlewareInterface $middleware): RouteInterface
-    {
-        $this->middlewareDispatcher->addMiddleware($middleware);
-        return $this;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function prepare(array $arguments): RouteInterface
-    {
-        $this->arguments = array_replace($this->savedArguments, $arguments);
-        return $this;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setArgument(string $name, string $value, bool $includeInSavedArguments = true): RouteInterface
-    {
-        if ($includeInSavedArguments) {
-            $this->savedArguments[$name] = $value;
-        }
-
-        $this->arguments[$name] = $value;
-        return $this;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function run(ServerRequestInterface $request): ResponseInterface
-    {
-        if (!$this->groupMiddlewareAppended) {
-            $this->appendGroupMiddlewareToRoute();
-        }
-
-        return $this->middlewareDispatcher->handle($request);
-    }
-
-    /**
-     * @return void
-     */
-    protected function appendGroupMiddlewareToRoute(): void
-    {
-        $inner = $this->middlewareDispatcher;
-        $this->middlewareDispatcher = new MiddlewareDispatcher($inner, $this->callableResolver, $this->container);
-
-        /** @var RouteGroupInterface $group */
-        foreach (array_reverse($this->groups) as $group) {
-            $group->appendMiddlewareToDispatcher($this->middlewareDispatcher);
-        }
-
-        $this->groupMiddlewareAppended = true;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function handle(ServerRequestInterface $request): ResponseInterface
-    {
-        if ($this->callableResolver instanceof AdvancedCallableResolverInterface) {
-            $callable = $this->callableResolver->resolveRoute($this->callable);
-        } else {
-            $callable = $this->callableResolver->resolve($this->callable);
-        }
-        $strategy = $this->invocationStrategy;
-
-        /** @var string[] $strategyImplements */
-        $strategyImplements = class_implements($strategy);
-
-        if (
-            is_array($callable)
-            && $callable[0] instanceof RequestHandlerInterface
-            && !in_array(RequestHandlerInvocationStrategyInterface::class, $strategyImplements)
-        ) {
-            $strategy = new RequestHandler();
-        }
-
-        $response = $this->responseFactory->createResponse();
-        return $strategy($callable, $request, $response, $this->arguments);
-    }
-}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Routing/RouteCollector.php b/advancedcontentfilter/vendor/slim/slim/Slim/Routing/RouteCollector.php
deleted file mode 100644
index 61b45030..00000000
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Routing/RouteCollector.php
+++ /dev/null
@@ -1,293 +0,0 @@
-<?php
-
-/**
- * Slim Framework (https://slimframework.com)
- *
- * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
- */
-
-declare(strict_types=1);
-
-namespace Slim\Routing;
-
-use Psr\Container\ContainerInterface;
-use Psr\Http\Message\ResponseFactoryInterface;
-use RuntimeException;
-use Slim\Handlers\Strategies\RequestResponse;
-use Slim\Interfaces\CallableResolverInterface;
-use Slim\Interfaces\InvocationStrategyInterface;
-use Slim\Interfaces\RouteCollectorInterface;
-use Slim\Interfaces\RouteCollectorProxyInterface;
-use Slim\Interfaces\RouteGroupInterface;
-use Slim\Interfaces\RouteInterface;
-use Slim\Interfaces\RouteParserInterface;
-
-use function array_pop;
-use function dirname;
-use function file_exists;
-use function sprintf;
-use function is_readable;
-use function is_writable;
-
-/**
- * RouteCollector is used to collect routes and route groups
- * as well as generate paths and URLs relative to its environment
- */
-class RouteCollector implements RouteCollectorInterface
-{
-    protected RouteParserInterface $routeParser;
-
-    protected CallableResolverInterface $callableResolver;
-
-    protected ?ContainerInterface $container = null;
-
-    protected InvocationStrategyInterface $defaultInvocationStrategy;
-
-    /**
-     * Base path used in pathFor()
-     */
-    protected string $basePath = '';
-
-    /**
-     * Path to fast route cache file. Set to null to disable route caching
-     */
-    protected ?string $cacheFile = null;
-
-    /**
-     * Routes
-     *
-     * @var RouteInterface[]
-     */
-    protected array $routes = [];
-
-    /**
-     * Routes indexed by name
-     *
-     * @var RouteInterface[]
-     */
-    protected array $routesByName = [];
-
-    /**
-     * Route groups
-     *
-     * @var RouteGroupInterface[]
-     */
-    protected array $routeGroups = [];
-
-    /**
-     * Route counter incrementer
-     */
-    protected int $routeCounter = 0;
-
-    protected ResponseFactoryInterface $responseFactory;
-
-    public function __construct(
-        ResponseFactoryInterface $responseFactory,
-        CallableResolverInterface $callableResolver,
-        ?ContainerInterface $container = null,
-        ?InvocationStrategyInterface $defaultInvocationStrategy = null,
-        ?RouteParserInterface $routeParser = null,
-        ?string $cacheFile = null
-    ) {
-        $this->responseFactory = $responseFactory;
-        $this->callableResolver = $callableResolver;
-        $this->container = $container;
-        $this->defaultInvocationStrategy = $defaultInvocationStrategy ?? new RequestResponse();
-        $this->routeParser = $routeParser ?? new RouteParser($this);
-
-        if ($cacheFile) {
-            $this->setCacheFile($cacheFile);
-        }
-    }
-
-    public function getRouteParser(): RouteParserInterface
-    {
-        return $this->routeParser;
-    }
-
-    /**
-     * Get default route invocation strategy
-     */
-    public function getDefaultInvocationStrategy(): InvocationStrategyInterface
-    {
-        return $this->defaultInvocationStrategy;
-    }
-
-    public function setDefaultInvocationStrategy(InvocationStrategyInterface $strategy): RouteCollectorInterface
-    {
-        $this->defaultInvocationStrategy = $strategy;
-        return $this;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getCacheFile(): ?string
-    {
-        return $this->cacheFile;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setCacheFile(string $cacheFile): RouteCollectorInterface
-    {
-        if (file_exists($cacheFile) && !is_readable($cacheFile)) {
-            throw new RuntimeException(
-                sprintf('Route collector cache file `%s` is not readable', $cacheFile)
-            );
-        }
-
-        if (!file_exists($cacheFile) && !is_writable(dirname($cacheFile))) {
-            throw new RuntimeException(
-                sprintf('Route collector cache file directory `%s` is not writable', dirname($cacheFile))
-            );
-        }
-
-        $this->cacheFile = $cacheFile;
-        return $this;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getBasePath(): string
-    {
-        return $this->basePath;
-    }
-
-    /**
-     * Set the base path used in urlFor()
-     */
-    public function setBasePath(string $basePath): RouteCollectorInterface
-    {
-        $this->basePath = $basePath;
-
-        return $this;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getRoutes(): array
-    {
-        return $this->routes;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function removeNamedRoute(string $name): RouteCollectorInterface
-    {
-        $route = $this->getNamedRoute($name);
-
-        unset($this->routesByName[$route->getName()], $this->routes[$route->getIdentifier()]);
-        return $this;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getNamedRoute(string $name): RouteInterface
-    {
-        if (isset($this->routesByName[$name])) {
-            $route = $this->routesByName[$name];
-            if ($route->getName() === $name) {
-                return $route;
-            }
-
-            unset($this->routesByName[$name]);
-        }
-
-        foreach ($this->routes as $route) {
-            if ($name === $route->getName()) {
-                $this->routesByName[$name] = $route;
-                return $route;
-            }
-        }
-
-        throw new RuntimeException('Named route does not exist for name: ' . $name);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function lookupRoute(string $identifier): RouteInterface
-    {
-        if (!isset($this->routes[$identifier])) {
-            throw new RuntimeException('Route not found, looks like your route cache is stale.');
-        }
-        return $this->routes[$identifier];
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function group(string $pattern, $callable): RouteGroupInterface
-    {
-        $routeGroup = $this->createGroup($pattern, $callable);
-        $this->routeGroups[] = $routeGroup;
-
-        $routeGroup->collectRoutes();
-        array_pop($this->routeGroups);
-
-        return $routeGroup;
-    }
-
-    /**
-     * @param string|callable $callable
-     */
-    protected function createGroup(string $pattern, $callable): RouteGroupInterface
-    {
-        $routeCollectorProxy = $this->createProxy($pattern);
-        return new RouteGroup($pattern, $callable, $this->callableResolver, $routeCollectorProxy);
-    }
-
-    protected function createProxy(string $pattern): RouteCollectorProxyInterface
-    {
-        return new RouteCollectorProxy(
-            $this->responseFactory,
-            $this->callableResolver,
-            $this->container,
-            $this,
-            $pattern
-        );
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function map(array $methods, string $pattern, $handler): RouteInterface
-    {
-        $route = $this->createRoute($methods, $pattern, $handler);
-        $this->routes[$route->getIdentifier()] = $route;
-
-        $routeName = $route->getName();
-        if ($routeName !== null && !isset($this->routesByName[$routeName])) {
-            $this->routesByName[$routeName] = $route;
-        }
-
-        $this->routeCounter++;
-
-        return $route;
-    }
-
-    /**
-     * @param string[]        $methods
-     * @param callable|string $callable
-     */
-    protected function createRoute(array $methods, string $pattern, $callable): RouteInterface
-    {
-        return new Route(
-            $methods,
-            $pattern,
-            $callable,
-            $this->responseFactory,
-            $this->callableResolver,
-            $this->container,
-            $this->defaultInvocationStrategy,
-            $this->routeGroups,
-            $this->routeCounter
-        );
-    }
-}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Routing/RouteCollectorProxy.php b/advancedcontentfilter/vendor/slim/slim/Slim/Routing/RouteCollectorProxy.php
deleted file mode 100644
index f8bc232b..00000000
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Routing/RouteCollectorProxy.php
+++ /dev/null
@@ -1,187 +0,0 @@
-<?php
-
-/**
- * Slim Framework (https://slimframework.com)
- *
- * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
- */
-
-declare(strict_types=1);
-
-namespace Slim\Routing;
-
-use Psr\Container\ContainerInterface;
-use Psr\Http\Message\ResponseFactoryInterface;
-use Slim\Interfaces\CallableResolverInterface;
-use Slim\Interfaces\RouteCollectorInterface;
-use Slim\Interfaces\RouteCollectorProxyInterface;
-use Slim\Interfaces\RouteGroupInterface;
-use Slim\Interfaces\RouteInterface;
-
-class RouteCollectorProxy implements RouteCollectorProxyInterface
-{
-    protected ResponseFactoryInterface $responseFactory;
-
-    protected CallableResolverInterface $callableResolver;
-
-    protected ?ContainerInterface $container = null;
-
-    protected RouteCollectorInterface $routeCollector;
-
-    protected string $groupPattern;
-
-    public function __construct(
-        ResponseFactoryInterface $responseFactory,
-        CallableResolverInterface $callableResolver,
-        ?ContainerInterface $container = null,
-        ?RouteCollectorInterface $routeCollector = null,
-        string $groupPattern = ''
-    ) {
-        $this->responseFactory = $responseFactory;
-        $this->callableResolver = $callableResolver;
-        $this->container = $container;
-        $this->routeCollector = $routeCollector ?? new RouteCollector($responseFactory, $callableResolver, $container);
-        $this->groupPattern = $groupPattern;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getResponseFactory(): ResponseFactoryInterface
-    {
-        return $this->responseFactory;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getCallableResolver(): CallableResolverInterface
-    {
-        return $this->callableResolver;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getContainer(): ?ContainerInterface
-    {
-        return $this->container;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getRouteCollector(): RouteCollectorInterface
-    {
-        return $this->routeCollector;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getBasePath(): string
-    {
-        return $this->routeCollector->getBasePath();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setBasePath(string $basePath): RouteCollectorProxyInterface
-    {
-        $this->routeCollector->setBasePath($basePath);
-
-        return $this;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function get(string $pattern, $callable): RouteInterface
-    {
-        return $this->map(['GET'], $pattern, $callable);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function post(string $pattern, $callable): RouteInterface
-    {
-        return $this->map(['POST'], $pattern, $callable);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function put(string $pattern, $callable): RouteInterface
-    {
-        return $this->map(['PUT'], $pattern, $callable);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function patch(string $pattern, $callable): RouteInterface
-    {
-        return $this->map(['PATCH'], $pattern, $callable);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function delete(string $pattern, $callable): RouteInterface
-    {
-        return $this->map(['DELETE'], $pattern, $callable);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function options(string $pattern, $callable): RouteInterface
-    {
-        return $this->map(['OPTIONS'], $pattern, $callable);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function any(string $pattern, $callable): RouteInterface
-    {
-        return $this->map(['GET', 'POST', 'PUT', 'PATCH', 'DELETE', 'OPTIONS'], $pattern, $callable);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function map(array $methods, string $pattern, $callable): RouteInterface
-    {
-        $pattern = $this->groupPattern . $pattern;
-
-        return $this->routeCollector->map($methods, $pattern, $callable);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function group(string $pattern, $callable): RouteGroupInterface
-    {
-        $pattern = $this->groupPattern . $pattern;
-
-        return $this->routeCollector->group($pattern, $callable);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function redirect(string $from, $to, int $status = 302): RouteInterface
-    {
-        $responseFactory = $this->responseFactory;
-
-        $handler = function () use ($to, $status, $responseFactory) {
-            $response = $responseFactory->createResponse($status);
-            return $response->withHeader('Location', (string) $to);
-        };
-
-        return $this->get($from, $handler);
-    }
-}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Routing/RouteContext.php b/advancedcontentfilter/vendor/slim/slim/Slim/Routing/RouteContext.php
deleted file mode 100644
index 3ba5e23a..00000000
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Routing/RouteContext.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-
-/**
- * Slim Framework (https://slimframework.com)
- *
- * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
- */
-
-declare(strict_types=1);
-
-namespace Slim\Routing;
-
-use Psr\Http\Message\ServerRequestInterface;
-use RuntimeException;
-use Slim\Interfaces\RouteInterface;
-use Slim\Interfaces\RouteParserInterface;
-
-final class RouteContext
-{
-    public const ROUTE = '__route__';
-
-    public const ROUTE_PARSER = '__routeParser__';
-
-    public const ROUTING_RESULTS = '__routingResults__';
-
-    public const BASE_PATH = '__basePath__';
-
-    public static function fromRequest(ServerRequestInterface $serverRequest): self
-    {
-        $route = $serverRequest->getAttribute(self::ROUTE);
-        $routeParser = $serverRequest->getAttribute(self::ROUTE_PARSER);
-        $routingResults = $serverRequest->getAttribute(self::ROUTING_RESULTS);
-        $basePath = $serverRequest->getAttribute(self::BASE_PATH);
-
-        if ($routeParser === null || $routingResults === null) {
-            throw new RuntimeException('Cannot create RouteContext before routing has been completed');
-        }
-
-        /** @var RouteInterface|null $route */
-        /** @var RouteParserInterface $routeParser */
-        /** @var RoutingResults $routingResults */
-        /** @var string|null $basePath */
-        return new self($route, $routeParser, $routingResults, $basePath);
-    }
-
-    private ?RouteInterface $route;
-
-    private RouteParserInterface $routeParser;
-
-    private RoutingResults $routingResults;
-
-    private ?string $basePath;
-
-    private function __construct(
-        ?RouteInterface $route,
-        RouteParserInterface $routeParser,
-        RoutingResults $routingResults,
-        ?string $basePath = null
-    ) {
-        $this->route = $route;
-        $this->routeParser = $routeParser;
-        $this->routingResults = $routingResults;
-        $this->basePath = $basePath;
-    }
-
-    public function getRoute(): ?RouteInterface
-    {
-        return $this->route;
-    }
-
-    public function getRouteParser(): RouteParserInterface
-    {
-        return $this->routeParser;
-    }
-
-    public function getRoutingResults(): RoutingResults
-    {
-        return $this->routingResults;
-    }
-
-    public function getBasePath(): string
-    {
-        if ($this->basePath === null) {
-            throw new RuntimeException('No base path defined.');
-        }
-        return $this->basePath;
-    }
-}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Routing/RouteGroup.php b/advancedcontentfilter/vendor/slim/slim/Slim/Routing/RouteGroup.php
deleted file mode 100644
index cd2f4e79..00000000
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Routing/RouteGroup.php
+++ /dev/null
@@ -1,104 +0,0 @@
-<?php
-
-/**
- * Slim Framework (https://slimframework.com)
- *
- * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
- */
-
-declare(strict_types=1);
-
-namespace Slim\Routing;
-
-use Psr\Http\Server\MiddlewareInterface;
-use Slim\Interfaces\AdvancedCallableResolverInterface;
-use Slim\Interfaces\CallableResolverInterface;
-use Slim\Interfaces\RouteCollectorProxyInterface;
-use Slim\Interfaces\RouteGroupInterface;
-use Slim\MiddlewareDispatcher;
-
-class RouteGroup implements RouteGroupInterface
-{
-    /**
-     * @var callable|string
-     */
-    protected $callable;
-
-    protected CallableResolverInterface $callableResolver;
-
-    protected RouteCollectorProxyInterface $routeCollectorProxy;
-
-    /**
-     * @var MiddlewareInterface[]|string[]|callable[]
-     */
-    protected array $middleware = [];
-
-    protected string $pattern;
-
-    /**
-     * @param callable|string              $callable
-     */
-    public function __construct(
-        string $pattern,
-        $callable,
-        CallableResolverInterface $callableResolver,
-        RouteCollectorProxyInterface $routeCollectorProxy
-    ) {
-        $this->pattern = $pattern;
-        $this->callable = $callable;
-        $this->callableResolver = $callableResolver;
-        $this->routeCollectorProxy = $routeCollectorProxy;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function collectRoutes(): RouteGroupInterface
-    {
-        if ($this->callableResolver instanceof AdvancedCallableResolverInterface) {
-            $callable = $this->callableResolver->resolveRoute($this->callable);
-        } else {
-            $callable = $this->callableResolver->resolve($this->callable);
-        }
-        $callable($this->routeCollectorProxy);
-        return $this;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function add($middleware): RouteGroupInterface
-    {
-        $this->middleware[] = $middleware;
-        return $this;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function addMiddleware(MiddlewareInterface $middleware): RouteGroupInterface
-    {
-        $this->middleware[] = $middleware;
-        return $this;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function appendMiddlewareToDispatcher(MiddlewareDispatcher $dispatcher): RouteGroupInterface
-    {
-        foreach ($this->middleware as $middleware) {
-            $dispatcher->add($middleware);
-        }
-
-        return $this;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getPattern(): string
-    {
-        return $this->pattern;
-    }
-}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Routing/RouteParser.php b/advancedcontentfilter/vendor/slim/slim/Slim/Routing/RouteParser.php
deleted file mode 100644
index afb533cc..00000000
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Routing/RouteParser.php
+++ /dev/null
@@ -1,127 +0,0 @@
-<?php
-
-/**
- * Slim Framework (https://slimframework.com)
- *
- * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
- */
-
-declare(strict_types=1);
-
-namespace Slim\Routing;
-
-use FastRoute\RouteParser\Std;
-use InvalidArgumentException;
-use Psr\Http\Message\UriInterface;
-use Slim\Interfaces\RouteCollectorInterface;
-use Slim\Interfaces\RouteParserInterface;
-
-use function array_key_exists;
-use function array_reverse;
-use function http_build_query;
-use function implode;
-use function is_string;
-
-class RouteParser implements RouteParserInterface
-{
-    private RouteCollectorInterface $routeCollector;
-
-    private Std $routeParser;
-
-    public function __construct(RouteCollectorInterface $routeCollector)
-    {
-        $this->routeCollector = $routeCollector;
-        $this->routeParser = new Std();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function relativeUrlFor(string $routeName, array $data = [], array $queryParams = []): string
-    {
-        $route = $this->routeCollector->getNamedRoute($routeName);
-        $pattern = $route->getPattern();
-
-        $segments = [];
-        $segmentName = '';
-
-        /*
-         * $routes is an associative array of expressions representing a route as multiple segments
-         * There is an expression for each optional parameter plus one without the optional parameters
-         * The most specific is last, hence why we reverse the array before iterating over it
-         */
-        $expressions = array_reverse($this->routeParser->parse($pattern));
-        foreach ($expressions as $expression) {
-            foreach ($expression as $segment) {
-                /*
-                 * Each $segment is either a string or an array of strings
-                 * containing optional parameters of an expression
-                 */
-                if (is_string($segment)) {
-                    $segments[] = $segment;
-                    continue;
-                }
-
-                /** @var string[] $segment */
-                /*
-                 * If we don't have a data element for this segment in the provided $data
-                 * we cancel testing to move onto the next expression with a less specific item
-                 */
-                if (!array_key_exists($segment[0], $data)) {
-                    $segments = [];
-                    $segmentName = $segment[0];
-                    break;
-                }
-
-                $segments[] = $data[$segment[0]];
-            }
-
-            /*
-             * If we get to this logic block we have found all the parameters
-             * for the provided $data which means we don't need to continue testing
-             * less specific expressions
-             */
-            if (!empty($segments)) {
-                break;
-            }
-        }
-
-        if (empty($segments)) {
-            throw new InvalidArgumentException('Missing data for URL segment: ' . $segmentName);
-        }
-
-        $url = implode('', $segments);
-        if ($queryParams) {
-            $url .= '?' . http_build_query($queryParams);
-        }
-
-        return $url;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function urlFor(string $routeName, array $data = [], array $queryParams = []): string
-    {
-        $basePath = $this->routeCollector->getBasePath();
-        $url = $this->relativeUrlFor($routeName, $data, $queryParams);
-
-        if ($basePath) {
-            $url = $basePath . $url;
-        }
-
-        return $url;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function fullUrlFor(UriInterface $uri, string $routeName, array $data = [], array $queryParams = []): string
-    {
-        $path = $this->urlFor($routeName, $data, $queryParams);
-        $scheme = $uri->getScheme();
-        $authority = $uri->getAuthority();
-        $protocol = ($scheme ? $scheme . ':' : '') . ($authority ? '//' . $authority : '');
-        return $protocol . $path;
-    }
-}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Routing/RouteResolver.php b/advancedcontentfilter/vendor/slim/slim/Slim/Routing/RouteResolver.php
deleted file mode 100644
index d4f4eafa..00000000
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Routing/RouteResolver.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-
-/**
- * Slim Framework (https://slimframework.com)
- *
- * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
- */
-
-declare(strict_types=1);
-
-namespace Slim\Routing;
-
-use RuntimeException;
-use Slim\Interfaces\DispatcherInterface;
-use Slim\Interfaces\RouteCollectorInterface;
-use Slim\Interfaces\RouteInterface;
-use Slim\Interfaces\RouteResolverInterface;
-
-use function rawurldecode;
-
-/**
- * RouteResolver instantiates the FastRoute dispatcher
- * and computes the routing results of a given URI and request method
- */
-class RouteResolver implements RouteResolverInterface
-{
-    protected RouteCollectorInterface $routeCollector;
-
-    private DispatcherInterface $dispatcher;
-
-    public function __construct(RouteCollectorInterface $routeCollector, ?DispatcherInterface $dispatcher = null)
-    {
-        $this->routeCollector = $routeCollector;
-        $this->dispatcher = $dispatcher ?? new Dispatcher($routeCollector);
-    }
-
-    /**
-     * @param string $uri Should be $request->getUri()->getPath()
-     */
-    public function computeRoutingResults(string $uri, string $method): RoutingResults
-    {
-        $uri = rawurldecode($uri);
-        if ($uri === '' || $uri[0] !== '/') {
-            $uri = '/' . $uri;
-        }
-        return $this->dispatcher->dispatch($method, $uri);
-    }
-
-    /**
-     * @throws RuntimeException
-     */
-    public function resolveRoute(string $identifier): RouteInterface
-    {
-        return $this->routeCollector->lookupRoute($identifier);
-    }
-}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Routing/RouteRunner.php b/advancedcontentfilter/vendor/slim/slim/Slim/Routing/RouteRunner.php
deleted file mode 100644
index 40946af5..00000000
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Routing/RouteRunner.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-
-/**
- * Slim Framework (https://slimframework.com)
- *
- * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
- */
-
-declare(strict_types=1);
-
-namespace Slim\Routing;
-
-use Psr\Http\Message\ResponseInterface;
-use Psr\Http\Message\ServerRequestInterface;
-use Psr\Http\Server\RequestHandlerInterface;
-use Slim\Exception\HttpMethodNotAllowedException;
-use Slim\Exception\HttpNotFoundException;
-use Slim\Interfaces\RouteCollectorProxyInterface;
-use Slim\Interfaces\RouteParserInterface;
-use Slim\Interfaces\RouteResolverInterface;
-use Slim\Middleware\RoutingMiddleware;
-
-class RouteRunner implements RequestHandlerInterface
-{
-    private RouteResolverInterface $routeResolver;
-
-    private RouteParserInterface $routeParser;
-
-    private ?RouteCollectorProxyInterface $routeCollectorProxy;
-
-    public function __construct(
-        RouteResolverInterface $routeResolver,
-        RouteParserInterface $routeParser,
-        ?RouteCollectorProxyInterface $routeCollectorProxy = null
-    ) {
-        $this->routeResolver = $routeResolver;
-        $this->routeParser = $routeParser;
-        $this->routeCollectorProxy = $routeCollectorProxy;
-    }
-
-    /**
-     * This request handler is instantiated automatically in App::__construct()
-     * It is at the very tip of the middleware queue meaning it will be executed
-     * last and it detects whether or not routing has been performed in the user
-     * defined middleware stack. In the event that the user did not perform routing
-     * it is done here
-     *
-     * @throws HttpNotFoundException
-     * @throws HttpMethodNotAllowedException
-     */
-    public function handle(ServerRequestInterface $request): ResponseInterface
-    {
-        // If routing hasn't been done, then do it now so we can dispatch
-        if ($request->getAttribute(RouteContext::ROUTING_RESULTS) === null) {
-            $routingMiddleware = new RoutingMiddleware($this->routeResolver, $this->routeParser);
-            $request = $routingMiddleware->performRouting($request);
-        }
-
-        if ($this->routeCollectorProxy !== null) {
-            $request = $request->withAttribute(
-                RouteContext::BASE_PATH,
-                $this->routeCollectorProxy->getBasePath()
-            );
-        }
-
-        /** @var Route $route */
-        $route = $request->getAttribute(RouteContext::ROUTE);
-        return $route->run($request);
-    }
-}
diff --git a/advancedcontentfilter/vendor/slim/slim/Slim/Routing/RoutingResults.php b/advancedcontentfilter/vendor/slim/slim/Slim/Routing/RoutingResults.php
deleted file mode 100644
index ac2fa64f..00000000
--- a/advancedcontentfilter/vendor/slim/slim/Slim/Routing/RoutingResults.php
+++ /dev/null
@@ -1,112 +0,0 @@
-<?php
-
-/**
- * Slim Framework (https://slimframework.com)
- *
- * @license https://github.com/slimphp/Slim/blob/4.x/LICENSE.md (MIT License)
- */
-
-declare(strict_types=1);
-
-namespace Slim\Routing;
-
-use Slim\Interfaces\DispatcherInterface;
-
-use function rawurldecode;
-
-class RoutingResults
-{
-    public const NOT_FOUND = 0;
-    public const FOUND = 1;
-    public const METHOD_NOT_ALLOWED = 2;
-
-    protected DispatcherInterface $dispatcher;
-
-    protected string $method;
-
-    protected string $uri;
-
-    /**
-     * The status is one of the constants shown above
-     * NOT_FOUND = 0
-     * FOUND = 1
-     * METHOD_NOT_ALLOWED = 2
-     */
-    protected int $routeStatus;
-
-    protected ?string $routeIdentifier = null;
-
-    /**
-     * @var array<string, string>
-     */
-    protected array $routeArguments;
-
-    /**
-     * @param array<string, string> $routeArguments
-     */
-    public function __construct(
-        DispatcherInterface $dispatcher,
-        string $method,
-        string $uri,
-        int $routeStatus,
-        ?string $routeIdentifier = null,
-        array $routeArguments = []
-    ) {
-        $this->dispatcher = $dispatcher;
-        $this->method = $method;
-        $this->uri = $uri;
-        $this->routeStatus = $routeStatus;
-        $this->routeIdentifier = $routeIdentifier;
-        $this->routeArguments = $routeArguments;
-    }
-
-    public function getDispatcher(): DispatcherInterface
-    {
-        return $this->dispatcher;
-    }
-
-    public function getMethod(): string
-    {
-        return $this->method;
-    }
-
-    public function getUri(): string
-    {
-        return $this->uri;
-    }
-
-    public function getRouteStatus(): int
-    {
-        return $this->routeStatus;
-    }
-
-    public function getRouteIdentifier(): ?string
-    {
-        return $this->routeIdentifier;
-    }
-
-    /**
-     * @return array<string, string>
-     */
-    public function getRouteArguments(bool $urlDecode = true): array
-    {
-        if (!$urlDecode) {
-            return $this->routeArguments;
-        }
-
-        $routeArguments = [];
-        foreach ($this->routeArguments as $key => $value) {
-            $routeArguments[$key] = rawurldecode($value);
-        }
-
-        return $routeArguments;
-    }
-
-    /**
-     * @return string[]
-     */
-    public function getAllowedMethods(): array
-    {
-        return $this->dispatcher->getAllowedMethods($this->uri);
-    }
-}
diff --git a/advancedcontentfilter/vendor/slim/slim/composer.json b/advancedcontentfilter/vendor/slim/slim/composer.json
index f98064ff..554a838a 100644
--- a/advancedcontentfilter/vendor/slim/slim/composer.json
+++ b/advancedcontentfilter/vendor/slim/slim/composer.json
@@ -3,7 +3,7 @@
     "type": "library",
     "description": "Slim is a PHP micro framework that helps you quickly write simple yet powerful web applications and APIs",
     "keywords": ["framework","micro","api","router"],
-    "homepage": "https://www.slimframework.com",
+    "homepage": "https://slimframework.com",
     "license": "MIT",
     "authors": [
         {
@@ -21,82 +21,38 @@
             "email": "rob@akrabat.com",
             "homepage": "http://akrabat.com"
         },
-        {
-            "name": "Pierre Berube",
-            "email": "pierre@lgse.com",
-            "homepage": "http://www.lgse.com"
-        },
         {
             "name": "Gabriel Manricks",
             "email": "gmanricks@me.com",
             "homepage": "http://gabrielmanricks.com"
         }
     ],
-    "support": {
-        "docs": "https://www.slimframework.com/docs/v4/",
-        "forum": "https://discourse.slimframework.com/",
-        "irc": "irc://irc.freenode.net:6667/slimphp",
-        "issues": "https://github.com/slimphp/Slim/issues",
-        "rss": "https://www.slimframework.com/blog/feed.rss",
-        "slack": "https://slimphp.slack.com/",
-        "source": "https://github.com/slimphp/Slim",
-        "wiki": "https://github.com/slimphp/Slim/wiki"
-    },
     "require": {
-        "php": "^7.4 || ^8.0",
-        "ext-json": "*",
-        "nikic/fast-route": "^1.3",
-        "psr/container": "^1.0 || ^2.0",
-        "psr/http-factory": "^1.0",
-        "psr/http-message": "^1.1 || ^2.0",
-        "psr/http-server-handler": "^1.0",
-        "psr/http-server-middleware": "^1.0",
-        "psr/log": "^1.1 || ^2.0 || ^3.0"
+        "php": ">=5.5.0",
+        "pimple/pimple": "^3.0",
+        "psr/http-message": "^1.0",
+        "nikic/fast-route": "^1.0",
+        "container-interop/container-interop": "^1.2",
+        "psr/container": "^1.0"
     },
     "require-dev": {
-        "ext-simplexml": "*",
-        "adriansuter/php-autoload-override": "^1.4",
-        "guzzlehttp/psr7": "^2.6",
-        "httpsoft/http-message": "^1.1",
-        "httpsoft/http-server-request": "^1.1",
-        "laminas/laminas-diactoros": "^2.17 || ^3",
-        "nyholm/psr7": "^1.8",
-        "nyholm/psr7-server": "^1.1",
-        "phpspec/prophecy": "^1.19",
-        "phpspec/prophecy-phpunit": "^2.1",
-        "phpstan/phpstan": "^1.10",
-        "phpunit/phpunit": "^9.6",
-        "slim/http": "^1.3",
-        "slim/psr7": "^1.6",
-        "squizlabs/php_codesniffer": "^3.9"
+        "squizlabs/php_codesniffer": "^2.5",
+        "phpunit/phpunit": "^4.0"
+    },
+    "provide": {
+        "psr/http-message-implementation": "1.0"
     },
     "autoload": {
         "psr-4": {
             "Slim\\": "Slim"
         }
     },
-    "autoload-dev": {
-        "psr-4": {
-            "Slim\\Tests\\": "tests"
-        }
-    },
     "scripts": {
         "test": [
             "@phpunit",
-            "@phpcs",
-            "@phpstan"
+            "@phpcs"
         ],
-        "phpunit": "phpunit",
-        "phpcs": "phpcs",
-        "phpstan": "phpstan --memory-limit=-1"
-    },
-    "suggest": {
-        "ext-simplexml": "Needed to support XML format in BodyParsingMiddleware",
-        "ext-xml": "Needed to support XML format in BodyParsingMiddleware",
-        "slim/psr7": "Slim PSR-7 implementation. See https://www.slimframework.com/docs/v4/start/installation.html for more information.",
-        "php-di/php-di": "PHP-DI is the recommended container library to be used with Slim"
-    },
-    "config": {
-        "sort-packages": true
+        "phpunit": "php vendor/bin/phpunit",
+        "phpcs": "php vendor/bin/phpcs"
     }
 }
diff --git a/advancedcontentfilter/vendor/symfony/cache-contracts/.gitignore b/advancedcontentfilter/vendor/symfony/cache-contracts/.gitignore
deleted file mode 100644
index c49a5d8d..00000000
--- a/advancedcontentfilter/vendor/symfony/cache-contracts/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-vendor/
-composer.lock
-phpunit.xml
diff --git a/advancedcontentfilter/vendor/symfony/cache-contracts/CHANGELOG.md b/advancedcontentfilter/vendor/symfony/cache-contracts/CHANGELOG.md
deleted file mode 100644
index 7932e261..00000000
--- a/advancedcontentfilter/vendor/symfony/cache-contracts/CHANGELOG.md
+++ /dev/null
@@ -1,5 +0,0 @@
-CHANGELOG
-=========
-
-The changelog is maintained for all Symfony contracts at the following URL:
-https://github.com/symfony/contracts/blob/main/CHANGELOG.md
diff --git a/advancedcontentfilter/vendor/symfony/cache-contracts/CacheInterface.php b/advancedcontentfilter/vendor/symfony/cache-contracts/CacheInterface.php
deleted file mode 100644
index 67e4dfd3..00000000
--- a/advancedcontentfilter/vendor/symfony/cache-contracts/CacheInterface.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Contracts\Cache;
-
-use Psr\Cache\CacheItemInterface;
-use Psr\Cache\InvalidArgumentException;
-
-/**
- * Covers most simple to advanced caching needs.
- *
- * @author Nicolas Grekas <p@tchwork.com>
- */
-interface CacheInterface
-{
-    /**
-     * Fetches a value from the pool or computes it if not found.
-     *
-     * On cache misses, a callback is called that should return the missing value.
-     * This callback is given a PSR-6 CacheItemInterface instance corresponding to the
-     * requested key, that could be used e.g. for expiration control. It could also
-     * be an ItemInterface instance when its additional features are needed.
-     *
-     * @param string                     $key       The key of the item to retrieve from the cache
-     * @param callable|CallbackInterface $callback  Should return the computed value for the given key/item
-     * @param float|null                 $beta      A float that, as it grows, controls the likeliness of triggering
-     *                                              early expiration. 0 disables it, INF forces immediate expiration.
-     *                                              The default (or providing null) is implementation dependent but should
-     *                                              typically be 1.0, which should provide optimal stampede protection.
-     *                                              See https://en.wikipedia.org/wiki/Cache_stampede#Probabilistic_early_expiration
-     * @param array                      &$metadata The metadata of the cached item {@see ItemInterface::getMetadata()}
-     *
-     * @return mixed
-     *
-     * @throws InvalidArgumentException When $key is not valid or when $beta is negative
-     */
-    public function get(string $key, callable $callback, float $beta = null, array &$metadata = null);
-
-    /**
-     * Removes an item from the pool.
-     *
-     * @param string $key The key to delete
-     *
-     * @throws InvalidArgumentException When $key is not valid
-     *
-     * @return bool True if the item was successfully removed, false if there was any error
-     */
-    public function delete(string $key): bool;
-}
diff --git a/advancedcontentfilter/vendor/symfony/cache-contracts/CacheTrait.php b/advancedcontentfilter/vendor/symfony/cache-contracts/CacheTrait.php
deleted file mode 100644
index d340e069..00000000
--- a/advancedcontentfilter/vendor/symfony/cache-contracts/CacheTrait.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Contracts\Cache;
-
-use Psr\Cache\CacheItemPoolInterface;
-use Psr\Cache\InvalidArgumentException;
-use Psr\Log\LoggerInterface;
-
-// Help opcache.preload discover always-needed symbols
-class_exists(InvalidArgumentException::class);
-
-/**
- * An implementation of CacheInterface for PSR-6 CacheItemPoolInterface classes.
- *
- * @author Nicolas Grekas <p@tchwork.com>
- */
-trait CacheTrait
-{
-    /**
-     * {@inheritdoc}
-     *
-     * @return mixed
-     */
-    public function get(string $key, callable $callback, float $beta = null, array &$metadata = null)
-    {
-        return $this->doGet($this, $key, $callback, $beta, $metadata);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function delete(string $key): bool
-    {
-        return $this->deleteItem($key);
-    }
-
-    private function doGet(CacheItemPoolInterface $pool, string $key, callable $callback, ?float $beta, array &$metadata = null, LoggerInterface $logger = null)
-    {
-        if (0 > $beta = $beta ?? 1.0) {
-            throw new class(sprintf('Argument "$beta" provided to "%s::get()" must be a positive number, %f given.', static::class, $beta)) extends \InvalidArgumentException implements InvalidArgumentException { };
-        }
-
-        $item = $pool->getItem($key);
-        $recompute = !$item->isHit() || \INF === $beta;
-        $metadata = $item instanceof ItemInterface ? $item->getMetadata() : [];
-
-        if (!$recompute && $metadata) {
-            $expiry = $metadata[ItemInterface::METADATA_EXPIRY] ?? false;
-            $ctime = $metadata[ItemInterface::METADATA_CTIME] ?? false;
-
-            if ($recompute = $ctime && $expiry && $expiry <= ($now = microtime(true)) - $ctime / 1000 * $beta * log(random_int(1, \PHP_INT_MAX) / \PHP_INT_MAX)) {
-                // force applying defaultLifetime to expiry
-                $item->expiresAt(null);
-                $logger && $logger->info('Item "{key}" elected for early recomputation {delta}s before its expiration', [
-                    'key' => $key,
-                    'delta' => sprintf('%.1f', $expiry - $now),
-                ]);
-            }
-        }
-
-        if ($recompute) {
-            $save = true;
-            $item->set($callback($item, $save));
-            if ($save) {
-                $pool->save($item);
-            }
-        }
-
-        return $item->get();
-    }
-}
diff --git a/advancedcontentfilter/vendor/symfony/cache-contracts/CallbackInterface.php b/advancedcontentfilter/vendor/symfony/cache-contracts/CallbackInterface.php
deleted file mode 100644
index 7dae2aac..00000000
--- a/advancedcontentfilter/vendor/symfony/cache-contracts/CallbackInterface.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Contracts\Cache;
-
-use Psr\Cache\CacheItemInterface;
-
-/**
- * Computes and returns the cached value of an item.
- *
- * @author Nicolas Grekas <p@tchwork.com>
- */
-interface CallbackInterface
-{
-    /**
-     * @param CacheItemInterface|ItemInterface $item  The item to compute the value for
-     * @param bool                             &$save Should be set to false when the value should not be saved in the pool
-     *
-     * @return mixed The computed value for the passed item
-     */
-    public function __invoke(CacheItemInterface $item, bool &$save);
-}
diff --git a/advancedcontentfilter/vendor/symfony/cache-contracts/ItemInterface.php b/advancedcontentfilter/vendor/symfony/cache-contracts/ItemInterface.php
deleted file mode 100644
index 10c04889..00000000
--- a/advancedcontentfilter/vendor/symfony/cache-contracts/ItemInterface.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Contracts\Cache;
-
-use Psr\Cache\CacheException;
-use Psr\Cache\CacheItemInterface;
-use Psr\Cache\InvalidArgumentException;
-
-/**
- * Augments PSR-6's CacheItemInterface with support for tags and metadata.
- *
- * @author Nicolas Grekas <p@tchwork.com>
- */
-interface ItemInterface extends CacheItemInterface
-{
-    /**
-     * References the Unix timestamp stating when the item will expire.
-     */
-    public const METADATA_EXPIRY = 'expiry';
-
-    /**
-     * References the time the item took to be created, in milliseconds.
-     */
-    public const METADATA_CTIME = 'ctime';
-
-    /**
-     * References the list of tags that were assigned to the item, as string[].
-     */
-    public const METADATA_TAGS = 'tags';
-
-    /**
-     * Reserved characters that cannot be used in a key or tag.
-     */
-    public const RESERVED_CHARACTERS = '{}()/\@:';
-
-    /**
-     * Adds a tag to a cache item.
-     *
-     * Tags are strings that follow the same validation rules as keys.
-     *
-     * @param string|string[] $tags A tag or array of tags
-     *
-     * @return $this
-     *
-     * @throws InvalidArgumentException When $tag is not valid
-     * @throws CacheException           When the item comes from a pool that is not tag-aware
-     */
-    public function tag($tags): self;
-
-    /**
-     * Returns a list of metadata info that were saved alongside with the cached value.
-     *
-     * See ItemInterface::METADATA_* consts for keys potentially found in the returned array.
-     */
-    public function getMetadata(): array;
-}
diff --git a/advancedcontentfilter/vendor/symfony/cache-contracts/LICENSE b/advancedcontentfilter/vendor/symfony/cache-contracts/LICENSE
deleted file mode 100644
index 74cdc2db..00000000
--- a/advancedcontentfilter/vendor/symfony/cache-contracts/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2018-2022 Fabien Potencier
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is furnished
-to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
diff --git a/advancedcontentfilter/vendor/symfony/cache-contracts/README.md b/advancedcontentfilter/vendor/symfony/cache-contracts/README.md
deleted file mode 100644
index 7085a699..00000000
--- a/advancedcontentfilter/vendor/symfony/cache-contracts/README.md
+++ /dev/null
@@ -1,9 +0,0 @@
-Symfony Cache Contracts
-=======================
-
-A set of abstractions extracted out of the Symfony components.
-
-Can be used to build on semantics that the Symfony components proved useful - and
-that already have battle tested implementations.
-
-See https://github.com/symfony/contracts/blob/main/README.md for more information.
diff --git a/advancedcontentfilter/vendor/symfony/cache-contracts/TagAwareCacheInterface.php b/advancedcontentfilter/vendor/symfony/cache-contracts/TagAwareCacheInterface.php
deleted file mode 100644
index 7c4cf111..00000000
--- a/advancedcontentfilter/vendor/symfony/cache-contracts/TagAwareCacheInterface.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Contracts\Cache;
-
-use Psr\Cache\InvalidArgumentException;
-
-/**
- * Allows invalidating cached items using tags.
- *
- * @author Nicolas Grekas <p@tchwork.com>
- */
-interface TagAwareCacheInterface extends CacheInterface
-{
-    /**
-     * Invalidates cached items using tags.
-     *
-     * When implemented on a PSR-6 pool, invalidation should not apply
-     * to deferred items. Instead, they should be committed as usual.
-     * This allows replacing old tagged values by new ones without
-     * race conditions.
-     *
-     * @param string[] $tags An array of tags to invalidate
-     *
-     * @return bool True on success
-     *
-     * @throws InvalidArgumentException When $tags is not valid
-     */
-    public function invalidateTags(array $tags);
-}
diff --git a/advancedcontentfilter/vendor/symfony/cache-contracts/composer.json b/advancedcontentfilter/vendor/symfony/cache-contracts/composer.json
deleted file mode 100644
index 9f45e178..00000000
--- a/advancedcontentfilter/vendor/symfony/cache-contracts/composer.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-    "name": "symfony/cache-contracts",
-    "type": "library",
-    "description": "Generic abstractions related to caching",
-    "keywords": ["abstractions", "contracts", "decoupling", "interfaces", "interoperability", "standards"],
-    "homepage": "https://symfony.com",
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "Nicolas Grekas",
-            "email": "p@tchwork.com"
-        },
-        {
-            "name": "Symfony Community",
-            "homepage": "https://symfony.com/contributors"
-        }
-    ],
-    "require": {
-        "php": ">=7.2.5",
-        "psr/cache": "^1.0|^2.0|^3.0"
-    },
-    "suggest": {
-        "symfony/cache-implementation": ""
-    },
-    "autoload": {
-        "psr-4": { "Symfony\\Contracts\\Cache\\": "" }
-    },
-    "minimum-stability": "dev",
-    "extra": {
-        "branch-alias": {
-            "dev-main": "2.5-dev"
-        },
-        "thanks": {
-            "name": "symfony/contracts",
-            "url": "https://github.com/symfony/contracts"
-        }
-    }
-}
diff --git a/advancedcontentfilter/vendor/symfony/cache/Adapter/AbstractAdapter.php b/advancedcontentfilter/vendor/symfony/cache/Adapter/AbstractAdapter.php
index 65647442..727fc84c 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Adapter/AbstractAdapter.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Adapter/AbstractAdapter.php
@@ -11,80 +11,66 @@
 
 namespace Symfony\Component\Cache\Adapter;
 
+use Psr\Cache\CacheItemInterface;
 use Psr\Log\LoggerAwareInterface;
 use Psr\Log\LoggerInterface;
+use Psr\Log\NullLogger;
 use Symfony\Component\Cache\CacheItem;
 use Symfony\Component\Cache\Exception\InvalidArgumentException;
 use Symfony\Component\Cache\ResettableInterface;
-use Symfony\Component\Cache\Traits\AbstractAdapterTrait;
-use Symfony\Component\Cache\Traits\ContractsTrait;
-use Symfony\Contracts\Cache\CacheInterface;
+use Symfony\Component\Cache\Traits\AbstractTrait;
 
 /**
  * @author Nicolas Grekas <p@tchwork.com>
  */
-abstract class AbstractAdapter implements AdapterInterface, CacheInterface, LoggerAwareInterface, ResettableInterface
+abstract class AbstractAdapter implements AdapterInterface, LoggerAwareInterface, ResettableInterface
 {
-    use AbstractAdapterTrait;
-    use ContractsTrait;
-
-    /**
-     * @internal
-     */
-    protected const NS_SEPARATOR = ':';
+    use AbstractTrait;
 
     private static $apcuSupported;
     private static $phpFilesSupported;
 
-    protected function __construct(string $namespace = '', int $defaultLifetime = 0)
+    private $createCacheItem;
+    private $mergeByLifetime;
+
+    /**
+     * @param string $namespace
+     * @param int    $defaultLifetime
+     */
+    protected function __construct($namespace = '', $defaultLifetime = 0)
     {
-        $this->namespace = '' === $namespace ? '' : CacheItem::validateKey($namespace).static::NS_SEPARATOR;
-        if (null !== $this->maxIdLength && \strlen($namespace) > $this->maxIdLength - 24) {
-            throw new InvalidArgumentException(sprintf('Namespace must be %d chars max, %d given ("%s").', $this->maxIdLength - 24, \strlen($namespace), $namespace));
+        $this->namespace = '' === $namespace ? '' : CacheItem::validateKey($namespace).':';
+        if (null !== $this->maxIdLength && strlen($namespace) > $this->maxIdLength - 24) {
+            throw new InvalidArgumentException(sprintf('Namespace must be %d chars max, %d given ("%s")', $this->maxIdLength - 24, strlen($namespace), $namespace));
         }
         $this->createCacheItem = \Closure::bind(
-            static function ($key, $value, $isHit) {
+            function ($key, $value, $isHit) use ($defaultLifetime) {
                 $item = new CacheItem();
                 $item->key = $key;
-                $item->value = $v = $value;
+                $item->value = $value;
                 $item->isHit = $isHit;
-                // Detect wrapped values that encode for their expiry and creation duration
-                // For compactness, these values are packed in the key of an array using
-                // magic numbers in the form 9D-..-..-..-..-00-..-..-..-5F
-                if (\is_array($v) && 1 === \count($v) && 10 === \strlen($k = (string) array_key_first($v)) && "\x9D" === $k[0] && "\0" === $k[5] && "\x5F" === $k[9]) {
-                    $item->value = $v[$k];
-                    $v = unpack('Ve/Nc', substr($k, 1, -1));
-                    $item->metadata[CacheItem::METADATA_EXPIRY] = $v['e'] + CacheItem::METADATA_EXPIRY_OFFSET;
-                    $item->metadata[CacheItem::METADATA_CTIME] = $v['c'];
-                }
+                $item->defaultLifetime = $defaultLifetime;
 
                 return $item;
             },
             null,
             CacheItem::class
         );
-        $getId = \Closure::fromCallable([$this, 'getId']);
+        $getId = function ($key) { return $this->getId((string) $key); };
         $this->mergeByLifetime = \Closure::bind(
-            static function ($deferred, $namespace, &$expiredIds) use ($getId, $defaultLifetime) {
-                $byLifetime = [];
-                $now = microtime(true);
-                $expiredIds = [];
+            function ($deferred, $namespace, &$expiredIds) use ($getId) {
+                $byLifetime = array();
+                $now = time();
+                $expiredIds = array();
 
                 foreach ($deferred as $key => $item) {
-                    $key = (string) $key;
                     if (null === $item->expiry) {
-                        $ttl = 0 < $defaultLifetime ? $defaultLifetime : 0;
-                    } elseif (!$item->expiry) {
-                        $ttl = 0;
-                    } elseif (0 >= $ttl = (int) (0.1 + $item->expiry - $now)) {
+                        $byLifetime[0 < $item->defaultLifetime ? $item->defaultLifetime : 0][$getId($key)] = $item->value;
+                    } elseif ($item->expiry > $now) {
+                        $byLifetime[$item->expiry - $now][$getId($key)] = $item->value;
+                    } else {
                         $expiredIds[] = $getId($key);
-                        continue;
                     }
-                    if (isset(($metadata = $item->newMetadata)[CacheItem::METADATA_TAGS])) {
-                        unset($metadata[CacheItem::METADATA_TAGS]);
-                    }
-                    // For compactness, expiry and creation duration are packed in the key of an array, using magic numbers as separators
-                    $byLifetime[$ttl][$getId($key)] = $metadata ? ["\x9D".pack('VN', (int) (0.1 + $metadata[self::METADATA_EXPIRY] - self::METADATA_EXPIRY_OFFSET), $metadata[self::METADATA_CTIME])."\x5F" => $item->value] : $item->value;
                 }
 
                 return $byLifetime;
@@ -95,90 +81,168 @@ abstract class AbstractAdapter implements AdapterInterface, CacheInterface, Logg
     }
 
     /**
-     * Returns the best possible adapter that your runtime supports.
-     *
-     * Using ApcuAdapter makes system caches compatible with read-only filesystems.
-     *
-     * @param string $namespace
-     * @param int    $defaultLifetime
-     * @param string $version
-     * @param string $directory
+     * @param string               $namespace
+     * @param int                  $defaultLifetime
+     * @param string               $version
+     * @param string               $directory
+     * @param LoggerInterface|null $logger
      *
      * @return AdapterInterface
      */
     public static function createSystemCache($namespace, $defaultLifetime, $version, $directory, LoggerInterface $logger = null)
     {
-        $opcache = new PhpFilesAdapter($namespace, $defaultLifetime, $directory, true);
-        if (null !== $logger) {
-            $opcache->setLogger($logger);
+        if (null === self::$apcuSupported) {
+            self::$apcuSupported = ApcuAdapter::isSupported();
         }
 
-        if (!self::$apcuSupported = self::$apcuSupported ?? ApcuAdapter::isSupported()) {
+        if (!self::$apcuSupported && null === self::$phpFilesSupported) {
+            self::$phpFilesSupported = PhpFilesAdapter::isSupported();
+        }
+
+        if (self::$phpFilesSupported) {
+            $opcache = new PhpFilesAdapter($namespace, $defaultLifetime, $directory);
+            if (null !== $logger) {
+                $opcache->setLogger($logger);
+            }
+
             return $opcache;
         }
 
-        if (\in_array(\PHP_SAPI, ['cli', 'phpdbg'], true) && !filter_var(\ini_get('apc.enable_cli'), \FILTER_VALIDATE_BOOLEAN)) {
-            return $opcache;
+        $fs = new FilesystemAdapter($namespace, $defaultLifetime, $directory);
+        if (null !== $logger) {
+            $fs->setLogger($logger);
+        }
+        if (!self::$apcuSupported) {
+            return $fs;
         }
 
-        $apcu = new ApcuAdapter($namespace, intdiv($defaultLifetime, 5), $version);
-        if (null !== $logger) {
+        $apcu = new ApcuAdapter($namespace, (int) $defaultLifetime / 5, $version);
+        if ('cli' === \PHP_SAPI && !ini_get('apc.enable_cli')) {
+            $apcu->setLogger(new NullLogger());
+        } elseif (null !== $logger) {
             $apcu->setLogger($logger);
         }
 
-        return new ChainAdapter([$apcu, $opcache]);
+        return new ChainAdapter(array($apcu, $fs));
     }
 
-    public static function createConnection($dsn, array $options = [])
+    public static function createConnection($dsn, array $options = array())
     {
-        if (!\is_string($dsn)) {
-            throw new InvalidArgumentException(sprintf('The "%s()" method expect argument #1 to be string, "%s" given.', __METHOD__, \gettype($dsn)));
+        if (!is_string($dsn)) {
+            throw new InvalidArgumentException(sprintf('The %s() method expect argument #1 to be string, %s given.', __METHOD__, gettype($dsn)));
         }
-        if (str_starts_with($dsn, 'redis:') || str_starts_with($dsn, 'rediss:')) {
+        if (0 === strpos($dsn, 'redis://')) {
             return RedisAdapter::createConnection($dsn, $options);
         }
-        if (str_starts_with($dsn, 'memcached:')) {
+        if (0 === strpos($dsn, 'memcached://')) {
             return MemcachedAdapter::createConnection($dsn, $options);
         }
 
-        throw new InvalidArgumentException(sprintf('Unsupported DSN: "%s".', $dsn));
+        throw new InvalidArgumentException(sprintf('Unsupported DSN: %s.', $dsn));
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getItem($key)
+    {
+        if ($this->deferred) {
+            $this->commit();
+        }
+        $id = $this->getId($key);
+
+        $f = $this->createCacheItem;
+        $isHit = false;
+        $value = null;
+
+        try {
+            foreach ($this->doFetch(array($id)) as $value) {
+                $isHit = true;
+            }
+        } catch (\Exception $e) {
+            CacheItem::log($this->logger, 'Failed to fetch key "{key}"', array('key' => $key, 'exception' => $e));
+        }
+
+        return $f($key, $value, $isHit);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getItems(array $keys = array())
+    {
+        if ($this->deferred) {
+            $this->commit();
+        }
+        $ids = array();
+
+        foreach ($keys as $key) {
+            $ids[] = $this->getId($key);
+        }
+        try {
+            $items = $this->doFetch($ids);
+        } catch (\Exception $e) {
+            CacheItem::log($this->logger, 'Failed to fetch requested items', array('keys' => $keys, 'exception' => $e));
+            $items = array();
+        }
+        $ids = array_combine($ids, $keys);
+
+        return $this->generateItems($items, $ids);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function save(CacheItemInterface $item)
+    {
+        if (!$item instanceof CacheItem) {
+            return false;
+        }
+        $this->deferred[$item->getKey()] = $item;
+
+        return $this->commit();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function saveDeferred(CacheItemInterface $item)
+    {
+        if (!$item instanceof CacheItem) {
+            return false;
+        }
+        $this->deferred[$item->getKey()] = $item;
+
+        return true;
     }
 
     /**
      * {@inheritdoc}
-     *
-     * @return bool
      */
     public function commit()
     {
         $ok = true;
         $byLifetime = $this->mergeByLifetime;
         $byLifetime = $byLifetime($this->deferred, $this->namespace, $expiredIds);
-        $retry = $this->deferred = [];
+        $retry = $this->deferred = array();
 
         if ($expiredIds) {
-            try {
-                $this->doDelete($expiredIds);
-            } catch (\Exception $e) {
-                $ok = false;
-                CacheItem::log($this->logger, 'Failed to delete expired items: '.$e->getMessage(), ['exception' => $e, 'cache-adapter' => get_debug_type($this)]);
-            }
+            $this->doDelete($expiredIds);
         }
         foreach ($byLifetime as $lifetime => $values) {
             try {
                 $e = $this->doSave($values, $lifetime);
             } catch (\Exception $e) {
             }
-            if (true === $e || [] === $e) {
+            if (true === $e || array() === $e) {
                 continue;
             }
-            if (\is_array($e) || 1 === \count($values)) {
-                foreach (\is_array($e) ? $e : array_keys($values) as $id) {
+            if (is_array($e) || 1 === count($values)) {
+                foreach (is_array($e) ? $e : array_keys($values) as $id) {
                     $ok = false;
                     $v = $values[$id];
-                    $type = \is_object($v) ? \get_class($v) : \gettype($v);
-                    $message = sprintf('Failed to save key "{key}" of type %s%s', $type, $e instanceof \Exception ? ': '.$e->getMessage() : '.');
-                    CacheItem::log($this->logger, $message, ['key' => substr($id, \strlen($this->namespace)), 'exception' => $e instanceof \Exception ? $e : null]);
+                    $type = is_object($v) ? get_class($v) : gettype($v);
+                    CacheItem::log($this->logger, 'Failed to save key "{key}" ({type})', array('key' => substr($id, strlen($this->namespace)), 'type' => $type, 'exception' => $e instanceof \Exception ? $e : null));
                 }
             } else {
                 foreach ($values as $id => $v) {
@@ -192,19 +256,47 @@ abstract class AbstractAdapter implements AdapterInterface, CacheInterface, Logg
             foreach ($ids as $id) {
                 try {
                     $v = $byLifetime[$lifetime][$id];
-                    $e = $this->doSave([$id => $v], $lifetime);
+                    $e = $this->doSave(array($id => $v), $lifetime);
                 } catch (\Exception $e) {
                 }
-                if (true === $e || [] === $e) {
+                if (true === $e || array() === $e) {
                     continue;
                 }
                 $ok = false;
-                $type = \is_object($v) ? \get_class($v) : \gettype($v);
-                $message = sprintf('Failed to save key "{key}" of type %s%s', $type, $e instanceof \Exception ? ': '.$e->getMessage() : '.');
-                CacheItem::log($this->logger, $message, ['key' => substr($id, \strlen($this->namespace)), 'exception' => $e instanceof \Exception ? $e : null]);
+                $type = is_object($v) ? get_class($v) : gettype($v);
+                CacheItem::log($this->logger, 'Failed to save key "{key}" ({type})', array('key' => substr($id, strlen($this->namespace)), 'type' => $type, 'exception' => $e instanceof \Exception ? $e : null));
             }
         }
 
         return $ok;
     }
+
+    public function __destruct()
+    {
+        if ($this->deferred) {
+            $this->commit();
+        }
+    }
+
+    private function generateItems($items, &$keys)
+    {
+        $f = $this->createCacheItem;
+
+        try {
+            foreach ($items as $id => $value) {
+                if (!isset($keys[$id])) {
+                    $id = key($keys);
+                }
+                $key = $keys[$id];
+                unset($keys[$id]);
+                yield $key => $f($key, $value, true);
+            }
+        } catch (\Exception $e) {
+            CacheItem::log($this->logger, 'Failed to fetch requested items', array('keys' => array_values($keys), 'exception' => $e));
+        }
+
+        foreach ($keys as $key) {
+            yield $key => $f($key, null, false);
+        }
+    }
 }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Adapter/AbstractTagAwareAdapter.php b/advancedcontentfilter/vendor/symfony/cache/Adapter/AbstractTagAwareAdapter.php
deleted file mode 100644
index 6b62ae98..00000000
--- a/advancedcontentfilter/vendor/symfony/cache/Adapter/AbstractTagAwareAdapter.php
+++ /dev/null
@@ -1,334 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Cache\Adapter;
-
-use Psr\Log\LoggerAwareInterface;
-use Symfony\Component\Cache\CacheItem;
-use Symfony\Component\Cache\Exception\InvalidArgumentException;
-use Symfony\Component\Cache\ResettableInterface;
-use Symfony\Component\Cache\Traits\AbstractAdapterTrait;
-use Symfony\Component\Cache\Traits\ContractsTrait;
-use Symfony\Contracts\Cache\TagAwareCacheInterface;
-
-/**
- * Abstract for native TagAware adapters.
- *
- * To keep info on tags, the tags are both serialized as part of cache value and provided as tag ids
- * to Adapters on operations when needed for storage to doSave(), doDelete() & doInvalidate().
- *
- * @author Nicolas Grekas <p@tchwork.com>
- * @author André Rømcke <andre.romcke+symfony@gmail.com>
- *
- * @internal
- */
-abstract class AbstractTagAwareAdapter implements TagAwareAdapterInterface, TagAwareCacheInterface, LoggerAwareInterface, ResettableInterface
-{
-    use AbstractAdapterTrait;
-    use ContractsTrait;
-
-    private const TAGS_PREFIX = "\0tags\0";
-
-    protected function __construct(string $namespace = '', int $defaultLifetime = 0)
-    {
-        $this->namespace = '' === $namespace ? '' : CacheItem::validateKey($namespace).':';
-        if (null !== $this->maxIdLength && \strlen($namespace) > $this->maxIdLength - 24) {
-            throw new InvalidArgumentException(sprintf('Namespace must be %d chars max, %d given ("%s").', $this->maxIdLength - 24, \strlen($namespace), $namespace));
-        }
-        $this->createCacheItem = \Closure::bind(
-            static function ($key, $value, $isHit) {
-                $item = new CacheItem();
-                $item->key = $key;
-                $item->isTaggable = true;
-                // If structure does not match what we expect return item as is (no value and not a hit)
-                if (!\is_array($value) || !\array_key_exists('value', $value)) {
-                    return $item;
-                }
-                $item->isHit = $isHit;
-                // Extract value, tags and meta data from the cache value
-                $item->value = $value['value'];
-                $item->metadata[CacheItem::METADATA_TAGS] = $value['tags'] ?? [];
-                if (isset($value['meta'])) {
-                    // For compactness these values are packed, & expiry is offset to reduce size
-                    $v = unpack('Ve/Nc', $value['meta']);
-                    $item->metadata[CacheItem::METADATA_EXPIRY] = $v['e'] + CacheItem::METADATA_EXPIRY_OFFSET;
-                    $item->metadata[CacheItem::METADATA_CTIME] = $v['c'];
-                }
-
-                return $item;
-            },
-            null,
-            CacheItem::class
-        );
-        $getId = \Closure::fromCallable([$this, 'getId']);
-        $tagPrefix = self::TAGS_PREFIX;
-        $this->mergeByLifetime = \Closure::bind(
-            static function ($deferred, &$expiredIds) use ($getId, $tagPrefix, $defaultLifetime) {
-                $byLifetime = [];
-                $now = microtime(true);
-                $expiredIds = [];
-
-                foreach ($deferred as $key => $item) {
-                    $key = (string) $key;
-                    if (null === $item->expiry) {
-                        $ttl = 0 < $defaultLifetime ? $defaultLifetime : 0;
-                    } elseif (!$item->expiry) {
-                        $ttl = 0;
-                    } elseif (0 >= $ttl = (int) (0.1 + $item->expiry - $now)) {
-                        $expiredIds[] = $getId($key);
-                        continue;
-                    }
-                    // Store Value and Tags on the cache value
-                    if (isset(($metadata = $item->newMetadata)[CacheItem::METADATA_TAGS])) {
-                        $value = ['value' => $item->value, 'tags' => $metadata[CacheItem::METADATA_TAGS]];
-                        unset($metadata[CacheItem::METADATA_TAGS]);
-                    } else {
-                        $value = ['value' => $item->value, 'tags' => []];
-                    }
-
-                    if ($metadata) {
-                        // For compactness, expiry and creation duration are packed, using magic numbers as separators
-                        $value['meta'] = pack('VN', (int) (0.1 + $metadata[self::METADATA_EXPIRY] - self::METADATA_EXPIRY_OFFSET), $metadata[self::METADATA_CTIME]);
-                    }
-
-                    // Extract tag changes, these should be removed from values in doSave()
-                    $value['tag-operations'] = ['add' => [], 'remove' => []];
-                    $oldTags = $item->metadata[CacheItem::METADATA_TAGS] ?? [];
-                    foreach (array_diff($value['tags'], $oldTags) as $addedTag) {
-                        $value['tag-operations']['add'][] = $getId($tagPrefix.$addedTag);
-                    }
-                    foreach (array_diff($oldTags, $value['tags']) as $removedTag) {
-                        $value['tag-operations']['remove'][] = $getId($tagPrefix.$removedTag);
-                    }
-
-                    $byLifetime[$ttl][$getId($key)] = $value;
-                    $item->metadata = $item->newMetadata;
-                }
-
-                return $byLifetime;
-            },
-            null,
-            CacheItem::class
-        );
-    }
-
-    /**
-     * Persists several cache items immediately.
-     *
-     * @param array   $values        The values to cache, indexed by their cache identifier
-     * @param int     $lifetime      The lifetime of the cached values, 0 for persisting until manual cleaning
-     * @param array[] $addTagData    Hash where key is tag id, and array value is list of cache id's to add to tag
-     * @param array[] $removeTagData Hash where key is tag id, and array value is list of cache id's to remove to tag
-     *
-     * @return array The identifiers that failed to be cached or a boolean stating if caching succeeded or not
-     */
-    abstract protected function doSave(array $values, int $lifetime, array $addTagData = [], array $removeTagData = []): array;
-
-    /**
-     * Removes multiple items from the pool and their corresponding tags.
-     *
-     * @param array $ids An array of identifiers that should be removed from the pool
-     *
-     * @return bool True if the items were successfully removed, false otherwise
-     */
-    abstract protected function doDelete(array $ids);
-
-    /**
-     * Removes relations between tags and deleted items.
-     *
-     * @param array $tagData Array of tag => key identifiers that should be removed from the pool
-     */
-    abstract protected function doDeleteTagRelations(array $tagData): bool;
-
-    /**
-     * Invalidates cached items using tags.
-     *
-     * @param string[] $tagIds An array of tags to invalidate, key is tag and value is tag id
-     *
-     * @return bool True on success
-     */
-    abstract protected function doInvalidate(array $tagIds): bool;
-
-    /**
-     * Delete items and yields the tags they were bound to.
-     */
-    protected function doDeleteYieldTags(array $ids): iterable
-    {
-        foreach ($this->doFetch($ids) as $id => $value) {
-            yield $id => \is_array($value) && \is_array($value['tags'] ?? null) ? $value['tags'] : [];
-        }
-
-        $this->doDelete($ids);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function commit(): bool
-    {
-        $ok = true;
-        $byLifetime = $this->mergeByLifetime;
-        $byLifetime = $byLifetime($this->deferred, $expiredIds);
-        $retry = $this->deferred = [];
-
-        if ($expiredIds) {
-            // Tags are not cleaned up in this case, however that is done on invalidateTags().
-            try {
-                $this->doDelete($expiredIds);
-            } catch (\Exception $e) {
-                $ok = false;
-                CacheItem::log($this->logger, 'Failed to delete expired items: '.$e->getMessage(), ['exception' => $e, 'cache-adapter' => get_debug_type($this)]);
-            }
-        }
-        foreach ($byLifetime as $lifetime => $values) {
-            try {
-                $values = $this->extractTagData($values, $addTagData, $removeTagData);
-                $e = $this->doSave($values, $lifetime, $addTagData, $removeTagData);
-            } catch (\Exception $e) {
-            }
-            if (true === $e || [] === $e) {
-                continue;
-            }
-            if (\is_array($e) || 1 === \count($values)) {
-                foreach (\is_array($e) ? $e : array_keys($values) as $id) {
-                    $ok = false;
-                    $v = $values[$id];
-                    $type = \is_object($v) ? \get_class($v) : \gettype($v);
-                    $message = sprintf('Failed to save key "{key}" of type %s%s', $type, $e instanceof \Exception ? ': '.$e->getMessage() : '.');
-                    CacheItem::log($this->logger, $message, ['key' => substr($id, \strlen($this->namespace)), 'exception' => $e instanceof \Exception ? $e : null]);
-                }
-            } else {
-                foreach ($values as $id => $v) {
-                    $retry[$lifetime][] = $id;
-                }
-            }
-        }
-
-        // When bulk-save failed, retry each item individually
-        foreach ($retry as $lifetime => $ids) {
-            foreach ($ids as $id) {
-                try {
-                    $v = $byLifetime[$lifetime][$id];
-                    $values = $this->extractTagData([$id => $v], $addTagData, $removeTagData);
-                    $e = $this->doSave($values, $lifetime, $addTagData, $removeTagData);
-                } catch (\Exception $e) {
-                }
-                if (true === $e || [] === $e) {
-                    continue;
-                }
-                $ok = false;
-                $type = \is_object($v) ? \get_class($v) : \gettype($v);
-                $message = sprintf('Failed to save key "{key}" of type %s%s', $type, $e instanceof \Exception ? ': '.$e->getMessage() : '.');
-                CacheItem::log($this->logger, $message, ['key' => substr($id, \strlen($this->namespace)), 'exception' => $e instanceof \Exception ? $e : null]);
-            }
-        }
-
-        return $ok;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function deleteItems(array $keys): bool
-    {
-        if (!$keys) {
-            return true;
-        }
-
-        $ok = true;
-        $ids = [];
-        $tagData = [];
-
-        foreach ($keys as $key) {
-            $ids[$key] = $this->getId($key);
-            unset($this->deferred[$key]);
-        }
-
-        try {
-            foreach ($this->doDeleteYieldTags(array_values($ids)) as $id => $tags) {
-                foreach ($tags as $tag) {
-                    $tagData[$this->getId(self::TAGS_PREFIX.$tag)][] = $id;
-                }
-            }
-        } catch (\Exception $e) {
-            $ok = false;
-        }
-
-        try {
-            if ((!$tagData || $this->doDeleteTagRelations($tagData)) && $ok) {
-                return true;
-            }
-        } catch (\Exception $e) {
-        }
-
-        // When bulk-delete failed, retry each item individually
-        foreach ($ids as $key => $id) {
-            try {
-                $e = null;
-                if ($this->doDelete([$id])) {
-                    continue;
-                }
-            } catch (\Exception $e) {
-            }
-            $message = 'Failed to delete key "{key}"'.($e instanceof \Exception ? ': '.$e->getMessage() : '.');
-            CacheItem::log($this->logger, $message, ['key' => $key, 'exception' => $e]);
-            $ok = false;
-        }
-
-        return $ok;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function invalidateTags(array $tags)
-    {
-        if (empty($tags)) {
-            return false;
-        }
-
-        $tagIds = [];
-        foreach (array_unique($tags) as $tag) {
-            $tagIds[] = $this->getId(self::TAGS_PREFIX.$tag);
-        }
-
-        try {
-            if ($this->doInvalidate($tagIds)) {
-                return true;
-            }
-        } catch (\Exception $e) {
-            CacheItem::log($this->logger, 'Failed to invalidate tags: '.$e->getMessage(), ['exception' => $e, 'cache-adapter' => get_debug_type($this)]);
-        }
-
-        return false;
-    }
-
-    /**
-     * Extracts tags operation data from $values set in mergeByLifetime, and returns values without it.
-     */
-    private function extractTagData(array $values, ?array &$addTagData, ?array &$removeTagData): array
-    {
-        $addTagData = $removeTagData = [];
-        foreach ($values as $id => $value) {
-            foreach ($value['tag-operations']['add'] as $tag => $tagId) {
-                $addTagData[$tagId][] = $id;
-            }
-
-            foreach ($value['tag-operations']['remove'] as $tag => $tagId) {
-                $removeTagData[$tagId][] = $id;
-            }
-
-            unset($values[$id]['tag-operations']);
-        }
-
-        return $values;
-    }
-}
diff --git a/advancedcontentfilter/vendor/symfony/cache/Adapter/AdapterInterface.php b/advancedcontentfilter/vendor/symfony/cache/Adapter/AdapterInterface.php
index 9e359e17..41222c1a 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Adapter/AdapterInterface.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Adapter/AdapterInterface.php
@@ -14,9 +14,6 @@ namespace Symfony\Component\Cache\Adapter;
 use Psr\Cache\CacheItemPoolInterface;
 use Symfony\Component\Cache\CacheItem;
 
-// Help opcache.preload discover always-needed symbols
-class_exists(CacheItem::class);
-
 /**
  * Interface for adapters managing instances of Symfony's CacheItem.
  *
@@ -36,14 +33,5 @@ interface AdapterInterface extends CacheItemPoolInterface
      *
      * @return \Traversable|CacheItem[]
      */
-    public function getItems(array $keys = []);
-
-    /**
-     * {@inheritdoc}
-     *
-     * @param string $prefix
-     *
-     * @return bool
-     */
-    public function clear(/* string $prefix = '' */);
+    public function getItems(array $keys = array());
 }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Adapter/ApcuAdapter.php b/advancedcontentfilter/vendor/symfony/cache/Adapter/ApcuAdapter.php
index 7db39565..50554ed6 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Adapter/ApcuAdapter.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Adapter/ApcuAdapter.php
@@ -18,9 +18,13 @@ class ApcuAdapter extends AbstractAdapter
     use ApcuTrait;
 
     /**
+     * @param string      $namespace
+     * @param int         $defaultLifetime
+     * @param string|null $version
+     *
      * @throws CacheException if APCu is not enabled
      */
-    public function __construct(string $namespace = '', int $defaultLifetime = 0, string $version = null)
+    public function __construct($namespace = '', $defaultLifetime = 0, $version = null)
     {
         $this->init($namespace, $defaultLifetime, $version);
     }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Adapter/ArrayAdapter.php b/advancedcontentfilter/vendor/symfony/cache/Adapter/ArrayAdapter.php
index 20043dec..2118e9c6 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Adapter/ArrayAdapter.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Adapter/ArrayAdapter.php
@@ -16,31 +16,30 @@ use Psr\Log\LoggerAwareInterface;
 use Symfony\Component\Cache\CacheItem;
 use Symfony\Component\Cache\ResettableInterface;
 use Symfony\Component\Cache\Traits\ArrayTrait;
-use Symfony\Contracts\Cache\CacheInterface;
 
 /**
  * @author Nicolas Grekas <p@tchwork.com>
  */
-class ArrayAdapter implements AdapterInterface, CacheInterface, LoggerAwareInterface, ResettableInterface
+class ArrayAdapter implements AdapterInterface, LoggerAwareInterface, ResettableInterface
 {
     use ArrayTrait;
 
     private $createCacheItem;
-    private $defaultLifetime;
 
     /**
+     * @param int  $defaultLifetime
      * @param bool $storeSerialized Disabling serialization can lead to cache corruptions when storing mutable values but increases performance otherwise
      */
-    public function __construct(int $defaultLifetime = 0, bool $storeSerialized = true)
+    public function __construct($defaultLifetime = 0, $storeSerialized = true)
     {
-        $this->defaultLifetime = $defaultLifetime;
         $this->storeSerialized = $storeSerialized;
         $this->createCacheItem = \Closure::bind(
-            static function ($key, $value, $isHit) {
+            function ($key, $value, $isHit) use ($defaultLifetime) {
                 $item = new CacheItem();
                 $item->key = $key;
                 $item->value = $value;
                 $item->isHit = $isHit;
+                $item->defaultLifetime = $defaultLifetime;
 
                 return $item;
             },
@@ -49,35 +48,27 @@ class ArrayAdapter implements AdapterInterface, CacheInterface, LoggerAwareInter
         );
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function get(string $key, callable $callback, float $beta = null, array &$metadata = null)
-    {
-        $item = $this->getItem($key);
-        $metadata = $item->getMetadata();
-
-        // ArrayAdapter works in memory, we don't care about stampede protection
-        if (\INF === $beta || !$item->isHit()) {
-            $save = true;
-            $item->set($callback($item, $save));
-            if ($save) {
-                $this->save($item);
-            }
-        }
-
-        return $item->get();
-    }
-
     /**
      * {@inheritdoc}
      */
     public function getItem($key)
     {
-        if (!$isHit = $this->hasItem($key)) {
+        $isHit = $this->hasItem($key);
+        try {
+            if (!$isHit) {
+                $this->values[$key] = $value = null;
+            } elseif (!$this->storeSerialized) {
+                $value = $this->values[$key];
+            } elseif ('b:0;' === $value = $this->values[$key]) {
+                $value = false;
+            } elseif (false === $value = unserialize($value)) {
+                $this->values[$key] = $value = null;
+                $isHit = false;
+            }
+        } catch (\Exception $e) {
+            CacheItem::log($this->logger, 'Failed to unserialize key "{key}"', array('key' => $key, 'exception' => $e));
             $this->values[$key] = $value = null;
-        } else {
-            $value = $this->storeSerialized ? $this->unfreeze($key, $isHit) : $this->values[$key];
+            $isHit = false;
         }
         $f = $this->createCacheItem;
 
@@ -87,21 +78,17 @@ class ArrayAdapter implements AdapterInterface, CacheInterface, LoggerAwareInter
     /**
      * {@inheritdoc}
      */
-    public function getItems(array $keys = [])
+    public function getItems(array $keys = array())
     {
         foreach ($keys as $key) {
-            if (!\is_string($key) || !isset($this->expiries[$key])) {
-                CacheItem::validateKey($key);
-            }
+            CacheItem::validateKey($key);
         }
 
-        return $this->generateItems($keys, microtime(true), $this->createCacheItem);
+        return $this->generateItems($keys, time(), $this->createCacheItem);
     }
 
     /**
      * {@inheritdoc}
-     *
-     * @return bool
      */
     public function deleteItems(array $keys)
     {
@@ -114,8 +101,6 @@ class ArrayAdapter implements AdapterInterface, CacheInterface, LoggerAwareInter
 
     /**
      * {@inheritdoc}
-     *
-     * @return bool
      */
     public function save(CacheItemInterface $item)
     {
@@ -127,32 +112,33 @@ class ArrayAdapter implements AdapterInterface, CacheInterface, LoggerAwareInter
         $value = $item["\0*\0value"];
         $expiry = $item["\0*\0expiry"];
 
-        if (null !== $expiry) {
-            if (!$expiry) {
-                $expiry = \PHP_INT_MAX;
-            } elseif ($expiry <= microtime(true)) {
-                $this->deleteItem($key);
+        if (null !== $expiry && $expiry <= time()) {
+            $this->deleteItem($key);
 
-                return true;
+            return true;
+        }
+        if ($this->storeSerialized) {
+            try {
+                $value = serialize($value);
+            } catch (\Exception $e) {
+                $type = is_object($value) ? get_class($value) : gettype($value);
+                CacheItem::log($this->logger, 'Failed to save key "{key}" ({type})', array('key' => $key, 'type' => $type, 'exception' => $e));
+
+                return false;
             }
         }
-        if ($this->storeSerialized && null === $value = $this->freeze($value, $key)) {
-            return false;
-        }
-        if (null === $expiry && 0 < $this->defaultLifetime) {
-            $expiry = microtime(true) + $this->defaultLifetime;
+        if (null === $expiry && 0 < $item["\0*\0defaultLifetime"]) {
+            $expiry = time() + $item["\0*\0defaultLifetime"];
         }
 
         $this->values[$key] = $value;
-        $this->expiries[$key] = $expiry ?? \PHP_INT_MAX;
+        $this->expiries[$key] = null !== $expiry ? $expiry : PHP_INT_MAX;
 
         return true;
     }
 
     /**
      * {@inheritdoc}
-     *
-     * @return bool
      */
     public function saveDeferred(CacheItemInterface $item)
     {
@@ -161,19 +147,9 @@ class ArrayAdapter implements AdapterInterface, CacheInterface, LoggerAwareInter
 
     /**
      * {@inheritdoc}
-     *
-     * @return bool
      */
     public function commit()
     {
         return true;
     }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function delete(string $key): bool
-    {
-        return $this->deleteItem($key);
-    }
 }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Adapter/ChainAdapter.php b/advancedcontentfilter/vendor/symfony/cache/Adapter/ChainAdapter.php
index 57fb096b..6bdf6b2d 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Adapter/ChainAdapter.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Adapter/ChainAdapter.php
@@ -17,9 +17,6 @@ use Symfony\Component\Cache\CacheItem;
 use Symfony\Component\Cache\Exception\InvalidArgumentException;
 use Symfony\Component\Cache\PruneableInterface;
 use Symfony\Component\Cache\ResettableInterface;
-use Symfony\Component\Cache\Traits\ContractsTrait;
-use Symfony\Contracts\Cache\CacheInterface;
-use Symfony\Contracts\Service\ResetInterface;
 
 /**
  * Chains several adapters together.
@@ -29,19 +26,17 @@ use Symfony\Contracts\Service\ResetInterface;
  *
  * @author Kévin Dunglas <dunglas@gmail.com>
  */
-class ChainAdapter implements AdapterInterface, CacheInterface, PruneableInterface, ResettableInterface
+class ChainAdapter implements AdapterInterface, PruneableInterface, ResettableInterface
 {
-    use ContractsTrait;
-
-    private $adapters = [];
+    private $adapters = array();
     private $adapterCount;
-    private $syncItem;
+    private $saveUp;
 
     /**
-     * @param CacheItemPoolInterface[] $adapters        The ordered list of adapters used to fetch cached items
-     * @param int                      $defaultLifetime The default lifetime of items propagated from lower adapters to upper ones
+     * @param CacheItemPoolInterface[] $adapters    The ordered list of adapters used to fetch cached items
+     * @param int                      $maxLifetime The max lifetime of items propagated from lower adapters to upper ones
      */
-    public function __construct(array $adapters, int $defaultLifetime = 0)
+    public function __construct(array $adapters, $maxLifetime = 0)
     {
         if (!$adapters) {
             throw new InvalidArgumentException('At least one adapter must be specified.');
@@ -49,10 +44,7 @@ class ChainAdapter implements AdapterInterface, CacheInterface, PruneableInterfa
 
         foreach ($adapters as $adapter) {
             if (!$adapter instanceof CacheItemPoolInterface) {
-                throw new InvalidArgumentException(sprintf('The class "%s" does not implement the "%s" interface.', \get_class($adapter), CacheItemPoolInterface::class));
-            }
-            if (\in_array(\PHP_SAPI, ['cli', 'phpdbg'], true) && $adapter instanceof ApcuAdapter && !filter_var(\ini_get('apc.enable_cli'), \FILTER_VALIDATE_BOOLEAN)) {
-                continue; // skip putting APCu in the chain when the backend is disabled
+                throw new InvalidArgumentException(sprintf('The class "%s" does not implement the "%s" interface.', get_class($adapter), CacheItemPoolInterface::class));
             }
 
             if ($adapter instanceof AdapterInterface) {
@@ -61,88 +53,41 @@ class ChainAdapter implements AdapterInterface, CacheInterface, PruneableInterfa
                 $this->adapters[] = new ProxyAdapter($adapter);
             }
         }
-        $this->adapterCount = \count($this->adapters);
+        $this->adapterCount = count($this->adapters);
 
-        $this->syncItem = \Closure::bind(
-            static function ($sourceItem, $item, $sourceMetadata = null) use ($defaultLifetime) {
-                $sourceItem->isTaggable = false;
-                $sourceMetadata = $sourceMetadata ?? $sourceItem->metadata;
-                unset($sourceMetadata[CacheItem::METADATA_TAGS]);
+        $this->saveUp = \Closure::bind(
+            function ($adapter, $item) use ($maxLifetime) {
+                $origDefaultLifetime = $item->defaultLifetime;
 
-                $item->value = $sourceItem->value;
-                $item->isHit = $sourceItem->isHit;
-                $item->metadata = $item->newMetadata = $sourceItem->metadata = $sourceMetadata;
-
-                if (isset($item->metadata[CacheItem::METADATA_EXPIRY])) {
-                    $item->expiresAt(\DateTime::createFromFormat('U.u', sprintf('%.6F', $item->metadata[CacheItem::METADATA_EXPIRY])));
-                } elseif (0 < $defaultLifetime) {
-                    $item->expiresAfter($defaultLifetime);
+                if (0 < $maxLifetime && ($origDefaultLifetime <= 0 || $maxLifetime < $origDefaultLifetime)) {
+                    $item->defaultLifetime = $maxLifetime;
                 }
 
-                return $item;
+                $adapter->save($item);
+                $item->defaultLifetime = $origDefaultLifetime;
             },
             null,
             CacheItem::class
         );
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function get(string $key, callable $callback, float $beta = null, array &$metadata = null)
-    {
-        $doSave = true;
-        $callback = static function (CacheItem $item, bool &$save) use ($callback, &$doSave) {
-            $value = $callback($item, $save);
-            $doSave = $save;
-
-            return $value;
-        };
-
-        $lastItem = null;
-        $i = 0;
-        $wrap = function (CacheItem $item = null, bool &$save = true) use ($key, $callback, $beta, &$wrap, &$i, &$doSave, &$lastItem, &$metadata) {
-            $adapter = $this->adapters[$i];
-            if (isset($this->adapters[++$i])) {
-                $callback = $wrap;
-                $beta = \INF === $beta ? \INF : 0;
-            }
-            if ($adapter instanceof CacheInterface) {
-                $value = $adapter->get($key, $callback, $beta, $metadata);
-            } else {
-                $value = $this->doGet($adapter, $key, $callback, $beta, $metadata);
-            }
-            if (null !== $item) {
-                ($this->syncItem)($lastItem = $lastItem ?? $item, $item, $metadata);
-            }
-            $save = $doSave;
-
-            return $value;
-        };
-
-        return $wrap();
-    }
-
     /**
      * {@inheritdoc}
      */
     public function getItem($key)
     {
-        $syncItem = $this->syncItem;
-        $misses = [];
+        $saveUp = $this->saveUp;
 
         foreach ($this->adapters as $i => $adapter) {
             $item = $adapter->getItem($key);
 
             if ($item->isHit()) {
                 while (0 <= --$i) {
-                    $this->adapters[$i]->save($syncItem($item, $misses[$i]));
+                    $saveUp($this->adapters[$i], $item);
                 }
 
                 return $item;
             }
-
-            $misses[$i] = $item;
         }
 
         return $item;
@@ -151,35 +96,33 @@ class ChainAdapter implements AdapterInterface, CacheInterface, PruneableInterfa
     /**
      * {@inheritdoc}
      */
-    public function getItems(array $keys = [])
+    public function getItems(array $keys = array())
     {
         return $this->generateItems($this->adapters[0]->getItems($keys), 0);
     }
 
-    private function generateItems(iterable $items, int $adapterIndex)
+    private function generateItems($items, $adapterIndex)
     {
-        $missing = [];
-        $misses = [];
+        $missing = array();
         $nextAdapterIndex = $adapterIndex + 1;
-        $nextAdapter = $this->adapters[$nextAdapterIndex] ?? null;
+        $nextAdapter = isset($this->adapters[$nextAdapterIndex]) ? $this->adapters[$nextAdapterIndex] : null;
 
         foreach ($items as $k => $item) {
             if (!$nextAdapter || $item->isHit()) {
                 yield $k => $item;
             } else {
                 $missing[] = $k;
-                $misses[$k] = $item;
             }
         }
 
         if ($missing) {
-            $syncItem = $this->syncItem;
+            $saveUp = $this->saveUp;
             $adapter = $this->adapters[$adapterIndex];
             $items = $this->generateItems($nextAdapter->getItems($missing), $nextAdapterIndex);
 
             foreach ($items as $k => $item) {
                 if ($item->isHit()) {
-                    $adapter->save($syncItem($item, $misses[$k]));
+                    $saveUp($adapter, $item);
                 }
 
                 yield $k => $item;
@@ -189,8 +132,6 @@ class ChainAdapter implements AdapterInterface, CacheInterface, PruneableInterfa
 
     /**
      * {@inheritdoc}
-     *
-     * @return bool
      */
     public function hasItem($key)
     {
@@ -205,23 +146,14 @@ class ChainAdapter implements AdapterInterface, CacheInterface, PruneableInterfa
 
     /**
      * {@inheritdoc}
-     *
-     * @param string $prefix
-     *
-     * @return bool
      */
-    public function clear(/* string $prefix = '' */)
+    public function clear()
     {
-        $prefix = 0 < \func_num_args() ? (string) func_get_arg(0) : '';
         $cleared = true;
         $i = $this->adapterCount;
 
         while ($i--) {
-            if ($this->adapters[$i] instanceof AdapterInterface) {
-                $cleared = $this->adapters[$i]->clear($prefix) && $cleared;
-            } else {
-                $cleared = $this->adapters[$i]->clear() && $cleared;
-            }
+            $cleared = $this->adapters[$i]->clear() && $cleared;
         }
 
         return $cleared;
@@ -229,8 +161,6 @@ class ChainAdapter implements AdapterInterface, CacheInterface, PruneableInterfa
 
     /**
      * {@inheritdoc}
-     *
-     * @return bool
      */
     public function deleteItem($key)
     {
@@ -246,8 +176,6 @@ class ChainAdapter implements AdapterInterface, CacheInterface, PruneableInterfa
 
     /**
      * {@inheritdoc}
-     *
-     * @return bool
      */
     public function deleteItems(array $keys)
     {
@@ -263,8 +191,6 @@ class ChainAdapter implements AdapterInterface, CacheInterface, PruneableInterfa
 
     /**
      * {@inheritdoc}
-     *
-     * @return bool
      */
     public function save(CacheItemInterface $item)
     {
@@ -280,8 +206,6 @@ class ChainAdapter implements AdapterInterface, CacheInterface, PruneableInterfa
 
     /**
      * {@inheritdoc}
-     *
-     * @return bool
      */
     public function saveDeferred(CacheItemInterface $item)
     {
@@ -297,8 +221,6 @@ class ChainAdapter implements AdapterInterface, CacheInterface, PruneableInterfa
 
     /**
      * {@inheritdoc}
-     *
-     * @return bool
      */
     public function commit()
     {
@@ -334,7 +256,7 @@ class ChainAdapter implements AdapterInterface, CacheInterface, PruneableInterfa
     public function reset()
     {
         foreach ($this->adapters as $adapter) {
-            if ($adapter instanceof ResetInterface) {
+            if ($adapter instanceof ResettableInterface) {
                 $adapter->reset();
             }
         }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Adapter/DoctrineAdapter.php b/advancedcontentfilter/vendor/symfony/cache/Adapter/DoctrineAdapter.php
index 75ae4cb7..972d2b41 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Adapter/DoctrineAdapter.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Adapter/DoctrineAdapter.php
@@ -18,7 +18,12 @@ class DoctrineAdapter extends AbstractAdapter
 {
     use DoctrineTrait;
 
-    public function __construct(CacheProvider $provider, string $namespace = '', int $defaultLifetime = 0)
+    /**
+     * @param CacheProvider $provider
+     * @param string        $namespace
+     * @param int           $defaultLifetime
+     */
+    public function __construct(CacheProvider $provider, $namespace = '', $defaultLifetime = 0)
     {
         parent::__construct('', $defaultLifetime);
         $this->provider = $provider;
diff --git a/advancedcontentfilter/vendor/symfony/cache/Adapter/FilesystemAdapter.php b/advancedcontentfilter/vendor/symfony/cache/Adapter/FilesystemAdapter.php
index 7185dd48..d071964e 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Adapter/FilesystemAdapter.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Adapter/FilesystemAdapter.php
@@ -11,8 +11,6 @@
 
 namespace Symfony\Component\Cache\Adapter;
 
-use Symfony\Component\Cache\Marshaller\DefaultMarshaller;
-use Symfony\Component\Cache\Marshaller\MarshallerInterface;
 use Symfony\Component\Cache\PruneableInterface;
 use Symfony\Component\Cache\Traits\FilesystemTrait;
 
@@ -20,9 +18,13 @@ class FilesystemAdapter extends AbstractAdapter implements PruneableInterface
 {
     use FilesystemTrait;
 
-    public function __construct(string $namespace = '', int $defaultLifetime = 0, string $directory = null, MarshallerInterface $marshaller = null)
+    /**
+     * @param string      $namespace
+     * @param int         $defaultLifetime
+     * @param string|null $directory
+     */
+    public function __construct($namespace = '', $defaultLifetime = 0, $directory = null)
     {
-        $this->marshaller = $marshaller ?? new DefaultMarshaller();
         parent::__construct('', $defaultLifetime);
         $this->init($namespace, $directory);
     }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Adapter/FilesystemTagAwareAdapter.php b/advancedcontentfilter/vendor/symfony/cache/Adapter/FilesystemTagAwareAdapter.php
deleted file mode 100644
index 6dccbf08..00000000
--- a/advancedcontentfilter/vendor/symfony/cache/Adapter/FilesystemTagAwareAdapter.php
+++ /dev/null
@@ -1,239 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Cache\Adapter;
-
-use Symfony\Component\Cache\Marshaller\MarshallerInterface;
-use Symfony\Component\Cache\Marshaller\TagAwareMarshaller;
-use Symfony\Component\Cache\PruneableInterface;
-use Symfony\Component\Cache\Traits\FilesystemTrait;
-
-/**
- * Stores tag id <> cache id relationship as a symlink, and lookup on invalidation calls.
- *
- * @author Nicolas Grekas <p@tchwork.com>
- * @author André Rømcke <andre.romcke+symfony@gmail.com>
- */
-class FilesystemTagAwareAdapter extends AbstractTagAwareAdapter implements PruneableInterface
-{
-    use FilesystemTrait {
-        doClear as private doClearCache;
-        doSave as private doSaveCache;
-    }
-
-    /**
-     * Folder used for tag symlinks.
-     */
-    private const TAG_FOLDER = 'tags';
-
-    public function __construct(string $namespace = '', int $defaultLifetime = 0, string $directory = null, MarshallerInterface $marshaller = null)
-    {
-        $this->marshaller = new TagAwareMarshaller($marshaller);
-        parent::__construct('', $defaultLifetime);
-        $this->init($namespace, $directory);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doClear($namespace)
-    {
-        $ok = $this->doClearCache($namespace);
-
-        if ('' !== $namespace) {
-            return $ok;
-        }
-
-        set_error_handler(static function () {});
-        $chars = '+-ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
-
-        try {
-            foreach ($this->scanHashDir($this->directory.self::TAG_FOLDER.\DIRECTORY_SEPARATOR) as $dir) {
-                if (rename($dir, $renamed = substr_replace($dir, bin2hex(random_bytes(4)), -8))) {
-                    $dir = $renamed.\DIRECTORY_SEPARATOR;
-                } else {
-                    $dir .= \DIRECTORY_SEPARATOR;
-                    $renamed = null;
-                }
-
-                for ($i = 0; $i < 38; ++$i) {
-                    if (!file_exists($dir.$chars[$i])) {
-                        continue;
-                    }
-                    for ($j = 0; $j < 38; ++$j) {
-                        if (!file_exists($d = $dir.$chars[$i].\DIRECTORY_SEPARATOR.$chars[$j])) {
-                            continue;
-                        }
-                        foreach (scandir($d, \SCANDIR_SORT_NONE) ?: [] as $link) {
-                            if ('.' !== $link && '..' !== $link && (null !== $renamed || !realpath($d.\DIRECTORY_SEPARATOR.$link))) {
-                                unlink($d.\DIRECTORY_SEPARATOR.$link);
-                            }
-                        }
-                        null === $renamed ?: rmdir($d);
-                    }
-                    null === $renamed ?: rmdir($dir.$chars[$i]);
-                }
-                null === $renamed ?: rmdir($renamed);
-            }
-        } finally {
-            restore_error_handler();
-        }
-
-        return $ok;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doSave(array $values, int $lifetime, array $addTagData = [], array $removeTagData = []): array
-    {
-        $failed = $this->doSaveCache($values, $lifetime);
-
-        // Add Tags as symlinks
-        foreach ($addTagData as $tagId => $ids) {
-            $tagFolder = $this->getTagFolder($tagId);
-            foreach ($ids as $id) {
-                if ($failed && \in_array($id, $failed, true)) {
-                    continue;
-                }
-
-                $file = $this->getFile($id);
-
-                if (!@symlink($file, $tagLink = $this->getFile($id, true, $tagFolder)) && !is_link($tagLink)) {
-                    @unlink($file);
-                    $failed[] = $id;
-                }
-            }
-        }
-
-        // Unlink removed Tags
-        foreach ($removeTagData as $tagId => $ids) {
-            $tagFolder = $this->getTagFolder($tagId);
-            foreach ($ids as $id) {
-                if ($failed && \in_array($id, $failed, true)) {
-                    continue;
-                }
-
-                @unlink($this->getFile($id, false, $tagFolder));
-            }
-        }
-
-        return $failed;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doDeleteYieldTags(array $ids): iterable
-    {
-        foreach ($ids as $id) {
-            $file = $this->getFile($id);
-            if (!file_exists($file) || !$h = @fopen($file, 'r')) {
-                continue;
-            }
-
-            if ((\PHP_VERSION_ID >= 70300 || '\\' !== \DIRECTORY_SEPARATOR) && !@unlink($file)) {
-                fclose($h);
-                continue;
-            }
-
-            $meta = explode("\n", fread($h, 4096), 3)[2] ?? '';
-
-            // detect the compact format used in marshall() using magic numbers in the form 9D-..-..-..-..-00-..-..-..-5F
-            if (13 < \strlen($meta) && "\x9D" === $meta[0] && "\0" === $meta[5] && "\x5F" === $meta[9]) {
-                $meta[9] = "\0";
-                $tagLen = unpack('Nlen', $meta, 9)['len'];
-                $meta = substr($meta, 13, $tagLen);
-
-                if (0 < $tagLen -= \strlen($meta)) {
-                    $meta .= fread($h, $tagLen);
-                }
-
-                try {
-                    yield $id => '' === $meta ? [] : $this->marshaller->unmarshall($meta);
-                } catch (\Exception $e) {
-                    yield $id => [];
-                }
-            }
-
-            fclose($h);
-
-            if (\PHP_VERSION_ID < 70300 && '\\' === \DIRECTORY_SEPARATOR) {
-                @unlink($file);
-            }
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doDeleteTagRelations(array $tagData): bool
-    {
-        foreach ($tagData as $tagId => $idList) {
-            $tagFolder = $this->getTagFolder($tagId);
-            foreach ($idList as $id) {
-                @unlink($this->getFile($id, false, $tagFolder));
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doInvalidate(array $tagIds): bool
-    {
-        foreach ($tagIds as $tagId) {
-            if (!file_exists($tagFolder = $this->getTagFolder($tagId))) {
-                continue;
-            }
-
-            set_error_handler(static function () {});
-
-            try {
-                if (rename($tagFolder, $renamed = substr_replace($tagFolder, bin2hex(random_bytes(4)), -9))) {
-                    $tagFolder = $renamed.\DIRECTORY_SEPARATOR;
-                } else {
-                    $renamed = null;
-                }
-
-                foreach ($this->scanHashDir($tagFolder) as $itemLink) {
-                    unlink(realpath($itemLink) ?: $itemLink);
-                    unlink($itemLink);
-                }
-
-                if (null === $renamed) {
-                    continue;
-                }
-
-                $chars = '+-ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
-
-                for ($i = 0; $i < 38; ++$i) {
-                    for ($j = 0; $j < 38; ++$j) {
-                        rmdir($tagFolder.$chars[$i].\DIRECTORY_SEPARATOR.$chars[$j]);
-                    }
-                    rmdir($tagFolder.$chars[$i]);
-                }
-                rmdir($renamed);
-            } finally {
-                restore_error_handler();
-            }
-        }
-
-        return true;
-    }
-
-    private function getTagFolder(string $tagId): string
-    {
-        return $this->getFile($tagId, false, $this->directory.self::TAG_FOLDER.\DIRECTORY_SEPARATOR).\DIRECTORY_SEPARATOR;
-    }
-}
diff --git a/advancedcontentfilter/vendor/symfony/cache/Adapter/MemcachedAdapter.php b/advancedcontentfilter/vendor/symfony/cache/Adapter/MemcachedAdapter.php
index b678bb5d..5637141a 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Adapter/MemcachedAdapter.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Adapter/MemcachedAdapter.php
@@ -11,7 +11,6 @@
 
 namespace Symfony\Component\Cache\Adapter;
 
-use Symfony\Component\Cache\Marshaller\MarshallerInterface;
 use Symfony\Component\Cache\Traits\MemcachedTrait;
 
 class MemcachedAdapter extends AbstractAdapter
@@ -30,8 +29,8 @@ class MemcachedAdapter extends AbstractAdapter
      *
      * Using a MemcachedAdapter as a pure items store is fine.
      */
-    public function __construct(\Memcached $client, string $namespace = '', int $defaultLifetime = 0, MarshallerInterface $marshaller = null)
+    public function __construct(\Memcached $client, $namespace = '', $defaultLifetime = 0)
     {
-        $this->init($client, $namespace, $defaultLifetime, $marshaller);
+        $this->init($client, $namespace, $defaultLifetime);
     }
 }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Adapter/NullAdapter.php b/advancedcontentfilter/vendor/symfony/cache/Adapter/NullAdapter.php
index 3c2979bd..f58f81e5 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Adapter/NullAdapter.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Adapter/NullAdapter.php
@@ -13,12 +13,11 @@ namespace Symfony\Component\Cache\Adapter;
 
 use Psr\Cache\CacheItemInterface;
 use Symfony\Component\Cache\CacheItem;
-use Symfony\Contracts\Cache\CacheInterface;
 
 /**
  * @author Titouan Galopin <galopintitouan@gmail.com>
  */
-class NullAdapter implements AdapterInterface, CacheInterface
+class NullAdapter implements AdapterInterface
 {
     private $createCacheItem;
 
@@ -37,16 +36,6 @@ class NullAdapter implements AdapterInterface, CacheInterface
         );
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function get(string $key, callable $callback, float $beta = null, array &$metadata = null)
-    {
-        $save = true;
-
-        return $callback(($this->createCacheItem)($key), $save);
-    }
-
     /**
      * {@inheritdoc}
      */
@@ -60,15 +49,13 @@ class NullAdapter implements AdapterInterface, CacheInterface
     /**
      * {@inheritdoc}
      */
-    public function getItems(array $keys = [])
+    public function getItems(array $keys = array())
     {
         return $this->generateItems($keys);
     }
 
     /**
      * {@inheritdoc}
-     *
-     * @return bool
      */
     public function hasItem($key)
     {
@@ -77,20 +64,14 @@ class NullAdapter implements AdapterInterface, CacheInterface
 
     /**
      * {@inheritdoc}
-     *
-     * @param string $prefix
-     *
-     * @return bool
      */
-    public function clear(/* string $prefix = '' */)
+    public function clear()
     {
         return true;
     }
 
     /**
      * {@inheritdoc}
-     *
-     * @return bool
      */
     public function deleteItem($key)
     {
@@ -99,8 +80,6 @@ class NullAdapter implements AdapterInterface, CacheInterface
 
     /**
      * {@inheritdoc}
-     *
-     * @return bool
      */
     public function deleteItems(array $keys)
     {
@@ -109,40 +88,26 @@ class NullAdapter implements AdapterInterface, CacheInterface
 
     /**
      * {@inheritdoc}
-     *
-     * @return bool
      */
     public function save(CacheItemInterface $item)
     {
-        return true;
+        return false;
     }
 
     /**
      * {@inheritdoc}
-     *
-     * @return bool
      */
     public function saveDeferred(CacheItemInterface $item)
     {
-        return true;
+        return false;
     }
 
     /**
      * {@inheritdoc}
-     *
-     * @return bool
      */
     public function commit()
     {
-        return true;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function delete(string $key): bool
-    {
-        return $this->deleteItem($key);
+        return false;
     }
 
     private function generateItems(array $keys)
diff --git a/advancedcontentfilter/vendor/symfony/cache/Adapter/PdoAdapter.php b/advancedcontentfilter/vendor/symfony/cache/Adapter/PdoAdapter.php
index d118736a..c3fc45b6 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Adapter/PdoAdapter.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Adapter/PdoAdapter.php
@@ -13,7 +13,6 @@ namespace Symfony\Component\Cache\Adapter;
 
 use Doctrine\DBAL\Connection;
 use Symfony\Component\Cache\Exception\InvalidArgumentException;
-use Symfony\Component\Cache\Marshaller\MarshallerInterface;
 use Symfony\Component\Cache\PruneableInterface;
 use Symfony\Component\Cache\Traits\PdoTrait;
 
@@ -28,9 +27,6 @@ class PdoAdapter extends AbstractAdapter implements PruneableInterface
      * a Doctrine DBAL Connection or a DSN string that will be used to
      * lazy-connect to the database when the cache is actually used.
      *
-     * When a Doctrine DBAL Connection is passed, the cache table is created
-     * automatically when possible. Otherwise, use the createTable() method.
-     *
      * List of available options:
      *  * db_table: The name of the table [default: cache_items]
      *  * db_id_col: The column where to store the cache id [default: item_id]
@@ -39,16 +35,19 @@ class PdoAdapter extends AbstractAdapter implements PruneableInterface
      *  * db_time_col: The column where to store the timestamp [default: item_time]
      *  * db_username: The username when lazy-connect [default: '']
      *  * db_password: The password when lazy-connect [default: '']
-     *  * db_connection_options: An array of driver-specific connection options [default: []]
+     *  * db_connection_options: An array of driver-specific connection options [default: array()]
      *
-     * @param \PDO|Connection|string $connOrDsn a \PDO or Connection instance or DSN string or null
+     * @param \PDO|Connection|string $connOrDsn       A \PDO or Connection instance or DSN string or null
+     * @param string                 $namespace
+     * @param int                    $defaultLifetime
+     * @param array                  $options         An associative array of options
      *
      * @throws InvalidArgumentException When first argument is not PDO nor Connection nor string
      * @throws InvalidArgumentException When PDO error mode is not PDO::ERRMODE_EXCEPTION
      * @throws InvalidArgumentException When namespace contains invalid characters
      */
-    public function __construct($connOrDsn, string $namespace = '', int $defaultLifetime = 0, array $options = [], MarshallerInterface $marshaller = null)
+    public function __construct($connOrDsn, $namespace = '', $defaultLifetime = 0, array $options = array())
     {
-        $this->init($connOrDsn, $namespace, $defaultLifetime, $options, $marshaller);
+        $this->init($connOrDsn, $namespace, $defaultLifetime, $options);
     }
 }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Adapter/PhpArrayAdapter.php b/advancedcontentfilter/vendor/symfony/cache/Adapter/PhpArrayAdapter.php
index bdce6e1a..d3b9d77d 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Adapter/PhpArrayAdapter.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Adapter/PhpArrayAdapter.php
@@ -17,9 +17,7 @@ use Symfony\Component\Cache\CacheItem;
 use Symfony\Component\Cache\Exception\InvalidArgumentException;
 use Symfony\Component\Cache\PruneableInterface;
 use Symfony\Component\Cache\ResettableInterface;
-use Symfony\Component\Cache\Traits\ContractsTrait;
 use Symfony\Component\Cache\Traits\PhpArrayTrait;
-use Symfony\Contracts\Cache\CacheInterface;
 
 /**
  * Caches items at warm up time using a PHP array that is stored in shared memory by OPCache since PHP 7.0.
@@ -28,9 +26,8 @@ use Symfony\Contracts\Cache\CacheInterface;
  * @author Titouan Galopin <galopintitouan@gmail.com>
  * @author Nicolas Grekas <p@tchwork.com>
  */
-class PhpArrayAdapter implements AdapterInterface, CacheInterface, PruneableInterface, ResettableInterface
+class PhpArrayAdapter implements AdapterInterface, PruneableInterface, ResettableInterface
 {
-    use ContractsTrait;
     use PhpArrayTrait;
 
     private $createCacheItem;
@@ -39,12 +36,13 @@ class PhpArrayAdapter implements AdapterInterface, CacheInterface, PruneableInte
      * @param string           $file         The PHP file were values are cached
      * @param AdapterInterface $fallbackPool A pool to fallback on when an item is not hit
      */
-    public function __construct(string $file, AdapterInterface $fallbackPool)
+    public function __construct($file, AdapterInterface $fallbackPool)
     {
         $this->file = $file;
         $this->pool = $fallbackPool;
+        $this->zendDetectUnicode = ini_get('zend.detect_unicode');
         $this->createCacheItem = \Closure::bind(
-            static function ($key, $value, $isHit) {
+            function ($key, $value, $isHit) {
                 $item = new CacheItem();
                 $item->key = $key;
                 $item->value = $value;
@@ -58,53 +56,27 @@ class PhpArrayAdapter implements AdapterInterface, CacheInterface, PruneableInte
     }
 
     /**
-     * This adapter takes advantage of how PHP stores arrays in its latest versions.
+     * This adapter should only be used on PHP 7.0+ to take advantage of how PHP
+     * stores arrays in its latest versions. This factory method decorates the given
+     * fallback pool with this adapter only if the current PHP version is supported.
      *
      * @param string                 $file         The PHP file were values are cached
-     * @param CacheItemPoolInterface $fallbackPool A pool to fallback on when an item is not hit
+     * @param CacheItemPoolInterface $fallbackPool Fallback for old PHP versions or opcache disabled
      *
      * @return CacheItemPoolInterface
      */
     public static function create($file, CacheItemPoolInterface $fallbackPool)
     {
-        if (!$fallbackPool instanceof AdapterInterface) {
-            $fallbackPool = new ProxyAdapter($fallbackPool);
-        }
-
-        return new static($file, $fallbackPool);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function get(string $key, callable $callback, float $beta = null, array &$metadata = null)
-    {
-        if (null === $this->values) {
-            $this->initialize();
-        }
-        if (!isset($this->keys[$key])) {
-            get_from_pool:
-            if ($this->pool instanceof CacheInterface) {
-                return $this->pool->get($key, $callback, $beta, $metadata);
+        // Shared memory is available in PHP 7.0+ with OPCache enabled and in HHVM
+        if ((\PHP_VERSION_ID >= 70000 && ini_get('opcache.enable')) || defined('HHVM_VERSION')) {
+            if (!$fallbackPool instanceof AdapterInterface) {
+                $fallbackPool = new ProxyAdapter($fallbackPool);
             }
 
-            return $this->doGet($this->pool, $key, $callback, $beta, $metadata);
-        }
-        $value = $this->values[$this->keys[$key]];
-
-        if ('N;' === $value) {
-            return null;
-        }
-        try {
-            if ($value instanceof \Closure) {
-                return $value();
-            }
-        } catch (\Throwable $e) {
-            unset($this->keys[$key]);
-            goto get_from_pool;
+            return new static($file, $fallbackPool);
         }
 
-        return $value;
+        return $fallbackPool;
     }
 
     /**
@@ -112,25 +84,29 @@ class PhpArrayAdapter implements AdapterInterface, CacheInterface, PruneableInte
      */
     public function getItem($key)
     {
-        if (!\is_string($key)) {
-            throw new InvalidArgumentException(sprintf('Cache key must be string, "%s" given.', \is_object($key) ? \get_class($key) : \gettype($key)));
+        if (!is_string($key)) {
+            throw new InvalidArgumentException(sprintf('Cache key must be string, "%s" given.', is_object($key) ? get_class($key) : gettype($key)));
         }
         if (null === $this->values) {
             $this->initialize();
         }
-        if (!isset($this->keys[$key])) {
+        if (!isset($this->values[$key])) {
             return $this->pool->getItem($key);
         }
 
-        $value = $this->values[$this->keys[$key]];
+        $value = $this->values[$key];
         $isHit = true;
 
         if ('N;' === $value) {
             $value = null;
-        } elseif ($value instanceof \Closure) {
+        } elseif (is_string($value) && isset($value[2]) && ':' === $value[1]) {
             try {
-                $value = $value();
-            } catch (\Throwable $e) {
+                $e = null;
+                $value = unserialize($value);
+            } catch (\Error $e) {
+            } catch (\Exception $e) {
+            }
+            if (null !== $e) {
                 $value = null;
                 $isHit = false;
             }
@@ -144,11 +120,11 @@ class PhpArrayAdapter implements AdapterInterface, CacheInterface, PruneableInte
     /**
      * {@inheritdoc}
      */
-    public function getItems(array $keys = [])
+    public function getItems(array $keys = array())
     {
         foreach ($keys as $key) {
-            if (!\is_string($key)) {
-                throw new InvalidArgumentException(sprintf('Cache key must be string, "%s" given.', \is_object($key) ? \get_class($key) : \gettype($key)));
+            if (!is_string($key)) {
+                throw new InvalidArgumentException(sprintf('Cache key must be string, "%s" given.', is_object($key) ? get_class($key) : gettype($key)));
             }
         }
         if (null === $this->values) {
@@ -160,54 +136,48 @@ class PhpArrayAdapter implements AdapterInterface, CacheInterface, PruneableInte
 
     /**
      * {@inheritdoc}
-     *
-     * @return bool
      */
     public function hasItem($key)
     {
-        if (!\is_string($key)) {
-            throw new InvalidArgumentException(sprintf('Cache key must be string, "%s" given.', \is_object($key) ? \get_class($key) : \gettype($key)));
+        if (!is_string($key)) {
+            throw new InvalidArgumentException(sprintf('Cache key must be string, "%s" given.', is_object($key) ? get_class($key) : gettype($key)));
         }
         if (null === $this->values) {
             $this->initialize();
         }
 
-        return isset($this->keys[$key]) || $this->pool->hasItem($key);
+        return isset($this->values[$key]) || $this->pool->hasItem($key);
     }
 
     /**
      * {@inheritdoc}
-     *
-     * @return bool
      */
     public function deleteItem($key)
     {
-        if (!\is_string($key)) {
-            throw new InvalidArgumentException(sprintf('Cache key must be string, "%s" given.', \is_object($key) ? \get_class($key) : \gettype($key)));
+        if (!is_string($key)) {
+            throw new InvalidArgumentException(sprintf('Cache key must be string, "%s" given.', is_object($key) ? get_class($key) : gettype($key)));
         }
         if (null === $this->values) {
             $this->initialize();
         }
 
-        return !isset($this->keys[$key]) && $this->pool->deleteItem($key);
+        return !isset($this->values[$key]) && $this->pool->deleteItem($key);
     }
 
     /**
      * {@inheritdoc}
-     *
-     * @return bool
      */
     public function deleteItems(array $keys)
     {
         $deleted = true;
-        $fallbackKeys = [];
+        $fallbackKeys = array();
 
         foreach ($keys as $key) {
-            if (!\is_string($key)) {
-                throw new InvalidArgumentException(sprintf('Cache key must be string, "%s" given.', \is_object($key) ? \get_class($key) : \gettype($key)));
+            if (!is_string($key)) {
+                throw new InvalidArgumentException(sprintf('Cache key must be string, "%s" given.', is_object($key) ? get_class($key) : gettype($key)));
             }
 
-            if (isset($this->keys[$key])) {
+            if (isset($this->values[$key])) {
                 $deleted = false;
             } else {
                 $fallbackKeys[] = $key;
@@ -226,8 +196,6 @@ class PhpArrayAdapter implements AdapterInterface, CacheInterface, PruneableInte
 
     /**
      * {@inheritdoc}
-     *
-     * @return bool
      */
     public function save(CacheItemInterface $item)
     {
@@ -235,13 +203,11 @@ class PhpArrayAdapter implements AdapterInterface, CacheInterface, PruneableInte
             $this->initialize();
         }
 
-        return !isset($this->keys[$item->getKey()]) && $this->pool->save($item);
+        return !isset($this->values[$item->getKey()]) && $this->pool->save($item);
     }
 
     /**
      * {@inheritdoc}
-     *
-     * @return bool
      */
     public function saveDeferred(CacheItemInterface $item)
     {
@@ -249,34 +215,37 @@ class PhpArrayAdapter implements AdapterInterface, CacheInterface, PruneableInte
             $this->initialize();
         }
 
-        return !isset($this->keys[$item->getKey()]) && $this->pool->saveDeferred($item);
+        return !isset($this->values[$item->getKey()]) && $this->pool->saveDeferred($item);
     }
 
     /**
      * {@inheritdoc}
-     *
-     * @return bool
      */
     public function commit()
     {
         return $this->pool->commit();
     }
 
-    private function generateItems(array $keys): \Generator
+    /**
+     * @return \Generator
+     */
+    private function generateItems(array $keys)
     {
         $f = $this->createCacheItem;
-        $fallbackKeys = [];
+        $fallbackKeys = array();
 
         foreach ($keys as $key) {
-            if (isset($this->keys[$key])) {
-                $value = $this->values[$this->keys[$key]];
+            if (isset($this->values[$key])) {
+                $value = $this->values[$key];
 
                 if ('N;' === $value) {
                     yield $key => $f($key, null, true);
-                } elseif ($value instanceof \Closure) {
+                } elseif (is_string($value) && isset($value[2]) && ':' === $value[1]) {
                     try {
-                        yield $key => $f($key, $value(), true);
-                    } catch (\Throwable $e) {
+                        yield $key => $f($key, unserialize($value), true);
+                    } catch (\Error $e) {
+                        yield $key => $f($key, null, false);
+                    } catch (\Exception $e) {
                         yield $key => $f($key, null, false);
                     }
                 } else {
@@ -288,34 +257,29 @@ class PhpArrayAdapter implements AdapterInterface, CacheInterface, PruneableInte
         }
 
         if ($fallbackKeys) {
-            yield from $this->pool->getItems($fallbackKeys);
+            foreach ($this->pool->getItems($fallbackKeys) as $key => $item) {
+                yield $key => $item;
+            }
         }
     }
 
     /**
      * @throws \ReflectionException When $class is not found and is required
      *
-     * @internal to be removed in Symfony 5.0
+     * @internal
      */
     public static function throwOnRequiredClass($class)
     {
         $e = new \ReflectionException("Class $class does not exist");
-        $trace = debug_backtrace();
-        $autoloadFrame = [
+        $trace = $e->getTrace();
+        $autoloadFrame = array(
             'function' => 'spl_autoload_call',
-            'args' => [$class],
-        ];
+            'args' => array($class),
+        );
+        $i = 1 + array_search($autoloadFrame, $trace, true);
 
-        if (\PHP_VERSION_ID >= 80000 && isset($trace[1])) {
-            $callerFrame = $trace[1];
-        } elseif (false !== $i = array_search($autoloadFrame, $trace, true)) {
-            $callerFrame = $trace[++$i];
-        } else {
-            throw $e;
-        }
-
-        if (isset($callerFrame['function']) && !isset($callerFrame['class'])) {
-            switch ($callerFrame['function']) {
+        if (isset($trace[$i]['function']) && !isset($trace[$i]['class'])) {
+            switch ($trace[$i]['function']) {
                 case 'get_class_methods':
                 case 'get_class_vars':
                 case 'get_parent_class':
diff --git a/advancedcontentfilter/vendor/symfony/cache/Adapter/PhpFilesAdapter.php b/advancedcontentfilter/vendor/symfony/cache/Adapter/PhpFilesAdapter.php
index 10938a0a..528d9c01 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Adapter/PhpFilesAdapter.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Adapter/PhpFilesAdapter.php
@@ -20,19 +20,22 @@ class PhpFilesAdapter extends AbstractAdapter implements PruneableInterface
     use PhpFilesTrait;
 
     /**
-     * @param $appendOnly Set to `true` to gain extra performance when the items stored in this pool never expire.
-     *                    Doing so is encouraged because it fits perfectly OPcache's memory model.
+     * @param string      $namespace
+     * @param int         $defaultLifetime
+     * @param string|null $directory
      *
      * @throws CacheException if OPcache is not enabled
      */
-    public function __construct(string $namespace = '', int $defaultLifetime = 0, string $directory = null, bool $appendOnly = false)
+    public function __construct($namespace = '', $defaultLifetime = 0, $directory = null)
     {
-        $this->appendOnly = $appendOnly;
-        self::$startTime = self::$startTime ?? $_SERVER['REQUEST_TIME'] ?? time();
+        if (!static::isSupported()) {
+            throw new CacheException('OPcache is not enabled');
+        }
         parent::__construct('', $defaultLifetime);
         $this->init($namespace, $directory);
-        $this->includeHandler = static function ($type, $msg, $file, $line) {
-            throw new \ErrorException($msg, 0, $type, $file, $line);
-        };
+
+        $e = new \Exception();
+        $this->includeHandler = function () use ($e) { throw $e; };
+        $this->zendDetectUnicode = ini_get('zend.detect_unicode');
     }
 }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Adapter/ProxyAdapter.php b/advancedcontentfilter/vendor/symfony/cache/Adapter/ProxyAdapter.php
index e006ea01..82c95c5b 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Adapter/ProxyAdapter.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Adapter/ProxyAdapter.php
@@ -16,57 +16,40 @@ use Psr\Cache\CacheItemPoolInterface;
 use Symfony\Component\Cache\CacheItem;
 use Symfony\Component\Cache\PruneableInterface;
 use Symfony\Component\Cache\ResettableInterface;
-use Symfony\Component\Cache\Traits\ContractsTrait;
 use Symfony\Component\Cache\Traits\ProxyTrait;
-use Symfony\Contracts\Cache\CacheInterface;
 
 /**
  * @author Nicolas Grekas <p@tchwork.com>
  */
-class ProxyAdapter implements AdapterInterface, CacheInterface, PruneableInterface, ResettableInterface
+class ProxyAdapter implements AdapterInterface, PruneableInterface, ResettableInterface
 {
-    use ContractsTrait;
     use ProxyTrait;
 
     private $namespace;
     private $namespaceLen;
     private $createCacheItem;
-    private $setInnerItem;
     private $poolHash;
-    private $defaultLifetime;
 
-    public function __construct(CacheItemPoolInterface $pool, string $namespace = '', int $defaultLifetime = 0)
+    /**
+     * @param CacheItemPoolInterface $pool
+     * @param string                 $namespace
+     * @param int                    $defaultLifetime
+     */
+    public function __construct(CacheItemPoolInterface $pool, $namespace = '', $defaultLifetime = 0)
     {
         $this->pool = $pool;
         $this->poolHash = $poolHash = spl_object_hash($pool);
         $this->namespace = '' === $namespace ? '' : CacheItem::validateKey($namespace);
-        $this->namespaceLen = \strlen($namespace);
-        $this->defaultLifetime = $defaultLifetime;
+        $this->namespaceLen = strlen($namespace);
         $this->createCacheItem = \Closure::bind(
-            static function ($key, $innerItem) use ($poolHash) {
+            function ($key, $innerItem) use ($defaultLifetime, $poolHash) {
                 $item = new CacheItem();
                 $item->key = $key;
-
-                if (null === $innerItem) {
-                    return $item;
-                }
-
-                $item->value = $v = $innerItem->get();
+                $item->value = $innerItem->get();
                 $item->isHit = $innerItem->isHit();
+                $item->defaultLifetime = $defaultLifetime;
                 $item->innerItem = $innerItem;
                 $item->poolHash = $poolHash;
-
-                // Detect wrapped values that encode for their expiry and creation duration
-                // For compactness, these values are packed in the key of an array using
-                // magic numbers in the form 9D-..-..-..-..-00-..-..-..-5F
-                if (\is_array($v) && 1 === \count($v) && 10 === \strlen($k = (string) array_key_first($v)) && "\x9D" === $k[0] && "\0" === $k[5] && "\x5F" === $k[9]) {
-                    $item->value = $v[$k];
-                    $v = unpack('Ve/Nc', substr($k, 1, -1));
-                    $item->metadata[CacheItem::METADATA_EXPIRY] = $v['e'] + CacheItem::METADATA_EXPIRY_OFFSET;
-                    $item->metadata[CacheItem::METADATA_CTIME] = $v['c'];
-                } elseif ($innerItem instanceof CacheItem) {
-                    $item->metadata = $innerItem->metadata;
-                }
                 $innerItem->set(null);
 
                 return $item;
@@ -74,43 +57,6 @@ class ProxyAdapter implements AdapterInterface, CacheInterface, PruneableInterfa
             null,
             CacheItem::class
         );
-        $this->setInnerItem = \Closure::bind(
-            /**
-             * @param array $item A CacheItem cast to (array); accessing protected properties requires adding the "\0*\0" PHP prefix
-             */
-            static function (CacheItemInterface $innerItem, array $item) {
-                // Tags are stored separately, no need to account for them when considering this item's newly set metadata
-                if (isset(($metadata = $item["\0*\0newMetadata"])[CacheItem::METADATA_TAGS])) {
-                    unset($metadata[CacheItem::METADATA_TAGS]);
-                }
-                if ($metadata) {
-                    // For compactness, expiry and creation duration are packed in the key of an array, using magic numbers as separators
-                    $item["\0*\0value"] = ["\x9D".pack('VN', (int) (0.1 + $metadata[self::METADATA_EXPIRY] - self::METADATA_EXPIRY_OFFSET), $metadata[self::METADATA_CTIME])."\x5F" => $item["\0*\0value"]];
-                }
-                $innerItem->set($item["\0*\0value"]);
-                $innerItem->expiresAt(null !== $item["\0*\0expiry"] ? \DateTime::createFromFormat('U.u', sprintf('%.6F', $item["\0*\0expiry"])) : null);
-            },
-            null,
-            CacheItem::class
-        );
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function get(string $key, callable $callback, float $beta = null, array &$metadata = null)
-    {
-        if (!$this->pool instanceof CacheInterface) {
-            return $this->doGet($this, $key, $callback, $beta, $metadata);
-        }
-
-        return $this->pool->get($this->getId($key), function ($innerItem, bool &$save) use ($key, $callback) {
-            $item = ($this->createCacheItem)($key, $innerItem);
-            $item->set($value = $callback($item, $save));
-            ($this->setInnerItem)($innerItem, (array) $item);
-
-            return $value;
-        }, $beta, $metadata);
     }
 
     /**
@@ -127,7 +73,7 @@ class ProxyAdapter implements AdapterInterface, CacheInterface, PruneableInterfa
     /**
      * {@inheritdoc}
      */
-    public function getItems(array $keys = [])
+    public function getItems(array $keys = array())
     {
         if ($this->namespaceLen) {
             foreach ($keys as $i => $key) {
@@ -140,8 +86,6 @@ class ProxyAdapter implements AdapterInterface, CacheInterface, PruneableInterfa
 
     /**
      * {@inheritdoc}
-     *
-     * @return bool
      */
     public function hasItem($key)
     {
@@ -150,26 +94,14 @@ class ProxyAdapter implements AdapterInterface, CacheInterface, PruneableInterfa
 
     /**
      * {@inheritdoc}
-     *
-     * @param string $prefix
-     *
-     * @return bool
      */
-    public function clear(/* string $prefix = '' */)
+    public function clear()
     {
-        $prefix = 0 < \func_num_args() ? (string) func_get_arg(0) : '';
-
-        if ($this->pool instanceof AdapterInterface) {
-            return $this->pool->clear($this->namespace.$prefix);
-        }
-
         return $this->pool->clear();
     }
 
     /**
      * {@inheritdoc}
-     *
-     * @return bool
      */
     public function deleteItem($key)
     {
@@ -178,8 +110,6 @@ class ProxyAdapter implements AdapterInterface, CacheInterface, PruneableInterfa
 
     /**
      * {@inheritdoc}
-     *
-     * @return bool
      */
     public function deleteItems(array $keys)
     {
@@ -194,8 +124,6 @@ class ProxyAdapter implements AdapterInterface, CacheInterface, PruneableInterfa
 
     /**
      * {@inheritdoc}
-     *
-     * @return bool
      */
     public function save(CacheItemInterface $item)
     {
@@ -204,8 +132,6 @@ class ProxyAdapter implements AdapterInterface, CacheInterface, PruneableInterfa
 
     /**
      * {@inheritdoc}
-     *
-     * @return bool
      */
     public function saveDeferred(CacheItemInterface $item)
     {
@@ -214,41 +140,30 @@ class ProxyAdapter implements AdapterInterface, CacheInterface, PruneableInterfa
 
     /**
      * {@inheritdoc}
-     *
-     * @return bool
      */
     public function commit()
     {
         return $this->pool->commit();
     }
 
-    private function doSave(CacheItemInterface $item, string $method)
+    private function doSave(CacheItemInterface $item, $method)
     {
         if (!$item instanceof CacheItem) {
             return false;
         }
         $item = (array) $item;
-        if (null === $item["\0*\0expiry"] && 0 < $this->defaultLifetime) {
-            $item["\0*\0expiry"] = microtime(true) + $this->defaultLifetime;
+        $expiry = $item["\0*\0expiry"];
+        if (null === $expiry && 0 < $item["\0*\0defaultLifetime"]) {
+            $expiry = time() + $item["\0*\0defaultLifetime"];
         }
-
-        if ($item["\0*\0poolHash"] === $this->poolHash && $item["\0*\0innerItem"]) {
-            $innerItem = $item["\0*\0innerItem"];
-        } elseif ($this->pool instanceof AdapterInterface) {
-            // this is an optimization specific for AdapterInterface implementations
-            // so we can save a round-trip to the backend by just creating a new item
-            $f = $this->createCacheItem;
-            $innerItem = $f($this->namespace.$item["\0*\0key"], null);
-        } else {
-            $innerItem = $this->pool->getItem($this->namespace.$item["\0*\0key"]);
-        }
-
-        ($this->setInnerItem)($innerItem, $item);
+        $innerItem = $item["\0*\0poolHash"] === $this->poolHash ? $item["\0*\0innerItem"] : $this->pool->getItem($this->namespace.$item["\0*\0key"]);
+        $innerItem->set($item["\0*\0value"]);
+        $innerItem->expiresAt(null !== $expiry ? \DateTime::createFromFormat('U', $expiry) : null);
 
         return $this->pool->$method($innerItem);
     }
 
-    private function generateItems(iterable $items)
+    private function generateItems($items)
     {
         $f = $this->createCacheItem;
 
@@ -261,7 +176,7 @@ class ProxyAdapter implements AdapterInterface, CacheInterface, PruneableInterfa
         }
     }
 
-    private function getId($key): string
+    private function getId($key)
     {
         CacheItem::validateKey($key);
 
diff --git a/advancedcontentfilter/vendor/symfony/cache/Adapter/Psr16Adapter.php b/advancedcontentfilter/vendor/symfony/cache/Adapter/Psr16Adapter.php
deleted file mode 100644
index e959d784..00000000
--- a/advancedcontentfilter/vendor/symfony/cache/Adapter/Psr16Adapter.php
+++ /dev/null
@@ -1,86 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Cache\Adapter;
-
-use Psr\SimpleCache\CacheInterface;
-use Symfony\Component\Cache\PruneableInterface;
-use Symfony\Component\Cache\ResettableInterface;
-use Symfony\Component\Cache\Traits\ProxyTrait;
-
-/**
- * Turns a PSR-16 cache into a PSR-6 one.
- *
- * @author Nicolas Grekas <p@tchwork.com>
- */
-class Psr16Adapter extends AbstractAdapter implements PruneableInterface, ResettableInterface
-{
-    use ProxyTrait;
-
-    /**
-     * @internal
-     */
-    protected const NS_SEPARATOR = '_';
-
-    private $miss;
-
-    public function __construct(CacheInterface $pool, string $namespace = '', int $defaultLifetime = 0)
-    {
-        parent::__construct($namespace, $defaultLifetime);
-
-        $this->pool = $pool;
-        $this->miss = new \stdClass();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doFetch(array $ids)
-    {
-        foreach ($this->pool->getMultiple($ids, $this->miss) as $key => $value) {
-            if ($this->miss !== $value) {
-                yield $key => $value;
-            }
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doHave($id)
-    {
-        return $this->pool->has($id);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doClear($namespace)
-    {
-        return $this->pool->clear();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doDelete(array $ids)
-    {
-        return $this->pool->deleteMultiple($ids);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doSave(array $values, int $lifetime)
-    {
-        return $this->pool->setMultiple($values, 0 === $lifetime ? null : $lifetime);
-    }
-}
diff --git a/advancedcontentfilter/vendor/symfony/cache/Adapter/RedisAdapter.php b/advancedcontentfilter/vendor/symfony/cache/Adapter/RedisAdapter.php
index eb5950e5..c1e17997 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Adapter/RedisAdapter.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Adapter/RedisAdapter.php
@@ -11,9 +11,6 @@
 
 namespace Symfony\Component\Cache\Adapter;
 
-use Symfony\Component\Cache\Marshaller\MarshallerInterface;
-use Symfony\Component\Cache\Traits\RedisClusterProxy;
-use Symfony\Component\Cache\Traits\RedisProxy;
 use Symfony\Component\Cache\Traits\RedisTrait;
 
 class RedisAdapter extends AbstractAdapter
@@ -21,12 +18,12 @@ class RedisAdapter extends AbstractAdapter
     use RedisTrait;
 
     /**
-     * @param \Redis|\RedisArray|\RedisCluster|\Predis\ClientInterface|RedisProxy|RedisClusterProxy $redis           The redis client
-     * @param string                                                                                $namespace       The default namespace
-     * @param int                                                                                   $defaultLifetime The default lifetime
+     * @param \Redis|\RedisArray|\RedisCluster|\Predis\Client $redisClient     The redis client
+     * @param string                                          $namespace       The default namespace
+     * @param int                                             $defaultLifetime The default lifetime
      */
-    public function __construct($redis, string $namespace = '', int $defaultLifetime = 0, MarshallerInterface $marshaller = null)
+    public function __construct($redisClient, $namespace = '', $defaultLifetime = 0)
     {
-        $this->init($redis, $namespace, $defaultLifetime, $marshaller);
+        $this->init($redisClient, $namespace, $defaultLifetime);
     }
 }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Adapter/RedisTagAwareAdapter.php b/advancedcontentfilter/vendor/symfony/cache/Adapter/RedisTagAwareAdapter.php
deleted file mode 100644
index fd263da3..00000000
--- a/advancedcontentfilter/vendor/symfony/cache/Adapter/RedisTagAwareAdapter.php
+++ /dev/null
@@ -1,321 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Cache\Adapter;
-
-use Predis\Connection\Aggregate\ClusterInterface;
-use Predis\Connection\Aggregate\PredisCluster;
-use Predis\Connection\Aggregate\ReplicationInterface;
-use Predis\Response\ErrorInterface;
-use Predis\Response\Status;
-use Symfony\Component\Cache\CacheItem;
-use Symfony\Component\Cache\Exception\InvalidArgumentException;
-use Symfony\Component\Cache\Exception\LogicException;
-use Symfony\Component\Cache\Marshaller\DeflateMarshaller;
-use Symfony\Component\Cache\Marshaller\MarshallerInterface;
-use Symfony\Component\Cache\Marshaller\TagAwareMarshaller;
-use Symfony\Component\Cache\Traits\RedisClusterProxy;
-use Symfony\Component\Cache\Traits\RedisProxy;
-use Symfony\Component\Cache\Traits\RedisTrait;
-
-/**
- * Stores tag id <> cache id relationship as a Redis Set.
- *
- * Set (tag relation info) is stored without expiry (non-volatile), while cache always gets an expiry (volatile) even
- * if not set by caller. Thus if you configure redis with the right eviction policy you can be safe this tag <> cache
- * relationship survives eviction (cache cleanup when Redis runs out of memory).
- *
- * Redis server 2.8+ with any `volatile-*` eviction policy, OR `noeviction` if you're sure memory will NEVER fill up
- *
- * Design limitations:
- *  - Max 4 billion cache keys per cache tag as limited by Redis Set datatype.
- *    E.g. If you use a "all" items tag for expiry instead of clear(), that limits you to 4 billion cache items also.
- *
- * @see https://redis.io/topics/lru-cache#eviction-policies Documentation for Redis eviction policies.
- * @see https://redis.io/topics/data-types#sets Documentation for Redis Set datatype.
- *
- * @author Nicolas Grekas <p@tchwork.com>
- * @author André Rømcke <andre.romcke+symfony@gmail.com>
- */
-class RedisTagAwareAdapter extends AbstractTagAwareAdapter
-{
-    use RedisTrait;
-
-    /**
-     * On cache items without a lifetime set, we set it to 100 days. This is to make sure cache items are
-     * preferred to be evicted over tag Sets, if eviction policy is configured according to requirements.
-     */
-    private const DEFAULT_CACHE_TTL = 8640000;
-
-    /**
-     * @var string|null detected eviction policy used on Redis server
-     */
-    private $redisEvictionPolicy;
-    private $namespace;
-
-    /**
-     * @param \Redis|\RedisArray|\RedisCluster|\Predis\ClientInterface|RedisProxy|RedisClusterProxy $redis           The redis client
-     * @param string                                                                                $namespace       The default namespace
-     * @param int                                                                                   $defaultLifetime The default lifetime
-     */
-    public function __construct($redis, string $namespace = '', int $defaultLifetime = 0, MarshallerInterface $marshaller = null)
-    {
-        if ($redis instanceof \Predis\ClientInterface && $redis->getConnection() instanceof ClusterInterface && !$redis->getConnection() instanceof PredisCluster) {
-            throw new InvalidArgumentException(sprintf('Unsupported Predis cluster connection: only "%s" is, "%s" given.', PredisCluster::class, \get_class($redis->getConnection())));
-        }
-
-        if (\defined('Redis::OPT_COMPRESSION') && ($redis instanceof \Redis || $redis instanceof \RedisArray || $redis instanceof \RedisCluster)) {
-            $compression = $redis->getOption(\Redis::OPT_COMPRESSION);
-
-            foreach (\is_array($compression) ? $compression : [$compression] as $c) {
-                if (\Redis::COMPRESSION_NONE !== $c) {
-                    throw new InvalidArgumentException(sprintf('phpredis compression must be disabled when using "%s", use "%s" instead.', static::class, DeflateMarshaller::class));
-                }
-            }
-        }
-
-        $this->init($redis, $namespace, $defaultLifetime, new TagAwareMarshaller($marshaller));
-        $this->namespace = $namespace;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doSave(array $values, int $lifetime, array $addTagData = [], array $delTagData = []): array
-    {
-        $eviction = $this->getRedisEvictionPolicy();
-        if ('noeviction' !== $eviction && !str_starts_with($eviction, 'volatile-')) {
-            throw new LogicException(sprintf('Redis maxmemory-policy setting "%s" is *not* supported by RedisTagAwareAdapter, use "noeviction" or "volatile-*" eviction policies.', $eviction));
-        }
-
-        // serialize values
-        if (!$serialized = $this->marshaller->marshall($values, $failed)) {
-            return $failed;
-        }
-
-        // While pipeline isn't supported on RedisCluster, other setups will at least benefit from doing this in one op
-        $results = $this->pipeline(static function () use ($serialized, $lifetime, $addTagData, $delTagData, $failed) {
-            // Store cache items, force a ttl if none is set, as there is no MSETEX we need to set each one
-            foreach ($serialized as $id => $value) {
-                yield 'setEx' => [
-                    $id,
-                    0 >= $lifetime ? self::DEFAULT_CACHE_TTL : $lifetime,
-                    $value,
-                ];
-            }
-
-            // Add and Remove Tags
-            foreach ($addTagData as $tagId => $ids) {
-                if (!$failed || $ids = array_diff($ids, $failed)) {
-                    yield 'sAdd' => array_merge([$tagId], $ids);
-                }
-            }
-
-            foreach ($delTagData as $tagId => $ids) {
-                if (!$failed || $ids = array_diff($ids, $failed)) {
-                    yield 'sRem' => array_merge([$tagId], $ids);
-                }
-            }
-        });
-
-        foreach ($results as $id => $result) {
-            // Skip results of SADD/SREM operations, they'll be 1 or 0 depending on if set value already existed or not
-            if (is_numeric($result)) {
-                continue;
-            }
-            // setEx results
-            if (true !== $result && (!$result instanceof Status || Status::get('OK') !== $result)) {
-                $failed[] = $id;
-            }
-        }
-
-        return $failed;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doDeleteYieldTags(array $ids): iterable
-    {
-        $lua = <<<'EOLUA'
-            local v = redis.call('GET', KEYS[1])
-            redis.call('DEL', KEYS[1])
-
-            if not v or v:len() <= 13 or v:byte(1) ~= 0x9D or v:byte(6) ~= 0 or v:byte(10) ~= 0x5F then
-                return ''
-            end
-
-            return v:sub(14, 13 + v:byte(13) + v:byte(12) * 256 + v:byte(11) * 65536)
-EOLUA;
-
-        $results = $this->pipeline(function () use ($ids, $lua) {
-            foreach ($ids as $id) {
-                yield 'eval' => $this->redis instanceof \Predis\ClientInterface ? [$lua, 1, $id] : [$lua, [$id], 1];
-            }
-        });
-
-        foreach ($results as $id => $result) {
-            if ($result instanceof \RedisException || $result instanceof ErrorInterface) {
-                CacheItem::log($this->logger, 'Failed to delete key "{key}": '.$result->getMessage(), ['key' => substr($id, \strlen($this->namespace)), 'exception' => $result]);
-
-                continue;
-            }
-
-            try {
-                yield $id => !\is_string($result) || '' === $result ? [] : $this->marshaller->unmarshall($result);
-            } catch (\Exception $e) {
-                yield $id => [];
-            }
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doDeleteTagRelations(array $tagData): bool
-    {
-        $results = $this->pipeline(static function () use ($tagData) {
-            foreach ($tagData as $tagId => $idList) {
-                array_unshift($idList, $tagId);
-                yield 'sRem' => $idList;
-            }
-        });
-        foreach ($results as $result) {
-            // no-op
-        }
-
-        return true;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doInvalidate(array $tagIds): bool
-    {
-        // This script scans the set of items linked to tag: it empties the set
-        // and removes the linked items. When the set is still not empty after
-        // the scan, it means we're in cluster mode and that the linked items
-        // are on other nodes: we move the links to a temporary set and we
-        // garbage collect that set from the client side.
-
-        $lua = <<<'EOLUA'
-            redis.replicate_commands()
-
-            local cursor = '0'
-            local id = KEYS[1]
-            repeat
-                local result = redis.call('SSCAN', id, cursor, 'COUNT', 5000);
-                cursor = result[1];
-                local rems = {}
-
-                for _, v in ipairs(result[2]) do
-                    local ok, _ = pcall(redis.call, 'DEL', ARGV[1]..v)
-                    if ok then
-                        table.insert(rems, v)
-                    end
-                end
-                if 0 < #rems then
-                    redis.call('SREM', id, unpack(rems))
-                end
-            until '0' == cursor;
-
-            redis.call('SUNIONSTORE', '{'..id..'}'..id, id)
-            redis.call('DEL', id)
-
-            return redis.call('SSCAN', '{'..id..'}'..id, '0', 'COUNT', 5000)
-EOLUA;
-
-        $results = $this->pipeline(function () use ($tagIds, $lua) {
-            if ($this->redis instanceof \Predis\ClientInterface) {
-                $prefix = $this->redis->getOptions()->prefix ? $this->redis->getOptions()->prefix->getPrefix() : '';
-            } elseif (\is_array($prefix = $this->redis->getOption(\Redis::OPT_PREFIX) ?? '')) {
-                $prefix = current($prefix);
-            }
-
-            foreach ($tagIds as $id) {
-                yield 'eval' => $this->redis instanceof \Predis\ClientInterface ? [$lua, 1, $id, $prefix] : [$lua, [$id, $prefix], 1];
-            }
-        });
-
-        $lua = <<<'EOLUA'
-            redis.replicate_commands()
-
-            local id = KEYS[1]
-            local cursor = table.remove(ARGV)
-            redis.call('SREM', '{'..id..'}'..id, unpack(ARGV))
-
-            return redis.call('SSCAN', '{'..id..'}'..id, cursor, 'COUNT', 5000)
-EOLUA;
-
-        $success = true;
-        foreach ($results as $id => $values) {
-            if ($values instanceof \RedisException || $values instanceof ErrorInterface) {
-                CacheItem::log($this->logger, 'Failed to invalidate key "{key}": '.$values->getMessage(), ['key' => substr($id, \strlen($this->namespace)), 'exception' => $values]);
-                $success = false;
-
-                continue;
-            }
-
-            [$cursor, $ids] = $values;
-
-            while ($ids || '0' !== $cursor) {
-                $this->doDelete($ids);
-
-                $evalArgs = [$id, $cursor];
-                array_splice($evalArgs, 1, 0, $ids);
-
-                if ($this->redis instanceof \Predis\ClientInterface) {
-                    array_unshift($evalArgs, $lua, 1);
-                } else {
-                    $evalArgs = [$lua, $evalArgs, 1];
-                }
-
-                $results = $this->pipeline(function () use ($evalArgs) {
-                    yield 'eval' => $evalArgs;
-                });
-
-                foreach ($results as [$cursor, $ids]) {
-                    // no-op
-                }
-            }
-        }
-
-        return $success;
-    }
-
-    private function getRedisEvictionPolicy(): string
-    {
-        if (null !== $this->redisEvictionPolicy) {
-            return $this->redisEvictionPolicy;
-        }
-
-        $hosts = $this->getHosts();
-        $host = reset($hosts);
-        if ($host instanceof \Predis\Client && $host->getConnection() instanceof ReplicationInterface) {
-            // Predis supports info command only on the master in replication environments
-            $hosts = [$host->getClientFor('master')];
-        }
-
-        foreach ($hosts as $host) {
-            $info = $host->info('Memory');
-
-            if ($info instanceof ErrorInterface) {
-                continue;
-            }
-
-            $info = $info['Memory'] ?? $info;
-
-            return $this->redisEvictionPolicy = $info['maxmemory_policy'];
-        }
-
-        return $this->redisEvictionPolicy = '';
-    }
-}
diff --git a/advancedcontentfilter/vendor/symfony/cache/Adapter/SimpleCacheAdapter.php b/advancedcontentfilter/vendor/symfony/cache/Adapter/SimpleCacheAdapter.php
index 5f14a85b..24db5d50 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Adapter/SimpleCacheAdapter.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Adapter/SimpleCacheAdapter.php
@@ -11,11 +11,69 @@
 
 namespace Symfony\Component\Cache\Adapter;
 
-@trigger_error(sprintf('The "%s" class is @deprecated since Symfony 4.3, use "Psr16Adapter" instead.', SimpleCacheAdapter::class), \E_USER_DEPRECATED);
+use Psr\SimpleCache\CacheInterface;
+use Symfony\Component\Cache\PruneableInterface;
+use Symfony\Component\Cache\ResettableInterface;
+use Symfony\Component\Cache\Traits\ProxyTrait;
 
 /**
- * @deprecated since Symfony 4.3, use Psr16Adapter instead.
+ * @author Nicolas Grekas <p@tchwork.com>
  */
-class SimpleCacheAdapter extends Psr16Adapter
+class SimpleCacheAdapter extends AbstractAdapter implements PruneableInterface, ResettableInterface
 {
+    use ProxyTrait;
+
+    private $miss;
+
+    public function __construct(CacheInterface $pool, $namespace = '', $defaultLifetime = 0)
+    {
+        parent::__construct($namespace, $defaultLifetime);
+
+        $this->pool = $pool;
+        $this->miss = new \stdClass();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function doFetch(array $ids)
+    {
+        foreach ($this->pool->getMultiple($ids, $this->miss) as $key => $value) {
+            if ($this->miss !== $value) {
+                yield $key => $value;
+            }
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function doHave($id)
+    {
+        return $this->pool->has($id);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function doClear($namespace)
+    {
+        return $this->pool->clear();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function doDelete(array $ids)
+    {
+        return $this->pool->deleteMultiple($ids);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function doSave(array $values, $lifetime)
+    {
+        return $this->pool->setMultiple($values, 0 === $lifetime ? null : $lifetime);
+    }
 }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Adapter/TagAwareAdapter.php b/advancedcontentfilter/vendor/symfony/cache/Adapter/TagAwareAdapter.php
index 105d4a64..72bbc143 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Adapter/TagAwareAdapter.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Adapter/TagAwareAdapter.php
@@ -13,46 +13,39 @@ namespace Symfony\Component\Cache\Adapter;
 
 use Psr\Cache\CacheItemInterface;
 use Psr\Cache\InvalidArgumentException;
-use Psr\Log\LoggerAwareInterface;
-use Psr\Log\LoggerAwareTrait;
 use Symfony\Component\Cache\CacheItem;
 use Symfony\Component\Cache\PruneableInterface;
 use Symfony\Component\Cache\ResettableInterface;
-use Symfony\Component\Cache\Traits\ContractsTrait;
 use Symfony\Component\Cache\Traits\ProxyTrait;
-use Symfony\Contracts\Cache\TagAwareCacheInterface;
 
 /**
  * @author Nicolas Grekas <p@tchwork.com>
  */
-class TagAwareAdapter implements TagAwareAdapterInterface, TagAwareCacheInterface, PruneableInterface, ResettableInterface, LoggerAwareInterface
+class TagAwareAdapter implements TagAwareAdapterInterface, PruneableInterface, ResettableInterface
 {
-    use ContractsTrait;
-    use LoggerAwareTrait;
+    const TAGS_PREFIX = "\0tags\0";
+
     use ProxyTrait;
 
-    public const TAGS_PREFIX = "\0tags\0";
-
-    private $deferred = [];
+    private $deferred = array();
     private $createCacheItem;
     private $setCacheItemTags;
     private $getTagsByKey;
     private $invalidateTags;
     private $tags;
-    private $knownTagVersions = [];
-    private $knownTagVersionsTtl;
 
-    public function __construct(AdapterInterface $itemsPool, AdapterInterface $tagsPool = null, float $knownTagVersionsTtl = 0.15)
+    public function __construct(AdapterInterface $itemsPool, AdapterInterface $tagsPool = null)
     {
         $this->pool = $itemsPool;
         $this->tags = $tagsPool ?: $itemsPool;
-        $this->knownTagVersionsTtl = $knownTagVersionsTtl;
         $this->createCacheItem = \Closure::bind(
-            static function ($key, $value, CacheItem $protoItem) {
+            function ($key, $value, CacheItem $protoItem) {
                 $item = new CacheItem();
                 $item->key = $key;
                 $item->value = $value;
+                $item->defaultLifetime = $protoItem->defaultLifetime;
                 $item->expiry = $protoItem->expiry;
+                $item->innerItem = $protoItem->innerItem;
                 $item->poolHash = $protoItem->poolHash;
 
                 return $item;
@@ -61,14 +54,13 @@ class TagAwareAdapter implements TagAwareAdapterInterface, TagAwareCacheInterfac
             CacheItem::class
         );
         $this->setCacheItemTags = \Closure::bind(
-            static function (CacheItem $item, $key, array &$itemTags) {
-                $item->isTaggable = true;
+            function (CacheItem $item, $key, array &$itemTags) {
                 if (!$item->isHit) {
                     return $item;
                 }
                 if (isset($itemTags[$key])) {
                     foreach ($itemTags[$key] as $tag => $version) {
-                        $item->metadata[CacheItem::METADATA_TAGS][$tag] = $tag;
+                        $item->prevTags[$tag] = $tag;
                     }
                     unset($itemTags[$key]);
                 } else {
@@ -82,11 +74,10 @@ class TagAwareAdapter implements TagAwareAdapterInterface, TagAwareCacheInterfac
             CacheItem::class
         );
         $this->getTagsByKey = \Closure::bind(
-            static function ($deferred) {
-                $tagsByKey = [];
+            function ($deferred) {
+                $tagsByKey = array();
                 foreach ($deferred as $key => $item) {
-                    $tagsByKey[$key] = $item->newMetadata[CacheItem::METADATA_TAGS] ?? [];
-                    $item->metadata = $item->newMetadata;
+                    $tagsByKey[$key] = $item->tags;
                 }
 
                 return $tagsByKey;
@@ -95,9 +86,11 @@ class TagAwareAdapter implements TagAwareAdapterInterface, TagAwareCacheInterfac
             CacheItem::class
         );
         $this->invalidateTags = \Closure::bind(
-            static function (AdapterInterface $tagsAdapter, array $tags) {
-                foreach ($tags as $v) {
-                    $v->expiry = 0;
+            function (AdapterInterface $tagsAdapter, array $tags) {
+                foreach ($tagsAdapter->getItems($tags) as $v) {
+                    $v->set(1 + (int) $v->get());
+                    $v->defaultLifetime = 0;
+                    $v->expiry = null;
                     $tagsAdapter->saveDeferred($v);
                 }
 
@@ -113,75 +106,35 @@ class TagAwareAdapter implements TagAwareAdapterInterface, TagAwareCacheInterfac
      */
     public function invalidateTags(array $tags)
     {
-        $ok = true;
-        $tagsByKey = [];
-        $invalidatedTags = [];
-        foreach ($tags as $tag) {
-            CacheItem::validateKey($tag);
-            $invalidatedTags[$tag] = 0;
-        }
-
-        if ($this->deferred) {
-            $items = $this->deferred;
-            foreach ($items as $key => $item) {
-                if (!$this->pool->saveDeferred($item)) {
-                    unset($this->deferred[$key]);
-                    $ok = false;
-                }
+        foreach ($tags as $k => $tag) {
+            if ('' !== $tag && is_string($tag)) {
+                $tags[$k] = $tag.static::TAGS_PREFIX;
             }
-
-            $f = $this->getTagsByKey;
-            $tagsByKey = $f($items);
-            $this->deferred = [];
         }
+        $f = $this->invalidateTags;
 
-        $tagVersions = $this->getTagVersions($tagsByKey, $invalidatedTags);
-        $f = $this->createCacheItem;
-
-        foreach ($tagsByKey as $key => $tags) {
-            $this->pool->saveDeferred($f(static::TAGS_PREFIX.$key, array_intersect_key($tagVersions, $tags), $items[$key]));
-        }
-        $ok = $this->pool->commit() && $ok;
-
-        if ($invalidatedTags) {
-            $f = $this->invalidateTags;
-            $ok = $f($this->tags, $invalidatedTags) && $ok;
-        }
-
-        return $ok;
+        return $f($this->tags, $tags);
     }
 
     /**
      * {@inheritdoc}
-     *
-     * @return bool
      */
     public function hasItem($key)
     {
-        if (\is_string($key) && isset($this->deferred[$key])) {
+        if ($this->deferred) {
             $this->commit();
         }
-
         if (!$this->pool->hasItem($key)) {
             return false;
         }
-
-        $itemTags = $this->pool->getItem(static::TAGS_PREFIX.$key);
-
-        if (!$itemTags->isHit()) {
-            return false;
-        }
-
-        if (!$itemTags = $itemTags->get()) {
+        if (!$itemTags = $this->pool->getItem(static::TAGS_PREFIX.$key)->get()) {
             return true;
         }
 
-        foreach ($this->getTagVersions([$itemTags]) as $tag => $version) {
-            if ($itemTags[$tag] === $version || \is_int($itemTags[$tag]) && \is_int($version) && 1 === $itemTags[$tag] - $version) {
-                continue;
+        foreach ($this->getTagVersions(array($itemTags)) as $tag => $version) {
+            if ($itemTags[$tag] !== $version) {
+                return false;
             }
-
-            return false;
         }
 
         return true;
@@ -192,33 +145,28 @@ class TagAwareAdapter implements TagAwareAdapterInterface, TagAwareCacheInterfac
      */
     public function getItem($key)
     {
-        foreach ($this->getItems([$key]) as $item) {
+        foreach ($this->getItems(array($key)) as $item) {
             return $item;
         }
-
-        return null;
     }
 
     /**
      * {@inheritdoc}
      */
-    public function getItems(array $keys = [])
+    public function getItems(array $keys = array())
     {
-        $tagKeys = [];
-        $commit = false;
+        if ($this->deferred) {
+            $this->commit();
+        }
+        $tagKeys = array();
 
         foreach ($keys as $key) {
-            if ('' !== $key && \is_string($key)) {
-                $commit = $commit || isset($this->deferred[$key]);
+            if ('' !== $key && is_string($key)) {
                 $key = static::TAGS_PREFIX.$key;
                 $tagKeys[$key] = $key;
             }
         }
 
-        if ($commit) {
-            $this->commit();
-        }
-
         try {
             $items = $this->pool->getItems($tagKeys + $keys);
         } catch (InvalidArgumentException $e) {
@@ -232,51 +180,29 @@ class TagAwareAdapter implements TagAwareAdapterInterface, TagAwareCacheInterfac
 
     /**
      * {@inheritdoc}
-     *
-     * @param string $prefix
-     *
-     * @return bool
      */
-    public function clear(/* string $prefix = '' */)
+    public function clear()
     {
-        $prefix = 0 < \func_num_args() ? (string) func_get_arg(0) : '';
-
-        if ('' !== $prefix) {
-            foreach ($this->deferred as $key => $item) {
-                if (str_starts_with($key, $prefix)) {
-                    unset($this->deferred[$key]);
-                }
-            }
-        } else {
-            $this->deferred = [];
-        }
-
-        if ($this->pool instanceof AdapterInterface) {
-            return $this->pool->clear($prefix);
-        }
+        $this->deferred = array();
 
         return $this->pool->clear();
     }
 
     /**
      * {@inheritdoc}
-     *
-     * @return bool
      */
     public function deleteItem($key)
     {
-        return $this->deleteItems([$key]);
+        return $this->deleteItems(array($key));
     }
 
     /**
      * {@inheritdoc}
-     *
-     * @return bool
      */
     public function deleteItems(array $keys)
     {
         foreach ($keys as $key) {
-            if ('' !== $key && \is_string($key)) {
+            if ('' !== $key && is_string($key)) {
                 $keys[] = static::TAGS_PREFIX.$key;
             }
         }
@@ -286,8 +212,6 @@ class TagAwareAdapter implements TagAwareAdapterInterface, TagAwareCacheInterfac
 
     /**
      * {@inheritdoc}
-     *
-     * @return bool
      */
     public function save(CacheItemInterface $item)
     {
@@ -301,8 +225,6 @@ class TagAwareAdapter implements TagAwareAdapterInterface, TagAwareCacheInterfac
 
     /**
      * {@inheritdoc}
-     *
-     * @return bool
      */
     public function saveDeferred(CacheItemInterface $item)
     {
@@ -316,25 +238,32 @@ class TagAwareAdapter implements TagAwareAdapterInterface, TagAwareCacheInterfac
 
     /**
      * {@inheritdoc}
-     *
-     * @return bool
      */
     public function commit()
     {
-        return $this->invalidateTags([]);
-    }
+        $ok = true;
 
-    /**
-     * @return array
-     */
-    public function __sleep()
-    {
-        throw new \BadMethodCallException('Cannot serialize '.__CLASS__);
-    }
+        if ($this->deferred) {
+            $items = $this->deferred;
+            foreach ($items as $key => $item) {
+                if (!$this->pool->saveDeferred($item)) {
+                    unset($this->deferred[$key]);
+                    $ok = false;
+                }
+            }
 
-    public function __wakeup()
-    {
-        throw new \BadMethodCallException('Cannot unserialize '.__CLASS__);
+            $f = $this->getTagsByKey;
+            $tagsByKey = $f($items);
+            $this->deferred = array();
+            $tagVersions = $this->getTagVersions($tagsByKey);
+            $f = $this->createCacheItem;
+
+            foreach ($tagsByKey as $key => $tags) {
+                $this->pool->saveDeferred($f(static::TAGS_PREFIX.$key, array_intersect_key($tagVersions, $tags), $items[$key]));
+            }
+        }
+
+        return $this->pool->commit() && $ok;
     }
 
     public function __destruct()
@@ -342,9 +271,9 @@ class TagAwareAdapter implements TagAwareAdapterInterface, TagAwareCacheInterfac
         $this->commit();
     }
 
-    private function generateItems(iterable $items, array $tagKeys)
+    private function generateItems($items, array $tagKeys)
     {
-        $bufferedItems = $itemTags = [];
+        $bufferedItems = $itemTags = array();
         $f = $this->setCacheItemTags;
 
         foreach ($items as $key => $item) {
@@ -358,21 +287,17 @@ class TagAwareAdapter implements TagAwareAdapterInterface, TagAwareCacheInterfac
             }
 
             unset($tagKeys[$key]);
-
-            if ($item->isHit()) {
-                $itemTags[$key] = $item->get() ?: [];
-            }
+            $itemTags[$key] = $item->get() ?: array();
 
             if (!$tagKeys) {
                 $tagVersions = $this->getTagVersions($itemTags);
 
                 foreach ($itemTags as $key => $tags) {
                     foreach ($tags as $tag => $version) {
-                        if ($tagVersions[$tag] === $version || \is_int($version) && \is_int($tagVersions[$tag]) && 1 === $version - $tagVersions[$tag]) {
-                            continue;
+                        if ($tagVersions[$tag] !== $version) {
+                            unset($itemTags[$key]);
+                            continue 2;
                         }
-                        unset($itemTags[$key]);
-                        continue 2;
                     }
                 }
                 $tagVersions = $tagKeys = null;
@@ -385,59 +310,23 @@ class TagAwareAdapter implements TagAwareAdapterInterface, TagAwareCacheInterfac
         }
     }
 
-    private function getTagVersions(array $tagsByKey, array &$invalidatedTags = [])
+    private function getTagVersions(array $tagsByKey)
     {
-        $tagVersions = $invalidatedTags;
+        $tagVersions = array();
 
         foreach ($tagsByKey as $tags) {
             $tagVersions += $tags;
         }
 
-        if (!$tagVersions) {
-            return [];
-        }
-
-        if (!$fetchTagVersions = 1 !== \func_num_args()) {
-            foreach ($tagsByKey as $tags) {
-                foreach ($tags as $tag => $version) {
-                    if ($tagVersions[$tag] > $version) {
-                        $tagVersions[$tag] = $version;
-                    }
-                }
+        if ($tagVersions) {
+            $tags = array();
+            foreach ($tagVersions as $tag => $version) {
+                $tagVersions[$tag] = $tag.static::TAGS_PREFIX;
+                $tags[$tag.static::TAGS_PREFIX] = $tag;
             }
-        }
-
-        $now = microtime(true);
-        $tags = [];
-        foreach ($tagVersions as $tag => $version) {
-            $tags[$tag.static::TAGS_PREFIX] = $tag;
-            if ($fetchTagVersions || !isset($this->knownTagVersions[$tag]) || !\is_int($version)) {
-                $fetchTagVersions = true;
-                continue;
+            foreach ($this->tags->getItems($tagVersions) as $tag => $version) {
+                $tagVersions[$tags[$tag]] = $version->get() ?: 0;
             }
-            $version -= $this->knownTagVersions[$tag][1];
-            if ((0 !== $version && 1 !== $version) || $now - $this->knownTagVersions[$tag][0] >= $this->knownTagVersionsTtl) {
-                // reuse previously fetched tag versions up to the ttl, unless we are storing items or a potential miss arises
-                $fetchTagVersions = true;
-            } else {
-                $this->knownTagVersions[$tag][1] += $version;
-            }
-        }
-
-        if (!$fetchTagVersions) {
-            return $tagVersions;
-        }
-
-        foreach ($this->tags->getItems(array_keys($tags)) as $tag => $version) {
-            $tagVersions[$tag = $tags[$tag]] = $version->get() ?: 0;
-            if (isset($invalidatedTags[$tag])) {
-                $invalidatedTags[$tag] = $version->set(++$tagVersions[$tag]);
-            }
-            if (!\is_int($tagVersions[$tag])) {
-                unset($this->knownTagVersions[$tag]);
-                continue;
-            }
-            $this->knownTagVersions[$tag] = [$now, $tagVersions[$tag]];
         }
 
         return $tagVersions;
diff --git a/advancedcontentfilter/vendor/symfony/cache/Adapter/TraceableAdapter.php b/advancedcontentfilter/vendor/symfony/cache/Adapter/TraceableAdapter.php
index 9e65b2ef..98d0e526 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Adapter/TraceableAdapter.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Adapter/TraceableAdapter.php
@@ -12,11 +12,8 @@
 namespace Symfony\Component\Cache\Adapter;
 
 use Psr\Cache\CacheItemInterface;
-use Symfony\Component\Cache\CacheItem;
 use Symfony\Component\Cache\PruneableInterface;
 use Symfony\Component\Cache\ResettableInterface;
-use Symfony\Contracts\Cache\CacheInterface;
-use Symfony\Contracts\Service\ResetInterface;
 
 /**
  * An adapter that collects data about all cache calls.
@@ -25,48 +22,16 @@ use Symfony\Contracts\Service\ResetInterface;
  * @author Tobias Nyholm <tobias.nyholm@gmail.com>
  * @author Nicolas Grekas <p@tchwork.com>
  */
-class TraceableAdapter implements AdapterInterface, CacheInterface, PruneableInterface, ResettableInterface
+class TraceableAdapter implements AdapterInterface, PruneableInterface, ResettableInterface
 {
     protected $pool;
-    private $calls = [];
+    private $calls = array();
 
     public function __construct(AdapterInterface $pool)
     {
         $this->pool = $pool;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function get(string $key, callable $callback, float $beta = null, array &$metadata = null)
-    {
-        if (!$this->pool instanceof CacheInterface) {
-            throw new \BadMethodCallException(sprintf('Cannot call "%s::get()": this class doesn\'t implement "%s".', \get_class($this->pool), CacheInterface::class));
-        }
-
-        $isHit = true;
-        $callback = function (CacheItem $item, bool &$save) use ($callback, &$isHit) {
-            $isHit = $item->isHit();
-
-            return $callback($item, $save);
-        };
-
-        $event = $this->start(__FUNCTION__);
-        try {
-            $value = $this->pool->get($key, $callback, $beta, $metadata);
-            $event->result[$key] = \is_object($value) ? \get_class($value) : \gettype($value);
-        } finally {
-            $event->end = microtime(true);
-        }
-        if ($isHit) {
-            ++$event->hits;
-        } else {
-            ++$event->misses;
-        }
-
-        return $value;
-    }
-
     /**
      * {@inheritdoc}
      */
@@ -89,8 +54,6 @@ class TraceableAdapter implements AdapterInterface, CacheInterface, PruneableInt
 
     /**
      * {@inheritdoc}
-     *
-     * @return bool
      */
     public function hasItem($key)
     {
@@ -104,8 +67,6 @@ class TraceableAdapter implements AdapterInterface, CacheInterface, PruneableInt
 
     /**
      * {@inheritdoc}
-     *
-     * @return bool
      */
     public function deleteItem($key)
     {
@@ -119,8 +80,6 @@ class TraceableAdapter implements AdapterInterface, CacheInterface, PruneableInt
 
     /**
      * {@inheritdoc}
-     *
-     * @return bool
      */
     public function save(CacheItemInterface $item)
     {
@@ -134,8 +93,6 @@ class TraceableAdapter implements AdapterInterface, CacheInterface, PruneableInt
 
     /**
      * {@inheritdoc}
-     *
-     * @return bool
      */
     public function saveDeferred(CacheItemInterface $item)
     {
@@ -150,7 +107,7 @@ class TraceableAdapter implements AdapterInterface, CacheInterface, PruneableInt
     /**
      * {@inheritdoc}
      */
-    public function getItems(array $keys = [])
+    public function getItems(array $keys = array())
     {
         $event = $this->start(__FUNCTION__);
         try {
@@ -159,7 +116,7 @@ class TraceableAdapter implements AdapterInterface, CacheInterface, PruneableInt
             $event->end = microtime(true);
         }
         $f = function () use ($result, $event) {
-            $event->result = [];
+            $event->result = array();
             foreach ($result as $key => $item) {
                 if ($event->result[$key] = $item->isHit()) {
                     ++$event->hits;
@@ -175,20 +132,11 @@ class TraceableAdapter implements AdapterInterface, CacheInterface, PruneableInt
 
     /**
      * {@inheritdoc}
-     *
-     * @param string $prefix
-     *
-     * @return bool
      */
-    public function clear(/* string $prefix = '' */)
+    public function clear()
     {
-        $prefix = 0 < \func_num_args() ? (string) func_get_arg(0) : '';
         $event = $this->start(__FUNCTION__);
         try {
-            if ($this->pool instanceof AdapterInterface) {
-                return $event->result = $this->pool->clear($prefix);
-            }
-
             return $event->result = $this->pool->clear();
         } finally {
             $event->end = microtime(true);
@@ -197,8 +145,6 @@ class TraceableAdapter implements AdapterInterface, CacheInterface, PruneableInt
 
     /**
      * {@inheritdoc}
-     *
-     * @return bool
      */
     public function deleteItems(array $keys)
     {
@@ -213,8 +159,6 @@ class TraceableAdapter implements AdapterInterface, CacheInterface, PruneableInt
 
     /**
      * {@inheritdoc}
-     *
-     * @return bool
      */
     public function commit()
     {
@@ -247,21 +191,12 @@ class TraceableAdapter implements AdapterInterface, CacheInterface, PruneableInt
      */
     public function reset()
     {
-        if ($this->pool instanceof ResetInterface) {
-            $this->pool->reset();
+        if (!$this->pool instanceof ResettableInterface) {
+            return;
         }
-
-        $this->clearCalls();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function delete(string $key): bool
-    {
         $event = $this->start(__FUNCTION__);
         try {
-            return $event->result[$key] = $this->pool->deleteItem($key);
+            $this->pool->reset();
         } finally {
             $event->end = microtime(true);
         }
@@ -274,7 +209,7 @@ class TraceableAdapter implements AdapterInterface, CacheInterface, PruneableInt
 
     public function clearCalls()
     {
-        $this->calls = [];
+        $this->calls = array();
     }
 
     protected function start($name)
diff --git a/advancedcontentfilter/vendor/symfony/cache/Adapter/TraceableTagAwareAdapter.php b/advancedcontentfilter/vendor/symfony/cache/Adapter/TraceableTagAwareAdapter.php
index 69461b8b..de68955d 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Adapter/TraceableTagAwareAdapter.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Adapter/TraceableTagAwareAdapter.php
@@ -11,12 +11,10 @@
 
 namespace Symfony\Component\Cache\Adapter;
 
-use Symfony\Contracts\Cache\TagAwareCacheInterface;
-
 /**
  * @author Robin Chalas <robin.chalas@gmail.com>
  */
-class TraceableTagAwareAdapter extends TraceableAdapter implements TagAwareAdapterInterface, TagAwareCacheInterface
+class TraceableTagAwareAdapter extends TraceableAdapter implements TagAwareAdapterInterface
 {
     public function __construct(TagAwareAdapterInterface $pool)
     {
diff --git a/advancedcontentfilter/vendor/symfony/cache/CHANGELOG.md b/advancedcontentfilter/vendor/symfony/cache/CHANGELOG.md
index 435eaf3d..11c1b936 100644
--- a/advancedcontentfilter/vendor/symfony/cache/CHANGELOG.md
+++ b/advancedcontentfilter/vendor/symfony/cache/CHANGELOG.md
@@ -1,43 +1,6 @@
 CHANGELOG
 =========
 
-4.4.0
------
-
- * added support for connecting to Redis Sentinel clusters
- * added argument `$prefix` to `AdapterInterface::clear()`
- * improved `RedisTagAwareAdapter` to support Redis server >= 2.8 and up to 4B items per tag
- * added `TagAwareMarshaller` for optimized data storage when using `AbstractTagAwareAdapter`
- * added `DeflateMarshaller` to compress serialized values
- * removed support for phpredis 4 `compression`
- * [BC BREAK] `RedisTagAwareAdapter` is not compatible with `RedisCluster` from `Predis` anymore, use `phpredis` instead
- * Marked the `CacheDataCollector` class as `@final`.
-
-4.3.0
------
-
- * removed `psr/simple-cache` dependency, run `composer require psr/simple-cache` if you need it
- * deprecated all PSR-16 adapters, use `Psr16Cache` or `Symfony\Contracts\Cache\CacheInterface` implementations instead
- * deprecated `SimpleCacheAdapter`, use `Psr16Adapter` instead
-
-4.2.0
------
-
- * added support for connecting to Redis clusters via DSN
- * added support for configuring multiple Memcached servers via DSN
- * added `MarshallerInterface` and `DefaultMarshaller` to allow changing the serializer and provide one that automatically uses igbinary when available
- * implemented `CacheInterface`, which provides stampede protection via probabilistic early expiration and should become the preferred way to use a cache
- * added sub-second expiry accuracy for backends that support it
- * added support for phpredis 4 `compression` and `tcp_keepalive` options
- * added automatic table creation when using Doctrine DBAL with PDO-based backends
- * throw `LogicException` when `CacheItem::tag()` is called on an item coming from a non tag-aware pool
- * deprecated `CacheItem::getPreviousTags()`, use `CacheItem::getMetadata()` instead
- * deprecated the `AbstractAdapter::unserialize()` and `AbstractCache::unserialize()` methods
- * added `CacheCollectorPass` (originally in `FrameworkBundle`)
- * added `CachePoolClearerPass` (originally in `FrameworkBundle`)
- * added `CachePoolPass` (originally in `FrameworkBundle`)
- * added `CachePoolPrunerPass` (originally in `FrameworkBundle`)
-
 3.4.0
 -----
 
@@ -50,7 +13,7 @@ CHANGELOG
 3.3.0
 -----
 
- * added CacheItem::getPreviousTags() to get bound tags coming from the pool storage if any
+ * [EXPERIMENTAL] added CacheItem::getPreviousTags() to get bound tags coming from the pool storage if any
  * added PSR-16 "Simple Cache" implementations for all existing PSR-6 adapters
  * added Psr6Cache and SimpleCacheAdapter for bidirectional interoperability between PSR-6 and PSR-16
  * added MemcachedAdapter (PSR-6) and MemcachedCache (PSR-16)
diff --git a/advancedcontentfilter/vendor/symfony/cache/CacheItem.php b/advancedcontentfilter/vendor/symfony/cache/CacheItem.php
index 4dd6fd7c..93ffea49 100644
--- a/advancedcontentfilter/vendor/symfony/cache/CacheItem.php
+++ b/advancedcontentfilter/vendor/symfony/cache/CacheItem.php
@@ -11,40 +11,35 @@
 
 namespace Symfony\Component\Cache;
 
+use Psr\Cache\CacheItemInterface;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\Cache\Exception\InvalidArgumentException;
-use Symfony\Component\Cache\Exception\LogicException;
-use Symfony\Contracts\Cache\ItemInterface;
 
 /**
  * @author Nicolas Grekas <p@tchwork.com>
  */
-final class CacheItem implements ItemInterface
+final class CacheItem implements CacheItemInterface
 {
-    private const METADATA_EXPIRY_OFFSET = 1527506807;
-
     protected $key;
     protected $value;
     protected $isHit = false;
     protected $expiry;
-    protected $metadata = [];
-    protected $newMetadata = [];
+    protected $defaultLifetime;
+    protected $tags = array();
+    protected $prevTags = array();
     protected $innerItem;
     protected $poolHash;
-    protected $isTaggable = false;
 
     /**
      * {@inheritdoc}
      */
-    public function getKey(): string
+    public function getKey()
     {
         return $this->key;
     }
 
     /**
      * {@inheritdoc}
-     *
-     * @return mixed
      */
     public function get()
     {
@@ -54,17 +49,15 @@ final class CacheItem implements ItemInterface
     /**
      * {@inheritdoc}
      */
-    public function isHit(): bool
+    public function isHit()
     {
         return $this->isHit;
     }
 
     /**
      * {@inheritdoc}
-     *
-     * @return $this
      */
-    public function set($value): self
+    public function set($value)
     {
         $this->value = $value;
 
@@ -73,17 +66,15 @@ final class CacheItem implements ItemInterface
 
     /**
      * {@inheritdoc}
-     *
-     * @return $this
      */
-    public function expiresAt($expiration): self
+    public function expiresAt($expiration)
     {
         if (null === $expiration) {
-            $this->expiry = null;
+            $this->expiry = $this->defaultLifetime > 0 ? time() + $this->defaultLifetime : null;
         } elseif ($expiration instanceof \DateTimeInterface) {
-            $this->expiry = (float) $expiration->format('U.u');
+            $this->expiry = (int) $expiration->format('U');
         } else {
-            throw new InvalidArgumentException(sprintf('Expiration date must implement DateTimeInterface or be null, "%s" given.', \is_object($expiration) ? \get_class($expiration) : \gettype($expiration)));
+            throw new InvalidArgumentException(sprintf('Expiration date must implement DateTimeInterface or be null, "%s" given', is_object($expiration) ? get_class($expiration) : gettype($expiration)));
         }
 
         return $this;
@@ -91,92 +82,84 @@ final class CacheItem implements ItemInterface
 
     /**
      * {@inheritdoc}
-     *
-     * @return $this
      */
-    public function expiresAfter($time): self
+    public function expiresAfter($time)
     {
         if (null === $time) {
-            $this->expiry = null;
+            $this->expiry = $this->defaultLifetime > 0 ? time() + $this->defaultLifetime : null;
         } elseif ($time instanceof \DateInterval) {
-            $this->expiry = microtime(true) + \DateTime::createFromFormat('U', 0)->add($time)->format('U.u');
-        } elseif (\is_int($time)) {
-            $this->expiry = $time + microtime(true);
+            $this->expiry = (int) \DateTime::createFromFormat('U', time())->add($time)->format('U');
+        } elseif (is_int($time)) {
+            $this->expiry = $time + time();
         } else {
-            throw new InvalidArgumentException(sprintf('Expiration date must be an integer, a DateInterval or null, "%s" given.', \is_object($time) ? \get_class($time) : \gettype($time)));
+            throw new InvalidArgumentException(sprintf('Expiration date must be an integer, a DateInterval or null, "%s" given', is_object($time) ? get_class($time) : gettype($time)));
         }
 
         return $this;
     }
 
     /**
-     * {@inheritdoc}
+     * Adds a tag to a cache item.
+     *
+     * @param string|string[] $tags A tag or array of tags
+     *
+     * @return static
+     *
+     * @throws InvalidArgumentException When $tag is not valid
      */
-    public function tag($tags): ItemInterface
+    public function tag($tags)
     {
-        if (!$this->isTaggable) {
-            throw new LogicException(sprintf('Cache item "%s" comes from a non tag-aware pool: you cannot tag it.', $this->key));
-        }
-        if (!is_iterable($tags)) {
-            $tags = [$tags];
+        if (!is_array($tags)) {
+            $tags = array($tags);
         }
         foreach ($tags as $tag) {
-            if (!\is_string($tag) && !(\is_object($tag) && method_exists($tag, '__toString'))) {
-                throw new InvalidArgumentException(sprintf('Cache tag must be string or object that implements __toString(), "%s" given.', \is_object($tag) ? \get_class($tag) : \gettype($tag)));
+            if (!is_string($tag)) {
+                throw new InvalidArgumentException(sprintf('Cache tag must be string, "%s" given', is_object($tag) ? get_class($tag) : gettype($tag)));
             }
-            $tag = (string) $tag;
-            if (isset($this->newMetadata[self::METADATA_TAGS][$tag])) {
+            if (isset($this->tags[$tag])) {
                 continue;
             }
-            if ('' === $tag) {
-                throw new InvalidArgumentException('Cache tag length must be greater than zero.');
+            if (!isset($tag[0])) {
+                throw new InvalidArgumentException('Cache tag length must be greater than zero');
             }
-            if (false !== strpbrk($tag, self::RESERVED_CHARACTERS)) {
-                throw new InvalidArgumentException(sprintf('Cache tag "%s" contains reserved characters "%s".', $tag, self::RESERVED_CHARACTERS));
+            if (false !== strpbrk($tag, '{}()/\@:')) {
+                throw new InvalidArgumentException(sprintf('Cache tag "%s" contains reserved characters {}()/\@:', $tag));
             }
-            $this->newMetadata[self::METADATA_TAGS][$tag] = $tag;
+            $this->tags[$tag] = $tag;
         }
 
         return $this;
     }
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getMetadata(): array
-    {
-        return $this->metadata;
-    }
-
     /**
      * Returns the list of tags bound to the value coming from the pool storage if any.
      *
-     * @deprecated since Symfony 4.2, use the "getMetadata()" method instead.
+     * @return array
      */
-    public function getPreviousTags(): array
+    public function getPreviousTags()
     {
-        @trigger_error(sprintf('The "%s()" method is deprecated since Symfony 4.2, use the "getMetadata()" method instead.', __METHOD__), \E_USER_DEPRECATED);
-
-        return $this->metadata[self::METADATA_TAGS] ?? [];
+        return $this->prevTags;
     }
 
     /**
      * Validates a cache key according to PSR-6.
      *
-     * @param mixed $key The key to validate
+     * @param string $key The key to validate
+     *
+     * @return string
      *
      * @throws InvalidArgumentException When $key is not valid
      */
-    public static function validateKey($key): string
+    public static function validateKey($key)
     {
-        if (!\is_string($key)) {
-            throw new InvalidArgumentException(sprintf('Cache key must be string, "%s" given.', \is_object($key) ? \get_class($key) : \gettype($key)));
+        if (!is_string($key)) {
+            throw new InvalidArgumentException(sprintf('Cache key must be string, "%s" given', is_object($key) ? get_class($key) : gettype($key)));
         }
-        if ('' === $key) {
-            throw new InvalidArgumentException('Cache key length must be greater than zero.');
+        if (!isset($key[0])) {
+            throw new InvalidArgumentException('Cache key length must be greater than zero');
         }
-        if (false !== strpbrk($key, self::RESERVED_CHARACTERS)) {
-            throw new InvalidArgumentException(sprintf('Cache key "%s" contains reserved characters "%s".', $key, self::RESERVED_CHARACTERS));
+        if (false !== strpbrk($key, '{}()/\@:')) {
+            throw new InvalidArgumentException(sprintf('Cache key "%s" contains reserved characters {}()/\@:', $key));
         }
 
         return $key;
@@ -187,18 +170,18 @@ final class CacheItem implements ItemInterface
      *
      * @internal
      */
-    public static function log(?LoggerInterface $logger, string $message, array $context = [])
+    public static function log(LoggerInterface $logger = null, $message, $context = array())
     {
         if ($logger) {
             $logger->warning($message, $context);
         } else {
-            $replace = [];
+            $replace = array();
             foreach ($context as $k => $v) {
-                if (\is_scalar($v)) {
+                if (is_scalar($v)) {
                     $replace['{'.$k.'}'] = $v;
                 }
             }
-            @trigger_error(strtr($message, $replace), \E_USER_WARNING);
+            @trigger_error(strtr($message, $replace), E_USER_WARNING);
         }
     }
 }
diff --git a/advancedcontentfilter/vendor/symfony/cache/DataCollector/CacheDataCollector.php b/advancedcontentfilter/vendor/symfony/cache/DataCollector/CacheDataCollector.php
index 9bcd5b06..ceef45aa 100644
--- a/advancedcontentfilter/vendor/symfony/cache/DataCollector/CacheDataCollector.php
+++ b/advancedcontentfilter/vendor/symfony/cache/DataCollector/CacheDataCollector.php
@@ -21,18 +21,17 @@ use Symfony\Component\HttpKernel\DataCollector\LateDataCollectorInterface;
 /**
  * @author Aaron Scherer <aequasi@gmail.com>
  * @author Tobias Nyholm <tobias.nyholm@gmail.com>
- *
- * @final since Symfony 4.4
  */
 class CacheDataCollector extends DataCollector implements LateDataCollectorInterface
 {
     /**
      * @var TraceableAdapter[]
      */
-    private $instances = [];
+    private $instances = array();
 
     /**
-     * @param string $name
+     * @param string           $name
+     * @param TraceableAdapter $instance
      */
     public function addInstance($name, TraceableAdapter $instance)
     {
@@ -41,13 +40,11 @@ class CacheDataCollector extends DataCollector implements LateDataCollectorInter
 
     /**
      * {@inheritdoc}
-     *
-     * @param \Throwable|null $exception
      */
-    public function collect(Request $request, Response $response/* , \Throwable $exception = null */)
+    public function collect(Request $request, Response $response, \Exception $exception = null)
     {
-        $empty = ['calls' => [], 'config' => [], 'options' => [], 'statistics' => []];
-        $this->data = ['instances' => $empty, 'total' => $empty];
+        $empty = array('calls' => array(), 'config' => array(), 'options' => array(), 'statistics' => array());
+        $this->data = array('instances' => $empty, 'total' => $empty);
         foreach ($this->instances as $name => $instance) {
             $this->data['instances']['calls'][$name] = $instance->getCalls();
         }
@@ -58,7 +55,7 @@ class CacheDataCollector extends DataCollector implements LateDataCollectorInter
 
     public function reset()
     {
-        $this->data = [];
+        $this->data = array();
         foreach ($this->instances as $instance) {
             $instance->clearCalls();
         }
@@ -66,7 +63,7 @@ class CacheDataCollector extends DataCollector implements LateDataCollectorInter
 
     public function lateCollect()
     {
-        $this->data['instances']['calls'] = $this->cloneVar($this->data['instances']['calls']);
+        $this->data = $this->cloneVar($this->data);
     }
 
     /**
@@ -107,11 +104,14 @@ class CacheDataCollector extends DataCollector implements LateDataCollectorInter
         return $this->data['instances']['calls'];
     }
 
-    private function calculateStatistics(): array
+    /**
+     * @return array
+     */
+    private function calculateStatistics()
     {
-        $statistics = [];
+        $statistics = array();
         foreach ($this->data['instances']['calls'] as $name => $calls) {
-            $statistics[$name] = [
+            $statistics[$name] = array(
                 'calls' => 0,
                 'time' => 0,
                 'reads' => 0,
@@ -119,41 +119,34 @@ class CacheDataCollector extends DataCollector implements LateDataCollectorInter
                 'deletes' => 0,
                 'hits' => 0,
                 'misses' => 0,
-            ];
+            );
             /** @var TraceableAdapterEvent $call */
             foreach ($calls as $call) {
-                ++$statistics[$name]['calls'];
+                $statistics[$name]['calls'] += 1;
                 $statistics[$name]['time'] += $call->end - $call->start;
-                if ('get' === $call->name) {
-                    ++$statistics[$name]['reads'];
+                if ('getItem' === $call->name) {
+                    $statistics[$name]['reads'] += 1;
                     if ($call->hits) {
-                        ++$statistics[$name]['hits'];
+                        $statistics[$name]['hits'] += 1;
                     } else {
-                        ++$statistics[$name]['misses'];
-                        ++$statistics[$name]['writes'];
-                    }
-                } elseif ('getItem' === $call->name) {
-                    ++$statistics[$name]['reads'];
-                    if ($call->hits) {
-                        ++$statistics[$name]['hits'];
-                    } else {
-                        ++$statistics[$name]['misses'];
+                        $statistics[$name]['misses'] += 1;
                     }
                 } elseif ('getItems' === $call->name) {
-                    $statistics[$name]['reads'] += $call->hits + $call->misses;
+                    $count = $call->hits + $call->misses;
+                    $statistics[$name]['reads'] += $count;
                     $statistics[$name]['hits'] += $call->hits;
-                    $statistics[$name]['misses'] += $call->misses;
+                    $statistics[$name]['misses'] += $count - $call->misses;
                 } elseif ('hasItem' === $call->name) {
-                    ++$statistics[$name]['reads'];
+                    $statistics[$name]['reads'] += 1;
                     if (false === $call->result) {
-                        ++$statistics[$name]['misses'];
+                        $statistics[$name]['misses'] += 1;
                     } else {
-                        ++$statistics[$name]['hits'];
+                        $statistics[$name]['hits'] += 1;
                     }
                 } elseif ('save' === $call->name) {
-                    ++$statistics[$name]['writes'];
+                    $statistics[$name]['writes'] += 1;
                 } elseif ('deleteItem' === $call->name) {
-                    ++$statistics[$name]['deletes'];
+                    $statistics[$name]['deletes'] += 1;
                 }
             }
             if ($statistics[$name]['reads']) {
@@ -166,10 +159,13 @@ class CacheDataCollector extends DataCollector implements LateDataCollectorInter
         return $statistics;
     }
 
-    private function calculateTotalStatistics(): array
+    /**
+     * @return array
+     */
+    private function calculateTotalStatistics()
     {
         $statistics = $this->getStatistics();
-        $totals = [
+        $totals = array(
             'calls' => 0,
             'time' => 0,
             'reads' => 0,
@@ -177,7 +173,7 @@ class CacheDataCollector extends DataCollector implements LateDataCollectorInter
             'deletes' => 0,
             'hits' => 0,
             'misses' => 0,
-        ];
+        );
         foreach ($statistics as $name => $values) {
             foreach ($totals as $key => $value) {
                 $totals[$key] += $statistics[$name][$key];
diff --git a/advancedcontentfilter/vendor/symfony/cache/DependencyInjection/CacheCollectorPass.php b/advancedcontentfilter/vendor/symfony/cache/DependencyInjection/CacheCollectorPass.php
deleted file mode 100644
index 6bbab9da..00000000
--- a/advancedcontentfilter/vendor/symfony/cache/DependencyInjection/CacheCollectorPass.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Cache\DependencyInjection;
-
-use Symfony\Component\Cache\Adapter\TagAwareAdapterInterface;
-use Symfony\Component\Cache\Adapter\TraceableAdapter;
-use Symfony\Component\Cache\Adapter\TraceableTagAwareAdapter;
-use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Definition;
-use Symfony\Component\DependencyInjection\Reference;
-
-/**
- * Inject a data collector to all the cache services to be able to get detailed statistics.
- *
- * @author Tobias Nyholm <tobias.nyholm@gmail.com>
- */
-class CacheCollectorPass implements CompilerPassInterface
-{
-    private $dataCollectorCacheId;
-    private $cachePoolTag;
-    private $cachePoolRecorderInnerSuffix;
-
-    public function __construct(string $dataCollectorCacheId = 'data_collector.cache', string $cachePoolTag = 'cache.pool', string $cachePoolRecorderInnerSuffix = '.recorder_inner')
-    {
-        $this->dataCollectorCacheId = $dataCollectorCacheId;
-        $this->cachePoolTag = $cachePoolTag;
-        $this->cachePoolRecorderInnerSuffix = $cachePoolRecorderInnerSuffix;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function process(ContainerBuilder $container)
-    {
-        if (!$container->hasDefinition($this->dataCollectorCacheId)) {
-            return;
-        }
-
-        foreach ($container->findTaggedServiceIds($this->cachePoolTag) as $id => $attributes) {
-            $poolName = $attributes[0]['name'] ?? $id;
-
-            $this->addToCollector($id, $poolName, $container);
-        }
-    }
-
-    private function addToCollector(string $id, string $name, ContainerBuilder $container)
-    {
-        $definition = $container->getDefinition($id);
-        if ($definition->isAbstract()) {
-            return;
-        }
-
-        $collectorDefinition = $container->getDefinition($this->dataCollectorCacheId);
-        $recorder = new Definition(is_subclass_of($definition->getClass(), TagAwareAdapterInterface::class) ? TraceableTagAwareAdapter::class : TraceableAdapter::class);
-        $recorder->setTags($definition->getTags());
-        if (!$definition->isPublic() || !$definition->isPrivate()) {
-            $recorder->setPublic($definition->isPublic());
-        }
-        $recorder->setArguments([new Reference($innerId = $id.$this->cachePoolRecorderInnerSuffix)]);
-
-        $definition->setTags([]);
-        $definition->setPublic(false);
-
-        $container->setDefinition($innerId, $definition);
-        $container->setDefinition($id, $recorder);
-
-        // Tell the collector to add the new instance
-        $collectorDefinition->addMethodCall('addInstance', [$name, new Reference($id)]);
-        $collectorDefinition->setPublic(false);
-    }
-}
diff --git a/advancedcontentfilter/vendor/symfony/cache/DependencyInjection/CachePoolClearerPass.php b/advancedcontentfilter/vendor/symfony/cache/DependencyInjection/CachePoolClearerPass.php
deleted file mode 100644
index 3ca89a36..00000000
--- a/advancedcontentfilter/vendor/symfony/cache/DependencyInjection/CachePoolClearerPass.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Cache\DependencyInjection;
-
-use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Reference;
-
-/**
- * @author Nicolas Grekas <p@tchwork.com>
- */
-class CachePoolClearerPass implements CompilerPassInterface
-{
-    private $cachePoolClearerTag;
-
-    public function __construct(string $cachePoolClearerTag = 'cache.pool.clearer')
-    {
-        $this->cachePoolClearerTag = $cachePoolClearerTag;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function process(ContainerBuilder $container)
-    {
-        $container->getParameterBag()->remove('cache.prefix.seed');
-
-        foreach ($container->findTaggedServiceIds($this->cachePoolClearerTag) as $id => $attr) {
-            $clearer = $container->getDefinition($id);
-            $pools = [];
-            foreach ($clearer->getArgument(0) as $name => $ref) {
-                if ($container->hasDefinition($ref)) {
-                    $pools[$name] = new Reference($ref);
-                }
-            }
-            $clearer->replaceArgument(0, $pools);
-        }
-    }
-}
diff --git a/advancedcontentfilter/vendor/symfony/cache/DependencyInjection/CachePoolPass.php b/advancedcontentfilter/vendor/symfony/cache/DependencyInjection/CachePoolPass.php
deleted file mode 100644
index c707ad9a..00000000
--- a/advancedcontentfilter/vendor/symfony/cache/DependencyInjection/CachePoolPass.php
+++ /dev/null
@@ -1,228 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Cache\DependencyInjection;
-
-use Symfony\Component\Cache\Adapter\AbstractAdapter;
-use Symfony\Component\Cache\Adapter\ArrayAdapter;
-use Symfony\Component\Cache\Adapter\ChainAdapter;
-use Symfony\Component\Cache\Adapter\NullAdapter;
-use Symfony\Component\DependencyInjection\ChildDefinition;
-use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Definition;
-use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
-use Symfony\Component\DependencyInjection\Reference;
-
-/**
- * @author Nicolas Grekas <p@tchwork.com>
- */
-class CachePoolPass implements CompilerPassInterface
-{
-    private $cachePoolTag;
-    private $kernelResetTag;
-    private $cacheClearerId;
-    private $cachePoolClearerTag;
-    private $cacheSystemClearerId;
-    private $cacheSystemClearerTag;
-
-    public function __construct(string $cachePoolTag = 'cache.pool', string $kernelResetTag = 'kernel.reset', string $cacheClearerId = 'cache.global_clearer', string $cachePoolClearerTag = 'cache.pool.clearer', string $cacheSystemClearerId = 'cache.system_clearer', string $cacheSystemClearerTag = 'kernel.cache_clearer')
-    {
-        $this->cachePoolTag = $cachePoolTag;
-        $this->kernelResetTag = $kernelResetTag;
-        $this->cacheClearerId = $cacheClearerId;
-        $this->cachePoolClearerTag = $cachePoolClearerTag;
-        $this->cacheSystemClearerId = $cacheSystemClearerId;
-        $this->cacheSystemClearerTag = $cacheSystemClearerTag;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function process(ContainerBuilder $container)
-    {
-        if ($container->hasParameter('cache.prefix.seed')) {
-            $seed = '.'.$container->getParameterBag()->resolveValue($container->getParameter('cache.prefix.seed'));
-        } else {
-            $seed = '_'.$container->getParameter('kernel.project_dir');
-        }
-        $seed .= '.'.$container->getParameter('kernel.container_class');
-
-        $allPools = [];
-        $clearers = [];
-        $attributes = [
-            'provider',
-            'name',
-            'namespace',
-            'default_lifetime',
-            'reset',
-        ];
-        foreach ($container->findTaggedServiceIds($this->cachePoolTag) as $id => $tags) {
-            $adapter = $pool = $container->getDefinition($id);
-            if ($pool->isAbstract()) {
-                continue;
-            }
-            $class = $adapter->getClass();
-            while ($adapter instanceof ChildDefinition) {
-                $adapter = $container->findDefinition($adapter->getParent());
-                $class = $class ?: $adapter->getClass();
-                if ($t = $adapter->getTag($this->cachePoolTag)) {
-                    $tags[0] += $t[0];
-                }
-            }
-            $name = $tags[0]['name'] ?? $id;
-            if (!isset($tags[0]['namespace'])) {
-                $namespaceSeed = $seed;
-                if (null !== $class) {
-                    $namespaceSeed .= '.'.$class;
-                }
-
-                $tags[0]['namespace'] = $this->getNamespace($namespaceSeed, $name);
-            }
-            if (isset($tags[0]['clearer'])) {
-                $clearer = $tags[0]['clearer'];
-                while ($container->hasAlias($clearer)) {
-                    $clearer = (string) $container->getAlias($clearer);
-                }
-            } else {
-                $clearer = null;
-            }
-            unset($tags[0]['clearer'], $tags[0]['name']);
-
-            if (isset($tags[0]['provider'])) {
-                $tags[0]['provider'] = new Reference(static::getServiceProvider($container, $tags[0]['provider']));
-            }
-
-            if (ChainAdapter::class === $class) {
-                $adapters = [];
-                foreach ($adapter->getArgument(0) as $provider => $adapter) {
-                    if ($adapter instanceof ChildDefinition) {
-                        $chainedPool = $adapter;
-                    } else {
-                        $chainedPool = $adapter = new ChildDefinition($adapter);
-                    }
-
-                    $chainedTags = [\is_int($provider) ? [] : ['provider' => $provider]];
-                    $chainedClass = '';
-
-                    while ($adapter instanceof ChildDefinition) {
-                        $adapter = $container->findDefinition($adapter->getParent());
-                        $chainedClass = $chainedClass ?: $adapter->getClass();
-                        if ($t = $adapter->getTag($this->cachePoolTag)) {
-                            $chainedTags[0] += $t[0];
-                        }
-                    }
-
-                    if (ChainAdapter::class === $chainedClass) {
-                        throw new InvalidArgumentException(sprintf('Invalid service "%s": chain of adapters cannot reference another chain, found "%s".', $id, $chainedPool->getParent()));
-                    }
-
-                    $i = 0;
-
-                    if (isset($chainedTags[0]['provider'])) {
-                        $chainedPool->replaceArgument($i++, new Reference(static::getServiceProvider($container, $chainedTags[0]['provider'])));
-                    }
-
-                    if (isset($tags[0]['namespace']) && !\in_array($adapter->getClass(), [ArrayAdapter::class, NullAdapter::class], true)) {
-                        $chainedPool->replaceArgument($i++, $tags[0]['namespace']);
-                    }
-
-                    if (isset($tags[0]['default_lifetime'])) {
-                        $chainedPool->replaceArgument($i++, $tags[0]['default_lifetime']);
-                    }
-
-                    $adapters[] = $chainedPool;
-                }
-
-                $pool->replaceArgument(0, $adapters);
-                unset($tags[0]['provider'], $tags[0]['namespace']);
-                $i = 1;
-            } else {
-                $i = 0;
-            }
-
-            foreach ($attributes as $attr) {
-                if (!isset($tags[0][$attr])) {
-                    // no-op
-                } elseif ('reset' === $attr) {
-                    if ($tags[0][$attr]) {
-                        $pool->addTag($this->kernelResetTag, ['method' => $tags[0][$attr]]);
-                    }
-                } elseif ('namespace' !== $attr || !\in_array($class, [ArrayAdapter::class, NullAdapter::class], true)) {
-                    $pool->replaceArgument($i++, $tags[0][$attr]);
-                }
-                unset($tags[0][$attr]);
-            }
-            if (!empty($tags[0])) {
-                throw new InvalidArgumentException(sprintf('Invalid "%s" tag for service "%s": accepted attributes are "clearer", "provider", "name", "namespace", "default_lifetime" and "reset", found "%s".', $this->cachePoolTag, $id, implode('", "', array_keys($tags[0]))));
-            }
-
-            if (null !== $clearer) {
-                $clearers[$clearer][$name] = new Reference($id, $container::IGNORE_ON_UNINITIALIZED_REFERENCE);
-            }
-
-            $allPools[$name] = new Reference($id, $container::IGNORE_ON_UNINITIALIZED_REFERENCE);
-        }
-
-        $notAliasedCacheClearerId = $this->cacheClearerId;
-        while ($container->hasAlias($this->cacheClearerId)) {
-            $this->cacheClearerId = (string) $container->getAlias($this->cacheClearerId);
-        }
-        if ($container->hasDefinition($this->cacheClearerId)) {
-            $clearers[$notAliasedCacheClearerId] = $allPools;
-        }
-
-        foreach ($clearers as $id => $pools) {
-            $clearer = $container->getDefinition($id);
-            if ($clearer instanceof ChildDefinition) {
-                $clearer->replaceArgument(0, $pools);
-            } else {
-                $clearer->setArgument(0, $pools);
-            }
-            $clearer->addTag($this->cachePoolClearerTag);
-
-            if ($this->cacheSystemClearerId === $id) {
-                $clearer->addTag($this->cacheSystemClearerTag);
-            }
-        }
-
-        if ($container->hasDefinition('console.command.cache_pool_list')) {
-            $container->getDefinition('console.command.cache_pool_list')->replaceArgument(0, array_keys($allPools));
-        }
-    }
-
-    private function getNamespace(string $seed, string $id)
-    {
-        return substr(str_replace('/', '-', base64_encode(hash('sha256', $id.$seed, true))), 0, 10);
-    }
-
-    /**
-     * @internal
-     */
-    public static function getServiceProvider(ContainerBuilder $container, $name)
-    {
-        $container->resolveEnvPlaceholders($name, null, $usedEnvs);
-
-        if ($usedEnvs || preg_match('#^[a-z]++:#', $name)) {
-            $dsn = $name;
-
-            if (!$container->hasDefinition($name = '.cache_connection.'.ContainerBuilder::hash($dsn))) {
-                $definition = new Definition(AbstractAdapter::class);
-                $definition->setPublic(false);
-                $definition->setFactory([AbstractAdapter::class, 'createConnection']);
-                $definition->setArguments([$dsn, ['lazy' => true]]);
-                $container->setDefinition($name, $definition);
-            }
-        }
-
-        return $name;
-    }
-}
diff --git a/advancedcontentfilter/vendor/symfony/cache/DependencyInjection/CachePoolPrunerPass.php b/advancedcontentfilter/vendor/symfony/cache/DependencyInjection/CachePoolPrunerPass.php
deleted file mode 100644
index e5699623..00000000
--- a/advancedcontentfilter/vendor/symfony/cache/DependencyInjection/CachePoolPrunerPass.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Cache\DependencyInjection;
-
-use Symfony\Component\Cache\PruneableInterface;
-use Symfony\Component\DependencyInjection\Argument\IteratorArgument;
-use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\DependencyInjection\Exception\InvalidArgumentException;
-use Symfony\Component\DependencyInjection\Reference;
-
-/**
- * @author Rob Frawley 2nd <rmf@src.run>
- */
-class CachePoolPrunerPass implements CompilerPassInterface
-{
-    private $cacheCommandServiceId;
-    private $cachePoolTag;
-
-    public function __construct(string $cacheCommandServiceId = 'console.command.cache_pool_prune', string $cachePoolTag = 'cache.pool')
-    {
-        $this->cacheCommandServiceId = $cacheCommandServiceId;
-        $this->cachePoolTag = $cachePoolTag;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function process(ContainerBuilder $container)
-    {
-        if (!$container->hasDefinition($this->cacheCommandServiceId)) {
-            return;
-        }
-
-        $services = [];
-
-        foreach ($container->findTaggedServiceIds($this->cachePoolTag) as $id => $tags) {
-            $class = $container->getParameterBag()->resolveValue($container->getDefinition($id)->getClass());
-
-            if (!$reflection = $container->getReflectionClass($class)) {
-                throw new InvalidArgumentException(sprintf('Class "%s" used for service "%s" cannot be found.', $class, $id));
-            }
-
-            if ($reflection->implementsInterface(PruneableInterface::class)) {
-                $services[$id] = new Reference($id);
-            }
-        }
-
-        $container->getDefinition($this->cacheCommandServiceId)->replaceArgument(0, new IteratorArgument($services));
-    }
-}
diff --git a/advancedcontentfilter/vendor/symfony/cache/DoctrineProvider.php b/advancedcontentfilter/vendor/symfony/cache/DoctrineProvider.php
index f6ac5745..cebe95fb 100644
--- a/advancedcontentfilter/vendor/symfony/cache/DoctrineProvider.php
+++ b/advancedcontentfilter/vendor/symfony/cache/DoctrineProvider.php
@@ -13,11 +13,6 @@ namespace Symfony\Component\Cache;
 
 use Doctrine\Common\Cache\CacheProvider;
 use Psr\Cache\CacheItemPoolInterface;
-use Symfony\Contracts\Service\ResetInterface;
-
-if (!class_exists(CacheProvider::class)) {
-    return;
-}
 
 /**
  * @author Nicolas Grekas <p@tchwork.com>
@@ -44,7 +39,7 @@ class DoctrineProvider extends CacheProvider implements PruneableInterface, Rese
      */
     public function reset()
     {
-        if ($this->pool instanceof ResetInterface) {
+        if ($this->pool instanceof ResettableInterface) {
             $this->pool->reset();
         }
         $this->setNamespace($this->getNamespace());
@@ -52,8 +47,6 @@ class DoctrineProvider extends CacheProvider implements PruneableInterface, Rese
 
     /**
      * {@inheritdoc}
-     *
-     * @return mixed
      */
     protected function doFetch($id)
     {
@@ -64,8 +57,6 @@ class DoctrineProvider extends CacheProvider implements PruneableInterface, Rese
 
     /**
      * {@inheritdoc}
-     *
-     * @return bool
      */
     protected function doContains($id)
     {
@@ -74,8 +65,6 @@ class DoctrineProvider extends CacheProvider implements PruneableInterface, Rese
 
     /**
      * {@inheritdoc}
-     *
-     * @return bool
      */
     protected function doSave($id, $data, $lifeTime = 0)
     {
@@ -90,8 +79,6 @@ class DoctrineProvider extends CacheProvider implements PruneableInterface, Rese
 
     /**
      * {@inheritdoc}
-     *
-     * @return bool
      */
     protected function doDelete($id)
     {
@@ -100,21 +87,16 @@ class DoctrineProvider extends CacheProvider implements PruneableInterface, Rese
 
     /**
      * {@inheritdoc}
-     *
-     * @return bool
      */
     protected function doFlush()
     {
-        return $this->pool->clear();
+        $this->pool->clear();
     }
 
     /**
      * {@inheritdoc}
-     *
-     * @return array|null
      */
     protected function doGetStats()
     {
-        return null;
     }
 }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Exception/CacheException.php b/advancedcontentfilter/vendor/symfony/cache/Exception/CacheException.php
index d2e975b2..e87b2db8 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Exception/CacheException.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Exception/CacheException.php
@@ -14,12 +14,6 @@ namespace Symfony\Component\Cache\Exception;
 use Psr\Cache\CacheException as Psr6CacheInterface;
 use Psr\SimpleCache\CacheException as SimpleCacheInterface;
 
-if (interface_exists(SimpleCacheInterface::class)) {
-    class CacheException extends \Exception implements Psr6CacheInterface, SimpleCacheInterface
-    {
-    }
-} else {
-    class CacheException extends \Exception implements Psr6CacheInterface
-    {
-    }
+class CacheException extends \Exception implements Psr6CacheInterface, SimpleCacheInterface
+{
 }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Exception/InvalidArgumentException.php b/advancedcontentfilter/vendor/symfony/cache/Exception/InvalidArgumentException.php
index 7f9584a2..828bf3ed 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Exception/InvalidArgumentException.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Exception/InvalidArgumentException.php
@@ -14,12 +14,6 @@ namespace Symfony\Component\Cache\Exception;
 use Psr\Cache\InvalidArgumentException as Psr6CacheInterface;
 use Psr\SimpleCache\InvalidArgumentException as SimpleCacheInterface;
 
-if (interface_exists(SimpleCacheInterface::class)) {
-    class InvalidArgumentException extends \InvalidArgumentException implements Psr6CacheInterface, SimpleCacheInterface
-    {
-    }
-} else {
-    class InvalidArgumentException extends \InvalidArgumentException implements Psr6CacheInterface
-    {
-    }
+class InvalidArgumentException extends \InvalidArgumentException implements Psr6CacheInterface, SimpleCacheInterface
+{
 }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Exception/LogicException.php b/advancedcontentfilter/vendor/symfony/cache/Exception/LogicException.php
deleted file mode 100644
index 9ffa7ed6..00000000
--- a/advancedcontentfilter/vendor/symfony/cache/Exception/LogicException.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Cache\Exception;
-
-use Psr\Cache\CacheException as Psr6CacheInterface;
-use Psr\SimpleCache\CacheException as SimpleCacheInterface;
-
-if (interface_exists(SimpleCacheInterface::class)) {
-    class LogicException extends \LogicException implements Psr6CacheInterface, SimpleCacheInterface
-    {
-    }
-} else {
-    class LogicException extends \LogicException implements Psr6CacheInterface
-    {
-    }
-}
diff --git a/advancedcontentfilter/vendor/symfony/cache/LICENSE b/advancedcontentfilter/vendor/symfony/cache/LICENSE
index 7fa95390..fcd3fa76 100644
--- a/advancedcontentfilter/vendor/symfony/cache/LICENSE
+++ b/advancedcontentfilter/vendor/symfony/cache/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2016-2022 Fabien Potencier
+Copyright (c) 2016-2018 Fabien Potencier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/advancedcontentfilter/vendor/symfony/cache/LockRegistry.php b/advancedcontentfilter/vendor/symfony/cache/LockRegistry.php
deleted file mode 100644
index 26574f10..00000000
--- a/advancedcontentfilter/vendor/symfony/cache/LockRegistry.php
+++ /dev/null
@@ -1,161 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Cache;
-
-use Psr\Log\LoggerInterface;
-use Symfony\Contracts\Cache\CacheInterface;
-use Symfony\Contracts\Cache\ItemInterface;
-
-/**
- * LockRegistry is used internally by existing adapters to protect against cache stampede.
- *
- * It does so by wrapping the computation of items in a pool of locks.
- * Foreach each apps, there can be at most 20 concurrent processes that
- * compute items at the same time and only one per cache-key.
- *
- * @author Nicolas Grekas <p@tchwork.com>
- */
-final class LockRegistry
-{
-    private static $openedFiles = [];
-    private static $lockedFiles;
-    private static $signalingException;
-    private static $signalingCallback;
-
-    /**
-     * The number of items in this list controls the max number of concurrent processes.
-     */
-    private static $files = [
-        __DIR__.\DIRECTORY_SEPARATOR.'Adapter'.\DIRECTORY_SEPARATOR.'AbstractAdapter.php',
-        __DIR__.\DIRECTORY_SEPARATOR.'Adapter'.\DIRECTORY_SEPARATOR.'AbstractTagAwareAdapter.php',
-        __DIR__.\DIRECTORY_SEPARATOR.'Adapter'.\DIRECTORY_SEPARATOR.'AdapterInterface.php',
-        __DIR__.\DIRECTORY_SEPARATOR.'Adapter'.\DIRECTORY_SEPARATOR.'ApcuAdapter.php',
-        __DIR__.\DIRECTORY_SEPARATOR.'Adapter'.\DIRECTORY_SEPARATOR.'ArrayAdapter.php',
-        __DIR__.\DIRECTORY_SEPARATOR.'Adapter'.\DIRECTORY_SEPARATOR.'ChainAdapter.php',
-        __DIR__.\DIRECTORY_SEPARATOR.'Adapter'.\DIRECTORY_SEPARATOR.'DoctrineAdapter.php',
-        __DIR__.\DIRECTORY_SEPARATOR.'Adapter'.\DIRECTORY_SEPARATOR.'FilesystemAdapter.php',
-        __DIR__.\DIRECTORY_SEPARATOR.'Adapter'.\DIRECTORY_SEPARATOR.'FilesystemTagAwareAdapter.php',
-        __DIR__.\DIRECTORY_SEPARATOR.'Adapter'.\DIRECTORY_SEPARATOR.'MemcachedAdapter.php',
-        __DIR__.\DIRECTORY_SEPARATOR.'Adapter'.\DIRECTORY_SEPARATOR.'NullAdapter.php',
-        __DIR__.\DIRECTORY_SEPARATOR.'Adapter'.\DIRECTORY_SEPARATOR.'PdoAdapter.php',
-        __DIR__.\DIRECTORY_SEPARATOR.'Adapter'.\DIRECTORY_SEPARATOR.'PhpArrayAdapter.php',
-        __DIR__.\DIRECTORY_SEPARATOR.'Adapter'.\DIRECTORY_SEPARATOR.'PhpFilesAdapter.php',
-        __DIR__.\DIRECTORY_SEPARATOR.'Adapter'.\DIRECTORY_SEPARATOR.'ProxyAdapter.php',
-        __DIR__.\DIRECTORY_SEPARATOR.'Adapter'.\DIRECTORY_SEPARATOR.'Psr16Adapter.php',
-        __DIR__.\DIRECTORY_SEPARATOR.'Adapter'.\DIRECTORY_SEPARATOR.'RedisAdapter.php',
-        __DIR__.\DIRECTORY_SEPARATOR.'Adapter'.\DIRECTORY_SEPARATOR.'RedisTagAwareAdapter.php',
-        __DIR__.\DIRECTORY_SEPARATOR.'Adapter'.\DIRECTORY_SEPARATOR.'SimpleCacheAdapter.php',
-        __DIR__.\DIRECTORY_SEPARATOR.'Adapter'.\DIRECTORY_SEPARATOR.'TagAwareAdapter.php',
-        __DIR__.\DIRECTORY_SEPARATOR.'Adapter'.\DIRECTORY_SEPARATOR.'TagAwareAdapterInterface.php',
-        __DIR__.\DIRECTORY_SEPARATOR.'Adapter'.\DIRECTORY_SEPARATOR.'TraceableAdapter.php',
-        __DIR__.\DIRECTORY_SEPARATOR.'Adapter'.\DIRECTORY_SEPARATOR.'TraceableTagAwareAdapter.php',
-    ];
-
-    /**
-     * Defines a set of existing files that will be used as keys to acquire locks.
-     *
-     * @return array The previously defined set of files
-     */
-    public static function setFiles(array $files): array
-    {
-        $previousFiles = self::$files;
-        self::$files = $files;
-
-        foreach (self::$openedFiles as $file) {
-            if ($file) {
-                flock($file, \LOCK_UN);
-                fclose($file);
-            }
-        }
-        self::$openedFiles = self::$lockedFiles = [];
-
-        return $previousFiles;
-    }
-
-    public static function compute(callable $callback, ItemInterface $item, bool &$save, CacheInterface $pool, \Closure $setMetadata = null, LoggerInterface $logger = null)
-    {
-        if ('\\' === \DIRECTORY_SEPARATOR && null === self::$lockedFiles) {
-            // disable locking on Windows by default
-            self::$files = self::$lockedFiles = [];
-        }
-
-        $key = self::$files ? abs(crc32($item->getKey())) % \count(self::$files) : -1;
-
-        if ($key < 0 || self::$lockedFiles || !$lock = self::open($key)) {
-            return $callback($item, $save);
-        }
-
-        self::$signalingException ?? self::$signalingException = unserialize("O:9:\"Exception\":1:{s:16:\"\0Exception\0trace\";a:0:{}}");
-        self::$signalingCallback ?? self::$signalingCallback = function () { throw self::$signalingException; };
-
-        while (true) {
-            try {
-                // race to get the lock in non-blocking mode
-                $locked = flock($lock, \LOCK_EX | \LOCK_NB, $wouldBlock);
-
-                if ($locked || !$wouldBlock) {
-                    $logger && $logger->info(sprintf('Lock %s, now computing item "{key}"', $locked ? 'acquired' : 'not supported'), ['key' => $item->getKey()]);
-                    self::$lockedFiles[$key] = true;
-
-                    $value = $callback($item, $save);
-
-                    if ($save) {
-                        if ($setMetadata) {
-                            $setMetadata($item);
-                        }
-
-                        $pool->save($item->set($value));
-                        $save = false;
-                    }
-
-                    return $value;
-                }
-                // if we failed the race, retry locking in blocking mode to wait for the winner
-                $logger && $logger->info('Item "{key}" is locked, waiting for it to be released', ['key' => $item->getKey()]);
-                flock($lock, \LOCK_SH);
-            } finally {
-                flock($lock, \LOCK_UN);
-                unset(self::$lockedFiles[$key]);
-            }
-
-            try {
-                $value = $pool->get($item->getKey(), self::$signalingCallback, 0);
-                $logger && $logger->info('Item "{key}" retrieved after lock was released', ['key' => $item->getKey()]);
-                $save = false;
-
-                return $value;
-            } catch (\Exception $e) {
-                if (self::$signalingException !== $e) {
-                    throw $e;
-                }
-                $logger && $logger->info('Item "{key}" not found while lock was released, now retrying', ['key' => $item->getKey()]);
-            }
-        }
-
-        return null;
-    }
-
-    private static function open(int $key)
-    {
-        if (null !== $h = self::$openedFiles[$key] ?? null) {
-            return $h;
-        }
-        set_error_handler(function () {});
-        try {
-            $h = fopen(self::$files[$key], 'r+');
-        } finally {
-            restore_error_handler();
-        }
-
-        return self::$openedFiles[$key] = $h ?: @fopen(self::$files[$key], 'r');
-    }
-}
diff --git a/advancedcontentfilter/vendor/symfony/cache/Marshaller/DefaultMarshaller.php b/advancedcontentfilter/vendor/symfony/cache/Marshaller/DefaultMarshaller.php
deleted file mode 100644
index 7493a2ef..00000000
--- a/advancedcontentfilter/vendor/symfony/cache/Marshaller/DefaultMarshaller.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Cache\Marshaller;
-
-use Symfony\Component\Cache\Exception\CacheException;
-
-/**
- * Serializes/unserializes values using igbinary_serialize() if available, serialize() otherwise.
- *
- * @author Nicolas Grekas <p@tchwork.com>
- */
-class DefaultMarshaller implements MarshallerInterface
-{
-    private $useIgbinarySerialize = true;
-
-    public function __construct(bool $useIgbinarySerialize = null)
-    {
-        if (null === $useIgbinarySerialize) {
-            $useIgbinarySerialize = \extension_loaded('igbinary') && (\PHP_VERSION_ID < 70400 || version_compare('3.1.6', phpversion('igbinary'), '<='));
-        } elseif ($useIgbinarySerialize && (!\extension_loaded('igbinary') || (\PHP_VERSION_ID >= 70400 && version_compare('3.1.6', phpversion('igbinary'), '>')))) {
-            throw new CacheException(\extension_loaded('igbinary') && \PHP_VERSION_ID >= 70400 ? 'Please upgrade the "igbinary" PHP extension to v3.1.6 or higher.' : 'The "igbinary" PHP extension is not loaded.');
-        }
-        $this->useIgbinarySerialize = $useIgbinarySerialize;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function marshall(array $values, ?array &$failed): array
-    {
-        $serialized = $failed = [];
-
-        foreach ($values as $id => $value) {
-            try {
-                if ($this->useIgbinarySerialize) {
-                    $serialized[$id] = igbinary_serialize($value);
-                } else {
-                    $serialized[$id] = serialize($value);
-                }
-            } catch (\Exception $e) {
-                $failed[] = $id;
-            }
-        }
-
-        return $serialized;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function unmarshall(string $value)
-    {
-        if ('b:0;' === $value) {
-            return false;
-        }
-        if ('N;' === $value) {
-            return null;
-        }
-        static $igbinaryNull;
-        if ($value === ($igbinaryNull ?? $igbinaryNull = \extension_loaded('igbinary') ? igbinary_serialize(null) : false)) {
-            return null;
-        }
-        $unserializeCallbackHandler = ini_set('unserialize_callback_func', __CLASS__.'::handleUnserializeCallback');
-        try {
-            if (':' === ($value[1] ?? ':')) {
-                if (false !== $value = unserialize($value)) {
-                    return $value;
-                }
-            } elseif (false === $igbinaryNull) {
-                throw new \RuntimeException('Failed to unserialize values, did you forget to install the "igbinary" extension?');
-            } elseif (null !== $value = igbinary_unserialize($value)) {
-                return $value;
-            }
-
-            throw new \DomainException(error_get_last() ? error_get_last()['message'] : 'Failed to unserialize values.');
-        } catch (\Error $e) {
-            throw new \ErrorException($e->getMessage(), $e->getCode(), \E_ERROR, $e->getFile(), $e->getLine());
-        } finally {
-            ini_set('unserialize_callback_func', $unserializeCallbackHandler);
-        }
-    }
-
-    /**
-     * @internal
-     */
-    public static function handleUnserializeCallback($class)
-    {
-        throw new \DomainException('Class not found: '.$class);
-    }
-}
diff --git a/advancedcontentfilter/vendor/symfony/cache/Marshaller/DeflateMarshaller.php b/advancedcontentfilter/vendor/symfony/cache/Marshaller/DeflateMarshaller.php
deleted file mode 100644
index 55448061..00000000
--- a/advancedcontentfilter/vendor/symfony/cache/Marshaller/DeflateMarshaller.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Cache\Marshaller;
-
-use Symfony\Component\Cache\Exception\CacheException;
-
-/**
- * Compresses values using gzdeflate().
- *
- * @author Nicolas Grekas <p@tchwork.com>
- */
-class DeflateMarshaller implements MarshallerInterface
-{
-    private $marshaller;
-
-    public function __construct(MarshallerInterface $marshaller)
-    {
-        if (!\function_exists('gzdeflate')) {
-            throw new CacheException('The "zlib" PHP extension is not loaded.');
-        }
-
-        $this->marshaller = $marshaller;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function marshall(array $values, ?array &$failed): array
-    {
-        return array_map('gzdeflate', $this->marshaller->marshall($values, $failed));
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function unmarshall(string $value)
-    {
-        if (false !== $inflatedValue = @gzinflate($value)) {
-            $value = $inflatedValue;
-        }
-
-        return $this->marshaller->unmarshall($value);
-    }
-}
diff --git a/advancedcontentfilter/vendor/symfony/cache/Marshaller/MarshallerInterface.php b/advancedcontentfilter/vendor/symfony/cache/Marshaller/MarshallerInterface.php
deleted file mode 100644
index cdd6c402..00000000
--- a/advancedcontentfilter/vendor/symfony/cache/Marshaller/MarshallerInterface.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Cache\Marshaller;
-
-/**
- * Serializes/unserializes PHP values.
- *
- * Implementations of this interface MUST deal with errors carefully. They MUST
- * also deal with forward and backward compatibility at the storage format level.
- *
- * @author Nicolas Grekas <p@tchwork.com>
- */
-interface MarshallerInterface
-{
-    /**
-     * Serializes a list of values.
-     *
-     * When serialization fails for a specific value, no exception should be
-     * thrown. Instead, its key should be listed in $failed.
-     */
-    public function marshall(array $values, ?array &$failed): array;
-
-    /**
-     * Unserializes a single value and throws an exception if anything goes wrong.
-     *
-     * @return mixed
-     *
-     * @throws \Exception Whenever unserialization fails
-     */
-    public function unmarshall(string $value);
-}
diff --git a/advancedcontentfilter/vendor/symfony/cache/Marshaller/TagAwareMarshaller.php b/advancedcontentfilter/vendor/symfony/cache/Marshaller/TagAwareMarshaller.php
deleted file mode 100644
index 5d1e303b..00000000
--- a/advancedcontentfilter/vendor/symfony/cache/Marshaller/TagAwareMarshaller.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Cache\Marshaller;
-
-/**
- * A marshaller optimized for data structures generated by AbstractTagAwareAdapter.
- *
- * @author Nicolas Grekas <p@tchwork.com>
- */
-class TagAwareMarshaller implements MarshallerInterface
-{
-    private $marshaller;
-
-    public function __construct(MarshallerInterface $marshaller = null)
-    {
-        $this->marshaller = $marshaller ?? new DefaultMarshaller();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function marshall(array $values, ?array &$failed): array
-    {
-        $failed = $notSerialized = $serialized = [];
-
-        foreach ($values as $id => $value) {
-            if (\is_array($value) && \is_array($value['tags'] ?? null) && \array_key_exists('value', $value) && \count($value) === 2 + (\is_string($value['meta'] ?? null) && 8 === \strlen($value['meta']))) {
-                // if the value is an array with keys "tags", "value" and "meta", use a compact serialization format
-                // magic numbers in the form 9D-..-..-..-..-00-..-..-..-5F allow detecting this format quickly in unmarshall()
-
-                $v = $this->marshaller->marshall($value, $f);
-
-                if ($f) {
-                    $f = [];
-                    $failed[] = $id;
-                } else {
-                    if ([] === $value['tags']) {
-                        $v['tags'] = '';
-                    }
-
-                    $serialized[$id] = "\x9D".($value['meta'] ?? "\0\0\0\0\0\0\0\0").pack('N', \strlen($v['tags'])).$v['tags'].$v['value'];
-                    $serialized[$id][9] = "\x5F";
-                }
-            } else {
-                // other arbitratry values are serialized using the decorated marshaller below
-                $notSerialized[$id] = $value;
-            }
-        }
-
-        if ($notSerialized) {
-            $serialized += $this->marshaller->marshall($notSerialized, $f);
-            $failed = array_merge($failed, $f);
-        }
-
-        return $serialized;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function unmarshall(string $value)
-    {
-        // detect the compact format used in marshall() using magic numbers in the form 9D-..-..-..-..-00-..-..-..-5F
-        if (13 >= \strlen($value) || "\x9D" !== $value[0] || "\0" !== $value[5] || "\x5F" !== $value[9]) {
-            return $this->marshaller->unmarshall($value);
-        }
-
-        // data consists of value, tags and metadata which we need to unpack
-        $meta = substr($value, 1, 12);
-        $meta[8] = "\0";
-        $tagLen = unpack('Nlen', $meta, 8)['len'];
-        $meta = substr($meta, 0, 8);
-
-        return [
-            'value' => $this->marshaller->unmarshall(substr($value, 13 + $tagLen)),
-            'tags' => $tagLen ? $this->marshaller->unmarshall(substr($value, 13, $tagLen)) : [],
-            'meta' => "\0\0\0\0\0\0\0\0" === $meta ? null : $meta,
-        ];
-    }
-}
diff --git a/advancedcontentfilter/vendor/symfony/cache/Psr16Cache.php b/advancedcontentfilter/vendor/symfony/cache/Psr16Cache.php
deleted file mode 100644
index ac265a57..00000000
--- a/advancedcontentfilter/vendor/symfony/cache/Psr16Cache.php
+++ /dev/null
@@ -1,284 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Cache;
-
-use Psr\Cache\CacheException as Psr6CacheException;
-use Psr\Cache\CacheItemPoolInterface;
-use Psr\SimpleCache\CacheException as SimpleCacheException;
-use Psr\SimpleCache\CacheInterface;
-use Symfony\Component\Cache\Adapter\AdapterInterface;
-use Symfony\Component\Cache\Exception\InvalidArgumentException;
-use Symfony\Component\Cache\Traits\ProxyTrait;
-
-if (null !== (new \ReflectionMethod(CacheInterface::class, 'get'))->getReturnType()) {
-    throw new \LogicException('psr/simple-cache 3.0+ is not compatible with this version of symfony/cache. Please upgrade symfony/cache to 6.0+ or downgrade psr/simple-cache to 1.x or 2.x.');
-}
-
-/**
- * Turns a PSR-6 cache into a PSR-16 one.
- *
- * @author Nicolas Grekas <p@tchwork.com>
- */
-class Psr16Cache implements CacheInterface, PruneableInterface, ResettableInterface
-{
-    use ProxyTrait;
-
-    private const METADATA_EXPIRY_OFFSET = 1527506807;
-
-    private $createCacheItem;
-    private $cacheItemPrototype;
-
-    public function __construct(CacheItemPoolInterface $pool)
-    {
-        $this->pool = $pool;
-
-        if (!$pool instanceof AdapterInterface) {
-            return;
-        }
-        $cacheItemPrototype = &$this->cacheItemPrototype;
-        $createCacheItem = \Closure::bind(
-            static function ($key, $value, $allowInt = false) use (&$cacheItemPrototype) {
-                $item = clone $cacheItemPrototype;
-                $item->poolHash = $item->innerItem = null;
-                $item->key = $allowInt && \is_int($key) ? (string) $key : CacheItem::validateKey($key);
-                $item->value = $value;
-                $item->isHit = false;
-
-                return $item;
-            },
-            null,
-            CacheItem::class
-        );
-        $this->createCacheItem = function ($key, $value, $allowInt = false) use ($createCacheItem) {
-            if (null === $this->cacheItemPrototype) {
-                $this->get($allowInt && \is_int($key) ? (string) $key : $key);
-            }
-            $this->createCacheItem = $createCacheItem;
-
-            return $createCacheItem($key, null, $allowInt)->set($value);
-        };
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @return mixed
-     */
-    public function get($key, $default = null)
-    {
-        try {
-            $item = $this->pool->getItem($key);
-        } catch (SimpleCacheException $e) {
-            throw $e;
-        } catch (Psr6CacheException $e) {
-            throw new InvalidArgumentException($e->getMessage(), $e->getCode(), $e);
-        }
-        if (null === $this->cacheItemPrototype) {
-            $this->cacheItemPrototype = clone $item;
-            $this->cacheItemPrototype->set(null);
-        }
-
-        return $item->isHit() ? $item->get() : $default;
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @return bool
-     */
-    public function set($key, $value, $ttl = null)
-    {
-        try {
-            if (null !== $f = $this->createCacheItem) {
-                $item = $f($key, $value);
-            } else {
-                $item = $this->pool->getItem($key)->set($value);
-            }
-        } catch (SimpleCacheException $e) {
-            throw $e;
-        } catch (Psr6CacheException $e) {
-            throw new InvalidArgumentException($e->getMessage(), $e->getCode(), $e);
-        }
-        if (null !== $ttl) {
-            $item->expiresAfter($ttl);
-        }
-
-        return $this->pool->save($item);
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @return bool
-     */
-    public function delete($key)
-    {
-        try {
-            return $this->pool->deleteItem($key);
-        } catch (SimpleCacheException $e) {
-            throw $e;
-        } catch (Psr6CacheException $e) {
-            throw new InvalidArgumentException($e->getMessage(), $e->getCode(), $e);
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @return bool
-     */
-    public function clear()
-    {
-        return $this->pool->clear();
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @return iterable
-     */
-    public function getMultiple($keys, $default = null)
-    {
-        if ($keys instanceof \Traversable) {
-            $keys = iterator_to_array($keys, false);
-        } elseif (!\is_array($keys)) {
-            throw new InvalidArgumentException(sprintf('Cache keys must be array or Traversable, "%s" given.', \is_object($keys) ? \get_class($keys) : \gettype($keys)));
-        }
-
-        try {
-            $items = $this->pool->getItems($keys);
-        } catch (SimpleCacheException $e) {
-            throw $e;
-        } catch (Psr6CacheException $e) {
-            throw new InvalidArgumentException($e->getMessage(), $e->getCode(), $e);
-        }
-        $values = [];
-
-        if (!$this->pool instanceof AdapterInterface) {
-            foreach ($items as $key => $item) {
-                $values[$key] = $item->isHit() ? $item->get() : $default;
-            }
-
-            return $values;
-        }
-
-        foreach ($items as $key => $item) {
-            if (!$item->isHit()) {
-                $values[$key] = $default;
-                continue;
-            }
-            $values[$key] = $item->get();
-
-            if (!$metadata = $item->getMetadata()) {
-                continue;
-            }
-            unset($metadata[CacheItem::METADATA_TAGS]);
-
-            if ($metadata) {
-                $values[$key] = ["\x9D".pack('VN', (int) (0.1 + $metadata[CacheItem::METADATA_EXPIRY] - self::METADATA_EXPIRY_OFFSET), $metadata[CacheItem::METADATA_CTIME])."\x5F" => $values[$key]];
-            }
-        }
-
-        return $values;
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @return bool
-     */
-    public function setMultiple($values, $ttl = null)
-    {
-        $valuesIsArray = \is_array($values);
-        if (!$valuesIsArray && !$values instanceof \Traversable) {
-            throw new InvalidArgumentException(sprintf('Cache values must be array or Traversable, "%s" given.', \is_object($values) ? \get_class($values) : \gettype($values)));
-        }
-        $items = [];
-
-        try {
-            if (null !== $f = $this->createCacheItem) {
-                $valuesIsArray = false;
-                foreach ($values as $key => $value) {
-                    $items[$key] = $f($key, $value, true);
-                }
-            } elseif ($valuesIsArray) {
-                $items = [];
-                foreach ($values as $key => $value) {
-                    $items[] = (string) $key;
-                }
-                $items = $this->pool->getItems($items);
-            } else {
-                foreach ($values as $key => $value) {
-                    if (\is_int($key)) {
-                        $key = (string) $key;
-                    }
-                    $items[$key] = $this->pool->getItem($key)->set($value);
-                }
-            }
-        } catch (SimpleCacheException $e) {
-            throw $e;
-        } catch (Psr6CacheException $e) {
-            throw new InvalidArgumentException($e->getMessage(), $e->getCode(), $e);
-        }
-        $ok = true;
-
-        foreach ($items as $key => $item) {
-            if ($valuesIsArray) {
-                $item->set($values[$key]);
-            }
-            if (null !== $ttl) {
-                $item->expiresAfter($ttl);
-            }
-            $ok = $this->pool->saveDeferred($item) && $ok;
-        }
-
-        return $this->pool->commit() && $ok;
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @return bool
-     */
-    public function deleteMultiple($keys)
-    {
-        if ($keys instanceof \Traversable) {
-            $keys = iterator_to_array($keys, false);
-        } elseif (!\is_array($keys)) {
-            throw new InvalidArgumentException(sprintf('Cache keys must be array or Traversable, "%s" given.', \is_object($keys) ? \get_class($keys) : \gettype($keys)));
-        }
-
-        try {
-            return $this->pool->deleteItems($keys);
-        } catch (SimpleCacheException $e) {
-            throw $e;
-        } catch (Psr6CacheException $e) {
-            throw new InvalidArgumentException($e->getMessage(), $e->getCode(), $e);
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @return bool
-     */
-    public function has($key)
-    {
-        try {
-            return $this->pool->hasItem($key);
-        } catch (SimpleCacheException $e) {
-            throw $e;
-        } catch (Psr6CacheException $e) {
-            throw new InvalidArgumentException($e->getMessage(), $e->getCode(), $e);
-        }
-    }
-}
diff --git a/advancedcontentfilter/vendor/symfony/cache/README.md b/advancedcontentfilter/vendor/symfony/cache/README.md
index c466d578..c4ab7520 100644
--- a/advancedcontentfilter/vendor/symfony/cache/README.md
+++ b/advancedcontentfilter/vendor/symfony/cache/README.md
@@ -1,19 +1,18 @@
 Symfony PSR-6 implementation for caching
 ========================================
 
-The Cache component provides extended
-[PSR-6](https://www.php-fig.org/psr/psr-6/) implementations for adding cache to
-your applications. It is designed to have a low overhead so that caching is
-fastest. It ships with adapters for the most widespread caching backends.
-It also provides a [PSR-16](https://www.php-fig.org/psr/psr-16/) adapter,
-and implementations for [symfony/cache-contracts](https://github.com/symfony/cache-contracts)'
-`CacheInterface` and `TagAwareCacheInterface`.
+This component provides an extended [PSR-6](http://www.php-fig.org/psr/psr-6/)
+implementation for adding cache to your applications. It is designed to have a
+low overhead so that caching is fastest. It ships with a few caching adapters
+for the most widespread and suited to caching backends. It also provides a
+`doctrine/cache` proxy adapter to cover more advanced caching needs and a proxy
+adapter for greater interoperability between PSR-6 implementations.
 
 Resources
 ---------
 
- * [Documentation](https://symfony.com/doc/current/components/cache.html)
- * [Contributing](https://symfony.com/doc/current/contributing/index.html)
- * [Report issues](https://github.com/symfony/symfony/issues) and
-   [send Pull Requests](https://github.com/symfony/symfony/pulls)
-   in the [main Symfony repository](https://github.com/symfony/symfony)
+  * [Documentation](https://symfony.com/doc/current/components/cache.html)
+  * [Contributing](https://symfony.com/doc/current/contributing/index.html)
+  * [Report issues](https://github.com/symfony/symfony/issues) and
+    [send Pull Requests](https://github.com/symfony/symfony/pulls)
+    in the [main Symfony repository](https://github.com/symfony/symfony)
diff --git a/advancedcontentfilter/vendor/symfony/cache/ResettableInterface.php b/advancedcontentfilter/vendor/symfony/cache/ResettableInterface.php
index 7b0a853f..6be72861 100644
--- a/advancedcontentfilter/vendor/symfony/cache/ResettableInterface.php
+++ b/advancedcontentfilter/vendor/symfony/cache/ResettableInterface.php
@@ -11,11 +11,10 @@
 
 namespace Symfony\Component\Cache;
 
-use Symfony\Contracts\Service\ResetInterface;
-
 /**
  * Resets a pool's local state.
  */
-interface ResettableInterface extends ResetInterface
+interface ResettableInterface
 {
+    public function reset();
 }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Simple/AbstractCache.php b/advancedcontentfilter/vendor/symfony/cache/Simple/AbstractCache.php
index c3d8b38c..e666effa 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Simple/AbstractCache.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Simple/AbstractCache.php
@@ -12,20 +12,16 @@
 namespace Symfony\Component\Cache\Simple;
 
 use Psr\Log\LoggerAwareInterface;
-use Psr\SimpleCache\CacheInterface as Psr16CacheInterface;
-use Symfony\Component\Cache\Adapter\AbstractAdapter;
+use Psr\SimpleCache\CacheInterface;
 use Symfony\Component\Cache\CacheItem;
 use Symfony\Component\Cache\Exception\InvalidArgumentException;
-use Symfony\Component\Cache\ResettableInterface;
 use Symfony\Component\Cache\Traits\AbstractTrait;
-use Symfony\Contracts\Cache\CacheInterface;
-
-@trigger_error(sprintf('The "%s" class is deprecated since Symfony 4.3, use "%s" and type-hint for "%s" instead.', AbstractCache::class, AbstractAdapter::class, CacheInterface::class), \E_USER_DEPRECATED);
+use Symfony\Component\Cache\ResettableInterface;
 
 /**
- * @deprecated since Symfony 4.3, use AbstractAdapter and type-hint for CacheInterface instead.
+ * @author Nicolas Grekas <p@tchwork.com>
  */
-abstract class AbstractCache implements Psr16CacheInterface, LoggerAwareInterface, ResettableInterface
+abstract class AbstractCache implements CacheInterface, LoggerAwareInterface, ResettableInterface
 {
     use AbstractTrait {
         deleteItems as private;
@@ -33,19 +29,18 @@ abstract class AbstractCache implements Psr16CacheInterface, LoggerAwareInterfac
         AbstractTrait::hasItem as has;
     }
 
-    /**
-     * @internal
-     */
-    protected const NS_SEPARATOR = ':';
-
     private $defaultLifetime;
 
-    protected function __construct(string $namespace = '', int $defaultLifetime = 0)
+    /**
+     * @param string $namespace
+     * @param int    $defaultLifetime
+     */
+    protected function __construct($namespace = '', $defaultLifetime = 0)
     {
-        $this->defaultLifetime = max(0, $defaultLifetime);
+        $this->defaultLifetime = max(0, (int) $defaultLifetime);
         $this->namespace = '' === $namespace ? '' : CacheItem::validateKey($namespace).':';
-        if (null !== $this->maxIdLength && \strlen($namespace) > $this->maxIdLength - 24) {
-            throw new InvalidArgumentException(sprintf('Namespace must be %d chars max, %d given ("%s").', $this->maxIdLength - 24, \strlen($namespace), $namespace));
+        if (null !== $this->maxIdLength && strlen($namespace) > $this->maxIdLength - 24) {
+            throw new InvalidArgumentException(sprintf('Namespace must be %d chars max, %d given ("%s")', $this->maxIdLength - 24, strlen($namespace), $namespace));
         }
     }
 
@@ -57,11 +52,11 @@ abstract class AbstractCache implements Psr16CacheInterface, LoggerAwareInterfac
         $id = $this->getId($key);
 
         try {
-            foreach ($this->doFetch([$id]) as $value) {
+            foreach ($this->doFetch(array($id)) as $value) {
                 return $value;
             }
         } catch (\Exception $e) {
-            CacheItem::log($this->logger, 'Failed to fetch key "{key}": '.$e->getMessage(), ['key' => $key, 'exception' => $e]);
+            CacheItem::log($this->logger, 'Failed to fetch key "{key}"', array('key' => $key, 'exception' => $e));
         }
 
         return $default;
@@ -69,29 +64,25 @@ abstract class AbstractCache implements Psr16CacheInterface, LoggerAwareInterfac
 
     /**
      * {@inheritdoc}
-     *
-     * @return bool
      */
     public function set($key, $value, $ttl = null)
     {
         CacheItem::validateKey($key);
 
-        return $this->setMultiple([$key => $value], $ttl);
+        return $this->setMultiple(array($key => $value), $ttl);
     }
 
     /**
      * {@inheritdoc}
-     *
-     * @return iterable
      */
     public function getMultiple($keys, $default = null)
     {
         if ($keys instanceof \Traversable) {
             $keys = iterator_to_array($keys, false);
-        } elseif (!\is_array($keys)) {
-            throw new InvalidArgumentException(sprintf('Cache keys must be array or Traversable, "%s" given.', \is_object($keys) ? \get_class($keys) : \gettype($keys)));
+        } elseif (!is_array($keys)) {
+            throw new InvalidArgumentException(sprintf('Cache keys must be array or Traversable, "%s" given', is_object($keys) ? get_class($keys) : gettype($keys)));
         }
-        $ids = [];
+        $ids = array();
 
         foreach ($keys as $key) {
             $ids[] = $this->getId($key);
@@ -99,8 +90,8 @@ abstract class AbstractCache implements Psr16CacheInterface, LoggerAwareInterfac
         try {
             $values = $this->doFetch($ids);
         } catch (\Exception $e) {
-            CacheItem::log($this->logger, 'Failed to fetch values: '.$e->getMessage(), ['keys' => $keys, 'exception' => $e]);
-            $values = [];
+            CacheItem::log($this->logger, 'Failed to fetch requested values', array('keys' => $keys, 'exception' => $e));
+            $values = array();
         }
         $ids = array_combine($ids, $keys);
 
@@ -109,18 +100,16 @@ abstract class AbstractCache implements Psr16CacheInterface, LoggerAwareInterfac
 
     /**
      * {@inheritdoc}
-     *
-     * @return bool
      */
     public function setMultiple($values, $ttl = null)
     {
-        if (!\is_array($values) && !$values instanceof \Traversable) {
-            throw new InvalidArgumentException(sprintf('Cache values must be array or Traversable, "%s" given.', \is_object($values) ? \get_class($values) : \gettype($values)));
+        if (!is_array($values) && !$values instanceof \Traversable) {
+            throw new InvalidArgumentException(sprintf('Cache values must be array or Traversable, "%s" given', is_object($values) ? get_class($values) : gettype($values)));
         }
-        $valuesById = [];
+        $valuesById = array();
 
         foreach ($values as $key => $value) {
-            if (\is_int($key)) {
+            if (is_int($key)) {
                 $key = (string) $key;
             }
             $valuesById[$this->getId($key)] = $value;
@@ -133,30 +122,27 @@ abstract class AbstractCache implements Psr16CacheInterface, LoggerAwareInterfac
             $e = $this->doSave($valuesById, $ttl);
         } catch (\Exception $e) {
         }
-        if (true === $e || [] === $e) {
+        if (true === $e || array() === $e) {
             return true;
         }
-        $keys = [];
-        foreach (\is_array($e) ? $e : array_keys($valuesById) as $id) {
-            $keys[] = substr($id, \strlen($this->namespace));
+        $keys = array();
+        foreach (is_array($e) ? $e : array_keys($valuesById) as $id) {
+            $keys[] = substr($id, strlen($this->namespace));
         }
-        $message = 'Failed to save values'.($e instanceof \Exception ? ': '.$e->getMessage() : '.');
-        CacheItem::log($this->logger, $message, ['keys' => $keys, 'exception' => $e instanceof \Exception ? $e : null]);
+        CacheItem::log($this->logger, 'Failed to save values', array('keys' => $keys, 'exception' => $e instanceof \Exception ? $e : null));
 
         return false;
     }
 
     /**
      * {@inheritdoc}
-     *
-     * @return bool
      */
     public function deleteMultiple($keys)
     {
         if ($keys instanceof \Traversable) {
             $keys = iterator_to_array($keys, false);
-        } elseif (!\is_array($keys)) {
-            throw new InvalidArgumentException(sprintf('Cache keys must be array or Traversable, "%s" given.', \is_object($keys) ? \get_class($keys) : \gettype($keys)));
+        } elseif (!is_array($keys)) {
+            throw new InvalidArgumentException(sprintf('Cache keys must be array or Traversable, "%s" given', is_object($keys) ? get_class($keys) : gettype($keys)));
         }
 
         return $this->deleteItems($keys);
@@ -170,26 +156,26 @@ abstract class AbstractCache implements Psr16CacheInterface, LoggerAwareInterfac
         if ($ttl instanceof \DateInterval) {
             $ttl = (int) \DateTime::createFromFormat('U', 0)->add($ttl)->format('U');
         }
-        if (\is_int($ttl)) {
+        if (is_int($ttl)) {
             return 0 < $ttl ? $ttl : false;
         }
 
-        throw new InvalidArgumentException(sprintf('Expiration date must be an integer, a DateInterval or null, "%s" given.', \is_object($ttl) ? \get_class($ttl) : \gettype($ttl)));
+        throw new InvalidArgumentException(sprintf('Expiration date must be an integer, a DateInterval or null, "%s" given', is_object($ttl) ? get_class($ttl) : gettype($ttl)));
     }
 
-    private function generateValues(iterable $values, array &$keys, $default): iterable
+    private function generateValues($values, &$keys, $default)
     {
         try {
             foreach ($values as $id => $value) {
                 if (!isset($keys[$id])) {
-                    throw new InvalidArgumentException(sprintf('Could not match value id "%s" to keys "%s".', $id, implode('", "', $keys)));
+                    $id = key($keys);
                 }
                 $key = $keys[$id];
                 unset($keys[$id]);
                 yield $key => $value;
             }
         } catch (\Exception $e) {
-            CacheItem::log($this->logger, 'Failed to fetch values: '.$e->getMessage(), ['keys' => array_values($keys), 'exception' => $e]);
+            CacheItem::log($this->logger, 'Failed to fetch requested values', array('keys' => array_values($keys), 'exception' => $e));
         }
 
         foreach ($keys as $key) {
diff --git a/advancedcontentfilter/vendor/symfony/cache/Simple/ApcuCache.php b/advancedcontentfilter/vendor/symfony/cache/Simple/ApcuCache.php
index bef89e27..e583b443 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Simple/ApcuCache.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Simple/ApcuCache.php
@@ -11,20 +11,18 @@
 
 namespace Symfony\Component\Cache\Simple;
 
-use Symfony\Component\Cache\Adapter\ApcuAdapter;
 use Symfony\Component\Cache\Traits\ApcuTrait;
-use Symfony\Contracts\Cache\CacheInterface;
 
-@trigger_error(sprintf('The "%s" class is deprecated since Symfony 4.3, use "%s" and type-hint for "%s" instead.', ApcuCache::class, ApcuAdapter::class, CacheInterface::class), \E_USER_DEPRECATED);
-
-/**
- * @deprecated since Symfony 4.3, use ApcuAdapter and type-hint for CacheInterface instead.
- */
 class ApcuCache extends AbstractCache
 {
     use ApcuTrait;
 
-    public function __construct(string $namespace = '', int $defaultLifetime = 0, string $version = null)
+    /**
+     * @param string      $namespace
+     * @param int         $defaultLifetime
+     * @param string|null $version
+     */
+    public function __construct($namespace = '', $defaultLifetime = 0, $version = null)
     {
         $this->init($namespace, $defaultLifetime, $version);
     }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Simple/ArrayCache.php b/advancedcontentfilter/vendor/symfony/cache/Simple/ArrayCache.php
index 469edf1c..8d027cd2 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Simple/ArrayCache.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Simple/ArrayCache.php
@@ -12,20 +12,16 @@
 namespace Symfony\Component\Cache\Simple;
 
 use Psr\Log\LoggerAwareInterface;
-use Psr\SimpleCache\CacheInterface as Psr16CacheInterface;
-use Symfony\Component\Cache\Adapter\ArrayAdapter;
+use Psr\SimpleCache\CacheInterface;
 use Symfony\Component\Cache\CacheItem;
 use Symfony\Component\Cache\Exception\InvalidArgumentException;
 use Symfony\Component\Cache\ResettableInterface;
 use Symfony\Component\Cache\Traits\ArrayTrait;
-use Symfony\Contracts\Cache\CacheInterface;
-
-@trigger_error(sprintf('The "%s" class is deprecated since Symfony 4.3, use "%s" and type-hint for "%s" instead.', ArrayCache::class, ArrayAdapter::class, CacheInterface::class), \E_USER_DEPRECATED);
 
 /**
- * @deprecated since Symfony 4.3, use ArrayAdapter and type-hint for CacheInterface instead.
+ * @author Nicolas Grekas <p@tchwork.com>
  */
-class ArrayCache implements Psr16CacheInterface, LoggerAwareInterface, ResettableInterface
+class ArrayCache implements CacheInterface, LoggerAwareInterface, ResettableInterface
 {
     use ArrayTrait {
         ArrayTrait::deleteItem as delete;
@@ -35,11 +31,12 @@ class ArrayCache implements Psr16CacheInterface, LoggerAwareInterface, Resettabl
     private $defaultLifetime;
 
     /**
+     * @param int  $defaultLifetime
      * @param bool $storeSerialized Disabling serialization can lead to cache corruptions when storing mutable values but increases performance otherwise
      */
-    public function __construct(int $defaultLifetime = 0, bool $storeSerialized = true)
+    public function __construct($defaultLifetime = 0, $storeSerialized = true)
     {
-        $this->defaultLifetime = $defaultLifetime;
+        $this->defaultLifetime = (int) $defaultLifetime;
         $this->storeSerialized = $storeSerialized;
     }
 
@@ -48,52 +45,35 @@ class ArrayCache implements Psr16CacheInterface, LoggerAwareInterface, Resettabl
      */
     public function get($key, $default = null)
     {
-        if (!\is_string($key) || !isset($this->expiries[$key])) {
-            CacheItem::validateKey($key);
+        foreach ($this->getMultiple(array($key), $default) as $v) {
+            return $v;
         }
-        if (!$isHit = isset($this->expiries[$key]) && ($this->expiries[$key] > microtime(true) || !$this->delete($key))) {
-            $this->values[$key] = null;
-
-            return $default;
-        }
-        if (!$this->storeSerialized) {
-            return $this->values[$key];
-        }
-        $value = $this->unfreeze($key, $isHit);
-
-        return $isHit ? $value : $default;
     }
 
     /**
      * {@inheritdoc}
-     *
-     * @return iterable
      */
     public function getMultiple($keys, $default = null)
     {
         if ($keys instanceof \Traversable) {
             $keys = iterator_to_array($keys, false);
-        } elseif (!\is_array($keys)) {
-            throw new InvalidArgumentException(sprintf('Cache keys must be array or Traversable, "%s" given.', \is_object($keys) ? \get_class($keys) : \gettype($keys)));
+        } elseif (!is_array($keys)) {
+            throw new InvalidArgumentException(sprintf('Cache keys must be array or Traversable, "%s" given', is_object($keys) ? get_class($keys) : gettype($keys)));
         }
         foreach ($keys as $key) {
-            if (!\is_string($key) || !isset($this->expiries[$key])) {
-                CacheItem::validateKey($key);
-            }
+            CacheItem::validateKey($key);
         }
 
-        return $this->generateItems($keys, microtime(true), function ($k, $v, $hit) use ($default) { return $hit ? $v : $default; });
+        return $this->generateItems($keys, time(), function ($k, $v, $hit) use ($default) { return $hit ? $v : $default; });
     }
 
     /**
      * {@inheritdoc}
-     *
-     * @return bool
      */
     public function deleteMultiple($keys)
     {
-        if (!\is_array($keys) && !$keys instanceof \Traversable) {
-            throw new InvalidArgumentException(sprintf('Cache keys must be array or Traversable, "%s" given.', \is_object($keys) ? \get_class($keys) : \gettype($keys)));
+        if (!is_array($keys) && !$keys instanceof \Traversable) {
+            throw new InvalidArgumentException(sprintf('Cache keys must be array or Traversable, "%s" given', is_object($keys) ? get_class($keys) : gettype($keys)));
         }
         foreach ($keys as $key) {
             $this->delete($key);
@@ -104,45 +84,46 @@ class ArrayCache implements Psr16CacheInterface, LoggerAwareInterface, Resettabl
 
     /**
      * {@inheritdoc}
-     *
-     * @return bool
      */
     public function set($key, $value, $ttl = null)
     {
-        if (!\is_string($key)) {
-            CacheItem::validateKey($key);
-        }
+        CacheItem::validateKey($key);
 
-        return $this->setMultiple([$key => $value], $ttl);
+        return $this->setMultiple(array($key => $value), $ttl);
     }
 
     /**
      * {@inheritdoc}
-     *
-     * @return bool
      */
     public function setMultiple($values, $ttl = null)
     {
-        if (!\is_array($values) && !$values instanceof \Traversable) {
-            throw new InvalidArgumentException(sprintf('Cache values must be array or Traversable, "%s" given.', \is_object($values) ? \get_class($values) : \gettype($values)));
+        if (!is_array($values) && !$values instanceof \Traversable) {
+            throw new InvalidArgumentException(sprintf('Cache values must be array or Traversable, "%s" given', is_object($values) ? get_class($values) : gettype($values)));
         }
-        $valuesArray = [];
+        $valuesArray = array();
 
         foreach ($values as $key => $value) {
-            if (!\is_int($key) && !(\is_string($key) && isset($this->expiries[$key]))) {
-                CacheItem::validateKey($key);
-            }
+            is_int($key) || CacheItem::validateKey($key);
             $valuesArray[$key] = $value;
         }
         if (false === $ttl = $this->normalizeTtl($ttl)) {
             return $this->deleteMultiple(array_keys($valuesArray));
         }
-        $expiry = 0 < $ttl ? microtime(true) + $ttl : \PHP_INT_MAX;
+        if ($this->storeSerialized) {
+            foreach ($valuesArray as $key => $value) {
+                try {
+                    $valuesArray[$key] = serialize($value);
+                } catch (\Exception $e) {
+                    $type = is_object($value) ? get_class($value) : gettype($value);
+                    CacheItem::log($this->logger, 'Failed to save key "{key}" ({type})', array('key' => $key, 'type' => $type, 'exception' => $e));
+
+                    return false;
+                }
+            }
+        }
+        $expiry = 0 < $ttl ? time() + $ttl : PHP_INT_MAX;
 
         foreach ($valuesArray as $key => $value) {
-            if ($this->storeSerialized && null === $value = $this->freeze($value, $key)) {
-                return false;
-            }
             $this->values[$key] = $value;
             $this->expiries[$key] = $expiry;
         }
@@ -158,10 +139,10 @@ class ArrayCache implements Psr16CacheInterface, LoggerAwareInterface, Resettabl
         if ($ttl instanceof \DateInterval) {
             $ttl = (int) \DateTime::createFromFormat('U', 0)->add($ttl)->format('U');
         }
-        if (\is_int($ttl)) {
+        if (is_int($ttl)) {
             return 0 < $ttl ? $ttl : false;
         }
 
-        throw new InvalidArgumentException(sprintf('Expiration date must be an integer, a DateInterval or null, "%s" given.', \is_object($ttl) ? \get_class($ttl) : \gettype($ttl)));
+        throw new InvalidArgumentException(sprintf('Expiration date must be an integer, a DateInterval or null, "%s" given', is_object($ttl) ? get_class($ttl) : gettype($ttl)));
     }
 }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Simple/ChainCache.php b/advancedcontentfilter/vendor/symfony/cache/Simple/ChainCache.php
index bae95072..9d0c7587 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Simple/ChainCache.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Simple/ChainCache.php
@@ -11,15 +11,10 @@
 
 namespace Symfony\Component\Cache\Simple;
 
-use Psr\SimpleCache\CacheInterface as Psr16CacheInterface;
-use Symfony\Component\Cache\Adapter\ChainAdapter;
+use Psr\SimpleCache\CacheInterface;
 use Symfony\Component\Cache\Exception\InvalidArgumentException;
 use Symfony\Component\Cache\PruneableInterface;
 use Symfony\Component\Cache\ResettableInterface;
-use Symfony\Contracts\Cache\CacheInterface;
-use Symfony\Contracts\Service\ResetInterface;
-
-@trigger_error(sprintf('The "%s" class is deprecated since Symfony 4.3, use "%s" and type-hint for "%s" instead.', ChainCache::class, ChainAdapter::class, CacheInterface::class), \E_USER_DEPRECATED);
 
 /**
  * Chains several caches together.
@@ -27,35 +22,35 @@ use Symfony\Contracts\Service\ResetInterface;
  * Cached items are fetched from the first cache having them in its data store.
  * They are saved and deleted in all caches at once.
  *
- * @deprecated since Symfony 4.3, use ChainAdapter and type-hint for CacheInterface instead.
+ * @author Nicolas Grekas <p@tchwork.com>
  */
-class ChainCache implements Psr16CacheInterface, PruneableInterface, ResettableInterface
+class ChainCache implements CacheInterface, PruneableInterface, ResettableInterface
 {
     private $miss;
-    private $caches = [];
+    private $caches = array();
     private $defaultLifetime;
     private $cacheCount;
 
     /**
-     * @param Psr16CacheInterface[] $caches          The ordered list of caches used to fetch cached items
-     * @param int                   $defaultLifetime The lifetime of items propagated from lower caches to upper ones
+     * @param CacheInterface[] $caches          The ordered list of caches used to fetch cached items
+     * @param int              $defaultLifetime The lifetime of items propagated from lower caches to upper ones
      */
-    public function __construct(array $caches, int $defaultLifetime = 0)
+    public function __construct(array $caches, $defaultLifetime = 0)
     {
         if (!$caches) {
             throw new InvalidArgumentException('At least one cache must be specified.');
         }
 
         foreach ($caches as $cache) {
-            if (!$cache instanceof Psr16CacheInterface) {
-                throw new InvalidArgumentException(sprintf('The class "%s" does not implement the "%s" interface.', \get_class($cache), Psr16CacheInterface::class));
+            if (!$cache instanceof CacheInterface) {
+                throw new InvalidArgumentException(sprintf('The class "%s" does not implement the "%s" interface.', get_class($cache), CacheInterface::class));
             }
         }
 
         $this->miss = new \stdClass();
         $this->caches = array_values($caches);
-        $this->cacheCount = \count($this->caches);
-        $this->defaultLifetime = 0 < $defaultLifetime ? $defaultLifetime : null;
+        $this->cacheCount = count($this->caches);
+        $this->defaultLifetime = 0 < $defaultLifetime ? (int) $defaultLifetime : null;
     }
 
     /**
@@ -63,7 +58,7 @@ class ChainCache implements Psr16CacheInterface, PruneableInterface, ResettableI
      */
     public function get($key, $default = null)
     {
-        $miss = null !== $default && \is_object($default) ? $default : $this->miss;
+        $miss = null !== $default && is_object($default) ? $default : $this->miss;
 
         foreach ($this->caches as $i => $cache) {
             $value = $cache->get($key, $miss);
@@ -82,21 +77,19 @@ class ChainCache implements Psr16CacheInterface, PruneableInterface, ResettableI
 
     /**
      * {@inheritdoc}
-     *
-     * @return iterable
      */
     public function getMultiple($keys, $default = null)
     {
-        $miss = null !== $default && \is_object($default) ? $default : $this->miss;
+        $miss = null !== $default && is_object($default) ? $default : $this->miss;
 
         return $this->generateItems($this->caches[0]->getMultiple($keys, $miss), 0, $miss, $default);
     }
 
-    private function generateItems(iterable $values, int $cacheIndex, $miss, $default): iterable
+    private function generateItems($values, $cacheIndex, $miss, $default)
     {
-        $missing = [];
+        $missing = array();
         $nextCacheIndex = $cacheIndex + 1;
-        $nextCache = $this->caches[$nextCacheIndex] ?? null;
+        $nextCache = isset($this->caches[$nextCacheIndex]) ? $this->caches[$nextCacheIndex] : null;
 
         foreach ($values as $k => $value) {
             if ($miss !== $value) {
@@ -125,8 +118,6 @@ class ChainCache implements Psr16CacheInterface, PruneableInterface, ResettableI
 
     /**
      * {@inheritdoc}
-     *
-     * @return bool
      */
     public function has($key)
     {
@@ -141,8 +132,6 @@ class ChainCache implements Psr16CacheInterface, PruneableInterface, ResettableI
 
     /**
      * {@inheritdoc}
-     *
-     * @return bool
      */
     public function clear()
     {
@@ -158,8 +147,6 @@ class ChainCache implements Psr16CacheInterface, PruneableInterface, ResettableI
 
     /**
      * {@inheritdoc}
-     *
-     * @return bool
      */
     public function delete($key)
     {
@@ -175,8 +162,6 @@ class ChainCache implements Psr16CacheInterface, PruneableInterface, ResettableI
 
     /**
      * {@inheritdoc}
-     *
-     * @return bool
      */
     public function deleteMultiple($keys)
     {
@@ -195,8 +180,6 @@ class ChainCache implements Psr16CacheInterface, PruneableInterface, ResettableI
 
     /**
      * {@inheritdoc}
-     *
-     * @return bool
      */
     public function set($key, $value, $ttl = null)
     {
@@ -212,15 +195,13 @@ class ChainCache implements Psr16CacheInterface, PruneableInterface, ResettableI
 
     /**
      * {@inheritdoc}
-     *
-     * @return bool
      */
     public function setMultiple($values, $ttl = null)
     {
         if ($values instanceof \Traversable) {
             $valuesIterator = $values;
             $values = function () use ($valuesIterator, &$values) {
-                $generatedValues = [];
+                $generatedValues = array();
 
                 foreach ($valuesIterator as $key => $value) {
                     yield $key => $value;
@@ -263,7 +244,7 @@ class ChainCache implements Psr16CacheInterface, PruneableInterface, ResettableI
     public function reset()
     {
         foreach ($this->caches as $cache) {
-            if ($cache instanceof ResetInterface) {
+            if ($cache instanceof ResettableInterface) {
                 $cache->reset();
             }
         }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Simple/DoctrineCache.php b/advancedcontentfilter/vendor/symfony/cache/Simple/DoctrineCache.php
index d7feb4d3..00f0b9c6 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Simple/DoctrineCache.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Simple/DoctrineCache.php
@@ -12,20 +12,18 @@
 namespace Symfony\Component\Cache\Simple;
 
 use Doctrine\Common\Cache\CacheProvider;
-use Symfony\Component\Cache\Adapter\DoctrineAdapter;
 use Symfony\Component\Cache\Traits\DoctrineTrait;
-use Symfony\Contracts\Cache\CacheInterface;
 
-@trigger_error(sprintf('The "%s" class is deprecated since Symfony 4.3, use "%s" and type-hint for "%s" instead.', DoctrineCache::class, DoctrineAdapter::class, CacheInterface::class), \E_USER_DEPRECATED);
-
-/**
- * @deprecated since Symfony 4.3, use DoctrineAdapter and type-hint for CacheInterface instead.
- */
 class DoctrineCache extends AbstractCache
 {
     use DoctrineTrait;
 
-    public function __construct(CacheProvider $provider, string $namespace = '', int $defaultLifetime = 0)
+    /**
+     * @param CacheProvider $provider
+     * @param string        $namespace
+     * @param int           $defaultLifetime
+     */
+    public function __construct(CacheProvider $provider, $namespace = '', $defaultLifetime = 0)
     {
         parent::__construct('', $defaultLifetime);
         $this->provider = $provider;
diff --git a/advancedcontentfilter/vendor/symfony/cache/Simple/FilesystemCache.php b/advancedcontentfilter/vendor/symfony/cache/Simple/FilesystemCache.php
index fcc8a170..ccd57953 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Simple/FilesystemCache.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Simple/FilesystemCache.php
@@ -11,25 +11,20 @@
 
 namespace Symfony\Component\Cache\Simple;
 
-use Symfony\Component\Cache\Adapter\FilesystemAdapter;
-use Symfony\Component\Cache\Marshaller\DefaultMarshaller;
-use Symfony\Component\Cache\Marshaller\MarshallerInterface;
 use Symfony\Component\Cache\PruneableInterface;
 use Symfony\Component\Cache\Traits\FilesystemTrait;
-use Symfony\Contracts\Cache\CacheInterface;
 
-@trigger_error(sprintf('The "%s" class is deprecated since Symfony 4.3, use "%s" and type-hint for "%s" instead.', FilesystemCache::class, FilesystemAdapter::class, CacheInterface::class), \E_USER_DEPRECATED);
-
-/**
- * @deprecated since Symfony 4.3, use FilesystemAdapter and type-hint for CacheInterface instead.
- */
 class FilesystemCache extends AbstractCache implements PruneableInterface
 {
     use FilesystemTrait;
 
-    public function __construct(string $namespace = '', int $defaultLifetime = 0, string $directory = null, MarshallerInterface $marshaller = null)
+    /**
+     * @param string      $namespace
+     * @param int         $defaultLifetime
+     * @param string|null $directory
+     */
+    public function __construct($namespace = '', $defaultLifetime = 0, $directory = null)
     {
-        $this->marshaller = $marshaller ?? new DefaultMarshaller();
         parent::__construct('', $defaultLifetime);
         $this->init($namespace, $directory);
     }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Simple/MemcachedCache.php b/advancedcontentfilter/vendor/symfony/cache/Simple/MemcachedCache.php
index 1f636486..77177406 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Simple/MemcachedCache.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Simple/MemcachedCache.php
@@ -11,24 +11,21 @@
 
 namespace Symfony\Component\Cache\Simple;
 
-use Symfony\Component\Cache\Adapter\MemcachedAdapter;
-use Symfony\Component\Cache\Marshaller\MarshallerInterface;
 use Symfony\Component\Cache\Traits\MemcachedTrait;
-use Symfony\Contracts\Cache\CacheInterface;
 
-@trigger_error(sprintf('The "%s" class is deprecated since Symfony 4.3, use "%s" and type-hint for "%s" instead.', MemcachedCache::class, MemcachedAdapter::class, CacheInterface::class), \E_USER_DEPRECATED);
-
-/**
- * @deprecated since Symfony 4.3, use MemcachedAdapter and type-hint for CacheInterface instead.
- */
 class MemcachedCache extends AbstractCache
 {
     use MemcachedTrait;
 
     protected $maxIdLength = 250;
 
-    public function __construct(\Memcached $client, string $namespace = '', int $defaultLifetime = 0, MarshallerInterface $marshaller = null)
+    /**
+     * @param \Memcached $client
+     * @param string     $namespace
+     * @param int        $defaultLifetime
+     */
+    public function __construct(\Memcached $client, $namespace = '', $defaultLifetime = 0)
     {
-        $this->init($client, $namespace, $defaultLifetime, $marshaller);
+        $this->init($client, $namespace, $defaultLifetime);
     }
 }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Simple/NullCache.php b/advancedcontentfilter/vendor/symfony/cache/Simple/NullCache.php
index fcbd39d5..fa986aeb 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Simple/NullCache.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Simple/NullCache.php
@@ -11,16 +11,12 @@
 
 namespace Symfony\Component\Cache\Simple;
 
-use Psr\SimpleCache\CacheInterface as Psr16CacheInterface;
-use Symfony\Component\Cache\Adapter\NullAdapter;
-use Symfony\Contracts\Cache\CacheInterface;
-
-@trigger_error(sprintf('The "%s" class is deprecated since Symfony 4.3, use "%s" and type-hint for "%s" instead.', NullCache::class, NullAdapter::class, CacheInterface::class), \E_USER_DEPRECATED);
+use Psr\SimpleCache\CacheInterface;
 
 /**
- * @deprecated since Symfony 4.3, use NullAdapter and type-hint for CacheInterface instead.
+ * @author Nicolas Grekas <p@tchwork.com>
  */
-class NullCache implements Psr16CacheInterface
+class NullCache implements CacheInterface
 {
     /**
      * {@inheritdoc}
@@ -32,8 +28,6 @@ class NullCache implements Psr16CacheInterface
 
     /**
      * {@inheritdoc}
-     *
-     * @return iterable
      */
     public function getMultiple($keys, $default = null)
     {
@@ -44,8 +38,6 @@ class NullCache implements Psr16CacheInterface
 
     /**
      * {@inheritdoc}
-     *
-     * @return bool
      */
     public function has($key)
     {
@@ -54,8 +46,6 @@ class NullCache implements Psr16CacheInterface
 
     /**
      * {@inheritdoc}
-     *
-     * @return bool
      */
     public function clear()
     {
@@ -64,8 +54,6 @@ class NullCache implements Psr16CacheInterface
 
     /**
      * {@inheritdoc}
-     *
-     * @return bool
      */
     public function delete($key)
     {
@@ -74,8 +62,6 @@ class NullCache implements Psr16CacheInterface
 
     /**
      * {@inheritdoc}
-     *
-     * @return bool
      */
     public function deleteMultiple($keys)
     {
@@ -84,8 +70,6 @@ class NullCache implements Psr16CacheInterface
 
     /**
      * {@inheritdoc}
-     *
-     * @return bool
      */
     public function set($key, $value, $ttl = null)
     {
@@ -94,8 +78,6 @@ class NullCache implements Psr16CacheInterface
 
     /**
      * {@inheritdoc}
-     *
-     * @return bool
      */
     public function setMultiple($values, $ttl = null)
     {
diff --git a/advancedcontentfilter/vendor/symfony/cache/Simple/PdoCache.php b/advancedcontentfilter/vendor/symfony/cache/Simple/PdoCache.php
index 7011ea07..931a3b1f 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Simple/PdoCache.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Simple/PdoCache.php
@@ -11,17 +11,9 @@
 
 namespace Symfony\Component\Cache\Simple;
 
-use Symfony\Component\Cache\Adapter\PdoAdapter;
-use Symfony\Component\Cache\Marshaller\MarshallerInterface;
 use Symfony\Component\Cache\PruneableInterface;
 use Symfony\Component\Cache\Traits\PdoTrait;
-use Symfony\Contracts\Cache\CacheInterface;
 
-@trigger_error(sprintf('The "%s" class is deprecated since Symfony 4.3, use "%s" and type-hint for "%s" instead.', PdoCache::class, PdoAdapter::class, CacheInterface::class), \E_USER_DEPRECATED);
-
-/**
- * @deprecated since Symfony 4.3, use PdoAdapter and type-hint for CacheInterface instead.
- */
 class PdoCache extends AbstractCache implements PruneableInterface
 {
     use PdoTrait;
@@ -33,9 +25,6 @@ class PdoCache extends AbstractCache implements PruneableInterface
      * a Doctrine DBAL Connection or a DSN string that will be used to
      * lazy-connect to the database when the cache is actually used.
      *
-     * When a Doctrine DBAL Connection is passed, the cache table is created
-     * automatically when possible. Otherwise, use the createTable() method.
-     *
      * List of available options:
      *  * db_table: The name of the table [default: cache_items]
      *  * db_id_col: The column where to store the cache id [default: item_id]
@@ -44,16 +33,19 @@ class PdoCache extends AbstractCache implements PruneableInterface
      *  * db_time_col: The column where to store the timestamp [default: item_time]
      *  * db_username: The username when lazy-connect [default: '']
      *  * db_password: The password when lazy-connect [default: '']
-     *  * db_connection_options: An array of driver-specific connection options [default: []]
+     *  * db_connection_options: An array of driver-specific connection options [default: array()]
      *
-     * @param \PDO|Connection|string $connOrDsn a \PDO or Connection instance or DSN string or null
+     * @param \PDO|Connection|string $connOrDsn       A \PDO or Connection instance or DSN string or null
+     * @param string                 $namespace
+     * @param int                    $defaultLifetime
+     * @param array                  $options         An associative array of options
      *
      * @throws InvalidArgumentException When first argument is not PDO nor Connection nor string
      * @throws InvalidArgumentException When PDO error mode is not PDO::ERRMODE_EXCEPTION
      * @throws InvalidArgumentException When namespace contains invalid characters
      */
-    public function __construct($connOrDsn, string $namespace = '', int $defaultLifetime = 0, array $options = [], MarshallerInterface $marshaller = null)
+    public function __construct($connOrDsn, $namespace = '', $defaultLifetime = 0, array $options = array())
     {
-        $this->init($connOrDsn, $namespace, $defaultLifetime, $options, $marshaller);
+        $this->init($connOrDsn, $namespace, $defaultLifetime, $options);
     }
 }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Simple/PhpArrayCache.php b/advancedcontentfilter/vendor/symfony/cache/Simple/PhpArrayCache.php
index 10c7340a..3db8a2ac 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Simple/PhpArrayCache.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Simple/PhpArrayCache.php
@@ -11,44 +11,51 @@
 
 namespace Symfony\Component\Cache\Simple;
 
-use Psr\SimpleCache\CacheInterface as Psr16CacheInterface;
-use Symfony\Component\Cache\Adapter\PhpArrayAdapter;
+use Psr\SimpleCache\CacheInterface;
 use Symfony\Component\Cache\Exception\InvalidArgumentException;
+use Symfony\Component\Cache\Traits\PhpArrayTrait;
 use Symfony\Component\Cache\PruneableInterface;
 use Symfony\Component\Cache\ResettableInterface;
-use Symfony\Component\Cache\Traits\PhpArrayTrait;
-use Symfony\Contracts\Cache\CacheInterface;
-
-@trigger_error(sprintf('The "%s" class is deprecated since Symfony 4.3, use "%s" and type-hint for "%s" instead.', PhpArrayCache::class, PhpArrayAdapter::class, CacheInterface::class), \E_USER_DEPRECATED);
 
 /**
- * @deprecated since Symfony 4.3, use PhpArrayAdapter and type-hint for CacheInterface instead.
+ * Caches items at warm up time using a PHP array that is stored in shared memory by OPCache since PHP 7.0.
+ * Warmed up items are read-only and run-time discovered items are cached using a fallback adapter.
+ *
+ * @author Titouan Galopin <galopintitouan@gmail.com>
+ * @author Nicolas Grekas <p@tchwork.com>
  */
-class PhpArrayCache implements Psr16CacheInterface, PruneableInterface, ResettableInterface
+class PhpArrayCache implements CacheInterface, PruneableInterface, ResettableInterface
 {
     use PhpArrayTrait;
 
     /**
-     * @param string              $file         The PHP file were values are cached
-     * @param Psr16CacheInterface $fallbackPool A pool to fallback on when an item is not hit
+     * @param string         $file         The PHP file were values are cached
+     * @param CacheInterface $fallbackPool A pool to fallback on when an item is not hit
      */
-    public function __construct(string $file, Psr16CacheInterface $fallbackPool)
+    public function __construct($file, CacheInterface $fallbackPool)
     {
         $this->file = $file;
         $this->pool = $fallbackPool;
+        $this->zendDetectUnicode = ini_get('zend.detect_unicode');
     }
 
     /**
-     * This adapter takes advantage of how PHP stores arrays in its latest versions.
+     * This adapter should only be used on PHP 7.0+ to take advantage of how PHP
+     * stores arrays in its latest versions. This factory method decorates the given
+     * fallback pool with this adapter only if the current PHP version is supported.
      *
-     * @param string         $file         The PHP file were values are cached
-     * @param CacheInterface $fallbackPool A pool to fallback on when an item is not hit
+     * @param string $file The PHP file were values are cached
      *
-     * @return Psr16CacheInterface
+     * @return CacheInterface
      */
-    public static function create($file, Psr16CacheInterface $fallbackPool)
+    public static function create($file, CacheInterface $fallbackPool)
     {
-        return new static($file, $fallbackPool);
+        // Shared memory is available in PHP 7.0+ with OPCache enabled and in HHVM
+        if ((\PHP_VERSION_ID >= 70000 && ini_get('opcache.enable')) || defined('HHVM_VERSION')) {
+            return new static($file, $fallbackPool);
+        }
+
+        return $fallbackPool;
     }
 
     /**
@@ -56,24 +63,28 @@ class PhpArrayCache implements Psr16CacheInterface, PruneableInterface, Resettab
      */
     public function get($key, $default = null)
     {
-        if (!\is_string($key)) {
-            throw new InvalidArgumentException(sprintf('Cache key must be string, "%s" given.', \is_object($key) ? \get_class($key) : \gettype($key)));
+        if (!is_string($key)) {
+            throw new InvalidArgumentException(sprintf('Cache key must be string, "%s" given.', is_object($key) ? get_class($key) : gettype($key)));
         }
         if (null === $this->values) {
             $this->initialize();
         }
-        if (!isset($this->keys[$key])) {
+        if (!isset($this->values[$key])) {
             return $this->pool->get($key, $default);
         }
-        $value = $this->values[$this->keys[$key]];
+
+        $value = $this->values[$key];
 
         if ('N;' === $value) {
-            return null;
-        }
-        if ($value instanceof \Closure) {
+            $value = null;
+        } elseif (is_string($value) && isset($value[2]) && ':' === $value[1]) {
             try {
-                return $value();
-            } catch (\Throwable $e) {
+                $e = null;
+                $value = unserialize($value);
+            } catch (\Error $e) {
+            } catch (\Exception $e) {
+            }
+            if (null !== $e) {
                 return $default;
             }
         }
@@ -83,19 +94,17 @@ class PhpArrayCache implements Psr16CacheInterface, PruneableInterface, Resettab
 
     /**
      * {@inheritdoc}
-     *
-     * @return iterable
      */
     public function getMultiple($keys, $default = null)
     {
         if ($keys instanceof \Traversable) {
             $keys = iterator_to_array($keys, false);
-        } elseif (!\is_array($keys)) {
-            throw new InvalidArgumentException(sprintf('Cache keys must be array or Traversable, "%s" given.', \is_object($keys) ? \get_class($keys) : \gettype($keys)));
+        } elseif (!is_array($keys)) {
+            throw new InvalidArgumentException(sprintf('Cache keys must be array or Traversable, "%s" given', is_object($keys) ? get_class($keys) : gettype($keys)));
         }
         foreach ($keys as $key) {
-            if (!\is_string($key)) {
-                throw new InvalidArgumentException(sprintf('Cache key must be string, "%s" given.', \is_object($key) ? \get_class($key) : \gettype($key)));
+            if (!is_string($key)) {
+                throw new InvalidArgumentException(sprintf('Cache key must be string, "%s" given.', is_object($key) ? get_class($key) : gettype($key)));
             }
         }
         if (null === $this->values) {
@@ -107,58 +116,52 @@ class PhpArrayCache implements Psr16CacheInterface, PruneableInterface, Resettab
 
     /**
      * {@inheritdoc}
-     *
-     * @return bool
      */
     public function has($key)
     {
-        if (!\is_string($key)) {
-            throw new InvalidArgumentException(sprintf('Cache key must be string, "%s" given.', \is_object($key) ? \get_class($key) : \gettype($key)));
+        if (!is_string($key)) {
+            throw new InvalidArgumentException(sprintf('Cache key must be string, "%s" given.', is_object($key) ? get_class($key) : gettype($key)));
         }
         if (null === $this->values) {
             $this->initialize();
         }
 
-        return isset($this->keys[$key]) || $this->pool->has($key);
+        return isset($this->values[$key]) || $this->pool->has($key);
     }
 
     /**
      * {@inheritdoc}
-     *
-     * @return bool
      */
     public function delete($key)
     {
-        if (!\is_string($key)) {
-            throw new InvalidArgumentException(sprintf('Cache key must be string, "%s" given.', \is_object($key) ? \get_class($key) : \gettype($key)));
+        if (!is_string($key)) {
+            throw new InvalidArgumentException(sprintf('Cache key must be string, "%s" given.', is_object($key) ? get_class($key) : gettype($key)));
         }
         if (null === $this->values) {
             $this->initialize();
         }
 
-        return !isset($this->keys[$key]) && $this->pool->delete($key);
+        return !isset($this->values[$key]) && $this->pool->delete($key);
     }
 
     /**
      * {@inheritdoc}
-     *
-     * @return bool
      */
     public function deleteMultiple($keys)
     {
-        if (!\is_array($keys) && !$keys instanceof \Traversable) {
-            throw new InvalidArgumentException(sprintf('Cache keys must be array or Traversable, "%s" given.', \is_object($keys) ? \get_class($keys) : \gettype($keys)));
+        if (!is_array($keys) && !$keys instanceof \Traversable) {
+            throw new InvalidArgumentException(sprintf('Cache keys must be array or Traversable, "%s" given', is_object($keys) ? get_class($keys) : gettype($keys)));
         }
 
         $deleted = true;
-        $fallbackKeys = [];
+        $fallbackKeys = array();
 
         foreach ($keys as $key) {
-            if (!\is_string($key)) {
-                throw new InvalidArgumentException(sprintf('Cache key must be string, "%s" given.', \is_object($key) ? \get_class($key) : \gettype($key)));
+            if (!is_string($key)) {
+                throw new InvalidArgumentException(sprintf('Cache key must be string, "%s" given.', is_object($key) ? get_class($key) : gettype($key)));
             }
 
-            if (isset($this->keys[$key])) {
+            if (isset($this->values[$key])) {
                 $deleted = false;
             } else {
                 $fallbackKeys[] = $key;
@@ -177,41 +180,37 @@ class PhpArrayCache implements Psr16CacheInterface, PruneableInterface, Resettab
 
     /**
      * {@inheritdoc}
-     *
-     * @return bool
      */
     public function set($key, $value, $ttl = null)
     {
-        if (!\is_string($key)) {
-            throw new InvalidArgumentException(sprintf('Cache key must be string, "%s" given.', \is_object($key) ? \get_class($key) : \gettype($key)));
+        if (!is_string($key)) {
+            throw new InvalidArgumentException(sprintf('Cache key must be string, "%s" given.', is_object($key) ? get_class($key) : gettype($key)));
         }
         if (null === $this->values) {
             $this->initialize();
         }
 
-        return !isset($this->keys[$key]) && $this->pool->set($key, $value, $ttl);
+        return !isset($this->values[$key]) && $this->pool->set($key, $value, $ttl);
     }
 
     /**
      * {@inheritdoc}
-     *
-     * @return bool
      */
     public function setMultiple($values, $ttl = null)
     {
-        if (!\is_array($values) && !$values instanceof \Traversable) {
-            throw new InvalidArgumentException(sprintf('Cache values must be array or Traversable, "%s" given.', \is_object($values) ? \get_class($values) : \gettype($values)));
+        if (!is_array($values) && !$values instanceof \Traversable) {
+            throw new InvalidArgumentException(sprintf('Cache values must be array or Traversable, "%s" given', is_object($values) ? get_class($values) : gettype($values)));
         }
 
         $saved = true;
-        $fallbackValues = [];
+        $fallbackValues = array();
 
         foreach ($values as $key => $value) {
-            if (!\is_string($key) && !\is_int($key)) {
-                throw new InvalidArgumentException(sprintf('Cache key must be string, "%s" given.', \is_object($key) ? \get_class($key) : \gettype($key)));
+            if (!is_string($key) && !is_int($key)) {
+                throw new InvalidArgumentException(sprintf('Cache key must be string, "%s" given.', is_object($key) ? get_class($key) : gettype($key)));
             }
 
-            if (isset($this->keys[$key])) {
+            if (isset($this->values[$key])) {
                 $saved = false;
             } else {
                 $fallbackValues[$key] = $value;
@@ -225,20 +224,22 @@ class PhpArrayCache implements Psr16CacheInterface, PruneableInterface, Resettab
         return $saved;
     }
 
-    private function generateItems(array $keys, $default): iterable
+    private function generateItems(array $keys, $default)
     {
-        $fallbackKeys = [];
+        $fallbackKeys = array();
 
         foreach ($keys as $key) {
-            if (isset($this->keys[$key])) {
-                $value = $this->values[$this->keys[$key]];
+            if (isset($this->values[$key])) {
+                $value = $this->values[$key];
 
                 if ('N;' === $value) {
                     yield $key => null;
-                } elseif ($value instanceof \Closure) {
+                } elseif (is_string($value) && isset($value[2]) && ':' === $value[1]) {
                     try {
-                        yield $key => $value();
-                    } catch (\Throwable $e) {
+                        yield $key => unserialize($value);
+                    } catch (\Error $e) {
+                        yield $key => $default;
+                    } catch (\Exception $e) {
                         yield $key => $default;
                     }
                 } else {
@@ -250,7 +251,9 @@ class PhpArrayCache implements Psr16CacheInterface, PruneableInterface, Resettab
         }
 
         if ($fallbackKeys) {
-            yield from $this->pool->getMultiple($fallbackKeys, $default);
+            foreach ($this->pool->getMultiple($fallbackKeys, $default) as $key => $item) {
+                yield $key => $item;
+            }
         }
     }
 }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Simple/PhpFilesCache.php b/advancedcontentfilter/vendor/symfony/cache/Simple/PhpFilesCache.php
index 9c79ae9a..9231c8cd 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Simple/PhpFilesCache.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Simple/PhpFilesCache.php
@@ -11,35 +11,31 @@
 
 namespace Symfony\Component\Cache\Simple;
 
-use Symfony\Component\Cache\Adapter\PhpFilesAdapter;
 use Symfony\Component\Cache\Exception\CacheException;
 use Symfony\Component\Cache\PruneableInterface;
 use Symfony\Component\Cache\Traits\PhpFilesTrait;
-use Symfony\Contracts\Cache\CacheInterface;
 
-@trigger_error(sprintf('The "%s" class is deprecated since Symfony 4.3, use "%s" and type-hint for "%s" instead.', PhpFilesCache::class, PhpFilesAdapter::class, CacheInterface::class), \E_USER_DEPRECATED);
-
-/**
- * @deprecated since Symfony 4.3, use PhpFilesAdapter and type-hint for CacheInterface instead.
- */
 class PhpFilesCache extends AbstractCache implements PruneableInterface
 {
     use PhpFilesTrait;
 
     /**
-     * @param $appendOnly Set to `true` to gain extra performance when the items stored in this pool never expire.
-     *                    Doing so is encouraged because it fits perfectly OPcache's memory model.
+     * @param string      $namespace
+     * @param int         $defaultLifetime
+     * @param string|null $directory
      *
      * @throws CacheException if OPcache is not enabled
      */
-    public function __construct(string $namespace = '', int $defaultLifetime = 0, string $directory = null, bool $appendOnly = false)
+    public function __construct($namespace = '', $defaultLifetime = 0, $directory = null)
     {
-        $this->appendOnly = $appendOnly;
-        self::$startTime = self::$startTime ?? $_SERVER['REQUEST_TIME'] ?? time();
+        if (!static::isSupported()) {
+            throw new CacheException('OPcache is not enabled');
+        }
         parent::__construct('', $defaultLifetime);
         $this->init($namespace, $directory);
-        $this->includeHandler = static function ($type, $msg, $file, $line) {
-            throw new \ErrorException($msg, 0, $type, $file, $line);
-        };
+
+        $e = new \Exception();
+        $this->includeHandler = function () use ($e) { throw $e; };
+        $this->zendDetectUnicode = ini_get('zend.detect_unicode');
     }
 }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Simple/Psr6Cache.php b/advancedcontentfilter/vendor/symfony/cache/Simple/Psr6Cache.php
index 366284b2..81f14d4a 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Simple/Psr6Cache.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Simple/Psr6Cache.php
@@ -11,13 +11,218 @@
 
 namespace Symfony\Component\Cache\Simple;
 
-use Symfony\Component\Cache\Psr16Cache;
-
-@trigger_error(sprintf('The "%s" class is deprecated since Symfony 4.3, use "%s" instead.', Psr6Cache::class, Psr16Cache::class), \E_USER_DEPRECATED);
+use Psr\Cache\CacheItemPoolInterface;
+use Psr\Cache\CacheException as Psr6CacheException;
+use Psr\SimpleCache\CacheInterface;
+use Psr\SimpleCache\CacheException as SimpleCacheException;
+use Symfony\Component\Cache\Adapter\AbstractAdapter;
+use Symfony\Component\Cache\CacheItem;
+use Symfony\Component\Cache\Exception\InvalidArgumentException;
+use Symfony\Component\Cache\PruneableInterface;
+use Symfony\Component\Cache\ResettableInterface;
+use Symfony\Component\Cache\Traits\ProxyTrait;
 
 /**
- * @deprecated since Symfony 4.3, use Psr16Cache instead.
+ * @author Nicolas Grekas <p@tchwork.com>
  */
-class Psr6Cache extends Psr16Cache
+class Psr6Cache implements CacheInterface, PruneableInterface, ResettableInterface
 {
+    use ProxyTrait;
+
+    private $createCacheItem;
+
+    public function __construct(CacheItemPoolInterface $pool)
+    {
+        $this->pool = $pool;
+
+        if ($pool instanceof AbstractAdapter) {
+            $this->createCacheItem = \Closure::bind(
+                function ($key, $value, $allowInt = false) {
+                    if ($allowInt && is_int($key)) {
+                        $key = (string) $key;
+                    } else {
+                        CacheItem::validateKey($key);
+                    }
+                    $f = $this->createCacheItem;
+
+                    return $f($key, $value, false);
+                },
+                $pool,
+                AbstractAdapter::class
+            );
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function get($key, $default = null)
+    {
+        try {
+            $item = $this->pool->getItem($key);
+        } catch (SimpleCacheException $e) {
+            throw $e;
+        } catch (Psr6CacheException $e) {
+            throw new InvalidArgumentException($e->getMessage(), $e->getCode(), $e);
+        }
+
+        return $item->isHit() ? $item->get() : $default;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function set($key, $value, $ttl = null)
+    {
+        try {
+            if (null !== $f = $this->createCacheItem) {
+                $item = $f($key, $value);
+            } else {
+                $item = $this->pool->getItem($key)->set($value);
+            }
+        } catch (SimpleCacheException $e) {
+            throw $e;
+        } catch (Psr6CacheException $e) {
+            throw new InvalidArgumentException($e->getMessage(), $e->getCode(), $e);
+        }
+        if (null !== $ttl) {
+            $item->expiresAfter($ttl);
+        }
+
+        return $this->pool->save($item);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function delete($key)
+    {
+        try {
+            return $this->pool->deleteItem($key);
+        } catch (SimpleCacheException $e) {
+            throw $e;
+        } catch (Psr6CacheException $e) {
+            throw new InvalidArgumentException($e->getMessage(), $e->getCode(), $e);
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function clear()
+    {
+        return $this->pool->clear();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getMultiple($keys, $default = null)
+    {
+        if ($keys instanceof \Traversable) {
+            $keys = iterator_to_array($keys, false);
+        } elseif (!is_array($keys)) {
+            throw new InvalidArgumentException(sprintf('Cache keys must be array or Traversable, "%s" given', is_object($keys) ? get_class($keys) : gettype($keys)));
+        }
+
+        try {
+            $items = $this->pool->getItems($keys);
+        } catch (SimpleCacheException $e) {
+            throw $e;
+        } catch (Psr6CacheException $e) {
+            throw new InvalidArgumentException($e->getMessage(), $e->getCode(), $e);
+        }
+        $values = array();
+
+        foreach ($items as $key => $item) {
+            $values[$key] = $item->isHit() ? $item->get() : $default;
+        }
+
+        return $values;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setMultiple($values, $ttl = null)
+    {
+        $valuesIsArray = is_array($values);
+        if (!$valuesIsArray && !$values instanceof \Traversable) {
+            throw new InvalidArgumentException(sprintf('Cache values must be array or Traversable, "%s" given', is_object($values) ? get_class($values) : gettype($values)));
+        }
+        $items = array();
+
+        try {
+            if (null !== $f = $this->createCacheItem) {
+                $valuesIsArray = false;
+                foreach ($values as $key => $value) {
+                    $items[$key] = $f($key, $value, true);
+                }
+            } elseif ($valuesIsArray) {
+                $items = array();
+                foreach ($values as $key => $value) {
+                    $items[] = (string) $key;
+                }
+                $items = $this->pool->getItems($items);
+            } else {
+                foreach ($values as $key => $value) {
+                    if (is_int($key)) {
+                        $key = (string) $key;
+                    }
+                    $items[$key] = $this->pool->getItem($key)->set($value);
+                }
+            }
+        } catch (SimpleCacheException $e) {
+            throw $e;
+        } catch (Psr6CacheException $e) {
+            throw new InvalidArgumentException($e->getMessage(), $e->getCode(), $e);
+        }
+        $ok = true;
+
+        foreach ($items as $key => $item) {
+            if ($valuesIsArray) {
+                $item->set($values[$key]);
+            }
+            if (null !== $ttl) {
+                $item->expiresAfter($ttl);
+            }
+            $ok = $this->pool->saveDeferred($item) && $ok;
+        }
+
+        return $this->pool->commit() && $ok;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function deleteMultiple($keys)
+    {
+        if ($keys instanceof \Traversable) {
+            $keys = iterator_to_array($keys, false);
+        } elseif (!is_array($keys)) {
+            throw new InvalidArgumentException(sprintf('Cache keys must be array or Traversable, "%s" given', is_object($keys) ? get_class($keys) : gettype($keys)));
+        }
+
+        try {
+            return $this->pool->deleteItems($keys);
+        } catch (SimpleCacheException $e) {
+            throw $e;
+        } catch (Psr6CacheException $e) {
+            throw new InvalidArgumentException($e->getMessage(), $e->getCode(), $e);
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function has($key)
+    {
+        try {
+            return $this->pool->hasItem($key);
+        } catch (SimpleCacheException $e) {
+            throw $e;
+        } catch (Psr6CacheException $e) {
+            throw new InvalidArgumentException($e->getMessage(), $e->getCode(), $e);
+        }
+    }
 }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Simple/RedisCache.php b/advancedcontentfilter/vendor/symfony/cache/Simple/RedisCache.php
index e0a76fd6..e82c0627 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Simple/RedisCache.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Simple/RedisCache.php
@@ -11,27 +11,19 @@
 
 namespace Symfony\Component\Cache\Simple;
 
-use Symfony\Component\Cache\Adapter\RedisAdapter;
-use Symfony\Component\Cache\Marshaller\MarshallerInterface;
-use Symfony\Component\Cache\Traits\RedisClusterProxy;
-use Symfony\Component\Cache\Traits\RedisProxy;
 use Symfony\Component\Cache\Traits\RedisTrait;
-use Symfony\Contracts\Cache\CacheInterface;
 
-@trigger_error(sprintf('The "%s" class is deprecated since Symfony 4.3, use "%s" and type-hint for "%s" instead.', RedisCache::class, RedisAdapter::class, CacheInterface::class), \E_USER_DEPRECATED);
-
-/**
- * @deprecated since Symfony 4.3, use RedisAdapter and type-hint for CacheInterface instead.
- */
 class RedisCache extends AbstractCache
 {
     use RedisTrait;
 
     /**
-     * @param \Redis|\RedisArray|\RedisCluster|\Predis\ClientInterface|RedisProxy|RedisClusterProxy $redis
+     * @param \Redis|\RedisArray|\RedisCluster|\Predis\Client $redisClient
+     * @param string                                          $namespace
+     * @param int                                             $defaultLifetime
      */
-    public function __construct($redis, string $namespace = '', int $defaultLifetime = 0, MarshallerInterface $marshaller = null)
+    public function __construct($redisClient, $namespace = '', $defaultLifetime = 0)
     {
-        $this->init($redis, $namespace, $defaultLifetime, $marshaller);
+        $this->init($redisClient, $namespace, $defaultLifetime);
     }
 }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Simple/TraceableCache.php b/advancedcontentfilter/vendor/symfony/cache/Simple/TraceableCache.php
index 0dae813e..756403bf 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Simple/TraceableCache.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Simple/TraceableCache.php
@@ -11,25 +11,22 @@
 
 namespace Symfony\Component\Cache\Simple;
 
-use Psr\SimpleCache\CacheInterface as Psr16CacheInterface;
-use Symfony\Component\Cache\Adapter\TraceableAdapter;
+use Psr\SimpleCache\CacheInterface;
 use Symfony\Component\Cache\PruneableInterface;
 use Symfony\Component\Cache\ResettableInterface;
-use Symfony\Contracts\Cache\CacheInterface;
-use Symfony\Contracts\Service\ResetInterface;
-
-@trigger_error(sprintf('The "%s" class is deprecated since Symfony 4.3, use "%s" and type-hint for "%s" instead.', TraceableCache::class, TraceableAdapter::class, CacheInterface::class), \E_USER_DEPRECATED);
 
 /**
- * @deprecated since Symfony 4.3, use TraceableAdapter and type-hint for CacheInterface instead.
+ * An adapter that collects data about all cache calls.
+ *
+ * @author Nicolas Grekas <p@tchwork.com>
  */
-class TraceableCache implements Psr16CacheInterface, PruneableInterface, ResettableInterface
+class TraceableCache implements CacheInterface, PruneableInterface, ResettableInterface
 {
     private $pool;
     private $miss;
-    private $calls = [];
+    private $calls = array();
 
-    public function __construct(Psr16CacheInterface $pool)
+    public function __construct(CacheInterface $pool)
     {
         $this->pool = $pool;
         $this->miss = new \stdClass();
@@ -40,7 +37,7 @@ class TraceableCache implements Psr16CacheInterface, PruneableInterface, Resetta
      */
     public function get($key, $default = null)
     {
-        $miss = null !== $default && \is_object($default) ? $default : $this->miss;
+        $miss = null !== $default && is_object($default) ? $default : $this->miss;
         $event = $this->start(__FUNCTION__);
         try {
             $value = $this->pool->get($key, $miss);
@@ -59,8 +56,6 @@ class TraceableCache implements Psr16CacheInterface, PruneableInterface, Resetta
 
     /**
      * {@inheritdoc}
-     *
-     * @return bool
      */
     public function has($key)
     {
@@ -74,8 +69,6 @@ class TraceableCache implements Psr16CacheInterface, PruneableInterface, Resetta
 
     /**
      * {@inheritdoc}
-     *
-     * @return bool
      */
     public function delete($key)
     {
@@ -89,8 +82,6 @@ class TraceableCache implements Psr16CacheInterface, PruneableInterface, Resetta
 
     /**
      * {@inheritdoc}
-     *
-     * @return bool
      */
     public function set($key, $value, $ttl = null)
     {
@@ -104,13 +95,11 @@ class TraceableCache implements Psr16CacheInterface, PruneableInterface, Resetta
 
     /**
      * {@inheritdoc}
-     *
-     * @return bool
      */
     public function setMultiple($values, $ttl = null)
     {
         $event = $this->start(__FUNCTION__);
-        $event->result['keys'] = [];
+        $event->result['keys'] = array();
 
         if ($values instanceof \Traversable) {
             $values = function () use ($values, $event) {
@@ -120,7 +109,7 @@ class TraceableCache implements Psr16CacheInterface, PruneableInterface, Resetta
                 }
             };
             $values = $values();
-        } elseif (\is_array($values)) {
+        } elseif (is_array($values)) {
             $event->result['keys'] = array_keys($values);
         }
 
@@ -133,12 +122,10 @@ class TraceableCache implements Psr16CacheInterface, PruneableInterface, Resetta
 
     /**
      * {@inheritdoc}
-     *
-     * @return iterable
      */
     public function getMultiple($keys, $default = null)
     {
-        $miss = null !== $default && \is_object($default) ? $default : $this->miss;
+        $miss = null !== $default && is_object($default) ? $default : $this->miss;
         $event = $this->start(__FUNCTION__);
         try {
             $result = $this->pool->getMultiple($keys, $miss);
@@ -146,7 +133,7 @@ class TraceableCache implements Psr16CacheInterface, PruneableInterface, Resetta
             $event->end = microtime(true);
         }
         $f = function () use ($result, $event, $miss, $default) {
-            $event->result = [];
+            $event->result = array();
             foreach ($result as $key => $value) {
                 if ($event->result[$key] = $miss !== $value) {
                     ++$event->hits;
@@ -163,8 +150,6 @@ class TraceableCache implements Psr16CacheInterface, PruneableInterface, Resetta
 
     /**
      * {@inheritdoc}
-     *
-     * @return bool
      */
     public function clear()
     {
@@ -178,8 +163,6 @@ class TraceableCache implements Psr16CacheInterface, PruneableInterface, Resetta
 
     /**
      * {@inheritdoc}
-     *
-     * @return bool
      */
     public function deleteMultiple($keys)
     {
@@ -217,7 +200,7 @@ class TraceableCache implements Psr16CacheInterface, PruneableInterface, Resetta
      */
     public function reset()
     {
-        if (!$this->pool instanceof ResetInterface) {
+        if (!$this->pool instanceof ResettableInterface) {
             return;
         }
         $event = $this->start(__FUNCTION__);
@@ -233,11 +216,11 @@ class TraceableCache implements Psr16CacheInterface, PruneableInterface, Resetta
         try {
             return $this->calls;
         } finally {
-            $this->calls = [];
+            $this->calls = array();
         }
     }
 
-    private function start(string $name): TraceableCacheEvent
+    private function start($name)
     {
         $this->calls[] = $event = new TraceableCacheEvent();
         $event->name = $name;
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/AbstractRedisAdapterTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/AbstractRedisAdapterTest.php
index 0e8ed001..d9353821 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/AbstractRedisAdapterTest.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/AbstractRedisAdapterTest.php
@@ -15,11 +15,11 @@ use Symfony\Component\Cache\Adapter\RedisAdapter;
 
 abstract class AbstractRedisAdapterTest extends AdapterTestCase
 {
-    protected $skippedTests = [
+    protected $skippedTests = array(
         'testExpiration' => 'Testing expiration slows down the test suite',
         'testHasItemReturnsFalseWhenDeferredItemIsExpired' => 'Testing expiration slows down the test suite',
         'testDefaultLifeTime' => 'Testing expiration slows down the test suite',
-    ];
+    );
 
     protected static $redis;
 
@@ -28,15 +28,14 @@ abstract class AbstractRedisAdapterTest extends AdapterTestCase
         return new RedisAdapter(self::$redis, str_replace('\\', '.', __CLASS__), $defaultLifetime);
     }
 
-    public static function setUpBeforeClass()
+    public static function setupBeforeClass()
     {
-        if (!\extension_loaded('redis')) {
+        if (!extension_loaded('redis')) {
             self::markTestSkipped('Extension redis required.');
         }
-        try {
-            (new \Redis())->connect(getenv('REDIS_HOST'));
-        } catch (\Exception $e) {
-            self::markTestSkipped($e->getMessage());
+        if (!@((new \Redis())->connect(getenv('REDIS_HOST')))) {
+            $e = error_get_last();
+            self::markTestSkipped($e['message']);
         }
     }
 
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/AdapterTestCase.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/AdapterTestCase.php
index 5758a286..a0b74b47 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/AdapterTestCase.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/AdapterTestCase.php
@@ -21,11 +21,11 @@ abstract class AdapterTestCase extends CachePoolTest
     {
         parent::setUp();
 
-        if (!\array_key_exists('testDeferredSaveWithoutCommit', $this->skippedTests) && \defined('HHVM_VERSION')) {
+        if (!array_key_exists('testDeferredSaveWithoutCommit', $this->skippedTests) && defined('HHVM_VERSION')) {
             $this->skippedTests['testDeferredSaveWithoutCommit'] = 'Destructors are called late on HHVM.';
         }
 
-        if (!\array_key_exists('testPrune', $this->skippedTests) && !$this->createCachePool() instanceof PruneableInterface) {
+        if (!array_key_exists('testPrune', $this->skippedTests) && !$this->createCachePool() instanceof PruneableInterface) {
             $this->skippedTests['testPrune'] = 'Not a pruneable cache pool.';
         }
     }
@@ -85,11 +85,11 @@ abstract class AdapterTestCase extends CachePoolTest
         $item = $cache->getItem('foo');
         $this->assertFalse($item->isHit());
 
-        foreach ($cache->getItems(['foo']) as $item) {
+        foreach ($cache->getItems(array('foo')) as $item) {
         }
         $cache->save($item->set(new NotUnserializable()));
 
-        foreach ($cache->getItems(['foo']) as $item) {
+        foreach ($cache->getItems(array('foo')) as $item) {
         }
         $this->assertFalse($item->isHit());
     }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/ApcuAdapterTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/ApcuAdapterTest.php
index f55a1b9b..72df12e4 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/ApcuAdapterTest.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/ApcuAdapterTest.php
@@ -16,23 +16,23 @@ use Symfony\Component\Cache\Adapter\ApcuAdapter;
 
 class ApcuAdapterTest extends AdapterTestCase
 {
-    protected $skippedTests = [
+    protected $skippedTests = array(
         'testExpiration' => 'Testing expiration slows down the test suite',
         'testHasItemReturnsFalseWhenDeferredItemIsExpired' => 'Testing expiration slows down the test suite',
         'testDefaultLifeTime' => 'Testing expiration slows down the test suite',
-    ];
+    );
 
     public function createCachePool($defaultLifetime = 0)
     {
-        if (!\function_exists('apcu_fetch') || !filter_var(ini_get('apc.enabled'), \FILTER_VALIDATE_BOOLEAN)) {
+        if (!function_exists('apcu_fetch') || !ini_get('apc.enabled')) {
             $this->markTestSkipped('APCu extension is required.');
         }
-        if ('cli' === \PHP_SAPI && !filter_var(ini_get('apc.enable_cli'), \FILTER_VALIDATE_BOOLEAN)) {
+        if ('cli' === PHP_SAPI && !ini_get('apc.enable_cli')) {
             if ('testWithCliSapi' !== $this->getName()) {
                 $this->markTestSkipped('apc.enable_cli=1 is required.');
             }
         }
-        if ('\\' === \DIRECTORY_SEPARATOR) {
+        if ('\\' === DIRECTORY_SEPARATOR) {
             $this->markTestSkipped('Fails transiently on Windows.');
         }
 
@@ -54,7 +54,7 @@ class ApcuAdapterTest extends AdapterTestCase
 
     public function testVersion()
     {
-        $namespace = str_replace('\\', '.', static::class);
+        $namespace = str_replace('\\', '.', get_class($this));
 
         $pool1 = new ApcuAdapter($namespace, 0, 'p1');
 
@@ -79,7 +79,7 @@ class ApcuAdapterTest extends AdapterTestCase
 
     public function testNamespace()
     {
-        $namespace = str_replace('\\', '.', static::class);
+        $namespace = str_replace('\\', '.', get_class($this));
 
         $pool1 = new ApcuAdapter($namespace.'_1', 0, 'p1');
 
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/ArrayAdapterTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/ArrayAdapterTest.php
index e6adc9d0..725d7901 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/ArrayAdapterTest.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/ArrayAdapterTest.php
@@ -18,10 +18,10 @@ use Symfony\Component\Cache\Adapter\ArrayAdapter;
  */
 class ArrayAdapterTest extends AdapterTestCase
 {
-    protected $skippedTests = [
+    protected $skippedTests = array(
         'testDeferredSaveWithoutCommit' => 'Assumes a shared cache which ArrayAdapter is not.',
         'testSaveWithoutExpire' => 'Assumes a shared cache which ArrayAdapter is not.',
-    ];
+    );
 
     public function createCachePool($defaultLifetime = 0)
     {
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/ChainAdapterTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/ChainAdapterTest.php
index be811d6f..293a90cc 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/ChainAdapterTest.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/ChainAdapterTest.php
@@ -11,11 +11,10 @@
 
 namespace Symfony\Component\Cache\Tests\Adapter;
 
-use PHPUnit\Framework\MockObject\MockObject;
 use Symfony\Component\Cache\Adapter\AdapterInterface;
+use Symfony\Component\Cache\Adapter\FilesystemAdapter;
 use Symfony\Component\Cache\Adapter\ArrayAdapter;
 use Symfony\Component\Cache\Adapter\ChainAdapter;
-use Symfony\Component\Cache\Adapter\FilesystemAdapter;
 use Symfony\Component\Cache\PruneableInterface;
 use Symfony\Component\Cache\Tests\Fixtures\ExternalAdapter;
 
@@ -27,21 +26,25 @@ class ChainAdapterTest extends AdapterTestCase
 {
     public function createCachePool($defaultLifetime = 0)
     {
-        return new ChainAdapter([new ArrayAdapter($defaultLifetime), new ExternalAdapter($defaultLifetime), new FilesystemAdapter('', $defaultLifetime)], $defaultLifetime);
+        return new ChainAdapter(array(new ArrayAdapter($defaultLifetime), new ExternalAdapter(), new FilesystemAdapter('', $defaultLifetime)), $defaultLifetime);
     }
 
+    /**
+     * @expectedException \Symfony\Component\Cache\Exception\InvalidArgumentException
+     * @expectedExceptionMessage At least one adapter must be specified.
+     */
     public function testEmptyAdaptersException()
     {
-        $this->expectException('Symfony\Component\Cache\Exception\InvalidArgumentException');
-        $this->expectExceptionMessage('At least one adapter must be specified.');
-        new ChainAdapter([]);
+        new ChainAdapter(array());
     }
 
+    /**
+     * @expectedException \Symfony\Component\Cache\Exception\InvalidArgumentException
+     * @expectedExceptionMessage The class "stdClass" does not implement
+     */
     public function testInvalidAdapterException()
     {
-        $this->expectException('Symfony\Component\Cache\Exception\InvalidArgumentException');
-        $this->expectExceptionMessage('The class "stdClass" does not implement');
-        new ChainAdapter([new \stdClass()]);
+        new ChainAdapter(array(new \stdClass()));
     }
 
     public function testPrune()
@@ -50,141 +53,23 @@ class ChainAdapterTest extends AdapterTestCase
             $this->markTestSkipped($this->skippedTests[__FUNCTION__]);
         }
 
-        $cache = new ChainAdapter([
+        $cache = new ChainAdapter(array(
             $this->getPruneableMock(),
             $this->getNonPruneableMock(),
             $this->getPruneableMock(),
-        ]);
+        ));
         $this->assertTrue($cache->prune());
 
-        $cache = new ChainAdapter([
+        $cache = new ChainAdapter(array(
             $this->getPruneableMock(),
             $this->getFailingPruneableMock(),
             $this->getPruneableMock(),
-        ]);
+        ));
         $this->assertFalse($cache->prune());
     }
 
-    public function testMultipleCachesExpirationWhenCommonTtlIsNotSet()
-    {
-        if (isset($this->skippedTests[__FUNCTION__])) {
-            $this->markTestSkipped($this->skippedTests[__FUNCTION__]);
-        }
-
-        $adapter1 = new ArrayAdapter(4);
-        $adapter2 = new ArrayAdapter(2);
-
-        $cache = new ChainAdapter([$adapter1, $adapter2]);
-
-        $cache->save($cache->getItem('key')->set('value'));
-
-        $item = $adapter1->getItem('key');
-        $this->assertTrue($item->isHit());
-        $this->assertEquals('value', $item->get());
-
-        $item = $adapter2->getItem('key');
-        $this->assertTrue($item->isHit());
-        $this->assertEquals('value', $item->get());
-
-        sleep(2);
-
-        $item = $adapter1->getItem('key');
-        $this->assertTrue($item->isHit());
-        $this->assertEquals('value', $item->get());
-
-        $item = $adapter2->getItem('key');
-        $this->assertFalse($item->isHit());
-
-        sleep(2);
-
-        $item = $adapter1->getItem('key');
-        $this->assertFalse($item->isHit());
-
-        $adapter2->save($adapter2->getItem('key1')->set('value1'));
-
-        $item = $cache->getItem('key1');
-        $this->assertTrue($item->isHit());
-        $this->assertEquals('value1', $item->get());
-
-        sleep(2);
-
-        $item = $adapter1->getItem('key1');
-        $this->assertTrue($item->isHit());
-        $this->assertEquals('value1', $item->get());
-
-        $item = $adapter2->getItem('key1');
-        $this->assertFalse($item->isHit());
-
-        sleep(2);
-
-        $item = $adapter1->getItem('key1');
-        $this->assertFalse($item->isHit());
-    }
-
-    public function testMultipleCachesExpirationWhenCommonTtlIsSet()
-    {
-        if (isset($this->skippedTests[__FUNCTION__])) {
-            $this->markTestSkipped($this->skippedTests[__FUNCTION__]);
-        }
-
-        $adapter1 = new ArrayAdapter(4);
-        $adapter2 = new ArrayAdapter(2);
-
-        $cache = new ChainAdapter([$adapter1, $adapter2], 6);
-
-        $cache->save($cache->getItem('key')->set('value'));
-
-        $item = $adapter1->getItem('key');
-        $this->assertTrue($item->isHit());
-        $this->assertEquals('value', $item->get());
-
-        $item = $adapter2->getItem('key');
-        $this->assertTrue($item->isHit());
-        $this->assertEquals('value', $item->get());
-
-        sleep(2);
-
-        $item = $adapter1->getItem('key');
-        $this->assertTrue($item->isHit());
-        $this->assertEquals('value', $item->get());
-
-        $item = $adapter2->getItem('key');
-        $this->assertFalse($item->isHit());
-
-        sleep(2);
-
-        $item = $adapter1->getItem('key');
-        $this->assertFalse($item->isHit());
-
-        $adapter2->save($adapter2->getItem('key1')->set('value1'));
-
-        $item = $cache->getItem('key1');
-        $this->assertTrue($item->isHit());
-        $this->assertEquals('value1', $item->get());
-
-        sleep(2);
-
-        $item = $adapter1->getItem('key1');
-        $this->assertTrue($item->isHit());
-        $this->assertEquals('value1', $item->get());
-
-        $item = $adapter2->getItem('key1');
-        $this->assertFalse($item->isHit());
-
-        sleep(2);
-
-        $item = $adapter1->getItem('key1');
-        $this->assertTrue($item->isHit());
-        $this->assertEquals('value1', $item->get());
-
-        sleep(2);
-
-        $item = $adapter1->getItem('key1');
-        $this->assertFalse($item->isHit());
-    }
-
     /**
-     * @return MockObject|PruneableCacheInterface
+     * @return \PHPUnit_Framework_MockObject_MockObject|PruneableCacheInterface
      */
     private function getPruneableMock()
     {
@@ -195,13 +80,13 @@ class ChainAdapterTest extends AdapterTestCase
         $pruneable
             ->expects($this->atLeastOnce())
             ->method('prune')
-            ->willReturn(true);
+            ->will($this->returnValue(true));
 
         return $pruneable;
     }
 
     /**
-     * @return MockObject|PruneableCacheInterface
+     * @return \PHPUnit_Framework_MockObject_MockObject|PruneableCacheInterface
      */
     private function getFailingPruneableMock()
     {
@@ -212,13 +97,13 @@ class ChainAdapterTest extends AdapterTestCase
         $pruneable
             ->expects($this->atLeastOnce())
             ->method('prune')
-            ->willReturn(false);
+            ->will($this->returnValue(false));
 
         return $pruneable;
     }
 
     /**
-     * @return MockObject|AdapterInterface
+     * @return \PHPUnit_Framework_MockObject_MockObject|AdapterInterface
      */
     private function getNonPruneableMock()
     {
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/DoctrineAdapterTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/DoctrineAdapterTest.php
index 8f520cb5..8d4dfe28 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/DoctrineAdapterTest.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/DoctrineAdapterTest.php
@@ -19,11 +19,11 @@ use Symfony\Component\Cache\Tests\Fixtures\ArrayCache;
  */
 class DoctrineAdapterTest extends AdapterTestCase
 {
-    protected $skippedTests = [
+    protected $skippedTests = array(
         'testDeferredSaveWithoutCommit' => 'Assumes a shared cache which ArrayCache is not.',
         'testSaveWithoutExpire' => 'Assumes a shared cache which ArrayCache is not.',
         'testNotUnserializable' => 'ArrayCache does not use serialize/unserialize',
-    ];
+    );
 
     public function createCachePool($defaultLifetime = 0)
     {
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/FilesystemAdapterTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/FilesystemAdapterTest.php
index fa830682..b6757514 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/FilesystemAdapterTest.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/FilesystemAdapterTest.php
@@ -34,7 +34,7 @@ class FilesystemAdapterTest extends AdapterTestCase
         if (!file_exists($dir)) {
             return;
         }
-        if (!$dir || 0 !== strpos(\dirname($dir), sys_get_temp_dir())) {
+        if (!$dir || 0 !== strpos(dirname($dir), sys_get_temp_dir())) {
             throw new \Exception(__METHOD__."() operates only on subdirs of system's temp dir");
         }
         $children = new \RecursiveIteratorIterator(
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/MaxIdLengthAdapterTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/MaxIdLengthAdapterTest.php
index 536e2c2d..cf2384c5 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/MaxIdLengthAdapterTest.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/MaxIdLengthAdapterTest.php
@@ -19,59 +19,29 @@ class MaxIdLengthAdapterTest extends TestCase
     public function testLongKey()
     {
         $cache = $this->getMockBuilder(MaxIdLengthAdapter::class)
-            ->setConstructorArgs([str_repeat('-', 10)])
-            ->setMethods(['doHave', 'doFetch', 'doDelete', 'doSave', 'doClear'])
+            ->setConstructorArgs(array(str_repeat('-', 10)))
+            ->setMethods(array('doHave', 'doFetch', 'doDelete', 'doSave', 'doClear'))
             ->getMock();
 
         $cache->expects($this->exactly(2))
             ->method('doHave')
             ->withConsecutive(
-                [$this->equalTo('----------:0GTYWa9n4ed8vqNlOT2iEr:')],
-                [$this->equalTo('----------:---------------------------------------')]
+                array($this->equalTo('----------:0GTYWa9n4ed8vqNlOT2iEr:')),
+                array($this->equalTo('----------:---------------------------------------'))
             );
 
         $cache->hasItem(str_repeat('-', 40));
         $cache->hasItem(str_repeat('-', 39));
     }
 
-    public function testLongKeyVersioning()
-    {
-        $cache = $this->getMockBuilder(MaxIdLengthAdapter::class)
-            ->setConstructorArgs([str_repeat('-', 26)])
-            ->getMock();
-
-        $cache
-            ->method('doFetch')
-            ->willReturn(['2:']);
-
-        $reflectionClass = new \ReflectionClass(AbstractAdapter::class);
-
-        $reflectionMethod = $reflectionClass->getMethod('getId');
-        $reflectionMethod->setAccessible(true);
-
-        // No versioning enabled
-        $this->assertEquals('--------------------------:------------', $reflectionMethod->invokeArgs($cache, [str_repeat('-', 12)]));
-        $this->assertLessThanOrEqual(50, \strlen($reflectionMethod->invokeArgs($cache, [str_repeat('-', 12)])));
-        $this->assertLessThanOrEqual(50, \strlen($reflectionMethod->invokeArgs($cache, [str_repeat('-', 23)])));
-        $this->assertLessThanOrEqual(50, \strlen($reflectionMethod->invokeArgs($cache, [str_repeat('-', 40)])));
-
-        $reflectionProperty = $reflectionClass->getProperty('versioningIsEnabled');
-        $reflectionProperty->setAccessible(true);
-        $reflectionProperty->setValue($cache, true);
-
-        // Versioning enabled
-        $this->assertEquals('--------------------------:2:------------', $reflectionMethod->invokeArgs($cache, [str_repeat('-', 12)]));
-        $this->assertLessThanOrEqual(50, \strlen($reflectionMethod->invokeArgs($cache, [str_repeat('-', 12)])));
-        $this->assertLessThanOrEqual(50, \strlen($reflectionMethod->invokeArgs($cache, [str_repeat('-', 23)])));
-        $this->assertLessThanOrEqual(50, \strlen($reflectionMethod->invokeArgs($cache, [str_repeat('-', 40)])));
-    }
-
+    /**
+     * @expectedException \Symfony\Component\Cache\Exception\InvalidArgumentException
+     * @expectedExceptionMessage Namespace must be 26 chars max, 40 given ("----------------------------------------")
+     */
     public function testTooLongNamespace()
     {
-        $this->expectException('Symfony\Component\Cache\Exception\InvalidArgumentException');
-        $this->expectExceptionMessage('Namespace must be 26 chars max, 40 given ("----------------------------------------")');
-        $this->getMockBuilder(MaxIdLengthAdapter::class)
-            ->setConstructorArgs([str_repeat('-', 40)])
+        $cache = $this->getMockBuilder(MaxIdLengthAdapter::class)
+            ->setConstructorArgs(array(str_repeat('-', 40)))
             ->getMock();
     }
 }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/MemcachedAdapterTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/MemcachedAdapterTest.php
index a9a397dd..76e06080 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/MemcachedAdapterTest.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/MemcachedAdapterTest.php
@@ -16,19 +16,19 @@ use Symfony\Component\Cache\Adapter\MemcachedAdapter;
 
 class MemcachedAdapterTest extends AdapterTestCase
 {
-    protected $skippedTests = [
+    protected $skippedTests = array(
         'testHasItemReturnsFalseWhenDeferredItemIsExpired' => 'Testing expiration slows down the test suite',
         'testDefaultLifeTime' => 'Testing expiration slows down the test suite',
-    ];
+    );
 
     protected static $client;
 
-    public static function setUpBeforeClass()
+    public static function setupBeforeClass()
     {
         if (!MemcachedAdapter::isSupported()) {
             self::markTestSkipped('Extension memcached >=2.2.0 required.');
         }
-        self::$client = AbstractAdapter::createConnection('memcached://'.getenv('MEMCACHED_HOST'), ['binary_protocol' => false]);
+        self::$client = AbstractAdapter::createConnection('memcached://'.getenv('MEMCACHED_HOST'), array('binary_protocol' => false));
         self::$client->get('foo');
         $code = self::$client->getResultCode();
 
@@ -46,13 +46,13 @@ class MemcachedAdapterTest extends AdapterTestCase
 
     public function testOptions()
     {
-        $client = MemcachedAdapter::createConnection([], [
+        $client = MemcachedAdapter::createConnection(array(), array(
             'libketama_compatible' => false,
             'distribution' => 'modula',
             'compression' => true,
             'serializer' => 'php',
             'hash' => 'md5',
-        ]);
+        ));
 
         $this->assertSame(\Memcached::SERIALIZER_PHP, $client->getOption(\Memcached::OPT_SERIALIZER));
         $this->assertSame(\Memcached::HASH_MD5, $client->getOption(\Memcached::OPT_HASH));
@@ -63,51 +63,46 @@ class MemcachedAdapterTest extends AdapterTestCase
 
     /**
      * @dataProvider provideBadOptions
+     * @expectedException \ErrorException
+     * @expectedExceptionMessage constant(): Couldn't find constant Memcached::
      */
     public function testBadOptions($name, $value)
     {
-        if (\PHP_VERSION_ID < 80000) {
-            $this->expectException('ErrorException');
-            $this->expectExceptionMessage('constant(): Couldn\'t find constant Memcached::');
-        } else {
-            $this->expectException('Error');
-            $this->expectExceptionMessage('Undefined constant Memcached::');
-        }
-
-        MemcachedAdapter::createConnection([], [$name => $value]);
+        MemcachedAdapter::createConnection(array(), array($name => $value));
     }
 
     public function provideBadOptions()
     {
-        return [
-            ['foo', 'bar'],
-            ['hash', 'zyx'],
-            ['serializer', 'zyx'],
-            ['distribution', 'zyx'],
-        ];
+        return array(
+            array('foo', 'bar'),
+            array('hash', 'zyx'),
+            array('serializer', 'zyx'),
+            array('distribution', 'zyx'),
+        );
     }
 
     public function testDefaultOptions()
     {
         $this->assertTrue(MemcachedAdapter::isSupported());
 
-        $client = MemcachedAdapter::createConnection([]);
+        $client = MemcachedAdapter::createConnection(array());
 
         $this->assertTrue($client->getOption(\Memcached::OPT_COMPRESSION));
         $this->assertSame(1, $client->getOption(\Memcached::OPT_BINARY_PROTOCOL));
-        $this->assertSame(1, $client->getOption(\Memcached::OPT_TCP_NODELAY));
         $this->assertSame(1, $client->getOption(\Memcached::OPT_LIBKETAMA_COMPATIBLE));
     }
 
+    /**
+     * @expectedException \Symfony\Component\Cache\Exception\CacheException
+     * @expectedExceptionMessage MemcachedAdapter: "serializer" option must be "php" or "igbinary".
+     */
     public function testOptionSerializer()
     {
-        $this->expectException('Symfony\Component\Cache\Exception\CacheException');
-        $this->expectExceptionMessage('MemcachedAdapter: "serializer" option must be "php" or "igbinary".');
         if (!\Memcached::HAVE_JSON) {
             $this->markTestSkipped('Memcached::HAVE_JSON required');
         }
 
-        new MemcachedAdapter(MemcachedAdapter::createConnection([], ['serializer' => 'json']));
+        new MemcachedAdapter(MemcachedAdapter::createConnection(array(), array('serializer' => 'json')));
     }
 
     /**
@@ -116,54 +111,54 @@ class MemcachedAdapterTest extends AdapterTestCase
     public function testServersSetting($dsn, $host, $port)
     {
         $client1 = MemcachedAdapter::createConnection($dsn);
-        $client2 = MemcachedAdapter::createConnection([$dsn]);
-        $client3 = MemcachedAdapter::createConnection([[$host, $port]]);
-        $expect = [
+        $client2 = MemcachedAdapter::createConnection(array($dsn));
+        $client3 = MemcachedAdapter::createConnection(array(array($host, $port)));
+        $expect = array(
             'host' => $host,
             'port' => $port,
-        ];
+        );
 
-        $f = function ($s) { return ['host' => $s['host'], 'port' => $s['port']]; };
-        $this->assertSame([$expect], array_map($f, $client1->getServerList()));
-        $this->assertSame([$expect], array_map($f, $client2->getServerList()));
-        $this->assertSame([$expect], array_map($f, $client3->getServerList()));
+        $f = function ($s) { return array('host' => $s['host'], 'port' => $s['port']); };
+        $this->assertSame(array($expect), array_map($f, $client1->getServerList()));
+        $this->assertSame(array($expect), array_map($f, $client2->getServerList()));
+        $this->assertSame(array($expect), array_map($f, $client3->getServerList()));
     }
 
     public function provideServersSetting()
     {
-        yield [
+        yield array(
             'memcached://127.0.0.1/50',
             '127.0.0.1',
             11211,
-        ];
-        yield [
+        );
+        yield array(
             'memcached://localhost:11222?weight=25',
             'localhost',
             11222,
-        ];
-        if (filter_var(ini_get('memcached.use_sasl'), \FILTER_VALIDATE_BOOLEAN)) {
-            yield [
+        );
+        if (ini_get('memcached.use_sasl')) {
+            yield array(
                 'memcached://user:password@127.0.0.1?weight=50',
                 '127.0.0.1',
                 11211,
-            ];
+            );
         }
-        yield [
+        yield array(
             'memcached:///var/run/memcached.sock?weight=25',
             '/var/run/memcached.sock',
             0,
-        ];
-        yield [
+        );
+        yield array(
             'memcached:///var/local/run/memcached.socket?weight=25',
             '/var/local/run/memcached.socket',
             0,
-        ];
-        if (filter_var(ini_get('memcached.use_sasl'), \FILTER_VALIDATE_BOOLEAN)) {
-            yield [
+        );
+        if (ini_get('memcached.use_sasl')) {
+            yield array(
                 'memcached://user:password@/var/local/run/memcached.socket?weight=25',
                 '/var/local/run/memcached.socket',
                 0,
-            ];
+            );
         }
     }
 
@@ -185,20 +180,15 @@ class MemcachedAdapterTest extends AdapterTestCase
             self::markTestSkipped('Extension memcached required.');
         }
 
-        yield [
+        yield array(
             'memcached://localhost:11222?retry_timeout=10',
-            [\Memcached::OPT_RETRY_TIMEOUT => 8],
-            [\Memcached::OPT_RETRY_TIMEOUT => 10],
-        ];
-        yield [
+            array(\Memcached::OPT_RETRY_TIMEOUT => 8),
+            array(\Memcached::OPT_RETRY_TIMEOUT => 10),
+        );
+        yield array(
             'memcached://localhost:11222?socket_recv_size=1&socket_send_size=2',
-            [\Memcached::OPT_RETRY_TIMEOUT => 8],
-            [\Memcached::OPT_SOCKET_RECV_SIZE => 1, \Memcached::OPT_SOCKET_SEND_SIZE => 2, \Memcached::OPT_RETRY_TIMEOUT => 8],
-        ];
-    }
-
-    public function testClear()
-    {
-        $this->assertTrue($this->createCachePool()->clear());
+            array(\Memcached::OPT_RETRY_TIMEOUT => 8),
+            array(\Memcached::OPT_SOCKET_RECV_SIZE => 1, \Memcached::OPT_SOCKET_SEND_SIZE => 2, \Memcached::OPT_RETRY_TIMEOUT => 8),
+        );
     }
 }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/NullAdapterTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/NullAdapterTest.php
index b771fa0e..73e5cad5 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/NullAdapterTest.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/NullAdapterTest.php
@@ -43,7 +43,7 @@ class NullAdapterTest extends TestCase
     {
         $adapter = $this->createCachePool();
 
-        $keys = ['foo', 'bar', 'baz', 'biz'];
+        $keys = array('foo', 'bar', 'baz', 'biz');
 
         /** @var CacheItemInterface[] $items */
         $items = $adapter->getItems($keys);
@@ -89,7 +89,7 @@ class NullAdapterTest extends TestCase
 
     public function testDeleteItems()
     {
-        $this->assertTrue($this->createCachePool()->deleteItems(['key', 'foo', 'bar']));
+        $this->assertTrue($this->createCachePool()->deleteItems(array('key', 'foo', 'bar')));
     }
 
     public function testSave()
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/PdoAdapterTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/PdoAdapterTest.php
index dd2a9118..24e3f9bb 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/PdoAdapterTest.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/PdoAdapterTest.php
@@ -23,9 +23,9 @@ class PdoAdapterTest extends AdapterTestCase
 
     protected static $dbFile;
 
-    public static function setUpBeforeClass()
+    public static function setupBeforeClass()
     {
-        if (!\extension_loaded('pdo_sqlite')) {
+        if (!extension_loaded('pdo_sqlite')) {
             self::markTestSkipped('Extension pdo_sqlite required.');
         }
 
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/PdoDbalAdapterTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/PdoDbalAdapterTest.php
index aa53958c..1e8c6155 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/PdoDbalAdapterTest.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/PdoDbalAdapterTest.php
@@ -24,15 +24,15 @@ class PdoDbalAdapterTest extends AdapterTestCase
 
     protected static $dbFile;
 
-    public static function setUpBeforeClass()
+    public static function setupBeforeClass()
     {
-        if (!\extension_loaded('pdo_sqlite')) {
+        if (!extension_loaded('pdo_sqlite')) {
             self::markTestSkipped('Extension pdo_sqlite required.');
         }
 
         self::$dbFile = tempnam(sys_get_temp_dir(), 'sf_sqlite_cache');
 
-        $pool = new PdoAdapter(DriverManager::getConnection(['driver' => 'pdo_sqlite', 'path' => self::$dbFile]));
+        $pool = new PdoAdapter(DriverManager::getConnection(array('driver' => 'pdo_sqlite', 'path' => self::$dbFile)));
         $pool->createTable();
     }
 
@@ -43,6 +43,6 @@ class PdoDbalAdapterTest extends AdapterTestCase
 
     public function createCachePool($defaultLifetime = 0)
     {
-        return new PdoAdapter(DriverManager::getConnection(['driver' => 'pdo_sqlite', 'path' => self::$dbFile]), '', $defaultLifetime);
+        return new PdoAdapter(DriverManager::getConnection(array('driver' => 'pdo_sqlite', 'path' => self::$dbFile)), '', $defaultLifetime);
     }
 }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/PhpArrayAdapterTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/PhpArrayAdapterTest.php
index f88a7187..14b61263 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/PhpArrayAdapterTest.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/PhpArrayAdapterTest.php
@@ -20,7 +20,7 @@ use Symfony\Component\Cache\Adapter\PhpArrayAdapter;
  */
 class PhpArrayAdapterTest extends AdapterTestCase
 {
-    protected $skippedTests = [
+    protected $skippedTests = array(
         'testBasicUsage' => 'PhpArrayAdapter is read-only.',
         'testBasicUsageWithLongKey' => 'PhpArrayAdapter is read-only.',
         'testClear' => 'PhpArrayAdapter is read-only.',
@@ -51,19 +51,17 @@ class PhpArrayAdapterTest extends AdapterTestCase
 
         'testDefaultLifeTime' => 'PhpArrayAdapter does not allow configuring a default lifetime.',
         'testPrune' => 'PhpArrayAdapter just proxies',
-    ];
+    );
 
     protected static $file;
 
-    public static function setUpBeforeClass()
+    public static function setupBeforeClass()
     {
         self::$file = sys_get_temp_dir().'/symfony-cache/php-array-adapter-test.php';
     }
 
     protected function tearDown()
     {
-        $this->createCachePool()->clear();
-
         if (file_exists(sys_get_temp_dir().'/symfony-cache')) {
             FilesystemAdapterTest::rmdir(sys_get_temp_dir().'/symfony-cache');
         }
@@ -76,22 +74,22 @@ class PhpArrayAdapterTest extends AdapterTestCase
 
     public function testStore()
     {
-        $arrayWithRefs = [];
+        $arrayWithRefs = array();
         $arrayWithRefs[0] = 123;
         $arrayWithRefs[1] = &$arrayWithRefs[0];
 
-        $object = (object) [
+        $object = (object) array(
             'foo' => 'bar',
             'foo2' => 'bar2',
-        ];
+        );
 
-        $expected = [
+        $expected = array(
             'null' => null,
             'serializedString' => serialize($object),
             'arrayWithRefs' => $arrayWithRefs,
             'object' => $object,
-            'arrayWithObject' => ['bar' => $object],
-        ];
+            'arrayWithObject' => array('bar' => $object),
+        );
 
         $adapter = $this->createCachePool();
         $adapter->warmUp($expected);
@@ -103,13 +101,13 @@ class PhpArrayAdapterTest extends AdapterTestCase
 
     public function testStoredFile()
     {
-        $expected = [
+        $expected = array(
             'integer' => 42,
             'float' => 42.42,
             'boolean' => true,
-            'array_simple' => ['foo', 'bar'],
-            'array_associative' => ['foo' => 'bar', 'foo2' => 'bar2'],
-        ];
+            'array_simple' => array('foo', 'bar'),
+            'array_associative' => array('foo' => 'bar', 'foo2' => 'bar2'),
+        );
 
         $adapter = $this->createCachePool();
         $adapter->warmUp($expected);
@@ -124,7 +122,7 @@ class PhpArrayAdapterWrapper extends PhpArrayAdapter
 {
     public function save(CacheItemInterface $item)
     {
-        \call_user_func(\Closure::bind(function () use ($item) {
+        call_user_func(\Closure::bind(function () use ($item) {
             $this->values[$item->getKey()] = $item->get();
             $this->warmUp($this->values);
             $this->values = eval(substr(file_get_contents($this->file), 6));
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/PhpArrayAdapterWithFallbackTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/PhpArrayAdapterWithFallbackTest.php
index 0bfd5c39..1a23198c 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/PhpArrayAdapterWithFallbackTest.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/PhpArrayAdapterWithFallbackTest.php
@@ -19,26 +19,24 @@ use Symfony\Component\Cache\Adapter\PhpArrayAdapter;
  */
 class PhpArrayAdapterWithFallbackTest extends AdapterTestCase
 {
-    protected $skippedTests = [
+    protected $skippedTests = array(
         'testGetItemInvalidKeys' => 'PhpArrayAdapter does not throw exceptions on invalid key.',
         'testGetItemsInvalidKeys' => 'PhpArrayAdapter does not throw exceptions on invalid key.',
         'testHasItemInvalidKeys' => 'PhpArrayAdapter does not throw exceptions on invalid key.',
         'testDeleteItemInvalidKeys' => 'PhpArrayAdapter does not throw exceptions on invalid key.',
         'testDeleteItemsInvalidKeys' => 'PhpArrayAdapter does not throw exceptions on invalid key.',
         'testPrune' => 'PhpArrayAdapter just proxies',
-    ];
+    );
 
     protected static $file;
 
-    public static function setUpBeforeClass()
+    public static function setupBeforeClass()
     {
         self::$file = sys_get_temp_dir().'/symfony-cache/php-array-adapter-test.php';
     }
 
     protected function tearDown()
     {
-        $this->createCachePool()->clear();
-
         if (file_exists(sys_get_temp_dir().'/symfony-cache')) {
             FilesystemAdapterTest::rmdir(sys_get_temp_dir().'/symfony-cache');
         }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/PhpFilesAdapterTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/PhpFilesAdapterTest.php
index 247160d5..8e93c937 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/PhpFilesAdapterTest.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/PhpFilesAdapterTest.php
@@ -19,9 +19,9 @@ use Symfony\Component\Cache\Adapter\PhpFilesAdapter;
  */
 class PhpFilesAdapterTest extends AdapterTestCase
 {
-    protected $skippedTests = [
+    protected $skippedTests = array(
         'testDefaultLifeTime' => 'PhpFilesAdapter does not allow configuring a default lifetime.',
-    ];
+    );
 
     public function createCachePool()
     {
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/PredisAdapterTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/PredisAdapterTest.php
index 6aadbf26..c005d64a 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/PredisAdapterTest.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/PredisAdapterTest.php
@@ -16,23 +16,23 @@ use Symfony\Component\Cache\Adapter\RedisAdapter;
 
 class PredisAdapterTest extends AbstractRedisAdapterTest
 {
-    public static function setUpBeforeClass()
+    public static function setupBeforeClass()
     {
-        parent::setUpBeforeClass();
-        self::$redis = new \Predis\Client(['host' => getenv('REDIS_HOST')]);
+        parent::setupBeforeClass();
+        self::$redis = new \Predis\Client(array('host' => getenv('REDIS_HOST')));
     }
 
     public function testCreateConnection()
     {
         $redisHost = getenv('REDIS_HOST');
 
-        $redis = RedisAdapter::createConnection('redis://'.$redisHost.'/1', ['class' => \Predis\Client::class, 'timeout' => 3]);
+        $redis = RedisAdapter::createConnection('redis://'.$redisHost.'/1', array('class' => \Predis\Client::class, 'timeout' => 3));
         $this->assertInstanceOf(\Predis\Client::class, $redis);
 
         $connection = $redis->getConnection();
         $this->assertInstanceOf(StreamConnection::class, $connection);
 
-        $params = [
+        $params = array(
             'scheme' => 'tcp',
             'host' => $redisHost,
             'path' => '',
@@ -47,7 +47,7 @@ class PredisAdapterTest extends AbstractRedisAdapterTest
             'lazy' => false,
             'database' => '1',
             'password' => null,
-        ];
+        );
         $this->assertSame($params, $connection->getParameters()->toArray());
     }
 }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/PredisClusterAdapterTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/PredisClusterAdapterTest.php
index 1afabaf1..38915397 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/PredisClusterAdapterTest.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/PredisClusterAdapterTest.php
@@ -13,10 +13,10 @@ namespace Symfony\Component\Cache\Tests\Adapter;
 
 class PredisClusterAdapterTest extends AbstractRedisAdapterTest
 {
-    public static function setUpBeforeClass()
+    public static function setupBeforeClass()
     {
-        parent::setUpBeforeClass();
-        self::$redis = new \Predis\Client([['host' => getenv('REDIS_HOST')]]);
+        parent::setupBeforeClass();
+        self::$redis = new \Predis\Client(array(array('host' => getenv('REDIS_HOST'))));
     }
 
     public static function tearDownAfterClass()
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/PredisRedisClusterAdapterTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/PredisRedisClusterAdapterTest.php
deleted file mode 100644
index 5b09919e..00000000
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/PredisRedisClusterAdapterTest.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Cache\Tests\Adapter;
-
-class PredisRedisClusterAdapterTest extends AbstractRedisAdapterTest
-{
-    public static function setUpBeforeClass()
-    {
-        if (!$hosts = getenv('REDIS_CLUSTER_HOSTS')) {
-            self::markTestSkipped('REDIS_CLUSTER_HOSTS env var is not defined.');
-        }
-        self::$redis = new \Predis\Client(explode(' ', $hosts), ['cluster' => 'redis']);
-    }
-
-    public static function tearDownAfterClass()
-    {
-        self::$redis = null;
-    }
-}
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/ProxyAdapterTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/ProxyAdapterTest.php
index 810cb31a..ff4b9d34 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/ProxyAdapterTest.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/ProxyAdapterTest.php
@@ -21,21 +21,23 @@ use Symfony\Component\Cache\CacheItem;
  */
 class ProxyAdapterTest extends AdapterTestCase
 {
-    protected $skippedTests = [
+    protected $skippedTests = array(
         'testDeferredSaveWithoutCommit' => 'Assumes a shared cache which ArrayAdapter is not.',
         'testSaveWithoutExpire' => 'Assumes a shared cache which ArrayAdapter is not.',
         'testPrune' => 'ProxyAdapter just proxies',
-    ];
+    );
 
     public function createCachePool($defaultLifetime = 0)
     {
         return new ProxyAdapter(new ArrayAdapter(), '', $defaultLifetime);
     }
 
+    /**
+     * @expectedException \Exception
+     * @expectedExceptionMessage OK bar
+     */
     public function testProxyfiedItem()
     {
-        $this->expectException('Exception');
-        $this->expectExceptionMessage('OK bar');
         $item = new CacheItem();
         $pool = new ProxyAdapter(new TestingArrayAdapter($item));
 
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/RedisAdapterTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/RedisAdapterTest.php
index 6ec6321a..28c310fb 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/RedisAdapterTest.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/RedisAdapterTest.php
@@ -17,10 +17,10 @@ use Symfony\Component\Cache\Traits\RedisProxy;
 
 class RedisAdapterTest extends AbstractRedisAdapterTest
 {
-    public static function setUpBeforeClass()
+    public static function setupBeforeClass()
     {
-        parent::setUpBeforeClass();
-        self::$redis = AbstractAdapter::createConnection('redis://'.getenv('REDIS_HOST'), ['lazy' => true]);
+        parent::setupBeforeClass();
+        self::$redis = AbstractAdapter::createConnection('redis://'.getenv('REDIS_HOST'), array('lazy' => true));
     }
 
     public function createCachePool($defaultLifetime = 0)
@@ -43,50 +43,50 @@ class RedisAdapterTest extends AbstractRedisAdapterTest
         $redis = RedisAdapter::createConnection('redis://'.$redisHost.'/2');
         $this->assertSame(2, $redis->getDbNum());
 
-        $redis = RedisAdapter::createConnection('redis://'.$redisHost, ['timeout' => 3]);
+        $redis = RedisAdapter::createConnection('redis://'.$redisHost, array('timeout' => 3));
         $this->assertEquals(3, $redis->getTimeout());
 
         $redis = RedisAdapter::createConnection('redis://'.$redisHost.'?timeout=4');
         $this->assertEquals(4, $redis->getTimeout());
 
-        $redis = RedisAdapter::createConnection('redis://'.$redisHost, ['read_timeout' => 5]);
+        $redis = RedisAdapter::createConnection('redis://'.$redisHost, array('read_timeout' => 5));
         $this->assertEquals(5, $redis->getReadTimeout());
     }
 
     /**
      * @dataProvider provideFailedCreateConnection
+     * @expectedException \Symfony\Component\Cache\Exception\InvalidArgumentException
+     * @expectedExceptionMessage Redis connection failed
      */
     public function testFailedCreateConnection($dsn)
     {
-        $this->expectException('Symfony\Component\Cache\Exception\InvalidArgumentException');
-        $this->expectExceptionMessage('Redis connection ');
         RedisAdapter::createConnection($dsn);
     }
 
     public function provideFailedCreateConnection()
     {
-        return [
-            ['redis://localhost:1234'],
-            ['redis://foo@localhost'],
-            ['redis://localhost/123'],
-        ];
+        return array(
+            array('redis://localhost:1234'),
+            array('redis://foo@localhost'),
+            array('redis://localhost/123'),
+        );
     }
 
     /**
      * @dataProvider provideInvalidCreateConnection
+     * @expectedException \Symfony\Component\Cache\Exception\InvalidArgumentException
+     * @expectedExceptionMessage Invalid Redis DSN
      */
     public function testInvalidCreateConnection($dsn)
     {
-        $this->expectException('Symfony\Component\Cache\Exception\InvalidArgumentException');
-        $this->expectExceptionMessage('Invalid Redis DSN');
         RedisAdapter::createConnection($dsn);
     }
 
     public function provideInvalidCreateConnection()
     {
-        return [
-            ['foo://localhost'],
-            ['redis://'],
-        ];
+        return array(
+            array('foo://localhost'),
+            array('redis://'),
+        );
     }
 }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/RedisArrayAdapterTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/RedisArrayAdapterTest.php
index bd9def32..bef3eb88 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/RedisArrayAdapterTest.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/RedisArrayAdapterTest.php
@@ -13,12 +13,12 @@ namespace Symfony\Component\Cache\Tests\Adapter;
 
 class RedisArrayAdapterTest extends AbstractRedisAdapterTest
 {
-    public static function setUpBeforeClass()
+    public static function setupBeforeClass()
     {
         parent::setupBeforeClass();
         if (!class_exists('RedisArray')) {
             self::markTestSkipped('The RedisArray class is required.');
         }
-        self::$redis = new \RedisArray([getenv('REDIS_HOST')], ['lazy_connect' => true]);
+        self::$redis = new \RedisArray(array(getenv('REDIS_HOST')), array('lazy_connect' => true));
     }
 }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/RedisClusterAdapterTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/RedisClusterAdapterTest.php
deleted file mode 100644
index 9c339d2d..00000000
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/RedisClusterAdapterTest.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Cache\Tests\Adapter;
-
-class RedisClusterAdapterTest extends AbstractRedisAdapterTest
-{
-    public static function setUpBeforeClass()
-    {
-        if (!class_exists('RedisCluster')) {
-            self::markTestSkipped('The RedisCluster class is required.');
-        }
-        if (!$hosts = getenv('REDIS_CLUSTER_HOSTS')) {
-            self::markTestSkipped('REDIS_CLUSTER_HOSTS env var is not defined.');
-        }
-
-        self::$redis = new \RedisCluster(null, explode(' ', $hosts));
-    }
-}
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/SimpleCacheAdapterTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/SimpleCacheAdapterTest.php
index d8470a2e..d5795d52 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/SimpleCacheAdapterTest.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/SimpleCacheAdapterTest.php
@@ -11,31 +11,20 @@
 
 namespace Symfony\Component\Cache\Tests\Adapter;
 
-use Symfony\Component\Cache\Adapter\SimpleCacheAdapter;
-use Symfony\Component\Cache\Simple\ArrayCache;
 use Symfony\Component\Cache\Simple\FilesystemCache;
+use Symfony\Component\Cache\Adapter\SimpleCacheAdapter;
 
 /**
  * @group time-sensitive
  */
 class SimpleCacheAdapterTest extends AdapterTestCase
 {
-    protected $skippedTests = [
+    protected $skippedTests = array(
         'testPrune' => 'SimpleCache just proxies',
-    ];
+    );
 
     public function createCachePool($defaultLifetime = 0)
     {
         return new SimpleCacheAdapter(new FilesystemCache(), '', $defaultLifetime);
     }
-
-    public function testValidCacheKeyWithNamespace()
-    {
-        $cache = new SimpleCacheAdapter(new ArrayCache(), 'some_namespace', 0);
-        $item = $cache->getItem('my_key');
-        $item->set('someValue');
-        $cache->save($item);
-
-        $this->assertTrue($cache->getItem('my_key')->isHit(), 'Stored item is successfully retrieved.');
-    }
 }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/TagAwareAdapterTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/TagAwareAdapterTest.php
index 11907a03..0e4e07a1 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/TagAwareAdapterTest.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/TagAwareAdapterTest.php
@@ -11,10 +11,7 @@
 
 namespace Symfony\Component\Cache\Tests\Adapter;
 
-use PHPUnit\Framework\MockObject\MockObject;
-use Psr\Cache\CacheItemInterface;
 use Symfony\Component\Cache\Adapter\AdapterInterface;
-use Symfony\Component\Cache\Adapter\ArrayAdapter;
 use Symfony\Component\Cache\Adapter\FilesystemAdapter;
 use Symfony\Component\Cache\Adapter\TagAwareAdapter;
 
@@ -33,9 +30,11 @@ class TagAwareAdapterTest extends AdapterTestCase
         FilesystemAdapterTest::rmdir(sys_get_temp_dir().'/symfony-cache');
     }
 
+    /**
+     * @expectedException \Psr\Cache\InvalidArgumentException
+     */
     public function testInvalidTag()
     {
-        $this->expectException('Psr\Cache\InvalidArgumentException');
         $pool = $this->createCachePool();
         $item = $pool->getItem('foo');
         $item->tag(':');
@@ -57,7 +56,7 @@ class TagAwareAdapterTest extends AdapterTestCase
         $pool->save($i3->tag('foo')->tag('baz'));
         $pool->save($foo);
 
-        $pool->invalidateTags(['bar']);
+        $pool->invalidateTags(array('bar'));
 
         $this->assertFalse($pool->getItem('i0')->isHit());
         $this->assertTrue($pool->getItem('i1')->isHit());
@@ -65,33 +64,11 @@ class TagAwareAdapterTest extends AdapterTestCase
         $this->assertTrue($pool->getItem('i3')->isHit());
         $this->assertTrue($pool->getItem('foo')->isHit());
 
-        $pool->invalidateTags(['foo']);
+        $pool->invalidateTags(array('foo'));
 
         $this->assertFalse($pool->getItem('i1')->isHit());
         $this->assertFalse($pool->getItem('i3')->isHit());
         $this->assertTrue($pool->getItem('foo')->isHit());
-
-        $anotherPoolInstance = $this->createCachePool();
-
-        $this->assertFalse($anotherPoolInstance->getItem('i1')->isHit());
-        $this->assertFalse($anotherPoolInstance->getItem('i3')->isHit());
-        $this->assertTrue($anotherPoolInstance->getItem('foo')->isHit());
-    }
-
-    public function testInvalidateCommits()
-    {
-        $pool1 = $this->createCachePool();
-
-        $foo = $pool1->getItem('foo');
-        $foo->tag('tag');
-
-        $pool1->saveDeferred($foo->set('foo'));
-        $pool1->invalidateTags(['tag']);
-
-        $pool2 = $this->createCachePool();
-        $foo = $pool2->getItem('foo');
-
-        $this->assertTrue($foo->isHit());
     }
 
     public function testTagsAreCleanedOnSave()
@@ -104,7 +81,7 @@ class TagAwareAdapterTest extends AdapterTestCase
         $i = $pool->getItem('k');
         $pool->save($i->tag('bar'));
 
-        $pool->invalidateTags(['foo']);
+        $pool->invalidateTags(array('foo'));
         $this->assertTrue($pool->getItem('k')->isHit());
     }
 
@@ -117,7 +94,7 @@ class TagAwareAdapterTest extends AdapterTestCase
         $pool->deleteItem('k');
 
         $pool->save($pool->getItem('k'));
-        $pool->invalidateTags(['foo']);
+        $pool->invalidateTags(array('foo'));
 
         $this->assertTrue($pool->getItem('k')->isHit());
     }
@@ -127,11 +104,11 @@ class TagAwareAdapterTest extends AdapterTestCase
         $pool = $this->createCachePool(10);
 
         $item = $pool->getItem('foo');
-        $item->tag(['baz']);
+        $item->tag(array('baz'));
         $item->expiresAfter(100);
 
         $pool->save($item);
-        $pool->invalidateTags(['baz']);
+        $pool->invalidateTags(array('baz'));
         $this->assertFalse($pool->getItem('foo')->isHit());
 
         sleep(20);
@@ -147,7 +124,7 @@ class TagAwareAdapterTest extends AdapterTestCase
         $pool->save($i->tag('foo'));
 
         $i = $pool->getItem('k');
-        $this->assertSame(['foo' => 'foo'], $i->getPreviousTags());
+        $this->assertSame(array('foo' => 'foo'), $i->getPreviousTags());
     }
 
     public function testPrune()
@@ -162,138 +139,8 @@ class TagAwareAdapterTest extends AdapterTestCase
         $this->assertFalse($cache->prune());
     }
 
-    public function testKnownTagVersionsTtl()
-    {
-        $itemsPool = new FilesystemAdapter('', 10);
-        $tagsPool = $this
-            ->getMockBuilder(AdapterInterface::class)
-            ->getMock();
-
-        $pool = new TagAwareAdapter($itemsPool, $tagsPool, 10);
-
-        $item = $pool->getItem('foo');
-        $item->tag(['baz']);
-        $item->expiresAfter(100);
-
-        $tag = $this->getMockBuilder(CacheItemInterface::class)->getMock();
-        $tag->expects(self::exactly(2))->method('get')->willReturn(10);
-
-        $tagsPool->expects(self::exactly(2))->method('getItems')->willReturn([
-            'baz'.TagAwareAdapter::TAGS_PREFIX => $tag,
-        ]);
-
-        $pool->save($item);
-        $this->assertTrue($pool->getItem('foo')->isHit());
-        $this->assertTrue($pool->getItem('foo')->isHit());
-
-        sleep(20);
-
-        $this->assertTrue($pool->getItem('foo')->isHit());
-
-        sleep(5);
-
-        $this->assertTrue($pool->getItem('foo')->isHit());
-    }
-
-    public function testTagEntryIsCreatedForItemWithoutTags()
-    {
-        $pool = $this->createCachePool();
-
-        $itemKey = 'foo';
-        $item = $pool->getItem($itemKey);
-        $pool->save($item);
-
-        $adapter = new FilesystemAdapter();
-        $this->assertTrue($adapter->hasItem(TagAwareAdapter::TAGS_PREFIX.$itemKey));
-    }
-
-    public function testHasItemReturnsFalseWhenPoolDoesNotHaveItemTags()
-    {
-        $pool = $this->createCachePool();
-
-        $itemKey = 'foo';
-        $item = $pool->getItem($itemKey);
-        $pool->save($item);
-
-        $anotherPool = $this->createCachePool();
-
-        $adapter = new FilesystemAdapter();
-        $adapter->deleteItem(TagAwareAdapter::TAGS_PREFIX.$itemKey); //simulate item losing tags pair
-
-        $this->assertFalse($anotherPool->hasItem($itemKey));
-    }
-
-    public function testGetItemReturnsCacheMissWhenPoolDoesNotHaveItemTags()
-    {
-        $pool = $this->createCachePool();
-
-        $itemKey = 'foo';
-        $item = $pool->getItem($itemKey);
-        $pool->save($item);
-
-        $anotherPool = $this->createCachePool();
-
-        $adapter = new FilesystemAdapter();
-        $adapter->deleteItem(TagAwareAdapter::TAGS_PREFIX.$itemKey); //simulate item losing tags pair
-
-        $item = $anotherPool->getItem($itemKey);
-        $this->assertFalse($item->isHit());
-    }
-
-    public function testHasItemReturnsFalseWhenPoolDoesNotHaveItemAndOnlyHasTags()
-    {
-        $pool = $this->createCachePool();
-
-        $itemKey = 'foo';
-        $item = $pool->getItem($itemKey);
-        $pool->save($item);
-
-        $anotherPool = $this->createCachePool();
-
-        $adapter = new FilesystemAdapter();
-        $adapter->deleteItem($itemKey); //simulate losing item but keeping tags
-
-        $this->assertFalse($anotherPool->hasItem($itemKey));
-    }
-
-    public function testInvalidateTagsWithArrayAdapter()
-    {
-        $adapter = new TagAwareAdapter(new ArrayAdapter());
-
-        $item = $adapter->getItem('foo');
-
-        $this->assertFalse($item->isHit());
-
-        $item->tag('bar');
-        $item->expiresAfter(100);
-        $adapter->save($item);
-
-        $this->assertTrue($adapter->getItem('foo')->isHit());
-
-        $adapter->invalidateTags(['bar']);
-
-        $this->assertFalse($adapter->getItem('foo')->isHit());
-    }
-
-    public function testGetItemReturnsCacheMissWhenPoolDoesNotHaveItemAndOnlyHasTags()
-    {
-        $pool = $this->createCachePool();
-
-        $itemKey = 'foo';
-        $item = $pool->getItem($itemKey);
-        $pool->save($item);
-
-        $anotherPool = $this->createCachePool();
-
-        $adapter = new FilesystemAdapter();
-        $adapter->deleteItem($itemKey); //simulate losing item but keeping tags
-
-        $item = $anotherPool->getItem($itemKey);
-        $this->assertFalse($item->isHit());
-    }
-
     /**
-     * @return MockObject|PruneableCacheInterface
+     * @return \PHPUnit_Framework_MockObject_MockObject|PruneableCacheInterface
      */
     private function getPruneableMock()
     {
@@ -304,13 +151,13 @@ class TagAwareAdapterTest extends AdapterTestCase
         $pruneable
             ->expects($this->atLeastOnce())
             ->method('prune')
-            ->willReturn(true);
+            ->will($this->returnValue(true));
 
         return $pruneable;
     }
 
     /**
-     * @return MockObject|PruneableCacheInterface
+     * @return \PHPUnit_Framework_MockObject_MockObject|PruneableCacheInterface
      */
     private function getFailingPruneableMock()
     {
@@ -321,13 +168,13 @@ class TagAwareAdapterTest extends AdapterTestCase
         $pruneable
             ->expects($this->atLeastOnce())
             ->method('prune')
-            ->willReturn(false);
+            ->will($this->returnValue(false));
 
         return $pruneable;
     }
 
     /**
-     * @return MockObject|AdapterInterface
+     * @return \PHPUnit_Framework_MockObject_MockObject|AdapterInterface
      */
     private function getNonPruneableMock()
     {
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/TagAwareAndProxyAdapterIntegrationTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/TagAwareAndProxyAdapterIntegrationTest.php
deleted file mode 100644
index b11c1f28..00000000
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/TagAwareAndProxyAdapterIntegrationTest.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-namespace Symfony\Component\Cache\Tests\Adapter;
-
-use PHPUnit\Framework\TestCase;
-use Psr\Cache\CacheItemPoolInterface;
-use Symfony\Component\Cache\Adapter\ArrayAdapter;
-use Symfony\Component\Cache\Adapter\ProxyAdapter;
-use Symfony\Component\Cache\Adapter\TagAwareAdapter;
-use Symfony\Component\Cache\Tests\Fixtures\ExternalAdapter;
-
-class TagAwareAndProxyAdapterIntegrationTest extends TestCase
-{
-    /**
-     * @dataProvider dataProvider
-     */
-    public function testIntegrationUsingProxiedAdapter(CacheItemPoolInterface $proxiedAdapter)
-    {
-        $cache = new TagAwareAdapter(new ProxyAdapter($proxiedAdapter));
-
-        $item = $cache->getItem('foo');
-        $item->tag(['tag1', 'tag2']);
-        $item->set('bar');
-        $cache->save($item);
-
-        $this->assertSame('bar', $cache->getItem('foo')->get());
-    }
-
-    public function dataProvider()
-    {
-        return [
-            [new ArrayAdapter()],
-            // also testing with a non-AdapterInterface implementation
-            // because the ProxyAdapter behaves slightly different for those
-            [new ExternalAdapter()],
-        ];
-    }
-}
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/TraceableAdapterTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/TraceableAdapterTest.php
index 35eba7d7..3755e88d 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/TraceableAdapterTest.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/TraceableAdapterTest.php
@@ -19,9 +19,9 @@ use Symfony\Component\Cache\Adapter\TraceableAdapter;
  */
 class TraceableAdapterTest extends AdapterTestCase
 {
-    protected $skippedTests = [
+    protected $skippedTests = array(
         'testPrune' => 'TraceableAdapter just proxies',
-    ];
+    );
 
     public function createCachePool($defaultLifetime = 0)
     {
@@ -37,7 +37,7 @@ class TraceableAdapterTest extends AdapterTestCase
 
         $call = $calls[0];
         $this->assertSame('getItem', $call->name);
-        $this->assertSame(['k' => false], $call->result);
+        $this->assertSame(array('k' => false), $call->result);
         $this->assertSame(0, $call->hits);
         $this->assertSame(1, $call->misses);
         $this->assertNotEmpty($call->start);
@@ -61,7 +61,7 @@ class TraceableAdapterTest extends AdapterTestCase
     public function testGetItemsMissTrace()
     {
         $pool = $this->createCachePool();
-        $arg = ['k0', 'k1'];
+        $arg = array('k0', 'k1');
         $items = $pool->getItems($arg);
         foreach ($items as $item) {
         }
@@ -70,7 +70,7 @@ class TraceableAdapterTest extends AdapterTestCase
 
         $call = $calls[0];
         $this->assertSame('getItems', $call->name);
-        $this->assertSame(['k0' => false, 'k1' => false], $call->result);
+        $this->assertSame(array('k0' => false, 'k1' => false), $call->result);
         $this->assertSame(2, $call->misses);
         $this->assertNotEmpty($call->start);
         $this->assertNotEmpty($call->end);
@@ -85,7 +85,7 @@ class TraceableAdapterTest extends AdapterTestCase
 
         $call = $calls[0];
         $this->assertSame('hasItem', $call->name);
-        $this->assertSame(['k' => false], $call->result);
+        $this->assertSame(array('k' => false), $call->result);
         $this->assertNotEmpty($call->start);
         $this->assertNotEmpty($call->end);
     }
@@ -101,7 +101,7 @@ class TraceableAdapterTest extends AdapterTestCase
 
         $call = $calls[2];
         $this->assertSame('hasItem', $call->name);
-        $this->assertSame(['k' => true], $call->result);
+        $this->assertSame(array('k' => true), $call->result);
         $this->assertNotEmpty($call->start);
         $this->assertNotEmpty($call->end);
     }
@@ -115,7 +115,7 @@ class TraceableAdapterTest extends AdapterTestCase
 
         $call = $calls[0];
         $this->assertSame('deleteItem', $call->name);
-        $this->assertSame(['k' => true], $call->result);
+        $this->assertSame(array('k' => true), $call->result);
         $this->assertSame(0, $call->hits);
         $this->assertSame(0, $call->misses);
         $this->assertNotEmpty($call->start);
@@ -125,14 +125,14 @@ class TraceableAdapterTest extends AdapterTestCase
     public function testDeleteItemsTrace()
     {
         $pool = $this->createCachePool();
-        $arg = ['k0', 'k1'];
+        $arg = array('k0', 'k1');
         $pool->deleteItems($arg);
         $calls = $pool->getCalls();
         $this->assertCount(1, $calls);
 
         $call = $calls[0];
         $this->assertSame('deleteItems', $call->name);
-        $this->assertSame(['keys' => $arg, 'result' => true], $call->result);
+        $this->assertSame(array('keys' => $arg, 'result' => true), $call->result);
         $this->assertSame(0, $call->hits);
         $this->assertSame(0, $call->misses);
         $this->assertNotEmpty($call->start);
@@ -149,7 +149,7 @@ class TraceableAdapterTest extends AdapterTestCase
 
         $call = $calls[1];
         $this->assertSame('save', $call->name);
-        $this->assertSame(['k' => true], $call->result);
+        $this->assertSame(array('k' => true), $call->result);
         $this->assertSame(0, $call->hits);
         $this->assertSame(0, $call->misses);
         $this->assertNotEmpty($call->start);
@@ -166,7 +166,7 @@ class TraceableAdapterTest extends AdapterTestCase
 
         $call = $calls[1];
         $this->assertSame('saveDeferred', $call->name);
-        $this->assertSame(['k' => true], $call->result);
+        $this->assertSame(array('k' => true), $call->result);
         $this->assertSame(0, $call->hits);
         $this->assertSame(0, $call->misses);
         $this->assertNotEmpty($call->start);
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/TraceableTagAwareAdapterTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/TraceableTagAwareAdapterTest.php
index 5cd4185c..9b50bfab 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/TraceableTagAwareAdapterTest.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Tests/Adapter/TraceableTagAwareAdapterTest.php
@@ -23,7 +23,7 @@ class TraceableTagAwareAdapterTest extends TraceableAdapterTest
     public function testInvalidateTags()
     {
         $pool = new TraceableTagAwareAdapter(new TagAwareAdapter(new FilesystemAdapter()));
-        $pool->invalidateTags(['foo']);
+        $pool->invalidateTags(array('foo'));
         $calls = $pool->getCalls();
         $this->assertCount(1, $calls);
 
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/CacheItemTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/CacheItemTest.php
index 28c681d1..daca925f 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/CacheItemTest.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Tests/CacheItemTest.php
@@ -23,33 +23,33 @@ class CacheItemTest extends TestCase
 
     /**
      * @dataProvider provideInvalidKey
+     * @expectedException \Symfony\Component\Cache\Exception\InvalidArgumentException
+     * @expectedExceptionMessage Cache key
      */
     public function testInvalidKey($key)
     {
-        $this->expectException('Symfony\Component\Cache\Exception\InvalidArgumentException');
-        $this->expectExceptionMessage('Cache key');
         CacheItem::validateKey($key);
     }
 
     public function provideInvalidKey()
     {
-        return [
-            [''],
-            ['{'],
-            ['}'],
-            ['('],
-            [')'],
-            ['/'],
-            ['\\'],
-            ['@'],
-            [':'],
-            [true],
-            [null],
-            [1],
-            [1.1],
-            [[[]]],
-            [new \Exception('foo')],
-        ];
+        return array(
+            array(''),
+            array('{'),
+            array('}'),
+            array('('),
+            array(')'),
+            array('/'),
+            array('\\'),
+            array('@'),
+            array(':'),
+            array(true),
+            array(null),
+            array(1),
+            array(1.1),
+            array(array(array())),
+            array(new \Exception('foo')),
+        );
     }
 
     public function testTag()
@@ -57,20 +57,20 @@ class CacheItemTest extends TestCase
         $item = new CacheItem();
 
         $this->assertSame($item, $item->tag('foo'));
-        $this->assertSame($item, $item->tag(['bar', 'baz']));
+        $this->assertSame($item, $item->tag(array('bar', 'baz')));
 
-        \call_user_func(\Closure::bind(function () use ($item) {
-            $this->assertSame(['foo' => 'foo', 'bar' => 'bar', 'baz' => 'baz'], $item->tags);
+        call_user_func(\Closure::bind(function () use ($item) {
+            $this->assertSame(array('foo' => 'foo', 'bar' => 'bar', 'baz' => 'baz'), $item->tags);
         }, $this, CacheItem::class));
     }
 
     /**
      * @dataProvider provideInvalidKey
+     * @expectedException \Symfony\Component\Cache\Exception\InvalidArgumentException
+     * @expectedExceptionMessage Cache tag
      */
     public function testInvalidTag($tag)
     {
-        $this->expectException('Symfony\Component\Cache\Exception\InvalidArgumentException');
-        $this->expectExceptionMessage('Cache tag');
         $item = new CacheItem();
         $item->tag($tag);
     }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Fixtures/ArrayCache.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Fixtures/ArrayCache.php
index 13b4f330..1a6157e8 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Fixtures/ArrayCache.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Tests/Fixtures/ArrayCache.php
@@ -6,7 +6,7 @@ use Doctrine\Common\Cache\CacheProvider;
 
 class ArrayCache extends CacheProvider
 {
-    private $data = [];
+    private $data = array();
 
     protected function doFetch($id)
     {
@@ -21,12 +21,12 @@ class ArrayCache extends CacheProvider
 
         $expiry = $this->data[$id][1];
 
-        return !$expiry || time() < $expiry || !$this->doDelete($id);
+        return !$expiry || time() <= $expiry || !$this->doDelete($id);
     }
 
     protected function doSave($id, $data, $lifeTime = 0)
     {
-        $this->data[$id] = [$data, $lifeTime ? time() + $lifeTime : false];
+        $this->data[$id] = array($data, $lifeTime ? time() + $lifeTime : false);
 
         return true;
     }
@@ -40,7 +40,7 @@ class ArrayCache extends CacheProvider
 
     protected function doFlush()
     {
-        $this->data = [];
+        $this->data = array();
 
         return true;
     }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Fixtures/ExternalAdapter.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Fixtures/ExternalAdapter.php
index be1f9901..493906ea 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Fixtures/ExternalAdapter.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Tests/Fixtures/ExternalAdapter.php
@@ -24,9 +24,9 @@ class ExternalAdapter implements CacheItemPoolInterface
 {
     private $cache;
 
-    public function __construct($defaultLifetime = 0)
+    public function __construct()
     {
-        $this->cache = new ArrayAdapter($defaultLifetime);
+        $this->cache = new ArrayAdapter();
     }
 
     public function getItem($key)
@@ -34,7 +34,7 @@ class ExternalAdapter implements CacheItemPoolInterface
         return $this->cache->getItem($key);
     }
 
-    public function getItems(array $keys = [])
+    public function getItems(array $keys = array())
     {
         return $this->cache->getItems($keys);
     }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/AbstractRedisCacheTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/AbstractRedisCacheTest.php
index 7a6cabe8..f70f49d5 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/AbstractRedisCacheTest.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/AbstractRedisCacheTest.php
@@ -15,11 +15,11 @@ use Symfony\Component\Cache\Simple\RedisCache;
 
 abstract class AbstractRedisCacheTest extends CacheTestCase
 {
-    protected $skippedTests = [
+    protected $skippedTests = array(
         'testSetTtl' => 'Testing expiration slows down the test suite',
         'testSetMultipleTtl' => 'Testing expiration slows down the test suite',
         'testDefaultLifeTime' => 'Testing expiration slows down the test suite',
-    ];
+    );
 
     protected static $redis;
 
@@ -28,15 +28,14 @@ abstract class AbstractRedisCacheTest extends CacheTestCase
         return new RedisCache(self::$redis, str_replace('\\', '.', __CLASS__), $defaultLifetime);
     }
 
-    public static function setUpBeforeClass()
+    public static function setupBeforeClass()
     {
-        if (!\extension_loaded('redis')) {
+        if (!extension_loaded('redis')) {
             self::markTestSkipped('Extension redis required.');
         }
-        try {
-            (new \Redis())->connect(getenv('REDIS_HOST'));
-        } catch (\Exception $e) {
-            self::markTestSkipped($e->getMessage());
+        if (!@((new \Redis())->connect(getenv('REDIS_HOST')))) {
+            $e = error_get_last();
+            self::markTestSkipped($e['message']);
         }
     }
 
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/ApcuCacheTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/ApcuCacheTest.php
index fad0c043..297a4175 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/ApcuCacheTest.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/ApcuCacheTest.php
@@ -15,18 +15,18 @@ use Symfony\Component\Cache\Simple\ApcuCache;
 
 class ApcuCacheTest extends CacheTestCase
 {
-    protected $skippedTests = [
+    protected $skippedTests = array(
         'testSetTtl' => 'Testing expiration slows down the test suite',
         'testSetMultipleTtl' => 'Testing expiration slows down the test suite',
         'testDefaultLifeTime' => 'Testing expiration slows down the test suite',
-    ];
+    );
 
     public function createSimpleCache($defaultLifetime = 0)
     {
-        if (!\function_exists('apcu_fetch') || !filter_var(ini_get('apc.enabled'), \FILTER_VALIDATE_BOOLEAN) || ('cli' === \PHP_SAPI && !filter_var(ini_get('apc.enable_cli'), \FILTER_VALIDATE_BOOLEAN))) {
+        if (!function_exists('apcu_fetch') || !ini_get('apc.enabled') || ('cli' === PHP_SAPI && !ini_get('apc.enable_cli'))) {
             $this->markTestSkipped('APCu extension is required.');
         }
-        if ('\\' === \DIRECTORY_SEPARATOR) {
+        if ('\\' === DIRECTORY_SEPARATOR) {
             $this->markTestSkipped('Fails transiently on Windows.');
         }
 
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/CacheTestCase.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/CacheTestCase.php
index ff9944a3..48b97282 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/CacheTestCase.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/CacheTestCase.php
@@ -21,18 +21,18 @@ abstract class CacheTestCase extends SimpleCacheTest
     {
         parent::setUp();
 
-        if (!\array_key_exists('testPrune', $this->skippedTests) && !$this->createSimpleCache() instanceof PruneableInterface) {
+        if (!array_key_exists('testPrune', $this->skippedTests) && !$this->createSimpleCache() instanceof PruneableInterface) {
             $this->skippedTests['testPrune'] = 'Not a pruneable cache pool.';
         }
     }
 
     public static function validKeys()
     {
-        if (\defined('HHVM_VERSION')) {
+        if (defined('HHVM_VERSION')) {
             return parent::validKeys();
         }
 
-        return array_merge(parent::validKeys(), [["a\0b"]]);
+        return array_merge(parent::validKeys(), array(array("a\0b")));
     }
 
     public function testDefaultLifeTime()
@@ -42,7 +42,6 @@ abstract class CacheTestCase extends SimpleCacheTest
         }
 
         $cache = $this->createSimpleCache(2);
-        $cache->clear();
 
         $cache->set('key.dlt', 'value');
         sleep(1);
@@ -51,8 +50,6 @@ abstract class CacheTestCase extends SimpleCacheTest
 
         sleep(2);
         $this->assertNull($cache->get('key.dlt'));
-
-        $cache->clear();
     }
 
     public function testNotUnserializable()
@@ -62,19 +59,16 @@ abstract class CacheTestCase extends SimpleCacheTest
         }
 
         $cache = $this->createSimpleCache();
-        $cache->clear();
 
         $cache->set('foo', new NotUnserializable());
 
         $this->assertNull($cache->get('foo'));
 
-        $cache->setMultiple(['foo' => new NotUnserializable()]);
+        $cache->setMultiple(array('foo' => new NotUnserializable()));
 
-        foreach ($cache->getMultiple(['foo']) as $value) {
+        foreach ($cache->getMultiple(array('foo')) as $value) {
         }
         $this->assertNull($value);
-
-        $cache->clear();
     }
 
     public function testPrune()
@@ -89,7 +83,6 @@ abstract class CacheTestCase extends SimpleCacheTest
 
         /** @var PruneableInterface|CacheInterface $cache */
         $cache = $this->createSimpleCache();
-        $cache->clear();
 
         $cache->set('foo', 'foo-val', new \DateInterval('PT05S'));
         $cache->set('bar', 'bar-val', new \DateInterval('PT10S'));
@@ -131,8 +124,6 @@ abstract class CacheTestCase extends SimpleCacheTest
         $cache->prune();
         $this->assertFalse($this->isPruned($cache, 'foo'));
         $this->assertTrue($this->isPruned($cache, 'qux'));
-
-        $cache->clear();
     }
 }
 
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/ChainCacheTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/ChainCacheTest.php
index f216bc1f..ab28e3bc 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/ChainCacheTest.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/ChainCacheTest.php
@@ -11,7 +11,6 @@
 
 namespace Symfony\Component\Cache\Tests\Simple;
 
-use PHPUnit\Framework\MockObject\MockObject;
 use Psr\SimpleCache\CacheInterface;
 use Symfony\Component\Cache\PruneableInterface;
 use Symfony\Component\Cache\Simple\ArrayCache;
@@ -25,21 +24,25 @@ class ChainCacheTest extends CacheTestCase
 {
     public function createSimpleCache($defaultLifetime = 0)
     {
-        return new ChainCache([new ArrayCache($defaultLifetime), new FilesystemCache('', $defaultLifetime)], $defaultLifetime);
+        return new ChainCache(array(new ArrayCache($defaultLifetime), new FilesystemCache('', $defaultLifetime)), $defaultLifetime);
     }
 
+    /**
+     * @expectedException \Symfony\Component\Cache\Exception\InvalidArgumentException
+     * @expectedExceptionMessage At least one cache must be specified.
+     */
     public function testEmptyCachesException()
     {
-        $this->expectException('Symfony\Component\Cache\Exception\InvalidArgumentException');
-        $this->expectExceptionMessage('At least one cache must be specified.');
-        new ChainCache([]);
+        new ChainCache(array());
     }
 
+    /**
+     * @expectedException \Symfony\Component\Cache\Exception\InvalidArgumentException
+     * @expectedExceptionMessage The class "stdClass" does not implement
+     */
     public function testInvalidCacheException()
     {
-        $this->expectException('Symfony\Component\Cache\Exception\InvalidArgumentException');
-        $this->expectExceptionMessage('The class "stdClass" does not implement');
-        new ChainCache([new \stdClass()]);
+        new ChainCache(array(new \stdClass()));
     }
 
     public function testPrune()
@@ -48,23 +51,23 @@ class ChainCacheTest extends CacheTestCase
             $this->markTestSkipped($this->skippedTests[__FUNCTION__]);
         }
 
-        $cache = new ChainCache([
+        $cache = new ChainCache(array(
             $this->getPruneableMock(),
             $this->getNonPruneableMock(),
             $this->getPruneableMock(),
-        ]);
+        ));
         $this->assertTrue($cache->prune());
 
-        $cache = new ChainCache([
+        $cache = new ChainCache(array(
             $this->getPruneableMock(),
             $this->getFailingPruneableMock(),
             $this->getPruneableMock(),
-        ]);
+        ));
         $this->assertFalse($cache->prune());
     }
 
     /**
-     * @return MockObject|PruneableCacheInterface
+     * @return \PHPUnit_Framework_MockObject_MockObject|PruneableCacheInterface
      */
     private function getPruneableMock()
     {
@@ -75,13 +78,13 @@ class ChainCacheTest extends CacheTestCase
         $pruneable
             ->expects($this->atLeastOnce())
             ->method('prune')
-            ->willReturn(true);
+            ->will($this->returnValue(true));
 
         return $pruneable;
     }
 
     /**
-     * @return MockObject|PruneableCacheInterface
+     * @return \PHPUnit_Framework_MockObject_MockObject|PruneableCacheInterface
      */
     private function getFailingPruneableMock()
     {
@@ -92,13 +95,13 @@ class ChainCacheTest extends CacheTestCase
         $pruneable
             ->expects($this->atLeastOnce())
             ->method('prune')
-            ->willReturn(false);
+            ->will($this->returnValue(false));
 
         return $pruneable;
     }
 
     /**
-     * @return MockObject|CacheInterface
+     * @return \PHPUnit_Framework_MockObject_MockObject|CacheInterface
      */
     private function getNonPruneableMock()
     {
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/DoctrineCacheTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/DoctrineCacheTest.php
index af4331d6..127c9685 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/DoctrineCacheTest.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/DoctrineCacheTest.php
@@ -19,10 +19,10 @@ use Symfony\Component\Cache\Tests\Fixtures\ArrayCache;
  */
 class DoctrineCacheTest extends CacheTestCase
 {
-    protected $skippedTests = [
+    protected $skippedTests = array(
         'testObjectDoesNotChangeInCache' => 'ArrayCache does not use serialize/unserialize',
         'testNotUnserializable' => 'ArrayCache does not use serialize/unserialize',
-    ];
+    );
 
     public function createSimpleCache($defaultLifetime = 0)
     {
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/MemcachedCacheTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/MemcachedCacheTest.php
index 6df682e9..c4af891a 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/MemcachedCacheTest.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/MemcachedCacheTest.php
@@ -16,15 +16,15 @@ use Symfony\Component\Cache\Simple\MemcachedCache;
 
 class MemcachedCacheTest extends CacheTestCase
 {
-    protected $skippedTests = [
+    protected $skippedTests = array(
         'testSetTtl' => 'Testing expiration slows down the test suite',
         'testSetMultipleTtl' => 'Testing expiration slows down the test suite',
         'testDefaultLifeTime' => 'Testing expiration slows down the test suite',
-    ];
+    );
 
     protected static $client;
 
-    public static function setUpBeforeClass()
+    public static function setupBeforeClass()
     {
         if (!MemcachedCache::isSupported()) {
             self::markTestSkipped('Extension memcached >=2.2.0 required.');
@@ -40,29 +40,20 @@ class MemcachedCacheTest extends CacheTestCase
 
     public function createSimpleCache($defaultLifetime = 0)
     {
-        $client = $defaultLifetime ? AbstractAdapter::createConnection('memcached://'.getenv('MEMCACHED_HOST'), ['binary_protocol' => false]) : self::$client;
+        $client = $defaultLifetime ? AbstractAdapter::createConnection('memcached://'.getenv('MEMCACHED_HOST'), array('binary_protocol' => false)) : self::$client;
 
         return new MemcachedCache($client, str_replace('\\', '.', __CLASS__), $defaultLifetime);
     }
 
-    public function testCreatePersistentConnectionShouldNotDupServerList()
-    {
-        $instance = MemcachedCache::createConnection('memcached://'.getenv('MEMCACHED_HOST'), ['persistent_id' => 'persistent']);
-        $this->assertCount(1, $instance->getServerList());
-
-        $instance = MemcachedCache::createConnection('memcached://'.getenv('MEMCACHED_HOST'), ['persistent_id' => 'persistent']);
-        $this->assertCount(1, $instance->getServerList());
-    }
-
     public function testOptions()
     {
-        $client = MemcachedCache::createConnection([], [
+        $client = MemcachedCache::createConnection(array(), array(
             'libketama_compatible' => false,
             'distribution' => 'modula',
             'compression' => true,
             'serializer' => 'php',
             'hash' => 'md5',
-        ]);
+        ));
 
         $this->assertSame(\Memcached::SERIALIZER_PHP, $client->getOption(\Memcached::OPT_SERIALIZER));
         $this->assertSame(\Memcached::HASH_MD5, $client->getOption(\Memcached::OPT_HASH));
@@ -73,50 +64,46 @@ class MemcachedCacheTest extends CacheTestCase
 
     /**
      * @dataProvider provideBadOptions
+     * @expectedException \ErrorException
+     * @expectedExceptionMessage constant(): Couldn't find constant Memcached::
      */
     public function testBadOptions($name, $value)
     {
-        if (\PHP_VERSION_ID < 80000) {
-            $this->expectException('ErrorException');
-            $this->expectExceptionMessage('constant(): Couldn\'t find constant Memcached::');
-        } else {
-            $this->expectException('Error');
-            $this->expectExceptionMessage('Undefined constant Memcached::');
-        }
-
-        MemcachedCache::createConnection([], [$name => $value]);
+        MemcachedCache::createConnection(array(), array($name => $value));
     }
 
     public function provideBadOptions()
     {
-        return [
-            ['foo', 'bar'],
-            ['hash', 'zyx'],
-            ['serializer', 'zyx'],
-            ['distribution', 'zyx'],
-        ];
+        return array(
+            array('foo', 'bar'),
+            array('hash', 'zyx'),
+            array('serializer', 'zyx'),
+            array('distribution', 'zyx'),
+        );
     }
 
     public function testDefaultOptions()
     {
         $this->assertTrue(MemcachedCache::isSupported());
 
-        $client = MemcachedCache::createConnection([]);
+        $client = MemcachedCache::createConnection(array());
 
         $this->assertTrue($client->getOption(\Memcached::OPT_COMPRESSION));
         $this->assertSame(1, $client->getOption(\Memcached::OPT_BINARY_PROTOCOL));
         $this->assertSame(1, $client->getOption(\Memcached::OPT_LIBKETAMA_COMPATIBLE));
     }
 
+    /**
+     * @expectedException \Symfony\Component\Cache\Exception\CacheException
+     * @expectedExceptionMessage MemcachedAdapter: "serializer" option must be "php" or "igbinary".
+     */
     public function testOptionSerializer()
     {
-        $this->expectException('Symfony\Component\Cache\Exception\CacheException');
-        $this->expectExceptionMessage('MemcachedAdapter: "serializer" option must be "php" or "igbinary".');
         if (!\Memcached::HAVE_JSON) {
             $this->markTestSkipped('Memcached::HAVE_JSON required');
         }
 
-        new MemcachedCache(MemcachedCache::createConnection([], ['serializer' => 'json']));
+        new MemcachedCache(MemcachedCache::createConnection(array(), array('serializer' => 'json')));
     }
 
     /**
@@ -125,54 +112,54 @@ class MemcachedCacheTest extends CacheTestCase
     public function testServersSetting($dsn, $host, $port)
     {
         $client1 = MemcachedCache::createConnection($dsn);
-        $client2 = MemcachedCache::createConnection([$dsn]);
-        $client3 = MemcachedCache::createConnection([[$host, $port]]);
-        $expect = [
+        $client2 = MemcachedCache::createConnection(array($dsn));
+        $client3 = MemcachedCache::createConnection(array(array($host, $port)));
+        $expect = array(
             'host' => $host,
             'port' => $port,
-        ];
+        );
 
-        $f = function ($s) { return ['host' => $s['host'], 'port' => $s['port']]; };
-        $this->assertSame([$expect], array_map($f, $client1->getServerList()));
-        $this->assertSame([$expect], array_map($f, $client2->getServerList()));
-        $this->assertSame([$expect], array_map($f, $client3->getServerList()));
+        $f = function ($s) { return array('host' => $s['host'], 'port' => $s['port']); };
+        $this->assertSame(array($expect), array_map($f, $client1->getServerList()));
+        $this->assertSame(array($expect), array_map($f, $client2->getServerList()));
+        $this->assertSame(array($expect), array_map($f, $client3->getServerList()));
     }
 
     public function provideServersSetting()
     {
-        yield [
+        yield array(
             'memcached://127.0.0.1/50',
             '127.0.0.1',
             11211,
-        ];
-        yield [
+        );
+        yield array(
             'memcached://localhost:11222?weight=25',
             'localhost',
             11222,
-        ];
-        if (filter_var(ini_get('memcached.use_sasl'), \FILTER_VALIDATE_BOOLEAN)) {
-            yield [
+        );
+        if (ini_get('memcached.use_sasl')) {
+            yield array(
                 'memcached://user:password@127.0.0.1?weight=50',
                 '127.0.0.1',
                 11211,
-            ];
+            );
         }
-        yield [
+        yield array(
             'memcached:///var/run/memcached.sock?weight=25',
             '/var/run/memcached.sock',
             0,
-        ];
-        yield [
+        );
+        yield array(
             'memcached:///var/local/run/memcached.socket?weight=25',
             '/var/local/run/memcached.socket',
             0,
-        ];
-        if (filter_var(ini_get('memcached.use_sasl'), \FILTER_VALIDATE_BOOLEAN)) {
-            yield [
+        );
+        if (ini_get('memcached.use_sasl')) {
+            yield array(
                 'memcached://user:password@/var/local/run/memcached.socket?weight=25',
                 '/var/local/run/memcached.socket',
                 0,
-            ];
+            );
         }
     }
 }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/MemcachedCacheTextModeTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/MemcachedCacheTextModeTest.php
deleted file mode 100644
index 13865a60..00000000
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/MemcachedCacheTextModeTest.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Cache\Tests\Simple;
-
-use Symfony\Component\Cache\Adapter\AbstractAdapter;
-use Symfony\Component\Cache\Simple\MemcachedCache;
-
-class MemcachedCacheTextModeTest extends MemcachedCacheTest
-{
-    public function createSimpleCache($defaultLifetime = 0)
-    {
-        $client = AbstractAdapter::createConnection('memcached://'.getenv('MEMCACHED_HOST'), ['binary_protocol' => false]);
-
-        return new MemcachedCache($client, str_replace('\\', '.', __CLASS__), $defaultLifetime);
-    }
-}
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/NullCacheTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/NullCacheTest.php
index 31f42c32..7b760fd3 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/NullCacheTest.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/NullCacheTest.php
@@ -40,7 +40,7 @@ class NullCacheTest extends TestCase
     {
         $cache = $this->createCachePool();
 
-        $keys = ['foo', 'bar', 'baz', 'biz'];
+        $keys = array('foo', 'bar', 'baz', 'biz');
 
         $default = new \stdClass();
         $items = $cache->getMultiple($keys, $default);
@@ -75,7 +75,7 @@ class NullCacheTest extends TestCase
 
     public function testDeleteMultiple()
     {
-        $this->assertTrue($this->createCachePool()->deleteMultiple(['key', 'foo', 'bar']));
+        $this->assertTrue($this->createCachePool()->deleteMultiple(array('key', 'foo', 'bar')));
     }
 
     public function testSet()
@@ -90,7 +90,7 @@ class NullCacheTest extends TestCase
     {
         $cache = $this->createCachePool();
 
-        $this->assertFalse($cache->setMultiple(['key' => 'val']));
+        $this->assertFalse($cache->setMultiple(array('key' => 'val')));
         $this->assertNull($cache->get('key'));
     }
 }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/PdoCacheTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/PdoCacheTest.php
index f5a26341..cf573095 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/PdoCacheTest.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/PdoCacheTest.php
@@ -23,9 +23,9 @@ class PdoCacheTest extends CacheTestCase
 
     protected static $dbFile;
 
-    public static function setUpBeforeClass()
+    public static function setupBeforeClass()
     {
-        if (!\extension_loaded('pdo_sqlite')) {
+        if (!extension_loaded('pdo_sqlite')) {
             self::markTestSkipped('Extension pdo_sqlite required.');
         }
 
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/PdoDbalCacheTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/PdoDbalCacheTest.php
index 4da2b603..0c40c04a 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/PdoDbalCacheTest.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/PdoDbalCacheTest.php
@@ -24,15 +24,15 @@ class PdoDbalCacheTest extends CacheTestCase
 
     protected static $dbFile;
 
-    public static function setUpBeforeClass()
+    public static function setupBeforeClass()
     {
-        if (!\extension_loaded('pdo_sqlite')) {
+        if (!extension_loaded('pdo_sqlite')) {
             self::markTestSkipped('Extension pdo_sqlite required.');
         }
 
         self::$dbFile = tempnam(sys_get_temp_dir(), 'sf_sqlite_cache');
 
-        $pool = new PdoCache(DriverManager::getConnection(['driver' => 'pdo_sqlite', 'path' => self::$dbFile]));
+        $pool = new PdoCache(DriverManager::getConnection(array('driver' => 'pdo_sqlite', 'path' => self::$dbFile)));
         $pool->createTable();
     }
 
@@ -43,6 +43,6 @@ class PdoDbalCacheTest extends CacheTestCase
 
     public function createSimpleCache($defaultLifetime = 0)
     {
-        return new PdoCache(DriverManager::getConnection(['driver' => 'pdo_sqlite', 'path' => self::$dbFile]), '', $defaultLifetime);
+        return new PdoCache(DriverManager::getConnection(array('driver' => 'pdo_sqlite', 'path' => self::$dbFile)), '', $defaultLifetime);
     }
 }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/PhpArrayCacheTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/PhpArrayCacheTest.php
index bcd7dea5..1bd0ca27 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/PhpArrayCacheTest.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/PhpArrayCacheTest.php
@@ -11,16 +11,16 @@
 
 namespace Symfony\Component\Cache\Tests\Simple;
 
+use Symfony\Component\Cache\Tests\Adapter\FilesystemAdapterTest;
 use Symfony\Component\Cache\Simple\NullCache;
 use Symfony\Component\Cache\Simple\PhpArrayCache;
-use Symfony\Component\Cache\Tests\Adapter\FilesystemAdapterTest;
 
 /**
  * @group time-sensitive
  */
 class PhpArrayCacheTest extends CacheTestCase
 {
-    protected $skippedTests = [
+    protected $skippedTests = array(
         'testBasicUsageWithLongKey' => 'PhpArrayCache does no writes',
 
         'testDelete' => 'PhpArrayCache does no writes',
@@ -45,19 +45,17 @@ class PhpArrayCacheTest extends CacheTestCase
 
         'testDefaultLifeTime' => 'PhpArrayCache does not allow configuring a default lifetime.',
         'testPrune' => 'PhpArrayCache just proxies',
-    ];
+    );
 
     protected static $file;
 
-    public static function setUpBeforeClass()
+    public static function setupBeforeClass()
     {
         self::$file = sys_get_temp_dir().'/symfony-cache/php-array-adapter-test.php';
     }
 
     protected function tearDown()
     {
-        $this->createSimpleCache()->clear();
-
         if (file_exists(sys_get_temp_dir().'/symfony-cache')) {
             FilesystemAdapterTest::rmdir(sys_get_temp_dir().'/symfony-cache');
         }
@@ -70,22 +68,22 @@ class PhpArrayCacheTest extends CacheTestCase
 
     public function testStore()
     {
-        $arrayWithRefs = [];
+        $arrayWithRefs = array();
         $arrayWithRefs[0] = 123;
         $arrayWithRefs[1] = &$arrayWithRefs[0];
 
-        $object = (object) [
+        $object = (object) array(
             'foo' => 'bar',
             'foo2' => 'bar2',
-        ];
+        );
 
-        $expected = [
+        $expected = array(
             'null' => null,
             'serializedString' => serialize($object),
             'arrayWithRefs' => $arrayWithRefs,
             'object' => $object,
-            'arrayWithObject' => ['bar' => $object],
-        ];
+            'arrayWithObject' => array('bar' => $object),
+        );
 
         $cache = new PhpArrayCache(self::$file, new NullCache());
         $cache->warmUp($expected);
@@ -97,13 +95,13 @@ class PhpArrayCacheTest extends CacheTestCase
 
     public function testStoredFile()
     {
-        $expected = [
+        $expected = array(
             'integer' => 42,
             'float' => 42.42,
             'boolean' => true,
-            'array_simple' => ['foo', 'bar'],
-            'array_associative' => ['foo' => 'bar', 'foo2' => 'bar2'],
-        ];
+            'array_simple' => array('foo', 'bar'),
+            'array_associative' => array('foo' => 'bar', 'foo2' => 'bar2'),
+        );
 
         $cache = new PhpArrayCache(self::$file, new NullCache());
         $cache->warmUp($expected);
@@ -118,7 +116,7 @@ class PhpArrayCacheWrapper extends PhpArrayCache
 {
     public function set($key, $value, $ttl = null)
     {
-        \call_user_func(\Closure::bind(function () use ($key, $value) {
+        call_user_func(\Closure::bind(function () use ($key, $value) {
             $this->values[$key] = $value;
             $this->warmUp($this->values);
             $this->values = eval(substr(file_get_contents($this->file), 6));
@@ -129,10 +127,10 @@ class PhpArrayCacheWrapper extends PhpArrayCache
 
     public function setMultiple($values, $ttl = null)
     {
-        if (!\is_array($values) && !$values instanceof \Traversable) {
+        if (!is_array($values) && !$values instanceof \Traversable) {
             return parent::setMultiple($values, $ttl);
         }
-        \call_user_func(\Closure::bind(function () use ($values) {
+        call_user_func(\Closure::bind(function () use ($values) {
             foreach ($values as $key => $value) {
                 $this->values[$key] = $value;
             }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/PhpArrayCacheWithFallbackTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/PhpArrayCacheWithFallbackTest.php
index b08c1604..4b6a94f7 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/PhpArrayCacheWithFallbackTest.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/PhpArrayCacheWithFallbackTest.php
@@ -20,7 +20,7 @@ use Symfony\Component\Cache\Tests\Adapter\FilesystemAdapterTest;
  */
 class PhpArrayCacheWithFallbackTest extends CacheTestCase
 {
-    protected $skippedTests = [
+    protected $skippedTests = array(
         'testGetInvalidKeys' => 'PhpArrayCache does no validation',
         'testGetMultipleInvalidKeys' => 'PhpArrayCache does no validation',
         'testDeleteInvalidKeys' => 'PhpArrayCache does no validation',
@@ -32,19 +32,17 @@ class PhpArrayCacheWithFallbackTest extends CacheTestCase
         'testSetMultipleInvalidTtl' => 'PhpArrayCache does no validation',
         'testHasInvalidKeys' => 'PhpArrayCache does no validation',
         'testPrune' => 'PhpArrayCache just proxies',
-    ];
+    );
 
     protected static $file;
 
-    public static function setUpBeforeClass()
+    public static function setupBeforeClass()
     {
         self::$file = sys_get_temp_dir().'/symfony-cache/php-array-adapter-test.php';
     }
 
     protected function tearDown()
     {
-        $this->createSimpleCache()->clear();
-
         if (file_exists(sys_get_temp_dir().'/symfony-cache')) {
             FilesystemAdapterTest::rmdir(sys_get_temp_dir().'/symfony-cache');
         }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/PhpFilesCacheTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/PhpFilesCacheTest.php
index 936f29a4..7a402682 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/PhpFilesCacheTest.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/PhpFilesCacheTest.php
@@ -19,9 +19,9 @@ use Symfony\Component\Cache\Simple\PhpFilesCache;
  */
 class PhpFilesCacheTest extends CacheTestCase
 {
-    protected $skippedTests = [
+    protected $skippedTests = array(
         'testDefaultLifeTime' => 'PhpFilesCache does not allow configuring a default lifetime.',
-    ];
+    );
 
     public function createSimpleCache()
     {
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/Psr6CacheTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/Psr6CacheTest.php
index 1bc75c90..78582894 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/Psr6CacheTest.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/Psr6CacheTest.php
@@ -19,9 +19,9 @@ use Symfony\Component\Cache\Simple\Psr6Cache;
  */
 class Psr6CacheTest extends CacheTestCase
 {
-    protected $skippedTests = [
+    protected $skippedTests = array(
         'testPrune' => 'Psr6Cache just proxies',
-    ];
+    );
 
     public function createSimpleCache($defaultLifetime = 0)
     {
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/RedisArrayCacheTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/RedisArrayCacheTest.php
index ec5e4c06..3c903c8a 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/RedisArrayCacheTest.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/RedisArrayCacheTest.php
@@ -13,12 +13,12 @@ namespace Symfony\Component\Cache\Tests\Simple;
 
 class RedisArrayCacheTest extends AbstractRedisCacheTest
 {
-    public static function setUpBeforeClass()
+    public static function setupBeforeClass()
     {
         parent::setupBeforeClass();
         if (!class_exists('RedisArray')) {
             self::markTestSkipped('The RedisArray class is required.');
         }
-        self::$redis = new \RedisArray([getenv('REDIS_HOST')], ['lazy_connect' => true]);
+        self::$redis = new \RedisArray(array(getenv('REDIS_HOST')), array('lazy_connect' => true));
     }
 }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/RedisCacheTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/RedisCacheTest.php
index 8e3f6088..d33421f9 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/RedisCacheTest.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/RedisCacheTest.php
@@ -15,7 +15,7 @@ use Symfony\Component\Cache\Simple\RedisCache;
 
 class RedisCacheTest extends AbstractRedisCacheTest
 {
-    public static function setUpBeforeClass()
+    public static function setupBeforeClass()
     {
         parent::setupBeforeClass();
         self::$redis = RedisCache::createConnection('redis://'.getenv('REDIS_HOST'));
@@ -33,50 +33,50 @@ class RedisCacheTest extends AbstractRedisCacheTest
         $redis = RedisCache::createConnection('redis://'.$redisHost.'/2');
         $this->assertSame(2, $redis->getDbNum());
 
-        $redis = RedisCache::createConnection('redis://'.$redisHost, ['timeout' => 3]);
+        $redis = RedisCache::createConnection('redis://'.$redisHost, array('timeout' => 3));
         $this->assertEquals(3, $redis->getTimeout());
 
         $redis = RedisCache::createConnection('redis://'.$redisHost.'?timeout=4');
         $this->assertEquals(4, $redis->getTimeout());
 
-        $redis = RedisCache::createConnection('redis://'.$redisHost, ['read_timeout' => 5]);
+        $redis = RedisCache::createConnection('redis://'.$redisHost, array('read_timeout' => 5));
         $this->assertEquals(5, $redis->getReadTimeout());
     }
 
     /**
      * @dataProvider provideFailedCreateConnection
+     * @expectedException \Symfony\Component\Cache\Exception\InvalidArgumentException
+     * @expectedExceptionMessage Redis connection failed
      */
     public function testFailedCreateConnection($dsn)
     {
-        $this->expectException('Symfony\Component\Cache\Exception\InvalidArgumentException');
-        $this->expectExceptionMessage('Redis connection ');
         RedisCache::createConnection($dsn);
     }
 
     public function provideFailedCreateConnection()
     {
-        return [
-            ['redis://localhost:1234'],
-            ['redis://foo@localhost'],
-            ['redis://localhost/123'],
-        ];
+        return array(
+            array('redis://localhost:1234'),
+            array('redis://foo@localhost'),
+            array('redis://localhost/123'),
+        );
     }
 
     /**
      * @dataProvider provideInvalidCreateConnection
+     * @expectedException \Symfony\Component\Cache\Exception\InvalidArgumentException
+     * @expectedExceptionMessage Invalid Redis DSN
      */
     public function testInvalidCreateConnection($dsn)
     {
-        $this->expectException('Symfony\Component\Cache\Exception\InvalidArgumentException');
-        $this->expectExceptionMessage('Invalid Redis DSN');
         RedisCache::createConnection($dsn);
     }
 
     public function provideInvalidCreateConnection()
     {
-        return [
-            ['foo://localhost'],
-            ['redis://'],
-        ];
+        return array(
+            array('foo://localhost'),
+            array('redis://'),
+        );
     }
 }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/RedisClusterCacheTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/RedisClusterCacheTest.php
deleted file mode 100644
index 6b7f8039..00000000
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/RedisClusterCacheTest.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Cache\Tests\Simple;
-
-class RedisClusterCacheTest extends AbstractRedisCacheTest
-{
-    public static function setUpBeforeClass()
-    {
-        if (!class_exists('RedisCluster')) {
-            self::markTestSkipped('The RedisCluster class is required.');
-        }
-        if (!$hosts = getenv('REDIS_CLUSTER_HOSTS')) {
-            self::markTestSkipped('REDIS_CLUSTER_HOSTS env var is not defined.');
-        }
-
-        self::$redis = new \RedisCluster(null, explode(' ', $hosts));
-    }
-}
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/TraceableCacheTest.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/TraceableCacheTest.php
index e684caf3..535f93da 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/TraceableCacheTest.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Tests/Simple/TraceableCacheTest.php
@@ -19,9 +19,9 @@ use Symfony\Component\Cache\Simple\TraceableCache;
  */
 class TraceableCacheTest extends CacheTestCase
 {
-    protected $skippedTests = [
+    protected $skippedTests = array(
         'testPrune' => 'TraceableCache just proxies',
-    ];
+    );
 
     public function createSimpleCache($defaultLifetime = 0)
     {
@@ -37,7 +37,7 @@ class TraceableCacheTest extends CacheTestCase
 
         $call = $calls[0];
         $this->assertSame('get', $call->name);
-        $this->assertSame(['k' => false], $call->result);
+        $this->assertSame(array('k' => false), $call->result);
         $this->assertSame(0, $call->hits);
         $this->assertSame(1, $call->misses);
         $this->assertNotEmpty($call->start);
@@ -61,7 +61,7 @@ class TraceableCacheTest extends CacheTestCase
     {
         $pool = $this->createSimpleCache();
         $pool->set('k1', 123);
-        $values = $pool->getMultiple(['k0', 'k1']);
+        $values = $pool->getMultiple(array('k0', 'k1'));
         foreach ($values as $value) {
         }
         $calls = $pool->getCalls();
@@ -69,7 +69,7 @@ class TraceableCacheTest extends CacheTestCase
 
         $call = $calls[1];
         $this->assertSame('getMultiple', $call->name);
-        $this->assertSame(['k1' => true, 'k0' => false], $call->result);
+        $this->assertSame(array('k1' => true, 'k0' => false), $call->result);
         $this->assertSame(1, $call->misses);
         $this->assertNotEmpty($call->start);
         $this->assertNotEmpty($call->end);
@@ -84,7 +84,7 @@ class TraceableCacheTest extends CacheTestCase
 
         $call = $calls[0];
         $this->assertSame('has', $call->name);
-        $this->assertSame(['k' => false], $call->result);
+        $this->assertSame(array('k' => false), $call->result);
         $this->assertNotEmpty($call->start);
         $this->assertNotEmpty($call->end);
     }
@@ -99,7 +99,7 @@ class TraceableCacheTest extends CacheTestCase
 
         $call = $calls[1];
         $this->assertSame('has', $call->name);
-        $this->assertSame(['k' => true], $call->result);
+        $this->assertSame(array('k' => true), $call->result);
         $this->assertNotEmpty($call->start);
         $this->assertNotEmpty($call->end);
     }
@@ -113,7 +113,7 @@ class TraceableCacheTest extends CacheTestCase
 
         $call = $calls[0];
         $this->assertSame('delete', $call->name);
-        $this->assertSame(['k' => true], $call->result);
+        $this->assertSame(array('k' => true), $call->result);
         $this->assertSame(0, $call->hits);
         $this->assertSame(0, $call->misses);
         $this->assertNotEmpty($call->start);
@@ -123,14 +123,14 @@ class TraceableCacheTest extends CacheTestCase
     public function testDeleteMultipleTrace()
     {
         $pool = $this->createSimpleCache();
-        $arg = ['k0', 'k1'];
+        $arg = array('k0', 'k1');
         $pool->deleteMultiple($arg);
         $calls = $pool->getCalls();
         $this->assertCount(1, $calls);
 
         $call = $calls[0];
         $this->assertSame('deleteMultiple', $call->name);
-        $this->assertSame(['keys' => $arg, 'result' => true], $call->result);
+        $this->assertSame(array('keys' => $arg, 'result' => true), $call->result);
         $this->assertSame(0, $call->hits);
         $this->assertSame(0, $call->misses);
         $this->assertNotEmpty($call->start);
@@ -146,7 +146,7 @@ class TraceableCacheTest extends CacheTestCase
 
         $call = $calls[0];
         $this->assertSame('set', $call->name);
-        $this->assertSame(['k' => true], $call->result);
+        $this->assertSame(array('k' => true), $call->result);
         $this->assertSame(0, $call->hits);
         $this->assertSame(0, $call->misses);
         $this->assertNotEmpty($call->start);
@@ -156,13 +156,13 @@ class TraceableCacheTest extends CacheTestCase
     public function testSetMultipleTrace()
     {
         $pool = $this->createSimpleCache();
-        $pool->setMultiple(['k' => 'foo']);
+        $pool->setMultiple(array('k' => 'foo'));
         $calls = $pool->getCalls();
         $this->assertCount(1, $calls);
 
         $call = $calls[0];
         $this->assertSame('setMultiple', $call->name);
-        $this->assertSame(['keys' => ['k'], 'result' => true], $call->result);
+        $this->assertSame(array('keys' => array('k'), 'result' => true), $call->result);
         $this->assertSame(0, $call->hits);
         $this->assertSame(0, $call->misses);
         $this->assertNotEmpty($call->start);
diff --git a/advancedcontentfilter/vendor/symfony/cache/Tests/Traits/PdoPruneableTrait.php b/advancedcontentfilter/vendor/symfony/cache/Tests/Traits/PdoPruneableTrait.php
index c405de70..a9c459fb 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Tests/Traits/PdoPruneableTrait.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Tests/Traits/PdoPruneableTrait.php
@@ -24,11 +24,11 @@ trait PdoPruneableTrait
         $getPdoConn = $o->getMethod('getConnection');
         $getPdoConn->setAccessible(true);
 
-        /** @var \Doctrine\DBAL\Statement|\PDOStatement $select */
+        /** @var \Doctrine\DBAL\Statement $select */
         $select = $getPdoConn->invoke($cache)->prepare('SELECT 1 FROM cache_items WHERE item_id LIKE :id');
         $select->bindValue(':id', sprintf('%%%s', $name));
-        $result = $select->execute();
+        $select->execute();
 
-        return 1 !== (int) (\is_object($result) ? $result->fetchOne() : $select->fetch(\PDO::FETCH_COLUMN));
+        return 0 === count($select->fetchAll(\PDO::FETCH_COLUMN));
     }
 }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Traits/AbstractAdapterTrait.php b/advancedcontentfilter/vendor/symfony/cache/Traits/AbstractAdapterTrait.php
deleted file mode 100644
index 388c1df3..00000000
--- a/advancedcontentfilter/vendor/symfony/cache/Traits/AbstractAdapterTrait.php
+++ /dev/null
@@ -1,164 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Cache\Traits;
-
-use Psr\Cache\CacheItemInterface;
-use Symfony\Component\Cache\CacheItem;
-use Symfony\Component\Cache\Exception\InvalidArgumentException;
-
-/**
- * @author Nicolas Grekas <p@tchwork.com>
- *
- * @internal
- */
-trait AbstractAdapterTrait
-{
-    use AbstractTrait;
-
-    /**
-     * @var \Closure needs to be set by class, signature is function(string <key>, mixed <value>, bool <isHit>)
-     */
-    private $createCacheItem;
-
-    /**
-     * @var \Closure needs to be set by class, signature is function(array <deferred>, string <namespace>, array <&expiredIds>)
-     */
-    private $mergeByLifetime;
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getItem($key)
-    {
-        $id = $this->getId($key);
-
-        if (isset($this->deferred[$key])) {
-            $this->commit();
-        }
-
-        $f = $this->createCacheItem;
-        $isHit = false;
-        $value = null;
-
-        try {
-            foreach ($this->doFetch([$id]) as $value) {
-                $isHit = true;
-            }
-
-            return $f($key, $value, $isHit);
-        } catch (\Exception $e) {
-            CacheItem::log($this->logger, 'Failed to fetch key "{key}": '.$e->getMessage(), ['key' => $key, 'exception' => $e]);
-        }
-
-        return $f($key, null, false);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getItems(array $keys = [])
-    {
-        $ids = [];
-        $commit = false;
-
-        foreach ($keys as $key) {
-            $ids[] = $this->getId($key);
-            $commit = $commit || isset($this->deferred[$key]);
-        }
-
-        if ($commit) {
-            $this->commit();
-        }
-
-        try {
-            $items = $this->doFetch($ids);
-        } catch (\Exception $e) {
-            CacheItem::log($this->logger, 'Failed to fetch items: '.$e->getMessage(), ['keys' => $keys, 'exception' => $e]);
-            $items = [];
-        }
-        $ids = array_combine($ids, $keys);
-
-        return $this->generateItems($items, $ids);
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @return bool
-     */
-    public function save(CacheItemInterface $item)
-    {
-        if (!$item instanceof CacheItem) {
-            return false;
-        }
-        $this->deferred[$item->getKey()] = $item;
-
-        return $this->commit();
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @return bool
-     */
-    public function saveDeferred(CacheItemInterface $item)
-    {
-        if (!$item instanceof CacheItem) {
-            return false;
-        }
-        $this->deferred[$item->getKey()] = $item;
-
-        return true;
-    }
-
-    /**
-     * @return array
-     */
-    public function __sleep()
-    {
-        throw new \BadMethodCallException('Cannot serialize '.__CLASS__);
-    }
-
-    public function __wakeup()
-    {
-        throw new \BadMethodCallException('Cannot unserialize '.__CLASS__);
-    }
-
-    public function __destruct()
-    {
-        if ($this->deferred) {
-            $this->commit();
-        }
-    }
-
-    private function generateItems(iterable $items, array &$keys): iterable
-    {
-        $f = $this->createCacheItem;
-
-        try {
-            foreach ($items as $id => $value) {
-                if (!isset($keys[$id])) {
-                    throw new InvalidArgumentException(sprintf('Could not match value id "%s" to keys "%s".', $id, implode('", "', $keys)));
-                }
-                $key = $keys[$id];
-                unset($keys[$id]);
-                yield $key => $f($key, $value, true);
-            }
-        } catch (\Exception $e) {
-            CacheItem::log($this->logger, 'Failed to fetch items: '.$e->getMessage(), ['keys' => array_values($keys), 'exception' => $e]);
-        }
-
-        foreach ($keys as $key) {
-            yield $key => $f($key, null, false);
-        }
-    }
-}
diff --git a/advancedcontentfilter/vendor/symfony/cache/Traits/AbstractTrait.php b/advancedcontentfilter/vendor/symfony/cache/Traits/AbstractTrait.php
index b0478806..d7af3b55 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Traits/AbstractTrait.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Traits/AbstractTrait.php
@@ -26,8 +26,7 @@ trait AbstractTrait
     private $namespace;
     private $namespaceVersion = '';
     private $versioningIsEnabled = false;
-    private $deferred = [];
-    private $ids = [];
+    private $deferred = array();
 
     /**
      * @var int|null The maximum length to enforce for identifiers or null when no limit applies
@@ -55,7 +54,7 @@ trait AbstractTrait
     /**
      * Deletes all items in the pool.
      *
-     * @param string $namespace The prefix used for all identifiers managed by this pool
+     * @param string The prefix used for all identifiers managed by this pool
      *
      * @return bool True if the pool was successfully cleared, false otherwise
      */
@@ -78,12 +77,10 @@ trait AbstractTrait
      *
      * @return array|bool The identifiers that failed to be cached or a boolean stating if caching succeeded or not
      */
-    abstract protected function doSave(array $values, int $lifetime);
+    abstract protected function doSave(array $values, $lifetime);
 
     /**
      * {@inheritdoc}
-     *
-     * @return bool
      */
     public function hasItem($key)
     {
@@ -96,7 +93,7 @@ trait AbstractTrait
         try {
             return $this->doHave($id);
         } catch (\Exception $e) {
-            CacheItem::log($this->logger, 'Failed to check if key "{key}" is cached: '.$e->getMessage(), ['key' => $key, 'exception' => $e]);
+            CacheItem::log($this->logger, 'Failed to check if key "{key}" is cached', array('key' => $key, 'exception' => $e));
 
             return false;
         }
@@ -104,43 +101,23 @@ trait AbstractTrait
 
     /**
      * {@inheritdoc}
-     *
-     * @param string $prefix
-     *
-     * @return bool
      */
-    public function clear(/* string $prefix = '' */)
+    public function clear()
     {
-        $this->deferred = [];
         if ($cleared = $this->versioningIsEnabled) {
-            if ('' === $namespaceVersionToClear = $this->namespaceVersion) {
-                foreach ($this->doFetch([static::NS_SEPARATOR.$this->namespace]) as $v) {
-                    $namespaceVersionToClear = $v;
-                }
+            $this->namespaceVersion = 2;
+            foreach ($this->doFetch(array('@'.$this->namespace)) as $v) {
+                $this->namespaceVersion = 1 + (int) $v;
             }
-            $namespaceToClear = $this->namespace.$namespaceVersionToClear;
-            $namespaceVersion = self::formatNamespaceVersion(mt_rand());
-            try {
-                $e = $this->doSave([static::NS_SEPARATOR.$this->namespace => $namespaceVersion], 0);
-            } catch (\Exception $e) {
-            }
-            if (true !== $e && [] !== $e) {
-                $cleared = false;
-                $message = 'Failed to save the new namespace'.($e instanceof \Exception ? ': '.$e->getMessage() : '.');
-                CacheItem::log($this->logger, $message, ['exception' => $e instanceof \Exception ? $e : null]);
-            } else {
-                $this->namespaceVersion = $namespaceVersion;
-                $this->ids = [];
-            }
-        } else {
-            $prefix = 0 < \func_num_args() ? (string) func_get_arg(0) : '';
-            $namespaceToClear = $this->namespace.$prefix;
+            $this->namespaceVersion .= ':';
+            $cleared = $this->doSave(array('@'.$this->namespace => $this->namespaceVersion), 0);
         }
+        $this->deferred = array();
 
         try {
-            return $this->doClear($namespaceToClear) || $cleared;
+            return $this->doClear($this->namespace) || $cleared;
         } catch (\Exception $e) {
-            CacheItem::log($this->logger, 'Failed to clear the cache: '.$e->getMessage(), ['exception' => $e]);
+            CacheItem::log($this->logger, 'Failed to clear the cache', array('exception' => $e));
 
             return false;
         }
@@ -148,22 +125,18 @@ trait AbstractTrait
 
     /**
      * {@inheritdoc}
-     *
-     * @return bool
      */
     public function deleteItem($key)
     {
-        return $this->deleteItems([$key]);
+        return $this->deleteItems(array($key));
     }
 
     /**
      * {@inheritdoc}
-     *
-     * @return bool
      */
     public function deleteItems(array $keys)
     {
-        $ids = [];
+        $ids = array();
 
         foreach ($keys as $key) {
             $ids[$key] = $this->getId($key);
@@ -183,13 +156,12 @@ trait AbstractTrait
         foreach ($ids as $key => $id) {
             try {
                 $e = null;
-                if ($this->doDelete([$id])) {
+                if ($this->doDelete(array($id))) {
                     continue;
                 }
             } catch (\Exception $e) {
             }
-            $message = 'Failed to delete key "{key}"'.($e instanceof \Exception ? ': '.$e->getMessage() : '.');
-            CacheItem::log($this->logger, $message, ['key' => $key, 'exception' => $e]);
+            CacheItem::log($this->logger, 'Failed to delete key "{key}"', array('key' => $key, 'exception' => $e));
             $ok = false;
         }
 
@@ -213,7 +185,6 @@ trait AbstractTrait
         $wasEnabled = $this->versioningIsEnabled;
         $this->versioningIsEnabled = (bool) $enable;
         $this->namespaceVersion = '';
-        $this->ids = [];
 
         return $wasEnabled;
     }
@@ -227,7 +198,6 @@ trait AbstractTrait
             $this->commit();
         }
         $this->namespaceVersion = '';
-        $this->ids = [];
     }
 
     /**
@@ -238,13 +208,9 @@ trait AbstractTrait
      * @return mixed
      *
      * @throws \Exception
-     *
-     * @deprecated since Symfony 4.2, use DefaultMarshaller instead.
      */
     protected static function unserialize($value)
     {
-        @trigger_error(sprintf('The "%s::unserialize()" method is deprecated since Symfony 4.2, use DefaultMarshaller instead.', __CLASS__), \E_USER_DEPRECATED);
-
         if ('b:0;' === $value) {
             return false;
         }
@@ -253,53 +219,30 @@ trait AbstractTrait
             if (false !== $value = unserialize($value)) {
                 return $value;
             }
-            throw new \DomainException('Failed to unserialize cached value.');
+            throw new \DomainException('Failed to unserialize cached value');
         } catch (\Error $e) {
-            throw new \ErrorException($e->getMessage(), $e->getCode(), \E_ERROR, $e->getFile(), $e->getLine());
+            throw new \ErrorException($e->getMessage(), $e->getCode(), E_ERROR, $e->getFile(), $e->getLine());
         } finally {
             ini_set('unserialize_callback_func', $unserializeCallbackHandler);
         }
     }
 
-    private function getId($key): string
+    private function getId($key)
     {
-        if ($this->versioningIsEnabled && '' === $this->namespaceVersion) {
-            $this->ids = [];
-            $this->namespaceVersion = '1'.static::NS_SEPARATOR;
-            try {
-                foreach ($this->doFetch([static::NS_SEPARATOR.$this->namespace]) as $v) {
-                    $this->namespaceVersion = $v;
-                }
-                $e = true;
-                if ('1'.static::NS_SEPARATOR === $this->namespaceVersion) {
-                    $this->namespaceVersion = self::formatNamespaceVersion(time());
-                    $e = $this->doSave([static::NS_SEPARATOR.$this->namespace => $this->namespaceVersion], 0);
-                }
-            } catch (\Exception $e) {
-            }
-            if (true !== $e && [] !== $e) {
-                $message = 'Failed to save the new namespace'.($e instanceof \Exception ? ': '.$e->getMessage() : '.');
-                CacheItem::log($this->logger, $message, ['exception' => $e instanceof \Exception ? $e : null]);
-            }
-        }
-
-        if (\is_string($key) && isset($this->ids[$key])) {
-            return $this->namespace.$this->namespaceVersion.$this->ids[$key];
-        }
         CacheItem::validateKey($key);
-        $this->ids[$key] = $key;
 
-        if (\count($this->ids) > 1000) {
-            $this->ids = \array_slice($this->ids, 500, null, true); // stop memory leak if there are many keys
+        if ($this->versioningIsEnabled && '' === $this->namespaceVersion) {
+            $this->namespaceVersion = '1:';
+            foreach ($this->doFetch(array('@'.$this->namespace)) as $v) {
+                $this->namespaceVersion = $v;
+            }
         }
 
         if (null === $this->maxIdLength) {
             return $this->namespace.$this->namespaceVersion.$key;
         }
-        if (\strlen($id = $this->namespace.$this->namespaceVersion.$key) > $this->maxIdLength) {
-            // Use MD5 to favor speed over security, which is not an issue here
-            $this->ids[$key] = $id = substr_replace(base64_encode(hash('md5', $key, true)), static::NS_SEPARATOR, -(\strlen($this->namespaceVersion) + 2));
-            $id = $this->namespace.$this->namespaceVersion.$id;
+        if (strlen($id = $this->namespace.$this->namespaceVersion.$key) > $this->maxIdLength) {
+            $id = $this->namespace.$this->namespaceVersion.substr_replace(base64_encode(hash('sha256', $key, true)), ':', -22);
         }
 
         return $id;
@@ -312,9 +255,4 @@ trait AbstractTrait
     {
         throw new \DomainException('Class not found: '.$class);
     }
-
-    private static function formatNamespaceVersion(int $value): string
-    {
-        return strtr(substr_replace(base64_encode(pack('V', $value)), static::NS_SEPARATOR, 5), '/', '_');
-    }
 }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Traits/ApcuTrait.php b/advancedcontentfilter/vendor/symfony/cache/Traits/ApcuTrait.php
index 46bd20fe..fe7dfbab 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Traits/ApcuTrait.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Traits/ApcuTrait.php
@@ -23,15 +23,15 @@ trait ApcuTrait
 {
     public static function isSupported()
     {
-        return \function_exists('apcu_fetch') && filter_var(\ini_get('apc.enabled'), \FILTER_VALIDATE_BOOLEAN);
+        return function_exists('apcu_fetch') && ini_get('apc.enabled');
     }
 
-    private function init(string $namespace, int $defaultLifetime, ?string $version)
+    private function init($namespace, $defaultLifetime, $version)
     {
         if (!static::isSupported()) {
-            throw new CacheException('APCu is not enabled.');
+            throw new CacheException('APCu is not enabled');
         }
-        if ('cli' === \PHP_SAPI) {
+        if ('cli' === PHP_SAPI) {
             ini_set('apc.use_request_time', 0);
         }
         parent::__construct($namespace, $defaultLifetime);
@@ -51,27 +51,14 @@ trait ApcuTrait
      */
     protected function doFetch(array $ids)
     {
-        $unserializeCallbackHandler = ini_set('unserialize_callback_func', __CLASS__.'::handleUnserializeCallback');
         try {
-            $values = [];
-            $ids = array_flip($ids);
-            foreach (apcu_fetch(array_keys($ids), $ok) ?: [] as $k => $v) {
-                if (!isset($ids[$k])) {
-                    // work around https://github.com/krakjoe/apcu/issues/247
-                    $k = key($ids);
-                }
-                unset($ids[$k]);
-
+            foreach (apcu_fetch($ids, $ok) ?: array() as $k => $v) {
                 if (null !== $v || $ok) {
-                    $values[$k] = $v;
+                    yield $k => $v;
                 }
             }
-
-            return $values;
         } catch (\Error $e) {
-            throw new \ErrorException($e->getMessage(), $e->getCode(), \E_ERROR, $e->getFile(), $e->getLine());
-        } finally {
-            ini_set('unserialize_callback_func', $unserializeCallbackHandler);
+            throw new \ErrorException($e->getMessage(), $e->getCode(), E_ERROR, $e->getFile(), $e->getLine());
         }
     }
 
@@ -88,8 +75,8 @@ trait ApcuTrait
      */
     protected function doClear($namespace)
     {
-        return isset($namespace[0]) && class_exists(\APCUIterator::class, false) && ('cli' !== \PHP_SAPI || filter_var(\ini_get('apc.enable_cli'), \FILTER_VALIDATE_BOOLEAN))
-            ? apcu_delete(new \APCUIterator(sprintf('/^%s/', preg_quote($namespace, '/')), \APC_ITER_KEY))
+        return isset($namespace[0]) && class_exists('APCuIterator', false) && ('cli' !== PHP_SAPI || ini_get('apc.enable_cli'))
+            ? apcu_delete(new \APCuIterator(sprintf('/^%s/', preg_quote($namespace, '/')), APC_ITER_KEY))
             : apcu_clear_cache();
     }
 
@@ -108,7 +95,7 @@ trait ApcuTrait
     /**
      * {@inheritdoc}
      */
-    protected function doSave(array $values, int $lifetime)
+    protected function doSave(array $values, $lifetime)
     {
         try {
             if (false === $failures = apcu_store($values, null, $lifetime)) {
@@ -116,13 +103,15 @@ trait ApcuTrait
             }
 
             return array_keys($failures);
-        } catch (\Throwable $e) {
-            if (1 === \count($values)) {
-                // Workaround https://github.com/krakjoe/apcu/issues/170
-                apcu_delete(array_key_first($values));
-            }
-
-            throw $e;
+        } catch (\Error $e) {
+        } catch (\Exception $e) {
         }
+
+        if (1 === count($values)) {
+            // Workaround https://github.com/krakjoe/apcu/issues/170
+            apcu_delete(key($values));
+        }
+
+        throw $e;
     }
 }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Traits/ArrayTrait.php b/advancedcontentfilter/vendor/symfony/cache/Traits/ArrayTrait.php
index e41daebc..b7d2ad6d 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Traits/ArrayTrait.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Traits/ArrayTrait.php
@@ -24,8 +24,8 @@ trait ArrayTrait
     use LoggerAwareTrait;
 
     private $storeSerialized;
-    private $values = [];
-    private $expiries = [];
+    private $values = array();
+    private $expiries = array();
 
     /**
      * Returns all cached values, with cache miss as null.
@@ -34,72 +34,36 @@ trait ArrayTrait
      */
     public function getValues()
     {
-        if (!$this->storeSerialized) {
-            return $this->values;
-        }
-
-        $values = $this->values;
-        foreach ($values as $k => $v) {
-            if (null === $v || 'N;' === $v) {
-                continue;
-            }
-            if (!\is_string($v) || !isset($v[2]) || ':' !== $v[1]) {
-                $values[$k] = serialize($v);
-            }
-        }
-
-        return $values;
+        return $this->values;
     }
 
     /**
      * {@inheritdoc}
-     *
-     * @return bool
      */
     public function hasItem($key)
     {
-        if (\is_string($key) && isset($this->expiries[$key]) && $this->expiries[$key] > microtime(true)) {
-            return true;
-        }
         CacheItem::validateKey($key);
 
-        return isset($this->expiries[$key]) && !$this->deleteItem($key);
+        return isset($this->expiries[$key]) && ($this->expiries[$key] >= time() || !$this->deleteItem($key));
     }
 
     /**
      * {@inheritdoc}
-     *
-     * @param string $prefix
-     *
-     * @return bool
      */
-    public function clear(/* string $prefix = '' */)
+    public function clear()
     {
-        $prefix = 0 < \func_num_args() ? (string) func_get_arg(0) : '';
-
-        if ('' !== $prefix) {
-            foreach ($this->values as $key => $value) {
-                if (str_starts_with($key, $prefix)) {
-                    unset($this->values[$key], $this->expiries[$key]);
-                }
-            }
-        } else {
-            $this->values = $this->expiries = [];
-        }
+        $this->values = $this->expiries = array();
 
         return true;
     }
 
     /**
      * {@inheritdoc}
-     *
-     * @return bool
      */
     public function deleteItem($key)
     {
-        if (!\is_string($key) || !isset($this->expiries[$key])) {
-            CacheItem::validateKey($key);
-        }
+        CacheItem::validateKey($key);
+
         unset($this->values[$key], $this->expiries[$key]);
 
         return true;
@@ -113,13 +77,24 @@ trait ArrayTrait
         $this->clear();
     }
 
-    private function generateItems(array $keys, float $now, callable $f): iterable
+    private function generateItems(array $keys, $now, $f)
     {
         foreach ($keys as $i => $key) {
-            if (!$isHit = isset($this->expiries[$key]) && ($this->expiries[$key] > $now || !$this->deleteItem($key))) {
+            try {
+                if (!$isHit = isset($this->expiries[$key]) && ($this->expiries[$key] >= $now || !$this->deleteItem($key))) {
+                    $this->values[$key] = $value = null;
+                } elseif (!$this->storeSerialized) {
+                    $value = $this->values[$key];
+                } elseif ('b:0;' === $value = $this->values[$key]) {
+                    $value = false;
+                } elseif (false === $value = unserialize($value)) {
+                    $this->values[$key] = $value = null;
+                    $isHit = false;
+                }
+            } catch (\Exception $e) {
+                CacheItem::log($this->logger, 'Failed to unserialize key "{key}"', array('key' => $key, 'exception' => $e));
                 $this->values[$key] = $value = null;
-            } else {
-                $value = $this->storeSerialized ? $this->unfreeze($key, $isHit) : $this->values[$key];
+                $isHit = false;
             }
             unset($keys[$i]);
 
@@ -130,55 +105,4 @@ trait ArrayTrait
             yield $key => $f($key, null, false);
         }
     }
-
-    private function freeze($value, $key)
-    {
-        if (null === $value) {
-            return 'N;';
-        }
-        if (\is_string($value)) {
-            // Serialize strings if they could be confused with serialized objects or arrays
-            if ('N;' === $value || (isset($value[2]) && ':' === $value[1])) {
-                return serialize($value);
-            }
-        } elseif (!\is_scalar($value)) {
-            try {
-                $serialized = serialize($value);
-            } catch (\Exception $e) {
-                unset($this->values[$key]);
-                $type = \is_object($value) ? \get_class($value) : \gettype($value);
-                $message = sprintf('Failed to save key "{key}" of type %s: ', $type).$e->getMessage();
-                CacheItem::log($this->logger, $message, ['key' => $key, 'exception' => $e]);
-
-                return null;
-            }
-            // Keep value serialized if it contains any objects or any internal references
-            if ('C' === $serialized[0] || 'O' === $serialized[0] || preg_match('/;[OCRr]:[1-9]/', $serialized)) {
-                return $serialized;
-            }
-        }
-
-        return $value;
-    }
-
-    private function unfreeze(string $key, bool &$isHit)
-    {
-        if ('N;' === $value = $this->values[$key]) {
-            return null;
-        }
-        if (\is_string($value) && isset($value[2]) && ':' === $value[1]) {
-            try {
-                $value = unserialize($value);
-            } catch (\Exception $e) {
-                CacheItem::log($this->logger, 'Failed to unserialize key "{key}": '.$e->getMessage(), ['key' => $key, 'exception' => $e]);
-                $value = false;
-            }
-            if (false === $value) {
-                $this->values[$key] = $value = null;
-                $isHit = false;
-            }
-        }
-
-        return $value;
-    }
 }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Traits/ContractsTrait.php b/advancedcontentfilter/vendor/symfony/cache/Traits/ContractsTrait.php
deleted file mode 100644
index 49a96eed..00000000
--- a/advancedcontentfilter/vendor/symfony/cache/Traits/ContractsTrait.php
+++ /dev/null
@@ -1,109 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Cache\Traits;
-
-use Psr\Log\LoggerInterface;
-use Symfony\Component\Cache\Adapter\AdapterInterface;
-use Symfony\Component\Cache\CacheItem;
-use Symfony\Component\Cache\Exception\InvalidArgumentException;
-use Symfony\Component\Cache\LockRegistry;
-use Symfony\Contracts\Cache\CacheInterface;
-use Symfony\Contracts\Cache\CacheTrait;
-use Symfony\Contracts\Cache\ItemInterface;
-
-/**
- * @author Nicolas Grekas <p@tchwork.com>
- *
- * @internal
- */
-trait ContractsTrait
-{
-    use CacheTrait {
-        doGet as private contractsGet;
-    }
-
-    private $callbackWrapper;
-    private $computing = [];
-
-    /**
-     * Wraps the callback passed to ->get() in a callable.
-     *
-     * @return callable the previous callback wrapper
-     */
-    public function setCallbackWrapper(?callable $callbackWrapper): callable
-    {
-        if (!isset($this->callbackWrapper)) {
-            $this->callbackWrapper = \Closure::fromCallable([LockRegistry::class, 'compute']);
-
-            if (\in_array(\PHP_SAPI, ['cli', 'phpdbg'], true)) {
-                $this->setCallbackWrapper(null);
-            }
-        }
-
-        $previousWrapper = $this->callbackWrapper;
-        $this->callbackWrapper = $callbackWrapper ?? static function (callable $callback, ItemInterface $item, bool &$save, CacheInterface $pool, \Closure $setMetadata, ?LoggerInterface $logger) {
-            return $callback($item, $save);
-        };
-
-        return $previousWrapper;
-    }
-
-    private function doGet(AdapterInterface $pool, string $key, callable $callback, ?float $beta, array &$metadata = null)
-    {
-        if (0 > $beta = $beta ?? 1.0) {
-            throw new InvalidArgumentException(sprintf('Argument "$beta" provided to "%s::get()" must be a positive number, %f given.', static::class, $beta));
-        }
-
-        static $setMetadata;
-
-        $setMetadata = $setMetadata ?? \Closure::bind(
-            static function (CacheItem $item, float $startTime, ?array &$metadata) {
-                if ($item->expiry > $endTime = microtime(true)) {
-                    $item->newMetadata[CacheItem::METADATA_EXPIRY] = $metadata[CacheItem::METADATA_EXPIRY] = $item->expiry;
-                    $item->newMetadata[CacheItem::METADATA_CTIME] = $metadata[CacheItem::METADATA_CTIME] = (int) ceil(1000 * ($endTime - $startTime));
-                } else {
-                    unset($metadata[CacheItem::METADATA_EXPIRY], $metadata[CacheItem::METADATA_CTIME]);
-                }
-            },
-            null,
-            CacheItem::class
-        );
-
-        return $this->contractsGet($pool, $key, function (CacheItem $item, bool &$save) use ($pool, $callback, $setMetadata, &$metadata, $key) {
-            // don't wrap nor save recursive calls
-            if (isset($this->computing[$key])) {
-                $value = $callback($item, $save);
-                $save = false;
-
-                return $value;
-            }
-
-            $this->computing[$key] = $key;
-            $startTime = microtime(true);
-
-            if (!isset($this->callbackWrapper)) {
-                $this->setCallbackWrapper($this->setCallbackWrapper(null));
-            }
-
-            try {
-                $value = ($this->callbackWrapper)($callback, $item, $save, $pool, function (CacheItem $item) use ($setMetadata, $startTime, &$metadata) {
-                    $setMetadata($item, $startTime, $metadata);
-                }, $this->logger ?? null);
-                $setMetadata($item, $startTime, $metadata);
-
-                return $value;
-            } finally {
-                unset($this->computing[$key]);
-            }
-        }, $beta, $metadata, $this->logger ?? null);
-    }
-}
diff --git a/advancedcontentfilter/vendor/symfony/cache/Traits/DoctrineTrait.php b/advancedcontentfilter/vendor/symfony/cache/Traits/DoctrineTrait.php
index ae14db01..c87ecaba 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Traits/DoctrineTrait.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Traits/DoctrineTrait.php
@@ -45,7 +45,7 @@ trait DoctrineTrait
                     case 'unserialize':
                     case 'apcu_fetch':
                     case 'apc_fetch':
-                        throw new \ErrorException($e->getMessage(), $e->getCode(), \E_ERROR, $e->getFile(), $e->getLine());
+                        throw new \ErrorException($e->getMessage(), $e->getCode(), E_ERROR, $e->getFile(), $e->getLine());
                 }
             }
 
@@ -91,7 +91,7 @@ trait DoctrineTrait
     /**
      * {@inheritdoc}
      */
-    protected function doSave(array $values, int $lifetime)
+    protected function doSave(array $values, $lifetime)
     {
         return $this->provider->saveMultiple($values, $lifetime);
     }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Traits/FilesystemCommonTrait.php b/advancedcontentfilter/vendor/symfony/cache/Traits/FilesystemCommonTrait.php
index 4e06495d..b0f495e4 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Traits/FilesystemCommonTrait.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Traits/FilesystemCommonTrait.php
@@ -23,10 +23,10 @@ trait FilesystemCommonTrait
     private $directory;
     private $tmp;
 
-    private function init(string $namespace, ?string $directory)
+    private function init($namespace, $directory)
     {
         if (!isset($directory[0])) {
-            $directory = sys_get_temp_dir().\DIRECTORY_SEPARATOR.'symfony-cache';
+            $directory = sys_get_temp_dir().'/symfony-cache';
         } else {
             $directory = realpath($directory) ?: $directory;
         }
@@ -34,17 +34,15 @@ trait FilesystemCommonTrait
             if (preg_match('#[^-+_.A-Za-z0-9]#', $namespace, $match)) {
                 throw new InvalidArgumentException(sprintf('Namespace contains "%s" but only characters in [-+_.A-Za-z0-9] are allowed.', $match[0]));
             }
-            $directory .= \DIRECTORY_SEPARATOR.$namespace;
-        } else {
-            $directory .= \DIRECTORY_SEPARATOR.'@';
+            $directory .= DIRECTORY_SEPARATOR.$namespace;
         }
         if (!file_exists($directory)) {
             @mkdir($directory, 0777, true);
         }
-        $directory .= \DIRECTORY_SEPARATOR;
+        $directory .= DIRECTORY_SEPARATOR;
         // On Windows the whole path is limited to 258 chars
-        if ('\\' === \DIRECTORY_SEPARATOR && \strlen($directory) > 234) {
-            throw new InvalidArgumentException(sprintf('Cache directory too long (%s).', $directory));
+        if ('\\' === DIRECTORY_SEPARATOR && strlen($directory) > 234) {
+            throw new InvalidArgumentException(sprintf('Cache directory too long (%s)', $directory));
         }
 
         $this->directory = $directory;
@@ -57,12 +55,8 @@ trait FilesystemCommonTrait
     {
         $ok = true;
 
-        foreach ($this->scanHashDir($this->directory) as $file) {
-            if ('' !== $namespace && !str_starts_with($this->getFileKey($file), $namespace)) {
-                continue;
-            }
-
-            $ok = ($this->doUnlink($file) || !file_exists($file)) && $ok;
+        foreach (new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($this->directory, \FilesystemIterator::SKIP_DOTS)) as $file) {
+            $ok = ($file->isDir() || @unlink($file) || !file_exists($file)) && $ok;
         }
 
         return $ok;
@@ -77,39 +71,23 @@ trait FilesystemCommonTrait
 
         foreach ($ids as $id) {
             $file = $this->getFile($id);
-            $ok = (!file_exists($file) || $this->doUnlink($file) || !file_exists($file)) && $ok;
+            $ok = (!file_exists($file) || @unlink($file) || !file_exists($file)) && $ok;
         }
 
         return $ok;
     }
 
-    protected function doUnlink($file)
-    {
-        return @unlink($file);
-    }
-
-    private function write(string $file, string $data, int $expiresAt = null)
+    private function write($file, $data, $expiresAt = null)
     {
         set_error_handler(__CLASS__.'::throwError');
         try {
             if (null === $this->tmp) {
-                $this->tmp = $this->directory.bin2hex(random_bytes(6));
+                $this->tmp = $this->directory.uniqid('', true);
             }
-            try {
-                $h = fopen($this->tmp, 'x');
-            } catch (\ErrorException $e) {
-                if (!str_contains($e->getMessage(), 'File exists')) {
-                    throw $e;
-                }
-
-                $this->tmp = $this->directory.bin2hex(random_bytes(6));
-                $h = fopen($this->tmp, 'x');
-            }
-            fwrite($h, $data);
-            fclose($h);
+            file_put_contents($this->tmp, $data);
 
             if (null !== $expiresAt) {
-                touch($this->tmp, $expiresAt ?: time() + 31556952); // 1 year in seconds
+                touch($this->tmp, $expiresAt);
             }
 
             return rename($this->tmp, $file);
@@ -118,11 +96,10 @@ trait FilesystemCommonTrait
         }
     }
 
-    private function getFile(string $id, bool $mkdir = false, string $directory = null)
+    private function getFile($id, $mkdir = false)
     {
-        // Use MD5 to favor speed over security, which is not an issue here
-        $hash = str_replace('/', '-', base64_encode(hash('md5', static::class.$id, true)));
-        $dir = ($directory ?? $this->directory).strtoupper($hash[0].\DIRECTORY_SEPARATOR.$hash[1].\DIRECTORY_SEPARATOR);
+        $hash = str_replace('/', '-', base64_encode(hash('sha256', static::class.$id, true)));
+        $dir = $this->directory.strtoupper($hash[0].DIRECTORY_SEPARATOR.$hash[1].DIRECTORY_SEPARATOR);
 
         if ($mkdir && !file_exists($dir)) {
             @mkdir($dir, 0777, true);
@@ -131,38 +108,6 @@ trait FilesystemCommonTrait
         return $dir.substr($hash, 2, 20);
     }
 
-    private function getFileKey(string $file): string
-    {
-        return '';
-    }
-
-    private function scanHashDir(string $directory): \Generator
-    {
-        if (!file_exists($directory)) {
-            return;
-        }
-
-        $chars = '+-ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
-
-        for ($i = 0; $i < 38; ++$i) {
-            if (!file_exists($directory.$chars[$i])) {
-                continue;
-            }
-
-            for ($j = 0; $j < 38; ++$j) {
-                if (!file_exists($dir = $directory.$chars[$i].\DIRECTORY_SEPARATOR.$chars[$j])) {
-                    continue;
-                }
-
-                foreach (@scandir($dir, \SCANDIR_SORT_NONE) ?: [] as $file) {
-                    if ('.' !== $file && '..' !== $file) {
-                        yield $dir.\DIRECTORY_SEPARATOR.$file;
-                    }
-                }
-            }
-        }
-    }
-
     /**
      * @internal
      */
@@ -171,19 +116,6 @@ trait FilesystemCommonTrait
         throw new \ErrorException($message, 0, $type, $file, $line);
     }
 
-    /**
-     * @return array
-     */
-    public function __sleep()
-    {
-        throw new \BadMethodCallException('Cannot serialize '.__CLASS__);
-    }
-
-    public function __wakeup()
-    {
-        throw new \BadMethodCallException('Cannot unserialize '.__CLASS__);
-    }
-
     public function __destruct()
     {
         if (method_exists(parent::class, '__destruct')) {
diff --git a/advancedcontentfilter/vendor/symfony/cache/Traits/FilesystemTrait.php b/advancedcontentfilter/vendor/symfony/cache/Traits/FilesystemTrait.php
index 72118eaa..23974b3b 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Traits/FilesystemTrait.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Traits/FilesystemTrait.php
@@ -23,8 +23,6 @@ trait FilesystemTrait
 {
     use FilesystemCommonTrait;
 
-    private $marshaller;
-
     /**
      * @return bool
      */
@@ -33,8 +31,8 @@ trait FilesystemTrait
         $time = time();
         $pruned = true;
 
-        foreach ($this->scanHashDir($this->directory) as $file) {
-            if (!$h = @fopen($file, 'r')) {
+        foreach (new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($this->directory, \FilesystemIterator::SKIP_DOTS), \RecursiveIteratorIterator::LEAVES_ONLY) as $file) {
+            if (!$h = @fopen($file, 'rb')) {
                 continue;
             }
 
@@ -54,12 +52,12 @@ trait FilesystemTrait
      */
     protected function doFetch(array $ids)
     {
-        $values = [];
+        $values = array();
         $now = time();
 
         foreach ($ids as $id) {
             $file = $this->getFile($id);
-            if (!file_exists($file) || !$h = @fopen($file, 'r')) {
+            if (!file_exists($file) || !$h = @fopen($file, 'rb')) {
                 continue;
             }
             if (($expiresAt = (int) fgets($h)) && $now >= $expiresAt) {
@@ -70,7 +68,7 @@ trait FilesystemTrait
                 $value = stream_get_contents($h);
                 fclose($h);
                 if ($i === $id) {
-                    $values[$id] = $this->marshaller->unmarshall($value);
+                    $values[$id] = parent::unserialize($value);
                 }
             }
         }
@@ -85,40 +83,25 @@ trait FilesystemTrait
     {
         $file = $this->getFile($id);
 
-        return file_exists($file) && (@filemtime($file) > time() || $this->doFetch([$id]));
+        return file_exists($file) && (@filemtime($file) > time() || $this->doFetch(array($id)));
     }
 
     /**
      * {@inheritdoc}
      */
-    protected function doSave(array $values, int $lifetime)
+    protected function doSave(array $values, $lifetime)
     {
+        $ok = true;
         $expiresAt = $lifetime ? (time() + $lifetime) : 0;
-        $values = $this->marshaller->marshall($values, $failed);
 
         foreach ($values as $id => $value) {
-            if (!$this->write($this->getFile($id, true), $expiresAt."\n".rawurlencode($id)."\n".$value, $expiresAt)) {
-                $failed[] = $id;
-            }
+            $ok = $this->write($this->getFile($id, true), $expiresAt."\n".rawurlencode($id)."\n".serialize($value), $expiresAt) && $ok;
         }
 
-        if ($failed && !is_writable($this->directory)) {
-            throw new CacheException(sprintf('Cache directory is not writable (%s).', $this->directory));
+        if (!$ok && !is_writable($this->directory)) {
+            throw new CacheException(sprintf('Cache directory is not writable (%s)', $this->directory));
         }
 
-        return $failed;
-    }
-
-    private function getFileKey(string $file): string
-    {
-        if (!$h = @fopen($file, 'r')) {
-            return '';
-        }
-
-        fgets($h); // expiry
-        $encodedKey = fgets($h);
-        fclose($h);
-
-        return rawurldecode(rtrim($encodedKey));
+        return $ok;
     }
 }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Traits/MemcachedTrait.php b/advancedcontentfilter/vendor/symfony/cache/Traits/MemcachedTrait.php
index ebcb160c..9b877efb 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Traits/MemcachedTrait.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Traits/MemcachedTrait.php
@@ -13,8 +13,6 @@ namespace Symfony\Component\Cache\Traits;
 
 use Symfony\Component\Cache\Exception\CacheException;
 use Symfony\Component\Cache\Exception\InvalidArgumentException;
-use Symfony\Component\Cache\Marshaller\DefaultMarshaller;
-use Symfony\Component\Cache\Marshaller\MarshallerInterface;
 
 /**
  * @author Rob Frawley 2nd <rmf@src.run>
@@ -24,41 +22,32 @@ use Symfony\Component\Cache\Marshaller\MarshallerInterface;
  */
 trait MemcachedTrait
 {
-    private static $defaultClientOptions = [
+    private static $defaultClientOptions = array(
         'persistent_id' => null,
         'username' => null,
         'password' => null,
-        \Memcached::OPT_SERIALIZER => \Memcached::SERIALIZER_PHP,
-    ];
+        'serializer' => 'php',
+    );
 
-    /**
-     * We are replacing characters that are illegal in Memcached keys with reserved characters from
-     * {@see \Symfony\Contracts\Cache\ItemInterface::RESERVED_CHARACTERS} that are legal in Memcached.
-     * Note: don’t use {@see \Symfony\Component\Cache\Adapter\AbstractAdapter::NS_SEPARATOR}.
-     */
-    private static $RESERVED_MEMCACHED = " \n\r\t\v\f\0";
-    private static $RESERVED_PSR6 = '@()\{}/';
-
-    private $marshaller;
     private $client;
     private $lazyClient;
 
     public static function isSupported()
     {
-        return \extension_loaded('memcached') && version_compare(phpversion('memcached'), \PHP_VERSION_ID >= 80100 ? '3.1.6' : '2.2.0', '>=');
+        return extension_loaded('memcached') && version_compare(phpversion('memcached'), '2.2.0', '>=');
     }
 
-    private function init(\Memcached $client, string $namespace, int $defaultLifetime, ?MarshallerInterface $marshaller)
+    private function init(\Memcached $client, $namespace, $defaultLifetime)
     {
         if (!static::isSupported()) {
-            throw new CacheException('Memcached '.(\PHP_VERSION_ID >= 80100 ? '> 3.1.5' : '>= 2.2.0').' is required.');
+            throw new CacheException('Memcached >= 2.2.0 is required');
         }
-        if ('Memcached' === \get_class($client)) {
+        if ('Memcached' === get_class($client)) {
             $opt = $client->getOption(\Memcached::OPT_SERIALIZER);
             if (\Memcached::SERIALIZER_PHP !== $opt && \Memcached::SERIALIZER_IGBINARY !== $opt) {
                 throw new CacheException('MemcachedAdapter: "serializer" option must be "php" or "igbinary".');
             }
-            $this->maxIdLength -= \strlen($client->getOption(\Memcached::OPT_PREFIX_KEY));
+            $this->maxIdLength -= strlen($client->getOption(\Memcached::OPT_PREFIX_KEY));
             $this->client = $client;
         } else {
             $this->lazyClient = $client;
@@ -66,7 +55,6 @@ trait MemcachedTrait
 
         parent::__construct($namespace, $defaultLifetime);
         $this->enableVersioning();
-        $this->marshaller = $marshaller ?? new DefaultMarshaller();
     }
 
     /**
@@ -76,23 +64,24 @@ trait MemcachedTrait
      *
      * Examples for servers:
      * - 'memcached://user:pass@localhost?weight=33'
-     * - [['localhost', 11211, 33]]
+     * - array(array('localhost', 11211, 33))
      *
-     * @param array[]|string|string[] $servers An array of servers, a DSN, or an array of DSNs
+     * @param array[]|string|string[] An array of servers, a DSN, or an array of DSNs
+     * @param array                   An array of options
      *
      * @return \Memcached
      *
      * @throws \ErrorException When invalid options or servers are provided
      */
-    public static function createConnection($servers, array $options = [])
+    public static function createConnection($servers, array $options = array())
     {
-        if (\is_string($servers)) {
-            $servers = [$servers];
-        } elseif (!\is_array($servers)) {
-            throw new InvalidArgumentException(sprintf('MemcachedAdapter::createClient() expects array or string as first argument, "%s" given.', \gettype($servers)));
+        if (is_string($servers)) {
+            $servers = array($servers);
+        } elseif (!is_array($servers)) {
+            throw new InvalidArgumentException(sprintf('MemcachedAdapter::createClient() expects array or string as first argument, %s given.', gettype($servers)));
         }
         if (!static::isSupported()) {
-            throw new CacheException('Memcached '.(\PHP_VERSION_ID >= 80100 ? '> 3.1.5' : '>= 2.2.0').' is required.');
+            throw new CacheException('Memcached >= 2.2.0 is required');
         }
         set_error_handler(function ($type, $msg, $file, $line) { throw new \ErrorException($msg, 0, $type, $file, $line); });
         try {
@@ -103,87 +92,59 @@ trait MemcachedTrait
 
             // parse any DSN in $servers
             foreach ($servers as $i => $dsn) {
-                if (\is_array($dsn)) {
+                if (is_array($dsn)) {
                     continue;
                 }
-                if (!str_starts_with($dsn, 'memcached:')) {
-                    throw new InvalidArgumentException(sprintf('Invalid Memcached DSN: "%s" does not start with "memcached:".', $dsn));
+                if (0 !== strpos($dsn, 'memcached://')) {
+                    throw new InvalidArgumentException(sprintf('Invalid Memcached DSN: %s does not start with "memcached://"', $dsn));
                 }
-                $params = preg_replace_callback('#^memcached:(//)?(?:([^@]*+)@)?#', function ($m) use (&$username, &$password) {
-                    if (!empty($m[2])) {
-                        [$username, $password] = explode(':', $m[2], 2) + [1 => null];
+                $params = preg_replace_callback('#^memcached://(?:([^@]*+)@)?#', function ($m) use (&$username, &$password) {
+                    if (!empty($m[1])) {
+                        list($username, $password) = explode(':', $m[1], 2) + array(1 => null);
                     }
 
-                    return 'file:'.($m[1] ?? '');
+                    return 'file://';
                 }, $dsn);
                 if (false === $params = parse_url($params)) {
-                    throw new InvalidArgumentException(sprintf('Invalid Memcached DSN: "%s".', $dsn));
-                }
-                $query = $hosts = [];
-                if (isset($params['query'])) {
-                    parse_str($params['query'], $query);
-
-                    if (isset($query['host'])) {
-                        if (!\is_array($hosts = $query['host'])) {
-                            throw new InvalidArgumentException(sprintf('Invalid Memcached DSN: "%s".', $dsn));
-                        }
-                        foreach ($hosts as $host => $weight) {
-                            if (false === $port = strrpos($host, ':')) {
-                                $hosts[$host] = [$host, 11211, (int) $weight];
-                            } else {
-                                $hosts[$host] = [substr($host, 0, $port), (int) substr($host, 1 + $port), (int) $weight];
-                            }
-                        }
-                        $hosts = array_values($hosts);
-                        unset($query['host']);
-                    }
-                    if ($hosts && !isset($params['host']) && !isset($params['path'])) {
-                        unset($servers[$i]);
-                        $servers = array_merge($servers, $hosts);
-                        continue;
-                    }
+                    throw new InvalidArgumentException(sprintf('Invalid Memcached DSN: %s', $dsn));
                 }
                 if (!isset($params['host']) && !isset($params['path'])) {
-                    throw new InvalidArgumentException(sprintf('Invalid Memcached DSN: "%s".', $dsn));
+                    throw new InvalidArgumentException(sprintf('Invalid Memcached DSN: %s', $dsn));
                 }
                 if (isset($params['path']) && preg_match('#/(\d+)$#', $params['path'], $m)) {
                     $params['weight'] = $m[1];
-                    $params['path'] = substr($params['path'], 0, -\strlen($m[0]));
+                    $params['path'] = substr($params['path'], 0, -strlen($m[0]));
                 }
-                $params += [
-                    'host' => $params['host'] ?? $params['path'],
+                $params += array(
+                    'host' => isset($params['host']) ? $params['host'] : $params['path'],
                     'port' => isset($params['host']) ? 11211 : null,
                     'weight' => 0,
-                ];
-                if ($query) {
+                );
+                if (isset($params['query'])) {
+                    parse_str($params['query'], $query);
                     $params += $query;
                     $options = $query + $options;
                 }
 
-                $servers[$i] = [$params['host'], $params['port'], $params['weight']];
-
-                if ($hosts) {
-                    $servers = array_merge($servers, $hosts);
-                }
+                $servers[$i] = array($params['host'], $params['port'], $params['weight']);
             }
 
             // set client's options
             unset($options['persistent_id'], $options['username'], $options['password'], $options['weight'], $options['lazy']);
-            $options = array_change_key_case($options, \CASE_UPPER);
+            $options = array_change_key_case($options, CASE_UPPER);
             $client->setOption(\Memcached::OPT_BINARY_PROTOCOL, true);
             $client->setOption(\Memcached::OPT_NO_BLOCK, true);
-            $client->setOption(\Memcached::OPT_TCP_NODELAY, true);
-            if (!\array_key_exists('LIBKETAMA_COMPATIBLE', $options) && !\array_key_exists(\Memcached::OPT_LIBKETAMA_COMPATIBLE, $options)) {
+            if (!array_key_exists('LIBKETAMA_COMPATIBLE', $options) && !array_key_exists(\Memcached::OPT_LIBKETAMA_COMPATIBLE, $options)) {
                 $client->setOption(\Memcached::OPT_LIBKETAMA_COMPATIBLE, true);
             }
             foreach ($options as $name => $value) {
-                if (\is_int($name)) {
+                if (is_int($name)) {
                     continue;
                 }
                 if ('HASH' === $name || 'SERIALIZER' === $name || 'DISTRIBUTION' === $name) {
-                    $value = \constant('Memcached::'.$name.'_'.strtoupper($value));
+                    $value = constant('Memcached::'.$name.'_'.strtoupper($value));
                 }
-                $opt = \constant('Memcached::OPT_'.$name);
+                $opt = constant('Memcached::OPT_'.$name);
 
                 unset($options[$name]);
                 $options[$opt] = $value;
@@ -192,14 +153,14 @@ trait MemcachedTrait
 
             // set client's servers, taking care of persistent connections
             if (!$client->isPristine()) {
-                $oldServers = [];
+                $oldServers = array();
                 foreach ($client->getServerList() as $server) {
-                    $oldServers[] = [$server['host'], $server['port']];
+                    $oldServers[] = array($server['host'], $server['port']);
                 }
 
-                $newServers = [];
+                $newServers = array();
                 foreach ($servers as $server) {
-                    if (1 < \count($server)) {
+                    if (1 < count($server)) {
                         $server = array_values($server);
                         unset($server[2]);
                         $server[1] = (int) $server[1];
@@ -208,12 +169,12 @@ trait MemcachedTrait
                 }
 
                 if ($oldServers !== $newServers) {
-                    $client->resetServerList();
+                    // before resetting, ensure $servers is valid
                     $client->addServers($servers);
+                    $client->resetServerList();
                 }
-            } else {
-                $client->addServers($servers);
             }
+            $client->addServers($servers);
 
             if (null !== $username || null !== $password) {
                 if (!method_exists($client, 'setSaslAuthData')) {
@@ -231,22 +192,13 @@ trait MemcachedTrait
     /**
      * {@inheritdoc}
      */
-    protected function doSave(array $values, int $lifetime)
+    protected function doSave(array $values, $lifetime)
     {
-        if (!$values = $this->marshaller->marshall($values, $failed)) {
-            return $failed;
-        }
-
         if ($lifetime && $lifetime > 30 * 86400) {
             $lifetime += time();
         }
 
-        $encodedValues = [];
-        foreach ($values as $key => $value) {
-            $encodedValues[self::encodeKey($key)] = $value;
-        }
-
-        return $this->checkResultCode($this->getClient()->setMulti($encodedValues, $lifetime)) ? $failed : false;
+        return $this->checkResultCode($this->getClient()->setMulti($values, $lifetime));
     }
 
     /**
@@ -254,19 +206,13 @@ trait MemcachedTrait
      */
     protected function doFetch(array $ids)
     {
+        $unserializeCallbackHandler = ini_set('unserialize_callback_func', __CLASS__.'::handleUnserializeCallback');
         try {
-            $encodedIds = array_map([__CLASS__, 'encodeKey'], $ids);
-
-            $encodedResult = $this->checkResultCode($this->getClient()->getMulti($encodedIds));
-
-            $result = [];
-            foreach ($encodedResult as $key => $value) {
-                $result[self::decodeKey($key)] = $this->marshaller->unmarshall($value);
-            }
-
-            return $result;
+            return $this->checkResultCode($this->getClient()->getMulti($ids));
         } catch (\Error $e) {
-            throw new \ErrorException($e->getMessage(), $e->getCode(), \E_ERROR, $e->getFile(), $e->getLine());
+            throw new \ErrorException($e->getMessage(), $e->getCode(), E_ERROR, $e->getFile(), $e->getLine());
+        } finally {
+            ini_set('unserialize_callback_func', $unserializeCallbackHandler);
         }
     }
 
@@ -275,7 +221,7 @@ trait MemcachedTrait
      */
     protected function doHave($id)
     {
-        return false !== $this->getClient()->get(self::encodeKey($id)) || $this->checkResultCode(\Memcached::RES_SUCCESS === $this->client->getResultCode());
+        return false !== $this->getClient()->get($id) || $this->checkResultCode(\Memcached::RES_SUCCESS === $this->client->getResultCode());
     }
 
     /**
@@ -284,11 +230,9 @@ trait MemcachedTrait
     protected function doDelete(array $ids)
     {
         $ok = true;
-        $encodedIds = array_map([__CLASS__, 'encodeKey'], $ids);
-        foreach ($this->checkResultCode($this->getClient()->deleteMulti($encodedIds)) as $result) {
+        foreach ($this->checkResultCode($this->getClient()->deleteMulti($ids)) as $result) {
             if (\Memcached::RES_SUCCESS !== $result && \Memcached::RES_NOTFOUND !== $result) {
                 $ok = false;
-                break;
             }
         }
 
@@ -300,7 +244,7 @@ trait MemcachedTrait
      */
     protected function doClear($namespace)
     {
-        return '' === $namespace && $this->getClient()->flush();
+        return false;
     }
 
     private function checkResultCode($result)
@@ -311,10 +255,13 @@ trait MemcachedTrait
             return $result;
         }
 
-        throw new CacheException('MemcachedAdapter client error: '.strtolower($this->client->getResultMessage()));
+        throw new CacheException(sprintf('MemcachedAdapter client error: %s.', strtolower($this->client->getResultMessage())));
     }
 
-    private function getClient(): \Memcached
+    /**
+     * @return \Memcached
+     */
+    private function getClient()
     {
         if ($this->client) {
             return $this->client;
@@ -330,14 +277,4 @@ trait MemcachedTrait
 
         return $this->client = $this->lazyClient;
     }
-
-    private static function encodeKey(string $key): string
-    {
-        return strtr($key, self::$RESERVED_MEMCACHED, self::$RESERVED_PSR6);
-    }
-
-    private static function decodeKey(string $key): string
-    {
-        return strtr($key, self::$RESERVED_PSR6, self::$RESERVED_MEMCACHED);
-    }
 }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Traits/PdoTrait.php b/advancedcontentfilter/vendor/symfony/cache/Traits/PdoTrait.php
index 4d5e1230..a88099ec 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Traits/PdoTrait.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Traits/PdoTrait.php
@@ -12,24 +12,16 @@
 namespace Symfony\Component\Cache\Traits;
 
 use Doctrine\DBAL\Connection;
-use Doctrine\DBAL\DBALException;
 use Doctrine\DBAL\Driver\ServerInfoAwareConnection;
-use Doctrine\DBAL\DriverManager;
-use Doctrine\DBAL\Exception;
-use Doctrine\DBAL\Exception\TableNotFoundException;
-use Doctrine\DBAL\ParameterType;
+use Doctrine\DBAL\DBALException;
 use Doctrine\DBAL\Schema\Schema;
-use Doctrine\DBAL\Statement;
 use Symfony\Component\Cache\Exception\InvalidArgumentException;
-use Symfony\Component\Cache\Marshaller\DefaultMarshaller;
-use Symfony\Component\Cache\Marshaller\MarshallerInterface;
 
 /**
  * @internal
  */
 trait PdoTrait
 {
-    private $marshaller;
     private $conn;
     private $dsn;
     private $driver;
@@ -41,10 +33,10 @@ trait PdoTrait
     private $timeCol = 'item_time';
     private $username = '';
     private $password = '';
-    private $connectionOptions = [];
+    private $connectionOptions = array();
     private $namespace;
 
-    private function init($connOrDsn, string $namespace, int $defaultLifetime, array $options, ?MarshallerInterface $marshaller)
+    private function init($connOrDsn, $namespace, $defaultLifetime, array $options)
     {
         if (isset($namespace[0]) && preg_match('#[^-+.A-Za-z0-9]#', $namespace, $match)) {
             throw new InvalidArgumentException(sprintf('Namespace contains "%s" but only characters in [-+.A-Za-z0-9] are allowed.', $match[0]));
@@ -52,28 +44,27 @@ trait PdoTrait
 
         if ($connOrDsn instanceof \PDO) {
             if (\PDO::ERRMODE_EXCEPTION !== $connOrDsn->getAttribute(\PDO::ATTR_ERRMODE)) {
-                throw new InvalidArgumentException(sprintf('"%s" requires PDO error mode attribute be set to throw Exceptions (i.e. $pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION)).', __CLASS__));
+                throw new InvalidArgumentException(sprintf('"%s" requires PDO error mode attribute be set to throw Exceptions (i.e. $pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION))', __CLASS__));
             }
 
             $this->conn = $connOrDsn;
         } elseif ($connOrDsn instanceof Connection) {
             $this->conn = $connOrDsn;
-        } elseif (\is_string($connOrDsn)) {
+        } elseif (is_string($connOrDsn)) {
             $this->dsn = $connOrDsn;
         } else {
-            throw new InvalidArgumentException(sprintf('"%s" requires PDO or Doctrine\DBAL\Connection instance or DSN string as first argument, "%s" given.', __CLASS__, \is_object($connOrDsn) ? \get_class($connOrDsn) : \gettype($connOrDsn)));
+            throw new InvalidArgumentException(sprintf('"%s" requires PDO or Doctrine\DBAL\Connection instance or DSN string as first argument, "%s" given.', __CLASS__, is_object($connOrDsn) ? get_class($connOrDsn) : gettype($connOrDsn)));
         }
 
-        $this->table = $options['db_table'] ?? $this->table;
-        $this->idCol = $options['db_id_col'] ?? $this->idCol;
-        $this->dataCol = $options['db_data_col'] ?? $this->dataCol;
-        $this->lifetimeCol = $options['db_lifetime_col'] ?? $this->lifetimeCol;
-        $this->timeCol = $options['db_time_col'] ?? $this->timeCol;
-        $this->username = $options['db_username'] ?? $this->username;
-        $this->password = $options['db_password'] ?? $this->password;
-        $this->connectionOptions = $options['db_connection_options'] ?? $this->connectionOptions;
+        $this->table = isset($options['db_table']) ? $options['db_table'] : $this->table;
+        $this->idCol = isset($options['db_id_col']) ? $options['db_id_col'] : $this->idCol;
+        $this->dataCol = isset($options['db_data_col']) ? $options['db_data_col'] : $this->dataCol;
+        $this->lifetimeCol = isset($options['db_lifetime_col']) ? $options['db_lifetime_col'] : $this->lifetimeCol;
+        $this->timeCol = isset($options['db_time_col']) ? $options['db_time_col'] : $this->timeCol;
+        $this->username = isset($options['db_username']) ? $options['db_username'] : $this->username;
+        $this->password = isset($options['db_password']) ? $options['db_password'] : $this->password;
+        $this->connectionOptions = isset($options['db_connection_options']) ? $options['db_connection_options'] : $this->connectionOptions;
         $this->namespace = $namespace;
-        $this->marshaller = $marshaller ?? new DefaultMarshaller();
 
         parent::__construct($namespace, $defaultLifetime);
     }
@@ -86,7 +77,6 @@ trait PdoTrait
      *
      * @throws \PDOException    When the table already exists
      * @throws DBALException    When the table already exists
-     * @throws Exception        When the table already exists
      * @throws \DomainException When an unsupported PDO driver is used
      */
     public function createTable()
@@ -95,31 +85,27 @@ trait PdoTrait
         $conn = $this->getConnection();
 
         if ($conn instanceof Connection) {
-            $types = [
+            $types = array(
                 'mysql' => 'binary',
                 'sqlite' => 'text',
                 'pgsql' => 'string',
                 'oci' => 'string',
                 'sqlsrv' => 'string',
-            ];
+            );
             if (!isset($types[$this->driver])) {
                 throw new \DomainException(sprintf('Creating the cache table is currently not implemented for PDO driver "%s".', $this->driver));
             }
 
             $schema = new Schema();
             $table = $schema->createTable($this->table);
-            $table->addColumn($this->idCol, $types[$this->driver], ['length' => 255]);
-            $table->addColumn($this->dataCol, 'blob', ['length' => 16777215]);
-            $table->addColumn($this->lifetimeCol, 'integer', ['unsigned' => true, 'notnull' => false]);
-            $table->addColumn($this->timeCol, 'integer', ['unsigned' => true]);
-            $table->setPrimaryKey([$this->idCol]);
+            $table->addColumn($this->idCol, $types[$this->driver], array('length' => 255));
+            $table->addColumn($this->dataCol, 'blob', array('length' => 16777215));
+            $table->addColumn($this->lifetimeCol, 'integer', array('unsigned' => true, 'notnull' => false));
+            $table->addColumn($this->timeCol, 'integer', array('unsigned' => true));
+            $table->setPrimaryKey(array($this->idCol));
 
             foreach ($schema->toSql($conn->getDatabasePlatform()) as $sql) {
-                if (method_exists($conn, 'executeStatement')) {
-                    $conn->executeStatement($sql);
-                } else {
-                    $conn->exec($sql);
-                }
+                $conn->exec($sql);
             }
 
             return;
@@ -150,11 +136,7 @@ trait PdoTrait
                 throw new \DomainException(sprintf('Creating the cache table is currently not implemented for PDO driver "%s".', $this->driver));
         }
 
-        if ($conn instanceof Connection && method_exists($conn, 'executeStatement')) {
-            $conn->executeStatement($sql);
-        } else {
-            $conn->exec($sql);
-        }
+        $conn->exec($sql);
     }
 
     /**
@@ -168,35 +150,14 @@ trait PdoTrait
             $deleteSql .= " AND $this->idCol LIKE :namespace";
         }
 
-        $connection = $this->getConnection();
-        $useDbalConstants = $connection instanceof Connection;
-
-        try {
-            $delete = $connection->prepare($deleteSql);
-        } catch (TableNotFoundException $e) {
-            return true;
-        } catch (\PDOException $e) {
-            return true;
-        }
-        $delete->bindValue(':time', time(), $useDbalConstants ? ParameterType::INTEGER : \PDO::PARAM_INT);
+        $delete = $this->getConnection()->prepare($deleteSql);
+        $delete->bindValue(':time', time(), \PDO::PARAM_INT);
 
         if ('' !== $this->namespace) {
-            $delete->bindValue(':namespace', sprintf('%s%%', $this->namespace), $useDbalConstants ? ParameterType::STRING : \PDO::PARAM_STR);
+            $delete->bindValue(':namespace', sprintf('%s%%', $this->namespace), \PDO::PARAM_STR);
         }
-        try {
-            // Doctrine DBAL ^2.13 || >= 3.1
-            if ($delete instanceof Statement && method_exists($delete, 'executeStatement')) {
-                $delete->executeStatement();
 
-                return true;
-            }
-
-            return $delete->execute();
-        } catch (TableNotFoundException $e) {
-            return true;
-        } catch (\PDOException $e) {
-            return true;
-        }
+        return $delete->execute();
     }
 
     /**
@@ -204,41 +165,31 @@ trait PdoTrait
      */
     protected function doFetch(array $ids)
     {
-        $connection = $this->getConnection();
-        $useDbalConstants = $connection instanceof Connection;
-
         $now = time();
-        $expired = [];
+        $expired = array();
 
-        $sql = str_pad('', (\count($ids) << 1) - 1, '?,');
+        $sql = str_pad('', (count($ids) << 1) - 1, '?,');
         $sql = "SELECT $this->idCol, CASE WHEN $this->lifetimeCol IS NULL OR $this->lifetimeCol + $this->timeCol > ? THEN $this->dataCol ELSE NULL END FROM $this->table WHERE $this->idCol IN ($sql)";
-        $stmt = $connection->prepare($sql);
-        $stmt->bindValue($i = 1, $now, $useDbalConstants ? ParameterType::INTEGER : \PDO::PARAM_INT);
+        $stmt = $this->getConnection()->prepare($sql);
+        $stmt->bindValue($i = 1, $now, \PDO::PARAM_INT);
         foreach ($ids as $id) {
             $stmt->bindValue(++$i, $id);
         }
-        $result = $stmt->execute();
+        $stmt->execute();
 
-        if (\is_object($result)) {
-            $result = $result->iterateNumeric();
-        } else {
-            $stmt->setFetchMode(\PDO::FETCH_NUM);
-            $result = $stmt;
-        }
-
-        foreach ($result as $row) {
+        while ($row = $stmt->fetch(\PDO::FETCH_NUM)) {
             if (null === $row[1]) {
                 $expired[] = $row[0];
             } else {
-                yield $row[0] => $this->marshaller->unmarshall(\is_resource($row[1]) ? stream_get_contents($row[1]) : $row[1]);
+                yield $row[0] => parent::unserialize(is_resource($row[1]) ? stream_get_contents($row[1]) : $row[1]);
             }
         }
 
         if ($expired) {
-            $sql = str_pad('', (\count($expired) << 1) - 1, '?,');
+            $sql = str_pad('', (count($expired) << 1) - 1, '?,');
             $sql = "DELETE FROM $this->table WHERE $this->lifetimeCol + $this->timeCol <= ? AND $this->idCol IN ($sql)";
-            $stmt = $connection->prepare($sql);
-            $stmt->bindValue($i = 1, $now, $useDbalConstants ? ParameterType::INTEGER : \PDO::PARAM_INT);
+            $stmt = $this->getConnection()->prepare($sql);
+            $stmt->bindValue($i = 1, $now, \PDO::PARAM_INT);
             foreach ($expired as $id) {
                 $stmt->bindValue(++$i, $id);
             }
@@ -251,17 +202,14 @@ trait PdoTrait
      */
     protected function doHave($id)
     {
-        $connection = $this->getConnection();
-        $useDbalConstants = $connection instanceof Connection;
-
         $sql = "SELECT 1 FROM $this->table WHERE $this->idCol = :id AND ($this->lifetimeCol IS NULL OR $this->lifetimeCol + $this->timeCol > :time)";
-        $stmt = $connection->prepare($sql);
+        $stmt = $this->getConnection()->prepare($sql);
 
         $stmt->bindValue(':id', $id);
-        $stmt->bindValue(':time', time(), $useDbalConstants ? ParameterType::INTEGER : \PDO::PARAM_INT);
-        $result = $stmt->execute();
+        $stmt->bindValue(':time', time(), \PDO::PARAM_INT);
+        $stmt->execute();
 
-        return (bool) (\is_object($result) ? $result->fetchOne() : $stmt->fetchColumn());
+        return (bool) $stmt->fetchColumn();
     }
 
     /**
@@ -281,15 +229,7 @@ trait PdoTrait
             $sql = "DELETE FROM $this->table WHERE $this->idCol LIKE '$namespace%'";
         }
 
-        try {
-            if ($conn instanceof Connection && method_exists($conn, 'executeStatement')) {
-                $conn->executeStatement($sql);
-            } else {
-                $conn->exec($sql);
-            }
-        } catch (TableNotFoundException $e) {
-        } catch (\PDOException $e) {
-        }
+        $conn->exec($sql);
 
         return true;
     }
@@ -299,14 +239,10 @@ trait PdoTrait
      */
     protected function doDelete(array $ids)
     {
-        $sql = str_pad('', (\count($ids) << 1) - 1, '?,');
+        $sql = str_pad('', (count($ids) << 1) - 1, '?,');
         $sql = "DELETE FROM $this->table WHERE $this->idCol IN ($sql)";
-        try {
-            $stmt = $this->getConnection()->prepare($sql);
-            $stmt->execute(array_values($ids));
-        } catch (TableNotFoundException $e) {
-        } catch (\PDOException $e) {
-        }
+        $stmt = $this->getConnection()->prepare($sql);
+        $stmt->execute(array_values($ids));
 
         return true;
     }
@@ -314,15 +250,24 @@ trait PdoTrait
     /**
      * {@inheritdoc}
      */
-    protected function doSave(array $values, int $lifetime)
+    protected function doSave(array $values, $lifetime)
     {
-        if (!$values = $this->marshaller->marshall($values, $failed)) {
+        $serialized = array();
+        $failed = array();
+
+        foreach ($values as $id => $value) {
+            try {
+                $serialized[$id] = serialize($value);
+            } catch (\Exception $e) {
+                $failed[] = $id;
+            }
+        }
+
+        if (!$serialized) {
             return $failed;
         }
 
         $conn = $this->getConnection();
-        $useDbalConstants = $conn instanceof Connection;
-
         $driver = $this->driver;
         $insertSql = "INSERT INTO $this->table ($this->idCol, $this->dataCol, $this->lifetimeCol, $this->timeCol) VALUES (:id, :data, :lifetime, :time)";
 
@@ -357,62 +302,39 @@ trait PdoTrait
 
         $now = time();
         $lifetime = $lifetime ?: null;
-        try {
-            $stmt = $conn->prepare($sql);
-        } catch (TableNotFoundException $e) {
-            if (!$conn->isTransactionActive() || \in_array($this->driver, ['pgsql', 'sqlite', 'sqlsrv'], true)) {
-                $this->createTable();
-            }
-            $stmt = $conn->prepare($sql);
-        } catch (\PDOException $e) {
-            if (!$conn->inTransaction() || \in_array($this->driver, ['pgsql', 'sqlite', 'sqlsrv'], true)) {
-                $this->createTable();
-            }
-            $stmt = $conn->prepare($sql);
-        }
+        $stmt = $conn->prepare($sql);
 
         if ('sqlsrv' === $driver || 'oci' === $driver) {
             $stmt->bindParam(1, $id);
             $stmt->bindParam(2, $id);
-            $stmt->bindParam(3, $data, $useDbalConstants ? ParameterType::LARGE_OBJECT : \PDO::PARAM_LOB);
-            $stmt->bindValue(4, $lifetime, $useDbalConstants ? ParameterType::INTEGER : \PDO::PARAM_INT);
-            $stmt->bindValue(5, $now, $useDbalConstants ? ParameterType::INTEGER : \PDO::PARAM_INT);
-            $stmt->bindParam(6, $data, $useDbalConstants ? ParameterType::LARGE_OBJECT : \PDO::PARAM_LOB);
-            $stmt->bindValue(7, $lifetime, $useDbalConstants ? ParameterType::INTEGER : \PDO::PARAM_INT);
-            $stmt->bindValue(8, $now, $useDbalConstants ? ParameterType::INTEGER : \PDO::PARAM_INT);
+            $stmt->bindParam(3, $data, \PDO::PARAM_LOB);
+            $stmt->bindValue(4, $lifetime, \PDO::PARAM_INT);
+            $stmt->bindValue(5, $now, \PDO::PARAM_INT);
+            $stmt->bindParam(6, $data, \PDO::PARAM_LOB);
+            $stmt->bindValue(7, $lifetime, \PDO::PARAM_INT);
+            $stmt->bindValue(8, $now, \PDO::PARAM_INT);
         } else {
             $stmt->bindParam(':id', $id);
-            $stmt->bindParam(':data', $data, $useDbalConstants ? ParameterType::LARGE_OBJECT : \PDO::PARAM_LOB);
-            $stmt->bindValue(':lifetime', $lifetime, $useDbalConstants ? ParameterType::INTEGER : \PDO::PARAM_INT);
-            $stmt->bindValue(':time', $now, $useDbalConstants ? ParameterType::INTEGER : \PDO::PARAM_INT);
+            $stmt->bindParam(':data', $data, \PDO::PARAM_LOB);
+            $stmt->bindValue(':lifetime', $lifetime, \PDO::PARAM_INT);
+            $stmt->bindValue(':time', $now, \PDO::PARAM_INT);
         }
         if (null === $driver) {
             $insertStmt = $conn->prepare($insertSql);
 
             $insertStmt->bindParam(':id', $id);
-            $insertStmt->bindParam(':data', $data, $useDbalConstants ? ParameterType::LARGE_OBJECT : \PDO::PARAM_LOB);
-            $insertStmt->bindValue(':lifetime', $lifetime, $useDbalConstants ? ParameterType::INTEGER : \PDO::PARAM_INT);
-            $insertStmt->bindValue(':time', $now, $useDbalConstants ? ParameterType::INTEGER : \PDO::PARAM_INT);
+            $insertStmt->bindParam(':data', $data, \PDO::PARAM_LOB);
+            $insertStmt->bindValue(':lifetime', $lifetime, \PDO::PARAM_INT);
+            $insertStmt->bindValue(':time', $now, \PDO::PARAM_INT);
         }
 
-        foreach ($values as $id => $data) {
-            try {
-                $result = $stmt->execute();
-            } catch (TableNotFoundException $e) {
-                if (!$conn->isTransactionActive() || \in_array($this->driver, ['pgsql', 'sqlite', 'sqlsrv'], true)) {
-                    $this->createTable();
-                }
-                $result = $stmt->execute();
-            } catch (\PDOException $e) {
-                if (!$conn->inTransaction() || \in_array($this->driver, ['pgsql', 'sqlite', 'sqlsrv'], true)) {
-                    $this->createTable();
-                }
-                $result = $stmt->execute();
-            }
-            if (null === $driver && !(\is_object($result) ? $result->rowCount() : $stmt->rowCount())) {
+        foreach ($serialized as $id => $data) {
+            $stmt->execute();
+
+            if (null === $driver && !$stmt->rowCount()) {
                 try {
                     $insertStmt->execute();
-                } catch (DBALException|Exception $e) {
+                } catch (DBALException $e) {
                 } catch (\PDOException $e) {
                     // A concurrent write won, let it be
                 }
@@ -428,58 +350,32 @@ trait PdoTrait
     private function getConnection()
     {
         if (null === $this->conn) {
-            if (strpos($this->dsn, '://')) {
-                if (!class_exists(DriverManager::class)) {
-                    throw new InvalidArgumentException(sprintf('Failed to parse the DSN "%s". Try running "composer require doctrine/dbal".', $this->dsn));
-                }
-                $this->conn = DriverManager::getConnection(['url' => $this->dsn]);
-            } else {
-                $this->conn = new \PDO($this->dsn, $this->username, $this->password, $this->connectionOptions);
-                $this->conn->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_EXCEPTION);
-            }
+            $this->conn = new \PDO($this->dsn, $this->username, $this->password, $this->connectionOptions);
+            $this->conn->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_EXCEPTION);
         }
         if (null === $this->driver) {
             if ($this->conn instanceof \PDO) {
                 $this->driver = $this->conn->getAttribute(\PDO::ATTR_DRIVER_NAME);
             } else {
-                $driver = $this->conn->getDriver();
-
-                switch (true) {
-                    case $driver instanceof \Doctrine\DBAL\Driver\Mysqli\Driver:
-                        throw new \LogicException(sprintf('The adapter "%s" does not support the mysqli driver, use pdo_mysql instead.', static::class));
-                    case $driver instanceof \Doctrine\DBAL\Driver\AbstractMySQLDriver:
+                switch ($this->driver = $this->conn->getDriver()->getName()) {
+                    case 'mysqli':
+                    case 'pdo_mysql':
+                    case 'drizzle_pdo_mysql':
                         $this->driver = 'mysql';
                         break;
-                    case $driver instanceof \Doctrine\DBAL\Driver\PDOSqlite\Driver:
-                    case $driver instanceof \Doctrine\DBAL\Driver\PDO\SQLite\Driver:
+                    case 'pdo_sqlite':
                         $this->driver = 'sqlite';
                         break;
-                    case $driver instanceof \Doctrine\DBAL\Driver\PDOPgSql\Driver:
-                    case $driver instanceof \Doctrine\DBAL\Driver\PDO\PgSQL\Driver:
+                    case 'pdo_pgsql':
                         $this->driver = 'pgsql';
                         break;
-                    case $driver instanceof \Doctrine\DBAL\Driver\OCI8\Driver:
-                    case $driver instanceof \Doctrine\DBAL\Driver\PDOOracle\Driver:
-                    case $driver instanceof \Doctrine\DBAL\Driver\PDO\OCI\Driver:
+                    case 'oci8':
+                    case 'pdo_oracle':
                         $this->driver = 'oci';
                         break;
-                    case $driver instanceof \Doctrine\DBAL\Driver\SQLSrv\Driver:
-                    case $driver instanceof \Doctrine\DBAL\Driver\PDOSqlsrv\Driver:
-                    case $driver instanceof \Doctrine\DBAL\Driver\PDO\SQLSrv\Driver:
+                    case 'pdo_sqlsrv':
                         $this->driver = 'sqlsrv';
                         break;
-                    case $driver instanceof \Doctrine\DBAL\Driver:
-                        $this->driver = [
-                                'mssql' => 'sqlsrv',
-                                'oracle' => 'oci',
-                                'postgresql' => 'pgsql',
-                                'sqlite' => 'sqlite',
-                                'mysql' => 'mysql',
-                            ][$driver->getDatabasePlatform()->getName()] ?? \get_class($driver);
-                        break;
-                    default:
-                        $this->driver = \get_class($driver);
-                        break;
                 }
             }
         }
@@ -487,7 +383,10 @@ trait PdoTrait
         return $this->conn;
     }
 
-    private function getServerVersion(): string
+    /**
+     * @return string
+     */
+    private function getServerVersion()
     {
         if (null === $this->serverVersion) {
             $conn = $this->conn instanceof \PDO ? $this->conn : $this->conn->getWrappedConnection();
diff --git a/advancedcontentfilter/vendor/symfony/cache/Traits/PhpArrayTrait.php b/advancedcontentfilter/vendor/symfony/cache/Traits/PhpArrayTrait.php
index 230c7bd4..ae634d6b 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Traits/PhpArrayTrait.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Traits/PhpArrayTrait.php
@@ -11,10 +11,8 @@
 
 namespace Symfony\Component\Cache\Traits;
 
-use Symfony\Component\Cache\Adapter\AdapterInterface;
 use Symfony\Component\Cache\CacheItem;
 use Symfony\Component\Cache\Exception\InvalidArgumentException;
-use Symfony\Component\VarExporter\VarExporter;
 
 /**
  * @author Titouan Galopin <galopintitouan@gmail.com>
@@ -27,10 +25,8 @@ trait PhpArrayTrait
     use ProxyTrait;
 
     private $file;
-    private $keys;
     private $values;
-
-    private static $valuesCache = [];
+    private $zendDetectUnicode;
 
     /**
      * Store an array of cached values.
@@ -41,106 +37,88 @@ trait PhpArrayTrait
     {
         if (file_exists($this->file)) {
             if (!is_file($this->file)) {
-                throw new InvalidArgumentException(sprintf('Cache path exists and is not a file: "%s".', $this->file));
+                throw new InvalidArgumentException(sprintf('Cache path exists and is not a file: %s.', $this->file));
             }
 
             if (!is_writable($this->file)) {
-                throw new InvalidArgumentException(sprintf('Cache file is not writable: "%s".', $this->file));
+                throw new InvalidArgumentException(sprintf('Cache file is not writable: %s.', $this->file));
             }
         } else {
-            $directory = \dirname($this->file);
+            $directory = dirname($this->file);
 
             if (!is_dir($directory) && !@mkdir($directory, 0777, true)) {
-                throw new InvalidArgumentException(sprintf('Cache directory does not exist and cannot be created: "%s".', $directory));
+                throw new InvalidArgumentException(sprintf('Cache directory does not exist and cannot be created: %s.', $directory));
             }
 
             if (!is_writable($directory)) {
-                throw new InvalidArgumentException(sprintf('Cache directory is not writable: "%s".', $directory));
+                throw new InvalidArgumentException(sprintf('Cache directory is not writable: %s.', $directory));
             }
         }
 
-        $dumpedValues = '';
-        $dumpedMap = [];
         $dump = <<<'EOF'
 <?php
 
 // This file has been auto-generated by the Symfony Cache Component.
 
-return [[
+return array(
 
 
 EOF;
 
         foreach ($values as $key => $value) {
-            CacheItem::validateKey(\is_int($key) ? (string) $key : $key);
-            $isStaticValue = true;
+            CacheItem::validateKey(is_int($key) ? (string) $key : $key);
 
-            if (null === $value) {
-                $value = "'N;'";
-            } elseif (\is_object($value) || \is_array($value)) {
+            if (null === $value || is_object($value)) {
                 try {
-                    $value = VarExporter::export($value, $isStaticValue);
+                    $value = serialize($value);
                 } catch (\Exception $e) {
-                    throw new InvalidArgumentException(sprintf('Cache key "%s" has non-serializable "%s" value.', $key, \is_object($value) ? \get_class($value) : 'array'), 0, $e);
+                    throw new InvalidArgumentException(sprintf('Cache key "%s" has non-serializable %s value.', $key, get_class($value)), 0, $e);
                 }
-            } elseif (\is_string($value)) {
-                // Wrap "N;" in a closure to not confuse it with an encoded `null`
-                if ('N;' === $value) {
-                    $isStaticValue = false;
+            } elseif (is_array($value)) {
+                try {
+                    $serialized = serialize($value);
+                    $unserialized = unserialize($serialized);
+                } catch (\Exception $e) {
+                    throw new InvalidArgumentException(sprintf('Cache key "%s" has non-serializable array value.', $key), 0, $e);
                 }
-                $value = var_export($value, true);
-            } elseif (!\is_scalar($value)) {
-                throw new InvalidArgumentException(sprintf('Cache key "%s" has non-serializable "%s" value.', $key, \gettype($value)));
-            } else {
-                $value = var_export($value, true);
+                // Store arrays serialized if they contain any objects or references
+                if ($unserialized !== $value || (false !== strpos($serialized, ';R:') && preg_match('/;R:[1-9]/', $serialized))) {
+                    $value = $serialized;
+                }
+            } elseif (is_string($value)) {
+                // Serialize strings if they could be confused with serialized objects or arrays
+                if ('N;' === $value || (isset($value[2]) && ':' === $value[1])) {
+                    $value = serialize($value);
+                }
+            } elseif (!is_scalar($value)) {
+                throw new InvalidArgumentException(sprintf('Cache key "%s" has non-serializable %s value.', $key, gettype($value)));
             }
 
-            if (!$isStaticValue) {
-                $value = str_replace("\n", "\n    ", $value);
-                $value = "static function () {\n    return {$value};\n}";
-            }
-            $hash = hash('md5', $value);
-
-            if (null === $id = $dumpedMap[$hash] ?? null) {
-                $id = $dumpedMap[$hash] = \count($dumpedMap);
-                $dumpedValues .= "{$id} => {$value},\n";
-            }
-
-            $dump .= var_export($key, true)." => {$id},\n";
+            $dump .= var_export($key, true).' => '.var_export($value, true).",\n";
         }
 
-        $dump .= "\n], [\n\n{$dumpedValues}\n]];\n";
+        $dump .= "\n);\n";
+        $dump = str_replace("' . \"\\0\" . '", "\0", $dump);
 
         $tmpFile = uniqid($this->file, true);
 
         file_put_contents($tmpFile, $dump);
         @chmod($tmpFile, 0666 & ~umask());
-        unset($serialized, $value, $dump);
+        unset($serialized, $unserialized, $value, $dump);
 
         @rename($tmpFile, $this->file);
-        unset(self::$valuesCache[$this->file]);
 
         $this->initialize();
     }
 
     /**
      * {@inheritdoc}
-     *
-     * @param string $prefix
-     *
-     * @return bool
      */
-    public function clear(/* string $prefix = '' */)
+    public function clear()
     {
-        $prefix = 0 < \func_num_args() ? (string) func_get_arg(0) : '';
-        $this->keys = $this->values = [];
+        $this->values = array();
 
         $cleared = @unlink($this->file) || !file_exists($this->file);
-        unset(self::$valuesCache[$this->file]);
-
-        if ($this->pool instanceof AdapterInterface) {
-            return $this->pool->clear($prefix) && $cleared;
-        }
 
         return $this->pool->clear() && $cleared;
     }
@@ -150,20 +128,15 @@ EOF;
      */
     private function initialize()
     {
-        if (isset(self::$valuesCache[$this->file])) {
-            $values = self::$valuesCache[$this->file];
-        } elseif (!file_exists($this->file)) {
-            $this->keys = $this->values = [];
-
-            return;
-        } else {
-            $values = self::$valuesCache[$this->file] = (include $this->file) ?: [[], []];
+        if ($this->zendDetectUnicode) {
+            $zmb = ini_set('zend.detect_unicode', 0);
         }
-
-        if (2 !== \count($values) || !isset($values[0], $values[1])) {
-            $this->keys = $this->values = [];
-        } else {
-            [$this->keys, $this->values] = $values;
+        try {
+            $this->values = file_exists($this->file) ? (include $this->file ?: array()) : array();
+        } finally {
+            if ($this->zendDetectUnicode) {
+                ini_set('zend.detect_unicode', $zmb);
+            }
         }
     }
 }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Traits/PhpFilesTrait.php b/advancedcontentfilter/vendor/symfony/cache/Traits/PhpFilesTrait.php
index c76e7fe3..c800e1a1 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Traits/PhpFilesTrait.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Traits/PhpFilesTrait.php
@@ -13,7 +13,6 @@ namespace Symfony\Component\Cache\Traits;
 
 use Symfony\Component\Cache\Exception\CacheException;
 use Symfony\Component\Cache\Exception\InvalidArgumentException;
-use Symfony\Component\VarExporter\VarExporter;
 
 /**
  * @author Piotr Stankowski <git@trakos.pl>
@@ -24,24 +23,14 @@ use Symfony\Component\VarExporter\VarExporter;
  */
 trait PhpFilesTrait
 {
-    use FilesystemCommonTrait {
-        doClear as private doCommonClear;
-        doDelete as private doCommonDelete;
-    }
+    use FilesystemCommonTrait;
 
     private $includeHandler;
-    private $appendOnly;
-    private $values = [];
-    private $files = [];
-
-    private static $startTime;
-    private static $valuesCache = [];
+    private $zendDetectUnicode;
 
     public static function isSupported()
     {
-        self::$startTime = self::$startTime ?? $_SERVER['REQUEST_TIME'] ?? time();
-
-        return \function_exists('opcache_invalidate') && filter_var(\ini_get('opcache.enable'), \FILTER_VALIDATE_BOOLEAN) && (!\in_array(\PHP_SAPI, ['cli', 'phpdbg'], true) || filter_var(\ini_get('opcache.enable_cli'), \FILTER_VALIDATE_BOOLEAN));
+        return function_exists('opcache_invalidate') && ini_get('opcache.enable');
     }
 
     /**
@@ -51,21 +40,19 @@ trait PhpFilesTrait
     {
         $time = time();
         $pruned = true;
-        $getExpiry = true;
+        $allowCompile = 'cli' !== PHP_SAPI || ini_get('opcache.enable_cli');
 
         set_error_handler($this->includeHandler);
         try {
-            foreach ($this->scanHashDir($this->directory) as $file) {
-                try {
-                    if (\is_array($expiresAt = include $file)) {
-                        $expiresAt = $expiresAt[0];
-                    }
-                } catch (\ErrorException $e) {
-                    $expiresAt = $time;
-                }
+            foreach (new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($this->directory, \FilesystemIterator::SKIP_DOTS), \RecursiveIteratorIterator::LEAVES_ONLY) as $file) {
+                list($expiresAt) = include $file;
 
                 if ($time >= $expiresAt) {
-                    $pruned = $this->doUnlink($file) && !file_exists($file) && $pruned;
+                    $pruned = @unlink($file) && !file_exists($file) && $pruned;
+
+                    if ($allowCompile) {
+                        @opcache_invalidate($file, true);
+                    }
                 }
             }
         } finally {
@@ -80,75 +67,41 @@ trait PhpFilesTrait
      */
     protected function doFetch(array $ids)
     {
-        if ($this->appendOnly) {
-            $now = 0;
-            $missingIds = [];
-        } else {
-            $now = time();
-            $missingIds = $ids;
-            $ids = [];
+        $values = array();
+        $now = time();
+
+        if ($this->zendDetectUnicode) {
+            $zmb = ini_set('zend.detect_unicode', 0);
         }
-        $values = [];
-
-        begin:
-        $getExpiry = false;
-
-        foreach ($ids as $id) {
-            if (null === $value = $this->values[$id] ?? null) {
-                $missingIds[] = $id;
-            } elseif ('N;' === $value) {
-                $values[$id] = null;
-            } elseif (!\is_object($value)) {
-                $values[$id] = $value;
-            } elseif (!$value instanceof LazyValue) {
-                $values[$id] = $value();
-            } elseif (false === $values[$id] = include $value->file) {
-                unset($values[$id], $this->values[$id]);
-                $missingIds[] = $id;
-            }
-            if (!$this->appendOnly) {
-                unset($this->values[$id]);
-            }
-        }
-
-        if (!$missingIds) {
-            return $values;
-        }
-
         set_error_handler($this->includeHandler);
         try {
-            $getExpiry = true;
-
-            foreach ($missingIds as $k => $id) {
+            foreach ($ids as $id) {
                 try {
-                    $file = $this->files[$id] ?? $this->files[$id] = $this->getFile($id);
-
-                    if (isset(self::$valuesCache[$file])) {
-                        [$expiresAt, $this->values[$id]] = self::$valuesCache[$file];
-                    } elseif (\is_array($expiresAt = include $file)) {
-                        if ($this->appendOnly) {
-                            self::$valuesCache[$file] = $expiresAt;
-                        }
-
-                        [$expiresAt, $this->values[$id]] = $expiresAt;
-                    } elseif ($now < $expiresAt) {
-                        $this->values[$id] = new LazyValue($file);
-                    }
-
+                    $file = $this->getFile($id);
+                    list($expiresAt, $values[$id]) = include $file;
                     if ($now >= $expiresAt) {
-                        unset($this->values[$id], $missingIds[$k], self::$valuesCache[$file]);
+                        unset($values[$id]);
                     }
-                } catch (\ErrorException $e) {
-                    unset($missingIds[$k]);
+                } catch (\Exception $e) {
+                    continue;
                 }
             }
         } finally {
             restore_error_handler();
+            if ($this->zendDetectUnicode) {
+                ini_set('zend.detect_unicode', $zmb);
+            }
         }
 
-        $ids = $missingIds;
-        $missingIds = [];
-        goto begin;
+        foreach ($values as $id => $value) {
+            if ('N;' === $value) {
+                $values[$id] = null;
+            } elseif (is_string($value) && isset($value[2]) && ':' === $value[1]) {
+                $values[$id] = parent::unserialize($value);
+            }
+        }
+
+        return $values;
     }
 
     /**
@@ -156,158 +109,50 @@ trait PhpFilesTrait
      */
     protected function doHave($id)
     {
-        if ($this->appendOnly && isset($this->values[$id])) {
-            return true;
-        }
-
-        set_error_handler($this->includeHandler);
-        try {
-            $file = $this->files[$id] ?? $this->files[$id] = $this->getFile($id);
-            $getExpiry = true;
-
-            if (isset(self::$valuesCache[$file])) {
-                [$expiresAt, $value] = self::$valuesCache[$file];
-            } elseif (\is_array($expiresAt = include $file)) {
-                if ($this->appendOnly) {
-                    self::$valuesCache[$file] = $expiresAt;
-                }
-
-                [$expiresAt, $value] = $expiresAt;
-            } elseif ($this->appendOnly) {
-                $value = new LazyValue($file);
-            }
-        } catch (\ErrorException $e) {
-            return false;
-        } finally {
-            restore_error_handler();
-        }
-        if ($this->appendOnly) {
-            $now = 0;
-            $this->values[$id] = $value;
-        } else {
-            $now = time();
-        }
-
-        return $now < $expiresAt;
+        return (bool) $this->doFetch(array($id));
     }
 
     /**
      * {@inheritdoc}
      */
-    protected function doSave(array $values, int $lifetime)
+    protected function doSave(array $values, $lifetime)
     {
         $ok = true;
-        $expiry = $lifetime ? time() + $lifetime : 'PHP_INT_MAX';
-        $allowCompile = self::isSupported();
+        $data = array($lifetime ? time() + $lifetime : PHP_INT_MAX, '');
+        $allowCompile = 'cli' !== PHP_SAPI || ini_get('opcache.enable_cli');
 
         foreach ($values as $key => $value) {
-            unset($this->values[$key]);
-            $isStaticValue = true;
-            if (null === $value) {
-                $value = "'N;'";
-            } elseif (\is_object($value) || \is_array($value)) {
-                try {
-                    $value = VarExporter::export($value, $isStaticValue);
-                } catch (\Exception $e) {
-                    throw new InvalidArgumentException(sprintf('Cache key "%s" has non-serializable "%s" value.', $key, \is_object($value) ? \get_class($value) : 'array'), 0, $e);
+            if (null === $value || is_object($value)) {
+                $value = serialize($value);
+            } elseif (is_array($value)) {
+                $serialized = serialize($value);
+                $unserialized = parent::unserialize($serialized);
+                // Store arrays serialized if they contain any objects or references
+                if ($unserialized !== $value || (false !== strpos($serialized, ';R:') && preg_match('/;R:[1-9]/', $serialized))) {
+                    $value = $serialized;
                 }
-            } elseif (\is_string($value)) {
-                // Wrap "N;" in a closure to not confuse it with an encoded `null`
-                if ('N;' === $value) {
-                    $isStaticValue = false;
+            } elseif (is_string($value)) {
+                // Serialize strings if they could be confused with serialized objects or arrays
+                if ('N;' === $value || (isset($value[2]) && ':' === $value[1])) {
+                    $value = serialize($value);
                 }
-                $value = var_export($value, true);
-            } elseif (!\is_scalar($value)) {
-                throw new InvalidArgumentException(sprintf('Cache key "%s" has non-serializable "%s" value.', $key, \gettype($value)));
-            } else {
-                $value = var_export($value, true);
+            } elseif (!is_scalar($value)) {
+                throw new InvalidArgumentException(sprintf('Cache key "%s" has non-serializable %s value.', $key, gettype($value)));
             }
 
-            $encodedKey = rawurlencode($key);
-
-            if ($isStaticValue) {
-                $value = "return [{$expiry}, {$value}];";
-            } elseif ($this->appendOnly) {
-                $value = "return [{$expiry}, static function () { return {$value}; }];";
-            } else {
-                // We cannot use a closure here because of https://bugs.php.net/76982
-                $value = str_replace('\Symfony\Component\VarExporter\Internal\\', '', $value);
-                $value = "namespace Symfony\Component\VarExporter\Internal;\n\nreturn \$getExpiry ? {$expiry} : {$value};";
-            }
-
-            $file = $this->files[$key] = $this->getFile($key, true);
-            // Since OPcache only compiles files older than the script execution start, set the file's mtime in the past
-            $ok = $this->write($file, "<?php //{$encodedKey}\n\n{$value}\n", self::$startTime - 10) && $ok;
+            $data[1] = $value;
+            $file = $this->getFile($key, true);
+            $ok = $this->write($file, '<?php return '.var_export($data, true).';') && $ok;
 
             if ($allowCompile) {
                 @opcache_invalidate($file, true);
-                @opcache_compile_file($file);
             }
-            unset(self::$valuesCache[$file]);
         }
 
         if (!$ok && !is_writable($this->directory)) {
-            throw new CacheException(sprintf('Cache directory is not writable (%s).', $this->directory));
+            throw new CacheException(sprintf('Cache directory is not writable (%s)', $this->directory));
         }
 
         return $ok;
     }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doClear($namespace)
-    {
-        $this->values = [];
-
-        return $this->doCommonClear($namespace);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function doDelete(array $ids)
-    {
-        foreach ($ids as $id) {
-            unset($this->values[$id]);
-        }
-
-        return $this->doCommonDelete($ids);
-    }
-
-    protected function doUnlink($file)
-    {
-        unset(self::$valuesCache[$file]);
-
-        if (self::isSupported()) {
-            @opcache_invalidate($file, true);
-        }
-
-        return @unlink($file);
-    }
-
-    private function getFileKey(string $file): string
-    {
-        if (!$h = @fopen($file, 'r')) {
-            return '';
-        }
-
-        $encodedKey = substr(fgets($h), 8);
-        fclose($h);
-
-        return rawurldecode(rtrim($encodedKey));
-    }
-}
-
-/**
- * @internal
- */
-class LazyValue
-{
-    public $file;
-
-    public function __construct(string $file)
-    {
-        $this->file = $file;
-    }
 }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Traits/ProxyTrait.php b/advancedcontentfilter/vendor/symfony/cache/Traits/ProxyTrait.php
index c86f360a..06dba7e5 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Traits/ProxyTrait.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Traits/ProxyTrait.php
@@ -12,12 +12,10 @@
 namespace Symfony\Component\Cache\Traits;
 
 use Symfony\Component\Cache\PruneableInterface;
-use Symfony\Contracts\Service\ResetInterface;
+use Symfony\Component\Cache\ResettableInterface;
 
 /**
  * @author Nicolas Grekas <p@tchwork.com>
- *
- * @internal
  */
 trait ProxyTrait
 {
@@ -36,7 +34,7 @@ trait ProxyTrait
      */
     public function reset()
     {
-        if ($this->pool instanceof ResetInterface) {
+        if ($this->pool instanceof ResettableInterface) {
             $this->pool->reset();
         }
     }
diff --git a/advancedcontentfilter/vendor/symfony/cache/Traits/RedisClusterNodeProxy.php b/advancedcontentfilter/vendor/symfony/cache/Traits/RedisClusterNodeProxy.php
deleted file mode 100644
index deba74f6..00000000
--- a/advancedcontentfilter/vendor/symfony/cache/Traits/RedisClusterNodeProxy.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Cache\Traits;
-
-/**
- * This file acts as a wrapper to the \RedisCluster implementation so it can accept the same type of calls as
- *  individual \Redis objects.
- *
- * Calls are made to individual nodes via: RedisCluster->{method}($host, ...args)'
- *  according to https://github.com/phpredis/phpredis/blob/develop/cluster.markdown#directed-node-commands
- *
- * @author Jack Thomas <jack.thomas@solidalpha.com>
- *
- * @internal
- */
-class RedisClusterNodeProxy
-{
-    private $host;
-    private $redis;
-
-    /**
-     * @param \RedisCluster|RedisClusterProxy $redis
-     */
-    public function __construct(array $host, $redis)
-    {
-        $this->host = $host;
-        $this->redis = $redis;
-    }
-
-    public function __call(string $method, array $args)
-    {
-        return $this->redis->{$method}($this->host, ...$args);
-    }
-
-    public function scan(&$iIterator, $strPattern = null, $iCount = null)
-    {
-        return $this->redis->scan($iIterator, $this->host, $strPattern, $iCount);
-    }
-
-    public function getOption($name)
-    {
-        return $this->redis->getOption($name);
-    }
-}
diff --git a/advancedcontentfilter/vendor/symfony/cache/Traits/RedisClusterProxy.php b/advancedcontentfilter/vendor/symfony/cache/Traits/RedisClusterProxy.php
deleted file mode 100644
index b4cef59a..00000000
--- a/advancedcontentfilter/vendor/symfony/cache/Traits/RedisClusterProxy.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\Cache\Traits;
-
-/**
- * @author Alessandro Chitolina <alekitto@gmail.com>
- *
- * @internal
- */
-class RedisClusterProxy
-{
-    private $redis;
-    private $initializer;
-
-    public function __construct(\Closure $initializer)
-    {
-        $this->initializer = $initializer;
-    }
-
-    public function __call($method, array $args)
-    {
-        $this->redis ?: $this->redis = $this->initializer->__invoke();
-
-        return $this->redis->{$method}(...$args);
-    }
-
-    public function hscan($strKey, &$iIterator, $strPattern = null, $iCount = null)
-    {
-        $this->redis ?: $this->redis = $this->initializer->__invoke();
-
-        return $this->redis->hscan($strKey, $iIterator, $strPattern, $iCount);
-    }
-
-    public function scan(&$iIterator, $strPattern = null, $iCount = null)
-    {
-        $this->redis ?: $this->redis = $this->initializer->__invoke();
-
-        return $this->redis->scan($iIterator, $strPattern, $iCount);
-    }
-
-    public function sscan($strKey, &$iIterator, $strPattern = null, $iCount = null)
-    {
-        $this->redis ?: $this->redis = $this->initializer->__invoke();
-
-        return $this->redis->sscan($strKey, $iIterator, $strPattern, $iCount);
-    }
-
-    public function zscan($strKey, &$iIterator, $strPattern = null, $iCount = null)
-    {
-        $this->redis ?: $this->redis = $this->initializer->__invoke();
-
-        return $this->redis->zscan($strKey, $iIterator, $strPattern, $iCount);
-    }
-}
diff --git a/advancedcontentfilter/vendor/symfony/cache/Traits/RedisProxy.php b/advancedcontentfilter/vendor/symfony/cache/Traits/RedisProxy.php
index 2b0b8573..b328f94c 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Traits/RedisProxy.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Traits/RedisProxy.php
@@ -32,7 +32,7 @@ class RedisProxy
     {
         $this->ready ?: $this->ready = $this->initializer->__invoke($this->redis);
 
-        return $this->redis->{$method}(...$args);
+        return \call_user_func_array(array($this->redis, $method), $args);
     }
 
     public function hscan($strKey, &$iIterator, $strPattern = null, $iCount = null)
diff --git a/advancedcontentfilter/vendor/symfony/cache/Traits/RedisTrait.php b/advancedcontentfilter/vendor/symfony/cache/Traits/RedisTrait.php
index dabdde4e..ac8b5a5f 100644
--- a/advancedcontentfilter/vendor/symfony/cache/Traits/RedisTrait.php
+++ b/advancedcontentfilter/vendor/symfony/cache/Traits/RedisTrait.php
@@ -11,15 +11,13 @@
 
 namespace Symfony\Component\Cache\Traits;
 
+use Predis\Connection\Factory;
 use Predis\Connection\Aggregate\ClusterInterface;
+use Predis\Connection\Aggregate\PredisCluster;
 use Predis\Connection\Aggregate\RedisCluster;
-use Predis\Connection\Aggregate\ReplicationInterface;
-use Predis\Response\ErrorInterface;
 use Predis\Response\Status;
 use Symfony\Component\Cache\Exception\CacheException;
 use Symfony\Component\Cache\Exception\InvalidArgumentException;
-use Symfony\Component\Cache\Marshaller\DefaultMarshaller;
-use Symfony\Component\Cache\Marshaller\MarshallerInterface;
 
 /**
  * @author Aurimas Niekis <aurimas@niekis.lt>
@@ -29,47 +27,33 @@ use Symfony\Component\Cache\Marshaller\MarshallerInterface;
  */
 trait RedisTrait
 {
-    private static $defaultConnectionOptions = [
+    private static $defaultConnectionOptions = array(
         'class' => null,
         'persistent' => 0,
         'persistent_id' => null,
         'timeout' => 30,
         'read_timeout' => 0,
         'retry_interval' => 0,
-        'tcp_keepalive' => 0,
-        'lazy' => null,
-        'redis_cluster' => false,
-        'redis_sentinel' => null,
-        'dbindex' => 0,
-        'failover' => 'none',
-        'ssl' => null, // see https://php.net/context.ssl
-    ];
+        'lazy' => false,
+    );
     private $redis;
-    private $marshaller;
 
     /**
-     * @param \Redis|\RedisArray|\RedisCluster|\Predis\ClientInterface|RedisProxy|RedisClusterProxy $redis
+     * @param \Redis|\RedisArray|\RedisCluster|\Predis\Client $redisClient
      */
-    private function init($redis, string $namespace, int $defaultLifetime, ?MarshallerInterface $marshaller)
+    public function init($redisClient, $namespace = '', $defaultLifetime = 0)
     {
         parent::__construct($namespace, $defaultLifetime);
 
         if (preg_match('#[^-+_.A-Za-z0-9]#', $namespace, $match)) {
             throw new InvalidArgumentException(sprintf('RedisAdapter namespace contains "%s" but only characters in [-+_.A-Za-z0-9] are allowed.', $match[0]));
         }
-
-        if (!$redis instanceof \Redis && !$redis instanceof \RedisArray && !$redis instanceof \RedisCluster && !$redis instanceof \Predis\ClientInterface && !$redis instanceof RedisProxy && !$redis instanceof RedisClusterProxy) {
-            throw new InvalidArgumentException(sprintf('"%s()" expects parameter 1 to be Redis, RedisArray, RedisCluster or Predis\ClientInterface, "%s" given.', __METHOD__, \is_object($redis) ? \get_class($redis) : \gettype($redis)));
+        if ($redisClient instanceof \RedisCluster) {
+            $this->enableVersioning();
+        } elseif (!$redisClient instanceof \Redis && !$redisClient instanceof \RedisArray && !$redisClient instanceof \Predis\Client && !$redisClient instanceof RedisProxy) {
+            throw new InvalidArgumentException(sprintf('%s() expects parameter 1 to be Redis, RedisArray, RedisCluster or Predis\Client, %s given', __METHOD__, is_object($redisClient) ? get_class($redisClient) : gettype($redisClient)));
         }
-
-        if ($redis instanceof \Predis\ClientInterface && $redis->getOptions()->exceptions) {
-            $options = clone $redis->getOptions();
-            \Closure::bind(function () { $this->options['exceptions'] = false; }, $options, $options)();
-            $redis = new $redis($redis->getConnection(), $options);
-        }
-
-        $this->redis = $redis;
-        $this->marshaller = $marshaller ?? new DefaultMarshaller();
+        $this->redis = $redisClient;
     }
 
     /**
@@ -87,138 +71,72 @@ trait RedisTrait
      *
      * @throws InvalidArgumentException when the DSN is invalid
      *
-     * @return \Redis|\RedisCluster|RedisClusterProxy|RedisProxy|\Predis\ClientInterface According to the "class" option
+     * @return \Redis|\Predis\Client According to the "class" option
      */
-    public static function createConnection($dsn, array $options = [])
+    public static function createConnection($dsn, array $options = array())
     {
-        if (str_starts_with($dsn, 'redis:')) {
-            $scheme = 'redis';
-        } elseif (str_starts_with($dsn, 'rediss:')) {
-            $scheme = 'rediss';
-        } else {
-            throw new InvalidArgumentException(sprintf('Invalid Redis DSN: "%s" does not start with "redis:" or "rediss".', $dsn));
+        if (0 !== strpos($dsn, 'redis://')) {
+            throw new InvalidArgumentException(sprintf('Invalid Redis DSN: %s does not start with "redis://"', $dsn));
         }
-
-        if (!\extension_loaded('redis') && !class_exists(\Predis\Client::class)) {
-            throw new CacheException(sprintf('Cannot find the "redis" extension nor the "predis/predis" package: "%s".', $dsn));
-        }
-
-        $params = preg_replace_callback('#^'.$scheme.':(//)?(?:(?:[^:@]*+:)?([^@]*+)@)?#', function ($m) use (&$auth) {
-            if (isset($m[2])) {
-                $auth = $m[2];
-
-                if ('' === $auth) {
-                    $auth = null;
-                }
+        $params = preg_replace_callback('#^redis://(?:(?:[^:@]*+:)?([^@]*+)@)?#', function ($m) use (&$auth) {
+            if (isset($m[1])) {
+                $auth = $m[1];
             }
 
-            return 'file:'.($m[1] ?? '');
+            return 'file://';
         }, $dsn);
-
         if (false === $params = parse_url($params)) {
-            throw new InvalidArgumentException(sprintf('Invalid Redis DSN: "%s".', $dsn));
+            throw new InvalidArgumentException(sprintf('Invalid Redis DSN: %s', $dsn));
         }
-
-        $query = $hosts = [];
-
-        $tls = 'rediss' === $scheme;
-        $tcpScheme = $tls ? 'tls' : 'tcp';
-
+        if (!isset($params['host']) && !isset($params['path'])) {
+            throw new InvalidArgumentException(sprintf('Invalid Redis DSN: %s', $dsn));
+        }
+        if (isset($params['path']) && preg_match('#/(\d+)$#', $params['path'], $m)) {
+            $params['dbindex'] = $m[1];
+            $params['path'] = substr($params['path'], 0, -strlen($m[0]));
+        }
+        if (isset($params['host'])) {
+            $scheme = 'tcp';
+        } else {
+            $scheme = 'unix';
+        }
+        $params += array(
+            'host' => isset($params['host']) ? $params['host'] : $params['path'],
+            'port' => isset($params['host']) ? 6379 : null,
+            'dbindex' => 0,
+        );
         if (isset($params['query'])) {
             parse_str($params['query'], $query);
-
-            if (isset($query['host'])) {
-                if (!\is_array($hosts = $query['host'])) {
-                    throw new InvalidArgumentException(sprintf('Invalid Redis DSN: "%s".', $dsn));
-                }
-                foreach ($hosts as $host => $parameters) {
-                    if (\is_string($parameters)) {
-                        parse_str($parameters, $parameters);
-                    }
-                    if (false === $i = strrpos($host, ':')) {
-                        $hosts[$host] = ['scheme' => $tcpScheme, 'host' => $host, 'port' => 6379] + $parameters;
-                    } elseif ($port = (int) substr($host, 1 + $i)) {
-                        $hosts[$host] = ['scheme' => $tcpScheme, 'host' => substr($host, 0, $i), 'port' => $port] + $parameters;
-                    } else {
-                        $hosts[$host] = ['scheme' => 'unix', 'path' => substr($host, 0, $i)] + $parameters;
-                    }
-                }
-                $hosts = array_values($hosts);
-            }
+            $params += $query;
         }
-
-        if (isset($params['host']) || isset($params['path'])) {
-            if (!isset($params['dbindex']) && isset($params['path'])) {
-                if (preg_match('#/(\d+)$#', $params['path'], $m)) {
-                    $params['dbindex'] = $m[1];
-                    $params['path'] = substr($params['path'], 0, -\strlen($m[0]));
-                } elseif (isset($params['host'])) {
-                    throw new InvalidArgumentException(sprintf('Invalid Redis DSN: "%s", the "dbindex" parameter must be a number.', $dsn));
-                }
-            }
-
-            if (isset($params['host'])) {
-                array_unshift($hosts, ['scheme' => $tcpScheme, 'host' => $params['host'], 'port' => $params['port'] ?? 6379]);
-            } else {
-                array_unshift($hosts, ['scheme' => 'unix', 'path' => $params['path']]);
-            }
-        }
-
-        if (!$hosts) {
-            throw new InvalidArgumentException(sprintf('Invalid Redis DSN: "%s".', $dsn));
-        }
-
-        $params += $query + $options + self::$defaultConnectionOptions;
-
-        if (isset($params['redis_sentinel']) && !class_exists(\Predis\Client::class)) {
-            throw new CacheException(sprintf('Redis Sentinel support requires the "predis/predis" package: "%s".', $dsn));
-        }
-
-        if (null === $params['class'] && !isset($params['redis_sentinel']) && \extension_loaded('redis')) {
-            $class = $params['redis_cluster'] ? \RedisCluster::class : (1 < \count($hosts) ? \RedisArray::class : \Redis::class);
-        } else {
-            $class = $params['class'] ?? \Predis\Client::class;
-
-            if (isset($params['redis_sentinel']) && !is_a($class, \Predis\Client::class, true)) {
-                throw new CacheException(sprintf('Cannot use Redis Sentinel: class "%s" does not extend "Predis\Client": "%s".', $class, $dsn));
-            }
+        $params += $options + self::$defaultConnectionOptions;
+        if (null === $params['class'] && !extension_loaded('redis') && !class_exists(\Predis\Client::class)) {
+            throw new CacheException(sprintf('Cannot find the "redis" extension, and "predis/predis" is not installed: %s', $dsn));
         }
+        $class = null === $params['class'] ? (extension_loaded('redis') ? \Redis::class : \Predis\Client::class) : $params['class'];
 
         if (is_a($class, \Redis::class, true)) {
             $connect = $params['persistent'] || $params['persistent_id'] ? 'pconnect' : 'connect';
             $redis = new $class();
 
-            $initializer = static function ($redis) use ($connect, $params, $dsn, $auth, $hosts, $tls) {
-                $host = $hosts[0]['host'] ?? $hosts[0]['path'];
-                $port = $hosts[0]['port'] ?? 0;
-
-                if (isset($hosts[0]['host']) && $tls) {
-                    $host = 'tls://'.$host;
+            $initializer = function ($redis) use ($connect, $params, $dsn, $auth) {
+                try {
+                    @$redis->{$connect}($params['host'], $params['port'], $params['timeout'], $params['persistent_id'], $params['retry_interval']);
+                } catch (\RedisException $e) {
+                    throw new InvalidArgumentException(sprintf('Redis connection failed (%s): %s', $e->getMessage(), $dsn));
                 }
 
-                try {
-                    @$redis->{$connect}($host, $port, $params['timeout'], (string) $params['persistent_id'], $params['retry_interval'], $params['read_timeout'], ...\defined('Redis::SCAN_PREFIX') ? [['stream' => $params['ssl'] ?? null]] : []);
+                if (@!$redis->isConnected()) {
+                    $e = ($e = error_get_last()) && preg_match('/^Redis::p?connect\(\): (.*)/', $e['message'], $e) ? sprintf(' (%s)', $e[1]) : '';
+                    throw new InvalidArgumentException(sprintf('Redis connection failed%s: %s', $e, $dsn));
+                }
 
-                    set_error_handler(function ($type, $msg) use (&$error) { $error = $msg; });
-                    $isConnected = $redis->isConnected();
-                    restore_error_handler();
-                    if (!$isConnected) {
-                        $error = preg_match('/^Redis::p?connect\(\): (.*)/', $error, $error) ? sprintf(' (%s)', $error[1]) : '';
-                        throw new InvalidArgumentException(sprintf('Redis connection "%s" failed: ', $dsn).$error.'.');
-                    }
-
-                    if ((null !== $auth && !$redis->auth($auth))
-                        || ($params['dbindex'] && !$redis->select($params['dbindex']))
-                    ) {
-                        $e = preg_replace('/^ERR /', '', $redis->getLastError());
-                        throw new InvalidArgumentException(sprintf('Redis connection "%s" failed: ', $dsn).$e.'.');
-                    }
-
-                    if (0 < $params['tcp_keepalive'] && \defined('Redis::OPT_TCP_KEEPALIVE')) {
-                        $redis->setOption(\Redis::OPT_TCP_KEEPALIVE, $params['tcp_keepalive']);
-                    }
-                } catch (\RedisException $e) {
-                    throw new InvalidArgumentException(sprintf('Redis connection "%s" failed: ', $dsn).$e->getMessage());
+                if ((null !== $auth && !$redis->auth($auth))
+                    || ($params['dbindex'] && !$redis->select($params['dbindex']))
+                    || ($params['read_timeout'] && !$redis->setOption(\Redis::OPT_READ_TIMEOUT, $params['read_timeout']))
+                ) {
+                    $e = preg_replace('/^ERR /', '', $redis->getLastError());
+                    throw new InvalidArgumentException(sprintf('Redis connection failed (%s): %s', $e, $dsn));
                 }
 
                 return true;
@@ -229,94 +147,15 @@ trait RedisTrait
             } else {
                 $initializer($redis);
             }
-        } elseif (is_a($class, \RedisArray::class, true)) {
-            foreach ($hosts as $i => $host) {
-                switch ($host['scheme']) {
-                    case 'tcp': $hosts[$i] = $host['host'].':'.$host['port']; break;
-                    case 'tls': $hosts[$i] = 'tls://'.$host['host'].':'.$host['port']; break;
-                    default: $hosts[$i] = $host['path'];
-                }
-            }
-            $params['lazy_connect'] = $params['lazy'] ?? true;
-            $params['connect_timeout'] = $params['timeout'];
-
-            try {
-                $redis = new $class($hosts, $params);
-            } catch (\RedisClusterException $e) {
-                throw new InvalidArgumentException(sprintf('Redis connection "%s" failed: ', $dsn).$e->getMessage());
-            }
-
-            if (0 < $params['tcp_keepalive'] && \defined('Redis::OPT_TCP_KEEPALIVE')) {
-                $redis->setOption(\Redis::OPT_TCP_KEEPALIVE, $params['tcp_keepalive']);
-            }
-        } elseif (is_a($class, \RedisCluster::class, true)) {
-            $initializer = static function () use ($class, $params, $dsn, $hosts) {
-                foreach ($hosts as $i => $host) {
-                    switch ($host['scheme']) {
-                        case 'tcp': $hosts[$i] = $host['host'].':'.$host['port']; break;
-                        case 'tls': $hosts[$i] = 'tls://'.$host['host'].':'.$host['port']; break;
-                        default: $hosts[$i] = $host['path'];
-                    }
-                }
-
-                try {
-                    $redis = new $class(null, $hosts, $params['timeout'], $params['read_timeout'], (bool) $params['persistent'], $params['auth'] ?? '', ...\defined('Redis::SCAN_PREFIX') ? [$params['ssl'] ?? null] : []);
-                } catch (\RedisClusterException $e) {
-                    throw new InvalidArgumentException(sprintf('Redis connection "%s" failed: ', $dsn).$e->getMessage());
-                }
-
-                if (0 < $params['tcp_keepalive'] && \defined('Redis::OPT_TCP_KEEPALIVE')) {
-                    $redis->setOption(\Redis::OPT_TCP_KEEPALIVE, $params['tcp_keepalive']);
-                }
-                switch ($params['failover']) {
-                    case 'error': $redis->setOption(\RedisCluster::OPT_SLAVE_FAILOVER, \RedisCluster::FAILOVER_ERROR); break;
-                    case 'distribute': $redis->setOption(\RedisCluster::OPT_SLAVE_FAILOVER, \RedisCluster::FAILOVER_DISTRIBUTE); break;
-                    case 'slaves': $redis->setOption(\RedisCluster::OPT_SLAVE_FAILOVER, \RedisCluster::FAILOVER_DISTRIBUTE_SLAVES); break;
-                }
-
-                return $redis;
-            };
-
-            $redis = $params['lazy'] ? new RedisClusterProxy($initializer) : $initializer();
-        } elseif (is_a($class, \Predis\ClientInterface::class, true)) {
-            if ($params['redis_cluster']) {
-                $params['cluster'] = 'redis';
-                if (isset($params['redis_sentinel'])) {
-                    throw new InvalidArgumentException(sprintf('Cannot use both "redis_cluster" and "redis_sentinel" at the same time: "%s".', $dsn));
-                }
-            } elseif (isset($params['redis_sentinel'])) {
-                $params['replication'] = 'sentinel';
-                $params['service'] = $params['redis_sentinel'];
-            }
-            $params += ['parameters' => []];
-            $params['parameters'] += [
-                'persistent' => $params['persistent'],
-                'timeout' => $params['timeout'],
-                'read_write_timeout' => $params['read_timeout'],
-                'tcp_nodelay' => true,
-            ];
-            if ($params['dbindex']) {
-                $params['parameters']['database'] = $params['dbindex'];
-            }
-            if (null !== $auth) {
-                $params['parameters']['password'] = $auth;
-            }
-            if (1 === \count($hosts) && !($params['redis_cluster'] || $params['redis_sentinel'])) {
-                $hosts = $hosts[0];
-            } elseif (\in_array($params['failover'], ['slaves', 'distribute'], true) && !isset($params['replication'])) {
-                $params['replication'] = true;
-                $hosts[0] += ['alias' => 'master'];
-            }
-            $params['exceptions'] = false;
-
-            $redis = new $class($hosts, array_diff_key($params, array_diff_key(self::$defaultConnectionOptions, ['ssl' => null])));
-            if (isset($params['redis_sentinel'])) {
-                $redis->getConnection()->setSentinelTimeout($params['timeout']);
-            }
+        } elseif (is_a($class, \Predis\Client::class, true)) {
+            $params['scheme'] = $scheme;
+            $params['database'] = $params['dbindex'] ?: null;
+            $params['password'] = $auth;
+            $redis = new $class((new Factory())->create($params));
         } elseif (class_exists($class, false)) {
-            throw new InvalidArgumentException(sprintf('"%s" is not a subclass of "Redis", "RedisArray", "RedisCluster" nor "Predis\ClientInterface".', $class));
+            throw new InvalidArgumentException(sprintf('"%s" is not a subclass of "Redis" or "Predis\Client"', $class));
         } else {
-            throw new InvalidArgumentException(sprintf('Class "%s" does not exist.', $class));
+            throw new InvalidArgumentException(sprintf('Class "%s" does not exist', $class));
         }
 
         return $redis;
@@ -327,35 +166,18 @@ trait RedisTrait
      */
     protected function doFetch(array $ids)
     {
-        if (!$ids) {
-            return [];
-        }
-
-        $result = [];
-
-        if ($this->redis instanceof \Predis\ClientInterface && $this->redis->getConnection() instanceof ClusterInterface) {
+        if ($ids) {
             $values = $this->pipeline(function () use ($ids) {
                 foreach ($ids as $id) {
-                    yield 'get' => [$id];
+                    yield 'get' => array($id);
                 }
             });
-        } else {
-            $values = $this->redis->mget($ids);
-
-            if (!\is_array($values) || \count($values) !== \count($ids)) {
-                return [];
-            }
-
-            $values = array_combine($ids, $values);
-        }
-
-        foreach ($values as $id => $v) {
-            if ($v) {
-                $result[$id] = $this->marshaller->unmarshall($v);
+            foreach ($values as $id => $v) {
+                if ($v) {
+                    yield $id => parent::unserialize($v);
+                }
             }
         }
-
-        return $result;
     }
 
     /**
@@ -371,19 +193,33 @@ trait RedisTrait
      */
     protected function doClear($namespace)
     {
-        if ($this->redis instanceof \Predis\ClientInterface) {
-            $prefix = $this->redis->getOptions()->prefix ? $this->redis->getOptions()->prefix->getPrefix() : '';
-            $prefixLen = \strlen($prefix ?? '');
-        }
+        // When using a native Redis cluster, clearing the cache is done by versioning in AbstractTrait::clear().
+        // This means old keys are not really removed until they expire and may need gargage collection.
 
         $cleared = true;
-        $hosts = $this->getHosts();
-        $host = reset($hosts);
-        if ($host instanceof \Predis\Client && $host->getConnection() instanceof ReplicationInterface) {
-            // Predis supports info command only on the master in replication environments
-            $hosts = [$host->getClientFor('master')];
-        }
+        $hosts = array($this->redis);
+        $evalArgs = array(array($namespace), 0);
 
+        if ($this->redis instanceof \Predis\Client) {
+            $evalArgs = array(0, $namespace);
+
+            $connection = $this->redis->getConnection();
+            if ($connection instanceof PredisCluster) {
+                $hosts = array();
+                foreach ($connection as $c) {
+                    $hosts[] = new \Predis\Client($c);
+                }
+            } elseif ($connection instanceof RedisCluster) {
+                return false;
+            }
+        } elseif ($this->redis instanceof \RedisArray) {
+            $hosts = array();
+            foreach ($this->redis->_hosts() as $host) {
+                $hosts[] = $this->redis->_instance($host);
+            }
+        } elseif ($this->redis instanceof \RedisCluster) {
+            return false;
+        }
         foreach ($hosts as $host) {
             if (!isset($namespace[0])) {
                 $cleared = $host->flushDb() && $cleared;
@@ -391,37 +227,25 @@ trait RedisTrait
             }
 
             $info = $host->info('Server');
-            $info = !$info instanceof ErrorInterface ? $info['Server'] ?? $info : ['redis_version' => '2.0'];
-
-            if (!$host instanceof \Predis\ClientInterface) {
-                $prefix = \defined('Redis::SCAN_PREFIX') && (\Redis::SCAN_PREFIX & $host->getOption(\Redis::OPT_SCAN)) ? '' : $host->getOption(\Redis::OPT_PREFIX);
-                $prefixLen = \strlen($host->getOption(\Redis::OPT_PREFIX) ?? '');
-            }
-            $pattern = $prefix.$namespace.'*';
+            $info = isset($info['Server']) ? $info['Server'] : $info;
 
             if (!version_compare($info['redis_version'], '2.8', '>=')) {
                 // As documented in Redis documentation (http://redis.io/commands/keys) using KEYS
                 // can hang your server when it is executed against large databases (millions of items).
                 // Whenever you hit this scale, you should really consider upgrading to Redis 2.8 or above.
-                $args = $this->redis instanceof \Predis\ClientInterface ? [0, $pattern] : [[$pattern], 0];
-                $cleared = $host->eval("local keys=redis.call('KEYS',ARGV[1]) for i=1,#keys,5000 do redis.call('DEL',unpack(keys,i,math.min(i+4999,#keys))) end return 1", $args[0], $args[1]) && $cleared;
+                $cleared = $host->eval("local keys=redis.call('KEYS',ARGV[1]..'*') for i=1,#keys,5000 do redis.call('DEL',unpack(keys,i,math.min(i+4999,#keys))) end return 1", $evalArgs[0], $evalArgs[1]) && $cleared;
                 continue;
             }
 
             $cursor = null;
             do {
-                $keys = $host instanceof \Predis\ClientInterface ? $host->scan($cursor, 'MATCH', $pattern, 'COUNT', 1000) : $host->scan($cursor, $pattern, 1000);
-                if (isset($keys[1]) && \is_array($keys[1])) {
+                $keys = $host instanceof \Predis\Client ? $host->scan($cursor, 'MATCH', $namespace.'*', 'COUNT', 1000) : $host->scan($cursor, $namespace.'*', 1000);
+                if (isset($keys[1]) && is_array($keys[1])) {
                     $cursor = $keys[0];
                     $keys = $keys[1];
                 }
                 if ($keys) {
-                    if ($prefixLen) {
-                        foreach ($keys as $i => $key) {
-                            $keys[$i] = substr($key, $prefixLen);
-                        }
-                    }
-                    $this->doDelete($keys);
+                    $host->del($keys);
                 }
             } while ($cursor = (int) $cursor);
         }
@@ -434,17 +258,7 @@ trait RedisTrait
      */
     protected function doDelete(array $ids)
     {
-        if (!$ids) {
-            return true;
-        }
-
-        if ($this->redis instanceof \Predis\ClientInterface && $this->redis->getConnection() instanceof ClusterInterface) {
-            $this->pipeline(function () use ($ids) {
-                foreach ($ids as $id) {
-                    yield 'del' => [$id];
-                }
-            })->rewind();
-        } else {
+        if ($ids) {
             $this->redis->del($ids);
         }
 
@@ -454,24 +268,34 @@ trait RedisTrait
     /**
      * {@inheritdoc}
      */
-    protected function doSave(array $values, int $lifetime)
+    protected function doSave(array $values, $lifetime)
     {
-        if (!$values = $this->marshaller->marshall($values, $failed)) {
+        $serialized = array();
+        $failed = array();
+
+        foreach ($values as $id => $value) {
+            try {
+                $serialized[$id] = serialize($value);
+            } catch (\Exception $e) {
+                $failed[] = $id;
+            }
+        }
+
+        if (!$serialized) {
             return $failed;
         }
 
-        $results = $this->pipeline(function () use ($values, $lifetime) {
-            foreach ($values as $id => $value) {
+        $results = $this->pipeline(function () use ($serialized, $lifetime) {
+            foreach ($serialized as $id => $value) {
                 if (0 >= $lifetime) {
-                    yield 'set' => [$id, $value];
+                    yield 'set' => array($id, $value);
                 } else {
-                    yield 'setEx' => [$id, $lifetime, $value];
+                    yield 'setEx' => array($id, $lifetime, $value);
                 }
             }
         });
-
         foreach ($results as $id => $result) {
-            if (true !== $result && (!$result instanceof Status || Status::get('OK') !== $result)) {
+            if (true !== $result && (!$result instanceof Status || $result !== Status::get('OK'))) {
                 $failed[] = $id;
             }
         }
@@ -479,87 +303,54 @@ trait RedisTrait
         return $failed;
     }
 
-    private function pipeline(\Closure $generator, $redis = null): \Generator
+    private function pipeline(\Closure $generator)
     {
-        $ids = [];
-        $redis = $redis ?? $this->redis;
+        $ids = array();
 
-        if ($redis instanceof RedisClusterProxy || $redis instanceof \RedisCluster || ($redis instanceof \Predis\ClientInterface && $redis->getConnection() instanceof RedisCluster)) {
-            // phpredis & predis don't support pipelining with RedisCluster
-            // see https://github.com/phpredis/phpredis/blob/develop/cluster.markdown#pipelining
-            // see https://github.com/nrk/predis/issues/267#issuecomment-123781423
-            $results = [];
-            foreach ($generator() as $command => $args) {
-                $results[] = $redis->{$command}(...$args);
-                $ids[] = 'eval' === $command ? ($redis instanceof \Predis\ClientInterface ? $args[2] : $args[1][0]) : $args[0];
-            }
-        } elseif ($redis instanceof \Predis\ClientInterface) {
-            $results = $redis->pipeline(static function ($redis) use ($generator, &$ids) {
+        if ($this->redis instanceof \Predis\Client && !$this->redis->getConnection() instanceof ClusterInterface) {
+            $results = $this->redis->pipeline(function ($redis) use ($generator, &$ids) {
                 foreach ($generator() as $command => $args) {
-                    $redis->{$command}(...$args);
-                    $ids[] = 'eval' === $command ? $args[2] : $args[0];
+                    call_user_func_array(array($redis, $command), $args);
+                    $ids[] = $args[0];
                 }
             });
-        } elseif ($redis instanceof \RedisArray) {
-            $connections = $results = $ids = [];
+        } elseif ($this->redis instanceof \RedisArray) {
+            $connections = $results = $ids = array();
             foreach ($generator() as $command => $args) {
-                $id = 'eval' === $command ? $args[1][0] : $args[0];
-                if (!isset($connections[$h = $redis->_target($id)])) {
-                    $connections[$h] = [$redis->_instance($h), -1];
+                if (!isset($connections[$h = $this->redis->_target($args[0])])) {
+                    $connections[$h] = array($this->redis->_instance($h), -1);
                     $connections[$h][0]->multi(\Redis::PIPELINE);
                 }
-                $connections[$h][0]->{$command}(...$args);
-                $results[] = [$h, ++$connections[$h][1]];
-                $ids[] = $id;
+                call_user_func_array(array($connections[$h][0], $command), $args);
+                $results[] = array($h, ++$connections[$h][1]);
+                $ids[] = $args[0];
             }
             foreach ($connections as $h => $c) {
                 $connections[$h] = $c[0]->exec();
             }
-            foreach ($results as $k => [$h, $c]) {
+            foreach ($results as $k => list($h, $c)) {
                 $results[$k] = $connections[$h][$c];
             }
-        } else {
-            $redis->multi(\Redis::PIPELINE);
+        } elseif ($this->redis instanceof \RedisCluster || ($this->redis instanceof \Predis\Client && $this->redis->getConnection() instanceof ClusterInterface)) {
+            // phpredis & predis don't support pipelining with RedisCluster
+            // see https://github.com/phpredis/phpredis/blob/develop/cluster.markdown#pipelining
+            // see https://github.com/nrk/predis/issues/267#issuecomment-123781423
+            $results = array();
             foreach ($generator() as $command => $args) {
-                $redis->{$command}(...$args);
-                $ids[] = 'eval' === $command ? $args[1][0] : $args[0];
+                $results[] = call_user_func_array(array($this->redis, $command), $args);
+                $ids[] = $args[0];
             }
-            $results = $redis->exec();
-        }
-
-        if (!$redis instanceof \Predis\ClientInterface && 'eval' === $command && $redis->getLastError()) {
-            $e = new \RedisException($redis->getLastError());
-            $results = array_map(function ($v) use ($e) { return false === $v ? $e : $v; }, $results);
+        } else {
+            $this->redis->multi(\Redis::PIPELINE);
+            foreach ($generator() as $command => $args) {
+                call_user_func_array(array($this->redis, $command), $args);
+                $ids[] = $args[0];
+            }
+            $results = $this->redis->exec();
         }
 
         foreach ($ids as $k => $id) {
             yield $id => $results[$k];
         }
     }
-
-    private function getHosts(): array
-    {
-        $hosts = [$this->redis];
-        if ($this->redis instanceof \Predis\ClientInterface) {
-            $connection = $this->redis->getConnection();
-            if ($connection instanceof ClusterInterface && $connection instanceof \Traversable) {
-                $hosts = [];
-                foreach ($connection as $c) {
-                    $hosts[] = new \Predis\Client($c);
-                }
-            }
-        } elseif ($this->redis instanceof \RedisArray) {
-            $hosts = [];
-            foreach ($this->redis->_hosts() as $host) {
-                $hosts[] = $this->redis->_instance($host);
-            }
-        } elseif ($this->redis instanceof RedisClusterProxy || $this->redis instanceof \RedisCluster) {
-            $hosts = [];
-            foreach ($this->redis->_masters() as $host) {
-                $hosts[] = new RedisClusterNodeProxy($host, $this->redis);
-            }
-        }
-
-        return $hosts;
-    }
 }
diff --git a/advancedcontentfilter/vendor/symfony/cache/composer.json b/advancedcontentfilter/vendor/symfony/cache/composer.json
index 7a9e8df5..e13cd967 100644
--- a/advancedcontentfilter/vendor/symfony/cache/composer.json
+++ b/advancedcontentfilter/vendor/symfony/cache/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "symfony/cache",
     "type": "library",
-    "description": "Provides extended PSR-6, PSR-16 (and tags) implementations",
+    "description": "Symfony Cache component with PSR-6, PSR-16, and tags",
     "keywords": ["caching", "psr6"],
     "homepage": "https://symfony.com",
     "license": "MIT",
@@ -16,37 +16,24 @@
         }
     ],
     "provide": {
-        "psr/cache-implementation": "1.0|2.0",
-        "psr/simple-cache-implementation": "1.0|2.0",
-        "symfony/cache-implementation": "1.0|2.0"
+        "psr/cache-implementation": "1.0",
+        "psr/simple-cache-implementation": "1.0"
     },
     "require": {
-        "php": ">=7.1.3",
-        "psr/cache": "^1.0|^2.0",
-        "psr/log": "^1|^2|^3",
-        "symfony/cache-contracts": "^1.1.7|^2",
-        "symfony/polyfill-php73": "^1.9",
-        "symfony/polyfill-php80": "^1.16",
-        "symfony/service-contracts": "^1.1|^2",
-        "symfony/var-exporter": "^4.2|^5.0"
+        "php": "^5.5.9|>=7.0.8",
+        "psr/cache": "~1.0",
+        "psr/log": "~1.0",
+        "psr/simple-cache": "^1.0",
+        "symfony/polyfill-apcu": "~1.1"
     },
     "require-dev": {
         "cache/integration-tests": "dev-master",
-        "doctrine/cache": "^1.6|^2.0",
-        "doctrine/dbal": "^2.7|^3.0",
-        "predis/predis": "^1.1",
-        "psr/simple-cache": "^1.0|^2.0",
-        "symfony/config": "^4.2|^5.0",
-        "symfony/dependency-injection": "^3.4|^4.1|^5.0",
-        "symfony/filesystem": "^4.4|^5.0",
-        "symfony/http-kernel": "^4.4",
-        "symfony/var-dumper": "^4.4|^5.0"
+        "doctrine/cache": "~1.6",
+        "doctrine/dbal": "~2.4",
+        "predis/predis": "~1.0"
     },
     "conflict": {
-        "doctrine/dbal": "<2.7",
-        "symfony/dependency-injection": "<3.4",
-        "symfony/http-kernel": "<4.4|>=5.0",
-        "symfony/var-dumper": "<4.4"
+        "symfony/var-dumper": "<3.3"
     },
     "autoload": {
         "psr-4": { "Symfony\\Component\\Cache\\": "" },
@@ -54,5 +41,10 @@
             "/Tests/"
         ]
     },
-    "minimum-stability": "dev"
+    "minimum-stability": "dev",
+    "extra": {
+        "branch-alias": {
+            "dev-master": "3.4-dev"
+        }
+    }
 }
diff --git a/advancedcontentfilter/vendor/symfony/cache/phpunit.xml.dist b/advancedcontentfilter/vendor/symfony/cache/phpunit.xml.dist
index c35458ca..9b3c30d7 100644
--- a/advancedcontentfilter/vendor/symfony/cache/phpunit.xml.dist
+++ b/advancedcontentfilter/vendor/symfony/cache/phpunit.xml.dist
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/5.2/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
          backupGlobals="false"
          colors="true"
          bootstrap="vendor/autoload.php"
@@ -36,11 +36,11 @@
                 <array>
                     <element key="time-sensitive">
                         <array>
-                            <element key="0"><string>Cache\IntegrationTests</string></element>
-                            <element key="1"><string>Doctrine\Common\Cache</string></element>
-                            <element key="2"><string>Symfony\Component\Cache</string></element>
-                            <element key="3"><string>Symfony\Component\Cache\Tests\Fixtures</string></element>
-                            <element key="4"><string>Symfony\Component\Cache\Traits</string></element>
+                            <element><string>Cache\IntegrationTests</string></element>
+                            <element><string>Doctrine\Common\Cache</string></element>
+                            <element><string>Symfony\Component\Cache</string></element>
+                            <element><string>Symfony\Component\Cache\Tests\Fixtures</string></element>
+                            <element><string>Symfony\Component\Cache\Traits</string></element>
                         </array>
                     </element>
                 </array>
diff --git a/advancedcontentfilter/vendor/symfony/deprecation-contracts/.gitignore b/advancedcontentfilter/vendor/symfony/deprecation-contracts/.gitignore
deleted file mode 100644
index c49a5d8d..00000000
--- a/advancedcontentfilter/vendor/symfony/deprecation-contracts/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-vendor/
-composer.lock
-phpunit.xml
diff --git a/advancedcontentfilter/vendor/symfony/deprecation-contracts/CHANGELOG.md b/advancedcontentfilter/vendor/symfony/deprecation-contracts/CHANGELOG.md
deleted file mode 100644
index 7932e261..00000000
--- a/advancedcontentfilter/vendor/symfony/deprecation-contracts/CHANGELOG.md
+++ /dev/null
@@ -1,5 +0,0 @@
-CHANGELOG
-=========
-
-The changelog is maintained for all Symfony contracts at the following URL:
-https://github.com/symfony/contracts/blob/main/CHANGELOG.md
diff --git a/advancedcontentfilter/vendor/symfony/deprecation-contracts/LICENSE b/advancedcontentfilter/vendor/symfony/deprecation-contracts/LICENSE
deleted file mode 100644
index 406242ff..00000000
--- a/advancedcontentfilter/vendor/symfony/deprecation-contracts/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2020-2022 Fabien Potencier
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is furnished
-to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
diff --git a/advancedcontentfilter/vendor/symfony/deprecation-contracts/README.md b/advancedcontentfilter/vendor/symfony/deprecation-contracts/README.md
deleted file mode 100644
index 4957933a..00000000
--- a/advancedcontentfilter/vendor/symfony/deprecation-contracts/README.md
+++ /dev/null
@@ -1,26 +0,0 @@
-Symfony Deprecation Contracts
-=============================
-
-A generic function and convention to trigger deprecation notices.
-
-This package provides a single global function named `trigger_deprecation()` that triggers silenced deprecation notices.
-
-By using a custom PHP error handler such as the one provided by the Symfony ErrorHandler component,
-the triggered deprecations can be caught and logged for later discovery, both on dev and prod environments.
-
-The function requires at least 3 arguments:
- - the name of the Composer package that is triggering the deprecation
- - the version of the package that introduced the deprecation
- - the message of the deprecation
- - more arguments can be provided: they will be inserted in the message using `printf()` formatting
-
-Example:
-```php
-trigger_deprecation('symfony/blockchain', '8.9', 'Using "%s" is deprecated, use "%s" instead.', 'bitcoin', 'fabcoin');
-```
-
-This will generate the following message:
-`Since symfony/blockchain 8.9: Using "bitcoin" is deprecated, use "fabcoin" instead.`
-
-While not necessarily recommended, the deprecation notices can be completely ignored by declaring an empty
-`function trigger_deprecation() {}` in your application.
diff --git a/advancedcontentfilter/vendor/symfony/deprecation-contracts/composer.json b/advancedcontentfilter/vendor/symfony/deprecation-contracts/composer.json
deleted file mode 100644
index cc7cc123..00000000
--- a/advancedcontentfilter/vendor/symfony/deprecation-contracts/composer.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "name": "symfony/deprecation-contracts",
-    "type": "library",
-    "description": "A generic function and convention to trigger deprecation notices",
-    "homepage": "https://symfony.com",
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "Nicolas Grekas",
-            "email": "p@tchwork.com"
-        },
-        {
-            "name": "Symfony Community",
-            "homepage": "https://symfony.com/contributors"
-        }
-    ],
-    "require": {
-        "php": ">=7.1"
-    },
-    "autoload": {
-        "files": [
-            "function.php"
-        ]
-    },
-    "minimum-stability": "dev",
-    "extra": {
-        "branch-alias": {
-            "dev-main": "2.5-dev"
-        },
-        "thanks": {
-            "name": "symfony/contracts",
-            "url": "https://github.com/symfony/contracts"
-        }
-    }
-}
diff --git a/advancedcontentfilter/vendor/symfony/deprecation-contracts/function.php b/advancedcontentfilter/vendor/symfony/deprecation-contracts/function.php
deleted file mode 100644
index d4371504..00000000
--- a/advancedcontentfilter/vendor/symfony/deprecation-contracts/function.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-if (!function_exists('trigger_deprecation')) {
-    /**
-     * Triggers a silenced deprecation notice.
-     *
-     * @param string $package The name of the Composer package that is triggering the deprecation
-     * @param string $version The version of the package that introduced the deprecation
-     * @param string $message The message of the deprecation
-     * @param mixed  ...$args Values to insert in the message using printf() formatting
-     *
-     * @author Nicolas Grekas <p@tchwork.com>
-     */
-    function trigger_deprecation(string $package, string $version, string $message, ...$args): void
-    {
-        @trigger_error(($package || $version ? "Since $package $version: " : '').($args ? vsprintf($message, $args) : $message), \E_USER_DEPRECATED);
-    }
-}
diff --git a/advancedcontentfilter/vendor/symfony/expression-language/Compiler.php b/advancedcontentfilter/vendor/symfony/expression-language/Compiler.php
index 1ae427b9..66d10604 100644
--- a/advancedcontentfilter/vendor/symfony/expression-language/Compiler.php
+++ b/advancedcontentfilter/vendor/symfony/expression-language/Compiler.php
@@ -110,22 +110,22 @@ class Compiler
      */
     public function repr($value)
     {
-        if (\is_int($value) || \is_float($value)) {
-            if (false !== $locale = setlocale(\LC_NUMERIC, 0)) {
-                setlocale(\LC_NUMERIC, 'C');
+        if (is_int($value) || is_float($value)) {
+            if (false !== $locale = setlocale(LC_NUMERIC, 0)) {
+                setlocale(LC_NUMERIC, 'C');
             }
 
             $this->raw($value);
 
             if (false !== $locale) {
-                setlocale(\LC_NUMERIC, $locale);
+                setlocale(LC_NUMERIC, $locale);
             }
         } elseif (null === $value) {
             $this->raw('null');
-        } elseif (\is_bool($value)) {
+        } elseif (is_bool($value)) {
             $this->raw($value ? 'true' : 'false');
-        } elseif (\is_array($value)) {
-            $this->raw('[');
+        } elseif (is_array($value)) {
+            $this->raw('array(');
             $first = true;
             foreach ($value as $key => $value) {
                 if (!$first) {
@@ -136,7 +136,7 @@ class Compiler
                 $this->raw(' => ');
                 $this->repr($value);
             }
-            $this->raw(']');
+            $this->raw(')');
         } else {
             $this->string($value);
         }
diff --git a/advancedcontentfilter/vendor/symfony/expression-language/ExpressionFunction.php b/advancedcontentfilter/vendor/symfony/expression-language/ExpressionFunction.php
index 77c88f66..ad775dbd 100644
--- a/advancedcontentfilter/vendor/symfony/expression-language/ExpressionFunction.php
+++ b/advancedcontentfilter/vendor/symfony/expression-language/ExpressionFunction.php
@@ -76,23 +76,23 @@ class ExpressionFunction
     public static function fromPhp($phpFunctionName, $expressionFunctionName = null)
     {
         $phpFunctionName = ltrim($phpFunctionName, '\\');
-        if (!\function_exists($phpFunctionName)) {
+        if (!function_exists($phpFunctionName)) {
             throw new \InvalidArgumentException(sprintf('PHP function "%s" does not exist.', $phpFunctionName));
         }
 
         $parts = explode('\\', $phpFunctionName);
-        if (!$expressionFunctionName && \count($parts) > 1) {
+        if (!$expressionFunctionName && count($parts) > 1) {
             throw new \InvalidArgumentException(sprintf('An expression function name must be defined when PHP function "%s" is namespaced.', $phpFunctionName));
         }
 
         $compiler = function () use ($phpFunctionName) {
-            return sprintf('\%s(%s)', $phpFunctionName, implode(', ', \func_get_args()));
+            return sprintf('\%s(%s)', $phpFunctionName, implode(', ', func_get_args()));
         };
 
         $evaluator = function () use ($phpFunctionName) {
-            $args = \func_get_args();
+            $args = func_get_args();
 
-            return \call_user_func_array($phpFunctionName, array_splice($args, 1));
+            return call_user_func_array($phpFunctionName, array_splice($args, 1));
         };
 
         return new self($expressionFunctionName ?: end($parts), $compiler, $evaluator);
diff --git a/advancedcontentfilter/vendor/symfony/expression-language/ExpressionLanguage.php b/advancedcontentfilter/vendor/symfony/expression-language/ExpressionLanguage.php
index 16476669..a9cfc4ca 100644
--- a/advancedcontentfilter/vendor/symfony/expression-language/ExpressionLanguage.php
+++ b/advancedcontentfilter/vendor/symfony/expression-language/ExpressionLanguage.php
@@ -28,20 +28,20 @@ class ExpressionLanguage
     private $parser;
     private $compiler;
 
-    protected $functions = [];
+    protected $functions = array();
 
     /**
      * @param CacheItemPoolInterface                $cache
      * @param ExpressionFunctionProviderInterface[] $providers
      */
-    public function __construct($cache = null, array $providers = [])
+    public function __construct($cache = null, array $providers = array())
     {
         if (null !== $cache) {
             if ($cache instanceof ParserCacheInterface) {
-                @trigger_error(sprintf('Passing an instance of %s as constructor argument for %s is deprecated as of 3.2 and will be removed in 4.0. Pass an instance of %s instead.', ParserCacheInterface::class, self::class, CacheItemPoolInterface::class), \E_USER_DEPRECATED);
+                @trigger_error(sprintf('Passing an instance of %s as constructor argument for %s is deprecated as of 3.2 and will be removed in 4.0. Pass an instance of %s instead.', ParserCacheInterface::class, self::class, CacheItemPoolInterface::class), E_USER_DEPRECATED);
                 $cache = new ParserCacheAdapter($cache);
             } elseif (!$cache instanceof CacheItemPoolInterface) {
-                throw new \InvalidArgumentException(sprintf('Cache argument has to implement "%s".', CacheItemPoolInterface::class));
+                throw new \InvalidArgumentException(sprintf('Cache argument has to implement %s.', CacheItemPoolInterface::class));
             }
         }
 
@@ -60,7 +60,7 @@ class ExpressionLanguage
      *
      * @return string The compiled PHP source code
      */
-    public function compile($expression, $names = [])
+    public function compile($expression, $names = array())
     {
         return $this->getCompiler()->compile($this->parse($expression, $names)->getNodes())->getSource();
     }
@@ -71,9 +71,9 @@ class ExpressionLanguage
      * @param Expression|string $expression The expression to compile
      * @param array             $values     An array of values
      *
-     * @return mixed The result of the evaluation of the expression
+     * @return string The result of the evaluation of the expression
      */
-    public function evaluate($expression, $values = [])
+    public function evaluate($expression, $values = array())
     {
         return $this->parse($expression, array_keys($values))->getNodes()->evaluate($this->functions, $values);
     }
@@ -93,10 +93,10 @@ class ExpressionLanguage
         }
 
         asort($names);
-        $cacheKeyItems = [];
+        $cacheKeyItems = array();
 
         foreach ($names as $nameKey => $name) {
-            $cacheKeyItems[] = \is_int($nameKey) ? $name : $nameKey.':'.$name;
+            $cacheKeyItems[] = is_int($nameKey) ? $name : $nameKey.':'.$name;
         }
 
         $cacheItem = $this->cache->getItem(rawurlencode($expression.'//'.implode('|', $cacheKeyItems)));
@@ -129,7 +129,7 @@ class ExpressionLanguage
             throw new \LogicException('Registering functions after calling evaluate(), compile() or parse() is not supported.');
         }
 
-        $this->functions[$name] = ['compiler' => $compiler, 'evaluator' => $evaluator];
+        $this->functions[$name] = array('compiler' => $compiler, 'evaluator' => $evaluator);
     }
 
     public function addFunction(ExpressionFunction $function)
diff --git a/advancedcontentfilter/vendor/symfony/expression-language/LICENSE b/advancedcontentfilter/vendor/symfony/expression-language/LICENSE
index 9e936ec0..21d7fb9e 100644
--- a/advancedcontentfilter/vendor/symfony/expression-language/LICENSE
+++ b/advancedcontentfilter/vendor/symfony/expression-language/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2020 Fabien Potencier
+Copyright (c) 2004-2018 Fabien Potencier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/advancedcontentfilter/vendor/symfony/expression-language/Lexer.php b/advancedcontentfilter/vendor/symfony/expression-language/Lexer.php
index ace847b0..aeeda8a8 100644
--- a/advancedcontentfilter/vendor/symfony/expression-language/Lexer.php
+++ b/advancedcontentfilter/vendor/symfony/expression-language/Lexer.php
@@ -29,11 +29,11 @@ class Lexer
      */
     public function tokenize($expression)
     {
-        $expression = str_replace(["\r", "\n", "\t", "\v", "\f"], ' ', $expression);
+        $expression = str_replace(array("\r", "\n", "\t", "\v", "\f"), ' ', $expression);
         $cursor = 0;
-        $tokens = [];
-        $brackets = [];
-        $end = \strlen($expression);
+        $tokens = array();
+        $brackets = array();
+        $end = strlen($expression);
 
         while ($cursor < $end) {
             if (' ' == $expression[$cursor]) {
@@ -45,26 +45,26 @@ class Lexer
             if (preg_match('/[0-9]+(?:\.[0-9]+)?/A', $expression, $match, 0, $cursor)) {
                 // numbers
                 $number = (float) $match[0];  // floats
-                if (preg_match('/^[0-9]+$/', $match[0]) && $number <= \PHP_INT_MAX) {
+                if (preg_match('/^[0-9]+$/', $match[0]) && $number <= PHP_INT_MAX) {
                     $number = (int) $match[0]; // integers lower than the maximum
                 }
                 $tokens[] = new Token(Token::NUMBER_TYPE, $number, $cursor + 1);
-                $cursor += \strlen($match[0]);
+                $cursor += strlen($match[0]);
             } elseif (false !== strpos('([{', $expression[$cursor])) {
                 // opening bracket
-                $brackets[] = [$expression[$cursor], $cursor];
+                $brackets[] = array($expression[$cursor], $cursor);
 
                 $tokens[] = new Token(Token::PUNCTUATION_TYPE, $expression[$cursor], $cursor + 1);
                 ++$cursor;
             } elseif (false !== strpos(')]}', $expression[$cursor])) {
                 // closing bracket
                 if (empty($brackets)) {
-                    throw new SyntaxError(sprintf('Unexpected "%s".', $expression[$cursor]), $cursor, $expression);
+                    throw new SyntaxError(sprintf('Unexpected "%s"', $expression[$cursor]), $cursor, $expression);
                 }
 
                 list($expect, $cur) = array_pop($brackets);
                 if ($expression[$cursor] != strtr($expect, '([{', ')]}')) {
-                    throw new SyntaxError(sprintf('Unclosed "%s".', $expect), $cur, $expression);
+                    throw new SyntaxError(sprintf('Unclosed "%s"', $expect), $cur, $expression);
                 }
 
                 $tokens[] = new Token(Token::PUNCTUATION_TYPE, $expression[$cursor], $cursor + 1);
@@ -72,11 +72,11 @@ class Lexer
             } elseif (preg_match('/"([^"\\\\]*(?:\\\\.[^"\\\\]*)*)"|\'([^\'\\\\]*(?:\\\\.[^\'\\\\]*)*)\'/As', $expression, $match, 0, $cursor)) {
                 // strings
                 $tokens[] = new Token(Token::STRING_TYPE, stripcslashes(substr($match[0], 1, -1)), $cursor + 1);
-                $cursor += \strlen($match[0]);
-            } elseif (preg_match('/(?<=^|[\s(])not in(?=[\s(])|\!\=\=|(?<=^|[\s(])not(?=[\s(])|(?<=^|[\s(])and(?=[\s(])|\=\=\=|\>\=|(?<=^|[\s(])or(?=[\s(])|\<\=|\*\*|\.\.|(?<=^|[\s(])in(?=[\s(])|&&|\|\||(?<=^|[\s(])matches|\=\=|\!\=|\*|~|%|\/|\>|\||\!|\^|&|\+|\<|\-/A', $expression, $match, 0, $cursor)) {
+                $cursor += strlen($match[0]);
+            } elseif (preg_match('/not in(?=[\s(])|\!\=\=|not(?=[\s(])|and(?=[\s(])|\=\=\=|\>\=|or(?=[\s(])|\<\=|\*\*|\.\.|in(?=[\s(])|&&|\|\||matches|\=\=|\!\=|\*|~|%|\/|\>|\||\!|\^|&|\+|\<|\-/A', $expression, $match, 0, $cursor)) {
                 // operators
                 $tokens[] = new Token(Token::OPERATOR_TYPE, $match[0], $cursor + 1);
-                $cursor += \strlen($match[0]);
+                $cursor += strlen($match[0]);
             } elseif (false !== strpos('.,?:', $expression[$cursor])) {
                 // punctuation
                 $tokens[] = new Token(Token::PUNCTUATION_TYPE, $expression[$cursor], $cursor + 1);
@@ -84,10 +84,10 @@ class Lexer
             } elseif (preg_match('/[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*/A', $expression, $match, 0, $cursor)) {
                 // names
                 $tokens[] = new Token(Token::NAME_TYPE, $match[0], $cursor + 1);
-                $cursor += \strlen($match[0]);
+                $cursor += strlen($match[0]);
             } else {
                 // unlexable
-                throw new SyntaxError(sprintf('Unexpected character "%s".', $expression[$cursor]), $cursor, $expression);
+                throw new SyntaxError(sprintf('Unexpected character "%s"', $expression[$cursor]), $cursor, $expression);
             }
         }
 
@@ -95,7 +95,7 @@ class Lexer
 
         if (!empty($brackets)) {
             list($expect, $cur) = array_pop($brackets);
-            throw new SyntaxError(sprintf('Unclosed "%s".', $expect), $cur, $expression);
+            throw new SyntaxError(sprintf('Unclosed "%s"', $expect), $cur, $expression);
         }
 
         return new TokenStream($tokens, $expression);
diff --git a/advancedcontentfilter/vendor/symfony/expression-language/Node/ArgumentsNode.php b/advancedcontentfilter/vendor/symfony/expression-language/Node/ArgumentsNode.php
index e9849a44..1c78d805 100644
--- a/advancedcontentfilter/vendor/symfony/expression-language/Node/ArgumentsNode.php
+++ b/advancedcontentfilter/vendor/symfony/expression-language/Node/ArgumentsNode.php
@@ -27,7 +27,7 @@ class ArgumentsNode extends ArrayNode
 
     public function toArray()
     {
-        $array = [];
+        $array = array();
 
         foreach ($this->getKeyValuePairs() as $pair) {
             $array[] = $pair['value'];
diff --git a/advancedcontentfilter/vendor/symfony/expression-language/Node/ArrayNode.php b/advancedcontentfilter/vendor/symfony/expression-language/Node/ArrayNode.php
index 921319a7..e1a2f2e9 100644
--- a/advancedcontentfilter/vendor/symfony/expression-language/Node/ArrayNode.php
+++ b/advancedcontentfilter/vendor/symfony/expression-language/Node/ArrayNode.php
@@ -41,14 +41,14 @@ class ArrayNode extends Node
      */
     public function compile(Compiler $compiler)
     {
-        $compiler->raw('[');
+        $compiler->raw('array(');
         $this->compileArguments($compiler);
-        $compiler->raw(']');
+        $compiler->raw(')');
     }
 
     public function evaluate($functions, $values)
     {
-        $result = [];
+        $result = array();
         foreach ($this->getKeyValuePairs() as $pair) {
             $result[$pair['key']->evaluate($functions, $values)] = $pair['value']->evaluate($functions, $values);
         }
@@ -58,12 +58,12 @@ class ArrayNode extends Node
 
     public function toArray()
     {
-        $value = [];
+        $value = array();
         foreach ($this->getKeyValuePairs() as $pair) {
             $value[$pair['key']->attributes['value']] = $pair['value'];
         }
 
-        $array = [];
+        $array = array();
 
         if ($this->isHash($value)) {
             foreach ($value as $k => $v) {
@@ -88,9 +88,9 @@ class ArrayNode extends Node
 
     protected function getKeyValuePairs()
     {
-        $pairs = [];
+        $pairs = array();
         foreach (array_chunk($this->nodes, 2) as $pair) {
-            $pairs[] = ['key' => $pair[0], 'value' => $pair[1]];
+            $pairs[] = array('key' => $pair[0], 'value' => $pair[1]);
         }
 
         return $pairs;
diff --git a/advancedcontentfilter/vendor/symfony/expression-language/Node/BinaryNode.php b/advancedcontentfilter/vendor/symfony/expression-language/Node/BinaryNode.php
index 549161b3..33b4c8f0 100644
--- a/advancedcontentfilter/vendor/symfony/expression-language/Node/BinaryNode.php
+++ b/advancedcontentfilter/vendor/symfony/expression-language/Node/BinaryNode.php
@@ -20,24 +20,24 @@ use Symfony\Component\ExpressionLanguage\Compiler;
  */
 class BinaryNode extends Node
 {
-    private static $operators = [
+    private static $operators = array(
         '~' => '.',
         'and' => '&&',
         'or' => '||',
-    ];
+    );
 
-    private static $functions = [
+    private static $functions = array(
         '**' => 'pow',
         '..' => 'range',
         'in' => 'in_array',
         'not in' => '!in_array',
-    ];
+    );
 
     public function __construct($operator, Node $left, Node $right)
     {
         parent::__construct(
-            ['left' => $left, 'right' => $right],
-            ['operator' => $operator]
+            array('left' => $left, 'right' => $right),
+            array('operator' => $operator)
         );
     }
 
@@ -93,7 +93,7 @@ class BinaryNode extends Node
             $right = $this->nodes['right']->evaluate($functions, $values);
 
             if ('not in' === $operator) {
-                return !\in_array($left, $right);
+                return !in_array($left, $right);
             }
             $f = self::$functions[$operator];
 
@@ -135,9 +135,9 @@ class BinaryNode extends Node
             case '<=':
                 return $left <= $right;
             case 'not in':
-                return !\in_array($left, $right);
+                return !in_array($left, $right);
             case 'in':
-                return \in_array($left, $right);
+                return in_array($left, $right);
             case '+':
                 return $left + $right;
             case '-':
@@ -147,16 +147,8 @@ class BinaryNode extends Node
             case '*':
                 return $left * $right;
             case '/':
-                if (0 == $right) {
-                    throw new \DivisionByZeroError('Division by zero.');
-                }
-
                 return $left / $right;
             case '%':
-                if (0 == $right) {
-                    throw new \DivisionByZeroError('Modulo by zero.');
-                }
-
                 return $left % $right;
             case 'matches':
                 return preg_match($right, $left);
@@ -165,6 +157,6 @@ class BinaryNode extends Node
 
     public function toArray()
     {
-        return ['(', $this->nodes['left'], ' '.$this->attributes['operator'].' ', $this->nodes['right'], ')'];
+        return array('(', $this->nodes['left'], ' '.$this->attributes['operator'].' ', $this->nodes['right'], ')');
     }
 }
diff --git a/advancedcontentfilter/vendor/symfony/expression-language/Node/ConditionalNode.php b/advancedcontentfilter/vendor/symfony/expression-language/Node/ConditionalNode.php
index ca1b484b..9db0f931 100644
--- a/advancedcontentfilter/vendor/symfony/expression-language/Node/ConditionalNode.php
+++ b/advancedcontentfilter/vendor/symfony/expression-language/Node/ConditionalNode.php
@@ -23,7 +23,7 @@ class ConditionalNode extends Node
     public function __construct(Node $expr1, Node $expr2, Node $expr3)
     {
         parent::__construct(
-            ['expr1' => $expr1, 'expr2' => $expr2, 'expr3' => $expr3]
+            array('expr1' => $expr1, 'expr2' => $expr2, 'expr3' => $expr3)
         );
     }
 
@@ -51,6 +51,6 @@ class ConditionalNode extends Node
 
     public function toArray()
     {
-        return ['(', $this->nodes['expr1'], ' ? ', $this->nodes['expr2'], ' : ', $this->nodes['expr3'], ')'];
+        return array('(', $this->nodes['expr1'], ' ? ', $this->nodes['expr2'], ' : ', $this->nodes['expr3'], ')');
     }
 }
diff --git a/advancedcontentfilter/vendor/symfony/expression-language/Node/ConstantNode.php b/advancedcontentfilter/vendor/symfony/expression-language/Node/ConstantNode.php
index 670e52ed..733d481b 100644
--- a/advancedcontentfilter/vendor/symfony/expression-language/Node/ConstantNode.php
+++ b/advancedcontentfilter/vendor/symfony/expression-language/Node/ConstantNode.php
@@ -26,8 +26,8 @@ class ConstantNode extends Node
     {
         $this->isIdentifier = $isIdentifier;
         parent::__construct(
-            [],
-            ['value' => $value]
+            array(),
+            array('value' => $value)
         );
     }
 
@@ -43,7 +43,7 @@ class ConstantNode extends Node
 
     public function toArray()
     {
-        $array = [];
+        $array = array();
         $value = $this->attributes['value'];
 
         if ($this->isIdentifier) {
@@ -56,7 +56,7 @@ class ConstantNode extends Node
             $array[] = 'null';
         } elseif (is_numeric($value)) {
             $array[] = $value;
-        } elseif (!\is_array($value)) {
+        } elseif (!is_array($value)) {
             $array[] = $this->dumpString($value);
         } elseif ($this->isHash($value)) {
             foreach ($value as $k => $v) {
diff --git a/advancedcontentfilter/vendor/symfony/expression-language/Node/FunctionNode.php b/advancedcontentfilter/vendor/symfony/expression-language/Node/FunctionNode.php
index 90008d5d..13928c8d 100644
--- a/advancedcontentfilter/vendor/symfony/expression-language/Node/FunctionNode.php
+++ b/advancedcontentfilter/vendor/symfony/expression-language/Node/FunctionNode.php
@@ -23,36 +23,36 @@ class FunctionNode extends Node
     public function __construct($name, Node $arguments)
     {
         parent::__construct(
-            ['arguments' => $arguments],
-            ['name' => $name]
+            array('arguments' => $arguments),
+            array('name' => $name)
         );
     }
 
     public function compile(Compiler $compiler)
     {
-        $arguments = [];
+        $arguments = array();
         foreach ($this->nodes['arguments']->nodes as $node) {
             $arguments[] = $compiler->subcompile($node);
         }
 
         $function = $compiler->getFunction($this->attributes['name']);
 
-        $compiler->raw(\call_user_func_array($function['compiler'], $arguments));
+        $compiler->raw(call_user_func_array($function['compiler'], $arguments));
     }
 
     public function evaluate($functions, $values)
     {
-        $arguments = [$values];
+        $arguments = array($values);
         foreach ($this->nodes['arguments']->nodes as $node) {
             $arguments[] = $node->evaluate($functions, $values);
         }
 
-        return \call_user_func_array($functions[$this->attributes['name']]['evaluator'], $arguments);
+        return call_user_func_array($functions[$this->attributes['name']]['evaluator'], $arguments);
     }
 
     public function toArray()
     {
-        $array = [];
+        $array = array();
         $array[] = $this->attributes['name'];
 
         foreach ($this->nodes['arguments']->nodes as $node) {
diff --git a/advancedcontentfilter/vendor/symfony/expression-language/Node/GetAttrNode.php b/advancedcontentfilter/vendor/symfony/expression-language/Node/GetAttrNode.php
index dffe0e30..2ecba97f 100644
--- a/advancedcontentfilter/vendor/symfony/expression-language/Node/GetAttrNode.php
+++ b/advancedcontentfilter/vendor/symfony/expression-language/Node/GetAttrNode.php
@@ -27,8 +27,8 @@ class GetAttrNode extends Node
     public function __construct(Node $node, Node $attribute, ArrayNode $arguments, $type)
     {
         parent::__construct(
-            ['node' => $node, 'attribute' => $attribute, 'arguments' => $arguments],
-            ['type' => $type]
+            array('node' => $node, 'attribute' => $attribute, 'arguments' => $arguments),
+            array('type' => $type)
         );
     }
 
@@ -69,7 +69,7 @@ class GetAttrNode extends Node
         switch ($this->attributes['type']) {
             case self::PROPERTY_CALL:
                 $obj = $this->nodes['node']->evaluate($functions, $values);
-                if (!\is_object($obj)) {
+                if (!is_object($obj)) {
                     throw new \RuntimeException('Unable to get a property on a non-object.');
                 }
 
@@ -79,24 +79,18 @@ class GetAttrNode extends Node
 
             case self::METHOD_CALL:
                 $obj = $this->nodes['node']->evaluate($functions, $values);
-                if (!\is_object($obj)) {
+                if (!is_object($obj)) {
                     throw new \RuntimeException('Unable to get a property on a non-object.');
                 }
-                if (!\is_callable($toCall = [$obj, $this->nodes['attribute']->attributes['value']])) {
-                    throw new \RuntimeException(sprintf('Unable to call method "%s" of object "%s".', $this->nodes['attribute']->attributes['value'], \get_class($obj)));
+                if (!is_callable($toCall = array($obj, $this->nodes['attribute']->attributes['value']))) {
+                    throw new \RuntimeException(sprintf('Unable to call method "%s" of object "%s".', $this->nodes['attribute']->attributes['value'], get_class($obj)));
                 }
 
-                $arguments = $this->nodes['arguments']->evaluate($functions, $values);
-
-                if (\PHP_VERSION_ID >= 80000) {
-                    $arguments = array_values($arguments);
-                }
-
-                return \call_user_func_array($toCall, $arguments);
+                return call_user_func_array($toCall, $this->nodes['arguments']->evaluate($functions, $values));
 
             case self::ARRAY_CALL:
                 $array = $this->nodes['node']->evaluate($functions, $values);
-                if (!\is_array($array) && !$array instanceof \ArrayAccess) {
+                if (!is_array($array) && !$array instanceof \ArrayAccess) {
                     throw new \RuntimeException('Unable to get an item on a non-array.');
                 }
 
@@ -108,13 +102,13 @@ class GetAttrNode extends Node
     {
         switch ($this->attributes['type']) {
             case self::PROPERTY_CALL:
-                return [$this->nodes['node'], '.', $this->nodes['attribute']];
+                return array($this->nodes['node'], '.', $this->nodes['attribute']);
 
             case self::METHOD_CALL:
-                return [$this->nodes['node'], '.', $this->nodes['attribute'], '(', $this->nodes['arguments'], ')'];
+                return array($this->nodes['node'], '.', $this->nodes['attribute'], '(', $this->nodes['arguments'], ')');
 
             case self::ARRAY_CALL:
-                return [$this->nodes['node'], '[', $this->nodes['attribute'], ']'];
+                return array($this->nodes['node'], '[', $this->nodes['attribute'], ']');
         }
     }
 }
diff --git a/advancedcontentfilter/vendor/symfony/expression-language/Node/NameNode.php b/advancedcontentfilter/vendor/symfony/expression-language/Node/NameNode.php
index 1c9c277b..9e1462f2 100644
--- a/advancedcontentfilter/vendor/symfony/expression-language/Node/NameNode.php
+++ b/advancedcontentfilter/vendor/symfony/expression-language/Node/NameNode.php
@@ -23,8 +23,8 @@ class NameNode extends Node
     public function __construct($name)
     {
         parent::__construct(
-            [],
-            ['name' => $name]
+            array(),
+            array('name' => $name)
         );
     }
 
@@ -40,6 +40,6 @@ class NameNode extends Node
 
     public function toArray()
     {
-        return [$this->attributes['name']];
+        return array($this->attributes['name']);
     }
 }
diff --git a/advancedcontentfilter/vendor/symfony/expression-language/Node/Node.php b/advancedcontentfilter/vendor/symfony/expression-language/Node/Node.php
index 95045902..1db4e852 100644
--- a/advancedcontentfilter/vendor/symfony/expression-language/Node/Node.php
+++ b/advancedcontentfilter/vendor/symfony/expression-language/Node/Node.php
@@ -20,14 +20,14 @@ use Symfony\Component\ExpressionLanguage\Compiler;
  */
 class Node
 {
-    public $nodes = [];
-    public $attributes = [];
+    public $nodes = array();
+    public $attributes = array();
 
     /**
      * @param array $nodes      An array of nodes
      * @param array $attributes An array of attributes
      */
-    public function __construct(array $nodes = [], array $attributes = [])
+    public function __construct(array $nodes = array(), array $attributes = array())
     {
         $this->nodes = $nodes;
         $this->attributes = $attributes;
@@ -35,14 +35,14 @@ class Node
 
     public function __toString()
     {
-        $attributes = [];
+        $attributes = array();
         foreach ($this->attributes as $name => $value) {
             $attributes[] = sprintf('%s: %s', $name, str_replace("\n", '', var_export($value, true)));
         }
 
-        $repr = [str_replace('Symfony\Component\ExpressionLanguage\Node\\', '', static::class).'('.implode(', ', $attributes)];
+        $repr = array(str_replace('Symfony\Component\ExpressionLanguage\Node\\', '', get_class($this)).'('.implode(', ', $attributes));
 
-        if (\count($this->nodes)) {
+        if (count($this->nodes)) {
             foreach ($this->nodes as $node) {
                 foreach (explode("\n", (string) $node) as $line) {
                     $repr[] = '    '.$line;
@@ -66,7 +66,7 @@ class Node
 
     public function evaluate($functions, $values)
     {
-        $results = [];
+        $results = array();
         foreach ($this->nodes as $node) {
             $results[] = $node->evaluate($functions, $values);
         }
@@ -76,7 +76,7 @@ class Node
 
     public function toArray()
     {
-        throw new \BadMethodCallException(sprintf('Dumping a "%s" instance is not supported yet.', static::class));
+        throw new \BadMethodCallException(sprintf('Dumping a "%s" instance is not supported yet.', get_class($this)));
     }
 
     public function dump()
diff --git a/advancedcontentfilter/vendor/symfony/expression-language/Node/UnaryNode.php b/advancedcontentfilter/vendor/symfony/expression-language/Node/UnaryNode.php
index 497b7fe5..58310321 100644
--- a/advancedcontentfilter/vendor/symfony/expression-language/Node/UnaryNode.php
+++ b/advancedcontentfilter/vendor/symfony/expression-language/Node/UnaryNode.php
@@ -20,18 +20,18 @@ use Symfony\Component\ExpressionLanguage\Compiler;
  */
 class UnaryNode extends Node
 {
-    private static $operators = [
+    private static $operators = array(
         '!' => '!',
         'not' => '!',
         '+' => '+',
         '-' => '-',
-    ];
+    );
 
     public function __construct($operator, Node $node)
     {
         parent::__construct(
-            ['node' => $node],
-            ['operator' => $operator]
+            array('node' => $node),
+            array('operator' => $operator)
         );
     }
 
@@ -61,6 +61,6 @@ class UnaryNode extends Node
 
     public function toArray()
     {
-        return ['(', $this->attributes['operator'].' ', $this->nodes['node'], ')'];
+        return array('(', $this->attributes['operator'].' ', $this->nodes['node'], ')');
     }
 }
diff --git a/advancedcontentfilter/vendor/symfony/expression-language/Parser.php b/advancedcontentfilter/vendor/symfony/expression-language/Parser.php
index bfc24395..4b1ce8e3 100644
--- a/advancedcontentfilter/vendor/symfony/expression-language/Parser.php
+++ b/advancedcontentfilter/vendor/symfony/expression-language/Parser.php
@@ -36,40 +36,40 @@ class Parser
     {
         $this->functions = $functions;
 
-        $this->unaryOperators = [
-            'not' => ['precedence' => 50],
-            '!' => ['precedence' => 50],
-            '-' => ['precedence' => 500],
-            '+' => ['precedence' => 500],
-        ];
-        $this->binaryOperators = [
-            'or' => ['precedence' => 10, 'associativity' => self::OPERATOR_LEFT],
-            '||' => ['precedence' => 10, 'associativity' => self::OPERATOR_LEFT],
-            'and' => ['precedence' => 15, 'associativity' => self::OPERATOR_LEFT],
-            '&&' => ['precedence' => 15, 'associativity' => self::OPERATOR_LEFT],
-            '|' => ['precedence' => 16, 'associativity' => self::OPERATOR_LEFT],
-            '^' => ['precedence' => 17, 'associativity' => self::OPERATOR_LEFT],
-            '&' => ['precedence' => 18, 'associativity' => self::OPERATOR_LEFT],
-            '==' => ['precedence' => 20, 'associativity' => self::OPERATOR_LEFT],
-            '===' => ['precedence' => 20, 'associativity' => self::OPERATOR_LEFT],
-            '!=' => ['precedence' => 20, 'associativity' => self::OPERATOR_LEFT],
-            '!==' => ['precedence' => 20, 'associativity' => self::OPERATOR_LEFT],
-            '<' => ['precedence' => 20, 'associativity' => self::OPERATOR_LEFT],
-            '>' => ['precedence' => 20, 'associativity' => self::OPERATOR_LEFT],
-            '>=' => ['precedence' => 20, 'associativity' => self::OPERATOR_LEFT],
-            '<=' => ['precedence' => 20, 'associativity' => self::OPERATOR_LEFT],
-            'not in' => ['precedence' => 20, 'associativity' => self::OPERATOR_LEFT],
-            'in' => ['precedence' => 20, 'associativity' => self::OPERATOR_LEFT],
-            'matches' => ['precedence' => 20, 'associativity' => self::OPERATOR_LEFT],
-            '..' => ['precedence' => 25, 'associativity' => self::OPERATOR_LEFT],
-            '+' => ['precedence' => 30, 'associativity' => self::OPERATOR_LEFT],
-            '-' => ['precedence' => 30, 'associativity' => self::OPERATOR_LEFT],
-            '~' => ['precedence' => 40, 'associativity' => self::OPERATOR_LEFT],
-            '*' => ['precedence' => 60, 'associativity' => self::OPERATOR_LEFT],
-            '/' => ['precedence' => 60, 'associativity' => self::OPERATOR_LEFT],
-            '%' => ['precedence' => 60, 'associativity' => self::OPERATOR_LEFT],
-            '**' => ['precedence' => 200, 'associativity' => self::OPERATOR_RIGHT],
-        ];
+        $this->unaryOperators = array(
+            'not' => array('precedence' => 50),
+            '!' => array('precedence' => 50),
+            '-' => array('precedence' => 500),
+            '+' => array('precedence' => 500),
+        );
+        $this->binaryOperators = array(
+            'or' => array('precedence' => 10, 'associativity' => self::OPERATOR_LEFT),
+            '||' => array('precedence' => 10, 'associativity' => self::OPERATOR_LEFT),
+            'and' => array('precedence' => 15, 'associativity' => self::OPERATOR_LEFT),
+            '&&' => array('precedence' => 15, 'associativity' => self::OPERATOR_LEFT),
+            '|' => array('precedence' => 16, 'associativity' => self::OPERATOR_LEFT),
+            '^' => array('precedence' => 17, 'associativity' => self::OPERATOR_LEFT),
+            '&' => array('precedence' => 18, 'associativity' => self::OPERATOR_LEFT),
+            '==' => array('precedence' => 20, 'associativity' => self::OPERATOR_LEFT),
+            '===' => array('precedence' => 20, 'associativity' => self::OPERATOR_LEFT),
+            '!=' => array('precedence' => 20, 'associativity' => self::OPERATOR_LEFT),
+            '!==' => array('precedence' => 20, 'associativity' => self::OPERATOR_LEFT),
+            '<' => array('precedence' => 20, 'associativity' => self::OPERATOR_LEFT),
+            '>' => array('precedence' => 20, 'associativity' => self::OPERATOR_LEFT),
+            '>=' => array('precedence' => 20, 'associativity' => self::OPERATOR_LEFT),
+            '<=' => array('precedence' => 20, 'associativity' => self::OPERATOR_LEFT),
+            'not in' => array('precedence' => 20, 'associativity' => self::OPERATOR_LEFT),
+            'in' => array('precedence' => 20, 'associativity' => self::OPERATOR_LEFT),
+            'matches' => array('precedence' => 20, 'associativity' => self::OPERATOR_LEFT),
+            '..' => array('precedence' => 25, 'associativity' => self::OPERATOR_LEFT),
+            '+' => array('precedence' => 30, 'associativity' => self::OPERATOR_LEFT),
+            '-' => array('precedence' => 30, 'associativity' => self::OPERATOR_LEFT),
+            '~' => array('precedence' => 40, 'associativity' => self::OPERATOR_LEFT),
+            '*' => array('precedence' => 60, 'associativity' => self::OPERATOR_LEFT),
+            '/' => array('precedence' => 60, 'associativity' => self::OPERATOR_LEFT),
+            '%' => array('precedence' => 60, 'associativity' => self::OPERATOR_LEFT),
+            '**' => array('precedence' => 200, 'associativity' => self::OPERATOR_RIGHT),
+        );
     }
 
     /**
@@ -92,14 +92,14 @@ class Parser
      *
      * @throws SyntaxError
      */
-    public function parse(TokenStream $stream, $names = [])
+    public function parse(TokenStream $stream, $names = array())
     {
         $this->stream = $stream;
         $this->names = $names;
 
         $node = $this->parseExpression();
         if (!$stream->isEOF()) {
-            throw new SyntaxError(sprintf('Unexpected token "%s" of value "%s".', $stream->current->type, $stream->current->value), $stream->current->cursor, $stream->getExpression());
+            throw new SyntaxError(sprintf('Unexpected token "%s" of value "%s"', $stream->current->type, $stream->current->value), $stream->current->cursor, $stream->getExpression());
         }
 
         return $node;
@@ -195,18 +195,18 @@ class Parser
                     default:
                         if ('(' === $this->stream->current->value) {
                             if (false === isset($this->functions[$token->value])) {
-                                throw new SyntaxError(sprintf('The function "%s" does not exist.', $token->value), $token->cursor, $this->stream->getExpression(), $token->value, array_keys($this->functions));
+                                throw new SyntaxError(sprintf('The function "%s" does not exist', $token->value), $token->cursor, $this->stream->getExpression(), $token->value, array_keys($this->functions));
                             }
 
                             $node = new Node\FunctionNode($token->value, $this->parseArguments());
                         } else {
-                            if (!\in_array($token->value, $this->names, true)) {
-                                throw new SyntaxError(sprintf('Variable "%s" is not valid.', $token->value), $token->cursor, $this->stream->getExpression(), $token->value, $this->names);
+                            if (!in_array($token->value, $this->names, true)) {
+                                throw new SyntaxError(sprintf('Variable "%s" is not valid', $token->value), $token->cursor, $this->stream->getExpression(), $token->value, $this->names);
                             }
 
                             // is the name used in the compiled code different
                             // from the name used in the expression?
-                            if (\is_int($name = array_search($token->value, $this->names))) {
+                            if (is_int($name = array_search($token->value, $this->names))) {
                                 $name = $token->value;
                             }
 
@@ -227,7 +227,7 @@ class Parser
                 } elseif ($token->test(Token::PUNCTUATION_TYPE, '{')) {
                     $node = $this->parseHashExpression();
                 } else {
-                    throw new SyntaxError(sprintf('Unexpected token "%s" of value "%s".', $token->type, $token->value), $token->cursor, $this->stream->getExpression());
+                    throw new SyntaxError(sprintf('Unexpected token "%s" of value "%s"', $token->type, $token->value), $token->cursor, $this->stream->getExpression());
                 }
         }
 
@@ -289,7 +289,7 @@ class Parser
             } else {
                 $current = $this->stream->current;
 
-                throw new SyntaxError(sprintf('A hash key must be a quoted string, a number, a name, or an expression enclosed in parentheses (unexpected token "%s" of value "%s".', $current->type, $current->value), $current->cursor, $this->stream->getExpression());
+                throw new SyntaxError(sprintf('A hash key must be a quoted string, a number, a name, or an expression enclosed in parentheses (unexpected token "%s" of value "%s"', $current->type, $current->value), $current->cursor, $this->stream->getExpression());
             }
 
             $this->stream->expect(Token::PUNCTUATION_TYPE, ':', 'A hash key must be followed by a colon (:)');
@@ -327,7 +327,7 @@ class Parser
                     // As a result, if $token is NOT an operator OR $token->value is NOT a valid property or method name, an exception shall be thrown.
                     (Token::OPERATOR_TYPE !== $token->type || !preg_match('/[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*/A', $token->value))
                 ) {
-                    throw new SyntaxError('Expected name.', $token->cursor, $this->stream->getExpression());
+                    throw new SyntaxError('Expected name', $token->cursor, $this->stream->getExpression());
                 }
 
                 $arg = new Node\ConstantNode($token->value, true);
@@ -364,7 +364,7 @@ class Parser
      */
     public function parseArguments()
     {
-        $args = [];
+        $args = array();
         $this->stream->expect(Token::PUNCTUATION_TYPE, '(', 'A list of arguments must begin with an opening parenthesis');
         while (!$this->stream->current->test(Token::PUNCTUATION_TYPE, ')')) {
             if (!empty($args)) {
diff --git a/advancedcontentfilter/vendor/symfony/expression-language/ParserCache/ArrayParserCache.php b/advancedcontentfilter/vendor/symfony/expression-language/ParserCache/ArrayParserCache.php
index f009df73..12496250 100644
--- a/advancedcontentfilter/vendor/symfony/expression-language/ParserCache/ArrayParserCache.php
+++ b/advancedcontentfilter/vendor/symfony/expression-language/ParserCache/ArrayParserCache.php
@@ -11,7 +11,7 @@
 
 namespace Symfony\Component\ExpressionLanguage\ParserCache;
 
-@trigger_error('The '.__NAMESPACE__.'\ArrayParserCache class is deprecated since Symfony 3.2 and will be removed in 4.0. Use the Symfony\Component\Cache\Adapter\ArrayAdapter class instead.', \E_USER_DEPRECATED);
+@trigger_error('The '.__NAMESPACE__.'\ArrayParserCache class is deprecated since Symfony 3.2 and will be removed in 4.0. Use the Symfony\Component\Cache\Adapter\ArrayAdapter class instead.', E_USER_DEPRECATED);
 
 use Symfony\Component\ExpressionLanguage\ParsedExpression;
 
@@ -22,7 +22,7 @@ use Symfony\Component\ExpressionLanguage\ParsedExpression;
  */
 class ArrayParserCache implements ParserCacheInterface
 {
-    private $cache = [];
+    private $cache = array();
 
     /**
      * {@inheritdoc}
diff --git a/advancedcontentfilter/vendor/symfony/expression-language/ParserCache/ParserCacheAdapter.php b/advancedcontentfilter/vendor/symfony/expression-language/ParserCache/ParserCacheAdapter.php
index b9b448dd..a3e227d0 100644
--- a/advancedcontentfilter/vendor/symfony/expression-language/ParserCache/ParserCacheAdapter.php
+++ b/advancedcontentfilter/vendor/symfony/expression-language/ParserCache/ParserCacheAdapter.php
@@ -30,7 +30,7 @@ class ParserCacheAdapter implements CacheItemPoolInterface
         $this->pool = $pool;
 
         $this->createCacheItem = \Closure::bind(
-            static function ($key, $value, $isHit) {
+            function ($key, $value, $isHit) {
                 $item = new CacheItem();
                 $item->key = $key;
                 $item->value = $value;
@@ -65,9 +65,9 @@ class ParserCacheAdapter implements CacheItemPoolInterface
     /**
      * {@inheritdoc}
      */
-    public function getItems(array $keys = [])
+    public function getItems(array $keys = array())
     {
-        throw new \BadMethodCallException('Not implemented.');
+        throw new \BadMethodCallException('Not implemented');
     }
 
     /**
@@ -75,7 +75,7 @@ class ParserCacheAdapter implements CacheItemPoolInterface
      */
     public function hasItem($key)
     {
-        throw new \BadMethodCallException('Not implemented.');
+        throw new \BadMethodCallException('Not implemented');
     }
 
     /**
@@ -83,7 +83,7 @@ class ParserCacheAdapter implements CacheItemPoolInterface
      */
     public function clear()
     {
-        throw new \BadMethodCallException('Not implemented.');
+        throw new \BadMethodCallException('Not implemented');
     }
 
     /**
@@ -91,7 +91,7 @@ class ParserCacheAdapter implements CacheItemPoolInterface
      */
     public function deleteItem($key)
     {
-        throw new \BadMethodCallException('Not implemented.');
+        throw new \BadMethodCallException('Not implemented');
     }
 
     /**
@@ -99,7 +99,7 @@ class ParserCacheAdapter implements CacheItemPoolInterface
      */
     public function deleteItems(array $keys)
     {
-        throw new \BadMethodCallException('Not implemented.');
+        throw new \BadMethodCallException('Not implemented');
     }
 
     /**
@@ -107,7 +107,7 @@ class ParserCacheAdapter implements CacheItemPoolInterface
      */
     public function saveDeferred(CacheItemInterface $item)
     {
-        throw new \BadMethodCallException('Not implemented.');
+        throw new \BadMethodCallException('Not implemented');
     }
 
     /**
@@ -115,6 +115,6 @@ class ParserCacheAdapter implements CacheItemPoolInterface
      */
     public function commit()
     {
-        throw new \BadMethodCallException('Not implemented.');
+        throw new \BadMethodCallException('Not implemented');
     }
 }
diff --git a/advancedcontentfilter/vendor/symfony/expression-language/ParserCache/ParserCacheInterface.php b/advancedcontentfilter/vendor/symfony/expression-language/ParserCache/ParserCacheInterface.php
index 98a80edd..ed66b21b 100644
--- a/advancedcontentfilter/vendor/symfony/expression-language/ParserCache/ParserCacheInterface.php
+++ b/advancedcontentfilter/vendor/symfony/expression-language/ParserCache/ParserCacheInterface.php
@@ -11,7 +11,7 @@
 
 namespace Symfony\Component\ExpressionLanguage\ParserCache;
 
-@trigger_error('The '.__NAMESPACE__.'\ParserCacheInterface interface is deprecated since Symfony 3.2 and will be removed in 4.0. Use Psr\Cache\CacheItemPoolInterface instead.', \E_USER_DEPRECATED);
+@trigger_error('The '.__NAMESPACE__.'\ParserCacheInterface interface is deprecated since Symfony 3.2 and will be removed in 4.0. Use Psr\Cache\CacheItemPoolInterface instead.', E_USER_DEPRECATED);
 
 use Symfony\Component\ExpressionLanguage\ParsedExpression;
 
diff --git a/advancedcontentfilter/vendor/symfony/expression-language/Resources/bin/generate_operator_regex.php b/advancedcontentfilter/vendor/symfony/expression-language/Resources/bin/generate_operator_regex.php
index c86e9625..74a10089 100644
--- a/advancedcontentfilter/vendor/symfony/expression-language/Resources/bin/generate_operator_regex.php
+++ b/advancedcontentfilter/vendor/symfony/expression-language/Resources/bin/generate_operator_regex.php
@@ -9,19 +9,15 @@
  * file that was distributed with this source code.
  */
 
-$operators = ['not', '!', 'or', '||', '&&', 'and', '|', '^', '&', '==', '===', '!=', '!==', '<', '>', '>=', '<=', 'not in', 'in', '..', '+', '-', '~', '*', '/', '%', 'matches', '**'];
+$operators = array('not', '!', 'or', '||', '&&', 'and', '|', '^', '&', '==', '===', '!=', '!==', '<', '>', '>=', '<=', 'not in', 'in', '..', '+', '-', '~', '*', '/', '%', 'matches', '**');
 $operators = array_combine($operators, array_map('strlen', $operators));
 arsort($operators);
 
-$regex = [];
+$regex = array();
 foreach ($operators as $operator => $length) {
-    // Collisions of character operators:
-    // - an operator that begins with a character must have a space or a parenthesis before or starting at the beginning of a string
-    // - an operator that ends with a character must be followed by a whitespace or a parenthesis
-    $regex[] =
-        (ctype_alpha($operator[0]) ? '(?<=^|[\s(])' : '')
-        .preg_quote($operator, '/')
-        .(ctype_alpha($operator[$length - 1]) ? '(?=[\s(])' : '');
+    // an operator that ends with a character must be followed by
+    // a whitespace or a parenthesis
+    $regex[] = preg_quote($operator, '/').(ctype_alpha($operator[$length - 1]) ? '(?=[\s(])' : '');
 }
 
 echo '/'.implode('|', $regex).'/A';
diff --git a/advancedcontentfilter/vendor/symfony/expression-language/SyntaxError.php b/advancedcontentfilter/vendor/symfony/expression-language/SyntaxError.php
index a942b8cb..12348e68 100644
--- a/advancedcontentfilter/vendor/symfony/expression-language/SyntaxError.php
+++ b/advancedcontentfilter/vendor/symfony/expression-language/SyntaxError.php
@@ -15,14 +15,14 @@ class SyntaxError extends \LogicException
 {
     public function __construct($message, $cursor = 0, $expression = '', $subject = null, array $proposals = null)
     {
-        $message = sprintf('%s around position %d', rtrim($message, '.'), $cursor);
+        $message = sprintf('%s around position %d', $message, $cursor);
         if ($expression) {
             $message = sprintf('%s for expression `%s`', $message, $expression);
         }
         $message .= '.';
 
         if (null !== $subject && null !== $proposals) {
-            $minScore = \INF;
+            $minScore = INF;
             foreach ($proposals as $proposal) {
                 $distance = levenshtein($subject, $proposal);
                 if ($distance < $minScore) {
diff --git a/advancedcontentfilter/vendor/symfony/expression-language/Tests/ExpressionFunctionTest.php b/advancedcontentfilter/vendor/symfony/expression-language/Tests/ExpressionFunctionTest.php
index d7e23cb4..f2710fb1 100644
--- a/advancedcontentfilter/vendor/symfony/expression-language/Tests/ExpressionFunctionTest.php
+++ b/advancedcontentfilter/vendor/symfony/expression-language/Tests/ExpressionFunctionTest.php
@@ -21,17 +21,21 @@ use Symfony\Component\ExpressionLanguage\ExpressionFunction;
  */
 class ExpressionFunctionTest extends TestCase
 {
+    /**
+     * @expectedException \InvalidArgumentException
+     * @expectedExceptionMessage PHP function "fn_does_not_exist" does not exist.
+     */
     public function testFunctionDoesNotExist()
     {
-        $this->expectException('InvalidArgumentException');
-        $this->expectExceptionMessage('PHP function "fn_does_not_exist" does not exist.');
         ExpressionFunction::fromPhp('fn_does_not_exist');
     }
 
+    /**
+     * @expectedException \InvalidArgumentException
+     * @expectedExceptionMessage An expression function name must be defined when PHP function "Symfony\Component\ExpressionLanguage\Tests\fn_namespaced" is namespaced.
+     */
     public function testFunctionNamespaced()
     {
-        $this->expectException('InvalidArgumentException');
-        $this->expectExceptionMessage('An expression function name must be defined when PHP function "Symfony\Component\ExpressionLanguage\Tests\fn_namespaced" is namespaced.');
         ExpressionFunction::fromPhp('Symfony\Component\ExpressionLanguage\Tests\fn_namespaced');
     }
 }
diff --git a/advancedcontentfilter/vendor/symfony/expression-language/Tests/ExpressionLanguageTest.php b/advancedcontentfilter/vendor/symfony/expression-language/Tests/ExpressionLanguageTest.php
index 97e915ac..70328c8e 100644
--- a/advancedcontentfilter/vendor/symfony/expression-language/Tests/ExpressionLanguageTest.php
+++ b/advancedcontentfilter/vendor/symfony/expression-language/Tests/ExpressionLanguageTest.php
@@ -11,8 +11,8 @@
 
 namespace Symfony\Component\ExpressionLanguage\Tests;
 
-use PHPUnit\Framework\TestCase;
 use Symfony\Component\ExpressionLanguage\ExpressionFunction;
+use PHPUnit\Framework\TestCase;
 use Symfony\Component\ExpressionLanguage\ExpressionLanguage;
 use Symfony\Component\ExpressionLanguage\ParsedExpression;
 use Symfony\Component\ExpressionLanguage\Tests\Fixtures\TestProvider;
@@ -36,18 +36,18 @@ class ExpressionLanguageTest extends TestCase
         $cacheItemMock
             ->expects($this->exactly(2))
             ->method('get')
-            ->willReturnCallback(function () use (&$savedParsedExpression) {
+            ->will($this->returnCallback(function () use (&$savedParsedExpression) {
                 return $savedParsedExpression;
-            })
+            }))
         ;
 
         $cacheItemMock
             ->expects($this->exactly(1))
             ->method('set')
             ->with($this->isInstanceOf(ParsedExpression::class))
-            ->willReturnCallback(function ($parsedExpression) use (&$savedParsedExpression) {
+            ->will($this->returnCallback(function ($parsedExpression) use (&$savedParsedExpression) {
                 $savedParsedExpression = $parsedExpression;
-            })
+            }))
         ;
 
         $cacheMock
@@ -56,10 +56,10 @@ class ExpressionLanguageTest extends TestCase
             ->with($cacheItemMock)
         ;
 
-        $parsedExpression = $expressionLanguage->parse('1 + 1', []);
+        $parsedExpression = $expressionLanguage->parse('1 + 1', array());
         $this->assertSame($savedParsedExpression, $parsedExpression);
 
-        $parsedExpression = $expressionLanguage->parse('1 + 1', []);
+        $parsedExpression = $expressionLanguage->parse('1 + 1', array());
         $this->assertSame($savedParsedExpression, $parsedExpression);
     }
 
@@ -70,6 +70,7 @@ class ExpressionLanguageTest extends TestCase
     {
         $cacheMock = $this->getMockBuilder('Symfony\Component\ExpressionLanguage\ParserCache\ParserCacheInterface')->getMock();
 
+        $cacheItemMock = $this->getMockBuilder('Psr\Cache\CacheItemInterface')->getMock();
         $savedParsedExpression = null;
         $expressionLanguage = new ExpressionLanguage($cacheMock);
 
@@ -84,27 +85,29 @@ class ExpressionLanguageTest extends TestCase
             ->expects($this->exactly(1))
             ->method('save')
             ->with('1%20%2B%201%2F%2F', $this->isInstanceOf(ParsedExpression::class))
-            ->willReturnCallback(function ($key, $expression) use (&$savedParsedExpression) {
+            ->will($this->returnCallback(function ($key, $expression) use (&$savedParsedExpression) {
                 $savedParsedExpression = $expression;
-            })
+            }))
         ;
 
-        $parsedExpression = $expressionLanguage->parse('1 + 1', []);
+        $parsedExpression = $expressionLanguage->parse('1 + 1', array());
         $this->assertSame($savedParsedExpression, $parsedExpression);
     }
 
+    /**
+     * @expectedException \InvalidArgumentException
+     * @expectedExceptionMessage Cache argument has to implement Psr\Cache\CacheItemPoolInterface.
+     */
     public function testWrongCacheImplementation()
     {
-        $this->expectException('InvalidArgumentException');
-        $this->expectExceptionMessage('Cache argument has to implement "Psr\Cache\CacheItemPoolInterface".');
         $cacheMock = $this->getMockBuilder('Psr\Cache\CacheItemSpoolInterface')->getMock();
-        new ExpressionLanguage($cacheMock);
+        $expressionLanguage = new ExpressionLanguage($cacheMock);
     }
 
     public function testConstantFunction()
     {
         $expressionLanguage = new ExpressionLanguage();
-        $this->assertEquals(\PHP_VERSION, $expressionLanguage->evaluate('constant("PHP_VERSION")'));
+        $this->assertEquals(PHP_VERSION, $expressionLanguage->evaluate('constant("PHP_VERSION")'));
 
         $expressionLanguage = new ExpressionLanguage();
         $this->assertEquals('\constant("PHP_VERSION")', $expressionLanguage->compile('constant("PHP_VERSION")'));
@@ -112,7 +115,7 @@ class ExpressionLanguageTest extends TestCase
 
     public function testProviders()
     {
-        $expressionLanguage = new ExpressionLanguage(null, [new TestProvider()]);
+        $expressionLanguage = new ExpressionLanguage(null, array(new TestProvider()));
         $this->assertEquals('foo', $expressionLanguage->evaluate('identity("foo")'));
         $this->assertEquals('"foo"', $expressionLanguage->compile('identity("foo")'));
         $this->assertEquals('FOO', $expressionLanguage->evaluate('strtoupper("foo")'));
@@ -143,43 +146,45 @@ class ExpressionLanguageTest extends TestCase
         $this->assertSame($expected, $result);
     }
 
+    /**
+     * @expectedException \Symfony\Component\ExpressionLanguage\SyntaxError
+     * @expectedExceptionMessage Unexpected end of expression around position 6 for expression `node.`.
+     */
     public function testParseThrowsInsteadOfNotice()
     {
-        $this->expectException('Symfony\Component\ExpressionLanguage\SyntaxError');
-        $this->expectExceptionMessage('Unexpected end of expression around position 6 for expression `node.`.');
         $expressionLanguage = new ExpressionLanguage();
-        $expressionLanguage->parse('node.', ['node']);
+        $expressionLanguage->parse('node.', array('node'));
     }
 
     public function shortCircuitProviderEvaluate()
     {
-        $object = $this->getMockBuilder('stdClass')->setMethods(['foo'])->getMock();
+        $object = $this->getMockBuilder('stdClass')->setMethods(array('foo'))->getMock();
         $object->expects($this->never())->method('foo');
 
-        return [
-            ['false and object.foo()', ['object' => $object], false],
-            ['false && object.foo()', ['object' => $object], false],
-            ['true || object.foo()', ['object' => $object], true],
-            ['true or object.foo()', ['object' => $object], true],
-        ];
+        return array(
+            array('false and object.foo()', array('object' => $object), false),
+            array('false && object.foo()', array('object' => $object), false),
+            array('true || object.foo()', array('object' => $object), true),
+            array('true or object.foo()', array('object' => $object), true),
+        );
     }
 
     public function shortCircuitProviderCompile()
     {
-        return [
-            ['false and foo', ['foo' => 'foo'], false],
-            ['false && foo', ['foo' => 'foo'], false],
-            ['true || foo', ['foo' => 'foo'], true],
-            ['true or foo', ['foo' => 'foo'], true],
-        ];
+        return array(
+            array('false and foo', array('foo' => 'foo'), false),
+            array('false && foo', array('foo' => 'foo'), false),
+            array('true || foo', array('foo' => 'foo'), true),
+            array('true or foo', array('foo' => 'foo'), true),
+        );
     }
 
     public function testCachingForOverriddenVariableNames()
     {
         $expressionLanguage = new ExpressionLanguage();
         $expression = 'a + b';
-        $expressionLanguage->evaluate($expression, ['a' => 1, 'b' => 1]);
-        $result = $expressionLanguage->compile($expression, ['a', 'B' => 'b']);
+        $expressionLanguage->evaluate($expression, array('a' => 1, 'b' => 1));
+        $result = $expressionLanguage->compile($expression, array('a', 'B' => 'b'));
         $this->assertSame('($a + $B)', $result);
     }
 
@@ -187,7 +192,7 @@ class ExpressionLanguageTest extends TestCase
     {
         $expressionLanguage = new ExpressionLanguage();
         $expression = '123 === a';
-        $result = $expressionLanguage->compile($expression, ['a']);
+        $result = $expressionLanguage->compile($expression, array('a'));
         $this->assertSame('(123 === $a)', $result);
     }
 
@@ -196,7 +201,7 @@ class ExpressionLanguageTest extends TestCase
         $cacheMock = $this->getMockBuilder('Psr\Cache\CacheItemPoolInterface')->getMock();
         $cacheItemMock = $this->getMockBuilder('Psr\Cache\CacheItemInterface')->getMock();
         $expressionLanguage = new ExpressionLanguage($cacheMock);
-        $savedParsedExpression = null;
+        $savedParsedExpressions = array();
 
         $cacheMock
             ->expects($this->exactly(2))
@@ -208,18 +213,18 @@ class ExpressionLanguageTest extends TestCase
         $cacheItemMock
             ->expects($this->exactly(2))
             ->method('get')
-            ->willReturnCallback(function () use (&$savedParsedExpression) {
+            ->will($this->returnCallback(function () use (&$savedParsedExpression) {
                 return $savedParsedExpression;
-            })
+            }))
         ;
 
         $cacheItemMock
             ->expects($this->exactly(1))
             ->method('set')
             ->with($this->isInstanceOf(ParsedExpression::class))
-            ->willReturnCallback(function ($parsedExpression) use (&$savedParsedExpression) {
+            ->will($this->returnCallback(function ($parsedExpression) use (&$savedParsedExpression) {
                 $savedParsedExpression = $parsedExpression;
-            })
+            }))
         ;
 
         $cacheMock
@@ -229,57 +234,48 @@ class ExpressionLanguageTest extends TestCase
         ;
 
         $expression = 'a + b';
-        $expressionLanguage->compile($expression, ['a', 'B' => 'b']);
-        $expressionLanguage->compile($expression, ['B' => 'b', 'a']);
-    }
-
-    public function testOperatorCollisions()
-    {
-        $expressionLanguage = new ExpressionLanguage();
-        $expression = 'foo.not in [bar]';
-        $compiled = $expressionLanguage->compile($expression, ['foo', 'bar']);
-        $this->assertSame('in_array($foo->not, [0 => $bar])', $compiled);
-
-        $result = $expressionLanguage->evaluate($expression, ['foo' => (object) ['not' => 'test'], 'bar' => 'test']);
-        $this->assertTrue($result);
+        $expressionLanguage->compile($expression, array('a', 'B' => 'b'));
+        $expressionLanguage->compile($expression, array('B' => 'b', 'a'));
     }
 
     /**
      * @dataProvider getRegisterCallbacks
+     * @expectedException \LogicException
      */
     public function testRegisterAfterParse($registerCallback)
     {
-        $this->expectException('LogicException');
         $el = new ExpressionLanguage();
-        $el->parse('1 + 1', []);
+        $el->parse('1 + 1', array());
         $registerCallback($el);
     }
 
     /**
      * @dataProvider getRegisterCallbacks
+     * @expectedException \LogicException
      */
     public function testRegisterAfterEval($registerCallback)
     {
-        $this->expectException('LogicException');
         $el = new ExpressionLanguage();
         $el->evaluate('1 + 1');
         $registerCallback($el);
     }
 
+    /**
+     * @expectedException \RuntimeException
+     * @expectedExceptionMessageRegExp  /Unable to call method "\w+" of object "\w+"./
+     */
     public function testCallBadCallable()
     {
-        $this->expectException('RuntimeException');
-        $this->expectExceptionMessageMatches('/Unable to call method "\w+" of object "\w+"./');
         $el = new ExpressionLanguage();
-        $el->evaluate('foo.myfunction()', ['foo' => new \stdClass()]);
+        $el->evaluate('foo.myfunction()', array('foo' => new \stdClass()));
     }
 
     /**
      * @dataProvider getRegisterCallbacks
+     * @expectedException \LogicException
      */
     public function testRegisterAfterCompile($registerCallback)
     {
-        $this->expectException('LogicException');
         $el = new ExpressionLanguage();
         $el->compile('1 + 1');
         $registerCallback($el);
@@ -287,22 +283,22 @@ class ExpressionLanguageTest extends TestCase
 
     public function getRegisterCallbacks()
     {
-        return [
-            [
+        return array(
+            array(
                 function (ExpressionLanguage $el) {
                     $el->register('fn', function () {}, function () {});
                 },
-            ],
-            [
+            ),
+            array(
                 function (ExpressionLanguage $el) {
                     $el->addFunction(new ExpressionFunction('fn', function () {}, function () {}));
                 },
-            ],
-            [
+            ),
+            array(
                 function (ExpressionLanguage $el) {
                     $el->registerProvider(new TestProvider());
                 },
-            ],
-        ];
+            ),
+        );
     }
 }
diff --git a/advancedcontentfilter/vendor/symfony/expression-language/Tests/Fixtures/TestProvider.php b/advancedcontentfilter/vendor/symfony/expression-language/Tests/Fixtures/TestProvider.php
index 8405d4f9..20c5182b 100644
--- a/advancedcontentfilter/vendor/symfony/expression-language/Tests/Fixtures/TestProvider.php
+++ b/advancedcontentfilter/vendor/symfony/expression-language/Tests/Fixtures/TestProvider.php
@@ -19,7 +19,7 @@ class TestProvider implements ExpressionFunctionProviderInterface
 {
     public function getFunctions()
     {
-        return [
+        return array(
             new ExpressionFunction('identity', function ($input) {
                 return $input;
             }, function (array $values, $input) {
@@ -31,7 +31,7 @@ class TestProvider implements ExpressionFunctionProviderInterface
             ExpressionFunction::fromPhp('\strtolower'),
 
             ExpressionFunction::fromPhp('Symfony\Component\ExpressionLanguage\Tests\Fixtures\fn_namespaced', 'fn_namespaced'),
-        ];
+        );
     }
 }
 
diff --git a/advancedcontentfilter/vendor/symfony/expression-language/Tests/LexerTest.php b/advancedcontentfilter/vendor/symfony/expression-language/Tests/LexerTest.php
index 6c3d1a7d..87c16f70 100644
--- a/advancedcontentfilter/vendor/symfony/expression-language/Tests/LexerTest.php
+++ b/advancedcontentfilter/vendor/symfony/expression-language/Tests/LexerTest.php
@@ -33,55 +33,59 @@ class LexerTest extends TestCase
      */
     public function testTokenize($tokens, $expression)
     {
-        $tokens[] = new Token('end of expression', null, \strlen($expression) + 1);
+        $tokens[] = new Token('end of expression', null, strlen($expression) + 1);
         $this->assertEquals(new TokenStream($tokens, $expression), $this->lexer->tokenize($expression));
     }
 
+    /**
+     * @expectedException \Symfony\Component\ExpressionLanguage\SyntaxError
+     * @expectedExceptionMessage Unexpected character "'" around position 33 for expression `service(faulty.expression.example').dummyMethod()`.
+     */
     public function testTokenizeThrowsErrorWithMessage()
     {
-        $this->expectException('Symfony\Component\ExpressionLanguage\SyntaxError');
-        $this->expectExceptionMessage('Unexpected character "\'" around position 33 for expression `service(faulty.expression.example\').dummyMethod()`.');
         $expression = "service(faulty.expression.example').dummyMethod()";
         $this->lexer->tokenize($expression);
     }
 
+    /**
+     * @expectedException \Symfony\Component\ExpressionLanguage\SyntaxError
+     * @expectedExceptionMessage Unclosed "(" around position 7 for expression `service(unclosed.expression.dummyMethod()`.
+     */
     public function testTokenizeThrowsErrorOnUnclosedBrace()
     {
-        $this->expectException('Symfony\Component\ExpressionLanguage\SyntaxError');
-        $this->expectExceptionMessage('Unclosed "(" around position 7 for expression `service(unclosed.expression.dummyMethod()`.');
         $expression = 'service(unclosed.expression.dummyMethod()';
         $this->lexer->tokenize($expression);
     }
 
     public function getTokenizeData()
     {
-        return [
-            [
-                [new Token('name', 'a', 3)],
+        return array(
+            array(
+                array(new Token('name', 'a', 3)),
                 '  a  ',
-            ],
-            [
-                [new Token('name', 'a', 1)],
+            ),
+            array(
+                array(new Token('name', 'a', 1)),
                 'a',
-            ],
-            [
-                [new Token('string', 'foo', 1)],
+            ),
+            array(
+                array(new Token('string', 'foo', 1)),
                 '"foo"',
-            ],
-            [
-                [new Token('number', '3', 1)],
+            ),
+            array(
+                array(new Token('number', '3', 1)),
                 '3',
-            ],
-            [
-                [new Token('operator', '+', 1)],
+            ),
+            array(
+                array(new Token('operator', '+', 1)),
                 '+',
-            ],
-            [
-                [new Token('punctuation', '.', 1)],
+            ),
+            array(
+                array(new Token('punctuation', '.', 1)),
                 '.',
-            ],
-            [
-                [
+            ),
+            array(
+                array(
                     new Token('punctuation', '(', 1),
                     new Token('number', '3', 2),
                     new Token('operator', '+', 4),
@@ -97,33 +101,21 @@ class LexerTest extends TestCase
                     new Token('punctuation', '[', 25),
                     new Token('number', '4', 26),
                     new Token('punctuation', ']', 27),
-                ],
+                ),
                 '(3 + 5) ~ foo("bar").baz[4]',
-            ],
-            [
-                [new Token('operator', '..', 1)],
+            ),
+            array(
+                array(new Token('operator', '..', 1)),
                 '..',
-            ],
-            [
-                [new Token('string', '#foo', 1)],
+            ),
+            array(
+                array(new Token('string', '#foo', 1)),
                 "'#foo'",
-            ],
-            [
-                [new Token('string', '#foo', 1)],
+            ),
+            array(
+                array(new Token('string', '#foo', 1)),
                 '"#foo"',
-            ],
-            [
-                [
-                    new Token('name', 'foo', 1),
-                    new Token('punctuation', '.', 4),
-                    new Token('name', 'not', 5),
-                    new Token('operator', 'in', 9),
-                    new Token('punctuation', '[', 12),
-                    new Token('name', 'bar', 13),
-                    new Token('punctuation', ']', 16),
-                ],
-                'foo.not in [bar]',
-            ],
-        ];
+            ),
+        );
     }
 }
diff --git a/advancedcontentfilter/vendor/symfony/expression-language/Tests/Node/AbstractNodeTest.php b/advancedcontentfilter/vendor/symfony/expression-language/Tests/Node/AbstractNodeTest.php
index 29750374..a6f80c2f 100644
--- a/advancedcontentfilter/vendor/symfony/expression-language/Tests/Node/AbstractNodeTest.php
+++ b/advancedcontentfilter/vendor/symfony/expression-language/Tests/Node/AbstractNodeTest.php
@@ -19,7 +19,7 @@ abstract class AbstractNodeTest extends TestCase
     /**
      * @dataProvider getEvaluateData
      */
-    public function testEvaluate($expected, $node, $variables = [], $functions = [])
+    public function testEvaluate($expected, $node, $variables = array(), $functions = array())
     {
         $this->assertSame($expected, $node->evaluate($functions, $variables));
     }
@@ -29,7 +29,7 @@ abstract class AbstractNodeTest extends TestCase
     /**
      * @dataProvider getCompileData
      */
-    public function testCompile($expected, $node, $functions = [])
+    public function testCompile($expected, $node, $functions = array())
     {
         $compiler = new Compiler($functions);
         $node->compile($compiler);
diff --git a/advancedcontentfilter/vendor/symfony/expression-language/Tests/Node/ArgumentsNodeTest.php b/advancedcontentfilter/vendor/symfony/expression-language/Tests/Node/ArgumentsNodeTest.php
index 9d88b4ae..60a6d1ca 100644
--- a/advancedcontentfilter/vendor/symfony/expression-language/Tests/Node/ArgumentsNodeTest.php
+++ b/advancedcontentfilter/vendor/symfony/expression-language/Tests/Node/ArgumentsNodeTest.php
@@ -17,16 +17,16 @@ class ArgumentsNodeTest extends ArrayNodeTest
 {
     public function getCompileData()
     {
-        return [
-            ['"a", "b"', $this->getArrayNode()],
-        ];
+        return array(
+            array('"a", "b"', $this->getArrayNode()),
+        );
     }
 
     public function getDumpData()
     {
-        return [
-            ['"a", "b"', $this->getArrayNode()],
-        ];
+        return array(
+            array('"a", "b"', $this->getArrayNode()),
+        );
     }
 
     protected function createArrayNode()
diff --git a/advancedcontentfilter/vendor/symfony/expression-language/Tests/Node/ArrayNodeTest.php b/advancedcontentfilter/vendor/symfony/expression-language/Tests/Node/ArrayNodeTest.php
index 3d03d837..11a35d46 100644
--- a/advancedcontentfilter/vendor/symfony/expression-language/Tests/Node/ArrayNodeTest.php
+++ b/advancedcontentfilter/vendor/symfony/expression-language/Tests/Node/ArrayNodeTest.php
@@ -30,31 +30,31 @@ class ArrayNodeTest extends AbstractNodeTest
 
     public function getEvaluateData()
     {
-        return [
-            [['b' => 'a', 'b'], $this->getArrayNode()],
-        ];
+        return array(
+            array(array('b' => 'a', 'b'), $this->getArrayNode()),
+        );
     }
 
     public function getCompileData()
     {
-        return [
-            ['["b" => "a", 0 => "b"]', $this->getArrayNode()],
-        ];
+        return array(
+            array('array("b" => "a", 0 => "b")', $this->getArrayNode()),
+        );
     }
 
     public function getDumpData()
     {
-        yield ['{"b": "a", 0: "b"}', $this->getArrayNode()];
+        yield array('{"b": "a", 0: "b"}', $this->getArrayNode());
 
         $array = $this->createArrayNode();
         $array->addElement(new ConstantNode('c'), new ConstantNode('a"b'));
         $array->addElement(new ConstantNode('d'), new ConstantNode('a\b'));
-        yield ['{"a\\"b": "c", "a\\\\b": "d"}', $array];
+        yield array('{"a\\"b": "c", "a\\\\b": "d"}', $array);
 
         $array = $this->createArrayNode();
         $array->addElement(new ConstantNode('c'));
         $array->addElement(new ConstantNode('d'));
-        yield ['["c", "d"]', $array];
+        yield array('["c", "d"]', $array);
     }
 
     protected function getArrayNode()
diff --git a/advancedcontentfilter/vendor/symfony/expression-language/Tests/Node/BinaryNodeTest.php b/advancedcontentfilter/vendor/symfony/expression-language/Tests/Node/BinaryNodeTest.php
index b45a1e57..258d276b 100644
--- a/advancedcontentfilter/vendor/symfony/expression-language/Tests/Node/BinaryNodeTest.php
+++ b/advancedcontentfilter/vendor/symfony/expression-language/Tests/Node/BinaryNodeTest.php
@@ -11,8 +11,8 @@
 
 namespace Symfony\Component\ExpressionLanguage\Tests\Node;
 
-use Symfony\Component\ExpressionLanguage\Node\ArrayNode;
 use Symfony\Component\ExpressionLanguage\Node\BinaryNode;
+use Symfony\Component\ExpressionLanguage\Node\ArrayNode;
 use Symfony\Component\ExpressionLanguage\Node\ConstantNode;
 
 class BinaryNodeTest extends AbstractNodeTest
@@ -23,47 +23,47 @@ class BinaryNodeTest extends AbstractNodeTest
         $array->addElement(new ConstantNode('a'));
         $array->addElement(new ConstantNode('b'));
 
-        return [
-            [true, new BinaryNode('or', new ConstantNode(true), new ConstantNode(false))],
-            [true, new BinaryNode('||', new ConstantNode(true), new ConstantNode(false))],
-            [false, new BinaryNode('and', new ConstantNode(true), new ConstantNode(false))],
-            [false, new BinaryNode('&&', new ConstantNode(true), new ConstantNode(false))],
+        return array(
+            array(true, new BinaryNode('or', new ConstantNode(true), new ConstantNode(false))),
+            array(true, new BinaryNode('||', new ConstantNode(true), new ConstantNode(false))),
+            array(false, new BinaryNode('and', new ConstantNode(true), new ConstantNode(false))),
+            array(false, new BinaryNode('&&', new ConstantNode(true), new ConstantNode(false))),
 
-            [0, new BinaryNode('&', new ConstantNode(2), new ConstantNode(4))],
-            [6, new BinaryNode('|', new ConstantNode(2), new ConstantNode(4))],
-            [6, new BinaryNode('^', new ConstantNode(2), new ConstantNode(4))],
+            array(0, new BinaryNode('&', new ConstantNode(2), new ConstantNode(4))),
+            array(6, new BinaryNode('|', new ConstantNode(2), new ConstantNode(4))),
+            array(6, new BinaryNode('^', new ConstantNode(2), new ConstantNode(4))),
 
-            [true, new BinaryNode('<', new ConstantNode(1), new ConstantNode(2))],
-            [true, new BinaryNode('<=', new ConstantNode(1), new ConstantNode(2))],
-            [true, new BinaryNode('<=', new ConstantNode(1), new ConstantNode(1))],
+            array(true, new BinaryNode('<', new ConstantNode(1), new ConstantNode(2))),
+            array(true, new BinaryNode('<=', new ConstantNode(1), new ConstantNode(2))),
+            array(true, new BinaryNode('<=', new ConstantNode(1), new ConstantNode(1))),
 
-            [false, new BinaryNode('>', new ConstantNode(1), new ConstantNode(2))],
-            [false, new BinaryNode('>=', new ConstantNode(1), new ConstantNode(2))],
-            [true, new BinaryNode('>=', new ConstantNode(1), new ConstantNode(1))],
+            array(false, new BinaryNode('>', new ConstantNode(1), new ConstantNode(2))),
+            array(false, new BinaryNode('>=', new ConstantNode(1), new ConstantNode(2))),
+            array(true, new BinaryNode('>=', new ConstantNode(1), new ConstantNode(1))),
 
-            [true, new BinaryNode('===', new ConstantNode(true), new ConstantNode(true))],
-            [false, new BinaryNode('!==', new ConstantNode(true), new ConstantNode(true))],
+            array(true, new BinaryNode('===', new ConstantNode(true), new ConstantNode(true))),
+            array(false, new BinaryNode('!==', new ConstantNode(true), new ConstantNode(true))),
 
-            [false, new BinaryNode('==', new ConstantNode(2), new ConstantNode(1))],
-            [true, new BinaryNode('!=', new ConstantNode(2), new ConstantNode(1))],
+            array(false, new BinaryNode('==', new ConstantNode(2), new ConstantNode(1))),
+            array(true, new BinaryNode('!=', new ConstantNode(2), new ConstantNode(1))),
 
-            [-1, new BinaryNode('-', new ConstantNode(1), new ConstantNode(2))],
-            [3, new BinaryNode('+', new ConstantNode(1), new ConstantNode(2))],
-            [4, new BinaryNode('*', new ConstantNode(2), new ConstantNode(2))],
-            [1, new BinaryNode('/', new ConstantNode(2), new ConstantNode(2))],
-            [1, new BinaryNode('%', new ConstantNode(5), new ConstantNode(2))],
-            [25, new BinaryNode('**', new ConstantNode(5), new ConstantNode(2))],
-            ['ab', new BinaryNode('~', new ConstantNode('a'), new ConstantNode('b'))],
+            array(-1, new BinaryNode('-', new ConstantNode(1), new ConstantNode(2))),
+            array(3, new BinaryNode('+', new ConstantNode(1), new ConstantNode(2))),
+            array(4, new BinaryNode('*', new ConstantNode(2), new ConstantNode(2))),
+            array(1, new BinaryNode('/', new ConstantNode(2), new ConstantNode(2))),
+            array(1, new BinaryNode('%', new ConstantNode(5), new ConstantNode(2))),
+            array(25, new BinaryNode('**', new ConstantNode(5), new ConstantNode(2))),
+            array('ab', new BinaryNode('~', new ConstantNode('a'), new ConstantNode('b'))),
 
-            [true, new BinaryNode('in', new ConstantNode('a'), $array)],
-            [false, new BinaryNode('in', new ConstantNode('c'), $array)],
-            [true, new BinaryNode('not in', new ConstantNode('c'), $array)],
-            [false, new BinaryNode('not in', new ConstantNode('a'), $array)],
+            array(true, new BinaryNode('in', new ConstantNode('a'), $array)),
+            array(false, new BinaryNode('in', new ConstantNode('c'), $array)),
+            array(true, new BinaryNode('not in', new ConstantNode('c'), $array)),
+            array(false, new BinaryNode('not in', new ConstantNode('a'), $array)),
 
-            [[1, 2, 3], new BinaryNode('..', new ConstantNode(1), new ConstantNode(3))],
+            array(array(1, 2, 3), new BinaryNode('..', new ConstantNode(1), new ConstantNode(3))),
 
-            [1, new BinaryNode('matches', new ConstantNode('abc'), new ConstantNode('/^[a-z]+$/'))],
-        ];
+            array(1, new BinaryNode('matches', new ConstantNode('abc'), new ConstantNode('/^[a-z]+$/'))),
+        );
     }
 
     public function getCompileData()
@@ -72,47 +72,47 @@ class BinaryNodeTest extends AbstractNodeTest
         $array->addElement(new ConstantNode('a'));
         $array->addElement(new ConstantNode('b'));
 
-        return [
-            ['(true || false)', new BinaryNode('or', new ConstantNode(true), new ConstantNode(false))],
-            ['(true || false)', new BinaryNode('||', new ConstantNode(true), new ConstantNode(false))],
-            ['(true && false)', new BinaryNode('and', new ConstantNode(true), new ConstantNode(false))],
-            ['(true && false)', new BinaryNode('&&', new ConstantNode(true), new ConstantNode(false))],
+        return array(
+            array('(true || false)', new BinaryNode('or', new ConstantNode(true), new ConstantNode(false))),
+            array('(true || false)', new BinaryNode('||', new ConstantNode(true), new ConstantNode(false))),
+            array('(true && false)', new BinaryNode('and', new ConstantNode(true), new ConstantNode(false))),
+            array('(true && false)', new BinaryNode('&&', new ConstantNode(true), new ConstantNode(false))),
 
-            ['(2 & 4)', new BinaryNode('&', new ConstantNode(2), new ConstantNode(4))],
-            ['(2 | 4)', new BinaryNode('|', new ConstantNode(2), new ConstantNode(4))],
-            ['(2 ^ 4)', new BinaryNode('^', new ConstantNode(2), new ConstantNode(4))],
+            array('(2 & 4)', new BinaryNode('&', new ConstantNode(2), new ConstantNode(4))),
+            array('(2 | 4)', new BinaryNode('|', new ConstantNode(2), new ConstantNode(4))),
+            array('(2 ^ 4)', new BinaryNode('^', new ConstantNode(2), new ConstantNode(4))),
 
-            ['(1 < 2)', new BinaryNode('<', new ConstantNode(1), new ConstantNode(2))],
-            ['(1 <= 2)', new BinaryNode('<=', new ConstantNode(1), new ConstantNode(2))],
-            ['(1 <= 1)', new BinaryNode('<=', new ConstantNode(1), new ConstantNode(1))],
+            array('(1 < 2)', new BinaryNode('<', new ConstantNode(1), new ConstantNode(2))),
+            array('(1 <= 2)', new BinaryNode('<=', new ConstantNode(1), new ConstantNode(2))),
+            array('(1 <= 1)', new BinaryNode('<=', new ConstantNode(1), new ConstantNode(1))),
 
-            ['(1 > 2)', new BinaryNode('>', new ConstantNode(1), new ConstantNode(2))],
-            ['(1 >= 2)', new BinaryNode('>=', new ConstantNode(1), new ConstantNode(2))],
-            ['(1 >= 1)', new BinaryNode('>=', new ConstantNode(1), new ConstantNode(1))],
+            array('(1 > 2)', new BinaryNode('>', new ConstantNode(1), new ConstantNode(2))),
+            array('(1 >= 2)', new BinaryNode('>=', new ConstantNode(1), new ConstantNode(2))),
+            array('(1 >= 1)', new BinaryNode('>=', new ConstantNode(1), new ConstantNode(1))),
 
-            ['(true === true)', new BinaryNode('===', new ConstantNode(true), new ConstantNode(true))],
-            ['(true !== true)', new BinaryNode('!==', new ConstantNode(true), new ConstantNode(true))],
+            array('(true === true)', new BinaryNode('===', new ConstantNode(true), new ConstantNode(true))),
+            array('(true !== true)', new BinaryNode('!==', new ConstantNode(true), new ConstantNode(true))),
 
-            ['(2 == 1)', new BinaryNode('==', new ConstantNode(2), new ConstantNode(1))],
-            ['(2 != 1)', new BinaryNode('!=', new ConstantNode(2), new ConstantNode(1))],
+            array('(2 == 1)', new BinaryNode('==', new ConstantNode(2), new ConstantNode(1))),
+            array('(2 != 1)', new BinaryNode('!=', new ConstantNode(2), new ConstantNode(1))),
 
-            ['(1 - 2)', new BinaryNode('-', new ConstantNode(1), new ConstantNode(2))],
-            ['(1 + 2)', new BinaryNode('+', new ConstantNode(1), new ConstantNode(2))],
-            ['(2 * 2)', new BinaryNode('*', new ConstantNode(2), new ConstantNode(2))],
-            ['(2 / 2)', new BinaryNode('/', new ConstantNode(2), new ConstantNode(2))],
-            ['(5 % 2)', new BinaryNode('%', new ConstantNode(5), new ConstantNode(2))],
-            ['pow(5, 2)', new BinaryNode('**', new ConstantNode(5), new ConstantNode(2))],
-            ['("a" . "b")', new BinaryNode('~', new ConstantNode('a'), new ConstantNode('b'))],
+            array('(1 - 2)', new BinaryNode('-', new ConstantNode(1), new ConstantNode(2))),
+            array('(1 + 2)', new BinaryNode('+', new ConstantNode(1), new ConstantNode(2))),
+            array('(2 * 2)', new BinaryNode('*', new ConstantNode(2), new ConstantNode(2))),
+            array('(2 / 2)', new BinaryNode('/', new ConstantNode(2), new ConstantNode(2))),
+            array('(5 % 2)', new BinaryNode('%', new ConstantNode(5), new ConstantNode(2))),
+            array('pow(5, 2)', new BinaryNode('**', new ConstantNode(5), new ConstantNode(2))),
+            array('("a" . "b")', new BinaryNode('~', new ConstantNode('a'), new ConstantNode('b'))),
 
-            ['in_array("a", [0 => "a", 1 => "b"])', new BinaryNode('in', new ConstantNode('a'), $array)],
-            ['in_array("c", [0 => "a", 1 => "b"])', new BinaryNode('in', new ConstantNode('c'), $array)],
-            ['!in_array("c", [0 => "a", 1 => "b"])', new BinaryNode('not in', new ConstantNode('c'), $array)],
-            ['!in_array("a", [0 => "a", 1 => "b"])', new BinaryNode('not in', new ConstantNode('a'), $array)],
+            array('in_array("a", array(0 => "a", 1 => "b"))', new BinaryNode('in', new ConstantNode('a'), $array)),
+            array('in_array("c", array(0 => "a", 1 => "b"))', new BinaryNode('in', new ConstantNode('c'), $array)),
+            array('!in_array("c", array(0 => "a", 1 => "b"))', new BinaryNode('not in', new ConstantNode('c'), $array)),
+            array('!in_array("a", array(0 => "a", 1 => "b"))', new BinaryNode('not in', new ConstantNode('a'), $array)),
 
-            ['range(1, 3)', new BinaryNode('..', new ConstantNode(1), new ConstantNode(3))],
+            array('range(1, 3)', new BinaryNode('..', new ConstantNode(1), new ConstantNode(3))),
 
-            ['preg_match("/^[a-z]+/i\$/", "abc")', new BinaryNode('matches', new ConstantNode('abc'), new ConstantNode('/^[a-z]+/i$/'))],
-        ];
+            array('preg_match("/^[a-z]+/i\$/", "abc")', new BinaryNode('matches', new ConstantNode('abc'), new ConstantNode('/^[a-z]+/i$/'))),
+        );
     }
 
     public function getDumpData()
@@ -121,46 +121,46 @@ class BinaryNodeTest extends AbstractNodeTest
         $array->addElement(new ConstantNode('a'));
         $array->addElement(new ConstantNode('b'));
 
-        return [
-            ['(true or false)', new BinaryNode('or', new ConstantNode(true), new ConstantNode(false))],
-            ['(true || false)', new BinaryNode('||', new ConstantNode(true), new ConstantNode(false))],
-            ['(true and false)', new BinaryNode('and', new ConstantNode(true), new ConstantNode(false))],
-            ['(true && false)', new BinaryNode('&&', new ConstantNode(true), new ConstantNode(false))],
+        return array(
+            array('(true or false)', new BinaryNode('or', new ConstantNode(true), new ConstantNode(false))),
+            array('(true || false)', new BinaryNode('||', new ConstantNode(true), new ConstantNode(false))),
+            array('(true and false)', new BinaryNode('and', new ConstantNode(true), new ConstantNode(false))),
+            array('(true && false)', new BinaryNode('&&', new ConstantNode(true), new ConstantNode(false))),
 
-            ['(2 & 4)', new BinaryNode('&', new ConstantNode(2), new ConstantNode(4))],
-            ['(2 | 4)', new BinaryNode('|', new ConstantNode(2), new ConstantNode(4))],
-            ['(2 ^ 4)', new BinaryNode('^', new ConstantNode(2), new ConstantNode(4))],
+            array('(2 & 4)', new BinaryNode('&', new ConstantNode(2), new ConstantNode(4))),
+            array('(2 | 4)', new BinaryNode('|', new ConstantNode(2), new ConstantNode(4))),
+            array('(2 ^ 4)', new BinaryNode('^', new ConstantNode(2), new ConstantNode(4))),
 
-            ['(1 < 2)', new BinaryNode('<', new ConstantNode(1), new ConstantNode(2))],
-            ['(1 <= 2)', new BinaryNode('<=', new ConstantNode(1), new ConstantNode(2))],
-            ['(1 <= 1)', new BinaryNode('<=', new ConstantNode(1), new ConstantNode(1))],
+            array('(1 < 2)', new BinaryNode('<', new ConstantNode(1), new ConstantNode(2))),
+            array('(1 <= 2)', new BinaryNode('<=', new ConstantNode(1), new ConstantNode(2))),
+            array('(1 <= 1)', new BinaryNode('<=', new ConstantNode(1), new ConstantNode(1))),
 
-            ['(1 > 2)', new BinaryNode('>', new ConstantNode(1), new ConstantNode(2))],
-            ['(1 >= 2)', new BinaryNode('>=', new ConstantNode(1), new ConstantNode(2))],
-            ['(1 >= 1)', new BinaryNode('>=', new ConstantNode(1), new ConstantNode(1))],
+            array('(1 > 2)', new BinaryNode('>', new ConstantNode(1), new ConstantNode(2))),
+            array('(1 >= 2)', new BinaryNode('>=', new ConstantNode(1), new ConstantNode(2))),
+            array('(1 >= 1)', new BinaryNode('>=', new ConstantNode(1), new ConstantNode(1))),
 
-            ['(true === true)', new BinaryNode('===', new ConstantNode(true), new ConstantNode(true))],
-            ['(true !== true)', new BinaryNode('!==', new ConstantNode(true), new ConstantNode(true))],
+            array('(true === true)', new BinaryNode('===', new ConstantNode(true), new ConstantNode(true))),
+            array('(true !== true)', new BinaryNode('!==', new ConstantNode(true), new ConstantNode(true))),
 
-            ['(2 == 1)', new BinaryNode('==', new ConstantNode(2), new ConstantNode(1))],
-            ['(2 != 1)', new BinaryNode('!=', new ConstantNode(2), new ConstantNode(1))],
+            array('(2 == 1)', new BinaryNode('==', new ConstantNode(2), new ConstantNode(1))),
+            array('(2 != 1)', new BinaryNode('!=', new ConstantNode(2), new ConstantNode(1))),
 
-            ['(1 - 2)', new BinaryNode('-', new ConstantNode(1), new ConstantNode(2))],
-            ['(1 + 2)', new BinaryNode('+', new ConstantNode(1), new ConstantNode(2))],
-            ['(2 * 2)', new BinaryNode('*', new ConstantNode(2), new ConstantNode(2))],
-            ['(2 / 2)', new BinaryNode('/', new ConstantNode(2), new ConstantNode(2))],
-            ['(5 % 2)', new BinaryNode('%', new ConstantNode(5), new ConstantNode(2))],
-            ['(5 ** 2)', new BinaryNode('**', new ConstantNode(5), new ConstantNode(2))],
-            ['("a" ~ "b")', new BinaryNode('~', new ConstantNode('a'), new ConstantNode('b'))],
+            array('(1 - 2)', new BinaryNode('-', new ConstantNode(1), new ConstantNode(2))),
+            array('(1 + 2)', new BinaryNode('+', new ConstantNode(1), new ConstantNode(2))),
+            array('(2 * 2)', new BinaryNode('*', new ConstantNode(2), new ConstantNode(2))),
+            array('(2 / 2)', new BinaryNode('/', new ConstantNode(2), new ConstantNode(2))),
+            array('(5 % 2)', new BinaryNode('%', new ConstantNode(5), new ConstantNode(2))),
+            array('(5 ** 2)', new BinaryNode('**', new ConstantNode(5), new ConstantNode(2))),
+            array('("a" ~ "b")', new BinaryNode('~', new ConstantNode('a'), new ConstantNode('b'))),
 
-            ['("a" in ["a", "b"])', new BinaryNode('in', new ConstantNode('a'), $array)],
-            ['("c" in ["a", "b"])', new BinaryNode('in', new ConstantNode('c'), $array)],
-            ['("c" not in ["a", "b"])', new BinaryNode('not in', new ConstantNode('c'), $array)],
-            ['("a" not in ["a", "b"])', new BinaryNode('not in', new ConstantNode('a'), $array)],
+            array('("a" in ["a", "b"])', new BinaryNode('in', new ConstantNode('a'), $array)),
+            array('("c" in ["a", "b"])', new BinaryNode('in', new ConstantNode('c'), $array)),
+            array('("c" not in ["a", "b"])', new BinaryNode('not in', new ConstantNode('c'), $array)),
+            array('("a" not in ["a", "b"])', new BinaryNode('not in', new ConstantNode('a'), $array)),
 
-            ['(1 .. 3)', new BinaryNode('..', new ConstantNode(1), new ConstantNode(3))],
+            array('(1 .. 3)', new BinaryNode('..', new ConstantNode(1), new ConstantNode(3))),
 
-            ['("abc" matches "/^[a-z]+/i$/")', new BinaryNode('matches', new ConstantNode('abc'), new ConstantNode('/^[a-z]+/i$/'))],
-        ];
+            array('("abc" matches "/^[a-z]+/i$/")', new BinaryNode('matches', new ConstantNode('abc'), new ConstantNode('/^[a-z]+/i$/'))),
+        );
     }
 }
diff --git a/advancedcontentfilter/vendor/symfony/expression-language/Tests/Node/ConditionalNodeTest.php b/advancedcontentfilter/vendor/symfony/expression-language/Tests/Node/ConditionalNodeTest.php
index 13b7cbde..cbf9e8d4 100644
--- a/advancedcontentfilter/vendor/symfony/expression-language/Tests/Node/ConditionalNodeTest.php
+++ b/advancedcontentfilter/vendor/symfony/expression-language/Tests/Node/ConditionalNodeTest.php
@@ -18,25 +18,25 @@ class ConditionalNodeTest extends AbstractNodeTest
 {
     public function getEvaluateData()
     {
-        return [
-            [1, new ConditionalNode(new ConstantNode(true), new ConstantNode(1), new ConstantNode(2))],
-            [2, new ConditionalNode(new ConstantNode(false), new ConstantNode(1), new ConstantNode(2))],
-        ];
+        return array(
+            array(1, new ConditionalNode(new ConstantNode(true), new ConstantNode(1), new ConstantNode(2))),
+            array(2, new ConditionalNode(new ConstantNode(false), new ConstantNode(1), new ConstantNode(2))),
+        );
     }
 
     public function getCompileData()
     {
-        return [
-            ['((true) ? (1) : (2))', new ConditionalNode(new ConstantNode(true), new ConstantNode(1), new ConstantNode(2))],
-            ['((false) ? (1) : (2))', new ConditionalNode(new ConstantNode(false), new ConstantNode(1), new ConstantNode(2))],
-        ];
+        return array(
+            array('((true) ? (1) : (2))', new ConditionalNode(new ConstantNode(true), new ConstantNode(1), new ConstantNode(2))),
+            array('((false) ? (1) : (2))', new ConditionalNode(new ConstantNode(false), new ConstantNode(1), new ConstantNode(2))),
+        );
     }
 
     public function getDumpData()
     {
-        return [
-            ['(true ? 1 : 2)', new ConditionalNode(new ConstantNode(true), new ConstantNode(1), new ConstantNode(2))],
-            ['(false ? 1 : 2)', new ConditionalNode(new ConstantNode(false), new ConstantNode(1), new ConstantNode(2))],
-        ];
+        return array(
+            array('(true ? 1 : 2)', new ConditionalNode(new ConstantNode(true), new ConstantNode(1), new ConstantNode(2))),
+            array('(false ? 1 : 2)', new ConditionalNode(new ConstantNode(false), new ConstantNode(1), new ConstantNode(2))),
+        );
     }
 }
diff --git a/advancedcontentfilter/vendor/symfony/expression-language/Tests/Node/ConstantNodeTest.php b/advancedcontentfilter/vendor/symfony/expression-language/Tests/Node/ConstantNodeTest.php
index fee9f5bf..af79a91c 100644
--- a/advancedcontentfilter/vendor/symfony/expression-language/Tests/Node/ConstantNodeTest.php
+++ b/advancedcontentfilter/vendor/symfony/expression-language/Tests/Node/ConstantNodeTest.php
@@ -17,44 +17,44 @@ class ConstantNodeTest extends AbstractNodeTest
 {
     public function getEvaluateData()
     {
-        return [
-            [false, new ConstantNode(false)],
-            [true, new ConstantNode(true)],
-            [null, new ConstantNode(null)],
-            [3, new ConstantNode(3)],
-            [3.3, new ConstantNode(3.3)],
-            ['foo', new ConstantNode('foo')],
-            [[1, 'b' => 'a'], new ConstantNode([1, 'b' => 'a'])],
-        ];
+        return array(
+            array(false, new ConstantNode(false)),
+            array(true, new ConstantNode(true)),
+            array(null, new ConstantNode(null)),
+            array(3, new ConstantNode(3)),
+            array(3.3, new ConstantNode(3.3)),
+            array('foo', new ConstantNode('foo')),
+            array(array(1, 'b' => 'a'), new ConstantNode(array(1, 'b' => 'a'))),
+        );
     }
 
     public function getCompileData()
     {
-        return [
-            ['false', new ConstantNode(false)],
-            ['true', new ConstantNode(true)],
-            ['null', new ConstantNode(null)],
-            ['3', new ConstantNode(3)],
-            ['3.3', new ConstantNode(3.3)],
-            ['"foo"', new ConstantNode('foo')],
-            ['[0 => 1, "b" => "a"]', new ConstantNode([1, 'b' => 'a'])],
-        ];
+        return array(
+            array('false', new ConstantNode(false)),
+            array('true', new ConstantNode(true)),
+            array('null', new ConstantNode(null)),
+            array('3', new ConstantNode(3)),
+            array('3.3', new ConstantNode(3.3)),
+            array('"foo"', new ConstantNode('foo')),
+            array('array(0 => 1, "b" => "a")', new ConstantNode(array(1, 'b' => 'a'))),
+        );
     }
 
     public function getDumpData()
     {
-        return [
-            ['false', new ConstantNode(false)],
-            ['true', new ConstantNode(true)],
-            ['null', new ConstantNode(null)],
-            ['3', new ConstantNode(3)],
-            ['3.3', new ConstantNode(3.3)],
-            ['"foo"', new ConstantNode('foo')],
-            ['foo', new ConstantNode('foo', true)],
-            ['{0: 1, "b": "a", 1: true}', new ConstantNode([1, 'b' => 'a', true])],
-            ['{"a\\"b": "c", "a\\\\b": "d"}', new ConstantNode(['a"b' => 'c', 'a\\b' => 'd'])],
-            ['["c", "d"]', new ConstantNode(['c', 'd'])],
-            ['{"a": ["b"]}', new ConstantNode(['a' => ['b']])],
-        ];
+        return array(
+            array('false', new ConstantNode(false)),
+            array('true', new ConstantNode(true)),
+            array('null', new ConstantNode(null)),
+            array('3', new ConstantNode(3)),
+            array('3.3', new ConstantNode(3.3)),
+            array('"foo"', new ConstantNode('foo')),
+            array('foo', new ConstantNode('foo', true)),
+            array('{0: 1, "b": "a", 1: true}', new ConstantNode(array(1, 'b' => 'a', true))),
+            array('{"a\\"b": "c", "a\\\\b": "d"}', new ConstantNode(array('a"b' => 'c', 'a\\b' => 'd'))),
+            array('["c", "d"]', new ConstantNode(array('c', 'd'))),
+            array('{"a": ["b"]}', new ConstantNode(array('a' => array('b')))),
+        );
     }
 }
diff --git a/advancedcontentfilter/vendor/symfony/expression-language/Tests/Node/FunctionNodeTest.php b/advancedcontentfilter/vendor/symfony/expression-language/Tests/Node/FunctionNodeTest.php
index c6cb02c1..8d6f92a9 100644
--- a/advancedcontentfilter/vendor/symfony/expression-language/Tests/Node/FunctionNodeTest.php
+++ b/advancedcontentfilter/vendor/symfony/expression-language/Tests/Node/FunctionNodeTest.php
@@ -11,42 +11,42 @@
 
 namespace Symfony\Component\ExpressionLanguage\Tests\Node;
 
-use Symfony\Component\ExpressionLanguage\Node\ConstantNode;
 use Symfony\Component\ExpressionLanguage\Node\FunctionNode;
+use Symfony\Component\ExpressionLanguage\Node\ConstantNode;
 use Symfony\Component\ExpressionLanguage\Node\Node;
 
 class FunctionNodeTest extends AbstractNodeTest
 {
     public function getEvaluateData()
     {
-        return [
-            ['bar', new FunctionNode('foo', new Node([new ConstantNode('bar')])), [], ['foo' => $this->getCallables()]],
-        ];
+        return array(
+            array('bar', new FunctionNode('foo', new Node(array(new ConstantNode('bar')))), array(), array('foo' => $this->getCallables())),
+        );
     }
 
     public function getCompileData()
     {
-        return [
-            ['foo("bar")', new FunctionNode('foo', new Node([new ConstantNode('bar')])), ['foo' => $this->getCallables()]],
-        ];
+        return array(
+            array('foo("bar")', new FunctionNode('foo', new Node(array(new ConstantNode('bar')))), array('foo' => $this->getCallables())),
+        );
     }
 
     public function getDumpData()
     {
-        return [
-            ['foo("bar")', new FunctionNode('foo', new Node([new ConstantNode('bar')])), ['foo' => $this->getCallables()]],
-        ];
+        return array(
+            array('foo("bar")', new FunctionNode('foo', new Node(array(new ConstantNode('bar')))), array('foo' => $this->getCallables())),
+        );
     }
 
     protected function getCallables()
     {
-        return [
+        return array(
             'compiler' => function ($arg) {
                 return sprintf('foo(%s)', $arg);
             },
             'evaluator' => function ($variables, $arg) {
                 return $arg;
             },
-        ];
+        );
     }
 }
diff --git a/advancedcontentfilter/vendor/symfony/expression-language/Tests/Node/GetAttrNodeTest.php b/advancedcontentfilter/vendor/symfony/expression-language/Tests/Node/GetAttrNodeTest.php
index c790f33a..cf7cd7a0 100644
--- a/advancedcontentfilter/vendor/symfony/expression-language/Tests/Node/GetAttrNodeTest.php
+++ b/advancedcontentfilter/vendor/symfony/expression-language/Tests/Node/GetAttrNodeTest.php
@@ -12,49 +12,49 @@
 namespace Symfony\Component\ExpressionLanguage\Tests\Node;
 
 use Symfony\Component\ExpressionLanguage\Node\ArrayNode;
-use Symfony\Component\ExpressionLanguage\Node\ConstantNode;
-use Symfony\Component\ExpressionLanguage\Node\GetAttrNode;
 use Symfony\Component\ExpressionLanguage\Node\NameNode;
+use Symfony\Component\ExpressionLanguage\Node\GetAttrNode;
+use Symfony\Component\ExpressionLanguage\Node\ConstantNode;
 
 class GetAttrNodeTest extends AbstractNodeTest
 {
     public function getEvaluateData()
     {
-        return [
-            ['b', new GetAttrNode(new NameNode('foo'), new ConstantNode(0), $this->getArrayNode(), GetAttrNode::ARRAY_CALL), ['foo' => ['b' => 'a', 'b']]],
-            ['a', new GetAttrNode(new NameNode('foo'), new ConstantNode('b'), $this->getArrayNode(), GetAttrNode::ARRAY_CALL), ['foo' => ['b' => 'a', 'b']]],
+        return array(
+            array('b', new GetAttrNode(new NameNode('foo'), new ConstantNode(0), $this->getArrayNode(), GetAttrNode::ARRAY_CALL), array('foo' => array('b' => 'a', 'b'))),
+            array('a', new GetAttrNode(new NameNode('foo'), new ConstantNode('b'), $this->getArrayNode(), GetAttrNode::ARRAY_CALL), array('foo' => array('b' => 'a', 'b'))),
 
-            ['bar', new GetAttrNode(new NameNode('foo'), new ConstantNode('foo'), $this->getArrayNode(), GetAttrNode::PROPERTY_CALL), ['foo' => new Obj()]],
+            array('bar', new GetAttrNode(new NameNode('foo'), new ConstantNode('foo'), $this->getArrayNode(), GetAttrNode::PROPERTY_CALL), array('foo' => new Obj())),
 
-            ['baz', new GetAttrNode(new NameNode('foo'), new ConstantNode('foo'), $this->getArrayNode(), GetAttrNode::METHOD_CALL), ['foo' => new Obj()]],
-            ['a', new GetAttrNode(new NameNode('foo'), new NameNode('index'), $this->getArrayNode(), GetAttrNode::ARRAY_CALL), ['foo' => ['b' => 'a', 'b'], 'index' => 'b']],
-        ];
+            array('baz', new GetAttrNode(new NameNode('foo'), new ConstantNode('foo'), $this->getArrayNode(), GetAttrNode::METHOD_CALL), array('foo' => new Obj())),
+            array('a', new GetAttrNode(new NameNode('foo'), new NameNode('index'), $this->getArrayNode(), GetAttrNode::ARRAY_CALL), array('foo' => array('b' => 'a', 'b'), 'index' => 'b')),
+        );
     }
 
     public function getCompileData()
     {
-        return [
-            ['$foo[0]', new GetAttrNode(new NameNode('foo'), new ConstantNode(0), $this->getArrayNode(), GetAttrNode::ARRAY_CALL)],
-            ['$foo["b"]', new GetAttrNode(new NameNode('foo'), new ConstantNode('b'), $this->getArrayNode(), GetAttrNode::ARRAY_CALL)],
+        return array(
+            array('$foo[0]', new GetAttrNode(new NameNode('foo'), new ConstantNode(0), $this->getArrayNode(), GetAttrNode::ARRAY_CALL)),
+            array('$foo["b"]', new GetAttrNode(new NameNode('foo'), new ConstantNode('b'), $this->getArrayNode(), GetAttrNode::ARRAY_CALL)),
 
-            ['$foo->foo', new GetAttrNode(new NameNode('foo'), new ConstantNode('foo'), $this->getArrayNode(), GetAttrNode::PROPERTY_CALL), ['foo' => new Obj()]],
+            array('$foo->foo', new GetAttrNode(new NameNode('foo'), new ConstantNode('foo'), $this->getArrayNode(), GetAttrNode::PROPERTY_CALL), array('foo' => new Obj())),
 
-            ['$foo->foo(["b" => "a", 0 => "b"])', new GetAttrNode(new NameNode('foo'), new ConstantNode('foo'), $this->getArrayNode(), GetAttrNode::METHOD_CALL), ['foo' => new Obj()]],
-            ['$foo[$index]', new GetAttrNode(new NameNode('foo'), new NameNode('index'), $this->getArrayNode(), GetAttrNode::ARRAY_CALL)],
-        ];
+            array('$foo->foo(array("b" => "a", 0 => "b"))', new GetAttrNode(new NameNode('foo'), new ConstantNode('foo'), $this->getArrayNode(), GetAttrNode::METHOD_CALL), array('foo' => new Obj())),
+            array('$foo[$index]', new GetAttrNode(new NameNode('foo'), new NameNode('index'), $this->getArrayNode(), GetAttrNode::ARRAY_CALL)),
+        );
     }
 
     public function getDumpData()
     {
-        return [
-            ['foo[0]', new GetAttrNode(new NameNode('foo'), new ConstantNode(0), $this->getArrayNode(), GetAttrNode::ARRAY_CALL)],
-            ['foo["b"]', new GetAttrNode(new NameNode('foo'), new ConstantNode('b'), $this->getArrayNode(), GetAttrNode::ARRAY_CALL)],
+        return array(
+            array('foo[0]', new GetAttrNode(new NameNode('foo'), new ConstantNode(0), $this->getArrayNode(), GetAttrNode::ARRAY_CALL)),
+            array('foo["b"]', new GetAttrNode(new NameNode('foo'), new ConstantNode('b'), $this->getArrayNode(), GetAttrNode::ARRAY_CALL)),
 
-            ['foo.foo', new GetAttrNode(new NameNode('foo'), new NameNode('foo'), $this->getArrayNode(), GetAttrNode::PROPERTY_CALL), ['foo' => new Obj()]],
+            array('foo.foo', new GetAttrNode(new NameNode('foo'), new NameNode('foo'), $this->getArrayNode(), GetAttrNode::PROPERTY_CALL), array('foo' => new Obj())),
 
-            ['foo.foo({"b": "a", 0: "b"})', new GetAttrNode(new NameNode('foo'), new NameNode('foo'), $this->getArrayNode(), GetAttrNode::METHOD_CALL), ['foo' => new Obj()]],
-            ['foo[index]', new GetAttrNode(new NameNode('foo'), new NameNode('index'), $this->getArrayNode(), GetAttrNode::ARRAY_CALL)],
-        ];
+            array('foo.foo({"b": "a", 0: "b"})', new GetAttrNode(new NameNode('foo'), new NameNode('foo'), $this->getArrayNode(), GetAttrNode::METHOD_CALL), array('foo' => new Obj())),
+            array('foo[index]', new GetAttrNode(new NameNode('foo'), new NameNode('index'), $this->getArrayNode(), GetAttrNode::ARRAY_CALL)),
+        );
     }
 
     protected function getArrayNode()
diff --git a/advancedcontentfilter/vendor/symfony/expression-language/Tests/Node/NameNodeTest.php b/advancedcontentfilter/vendor/symfony/expression-language/Tests/Node/NameNodeTest.php
index a30c27b8..5fa2c37f 100644
--- a/advancedcontentfilter/vendor/symfony/expression-language/Tests/Node/NameNodeTest.php
+++ b/advancedcontentfilter/vendor/symfony/expression-language/Tests/Node/NameNodeTest.php
@@ -17,22 +17,22 @@ class NameNodeTest extends AbstractNodeTest
 {
     public function getEvaluateData()
     {
-        return [
-            ['bar', new NameNode('foo'), ['foo' => 'bar']],
-        ];
+        return array(
+            array('bar', new NameNode('foo'), array('foo' => 'bar')),
+        );
     }
 
     public function getCompileData()
     {
-        return [
-            ['$foo', new NameNode('foo')],
-        ];
+        return array(
+            array('$foo', new NameNode('foo')),
+        );
     }
 
     public function getDumpData()
     {
-        return [
-            ['foo', new NameNode('foo')],
-        ];
+        return array(
+            array('foo', new NameNode('foo')),
+        );
     }
 }
diff --git a/advancedcontentfilter/vendor/symfony/expression-language/Tests/Node/NodeTest.php b/advancedcontentfilter/vendor/symfony/expression-language/Tests/Node/NodeTest.php
index 351da051..0f35b5fe 100644
--- a/advancedcontentfilter/vendor/symfony/expression-language/Tests/Node/NodeTest.php
+++ b/advancedcontentfilter/vendor/symfony/expression-language/Tests/Node/NodeTest.php
@@ -12,14 +12,14 @@
 namespace Symfony\Component\ExpressionLanguage\Tests\Node;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Component\ExpressionLanguage\Node\ConstantNode;
 use Symfony\Component\ExpressionLanguage\Node\Node;
+use Symfony\Component\ExpressionLanguage\Node\ConstantNode;
 
 class NodeTest extends TestCase
 {
     public function testToString()
     {
-        $node = new Node([new ConstantNode('foo')]);
+        $node = new Node(array(new ConstantNode('foo')));
 
         $this->assertEquals(<<<'EOF'
 Node(
@@ -31,7 +31,7 @@ EOF
 
     public function testSerialization()
     {
-        $node = new Node(['foo' => 'bar'], ['bar' => 'foo']);
+        $node = new Node(array('foo' => 'bar'), array('bar' => 'foo'));
 
         $serializedNode = serialize($node);
         $unserializedNode = unserialize($serializedNode);
diff --git a/advancedcontentfilter/vendor/symfony/expression-language/Tests/Node/UnaryNodeTest.php b/advancedcontentfilter/vendor/symfony/expression-language/Tests/Node/UnaryNodeTest.php
index bac75d24..ae2e3eee 100644
--- a/advancedcontentfilter/vendor/symfony/expression-language/Tests/Node/UnaryNodeTest.php
+++ b/advancedcontentfilter/vendor/symfony/expression-language/Tests/Node/UnaryNodeTest.php
@@ -11,38 +11,38 @@
 
 namespace Symfony\Component\ExpressionLanguage\Tests\Node;
 
-use Symfony\Component\ExpressionLanguage\Node\ConstantNode;
 use Symfony\Component\ExpressionLanguage\Node\UnaryNode;
+use Symfony\Component\ExpressionLanguage\Node\ConstantNode;
 
 class UnaryNodeTest extends AbstractNodeTest
 {
     public function getEvaluateData()
     {
-        return [
-            [-1, new UnaryNode('-', new ConstantNode(1))],
-            [3, new UnaryNode('+', new ConstantNode(3))],
-            [false, new UnaryNode('!', new ConstantNode(true))],
-            [false, new UnaryNode('not', new ConstantNode(true))],
-        ];
+        return array(
+            array(-1, new UnaryNode('-', new ConstantNode(1))),
+            array(3, new UnaryNode('+', new ConstantNode(3))),
+            array(false, new UnaryNode('!', new ConstantNode(true))),
+            array(false, new UnaryNode('not', new ConstantNode(true))),
+        );
     }
 
     public function getCompileData()
     {
-        return [
-            ['(-1)', new UnaryNode('-', new ConstantNode(1))],
-            ['(+3)', new UnaryNode('+', new ConstantNode(3))],
-            ['(!true)', new UnaryNode('!', new ConstantNode(true))],
-            ['(!true)', new UnaryNode('not', new ConstantNode(true))],
-        ];
+        return array(
+            array('(-1)', new UnaryNode('-', new ConstantNode(1))),
+            array('(+3)', new UnaryNode('+', new ConstantNode(3))),
+            array('(!true)', new UnaryNode('!', new ConstantNode(true))),
+            array('(!true)', new UnaryNode('not', new ConstantNode(true))),
+        );
     }
 
     public function getDumpData()
     {
-        return [
-            ['(- 1)', new UnaryNode('-', new ConstantNode(1))],
-            ['(+ 3)', new UnaryNode('+', new ConstantNode(3))],
-            ['(! true)', new UnaryNode('!', new ConstantNode(true))],
-            ['(not true)', new UnaryNode('not', new ConstantNode(true))],
-        ];
+        return array(
+            array('(- 1)', new UnaryNode('-', new ConstantNode(1))),
+            array('(+ 3)', new UnaryNode('+', new ConstantNode(3))),
+            array('(! true)', new UnaryNode('!', new ConstantNode(true))),
+            array('(not true)', new UnaryNode('not', new ConstantNode(true))),
+        );
     }
 }
diff --git a/advancedcontentfilter/vendor/symfony/expression-language/Tests/ParserCache/ParserCacheAdapterTest.php b/advancedcontentfilter/vendor/symfony/expression-language/Tests/ParserCache/ParserCacheAdapterTest.php
index f82af92e..44731611 100644
--- a/advancedcontentfilter/vendor/symfony/expression-language/Tests/ParserCache/ParserCacheAdapterTest.php
+++ b/advancedcontentfilter/vendor/symfony/expression-language/Tests/ParserCache/ParserCacheAdapterTest.php
@@ -12,9 +12,9 @@
 namespace Symfony\Component\ExpressionLanguage\Tests;
 
 use PHPUnit\Framework\TestCase;
-use Symfony\Component\ExpressionLanguage\Node\Node;
 use Symfony\Component\ExpressionLanguage\ParsedExpression;
 use Symfony\Component\ExpressionLanguage\ParserCache\ParserCacheAdapter;
+use Symfony\Component\ExpressionLanguage\Node\Node;
 
 /**
  * @group legacy
@@ -38,8 +38,8 @@ class ParserCacheAdapterTest extends TestCase
 
         $cacheItem = $parserCacheAdapter->getItem($key);
 
-        $this->assertEquals($value, $cacheItem->get());
-        $this->assertTrue($cacheItem->isHit());
+        $this->assertEquals($cacheItem->get(), $value);
+        $this->assertEquals($cacheItem->isHit(), true);
     }
 
     public function testSave()
@@ -47,7 +47,7 @@ class ParserCacheAdapterTest extends TestCase
         $poolMock = $this->getMockBuilder('Symfony\Component\ExpressionLanguage\ParserCache\ParserCacheInterface')->getMock();
         $cacheItemMock = $this->getMockBuilder('Psr\Cache\CacheItemInterface')->getMock();
         $key = 'key';
-        $value = new ParsedExpression('1 + 1', new Node([], []));
+        $value = new ParsedExpression('1 + 1', new Node(array(), array()));
         $parserCacheAdapter = new ParserCacheAdapter($poolMock);
 
         $poolMock
@@ -68,14 +68,14 @@ class ParserCacheAdapterTest extends TestCase
             ->willReturn($value)
         ;
 
-        $parserCacheAdapter->save($cacheItemMock);
+        $cacheItem = $parserCacheAdapter->save($cacheItemMock);
     }
 
     public function testGetItems()
     {
         $poolMock = $this->getMockBuilder('Symfony\Component\ExpressionLanguage\ParserCache\ParserCacheInterface')->getMock();
         $parserCacheAdapter = new ParserCacheAdapter($poolMock);
-        $this->expectException(\BadMethodCallException::class);
+        $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}(\BadMethodCallException::class);
 
         $parserCacheAdapter->getItems();
     }
@@ -85,7 +85,7 @@ class ParserCacheAdapterTest extends TestCase
         $poolMock = $this->getMockBuilder('Symfony\Component\ExpressionLanguage\ParserCache\ParserCacheInterface')->getMock();
         $key = 'key';
         $parserCacheAdapter = new ParserCacheAdapter($poolMock);
-        $this->expectException(\BadMethodCallException::class);
+        $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}(\BadMethodCallException::class);
 
         $parserCacheAdapter->hasItem($key);
     }
@@ -94,7 +94,7 @@ class ParserCacheAdapterTest extends TestCase
     {
         $poolMock = $this->getMockBuilder('Symfony\Component\ExpressionLanguage\ParserCache\ParserCacheInterface')->getMock();
         $parserCacheAdapter = new ParserCacheAdapter($poolMock);
-        $this->expectException(\BadMethodCallException::class);
+        $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}(\BadMethodCallException::class);
 
         $parserCacheAdapter->clear();
     }
@@ -104,7 +104,7 @@ class ParserCacheAdapterTest extends TestCase
         $poolMock = $this->getMockBuilder('Symfony\Component\ExpressionLanguage\ParserCache\ParserCacheInterface')->getMock();
         $key = 'key';
         $parserCacheAdapter = new ParserCacheAdapter($poolMock);
-        $this->expectException(\BadMethodCallException::class);
+        $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}(\BadMethodCallException::class);
 
         $parserCacheAdapter->deleteItem($key);
     }
@@ -112,9 +112,9 @@ class ParserCacheAdapterTest extends TestCase
     public function testDeleteItems()
     {
         $poolMock = $this->getMockBuilder('Symfony\Component\ExpressionLanguage\ParserCache\ParserCacheInterface')->getMock();
-        $keys = ['key'];
+        $keys = array('key');
         $parserCacheAdapter = new ParserCacheAdapter($poolMock);
-        $this->expectException(\BadMethodCallException::class);
+        $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}(\BadMethodCallException::class);
 
         $parserCacheAdapter->deleteItems($keys);
     }
@@ -124,7 +124,7 @@ class ParserCacheAdapterTest extends TestCase
         $poolMock = $this->getMockBuilder('Symfony\Component\ExpressionLanguage\ParserCache\ParserCacheInterface')->getMock();
         $parserCacheAdapter = new ParserCacheAdapter($poolMock);
         $cacheItemMock = $this->getMockBuilder('Psr\Cache\CacheItemInterface')->getMock();
-        $this->expectException(\BadMethodCallException::class);
+        $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}(\BadMethodCallException::class);
 
         $parserCacheAdapter->saveDeferred($cacheItemMock);
     }
@@ -133,7 +133,7 @@ class ParserCacheAdapterTest extends TestCase
     {
         $poolMock = $this->getMockBuilder('Symfony\Component\ExpressionLanguage\ParserCache\ParserCacheInterface')->getMock();
         $parserCacheAdapter = new ParserCacheAdapter($poolMock);
-        $this->expectException(\BadMethodCallException::class);
+        $this->{method_exists($this, $_ = 'expectException') ? $_ : 'setExpectedException'}(\BadMethodCallException::class);
 
         $parserCacheAdapter->commit();
     }
diff --git a/advancedcontentfilter/vendor/symfony/expression-language/Tests/ParserTest.php b/advancedcontentfilter/vendor/symfony/expression-language/Tests/ParserTest.php
index 2d5a0a6c..11464abd 100644
--- a/advancedcontentfilter/vendor/symfony/expression-language/Tests/ParserTest.php
+++ b/advancedcontentfilter/vendor/symfony/expression-language/Tests/ParserTest.php
@@ -12,37 +12,41 @@
 namespace Symfony\Component\ExpressionLanguage\Tests;
 
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\ExpressionLanguage\Parser;
 use Symfony\Component\ExpressionLanguage\Lexer;
 use Symfony\Component\ExpressionLanguage\Node;
-use Symfony\Component\ExpressionLanguage\Parser;
 
 class ParserTest extends TestCase
 {
+    /**
+     * @expectedException        \Symfony\Component\ExpressionLanguage\SyntaxError
+     * @expectedExceptionMessage Variable "foo" is not valid around position 1 for expression `foo`.
+     */
     public function testParseWithInvalidName()
     {
-        $this->expectException('Symfony\Component\ExpressionLanguage\SyntaxError');
-        $this->expectExceptionMessage('Variable "foo" is not valid around position 1 for expression `foo`.');
         $lexer = new Lexer();
-        $parser = new Parser([]);
+        $parser = new Parser(array());
         $parser->parse($lexer->tokenize('foo'));
     }
 
+    /**
+     * @expectedException        \Symfony\Component\ExpressionLanguage\SyntaxError
+     * @expectedExceptionMessage Variable "foo" is not valid around position 1 for expression `foo`.
+     */
     public function testParseWithZeroInNames()
     {
-        $this->expectException('Symfony\Component\ExpressionLanguage\SyntaxError');
-        $this->expectExceptionMessage('Variable "foo" is not valid around position 1 for expression `foo`.');
         $lexer = new Lexer();
-        $parser = new Parser([]);
-        $parser->parse($lexer->tokenize('foo'), [0]);
+        $parser = new Parser(array());
+        $parser->parse($lexer->tokenize('foo'), array(0));
     }
 
     /**
      * @dataProvider getParseData
      */
-    public function testParse($node, $expression, $names = [])
+    public function testParse($node, $expression, $names = array())
     {
         $lexer = new Lexer();
-        $parser = new Parser([]);
+        $parser = new Parser(array());
         $this->assertEquals($node, $parser->parse($lexer->tokenize($expression), $names));
     }
 
@@ -53,66 +57,63 @@ class ParserTest extends TestCase
         $arguments->addElement(new Node\ConstantNode(2));
         $arguments->addElement(new Node\ConstantNode(true));
 
-        $arrayNode = new Node\ArrayNode();
-        $arrayNode->addElement(new Node\NameNode('bar'));
-
-        return [
-            [
+        return array(
+            array(
                 new Node\NameNode('a'),
                 'a',
-                ['a'],
-            ],
-            [
+                array('a'),
+            ),
+            array(
                 new Node\ConstantNode('a'),
                 '"a"',
-            ],
-            [
+            ),
+            array(
                 new Node\ConstantNode(3),
                 '3',
-            ],
-            [
+            ),
+            array(
                 new Node\ConstantNode(false),
                 'false',
-            ],
-            [
+            ),
+            array(
                 new Node\ConstantNode(true),
                 'true',
-            ],
-            [
+            ),
+            array(
                 new Node\ConstantNode(null),
                 'null',
-            ],
-            [
+            ),
+            array(
                 new Node\UnaryNode('-', new Node\ConstantNode(3)),
                 '-3',
-            ],
-            [
+            ),
+            array(
                 new Node\BinaryNode('-', new Node\ConstantNode(3), new Node\ConstantNode(3)),
                 '3 - 3',
-            ],
-            [
+            ),
+            array(
                 new Node\BinaryNode('*',
                     new Node\BinaryNode('-', new Node\ConstantNode(3), new Node\ConstantNode(3)),
                     new Node\ConstantNode(2)
                 ),
                 '(3 - 3) * 2',
-            ],
-            [
+            ),
+            array(
                 new Node\GetAttrNode(new Node\NameNode('foo'), new Node\ConstantNode('bar', true), new Node\ArgumentsNode(), Node\GetAttrNode::PROPERTY_CALL),
                 'foo.bar',
-                ['foo'],
-            ],
-            [
+                array('foo'),
+            ),
+            array(
                 new Node\GetAttrNode(new Node\NameNode('foo'), new Node\ConstantNode('bar', true), new Node\ArgumentsNode(), Node\GetAttrNode::METHOD_CALL),
                 'foo.bar()',
-                ['foo'],
-            ],
-            [
+                array('foo'),
+            ),
+            array(
                 new Node\GetAttrNode(new Node\NameNode('foo'), new Node\ConstantNode('not', true), new Node\ArgumentsNode(), Node\GetAttrNode::METHOD_CALL),
                 'foo.not()',
-                ['foo'],
-            ],
-            [
+                array('foo'),
+            ),
+            array(
                 new Node\GetAttrNode(
                     new Node\NameNode('foo'),
                     new Node\ConstantNode('bar', true),
@@ -120,24 +121,24 @@ class ParserTest extends TestCase
                     Node\GetAttrNode::METHOD_CALL
                 ),
                 'foo.bar("arg1", 2, true)',
-                ['foo'],
-            ],
-            [
+                array('foo'),
+            ),
+            array(
                 new Node\GetAttrNode(new Node\NameNode('foo'), new Node\ConstantNode(3), new Node\ArgumentsNode(), Node\GetAttrNode::ARRAY_CALL),
                 'foo[3]',
-                ['foo'],
-            ],
-            [
+                array('foo'),
+            ),
+            array(
                 new Node\ConditionalNode(new Node\ConstantNode(true), new Node\ConstantNode(true), new Node\ConstantNode(false)),
                 'true ? true : false',
-            ],
-            [
+            ),
+            array(
                 new Node\BinaryNode('matches', new Node\ConstantNode('foo'), new Node\ConstantNode('/foo/')),
                 '"foo" matches "/foo/"',
-            ],
+            ),
 
             // chained calls
-            [
+            array(
                 $this->createGetAttrNode(
                     $this->createGetAttrNode(
                         $this->createGetAttrNode(
@@ -146,45 +147,15 @@ class ParserTest extends TestCase
                         'baz', Node\GetAttrNode::PROPERTY_CALL),
                     '3', Node\GetAttrNode::ARRAY_CALL),
                 'foo.bar().foo().baz[3]',
-                ['foo'],
-            ],
+                array('foo'),
+            ),
 
-            [
+            array(
                 new Node\NameNode('foo'),
                 'bar',
-                ['foo' => 'bar'],
-            ],
-
-            // Operators collisions
-            [
-                new Node\BinaryNode(
-                    'in',
-                    new Node\GetAttrNode(
-                        new Node\NameNode('foo'),
-                        new Node\ConstantNode('not', true),
-                        new Node\ArgumentsNode(),
-                        Node\GetAttrNode::PROPERTY_CALL
-                    ),
-                    $arrayNode
-                ),
-                'foo.not in [bar]',
-                ['foo', 'bar'],
-            ],
-            [
-                new Node\BinaryNode(
-                    'or',
-                    new Node\UnaryNode('not', new Node\NameNode('foo')),
-                    new Node\GetAttrNode(
-                        new Node\NameNode('foo'),
-                        new Node\ConstantNode('not', true),
-                        new Node\ArgumentsNode(),
-                        Node\GetAttrNode::PROPERTY_CALL
-                    )
-                ),
-                'not foo or foo.not',
-                ['foo'],
-            ],
-        ];
+                array('foo' => 'bar'),
+            ),
+        );
     }
 
     private function createGetAttrNode($node, $item, $type)
@@ -194,44 +165,46 @@ class ParserTest extends TestCase
 
     /**
      * @dataProvider getInvalidPostfixData
+     * @expectedException \Symfony\Component\ExpressionLanguage\SyntaxError
      */
-    public function testParseWithInvalidPostfixData($expr, $names = [])
+    public function testParseWithInvalidPostfixData($expr, $names = array())
     {
-        $this->expectException('Symfony\Component\ExpressionLanguage\SyntaxError');
         $lexer = new Lexer();
-        $parser = new Parser([]);
+        $parser = new Parser(array());
         $parser->parse($lexer->tokenize($expr), $names);
     }
 
     public function getInvalidPostfixData()
     {
-        return [
-            [
+        return array(
+            array(
                 'foo."#"',
-                ['foo'],
-            ],
-            [
+                array('foo'),
+            ),
+            array(
                 'foo."bar"',
-                ['foo'],
-            ],
-            [
+                array('foo'),
+            ),
+            array(
                 'foo.**',
-                ['foo'],
-            ],
-            [
+                array('foo'),
+            ),
+            array(
                 'foo.123',
-                ['foo'],
-            ],
-        ];
+                array('foo'),
+            ),
+        );
     }
 
+    /**
+     * @expectedException \Symfony\Component\ExpressionLanguage\SyntaxError
+     * @expectedExceptionMessage Did you mean "baz"?
+     */
     public function testNameProposal()
     {
-        $this->expectException('Symfony\Component\ExpressionLanguage\SyntaxError');
-        $this->expectExceptionMessage('Did you mean "baz"?');
         $lexer = new Lexer();
-        $parser = new Parser([]);
+        $parser = new Parser(array());
 
-        $parser->parse($lexer->tokenize('foo > bar'), ['foo', 'baz']);
+        $parser->parse($lexer->tokenize('foo > bar'), array('foo', 'baz'));
     }
 }
diff --git a/advancedcontentfilter/vendor/symfony/expression-language/Token.php b/advancedcontentfilter/vendor/symfony/expression-language/Token.php
index 60dc32d7..4517335b 100644
--- a/advancedcontentfilter/vendor/symfony/expression-language/Token.php
+++ b/advancedcontentfilter/vendor/symfony/expression-language/Token.php
@@ -54,7 +54,7 @@ class Token
     /**
      * Tests the current token for a type and/or a value.
      *
-     * @param string      $type  The type to test
+     * @param array|int   $type  The type to test
      * @param string|null $value The token value
      *
      * @return bool
diff --git a/advancedcontentfilter/vendor/symfony/expression-language/TokenStream.php b/advancedcontentfilter/vendor/symfony/expression-language/TokenStream.php
index 09d3854e..9096b183 100644
--- a/advancedcontentfilter/vendor/symfony/expression-language/TokenStream.php
+++ b/advancedcontentfilter/vendor/symfony/expression-language/TokenStream.php
@@ -53,7 +53,7 @@ class TokenStream
         ++$this->position;
 
         if (!isset($this->tokens[$this->position])) {
-            throw new SyntaxError('Unexpected end of expression.', $this->current->cursor, $this->expression);
+            throw new SyntaxError('Unexpected end of expression', $this->current->cursor, $this->expression);
         }
 
         $this->current = $this->tokens[$this->position];
@@ -70,7 +70,7 @@ class TokenStream
     {
         $token = $this->current;
         if (!$token->test($type, $value)) {
-            throw new SyntaxError(sprintf('%sUnexpected token "%s" of value "%s" ("%s" expected%s).', $message ? $message.'. ' : '', $token->type, $token->value, $type, $value ? sprintf(' with value "%s"', $value) : ''), $token->cursor, $this->expression);
+            throw new SyntaxError(sprintf('%sUnexpected token "%s" of value "%s" ("%s" expected%s)', $message ? $message.'. ' : '', $token->type, $token->value, $type, $value ? sprintf(' with value "%s"', $value) : ''), $token->cursor, $this->expression);
         }
         $this->next();
     }
diff --git a/advancedcontentfilter/vendor/symfony/expression-language/composer.json b/advancedcontentfilter/vendor/symfony/expression-language/composer.json
index 5d5825b9..5f662ffd 100644
--- a/advancedcontentfilter/vendor/symfony/expression-language/composer.json
+++ b/advancedcontentfilter/vendor/symfony/expression-language/composer.json
@@ -17,8 +17,7 @@
     ],
     "require": {
         "php": "^5.5.9|>=7.0.8",
-        "symfony/cache": "~3.1|~4.0",
-        "symfony/polyfill-php70": "~1.6"
+        "symfony/cache": "~3.1|~4.0"
     },
     "autoload": {
         "psr-4": { "Symfony\\Component\\ExpressionLanguage\\": "" },
@@ -26,5 +25,10 @@
             "/Tests/"
         ]
     },
-    "minimum-stability": "dev"
+    "minimum-stability": "dev",
+    "extra": {
+        "branch-alias": {
+            "dev-master": "3.4-dev"
+        }
+    }
 }
diff --git a/advancedcontentfilter/vendor/symfony/expression-language/phpunit.xml.dist b/advancedcontentfilter/vendor/symfony/expression-language/phpunit.xml.dist
index ae84dcd9..517322fb 100644
--- a/advancedcontentfilter/vendor/symfony/expression-language/phpunit.xml.dist
+++ b/advancedcontentfilter/vendor/symfony/expression-language/phpunit.xml.dist
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/5.2/phpunit.xsd"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
          backupGlobals="false"
          colors="true"
          bootstrap="vendor/autoload.php"
diff --git a/advancedcontentfilter/vendor/symfony/polyfill-apcu/Apcu.php b/advancedcontentfilter/vendor/symfony/polyfill-apcu/Apcu.php
index 4dc5bf9a..595f6010 100644
--- a/advancedcontentfilter/vendor/symfony/polyfill-apcu/Apcu.php
+++ b/advancedcontentfilter/vendor/symfony/polyfill-apcu/Apcu.php
@@ -23,11 +23,11 @@ final class Apcu
 {
     public static function apcu_add($key, $var = null, $ttl = 0)
     {
-        if (!\is_array($key)) {
+        if (!is_array($key)) {
             return apc_add($key, $var, $ttl);
         }
 
-        $errors = [];
+        $errors = array();
         foreach ($key as $k => $v) {
             if (!apc_add($k, $v, $ttl)) {
                 $errors[$k] = -1;
@@ -39,11 +39,11 @@ final class Apcu
 
     public static function apcu_store($key, $var = null, $ttl = 0)
     {
-        if (!\is_array($key)) {
+        if (!is_array($key)) {
             return apc_store($key, $var, $ttl);
         }
 
-        $errors = [];
+        $errors = array();
         foreach ($key as $k => $v) {
             if (!apc_store($k, $v, $ttl)) {
                 $errors[$k] = -1;
@@ -55,11 +55,11 @@ final class Apcu
 
     public static function apcu_exists($keys)
     {
-        if (!\is_array($keys)) {
+        if (!is_array($keys)) {
             return apc_exists($keys);
         }
 
-        $existing = [];
+        $existing = array();
         foreach ($keys as $k) {
             if (apc_exists($k)) {
                 $existing[$k] = true;
@@ -71,12 +71,12 @@ final class Apcu
 
     public static function apcu_fetch($key, &$success = null)
     {
-        if (!\is_array($key)) {
+        if (!is_array($key)) {
             return apc_fetch($key, $success);
         }
 
         $succeeded = true;
-        $values = [];
+        $values = array();
         foreach ($key as $k) {
             $v = apc_fetch($k, $success);
             if ($success) {
@@ -92,7 +92,7 @@ final class Apcu
 
     public static function apcu_delete($key)
     {
-        if (!\is_array($key)) {
+        if (!is_array($key)) {
             return apc_delete($key);
         }
 
diff --git a/advancedcontentfilter/vendor/symfony/polyfill-apcu/LICENSE b/advancedcontentfilter/vendor/symfony/polyfill-apcu/LICENSE
index 6e3afce6..24fa32c2 100644
--- a/advancedcontentfilter/vendor/symfony/polyfill-apcu/LICENSE
+++ b/advancedcontentfilter/vendor/symfony/polyfill-apcu/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2015-present Fabien Potencier
+Copyright (c) 2015-2018 Fabien Potencier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/advancedcontentfilter/vendor/symfony/polyfill-apcu/README.md b/advancedcontentfilter/vendor/symfony/polyfill-apcu/README.md
index 57f4bf6b..e614bcab 100644
--- a/advancedcontentfilter/vendor/symfony/polyfill-apcu/README.md
+++ b/advancedcontentfilter/vendor/symfony/polyfill-apcu/README.md
@@ -1,10 +1,10 @@
 Symfony Polyfill / APCu
 ========================
 
-This component provides `apcu_*` functions and the `APCuIterator` class to users of the legacy APC extension.
+This component provides `apcu_*` functions and the `APCUIterator` class to users of the legacy APC extension.
 
 More information can be found in the
-[main Polyfill README](https://github.com/symfony/polyfill/blob/main/README.md).
+[main Polyfill README](https://github.com/symfony/polyfill/blob/master/README.md).
 
 License
 =======
diff --git a/advancedcontentfilter/vendor/symfony/polyfill-apcu/bootstrap.php b/advancedcontentfilter/vendor/symfony/polyfill-apcu/bootstrap.php
index 96b2706a..305183b6 100644
--- a/advancedcontentfilter/vendor/symfony/polyfill-apcu/bootstrap.php
+++ b/advancedcontentfilter/vendor/symfony/polyfill-apcu/bootstrap.php
@@ -15,67 +15,32 @@ if (!extension_loaded('apc') && !extension_loaded('apcu')) {
     return;
 }
 
-if (\PHP_VERSION_ID >= 80000) {
-    return require __DIR__.'/bootstrap80.php';
-}
-
-if (extension_loaded('Zend Data Cache')) {
-    if (!function_exists('apcu_add')) {
-        function apcu_add($key, $value = null, $ttl = 0) { return p\Apcu::apcu_add($key, $value, $ttl); }
-    }
-    if (!function_exists('apcu_delete')) {
+if (!function_exists('apcu_add')) {
+    if (extension_loaded('Zend Data Cache')) {
+        function apcu_add($key, $var = null, $ttl = 0) { return p\Apcu::apcu_add($key, $var, $ttl); }
         function apcu_delete($key) { return p\Apcu::apcu_delete($key); }
-    }
-    if (!function_exists('apcu_exists')) {
-        function apcu_exists($key) { return p\Apcu::apcu_exists($key); }
-    }
-    if (!function_exists('apcu_fetch')) {
+        function apcu_exists($keys) { return p\Apcu::apcu_exists($keys); }
         function apcu_fetch($key, &$success = null) { return p\Apcu::apcu_fetch($key, $success); }
-    }
-    if (!function_exists('apcu_store')) {
-        function apcu_store($key, $value = null, $ttl = 0) { return p\Apcu::apcu_store($key, $value, $ttl); }
-    }
-} else {
-    if (!function_exists('apcu_add')) {
-        function apcu_add($key, $value = null, $ttl = 0) { return apc_add($key, $value, $ttl); }
-    }
-    if (!function_exists('apcu_delete')) {
+        function apcu_store($key, $var = null, $ttl = 0) { return p\Apcu::apcu_store($key, $var, $ttl); }
+    } else {
+        function apcu_add($key, $var = null, $ttl = 0) { return apc_add($key, $var, $ttl); }
         function apcu_delete($key) { return apc_delete($key); }
-    }
-    if (!function_exists('apcu_exists')) {
-        function apcu_exists($key) { return apc_exists($key); }
-    }
-    if (!function_exists('apcu_fetch')) {
+        function apcu_exists($keys) { return apc_exists($keys); }
         function apcu_fetch($key, &$success = null) { return apc_fetch($key, $success); }
+        function apcu_store($key, $var = null, $ttl = 0) { return apc_store($key, $var, $ttl); }
     }
-    if (!function_exists('apcu_store')) {
-        function apcu_store($key, $value = null, $ttl = 0) { return apc_store($key, $value, $ttl); }
-    }
-}
-
-if (!function_exists('apcu_cache_info')) {
     function apcu_cache_info($limited = false) { return apc_cache_info('user', $limited); }
-}
-if (!function_exists('apcu_cas')) {
     function apcu_cas($key, $old, $new) { return apc_cas($key, $old, $new); }
-}
-if (!function_exists('apcu_clear_cache')) {
     function apcu_clear_cache() { return apc_clear_cache('user'); }
-}
-if (!function_exists('apcu_dec')) {
     function apcu_dec($key, $step = 1, &$success = false) { return apc_dec($key, $step, $success); }
-}
-if (!function_exists('apcu_inc')) {
     function apcu_inc($key, $step = 1, &$success = false) { return apc_inc($key, $step, $success); }
-}
-if (!function_exists('apcu_sma_info')) {
     function apcu_sma_info($limited = false) { return apc_sma_info($limited); }
 }
 
-if (!class_exists('APCuIterator', false) && class_exists('APCIterator', false)) {
-    class APCuIterator extends APCIterator
+if (!class_exists('APCUIterator', false) && class_exists('APCIterator', false)) {
+    class APCUIterator extends APCIterator
     {
-        public function __construct($search = null, $format = \APC_ITER_ALL, $chunk_size = 100, $list = \APC_LIST_ACTIVE)
+        public function __construct($search = null, $format = APC_ITER_ALL, $chunk_size = 100, $list = APC_LIST_ACTIVE)
         {
             parent::__construct('user', $search, $format, $chunk_size, $list);
         }
diff --git a/advancedcontentfilter/vendor/symfony/polyfill-apcu/bootstrap80.php b/advancedcontentfilter/vendor/symfony/polyfill-apcu/bootstrap80.php
deleted file mode 100644
index 69e9f160..00000000
--- a/advancedcontentfilter/vendor/symfony/polyfill-apcu/bootstrap80.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-use Symfony\Polyfill\Apcu as p;
-
-if (extension_loaded('Zend Data Cache')) {
-    if (!function_exists('apcu_add')) {
-        function apcu_add($key, mixed $value, ?int $ttl = 0): array|bool { return p\Apcu::apcu_add($key, $value, (int) $ttl); }
-    }
-    if (!function_exists('apcu_delete')) {
-        function apcu_delete($key): array|bool { return p\Apcu::apcu_delete($key); }
-    }
-    if (!function_exists('apcu_exists')) {
-        function apcu_exists($key): array|bool { return p\Apcu::apcu_exists($key); }
-    }
-    if (!function_exists('apcu_fetch')) {
-        function apcu_fetch($key, &$success = null): mixed { return p\Apcu::apcu_fetch($key, $success); }
-    }
-    if (!function_exists('apcu_store')) {
-        function apcu_store($key, mixed $value, ?int $ttl = 0): array|bool { return p\Apcu::apcu_store($key, $value, (int) $ttl); }
-    }
-} else {
-    if (!function_exists('apcu_add')) {
-        function apcu_add($key, mixed $value, ?int $ttl = 0): array|bool { return apc_add($key, $value, (int) $ttl); }
-    }
-    if (!function_exists('apcu_delete')) {
-        function apcu_delete($key): array|bool { return apc_delete($key); }
-    }
-    if (!function_exists('apcu_exists')) {
-        function apcu_exists($key): array|bool { return apc_exists($key); }
-    }
-    if (!function_exists('apcu_fetch')) {
-        function apcu_fetch($key, &$success = null) { return apc_fetch($key, $success); }
-    }
-    if (!function_exists('apcu_store')) {
-        function apcu_store($key, mixed $value, ?int $ttl = 0): array|bool { return apc_store($key, $value, (int) $ttl); }
-    }
-}
-
-if (!function_exists('apcu_cache_info')) {
-    function apcu_cache_info($limited = false) { return apc_cache_info('user', $limited); }
-}
-if (!function_exists('apcu_cas')) {
-    function apcu_cas($key, $old, $new) { return apc_cas($key, $old, $new); }
-}
-if (!function_exists('apcu_clear_cache')) {
-    function apcu_clear_cache() { return apc_clear_cache('user'); }
-}
-if (!function_exists('apcu_dec')) {
-    function apcu_dec($key, $step = 1, &$success = false) { return apc_dec($key, $step, $success); }
-}
-if (!function_exists('apcu_inc')) {
-    function apcu_inc($key, $step = 1, &$success = false) { return apc_inc($key, $step, $success); }
-}
-if (!function_exists('apcu_sma_info')) {
-    function apcu_sma_info($limited = false) { return apc_sma_info($limited); }
-}
-
-if (!class_exists('APCuIterator', false) && class_exists('APCIterator', false)) {
-    class APCuIterator extends APCIterator
-    {
-        public function __construct($search = null, $format = APC_ITER_ALL, $chunk_size = 100, $list = APC_LIST_ACTIVE)
-        {
-            parent::__construct('user', $search, $format, $chunk_size, $list);
-        }
-    }
-}
diff --git a/advancedcontentfilter/vendor/symfony/polyfill-apcu/composer.json b/advancedcontentfilter/vendor/symfony/polyfill-apcu/composer.json
index e92524f3..54ea2b85 100644
--- a/advancedcontentfilter/vendor/symfony/polyfill-apcu/composer.json
+++ b/advancedcontentfilter/vendor/symfony/polyfill-apcu/composer.json
@@ -16,7 +16,7 @@
         }
     ],
     "require": {
-        "php": ">=7.1"
+        "php": ">=5.3.3"
     },
     "autoload": {
         "psr-4": { "Symfony\\Polyfill\\Apcu\\": "" },
@@ -25,11 +25,7 @@
     "minimum-stability": "dev",
     "extra": {
         "branch-alias": {
-            "dev-main": "1.28-dev"
-        },
-        "thanks": {
-            "name": "symfony/polyfill",
-            "url": "https://github.com/symfony/polyfill"
+            "dev-master": "1.7-dev"
         }
     }
 }
diff --git a/advancedcontentfilter/vendor/symfony/polyfill-php73/LICENSE b/advancedcontentfilter/vendor/symfony/polyfill-php73/LICENSE
deleted file mode 100644
index 7536caea..00000000
--- a/advancedcontentfilter/vendor/symfony/polyfill-php73/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2018-present Fabien Potencier
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is furnished
-to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
diff --git a/advancedcontentfilter/vendor/symfony/polyfill-php73/Php73.php b/advancedcontentfilter/vendor/symfony/polyfill-php73/Php73.php
deleted file mode 100644
index 65c35a6a..00000000
--- a/advancedcontentfilter/vendor/symfony/polyfill-php73/Php73.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Polyfill\Php73;
-
-/**
- * @author Gabriel Caruso <carusogabriel34@gmail.com>
- * @author Ion Bazan <ion.bazan@gmail.com>
- *
- * @internal
- */
-final class Php73
-{
-    public static $startAt = 1533462603;
-
-    /**
-     * @param bool $asNum
-     *
-     * @return array|float|int
-     */
-    public static function hrtime($asNum = false)
-    {
-        $ns = microtime(false);
-        $s = substr($ns, 11) - self::$startAt;
-        $ns = 1E9 * (float) $ns;
-
-        if ($asNum) {
-            $ns += $s * 1E9;
-
-            return \PHP_INT_SIZE === 4 ? $ns : (int) $ns;
-        }
-
-        return [$s, (int) $ns];
-    }
-}
diff --git a/advancedcontentfilter/vendor/symfony/polyfill-php73/README.md b/advancedcontentfilter/vendor/symfony/polyfill-php73/README.md
deleted file mode 100644
index 032fafbd..00000000
--- a/advancedcontentfilter/vendor/symfony/polyfill-php73/README.md
+++ /dev/null
@@ -1,18 +0,0 @@
-Symfony Polyfill / Php73
-========================
-
-This component provides functions added to PHP 7.3 core:
-
-- [`array_key_first`](https://php.net/array_key_first)
-- [`array_key_last`](https://php.net/array_key_last)
-- [`hrtime`](https://php.net/function.hrtime)
-- [`is_countable`](https://php.net/is_countable)
-- [`JsonException`](https://php.net/JsonException)
-
-More information can be found in the
-[main Polyfill README](https://github.com/symfony/polyfill/blob/main/README.md).
-
-License
-=======
-
-This library is released under the [MIT license](LICENSE).
diff --git a/advancedcontentfilter/vendor/symfony/polyfill-php73/Resources/stubs/JsonException.php b/advancedcontentfilter/vendor/symfony/polyfill-php73/Resources/stubs/JsonException.php
deleted file mode 100644
index f06d6c26..00000000
--- a/advancedcontentfilter/vendor/symfony/polyfill-php73/Resources/stubs/JsonException.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-if (\PHP_VERSION_ID < 70300) {
-    class JsonException extends Exception
-    {
-    }
-}
diff --git a/advancedcontentfilter/vendor/symfony/polyfill-php73/bootstrap.php b/advancedcontentfilter/vendor/symfony/polyfill-php73/bootstrap.php
deleted file mode 100644
index d6b21538..00000000
--- a/advancedcontentfilter/vendor/symfony/polyfill-php73/bootstrap.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-use Symfony\Polyfill\Php73 as p;
-
-if (\PHP_VERSION_ID >= 70300) {
-    return;
-}
-
-if (!function_exists('is_countable')) {
-    function is_countable($value) { return is_array($value) || $value instanceof Countable || $value instanceof ResourceBundle || $value instanceof SimpleXmlElement; }
-}
-if (!function_exists('hrtime')) {
-    require_once __DIR__.'/Php73.php';
-    p\Php73::$startAt = (int) microtime(true);
-    function hrtime($as_number = false) { return p\Php73::hrtime($as_number); }
-}
-if (!function_exists('array_key_first')) {
-    function array_key_first(array $array) { foreach ($array as $key => $value) { return $key; } }
-}
-if (!function_exists('array_key_last')) {
-    function array_key_last(array $array) { return key(array_slice($array, -1, 1, true)); }
-}
diff --git a/advancedcontentfilter/vendor/symfony/polyfill-php73/composer.json b/advancedcontentfilter/vendor/symfony/polyfill-php73/composer.json
deleted file mode 100644
index 3d47d154..00000000
--- a/advancedcontentfilter/vendor/symfony/polyfill-php73/composer.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-    "name": "symfony/polyfill-php73",
-    "type": "library",
-    "description": "Symfony polyfill backporting some PHP 7.3+ features to lower PHP versions",
-    "keywords": ["polyfill", "shim", "compatibility", "portable"],
-    "homepage": "https://symfony.com",
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "Nicolas Grekas",
-            "email": "p@tchwork.com"
-        },
-        {
-            "name": "Symfony Community",
-            "homepage": "https://symfony.com/contributors"
-        }
-    ],
-    "require": {
-        "php": ">=7.1"
-    },
-    "autoload": {
-        "psr-4": { "Symfony\\Polyfill\\Php73\\": "" },
-        "files": [ "bootstrap.php" ],
-        "classmap": [ "Resources/stubs" ]
-    },
-    "minimum-stability": "dev",
-    "extra": {
-        "thanks": {
-            "name": "symfony/polyfill",
-            "url": "https://github.com/symfony/polyfill"
-        }
-    }
-}
diff --git a/advancedcontentfilter/vendor/symfony/polyfill-php80/LICENSE b/advancedcontentfilter/vendor/symfony/polyfill-php80/LICENSE
deleted file mode 100644
index 0ed3a246..00000000
--- a/advancedcontentfilter/vendor/symfony/polyfill-php80/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2020-present Fabien Potencier
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is furnished
-to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
diff --git a/advancedcontentfilter/vendor/symfony/polyfill-php80/Php80.php b/advancedcontentfilter/vendor/symfony/polyfill-php80/Php80.php
deleted file mode 100644
index 362dd1a9..00000000
--- a/advancedcontentfilter/vendor/symfony/polyfill-php80/Php80.php
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Polyfill\Php80;
-
-/**
- * @author Ion Bazan <ion.bazan@gmail.com>
- * @author Nico Oelgart <nicoswd@gmail.com>
- * @author Nicolas Grekas <p@tchwork.com>
- *
- * @internal
- */
-final class Php80
-{
-    public static function fdiv(float $dividend, float $divisor): float
-    {
-        return @($dividend / $divisor);
-    }
-
-    public static function get_debug_type($value): string
-    {
-        switch (true) {
-            case null === $value: return 'null';
-            case \is_bool($value): return 'bool';
-            case \is_string($value): return 'string';
-            case \is_array($value): return 'array';
-            case \is_int($value): return 'int';
-            case \is_float($value): return 'float';
-            case \is_object($value): break;
-            case $value instanceof \__PHP_Incomplete_Class: return '__PHP_Incomplete_Class';
-            default:
-                if (null === $type = @get_resource_type($value)) {
-                    return 'unknown';
-                }
-
-                if ('Unknown' === $type) {
-                    $type = 'closed';
-                }
-
-                return "resource ($type)";
-        }
-
-        $class = \get_class($value);
-
-        if (false === strpos($class, '@')) {
-            return $class;
-        }
-
-        return (get_parent_class($class) ?: key(class_implements($class)) ?: 'class').'@anonymous';
-    }
-
-    public static function get_resource_id($res): int
-    {
-        if (!\is_resource($res) && null === @get_resource_type($res)) {
-            throw new \TypeError(sprintf('Argument 1 passed to get_resource_id() must be of the type resource, %s given', get_debug_type($res)));
-        }
-
-        return (int) $res;
-    }
-
-    public static function preg_last_error_msg(): string
-    {
-        switch (preg_last_error()) {
-            case \PREG_INTERNAL_ERROR:
-                return 'Internal error';
-            case \PREG_BAD_UTF8_ERROR:
-                return 'Malformed UTF-8 characters, possibly incorrectly encoded';
-            case \PREG_BAD_UTF8_OFFSET_ERROR:
-                return 'The offset did not correspond to the beginning of a valid UTF-8 code point';
-            case \PREG_BACKTRACK_LIMIT_ERROR:
-                return 'Backtrack limit exhausted';
-            case \PREG_RECURSION_LIMIT_ERROR:
-                return 'Recursion limit exhausted';
-            case \PREG_JIT_STACKLIMIT_ERROR:
-                return 'JIT stack limit exhausted';
-            case \PREG_NO_ERROR:
-                return 'No error';
-            default:
-                return 'Unknown error';
-        }
-    }
-
-    public static function str_contains(string $haystack, string $needle): bool
-    {
-        return '' === $needle || false !== strpos($haystack, $needle);
-    }
-
-    public static function str_starts_with(string $haystack, string $needle): bool
-    {
-        return 0 === strncmp($haystack, $needle, \strlen($needle));
-    }
-
-    public static function str_ends_with(string $haystack, string $needle): bool
-    {
-        if ('' === $needle || $needle === $haystack) {
-            return true;
-        }
-
-        if ('' === $haystack) {
-            return false;
-        }
-
-        $needleLength = \strlen($needle);
-
-        return $needleLength <= \strlen($haystack) && 0 === substr_compare($haystack, $needle, -$needleLength);
-    }
-}
diff --git a/advancedcontentfilter/vendor/symfony/polyfill-php80/PhpToken.php b/advancedcontentfilter/vendor/symfony/polyfill-php80/PhpToken.php
deleted file mode 100644
index fe6e6910..00000000
--- a/advancedcontentfilter/vendor/symfony/polyfill-php80/PhpToken.php
+++ /dev/null
@@ -1,103 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Polyfill\Php80;
-
-/**
- * @author Fedonyuk Anton <info@ensostudio.ru>
- *
- * @internal
- */
-class PhpToken implements \Stringable
-{
-    /**
-     * @var int
-     */
-    public $id;
-
-    /**
-     * @var string
-     */
-    public $text;
-
-    /**
-     * @var int
-     */
-    public $line;
-
-    /**
-     * @var int
-     */
-    public $pos;
-
-    public function __construct(int $id, string $text, int $line = -1, int $position = -1)
-    {
-        $this->id = $id;
-        $this->text = $text;
-        $this->line = $line;
-        $this->pos = $position;
-    }
-
-    public function getTokenName(): ?string
-    {
-        if ('UNKNOWN' === $name = token_name($this->id)) {
-            $name = \strlen($this->text) > 1 || \ord($this->text) < 32 ? null : $this->text;
-        }
-
-        return $name;
-    }
-
-    /**
-     * @param int|string|array $kind
-     */
-    public function is($kind): bool
-    {
-        foreach ((array) $kind as $value) {
-            if (\in_array($value, [$this->id, $this->text], true)) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    public function isIgnorable(): bool
-    {
-        return \in_array($this->id, [\T_WHITESPACE, \T_COMMENT, \T_DOC_COMMENT, \T_OPEN_TAG], true);
-    }
-
-    public function __toString(): string
-    {
-        return (string) $this->text;
-    }
-
-    /**
-     * @return static[]
-     */
-    public static function tokenize(string $code, int $flags = 0): array
-    {
-        $line = 1;
-        $position = 0;
-        $tokens = token_get_all($code, $flags);
-        foreach ($tokens as $index => $token) {
-            if (\is_string($token)) {
-                $id = \ord($token);
-                $text = $token;
-            } else {
-                [$id, $text, $line] = $token;
-            }
-            $tokens[$index] = new static($id, $text, $line, $position);
-            $position += \strlen($text);
-        }
-
-        return $tokens;
-    }
-}
diff --git a/advancedcontentfilter/vendor/symfony/polyfill-php80/README.md b/advancedcontentfilter/vendor/symfony/polyfill-php80/README.md
deleted file mode 100644
index 3816c559..00000000
--- a/advancedcontentfilter/vendor/symfony/polyfill-php80/README.md
+++ /dev/null
@@ -1,25 +0,0 @@
-Symfony Polyfill / Php80
-========================
-
-This component provides features added to PHP 8.0 core:
-
-- [`Stringable`](https://php.net/stringable) interface
-- [`fdiv`](https://php.net/fdiv)
-- [`ValueError`](https://php.net/valueerror) class
-- [`UnhandledMatchError`](https://php.net/unhandledmatcherror) class
-- `FILTER_VALIDATE_BOOL` constant
-- [`get_debug_type`](https://php.net/get_debug_type)
-- [`PhpToken`](https://php.net/phptoken) class
-- [`preg_last_error_msg`](https://php.net/preg_last_error_msg)
-- [`str_contains`](https://php.net/str_contains)
-- [`str_starts_with`](https://php.net/str_starts_with)
-- [`str_ends_with`](https://php.net/str_ends_with)
-- [`get_resource_id`](https://php.net/get_resource_id)
-
-More information can be found in the
-[main Polyfill README](https://github.com/symfony/polyfill/blob/main/README.md).
-
-License
-=======
-
-This library is released under the [MIT license](LICENSE).
diff --git a/advancedcontentfilter/vendor/symfony/polyfill-php80/Resources/stubs/Attribute.php b/advancedcontentfilter/vendor/symfony/polyfill-php80/Resources/stubs/Attribute.php
deleted file mode 100644
index 2b955423..00000000
--- a/advancedcontentfilter/vendor/symfony/polyfill-php80/Resources/stubs/Attribute.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-#[Attribute(Attribute::TARGET_CLASS)]
-final class Attribute
-{
-    public const TARGET_CLASS = 1;
-    public const TARGET_FUNCTION = 2;
-    public const TARGET_METHOD = 4;
-    public const TARGET_PROPERTY = 8;
-    public const TARGET_CLASS_CONSTANT = 16;
-    public const TARGET_PARAMETER = 32;
-    public const TARGET_ALL = 63;
-    public const IS_REPEATABLE = 64;
-
-    /** @var int */
-    public $flags;
-
-    public function __construct(int $flags = self::TARGET_ALL)
-    {
-        $this->flags = $flags;
-    }
-}
diff --git a/advancedcontentfilter/vendor/symfony/polyfill-php80/Resources/stubs/PhpToken.php b/advancedcontentfilter/vendor/symfony/polyfill-php80/Resources/stubs/PhpToken.php
deleted file mode 100644
index bd1212f6..00000000
--- a/advancedcontentfilter/vendor/symfony/polyfill-php80/Resources/stubs/PhpToken.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-if (\PHP_VERSION_ID < 80000 && extension_loaded('tokenizer')) {
-    class PhpToken extends Symfony\Polyfill\Php80\PhpToken
-    {
-    }
-}
diff --git a/advancedcontentfilter/vendor/symfony/polyfill-php80/Resources/stubs/Stringable.php b/advancedcontentfilter/vendor/symfony/polyfill-php80/Resources/stubs/Stringable.php
deleted file mode 100644
index 7c62d750..00000000
--- a/advancedcontentfilter/vendor/symfony/polyfill-php80/Resources/stubs/Stringable.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-if (\PHP_VERSION_ID < 80000) {
-    interface Stringable
-    {
-        /**
-         * @return string
-         */
-        public function __toString();
-    }
-}
diff --git a/advancedcontentfilter/vendor/symfony/polyfill-php80/Resources/stubs/UnhandledMatchError.php b/advancedcontentfilter/vendor/symfony/polyfill-php80/Resources/stubs/UnhandledMatchError.php
deleted file mode 100644
index 01c6c6c8..00000000
--- a/advancedcontentfilter/vendor/symfony/polyfill-php80/Resources/stubs/UnhandledMatchError.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-if (\PHP_VERSION_ID < 80000) {
-    class UnhandledMatchError extends Error
-    {
-    }
-}
diff --git a/advancedcontentfilter/vendor/symfony/polyfill-php80/Resources/stubs/ValueError.php b/advancedcontentfilter/vendor/symfony/polyfill-php80/Resources/stubs/ValueError.php
deleted file mode 100644
index 783dbc28..00000000
--- a/advancedcontentfilter/vendor/symfony/polyfill-php80/Resources/stubs/ValueError.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-if (\PHP_VERSION_ID < 80000) {
-    class ValueError extends Error
-    {
-    }
-}
diff --git a/advancedcontentfilter/vendor/symfony/polyfill-php80/bootstrap.php b/advancedcontentfilter/vendor/symfony/polyfill-php80/bootstrap.php
deleted file mode 100644
index e5f7dbc1..00000000
--- a/advancedcontentfilter/vendor/symfony/polyfill-php80/bootstrap.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-use Symfony\Polyfill\Php80 as p;
-
-if (\PHP_VERSION_ID >= 80000) {
-    return;
-}
-
-if (!defined('FILTER_VALIDATE_BOOL') && defined('FILTER_VALIDATE_BOOLEAN')) {
-    define('FILTER_VALIDATE_BOOL', \FILTER_VALIDATE_BOOLEAN);
-}
-
-if (!function_exists('fdiv')) {
-    function fdiv(float $num1, float $num2): float { return p\Php80::fdiv($num1, $num2); }
-}
-if (!function_exists('preg_last_error_msg')) {
-    function preg_last_error_msg(): string { return p\Php80::preg_last_error_msg(); }
-}
-if (!function_exists('str_contains')) {
-    function str_contains(?string $haystack, ?string $needle): bool { return p\Php80::str_contains($haystack ?? '', $needle ?? ''); }
-}
-if (!function_exists('str_starts_with')) {
-    function str_starts_with(?string $haystack, ?string $needle): bool { return p\Php80::str_starts_with($haystack ?? '', $needle ?? ''); }
-}
-if (!function_exists('str_ends_with')) {
-    function str_ends_with(?string $haystack, ?string $needle): bool { return p\Php80::str_ends_with($haystack ?? '', $needle ?? ''); }
-}
-if (!function_exists('get_debug_type')) {
-    function get_debug_type($value): string { return p\Php80::get_debug_type($value); }
-}
-if (!function_exists('get_resource_id')) {
-    function get_resource_id($resource): int { return p\Php80::get_resource_id($resource); }
-}
diff --git a/advancedcontentfilter/vendor/symfony/polyfill-php80/composer.json b/advancedcontentfilter/vendor/symfony/polyfill-php80/composer.json
deleted file mode 100644
index 46ccde20..00000000
--- a/advancedcontentfilter/vendor/symfony/polyfill-php80/composer.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-    "name": "symfony/polyfill-php80",
-    "type": "library",
-    "description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions",
-    "keywords": ["polyfill", "shim", "compatibility", "portable"],
-    "homepage": "https://symfony.com",
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "Ion Bazan",
-            "email": "ion.bazan@gmail.com"
-        },
-        {
-            "name": "Nicolas Grekas",
-            "email": "p@tchwork.com"
-        },
-        {
-            "name": "Symfony Community",
-            "homepage": "https://symfony.com/contributors"
-        }
-    ],
-    "require": {
-        "php": ">=7.1"
-    },
-    "autoload": {
-        "psr-4": { "Symfony\\Polyfill\\Php80\\": "" },
-        "files": [ "bootstrap.php" ],
-        "classmap": [ "Resources/stubs" ]
-    },
-    "minimum-stability": "dev",
-    "extra": {
-        "thanks": {
-            "name": "symfony/polyfill",
-            "url": "https://github.com/symfony/polyfill"
-        }
-    }
-}
diff --git a/advancedcontentfilter/vendor/symfony/service-contracts/.gitignore b/advancedcontentfilter/vendor/symfony/service-contracts/.gitignore
deleted file mode 100644
index c49a5d8d..00000000
--- a/advancedcontentfilter/vendor/symfony/service-contracts/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-vendor/
-composer.lock
-phpunit.xml
diff --git a/advancedcontentfilter/vendor/symfony/service-contracts/Attribute/Required.php b/advancedcontentfilter/vendor/symfony/service-contracts/Attribute/Required.php
deleted file mode 100644
index 9df85118..00000000
--- a/advancedcontentfilter/vendor/symfony/service-contracts/Attribute/Required.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Contracts\Service\Attribute;
-
-/**
- * A required dependency.
- *
- * This attribute indicates that a property holds a required dependency. The annotated property or method should be
- * considered during the instantiation process of the containing class.
- *
- * @author Alexander M. Turek <me@derrabus.de>
- */
-#[\Attribute(\Attribute::TARGET_METHOD | \Attribute::TARGET_PROPERTY)]
-final class Required
-{
-}
diff --git a/advancedcontentfilter/vendor/symfony/service-contracts/Attribute/SubscribedService.php b/advancedcontentfilter/vendor/symfony/service-contracts/Attribute/SubscribedService.php
deleted file mode 100644
index 10d1bc38..00000000
--- a/advancedcontentfilter/vendor/symfony/service-contracts/Attribute/SubscribedService.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Contracts\Service\Attribute;
-
-use Symfony\Contracts\Service\ServiceSubscriberTrait;
-
-/**
- * Use with {@see ServiceSubscriberTrait} to mark a method's return type
- * as a subscribed service.
- *
- * @author Kevin Bond <kevinbond@gmail.com>
- */
-#[\Attribute(\Attribute::TARGET_METHOD)]
-final class SubscribedService
-{
-    /**
-     * @param string|null $key The key to use for the service
-     *                         If null, use "ClassName::methodName"
-     */
-    public function __construct(
-        public ?string $key = null
-    ) {
-    }
-}
diff --git a/advancedcontentfilter/vendor/symfony/service-contracts/CHANGELOG.md b/advancedcontentfilter/vendor/symfony/service-contracts/CHANGELOG.md
deleted file mode 100644
index 7932e261..00000000
--- a/advancedcontentfilter/vendor/symfony/service-contracts/CHANGELOG.md
+++ /dev/null
@@ -1,5 +0,0 @@
-CHANGELOG
-=========
-
-The changelog is maintained for all Symfony contracts at the following URL:
-https://github.com/symfony/contracts/blob/main/CHANGELOG.md
diff --git a/advancedcontentfilter/vendor/symfony/service-contracts/LICENSE b/advancedcontentfilter/vendor/symfony/service-contracts/LICENSE
deleted file mode 100644
index 74cdc2db..00000000
--- a/advancedcontentfilter/vendor/symfony/service-contracts/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2018-2022 Fabien Potencier
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is furnished
-to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
diff --git a/advancedcontentfilter/vendor/symfony/service-contracts/README.md b/advancedcontentfilter/vendor/symfony/service-contracts/README.md
deleted file mode 100644
index 41e054a1..00000000
--- a/advancedcontentfilter/vendor/symfony/service-contracts/README.md
+++ /dev/null
@@ -1,9 +0,0 @@
-Symfony Service Contracts
-=========================
-
-A set of abstractions extracted out of the Symfony components.
-
-Can be used to build on semantics that the Symfony components proved useful - and
-that already have battle tested implementations.
-
-See https://github.com/symfony/contracts/blob/main/README.md for more information.
diff --git a/advancedcontentfilter/vendor/symfony/service-contracts/ResetInterface.php b/advancedcontentfilter/vendor/symfony/service-contracts/ResetInterface.php
deleted file mode 100644
index 1af1075e..00000000
--- a/advancedcontentfilter/vendor/symfony/service-contracts/ResetInterface.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Contracts\Service;
-
-/**
- * Provides a way to reset an object to its initial state.
- *
- * When calling the "reset()" method on an object, it should be put back to its
- * initial state. This usually means clearing any internal buffers and forwarding
- * the call to internal dependencies. All properties of the object should be put
- * back to the same state it had when it was first ready to use.
- *
- * This method could be called, for example, to recycle objects that are used as
- * services, so that they can be used to handle several requests in the same
- * process loop (note that we advise making your services stateless instead of
- * implementing this interface when possible.)
- */
-interface ResetInterface
-{
-    public function reset();
-}
diff --git a/advancedcontentfilter/vendor/symfony/service-contracts/ServiceLocatorTrait.php b/advancedcontentfilter/vendor/symfony/service-contracts/ServiceLocatorTrait.php
deleted file mode 100644
index 74dfa436..00000000
--- a/advancedcontentfilter/vendor/symfony/service-contracts/ServiceLocatorTrait.php
+++ /dev/null
@@ -1,128 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Contracts\Service;
-
-use Psr\Container\ContainerExceptionInterface;
-use Psr\Container\NotFoundExceptionInterface;
-
-// Help opcache.preload discover always-needed symbols
-class_exists(ContainerExceptionInterface::class);
-class_exists(NotFoundExceptionInterface::class);
-
-/**
- * A trait to help implement ServiceProviderInterface.
- *
- * @author Robin Chalas <robin.chalas@gmail.com>
- * @author Nicolas Grekas <p@tchwork.com>
- */
-trait ServiceLocatorTrait
-{
-    private $factories;
-    private $loading = [];
-    private $providedTypes;
-
-    /**
-     * @param callable[] $factories
-     */
-    public function __construct(array $factories)
-    {
-        $this->factories = $factories;
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @return bool
-     */
-    public function has(string $id)
-    {
-        return isset($this->factories[$id]);
-    }
-
-    /**
-     * {@inheritdoc}
-     *
-     * @return mixed
-     */
-    public function get(string $id)
-    {
-        if (!isset($this->factories[$id])) {
-            throw $this->createNotFoundException($id);
-        }
-
-        if (isset($this->loading[$id])) {
-            $ids = array_values($this->loading);
-            $ids = \array_slice($this->loading, array_search($id, $ids));
-            $ids[] = $id;
-
-            throw $this->createCircularReferenceException($id, $ids);
-        }
-
-        $this->loading[$id] = $id;
-        try {
-            return $this->factories[$id]($this);
-        } finally {
-            unset($this->loading[$id]);
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getProvidedServices(): array
-    {
-        if (null === $this->providedTypes) {
-            $this->providedTypes = [];
-
-            foreach ($this->factories as $name => $factory) {
-                if (!\is_callable($factory)) {
-                    $this->providedTypes[$name] = '?';
-                } else {
-                    $type = (new \ReflectionFunction($factory))->getReturnType();
-
-                    $this->providedTypes[$name] = $type ? ($type->allowsNull() ? '?' : '').($type instanceof \ReflectionNamedType ? $type->getName() : $type) : '?';
-                }
-            }
-        }
-
-        return $this->providedTypes;
-    }
-
-    private function createNotFoundException(string $id): NotFoundExceptionInterface
-    {
-        if (!$alternatives = array_keys($this->factories)) {
-            $message = 'is empty...';
-        } else {
-            $last = array_pop($alternatives);
-            if ($alternatives) {
-                $message = sprintf('only knows about the "%s" and "%s" services.', implode('", "', $alternatives), $last);
-            } else {
-                $message = sprintf('only knows about the "%s" service.', $last);
-            }
-        }
-
-        if ($this->loading) {
-            $message = sprintf('The service "%s" has a dependency on a non-existent service "%s". This locator %s', end($this->loading), $id, $message);
-        } else {
-            $message = sprintf('Service "%s" not found: the current service locator %s', $id, $message);
-        }
-
-        return new class($message) extends \InvalidArgumentException implements NotFoundExceptionInterface {
-        };
-    }
-
-    private function createCircularReferenceException(string $id, array $path): ContainerExceptionInterface
-    {
-        return new class(sprintf('Circular reference detected for service "%s", path: "%s".', $id, implode(' -> ', $path))) extends \RuntimeException implements ContainerExceptionInterface {
-        };
-    }
-}
diff --git a/advancedcontentfilter/vendor/symfony/service-contracts/ServiceProviderInterface.php b/advancedcontentfilter/vendor/symfony/service-contracts/ServiceProviderInterface.php
deleted file mode 100644
index c60ad0bd..00000000
--- a/advancedcontentfilter/vendor/symfony/service-contracts/ServiceProviderInterface.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Contracts\Service;
-
-use Psr\Container\ContainerInterface;
-
-/**
- * A ServiceProviderInterface exposes the identifiers and the types of services provided by a container.
- *
- * @author Nicolas Grekas <p@tchwork.com>
- * @author Mateusz Sip <mateusz.sip@gmail.com>
- */
-interface ServiceProviderInterface extends ContainerInterface
-{
-    /**
-     * Returns an associative array of service types keyed by the identifiers provided by the current container.
-     *
-     * Examples:
-     *
-     *  * ['logger' => 'Psr\Log\LoggerInterface'] means the object provides a service named "logger" that implements Psr\Log\LoggerInterface
-     *  * ['foo' => '?'] means the container provides service name "foo" of unspecified type
-     *  * ['bar' => '?Bar\Baz'] means the container provides a service "bar" of type Bar\Baz|null
-     *
-     * @return string[] The provided service types, keyed by service names
-     */
-    public function getProvidedServices(): array;
-}
diff --git a/advancedcontentfilter/vendor/symfony/service-contracts/ServiceSubscriberInterface.php b/advancedcontentfilter/vendor/symfony/service-contracts/ServiceSubscriberInterface.php
deleted file mode 100644
index 098ab908..00000000
--- a/advancedcontentfilter/vendor/symfony/service-contracts/ServiceSubscriberInterface.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Contracts\Service;
-
-/**
- * A ServiceSubscriber exposes its dependencies via the static {@link getSubscribedServices} method.
- *
- * The getSubscribedServices method returns an array of service types required by such instances,
- * optionally keyed by the service names used internally. Service types that start with an interrogation
- * mark "?" are optional, while the other ones are mandatory service dependencies.
- *
- * The injected service locators SHOULD NOT allow access to any other services not specified by the method.
- *
- * It is expected that ServiceSubscriber instances consume PSR-11-based service locators internally.
- * This interface does not dictate any injection method for these service locators, although constructor
- * injection is recommended.
- *
- * @author Nicolas Grekas <p@tchwork.com>
- */
-interface ServiceSubscriberInterface
-{
-    /**
-     * Returns an array of service types required by such instances, optionally keyed by the service names used internally.
-     *
-     * For mandatory dependencies:
-     *
-     *  * ['logger' => 'Psr\Log\LoggerInterface'] means the objects use the "logger" name
-     *    internally to fetch a service which must implement Psr\Log\LoggerInterface.
-     *  * ['loggers' => 'Psr\Log\LoggerInterface[]'] means the objects use the "loggers" name
-     *    internally to fetch an iterable of Psr\Log\LoggerInterface instances.
-     *  * ['Psr\Log\LoggerInterface'] is a shortcut for
-     *  * ['Psr\Log\LoggerInterface' => 'Psr\Log\LoggerInterface']
-     *
-     * otherwise:
-     *
-     *  * ['logger' => '?Psr\Log\LoggerInterface'] denotes an optional dependency
-     *  * ['loggers' => '?Psr\Log\LoggerInterface[]'] denotes an optional iterable dependency
-     *  * ['?Psr\Log\LoggerInterface'] is a shortcut for
-     *  * ['Psr\Log\LoggerInterface' => '?Psr\Log\LoggerInterface']
-     *
-     * @return string[] The required service types, optionally keyed by service names
-     */
-    public static function getSubscribedServices();
-}
diff --git a/advancedcontentfilter/vendor/symfony/service-contracts/ServiceSubscriberTrait.php b/advancedcontentfilter/vendor/symfony/service-contracts/ServiceSubscriberTrait.php
deleted file mode 100644
index 16e3eb2c..00000000
--- a/advancedcontentfilter/vendor/symfony/service-contracts/ServiceSubscriberTrait.php
+++ /dev/null
@@ -1,109 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Contracts\Service;
-
-use Psr\Container\ContainerInterface;
-use Symfony\Contracts\Service\Attribute\SubscribedService;
-
-/**
- * Implementation of ServiceSubscriberInterface that determines subscribed services from
- * method return types. Service ids are available as "ClassName::methodName".
- *
- * @author Kevin Bond <kevinbond@gmail.com>
- */
-trait ServiceSubscriberTrait
-{
-    /** @var ContainerInterface */
-    protected $container;
-
-    /**
-     * {@inheritdoc}
-     */
-    public static function getSubscribedServices(): array
-    {
-        $services = method_exists(get_parent_class(self::class) ?: '', __FUNCTION__) ? parent::getSubscribedServices() : [];
-        $attributeOptIn = false;
-
-        if (\PHP_VERSION_ID >= 80000) {
-            foreach ((new \ReflectionClass(self::class))->getMethods() as $method) {
-                if (self::class !== $method->getDeclaringClass()->name) {
-                    continue;
-                }
-
-                if (!$attribute = $method->getAttributes(SubscribedService::class)[0] ?? null) {
-                    continue;
-                }
-
-                if ($method->isStatic() || $method->isAbstract() || $method->isGenerator() || $method->isInternal() || $method->getNumberOfRequiredParameters()) {
-                    throw new \LogicException(sprintf('Cannot use "%s" on method "%s::%s()" (can only be used on non-static, non-abstract methods with no parameters).', SubscribedService::class, self::class, $method->name));
-                }
-
-                if (!$returnType = $method->getReturnType()) {
-                    throw new \LogicException(sprintf('Cannot use "%s" on methods without a return type in "%s::%s()".', SubscribedService::class, $method->name, self::class));
-                }
-
-                $serviceId = $returnType instanceof \ReflectionNamedType ? $returnType->getName() : (string) $returnType;
-
-                if ($returnType->allowsNull()) {
-                    $serviceId = '?'.$serviceId;
-                }
-
-                $services[$attribute->newInstance()->key ?? self::class.'::'.$method->name] = $serviceId;
-                $attributeOptIn = true;
-            }
-        }
-
-        if (!$attributeOptIn) {
-            foreach ((new \ReflectionClass(self::class))->getMethods() as $method) {
-                if ($method->isStatic() || $method->isAbstract() || $method->isGenerator() || $method->isInternal() || $method->getNumberOfRequiredParameters()) {
-                    continue;
-                }
-
-                if (self::class !== $method->getDeclaringClass()->name) {
-                    continue;
-                }
-
-                if (!($returnType = $method->getReturnType()) instanceof \ReflectionNamedType) {
-                    continue;
-                }
-
-                if ($returnType->isBuiltin()) {
-                    continue;
-                }
-
-                if (\PHP_VERSION_ID >= 80000) {
-                    trigger_deprecation('symfony/service-contracts', '2.5', 'Using "%s" in "%s" without using the "%s" attribute on any method is deprecated.', ServiceSubscriberTrait::class, self::class, SubscribedService::class);
-                }
-
-                $services[self::class.'::'.$method->name] = '?'.($returnType instanceof \ReflectionNamedType ? $returnType->getName() : $returnType);
-            }
-        }
-
-        return $services;
-    }
-
-    /**
-     * @required
-     *
-     * @return ContainerInterface|null
-     */
-    public function setContainer(ContainerInterface $container)
-    {
-        $this->container = $container;
-
-        if (method_exists(get_parent_class(self::class) ?: '', __FUNCTION__)) {
-            return parent::setContainer($container);
-        }
-
-        return null;
-    }
-}
diff --git a/advancedcontentfilter/vendor/symfony/service-contracts/Test/ServiceLocatorTest.php b/advancedcontentfilter/vendor/symfony/service-contracts/Test/ServiceLocatorTest.php
deleted file mode 100644
index 2a1b565f..00000000
--- a/advancedcontentfilter/vendor/symfony/service-contracts/Test/ServiceLocatorTest.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Contracts\Service\Test;
-
-use PHPUnit\Framework\TestCase;
-use Psr\Container\ContainerInterface;
-use Symfony\Contracts\Service\ServiceLocatorTrait;
-
-abstract class ServiceLocatorTest extends TestCase
-{
-    /**
-     * @return ContainerInterface
-     */
-    protected function getServiceLocator(array $factories)
-    {
-        return new class($factories) implements ContainerInterface {
-            use ServiceLocatorTrait;
-        };
-    }
-
-    public function testHas()
-    {
-        $locator = $this->getServiceLocator([
-            'foo' => function () { return 'bar'; },
-            'bar' => function () { return 'baz'; },
-            function () { return 'dummy'; },
-        ]);
-
-        $this->assertTrue($locator->has('foo'));
-        $this->assertTrue($locator->has('bar'));
-        $this->assertFalse($locator->has('dummy'));
-    }
-
-    public function testGet()
-    {
-        $locator = $this->getServiceLocator([
-            'foo' => function () { return 'bar'; },
-            'bar' => function () { return 'baz'; },
-        ]);
-
-        $this->assertSame('bar', $locator->get('foo'));
-        $this->assertSame('baz', $locator->get('bar'));
-    }
-
-    public function testGetDoesNotMemoize()
-    {
-        $i = 0;
-        $locator = $this->getServiceLocator([
-            'foo' => function () use (&$i) {
-                ++$i;
-
-                return 'bar';
-            },
-        ]);
-
-        $this->assertSame('bar', $locator->get('foo'));
-        $this->assertSame('bar', $locator->get('foo'));
-        $this->assertSame(2, $i);
-    }
-
-    public function testThrowsOnUndefinedInternalService()
-    {
-        if (!$this->getExpectedException()) {
-            $this->expectException(\Psr\Container\NotFoundExceptionInterface::class);
-            $this->expectExceptionMessage('The service "foo" has a dependency on a non-existent service "bar". This locator only knows about the "foo" service.');
-        }
-        $locator = $this->getServiceLocator([
-            'foo' => function () use (&$locator) { return $locator->get('bar'); },
-        ]);
-
-        $locator->get('foo');
-    }
-
-    public function testThrowsOnCircularReference()
-    {
-        $this->expectException(\Psr\Container\ContainerExceptionInterface::class);
-        $this->expectExceptionMessage('Circular reference detected for service "bar", path: "bar -> baz -> bar".');
-        $locator = $this->getServiceLocator([
-            'foo' => function () use (&$locator) { return $locator->get('bar'); },
-            'bar' => function () use (&$locator) { return $locator->get('baz'); },
-            'baz' => function () use (&$locator) { return $locator->get('bar'); },
-        ]);
-
-        $locator->get('foo');
-    }
-}
diff --git a/advancedcontentfilter/vendor/symfony/service-contracts/composer.json b/advancedcontentfilter/vendor/symfony/service-contracts/composer.json
deleted file mode 100644
index f0586370..00000000
--- a/advancedcontentfilter/vendor/symfony/service-contracts/composer.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-    "name": "symfony/service-contracts",
-    "type": "library",
-    "description": "Generic abstractions related to writing services",
-    "keywords": ["abstractions", "contracts", "decoupling", "interfaces", "interoperability", "standards"],
-    "homepage": "https://symfony.com",
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "Nicolas Grekas",
-            "email": "p@tchwork.com"
-        },
-        {
-            "name": "Symfony Community",
-            "homepage": "https://symfony.com/contributors"
-        }
-    ],
-    "require": {
-        "php": ">=7.2.5",
-        "psr/container": "^1.1",
-        "symfony/deprecation-contracts": "^2.1|^3"
-    },
-    "conflict": {
-        "ext-psr": "<1.1|>=2"
-    },
-    "suggest": {
-        "symfony/service-implementation": ""
-    },
-    "autoload": {
-        "psr-4": { "Symfony\\Contracts\\Service\\": "" }
-    },
-    "minimum-stability": "dev",
-    "extra": {
-        "branch-alias": {
-            "dev-main": "2.5-dev"
-        },
-        "thanks": {
-            "name": "symfony/contracts",
-            "url": "https://github.com/symfony/contracts"
-        }
-    }
-}
diff --git a/advancedcontentfilter/vendor/symfony/var-exporter/CHANGELOG.md b/advancedcontentfilter/vendor/symfony/var-exporter/CHANGELOG.md
deleted file mode 100644
index 3406c30e..00000000
--- a/advancedcontentfilter/vendor/symfony/var-exporter/CHANGELOG.md
+++ /dev/null
@@ -1,12 +0,0 @@
-CHANGELOG
-=========
-
-5.1.0
------
-
- * added argument `array &$foundClasses` to `VarExporter::export()` to ease with preloading exported values
-
-4.2.0
------
-
- * added the component
diff --git a/advancedcontentfilter/vendor/symfony/var-exporter/Exception/ClassNotFoundException.php b/advancedcontentfilter/vendor/symfony/var-exporter/Exception/ClassNotFoundException.php
deleted file mode 100644
index 379a7651..00000000
--- a/advancedcontentfilter/vendor/symfony/var-exporter/Exception/ClassNotFoundException.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\VarExporter\Exception;
-
-class ClassNotFoundException extends \Exception implements ExceptionInterface
-{
-    public function __construct(string $class, ?\Throwable $previous = null)
-    {
-        parent::__construct(sprintf('Class "%s" not found.', $class), 0, $previous);
-    }
-}
diff --git a/advancedcontentfilter/vendor/symfony/var-exporter/Exception/ExceptionInterface.php b/advancedcontentfilter/vendor/symfony/var-exporter/Exception/ExceptionInterface.php
deleted file mode 100644
index adfaed47..00000000
--- a/advancedcontentfilter/vendor/symfony/var-exporter/Exception/ExceptionInterface.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\VarExporter\Exception;
-
-interface ExceptionInterface extends \Throwable
-{
-}
diff --git a/advancedcontentfilter/vendor/symfony/var-exporter/Exception/NotInstantiableTypeException.php b/advancedcontentfilter/vendor/symfony/var-exporter/Exception/NotInstantiableTypeException.php
deleted file mode 100644
index b9ba225d..00000000
--- a/advancedcontentfilter/vendor/symfony/var-exporter/Exception/NotInstantiableTypeException.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\VarExporter\Exception;
-
-class NotInstantiableTypeException extends \Exception implements ExceptionInterface
-{
-    public function __construct(string $type, ?\Throwable $previous = null)
-    {
-        parent::__construct(sprintf('Type "%s" is not instantiable.', $type), 0, $previous);
-    }
-}
diff --git a/advancedcontentfilter/vendor/symfony/var-exporter/Instantiator.php b/advancedcontentfilter/vendor/symfony/var-exporter/Instantiator.php
deleted file mode 100644
index 368c769a..00000000
--- a/advancedcontentfilter/vendor/symfony/var-exporter/Instantiator.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\VarExporter;
-
-use Symfony\Component\VarExporter\Exception\ExceptionInterface;
-use Symfony\Component\VarExporter\Exception\NotInstantiableTypeException;
-use Symfony\Component\VarExporter\Internal\Hydrator;
-use Symfony\Component\VarExporter\Internal\Registry;
-
-/**
- * A utility class to create objects without calling their constructor.
- *
- * @author Nicolas Grekas <p@tchwork.com>
- */
-final class Instantiator
-{
-    /**
-     * Creates an object and sets its properties without calling its constructor nor any other methods.
-     *
-     * For example:
-     *
-     *     // creates an empty instance of Foo
-     *     Instantiator::instantiate(Foo::class);
-     *
-     *     // creates a Foo instance and sets one of its properties
-     *     Instantiator::instantiate(Foo::class, ['propertyName' => $propertyValue]);
-     *
-     *     // creates a Foo instance and sets a private property defined on its parent Bar class
-     *     Instantiator::instantiate(Foo::class, [], [
-     *         Bar::class => ['privateBarProperty' => $propertyValue],
-     *     ]);
-     *
-     * Instances of ArrayObject, ArrayIterator and SplObjectStorage can be created
-     * by using the special "\0" property name to define their internal value:
-     *
-     *     // creates an SplObjectStorage where $info1 is attached to $obj1, etc.
-     *     Instantiator::instantiate(SplObjectStorage::class, ["\0" => [$obj1, $info1, $obj2, $info2...]]);
-     *
-     *     // creates an ArrayObject populated with $inputArray
-     *     Instantiator::instantiate(ArrayObject::class, ["\0" => [$inputArray]]);
-     *
-     * @param string $class             The class of the instance to create
-     * @param array  $properties        The properties to set on the instance
-     * @param array  $privateProperties The private properties to set on the instance,
-     *                                  keyed by their declaring class
-     *
-     * @throws ExceptionInterface When the instance cannot be created
-     */
-    public static function instantiate(string $class, array $properties = [], array $privateProperties = []): object
-    {
-        $reflector = Registry::$reflectors[$class] ?? Registry::getClassReflector($class);
-
-        if (Registry::$cloneable[$class]) {
-            $wrappedInstance = [clone Registry::$prototypes[$class]];
-        } elseif (Registry::$instantiableWithoutConstructor[$class]) {
-            $wrappedInstance = [$reflector->newInstanceWithoutConstructor()];
-        } elseif (null === Registry::$prototypes[$class]) {
-            throw new NotInstantiableTypeException($class);
-        } elseif ($reflector->implementsInterface('Serializable') && (\PHP_VERSION_ID < 70400 || !method_exists($class, '__unserialize'))) {
-            $wrappedInstance = [unserialize('C:'.\strlen($class).':"'.$class.'":0:{}')];
-        } else {
-            $wrappedInstance = [unserialize('O:'.\strlen($class).':"'.$class.'":0:{}')];
-        }
-
-        if ($properties) {
-            $privateProperties[$class] = isset($privateProperties[$class]) ? $properties + $privateProperties[$class] : $properties;
-        }
-
-        foreach ($privateProperties as $class => $properties) {
-            if (!$properties) {
-                continue;
-            }
-            foreach ($properties as $name => $value) {
-                // because they're also used for "unserialization", hydrators
-                // deal with array of instances, so we need to wrap values
-                $properties[$name] = [$value];
-            }
-            (Hydrator::$hydrators[$class] ?? Hydrator::getHydrator($class))($properties, $wrappedInstance);
-        }
-
-        return $wrappedInstance[0];
-    }
-}
diff --git a/advancedcontentfilter/vendor/symfony/var-exporter/Internal/Exporter.php b/advancedcontentfilter/vendor/symfony/var-exporter/Internal/Exporter.php
deleted file mode 100644
index 51c29e45..00000000
--- a/advancedcontentfilter/vendor/symfony/var-exporter/Internal/Exporter.php
+++ /dev/null
@@ -1,417 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\VarExporter\Internal;
-
-use Symfony\Component\VarExporter\Exception\NotInstantiableTypeException;
-
-/**
- * @author Nicolas Grekas <p@tchwork.com>
- *
- * @internal
- */
-class Exporter
-{
-    /**
-     * Prepares an array of values for VarExporter.
-     *
-     * For performance this method is public and has no type-hints.
-     *
-     * @param array             &$values
-     * @param \SplObjectStorage $objectsPool
-     * @param array             &$refsPool
-     * @param int               &$objectsCount
-     * @param bool              &$valuesAreStatic
-     *
-     * @throws NotInstantiableTypeException When a value cannot be serialized
-     */
-    public static function prepare($values, $objectsPool, &$refsPool, &$objectsCount, &$valuesAreStatic): array
-    {
-        $refs = $values;
-        foreach ($values as $k => $value) {
-            if (\is_resource($value)) {
-                throw new NotInstantiableTypeException(get_resource_type($value).' resource');
-            }
-            $refs[$k] = $objectsPool;
-
-            if ($isRef = !$valueIsStatic = $values[$k] !== $objectsPool) {
-                $values[$k] = &$value; // Break hard references to make $values completely
-                unset($value);         // independent from the original structure
-                $refs[$k] = $value = $values[$k];
-                if ($value instanceof Reference && 0 > $value->id) {
-                    $valuesAreStatic = false;
-                    ++$value->count;
-                    continue;
-                }
-                $refsPool[] = [&$refs[$k], $value, &$value];
-                $refs[$k] = $values[$k] = new Reference(-\count($refsPool), $value);
-            }
-
-            if (\is_array($value)) {
-                if ($value) {
-                    $value = self::prepare($value, $objectsPool, $refsPool, $objectsCount, $valueIsStatic);
-                }
-                goto handle_value;
-            } elseif (!\is_object($value) || $value instanceof \UnitEnum) {
-                goto handle_value;
-            }
-
-            $valueIsStatic = false;
-            if (isset($objectsPool[$value])) {
-                ++$objectsCount;
-                $value = new Reference($objectsPool[$value][0]);
-                goto handle_value;
-            }
-
-            $class = \get_class($value);
-            $reflector = Registry::$reflectors[$class] ?? Registry::getClassReflector($class);
-            $properties = [];
-
-            if ($reflector->hasMethod('__serialize')) {
-                if (!$reflector->getMethod('__serialize')->isPublic()) {
-                    throw new \Error(sprintf('Call to %s method "%s::__serialize()".', $reflector->getMethod('__serialize')->isProtected() ? 'protected' : 'private', $class));
-                }
-
-                if (!\is_array($serializeProperties = $value->__serialize())) {
-                    throw new \TypeError($class.'::__serialize() must return an array');
-                }
-
-                if ($reflector->hasMethod('__unserialize')) {
-                    $properties = $serializeProperties;
-                } else {
-                    foreach ($serializeProperties as $n => $v) {
-                        $c = \PHP_VERSION_ID >= 80100 && $reflector->hasProperty($n) && ($p = $reflector->getProperty($n))->isReadOnly() ? $p->class : 'stdClass';
-                        $properties[$c][$n] = $v;
-                    }
-                }
-
-                goto prepare_value;
-            }
-
-            $sleep = null;
-            $proto = Registry::$prototypes[$class];
-
-            if (($value instanceof \ArrayIterator || $value instanceof \ArrayObject) && null !== $proto) {
-                // ArrayIterator and ArrayObject need special care because their "flags"
-                // option changes the behavior of the (array) casting operator.
-                [$arrayValue, $properties] = self::getArrayObjectProperties($value, $proto);
-
-                // populates Registry::$prototypes[$class] with a new instance
-                Registry::getClassReflector($class, Registry::$instantiableWithoutConstructor[$class], Registry::$cloneable[$class]);
-            } elseif ($value instanceof \SplObjectStorage && Registry::$cloneable[$class] && null !== $proto) {
-                // By implementing Serializable, SplObjectStorage breaks
-                // internal references; let's deal with it on our own.
-                foreach (clone $value as $v) {
-                    $properties[] = $v;
-                    $properties[] = $value[$v];
-                }
-                $properties = ['SplObjectStorage' => ["\0" => $properties]];
-                $arrayValue = (array) $value;
-            } elseif ($value instanceof \Serializable
-                || $value instanceof \__PHP_Incomplete_Class
-                || \PHP_VERSION_ID < 80200 && $value instanceof \DatePeriod
-            ) {
-                ++$objectsCount;
-                $objectsPool[$value] = [$id = \count($objectsPool), serialize($value), [], 0];
-                $value = new Reference($id);
-                goto handle_value;
-            } else {
-                if (method_exists($class, '__sleep')) {
-                    if (!\is_array($sleep = $value->__sleep())) {
-                        trigger_error('serialize(): __sleep should return an array only containing the names of instance-variables to serialize', \E_USER_NOTICE);
-                        $value = null;
-                        goto handle_value;
-                    }
-                    $sleep = array_flip($sleep);
-                }
-
-                $arrayValue = (array) $value;
-            }
-
-            $proto = (array) $proto;
-
-            foreach ($arrayValue as $name => $v) {
-                $i = 0;
-                $n = (string) $name;
-                if ('' === $n || "\0" !== $n[0]) {
-                    $c = \PHP_VERSION_ID >= 80100 && $reflector->hasProperty($n) && ($p = $reflector->getProperty($n))->isReadOnly() ? $p->class : 'stdClass';
-                } elseif ('*' === $n[1]) {
-                    $n = substr($n, 3);
-                    $c = $reflector->getProperty($n)->class;
-                    if ('Error' === $c) {
-                        $c = 'TypeError';
-                    } elseif ('Exception' === $c) {
-                        $c = 'ErrorException';
-                    }
-                } else {
-                    $i = strpos($n, "\0", 2);
-                    $c = substr($n, 1, $i - 1);
-                    $n = substr($n, 1 + $i);
-                }
-                if (null !== $sleep) {
-                    if (!isset($sleep[$name]) && (!isset($sleep[$n]) || ($i && $c !== $class))) {
-                        unset($arrayValue[$name]);
-                        continue;
-                    }
-                    unset($sleep[$name], $sleep[$n]);
-                }
-                if (!\array_key_exists($name, $proto) || $proto[$name] !== $v || "\x00Error\x00trace" === $name || "\x00Exception\x00trace" === $name) {
-                    $properties[$c][$n] = $v;
-                }
-            }
-            if ($sleep) {
-                foreach ($sleep as $n => $v) {
-                    trigger_error(sprintf('serialize(): "%s" returned as member variable from __sleep() but does not exist', $n), \E_USER_NOTICE);
-                }
-            }
-            if (method_exists($class, '__unserialize')) {
-                $properties = $arrayValue;
-            }
-
-            prepare_value:
-            $objectsPool[$value] = [$id = \count($objectsPool)];
-            $properties = self::prepare($properties, $objectsPool, $refsPool, $objectsCount, $valueIsStatic);
-            ++$objectsCount;
-            $objectsPool[$value] = [$id, $class, $properties, method_exists($class, '__unserialize') ? -$objectsCount : (method_exists($class, '__wakeup') ? $objectsCount : 0)];
-
-            $value = new Reference($id);
-
-            handle_value:
-            if ($isRef) {
-                unset($value); // Break the hard reference created above
-            } elseif (!$valueIsStatic) {
-                $values[$k] = $value;
-            }
-            $valuesAreStatic = $valueIsStatic && $valuesAreStatic;
-        }
-
-        return $values;
-    }
-
-    public static function export($value, string $indent = '')
-    {
-        switch (true) {
-            case \is_int($value) || \is_float($value): return var_export($value, true);
-            case [] === $value: return '[]';
-            case false === $value: return 'false';
-            case true === $value: return 'true';
-            case null === $value: return 'null';
-            case '' === $value: return "''";
-            case $value instanceof \UnitEnum: return '\\'.ltrim(var_export($value, true), '\\');
-        }
-
-        if ($value instanceof Reference) {
-            if (0 <= $value->id) {
-                return '$o['.$value->id.']';
-            }
-            if (!$value->count) {
-                return self::export($value->value, $indent);
-            }
-            $value = -$value->id;
-
-            return '&$r['.$value.']';
-        }
-        $subIndent = $indent.'    ';
-
-        if (\is_string($value)) {
-            $code = sprintf("'%s'", addcslashes($value, "'\\"));
-
-            $code = preg_replace_callback("/((?:[\\0\\r\\n]|\u{202A}|\u{202B}|\u{202D}|\u{202E}|\u{2066}|\u{2067}|\u{2068}|\u{202C}|\u{2069})++)(.)/", function ($m) use ($subIndent) {
-                $m[1] = sprintf('\'."%s".\'', str_replace(
-                    ["\0", "\r", "\n", "\u{202A}", "\u{202B}", "\u{202D}", "\u{202E}", "\u{2066}", "\u{2067}", "\u{2068}", "\u{202C}", "\u{2069}", '\n\\'],
-                    ['\0', '\r', '\n', '\u{202A}', '\u{202B}', '\u{202D}', '\u{202E}', '\u{2066}', '\u{2067}', '\u{2068}', '\u{202C}', '\u{2069}', '\n"'."\n".$subIndent.'."\\'],
-                    $m[1]
-                ));
-
-                if ("'" === $m[2]) {
-                    return substr($m[1], 0, -2);
-                }
-
-                if ('n".\'' === substr($m[1], -4)) {
-                    return substr_replace($m[1], "\n".$subIndent.".'".$m[2], -2);
-                }
-
-                return $m[1].$m[2];
-            }, $code, -1, $count);
-
-            if ($count && str_starts_with($code, "''.")) {
-                $code = substr($code, 3);
-            }
-
-            return $code;
-        }
-
-        if (\is_array($value)) {
-            $j = -1;
-            $code = '';
-            foreach ($value as $k => $v) {
-                $code .= $subIndent;
-                if (!\is_int($k) || 1 !== $k - $j) {
-                    $code .= self::export($k, $subIndent).' => ';
-                }
-                if (\is_int($k) && $k > $j) {
-                    $j = $k;
-                }
-                $code .= self::export($v, $subIndent).",\n";
-            }
-
-            return "[\n".$code.$indent.']';
-        }
-
-        if ($value instanceof Values) {
-            $code = $subIndent."\$r = [],\n";
-            foreach ($value->values as $k => $v) {
-                $code .= $subIndent.'$r['.$k.'] = '.self::export($v, $subIndent).",\n";
-            }
-
-            return "[\n".$code.$indent.']';
-        }
-
-        if ($value instanceof Registry) {
-            return self::exportRegistry($value, $indent, $subIndent);
-        }
-
-        if ($value instanceof Hydrator) {
-            return self::exportHydrator($value, $indent, $subIndent);
-        }
-
-        throw new \UnexpectedValueException(sprintf('Cannot export value of type "%s".', get_debug_type($value)));
-    }
-
-    private static function exportRegistry(Registry $value, string $indent, string $subIndent): string
-    {
-        $code = '';
-        $serializables = [];
-        $seen = [];
-        $prototypesAccess = 0;
-        $factoriesAccess = 0;
-        $r = '\\'.Registry::class;
-        $j = -1;
-
-        foreach ($value->classes as $k => $class) {
-            if (':' === ($class[1] ?? null)) {
-                $serializables[$k] = $class;
-                continue;
-            }
-            if (!Registry::$instantiableWithoutConstructor[$class]) {
-                if (is_subclass_of($class, 'Serializable') && !method_exists($class, '__unserialize')) {
-                    $serializables[$k] = 'C:'.\strlen($class).':"'.$class.'":0:{}';
-                } else {
-                    $serializables[$k] = 'O:'.\strlen($class).':"'.$class.'":0:{}';
-                }
-                if (is_subclass_of($class, 'Throwable')) {
-                    $eol = is_subclass_of($class, 'Error') ? "\0Error\0" : "\0Exception\0";
-                    $serializables[$k] = substr_replace($serializables[$k], '1:{s:'.(5 + \strlen($eol)).':"'.$eol.'trace";a:0:{}}', -4);
-                }
-                continue;
-            }
-            $code .= $subIndent.(1 !== $k - $j ? $k.' => ' : '');
-            $j = $k;
-            $eol = ",\n";
-            $c = '['.self::export($class).']';
-
-            if ($seen[$class] ?? false) {
-                if (Registry::$cloneable[$class]) {
-                    ++$prototypesAccess;
-                    $code .= 'clone $p'.$c;
-                } else {
-                    ++$factoriesAccess;
-                    $code .= '$f'.$c.'()';
-                }
-            } else {
-                $seen[$class] = true;
-                if (Registry::$cloneable[$class]) {
-                    $code .= 'clone ('.($prototypesAccess++ ? '$p' : '($p = &'.$r.'::$prototypes)').$c.' ?? '.$r.'::p';
-                } else {
-                    $code .= '('.($factoriesAccess++ ? '$f' : '($f = &'.$r.'::$factories)').$c.' ?? '.$r.'::f';
-                    $eol = '()'.$eol;
-                }
-                $code .= '('.substr($c, 1, -1).'))';
-            }
-            $code .= $eol;
-        }
-
-        if (1 === $prototypesAccess) {
-            $code = str_replace('($p = &'.$r.'::$prototypes)', $r.'::$prototypes', $code);
-        }
-        if (1 === $factoriesAccess) {
-            $code = str_replace('($f = &'.$r.'::$factories)', $r.'::$factories', $code);
-        }
-        if ('' !== $code) {
-            $code = "\n".$code.$indent;
-        }
-
-        if ($serializables) {
-            $code = $r.'::unserialize(['.$code.'], '.self::export($serializables, $indent).')';
-        } else {
-            $code = '['.$code.']';
-        }
-
-        return '$o = '.$code;
-    }
-
-    private static function exportHydrator(Hydrator $value, string $indent, string $subIndent): string
-    {
-        $code = '';
-        foreach ($value->properties as $class => $properties) {
-            $code .= $subIndent.'    '.self::export($class).' => '.self::export($properties, $subIndent.'    ').",\n";
-        }
-
-        $code = [
-            self::export($value->registry, $subIndent),
-            self::export($value->values, $subIndent),
-            '' !== $code ? "[\n".$code.$subIndent.']' : '[]',
-            self::export($value->value, $subIndent),
-            self::export($value->wakeups, $subIndent),
-        ];
-
-        return '\\'.\get_class($value)."::hydrate(\n".$subIndent.implode(",\n".$subIndent, $code)."\n".$indent.')';
-    }
-
-    /**
-     * @param \ArrayIterator|\ArrayObject $value
-     * @param \ArrayIterator|\ArrayObject $proto
-     */
-    private static function getArrayObjectProperties($value, $proto): array
-    {
-        $reflector = $value instanceof \ArrayIterator ? 'ArrayIterator' : 'ArrayObject';
-        $reflector = Registry::$reflectors[$reflector] ?? Registry::getClassReflector($reflector);
-
-        $properties = [
-            $arrayValue = (array) $value,
-            $reflector->getMethod('getFlags')->invoke($value),
-            $value instanceof \ArrayObject ? $reflector->getMethod('getIteratorClass')->invoke($value) : 'ArrayIterator',
-        ];
-
-        $reflector = $reflector->getMethod('setFlags');
-        $reflector->invoke($proto, \ArrayObject::STD_PROP_LIST);
-
-        if ($properties[1] & \ArrayObject::STD_PROP_LIST) {
-            $reflector->invoke($value, 0);
-            $properties[0] = (array) $value;
-        } else {
-            $reflector->invoke($value, \ArrayObject::STD_PROP_LIST);
-            $arrayValue = (array) $value;
-        }
-        $reflector->invoke($value, $properties[1]);
-
-        if ([[], 0, 'ArrayIterator'] === $properties) {
-            $properties = [];
-        } else {
-            if ('ArrayIterator' === $properties[2]) {
-                unset($properties[2]);
-            }
-            $properties = [$reflector->class => ["\0" => $properties]];
-        }
-
-        return [$arrayValue, $properties];
-    }
-}
diff --git a/advancedcontentfilter/vendor/symfony/var-exporter/Internal/Hydrator.php b/advancedcontentfilter/vendor/symfony/var-exporter/Internal/Hydrator.php
deleted file mode 100644
index 5ed6bdc9..00000000
--- a/advancedcontentfilter/vendor/symfony/var-exporter/Internal/Hydrator.php
+++ /dev/null
@@ -1,152 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\VarExporter\Internal;
-
-use Symfony\Component\VarExporter\Exception\ClassNotFoundException;
-
-/**
- * @author Nicolas Grekas <p@tchwork.com>
- *
- * @internal
- */
-class Hydrator
-{
-    public static $hydrators = [];
-
-    public $registry;
-    public $values;
-    public $properties;
-    public $value;
-    public $wakeups;
-
-    public function __construct(?Registry $registry, ?Values $values, array $properties, $value, array $wakeups)
-    {
-        $this->registry = $registry;
-        $this->values = $values;
-        $this->properties = $properties;
-        $this->value = $value;
-        $this->wakeups = $wakeups;
-    }
-
-    public static function hydrate($objects, $values, $properties, $value, $wakeups)
-    {
-        foreach ($properties as $class => $vars) {
-            (self::$hydrators[$class] ?? self::getHydrator($class))($vars, $objects);
-        }
-        foreach ($wakeups as $k => $v) {
-            if (\is_array($v)) {
-                $objects[-$k]->__unserialize($v);
-            } else {
-                $objects[$v]->__wakeup();
-            }
-        }
-
-        return $value;
-    }
-
-    public static function getHydrator($class)
-    {
-        switch ($class) {
-            case 'stdClass':
-                return self::$hydrators[$class] = static function ($properties, $objects) {
-                    foreach ($properties as $name => $values) {
-                        foreach ($values as $i => $v) {
-                            $objects[$i]->$name = $v;
-                        }
-                    }
-                };
-
-            case 'ErrorException':
-                return self::$hydrators[$class] = (self::$hydrators['stdClass'] ?? self::getHydrator('stdClass'))->bindTo(null, new class() extends \ErrorException {
-                });
-
-            case 'TypeError':
-                return self::$hydrators[$class] = (self::$hydrators['stdClass'] ?? self::getHydrator('stdClass'))->bindTo(null, new class() extends \Error {
-                });
-
-            case 'SplObjectStorage':
-                return self::$hydrators[$class] = static function ($properties, $objects) {
-                    foreach ($properties as $name => $values) {
-                        if ("\0" === $name) {
-                            foreach ($values as $i => $v) {
-                                for ($j = 0; $j < \count($v); ++$j) {
-                                    $objects[$i]->attach($v[$j], $v[++$j]);
-                                }
-                            }
-                            continue;
-                        }
-                        foreach ($values as $i => $v) {
-                            $objects[$i]->$name = $v;
-                        }
-                    }
-                };
-        }
-
-        if (!class_exists($class) && !interface_exists($class, false) && !trait_exists($class, false)) {
-            throw new ClassNotFoundException($class);
-        }
-        $classReflector = new \ReflectionClass($class);
-
-        switch ($class) {
-            case 'ArrayIterator':
-            case 'ArrayObject':
-                $constructor = \Closure::fromCallable([$classReflector->getConstructor(), 'invokeArgs']);
-
-                return self::$hydrators[$class] = static function ($properties, $objects) use ($constructor) {
-                    foreach ($properties as $name => $values) {
-                        if ("\0" !== $name) {
-                            foreach ($values as $i => $v) {
-                                $objects[$i]->$name = $v;
-                            }
-                        }
-                    }
-                    foreach ($properties["\0"] ?? [] as $i => $v) {
-                        $constructor($objects[$i], $v);
-                    }
-                };
-        }
-
-        if (!$classReflector->isInternal()) {
-            return self::$hydrators[$class] = (self::$hydrators['stdClass'] ?? self::getHydrator('stdClass'))->bindTo(null, $class);
-        }
-
-        if ($classReflector->name !== $class) {
-            return self::$hydrators[$classReflector->name] ?? self::getHydrator($classReflector->name);
-        }
-
-        $propertySetters = [];
-        foreach ($classReflector->getProperties() as $propertyReflector) {
-            if (!$propertyReflector->isStatic()) {
-                $propertyReflector->setAccessible(true);
-                $propertySetters[$propertyReflector->name] = \Closure::fromCallable([$propertyReflector, 'setValue']);
-            }
-        }
-
-        if (!$propertySetters) {
-            return self::$hydrators[$class] = self::$hydrators['stdClass'] ?? self::getHydrator('stdClass');
-        }
-
-        return self::$hydrators[$class] = static function ($properties, $objects) use ($propertySetters) {
-            foreach ($properties as $name => $values) {
-                if ($setValue = $propertySetters[$name] ?? null) {
-                    foreach ($values as $i => $v) {
-                        $setValue($objects[$i], $v);
-                    }
-                    continue;
-                }
-                foreach ($values as $i => $v) {
-                    $objects[$i]->$name = $v;
-                }
-            }
-        };
-    }
-}
diff --git a/advancedcontentfilter/vendor/symfony/var-exporter/Internal/Reference.php b/advancedcontentfilter/vendor/symfony/var-exporter/Internal/Reference.php
deleted file mode 100644
index e371c07b..00000000
--- a/advancedcontentfilter/vendor/symfony/var-exporter/Internal/Reference.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\VarExporter\Internal;
-
-/**
- * @author Nicolas Grekas <p@tchwork.com>
- *
- * @internal
- */
-class Reference
-{
-    public $id;
-    public $value;
-    public $count = 0;
-
-    public function __construct(int $id, $value = null)
-    {
-        $this->id = $id;
-        $this->value = $value;
-    }
-}
diff --git a/advancedcontentfilter/vendor/symfony/var-exporter/Internal/Registry.php b/advancedcontentfilter/vendor/symfony/var-exporter/Internal/Registry.php
deleted file mode 100644
index 24b77b9e..00000000
--- a/advancedcontentfilter/vendor/symfony/var-exporter/Internal/Registry.php
+++ /dev/null
@@ -1,146 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\VarExporter\Internal;
-
-use Symfony\Component\VarExporter\Exception\ClassNotFoundException;
-use Symfony\Component\VarExporter\Exception\NotInstantiableTypeException;
-
-/**
- * @author Nicolas Grekas <p@tchwork.com>
- *
- * @internal
- */
-class Registry
-{
-    public static $reflectors = [];
-    public static $prototypes = [];
-    public static $factories = [];
-    public static $cloneable = [];
-    public static $instantiableWithoutConstructor = [];
-
-    public $classes = [];
-
-    public function __construct(array $classes)
-    {
-        $this->classes = $classes;
-    }
-
-    public static function unserialize($objects, $serializables)
-    {
-        $unserializeCallback = ini_set('unserialize_callback_func', __CLASS__.'::getClassReflector');
-
-        try {
-            foreach ($serializables as $k => $v) {
-                $objects[$k] = unserialize($v);
-            }
-        } finally {
-            ini_set('unserialize_callback_func', $unserializeCallback);
-        }
-
-        return $objects;
-    }
-
-    public static function p($class)
-    {
-        self::getClassReflector($class, true, true);
-
-        return self::$prototypes[$class];
-    }
-
-    public static function f($class)
-    {
-        $reflector = self::$reflectors[$class] ?? self::getClassReflector($class, true, false);
-
-        return self::$factories[$class] = \Closure::fromCallable([$reflector, 'newInstanceWithoutConstructor']);
-    }
-
-    public static function getClassReflector($class, $instantiableWithoutConstructor = false, $cloneable = null)
-    {
-        if (!($isClass = class_exists($class)) && !interface_exists($class, false) && !trait_exists($class, false)) {
-            throw new ClassNotFoundException($class);
-        }
-        $reflector = new \ReflectionClass($class);
-
-        if ($instantiableWithoutConstructor) {
-            $proto = $reflector->newInstanceWithoutConstructor();
-        } elseif (!$isClass || $reflector->isAbstract()) {
-            throw new NotInstantiableTypeException($class);
-        } elseif ($reflector->name !== $class) {
-            $reflector = self::$reflectors[$name = $reflector->name] ?? self::getClassReflector($name, false, $cloneable);
-            self::$cloneable[$class] = self::$cloneable[$name];
-            self::$instantiableWithoutConstructor[$class] = self::$instantiableWithoutConstructor[$name];
-            self::$prototypes[$class] = self::$prototypes[$name];
-
-            return self::$reflectors[$class] = $reflector;
-        } else {
-            try {
-                $proto = $reflector->newInstanceWithoutConstructor();
-                $instantiableWithoutConstructor = true;
-            } catch (\ReflectionException $e) {
-                $proto = $reflector->implementsInterface('Serializable') && !method_exists($class, '__unserialize') ? 'C:' : 'O:';
-                if ('C:' === $proto && !$reflector->getMethod('unserialize')->isInternal()) {
-                    $proto = null;
-                } else {
-                    try {
-                        $proto = @unserialize($proto.\strlen($class).':"'.$class.'":0:{}');
-                    } catch (\Exception $e) {
-                        if (__FILE__ !== $e->getFile()) {
-                            throw $e;
-                        }
-                        throw new NotInstantiableTypeException($class, $e);
-                    }
-                    if (false === $proto) {
-                        throw new NotInstantiableTypeException($class);
-                    }
-                }
-            }
-            if (null !== $proto && !$proto instanceof \Throwable && !$proto instanceof \Serializable && !method_exists($class, '__sleep') && (\PHP_VERSION_ID < 70400 || !method_exists($class, '__serialize'))) {
-                try {
-                    serialize($proto);
-                } catch (\Exception $e) {
-                    throw new NotInstantiableTypeException($class, $e);
-                }
-            }
-        }
-
-        if (null === $cloneable) {
-            if (($proto instanceof \Reflector || $proto instanceof \ReflectionGenerator || $proto instanceof \ReflectionType || $proto instanceof \IteratorIterator || $proto instanceof \RecursiveIteratorIterator) && (!$proto instanceof \Serializable && !method_exists($proto, '__wakeup') && (\PHP_VERSION_ID < 70400 || !method_exists($class, '__unserialize')))) {
-                throw new NotInstantiableTypeException($class);
-            }
-
-            $cloneable = $reflector->isCloneable() && !$reflector->hasMethod('__clone');
-        }
-
-        self::$cloneable[$class] = $cloneable;
-        self::$instantiableWithoutConstructor[$class] = $instantiableWithoutConstructor;
-        self::$prototypes[$class] = $proto;
-
-        if ($proto instanceof \Throwable) {
-            static $setTrace;
-
-            if (null === $setTrace) {
-                $setTrace = [
-                    new \ReflectionProperty(\Error::class, 'trace'),
-                    new \ReflectionProperty(\Exception::class, 'trace'),
-                ];
-                $setTrace[0]->setAccessible(true);
-                $setTrace[1]->setAccessible(true);
-                $setTrace[0] = \Closure::fromCallable([$setTrace[0], 'setValue']);
-                $setTrace[1] = \Closure::fromCallable([$setTrace[1], 'setValue']);
-            }
-
-            $setTrace[$proto instanceof \Exception]($proto, []);
-        }
-
-        return self::$reflectors[$class] = $reflector;
-    }
-}
diff --git a/advancedcontentfilter/vendor/symfony/var-exporter/Internal/Values.php b/advancedcontentfilter/vendor/symfony/var-exporter/Internal/Values.php
deleted file mode 100644
index 21ae04e6..00000000
--- a/advancedcontentfilter/vendor/symfony/var-exporter/Internal/Values.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\VarExporter\Internal;
-
-/**
- * @author Nicolas Grekas <p@tchwork.com>
- *
- * @internal
- */
-class Values
-{
-    public $values;
-
-    public function __construct(array $values)
-    {
-        $this->values = $values;
-    }
-}
diff --git a/advancedcontentfilter/vendor/symfony/var-exporter/LICENSE b/advancedcontentfilter/vendor/symfony/var-exporter/LICENSE
deleted file mode 100644
index 7536caea..00000000
--- a/advancedcontentfilter/vendor/symfony/var-exporter/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2018-present Fabien Potencier
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is furnished
-to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
diff --git a/advancedcontentfilter/vendor/symfony/var-exporter/README.md b/advancedcontentfilter/vendor/symfony/var-exporter/README.md
deleted file mode 100644
index a34e4c23..00000000
--- a/advancedcontentfilter/vendor/symfony/var-exporter/README.md
+++ /dev/null
@@ -1,38 +0,0 @@
-VarExporter Component
-=====================
-
-The VarExporter component allows exporting any serializable PHP data structure to
-plain PHP code. While doing so, it preserves all the semantics associated with
-the serialization mechanism of PHP (`__wakeup`, `__sleep`, `Serializable`,
-`__serialize`, `__unserialize`).
-
-It also provides an instantiator that allows creating and populating objects
-without calling their constructor nor any other methods.
-
-The reason to use this component *vs* `serialize()` or
-[igbinary](https://github.com/igbinary/igbinary) is performance: thanks to
-OPcache, the resulting code is significantly faster and more memory efficient
-than using `unserialize()` or `igbinary_unserialize()`.
-
-Unlike `var_export()`, this works on any serializable PHP value.
-
-It also provides a few improvements over `var_export()`/`serialize()`:
-
- * the output is PSR-2 compatible;
- * the output can be re-indented without messing up with `\r` or `\n` in the data
- * missing classes throw a `ClassNotFoundException` instead of being unserialized to
-   `PHP_Incomplete_Class` objects;
- * references involving `SplObjectStorage`, `ArrayObject` or `ArrayIterator`
-   instances are preserved;
- * `Reflection*`, `IteratorIterator` and `RecursiveIteratorIterator` classes
-   throw an exception when being serialized (their unserialized version is broken
-   anyway, see https://bugs.php.net/76737).
-
-Resources
----------
-
- * [Documentation](https://symfony.com/doc/current/components/var_exporter.html)
- * [Contributing](https://symfony.com/doc/current/contributing/index.html)
- * [Report issues](https://github.com/symfony/symfony/issues) and
-   [send Pull Requests](https://github.com/symfony/symfony/pulls)
-   in the [main Symfony repository](https://github.com/symfony/symfony)
diff --git a/advancedcontentfilter/vendor/symfony/var-exporter/VarExporter.php b/advancedcontentfilter/vendor/symfony/var-exporter/VarExporter.php
deleted file mode 100644
index d4c08091..00000000
--- a/advancedcontentfilter/vendor/symfony/var-exporter/VarExporter.php
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-
-/*
- * This file is part of the Symfony package.
- *
- * (c) Fabien Potencier <fabien@symfony.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Symfony\Component\VarExporter;
-
-use Symfony\Component\VarExporter\Exception\ExceptionInterface;
-use Symfony\Component\VarExporter\Internal\Exporter;
-use Symfony\Component\VarExporter\Internal\Hydrator;
-use Symfony\Component\VarExporter\Internal\Registry;
-use Symfony\Component\VarExporter\Internal\Values;
-
-/**
- * Exports serializable PHP values to PHP code.
- *
- * VarExporter allows serializing PHP data structures to plain PHP code (like var_export())
- * while preserving all the semantics associated with serialize() (unlike var_export()).
- *
- * By leveraging OPcache, the generated PHP code is faster than doing the same with unserialize().
- *
- * @author Nicolas Grekas <p@tchwork.com>
- */
-final class VarExporter
-{
-    /**
-     * Exports a serializable PHP value to PHP code.
-     *
-     * @param mixed $value          The value to export
-     * @param bool  &$isStaticValue Set to true after execution if the provided value is static, false otherwise
-     * @param array &$foundClasses  Classes found in the value are added to this list as both keys and values
-     *
-     * @throws ExceptionInterface When the provided value cannot be serialized
-     */
-    public static function export($value, ?bool &$isStaticValue = null, array &$foundClasses = []): string
-    {
-        $isStaticValue = true;
-
-        if (!\is_object($value) && !(\is_array($value) && $value) && !\is_resource($value) || $value instanceof \UnitEnum) {
-            return Exporter::export($value);
-        }
-
-        $objectsPool = new \SplObjectStorage();
-        $refsPool = [];
-        $objectsCount = 0;
-
-        try {
-            $value = Exporter::prepare([$value], $objectsPool, $refsPool, $objectsCount, $isStaticValue)[0];
-        } finally {
-            $references = [];
-            foreach ($refsPool as $i => $v) {
-                if ($v[0]->count) {
-                    $references[1 + $i] = $v[2];
-                }
-                $v[0] = $v[1];
-            }
-        }
-
-        if ($isStaticValue) {
-            return Exporter::export($value);
-        }
-
-        $classes = [];
-        $values = [];
-        $states = [];
-        foreach ($objectsPool as $i => $v) {
-            [, $class, $values[], $wakeup] = $objectsPool[$v];
-            $foundClasses[$class] = $classes[] = $class;
-
-            if (0 < $wakeup) {
-                $states[$wakeup] = $i;
-            } elseif (0 > $wakeup) {
-                $states[-$wakeup] = [$i, array_pop($values)];
-                $values[] = [];
-            }
-        }
-        ksort($states);
-
-        $wakeups = [null];
-        foreach ($states as $v) {
-            if (\is_array($v)) {
-                $wakeups[-$v[0]] = $v[1];
-            } else {
-                $wakeups[] = $v;
-            }
-        }
-
-        if (null === $wakeups[0]) {
-            unset($wakeups[0]);
-        }
-
-        $properties = [];
-        foreach ($values as $i => $vars) {
-            foreach ($vars as $class => $values) {
-                foreach ($values as $name => $v) {
-                    $properties[$class][$name][$i] = $v;
-                }
-            }
-        }
-
-        if ($classes || $references) {
-            $value = new Hydrator(new Registry($classes), $references ? new Values($references) : null, $properties, $value, $wakeups);
-        } else {
-            $isStaticValue = true;
-        }
-
-        return Exporter::export($value);
-    }
-}
diff --git a/advancedcontentfilter/vendor/symfony/var-exporter/composer.json b/advancedcontentfilter/vendor/symfony/var-exporter/composer.json
deleted file mode 100644
index 29d4901d..00000000
--- a/advancedcontentfilter/vendor/symfony/var-exporter/composer.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-    "name": "symfony/var-exporter",
-    "type": "library",
-    "description": "Allows exporting any serializable PHP data structure to plain PHP code",
-    "keywords": ["export", "serialize", "instantiate", "hydrate", "construct", "clone"],
-    "homepage": "https://symfony.com",
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "Nicolas Grekas",
-            "email": "p@tchwork.com"
-        },
-        {
-            "name": "Symfony Community",
-            "homepage": "https://symfony.com/contributors"
-        }
-    ],
-    "require": {
-        "php": ">=7.2.5",
-        "symfony/polyfill-php80": "^1.16"
-    },
-    "require-dev": {
-        "symfony/var-dumper": "^4.4.9|^5.0.9|^6.0"
-    },
-    "autoload": {
-        "psr-4": { "Symfony\\Component\\VarExporter\\": "" },
-        "exclude-from-classmap": [
-            "/Tests/"
-        ]
-    },
-    "minimum-stability": "dev"
-}
diff --git a/audon/README.md b/audon/README.md
deleted file mode 100644
index beb89a1e..00000000
--- a/audon/README.md
+++ /dev/null
@@ -1,6 +0,0 @@
-Audon Addon
-=============
-
-This is a quick and dirty addon to add a [Audon][1] website as an app. This Addon based on webrtc. Audon is a service of realtime audio chat 
-
-[1]: https://codeberg.org/nmkj/audon
diff --git a/audon/audon.php b/audon/audon.php
deleted file mode 100644
index 553e7f5c..00000000
--- a/audon/audon.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-/*
- * Name: Audon Application
- * Description: add a Audon instance. Based on webRTC Addon
- * Version: 0.1
- * Author: Stephen Mahood <https://friends.mayfirst.org/profile/marxistvegan>
- * Author: Tobias Diekershoff <https://f.diekershoff.de/profile/tobias>
- * Author: Matthias Ebers <https://loma.ml/profile/feb>
- */
-
-use Friendica\Core\Hook;
-use Friendica\Core\Renderer;
-use Friendica\DI;
-
-function audon_install()
-{
-	Hook::register('app_menu', __FILE__, 'audon_app_menu');
-}
-
-function audon_app_menu(array &$b)
-{
-	$b['app_menu'][] = '<div class="app-title"><a href="audon">' . DI::l10n()->t('Audon Audiochat') . '</a></div>';
-}
-
-function audon_addon_admin(string &$o)
-{
-	$t = Renderer::getMarkupTemplate('admin.tpl', 'addon/audon/');
-	$o = Renderer::replaceMacros($t, [
-		'$submit'   => DI::l10n()->t('Save Settings'), 
-		'$audonurl' => [
-			'audonurl', 
-			DI::l10n()->t('Audon Base URL'), 
-			DI::config()->get('audon','audonurl'), 
-			DI::l10n()->t('Page your users will create an Audon audio chat room on. For example you could use https://audon.space.'), 
-		], 
-	]);
-}
-
-function audon_addon_admin_post()
-{
-	DI::config()->set('audon', 'audonurl', trim($_POST['audonurl'] ?? ''));
-}
-
-/**
- * This is a statement rather than an actual function definition. The simple
- * existence of this method is checked to figure out if the addon offers a
- * module.
- */
-function audon_module() {}
-
-function audon_content(): string
-{
-	$o = '';
-
-	/* landingpage to create chatrooms */
-	$audonurl = DI::config()->get('audon', 'audonurl');
-
-
-	/* embedd the landing page in an iframe */
-	$o .= '<h2>' . DI::l10n()->t('Audio Chat') . '</h2>';
-	$o .= '<p>' . DI::l10n()->t('Audon is an audio conferencing tool. Connect your account to Audon and create a room. Share the generated link to talk to other participants.') . '</p>';
-	if ($audonurl == '') {
-		$o .= '<p>' . DI::l10n()->t('Please contact your Friendica administrator to remind them to configure the Audon addon.') . '</p>';
-	} else {
-		$o .= '<iframe src="' . $audonurl . '" width="740px" height="600px"></iframe>';
-	}
-
-	return $o;
-}
diff --git a/audon/lang/C/messages.po b/audon/lang/C/messages.po
deleted file mode 100644
index c8fd38af..00000000
--- a/audon/lang/C/messages.po
+++ /dev/null
@@ -1,52 +0,0 @@
-# ADDON audon
-# Copyright (C) 
-# This file is distributed under the same license as the Friendica audon addon package.
-# 
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-08-18 18:23+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: audon.php:22
-msgid "Audon Audiochat"
-msgstr ""
-
-#: audon.php:29
-msgid "Save Settings"
-msgstr ""
-
-#: audon.php:32
-msgid "Audon Base URL"
-msgstr ""
-
-#: audon.php:34
-msgid ""
-"Page your users will create an Audon audio chat room on. For example you "
-"could use https://audon.space."
-msgstr ""
-
-#: audon.php:60
-msgid "Audio Chat"
-msgstr ""
-
-#: audon.php:61
-msgid ""
-"Audon is an audio conferencing tool. Connect your account to Audon and "
-"create a room. Share the generated link to talk to other participants."
-msgstr ""
-
-#: audon.php:63
-msgid ""
-"Please contact your Friendica administrator to remind them to configure the "
-"Audon addon."
-msgstr ""
diff --git a/audon/templates/admin.tpl b/audon/templates/admin.tpl
deleted file mode 100644
index e2758583..00000000
--- a/audon/templates/admin.tpl
+++ /dev/null
@@ -1,2 +0,0 @@
-{{include file="field_input.tpl" field=$audonurl}}
-<button type="submit">{{$submit}}</button>
diff --git a/birdavatar/README.md b/birdavatar/README.md
deleted file mode 100644
index 4eb8fd80..00000000
--- a/birdavatar/README.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# Bird Avatar Generator
-
-Generate a default avatar based on David Revoy's bird-avatar-generator https://www.peppercarrot.com/extras/html/2019_bird-generator/index.php
-
-## License:
-
-**Artworks:**
-PNG and ORA files licensed under: [CC-By 4.0](https://creativecommons.org/licenses/by/4.0/) 
-attribution: David Revoy with the following exception: Generated pictures used as Avatar 
-(for blog,forum,social-network) don't need direct attribution and so, can be used 
-
-**Original code**
-Original PHP code is licensed under the short and simple permissive:
-[MIT License](https://en.wikipedia.org/wiki/MIT_License)
diff --git a/birdavatar/avatars/accessorie_1.png b/birdavatar/avatars/accessorie_1.png
deleted file mode 100644
index decd7486..00000000
Binary files a/birdavatar/avatars/accessorie_1.png and /dev/null differ
diff --git a/birdavatar/avatars/accessorie_10.png b/birdavatar/avatars/accessorie_10.png
deleted file mode 100644
index f8e4529d..00000000
Binary files a/birdavatar/avatars/accessorie_10.png and /dev/null differ
diff --git a/birdavatar/avatars/accessorie_11.png b/birdavatar/avatars/accessorie_11.png
deleted file mode 100644
index 783e968e..00000000
Binary files a/birdavatar/avatars/accessorie_11.png and /dev/null differ
diff --git a/birdavatar/avatars/accessorie_12.png b/birdavatar/avatars/accessorie_12.png
deleted file mode 100644
index dde3b6c1..00000000
Binary files a/birdavatar/avatars/accessorie_12.png and /dev/null differ
diff --git a/birdavatar/avatars/accessorie_13.png b/birdavatar/avatars/accessorie_13.png
deleted file mode 100644
index aa0a48f2..00000000
Binary files a/birdavatar/avatars/accessorie_13.png and /dev/null differ
diff --git a/birdavatar/avatars/accessorie_14.png b/birdavatar/avatars/accessorie_14.png
deleted file mode 100644
index 66f3d848..00000000
Binary files a/birdavatar/avatars/accessorie_14.png and /dev/null differ
diff --git a/birdavatar/avatars/accessorie_15.png b/birdavatar/avatars/accessorie_15.png
deleted file mode 100644
index decd7486..00000000
Binary files a/birdavatar/avatars/accessorie_15.png and /dev/null differ
diff --git a/birdavatar/avatars/accessorie_16.png b/birdavatar/avatars/accessorie_16.png
deleted file mode 100644
index aa011593..00000000
Binary files a/birdavatar/avatars/accessorie_16.png and /dev/null differ
diff --git a/birdavatar/avatars/accessorie_17.png b/birdavatar/avatars/accessorie_17.png
deleted file mode 100644
index c1ff1fcb..00000000
Binary files a/birdavatar/avatars/accessorie_17.png and /dev/null differ
diff --git a/birdavatar/avatars/accessorie_18.png b/birdavatar/avatars/accessorie_18.png
deleted file mode 100644
index 37c22f00..00000000
Binary files a/birdavatar/avatars/accessorie_18.png and /dev/null differ
diff --git a/birdavatar/avatars/accessorie_19.png b/birdavatar/avatars/accessorie_19.png
deleted file mode 100644
index a8c3d0bd..00000000
Binary files a/birdavatar/avatars/accessorie_19.png and /dev/null differ
diff --git a/birdavatar/avatars/accessorie_2.png b/birdavatar/avatars/accessorie_2.png
deleted file mode 100644
index afb2ab9d..00000000
Binary files a/birdavatar/avatars/accessorie_2.png and /dev/null differ
diff --git a/birdavatar/avatars/accessorie_20.png b/birdavatar/avatars/accessorie_20.png
deleted file mode 100644
index 58c88213..00000000
Binary files a/birdavatar/avatars/accessorie_20.png and /dev/null differ
diff --git a/birdavatar/avatars/accessorie_3.png b/birdavatar/avatars/accessorie_3.png
deleted file mode 100644
index 3e572e17..00000000
Binary files a/birdavatar/avatars/accessorie_3.png and /dev/null differ
diff --git a/birdavatar/avatars/accessorie_4.png b/birdavatar/avatars/accessorie_4.png
deleted file mode 100644
index e29728c0..00000000
Binary files a/birdavatar/avatars/accessorie_4.png and /dev/null differ
diff --git a/birdavatar/avatars/accessorie_5.png b/birdavatar/avatars/accessorie_5.png
deleted file mode 100644
index d70aeddc..00000000
Binary files a/birdavatar/avatars/accessorie_5.png and /dev/null differ
diff --git a/birdavatar/avatars/accessorie_6.png b/birdavatar/avatars/accessorie_6.png
deleted file mode 100644
index f8186a2b..00000000
Binary files a/birdavatar/avatars/accessorie_6.png and /dev/null differ
diff --git a/birdavatar/avatars/accessorie_7.png b/birdavatar/avatars/accessorie_7.png
deleted file mode 100644
index 5cf31864..00000000
Binary files a/birdavatar/avatars/accessorie_7.png and /dev/null differ
diff --git a/birdavatar/avatars/accessorie_8.png b/birdavatar/avatars/accessorie_8.png
deleted file mode 100644
index a65d8ebe..00000000
Binary files a/birdavatar/avatars/accessorie_8.png and /dev/null differ
diff --git a/birdavatar/avatars/accessorie_9.png b/birdavatar/avatars/accessorie_9.png
deleted file mode 100644
index decd7486..00000000
Binary files a/birdavatar/avatars/accessorie_9.png and /dev/null differ
diff --git a/birdavatar/avatars/bec_1.png b/birdavatar/avatars/bec_1.png
deleted file mode 100644
index cf290f7d..00000000
Binary files a/birdavatar/avatars/bec_1.png and /dev/null differ
diff --git a/birdavatar/avatars/bec_2.png b/birdavatar/avatars/bec_2.png
deleted file mode 100644
index 5b1be9a2..00000000
Binary files a/birdavatar/avatars/bec_2.png and /dev/null differ
diff --git a/birdavatar/avatars/bec_3.png b/birdavatar/avatars/bec_3.png
deleted file mode 100644
index 3739b558..00000000
Binary files a/birdavatar/avatars/bec_3.png and /dev/null differ
diff --git a/birdavatar/avatars/bec_4.png b/birdavatar/avatars/bec_4.png
deleted file mode 100644
index e16d0d54..00000000
Binary files a/birdavatar/avatars/bec_4.png and /dev/null differ
diff --git a/birdavatar/avatars/bec_5.png b/birdavatar/avatars/bec_5.png
deleted file mode 100644
index 8a1be081..00000000
Binary files a/birdavatar/avatars/bec_5.png and /dev/null differ
diff --git a/birdavatar/avatars/bec_6.png b/birdavatar/avatars/bec_6.png
deleted file mode 100644
index 5bd87c20..00000000
Binary files a/birdavatar/avatars/bec_6.png and /dev/null differ
diff --git a/birdavatar/avatars/bec_7.png b/birdavatar/avatars/bec_7.png
deleted file mode 100644
index b71b04f8..00000000
Binary files a/birdavatar/avatars/bec_7.png and /dev/null differ
diff --git a/birdavatar/avatars/bec_8.png b/birdavatar/avatars/bec_8.png
deleted file mode 100644
index fbf95a01..00000000
Binary files a/birdavatar/avatars/bec_8.png and /dev/null differ
diff --git a/birdavatar/avatars/bec_9.png b/birdavatar/avatars/bec_9.png
deleted file mode 100644
index 16a2d2ef..00000000
Binary files a/birdavatar/avatars/bec_9.png and /dev/null differ
diff --git a/birdavatar/avatars/body_1.png b/birdavatar/avatars/body_1.png
deleted file mode 100644
index 490d75ef..00000000
Binary files a/birdavatar/avatars/body_1.png and /dev/null differ
diff --git a/birdavatar/avatars/body_2.png b/birdavatar/avatars/body_2.png
deleted file mode 100644
index 0c6e36f5..00000000
Binary files a/birdavatar/avatars/body_2.png and /dev/null differ
diff --git a/birdavatar/avatars/body_3.png b/birdavatar/avatars/body_3.png
deleted file mode 100644
index 97edad0e..00000000
Binary files a/birdavatar/avatars/body_3.png and /dev/null differ
diff --git a/birdavatar/avatars/body_4.png b/birdavatar/avatars/body_4.png
deleted file mode 100644
index 14a295bc..00000000
Binary files a/birdavatar/avatars/body_4.png and /dev/null differ
diff --git a/birdavatar/avatars/body_5.png b/birdavatar/avatars/body_5.png
deleted file mode 100644
index 2e06406b..00000000
Binary files a/birdavatar/avatars/body_5.png and /dev/null differ
diff --git a/birdavatar/avatars/body_6.png b/birdavatar/avatars/body_6.png
deleted file mode 100644
index cf6195d3..00000000
Binary files a/birdavatar/avatars/body_6.png and /dev/null differ
diff --git a/birdavatar/avatars/body_7.png b/birdavatar/avatars/body_7.png
deleted file mode 100644
index 8cdbc9c3..00000000
Binary files a/birdavatar/avatars/body_7.png and /dev/null differ
diff --git a/birdavatar/avatars/body_8.png b/birdavatar/avatars/body_8.png
deleted file mode 100644
index 07d571f9..00000000
Binary files a/birdavatar/avatars/body_8.png and /dev/null differ
diff --git a/birdavatar/avatars/body_9.png b/birdavatar/avatars/body_9.png
deleted file mode 100644
index 8b6d3e1a..00000000
Binary files a/birdavatar/avatars/body_9.png and /dev/null differ
diff --git a/birdavatar/avatars/eyes_1.png b/birdavatar/avatars/eyes_1.png
deleted file mode 100644
index c58e63a2..00000000
Binary files a/birdavatar/avatars/eyes_1.png and /dev/null differ
diff --git a/birdavatar/avatars/eyes_2.png b/birdavatar/avatars/eyes_2.png
deleted file mode 100644
index 584afa99..00000000
Binary files a/birdavatar/avatars/eyes_2.png and /dev/null differ
diff --git a/birdavatar/avatars/eyes_3.png b/birdavatar/avatars/eyes_3.png
deleted file mode 100644
index 5434f9c7..00000000
Binary files a/birdavatar/avatars/eyes_3.png and /dev/null differ
diff --git a/birdavatar/avatars/eyes_4.png b/birdavatar/avatars/eyes_4.png
deleted file mode 100644
index 7c9cee1b..00000000
Binary files a/birdavatar/avatars/eyes_4.png and /dev/null differ
diff --git a/birdavatar/avatars/eyes_5.png b/birdavatar/avatars/eyes_5.png
deleted file mode 100644
index 89859b25..00000000
Binary files a/birdavatar/avatars/eyes_5.png and /dev/null differ
diff --git a/birdavatar/avatars/eyes_6.png b/birdavatar/avatars/eyes_6.png
deleted file mode 100644
index 7acdd69a..00000000
Binary files a/birdavatar/avatars/eyes_6.png and /dev/null differ
diff --git a/birdavatar/avatars/eyes_7.png b/birdavatar/avatars/eyes_7.png
deleted file mode 100644
index 098a066a..00000000
Binary files a/birdavatar/avatars/eyes_7.png and /dev/null differ
diff --git a/birdavatar/avatars/eyes_8.png b/birdavatar/avatars/eyes_8.png
deleted file mode 100644
index 64267cfa..00000000
Binary files a/birdavatar/avatars/eyes_8.png and /dev/null differ
diff --git a/birdavatar/avatars/eyes_9.png b/birdavatar/avatars/eyes_9.png
deleted file mode 100644
index 1807e049..00000000
Binary files a/birdavatar/avatars/eyes_9.png and /dev/null differ
diff --git a/birdavatar/avatars/hoop_1.png b/birdavatar/avatars/hoop_1.png
deleted file mode 100644
index d1606934..00000000
Binary files a/birdavatar/avatars/hoop_1.png and /dev/null differ
diff --git a/birdavatar/avatars/hoop_10.png b/birdavatar/avatars/hoop_10.png
deleted file mode 100644
index f8426701..00000000
Binary files a/birdavatar/avatars/hoop_10.png and /dev/null differ
diff --git a/birdavatar/avatars/hoop_2.png b/birdavatar/avatars/hoop_2.png
deleted file mode 100644
index e2f089d7..00000000
Binary files a/birdavatar/avatars/hoop_2.png and /dev/null differ
diff --git a/birdavatar/avatars/hoop_3.png b/birdavatar/avatars/hoop_3.png
deleted file mode 100644
index b985f340..00000000
Binary files a/birdavatar/avatars/hoop_3.png and /dev/null differ
diff --git a/birdavatar/avatars/hoop_4.png b/birdavatar/avatars/hoop_4.png
deleted file mode 100644
index cde95f8a..00000000
Binary files a/birdavatar/avatars/hoop_4.png and /dev/null differ
diff --git a/birdavatar/avatars/hoop_5.png b/birdavatar/avatars/hoop_5.png
deleted file mode 100644
index 1fc8312e..00000000
Binary files a/birdavatar/avatars/hoop_5.png and /dev/null differ
diff --git a/birdavatar/avatars/hoop_6.png b/birdavatar/avatars/hoop_6.png
deleted file mode 100644
index 95a7f498..00000000
Binary files a/birdavatar/avatars/hoop_6.png and /dev/null differ
diff --git a/birdavatar/avatars/hoop_7.png b/birdavatar/avatars/hoop_7.png
deleted file mode 100644
index 389d538f..00000000
Binary files a/birdavatar/avatars/hoop_7.png and /dev/null differ
diff --git a/birdavatar/avatars/hoop_8.png b/birdavatar/avatars/hoop_8.png
deleted file mode 100644
index 05936336..00000000
Binary files a/birdavatar/avatars/hoop_8.png and /dev/null differ
diff --git a/birdavatar/avatars/hoop_9.png b/birdavatar/avatars/hoop_9.png
deleted file mode 100644
index f58e8d2b..00000000
Binary files a/birdavatar/avatars/hoop_9.png and /dev/null differ
diff --git a/birdavatar/avatars/tail_1.png b/birdavatar/avatars/tail_1.png
deleted file mode 100644
index e544ca3e..00000000
Binary files a/birdavatar/avatars/tail_1.png and /dev/null differ
diff --git a/birdavatar/avatars/tail_2.png b/birdavatar/avatars/tail_2.png
deleted file mode 100644
index 355b6d16..00000000
Binary files a/birdavatar/avatars/tail_2.png and /dev/null differ
diff --git a/birdavatar/avatars/tail_3.png b/birdavatar/avatars/tail_3.png
deleted file mode 100644
index aebf9b4c..00000000
Binary files a/birdavatar/avatars/tail_3.png and /dev/null differ
diff --git a/birdavatar/avatars/tail_4.png b/birdavatar/avatars/tail_4.png
deleted file mode 100644
index 88e686e6..00000000
Binary files a/birdavatar/avatars/tail_4.png and /dev/null differ
diff --git a/birdavatar/avatars/tail_5.png b/birdavatar/avatars/tail_5.png
deleted file mode 100644
index 7bf9a2df..00000000
Binary files a/birdavatar/avatars/tail_5.png and /dev/null differ
diff --git a/birdavatar/avatars/tail_6.png b/birdavatar/avatars/tail_6.png
deleted file mode 100644
index 9a2341b3..00000000
Binary files a/birdavatar/avatars/tail_6.png and /dev/null differ
diff --git a/birdavatar/avatars/tail_7.png b/birdavatar/avatars/tail_7.png
deleted file mode 100644
index 99d38880..00000000
Binary files a/birdavatar/avatars/tail_7.png and /dev/null differ
diff --git a/birdavatar/avatars/tail_8.png b/birdavatar/avatars/tail_8.png
deleted file mode 100644
index 338a82a5..00000000
Binary files a/birdavatar/avatars/tail_8.png and /dev/null differ
diff --git a/birdavatar/avatars/tail_9.png b/birdavatar/avatars/tail_9.png
deleted file mode 100644
index eda337d1..00000000
Binary files a/birdavatar/avatars/tail_9.png and /dev/null differ
diff --git a/birdavatar/avatars/wing_1.png b/birdavatar/avatars/wing_1.png
deleted file mode 100644
index 14aadd7c..00000000
Binary files a/birdavatar/avatars/wing_1.png and /dev/null differ
diff --git a/birdavatar/avatars/wing_2.png b/birdavatar/avatars/wing_2.png
deleted file mode 100644
index 5b5c25ca..00000000
Binary files a/birdavatar/avatars/wing_2.png and /dev/null differ
diff --git a/birdavatar/avatars/wing_3.png b/birdavatar/avatars/wing_3.png
deleted file mode 100644
index bb84cdf0..00000000
Binary files a/birdavatar/avatars/wing_3.png and /dev/null differ
diff --git a/birdavatar/avatars/wing_4.png b/birdavatar/avatars/wing_4.png
deleted file mode 100644
index 44ad10e6..00000000
Binary files a/birdavatar/avatars/wing_4.png and /dev/null differ
diff --git a/birdavatar/avatars/wing_5.png b/birdavatar/avatars/wing_5.png
deleted file mode 100644
index c87d063e..00000000
Binary files a/birdavatar/avatars/wing_5.png and /dev/null differ
diff --git a/birdavatar/avatars/wing_6.png b/birdavatar/avatars/wing_6.png
deleted file mode 100644
index c29b31e8..00000000
Binary files a/birdavatar/avatars/wing_6.png and /dev/null differ
diff --git a/birdavatar/avatars/wing_7.png b/birdavatar/avatars/wing_7.png
deleted file mode 100644
index a4ed6610..00000000
Binary files a/birdavatar/avatars/wing_7.png and /dev/null differ
diff --git a/birdavatar/avatars/wing_8.png b/birdavatar/avatars/wing_8.png
deleted file mode 100644
index ed0738cb..00000000
Binary files a/birdavatar/avatars/wing_8.png and /dev/null differ
diff --git a/birdavatar/avatars/wing_9.png b/birdavatar/avatars/wing_9.png
deleted file mode 100644
index 07d59f89..00000000
Binary files a/birdavatar/avatars/wing_9.png and /dev/null differ
diff --git a/birdavatar/bird_src.ora b/birdavatar/bird_src.ora
deleted file mode 100644
index c88532a4..00000000
Binary files a/birdavatar/bird_src.ora and /dev/null differ
diff --git a/birdavatar/birdavatar.php b/birdavatar/birdavatar.php
deleted file mode 100644
index 4841ba52..00000000
--- a/birdavatar/birdavatar.php
+++ /dev/null
@@ -1,272 +0,0 @@
-<?php
-/**
- * Name: Bird Avatar Generator
- * Description: Generate a default avatar based on David Revoy's bird-avatar-generator https://www.peppercarrot.com/extras/html/2019_bird-generator/index.php
- * Version: 1.0
- * Author: Fabio <https://kirgroup.com/profile/fabrixxm>
- */
-
-use Friendica\App;
-use Friendica\Core\Hook;
-use Friendica\Core\Logger;
-use Friendica\Core\Renderer;
-use Friendica\Database\DBA;
-use Friendica\DI;
-use Friendica\Model\Contact;
-use Friendica\Model\Photo;
-use Friendica\Model\Profile;
-use Friendica\Network\HTTPException\NotFoundException;
-
-define("BIRDAVATAR_SIZE", 256);
-
-/**
- * Installs the addon hook
- */
-function birdavatar_install()
-{
-	Hook::register('avatar_lookup', __FILE__, 'birdavatar_lookup');
-	Hook::register('addon_settings', __FILE__, 'birdavatar_addon_settings');
-	Hook::register('addon_settings_post', __FILE__, 'birdavatar_addon_settings_post');
-
-	Logger::info('registered birdavatar');
-}
-
-/**
- * Bird avatar user settings page
- */
-function birdavatar_addon_settings(array &$data)
-{
-	if (!DI::userSession()->getLocalUserId()) {
-		return;
-	}
-
-	$t    = Renderer::getMarkupTemplate('settings.tpl', 'addon/birdavatar/');
-	$html = Renderer::replaceMacros($t, [
-		'$uncache'      => time(),
-		'$uid'          => DI::userSession()->getLocalUserId(),
-		'$setrandomize' => DI::l10n()->t('Set default profile avatar or randomize the bird.'),
-	]);
-
-	$data = [
-		'addon'  => 'birdavar',
-		'title'  => DI::l10n()->t('Bird Avatar Settings'),
-		'html'   => $html,
-		'submit' => [
-			'birdavatar-usebird'   => DI::l10n()->t('Use Bird as Avatar'),
-			'birdavatar-morebird'  => DI::l10n()->t('More Random Bird!'),
-			'birdavatar-emailbird' => DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'birdavatar', 'seed', false) ? DI::l10n()->t('Reset to email Bird') : null,
-		],
-	];
-}
-
-/**
- * Bird avatar user settings POST handle
- */
-function birdavatar_addon_settings_post(&$s)
-{
-	if (!DI::userSession()->getLocalUserId()) {
-		return;
-	}
-
-	if (!empty($_POST['birdavatar-usebird'])) {
-		$url = DI::baseUrl() . '/birdavatar/' . DI::userSession()->getLocalUserId() . '?ts=' . time();
-
-		$self = DBA::selectFirst('contact', ['id'], ['uid' => DI::userSession()->getLocalUserId(), 'self' => true]);
-		if (!DBA::isResult($self)) {
-			DI::sysmsg()->addNotice(DI::l10n()->t("The bird has not found itself."));
-			return;
-		}
-
-		Photo::importProfilePhoto($url, DI::userSession()->getLocalUserId(), $self['id']);
-
-		$condition = ['uid' => DI::userSession()->getLocalUserId(), 'contact-id' => $self['id']];
-		$photo     = DBA::selectFirst('photo', ['resource-id'], $condition);
-		if (!DBA::isResult($photo)) {
-			DI::sysmsg()->addNotice(DI::l10n()->t('There was an error, the bird flew away.'));
-			return;
-		}
-
-		DBA::update('photo', ['profile' => false], ['profile' => true, 'uid' => DI::userSession()->getLocalUserId()]);
-
-		$fields = ['profile' => true, 'album' => DI::l10n()->t('Profile Photos'), 'contact-id' => 0];
-		DBA::update('photo', $fields, ['uid' => DI::userSession()->getLocalUserId(), 'resource-id' => $photo['resource-id']]);
-
-		Photo::importProfilePhoto($url, DI::userSession()->getLocalUserId(), $self['id']);
-
-		Contact::updateSelfFromUserID(DI::userSession()->getLocalUserId(), true);
-
-		// Update global directory in background
-		Profile::publishUpdate(DI::userSession()->getLocalUserId());
-
-		DI::sysmsg()->addInfo(DI::l10n()->t('Meow!'));
-		return;
-	}
-
-	if (!empty($_POST['birdavatar-morebird'])) {
-		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'birdavatar', 'seed', time());
-	}
-
-	if (!empty($_POST['birdavatar-emailbird'])) {
-		DI::pConfig()->delete(DI::userSession()->getLocalUserId(), 'birdavatar', 'seed');
-	}
-}
-
-/**
- * Returns the URL to the bird avatar
- *
- * @param &$b array
- */
-function birdavatar_lookup(array &$b)
-{
-	$user = DBA::selectFirst('user', ['uid'], ['email' => $b['email']]);
-	if (DBA::isResult($user)) {
-		$url = DI::baseUrl() . '/birdavatar/' . $user['uid'];
-	} else {
-		$url = DI::baseUrl() . '/birdavatar/' . md5(trim(strtolower($b['email'])));
-	}
-
-	switch ($b['size']) {
-		case 300: $url .= "/4"; break;
-		case 80: $url .= "/5"; break;
-		case 48: $url .= "/6"; break;
-	}
-
-	$b['url']     = $url;
-	$b['success'] = true;
-}
-
-/**
- * This is a statement rather than an actual function definition. The simple
- * existence of this method is checked to figure out if the addon offers a
- * module.
- */
-function birdavatar_module() {}
-
-/**
- * Returns image for user id
- *
- * @throws NotFoundException
- *
- */
-function birdavatar_content()
-{
-	if (DI::args()->getArgc() < 2 || DI::args()->getArgc() > 3) {
-		throw new NotFoundException(); // this should be catched on index and show default "not found" page.
-	}
-
-	if (is_numeric(DI::args()->getArgv()[1])) {
-		$uid       = intval(DI::args()->getArgv()[1]);
-		$condition = ['uid' => $uid,
-			'account_expired'  => false, 'account_removed' => false];
-		$user = DBA::selectFirst('user', ['email'], $condition);
-
-		if ($user === false) {
-			throw new NotFoundException();
-		}
-
-		$seed = DI::pConfig()->get($uid, "birdavatar", "seed", md5(trim(strtolower($user['email']))));
-	} elseif (!empty(DI::args()->getArgv()[1])) {
-		$seed = DI::args()->getArgv()[1];
-	} else {
-		throw new NotFoundException();
-	}
-
-	$size = 0;
-	if (DI::args()->getArgc() == 3) {
-		$size = intval(DI::args()->getArgv()[2]);
-	}
-
-	// start generation
-	ob_start();
-
-	// render the picture:
-	build_bird($seed, $size);
-
-	ob_end_flush();
-
-	exit();
-}
-
-/**
- * ====================
- * BIRD-AVATAR-GENERATOR
- * ====================
- *
- * @authors: Andreas Gohr, David Revoy
- *
- * This PHP is licensed under the short and simple permissive:
- * [MIT License](https://en.wikipedia.org/wiki/MIT_License)
- *
- **/
-
-function build_bird($seed = '', $size = 0)
-{
-	// init random seed
-	if ($seed) {
-		srand(hexdec(substr(md5($seed), 0, 6)));
-	}
-
-	// throw the dice for body parts
-	$parts = [
-		'tail'       => rand(1,9),
-		'hoop'       => rand(1,10),
-		'body'       => rand(1,9),
-		'wing'       => rand(1,9),
-		'eyes'       => rand(1,9),
-		'bec'        => rand(1,9),
-		'accessorie' => rand(1,20)
-	];
-
-	// create backgound
-	$bird = @imagecreatetruecolor(BIRDAVATAR_SIZE, BIRDAVATAR_SIZE)
-		or die("GD image create failed");
-	$white = imagecolorallocate($bird, 255, 255, 255);
-	imagefill($bird, 0, 0, $white);
-
-	// add parts
-	foreach ($parts as $part => $num) {
-		$file = dirname(__FILE__) . '/avatars/' . $part . '_' . $num . '.png';
-
-		$im = @imagecreatefrompng($file);
-		if (!$im) {
-			die('Failed to load ' . $file);
-		}
-		imageSaveAlpha($im, true);
-		imagecopy($bird, $im, 0, 0, 0, 0, BIRDAVATAR_SIZE, BIRDAVATAR_SIZE);
-		imagedestroy($im);
-	}
-
-	// scale image
-	if ($size > 3 && $size < 7) {
-		switch ($size) {
-			case 4:
-				$size = 300;
-				break;
-			case 5:
-				$size = 80;
-				break;
-			case 6:
-				$size = 48;
-				break;
-		}
-
-		$dest = imagecreatetruecolor($size, $size) or die("GD image create failed");
-		imagealphablending($dest, false);
-		imagesavealpha($dest, true);
-		imagecopyresampled($dest, $bird, 0, 0, 0, 0, $size, $size, BIRDAVATAR_SIZE, BIRDAVATAR_SIZE);
-		imagedestroy($bird);
-		$bird = $dest;
-	}
-
-	// restore random seed
-	if ($seed) {
-		srand();
-	}
-
-	header('Pragma: public');
-	header('Cache-Control: max-age=86400');
-	header('Expires: ' . gmdate('D, d M Y H:i:s \G\M\T', time() + 86400));
-	header('Content-Type: image/jpg');
-	imagejpeg($bird, null, 90);
-	imagedestroy($bird);
-}
diff --git a/birdavatar/lang/C/messages.po b/birdavatar/lang/C/messages.po
deleted file mode 100644
index 0d90e08a..00000000
--- a/birdavatar/lang/C/messages.po
+++ /dev/null
@@ -1,54 +0,0 @@
-# ADDON birdavatar
-# Copyright (C) 
-# This file is distributed under the same license as the Friendica birdavatar addon package.
-# 
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-24 08:50-0500\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: birdavatar.php:47
-msgid "Set default profile avatar or randomize the bird."
-msgstr ""
-
-#: birdavatar.php:52
-msgid "Bird Avatar Settings"
-msgstr ""
-
-#: birdavatar.php:55
-msgid "Use Bird as Avatar"
-msgstr ""
-
-#: birdavatar.php:56
-msgid "More Random Bird!"
-msgstr ""
-
-#: birdavatar.php:57
-msgid "Reset to email Bird"
-msgstr ""
-
-#: birdavatar.php:76
-msgid "The bird has not found itself."
-msgstr ""
-
-#: birdavatar.php:85
-msgid "There was an error, the bird flew away."
-msgstr ""
-
-#: birdavatar.php:91
-msgid "Profile Photos"
-msgstr ""
-
-#: birdavatar.php:101
-msgid "Meow!"
-msgstr ""
diff --git a/birdavatar/templates/settings.tpl b/birdavatar/templates/settings.tpl
deleted file mode 100644
index 13230bd1..00000000
--- a/birdavatar/templates/settings.tpl
+++ /dev/null
@@ -1,2 +0,0 @@
-<p>{{$setrandomize}}</p>
-<p><img src="{{$basepath}}/birdavatar/{{$uid}}?{{$uncache}}"></p>
diff --git a/blackout/blackout.php b/blackout/blackout.php
index 55fb8d32..72c2f62c 100644
--- a/blackout/blackout.php
+++ b/blackout/blackout.php
@@ -44,77 +44,78 @@
  * THE SOFTWARE.
  */
 
-use Friendica\App;
+use Friendica\Core\Config;
 use Friendica\Core\Hook;
+use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Core\System;
-use Friendica\DI;
 
 function blackout_install() {
 	Hook::register('page_header', 'addon/blackout/blackout.php', 'blackout_redirect');
 }
 
-function blackout_redirect ($b)
-{
+function blackout_uninstall() {
+	Hook::unregister('page_header', 'addon/blackout/blackout.php', 'blackout_redirect');
+}
+function blackout_redirect ($a, $b) {
 	// if we have a logged in user, don't throw her out
-	if (DI::userSession()->getLocalUserId()) {
+	if (local_user()) {
 		return true;
 	}
 
 	// else...
-	$mystart = DI::config()->get('blackout','begindate');
-	$myend   = DI::config()->get('blackout','enddate');
-	$myurl   = DI::config()->get('blackout','url');
+	$mystart = Config::get('blackout','begindate');
+	$myend   = Config::get('blackout','enddate');
+	$myurl   = Config::get('blackout','url');
 	$now = time();
 	$date1 = DateTime::createFromFormat('Y-m-d G:i', $mystart);
 	$date2 = DateTime::createFromFormat('Y-m-d G:i', $myend);
-	if ($date1 && $date2) {
+	if ( $date1 && $date2 ) {
 		$date1 = DateTime::createFromFormat('Y-m-d G:i', $mystart)->format('U');
 		$date2 = DateTime::createFromFormat('Y-m-d G:i', $myend)->format('U');
 	} else {
-		$date1 = 0;
-		$date2 = 0;
+		   $date1 = 0;
+		   $date2 = 0;
 	}
-
 	if (( $date1 <= $now ) && ( $now <= $date2 )) {
-		Logger::notice('redirecting user to blackout page');
+		Logger::log('redirecting user to blackout page');
 		System::externalRedirect($myurl);
 	}
 }
 
-function blackout_addon_admin(string &$o)
-{
-	$mystart = DI::config()->get('blackout','begindate');
-	if (! is_string($mystart)) { $mystart = 'YYYY-MM-DD hh:mm'; }
-	$myend   = DI::config()->get('blackout','enddate');
-	if (! is_string($myend)) { $myend = 'YYYY-MM-DD hh:mm'; }
-	$myurl   = DI::config()->get('blackout','url');
-	if (! is_string($myurl)) { $myurl = 'https://www.example.com'; }
-	$t = Renderer::getMarkupTemplate( 'admin.tpl', 'addon/blackout/' );
+function blackout_addon_admin(&$a, &$o) {
+	$mystart = Config::get('blackout','begindate');
+	if (! is_string($mystart)) { $mystart = "YYYY-MM-DD hh:mm"; }
+	$myend   = Config::get('blackout','enddate');
+	if (! is_string($myend)) { $myend = "YYYY-MM-DD hh:mm"; }
+	$myurl   = Config::get('blackout','url');
+	if (! is_string($myurl)) { $myurl = "https://www.example.com"; }
+	$t = Renderer::getMarkupTemplate( "admin.tpl", "addon/blackout/" );
 
 	$date1 = DateTime::createFromFormat('Y-m-d G:i', $mystart);
 	$date2 = DateTime::createFromFormat('Y-m-d G:i', $myend);
 	// a note for the admin
-	$adminnote = '';
+	$adminnote = "";
 	if ($date2 < $date1) {
-		$adminnote = DI::l10n()->t("The end-date is prior to the start-date of the blackout, you should fix this.");
+		$adminnote = L10n::t("The end-date is prior to the start-date of the blackout, you should fix this");
 	} else {
-		$adminnote = DI::l10n()->t("Please double check the current settings for the blackout. It will begin on <strong>%s</strong> and end on <strong>%s</strong>.", $mystart, $myend);
+		$adminnote = L10n::t("Please double check that the current settings for the blackout. Begin will be <strong>%s</strong> and it will end <strong>%s</strong>.", $mystart, $myend);
 	}
 	$o = Renderer::replaceMacros($t, [
-		'$submit' => DI::l10n()->t('Save Settings'),
-		'$rurl' => ['rurl', DI::l10n()->t("Redirect URL"), $myurl, DI::l10n()->t("All your visitors from the web will be redirected to this URL."), '', '', 'url'],
-		'$startdate' => ['startdate', DI::l10n()->t("Begin of the Blackout"), $mystart, DI::l10n()->t("Format is <tt>YYYY-MM-DD hh:mm</tt>; <em>YYYY</em> year, <em>MM</em> month, <em>DD</em> day, <em>hh</em> hour and <em>mm</em> minute.")],
-		'$enddate' => ['enddate', DI::l10n()->t("End of the Blackout"), $myend, ''],
+		'$submit' => L10n::t('Save Settings'),
+		'$rurl' => ["rurl", L10n::t("Redirect URL"), $myurl, L10n::t("all your visitors from the web will be redirected to this URL"), "", "", "url"],
+		'$startdate' => ["startdate", L10n::t("Begin of the Blackout"), $mystart, L10n::t("Format is <tt>YYYY-MM-DD hh:mm</tt>; <em>YYYY</em> year, <em>MM</em> month, <em>DD</em> day, <em>hh</em> hour and <em>mm</em> minute.")],
+		'$enddate' => ["enddate", L10n::t("End of the Blackout"), $myend, ""],
 		'$adminnote' => $adminnote,
-		'$aboutredirect' => DI::l10n()->t("<strong>Note</strong>: The redirect will be active from the moment you press the submit button. Users currently logged in will <strong>not</strong> be thrown out but can't login again after logging out while the blackout is still in place."),
+		'$aboutredirect' => L10n::t("<strong>Note</strong>: The redirect will be active from the moment you press the submit button. Users currently logged in will <strong>not</strong> be thrown out but can't login again after logging out should the blackout is still in place."),
 	]);
 }
-
-function blackout_addon_admin_post ()
-{
-	DI::config()->set('blackout', 'begindate', trim($_POST['startdate']));
-	DI::config()->set('blackout', 'enddate', trim($_POST['enddate']));
-	DI::config()->set('blackout', 'url', trim($_POST['rurl']));
+function blackout_addon_admin_post (&$a) {
+	$begindate = trim($_POST['startdate']);
+	$enddate = trim($_POST['enddate']);
+	$url = trim($_POST['rurl']);
+	Config::set('blackout','begindate',$begindate);
+	Config::set('blackout','enddate',$enddate);
+	Config::set('blackout','url',$url);
 }
diff --git a/blackout/lang/C/messages.po b/blackout/lang/C/messages.po
index 6ae15759..abdd3fd9 100644
--- a/blackout/lang/C/messages.po
+++ b/blackout/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
+"POT-Creation-Date: 2019-03-12 09:26+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,48 +17,48 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: blackout.php:97
+#: blackout.php:101
 msgid ""
-"The end-date is prior to the start-date of the blackout, you should fix this."
+"The end-date is prior to the start-date of the blackout, you should fix this"
 msgstr ""
 
-#: blackout.php:99
+#: blackout.php:103
 #, php-format
 msgid ""
-"Please double check the current settings for the blackout. It will begin on "
-"<strong>%s</strong> and end on <strong>%s</strong>."
+"Please double check that the current settings for the blackout. Begin will "
+"be <strong>%s</strong> and it will end <strong>%s</strong>."
 msgstr ""
 
-#: blackout.php:102
+#: blackout.php:106
 msgid "Save Settings"
 msgstr ""
 
-#: blackout.php:103
+#: blackout.php:107
 msgid "Redirect URL"
 msgstr ""
 
-#: blackout.php:103
-msgid "All your visitors from the web will be redirected to this URL."
+#: blackout.php:107
+msgid "all your visitors from the web will be redirected to this URL"
 msgstr ""
 
-#: blackout.php:104
+#: blackout.php:108
 msgid "Begin of the Blackout"
 msgstr ""
 
-#: blackout.php:104
+#: blackout.php:108
 msgid ""
 "Format is <tt>YYYY-MM-DD hh:mm</tt>; <em>YYYY</em> year, <em>MM</em> month, "
 "<em>DD</em> day, <em>hh</em> hour and <em>mm</em> minute."
 msgstr ""
 
-#: blackout.php:105
+#: blackout.php:109
 msgid "End of the Blackout"
 msgstr ""
 
-#: blackout.php:107
+#: blackout.php:111
 msgid ""
 "<strong>Note</strong>: The redirect will be active from the moment you press "
 "the submit button. Users currently logged in will <strong>not</strong> be "
-"thrown out but can't login again after logging out while the blackout is "
+"thrown out but can't login again after logging out should the blackout is "
 "still in place."
 msgstr ""
diff --git a/blackout/lang/ar/messages.po b/blackout/lang/ar/messages.po
deleted file mode 100644
index 5014fcb2..00000000
--- a/blackout/lang/ar/messages.po
+++ /dev/null
@@ -1,67 +0,0 @@
-# ADDON blackout
-# Copyright (C)
-# This file is distributed under the same license as the Friendica blackout addon package.
-# 
-# 
-# Translators:
-# Farida Khalaf <faridakhalaf@hotmail.com>, 2021
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2021-10-26 18:49+0000\n"
-"Last-Translator: abidin toumi <abidin24@tutanota.com>\n"
-"Language-Team: Arabic (http://www.transifex.com/Friendica/friendica/language/ar/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ar\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-
-#: blackout.php:97
-msgid ""
-"The end-date is prior to the start-date of the blackout, you should fix "
-"this."
-msgstr "تاريخ الانتهاء يسبق تاريخ بدء التعتيم ، يجب إصلاح هذا."
-
-#: blackout.php:99
-#, php-format
-msgid ""
-"Please double check the current settings for the blackout. It will begin on "
-"<strong>%s</strong> and end on <strong>%s</strong>."
-msgstr "يرجى التحقق مرة أخرى من الإعدادات الحالية لحالة التعتيم. بدأ في 1 ٪ 1 %s وانتهاء في2٪2 %s."
-
-#: blackout.php:102
-msgid "Save Settings"
-msgstr "احفظ الإعدادات"
-
-#: blackout.php:103
-msgid "Redirect URL"
-msgstr "أعد توجيه الرابط"
-
-#: blackout.php:103
-msgid "All your visitors from the web will be redirected to this URL."
-msgstr "سيعاد توجيه جميع الزوار إلى هذا الرابط."
-
-#: blackout.php:104
-msgid "Begin of the Blackout"
-msgstr "بدء التعتيم"
-
-#: blackout.php:104
-msgid ""
-"Format is <tt>YYYY-MM-DD hh:mm</tt>; <em>YYYY</em> year, <em>MM</em> month, "
-"<em>DD</em> day, <em>hh</em> hour and <em>mm</em> minute."
-msgstr "الصيغة هي: <tt>YYYY-MM-DD hh:mm</tt>؛\n<em>YYYY</em> السنة، <em>MM</em> الشهر، <em>DD</em> اليوم، <em>hh</em> الساعة، <em>mm</em> الدقيقة."
-
-#: blackout.php:105
-msgid "End of the Blackout"
-msgstr "نهاية التعتيم"
-
-#: blackout.php:107
-msgid ""
-"<strong>Note</strong>: The redirect will be active from the moment you press"
-" the submit button. Users currently logged in will <strong>not</strong> be "
-"thrown out but can't login again after logging out while the blackout is "
-"still in place."
-msgstr "<strong>ملاحظة</strong>: إعادة التوجيه ستنشط إبتداءً من لحظة ضغط زر الإرسال. <strong>لن</strong> يُطرد المستخدمون الوالجون حاليًا ولكن إذا خروجوا لن يمكنهم الولوج أثناء التعتيم."
diff --git a/blackout/lang/ar/strings.php b/blackout/lang/ar/strings.php
deleted file mode 100644
index 86eb2aef..00000000
--- a/blackout/lang/ar/strings.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_ar")) {
-function string_plural_select_ar($n){
-	$n = intval($n);
-	if ($n==0) { return 0; } else if ($n==1) { return 1; } else if ($n==2) { return 2; } else if ($n%100>=3 && $n%100<=10) { return 3; } else if ($n%100>=11 && $n%100<=99) { return 4; } else  { return 5; }
-}}
-$a->strings['The end-date is prior to the start-date of the blackout, you should fix this.'] = 'تاريخ الانتهاء يسبق تاريخ بدء التعتيم ، يجب إصلاح هذا.';
-$a->strings['Please double check the current settings for the blackout. It will begin on <strong>%s</strong> and end on <strong>%s</strong>.'] = 'يرجى التحقق مرة أخرى من الإعدادات الحالية لحالة التعتيم. بدأ في 1 ٪ 1 %s وانتهاء في2٪2 %s.';
-$a->strings['Save Settings'] = 'احفظ الإعدادات';
-$a->strings['Redirect URL'] = 'أعد توجيه الرابط';
-$a->strings['All your visitors from the web will be redirected to this URL.'] = 'سيعاد توجيه جميع الزوار إلى هذا الرابط.';
-$a->strings['Begin of the Blackout'] = 'بدء التعتيم';
-$a->strings['Format is <tt>YYYY-MM-DD hh:mm</tt>; <em>YYYY</em> year, <em>MM</em> month, <em>DD</em> day, <em>hh</em> hour and <em>mm</em> minute.'] = 'الصيغة هي: <tt>YYYY-MM-DD hh:mm</tt>؛
-<em>YYYY</em> السنة، <em>MM</em> الشهر، <em>DD</em> اليوم، <em>hh</em> الساعة، <em>mm</em> الدقيقة.';
-$a->strings['End of the Blackout'] = 'نهاية التعتيم';
-$a->strings['<strong>Note</strong>: The redirect will be active from the moment you press the submit button. Users currently logged in will <strong>not</strong> be thrown out but can\'t login again after logging out while the blackout is still in place.'] = '<strong>ملاحظة</strong>: إعادة التوجيه ستنشط إبتداءً من لحظة ضغط زر الإرسال. <strong>لن</strong> يُطرد المستخدمون الوالجون حاليًا ولكن إذا خروجوا لن يمكنهم الولوج أثناء التعتيم.';
diff --git a/blackout/lang/ca/strings.php b/blackout/lang/ca/strings.php
index df85e842..20c8c1da 100644
--- a/blackout/lang/ca/strings.php
+++ b/blackout/lang/ca/strings.php
@@ -3,14 +3,15 @@
 if(! function_exists("string_plural_select_ca")) {
 function string_plural_select_ca($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['The end-date is prior to the start-date of the blackout, you should fix this'] = 'La data de finalització és anterior a la data d\'inici de l\'apagada, hauríeu d\'arreglar-ho';
-$a->strings['Please double check that the current settings for the blackout. Begin will be <strong>%s</strong> and it will end <strong>%s</strong>.'] = 'Verifiqueu si la configuració actual per a l\'apagat. Començarà serà <strong>%s</strong> i s’acabarà <strong>%s</strong>.';
-$a->strings['Save Settings'] = 'Desa la configuració';
-$a->strings['Redirect URL'] = 'Redirigir URL';
-$a->strings['all your visitors from the web will be redirected to this URL'] = 'tots els visitants del web seran redirigits a aquest tema URL';
-$a->strings['Begin of the Blackout'] = 'Inici de l’apagada';
-$a->strings['Format is <tt>YYYY-MM-DD hh:mm</tt>; <em>YYYY</em> year, <em>MM</em> month, <em>DD</em> day, <em>hh</em> hour and <em>mm</em> minute.'] = 'El format és <tt>YYYY-MM-DD hh:mm</tt>; <em>YYYY</em> year, <em>MM</em> mes. <em>DD</em> day, <em>hh</em>hora i <em>mm</em> minut.';
-$a->strings['End of the Blackout'] = 'Fi de l’apagada';
-$a->strings['<strong>Note</strong>: The redirect will be active from the moment you press the submit button. Users currently logged in will <strong>not</strong> be thrown out but can\'t login again after logging out should the blackout is still in place.'] = '<strong>Nota</strong>: La redirecció estarà activa des del moment en què premeu el botó d\'enviament. Els usuaris actualment connectats ho faran <strong>no</strong> es llençarà però no es pot tornar a iniciar la sessió un cop s\'hagi desactivat l\'apagada.';
+;
+$a->strings["The end-date is prior to the start-date of the blackout, you should fix this"] = "La data de finalització és anterior a la data d'inici de l'apagada, hauríeu d'arreglar-ho";
+$a->strings["Please double check that the current settings for the blackout. Begin will be <strong>%s</strong> and it will end <strong>%s</strong>."] = "Verifiqueu si la configuració actual per a l'apagat. Començarà serà <strong>%s</strong> i s’acabarà <strong>%s</strong>.";
+$a->strings["Save Settings"] = "Desa la configuració";
+$a->strings["Redirect URL"] = "Redirigir URL";
+$a->strings["all your visitors from the web will be redirected to this URL"] = "tots els visitants del web seran redirigits a aquest tema URL";
+$a->strings["Begin of the Blackout"] = "Inici de l’apagada";
+$a->strings["Format is <tt>YYYY-MM-DD hh:mm</tt>; <em>YYYY</em> year, <em>MM</em> month, <em>DD</em> day, <em>hh</em> hour and <em>mm</em> minute."] = "El format és <tt>YYYY-MM-DD hh:mm</tt>; <em>YYYY</em> year, <em>MM</em> mes. <em>DD</em> day, <em>hh</em>hora i <em>mm</em> minut.";
+$a->strings["End of the Blackout"] = "Fi de l’apagada";
+$a->strings["<strong>Note</strong>: The redirect will be active from the moment you press the submit button. Users currently logged in will <strong>not</strong> be thrown out but can't login again after logging out should the blackout is still in place."] = "<strong>Nota</strong>: La redirecció estarà activa des del moment en què premeu el botó d'enviament. Els usuaris actualment connectats ho faran <strong>no</strong> es llençarà però no es pot tornar a iniciar la sessió un cop s'hagi desactivat l'apagada.";
diff --git a/blackout/lang/cs/strings.php b/blackout/lang/cs/strings.php
index 1736eafe..c38d7065 100644
--- a/blackout/lang/cs/strings.php
+++ b/blackout/lang/cs/strings.php
@@ -3,14 +3,15 @@
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
 	$n = intval($n);
-	if (($n == 1 && $n % 1 == 0)) { return 0; } else if (($n >= 2 && $n <= 4 && $n % 1 == 0)) { return 1; } else if (($n % 1 != 0 )) { return 2; } else  { return 3; }
+	return ($n == 1 && $n % 1 == 0) ? 0 : ($n >= 2 && $n <= 4 && $n % 1 == 0) ? 1: ($n % 1 != 0 ) ? 2 : 3;;
 }}
-$a->strings['The end-date is prior to the start-date of the blackout, you should fix this'] = 'Datum konce odstávky je před datem zahájení odstávky, prosím opravte to';
-$a->strings['Please double check that the current settings for the blackout. Begin will be <strong>%s</strong> and it will end <strong>%s</strong>.'] = 'Prosím zkontrolujte svá aktuální nastavení pro odstávku. Začne <strong>%s</strong> a skončí <strong>%s</strong>.';
-$a->strings['Save Settings'] = 'Uložit nastavení';
-$a->strings['Redirect URL'] = 'URL přesměrování';
-$a->strings['all your visitors from the web will be redirected to this URL'] = 'všichni vaši návštěvníci z webu budou přesměrování na tuto URL adresu';
-$a->strings['Begin of the Blackout'] = 'Zahájení odstávky';
-$a->strings['Format is <tt>YYYY-MM-DD hh:mm</tt>; <em>YYYY</em> year, <em>MM</em> month, <em>DD</em> day, <em>hh</em> hour and <em>mm</em> minute.'] = 'Formát je <tt>RRRR-MM-DD hh:mm</tt>; <em>RRRR</em> rok, <em>MM</em> měsíc, <em>DD</em> den, <em>hh</em> hodina a <em>mm</em> minuta.';
-$a->strings['End of the Blackout'] = 'Konec odstávky';
-$a->strings['<strong>Note</strong>: The redirect will be active from the moment you press the submit button. Users currently logged in will <strong>not</strong> be thrown out but can\'t login again after logging out should the blackout is still in place.'] = '<strong>Poznámka</strong>: Přesměrování bude aktivní od chvíle, kdy stisknete tlačítko pro odeslání. Aktuálně přihlášení uživatelé <strong>nebudou</strong> odhlášeni, ale po odhlášení se po dobu trvání odstávky nebudou moci znovu přihlásit.';
+;
+$a->strings["The end-date is prior to the start-date of the blackout, you should fix this"] = "Datum konce odstávky je před datem zahájení odstávky, prosím opravte to";
+$a->strings["Please double check that the current settings for the blackout. Begin will be <strong>%s</strong> and it will end <strong>%s</strong>."] = "Prosím zkontrolujte svá aktuální nastavení pro odstávku. Začne <strong>%s</strong> a skončí <strong>%s</strong>.";
+$a->strings["Save Settings"] = "Uložit nastavení";
+$a->strings["Redirect URL"] = "URL přesměrování";
+$a->strings["all your visitors from the web will be redirected to this URL"] = "všichni vaši návštěvníci z webu budou přesměrování na tuto URL adresu";
+$a->strings["Begin of the Blackout"] = "Zahájení odstávky";
+$a->strings["Format is <tt>YYYY-MM-DD hh:mm</tt>; <em>YYYY</em> year, <em>MM</em> month, <em>DD</em> day, <em>hh</em> hour and <em>mm</em> minute."] = "Formát je <tt>RRRR-MM-DD hh:mm</tt>; <em>RRRR</em> rok, <em>MM</em> měsíc, <em>DD</em> den, <em>hh</em> hodina a <em>mm</em> minuta.";
+$a->strings["End of the Blackout"] = "Konec odstávky";
+$a->strings["<strong>Note</strong>: The redirect will be active from the moment you press the submit button. Users currently logged in will <strong>not</strong> be thrown out but can't login again after logging out should the blackout is still in place."] = "<strong>Poznámka</strong>: Přesměrování bude aktivní od chvíle, kdy stisknete tlačítko pro odeslání. Aktuálně přihlášení uživatelé <strong>nebudou</strong> odhlášeni, ale po odhlášení se po dobu trvání odstávky nebudou moci znovu přihlásit.";
diff --git a/blackout/lang/da-dk/messages.po b/blackout/lang/da-dk/messages.po
deleted file mode 100644
index 8e7993e2..00000000
--- a/blackout/lang/da-dk/messages.po
+++ /dev/null
@@ -1,66 +0,0 @@
-# ADDON blackout
-# Copyright (C)
-# This file is distributed under the same license as the Friendica blackout addon package.
-# 
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2014-06-22 11:19+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Danish (Denmark) (http://www.transifex.com/Friendica/friendica/language/da_DK/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: da_DK\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: blackout.php:97
-msgid ""
-"The end-date is prior to the start-date of the blackout, you should fix "
-"this."
-msgstr ""
-
-#: blackout.php:99
-#, php-format
-msgid ""
-"Please double check the current settings for the blackout. It will begin on "
-"<strong>%s</strong> and end on <strong>%s</strong>."
-msgstr ""
-
-#: blackout.php:102
-msgid "Save Settings"
-msgstr ""
-
-#: blackout.php:103
-msgid "Redirect URL"
-msgstr ""
-
-#: blackout.php:103
-msgid "All your visitors from the web will be redirected to this URL."
-msgstr ""
-
-#: blackout.php:104
-msgid "Begin of the Blackout"
-msgstr ""
-
-#: blackout.php:104
-msgid ""
-"Format is <tt>YYYY-MM-DD hh:mm</tt>; <em>YYYY</em> year, <em>MM</em> month, "
-"<em>DD</em> day, <em>hh</em> hour and <em>mm</em> minute."
-msgstr ""
-
-#: blackout.php:105
-msgid "End of the Blackout"
-msgstr ""
-
-#: blackout.php:107
-msgid ""
-"<strong>Note</strong>: The redirect will be active from the moment you press"
-" the submit button. Users currently logged in will <strong>not</strong> be "
-"thrown out but can't login again after logging out while the blackout is "
-"still in place."
-msgstr ""
diff --git a/blackout/lang/da-dk/strings.php b/blackout/lang/da-dk/strings.php
deleted file mode 100644
index 09554750..00000000
--- a/blackout/lang/da-dk/strings.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_da_dk")) {
-function string_plural_select_da_dk($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
diff --git a/blackout/lang/de/messages.po b/blackout/lang/de/messages.po
index 3549512f..5e4e3679 100644
--- a/blackout/lang/de/messages.po
+++ b/blackout/lang/de/messages.po
@@ -4,66 +4,64 @@
 # 
 # 
 # Translators:
-# Till Mohr <tmtrfx@till-mohr.de>, 2021
 # Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2014
-# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2019,2021
+# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2019
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2014-06-22 11:19+0000\n"
-"Last-Translator: Till Mohr <tmtrfx@till-mohr.de>, 2021\n"
-"Language-Team: German (http://app.transifex.com/Friendica/friendica/language/de/)\n"
+"POT-Creation-Date: 2019-03-12 09:26+0100\n"
+"PO-Revision-Date: 2019-03-13 05:20+0000\n"
+"Last-Translator: Tobias Diekershoff <tobias.diekershoff@gmx.net>\n"
+"Language-Team: German (http://www.transifex.com/Friendica/friendica/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: blackout.php:97
+#: blackout.php:101
 msgid ""
-"The end-date is prior to the start-date of the blackout, you should fix "
-"this."
-msgstr "Das Enddatum liegt vor dem Startdatum des Blackouts, du solltest dies korrigieren."
+"The end-date is prior to the start-date of the blackout, you should fix this"
+msgstr "Das End-Datum des Blackouts liegt vor dem Start-Datum. Du solltest das anpassen."
 
-#: blackout.php:99
+#: blackout.php:103
 #, php-format
 msgid ""
-"Please double check the current settings for the blackout. It will begin on "
-"<strong>%s</strong> and end on <strong>%s</strong>."
-msgstr "Bitte überprüfe die aktuellen Einstellungen für den Blackout. Start-Zeitpunkt ist <strong>%s</strong>, und das Ende ist <strong>%s</strong>."
+"Please double check that the current settings for the blackout. Begin will "
+"be <strong>%s</strong> and it will end <strong>%s</strong>."
+msgstr "Bitte überprüfe die aktuellen Einstellungen für den Blackout. Start-Zeitpunkt ist <strong>%s</strong> und das Ende ist <strong>%s</strong>."
 
-#: blackout.php:102
+#: blackout.php:106
 msgid "Save Settings"
 msgstr "Einstellungen speichern"
 
-#: blackout.php:103
+#: blackout.php:107
 msgid "Redirect URL"
 msgstr "Umleitungs-URL"
 
-#: blackout.php:103
-msgid "All your visitors from the web will be redirected to this URL."
+#: blackout.php:107
+msgid "all your visitors from the web will be redirected to this URL"
 msgstr "Alle Besucher der Webseite werden zu dieser URL umgeleitet"
 
-#: blackout.php:104
+#: blackout.php:108
 msgid "Begin of the Blackout"
 msgstr "Beginn des Blackouts"
 
-#: blackout.php:104
+#: blackout.php:108
 msgid ""
 "Format is <tt>YYYY-MM-DD hh:mm</tt>; <em>YYYY</em> year, <em>MM</em> month, "
 "<em>DD</em> day, <em>hh</em> hour and <em>mm</em> minute."
 msgstr "Das Format ist <tt>YYYY-MM-DD hh:mm</tt>: <em>YYYY</em> das Jahr, <em>MM</em> der Monat, <em>DD</em> der Tag sowie <em>hh</em> Stunden und <em>mm</em> Minuten."
 
-#: blackout.php:105
+#: blackout.php:109
 msgid "End of the Blackout"
 msgstr "Ende des Blackouts"
 
-#: blackout.php:107
+#: blackout.php:111
 msgid ""
 "<strong>Note</strong>: The redirect will be active from the moment you press"
 " the submit button. Users currently logged in will <strong>not</strong> be "
-"thrown out but can't login again after logging out while the blackout is "
+"thrown out but can't login again after logging out should the blackout is "
 "still in place."
-msgstr "<strong>Hinweis</strong>: Die Umleitung ist von dem Moment an aktiv, wenn du den \"Einstellungen speichern\"-Button drückst. Derzeit angemeldete Nutzer werden <strong>nicht</strong> ausgeschlossen, können sich aber, nachdem sie sich während des Blackouts ausgeloggt haben, nicht mehr anmelden."
+msgstr "<strong>Hinweis</strong>: Die Umleitung ist von dem Moment aktiv, wenn du den \"Einstellungen speichern\" Button drückst. Derzeit angemeldete Nutzer werden <strong>nicht</strong> ausgeworfen werden, können sich aber nicht wieder anmelden, wenn sie sich während des Blackouts abmelden."
diff --git a/blackout/lang/de/strings.php b/blackout/lang/de/strings.php
index 7b689a5e..41ff52c2 100644
--- a/blackout/lang/de/strings.php
+++ b/blackout/lang/de/strings.php
@@ -3,14 +3,15 @@
 if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['The end-date is prior to the start-date of the blackout, you should fix this.'] = 'Das Enddatum liegt vor dem Startdatum des Blackouts, du solltest dies korrigieren.';
-$a->strings['Please double check the current settings for the blackout. It will begin on <strong>%s</strong> and end on <strong>%s</strong>.'] = 'Bitte überprüfe die aktuellen Einstellungen für den Blackout. Start-Zeitpunkt ist <strong>%s</strong>, und das Ende ist <strong>%s</strong>.';
-$a->strings['Save Settings'] = 'Einstellungen speichern';
-$a->strings['Redirect URL'] = 'Umleitungs-URL';
-$a->strings['All your visitors from the web will be redirected to this URL.'] = 'Alle Besucher der Webseite werden zu dieser URL umgeleitet';
-$a->strings['Begin of the Blackout'] = 'Beginn des Blackouts';
-$a->strings['Format is <tt>YYYY-MM-DD hh:mm</tt>; <em>YYYY</em> year, <em>MM</em> month, <em>DD</em> day, <em>hh</em> hour and <em>mm</em> minute.'] = 'Das Format ist <tt>YYYY-MM-DD hh:mm</tt>: <em>YYYY</em> das Jahr, <em>MM</em> der Monat, <em>DD</em> der Tag sowie <em>hh</em> Stunden und <em>mm</em> Minuten.';
-$a->strings['End of the Blackout'] = 'Ende des Blackouts';
-$a->strings['<strong>Note</strong>: The redirect will be active from the moment you press the submit button. Users currently logged in will <strong>not</strong> be thrown out but can\'t login again after logging out while the blackout is still in place.'] = '<strong>Hinweis</strong>: Die Umleitung ist von dem Moment an aktiv, wenn du den "Einstellungen speichern"-Button drückst. Derzeit angemeldete Nutzer werden <strong>nicht</strong> ausgeschlossen, können sich aber, nachdem sie sich während des Blackouts ausgeloggt haben, nicht mehr anmelden.';
+;
+$a->strings["The end-date is prior to the start-date of the blackout, you should fix this"] = "Das End-Datum des Blackouts liegt vor dem Start-Datum. Du solltest das anpassen.";
+$a->strings["Please double check that the current settings for the blackout. Begin will be <strong>%s</strong> and it will end <strong>%s</strong>."] = "Bitte überprüfe die aktuellen Einstellungen für den Blackout. Start-Zeitpunkt ist <strong>%s</strong> und das Ende ist <strong>%s</strong>.";
+$a->strings["Save Settings"] = "Einstellungen speichern";
+$a->strings["Redirect URL"] = "Umleitungs-URL";
+$a->strings["all your visitors from the web will be redirected to this URL"] = "Alle Besucher der Webseite werden zu dieser URL umgeleitet";
+$a->strings["Begin of the Blackout"] = "Beginn des Blackouts";
+$a->strings["Format is <tt>YYYY-MM-DD hh:mm</tt>; <em>YYYY</em> year, <em>MM</em> month, <em>DD</em> day, <em>hh</em> hour and <em>mm</em> minute."] = "Das Format ist <tt>YYYY-MM-DD hh:mm</tt>: <em>YYYY</em> das Jahr, <em>MM</em> der Monat, <em>DD</em> der Tag sowie <em>hh</em> Stunden und <em>mm</em> Minuten.";
+$a->strings["End of the Blackout"] = "Ende des Blackouts";
+$a->strings["<strong>Note</strong>: The redirect will be active from the moment you press the submit button. Users currently logged in will <strong>not</strong> be thrown out but can't login again after logging out should the blackout is still in place."] = "<strong>Hinweis</strong>: Die Umleitung ist von dem Moment aktiv, wenn du den \"Einstellungen speichern\" Button drückst. Derzeit angemeldete Nutzer werden <strong>nicht</strong> ausgeworfen werden, können sich aber nicht wieder anmelden, wenn sie sich während des Blackouts abmelden.";
diff --git a/blackout/lang/en-gb/strings.php b/blackout/lang/en-gb/strings.php
index af276d01..18b61594 100644
--- a/blackout/lang/en-gb/strings.php
+++ b/blackout/lang/en-gb/strings.php
@@ -3,14 +3,15 @@
 if(! function_exists("string_plural_select_en_gb")) {
 function string_plural_select_en_gb($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['The end-date is prior to the start-date of the blackout, you should fix this'] = 'The end date is prior to the start date of the blackout, you should fix this';
-$a->strings['Please double check that the current settings for the blackout. Begin will be <strong>%s</strong> and it will end <strong>%s</strong>.'] = 'Please double check that the current settings for the blackout. Begin will be <strong>%s</strong> and it will end <strong>%s</strong>.';
-$a->strings['Save Settings'] = 'Save Settings';
-$a->strings['Redirect URL'] = 'Redirect URL';
-$a->strings['all your visitors from the web will be redirected to this URL'] = 'Visitors from the web will be redirected to this URL';
-$a->strings['Begin of the Blackout'] = 'Blackout begins';
-$a->strings['Format is <tt>YYYY-MM-DD hh:mm</tt>; <em>YYYY</em> year, <em>MM</em> month, <em>DD</em> day, <em>hh</em> hour and <em>mm</em> minute.'] = 'Format is <tt>YYYY-MM-DD hh:mm</tt>; <em>YYYY</em> year, <em>MM</em> month, <em>DD</em> day, <em>hh</em> hour and <em>mm</em> minute.';
-$a->strings['End of the Blackout'] = 'Blackout ends';
-$a->strings['<strong>Note</strong>: The redirect will be active from the moment you press the submit button. Users currently logged in will <strong>not</strong> be thrown out but can\'t login again after logging out should the blackout is still in place.'] = '<strong>Note</strong>: The redirect will be active from the moment you press the submit button. Users currently logged in will <strong>not</strong> be affected but can\'t login again after logging out should the blackout is still in place.';
+;
+$a->strings["The end-date is prior to the start-date of the blackout, you should fix this"] = "The end date is prior to the start date of the blackout, you should fix this";
+$a->strings["Please double check that the current settings for the blackout. Begin will be <strong>%s</strong> and it will end <strong>%s</strong>."] = "Please double check that the current settings for the blackout. Begin will be <strong>%s</strong> and it will end <strong>%s</strong>.";
+$a->strings["Save Settings"] = "Save Settings";
+$a->strings["Redirect URL"] = "Redirect URL";
+$a->strings["all your visitors from the web will be redirected to this URL"] = "Visitors from the web will be redirected to this URL";
+$a->strings["Begin of the Blackout"] = "Blackout begins";
+$a->strings["Format is <tt>YYYY-MM-DD hh:mm</tt>; <em>YYYY</em> year, <em>MM</em> month, <em>DD</em> day, <em>hh</em> hour and <em>mm</em> minute."] = "Format is <tt>YYYY-MM-DD hh:mm</tt>; <em>YYYY</em> year, <em>MM</em> month, <em>DD</em> day, <em>hh</em> hour and <em>mm</em> minute.";
+$a->strings["End of the Blackout"] = "Blackout ends";
+$a->strings["<strong>Note</strong>: The redirect will be active from the moment you press the submit button. Users currently logged in will <strong>not</strong> be thrown out but can't login again after logging out should the blackout is still in place."] = "<strong>Note</strong>: The redirect will be active from the moment you press the submit button. Users currently logged in will <strong>not</strong> be affected but can't login again after logging out should the blackout is still in place.";
diff --git a/blackout/lang/en-us/strings.php b/blackout/lang/en-us/strings.php
index 0d7fb430..705163ab 100644
--- a/blackout/lang/en-us/strings.php
+++ b/blackout/lang/en-us/strings.php
@@ -2,13 +2,13 @@
 
 if(! function_exists("string_plural_select_en_us")) {
 function string_plural_select_en_us($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Save Settings'] = 'Save Settings';
-$a->strings['Redirect URL'] = 'Redirect URL';
-$a->strings['all your visitors from the web will be redirected to this URL'] = 'All your visitors from the web will be redirected to this URL.';
-$a->strings['Begin of the Blackout'] = 'Start time of the Blackout';
-$a->strings['format is <em>YYYY</em> year, <em>MM</em> month, <em>DD</em> day, <em>hh</em> hour and <em>mm</em> minute'] = 'Format is <em>YYYY</em> year, <em>MM</em> month, <em>DD</em> day, <em>hh</em> hour and <em>mm</em> minute';
-$a->strings['End of the Blackout'] = 'End time of the Blackout';
-$a->strings['The end-date is prior to the start-date of the blackout, you should fix this.'] = 'The end-date is prior to the start-date of the blackout, you should fix this.';
+;
+$a->strings["Save Settings"] = "Save Settings";
+$a->strings["Redirect URL"] = "Redirect URL";
+$a->strings["all your visitors from the web will be redirected to this URL"] = "All your visitors from the web will be redirected to this URL.";
+$a->strings["Begin of the Blackout"] = "Start time of the Blackout";
+$a->strings["format is <em>YYYY</em> year, <em>MM</em> month, <em>DD</em> day, <em>hh</em> hour and <em>mm</em> minute"] = "Format is <em>YYYY</em> year, <em>MM</em> month, <em>DD</em> day, <em>hh</em> hour and <em>mm</em> minute";
+$a->strings["End of the Blackout"] = "End time of the Blackout";
+$a->strings["The end-date is prior to the start-date of the blackout, you should fix this."] = "The end-date is prior to the start-date of the blackout, you should fix this.";
diff --git a/blackout/lang/es/messages.po b/blackout/lang/es/messages.po
index f7386d27..0c54bd88 100644
--- a/blackout/lang/es/messages.po
+++ b/blackout/lang/es/messages.po
@@ -4,15 +4,14 @@
 # 
 # 
 # Translators:
-# Senex Petrovic <javierruizo@hotmail.com>, 2021
 # Tupambae.org, 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2021-04-01 09:44+0000\n"
-"Last-Translator: Senex Petrovic <javierruizo@hotmail.com>\n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2016-04-18 19:20+0000\n"
+"Last-Translator: Tupambae.org\n"
 "Language-Team: Spanish (http://www.transifex.com/Friendica/friendica/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,49 +19,34 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: blackout.php:97
-msgid ""
-"The end-date is prior to the start-date of the blackout, you should fix "
-"this."
-msgstr "La fecha de finalización es anterior a la fecha de inicio del bloqueo, debe corregirlo."
-
 #: blackout.php:99
-#, php-format
-msgid ""
-"Please double check the current settings for the blackout. It will begin on "
-"<strong>%s</strong> and end on <strong>%s</strong>."
-msgstr "Verifique la configuración actual del bloqueo. Iniciará  <strong>%s</strong> finalizará <strong>%s</strong>."
-
-#: blackout.php:102
 msgid "Save Settings"
 msgstr "Guardar configuración"
 
-#: blackout.php:103
+#: blackout.php:100
 msgid "Redirect URL"
 msgstr "Redirigir URL"
 
-#: blackout.php:103
-msgid "All your visitors from the web will be redirected to this URL."
-msgstr "Todos sus visitantes de la web serán redirigidos a esta URL."
+#: blackout.php:100
+msgid "all your visitors from the web will be redirected to this URL"
+msgstr "todos los visitantes de la web serán redirigidos a esta dirección."
 
-#: blackout.php:104
+#: blackout.php:101
 msgid "Begin of the Blackout"
 msgstr "Inicio del apagón."
 
-#: blackout.php:104
+#: blackout.php:101
 msgid ""
-"Format is <tt>YYYY-MM-DD hh:mm</tt>; <em>YYYY</em> year, <em>MM</em> month, "
-"<em>DD</em> day, <em>hh</em> hour and <em>mm</em> minute."
-msgstr "Format is <tt>YYYY-MM-DD hh:mm</tt>; <em>YYYY</em> año, <em>MM</em> mes, <em>DD</em> dia, <em>hh</em> hora y <em>mm</em> minuto."
+"format is <em>YYYY</em> year, <em>MM</em> month, <em>DD</em> day, "
+"<em>hh</em> hour and <em>mm</em> minute"
+msgstr "formato es <em>YYYY</em> año, <em>MM</em> mes, <em>DD</em> día, <em>hh</em> hora y <em>mm</em> minuto"
 
-#: blackout.php:105
+#: blackout.php:102
 msgid "End of the Blackout"
 msgstr "Fin del apagón."
 
-#: blackout.php:107
+#: blackout.php:108
 msgid ""
-"<strong>Note</strong>: The redirect will be active from the moment you press"
-" the submit button. Users currently logged in will <strong>not</strong> be "
-"thrown out but can't login again after logging out while the blackout is "
-"still in place."
-msgstr "<strong>Nota</strong>: La redirección estará activa desde el momento en que presione el botón Enviar. Los usuarios que hayan iniciado sesión actualmente  <strong>no</strong> serán expulsados, pero no podrán volver a iniciar sesión después de cerrar la sesión mientras el apagón continúe."
+"The end-date is prior to the start-date of the blackout, you should fix "
+"this."
+msgstr "La fecha de final del apagón es antes de la fecha de inicio, deberías arreglar esto."
diff --git a/blackout/lang/es/strings.php b/blackout/lang/es/strings.php
index 70a49694..867a8c9b 100644
--- a/blackout/lang/es/strings.php
+++ b/blackout/lang/es/strings.php
@@ -2,15 +2,13 @@
 
 if(! function_exists("string_plural_select_es")) {
 function string_plural_select_es($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['The end-date is prior to the start-date of the blackout, you should fix this.'] = 'La fecha de finalización es anterior a la fecha de inicio del bloqueo, debe corregirlo.';
-$a->strings['Please double check the current settings for the blackout. It will begin on <strong>%s</strong> and end on <strong>%s</strong>.'] = 'Verifique la configuración actual del bloqueo. Iniciará  <strong>%s</strong> finalizará <strong>%s</strong>.';
-$a->strings['Save Settings'] = 'Guardar configuración';
-$a->strings['Redirect URL'] = 'Redirigir URL';
-$a->strings['All your visitors from the web will be redirected to this URL.'] = 'Todos sus visitantes de la web serán redirigidos a esta URL.';
-$a->strings['Begin of the Blackout'] = 'Inicio del apagón.';
-$a->strings['Format is <tt>YYYY-MM-DD hh:mm</tt>; <em>YYYY</em> year, <em>MM</em> month, <em>DD</em> day, <em>hh</em> hour and <em>mm</em> minute.'] = 'Format is <tt>YYYY-MM-DD hh:mm</tt>; <em>YYYY</em> año, <em>MM</em> mes, <em>DD</em> dia, <em>hh</em> hora y <em>mm</em> minuto.';
-$a->strings['End of the Blackout'] = 'Fin del apagón.';
-$a->strings['<strong>Note</strong>: The redirect will be active from the moment you press the submit button. Users currently logged in will <strong>not</strong> be thrown out but can\'t login again after logging out while the blackout is still in place.'] = '<strong>Nota</strong>: La redirección estará activa desde el momento en que presione el botón Enviar. Los usuarios que hayan iniciado sesión actualmente  <strong>no</strong> serán expulsados, pero no podrán volver a iniciar sesión después de cerrar la sesión mientras el apagón continúe.';
+;
+$a->strings["Save Settings"] = "Guardar configuración";
+$a->strings["Redirect URL"] = "Redirigir URL";
+$a->strings["all your visitors from the web will be redirected to this URL"] = "todos los visitantes de la web serán redirigidos a esta dirección.";
+$a->strings["Begin of the Blackout"] = "Inicio del apagón.";
+$a->strings["format is <em>YYYY</em> year, <em>MM</em> month, <em>DD</em> day, <em>hh</em> hour and <em>mm</em> minute"] = "formato es <em>YYYY</em> año, <em>MM</em> mes, <em>DD</em> día, <em>hh</em> hora y <em>mm</em> minuto";
+$a->strings["End of the Blackout"] = "Fin del apagón.";
+$a->strings["The end-date is prior to the start-date of the blackout, you should fix this."] = "La fecha de final del apagón es antes de la fecha de inicio, deberías arreglar esto.";
diff --git a/blackout/lang/fi-fi/strings.php b/blackout/lang/fi-fi/strings.php
index fc644baa..898e730f 100644
--- a/blackout/lang/fi-fi/strings.php
+++ b/blackout/lang/fi-fi/strings.php
@@ -2,13 +2,13 @@
 
 if(! function_exists("string_plural_select_fi_fi")) {
 function string_plural_select_fi_fi($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Save Settings'] = 'Tallenna asetukset';
-$a->strings['Redirect URL'] = 'Uudelleenohjaus URL-osoite';
-$a->strings['all your visitors from the web will be redirected to this URL'] = 'kaikki kävijät uudelleenohjataan tähän URL-osoitteeseen';
-$a->strings['Begin of the Blackout'] = 'Blackout alkaa';
-$a->strings['format is <em>YYYY</em> year, <em>MM</em> month, <em>DD</em> day, <em>hh</em> hour and <em>mm</em> minute'] = 'formaati on <em>VVVV</em> vuosi, <em>KK</em> kuukausi, <em>PP</em> päivä, <em>tt</em> tunti ja <em>mm</em> minuutti';
-$a->strings['End of the Blackout'] = 'Blackout loppuu';
-$a->strings['The end-date is prior to the start-date of the blackout, you should fix this.'] = 'Blackoutin päättymispäivä on ennen alkamispäivää, korjaa tämä.';
+;
+$a->strings["Save Settings"] = "Tallenna asetukset";
+$a->strings["Redirect URL"] = "Uudelleenohjaus URL-osoite";
+$a->strings["all your visitors from the web will be redirected to this URL"] = "kaikki kävijät uudelleenohjataan tähän URL-osoitteeseen";
+$a->strings["Begin of the Blackout"] = "Blackout alkaa";
+$a->strings["format is <em>YYYY</em> year, <em>MM</em> month, <em>DD</em> day, <em>hh</em> hour and <em>mm</em> minute"] = "formaati on <em>VVVV</em> vuosi, <em>KK</em> kuukausi, <em>PP</em> päivä, <em>tt</em> tunti ja <em>mm</em> minuutti";
+$a->strings["End of the Blackout"] = "Blackout loppuu";
+$a->strings["The end-date is prior to the start-date of the blackout, you should fix this."] = "Blackoutin päättymispäivä on ennen alkamispäivää, korjaa tämä.";
diff --git a/blackout/lang/fr/messages.po b/blackout/lang/fr/messages.po
index d373e30e..a73b4907 100644
--- a/blackout/lang/fr/messages.po
+++ b/blackout/lang/fr/messages.po
@@ -4,68 +4,66 @@
 # 
 # 
 # Translators:
-# bob lebonche <lebonche@tutanota.com>, 2021
 # Damien Goutte-Gattat <damien+transifex@incenp.org>, 2015
 # Hypolite Petovan <hypolite@mrpetovan.com>, 2016
-# Valvin <vincent-forum@valvin.fr>, 2019
+# Valvin A <vincent-forum@valvin.fr>, 2019
 # Vladimir Núñez <lapoubelle111@gmail.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2014-06-22 11:19+0000\n"
-"Last-Translator: bob lebonche <lebonche@tutanota.com>, 2021\n"
+"POT-Creation-Date: 2019-03-12 09:26+0100\n"
+"PO-Revision-Date: 2019-05-27 19:12+0000\n"
+"Last-Translator: Valvin A <vincent-forum@valvin.fr>\n"
 "Language-Team: French (http://www.transifex.com/Friendica/friendica/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fr\n"
-"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: blackout.php:97
+#: blackout.php:101
 msgid ""
-"The end-date is prior to the start-date of the blackout, you should fix "
-"this."
-msgstr "La date de fin est antérieure à la date de début du blackout, vous devriez changer ça."
+"The end-date is prior to the start-date of the blackout, you should fix this"
+msgstr "La date de fin est antérieure au début de l'extinction, vous devriez corriger cela."
 
-#: blackout.php:99
+#: blackout.php:103
 #, php-format
 msgid ""
-"Please double check the current settings for the blackout. It will begin on "
-"<strong>%s</strong> and end on <strong>%s</strong>."
-msgstr "S'il vous plaît, vérifiez à nouveau les réglages actuels du blackout. Il commencera à  <strong>%s</strong> finira à <strong>%s</strong>."
+"Please double check that the current settings for the blackout. Begin will "
+"be <strong>%s</strong> and it will end <strong>%s</strong>."
+msgstr "Merci de vérifier que le paramétrage actuel pour l'extinction. Le début sera <strong>%s</strong> et se terminera <strong>%s</strong>"
 
-#: blackout.php:102
+#: blackout.php:106
 msgid "Save Settings"
 msgstr "Sauvegarder les paramètres"
 
-#: blackout.php:103
+#: blackout.php:107
 msgid "Redirect URL"
 msgstr "Adresse URL de redirection"
 
-#: blackout.php:103
-msgid "All your visitors from the web will be redirected to this URL."
-msgstr "Tous les visiteurs venant du web seront redirigés vers cette URL."
+#: blackout.php:107
+msgid "all your visitors from the web will be redirected to this URL"
+msgstr "Tous vos visiteurs venant du web seront redirigés vers cette URL."
 
-#: blackout.php:104
+#: blackout.php:108
 msgid "Begin of the Blackout"
 msgstr "Début de l'extinction"
 
-#: blackout.php:104
+#: blackout.php:108
 msgid ""
 "Format is <tt>YYYY-MM-DD hh:mm</tt>; <em>YYYY</em> year, <em>MM</em> month, "
 "<em>DD</em> day, <em>hh</em> hour and <em>mm</em> minute."
 msgstr "Le format est <tt>YYYY-MM-DD hh:mm</tt>; <em>YYYY</em> année, <em>MM</em>mois, <em>DD</em> jour, <em>hh</em>heure et <em>mm</em>minute."
 
-#: blackout.php:105
+#: blackout.php:109
 msgid "End of the Blackout"
 msgstr "Fin de l'extinction"
 
-#: blackout.php:107
+#: blackout.php:111
 msgid ""
 "<strong>Note</strong>: The redirect will be active from the moment you press"
 " the submit button. Users currently logged in will <strong>not</strong> be "
-"thrown out but can't login again after logging out while the blackout is "
+"thrown out but can't login again after logging out should the blackout is "
 "still in place."
-msgstr "<strong>Note</strong>: La redirection sera active à partir du moment où vous pressez le bouton d'envoi. Les utilisateurs actuellement connectés ne seront pas éjectés mais <strong> ne </strong> pourront se connecter à nouveau après s'être déconnectés, pendant que le blackout est encore en cours."
+msgstr "<strong>Note</strong>: La redirection sera active à partir du moment ou vous appuierez sur le bouton envoyer. Les utilisateurs identifiés ne seront <strong>pas</strong> déconnectés mais ne pourront pas se reconnecter après s'être déconnectés tant que l'extinction est en place."
diff --git a/blackout/lang/fr/strings.php b/blackout/lang/fr/strings.php
index 95dacb52..f60d599d 100644
--- a/blackout/lang/fr/strings.php
+++ b/blackout/lang/fr/strings.php
@@ -3,14 +3,15 @@
 if(! function_exists("string_plural_select_fr")) {
 function string_plural_select_fr($n){
 	$n = intval($n);
-	if (($n == 0 || $n == 1)) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
+	return ($n > 1);;
 }}
-$a->strings['The end-date is prior to the start-date of the blackout, you should fix this.'] = 'La date de fin est antérieure à la date de début du blackout, vous devriez changer ça.';
-$a->strings['Please double check the current settings for the blackout. It will begin on <strong>%s</strong> and end on <strong>%s</strong>.'] = 'S\'il vous plaît, vérifiez à nouveau les réglages actuels du blackout. Il commencera à  <strong>%s</strong> finira à <strong>%s</strong>.';
-$a->strings['Save Settings'] = 'Sauvegarder les paramètres';
-$a->strings['Redirect URL'] = 'Adresse URL de redirection';
-$a->strings['All your visitors from the web will be redirected to this URL.'] = 'Tous les visiteurs venant du web seront redirigés vers cette URL.';
-$a->strings['Begin of the Blackout'] = 'Début de l\'extinction';
-$a->strings['Format is <tt>YYYY-MM-DD hh:mm</tt>; <em>YYYY</em> year, <em>MM</em> month, <em>DD</em> day, <em>hh</em> hour and <em>mm</em> minute.'] = 'Le format est <tt>YYYY-MM-DD hh:mm</tt>; <em>YYYY</em> année, <em>MM</em>mois, <em>DD</em> jour, <em>hh</em>heure et <em>mm</em>minute.';
-$a->strings['End of the Blackout'] = 'Fin de l\'extinction';
-$a->strings['<strong>Note</strong>: The redirect will be active from the moment you press the submit button. Users currently logged in will <strong>not</strong> be thrown out but can\'t login again after logging out while the blackout is still in place.'] = '<strong>Note</strong>: La redirection sera active à partir du moment où vous pressez le bouton d\'envoi. Les utilisateurs actuellement connectés ne seront pas éjectés mais <strong> ne </strong> pourront se connecter à nouveau après s\'être déconnectés, pendant que le blackout est encore en cours.';
+;
+$a->strings["The end-date is prior to the start-date of the blackout, you should fix this"] = "La date de fin est antérieure au début de l'extinction, vous devriez corriger cela.";
+$a->strings["Please double check that the current settings for the blackout. Begin will be <strong>%s</strong> and it will end <strong>%s</strong>."] = "Merci de vérifier que le paramétrage actuel pour l'extinction. Le début sera <strong>%s</strong> et se terminera <strong>%s</strong>";
+$a->strings["Save Settings"] = "Sauvegarder les paramètres";
+$a->strings["Redirect URL"] = "Adresse URL de redirection";
+$a->strings["all your visitors from the web will be redirected to this URL"] = "Tous vos visiteurs venant du web seront redirigés vers cette URL.";
+$a->strings["Begin of the Blackout"] = "Début de l'extinction";
+$a->strings["Format is <tt>YYYY-MM-DD hh:mm</tt>; <em>YYYY</em> year, <em>MM</em> month, <em>DD</em> day, <em>hh</em> hour and <em>mm</em> minute."] = "Le format est <tt>YYYY-MM-DD hh:mm</tt>; <em>YYYY</em> année, <em>MM</em>mois, <em>DD</em> jour, <em>hh</em>heure et <em>mm</em>minute.";
+$a->strings["End of the Blackout"] = "Fin de l'extinction";
+$a->strings["<strong>Note</strong>: The redirect will be active from the moment you press the submit button. Users currently logged in will <strong>not</strong> be thrown out but can't login again after logging out should the blackout is still in place."] = "<strong>Note</strong>: La redirection sera active à partir du moment ou vous appuierez sur le bouton envoyer. Les utilisateurs identifiés ne seront <strong>pas</strong> déconnectés mais ne pourront pas se reconnecter après s'être déconnectés tant que l'extinction est en place.";
diff --git a/blackout/lang/hu/messages.po b/blackout/lang/hu/messages.po
deleted file mode 100644
index 2f2d90ce..00000000
--- a/blackout/lang/hu/messages.po
+++ /dev/null
@@ -1,67 +0,0 @@
-# ADDON blackout
-# Copyright (C)
-# This file is distributed under the same license as the Friendica blackout addon package.
-# 
-# 
-# Translators:
-# Balázs Úr, 2020-2021
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2014-06-22 11:19+0000\n"
-"Last-Translator: Balázs Úr, 2020-2021\n"
-"Language-Team: Hungarian (http://www.transifex.com/Friendica/friendica/language/hu/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: hu\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: blackout.php:97
-msgid ""
-"The end-date is prior to the start-date of the blackout, you should fix "
-"this."
-msgstr "A befejezési dátum az áramszünet kezdési dátuma előtt van, ezt javítania kell."
-
-#: blackout.php:99
-#, php-format
-msgid ""
-"Please double check the current settings for the blackout. It will begin on "
-"<strong>%s</strong> and end on <strong>%s</strong>."
-msgstr "Ellenőrizze még egyszer az áramszünet jelenlegi beállításait. A kezdete <strong>%s</strong> és a vége <strong>%s</strong> lesz."
-
-#: blackout.php:102
-msgid "Save Settings"
-msgstr "Beállítások mentése"
-
-#: blackout.php:103
-msgid "Redirect URL"
-msgstr "Átirányítási URL"
-
-#: blackout.php:103
-msgid "All your visitors from the web will be redirected to this URL."
-msgstr "A webről érkező összes látogatója át lesz irányítva erre az URL-re."
-
-#: blackout.php:104
-msgid "Begin of the Blackout"
-msgstr "Az áramszünet kezdete"
-
-#: blackout.php:104
-msgid ""
-"Format is <tt>YYYY-MM-DD hh:mm</tt>; <em>YYYY</em> year, <em>MM</em> month, "
-"<em>DD</em> day, <em>hh</em> hour and <em>mm</em> minute."
-msgstr "A formátum <tt>ÉÉÉÉ-HH-NN óó:pp</tt>, ahol <em>ÉÉÉÉ</em> az év, <em>HH</em> a hónap, <em>NN</em> a nap, <em>óó</em> az óra és <em>pp</em> a perc."
-
-#: blackout.php:105
-msgid "End of the Blackout"
-msgstr "Az áramszünet vége"
-
-#: blackout.php:107
-msgid ""
-"<strong>Note</strong>: The redirect will be active from the moment you press"
-" the submit button. Users currently logged in will <strong>not</strong> be "
-"thrown out but can't login again after logging out while the blackout is "
-"still in place."
-msgstr "<strong>Megjegyzés</strong>: Az átirányítás attól a pillanattól kezdve lesz aktív, amikor megnyomja az elküldés gombot. A jelenleg bejelentkezett felhasználók <strong>nem</strong> lesznek kidobva, de nem tudnak újra bejelentkezni, miután kijelentkeztek és az áramszünet még hatályban van."
diff --git a/blackout/lang/hu/strings.php b/blackout/lang/hu/strings.php
deleted file mode 100644
index 53f650cc..00000000
--- a/blackout/lang/hu/strings.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_hu")) {
-function string_plural_select_hu($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['The end-date is prior to the start-date of the blackout, you should fix this.'] = 'A befejezési dátum az áramszünet kezdési dátuma előtt van, ezt javítania kell.';
-$a->strings['Please double check the current settings for the blackout. It will begin on <strong>%s</strong> and end on <strong>%s</strong>.'] = 'Ellenőrizze még egyszer az áramszünet jelenlegi beállításait. A kezdete <strong>%s</strong> és a vége <strong>%s</strong> lesz.';
-$a->strings['Save Settings'] = 'Beállítások mentése';
-$a->strings['Redirect URL'] = 'Átirányítási URL';
-$a->strings['All your visitors from the web will be redirected to this URL.'] = 'A webről érkező összes látogatója át lesz irányítva erre az URL-re.';
-$a->strings['Begin of the Blackout'] = 'Az áramszünet kezdete';
-$a->strings['Format is <tt>YYYY-MM-DD hh:mm</tt>; <em>YYYY</em> year, <em>MM</em> month, <em>DD</em> day, <em>hh</em> hour and <em>mm</em> minute.'] = 'A formátum <tt>ÉÉÉÉ-HH-NN óó:pp</tt>, ahol <em>ÉÉÉÉ</em> az év, <em>HH</em> a hónap, <em>NN</em> a nap, <em>óó</em> az óra és <em>pp</em> a perc.';
-$a->strings['End of the Blackout'] = 'Az áramszünet vége';
-$a->strings['<strong>Note</strong>: The redirect will be active from the moment you press the submit button. Users currently logged in will <strong>not</strong> be thrown out but can\'t login again after logging out while the blackout is still in place.'] = '<strong>Megjegyzés</strong>: Az átirányítás attól a pillanattól kezdve lesz aktív, amikor megnyomja az elküldés gombot. A jelenleg bejelentkezett felhasználók <strong>nem</strong> lesznek kidobva, de nem tudnak újra bejelentkezni, miután kijelentkeztek és az áramszünet még hatályban van.';
diff --git a/blackout/lang/is/strings.php b/blackout/lang/is/strings.php
index 1e92a162..41980a4d 100644
--- a/blackout/lang/is/strings.php
+++ b/blackout/lang/is/strings.php
@@ -3,6 +3,13 @@
 if(! function_exists("string_plural_select_is")) {
 function string_plural_select_is($n){
 	$n = intval($n);
-	return intval($n % 10 != 1 || $n % 100 == 11);
+	return ($n % 10 != 1 || $n % 100 == 11);;
 }}
-$a->strings['Save Settings'] = 'Vista stillingar';
+;
+$a->strings["Save Settings"] = "Vista stillingar";
+$a->strings["Redirect URL"] = "";
+$a->strings["all your visitors from the web will be redirected to this URL"] = "";
+$a->strings["Begin of the Blackout"] = "";
+$a->strings["format is <em>YYYY</em> year, <em>MM</em> month, <em>DD</em> day, <em>hh</em> hour and <em>mm</em> minute"] = "";
+$a->strings["End of the Blackout"] = "";
+$a->strings["The end-date is prior to the start-date of the blackout, you should fix this."] = "";
diff --git a/blackout/lang/it/messages.po b/blackout/lang/it/messages.po
index 50b839db..1b0c6f62 100644
--- a/blackout/lang/it/messages.po
+++ b/blackout/lang/it/messages.po
@@ -5,14 +5,13 @@
 # 
 # Translators:
 # fabrixxm <fabrix.xm@gmail.com>, 2014,2018
-# Sylke Vicious <silkevicious@gmail.com>, 2020-2021
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2021-04-19 11:10+0000\n"
-"Last-Translator: Sylke Vicious <silkevicious@gmail.com>\n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2018-03-19 19:50+0000\n"
+"Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,49 +19,34 @@ msgstr ""
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: blackout.php:97
-msgid ""
-"The end-date is prior to the start-date of the blackout, you should fix "
-"this."
-msgstr "La data di fine è precedente alla data di inizio blackout, dovresti sistemarle."
-
 #: blackout.php:99
-#, php-format
-msgid ""
-"Please double check the current settings for the blackout. It will begin on "
-"<strong>%s</strong> and end on <strong>%s</strong>."
-msgstr "Per favore ricontrolla le impostazioni attuali per il blackout. L'inizio sarà il <strong>%s</strong> e terminerà il <strong>%s</strong>."
-
-#: blackout.php:102
 msgid "Save Settings"
 msgstr "Salva Impostazioni"
 
-#: blackout.php:103
+#: blackout.php:100
 msgid "Redirect URL"
 msgstr "URL di reindirizzamento"
 
-#: blackout.php:103
-msgid "All your visitors from the web will be redirected to this URL."
-msgstr "Tutti i tuoi visitatori dal web verranno reindirizzati a questo URL."
+#: blackout.php:100
+msgid "all your visitors from the web will be redirected to this URL"
+msgstr "tutti i visitatori dal web verranno reindirizzati a questo URL"
 
-#: blackout.php:104
+#: blackout.php:101
 msgid "Begin of the Blackout"
 msgstr "Inzio del blackout"
 
-#: blackout.php:104
+#: blackout.php:101
 msgid ""
-"Format is <tt>YYYY-MM-DD hh:mm</tt>; <em>YYYY</em> year, <em>MM</em> month, "
-"<em>DD</em> day, <em>hh</em> hour and <em>mm</em> minute."
-msgstr "Il formato è <tt>YYYY-MM-DD hh:mm</tt>; <em>YYYY</em> anno, <em>MM</em> mese, <em>DD</em> giorno, <em>hh</em> ora e <em>mm</em> minuto."
+"format is <em>YYYY</em> year, <em>MM</em> month, <em>DD</em> day, "
+"<em>hh</em> hour and <em>mm</em> minute"
+msgstr "il formato è <em>YYYY</em> anno, <em>MM</em> mese, <em>DD</em> giorno, <em>hh</em> ora e <em>mm</em> minuto"
 
-#: blackout.php:105
+#: blackout.php:102
 msgid "End of the Blackout"
 msgstr "Fine del blackout"
 
-#: blackout.php:107
+#: blackout.php:108
 msgid ""
-"<strong>Note</strong>: The redirect will be active from the moment you press"
-" the submit button. Users currently logged in will <strong>not</strong> be "
-"thrown out but can't login again after logging out while the blackout is "
-"still in place."
-msgstr "<strong>Nota</strong>: Il reindirizzamento sarà attivo dal momento in cui premerai il pulsante di invio. Gli utenti attualmente autenticati <strong>non</strong> saranno disconnessi ma non potranno accedere in caso di disconnessione fintanto che il blackout sarà attivo."
+"The end-date is prior to the start-date of the blackout, you should fix "
+"this."
+msgstr "La data di fine è precedente alla data di inizio. Dovresti sistemarla."
diff --git a/blackout/lang/it/strings.php b/blackout/lang/it/strings.php
index 311dbda9..b0142236 100644
--- a/blackout/lang/it/strings.php
+++ b/blackout/lang/it/strings.php
@@ -2,15 +2,13 @@
 
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['The end-date is prior to the start-date of the blackout, you should fix this.'] = 'La data di fine è precedente alla data di inizio blackout, dovresti sistemarle.';
-$a->strings['Please double check the current settings for the blackout. It will begin on <strong>%s</strong> and end on <strong>%s</strong>.'] = 'Per favore ricontrolla le impostazioni attuali per il blackout. L\'inizio sarà il <strong>%s</strong> e terminerà il <strong>%s</strong>.';
-$a->strings['Save Settings'] = 'Salva Impostazioni';
-$a->strings['Redirect URL'] = 'URL di reindirizzamento';
-$a->strings['All your visitors from the web will be redirected to this URL.'] = 'Tutti i tuoi visitatori dal web verranno reindirizzati a questo URL.';
-$a->strings['Begin of the Blackout'] = 'Inzio del blackout';
-$a->strings['Format is <tt>YYYY-MM-DD hh:mm</tt>; <em>YYYY</em> year, <em>MM</em> month, <em>DD</em> day, <em>hh</em> hour and <em>mm</em> minute.'] = 'Il formato è <tt>YYYY-MM-DD hh:mm</tt>; <em>YYYY</em> anno, <em>MM</em> mese, <em>DD</em> giorno, <em>hh</em> ora e <em>mm</em> minuto.';
-$a->strings['End of the Blackout'] = 'Fine del blackout';
-$a->strings['<strong>Note</strong>: The redirect will be active from the moment you press the submit button. Users currently logged in will <strong>not</strong> be thrown out but can\'t login again after logging out while the blackout is still in place.'] = '<strong>Nota</strong>: Il reindirizzamento sarà attivo dal momento in cui premerai il pulsante di invio. Gli utenti attualmente autenticati <strong>non</strong> saranno disconnessi ma non potranno accedere in caso di disconnessione fintanto che il blackout sarà attivo.';
+;
+$a->strings["Save Settings"] = "Salva Impostazioni";
+$a->strings["Redirect URL"] = "URL di reindirizzamento";
+$a->strings["all your visitors from the web will be redirected to this URL"] = "tutti i visitatori dal web verranno reindirizzati a questo URL";
+$a->strings["Begin of the Blackout"] = "Inzio del blackout";
+$a->strings["format is <em>YYYY</em> year, <em>MM</em> month, <em>DD</em> day, <em>hh</em> hour and <em>mm</em> minute"] = "il formato è <em>YYYY</em> anno, <em>MM</em> mese, <em>DD</em> giorno, <em>hh</em> ora e <em>mm</em> minuto";
+$a->strings["End of the Blackout"] = "Fine del blackout";
+$a->strings["The end-date is prior to the start-date of the blackout, you should fix this."] = "La data di fine è precedente alla data di inizio. Dovresti sistemarla.";
diff --git a/blackout/lang/ja/messages.po b/blackout/lang/ja/messages.po
index 3747bb06..c7e267d7 100644
--- a/blackout/lang/ja/messages.po
+++ b/blackout/lang/ja/messages.po
@@ -4,14 +4,13 @@
 # 
 # 
 # Translators:
-# XMPPはいいぞ, 2021
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2021-05-09 10:43+0000\n"
-"Last-Translator: XMPPはいいぞ\n"
+"POT-Creation-Date: 2019-03-12 09:26+0100\n"
+"PO-Revision-Date: 2019-08-28 10:18+0000\n"
+"Last-Translator: Ozero Dien <rgfx0020+misc@gmail.com>\n"
 "Language-Team: Japanese (http://www.transifex.com/Friendica/friendica/language/ja/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,49 +18,48 @@ msgstr ""
 "Language: ja\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: blackout.php:97
+#: blackout.php:101
 msgid ""
-"The end-date is prior to the start-date of the blackout, you should fix "
-"this."
-msgstr "終了日はブラックアウトの開始日より前で、これを修正する必要があります"
+"The end-date is prior to the start-date of the blackout, you should fix this"
+msgstr "終了日はブラックアウトの開始日より前です。これを修正する必要があります"
 
-#: blackout.php:99
+#: blackout.php:103
 #, php-format
 msgid ""
-"Please double check the current settings for the blackout. It will begin on "
-"<strong>%s</strong> and end on <strong>%s</strong>."
-msgstr ""
+"Please double check that the current settings for the blackout. Begin will "
+"be <strong>%s</strong> and it will end <strong>%s</strong>."
+msgstr "ブラックアウトの現在の設定を再確認してください。開始は<strong> %s </strong>で、終了は<strong> %s </strong>です。"
 
-#: blackout.php:102
+#: blackout.php:106
 msgid "Save Settings"
 msgstr "設定を保存する"
 
-#: blackout.php:103
+#: blackout.php:107
 msgid "Redirect URL"
 msgstr "リダイレクト URL"
 
-#: blackout.php:103
-msgid "All your visitors from the web will be redirected to this URL."
+#: blackout.php:107
+msgid "all your visitors from the web will be redirected to this URL"
 msgstr "Webからのすべての訪問者はこのURLにリダイレクトされます"
 
-#: blackout.php:104
+#: blackout.php:108
 msgid "Begin of the Blackout"
 msgstr "ブラックアウトの始まり"
 
-#: blackout.php:104
+#: blackout.php:108
 msgid ""
 "Format is <tt>YYYY-MM-DD hh:mm</tt>; <em>YYYY</em> year, <em>MM</em> month, "
 "<em>DD</em> day, <em>hh</em> hour and <em>mm</em> minute."
 msgstr "形式は<tt> YYYY-MM-DD hh：mm </tt>です。 <em> YYYY </em>年、<em> MM </em>月、<em> DD </em>日、<em> hh </em>時間と<em> mm </em>分。"
 
-#: blackout.php:105
+#: blackout.php:109
 msgid "End of the Blackout"
 msgstr "ブラックアウトの終わり"
 
-#: blackout.php:107
+#: blackout.php:111
 msgid ""
 "<strong>Note</strong>: The redirect will be active from the moment you press"
 " the submit button. Users currently logged in will <strong>not</strong> be "
-"thrown out but can't login again after logging out while the blackout is "
+"thrown out but can't login again after logging out should the blackout is "
 "still in place."
-msgstr ""
+msgstr "<strong>備考</strong>：送信ボタンを押した時点からリダイレクトが有効になります。現在ログインしているユーザーは<strong>リダイレクトされません</strong>が、ブラックアウトが有効な間はログアウト後再度ログインできなくなります。"
diff --git a/blackout/lang/ja/strings.php b/blackout/lang/ja/strings.php
index 1456db9f..820f8e4a 100644
--- a/blackout/lang/ja/strings.php
+++ b/blackout/lang/ja/strings.php
@@ -3,12 +3,15 @@
 if(! function_exists("string_plural_select_ja")) {
 function string_plural_select_ja($n){
 	$n = intval($n);
-	return intval(0);
+	return 0;;
 }}
-$a->strings['The end-date is prior to the start-date of the blackout, you should fix this.'] = '終了日はブラックアウトの開始日より前で、これを修正する必要があります';
-$a->strings['Save Settings'] = '設定を保存する';
-$a->strings['Redirect URL'] = 'リダイレクト URL';
-$a->strings['All your visitors from the web will be redirected to this URL.'] = 'Webからのすべての訪問者はこのURLにリダイレクトされます';
-$a->strings['Begin of the Blackout'] = 'ブラックアウトの始まり';
-$a->strings['Format is <tt>YYYY-MM-DD hh:mm</tt>; <em>YYYY</em> year, <em>MM</em> month, <em>DD</em> day, <em>hh</em> hour and <em>mm</em> minute.'] = '形式は<tt> YYYY-MM-DD hh：mm </tt>です。 <em> YYYY </em>年、<em> MM </em>月、<em> DD </em>日、<em> hh </em>時間と<em> mm </em>分。';
-$a->strings['End of the Blackout'] = 'ブラックアウトの終わり';
+;
+$a->strings["The end-date is prior to the start-date of the blackout, you should fix this"] = "終了日はブラックアウトの開始日より前です。これを修正する必要があります";
+$a->strings["Please double check that the current settings for the blackout. Begin will be <strong>%s</strong> and it will end <strong>%s</strong>."] = "ブラックアウトの現在の設定を再確認してください。開始は<strong> %s </strong>で、終了は<strong> %s </strong>です。";
+$a->strings["Save Settings"] = "設定を保存する";
+$a->strings["Redirect URL"] = "リダイレクト URL";
+$a->strings["all your visitors from the web will be redirected to this URL"] = "Webからのすべての訪問者はこのURLにリダイレクトされます";
+$a->strings["Begin of the Blackout"] = "ブラックアウトの始まり";
+$a->strings["Format is <tt>YYYY-MM-DD hh:mm</tt>; <em>YYYY</em> year, <em>MM</em> month, <em>DD</em> day, <em>hh</em> hour and <em>mm</em> minute."] = "形式は<tt> YYYY-MM-DD hh：mm </tt>です。 <em> YYYY </em>年、<em> MM </em>月、<em> DD </em>日、<em> hh </em>時間と<em> mm </em>分。";
+$a->strings["End of the Blackout"] = "ブラックアウトの終わり";
+$a->strings["<strong>Note</strong>: The redirect will be active from the moment you press the submit button. Users currently logged in will <strong>not</strong> be thrown out but can't login again after logging out should the blackout is still in place."] = "<strong>備考</strong>：送信ボタンを押した時点からリダイレクトが有効になります。現在ログインしているユーザーは<strong>リダイレクトされません</strong>が、ブラックアウトが有効な間はログアウト後再度ログインできなくなります。";
diff --git a/blackout/lang/nl/strings.php b/blackout/lang/nl/strings.php
index e233e45d..8311c07e 100644
--- a/blackout/lang/nl/strings.php
+++ b/blackout/lang/nl/strings.php
@@ -3,12 +3,13 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Save Settings'] = 'Instellingen opslaan';
-$a->strings['Redirect URL'] = 'URL doorverwijzing';
-$a->strings['all your visitors from the web will be redirected to this URL'] = 'al je bezoekers van het internet zullen worden doorverwezen naar deze URL';
-$a->strings['Begin of the Blackout'] = 'Begin van de Blackout';
-$a->strings['format is <em>YYYY</em> year, <em>MM</em> month, <em>DD</em> day, <em>hh</em> hour and <em>mm</em> minute'] = 'formaat is <em>JJJJ</em> jaar, <em>MM</em> maand, <em>DD</em> dag, <em>uu</em> uur en <em>mm</em> minuten';
-$a->strings['End of the Blackout'] = 'Einde van de Blackout';
-$a->strings['The end-date is prior to the start-date of the blackout, you should fix this.'] = 'De einddatum van de blackout is eerder dan de startdatum, verbeter dit.';
+;
+$a->strings["Save Settings"] = "Instellingen opslaan";
+$a->strings["Redirect URL"] = "URL doorverwijzing";
+$a->strings["all your visitors from the web will be redirected to this URL"] = "al je bezoekers van het internet zullen worden doorverwezen naar deze URL";
+$a->strings["Begin of the Blackout"] = "Begin van de Blackout";
+$a->strings["format is <em>YYYY</em> year, <em>MM</em> month, <em>DD</em> day, <em>hh</em> hour and <em>mm</em> minute"] = "formaat is <em>JJJJ</em> jaar, <em>MM</em> maand, <em>DD</em> dag, <em>uu</em> uur en <em>mm</em> minuten";
+$a->strings["End of the Blackout"] = "Einde van de Blackout";
+$a->strings["The end-date is prior to the start-date of the blackout, you should fix this."] = "De einddatum van de blackout is eerder dan de startdatum, verbeter dit.";
diff --git a/blackout/lang/pl/messages.po b/blackout/lang/pl/messages.po
index b8f088ce..5cb661d8 100644
--- a/blackout/lang/pl/messages.po
+++ b/blackout/lang/pl/messages.po
@@ -4,16 +4,15 @@
 # 
 # 
 # Translators:
-# Piotr Strębski <strebski@gmail.com>, 2022
-# Waldemar Stoczkowski, 2018-2020
+# Waldemar Stoczkowski, 2018-2019
 # Waldemar Stoczkowski, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2014-06-22 11:19+0000\n"
-"Last-Translator: Piotr Strębski <strebski@gmail.com>, 2022\n"
+"POT-Creation-Date: 2019-03-12 09:26+0100\n"
+"PO-Revision-Date: 2019-03-14 19:55+0000\n"
+"Last-Translator: Waldemar Stoczkowski\n"
 "Language-Team: Polish (http://www.transifex.com/Friendica/friendica/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,49 +20,48 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
-#: blackout.php:97
+#: blackout.php:101
 msgid ""
-"The end-date is prior to the start-date of the blackout, you should fix "
-"this."
-msgstr "Data końcowa jest wcześniejsza niż data rozpoczęcia blackoutu, powinieneś to naprawić."
+"The end-date is prior to the start-date of the blackout, you should fix this"
+msgstr "Data zakończenia jest przed datą rozpoczęcia, powinieneś to naprawić"
 
-#: blackout.php:99
+#: blackout.php:103
 #, php-format
 msgid ""
-"Please double check the current settings for the blackout. It will begin on "
-"<strong>%s</strong> and end on <strong>%s</strong>."
-msgstr "Proszę dokładnie sprawdzić aktualne ustawienia blackoutu. Zacznie się o <strong>%s</strong> i zakończy o <strong>%s</strong>."
+"Please double check that the current settings for the blackout. Begin will "
+"be <strong>%s</strong> and it will end <strong>%s</strong>."
+msgstr ""
 
-#: blackout.php:102
+#: blackout.php:106
 msgid "Save Settings"
 msgstr "Zapisz ustawienia"
 
-#: blackout.php:103
+#: blackout.php:107
 msgid "Redirect URL"
 msgstr "Przekierowanie URL"
 
-#: blackout.php:103
-msgid "All your visitors from the web will be redirected to this URL."
-msgstr "Wszyscy Twoi goście z Internetu zostaną przekierowani na ten adres URL."
+#: blackout.php:107
+msgid "all your visitors from the web will be redirected to this URL"
+msgstr "wszyscy Twoi goście z internetu zostaną przekierowani na ten adres URL"
 
-#: blackout.php:104
+#: blackout.php:108
 msgid "Begin of the Blackout"
-msgstr "Rozpocznij blackout"
+msgstr "Rozpocznij Blackout"
 
-#: blackout.php:104
+#: blackout.php:108
 msgid ""
 "Format is <tt>YYYY-MM-DD hh:mm</tt>; <em>YYYY</em> year, <em>MM</em> month, "
 "<em>DD</em> day, <em>hh</em> hour and <em>mm</em> minute."
-msgstr "Format to <tt>RRRR-MM-DD gg:mm</tt>; <em>RRRR</em> rok, <em>MM</em> miesiąc, <em>DD</em> dzień, <em>gg</em> godzina i <em>mm</em> minuta."
+msgstr ""
 
-#: blackout.php:105
+#: blackout.php:109
 msgid "End of the Blackout"
-msgstr "Koniec blackoutu"
+msgstr "Koniec Blackout"
 
-#: blackout.php:107
+#: blackout.php:111
 msgid ""
 "<strong>Note</strong>: The redirect will be active from the moment you press"
 " the submit button. Users currently logged in will <strong>not</strong> be "
-"thrown out but can't login again after logging out while the blackout is "
+"thrown out but can't login again after logging out should the blackout is "
 "still in place."
-msgstr "<strong>Uwaga</strong>: Przekierowanie będzie aktywne od momentu naciśnięcia przycisku przesyłania. Użytkownicy aktualnie zalogowani <strong>nie</strong> zostaną wyrzuceni, ale nie będą mogli zalogować się ponownie po wylogowaniu, jeśli blackout będzie nadal obowiązywać."
+msgstr ""
diff --git a/blackout/lang/pl/strings.php b/blackout/lang/pl/strings.php
index b80e36da..bcfdb7db 100644
--- a/blackout/lang/pl/strings.php
+++ b/blackout/lang/pl/strings.php
@@ -3,14 +3,15 @@
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
 	$n = intval($n);
-	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
+	return ($n==1 ? 0 : ($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14) ? 1 : $n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14) ? 2 : 3);;
 }}
-$a->strings['The end-date is prior to the start-date of the blackout, you should fix this.'] = 'Data końcowa jest wcześniejsza niż data rozpoczęcia blackoutu, powinieneś to naprawić.';
-$a->strings['Please double check the current settings for the blackout. It will begin on <strong>%s</strong> and end on <strong>%s</strong>.'] = 'Proszę dokładnie sprawdzić aktualne ustawienia blackoutu. Zacznie się o <strong>%s</strong> i zakończy o <strong>%s</strong>.';
-$a->strings['Save Settings'] = 'Zapisz ustawienia';
-$a->strings['Redirect URL'] = 'Przekierowanie URL';
-$a->strings['All your visitors from the web will be redirected to this URL.'] = 'Wszyscy Twoi goście z Internetu zostaną przekierowani na ten adres URL.';
-$a->strings['Begin of the Blackout'] = 'Rozpocznij blackout';
-$a->strings['Format is <tt>YYYY-MM-DD hh:mm</tt>; <em>YYYY</em> year, <em>MM</em> month, <em>DD</em> day, <em>hh</em> hour and <em>mm</em> minute.'] = 'Format to <tt>RRRR-MM-DD gg:mm</tt>; <em>RRRR</em> rok, <em>MM</em> miesiąc, <em>DD</em> dzień, <em>gg</em> godzina i <em>mm</em> minuta.';
-$a->strings['End of the Blackout'] = 'Koniec blackoutu';
-$a->strings['<strong>Note</strong>: The redirect will be active from the moment you press the submit button. Users currently logged in will <strong>not</strong> be thrown out but can\'t login again after logging out while the blackout is still in place.'] = '<strong>Uwaga</strong>: Przekierowanie będzie aktywne od momentu naciśnięcia przycisku przesyłania. Użytkownicy aktualnie zalogowani <strong>nie</strong> zostaną wyrzuceni, ale nie będą mogli zalogować się ponownie po wylogowaniu, jeśli blackout będzie nadal obowiązywać.';
+;
+$a->strings["The end-date is prior to the start-date of the blackout, you should fix this"] = "Data zakończenia jest przed datą rozpoczęcia, powinieneś to naprawić";
+$a->strings["Please double check that the current settings for the blackout. Begin will be <strong>%s</strong> and it will end <strong>%s</strong>."] = "";
+$a->strings["Save Settings"] = "Zapisz ustawienia";
+$a->strings["Redirect URL"] = "Przekierowanie URL";
+$a->strings["all your visitors from the web will be redirected to this URL"] = "wszyscy Twoi goście z internetu zostaną przekierowani na ten adres URL";
+$a->strings["Begin of the Blackout"] = "Rozpocznij Blackout";
+$a->strings["Format is <tt>YYYY-MM-DD hh:mm</tt>; <em>YYYY</em> year, <em>MM</em> month, <em>DD</em> day, <em>hh</em> hour and <em>mm</em> minute."] = "";
+$a->strings["End of the Blackout"] = "Koniec Blackout";
+$a->strings["<strong>Note</strong>: The redirect will be active from the moment you press the submit button. Users currently logged in will <strong>not</strong> be thrown out but can't login again after logging out should the blackout is still in place."] = "";
diff --git a/blackout/lang/ro/strings.php b/blackout/lang/ro/strings.php
index e71ac6b6..498f7c3e 100644
--- a/blackout/lang/ro/strings.php
+++ b/blackout/lang/ro/strings.php
@@ -2,13 +2,13 @@
 
 if(! function_exists("string_plural_select_ro")) {
 function string_plural_select_ro($n){
-	$n = intval($n);
-	if ($n==1) { return 0; } else if ((($n%100>19)||(($n%100==0)&&($n!=0)))) { return 2; } else  { return 1; }
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
 }}
-$a->strings['Save Settings'] = 'Salvare Configurări';
-$a->strings['Redirect URL'] = 'URL de Redirecționare';
-$a->strings['all your visitors from the web will be redirected to this URL'] = 'toți vizitatorii dvs. de pe web vor fi redirecționați către acest URL';
-$a->strings['Begin of the Blackout'] = 'Pornire punct Blackout';
-$a->strings['format is <em>YYYY</em> year, <em>MM</em> month, <em>DD</em> day, <em>hh</em> hour and <em>mm</em> minute'] = 'formatul este <em>YYYY</em> anul, <em>MM</em> luna, <em>DD</em> ziua, <em>hh</em> ora și <em>mm</em> minute';
-$a->strings['End of the Blackout'] = 'Finalizare punct Blackout';
-$a->strings['The end-date is prior to the start-date of the blackout, you should fix this.'] = 'Data de finalizare este anterioară punctului blackout de pornire, ar trebui să corectați aceasta.';
+;
+$a->strings["Save Settings"] = "Salvare Configurări";
+$a->strings["Redirect URL"] = "URL de Redirecționare";
+$a->strings["all your visitors from the web will be redirected to this URL"] = "toți vizitatorii dvs. de pe web vor fi redirecționați către acest URL";
+$a->strings["Begin of the Blackout"] = "Pornire punct Blackout";
+$a->strings["format is <em>YYYY</em> year, <em>MM</em> month, <em>DD</em> day, <em>hh</em> hour and <em>mm</em> minute"] = "formatul este <em>YYYY</em> anul, <em>MM</em> luna, <em>DD</em> ziua, <em>hh</em> ora și <em>mm</em> minute";
+$a->strings["End of the Blackout"] = "Finalizare punct Blackout";
+$a->strings["The end-date is prior to the start-date of the blackout, you should fix this."] = "Data de finalizare este anterioară punctului blackout de pornire, ar trebui să corectați aceasta.";
diff --git a/blackout/lang/ru/messages.po b/blackout/lang/ru/messages.po
index 4fa48ccc..560ed5d7 100644
--- a/blackout/lang/ru/messages.po
+++ b/blackout/lang/ru/messages.po
@@ -4,16 +4,14 @@
 # 
 # 
 # Translators:
-# Alexander An <ravnina@gmail.com>, 2020
-# Eugene Veresk <eugene.vereshchagin@gmail.com>, 2020
 # Stanislav N. <pztrn@pztrn.name>, 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-03-12 09:26+0100\n"
-"PO-Revision-Date: 2020-04-23 14:36+0000\n"
-"Last-Translator: Alexander An <ravnina@gmail.com>\n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2017-04-08 05:34+0000\n"
+"Last-Translator: Stanislav N. <pztrn@pztrn.name>\n"
 "Language-Team: Russian (http://www.transifex.com/Friendica/friendica/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,48 +19,34 @@ msgstr ""
 "Language: ru\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
-#: blackout.php:101
-msgid ""
-"The end-date is prior to the start-date of the blackout, you should fix this"
-msgstr "Дата начала позже даты окончания, исправьте это"
-
-#: blackout.php:103
-#, php-format
-msgid ""
-"Please double check that the current settings for the blackout. Begin will "
-"be <strong>%s</strong> and it will end <strong>%s</strong>."
-msgstr " Пожалуйста, проверьте настройки блэкаута ещё раз. Он начнётся <strong>%s</strong> и закончится <strong>%s</strong>."
-
-#: blackout.php:106
+#: blackout.php:99
 msgid "Save Settings"
 msgstr "Сохранить настройки"
 
-#: blackout.php:107
+#: blackout.php:100
 msgid "Redirect URL"
 msgstr "Ссылка для перенаправления"
 
-#: blackout.php:107
+#: blackout.php:100
 msgid "all your visitors from the web will be redirected to this URL"
 msgstr "все посетители будут перенаправлены на этот URL"
 
-#: blackout.php:108
+#: blackout.php:101
 msgid "Begin of the Blackout"
 msgstr "Начало блэкаута"
 
-#: blackout.php:108
+#: blackout.php:101
 msgid ""
-"Format is <tt>YYYY-MM-DD hh:mm</tt>; <em>YYYY</em> year, <em>MM</em> month, "
-"<em>DD</em> day, <em>hh</em> hour and <em>mm</em> minute."
-msgstr "Формат: <tt>YYYY-MM-DD hh:mm</tt>; <em>YYYY</em> год, <em>MM</em> месяц, <em>DD</em> день, <em>hh</em> час и <em>mm</em> минуты."
+"format is <em>YYYY</em> year, <em>MM</em> month, <em>DD</em> day, "
+"<em>hh</em> hour and <em>mm</em> minute"
+msgstr "формат: <em>YYYY</em> год, <em>MM</em> месяц, <em>DD</em> день, <em>hh</em> час и <em>mm</em> минута"
 
-#: blackout.php:109
+#: blackout.php:102
 msgid "End of the Blackout"
 msgstr "Конец блэкаута"
 
-#: blackout.php:111
+#: blackout.php:108
 msgid ""
-"<strong>Note</strong>: The redirect will be active from the moment you press"
-" the submit button. Users currently logged in will <strong>not</strong> be "
-"thrown out but can't login again after logging out should the blackout is "
-"still in place."
-msgstr "<strong>Внимание</strong>: Переадресация будет включена после нажатия вами кнопки. Уже вошедшие пользователи <strong>не</strong> будут выброшены, но не смогут зайти снова, пока блэкаут не закончится."
+"The end-date is prior to the start-date of the blackout, you should fix "
+"this."
+msgstr "Указана более ранняя дата окончания, чем дата начала. Это надо исправить."
diff --git a/blackout/lang/ru/strings.php b/blackout/lang/ru/strings.php
index f18803e6..aae8b350 100644
--- a/blackout/lang/ru/strings.php
+++ b/blackout/lang/ru/strings.php
@@ -2,15 +2,13 @@
 
 if(! function_exists("string_plural_select_ru")) {
 function string_plural_select_ru($n){
-	$n = intval($n);
-	if ($n%10==1 && $n%100!=11) { return 0; } else if ($n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14)) { return 1; } else if ($n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)) { return 2; } else  { return 3; }
+	return ($n%10==1 && $n%100!=11 ? 0 : $n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14) ? 1 : $n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)? 2 : 3);;
 }}
-$a->strings['The end-date is prior to the start-date of the blackout, you should fix this'] = 'Дата начала позже даты окончания, исправьте это';
-$a->strings['Please double check that the current settings for the blackout. Begin will be <strong>%s</strong> and it will end <strong>%s</strong>.'] = ' Пожалуйста, проверьте настройки блэкаута ещё раз. Он начнётся <strong>%s</strong> и закончится <strong>%s</strong>.';
-$a->strings['Save Settings'] = 'Сохранить настройки';
-$a->strings['Redirect URL'] = 'Ссылка для перенаправления';
-$a->strings['all your visitors from the web will be redirected to this URL'] = 'все посетители будут перенаправлены на этот URL';
-$a->strings['Begin of the Blackout'] = 'Начало блэкаута';
-$a->strings['Format is <tt>YYYY-MM-DD hh:mm</tt>; <em>YYYY</em> year, <em>MM</em> month, <em>DD</em> day, <em>hh</em> hour and <em>mm</em> minute.'] = 'Формат: <tt>YYYY-MM-DD hh:mm</tt>; <em>YYYY</em> год, <em>MM</em> месяц, <em>DD</em> день, <em>hh</em> час и <em>mm</em> минуты.';
-$a->strings['End of the Blackout'] = 'Конец блэкаута';
-$a->strings['<strong>Note</strong>: The redirect will be active from the moment you press the submit button. Users currently logged in will <strong>not</strong> be thrown out but can\'t login again after logging out should the blackout is still in place.'] = '<strong>Внимание</strong>: Переадресация будет включена после нажатия вами кнопки. Уже вошедшие пользователи <strong>не</strong> будут выброшены, но не смогут зайти снова, пока блэкаут не закончится.';
+;
+$a->strings["Save Settings"] = "Сохранить настройки";
+$a->strings["Redirect URL"] = "Ссылка для перенаправления";
+$a->strings["all your visitors from the web will be redirected to this URL"] = "все посетители будут перенаправлены на этот URL";
+$a->strings["Begin of the Blackout"] = "Начало блэкаута";
+$a->strings["format is <em>YYYY</em> year, <em>MM</em> month, <em>DD</em> day, <em>hh</em> hour and <em>mm</em> minute"] = "формат: <em>YYYY</em> год, <em>MM</em> месяц, <em>DD</em> день, <em>hh</em> час и <em>mm</em> минута";
+$a->strings["End of the Blackout"] = "Конец блэкаута";
+$a->strings["The end-date is prior to the start-date of the blackout, you should fix this."] = "Указана более ранняя дата окончания, чем дата начала. Это надо исправить.";
diff --git a/blackout/lang/sv/messages.po b/blackout/lang/sv/messages.po
index ee58b960..31931bf7 100644
--- a/blackout/lang/sv/messages.po
+++ b/blackout/lang/sv/messages.po
@@ -4,16 +4,16 @@
 # 
 # 
 # Translators:
-# efef6ec5b435a041fce803c7f8af77d2_2341d43, 2017
+# Jonatan Nyberg, 2017
 # Tim Stahel <transifex@swedneck.xyz>, 2018
 # Bjoessi <torbjorn.andersson@syte.se>, 2019
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2021-01-04 08:29+0000\n"
-"Last-Translator: Transifex Bot <>\n"
+"POT-Creation-Date: 2019-03-12 09:26+0100\n"
+"PO-Revision-Date: 2019-04-04 20:32+0000\n"
+"Last-Translator: Bjoessi <torbjorn.andersson@syte.se>\n"
 "Language-Team: Swedish (http://www.transifex.com/Friendica/friendica/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,49 +21,48 @@ msgstr ""
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: blackout.php:97
+#: blackout.php:101
 msgid ""
-"The end-date is prior to the start-date of the blackout, you should fix "
-"this."
-msgstr ""
+"The end-date is prior to the start-date of the blackout, you should fix this"
+msgstr "Slutdatumet ligger före startdatumet för nedsläckningen, du bör rätta detta."
 
-#: blackout.php:99
+#: blackout.php:103
 #, php-format
 msgid ""
-"Please double check the current settings for the blackout. It will begin on "
-"<strong>%s</strong> and end on <strong>%s</strong>."
-msgstr ""
+"Please double check that the current settings for the blackout. Begin will "
+"be <strong>%s</strong> and it will end <strong>%s</strong>."
+msgstr "Vänligen försäkra dig om att inställningarna för nedsläckningen är korrekt. Början <strong>%s</strong> och slut <strong>%s</strong>."
 
-#: blackout.php:102
+#: blackout.php:106
 msgid "Save Settings"
 msgstr "Spara inställningar"
 
-#: blackout.php:103
+#: blackout.php:107
 msgid "Redirect URL"
 msgstr "Omdirigera URL"
 
-#: blackout.php:103
-msgid "All your visitors from the web will be redirected to this URL."
-msgstr ""
+#: blackout.php:107
+msgid "all your visitors from the web will be redirected to this URL"
+msgstr "alla dina besökare från webben kommer omdirigeras till denna URL"
 
-#: blackout.php:104
+#: blackout.php:108
 msgid "Begin of the Blackout"
 msgstr "Start på nedsläckningen"
 
-#: blackout.php:104
+#: blackout.php:108
 msgid ""
 "Format is <tt>YYYY-MM-DD hh:mm</tt>; <em>YYYY</em> year, <em>MM</em> month, "
 "<em>DD</em> day, <em>hh</em> hour and <em>mm</em> minute."
 msgstr "Formatet är <tt>ÅÅÅÅ-MM-DD tt:mm</tt>; <em>ÅÅÅÅ</em> år, <em>MM</em> månad, <em>DD</em> dag, <em>tt</em> timme och <em>mm</em> minut."
 
-#: blackout.php:105
+#: blackout.php:109
 msgid "End of the Blackout"
 msgstr "Slut på nedsläckningen"
 
-#: blackout.php:107
+#: blackout.php:111
 msgid ""
 "<strong>Note</strong>: The redirect will be active from the moment you press"
 " the submit button. Users currently logged in will <strong>not</strong> be "
-"thrown out but can't login again after logging out while the blackout is "
+"thrown out but can't login again after logging out should the blackout is "
 "still in place."
-msgstr ""
+msgstr "<strong>Observera</strong>: Hänvisningen kommer att träda i kraft när du trycker på skicka-knappen. Användare som just nu är inloggade kommer <strong>inte</strong> bli utkastade men kan inte logga in igen efter utloggning om nedsläckningen fortfarande är i kraft. "
diff --git a/blackout/lang/sv/strings.php b/blackout/lang/sv/strings.php
index 86792904..d7eadfd4 100644
--- a/blackout/lang/sv/strings.php
+++ b/blackout/lang/sv/strings.php
@@ -3,10 +3,15 @@
 if(! function_exists("string_plural_select_sv")) {
 function string_plural_select_sv($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Save Settings'] = 'Spara inställningar';
-$a->strings['Redirect URL'] = 'Omdirigera URL';
-$a->strings['Begin of the Blackout'] = 'Start på nedsläckningen';
-$a->strings['Format is <tt>YYYY-MM-DD hh:mm</tt>; <em>YYYY</em> year, <em>MM</em> month, <em>DD</em> day, <em>hh</em> hour and <em>mm</em> minute.'] = 'Formatet är <tt>ÅÅÅÅ-MM-DD tt:mm</tt>; <em>ÅÅÅÅ</em> år, <em>MM</em> månad, <em>DD</em> dag, <em>tt</em> timme och <em>mm</em> minut.';
-$a->strings['End of the Blackout'] = 'Slut på nedsläckningen';
+;
+$a->strings["The end-date is prior to the start-date of the blackout, you should fix this"] = "Slutdatumet ligger före startdatumet för nedsläckningen, du bör rätta detta.";
+$a->strings["Please double check that the current settings for the blackout. Begin will be <strong>%s</strong> and it will end <strong>%s</strong>."] = "Vänligen försäkra dig om att inställningarna för nedsläckningen är korrekt. Början <strong>%s</strong> och slut <strong>%s</strong>.";
+$a->strings["Save Settings"] = "Spara inställningar";
+$a->strings["Redirect URL"] = "Omdirigera URL";
+$a->strings["all your visitors from the web will be redirected to this URL"] = "alla dina besökare från webben kommer omdirigeras till denna URL";
+$a->strings["Begin of the Blackout"] = "Start på nedsläckningen";
+$a->strings["Format is <tt>YYYY-MM-DD hh:mm</tt>; <em>YYYY</em> year, <em>MM</em> month, <em>DD</em> day, <em>hh</em> hour and <em>mm</em> minute."] = "Formatet är <tt>ÅÅÅÅ-MM-DD tt:mm</tt>; <em>ÅÅÅÅ</em> år, <em>MM</em> månad, <em>DD</em> dag, <em>tt</em> timme och <em>mm</em> minut.";
+$a->strings["End of the Blackout"] = "Slut på nedsläckningen";
+$a->strings["<strong>Note</strong>: The redirect will be active from the moment you press the submit button. Users currently logged in will <strong>not</strong> be thrown out but can't login again after logging out should the blackout is still in place."] = "<strong>Observera</strong>: Hänvisningen kommer att träda i kraft när du trycker på skicka-knappen. Användare som just nu är inloggade kommer <strong>inte</strong> bli utkastade men kan inte logga in igen efter utloggning om nedsläckningen fortfarande är i kraft. ";
diff --git a/blackout/lang/zh-cn/messages.po b/blackout/lang/zh-cn/messages.po
deleted file mode 100644
index f91d56f5..00000000
--- a/blackout/lang/zh-cn/messages.po
+++ /dev/null
@@ -1,66 +0,0 @@
-# ADDON blackout
-# Copyright (C)
-# This file is distributed under the same license as the Friendica blackout addon package.
-# 
-# 
-# Translators:
-# steve jobs <vicdorke@gmail.com>, 2020
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-03-12 09:26+0100\n"
-"PO-Revision-Date: 2020-07-06 19:48+0000\n"
-"Last-Translator: steve jobs <vicdorke@gmail.com>\n"
-"Language-Team: Chinese (China) (http://www.transifex.com/Friendica/friendica/language/zh_CN/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: zh_CN\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-
-#: blackout.php:101
-msgid ""
-"The end-date is prior to the start-date of the blackout, you should fix this"
-msgstr "结束日期早于开始日期，您应该修复此问题"
-
-#: blackout.php:103
-#, php-format
-msgid ""
-"Please double check that the current settings for the blackout. Begin will "
-"be <strong>%s</strong> and it will end <strong>%s</strong>."
-msgstr "请仔细检查一下当前的维护设置。将从<strong>%s</strong>开始结束于<strong>%s</strong>。"
-
-#: blackout.php:106
-msgid "Save Settings"
-msgstr "保存设置"
-
-#: blackout.php:107
-msgid "Redirect URL"
-msgstr "重定向URL"
-
-#: blackout.php:107
-msgid "all your visitors from the web will be redirected to this URL"
-msgstr "所有来自web的访问者都将重定向到此URL"
-
-#: blackout.php:108
-msgid "Begin of the Blackout"
-msgstr "开始维护"
-
-#: blackout.php:108
-msgid ""
-"Format is <tt>YYYY-MM-DD hh:mm</tt>; <em>YYYY</em> year, <em>MM</em> month, "
-"<em>DD</em> day, <em>hh</em> hour and <em>mm</em> minute."
-msgstr "格式为<tt>YYYY-MM-DD HH：MM</tt>；<em>YYYY年</em>、<em>MM月</em>、<em>DD日</em>、<em>HH</em>小时和<em>MM</em>分钟"
-
-#: blackout.php:109
-msgid "End of the Blackout"
-msgstr "结束维护"
-
-#: blackout.php:111
-msgid ""
-"<strong>Note</strong>: The redirect will be active from the moment you press"
-" the submit button. Users currently logged in will <strong>not</strong> be "
-"thrown out but can't login again after logging out should the blackout is "
-"still in place."
-msgstr "<strong>注意</strong>：从您按下提交按钮的那一刻起，重定向将处于活动状态。当前登录的用户<strong>不会</strong>被驱逐，但如果仍处于维护状态，则在注销后不能再次登录。"
diff --git a/blackout/lang/zh-cn/strings.php b/blackout/lang/zh-cn/strings.php
index 41b7473e..d6d8e7d2 100644
--- a/blackout/lang/zh-cn/strings.php
+++ b/blackout/lang/zh-cn/strings.php
@@ -1,16 +1,3 @@
-<?php
-
-if(! function_exists("string_plural_select_zh_cn")) {
-function string_plural_select_zh_cn($n){
-	$n = intval($n);
-	return intval(0);
-}}
-$a->strings['The end-date is prior to the start-date of the blackout, you should fix this'] = '结束日期早于开始日期，您应该修复此问题';
-$a->strings['Please double check that the current settings for the blackout. Begin will be <strong>%s</strong> and it will end <strong>%s</strong>.'] = '请仔细检查一下当前的维护设置。将从<strong>%s</strong>开始结束于<strong>%s</strong>。';
-$a->strings['Save Settings'] = '保存设置';
-$a->strings['Redirect URL'] = '重定向URL';
-$a->strings['all your visitors from the web will be redirected to this URL'] = '所有来自web的访问者都将重定向到此URL';
-$a->strings['Begin of the Blackout'] = '开始维护';
-$a->strings['Format is <tt>YYYY-MM-DD hh:mm</tt>; <em>YYYY</em> year, <em>MM</em> month, <em>DD</em> day, <em>hh</em> hour and <em>mm</em> minute.'] = '格式为<tt>YYYY-MM-DD HH：MM</tt>；<em>YYYY年</em>、<em>MM月</em>、<em>DD日</em>、<em>HH</em>小时和<em>MM</em>分钟';
-$a->strings['End of the Blackout'] = '结束维护';
-$a->strings['<strong>Note</strong>: The redirect will be active from the moment you press the submit button. Users currently logged in will <strong>not</strong> be thrown out but can\'t login again after logging out should the blackout is still in place.'] = '<strong>注意</strong>：从您按下提交按钮的那一刻起，重定向将处于活动状态。当前登录的用户<strong>不会</strong>被驱逐，但如果仍处于维护状态，则在注销后不能再次登录。';
+<?php
+
+$a->strings["Submit"] = "提交";
diff --git a/blockbot/blockbot.php b/blockbot/blockbot.php
index e11f23f7..2714e494 100644
--- a/blockbot/blockbot.php
+++ b/blockbot/blockbot.php
@@ -8,139 +8,91 @@
  *
  */
 
+use Friendica\App;
+use Friendica\Core\Config;
 use Friendica\Core\Hook;
-use Friendica\DI;
+use Friendica\Core\System;
 use Jaybizzle\CrawlerDetect\CrawlerDetect;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
-use Friendica\Network\HTTPException\ForbiddenException;
+use Friendica\Core\L10n;
 
 require_once __DIR__ . DIRECTORY_SEPARATOR . 'vendor' . DIRECTORY_SEPARATOR . 'autoload.php';
 
-function blockbot_install()
-{
+function blockbot_install() {
 	Hook::register('init_1', __FILE__, 'blockbot_init_1');
 }
 
-function blockbot_addon_admin(string &$o)
-{
-	$t = Renderer::getMarkupTemplate('admin.tpl', 'addon/blockbot/');
+
+function blockbot_uninstall() {
+	Hook::unregister('init_1', __FILE__, 'blockbot_init_1');
+}
+
+function blockbot_addon_admin(&$a, &$o) {
+	$t = Renderer::getMarkupTemplate("admin.tpl", "addon/blockbot/");
 
 	$o = Renderer::replaceMacros($t, [
-		'$submit'             => DI::l10n()->t('Save Settings'),
-		'$good_crawlers'      => ['good_crawlers', DI::l10n()->t('Allow "good" crawlers'), DI::config()->get('blockbot', 'good_crawlers'), DI::l10n()->t("Don't block fediverse crawlers, relay servers and other bots with good purposes.")],
-		'$socialmedia_agents' => ['socialmedia_agents', DI::l10n()->t('Allow preview agents'), DI::config()->get('blockbot', 'socialmedia_agents'), DI::l10n()->t("Don't block agents from social media systems that want to generate preview data for links that had been set by their users.")],
-		'$http_libraries'     => ['http_libraries', DI::l10n()->t('Allow generic HTTP libraries'), DI::config()->get('blockbot', 'http_libraries'), DI::l10n()->t("Don't block agents from generic HTTP libraries that could be used for good or for bad and that currently can't be traced back to any known Fediverse project.")],
-		'$block_gab'          => ['block_gab', DI::l10n()->t('Block GabSocial'), DI::config()->get('blockbot', 'block_gab'), DI::l10n()->t('Block the software GabSocial. This will block every access for that software. You can block dedicated gab instances in the blocklist settings in the admin section.')],
-		'$training'           => ['training', DI::l10n()->t('Training mode'), DI::config()->get('blockbot', 'training'), DI::l10n()->t("Activates the training mode. This is only meant for developing purposes. Don't activate this on a production machine. This can cut communication with some systems.")],
+		'$submit' => L10n::t('Save Settings'),
+		'$good_crawlers' => ['good_crawlers', L10n::t('Allow "good" crawlers'), Config::get('blockbot', 'good_crawlers'), "Don't block fediverse crawlers, relay servers and other bots with good purposes."],
+		'$block_gab' => ['block_gab', L10n::t('Block GabSocial'), Config::get('blockbot', 'block_gab'), 'Block the software GabSocial. This will block every access for that software. You can block dedicated gab instances in the blocklist settings in the admin section.'],
+		'$training' => ['training', L10n::t('Training mode'), Config::get('blockbot', 'training'), "Activates the training mode. This is only meant for developing purposes. Don't activate this on a production machine. This can cut communication with some systems."],
 	]);
 }
 
-function blockbot_addon_admin_post()
-{
-	DI::config()->set('blockbot', 'good_crawlers', $_POST['good_crawlers'] ?? false);
-	DI::config()->set('blockbot', 'socialmedia_agents', $_POST['socialmedia_agents'] ?? false);
-	DI::config()->set('blockbot', 'http_libraries', $_POST['http_libraries'] ?? false);
-	DI::config()->set('blockbot', 'block_gab', $_POST['block_gab'] ?? false);
-	DI::config()->set('blockbot', 'training', $_POST['training'] ?? false);
+function blockbot_addon_admin_post(&$a) {
+	Config::set('blockbot', 'good_crawlers', $_POST['good_crawlers'] ?? false);
+	Config::set('blockbot', 'block_gab', $_POST['block_gab'] ?? false);
+	Config::set('blockbot', 'training', $_POST['training'] ?? false);
+	info(L10n::t('Settings updated.'). EOL);
 }
 
-function blockbot_init_1()
-{
+function blockbot_init_1(App $a) {
 	if (empty($_SERVER['HTTP_USER_AGENT'])) {
 		return;
 	}
 
 	$logdata = ['agent' => $_SERVER['HTTP_USER_AGENT'], 'uri' => $_SERVER['REQUEST_URI']];
 
-	// List of known unwanted crawlers.
-	$agents = [
-		'SemrushBot', 's~feedly-nikon3', 'Qwantify/Bleriot/', 'ltx71', 'Sogou web spider/',
-		'Diffbot/', 'YisouSpider', 'evc-batch/', 'LivelapBot/', 'TrendsmapResolver/',
+	// List of "good" crawlers
+	$good_agents = ['fediverse.space crawler', 'fediverse.network crawler', 'Active_Pods_CheckBot_3.0',
+			'Social-Relay/', 'Test Certificate Info', 'Uptimebot/', 'GNUSocialBot'];
+
+	// List of known crawlers.
+	$agents = ['SemrushBot', 's~feedly-nikon3', 'Qwantify/Bleriot/', 'ltx71', 'Sogou web spider/',
+		'Diffbot/', 'Twitterbot/', 'YisouSpider', 'evc-batch/', 'LivelapBot/', 'TrendsmapResolver/',
 		'PaperLiBot/', 'Nuzzel', 'um-LN/', 'Google Favicon', 'Datanyze', 'BLEXBot/', '360Spider',
 		'adscanner/', 'HeadlessChrome', 'wpif', 'startmebot/', 'Googlebot/', 'Applebot/',
-		'GoogleImageProxy', 'bingbot/', 'heritrix/', 'ldspider',
-		'AwarioRssBot/', 'TweetmemeBot/', 'dcrawl/', 'PhantomJS/', 'Googlebot-Image/',
-		'CrowdTanglebot/', 'Mediapartners-Google', 'Baiduspider', 'datagnionbot',
+		'facebookexternalhit/', 'GoogleImageProxy', 'bingbot/', 'heritrix/', 'ldspider',
+		'AwarioRssBot/', 'Zabbix', 'TweetmemeBot/', 'dcrawl/', 'PhantomJS/', 'Googlebot-Image/',
+		'CrowdTanglebot/', 'Mediapartners-Google', 'Baiduspider/', 'datagnionbot',
 		'MegaIndex.ru/', 'SMUrlExpander', 'Hatena-Favicon/', 'Wappalyzer', 'FlipboardProxy/',
 		'NetcraftSurveyAgent/', 'Dataprovider.com', 'SMTBot/', 'Nimbostratus-Bot/',
 		'DuckDuckGo-Favicons-Bot/', 'IndieWebCards/', 'proximic', 'netEstate NE Crawler',
-		'AhrefsBot/', 'YandexBot/', 'Exabot/', 'Mediumbot-MetaTagFetcher/',
-		'SurdotlyBot/', 'BingPreview/', 'SabsimBot/', 'CCBot/', 'WbSrch/',
+		'AhrefsBot/', 'YandexBot/', 'Exabot/', 'Mediumbot-MetaTagFetcher/', 'WhatsApp/',
+		'TelegramBot', 'SurdotlyBot/', 'BingPreview/', 'SabsimBot/', 'CCBot/', 'WbSrch/',
 		'DuckDuckBot-Https/', 'HTTP Banner Detection', 'YandexImages/', 'archive.org_bot',
 		'ArchiveTeam ArchiveBot/', 'yacybot', 'https://developers.google.com/+/web/snippet/',
-		'Scrapy/', 'MJ12bot/', 'DotBot/', 'Pinterestbot/', 'Jooblebot/',
+		'Scrapy/', 'github-camo', 'MJ12bot/', 'DotBot/', 'Pinterestbot/', 'Jooblebot/',
 		'Cliqzbot/', 'YaK/', 'Mediatoolkitbot', 'Snacktory', 'FunWebProducts', 'oBot/',
 		'7Siters/', 'KOCMOHABT', 'Google-SearchByImage', 'FemtosearchBot/',
-		'HubSpot Crawler', 'DomainStatsBot/', 'Re-re Studio', 'AwarioSmartBot/',
-		'DNSResearchBot/', 'PetalBot;', 'Nmap Scripting Engine;',
-		'Google-Apps-Script; beanserver;', 'woorankreview/', 'Seekport Crawler;', 'AHC/',
-		'Semanticbot/', 'XoviOnpageCrawler;', 'Pinterest/',
-		'GetHPinfo.com-Bot/', 'BoardReader Favicon Fetcher', 'Google-Adwords-Instant', 'newspaper/',
-		'YurichevBot/', 'Crawling at Home Project', 'InfoTigerBot/', 'AdIdxBot/',
-		'MicrosoftPreview/', 'masscan/', 'Timpibot/', 'everyfeed-spider/', 'AndroidDownloadManager/',
-		'WebZIP/', 'WDG_Validator/', 'Screaming Frog SEO Spider/', ' Bytespider;', 'ISSCyberRiskCrawler/',
-		'BitSightBot/', 'ev-crawler/', 'CensysInspect/1.1', 'Protopage/', 'Gaisbot/', 'WellKnownBot/',
-		'SuperBot/', 'Googlebot-Mobile/', 'GPTBot/', 'GenomeCrawlerd/', '2ip bot/', 'Ocarinabot',
-		'Yahoo! Slurp;', 'AdsBot-Google', 'Gregarius/', 'FAST-WebCrawler/', 'Xenu Link Sleuth/',
-		'Ask Jeeves', 'alexa site audit/', 'Yahoo! Slurp China;', 'Microsoft URL Control',
-		'Facebot', 'Googlebot-Video/', 'msnbot/', 'Offline Explorer/', 'YandexNews/', 'msnbot-media/',
-		'EmailWolf', 'Download Demon/', 'FeedFetcher-Google;', 'WebCopier', '+ONB_Bot_Btrix',
-		'scoopit-crawler/', 'ia_archiver', 'Quora-Bot/', 'WebwikiBot/', 'FullStoryBot/',
-		'wpbot/', 'SearchExpress', 'DuckDuckBot/', 'Google Web Preview',
-	];
+		'HubSpot Crawler', 'DomainStatsBot/', 'Re-re Studio'];
 
-	if (DI::config()->get('blockbot', 'block_gab')) {
+	if (!Config::get('blockbot', 'good_crawlers')) {
+		$agents = array_merge($agents, $good_agents);
+	}
+
+	if (Config::get('blockbot', 'block_gab')) {
 		$agents[] = 'GabSocial/';
 	}
 
-	// List of "good" crawlers, mostly from the fediverse.
-	$good_agents = [
-		'fediverse.space crawler', 'fediverse.network crawler', 'Active_Pods_CheckBot_3.0',
-		'Social-Relay/', 'Test Certificate Info', 'Uptimebot/', 'GNUSocialBot', 'UptimeRobot/',
-		'PTST/', 'Zabbix', 'Poduptime/', 'FediFetcher', 'lemmy-stats-crawler',
-		'FedditLemmyverseCrawler/', 'lemmy-explorer-crawler/', 'URIports Validator',
-		'rss-is-dead.lol web bot;', 'fedistatsCrawler/', 'W3C_CSS_Validator_JFouffa/',
-		'IABot/', 'Slackbot 1', 'BeeperBot/', 'Matrix-Media-Repo/', 'P3P Validator',
-		'KeybaseBot;',
-	];
-
-	if (!DI::config()->get('blockbot', 'good_crawlers')) {
-		$agents = array_merge($agents, $good_agents);
-	} elseif (blockbot_match($good_agents)) {
-		return;
-	}
-
-	// List of agents from social media systems that fetch preview data via opem graph or twitter cards.
-	$socialmedia_agents = ['Twitterbot', 'facebookexternalhit/', 'SkypeUriPreview Preview/',
-		'TelegramBot', 'WhatsApp/', 'github-camo', 'Bluesky Cardyb/', 'XING-contenttabreceiver/', 
-		'LinkedInBot/', 'Instagram ', 'Synapse (bot; ', 'Discordbot/', 'SummalyBot/',
-		'Slackbot-LinkExpanding', 'Slack-ImgProxy', 'Iframely/',
-	];
-
-	if (!DI::config()->get('blockbot', 'socialmedia_agents')) {
-		$agents = array_merge($agents, $socialmedia_agents);
-	} elseif (blockbot_match($socialmedia_agents)) {
-		return;
-	}
-	
-	// HTTP Libraries
-	$http_libraries = ['ReactorNetty/', 'GuzzleHttp/', 'Embed PHP library', 'python-urllib3/',
-		'EventMachine HttpClient', 'HTMLParser/'
-	];
-
-	if (!DI::config()->get('blockbot', 'http_libraries')) {
-		$agents = array_merge($agents, $http_libraries);
-	} elseif (blockbot_match($http_libraries)) {
-		return;
-	}
-
-	if (blockbot_match($agents)) {
-		throw new ForbiddenException('Bots are not allowed. If you consider this a mistake, create an issue at https://github.com/friendica/friendica');
+	foreach ($agents as $agent) {
+		if (stristr($_SERVER['HTTP_USER_AGENT'], $agent)) {
+			System::httpExit(403, 'Bots are not allowed');
+		}
 	}
 
 	// This switch here is only meant for developers who want to add more bots to the list above, it is not safe for production.
-	if (!DI::config()->get('blockbot', 'training')) {
+	if (!Config::get('blockbot', 'training')) {
 		return;
 	}
 
@@ -151,37 +103,25 @@ function blockbot_init_1()
 		return;
 	}
 
-	// List of known "good" agents, mostly used by Fediverse systems, feed readers, ...
-	$agents = [
-		'curl', 'zgrab', 'Go-http-client', 'curb', 'github.com', 'reqwest', 'Feedly/',
+	// List of false positives' strings of known "good" agents.
+	$agents = ['curl', 'zgrab', 'Go-http-client', 'curb', 'github.com', 'reqwest', 'Feedly/',
 		'Python-urllib/', 'Liferea/', 'aiohttp/', 'WordPress.com Reader', 'hackney/',
 		'Faraday v', 'okhttp', 'UniversalFeedParser', 'PixelFedBot', 'python-requests',
 		'WordPress/', 'http.rb/', 'Apache-HttpClient/', 'WordPress.com;', 'Pleroma',
-		'Dispatch/', 'Ruby', 'Java/', 'libwww-perl/', 'Mastodon/', 'FeedlyApp/',
-		'lua-resty-http/', 'Tiny Tiny RSS/', 'Wget/', 'PostmanRuntime/',
-		'W3C_Validator/', 'NetNewsWire', 'FeedValidator/', 'theoldreader.com', 'axios/',
-		'Paw/', 'PeerTube/', 'fedi.inex.dev', 'FediDB/', 'index.community crawler',
-		'Slackbot-LinkExpanding', 'Firefish/', 'Takahe/', 'Akkoma ', 'Misskey/', 'Lynx/',
-		'camo-rs asset proxy', 'gotosocial/', 'incestoma ', 'SpaceCowboys Android RSS Reader',
-		'NewsBlur Feed Finder', 'Lemmy/', 'enby-town/', 'rss2tg bot;', '; HTTrack ',
-		'MbinBot', 'kbinBot', 'Pixelfed/', 'NewsBlur Feed Fetcher', 'NewsBlur Page Fetcher',
-	];
+		'Dispatch/', 'Ruby', 'Java/', 'libwww-perl/', 'Mastodon/',
+		'lua-resty-http/'];
 
-	if (blockbot_match($agents)) {
-		logger::info('False positive', $logdata);
-		return;
+	if (Config::get('blockbot', 'good_crawlers')) {
+		$agents = array_merge($agents, $good_agents);
 	}
 
-	logger::notice('Blocked bot', $logdata);
-	throw new ForbiddenException('Bots are not allowed. If you consider this a mistake, create an issue at https://github.com/friendica/friendica');
-}
-
-function blockbot_match(array $agents)
-{
 	foreach ($agents as $agent) {
 		if (stristr($_SERVER['HTTP_USER_AGENT'], $agent)) {
-			return true;
+			logger::notice('False positive', $logdata);
+			return;
 		}
 	}
-	return false;
-}
\ No newline at end of file
+
+	logger::info('Blocked bot', $logdata);
+	System::httpExit(403, 'Bots are not allowed');
+}
diff --git a/blockbot/composer.json b/blockbot/composer.json
index 40583e20..f13a2d17 100644
--- a/blockbot/composer.json
+++ b/blockbot/composer.json
@@ -1,24 +1,24 @@
 {
-    "name": "friendica-addons/blockbot",
-    "description": "Blocking bots based on detecting bots/crawlers/spiders via the user agent and http_from header.",
-    "type": "friendica-addon",
-    "authors": [
-        {
-            "name": "Philipp Holzer",
-            "email": "admin@philipp.info",
-            "homepage": "https://friendica.philipp.info/profile/nupplaphil",
-            "role": "Developer"
-        }
-    ],
-    "require": {
-        "php": ">=5.6.0",
-        "jaybizzle/crawler-detect": "1.*"
-    },
-    "license": "3-clause BSD license",
-    "minimum-stability": "stable",
-    "config": {
-        "optimize-autoloader": true,
-        "autoloader-suffix": "BlockBotAddon",
-        "preferred-install": "dist"
-    }
+	"name": "friendica-addons/blockbot",
+	"description": "Blocking bots based on detecting bots/crawlers/spiders via the user agent and http_from header.",
+	"type": "friendica-addon",
+	"authors": [
+		{
+			"name": "Philipp Holzer",
+			"email": "admin@philipp.info",
+			"homepage": "https://friendica.philipp.info/profile/nupplaphil",
+			"role": "Developer"
+		}
+	],
+	"require": {
+		"php": ">=5.6.0",
+		"jaybizzle/crawler-detect": "1.*"
+	},
+	"license": "3-clause BSD license",
+	"minimum-stability": "stable",
+	"config": {
+		"optimize-autoloader": true,
+		"autoloader-suffix": "BlockBotAddon",
+		"preferred-install": "dist"
+	}
 }
diff --git a/blockbot/composer.lock b/blockbot/composer.lock
index 50f71a37..26b021b1 100644
--- a/blockbot/composer.lock
+++ b/blockbot/composer.lock
@@ -8,23 +8,24 @@
     "packages": [
         {
             "name": "jaybizzle/crawler-detect",
-            "version": "v1.2.116",
+            "version": "v1.2.80",
             "source": {
                 "type": "git",
                 "url": "https://github.com/JayBizzle/Crawler-Detect.git",
-                "reference": "97e9fe30219e60092e107651abb379a38b342921"
+                "reference": "af6a36e6d69670df3f0a3ed8e21d4b8cc67a7847"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/JayBizzle/Crawler-Detect/zipball/97e9fe30219e60092e107651abb379a38b342921",
-                "reference": "97e9fe30219e60092e107651abb379a38b342921",
+                "url": "https://api.github.com/repos/JayBizzle/Crawler-Detect/zipball/af6a36e6d69670df3f0a3ed8e21d4b8cc67a7847",
+                "reference": "af6a36e6d69670df3f0a3ed8e21d4b8cc67a7847",
                 "shasum": ""
             },
             "require": {
                 "php": ">=5.3.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^4.8|^5.5|^6.5|^9.4"
+                "phpunit/phpunit": "^4.8|^5.5|^6.5",
+                "satooshi/php-coveralls": "1.*"
             },
             "type": "library",
             "autoload": {
@@ -52,7 +53,7 @@
                 "crawlerdetect",
                 "php crawler detect"
             ],
-            "time": "2023-07-21T15:49:49+00:00"
+            "time": "2019-04-05T19:52:02+00:00"
         }
     ],
     "packages-dev": [],
@@ -64,6 +65,5 @@
     "platform": {
         "php": ">=5.6.0"
     },
-    "platform-dev": [],
-    "plugin-api-version": "1.1.0"
+    "platform-dev": []
 }
diff --git a/blockbot/lang/C/messages.po b/blockbot/lang/C/messages.po
index a99ccc5a..1bdd56a7 100644
--- a/blockbot/lang/C/messages.po
+++ b/blockbot/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-03-05 04:51+0000\n"
+"POT-Creation-Date: 2019-08-07 09:03+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,59 +17,22 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: blockbot.php:30
+#: blockbot.php:35
 msgid "Save Settings"
 msgstr ""
 
-#: blockbot.php:31
+#: blockbot.php:36
 msgid "Allow \"good\" crawlers"
 msgstr ""
 
-#: blockbot.php:31
-msgid ""
-"Don't block fediverse crawlers, relay servers and other bots with good "
-"purposes."
-msgstr ""
-
-#: blockbot.php:32
-msgid "Allow preview agents"
-msgstr ""
-
-#: blockbot.php:32
-msgid ""
-"Don't block agents from social media systems that want to generate preview "
-"data for links that had been set by their users."
-msgstr ""
-
-#: blockbot.php:33
-msgid "Allow generic HTTP libraries"
-msgstr ""
-
-#: blockbot.php:33
-msgid ""
-"Don't block agents from generic HTTP libraries that could be used for good "
-"or for bad and that currently can't be traced back to any known Fediverse "
-"project."
-msgstr ""
-
-#: blockbot.php:34
+#: blockbot.php:37
 msgid "Block GabSocial"
 msgstr ""
 
-#: blockbot.php:34
-msgid ""
-"Block the software GabSocial. This will block every access for that "
-"software. You can block dedicated gab instances in the blocklist settings in "
-"the admin section."
-msgstr ""
-
-#: blockbot.php:35
+#: blockbot.php:38
 msgid "Training mode"
 msgstr ""
 
-#: blockbot.php:35
-msgid ""
-"Activates the training mode. This is only meant for developing purposes. "
-"Don't activate this on a production machine. This can cut communication with "
-"some systems."
+#: blockbot.php:46
+msgid "Settings updated."
 msgstr ""
diff --git a/blockbot/lang/ar/messages.po b/blockbot/lang/ar/messages.po
deleted file mode 100644
index 27af1435..00000000
--- a/blockbot/lang/ar/messages.po
+++ /dev/null
@@ -1,39 +0,0 @@
-# ADDON blockbot
-# Copyright (C)
-# This file is distributed under the same license as the Friendica blockbot addon package.
-# 
-# 
-# Translators:
-# Farida Khalaf <faridakhalaf@hotmail.com>, 2021
-# abidin toumi <abidin24@tutanota.com>, 2021
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2019-08-07 07:43+0000\n"
-"Last-Translator: abidin toumi <abidin24@tutanota.com>, 2021\n"
-"Language-Team: Arabic (https://www.transifex.com/Friendica/teams/12172/ar/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ar\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-
-#: blockbot.php:29
-msgid "Save Settings"
-msgstr "احفظ الإعدادات"
-
-#: blockbot.php:30
-msgid "Allow \"good\" crawlers"
-msgstr "السماح ببرامج الزحف \"الجيدة\""
-
-#: blockbot.php:31
-msgid "Block GabSocial"
-msgstr "حظر GabSocial"
-
-#: blockbot.php:32
-msgid "Training mode"
-msgstr "وضع التدريب"
diff --git a/blockbot/lang/ar/strings.php b/blockbot/lang/ar/strings.php
deleted file mode 100644
index ef591488..00000000
--- a/blockbot/lang/ar/strings.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_ar")) {
-function string_plural_select_ar($n){
-	$n = intval($n);
-	if ($n==0) { return 0; } else if ($n==1) { return 1; } else if ($n==2) { return 2; } else if ($n%100>=3 && $n%100<=10) { return 3; } else if ($n%100>=11 && $n%100<=99) { return 4; } else  { return 5; }
-}}
-$a->strings['Save Settings'] = 'احفظ الإعدادات';
-$a->strings['Allow "good" crawlers'] = 'السماح ببرامج الزحف "الجيدة"';
-$a->strings['Block GabSocial'] = 'حظر GabSocial';
-$a->strings['Training mode'] = 'وضع التدريب';
diff --git a/blockbot/lang/bg/messages.po b/blockbot/lang/bg/messages.po
deleted file mode 100644
index cb61ff38..00000000
--- a/blockbot/lang/bg/messages.po
+++ /dev/null
@@ -1,42 +0,0 @@
-# ADDON blockbot
-# Copyright (C)
-# This file is distributed under the same license as the Friendica blockbot addon package.
-# 
-# 
-# Translators:
-# Rafael Kalachev <kalachev.rafael@gmail.com>, 2021
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-07 09:03+0200\n"
-"PO-Revision-Date: 2019-08-07 07:43+0000\n"
-"Last-Translator: Rafael Kalachev <kalachev.rafael@gmail.com>, 2021\n"
-"Language-Team: Bulgarian (https://www.transifex.com/Friendica/teams/12172/bg/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: bg\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: blockbot.php:35
-msgid "Save Settings"
-msgstr "Запази настройките"
-
-#: blockbot.php:36
-msgid "Allow \"good\" crawlers"
-msgstr "Разреши \"добри\" обхождащи роботи за уеб страници"
-
-#: blockbot.php:37
-msgid "Block GabSocial"
-msgstr "Блокирай GabSocial"
-
-#: blockbot.php:38
-msgid "Training mode"
-msgstr "Тренировъчен режим"
-
-#: blockbot.php:46
-msgid "Settings updated."
-msgstr "Настройките са обновени"
diff --git a/blockbot/lang/bg/strings.php b/blockbot/lang/bg/strings.php
deleted file mode 100644
index 932541d9..00000000
--- a/blockbot/lang/bg/strings.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_bg")) {
-function string_plural_select_bg($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Save Settings'] = 'Запази настройките';
-$a->strings['Allow "good" crawlers'] = 'Разреши "добри" обхождащи роботи за уеб страници';
-$a->strings['Block GabSocial'] = 'Блокирай GabSocial';
-$a->strings['Training mode'] = 'Тренировъчен режим';
-$a->strings['Settings updated.'] = 'Настройките са обновени';
diff --git a/blockbot/lang/ca/strings.php b/blockbot/lang/ca/strings.php
index ed82dcae..3f95ee05 100644
--- a/blockbot/lang/ca/strings.php
+++ b/blockbot/lang/ca/strings.php
@@ -3,10 +3,11 @@
 if(! function_exists("string_plural_select_ca")) {
 function string_plural_select_ca($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Save Settings'] = 'Desa la configuració';
-$a->strings['Allow "good" crawlers'] = 'Permeti rastrejadors "bons"';
-$a->strings['Block GabSocial'] = 'Bloquejar GabSocial';
-$a->strings['Training mode'] = 'Modalitat d\'entrenament';
-$a->strings['Settings updated.'] = 'La configuració s\'ha actualitzat.';
+;
+$a->strings["Save Settings"] = "Desa la configuració";
+$a->strings["Allow \"good\" crawlers"] = "Permeti rastrejadors \"bons\"";
+$a->strings["Block GabSocial"] = "Bloquejar GabSocial";
+$a->strings["Training mode"] = "Modalitat d'entrenament";
+$a->strings["Settings updated."] = "La configuració s'ha actualitzat.";
diff --git a/blockbot/lang/cs/strings.php b/blockbot/lang/cs/strings.php
index 09753d17..d3c5a2dd 100644
--- a/blockbot/lang/cs/strings.php
+++ b/blockbot/lang/cs/strings.php
@@ -3,10 +3,11 @@
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
 	$n = intval($n);
-	if (($n == 1 && $n % 1 == 0)) { return 0; } else if (($n >= 2 && $n <= 4 && $n % 1 == 0)) { return 1; } else if (($n % 1 != 0 )) { return 2; } else  { return 3; }
+	return ($n == 1 && $n % 1 == 0) ? 0 : ($n >= 2 && $n <= 4 && $n % 1 == 0) ? 1: ($n % 1 != 0 ) ? 2 : 3;;
 }}
-$a->strings['Save Settings'] = 'Uložit nastavení';
-$a->strings['Allow "good" crawlers'] = 'Povolit „dobré“ crawlery';
-$a->strings['Block GabSocial'] = 'Zablokovat GabSocial';
-$a->strings['Training mode'] = 'Trénovací režim';
-$a->strings['Settings updated.'] = 'Nastavení aktualizována.';
+;
+$a->strings["Save Settings"] = "Uložit nastavení";
+$a->strings["Allow \"good\" crawlers"] = "Povolit „dobré“ crawlery";
+$a->strings["Block GabSocial"] = "Zablokovat GabSocial";
+$a->strings["Training mode"] = "Trénovací režim";
+$a->strings["Settings updated."] = "Nastavení aktualizována.";
diff --git a/blockbot/lang/de/strings.php b/blockbot/lang/de/strings.php
index 4ef71070..db52f710 100644
--- a/blockbot/lang/de/strings.php
+++ b/blockbot/lang/de/strings.php
@@ -3,10 +3,11 @@
 if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Save Settings'] = 'Einstellungen speichern';
-$a->strings['Allow "good" crawlers'] = '"Gute" Crawler erlauben';
-$a->strings['Block GabSocial'] = 'GabSocial Instanzen blockieren';
-$a->strings['Training mode'] = 'Trainingsmodus';
-$a->strings['Settings updated.'] = 'Einstellungen aktualisiert.';
+;
+$a->strings["Save Settings"] = "Einstellungen speichern";
+$a->strings["Allow \"good\" crawlers"] = "\"Gute\" Crawler erlauben";
+$a->strings["Block GabSocial"] = "GabSocial Instanzen blockieren";
+$a->strings["Training mode"] = "Trainingsmodus";
+$a->strings["Settings updated."] = "Einstellungen aktualisiert.";
diff --git a/blockbot/lang/en-gb/strings.php b/blockbot/lang/en-gb/strings.php
index 1570fc97..f5299bf5 100644
--- a/blockbot/lang/en-gb/strings.php
+++ b/blockbot/lang/en-gb/strings.php
@@ -3,10 +3,11 @@
 if(! function_exists("string_plural_select_en_gb")) {
 function string_plural_select_en_gb($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Save Settings'] = 'Save Settings';
-$a->strings['Allow "good" crawlers'] = 'Allow "good" crawlers';
-$a->strings['Block GabSocial'] = 'Block GabSocial';
-$a->strings['Training mode'] = 'Training mode';
-$a->strings['Settings updated.'] = 'Settings updated.';
+;
+$a->strings["Save Settings"] = "Save Settings";
+$a->strings["Allow \"good\" crawlers"] = "Allow \"good\" crawlers";
+$a->strings["Block GabSocial"] = "Block GabSocial";
+$a->strings["Training mode"] = "Training mode";
+$a->strings["Settings updated."] = "Settings updated.";
diff --git a/blockbot/lang/es/strings.php b/blockbot/lang/es/strings.php
index 93ff45bf..813864c8 100644
--- a/blockbot/lang/es/strings.php
+++ b/blockbot/lang/es/strings.php
@@ -3,10 +3,11 @@
 if(! function_exists("string_plural_select_es")) {
 function string_plural_select_es($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Save Settings'] = 'Guardar ajustes';
-$a->strings['Allow "good" crawlers'] = 'Permitir rastreadores web "buenos"';
-$a->strings['Block GabSocial'] = 'Bloquear GabSocial';
-$a->strings['Training mode'] = 'Modo de entrenamiento';
-$a->strings['Settings updated.'] = 'Ajustes actualizados.';
+;
+$a->strings["Save Settings"] = "Guardar ajustes";
+$a->strings["Allow \"good\" crawlers"] = "Permitir rastreadores web \"buenos\"";
+$a->strings["Block GabSocial"] = "Bloquear GabSocial";
+$a->strings["Training mode"] = "Modo de entrenamiento";
+$a->strings["Settings updated."] = "Ajustes actualizados.";
diff --git a/blockbot/lang/fr/strings.php b/blockbot/lang/fr/strings.php
index dbcda667..1597735a 100644
--- a/blockbot/lang/fr/strings.php
+++ b/blockbot/lang/fr/strings.php
@@ -3,10 +3,11 @@
 if(! function_exists("string_plural_select_fr")) {
 function string_plural_select_fr($n){
 	$n = intval($n);
-	return intval($n > 1);
+	return ($n > 1);;
 }}
-$a->strings['Save Settings'] = 'Enregistrer les Paramètres';
-$a->strings['Allow "good" crawlers'] = 'Autoriser les "bons" crawlers';
-$a->strings['Block GabSocial'] = 'Bloquer GabSocial';
-$a->strings['Training mode'] = 'Mode d\'entraînement';
-$a->strings['Settings updated.'] = 'Paramètres mis à jour.';
+;
+$a->strings["Save Settings"] = "Enregistrer les Paramètres";
+$a->strings["Allow \"good\" crawlers"] = "Autoriser les \"bons\" crawlers";
+$a->strings["Block GabSocial"] = "Bloquer GabSocial";
+$a->strings["Training mode"] = "Mode d'entraînement";
+$a->strings["Settings updated."] = "Paramètres mis à jour.";
diff --git a/blockbot/lang/hu/messages.po b/blockbot/lang/hu/messages.po
deleted file mode 100644
index 1139b3f2..00000000
--- a/blockbot/lang/hu/messages.po
+++ /dev/null
@@ -1,42 +0,0 @@
-# ADDON blockbot
-# Copyright (C)
-# This file is distributed under the same license as the Friendica blockbot addon package.
-# 
-# 
-# Translators:
-# Balázs Úr, 2020
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-07 09:03+0200\n"
-"PO-Revision-Date: 2019-08-07 07:43+0000\n"
-"Last-Translator: Balázs Úr, 2020\n"
-"Language-Team: Hungarian (https://www.transifex.com/Friendica/teams/12172/hu/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: hu\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: blockbot.php:35
-msgid "Save Settings"
-msgstr "Beállítások mentése"
-
-#: blockbot.php:36
-msgid "Allow \"good\" crawlers"
-msgstr "A „jó” keresőrobotok engedélyezése"
-
-#: blockbot.php:37
-msgid "Block GabSocial"
-msgstr "GabSocial tiltása"
-
-#: blockbot.php:38
-msgid "Training mode"
-msgstr "Oktató mód"
-
-#: blockbot.php:46
-msgid "Settings updated."
-msgstr "A beállítások frissítve."
diff --git a/blockbot/lang/hu/strings.php b/blockbot/lang/hu/strings.php
deleted file mode 100644
index 6ede193a..00000000
--- a/blockbot/lang/hu/strings.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_hu")) {
-function string_plural_select_hu($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Save Settings'] = 'Beállítások mentése';
-$a->strings['Allow "good" crawlers'] = 'A „jó” keresőrobotok engedélyezése';
-$a->strings['Block GabSocial'] = 'GabSocial tiltása';
-$a->strings['Training mode'] = 'Oktató mód';
-$a->strings['Settings updated.'] = 'A beállítások frissítve.';
diff --git a/blockbot/lang/it/messages.po b/blockbot/lang/it/messages.po
deleted file mode 100644
index 06db4426..00000000
--- a/blockbot/lang/it/messages.po
+++ /dev/null
@@ -1,42 +0,0 @@
-# ADDON blockbot
-# Copyright (C)
-# This file is distributed under the same license as the Friendica blockbot addon package.
-# 
-# 
-# Translators:
-# Sylke Vicious <silkevicious@gmail.com>, 2020
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-07 09:03+0200\n"
-"PO-Revision-Date: 2019-08-07 07:43+0000\n"
-"Last-Translator: Sylke Vicious <silkevicious@gmail.com>, 2020\n"
-"Language-Team: Italian (https://www.transifex.com/Friendica/teams/12172/it/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: it\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: blockbot.php:35
-msgid "Save Settings"
-msgstr "Salva Impostazioni"
-
-#: blockbot.php:36
-msgid "Allow \"good\" crawlers"
-msgstr "Permetti crawler \"buoni\""
-
-#: blockbot.php:37
-msgid "Block GabSocial"
-msgstr "Blocca GabSocial"
-
-#: blockbot.php:38
-msgid "Training mode"
-msgstr "Modalità addestramento"
-
-#: blockbot.php:46
-msgid "Settings updated."
-msgstr "Impostazioni aggiornate."
diff --git a/blockbot/lang/it/strings.php b/blockbot/lang/it/strings.php
deleted file mode 100644
index fd379860..00000000
--- a/blockbot/lang/it/strings.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_it")) {
-function string_plural_select_it($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Save Settings'] = 'Salva Impostazioni';
-$a->strings['Allow "good" crawlers'] = 'Permetti crawler "buoni"';
-$a->strings['Block GabSocial'] = 'Blocca GabSocial';
-$a->strings['Training mode'] = 'Modalità addestramento';
-$a->strings['Settings updated.'] = 'Impostazioni aggiornate.';
diff --git a/blockbot/lang/nl/strings.php b/blockbot/lang/nl/strings.php
index 8ad73959..18d9c2cc 100644
--- a/blockbot/lang/nl/strings.php
+++ b/blockbot/lang/nl/strings.php
@@ -3,10 +3,11 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Save Settings'] = 'Instellingen opslaan';
-$a->strings['Allow "good" crawlers'] = '"Goede" crawlers toestaan';
-$a->strings['Block GabSocial'] = 'Blokeer GabSocial';
-$a->strings['Training mode'] = 'Training modus';
-$a->strings['Settings updated.'] = 'Instellingen opgeslagen';
+;
+$a->strings["Save Settings"] = "Instellingen opslaan";
+$a->strings["Allow \"good\" crawlers"] = "\"Goede\" crawlers toestaan";
+$a->strings["Block GabSocial"] = "Blokeer GabSocial";
+$a->strings["Training mode"] = "Training modus";
+$a->strings["Settings updated."] = "Instellingen opgeslagen";
diff --git a/blockbot/lang/pl/strings.php b/blockbot/lang/pl/strings.php
index 612798d8..0eafbcaf 100644
--- a/blockbot/lang/pl/strings.php
+++ b/blockbot/lang/pl/strings.php
@@ -3,10 +3,11 @@
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
 	$n = intval($n);
-	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
+	return ($n==1 ? 0 : ($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14) ? 1 : $n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14) ? 2 : 3);;
 }}
-$a->strings['Save Settings'] = 'Zapisz ustawienia';
-$a->strings['Allow "good" crawlers'] = 'Pozwól „dobrym” robotom';
-$a->strings['Block GabSocial'] = 'Zablokuj GabSocial';
-$a->strings['Training mode'] = 'Tryb treningowy';
-$a->strings['Settings updated.'] = 'Ustawienia zaktualizowane.';
+;
+$a->strings["Save Settings"] = "Zapisz ustawienia";
+$a->strings["Allow \"good\" crawlers"] = "Pozwól „dobrym” robotom";
+$a->strings["Block GabSocial"] = "Zablokuj GabSocial";
+$a->strings["Training mode"] = "Tryb treningowy";
+$a->strings["Settings updated."] = "Ustawienia zaktualizowane.";
diff --git a/blockbot/lang/ru/messages.po b/blockbot/lang/ru/messages.po
deleted file mode 100644
index d66e74b4..00000000
--- a/blockbot/lang/ru/messages.po
+++ /dev/null
@@ -1,43 +0,0 @@
-# ADDON blockbot
-# Copyright (C)
-# This file is distributed under the same license as the Friendica blockbot addon package.
-# 
-# 
-# Translators:
-# Alexey Adamov <2077@tutanota.com>, 2019
-# Eugene Veresk <eugene.vereshchagin@gmail.com>, 2020
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-07 09:03+0200\n"
-"PO-Revision-Date: 2019-08-07 07:43+0000\n"
-"Last-Translator: Eugene Veresk <eugene.vereshchagin@gmail.com>, 2020\n"
-"Language-Team: Russian (https://www.transifex.com/Friendica/teams/12172/ru/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ru\n"
-"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
-
-#: blockbot.php:35
-msgid "Save Settings"
-msgstr "Сохранить настройки"
-
-#: blockbot.php:36
-msgid "Allow \"good\" crawlers"
-msgstr "Разрешить \"хороших\" поисковых роботов"
-
-#: blockbot.php:37
-msgid "Block GabSocial"
-msgstr "Блокировать GabSocial"
-
-#: blockbot.php:38
-msgid "Training mode"
-msgstr "Режим обучения"
-
-#: blockbot.php:46
-msgid "Settings updated."
-msgstr "Настройки изменены"
diff --git a/blockbot/lang/ru/strings.php b/blockbot/lang/ru/strings.php
deleted file mode 100644
index c981ce97..00000000
--- a/blockbot/lang/ru/strings.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_ru")) {
-function string_plural_select_ru($n){
-	$n = intval($n);
-	if ($n%10==1 && $n%100!=11) { return 0; } else if ($n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14)) { return 1; } else if ($n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)) { return 2; } else  { return 3; }
-}}
-$a->strings['Save Settings'] = 'Сохранить настройки';
-$a->strings['Allow "good" crawlers'] = 'Разрешить "хороших" поисковых роботов';
-$a->strings['Block GabSocial'] = 'Блокировать GabSocial';
-$a->strings['Training mode'] = 'Режим обучения';
-$a->strings['Settings updated.'] = 'Настройки изменены';
diff --git a/blockbot/templates/admin.tpl b/blockbot/templates/admin.tpl
index 5f41ae70..a6de1bd3 100644
--- a/blockbot/templates/admin.tpl
+++ b/blockbot/templates/admin.tpl
@@ -1,6 +1,4 @@
 {{include file="field_checkbox.tpl" field=$good_crawlers}}
-{{include file="field_checkbox.tpl" field=$socialmedia_agents}}
-{{include file="field_checkbox.tpl" field=$http_libraries}}
 {{include file="field_checkbox.tpl" field=$block_gab}}
 {{include file="field_checkbox.tpl" field=$training}}
 <div class="submit"><button type="submit" class="btn btn-primary" name="page_site" value="{{$submit}}">{{$submit}}</button></div>
diff --git a/blockbot/vendor/composer/ClassLoader.php b/blockbot/vendor/composer/ClassLoader.php
index 03b9bb9c..95f7e097 100644
--- a/blockbot/vendor/composer/ClassLoader.php
+++ b/blockbot/vendor/composer/ClassLoader.php
@@ -60,7 +60,7 @@ class ClassLoader
     public function getPrefixes()
     {
         if (!empty($this->prefixesPsr0)) {
-            return call_user_func_array('array_merge', array_values($this->prefixesPsr0));
+            return call_user_func_array('array_merge', $this->prefixesPsr0);
         }
 
         return array();
@@ -279,7 +279,7 @@ class ClassLoader
      */
     public function setApcuPrefix($apcuPrefix)
     {
-        $this->apcuPrefix = function_exists('apcu_fetch') && filter_var(ini_get('apc.enabled'), FILTER_VALIDATE_BOOLEAN) ? $apcuPrefix : null;
+        $this->apcuPrefix = function_exists('apcu_fetch') && ini_get('apc.enabled') ? $apcuPrefix : null;
     }
 
     /**
diff --git a/blockbot/vendor/composer/autoload_real.php b/blockbot/vendor/composer/autoload_real.php
index 404079e0..ccb886a2 100644
--- a/blockbot/vendor/composer/autoload_real.php
+++ b/blockbot/vendor/composer/autoload_real.php
@@ -13,9 +13,6 @@ class ComposerAutoloaderInitBlockBotAddon
         }
     }
 
-    /**
-     * @return \Composer\Autoload\ClassLoader
-     */
     public static function getLoader()
     {
         if (null !== self::$loader) {
diff --git a/blockbot/vendor/composer/installed.json b/blockbot/vendor/composer/installed.json
index db9064b6..d255d573 100644
--- a/blockbot/vendor/composer/installed.json
+++ b/blockbot/vendor/composer/installed.json
@@ -1,26 +1,27 @@
 [
     {
         "name": "jaybizzle/crawler-detect",
-        "version": "v1.2.116",
-        "version_normalized": "1.2.116.0",
+        "version": "v1.2.80",
+        "version_normalized": "1.2.80.0",
         "source": {
             "type": "git",
             "url": "https://github.com/JayBizzle/Crawler-Detect.git",
-            "reference": "97e9fe30219e60092e107651abb379a38b342921"
+            "reference": "af6a36e6d69670df3f0a3ed8e21d4b8cc67a7847"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/JayBizzle/Crawler-Detect/zipball/97e9fe30219e60092e107651abb379a38b342921",
-            "reference": "97e9fe30219e60092e107651abb379a38b342921",
+            "url": "https://api.github.com/repos/JayBizzle/Crawler-Detect/zipball/af6a36e6d69670df3f0a3ed8e21d4b8cc67a7847",
+            "reference": "af6a36e6d69670df3f0a3ed8e21d4b8cc67a7847",
             "shasum": ""
         },
         "require": {
             "php": ">=5.3.0"
         },
         "require-dev": {
-            "phpunit/phpunit": "^4.8|^5.5|^6.5|^9.4"
+            "phpunit/phpunit": "^4.8|^5.5|^6.5",
+            "satooshi/php-coveralls": "1.*"
         },
-        "time": "2023-07-21T15:49:49+00:00",
+        "time": "2019-04-05T19:52:02+00:00",
         "type": "library",
         "installation-source": "dist",
         "autoload": {
diff --git a/blockbot/vendor/jaybizzle/crawler-detect/.github/workflows/php-cs-fixer.yml b/blockbot/vendor/jaybizzle/crawler-detect/.github/workflows/php-cs-fixer.yml
deleted file mode 100644
index 1c083c40..00000000
--- a/blockbot/vendor/jaybizzle/crawler-detect/.github/workflows/php-cs-fixer.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-name: Check & fix styling
-
-on: [ push ]
-
-jobs:
-    php-cs-fixer:
-        runs-on: ubuntu-latest
-
-        steps:
-            -   name: Checkout code
-                uses: actions/checkout@v2
-                with:
-                    ref: ${{ github.head_ref }}
-
-            -   name: Run PHP CS Fixer
-                uses: docker://oskarstark/php-cs-fixer-ga:2.18.6
-                with:
-                    args: --config=.php_cs.dist --allow-risky=yes
-
-            -   name: Commit changes
-                uses: stefanzweifel/git-auto-commit-action@v4
-                with:
-                    commit_message: Fix styling
\ No newline at end of file
diff --git a/blockbot/vendor/jaybizzle/crawler-detect/.github/workflows/test.yml b/blockbot/vendor/jaybizzle/crawler-detect/.github/workflows/test.yml
deleted file mode 100644
index 22911114..00000000
--- a/blockbot/vendor/jaybizzle/crawler-detect/.github/workflows/test.yml
+++ /dev/null
@@ -1,56 +0,0 @@
-name: Test
-
-on:
-  push:
-    branches:
-      - "master"
-  pull_request:
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: true
-      matrix:
-        php: [5.3, 5.4, 5.5, 5.6, 7.0, 7.1, 7.2, 7.3, 7.4, 8.0, 8.1, 8.2]
-
-    name: PHP:${{ matrix.php }}
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Setup PHP, with composer
-        uses: shivammathur/setup-php@v2
-        with:
-          php-version: ${{ matrix.php }}
-          tools: composer:v2
-          coverage: xdebug
-
-      - name: Get composer cache directory
-        id: composer-cache
-        run: |
-          echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
-        shell: bash
-
-      - name: Cache composer dependencies
-        uses: actions/cache@v3
-        with:
-          path: ${{ steps.composer-cache.outputs.dir }}
-          key: dependencies-php-${{ matrix.php }}-composer-${{ hashFiles('composer.json') }}
-          restore-keys: dependencies-php-${{ matrix.php }}-composer-
-
-      - name: Install Composer dependencies
-        run: |
-          composer install --prefer-dist --no-interaction --no-suggest
-
-      - name: Run Unit tests
-        run: |
-          vendor/bin/phpunit --coverage-clover=tests/logs/clover.xml
-
-      - name: Upload coverage results to Coveralls
-        env:
-          COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          composer global require php-coveralls/php-coveralls "^1.0"
-          coveralls --coverage_clover=tests/logs/clover.xml -v
diff --git a/blockbot/vendor/jaybizzle/crawler-detect/.php_cs.dist b/blockbot/vendor/jaybizzle/crawler-detect/.php_cs.dist
deleted file mode 100644
index 91c91af9..00000000
--- a/blockbot/vendor/jaybizzle/crawler-detect/.php_cs.dist
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-$finder = Symfony\Component\Finder\Finder::create()
-    ->in([
-        __DIR__.'/src',
-        __DIR__.'/tests',
-    ])
-    ->name('*.php')
-    ->ignoreDotFiles(true)
-    ->ignoreVCS(true);
-
-return PhpCsFixer\Config::create()
-    ->setRules([
-        '@PSR2' => true,
-        'array_syntax' => ['syntax' => 'long'],
-        'ordered_imports' => ['sortAlgorithm' => 'alpha'],
-        'no_unused_imports' => true,
-        'not_operator_with_successor_space' => true,
-        'trailing_comma_in_multiline_array' => true,
-        'phpdoc_scalar' => true,
-        'unary_operator_spaces' => true,
-        'binary_operator_spaces' => true,
-        'blank_line_before_statement' => [
-            'statements' => ['break', 'continue', 'declare', 'return', 'throw', 'try'],
-        ],
-        'phpdoc_single_line_var_spacing' => true,
-        'phpdoc_var_without_name' => true,
-        'method_argument_space' => [
-            'on_multiline' => 'ensure_fully_multiline',
-            'keep_multiple_spaces_after_comma' => true,
-        ],
-    ])
-    ->setFinder($finder);
\ No newline at end of file
diff --git a/blockbot/vendor/jaybizzle/crawler-detect/LICENSE b/blockbot/vendor/jaybizzle/crawler-detect/LICENSE
index 569c7b4f..2f4e15e2 100644
--- a/blockbot/vendor/jaybizzle/crawler-detect/LICENSE
+++ b/blockbot/vendor/jaybizzle/crawler-detect/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015-2020 Mark Beech
+Copyright (c) 2015-2018 Mark Beech
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/blockbot/vendor/jaybizzle/crawler-detect/README.md b/blockbot/vendor/jaybizzle/crawler-detect/README.md
index 57ec8e8b..e7c25f3b 100644
--- a/blockbot/vendor/jaybizzle/crawler-detect/README.md
+++ b/blockbot/vendor/jaybizzle/crawler-detect/README.md
@@ -1,23 +1,24 @@
-<p align="center"><a href="https://crawlerdetect.io/" target="_blank"><img src="https://cloud.githubusercontent.com/assets/340752/23082173/1bd1a396-f550-11e6-8aba-4d3c75edea2f.png" width="321" height="219" /></a><br><br>
-<a href="https://crawlerdetect.io/" target="_blank">crawlerdetect.io</a>
+<p align="center"><a href="http://crawlerdetect.io/" target="_blank"><img src="https://cloud.githubusercontent.com/assets/340752/23082173/1bd1a396-f550-11e6-8aba-4d3c75edea2f.png" width="321" height="219" /></a><br><br>
+<a href="http://crawlerdetect.io/" target="_blank">crawlerdetect.io</a>
 <br><br>
 </p>
+
 <p align="center">
-<a href="https://github.com/JayBizzle/Crawler-Detect/actions"><img alt="GitHub Workflow Status" src="https://img.shields.io/github/actions/workflow/status/JayBizzle/Crawler-Detect/test.yml?branch=master&style=flat-square"></a>
+<a href="https://travis-ci.org/JayBizzle/Crawler-Detect"><img src="https://img.shields.io/travis/JayBizzle/Crawler-Detect/master.svg?style=flat-square" /></a>
 <a href="https://packagist.org/packages/jaybizzle/crawler-detect"><img src="https://img.shields.io/packagist/dm/JayBizzle/Crawler-Detect.svg?style=flat-square" /></a>
+<a href="https://scrutinizer-ci.com/g/JayBizzle/Crawler-Detect/?branch=master"><img src="https://img.shields.io/scrutinizer/g/JayBizzle/Crawler-Detect.svg?style=flat-square" /></a>
 <a href="https://github.com/JayBizzle/Crawler-Detect"><img src="https://img.shields.io/badge/license-MIT-ff69b4.svg?style=flat-square" /></a>
 <a href="https://packagist.org/packages/jaybizzle/crawler-detect"><img src="https://img.shields.io/packagist/v/jaybizzle/Crawler-Detect.svg?style=flat-square" /></a>
+<a href="https://styleci.io/repos/32755917"><img src="https://styleci.io/repos/32755917/shield" /></a>
 <a href="https://coveralls.io/github/JayBizzle/Crawler-Detect"><img src="https://img.shields.io/coveralls/JayBizzle/Crawler-Detect/master.svg?style=flat-square" /></a>
 </p>
 
 ## About CrawlerDetect
 
-CrawlerDetect is a PHP class for detecting bots/crawlers/spiders via the `user agent` and `http_from` header. Currently able to detect 1,000's of bots/spiders/crawlers.
+CrawlerDetect is a PHP class for detecting bots/crawlers/spiders via the user agent and http_from header. Currently able to detect 1,000's of bots/spiders/crawlers.
 
 ### Installation
-```
-composer require jaybizzle/crawler-detect
-```
+Run `composer require jaybizzle/crawler-detect 1.*` or add `"jaybizzle/crawler-detect" :"1.*"` to your `composer.json`.
 
 ### Usage
 ```PHP
@@ -45,7 +46,7 @@ If you find a bot/spider/crawler user agent that CrawlerDetect fails to detect,
 Failing that, just create an issue with the user agent you have found, and we'll take it from there :)
 
 ### Laravel Package
-If you would like to use this with Laravel, please see [Laravel-Crawler-Detect](https://github.com/JayBizzle/Laravel-Crawler-Detect)
+If you would like to use this with Laravel 4/5, please see [Laravel-Crawler-Detect](https://github.com/JayBizzle/Laravel-Crawler-Detect)
 
 ### Symfony Bundle
 To use this library with Symfony 2/3/4, check out the [CrawlerDetectBundle](https://github.com/nicolasmure/CrawlerDetectBundle).
@@ -56,20 +57,15 @@ To use this library with the YII2 framework, check out [yii2-crawler-detect](htt
 ### ES6 Library
 To use this library with NodeJS or any ES6 application based, check out [es6-crawler-detect](https://github.com/JefferyHus/es6-crawler-detect).
 
-### Python Library
-To use this library in a Python project, check out [crawlerdetect](https://github.com/moskrc/CrawlerDetect).
-
-### JVM Library (written in Java)
-To use this library in a JVM project (including Java, Scala, Kotlin, etc.), check out [CrawlerDetect](https://github.com/nekosoftllc/crawler-detect).
-
 ### .NET Library
 To use this library in a .net standard (including .net core) based project, check out [NetCrawlerDetect](https://github.com/gplumb/NetCrawlerDetect).
 
-### Ruby Gem
-To use this library with Ruby on Rails or any Ruby-based application, check out [crawler_detect](https://github.com/loadkpi/crawler_detect) gem.
+### Nette Extension
+To use this library with the Nette framework, checkout [NetteCrawlerDetect](https://github.com/JanGalek/Crawler-Detect).
 
-### Go Module
-To use this library with Go, check out the [crawlerdetect](https://github.com/x-way/crawlerdetect) module.
+### Ruby Gem
+
+To use this library with Ruby on Rails or any Ruby-based application, check out [crawler_detect](https://github.com/loadkpi/crawler_detect) gem.
 
 _Parts of this class are based on the brilliant [MobileDetect](https://github.com/serbanghita/Mobile-Detect)_
 
diff --git a/blockbot/vendor/jaybizzle/crawler-detect/composer.json b/blockbot/vendor/jaybizzle/crawler-detect/composer.json
index 4774117e..0c0babe6 100755
--- a/blockbot/vendor/jaybizzle/crawler-detect/composer.json
+++ b/blockbot/vendor/jaybizzle/crawler-detect/composer.json
@@ -16,7 +16,8 @@
         "php": ">=5.3.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^4.8|^5.5|^6.5|^9.4"
+        "phpunit/phpunit": "^4.8|^5.5|^6.5",
+        "satooshi/php-coveralls": "1.*"
     },
     "autoload": {
         "psr-4": {
diff --git a/blockbot/vendor/jaybizzle/crawler-detect/export.php b/blockbot/vendor/jaybizzle/crawler-detect/export.php
index 6c7459c4..4c4b9d5d 100644
--- a/blockbot/vendor/jaybizzle/crawler-detect/export.php
+++ b/blockbot/vendor/jaybizzle/crawler-detect/export.php
@@ -37,5 +37,5 @@ function outputJson($object)
 function outputTxt($object)
 {
     $className = (new ReflectionClass($object))->getShortName();
-    file_put_contents("raw/$className.txt", implode(PHP_EOL, $object->getAll()));
+    file_put_contents("raw/$className.txt", implode($object->getAll(), PHP_EOL));
 }
diff --git a/blockbot/vendor/jaybizzle/crawler-detect/raw/Crawlers.json b/blockbot/vendor/jaybizzle/crawler-detect/raw/Crawlers.json
index 003b87c8..a1e690eb 100644
--- a/blockbot/vendor/jaybizzle/crawler-detect/raw/Crawlers.json
+++ b/blockbot/vendor/jaybizzle/crawler-detect/raw/Crawlers.json
@@ -1 +1 @@
-[" YLT","^Aether","^Amazon Simple Notification Service Agent$","^Amazon-Route53-Health-Check-Service","^b0t$","^bluefish ","^Calypso v\\\/","^COMODO DCV","^Corax","^DangDang","^DavClnt","^DHSH","^docker\\\/[0-9]","^Expanse","^FDM ","^git\\\/","^Goose\\\/","^Grabber","^Gradle\\\/","^HTTPClient\\\/","^HTTPing","^Java\\\/","^Jeode\\\/","^Jetty\\\/","^Mail\\\/","^Mget","^Microsoft URL Control","^Mikrotik\\\/","^Netlab360","^NG\\\/[0-9\\.]","^NING\\\/","^npm\\\/","^Nuclei","^PHP-AYMAPI\\\/","^PHP\\\/","^pip\\\/","^pnpm\\\/","^RMA\\\/","^Ruby|Ruby\\\/[0-9]","^Swurl ","^TLS tester ","^twine\\\/","^ureq","^VSE\\\/[0-9]","^WordPress\\.com","^XRL\\\/[0-9]","^ZmEu","008\\\/","13TABS","192\\.comAgent","2GDPR\\\/","2ip\\.ru","404enemy","7Siters","80legs","a3logics\\.in","A6-Indexer","Abonti","Aboundex","aboutthedomain","Accoona-AI-Agent","acebookexternalhit\\\/","acoon","acrylicapps\\.com\\\/pulp","Acunetix","AdAuth\\\/","adbeat","AddThis","ADmantX","AdminLabs","adressendeutschland","adreview\\\/","adscanner","adstxt-worker","Adstxtaggregator","adstxt\\.com","Adyen HttpClient","AffiliateLabz\\\/","affilimate-puppeteer","agentslug","AHC","aihit","aiohttp\\\/","Airmail","akka-http\\\/","akula\\\/","alertra","alexa site audit","Alibaba\\.Security\\.Heimdall","Alligator","allloadin","AllSubmitter","alyze\\.info","amagit","Anarchie","AndroidDownloadManager","Anemone","AngleSharp","annotate_google","Anthill","Anturis Agent","Ant\\.com","AnyEvent-HTTP\\\/","Apache Ant\\\/","Apache Droid","Apache OpenOffice","Apache-HttpAsyncClient","Apache-HttpClient","ApacheBench","Apexoo","apimon\\.de","APIs-Google","AportWorm\\\/","AppBeat\\\/","AppEngine-Google","AppleSyndication","Aprc\\\/[0-9]","Arachmo","arachnode","Arachnophilia","aria2","Arukereso","asafaweb","Asana\\\/","Ask Jeeves","AskQuickly","ASPSeek","Asterias","Astute","asynchttp","Attach","attohttpc","autocite","AutomaticWPTester","Autonomy","awin\\.com","AWS Security Scanner","axios\\\/","a\\.pr-cy\\.ru","B-l-i-t-z-B-O-T","Backlink-Ceck","backlink-check","BacklinkHttpStatus","BackStreet","BackupLand","BackWeb","Bad-Neighborhood","Badass","baidu\\.com","Bandit","basicstate","BatchFTP","Battleztar Bazinga","baypup\\\/","BazQux","BBBike","BCKLINKS","BDFetch","BegunAdvertising","Bewica-security-scan","Bidtellect","BigBozz","Bigfoot","biglotron","BingLocalSearch","BingPreview","binlar","biNu image cacher","Bitacle","Bitrix link preview","biz_Directory","BKCTwitterUnshortener\\\/","Black Hole","Blackboard Safeassign","BlackWidow","BlockNote\\.Net","BlogBridge","Bloglines","Bloglovin","BlogPulseLive","BlogSearch","Blogtrottr","BlowFish","boitho\\.com-dc","Boost\\.Beast","BPImageWalker","Braintree-Webhooks","Branch Metrics API","Branch-Passthrough","Brandprotect","BrandVerity","Brandwatch","Brodie\\\/","Browsershots","BUbiNG","Buck\\\/","Buddy","BuiltWith","Bullseye","BunnySlippers","Burf Search","Butterfly\\\/","BuzzSumo","CAAM\\\/[0-9]","CakePHP","Calculon","Canary%20Mail","CaretNail","catexplorador","CC Metadata Scaper","Cegbfeieh","censys","centuryb.o.t9[at]gmail.com","Cerberian Drtrs","CERT\\.at-Statistics-Survey","cf-facebook","cg-eye","changedetection","ChangesMeter","Charlotte","chatterino-api-cache","CheckHost","checkprivacy","CherryPicker","ChinaClaw","Chirp\\\/","chkme\\.com","Chlooe","Chromaxa","CirrusExplorer","CISPA Vulnerability Notification","CISPA Web Analyser","Citoid","CJNetworkQuality","Clarsentia","clips\\.ua\\.ac\\.be","Cloud mapping","CloudEndure","CloudFlare-AlwaysOnline","Cloudflare-Healthchecks","Cloudinary","cmcm\\.com","coccoc","cognitiveseo","ColdFusion","colly -","CommaFeed","Commons-HttpClient","commonscan","contactbigdatafr","contentkingapp","Contextual Code Sites Explorer","convera","CookieReports","copyright sheriff","CopyRightCheck","Copyscape","cortex\\\/","Cosmos4j\\.feedback","Covario-IDS","Craw\\\/","Crescent","Criteo","Crowsnest","CSHttp","CSSCheck","Cula\\\/","curb","Curious George","curl","cuwhois\\\/","cybo\\.com","DAP\\\/NetHTTP","DareBoost","DatabaseDriverMysqli","DataCha0s","DatadogSynthetics","Datafeedwatch","Datanyze","DataparkSearch","dataprovider","DataXu","Daum(oa)?[ \\\/][0-9]","dBpoweramp","ddline","deeris","delve\\.ai","Demon","DeuSu","developers\\.google\\.com\\\/\\+\\\/web\\\/snippet\\\/","Devil","Digg","Digincore","DigitalPebble","Dirbuster","Discourse Forum Onebox","Dispatch\\\/","Disqus\\\/","DittoSpyder","dlvr","DMBrowser","DNSPod-reporting","docoloc","Dolphin http client","DomainAppender","DomainLabz","Domains Project\\\/","Donuts Content Explorer","dotMailer content retrieval","dotSemantic","downforeveryoneorjustme","Download Wonder","downnotifier","DowntimeDetector","Drip","drupact","Drupal \\(\\+http:\\\/\\\/drupal\\.org\\\/\\)","DTS Agent","dubaiindex","DuplexWeb-Google","DynatraceSynthetic","EARTHCOM","Easy-Thumb","EasyDL","Ebingbong","ec2linkfinder","eCairn-Grabber","eCatch","ECCP","eContext\\\/","Ecxi","EirGrabber","ElectricMonk","elefent","EMail Exractor","EMail Wolf","EmailWolf","Embarcadero","Embed PHP Library","Embedly","endo\\\/","europarchive\\.org","evc-batch","EventMachine HttpClient","Everwall Link Expander","Evidon","Evrinid","ExactSearch","ExaleadCloudview","Excel\\\/","exif","ExoRank","Exploratodo","Express WebPictures","Extreme Picture Finder","EyeNetIE","ezooms","facebookexternalhit","facebookexternalua","facebookplatform","fairshare","Faraday v","fasthttp","Faveeo","Favicon downloader","faviconarchive","faviconkit","FavOrg","Feed Wrangler","Feedable\\\/","Feedbin","FeedBooster","FeedBucket","FeedBunch\\\/","FeedBurner","feeder","Feedly","FeedshowOnline","Feedshow\\\/","Feedspot","FeedViewer\\\/","Feedwind\\\/","FeedZcollector","feeltiptop","Fetch API","Fetch\\\/[0-9]","Fever\\\/[0-9]","FHscan","Fiery%20Feeds","Filestack","Fimap","findlink","findthatfile","FlashGet","FlipboardBrowserProxy","FlipboardProxy","FlipboardRSS","Flock\\\/","Florienzh\\\/","fluffy","Flunky","flynxapp","forensiq","ForusP","FoundSeoTool","fragFINN\\.de","free thumbnails","Freeuploader","FreshRSS","frontman","Funnelback","Fuzz Faster U Fool","G-i-g-a-b-o-t","g00g1e\\.net","ganarvisitas","gdnplus\\.com","geek-tools","Genieo","GentleSource","GetCode","Getintent","GetLinkInfo","getprismatic","GetRight","getroot","GetURLInfo\\\/","GetWeb","Geziyor","Ghost Inspector","GigablastOpenSource","GIS-LABS","github-camo","GitHub-Hookshot","github\\.com","Go http package","Go [\\d\\.]* package http","Go!Zilla","Go-Ahead-Got-It","Go-http-client","go-mtasts\\\/","gobuster","gobyus","Gofeed","gofetch","Goldfire Server","GomezAgent","gooblog","Goodzer\\\/","Google AppsViewer","Google Desktop","Google favicon","Google Keyword Suggestion","Google Keyword Tool","Google Page Speed Insights","Google PP Default","Google Search Console","Google Web Preview","Google-Ads-Creatives-Assistant","Google-Ads-Overview","Google-Adwords","Google-Apps-Script","Google-Calendar-Importer","Google-HotelAdsVerifier","Google-HTTP-Java-Client","Google-InspectionTool","Google-Podcast","Google-Publisher-Plugin","Google-Read-Aloud","Google-SearchByImage","Google-Site-Verification","Google-SMTP-STS","Google-speakr","Google-Structured-Data-Testing-Tool","Google-Transparency-Report","google-xrawler","Google-Youtube-Links","GoogleDocs","GoogleHC\\\/","GoogleProber","GoogleProducer","GoogleSites","Gookey","GoSpotCheck","gosquared-thumbnailer","Gotit","GoZilla","grabify","GrabNet","Grafula","Grammarly","GrapeFX","GreatNews","Gregarius","GRequests","grokkit","grouphigh","grub-client","gSOAP\\\/","GT::WWW","GTmetrix","GuzzleHttp","gvfs\\\/","HAA(A)?RTLAND http client","Haansoft","hackney\\\/","Hadi Agent","HappyApps-WebCheck","Hardenize","Hatena","Havij","HaxerMen","HeadlessChrome","HEADMasterSEO","HeartRails_Capture","help@dataminr\\.com","heritrix","Hexometer","historious","hkedcity","hledejLevne\\.cz","Hloader","HMView","Holmes","HonesoSearchEngine","HootSuite Image proxy","Hootsuite-WebFeed","hosterstats","HostTracker","ht:\\\/\\\/check","htdig","HTMLparser","htmlyse","HTTP Banner Detection","http-get","HTTP-Header-Abfrage","http-kit","http-request\\\/","HTTP-Tiny","HTTP::Lite","http:\\\/\\\/www.neomo.de\\\/","HttpComponents","httphr","HTTPie","HTTPMon","httpRequest","httpscheck","httpssites_power","httpunit","HttpUrlConnection","http\\.rb\\\/","HTTP_Compression_Test","http_get","http_request2","http_requester","httrack","huaweisymantec","HubSpot ","HubSpot-Link-Resolver","Humanlinks","i2kconnect\\\/","Iblog","ichiro","Id-search","IdeelaborPlagiaat","IDG Twitter Links Resolver","IDwhois\\\/","Iframely","igdeSpyder","iGooglePortal","IlTrovatore","Image Fetch","Image Sucker","ImageEngine\\\/","ImageVisu\\\/","Imagga","imagineeasy","imgsizer","InAGist","inbound\\.li parser","InDesign%20CC","Indy Library","InetURL","infegy","infohelfer","InfoTekies","InfoWizards Reciprocal Link","inpwrd\\.com","instabid","Instapaper","Integrity","integromedb","Intelliseek","InterGET","Internet Ninja","InternetSeer","internetVista monitor","internetwache","internet_archive","intraVnews","IODC","IOI","Inboxb0t","iplabel","ips-agent","IPS\\\/[0-9]","IPWorks HTTP\\\/S Component","iqdb\\\/","Iria","Irokez","isitup\\.org","iskanie","isUp\\.li","iThemes Sync\\\/","IZaBEE","iZSearch","JAHHO","janforman","Jaunt\\\/","Java.*outbrain","javelin\\.io","Jbrofuzz","Jersey\\\/","JetCar","Jigsaw","Jobboerse","JobFeed discovery","Jobg8 URL Monitor","jobo","Jobrapido","Jobsearch1\\.5","JoinVision Generic","JolokiaPwn","Joomla","Jorgee","JS-Kit","JungleKeyThumbnail","JustView","Kaspersky Lab CFR link resolver","Kelny\\\/","Kerrigan\\\/","KeyCDN","Keyword Density","Keywords Research","khttp\\\/","KickFire","KimonoLabs\\\/","Kml-Google","knows\\.is","KOCMOHABT","kouio","kube-probe","kubectl","kulturarw3","KumKie","Larbin","Lavf\\\/","leakix\\.net","LeechFTP","LeechGet","letsencrypt","Lftp","LibVLC","LibWeb","Libwhisker","libwww","Licorne","Liferea\\\/","Lighthouse","Lightspeedsystems","Likse","limber\\.io","Link Valet","LinkAlarm\\\/","LinkAnalyser","linkCheck","linkdex","LinkExaminer","linkfluence","linkpeek","LinkPreview","LinkScan","LinksManager","LinkTiger","LinkWalker","link_thumbnailer","Lipperhey","Litemage_walker","livedoor ScreenShot","LoadImpactRload","localsearch-web","LongURL API","longurl-r-package","looid\\.com","looksystems\\.net","ltx71","lua-resty-http","Lucee \\(CFML Engine\\)","Lush Http Client","lwp-request","lwp-trivial","LWP::Simple","lycos","LYT\\.SR","L\\.webis","mabontland","MacOutlook\\\/","Mag-Net","MagpieRSS","Mail::STS","MailChimp","Mail\\.Ru","Majestic12","makecontact\\\/","Mandrill","MapperCmd","marketinggrader","MarkMonitor","MarkWatch","Mass Downloader","masscan\\\/","Mata Hari","mattermost","Mediametric","Mediapartners-Google","mediawords","MegaIndex\\.ru","MeltwaterNews","Melvil Rawi","MemGator","Metaspinner","MetaURI","MFC_Tear_Sample","Microsearch","Microsoft Data Access","Microsoft Office","Microsoft Outlook","Microsoft Windows Network Diagnostics","Microsoft-WebDAV-MiniRedir","Microsoft\\.Data\\.Mashup","MIDown tool","MIIxpc","Mindjet","Miniature\\.io","Miniflux","mio_httpc","Miro-HttpClient","Mister PiX","mixdata dot com","mixed-content-scan","mixnode","Mnogosearch","mogimogi","Mojeek","Mojolicious \\(Perl\\)","Mollie","monitis","Monitority\\\/","Monit\\\/","montastic","MonTools","Moreover","Morfeus Fucking Scanner","Morning Paper","MovableType","mowser","Mrcgiguy","Mr\\.4x3 Powered","MS Web Services Client Protocol","MSFrontPage","mShots","MuckRack\\\/","muhstik-scan","MVAClient","MxToolbox\\\/","myseosnapshot","nagios","Najdi\\.si","Name Intelligence","NameFo\\.com","Nameprotect","nationalarchives","Navroad","NearSite","Needle","Nessus","Net Vampire","NetAnts","NETCRAFT","NetLyzer","NetMechanic","NetNewsWire","Netpursual","netresearch","NetShelter ContentScan","Netsparker","NetSystemsResearch","nettle","NetTrack","Netvibes","NetZIP","Neustar WPM","NeutrinoAPI","NewRelicPinger","NewsBlur .*Finder","NewsGator","newsme","newspaper\\\/","Nexgate Ruby Client","NG-Search","nghttp2","Nibbler","NICErsPRO","NihilScio","Nikto","nineconnections","NLNZ_IAHarvester","Nmap Scripting Engine","node-fetch","node-superagent","node-urllib","Nodemeter","NodePing","node\\.io","nominet\\.org\\.uk","nominet\\.uk","Norton-Safeweb","Notifixious","notifyninja","NotionEmbedder","nuhk","nutch","Nuzzel","nWormFeedFinder","nyawc\\\/","Nymesis","NYU","Observatory\\\/","Ocelli\\\/","Octopus","oegp","Offline Explorer","Offline Navigator","OgScrper","okhttp","omgili","OMSC","Online Domain Tools","Open Source RSS","OpenCalaisSemanticProxy","Openfind","OpenLinkProfiler","Openstat\\\/","OpenVAS","OPPO A33","Optimizer","Orbiter","OrgProbe\\\/","orion-semantics","Outlook-Express","Outlook-iOS","Owler","Owlin","ownCloud News","ow\\.ly","OxfordCloudService","page scorer","Page Valet","page2rss","PageFreezer","PageGrabber","PagePeeker","PageScorer","Pagespeed\\\/","PageThing","page_verifier","Panopta","panscient","Papa Foto","parsijoo","Pavuk","PayPal IPN","pcBrowser","Pcore-HTTP","PDF24 URL To PDF","Pearltrees","PECL::HTTP","peerindex","Peew","PeoplePal","Perlu -","PhantomJS Screenshoter","PhantomJS\\\/","Photon\\\/","php-requests","phpservermon","Pi-Monster","Picscout","Picsearch","PictureFinder","Pimonster","Pingability","PingAdmin\\.Ru","Pingdom","Pingoscope","PingSpot","ping\\.blo\\.gs","pinterest\\.com","Pixray","Pizilla","Plagger\\\/","Pleroma ","Ploetz \\+ Zeller","Plukkie","plumanalytics","PocketImageCache","PocketParser","Pockey","PodcastAddict\\\/","POE-Component-Client-HTTP","Polymail\\\/","Pompos","Porkbun","Port Monitor","postano","postfix-mta-sts-resolver","PostmanRuntime","postplanner\\.com","PostPost","postrank","PowerPoint\\\/","Prebid","Prerender","Priceonomics Analysis Engine","PrintFriendly","PritTorrent","Prlog","probethenet","Project ?25499","Project-Resonance","prospectb2b","Protopage","ProWebWalker","proximic","PRTG Network Monitor","pshtt, https scanning","PTST ","PTST\\\/[0-9]+","Pump","Python-httplib2","python-httpx","python-requests","Python-urllib","Qirina Hurdler","QQDownload","QrafterPro","Qseero","Qualidator","QueryN Metasearch","queuedriver","quic-go-HTTP\\\/","QuiteRSS","Quora Link Preview","Qwantify","Radian6","RadioPublicImageResizer","Railgun\\\/","RankActive","RankFlex","RankSonicSiteAuditor","RapidLoad\\\/","Re-re Studio","ReactorNetty","Readability","RealDownload","RealPlayer%20Downloader","RebelMouse","Recorder","RecurPost\\\/","redback\\\/","ReederForMac","Reeder\\\/","ReGet","RepoMonkey","request\\.js","reqwest\\\/","ResponseCodeTest","RestSharp","Riddler","Rival IQ","Robosourcer","Robozilla","ROI Hunter","RPT-HTTPClient","RSSMix\\\/","RSSOwl","RyowlEngine","safe-agent-scanner","SalesIntelligent","Saleslift","SAP NetWeaver Application Server","SauceNAO","SBIder","sc-downloader","scalaj-http","Scamadviser-Frontend","ScanAlert","scan\\.lol","Scoop","scooter","ScopeContentAG-HTTP-Client","ScoutJet","ScoutURLMonitor","ScrapeBox Page Scanner","Scrapy","Screaming","ScreenShotService","Scrubby","Scrutiny\\\/","Search37","searchenginepromotionhelp","Searchestate","SearchExpress","SearchSight","SearchWP","search\\.thunderstone","Seeker","semanticdiscovery","semanticjuice","Semiocast HTTP client","Semrush","Sendsay\\.Ru","sentry\\\/","SEO Browser","Seo Servis","seo-nastroj\\.cz","seo4ajax","Seobility","SEOCentro","SeoCheck","seocompany","SEOkicks","SEOlizer","Seomoz","SEOprofiler","seoscanners","SEOsearch","seositecheckup","SEOstats","servernfo","sexsearcher","Seznam","Shelob","Shodan","Shoppimon","ShopWiki","ShortLinkTranslate","shortURL lengthener","shrinktheweb","Sideqik","Siege","SimplePie","SimplyFast","Siphon","SISTRIX","Site Sucker","Site-Shot\\\/","Site24x7","SiteBar","Sitebeam","Sitebulb\\\/","SiteCondor","SiteExplorer","SiteGuardian","Siteimprove","SiteIndexed","Sitemap(s)? Generator","SitemapGenerator","SiteMonitor","Siteshooter B0t","SiteSnagger","SiteSucker","SiteTruth","Sitevigil","sitexy\\.com","SkypeUriPreview","Slack\\\/","sli-systems\\.com","slider\\.com","slurp","SlySearch","SmartDownload","SMRF URL Expander","SMUrlExpander","Snake","Snappy","SnapSearch","Snarfer\\\/","SniffRSS","sniptracker","Snoopy","SnowHaze Search","sogou web","SortSite","Sottopop","sovereign\\.ai","SpaceBison","SpamExperts","Spammen","Spanner","Spawning-AI","spaziodati","SPDYCheck","Specificfeeds","SpeedKit","speedy","SPEng","Spinn3r","spray-can","Sprinklr ","spyonweb","sqlmap","Sqlworm","Sqworm","SSL Labs","ssl-tools","StackRambler","Statastico\\\/","Statically-","StatusCake","Steeler","Stratagems Kumo","Stripe\\\/","Stroke\\.cz","StudioFACA","StumbleUpon","suchen","Sucuri","summify","SuperHTTP","Surphace Scout","Suzuran","swcd ","Symfony BrowserKit","Symfony2 BrowserKit","Synapse\\\/","Syndirella\\\/","SynHttpClient-Built","Sysomos","sysscan","Szukacz","T0PHackTeam","tAkeOut","Tarantula\\\/","Taringa UGC","TarmotGezgin","tchelebi\\.io","techiaith\\.cymru","Teleport","Telesoft","Telesphoreo","Telesphorep","Tenon\\.io","teoma","terrainformatica","Test Certificate Info","testuri","Tetrahedron","TextRazor Downloader","The Drop Reaper","The Expert HTML Source Viewer","The Intraformant","The Knowledge AI","theinternetrules","TheNomad","Thinklab","Thumbor","Thumbshots","ThumbSniper","timewe\\.net","TinEye","Tiny Tiny RSS","TLSProbe\\\/","Toata","topster","touche\\.com","Traackr\\.com","tracemyfile","Trackuity","TrapitAgent","Trendiction","Trendsmap","trendspottr","truwoGPS","TryJsoup","TulipChain","Turingos","Turnitin","tweetedtimes","Tweetminster","Tweezler\\\/","twibble","Twice","Twikle","Twingly","Twisted PageGetter","Typhoeus","ubermetrics-technologies","uclassify","UdmSearch","ultimate_sitemap_parser","unchaos","unirest-java","UniversalFeedParser","unshortenit","Unshorten\\.It","Untiny","UnwindFetchor","updated","updown\\.io daemon","Upflow","Uptimia","URL Verifier","Urlcheckr","URLitor","urlresolver","Urlstat","URLTester","UrlTrends Ranking Updater","URLy Warning","URLy\\.Warning","URL\\\/Emacs","Vacuum","Vagabondo","VB Project","vBSEO","VCI","via ggpht\\.com GoogleImageProxy","Virusdie","visionutils","Visual Rights Group","vkShare","VoidEYE","Voil","voltron","voyager\\\/","VSAgent\\\/","VSB-TUO\\\/","Vulnbusters Meter","VYU2","w3af\\.org","W3C-checklink","W3C-mobileOK","W3C_Unicorn","WAC-OFU","WakeletLinkExpander","WallpapersHD","Wallpapers\\\/[0-9]+","wangling","Wappalyzer","WatchMouse","WbSrch\\\/","WDT\\.io","Web Auto","Web Collage","Web Enhancer","Web Fetch","Web Fuck","Web Pix","Web Sauger","Web spyder","Web Sucker","web-capture\\.net","Web-sniffer","Webalta","Webauskunft","WebAuto","WebCapture","WebClient\\\/","webcollage","WebCookies","WebCopier","WebCorp","WebDataStats","WebDoc","WebEnhancer","WebFetch","WebFuck","WebGazer","WebGo IS","WebImageCollector","WebImages","WebIndex","webkit2png","WebLeacher","webmastercoffee","webmon ","WebPix","WebReaper","WebSauger","webscreenie","Webshag","Webshot","Website Quester","websitepulse agent","WebsiteQuester","Websnapr","WebSniffer","Webster","WebStripper","WebSucker","webtech\\\/","WebThumbnail","Webthumb\\\/","WebWhacker","WebZIP","WeLikeLinks","WEPA","WeSEE","wf84","Wfuzz\\\/","wget","WhatCMS","WhatsApp","WhatsMyIP","WhatWeb","WhereGoes\\?","Whibse","WhoAPI\\\/","WhoRunsCoinHive","Whynder Magnet","Windows-RSS-Platform","WinHttp-Autoproxy-Service","WinHTTP\\\/","WinPodder","wkhtmlto","wmtips","Woko","Wolfram HTTPClient","woorankreview","WordPress\\\/","WordupinfoSearch","Word\\\/","worldping-api","wotbox","WP Engine Install Performance API","WP Rocket","wpif","wprecon\\.com survey","WPScan","wscheck","Wtrace","WWW-Collector-E","WWW-Mechanize","WWW::Document","WWW::Mechanize","WWWOFFLE","www\\.monitor\\.us","x09Mozilla","x22Mozilla","XaxisSemanticsClassifier","XenForo\\\/","Xenu Link Sleuth","XING-contenttabreceiver","xpymep([0-9]?)\\.exe","Y!J-[A-Z][A-Z][A-Z]","Yaanb","yacy","Yahoo Link Preview","YahooCacheSystem","YahooMailProxy","YahooYSMcm","YandeG","Yandex(?!Search)","yanga","yeti","Yo-yo","Yoleo Consumer","yomins\\.com","yoogliFetchAgent","YottaaMonitor","Your-Website-Sucks","yourls\\.org","YoYs\\.net","YP\\.PL","Zabbix","Zade","Zao","Zauba","Zemanta Aggregator","Zend\\\\Http\\\\Client","Zend_Http_Client","Zermelo","Zeus ","zgrab","ZnajdzFoto","ZnHTTP","Zombie\\.js","Zoom\\.Mac","ZoteroTranslationServer","ZyBorg","[a-z0-9\\-_]*(bot|crawl|archiver|transcoder|spider|uptime|validator|fetcher|cron|checker|reader|extractor|monitoring|analyzer|scraper)"]
\ No newline at end of file
+[".*Java.*outbrain"," YLT","^b0t$","^bluefish ","^Calypso v\\\/","^COMODO DCV","^DangDang","^DavClnt","^FDM ","^git\\\/","^Goose\\\/","^Grabber","^HTTPClient\\\/","^Java\\\/","^Jeode\\\/","^Jetty\\\/","^Mail\\\/","^Mget","^Microsoft URL Control","^NG\\\/[0-9\\.]","^NING\\\/","^PHP\\\/[0-9]","^RMA\\\/","^Ruby|Ruby\\\/[0-9]","^VSE\\\/[0-9]","^WordPress\\.com","^XRL\\\/[0-9]","^ZmEu","008\\\/","13TABS","192\\.comAgent","2ip\\.ru","404enemy","7Siters","80legs","a\\.pr-cy\\.ru","a3logics\\.in","A6-Indexer","Abonti","Aboundex","aboutthedomain","Accoona-AI-Agent","acoon","acrylicapps\\.com\\\/pulp","Acunetix","AdAuth\\\/","adbeat","AddThis","ADmantX","AdminLabs","adressendeutschland","adscanner","Adstxtaggregator","agentslug","AHC","aihit","aiohttp\\\/","Airmail","akka-http\\\/","akula\\\/","alertra","alexa site audit","Alibaba\\.Security\\.Heimdall","Alligator","allloadin","AllSubmitter","alyze\\.info","amagit","Anarchie","AndroidDownloadManager","Anemone","AngleSharp","annotate_google","Ant\\.com","Anturis Agent","AnyEvent-HTTP\\\/","Apache Droid","Apache OpenOffice","Apache-HttpAsyncClient","Apache-HttpClient","ApacheBench","Apexoo","APIs-Google","AportWorm\\\/","AppBeat\\\/","AppEngine-Google","AppStoreScraperZ","Aprc\\\/[0-9]","Arachmo","arachnode","Arachnophilia","aria2","Arukereso","asafaweb","AskQuickly","Ask Jeeves","ASPSeek","Asterias","Astute","asynchttp","Attach","autocite","Autonomy","axios\\\/","B-l-i-t-z-B-O-T","Backlink-Ceck","backlink-check","BacklinkHttpStatus","BackStreet","BackWeb","Bad-Neighborhood","Badass","baidu\\.com","Bandit","basicstate","BatchFTP","Battleztar Bazinga","baypup\\\/","BazQux","BBBike","BCKLINKS","BDFetch","BegunAdvertising","Bidtellect","BigBozz","Bigfoot","biglotron","BingLocalSearch","BingPreview","binlar","biNu image cacher","Bitacle","biz_Directory","Black Hole","Blackboard Safeassign","BlackWidow","BlockNote\\.Net","Bloglines","Bloglovin","BlogPulseLive","BlogSearch","Blogtrottr","BlowFish","boitho\\.com-dc","BPImageWalker","Braintree-Webhooks","Branch Metrics API","Branch-Passthrough","Brandprotect","BrandVerity","Brandwatch","Brodie\\\/","Browsershots","BUbiNG","Buck\\\/","Buddy","BuiltWith","Bullseye","BunnySlippers","Burf Search","Butterfly\\\/","BuzzSumo","CAAM\\\/[0-9]","CakePHP","Calculon","Canary%20Mail","CaretNail","catexplorador","CC Metadata Scaper","Cegbfeieh","censys","Cerberian Drtrs","CERT\\.at-Statistics-Survey","cg-eye","changedetection","ChangesMeter","Charlotte","CheckHost","checkprivacy","CherryPicker","ChinaClaw","Chirp\\\/","chkme\\.com","Chlooe","Chromaxa","CirrusExplorer","CISPA Vulnerability Notification","Citoid","CJNetworkQuality","Clarsentia","clips\\.ua\\.ac\\.be","Cloud mapping","CloudEndure","CloudFlare-AlwaysOnline","Cloudinary","cmcm\\.com","coccoc","cognitiveseo","colly -","CommaFeed","Commons-HttpClient","commonscan","contactbigdatafr","contentkingapp","convera","CookieReports","copyright sheriff","CopyRightCheck","Copyscape","Cosmos4j\\.feedback","Covario-IDS","Crescent","Crowsnest","Criteo","CSHttp","curb","Curious George","curl","cuwhois\\\/","cybo\\.com","DAP\\\/NetHTTP","DareBoost","DatabaseDriverMysqli","DataCha0s","Datafeedwatch","Datanyze","DataparkSearch","dataprovider","DataXu","Daum(oa)?[ \\\/][0-9]","Demon","DeuSu","developers\\.google\\.com\\\/\\+\\\/web\\\/snippet\\\/","Devil","Digg","Digincore","DigitalPebble","Dirbuster","Discourse Forum Onebox","Disqus\\\/","Dispatch\\\/","DittoSpyder","dlvr","DMBrowser","DNSPod-reporting","docoloc","Dolphin http client","DomainAppender","Donuts Content Explorer","dotMailer content retrieval","dotSemantic","downforeveryoneorjustme","Download Wonder","downnotifier","DowntimeDetector","Drip","drupact","Drupal \\(\\+http:\\\/\\\/drupal\\.org\\\/\\)","DTS Agent","dubaiindex","EARTHCOM","Easy-Thumb","EasyDL","Ebingbong","ec2linkfinder","eCairn-Grabber","eCatch","ECCP","eContext\\\/","Ecxi","EirGrabber","ElectricMonk","elefent","EMail Exractor","EMail Wolf","EmailWolf","Embarcadero","Embed PHP Library","Embedly","endo\\\/","europarchive\\.org","evc-batch","EventMachine HttpClient","Everwall Link Expander","Evidon","Evrinid","ExactSearch","ExaleadCloudview","Excel\\\/","exif","Exploratodo","Express WebPictures","Extreme Picture Finder","EyeNetIE","ezooms","facebookexternalhit","facebookplatform","fairshare","Faraday v","fasthttp","Faveeo","Favicon downloader","faviconkit","faviconarchive","FavOrg","Feed Wrangler","Feedable\\\/","Feedbin","FeedBooster","FeedBucket","FeedBunch\\\/","FeedBurner","feeder","Feedly","FeedshowOnline","Feedspot","Feedwind\\\/","FeedZcollector","feeltiptop","Fetch API","Fetch\\\/[0-9]","Fever\\\/[0-9]","FHscan","Fimap","findlink","findthatfile","FlashGet","FlipboardBrowserProxy","FlipboardProxy","FlipboardRSS","Flock\\\/","fluffy","Flunky","flynxapp","forensiq","FoundSeoTool","http:\\\/\\\/www.neomo.de\\\/","free thumbnails","Freeuploader","Funnelback","G-i-g-a-b-o-t","g00g1e\\.net","ganarvisitas","geek-tools","Genieo","GentleSource","GetCode","Getintent","GetLinkInfo","getprismatic","GetRight","getroot","GetURLInfo\\\/","GetWeb","Ghost Inspector","GigablastOpenSource","GIS-LABS","github-camo","github\\.com","Go [\\d\\.]* package http","Go http package","Go-Ahead-Got-It","Go-http-client","Go!Zilla","gobyus","gofetch","GomezAgent","gooblog","Goodzer\\\/","Google AppsViewer","Google Desktop","Google favicon","Google Keyword Suggestion","Google Keyword Tool","Google Page Speed Insights","Google PP Default","Google Search Console","Google Web Preview","Google-Adwords","Google-Apps-Script","Google-Calendar-Importer","Google-HotelAdsVerifier","Google-HTTP-Java-Client","Google-Publisher-Plugin","Google-SearchByImage","Google-Site-Verification","Google-Structured-Data-Testing-Tool","Google-Youtube-Links","google-xrawler","GoogleDocs","GoogleHC\\\/","GoogleProducer","GoogleSites","Google-Transparency-Report","Gookey","GoScraper","GoSpotCheck","gosquared-thumbnailer","Gotit","GoZilla","grabify","GrabNet","Grafula","Grammarly","GrapeFX","GreatNews","Gregarius","GRequests","grokkit","grouphigh","grub-client","gSOAP\\\/","GT::WWW","GTmetrix","GuzzleHttp","gvfs\\\/","HAA(A)?RTLAND http client","Haansoft","hackney\\\/","Hadi Agent","HappyApps-WebCheck","Hatena","Havij","HeadlessChrome","HEADMasterSEO","HeartRails_Capture","help@dataminr\\.com","heritrix","historious","hkedcity","hledejLevne\\.cz","Hloader","HMView","Holmes","HonesoSearchEngine","HootSuite Image proxy","Hootsuite-WebFeed","hosterstats","HostTracker","ht:\\\/\\\/check","htdig","HTMLparser","htmlyse","HTTP Banner Detection","HTTP_Compression_Test","http_request2","http_requester","http-get","HTTP-Header-Abfrage","http-kit","http-request\\\/","HTTP-Tiny","HTTP::Lite","http\\.rb\\\/","http_get","HttpComponents","httphr","HTTPMon","httpRequest","httpscheck","httpssites_power","httpunit","HttpUrlConnection","httrack","huaweisymantec","HubSpot ","Humanlinks","i2kconnect\\\/","Iblog","ichiro","Id-search","IdeelaborPlagiaat","IDG Twitter Links Resolver","IDwhois\\\/","Iframely","igdeSpyder","IlTrovatore","Image Fetch","Image Sucker","ImageEngine\\\/","ImageVisu\\\/","Imagga","imagineeasy","imgsizer","InAGist","inbound\\.li parser","InDesign%20CC","Indy Library","InetURL","infegy","infohelfer","InfoTekies","InfoWizards Reciprocal Link","inpwrd\\.com","instabid","Instapaper","Integrity","integromedb","Intelliseek","InterGET","internet_archive","Internet Ninja","InternetSeer","internetVista monitor","intraVnews","IODC","IOI","iplabel","ips-agent","IPS\\\/[0-9]","IPWorks HTTP\\\/S Component","iqdb\\\/","Iria","Irokez","isitup\\.org","iskanie","isUp\\.li","iThemes Sync\\\/","iZSearch","JAHHO","janforman","Jaunt\\\/","Jbrofuzz","Jersey\\\/","JetCar","Jigsaw","Jobboerse","JobFeed discovery","Jobg8 URL Monitor","jobo","Jobrapido","Jobsearch1\\.5","JoinVision Generic","JolokiaPwn","Joomla","Jorgee","JS-Kit","JustView","Kaspersky Lab CFR link resolver","Kelny\\\/","Kerrigan\\\/","KeyCDN","Keyword Density","Keywords Research","KickFire","KimonoLabs\\\/","Kml-Google","knows\\.is","KOCMOHABT","kouio","kube-probe","kulturarw3","KumKie","L\\.webis","Larbin","Lavf\\\/","LeechFTP","LeechGet","letsencrypt","Lftp","LibVLC","LibWeb","Libwhisker","libwww","Licorne","Liferea\\\/","Lightspeedsystems","Lighthouse","Likse","Link Valet","link_thumbnailer","LinkAlarm\\\/","linkCheck","linkdex","LinkExaminer","linkfluence","linkpeek","LinkPreviewGenerator","LinkScan","LinksManager","LinkTiger","LinkWalker","Lipperhey","Litemage_walker","livedoor ScreenShot","LoadImpactRload","localsearch-web","LongURL API","looksystems\\.net","ltx71","lua-resty-http","lwp-request","lwp-trivial","LWP::Simple","lycos","LYT\\.SR","mabontland","Mag-Net","MagpieRSS","Mail\\.Ru","MailChimp","Majestic12","makecontact\\\/","Mandrill","MapperCmd","marketinggrader","MarkMonitor","MarkWatch","Mass Downloader","masscan\\\/","Mata Hari","Mediapartners-Google","mediawords","MegaIndex\\.ru","MeltwaterNews","Melvil Rawi","MemGator","Metaspinner","MetaURI","MFC_Tear_Sample","Microsearch","Microsoft Office ","Microsoft Outlook","Microsoft Windows Network Diagnostics","Microsoft-WebDAV-MiniRedir","Microsoft Data Access","MIDown tool","MIIxpc","Mindjet","Miniature\\.io","Miniflux","Mister PiX","mixdata dot com","mixed-content-scan","Mixmax-LinkPreview","mixnode","Mnogosearch","mogimogi","Mojeek","Mojolicious \\(Perl\\)","Monit\\\/","monitis","Monitority\\\/","montastic","MonTools","Moreover","Morfeus Fucking Scanner","Morning Paper","MovableType","mowser","Mrcgiguy","MS Web Services Client Protocol","MSFrontPage","mShots","MuckRack\\\/","muhstik-scan","MVAClient","MxToolbox\\\/","nagios","Najdi\\.si","Name Intelligence","Nameprotect","Navroad","NearSite","Needle","Nessus","Net Vampire","NetAnts","NETCRAFT","NetLyzer","NetMechanic","NetNewsWire","Netpursual","netresearch","NetShelter ContentScan","Netsparker","NetTrack","Netvibes","NetZIP","Neustar WPM","NeutrinoAPI","NewRelicPinger","NewsBlur .*Finder","NewsGator","newsme","newspaper\\\/","Nexgate Ruby Client","NG-Search","Nibbler","NICErsPRO","Nikto","nineconnections","NLNZ_IAHarvester","Nmap Scripting Engine","node-superagent","node-urllib","node\\.io","Nodemeter","NodePing","nominet\\.org\\.uk","nominet\\.uk","Norton-Safeweb","Notifixious","notifyninja","nuhk","nutch","Nuzzel","nWormFeedFinder","nyawc\\\/","Nymesis","NYU","Ocelli\\\/","Octopus","oegp","Offline Explorer","Offline Navigator","og-scraper","okhttp","omgili","OMSC","Online Domain Tools","OpenCalaisSemanticProxy","Openfind","OpenLinkProfiler","Openstat\\\/","OpenVAS","Optimizer","Orbiter","OrgProbe\\\/","orion-semantics","Outlook-Express","Outlook-iOS","ow\\.ly","Owler","ownCloud News","OxfordCloudService","Page Valet","page_verifier","page scorer","page2rss","PageGrabber","PagePeeker","PageScorer","Pagespeed\\\/","Panopta","panscient","Papa Foto","parsijoo","Pavuk","PayPal IPN","pcBrowser","Pcore-HTTP","Pearltrees","PECL::HTTP","peerindex","Peew","PeoplePal","Perlu -","PhantomJS Screenshoter","PhantomJS\\\/","Photon\\\/","phpservermon","Pi-Monster","Picscout","Picsearch","PictureFinder","Pimonster","ping\\.blo\\.gs","Pingability","PingAdmin\\.Ru","Pingdom","Pingoscope","PingSpot","pinterest\\.com","Pixray","Pizilla","Plagger\\\/","Ploetz \\+ Zeller","Plukkie","plumanalytics","PocketImageCache","PocketParser","Pockey","POE-Component-Client-HTTP","Polymail\\\/","Pompos","Porkbun","Port Monitor","postano","PostmanRuntime","PostPost","postrank","PowerPoint\\\/","Priceonomics Analysis Engine","PrintFriendly","PritTorrent","Prlog","probethenet","Project 25499","prospectb2b","Protopage","ProWebWalker","proximic","PRTG Network Monitor","pshtt, https scanning","PTST ","PTST\\\/[0-9]+","Pulsepoint XT3 web scraper","Pump","Python-httplib2","python-requests","Python-urllib","Qirina Hurdler","QQDownload","QrafterPro","Qseero","Qualidator","QueryN Metasearch","queuedriver","Quora Link Preview","Qwantify","Radian6","RankActive","RankFlex","RankSonicSiteAuditor","Re-re Studio","ReactorNetty","Readability","RealDownload","RealPlayer%20Downloader","RebelMouse","Recorder","RecurPost\\\/","redback\\\/","ReederForMac","ReGet","RepoMonkey","request\\.js","reqwest\\\/","ResponseCodeTest","RestSharp","Riddler","Rival IQ","Robosourcer","Robozilla","ROI Hunter","RPT-HTTPClient","RSSOwl","safe-agent-scanner","SalesIntelligent","Saleslift","Sendsay\\.Ru","SauceNAO","SBIder","scalaj-http","scan\\.lol","ScanAlert","Scoop","scooter","ScoutJet","ScoutURLMonitor","ScrapeBox Page Scanner","SimpleScraper","Scrapy","Screaming","ScreenShotService","Scrubby","Scrutiny\\\/","search\\.thunderstone","Search37","searchenginepromotionhelp","Searchestate","SearchExpress","SearchSight","Seeker","semanticdiscovery","semanticjuice","Semiocast HTTP client","Semrush","sentry\\\/","SEO Browser","Seo Servis","seo-nastroj\\.cz","seo4ajax","Seobility","SEOCentro","SeoCheck","SEOkicks","Seomoz","SEOprofiler","SEOsearch","seoscanners","seositecheckup","SEOstats","servernfo","sexsearcher","Seznam","Shelob","Shodan","Shoppimon","ShopWiki","ShortLinkTranslate","shrinktheweb","Sideqik","SimplePie","SimplyFast","Siphon","SISTRIX","Site-Shot\\\/","Site Sucker","Site24x7","SiteBar","Sitebeam","Sitebulb\\\/","SiteCondor","SiteExplorer","SiteGuardian","Siteimprove","SiteIndexed","Sitemap(s)? Generator","SitemapGenerator","SiteMonitor","Siteshooter B0t","SiteSnagger","SiteSucker","SiteTruth","Sitevigil","sitexy\\.com","SkypeUriPreview","Slack\\\/","slider\\.com","slurp","SlySearch","SmartDownload","SMRF URL Expander","SMUrlExpander","Snake","Snappy","SnapSearch","Snarfer\\\/","SniffRSS","sniptracker","Snoopy","SnowHaze Search","sogou web","SortSite","Sottopop","sovereign\\.ai","SpaceBison","SpamExperts","Spammen","Spanner","spaziodati","SPDYCheck","Specificfeeds","speedy","SPEng","Spinn3r","spray-can","Sprinklr ","spyonweb","sqlmap","Sqlworm","Sqworm","SSL Labs","ssl-tools","StackRambler","Statastico\\\/","StatusCake","Steeler","Stratagems Kumo","Stroke\\.cz","StudioFACA","StumbleUpon","suchen","Sucuri","summify","SuperHTTP","Surphace Scout","Suzuran","SwiteScraper","Symfony BrowserKit","Symfony2 BrowserKit","SynHttpClient-Built","Sysomos","sysscan","Szukacz","T0PHackTeam","tAkeOut","Tarantula\\\/","Taringa UGC","TarmotGezgin","Teleport","Telesoft","Telesphoreo","Telesphorep","Tenon\\.io","teoma","terrainformatica","Test Certificate Info","testuri","Tetrahedron","The Drop Reaper","The Expert HTML Source Viewer","The Knowledge AI","The Intraformant","theinternetrules","TheNomad","Thinklab","Thumbshots","ThumbSniper","timewe\\.net","TinEye","Tiny Tiny RSS","TLSProbe\\\/","Toata","topster","touche\\.com","Traackr\\.com","tracemyfile","Trackuity","TrapitAgent","Trendiction","Trendsmap","trendspottr","truwoGPS","TryJsoup","TulipChain","Turingos","Turnitin","tweetedtimes","Tweetminster","Tweezler\\\/","twibble","Twice","Twikle","Twingly","Twisted PageGetter","Typhoeus","ubermetrics-technologies","uclassify","UdmSearch","unchaos","unirest-java","UniversalFeedParser","Unshorten\\.It","Untiny","UnwindFetchor","updated","updown\\.io daemon","Upflow","Uptimia","Urlcheckr","URL Verifier","URLitor","urlresolver","Urlstat","URLTester","UrlTrends Ranking Updater","URLy Warning","URLy\\.Warning","Vacuum","Vagabondo","VB Project","vBSEO","VCI","via ggpht\\.com GoogleImageProxy","VidibleScraper","Virusdie","visionutils","vkShare","VoidEYE","Voil","voltron","voyager\\\/","VSAgent\\\/","VSB-TUO\\\/","Vulnbusters Meter","VYU2","w3af\\.org","W3C_Unicorn","W3C-checklink","W3C-mobileOK","WAC-OFU","Wallpapers\\\/[0-9]+","WallpapersHD","wangling","Wappalyzer","WatchMouse","WbSrch\\\/","WDT\\.io","web-capture\\.net","Web-sniffer","Web Auto","Web Collage","Web Enhancer","Web Fetch","Web Fuck","Web Pix","Web Sauger","Web Sucker","Webalta","Webauskunft","WebAuto","WebCapture","WebClient\\\/","webcollage","WebCookies","WebCopier","WebCorp","WebDataStats","WebDoc","WebEnhancer","WebFetch","WebFuck","WebGazer","WebGo IS","WebImageCollector","WebImages","WebIndex","webkit2png","WebLeacher","webmastercoffee","webmon ","WebPix","WebReaper","WebSauger","webscreenie","Webshag","Webshot","Website Quester","websitepulse agent","WebsiteQuester","Websnapr","WebSniffer","Webster","WebStripper","WebSucker","Webthumb\\\/","WebThumbnail","WebWhacker","WebZIP","WeLikeLinks","WEPA","WeSEE","wf84","Wfuzz\\\/","wget","WhatsApp","WhatsMyIP","WhatWeb","WhereGoes\\?","Whibse","WhoRunsCoinHive","Whynder Magnet","Windows-RSS-Platform","WinPodder","wkhtmlto","wmtips","Woko","woorankreview","Word\\\/","WordPress\\\/","WordupinfoSearch","wotbox","WP Engine Install Performance API","wpif","wprecon\\.com survey","WPScan","wscheck","Wtrace","WWW-Collector-E","WWW-Mechanize","WWW::Document","WWW::Mechanize","www\\.monitor\\.us","WWWOFFLE","x09Mozilla","x22Mozilla","XaxisSemanticsClassifier","Xenu Link Sleuth","XING-contenttabreceiver","xpymep([0-9]?)\\.exe","Y!J-(ASR|BSC)","Y\\!J-BRW","Yaanb","yacy","Yahoo Link Preview","YahooCacheSystem","YahooYSMcm","YandeG","Yandex(?!Search)","yanga","yeti","Yo-yo","Yoleo Consumer","yoogliFetchAgent","YottaaMonitor","Your-Website-Sucks","yourls\\.org","YoYs\\.net","YP\\.PL","Zabbix","Zade","Zao","Zauba","Zemanta Aggregator","Zend_Http_Client","Zend\\\\Http\\\\Client","Zermelo","Zeus ","zgrab","ZnajdzFoto","Zombie\\.js","Zoom\\.Mac","ZyBorg","[a-z0-9\\-_]*(bot|crawl|archiver|transcoder|spider|uptime|validator|fetcher|cron|checker|reader|extractor|monitoring|analyzer)"]
\ No newline at end of file
diff --git a/blockbot/vendor/jaybizzle/crawler-detect/raw/Crawlers.txt b/blockbot/vendor/jaybizzle/crawler-detect/raw/Crawlers.txt
index 791d08bb..1522796e 100644
--- a/blockbot/vendor/jaybizzle/crawler-detect/raw/Crawlers.txt
+++ b/blockbot/vendor/jaybizzle/crawler-detect/raw/Crawlers.txt
@@ -1,46 +1,27 @@
+.*Java.*outbrain
  YLT
-^Aether
-^Amazon Simple Notification Service Agent$
-^Amazon-Route53-Health-Check-Service
 ^b0t$
 ^bluefish 
 ^Calypso v\/
 ^COMODO DCV
-^Corax
 ^DangDang
 ^DavClnt
-^DHSH
-^docker\/[0-9]
-^Expanse
 ^FDM 
 ^git\/
 ^Goose\/
 ^Grabber
-^Gradle\/
 ^HTTPClient\/
-^HTTPing
 ^Java\/
 ^Jeode\/
 ^Jetty\/
 ^Mail\/
 ^Mget
 ^Microsoft URL Control
-^Mikrotik\/
-^Netlab360
 ^NG\/[0-9\.]
 ^NING\/
-^npm\/
-^Nuclei
-^PHP-AYMAPI\/
-^PHP\/
-^pip\/
-^pnpm\/
+^PHP\/[0-9]
 ^RMA\/
 ^Ruby|Ruby\/[0-9]
-^Swurl 
-^TLS tester 
-^twine\/
-^ureq
 ^VSE\/[0-9]
 ^WordPress\.com
 ^XRL\/[0-9]
@@ -48,18 +29,17 @@
 008\/
 13TABS
 192\.comAgent
-2GDPR\/
 2ip\.ru
 404enemy
 7Siters
 80legs
+a\.pr-cy\.ru
 a3logics\.in
 A6-Indexer
 Abonti
 Aboundex
 aboutthedomain
 Accoona-AI-Agent
-acebookexternalhit\/
 acoon
 acrylicapps\.com\/pulp
 Acunetix
@@ -69,14 +49,8 @@ AddThis
 ADmantX
 AdminLabs
 adressendeutschland
-adreview\/
 adscanner
-adstxt-worker
 Adstxtaggregator
-adstxt\.com
-Adyen HttpClient
-AffiliateLabz\/
-affilimate-puppeteer
 agentslug
 AHC
 aihit
@@ -97,23 +71,20 @@ AndroidDownloadManager
 Anemone
 AngleSharp
 annotate_google
-Anthill
-Anturis Agent
 Ant\.com
+Anturis Agent
 AnyEvent-HTTP\/
-Apache Ant\/
 Apache Droid
 Apache OpenOffice
 Apache-HttpAsyncClient
 Apache-HttpClient
 ApacheBench
 Apexoo
-apimon\.de
 APIs-Google
 AportWorm\/
 AppBeat\/
 AppEngine-Google
-AppleSyndication
+AppStoreScraperZ
 Aprc\/[0-9]
 Arachmo
 arachnode
@@ -121,28 +92,21 @@ Arachnophilia
 aria2
 Arukereso
 asafaweb
-Asana\/
-Ask Jeeves
 AskQuickly
+Ask Jeeves
 ASPSeek
 Asterias
 Astute
 asynchttp
 Attach
-attohttpc
 autocite
-AutomaticWPTester
 Autonomy
-awin\.com
-AWS Security Scanner
 axios\/
-a\.pr-cy\.ru
 B-l-i-t-z-B-O-T
 Backlink-Ceck
 backlink-check
 BacklinkHttpStatus
 BackStreet
-BackupLand
 BackWeb
 Bad-Neighborhood
 Badass
@@ -157,7 +121,6 @@ BBBike
 BCKLINKS
 BDFetch
 BegunAdvertising
-Bewica-security-scan
 Bidtellect
 BigBozz
 Bigfoot
@@ -167,14 +130,11 @@ BingPreview
 binlar
 biNu image cacher
 Bitacle
-Bitrix link preview
 biz_Directory
-BKCTwitterUnshortener\/
 Black Hole
 Blackboard Safeassign
 BlackWidow
 BlockNote\.Net
-BlogBridge
 Bloglines
 Bloglovin
 BlogPulseLive
@@ -182,7 +142,6 @@ BlogSearch
 Blogtrottr
 BlowFish
 boitho\.com-dc
-Boost\.Beast
 BPImageWalker
 Braintree-Webhooks
 Branch Metrics API
@@ -210,15 +169,12 @@ catexplorador
 CC Metadata Scaper
 Cegbfeieh
 censys
-centuryb.o.t9[at]gmail.com
 Cerberian Drtrs
 CERT\.at-Statistics-Survey
-cf-facebook
 cg-eye
 changedetection
 ChangesMeter
 Charlotte
-chatterino-api-cache
 CheckHost
 checkprivacy
 CherryPicker
@@ -229,7 +185,6 @@ Chlooe
 Chromaxa
 CirrusExplorer
 CISPA Vulnerability Notification
-CISPA Web Analyser
 Citoid
 CJNetworkQuality
 Clarsentia
@@ -237,34 +192,27 @@ clips\.ua\.ac\.be
 Cloud mapping
 CloudEndure
 CloudFlare-AlwaysOnline
-Cloudflare-Healthchecks
 Cloudinary
 cmcm\.com
 coccoc
 cognitiveseo
-ColdFusion
 colly -
 CommaFeed
 Commons-HttpClient
 commonscan
 contactbigdatafr
 contentkingapp
-Contextual Code Sites Explorer
 convera
 CookieReports
 copyright sheriff
 CopyRightCheck
 Copyscape
-cortex\/
 Cosmos4j\.feedback
 Covario-IDS
-Craw\/
 Crescent
-Criteo
 Crowsnest
+Criteo
 CSHttp
-CSSCheck
-Cula\/
 curb
 Curious George
 curl
@@ -274,17 +222,12 @@ DAP\/NetHTTP
 DareBoost
 DatabaseDriverMysqli
 DataCha0s
-DatadogSynthetics
 Datafeedwatch
 Datanyze
 DataparkSearch
 dataprovider
 DataXu
 Daum(oa)?[ \/][0-9]
-dBpoweramp
-ddline
-deeris
-delve\.ai
 Demon
 DeuSu
 developers\.google\.com\/\+\/web\/snippet\/
@@ -294,8 +237,8 @@ Digincore
 DigitalPebble
 Dirbuster
 Discourse Forum Onebox
-Dispatch\/
 Disqus\/
+Dispatch\/
 DittoSpyder
 dlvr
 DMBrowser
@@ -303,8 +246,6 @@ DNSPod-reporting
 docoloc
 Dolphin http client
 DomainAppender
-DomainLabz
-Domains Project\/
 Donuts Content Explorer
 dotMailer content retrieval
 dotSemantic
@@ -317,8 +258,6 @@ drupact
 Drupal \(\+http:\/\/drupal\.org\/\)
 DTS Agent
 dubaiindex
-DuplexWeb-Google
-DynatraceSynthetic
 EARTHCOM
 Easy-Thumb
 EasyDL
@@ -349,22 +288,20 @@ ExactSearch
 ExaleadCloudview
 Excel\/
 exif
-ExoRank
 Exploratodo
 Express WebPictures
 Extreme Picture Finder
 EyeNetIE
 ezooms
 facebookexternalhit
-facebookexternalua
 facebookplatform
 fairshare
 Faraday v
 fasthttp
 Faveeo
 Favicon downloader
-faviconarchive
 faviconkit
+faviconarchive
 FavOrg
 Feed Wrangler
 Feedable\/
@@ -376,9 +313,7 @@ FeedBurner
 feeder
 Feedly
 FeedshowOnline
-Feedshow\/
 Feedspot
-FeedViewer\/
 Feedwind\/
 FeedZcollector
 feeltiptop
@@ -386,8 +321,6 @@ Fetch API
 Fetch\/[0-9]
 Fever\/[0-9]
 FHscan
-Fiery%20Feeds
-Filestack
 Fimap
 findlink
 findthatfile
@@ -396,24 +329,18 @@ FlipboardBrowserProxy
 FlipboardProxy
 FlipboardRSS
 Flock\/
-Florienzh\/
 fluffy
 Flunky
 flynxapp
 forensiq
-ForusP
 FoundSeoTool
-fragFINN\.de
+http:\/\/www.neomo.de\/
 free thumbnails
 Freeuploader
-FreshRSS
-frontman
 Funnelback
-Fuzz Faster U Fool
 G-i-g-a-b-o-t
 g00g1e\.net
 ganarvisitas
-gdnplus\.com
 geek-tools
 Genieo
 GentleSource
@@ -425,24 +352,18 @@ GetRight
 getroot
 GetURLInfo\/
 GetWeb
-Geziyor
 Ghost Inspector
 GigablastOpenSource
 GIS-LABS
 github-camo
-GitHub-Hookshot
 github\.com
-Go http package
 Go [\d\.]* package http
-Go!Zilla
+Go http package
 Go-Ahead-Got-It
 Go-http-client
-go-mtasts\/
-gobuster
+Go!Zilla
 gobyus
-Gofeed
 gofetch
-Goldfire Server
 GomezAgent
 gooblog
 Goodzer\/
@@ -455,31 +376,24 @@ Google Page Speed Insights
 Google PP Default
 Google Search Console
 Google Web Preview
-Google-Ads-Creatives-Assistant
-Google-Ads-Overview
 Google-Adwords
 Google-Apps-Script
 Google-Calendar-Importer
 Google-HotelAdsVerifier
 Google-HTTP-Java-Client
-Google-InspectionTool
-Google-Podcast
 Google-Publisher-Plugin
-Google-Read-Aloud
 Google-SearchByImage
 Google-Site-Verification
-Google-SMTP-STS
-Google-speakr
 Google-Structured-Data-Testing-Tool
-Google-Transparency-Report
-google-xrawler
 Google-Youtube-Links
+google-xrawler
 GoogleDocs
 GoogleHC\/
-GoogleProber
 GoogleProducer
 GoogleSites
+Google-Transparency-Report
 Gookey
+GoScraper
 GoSpotCheck
 gosquared-thumbnailer
 Gotit
@@ -505,16 +419,13 @@ Haansoft
 hackney\/
 Hadi Agent
 HappyApps-WebCheck
-Hardenize
 Hatena
 Havij
-HaxerMen
 HeadlessChrome
 HEADMasterSEO
 HeartRails_Capture
 help@dataminr\.com
 heritrix
-Hexometer
 historious
 hkedcity
 hledejLevne\.cz
@@ -531,31 +442,28 @@ htdig
 HTMLparser
 htmlyse
 HTTP Banner Detection
+HTTP_Compression_Test
+http_request2
+http_requester
 http-get
 HTTP-Header-Abfrage
 http-kit
 http-request\/
 HTTP-Tiny
 HTTP::Lite
-http:\/\/www.neomo.de\/
+http\.rb\/
+http_get
 HttpComponents
 httphr
-HTTPie
 HTTPMon
 httpRequest
 httpscheck
 httpssites_power
 httpunit
 HttpUrlConnection
-http\.rb\/
-HTTP_Compression_Test
-http_get
-http_request2
-http_requester
 httrack
 huaweisymantec
 HubSpot 
-HubSpot-Link-Resolver
 Humanlinks
 i2kconnect\/
 Iblog
@@ -566,7 +474,6 @@ IDG Twitter Links Resolver
 IDwhois\/
 Iframely
 igdeSpyder
-iGooglePortal
 IlTrovatore
 Image Fetch
 Image Sucker
@@ -591,15 +498,13 @@ Integrity
 integromedb
 Intelliseek
 InterGET
+internet_archive
 Internet Ninja
 InternetSeer
 internetVista monitor
-internetwache
-internet_archive
 intraVnews
 IODC
 IOI
-Inboxb0t
 iplabel
 ips-agent
 IPS\/[0-9]
@@ -611,13 +516,10 @@ isitup\.org
 iskanie
 isUp\.li
 iThemes Sync\/
-IZaBEE
 iZSearch
 JAHHO
 janforman
 Jaunt\/
-Java.*outbrain
-javelin\.io
 Jbrofuzz
 Jersey\/
 JetCar
@@ -633,7 +535,6 @@ JolokiaPwn
 Joomla
 Jorgee
 JS-Kit
-JungleKeyThumbnail
 JustView
 Kaspersky Lab CFR link resolver
 Kelny\/
@@ -641,7 +542,6 @@ Kerrigan\/
 KeyCDN
 Keyword Density
 Keywords Research
-khttp\/
 KickFire
 KimonoLabs\/
 Kml-Google
@@ -649,12 +549,11 @@ knows\.is
 KOCMOHABT
 kouio
 kube-probe
-kubectl
 kulturarw3
 KumKie
+L\.webis
 Larbin
 Lavf\/
-leakix\.net
 LeechFTP
 LeechGet
 letsencrypt
@@ -665,50 +564,41 @@ Libwhisker
 libwww
 Licorne
 Liferea\/
-Lighthouse
 Lightspeedsystems
+Lighthouse
 Likse
-limber\.io
 Link Valet
+link_thumbnailer
 LinkAlarm\/
-LinkAnalyser
 linkCheck
 linkdex
 LinkExaminer
 linkfluence
 linkpeek
-LinkPreview
+LinkPreviewGenerator
 LinkScan
 LinksManager
 LinkTiger
 LinkWalker
-link_thumbnailer
 Lipperhey
 Litemage_walker
 livedoor ScreenShot
 LoadImpactRload
 localsearch-web
 LongURL API
-longurl-r-package
-looid\.com
 looksystems\.net
 ltx71
 lua-resty-http
-Lucee \(CFML Engine\)
-Lush Http Client
 lwp-request
 lwp-trivial
 LWP::Simple
 lycos
 LYT\.SR
-L\.webis
 mabontland
-MacOutlook\/
 Mag-Net
 MagpieRSS
-Mail::STS
-MailChimp
 Mail\.Ru
+MailChimp
 Majestic12
 makecontact\/
 Mandrill
@@ -719,8 +609,6 @@ MarkWatch
 Mass Downloader
 masscan\/
 Mata Hari
-mattermost
-Mediametric
 Mediapartners-Google
 mediawords
 MegaIndex\.ru
@@ -731,31 +619,28 @@ Metaspinner
 MetaURI
 MFC_Tear_Sample
 Microsearch
-Microsoft Data Access
-Microsoft Office
+Microsoft Office 
 Microsoft Outlook
 Microsoft Windows Network Diagnostics
 Microsoft-WebDAV-MiniRedir
-Microsoft\.Data\.Mashup
+Microsoft Data Access
 MIDown tool
 MIIxpc
 Mindjet
 Miniature\.io
 Miniflux
-mio_httpc
-Miro-HttpClient
 Mister PiX
 mixdata dot com
 mixed-content-scan
+Mixmax-LinkPreview
 mixnode
 Mnogosearch
 mogimogi
 Mojeek
 Mojolicious \(Perl\)
-Mollie
+Monit\/
 monitis
 Monitority\/
-Monit\/
 montastic
 MonTools
 Moreover
@@ -764,7 +649,6 @@ Morning Paper
 MovableType
 mowser
 Mrcgiguy
-Mr\.4x3 Powered
 MS Web Services Client Protocol
 MSFrontPage
 mShots
@@ -772,13 +656,10 @@ MuckRack\/
 muhstik-scan
 MVAClient
 MxToolbox\/
-myseosnapshot
 nagios
 Najdi\.si
 Name Intelligence
-NameFo\.com
 Nameprotect
-nationalarchives
 Navroad
 NearSite
 Needle
@@ -793,8 +674,6 @@ Netpursual
 netresearch
 NetShelter ContentScan
 Netsparker
-NetSystemsResearch
-nettle
 NetTrack
 Netvibes
 NetZIP
@@ -807,26 +686,22 @@ newsme
 newspaper\/
 Nexgate Ruby Client
 NG-Search
-nghttp2
 Nibbler
 NICErsPRO
-NihilScio
 Nikto
 nineconnections
 NLNZ_IAHarvester
 Nmap Scripting Engine
-node-fetch
 node-superagent
 node-urllib
+node\.io
 Nodemeter
 NodePing
-node\.io
 nominet\.org\.uk
 nominet\.uk
 Norton-Safeweb
 Notifixious
 notifyninja
-NotionEmbedder
 nuhk
 nutch
 Nuzzel
@@ -834,45 +709,39 @@ nWormFeedFinder
 nyawc\/
 Nymesis
 NYU
-Observatory\/
 Ocelli\/
 Octopus
 oegp
 Offline Explorer
 Offline Navigator
-OgScrper
+og-scraper
 okhttp
 omgili
 OMSC
 Online Domain Tools
-Open Source RSS
 OpenCalaisSemanticProxy
 Openfind
 OpenLinkProfiler
 Openstat\/
 OpenVAS
-OPPO A33
 Optimizer
 Orbiter
 OrgProbe\/
 orion-semantics
 Outlook-Express
 Outlook-iOS
-Owler
-Owlin
-ownCloud News
 ow\.ly
+Owler
+ownCloud News
 OxfordCloudService
-page scorer
 Page Valet
+page_verifier
+page scorer
 page2rss
-PageFreezer
 PageGrabber
 PagePeeker
 PageScorer
 Pagespeed\/
-PageThing
-page_verifier
 Panopta
 panscient
 Papa Foto
@@ -881,7 +750,6 @@ Pavuk
 PayPal IPN
 pcBrowser
 Pcore-HTTP
-PDF24 URL To PDF
 Pearltrees
 PECL::HTTP
 peerindex
@@ -891,52 +759,44 @@ Perlu -
 PhantomJS Screenshoter
 PhantomJS\/
 Photon\/
-php-requests
 phpservermon
 Pi-Monster
 Picscout
 Picsearch
 PictureFinder
 Pimonster
+ping\.blo\.gs
 Pingability
 PingAdmin\.Ru
 Pingdom
 Pingoscope
 PingSpot
-ping\.blo\.gs
 pinterest\.com
 Pixray
 Pizilla
 Plagger\/
-Pleroma 
 Ploetz \+ Zeller
 Plukkie
 plumanalytics
 PocketImageCache
 PocketParser
 Pockey
-PodcastAddict\/
 POE-Component-Client-HTTP
 Polymail\/
 Pompos
 Porkbun
 Port Monitor
 postano
-postfix-mta-sts-resolver
 PostmanRuntime
-postplanner\.com
 PostPost
 postrank
 PowerPoint\/
-Prebid
-Prerender
 Priceonomics Analysis Engine
 PrintFriendly
 PritTorrent
 Prlog
 probethenet
-Project ?25499
-Project-Resonance
+Project 25499
 prospectb2b
 Protopage
 ProWebWalker
@@ -945,9 +805,9 @@ PRTG Network Monitor
 pshtt, https scanning
 PTST 
 PTST\/[0-9]+
+Pulsepoint XT3 web scraper
 Pump
 Python-httplib2
-python-httpx
 python-requests
 Python-urllib
 Qirina Hurdler
@@ -957,17 +817,12 @@ Qseero
 Qualidator
 QueryN Metasearch
 queuedriver
-quic-go-HTTP\/
-QuiteRSS
 Quora Link Preview
 Qwantify
 Radian6
-RadioPublicImageResizer
-Railgun\/
 RankActive
 RankFlex
 RankSonicSiteAuditor
-RapidLoad\/
 Re-re Studio
 ReactorNetty
 Readability
@@ -978,7 +833,6 @@ Recorder
 RecurPost\/
 redback\/
 ReederForMac
-Reeder\/
 ReGet
 RepoMonkey
 request\.js
@@ -991,44 +845,38 @@ Robosourcer
 Robozilla
 ROI Hunter
 RPT-HTTPClient
-RSSMix\/
 RSSOwl
-RyowlEngine
 safe-agent-scanner
 SalesIntelligent
 Saleslift
-SAP NetWeaver Application Server
+Sendsay\.Ru
 SauceNAO
 SBIder
-sc-downloader
 scalaj-http
-Scamadviser-Frontend
-ScanAlert
 scan\.lol
+ScanAlert
 Scoop
 scooter
-ScopeContentAG-HTTP-Client
 ScoutJet
 ScoutURLMonitor
 ScrapeBox Page Scanner
+SimpleScraper
 Scrapy
 Screaming
 ScreenShotService
 Scrubby
 Scrutiny\/
+search\.thunderstone
 Search37
 searchenginepromotionhelp
 Searchestate
 SearchExpress
 SearchSight
-SearchWP
-search\.thunderstone
 Seeker
 semanticdiscovery
 semanticjuice
 Semiocast HTTP client
 Semrush
-Sendsay\.Ru
 sentry\/
 SEO Browser
 Seo Servis
@@ -1037,13 +885,11 @@ seo4ajax
 Seobility
 SEOCentro
 SeoCheck
-seocompany
 SEOkicks
-SEOlizer
 Seomoz
 SEOprofiler
-seoscanners
 SEOsearch
+seoscanners
 seositecheckup
 SEOstats
 servernfo
@@ -1054,16 +900,14 @@ Shodan
 Shoppimon
 ShopWiki
 ShortLinkTranslate
-shortURL lengthener
 shrinktheweb
 Sideqik
-Siege
 SimplePie
 SimplyFast
 Siphon
 SISTRIX
-Site Sucker
 Site-Shot\/
+Site Sucker
 Site24x7
 SiteBar
 Sitebeam
@@ -1084,7 +928,6 @@ Sitevigil
 sitexy\.com
 SkypeUriPreview
 Slack\/
-sli-systems\.com
 slider\.com
 slurp
 SlySearch
@@ -1107,11 +950,9 @@ SpaceBison
 SpamExperts
 Spammen
 Spanner
-Spawning-AI
 spaziodati
 SPDYCheck
 Specificfeeds
-SpeedKit
 speedy
 SPEng
 Spinn3r
@@ -1125,11 +966,9 @@ SSL Labs
 ssl-tools
 StackRambler
 Statastico\/
-Statically-
 StatusCake
 Steeler
 Stratagems Kumo
-Stripe\/
 Stroke\.cz
 StudioFACA
 StumbleUpon
@@ -1139,11 +978,9 @@ summify
 SuperHTTP
 Surphace Scout
 Suzuran
-swcd 
+SwiteScraper
 Symfony BrowserKit
 Symfony2 BrowserKit
-Synapse\/
-Syndirella\/
 SynHttpClient-Built
 Sysomos
 sysscan
@@ -1153,8 +990,6 @@ tAkeOut
 Tarantula\/
 Taringa UGC
 TarmotGezgin
-tchelebi\.io
-techiaith\.cymru
 Teleport
 Telesoft
 Telesphoreo
@@ -1165,15 +1000,13 @@ terrainformatica
 Test Certificate Info
 testuri
 Tetrahedron
-TextRazor Downloader
 The Drop Reaper
 The Expert HTML Source Viewer
-The Intraformant
 The Knowledge AI
+The Intraformant
 theinternetrules
 TheNomad
 Thinklab
-Thumbor
 Thumbshots
 ThumbSniper
 timewe\.net
@@ -1207,11 +1040,9 @@ Typhoeus
 ubermetrics-technologies
 uclassify
 UdmSearch
-ultimate_sitemap_parser
 unchaos
 unirest-java
 UniversalFeedParser
-unshortenit
 Unshorten\.It
 Untiny
 UnwindFetchor
@@ -1219,8 +1050,8 @@ updated
 updown\.io daemon
 Upflow
 Uptimia
-URL Verifier
 Urlcheckr
+URL Verifier
 URLitor
 urlresolver
 Urlstat
@@ -1228,16 +1059,15 @@ URLTester
 UrlTrends Ranking Updater
 URLy Warning
 URLy\.Warning
-URL\/Emacs
 Vacuum
 Vagabondo
 VB Project
 vBSEO
 VCI
 via ggpht\.com GoogleImageProxy
+VidibleScraper
 Virusdie
 visionutils
-Visual Rights Group
 vkShare
 VoidEYE
 Voil
@@ -1248,18 +1078,19 @@ VSB-TUO\/
 Vulnbusters Meter
 VYU2
 w3af\.org
+W3C_Unicorn
 W3C-checklink
 W3C-mobileOK
-W3C_Unicorn
 WAC-OFU
-WakeletLinkExpander
-WallpapersHD
 Wallpapers\/[0-9]+
+WallpapersHD
 wangling
 Wappalyzer
 WatchMouse
 WbSrch\/
 WDT\.io
+web-capture\.net
+Web-sniffer
 Web Auto
 Web Collage
 Web Enhancer
@@ -1267,10 +1098,7 @@ Web Fetch
 Web Fuck
 Web Pix
 Web Sauger
-Web spyder
 Web Sucker
-web-capture\.net
-Web-sniffer
 Webalta
 Webauskunft
 WebAuto
@@ -1308,9 +1136,8 @@ WebSniffer
 Webster
 WebStripper
 WebSucker
-webtech\/
-WebThumbnail
 Webthumb\/
+WebThumbnail
 WebWhacker
 WebZIP
 WeLikeLinks
@@ -1319,31 +1146,24 @@ WeSEE
 wf84
 Wfuzz\/
 wget
-WhatCMS
 WhatsApp
 WhatsMyIP
 WhatWeb
 WhereGoes\?
 Whibse
-WhoAPI\/
 WhoRunsCoinHive
 Whynder Magnet
 Windows-RSS-Platform
-WinHttp-Autoproxy-Service
-WinHTTP\/
 WinPodder
 wkhtmlto
 wmtips
 Woko
-Wolfram HTTPClient
 woorankreview
+Word\/
 WordPress\/
 WordupinfoSearch
-Word\/
-worldping-api
 wotbox
 WP Engine Install Performance API
-WP Rocket
 wpif
 wprecon\.com survey
 WPScan
@@ -1353,21 +1173,20 @@ WWW-Collector-E
 WWW-Mechanize
 WWW::Document
 WWW::Mechanize
-WWWOFFLE
 www\.monitor\.us
+WWWOFFLE
 x09Mozilla
 x22Mozilla
 XaxisSemanticsClassifier
-XenForo\/
 Xenu Link Sleuth
 XING-contenttabreceiver
 xpymep([0-9]?)\.exe
-Y!J-[A-Z][A-Z][A-Z]
+Y!J-(ASR|BSC)
+Y\!J-BRW
 Yaanb
 yacy
 Yahoo Link Preview
 YahooCacheSystem
-YahooMailProxy
 YahooYSMcm
 YandeG
 Yandex(?!Search)
@@ -1375,7 +1194,6 @@ yanga
 yeti
 Yo-yo
 Yoleo Consumer
-yomins\.com
 yoogliFetchAgent
 YottaaMonitor
 Your-Website-Sucks
@@ -1387,15 +1205,13 @@ Zade
 Zao
 Zauba
 Zemanta Aggregator
-Zend\\Http\\Client
 Zend_Http_Client
+Zend\\Http\\Client
 Zermelo
 Zeus 
 zgrab
 ZnajdzFoto
-ZnHTTP
 Zombie\.js
 Zoom\.Mac
-ZoteroTranslationServer
 ZyBorg
-[a-z0-9\-_]*(bot|crawl|archiver|transcoder|spider|uptime|validator|fetcher|cron|checker|reader|extractor|monitoring|analyzer|scraper)
\ No newline at end of file
+[a-z0-9\-_]*(bot|crawl|archiver|transcoder|spider|uptime|validator|fetcher|cron|checker|reader|extractor|monitoring|analyzer)
\ No newline at end of file
diff --git a/blockbot/vendor/jaybizzle/crawler-detect/raw/Exclusions.json b/blockbot/vendor/jaybizzle/crawler-detect/raw/Exclusions.json
index e7e01416..a18eb985 100644
--- a/blockbot/vendor/jaybizzle/crawler-detect/raw/Exclusions.json
+++ b/blockbot/vendor/jaybizzle/crawler-detect/raw/Exclusions.json
@@ -1 +1 @@
-["Safari.[\\d\\.]*","Firefox.[\\d\\.]*"," Chrome.[\\d\\.]*","Chromium.[\\d\\.]*","MSIE.[\\d\\.]","Opera\\\/[\\d\\.]*","Mozilla.[\\d\\.]*","AppleWebKit.[\\d\\.]*","Trident.[\\d\\.]*","Windows NT.[\\d\\.]*","Android [\\d\\.]*","Macintosh.","Ubuntu","Linux","[ ]Intel","Mac OS X [\\d_]*","(like )?Gecko(.[\\d\\.]*)?","KHTML,","CriOS.[\\d\\.]*","CPU iPhone OS ([0-9_])* like Mac OS X","CPU OS ([0-9_])* like Mac OS X","iPod","compatible","x86_..","i686","x64","X11","rv:[\\d\\.]*","Version.[\\d\\.]*","WOW64","Win64","Dalvik.[\\d\\.]*"," \\.NET CLR [\\d\\.]*","Presto.[\\d\\.]*","Media Center PC","BlackBerry","Build","Opera Mini\\\/\\d{1,2}\\.\\d{1,2}\\.[\\d\\.]*\\\/\\d{1,2}\\.","Opera"," \\.NET[\\d\\.]*","cubot","; M bot","; CRONO","; B bot","; IDbot","; ID bot","; POWER BOT","OCTOPUS-CORE","htc_botdugls","super\\\/\\d+\\\/Android\\\/\\d+"]
\ No newline at end of file
+["Safari.[\\d\\.]*","Firefox.[\\d\\.]*"," Chrome.[\\d\\.]*","Chromium.[\\d\\.]*","MSIE.[\\d\\.]","Opera\\\/[\\d\\.]*","Mozilla.[\\d\\.]*","AppleWebKit.[\\d\\.]*","Trident.[\\d\\.]*","Windows NT.[\\d\\.]*","Android [\\d\\.]*","Macintosh.","Ubuntu","Linux","[ ]Intel","Mac OS X [\\d_]*","(like )?Gecko(.[\\d\\.]*)?","KHTML,","CriOS.[\\d\\.]*","CPU iPhone OS ([0-9_])* like Mac OS X","CPU OS ([0-9_])* like Mac OS X","iPod","compatible","x86_..","i686","x64","X11","rv:[\\d\\.]*","Version.[\\d\\.]*","WOW64","Win64","Dalvik.[\\d\\.]*"," \\.NET CLR [\\d\\.]*","Presto.[\\d\\.]*","Media Center PC","BlackBerry","Build","Opera Mini\\\/\\d{1,2}\\.\\d{1,2}\\.[\\d\\.]*\\\/\\d{1,2}\\.","Opera"," \\.NET[\\d\\.]*","cubot","; M bot","; CRONO","; B bot","; IDbot","; ID bot","; POWER BOT",";"]
\ No newline at end of file
diff --git a/blockbot/vendor/jaybizzle/crawler-detect/raw/Exclusions.txt b/blockbot/vendor/jaybizzle/crawler-detect/raw/Exclusions.txt
index a44a99cb..da56db9b 100644
--- a/blockbot/vendor/jaybizzle/crawler-detect/raw/Exclusions.txt
+++ b/blockbot/vendor/jaybizzle/crawler-detect/raw/Exclusions.txt
@@ -45,6 +45,4 @@ cubot
 ; IDbot
 ; ID bot
 ; POWER BOT
-OCTOPUS-CORE
-htc_botdugls
-super\/\d+\/Android\/\d+
\ No newline at end of file
+;
\ No newline at end of file
diff --git a/blockbot/vendor/jaybizzle/crawler-detect/src/CrawlerDetect.php b/blockbot/vendor/jaybizzle/crawler-detect/src/CrawlerDetect.php
index 3ea284a7..1067976b 100644
--- a/blockbot/vendor/jaybizzle/crawler-detect/src/CrawlerDetect.php
+++ b/blockbot/vendor/jaybizzle/crawler-detect/src/CrawlerDetect.php
@@ -20,9 +20,9 @@ class CrawlerDetect
     /**
      * The user agent.
      *
-     * @var string|null
+     * @var null
      */
-    protected $userAgent;
+    protected $userAgent = null;
 
     /**
      * Headers that contain a user agent.
@@ -93,7 +93,7 @@ class CrawlerDetect
      * Compile the regex patterns into one regex string.
      *
      * @param array
-     *
+     * 
      * @return string
      */
     public function compileRegex($patterns)
@@ -138,7 +138,7 @@ class CrawlerDetect
     /**
      * Set the user agent.
      *
-     * @param string|null $userAgent
+     * @param string $userAgent
      */
     public function setUserAgent($userAgent)
     {
@@ -165,14 +165,20 @@ class CrawlerDetect
         $agent = trim(preg_replace(
             "/{$this->compiledExclusions}/i",
             '',
-            $userAgent ?: $this->userAgent ?: ''
+            $userAgent ?: $this->userAgent
         ));
 
-        if ($agent === '') {
+        if ($agent == '') {
             return false;
         }
 
-        return (bool) preg_match("/{$this->compiledRegex}/i", $agent, $this->matches);
+        $result = preg_match("/{$this->compiledRegex}/i", $agent, $matches);
+
+        if ($matches) {
+            $this->matches = $matches;
+        }
+
+        return (bool) $result;
     }
 
     /**
@@ -184,13 +190,4 @@ class CrawlerDetect
     {
         return isset($this->matches[0]) ? $this->matches[0] : null;
     }
-
-
-    /**
-     * @return string|null
-     */
-    public function getUserAgent()
-    {
-        return $this->userAgent;
-    }
 }
diff --git a/blockbot/vendor/jaybizzle/crawler-detect/src/Fixtures/AbstractProvider.php b/blockbot/vendor/jaybizzle/crawler-detect/src/Fixtures/AbstractProvider.php
index ffe10f51..26ea8e5f 100644
--- a/blockbot/vendor/jaybizzle/crawler-detect/src/Fixtures/AbstractProvider.php
+++ b/blockbot/vendor/jaybizzle/crawler-detect/src/Fixtures/AbstractProvider.php
@@ -15,14 +15,14 @@ abstract class AbstractProvider
 {
     /**
      * The data set.
-     *
+     * 
      * @var array
      */
     protected $data;
 
     /**
      * Return the data set.
-     *
+     * 
      * @return array
      */
     public function getAll()
diff --git a/blockbot/vendor/jaybizzle/crawler-detect/src/Fixtures/Crawlers.php b/blockbot/vendor/jaybizzle/crawler-detect/src/Fixtures/Crawlers.php
index a44edd23..a9070565 100644
--- a/blockbot/vendor/jaybizzle/crawler-detect/src/Fixtures/Crawlers.php
+++ b/blockbot/vendor/jaybizzle/crawler-detect/src/Fixtures/Crawlers.php
@@ -19,49 +19,30 @@ class Crawlers extends AbstractProvider
      * @var array
      */
     protected $data = array(
+        '.*Java.*outbrain',
         ' YLT',
-        '^Aether',
-        '^Amazon Simple Notification Service Agent$',
-        '^Amazon-Route53-Health-Check-Service',
         '^b0t$',
         '^bluefish ',
         '^Calypso v\/',
         '^COMODO DCV',
-        '^Corax',
         '^DangDang',
         '^DavClnt',
-        '^DHSH',
-        '^docker\/[0-9]',
-        '^Expanse',
         '^FDM ',
         '^git\/',
         '^Goose\/',
         '^Grabber',
-        '^Gradle\/',
         '^HTTPClient\/',
-        '^HTTPing',
         '^Java\/',
         '^Jeode\/',
         '^Jetty\/',
         '^Mail\/',
         '^Mget',
         '^Microsoft URL Control',
-        '^Mikrotik\/',
-        '^Netlab360',
         '^NG\/[0-9\.]',
         '^NING\/',
-        '^npm\/',
-        '^Nuclei',
-        '^PHP-AYMAPI\/',
-        '^PHP\/',
-        '^pip\/',
-        '^pnpm\/',
+        '^PHP\/[0-9]',
         '^RMA\/',
         '^Ruby|Ruby\/[0-9]',
-        '^Swurl ',
-        '^TLS tester ',
-        '^twine\/',
-        '^ureq',
         '^VSE\/[0-9]',
         '^WordPress\.com',
         '^XRL\/[0-9]',
@@ -69,18 +50,17 @@ class Crawlers extends AbstractProvider
         '008\/',
         '13TABS',
         '192\.comAgent',
-        '2GDPR\/',
         '2ip\.ru',
         '404enemy',
         '7Siters',
         '80legs',
+        'a\.pr-cy\.ru',
         'a3logics\.in',
         'A6-Indexer',
         'Abonti',
         'Aboundex',
         'aboutthedomain',
         'Accoona-AI-Agent',
-        'acebookexternalhit\/',
         'acoon',
         'acrylicapps\.com\/pulp',
         'Acunetix',
@@ -90,14 +70,8 @@ class Crawlers extends AbstractProvider
         'ADmantX',
         'AdminLabs',
         'adressendeutschland',
-        'adreview\/',
         'adscanner',
-        'adstxt-worker',
         'Adstxtaggregator',
-        'adstxt\.com',
-        'Adyen HttpClient',
-        'AffiliateLabz\/',
-        'affilimate-puppeteer',
         'agentslug',
         'AHC',
         'aihit',
@@ -118,23 +92,20 @@ class Crawlers extends AbstractProvider
         'Anemone',
         'AngleSharp',
         'annotate_google',
-        'Anthill',
-        'Anturis Agent',
         'Ant\.com',
+        'Anturis Agent',
         'AnyEvent-HTTP\/',
-        'Apache Ant\/',
         'Apache Droid',
         'Apache OpenOffice',
         'Apache-HttpAsyncClient',
         'Apache-HttpClient',
         'ApacheBench',
         'Apexoo',
-        'apimon\.de',
         'APIs-Google',
         'AportWorm\/',
         'AppBeat\/',
         'AppEngine-Google',
-        'AppleSyndication',
+        'AppStoreScraperZ',
         'Aprc\/[0-9]',
         'Arachmo',
         'arachnode',
@@ -142,28 +113,21 @@ class Crawlers extends AbstractProvider
         'aria2',
         'Arukereso',
         'asafaweb',
-        'Asana\/',
-        'Ask Jeeves',
         'AskQuickly',
+        'Ask Jeeves',
         'ASPSeek',
         'Asterias',
         'Astute',
         'asynchttp',
         'Attach',
-        'attohttpc',
         'autocite',
-        'AutomaticWPTester',
         'Autonomy',
-        'awin\.com',
-        'AWS Security Scanner',
         'axios\/',
-        'a\.pr-cy\.ru',
         'B-l-i-t-z-B-O-T',
         'Backlink-Ceck',
         'backlink-check',
         'BacklinkHttpStatus',
         'BackStreet',
-        'BackupLand',
         'BackWeb',
         'Bad-Neighborhood',
         'Badass',
@@ -178,7 +142,6 @@ class Crawlers extends AbstractProvider
         'BCKLINKS',
         'BDFetch',
         'BegunAdvertising',
-        'Bewica-security-scan',
         'Bidtellect',
         'BigBozz',
         'Bigfoot',
@@ -188,14 +151,11 @@ class Crawlers extends AbstractProvider
         'binlar',
         'biNu image cacher',
         'Bitacle',
-        'Bitrix link preview',
         'biz_Directory',
-        'BKCTwitterUnshortener\/',
         'Black Hole',
         'Blackboard Safeassign',
         'BlackWidow',
         'BlockNote\.Net',
-        'BlogBridge',
         'Bloglines',
         'Bloglovin',
         'BlogPulseLive',
@@ -203,7 +163,6 @@ class Crawlers extends AbstractProvider
         'Blogtrottr',
         'BlowFish',
         'boitho\.com-dc',
-        'Boost\.Beast',
         'BPImageWalker',
         'Braintree-Webhooks',
         'Branch Metrics API',
@@ -231,15 +190,12 @@ class Crawlers extends AbstractProvider
         'CC Metadata Scaper',
         'Cegbfeieh',
         'censys',
-        'centuryb.o.t9[at]gmail.com',
         'Cerberian Drtrs',
         'CERT\.at-Statistics-Survey',
-        'cf-facebook',
         'cg-eye',
         'changedetection',
         'ChangesMeter',
         'Charlotte',
-        'chatterino-api-cache',
         'CheckHost',
         'checkprivacy',
         'CherryPicker',
@@ -250,7 +206,6 @@ class Crawlers extends AbstractProvider
         'Chromaxa',
         'CirrusExplorer',
         'CISPA Vulnerability Notification',
-        'CISPA Web Analyser',
         'Citoid',
         'CJNetworkQuality',
         'Clarsentia',
@@ -258,34 +213,27 @@ class Crawlers extends AbstractProvider
         'Cloud mapping',
         'CloudEndure',
         'CloudFlare-AlwaysOnline',
-        'Cloudflare-Healthchecks',
         'Cloudinary',
         'cmcm\.com',
         'coccoc',
         'cognitiveseo',
-        'ColdFusion',
         'colly -',
         'CommaFeed',
         'Commons-HttpClient',
         'commonscan',
         'contactbigdatafr',
         'contentkingapp',
-        'Contextual Code Sites Explorer',
         'convera',
         'CookieReports',
         'copyright sheriff',
         'CopyRightCheck',
         'Copyscape',
-        'cortex\/',
         'Cosmos4j\.feedback',
         'Covario-IDS',
-        'Craw\/',
         'Crescent',
-        'Criteo',
         'Crowsnest',
+        'Criteo',
         'CSHttp',
-        'CSSCheck',
-        'Cula\/',
         'curb',
         'Curious George',
         'curl',
@@ -295,17 +243,12 @@ class Crawlers extends AbstractProvider
         'DareBoost',
         'DatabaseDriverMysqli',
         'DataCha0s',
-        'DatadogSynthetics',
         'Datafeedwatch',
         'Datanyze',
         'DataparkSearch',
         'dataprovider',
         'DataXu',
         'Daum(oa)?[ \/][0-9]',
-        'dBpoweramp',
-        'ddline',
-        'deeris',
-        'delve\.ai',
         'Demon',
         'DeuSu',
         'developers\.google\.com\/\+\/web\/snippet\/',
@@ -315,8 +258,8 @@ class Crawlers extends AbstractProvider
         'DigitalPebble',
         'Dirbuster',
         'Discourse Forum Onebox',
-        'Dispatch\/',
         'Disqus\/',
+        'Dispatch\/',
         'DittoSpyder',
         'dlvr',
         'DMBrowser',
@@ -324,8 +267,6 @@ class Crawlers extends AbstractProvider
         'docoloc',
         'Dolphin http client',
         'DomainAppender',
-        'DomainLabz',
-        'Domains Project\/',
         'Donuts Content Explorer',
         'dotMailer content retrieval',
         'dotSemantic',
@@ -338,8 +279,6 @@ class Crawlers extends AbstractProvider
         'Drupal \(\+http:\/\/drupal\.org\/\)',
         'DTS Agent',
         'dubaiindex',
-        'DuplexWeb-Google',
-        'DynatraceSynthetic',
         'EARTHCOM',
         'Easy-Thumb',
         'EasyDL',
@@ -370,22 +309,20 @@ class Crawlers extends AbstractProvider
         'ExaleadCloudview',
         'Excel\/',
         'exif',
-        'ExoRank',
         'Exploratodo',
         'Express WebPictures',
         'Extreme Picture Finder',
         'EyeNetIE',
         'ezooms',
         'facebookexternalhit',
-        'facebookexternalua',
         'facebookplatform',
         'fairshare',
         'Faraday v',
         'fasthttp',
         'Faveeo',
         'Favicon downloader',
-        'faviconarchive',
         'faviconkit',
+        'faviconarchive',
         'FavOrg',
         'Feed Wrangler',
         'Feedable\/',
@@ -397,9 +334,7 @@ class Crawlers extends AbstractProvider
         'feeder',
         'Feedly',
         'FeedshowOnline',
-        'Feedshow\/',
         'Feedspot',
-        'FeedViewer\/',
         'Feedwind\/',
         'FeedZcollector',
         'feeltiptop',
@@ -407,8 +342,6 @@ class Crawlers extends AbstractProvider
         'Fetch\/[0-9]',
         'Fever\/[0-9]',
         'FHscan',
-        'Fiery%20Feeds',
-        'Filestack',
         'Fimap',
         'findlink',
         'findthatfile',
@@ -417,24 +350,18 @@ class Crawlers extends AbstractProvider
         'FlipboardProxy',
         'FlipboardRSS',
         'Flock\/',
-        'Florienzh\/',
         'fluffy',
         'Flunky',
         'flynxapp',
         'forensiq',
-        'ForusP',
         'FoundSeoTool',
-        'fragFINN\.de',
+        'http:\/\/www.neomo.de\/', //'Francis [Bot]'
         'free thumbnails',
         'Freeuploader',
-        'FreshRSS',
-        'frontman',
         'Funnelback',
-        'Fuzz Faster U Fool',
         'G-i-g-a-b-o-t',
         'g00g1e\.net',
         'ganarvisitas',
-        'gdnplus\.com',
         'geek-tools',
         'Genieo',
         'GentleSource',
@@ -446,24 +373,18 @@ class Crawlers extends AbstractProvider
         'getroot',
         'GetURLInfo\/',
         'GetWeb',
-        'Geziyor',
         'Ghost Inspector',
         'GigablastOpenSource',
         'GIS-LABS',
         'github-camo',
-        'GitHub-Hookshot',
         'github\.com',
-        'Go http package',
         'Go [\d\.]* package http',
-        'Go!Zilla',
+        'Go http package',
         'Go-Ahead-Got-It',
         'Go-http-client',
-        'go-mtasts\/',
-        'gobuster',
+        'Go!Zilla',
         'gobyus',
-        'Gofeed',
         'gofetch',
-        'Goldfire Server',
         'GomezAgent',
         'gooblog',
         'Goodzer\/',
@@ -476,31 +397,24 @@ class Crawlers extends AbstractProvider
         'Google PP Default',
         'Google Search Console',
         'Google Web Preview',
-        'Google-Ads-Creatives-Assistant',
-        'Google-Ads-Overview',
         'Google-Adwords',
         'Google-Apps-Script',
         'Google-Calendar-Importer',
         'Google-HotelAdsVerifier',
         'Google-HTTP-Java-Client',
-        'Google-InspectionTool',
-        'Google-Podcast',
         'Google-Publisher-Plugin',
-        'Google-Read-Aloud',
         'Google-SearchByImage',
         'Google-Site-Verification',
-        'Google-SMTP-STS',
-        'Google-speakr',
         'Google-Structured-Data-Testing-Tool',
-        'Google-Transparency-Report',
-        'google-xrawler',
         'Google-Youtube-Links',
+        'google-xrawler',
         'GoogleDocs',
         'GoogleHC\/',
-        'GoogleProber',
         'GoogleProducer',
         'GoogleSites',
+        'Google-Transparency-Report',
         'Gookey',
+        'GoScraper',
         'GoSpotCheck',
         'gosquared-thumbnailer',
         'Gotit',
@@ -526,16 +440,13 @@ class Crawlers extends AbstractProvider
         'hackney\/',
         'Hadi Agent',
         'HappyApps-WebCheck',
-        'Hardenize',
         'Hatena',
         'Havij',
-        'HaxerMen',
         'HeadlessChrome',
         'HEADMasterSEO',
         'HeartRails_Capture',
         'help@dataminr\.com',
         'heritrix',
-        'Hexometer',
         'historious',
         'hkedcity',
         'hledejLevne\.cz',
@@ -552,31 +463,28 @@ class Crawlers extends AbstractProvider
         'HTMLparser',
         'htmlyse',
         'HTTP Banner Detection',
+        'HTTP_Compression_Test',
+        'http_request2',
+        'http_requester',
         'http-get',
         'HTTP-Header-Abfrage',
         'http-kit',
         'http-request\/',
         'HTTP-Tiny',
         'HTTP::Lite',
-        'http:\/\/www.neomo.de\/', //'Francis [Bot]'
+        'http\.rb\/',
+        'http_get',
         'HttpComponents',
         'httphr',
-        'HTTPie',
         'HTTPMon',
         'httpRequest',
         'httpscheck',
         'httpssites_power',
         'httpunit',
         'HttpUrlConnection',
-        'http\.rb\/',
-        'HTTP_Compression_Test',
-        'http_get',
-        'http_request2',
-        'http_requester',
         'httrack',
         'huaweisymantec',
         'HubSpot ',
-        'HubSpot-Link-Resolver',
         'Humanlinks',
         'i2kconnect\/',
         'Iblog',
@@ -587,7 +495,6 @@ class Crawlers extends AbstractProvider
         'IDwhois\/',
         'Iframely',
         'igdeSpyder',
-        'iGooglePortal',
         'IlTrovatore',
         'Image Fetch',
         'Image Sucker',
@@ -612,15 +519,13 @@ class Crawlers extends AbstractProvider
         'integromedb',
         'Intelliseek',
         'InterGET',
+        'internet_archive',
         'Internet Ninja',
         'InternetSeer',
         'internetVista monitor',
-        'internetwache',
-        'internet_archive',
         'intraVnews',
         'IODC',
         'IOI',
-        'Inboxb0t',
         'iplabel',
         'ips-agent',
         'IPS\/[0-9]',
@@ -632,13 +537,10 @@ class Crawlers extends AbstractProvider
         'iskanie',
         'isUp\.li',
         'iThemes Sync\/',
-        'IZaBEE',
         'iZSearch',
         'JAHHO',
         'janforman',
         'Jaunt\/',
-        'Java.*outbrain',
-        'javelin\.io',
         'Jbrofuzz',
         'Jersey\/',
         'JetCar',
@@ -654,7 +556,6 @@ class Crawlers extends AbstractProvider
         'Joomla',
         'Jorgee',
         'JS-Kit',
-        'JungleKeyThumbnail',
         'JustView',
         'Kaspersky Lab CFR link resolver',
         'Kelny\/',
@@ -662,7 +563,6 @@ class Crawlers extends AbstractProvider
         'KeyCDN',
         'Keyword Density',
         'Keywords Research',
-        'khttp\/',
         'KickFire',
         'KimonoLabs\/',
         'Kml-Google',
@@ -670,12 +570,11 @@ class Crawlers extends AbstractProvider
         'KOCMOHABT',
         'kouio',
         'kube-probe',
-        'kubectl',
         'kulturarw3',
         'KumKie',
+        'L\.webis',
         'Larbin',
         'Lavf\/',
-        'leakix\.net',
         'LeechFTP',
         'LeechGet',
         'letsencrypt',
@@ -686,50 +585,41 @@ class Crawlers extends AbstractProvider
         'libwww',
         'Licorne',
         'Liferea\/',
-        'Lighthouse',
         'Lightspeedsystems',
+        'Lighthouse',
         'Likse',
-        'limber\.io',
         'Link Valet',
+        'link_thumbnailer',
         'LinkAlarm\/',
-        'LinkAnalyser',
         'linkCheck',
         'linkdex',
         'LinkExaminer',
         'linkfluence',
         'linkpeek',
-        'LinkPreview',
+        'LinkPreviewGenerator',
         'LinkScan',
         'LinksManager',
         'LinkTiger',
         'LinkWalker',
-        'link_thumbnailer',
         'Lipperhey',
         'Litemage_walker',
         'livedoor ScreenShot',
         'LoadImpactRload',
         'localsearch-web',
         'LongURL API',
-        'longurl-r-package',
-        'looid\.com',
         'looksystems\.net',
         'ltx71',
         'lua-resty-http',
-        'Lucee \(CFML Engine\)',
-        'Lush Http Client',
         'lwp-request',
         'lwp-trivial',
         'LWP::Simple',
         'lycos',
         'LYT\.SR',
-        'L\.webis',
         'mabontland',
-        'MacOutlook\/',
         'Mag-Net',
         'MagpieRSS',
-        'Mail::STS',
-        'MailChimp',
         'Mail\.Ru',
+        'MailChimp',
         'Majestic12',
         'makecontact\/',
         'Mandrill',
@@ -740,8 +630,6 @@ class Crawlers extends AbstractProvider
         'Mass Downloader',
         'masscan\/',
         'Mata Hari',
-        'mattermost',
-        'Mediametric',
         'Mediapartners-Google',
         'mediawords',
         'MegaIndex\.ru',
@@ -752,31 +640,28 @@ class Crawlers extends AbstractProvider
         'MetaURI',
         'MFC_Tear_Sample',
         'Microsearch',
-        'Microsoft Data Access',
-        'Microsoft Office',
+        'Microsoft Office ',
         'Microsoft Outlook',
         'Microsoft Windows Network Diagnostics',
         'Microsoft-WebDAV-MiniRedir',
-        'Microsoft\.Data\.Mashup',
+        'Microsoft Data Access',
         'MIDown tool',
         'MIIxpc',
         'Mindjet',
         'Miniature\.io',
         'Miniflux',
-        'mio_httpc',
-        'Miro-HttpClient',
         'Mister PiX',
         'mixdata dot com',
         'mixed-content-scan',
+        'Mixmax-LinkPreview',
         'mixnode',
         'Mnogosearch',
         'mogimogi',
         'Mojeek',
         'Mojolicious \(Perl\)',
-        'Mollie',
+        'Monit\/',
         'monitis',
         'Monitority\/',
-        'Monit\/',
         'montastic',
         'MonTools',
         'Moreover',
@@ -785,7 +670,6 @@ class Crawlers extends AbstractProvider
         'MovableType',
         'mowser',
         'Mrcgiguy',
-        'Mr\.4x3 Powered',
         'MS Web Services Client Protocol',
         'MSFrontPage',
         'mShots',
@@ -793,13 +677,10 @@ class Crawlers extends AbstractProvider
         'muhstik-scan',
         'MVAClient',
         'MxToolbox\/',
-        'myseosnapshot',
         'nagios',
         'Najdi\.si',
         'Name Intelligence',
-        'NameFo\.com',
         'Nameprotect',
-        'nationalarchives',
         'Navroad',
         'NearSite',
         'Needle',
@@ -814,8 +695,6 @@ class Crawlers extends AbstractProvider
         'netresearch',
         'NetShelter ContentScan',
         'Netsparker',
-        'NetSystemsResearch',
-        'nettle',
         'NetTrack',
         'Netvibes',
         'NetZIP',
@@ -828,26 +707,22 @@ class Crawlers extends AbstractProvider
         'newspaper\/',
         'Nexgate Ruby Client',
         'NG-Search',
-        'nghttp2',
         'Nibbler',
         'NICErsPRO',
-        'NihilScio',
         'Nikto',
         'nineconnections',
         'NLNZ_IAHarvester',
         'Nmap Scripting Engine',
-        'node-fetch',
         'node-superagent',
         'node-urllib',
+        'node\.io',
         'Nodemeter',
         'NodePing',
-        'node\.io',
         'nominet\.org\.uk',
         'nominet\.uk',
         'Norton-Safeweb',
         'Notifixious',
         'notifyninja',
-        'NotionEmbedder',
         'nuhk',
         'nutch',
         'Nuzzel',
@@ -855,45 +730,39 @@ class Crawlers extends AbstractProvider
         'nyawc\/',
         'Nymesis',
         'NYU',
-        'Observatory\/',
         'Ocelli\/',
         'Octopus',
         'oegp',
         'Offline Explorer',
         'Offline Navigator',
-        'OgScrper',
+        'og-scraper',
         'okhttp',
         'omgili',
         'OMSC',
         'Online Domain Tools',
-        'Open Source RSS',
         'OpenCalaisSemanticProxy',
         'Openfind',
         'OpenLinkProfiler',
         'Openstat\/',
         'OpenVAS',
-        'OPPO A33',
         'Optimizer',
         'Orbiter',
         'OrgProbe\/',
         'orion-semantics',
         'Outlook-Express',
         'Outlook-iOS',
-        'Owler',
-        'Owlin',
-        'ownCloud News',
         'ow\.ly',
+        'Owler',
+        'ownCloud News',
         'OxfordCloudService',
-        'page scorer',
         'Page Valet',
+        'page_verifier',
+        'page scorer',
         'page2rss',
-        'PageFreezer',
         'PageGrabber',
         'PagePeeker',
         'PageScorer',
         'Pagespeed\/',
-        'PageThing',
-        'page_verifier',
         'Panopta',
         'panscient',
         'Papa Foto',
@@ -902,7 +771,6 @@ class Crawlers extends AbstractProvider
         'PayPal IPN',
         'pcBrowser',
         'Pcore-HTTP',
-        'PDF24 URL To PDF',
         'Pearltrees',
         'PECL::HTTP',
         'peerindex',
@@ -912,52 +780,44 @@ class Crawlers extends AbstractProvider
         'PhantomJS Screenshoter',
         'PhantomJS\/',
         'Photon\/',
-        'php-requests',
         'phpservermon',
         'Pi-Monster',
         'Picscout',
         'Picsearch',
         'PictureFinder',
         'Pimonster',
+        'ping\.blo\.gs',
         'Pingability',
         'PingAdmin\.Ru',
         'Pingdom',
         'Pingoscope',
         'PingSpot',
-        'ping\.blo\.gs',
         'pinterest\.com',
         'Pixray',
         'Pizilla',
         'Plagger\/',
-        'Pleroma ',
         'Ploetz \+ Zeller',
         'Plukkie',
         'plumanalytics',
         'PocketImageCache',
         'PocketParser',
         'Pockey',
-        'PodcastAddict\/',
         'POE-Component-Client-HTTP',
         'Polymail\/',
         'Pompos',
         'Porkbun',
         'Port Monitor',
         'postano',
-        'postfix-mta-sts-resolver',
         'PostmanRuntime',
-        'postplanner\.com',
         'PostPost',
         'postrank',
         'PowerPoint\/',
-        'Prebid',
-        'Prerender',
         'Priceonomics Analysis Engine',
         'PrintFriendly',
         'PritTorrent',
         'Prlog',
         'probethenet',
-        'Project ?25499',
-        'Project-Resonance',
+        'Project 25499',
         'prospectb2b',
         'Protopage',
         'ProWebWalker',
@@ -966,9 +826,9 @@ class Crawlers extends AbstractProvider
         'pshtt, https scanning',
         'PTST ',
         'PTST\/[0-9]+',
+        'Pulsepoint XT3 web scraper',
         'Pump',
         'Python-httplib2',
-        'python-httpx',
         'python-requests',
         'Python-urllib',
         'Qirina Hurdler',
@@ -978,17 +838,12 @@ class Crawlers extends AbstractProvider
         'Qualidator',
         'QueryN Metasearch',
         'queuedriver',
-        'quic-go-HTTP\/',
-        'QuiteRSS',
         'Quora Link Preview',
         'Qwantify',
         'Radian6',
-        'RadioPublicImageResizer',
-        'Railgun\/',
         'RankActive',
         'RankFlex',
         'RankSonicSiteAuditor',
-        'RapidLoad\/',
         'Re-re Studio',
         'ReactorNetty',
         'Readability',
@@ -999,7 +854,6 @@ class Crawlers extends AbstractProvider
         'RecurPost\/',
         'redback\/',
         'ReederForMac',
-        'Reeder\/',
         'ReGet',
         'RepoMonkey',
         'request\.js',
@@ -1012,44 +866,38 @@ class Crawlers extends AbstractProvider
         'Robozilla',
         'ROI Hunter',
         'RPT-HTTPClient',
-        'RSSMix\/',
         'RSSOwl',
-        'RyowlEngine',
         'safe-agent-scanner',
         'SalesIntelligent',
         'Saleslift',
-        'SAP NetWeaver Application Server',
+        'Sendsay\.Ru',
         'SauceNAO',
         'SBIder',
-        'sc-downloader',
         'scalaj-http',
-        'Scamadviser-Frontend',
-        'ScanAlert',
         'scan\.lol',
+        'ScanAlert',
         'Scoop',
         'scooter',
-        'ScopeContentAG-HTTP-Client',
         'ScoutJet',
         'ScoutURLMonitor',
         'ScrapeBox Page Scanner',
+        'SimpleScraper',
         'Scrapy',
         'Screaming',
         'ScreenShotService',
         'Scrubby',
         'Scrutiny\/',
+        'search\.thunderstone',
         'Search37',
         'searchenginepromotionhelp',
         'Searchestate',
         'SearchExpress',
         'SearchSight',
-        'SearchWP',
-        'search\.thunderstone',
         'Seeker',
         'semanticdiscovery',
         'semanticjuice',
         'Semiocast HTTP client',
         'Semrush',
-        'Sendsay\.Ru',
         'sentry\/',
         'SEO Browser',
         'Seo Servis',
@@ -1058,13 +906,11 @@ class Crawlers extends AbstractProvider
         'Seobility',
         'SEOCentro',
         'SeoCheck',
-        'seocompany',
         'SEOkicks',
-        'SEOlizer',
         'Seomoz',
         'SEOprofiler',
-        'seoscanners',
         'SEOsearch',
+        'seoscanners',
         'seositecheckup',
         'SEOstats',
         'servernfo',
@@ -1075,16 +921,14 @@ class Crawlers extends AbstractProvider
         'Shoppimon',
         'ShopWiki',
         'ShortLinkTranslate',
-        'shortURL lengthener',
         'shrinktheweb',
         'Sideqik',
-        'Siege',
         'SimplePie',
         'SimplyFast',
         'Siphon',
         'SISTRIX',
-        'Site Sucker',
         'Site-Shot\/',
+        'Site Sucker',
         'Site24x7',
         'SiteBar',
         'Sitebeam',
@@ -1105,7 +949,6 @@ class Crawlers extends AbstractProvider
         'sitexy\.com',
         'SkypeUriPreview',
         'Slack\/',
-        'sli-systems\.com',
         'slider\.com',
         'slurp',
         'SlySearch',
@@ -1128,11 +971,9 @@ class Crawlers extends AbstractProvider
         'SpamExperts',
         'Spammen',
         'Spanner',
-        'Spawning-AI',
         'spaziodati',
         'SPDYCheck',
         'Specificfeeds',
-        'SpeedKit',
         'speedy',
         'SPEng',
         'Spinn3r',
@@ -1146,11 +987,9 @@ class Crawlers extends AbstractProvider
         'ssl-tools',
         'StackRambler',
         'Statastico\/',
-        'Statically-',
         'StatusCake',
         'Steeler',
         'Stratagems Kumo',
-        'Stripe\/',
         'Stroke\.cz',
         'StudioFACA',
         'StumbleUpon',
@@ -1160,11 +999,9 @@ class Crawlers extends AbstractProvider
         'SuperHTTP',
         'Surphace Scout',
         'Suzuran',
-        'swcd ',
+        'SwiteScraper',
         'Symfony BrowserKit',
         'Symfony2 BrowserKit',
-        'Synapse\/',
-        'Syndirella\/',
         'SynHttpClient-Built',
         'Sysomos',
         'sysscan',
@@ -1174,8 +1011,6 @@ class Crawlers extends AbstractProvider
         'Tarantula\/',
         'Taringa UGC',
         'TarmotGezgin',
-        'tchelebi\.io',
-        'techiaith\.cymru',
         'Teleport',
         'Telesoft',
         'Telesphoreo',
@@ -1186,15 +1021,13 @@ class Crawlers extends AbstractProvider
         'Test Certificate Info',
         'testuri',
         'Tetrahedron',
-        'TextRazor Downloader',
         'The Drop Reaper',
         'The Expert HTML Source Viewer',
-        'The Intraformant',
         'The Knowledge AI',
+        'The Intraformant',
         'theinternetrules',
         'TheNomad',
         'Thinklab',
-        'Thumbor',
         'Thumbshots',
         'ThumbSniper',
         'timewe\.net',
@@ -1228,11 +1061,9 @@ class Crawlers extends AbstractProvider
         'ubermetrics-technologies',
         'uclassify',
         'UdmSearch',
-        'ultimate_sitemap_parser',
         'unchaos',
         'unirest-java',
         'UniversalFeedParser',
-        'unshortenit',
         'Unshorten\.It',
         'Untiny',
         'UnwindFetchor',
@@ -1240,8 +1071,8 @@ class Crawlers extends AbstractProvider
         'updown\.io daemon',
         'Upflow',
         'Uptimia',
-        'URL Verifier',
         'Urlcheckr',
+        'URL Verifier',
         'URLitor',
         'urlresolver',
         'Urlstat',
@@ -1249,16 +1080,15 @@ class Crawlers extends AbstractProvider
         'UrlTrends Ranking Updater',
         'URLy Warning',
         'URLy\.Warning',
-        'URL\/Emacs',
         'Vacuum',
         'Vagabondo',
         'VB Project',
         'vBSEO',
         'VCI',
         'via ggpht\.com GoogleImageProxy',
+        'VidibleScraper',
         'Virusdie',
         'visionutils',
-        'Visual Rights Group',
         'vkShare',
         'VoidEYE',
         'Voil',
@@ -1269,18 +1099,19 @@ class Crawlers extends AbstractProvider
         'Vulnbusters Meter',
         'VYU2',
         'w3af\.org',
+        'W3C_Unicorn',
         'W3C-checklink',
         'W3C-mobileOK',
-        'W3C_Unicorn',
         'WAC-OFU',
-        'WakeletLinkExpander',
-        'WallpapersHD',
         'Wallpapers\/[0-9]+',
+        'WallpapersHD',
         'wangling',
         'Wappalyzer',
         'WatchMouse',
         'WbSrch\/',
         'WDT\.io',
+        'web-capture\.net',
+        'Web-sniffer',
         'Web Auto',
         'Web Collage',
         'Web Enhancer',
@@ -1288,10 +1119,7 @@ class Crawlers extends AbstractProvider
         'Web Fuck',
         'Web Pix',
         'Web Sauger',
-        'Web spyder',
         'Web Sucker',
-        'web-capture\.net',
-        'Web-sniffer',
         'Webalta',
         'Webauskunft',
         'WebAuto',
@@ -1329,9 +1157,8 @@ class Crawlers extends AbstractProvider
         'Webster',
         'WebStripper',
         'WebSucker',
-        'webtech\/',
-        'WebThumbnail',
         'Webthumb\/',
+        'WebThumbnail',
         'WebWhacker',
         'WebZIP',
         'WeLikeLinks',
@@ -1340,31 +1167,24 @@ class Crawlers extends AbstractProvider
         'wf84',
         'Wfuzz\/',
         'wget',
-        'WhatCMS',
         'WhatsApp',
         'WhatsMyIP',
         'WhatWeb',
         'WhereGoes\?',
         'Whibse',
-        'WhoAPI\/',
         'WhoRunsCoinHive',
         'Whynder Magnet',
         'Windows-RSS-Platform',
-        'WinHttp-Autoproxy-Service',
-        'WinHTTP\/',
         'WinPodder',
         'wkhtmlto',
         'wmtips',
         'Woko',
-        'Wolfram HTTPClient',
         'woorankreview',
+        'Word\/',
         'WordPress\/',
         'WordupinfoSearch',
-        'Word\/',
-        'worldping-api',
         'wotbox',
         'WP Engine Install Performance API',
-        'WP Rocket',
         'wpif',
         'wprecon\.com survey',
         'WPScan',
@@ -1374,21 +1194,20 @@ class Crawlers extends AbstractProvider
         'WWW-Mechanize',
         'WWW::Document',
         'WWW::Mechanize',
-        'WWWOFFLE',
         'www\.monitor\.us',
+        'WWWOFFLE',
         'x09Mozilla',
         'x22Mozilla',
         'XaxisSemanticsClassifier',
-        'XenForo\/',
         'Xenu Link Sleuth',
         'XING-contenttabreceiver',
         'xpymep([0-9]?)\.exe',
-        'Y!J-[A-Z][A-Z][A-Z]',
+        'Y!J-(ASR|BSC)',
+        'Y\!J-BRW',
         'Yaanb',
         'yacy',
         'Yahoo Link Preview',
         'YahooCacheSystem',
-        'YahooMailProxy',
         'YahooYSMcm',
         'YandeG',
         'Yandex(?!Search)',
@@ -1396,7 +1215,6 @@ class Crawlers extends AbstractProvider
         'yeti',
         'Yo-yo',
         'Yoleo Consumer',
-        'yomins\.com',
         'yoogliFetchAgent',
         'YottaaMonitor',
         'Your-Website-Sucks',
@@ -1408,17 +1226,15 @@ class Crawlers extends AbstractProvider
         'Zao',
         'Zauba',
         'Zemanta Aggregator',
-        'Zend\\\\Http\\\\Client',
         'Zend_Http_Client',
+        'Zend\\\\Http\\\\Client',
         'Zermelo',
         'Zeus ',
         'zgrab',
         'ZnajdzFoto',
-        'ZnHTTP',
         'Zombie\.js',
         'Zoom\.Mac',
-        'ZoteroTranslationServer',
         'ZyBorg',
-        '[a-z0-9\-_]*(bot|crawl|archiver|transcoder|spider|uptime|validator|fetcher|cron|checker|reader|extractor|monitoring|analyzer|scraper)',
+        '[a-z0-9\-_]*(bot|crawl|archiver|transcoder|spider|uptime|validator|fetcher|cron|checker|reader|extractor|monitoring|analyzer)',
     );
 }
diff --git a/blockbot/vendor/jaybizzle/crawler-detect/src/Fixtures/Exclusions.php b/blockbot/vendor/jaybizzle/crawler-detect/src/Fixtures/Exclusions.php
index 62745572..e6b3ca89 100644
--- a/blockbot/vendor/jaybizzle/crawler-detect/src/Fixtures/Exclusions.php
+++ b/blockbot/vendor/jaybizzle/crawler-detect/src/Fixtures/Exclusions.php
@@ -67,8 +67,6 @@ class Exclusions extends AbstractProvider
         '; IDbot',
         '; ID bot',
         '; POWER BOT',
-        'OCTOPUS-CORE',
-        'htc_botdugls',
-        'super\/\d+\/Android\/\d+',
+        ';', // Remove the following characters ;
     );
 }
diff --git a/blockem/blockem.css b/blockem/blockem.css
new file mode 100644
index 00000000..265b6ba8
--- /dev/null
+++ b/blockem/blockem.css
@@ -0,0 +1,18 @@
+
+#blockem-label {
+	float: left;
+	width: 300px;
+	margin-top: 10px;
+}
+
+#blockem-words {
+	float: left;
+	margin-top: 10px;
+	width: 400px;
+	height: 150px;
+}
+
+#blockem-submit {
+	margin-top: 15px;
+}
+
diff --git a/blockem/blockem.php b/blockem/blockem.php
new file mode 100644
index 00000000..e0c0a74a
--- /dev/null
+++ b/blockem/blockem.php
@@ -0,0 +1,247 @@
+<?php
+/**
+ * Name: blockem
+ * Description: Allows users to hide content by collapsing posts and replies.
+ * Version: 1.0
+ * Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
+ * Author: Roland Haeder <https://f.haeder.net/roland>
+ */
+
+use Friendica\App;
+use Friendica\Core\Hook;
+use Friendica\Core\L10n;
+use Friendica\Core\PConfig;
+use Friendica\Util\Strings;
+
+function blockem_install()
+{
+	Hook::register('prepare_body_content_filter', 'addon/blockem/blockem.php', 'blockem_prepare_body_content_filter');
+	Hook::register('display_item'               , 'addon/blockem/blockem.php', 'blockem_display_item');
+	Hook::register('addon_settings'             , 'addon/blockem/blockem.php', 'blockem_addon_settings');
+	Hook::register('addon_settings_post'        , 'addon/blockem/blockem.php', 'blockem_addon_settings_post');
+	Hook::register('conversation_start'         , 'addon/blockem/blockem.php', 'blockem_conversation_start');
+	Hook::register('item_photo_menu'            , 'addon/blockem/blockem.php', 'blockem_item_photo_menu');
+	Hook::register('enotify_store'              , 'addon/blockem/blockem.php', 'blockem_enotify_store');
+}
+
+function blockem_uninstall()
+{
+	Hook::unregister('prepare_body_content_filter', 'addon/blockem/blockem.php', 'blockem_prepare_body_content_filter');
+	Hook::unregister('prepare_body'               , 'addon/blockem/blockem.php', 'blockem_prepare_body');
+	Hook::unregister('display_item'               , 'addon/blockem/blockem.php', 'blockem_display_item');
+	Hook::unregister('addon_settings'             , 'addon/blockem/blockem.php', 'blockem_addon_settings');
+	Hook::unregister('addon_settings_post'        , 'addon/blockem/blockem.php', 'blockem_addon_settings_post');
+	Hook::unregister('conversation_start'         , 'addon/blockem/blockem.php', 'blockem_conversation_start');
+	Hook::unregister('item_photo_menu'            , 'addon/blockem/blockem.php', 'blockem_item_photo_menu');
+	Hook::unregister('enotify_store'              , 'addon/blockem/blockem.php', 'blockem_enotify_store');
+}
+
+function blockem_addon_settings (App $a, &$s)
+{
+	if (!local_user()) {
+		return;
+	}
+
+	/* Add our stylesheet to the page so we can make our settings look nice */
+	$a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->getBaseURL() . '/addon/blockem/blockem.css' . '" media="all" />' . "\r\n";
+
+	$words = PConfig::get(local_user(), 'blockem', 'words');
+
+	if (!$words) {
+		$words = '';
+	}
+
+	$s .= '<span id="settings_blockem_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_blockem_expanded\'); openClose(\'settings_blockem_inflated\');">';
+	$s .= '<h3>' . L10n::t('Blockem') . '</h3>';
+	$s .= '</span>';
+	$s .= '<div id="settings_blockem_expanded" class="settings-block" style="display: none;">';
+	$s .= '<span class="fakelink" onclick="openClose(\'settings_blockem_expanded\'); openClose(\'settings_blockem_inflated\');">';
+	$s .= '<h3>' . L10n::t('Blockem') . '</h3>';
+	$s .= '</span>';
+
+	$s .= '<div id="blockem-wrapper">';
+	$s .= '<div id="blockem-desc">'. L10n::t("Hides user's content by collapsing posts. Also replaces their avatar with generic image.") . ' </div>';
+	$s .= '<label id="blockem-label" for="blockem-words">' . L10n::t('Comma separated profile URLS:') . ' </label>';
+	$s .= '<textarea id="blockem-words" type="text" name="blockem-words" >' . htmlspecialchars($words) . '</textarea>';
+	$s .= '</div><div class="clear"></div>';
+
+	$s .= '<div class="settings-submit-wrapper" ><input type="submit" id="blockem-submit" name="blockem-submit" class="settings-submit" value="' . L10n::t('Save Settings') . '" /></div></div>';
+
+	return;
+
+}
+
+function blockem_addon_settings_post(App $a, array &$b)
+{
+	if (!local_user()) {
+		return;
+	}
+
+	if (!empty($_POST['blockem-submit'])) {
+		PConfig::set(local_user(), 'blockem', 'words', trim($_POST['blockem-words']));
+		info(L10n::t('BLOCKEM Settings saved.') . EOL);
+	}
+}
+
+function blockem_enotify_store(App $a, array &$b)
+{
+	$words = PConfig::get($b['uid'], 'blockem', 'words');
+
+	if ($words) {
+		$arr = explode(',', $words);
+	} else {
+		return;
+	}
+
+	$found = false;
+
+	if (count($arr)) {
+		foreach ($arr as $word) {
+			if (!strlen(trim($word))) {
+				continue;
+			}
+
+			if (Strings::compareLink($b['url'], $word)) {
+				$found = true;
+				break;
+			}
+		}
+	}
+
+	if ($found) {
+		$b['abort'] = true;
+	}
+}
+
+function blockem_prepare_body_content_filter(App $a, array &$hook_data)
+{
+	if (!local_user()) {
+		return;
+	}
+
+	$profiles_string = null;
+
+	if (local_user()) {
+		$profiles_string = PConfig::get(local_user(), 'blockem', 'words');
+	}
+
+	if ($profiles_string) {
+		$profiles_array = explode(',', $profiles_string);
+	} else {
+		return;
+	}
+
+	$found = false;
+
+	foreach ($profiles_array as $word) {
+		if (Strings::compareLink($hook_data['item']['author-link'], trim($word))) {
+			$found = true;
+			break;
+		}
+	}
+
+	if ($found) {
+		$hook_data['filter_reasons'][] = L10n::t('Filtered user: %s', $hook_data['item']['author-name']);
+	}
+}
+
+function blockem_display_item(App $a, array &$b = null)
+{
+	if (!empty($b['output']['body']) && strstr($b['output']['body'], 'id="blockem-wrap-')) {
+		$b['output']['thumb'] = $a->getBaseURL() . "/images/person-80.jpg";
+	}
+}
+
+function blockem_conversation_start(App $a, array &$b)
+{
+	if (!local_user()) {
+		return;
+	}
+
+	$words = PConfig::get(local_user(), 'blockem', 'words');
+
+	if ($words) {
+		$a->data['blockem'] = explode(',', $words);
+	}
+
+	$a->page['htmlhead'] .= <<< EOT
+
+<script>
+function blockemBlock(author) {
+	$.get('blockem?block=' +author, function(data) {
+		location.reload(true);
+	});
+}
+function blockemUnblock(author) {
+	$.get('blockem?unblock=' +author, function(data) {
+		location.reload(true);
+	});
+}
+</script>
+
+EOT;
+}
+
+function blockem_item_photo_menu(App $a, array &$b)
+{
+	if (!local_user() || $b['item']['self']) {
+		return;
+	}
+
+	$blocked = false;
+	$author = $b['item']['author-link'];
+
+	if (!empty($a->data['blockem'])) {
+		foreach($a->data['blockem'] as $bloke) {
+			if (Strings::compareLink($bloke,$author)) {
+				$blocked = true;
+				break;
+			}
+		}
+	}
+	if ($blocked) {
+		$b['menu'][L10n::t('Unblock Author')] = 'javascript:blockemUnblock(\'' . $author . '\');';
+	} else {
+		$b['menu'][L10n::t('Block Author')] = 'javascript:blockemBlock(\'' . $author . '\');';
+	}
+}
+
+function blockem_module()
+{
+}
+
+function blockem_init(App $a)
+{
+	if (!local_user()) {
+		return;
+	}
+
+	$words = PConfig::get(local_user(), 'blockem', 'words');
+
+	if (array_key_exists('block', $_GET) && $_GET['block']) {
+		if (strlen($words)) {
+			$words .= ',';
+		}
+
+		$words .= trim($_GET['block']);
+	}
+
+	if (array_key_exists('unblock', $_GET) && $_GET['unblock']) {
+		$arr = explode(',',$words);
+		$newarr = [];
+
+		if (count($arr)) {
+			foreach ($arr as $x) {
+				if (!Strings::compareLink(trim($x), trim($_GET['unblock']))) {
+					$newarr[] = $x;
+				}
+			}
+		}
+
+		$words = implode(',', $newarr);
+	}
+
+	PConfig::set(local_user(), 'blockem', 'words', $words);
+	info(L10n::t('blockem settings updated') . EOL);
+	exit();
+}
diff --git a/blockem/lang/C/messages.po b/blockem/lang/C/messages.po
new file mode 100644
index 00000000..95fa643b
--- /dev/null
+++ b/blockem/lang/C/messages.po
@@ -0,0 +1,57 @@
+# ADDON blockem
+# Copyright (C) 
+# This file is distributed under the same license as the Friendica blockem addon package.
+# 
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-08-17 10:23+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: blockem.php:54 blockem.php:58
+msgid "Blockem"
+msgstr ""
+
+#: blockem.php:62
+msgid ""
+"Hides user's content by collapsing posts. Also replaces their avatar with "
+"generic image."
+msgstr ""
+
+#: blockem.php:63
+msgid "Comma separated profile URLS:"
+msgstr ""
+
+#: blockem.php:67
+msgid "Save Settings"
+msgstr ""
+
+#: blockem.php:81
+msgid "BLOCKEM Settings saved."
+msgstr ""
+
+#: blockem.php:143
+#, php-format
+msgid "Filtered user: %s"
+msgstr ""
+
+#: blockem.php:202
+msgid "Unblock Author"
+msgstr ""
+
+#: blockem.php:204
+msgid "Block Author"
+msgstr ""
+
+#: blockem.php:244
+msgid "blockem settings updated"
+msgstr ""
diff --git a/blockem/lang/ca/messages.po b/blockem/lang/ca/messages.po
new file mode 100644
index 00000000..6d4c3468
--- /dev/null
+++ b/blockem/lang/ca/messages.po
@@ -0,0 +1,59 @@
+# ADDON blockem
+# Copyright (C)
+# This file is distributed under the same license as the Friendica blockem addon package.
+# 
+# 
+# Translators:
+# Joan Bar <friendica@tutanota.com>, 2019
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-08-17 10:23+0200\n"
+"PO-Revision-Date: 2019-10-14 11:50+0000\n"
+"Last-Translator: Joan Bar <friendica@tutanota.com>\n"
+"Language-Team: Catalan (http://www.transifex.com/Friendica/friendica/language/ca/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ca\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: blockem.php:54 blockem.php:58
+msgid "Blockem"
+msgstr "Blockem"
+
+#: blockem.php:62
+msgid ""
+"Hides user's content by collapsing posts. Also replaces their avatar with "
+"generic image."
+msgstr "Amaga el contingut de l'usuari mitjançant la publicació col·lapsada. També substitueix el seu avatar per una imatge genèrica"
+
+#: blockem.php:63
+msgid "Comma separated profile URLS:"
+msgstr "URL de perfil separats per comes:"
+
+#: blockem.php:67
+msgid "Save Settings"
+msgstr "Desa la configuració"
+
+#: blockem.php:81
+msgid "BLOCKEM Settings saved."
+msgstr "S'ha desat la configuració de BLOCKEM."
+
+#: blockem.php:143
+#, php-format
+msgid "Filtered user: %s"
+msgstr "Usuari filtrat:%s"
+
+#: blockem.php:202
+msgid "Unblock Author"
+msgstr "Desbloca l'autor"
+
+#: blockem.php:204
+msgid "Block Author"
+msgstr "Autor de bloc"
+
+#: blockem.php:244
+msgid "blockem settings updated"
+msgstr "S'ha actualitzat la configuració de blockem"
diff --git a/blockem/lang/ca/strings.php b/blockem/lang/ca/strings.php
new file mode 100644
index 00000000..057a6019
--- /dev/null
+++ b/blockem/lang/ca/strings.php
@@ -0,0 +1,17 @@
+<?php
+
+if(! function_exists("string_plural_select_ca")) {
+function string_plural_select_ca($n){
+	$n = intval($n);
+	return ($n != 1);;
+}}
+;
+$a->strings["Blockem"] = "Blockem";
+$a->strings["Hides user's content by collapsing posts. Also replaces their avatar with generic image."] = "Amaga el contingut de l'usuari mitjançant la publicació col·lapsada. També substitueix el seu avatar per una imatge genèrica";
+$a->strings["Comma separated profile URLS:"] = "URL de perfil separats per comes:";
+$a->strings["Save Settings"] = "Desa la configuració";
+$a->strings["BLOCKEM Settings saved."] = "S'ha desat la configuració de BLOCKEM.";
+$a->strings["Filtered user: %s"] = "Usuari filtrat:%s";
+$a->strings["Unblock Author"] = "Desbloca l'autor";
+$a->strings["Block Author"] = "Autor de bloc";
+$a->strings["blockem settings updated"] = "S'ha actualitzat la configuració de blockem";
diff --git a/blockem/lang/cs/messages.po b/blockem/lang/cs/messages.po
new file mode 100644
index 00000000..fb90a2ca
--- /dev/null
+++ b/blockem/lang/cs/messages.po
@@ -0,0 +1,60 @@
+# ADDON blockem
+# Copyright (C)
+# This file is distributed under the same license as the Friendica blockem addon package.
+# 
+# 
+# Translators:
+# Aditoo, 2018
+# michal_s <msupler@gmail.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-08-17 10:23+0200\n"
+"PO-Revision-Date: 2018-08-18 12:25+0000\n"
+"Last-Translator: Aditoo\n"
+"Language-Team: Czech (http://www.transifex.com/Friendica/friendica/language/cs/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
+
+#: blockem.php:54 blockem.php:58
+msgid "Blockem"
+msgstr "Blockem"
+
+#: blockem.php:62
+msgid ""
+"Hides user's content by collapsing posts. Also replaces their avatar with "
+"generic image."
+msgstr "Skrývá uživatelský obsah zabalením příspěvků. Navíc nahrazuje avatar generickým obrázkem."
+
+#: blockem.php:63
+msgid "Comma separated profile URLS:"
+msgstr "URL adresy profilů, oddělené čárkami:"
+
+#: blockem.php:67
+msgid "Save Settings"
+msgstr "Uložit nastavení"
+
+#: blockem.php:81
+msgid "BLOCKEM Settings saved."
+msgstr "Nastavení BLOCKEM uložena."
+
+#: blockem.php:143
+#, php-format
+msgid "Filtered user: %s"
+msgstr "Filtrovaný uživatel: %s"
+
+#: blockem.php:202
+msgid "Unblock Author"
+msgstr "Odblokovat autora"
+
+#: blockem.php:204
+msgid "Block Author"
+msgstr "Zablokovat autora"
+
+#: blockem.php:244
+msgid "blockem settings updated"
+msgstr "nastavení blockem aktualizována"
diff --git a/blockem/lang/cs/strings.php b/blockem/lang/cs/strings.php
new file mode 100644
index 00000000..495b9610
--- /dev/null
+++ b/blockem/lang/cs/strings.php
@@ -0,0 +1,17 @@
+<?php
+
+if(! function_exists("string_plural_select_cs")) {
+function string_plural_select_cs($n){
+	$n = intval($n);
+	return ($n == 1 && $n % 1 == 0) ? 0 : ($n >= 2 && $n <= 4 && $n % 1 == 0) ? 1: ($n % 1 != 0 ) ? 2 : 3;;
+}}
+;
+$a->strings["Blockem"] = "Blockem";
+$a->strings["Hides user's content by collapsing posts. Also replaces their avatar with generic image."] = "Skrývá uživatelský obsah zabalením příspěvků. Navíc nahrazuje avatar generickým obrázkem.";
+$a->strings["Comma separated profile URLS:"] = "URL adresy profilů, oddělené čárkami:";
+$a->strings["Save Settings"] = "Uložit nastavení";
+$a->strings["BLOCKEM Settings saved."] = "Nastavení BLOCKEM uložena.";
+$a->strings["Filtered user: %s"] = "Filtrovaný uživatel: %s";
+$a->strings["Unblock Author"] = "Odblokovat autora";
+$a->strings["Block Author"] = "Zablokovat autora";
+$a->strings["blockem settings updated"] = "nastavení blockem aktualizována";
diff --git a/blockem/lang/de/messages.po b/blockem/lang/de/messages.po
new file mode 100644
index 00000000..287b24c5
--- /dev/null
+++ b/blockem/lang/de/messages.po
@@ -0,0 +1,61 @@
+# ADDON blockem
+# Copyright (C)
+# This file is distributed under the same license as the Friendica blockem addon package.
+# 
+# 
+# Translators:
+# Andreas H., 2018
+# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2014
+# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2018
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-08-17 10:23+0200\n"
+"PO-Revision-Date: 2018-08-18 10:59+0000\n"
+"Last-Translator: Andreas H.\n"
+"Language-Team: German (http://www.transifex.com/Friendica/friendica/language/de/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: blockem.php:54 blockem.php:58
+msgid "Blockem"
+msgstr "Blockem"
+
+#: blockem.php:62
+msgid ""
+"Hides user's content by collapsing posts. Also replaces their avatar with "
+"generic image."
+msgstr "Verbirgt Inhalte von Kontakten durch kollabieren der Beiträge. Des weiteren wird das Profilbild durch einen generischen Avatar ersetzt."
+
+#: blockem.php:63
+msgid "Comma separated profile URLS:"
+msgstr "Komma separierte Liste von Profil URLs"
+
+#: blockem.php:67
+msgid "Save Settings"
+msgstr "Einstellungen speichern"
+
+#: blockem.php:81
+msgid "BLOCKEM Settings saved."
+msgstr "BLOCKEM-Einstellungen gesichert."
+
+#: blockem.php:143
+#, php-format
+msgid "Filtered user: %s"
+msgstr "Gefilterte Person: %s"
+
+#: blockem.php:202
+msgid "Unblock Author"
+msgstr "Autor freischalten"
+
+#: blockem.php:204
+msgid "Block Author"
+msgstr "Autor blockieren"
+
+#: blockem.php:244
+msgid "blockem settings updated"
+msgstr "blockem Einstellungen aktualisiert"
diff --git a/blockem/lang/de/strings.php b/blockem/lang/de/strings.php
new file mode 100644
index 00000000..60c03858
--- /dev/null
+++ b/blockem/lang/de/strings.php
@@ -0,0 +1,17 @@
+<?php
+
+if(! function_exists("string_plural_select_de")) {
+function string_plural_select_de($n){
+	$n = intval($n);
+	return ($n != 1);;
+}}
+;
+$a->strings["Blockem"] = "Blockem";
+$a->strings["Hides user's content by collapsing posts. Also replaces their avatar with generic image."] = "Verbirgt Inhalte von Kontakten durch kollabieren der Beiträge. Des weiteren wird das Profilbild durch einen generischen Avatar ersetzt.";
+$a->strings["Comma separated profile URLS:"] = "Komma separierte Liste von Profil URLs";
+$a->strings["Save Settings"] = "Einstellungen speichern";
+$a->strings["BLOCKEM Settings saved."] = "BLOCKEM-Einstellungen gesichert.";
+$a->strings["Filtered user: %s"] = "Gefilterte Person: %s";
+$a->strings["Unblock Author"] = "Autor freischalten";
+$a->strings["Block Author"] = "Autor blockieren";
+$a->strings["blockem settings updated"] = "blockem Einstellungen aktualisiert";
diff --git a/blockem/lang/en-gb/messages.po b/blockem/lang/en-gb/messages.po
new file mode 100644
index 00000000..6bcc7b9b
--- /dev/null
+++ b/blockem/lang/en-gb/messages.po
@@ -0,0 +1,59 @@
+# ADDON blockem
+# Copyright (C)
+# This file is distributed under the same license as the Friendica blockem addon package.
+# 
+# 
+# Translators:
+# Andy H3 <andy@hubup.pro>, 2018
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-02-09 13:00+0100\n"
+"PO-Revision-Date: 2018-03-15 14:10+0000\n"
+"Last-Translator: Andy H3 <andy@hubup.pro>\n"
+"Language-Team: English (United Kingdom) (http://www.transifex.com/Friendica/friendica/language/en_GB/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en_GB\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: blockem.php:51 blockem.php:55
+msgid "\"Blockem\""
+msgstr "\"Blockem\""
+
+#: blockem.php:59
+msgid ""
+"Hides user's content by collapsing posts. Also replaces their avatar with "
+"generic image."
+msgstr "Hides user's content by collapsing posts. Also replaces their avatar with generic image."
+
+#: blockem.php:60
+msgid "Comma separated profile URLS:"
+msgstr "Comma separated profile URLs:"
+
+#: blockem.php:64
+msgid "Save Settings"
+msgstr "Save settings"
+
+#: blockem.php:77
+msgid "BLOCKEM Settings saved."
+msgstr "Blockem settings saved."
+
+#: blockem.php:140
+#, php-format
+msgid "Hidden content by %s - Click to open/close"
+msgstr "Hidden content by %s - Reveal/hide"
+
+#: blockem.php:193
+msgid "Unblock Author"
+msgstr "Unblock author"
+
+#: blockem.php:195
+msgid "Block Author"
+msgstr "Block author"
+
+#: blockem.php:227
+msgid "blockem settings updated"
+msgstr "Blockem settings updated"
diff --git a/blockem/lang/en-gb/strings.php b/blockem/lang/en-gb/strings.php
new file mode 100644
index 00000000..d31cebe7
--- /dev/null
+++ b/blockem/lang/en-gb/strings.php
@@ -0,0 +1,16 @@
+<?php
+
+if(! function_exists("string_plural_select_en_gb")) {
+function string_plural_select_en_gb($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["\"Blockem\""] = "\"Blockem\"";
+$a->strings["Hides user's content by collapsing posts. Also replaces their avatar with generic image."] = "Hides user's content by collapsing posts. Also replaces their avatar with generic image.";
+$a->strings["Comma separated profile URLS:"] = "Comma separated profile URLs:";
+$a->strings["Save Settings"] = "Save settings";
+$a->strings["BLOCKEM Settings saved."] = "Blockem settings saved.";
+$a->strings["Hidden content by %s - Click to open/close"] = "Hidden content by %s - Reveal/hide";
+$a->strings["Unblock Author"] = "Unblock author";
+$a->strings["Block Author"] = "Block author";
+$a->strings["blockem settings updated"] = "Blockem settings updated";
diff --git a/blockem/lang/en-us/messages.po b/blockem/lang/en-us/messages.po
new file mode 100644
index 00000000..1d64620b
--- /dev/null
+++ b/blockem/lang/en-us/messages.po
@@ -0,0 +1,61 @@
+# ADDON blockem
+# Copyright (C)
+# This file is distributed under the same license as the Friendica blockem addon package.
+# 
+# 
+# Translators:
+# Adam Clark <adam@isurf.ca>, 2018
+# Andy H3 <andy@hubup.pro>, 2018
+# R C <miqrogroove@gmail.com>, 2018
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-04-01 11:11-0400\n"
+"PO-Revision-Date: 2018-06-13 02:40+0000\n"
+"Last-Translator: R C <miqrogroove@gmail.com>\n"
+"Language-Team: English (United States) (http://www.transifex.com/Friendica/friendica/language/en_US/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en_US\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: blockem.php:52 blockem.php:56
+msgid "\"Blockem\""
+msgstr "Blockem"
+
+#: blockem.php:60
+msgid ""
+"Hides user's content by collapsing posts. Also replaces their avatar with "
+"generic image."
+msgstr "Hides user's content by collapsing posts. Also replaces their avatar with generic image."
+
+#: blockem.php:61
+msgid "Comma separated profile URLS:"
+msgstr "Comma-separated profile URLs:"
+
+#: blockem.php:65
+msgid "Save Settings"
+msgstr "Save settings"
+
+#: blockem.php:78
+msgid "BLOCKEM Settings saved."
+msgstr "Blockem settings saved."
+
+#: blockem.php:136
+#, php-format
+msgid "Filtered user: %s"
+msgstr "Filtered user: %s"
+
+#: blockem.php:189
+msgid "Unblock Author"
+msgstr "Unblock author"
+
+#: blockem.php:191
+msgid "Block Author"
+msgstr "Block author"
+
+#: blockem.php:223
+msgid "blockem settings updated"
+msgstr "Blockem settings updated"
diff --git a/blockem/lang/en-us/strings.php b/blockem/lang/en-us/strings.php
new file mode 100644
index 00000000..ed20379a
--- /dev/null
+++ b/blockem/lang/en-us/strings.php
@@ -0,0 +1,17 @@
+<?php
+
+if(! function_exists("string_plural_select_en_us")) {
+function string_plural_select_en_us($n){
+	$n = intval($n);
+	return ($n != 1);;
+}}
+;
+$a->strings["\"Blockem\""] = "Blockem";
+$a->strings["Hides user's content by collapsing posts. Also replaces their avatar with generic image."] = "Hides user's content by collapsing posts. Also replaces their avatar with generic image.";
+$a->strings["Comma separated profile URLS:"] = "Comma-separated profile URLs:";
+$a->strings["Save Settings"] = "Save settings";
+$a->strings["BLOCKEM Settings saved."] = "Blockem settings saved.";
+$a->strings["Filtered user: %s"] = "Filtered user: %s";
+$a->strings["Unblock Author"] = "Unblock author";
+$a->strings["Block Author"] = "Block author";
+$a->strings["blockem settings updated"] = "Blockem settings updated";
diff --git a/blockem/lang/eo/strings.php b/blockem/lang/eo/strings.php
new file mode 100644
index 00000000..b6116507
--- /dev/null
+++ b/blockem/lang/eo/strings.php
@@ -0,0 +1,10 @@
+<?php
+
+$a->strings["\"Blockem\" Settings"] = "\"Blockem\" Agordoj";
+$a->strings["Comma separated profile URLS to block"] = "Blokotaj URL adresoj, disigita per komo";
+$a->strings["Submit"] = "Sendi";
+$a->strings["BLOCKEM Settings saved."] = "Konservis Agordojn de BLOCKEM.";
+$a->strings["Blocked %s - Click to open/close"] = "%s blokita - Klaku por malfermi/fermi";
+$a->strings["Unblock Author"] = "Malbloki Aŭtoron";
+$a->strings["Block Author"] = "Bloki Aŭtoron";
+$a->strings["blockem settings updated"] = "Ĝisdatigis la blockem agordojn";
diff --git a/blockem/lang/es/messages.po b/blockem/lang/es/messages.po
new file mode 100644
index 00000000..be4df787
--- /dev/null
+++ b/blockem/lang/es/messages.po
@@ -0,0 +1,60 @@
+# ADDON blockem
+# Copyright (C)
+# This file is distributed under the same license as the Friendica blockem addon package.
+# 
+# 
+# Translators:
+# Albert, 2018
+# Tupambae.org, 2016
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-04-01 11:11-0400\n"
+"PO-Revision-Date: 2018-05-21 14:27+0000\n"
+"Last-Translator: Albert\n"
+"Language-Team: Spanish (http://www.transifex.com/Friendica/friendica/language/es/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: blockem.php:52 blockem.php:56
+msgid "\"Blockem\""
+msgstr "\"Bloquealos\""
+
+#: blockem.php:60
+msgid ""
+"Hides user's content by collapsing posts. Also replaces their avatar with "
+"generic image."
+msgstr "Oculta el contenido del usuario al colapsar las publicaciones. También reemplaza su avatar con una imagen genérica."
+
+#: blockem.php:61
+msgid "Comma separated profile URLS:"
+msgstr "URLs de perfil separadas por comas:"
+
+#: blockem.php:65
+msgid "Save Settings"
+msgstr "Guardar configuración"
+
+#: blockem.php:78
+msgid "BLOCKEM Settings saved."
+msgstr "Configuración de BLOQUEALOS guardado."
+
+#: blockem.php:136
+#, php-format
+msgid "Filtered user: %s"
+msgstr "Usuario filtrado: %s"
+
+#: blockem.php:189
+msgid "Unblock Author"
+msgstr "Desbloquear autor"
+
+#: blockem.php:191
+msgid "Block Author"
+msgstr "Bloquear autor"
+
+#: blockem.php:223
+msgid "blockem settings updated"
+msgstr "configuración de BLOQUEALOS actualizado"
diff --git a/blockem/lang/es/strings.php b/blockem/lang/es/strings.php
new file mode 100644
index 00000000..77604fe5
--- /dev/null
+++ b/blockem/lang/es/strings.php
@@ -0,0 +1,17 @@
+<?php
+
+if(! function_exists("string_plural_select_es")) {
+function string_plural_select_es($n){
+	$n = intval($n);
+	return ($n != 1);;
+}}
+;
+$a->strings["\"Blockem\""] = "\"Bloquealos\"";
+$a->strings["Hides user's content by collapsing posts. Also replaces their avatar with generic image."] = "Oculta el contenido del usuario al colapsar las publicaciones. También reemplaza su avatar con una imagen genérica.";
+$a->strings["Comma separated profile URLS:"] = "URLs de perfil separadas por comas:";
+$a->strings["Save Settings"] = "Guardar configuración";
+$a->strings["BLOCKEM Settings saved."] = "Configuración de BLOQUEALOS guardado.";
+$a->strings["Filtered user: %s"] = "Usuario filtrado: %s";
+$a->strings["Unblock Author"] = "Desbloquear autor";
+$a->strings["Block Author"] = "Bloquear autor";
+$a->strings["blockem settings updated"] = "configuración de BLOQUEALOS actualizado";
diff --git a/blockem/lang/fi-fi/messages.po b/blockem/lang/fi-fi/messages.po
new file mode 100644
index 00000000..4fac9aa7
--- /dev/null
+++ b/blockem/lang/fi-fi/messages.po
@@ -0,0 +1,60 @@
+# ADDON blockem
+# Copyright (C)
+# This file is distributed under the same license as the Friendica blockem addon package.
+# 
+# 
+# Translators:
+# Kris, 2018
+# Kris, 2018
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-04-01 11:11-0400\n"
+"PO-Revision-Date: 2018-04-18 14:44+0000\n"
+"Last-Translator: Kris\n"
+"Language-Team: Finnish (Finland) (http://www.transifex.com/Friendica/friendica/language/fi_FI/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fi_FI\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: blockem.php:52 blockem.php:56
+msgid "\"Blockem\""
+msgstr "\"Blockem\""
+
+#: blockem.php:60
+msgid ""
+"Hides user's content by collapsing posts. Also replaces their avatar with "
+"generic image."
+msgstr ""
+
+#: blockem.php:61
+msgid "Comma separated profile URLS:"
+msgstr "Profiilien URL-osoitteet pilkulla erotettuina:"
+
+#: blockem.php:65
+msgid "Save Settings"
+msgstr "Tallenna asetukset"
+
+#: blockem.php:78
+msgid "BLOCKEM Settings saved."
+msgstr "Blockem -asetukset tallennettu"
+
+#: blockem.php:136
+#, php-format
+msgid "Filtered user: %s"
+msgstr "Suodatettu käyttäjä: %s"
+
+#: blockem.php:189
+msgid "Unblock Author"
+msgstr "Poista kirjoittaja estolistalta"
+
+#: blockem.php:191
+msgid "Block Author"
+msgstr "Lisää kirjoittaja estolistalle"
+
+#: blockem.php:223
+msgid "blockem settings updated"
+msgstr "blockem -asetukset päivitetty"
diff --git a/blockem/lang/fi-fi/strings.php b/blockem/lang/fi-fi/strings.php
new file mode 100644
index 00000000..b2403e8a
--- /dev/null
+++ b/blockem/lang/fi-fi/strings.php
@@ -0,0 +1,16 @@
+<?php
+
+if(! function_exists("string_plural_select_fi_fi")) {
+function string_plural_select_fi_fi($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["\"Blockem\""] = "\"Blockem\"";
+$a->strings["Hides user's content by collapsing posts. Also replaces their avatar with generic image."] = "";
+$a->strings["Comma separated profile URLS:"] = "Profiilien URL-osoitteet pilkulla erotettuina:";
+$a->strings["Save Settings"] = "Tallenna asetukset";
+$a->strings["BLOCKEM Settings saved."] = "Blockem -asetukset tallennettu";
+$a->strings["Filtered user: %s"] = "Suodatettu käyttäjä: %s";
+$a->strings["Unblock Author"] = "Poista kirjoittaja estolistalta";
+$a->strings["Block Author"] = "Lisää kirjoittaja estolistalle";
+$a->strings["blockem settings updated"] = "blockem -asetukset päivitetty";
diff --git a/blockem/lang/fr/messages.po b/blockem/lang/fr/messages.po
new file mode 100644
index 00000000..527f1c73
--- /dev/null
+++ b/blockem/lang/fr/messages.po
@@ -0,0 +1,62 @@
+# ADDON blockem
+# Copyright (C)
+# This file is distributed under the same license as the Friendica blockem addon package.
+# 
+# 
+# Translators:
+# Hypolite Petovan <hypolite@mrpetovan.com>, 2016
+# Marie Olive <lacellule101@gmail.com>, 2018
+# StefOfficiel <pichard.stephane@free.fr>, 2015
+# vladimir N <lapoubelle111@gmail.com>, 2018
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-08-17 10:23+0200\n"
+"PO-Revision-Date: 2018-12-30 12:33+0000\n"
+"Last-Translator: vladimir N <lapoubelle111@gmail.com>\n"
+"Language-Team: French (http://www.transifex.com/Friendica/friendica/language/fr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: blockem.php:54 blockem.php:58
+msgid "Blockem"
+msgstr "Bloquez-les"
+
+#: blockem.php:62
+msgid ""
+"Hides user's content by collapsing posts. Also replaces their avatar with "
+"generic image."
+msgstr "Cache le contenu de l'utilisateur en contractant les publications. Remplace aussi leur avatar par une image générique."
+
+#: blockem.php:63
+msgid "Comma separated profile URLS:"
+msgstr "URLs de profil séparées par des virgules:"
+
+#: blockem.php:67
+msgid "Save Settings"
+msgstr "Sauvegarder les paramètres"
+
+#: blockem.php:81
+msgid "BLOCKEM Settings saved."
+msgstr "Paramètres Bloquez-les sauvegardés."
+
+#: blockem.php:143
+#, php-format
+msgid "Filtered user: %s"
+msgstr "Utilisateur filtré:%s"
+
+#: blockem.php:202
+msgid "Unblock Author"
+msgstr "Débloquer l'Auteur"
+
+#: blockem.php:204
+msgid "Block Author"
+msgstr "Bloquer l'Auteur"
+
+#: blockem.php:244
+msgid "blockem settings updated"
+msgstr "Réglages Blockem mis à jour."
diff --git a/blockem/lang/fr/strings.php b/blockem/lang/fr/strings.php
new file mode 100644
index 00000000..cc2d366f
--- /dev/null
+++ b/blockem/lang/fr/strings.php
@@ -0,0 +1,17 @@
+<?php
+
+if(! function_exists("string_plural_select_fr")) {
+function string_plural_select_fr($n){
+	$n = intval($n);
+	return ($n > 1);;
+}}
+;
+$a->strings["Blockem"] = "Bloquez-les";
+$a->strings["Hides user's content by collapsing posts. Also replaces their avatar with generic image."] = "Cache le contenu de l'utilisateur en contractant les publications. Remplace aussi leur avatar par une image générique.";
+$a->strings["Comma separated profile URLS:"] = "URLs de profil séparées par des virgules:";
+$a->strings["Save Settings"] = "Sauvegarder les paramètres";
+$a->strings["BLOCKEM Settings saved."] = "Paramètres Bloquez-les sauvegardés.";
+$a->strings["Filtered user: %s"] = "Utilisateur filtré:%s";
+$a->strings["Unblock Author"] = "Débloquer l'Auteur";
+$a->strings["Block Author"] = "Bloquer l'Auteur";
+$a->strings["blockem settings updated"] = "Réglages Blockem mis à jour.";
diff --git a/blockem/lang/is/strings.php b/blockem/lang/is/strings.php
new file mode 100644
index 00000000..3075c457
--- /dev/null
+++ b/blockem/lang/is/strings.php
@@ -0,0 +1,10 @@
+<?php
+
+$a->strings["\"Blockem\" Settings"] = "\"Blockem\" stillingar";
+$a->strings["Comma separated profile URLS to block"] = "Banna lista af forsíðum (komma á milli)";
+$a->strings["Submit"] = "Senda inn";
+$a->strings["BLOCKEM Settings saved."] = "BLOCKEM stillingar vistaðar.";
+$a->strings["Blocked %s - Click to open/close"] = "%s sett í straff - Smella til að taka úr/setja á";
+$a->strings["Unblock Author"] = "Leyfa notanda";
+$a->strings["Block Author"] = "Banna notanda";
+$a->strings["blockem settings updated"] = "";
diff --git a/blockem/lang/it/messages.po b/blockem/lang/it/messages.po
new file mode 100644
index 00000000..cdf74f99
--- /dev/null
+++ b/blockem/lang/it/messages.po
@@ -0,0 +1,59 @@
+# ADDON blockem
+# Copyright (C)
+# This file is distributed under the same license as the Friendica blockem addon package.
+# 
+# 
+# Translators:
+# fabrixxm <fabrix.xm@gmail.com>, 2014,2018-2019
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-08-17 10:23+0200\n"
+"PO-Revision-Date: 2019-03-11 14:21+0000\n"
+"Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n"
+"Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: it\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: blockem.php:54 blockem.php:58
+msgid "Blockem"
+msgstr "Blockem"
+
+#: blockem.php:62
+msgid ""
+"Hides user's content by collapsing posts. Also replaces their avatar with "
+"generic image."
+msgstr "Nascondi il contenuto degli utenti collassando i messaggi. Sostituisce anche gli avatar con un'immagine generica."
+
+#: blockem.php:63
+msgid "Comma separated profile URLS:"
+msgstr "URL profili separati da virgola:"
+
+#: blockem.php:67
+msgid "Save Settings"
+msgstr "Salva Impostazioni"
+
+#: blockem.php:81
+msgid "BLOCKEM Settings saved."
+msgstr "Impostazioni BLOCKEM salvate."
+
+#: blockem.php:143
+#, php-format
+msgid "Filtered user: %s"
+msgstr "Utente filtrato: %s"
+
+#: blockem.php:202
+msgid "Unblock Author"
+msgstr "Sblocca autore"
+
+#: blockem.php:204
+msgid "Block Author"
+msgstr "Blocca autore"
+
+#: blockem.php:244
+msgid "blockem settings updated"
+msgstr "Impostazioni 'blockem' aggiornate."
diff --git a/blockem/lang/it/strings.php b/blockem/lang/it/strings.php
new file mode 100644
index 00000000..59e4a0f7
--- /dev/null
+++ b/blockem/lang/it/strings.php
@@ -0,0 +1,17 @@
+<?php
+
+if(! function_exists("string_plural_select_it")) {
+function string_plural_select_it($n){
+	$n = intval($n);
+	return ($n != 1);;
+}}
+;
+$a->strings["Blockem"] = "Blockem";
+$a->strings["Hides user's content by collapsing posts. Also replaces their avatar with generic image."] = "Nascondi il contenuto degli utenti collassando i messaggi. Sostituisce anche gli avatar con un'immagine generica.";
+$a->strings["Comma separated profile URLS:"] = "URL profili separati da virgola:";
+$a->strings["Save Settings"] = "Salva Impostazioni";
+$a->strings["BLOCKEM Settings saved."] = "Impostazioni BLOCKEM salvate.";
+$a->strings["Filtered user: %s"] = "Utente filtrato: %s";
+$a->strings["Unblock Author"] = "Sblocca autore";
+$a->strings["Block Author"] = "Blocca autore";
+$a->strings["blockem settings updated"] = "Impostazioni 'blockem' aggiornate.";
diff --git a/blockem/lang/nb-no/strings.php b/blockem/lang/nb-no/strings.php
new file mode 100644
index 00000000..0dd6660d
--- /dev/null
+++ b/blockem/lang/nb-no/strings.php
@@ -0,0 +1,10 @@
+<?php
+
+$a->strings["\"Blockem\" Settings"] = "";
+$a->strings["Comma separated profile URLS to block"] = "";
+$a->strings["Submit"] = "Lagre";
+$a->strings["BLOCKEM Settings saved."] = "";
+$a->strings["Blocked %s - Click to open/close"] = "";
+$a->strings["Unblock Author"] = "";
+$a->strings["Block Author"] = "";
+$a->strings["blockem settings updated"] = "";
diff --git a/blockem/lang/nl/messages.po b/blockem/lang/nl/messages.po
new file mode 100644
index 00000000..f8bde25c
--- /dev/null
+++ b/blockem/lang/nl/messages.po
@@ -0,0 +1,60 @@
+# ADDON blockem
+# Copyright (C)
+# This file is distributed under the same license as the Friendica blockem addon package.
+# 
+# 
+# Translators:
+# AgnesElisa <agneselisa@disroot.org>, 2018
+# Jeroen De Meerleer <me@jeroened.be>, 2018
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-08-17 10:23+0200\n"
+"PO-Revision-Date: 2018-08-24 13:49+0000\n"
+"Last-Translator: Jeroen De Meerleer <me@jeroened.be>\n"
+"Language-Team: Dutch (http://www.transifex.com/Friendica/friendica/language/nl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: blockem.php:54 blockem.php:58
+msgid "Blockem"
+msgstr "Blockem"
+
+#: blockem.php:62
+msgid ""
+"Hides user's content by collapsing posts. Also replaces their avatar with "
+"generic image."
+msgstr "Verbergt de inhoud van het bericht van de gebruiker. Daarnaast vervangt het de avatar door een standaardafbeelding."
+
+#: blockem.php:63
+msgid "Comma separated profile URLS:"
+msgstr "Profiel URLs (kommagescheiden):"
+
+#: blockem.php:67
+msgid "Save Settings"
+msgstr "Instellingen opslaan"
+
+#: blockem.php:81
+msgid "BLOCKEM Settings saved."
+msgstr "BLOCKEM instellingen opgeslagen."
+
+#: blockem.php:143
+#, php-format
+msgid "Filtered user: %s"
+msgstr "Gefilterde gebruiker: %s"
+
+#: blockem.php:202
+msgid "Unblock Author"
+msgstr "Deblokkeer Auteur"
+
+#: blockem.php:204
+msgid "Block Author"
+msgstr "Auteur blokkeren"
+
+#: blockem.php:244
+msgid "blockem settings updated"
+msgstr "blockem instellingen opgeslagen"
diff --git a/blockem/lang/nl/strings.php b/blockem/lang/nl/strings.php
new file mode 100644
index 00000000..b74cc140
--- /dev/null
+++ b/blockem/lang/nl/strings.php
@@ -0,0 +1,17 @@
+<?php
+
+if(! function_exists("string_plural_select_nl")) {
+function string_plural_select_nl($n){
+	$n = intval($n);
+	return ($n != 1);;
+}}
+;
+$a->strings["Blockem"] = "Blockem";
+$a->strings["Hides user's content by collapsing posts. Also replaces their avatar with generic image."] = "Verbergt de inhoud van het bericht van de gebruiker. Daarnaast vervangt het de avatar door een standaardafbeelding.";
+$a->strings["Comma separated profile URLS:"] = "Profiel URLs (kommagescheiden):";
+$a->strings["Save Settings"] = "Instellingen opslaan";
+$a->strings["BLOCKEM Settings saved."] = "BLOCKEM instellingen opgeslagen.";
+$a->strings["Filtered user: %s"] = "Gefilterde gebruiker: %s";
+$a->strings["Unblock Author"] = "Deblokkeer Auteur";
+$a->strings["Block Author"] = "Auteur blokkeren";
+$a->strings["blockem settings updated"] = "blockem instellingen opgeslagen";
diff --git a/blockem/lang/pl/messages.po b/blockem/lang/pl/messages.po
new file mode 100644
index 00000000..0df09273
--- /dev/null
+++ b/blockem/lang/pl/messages.po
@@ -0,0 +1,59 @@
+# ADDON blockem
+# Copyright (C)
+# This file is distributed under the same license as the Friendica blockem addon package.
+# 
+# 
+# Translators:
+# Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>, 2018
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-08-17 10:23+0200\n"
+"PO-Revision-Date: 2018-08-20 13:44+0000\n"
+"Last-Translator: Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>\n"
+"Language-Team: Polish (http://www.transifex.com/Friendica/friendica/language/pl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pl\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
+
+#: blockem.php:54 blockem.php:58
+msgid "Blockem"
+msgstr "Zablokowanie"
+
+#: blockem.php:62
+msgid ""
+"Hides user's content by collapsing posts. Also replaces their avatar with "
+"generic image."
+msgstr "Ukrywa zawartość użytkownika, zwijając posty. Zastępuje również awatar wygenerowanym obrazem."
+
+#: blockem.php:63
+msgid "Comma separated profile URLS:"
+msgstr "Rozdzielone przecinkami adresy URL profilu:"
+
+#: blockem.php:67
+msgid "Save Settings"
+msgstr "Zapisz ustawienia"
+
+#: blockem.php:81
+msgid "BLOCKEM Settings saved."
+msgstr "BLOCKEM Ustawienia zapisane."
+
+#: blockem.php:143
+#, php-format
+msgid "Filtered user: %s"
+msgstr "Użytkownik filtrowany: %s"
+
+#: blockem.php:202
+msgid "Unblock Author"
+msgstr "Odblokuj autora"
+
+#: blockem.php:204
+msgid "Block Author"
+msgstr "Zablokuj autora"
+
+#: blockem.php:244
+msgid "blockem settings updated"
+msgstr "ustawienia blockem zostały zaktualizowane"
diff --git a/blockem/lang/pl/strings.php b/blockem/lang/pl/strings.php
new file mode 100644
index 00000000..08e1cf4d
--- /dev/null
+++ b/blockem/lang/pl/strings.php
@@ -0,0 +1,17 @@
+<?php
+
+if(! function_exists("string_plural_select_pl")) {
+function string_plural_select_pl($n){
+	$n = intval($n);
+	return ($n==1 ? 0 : ($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14) ? 1 : $n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14) ? 2 : 3);;
+}}
+;
+$a->strings["Blockem"] = "Zablokowanie";
+$a->strings["Hides user's content by collapsing posts. Also replaces their avatar with generic image."] = "Ukrywa zawartość użytkownika, zwijając posty. Zastępuje również awatar wygenerowanym obrazem.";
+$a->strings["Comma separated profile URLS:"] = "Rozdzielone przecinkami adresy URL profilu:";
+$a->strings["Save Settings"] = "Zapisz ustawienia";
+$a->strings["BLOCKEM Settings saved."] = "BLOCKEM Ustawienia zapisane.";
+$a->strings["Filtered user: %s"] = "Użytkownik filtrowany: %s";
+$a->strings["Unblock Author"] = "Odblokuj autora";
+$a->strings["Block Author"] = "Zablokuj autora";
+$a->strings["blockem settings updated"] = "ustawienia blockem zostały zaktualizowane";
diff --git a/blockem/lang/pt-br/strings.php b/blockem/lang/pt-br/strings.php
new file mode 100644
index 00000000..49f69cc3
--- /dev/null
+++ b/blockem/lang/pt-br/strings.php
@@ -0,0 +1,10 @@
+<?php
+
+$a->strings["\"Blockem\" Settings"] = "Configurações \"Blockem\"";
+$a->strings["Comma separated profile URLS to block"] = "URLS de perfis separados por vírgulas a serem bloqueados";
+$a->strings["Submit"] = "Enviar";
+$a->strings["BLOCKEM Settings saved."] = "Configurações BLOCKEM armazenadas.";
+$a->strings["Blocked %s - Click to open/close"] = "Bloqueado %s - Clique para abrir/fechar";
+$a->strings["Unblock Author"] = "Desbloqueie Autor";
+$a->strings["Block Author"] = "Bloqueie Autor";
+$a->strings["blockem settings updated"] = "configurações blockem atualizadas";
diff --git a/blockem/lang/ro/messages.po b/blockem/lang/ro/messages.po
new file mode 100644
index 00000000..a74e5757
--- /dev/null
+++ b/blockem/lang/ro/messages.po
@@ -0,0 +1,52 @@
+# ADDON blockem
+# Copyright (C)
+# This file is distributed under the same license as the Friendica blockem addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-08 11:43+0000\n"
+"Last-Translator: Arian - Cazare Muncitori <arianserv@gmail.com>\n"
+"Language-Team: Romanian (Romania) (http://www.transifex.com/projects/p/friendica/language/ro_RO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ro_RO\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
+
+#: blockem.php:53 blockem.php:57
+msgid "\"Blockem\""
+msgstr "\"Blockem\""
+
+#: blockem.php:61
+msgid "Comma separated profile URLS to block"
+msgstr "Adresele URL de profil, de blocat, separate prin virgulă"
+
+#: blockem.php:65
+msgid "Save Settings"
+msgstr "Salvare Configurări"
+
+#: blockem.php:78
+msgid "BLOCKEM Settings saved."
+msgstr "Configurările BLOCKEM au fost salvate."
+
+#: blockem.php:142
+#, php-format
+msgid "Blocked %s - Click to open/close"
+msgstr "%s Blocate - Apăsați pentru a deschide/închide"
+
+#: blockem.php:197
+msgid "Unblock Author"
+msgstr "Deblocare Autor"
+
+#: blockem.php:199
+msgid "Block Author"
+msgstr "Blocare Autor"
+
+#: blockem.php:231
+msgid "blockem settings updated"
+msgstr "Configurările blockem au fost actualizate"
diff --git a/blockem/lang/ro/strings.php b/blockem/lang/ro/strings.php
new file mode 100644
index 00000000..b842467d
--- /dev/null
+++ b/blockem/lang/ro/strings.php
@@ -0,0 +1,15 @@
+<?php
+
+if(! function_exists("string_plural_select_ro")) {
+function string_plural_select_ro($n){
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+}}
+;
+$a->strings["\"Blockem\""] = "\"Blockem\"";
+$a->strings["Comma separated profile URLS to block"] = "Adresele URL de profil, de blocat, separate prin virgulă";
+$a->strings["Save Settings"] = "Salvare Configurări";
+$a->strings["BLOCKEM Settings saved."] = "Configurările BLOCKEM au fost salvate.";
+$a->strings["Blocked %s - Click to open/close"] = "%s Blocate - Apăsați pentru a deschide/închide";
+$a->strings["Unblock Author"] = "Deblocare Autor";
+$a->strings["Block Author"] = "Blocare Autor";
+$a->strings["blockem settings updated"] = "Configurările blockem au fost actualizate";
diff --git a/blockem/lang/ru/messages.po b/blockem/lang/ru/messages.po
new file mode 100644
index 00000000..86d536c9
--- /dev/null
+++ b/blockem/lang/ru/messages.po
@@ -0,0 +1,59 @@
+# ADDON blockem
+# Copyright (C)
+# This file is distributed under the same license as the Friendica blockem addon package.
+# 
+# 
+# Translators:
+# Stanislav N. <pztrn@pztrn.name>, 2017-2018
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-04-01 11:11-0400\n"
+"PO-Revision-Date: 2018-05-25 00:00+0000\n"
+"Last-Translator: Stanislav N. <pztrn@pztrn.name>\n"
+"Language-Team: Russian (http://www.transifex.com/Friendica/friendica/language/ru/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ru\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
+
+#: blockem.php:52 blockem.php:56
+msgid "\"Blockem\""
+msgstr "\"Blockem\""
+
+#: blockem.php:60
+msgid ""
+"Hides user's content by collapsing posts. Also replaces their avatar with "
+"generic image."
+msgstr "Скрыть контент пользователя. Также заменяет его аватар изображением по-умолчанию."
+
+#: blockem.php:61
+msgid "Comma separated profile URLS:"
+msgstr "URL профилей, разделенные запятыми:"
+
+#: blockem.php:65
+msgid "Save Settings"
+msgstr "Сохранить настройки"
+
+#: blockem.php:78
+msgid "BLOCKEM Settings saved."
+msgstr "BLOCKEM Настройки сохранены."
+
+#: blockem.php:136
+#, php-format
+msgid "Filtered user: %s"
+msgstr "Отфильтрованный пользователь: %s"
+
+#: blockem.php:189
+msgid "Unblock Author"
+msgstr "Разблокировать автора"
+
+#: blockem.php:191
+msgid "Block Author"
+msgstr "Блокировать автора"
+
+#: blockem.php:223
+msgid "blockem settings updated"
+msgstr "Настройки Blockem обновлены"
diff --git a/blockem/lang/ru/strings.php b/blockem/lang/ru/strings.php
new file mode 100644
index 00000000..2a1b1498
--- /dev/null
+++ b/blockem/lang/ru/strings.php
@@ -0,0 +1,17 @@
+<?php
+
+if(! function_exists("string_plural_select_ru")) {
+function string_plural_select_ru($n){
+	$n = intval($n);
+	return ($n%10==1 && $n%100!=11 ? 0 : $n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14) ? 1 : $n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)? 2 : 3);;
+}}
+;
+$a->strings["\"Blockem\""] = "\"Blockem\"";
+$a->strings["Hides user's content by collapsing posts. Also replaces their avatar with generic image."] = "Скрыть контент пользователя. Также заменяет его аватар изображением по-умолчанию.";
+$a->strings["Comma separated profile URLS:"] = "URL профилей, разделенные запятыми:";
+$a->strings["Save Settings"] = "Сохранить настройки";
+$a->strings["BLOCKEM Settings saved."] = "BLOCKEM Настройки сохранены.";
+$a->strings["Filtered user: %s"] = "Отфильтрованный пользователь: %s";
+$a->strings["Unblock Author"] = "Разблокировать автора";
+$a->strings["Block Author"] = "Блокировать автора";
+$a->strings["blockem settings updated"] = "Настройки Blockem обновлены";
diff --git a/blockem/lang/sv/messages.po b/blockem/lang/sv/messages.po
new file mode 100644
index 00000000..a474f815
--- /dev/null
+++ b/blockem/lang/sv/messages.po
@@ -0,0 +1,59 @@
+# ADDON blockem
+# Copyright (C)
+# This file is distributed under the same license as the Friendica blockem addon package.
+# 
+# 
+# Translators:
+# Bjoessi <torbjorn.andersson@syte.se>, 2019
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-08-17 10:23+0200\n"
+"PO-Revision-Date: 2019-08-20 07:51+0000\n"
+"Last-Translator: Bjoessi <torbjorn.andersson@syte.se>\n"
+"Language-Team: Swedish (http://www.transifex.com/Friendica/friendica/language/sv/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sv\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: blockem.php:54 blockem.php:58
+msgid "Blockem"
+msgstr "BLOCKEM"
+
+#: blockem.php:62
+msgid ""
+"Hides user's content by collapsing posts. Also replaces their avatar with "
+"generic image."
+msgstr "Döljer användares inlägg genom sammanslagning nedåt. Användarens profilbild ersätts med en standardbild."
+
+#: blockem.php:63
+msgid "Comma separated profile URLS:"
+msgstr "Kommaseparerade profiladresser:"
+
+#: blockem.php:67
+msgid "Save Settings"
+msgstr "Spara inställningar"
+
+#: blockem.php:81
+msgid "BLOCKEM Settings saved."
+msgstr "BLOCKEM Inställningar sparade."
+
+#: blockem.php:143
+#, php-format
+msgid "Filtered user: %s"
+msgstr "Filtrerat på användare:%s"
+
+#: blockem.php:202
+msgid "Unblock Author"
+msgstr "Avblockera författare"
+
+#: blockem.php:204
+msgid "Block Author"
+msgstr "Blockera författare"
+
+#: blockem.php:244
+msgid "blockem settings updated"
+msgstr "BLOCKEM Inställningar uppdaterade"
diff --git a/blockem/lang/sv/strings.php b/blockem/lang/sv/strings.php
new file mode 100644
index 00000000..9685ad8b
--- /dev/null
+++ b/blockem/lang/sv/strings.php
@@ -0,0 +1,17 @@
+<?php
+
+if(! function_exists("string_plural_select_sv")) {
+function string_plural_select_sv($n){
+	$n = intval($n);
+	return ($n != 1);;
+}}
+;
+$a->strings["Blockem"] = "BLOCKEM";
+$a->strings["Hides user's content by collapsing posts. Also replaces their avatar with generic image."] = "Döljer användares inlägg genom sammanslagning nedåt. Användarens profilbild ersätts med en standardbild.";
+$a->strings["Comma separated profile URLS:"] = "Kommaseparerade profiladresser:";
+$a->strings["Save Settings"] = "Spara inställningar";
+$a->strings["BLOCKEM Settings saved."] = "BLOCKEM Inställningar sparade.";
+$a->strings["Filtered user: %s"] = "Filtrerat på användare:%s";
+$a->strings["Unblock Author"] = "Avblockera författare";
+$a->strings["Block Author"] = "Blockera författare";
+$a->strings["blockem settings updated"] = "BLOCKEM Inställningar uppdaterade";
diff --git a/blockem/lang/zh-cn/strings.php b/blockem/lang/zh-cn/strings.php
new file mode 100644
index 00000000..3a3dfaeb
--- /dev/null
+++ b/blockem/lang/zh-cn/strings.php
@@ -0,0 +1,10 @@
+<?php
+
+$a->strings["\"Blockem\" Settings"] = "「Blockem」配置";
+$a->strings["Comma separated profile URLS to block"] = "逗号分简介URL为栏";
+$a->strings["Submit"] = "提交";
+$a->strings["BLOCKEM Settings saved."] = "「Blockem」配置保存了。";
+$a->strings["Blocked %s - Click to open/close"] = "%s拦了－点击为开关";
+$a->strings["Unblock Author"] = "不拦作家";
+$a->strings["Block Author"] = "拦作家";
+$a->strings["blockem settings updated"] = "blockem设置更新了";
diff --git a/blogger/blogger.css b/blogger/blogger.css
new file mode 100644
index 00000000..2304ef9b
--- /dev/null
+++ b/blogger/blogger.css
@@ -0,0 +1,16 @@
+
+#blogger-enable-label, #blogger-username-label, #blogger-password-label, #blogger-bydefault-label, #blogger-blog-label {
+	float: left;
+	width: 200px;
+	margin-top: 10px;
+}
+
+#blogger-checkbox, #blogger-username, #blogger-password, #blogger-bydefault, #blogger-blog {
+	float: left;
+	margin-top: 10px;
+}
+
+#blogger-submit {
+	margin-top: 15px;
+}
+
diff --git a/blogger/blogger.php b/blogger/blogger.php
new file mode 100644
index 00000000..001224d2
--- /dev/null
+++ b/blogger/blogger.php
@@ -0,0 +1,234 @@
+<?php
+/**
+ * Name: Blogger Post Connector
+ * Description: Post to Blogger (or anything else which uses blogger XMLRPC API)
+ * Version: 1.0
+ * Status: Unsupported
+ */
+
+use Friendica\App;
+use Friendica\Content\Text\BBCode;
+use Friendica\Core\Hook;
+use Friendica\Core\L10n;
+use Friendica\Core\Logger;
+use Friendica\Core\PConfig;
+use Friendica\Util\Network;
+use Friendica\Util\XML;
+
+function blogger_install()
+{
+	Hook::register('hook_fork',               'addon/blogger/blogger.php', 'blogger_hook_fork');
+	Hook::register('post_local',              'addon/blogger/blogger.php', 'blogger_post_local');
+	Hook::register('notifier_normal',         'addon/blogger/blogger.php', 'blogger_send');
+	Hook::register('jot_networks',            'addon/blogger/blogger.php', 'blogger_jot_nets');
+	Hook::register('connector_settings',      'addon/blogger/blogger.php', 'blogger_settings');
+	Hook::register('connector_settings_post', 'addon/blogger/blogger.php', 'blogger_settings_post');
+}
+
+function blogger_uninstall()
+{
+	Hook::unregister('hook_fork',               'addon/blogger/blogger.php', 'blogger_hook_fork');
+	Hook::unregister('post_local',              'addon/blogger/blogger.php', 'blogger_post_local');
+	Hook::unregister('notifier_normal',         'addon/blogger/blogger.php', 'blogger_send');
+	Hook::unregister('jot_networks',            'addon/blogger/blogger.php', 'blogger_jot_nets');
+	Hook::unregister('connector_settings',      'addon/blogger/blogger.php', 'blogger_settings');
+	Hook::unregister('connector_settings_post', 'addon/blogger/blogger.php', 'blogger_settings_post');
+
+	// obsolete - remove
+	Hook::unregister('post_local_end',      'addon/blogger/blogger.php', 'blogger_send');
+	Hook::unregister('addon_settings',      'addon/blogger/blogger.php', 'blogger_settings');
+	Hook::unregister('addon_settings_post', 'addon/blogger/blogger.php', 'blogger_settings_post');
+}
+
+
+function blogger_jot_nets(App $a, array &$jotnets_fields)
+{
+	if (!local_user()) {
+		return;
+	}
+
+	if (PConfig::get(local_user(), 'blogger', 'post')) {
+		$jotnets_fields[] = [
+			'type' => 'checkbox',
+			'field' => [
+				'blogger_enable',
+				L10n::t('Post to blogger'),
+				PConfig::get(local_user(), 'blogger', 'post_by_default')
+			]
+		];
+	}
+}
+
+
+function blogger_settings(App $a, &$s)
+{
+	if (! local_user()) {
+		return;
+	}
+
+	/* Add our stylesheet to the page so we can make our settings look nice */
+
+	$a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->getBaseURL() . '/addon/blogger/blogger.css' . '" media="all" />' . "\r\n";
+
+	/* Get the current state of our config variables */
+
+	$enabled = PConfig::get(local_user(), 'blogger', 'post');
+	$checked = (($enabled) ? ' checked="checked" ' : '');
+	$css = (($enabled) ? '' : '-disabled');
+
+	$def_enabled = PConfig::get(local_user(), 'blogger', 'post_by_default');
+
+	$def_checked = (($def_enabled) ? ' checked="checked" ' : '');
+
+	$bl_username = PConfig::get(local_user(), 'blogger', 'bl_username');
+	$bl_password = PConfig::get(local_user(), 'blogger', 'bl_password');
+	$bl_blog = PConfig::get(local_user(), 'blogger', 'bl_blog');
+
+	/* Add some HTML to the existing form */
+	$s .= '<span id="settings_blogger_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_blogger_expanded\'); openClose(\'settings_blogger_inflated\');">';
+	$s .= '<img class="connector'.$css.'" src="images/blogger.png" /><h3 class="connector">'. L10n::t('Blogger Export').'</h3>';
+	$s .= '</span>';
+	$s .= '<div id="settings_blogger_expanded" class="settings-block" style="display: none;">';
+	$s .= '<span class="fakelink" onclick="openClose(\'settings_blogger_expanded\'); openClose(\'settings_blogger_inflated\');">';
+	$s .= '<img class="connector'.$css.'" src="images/blogger.png" /><h3 class="connector">'. L10n::t('Blogger Export').'</h3>';
+	$s .= '</span>';
+
+	$s .= '<div id="blogger-enable-wrapper">';
+	$s .= '<label id="blogger-enable-label" for="blogger-checkbox">' . L10n::t('Enable Blogger Post Addon') . '</label>';
+	$s .= '<input id="blogger-checkbox" type="checkbox" name="blogger" value="1" ' . $checked . '/>';
+	$s .= '</div><div class="clear"></div>';
+
+	$s .= '<div id="blogger-username-wrapper">';
+	$s .= '<label id="blogger-username-label" for="blogger-username">' . L10n::t('Blogger username') . '</label>';
+	$s .= '<input id="blogger-username" type="text" name="bl_username" value="' . $bl_username . '" />';
+	$s .= '</div><div class="clear"></div>';
+
+	$s .= '<div id="blogger-password-wrapper">';
+	$s .= '<label id="blogger-password-label" for="blogger-password">' . L10n::t('Blogger password') . '</label>';
+	$s .= '<input id="blogger-password" type="password" name="bl_password" value="' . $bl_password . '" />';
+	$s .= '</div><div class="clear"></div>';
+
+	$s .= '<div id="blogger-blog-wrapper">';
+	$s .= '<label id="blogger-blog-label" for="blogger-blog">' . L10n::t('Blogger API URL') . '</label>';
+	$s .= '<input id="blogger-blog" type="text" name="bl_blog" value="' . $bl_blog . '" />';
+	$s .= '</div><div class="clear"></div>';
+
+	$s .= '<div id="blogger-bydefault-wrapper">';
+	$s .= '<label id="blogger-bydefault-label" for="blogger-bydefault">' . L10n::t('Post to Blogger by default') . '</label>';
+	$s .= '<input id="blogger-bydefault" type="checkbox" name="bl_bydefault" value="1" ' . $def_checked . '/>';
+	$s .= '</div><div class="clear"></div>';
+
+	/* provide a submit button */
+	$s .= '<div class="settings-submit-wrapper" ><input type="submit" id="blogger-submit" name="blogger-submit" class="settings-submit" value="' . L10n::t('Save Settings') . '" /></div></div>';
+}
+
+
+function blogger_settings_post(App $a, array &$b)
+{
+	if (!empty($_POST['blogger-submit'])) {
+		PConfig::set(local_user(), 'blogger', 'post',            $_POST['blogger'] ?? false);
+		PConfig::set(local_user(), 'blogger', 'post_by_default', $_POST['bl_bydefault'] ?? false);
+		PConfig::set(local_user(), 'blogger', 'bl_username',     trim($_POST['bl_username']));
+		PConfig::set(local_user(), 'blogger', 'bl_password',     trim($_POST['bl_password']));
+		PConfig::set(local_user(), 'blogger', 'bl_blog',         trim($_POST['bl_blog']));
+	}
+}
+
+function blogger_hook_fork(App &$a, array &$b)
+{
+	if ($b['name'] != 'notifier_normal') {
+		return;
+	}
+
+	$post = $b['data'];
+
+	if ($post['deleted'] || $post['private'] || ($post['created'] !== $post['edited']) ||
+		!strstr($post['postopts'], 'blogger') || ($post['parent'] != $post['id'])) {
+		$b['execute'] = false;
+		return;
+	}
+}
+
+function blogger_post_local(App $a, array &$b)
+{
+	// This can probably be changed to allow editing by pointing to a different API endpoint
+
+	if ($b['edit']) {
+		return;
+	}
+
+	if (!local_user() || (local_user() != $b['uid'])) {
+		return;
+	}
+
+	if ($b['private'] || $b['parent']) {
+		return;
+	}
+
+	$bl_post   = intval(PConfig::get(local_user(), 'blogger', 'post'));
+
+	$bl_enable = (($bl_post && !empty($_REQUEST['blogger_enable'])) ? intval($_REQUEST['blogger_enable']) : 0);
+
+	if ($b['api_source'] && intval(PConfig::get(local_user(), 'blogger', 'post_by_default'))) {
+		$bl_enable = 1;
+	}
+
+	if (!$bl_enable) {
+		return;
+	}
+
+	if (strlen($b['postopts'])) {
+		$b['postopts'] .= ',';
+	}
+
+	$b['postopts'] .= 'blogger';
+}
+
+function blogger_send(App $a, array &$b)
+{
+	if ($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited'])) {
+		return;
+	}
+
+	if (! strstr($b['postopts'], 'blogger')) {
+		return;
+	}
+
+	if ($b['parent'] != $b['id']) {
+		return;
+	}
+
+	$bl_username = XML::escape(PConfig::get($b['uid'], 'blogger', 'bl_username'));
+	$bl_password = XML::escape(PConfig::get($b['uid'], 'blogger', 'bl_password'));
+	$bl_blog = PConfig::get($b['uid'], 'blogger', 'bl_blog');
+
+	if ($bl_username && $bl_password && $bl_blog) {
+		$title = '<title>' . (($b['title']) ? $b['title'] : L10n::t('Post from Friendica')) . '</title>';
+		$post = $title . BBCode::convert($b['body']);
+		$post = XML::escape($post);
+
+		$xml = <<< EOT
+<?xml version=\"1.0\" encoding=\"utf-8\"?>
+<methodCall>
+  <methodName>blogger.newPost</methodName>
+  <params>
+    <param><value><string/></value></param>
+    <param><value><string/></value></param>
+    <param><value><string>$bl_username</string></value></param>
+    <param><value><string>$bl_password</string></value></param>
+    <param><value><string>$post</string></value></param>
+    <param><value><int>1</int></value></param>
+  </params>
+</methodCall>
+
+EOT;
+
+		Logger::log('blogger: data: ' . $xml, Logger::DATA);
+
+		if ($bl_blog !== 'test') {
+			$x = Network::post($bl_blog, $xml)->getBody();
+		}
+
+		Logger::log('posted to blogger: ' . (($x) ? $x : ''), Logger::DEBUG);
+	}
+}
diff --git a/blogger/lang/C/messages.po b/blogger/lang/C/messages.po
new file mode 100644
index 00000000..f04bbb39
--- /dev/null
+++ b/blogger/lang/C/messages.po
@@ -0,0 +1,54 @@
+# ADDON blogger
+# Copyright (C) 
+# This file is distributed under the same license as the Friendica blogger addon package.
+# 
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: blogger.php:42
+msgid "Post to blogger"
+msgstr ""
+
+#: blogger.php:74 blogger.php:78
+msgid "Blogger Export"
+msgstr ""
+
+#: blogger.php:82
+msgid "Enable Blogger Post Addon"
+msgstr ""
+
+#: blogger.php:87
+msgid "Blogger username"
+msgstr ""
+
+#: blogger.php:92
+msgid "Blogger password"
+msgstr ""
+
+#: blogger.php:97
+msgid "Blogger API URL"
+msgstr ""
+
+#: blogger.php:102
+msgid "Post to Blogger by default"
+msgstr ""
+
+#: blogger.php:108
+msgid "Save Settings"
+msgstr ""
+
+#: blogger.php:178
+msgid "Post from Friendica"
+msgstr ""
diff --git a/blogger/lang/ca/messages.po b/blogger/lang/ca/messages.po
new file mode 100644
index 00000000..fa2be53c
--- /dev/null
+++ b/blogger/lang/ca/messages.po
@@ -0,0 +1,56 @@
+# ADDON blogger
+# Copyright (C)
+# This file is distributed under the same license as the Friendica blogger addon package.
+# 
+# 
+# Translators:
+# Joan Bar <friendica@tutanota.com>, 2019
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2019-10-14 11:51+0000\n"
+"Last-Translator: Joan Bar <friendica@tutanota.com>\n"
+"Language-Team: Catalan (http://www.transifex.com/Friendica/friendica/language/ca/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ca\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: blogger.php:42
+msgid "Post to blogger"
+msgstr "Publicar a blogger"
+
+#: blogger.php:74 blogger.php:78
+msgid "Blogger Export"
+msgstr "Exportació de Blogger"
+
+#: blogger.php:82
+msgid "Enable Blogger Post Addon"
+msgstr "Habilita Addon Post de Blogger"
+
+#: blogger.php:87
+msgid "Blogger username"
+msgstr "Nom d'usuari de Blogger"
+
+#: blogger.php:92
+msgid "Blogger password"
+msgstr "Contrasenya de Blogger"
+
+#: blogger.php:97
+msgid "Blogger API URL"
+msgstr "URL de l'API de Blogger"
+
+#: blogger.php:102
+msgid "Post to Blogger by default"
+msgstr "Publica a Blogger de manera predeterminada"
+
+#: blogger.php:108
+msgid "Save Settings"
+msgstr "Desa la configuració"
+
+#: blogger.php:178
+msgid "Post from Friendica"
+msgstr "Publica de Friendica"
diff --git a/blogger/lang/ca/strings.php b/blogger/lang/ca/strings.php
new file mode 100644
index 00000000..afac5d7f
--- /dev/null
+++ b/blogger/lang/ca/strings.php
@@ -0,0 +1,17 @@
+<?php
+
+if(! function_exists("string_plural_select_ca")) {
+function string_plural_select_ca($n){
+	$n = intval($n);
+	return ($n != 1);;
+}}
+;
+$a->strings["Post to blogger"] = "Publicar a blogger";
+$a->strings["Blogger Export"] = "Exportació de Blogger";
+$a->strings["Enable Blogger Post Addon"] = "Habilita Addon Post de Blogger";
+$a->strings["Blogger username"] = "Nom d'usuari de Blogger";
+$a->strings["Blogger password"] = "Contrasenya de Blogger";
+$a->strings["Blogger API URL"] = "URL de l'API de Blogger";
+$a->strings["Post to Blogger by default"] = "Publica a Blogger de manera predeterminada";
+$a->strings["Save Settings"] = "Desa la configuració";
+$a->strings["Post from Friendica"] = "Publica de Friendica";
diff --git a/blogger/lang/cs/messages.po b/blogger/lang/cs/messages.po
new file mode 100644
index 00000000..a1ee80b4
--- /dev/null
+++ b/blogger/lang/cs/messages.po
@@ -0,0 +1,57 @@
+# ADDON blogger
+# Copyright (C)
+# This file is distributed under the same license as the Friendica blogger addon package.
+# 
+# 
+# Translators:
+# Aditoo, 2018
+# michal_s <msupler@gmail.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2018-06-07 12:31+0000\n"
+"Last-Translator: Aditoo\n"
+"Language-Team: Czech (http://www.transifex.com/Friendica/friendica/language/cs/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
+
+#: blogger.php:42
+msgid "Post to blogger"
+msgstr "Poslat na blogger"
+
+#: blogger.php:74 blogger.php:78
+msgid "Blogger Export"
+msgstr "Blogger Export"
+
+#: blogger.php:82
+msgid "Enable Blogger Post Addon"
+msgstr "Povolit doplněk Blogger Post"
+
+#: blogger.php:87
+msgid "Blogger username"
+msgstr "Blogger uživatelské jméno"
+
+#: blogger.php:92
+msgid "Blogger password"
+msgstr "Blogger heslo"
+
+#: blogger.php:97
+msgid "Blogger API URL"
+msgstr "Blogger API URL"
+
+#: blogger.php:102
+msgid "Post to Blogger by default"
+msgstr "Defaultně zaslat na Blogger"
+
+#: blogger.php:108
+msgid "Save Settings"
+msgstr "Uložit Nastavení"
+
+#: blogger.php:178
+msgid "Post from Friendica"
+msgstr "Příspěvek z Friendica"
diff --git a/blogger/lang/cs/strings.php b/blogger/lang/cs/strings.php
new file mode 100644
index 00000000..4ce612a7
--- /dev/null
+++ b/blogger/lang/cs/strings.php
@@ -0,0 +1,17 @@
+<?php
+
+if(! function_exists("string_plural_select_cs")) {
+function string_plural_select_cs($n){
+	$n = intval($n);
+	return ($n == 1 && $n % 1 == 0) ? 0 : ($n >= 2 && $n <= 4 && $n % 1 == 0) ? 1: ($n % 1 != 0 ) ? 2 : 3;;
+}}
+;
+$a->strings["Post to blogger"] = "Poslat na blogger";
+$a->strings["Blogger Export"] = "Blogger Export";
+$a->strings["Enable Blogger Post Addon"] = "Povolit doplněk Blogger Post";
+$a->strings["Blogger username"] = "Blogger uživatelské jméno";
+$a->strings["Blogger password"] = "Blogger heslo";
+$a->strings["Blogger API URL"] = "Blogger API URL";
+$a->strings["Post to Blogger by default"] = "Defaultně zaslat na Blogger";
+$a->strings["Save Settings"] = "Uložit Nastavení";
+$a->strings["Post from Friendica"] = "Příspěvek z Friendica";
diff --git a/blogger/lang/de/messages.po b/blogger/lang/de/messages.po
new file mode 100644
index 00000000..0ecdfd79
--- /dev/null
+++ b/blogger/lang/de/messages.po
@@ -0,0 +1,56 @@
+# ADDON blogger
+# Copyright (C)
+# This file is distributed under the same license as the Friendica blogger addon package.
+# 
+# 
+# Translators:
+# bavatar <tobias.diekershoff@gmx.net>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-06-29 08:19+0000\n"
+"Last-Translator: bavatar <tobias.diekershoff@gmx.net>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/friendica/language/de/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: blogger.php:42
+msgid "Post to blogger"
+msgstr "Auf Blogger posten"
+
+#: blogger.php:74 blogger.php:78
+msgid "Blogger Export"
+msgstr "Blogger Export"
+
+#: blogger.php:82
+msgid "Enable Blogger Post Addon"
+msgstr "Blogger-Post-Addon aktivieren"
+
+#: blogger.php:87
+msgid "Blogger username"
+msgstr "Blogger-Benutzername"
+
+#: blogger.php:92
+msgid "Blogger password"
+msgstr "Blogger-Passwort"
+
+#: blogger.php:97
+msgid "Blogger API URL"
+msgstr "Blogger-API-URL"
+
+#: blogger.php:102
+msgid "Post to Blogger by default"
+msgstr "Standardmäßig auf Blogger posten"
+
+#: blogger.php:108
+msgid "Save Settings"
+msgstr "Einstellungen speichern"
+
+#: blogger.php:178
+msgid "Post from Friendica"
+msgstr "Post via Friendica"
diff --git a/blogger/lang/de/strings.php b/blogger/lang/de/strings.php
new file mode 100644
index 00000000..549b6a2b
--- /dev/null
+++ b/blogger/lang/de/strings.php
@@ -0,0 +1,16 @@
+<?php
+
+if(! function_exists("string_plural_select_de")) {
+function string_plural_select_de($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["Post to blogger"] = "Auf Blogger posten";
+$a->strings["Blogger Export"] = "Blogger Export";
+$a->strings["Enable Blogger Post Addon"] = "Blogger-Post-Addon aktivieren";
+$a->strings["Blogger username"] = "Blogger-Benutzername";
+$a->strings["Blogger password"] = "Blogger-Passwort";
+$a->strings["Blogger API URL"] = "Blogger-API-URL";
+$a->strings["Post to Blogger by default"] = "Standardmäßig auf Blogger posten";
+$a->strings["Save Settings"] = "Einstellungen speichern";
+$a->strings["Post from Friendica"] = "Post via Friendica";
diff --git a/blogger/lang/en-gb/messages.po b/blogger/lang/en-gb/messages.po
new file mode 100644
index 00000000..304db230
--- /dev/null
+++ b/blogger/lang/en-gb/messages.po
@@ -0,0 +1,56 @@
+# ADDON blogger
+# Copyright (C)
+# This file is distributed under the same license as the Friendica blogger addon package.
+# 
+# 
+# Translators:
+# Kris, 2018
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2018-04-08 19:53+0000\n"
+"Last-Translator: Kris\n"
+"Language-Team: English (United Kingdom) (http://www.transifex.com/Friendica/friendica/language/en_GB/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en_GB\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: blogger.php:42
+msgid "Post to blogger"
+msgstr "Post to Blogger"
+
+#: blogger.php:74 blogger.php:78
+msgid "Blogger Export"
+msgstr ""
+
+#: blogger.php:82
+msgid "Enable Blogger Post Addon"
+msgstr "Enable Blogger Post Addon"
+
+#: blogger.php:87
+msgid "Blogger username"
+msgstr "Blogger username"
+
+#: blogger.php:92
+msgid "Blogger password"
+msgstr "Blogger password"
+
+#: blogger.php:97
+msgid "Blogger API URL"
+msgstr ""
+
+#: blogger.php:102
+msgid "Post to Blogger by default"
+msgstr "Post to Blogger by default"
+
+#: blogger.php:108
+msgid "Save Settings"
+msgstr "Save Settings"
+
+#: blogger.php:178
+msgid "Post from Friendica"
+msgstr "Post from Friendica"
diff --git a/blogger/lang/en-gb/strings.php b/blogger/lang/en-gb/strings.php
new file mode 100644
index 00000000..4a02842e
--- /dev/null
+++ b/blogger/lang/en-gb/strings.php
@@ -0,0 +1,16 @@
+<?php
+
+if(! function_exists("string_plural_select_en_gb")) {
+function string_plural_select_en_gb($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["Post to blogger"] = "Post to Blogger";
+$a->strings["Blogger Export"] = "";
+$a->strings["Enable Blogger Post Addon"] = "Enable Blogger Post Addon";
+$a->strings["Blogger username"] = "Blogger username";
+$a->strings["Blogger password"] = "Blogger password";
+$a->strings["Blogger API URL"] = "";
+$a->strings["Post to Blogger by default"] = "Post to Blogger by default";
+$a->strings["Save Settings"] = "Save Settings";
+$a->strings["Post from Friendica"] = "Post from Friendica";
diff --git a/blogger/lang/eo/strings.php b/blogger/lang/eo/strings.php
new file mode 100644
index 00000000..a7783cd8
--- /dev/null
+++ b/blogger/lang/eo/strings.php
@@ -0,0 +1,11 @@
+<?php
+
+$a->strings["Post to blogger"] = "Afiŝi al blogger";
+$a->strings["Blogger Post Settings"] = "Agordo pri Blogger Afiŝoj";
+$a->strings["Enable Blogger Post Addon"] = "Ŝalti la Blogger afiŝo kromprogramon";
+$a->strings["Blogger username"] = "Blogger uzantonomo";
+$a->strings["Blogger password"] = "Blogger pasvorto";
+$a->strings["Blogger API URL"] = "Blogger API URL";
+$a->strings["Post to Blogger by default"] = "Defaŭlte afiŝi al Blogger";
+$a->strings["Submit"] = "Sendi";
+$a->strings["Post from Friendica"] = "Afiŝo de Friendica";
diff --git a/blogger/lang/es/messages.po b/blogger/lang/es/messages.po
new file mode 100644
index 00000000..e4c64973
--- /dev/null
+++ b/blogger/lang/es/messages.po
@@ -0,0 +1,56 @@
+# ADDON blogger
+# Copyright (C)
+# This file is distributed under the same license as the Friendica blogger addon package.
+# 
+# 
+# Translators:
+# Albert, 2018
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2018-05-21 14:27+0000\n"
+"Last-Translator: Albert\n"
+"Language-Team: Spanish (http://www.transifex.com/Friendica/friendica/language/es/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: blogger.php:42
+msgid "Post to blogger"
+msgstr "Entrada para blogger"
+
+#: blogger.php:74 blogger.php:78
+msgid "Blogger Export"
+msgstr "Esportar Blogger"
+
+#: blogger.php:82
+msgid "Enable Blogger Post Addon"
+msgstr "Habilitar el complemento de publicación de Blogger"
+
+#: blogger.php:87
+msgid "Blogger username"
+msgstr "Nombre de usuario de Blogger"
+
+#: blogger.php:92
+msgid "Blogger password"
+msgstr "Contraseña de Blogger"
+
+#: blogger.php:97
+msgid "Blogger API URL"
+msgstr "URL API de Blogger"
+
+#: blogger.php:102
+msgid "Post to Blogger by default"
+msgstr "Entrada a Blogger por defecto"
+
+#: blogger.php:108
+msgid "Save Settings"
+msgstr "Guardar ajustes"
+
+#: blogger.php:178
+msgid "Post from Friendica"
+msgstr "Entrada desde Friendica"
diff --git a/blogger/lang/es/strings.php b/blogger/lang/es/strings.php
new file mode 100644
index 00000000..52b4f120
--- /dev/null
+++ b/blogger/lang/es/strings.php
@@ -0,0 +1,17 @@
+<?php
+
+if(! function_exists("string_plural_select_es")) {
+function string_plural_select_es($n){
+	$n = intval($n);
+	return ($n != 1);;
+}}
+;
+$a->strings["Post to blogger"] = "Entrada para blogger";
+$a->strings["Blogger Export"] = "Esportar Blogger";
+$a->strings["Enable Blogger Post Addon"] = "Habilitar el complemento de publicación de Blogger";
+$a->strings["Blogger username"] = "Nombre de usuario de Blogger";
+$a->strings["Blogger password"] = "Contraseña de Blogger";
+$a->strings["Blogger API URL"] = "URL API de Blogger";
+$a->strings["Post to Blogger by default"] = "Entrada a Blogger por defecto";
+$a->strings["Save Settings"] = "Guardar ajustes";
+$a->strings["Post from Friendica"] = "Entrada desde Friendica";
diff --git a/blogger/lang/fi-fi/messages.po b/blogger/lang/fi-fi/messages.po
new file mode 100644
index 00000000..e24eda7a
--- /dev/null
+++ b/blogger/lang/fi-fi/messages.po
@@ -0,0 +1,57 @@
+# ADDON blogger
+# Copyright (C)
+# This file is distributed under the same license as the Friendica blogger addon package.
+# 
+# 
+# Translators:
+# Kris, 2018
+# Kris, 2018
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2018-04-17 19:18+0000\n"
+"Last-Translator: Kris\n"
+"Language-Team: Finnish (Finland) (http://www.transifex.com/Friendica/friendica/language/fi_FI/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fi_FI\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: blogger.php:42
+msgid "Post to blogger"
+msgstr "Julkaise Bloggerissa"
+
+#: blogger.php:74 blogger.php:78
+msgid "Blogger Export"
+msgstr "Blogger Export"
+
+#: blogger.php:82
+msgid "Enable Blogger Post Addon"
+msgstr "Ota Blogger-viestilisäosa käyttöön"
+
+#: blogger.php:87
+msgid "Blogger username"
+msgstr "Blogger -käyttäjätunnus"
+
+#: blogger.php:92
+msgid "Blogger password"
+msgstr "Blogger -salasana"
+
+#: blogger.php:97
+msgid "Blogger API URL"
+msgstr "Blogger API URL-osoite"
+
+#: blogger.php:102
+msgid "Post to Blogger by default"
+msgstr "Julkaise Bloggeriin oletuksena"
+
+#: blogger.php:108
+msgid "Save Settings"
+msgstr "Tallenna asetukset"
+
+#: blogger.php:178
+msgid "Post from Friendica"
+msgstr "Julkaise Friendicasta"
diff --git a/blogger/lang/fi-fi/strings.php b/blogger/lang/fi-fi/strings.php
new file mode 100644
index 00000000..115518ad
--- /dev/null
+++ b/blogger/lang/fi-fi/strings.php
@@ -0,0 +1,16 @@
+<?php
+
+if(! function_exists("string_plural_select_fi_fi")) {
+function string_plural_select_fi_fi($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["Post to blogger"] = "Julkaise Bloggerissa";
+$a->strings["Blogger Export"] = "Blogger Export";
+$a->strings["Enable Blogger Post Addon"] = "Ota Blogger-viestilisäosa käyttöön";
+$a->strings["Blogger username"] = "Blogger -käyttäjätunnus";
+$a->strings["Blogger password"] = "Blogger -salasana";
+$a->strings["Blogger API URL"] = "Blogger API URL-osoite";
+$a->strings["Post to Blogger by default"] = "Julkaise Bloggeriin oletuksena";
+$a->strings["Save Settings"] = "Tallenna asetukset";
+$a->strings["Post from Friendica"] = "Julkaise Friendicasta";
diff --git a/blogger/lang/fr/messages.po b/blogger/lang/fr/messages.po
new file mode 100644
index 00000000..119fcb56
--- /dev/null
+++ b/blogger/lang/fr/messages.po
@@ -0,0 +1,58 @@
+# ADDON blogger
+# Copyright (C)
+# This file is distributed under the same license as the Friendica blogger addon package.
+# 
+# 
+# Translators:
+# Hypolite Petovan <hypolite@mrpetovan.com>, 2016
+# Marie Olive <lacellule101@gmail.com>, 2018
+# RyDroid <inactive+RyDroid@transifex.com>, 2015
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2018-11-13 12:44+0000\n"
+"Last-Translator: Marie Olive <lacellule101@gmail.com>\n"
+"Language-Team: French (http://www.transifex.com/Friendica/friendica/language/fr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: blogger.php:42
+msgid "Post to blogger"
+msgstr "Poster sur Blogger"
+
+#: blogger.php:74 blogger.php:78
+msgid "Blogger Export"
+msgstr "Export Blogger"
+
+#: blogger.php:82
+msgid "Enable Blogger Post Addon"
+msgstr "Activer l'extension de publication Blogger"
+
+#: blogger.php:87
+msgid "Blogger username"
+msgstr "Nom d'utilisateur Blogger"
+
+#: blogger.php:92
+msgid "Blogger password"
+msgstr "Mot de passe Blogger"
+
+#: blogger.php:97
+msgid "Blogger API URL"
+msgstr "URL de l'API de Blogger"
+
+#: blogger.php:102
+msgid "Post to Blogger by default"
+msgstr "Poster sur Blogger par défaut"
+
+#: blogger.php:108
+msgid "Save Settings"
+msgstr "Sauvegarder les paramètres"
+
+#: blogger.php:178
+msgid "Post from Friendica"
+msgstr "Publier depuis Friendica"
diff --git a/blogger/lang/fr/strings.php b/blogger/lang/fr/strings.php
new file mode 100644
index 00000000..a1500c11
--- /dev/null
+++ b/blogger/lang/fr/strings.php
@@ -0,0 +1,17 @@
+<?php
+
+if(! function_exists("string_plural_select_fr")) {
+function string_plural_select_fr($n){
+	$n = intval($n);
+	return ($n > 1);;
+}}
+;
+$a->strings["Post to blogger"] = "Poster sur Blogger";
+$a->strings["Blogger Export"] = "Export Blogger";
+$a->strings["Enable Blogger Post Addon"] = "Activer l'extension de publication Blogger";
+$a->strings["Blogger username"] = "Nom d'utilisateur Blogger";
+$a->strings["Blogger password"] = "Mot de passe Blogger";
+$a->strings["Blogger API URL"] = "URL de l'API de Blogger";
+$a->strings["Post to Blogger by default"] = "Poster sur Blogger par défaut";
+$a->strings["Save Settings"] = "Sauvegarder les paramètres";
+$a->strings["Post from Friendica"] = "Publier depuis Friendica";
diff --git a/blogger/lang/is/messages.po b/blogger/lang/is/messages.po
new file mode 100644
index 00000000..687b624f
--- /dev/null
+++ b/blogger/lang/is/messages.po
@@ -0,0 +1,56 @@
+# ADDON blogger
+# Copyright (C)
+# This file is distributed under the same license as the Friendica blogger addon package.
+# 
+# 
+# Translators:
+# Sveinn í Felli <sv1@fellsnet.is>, 2016,2018
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2018-05-24 09:45+0000\n"
+"Last-Translator: Sveinn í Felli <sv1@fellsnet.is>\n"
+"Language-Team: Icelandic (http://www.transifex.com/Friendica/friendica/language/is/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: is\n"
+"Plural-Forms: nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);\n"
+
+#: blogger.php:42
+msgid "Post to blogger"
+msgstr "Senda færslu á bloggara"
+
+#: blogger.php:74 blogger.php:78
+msgid "Blogger Export"
+msgstr "Flytja út blogg"
+
+#: blogger.php:82
+msgid "Enable Blogger Post Addon"
+msgstr "Virkja sendiviðbót fyrir blogg"
+
+#: blogger.php:87
+msgid "Blogger username"
+msgstr "Notandanafn bloggara"
+
+#: blogger.php:92
+msgid "Blogger password"
+msgstr "Aðgangsorð bloggara"
+
+#: blogger.php:97
+msgid "Blogger API URL"
+msgstr "API slóð bloggs"
+
+#: blogger.php:102
+msgid "Post to Blogger by default"
+msgstr "Sjálfgefið láta færslur flæða inn á blogg"
+
+#: blogger.php:108
+msgid "Save Settings"
+msgstr "Vista stillingar"
+
+#: blogger.php:178
+msgid "Post from Friendica"
+msgstr "Færslur frá Friendica"
diff --git a/blogger/lang/is/strings.php b/blogger/lang/is/strings.php
new file mode 100644
index 00000000..5e61af39
--- /dev/null
+++ b/blogger/lang/is/strings.php
@@ -0,0 +1,17 @@
+<?php
+
+if(! function_exists("string_plural_select_is")) {
+function string_plural_select_is($n){
+	$n = intval($n);
+	return ($n % 10 != 1 || $n % 100 == 11);;
+}}
+;
+$a->strings["Post to blogger"] = "Senda færslu á bloggara";
+$a->strings["Blogger Export"] = "Flytja út blogg";
+$a->strings["Enable Blogger Post Addon"] = "Virkja sendiviðbót fyrir blogg";
+$a->strings["Blogger username"] = "Notandanafn bloggara";
+$a->strings["Blogger password"] = "Aðgangsorð bloggara";
+$a->strings["Blogger API URL"] = "API slóð bloggs";
+$a->strings["Post to Blogger by default"] = "Sjálfgefið láta færslur flæða inn á blogg";
+$a->strings["Save Settings"] = "Vista stillingar";
+$a->strings["Post from Friendica"] = "Færslur frá Friendica";
diff --git a/blogger/lang/it/messages.po b/blogger/lang/it/messages.po
new file mode 100644
index 00000000..9ee69d62
--- /dev/null
+++ b/blogger/lang/it/messages.po
@@ -0,0 +1,56 @@
+# ADDON blogger
+# Copyright (C)
+# This file is distributed under the same license as the Friendica blogger addon package.
+# 
+# 
+# Translators:
+# fabrixxm <fabrix.xm@gmail.com>, 2014,2018
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2018-03-19 13:21+0000\n"
+"Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n"
+"Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: it\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: blogger.php:42
+msgid "Post to blogger"
+msgstr "Invia a Blogger"
+
+#: blogger.php:74 blogger.php:78
+msgid "Blogger Export"
+msgstr "Esporta Blogger"
+
+#: blogger.php:82
+msgid "Enable Blogger Post Addon"
+msgstr "Abilita il componente aggiuntivo di invio a Blogger"
+
+#: blogger.php:87
+msgid "Blogger username"
+msgstr "Nome utente Blogger"
+
+#: blogger.php:92
+msgid "Blogger password"
+msgstr "Password Blogger"
+
+#: blogger.php:97
+msgid "Blogger API URL"
+msgstr "Indirizzo API Blogger"
+
+#: blogger.php:102
+msgid "Post to Blogger by default"
+msgstr "Invia sempre a Blogger"
+
+#: blogger.php:108
+msgid "Save Settings"
+msgstr "Salva Impostazioni"
+
+#: blogger.php:178
+msgid "Post from Friendica"
+msgstr "Messaggio da Friendica"
diff --git a/blogger/lang/it/strings.php b/blogger/lang/it/strings.php
new file mode 100644
index 00000000..80b7b5fa
--- /dev/null
+++ b/blogger/lang/it/strings.php
@@ -0,0 +1,16 @@
+<?php
+
+if(! function_exists("string_plural_select_it")) {
+function string_plural_select_it($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["Post to blogger"] = "Invia a Blogger";
+$a->strings["Blogger Export"] = "Esporta Blogger";
+$a->strings["Enable Blogger Post Addon"] = "Abilita il componente aggiuntivo di invio a Blogger";
+$a->strings["Blogger username"] = "Nome utente Blogger";
+$a->strings["Blogger password"] = "Password Blogger";
+$a->strings["Blogger API URL"] = "Indirizzo API Blogger";
+$a->strings["Post to Blogger by default"] = "Invia sempre a Blogger";
+$a->strings["Save Settings"] = "Salva Impostazioni";
+$a->strings["Post from Friendica"] = "Messaggio da Friendica";
diff --git a/blogger/lang/nb-no/strings.php b/blogger/lang/nb-no/strings.php
new file mode 100644
index 00000000..3c5a03df
--- /dev/null
+++ b/blogger/lang/nb-no/strings.php
@@ -0,0 +1,11 @@
+<?php
+
+$a->strings["Post to blogger"] = "";
+$a->strings["Blogger Post Settings"] = "";
+$a->strings["Enable Blogger Post Addon"] = "";
+$a->strings["Blogger username"] = "";
+$a->strings["Blogger password"] = "";
+$a->strings["Blogger API URL"] = "";
+$a->strings["Post to Blogger by default"] = "";
+$a->strings["Submit"] = "Lagre";
+$a->strings["Post from Friendica"] = "";
diff --git a/blogger/lang/nl/messages.po b/blogger/lang/nl/messages.po
new file mode 100644
index 00000000..e81976f2
--- /dev/null
+++ b/blogger/lang/nl/messages.po
@@ -0,0 +1,56 @@
+# ADDON blogger
+# Copyright (C)
+# This file is distributed under the same license as the Friendica blogger addon package.
+# 
+# 
+# Translators:
+# AgnesElisa <agneselisa@disroot.org>, 2018
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2018-04-18 23:20+0000\n"
+"Last-Translator: AgnesElisa <agneselisa@disroot.org>\n"
+"Language-Team: Dutch (http://www.transifex.com/Friendica/friendica/language/nl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: blogger.php:42
+msgid "Post to blogger"
+msgstr "Plaatsen op Blogger"
+
+#: blogger.php:74 blogger.php:78
+msgid "Blogger Export"
+msgstr "Blogger Exporteren"
+
+#: blogger.php:82
+msgid "Enable Blogger Post Addon"
+msgstr "Blogger Post Addon inschakelen"
+
+#: blogger.php:87
+msgid "Blogger username"
+msgstr "Blogger gebruikersnaam"
+
+#: blogger.php:92
+msgid "Blogger password"
+msgstr "Blogger wachtwoord"
+
+#: blogger.php:97
+msgid "Blogger API URL"
+msgstr "Blogger API URL"
+
+#: blogger.php:102
+msgid "Post to Blogger by default"
+msgstr "Plaatsen op Blogger als standaard instellen"
+
+#: blogger.php:108
+msgid "Save Settings"
+msgstr "Instellingen Opslaan"
+
+#: blogger.php:178
+msgid "Post from Friendica"
+msgstr "Bericht plaatsen vanaf Friendica"
diff --git a/blogger/lang/nl/strings.php b/blogger/lang/nl/strings.php
new file mode 100644
index 00000000..dd1eeb77
--- /dev/null
+++ b/blogger/lang/nl/strings.php
@@ -0,0 +1,17 @@
+<?php
+
+if(! function_exists("string_plural_select_nl")) {
+function string_plural_select_nl($n){
+	$n = intval($n);
+	return ($n != 1);;
+}}
+;
+$a->strings["Post to blogger"] = "Plaatsen op Blogger";
+$a->strings["Blogger Export"] = "Blogger Exporteren";
+$a->strings["Enable Blogger Post Addon"] = "Blogger Post Addon inschakelen";
+$a->strings["Blogger username"] = "Blogger gebruikersnaam";
+$a->strings["Blogger password"] = "Blogger wachtwoord";
+$a->strings["Blogger API URL"] = "Blogger API URL";
+$a->strings["Post to Blogger by default"] = "Plaatsen op Blogger als standaard instellen";
+$a->strings["Save Settings"] = "Instellingen Opslaan";
+$a->strings["Post from Friendica"] = "Bericht plaatsen vanaf Friendica";
diff --git a/blogger/lang/pl/messages.po b/blogger/lang/pl/messages.po
new file mode 100644
index 00000000..0730360c
--- /dev/null
+++ b/blogger/lang/pl/messages.po
@@ -0,0 +1,56 @@
+# ADDON blogger
+# Copyright (C)
+# This file is distributed under the same license as the Friendica blogger addon package.
+# 
+# 
+# Translators:
+# Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>, 2018
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2018-08-04 10:57+0000\n"
+"Last-Translator: Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>\n"
+"Language-Team: Polish (http://www.transifex.com/Friendica/friendica/language/pl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pl\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
+
+#: blogger.php:42
+msgid "Post to blogger"
+msgstr "Opublikuj w bloggerze"
+
+#: blogger.php:74 blogger.php:78
+msgid "Blogger Export"
+msgstr "Eksport Bloggera"
+
+#: blogger.php:82
+msgid "Enable Blogger Post Addon"
+msgstr "Włącz dodatek Blogger"
+
+#: blogger.php:87
+msgid "Blogger username"
+msgstr "Nazwa użytkownika Blogger"
+
+#: blogger.php:92
+msgid "Blogger password"
+msgstr "Hasło Blogger"
+
+#: blogger.php:97
+msgid "Blogger API URL"
+msgstr "Adres URL interfejsu API Blogger"
+
+#: blogger.php:102
+msgid "Post to Blogger by default"
+msgstr "Opublikuj domyślnie na Blogger"
+
+#: blogger.php:108
+msgid "Save Settings"
+msgstr "Zapisz ustawienia"
+
+#: blogger.php:178
+msgid "Post from Friendica"
+msgstr "Post od Friendica"
diff --git a/blogger/lang/pl/strings.php b/blogger/lang/pl/strings.php
new file mode 100644
index 00000000..a0445900
--- /dev/null
+++ b/blogger/lang/pl/strings.php
@@ -0,0 +1,17 @@
+<?php
+
+if(! function_exists("string_plural_select_pl")) {
+function string_plural_select_pl($n){
+	$n = intval($n);
+	return ($n==1 ? 0 : ($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14) ? 1 : $n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14) ? 2 : 3);;
+}}
+;
+$a->strings["Post to blogger"] = "Opublikuj w bloggerze";
+$a->strings["Blogger Export"] = "Eksport Bloggera";
+$a->strings["Enable Blogger Post Addon"] = "Włącz dodatek Blogger";
+$a->strings["Blogger username"] = "Nazwa użytkownika Blogger";
+$a->strings["Blogger password"] = "Hasło Blogger";
+$a->strings["Blogger API URL"] = "Adres URL interfejsu API Blogger";
+$a->strings["Post to Blogger by default"] = "Opublikuj domyślnie na Blogger";
+$a->strings["Save Settings"] = "Zapisz ustawienia";
+$a->strings["Post from Friendica"] = "Post od Friendica";
diff --git a/blogger/lang/pt-br/messages.po b/blogger/lang/pt-br/messages.po
new file mode 100644
index 00000000..6b22fc20
--- /dev/null
+++ b/blogger/lang/pt-br/messages.po
@@ -0,0 +1,57 @@
+# ADDON blogger
+# Copyright (C)
+# This file is distributed under the same license as the Friendica blogger addon package.
+# 
+# 
+# Translators:
+# Beatriz Vital <vitalb@riseup.net>, 2016
+# John Brazil, 2015
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2016-08-19 20:36+0000\n"
+"Last-Translator: Beatriz Vital <vitalb@riseup.net>\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/Friendica/friendica/language/pt_BR/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pt_BR\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: blogger.php:42
+msgid "Post to blogger"
+msgstr "Publicar no Blogger"
+
+#: blogger.php:74 blogger.php:78
+msgid "Blogger Export"
+msgstr "Exportador Blogger"
+
+#: blogger.php:82
+msgid "Enable Blogger Post Addon"
+msgstr "Habilitar plug-in para publicar no Blogger"
+
+#: blogger.php:87
+msgid "Blogger username"
+msgstr "Nome de usuário no Blogger"
+
+#: blogger.php:92
+msgid "Blogger password"
+msgstr "Senha do Blogger"
+
+#: blogger.php:97
+msgid "Blogger API URL"
+msgstr "URL da API do Blogger"
+
+#: blogger.php:102
+msgid "Post to Blogger by default"
+msgstr "Publicar no Blogger por padrão"
+
+#: blogger.php:108
+msgid "Save Settings"
+msgstr "Salvar Configurações"
+
+#: blogger.php:178
+msgid "Post from Friendica"
+msgstr "Postar a partir de Friendica"
diff --git a/blogger/lang/pt-br/strings.php b/blogger/lang/pt-br/strings.php
new file mode 100644
index 00000000..74a79aca
--- /dev/null
+++ b/blogger/lang/pt-br/strings.php
@@ -0,0 +1,16 @@
+<?php
+
+if(! function_exists("string_plural_select_pt_br")) {
+function string_plural_select_pt_br($n){
+	return ($n > 1);;
+}}
+;
+$a->strings["Post to blogger"] = "Publicar no Blogger";
+$a->strings["Blogger Export"] = "Exportador Blogger";
+$a->strings["Enable Blogger Post Addon"] = "Habilitar plug-in para publicar no Blogger";
+$a->strings["Blogger username"] = "Nome de usuário no Blogger";
+$a->strings["Blogger password"] = "Senha do Blogger";
+$a->strings["Blogger API URL"] = "URL da API do Blogger";
+$a->strings["Post to Blogger by default"] = "Publicar no Blogger por padrão";
+$a->strings["Save Settings"] = "Salvar Configurações";
+$a->strings["Post from Friendica"] = "Postar a partir de Friendica";
diff --git a/blogger/lang/ro/messages.po b/blogger/lang/ro/messages.po
new file mode 100644
index 00000000..de35da2b
--- /dev/null
+++ b/blogger/lang/ro/messages.po
@@ -0,0 +1,55 @@
+# ADDON blogger
+# Copyright (C)
+# This file is distributed under the same license as the Friendica blogger addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-08 11:44+0000\n"
+"Last-Translator: Arian - Cazare Muncitori <arianserv@gmail.com>\n"
+"Language-Team: Romanian (Romania) (http://www.transifex.com/projects/p/friendica/language/ro_RO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ro_RO\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
+
+#: blogger.php:42
+msgid "Post to blogger"
+msgstr "Postați pe Blogger"
+
+#: blogger.php:74 blogger.php:78
+msgid "Blogger Export"
+msgstr "Export pe Blogger "
+
+#: blogger.php:82
+msgid "Enable Blogger Post Addon"
+msgstr "Activare Modul Postare pe Blogger "
+
+#: blogger.php:87
+msgid "Blogger username"
+msgstr "Utilizator Blogger"
+
+#: blogger.php:92
+msgid "Blogger password"
+msgstr "Parolă Blogger "
+
+#: blogger.php:97
+msgid "Blogger API URL"
+msgstr "URL Cheie API Blogger "
+
+#: blogger.php:102
+msgid "Post to Blogger by default"
+msgstr "Postați implicit pe Blogger"
+
+#: blogger.php:108
+msgid "Save Settings"
+msgstr "Salvare Configurări"
+
+#: blogger.php:178
+msgid "Post from Friendica"
+msgstr "Postați din Friendica"
diff --git a/blogger/lang/ro/strings.php b/blogger/lang/ro/strings.php
new file mode 100644
index 00000000..f6aac95d
--- /dev/null
+++ b/blogger/lang/ro/strings.php
@@ -0,0 +1,16 @@
+<?php
+
+if(! function_exists("string_plural_select_ro")) {
+function string_plural_select_ro($n){
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+}}
+;
+$a->strings["Post to blogger"] = "Postați pe Blogger";
+$a->strings["Blogger Export"] = "Export pe Blogger ";
+$a->strings["Enable Blogger Post Addon"] = "Activare Modul Postare pe Blogger ";
+$a->strings["Blogger username"] = "Utilizator Blogger";
+$a->strings["Blogger password"] = "Parolă Blogger ";
+$a->strings["Blogger API URL"] = "URL Cheie API Blogger ";
+$a->strings["Post to Blogger by default"] = "Postați implicit pe Blogger";
+$a->strings["Save Settings"] = "Salvare Configurări";
+$a->strings["Post from Friendica"] = "Postați din Friendica";
diff --git a/blogger/lang/ru/messages.po b/blogger/lang/ru/messages.po
new file mode 100644
index 00000000..62ad1fb3
--- /dev/null
+++ b/blogger/lang/ru/messages.po
@@ -0,0 +1,56 @@
+# ADDON blogger
+# Copyright (C)
+# This file is distributed under the same license as the Friendica blogger addon package.
+# 
+# 
+# Translators:
+# Stanislav N. <pztrn@pztrn.name>, 2017-2018
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2018-05-25 00:00+0000\n"
+"Last-Translator: Stanislav N. <pztrn@pztrn.name>\n"
+"Language-Team: Russian (http://www.transifex.com/Friendica/friendica/language/ru/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ru\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
+
+#: blogger.php:42
+msgid "Post to blogger"
+msgstr "Написать в Blogger"
+
+#: blogger.php:74 blogger.php:78
+msgid "Blogger Export"
+msgstr "Экспорт в Blogger"
+
+#: blogger.php:82
+msgid "Enable Blogger Post Addon"
+msgstr "Включить аддон репоста в Blogger"
+
+#: blogger.php:87
+msgid "Blogger username"
+msgstr "Имя пользователя Blogger"
+
+#: blogger.php:92
+msgid "Blogger password"
+msgstr "Пароль Blogger"
+
+#: blogger.php:97
+msgid "Blogger API URL"
+msgstr "Blogger API URL"
+
+#: blogger.php:102
+msgid "Post to Blogger by default"
+msgstr "Отправлять в Blogger по умолчанию"
+
+#: blogger.php:108
+msgid "Save Settings"
+msgstr "Сохранить настройки"
+
+#: blogger.php:178
+msgid "Post from Friendica"
+msgstr "Сообщение от Friendica"
diff --git a/blogger/lang/ru/strings.php b/blogger/lang/ru/strings.php
new file mode 100644
index 00000000..c90b73e5
--- /dev/null
+++ b/blogger/lang/ru/strings.php
@@ -0,0 +1,17 @@
+<?php
+
+if(! function_exists("string_plural_select_ru")) {
+function string_plural_select_ru($n){
+	$n = intval($n);
+	return ($n%10==1 && $n%100!=11 ? 0 : $n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14) ? 1 : $n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)? 2 : 3);;
+}}
+;
+$a->strings["Post to blogger"] = "Написать в Blogger";
+$a->strings["Blogger Export"] = "Экспорт в Blogger";
+$a->strings["Enable Blogger Post Addon"] = "Включить аддон репоста в Blogger";
+$a->strings["Blogger username"] = "Имя пользователя Blogger";
+$a->strings["Blogger password"] = "Пароль Blogger";
+$a->strings["Blogger API URL"] = "Blogger API URL";
+$a->strings["Post to Blogger by default"] = "Отправлять в Blogger по умолчанию";
+$a->strings["Save Settings"] = "Сохранить настройки";
+$a->strings["Post from Friendica"] = "Сообщение от Friendica";
diff --git a/blogger/lang/sv/messages.po b/blogger/lang/sv/messages.po
new file mode 100644
index 00000000..a9e4ae81
--- /dev/null
+++ b/blogger/lang/sv/messages.po
@@ -0,0 +1,56 @@
+# ADDON blogger
+# Copyright (C)
+# This file is distributed under the same license as the Friendica blogger addon package.
+# 
+# 
+# Translators:
+# Bjoessi <torbjorn.andersson@syte.se>, 2019
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2019-08-20 07:54+0000\n"
+"Last-Translator: Bjoessi <torbjorn.andersson@syte.se>\n"
+"Language-Team: Swedish (http://www.transifex.com/Friendica/friendica/language/sv/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sv\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: blogger.php:42
+msgid "Post to blogger"
+msgstr "Lägg in på Blogger"
+
+#: blogger.php:74 blogger.php:78
+msgid "Blogger Export"
+msgstr "Export till Blogger"
+
+#: blogger.php:82
+msgid "Enable Blogger Post Addon"
+msgstr "Aktivera tillägg för Blogger-inlägg"
+
+#: blogger.php:87
+msgid "Blogger username"
+msgstr "Blogger användarnamn"
+
+#: blogger.php:92
+msgid "Blogger password"
+msgstr "Blogger lösenord"
+
+#: blogger.php:97
+msgid "Blogger API URL"
+msgstr "Blogger API URL"
+
+#: blogger.php:102
+msgid "Post to Blogger by default"
+msgstr "Lägg in på Blogger som standard"
+
+#: blogger.php:108
+msgid "Save Settings"
+msgstr "Spara inställningar"
+
+#: blogger.php:178
+msgid "Post from Friendica"
+msgstr "Inlägg från Friendica"
diff --git a/blogger/lang/sv/strings.php b/blogger/lang/sv/strings.php
new file mode 100644
index 00000000..6bb652dd
--- /dev/null
+++ b/blogger/lang/sv/strings.php
@@ -0,0 +1,17 @@
+<?php
+
+if(! function_exists("string_plural_select_sv")) {
+function string_plural_select_sv($n){
+	$n = intval($n);
+	return ($n != 1);;
+}}
+;
+$a->strings["Post to blogger"] = "Lägg in på Blogger";
+$a->strings["Blogger Export"] = "Export till Blogger";
+$a->strings["Enable Blogger Post Addon"] = "Aktivera tillägg för Blogger-inlägg";
+$a->strings["Blogger username"] = "Blogger användarnamn";
+$a->strings["Blogger password"] = "Blogger lösenord";
+$a->strings["Blogger API URL"] = "Blogger API URL";
+$a->strings["Post to Blogger by default"] = "Lägg in på Blogger som standard";
+$a->strings["Save Settings"] = "Spara inställningar";
+$a->strings["Post from Friendica"] = "Inlägg från Friendica";
diff --git a/blogger/lang/zh-cn/strings.php b/blogger/lang/zh-cn/strings.php
new file mode 100644
index 00000000..d9b71731
--- /dev/null
+++ b/blogger/lang/zh-cn/strings.php
@@ -0,0 +1,11 @@
+<?php
+
+$a->strings["Post to blogger"] = "转播到blogger";
+$a->strings["Blogger Post Settings"] = "Blogger转播设置";
+$a->strings["Enable Blogger Post Addon"] = "使Blogger转播插件可用";
+$a->strings["Blogger username"] = "Blogger用户名";
+$a->strings["Blogger password"] = "Blogger密码";
+$a->strings["Blogger API URL"] = "Blogger API URL";
+$a->strings["Post to Blogger by default"] = "默认地转播到Blogger";
+$a->strings["Submit"] = "提交";
+$a->strings["Post from Friendica"] = "文章从Friendica";
diff --git a/bluesky/README.md b/bluesky/README.md
deleted file mode 100644
index bf900fcd..00000000
--- a/bluesky/README.md
+++ /dev/null
@@ -1,9 +0,0 @@
-Bluesky Addon
-==============
-
-This addon supports posting to and receiving posts from Bluesky.
-
-No setup is needed for the admins to make it work for their users.
-
-Bluesky itself is under development as well. It is planned to make it decentral.
-The addon is prepared to support different servers. But it isn't enabled yet.
\ No newline at end of file
diff --git a/bluesky/bluesky.php b/bluesky/bluesky.php
deleted file mode 100644
index 2cd2d263..00000000
--- a/bluesky/bluesky.php
+++ /dev/null
@@ -1,1908 +0,0 @@
-<?php
-/**
- * Name: Bluesky Connector
- * Description: Post to Bluesky
- * Version: 1.1
- * Author: Michael Vogel <https://pirati.ca/profile/heluecht>
- *
- * @todo
- * Currently technical issues in the core:
- * - Outgoing mentions
- *
- * At some point in time:
- * - Sending Quote shares https://atproto.com/lexicons/app-bsky-embed#appbskyembedrecord and https://atproto.com/lexicons/app-bsky-embed#appbskyembedrecordwithmedia
- *
- * Possibly not possible:
- * - only fetch new posts
- *
- * Currently not possible, due to limitations in Friendica
- * - mute contacts https://atproto.com/lexicons/app-bsky-graph#appbskygraphmuteactor
- * - unmute contacts https://atproto.com/lexicons/app-bsky-graph#appbskygraphunmuteactor
- *
- * Possibly interesting:
- * - https://atproto.com/lexicons/com-atproto-label#comatprotolabelsubscribelabels
- */
-
-use Friendica\Content\Text\BBCode;
-use Friendica\Content\Text\HTML;
-use Friendica\Content\Text\Plaintext;
-use Friendica\Core\Cache\Enum\Duration;
-use Friendica\Core\Config\Util\ConfigFileManager;
-use Friendica\Core\Hook;
-use Friendica\Core\Logger;
-use Friendica\Core\Protocol;
-use Friendica\Core\Renderer;
-use Friendica\Core\Worker;
-use Friendica\Database\DBA;
-use Friendica\DI;
-use Friendica\Model\Contact;
-use Friendica\Model\GServer;
-use Friendica\Model\Item;
-use Friendica\Model\ItemURI;
-use Friendica\Model\Photo;
-use Friendica\Model\Post;
-use Friendica\Model\Tag;
-use Friendica\Model\User;
-use Friendica\Network\HTTPClient\Client\HttpClientAccept;
-use Friendica\Network\HTTPClient\Client\HttpClientOptions;
-use Friendica\Object\Image;
-use Friendica\Protocol\Activity;
-use Friendica\Protocol\Relay;
-use Friendica\Util\DateTimeFormat;
-use Friendica\Util\Strings;
-
-const BLUESKY_DEFAULT_POLL_INTERVAL = 10; // given in minutes
-const BLUESKY_IMAGE_SIZE = [1000000, 500000, 100000, 50000];
-
-const BLUEKSY_STATUS_UNKNOWN    = 0;
-const BLUEKSY_STATUS_TOKEN_OK   = 1;
-const BLUEKSY_STATUS_SUCCESS    = 2;
-const BLUEKSY_STATUS_API_FAIL   = 10;
-const BLUEKSY_STATUS_DID_FAIL   = 11;
-const BLUEKSY_STATUS_PDS_FAIL   = 12;
-const BLUEKSY_STATUS_TOKEN_FAIL = 13;
-
-/*
- * (Currently) hard wired paths for Bluesky services
- */
-const BLUESKY_DIRECTORY = 'https://plc.directory'; // Path to the directory server service to fetch the PDS of a given DID
-const BLUESKY_PDS       = 'https://bsky.social';   // Path to the personal data server service (PDS) to fetch the DID for a given handle
-const BLUESKY_WEB       = 'https://bsky.app';      // Path to the web interface with the user profile and posts
-
-function bluesky_install()
-{
-	Hook::register('load_config',             __FILE__, 'bluesky_load_config');
-	Hook::register('hook_fork',               __FILE__, 'bluesky_hook_fork');
-	Hook::register('post_local',              __FILE__, 'bluesky_post_local');
-	Hook::register('notifier_normal',         __FILE__, 'bluesky_send');
-	Hook::register('jot_networks',            __FILE__, 'bluesky_jot_nets');
-	Hook::register('connector_settings',      __FILE__, 'bluesky_settings');
-	Hook::register('connector_settings_post', __FILE__, 'bluesky_settings_post');
-	Hook::register('cron',                    __FILE__, 'bluesky_cron');
-	Hook::register('support_follow',          __FILE__, 'bluesky_support_follow');
-	Hook::register('support_probe',           __FILE__, 'bluesky_support_probe');
-	Hook::register('follow',                  __FILE__, 'bluesky_follow');
-	Hook::register('unfollow',                __FILE__, 'bluesky_unfollow');
-	Hook::register('block',                   __FILE__, 'bluesky_block');
-	Hook::register('unblock',                 __FILE__, 'bluesky_unblock');
-	Hook::register('check_item_notification', __FILE__, 'bluesky_check_item_notification');
-	Hook::register('probe_detect',            __FILE__, 'bluesky_probe_detect');
-	Hook::register('item_by_link',            __FILE__, 'bluesky_item_by_link');
-}
-
-function bluesky_load_config(ConfigFileManager $loader)
-{
-	DI::app()->getConfigCache()->load($loader->loadAddonConfig('bluesky'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
-}
-
-function bluesky_check_item_notification(array &$notification_data)
-{
-	$did = DI::pConfig()->get($notification_data['uid'], 'bluesky', 'did');
-
-	if (!empty($did)) {
-		$notification_data['profiles'][] = $did;
-	}
-}
-
-function bluesky_probe_detect(array &$hookData)
-{
-	// Don't overwrite an existing result
-	if (isset($hookData['result'])) {
-		return;
-	}
-
-	// Avoid a lookup for the wrong network
-	if (!in_array($hookData['network'], ['', Protocol::BLUESKY])) {
-		return;
-	}
-
-	$pconfig = DBA::selectFirst('pconfig', ['uid'], ["`cat` = ? AND `k` = ? AND `v` != ?", 'bluesky', 'access_token', '']);
-	if (empty($pconfig['uid'])) {
-		return;
-	}
-
-	if (parse_url($hookData['uri'], PHP_URL_SCHEME) == 'did') {
-		$did = $hookData['uri'];
-	} elseif (preg_match('#^' . BLUESKY_WEB . '/profile/(.+)#', $hookData['uri'], $matches)) {
-		$did = bluesky_get_did($matches[1]);
-		if (empty($did)) {
-			return;
-		}
-	} else {
-		return;
-	}
-
-	$token = bluesky_get_token($pconfig['uid']);
-	if (empty($token)) {
-		return;
-	}
-
-	$data = bluesky_xrpc_get($pconfig['uid'], 'app.bsky.actor.getProfile', ['actor' => $did]);
-	if (empty($data)) {
-		return;
-	}
-
-	$hookData['result'] = bluesky_get_contact_fields($data, 0, $pconfig['uid'], false);
-
-	$hookData['result']['baseurl'] = bluesky_get_pds($did);
-
-	// Preparing probe data. This differs slightly from the contact array
-	$hookData['result']['about']    = HTML::toBBCode($data->description ?? '');
-	$hookData['result']['photo']    = $data->avatar ?? '';
-	$hookData['result']['header']   = $data->banner ?? '';
-	$hookData['result']['batch']    = '';
-	$hookData['result']['notify']   = '';
-	$hookData['result']['poll']     = '';
-	$hookData['result']['poco']     = '';
-	$hookData['result']['pubkey']   = '';
-	$hookData['result']['priority'] = 0;
-	$hookData['result']['guid']     = '';
-}
-
-function bluesky_item_by_link(array &$hookData)
-{
-	// Don't overwrite an existing result
-	if (isset($hookData['item_id'])) {
-		return;
-	}
-
-	$token = bluesky_get_token($hookData['uid']);
-	if (empty($token)) {
-		return;
-	}
-
-	if (!preg_match('#^' . BLUESKY_WEB . '/profile/(.+)/post/(.+)#', $hookData['uri'], $matches)) {
-		return;
-	}
-
-	$did = bluesky_get_did($matches[1]);
-	if (empty($did)) {
-		return;
-	}
-
-	Logger::debug('Found bluesky post', ['url' => $hookData['uri'], 'handle' => $matches[1], 'did' => $did, 'cid' => $matches[2]]);
-
-	$uri = 'at://' . $did . '/app.bsky.feed.post/' . $matches[2];
-
-	$uri = bluesky_fetch_missing_post($uri, $hookData['uid'], $hookData['uid'], Item::PR_FETCHED, 0, 0, 0);
-	Logger::debug('Got post', ['profile' => $matches[1], 'cid' => $matches[2], 'result' => $uri]);
-	if (!empty($uri)) {
-		$item = Post::selectFirst(['id'], ['uri' => $uri, 'uid' => $hookData['uid']]);
-		if (!empty($item['id'])) {
-			$hookData['item_id'] = $item['id'];
-		}
-	}
-}
-
-function bluesky_support_follow(array &$data)
-{
-	if ($data['protocol'] == Protocol::BLUESKY) {
-		$data['result'] = true;
-	}
-}
-
-function bluesky_support_probe(array &$data)
-{
-	if ($data['protocol'] == Protocol::BLUESKY) {
-		$data['result'] = true;
-	}
-}
-
-function bluesky_follow(array &$hook_data)
-{
-	$token = bluesky_get_token($hook_data['uid']);
-	if (empty($token)) {
-		return;
-	}
-
-	Logger::debug('Check if contact is bluesky', ['data' => $hook_data]);
-	$contact = DBA::selectFirst('contact', [], ['network' => Protocol::BLUESKY, 'url' => $hook_data['url'], 'uid' => [0, $hook_data['uid']]]);
-	if (empty($contact)) {
-		return;
-	}
-
-	$record = [
-		'subject'   => $contact['url'],
-		'createdAt' => DateTimeFormat::utcNow(DateTimeFormat::ATOM),
-		'$type'     => 'app.bsky.graph.follow'
-	];
-
-	$post = [
-		'collection' => 'app.bsky.graph.follow',
-		'repo'       => DI::pConfig()->get($hook_data['uid'], 'bluesky', 'did'),
-		'record'     => $record
-	];
-
-	$activity = bluesky_xrpc_post($hook_data['uid'], 'com.atproto.repo.createRecord', $post);
-	if (!empty($activity->uri)) {
-		$hook_data['contact'] = $contact;
-		Logger::debug('Successfully start following', ['url' => $contact['url'], 'uri' => $activity->uri]);
-	}
-}
-
-function bluesky_unfollow(array &$hook_data)
-{
-	$token = bluesky_get_token($hook_data['uid']);
-	if (empty($token)) {
-		return;
-	}
-
-	if ($hook_data['contact']['network'] != Protocol::BLUESKY) {
-		return;
-	}
-
-	$data = bluesky_xrpc_get($hook_data['uid'], 'app.bsky.actor.getProfile', ['actor' => $hook_data['contact']['url']]);
-	if (empty($data->viewer) || empty($data->viewer->following)) {
-		return;
-	}
-
-	bluesky_delete_post($data->viewer->following, $hook_data['uid']);
-
-	$hook_data['result'] = true;
-}
-
-function bluesky_block(array &$hook_data)
-{
-	$token = bluesky_get_token($hook_data['uid']);
-	if (empty($token)) {
-		return;
-	}
-
-	Logger::debug('Check if contact is bluesky', ['data' => $hook_data]);
-	$contact = DBA::selectFirst('contact', [], ['network' => Protocol::BLUESKY, 'url' => $hook_data['url'], 'uid' => [0, $hook_data['uid']]]);
-	if (empty($contact)) {
-		return;
-	}
-
-	$record = [
-		'subject'   => $contact['url'],
-		'createdAt' => DateTimeFormat::utcNow(DateTimeFormat::ATOM),
-		'$type'     => 'app.bsky.graph.block'
-	];
-
-	$post = [
-		'collection' => 'app.bsky.graph.block',
-		'repo'       => DI::pConfig()->get($hook_data['uid'], 'bluesky', 'did'),
-		'record'     => $record
-	];
-
-	$activity = bluesky_xrpc_post($hook_data['uid'], 'com.atproto.repo.createRecord', $post);
-	if (!empty($activity->uri)) {
-		$cdata = Contact::getPublicAndUserContactID($hook_data['contact']['id'], $hook_data['uid']);
-		if (!empty($cdata['user'])) {
-			Contact::remove($cdata['user']);
-		}
-		Logger::debug('Successfully blocked contact', ['url' => $hook_data['contact']['url'], 'uri' => $activity->uri]);
-	}
-}
-
-function bluesky_unblock(array &$hook_data)
-{
-	$token = bluesky_get_token($hook_data['uid']);
-	if (empty($token)) {
-		return;
-	}
-
-	if ($hook_data['contact']['network'] != Protocol::BLUESKY) {
-		return;
-	}
-
-	$data = bluesky_xrpc_get($hook_data['uid'], 'app.bsky.actor.getProfile', ['actor' => $hook_data['contact']['url']]);
-	if (empty($data->viewer) || empty($data->viewer->blocking)) {
-		return;
-	}
-
-	bluesky_delete_post($data->viewer->blocking, $hook_data['uid']);
-
-	$hook_data['result'] = true;
-}
-
-function bluesky_addon_admin(string &$o)
-{
-	$t = Renderer::getMarkupTemplate('admin.tpl', 'addon/bluesky/');
-
-	$o = Renderer::replaceMacros($t, [
-		'$submit' => DI::l10n()->t('Save Settings'),
-		'$friendica_handles'    => ['friendica_handles', DI::l10n()->t('Allow your users to use your hostname for their Bluesky handles'), DI::config()->get('bluesky', 'friendica_handles'), DI::l10n()->t('Before enabling this option, you have to setup a wildcard domain configuration and you have to enable wildcard requests in your webserver configuration. On Apache this is done by adding "ServerAlias *.%s" to your HTTP configuration. You don\'t need to change the HTTPS configuration.', DI::baseUrl()->getHost())],
-	]);
-}
-
-function bluesky_addon_admin_post()
-{
-	DI::config()->set('bluesky', 'friendica_handles', (bool)$_POST['friendica_handles']);
-}
-
-function bluesky_settings(array &$data)
-{
-	if (!DI::userSession()->getLocalUserId()) {
-		return;
-	}
-
-	$enabled       = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'post') ?? false;
-	$def_enabled   = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'post_by_default') ?? false;
-	$pds           = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'pds');
-	$handle        = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'handle');
-	$did           = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'did');
-	$token         = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'access_token');
-	$import        = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'import') ?? false;
-	$import_feeds  = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'import_feeds') ?? false;
-	$custom_handle = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'friendica_handle') ?? false;
-
-	if (DI::config()->get('bluesky', 'friendica_handles')) {
-		$self = User::getById(DI::userSession()->getLocalUserId(), ['nickname']);
-		$handle = $self['nickname'] . '.' . DI::baseUrl()->getHost();
-		$friendica_handle = ['bluesky_friendica_handle', DI::l10n()->t('Allow to use %s as your Bluesky handle.', $handle), $custom_handle, DI::l10n()->t('When enabled, you can use %s as your Bluesky handle. After you enabled this option, please go to https://bsky.app/settings and select to change your handle. Select that you have got your own domain. Then enter %s and select "No DNS Panel". Then select "Verify Text File".', $handle, $handle)];
-	} else {
-		$friendica_handle = [];
-	}
-
-	$t    = Renderer::getMarkupTemplate('connector_settings.tpl', 'addon/bluesky/');
-	$html = Renderer::replaceMacros($t, [
-		'$enable'       => ['bluesky', DI::l10n()->t('Enable Bluesky Post Addon'), $enabled],
-		'$bydefault'    => ['bluesky_bydefault', DI::l10n()->t('Post to Bluesky by default'), $def_enabled],
-		'$import'       => ['bluesky_import', DI::l10n()->t('Import the remote timeline'), $import],
-		'$import_feeds' => ['bluesky_import_feeds', DI::l10n()->t('Import the pinned feeds'), $import_feeds, DI::l10n()->t('When activated, Posts will be imported from all the feeds that you pinned in Bluesky.')],
-		'$custom_handle' => $friendica_handle,
-		'$pds'          => ['bluesky_pds', DI::l10n()->t('Personal Data Server'), $pds, DI::l10n()->t('The personal data server (PDS) is the system that hosts your profile.'), '', 'readonly'],
-		'$handle'       => ['bluesky_handle', DI::l10n()->t('Bluesky handle'), $handle],
-		'$did'          => ['bluesky_did', DI::l10n()->t('Bluesky DID'), $did, DI::l10n()->t('This is the unique identifier. It will be fetched automatically, when the handle is entered.'), '', 'readonly'],
-		'$password'     => ['bluesky_password', DI::l10n()->t('Bluesky app password'), '', DI::l10n()->t("Please don't add your real password here, but instead create a specific app password in the Bluesky settings.")],
-		'$status'       => bluesky_get_status($handle, $did, $pds, $token),
-	]);
-
-	$data = [
-		'connector' => 'bluesky',
-		'title'     => DI::l10n()->t('Bluesky Import/Export'),
-		'image'     => 'images/bluesky.jpg',
-		'enabled'   => $enabled,
-		'html'      => $html,
-	];
-}
-
-function bluesky_get_status(string $handle = null, string $did = null, string $pds = null, string $token = null): string
-{
-	if (empty($handle)) {
-		return DI::l10n()->t('You are not authenticated. Please enter your handle and the app password.');
-	}
-
-	$status = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'status') ?? BLUEKSY_STATUS_UNKNOWN;
-
-	// Fallback mechanism for connection that had been established before the introduction of the status
-	if ($status == BLUEKSY_STATUS_UNKNOWN) {
-		if (empty($did)) {
-			$status = BLUEKSY_STATUS_DID_FAIL;
-		} elseif (empty($pds)) {
-			$status = BLUEKSY_STATUS_PDS_FAIL;
-		} elseif (!empty($token)) {
-			$status = BLUEKSY_STATUS_TOKEN_OK;
-		} else {
-			$status = BLUEKSY_STATUS_TOKEN_FAIL;
-		}
-	}
-
-	switch ($status) {
-		case BLUEKSY_STATUS_TOKEN_OK:
-			return DI::l10n()->t("You are authenticated to Bluesky. For security reasons the password isn't stored.");
-		case BLUEKSY_STATUS_SUCCESS:
-			return DI::l10n()->t('The communication with the personal data server service (PDS) is established.');
-		case BLUEKSY_STATUS_API_FAIL;
-			return DI::l10n()->t('Communication issues with the personal data server service (PDS).');
-		case BLUEKSY_STATUS_DID_FAIL:
-			return DI::l10n()->t('The DID for the provided handle could not be detected. Please check if you entered the correct handle.');
-		case BLUEKSY_STATUS_PDS_FAIL:
-			return DI::l10n()->t('The personal data server service (PDS) could not be detected.');
-		case BLUEKSY_STATUS_TOKEN_FAIL:
-			return DI::l10n()->t('The authentication with the provided handle and password failed. Please check if you entered the correct password.');
-		default:
-			return '';
-	}
-}
-
-function bluesky_settings_post(array &$b)
-{
-	if (empty($_POST['bluesky-submit'])) {
-		return;
-	}
-
-	$old_pds    = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'pds');
-	$old_handle = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'handle');
-	$old_did    = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'did');
-
-	$handle = trim($_POST['bluesky_handle'], ' @');
-
-	DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'bluesky', 'post',             intval($_POST['bluesky']));
-	DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'bluesky', 'post_by_default',  intval($_POST['bluesky_bydefault']));
-	DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'bluesky', 'handle',           $handle);
-	DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'bluesky', 'import',           intval($_POST['bluesky_import']));
-	DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'bluesky', 'import_feeds',     intval($_POST['bluesky_import_feeds']));
-	DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'bluesky', 'friendica_handle', intval($_POST['bluesky_friendica_handle']));
-
-	if (!empty($handle)) {
-		if (empty($old_did) || $old_handle != $handle) {
-			$did = bluesky_get_did(DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'handle'));
-			if (empty($did)) {
-				DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'bluesky', 'status', BLUEKSY_STATUS_DID_FAIL);
-			}
-			DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'bluesky', 'did', $did);
-		} else {
-			$did = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'did');
-		}
-		if (!empty($did) && (empty($old_pds) || $old_handle != $handle)) {
-			$pds = bluesky_get_pds($did);
-			if (empty($pds)) {
-				DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'bluesky', 'status', BLUEKSY_STATUS_PDS_FAIL);
-			}
-			DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'bluesky', 'pds', $pds);
-		} else {
-			$pds = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'pds');
-		}
-	} else {
-		DI::pConfig()->delete(DI::userSession()->getLocalUserId(), 'bluesky', 'did');
-		DI::pConfig()->delete(DI::userSession()->getLocalUserId(), 'bluesky', 'pds');
-		DI::pConfig()->delete(DI::userSession()->getLocalUserId(), 'bluesky', 'access_token');
-		DI::pConfig()->delete(DI::userSession()->getLocalUserId(), 'bluesky', 'refresh_token');
-		DI::pConfig()->delete(DI::userSession()->getLocalUserId(), 'bluesky', 'token_created');
-		DI::pConfig()->delete(DI::userSession()->getLocalUserId(), 'bluesky', 'status');
-	}
-
-	if (!empty($did) && !empty($pds) && !empty($_POST['bluesky_password'])) {
-		bluesky_create_token(DI::userSession()->getLocalUserId(), $_POST['bluesky_password']);
-	}
-}
-
-function bluesky_jot_nets(array &$jotnets_fields)
-{
-	if (!DI::userSession()->getLocalUserId()) {
-		return;
-	}
-
-	if (DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'post')) {
-		$jotnets_fields[] = [
-			'type'  => 'checkbox',
-			'field' => [
-				'bluesky_enable',
-				DI::l10n()->t('Post to Bluesky'),
-				DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'post_by_default')
-			]
-		];
-	}
-}
-
-function bluesky_cron()
-{
-	$last = (int)DI::keyValue()->get('bluesky_last_poll');
-
-	$poll_interval = intval(DI::config()->get('bluesky', 'poll_interval'));
-	if (!$poll_interval) {
-		$poll_interval = BLUESKY_DEFAULT_POLL_INTERVAL;
-	}
-
-	if ($last) {
-		$next = $last + ($poll_interval * 60);
-		if ($next > time()) {
-			Logger::notice('poll interval not reached');
-			return;
-		}
-	}
-	Logger::notice('cron_start');
-
-	$abandon_days = intval(DI::config()->get('system', 'account_abandon_days'));
-	if ($abandon_days < 1) {
-		$abandon_days = 0;
-	}
-
-	$abandon_limit = date(DateTimeFormat::MYSQL, time() - $abandon_days * 86400);
-
-	$pconfigs = DBA::selectToArray('pconfig', [], ['cat' => 'bluesky', 'k' => 'import', 'v' => true]);
-	foreach ($pconfigs as $pconfig) {
-		if ($abandon_days != 0) {
-			if (!DBA::exists('user', ["`uid` = ? AND `login_date` >= ?", $pconfig['uid'], $abandon_limit])) {
-				Logger::notice('abandoned account: timeline from user will not be imported', ['user' => $pconfig['uid']]);
-				continue;
-			}
-		}
-
-		// Refresh the token now, so that it doesn't need to be refreshed in parallel by the following workers
-		bluesky_get_token($pconfig['uid']);
-
-		Worker::add(['priority' => Worker::PRIORITY_MEDIUM, 'force_priority' => true], 'addon/bluesky/bluesky_notifications.php', $pconfig['uid'], $last);
-		Worker::add(['priority' => Worker::PRIORITY_MEDIUM, 'force_priority' => true], 'addon/bluesky/bluesky_timeline.php', $pconfig['uid'], $last);
-
-		if (DI::pConfig()->get($pconfig['uid'], 'bluesky', 'import_feeds')) {
-			$feeds = bluesky_get_feeds($pconfig['uid']);
-			foreach ($feeds as $feed) {
-				Worker::add(['priority' => Worker::PRIORITY_MEDIUM, 'force_priority' => true], 'addon/bluesky/bluesky_feed.php', $pconfig['uid'], $feed, $last);
-			}
-		}
-	}
-
-	$last_clean = DI::keyValue()->get('bluesky_last_clean');
-	if (empty($last_clean) || ($last_clean + 86400 < time())) {
-		Logger::notice('Start contact cleanup');
-		$contacts = DBA::select('account-user-view', ['id', 'pid'], ["`network` = ? AND `uid` != ? AND `rel` = ?", Protocol::BLUESKY, 0, Contact::NOTHING]);
-		while ($contact = DBA::fetch($contacts)) {
-			Worker::add(Worker::PRIORITY_LOW, 'MergeContact', $contact['pid'], $contact['id'], 0);
-		}
-		DBA::close($contacts);
-		DI::keyValue()->set('bluesky_last_clean', time());
-		Logger::notice('Contact cleanup done');
-	}
-
-	Logger::notice('cron_end');
-
-	DI::keyValue()->set('bluesky_last_poll', time());
-}
-
-function bluesky_hook_fork(array &$b)
-{
-	if ($b['name'] != 'notifier_normal') {
-		return;
-	}
-
-	$post = $b['data'];
-
-	if (($post['created'] !== $post['edited']) && !$post['deleted']) {
-		DI::logger()->info('Editing is not supported by the addon');
-		$b['execute'] = false;
-		return;
-	}
-
-	if (DI::pConfig()->get($post['uid'], 'bluesky', 'import')) {
-		// Don't post if it isn't a reply to a bluesky post
-		if (($post['parent'] != $post['id']) && !Post::exists(['id' => $post['parent'], 'network' => Protocol::BLUESKY])) {
-			Logger::notice('No bluesky parent found', ['item' => $post['id']]);
-			$b['execute'] = false;
-			return;
-		}
-	} elseif (!strstr($post['postopts'] ?? '', 'bluesky') || ($post['parent'] != $post['id']) || $post['private']) {
-		DI::logger()->info('Activities are never exported when we don\'t import the bluesky timeline', ['uid' => $post['uid']]);
-		$b['execute'] = false;
-		return;
-	}
-}
-
-function bluesky_post_local(array &$b)
-{
-	if ($b['edit']) {
-		return;
-	}
-
-	if (!DI::userSession()->getLocalUserId() || (DI::userSession()->getLocalUserId() != $b['uid'])) {
-		return;
-	}
-
-	if ($b['private'] || $b['parent']) {
-		return;
-	}
-
-	$bluesky_post   = intval(DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'post'));
-	$bluesky_enable = (($bluesky_post && !empty($_REQUEST['bluesky_enable'])) ? intval($_REQUEST['bluesky_enable']) : 0);
-
-	// if API is used, default to the chosen settings
-	if ($b['api_source'] && intval(DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'bluesky', 'post_by_default'))) {
-		$bluesky_enable = 1;
-	}
-
-	if (!$bluesky_enable) {
-		return;
-	}
-
-	if (strlen($b['postopts'])) {
-		$b['postopts'] .= ',';
-	}
-
-	$b['postopts'] .= 'bluesky';
-}
-
-function bluesky_send(array &$b)
-{
-	if (($b['created'] !== $b['edited']) && !$b['deleted']) {
-		return;
-	}
-
-	if ($b['gravity'] != Item::GRAVITY_PARENT) {
-		Logger::debug('Got comment', ['item' => $b]);
-
-		if ($b['deleted']) {
-			$uri = bluesky_get_uri_class($b['uri']);
-			if (empty($uri)) {
-				Logger::debug('Not a bluesky post', ['uri' => $b['uri']]);
-				return;
-			}
-			bluesky_delete_post($b['uri'], $b['uid']);
-			return;
-		}
-
-		$root   = bluesky_get_uri_class($b['parent-uri']);
-		$parent = bluesky_get_uri_class($b['thr-parent']);
-
-		if (empty($root) || empty($parent)) {
-			Logger::debug('No bluesky post', ['parent' => $b['parent'], 'thr-parent' => $b['thr-parent']]);
-			return;
-		}
-
-		if ($b['gravity'] == Item::GRAVITY_COMMENT) {
-			Logger::debug('Posting comment', ['root' => $root, 'parent' => $parent]);
-			bluesky_create_post($b, $root, $parent);
-			return;
-		} elseif (in_array($b['verb'], [Activity::LIKE, Activity::ANNOUNCE])) {
-			bluesky_create_activity($b, $parent);
-		}
-		return;
-	} elseif ($b['private'] || !strstr($b['postopts'], 'bluesky')) {
-		return;
-	}
-
-	bluesky_create_post($b);
-}
-
-function bluesky_create_activity(array $item, stdClass $parent = null)
-{
-	$uid = $item['uid'];
-	$token = bluesky_get_token($uid);
-	if (empty($token)) {
-		return;
-	}
-
-	$did  = DI::pConfig()->get($uid, 'bluesky', 'did');
-
-	if ($item['verb'] == Activity::LIKE) {
-		$record = [
-			'subject'   => $parent,
-			'createdAt' => DateTimeFormat::utcNow(DateTimeFormat::ATOM),
-			'$type'     => 'app.bsky.feed.like'
-		];
-
-		$post = [
-			'collection' => 'app.bsky.feed.like',
-			'repo'       => $did,
-			'record'     => $record
-		];
-	} elseif ($item['verb'] == Activity::ANNOUNCE) {
-		$record = [
-			'subject'   => $parent,
-			'createdAt' => DateTimeFormat::utcNow(DateTimeFormat::ATOM),
-			'$type'     => 'app.bsky.feed.repost'
-		];
-
-		$post = [
-			'collection' => 'app.bsky.feed.repost',
-			'repo'       => $did,
-			'record'     => $record
-		];
-	}
-
-	$activity = bluesky_xrpc_post($uid, 'com.atproto.repo.createRecord', $post);
-	if (empty($activity)) {
-		return;
-	}
-	Logger::debug('Activity done', ['return' => $activity]);
-	$uri = bluesky_get_uri($activity);
-	Item::update(['extid' => $uri], ['id' => $item['id']]);
-	Logger::debug('Set extid', ['id' => $item['id'], 'extid' => $activity]);
-}
-
-function bluesky_create_post(array $item, stdClass $root = null, stdClass $parent = null)
-{
-	$uid = $item['uid'];
-	$token = bluesky_get_token($uid);
-	if (empty($token)) {
-		return;
-	}
-
-	// Try to fetch the language from the post itself
-	if (!empty($item['language'])) {
-		$language = array_key_first(json_decode($item['language'], true));
-	} else {
-		$language = '';
-	}
-
-	$item['body'] = Post\Media::removeFromBody($item['body']);
-
-	foreach (Post\Media::getByURIId($item['uri-id'], [Post\Media::AUDIO, Post\Media::VIDEO, Post\Media::ACTIVITY]) as $media) {
-		if (strpos($item['body'], $media['url']) === false) {
-			$item['body'] .= "\n[url]" . $media['url'] . "[/url]\n";
-		}
-	}
-	
-	if (!empty($item['quote-uri-id'])) {
-		$quote = Post::selectFirstPost(['uri', 'plink'], ['uri-id' => $item['quote-uri-id']]);
-		if (!empty($quote)) {
-			if ((strpos($item['body'], $quote['plink'] ?: $quote['uri']) === false) && (strpos($item['body'], $quote['uri']) === false)) {
-				$item['body'] .= "\n[url]" . ($quote['plink'] ?: $quote['uri']) . "[/url]\n";
-			}
-		}
-	}
-	
-	$urls = bluesky_get_urls($item['body']);
-	$item['body'] = $urls['body'];
-
-	$msg = Plaintext::getPost($item, 300, false, BBCode::BLUESKY);
-	foreach ($msg['parts'] as $key => $part) {
-
-		$facets = bluesky_get_facets($part, $urls['urls']);
-
-		$record = [
-			'text'      => $facets['body'],
-			'$type'     => 'app.bsky.feed.post',
-			'createdAt' => DateTimeFormat::utcNow(DateTimeFormat::ATOM),
-		];
-
-		if (!empty($language)) {
-			$record['langs'] = [$language];
-		}
-
-		if (!empty($facets['facets'])) {
-			$record['facets'] = $facets['facets'];
-		}
-
-		if (!empty($root)) {
-			$record['reply'] = ['root' => $root, 'parent' => $parent];
-		}
-
-		if ($key == count($msg['parts']) - 1) {
-			$record = bluesky_add_embed($uid, $msg, $record);
-			if (empty($record)) {
-				if (Worker::getRetrial() < 3) {
-					Worker::defer();
-				}
-				return;
-			}
-		}
-
-		$post = [
-			'collection' => 'app.bsky.feed.post',
-			'repo'       => DI::pConfig()->get($uid, 'bluesky', 'did'),
-			'record'     => $record
-		];
-
-		$parent = bluesky_xrpc_post($uid, 'com.atproto.repo.createRecord', $post);
-		if (empty($parent)) {
-			if ($part == 0) {
-				Worker::defer();
-			}
-			return;
-		}
-		Logger::debug('Posting done', ['return' => $parent]);
-		if (empty($root)) {
-			$root = $parent;
-		}
-		if (($key == 0) && ($item['gravity'] != Item::GRAVITY_PARENT)) {
-			$uri = bluesky_get_uri($parent);
-			Item::update(['extid' => $uri], ['id' => $item['id']]);
-			Logger::debug('Set extid', ['id' => $item['id'], 'extid' => $uri]);
-		}
-	}
-}
-
-function bluesky_get_urls(string $body): array
-{
-	// Remove all hashtag and mention links
-	$body = preg_replace("/([@!])\[url\=(.*?)\](.*?)\[\/url\]/ism", '$1$3', $body);
-
-	$body = BBCode::expandVideoLinks($body);
-	$urls = [];
-
-	// Search for hash tags
-	if (preg_match_all("/#\[url\=(https?:.*?)\](.*?)\[\/url\]/ism", $body, $matches, PREG_SET_ORDER)) {
-		foreach ($matches as $match) {
-			$text = '#' . $match[2];
-			$urls[strpos($body, $match[0])] = ['tag' => $match[2], 'text' => $text, 'hash' => $text];
-			$body = str_replace($match[0], $text, $body);
-		}
-	}
-
-	// Search for pure links
-	if (preg_match_all("/\[url\](https?:.*?)\[\/url\]/ism", $body, $matches, PREG_SET_ORDER)) {
-		foreach ($matches as $match) {
-			$text = Strings::getStyledURL($match[1]);
-			$hash = bluesky_get_hash_for_url($match[0], mb_strlen($text));
-			$urls[strpos($body, $match[0])] = ['url' => $match[1], 'text' => $text, 'hash' => $hash];
-			$body = str_replace($match[0], $hash, $body);
-		}
-	}
-
-	// Search for links with descriptions
-	if (preg_match_all("/\[url\=(https?:.*?)\](.*?)\[\/url\]/ism", $body, $matches, PREG_SET_ORDER)) {
-		foreach ($matches as $match) {
-			if ($match[1] == $match[2]) {
-				$text = Strings::getStyledURL($match[1]);
-			} else {
-				$text = $match[2];
-			}
-			if (mb_strlen($text) < 100) {
-				$hash = bluesky_get_hash_for_url($match[0], mb_strlen($text));
-				$urls[strpos($body, $match[0])] = ['url' => $match[1], 'text' => $text, 'hash' => $hash];
-				$body = str_replace($match[0], $hash, $body);
-			} else {
-				$text = Strings::getStyledURL($match[1]);
-				$hash = bluesky_get_hash_for_url($match[0], mb_strlen($text));
-				$urls[strpos($body, $match[0])] = ['url' => $match[1], 'text' => $text, 'hash' => $hash];
-				$body = str_replace($match[0], $text . ' ' . $hash, $body);
-			}
-		}
-	}
-
-	asort($urls);
-
-	return ['body' => $body, 'urls' => $urls];
-}
-
-function bluesky_get_hash_for_url(string $text, int $linklength): string
-{
-	if ($linklength <= 10) {
-		return '|' . hash('crc32', $text) . '|';
-	}
-	return substr('|' . hash('crc32', $text) . base64_encode($text), 0, $linklength - 2) . '|';
-}
-
-function bluesky_get_facets(string $body, array $urls): array
-{
-	$facets = [];
-
-	foreach ($urls as $url) {
-		$pos = strpos($body, $url['hash']);
-		if ($pos === false) {
-			continue;
-		}
-		if ($pos > 0) {
-			$prefix = substr($body, 0, $pos);
-		} else {
-			$prefix = '';
-		}
-
-		$body = $prefix . $url['text'] . substr($body, $pos + strlen($url['hash']));
-
-		$facet = new stdClass;
-		$facet->index = new stdClass;
-		$facet->index->byteEnd   = $pos + strlen($url['text']);
-		$facet->index->byteStart = $pos;
-
-		$feature = new stdClass;
-
-		$type = '$type';
-		if (!empty($url['tag'])) {
-			$feature->tag = $url['tag'];
-			$feature->$type = 'app.bsky.richtext.facet#tag';
-		} elseif (!empty($url['url'])) {
-			$feature->uri = $url['url'];
-			$feature->$type = 'app.bsky.richtext.facet#link';
-		} else {
-			continue;
-		}
-
-		$facet->features = [$feature];
-		$facets[] = $facet;
-	}
-
-	return ['facets' => $facets, 'body' => $body];
-}
-
-function bluesky_add_embed(int $uid, array $msg, array $record): array
-{
-	if (($msg['type'] != 'link') && !empty($msg['images'])) {
-		$images = [];
-		foreach ($msg['images'] as $image) {
-			if (count($images) == 4) {
-				continue;
-			}
-			$photo = Photo::selectFirst([], ['id' => $image['id']]);
-			$blob = bluesky_upload_blob($uid, $photo);
-			if (empty($blob)) {
-				return [];
-			}
-			$images[] = ['alt' => $image['description'] ?? '', 'image' => $blob];
-		}
-		if (!empty($images)) {
-			$record['embed'] = ['$type' => 'app.bsky.embed.images', 'images' => $images];
-		}
-	} elseif ($msg['type'] == 'link') {
-		$record['embed'] = [
-			'$type'    => 'app.bsky.embed.external',
-			'external' => [
-				'uri'         => $msg['url'],
-				'title'       => $msg['title'] ?? '',
-				'description' => $msg['description'] ?? '',
-			]
-		];
-		if (!empty($msg['image'])) {
-			$photo = Photo::createPhotoForExternalResource($msg['image']);
-			$blob = bluesky_upload_blob($uid, $photo);
-			if (!empty($blob)) {
-				$record['embed']['external']['thumb'] = $blob;
-			}
-		}
-	}
-	return $record;
-}
-
-function bluesky_upload_blob(int $uid, array $photo): ?stdClass
-{
-	$retrial = Worker::getRetrial();
-	$content = Photo::getImageForPhoto($photo);
-
-	$picture = new Image($content, $photo['type'], $photo['filename']);
-	$height  = $picture->getHeight();
-	$width   = $picture->getWidth();
-	$size    = strlen($content);
-
-	$picture    = Photo::resizeToFileSize($picture, BLUESKY_IMAGE_SIZE[$retrial]);
-	$new_height = $picture->getHeight();
-	$new_width  = $picture->getWidth();
-	$content    = $picture->asString();
-	$new_size   = strlen($content);
-
-	Logger::info('Uploading', ['uid' => $uid, 'retrial' => $retrial, 'height' => $new_height, 'width' => $new_width, 'size' => $new_size, 'orig-height' => $height, 'orig-width' => $width, 'orig-size' => $size]);
-
-	$data = bluesky_post($uid, '/xrpc/com.atproto.repo.uploadBlob', $content, ['Content-type' => $photo['type'], 'Authorization' => ['Bearer ' . bluesky_get_token($uid)]]);
-	if (empty($data)) {
-		Logger::info('Uploading failed', ['uid' => $uid, 'retrial' => $retrial, 'height' => $new_height, 'width' => $new_width, 'size' => $new_size, 'orig-height' => $height, 'orig-width' => $width, 'orig-size' => $size]);
-		return null;
-	}
-
-	Logger::debug('Uploaded blob', ['return' => $data, 'uid' => $uid, 'retrial' => $retrial, 'height' => $new_height, 'width' => $new_width, 'size' => $new_size, 'orig-height' => $height, 'orig-width' => $width, 'orig-size' => $size]);
-	return $data->blob;
-}
-
-function bluesky_delete_post(string $uri, int $uid)
-{
-	$parts = bluesky_get_uri_parts($uri);
-	if (empty($parts)) {
-		Logger::debug('No uri delected', ['uri' => $uri]);
-		return;
-	}
-	bluesky_xrpc_post($uid, 'com.atproto.repo.deleteRecord', $parts);
-	Logger::debug('Deleted', ['parts' => $parts]);
-}
-
-function bluesky_fetch_timeline(int $uid, int $last_poll)
-{
-	$data = bluesky_xrpc_get($uid, 'app.bsky.feed.getTimeline');
-	if (empty($data)) {
-		return;
-	}
-
-	if (empty($data->feed)) {
-		return;
-	}
-
-	foreach (array_reverse($data->feed) as $entry) {
-		bluesky_process_post($entry->post, $uid, $uid, Item::PR_NONE, 0, 0, $last_poll);
-		if (!empty($entry->reason)) {
-			bluesky_process_reason($entry->reason, bluesky_get_uri($entry->post), $uid);
-		}
-	}
-
-	// @todo Support paging
-	// [cursor] => 1684670516000::bafyreidq3ilwslmlx72jf5vrk367xcc63s6lrhzlyup2bi3zwcvso6w2vi
-}
-
-function bluesky_process_reason(stdClass $reason, string $uri, int $uid)
-{
-	$type = '$type';
-	if ($reason->$type != 'app.bsky.feed.defs#reasonRepost') {
-		return;
-	}
-
-	$contact = bluesky_get_contact($reason->by, $uid, $uid);
-
-	$item = [
-		'network'       => Protocol::BLUESKY,
-		'uid'           => $uid,
-		'wall'          => false,
-		'uri'           => $reason->by->did . '/app.bsky.feed.repost/' . $reason->indexedAt,
-		'private'       => Item::UNLISTED,
-		'verb'          => Activity::POST,
-		'contact-id'    => $contact['id'],
-		'author-name'   => $contact['name'],
-		'author-link'   => $contact['url'],
-		'author-avatar' => $contact['avatar'],
-		'verb'          => Activity::ANNOUNCE,
-		'body'          => Activity::ANNOUNCE,
-		'gravity'       => Item::GRAVITY_ACTIVITY,
-		'object-type'   => Activity\ObjectType::NOTE,
-		'thr-parent'    => $uri,
-	];
-
-	if (Post::exists(['uri' => $item['uri'], 'uid' => $uid])) {
-		return;
-	}
-
-	$item['guid']         = Item::guidFromUri($item['uri'], $contact['alias']);
-	$item['owner-name']   = $item['author-name'];
-	$item['owner-link']   = $item['author-link'];
-	$item['owner-avatar'] = $item['author-avatar'];
-	if (Item::insert($item)) {
-		$cdata = Contact::getPublicAndUserContactID($contact['id'], $uid);
-		Item::update(['post-reason' => Item::PR_ANNOUNCEMENT, 'causer-id' => $cdata['public']], ['uri' => $uri, 'uid' => $uid]);
-	}
-}
-
-function bluesky_fetch_notifications(int $uid, int $last_poll)
-{
-	$data = bluesky_xrpc_get($uid, 'app.bsky.notification.listNotifications');
-	if (empty($data->notifications)) {
-		return;
-	}
-	foreach ($data->notifications as $notification) {
-		$uri = bluesky_get_uri($notification);
-		if (Post::exists(['uri' => $uri, 'uid' => $uid]) || Post::exists(['extid' => $uri, 'uid' => $uid])) {
-			Logger::debug('Notification already processed', ['uid' => $uid, 'reason' => $notification->reason, 'uri' => $uri, 'indexedAt' => $notification->indexedAt]);
-			continue;
-		}
-		Logger::debug('Process notification', ['uid' => $uid, 'reason' => $notification->reason, 'uri' => $uri, 'indexedAt' => $notification->indexedAt]);
-		switch ($notification->reason) {
-			case 'like':
-				$item = bluesky_get_header($notification, $uri, $uid, $uid);
-				$item['gravity'] = Item::GRAVITY_ACTIVITY;
-				$item['body'] = $item['verb'] = Activity::LIKE;
-				$item['thr-parent'] = bluesky_get_uri($notification->record->subject);
-				$item['thr-parent'] = bluesky_fetch_missing_post($item['thr-parent'], $uid, $uid, Item::PR_FETCHED, $item['contact-id'], 0, $last_poll);
-				if (!empty($item['thr-parent'])) {
-					$data = Item::insert($item);
-					Logger::debug('Got like', ['uid' => $uid, 'result' => $data, 'uri' => $uri]);
-				} else {
-					Logger::info('Thread parent not found', ['uid' => $uid, 'parent' => $item['thr-parent'], 'uri' => $uri]);
-				}
-				break;
-
-			case 'repost':
-				$item = bluesky_get_header($notification, $uri, $uid, $uid);
-				$item['gravity'] = Item::GRAVITY_ACTIVITY;
-				$item['body'] = $item['verb'] = Activity::ANNOUNCE;
-				$item['thr-parent'] = bluesky_get_uri($notification->record->subject);
-				$item['thr-parent'] = bluesky_fetch_missing_post($item['thr-parent'], $uid, $uid, Item::PR_FETCHED, $item['contact-id'], 0, $last_poll);
-				if (!empty($item['thr-parent'])) {
-					$data = Item::insert($item);
-					Logger::debug('Got repost', ['uid' => $uid, 'result' => $data, 'uri' => $uri]);
-				} else {
-					Logger::info('Thread parent not found', ['uid' => $uid, 'parent' => $item['thr-parent'], 'uri' => $uri]);
-				}
-				break;
-
-			case 'follow':
-				$contact = bluesky_get_contact($notification->author, $uid, $uid);
-				Logger::debug('New follower', ['uid' => $uid, 'nick' => $contact['nick'], 'uri' => $uri]);
-				break;
-
-			case 'mention':
-				$contact = bluesky_get_contact($notification->author, 0, $uid);
-				$result  = bluesky_fetch_missing_post($uri, $uid, $uid, Item::PR_TO, $contact['id'], 0, $last_poll);
-				Logger::debug('Got mention', ['uid' => $uid, 'nick' => $contact['nick'], 'result' => $result, 'uri' => $uri]);
-				break;
-
-			case 'reply':
-				$contact = bluesky_get_contact($notification->author, 0, $uid);
-				$result  = bluesky_fetch_missing_post($uri, $uid, $uid, Item::PR_COMMENT, $contact['id'], 0, $last_poll);
-				Logger::debug('Got reply', ['uid' => $uid, 'nick' => $contact['nick'], 'result' => $result, 'uri' => $uri]);
-				break;
-
-			case 'quote':
-				$contact = bluesky_get_contact($notification->author, 0, $uid);
-				$result  = bluesky_fetch_missing_post($uri, $uid, $uid, Item::PR_PUSHED, $contact['id'], 0, $last_poll);
-				Logger::debug('Got quote', ['uid' => $uid, 'nick' => $contact['nick'], 'result' => $result, 'uri' => $uri]);
-				break;
-
-			default:
-				Logger::notice('Unhandled reason', ['reason' => $notification->reason, 'uri' => $uri]);
-				break;
-		}
-	}
-}
-
-function bluesky_fetch_feed(int $uid, string $feed, int $last_poll)
-{
-	$data = bluesky_xrpc_get($uid, 'app.bsky.feed.getFeed', ['feed' => $feed]);
-	if (empty($data)) {
-		return;
-	}
-
-	if (empty($data->feed)) {
-		return;
-	}
-
-	$feeddata = bluesky_xrpc_get($uid, 'app.bsky.feed.getFeedGenerator', ['feed' => $feed]);
-	if (!empty($feeddata)) {
-		$feedurl  = $feeddata->view->uri;
-		$feedname = $feeddata->view->displayName;
-	} else {
-		$feedurl  = $feed;
-		$feedname = $feed;
-	}
-
-	foreach (array_reverse($data->feed) as $entry) {
-		$contact   = bluesky_get_contact($entry->post->author, 0, $uid);
-		$languages = $entry->post->record->langs ?? [];
-
-		if (!Relay::isWantedLanguage($entry->post->record->text, 0, $contact['id'] ?? 0, $languages)) {
-			Logger::debug('Unwanted language detected', ['text' => $entry->post->record->text]);
-			continue;
-		}
-		$uri_id = bluesky_process_post($entry->post, $uid, $uid, Item::PR_TAG, 0, 0, $last_poll);
-		if (!empty($uri_id)) {
-			$stored = Post\Category::storeFileByURIId($uri_id, $uid, Post\Category::SUBCRIPTION, $feedname, $feedurl);
-			Logger::debug('Stored tag subscription for user', ['uri-id' => $uri_id, 'uid' => $uid, 'name' => $feedname, 'url' => $feedurl, 'stored' => $stored]);
-		} else {
-			Logger::notice('Post not found', ['entry' => $entry]);
-		}
-		if (!empty($entry->reason)) {
-			bluesky_process_reason($entry->reason, bluesky_get_uri($entry->post), $uid);
-		}
-	}
-}
-
-function bluesky_process_post(stdClass $post, int $uid, int $fetch_uid, int $post_reason, int $causer, int $level, int $last_poll): int
-{
-	$uri = bluesky_get_uri($post);
-
-	if ($uri_id = bluesky_fetch_uri_id($uri, $uid)) {
-		return $uri_id;
-	}
-
-	if (empty($post->record)) {
-		Logger::debug('Invalid post', ['uri' => $uri]);
-		return 0;
-	}
-
-	Logger::debug('Importing post', ['uid' => $uid, 'indexedAt' => $post->indexedAt, 'uri' => $post->uri, 'cid' => $post->cid, 'root' => $post->record->reply->root ?? '']);
-
-	$item = bluesky_get_header($post, $uri, $uid, $fetch_uid);
-	$item = bluesky_get_content($item, $post->record, $uri, $uid, $fetch_uid, $level, $last_poll);
-	if (empty($item)) {
-		return 0;
-	}
-
-	if (!empty($post->embed)) {
-		$item = bluesky_add_media($post->embed, $item, $uid, $level, $last_poll);
-	}
-
-	$item['restrictions'] = bluesky_get_restrictions_for_user($post, $item, $post_reason);
-
-	if (empty($item['post-reason'])) {
-		$item['post-reason'] = $post_reason;
-	}
-
-	if ($causer != 0) {
-		$item['causer-id'] = $causer;
-	}
-
-	Item::insert($item);
-	return bluesky_fetch_uri_id($uri, $uid);
-}
-
-function bluesky_get_header(stdClass $post, string $uri, int $uid, int $fetch_uid): array
-{
-	$parts = bluesky_get_uri_parts($uri);
-	if (empty($post->author) || empty($post->cid) || empty($parts->rkey)) {
-		return [];
-	}
-	$contact = bluesky_get_contact($post->author, $uid, $fetch_uid);
-	$item = [
-		'network'       => Protocol::BLUESKY,
-		'uid'           => $uid,
-		'wall'          => false,
-		'uri'           => $uri,
-		'guid'          => $post->cid,
-		'private'       => Item::UNLISTED,
-		'verb'          => Activity::POST,
-		'contact-id'    => $contact['id'],
-		'author-name'   => $contact['name'],
-		'author-link'   => $contact['url'],
-		'author-avatar' => $contact['avatar'],
-		'plink'         => $contact['alias'] . '/post/' . $parts->rkey,
-		'source'        => json_encode($post),
-	];
-
-	$item['uri-id']       = ItemURI::getIdByURI($uri);
-	$item['owner-name']   = $item['author-name'];
-	$item['owner-link']   = $item['author-link'];
-	$item['owner-avatar'] = $item['author-avatar'];
-
-	if (in_array($contact['rel'], [Contact::SHARING, Contact::FRIEND])) {
-		$item['post-reason'] = Item::PR_FOLLOWER;
-	}
-
-	return $item;
-}
-
-function bluesky_get_restrictions_for_user(stdClass $post, array $item, int $post_reason): ?int
-{
-	if (!empty($post->viewer->replyDisabled)) {
-		return Item::CANT_REPLY;
-	}
-
-	if(empty($post->threadgate)) {
-		return null;
-	}
-
-	if (!isset($post->threadgate->record->allow)) {
-		return null;
-	}
-
-	if ($item['uid'] == 0) {
-		return Item::CANT_REPLY;
-	}
-
-	$restrict = true;
-	$type = '$type';
-	foreach ($post->threadgate->record->allow as $allow) {
-		switch ($allow->$type) {
-			case 'app.bsky.feed.threadgate#followingRule':
-				// Only followers can reply.
-				if (Contact::isFollower($item['author-id'], $item['uid'])) {
-					$restrict = false;
-				}
-				break;
-			case 'app.bsky.feed.threadgate#mentionRule':
-				// Only mentioned accounts can reply.
-				if ($post_reason == Item::PR_TO) {
-					$restrict = false;
-				}
-				break;
-			case 'app.bsky.feed.threadgate#listRule';
-				// Only accounts in the provided list can reply. We don't support this at the moment.
-				break;
-		}
-	}
-
-	return $restrict ? Item::CANT_REPLY : null;
-}
-
-function bluesky_get_content(array $item, stdClass $record, string $uri, int $uid, int $fetch_uid, int $level, int $last_poll): array
-{
-	if (empty($item)) {
-		return [];
-	}
-
-	if (!empty($record->reply)) {
-		$item['parent-uri'] = bluesky_get_uri($record->reply->root);
-		if ($item['parent-uri'] != $uri) {
-			$item['parent-uri'] = bluesky_fetch_missing_post($item['parent-uri'], $uid, $fetch_uid, Item::PR_FETCHED, $item['contact-id'], $level, $last_poll);
-			if (empty($item['parent-uri'])) {
-				return [];
-			}
-		}
-
-		$item['thr-parent'] = bluesky_get_uri($record->reply->parent);
-		if (!in_array($item['thr-parent'], [$uri, $item['parent-uri']])) {
-			$item['thr-parent'] = bluesky_fetch_missing_post($item['thr-parent'], $uid, $fetch_uid, Item::PR_FETCHED, $item['contact-id'], $level, $last_poll, $item['parent-uri']);
-			if (empty($item['thr-parent'])) {
-				return [];
-			}
-		}
-	}
-
-	$item['body']    = bluesky_get_text($record, $item['uri-id']);
-	$item['created'] = DateTimeFormat::utc($record->createdAt, DateTimeFormat::MYSQL);
-	$item['transmitted-languages'] = $record->langs ?? [];
-
-	if (($last_poll != 0) && strtotime($item['created']) > $last_poll) {
-		$item['received'] = $item['created'];
-	}
-
-	return $item;
-}
-
-function bluesky_get_text(stdClass $record, int $uri_id): string
-{
-	$text = $record->text ?? '';
-
-	if (empty($record->facets)) {
-		return $text;
-	}
-
-	$facets = [];
-	foreach ($record->facets as $facet) {
-		$facets[$facet->index->byteStart] = $facet;
-	}
-	krsort($facets);
-
-	foreach ($facets as $facet) {
-		$prefix   = substr($text, 0, $facet->index->byteStart);
-		$linktext = substr($text, $facet->index->byteStart, $facet->index->byteEnd - $facet->index->byteStart);
-		$suffix   = substr($text, $facet->index->byteEnd);
-
-		$url  = '';
-		$type = '$type';
-		foreach ($facet->features as $feature) {
-
-			switch ($feature->$type) {
-				case 'app.bsky.richtext.facet#link':
-					$url = $feature->uri;
-					break;
-
-				case 'app.bsky.richtext.facet#mention':
-					$contact = Contact::getByURL($feature->did, null, ['id']);
-					if (!empty($contact['id'])) {
-						$url = DI::baseUrl() . '/contact/' . $contact['id'];
-						if (substr($linktext, 0, 1) == '@') {
-							$prefix .= '@';
-							$linktext = substr($linktext, 1);
-						}
-					}
-					break;
-
-				case 'app.bsky.richtext.facet#tag';
-					Tag::store($uri_id, Tag::HASHTAG, $feature->tag);
-					$url      = DI::baseUrl() . '/search?tag=' . urlencode($feature->tag);
-					$linktext = '#' . $feature->tag;
-					break;
-
-				default:
-					Logger::notice('Unhandled feature type', ['type' => $feature->$type, 'feature' => $feature, 'record' => $record]);
-					break;
-			}
-		}
-		if (!empty($url)) {
-			$text = $prefix . '[url=' . $url . ']' . $linktext . '[/url]' . $suffix;
-		}
-	}
-	return $text;
-}
-
-function bluesky_add_media(stdClass $embed, array $item, int $fetch_uid, int $level, int $last_poll): array
-{
-	$type = '$type';
-	switch ($embed->$type) {
-		case 'app.bsky.embed.images#view':
-			foreach ($embed->images as $image) {
-				$media = [
-					'uri-id'      => $item['uri-id'],
-					'type'        => Post\Media::IMAGE,
-					'url'         => $image->fullsize,
-					'preview'     => $image->thumb,
-					'description' => $image->alt,
-				];
-				Post\Media::insert($media);
-			}
-			break;
-
-		case 'app.bsky.embed.external#view':
-			$media = [
-				'uri-id' => $item['uri-id'],
-				'type'        => Post\Media::HTML,
-				'url'         => $embed->external->uri,
-				'name'        => $embed->external->title,
-				'description' => $embed->external->description,
-			];
-			Post\Media::insert($media);
-			break;
-
-		case 'app.bsky.embed.record#view':
-			$original_uri = $uri = bluesky_get_uri($embed->record);
-			$uri = bluesky_fetch_missing_post($uri, $item['uid'], $fetch_uid, Item::PR_FETCHED, $item['contact-id'], $level, $last_poll);
-			if ($uri) {
-				$shared = Post::selectFirst(['uri-id'], ['uri' => $uri, 'uid' => [$item['uid'], 0]]);
-				$uri_id = $shared['uri-id'] ?? 0;
-			}
-			if (!empty($uri_id)) {
-				$item['quote-uri-id'] = $uri_id;
-			} else {
-				Logger::debug('Quoted post could not be fetched', ['original-uri' => $original_uri, 'uri' => $uri]);
-			}
-			break;
-
-		case 'app.bsky.embed.recordWithMedia#view':
-			bluesky_add_media($embed->media, $item, $fetch_uid, $level, $last_poll);
-			$original_uri = $uri = bluesky_get_uri($embed->record->record);
-			$uri = bluesky_fetch_missing_post($uri, $item['uid'], $fetch_uid, Item::PR_FETCHED, $item['contact-id'], $level, $last_poll);
-			if ($uri) {
-				$shared = Post::selectFirst(['uri-id'], ['uri' => $uri, 'uid' => [$item['uid'], 0]]);
-				$uri_id = $shared['uri-id'] ?? 0;
-			}
-			if (!empty($uri_id)) {
-				$item['quote-uri-id'] = $uri_id;
-			} else {
-				Logger::debug('Quoted post could not be fetched', ['original-uri' => $original_uri, 'uri' => $uri]);
-			}
-			break;
-
-		default:
-			Logger::notice('Unhandled embed type', ['uri-id' => $item['uri-id'], 'type' => $embed->$type, 'embed' => $embed]);
-			break;
-	}
-	return $item;
-}
-
-function bluesky_get_uri(stdClass $post): string
-{
-	if (empty($post->cid)) {
-		Logger::info('Invalid URI', ['post' => $post]);
-		return '';
-	}
-	return $post->uri . ':' . $post->cid;
-}
-
-function bluesky_get_uri_class(string $uri): ?stdClass
-{
-	if (empty($uri)) {
-		return null;
-	}
-
-	$elements = explode(':', $uri);
-	if (empty($elements) || ($elements[0] != 'at')) {
-		$post = Post::selectFirstPost(['extid'], ['uri' => $uri]);
-		return bluesky_get_uri_class($post['extid'] ?? '');
-	}
-
-	$class = new stdClass;
-
-	$class->cid = array_pop($elements);
-	$class->uri = implode(':', $elements);
-
-	if ((substr_count($class->uri, '/') == 2) && (substr_count($class->cid, '/') == 2)) {
-		$class->uri .= ':' . $class->cid;
-		$class->cid = '';
-	}
-
-	return $class;
-}
-
-function bluesky_get_uri_parts(string $uri): ?stdClass
-{
-	$class = bluesky_get_uri_class($uri);
-	if (empty($class)) {
-		return null;
-	}
-
-	$parts = explode('/', substr($class->uri, 5));
-
-	$class = new stdClass;
-
-	$class->repo       = $parts[0];
-	$class->collection = $parts[1];
-	$class->rkey       = $parts[2];
-
-	return $class;
-}
-
-function bluesky_fetch_missing_post(string $uri, int $uid, int $fetch_uid, int $post_reason, int $causer, int $level, int $last_poll, string $fallback = ''): string
-{
-	$fetched_uri = bluesky_fetch_post($uri, $uid);
-	if (!empty($fetched_uri)) {
-		return $fetched_uri;
-	}
-
-	if (++$level > 100) {
-		Logger::info('Recursion level too deep', ['level' => $level, 'uid' => $uid, 'uri' => $uri, 'fallback' => $fallback]);
-		// When the level is too deep we will fallback to the parent uri.
-		// Allthough the threading won't be correct, we at least had stored all posts and won't try again
-		return $fallback;
-	}
-
-	$class = bluesky_get_uri_class($uri);
-	$fetch_uri = $class->uri;
-
-	Logger::debug('Fetch missing post', ['level' => $level, 'uid' => $uid, 'uri' => $uri]);
-	$data = bluesky_xrpc_get($fetch_uid, 'app.bsky.feed.getPostThread', ['uri' => $fetch_uri]);
-	if (empty($data)) {
-		Logger::info('Thread was not fetched', ['level' => $level, 'uid' => $uid, 'uri' => $uri, 'fallback' => $fallback]);
-		return $fallback;
-	}
-
-	Logger::debug('Reply count', ['level' => $level, 'uid' => $uid, 'uri' => $uri]);
-
-	if ($causer != 0) {
-		$cdata = Contact::getPublicAndUserContactID($causer, $uid);
-		$causer = $cdata['public'] ?? 0;
-	}
-
-	return bluesky_process_thread($data->thread, $uid, $fetch_uid, $post_reason, $causer, $level, $last_poll);
-}
-
-function bluesky_fetch_post(string $uri, int $uid): string
-{
-	if (Post::exists(['uri' => $uri, 'uid' => [$uid, 0]])) {
-		Logger::debug('Post exists', ['uri' => $uri]);
-		return $uri;
-	}
-
-	$reply = Post::selectFirst(['uri'], ['extid' => $uri, 'uid' => [$uid, 0]]);
-	if (!empty($reply['uri'])) {
-		Logger::debug('Post with extid exists', ['uri' => $uri]);
-		return $reply['uri'];
-	}
-	return '';
-}
-
-function bluesky_fetch_uri_id(string $uri, int $uid): string
-{
-	$reply = Post::selectFirst(['uri-id'], ['uri' => $uri, 'uid' => [$uid, 0]]);
-	if (!empty($reply['uri-id'])) {
-		Logger::debug('Post with extid exists', ['uri' => $uri]);
-		return $reply['uri-id'];
-	}
-	$reply = Post::selectFirst(['uri-id'], ['extid' => $uri, 'uid' => [$uid, 0]]);
-	if (!empty($reply['uri-id'])) {
-		Logger::debug('Post with extid exists', ['uri' => $uri]);
-		return $reply['uri-id'];
-	}
-	return 0;
-}
-
-function bluesky_process_thread(stdClass $thread, int $uid, int $fetch_uid, int $post_reason, int $causer, int $level, int $last_poll): string
-{
-	if (empty($thread->post)) {
-		Logger::info('Invalid post', ['post' => $thread]);
-		return '';
-	}
-	$uri = bluesky_get_uri($thread->post);
-
-	$fetched_uri = bluesky_fetch_post($uri, $uid);
-	if (empty($fetched_uri)) {
-		$uri_id = bluesky_process_post($thread->post, $uid, $fetch_uid, $post_reason, $causer, $level, $last_poll);
-		if ($uri_id) {
-			Logger::debug('Post has been processed and stored', ['uri-id' => $uri_id, 'uri' => $uri]);
-			return $uri;
-		} else {
-			Logger::info('Post has not not been stored', ['uri' => $uri]);
-			return '';
-		}
-	} else {
-		Logger::debug('Post exists', ['uri' => $uri]);
-		$uri = $fetched_uri;
-	}
-
-	foreach ($thread->replies ?? [] as $reply) {
-		$reply_uri = bluesky_process_thread($reply, $uid, $fetch_uid, Item::PR_FETCHED, $causer, $level, $last_poll);
-		Logger::debug('Reply has been processed', ['uri' => $uri, 'reply' => $reply_uri]);
-	}
-
-	return $uri;
-}
-
-function bluesky_get_contact(stdClass $author, int $uid, int $fetch_uid): array
-{
-	$condition = ['network' => Protocol::BLUESKY, 'uid' => 0, 'url' => $author->did];
-	$contact = Contact::selectFirst(['id', 'updated'], $condition);
-
-	$update = empty($contact) || $contact['updated'] < DateTimeFormat::utc('now -24 hours');
-
-	$public_fields = $fields = bluesky_get_contact_fields($author, $uid, $fetch_uid, $update);
-
-	$public_fields['uid'] = 0;
-	$public_fields['rel'] = Contact::NOTHING;
-
-	if (empty($contact)) {
-		$cid = Contact::insert($public_fields);
-	} else {
-		$cid = $contact['id'];
-		Contact::update($public_fields, ['id' => $cid], true);
-	}
-
-	if ($uid != 0) {
-		$condition = ['network' => Protocol::BLUESKY, 'uid' => $uid, 'url' => $author->did];
-
-		$contact = Contact::selectFirst(['id', 'rel', 'uid'], $condition);
-		if (!isset($fields['rel']) && isset($contact['rel'])) {
-			$fields['rel'] = $contact['rel'];
-		} elseif (!isset($fields['rel'])) {
-			$fields['rel'] = Contact::NOTHING;
-		}
-	}
-
-	if (($uid != 0) && ($fields['rel'] != Contact::NOTHING)) {
-		if (empty($contact)) {
-			$cid = Contact::insert($fields);
-		} else {
-			$cid = $contact['id'];
-			Contact::update($fields, ['id' => $cid], true);
-		}
-		Logger::debug('Get user contact', ['id' => $cid, 'uid' => $uid, 'update' => $update]);
-	} else {
-		Logger::debug('Get public contact', ['id' => $cid, 'uid' => $uid, 'update' => $update]);
-	}
-	if (!empty($author->avatar)) {
-		Contact::updateAvatar($cid, $author->avatar);
-	}
-
-	return Contact::getById($cid);
-}
-
-function bluesky_get_contact_fields(stdClass $author, int $uid, int $fetch_uid, bool $update): array
-{
-	$nick = $author->handle ?? $author->did;
-	$name = $author->displayName ?? $nick;
-	$fields = [
-		'uid'      => $uid,
-		'network'  => Protocol::BLUESKY,
-		'priority' => 1,
-		'writable' => true,
-		'blocked'  => false,
-		'readonly' => false,
-		'pending'  => false,
-		'url'      => $author->did,
-		'nurl'     => $author->did,
-		'alias'    => BLUESKY_WEB . '/profile/' . $nick,
-		'name'     => $name ?: $nick,
-		'nick'     => $nick,
-		'addr'     => $nick,
-	];
-
-	if (!$update) {
-		Logger::debug('Got contact fields', ['uid' => $uid, 'url' => $fields['url']]);
-		return $fields;
-	}
-
-	$fields['baseurl'] = bluesky_get_pds($author->did);
-	if (!empty($fields['baseurl'])) {
-		GServer::check($fields['baseurl'], Protocol::BLUESKY);
-		$fields['gsid'] = GServer::getID($fields['baseurl'], true);
-	}
-
-	$data = bluesky_xrpc_get($fetch_uid, 'app.bsky.actor.getProfile', ['actor' => $author->did]);
-	if (empty($data)) {
-		Logger::debug('Error fetching contact fields', ['uid' => $uid, 'url' => $fields['url']]);
-		return $fields;
-	}
-
-	$fields['updated'] = DateTimeFormat::utcNow(DateTimeFormat::MYSQL);
-
-	if (!empty($data->description)) {
-		$fields['about'] = HTML::toBBCode($data->description);
-	}
-
-	if (!empty($data->banner)) {
-		$fields['header'] = $data->banner;
-	}
-
-	if (!empty($data->viewer)) {
-		if (!empty($data->viewer->following) && !empty($data->viewer->followedBy)) {
-			$fields['rel'] = Contact::FRIEND;
-		} elseif (!empty($data->viewer->following) && empty($data->viewer->followedBy)) {
-			$fields['rel'] = Contact::SHARING;
-		} elseif (empty($data->viewer->following) && !empty($data->viewer->followedBy)) {
-			$fields['rel'] = Contact::FOLLOWER;
-		} else {
-			$fields['rel'] = Contact::NOTHING;
-		}
-	}
-
-	Logger::debug('Got updated contact fields', ['uid' => $uid, 'url' => $fields['url']]);
-	return $fields;
-}
-
-function bluesky_get_feeds(int $uid): array
-{
-	$type = '$type';
-	$preferences = bluesky_get_preferences($uid);
-	foreach ($preferences->preferences as $preference) {
-		if ($preference->$type == 'app.bsky.actor.defs#savedFeedsPref') {
-			return $preference->pinned ?? [];
-		}
-	}
-	return [];
-}
-
-function bluesky_get_preferences(int $uid): stdClass
-{
-	$cachekey = 'bluesky:preferences:' . $uid;
-	$data = DI::cache()->get($cachekey);
-	if (!is_null($data)) {
-		return $data;
-	}
-
-	$data = bluesky_xrpc_get($uid, 'app.bsky.actor.getPreferences');
-
-	DI::cache()->set($cachekey, $data, Duration::HOUR);
-	return $data;
-}
-
-function bluesky_get_did_by_wellknown(string $handle): string
-{
-	$curlResult = DI::httpClient()->get('http://' . $handle . '/.well-known/atproto-did');
-	if ($curlResult->isSuccess() && substr($curlResult->getBodyString(), 0, 4) == 'did:') {
-		$did = $curlResult->getBodyString();
-		if (!bluesky_valid_did($did, $handle)) {
-			Logger::notice('Invalid DID', ['handle' => $handle, 'did' => $did]);	
-			return '';
-		}
-		Logger::debug('Got DID by wellknown', ['handle' => $handle, 'did' => $did]);
-		return $did;
-	}
-	return '';
-}
-
-function bluesky_get_did_by_dns(string $handle): string
-{
-	$records = @dns_get_record('_atproto.' . $handle . '.', DNS_TXT);
-	if (empty($records)) {
-		return '';
-	}
-	foreach ($records as $record) {
-		if (!empty($record['txt']) && substr($record['txt'], 0, 4) == 'did=') {
-			$did = substr($record['txt'], 4);
-			if (!bluesky_valid_did($did, $handle)) {
-				Logger::notice('Invalid DID', ['handle' => $handle, 'did' => $did]);	
-				return '';
-			}
-			Logger::debug('Got DID by DNS', ['handle' => $handle, 'did' => $did]);
-			return $did;
-		}
-	}
-	return '';
-}
-
-function bluesky_get_did(string $handle): string
-{
-	// Deactivated at the moment, since it isn't reliable by now
-	//$did = bluesky_get_did_by_dns($handle);
-	//if ($did != '') {
-	//	return $did;
-	//}
-	
-	//$did = bluesky_get_did_by_wellknown($handle);
-	//if ($did != '') {
-	//	return $did;
-	//}
-	
-	$data = bluesky_get(BLUESKY_PDS . '/xrpc/com.atproto.identity.resolveHandle?handle=' . urlencode($handle));
-	if (empty($data) || empty($data->did)) {
-		return '';
-	}
-	Logger::debug('Got DID by PDS call', ['handle' => $handle, 'did' => $data->did]);
-	return $data->did;
-}
-
-function bluesky_get_user_pds(int $uid): string
-{
-	$pds = DI::pConfig()->get($uid, 'bluesky', 'pds');
-	if (!empty($pds)) {
-		return $pds;
-	}
-	$did = DI::pConfig()->get($uid, 'bluesky', 'did');
-	if (empty($did)) {
-		Logger::notice('Empty did for user', ['uid' => $uid]);
-		return '';
-	}
-	$pds = bluesky_get_pds($did);
-	DI::pConfig()->set($uid, 'bluesky', 'pds', $pds);
-	return $pds;
-}
-
-function bluesky_get_pds(string $did): ?string
-{
-	$data = bluesky_get(BLUESKY_DIRECTORY . '/' . $did);
-	if (empty($data) || empty($data->service)) {
-		return null;
-	}
-
-	foreach ($data->service as $service) {
-		if (($service->id == '#atproto_pds') && ($service->type == 'AtprotoPersonalDataServer') && !empty($service->serviceEndpoint)) {
-			return $service->serviceEndpoint;
-		}
-	}
-
-	return null;
-}
-
-function bluesky_valid_did(string $did, string $handle): bool
-{
-	$data = bluesky_get(BLUESKY_DIRECTORY . '/' . $did);
-	if (empty($data) || empty($data->alsoKnownAs)) {
-		return false;
-	}
-
-	return in_array('at://' . $handle, $data->alsoKnownAs);
-}
-
-function bluesky_get_token(int $uid): string
-{
-	$token   = DI::pConfig()->get($uid, 'bluesky', 'access_token');
-	$created = DI::pConfig()->get($uid, 'bluesky', 'token_created');
-	if (empty($token)) {
-		return '';
-	}
-
-	if ($created + 300 < time()) {
-		return bluesky_refresh_token($uid);
-	}
-	return $token;
-}
-
-function bluesky_refresh_token(int $uid): string
-{
-	$token = DI::pConfig()->get($uid, 'bluesky', 'refresh_token');
-
-	$data = bluesky_post($uid, '/xrpc/com.atproto.server.refreshSession', '', ['Authorization' => ['Bearer ' . $token]]);
-	if (empty($data)) {
-		return '';
-	}
-
-	Logger::debug('Refreshed token', ['return' => $data]);
-	DI::pConfig()->set($uid, 'bluesky', 'access_token', $data->accessJwt);
-	DI::pConfig()->set($uid, 'bluesky', 'refresh_token', $data->refreshJwt);
-	DI::pConfig()->set($uid, 'bluesky', 'token_created', time());
-	return $data->accessJwt;
-}
-
-function bluesky_create_token(int $uid, string $password): string
-{
-	$did = DI::pConfig()->get($uid, 'bluesky', 'did');
-
-	$data = bluesky_post($uid, '/xrpc/com.atproto.server.createSession', json_encode(['identifier' => $did, 'password' => $password]), ['Content-type' => 'application/json']);
-	if (empty($data)) {
-		DI::pConfig()->set($uid, 'bluesky', 'status', BLUEKSY_STATUS_TOKEN_FAIL);
-		return '';
-	}
-
-	Logger::debug('Created token', ['return' => $data]);
-	DI::pConfig()->set($uid, 'bluesky', 'access_token', $data->accessJwt);
-	DI::pConfig()->set($uid, 'bluesky', 'refresh_token', $data->refreshJwt);
-	DI::pConfig()->set($uid, 'bluesky', 'token_created', time());
-	DI::pConfig()->set($uid, 'bluesky', 'status', BLUEKSY_STATUS_TOKEN_OK);
-	return $data->accessJwt;
-}
-
-function bluesky_xrpc_post(int $uid, string $url, $parameters): ?stdClass
-{
-	return bluesky_post($uid, '/xrpc/' . $url, json_encode($parameters),  ['Content-type' => 'application/json', 'Authorization' => ['Bearer ' . bluesky_get_token($uid)]]);
-}
-
-function bluesky_post(int $uid, string $url, string $params, array $headers): ?stdClass
-{
-	try {
-		$curlResult = DI::httpClient()->post(bluesky_get_user_pds($uid) . $url, $params, $headers);
-	} catch (\Exception $e) {
-		Logger::notice('Exception on post', ['exception' => $e]);
-		DI::pConfig()->set($uid, 'bluesky', 'status', BLUEKSY_STATUS_API_FAIL);
-		return null;
-	}
-
-	if (!$curlResult->isSuccess()) {
-		Logger::notice('API Error', ['error' => json_decode($curlResult->getBodyString()) ?: $curlResult->getBodyString()]);
-		DI::pConfig()->set($uid, 'bluesky', 'status', BLUEKSY_STATUS_API_FAIL);
-		return null;
-	}
-
-	DI::pConfig()->set($uid, 'bluesky', 'status', BLUEKSY_STATUS_SUCCESS);
-	return json_decode($curlResult->getBodyString());
-}
-
-function bluesky_xrpc_get(int $uid, string $url, array $parameters = []): ?stdClass
-{
-	if (!empty($parameters)) {
-		$url .= '?' . http_build_query($parameters);
-	}
-
-	$data = bluesky_get(bluesky_get_user_pds($uid) . '/xrpc/' . $url, HttpClientAccept::JSON, [HttpClientOptions::HEADERS => ['Authorization' => ['Bearer ' . bluesky_get_token($uid)]]]);
-	DI::pConfig()->set($uid, 'bluesky', 'status', is_null($data) ? BLUEKSY_STATUS_API_FAIL : BLUEKSY_STATUS_SUCCESS);
-	return $data;
-}
-
-function bluesky_get(string $url, string $accept_content = HttpClientAccept::DEFAULT, array $opts = []): ?stdClass
-{
-	try {
-		$curlResult = DI::httpClient()->get($url, $accept_content, $opts);
-	} catch (\Exception $e) {
-		Logger::notice('Exception on get', ['exception' => $e]);
-		return null;
-	}
-
-	if (!$curlResult->isSuccess()) {
-		Logger::notice('API Error', ['error' => json_decode($curlResult->getBodyString()) ?: $curlResult->getBodyString()]);
-		return null;
-	}
-
-	return json_decode($curlResult->getBodyString());
-}
diff --git a/bluesky/bluesky_feed.php b/bluesky/bluesky_feed.php
deleted file mode 100644
index c9a54223..00000000
--- a/bluesky/bluesky_feed.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-use Friendica\Core\Logger;
-
-function bluesky_feed_run($argv, $argc)
-{
-	require_once 'addon/bluesky/bluesky.php';
-
-	if ($argc != 4) {
-		return;
-	}
-
-	Logger::debug('Importing feed - start', ['user' => $argv[1], 'feed' => $argv[2], 'last_poll' => $argv[3]]);
-	bluesky_fetch_feed($argv[1], $argv[2], $argv[3]);
-	Logger::debug('Importing feed - done', ['user' => $argv[1], 'feed' => $argv[2], 'last_poll' => $argv[3]]);
-}
diff --git a/bluesky/bluesky_notifications.php b/bluesky/bluesky_notifications.php
deleted file mode 100644
index ad35dfe0..00000000
--- a/bluesky/bluesky_notifications.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-use Friendica\Core\Logger;
-
-function bluesky_notifications_run($argv, $argc)
-{
-	require_once 'addon/bluesky/bluesky.php';
-
-	if ($argc != 3) {
-		return;
-	}
-
-	Logger::notice('importing notifications - start', ['user' => $argv[1], 'last_poll' => $argv[2]]);
-	bluesky_fetch_notifications($argv[1], $argv[2]);
-	Logger::notice('importing notifications - done', ['user' => $argv[1], 'last_poll' => $argv[2]]);
-}
diff --git a/bluesky/bluesky_timeline.php b/bluesky/bluesky_timeline.php
deleted file mode 100644
index 22ef2224..00000000
--- a/bluesky/bluesky_timeline.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-use Friendica\Core\Logger;
-
-function bluesky_timeline_run($argv, $argc)
-{
-	require_once 'addon/bluesky/bluesky.php';
-
-	if ($argc != 3) {
-		return;
-	}
-
-	Logger::notice('importing timeline - start', ['user' => $argv[1], 'last_poll' => $argv[2]]);
-	bluesky_fetch_timeline($argv[1], $argv[2]);
-	Logger::notice('importing timeline - done', ['user' => $argv[1], 'last_poll' => $argv[2]]);
-}
diff --git a/bluesky/lang/C/messages.po b/bluesky/lang/C/messages.po
deleted file mode 100644
index 9521ab89..00000000
--- a/bluesky/lang/C/messages.po
+++ /dev/null
@@ -1,147 +0,0 @@
-# ADDON bluesky
-# Copyright (C) 
-# This file is distributed under the same license as the Friendica bluesky addon package.
-# 
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-03-22 05:31+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: bluesky.php:325
-msgid "Save Settings"
-msgstr ""
-
-#: bluesky.php:326
-msgid "Allow your users to use your hostname for their Bluesky handles"
-msgstr ""
-
-#: bluesky.php:326
-#, php-format
-msgid ""
-"Before enabling this option, you have to setup a wildcard domain "
-"configuration and you have to enable wildcard requests in your webserver "
-"configuration. On Apache this is done by adding \"ServerAlias *.%s\" to your "
-"HTTP configuration. You don't need to change the HTTPS configuration."
-msgstr ""
-
-#: bluesky.php:354
-#, php-format
-msgid "Allow to use %s as your Bluesky handle."
-msgstr ""
-
-#: bluesky.php:354
-#, php-format
-msgid ""
-"When enabled, you can use %s as your Bluesky handle. After you enabled this "
-"option, please go to https://bsky.app/settings and select to change your "
-"handle. Select that you have got your own domain. Then enter %s and select "
-"\"No DNS Panel\". Then select \"Verify Text File\"."
-msgstr ""
-
-#: bluesky.php:361
-msgid "Enable Bluesky Post Addon"
-msgstr ""
-
-#: bluesky.php:362
-msgid "Post to Bluesky by default"
-msgstr ""
-
-#: bluesky.php:363
-msgid "Import the remote timeline"
-msgstr ""
-
-#: bluesky.php:364
-msgid "Import the pinned feeds"
-msgstr ""
-
-#: bluesky.php:364
-msgid ""
-"When activated, Posts will be imported from all the feeds that you pinned in "
-"Bluesky."
-msgstr ""
-
-#: bluesky.php:366
-msgid "Personal Data Server"
-msgstr ""
-
-#: bluesky.php:366
-msgid "The personal data server (PDS) is the system that hosts your profile."
-msgstr ""
-
-#: bluesky.php:367
-msgid "Bluesky handle"
-msgstr ""
-
-#: bluesky.php:368
-msgid "Bluesky DID"
-msgstr ""
-
-#: bluesky.php:368
-msgid ""
-"This is the unique identifier. It will be fetched automatically, when the "
-"handle is entered."
-msgstr ""
-
-#: bluesky.php:369
-msgid "Bluesky app password"
-msgstr ""
-
-#: bluesky.php:369
-msgid ""
-"Please don't add your real password here, but instead create a specific app "
-"password in the Bluesky settings."
-msgstr ""
-
-#: bluesky.php:375
-msgid "Bluesky Import/Export"
-msgstr ""
-
-#: bluesky.php:385
-msgid ""
-"You are not authenticated. Please enter your handle and the app password."
-msgstr ""
-
-#: bluesky.php:405
-msgid ""
-"You are authenticated to Bluesky. For security reasons the password isn't "
-"stored."
-msgstr ""
-
-#: bluesky.php:407
-msgid ""
-"The communication with the personal data server service (PDS) is established."
-msgstr ""
-
-#: bluesky.php:409
-msgid "Communication issues with the personal data server service (PDS)."
-msgstr ""
-
-#: bluesky.php:411
-msgid ""
-"The DID for the provided handle could not be detected. Please check if you "
-"entered the correct handle."
-msgstr ""
-
-#: bluesky.php:413
-msgid "The personal data server service (PDS) could not be detected."
-msgstr ""
-
-#: bluesky.php:415
-msgid ""
-"The authentication with the provided handle and password failed. Please "
-"check if you entered the correct password."
-msgstr ""
-
-#: bluesky.php:484
-msgid "Post to Bluesky"
-msgstr ""
diff --git a/bluesky/lang/de/messages.po b/bluesky/lang/de/messages.po
deleted file mode 100644
index 13ea8e96..00000000
--- a/bluesky/lang/de/messages.po
+++ /dev/null
@@ -1,89 +0,0 @@
-# ADDON bluesky
-# Copyright (C)
-# This file is distributed under the same license as the Friendica bluesky addon package.
-# 
-# 
-# Translators:
-# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2023
-# haheute <haheute@posteo.de>, 2023
-# Raroun, 2023
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-05-24 05:52+0000\n"
-"PO-Revision-Date: 2023-05-24 06:02+0000\n"
-"Last-Translator: Raroun, 2023\n"
-"Language-Team: German (https://app.transifex.com/Friendica/teams/12172/de/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: de\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: bluesky.php:100
-msgid ""
-"You are authenticated to Bluesky. For security reasons the password isn't "
-"stored."
-msgstr ""
-"Du bist auf Bluesky authentifiziert. Aus Sicherheitsgründen wird das "
-"Passwort nicht gespeichert."
-
-#: bluesky.php:100
-msgid "You are not authenticated. Please enter the app password."
-msgstr ""
-"Du bist derzeit nicht authentifiziert. Bitte gib dein App Passwort ein."
-
-#: bluesky.php:104
-msgid "Enable Bluesky Post Addon"
-msgstr "Bluesky Post Addon aktivieren"
-
-#: bluesky.php:105
-msgid "Post to Bluesky by default"
-msgstr "Standardmäßig auf Bluesky veröffentlichen"
-
-#: bluesky.php:106
-msgid "Import the remote timeline"
-msgstr "Importiere die entfernte Timeline"
-
-#: bluesky.php:107
-msgid "Bluesky host"
-msgstr "Bluesky Host"
-
-#: bluesky.php:108
-msgid "Bluesky handle"
-msgstr "Bluesky Handle"
-
-#: bluesky.php:109
-msgid "Bluesky DID"
-msgstr "Bluesky DID"
-
-#: bluesky.php:109
-msgid ""
-"This is the unique identifier. It will be fetched automatically, when the "
-"handle is entered."
-msgstr ""
-"Sobald das Handle eingegeben ist, wird diese einzigartige Kennung "
-"automatisch abgerufen."
-
-#: bluesky.php:110
-msgid "Bluesky app password"
-msgstr "Bluesky App Passwort"
-
-#: bluesky.php:110
-msgid ""
-"Please don't add your real password here, but instead create a specific app "
-"password in the Bluesky settings."
-msgstr ""
-"Bitte verwende hier nicht dein echtes Passwort, sondern stattdessen ein "
-"speziell für diese App in den Bluesky Einstellungen festgelegtes Passwort."
-
-#: bluesky.php:116
-msgid "Bluesky Import/Export"
-msgstr "Bluesky Import/Export"
-
-#: bluesky.php:167
-msgid "Post to Bluesky"
-msgstr "Auf Bluesky veröffentlichen"
diff --git a/bluesky/lang/de/strings.php b/bluesky/lang/de/strings.php
deleted file mode 100644
index 8e3c9421..00000000
--- a/bluesky/lang/de/strings.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_de")) {
-function string_plural_select_de($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['You are authenticated to Bluesky. For security reasons the password isn\'t stored.'] = 'Du bist auf Bluesky authentifiziert. Aus Sicherheitsgründen wird das Passwort nicht gespeichert.';
-$a->strings['You are not authenticated. Please enter the app password.'] = 'Du bist derzeit nicht authentifiziert. Bitte gib dein App Passwort ein.';
-$a->strings['Enable Bluesky Post Addon'] = 'Bluesky Post Addon aktivieren';
-$a->strings['Post to Bluesky by default'] = 'Standardmäßig auf Bluesky veröffentlichen';
-$a->strings['Import the remote timeline'] = 'Importiere die entfernte Timeline';
-$a->strings['Bluesky host'] = 'Bluesky Host';
-$a->strings['Bluesky handle'] = 'Bluesky Handle';
-$a->strings['Bluesky DID'] = 'Bluesky DID';
-$a->strings['This is the unique identifier. It will be fetched automatically, when the handle is entered.'] = 'Sobald das Handle eingegeben ist, wird diese einzigartige Kennung automatisch abgerufen.';
-$a->strings['Bluesky app password'] = 'Bluesky App Passwort';
-$a->strings['Please don\'t add your real password here, but instead create a specific app password in the Bluesky settings.'] = 'Bitte verwende hier nicht dein echtes Passwort, sondern stattdessen ein speziell für diese App in den Bluesky Einstellungen festgelegtes Passwort.';
-$a->strings['Bluesky Import/Export'] = 'Bluesky Import/Export';
-$a->strings['Post to Bluesky'] = 'Auf Bluesky veröffentlichen';
diff --git a/bluesky/lang/zh-cn/messages.po b/bluesky/lang/zh-cn/messages.po
deleted file mode 100644
index 9074ce34..00000000
--- a/bluesky/lang/zh-cn/messages.po
+++ /dev/null
@@ -1,80 +0,0 @@
-# ADDON bluesky
-# Copyright (C)
-# This file is distributed under the same license as the Friendica bluesky addon package.
-# 
-# 
-# Translators:
-# tslmuun, 2023
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-05-24 05:52+0000\n"
-"PO-Revision-Date: 2023-05-24 06:02+0000\n"
-"Last-Translator: tslmuun, 2023\n"
-"Language-Team: Chinese (China) (https://app.transifex.com/Friendica/teams/12172/zh_CN/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: zh_CN\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-
-#: bluesky.php:100
-msgid ""
-"You are authenticated to Bluesky. For security reasons the password isn't "
-"stored."
-msgstr "您已通过 Bluesky 的身份验证。 出于安全原因，不存储密码。"
-
-#: bluesky.php:100
-msgid "You are not authenticated. Please enter the app password."
-msgstr "您未通过身份验证。 请输入应用密码。"
-
-#: bluesky.php:104
-msgid "Enable Bluesky Post Addon"
-msgstr "启用Bluesky插件"
-
-#: bluesky.php:105
-msgid "Post to Bluesky by default"
-msgstr "默认发布到Bluesky"
-
-#: bluesky.php:106
-msgid "Import the remote timeline"
-msgstr "导入远程时间线"
-
-#: bluesky.php:107
-msgid "Bluesky host"
-msgstr "Bluesky地址"
-
-#: bluesky.php:108
-msgid "Bluesky handle"
-msgstr "Bluesky handle"
-
-#: bluesky.php:109
-msgid "Bluesky DID"
-msgstr "Bluesky DID"
-
-#: bluesky.php:109
-msgid ""
-"This is the unique identifier. It will be fetched automatically, when the "
-"handle is entered."
-msgstr "这是唯一标识符。 输入句柄时，它将自动获取。"
-
-#: bluesky.php:110
-msgid "Bluesky app password"
-msgstr "Bluesky 应用密码"
-
-#: bluesky.php:110
-msgid ""
-"Please don't add your real password here, but instead create a specific app "
-"password in the Bluesky settings."
-msgstr "请不要在此处填写您的真实密码，而是在 Bluesky 设置中创建一个特定的应用程序密码。"
-
-#: bluesky.php:116
-msgid "Bluesky Import/Export"
-msgstr "Bluesky 导入/导出"
-
-#: bluesky.php:167
-msgid "Post to Bluesky"
-msgstr "发布到Bluesky"
diff --git a/bluesky/lang/zh-cn/strings.php b/bluesky/lang/zh-cn/strings.php
deleted file mode 100644
index 9c71d974..00000000
--- a/bluesky/lang/zh-cn/strings.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_zh_cn")) {
-function string_plural_select_zh_cn($n){
-	$n = intval($n);
-	return intval(0);
-}}
-$a->strings['You are authenticated to Bluesky. For security reasons the password isn\'t stored.'] = '您已通过 Bluesky 的身份验证。 出于安全原因，不存储密码。';
-$a->strings['You are not authenticated. Please enter the app password.'] = '您未通过身份验证。 请输入应用密码。';
-$a->strings['Enable Bluesky Post Addon'] = '启用Bluesky插件';
-$a->strings['Post to Bluesky by default'] = '默认发布到Bluesky';
-$a->strings['Import the remote timeline'] = '导入远程时间线';
-$a->strings['Bluesky host'] = 'Bluesky地址';
-$a->strings['Bluesky handle'] = 'Bluesky handle';
-$a->strings['Bluesky DID'] = 'Bluesky DID';
-$a->strings['This is the unique identifier. It will be fetched automatically, when the handle is entered.'] = '这是唯一标识符。 输入句柄时，它将自动获取。';
-$a->strings['Bluesky app password'] = 'Bluesky 应用密码';
-$a->strings['Please don\'t add your real password here, but instead create a specific app password in the Bluesky settings.'] = '请不要在此处填写您的真实密码，而是在 Bluesky 设置中创建一个特定的应用程序密码。';
-$a->strings['Bluesky Import/Export'] = 'Bluesky 导入/导出';
-$a->strings['Post to Bluesky'] = '发布到Bluesky';
diff --git a/bluesky/templates/admin.tpl b/bluesky/templates/admin.tpl
deleted file mode 100644
index 7b752a88..00000000
--- a/bluesky/templates/admin.tpl
+++ /dev/null
@@ -1,2 +0,0 @@
-{{include file="field_checkbox.tpl" field=$friendica_handles}}
-<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
diff --git a/bluesky/templates/connector_settings.tpl b/bluesky/templates/connector_settings.tpl
deleted file mode 100644
index 3ebea827..00000000
--- a/bluesky/templates/connector_settings.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-<p>{{$status}}</p>
-{{include file="field_checkbox.tpl" field=$enable}}
-{{include file="field_checkbox.tpl" field=$bydefault}}
-{{include file="field_checkbox.tpl" field=$import}}
-{{include file="field_checkbox.tpl" field=$import_feeds}}
-{{if $custom_handle}}
-	{{include file="field_checkbox.tpl" field=$custom_handle}}
-{{/if}}
-{{include file="field_input.tpl" field=$pds}}
-{{include file="field_input.tpl" field=$handle}}
-{{include file="field_input.tpl" field=$did}}
-{{include file="field_input.tpl" field=$password}}
\ No newline at end of file
diff --git a/buffer/README.md b/buffer/README.md
new file mode 100644
index 00000000..f97cf07b
--- /dev/null
+++ b/buffer/README.md
@@ -0,0 +1,8 @@
+The addon uses the library from [https://github.com/thewebguy/bufferapp-php](https://github.com/thewebguy/bufferapp-php)
+
+Please register an app at [http://bufferapp.com/developers/api](http://bufferapp.com/developers/api)
+
+Please use (your server address)/buffer/connect as Callback URL.
+
+After the registration please enter the values for "Client ID" and "Client Secret" in the 
+[administration](admin/addons/buffer).
diff --git a/buffer/buffer.css b/buffer/buffer.css
new file mode 100644
index 00000000..67a28565
--- /dev/null
+++ b/buffer/buffer.css
@@ -0,0 +1,15 @@
+#buffer-enable-label, #buffer-bydefault-label, #buffer-delete-label {
+	float: left;
+	width: 200px;
+	margin-top: 10px;
+}
+
+#buffer-checkbox, #buffer-bydefault, #buffer-delete {
+	float: left;
+	margin-top: 10px;
+}
+
+#buffer-submit {
+	margin-top: 15px;
+}
+
diff --git a/buffer/buffer.php b/buffer/buffer.php
new file mode 100644
index 00000000..689127cf
--- /dev/null
+++ b/buffer/buffer.php
@@ -0,0 +1,413 @@
+<?php
+/**
+ * Name: Buffer Post Connector
+ * Description: Post to Buffer (Facebook Pages, LinkedIn, Twitter)
+ * Version: 0.2
+ * Author: Michael Vogel <http://pirati.ca/profile/heluecht>
+ */
+require 'addon/buffer/bufferapp.php';
+
+use Friendica\App;
+use Friendica\Core\Config;
+use Friendica\Core\Hook;
+use Friendica\Core\L10n;
+use Friendica\Core\Logger;
+use Friendica\Core\PConfig;
+use Friendica\Core\Protocol;
+use Friendica\Core\Renderer;
+use Friendica\Database\DBA;
+use Friendica\Model\ItemContent;
+use Friendica\Util\Proxy as ProxyUtils;
+use Friendica\Util\Strings;
+
+function buffer_install()
+{
+	Hook::register('hook_fork',            'addon/buffer/buffer.php', 'buffer_hook_fork');
+	Hook::register('post_local',           'addon/buffer/buffer.php', 'buffer_post_local');
+	Hook::register('notifier_normal',      'addon/buffer/buffer.php', 'buffer_send');
+	Hook::register('jot_networks',         'addon/buffer/buffer.php', 'buffer_jot_nets');
+	Hook::register('connector_settings',      'addon/buffer/buffer.php', 'buffer_settings');
+	Hook::register('connector_settings_post', 'addon/buffer/buffer.php', 'buffer_settings_post');
+}
+
+function buffer_uninstall()
+{
+	Hook::unregister('hook_fork',               'addon/buffer/buffer.php', 'buffer_hook_fork');
+	Hook::unregister('post_local',              'addon/buffer/buffer.php', 'buffer_post_local');
+	Hook::unregister('notifier_normal',         'addon/buffer/buffer.php', 'buffer_send');
+	Hook::unregister('jot_networks',            'addon/buffer/buffer.php', 'buffer_jot_nets');
+	Hook::unregister('connector_settings',      'addon/buffer/buffer.php', 'buffer_settings');
+	Hook::unregister('connector_settings_post', 'addon/buffer/buffer.php', 'buffer_settings_post');
+}
+
+function buffer_module()
+{
+}
+
+function buffer_content(App $a)
+{
+	if (! local_user()) {
+		notice(L10n::t('Permission denied.') . EOL);
+		return '';
+	}
+
+	require_once "mod/settings.php";
+	settings_init($a);
+
+	if (isset($a->argv[1])) {
+		switch ($a->argv[1]) {
+			case "connect":
+				$o = buffer_connect($a);
+				break;
+
+			default:
+				$o = print_r($a->argv, true);
+				break;
+		}
+	} else {
+		$o = buffer_connect($a);
+	}
+
+	return $o;
+}
+
+function buffer_addon_admin(App $a, &$o)
+{
+	$t = Renderer::getMarkupTemplate("admin.tpl", "addon/buffer/");
+
+	$o = Renderer::replaceMacros($t, [
+		'$submit' => L10n::t('Save Settings'),
+		// name, label, value, help, [extra values]
+		'$client_id' => ['client_id', L10n::t('Client ID'), Config::get('buffer', 'client_id'), ''],
+		'$client_secret' => ['client_secret', L10n::t('Client Secret'), Config::get('buffer', 'client_secret'), ''],
+	]);
+}
+
+function buffer_addon_admin_post(App $a)
+{
+	$client_id     = (!empty($_POST['client_id'])     ? Strings::escapeTags(trim($_POST['client_id']))     : '');
+	$client_secret = (!empty($_POST['client_secret']) ? Strings::escapeTags(trim($_POST['client_secret'])) : '');
+
+	Config::set('buffer', 'client_id'    , $client_id);
+	Config::set('buffer', 'client_secret', $client_secret);
+
+	info(L10n::t('Settings updated.'). EOL);
+}
+
+function buffer_connect(App $a)
+{
+	if (isset($_REQUEST["error"])) {
+		$o = L10n::t('Error when registering buffer connection:')." ".$_REQUEST["error"];
+		return $o;
+	}
+
+	// Start a session.  This is necessary to hold on to  a few keys the callback script will also need
+	session_start();
+
+	// Define the needed keys
+	$client_id = Config::get('buffer','client_id');
+	$client_secret = Config::get('buffer','client_secret');
+
+	// The callback URL is the script that gets called after the user authenticates with buffer
+	$callback_url = $a->getBaseURL()."/buffer/connect";
+
+	$buffer = new BufferApp($client_id, $client_secret, $callback_url);
+
+	if (!$buffer->ok) {
+		$o = '<a href="' . $buffer->get_login_url() . '">Connect to Buffer!</a>';
+	} else {
+		Logger::log("buffer_connect: authenticated");
+		$o = L10n::t("You are now authenticated to buffer. ");
+		$o .= '<br /><a href="' . $a->getBaseURL() . '/settings/connectors">' . L10n::t("return to the connector page") . '</a>';
+		PConfig::set(local_user(), 'buffer','access_token', $buffer->access_token);
+	}
+
+	return $o;
+}
+
+function buffer_jot_nets(App $a, array &$jotnets_fields)
+{
+	if (!local_user()) {
+		return;
+	}
+
+	if (PConfig::get(local_user(), 'buffer', 'post')) {
+		$jotnets_fields[] = [
+			'type' => 'checkbox',
+			'field' => [
+				'buffer_enable',
+				L10n::t('Post to Buffer'),
+				PConfig::get(local_user(), 'buffer', 'post_by_default')
+			]
+		];
+	}
+}
+
+function buffer_settings(App $a, &$s)
+{
+	if (! local_user()) {
+		return;
+	}
+
+	/* Add our stylesheet to the page so we can make our settings look nice */
+
+	$a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->getBaseURL() . '/addon/buffer/buffer.css' . '" media="all" />' . "\r\n";
+
+	/* Get the current state of our config variables */
+
+	$enabled = PConfig::get(local_user(),'buffer','post');
+	$checked = (($enabled) ? ' checked="checked" ' : '');
+	$css = (($enabled) ? '' : '-disabled');
+
+	$def_enabled = PConfig::get(local_user(),'buffer','post_by_default');
+	$def_checked = (($def_enabled) ? ' checked="checked" ' : '');
+
+	/* Add some HTML to the existing form */
+
+	$s .= '<span id="settings_buffer_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_buffer_expanded\'); openClose(\'settings_buffer_inflated\');">';
+	$s .= '<img class="connector'.$css.'" src="images/buffer.png" /><h3 class="connector">'. L10n::t('Buffer Export').'</h3>';
+	$s .= '</span>';
+	$s .= '<div id="settings_buffer_expanded" class="settings-block" style="display: none;">';
+	$s .= '<span class="fakelink" onclick="openClose(\'settings_buffer_expanded\'); openClose(\'settings_buffer_inflated\');">';
+	$s .= '<img class="connector'.$css.'" src="images/buffer.png" /><h3 class="connector">'. L10n::t('Buffer Export').'</h3>';
+	$s .= '</span>';
+
+	$client_id = Config::get("buffer", "client_id");
+	$client_secret = Config::get("buffer", "client_secret");
+	$access_token = PConfig::get(local_user(), "buffer", "access_token");
+
+	$s .= '<div id="buffer-password-wrapper">';
+
+	if ($access_token == "") {
+		$s .= '<div id="buffer-authenticate-wrapper">';
+		$s .= '<a href="'.$a->getBaseURL().'/buffer/connect">'.L10n::t("Authenticate your Buffer connection").'</a>';
+		$s .= '</div><div class="clear"></div>';
+	} else {
+		$s .= '<div id="buffer-enable-wrapper">';
+		$s .= '<label id="buffer-enable-label" for="buffer-checkbox">' . L10n::t('Enable Buffer Post Addon') . '</label>';
+		$s .= '<input id="buffer-checkbox" type="checkbox" name="buffer" value="1" ' . $checked . '/>';
+		$s .= '</div><div class="clear"></div>';
+
+		$s .= '<div id="buffer-bydefault-wrapper">';
+		$s .= '<label id="buffer-bydefault-label" for="buffer-bydefault">' . L10n::t('Post to Buffer by default') . '</label>';
+		$s .= '<input id="buffer-bydefault" type="checkbox" name="buffer_bydefault" value="1" ' . $def_checked . '/>';
+		$s .= '</div><div class="clear"></div>';
+
+		$s .= '<div id="buffer-delete-wrapper">';
+		$s .= '<label id="buffer-delete-label" for="buffer-delete">' . L10n::t('Check to delete this preset') . '</label>';
+		$s .= '<input id="buffer-delete" type="checkbox" name="buffer_delete" value="1" />';
+		$s .= '</div><div class="clear"></div>';
+
+		// The callback URL is the script that gets called after the user authenticates with buffer
+		$callback_url = $a->getBaseURL() . '/buffer/connect';
+
+		$buffer = new BufferApp($client_id, $client_secret, $callback_url, $access_token);
+
+		$profiles = $buffer->go('/profiles');
+		if (is_array($profiles)) {
+			$s .= '<div id="buffer-accounts-wrapper">';
+			$s .= L10n::t("Posts are going to all accounts that are enabled by default:");
+			$s .= "<ul>";
+			foreach ($profiles as $profile) {
+				if (!$profile->default)
+					continue;
+				$s .= "<li>";
+				//$s .= "<img src='".$profile->avatar_https."' width='16' />";
+				$s .= " ".$profile->formatted_username." (".$profile->formatted_service.")";
+				$s .= "</li>";
+			}
+			$s .= "</ul>";
+			$s .= '</div><div class="clear"></div>';
+		}
+
+	}
+
+	$s .= '</div><div class="clear"></div>';
+
+	/* provide a submit button */
+
+	$s .= '<div class="settings-submit-wrapper" ><input type="submit" id="buffer-submit" name="buffer-submit" class="settings-submit" value="' . L10n::t('Save Settings') . '" /></div></div>';
+}
+
+
+function buffer_settings_post(App $a, array &$b)
+{
+	if (!empty($_POST['buffer-submit'])) {
+		if (!empty($_POST['buffer_delete'])) {
+			PConfig::set(local_user(), 'buffer', 'access_token'   , '');
+			PConfig::set(local_user(), 'buffer', 'post'           , false);
+			PConfig::set(local_user(), 'buffer', 'post_by_default', false);
+		} else {
+			PConfig::set(local_user(), 'buffer', 'post'           , intval($_POST['buffer'] ?? false));
+			PConfig::set(local_user(), 'buffer', 'post_by_default', intval($_POST['buffer_bydefault'] ?? false));
+		}
+	}
+}
+
+function buffer_post_local(App $a, array &$b)
+{
+	if (!local_user() || (local_user() != $b['uid'])) {
+		return;
+	}
+
+	$buffer_post   = intval(PConfig::get(local_user(),'buffer','post'));
+
+	$buffer_enable = (($buffer_post && !empty($_REQUEST['buffer_enable'])) ? intval($_REQUEST['buffer_enable']) : 0);
+
+	if ($b['api_source'] && intval(PConfig::get(local_user(),'buffer','post_by_default'))) {
+		$buffer_enable = 1;
+	}
+
+	if (!$buffer_enable) {
+		return;
+	}
+
+	if (strlen($b['postopts'])) {
+		$b['postopts'] .= ',';
+	}
+
+	$b['postopts'] .= 'buffer';
+}
+
+function buffer_hook_fork(&$a, &$b)
+{
+	if ($b['name'] != 'notifier_normal') {
+		return;
+	}
+
+	$post = $b['data'];
+
+	if ($post['deleted'] || $post['private'] || ($post['created'] !== $post['edited']) ||
+		!strstr($post['postopts'], 'buffer') || ($post['parent'] != $post['id'])) {
+		$b['execute'] = false;
+		return;
+	}
+}
+
+function buffer_send(App $a, array &$b)
+{
+	if ($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited'])) {
+		return;
+	}
+
+	if (!strstr($b['postopts'],'buffer')) {
+		return;
+	}
+
+	if ($b['parent'] != $b['id']) {
+		return;
+	}
+
+	// Dont't post if the post doesn't belong to us.
+	// This is a check for forum postings
+	$self = DBA::selectFirst('contact', ['id'], ['uid' => $b['uid'], 'self' => true]);
+	if ($b['contact-id'] != $self['id']) {
+		return;
+	}
+
+	// if post comes from buffer don't send it back
+	//if($b['app'] == "Buffer")
+	//	return;
+
+	$client_id = Config::get("buffer", "client_id");
+	$client_secret = Config::get("buffer", "client_secret");
+	$access_token = PConfig::get($b['uid'], "buffer","access_token");
+	$callback_url = "";
+
+	if ($access_token) {
+		$buffer = new BufferApp($client_id, $client_secret, $callback_url, $access_token);
+
+		$profiles = $buffer->go('/profiles');
+		if (is_array($profiles)) {
+			Logger::log("Will send these parameter ".print_r($b, true), Logger::DEBUG);
+
+			foreach ($profiles as $profile) {
+				if (!$profile->default)
+					continue;
+
+				$send = false;
+
+				switch ($profile->service) {
+					case 'facebook':
+						$send = ($b["extid"] != Protocol::FACEBOOK);
+						$limit = 0;
+						$includedlinks = false;
+						$htmlmode = 9;
+						break;
+
+					case 'twitter':
+						$send = ($b["extid"] != Protocol::TWITTER);
+						$limit = 280;
+						$includedlinks = true;
+						$htmlmode = 8;
+						break;
+
+					case 'linkedin':
+						$send = ($b["extid"] != Protocol::LINKEDIN);
+						$limit = 700;
+						$includedlinks = true;
+						$htmlmode = 2;
+						break;
+				}
+
+				if (!$send)
+					continue;
+
+				$item = $b;
+
+				$post = ItemContent::getPlaintextPost($item, $limit, $includedlinks, $htmlmode);
+				Logger::log("buffer_send: converted message ".$b["id"]." result: ".print_r($post, true), Logger::DEBUG);
+
+				// The image proxy is used as a sanitizer. Buffer seems to be really picky about pictures
+				if (isset($post["image"])) {
+					$post["image"] = ProxyUtils::proxifyUrl($post["image"]);
+				}
+
+				if (isset($post["preview"])) {
+					$post["preview"] = ProxyUtils::proxifyUrl($post["preview"]);
+				}
+
+				// Seems like a bug to me
+				// Buffer doesn't add links to Twitter (but pictures)
+				if (($profile->service == "twitter") && isset($post["url"]) && ($post["type"] != "photo")) {
+					$post["text"] .= " " . $post["url"];
+				}
+
+				$message = [];
+				$message["text"] = $post["text"];
+				$message["profile_ids[]"] = $profile->id;
+				$message["shorten"] = false;
+				$message["now"] = true;
+
+				if (isset($post["title"])) {
+					$message["media[title]"] = $post["title"];
+				}
+
+				if (isset($post["description"])) {
+					$message["media[description]"] = $post["description"];
+				}
+
+				if (isset($post["url"]) && ($post["type"] != "photo")) {
+					$message["media[link]"] = $post["url"];
+				}
+
+				if (isset($post["image"])) {
+					$message["media[picture]"] = $post["image"];
+
+					if ($post["type"] == "photo") {
+						$message["media[thumbnail]"] = $post["image"];
+					}
+				}
+
+				if (isset($post["preview"])) {
+					$message["media[thumbnail]"] = $post["preview"];
+				}
+
+				//print_r($message);
+				Logger::log("buffer_send: data for message " . $b["id"] . ": " . print_r($message, true), Logger::DEBUG);
+				$ret = $buffer->go('/updates/create', $message);
+				Logger::log("buffer_send: send message " . $b["id"] . " result: " . print_r($ret, true), Logger::DEBUG);
+			}
+		}
+	}
+}
diff --git a/buffer/bufferapp.php b/buffer/bufferapp.php
new file mode 100644
index 00000000..ed1d9353
--- /dev/null
+++ b/buffer/bufferapp.php
@@ -0,0 +1,207 @@
+<?php
+	class BufferApp {
+		private $client_id;
+		private $client_secret;
+		private $code;
+		public $access_token;
+
+		private $callback_url;
+		private $authorize_url = 'https://bufferapp.com/oauth2/authorize';
+		private $access_token_url = 'https://api.bufferapp.com/1/oauth2/token.json';
+		private $buffer_url = 'https://api.bufferapp.com/1';
+
+		public $ok = false;
+
+		private $endpoints = [
+			'/user' => 'get',
+
+			'/profiles' => 'get',
+			'/profiles/:id' => 'get',
+			'/profiles/:id/schedules' => 'get',
+			'/profiles/:id/schedules/update' => 'post',	// Array schedules [0][days][]=mon, [0][times][]=12:00
+
+			'/updates/:id' => 'get',
+			'/profiles/:id/updates/pending' => 'get',
+			'/profiles/:id/updates/sent' => 'get',
+			'/updates/:id/interactions' => 'get',
+
+			'/profiles/:id/updates/reorder' => 'post',	// Array order, int offset, bool utc
+			'/profiles/:id/updates/shuffle' => 'post',
+			'/updates/create' => 'post',								// String text, Array profile_ids, Aool shorten, Bool now, Array media ['link'], ['description'], ['picture']
+			'/updates/:id/update' => 'post',						// String text, Bool now, Array media ['link'], ['description'], ['picture'], Bool utc
+			'/updates/:id/share' => 'post',
+			'/updates/:id/destroy' => 'post',
+			'/updates/:id/move_to_top' => 'post',
+
+			'/links/shares' => 'get',
+
+			'/info/configuration' => 'get',
+
+		];
+
+		public $errors = [
+			'invalid-endpoint' => 'The endpoint you supplied does not appear to be valid.',
+
+			'401' => 'Unauthorized.',
+			'403' => 'Permission denied.',
+			'404' => 'Endpoint not found.',
+			'405' => 'Method not allowed.',
+			'504' => 'Gateway timeout server response timeout.',
+			'1000' => 'An unknown error occurred.',
+			'1001' => 'Access token required.',
+			'1002' => 'Not within application scope.',
+			'1003' => 'Parameter not recognized.',
+			'1004' => 'Required parameter missing.',
+			'1005' => 'Unsupported response format.',
+			'1006' => 'Parameter value not within bounds.',
+			'1010' => 'Profile could not be found.',
+			'1011' => 'No authorization to access profile.',
+			'1012' => 'Profile did not save successfully.',
+			'1013' => 'Profile schedule limit reached.',
+			'1014' => 'Profile limit for user has been reached.',
+			'1015' => 'Profile could not be destroyed.',
+			'1016' => 'Profile buffer could not be emptied.',
+			'1020' => 'Update could not be found.',
+			'1021' => 'No authorization to access update.',
+			'1022' => 'Update did not save successfully.',
+			'1023' => 'Update limit for profile has been reached.',
+			'1024' => 'Update limit for team profile has been reached.',
+			'1025' => "Update was recently posted, can't post duplicate content.",
+			'1026' => 'Update must be in error status to requeue.',
+			'1027' => 'Update must be in buffer and not custom scheduled in order to move to top.',
+			'1028' => 'Update soft limit for profile reached.',
+			'1029' => 'Event type not supported.',
+			'1030' => 'Media filetype not supported.',
+			'1031' => 'Media filesize out of acceptable range.',
+			'1032' => 'Unable to post image to LinkedIn group(s).',
+			'1033' => 'Comments can only be posted to Facebook at this time.',
+			'1034' => 'Cannot schedule updates in the past.',
+			'1042' => 'User did not save successfully.',
+			'1050' => 'Client could not be found.',
+			'1051' => 'No authorization to access client.',
+		];
+
+		function __construct($client_id = '', $client_secret = '', $callback_url = '', $access_token = '') {
+			if ($client_id) $this->set_client_id($client_id);
+			if ($client_secret) $this->set_client_secret($client_secret);
+			if ($callback_url) $this->set_callback_url($callback_url);
+			if ($access_token) $this->access_token = $access_token;
+
+			if (isset($_GET['code']) && $_GET['code']) {
+				$this->code = $_GET['code'];
+				$this->create_access_token_url();
+			}
+
+			if (!$access_token)
+				$this->retrieve_access_token();
+		}
+
+		function go($endpoint = '', $data = '') {
+			if (in_array($endpoint, array_keys($this->endpoints))) {
+				$done_endpoint = $endpoint;
+			} else {
+				$ok = false;
+
+				foreach (array_keys($this->endpoints) as $done_endpoint) {
+					if (preg_match('/' . preg_replace('/(\:\w+)/i', '(\w+)', str_replace('/', '\/', $done_endpoint)) . '/i', $endpoint, $match)) {
+						$ok = true;
+						break;
+					}
+				}
+
+				if (!$ok) return $this->error('invalid-endpoint');
+			}
+
+			if (!$data || !is_array($data)) $data = [];
+			$data['access_token'] = $this->access_token;
+
+			$method = $this->endpoints[$done_endpoint]; //get() or post()
+			return $this->$method($this->buffer_url . $endpoint . '.json', $data);
+		}
+
+		function store_access_token() {
+			$_SESSION['oauth']['buffer']['access_token'] = $this->access_token;
+		}
+
+		function retrieve_access_token() {
+			$this->access_token = $_SESSION['oauth']['buffer']['access_token'];
+
+			if ($this->access_token) {
+				$this->ok = true;
+			}
+		}
+
+		function error($error) {
+			return (object) ['error' => $this->errors[$error]];
+		}
+
+		function create_access_token_url() {
+			$data = [
+				'code' => $this->code,
+				'grant_type' => 'authorization_code',
+				'client_id' => $this->client_id,
+				'client_secret' => $this->client_secret,
+				'redirect_uri' => $this->callback_url,
+			];
+
+			$obj = $this->post($this->access_token_url, $data);
+			$this->access_token = $obj->access_token;
+
+			$this->store_access_token();
+		}
+
+		function req($url = '', $data = '', $post = true) {
+			if (!$url) return false;
+			if (!$data || !is_array($data)) $data = [];
+
+			$options = [CURLOPT_RETURNTRANSFER => true, CURLOPT_HEADER => false];
+
+			if ($post) {
+				$options += [
+					CURLOPT_POST => $post,
+					CURLOPT_POSTFIELDS => $data
+				];
+			} else {
+				$url .= '?' . http_build_query($data);
+			}
+
+			$ch = curl_init($url);
+			curl_setopt_array($ch, $options);
+			$rs = curl_exec($ch);
+
+			$code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+			if ($code >= 400) {
+				return $this->error($code);
+			}
+
+			return json_decode($rs);
+		}
+
+		function get($url = '', $data = '') {
+			return $this->req($url, $data, false);
+		}
+
+		function post($url = '', $data = '') {
+			return $this->req($url, $data, true);
+		}
+
+		function get_login_url() {
+			return $this->authorize_url . '?'
+    		. 'client_id=' . $this->client_id
+    		. '&redirect_uri=' . urlencode($this->callback_url)
+    		. '&response_type=code';
+		}
+
+		function set_client_id($client_id) {
+			$this->client_id = $client_id;
+		}
+
+		function set_client_secret($client_secret) {
+			$this->client_secret = $client_secret;
+		}
+
+		function set_callback_url($callback_url) {
+			$this->callback_url = $callback_url;
+		}
+	}
+?>
diff --git a/buffer/lang/C/messages.po b/buffer/lang/C/messages.po
new file mode 100644
index 00000000..3d519337
--- /dev/null
+++ b/buffer/lang/C/messages.po
@@ -0,0 +1,74 @@
+# ADDON buffer
+# Copyright (C) 
+# This file is distributed under the same license as the Friendica buffer addon package.
+# 
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: buffer.php:31
+msgid "Permission denied."
+msgstr ""
+
+#: buffer.php:57 buffer.php:185
+msgid "Save Settings"
+msgstr ""
+
+#: buffer.php:59
+msgid "Client ID"
+msgstr ""
+
+#: buffer.php:60
+msgid "Client Secret"
+msgstr ""
+
+#: buffer.php:67
+msgid "Error when registering buffer connection:"
+msgstr ""
+
+#: buffer.php:86
+msgid "You are now authenticated to buffer. "
+msgstr ""
+
+#: buffer.php:87
+msgid "return to the connector page"
+msgstr ""
+
+#: buffer.php:103
+msgid "Post to Buffer"
+msgstr ""
+
+#: buffer.php:128 buffer.php:132
+msgid "Buffer Export"
+msgstr ""
+
+#: buffer.php:142
+msgid "Authenticate your Buffer connection"
+msgstr ""
+
+#: buffer.php:146
+msgid "Enable Buffer Post Addon"
+msgstr ""
+
+#: buffer.php:151
+msgid "Post to Buffer by default"
+msgstr ""
+
+#: buffer.php:156
+msgid "Check to delete this preset"
+msgstr ""
+
+#: buffer.php:165
+msgid "Posts are going to all accounts that are enabled by default:"
+msgstr ""
diff --git a/buffer/lang/ca/messages.po b/buffer/lang/ca/messages.po
new file mode 100644
index 00000000..4a3490fc
--- /dev/null
+++ b/buffer/lang/ca/messages.po
@@ -0,0 +1,76 @@
+# ADDON buffer
+# Copyright (C)
+# This file is distributed under the same license as the Friendica buffer addon package.
+# 
+# 
+# Translators:
+# Joan Bar <friendica@tutanota.com>, 2019
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2019-10-14 18:57+0000\n"
+"Last-Translator: Joan Bar <friendica@tutanota.com>\n"
+"Language-Team: Catalan (http://www.transifex.com/Friendica/friendica/language/ca/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ca\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: buffer.php:31
+msgid "Permission denied."
+msgstr "Permís denegat."
+
+#: buffer.php:57 buffer.php:185
+msgid "Save Settings"
+msgstr "Desa la configuració"
+
+#: buffer.php:59
+msgid "Client ID"
+msgstr "Identificador de client"
+
+#: buffer.php:60
+msgid "Client Secret"
+msgstr "Secret del client"
+
+#: buffer.php:67
+msgid "Error when registering buffer connection:"
+msgstr "Error al registrar la connexió del buffer:"
+
+#: buffer.php:86
+msgid "You are now authenticated to buffer. "
+msgstr "Ara esteu autenticats com a buffer."
+
+#: buffer.php:87
+msgid "return to the connector page"
+msgstr "Torna a la pàgina del connector"
+
+#: buffer.php:103
+msgid "Post to Buffer"
+msgstr "Publica a Buffer"
+
+#: buffer.php:128 buffer.php:132
+msgid "Buffer Export"
+msgstr "Exportació de buffer"
+
+#: buffer.php:142
+msgid "Authenticate your Buffer connection"
+msgstr "Autentiqueu la vostra connexió buffer"
+
+#: buffer.php:146
+msgid "Enable Buffer Post Addon"
+msgstr "Activa l’addició de missatges de buffer"
+
+#: buffer.php:151
+msgid "Post to Buffer by default"
+msgstr "Publica a Buffer de manera predeterminada"
+
+#: buffer.php:156
+msgid "Check to delete this preset"
+msgstr "Comproveu suprimir aquesta configuració"
+
+#: buffer.php:165
+msgid "Posts are going to all accounts that are enabled by default:"
+msgstr "Les publicacions aniran a tots els comptes que estan habilitats de manera predeterminada:"
diff --git a/buffer/lang/ca/strings.php b/buffer/lang/ca/strings.php
new file mode 100644
index 00000000..d0cdce88
--- /dev/null
+++ b/buffer/lang/ca/strings.php
@@ -0,0 +1,22 @@
+<?php
+
+if(! function_exists("string_plural_select_ca")) {
+function string_plural_select_ca($n){
+	$n = intval($n);
+	return ($n != 1);;
+}}
+;
+$a->strings["Permission denied."] = "Permís denegat.";
+$a->strings["Save Settings"] = "Desa la configuració";
+$a->strings["Client ID"] = "Identificador de client";
+$a->strings["Client Secret"] = "Secret del client";
+$a->strings["Error when registering buffer connection:"] = "Error al registrar la connexió del buffer:";
+$a->strings["You are now authenticated to buffer. "] = "Ara esteu autenticats com a buffer.";
+$a->strings["return to the connector page"] = "Torna a la pàgina del connector";
+$a->strings["Post to Buffer"] = "Publica a Buffer";
+$a->strings["Buffer Export"] = "Exportació de buffer";
+$a->strings["Authenticate your Buffer connection"] = "Autentiqueu la vostra connexió buffer";
+$a->strings["Enable Buffer Post Addon"] = "Activa l’addició de missatges de buffer";
+$a->strings["Post to Buffer by default"] = "Publica a Buffer de manera predeterminada";
+$a->strings["Check to delete this preset"] = "Comproveu suprimir aquesta configuració";
+$a->strings["Posts are going to all accounts that are enabled by default:"] = "Les publicacions aniran a tots els comptes que estan habilitats de manera predeterminada:";
diff --git a/buffer/lang/cs/messages.po b/buffer/lang/cs/messages.po
new file mode 100644
index 00000000..ce1d936b
--- /dev/null
+++ b/buffer/lang/cs/messages.po
@@ -0,0 +1,78 @@
+# ADDON buffer
+# Copyright (C)
+# This file is distributed under the same license as the Friendica buffer addon package.
+# 
+# 
+# Translators:
+# Aditoo, 2018
+# Aditoo, 2018
+# michal_s <msupler@gmail.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2018-09-12 09:43+0000\n"
+"Last-Translator: Aditoo\n"
+"Language-Team: Czech (http://www.transifex.com/Friendica/friendica/language/cs/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
+
+#: buffer.php:31
+msgid "Permission denied."
+msgstr "Přístup odmítnut."
+
+#: buffer.php:57 buffer.php:185
+msgid "Save Settings"
+msgstr "Uložit Nastavení"
+
+#: buffer.php:59
+msgid "Client ID"
+msgstr "Client ID"
+
+#: buffer.php:60
+msgid "Client Secret"
+msgstr "Client Secret"
+
+#: buffer.php:67
+msgid "Error when registering buffer connection:"
+msgstr "Chyba při registraci připojení na buffer:"
+
+#: buffer.php:86
+msgid "You are now authenticated to buffer. "
+msgstr "Nyní jste přihlášen/a na buffer."
+
+#: buffer.php:87
+msgid "return to the connector page"
+msgstr "zpět ke stránce konektoru"
+
+#: buffer.php:103
+msgid "Post to Buffer"
+msgstr "Posílat na Buffer"
+
+#: buffer.php:128 buffer.php:132
+msgid "Buffer Export"
+msgstr "Buffer Export"
+
+#: buffer.php:142
+msgid "Authenticate your Buffer connection"
+msgstr "Autentikujte své připojení na Buffer"
+
+#: buffer.php:146
+msgid "Enable Buffer Post Addon"
+msgstr "Povolit doplněk Buffer Post"
+
+#: buffer.php:151
+msgid "Post to Buffer by default"
+msgstr "Ve výchozím stavu posílat na Buffer"
+
+#: buffer.php:156
+msgid "Check to delete this preset"
+msgstr "Zaškrtnutím smažete toto nastavení"
+
+#: buffer.php:165
+msgid "Posts are going to all accounts that are enabled by default:"
+msgstr "Příspěvky budou posílány na všechny účty, které jsou ve výchozím stavu povoleny:"
diff --git a/buffer/lang/cs/strings.php b/buffer/lang/cs/strings.php
new file mode 100644
index 00000000..971dbe9b
--- /dev/null
+++ b/buffer/lang/cs/strings.php
@@ -0,0 +1,22 @@
+<?php
+
+if(! function_exists("string_plural_select_cs")) {
+function string_plural_select_cs($n){
+	$n = intval($n);
+	return ($n == 1 && $n % 1 == 0) ? 0 : ($n >= 2 && $n <= 4 && $n % 1 == 0) ? 1: ($n % 1 != 0 ) ? 2 : 3;;
+}}
+;
+$a->strings["Permission denied."] = "Přístup odmítnut.";
+$a->strings["Save Settings"] = "Uložit Nastavení";
+$a->strings["Client ID"] = "Client ID";
+$a->strings["Client Secret"] = "Client Secret";
+$a->strings["Error when registering buffer connection:"] = "Chyba při registraci připojení na buffer:";
+$a->strings["You are now authenticated to buffer. "] = "Nyní jste přihlášen/a na buffer.";
+$a->strings["return to the connector page"] = "zpět ke stránce konektoru";
+$a->strings["Post to Buffer"] = "Posílat na Buffer";
+$a->strings["Buffer Export"] = "Buffer Export";
+$a->strings["Authenticate your Buffer connection"] = "Autentikujte své připojení na Buffer";
+$a->strings["Enable Buffer Post Addon"] = "Povolit doplněk Buffer Post";
+$a->strings["Post to Buffer by default"] = "Ve výchozím stavu posílat na Buffer";
+$a->strings["Check to delete this preset"] = "Zaškrtnutím smažete toto nastavení";
+$a->strings["Posts are going to all accounts that are enabled by default:"] = "Příspěvky budou posílány na všechny účty, které jsou ve výchozím stavu povoleny:";
diff --git a/buffer/lang/de/messages.po b/buffer/lang/de/messages.po
new file mode 100644
index 00000000..e01056b6
--- /dev/null
+++ b/buffer/lang/de/messages.po
@@ -0,0 +1,79 @@
+# ADDON buffer
+# Copyright (C)
+# This file is distributed under the same license as the Friendica buffer addon package.
+# 
+# 
+# Translators:
+# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2014
+# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2018
+# Ulf Rompe <transifex.com@rompe.org>, 2019
+# Vinzenz Vietzke <vinz@vinzv.de>, 2019
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2019-08-19 10:15+0000\n"
+"Last-Translator: Vinzenz Vietzke <vinz@vinzv.de>\n"
+"Language-Team: German (http://www.transifex.com/Friendica/friendica/language/de/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: buffer.php:31
+msgid "Permission denied."
+msgstr "Zugriff verweigert."
+
+#: buffer.php:57 buffer.php:185
+msgid "Save Settings"
+msgstr "Einstellungen speichern"
+
+#: buffer.php:59
+msgid "Client ID"
+msgstr "Client ID"
+
+#: buffer.php:60
+msgid "Client Secret"
+msgstr "Client Secret"
+
+#: buffer.php:67
+msgid "Error when registering buffer connection:"
+msgstr "Fehler beim Registrieren des Buffer-Connectors."
+
+#: buffer.php:86
+msgid "You are now authenticated to buffer. "
+msgstr "Du bist nun auf Buffer authentifiziert."
+
+#: buffer.php:87
+msgid "return to the connector page"
+msgstr "zurück zur Connector-Seite"
+
+#: buffer.php:103
+msgid "Post to Buffer"
+msgstr "Auf Buffer veröffentlichen"
+
+#: buffer.php:128 buffer.php:132
+msgid "Buffer Export"
+msgstr "Buffer Export"
+
+#: buffer.php:142
+msgid "Authenticate your Buffer connection"
+msgstr "Authentifiziere deine Verbindung zu Buffer"
+
+#: buffer.php:146
+msgid "Enable Buffer Post Addon"
+msgstr "Buffer-Post-Addon aktivieren"
+
+#: buffer.php:151
+msgid "Post to Buffer by default"
+msgstr "Standardmäßig auf Buffer veröffentlichen"
+
+#: buffer.php:156
+msgid "Check to delete this preset"
+msgstr "Markieren, um diese Voreinstellung zu löschen"
+
+#: buffer.php:165
+msgid "Posts are going to all accounts that are enabled by default:"
+msgstr "Beiträge werden an alle Accounts geschickt, die standardmäßig aktiviert sind."
diff --git a/buffer/lang/de/strings.php b/buffer/lang/de/strings.php
new file mode 100644
index 00000000..bb55e28b
--- /dev/null
+++ b/buffer/lang/de/strings.php
@@ -0,0 +1,22 @@
+<?php
+
+if(! function_exists("string_plural_select_de")) {
+function string_plural_select_de($n){
+	$n = intval($n);
+	return ($n != 1);;
+}}
+;
+$a->strings["Permission denied."] = "Zugriff verweigert.";
+$a->strings["Save Settings"] = "Einstellungen speichern";
+$a->strings["Client ID"] = "Client ID";
+$a->strings["Client Secret"] = "Client Secret";
+$a->strings["Error when registering buffer connection:"] = "Fehler beim Registrieren des Buffer-Connectors.";
+$a->strings["You are now authenticated to buffer. "] = "Du bist nun auf Buffer authentifiziert.";
+$a->strings["return to the connector page"] = "zurück zur Connector-Seite";
+$a->strings["Post to Buffer"] = "Auf Buffer veröffentlichen";
+$a->strings["Buffer Export"] = "Buffer Export";
+$a->strings["Authenticate your Buffer connection"] = "Authentifiziere deine Verbindung zu Buffer";
+$a->strings["Enable Buffer Post Addon"] = "Buffer-Post-Addon aktivieren";
+$a->strings["Post to Buffer by default"] = "Standardmäßig auf Buffer veröffentlichen";
+$a->strings["Check to delete this preset"] = "Markieren, um diese Voreinstellung zu löschen";
+$a->strings["Posts are going to all accounts that are enabled by default:"] = "Beiträge werden an alle Accounts geschickt, die standardmäßig aktiviert sind.";
diff --git a/buffer/lang/es/messages.po b/buffer/lang/es/messages.po
new file mode 100644
index 00000000..eb38cc3c
--- /dev/null
+++ b/buffer/lang/es/messages.po
@@ -0,0 +1,76 @@
+# ADDON buffer
+# Copyright (C)
+# This file is distributed under the same license as the Friendica buffer addon package.
+# 
+# 
+# Translators:
+# Albert, 2018
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2018-05-21 14:28+0000\n"
+"Last-Translator: Albert\n"
+"Language-Team: Spanish (http://www.transifex.com/Friendica/friendica/language/es/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: buffer.php:31
+msgid "Permission denied."
+msgstr "Permiso denegado"
+
+#: buffer.php:57 buffer.php:185
+msgid "Save Settings"
+msgstr "Guardar ajustes"
+
+#: buffer.php:59
+msgid "Client ID"
+msgstr "ID de cliente"
+
+#: buffer.php:60
+msgid "Client Secret"
+msgstr "Secreto de cliente"
+
+#: buffer.php:67
+msgid "Error when registering buffer connection:"
+msgstr "Error al registrar cunexión de buffer"
+
+#: buffer.php:86
+msgid "You are now authenticated to buffer. "
+msgstr "Ahora está autenticado al fufer"
+
+#: buffer.php:87
+msgid "return to the connector page"
+msgstr "Vuelva a la página de conexión"
+
+#: buffer.php:103
+msgid "Post to Buffer"
+msgstr "Publique en Buffer"
+
+#: buffer.php:128 buffer.php:132
+msgid "Buffer Export"
+msgstr "Exportar Buffer"
+
+#: buffer.php:142
+msgid "Authenticate your Buffer connection"
+msgstr "Autenticar su conexión de Buffer"
+
+#: buffer.php:146
+msgid "Enable Buffer Post Addon"
+msgstr "Habilitar el complemento de publicación de Buffer"
+
+#: buffer.php:151
+msgid "Post to Buffer by default"
+msgstr "Publicar en Buffer por defecto"
+
+#: buffer.php:156
+msgid "Check to delete this preset"
+msgstr "Verificar para eliminar este preajuste"
+
+#: buffer.php:165
+msgid "Posts are going to all accounts that are enabled by default:"
+msgstr "Las publicaciones van a todas las cuentas que estén habilitadas por defecto"
diff --git a/buffer/lang/es/strings.php b/buffer/lang/es/strings.php
new file mode 100644
index 00000000..0137d30a
--- /dev/null
+++ b/buffer/lang/es/strings.php
@@ -0,0 +1,22 @@
+<?php
+
+if(! function_exists("string_plural_select_es")) {
+function string_plural_select_es($n){
+	$n = intval($n);
+	return ($n != 1);;
+}}
+;
+$a->strings["Permission denied."] = "Permiso denegado";
+$a->strings["Save Settings"] = "Guardar ajustes";
+$a->strings["Client ID"] = "ID de cliente";
+$a->strings["Client Secret"] = "Secreto de cliente";
+$a->strings["Error when registering buffer connection:"] = "Error al registrar cunexión de buffer";
+$a->strings["You are now authenticated to buffer. "] = "Ahora está autenticado al fufer";
+$a->strings["return to the connector page"] = "Vuelva a la página de conexión";
+$a->strings["Post to Buffer"] = "Publique en Buffer";
+$a->strings["Buffer Export"] = "Exportar Buffer";
+$a->strings["Authenticate your Buffer connection"] = "Autenticar su conexión de Buffer";
+$a->strings["Enable Buffer Post Addon"] = "Habilitar el complemento de publicación de Buffer";
+$a->strings["Post to Buffer by default"] = "Publicar en Buffer por defecto";
+$a->strings["Check to delete this preset"] = "Verificar para eliminar este preajuste";
+$a->strings["Posts are going to all accounts that are enabled by default:"] = "Las publicaciones van a todas las cuentas que estén habilitadas por defecto";
diff --git a/buffer/lang/fi-fi/messages.po b/buffer/lang/fi-fi/messages.po
new file mode 100644
index 00000000..e834f3f5
--- /dev/null
+++ b/buffer/lang/fi-fi/messages.po
@@ -0,0 +1,77 @@
+# ADDON buffer
+# Copyright (C)
+# This file is distributed under the same license as the Friendica buffer addon package.
+# 
+# 
+# Translators:
+# Kris, 2018
+# Kris, 2018
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2018-04-18 14:49+0000\n"
+"Last-Translator: Kris\n"
+"Language-Team: Finnish (Finland) (http://www.transifex.com/Friendica/friendica/language/fi_FI/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fi_FI\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: buffer.php:31
+msgid "Permission denied."
+msgstr "Lupa kielletty."
+
+#: buffer.php:57 buffer.php:185
+msgid "Save Settings"
+msgstr "Tallenna asetukset"
+
+#: buffer.php:59
+msgid "Client ID"
+msgstr ""
+
+#: buffer.php:60
+msgid "Client Secret"
+msgstr ""
+
+#: buffer.php:67
+msgid "Error when registering buffer connection:"
+msgstr "Virhe Buffer-yhteyden rekisteröimisessä:"
+
+#: buffer.php:86
+msgid "You are now authenticated to buffer. "
+msgstr "Buffer-yhteydesi on todennettu."
+
+#: buffer.php:87
+msgid "return to the connector page"
+msgstr ""
+
+#: buffer.php:103
+msgid "Post to Buffer"
+msgstr "Julkaise Bufferiin"
+
+#: buffer.php:128 buffer.php:132
+msgid "Buffer Export"
+msgstr "Buffer Export"
+
+#: buffer.php:142
+msgid "Authenticate your Buffer connection"
+msgstr "Todenna Buffer-yhteydesi"
+
+#: buffer.php:146
+msgid "Enable Buffer Post Addon"
+msgstr "Ota Buffer-viestilisäosa käyttöön"
+
+#: buffer.php:151
+msgid "Post to Buffer by default"
+msgstr "Julkaise Bufferiin oletuksena"
+
+#: buffer.php:156
+msgid "Check to delete this preset"
+msgstr ""
+
+#: buffer.php:165
+msgid "Posts are going to all accounts that are enabled by default:"
+msgstr ""
diff --git a/buffer/lang/fi-fi/strings.php b/buffer/lang/fi-fi/strings.php
new file mode 100644
index 00000000..53be70e0
--- /dev/null
+++ b/buffer/lang/fi-fi/strings.php
@@ -0,0 +1,21 @@
+<?php
+
+if(! function_exists("string_plural_select_fi_fi")) {
+function string_plural_select_fi_fi($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["Permission denied."] = "Lupa kielletty.";
+$a->strings["Save Settings"] = "Tallenna asetukset";
+$a->strings["Client ID"] = "";
+$a->strings["Client Secret"] = "";
+$a->strings["Error when registering buffer connection:"] = "Virhe Buffer-yhteyden rekisteröimisessä:";
+$a->strings["You are now authenticated to buffer. "] = "Buffer-yhteydesi on todennettu.";
+$a->strings["return to the connector page"] = "";
+$a->strings["Post to Buffer"] = "Julkaise Bufferiin";
+$a->strings["Buffer Export"] = "Buffer Export";
+$a->strings["Authenticate your Buffer connection"] = "Todenna Buffer-yhteydesi";
+$a->strings["Enable Buffer Post Addon"] = "Ota Buffer-viestilisäosa käyttöön";
+$a->strings["Post to Buffer by default"] = "Julkaise Bufferiin oletuksena";
+$a->strings["Check to delete this preset"] = "";
+$a->strings["Posts are going to all accounts that are enabled by default:"] = "";
diff --git a/buffer/lang/fr/messages.po b/buffer/lang/fr/messages.po
new file mode 100644
index 00000000..716f5397
--- /dev/null
+++ b/buffer/lang/fr/messages.po
@@ -0,0 +1,79 @@
+# ADDON buffer
+# Copyright (C)
+# This file is distributed under the same license as the Friendica buffer addon package.
+# 
+# 
+# Translators:
+# Hypolite Petovan <hypolite@mrpetovan.com>, 2016
+# Marie Olive <lacellule101@gmail.com>, 2018
+# RyDroid <inactive+RyDroid@transifex.com>, 2015
+# StefOfficiel <pichard.stephane@free.fr>, 2015
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2018-11-13 12:56+0000\n"
+"Last-Translator: Marie Olive <lacellule101@gmail.com>\n"
+"Language-Team: French (http://www.transifex.com/Friendica/friendica/language/fr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: buffer.php:31
+msgid "Permission denied."
+msgstr "Permission refusée."
+
+#: buffer.php:57 buffer.php:185
+msgid "Save Settings"
+msgstr "Enregistrer les Paramètres"
+
+#: buffer.php:59
+msgid "Client ID"
+msgstr "Identifiant client"
+
+#: buffer.php:60
+msgid "Client Secret"
+msgstr "Secret Client"
+
+#: buffer.php:67
+msgid "Error when registering buffer connection:"
+msgstr "Une erreur est survenue lors de la connexion à Buffer :"
+
+#: buffer.php:86
+msgid "You are now authenticated to buffer. "
+msgstr "Vous êtes maintenant authentifié sur Buffer."
+
+#: buffer.php:87
+msgid "return to the connector page"
+msgstr "revenir à la page du connecteur"
+
+#: buffer.php:103
+msgid "Post to Buffer"
+msgstr "Publier sur Buffer"
+
+#: buffer.php:128 buffer.php:132
+msgid "Buffer Export"
+msgstr "Export Buffer"
+
+#: buffer.php:142
+msgid "Authenticate your Buffer connection"
+msgstr "Authentifier votre connexion à Buffer"
+
+#: buffer.php:146
+msgid "Enable Buffer Post Addon"
+msgstr "Activer l'extension de publication Buffer"
+
+#: buffer.php:151
+msgid "Post to Buffer by default"
+msgstr "Publier sur Buffer par défaut"
+
+#: buffer.php:156
+msgid "Check to delete this preset"
+msgstr "Cocher pour supprimer ce préréglage"
+
+#: buffer.php:165
+msgid "Posts are going to all accounts that are enabled by default:"
+msgstr "Les posts sont envoyés à tous les comptes activés par défault:"
diff --git a/buffer/lang/fr/strings.php b/buffer/lang/fr/strings.php
new file mode 100644
index 00000000..f7d97493
--- /dev/null
+++ b/buffer/lang/fr/strings.php
@@ -0,0 +1,22 @@
+<?php
+
+if(! function_exists("string_plural_select_fr")) {
+function string_plural_select_fr($n){
+	$n = intval($n);
+	return ($n > 1);;
+}}
+;
+$a->strings["Permission denied."] = "Permission refusée.";
+$a->strings["Save Settings"] = "Enregistrer les Paramètres";
+$a->strings["Client ID"] = "Identifiant client";
+$a->strings["Client Secret"] = "Secret Client";
+$a->strings["Error when registering buffer connection:"] = "Une erreur est survenue lors de la connexion à Buffer :";
+$a->strings["You are now authenticated to buffer. "] = "Vous êtes maintenant authentifié sur Buffer.";
+$a->strings["return to the connector page"] = "revenir à la page du connecteur";
+$a->strings["Post to Buffer"] = "Publier sur Buffer";
+$a->strings["Buffer Export"] = "Export Buffer";
+$a->strings["Authenticate your Buffer connection"] = "Authentifier votre connexion à Buffer";
+$a->strings["Enable Buffer Post Addon"] = "Activer l'extension de publication Buffer";
+$a->strings["Post to Buffer by default"] = "Publier sur Buffer par défaut";
+$a->strings["Check to delete this preset"] = "Cocher pour supprimer ce préréglage";
+$a->strings["Posts are going to all accounts that are enabled by default:"] = "Les posts sont envoyés à tous les comptes activés par défault:";
diff --git a/buffer/lang/is/messages.po b/buffer/lang/is/messages.po
new file mode 100644
index 00000000..dea15854
--- /dev/null
+++ b/buffer/lang/is/messages.po
@@ -0,0 +1,76 @@
+# ADDON buffer
+# Copyright (C)
+# This file is distributed under the same license as the Friendica buffer addon package.
+# 
+# 
+# Translators:
+# Sveinn í Felli <sv1@fellsnet.is>, 2018
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2018-05-24 15:15+0000\n"
+"Last-Translator: Sveinn í Felli <sv1@fellsnet.is>\n"
+"Language-Team: Icelandic (http://www.transifex.com/Friendica/friendica/language/is/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: is\n"
+"Plural-Forms: nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);\n"
+
+#: buffer.php:31
+msgid "Permission denied."
+msgstr "Heimild ekki veitt."
+
+#: buffer.php:57 buffer.php:185
+msgid "Save Settings"
+msgstr ""
+
+#: buffer.php:59
+msgid "Client ID"
+msgstr ""
+
+#: buffer.php:60
+msgid "Client Secret"
+msgstr ""
+
+#: buffer.php:67
+msgid "Error when registering buffer connection:"
+msgstr ""
+
+#: buffer.php:86
+msgid "You are now authenticated to buffer. "
+msgstr ""
+
+#: buffer.php:87
+msgid "return to the connector page"
+msgstr ""
+
+#: buffer.php:103
+msgid "Post to Buffer"
+msgstr ""
+
+#: buffer.php:128 buffer.php:132
+msgid "Buffer Export"
+msgstr ""
+
+#: buffer.php:142
+msgid "Authenticate your Buffer connection"
+msgstr ""
+
+#: buffer.php:146
+msgid "Enable Buffer Post Addon"
+msgstr ""
+
+#: buffer.php:151
+msgid "Post to Buffer by default"
+msgstr ""
+
+#: buffer.php:156
+msgid "Check to delete this preset"
+msgstr ""
+
+#: buffer.php:165
+msgid "Posts are going to all accounts that are enabled by default:"
+msgstr ""
diff --git a/buffer/lang/is/strings.php b/buffer/lang/is/strings.php
new file mode 100644
index 00000000..3584aad3
--- /dev/null
+++ b/buffer/lang/is/strings.php
@@ -0,0 +1,22 @@
+<?php
+
+if(! function_exists("string_plural_select_is")) {
+function string_plural_select_is($n){
+	$n = intval($n);
+	return ($n % 10 != 1 || $n % 100 == 11);;
+}}
+;
+$a->strings["Permission denied."] = "Heimild ekki veitt.";
+$a->strings["Save Settings"] = "";
+$a->strings["Client ID"] = "";
+$a->strings["Client Secret"] = "";
+$a->strings["Error when registering buffer connection:"] = "";
+$a->strings["You are now authenticated to buffer. "] = "";
+$a->strings["return to the connector page"] = "";
+$a->strings["Post to Buffer"] = "";
+$a->strings["Buffer Export"] = "";
+$a->strings["Authenticate your Buffer connection"] = "";
+$a->strings["Enable Buffer Post Addon"] = "";
+$a->strings["Post to Buffer by default"] = "";
+$a->strings["Check to delete this preset"] = "";
+$a->strings["Posts are going to all accounts that are enabled by default:"] = "";
diff --git a/buffer/lang/it/messages.po b/buffer/lang/it/messages.po
new file mode 100644
index 00000000..6f4c94c2
--- /dev/null
+++ b/buffer/lang/it/messages.po
@@ -0,0 +1,77 @@
+# ADDON buffer
+# Copyright (C)
+# This file is distributed under the same license as the Friendica buffer addon package.
+# 
+# 
+# Translators:
+# fabrixxm <fabrix.xm@gmail.com>, 2014,2018
+# Sandro Santilli <strk@kbt.io>, 2015
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2018-03-19 13:21+0000\n"
+"Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n"
+"Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: it\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: buffer.php:31
+msgid "Permission denied."
+msgstr "Permesso negato."
+
+#: buffer.php:57 buffer.php:185
+msgid "Save Settings"
+msgstr "Salva Impostazioni"
+
+#: buffer.php:59
+msgid "Client ID"
+msgstr "Client ID"
+
+#: buffer.php:60
+msgid "Client Secret"
+msgstr "Client Secret"
+
+#: buffer.php:67
+msgid "Error when registering buffer connection:"
+msgstr "Errore registrando la connessione a buffer:"
+
+#: buffer.php:86
+msgid "You are now authenticated to buffer. "
+msgstr "Sei autenticato su buffer."
+
+#: buffer.php:87
+msgid "return to the connector page"
+msgstr "ritorna alla pagina del connettore"
+
+#: buffer.php:103
+msgid "Post to Buffer"
+msgstr "Invia a Buffer"
+
+#: buffer.php:128 buffer.php:132
+msgid "Buffer Export"
+msgstr "Esporta Buffer"
+
+#: buffer.php:142
+msgid "Authenticate your Buffer connection"
+msgstr "Autentica la tua connessione a Buffer"
+
+#: buffer.php:146
+msgid "Enable Buffer Post Addon"
+msgstr "Abilita il componente aggiuntivo di invio a Buffer"
+
+#: buffer.php:151
+msgid "Post to Buffer by default"
+msgstr "Invia sempre a Buffer"
+
+#: buffer.php:156
+msgid "Check to delete this preset"
+msgstr "Seleziona per eliminare questo preset"
+
+#: buffer.php:165
+msgid "Posts are going to all accounts that are enabled by default:"
+msgstr "I messaggi andranno a tutti gli account che sono abilitati:"
diff --git a/buffer/lang/it/strings.php b/buffer/lang/it/strings.php
new file mode 100644
index 00000000..02fa328b
--- /dev/null
+++ b/buffer/lang/it/strings.php
@@ -0,0 +1,21 @@
+<?php
+
+if(! function_exists("string_plural_select_it")) {
+function string_plural_select_it($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["Permission denied."] = "Permesso negato.";
+$a->strings["Save Settings"] = "Salva Impostazioni";
+$a->strings["Client ID"] = "Client ID";
+$a->strings["Client Secret"] = "Client Secret";
+$a->strings["Error when registering buffer connection:"] = "Errore registrando la connessione a buffer:";
+$a->strings["You are now authenticated to buffer. "] = "Sei autenticato su buffer.";
+$a->strings["return to the connector page"] = "ritorna alla pagina del connettore";
+$a->strings["Post to Buffer"] = "Invia a Buffer";
+$a->strings["Buffer Export"] = "Esporta Buffer";
+$a->strings["Authenticate your Buffer connection"] = "Autentica la tua connessione a Buffer";
+$a->strings["Enable Buffer Post Addon"] = "Abilita il componente aggiuntivo di invio a Buffer";
+$a->strings["Post to Buffer by default"] = "Invia sempre a Buffer";
+$a->strings["Check to delete this preset"] = "Seleziona per eliminare questo preset";
+$a->strings["Posts are going to all accounts that are enabled by default:"] = "I messaggi andranno a tutti gli account che sono abilitati:";
diff --git a/buffer/lang/nl/messages.po b/buffer/lang/nl/messages.po
new file mode 100644
index 00000000..1dc00c78
--- /dev/null
+++ b/buffer/lang/nl/messages.po
@@ -0,0 +1,77 @@
+# ADDON buffer
+# Copyright (C)
+# This file is distributed under the same license as the Friendica buffer addon package.
+# 
+# 
+# Translators:
+# AgnesElisa <agneselisa@disroot.org>, 2018
+# Jeroen De Meerleer <me@jeroened.be>, 2018
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2018-08-24 13:04+0000\n"
+"Last-Translator: Jeroen De Meerleer <me@jeroened.be>\n"
+"Language-Team: Dutch (http://www.transifex.com/Friendica/friendica/language/nl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: buffer.php:31
+msgid "Permission denied."
+msgstr "Toegang geweigerd."
+
+#: buffer.php:57 buffer.php:185
+msgid "Save Settings"
+msgstr "Instellingen opslaan"
+
+#: buffer.php:59
+msgid "Client ID"
+msgstr "Cliënt ID"
+
+#: buffer.php:60
+msgid "Client Secret"
+msgstr "Cliënt geheim"
+
+#: buffer.php:67
+msgid "Error when registering buffer connection:"
+msgstr "Fout bij het registreren van de buffer verbinding:"
+
+#: buffer.php:86
+msgid "You are now authenticated to buffer. "
+msgstr "Je bent nu aangemeld bij Buffer"
+
+#: buffer.php:87
+msgid "return to the connector page"
+msgstr "ga terug naar de verbindingspagina"
+
+#: buffer.php:103
+msgid "Post to Buffer"
+msgstr "Plaats bericht op Buffer"
+
+#: buffer.php:128 buffer.php:132
+msgid "Buffer Export"
+msgstr "Buffer Exporteren"
+
+#: buffer.php:142
+msgid "Authenticate your Buffer connection"
+msgstr "Verbinding met Buffer goedkeuren"
+
+#: buffer.php:146
+msgid "Enable Buffer Post Addon"
+msgstr "Buffer Post Addon inschakelen"
+
+#: buffer.php:151
+msgid "Post to Buffer by default"
+msgstr "Plaatsen op Buffer als standaard instellen"
+
+#: buffer.php:156
+msgid "Check to delete this preset"
+msgstr "Vink aan om deze vooraf ingestelde opties te verwijderen "
+
+#: buffer.php:165
+msgid "Posts are going to all accounts that are enabled by default:"
+msgstr "Berichten gaan naar alle accounts die als standaard zijn ingeschakeld: "
diff --git a/buffer/lang/nl/strings.php b/buffer/lang/nl/strings.php
new file mode 100644
index 00000000..5d6d0151
--- /dev/null
+++ b/buffer/lang/nl/strings.php
@@ -0,0 +1,22 @@
+<?php
+
+if(! function_exists("string_plural_select_nl")) {
+function string_plural_select_nl($n){
+	$n = intval($n);
+	return ($n != 1);;
+}}
+;
+$a->strings["Permission denied."] = "Toegang geweigerd.";
+$a->strings["Save Settings"] = "Instellingen opslaan";
+$a->strings["Client ID"] = "Cliënt ID";
+$a->strings["Client Secret"] = "Cliënt geheim";
+$a->strings["Error when registering buffer connection:"] = "Fout bij het registreren van de buffer verbinding:";
+$a->strings["You are now authenticated to buffer. "] = "Je bent nu aangemeld bij Buffer";
+$a->strings["return to the connector page"] = "ga terug naar de verbindingspagina";
+$a->strings["Post to Buffer"] = "Plaats bericht op Buffer";
+$a->strings["Buffer Export"] = "Buffer Exporteren";
+$a->strings["Authenticate your Buffer connection"] = "Verbinding met Buffer goedkeuren";
+$a->strings["Enable Buffer Post Addon"] = "Buffer Post Addon inschakelen";
+$a->strings["Post to Buffer by default"] = "Plaatsen op Buffer als standaard instellen";
+$a->strings["Check to delete this preset"] = "Vink aan om deze vooraf ingestelde opties te verwijderen ";
+$a->strings["Posts are going to all accounts that are enabled by default:"] = "Berichten gaan naar alle accounts die als standaard zijn ingeschakeld: ";
diff --git a/buffer/lang/pl/messages.po b/buffer/lang/pl/messages.po
new file mode 100644
index 00000000..d44d11ba
--- /dev/null
+++ b/buffer/lang/pl/messages.po
@@ -0,0 +1,76 @@
+# ADDON buffer
+# Copyright (C)
+# This file is distributed under the same license as the Friendica buffer addon package.
+# 
+# 
+# Translators:
+# Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>, 2018
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2018-03-31 17:10+0000\n"
+"Last-Translator: Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>\n"
+"Language-Team: Polish (http://www.transifex.com/Friendica/friendica/language/pl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pl\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
+
+#: buffer.php:31
+msgid "Permission denied."
+msgstr "Odmowa uprawnień."
+
+#: buffer.php:57 buffer.php:185
+msgid "Save Settings"
+msgstr "Zapisz ustawienia"
+
+#: buffer.php:59
+msgid "Client ID"
+msgstr "Identyfikator ID klienta"
+
+#: buffer.php:60
+msgid "Client Secret"
+msgstr " Tajny klucz klienta"
+
+#: buffer.php:67
+msgid "Error when registering buffer connection:"
+msgstr "Błąd podczas rejestrowania połączenia z buforem:"
+
+#: buffer.php:86
+msgid "You are now authenticated to buffer. "
+msgstr "Jesteś teraz uwierzytelniony w buforze."
+
+#: buffer.php:87
+msgid "return to the connector page"
+msgstr "powrót do strony połączenia"
+
+#: buffer.php:103
+msgid "Post to Buffer"
+msgstr "Opublikuj w buforze"
+
+#: buffer.php:128 buffer.php:132
+msgid "Buffer Export"
+msgstr "Eksportuj Bufor"
+
+#: buffer.php:142
+msgid "Authenticate your Buffer connection"
+msgstr "Uwierzytelnij swoje połączenie z buforem"
+
+#: buffer.php:146
+msgid "Enable Buffer Post Addon"
+msgstr "Włącz dodatek bufora pocztowego"
+
+#: buffer.php:151
+msgid "Post to Buffer by default"
+msgstr "Wyślij domyślnie post do bufora"
+
+#: buffer.php:156
+msgid "Check to delete this preset"
+msgstr "Zaznacz, aby usunąć to ustawienie wstępne"
+
+#: buffer.php:165
+msgid "Posts are going to all accounts that are enabled by default:"
+msgstr "Wpisy są wysyłane na wszystkie konta, które są domyślnie włączone:"
diff --git a/buffer/lang/pl/strings.php b/buffer/lang/pl/strings.php
new file mode 100644
index 00000000..cd1c1f5a
--- /dev/null
+++ b/buffer/lang/pl/strings.php
@@ -0,0 +1,21 @@
+<?php
+
+if(! function_exists("string_plural_select_pl")) {
+function string_plural_select_pl($n){
+	return ($n==1 ? 0 : ($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14) ? 1 : $n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14) ? 2 : 3);;
+}}
+;
+$a->strings["Permission denied."] = "Odmowa uprawnień.";
+$a->strings["Save Settings"] = "Zapisz ustawienia";
+$a->strings["Client ID"] = "Identyfikator ID klienta";
+$a->strings["Client Secret"] = " Tajny klucz klienta";
+$a->strings["Error when registering buffer connection:"] = "Błąd podczas rejestrowania połączenia z buforem:";
+$a->strings["You are now authenticated to buffer. "] = "Jesteś teraz uwierzytelniony w buforze.";
+$a->strings["return to the connector page"] = "powrót do strony połączenia";
+$a->strings["Post to Buffer"] = "Opublikuj w buforze";
+$a->strings["Buffer Export"] = "Eksportuj Bufor";
+$a->strings["Authenticate your Buffer connection"] = "Uwierzytelnij swoje połączenie z buforem";
+$a->strings["Enable Buffer Post Addon"] = "Włącz dodatek bufora pocztowego";
+$a->strings["Post to Buffer by default"] = "Wyślij domyślnie post do bufora";
+$a->strings["Check to delete this preset"] = "Zaznacz, aby usunąć to ustawienie wstępne";
+$a->strings["Posts are going to all accounts that are enabled by default:"] = "Wpisy są wysyłane na wszystkie konta, które są domyślnie włączone:";
diff --git a/buffer/lang/pt-br/messages.po b/buffer/lang/pt-br/messages.po
new file mode 100644
index 00000000..795f2642
--- /dev/null
+++ b/buffer/lang/pt-br/messages.po
@@ -0,0 +1,77 @@
+# ADDON buffer
+# Copyright (C)
+# This file is distributed under the same license as the Friendica buffer addon package.
+# 
+# 
+# Translators:
+# André Alves <and2099@riseup.net>, 2016
+# Rui Andrada <shingonoide@gmail.com>, 2015
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2016-01-03 06:19+0000\n"
+"Last-Translator: André Alves <and2099@riseup.net>\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/Friendica/friendica/language/pt_BR/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pt_BR\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: buffer.php:31
+msgid "Permission denied."
+msgstr "Permissão negada."
+
+#: buffer.php:57 buffer.php:185
+msgid "Save Settings"
+msgstr "Salvar configurações"
+
+#: buffer.php:59
+msgid "Client ID"
+msgstr ""
+
+#: buffer.php:60
+msgid "Client Secret"
+msgstr ""
+
+#: buffer.php:67
+msgid "Error when registering buffer connection:"
+msgstr "Erro ao registrar conexão de buffer:"
+
+#: buffer.php:86
+msgid "You are now authenticated to buffer. "
+msgstr "Você está autenticado no buffer."
+
+#: buffer.php:87
+msgid "return to the connector page"
+msgstr "Volte a página de conectores."
+
+#: buffer.php:103
+msgid "Post to Buffer"
+msgstr "Publicar no Buffer"
+
+#: buffer.php:128 buffer.php:132
+msgid "Buffer Export"
+msgstr "Exportar Buffer"
+
+#: buffer.php:142
+msgid "Authenticate your Buffer connection"
+msgstr "Autenticar sua conexão de Buffer"
+
+#: buffer.php:146
+msgid "Enable Buffer Post Addon"
+msgstr "Habilita addon para publicar no Buffer"
+
+#: buffer.php:151
+msgid "Post to Buffer by default"
+msgstr "Publica no Buffer por padrão"
+
+#: buffer.php:156
+msgid "Check to delete this preset"
+msgstr "Marque para excluir este perfil"
+
+#: buffer.php:165
+msgid "Posts are going to all accounts that are enabled by default:"
+msgstr ""
diff --git a/buffer/lang/pt-br/strings.php b/buffer/lang/pt-br/strings.php
new file mode 100644
index 00000000..737a86eb
--- /dev/null
+++ b/buffer/lang/pt-br/strings.php
@@ -0,0 +1,21 @@
+<?php
+
+if(! function_exists("string_plural_select_pt_br")) {
+function string_plural_select_pt_br($n){
+	return ($n > 1);;
+}}
+;
+$a->strings["Permission denied."] = "Permissão negada.";
+$a->strings["Save Settings"] = "Salvar configurações";
+$a->strings["Client ID"] = "";
+$a->strings["Client Secret"] = "";
+$a->strings["Error when registering buffer connection:"] = "Erro ao registrar conexão de buffer:";
+$a->strings["You are now authenticated to buffer. "] = "Você está autenticado no buffer.";
+$a->strings["return to the connector page"] = "Volte a página de conectores.";
+$a->strings["Post to Buffer"] = "Publicar no Buffer";
+$a->strings["Buffer Export"] = "Exportar Buffer";
+$a->strings["Authenticate your Buffer connection"] = "Autenticar sua conexão de Buffer";
+$a->strings["Enable Buffer Post Addon"] = "Habilita addon para publicar no Buffer";
+$a->strings["Post to Buffer by default"] = "Publica no Buffer por padrão";
+$a->strings["Check to delete this preset"] = "Marque para excluir este perfil";
+$a->strings["Posts are going to all accounts that are enabled by default:"] = "";
diff --git a/buffer/lang/ro/messages.po b/buffer/lang/ro/messages.po
new file mode 100644
index 00000000..81e46a5a
--- /dev/null
+++ b/buffer/lang/ro/messages.po
@@ -0,0 +1,75 @@
+# ADDON buffer
+# Copyright (C)
+# This file is distributed under the same license as the Friendica buffer addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-08 11:45+0000\n"
+"Last-Translator: Arian - Cazare Muncitori <arianserv@gmail.com>\n"
+"Language-Team: Romanian (Romania) (http://www.transifex.com/projects/p/friendica/language/ro_RO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ro_RO\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
+
+#: buffer.php:31
+msgid "Permission denied."
+msgstr "Permisiune refuzată."
+
+#: buffer.php:57 buffer.php:185
+msgid "Save Settings"
+msgstr "Salvare Configurări"
+
+#: buffer.php:59
+msgid "Client ID"
+msgstr "ID Client"
+
+#: buffer.php:60
+msgid "Client Secret"
+msgstr "Cheia Secretă Client"
+
+#: buffer.php:67
+msgid "Error when registering buffer connection:"
+msgstr "Eroare la înregistrarea conexiunii Buffer:"
+
+#: buffer.php:86
+msgid "You are now authenticated to buffer. "
+msgstr "Acum sunteți autentificat pe Buffer."
+
+#: buffer.php:87
+msgid "return to the connector page"
+msgstr "revenire la pagina de conectare"
+
+#: buffer.php:103
+msgid "Post to Buffer"
+msgstr "Postați pe Buffer"
+
+#: buffer.php:128 buffer.php:132
+msgid "Buffer Export"
+msgstr "Export pe Buffer "
+
+#: buffer.php:142
+msgid "Authenticate your Buffer connection"
+msgstr "Autentificați-vă conectarea la Buffer"
+
+#: buffer.php:146
+msgid "Enable Buffer Post Addon"
+msgstr "Activare Modul Postare pe Buffer"
+
+#: buffer.php:151
+msgid "Post to Buffer by default"
+msgstr "Postați implicit pe Buffer"
+
+#: buffer.php:156
+msgid "Check to delete this preset"
+msgstr "Bifați pentru a șterge această presetare"
+
+#: buffer.php:165
+msgid "Posts are going to all accounts that are enabled by default:"
+msgstr "Posturile merg către toate conturile care sunt activate implicit:"
diff --git a/buffer/lang/ro/strings.php b/buffer/lang/ro/strings.php
new file mode 100644
index 00000000..a6bda064
--- /dev/null
+++ b/buffer/lang/ro/strings.php
@@ -0,0 +1,21 @@
+<?php
+
+if(! function_exists("string_plural_select_ro")) {
+function string_plural_select_ro($n){
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+}}
+;
+$a->strings["Permission denied."] = "Permisiune refuzată.";
+$a->strings["Save Settings"] = "Salvare Configurări";
+$a->strings["Client ID"] = "ID Client";
+$a->strings["Client Secret"] = "Cheia Secretă Client";
+$a->strings["Error when registering buffer connection:"] = "Eroare la înregistrarea conexiunii Buffer:";
+$a->strings["You are now authenticated to buffer. "] = "Acum sunteți autentificat pe Buffer.";
+$a->strings["return to the connector page"] = "revenire la pagina de conectare";
+$a->strings["Post to Buffer"] = "Postați pe Buffer";
+$a->strings["Buffer Export"] = "Export pe Buffer ";
+$a->strings["Authenticate your Buffer connection"] = "Autentificați-vă conectarea la Buffer";
+$a->strings["Enable Buffer Post Addon"] = "Activare Modul Postare pe Buffer";
+$a->strings["Post to Buffer by default"] = "Postați implicit pe Buffer";
+$a->strings["Check to delete this preset"] = "Bifați pentru a șterge această presetare";
+$a->strings["Posts are going to all accounts that are enabled by default:"] = "Posturile merg către toate conturile care sunt activate implicit:";
diff --git a/buffer/lang/ru/messages.po b/buffer/lang/ru/messages.po
new file mode 100644
index 00000000..7aabaf4c
--- /dev/null
+++ b/buffer/lang/ru/messages.po
@@ -0,0 +1,76 @@
+# ADDON buffer
+# Copyright (C)
+# This file is distributed under the same license as the Friendica buffer addon package.
+# 
+# 
+# Translators:
+# Stanislav N. <pztrn@pztrn.name>, 2017-2018
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2018-05-25 00:01+0000\n"
+"Last-Translator: Stanislav N. <pztrn@pztrn.name>\n"
+"Language-Team: Russian (http://www.transifex.com/Friendica/friendica/language/ru/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ru\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
+
+#: buffer.php:31
+msgid "Permission denied."
+msgstr "Доступ запрещен."
+
+#: buffer.php:57 buffer.php:185
+msgid "Save Settings"
+msgstr "Сохранить настройки"
+
+#: buffer.php:59
+msgid "Client ID"
+msgstr "Client ID"
+
+#: buffer.php:60
+msgid "Client Secret"
+msgstr "Client Secret"
+
+#: buffer.php:67
+msgid "Error when registering buffer connection:"
+msgstr "Ошибка при регистрации соединения Buffer:"
+
+#: buffer.php:86
+msgid "You are now authenticated to buffer. "
+msgstr "Вы аутентифицированы на Buffer."
+
+#: buffer.php:87
+msgid "return to the connector page"
+msgstr "вернуться на страницу коннектора"
+
+#: buffer.php:103
+msgid "Post to Buffer"
+msgstr "Написать в Buffer"
+
+#: buffer.php:128 buffer.php:132
+msgid "Buffer Export"
+msgstr "Экспорт в Buffer"
+
+#: buffer.php:142
+msgid "Authenticate your Buffer connection"
+msgstr "Аутентифицируйте свое соединение с Buffer"
+
+#: buffer.php:146
+msgid "Enable Buffer Post Addon"
+msgstr "Включить аддон Buffer Post"
+
+#: buffer.php:151
+msgid "Post to Buffer by default"
+msgstr "Отправлять в Buffer по умолчанию"
+
+#: buffer.php:156
+msgid "Check to delete this preset"
+msgstr "Отметьте для удаления этих настроек"
+
+#: buffer.php:165
+msgid "Posts are going to all accounts that are enabled by default:"
+msgstr "Сообщения уходят во все учетные записи по умолчанию:"
diff --git a/buffer/lang/ru/strings.php b/buffer/lang/ru/strings.php
new file mode 100644
index 00000000..92dfc507
--- /dev/null
+++ b/buffer/lang/ru/strings.php
@@ -0,0 +1,22 @@
+<?php
+
+if(! function_exists("string_plural_select_ru")) {
+function string_plural_select_ru($n){
+	$n = intval($n);
+	return ($n%10==1 && $n%100!=11 ? 0 : $n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14) ? 1 : $n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)? 2 : 3);;
+}}
+;
+$a->strings["Permission denied."] = "Доступ запрещен.";
+$a->strings["Save Settings"] = "Сохранить настройки";
+$a->strings["Client ID"] = "Client ID";
+$a->strings["Client Secret"] = "Client Secret";
+$a->strings["Error when registering buffer connection:"] = "Ошибка при регистрации соединения Buffer:";
+$a->strings["You are now authenticated to buffer. "] = "Вы аутентифицированы на Buffer.";
+$a->strings["return to the connector page"] = "вернуться на страницу коннектора";
+$a->strings["Post to Buffer"] = "Написать в Buffer";
+$a->strings["Buffer Export"] = "Экспорт в Buffer";
+$a->strings["Authenticate your Buffer connection"] = "Аутентифицируйте свое соединение с Buffer";
+$a->strings["Enable Buffer Post Addon"] = "Включить аддон Buffer Post";
+$a->strings["Post to Buffer by default"] = "Отправлять в Buffer по умолчанию";
+$a->strings["Check to delete this preset"] = "Отметьте для удаления этих настроек";
+$a->strings["Posts are going to all accounts that are enabled by default:"] = "Сообщения уходят во все учетные записи по умолчанию:";
diff --git a/buffer/lang/sv/messages.po b/buffer/lang/sv/messages.po
new file mode 100644
index 00000000..5ca6e6ec
--- /dev/null
+++ b/buffer/lang/sv/messages.po
@@ -0,0 +1,77 @@
+# ADDON buffer
+# Copyright (C)
+# This file is distributed under the same license as the Friendica buffer addon package.
+# 
+# 
+# Translators:
+# Hypolite Petovan <hypolite@mrpetovan.com>, 2019
+# Bjoessi <torbjorn.andersson@syte.se>, 2019
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2019-08-20 08:07+0000\n"
+"Last-Translator: Bjoessi <torbjorn.andersson@syte.se>\n"
+"Language-Team: Swedish (http://www.transifex.com/Friendica/friendica/language/sv/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: sv\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: buffer.php:31
+msgid "Permission denied."
+msgstr "Åtkomst nekad."
+
+#: buffer.php:57 buffer.php:185
+msgid "Save Settings"
+msgstr "Spara inställningar"
+
+#: buffer.php:59
+msgid "Client ID"
+msgstr "Klient-ID"
+
+#: buffer.php:60
+msgid "Client Secret"
+msgstr "Klient hemlig nyckel"
+
+#: buffer.php:67
+msgid "Error when registering buffer connection:"
+msgstr "Fel vid anslutning till Buffer"
+
+#: buffer.php:86
+msgid "You are now authenticated to buffer. "
+msgstr "Du är nu autentiserad mot Buffer."
+
+#: buffer.php:87
+msgid "return to the connector page"
+msgstr "återgå till anslutningssida"
+
+#: buffer.php:103
+msgid "Post to Buffer"
+msgstr "Inlägg till Buffer"
+
+#: buffer.php:128 buffer.php:132
+msgid "Buffer Export"
+msgstr "Export till Buffer"
+
+#: buffer.php:142
+msgid "Authenticate your Buffer connection"
+msgstr "Validera din anslutning mot Buffer"
+
+#: buffer.php:146
+msgid "Enable Buffer Post Addon"
+msgstr "Aktivera tillägg för Buffer-inlägg"
+
+#: buffer.php:151
+msgid "Post to Buffer by default"
+msgstr "Lägg in på Buffer som standard"
+
+#: buffer.php:156
+msgid "Check to delete this preset"
+msgstr "Markera för att ta bort förinställning"
+
+#: buffer.php:165
+msgid "Posts are going to all accounts that are enabled by default:"
+msgstr "Inlägg skickas som standard till alla konton som är aktiverade:"
diff --git a/buffer/lang/sv/strings.php b/buffer/lang/sv/strings.php
new file mode 100644
index 00000000..b48a1766
--- /dev/null
+++ b/buffer/lang/sv/strings.php
@@ -0,0 +1,22 @@
+<?php
+
+if(! function_exists("string_plural_select_sv")) {
+function string_plural_select_sv($n){
+	$n = intval($n);
+	return ($n != 1);;
+}}
+;
+$a->strings["Permission denied."] = "Åtkomst nekad.";
+$a->strings["Save Settings"] = "Spara inställningar";
+$a->strings["Client ID"] = "Klient-ID";
+$a->strings["Client Secret"] = "Klient hemlig nyckel";
+$a->strings["Error when registering buffer connection:"] = "Fel vid anslutning till Buffer";
+$a->strings["You are now authenticated to buffer. "] = "Du är nu autentiserad mot Buffer.";
+$a->strings["return to the connector page"] = "återgå till anslutningssida";
+$a->strings["Post to Buffer"] = "Inlägg till Buffer";
+$a->strings["Buffer Export"] = "Export till Buffer";
+$a->strings["Authenticate your Buffer connection"] = "Validera din anslutning mot Buffer";
+$a->strings["Enable Buffer Post Addon"] = "Aktivera tillägg för Buffer-inlägg";
+$a->strings["Post to Buffer by default"] = "Lägg in på Buffer som standard";
+$a->strings["Check to delete this preset"] = "Markera för att ta bort förinställning";
+$a->strings["Posts are going to all accounts that are enabled by default:"] = "Inlägg skickas som standard till alla konton som är aktiverade:";
diff --git a/pnut/templates/admin.tpl b/buffer/templates/admin.tpl
similarity index 100%
rename from pnut/templates/admin.tpl
rename to buffer/templates/admin.tpl
diff --git a/buglink/buglink.php b/buglink/buglink.php
index 78fb8bef..d8253d98 100644
--- a/buglink/buglink.php
+++ b/buglink/buglink.php
@@ -8,14 +8,19 @@
 
 use Friendica\App;
 use Friendica\Core\Hook;
-use Friendica\DI;
+use Friendica\Core\L10n;
 
 function buglink_install()
 {
 	Hook::register('page_end', 'addon/buglink/buglink.php', 'buglink_active');
 }
 
-function buglink_active(string &$b)
+function buglink_uninstall()
 {
-	$b .= '<div id="buglink_wrapper" style="position: fixed; bottom: 5px; left: 5px;"><a href="https://github.com/friendica/friendica/issues" target="_blank" rel="noopener noreferrer" title="' . DI::l10n()->t('Report Bug') . '"><img src="addon/buglink/bug-x.gif" alt="' . DI::l10n()->t('Report Bug') . '" /></a></div>';
+	Hook::unregister('page_end', 'addon/buglink/buglink.php', 'buglink_active');
+}
+
+function buglink_active(App $a, &$b)
+{
+	$b .= '<div id="buglink_wrapper" style="position: fixed; bottom: 5px; left: 5px;"><a href="https://github.com/friendica/friendica/issues" target="_blank" title="' . L10n::t('Report Bug') . '"><img src="addon/buglink/bug-x.gif" alt="' . L10n::t('Report Bug') . '" /></a></div>';
 }
diff --git a/buglink/lang/C/messages.po b/buglink/lang/C/messages.po
index 442ee8c0..1721ffa6 100644
--- a/buglink/lang/C/messages.po
+++ b/buglink/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,6 +17,6 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: buglink.php:20
+#: buglink.php:15
 msgid "Report Bug"
 msgstr ""
diff --git a/buglink/lang/ar/messages.po b/buglink/lang/ar/messages.po
deleted file mode 100644
index 2e111125..00000000
--- a/buglink/lang/ar/messages.po
+++ /dev/null
@@ -1,25 +0,0 @@
-# ADDON buglink
-# Copyright (C)
-# This file is distributed under the same license as the Friendica buglink addon package.
-# 
-# 
-# Translators:
-# abidin toumi <abidin24@tutanota.com>, 2021
-# Farida Khalaf <faridakhalaf@hotmail.com>, 2021
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2021-10-29 08:25+0000\n"
-"Last-Translator: abidin toumi <abidin24@tutanota.com>\n"
-"Language-Team: Arabic (http://www.transifex.com/Friendica/friendica/language/ar/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ar\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-
-#: buglink.php:20
-msgid "Report Bug"
-msgstr "أبلغ عن علة"
diff --git a/buglink/lang/ar/strings.php b/buglink/lang/ar/strings.php
deleted file mode 100644
index e354fd75..00000000
--- a/buglink/lang/ar/strings.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_ar")) {
-function string_plural_select_ar($n){
-	$n = intval($n);
-	if ($n==0) { return 0; } else if ($n==1) { return 1; } else if ($n==2) { return 2; } else if ($n%100>=3 && $n%100<=10) { return 3; } else if ($n%100>=11 && $n%100<=99) { return 4; } else  { return 5; }
-}}
-$a->strings['Report Bug'] = 'أبلغ عن علة';
diff --git a/buglink/lang/ca/strings.php b/buglink/lang/ca/strings.php
index 12cfa584..a818f5df 100644
--- a/buglink/lang/ca/strings.php
+++ b/buglink/lang/ca/strings.php
@@ -3,6 +3,7 @@
 if(! function_exists("string_plural_select_ca")) {
 function string_plural_select_ca($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Report Bug'] = 'Informar d’error';
+;
+$a->strings["Report Bug"] = "Informar d’error";
diff --git a/buglink/lang/cs/messages.po b/buglink/lang/cs/messages.po
index 0e200c14..61dc88cf 100644
--- a/buglink/lang/cs/messages.po
+++ b/buglink/lang/cs/messages.po
@@ -4,21 +4,21 @@
 # 
 # 
 # Translators:
-# michal_s <msupler@gmail.com>, 2014
+# Michal Šupler <msupler@gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2014-06-22 11:27+0000\n"
-"Last-Translator: michal_s <msupler@gmail.com>, 2014\n"
-"Language-Team: Czech (http://app.transifex.com/Friendica/friendica/language/cs/)\n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-07 18:27+0000\n"
+"Last-Translator: Michal Šupler <msupler@gmail.com>\n"
+"Language-Team: Czech (http://www.transifex.com/projects/p/friendica/language/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: cs\n"
-"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: buglink.php:20
+#: buglink.php:15
 msgid "Report Bug"
 msgstr "Nahlásit chybu"
diff --git a/buglink/lang/cs/strings.php b/buglink/lang/cs/strings.php
index ae45ea37..7a9f9204 100644
--- a/buglink/lang/cs/strings.php
+++ b/buglink/lang/cs/strings.php
@@ -2,7 +2,7 @@
 
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
-	$n = intval($n);
-	if (($n == 1 && $n % 1 == 0)) { return 0; } else if (($n >= 2 && $n <= 4 && $n % 1 == 0)) { return 1; } else if (($n % 1 != 0 )) { return 2; } else  { return 3; }
+	return ($n==1) ? 0 : ($n>=2 && $n<=4) ? 1 : 2;;
 }}
-$a->strings['Report Bug'] = 'Nahlásit chybu';
+;
+$a->strings["Report Bug"] = "Nahlásit chybu";
diff --git a/buglink/lang/da-dk/messages.po b/buglink/lang/da-dk/messages.po
deleted file mode 100644
index 74aeb2b6..00000000
--- a/buglink/lang/da-dk/messages.po
+++ /dev/null
@@ -1,24 +0,0 @@
-# ADDON buglink
-# Copyright (C)
-# This file is distributed under the same license as the Friendica buglink addon package.
-# 
-# 
-# Translators:
-# Anton <dev@atjn.dk>, 2022
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2014-06-22 11:27+0000\n"
-"Last-Translator: Anton <dev@atjn.dk>, 2022\n"
-"Language-Team: Danish (Denmark) (http://www.transifex.com/Friendica/friendica/language/da_DK/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: da_DK\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: buglink.php:20
-msgid "Report Bug"
-msgstr "Rapportér fejl"
diff --git a/buglink/lang/da-dk/strings.php b/buglink/lang/da-dk/strings.php
deleted file mode 100644
index e43c5aa8..00000000
--- a/buglink/lang/da-dk/strings.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_da_dk")) {
-function string_plural_select_da_dk($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Report Bug'] = 'Rapportér fejl';
diff --git a/buglink/lang/de/messages.po b/buglink/lang/de/messages.po
index 4858bc77..a9f5dd12 100644
--- a/buglink/lang/de/messages.po
+++ b/buglink/lang/de/messages.po
@@ -4,22 +4,21 @@
 # 
 # 
 # Translators:
-# René Wagner <apollo@rw-net.de>, 2019
-# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2014
+# bavatar <tobias.diekershoff@gmx.net>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2014-06-22 11:27+0000\n"
-"Last-Translator: René Wagner <apollo@rw-net.de>, 2019\n"
-"Language-Team: German (http://app.transifex.com/Friendica/friendica/language/de/)\n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-06-22 11:28+0000\n"
+"Last-Translator: bavatar <tobias.diekershoff@gmx.net>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/friendica/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: buglink.php:20
+#: buglink.php:15
 msgid "Report Bug"
-msgstr "Fehler melden"
+msgstr "Fehler melden."
diff --git a/buglink/lang/de/strings.php b/buglink/lang/de/strings.php
index 30b7ebcf..19123819 100644
--- a/buglink/lang/de/strings.php
+++ b/buglink/lang/de/strings.php
@@ -2,7 +2,7 @@
 
 if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Report Bug'] = 'Fehler melden';
+;
+$a->strings["Report Bug"] = "Fehler melden.";
diff --git a/buglink/lang/es/strings.php b/buglink/lang/es/strings.php
index 5db40f29..27e45c1b 100644
--- a/buglink/lang/es/strings.php
+++ b/buglink/lang/es/strings.php
@@ -2,7 +2,7 @@
 
 if(! function_exists("string_plural_select_es")) {
 function string_plural_select_es($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Report Bug'] = 'Reportar error';
+;
+$a->strings["Report Bug"] = "Reportar error";
diff --git a/buglink/lang/fi-fi/strings.php b/buglink/lang/fi-fi/strings.php
index c92f029f..4222cfac 100644
--- a/buglink/lang/fi-fi/strings.php
+++ b/buglink/lang/fi-fi/strings.php
@@ -2,7 +2,7 @@
 
 if(! function_exists("string_plural_select_fi_fi")) {
 function string_plural_select_fi_fi($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Report Bug'] = 'Ilmoita virheestä';
+;
+$a->strings["Report Bug"] = "Ilmoita virheestä";
diff --git a/buglink/lang/fr/messages.po b/buglink/lang/fr/messages.po
deleted file mode 100644
index d055fe05..00000000
--- a/buglink/lang/fr/messages.po
+++ /dev/null
@@ -1,24 +0,0 @@
-# ADDON buglink
-# Copyright (C)
-# This file is distributed under the same license as the Friendica buglink addon package.
-# 
-# 
-# Translators:
-# StefOfficiel <pichard.stephane@free.fr>, 2015
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2014-06-22 11:27+0000\n"
-"Last-Translator: StefOfficiel <pichard.stephane@free.fr>, 2015\n"
-"Language-Team: French (http://www.transifex.com/Friendica/friendica/language/fr/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: fr\n"
-"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
-
-#: buglink.php:20
-msgid "Report Bug"
-msgstr "Signaler un Bug"
diff --git a/buglink/lang/fr/strings.php b/buglink/lang/fr/strings.php
index ce0d41f6..0075fb0d 100644
--- a/buglink/lang/fr/strings.php
+++ b/buglink/lang/fr/strings.php
@@ -1,8 +1,3 @@
-<?php
-
-if(! function_exists("string_plural_select_fr")) {
-function string_plural_select_fr($n){
-	$n = intval($n);
-	if (($n == 0 || $n == 1)) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
-}}
-$a->strings['Report Bug'] = 'Signaler un Bug';
+<?php
+
+$a->strings["Report Bug"] = "Signaler un bug";
diff --git a/buglink/lang/gd/messages.po b/buglink/lang/gd/messages.po
deleted file mode 100644
index 6666d6ed..00000000
--- a/buglink/lang/gd/messages.po
+++ /dev/null
@@ -1,24 +0,0 @@
-# ADDON buglink
-# Copyright (C)
-# This file is distributed under the same license as the Friendica buglink addon package.
-# 
-# 
-# Translators:
-# GunChleoc, 2022
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2014-06-22 11:27+0000\n"
-"Last-Translator: GunChleoc, 2022\n"
-"Language-Team: Gaelic, Scottish (http://www.transifex.com/Friendica/friendica/language/gd/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: gd\n"
-"Plural-Forms: nplurals=4; plural=(n==1 || n==11) ? 0 : (n==2 || n==12) ? 1 : (n > 2 && n < 20) ? 2 : 3;\n"
-
-#: buglink.php:20
-msgid "Report Bug"
-msgstr "Dèan aithris air buga"
diff --git a/buglink/lang/gd/strings.php b/buglink/lang/gd/strings.php
deleted file mode 100644
index 107ab380..00000000
--- a/buglink/lang/gd/strings.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_gd")) {
-function string_plural_select_gd($n){
-	$n = intval($n);
-	if (($n==1 || $n==11)) { return 0; } else if (($n==2 || $n==12)) { return 1; } else if (($n > 2 && $n < 20)) { return 2; } else  { return 3; }
-}}
-$a->strings['Report Bug'] = 'Dèan aithris air buga';
diff --git a/buglink/lang/hu/messages.po b/buglink/lang/hu/messages.po
deleted file mode 100644
index 0eaada0b..00000000
--- a/buglink/lang/hu/messages.po
+++ /dev/null
@@ -1,24 +0,0 @@
-# ADDON buglink
-# Copyright (C)
-# This file is distributed under the same license as the Friendica buglink addon package.
-# 
-# 
-# Translators:
-# Balázs Úr, 2020
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2014-06-22 11:27+0000\n"
-"Last-Translator: Balázs Úr, 2020\n"
-"Language-Team: Hungarian (http://www.transifex.com/Friendica/friendica/language/hu/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: hu\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: buglink.php:20
-msgid "Report Bug"
-msgstr "Hiba jelentése"
diff --git a/buglink/lang/hu/strings.php b/buglink/lang/hu/strings.php
deleted file mode 100644
index 67fae115..00000000
--- a/buglink/lang/hu/strings.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_hu")) {
-function string_plural_select_hu($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Report Bug'] = 'Hiba jelentése';
diff --git a/buglink/lang/is/strings.php b/buglink/lang/is/strings.php
index 2e35781b..0458315a 100644
--- a/buglink/lang/is/strings.php
+++ b/buglink/lang/is/strings.php
@@ -3,6 +3,7 @@
 if(! function_exists("string_plural_select_is")) {
 function string_plural_select_is($n){
 	$n = intval($n);
-	return intval($n % 10 != 1 || $n % 100 == 11);
+	return ($n % 10 != 1 || $n % 100 == 11);;
 }}
-$a->strings['Report Bug'] = 'Tilkynna villu';
+;
+$a->strings["Report Bug"] = "Tilkynna villu";
diff --git a/buglink/lang/it/strings.php b/buglink/lang/it/strings.php
index c238a12f..449e6b9f 100644
--- a/buglink/lang/it/strings.php
+++ b/buglink/lang/it/strings.php
@@ -2,7 +2,7 @@
 
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Report Bug'] = 'Segnala un Bug';
+;
+$a->strings["Report Bug"] = "Segnala un Bug";
diff --git a/buglink/lang/nb-no/messages.po b/buglink/lang/nb-no/messages.po
deleted file mode 100644
index c9e10ed9..00000000
--- a/buglink/lang/nb-no/messages.po
+++ /dev/null
@@ -1,24 +0,0 @@
-# ADDON buglink
-# Copyright (C)
-# This file is distributed under the same license as the Friendica buglink addon package.
-# 
-# 
-# Translators:
-# 9d7045af8ca83a89b1b4bf48a2c67786_a2524de <552015d9a2e1abe6fabe3394a3652575_905986>, 2020
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-06-22 13:18+0200\n"
-"PO-Revision-Date: 2020-06-06 21:45+0000\n"
-"Last-Translator: 9d7045af8ca83a89b1b4bf48a2c67786_a2524de <552015d9a2e1abe6fabe3394a3652575_905986>\n"
-"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/Friendica/friendica/language/nb_NO/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: nb_NO\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: buglink.php:15
-msgid "Report Bug"
-msgstr "Rapporter feil"
diff --git a/buglink/lang/nb-no/strings.php b/buglink/lang/nb-no/strings.php
index 7017707a..ec212e9a 100644
--- a/buglink/lang/nb-no/strings.php
+++ b/buglink/lang/nb-no/strings.php
@@ -1,8 +1,3 @@
-<?php
-
-if(! function_exists("string_plural_select_nb_no")) {
-function string_plural_select_nb_no($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Report Bug'] = 'Rapporter feil';
+<?php
+
+$a->strings["Report Bug"] = "";
diff --git a/buglink/lang/nl/strings.php b/buglink/lang/nl/strings.php
index 1e696e6f..a5db04bd 100644
--- a/buglink/lang/nl/strings.php
+++ b/buglink/lang/nl/strings.php
@@ -3,6 +3,7 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Report Bug'] = 'Bug rapporteren';
+;
+$a->strings["Report Bug"] = "Bug rapporteren";
diff --git a/buglink/lang/pl/messages.po b/buglink/lang/pl/messages.po
index c31388ee..5300e8df 100644
--- a/buglink/lang/pl/messages.po
+++ b/buglink/lang/pl/messages.po
@@ -4,14 +4,14 @@
 # 
 # 
 # Translators:
-# Waldemar Stoczkowski, 2018
+# Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2014-06-22 11:27+0000\n"
-"Last-Translator: Waldemar Stoczkowski, 2018\n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2018-03-30 17:07+0000\n"
+"Last-Translator: Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.com/Friendica/friendica/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,6 +19,6 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
-#: buglink.php:20
+#: buglink.php:15
 msgid "Report Bug"
 msgstr "Zgłoś błąd"
diff --git a/buglink/lang/pl/strings.php b/buglink/lang/pl/strings.php
index fcfd4edf..d2e835f9 100644
--- a/buglink/lang/pl/strings.php
+++ b/buglink/lang/pl/strings.php
@@ -2,7 +2,7 @@
 
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
-	$n = intval($n);
-	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
+	return ($n==1 ? 0 : ($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14) ? 1 : $n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14) ? 2 : 3);;
 }}
-$a->strings['Report Bug'] = 'Zgłoś błąd';
+;
+$a->strings["Report Bug"] = "Zgłoś błąd";
diff --git a/buglink/lang/ro/strings.php b/buglink/lang/ro/strings.php
index 2c2100ef..25a9c769 100644
--- a/buglink/lang/ro/strings.php
+++ b/buglink/lang/ro/strings.php
@@ -2,7 +2,7 @@
 
 if(! function_exists("string_plural_select_ro")) {
 function string_plural_select_ro($n){
-	$n = intval($n);
-	if ($n==1) { return 0; } else if ((($n%100>19)||(($n%100==0)&&($n!=0)))) { return 2; } else  { return 1; }
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
 }}
-$a->strings['Report Bug'] = 'Raportează Problema';
+;
+$a->strings["Report Bug"] = "Raportează Problema";
diff --git a/buglink/lang/ru/strings.php b/buglink/lang/ru/strings.php
index c1b033ca..fe03f9eb 100644
--- a/buglink/lang/ru/strings.php
+++ b/buglink/lang/ru/strings.php
@@ -2,7 +2,7 @@
 
 if(! function_exists("string_plural_select_ru")) {
 function string_plural_select_ru($n){
-	$n = intval($n);
-	if ($n%10==1 && $n%100!=11) { return 0; } else if ($n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14)) { return 1; } else if ($n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)) { return 2; } else  { return 3; }
+	return ($n%10==1 && $n%100!=11 ? 0 : $n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14) ? 1 : $n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)? 2 : 3);;
 }}
-$a->strings['Report Bug'] = 'Сообщить об ошибке';
+;
+$a->strings["Report Bug"] = "Сообщить об ошибке";
diff --git a/buglink/lang/sv/strings.php b/buglink/lang/sv/strings.php
index 3e7285ef..513dd4f3 100644
--- a/buglink/lang/sv/strings.php
+++ b/buglink/lang/sv/strings.php
@@ -2,7 +2,7 @@
 
 if(! function_exists("string_plural_select_sv")) {
 function string_plural_select_sv($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Report Bug'] = 'Rapportera bugg';
+;
+$a->strings["Report Bug"] = "Rapportera bugg";
diff --git a/buglink/lang/zh-cn/messages.po b/buglink/lang/zh-cn/messages.po
deleted file mode 100644
index bc3c9e1a..00000000
--- a/buglink/lang/zh-cn/messages.po
+++ /dev/null
@@ -1,24 +0,0 @@
-# ADDON buglink
-# Copyright (C)
-# This file is distributed under the same license as the Friendica buglink addon package.
-# 
-# 
-# Translators:
-# steve jobs <vicdorke@gmail.com>, 2020
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-06-22 13:18+0200\n"
-"PO-Revision-Date: 2020-06-10 12:31+0000\n"
-"Last-Translator: steve jobs <vicdorke@gmail.com>\n"
-"Language-Team: Chinese (China) (http://www.transifex.com/Friendica/friendica/language/zh_CN/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: zh_CN\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-
-#: buglink.php:15
-msgid "Report Bug"
-msgstr "报告错误"
diff --git a/buglink/lang/zh-cn/strings.php b/buglink/lang/zh-cn/strings.php
index f9958574..e70c0223 100644
--- a/buglink/lang/zh-cn/strings.php
+++ b/buglink/lang/zh-cn/strings.php
@@ -1,8 +1,3 @@
-<?php
-
-if(! function_exists("string_plural_select_zh_cn")) {
-function string_plural_select_zh_cn($n){
-	$n = intval($n);
-	return intval(0);
-}}
-$a->strings['Report Bug'] = '报告错误';
+<?php
+
+$a->strings["Report Bug"] = "报案程序错误";
diff --git a/calc/calc.php b/calc/calc.php
index a8a340c4..f60682b0 100644
--- a/calc/calc.php
+++ b/calc/calc.php
@@ -1,362 +1,363 @@
-<?php
-/**
- * Name: Calculator App
- * Description: Simple Calculator Application
- * Version: 1.0
- * Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
- */
-
-use Friendica\App;
-use Friendica\Core\Hook;
-use Friendica\DI;
-
-function calc_install() {
-	Hook::register('app_menu', 'addon/calc/calc.php', 'calc_app_menu');
-}
-
-function calc_app_menu(array &$b)
-{
-	$b['app_menu'][] = '<div class="app-title"><a href="calc">Calculator</a></div>'; 
-}
-
-/**
- * This is a statement rather than an actual function definition. The simple
- * existence of this method is checked to figure out if the addon offers a
- * module.
- */
-function calc_module() {}
-
-function calc_init()
-{
-	$x = <<< EOT
-
-<script language="JavaScript">
-/**************************************
- * www.FemaleNerd.com         *
- **************************************/
-
-// Declare global variables
-var displayText = ""
-var num1
-var num2
-var operatorType
-
-// Write to display
-function addDisplay(n){
-   id = document.getElementById("display");
-id.value = ""
-displayText += n
-id.value = displayText
-}
-
-// Addition
-function addNumbers() {
-if (displayText == "") {
-  displayText = result
- }
-num1 = parseFloat(displayText)
-operatorType = "add"
-displayText = ""
-}
-
-// Subtraction
-function subtractNumbers() {
-if (displayText == "") {
-  displayText = result
- }
-num1 = parseFloat(displayText)
-operatorType = "subtract"
-displayText = ""
-}
-
-// Multiplication
-function multiplyNumbers() {
-if (displayText == "") {
-  displayText = result
- }
-num1 = parseFloat(displayText)
-operatorType = "multiply"
-displayText = ""
-}
-
-// Division
-function divideNumbers() {
-if (displayText == "") {
-  displayText = result
- }
-num1 = parseFloat(displayText)
-operatorType = "divide"
-displayText = ""
-}
-
-// Sine
-function sin() {
-   id = document.getElementById("display");
-if (displayText == "") {
-  num1 = result
-  }
-else {
-  num1 = parseFloat(displayText)
-  }
-if (num1 != "") {
-  result = Math.sin(num1)
-  id.value = result
-  displayText = ""
-  }
-else {
-  alert("Please write the number first")
-  }
-}
-
-// Cosine
-function cos() {
-   id = document.getElementById("display");
-if (displayText == "") {
-  num1 = result
-  }
-else {
-  num1 = parseFloat(displayText)
-  }
-if (num1 != "") {
-  result = Math.cos(num1)
-  id.value = result
-  displayText = ""
-  }
-else {
-  alert("Please write the number first")
-  }
-}
-
-// ArcSine
-function arcSin() {
-   id = document.getElementById("display");
-if (displayText == "") {
-  num1 = result
-  }
-else {
-  num1 = parseFloat(displayText)
-  }
-if (num1 != "") {
-  result = Math.asin(num1)
-  id.value = result
-  displayText = ""
-  }
-else {
-  alert("Please write the number first")
-  }
-}
-
-// ArcCosine
-function arcCos() {
-   id = document.getElementById("display");
-if (displayText == "") {
-  num1 = result
-  }
-else {
-  num1 = parseFloat(displayText)
-  }
-if (num1 != "") {
-  result = Math.acos(num1)
-  id.value = result
-  displayText = ""
-  }
-else {
-  alert("Please write the number first")
-  }
-}
-
-// Square root
-function sqrt() {
-   id = document.getElementById("display");
-if (displayText == "") {
-  num1 = result
-  }
-else {
-  num1 = parseFloat(displayText)
-  }
-if (num1 != "") {
-  result = Math.sqrt(num1)
-  id.value = result
-  displayText = ""
-  }
-else {
-  alert("Please write the number first")
-  }
-}
-
-// Square number (number to the power of two)
-function square() {
-   id = document.getElementById("display");
-if (displayText == "") {
-  num1 = result
-  }
-else {
-  num1 = parseFloat(displayText)
-  }
-if (num1 != "") {
-  result = num1 * num1
-  id.value = result
-  displayText = ""
-  }
-else {
-  alert("Please write the number first")
-  }
-}
-
-// Convert degrees to radians
-function degToRad() {
-   id = document.getElementById("display");
-if (displayText == "") {
-  num1 = result
-  }
-else {
-  num1 = parseFloat(displayText)
-  }
-if (num1 != "") {
-  result = num1 * Math.PI / 180
-  id.value = result
-  displayText = ""
-  }
-else {
-  alert("Please write the number first")
-  }
-}
-
-// Convert radians to degrees
-function radToDeg() {
-   id = document.getElementById("display");
-if (displayText == "") {
-  num1 = result
-  }
-else {
-  num1 = parseFloat(displayText)
-  }
-if (num1 != "") {
-  result = num1 * 180 / Math.PI
-  id.value = result
-  displayText = ""
-  }
-else {
-  alert("Please write the number first")
-  }
-}
-
-// Calculations
-function calculate() {
-   id = document.getElementById("display");
-
-if (displayText != "") {
-  num2 = parseFloat(displayText)
-// Calc: Addition
-  if (operatorType == "add") {
-    result = num1 + num2
-    id.value = result
-    }
-// Calc: Subtraction
-  if (operatorType == "subtract") {
-    result = num1 - num2
-    id.value = result
-    }
-// Calc: Multiplication
-  if (operatorType == "multiply") {
-    result = num1 * num2
-    id.value = result
-    }
-// Calc: Division
-  if (operatorType == "divide") {
-    result = num1 / num2
-    id.value = result
-    }
-  displayText = ""
-  }
-  else {
-  id.value = "Oops! Error!"
-  }
-}
-
-// Clear the display
-function clearDisplay() {
-   id = document.getElementById("display");
-
-displayText = ""
-id.value = ""
-}
-</script>
-
-EOT;
-DI::page()['htmlhead'] .= $x;
-}
-
-function calc_content($app) {
-
-$o = '';
-
-$o .=  <<< EOT
-
-<h3>Calculator</h3>
-<br /><br />
-<table>
-<tbody><tr><td> 
-<table bgcolor="#af9999" border="1">
-<tbody><tr><td>
-<table border="1" cellpadding="2" cellspacing="2">
-<form name="calc">
-<!--
-<TR><TD VALIGN=top colspan=6 ALIGN="center"> <H2>Calculator</H2> </TD>
--->
-<tbody><tr>
-	<td colspan="5"><input size="22" id="display" name="display" type="text"></td>
-</tr><tr align="left" valign="middle">
-	<td><input name="one" value="&nbsp;&nbsp;1&nbsp;&nbsp;&nbsp;" onclick="addDisplay(1)" type="button"></td>
-	<td><input name="two" value="&nbsp;&nbsp;2&nbsp;&nbsp;&nbsp;" onclick="addDisplay(2)" type="button"></td>
-	<td><input name="three" value="&nbsp;&nbsp;3&nbsp;&nbsp;&nbsp;" onclick="addDisplay(3)" type="button"></td>
-	<td><input name="plus" value="&nbsp;&nbsp;+&nbsp;&nbsp;&nbsp;" onclick="addNumbers()" type="button"></td>
-</tr><tr align="left" valign="middle">
-	<td><input name="four" value="&nbsp;&nbsp;4&nbsp;&nbsp;&nbsp;" onclick="addDisplay(4)" type="button"></td>
-	<td><input name="five" value="&nbsp;&nbsp;5&nbsp;&nbsp;&nbsp;" onclick="addDisplay(5)" type="button"></td>
-	<td><input name="six" value="&nbsp;&nbsp;6&nbsp;&nbsp;&nbsp;" onclick="addDisplay(6)" type="button"></td>
-	<td><input name="minus" value="&nbsp;&nbsp;&nbsp;-&nbsp;&nbsp;&nbsp;" onclick="subtractNumbers()" type="button"></td>
-</tr><tr align="left" valign="middle">
-	<td><input name="seven" value="&nbsp;&nbsp;7&nbsp;&nbsp;&nbsp;" onclick="addDisplay(7)" type="button"></td>
-	<td><input name="eight" value="&nbsp;&nbsp;8&nbsp;&nbsp;&nbsp;" onclick="addDisplay(8)" type="button"></td>
-	<td><input name="nine" value="&nbsp;&nbsp;9&nbsp;&nbsp;&nbsp;" onclick="addDisplay(9)" type="button"></td>
-	<td><input name="multiplication" value="&nbsp;&nbsp;*&nbsp;&nbsp;&nbsp;&nbsp;" onclick="multiplyNumbers()" type="button"></td>
-</tr><tr align="left" valign="middle">
-	<td><input name="zero" value="&nbsp;&nbsp;0&nbsp;&nbsp;&nbsp;" onclick="addDisplay(0)" type="button"></td>
-	<td><input name="pi" value="&nbsp;Pi&nbsp;&nbsp;" onclick="addDisplay(Math.PI)" type="button"> </td> 
-	<td><input name="dot" value="&nbsp;&nbsp;&nbsp;.&nbsp;&nbsp;&nbsp;" onclick='addDisplay(".")' type="button"></td>
-	<td><input name="division" value="&nbsp;&nbsp;&nbsp;/&nbsp;&nbsp;&nbsp;" onclick="divideNumbers()" type="button"></td>
-</tr><tr align="left" valign="middle">
-	<td><input name="sqareroot" value="sqrt" onclick="sqrt()" type="button"></td>
-	<td><input name="squarex" value=" x^2" onclick="square()" type="button"></td>
-	<td><input name="deg-rad" value="d2r&nbsp;" onclick="degToRad()" type="button"></td>
-	<td><input name="rad-deg" value="r2d&nbsp;" onclick="radToDeg()" type="button"></td>
-</tr><tr align="left" valign="middle">
-	<td><input name="sine" value="&nbsp;sin&nbsp;" onclick="sin()" type="button"></td>
-	<td><input name="arcsine" value="asin" onclick="arcSin()" type="button"></td>
-	<td><input name="cosine" value="cos" onclick="cos()" type="button"></td>
-	<td><input name="arccosine" value="acs" onclick="arcCos()" type="button"></td>
-
-</tr><tr align="left" valign="middle">
-	<td colspan="2"><input name="clear" value="&nbsp;&nbsp;Clear&nbsp;&nbsp;" onclick="clearDisplay()" type="button"></td>
-	<td colspan="3"><input name="enter" value="&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;=&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;" onclick="calculate()" type="button"></td>
-
-</tr></tbody></table>
-</form>
-
-	<!--
-	<TD VALIGN=top> 
-		<B>NOTE:</B> All sine and cosine calculations are
-		<br>done in radians. Remember to convert first
-		<br>if using degrees.
-	</TD>
-	-->
-	
-</td></tr></tbody></table>
-
-
-</td></tr></tbody></table>
-
-EOT;
-	return $o;
-}
+<?php
+/**
+ * Name: Calculator App
+ * Description: Simple Calculator Application
+ * Version: 1.0
+ * Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
+ */
+use Friendica\Core\Hook;
+
+function calc_install() {
+	Hook::register('app_menu', 'addon/calc/calc.php', 'calc_app_menu');
+}
+
+function calc_uninstall() {
+	Hook::unregister('app_menu', 'addon/calc/calc.php', 'calc_app_menu');
+
+}
+
+function calc_app_menu($a,&$b) {
+	$b['app_menu'][] = '<div class="app-title"><a href="calc">Calculator</a></div>'; 
+}
+
+
+function calc_module() {}
+
+
+
+
+function calc_init($a) {
+
+$x = <<< EOT
+
+<script language="JavaScript">
+/**************************************
+ * www.FemaleNerd.com         *
+ **************************************/
+
+// Declare global variables
+var displayText = ""
+var num1
+var num2
+var operatorType
+
+// Write to display
+function addDisplay(n){
+   id = document.getElementById("display");
+id.value = ""
+displayText += n
+id.value = displayText
+}
+
+// Addition
+function addNumbers() {
+if (displayText == "") {
+  displayText = result
+ }
+num1 = parseFloat(displayText)
+operatorType = "add"
+displayText = ""
+}
+
+// Subtraction
+function subtractNumbers() {
+if (displayText == "") {
+  displayText = result
+ }
+num1 = parseFloat(displayText)
+operatorType = "subtract"
+displayText = ""
+}
+
+// Multiplication
+function multiplyNumbers() {
+if (displayText == "") {
+  displayText = result
+ }
+num1 = parseFloat(displayText)
+operatorType = "multiply"
+displayText = ""
+}
+
+// Division
+function divideNumbers() {
+if (displayText == "") {
+  displayText = result
+ }
+num1 = parseFloat(displayText)
+operatorType = "divide"
+displayText = ""
+}
+
+// Sine
+function sin() {
+   id = document.getElementById("display");
+if (displayText == "") {
+  num1 = result
+  }
+else {
+  num1 = parseFloat(displayText)
+  }
+if (num1 != "") {
+  result = Math.sin(num1)
+  id.value = result
+  displayText = ""
+  }
+else {
+  alert("Please write the number first")
+  }
+}
+
+// Cosine
+function cos() {
+   id = document.getElementById("display");
+if (displayText == "") {
+  num1 = result
+  }
+else {
+  num1 = parseFloat(displayText)
+  }
+if (num1 != "") {
+  result = Math.cos(num1)
+  id.value = result
+  displayText = ""
+  }
+else {
+  alert("Please write the number first")
+  }
+}
+
+// ArcSine
+function arcSin() {
+   id = document.getElementById("display");
+if (displayText == "") {
+  num1 = result
+  }
+else {
+  num1 = parseFloat(displayText)
+  }
+if (num1 != "") {
+  result = Math.asin(num1)
+  id.value = result
+  displayText = ""
+  }
+else {
+  alert("Please write the number first")
+  }
+}
+
+// ArcCosine
+function arcCos() {
+   id = document.getElementById("display");
+if (displayText == "") {
+  num1 = result
+  }
+else {
+  num1 = parseFloat(displayText)
+  }
+if (num1 != "") {
+  result = Math.acos(num1)
+  id.value = result
+  displayText = ""
+  }
+else {
+  alert("Please write the number first")
+  }
+}
+
+// Square root
+function sqrt() {
+   id = document.getElementById("display");
+if (displayText == "") {
+  num1 = result
+  }
+else {
+  num1 = parseFloat(displayText)
+  }
+if (num1 != "") {
+  result = Math.sqrt(num1)
+  id.value = result
+  displayText = ""
+  }
+else {
+  alert("Please write the number first")
+  }
+}
+
+// Square number (number to the power of two)
+function square() {
+   id = document.getElementById("display");
+if (displayText == "") {
+  num1 = result
+  }
+else {
+  num1 = parseFloat(displayText)
+  }
+if (num1 != "") {
+  result = num1 * num1
+  id.value = result
+  displayText = ""
+  }
+else {
+  alert("Please write the number first")
+  }
+}
+
+// Convert degrees to radians
+function degToRad() {
+   id = document.getElementById("display");
+if (displayText == "") {
+  num1 = result
+  }
+else {
+  num1 = parseFloat(displayText)
+  }
+if (num1 != "") {
+  result = num1 * Math.PI / 180
+  id.value = result
+  displayText = ""
+  }
+else {
+  alert("Please write the number first")
+  }
+}
+
+// Convert radians to degrees
+function radToDeg() {
+   id = document.getElementById("display");
+if (displayText == "") {
+  num1 = result
+  }
+else {
+  num1 = parseFloat(displayText)
+  }
+if (num1 != "") {
+  result = num1 * 180 / Math.PI
+  id.value = result
+  displayText = ""
+  }
+else {
+  alert("Please write the number first")
+  }
+}
+
+// Calculations
+function calculate() {
+   id = document.getElementById("display");
+
+if (displayText != "") {
+  num2 = parseFloat(displayText)
+// Calc: Addition
+  if (operatorType == "add") {
+    result = num1 + num2
+    id.value = result
+    }
+// Calc: Subtraction
+  if (operatorType == "subtract") {
+    result = num1 - num2
+    id.value = result
+    }
+// Calc: Multiplication
+  if (operatorType == "multiply") {
+    result = num1 * num2
+    id.value = result
+    }
+// Calc: Division
+  if (operatorType == "divide") {
+    result = num1 / num2
+    id.value = result
+    }
+  displayText = ""
+  }
+  else {
+  id.value = "Oops! Error!"
+  }
+}
+
+// Clear the display
+function clearDisplay() {
+   id = document.getElementById("display");
+
+displayText = ""
+id.value = ""
+}
+</script>
+
+EOT;
+$a->page['htmlhead'] .= $x;
+}
+
+function calc_content($app) {
+
+$o = '';
+
+$o .=  <<< EOT
+
+<h3>Calculator</h3>
+<br /><br />
+<table>
+<tbody><tr><td> 
+<table bgcolor="#af9999" border="1">
+<tbody><tr><td>
+<table border="1" cellpadding="2" cellspacing="2">
+<form name="calc">
+<!--
+<TR><TD VALIGN=top colspan=6 ALIGN="center"> <H2>Calculator</H2> </TD>
+-->
+<tbody><tr>
+	<td colspan="5"><input size="22" id="display" name="display" type="text"></td>
+</tr><tr align="left" valign="middle">
+	<td><input name="one" value="&nbsp;&nbsp;1&nbsp;&nbsp;&nbsp;" onclick="addDisplay(1)" type="button"></td>
+	<td><input name="two" value="&nbsp;&nbsp;2&nbsp;&nbsp;&nbsp;" onclick="addDisplay(2)" type="button"></td>
+	<td><input name="three" value="&nbsp;&nbsp;3&nbsp;&nbsp;&nbsp;" onclick="addDisplay(3)" type="button"></td>
+	<td><input name="plus" value="&nbsp;&nbsp;+&nbsp;&nbsp;&nbsp;" onclick="addNumbers()" type="button"></td>
+</tr><tr align="left" valign="middle">
+	<td><input name="four" value="&nbsp;&nbsp;4&nbsp;&nbsp;&nbsp;" onclick="addDisplay(4)" type="button"></td>
+	<td><input name="five" value="&nbsp;&nbsp;5&nbsp;&nbsp;&nbsp;" onclick="addDisplay(5)" type="button"></td>
+	<td><input name="six" value="&nbsp;&nbsp;6&nbsp;&nbsp;&nbsp;" onclick="addDisplay(6)" type="button"></td>
+	<td><input name="minus" value="&nbsp;&nbsp;&nbsp;-&nbsp;&nbsp;&nbsp;" onclick="subtractNumbers()" type="button"></td>
+</tr><tr align="left" valign="middle">
+	<td><input name="seven" value="&nbsp;&nbsp;7&nbsp;&nbsp;&nbsp;" onclick="addDisplay(7)" type="button"></td>
+	<td><input name="eight" value="&nbsp;&nbsp;8&nbsp;&nbsp;&nbsp;" onclick="addDisplay(8)" type="button"></td>
+	<td><input name="nine" value="&nbsp;&nbsp;9&nbsp;&nbsp;&nbsp;" onclick="addDisplay(9)" type="button"></td>
+	<td><input name="multiplication" value="&nbsp;&nbsp;*&nbsp;&nbsp;&nbsp;&nbsp;" onclick="multiplyNumbers()" type="button"></td>
+</tr><tr align="left" valign="middle">
+	<td><input name="zero" value="&nbsp;&nbsp;0&nbsp;&nbsp;&nbsp;" onclick="addDisplay(0)" type="button"></td>
+	<td><input name="pi" value="&nbsp;Pi&nbsp;&nbsp;" onclick="addDisplay(Math.PI)" type="button"> </td> 
+	<td><input name="dot" value="&nbsp;&nbsp;&nbsp;.&nbsp;&nbsp;&nbsp;" onclick='addDisplay(".")' type="button"></td>
+	<td><input name="division" value="&nbsp;&nbsp;&nbsp;/&nbsp;&nbsp;&nbsp;" onclick="divideNumbers()" type="button"></td>
+</tr><tr align="left" valign="middle">
+	<td><input name="sqareroot" value="sqrt" onclick="sqrt()" type="button"></td>
+	<td><input name="squarex" value=" x^2" onclick="square()" type="button"></td>
+	<td><input name="deg-rad" value="d2r&nbsp;" onclick="degToRad()" type="button"></td>
+	<td><input name="rad-deg" value="r2d&nbsp;" onclick="radToDeg()" type="button"></td>
+</tr><tr align="left" valign="middle">
+	<td><input name="sine" value="&nbsp;sin&nbsp;" onclick="sin()" type="button"></td>
+	<td><input name="arcsine" value="asin" onclick="arcSin()" type="button"></td>
+	<td><input name="cosine" value="cos" onclick="cos()" type="button"></td>
+	<td><input name="arccosine" value="acs" onclick="arcCos()" type="button"></td>
+
+</tr><tr align="left" valign="middle">
+	<td colspan="2"><input name="clear" value="&nbsp;&nbsp;Clear&nbsp;&nbsp;" onclick="clearDisplay()" type="button"></td>
+	<td colspan="3"><input name="enter" value="&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;=&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;" onclick="calculate()" type="button"></td>
+
+</tr></tbody></table>
+</form>
+
+	<!--
+	<TD VALIGN=top> 
+		<B>NOTE:</B> All sine and cosine calculations are
+		<br>done in radians. Remember to convert first
+		<br>if using degrees.
+	</TD>
+	-->
+	
+</td></tr></tbody></table>
+
+
+</td></tr></tbody></table>
+
+EOT;
+return $o;
+
+}
diff --git a/calc/lang/C/messages.po b/calc/lang/C/messages.po
new file mode 100644
index 00000000..e69de29b
diff --git a/catavatar/catavatar.php b/catavatar/catavatar.php
index 2116ac44..e70449af 100644
--- a/catavatar/catavatar.php
+++ b/catavatar/catavatar.php
@@ -7,15 +7,16 @@
  */
 
 use Friendica\App;
+use Friendica\Core\Config;
 use Friendica\Core\Hook;
+use Friendica\Core\L10n;
 use Friendica\Core\Logger;
+use Friendica\Core\PConfig;
 use Friendica\Core\Renderer;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
-use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Model\Photo;
-use Friendica\Model\Profile;
 use Friendica\Network\HTTPException\NotFoundException;
 
 define("CATAVATAR_SIZE", 256);
@@ -25,122 +26,132 @@ define("CATAVATAR_SIZE", 256);
  */
 function catavatar_install()
 {
-	Hook::register('avatar_lookup', __FILE__, 'catavatar_lookup');
-	Hook::register('addon_settings', __FILE__, 'catavatar_addon_settings');
-	Hook::register('addon_settings_post', __FILE__, 'catavatar_addon_settings_post');
+	Hook::register('avatar_lookup', 'addon/catavatar/catavatar.php', 'catavatar_lookup');
+	Hook::register('addon_settings', 'addon/catavatar/catavatar.php', 'catavatar_addon_settings');
+	Hook::register('addon_settings_post', 'addon/catavatar/catavatar.php', 'catavatar_addon_settings_post');
 
-	Logger::notice('registered catavatar');
+	Logger::log('registered catavatar');
+}
+
+/**
+ * Removes the addon hook
+ */
+function catavatar_uninstall()
+{
+	Hook::unregister('avatar_lookup', 'addon/catavatar/catavatar.php', 'catavatar_lookup');
+	Hook::unregister('addon_settings', 'addon/catavatar/catavatar.php', 'catavatar_addon_settings');
+	Hook::unregister('addon_settings_post', 'addon/catavatar/catavatar.php', 'catavatar_addon_settings_post');
+
+	Logger::log('unregistered catavatar');
 }
 
 /**
  * Cat avatar user settings page
  */
-function catavatar_addon_settings(array &$data)
+function catavatar_addon_settings(App $a, &$s)
 {
-	if (!DI::userSession()->getLocalUserId()) {
+	if (!local_user()) {
 		return;
 	}
 
-	$t    = Renderer::getMarkupTemplate('settings.tpl', 'addon/catavatar/');
-	$html = Renderer::replaceMacros($t, [
-		'$uncache'      => time(),
-		'$uid'          => DI::userSession()->getLocalUserId(),
-		'$setrandomize' => DI::l10n()->t('Set default profile avatar or randomize the cat.'),
+	$t = Renderer::getMarkupTemplate('settings.tpl', 'addon/catavatar/');
+	$s .= Renderer::replaceMacros($t, [
+		'$postpost' => !empty($_POST['catavatar-morecat']) || !empty($_POST['catavatar-emailcat']),
+		'$uncache' => time(),
+		'$uid' => local_user(),
+		'$usecat' => L10n::t('Use Cat as Avatar'),
+		'$morecat' => L10n::t('More Random Cat!'),
+		'$emailcat' => L10n::t('Reset to email Cat'),
+		'$seed' => PConfig::get(local_user(), 'catavatar', 'seed', false),
+		'$header' => L10n::t('Cat Avatar Settings'),
 	]);
-
-	$data = [
-		'addon'  => 'catavar',
-		'title'  => DI::l10n()->t('Cat Avatar Settings'),
-		'html'   => $html,
-		'submit' => [
-			'catavatar-usecat'   => DI::l10n()->t('Use Cat as Avatar'),
-			'catavatar-morecat'  => DI::l10n()->t('Another random Cat!'),
-			'catavatar-emailcat' => DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'catavatar', 'seed', false) ? DI::l10n()->t('Reset to email Cat') : null,
-		],
-	];
 }
 
 /**
  * Cat avatar user settings POST handle
  */
-function catavatar_addon_settings_post(&$s)
+function catavatar_addon_settings_post(App $a, &$s)
 {
-	if (!DI::userSession()->getLocalUserId()) {
+	if (!local_user()) {
 		return;
 	}
 
-	if (!empty($_POST['catavatar-usecat'])) {
-		$url = DI::baseUrl() . '/catavatar/' . DI::userSession()->getLocalUserId() . '?ts=' . time();
+	// delete the current cached cat avatar
+	$condition = ['uid' => local_user(), 'blocked' => false,
+			'account_expired' => false, 'account_removed' => false];
+	$user = DBA::selectFirst('user', ['email'], $condition);
 
-		$self = DBA::selectFirst('contact', ['id'], ['uid' => DI::userSession()->getLocalUserId(), 'self' => true]);
+	$seed = PConfig::get(local_user(), 'catavatar', 'seed', md5(trim(strtolower($user['email']))));
+
+	if (!empty($_POST['catavatar-usecat'])) {
+		$url = $a->getBaseURL() . '/catavatar/' . local_user() . '?ts=' . time();
+
+		$self = DBA::selectFirst('contact', ['id'], ['uid' => local_user(), 'self' => true]);
 		if (!DBA::isResult($self)) {
-			DI::sysmsg()->addNotice(DI::l10n()->t("The cat hadn't found itself."));
+			notice(L10n::t("The cat hadn't found itself."));
 			return;
 		}
 
-		Photo::importProfilePhoto($url, DI::userSession()->getLocalUserId(), $self['id']);
+		Photo::importProfilePhoto($url, local_user(), $self['id']);
 
-		$condition = ['uid' => DI::userSession()->getLocalUserId(), 'contact-id' => $self['id']];
+		$condition = ['uid' => local_user(), 'contact-id' => $self['id']];
 		$photo = DBA::selectFirst('photo', ['resource-id'], $condition);
 		if (!DBA::isResult($photo)) {
-			DI::sysmsg()->addNotice(DI::l10n()->t('There was an error, the cat ran away.'));
+			notice(L10n::t('There was an error, the cat ran away.'));
 			return;
 		}
 
-		DBA::update('photo', ['profile' => false], ['profile' => true, 'uid' => DI::userSession()->getLocalUserId()]);
+		DBA::update('photo', ['profile' => false], ['profile' => true, 'uid' => local_user()]);
 
-		$fields = ['profile' => true, 'album' => DI::l10n()->t('Profile Photos'), 'contact-id' => 0];
-		DBA::update('photo', $fields, ['uid' => DI::userSession()->getLocalUserId(), 'resource-id' => $photo['resource-id']]);
+		$fields = ['profile' => true, 'album' => L10n::t('Profile Photos'), 'contact-id' => 0];
+		DBA::update('photo', $fields, ['uid' => local_user(), 'resource-id' => $photo['resource-id']]);
 
-		Photo::importProfilePhoto($url, DI::userSession()->getLocalUserId(), $self['id']);
+		Photo::importProfilePhoto($url, local_user(), $self['id']);
 
-		Contact::updateSelfFromUserID(DI::userSession()->getLocalUserId(), true);
+		Contact::updateSelfFromUserID(local_user(), true);
 
 		// Update global directory in background
-		Profile::publishUpdate(DI::userSession()->getLocalUserId());
+		$url = $a->getBaseURL() . '/profile/' . $a->user['nickname'];
+		if ($url && strlen(Config::get('system', 'directory'))) {
+			Worker::add(PRIORITY_LOW, 'Directory', $url);
+		}
 
-		DI::sysmsg()->addInfo(DI::l10n()->t('Meow!'));
+		Worker::add(PRIORITY_LOW, 'ProfileUpdate', local_user());
+
+		info(L10n::t('Meow!'));
 		return;
 	}
 
 	if (!empty($_POST['catavatar-morecat'])) {
-		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'catavatar', 'seed', time());
+		PConfig::set(local_user(), 'catavatar', 'seed', time());
 	}
 
 	if (!empty($_POST['catavatar-emailcat'])) {
-		DI::pConfig()->delete(DI::userSession()->getLocalUserId(), 'catavatar', 'seed');
+		PConfig::delete(local_user(), 'catavatar', 'seed');
 	}
 }
 
 /**
  * Returns the URL to the cat avatar
  *
+ * @param $a array
  * @param &$b array
  */
-function catavatar_lookup(array &$b)
+function catavatar_lookup(App $a, &$b)
 {
 	$user = DBA::selectFirst('user', ['uid'], ['email' => $b['email']]);
-	if (DBA::isResult($user)) {
-		$url = DI::baseUrl() . '/catavatar/' . $user['uid'];
-	} else {
-		$url = DI::baseUrl() . '/catavatar/' . md5(trim(strtolower($b['email'])));
-	}
+	$url = $a->getBaseURL() . '/catavatar/' . $user['uid'];
 
 	switch($b['size']) {
 		case 300: $url .= "/4"; break;
 		case 80: $url .= "/5"; break;
-		case 48: $url .= "/6"; break;
+		case 47: $url .= "/6"; break;
 	}
 
 	$b['url'] = $url;
 	$b['success'] = true;
 }
 
-/**
- * This is a statement rather than an actual function definition. The simple
- * existence of this method is checked to figure out if the addon offers a
- * module.
- */
 function catavatar_module() {}
 
 /**
@@ -149,33 +160,28 @@ function catavatar_module() {}
  * @throws NotFoundException
  *
  */
-function catavatar_content()
+function catavatar_content(App $a)
 {
-	if (DI::args()->getArgc() < 2 || DI::args()->getArgc() > 3) {
+	if ($a->argc < 2 || $a->argc > 3) {
 		throw new NotFoundException(); // this should be catched on index and show default "not found" page.
 	}
 
-	if (is_numeric(DI::args()->getArgv()[1])) {
-		$uid = intval(DI::args()->getArgv()[1]);
-		$condition = ['uid' => $uid,
-				'account_expired' => false, 'account_removed' => false];
-		$user = DBA::selectFirst('user', ['email'], $condition);
+	$uid = intval($a->argv[1]);
 
-		if ($user === false) {
-			throw new NotFoundException();
-		}
+	$size = 0;
+	if ($a->argc == 3) {
+		$size = intval($a->argv[2]);
+	}
 
-		$seed = DI::pConfig()->get($uid, "catavatar", "seed", md5(trim(strtolower($user['email']))));
-	} elseif (!empty(DI::args()->getArgv()[1])) {
-		$seed = DI::args()->getArgv()[1];
-	} else {
+	$condition = ['uid' => $uid,
+			'account_expired' => false, 'account_removed' => false];
+	$user = DBA::selectFirst('user', ['email'], $condition);
+
+	if ($user === false) {
 		throw new NotFoundException();
 	}
 
-	$size = 0;
-	if (DI::args()->getArgc() == 3) {
-		$size = intval(DI::args()->getArgv()[2]);
-	}
+	$seed = PConfig::get($uid, "catavatar", "seed", md5(trim(strtolower($user['email']))));
 
 	// ...Or start generation
 	ob_start();
@@ -188,6 +194,8 @@ function catavatar_content()
 	exit();
 }
 
+
+
 /**
  * ====================
  * CAT-AVATAR-GENERATOR
diff --git a/catavatar/lang/C/messages.po b/catavatar/lang/C/messages.po
index 24735ca1..d22b6a88 100644
--- a/catavatar/lang/C/messages.po
+++ b/catavatar/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:14-0500\n"
+"POT-Creation-Date: 2018-04-13 09:35+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,38 +17,34 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: catavatar.php:48
-msgid "Set default profile avatar or randomize the cat."
-msgstr ""
-
-#: catavatar.php:53
-msgid "Cat Avatar Settings"
-msgstr ""
-
-#: catavatar.php:56
+#: catavatar.php:60
 msgid "Use Cat as Avatar"
 msgstr ""
 
-#: catavatar.php:57
-msgid "Another random Cat!"
+#: catavatar.php:61
+msgid "More Random Cat!"
 msgstr ""
 
-#: catavatar.php:58
+#: catavatar.php:62
 msgid "Reset to email Cat"
 msgstr ""
 
-#: catavatar.php:77
+#: catavatar.php:64
+msgid "Cat Avatar Settings"
+msgstr ""
+
+#: catavatar.php:100
 msgid "The cat hadn't found itself."
 msgstr ""
 
-#: catavatar.php:86
+#: catavatar.php:109
 msgid "There was an error, the cat ran away."
 msgstr ""
 
-#: catavatar.php:92
+#: catavatar.php:115
 msgid "Profile Photos"
 msgstr ""
 
-#: catavatar.php:102
+#: catavatar.php:130
 msgid "Meow!"
 msgstr ""
diff --git a/catavatar/lang/ar/messages.po b/catavatar/lang/ar/messages.po
deleted file mode 100644
index 2b6651f2..00000000
--- a/catavatar/lang/ar/messages.po
+++ /dev/null
@@ -1,59 +0,0 @@
-# ADDON catavatar
-# Copyright (C)
-# This file is distributed under the same license as the Friendica catavatar addon package.
-# 
-# 
-# Translators:
-# Farida Khalaf <faridakhalaf@hotmail.com>, 2021
-# abidin toumi <abidin24@tutanota.com>, 2021
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-25 13:16+0000\n"
-"PO-Revision-Date: 2018-04-07 05:23+0000\n"
-"Last-Translator: abidin toumi <abidin24@tutanota.com>, 2021\n"
-"Language-Team: Arabic (https://www.transifex.com/Friendica/teams/12172/ar/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ar\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-
-#: catavatar.php:49
-msgid "Use Cat as Avatar"
-msgstr "استخدم القط  كصورة رمزية"
-
-#: catavatar.php:50
-msgid "More Random Cat!"
-msgstr "المزيد من القطط العشوائية!"
-
-#: catavatar.php:51
-msgid "Reset to email Cat"
-msgstr "إعادة التعيين إلى البريد الإلكتروني للقط"
-
-#: catavatar.php:53
-msgid "Cat Avatar Settings"
-msgstr "إعدادات الصورة القط الرمزية"
-
-#: catavatar.php:54
-msgid "Set default profile avatar or randomize the cat."
-msgstr "عين الصورة الرمزية الافتراضية للملف الشخصي أو عين صورة قط عشوائي."
-
-#: catavatar.php:72
-msgid "The cat hadn't found itself."
-msgstr "القط لم يجد  نفسه"
-
-#: catavatar.php:81
-msgid "There was an error, the cat ran away."
-msgstr " هرب القط  ،كان هناك خطأ"
-
-#: catavatar.php:87
-msgid "Profile Photos"
-msgstr "الصور الشخصية"
-
-#: catavatar.php:97
-msgid "Meow!"
-msgstr "مياوو"
diff --git a/catavatar/lang/ar/strings.php b/catavatar/lang/ar/strings.php
deleted file mode 100644
index 28e549f6..00000000
--- a/catavatar/lang/ar/strings.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_ar")) {
-function string_plural_select_ar($n){
-	$n = intval($n);
-	if ($n==0) { return 0; } else if ($n==1) { return 1; } else if ($n==2) { return 2; } else if ($n%100>=3 && $n%100<=10) { return 3; } else if ($n%100>=11 && $n%100<=99) { return 4; } else  { return 5; }
-}}
-$a->strings['Use Cat as Avatar'] = 'استخدم القط  كصورة رمزية';
-$a->strings['More Random Cat!'] = 'المزيد من القطط العشوائية!';
-$a->strings['Reset to email Cat'] = 'إعادة التعيين إلى البريد الإلكتروني للقط';
-$a->strings['Cat Avatar Settings'] = 'إعدادات الصورة القط الرمزية';
-$a->strings['Set default profile avatar or randomize the cat.'] = 'عين الصورة الرمزية الافتراضية للملف الشخصي أو عين صورة قط عشوائي.';
-$a->strings['The cat hadn\'t found itself.'] = 'القط لم يجد  نفسه';
-$a->strings['There was an error, the cat ran away.'] = ' هرب القط  ،كان هناك خطأ';
-$a->strings['Profile Photos'] = 'الصور الشخصية';
-$a->strings['Meow!'] = 'مياوو';
diff --git a/catavatar/lang/ca/strings.php b/catavatar/lang/ca/strings.php
index 51fae163..cb62f492 100644
--- a/catavatar/lang/ca/strings.php
+++ b/catavatar/lang/ca/strings.php
@@ -3,13 +3,14 @@
 if(! function_exists("string_plural_select_ca")) {
 function string_plural_select_ca($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Use Cat as Avatar'] = 'Utilitzeu Gat com a Avatar';
-$a->strings['More Random Cat!'] = 'Més Random Cat!';
-$a->strings['Reset to email Cat'] = 'Restableix el correu electrònic Cat';
-$a->strings['Cat Avatar Settings'] = 'Configuració Avatar de cat';
-$a->strings['The cat hadn\'t found itself.'] = 'El gat no s\'havia trobat.';
-$a->strings['There was an error, the cat ran away.'] = 'Hi va haver un error, el gat va fugir.';
-$a->strings['Profile Photos'] = 'Fotos de perfil';
-$a->strings['Meow!'] = 'Meu!';
+;
+$a->strings["Use Cat as Avatar"] = "Utilitzeu Gat com a Avatar";
+$a->strings["More Random Cat!"] = "Més Random Cat!";
+$a->strings["Reset to email Cat"] = "Restableix el correu electrònic Cat";
+$a->strings["Cat Avatar Settings"] = "Configuració Avatar de cat";
+$a->strings["The cat hadn't found itself."] = "El gat no s'havia trobat.";
+$a->strings["There was an error, the cat ran away."] = "Hi va haver un error, el gat va fugir.";
+$a->strings["Profile Photos"] = "Fotos de perfil";
+$a->strings["Meow!"] = "Meu!";
diff --git a/catavatar/lang/cs/strings.php b/catavatar/lang/cs/strings.php
index b08e57e7..8aad1516 100644
--- a/catavatar/lang/cs/strings.php
+++ b/catavatar/lang/cs/strings.php
@@ -3,13 +3,14 @@
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
 	$n = intval($n);
-	if (($n == 1 && $n % 1 == 0)) { return 0; } else if (($n >= 2 && $n <= 4 && $n % 1 == 0)) { return 1; } else if (($n % 1 != 0 )) { return 2; } else  { return 3; }
+	return ($n == 1 && $n % 1 == 0) ? 0 : ($n >= 2 && $n <= 4 && $n % 1 == 0) ? 1: ($n % 1 != 0 ) ? 2 : 3;;
 }}
-$a->strings['Use Cat as Avatar'] = 'Použít kočku jako avatar';
-$a->strings['More Random Cat!'] = 'Další náhodné kočky!';
-$a->strings['Reset to email Cat'] = 'Resetovat a e-mailovat kočku';
-$a->strings['Cat Avatar Settings'] = 'Nastavení Cat Avatar';
-$a->strings['The cat hadn\'t found itself.'] = 'Kočka se nenašla.';
-$a->strings['There was an error, the cat ran away.'] = 'Vyskytla se chyba, kočka utekla.';
-$a->strings['Profile Photos'] = 'Profilové fotky';
-$a->strings['Meow!'] = 'Mňau!';
+;
+$a->strings["Use Cat as Avatar"] = "Použít kočku jako avatar";
+$a->strings["More Random Cat!"] = "Další náhodné kočky!";
+$a->strings["Reset to email Cat"] = "Resetovat a e-mailovat kočku";
+$a->strings["Cat Avatar Settings"] = "Nastavení Cat Avatar";
+$a->strings["The cat hadn't found itself."] = "Kočka se nenašla.";
+$a->strings["There was an error, the cat ran away."] = "Vyskytla se chyba, kočka utekla.";
+$a->strings["Profile Photos"] = "Profilové fotky";
+$a->strings["Meow!"] = "Mňau!";
diff --git a/catavatar/lang/da-dk/messages.po b/catavatar/lang/da-dk/messages.po
deleted file mode 100644
index c492097c..00000000
--- a/catavatar/lang/da-dk/messages.po
+++ /dev/null
@@ -1,58 +0,0 @@
-# ADDON catavatar
-# Copyright (C)
-# This file is distributed under the same license as the Friendica catavatar addon package.
-# 
-# 
-# Translators:
-# Anton <dev@atjn.dk>, 2022
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:14-0500\n"
-"PO-Revision-Date: 2018-04-07 05:23+0000\n"
-"Last-Translator: Anton <dev@atjn.dk>, 2022\n"
-"Language-Team: Danish (Denmark) (https://www.transifex.com/Friendica/teams/12172/da_DK/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: da_DK\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: catavatar.php:48
-msgid "Set default profile avatar or randomize the cat."
-msgstr ""
-
-#: catavatar.php:53
-msgid "Cat Avatar Settings"
-msgstr ""
-
-#: catavatar.php:56
-msgid "Use Cat as Avatar"
-msgstr ""
-
-#: catavatar.php:57
-msgid "Another random Cat!"
-msgstr ""
-
-#: catavatar.php:58
-msgid "Reset to email Cat"
-msgstr ""
-
-#: catavatar.php:77
-msgid "The cat hadn't found itself."
-msgstr "Katten havde ikke fundet sig selv."
-
-#: catavatar.php:86
-msgid "There was an error, the cat ran away."
-msgstr ""
-
-#: catavatar.php:92
-msgid "Profile Photos"
-msgstr ""
-
-#: catavatar.php:102
-msgid "Meow!"
-msgstr ""
diff --git a/catavatar/lang/da-dk/strings.php b/catavatar/lang/da-dk/strings.php
deleted file mode 100644
index 677f4b54..00000000
--- a/catavatar/lang/da-dk/strings.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_da_dk")) {
-function string_plural_select_da_dk($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['The cat hadn\'t found itself.'] = 'Katten havde ikke fundet sig selv.';
diff --git a/catavatar/lang/de/messages.po b/catavatar/lang/de/messages.po
index f99acaba..192300c8 100644
--- a/catavatar/lang/de/messages.po
+++ b/catavatar/lang/de/messages.po
@@ -3,61 +3,51 @@
 # This file is distributed under the same license as the Friendica catavatar addon package.
 # 
 # 
-# Translators:
-# Ulf Rompe <transifex.com@rompe.org>, 2019
-# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2022
-# 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:14-0500\n"
-"PO-Revision-Date: 2018-04-07 05:23+0000\n"
-"Last-Translator: Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2022\n"
-"Language-Team: German (https://app.transifex.com/Friendica/teams/12172/de/)\n"
+"POT-Creation-Date: 2018-04-13 09:35+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2018\n"
+"Language-Team: German (https://www.transifex.com/Friendica/teams/12172/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: catavatar.php:48
-msgid "Set default profile avatar or randomize the cat."
-msgstr ""
-"Wähle das standardmäßig verwendete Profilbild oder ein zufällig erzeugtes "
-"Katzenbild."
-
-#: catavatar.php:53
-msgid "Cat Avatar Settings"
-msgstr "Katzen-Profilbild-Einstellungen"
-
-#: catavatar.php:56
+#: catavatar.php:60
 msgid "Use Cat as Avatar"
 msgstr "Verwende diese Katze als Profilbild"
 
-#: catavatar.php:57
-msgid "Another random Cat!"
-msgstr "Eine andere zufällige Katze"
+#: catavatar.php:61
+msgid "More Random Cat!"
+msgstr "Weitere zufällige Katze"
 
-#: catavatar.php:58
+#: catavatar.php:62
 msgid "Reset to email Cat"
-msgstr "Zurück zu E-Mail-Katze"
+msgstr "Zurück zu E-Mail Katze"
 
-#: catavatar.php:77
+#: catavatar.php:64
+msgid "Cat Avatar Settings"
+msgstr "Katzen Profilbild Einstellungen"
+
+#: catavatar.php:100
 msgid "The cat hadn't found itself."
 msgstr ""
 "Es ist ein Problem mit der Datenbank aufgetreten. Die Katze konnte sich "
 "nicht selbst finden."
 
-#: catavatar.php:86
+#: catavatar.php:109
 msgid "There was an error, the cat ran away."
-msgstr "Upps, es gab einen Fehler und die Katze ist weggelaufen"
+msgstr "Upps es gab einen Fehler und die Katze ist weggelaufen"
 
-#: catavatar.php:92
+#: catavatar.php:115
 msgid "Profile Photos"
 msgstr "Profilbilder"
 
-#: catavatar.php:102
+#: catavatar.php:130
 msgid "Meow!"
 msgstr "Miau!"
diff --git a/catavatar/lang/de/strings.php b/catavatar/lang/de/strings.php
index 2d1cdcc0..a92ff79d 100644
--- a/catavatar/lang/de/strings.php
+++ b/catavatar/lang/de/strings.php
@@ -2,15 +2,14 @@
 
 if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Set default profile avatar or randomize the cat.'] = 'Wähle das standardmäßig verwendete Profilbild oder ein zufällig erzeugtes Katzenbild.';
-$a->strings['Cat Avatar Settings'] = 'Katzen-Profilbild-Einstellungen';
-$a->strings['Use Cat as Avatar'] = 'Verwende diese Katze als Profilbild';
-$a->strings['Another random Cat!'] = 'Eine andere zufällige Katze';
-$a->strings['Reset to email Cat'] = 'Zurück zu E-Mail-Katze';
-$a->strings['The cat hadn\'t found itself.'] = 'Es ist ein Problem mit der Datenbank aufgetreten. Die Katze konnte sich nicht selbst finden.';
-$a->strings['There was an error, the cat ran away.'] = 'Upps, es gab einen Fehler und die Katze ist weggelaufen';
-$a->strings['Profile Photos'] = 'Profilbilder';
-$a->strings['Meow!'] = 'Miau!';
+;
+$a->strings["Use Cat as Avatar"] = "Verwende diese Katze als Profilbild";
+$a->strings["More Random Cat!"] = "Weitere zufällige Katze";
+$a->strings["Reset to email Cat"] = "Zurück zu E-Mail Katze";
+$a->strings["Cat Avatar Settings"] = "Katzen Profilbild Einstellungen";
+$a->strings["The cat hadn't found itself."] = "Es ist ein Problem mit der Datenbank aufgetreten. Die Katze konnte sich nicht selbst finden.";
+$a->strings["There was an error, the cat ran away."] = "Upps es gab einen Fehler und die Katze ist weggelaufen";
+$a->strings["Profile Photos"] = "Profilbilder";
+$a->strings["Meow!"] = "Miau!";
diff --git a/catavatar/lang/en-gb/strings.php b/catavatar/lang/en-gb/strings.php
index 552cfd96..f37ebd61 100644
--- a/catavatar/lang/en-gb/strings.php
+++ b/catavatar/lang/en-gb/strings.php
@@ -2,14 +2,14 @@
 
 if(! function_exists("string_plural_select_en_gb")) {
 function string_plural_select_en_gb($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Use Cat as Avatar'] = 'Use Cat as Avatar';
-$a->strings['More Random Cat!'] = 'Another Random Cat!';
-$a->strings['Reset to email Cat'] = 'Reset to email Cat';
-$a->strings['Cat Avatar Settings'] = 'Cat Avatar Settings';
-$a->strings['The cat hadn\'t found itself.'] = 'There was a database error, the cat has got lost.';
-$a->strings['There was an error, the cat ran away.'] = 'There was an error, the cat ran away.';
-$a->strings['Profile Photos'] = 'Profile Photos';
-$a->strings['Meow!'] = 'Meow!';
+;
+$a->strings["Use Cat as Avatar"] = "Use Cat as Avatar";
+$a->strings["More Random Cat!"] = "Another Random Cat!";
+$a->strings["Reset to email Cat"] = "Reset to email Cat";
+$a->strings["Cat Avatar Settings"] = "Cat Avatar Settings";
+$a->strings["The cat hadn't found itself."] = "There was a database error, the cat has got lost.";
+$a->strings["There was an error, the cat ran away."] = "There was an error, the cat ran away.";
+$a->strings["Profile Photos"] = "Profile Photos";
+$a->strings["Meow!"] = "Meow!";
diff --git a/catavatar/lang/es/messages.po b/catavatar/lang/es/messages.po
index 5934a618..ede5e8e5 100644
--- a/catavatar/lang/es/messages.po
+++ b/catavatar/lang/es/messages.po
@@ -3,18 +3,14 @@
 # This file is distributed under the same license as the Friendica catavatar addon package.
 # 
 # 
-# Translators:
-# Albert, 2018
-# Boris Daniel Martinez Millàn <borisdanielmartinezmillan@gmail.com>, 2021
-# 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2018-04-07 05:23+0000\n"
-"Last-Translator: Boris Daniel Martinez Millàn <borisdanielmartinezmillan@gmail.com>, 2021\n"
+"POT-Creation-Date: 2018-04-13 09:35+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Albert, 2018\n"
 "Language-Team: Spanish (https://www.transifex.com/Friendica/teams/12172/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,39 +18,34 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: catavatar.php:48
+#: catavatar.php:60
 msgid "Use Cat as Avatar"
 msgstr "Usar Gato como Avatar"
 
-#: catavatar.php:49
+#: catavatar.php:61
 msgid "More Random Cat!"
 msgstr "¡Más gato al azar!"
 
-#: catavatar.php:50
+#: catavatar.php:62
 msgid "Reset to email Cat"
 msgstr "Restablecer a correo electrónico Gato"
 
-#: catavatar.php:52
+#: catavatar.php:64
 msgid "Cat Avatar Settings"
 msgstr "Ajustes de Avatar Gato"
 
-#: catavatar.php:53
-msgid "Set default profile avatar or randomize the cat."
-msgstr ""
-"Establezca su avatar de perfil o pondremos una foto de un gato al azar"
-
-#: catavatar.php:78
+#: catavatar.php:100
 msgid "The cat hadn't found itself."
 msgstr "El gato no se había encontrado."
 
-#: catavatar.php:87
+#: catavatar.php:109
 msgid "There was an error, the cat ran away."
 msgstr "Hubo un error, el gato se escapó."
 
-#: catavatar.php:93
+#: catavatar.php:115
 msgid "Profile Photos"
 msgstr "Fotos de perfil"
 
-#: catavatar.php:108
+#: catavatar.php:130
 msgid "Meow!"
 msgstr "¡Miau!"
diff --git a/catavatar/lang/es/strings.php b/catavatar/lang/es/strings.php
index 725100b2..72ba6990 100644
--- a/catavatar/lang/es/strings.php
+++ b/catavatar/lang/es/strings.php
@@ -3,14 +3,14 @@
 if(! function_exists("string_plural_select_es")) {
 function string_plural_select_es($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Use Cat as Avatar'] = 'Usar Gato como Avatar';
-$a->strings['More Random Cat!'] = '¡Más gato al azar!';
-$a->strings['Reset to email Cat'] = 'Restablecer a correo electrónico Gato';
-$a->strings['Cat Avatar Settings'] = 'Ajustes de Avatar Gato';
-$a->strings['Set default profile avatar or randomize the cat.'] = 'Establezca su avatar de perfil o pondremos una foto de un gato al azar';
-$a->strings['The cat hadn\'t found itself.'] = 'El gato no se había encontrado.';
-$a->strings['There was an error, the cat ran away.'] = 'Hubo un error, el gato se escapó.';
-$a->strings['Profile Photos'] = 'Fotos de perfil';
-$a->strings['Meow!'] = '¡Miau!';
+;
+$a->strings["Use Cat as Avatar"] = "Usar Gato como Avatar";
+$a->strings["More Random Cat!"] = "¡Más gato al azar!";
+$a->strings["Reset to email Cat"] = "Restablecer a correo electrónico Gato";
+$a->strings["Cat Avatar Settings"] = "Ajustes de Avatar Gato";
+$a->strings["The cat hadn't found itself."] = "El gato no se había encontrado.";
+$a->strings["There was an error, the cat ran away."] = "Hubo un error, el gato se escapó.";
+$a->strings["Profile Photos"] = "Fotos de perfil";
+$a->strings["Meow!"] = "¡Miau!";
diff --git a/catavatar/lang/fi-fi/strings.php b/catavatar/lang/fi-fi/strings.php
index fd1907c5..ebcd678c 100644
--- a/catavatar/lang/fi-fi/strings.php
+++ b/catavatar/lang/fi-fi/strings.php
@@ -2,13 +2,14 @@
 
 if(! function_exists("string_plural_select_fi_fi")) {
 function string_plural_select_fi_fi($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Use Cat as Avatar'] = 'Ota kissa-avatari käyttöön';
-$a->strings['More Random Cat!'] = 'Lisää satunnaisia kissoja!';
-$a->strings['Cat Avatar Settings'] = 'Cat Avatar -asetukset';
-$a->strings['The cat hadn\'t found itself.'] = 'Tietokantavirhe, kissa on eksyksissä.';
-$a->strings['There was an error, the cat ran away.'] = 'Tapahtui virhe, kissa juoksi karkuun.';
-$a->strings['Profile Photos'] = 'Profiilikuvia';
-$a->strings['Meow!'] = 'Miau!';
+;
+$a->strings["Use Cat as Avatar"] = "Ota kissa-avatari käyttöön";
+$a->strings["More Random Cat!"] = "Lisää satunnaisia kissoja!";
+$a->strings["Reset to email Cat"] = "";
+$a->strings["Cat Avatar Settings"] = "Cat Avatar -asetukset";
+$a->strings["The cat hadn't found itself."] = "Tietokantavirhe, kissa on eksyksissä.";
+$a->strings["There was an error, the cat ran away."] = "Tapahtui virhe, kissa juoksi karkuun.";
+$a->strings["Profile Photos"] = "Profiilikuvia";
+$a->strings["Meow!"] = "Miau!";
diff --git a/catavatar/lang/fr/messages.po b/catavatar/lang/fr/messages.po
index 64e98568..3c4e03f6 100644
--- a/catavatar/lang/fr/messages.po
+++ b/catavatar/lang/fr/messages.po
@@ -5,55 +5,50 @@
 # 
 # Translators:
 # Vladimir Núñez <lapoubelle111@gmail.com>, 2019
-# Florent C., 2023
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:14-0500\n"
+"POT-Creation-Date: 2018-04-13 09:35+0000\n"
 "PO-Revision-Date: 2018-04-07 05:23+0000\n"
-"Last-Translator: Florent C., 2023\n"
-"Language-Team: French (https://app.transifex.com/Friendica/teams/12172/fr/)\n"
+"Last-Translator: Vladimir Núñez <lapoubelle111@gmail.com>, 2019\n"
+"Language-Team: French (https://www.transifex.com/Friendica/teams/12172/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fr\n"
-"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: catavatar.php:48
-msgid "Set default profile avatar or randomize the cat."
-msgstr "Mettre l'avatar par défaut ou tirer au sort le chat."
+#: catavatar.php:60
+msgid "Use Cat as Avatar"
+msgstr "Utiliser Chat comme avatar"
 
-#: catavatar.php:53
+#: catavatar.php:61
+msgid "More Random Cat!"
+msgstr "Autres Chats au hasard"
+
+#: catavatar.php:62
+msgid "Reset to email Cat"
+msgstr "Réinitialiser à Chat courriel"
+
+#: catavatar.php:64
 msgid "Cat Avatar Settings"
 msgstr "Paramètres de Chat avatar"
 
-#: catavatar.php:56
-msgid "Use Cat as Avatar"
-msgstr "Utiliser ce Chat"
-
-#: catavatar.php:57
-msgid "Another random Cat!"
-msgstr "Un autre Chat aléatoire !"
-
-#: catavatar.php:58
-msgid "Reset to email Cat"
-msgstr "Revenir au Chat par défaut"
-
-#: catavatar.php:77
+#: catavatar.php:100
 msgid "The cat hadn't found itself."
 msgstr "Le Chat ne s'y est pas retrouvé"
 
-#: catavatar.php:86
+#: catavatar.php:109
 msgid "There was an error, the cat ran away."
 msgstr "Il y a eu une erreur et le chat s'est enfui"
 
-#: catavatar.php:92
+#: catavatar.php:115
 msgid "Profile Photos"
 msgstr "Photos de profil"
 
-#: catavatar.php:102
+#: catavatar.php:130
 msgid "Meow!"
 msgstr "Miaou !"
diff --git a/catavatar/lang/fr/strings.php b/catavatar/lang/fr/strings.php
index b68b9d45..78976bf5 100644
--- a/catavatar/lang/fr/strings.php
+++ b/catavatar/lang/fr/strings.php
@@ -3,14 +3,14 @@
 if(! function_exists("string_plural_select_fr")) {
 function string_plural_select_fr($n){
 	$n = intval($n);
-	if (($n == 0 || $n == 1)) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
+	return ($n > 1);;
 }}
-$a->strings['Set default profile avatar or randomize the cat.'] = 'Mettre l\'avatar par défaut ou tirer au sort le chat.';
-$a->strings['Cat Avatar Settings'] = 'Paramètres de Chat avatar';
-$a->strings['Use Cat as Avatar'] = 'Utiliser ce Chat';
-$a->strings['Another random Cat!'] = 'Un autre Chat aléatoire !';
-$a->strings['Reset to email Cat'] = 'Revenir au Chat par défaut';
-$a->strings['The cat hadn\'t found itself.'] = 'Le Chat ne s\'y est pas retrouvé';
-$a->strings['There was an error, the cat ran away.'] = 'Il y a eu une erreur et le chat s\'est enfui';
-$a->strings['Profile Photos'] = 'Photos de profil';
-$a->strings['Meow!'] = 'Miaou !';
+;
+$a->strings["Use Cat as Avatar"] = "Utiliser Chat comme avatar";
+$a->strings["More Random Cat!"] = "Autres Chats au hasard";
+$a->strings["Reset to email Cat"] = "Réinitialiser à Chat courriel";
+$a->strings["Cat Avatar Settings"] = "Paramètres de Chat avatar";
+$a->strings["The cat hadn't found itself."] = "Le Chat ne s'y est pas retrouvé";
+$a->strings["There was an error, the cat ran away."] = "Il y a eu une erreur et le chat s'est enfui";
+$a->strings["Profile Photos"] = "Photos de profil";
+$a->strings["Meow!"] = "Miaou !";
diff --git a/catavatar/lang/hu/messages.po b/catavatar/lang/hu/messages.po
deleted file mode 100644
index 912cf035..00000000
--- a/catavatar/lang/hu/messages.po
+++ /dev/null
@@ -1,58 +0,0 @@
-# ADDON catavatar
-# Copyright (C)
-# This file is distributed under the same license as the Friendica catavatar addon package.
-# 
-# 
-# Translators:
-# Balázs Úr, 2021
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:14-0500\n"
-"PO-Revision-Date: 2018-04-07 05:23+0000\n"
-"Last-Translator: Balázs Úr, 2021\n"
-"Language-Team: Hungarian (https://www.transifex.com/Friendica/teams/12172/hu/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: hu\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: catavatar.php:48
-msgid "Set default profile avatar or randomize the cat."
-msgstr "Alapértelmezett profilkép beállítása vagy véletlenszerű macska."
-
-#: catavatar.php:53
-msgid "Cat Avatar Settings"
-msgstr "Macskaprofilkép-beállítások"
-
-#: catavatar.php:56
-msgid "Use Cat as Avatar"
-msgstr "Macska használata profilképként"
-
-#: catavatar.php:57
-msgid "Another random Cat!"
-msgstr "Egy másik véletlenszerű macska!"
-
-#: catavatar.php:58
-msgid "Reset to email Cat"
-msgstr "Visszaállítás e-mail macskára"
-
-#: catavatar.php:77
-msgid "The cat hadn't found itself."
-msgstr "A macska nem találta meg önmagát."
-
-#: catavatar.php:86
-msgid "There was an error, the cat ran away."
-msgstr "Hiba történt, a macska elfutott."
-
-#: catavatar.php:92
-msgid "Profile Photos"
-msgstr "Profilfényképek"
-
-#: catavatar.php:102
-msgid "Meow!"
-msgstr "Miáú!"
diff --git a/catavatar/lang/hu/strings.php b/catavatar/lang/hu/strings.php
deleted file mode 100644
index a47b4df0..00000000
--- a/catavatar/lang/hu/strings.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_hu")) {
-function string_plural_select_hu($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Set default profile avatar or randomize the cat.'] = 'Alapértelmezett profilkép beállítása vagy véletlenszerű macska.';
-$a->strings['Cat Avatar Settings'] = 'Macskaprofilkép-beállítások';
-$a->strings['Use Cat as Avatar'] = 'Macska használata profilképként';
-$a->strings['Another random Cat!'] = 'Egy másik véletlenszerű macska!';
-$a->strings['Reset to email Cat'] = 'Visszaállítás e-mail macskára';
-$a->strings['The cat hadn\'t found itself.'] = 'A macska nem találta meg önmagát.';
-$a->strings['There was an error, the cat ran away.'] = 'Hiba történt, a macska elfutott.';
-$a->strings['Profile Photos'] = 'Profilfényképek';
-$a->strings['Meow!'] = 'Miáú!';
diff --git a/catavatar/lang/is/strings.php b/catavatar/lang/is/strings.php
index cb2e2214..a4266e21 100644
--- a/catavatar/lang/is/strings.php
+++ b/catavatar/lang/is/strings.php
@@ -3,7 +3,14 @@
 if(! function_exists("string_plural_select_is")) {
 function string_plural_select_is($n){
 	$n = intval($n);
-	return intval($n % 10 != 1 || $n % 100 == 11);
+	return ($n % 10 != 1 || $n % 100 == 11);;
 }}
-$a->strings['Profile Photos'] = 'Forsíðumyndir';
-$a->strings['Meow!'] = 'Mjá!';
+;
+$a->strings["Use Cat as Avatar"] = "";
+$a->strings["More Random Cat!"] = "";
+$a->strings["Reset to email Cat"] = "";
+$a->strings["Cat Avatar Settings"] = "";
+$a->strings["The cat hadn't found itself."] = "";
+$a->strings["There was an error, the cat ran away."] = "";
+$a->strings["Profile Photos"] = "Forsíðumyndir";
+$a->strings["Meow!"] = "Mjá!";
diff --git a/catavatar/lang/it/messages.po b/catavatar/lang/it/messages.po
index e05bd277..a190615c 100644
--- a/catavatar/lang/it/messages.po
+++ b/catavatar/lang/it/messages.po
@@ -3,19 +3,14 @@
 # This file is distributed under the same license as the Friendica catavatar addon package.
 # 
 # 
-# Translators:
-# fabrixxm <fabrix.xm@gmail.com>, 2018
-# Davide Pesenti <mrjive@mrjive.it>, 2018
-# Sylke Vicious <silkevicious@gmail.com>, 2021
-# 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-12-29 00:53+0000\n"
-"PO-Revision-Date: 2018-04-07 05:23+0000\n"
-"Last-Translator: Sylke Vicious <silkevicious@gmail.com>, 2021\n"
+"POT-Creation-Date: 2018-04-13 09:35+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Davide Pesenti <mrjive@mrjive.it>, 2018\n"
 "Language-Team: Italian (https://www.transifex.com/Friendica/teams/12172/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,38 +18,34 @@ msgstr ""
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: catavatar.php:48
+#: catavatar.php:60
 msgid "Use Cat as Avatar"
 msgstr "Usa il Gatto come avatar"
 
-#: catavatar.php:49
+#: catavatar.php:61
 msgid "More Random Cat!"
 msgstr "Altro Gatto a caso!"
 
-#: catavatar.php:50
+#: catavatar.php:62
 msgid "Reset to email Cat"
 msgstr "Reimposta Gatto"
 
-#: catavatar.php:52
+#: catavatar.php:64
 msgid "Cat Avatar Settings"
 msgstr "Impostazioni Avatar Gatto"
 
-#: catavatar.php:53
-msgid "Set default profile avatar or randomize the cat."
-msgstr "Imposta l'immagine di profilo predefinita o crea un gatto casuale."
-
-#: catavatar.php:78
+#: catavatar.php:100
 msgid "The cat hadn't found itself."
 msgstr "Il gatto non ha trovato sé stesso."
 
-#: catavatar.php:87
+#: catavatar.php:109
 msgid "There was an error, the cat ran away."
 msgstr "Si è verificato un errore, il gatto è scappato."
 
-#: catavatar.php:93
+#: catavatar.php:115
 msgid "Profile Photos"
 msgstr "Foto del profilo"
 
-#: catavatar.php:108
+#: catavatar.php:130
 msgid "Meow!"
 msgstr "Miao!"
diff --git a/catavatar/lang/it/strings.php b/catavatar/lang/it/strings.php
index 3a33374a..a3c1aa98 100644
--- a/catavatar/lang/it/strings.php
+++ b/catavatar/lang/it/strings.php
@@ -2,15 +2,14 @@
 
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Use Cat as Avatar'] = 'Usa il Gatto come avatar';
-$a->strings['More Random Cat!'] = 'Altro Gatto a caso!';
-$a->strings['Reset to email Cat'] = 'Reimposta Gatto';
-$a->strings['Cat Avatar Settings'] = 'Impostazioni Avatar Gatto';
-$a->strings['Set default profile avatar or randomize the cat.'] = 'Imposta l\'immagine di profilo predefinita o crea un gatto casuale.';
-$a->strings['The cat hadn\'t found itself.'] = 'Il gatto non ha trovato sé stesso.';
-$a->strings['There was an error, the cat ran away.'] = 'Si è verificato un errore, il gatto è scappato.';
-$a->strings['Profile Photos'] = 'Foto del profilo';
-$a->strings['Meow!'] = 'Miao!';
+;
+$a->strings["Use Cat as Avatar"] = "Usa il Gatto come avatar";
+$a->strings["More Random Cat!"] = "Altro Gatto a caso!";
+$a->strings["Reset to email Cat"] = "Reimposta Gatto";
+$a->strings["Cat Avatar Settings"] = "Impostazioni Avatar Gatto";
+$a->strings["The cat hadn't found itself."] = "Il gatto non ha trovato sé stesso.";
+$a->strings["There was an error, the cat ran away."] = "Si è verificato un errore, il gatto è scappato.";
+$a->strings["Profile Photos"] = "Foto del profilo";
+$a->strings["Meow!"] = "Miao!";
diff --git a/catavatar/lang/nl/strings.php b/catavatar/lang/nl/strings.php
index 27994280..f97a6ef5 100644
--- a/catavatar/lang/nl/strings.php
+++ b/catavatar/lang/nl/strings.php
@@ -3,13 +3,14 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Use Cat as Avatar'] = 'Gebruik een kat als avatar';
-$a->strings['More Random Cat!'] = 'Meer willekeurige kat!';
-$a->strings['Reset to email Cat'] = 'Email kat opnieuw instellen.';
-$a->strings['Cat Avatar Settings'] = 'Kat Avatar instellingen';
-$a->strings['The cat hadn\'t found itself.'] = 'Het katje kon zichzelf niet vinden.';
-$a->strings['There was an error, the cat ran away.'] = 'Er was een fout, de kat liep weg.';
-$a->strings['Profile Photos'] = 'Profielfoto\'s';
-$a->strings['Meow!'] = 'Miauw!';
+;
+$a->strings["Use Cat as Avatar"] = "Gebruik een kat als avatar";
+$a->strings["More Random Cat!"] = "Meer willekeurige kat!";
+$a->strings["Reset to email Cat"] = "Email kat opnieuw instellen.";
+$a->strings["Cat Avatar Settings"] = "Kat Avatar instellingen";
+$a->strings["The cat hadn't found itself."] = "Het katje kon zichzelf niet vinden.";
+$a->strings["There was an error, the cat ran away."] = "Er was een fout, de kat liep weg.";
+$a->strings["Profile Photos"] = "Profielfoto's";
+$a->strings["Meow!"] = "Miauw!";
diff --git a/catavatar/lang/pl/messages.po b/catavatar/lang/pl/messages.po
index 5bcf50b3..b1d66bc7 100644
--- a/catavatar/lang/pl/messages.po
+++ b/catavatar/lang/pl/messages.po
@@ -3,18 +3,14 @@
 # This file is distributed under the same license as the Friendica catavatar addon package.
 # 
 # 
-# Translators:
-# Waldemar Stoczkowski, 2018
-# Piotr Strębski <strebski@gmail.com>, 2022
-# 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:14-0500\n"
-"PO-Revision-Date: 2018-04-07 05:23+0000\n"
-"Last-Translator: Piotr Strębski <strebski@gmail.com>, 2022\n"
+"POT-Creation-Date: 2018-04-13 09:35+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>, 2018\n"
 "Language-Team: Polish (https://www.transifex.com/Friendica/teams/12172/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,38 +18,34 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
-#: catavatar.php:48
-msgid "Set default profile avatar or randomize the cat."
-msgstr "Ustaw domyślny awatar profilu lub użyj losowego kota."
-
-#: catavatar.php:53
-msgid "Cat Avatar Settings"
-msgstr "Ustawienia Kot Avatar"
-
-#: catavatar.php:56
+#: catavatar.php:60
 msgid "Use Cat as Avatar"
 msgstr "Użyj kota jako awatara"
 
-#: catavatar.php:57
-msgid "Another random Cat!"
-msgstr "Inny losowy kot!"
+#: catavatar.php:61
+msgid "More Random Cat!"
+msgstr "Więcej losowych kotów!"
 
-#: catavatar.php:58
+#: catavatar.php:62
 msgid "Reset to email Cat"
-msgstr "Resetuj Kota na e-mail"
+msgstr "Resetuj na e-mail Kot"
 
-#: catavatar.php:77
+#: catavatar.php:64
+msgid "Cat Avatar Settings"
+msgstr "Ustawienia Kot Avatar"
+
+#: catavatar.php:100
 msgid "The cat hadn't found itself."
 msgstr "Kot się nie znalazł."
 
-#: catavatar.php:86
+#: catavatar.php:109
 msgid "There was an error, the cat ran away."
 msgstr "Wystąpił błąd, kot uciekł."
 
-#: catavatar.php:92
+#: catavatar.php:115
 msgid "Profile Photos"
 msgstr "Zdjęcie profilowe"
 
-#: catavatar.php:102
+#: catavatar.php:130
 msgid "Meow!"
 msgstr "Miau!"
diff --git a/catavatar/lang/pl/strings.php b/catavatar/lang/pl/strings.php
index cb15c046..203d1a97 100644
--- a/catavatar/lang/pl/strings.php
+++ b/catavatar/lang/pl/strings.php
@@ -2,15 +2,14 @@
 
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
-	$n = intval($n);
-	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
+	return ($n==1 ? 0 : ($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14) ? 1 : $n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14) ? 2 : 3);;
 }}
-$a->strings['Set default profile avatar or randomize the cat.'] = 'Ustaw domyślny awatar profilu lub użyj losowego kota.';
-$a->strings['Cat Avatar Settings'] = 'Ustawienia Kot Avatar';
-$a->strings['Use Cat as Avatar'] = 'Użyj kota jako awatara';
-$a->strings['Another random Cat!'] = 'Inny losowy kot!';
-$a->strings['Reset to email Cat'] = 'Resetuj Kota na e-mail';
-$a->strings['The cat hadn\'t found itself.'] = 'Kot się nie znalazł.';
-$a->strings['There was an error, the cat ran away.'] = 'Wystąpił błąd, kot uciekł.';
-$a->strings['Profile Photos'] = 'Zdjęcie profilowe';
-$a->strings['Meow!'] = 'Miau!';
+;
+$a->strings["Use Cat as Avatar"] = "Użyj kota jako awatara";
+$a->strings["More Random Cat!"] = "Więcej losowych kotów!";
+$a->strings["Reset to email Cat"] = "Resetuj na e-mail Kot";
+$a->strings["Cat Avatar Settings"] = "Ustawienia Kot Avatar";
+$a->strings["The cat hadn't found itself."] = "Kot się nie znalazł.";
+$a->strings["There was an error, the cat ran away."] = "Wystąpił błąd, kot uciekł.";
+$a->strings["Profile Photos"] = "Zdjęcie profilowe";
+$a->strings["Meow!"] = "Miau!";
diff --git a/catavatar/lang/ru/messages.po b/catavatar/lang/ru/messages.po
deleted file mode 100644
index 8a53c182..00000000
--- a/catavatar/lang/ru/messages.po
+++ /dev/null
@@ -1,54 +0,0 @@
-# ADDON catavatar
-# Copyright (C)
-# This file is distributed under the same license as the Friendica catavatar addon package.
-# 
-# 
-# Translators:
-# Alexander An <ravnina@gmail.com>, 2020
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-04-13 09:35+0000\n"
-"PO-Revision-Date: 2018-04-07 05:23+0000\n"
-"Last-Translator: Alexander An <ravnina@gmail.com>, 2020\n"
-"Language-Team: Russian (https://www.transifex.com/Friendica/teams/12172/ru/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ru\n"
-"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
-
-#: catavatar.php:60
-msgid "Use Cat as Avatar"
-msgstr "Поставить кота на аватар"
-
-#: catavatar.php:61
-msgid "More Random Cat!"
-msgstr "Сгенерировать ещё котов!"
-
-#: catavatar.php:62
-msgid "Reset to email Cat"
-msgstr "Сбросить на кота по-умолчанию"
-
-#: catavatar.php:64
-msgid "Cat Avatar Settings"
-msgstr "Настройки Cat Avatar"
-
-#: catavatar.php:100
-msgid "The cat hadn't found itself."
-msgstr "Кот не нашёл сам себя."
-
-#: catavatar.php:109
-msgid "There was an error, the cat ran away."
-msgstr "Возникла ошибка, кот убежал."
-
-#: catavatar.php:115
-msgid "Profile Photos"
-msgstr "Фото профиля"
-
-#: catavatar.php:130
-msgid "Meow!"
-msgstr "Мяу!"
diff --git a/catavatar/lang/ru/strings.php b/catavatar/lang/ru/strings.php
deleted file mode 100644
index e8ab1b5f..00000000
--- a/catavatar/lang/ru/strings.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_ru")) {
-function string_plural_select_ru($n){
-	$n = intval($n);
-	if ($n%10==1 && $n%100!=11) { return 0; } else if ($n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14)) { return 1; } else if ($n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)) { return 2; } else  { return 3; }
-}}
-$a->strings['Use Cat as Avatar'] = 'Поставить кота на аватар';
-$a->strings['More Random Cat!'] = 'Сгенерировать ещё котов!';
-$a->strings['Reset to email Cat'] = 'Сбросить на кота по-умолчанию';
-$a->strings['Cat Avatar Settings'] = 'Настройки Cat Avatar';
-$a->strings['The cat hadn\'t found itself.'] = 'Кот не нашёл сам себя.';
-$a->strings['There was an error, the cat ran away.'] = 'Возникла ошибка, кот убежал.';
-$a->strings['Profile Photos'] = 'Фото профиля';
-$a->strings['Meow!'] = 'Мяу!';
diff --git a/catavatar/lang/sv/messages.po b/catavatar/lang/sv/messages.po
deleted file mode 100644
index c53de04d..00000000
--- a/catavatar/lang/sv/messages.po
+++ /dev/null
@@ -1,58 +0,0 @@
-# ADDON catavatar
-# Copyright (C)
-# This file is distributed under the same license as the Friendica catavatar addon package.
-# 
-# 
-# Translators:
-# Bjoessi <torbjorn.andersson@syte.se>, 2019
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:14-0500\n"
-"PO-Revision-Date: 2018-04-07 05:23+0000\n"
-"Last-Translator: Bjoessi <torbjorn.andersson@syte.se>, 2019\n"
-"Language-Team: Swedish (https://www.transifex.com/Friendica/teams/12172/sv/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: sv\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: catavatar.php:48
-msgid "Set default profile avatar or randomize the cat."
-msgstr ""
-
-#: catavatar.php:53
-msgid "Cat Avatar Settings"
-msgstr "Inställningar för profilkatt"
-
-#: catavatar.php:56
-msgid "Use Cat as Avatar"
-msgstr "Använd katt som profilbild"
-
-#: catavatar.php:57
-msgid "Another random Cat!"
-msgstr ""
-
-#: catavatar.php:58
-msgid "Reset to email Cat"
-msgstr "Återställ till epost-katt"
-
-#: catavatar.php:77
-msgid "The cat hadn't found itself."
-msgstr ""
-
-#: catavatar.php:86
-msgid "There was an error, the cat ran away."
-msgstr ""
-
-#: catavatar.php:92
-msgid "Profile Photos"
-msgstr ""
-
-#: catavatar.php:102
-msgid "Meow!"
-msgstr ""
diff --git a/catavatar/lang/sv/strings.php b/catavatar/lang/sv/strings.php
deleted file mode 100644
index 1bdcc993..00000000
--- a/catavatar/lang/sv/strings.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_sv")) {
-function string_plural_select_sv($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Cat Avatar Settings'] = 'Inställningar för profilkatt';
-$a->strings['Use Cat as Avatar'] = 'Använd katt som profilbild';
-$a->strings['Reset to email Cat'] = 'Återställ till epost-katt';
diff --git a/catavatar/templates/settings.tpl b/catavatar/templates/settings.tpl
index 7659a9c8..19f5f0bb 100644
--- a/catavatar/templates/settings.tpl
+++ b/catavatar/templates/settings.tpl
@@ -1,2 +1,24 @@
-<p>{{$setrandomize}}</p>
-<p><img src="{{$basepath}}/catavatar/{{$uid}}?{{$uncache}}"></p>
+<span id="settings_catavatar_inflated" class="settings-block fakelink" 
+	style="{{if $postpost}}display: none;{{else}}display: block;{{/if}}" 
+	onclick="openClose('settings_catavatar_expanded'); openClose('settings_catavatar_inflated');">
+		<h3>{{$header}}</h3>
+</span>
+<div id="settings_catavatar_expanded" class="settings-block" 
+	style="{{if $postpost}}display: block;{{else}}display: none;{{/if}}">
+	<span class="fakelink" onclick="openClose('settings_catavatar_expanded'); openClose('settings_catavatar_inflated');">
+		<h3>{{$header}}</h3>
+	</span>
+	<img src="{{$basepath}}/catavatar/{{$uid}}?{{$uncache}}">
+	<p>Set default profile avatar or randomize the cat</p>
+	<div class="settings-submit-wrapper" >
+		<input type="submit" name="catavatar-usecat" 
+			class="btn btn-primary settings-submit" value="{{$usecat}}" />
+		
+		<div class="btn-group" role="group" aria-label="...">
+			<input type="submit" name="catavatar-morecat" 
+				class="btn btn-default settings-submit" value="{{$morecat}}" />
+			<input type="submit" name="catavatar-emailcat" {{if !$seed}}disabled{{/if}}
+				class="btn btn-default settings-submit" value="{{$emailcat}}" />
+		</div>
+	</div>
+</div>
diff --git a/circle_text/group_text.php b/circle_text/group_text.php
deleted file mode 100644
index b52cbc19..00000000
--- a/circle_text/group_text.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-/**
- * Name: Circle Text
- * Description: Disable images in circle edit menu
- * Version: 1.0
- * Author: Thomas Willingham <https://kakste.com/profile/beardyunixer>
- */
-
-use Friendica\Core\Hook;
-use Friendica\Core\Renderer;
-use Friendica\DI;
-
-function circle_text_install()
-{
-	Hook::register('addon_settings', __FILE__, 'circle_text_settings');
-	Hook::register('addon_settings_post', __FILE__, 'circle_text_settings_post');
-}
-
-/**
- *
- * Callback from the settings post function.
- * $post contains the $_POST array.
- * We will make sure we've got a valid user account
- * and if so set our configuration setting for this person.
- *
- */
-
-function circle_text_settings_post(array $post)
-{
-	if (!DI::userSession()->getLocalUserId() || empty($post['circle_text-submit'])) {
-		return;
-	}
-
-	DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'system', 'circle_edit_image_limit', intval($post['circle_text']));
-}
-
-
-/**
- *
- * Called from the Addon Setting form.
- * Add our own settings info to the page.
- *
- */
-
-function circle_text_settings(array &$data)
-{
-	if (!DI::userSession()->getLocalUserId()) {
-		return;
-	}
-
-	$enabled = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'system', 'circle_edit_image_limit') ??
-		DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'system', 'groupedit_image_limit');
-
-	$t    = Renderer::getMarkupTemplate('settings.tpl', 'addon/circle_text/');
-	$html = Renderer::replaceMacros($t, [
-		'$enabled' => ['circle_text', DI::l10n()->t('Use a text only (non-image) circle selector in the "circle edit" menu'), $enabled],
-	]);
-
-	$data = [
-		'addon' => 'circle_text',
-		'title' => DI::l10n()->t('Circle Text'),
-		'html'  => $html,
-	];
-}
diff --git a/circle_text/lang/C/messages.po b/circle_text/lang/C/messages.po
deleted file mode 100644
index 27c0e60e..00000000
--- a/circle_text/lang/C/messages.po
+++ /dev/null
@@ -1,26 +0,0 @@
-# ADDON circle_text
-# Copyright (C) 
-# This file is distributed under the same license as the Friendica circle_text addon package.
-# 
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-06-03 15:48-0400\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: group_text.php:56
-msgid "Use a text only (non-image) circle selector in the \"circle edit\" menu"
-msgstr ""
-
-#: group_text.php:61
-msgid "Circle Text"
-msgstr ""
diff --git a/circle_text/lang/ar/messages.po b/circle_text/lang/ar/messages.po
deleted file mode 100644
index cfe9bb63..00000000
--- a/circle_text/lang/ar/messages.po
+++ /dev/null
@@ -1,32 +0,0 @@
-# ADDON group_text
-# Copyright (C)
-# This file is distributed under the same license as the Friendica group_text addon package.
-# 
-# 
-# Translators:
-# Farida Khalaf <faridakhalaf@hotmail.com>, 2021
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2021-02-21 02:59+0000\n"
-"Last-Translator: Farida Khalaf <faridakhalaf@hotmail.com>\n"
-"Language-Team: Arabic (http://www.transifex.com/Friendica/friendica/language/ar/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ar\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-
-#: group_text.php:62
-msgid "Group Text"
-msgstr "نص المجموعة:"
-
-#: group_text.php:64
-msgid "Use a text only (non-image) group selector in the \"group edit\" menu"
-msgstr "استخدم محدد نصي للمجموعة فقط (غير مصور) في قائمة \"تعديل المجموعة\""
-
-#: group_text.php:70
-msgid "Save Settings"
-msgstr "حفظ الإعدادات"
diff --git a/circle_text/lang/ar/strings.php b/circle_text/lang/ar/strings.php
deleted file mode 100644
index 20e8496a..00000000
--- a/circle_text/lang/ar/strings.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_ar")) {
-function string_plural_select_ar($n){
-	$n = intval($n);
-	if ($n==0) { return 0; } else if ($n==1) { return 1; } else if ($n==2) { return 2; } else if ($n%100>=3 && $n%100<=10) { return 3; } else if ($n%100>=11 && $n%100<=99) { return 4; } else  { return 5; }
-}}
-$a->strings['Group Text'] = 'نص المجموعة:';
-$a->strings['Use a text only (non-image) group selector in the "group edit" menu'] = 'استخدم محدد نصي للمجموعة فقط (غير مصور) في قائمة "تعديل المجموعة"';
-$a->strings['Save Settings'] = 'حفظ الإعدادات';
diff --git a/circle_text/lang/ca/messages.po b/circle_text/lang/ca/messages.po
deleted file mode 100644
index 7081c0d7..00000000
--- a/circle_text/lang/ca/messages.po
+++ /dev/null
@@ -1,36 +0,0 @@
-# ADDON group_text
-# Copyright (C)
-# This file is distributed under the same license as the Friendica group_text addon package.
-# 
-# 
-# Translators:
-# Joan Bar <friendica@tutanota.com>, 2019
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-27 05:01-0500\n"
-"PO-Revision-Date: 2019-10-14 00:45+0000\n"
-"Last-Translator: Joan Bar <friendica@tutanota.com>\n"
-"Language-Team: Catalan (http://www.transifex.com/Friendica/friendica/language/ca/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ca\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: group_text.php:46
-msgid "Group Text settings updated."
-msgstr "La configuració del text del grup s'ha actualitzat."
-
-#: group_text.php:76
-msgid "Group Text"
-msgstr "Missatge del grup"
-
-#: group_text.php:78
-msgid "Use a text only (non-image) group selector in the \"group edit\" menu"
-msgstr "Utilitzeu un selector de grup de només text (que no sigui una imatge) al menú 'Edita grup'"
-
-#: group_text.php:84
-msgid "Submit"
-msgstr "sotmetre's"
diff --git a/circle_text/lang/ca/strings.php b/circle_text/lang/ca/strings.php
deleted file mode 100644
index b28db322..00000000
--- a/circle_text/lang/ca/strings.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_ca")) {
-function string_plural_select_ca($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Group Text settings updated.'] = 'La configuració del text del grup s\'ha actualitzat.';
-$a->strings['Group Text'] = 'Missatge del grup';
-$a->strings['Use a text only (non-image) group selector in the "group edit" menu'] = 'Utilitzeu un selector de grup de només text (que no sigui una imatge) al menú \'Edita grup\'';
-$a->strings['Submit'] = 'sotmetre\'s';
diff --git a/circle_text/lang/cs/messages.po b/circle_text/lang/cs/messages.po
deleted file mode 100644
index 8b56b630..00000000
--- a/circle_text/lang/cs/messages.po
+++ /dev/null
@@ -1,37 +0,0 @@
-# ADDON group_text
-# Copyright (C)
-# This file is distributed under the same license as the Friendica group_text addon package.
-# 
-# 
-# Translators:
-# Aditoo, 2018
-# michal_s <msupler@gmail.com>, 2014-2015
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-27 05:01-0500\n"
-"PO-Revision-Date: 2018-09-12 09:47+0000\n"
-"Last-Translator: Aditoo\n"
-"Language-Team: Czech (http://www.transifex.com/Friendica/friendica/language/cs/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: cs\n"
-"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
-
-#: group_text.php:46
-msgid "Group Text settings updated."
-msgstr "Nastavení Group Text aktualizována."
-
-#: group_text.php:76
-msgid "Group Text"
-msgstr "Skupinový text"
-
-#: group_text.php:78
-msgid "Use a text only (non-image) group selector in the \"group edit\" menu"
-msgstr "Použijte pouze textový (bezobrázkový) výběr skupiny v menu úpravy skupin."
-
-#: group_text.php:84
-msgid "Submit"
-msgstr "Odeslat"
diff --git a/circle_text/lang/cs/strings.php b/circle_text/lang/cs/strings.php
deleted file mode 100644
index 510453af..00000000
--- a/circle_text/lang/cs/strings.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_cs")) {
-function string_plural_select_cs($n){
-	$n = intval($n);
-	if (($n == 1 && $n % 1 == 0)) { return 0; } else if (($n >= 2 && $n <= 4 && $n % 1 == 0)) { return 1; } else if (($n % 1 != 0 )) { return 2; } else  { return 3; }
-}}
-$a->strings['Group Text settings updated.'] = 'Nastavení Group Text aktualizována.';
-$a->strings['Group Text'] = 'Skupinový text';
-$a->strings['Use a text only (non-image) group selector in the "group edit" menu'] = 'Použijte pouze textový (bezobrázkový) výběr skupiny v menu úpravy skupin.';
-$a->strings['Submit'] = 'Odeslat';
diff --git a/circle_text/lang/da-dk/messages.po b/circle_text/lang/da-dk/messages.po
deleted file mode 100644
index 9f1fbefa..00000000
--- a/circle_text/lang/da-dk/messages.po
+++ /dev/null
@@ -1,28 +0,0 @@
-# ADDON group_text
-# Copyright (C)
-# This file is distributed under the same license as the Friendica group_text addon package.
-# 
-# 
-# Translators:
-# Anton <dev@atjn.dk>, 2022
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:14-0500\n"
-"PO-Revision-Date: 2014-06-23 08:35+0000\n"
-"Last-Translator: Anton <dev@atjn.dk>, 2022\n"
-"Language-Team: Danish (Denmark) (http://www.transifex.com/Friendica/friendica/language/da_DK/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: da_DK\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: group_text.php:58
-msgid "Use a text only (non-image) group selector in the \"group edit\" menu"
-msgstr "Brug en kun-tekst (intet billede) gruppevælger i grupperedigeringsmenuen"
-
-#: group_text.php:63
-msgid "Group Text"
-msgstr "Gruppebesked"
diff --git a/circle_text/lang/da-dk/strings.php b/circle_text/lang/da-dk/strings.php
deleted file mode 100644
index 4306b769..00000000
--- a/circle_text/lang/da-dk/strings.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_da_dk")) {
-function string_plural_select_da_dk($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Use a text only (non-image) group selector in the "group edit" menu'] = 'Brug en kun-tekst (intet billede) gruppevælger i grupperedigeringsmenuen';
-$a->strings['Group Text'] = 'Gruppebesked';
diff --git a/circle_text/lang/de/messages.po b/circle_text/lang/de/messages.po
deleted file mode 100644
index e4e5d782..00000000
--- a/circle_text/lang/de/messages.po
+++ /dev/null
@@ -1,31 +0,0 @@
-# ADDON group_text
-# Copyright (C)
-# This file is distributed under the same license as the Friendica group_text addon package.
-# 
-# 
-# Translators:
-# Andreas H., 2014
-# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2014
-# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2021
-# Ulf Rompe <transifex.com@rompe.org>, 2019
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:14-0500\n"
-"PO-Revision-Date: 2014-06-23 08:35+0000\n"
-"Last-Translator: Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2021\n"
-"Language-Team: German (http://app.transifex.com/Friendica/friendica/language/de/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: de\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: group_text.php:58
-msgid "Use a text only (non-image) group selector in the \"group edit\" menu"
-msgstr "Beim Bearbeiten von Gruppen Text statt Bilder anzeigen"
-
-#: group_text.php:63
-msgid "Group Text"
-msgstr "Gruppen als Text"
diff --git a/circle_text/lang/de/strings.php b/circle_text/lang/de/strings.php
deleted file mode 100644
index 7a75b54d..00000000
--- a/circle_text/lang/de/strings.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_de")) {
-function string_plural_select_de($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Use a text only (non-image) group selector in the "group edit" menu'] = 'Beim Bearbeiten von Gruppen Text statt Bilder anzeigen';
-$a->strings['Group Text'] = 'Gruppen als Text';
diff --git a/circle_text/lang/eo/strings.php b/circle_text/lang/eo/strings.php
deleted file mode 100644
index 4e220fb0..00000000
--- a/circle_text/lang/eo/strings.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-$a->strings["Group Text"] = "";
-$a->strings["Use a text only (non-image) group selector in the \"group edit\" menu"] = "";
-$a->strings["Submit"] = "Sendi";
diff --git a/circle_text/lang/es/messages.po b/circle_text/lang/es/messages.po
deleted file mode 100644
index 5d6d4107..00000000
--- a/circle_text/lang/es/messages.po
+++ /dev/null
@@ -1,33 +0,0 @@
-# ADDON group_text
-# Copyright (C)
-# This file is distributed under the same license as the Friendica group_text addon package.
-# 
-# 
-# Translators:
-# Albert, 2016
-# Senex Petrovic <javierruizo@hotmail.com>, 2021
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2021-04-01 09:56+0000\n"
-"Last-Translator: Senex Petrovic <javierruizo@hotmail.com>\n"
-"Language-Team: Spanish (http://www.transifex.com/Friendica/friendica/language/es/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: es\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: group_text.php:62
-msgid "Group Text"
-msgstr "Grupo de Texto"
-
-#: group_text.php:64
-msgid "Use a text only (non-image) group selector in the \"group edit\" menu"
-msgstr "Utilice sólo el selector de grupo de texto (no imagen) en el menú \"edición de grupo\""
-
-#: group_text.php:70
-msgid "Save Settings"
-msgstr "Guardar Ajustes"
diff --git a/circle_text/lang/es/strings.php b/circle_text/lang/es/strings.php
deleted file mode 100644
index 632130fd..00000000
--- a/circle_text/lang/es/strings.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_es")) {
-function string_plural_select_es($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Group Text'] = 'Grupo de Texto';
-$a->strings['Use a text only (non-image) group selector in the "group edit" menu'] = 'Utilice sólo el selector de grupo de texto (no imagen) en el menú "edición de grupo"';
-$a->strings['Save Settings'] = 'Guardar Ajustes';
diff --git a/circle_text/lang/fi-fi/messages.po b/circle_text/lang/fi-fi/messages.po
deleted file mode 100644
index 2e3782fd..00000000
--- a/circle_text/lang/fi-fi/messages.po
+++ /dev/null
@@ -1,37 +0,0 @@
-# ADDON group_text
-# Copyright (C)
-# This file is distributed under the same license as the Friendica group_text addon package.
-# 
-# 
-# Translators:
-# Kris, 2018
-# Kris, 2018
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-27 05:01-0500\n"
-"PO-Revision-Date: 2018-04-08 15:51+0000\n"
-"Last-Translator: Kris\n"
-"Language-Team: Finnish (Finland) (http://www.transifex.com/Friendica/friendica/language/fi_FI/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: fi_FI\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: group_text.php:46
-msgid "Group Text settings updated."
-msgstr "Group Text -asetukset päivitetty."
-
-#: group_text.php:76
-msgid "Group Text"
-msgstr "Group Text"
-
-#: group_text.php:78
-msgid "Use a text only (non-image) group selector in the \"group edit\" menu"
-msgstr ""
-
-#: group_text.php:84
-msgid "Submit"
-msgstr "Lähetä"
diff --git a/circle_text/lang/fi-fi/strings.php b/circle_text/lang/fi-fi/strings.php
deleted file mode 100644
index 5bcd0ddc..00000000
--- a/circle_text/lang/fi-fi/strings.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_fi_fi")) {
-function string_plural_select_fi_fi($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Group Text settings updated.'] = 'Group Text -asetukset päivitetty.';
-$a->strings['Group Text'] = 'Group Text';
-$a->strings['Submit'] = 'Lähetä';
diff --git a/circle_text/lang/fr/messages.po b/circle_text/lang/fr/messages.po
deleted file mode 100644
index c076d697..00000000
--- a/circle_text/lang/fr/messages.po
+++ /dev/null
@@ -1,29 +0,0 @@
-# ADDON group_text
-# Copyright (C)
-# This file is distributed under the same license as the Friendica group_text addon package.
-# 
-# 
-# Translators:
-# bob lebonche <lebonche@tutanota.com>, 2021
-# Hypolite Petovan <hypolite@mrpetovan.com>, 2016
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:14-0500\n"
-"PO-Revision-Date: 2014-06-23 08:35+0000\n"
-"Last-Translator: bob lebonche <lebonche@tutanota.com>, 2021\n"
-"Language-Team: French (http://www.transifex.com/Friendica/friendica/language/fr/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: fr\n"
-"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
-
-#: group_text.php:58
-msgid "Use a text only (non-image) group selector in the \"group edit\" menu"
-msgstr "Utiliser uniquement un groupe de texte (pas d'image) dans le menu \"groupedit\""
-
-#: group_text.php:63
-msgid "Group Text"
-msgstr "Groupe de texte"
diff --git a/circle_text/lang/fr/strings.php b/circle_text/lang/fr/strings.php
deleted file mode 100644
index 657d7657..00000000
--- a/circle_text/lang/fr/strings.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_fr")) {
-function string_plural_select_fr($n){
-	$n = intval($n);
-	if (($n == 0 || $n == 1)) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
-}}
-$a->strings['Use a text only (non-image) group selector in the "group edit" menu'] = 'Utiliser uniquement un groupe de texte (pas d\'image) dans le menu "groupedit"';
-$a->strings['Group Text'] = 'Groupe de texte';
diff --git a/circle_text/lang/hu/messages.po b/circle_text/lang/hu/messages.po
deleted file mode 100644
index 2c4f19c9..00000000
--- a/circle_text/lang/hu/messages.po
+++ /dev/null
@@ -1,28 +0,0 @@
-# ADDON group_text
-# Copyright (C)
-# This file is distributed under the same license as the Friendica group_text addon package.
-# 
-# 
-# Translators:
-# Balázs Úr, 2020-2021
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:14-0500\n"
-"PO-Revision-Date: 2014-06-23 08:35+0000\n"
-"Last-Translator: Balázs Úr, 2020-2021\n"
-"Language-Team: Hungarian (http://www.transifex.com/Friendica/friendica/language/hu/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: hu\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: group_text.php:58
-msgid "Use a text only (non-image) group selector in the \"group edit\" menu"
-msgstr "Csak szöveges (kép nélküli) csoportválasztó használata a „csoportszerkesztés” menüben"
-
-#: group_text.php:63
-msgid "Group Text"
-msgstr "Csoportszöveg"
diff --git a/circle_text/lang/hu/strings.php b/circle_text/lang/hu/strings.php
deleted file mode 100644
index ac72f9e0..00000000
--- a/circle_text/lang/hu/strings.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_hu")) {
-function string_plural_select_hu($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Use a text only (non-image) group selector in the "group edit" menu'] = 'Csak szöveges (kép nélküli) csoportválasztó használata a „csoportszerkesztés” menüben';
-$a->strings['Group Text'] = 'Csoportszöveg';
diff --git a/circle_text/lang/is/strings.php b/circle_text/lang/is/strings.php
deleted file mode 100644
index d331b2f9..00000000
--- a/circle_text/lang/is/strings.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-$a->strings["Group Text"] = "";
-$a->strings["Use a text only (non-image) group selector in the \"group edit\" menu"] = "";
-$a->strings["Submit"] = "Senda inn";
diff --git a/circle_text/lang/it/messages.po b/circle_text/lang/it/messages.po
deleted file mode 100644
index daab3fb6..00000000
--- a/circle_text/lang/it/messages.po
+++ /dev/null
@@ -1,33 +0,0 @@
-# ADDON group_text
-# Copyright (C)
-# This file is distributed under the same license as the Friendica group_text addon package.
-# 
-# 
-# Translators:
-# fabrixxm <fabrix.xm@gmail.com>, 2014-2015
-# Sylke Vicious <silkevicious@gmail.com>, 2021
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2021-02-16 12:48+0000\n"
-"Last-Translator: Sylke Vicious <silkevicious@gmail.com>\n"
-"Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: it\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: group_text.php:62
-msgid "Group Text"
-msgstr "Editor Gruppi Testuale"
-
-#: group_text.php:64
-msgid "Use a text only (non-image) group selector in the \"group edit\" menu"
-msgstr "Usa un selettore testuale (senza immagini) nella pagina \"modifica gruppo\""
-
-#: group_text.php:70
-msgid "Save Settings"
-msgstr "Salva Impostazioni"
diff --git a/circle_text/lang/it/strings.php b/circle_text/lang/it/strings.php
deleted file mode 100644
index e52683e9..00000000
--- a/circle_text/lang/it/strings.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_it")) {
-function string_plural_select_it($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Group Text'] = 'Editor Gruppi Testuale';
-$a->strings['Use a text only (non-image) group selector in the "group edit" menu'] = 'Usa un selettore testuale (senza immagini) nella pagina "modifica gruppo"';
-$a->strings['Save Settings'] = 'Salva Impostazioni';
diff --git a/circle_text/lang/nb-no/strings.php b/circle_text/lang/nb-no/strings.php
deleted file mode 100644
index cd9bebd4..00000000
--- a/circle_text/lang/nb-no/strings.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-$a->strings["Group Text"] = "";
-$a->strings["Use a text only (non-image) group selector in the \"group edit\" menu"] = "";
-$a->strings["Submit"] = "Lagre";
diff --git a/circle_text/lang/nl/messages.po b/circle_text/lang/nl/messages.po
deleted file mode 100644
index 56b5aae0..00000000
--- a/circle_text/lang/nl/messages.po
+++ /dev/null
@@ -1,36 +0,0 @@
-# ADDON group_text
-# Copyright (C)
-# This file is distributed under the same license as the Friendica group_text addon package.
-# 
-# 
-# Translators:
-# Jeroen De Meerleer <me@jeroened.be>, 2018
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-27 05:01-0500\n"
-"PO-Revision-Date: 2018-08-24 13:48+0000\n"
-"Last-Translator: Jeroen De Meerleer <me@jeroened.be>\n"
-"Language-Team: Dutch (http://www.transifex.com/Friendica/friendica/language/nl/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: nl\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: group_text.php:46
-msgid "Group Text settings updated."
-msgstr "Groupsberichten instellingen opgeslagen"
-
-#: group_text.php:76
-msgid "Group Text"
-msgstr "Groepsbericht"
-
-#: group_text.php:78
-msgid "Use a text only (non-image) group selector in the \"group edit\" menu"
-msgstr ""
-
-#: group_text.php:84
-msgid "Submit"
-msgstr ""
diff --git a/circle_text/lang/nl/strings.php b/circle_text/lang/nl/strings.php
deleted file mode 100644
index ba3cb3ec..00000000
--- a/circle_text/lang/nl/strings.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_nl")) {
-function string_plural_select_nl($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Group Text settings updated.'] = 'Groupsberichten instellingen opgeslagen';
-$a->strings['Group Text'] = 'Groepsbericht';
diff --git a/circle_text/lang/pl/messages.po b/circle_text/lang/pl/messages.po
deleted file mode 100644
index a1d6a3c8..00000000
--- a/circle_text/lang/pl/messages.po
+++ /dev/null
@@ -1,28 +0,0 @@
-# ADDON group_text
-# Copyright (C)
-# This file is distributed under the same license as the Friendica group_text addon package.
-# 
-# 
-# Translators:
-# Waldemar Stoczkowski, 2018
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:14-0500\n"
-"PO-Revision-Date: 2014-06-23 08:35+0000\n"
-"Last-Translator: Waldemar Stoczkowski, 2018\n"
-"Language-Team: Polish (http://www.transifex.com/Friendica/friendica/language/pl/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: pl\n"
-"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
-
-#: group_text.php:58
-msgid "Use a text only (non-image) group selector in the \"group edit\" menu"
-msgstr "Użyj tylko tekst (bez obrazu) selektor grupy w menu \"Edycja grupy\""
-
-#: group_text.php:63
-msgid "Group Text"
-msgstr "Grupuj tekst"
diff --git a/circle_text/lang/pl/strings.php b/circle_text/lang/pl/strings.php
deleted file mode 100644
index 96157c99..00000000
--- a/circle_text/lang/pl/strings.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_pl")) {
-function string_plural_select_pl($n){
-	$n = intval($n);
-	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
-}}
-$a->strings['Use a text only (non-image) group selector in the "group edit" menu'] = 'Użyj tylko tekst (bez obrazu) selektor grupy w menu "Edycja grupy"';
-$a->strings['Group Text'] = 'Grupuj tekst';
diff --git a/circle_text/lang/pt-br/strings.php b/circle_text/lang/pt-br/strings.php
deleted file mode 100644
index 4579a5b1..00000000
--- a/circle_text/lang/pt-br/strings.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-$a->strings["Group Text"] = "";
-$a->strings["Use a text only (non-image) group selector in the \"group edit\" menu"] = "";
-$a->strings["Submit"] = "Enviar";
diff --git a/circle_text/lang/ro/messages.po b/circle_text/lang/ro/messages.po
deleted file mode 100644
index c912f113..00000000
--- a/circle_text/lang/ro/messages.po
+++ /dev/null
@@ -1,36 +0,0 @@
-# ADDON group_text
-# Copyright (C)
-# This file is distributed under the same license as the Friendica group_text addon package.
-# 
-# 
-# Translators:
-# Doru  DEACONU <dumitrudeaconu@yahoo.com>, 2014
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-27 05:01-0500\n"
-"PO-Revision-Date: 2014-11-27 14:15+0000\n"
-"Last-Translator: Doru  DEACONU <dumitrudeaconu@yahoo.com>\n"
-"Language-Team: Romanian (Romania) (http://www.transifex.com/projects/p/friendica/language/ro_RO/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ro_RO\n"
-"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
-
-#: group_text.php:46
-msgid "Group Text settings updated."
-msgstr "Configurările Text Grup, au fost actualizate."
-
-#: group_text.php:76
-msgid "Group Text"
-msgstr "Text Grup"
-
-#: group_text.php:78
-msgid "Use a text only (non-image) group selector in the \"group edit\" menu"
-msgstr "Folosiți în meniul \"editare grup\" un selector de grup strict textual (fără-imagine)"
-
-#: group_text.php:84
-msgid "Submit"
-msgstr "Trimite"
diff --git a/circle_text/lang/ro/strings.php b/circle_text/lang/ro/strings.php
deleted file mode 100644
index 892ffc68..00000000
--- a/circle_text/lang/ro/strings.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_ro")) {
-function string_plural_select_ro($n){
-	$n = intval($n);
-	if ($n==1) { return 0; } else if ((($n%100>19)||(($n%100==0)&&($n!=0)))) { return 2; } else  { return 1; }
-}}
-$a->strings['Group Text settings updated.'] = 'Configurările Text Grup, au fost actualizate.';
-$a->strings['Group Text'] = 'Text Grup';
-$a->strings['Use a text only (non-image) group selector in the "group edit" menu'] = 'Folosiți în meniul "editare grup" un selector de grup strict textual (fără-imagine)';
-$a->strings['Submit'] = 'Trimite';
diff --git a/circle_text/lang/ru/messages.po b/circle_text/lang/ru/messages.po
deleted file mode 100644
index 05a25367..00000000
--- a/circle_text/lang/ru/messages.po
+++ /dev/null
@@ -1,36 +0,0 @@
-# ADDON group_text
-# Copyright (C)
-# This file is distributed under the same license as the Friendica group_text addon package.
-# 
-# 
-# Translators:
-# Stanislav N. <pztrn@pztrn.name>, 2017
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-27 05:01-0500\n"
-"PO-Revision-Date: 2017-04-08 17:26+0000\n"
-"Last-Translator: Stanislav N. <pztrn@pztrn.name>\n"
-"Language-Team: Russian (http://www.transifex.com/Friendica/friendica/language/ru/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ru\n"
-"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
-
-#: group_text.php:46
-msgid "Group Text settings updated."
-msgstr "Настройки Group Text обновлены."
-
-#: group_text.php:76
-msgid "Group Text"
-msgstr "Group Text"
-
-#: group_text.php:78
-msgid "Use a text only (non-image) group selector in the \"group edit\" menu"
-msgstr "Используйте текстовый (не изображение) селектор группы в режиме редактирования группы"
-
-#: group_text.php:84
-msgid "Submit"
-msgstr "Добавить"
diff --git a/circle_text/lang/ru/strings.php b/circle_text/lang/ru/strings.php
deleted file mode 100644
index 0f74e7ca..00000000
--- a/circle_text/lang/ru/strings.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_ru")) {
-function string_plural_select_ru($n){
-	$n = intval($n);
-	if ($n%10==1 && $n%100!=11) { return 0; } else if ($n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14)) { return 1; } else if ($n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)) { return 2; } else  { return 3; }
-}}
-$a->strings['Group Text settings updated.'] = 'Настройки Group Text обновлены.';
-$a->strings['Group Text'] = 'Group Text';
-$a->strings['Use a text only (non-image) group selector in the "group edit" menu'] = 'Используйте текстовый (не изображение) селектор группы в режиме редактирования группы';
-$a->strings['Submit'] = 'Добавить';
diff --git a/circle_text/lang/sv/messages.po b/circle_text/lang/sv/messages.po
deleted file mode 100644
index 8ddc1806..00000000
--- a/circle_text/lang/sv/messages.po
+++ /dev/null
@@ -1,28 +0,0 @@
-# ADDON group_text
-# Copyright (C)
-# This file is distributed under the same license as the Friendica group_text addon package.
-# 
-# 
-# Translators:
-# Kristoffer Grundström <lovaren@gmail.com>, 2022
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:14-0500\n"
-"PO-Revision-Date: 2022-01-16 00:35+0000\n"
-"Last-Translator: Kristoffer Grundström <lovaren@gmail.com>\n"
-"Language-Team: Swedish (http://www.transifex.com/Friendica/friendica/language/sv/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: sv\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: group_text.php:58
-msgid "Use a text only (non-image) group selector in the \"group edit\" menu"
-msgstr ""
-
-#: group_text.php:63
-msgid "Group Text"
-msgstr "Grupptext"
diff --git a/circle_text/lang/sv/strings.php b/circle_text/lang/sv/strings.php
deleted file mode 100644
index 5d5e98db..00000000
--- a/circle_text/lang/sv/strings.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_sv")) {
-function string_plural_select_sv($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Group Text'] = 'Grupptext';
diff --git a/circle_text/lang/zh-cn/strings.php b/circle_text/lang/zh-cn/strings.php
deleted file mode 100644
index a7b37bf2..00000000
--- a/circle_text/lang/zh-cn/strings.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-$a->strings["Group Text settings updated."] = "组正文设置更新了。";
-$a->strings["Group Text"] = "组正文";
-$a->strings["Use a text only (non-image) group selector in the \"group edit\" menu"] = "用光正文（无图片）组选择器在「组编辑」单";
-$a->strings["Submit"] = "提交";
diff --git a/circle_text/templates/settings.tpl b/circle_text/templates/settings.tpl
deleted file mode 100644
index 2f3f4ce7..00000000
--- a/circle_text/templates/settings.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{{include file="field_checkbox.tpl" field=$enabled}}
diff --git a/cld/README.md b/cld/README.md
deleted file mode 100644
index 933dbcee..00000000
--- a/cld/README.md
+++ /dev/null
@@ -1,85 +0,0 @@
-Compact Language Detector
-===
-CLD2 is an advanced language dectection library with a high reliability.
-
-This addon depends on the CLD PHP module which is not included in any Linux distribution.
-It needs to be built and installed by hand, which is not totally straightforward.
-
-Prerequisite
----
-To be able to build the extension, you need the CLD module and the files for the PHP module development.
-On Debian you install the packages php-dev, libcld2-dev and libcld2-0.
-Make sure to have installed the correct PHP version.
-Means: When you have got both PHP 8.0 and 8.2 on your system, you have to install php8.0-dev as well.
-
-Installation
----
-The original PHP extension is https://github.com/fntlnz/cld2-php-ext.
-However, it doesn't support PHP8.
-So https://github.com/hiteule/cld2-php-ext/tree/support-php8 has to be used.
-
-Download the source code:
-```
-wget https://github.com/hiteule/cld2-php-ext/archive/refs/heads/support-php8.zip
-```
-
-Unzip it:
-```
-unzip support-php8.zip
-```
-
-Change into the folder:
-```
-cd cld2-php-ext-support-php8/
-```
-
-Configure for the PHP Api version:
-```
-phpize
-```
-(if you have got several PHP versions on your system, execute the command with the version that you run Friendica with, e.g. `phpize8.0`)
-
-Create the Makefile:
-```
-./configure --with-cld2=/usr/include/cld2
-```
-
-Have a look at the line `checking for PHP includes`.
-When the output (for example `/usr/include/php/20220829` doesn't match the API version that you got from `phpize`, then you have to change all the version codes in your `Makefile` afterwards)
-
-Create the module:
-```
-make -j
-```
-
-Install it:
-```
-sudo make install
-```
-
-Change to the folder with the available modules. When you use PHP 8.2 on Debian it is:
-```
-cd /etc/php/8.2/mods-available
-```
-
-Create the file `cld2.ini` with this content:
-```
-; configuration for php cld2 module
-; priority=20
-extension=cld2.so
-```
-
-Enable the module for all versions and all sapi:
-```
-phpenmod -v ALL -s ALL cld2
-```
-
-Then restart the apache or fpm (or whatever you use) to load the changed configuration.
-
-Call `/admin/phpinfo` on your webserver.
-You then see the PHP Info.
-Search for "cld2".
-The module is installed, when you find it here.
-**Only proceed when the module is installed**
-
-Now you can enable the addon.
\ No newline at end of file
diff --git a/cld/cld.php b/cld/cld.php
deleted file mode 100644
index 5ca4c932..00000000
--- a/cld/cld.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-/**
- * Name: Compact Language Detector
- * Description: Improved language detection
- * Version: 0.1
- * Author: Michael Vogel <heluecht@pirati.ca>
- */
-
-use Friendica\Core\Hook;
-use Friendica\Core\Logger;
-use Friendica\DI;
-
-function cld_install()
-{
-	Hook::register('detect_languages', __FILE__, 'cld_detect_languages');
-}
-
-function cld_detect_languages(array &$data)
-{
-	if (!in_array('cld2', get_loaded_extensions())) {
-		Logger::warning('CLD2 is not installed.');
-		return;
-	}
-
-	$cld2 = new \CLD2Detector();
-
-	$cld2->setEncodingHint(CLD2Encoding::UTF8); // optional, hints about text encoding
-	$cld2->setPlainText(true);
-
-	$result = $cld2->detect($data['text']);
-
-	if ($data['detected']) {
-		$original = array_key_first($data['detected']);
-	} else {
-		$original = '';
-	}
-
-	$detected = DI::l10n()->toISO6391($result['language_code']);
-
-	// languages that aren't supported via the base language detection or tend to false detections
-	if ((strlen($detected) == 3) || in_array($detected, ['ht', 'kk', 'ku', 'ky', 'lg', 'mg', 'mk', 'mt', 'ny', 'rw', 'st', 'su', 'tg', 'ts', 'xx'])) {
-		return;
-	}
-
-	if (!$result['is_reliable']) {
-		Logger::debug('Unreliable detection', ['uri-id' => $data['uri-id'], 'original' => $original, 'detected' => $detected, 'name' => $result['language_name'], 'probability' => $result['language_probability'], 'text' => $data['text']]);
-		if (($original == $detected) && ($data['detected'][$original] < $result['language_probability'] / 100)) {
-			$data['detected'][$original] = $result['language_probability'] / 100;
-		}
-		return;
-	}
-
-	$available = array_keys(DI::l10n()->getLanguageCodes());
-
-	if (!in_array($detected, $available)) {
-		Logger::debug('Unsupported language', ['uri-id' => $data['uri-id'], 'original' => $original, 'detected' => $detected, 'name' => $result['language_name'], 'probability' => $result['language_probability'], 'text' => $data['text']]);
-		return;
-	}
-
-	if ($original != $detected) {
-		Logger::debug('Detected different language', ['uri-id' => $data['uri-id'], 'original' => $original, 'detected' => $detected, 'name' => $result['language_name'], 'probability' => $result['language_probability'], 'text' => $data['text']]);
-	}
-
-	$length = count($data['detected']);
-	if ($length > 0) {
-		unset($data['detected'][$detected]);
-		$data['detected'] = array_merge([$detected => $result['language_probability'] / 100], array_slice($data['detected'], 0, $length - 1));
-	} else {
-		$data['detected'] = [$detected => $result['language_probability'] / 100];
-	}
-}
diff --git a/convert/convert.php b/convert/convert.php
index 57ce6ea8..e9563741 100644
--- a/convert/convert.php
+++ b/convert/convert.php
@@ -1,219 +1,229 @@
-<?php
-/**
- * Name: Converter App
- * Description: Unit converter application
- * Version: 1.0
- * Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
- */
-
-use Friendica\App;
-use Friendica\Core\Hook;
-
-function convert_install() {
-	Hook::register('app_menu', 'addon/convert/convert.php', 'convert_app_menu');
-}
-
-function convert_app_menu(array &$b)
-{
-	$b['app_menu'][] = '<div class="app-title"><a href="convert">Units Conversion</a></div>';
-}
-
-
-function convert_module() {}
-
-function convert_content() {
-	// @TODO UnitConverter uses a deprecated constructor with the class' name
-	// @TODO Let's one day rewrite this to a modern composer package
-	include 'UnitConvertor.php';
-
-	class TP_Converter extends UnitConvertor
-	{
-		public function __construct(string $lang = 'en')
-		{
-			if ($lang == 'en' ) {
-				$dec_point = '.';
-				$thousand_sep = ',';
-			} else {
-				$dec_point = '.';
-				$thousand_sep = "'";
-			}
-
-			parent::UnitConvertor($dec_point, $thousand_sep );
-		}
-
-		private function findBaseUnit($from, $to)
-		{
-			while (list($skey, $sval) = each($this->bases)) {
-				if ($skey == $from || $to == $skey || in_array($to, $sval) || in_array($from, $sval)) {
-					return $skey;
-				}
-			}
-
-			return false;
-		}
-
-		public function getTable(int $value, $from_unit, $to_unit, $precision): string
-		{
-			$string = '';
-
-			if ($base_unit = $this->findBaseUnit($from_unit, $to_unit)) {
-				// A baseunit was found now lets convert from -> $base_unit
-				$cell ['value'] = $this->convert($value, $from_unit, $base_unit, $precision) . ' ' . $base_unit;
-				$cell ['class'] = ($base_unit == $from_unit || $base_unit == $to_unit) ? 'framedred' : '';
-				$cells[] = $cell;
-
-				// We now have the base unit and value now lets produce the table;
-				while (list($key, $val) = each($this->bases[$base_unit])) {
-					$cell ['value'] = $this->convert($value, $from_unit, $val, $precision) . ' ' . $val;
-					$cell ['class']	= ($val == $from_unit || $val == $to_unit) ? 'framedred' : '';
-					$cells[] = $cell;
-				}
-
-				$cc = count($cells);
-				$string = "<table class=\"framed grayish\" border=\"1\" cellpadding=\"5\" width=\"80%\" align=\"center\"><tr>";
-				$string .= "<td rowspan=\"$cc\" align=\"center\">$value $from_unit</td>";
-				$i = 0;
-				foreach ($cells as $cell) {
-					if ($i == 0) {
-						$string .= "<td class=\"" . $cell['class'] . "\">" . $cell['value'] . "</td>";
-						$i++;
-					} else {
-						$string .= "</tr><tr><td class=\"" . $cell['class'] . "\">" . $cell['value'] . "</td>";
-					}
-				}
-				$string .= "</tr></table>";
-			}
-
-			return $string;
-		}
-	}
-
-	$conv = new TP_Converter('en');
-
-	$conversions = [
-		'Temperature' => ['base'  => 'Celsius',
-			'conv' => [
-				'Fahrenheit' => ['ratio' => 1.8, 'offset' => 32],
-				'Kelvin' => ['ratio' => 1, 'offset' => 273],
-				'Reaumur' => 0.8
-			]
-		],
-		'Weight'  =>  ['base'  => 'kg',
-			'conv' => [
-				'g' => 1000,
-				'mg' => 1000000,
-				't' => 0.001,
-				'grain' => 15432,
-				'oz' => 35.274,
-				'lb' => 2.2046,
-				'cwt(UK)'	 =>  0.019684,
-				'cwt(US)'	 =>  0.022046,
-				'ton (US)'	 =>  0.0011023,
-				'ton (UK)'	 =>  0.0009842
-			]
-		],
-		'Distance'  =>  ['base'  => 'km',
-			'conv' => [
-				'm' => 1000,
-				'dm' => 10000,
-				'cm' => 100000,
-				'mm' => 1000000,
-		 		'mile' => 0.62137,
-				'naut.mile' => 0.53996,
-		 		'inch(es)' => 39370,
-				'ft' => 3280.8,
-				'yd' => 1093.6,
-				'furlong' => 4.970969537898672,
-				'fathom' => 546.8066491688539
-			]
-		],
-		'Area'  =>  ['base'  => 'km 2',
-			'conv' => [
-				'ha' => 100,
-				'acre' => 247.105,
-				'm 2' => pow(1000,2),
-				'dm 2' => pow(10000,2),
-				'cm 2' => pow(100000,2),
-				'mm 2' => pow(1000000,2),
-				'mile 2' => pow(0.62137,2),
-				'naut.miles 2' => pow(0.53996,2),
-		 		'in 2' => pow(39370,2),
-				'ft 2' => pow(3280.8,2),
-				'yd 2' => pow(1093.6,2),
-			]
-		],
-		'Volume'  =>  ['base'  => 'm 3',
-			'conv' => [
-				'in 3' => 61023.6,
-				'ft 3' => 35.315,
-				'cm 3' => pow(10,6),
-		 		'dm 3' => 1000,
-				'litre' => 1000,
-				'hl' => 10,
-				'yd 3' => 1.30795,
-		 		'gal(US)' => 264.172,
-				'gal(UK)' => 219.969,
-				'pint'  =>  2113.376,
-				'quart'  =>  1056.688,
-				'cup'  =>  4266.753,
-				'fl oz'  =>  33814.02,
-				'tablespoon'  =>  67628.04,
-				'teaspoon'  =>  202884.1,
-				'pt (UK)' => 1000/0.56826,
-				'barrel petroleum' => 1000/158.99,
-				'Register Tons' => 2.832,
-				'Ocean Tons' => 1.1327
-			]
-		],
-		'Speed'	 => ['base'  => 'kmph',
-			'conv' => [
-				'mps' => 0.0001726031,
-				'milesph' => 0.62137,
-				'knots' => 0.53996,
-				'mach STP' => 0.0008380431,
-				'c (warp)' => 9.265669e-10
-			]
-		]
-	];
-
-	while (list($key, $val) = each($conversions)) {
-		$conv->addConversion($val['base'], $val['conv']);
-		$list[$key][] = $val['base'];
-		while (list($ukey, $uval) = each($val['conv'])) {
-			$list[$key][] = $ukey;
-		}
-	}
-
-	$o .= '<h3>Unit Conversions</h3>';
-
-	if (isset($_POST['from_unit']) && isset($_POST['value'])) {
-		$o .= ($conv->getTable(intval($_POST['value']), $_POST['from_unit'], $_POST['to_unit'], 5)) . '</p>';
-	} else {
-		$o .= '<p>Select:</p>';
-	}
-
-	if (isset($_POST['value'])) {
-		$value = $_POST['value'];
-	} else {
-		$value = '';
-	}
-
-	$o .= '<form action="convert" method="post" name="conversion">';
-	$o .= '<input name="value" type="text" id="value" value="' . $value . '" size="10" maxlength="10" />';
-	$o .= '<select name="from_unit" size="12">';
-
-	reset($list);
-	while(list($key, $val) = each($list)) {
-		$o .=  "\n\t<optgroup label=\"$key\">";
-		while(list($ukey, $uval) = each($val)) {
-			$selected = (($uval == $_POST['from_unit']) ? ' selected="selected" ' : '');
-			$o .=  "\n\t\t<option value=\"$uval\" $selected >$uval</option>";
-		}
-		$o .= "\n\t</optgroup>";
-	}
-
-	$o .= '</select>';
-	$o .= '<input type="submit" name="Submit" value="Submit" /></form>';
-
-	return $o;
-}
+<?php
+/**
+ * Name: Converter App
+ * Description: Unit converter application
+ * Version: 1.0
+ * Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
+ */
+use Friendica\Core\Hook;
+
+function convert_install() {
+	Hook::register('app_menu', 'addon/convert/convert.php', 'convert_app_menu');
+}
+
+function convert_uninstall() {
+	Hook::unregister('app_menu', 'addon/convert/convert.php', 'convert_app_menu');
+}
+
+function convert_app_menu($a,&$b) {
+	$b['app_menu'][] = '<div class="app-title"><a href="convert">Units Conversion</a></div>';
+}
+
+
+function convert_module() {}
+
+
+
+
+
+
+
+function convert_content($app) {
+
+include("UnitConvertor.php");
+
+ class TP_Converter extends UnitConvertor {
+	function TP_Converter($lang = "en")
+	{
+		if ($lang != 'en' ) {
+			$dec_point = '.'; $thousand_sep = "'";
+		} else {
+			$dec_point = '.'; $thousand_sep = ",";
+		}
+
+		$this->UnitConvertor($dec_point , $thousand_sep );
+
+	} // end func UnitConvertor
+
+	function find_base_unit($from,$to) {
+		while (list($skey,$sval) = each($this->bases)) {
+				if ($skey == $from || $to == $skey || in_array($to,$sval) || in_array($from,$sval)) {
+					return $skey;
+				}
+		}
+		return false;
+	}
+
+	function getTable($value, $from_unit, $to_unit, $precision) {
+
+		if ($base_unit = $this->find_base_unit($from_unit,$to_unit)) {
+
+			// A baseunit was found now lets convert from -> $base_unit
+
+				$cell ['value'] = $this->convert($value, $from_unit, $base_unit, $precision)." ".$base_unit;
+				$cell ['class']	= ($base_unit == $from_unit || $base_unit == $to_unit) ? "framedred": "";
+				$cells[] = $cell;
+			// We now have the base unit and value now lets produce the table;
+			while (list($key,$val) = each($this->bases[$base_unit])) {
+				$cell ['value'] = $this->convert($value, $from_unit, $val, $precision)." ".$val;
+				$cell ['class']	= ($val == $from_unit || $val == $to_unit) ? "framedred": "";
+				$cells[] = $cell;
+			}
+
+			$cc = count($cells);
+			$string = "<table class=\"framed grayish\" border=\"1\" cellpadding=\"5\" width=\"80%\" align=\"center\"><tr>";
+			$string .= "<td rowspan=\"$cc\" align=\"center\">$value $from_unit</td>";
+			$i=0;
+			foreach ($cells as $cell) {
+				if ($i==0) {
+					$string .= "<td class=\"".$cell['class']."\">".$cell['value']."</td>";
+					$i++;
+				} else {
+					$string .= "</tr><tr><td class=\"".$cell['class']."\">".$cell['value']."</td>";
+				}
+			}
+			$string .= "</tr></table>";
+			return $string;
+		}
+
+	}
+}
+
+
+$conv = new TP_Converter('en');
+
+
+$conversions = [
+	'Temperature'=>['base' =>'Celsius',
+		'conv'=>[
+			'Fahrenheit'=>['ratio'=>1.8, 'offset'=>32],
+			'Kelvin'=>['ratio'=>1, 'offset'=>273],
+			'Reaumur'=>0.8
+		]
+	],
+	'Weight' => ['base' =>'kg',
+		'conv'=>[
+			'g'=>1000,
+			'mg'=>1000000,
+			't'=>0.001,
+			'grain'=>15432,
+			'oz'=>35.274,
+			'lb'=>2.2046,
+			'cwt(UK)'	=> 0.019684,
+			'cwt(US)'	=> 0.022046,
+			'ton (US)'	=> 0.0011023,
+			'ton (UK)'	=> 0.0009842
+		]
+	],
+	'Distance' => ['base' =>'km',
+		'conv'=>[
+			'm'=>1000,
+			'dm'=>10000,
+			'cm'=>100000,
+			'mm'=>1000000,
+	 		'mile'=>0.62137,
+			'naut.mile'=>0.53996,
+	 		'inch(es)'=>39370,
+			'ft'=>3280.8,
+			'yd'=>1093.6,
+			'furlong'=>4.970969537898672,
+			'fathom'=>546.8066491688539
+		]
+	],
+	'Area' => ['base' =>'km 2',
+		'conv'=>[
+			'ha'=>100,
+			'acre'=>247.105,
+			'm 2'=>pow(1000,2),
+			'dm 2'=>pow(10000,2),
+			'cm 2'=>pow(100000,2),
+			'mm 2'=>pow(1000000,2),
+			'mile 2'=>pow(0.62137,2),
+			'naut.miles 2'=>pow(0.53996,2),
+	 		'in 2'=>pow(39370,2),
+			'ft 2'=>pow(3280.8,2),
+			'yd 2'=>pow(1093.6,2),
+		]
+	],
+	'Volume' => ['base' =>'m 3',
+		'conv'=>[
+			'in 3'=>61023.6,
+			'ft 3'=>35.315,
+			'cm 3'=>pow(10,6),
+	 		'dm 3'=>1000,
+			'litre'=>1000,
+			'hl'=>10,
+			'yd 3'=>1.30795,
+	 		'gal(US)'=>264.172,
+			'gal(UK)'=>219.969,
+			'pint' => 2113.376,
+			'quart' => 1056.688,
+			'cup' => 4266.753,
+			'fl oz' => 33814.02,
+			'tablespoon' => 67628.04,
+			'teaspoon' => 202884.1,
+			'pt (UK)'=>1000/0.56826,
+			'barrel petroleum'=>1000/158.99,
+			'Register Tons'=>2.832,
+			'Ocean Tons'=>1.1327
+		]
+	],
+	'Speed'	=>['base' =>'kmph',
+		'conv'=>[
+			'mps'=>0.0001726031,
+			'milesph'=>0.62137,
+			'knots'=>0.53996,
+			'mach STP'=>0.0008380431,
+			'c (warp)'=>9.265669e-10
+		]
+	]
+];
+
+
+while (list($key,$val) = each($conversions)) {
+	$conv->addConversion($val['base'], $val['conv']);
+	$list[$key][] = $val['base'];
+	while (list($ukey,$uval) = each($val['conv'])) {
+		$list[$key][] = $ukey;
+	}
+}
+
+  $o .= '<h3>Unit Conversions</h3>';
+
+
+	if (isset($_POST['from_unit']) && isset($_POST['value'])) {
+    	$_POST['value'] = $_POST['value'] + 0;
+
+
+		$o .= ($conv->getTable($_POST['value'], $_POST['from_unit'], $_POST['to_unit'], 5))."</p>";
+	} else {
+		$o .= "<p>Select:</p>";
+	}
+
+	if(isset($_POST['value']))
+		$value = $_POST['value'];
+	else
+		$value = '';
+
+	$o .= '<form action="convert" method="post" name="conversion">';
+    $o .= '<input name="value" type="text" id="value" value="' . $value . '" size="10" maxlength="10" />';
+    $o .= '<select name="from_unit" size="12">';
+
+
+
+	reset($list);
+	while(list($key,$val) = each($list)) {
+		$o .=  "\n\t<optgroup label=\"$key\">";
+		while(list($ukey,$uval) = each($val)) {
+			$selected = (($uval == $_POST['from_unit']) ? ' selected="selected" ' : '');
+			$o .=  "\n\t\t<option value=\"$uval\" $selected >$uval</option>";
+		}
+		$o .= "\n\t</optgroup>";
+	}
+
+	$o .= '</select>';
+
+    $o .= '<input type="submit" name="Submit" value="Submit" /></form>';
+
+	return $o;
+}
diff --git a/convert/lang/C/messages.po b/convert/lang/C/messages.po
new file mode 100644
index 00000000..e69de29b
diff --git a/cookienotice/cookienotice.php b/cookienotice/cookienotice.php
index 2bd6f9b1..097f3c25 100644
--- a/cookienotice/cookienotice.php
+++ b/cookienotice/cookienotice.php
@@ -8,9 +8,10 @@
  */
 
 use Friendica\App;
+use Friendica\Core\Config;
 use Friendica\Core\Hook;
+use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
-use Friendica\DI;
 
 /**
  * cookienotice_install
@@ -28,25 +29,26 @@ function cookienotice_install()
  * cookienotice_addon_admin
  * creates the admins config panel
  *
+ * @param App    $a
  * @param string $s The existing config panel html so far
  *
  * @return void
  */
-function cookienotice_addon_admin(&$s)
+function cookienotice_addon_admin(App $a, &$s)
 {
-	if (!DI::userSession()->isSiteAdmin()) {
+	if (!is_site_admin()) {
 		return;
 	}
 
-	$text = DI::config()->get('cookienotice', 'text', DI::l10n()->t('This website uses cookies. If you continue browsing this website, you agree to the usage of cookies.'));
-	$oktext = DI::config()->get('cookienotice', 'oktext', DI::l10n()->t('OK'));
+	$text = Config::get('cookienotice', 'text', L10n::t('This website uses cookies. If you continue browsing this website, you agree to the usage of cookies.'));
+	$oktext = Config::get('cookienotice', 'oktext', L10n::t('OK'));
 
-	$t = Renderer::getMarkupTemplate('admin.tpl', 'addon/cookienotice/');
+	$t = Renderer::getMarkupTemplate('admin.tpl', __DIR__);
 	$s .= Renderer::replaceMacros($t, [
-		'$description' => DI::l10n()->t('<b>Configure your cookie usage notice.</b> It should just be a notice, saying that the website uses cookies. It is shown as long as a user didnt confirm clicking the OK button.'),
-		'$text' => ['cookienotice-text', DI::l10n()->t('Cookie Usage Notice'), $text],
-		'$oktext' => ['cookienotice-oktext', DI::l10n()->t('OK Button Text'), $oktext],
-		'$submit' => DI::l10n()->t('Save Settings')
+		'$description' => L10n::t('<b>Configure your cookie usage notice.</b> It should just be a notice, saying that the website uses cookies. It is shown as long as a user didnt confirm clicking the OK button.'),
+		'$text' => ['cookienotice-text', L10n::t('Cookie Usage Notice'), $text],
+		'$oktext' => ['cookienotice-oktext', L10n::t('OK Button Text'), $oktext],
+		'$submit' => L10n::t('Save Settings')
 	]);
 
 	return;
@@ -56,17 +58,20 @@ function cookienotice_addon_admin(&$s)
  * cookienotice_addon_admin_post
  * handles the post request from the admin panel
  *
+ * @param App    $a
+ *
  * @return void
  */
-function cookienotice_addon_admin_post()
+function cookienotice_addon_admin_post(App $a)
 {
-	if (!DI::userSession()->isSiteAdmin()) {
+	if (!is_site_admin()) {
 		return;
 	}
 
 	if ($_POST['cookienotice-submit']) {
-		DI::config()->set('cookienotice', 'text', trim(strip_tags($_POST['cookienotice-text'])));
-		DI::config()->set('cookienotice', 'oktext', trim(strip_tags($_POST['cookienotice-oktext'])));
+		Config::set('cookienotice', 'text', trim(strip_tags($_POST['cookienotice-text'])));
+		Config::set('cookienotice', 'oktext', trim(strip_tags($_POST['cookienotice-oktext'])));
+		info(L10n::t('cookienotice Settings saved.'));
 	}
 }
 
@@ -75,14 +80,18 @@ function cookienotice_addon_admin_post()
  * page_content_top hook
  * adds css and scripts to the <head> section of the html
  *
+ * @param App    $a
  * @param string $b unused - the header html incl. nav
  *
  * @return void
  */
-function cookienotice_page_content_top(string &$b)
+function cookienotice_page_content_top(App $a, &$b)
 {
-	DI::page()->registerStylesheet(__DIR__ . '/cookienotice.css');
-	DI::page()->registerFooterScript(__DIR__ . '/cookienotice.js');
+	$stylesheetPath = __DIR__ . '/cookienotice.css';
+	$footerscriptPath = __DIR__ . '/cookienotice.js';
+
+	$a->registerStylesheet($stylesheetPath);
+	$a->registerFooterScript($footerscriptPath);
 }
 
 /**
@@ -90,16 +99,17 @@ function cookienotice_page_content_top(string &$b)
  * page_end hook
  * ads our cookienotice box to the end of the html
  *
+ * @param App    $a
  * @param string $b the page html
  *
  * @return void
  */
-function cookienotice_page_end(string &$b)
+function cookienotice_page_end(App $a, &$b)
 {
-	$text = (string)DI::config()->get('cookienotice', 'text', DI::l10n()->t('This website uses cookies to recognize revisiting and logged in users. You accept the usage of these cookies by continue browsing this website.'));
-	$oktext = (string)DI::config()->get('cookienotice', 'oktext', DI::l10n()->t('OK'));
+	$text = (string)Config::get('cookienotice', 'text', L10n::t('This website uses cookies to recognize revisiting and logged in users. You accept the usage of these cookies by continue browsing this website.'));
+	$oktext = (string)Config::get('cookienotice', 'oktext', L10n::t('OK'));
 
-	$page_end_tpl = Renderer::getMarkupTemplate('cookienotice.tpl', 'addon/cookienotice/');
+	$page_end_tpl = Renderer::getMarkupTemplate('cookienotice.tpl', __DIR__);
 
 	$page_end = Renderer::replaceMacros($page_end_tpl, [
 		'$text' => $text,
diff --git a/cookienotice/lang/C/messages.po b/cookienotice/lang/C/messages.po
index 15055bb7..7d198f85 100644
--- a/cookienotice/lang/C/messages.po
+++ b/cookienotice/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
+"POT-Creation-Date: 2019-01-30 10:48+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,36 +17,52 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: cookienotice.php:42
+#: cookienotice.php:63
 msgid ""
 "This website uses cookies. If you continue browsing this website, you agree "
 "to the usage of cookies."
 msgstr ""
 
-#: cookienotice.php:43 cookienotice.php:108
+#: cookienotice.php:64 cookienotice.php:133
 msgid "OK"
 msgstr ""
 
-#: cookienotice.php:47
+#: cookienotice.php:68
+msgid "\"cookienotice\" Settings"
+msgstr ""
+
+#: cookienotice.php:69
 msgid ""
 "<b>Configure your cookie usage notice.</b> It should just be a notice, "
 "saying that the website uses cookies. It is shown as long as a user didnt "
 "confirm clicking the OK button."
 msgstr ""
 
-#: cookienotice.php:48
+#: cookienotice.php:70
 msgid "Cookie Usage Notice"
 msgstr ""
 
-#: cookienotice.php:49
+#: cookienotice.php:70
+msgid "The cookie usage notice"
+msgstr ""
+
+#: cookienotice.php:71
 msgid "OK Button Text"
 msgstr ""
 
-#: cookienotice.php:50
+#: cookienotice.php:71
+msgid "The OK Button text"
+msgstr ""
+
+#: cookienotice.php:72
 msgid "Save Settings"
 msgstr ""
 
-#: cookienotice.php:107
+#: cookienotice.php:97
+msgid "cookienotice Settings saved."
+msgstr ""
+
+#: cookienotice.php:132
 msgid ""
 "This website uses cookies to recognize revisiting and logged in users. You "
 "accept the usage of these cookies by continue browsing this website."
diff --git a/cookienotice/lang/ar/messages.po b/cookienotice/lang/ar/messages.po
deleted file mode 100644
index 52d630db..00000000
--- a/cookienotice/lang/ar/messages.po
+++ /dev/null
@@ -1,65 +0,0 @@
-# ADDON cookienotice
-# Copyright (C)
-# This file is distributed under the same license as the Friendica cookienotice addon package.
-# 
-# 
-# Translators:
-# Farida Khalaf <faridakhalaf@hotmail.com>, 2021
-# abidin toumi <abidin24@tutanota.com>, 2021
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2019-01-23 16:01+0000\n"
-"Last-Translator: abidin toumi <abidin24@tutanota.com>, 2021\n"
-"Language-Team: Arabic (https://www.transifex.com/Friendica/teams/12172/ar/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ar\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-
-#: cookienotice.php:42
-msgid ""
-"This website uses cookies. If you continue browsing this website, you agree "
-"to the usage of cookies."
-msgstr ""
-"هذا الموقع يستخدم ملف تعريف الارتباط. إذا واصلت تصفح هذا الموقع ، فإنك توافق"
-" على استخدام ملفات تعريف الارتباط."
-
-#: cookienotice.php:43 cookienotice.php:108
-msgid "OK"
-msgstr "موافق"
-
-#: cookienotice.php:47
-msgid ""
-"<b>Configure your cookie usage notice.</b> It should just be a notice, "
-"saying that the website uses cookies. It is shown as long as a user didnt "
-"confirm clicking the OK button."
-msgstr ""
-"تهيئة إشعار استخدام ملف تعريف الارتباط الخاص بك.\n"
-" يجب أن يكون مجرد إشعار ، يقول أن الموقع يستخدم ملفات تعريف الارتباط. \n"
-"يتم عرضه طالما لم يؤكد المستخدم النقر فوق الزر \"موافق\"<b>"
-
-#: cookienotice.php:48
-msgid "Cookie Usage Notice"
-msgstr "إشعار استخدام ملفات تعريف الارتباط"
-
-#: cookienotice.php:49
-msgid "OK Button Text"
-msgstr "زر الموافقة"
-
-#: cookienotice.php:50
-msgid "Save Settings"
-msgstr "احفظ الإعدادات"
-
-#: cookienotice.php:107
-msgid ""
-"This website uses cookies to recognize revisiting and logged in users. You "
-"accept the usage of these cookies by continue browsing this website."
-msgstr ""
-"يستخدم هذا الموقع ملفات تعريف الارتباط للتعرف على إعادة الزيارة والمستخدمين الذين ولجوا.\n"
-"  استمراريتك في تصفح هذا الموقع يعني  تقبلك استخدام ملفات تعريف الارتباط "
diff --git a/cookienotice/lang/ar/strings.php b/cookienotice/lang/ar/strings.php
deleted file mode 100644
index 77502ced..00000000
--- a/cookienotice/lang/ar/strings.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_ar")) {
-function string_plural_select_ar($n){
-	$n = intval($n);
-	if ($n==0) { return 0; } else if ($n==1) { return 1; } else if ($n==2) { return 2; } else if ($n%100>=3 && $n%100<=10) { return 3; } else if ($n%100>=11 && $n%100<=99) { return 4; } else  { return 5; }
-}}
-$a->strings['This website uses cookies. If you continue browsing this website, you agree to the usage of cookies.'] = 'هذا الموقع يستخدم ملف تعريف الارتباط. إذا واصلت تصفح هذا الموقع ، فإنك توافق على استخدام ملفات تعريف الارتباط.';
-$a->strings['OK'] = 'موافق';
-$a->strings['<b>Configure your cookie usage notice.</b> It should just be a notice, saying that the website uses cookies. It is shown as long as a user didnt confirm clicking the OK button.'] = 'تهيئة إشعار استخدام ملف تعريف الارتباط الخاص بك.
- يجب أن يكون مجرد إشعار ، يقول أن الموقع يستخدم ملفات تعريف الارتباط. 
-يتم عرضه طالما لم يؤكد المستخدم النقر فوق الزر "موافق"<b>';
-$a->strings['Cookie Usage Notice'] = 'إشعار استخدام ملفات تعريف الارتباط';
-$a->strings['OK Button Text'] = 'زر الموافقة';
-$a->strings['Save Settings'] = 'احفظ الإعدادات';
-$a->strings['This website uses cookies to recognize revisiting and logged in users. You accept the usage of these cookies by continue browsing this website.'] = 'يستخدم هذا الموقع ملفات تعريف الارتباط للتعرف على إعادة الزيارة والمستخدمين الذين ولجوا.
-  استمراريتك في تصفح هذا الموقع يعني  تقبلك استخدام ملفات تعريف الارتباط ';
diff --git a/cookienotice/lang/ca/strings.php b/cookienotice/lang/ca/strings.php
index 9f5795b7..fd662e21 100644
--- a/cookienotice/lang/ca/strings.php
+++ b/cookienotice/lang/ca/strings.php
@@ -3,16 +3,17 @@
 if(! function_exists("string_plural_select_ca")) {
 function string_plural_select_ca($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['This website uses cookies. If you continue browsing this website, you agree to the usage of cookies.'] = 'Aquest lloc web utilitza cookies. Si continueu navegant per aquest lloc web, esteu d’acord amb l’ús de cookies.';
-$a->strings['OK'] = 'D\'acord';
-$a->strings['"cookienotice" Settings'] = 'Configuració \'cookienotice\'';
-$a->strings['<b>Configure your cookie usage notice.</b> It should just be a notice, saying that the website uses cookies. It is shown as long as a user didnt confirm clicking the OK button.'] = '<b>Configureu l’avís d’ús de cookies.</b> Només hauria de ser un avís, dient que el lloc web utilitza cookies. Es mostra sempre que un usuari no confirmi el seu clic al botó D\'acord';
-$a->strings['Cookie Usage Notice'] = 'Avís d’ús de cookies';
-$a->strings['The cookie usage notice'] = 'L’avís d’ús de cookies';
-$a->strings['OK Button Text'] = 'Text del botó d’acord';
-$a->strings['The OK Button text'] = 'Text del botó D\'acord';
-$a->strings['Save Settings'] = 'Desa la configuració';
-$a->strings['cookienotice Settings saved.'] = 'Cookienotice S\'ha desat la configuració.';
-$a->strings['This website uses cookies to recognize revisiting and logged in users. You accept the usage of these cookies by continue browsing this website.'] = 'Aquest lloc web utilitza cookies per reconèixer la revisió i la sessió d’usuaris. Accepteu l’ús d’aquestes cookies continuant navegant per aquest lloc web.';
+;
+$a->strings["This website uses cookies. If you continue browsing this website, you agree to the usage of cookies."] = "Aquest lloc web utilitza cookies. Si continueu navegant per aquest lloc web, esteu d’acord amb l’ús de cookies.";
+$a->strings["OK"] = "D'acord";
+$a->strings["\"cookienotice\" Settings"] = "Configuració 'cookienotice'";
+$a->strings["<b>Configure your cookie usage notice.</b> It should just be a notice, saying that the website uses cookies. It is shown as long as a user didnt confirm clicking the OK button."] = "<b>Configureu l’avís d’ús de cookies.</b> Només hauria de ser un avís, dient que el lloc web utilitza cookies. Es mostra sempre que un usuari no confirmi el seu clic al botó D'acord";
+$a->strings["Cookie Usage Notice"] = "Avís d’ús de cookies";
+$a->strings["The cookie usage notice"] = "L’avís d’ús de cookies";
+$a->strings["OK Button Text"] = "Text del botó d’acord";
+$a->strings["The OK Button text"] = "Text del botó D'acord";
+$a->strings["Save Settings"] = "Desa la configuració";
+$a->strings["cookienotice Settings saved."] = "Cookienotice S'ha desat la configuració.";
+$a->strings["This website uses cookies to recognize revisiting and logged in users. You accept the usage of these cookies by continue browsing this website."] = "Aquest lloc web utilitza cookies per reconèixer la revisió i la sessió d’usuaris. Accepteu l’ús d’aquestes cookies continuant navegant per aquest lloc web.";
diff --git a/cookienotice/lang/cs/strings.php b/cookienotice/lang/cs/strings.php
index 2c200355..3a759f02 100644
--- a/cookienotice/lang/cs/strings.php
+++ b/cookienotice/lang/cs/strings.php
@@ -3,16 +3,17 @@
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
 	$n = intval($n);
-	if (($n == 1 && $n % 1 == 0)) { return 0; } else if (($n >= 2 && $n <= 4 && $n % 1 == 0)) { return 1; } else if (($n % 1 != 0 )) { return 2; } else  { return 3; }
+	return ($n == 1 && $n % 1 == 0) ? 0 : ($n >= 2 && $n <= 4 && $n % 1 == 0) ? 1: ($n % 1 != 0 ) ? 2 : 3;;
 }}
-$a->strings['This website uses cookies. If you continue browsing this website, you agree to the usage of cookies.'] = 'Tato stránka používá cookies. Pokud budete pokračovat v používání této stránky, souhlasíte s používáním cookies.';
-$a->strings['OK'] = 'OK';
-$a->strings['"cookienotice" Settings'] = 'Nastavení „cookienotice“';
-$a->strings['<b>Configure your cookie usage notice.</b> It should just be a notice, saying that the website uses cookies. It is shown as long as a user didnt confirm clicking the OK button.'] = '<b>Nastavte si vaše oznámení o používání cookies.</b> Mělo by to být pouze oznámení říkající, že stránka používá cookies. Zobrazí se, dokud uživatel neklikne na tlačítko OK.';
-$a->strings['Cookie Usage Notice'] = 'Oznámení o používání cookies';
-$a->strings['The cookie usage notice'] = 'Oznámení o používání cookies';
-$a->strings['OK Button Text'] = 'Text tlačítka OK';
-$a->strings['The OK Button text'] = 'Text tlačítka OK';
-$a->strings['Save Settings'] = 'Uložit nastavení';
-$a->strings['cookienotice Settings saved.'] = 'Nastavení cookienotice uložena.';
-$a->strings['This website uses cookies to recognize revisiting and logged in users. You accept the usage of these cookies by continue browsing this website.'] = 'Tato stránka používá cookies pro rozpoznávání znovu navštěvujících a přihlášených uživatelů. Pokud budete pokračovat v používání této stránky, souhlasíte s používáním cookies.';
+;
+$a->strings["This website uses cookies. If you continue browsing this website, you agree to the usage of cookies."] = "Tato stránka používá cookies. Pokud budete pokračovat v používání této stránky, souhlasíte s používáním cookies.";
+$a->strings["OK"] = "OK";
+$a->strings["\"cookienotice\" Settings"] = "Nastavení „cookienotice“";
+$a->strings["<b>Configure your cookie usage notice.</b> It should just be a notice, saying that the website uses cookies. It is shown as long as a user didnt confirm clicking the OK button."] = "<b>Nastavte si vaše oznámení o používání cookies.</b> Mělo by to být pouze oznámení říkající, že stránka používá cookies. Zobrazí se, dokud uživatel neklikne na tlačítko OK.";
+$a->strings["Cookie Usage Notice"] = "Oznámení o používání cookies";
+$a->strings["The cookie usage notice"] = "Oznámení o používání cookies";
+$a->strings["OK Button Text"] = "Text tlačítka OK";
+$a->strings["The OK Button text"] = "Text tlačítka OK";
+$a->strings["Save Settings"] = "Uložit nastavení";
+$a->strings["cookienotice Settings saved."] = "Nastavení cookienotice uložena.";
+$a->strings["This website uses cookies to recognize revisiting and logged in users. You accept the usage of these cookies by continue browsing this website."] = "Tato stránka používá cookies pro rozpoznávání znovu navštěvujících a přihlášených uživatelů. Pokud budete pokračovat v používání této stránky, souhlasíte s používáním cookies.";
diff --git a/cookienotice/lang/da-dk/messages.po b/cookienotice/lang/da-dk/messages.po
deleted file mode 100644
index 538e8397..00000000
--- a/cookienotice/lang/da-dk/messages.po
+++ /dev/null
@@ -1,53 +0,0 @@
-# ADDON cookienotice
-# Copyright (C)
-# This file is distributed under the same license as the Friendica cookienotice addon package.
-# 
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2019-01-23 16:01+0000\n"
-"Language-Team: Danish (Denmark) (https://www.transifex.com/Friendica/teams/12172/da_DK/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: da_DK\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: cookienotice.php:42
-msgid ""
-"This website uses cookies. If you continue browsing this website, you agree "
-"to the usage of cookies."
-msgstr ""
-
-#: cookienotice.php:43 cookienotice.php:108
-msgid "OK"
-msgstr ""
-
-#: cookienotice.php:47
-msgid ""
-"<b>Configure your cookie usage notice.</b> It should just be a notice, "
-"saying that the website uses cookies. It is shown as long as a user didnt "
-"confirm clicking the OK button."
-msgstr ""
-
-#: cookienotice.php:48
-msgid "Cookie Usage Notice"
-msgstr ""
-
-#: cookienotice.php:49
-msgid "OK Button Text"
-msgstr ""
-
-#: cookienotice.php:50
-msgid "Save Settings"
-msgstr ""
-
-#: cookienotice.php:107
-msgid ""
-"This website uses cookies to recognize revisiting and logged in users. You "
-"accept the usage of these cookies by continue browsing this website."
-msgstr ""
diff --git a/cookienotice/lang/da-dk/strings.php b/cookienotice/lang/da-dk/strings.php
deleted file mode 100644
index 09554750..00000000
--- a/cookienotice/lang/da-dk/strings.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_da_dk")) {
-function string_plural_select_da_dk($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
diff --git a/cookienotice/lang/de/messages.po b/cookienotice/lang/de/messages.po
index ec07534e..0689a398 100644
--- a/cookienotice/lang/de/messages.po
+++ b/cookienotice/lang/de/messages.po
@@ -6,36 +6,39 @@
 # Translators:
 # Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2019
 # Ulf Rompe <transifex.com@rompe.org>, 2019
-# foss <oss@disr.it>, 2020
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
+"POT-Creation-Date: 2019-01-30 10:48+0100\n"
 "PO-Revision-Date: 2019-01-23 16:01+0000\n"
-"Last-Translator: foss <oss@disr.it>, 2020\n"
-"Language-Team: German (https://app.transifex.com/Friendica/teams/12172/de/)\n"
+"Last-Translator: Ulf Rompe <transifex.com@rompe.org>, 2019\n"
+"Language-Team: German (https://www.transifex.com/Friendica/teams/12172/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: cookienotice.php:42
+#: cookienotice.php:63
 msgid ""
 "This website uses cookies. If you continue browsing this website, you agree "
 "to the usage of cookies."
 msgstr ""
 "Diese Webseite verwendet Cookies. Durch die weitere Benutzung der Webseite "
-"stimmst du dieser Verwendung zu."
+"stimmen Sie dieser Verwendung zu."
 
-#: cookienotice.php:43 cookienotice.php:108
+#: cookienotice.php:64 cookienotice.php:133
 msgid "OK"
 msgstr "OK"
 
-#: cookienotice.php:47
+#: cookienotice.php:68
+msgid "\"cookienotice\" Settings"
+msgstr "\"cookienotice\"-Einstellungen"
+
+#: cookienotice.php:69
 msgid ""
 "<b>Configure your cookie usage notice.</b> It should just be a notice, "
 "saying that the website uses cookies. It is shown as long as a user didnt "
@@ -45,23 +48,35 @@ msgstr ""
 "sein, der sagt, dass die Webseite Cookies benutzt. Er wird so lange "
 "angezeigt, bis der User den Hinweis durch Klicken des OK-Buttons bestätigt."
 
-#: cookienotice.php:48
+#: cookienotice.php:70
 msgid "Cookie Usage Notice"
 msgstr "Cookie-Nutzungshinweis"
 
-#: cookienotice.php:49
+#: cookienotice.php:70
+msgid "The cookie usage notice"
+msgstr "Der Hinweis zur Nutzung von Cookies"
+
+#: cookienotice.php:71
 msgid "OK Button Text"
 msgstr "OK-Button-Text"
 
-#: cookienotice.php:50
+#: cookienotice.php:71
+msgid "The OK Button text"
+msgstr "Der für den OK-Button verwendete Text"
+
+#: cookienotice.php:72
 msgid "Save Settings"
 msgstr "Einstellungen speichern"
 
-#: cookienotice.php:107
+#: cookienotice.php:97
+msgid "cookienotice Settings saved."
+msgstr "cookienotice-Einstellungen wurden gespeichert"
+
+#: cookienotice.php:132
 msgid ""
 "This website uses cookies to recognize revisiting and logged in users. You "
 "accept the usage of these cookies by continue browsing this website."
 msgstr ""
 "Diese Webseite verwendet Cookies zur Erkennung von wiederkehrenden Besuchern"
 " und eingeloggten Nutzern. Durch die weitere Benutzung der Webseite "
-"akzeptierst du die Verwendung der Cookies."
+"akzeptieren Sie die Verwendung der Cookies."
diff --git a/cookienotice/lang/de/strings.php b/cookienotice/lang/de/strings.php
index a83955ee..b4441c23 100644
--- a/cookienotice/lang/de/strings.php
+++ b/cookienotice/lang/de/strings.php
@@ -3,12 +3,17 @@
 if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['This website uses cookies. If you continue browsing this website, you agree to the usage of cookies.'] = 'Diese Webseite verwendet Cookies. Durch die weitere Benutzung der Webseite stimmst du dieser Verwendung zu.';
-$a->strings['OK'] = 'OK';
-$a->strings['<b>Configure your cookie usage notice.</b> It should just be a notice, saying that the website uses cookies. It is shown as long as a user didnt confirm clicking the OK button.'] = '<b>Konfiguriere deinen Cookie-Nutzungshinweis.</b> Es sollte ein Hinweis sein, der sagt, dass die Webseite Cookies benutzt. Er wird so lange angezeigt, bis der User den Hinweis durch Klicken des OK-Buttons bestätigt.';
-$a->strings['Cookie Usage Notice'] = 'Cookie-Nutzungshinweis';
-$a->strings['OK Button Text'] = 'OK-Button-Text';
-$a->strings['Save Settings'] = 'Einstellungen speichern';
-$a->strings['This website uses cookies to recognize revisiting and logged in users. You accept the usage of these cookies by continue browsing this website.'] = 'Diese Webseite verwendet Cookies zur Erkennung von wiederkehrenden Besuchern und eingeloggten Nutzern. Durch die weitere Benutzung der Webseite akzeptierst du die Verwendung der Cookies.';
+;
+$a->strings["This website uses cookies. If you continue browsing this website, you agree to the usage of cookies."] = "Diese Webseite verwendet Cookies. Durch die weitere Benutzung der Webseite stimmen Sie dieser Verwendung zu.";
+$a->strings["OK"] = "OK";
+$a->strings["\"cookienotice\" Settings"] = "\"cookienotice\"-Einstellungen";
+$a->strings["<b>Configure your cookie usage notice.</b> It should just be a notice, saying that the website uses cookies. It is shown as long as a user didnt confirm clicking the OK button."] = "<b>Konfiguriere deinen Cookie-Nutzungshinweis.</b> Es sollte ein Hinweis sein, der sagt, dass die Webseite Cookies benutzt. Er wird so lange angezeigt, bis der User den Hinweis durch Klicken des OK-Buttons bestätigt.";
+$a->strings["Cookie Usage Notice"] = "Cookie-Nutzungshinweis";
+$a->strings["The cookie usage notice"] = "Der Hinweis zur Nutzung von Cookies";
+$a->strings["OK Button Text"] = "OK-Button-Text";
+$a->strings["The OK Button text"] = "Der für den OK-Button verwendete Text";
+$a->strings["Save Settings"] = "Einstellungen speichern";
+$a->strings["cookienotice Settings saved."] = "cookienotice-Einstellungen wurden gespeichert";
+$a->strings["This website uses cookies to recognize revisiting and logged in users. You accept the usage of these cookies by continue browsing this website."] = "Diese Webseite verwendet Cookies zur Erkennung von wiederkehrenden Besuchern und eingeloggten Nutzern. Durch die weitere Benutzung der Webseite akzeptieren Sie die Verwendung der Cookies.";
diff --git a/cookienotice/lang/en-gb/strings.php b/cookienotice/lang/en-gb/strings.php
index 09dc7be2..0acb4196 100644
--- a/cookienotice/lang/en-gb/strings.php
+++ b/cookienotice/lang/en-gb/strings.php
@@ -3,16 +3,17 @@
 if(! function_exists("string_plural_select_en_gb")) {
 function string_plural_select_en_gb($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['This website uses cookies. If you continue browsing this website, you agree to the usage of cookies.'] = 'This website uses cookies. If you continue browsing this website, you agree to the usage of cookies.';
-$a->strings['OK'] = 'OK';
-$a->strings['"cookienotice" Settings'] = '"cookienotice" settings';
-$a->strings['<b>Configure your cookie usage notice.</b> It should just be a notice, saying that the website uses cookies. It is shown as long as a user didnt confirm clicking the OK button.'] = '<b>Configure your cookie usage notice.</b> It should just be a notice, saying that the website uses cookies. It is shown as long as a user didnt confirm clicking the OK button.';
-$a->strings['Cookie Usage Notice'] = 'Cookie usage notice';
-$a->strings['The cookie usage notice'] = 'The cookie usage notice';
-$a->strings['OK Button Text'] = 'OK button text';
-$a->strings['The OK Button text'] = 'OK button text';
-$a->strings['Save Settings'] = 'Save settings';
-$a->strings['cookienotice Settings saved.'] = 'Cookie notice settings saved.';
-$a->strings['This website uses cookies to recognize revisiting and logged in users. You accept the usage of these cookies by continue browsing this website.'] = 'This website uses cookies to recognize revisiting and logged in users. You accept the usage of these cookies by continue browsing this website.';
+;
+$a->strings["This website uses cookies. If you continue browsing this website, you agree to the usage of cookies."] = "This website uses cookies. If you continue browsing this website, you agree to the usage of cookies.";
+$a->strings["OK"] = "OK";
+$a->strings["\"cookienotice\" Settings"] = "\"cookienotice\" settings";
+$a->strings["<b>Configure your cookie usage notice.</b> It should just be a notice, saying that the website uses cookies. It is shown as long as a user didnt confirm clicking the OK button."] = "<b>Configure your cookie usage notice.</b> It should just be a notice, saying that the website uses cookies. It is shown as long as a user didnt confirm clicking the OK button.";
+$a->strings["Cookie Usage Notice"] = "Cookie usage notice";
+$a->strings["The cookie usage notice"] = "The cookie usage notice";
+$a->strings["OK Button Text"] = "OK button text";
+$a->strings["The OK Button text"] = "OK button text";
+$a->strings["Save Settings"] = "Save settings";
+$a->strings["cookienotice Settings saved."] = "Cookie notice settings saved.";
+$a->strings["This website uses cookies to recognize revisiting and logged in users. You accept the usage of these cookies by continue browsing this website."] = "This website uses cookies to recognize revisiting and logged in users. You accept the usage of these cookies by continue browsing this website.";
diff --git a/cookienotice/lang/es/messages.po b/cookienotice/lang/es/messages.po
deleted file mode 100644
index bf11f9cb..00000000
--- a/cookienotice/lang/es/messages.po
+++ /dev/null
@@ -1,65 +0,0 @@
-# ADDON cookienotice
-# Copyright (C)
-# This file is distributed under the same license as the Friendica cookienotice addon package.
-# 
-# 
-# Translators:
-# Senex Petrovic <javierruizo@hotmail.com>, 2021
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2019-01-23 16:01+0000\n"
-"Last-Translator: Senex Petrovic <javierruizo@hotmail.com>, 2021\n"
-"Language-Team: Spanish (https://www.transifex.com/Friendica/teams/12172/es/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: es\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: cookienotice.php:42
-msgid ""
-"This website uses cookies. If you continue browsing this website, you agree "
-"to the usage of cookies."
-msgstr ""
-"Este sitio web utiliza cookies. Si continúa navegando en este sitio web, "
-"acepta el uso de cookies."
-
-#: cookienotice.php:43 cookienotice.php:108
-msgid "OK"
-msgstr "OK"
-
-#: cookienotice.php:47
-msgid ""
-"<b>Configure your cookie usage notice.</b> It should just be a notice, "
-"saying that the website uses cookies. It is shown as long as a user didnt "
-"confirm clicking the OK button."
-msgstr ""
-"<b>Configura tu nota deñ uso de cookies.</b> Debería ser solo un aviso, "
-"diciendo que el sitio web utiliza cookies. Se muestra siempre que el usuario"
-" no confirmó haciendo clic en el botón Aceptar."
-
-#: cookienotice.php:48
-msgid "Cookie Usage Notice"
-msgstr "Aviso de uso de cookies"
-
-#: cookienotice.php:49
-msgid "OK Button Text"
-msgstr "Texto del botón OK"
-
-#: cookienotice.php:50
-msgid "Save Settings"
-msgstr "Grabar Ajustes"
-
-#: cookienotice.php:107
-msgid ""
-"This website uses cookies to recognize revisiting and logged in users. You "
-"accept the usage of these cookies by continue browsing this website."
-msgstr ""
-"Este sitio web utiliza cookies para reconocer a los usuarios que visitan y "
-"que inician sesión. Acepta el uso de estas cookies al continuar navegando en"
-" este sitio web."
diff --git a/cookienotice/lang/es/strings.php b/cookienotice/lang/es/strings.php
deleted file mode 100644
index 0cb2b314..00000000
--- a/cookienotice/lang/es/strings.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_es")) {
-function string_plural_select_es($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['This website uses cookies. If you continue browsing this website, you agree to the usage of cookies.'] = 'Este sitio web utiliza cookies. Si continúa navegando en este sitio web, acepta el uso de cookies.';
-$a->strings['OK'] = 'OK';
-$a->strings['<b>Configure your cookie usage notice.</b> It should just be a notice, saying that the website uses cookies. It is shown as long as a user didnt confirm clicking the OK button.'] = '<b>Configura tu nota deñ uso de cookies.</b> Debería ser solo un aviso, diciendo que el sitio web utiliza cookies. Se muestra siempre que el usuario no confirmó haciendo clic en el botón Aceptar.';
-$a->strings['Cookie Usage Notice'] = 'Aviso de uso de cookies';
-$a->strings['OK Button Text'] = 'Texto del botón OK';
-$a->strings['Save Settings'] = 'Grabar Ajustes';
-$a->strings['This website uses cookies to recognize revisiting and logged in users. You accept the usage of these cookies by continue browsing this website.'] = 'Este sitio web utiliza cookies para reconocer a los usuarios que visitan y que inician sesión. Acepta el uso de estas cookies al continuar navegando en este sitio web.';
diff --git a/cookienotice/lang/fr/messages.po b/cookienotice/lang/fr/messages.po
index f7ac7c76..65ed0d2a 100644
--- a/cookienotice/lang/fr/messages.po
+++ b/cookienotice/lang/fr/messages.po
@@ -5,63 +5,53 @@
 # 
 # Translators:
 # Vladimir Núñez <lapoubelle111@gmail.com>, 2019
-# bob lebonche <lebonche@tutanota.com>, 2021
 # 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
+"POT-Creation-Date: 2019-01-20 14:51+0100\n"
 "PO-Revision-Date: 2019-01-23 16:01+0000\n"
-"Last-Translator: bob lebonche <lebonche@tutanota.com>, 2021\n"
+"Last-Translator: Vladimir Núñez <lapoubelle111@gmail.com>, 2019\n"
 "Language-Team: French (https://www.transifex.com/Friendica/teams/12172/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fr\n"
-"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: cookienotice.php:42
-msgid ""
-"This website uses cookies. If you continue browsing this website, you agree "
-"to the usage of cookies."
+#: cookienotice.php:53
+msgid "\"cookienotice\" Settings"
 msgstr ""
-"Ce site utilise des cookies. Si vous poursuivez sur ce site, vous acceptez "
-"l'utilisation de ces cookies."
 
-#: cookienotice.php:43 cookienotice.php:108
-msgid "OK"
-msgstr "Ok"
-
-#: cookienotice.php:47
+#: cookienotice.php:54
 msgid ""
 "<b>Configure your cookie usage notice.</b> It should just be a notice, "
 "saying that the website uses cookies. It is shown as long as a user didnt "
 "confirm clicking the OK button."
 msgstr ""
-"<b>Configurez votre politique d'utilisation des cookies.</b> Cela devrait "
-"juste être un avertissement, signalant l'utilisation de cookies par le site."
-" Cela sera affiché tant que l'utilisateur n'aura pas confirmé en cliquant "
-"sur le bouton OK."
 
-#: cookienotice.php:48
+#: cookienotice.php:55
 msgid "Cookie Usage Notice"
-msgstr "Politique d'utilisation des cookies."
+msgstr ""
 
-#: cookienotice.php:49
+#: cookienotice.php:55
+msgid "The cookie usage notice"
+msgstr ""
+
+#: cookienotice.php:56
 msgid "OK Button Text"
 msgstr "Bouton OK Texte "
 
-#: cookienotice.php:50
-msgid "Save Settings"
-msgstr "Sauvegarder les réglages"
-
-#: cookienotice.php:107
-msgid ""
-"This website uses cookies to recognize revisiting and logged in users. You "
-"accept the usage of these cookies by continue browsing this website."
+#: cookienotice.php:56
+msgid "The OK Button text"
+msgstr ""
+
+#: cookienotice.php:57
+msgid "Save Settings"
+msgstr ""
+
+#: cookienotice.php:72
+msgid "cookienotice Settings saved."
 msgstr ""
-"Ce site utilise des cookies pour reconnaître les visiteurs et les "
-"utilisateurs connectés. Vous accepter l'utilisation de ces cookies en "
-"continuant sur ce site."
diff --git a/cookienotice/lang/fr/strings.php b/cookienotice/lang/fr/strings.php
index 7076d6aa..f975f493 100644
--- a/cookienotice/lang/fr/strings.php
+++ b/cookienotice/lang/fr/strings.php
@@ -3,12 +3,14 @@
 if(! function_exists("string_plural_select_fr")) {
 function string_plural_select_fr($n){
 	$n = intval($n);
-	if (($n == 0 || $n == 1)) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
+	return ($n > 1);;
 }}
-$a->strings['This website uses cookies. If you continue browsing this website, you agree to the usage of cookies.'] = 'Ce site utilise des cookies. Si vous poursuivez sur ce site, vous acceptez l\'utilisation de ces cookies.';
-$a->strings['OK'] = 'Ok';
-$a->strings['<b>Configure your cookie usage notice.</b> It should just be a notice, saying that the website uses cookies. It is shown as long as a user didnt confirm clicking the OK button.'] = '<b>Configurez votre politique d\'utilisation des cookies.</b> Cela devrait juste être un avertissement, signalant l\'utilisation de cookies par le site. Cela sera affiché tant que l\'utilisateur n\'aura pas confirmé en cliquant sur le bouton OK.';
-$a->strings['Cookie Usage Notice'] = 'Politique d\'utilisation des cookies.';
-$a->strings['OK Button Text'] = 'Bouton OK Texte ';
-$a->strings['Save Settings'] = 'Sauvegarder les réglages';
-$a->strings['This website uses cookies to recognize revisiting and logged in users. You accept the usage of these cookies by continue browsing this website.'] = 'Ce site utilise des cookies pour reconnaître les visiteurs et les utilisateurs connectés. Vous accepter l\'utilisation de ces cookies en continuant sur ce site.';
+;
+$a->strings["\"cookienotice\" Settings"] = "";
+$a->strings["<b>Configure your cookie usage notice.</b> It should just be a notice, saying that the website uses cookies. It is shown as long as a user didnt confirm clicking the OK button."] = "";
+$a->strings["Cookie Usage Notice"] = "";
+$a->strings["The cookie usage notice"] = "";
+$a->strings["OK Button Text"] = "Bouton OK Texte ";
+$a->strings["The OK Button text"] = "";
+$a->strings["Save Settings"] = "";
+$a->strings["cookienotice Settings saved."] = "";
diff --git a/cookienotice/lang/hu/messages.po b/cookienotice/lang/hu/messages.po
deleted file mode 100644
index a9a85fb9..00000000
--- a/cookienotice/lang/hu/messages.po
+++ /dev/null
@@ -1,66 +0,0 @@
-# ADDON cookienotice
-# Copyright (C)
-# This file is distributed under the same license as the Friendica cookienotice addon package.
-# 
-# 
-# Translators:
-# Balázs Úr, 2020
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2019-01-23 16:01+0000\n"
-"Last-Translator: Balázs Úr, 2020\n"
-"Language-Team: Hungarian (https://www.transifex.com/Friendica/teams/12172/hu/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: hu\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: cookienotice.php:42
-msgid ""
-"This website uses cookies. If you continue browsing this website, you agree "
-"to the usage of cookies."
-msgstr ""
-"Ez a weboldal sütiket használ. Ha folytatja a böngészést a weboldalon, akkor"
-" elfogadja a sütik használatát."
-
-#: cookienotice.php:43 cookienotice.php:108
-msgid "OK"
-msgstr "Rendben"
-
-#: cookienotice.php:47
-msgid ""
-"<b>Configure your cookie usage notice.</b> It should just be a notice, "
-"saying that the website uses cookies. It is shown as long as a user didnt "
-"confirm clicking the OK button."
-msgstr ""
-"<b>Állítsa be a sütihasználati figyelmeztetést.</b> Ennek csak egy "
-"figyelmeztetésnek kell lennie, amely arra hívja fel a figyelmet, hogy a "
-"weboldal sütiket használ. Egészen addig lesz megjelenítve, amíg a "
-"felhasználó nem fogadja el a Rendben gombra kattintva."
-
-#: cookienotice.php:48
-msgid "Cookie Usage Notice"
-msgstr "Sütihasználati figyelmeztetés"
-
-#: cookienotice.php:49
-msgid "OK Button Text"
-msgstr "Rendben gomb szövege"
-
-#: cookienotice.php:50
-msgid "Save Settings"
-msgstr "Beállítások mentése"
-
-#: cookienotice.php:107
-msgid ""
-"This website uses cookies to recognize revisiting and logged in users. You "
-"accept the usage of these cookies by continue browsing this website."
-msgstr ""
-"Ez a weboldal sütiket használ az újralátogatás felismeréséhez és a "
-"bejelentkezett felhasználókhoz. A weboldalon történő böngészés folytatásával"
-" Ön elfogadja ezen sütik használatát."
diff --git a/cookienotice/lang/hu/strings.php b/cookienotice/lang/hu/strings.php
deleted file mode 100644
index 9ad07400..00000000
--- a/cookienotice/lang/hu/strings.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_hu")) {
-function string_plural_select_hu($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['This website uses cookies. If you continue browsing this website, you agree to the usage of cookies.'] = 'Ez a weboldal sütiket használ. Ha folytatja a böngészést a weboldalon, akkor elfogadja a sütik használatát.';
-$a->strings['OK'] = 'Rendben';
-$a->strings['<b>Configure your cookie usage notice.</b> It should just be a notice, saying that the website uses cookies. It is shown as long as a user didnt confirm clicking the OK button.'] = '<b>Állítsa be a sütihasználati figyelmeztetést.</b> Ennek csak egy figyelmeztetésnek kell lennie, amely arra hívja fel a figyelmet, hogy a weboldal sütiket használ. Egészen addig lesz megjelenítve, amíg a felhasználó nem fogadja el a Rendben gombra kattintva.';
-$a->strings['Cookie Usage Notice'] = 'Sütihasználati figyelmeztetés';
-$a->strings['OK Button Text'] = 'Rendben gomb szövege';
-$a->strings['Save Settings'] = 'Beállítások mentése';
-$a->strings['This website uses cookies to recognize revisiting and logged in users. You accept the usage of these cookies by continue browsing this website.'] = 'Ez a weboldal sütiket használ az újralátogatás felismeréséhez és a bejelentkezett felhasználókhoz. A weboldalon történő böngészés folytatásával Ön elfogadja ezen sütik használatát.';
diff --git a/cookienotice/lang/it/strings.php b/cookienotice/lang/it/strings.php
index 41a83b82..b4d84be6 100644
--- a/cookienotice/lang/it/strings.php
+++ b/cookienotice/lang/it/strings.php
@@ -3,16 +3,17 @@
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['This website uses cookies. If you continue browsing this website, you agree to the usage of cookies.'] = 'Questo sito web utilizza cookie. Proseguendo la navigazione su questo sito, accetti l\'utilizzo dei cookie.';
-$a->strings['OK'] = 'OK';
-$a->strings['"cookienotice" Settings'] = 'Impostazioni "cookienotice"';
-$a->strings['<b>Configure your cookie usage notice.</b> It should just be a notice, saying that the website uses cookies. It is shown as long as a user didnt confirm clicking the OK button.'] = '<b>Configura la tua notifica di utilizzo dei cookie</b> Dovrebbe essere semplicemente una nota che dice che il sito utilizza dei cookie. Viene mostrata fino a quanto l\'utente conferma cliccando il bottone OK.';
-$a->strings['Cookie Usage Notice'] = 'Nota Utilizzo Cookie';
-$a->strings['The cookie usage notice'] = 'La nota di utilizzo dei cookie';
-$a->strings['OK Button Text'] = 'Testo Bottone OK';
-$a->strings['The OK Button text'] = 'Il testo del bottone OK';
-$a->strings['Save Settings'] = 'Salva Impostazioni';
-$a->strings['cookienotice Settings saved.'] = 'Impostazioni "cookienotice" salvate.';
-$a->strings['This website uses cookies to recognize revisiting and logged in users. You accept the usage of these cookies by continue browsing this website.'] = 'Questo sito utilizza cookie per riconosce gli utenti loggati e quelli che tornano a visitare. Proseguendo la navigazione su questo sito, accetti l\'utilizzo di questi cookie. ';
+;
+$a->strings["This website uses cookies. If you continue browsing this website, you agree to the usage of cookies."] = "Questo sito web utilizza cookie. Proseguendo la navigazione su questo sito, accetti l'utilizzo dei cookie.";
+$a->strings["OK"] = "OK";
+$a->strings["\"cookienotice\" Settings"] = "Impostazioni \"cookienotice\"";
+$a->strings["<b>Configure your cookie usage notice.</b> It should just be a notice, saying that the website uses cookies. It is shown as long as a user didnt confirm clicking the OK button."] = "<b>Configura la tua notifica di utilizzo dei cookie</b> Dovrebbe essere semplicemente una nota che dice che il sito utilizza dei cookie. Viene mostrata fino a quanto l'utente conferma cliccando il bottone OK.";
+$a->strings["Cookie Usage Notice"] = "Nota Utilizzo Cookie";
+$a->strings["The cookie usage notice"] = "La nota di utilizzo dei cookie";
+$a->strings["OK Button Text"] = "Testo Bottone OK";
+$a->strings["The OK Button text"] = "Il testo del bottone OK";
+$a->strings["Save Settings"] = "Salva Impostazioni";
+$a->strings["cookienotice Settings saved."] = "Impostazioni \"cookienotice\" salvate.";
+$a->strings["This website uses cookies to recognize revisiting and logged in users. You accept the usage of these cookies by continue browsing this website."] = "Questo sito utilizza cookie per riconosce gli utenti loggati e quelli che tornano a visitare. Proseguendo la navigazione su questo sito, accetti l'utilizzo di questi cookie. ";
diff --git a/cookienotice/lang/nl/strings.php b/cookienotice/lang/nl/strings.php
index 8247b729..4699657e 100644
--- a/cookienotice/lang/nl/strings.php
+++ b/cookienotice/lang/nl/strings.php
@@ -3,16 +3,17 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['This website uses cookies. If you continue browsing this website, you agree to the usage of cookies.'] = 'Deze website gebruikt cookies. Door het gebruik van deze website,  je akkoord met het gebruik van deze cookies.';
-$a->strings['OK'] = 'OK';
-$a->strings['"cookienotice" Settings'] = '"cookienotice" instellingen';
-$a->strings['<b>Configure your cookie usage notice.</b> It should just be a notice, saying that the website uses cookies. It is shown as long as a user didnt confirm clicking the OK button.'] = '<b>Configureer je meldingen voor het gebruik van cookies. </b>Het dient alleen een melding te zijn die zegt dat de website cookies gebruikt. Dit is te zien als de gebruiker niet heeft bevestigd door op de OK knop te drukken.';
-$a->strings['Cookie Usage Notice'] = 'Cookiemelding';
-$a->strings['The cookie usage notice'] = 'De cookiemelding';
-$a->strings['OK Button Text'] = 'OK knop tekst';
-$a->strings['The OK Button text'] = 'De OK knop tekst';
-$a->strings['Save Settings'] = 'Instellingen Opslaan';
-$a->strings['cookienotice Settings saved.'] = 'Cookienotice instellingen opgeslagen.';
-$a->strings['This website uses cookies to recognize revisiting and logged in users. You accept the usage of these cookies by continue browsing this website.'] = 'Deze website gebruikt cookies om terugkerende en ingelogde gebruikers te herkennen. Door gebruik van deze website gaat u akkoord met het gebruik van deze cookies';
+;
+$a->strings["This website uses cookies. If you continue browsing this website, you agree to the usage of cookies."] = "Deze website gebruikt cookies. Door het gebruik van deze website,  je akkoord met het gebruik van deze cookies.";
+$a->strings["OK"] = "OK";
+$a->strings["\"cookienotice\" Settings"] = "\"cookienotice\" instellingen";
+$a->strings["<b>Configure your cookie usage notice.</b> It should just be a notice, saying that the website uses cookies. It is shown as long as a user didnt confirm clicking the OK button."] = "<b>Configureer je meldingen voor het gebruik van cookies. </b>Het dient alleen een melding te zijn die zegt dat de website cookies gebruikt. Dit is te zien als de gebruiker niet heeft bevestigd door op de OK knop te drukken.";
+$a->strings["Cookie Usage Notice"] = "Cookiemelding";
+$a->strings["The cookie usage notice"] = "De cookiemelding";
+$a->strings["OK Button Text"] = "OK knop tekst";
+$a->strings["The OK Button text"] = "De OK knop tekst";
+$a->strings["Save Settings"] = "Instellingen Opslaan";
+$a->strings["cookienotice Settings saved."] = "Cookienotice instellingen opgeslagen.";
+$a->strings["This website uses cookies to recognize revisiting and logged in users. You accept the usage of these cookies by continue browsing this website."] = "Deze website gebruikt cookies om terugkerende en ingelogde gebruikers te herkennen. Door gebruik van deze website gaat u akkoord met het gebruik van deze cookies";
diff --git a/cookienotice/lang/pl/messages.po b/cookienotice/lang/pl/messages.po
index f1fc16b8..be47f834 100644
--- a/cookienotice/lang/pl/messages.po
+++ b/cookienotice/lang/pl/messages.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
+"POT-Creation-Date: 2019-01-30 10:48+0100\n"
 "PO-Revision-Date: 2019-01-23 16:01+0000\n"
 "Last-Translator: Waldemar Stoczkowski, 2019\n"
 "Language-Team: Polish (https://www.transifex.com/Friendica/teams/12172/pl/)\n"
@@ -21,7 +21,7 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
-#: cookienotice.php:42
+#: cookienotice.php:63
 msgid ""
 "This website uses cookies. If you continue browsing this website, you agree "
 "to the usage of cookies."
@@ -29,11 +29,15 @@ msgstr ""
 "Ta strona używa plików cookie. Jeśli będziesz kontynuować przeglądanie tej "
 "strony, zgadzasz się na użycie plików cookie."
 
-#: cookienotice.php:43 cookienotice.php:108
+#: cookienotice.php:64 cookienotice.php:133
 msgid "OK"
 msgstr "OK"
 
-#: cookienotice.php:47
+#: cookienotice.php:68
+msgid "\"cookienotice\" Settings"
+msgstr "Ustawienia \"plików cookie\""
+
+#: cookienotice.php:69
 msgid ""
 "<b>Configure your cookie usage notice.</b> It should just be a notice, "
 "saying that the website uses cookies. It is shown as long as a user didnt "
@@ -43,19 +47,31 @@ msgstr ""
 "prostu komunikat, że strona korzysta z plików cookie. Jest wyświetlany, o "
 "ile użytkownik nie potwierdził, klikając przycisk OK."
 
-#: cookienotice.php:48
+#: cookienotice.php:70
 msgid "Cookie Usage Notice"
 msgstr "Użyciu plików cookie"
 
-#: cookienotice.php:49
+#: cookienotice.php:70
+msgid "The cookie usage notice"
+msgstr "Powiadomienie o użyciu plików cookie"
+
+#: cookienotice.php:71
 msgid "OK Button Text"
 msgstr "Tekst przycisku OK"
 
-#: cookienotice.php:50
+#: cookienotice.php:71
+msgid "The OK Button text"
+msgstr "Tekst przycisku OK"
+
+#: cookienotice.php:72
 msgid "Save Settings"
 msgstr "Zapisz ustawienia"
 
-#: cookienotice.php:107
+#: cookienotice.php:97
+msgid "cookienotice Settings saved."
+msgstr "Zapisano stawienia plików cookie."
+
+#: cookienotice.php:132
 msgid ""
 "This website uses cookies to recognize revisiting and logged in users. You "
 "accept the usage of these cookies by continue browsing this website."
diff --git a/cookienotice/lang/pl/strings.php b/cookienotice/lang/pl/strings.php
index b46c1647..3643e5ad 100644
--- a/cookienotice/lang/pl/strings.php
+++ b/cookienotice/lang/pl/strings.php
@@ -3,12 +3,17 @@
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
 	$n = intval($n);
-	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
+	return ($n==1 ? 0 : ($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14) ? 1 : $n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14) ? 2 : 3);;
 }}
-$a->strings['This website uses cookies. If you continue browsing this website, you agree to the usage of cookies.'] = 'Ta strona używa plików cookie. Jeśli będziesz kontynuować przeglądanie tej strony, zgadzasz się na użycie plików cookie.';
-$a->strings['OK'] = 'OK';
-$a->strings['<b>Configure your cookie usage notice.</b> It should just be a notice, saying that the website uses cookies. It is shown as long as a user didnt confirm clicking the OK button.'] = '<b>Skonfiguruj zawiadomienie o użyciu plików cookie.</b> Powinien to być po prostu komunikat, że strona korzysta z plików cookie. Jest wyświetlany, o ile użytkownik nie potwierdził, klikając przycisk OK.';
-$a->strings['Cookie Usage Notice'] = 'Użyciu plików cookie';
-$a->strings['OK Button Text'] = 'Tekst przycisku OK';
-$a->strings['Save Settings'] = 'Zapisz ustawienia';
-$a->strings['This website uses cookies to recognize revisiting and logged in users. You accept the usage of these cookies by continue browsing this website.'] = 'Ta strona używa plików cookie do rozpoznawania ponownych odwiedzin i zalogowanych użytkowników. Akceptujesz użycie tych plików cookie, kontynuując przeglądanie tej witryny.';
+;
+$a->strings["This website uses cookies. If you continue browsing this website, you agree to the usage of cookies."] = "Ta strona używa plików cookie. Jeśli będziesz kontynuować przeglądanie tej strony, zgadzasz się na użycie plików cookie.";
+$a->strings["OK"] = "OK";
+$a->strings["\"cookienotice\" Settings"] = "Ustawienia \"plików cookie\"";
+$a->strings["<b>Configure your cookie usage notice.</b> It should just be a notice, saying that the website uses cookies. It is shown as long as a user didnt confirm clicking the OK button."] = "<b>Skonfiguruj zawiadomienie o użyciu plików cookie.</b> Powinien to być po prostu komunikat, że strona korzysta z plików cookie. Jest wyświetlany, o ile użytkownik nie potwierdził, klikając przycisk OK.";
+$a->strings["Cookie Usage Notice"] = "Użyciu plików cookie";
+$a->strings["The cookie usage notice"] = "Powiadomienie o użyciu plików cookie";
+$a->strings["OK Button Text"] = "Tekst przycisku OK";
+$a->strings["The OK Button text"] = "Tekst przycisku OK";
+$a->strings["Save Settings"] = "Zapisz ustawienia";
+$a->strings["cookienotice Settings saved."] = "Zapisano stawienia plików cookie.";
+$a->strings["This website uses cookies to recognize revisiting and logged in users. You accept the usage of these cookies by continue browsing this website."] = "Ta strona używa plików cookie do rozpoznawania ponownych odwiedzin i zalogowanych użytkowników. Akceptujesz użycie tych plików cookie, kontynuując przeglądanie tej witryny.";
diff --git a/cookienotice/lang/sv/messages.po b/cookienotice/lang/sv/messages.po
deleted file mode 100644
index 185ae4d0..00000000
--- a/cookienotice/lang/sv/messages.po
+++ /dev/null
@@ -1,53 +0,0 @@
-# ADDON cookienotice
-# Copyright (C)
-# This file is distributed under the same license as the Friendica cookienotice addon package.
-# 
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2019-01-23 16:01+0000\n"
-"Language-Team: Swedish (https://www.transifex.com/Friendica/teams/12172/sv/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: sv\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: cookienotice.php:42
-msgid ""
-"This website uses cookies. If you continue browsing this website, you agree "
-"to the usage of cookies."
-msgstr ""
-
-#: cookienotice.php:43 cookienotice.php:108
-msgid "OK"
-msgstr ""
-
-#: cookienotice.php:47
-msgid ""
-"<b>Configure your cookie usage notice.</b> It should just be a notice, "
-"saying that the website uses cookies. It is shown as long as a user didnt "
-"confirm clicking the OK button."
-msgstr ""
-
-#: cookienotice.php:48
-msgid "Cookie Usage Notice"
-msgstr ""
-
-#: cookienotice.php:49
-msgid "OK Button Text"
-msgstr ""
-
-#: cookienotice.php:50
-msgid "Save Settings"
-msgstr ""
-
-#: cookienotice.php:107
-msgid ""
-"This website uses cookies to recognize revisiting and logged in users. You "
-"accept the usage of these cookies by continue browsing this website."
-msgstr ""
diff --git a/cookienotice/lang/sv/strings.php b/cookienotice/lang/sv/strings.php
deleted file mode 100644
index 72e9772f..00000000
--- a/cookienotice/lang/sv/strings.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_sv")) {
-function string_plural_select_sv($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
diff --git a/cookienotice/lang/zh-cn/strings.php b/cookienotice/lang/zh-cn/strings.php
index 5e1c07c2..3036b5be 100644
--- a/cookienotice/lang/zh-cn/strings.php
+++ b/cookienotice/lang/zh-cn/strings.php
@@ -3,16 +3,17 @@
 if(! function_exists("string_plural_select_zh_cn")) {
 function string_plural_select_zh_cn($n){
 	$n = intval($n);
-	return intval(0);
+	return 0;;
 }}
-$a->strings['This website uses cookies. If you continue browsing this website, you agree to the usage of cookies.'] = '本网站将使用 cookies。如果您继续浏览本网站，即表示您同意使用 cookies。';
-$a->strings['OK'] = '好的';
-$a->strings['"cookienotice" Settings'] = '“cookie 布告”设置';
-$a->strings['<b>Configure your cookie usage notice.</b> It should just be a notice, saying that the website uses cookies. It is shown as long as a user didnt confirm clicking the OK button.'] = '<b>配置您的 cookie 使用布告。</b> 它将会显示一条布告称此网站使用 cookies 。它将会一直显示直到用户点击确定按钮。';
-$a->strings['Cookie Usage Notice'] = 'Cookie 使用布告';
-$a->strings['The cookie usage notice'] = 'cookie 使用布告';
-$a->strings['OK Button Text'] = '确认按钮文本';
-$a->strings['The OK Button text'] = '确认按钮文本';
-$a->strings['Save Settings'] = '保存设置';
-$a->strings['cookienotice Settings saved.'] = 'cookies 布告设置已保存';
-$a->strings['This website uses cookies to recognize revisiting and logged in users. You accept the usage of these cookies by continue browsing this website.'] = '本网站使用 cookies 来识别登录和重访的用户。如果您继续浏览本网站即表示您接受使用上述 cookies。';
+;
+$a->strings["This website uses cookies. If you continue browsing this website, you agree to the usage of cookies."] = "本网站将使用 cookies。如果您继续浏览本网站，即表示您同意使用 cookies。";
+$a->strings["OK"] = "好的";
+$a->strings["\"cookienotice\" Settings"] = "“cookie 布告”设置";
+$a->strings["<b>Configure your cookie usage notice.</b> It should just be a notice, saying that the website uses cookies. It is shown as long as a user didnt confirm clicking the OK button."] = "<b>配置您的 cookie 使用布告。</b> 它将会显示一条布告称此网站使用 cookies 。它将会一直显示直到用户点击确定按钮。";
+$a->strings["Cookie Usage Notice"] = "Cookie 使用布告";
+$a->strings["The cookie usage notice"] = "cookie 使用布告";
+$a->strings["OK Button Text"] = "确认按钮文本";
+$a->strings["The OK Button text"] = "确认按钮文本";
+$a->strings["Save Settings"] = "保存设置";
+$a->strings["cookienotice Settings saved."] = "cookies 布告设置已保存";
+$a->strings["This website uses cookies to recognize revisiting and logged in users. You accept the usage of these cookies by continue browsing this website."] = "本网站使用 cookies 来识别登录和重访的用户。如果您继续浏览本网站即表示您接受使用上述 cookies。";
diff --git a/curweather/curweather.php b/curweather/curweather.php
index f614840a..df7a701a 100644
--- a/curweather/curweather.php
+++ b/curweather/curweather.php
@@ -10,10 +10,14 @@
  */
 
 use Friendica\App;
-use Friendica\Core\Cache\Enum\Duration;
+use Friendica\Core\Cache;
+use Friendica\Core\Config;
 use Friendica\Core\Hook;
+use Friendica\Core\L10n;
+use Friendica\Core\PConfig;
 use Friendica\Core\Renderer;
-use Friendica\DI;
+use Friendica\Core\Session;
+use Friendica\Util\Network;
 use Friendica\Util\Proxy as ProxyUtils;
 
 function curweather_install()
@@ -23,15 +27,22 @@ function curweather_install()
 	Hook::register('addon_settings_post', 'addon/curweather/curweather.php', 'curweather_addon_settings_post');
 }
 
+function curweather_uninstall()
+{
+	Hook::unregister('network_mod_init'   , 'addon/curweather/curweather.php', 'curweather_network_mod_init');
+	Hook::unregister('addon_settings'     , 'addon/curweather/curweather.php', 'curweather_addon_settings');
+	Hook::unregister('addon_settings_post', 'addon/curweather/curweather.php', 'curweather_addon_settings_post');
+}
+
 //  get the weather data from OpenWeatherMap
 function getWeather($loc, $units = 'metric', $lang = 'en', $appid = '', $cachetime = 0)
 {
 	$url = "http://api.openweathermap.org/data/2.5/weather?q=" . $loc . "&appid=" . $appid . "&lang=" . $lang . "&units=" . $units . "&mode=xml";
-	$cached = DI::cache()->get('curweather'.md5($url));
+	$cached = Cache::get('curweather'.md5($url));
 	$now = new DateTime();
 
 	if (!is_null($cached)) {
-		$cdate = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'curweather', 'last');
+		$cdate = PConfig::get(local_user(), 'curweather', 'last');
 		$cached = unserialize($cached);
 
 		if ($cdate + $cachetime > $now->getTimestamp()) {
@@ -40,10 +51,10 @@ function getWeather($loc, $units = 'metric', $lang = 'en', $appid = '', $cacheti
 	}
 
 	try {
-		$res = new SimpleXMLElement(DI::httpClient()->fetch($url));
+		$res = new SimpleXMLElement(Network::fetchUrl($url));
 	} catch (Exception $e) {
 		if (empty($_SESSION['curweather_notice_shown'])) {
-			DI::sysmsg()->addNotice(DI::l10n()->t('Error fetching weather data. Error was: ' . $e->getMessage()));
+			info(L10n::t('Error fetching weather data. Error was: '.$e->getMessage()));
 			$_SESSION['curweather_notice_shown'] = true;
 		}
 
@@ -80,19 +91,19 @@ function getWeather($loc, $units = 'metric', $lang = 'en', $appid = '', $cacheti
 		'icon'        => (string) $res->weather['icon'],
 	];
 
-	DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'curweather', 'last', $now->getTimestamp());
-	DI::cache()->set('curweather'.md5($url), serialize($r), Duration::HOUR);
+	PConfig::set(local_user(), 'curweather', 'last', $now->getTimestamp());
+	Cache::set('curweather'.md5($url), serialize($r), Cache::HOUR);
 
 	return $r;
 }
 
-function curweather_network_mod_init(string &$body)
+function curweather_network_mod_init(App $a, &$b)
 {
-	if (!intval(DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'curweather', 'curweather_enable'))) {
+	if (!intval(PConfig::get(local_user(), 'curweather', 'curweather_enable'))) {
 		return;
 	}
 
-	DI::page()['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . DI::baseUrl() . '/addon/curweather/curweather.css' . '" media="all" />' . "\r\n";
+	$a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->getBaseURL() . '/addon/curweather/curweather.css' . '" media="all" />' . "\r\n";
 
 	// $rpt value is needed for location
 	// $lang will be taken from the browser session to honour user settings
@@ -103,15 +114,15 @@ function curweather_network_mod_init(string &$body)
 	// those parameters will be used to get: cloud status, temperature, preassure
 	// and relative humidity for display, also the relevent area of the map is
 	// linked from lat/log of the reply of OWMp
-	$rpt = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'curweather', 'curweather_loc');
+	$rpt = PConfig::get(local_user(), 'curweather', 'curweather_loc');
 
 	// Set the language to the browsers language or default and use metric units
-	$lang  = DI::session()->get('language', DI::config()->get('system', 'language'));
-	$units = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'curweather', 'curweather_units');
-	$appid = DI::config()->get('curweather', 'appid');
-	$cachetime = intval(DI::config()->get('curweather', 'cachetime'));
+	$lang = Session::get('language', Config::get('system', 'language'));
+	$units = PConfig::get( local_user(), 'curweather', 'curweather_units');
+	$appid = Config::get('curweather', 'appid');
+	$cachetime = intval(Config::get('curweather', 'cachetime'));
 
-	if ($units === '') {
+	if ($units === "") {
 		$units = 'metric';
 	}
 
@@ -126,116 +137,122 @@ function curweather_network_mod_init(string &$body)
 	if ($ok) {
 		$t = Renderer::getMarkupTemplate("widget.tpl", "addon/curweather/" );
 		$curweather = Renderer::replaceMacros($t, [
-			'$title' => DI::l10n()->t("Current Weather"),
+			'$title' => L10n::t("Current Weather"),
 			'$icon' => ProxyUtils::proxifyUrl('http://openweathermap.org/img/w/'.$res['icon'].'.png'),
 			'$city' => $res['city'],
 			'$lon' => $res['lon'],
 			'$lat' => $res['lat'],
 			'$description' => $res['descripion'],
 			'$temp' => $res['temperature'],
-			'$relhumidity' => ['caption'=>DI::l10n()->t('Relative Humidity'), 'val'=>$res['humidity']],
-			'$pressure' => ['caption'=>DI::l10n()->t('Pressure'), 'val'=>$res['pressure']],
-			'$wind' => ['caption'=>DI::l10n()->t('Wind'), 'val'=> $res['wind']],
-			'$lastupdate' => DI::l10n()->t('Last Updated').': '.$res['update'].'UTC',
-			'$databy' =>  DI::l10n()->t('Data by'),
-			'$showonmap' => DI::l10n()->t('Show on map')
+			'$relhumidity' => ['caption'=>L10n::t('Relative Humidity'), 'val'=>$res['humidity']],
+			'$pressure' => ['caption'=>L10n::t('Pressure'), 'val'=>$res['pressure']],
+			'$wind' => ['caption'=>L10n::t('Wind'), 'val'=> $res['wind']],
+			'$lastupdate' => L10n::t('Last Updated').': '.$res['update'].'UTC',
+			'$databy' =>  L10n::t('Data by'),
+			'$showonmap' => L10n::t('Show on map')
 		]);
 	} else {
 		$t = Renderer::getMarkupTemplate('widget-error.tpl', 'addon/curweather/');
 		$curweather = Renderer::replaceMacros( $t, [
-			'$problem' => DI::l10n()->t('There was a problem accessing the weather data. But have a look'),
+			'$problem' => L10n::t('There was a problem accessing the weather data. But have a look'),
 			'$rpt' => $rpt,
-			'$atOWM' => DI::l10n()->t('at OpenWeatherMap')
+			'$atOWM' => L10n::t('at OpenWeatherMap')
 		]);
 	}
 
-	DI::page()['aside'] = $curweather . DI::page()['aside'];
+	$a->page['aside'] = $curweather . $a->page['aside'];
 }
 
-function curweather_addon_settings_post($post)
+function curweather_addon_settings_post(App $a, $post)
 {
-	if (!DI::userSession()->getLocalUserId() || empty($_POST['curweather-settings-submit'])) {
+	if (!local_user() || empty($_POST['curweather-settings-submit'])) {
 		return;
 	}
 
-	DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'curweather', 'curweather_loc'   , trim($_POST['curweather_loc']));
-	DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'curweather', 'curweather_enable', intval($_POST['curweather_enable']));
-	DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'curweather', 'curweather_units' , trim($_POST['curweather_units']));
+	PConfig::set(local_user(), 'curweather', 'curweather_loc'   , trim($_POST['curweather_loc']));
+	PConfig::set(local_user(), 'curweather', 'curweather_enable', intval($_POST['curweather_enable']));
+	PConfig::set(local_user(), 'curweather', 'curweather_units' , trim($_POST['curweather_units']));
+
+	info(L10n::t('Current Weather settings updated.') . EOL);
 }
 
-function curweather_addon_settings(array &$data)
+function curweather_addon_settings(App $a, &$s)
 {
-	if (!DI::userSession()->getLocalUserId()) {
+	if (!local_user()) {
 		return;
 	}
 
-	$curweather_loc   = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'curweather', 'curweather_loc');
-	$curweather_units = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'curweather', 'curweather_units');
-	$appid            = DI::config()->get('curweather', 'appid');
+	/* Get the current state of our config variable */
+	$curweather_loc = PConfig::get(local_user(), 'curweather', 'curweather_loc');
+	$curweather_units = PConfig::get(local_user(), 'curweather', 'curweather_units');
+	$appid = Config::get('curweather', 'appid');
 
-	if ($appid == '') {
-		$noappidtext = DI::l10n()->t('No APPID found, please contact your admin to obtain one.');
+	if ($appid == "") {
+		$noappidtext = L10n::t('No APPID found, please contact your admin to obtain one.');
 	} else {
 		$noappidtext = '';
 	}
 
-	$enabled = intval(DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'curweather', 'curweather_enable'));
+	$enable = intval(PConfig::get(local_user(), 'curweather', 'curweather_enable'));
+	$enable_checked = (($enable) ? ' checked="checked" ' : '');
+	
+	// load template and replace the macros
+	$t = Renderer::getMarkupTemplate("settings.tpl", "addon/curweather/" );
 
-	$t    = Renderer::getMarkupTemplate('settings.tpl', 'addon/curweather/');
-	$html = Renderer::replaceMacros($t, [
-		'$noappidtext'      => $noappidtext,
-		'$info'             => DI::l10n()->t('Enter either the name of your location or the zip code.'),
-		'$curweather_loc'   => ['curweather_loc', DI::l10n()->t('Your Location'), $curweather_loc, DI::l10n()->t('Identifier of your location (name or zip code), e.g. <em>Berlin,DE</em> or <em>14476,DE</em>.')],
-		'$curweather_units' => ['curweather_units', DI::l10n()->t('Units'), $curweather_units, DI::l10n()->t('select if the temperature should be displayed in &deg;C or &deg;F'), ['metric' => '°C', 'imperial' => '°F']],
-		'$enabled'          => ['curweather_enable', DI::l10n()->t('Show weather data'), $enabled, ''],
+	$s = Renderer::replaceMacros($t, [
+		'$submit' => L10n::t('Save Settings'),
+		'$header' => L10n::t('Current Weather').' '.L10n::t('Settings'),
+		'$noappidtext' => $noappidtext,
+		'$info' => L10n::t('Enter either the name of your location or the zip code.'),
+		'$curweather_loc' => [ 'curweather_loc', L10n::t('Your Location'), $curweather_loc, L10n::t('Identifier of your location (name or zip code), e.g. <em>Berlin,DE</em> or <em>14476,DE</em>.') ],
+		'$curweather_units' => [ 'curweather_units', L10n::t('Units'), $curweather_units, L10n::t('select if the temperature should be displayed in &deg;C or &deg;F'), ['metric'=>'°C', 'imperial'=>'°F']],
+		'$enabled' => [ 'curweather_enable', L10n::t('Show weather data'), $enable, '']
 	]);
 
-	$data = [
-		'addon' => 'curweather',
-		'title' => DI::l10n()->t('Current Weather Settings'),
-		'html'  => $html,
-	];
+	return;
 }
 
 // Config stuff for the admin panel to let the admin of the node set a APPID
 // for accessing the API of openweathermap
-function curweather_addon_admin_post()
+function curweather_addon_admin_post(App $a)
 {
-	if (!DI::userSession()->isSiteAdmin()) {
+	if (!is_site_admin()) {
 		return;
 	}
 
 	if (!empty($_POST['curweather-submit'])) {
-		DI::config()->set('curweather', 'appid',     trim($_POST['appid']));
-		DI::config()->set('curweather', 'cachetime', trim($_POST['cachetime']));
+		Config::set('curweather', 'appid',     trim($_POST['appid']));
+		Config::set('curweather', 'cachetime', trim($_POST['cachetime']));
+
+		info(L10n::t('Curweather settings saved.' . PHP_EOL));
 	}
 }
 
-function curweather_addon_admin(string &$o)
+function curweather_addon_admin(App $a, &$o)
 {
-	if (!DI::userSession()->isSiteAdmin()) {
+	if (!is_site_admin()) {
 		return;
 	}
 
-	$appid = DI::config()->get('curweather', 'appid');
-	$cachetime = DI::config()->get('curweather', 'cachetime');
+	$appid = Config::get('curweather', 'appid');
+	$cachetime = Config::get('curweather', 'cachetime');
 
-	$t = Renderer::getMarkupTemplate('admin.tpl', 'addon/curweather/' );
+	$t = Renderer::getMarkupTemplate("admin.tpl", "addon/curweather/" );
 
 	$o = Renderer::replaceMacros($t, [
-		'$submit' => DI::l10n()->t('Save Settings'),
+		'$submit' => L10n::t('Save Settings'),
 		'$cachetime' => [
 			'cachetime',
-			DI::l10n()->t('Caching Interval'),
+			L10n::t('Caching Interval'),
 			$cachetime,
-			DI::l10n()->t('For how long should the weather data be cached? Choose according your OpenWeatherMap account type.'), [
-				'0'    => DI::l10n()->t('no cache'),
-				'300'  => '5 '  . DI::l10n()->t('minutes'),
-				'900'  => '15 ' . DI::l10n()->t('minutes'),
-				'1800' => '30 ' . DI::l10n()->t('minutes'),
-				'3600' => '60 ' . DI::l10n()->t('minutes')
+			L10n::t('For how long should the weather data be cached? Choose according your OpenWeatherMap account type.'), [
+				'0'    => L10n::t('no cache'),
+				'300'  => '5 '  . L10n::t('minutes'),
+				'900'  => '15 ' . L10n::t('minutes'),
+				'1800' => '30 ' . L10n::t('minutes'),
+				'3600' => '60 ' . L10n::t('minutes')
 			]
 		],
-		'$appid' => ['appid', DI::l10n()->t('Your APPID'), $appid, DI::l10n()->t('Your API key provided by OpenWeatherMap')]
+		'$appid' => ['appid', L10n::t('Your APPID'), $appid, L10n::t('Your API key provided by OpenWeatherMap')]
 	]);
 }
diff --git a/curweather/lang/C/messages.po b/curweather/lang/C/messages.po
index ec442c9c..048c327a 100644
--- a/curweather/lang/C/messages.po
+++ b/curweather/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:14-0500\n"
+"POT-Creation-Date: 2016-09-25 17:17+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,106 +17,114 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: curweather.php:47
-msgid "Error fetching weather data. Error was: "
+#: curweather.php:31
+msgid "Error fetching weather data.\\nError was: "
 msgstr ""
 
-#: curweather.php:130
+#: curweather.php:111 curweather.php:172
 msgid "Current Weather"
 msgstr ""
 
-#: curweather.php:137
+#: curweather.php:118
 msgid "Relative Humidity"
 msgstr ""
 
-#: curweather.php:138
+#: curweather.php:119
 msgid "Pressure"
 msgstr ""
 
-#: curweather.php:139
+#: curweather.php:120
 msgid "Wind"
 msgstr ""
 
-#: curweather.php:140
+#: curweather.php:121
 msgid "Last Updated"
 msgstr ""
 
-#: curweather.php:141
+#: curweather.php:122
 msgid "Data by"
 msgstr ""
 
-#: curweather.php:142
+#: curweather.php:123
 msgid "Show on map"
 msgstr ""
 
-#: curweather.php:147
+#: curweather.php:128
 msgid "There was a problem accessing the weather data. But have a look"
 msgstr ""
 
-#: curweather.php:149
+#: curweather.php:130
 msgid "at OpenWeatherMap"
 msgstr ""
 
-#: curweather.php:178
+#: curweather.php:146
+msgid "Current Weather settings updated."
+msgstr ""
+
+#: curweather.php:161
 msgid "No APPID found, please contact your admin to obtain one."
 msgstr ""
 
-#: curweather.php:188
+#: curweather.php:171 curweather.php:200
+msgid "Save Settings"
+msgstr ""
+
+#: curweather.php:172
+msgid "Settings"
+msgstr ""
+
+#: curweather.php:174
 msgid "Enter either the name of your location or the zip code."
 msgstr ""
 
-#: curweather.php:189
+#: curweather.php:175
 msgid "Your Location"
 msgstr ""
 
-#: curweather.php:189
+#: curweather.php:175
 msgid ""
 "Identifier of your location (name or zip code), e.g. <em>Berlin,DE</em> or "
 "<em>14476,DE</em>."
 msgstr ""
 
-#: curweather.php:190
+#: curweather.php:176
 msgid "Units"
 msgstr ""
 
-#: curweather.php:190
+#: curweather.php:176
 msgid "select if the temperature should be displayed in &deg;C or &deg;F"
 msgstr ""
 
-#: curweather.php:191
+#: curweather.php:177
 msgid "Show weather data"
 msgstr ""
 
-#: curweather.php:196
-msgid "Current Weather Settings"
+#: curweather.php:190
+msgid "Curweather settings saved."
 msgstr ""
 
-#: curweather.php:227
-msgid "Save Settings"
-msgstr ""
-
-#: curweather.php:230
+#: curweather.php:201
 msgid "Caching Interval"
 msgstr ""
 
-#: curweather.php:232
+#: curweather.php:201
 msgid ""
 "For how long should the weather data be cached? Choose according your "
 "OpenWeatherMap account type."
 msgstr ""
 
-#: curweather.php:233
+#: curweather.php:201
 msgid "no cache"
 msgstr ""
 
-#: curweather.php:234 curweather.php:235 curweather.php:236 curweather.php:237
+#: curweather.php:201
 msgid "minutes"
 msgstr ""
 
-#: curweather.php:240
+#: curweather.php:202
 msgid "Your APPID"
 msgstr ""
 
-#: curweather.php:240
+#: curweather.php:202
 msgid "Your API key provided by OpenWeatherMap"
 msgstr ""
diff --git a/curweather/lang/ar/messages.po b/curweather/lang/ar/messages.po
deleted file mode 100644
index fcb766b6..00000000
--- a/curweather/lang/ar/messages.po
+++ /dev/null
@@ -1,125 +0,0 @@
-# ADDON curweather
-# Copyright (C)
-# This file is distributed under the same license as the Friendica curweather addon package.
-# 
-# 
-# Translators:
-# abidin toumi <abidin24@tutanota.com>, 2021
-# Farida Khalaf <faridakhalaf@hotmail.com>, 2021
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2021-10-29 08:35+0000\n"
-"Last-Translator: abidin toumi <abidin24@tutanota.com>\n"
-"Language-Team: Arabic (http://www.transifex.com/Friendica/friendica/language/ar/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ar\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-
-#: curweather.php:47
-msgid "Error fetching weather data. Error was: "
-msgstr "خطأ في جلب بيانات الطقس. كان الخطأ:"
-
-#: curweather.php:130 curweather.php:192
-msgid "Current Weather"
-msgstr "الطقس الحالي"
-
-#: curweather.php:137
-msgid "Relative Humidity"
-msgstr "نسبة الرطوبة "
-
-#: curweather.php:138
-msgid "Pressure"
-msgstr "الضغط"
-
-#: curweather.php:139
-msgid "Wind"
-msgstr "الرياح"
-
-#: curweather.php:140
-msgid "Last Updated"
-msgstr "آخر تحديث"
-
-#: curweather.php:141
-msgid "Data by"
-msgstr "البيانات بواسطة"
-
-#: curweather.php:142
-msgid "Show on map"
-msgstr "إظهار على الخريطة"
-
-#: curweather.php:147
-msgid "There was a problem accessing the weather data. But have a look"
-msgstr "حدثت مشكلة في الوصول إلى بيانات الطقس.  الق نظرة"
-
-#: curweather.php:149
-msgid "at OpenWeatherMap"
-msgstr "في OpenWeatherMap"
-
-#: curweather.php:179
-msgid "No APPID found, please contact your admin to obtain one."
-msgstr "لم يتم العثور على معرف التطبيق ، يرجى الاتصال بالمدير للحصول على واحد."
-
-#: curweather.php:191 curweather.php:229
-msgid "Save Settings"
-msgstr "احفظ الإعدادات"
-
-#: curweather.php:192
-msgid "Settings"
-msgstr "الإعدادات"
-
-#: curweather.php:194
-msgid "Enter either the name of your location or the zip code."
-msgstr "أدخل اسم موقعك الجغرافي أو الرمز البريدي."
-
-#: curweather.php:195
-msgid "Your Location"
-msgstr "موقعك"
-
-#: curweather.php:195
-msgid ""
-"Identifier of your location (name or zip code), e.g. <em>Berlin,DE</em> or "
-"<em>14476,DE</em>."
-msgstr "تعرّيف موقعك (الاسم أو الرمز البريدي) ، على سبيل المثال <em>Berlin,DE</em> أو<em>14476,DE</em> ."
-
-#: curweather.php:196
-msgid "Units"
-msgstr "الوحدات"
-
-#: curweather.php:196
-msgid "select if the temperature should be displayed in &deg;C or &deg;F"
-msgstr "حدد ما إذا كان يجب عرض درجة الحرارة &deg;C أو &deg;F."
-
-#: curweather.php:197
-msgid "Show weather data"
-msgstr "أظهر بيانات الطقس"
-
-#: curweather.php:232
-msgid "Caching Interval"
-msgstr "فترة التخزين المؤقت"
-
-#: curweather.php:234
-msgid ""
-"For how long should the weather data be cached? Choose according your "
-"OpenWeatherMap account type."
-msgstr "إلى متى يجب تخزين بيانات الطقس مؤقتًا؟ اختر وفقًا لنوع حساب OpenWeatherMap. "
-
-#: curweather.php:235
-msgid "no cache"
-msgstr " لا تخزين مؤقت"
-
-#: curweather.php:236 curweather.php:237 curweather.php:238 curweather.php:239
-msgid "minutes"
-msgstr "دقائق"
-
-#: curweather.php:242
-msgid "Your APPID"
-msgstr "معرف التطبيق الخاص بك"
-
-#: curweather.php:242
-msgid "Your API key provided by OpenWeatherMap"
-msgstr " مفتاح API الخاص بك في OpenWeatherMap "
diff --git a/curweather/lang/ar/strings.php b/curweather/lang/ar/strings.php
deleted file mode 100644
index 8721dce3..00000000
--- a/curweather/lang/ar/strings.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_ar")) {
-function string_plural_select_ar($n){
-	$n = intval($n);
-	if ($n==0) { return 0; } else if ($n==1) { return 1; } else if ($n==2) { return 2; } else if ($n%100>=3 && $n%100<=10) { return 3; } else if ($n%100>=11 && $n%100<=99) { return 4; } else  { return 5; }
-}}
-$a->strings['Error fetching weather data. Error was: '] = 'خطأ في جلب بيانات الطقس. كان الخطأ:';
-$a->strings['Current Weather'] = 'الطقس الحالي';
-$a->strings['Relative Humidity'] = 'نسبة الرطوبة ';
-$a->strings['Pressure'] = 'الضغط';
-$a->strings['Wind'] = 'الرياح';
-$a->strings['Last Updated'] = 'آخر تحديث';
-$a->strings['Data by'] = 'البيانات بواسطة';
-$a->strings['Show on map'] = 'إظهار على الخريطة';
-$a->strings['There was a problem accessing the weather data. But have a look'] = 'حدثت مشكلة في الوصول إلى بيانات الطقس.  الق نظرة';
-$a->strings['at OpenWeatherMap'] = 'في OpenWeatherMap';
-$a->strings['No APPID found, please contact your admin to obtain one.'] = 'لم يتم العثور على معرف التطبيق ، يرجى الاتصال بالمدير للحصول على واحد.';
-$a->strings['Save Settings'] = 'احفظ الإعدادات';
-$a->strings['Settings'] = 'الإعدادات';
-$a->strings['Enter either the name of your location or the zip code.'] = 'أدخل اسم موقعك الجغرافي أو الرمز البريدي.';
-$a->strings['Your Location'] = 'موقعك';
-$a->strings['Identifier of your location (name or zip code), e.g. <em>Berlin,DE</em> or <em>14476,DE</em>.'] = 'تعرّيف موقعك (الاسم أو الرمز البريدي) ، على سبيل المثال <em>Berlin,DE</em> أو<em>14476,DE</em> .';
-$a->strings['Units'] = 'الوحدات';
-$a->strings['select if the temperature should be displayed in &deg;C or &deg;F'] = 'حدد ما إذا كان يجب عرض درجة الحرارة &deg;C أو &deg;F.';
-$a->strings['Show weather data'] = 'أظهر بيانات الطقس';
-$a->strings['Caching Interval'] = 'فترة التخزين المؤقت';
-$a->strings['For how long should the weather data be cached? Choose according your OpenWeatherMap account type.'] = 'إلى متى يجب تخزين بيانات الطقس مؤقتًا؟ اختر وفقًا لنوع حساب OpenWeatherMap. ';
-$a->strings['no cache'] = ' لا تخزين مؤقت';
-$a->strings['minutes'] = 'دقائق';
-$a->strings['Your APPID'] = 'معرف التطبيق الخاص بك';
-$a->strings['Your API key provided by OpenWeatherMap'] = ' مفتاح API الخاص بك في OpenWeatherMap ';
diff --git a/curweather/lang/ca/strings.php b/curweather/lang/ca/strings.php
index 6d065223..4fed6616 100644
--- a/curweather/lang/ca/strings.php
+++ b/curweather/lang/ca/strings.php
@@ -3,32 +3,33 @@
 if(! function_exists("string_plural_select_ca")) {
 function string_plural_select_ca($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Error fetching weather data.\nError was: '] = 'S\'ha produït un error en recuperar les dades meteorològiques. \\ NEror ha estat:';
-$a->strings['Current Weather'] = 'Temps actual';
-$a->strings['Relative Humidity'] = 'Humitat relativa';
-$a->strings['Pressure'] = 'pressió';
-$a->strings['Wind'] = 'vent';
-$a->strings['Last Updated'] = 'Última actualització';
-$a->strings['Data by'] = 'Dades de';
-$a->strings['Show on map'] = 'Mostra al mapa';
-$a->strings['There was a problem accessing the weather data. But have a look'] = 'S\'ha produït un problema en accedir a les dades meteorològiques. Però mireu-ho';
-$a->strings['at OpenWeatherMap'] = 'a OpenWeatherMap';
-$a->strings['Current Weather settings updated.'] = 'S\'ha actualitzat la configuració meteorològica actual.';
-$a->strings['No APPID found, please contact your admin to obtain one.'] = 'No s\'ha trobat cap APPID. Poseu-vos en contacte amb l\'administrador per obtenir-ne una.';
-$a->strings['Save Settings'] = 'Desa la configuració';
-$a->strings['Settings'] = 'Configuració';
-$a->strings['Enter either the name of your location or the zip code.'] = 'Introduïu el nom de la vostra ubicació o el codi postal.';
-$a->strings['Your Location'] = 'La teva localització';
-$a->strings['Identifier of your location (name or zip code), e.g. <em>Berlin,DE</em> or <em>14476,DE</em>.'] = 'Identificador de la vostra ubicació (nom o codi postal), e.g. <em>Berlin,DE</em> or <em>14476,DE</em>.';
-$a->strings['Units'] = 'unitat';
-$a->strings['select if the temperature should be displayed in &deg;C or &deg;F'] = 'seleccioneu si la temperatura ha de mostrar-se en ° C o ° F';
-$a->strings['Show weather data'] = 'Mostra dades meteorològiques';
-$a->strings['Curweather settings saved.'] = 'S\'han desat els paràmetres de Curweather.';
-$a->strings['Caching Interval'] = 'Interval de cau';
-$a->strings['For how long should the weather data be cached? Choose according your OpenWeatherMap account type.'] = 'Per quant temps s’han de mantenir en memòria cau les dades meteorològiques? Trieu segons el vostre tipus de compte OpenWeatherMap.';
-$a->strings['no cache'] = 'no cau';
-$a->strings['minutes'] = 'minuts';
-$a->strings['Your APPID'] = 'La vostra APPID';
-$a->strings['Your API key provided by OpenWeatherMap'] = 'La vostra clau d’API proporcionada per OpenWeatherMap';
+;
+$a->strings["Error fetching weather data.\\nError was: "] = "S'ha produït un error en recuperar les dades meteorològiques. \\\\ NEror ha estat:";
+$a->strings["Current Weather"] = "Temps actual";
+$a->strings["Relative Humidity"] = "Humitat relativa";
+$a->strings["Pressure"] = "pressió";
+$a->strings["Wind"] = "vent";
+$a->strings["Last Updated"] = "Última actualització";
+$a->strings["Data by"] = "Dades de";
+$a->strings["Show on map"] = "Mostra al mapa";
+$a->strings["There was a problem accessing the weather data. But have a look"] = "S'ha produït un problema en accedir a les dades meteorològiques. Però mireu-ho";
+$a->strings["at OpenWeatherMap"] = "a OpenWeatherMap";
+$a->strings["Current Weather settings updated."] = "S'ha actualitzat la configuració meteorològica actual.";
+$a->strings["No APPID found, please contact your admin to obtain one."] = "No s'ha trobat cap APPID. Poseu-vos en contacte amb l'administrador per obtenir-ne una.";
+$a->strings["Save Settings"] = "Desa la configuració";
+$a->strings["Settings"] = "Configuració";
+$a->strings["Enter either the name of your location or the zip code."] = "Introduïu el nom de la vostra ubicació o el codi postal.";
+$a->strings["Your Location"] = "La teva localització";
+$a->strings["Identifier of your location (name or zip code), e.g. <em>Berlin,DE</em> or <em>14476,DE</em>."] = "Identificador de la vostra ubicació (nom o codi postal), e.g. <em>Berlin,DE</em> or <em>14476,DE</em>.";
+$a->strings["Units"] = "unitat";
+$a->strings["select if the temperature should be displayed in &deg;C or &deg;F"] = "seleccioneu si la temperatura ha de mostrar-se en ° C o ° F";
+$a->strings["Show weather data"] = "Mostra dades meteorològiques";
+$a->strings["Curweather settings saved."] = "S'han desat els paràmetres de Curweather.";
+$a->strings["Caching Interval"] = "Interval de cau";
+$a->strings["For how long should the weather data be cached? Choose according your OpenWeatherMap account type."] = "Per quant temps s’han de mantenir en memòria cau les dades meteorològiques? Trieu segons el vostre tipus de compte OpenWeatherMap.";
+$a->strings["no cache"] = "no cau";
+$a->strings["minutes"] = "minuts";
+$a->strings["Your APPID"] = "La vostra APPID";
+$a->strings["Your API key provided by OpenWeatherMap"] = "La vostra clau d’API proporcionada per OpenWeatherMap";
diff --git a/curweather/lang/cs/messages.po b/curweather/lang/cs/messages.po
index eddde113..389550eb 100644
--- a/curweather/lang/cs/messages.po
+++ b/curweather/lang/cs/messages.po
@@ -11,116 +11,124 @@ msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:14-0500\n"
-"PO-Revision-Date: 2014-06-22 11:34+0000\n"
-"Last-Translator: Aditoo, 2018\n"
-"Language-Team: Czech (http://app.transifex.com/Friendica/friendica/language/cs/)\n"
+"POT-Creation-Date: 2016-09-25 17:17+0200\n"
+"PO-Revision-Date: 2018-07-05 17:03+0000\n"
+"Last-Translator: Aditoo\n"
+"Language-Team: Czech (http://www.transifex.com/Friendica/friendica/language/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: cs\n"
 "Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
 
-#: curweather.php:47
-msgid "Error fetching weather data. Error was: "
-msgstr ""
+#: curweather.php:31
+msgid "Error fetching weather data.\\nError was: "
+msgstr "Chyba při získávání dat o počasí.\\nChyba:"
 
-#: curweather.php:130
+#: curweather.php:111 curweather.php:172
 msgid "Current Weather"
 msgstr "Aktuální počasí"
 
-#: curweather.php:137
+#: curweather.php:118
 msgid "Relative Humidity"
 msgstr "Relativní vlhkost vzduchu"
 
-#: curweather.php:138
+#: curweather.php:119
 msgid "Pressure"
 msgstr "Tlak"
 
-#: curweather.php:139
+#: curweather.php:120
 msgid "Wind"
 msgstr "Vítr"
 
-#: curweather.php:140
+#: curweather.php:121
 msgid "Last Updated"
 msgstr "Naposledy aktualizováno"
 
-#: curweather.php:141
+#: curweather.php:122
 msgid "Data by"
 msgstr "Data podle"
 
-#: curweather.php:142
+#: curweather.php:123
 msgid "Show on map"
 msgstr "Ukázat na mapě"
 
-#: curweather.php:147
+#: curweather.php:128
 msgid "There was a problem accessing the weather data. But have a look"
 msgstr "Při získávání dat o počasí nastala chyba. Podívejte se ale"
 
-#: curweather.php:149
+#: curweather.php:130
 msgid "at OpenWeatherMap"
 msgstr "na OpenWeatherMap"
 
-#: curweather.php:178
+#: curweather.php:146
+msgid "Current Weather settings updated."
+msgstr "Nastavení pro Aktuální počasí aktualizováno."
+
+#: curweather.php:161
 msgid "No APPID found, please contact your admin to obtain one."
 msgstr "Žádné APPID nebylo nalezeno, prosím kontaktujte svého administrátora pro získání APPID."
 
-#: curweather.php:188
+#: curweather.php:171 curweather.php:200
+msgid "Save Settings"
+msgstr "Uložit nastavení"
+
+#: curweather.php:172
+msgid "Settings"
+msgstr "Nastavení"
+
+#: curweather.php:174
 msgid "Enter either the name of your location or the zip code."
 msgstr "Zadejte buď název místa, kde se nacházíte, nebo PSČ."
 
-#: curweather.php:189
+#: curweather.php:175
 msgid "Your Location"
 msgstr "Vaše poloha"
 
-#: curweather.php:189
+#: curweather.php:175
 msgid ""
 "Identifier of your location (name or zip code), e.g. <em>Berlin,DE</em> or "
 "<em>14476,DE</em>."
 msgstr "Identifikátor vaší polohy (název nebo PSČ), např. <em>Praha,CZ</em> nebo <em>11000,CZ</em>."
 
-#: curweather.php:190
+#: curweather.php:176
 msgid "Units"
 msgstr "Jednotky"
 
-#: curweather.php:190
+#: curweather.php:176
 msgid "select if the temperature should be displayed in &deg;C or &deg;F"
 msgstr "vyberte, jestli by se teplota měla zobrazovat v &deg;C či &deg;F"
 
-#: curweather.php:191
+#: curweather.php:177
 msgid "Show weather data"
 msgstr "Ukázat data o počasí"
 
-#: curweather.php:196
-msgid "Current Weather Settings"
-msgstr ""
+#: curweather.php:190
+msgid "Curweather settings saved."
+msgstr "Nastavení Curwather uložena."
 
-#: curweather.php:227
-msgid "Save Settings"
-msgstr "Uložit nastavení"
-
-#: curweather.php:230
+#: curweather.php:201
 msgid "Caching Interval"
-msgstr "Interval mezipaměti"
+msgstr "Ukládám interval do mezipaměti"
 
-#: curweather.php:232
+#: curweather.php:201
 msgid ""
 "For how long should the weather data be cached? Choose according your "
 "OpenWeatherMap account type."
 msgstr "Na jak dlouho by vaše data o počasí měla být uložena v mezipaměti? Vyberte podle typu vašeho účtu na OpenWeatherMap."
 
-#: curweather.php:233
+#: curweather.php:201
 msgid "no cache"
 msgstr "žádná mezipaměť"
 
-#: curweather.php:234 curweather.php:235 curweather.php:236 curweather.php:237
+#: curweather.php:201
 msgid "minutes"
 msgstr "minut"
 
-#: curweather.php:240
+#: curweather.php:202
 msgid "Your APPID"
 msgstr "Vaše APPID"
 
-#: curweather.php:240
+#: curweather.php:202
 msgid "Your API key provided by OpenWeatherMap"
 msgstr "Váš API klíč poskytnutý OpenWetherMap"
diff --git a/curweather/lang/cs/strings.php b/curweather/lang/cs/strings.php
index 78baa8a7..565fe7d7 100644
--- a/curweather/lang/cs/strings.php
+++ b/curweather/lang/cs/strings.php
@@ -3,28 +3,33 @@
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
 	$n = intval($n);
-	if (($n == 1 && $n % 1 == 0)) { return 0; } else if (($n >= 2 && $n <= 4 && $n % 1 == 0)) { return 1; } else if (($n % 1 != 0 )) { return 2; } else  { return 3; }
+	return ($n == 1 && $n % 1 == 0) ? 0 : ($n >= 2 && $n <= 4 && $n % 1 == 0) ? 1: ($n % 1 != 0 ) ? 2 : 3;;
 }}
-$a->strings['Current Weather'] = 'Aktuální počasí';
-$a->strings['Relative Humidity'] = 'Relativní vlhkost vzduchu';
-$a->strings['Pressure'] = 'Tlak';
-$a->strings['Wind'] = 'Vítr';
-$a->strings['Last Updated'] = 'Naposledy aktualizováno';
-$a->strings['Data by'] = 'Data podle';
-$a->strings['Show on map'] = 'Ukázat na mapě';
-$a->strings['There was a problem accessing the weather data. But have a look'] = 'Při získávání dat o počasí nastala chyba. Podívejte se ale';
-$a->strings['at OpenWeatherMap'] = 'na OpenWeatherMap';
-$a->strings['No APPID found, please contact your admin to obtain one.'] = 'Žádné APPID nebylo nalezeno, prosím kontaktujte svého administrátora pro získání APPID.';
-$a->strings['Enter either the name of your location or the zip code.'] = 'Zadejte buď název místa, kde se nacházíte, nebo PSČ.';
-$a->strings['Your Location'] = 'Vaše poloha';
-$a->strings['Identifier of your location (name or zip code), e.g. <em>Berlin,DE</em> or <em>14476,DE</em>.'] = 'Identifikátor vaší polohy (název nebo PSČ), např. <em>Praha,CZ</em> nebo <em>11000,CZ</em>.';
-$a->strings['Units'] = 'Jednotky';
-$a->strings['select if the temperature should be displayed in &deg;C or &deg;F'] = 'vyberte, jestli by se teplota měla zobrazovat v &deg;C či &deg;F';
-$a->strings['Show weather data'] = 'Ukázat data o počasí';
-$a->strings['Save Settings'] = 'Uložit nastavení';
-$a->strings['Caching Interval'] = 'Interval mezipaměti';
-$a->strings['For how long should the weather data be cached? Choose according your OpenWeatherMap account type.'] = 'Na jak dlouho by vaše data o počasí měla být uložena v mezipaměti? Vyberte podle typu vašeho účtu na OpenWeatherMap.';
-$a->strings['no cache'] = 'žádná mezipaměť';
-$a->strings['minutes'] = 'minut';
-$a->strings['Your APPID'] = 'Vaše APPID';
-$a->strings['Your API key provided by OpenWeatherMap'] = 'Váš API klíč poskytnutý OpenWetherMap';
+;
+$a->strings["Error fetching weather data.\\nError was: "] = "Chyba při získávání dat o počasí.\\nChyba:";
+$a->strings["Current Weather"] = "Aktuální počasí";
+$a->strings["Relative Humidity"] = "Relativní vlhkost vzduchu";
+$a->strings["Pressure"] = "Tlak";
+$a->strings["Wind"] = "Vítr";
+$a->strings["Last Updated"] = "Naposledy aktualizováno";
+$a->strings["Data by"] = "Data podle";
+$a->strings["Show on map"] = "Ukázat na mapě";
+$a->strings["There was a problem accessing the weather data. But have a look"] = "Při získávání dat o počasí nastala chyba. Podívejte se ale";
+$a->strings["at OpenWeatherMap"] = "na OpenWeatherMap";
+$a->strings["Current Weather settings updated."] = "Nastavení pro Aktuální počasí aktualizováno.";
+$a->strings["No APPID found, please contact your admin to obtain one."] = "Žádné APPID nebylo nalezeno, prosím kontaktujte svého administrátora pro získání APPID.";
+$a->strings["Save Settings"] = "Uložit nastavení";
+$a->strings["Settings"] = "Nastavení";
+$a->strings["Enter either the name of your location or the zip code."] = "Zadejte buď název místa, kde se nacházíte, nebo PSČ.";
+$a->strings["Your Location"] = "Vaše poloha";
+$a->strings["Identifier of your location (name or zip code), e.g. <em>Berlin,DE</em> or <em>14476,DE</em>."] = "Identifikátor vaší polohy (název nebo PSČ), např. <em>Praha,CZ</em> nebo <em>11000,CZ</em>.";
+$a->strings["Units"] = "Jednotky";
+$a->strings["select if the temperature should be displayed in &deg;C or &deg;F"] = "vyberte, jestli by se teplota měla zobrazovat v &deg;C či &deg;F";
+$a->strings["Show weather data"] = "Ukázat data o počasí";
+$a->strings["Curweather settings saved."] = "Nastavení Curwather uložena.";
+$a->strings["Caching Interval"] = "Ukládám interval do mezipaměti";
+$a->strings["For how long should the weather data be cached? Choose according your OpenWeatherMap account type."] = "Na jak dlouho by vaše data o počasí měla být uložena v mezipaměti? Vyberte podle typu vašeho účtu na OpenWeatherMap.";
+$a->strings["no cache"] = "žádná mezipaměť";
+$a->strings["minutes"] = "minut";
+$a->strings["Your APPID"] = "Vaše APPID";
+$a->strings["Your API key provided by OpenWeatherMap"] = "Váš API klíč poskytnutý OpenWetherMap";
diff --git a/curweather/lang/da-dk/messages.po b/curweather/lang/da-dk/messages.po
deleted file mode 100644
index 0fb7fa38..00000000
--- a/curweather/lang/da-dk/messages.po
+++ /dev/null
@@ -1,123 +0,0 @@
-# ADDON curweather
-# Copyright (C)
-# This file is distributed under the same license as the Friendica curweather addon package.
-# 
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:14-0500\n"
-"PO-Revision-Date: 2014-06-22 11:34+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Danish (Denmark) (http://www.transifex.com/Friendica/friendica/language/da_DK/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: da_DK\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: curweather.php:47
-msgid "Error fetching weather data. Error was: "
-msgstr ""
-
-#: curweather.php:130
-msgid "Current Weather"
-msgstr ""
-
-#: curweather.php:137
-msgid "Relative Humidity"
-msgstr ""
-
-#: curweather.php:138
-msgid "Pressure"
-msgstr ""
-
-#: curweather.php:139
-msgid "Wind"
-msgstr ""
-
-#: curweather.php:140
-msgid "Last Updated"
-msgstr ""
-
-#: curweather.php:141
-msgid "Data by"
-msgstr ""
-
-#: curweather.php:142
-msgid "Show on map"
-msgstr ""
-
-#: curweather.php:147
-msgid "There was a problem accessing the weather data. But have a look"
-msgstr ""
-
-#: curweather.php:149
-msgid "at OpenWeatherMap"
-msgstr ""
-
-#: curweather.php:178
-msgid "No APPID found, please contact your admin to obtain one."
-msgstr ""
-
-#: curweather.php:188
-msgid "Enter either the name of your location or the zip code."
-msgstr ""
-
-#: curweather.php:189
-msgid "Your Location"
-msgstr ""
-
-#: curweather.php:189
-msgid ""
-"Identifier of your location (name or zip code), e.g. <em>Berlin,DE</em> or "
-"<em>14476,DE</em>."
-msgstr ""
-
-#: curweather.php:190
-msgid "Units"
-msgstr ""
-
-#: curweather.php:190
-msgid "select if the temperature should be displayed in &deg;C or &deg;F"
-msgstr ""
-
-#: curweather.php:191
-msgid "Show weather data"
-msgstr ""
-
-#: curweather.php:196
-msgid "Current Weather Settings"
-msgstr ""
-
-#: curweather.php:227
-msgid "Save Settings"
-msgstr ""
-
-#: curweather.php:230
-msgid "Caching Interval"
-msgstr ""
-
-#: curweather.php:232
-msgid ""
-"For how long should the weather data be cached? Choose according your "
-"OpenWeatherMap account type."
-msgstr ""
-
-#: curweather.php:233
-msgid "no cache"
-msgstr ""
-
-#: curweather.php:234 curweather.php:235 curweather.php:236 curweather.php:237
-msgid "minutes"
-msgstr ""
-
-#: curweather.php:240
-msgid "Your APPID"
-msgstr ""
-
-#: curweather.php:240
-msgid "Your API key provided by OpenWeatherMap"
-msgstr ""
diff --git a/curweather/lang/da-dk/strings.php b/curweather/lang/da-dk/strings.php
deleted file mode 100644
index 09554750..00000000
--- a/curweather/lang/da-dk/strings.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_da_dk")) {
-function string_plural_select_da_dk($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
diff --git a/curweather/lang/de/messages.po b/curweather/lang/de/messages.po
index 15557ba5..0f76e2cb 100644
--- a/curweather/lang/de/messages.po
+++ b/curweather/lang/de/messages.po
@@ -6,124 +6,130 @@
 # Translators:
 # Andreas H., 2014
 # Oliver <post@toktan.org>, 2016
-# Till Mohr <tmtrfx@till-mohr.de>, 2021
 # Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2014-2015
-# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2016,2021-2022
-# Ulf Rompe <transifex.com@rompe.org>, 2019
+# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:14-0500\n"
-"PO-Revision-Date: 2014-06-22 11:34+0000\n"
-"Last-Translator: Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2016,2021-2022\n"
-"Language-Team: German (http://app.transifex.com/Friendica/friendica/language/de/)\n"
+"POT-Creation-Date: 2016-09-25 17:17+0200\n"
+"PO-Revision-Date: 2016-09-26 10:17+0000\n"
+"Last-Translator: Tobias Diekershoff <tobias.diekershoff@gmx.net>\n"
+"Language-Team: German (http://www.transifex.com/Friendica/friendica/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: curweather.php:47
-msgid "Error fetching weather data. Error was: "
-msgstr "Fehler beim Abrufen der Wetterdaten. Die Fehlermeldung lautet:"
+#: curweather.php:31
+msgid "Error fetching weather data.\\nError was: "
+msgstr "Fehler beim abrufen der Wetterdaten.\\nDie Fehlermeldung lautet:"
 
-#: curweather.php:130
+#: curweather.php:111 curweather.php:172
 msgid "Current Weather"
 msgstr "Aktuelles Wetter"
 
-#: curweather.php:137
+#: curweather.php:118
 msgid "Relative Humidity"
 msgstr "Relative Luftfeuchtigkeit"
 
-#: curweather.php:138
+#: curweather.php:119
 msgid "Pressure"
 msgstr "Luftdruck"
 
-#: curweather.php:139
+#: curweather.php:120
 msgid "Wind"
 msgstr "Wind"
 
-#: curweather.php:140
+#: curweather.php:121
 msgid "Last Updated"
 msgstr "Letzte Aktualisierung"
 
-#: curweather.php:141
+#: curweather.php:122
 msgid "Data by"
 msgstr "Daten von"
 
-#: curweather.php:142
+#: curweather.php:123
 msgid "Show on map"
 msgstr "Karte anzeigen"
 
-#: curweather.php:147
+#: curweather.php:128
 msgid "There was a problem accessing the weather data. But have a look"
-msgstr "Es gab ein Problem beim Abrufen der Wetterdaten. Aber wirf doch mal einen Blick"
+msgstr "Es gab ein Problem beim Abrufen der Wetterdaten. Aber werf doch mal einen Blick"
 
-#: curweather.php:149
+#: curweather.php:130
 msgid "at OpenWeatherMap"
 msgstr "auf OpenWeatherMap"
 
-#: curweather.php:178
-msgid "No APPID found, please contact your admin to obtain one."
-msgstr "Keine APPID gefunden, bitte kontaktiere deinen Admin, damit eine eingerichtet wird."
+#: curweather.php:146
+msgid "Current Weather settings updated."
+msgstr "Einstellungen des Aktuellen Wetter Addons aktualisiert."
 
-#: curweather.php:188
+#: curweather.php:161
+msgid "No APPID found, please contact your admin to obtain one."
+msgstr "Keine APPID gefunden, bitte kontaktiere deinen Admin damit eine eingerichtet wird."
+
+#: curweather.php:171 curweather.php:200
+msgid "Save Settings"
+msgstr "Einstellungen speichern"
+
+#: curweather.php:172
+msgid "Settings"
+msgstr "Einstellungen"
+
+#: curweather.php:174
 msgid "Enter either the name of your location or the zip code."
 msgstr "Gib entweder den Namen oder die PLZ deines Ortes ein."
 
-#: curweather.php:189
+#: curweather.php:175
 msgid "Your Location"
 msgstr "Deinen Standort festlegen"
 
-#: curweather.php:189
+#: curweather.php:175
 msgid ""
 "Identifier of your location (name or zip code), e.g. <em>Berlin,DE</em> or "
 "<em>14476,DE</em>."
 msgstr "Identifikator deines Standorts (Name oder Postleitzahl), z.B. <em>Berlin,DE</em> oder <em>14476,DE</em>."
 
-#: curweather.php:190
+#: curweather.php:176
 msgid "Units"
 msgstr "Einheiten"
 
-#: curweather.php:190
+#: curweather.php:176
 msgid "select if the temperature should be displayed in &deg;C or &deg;F"
-msgstr "wähle, ob die Temperatur in &deg;C oder &deg;F angezeigt werden soll"
+msgstr "wähle ob die Temperatur in &deg;C oder &deg;F angezeigt werden soll"
 
-#: curweather.php:191
+#: curweather.php:177
 msgid "Show weather data"
-msgstr "Zeige Wetterdaten"
+msgstr "Zeige Wetter Daten"
 
-#: curweather.php:196
-msgid "Current Weather Settings"
-msgstr "Aktuelles Wetter Einstellungen"
+#: curweather.php:190
+msgid "Curweather settings saved."
+msgstr "Curweather Einstellungen gespeichert."
 
-#: curweather.php:227
-msgid "Save Settings"
-msgstr "Einstellungen speichern"
-
-#: curweather.php:230
+#: curweather.php:201
 msgid "Caching Interval"
-msgstr "Cache-Intervall"
+msgstr "Cache Intervall"
 
-#: curweather.php:232
+#: curweather.php:201
 msgid ""
 "For how long should the weather data be cached? Choose according your "
 "OpenWeatherMap account type."
-msgstr "Wie lange sollen die Wetterdaten zwischengespeichert werden? Wähle eine für deinen OpenWeatherMap-Account passende Einstellung."
+msgstr "Wie lange sollen die Wetter Daten gecached werden? Wähle einen für deinen OpenWeatherMap Account passende Einstellung."
 
-#: curweather.php:233
+#: curweather.php:201
 msgid "no cache"
 msgstr "kein Cache"
 
-#: curweather.php:234 curweather.php:235 curweather.php:236 curweather.php:237
+#: curweather.php:201
 msgid "minutes"
 msgstr "Minuten"
 
-#: curweather.php:240
+#: curweather.php:202
 msgid "Your APPID"
 msgstr "Deine APPID"
 
-#: curweather.php:240
+#: curweather.php:202
 msgid "Your API key provided by OpenWeatherMap"
-msgstr "Der API-Schlüssel von OpenWeatherMap"
+msgstr "Der API Schlüssel von OpenWeatherMap"
diff --git a/curweather/lang/de/strings.php b/curweather/lang/de/strings.php
index 89980429..2f1f0e3d 100644
--- a/curweather/lang/de/strings.php
+++ b/curweather/lang/de/strings.php
@@ -2,31 +2,33 @@
 
 if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Error fetching weather data. Error was: '] = 'Fehler beim Abrufen der Wetterdaten. Die Fehlermeldung lautet:';
-$a->strings['Current Weather'] = 'Aktuelles Wetter';
-$a->strings['Relative Humidity'] = 'Relative Luftfeuchtigkeit';
-$a->strings['Pressure'] = 'Luftdruck';
-$a->strings['Wind'] = 'Wind';
-$a->strings['Last Updated'] = 'Letzte Aktualisierung';
-$a->strings['Data by'] = 'Daten von';
-$a->strings['Show on map'] = 'Karte anzeigen';
-$a->strings['There was a problem accessing the weather data. But have a look'] = 'Es gab ein Problem beim Abrufen der Wetterdaten. Aber wirf doch mal einen Blick';
-$a->strings['at OpenWeatherMap'] = 'auf OpenWeatherMap';
-$a->strings['No APPID found, please contact your admin to obtain one.'] = 'Keine APPID gefunden, bitte kontaktiere deinen Admin, damit eine eingerichtet wird.';
-$a->strings['Enter either the name of your location or the zip code.'] = 'Gib entweder den Namen oder die PLZ deines Ortes ein.';
-$a->strings['Your Location'] = 'Deinen Standort festlegen';
-$a->strings['Identifier of your location (name or zip code), e.g. <em>Berlin,DE</em> or <em>14476,DE</em>.'] = 'Identifikator deines Standorts (Name oder Postleitzahl), z.B. <em>Berlin,DE</em> oder <em>14476,DE</em>.';
-$a->strings['Units'] = 'Einheiten';
-$a->strings['select if the temperature should be displayed in &deg;C or &deg;F'] = 'wähle, ob die Temperatur in &deg;C oder &deg;F angezeigt werden soll';
-$a->strings['Show weather data'] = 'Zeige Wetterdaten';
-$a->strings['Current Weather Settings'] = 'Aktuelles Wetter Einstellungen';
-$a->strings['Save Settings'] = 'Einstellungen speichern';
-$a->strings['Caching Interval'] = 'Cache-Intervall';
-$a->strings['For how long should the weather data be cached? Choose according your OpenWeatherMap account type.'] = 'Wie lange sollen die Wetterdaten zwischengespeichert werden? Wähle eine für deinen OpenWeatherMap-Account passende Einstellung.';
-$a->strings['no cache'] = 'kein Cache';
-$a->strings['minutes'] = 'Minuten';
-$a->strings['Your APPID'] = 'Deine APPID';
-$a->strings['Your API key provided by OpenWeatherMap'] = 'Der API-Schlüssel von OpenWeatherMap';
+;
+$a->strings["Error fetching weather data.\\nError was: "] = "Fehler beim abrufen der Wetterdaten.\\nDie Fehlermeldung lautet:";
+$a->strings["Current Weather"] = "Aktuelles Wetter";
+$a->strings["Relative Humidity"] = "Relative Luftfeuchtigkeit";
+$a->strings["Pressure"] = "Luftdruck";
+$a->strings["Wind"] = "Wind";
+$a->strings["Last Updated"] = "Letzte Aktualisierung";
+$a->strings["Data by"] = "Daten von";
+$a->strings["Show on map"] = "Karte anzeigen";
+$a->strings["There was a problem accessing the weather data. But have a look"] = "Es gab ein Problem beim Abrufen der Wetterdaten. Aber werf doch mal einen Blick";
+$a->strings["at OpenWeatherMap"] = "auf OpenWeatherMap";
+$a->strings["Current Weather settings updated."] = "Einstellungen des Aktuellen Wetter Addons aktualisiert.";
+$a->strings["No APPID found, please contact your admin to obtain one."] = "Keine APPID gefunden, bitte kontaktiere deinen Admin damit eine eingerichtet wird.";
+$a->strings["Save Settings"] = "Einstellungen speichern";
+$a->strings["Settings"] = "Einstellungen";
+$a->strings["Enter either the name of your location or the zip code."] = "Gib entweder den Namen oder die PLZ deines Ortes ein.";
+$a->strings["Your Location"] = "Deinen Standort festlegen";
+$a->strings["Identifier of your location (name or zip code), e.g. <em>Berlin,DE</em> or <em>14476,DE</em>."] = "Identifikator deines Standorts (Name oder Postleitzahl), z.B. <em>Berlin,DE</em> oder <em>14476,DE</em>.";
+$a->strings["Units"] = "Einheiten";
+$a->strings["select if the temperature should be displayed in &deg;C or &deg;F"] = "wähle ob die Temperatur in &deg;C oder &deg;F angezeigt werden soll";
+$a->strings["Show weather data"] = "Zeige Wetter Daten";
+$a->strings["Curweather settings saved."] = "Curweather Einstellungen gespeichert.";
+$a->strings["Caching Interval"] = "Cache Intervall";
+$a->strings["For how long should the weather data be cached? Choose according your OpenWeatherMap account type."] = "Wie lange sollen die Wetter Daten gecached werden? Wähle einen für deinen OpenWeatherMap Account passende Einstellung.";
+$a->strings["no cache"] = "kein Cache";
+$a->strings["minutes"] = "Minuten";
+$a->strings["Your APPID"] = "Deine APPID";
+$a->strings["Your API key provided by OpenWeatherMap"] = "Der API Schlüssel von OpenWeatherMap";
diff --git a/curweather/lang/es/messages.po b/curweather/lang/es/messages.po
index 9678d701..6dfd444d 100644
--- a/curweather/lang/es/messages.po
+++ b/curweather/lang/es/messages.po
@@ -4,15 +4,14 @@
 # 
 # 
 # Translators:
-# Albert, 2016
-# Senex Petrovic <javierruizo@hotmail.com>, 2021
+# Alberto Díaz Tormo <albertodiaztormo@gmail.com>, 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2021-04-01 09:48+0000\n"
-"Last-Translator: Senex Petrovic <javierruizo@hotmail.com>\n"
+"POT-Creation-Date: 2016-09-25 17:17+0200\n"
+"PO-Revision-Date: 2016-10-23 11:30+0000\n"
+"Last-Translator: Alberto Díaz Tormo <albertodiaztormo@gmail.com>\n"
 "Language-Team: Spanish (http://www.transifex.com/Friendica/friendica/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,106 +19,114 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: curweather.php:47
-msgid "Error fetching weather data. Error was: "
-msgstr "Error al obtener datos meteorológicos. El error fue:"
+#: curweather.php:31
+msgid "Error fetching weather data.\\nError was: "
+msgstr "Error al traer información del clima.\\nError era: "
 
-#: curweather.php:130 curweather.php:192
+#: curweather.php:111 curweather.php:172
 msgid "Current Weather"
 msgstr "Clima actual"
 
-#: curweather.php:137
+#: curweather.php:118
 msgid "Relative Humidity"
 msgstr "Humedad relativa"
 
-#: curweather.php:138
+#: curweather.php:119
 msgid "Pressure"
 msgstr "Presión"
 
-#: curweather.php:139
+#: curweather.php:120
 msgid "Wind"
 msgstr "Viento"
 
-#: curweather.php:140
+#: curweather.php:121
 msgid "Last Updated"
 msgstr "Última actualización"
 
-#: curweather.php:141
+#: curweather.php:122
 msgid "Data by"
 msgstr "Información por"
 
-#: curweather.php:142
+#: curweather.php:123
 msgid "Show on map"
 msgstr "Mostrar en mapa"
 
-#: curweather.php:147
+#: curweather.php:128
 msgid "There was a problem accessing the weather data. But have a look"
 msgstr "Hubo un problema al acceder a la información del clima. Pero eche un vistazo"
 
-#: curweather.php:149
+#: curweather.php:130
 msgid "at OpenWeatherMap"
 msgstr "en OpenWeatherMap"
 
-#: curweather.php:179
+#: curweather.php:146
+msgid "Current Weather settings updated."
+msgstr "Ajustes de clima actual actualizados"
+
+#: curweather.php:161
 msgid "No APPID found, please contact your admin to obtain one."
 msgstr "No se encontró APPID, por favor contacte con su administrador para obtener una."
 
-#: curweather.php:191 curweather.php:229
+#: curweather.php:171 curweather.php:200
 msgid "Save Settings"
 msgstr "Guardar ajustes"
 
-#: curweather.php:192
+#: curweather.php:172
 msgid "Settings"
 msgstr "Ajustes"
 
-#: curweather.php:194
+#: curweather.php:174
 msgid "Enter either the name of your location or the zip code."
 msgstr "Introduzca el nombre de su ubicación o el código postal."
 
-#: curweather.php:195
+#: curweather.php:175
 msgid "Your Location"
 msgstr "Su ubicación"
 
-#: curweather.php:195
+#: curweather.php:175
 msgid ""
 "Identifier of your location (name or zip code), e.g. <em>Berlin,DE</em> or "
 "<em>14476,DE</em>."
 msgstr "Identificador de su ubicación (nombre o código postal), ej. <em>Berlin,DE</em> o <em>14476,DE</em>."
 
-#: curweather.php:196
+#: curweather.php:176
 msgid "Units"
 msgstr "Unidades"
 
-#: curweather.php:196
+#: curweather.php:176
 msgid "select if the temperature should be displayed in &deg;C or &deg;F"
 msgstr "seleccionar si la temperatura debería ser mostrada en &deg;C o &deg;F"
 
-#: curweather.php:197
+#: curweather.php:177
 msgid "Show weather data"
 msgstr "Mostrar información de clima"
 
-#: curweather.php:232
+#: curweather.php:190
+msgid "Curweather settings saved."
+msgstr "Ajustes de clima guardados."
+
+#: curweather.php:201
 msgid "Caching Interval"
 msgstr "Obteniendo intervalo"
 
-#: curweather.php:234
+#: curweather.php:201
 msgid ""
 "For how long should the weather data be cached? Choose according your "
 "OpenWeatherMap account type."
 msgstr "¿Durante cuánto tiempo debería ser obtenida la información de clima? Eliga de acuerdo a su tipo de cuenta de OpenWeatherMap."
 
-#: curweather.php:235
+#: curweather.php:201
 msgid "no cache"
 msgstr "sin almacenamiento"
 
-#: curweather.php:236 curweather.php:237 curweather.php:238 curweather.php:239
+#: curweather.php:201
 msgid "minutes"
 msgstr "minutos"
 
-#: curweather.php:242
+#: curweather.php:202
 msgid "Your APPID"
 msgstr "Su APPID"
 
-#: curweather.php:242
+#: curweather.php:202
 msgid "Your API key provided by OpenWeatherMap"
 msgstr "Su clave API provista por OpenWeatherMap"
diff --git a/curweather/lang/es/strings.php b/curweather/lang/es/strings.php
index 25f3f22a..f968076a 100644
--- a/curweather/lang/es/strings.php
+++ b/curweather/lang/es/strings.php
@@ -2,31 +2,33 @@
 
 if(! function_exists("string_plural_select_es")) {
 function string_plural_select_es($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Error fetching weather data. Error was: '] = 'Error al obtener datos meteorológicos. El error fue:';
-$a->strings['Current Weather'] = 'Clima actual';
-$a->strings['Relative Humidity'] = 'Humedad relativa';
-$a->strings['Pressure'] = 'Presión';
-$a->strings['Wind'] = 'Viento';
-$a->strings['Last Updated'] = 'Última actualización';
-$a->strings['Data by'] = 'Información por';
-$a->strings['Show on map'] = 'Mostrar en mapa';
-$a->strings['There was a problem accessing the weather data. But have a look'] = 'Hubo un problema al acceder a la información del clima. Pero eche un vistazo';
-$a->strings['at OpenWeatherMap'] = 'en OpenWeatherMap';
-$a->strings['No APPID found, please contact your admin to obtain one.'] = 'No se encontró APPID, por favor contacte con su administrador para obtener una.';
-$a->strings['Save Settings'] = 'Guardar ajustes';
-$a->strings['Settings'] = 'Ajustes';
-$a->strings['Enter either the name of your location or the zip code.'] = 'Introduzca el nombre de su ubicación o el código postal.';
-$a->strings['Your Location'] = 'Su ubicación';
-$a->strings['Identifier of your location (name or zip code), e.g. <em>Berlin,DE</em> or <em>14476,DE</em>.'] = 'Identificador de su ubicación (nombre o código postal), ej. <em>Berlin,DE</em> o <em>14476,DE</em>.';
-$a->strings['Units'] = 'Unidades';
-$a->strings['select if the temperature should be displayed in &deg;C or &deg;F'] = 'seleccionar si la temperatura debería ser mostrada en &deg;C o &deg;F';
-$a->strings['Show weather data'] = 'Mostrar información de clima';
-$a->strings['Caching Interval'] = 'Obteniendo intervalo';
-$a->strings['For how long should the weather data be cached? Choose according your OpenWeatherMap account type.'] = '¿Durante cuánto tiempo debería ser obtenida la información de clima? Eliga de acuerdo a su tipo de cuenta de OpenWeatherMap.';
-$a->strings['no cache'] = 'sin almacenamiento';
-$a->strings['minutes'] = 'minutos';
-$a->strings['Your APPID'] = 'Su APPID';
-$a->strings['Your API key provided by OpenWeatherMap'] = 'Su clave API provista por OpenWeatherMap';
+;
+$a->strings["Error fetching weather data.\\nError was: "] = "Error al traer información del clima.\\nError era: ";
+$a->strings["Current Weather"] = "Clima actual";
+$a->strings["Relative Humidity"] = "Humedad relativa";
+$a->strings["Pressure"] = "Presión";
+$a->strings["Wind"] = "Viento";
+$a->strings["Last Updated"] = "Última actualización";
+$a->strings["Data by"] = "Información por";
+$a->strings["Show on map"] = "Mostrar en mapa";
+$a->strings["There was a problem accessing the weather data. But have a look"] = "Hubo un problema al acceder a la información del clima. Pero eche un vistazo";
+$a->strings["at OpenWeatherMap"] = "en OpenWeatherMap";
+$a->strings["Current Weather settings updated."] = "Ajustes de clima actual actualizados";
+$a->strings["No APPID found, please contact your admin to obtain one."] = "No se encontró APPID, por favor contacte con su administrador para obtener una.";
+$a->strings["Save Settings"] = "Guardar ajustes";
+$a->strings["Settings"] = "Ajustes";
+$a->strings["Enter either the name of your location or the zip code."] = "Introduzca el nombre de su ubicación o el código postal.";
+$a->strings["Your Location"] = "Su ubicación";
+$a->strings["Identifier of your location (name or zip code), e.g. <em>Berlin,DE</em> or <em>14476,DE</em>."] = "Identificador de su ubicación (nombre o código postal), ej. <em>Berlin,DE</em> o <em>14476,DE</em>.";
+$a->strings["Units"] = "Unidades";
+$a->strings["select if the temperature should be displayed in &deg;C or &deg;F"] = "seleccionar si la temperatura debería ser mostrada en &deg;C o &deg;F";
+$a->strings["Show weather data"] = "Mostrar información de clima";
+$a->strings["Curweather settings saved."] = "Ajustes de clima guardados.";
+$a->strings["Caching Interval"] = "Obteniendo intervalo";
+$a->strings["For how long should the weather data be cached? Choose according your OpenWeatherMap account type."] = "¿Durante cuánto tiempo debería ser obtenida la información de clima? Eliga de acuerdo a su tipo de cuenta de OpenWeatherMap.";
+$a->strings["no cache"] = "sin almacenamiento";
+$a->strings["minutes"] = "minutos";
+$a->strings["Your APPID"] = "Su APPID";
+$a->strings["Your API key provided by OpenWeatherMap"] = "Su clave API provista por OpenWeatherMap";
diff --git a/curweather/lang/fi-fi/strings.php b/curweather/lang/fi-fi/strings.php
index df84451e..d942398d 100644
--- a/curweather/lang/fi-fi/strings.php
+++ b/curweather/lang/fi-fi/strings.php
@@ -3,31 +3,33 @@
 if(! function_exists("string_plural_select_fi_fi")) {
 function string_plural_select_fi_fi($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Error fetching weather data.\nError was: '] = 'Säätietojen noutamisessa tapahtui virhe.\nLisätietoja: ';
-$a->strings['Current Weather'] = 'Sää';
-$a->strings['Relative Humidity'] = 'Suhteellinen kosteus';
-$a->strings['Pressure'] = 'Ilmanpaine';
-$a->strings['Wind'] = 'Tuuli';
-$a->strings['Last Updated'] = 'Viimeksi päivitetty';
-$a->strings['Data by'] = 'Tiedot tuottaa';
-$a->strings['Show on map'] = 'Näytä kartalla';
-$a->strings['There was a problem accessing the weather data. But have a look'] = 'Säätietohaussa tapahtui virhe. Voit kuitenkin katsoa';
-$a->strings['at OpenWeatherMap'] = 'OpenWeatherMappiä';
-$a->strings['Current Weather settings updated.'] = 'Sääasetukset päivitetty.';
-$a->strings['No APPID found, please contact your admin to obtain one.'] = 'APPID puuttuu, ota yhteyttä ylläpitäjään.';
-$a->strings['Save Settings'] = 'Tallenna asetukset';
-$a->strings['Settings'] = 'Asetukset';
-$a->strings['Enter either the name of your location or the zip code.'] = 'Syötä sijaintisi nimi tai postinumero.';
-$a->strings['Your Location'] = 'Sijaintisi';
-$a->strings['Identifier of your location (name or zip code), e.g. <em>Berlin,DE</em> or <em>14476,DE</em>.'] = 'Sijantisi (paikka tai postinumero), esim. <em>Helsinki,FI</em> tai <em>00100,FI</em>.';
-$a->strings['Units'] = 'Yksiköt';
-$a->strings['select if the temperature should be displayed in &deg;C or &deg;F'] = 'ota käyttöön Celsius-asteikko (&deg;C) tai Fahrenheit-asteikko (&deg;F)';
-$a->strings['Show weather data'] = 'Näytä säätiedot';
-$a->strings['Curweather settings saved.'] = 'Curweather -asetukset tallennettu.';
-$a->strings['Caching Interval'] = 'Välimuistin aikaväli';
-$a->strings['no cache'] = 'Ei välimuistia';
-$a->strings['minutes'] = 'minuuttia';
-$a->strings['Your APPID'] = 'Sinun APPID';
-$a->strings['Your API key provided by OpenWeatherMap'] = 'API-avain OpenWeatherMapiltä';
+;
+$a->strings["Error fetching weather data.\\nError was: "] = "Säätietojen noutamisessa tapahtui virhe.\\nLisätietoja: ";
+$a->strings["Current Weather"] = "Sää";
+$a->strings["Relative Humidity"] = "Suhteellinen kosteus";
+$a->strings["Pressure"] = "Ilmanpaine";
+$a->strings["Wind"] = "Tuuli";
+$a->strings["Last Updated"] = "Viimeksi päivitetty";
+$a->strings["Data by"] = "Tiedot tuottaa";
+$a->strings["Show on map"] = "Näytä kartalla";
+$a->strings["There was a problem accessing the weather data. But have a look"] = "Säätietohaussa tapahtui virhe. Voit kuitenkin katsoa";
+$a->strings["at OpenWeatherMap"] = "OpenWeatherMappiä";
+$a->strings["Current Weather settings updated."] = "Sääasetukset päivitetty.";
+$a->strings["No APPID found, please contact your admin to obtain one."] = "APPID puuttuu, ota yhteyttä ylläpitäjään.";
+$a->strings["Save Settings"] = "Tallenna asetukset";
+$a->strings["Settings"] = "Asetukset";
+$a->strings["Enter either the name of your location or the zip code."] = "Syötä sijaintisi nimi tai postinumero.";
+$a->strings["Your Location"] = "Sijaintisi";
+$a->strings["Identifier of your location (name or zip code), e.g. <em>Berlin,DE</em> or <em>14476,DE</em>."] = "Sijantisi (paikka tai postinumero), esim. <em>Helsinki,FI</em> tai <em>00100,FI</em>.";
+$a->strings["Units"] = "Yksiköt";
+$a->strings["select if the temperature should be displayed in &deg;C or &deg;F"] = "ota käyttöön Celsius-asteikko (&deg;C) tai Fahrenheit-asteikko (&deg;F)";
+$a->strings["Show weather data"] = "Näytä säätiedot";
+$a->strings["Curweather settings saved."] = "Curweather -asetukset tallennettu.";
+$a->strings["Caching Interval"] = "Välimuistin aikaväli";
+$a->strings["For how long should the weather data be cached? Choose according your OpenWeatherMap account type."] = "";
+$a->strings["no cache"] = "Ei välimuistia";
+$a->strings["minutes"] = "minuuttia";
+$a->strings["Your APPID"] = "Sinun APPID";
+$a->strings["Your API key provided by OpenWeatherMap"] = "API-avain OpenWeatherMapiltä";
diff --git a/curweather/lang/fr/messages.po b/curweather/lang/fr/messages.po
index 57ed6b8b..0518bb21 100644
--- a/curweather/lang/fr/messages.po
+++ b/curweather/lang/fr/messages.po
@@ -4,125 +4,131 @@
 # 
 # 
 # Translators:
-# bob lebonche <lebonche@tutanota.com>, 2021
-# Hypolite Petovan <hypolite@mrpetovan.com>, 2022
 # Hypolite Petovan <hypolite@mrpetovan.com>, 2016
-# ea1cd8241cb389ffb6f92bc6891eff5d_dc12308 <70dced5587d47e18d88f9298024d96f8_93383>, 2015
+# Nicola Spanti <translations@nicola-spanti.info>, 2015
 # StefOfficiel <pichard.stephane@free.fr>, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:14-0500\n"
-"PO-Revision-Date: 2014-06-22 11:34+0000\n"
-"Last-Translator: Hypolite Petovan <hypolite@mrpetovan.com>, 2022\n"
+"POT-Creation-Date: 2016-03-12 08:10+0100\n"
+"PO-Revision-Date: 2016-09-24 03:15+0000\n"
+"Last-Translator: Hypolite Petovan <hypolite@mrpetovan.com>\n"
 "Language-Team: French (http://www.transifex.com/Friendica/friendica/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fr\n"
-"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: curweather.php:47
-msgid "Error fetching weather data. Error was: "
-msgstr "Erreur de récupération des données météo. L'erreur était :"
+#: curweather.php:31
+msgid "Error fetching weather data.\\nError was: "
+msgstr "Erreur durant la récupération de la météo.\\nL'erreur était : "
 
-#: curweather.php:130
+#: curweather.php:111 curweather.php:172
 msgid "Current Weather"
 msgstr "Météo actuelle"
 
-#: curweather.php:137
+#: curweather.php:118
 msgid "Relative Humidity"
 msgstr "Humidité relative"
 
-#: curweather.php:138
+#: curweather.php:119
 msgid "Pressure"
 msgstr "Pression"
 
-#: curweather.php:139
+#: curweather.php:120
 msgid "Wind"
 msgstr "Vent"
 
-#: curweather.php:140
+#: curweather.php:121
 msgid "Last Updated"
 msgstr "Dernière mise-à-jour"
 
-#: curweather.php:141
+#: curweather.php:122
 msgid "Data by"
 msgstr "Données de"
 
-#: curweather.php:142
+#: curweather.php:123
 msgid "Show on map"
 msgstr "Montrer sur la carte"
 
-#: curweather.php:147
+#: curweather.php:128
 msgid "There was a problem accessing the weather data. But have a look"
 msgstr "Une erreur est survenue lors de l'accès aux données météo. Vous pouvez quand même jeter un oeil"
 
-#: curweather.php:149
+#: curweather.php:130
 msgid "at OpenWeatherMap"
 msgstr "à OpenWeatherMap"
 
-#: curweather.php:178
-msgid "No APPID found, please contact your admin to obtain one."
-msgstr "Pas d'APPID trouvé, merci de contacter votre administrateur pour en obtenir un."
+#: curweather.php:146
+msgid "Current Weather settings updated."
+msgstr "Paramètres de la Météo Actuelle mis à jour."
 
-#: curweather.php:188
+#: curweather.php:161
+msgid "No APPID found, please contact your admin to optain one."
+msgstr "APPID introuvable, veuillez contacter votre administrateur pour en obtenir un."
+
+#: curweather.php:171 curweather.php:200
+msgid "Save Settings"
+msgstr "Sauvegarder les paramètres"
+
+#: curweather.php:172
+msgid "Settings"
+msgstr "Paramètres"
+
+#: curweather.php:174
 msgid "Enter either the name of your location or the zip code."
 msgstr "Entrez le nom de votre emplacement ou votre code postal."
 
-#: curweather.php:189
+#: curweather.php:175
 msgid "Your Location"
 msgstr "Votre position"
 
-#: curweather.php:189
+#: curweather.php:175
 msgid ""
 "Identifier of your location (name or zip code), e.g. <em>Berlin,DE</em> or "
 "<em>14476,DE</em>."
 msgstr "Identifiant de votre emplacement (nom ou code postal), par exemple <em>Paris 08, Fr</em> ou <em>75008, FR</em>."
 
-#: curweather.php:190
+#: curweather.php:176
 msgid "Units"
 msgstr "Unités"
 
-#: curweather.php:190
-msgid "select if the temperature should be displayed in &deg;C or &deg;F"
-msgstr "Sélectionner si la température devrait être affichée en °C ou en °F"
+#: curweather.php:176
+msgid "select if the temperatur should be displayed in &deg;C or &deg;F"
+msgstr "choisissez si la température doit être affichée en &deg;C ou &deg;F"
 
-#: curweather.php:191
+#: curweather.php:177
 msgid "Show weather data"
 msgstr "Montrer les données météos"
 
-#: curweather.php:196
-msgid "Current Weather Settings"
-msgstr "Paramètres de Météo"
+#: curweather.php:190
+msgid "Curweather settings saved."
+msgstr "Paramètres Curweather sauvés."
 
-#: curweather.php:227
-msgid "Save Settings"
-msgstr "Sauvegarder les paramètres"
-
-#: curweather.php:230
+#: curweather.php:201
 msgid "Caching Interval"
 msgstr "Intervalle de mise en cache."
 
-#: curweather.php:232
+#: curweather.php:201
 msgid ""
 "For how long should the weather data be cached? Choose according your "
 "OpenWeatherMap account type."
 msgstr "Pendant combien de temps les données météo doivent-elles être mises en cache? Choisissez en fonction du type de compte OpenWeatherMap."
 
-#: curweather.php:233
+#: curweather.php:201
 msgid "no cache"
 msgstr "pas de cache"
 
-#: curweather.php:234 curweather.php:235 curweather.php:236 curweather.php:237
+#: curweather.php:201
 msgid "minutes"
 msgstr "minutes"
 
-#: curweather.php:240
+#: curweather.php:202
 msgid "Your APPID"
 msgstr "Votre APPID"
 
-#: curweather.php:240
+#: curweather.php:202
 msgid "Your API key provided by OpenWeatherMap"
 msgstr "Votre clé pour l'API de OpenWeatherMap"
diff --git a/curweather/lang/fr/strings.php b/curweather/lang/fr/strings.php
index be5c1ba5..466a0508 100644
--- a/curweather/lang/fr/strings.php
+++ b/curweather/lang/fr/strings.php
@@ -2,31 +2,33 @@
 
 if(! function_exists("string_plural_select_fr")) {
 function string_plural_select_fr($n){
-	$n = intval($n);
-	if (($n == 0 || $n == 1)) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
+	return ($n > 1);;
 }}
-$a->strings['Error fetching weather data. Error was: '] = 'Erreur de récupération des données météo. L\'erreur était :';
-$a->strings['Current Weather'] = 'Météo actuelle';
-$a->strings['Relative Humidity'] = 'Humidité relative';
-$a->strings['Pressure'] = 'Pression';
-$a->strings['Wind'] = 'Vent';
-$a->strings['Last Updated'] = 'Dernière mise-à-jour';
-$a->strings['Data by'] = 'Données de';
-$a->strings['Show on map'] = 'Montrer sur la carte';
-$a->strings['There was a problem accessing the weather data. But have a look'] = 'Une erreur est survenue lors de l\'accès aux données météo. Vous pouvez quand même jeter un oeil';
-$a->strings['at OpenWeatherMap'] = 'à OpenWeatherMap';
-$a->strings['No APPID found, please contact your admin to obtain one.'] = 'Pas d\'APPID trouvé, merci de contacter votre administrateur pour en obtenir un.';
-$a->strings['Enter either the name of your location or the zip code.'] = 'Entrez le nom de votre emplacement ou votre code postal.';
-$a->strings['Your Location'] = 'Votre position';
-$a->strings['Identifier of your location (name or zip code), e.g. <em>Berlin,DE</em> or <em>14476,DE</em>.'] = 'Identifiant de votre emplacement (nom ou code postal), par exemple <em>Paris 08, Fr</em> ou <em>75008, FR</em>.';
-$a->strings['Units'] = 'Unités';
-$a->strings['select if the temperature should be displayed in &deg;C or &deg;F'] = 'Sélectionner si la température devrait être affichée en °C ou en °F';
-$a->strings['Show weather data'] = 'Montrer les données météos';
-$a->strings['Current Weather Settings'] = 'Paramètres de Météo';
-$a->strings['Save Settings'] = 'Sauvegarder les paramètres';
-$a->strings['Caching Interval'] = 'Intervalle de mise en cache.';
-$a->strings['For how long should the weather data be cached? Choose according your OpenWeatherMap account type.'] = 'Pendant combien de temps les données météo doivent-elles être mises en cache? Choisissez en fonction du type de compte OpenWeatherMap.';
-$a->strings['no cache'] = 'pas de cache';
-$a->strings['minutes'] = 'minutes';
-$a->strings['Your APPID'] = 'Votre APPID';
-$a->strings['Your API key provided by OpenWeatherMap'] = 'Votre clé pour l\'API de OpenWeatherMap';
+;
+$a->strings["Error fetching weather data.\\nError was: "] = "Erreur durant la récupération de la météo.\\nL'erreur était : ";
+$a->strings["Current Weather"] = "Météo actuelle";
+$a->strings["Relative Humidity"] = "Humidité relative";
+$a->strings["Pressure"] = "Pression";
+$a->strings["Wind"] = "Vent";
+$a->strings["Last Updated"] = "Dernière mise-à-jour";
+$a->strings["Data by"] = "Données de";
+$a->strings["Show on map"] = "Montrer sur la carte";
+$a->strings["There was a problem accessing the weather data. But have a look"] = "Une erreur est survenue lors de l'accès aux données météo. Vous pouvez quand même jeter un oeil";
+$a->strings["at OpenWeatherMap"] = "à OpenWeatherMap";
+$a->strings["Current Weather settings updated."] = "Paramètres de la Météo Actuelle mis à jour.";
+$a->strings["No APPID found, please contact your admin to optain one."] = "APPID introuvable, veuillez contacter votre administrateur pour en obtenir un.";
+$a->strings["Save Settings"] = "Sauvegarder les paramètres";
+$a->strings["Settings"] = "Paramètres";
+$a->strings["Enter either the name of your location or the zip code."] = "Entrez le nom de votre emplacement ou votre code postal.";
+$a->strings["Your Location"] = "Votre position";
+$a->strings["Identifier of your location (name or zip code), e.g. <em>Berlin,DE</em> or <em>14476,DE</em>."] = "Identifiant de votre emplacement (nom ou code postal), par exemple <em>Paris 08, Fr</em> ou <em>75008, FR</em>.";
+$a->strings["Units"] = "Unités";
+$a->strings["select if the temperatur should be displayed in &deg;C or &deg;F"] = "choisissez si la température doit être affichée en &deg;C ou &deg;F";
+$a->strings["Show weather data"] = "Montrer les données météos";
+$a->strings["Curweather settings saved."] = "Paramètres Curweather sauvés.";
+$a->strings["Caching Interval"] = "Intervalle de mise en cache.";
+$a->strings["For how long should the weather data be cached? Choose according your OpenWeatherMap account type."] = "Pendant combien de temps les données météo doivent-elles être mises en cache? Choisissez en fonction du type de compte OpenWeatherMap.";
+$a->strings["no cache"] = "pas de cache";
+$a->strings["minutes"] = "minutes";
+$a->strings["Your APPID"] = "Votre APPID";
+$a->strings["Your API key provided by OpenWeatherMap"] = "Votre clé pour l'API de OpenWeatherMap";
diff --git a/curweather/lang/hu/messages.po b/curweather/lang/hu/messages.po
deleted file mode 100644
index e2429bc9..00000000
--- a/curweather/lang/hu/messages.po
+++ /dev/null
@@ -1,124 +0,0 @@
-# ADDON curweather
-# Copyright (C)
-# This file is distributed under the same license as the Friendica curweather addon package.
-# 
-# 
-# Translators:
-# Balázs Úr, 2020-2021
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:14-0500\n"
-"PO-Revision-Date: 2014-06-22 11:34+0000\n"
-"Last-Translator: Balázs Úr, 2020-2021\n"
-"Language-Team: Hungarian (http://www.transifex.com/Friendica/friendica/language/hu/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: hu\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: curweather.php:47
-msgid "Error fetching weather data. Error was: "
-msgstr "Hiba az időjárásadatok lekérésekor. A hiba ez volt: "
-
-#: curweather.php:130
-msgid "Current Weather"
-msgstr "Jelenlegi időjárás"
-
-#: curweather.php:137
-msgid "Relative Humidity"
-msgstr "Relatív páratartalom"
-
-#: curweather.php:138
-msgid "Pressure"
-msgstr "Légnyomás"
-
-#: curweather.php:139
-msgid "Wind"
-msgstr "Szél"
-
-#: curweather.php:140
-msgid "Last Updated"
-msgstr "Utoljára frissítve"
-
-#: curweather.php:141
-msgid "Data by"
-msgstr "Adatszolgáltató"
-
-#: curweather.php:142
-msgid "Show on map"
-msgstr "Megjelenítés térképen"
-
-#: curweather.php:147
-msgid "There was a problem accessing the weather data. But have a look"
-msgstr "Probléma történt az időjárási adatokhoz való hozzáféréskor. De nézzen körül itt:"
-
-#: curweather.php:149
-msgid "at OpenWeatherMap"
-msgstr "OpenWeatherMap"
-
-#: curweather.php:178
-msgid "No APPID found, please contact your admin to obtain one."
-msgstr "Nem található alkalmazásazonosító. Vegye fel a kapcsolatot az adminisztrátorral, hogy beszerezzen egyet."
-
-#: curweather.php:188
-msgid "Enter either the name of your location or the zip code."
-msgstr "Adja meg a tartózkodási helyének nevét vagy irányítószámát."
-
-#: curweather.php:189
-msgid "Your Location"
-msgstr "Az Ön tartózkodási helye"
-
-#: curweather.php:189
-msgid ""
-"Identifier of your location (name or zip code), e.g. <em>Berlin,DE</em> or "
-"<em>14476,DE</em>."
-msgstr "A tartózkodási helyének azonosítója (neve vagy irányítószáma), például <em>Budapest,HU</em> vagy <em>1234,HU</em>."
-
-#: curweather.php:190
-msgid "Units"
-msgstr "Mértékegységek"
-
-#: curweather.php:190
-msgid "select if the temperature should be displayed in &deg;C or &deg;F"
-msgstr "Annak kiválasztása, hogy a hőmérsékletet &deg;C vagy &deg;F fokban kell megjeleníteni."
-
-#: curweather.php:191
-msgid "Show weather data"
-msgstr "Időjárási adatok megjelenítése"
-
-#: curweather.php:196
-msgid "Current Weather Settings"
-msgstr "Jelenlegi időjárás beállításai"
-
-#: curweather.php:227
-msgid "Save Settings"
-msgstr "Beállítások mentése"
-
-#: curweather.php:230
-msgid "Caching Interval"
-msgstr "Gyorsítótárazási időköz"
-
-#: curweather.php:232
-msgid ""
-"For how long should the weather data be cached? Choose according your "
-"OpenWeatherMap account type."
-msgstr "Mennyi ideig kell az időjárási adatokat gyorsítótárazni? Válasszon az OpenWeatherMap fióktípusa szerint."
-
-#: curweather.php:233
-msgid "no cache"
-msgstr "nincs gyorsítótár"
-
-#: curweather.php:234 curweather.php:235 curweather.php:236 curweather.php:237
-msgid "minutes"
-msgstr "perc"
-
-#: curweather.php:240
-msgid "Your APPID"
-msgstr "Az alkalmazásazonosítója"
-
-#: curweather.php:240
-msgid "Your API key provided by OpenWeatherMap"
-msgstr "Az OpenWeatherMap által biztosított API-kulcsa"
diff --git a/curweather/lang/hu/strings.php b/curweather/lang/hu/strings.php
deleted file mode 100644
index b80ffc89..00000000
--- a/curweather/lang/hu/strings.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_hu")) {
-function string_plural_select_hu($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Error fetching weather data. Error was: '] = 'Hiba az időjárásadatok lekérésekor. A hiba ez volt: ';
-$a->strings['Current Weather'] = 'Jelenlegi időjárás';
-$a->strings['Relative Humidity'] = 'Relatív páratartalom';
-$a->strings['Pressure'] = 'Légnyomás';
-$a->strings['Wind'] = 'Szél';
-$a->strings['Last Updated'] = 'Utoljára frissítve';
-$a->strings['Data by'] = 'Adatszolgáltató';
-$a->strings['Show on map'] = 'Megjelenítés térképen';
-$a->strings['There was a problem accessing the weather data. But have a look'] = 'Probléma történt az időjárási adatokhoz való hozzáféréskor. De nézzen körül itt:';
-$a->strings['at OpenWeatherMap'] = 'OpenWeatherMap';
-$a->strings['No APPID found, please contact your admin to obtain one.'] = 'Nem található alkalmazásazonosító. Vegye fel a kapcsolatot az adminisztrátorral, hogy beszerezzen egyet.';
-$a->strings['Enter either the name of your location or the zip code.'] = 'Adja meg a tartózkodási helyének nevét vagy irányítószámát.';
-$a->strings['Your Location'] = 'Az Ön tartózkodási helye';
-$a->strings['Identifier of your location (name or zip code), e.g. <em>Berlin,DE</em> or <em>14476,DE</em>.'] = 'A tartózkodási helyének azonosítója (neve vagy irányítószáma), például <em>Budapest,HU</em> vagy <em>1234,HU</em>.';
-$a->strings['Units'] = 'Mértékegységek';
-$a->strings['select if the temperature should be displayed in &deg;C or &deg;F'] = 'Annak kiválasztása, hogy a hőmérsékletet &deg;C vagy &deg;F fokban kell megjeleníteni.';
-$a->strings['Show weather data'] = 'Időjárási adatok megjelenítése';
-$a->strings['Current Weather Settings'] = 'Jelenlegi időjárás beállításai';
-$a->strings['Save Settings'] = 'Beállítások mentése';
-$a->strings['Caching Interval'] = 'Gyorsítótárazási időköz';
-$a->strings['For how long should the weather data be cached? Choose according your OpenWeatherMap account type.'] = 'Mennyi ideig kell az időjárási adatokat gyorsítótárazni? Válasszon az OpenWeatherMap fióktípusa szerint.';
-$a->strings['no cache'] = 'nincs gyorsítótár';
-$a->strings['minutes'] = 'perc';
-$a->strings['Your APPID'] = 'Az alkalmazásazonosítója';
-$a->strings['Your API key provided by OpenWeatherMap'] = 'Az OpenWeatherMap által biztosított API-kulcsa';
diff --git a/curweather/lang/it/messages.po b/curweather/lang/it/messages.po
index 5a7e2cac..fe0f0770 100644
--- a/curweather/lang/it/messages.po
+++ b/curweather/lang/it/messages.po
@@ -5,15 +5,14 @@
 # 
 # Translators:
 # fabrixxm <fabrix.xm@gmail.com>, 2014-2015
-# Sylke Vicious <silkevicious@gmail.com>, 2021
 # Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2021-02-16 12:57+0000\n"
-"Last-Translator: Sylke Vicious <silkevicious@gmail.com>\n"
+"POT-Creation-Date: 2016-09-25 17:17+0200\n"
+"PO-Revision-Date: 2017-09-20 06:07+0000\n"
+"Last-Translator: Tobias Diekershoff <tobias.diekershoff@gmx.net>\n"
 "Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,106 +20,114 @@ msgstr ""
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: curweather.php:47
-msgid "Error fetching weather data. Error was: "
-msgstr "Errore durante il recupero dei dati meteo. L'errore è stato:"
+#: curweather.php:31
+msgid "Error fetching weather data.\\nError was: "
+msgstr "Errore recuperando i dati meteo: "
 
-#: curweather.php:130 curweather.php:192
+#: curweather.php:111 curweather.php:172
 msgid "Current Weather"
 msgstr "Meteo"
 
-#: curweather.php:137
+#: curweather.php:118
 msgid "Relative Humidity"
 msgstr "Umidità Relativa"
 
-#: curweather.php:138
+#: curweather.php:119
 msgid "Pressure"
 msgstr "Pressione"
 
-#: curweather.php:139
+#: curweather.php:120
 msgid "Wind"
 msgstr "Vento"
 
-#: curweather.php:140
+#: curweather.php:121
 msgid "Last Updated"
 msgstr "Ultimo Aggiornamento: "
 
-#: curweather.php:141
+#: curweather.php:122
 msgid "Data by"
 msgstr "Data da"
 
-#: curweather.php:142
+#: curweather.php:123
 msgid "Show on map"
 msgstr "Mostra sulla mappa"
 
-#: curweather.php:147
+#: curweather.php:128
 msgid "There was a problem accessing the weather data. But have a look"
 msgstr "C'è stato un problema accedendo ai dati meteo, ma dai un'occhiata"
 
-#: curweather.php:149
+#: curweather.php:130
 msgid "at OpenWeatherMap"
 msgstr "a OpenWeatherMap"
 
-#: curweather.php:179
+#: curweather.php:146
+msgid "Current Weather settings updated."
+msgstr "Impostazioni Meteo aggiornate."
+
+#: curweather.php:161
 msgid "No APPID found, please contact your admin to obtain one."
 msgstr "APPID non trovata, contatta il tuo amministratore per averne una."
 
-#: curweather.php:191 curweather.php:229
+#: curweather.php:171 curweather.php:200
 msgid "Save Settings"
 msgstr "Salva Impostazioni"
 
-#: curweather.php:192
+#: curweather.php:172
 msgid "Settings"
 msgstr "Impostazioni"
 
-#: curweather.php:194
+#: curweather.php:174
 msgid "Enter either the name of your location or the zip code."
 msgstr "Inserisci il nome della tua posizione o il CAP"
 
-#: curweather.php:195
+#: curweather.php:175
 msgid "Your Location"
 msgstr "La tua Posizione"
 
-#: curweather.php:195
+#: curweather.php:175
 msgid ""
 "Identifier of your location (name or zip code), e.g. <em>Berlin,DE</em> or "
 "<em>14476,DE</em>."
 msgstr "Identificatore della tua posizione (nome o CAP), p.e. <em>Roma, IT</em> or <em>00186,IT</em>."
 
-#: curweather.php:196
+#: curweather.php:176
 msgid "Units"
 msgstr "Unità"
 
-#: curweather.php:196
+#: curweather.php:176
 msgid "select if the temperature should be displayed in &deg;C or &deg;F"
 msgstr "scegli se la temperatura deve essere mostrata in °C o in °F"
 
-#: curweather.php:197
+#: curweather.php:177
 msgid "Show weather data"
 msgstr "Mostra dati meteo"
 
-#: curweather.php:232
+#: curweather.php:190
+msgid "Curweather settings saved."
+msgstr "Impostazioni Curweather salvati."
+
+#: curweather.php:201
 msgid "Caching Interval"
 msgstr "Intervallo di cache"
 
-#: curweather.php:234
+#: curweather.php:201
 msgid ""
 "For how long should the weather data be cached? Choose according your "
 "OpenWeatherMap account type."
 msgstr "Per quanto tempo i dati meteo devono essere memorizzati? Scegli a seconda del tuo tipo di account su OpenWeatherMap."
 
-#: curweather.php:235
+#: curweather.php:201
 msgid "no cache"
 msgstr "nessuna cache"
 
-#: curweather.php:236 curweather.php:237 curweather.php:238 curweather.php:239
+#: curweather.php:201
 msgid "minutes"
 msgstr "minuti"
 
-#: curweather.php:242
+#: curweather.php:202
 msgid "Your APPID"
 msgstr "Il tuo APPID"
 
-#: curweather.php:242
+#: curweather.php:202
 msgid "Your API key provided by OpenWeatherMap"
 msgstr "La tua chiave API da OpenWeatherMap"
diff --git a/curweather/lang/it/strings.php b/curweather/lang/it/strings.php
index a497dace..99525cc1 100644
--- a/curweather/lang/it/strings.php
+++ b/curweather/lang/it/strings.php
@@ -2,31 +2,33 @@
 
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Error fetching weather data. Error was: '] = 'Errore durante il recupero dei dati meteo. L\'errore è stato:';
-$a->strings['Current Weather'] = 'Meteo';
-$a->strings['Relative Humidity'] = 'Umidità Relativa';
-$a->strings['Pressure'] = 'Pressione';
-$a->strings['Wind'] = 'Vento';
-$a->strings['Last Updated'] = 'Ultimo Aggiornamento: ';
-$a->strings['Data by'] = 'Data da';
-$a->strings['Show on map'] = 'Mostra sulla mappa';
-$a->strings['There was a problem accessing the weather data. But have a look'] = 'C\'è stato un problema accedendo ai dati meteo, ma dai un\'occhiata';
-$a->strings['at OpenWeatherMap'] = 'a OpenWeatherMap';
-$a->strings['No APPID found, please contact your admin to obtain one.'] = 'APPID non trovata, contatta il tuo amministratore per averne una.';
-$a->strings['Save Settings'] = 'Salva Impostazioni';
-$a->strings['Settings'] = 'Impostazioni';
-$a->strings['Enter either the name of your location or the zip code.'] = 'Inserisci il nome della tua posizione o il CAP';
-$a->strings['Your Location'] = 'La tua Posizione';
-$a->strings['Identifier of your location (name or zip code), e.g. <em>Berlin,DE</em> or <em>14476,DE</em>.'] = 'Identificatore della tua posizione (nome o CAP), p.e. <em>Roma, IT</em> or <em>00186,IT</em>.';
-$a->strings['Units'] = 'Unità';
-$a->strings['select if the temperature should be displayed in &deg;C or &deg;F'] = 'scegli se la temperatura deve essere mostrata in °C o in °F';
-$a->strings['Show weather data'] = 'Mostra dati meteo';
-$a->strings['Caching Interval'] = 'Intervallo di cache';
-$a->strings['For how long should the weather data be cached? Choose according your OpenWeatherMap account type.'] = 'Per quanto tempo i dati meteo devono essere memorizzati? Scegli a seconda del tuo tipo di account su OpenWeatherMap.';
-$a->strings['no cache'] = 'nessuna cache';
-$a->strings['minutes'] = 'minuti';
-$a->strings['Your APPID'] = 'Il tuo APPID';
-$a->strings['Your API key provided by OpenWeatherMap'] = 'La tua chiave API da OpenWeatherMap';
+;
+$a->strings["Error fetching weather data.\\nError was: "] = "Errore recuperando i dati meteo: ";
+$a->strings["Current Weather"] = "Meteo";
+$a->strings["Relative Humidity"] = "Umidità Relativa";
+$a->strings["Pressure"] = "Pressione";
+$a->strings["Wind"] = "Vento";
+$a->strings["Last Updated"] = "Ultimo Aggiornamento: ";
+$a->strings["Data by"] = "Data da";
+$a->strings["Show on map"] = "Mostra sulla mappa";
+$a->strings["There was a problem accessing the weather data. But have a look"] = "C'è stato un problema accedendo ai dati meteo, ma dai un'occhiata";
+$a->strings["at OpenWeatherMap"] = "a OpenWeatherMap";
+$a->strings["Current Weather settings updated."] = "Impostazioni Meteo aggiornate.";
+$a->strings["No APPID found, please contact your admin to obtain one."] = "APPID non trovata, contatta il tuo amministratore per averne una.";
+$a->strings["Save Settings"] = "Salva Impostazioni";
+$a->strings["Settings"] = "Impostazioni";
+$a->strings["Enter either the name of your location or the zip code."] = "Inserisci il nome della tua posizione o il CAP";
+$a->strings["Your Location"] = "La tua Posizione";
+$a->strings["Identifier of your location (name or zip code), e.g. <em>Berlin,DE</em> or <em>14476,DE</em>."] = "Identificatore della tua posizione (nome o CAP), p.e. <em>Roma, IT</em> or <em>00186,IT</em>.";
+$a->strings["Units"] = "Unità";
+$a->strings["select if the temperature should be displayed in &deg;C or &deg;F"] = "scegli se la temperatura deve essere mostrata in °C o in °F";
+$a->strings["Show weather data"] = "Mostra dati meteo";
+$a->strings["Curweather settings saved."] = "Impostazioni Curweather salvati.";
+$a->strings["Caching Interval"] = "Intervallo di cache";
+$a->strings["For how long should the weather data be cached? Choose according your OpenWeatherMap account type."] = "Per quanto tempo i dati meteo devono essere memorizzati? Scegli a seconda del tuo tipo di account su OpenWeatherMap.";
+$a->strings["no cache"] = "nessuna cache";
+$a->strings["minutes"] = "minuti";
+$a->strings["Your APPID"] = "Il tuo APPID";
+$a->strings["Your API key provided by OpenWeatherMap"] = "La tua chiave API da OpenWeatherMap";
diff --git a/curweather/lang/nl/strings.php b/curweather/lang/nl/strings.php
index ee7d7127..9a4a4d29 100644
--- a/curweather/lang/nl/strings.php
+++ b/curweather/lang/nl/strings.php
@@ -3,32 +3,33 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Error fetching weather data.\nError was: '] = 'Fout bij het ophalen van de weer data:\nFout was:';
-$a->strings['Current Weather'] = 'Het weer';
-$a->strings['Relative Humidity'] = 'Relatieve vochtigheid';
-$a->strings['Pressure'] = 'Luchtdruk';
-$a->strings['Wind'] = 'Wind';
-$a->strings['Last Updated'] = 'Laatste wijziging';
-$a->strings['Data by'] = 'Data afkomstig van';
-$a->strings['Show on map'] = 'Toon op kaart';
-$a->strings['There was a problem accessing the weather data. But have a look'] = 'Er was een probleem met het ophalen van de data. Bekijk het';
-$a->strings['at OpenWeatherMap'] = 'Op OpenWeatherMap';
-$a->strings['Current Weather settings updated.'] = 'Huidige weerinstellingen opgeslagen';
-$a->strings['No APPID found, please contact your admin to obtain one.'] = 'Geen APPID gevonden. Contacteer je node-admin om dit te verkrijgen';
-$a->strings['Save Settings'] = 'Instellingen opslaan';
-$a->strings['Settings'] = 'Instellingen';
-$a->strings['Enter either the name of your location or the zip code.'] = 'Voor de naam of de postcode van je locatie in';
-$a->strings['Your Location'] = 'Uw locatie';
-$a->strings['Identifier of your location (name or zip code), e.g. <em>Berlin,DE</em> or <em>14476,DE</em>.'] = 'ID van je locatie (naam of postocde), vb. <em>Amsterdam, NL</em> of <em>2000,BE</em>';
-$a->strings['Units'] = 'Eenheden';
-$a->strings['select if the temperature should be displayed in &deg;C or &deg;F'] = 'Selecteer of de temperatuur in &deg;C of &deg;F moet weergegeven worden';
-$a->strings['Show weather data'] = 'Toon weer ';
-$a->strings['Curweather settings saved.'] = 'Curweather instellingen opgeslagen';
-$a->strings['Caching Interval'] = 'Caching interval';
-$a->strings['For how long should the weather data be cached? Choose according your OpenWeatherMap account type.'] = 'Voor hoe lang moet de weer data opgeslagen worden? Kies dit volgens je OpenWeatherMap account type.';
-$a->strings['no cache'] = 'Geen cache';
-$a->strings['minutes'] = 'Minuten';
-$a->strings['Your APPID'] = 'Uw APPID';
-$a->strings['Your API key provided by OpenWeatherMap'] = 'Je OpenWeatherMap API-Key';
+;
+$a->strings["Error fetching weather data.\\nError was: "] = "Fout bij het ophalen van de weer data:\\nFout was:";
+$a->strings["Current Weather"] = "Het weer";
+$a->strings["Relative Humidity"] = "Relatieve vochtigheid";
+$a->strings["Pressure"] = "Luchtdruk";
+$a->strings["Wind"] = "Wind";
+$a->strings["Last Updated"] = "Laatste wijziging";
+$a->strings["Data by"] = "Data afkomstig van";
+$a->strings["Show on map"] = "Toon op kaart";
+$a->strings["There was a problem accessing the weather data. But have a look"] = "Er was een probleem met het ophalen van de data. Bekijk het";
+$a->strings["at OpenWeatherMap"] = "Op OpenWeatherMap";
+$a->strings["Current Weather settings updated."] = "Huidige weerinstellingen opgeslagen";
+$a->strings["No APPID found, please contact your admin to obtain one."] = "Geen APPID gevonden. Contacteer je node-admin om dit te verkrijgen";
+$a->strings["Save Settings"] = "Instellingen opslaan";
+$a->strings["Settings"] = "Instellingen";
+$a->strings["Enter either the name of your location or the zip code."] = "Voor de naam of de postcode van je locatie in";
+$a->strings["Your Location"] = "Uw locatie";
+$a->strings["Identifier of your location (name or zip code), e.g. <em>Berlin,DE</em> or <em>14476,DE</em>."] = "ID van je locatie (naam of postocde), vb. <em>Amsterdam, NL</em> of <em>2000,BE</em>";
+$a->strings["Units"] = "Eenheden";
+$a->strings["select if the temperature should be displayed in &deg;C or &deg;F"] = "Selecteer of de temperatuur in &deg;C of &deg;F moet weergegeven worden";
+$a->strings["Show weather data"] = "Toon weer ";
+$a->strings["Curweather settings saved."] = "Curweather instellingen opgeslagen";
+$a->strings["Caching Interval"] = "Caching interval";
+$a->strings["For how long should the weather data be cached? Choose according your OpenWeatherMap account type."] = "Voor hoe lang moet de weer data opgeslagen worden? Kies dit volgens je OpenWeatherMap account type.";
+$a->strings["no cache"] = "Geen cache";
+$a->strings["minutes"] = "Minuten";
+$a->strings["Your APPID"] = "Uw APPID";
+$a->strings["Your API key provided by OpenWeatherMap"] = "Je OpenWeatherMap API-Key";
diff --git a/curweather/lang/pl/messages.po b/curweather/lang/pl/messages.po
index 636797ed..f71410e0 100644
--- a/curweather/lang/pl/messages.po
+++ b/curweather/lang/pl/messages.po
@@ -4,15 +4,14 @@
 # 
 # 
 # Translators:
-# Piotr Strębski <strebski@gmail.com>, 2022
-# Waldemar Stoczkowski, 2018
+# Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:14-0500\n"
-"PO-Revision-Date: 2014-06-22 11:34+0000\n"
-"Last-Translator: Piotr Strębski <strebski@gmail.com>, 2022\n"
+"POT-Creation-Date: 2016-09-25 17:17+0200\n"
+"PO-Revision-Date: 2018-08-04 12:10+0000\n"
+"Last-Translator: Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.com/Friendica/friendica/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,106 +19,114 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
-#: curweather.php:47
-msgid "Error fetching weather data. Error was: "
-msgstr "Błąd podczas pobierania danych pogodowych. Wystąpił błąd:"
+#: curweather.php:31
+msgid "Error fetching weather data.\\nError was: "
+msgstr "Błąd podczas pobierania danych pogodowych. \\nError był:"
 
-#: curweather.php:130
+#: curweather.php:111 curweather.php:172
 msgid "Current Weather"
 msgstr "Obecna pogoda"
 
-#: curweather.php:137
+#: curweather.php:118
 msgid "Relative Humidity"
 msgstr "Względna wilgotność"
 
-#: curweather.php:138
+#: curweather.php:119
 msgid "Pressure"
 msgstr "Ciśnienie"
 
-#: curweather.php:139
+#: curweather.php:120
 msgid "Wind"
 msgstr "Wiatr"
 
-#: curweather.php:140
+#: curweather.php:121
 msgid "Last Updated"
 msgstr "Ostatnio zaktualizowano"
 
-#: curweather.php:141
+#: curweather.php:122
 msgid "Data by"
 msgstr "Dane wg"
 
-#: curweather.php:142
+#: curweather.php:123
 msgid "Show on map"
 msgstr "Pokaż na mapie"
 
-#: curweather.php:147
+#: curweather.php:128
 msgid "There was a problem accessing the weather data. But have a look"
 msgstr "Wystąpił problem z dostępem do danych pogodowych. Ale spójrz"
 
-#: curweather.php:149
+#: curweather.php:130
 msgid "at OpenWeatherMap"
 msgstr "w OpenWeatherMap"
 
-#: curweather.php:178
+#: curweather.php:146
+msgid "Current Weather settings updated."
+msgstr "Zaktualizowano bieżące ustawienia pogody."
+
+#: curweather.php:161
 msgid "No APPID found, please contact your admin to obtain one."
 msgstr "Nie znaleziono APPID, skontaktuj się z administratorem, aby go uzyskać."
 
-#: curweather.php:188
+#: curweather.php:171 curweather.php:200
+msgid "Save Settings"
+msgstr "Zapisz ustawienia"
+
+#: curweather.php:172
+msgid "Settings"
+msgstr "Ustawienia"
+
+#: curweather.php:174
 msgid "Enter either the name of your location or the zip code."
 msgstr "Wprowadź nazwę swojej lokalizacji lub kod pocztowy."
 
-#: curweather.php:189
+#: curweather.php:175
 msgid "Your Location"
 msgstr "Twoja lokalizacja"
 
-#: curweather.php:189
+#: curweather.php:175
 msgid ""
 "Identifier of your location (name or zip code), e.g. <em>Berlin,DE</em> or "
 "<em>14476,DE</em>."
 msgstr "Identyfikator Twojej lokalizacji (nazwa lub kod pocztowy), np. <em>Lublin, LU</em> lub <em>20001, LU</em>."
 
-#: curweather.php:190
+#: curweather.php:176
 msgid "Units"
 msgstr "Jednostka"
 
-#: curweather.php:190
+#: curweather.php:176
 msgid "select if the temperature should be displayed in &deg;C or &deg;F"
 msgstr "wybierz, czy temperatura powinna być wyświetlana w &deg;C lub &deg;F"
 
-#: curweather.php:191
+#: curweather.php:177
 msgid "Show weather data"
 msgstr "Pokaż dane pogodowe"
 
-#: curweather.php:196
-msgid "Current Weather Settings"
-msgstr "Bieżące ustawienia pogody"
+#: curweather.php:190
+msgid "Curweather settings saved."
+msgstr "Ustawienia pogodowe zostały zapisane."
 
-#: curweather.php:227
-msgid "Save Settings"
-msgstr "Zapisz ustawienia"
-
-#: curweather.php:230
+#: curweather.php:201
 msgid "Caching Interval"
 msgstr "Interwał buforowania"
 
-#: curweather.php:232
+#: curweather.php:201
 msgid ""
 "For how long should the weather data be cached? Choose according your "
 "OpenWeatherMap account type."
 msgstr "Od jak dawna powinny być buforowane dane pogodowe? Wybierz zgodnie z typem konta OpenWeatherMap."
 
-#: curweather.php:233
+#: curweather.php:201
 msgid "no cache"
 msgstr "Brak pamięci podręcznej"
 
-#: curweather.php:234 curweather.php:235 curweather.php:236 curweather.php:237
+#: curweather.php:201
 msgid "minutes"
 msgstr "minut"
 
-#: curweather.php:240
+#: curweather.php:202
 msgid "Your APPID"
 msgstr "Twój APPID"
 
-#: curweather.php:240
+#: curweather.php:202
 msgid "Your API key provided by OpenWeatherMap"
 msgstr "Twój klucz API dostarczony przez OpenWeatherMap"
diff --git a/curweather/lang/pl/strings.php b/curweather/lang/pl/strings.php
index c0e588be..aa4df64f 100644
--- a/curweather/lang/pl/strings.php
+++ b/curweather/lang/pl/strings.php
@@ -3,30 +3,33 @@
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
 	$n = intval($n);
-	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
+	return ($n==1 ? 0 : ($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14) ? 1 : $n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14) ? 2 : 3);;
 }}
-$a->strings['Error fetching weather data. Error was: '] = 'Błąd podczas pobierania danych pogodowych. Wystąpił błąd:';
-$a->strings['Current Weather'] = 'Obecna pogoda';
-$a->strings['Relative Humidity'] = 'Względna wilgotność';
-$a->strings['Pressure'] = 'Ciśnienie';
-$a->strings['Wind'] = 'Wiatr';
-$a->strings['Last Updated'] = 'Ostatnio zaktualizowano';
-$a->strings['Data by'] = 'Dane wg';
-$a->strings['Show on map'] = 'Pokaż na mapie';
-$a->strings['There was a problem accessing the weather data. But have a look'] = 'Wystąpił problem z dostępem do danych pogodowych. Ale spójrz';
-$a->strings['at OpenWeatherMap'] = 'w OpenWeatherMap';
-$a->strings['No APPID found, please contact your admin to obtain one.'] = 'Nie znaleziono APPID, skontaktuj się z administratorem, aby go uzyskać.';
-$a->strings['Enter either the name of your location or the zip code.'] = 'Wprowadź nazwę swojej lokalizacji lub kod pocztowy.';
-$a->strings['Your Location'] = 'Twoja lokalizacja';
-$a->strings['Identifier of your location (name or zip code), e.g. <em>Berlin,DE</em> or <em>14476,DE</em>.'] = 'Identyfikator Twojej lokalizacji (nazwa lub kod pocztowy), np. <em>Lublin, LU</em> lub <em>20001, LU</em>.';
-$a->strings['Units'] = 'Jednostka';
-$a->strings['select if the temperature should be displayed in &deg;C or &deg;F'] = 'wybierz, czy temperatura powinna być wyświetlana w &deg;C lub &deg;F';
-$a->strings['Show weather data'] = 'Pokaż dane pogodowe';
-$a->strings['Current Weather Settings'] = 'Bieżące ustawienia pogody';
-$a->strings['Save Settings'] = 'Zapisz ustawienia';
-$a->strings['Caching Interval'] = 'Interwał buforowania';
-$a->strings['For how long should the weather data be cached? Choose according your OpenWeatherMap account type.'] = 'Od jak dawna powinny być buforowane dane pogodowe? Wybierz zgodnie z typem konta OpenWeatherMap.';
-$a->strings['no cache'] = 'Brak pamięci podręcznej';
-$a->strings['minutes'] = 'minut';
-$a->strings['Your APPID'] = 'Twój APPID';
-$a->strings['Your API key provided by OpenWeatherMap'] = 'Twój klucz API dostarczony przez OpenWeatherMap';
+;
+$a->strings["Error fetching weather data.\\nError was: "] = "Błąd podczas pobierania danych pogodowych. \\nError był:";
+$a->strings["Current Weather"] = "Obecna pogoda";
+$a->strings["Relative Humidity"] = "Względna wilgotność";
+$a->strings["Pressure"] = "Ciśnienie";
+$a->strings["Wind"] = "Wiatr";
+$a->strings["Last Updated"] = "Ostatnio zaktualizowano";
+$a->strings["Data by"] = "Dane wg";
+$a->strings["Show on map"] = "Pokaż na mapie";
+$a->strings["There was a problem accessing the weather data. But have a look"] = "Wystąpił problem z dostępem do danych pogodowych. Ale spójrz";
+$a->strings["at OpenWeatherMap"] = "w OpenWeatherMap";
+$a->strings["Current Weather settings updated."] = "Zaktualizowano bieżące ustawienia pogody.";
+$a->strings["No APPID found, please contact your admin to obtain one."] = "Nie znaleziono APPID, skontaktuj się z administratorem, aby go uzyskać.";
+$a->strings["Save Settings"] = "Zapisz ustawienia";
+$a->strings["Settings"] = "Ustawienia";
+$a->strings["Enter either the name of your location or the zip code."] = "Wprowadź nazwę swojej lokalizacji lub kod pocztowy.";
+$a->strings["Your Location"] = "Twoja lokalizacja";
+$a->strings["Identifier of your location (name or zip code), e.g. <em>Berlin,DE</em> or <em>14476,DE</em>."] = "Identyfikator Twojej lokalizacji (nazwa lub kod pocztowy), np. <em>Lublin, LU</em> lub <em>20001, LU</em>.";
+$a->strings["Units"] = "Jednostka";
+$a->strings["select if the temperature should be displayed in &deg;C or &deg;F"] = "wybierz, czy temperatura powinna być wyświetlana w &deg;C lub &deg;F";
+$a->strings["Show weather data"] = "Pokaż dane pogodowe";
+$a->strings["Curweather settings saved."] = "Ustawienia pogodowe zostały zapisane.";
+$a->strings["Caching Interval"] = "Interwał buforowania";
+$a->strings["For how long should the weather data be cached? Choose according your OpenWeatherMap account type."] = "Od jak dawna powinny być buforowane dane pogodowe? Wybierz zgodnie z typem konta OpenWeatherMap.";
+$a->strings["no cache"] = "Brak pamięci podręcznej";
+$a->strings["minutes"] = "minut";
+$a->strings["Your APPID"] = "Twój APPID";
+$a->strings["Your API key provided by OpenWeatherMap"] = "Twój klucz API dostarczony przez OpenWeatherMap";
diff --git a/curweather/lang/pt-br/strings.php b/curweather/lang/pt-br/strings.php
index 60285cca..f50bc4a0 100644
--- a/curweather/lang/pt-br/strings.php
+++ b/curweather/lang/pt-br/strings.php
@@ -2,33 +2,33 @@
 
 if(! function_exists("string_plural_select_pt_br")) {
 function string_plural_select_pt_br($n){
-	$n = intval($n);
-	return intval($n > 1);
+	return ($n > 1);;
 }}
-$a->strings['Error fetching weather data.\nError was: '] = 'Houve um erro na obtenção de dados do clima\nErro:';
-$a->strings['Current Weather'] = 'Clima atual';
-$a->strings['Relative Humidity'] = 'Umidade relativa';
-$a->strings['Pressure'] = 'Pressão';
-$a->strings['Wind'] = 'Vento';
-$a->strings['Last Updated'] = 'Atualizado';
-$a->strings['Data by'] = 'Dados de';
-$a->strings['Show on map'] = 'Mostrar no mapa';
-$a->strings['There was a problem accessing the weather data. But have a look'] = 'Houve um problema no acesso aos dados do clima. Mas dê uma olhada';
-$a->strings['at OpenWeatherMap'] = 'em OpenWeatherMap';
-$a->strings['Current Weather settings updated.'] = 'Atualização das Configurações de clima.';
-$a->strings['No APPID found, please contact your admin to optain one.'] = 'Não foi encontrado nenhum AppID; fale com seu administrador para receber um.';
-$a->strings['Save Settings'] = 'Salvar Configurações';
-$a->strings['Settings'] = 'Configurações';
-$a->strings['Enter either the name of your location or the zip code.'] = 'Informe sua localização ou seu CEP.';
-$a->strings['Your Location'] = 'Sua localização';
-$a->strings['Identifier of your location (name or zip code), e.g. <em>Berlin,DE</em> or <em>14476,DE</em>.'] = 'Identificador da sua localização (nome ou CEP), p.ex. <em>Rio,BR</em> ou <em>20021,BR</em>.';
-$a->strings['Units'] = 'Unidades';
-$a->strings['select if the temperatur should be displayed in &deg;C or &deg;F'] = 'selecione se a temperatura será exibida em &deg;C or &deg;F';
-$a->strings['Show weather data'] = 'Mostrar dados do clima';
-$a->strings['Curweather settings saved.'] = 'As configurações do Curweather foram salvas.';
-$a->strings['Caching Interval'] = 'Intervalo de cache';
-$a->strings['For how long should the weather data be cached? Choose according your OpenWeatherMap account type.'] = 'Por quanto tempo os dados do clima devem ser guardados em cache? Escolha de acordo com o tipo da sua conta no OpenWeatherMap.';
-$a->strings['no cache'] = 'sem cache';
-$a->strings['minutes'] = 'minutos';
-$a->strings['Your APPID'] = 'Seu AppID';
-$a->strings['Your API key provided by OpenWeatherMap'] = 'Sua chave de API fornecida pelo OpenWeatherMap';
+;
+$a->strings["Error fetching weather data.\\nError was: "] = "Houve um erro na obtenção de dados do clima\\nErro:";
+$a->strings["Current Weather"] = "Clima atual";
+$a->strings["Relative Humidity"] = "Umidade relativa";
+$a->strings["Pressure"] = "Pressão";
+$a->strings["Wind"] = "Vento";
+$a->strings["Last Updated"] = "Atualizado";
+$a->strings["Data by"] = "Dados de";
+$a->strings["Show on map"] = "Mostrar no mapa";
+$a->strings["There was a problem accessing the weather data. But have a look"] = "Houve um problema no acesso aos dados do clima. Mas dê uma olhada";
+$a->strings["at OpenWeatherMap"] = "em OpenWeatherMap";
+$a->strings["Current Weather settings updated."] = "Atualização das Configurações de clima.";
+$a->strings["No APPID found, please contact your admin to optain one."] = "Não foi encontrado nenhum AppID; fale com seu administrador para receber um.";
+$a->strings["Save Settings"] = "Salvar Configurações";
+$a->strings["Settings"] = "Configurações";
+$a->strings["Enter either the name of your location or the zip code."] = "Informe sua localização ou seu CEP.";
+$a->strings["Your Location"] = "Sua localização";
+$a->strings["Identifier of your location (name or zip code), e.g. <em>Berlin,DE</em> or <em>14476,DE</em>."] = "Identificador da sua localização (nome ou CEP), p.ex. <em>Rio,BR</em> ou <em>20021,BR</em>.";
+$a->strings["Units"] = "Unidades";
+$a->strings["select if the temperatur should be displayed in &deg;C or &deg;F"] = "selecione se a temperatura será exibida em &deg;C or &deg;F";
+$a->strings["Show weather data"] = "Mostrar dados do clima";
+$a->strings["Curweather settings saved."] = "As configurações do Curweather foram salvas.";
+$a->strings["Caching Interval"] = "Intervalo de cache";
+$a->strings["For how long should the weather data be cached? Choose according your OpenWeatherMap account type."] = "Por quanto tempo os dados do clima devem ser guardados em cache? Escolha de acordo com o tipo da sua conta no OpenWeatherMap.";
+$a->strings["no cache"] = "sem cache";
+$a->strings["minutes"] = "minutos";
+$a->strings["Your APPID"] = "Seu AppID";
+$a->strings["Your API key provided by OpenWeatherMap"] = "Sua chave de API fornecida pelo OpenWeatherMap";
diff --git a/curweather/lang/ro/strings.php b/curweather/lang/ro/strings.php
index ebca5d6c..0d0ac9e3 100644
--- a/curweather/lang/ro/strings.php
+++ b/curweather/lang/ro/strings.php
@@ -2,12 +2,12 @@
 
 if(! function_exists("string_plural_select_ro")) {
 function string_plural_select_ro($n){
-	$n = intval($n);
-	if ($n==1) { return 0; } else if ((($n%100>19)||(($n%100==0)&&($n!=0)))) { return 2; } else  { return 1; }
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
 }}
-$a->strings['Current Weather'] = 'Starea Vremii';
-$a->strings['Current Weather settings updated.'] = 'Configurări actualizate pentru Starea Vremii';
-$a->strings['Current Weather Settings'] = 'Configurări  pentru Starea Vremii';
-$a->strings['Weather Location: '] = 'Locație Meteo:';
-$a->strings['Enable Current Weather'] = 'Activare Starea Vremii';
-$a->strings['Submit'] = 'Trimite';
+;
+$a->strings["Current Weather"] = "Starea Vremii";
+$a->strings["Current Weather settings updated."] = "Configurări actualizate pentru Starea Vremii";
+$a->strings["Current Weather Settings"] = "Configurări  pentru Starea Vremii";
+$a->strings["Weather Location: "] = "Locație Meteo:";
+$a->strings["Enable Current Weather"] = "Activare Starea Vremii";
+$a->strings["Submit"] = "Trimite";
diff --git a/curweather/lang/ru/messages.po b/curweather/lang/ru/messages.po
deleted file mode 100644
index bb3945de..00000000
--- a/curweather/lang/ru/messages.po
+++ /dev/null
@@ -1,124 +0,0 @@
-# ADDON curweather
-# Copyright (C)
-# This file is distributed under the same license as the Friendica curweather addon package.
-# 
-# 
-# Translators:
-# Alexander An <ravnina@gmail.com>, 2022
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:14-0500\n"
-"PO-Revision-Date: 2014-06-22 11:34+0000\n"
-"Last-Translator: Alexander An <ravnina@gmail.com>, 2022\n"
-"Language-Team: Russian (http://www.transifex.com/Friendica/friendica/language/ru/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ru\n"
-"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
-
-#: curweather.php:47
-msgid "Error fetching weather data. Error was: "
-msgstr "Ошибка получения данных о погоде. Ошибка:"
-
-#: curweather.php:130
-msgid "Current Weather"
-msgstr "Погода сейчас"
-
-#: curweather.php:137
-msgid "Relative Humidity"
-msgstr "Относительная влажность"
-
-#: curweather.php:138
-msgid "Pressure"
-msgstr "Давление"
-
-#: curweather.php:139
-msgid "Wind"
-msgstr "Ветер"
-
-#: curweather.php:140
-msgid "Last Updated"
-msgstr "Обновлено"
-
-#: curweather.php:141
-msgid "Data by"
-msgstr "Данные из"
-
-#: curweather.php:142
-msgid "Show on map"
-msgstr "Показать на карте"
-
-#: curweather.php:147
-msgid "There was a problem accessing the weather data. But have a look"
-msgstr "Не получилось получить данные о погоде. Но вы можете посмотреть"
-
-#: curweather.php:149
-msgid "at OpenWeatherMap"
-msgstr "OpenWeatherMap"
-
-#: curweather.php:178
-msgid "No APPID found, please contact your admin to obtain one."
-msgstr "Не найден APPID, свяжитесь с вашим администратором, чтобы получить его."
-
-#: curweather.php:188
-msgid "Enter either the name of your location or the zip code."
-msgstr "Введите ваше местоположение или индекс."
-
-#: curweather.php:189
-msgid "Your Location"
-msgstr "Ваше местонахождение"
-
-#: curweather.php:189
-msgid ""
-"Identifier of your location (name or zip code), e.g. <em>Berlin,DE</em> or "
-"<em>14476,DE</em>."
-msgstr "Ваше местоположение (имя или индекс), например <em>Berlin,DE</em> или <em>14476,DE</em>."
-
-#: curweather.php:190
-msgid "Units"
-msgstr "Единицы"
-
-#: curweather.php:190
-msgid "select if the temperature should be displayed in &deg;C or &deg;F"
-msgstr "выберите как должна отображаться температура - в &deg;C или &deg;F"
-
-#: curweather.php:191
-msgid "Show weather data"
-msgstr "Показать данные о погоде"
-
-#: curweather.php:196
-msgid "Current Weather Settings"
-msgstr "Текущие настройки"
-
-#: curweather.php:227
-msgid "Save Settings"
-msgstr "Сохранить настройки"
-
-#: curweather.php:230
-msgid "Caching Interval"
-msgstr "Интервал кэширования"
-
-#: curweather.php:232
-msgid ""
-"For how long should the weather data be cached? Choose according your "
-"OpenWeatherMap account type."
-msgstr "Как долго кэшировать данные о погоде? Выберите в соответствии с типом вашей учётной записи OpenWeatherMap."
-
-#: curweather.php:233
-msgid "no cache"
-msgstr "не кэшировать"
-
-#: curweather.php:234 curweather.php:235 curweather.php:236 curweather.php:237
-msgid "minutes"
-msgstr "мин."
-
-#: curweather.php:240
-msgid "Your APPID"
-msgstr "Ваш APPID"
-
-#: curweather.php:240
-msgid "Your API key provided by OpenWeatherMap"
-msgstr "Ваш ключ API, полученный у OpenWeatherMap"
diff --git a/curweather/lang/ru/strings.php b/curweather/lang/ru/strings.php
index 9926cdce..ab5e2246 100644
--- a/curweather/lang/ru/strings.php
+++ b/curweather/lang/ru/strings.php
@@ -1,32 +1,3 @@
-<?php
-
-if(! function_exists("string_plural_select_ru")) {
-function string_plural_select_ru($n){
-	$n = intval($n);
-	if ($n%10==1 && $n%100!=11) { return 0; } else if ($n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14)) { return 1; } else if ($n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)) { return 2; } else  { return 3; }
-}}
-$a->strings['Error fetching weather data. Error was: '] = 'Ошибка получения данных о погоде. Ошибка:';
-$a->strings['Current Weather'] = 'Погода сейчас';
-$a->strings['Relative Humidity'] = 'Относительная влажность';
-$a->strings['Pressure'] = 'Давление';
-$a->strings['Wind'] = 'Ветер';
-$a->strings['Last Updated'] = 'Обновлено';
-$a->strings['Data by'] = 'Данные из';
-$a->strings['Show on map'] = 'Показать на карте';
-$a->strings['There was a problem accessing the weather data. But have a look'] = 'Не получилось получить данные о погоде. Но вы можете посмотреть';
-$a->strings['at OpenWeatherMap'] = 'OpenWeatherMap';
-$a->strings['No APPID found, please contact your admin to obtain one.'] = 'Не найден APPID, свяжитесь с вашим администратором, чтобы получить его.';
-$a->strings['Enter either the name of your location or the zip code.'] = 'Введите ваше местоположение или индекс.';
-$a->strings['Your Location'] = 'Ваше местонахождение';
-$a->strings['Identifier of your location (name or zip code), e.g. <em>Berlin,DE</em> or <em>14476,DE</em>.'] = 'Ваше местоположение (имя или индекс), например <em>Berlin,DE</em> или <em>14476,DE</em>.';
-$a->strings['Units'] = 'Единицы';
-$a->strings['select if the temperature should be displayed in &deg;C or &deg;F'] = 'выберите как должна отображаться температура - в &deg;C или &deg;F';
-$a->strings['Show weather data'] = 'Показать данные о погоде';
-$a->strings['Current Weather Settings'] = 'Текущие настройки';
-$a->strings['Save Settings'] = 'Сохранить настройки';
-$a->strings['Caching Interval'] = 'Интервал кэширования';
-$a->strings['For how long should the weather data be cached? Choose according your OpenWeatherMap account type.'] = 'Как долго кэшировать данные о погоде? Выберите в соответствии с типом вашей учётной записи OpenWeatherMap.';
-$a->strings['no cache'] = 'не кэшировать';
-$a->strings['minutes'] = 'мин.';
-$a->strings['Your APPID'] = 'Ваш APPID';
-$a->strings['Your API key provided by OpenWeatherMap'] = 'Ваш ключ API, полученный у OpenWeatherMap';
+<?php
+
+$a->strings["Submit"] = "Подтвердить";
diff --git a/curweather/lang/sv/messages.po b/curweather/lang/sv/messages.po
deleted file mode 100644
index 18436e39..00000000
--- a/curweather/lang/sv/messages.po
+++ /dev/null
@@ -1,125 +0,0 @@
-# ADDON curweather
-# Copyright (C)
-# This file is distributed under the same license as the Friendica curweather addon package.
-# 
-# 
-# Translators:
-# Hypolite Petovan <hypolite@mrpetovan.com>, 2019
-# Kristoffer Grundström <lovaren@gmail.com>, 2022
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:14-0500\n"
-"PO-Revision-Date: 2022-01-16 01:04+0000\n"
-"Last-Translator: Kristoffer Grundström <lovaren@gmail.com>\n"
-"Language-Team: Swedish (http://www.transifex.com/Friendica/friendica/language/sv/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: sv\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: curweather.php:47
-msgid "Error fetching weather data. Error was: "
-msgstr ""
-
-#: curweather.php:130
-msgid "Current Weather"
-msgstr "Nuvarande väder"
-
-#: curweather.php:137
-msgid "Relative Humidity"
-msgstr "Relativ luftfuktighet"
-
-#: curweather.php:138
-msgid "Pressure"
-msgstr "Tryck"
-
-#: curweather.php:139
-msgid "Wind"
-msgstr "Vind"
-
-#: curweather.php:140
-msgid "Last Updated"
-msgstr "Uppdaterades senast"
-
-#: curweather.php:141
-msgid "Data by"
-msgstr "Data av"
-
-#: curweather.php:142
-msgid "Show on map"
-msgstr "Visa på karta"
-
-#: curweather.php:147
-msgid "There was a problem accessing the weather data. But have a look"
-msgstr ""
-
-#: curweather.php:149
-msgid "at OpenWeatherMap"
-msgstr "vid OpenWeatherMap"
-
-#: curweather.php:178
-msgid "No APPID found, please contact your admin to obtain one."
-msgstr ""
-
-#: curweather.php:188
-msgid "Enter either the name of your location or the zip code."
-msgstr ""
-
-#: curweather.php:189
-msgid "Your Location"
-msgstr "Din plats"
-
-#: curweather.php:189
-msgid ""
-"Identifier of your location (name or zip code), e.g. <em>Berlin,DE</em> or "
-"<em>14476,DE</em>."
-msgstr ""
-
-#: curweather.php:190
-msgid "Units"
-msgstr "Enheter"
-
-#: curweather.php:190
-msgid "select if the temperature should be displayed in &deg;C or &deg;F"
-msgstr ""
-
-#: curweather.php:191
-msgid "Show weather data"
-msgstr "Visa väder-data"
-
-#: curweather.php:196
-msgid "Current Weather Settings"
-msgstr ""
-
-#: curweather.php:227
-msgid "Save Settings"
-msgstr "Spara inställningar"
-
-#: curweather.php:230
-msgid "Caching Interval"
-msgstr ""
-
-#: curweather.php:232
-msgid ""
-"For how long should the weather data be cached? Choose according your "
-"OpenWeatherMap account type."
-msgstr ""
-
-#: curweather.php:233
-msgid "no cache"
-msgstr "ingen cache"
-
-#: curweather.php:234 curweather.php:235 curweather.php:236 curweather.php:237
-msgid "minutes"
-msgstr "minuter"
-
-#: curweather.php:240
-msgid "Your APPID"
-msgstr "Ditt APP-ID"
-
-#: curweather.php:240
-msgid "Your API key provided by OpenWeatherMap"
-msgstr ""
diff --git a/curweather/lang/sv/strings.php b/curweather/lang/sv/strings.php
index a27e6649..3ec569a7 100644
--- a/curweather/lang/sv/strings.php
+++ b/curweather/lang/sv/strings.php
@@ -1,22 +1,3 @@
-<?php
-
-if(! function_exists("string_plural_select_sv")) {
-function string_plural_select_sv($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Current Weather'] = 'Nuvarande väder';
-$a->strings['Relative Humidity'] = 'Relativ luftfuktighet';
-$a->strings['Pressure'] = 'Tryck';
-$a->strings['Wind'] = 'Vind';
-$a->strings['Last Updated'] = 'Uppdaterades senast';
-$a->strings['Data by'] = 'Data av';
-$a->strings['Show on map'] = 'Visa på karta';
-$a->strings['at OpenWeatherMap'] = 'vid OpenWeatherMap';
-$a->strings['Your Location'] = 'Din plats';
-$a->strings['Units'] = 'Enheter';
-$a->strings['Show weather data'] = 'Visa väder-data';
-$a->strings['Save Settings'] = 'Spara inställningar';
-$a->strings['no cache'] = 'ingen cache';
-$a->strings['minutes'] = 'minuter';
-$a->strings['Your APPID'] = 'Ditt APP-ID';
+<?php
+
+$a->strings["Submit"] = "Spara";
diff --git a/curweather/templates/settings.tpl b/curweather/templates/settings.tpl
index d250b9bb..09f6f506 100644
--- a/curweather/templates/settings.tpl
+++ b/curweather/templates/settings.tpl
@@ -1,6 +1,15 @@
-{{if $noappidtext}}
-<p style="color: red; font-weight: bold;">{{$noappidtext}}</p>
-{{/if}}
-{{include file="field_input.tpl" field=$curweather_loc}}
-{{include file="field_select.tpl" field=$curweather_units}}
-{{include file="field_checkbox.tpl" field=$enabled}}
+<span id="settings_curweather_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose('settings_curweather_expanded'); openClose('settings_curweather_inflated');">
+	<h3>{{$header}}</h3>
+</span>
+<div id="settings_curweather_expanded" class="settings-block" style="display: none;">
+	<span class="fakelink" onclick="openClose('settings_curweather_expanded'); openClose('settings_curweather_inflated');">
+		<h3>{{$header}}</h3>
+	</span>
+	<div style="color: red; font-weight: bold;">{{$noappidtext}}</div>
+	{{include file="field_input.tpl" field=$curweather_loc}}
+	{{include file="field_select.tpl" field=$curweather_units}}
+	{{include file="field_checkbox.tpl" field=$enabled}}
+	<div class="settings-submit-wrapper" >
+		<input type="submit" id="curweather-settings-submit" name="curweather-settings-submit" class="settings-submit" value="{{$submit}}" />
+	</div>
+</div>
diff --git a/diaspora/Diaspora_Connection.php b/diaspora/Diaspora_Connection.php
index d8390d70..a33bf608 100644
--- a/diaspora/Diaspora_Connection.php
+++ b/diaspora/Diaspora_Connection.php
@@ -1,7 +1,4 @@
 <?php
-
-use Friendica\Core\System;
-
 /**
  * Super-skeletal class to interact with Diaspora.
  *
@@ -32,7 +29,7 @@ class Diaspora_Connection {
 			$this->setPassword($password);
 		}
 
-		$this->cookiejar = tempnam(System::getTempPath(), 'cookies');
+		$this->cookiejar = tempnam(get_temppath(), 'cookies');
 		return $this;
 	}
 
diff --git a/diaspora/diasphp.php b/diaspora/diasphp.php
index 1588b582..f48933a6 100644
--- a/diaspora/diasphp.php
+++ b/diaspora/diasphp.php
@@ -1,7 +1,4 @@
 <?php
-
-use Friendica\Core\System;
-
 /**
  * Ein fies zusammengehackter PHP-Diaspory-Client, der direkt von diesem abgeschaut ist:
  * https://github.com/Javafant/diaspy/blob/master/client.py
@@ -14,7 +11,7 @@ class Diasphp {
 		$this->token_regex = '/content="(.*?)" name="csrf-token/';
 
 		$this->pod = $pod;
-		$this->cookiejar = tempnam(System::getTempPath(), 'cookies');
+		$this->cookiejar = tempnam(get_temppath(), 'cookies');
 	}
 
 	function __destruct() {
@@ -110,3 +107,4 @@ class Diasphp {
 		return true;
 	}
 }
+?>
diff --git a/diaspora/diaspora.css b/diaspora/diaspora.css
new file mode 100644
index 00000000..21ef9bc5
--- /dev/null
+++ b/diaspora/diaspora.css
@@ -0,0 +1,16 @@
+
+#diaspora-enable-label, #diaspora-username-label, #diaspora-password-label, #diaspora-bydefault-label, #diaspora-aspect-label {
+	float: left;
+	width: 200px;
+	margin-top: 10px;
+}
+
+#diaspora-checkbox, #diaspora-username, #diaspora-password, #diaspora-bydefault, #diaspora-aspect {
+	float: left;
+	margin-top: 10px;
+}
+
+#diaspora-submit {
+	margin-top: 15px;
+}
+
diff --git a/diaspora/diaspora.php b/diaspora/diaspora.php
index cb2eb996..0d847b14 100644
--- a/diaspora/diaspora.php
+++ b/diaspora/diaspora.php
@@ -12,12 +12,12 @@ require_once 'addon/diaspora/Diaspora_Connection.php';
 use Friendica\App;
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Hook;
+use Friendica\Core\L10n;
 use Friendica\Core\Logger;
-use Friendica\Core\Renderer;
+use Friendica\Core\PConfig;
+use Friendica\Core\Protocol;
 use Friendica\Database\DBA;
 use Friendica\Core\Worker;
-use Friendica\DI;
-use Friendica\Model\Post;
 
 function diaspora_install()
 {
@@ -29,114 +29,159 @@ function diaspora_install()
 	Hook::register('connector_settings_post', 'addon/diaspora/diaspora.php', 'diaspora_settings_post');
 }
 
-function diaspora_jot_nets(array &$jotnets_fields)
+function diaspora_uninstall()
 {
-	if (!DI::userSession()->getLocalUserId()) {
+	Hook::unregister('hook_fork',               'addon/diaspora/diaspora.php', 'diaspora_hook_fork');
+	Hook::unregister('post_local',              'addon/diaspora/diaspora.php', 'diaspora_post_local');
+	Hook::unregister('notifier_normal',         'addon/diaspora/diaspora.php', 'diaspora_send');
+	Hook::unregister('jot_networks',            'addon/diaspora/diaspora.php', 'diaspora_jot_nets');
+	Hook::unregister('connector_settings',      'addon/diaspora/diaspora.php', 'diaspora_settings');
+	Hook::unregister('connector_settings_post', 'addon/diaspora/diaspora.php', 'diaspora_settings_post');
+}
+
+function diaspora_jot_nets(App $a, array &$jotnets_fields)
+{
+	if (!local_user()) {
 		return;
 	}
 
-	if (DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'diaspora', 'post')) {
+	if (PConfig::get(local_user(), 'diaspora', 'post')) {
 		$jotnets_fields[] = [
 			'type' => 'checkbox',
 			'field' => [
 				'diaspora_enable',
-				DI::l10n()->t('Post to Diaspora'),
-				DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'diaspora', 'post_by_default')
+				L10n::t('Post to Diaspora'),
+				PConfig::get(local_user(), 'diaspora', 'post_by_default')
 			]
 		];
 	}
 }
 
-function diaspora_settings(array &$data)
+function diaspora_settings(App $a, &$s)
 {
-	if (!DI::userSession()->getLocalUserId()) {
+	if (! local_user()) {
 		return;
 	}
 
-	$enabled     = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'diaspora', 'post', false);
-	$def_enabled = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'diaspora', 'post_by_default');
+	/* Add our stylesheet to the page so we can make our settings look nice */
 
-	$handle   = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'diaspora', 'handle');
-	$password = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'diaspora', 'password');
-	$aspect   = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'diaspora', 'aspect');
+	$a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->getBaseURL() . '/addon/diaspora/diaspora.css' . '" media="all" />' . "\r\n";
 
-	$info  = '';
-	$error = '';
-	if (DI::session()->get('my_address')) {
-		$info = DI::l10n()->t('Please remember: You can always be reached from Diaspora with your Friendica handle <strong>%s</strong>. ', DI::session()->get('my_address'));
-		$info .= DI::l10n()->t('This connector is only meant if you still want to use your old Diaspora account for some time. ');
-		$info .= DI::l10n()->t('However, it is preferred that you tell your Diaspora contacts the new handle <strong>%s</strong> instead.', DI::session()->get('my_address'));
+	/* Get the current state of our config variables */
+
+	$enabled = PConfig::get(local_user(),'diaspora','post');
+	$checked = (($enabled) ? ' checked="checked" ' : '');
+	$css = (($enabled) ? '' : '-disabled');
+
+	$def_enabled = PConfig::get(local_user(),'diaspora','post_by_default');
+
+	$def_checked = (($def_enabled) ? ' checked="checked" ' : '');
+
+	$handle = PConfig::get(local_user(), 'diaspora', 'handle');
+	$password = PConfig::get(local_user(), 'diaspora', 'password');
+	$aspect = PConfig::get(local_user(),'diaspora','aspect');
+
+	$status = "";
+
+	$r = q("SELECT `addr` FROM `contact` WHERE `self` AND `uid` = %d", intval(local_user()));
+
+	if (DBA::isResult($r)) {
+		$status = L10n::t("Please remember: You can always be reached from Diaspora with your Friendica handle %s. ", $r[0]['addr']);
+		$status .= L10n::t('This connector is only meant if you still want to use your old Diaspora account for some time. ');
+		$status .= L10n::t('However, it is preferred that you tell your Diaspora contacts the new handle %s instead.', $r[0]['addr']);
 	}
 
-	$aspect_select = '';
+	$aspects = false;
+
 	if ($handle && $password) {
 		$conn = new Diaspora_Connection($handle, $password);
 		$conn->logIn();
-		$rawAspects = $conn->getAspects();
-		if ($rawAspects) {
-			$availableAspects = [
-				'all_aspects' => DI::l10n()->t('All aspects'),
-				'public'      => DI::l10n()->t('Public'),
-			];
-			foreach ($rawAspects as $rawAspect) {
-				$availableAspects[$rawAspect->id] = $rawAspect->name;
-			}
+		$aspects = $conn->getAspects();
 
-			$aspect_select = ['aspect', DI::l10n()->t('Post to aspect:'), $aspect, '', $availableAspects];
-			$info          = DI::l10n()->t('Connected with your Diaspora account <strong>%s</strong>', $handle);
-		} else {
-			$info  = '';
-			$error = DI::l10n()->t("Can't login to your Diaspora account. Please check handle (in the format user@domain.tld) and password.");
+		if (!$aspects) {
+			$status = L10n::t("Can't login to your Diaspora account. Please check handle (in the format user@domain.tld) and password.");
 		}
 	}
 
-	$t    = Renderer::getMarkupTemplate('connector_settings.tpl', 'addon/diaspora/');
-	$html = Renderer::replaceMacros($t, [
-		'$l10n' => [
-			'info_header'  => DI::l10n()->t('Information'),
-			'error_header' => DI::l10n()->t('Error'),
-		],
+	/* Add some HTML to the existing form */
 
-		'$info'  => $info,
-		'$error' => $error,
+	$s .= '<span id="settings_diaspora_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_diaspora_expanded\'); openClose(\'settings_diaspora_inflated\');">';
+	$s .= '<img class="connector'.$css.'" src="images/diaspora-logo.png" /><h3 class="connector">'. L10n::t('Diaspora Export').'</h3>';
+	$s .= '</span>';
+	$s .= '<div id="settings_diaspora_expanded" class="settings-block" style="display: none;">';
+	$s .= '<span class="fakelink" onclick="openClose(\'settings_diaspora_expanded\'); openClose(\'settings_diaspora_inflated\');">';
+	$s .= '<img class="connector'.$css.'" src="images/diaspora-logo.png" /><h3 class="connector">'. L10n::t('Diaspora Export').'</h3>';
+	$s .= '</span>';
 
-		'$enabled'         => ['enabled', DI::l10n()->t('Enable Diaspora Post Addon'), $enabled],
-		'$handle'          => ['handle', DI::l10n()->t('Diaspora handle'), $handle, null, null, 'placeholder="user@domain.tld"'],
-		'$password'        => ['password', DI::l10n()->t('Diaspora password'), '', DI::l10n()->t('Privacy notice: Your Diaspora password will be stored unencrypted to authenticate you with your Diaspora pod. This means your Friendica node administrator can have access to it.')],
-		'$aspect_select'   => $aspect_select,
-		'$post_by_default' => ['post_by_default', DI::l10n()->t('Post to Diaspora by default'), $def_enabled],
-	]);
+	if ($status) {
+		$s .= '<div id="diaspora-status-wrapper"><strong>';
+		$s .= $status;
+		$s .= '</strong></div><div class="clear"></div>';
+	}
+
+	$s .= '<div id="diaspora-enable-wrapper">';
+	$s .= '<label id="diaspora-enable-label" for="diaspora-checkbox">' . L10n::t('Enable Diaspora Post Addon') . '</label>';
+	$s .= '<input id="diaspora-checkbox" type="checkbox" name="diaspora" value="1" ' . $checked . '/>';
+	$s .= '</div><div class="clear"></div>';
+
+	$s .= '<div id="diaspora-username-wrapper">';
+	$s .= '<label id="diaspora-username-label" for="diaspora-username">' . L10n::t('Diaspora handle') . '</label>';
+	$s .= '<input id="diaspora-username" type="text" name="handle" value="' . $handle . '" />';
+	$s .= '</div><div class="clear"></div>';
+
+	$s .= '<div id="diaspora-password-wrapper">';
+	$s .= '<label id="diaspora-password-label" for="diaspora-password">' . L10n::t('Diaspora password') . '</label>';
+	$s .= '<input id="diaspora-password" type="password" name="password" value="' . $password . '" />';
+	$s .= '</div><div class="clear"></div>';
+
+	if ($aspects) {
+		$single_aspect =  new stdClass();
+		$single_aspect->id = 'all_aspects';
+		$single_aspect->name = L10n::t('All aspects');
+		$aspects[] = $single_aspect;
+
+		$single_aspect =  new stdClass();
+		$single_aspect->id = 'public';
+		$single_aspect->name = L10n::t('Public');
+		$aspects[] = $single_aspect;
+
+		$s .= '<label id="diaspora-aspect-label" for="diaspora-aspect">' . L10n::t('Post to aspect:') . '</label>';
+		$s .= '<select name="aspect" id="diaspora-aspect">';
+		foreach($aspects as $single_aspect) {
+			if ($single_aspect->id == $aspect)
+				$s .= "<option value='".$single_aspect->id."' selected>".$single_aspect->name."</option>";
+			else
+				$s .= "<option value='".$single_aspect->id."'>".$single_aspect->name."</option>";
+		}
+
+		$s .= "</select>";
+		$s .= '<div class="clear"></div>';
+	}
+
+	$s .= '<div id="diaspora-bydefault-wrapper">';
+	$s .= '<label id="diaspora-bydefault-label" for="diaspora-bydefault">' . L10n::t('Post to Diaspora by default') . '</label>';
+	$s .= '<input id="diaspora-bydefault" type="checkbox" name="diaspora_bydefault" value="1" ' . $def_checked . '/>';
+	$s .= '</div><div class="clear"></div>';
+
+	/* provide a submit button */
+
+	$s .= '<div class="settings-submit-wrapper" ><input type="submit" id="diaspora-submit" name="diaspora-submit" class="settings-submit" value="' . L10n::t('Save Settings') . '" /></div></div>';
 
-	$data = [
-		'connector' => 'diaspora',
-		'title'     => DI::l10n()->t('Diaspora Export'),
-		'image'     => 'images/diaspora-logo.png',
-		'enabled'   => $enabled,
-		'html'      => $html,
-	];
 }
 
 
-function diaspora_settings_post(array &$b)
+function diaspora_settings_post(App $a, &$b)
 {
 	if (!empty($_POST['diaspora-submit'])) {
-		DI::pConfig()->set(DI::userSession()->getLocalUserId(),'diaspora', 'post'           , intval($_POST['enabled']));
-		if (intval($_POST['enabled'])) {
-			if (isset($_POST['handle'])) {
-				DI::pConfig()->set(DI::userSession()->getLocalUserId(),'diaspora', 'handle'         , trim($_POST['handle']));
-				DI::pConfig()->set(DI::userSession()->getLocalUserId(),'diaspora', 'password'       , trim($_POST['password']));
-			}
-			if (!empty($_POST['aspect'])) {
-				DI::pConfig()->set(DI::userSession()->getLocalUserId(),'diaspora', 'aspect'         , trim($_POST['aspect']));
-				DI::pConfig()->set(DI::userSession()->getLocalUserId(),'diaspora', 'post_by_default', intval($_POST['post_by_default']));
-			}
-		} else {
-			DI::pConfig()->delete(DI::userSession()->getLocalUserId(), 'diaspora', 'password');
-		}
+		PConfig::set(local_user(),'diaspora', 'post'           , intval($_POST['diaspora']));
+		PConfig::set(local_user(),'diaspora', 'post_by_default', intval($_POST['diaspora_bydefault']));
+		PConfig::set(local_user(),'diaspora', 'handle'         , trim($_POST['handle']));
+		PConfig::set(local_user(),'diaspora', 'password'       , trim($_POST['password']));
+		PConfig::set(local_user(),'diaspora', 'aspect'         , trim($_POST['aspect']));
 	}
 }
 
-function diaspora_hook_fork(array &$b)
+function diaspora_hook_fork(&$a, &$b)
 {
 	if ($b['name'] != 'notifier_normal') {
 		return;
@@ -145,19 +190,19 @@ function diaspora_hook_fork(array &$b)
 	$post = $b['data'];
 
 	if ($post['deleted'] || $post['private'] || ($post['created'] !== $post['edited']) ||
-		!strstr($post['postopts'] ?? '', 'diaspora') || ($post['parent'] != $post['id'])) {
+		!strstr($post['postopts'], 'diaspora') || ($post['parent'] != $post['id'])) {
 		$b['execute'] = false;
 		return;
 	}
 }
 
-function diaspora_post_local(array &$b)
+function diaspora_post_local(App $a, array &$b)
 {
 	if ($b['edit']) {
 		return;
 	}
 
-	if (!DI::userSession()->getLocalUserId() || (DI::userSession()->getLocalUserId() != $b['uid'])) {
+	if (!local_user() || (local_user() != $b['uid'])) {
 		return;
 	}
 
@@ -165,11 +210,11 @@ function diaspora_post_local(array &$b)
 		return;
 	}
 
-	$diaspora_post   = intval(DI::pConfig()->get(DI::userSession()->getLocalUserId(),'diaspora','post'));
+	$diaspora_post   = intval(PConfig::get(local_user(),'diaspora','post'));
 
 	$diaspora_enable = (($diaspora_post && !empty($_REQUEST['diaspora_enable'])) ? intval($_REQUEST['diaspora_enable']) : 0);
 
-	if ($b['api_source'] && intval(DI::pConfig()->get(DI::userSession()->getLocalUserId(),'diaspora','post_by_default'))) {
+	if ($b['api_source'] && intval(PConfig::get(local_user(),'diaspora','post_by_default'))) {
 		$diaspora_enable = 1;
 	}
 
@@ -184,11 +229,11 @@ function diaspora_post_local(array &$b)
 	$b['postopts'] .= 'diaspora';
 }
 
-function diaspora_send(array &$b)
+function diaspora_send(App $a, array &$b)
 {
-	$hostname = DI::baseUrl()->getHost();
+	$hostname = $a->getHostName();
 
-	Logger::notice('diaspora_send: invoked');
+	Logger::log('diaspora_send: invoked');
 
 	if ($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited'])) {
 		return;
@@ -202,24 +247,36 @@ function diaspora_send(array &$b)
 		return;
 	}
 
-	$b['body'] = Post\Media::addAttachmentsToBody($b['uri-id'], DI::contentItem()->addSharedPost($b));
-
 	// Dont't post if the post doesn't belong to us.
-	// This is a check for group postings
+	// This is a check for forum postings
 	$self = DBA::selectFirst('contact', ['id'], ['uid' => $b['uid'], 'self' => true]);
 
 	if ($b['contact-id'] != $self['id']) {
 		return;
 	}
 
-	Logger::info('diaspora_send: prepare posting');
+	Logger::log('diaspora_send: prepare posting', Logger::DEBUG);
 
-	$handle = DI::pConfig()->get($b['uid'],'diaspora','handle');
-	$password = DI::pConfig()->get($b['uid'],'diaspora','password');
-	$aspect = DI::pConfig()->get($b['uid'],'diaspora','aspect');
+	$handle = PConfig::get($b['uid'],'diaspora','handle');
+	$password = PConfig::get($b['uid'],'diaspora','password');
+	$aspect = PConfig::get($b['uid'],'diaspora','aspect');
 
 	if ($handle && $password) {
-		Logger::info('diaspora_send: all values seem to be okay');
+		Logger::log('diaspora_send: all values seem to be okay', Logger::DEBUG);
+
+		$tag_arr = [];
+		$tags = '';
+		$x = preg_match_all('/\#\[(.*?)\](.*?)\[/',$b['tag'],$matches,PREG_SET_ORDER);
+
+		if ($x) {
+			foreach ($matches as $mtch) {
+				$tag_arr[] = $mtch[2];
+			}
+		}
+
+		if (count($tag_arr)) {
+			$tags = implode(',',$tag_arr);
+		}
 
 		$title = $b['title'];
 		$body = $b['body'];
@@ -250,20 +307,20 @@ function diaspora_send(array &$b)
 		require_once "addon/diaspora/diasphp.php";
 
 		try {
-			Logger::info('diaspora_send: prepare');
+			Logger::log('diaspora_send: prepare', Logger::DEBUG);
 			$conn = new Diaspora_Connection($handle, $password);
-			Logger::info('diaspora_send: try to log in '.$handle);
+			Logger::log('diaspora_send: try to log in '.$handle, Logger::DEBUG);
 			$conn->logIn();
-			Logger::info('diaspora_send: try to send '.$body);
+			Logger::log('diaspora_send: try to send '.$body, Logger::DEBUG);
 
 			$conn->provider = $hostname;
 			$conn->postStatusMessage($body, $aspect);
 
-			Logger::notice('diaspora_send: success');
+			Logger::log('diaspora_send: success');
 		} catch (Exception $e) {
-			Logger::notice("diaspora_send: Error submitting the post: " . $e->getMessage());
+			Logger::log("diaspora_send: Error submitting the post: " . $e->getMessage());
 
-			Logger::info('diaspora_send: requeueing '.$b['uid']);
+			Logger::log('diaspora_send: requeueing '.$b['uid'], Logger::DEBUG);
 
 			Worker::defer();
 		}
diff --git a/diaspora/lang/C/messages.po b/diaspora/lang/C/messages.po
index b9944720..6764eaf1 100644
--- a/diaspora/lang/C/messages.po
+++ b/diaspora/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-06-03 15:48-0400\n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,84 +17,44 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: diaspora.php:43
+#: diaspora.php:37
 msgid "Post to Diaspora"
 msgstr ""
 
-#: diaspora.php:66
-#, php-format
+#: diaspora.php:142
 msgid ""
-"Please remember: You can always be reached from Diaspora with your Friendica "
-"handle <strong>%s</strong>. "
+"Can't login to your Diaspora account. Please check username and password and "
+"ensure you used the complete address (including http...)"
 msgstr ""
 
-#: diaspora.php:67
-msgid ""
-"This connector is only meant if you still want to use your old Diaspora "
-"account for some time. "
+#: diaspora.php:149 diaspora.php:153
+msgid "Diaspora Export"
 msgstr ""
 
-#: diaspora.php:68
-#, php-format
-msgid ""
-"However, it is preferred that you tell your Diaspora contacts the new handle "
-"<strong>%s</strong> instead."
-msgstr ""
-
-#: diaspora.php:78
-msgid "All aspects"
-msgstr ""
-
-#: diaspora.php:79
-msgid "Public"
-msgstr ""
-
-#: diaspora.php:85
-msgid "Post to aspect:"
-msgstr ""
-
-#: diaspora.php:86
-#, php-format
-msgid "Connected with your Diaspora account <strong>%s</strong>"
-msgstr ""
-
-#: diaspora.php:89
-msgid ""
-"Can't login to your Diaspora account. Please check handle (in the format "
-"user@domain.tld) and password."
-msgstr ""
-
-#: diaspora.php:96
-msgid "Information"
-msgstr ""
-
-#: diaspora.php:97
-msgid "Error"
-msgstr ""
-
-#: diaspora.php:103
+#: diaspora.php:163
 msgid "Enable Diaspora Post Addon"
 msgstr ""
 
-#: diaspora.php:104
-msgid "Diaspora handle"
+#: diaspora.php:168
+msgid "Diaspora username"
 msgstr ""
 
-#: diaspora.php:105
+#: diaspora.php:173
 msgid "Diaspora password"
 msgstr ""
 
-#: diaspora.php:105
-msgid ""
-"Privacy notice: Your Diaspora password will be stored unencrypted to "
-"authenticate you with your Diaspora pod. This means your Friendica node "
-"administrator can have access to it."
+#: diaspora.php:178
+msgid "Diaspora site URL"
 msgstr ""
 
-#: diaspora.php:107
+#: diaspora.php:183
 msgid "Post to Diaspora by default"
 msgstr ""
 
-#: diaspora.php:112
-msgid "Diaspora Export"
+#: diaspora.php:189
+msgid "Save Settings"
+msgstr ""
+
+#: diaspora.php:324
+msgid "Diaspora post failed. Queued for retry."
 msgstr ""
diff --git a/diaspora/lang/ar/messages.po b/diaspora/lang/ar/messages.po
deleted file mode 100644
index 55e0f1a2..00000000
--- a/diaspora/lang/ar/messages.po
+++ /dev/null
@@ -1,107 +0,0 @@
-# ADDON diaspora
-# Copyright (C)
-# This file is distributed under the same license as the Friendica diaspora addon package.
-# 
-# 
-# Translators:
-# abidin toumi <abidin24@tutanota.com>, 2021
-# Farida Khalaf <faridakhalaf@hotmail.com>, 2021
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2021-10-29 10:03+0000\n"
-"Last-Translator: abidin toumi <abidin24@tutanota.com>\n"
-"Language-Team: Arabic (http://www.transifex.com/Friendica/friendica/language/ar/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ar\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-
-#: diaspora.php:43
-msgid "Post to Diaspora"
-msgstr "شارك في دياسبورا"
-
-#: diaspora.php:68
-#, php-format
-msgid ""
-"Please remember: You can always be reached from Diaspora with your Friendica"
-" handle <strong>%s</strong>. "
-msgstr "تذكر: يمكن الوصول إليك من دياسبورا باستخدام معرف فرنديكا<strong>%s</strong>."
-
-#: diaspora.php:69
-msgid ""
-"This connector is only meant if you still want to use your old Diaspora "
-"account for some time. "
-msgstr "يجب استخدام هذا الموصل في حالة كنت تريد استخدام حساب دياسبورا القديم."
-
-#: diaspora.php:70
-#, php-format
-msgid ""
-"However, it is preferred that you tell your Diaspora contacts the new handle"
-" <strong>%s</strong> instead."
-msgstr "على أي حال ، من الأفضل أن تطلع متراسليك في دياسبورا بمعرفك الجديد <strong>%s</strong>. "
-
-#: diaspora.php:80
-msgid "All aspects"
-msgstr "كل الفئات"
-
-#: diaspora.php:81
-msgid "Public"
-msgstr "علني"
-
-#: diaspora.php:87
-msgid "Post to aspect:"
-msgstr "انشر إلى الفئات:"
-
-#: diaspora.php:88
-#, php-format
-msgid "Connected with your Diaspora account <strong>%s</strong>"
-msgstr "متصل بحساب دياسبورا <strong>%s</strong>"
-
-#: diaspora.php:91
-msgid ""
-"Can't login to your Diaspora account. Please check handle (in the format "
-"user@domain.tld) and password."
-msgstr "لا يمكن تسجيل الدخول إلى حساب الدياسبورا. يرجى التحقق من المعرف (على شاكلة user@domain.tld) وكلمة المرور."
-
-#: diaspora.php:99
-msgid "Diaspora Export"
-msgstr "تصدير الدياسبورا"
-
-#: diaspora.php:100
-msgid "Information"
-msgstr "معلومات"
-
-#: diaspora.php:101
-msgid "Error"
-msgstr "خطأ"
-
-#: diaspora.php:102
-msgid "Save Settings"
-msgstr "احفظ الإعدادات"
-
-#: diaspora.php:106
-msgid "Enable Diaspora Post Addon"
-msgstr "تفعيل إضافة مشاركة دياسبورا"
-
-#: diaspora.php:107
-msgid "Diaspora handle"
-msgstr "معرف الدياسبورا"
-
-#: diaspora.php:108
-msgid "Diaspora password"
-msgstr "كلمة مرور الدياسبورا"
-
-#: diaspora.php:108
-msgid ""
-"Privacy notice: Your Diaspora password will be stored unencrypted to "
-"authenticate you with your Diaspora pod. This means your Friendica node "
-"administrator can have access to it."
-msgstr "تنبيه خصوصية: سيتم تخزين كلمة مرور دياسبورا دون تشفير للاستيثاق منك في خادم دياسبورا. هذا يعني أنه يمكن لمسؤول عقدة فرنديكا الوصول إليها."
-
-#: diaspora.php:110
-msgid "Post to Diaspora by default"
-msgstr "شارك في دياسبورا افتراضيا"
diff --git a/diaspora/lang/ar/strings.php b/diaspora/lang/ar/strings.php
deleted file mode 100644
index 93fe0374..00000000
--- a/diaspora/lang/ar/strings.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_ar")) {
-function string_plural_select_ar($n){
-	$n = intval($n);
-	if ($n==0) { return 0; } else if ($n==1) { return 1; } else if ($n==2) { return 2; } else if ($n%100>=3 && $n%100<=10) { return 3; } else if ($n%100>=11 && $n%100<=99) { return 4; } else  { return 5; }
-}}
-$a->strings['Post to Diaspora'] = 'شارك في دياسبورا';
-$a->strings['Please remember: You can always be reached from Diaspora with your Friendica handle <strong>%s</strong>. '] = 'تذكر: يمكن الوصول إليك من دياسبورا باستخدام معرف فرنديكا<strong>%s</strong>.';
-$a->strings['This connector is only meant if you still want to use your old Diaspora account for some time. '] = 'يجب استخدام هذا الموصل في حالة كنت تريد استخدام حساب دياسبورا القديم.';
-$a->strings['However, it is preferred that you tell your Diaspora contacts the new handle <strong>%s</strong> instead.'] = 'على أي حال ، من الأفضل أن تطلع متراسليك في دياسبورا بمعرفك الجديد <strong>%s</strong>. ';
-$a->strings['All aspects'] = 'كل الفئات';
-$a->strings['Public'] = 'علني';
-$a->strings['Post to aspect:'] = 'انشر إلى الفئات:';
-$a->strings['Connected with your Diaspora account <strong>%s</strong>'] = 'متصل بحساب دياسبورا <strong>%s</strong>';
-$a->strings['Can\'t login to your Diaspora account. Please check handle (in the format user@domain.tld) and password.'] = 'لا يمكن تسجيل الدخول إلى حساب الدياسبورا. يرجى التحقق من المعرف (على شاكلة user@domain.tld) وكلمة المرور.';
-$a->strings['Diaspora Export'] = 'تصدير الدياسبورا';
-$a->strings['Information'] = 'معلومات';
-$a->strings['Error'] = 'خطأ';
-$a->strings['Save Settings'] = 'احفظ الإعدادات';
-$a->strings['Enable Diaspora Post Addon'] = 'تفعيل إضافة مشاركة دياسبورا';
-$a->strings['Diaspora handle'] = 'معرف الدياسبورا';
-$a->strings['Diaspora password'] = 'كلمة مرور الدياسبورا';
-$a->strings['Privacy notice: Your Diaspora password will be stored unencrypted to authenticate you with your Diaspora pod. This means your Friendica node administrator can have access to it.'] = 'تنبيه خصوصية: سيتم تخزين كلمة مرور دياسبورا دون تشفير للاستيثاق منك في خادم دياسبورا. هذا يعني أنه يمكن لمسؤول عقدة فرنديكا الوصول إليها.';
-$a->strings['Post to Diaspora by default'] = 'شارك في دياسبورا افتراضيا';
diff --git a/diaspora/lang/ca/strings.php b/diaspora/lang/ca/strings.php
index 808fbaf8..ce48df19 100644
--- a/diaspora/lang/ca/strings.php
+++ b/diaspora/lang/ca/strings.php
@@ -3,15 +3,16 @@
 if(! function_exists("string_plural_select_ca")) {
 function string_plural_select_ca($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Post to Diaspora'] = 'Publicar a diàspora';
-$a->strings['Can\'t login to your Diaspora account. Please check username and password and ensure you used the complete address (including http...)'] = 'No es pot iniciar la sessió al vostre compte de Diaspora. Comproveu nom d\'usuari i contrasenya i assegureu-vos que heu utilitzat l\'adreça completa (inclosa http ...)';
-$a->strings['Diaspora Export'] = 'Exportació de diàspora';
-$a->strings['Enable Diaspora Post Addon'] = 'Habilita Addon Post de Diaspora';
-$a->strings['Diaspora username'] = 'Nom d\'usuari de diàspora';
-$a->strings['Diaspora password'] = 'Contrasenya de diàspora';
-$a->strings['Diaspora site URL'] = 'URL del lloc de diàspora';
-$a->strings['Post to Diaspora by default'] = 'Publica a Diaspora de manera predeterminada';
-$a->strings['Save Settings'] = 'Desa la configuració';
-$a->strings['Diaspora post failed. Queued for retry.'] = 'La publicació de la diàspora ha fallat Feu cua per tornar a provar.';
+;
+$a->strings["Post to Diaspora"] = "Publicar a diàspora";
+$a->strings["Can't login to your Diaspora account. Please check username and password and ensure you used the complete address (including http...)"] = "No es pot iniciar la sessió al vostre compte de Diaspora. Comproveu nom d'usuari i contrasenya i assegureu-vos que heu utilitzat l'adreça completa (inclosa http ...)";
+$a->strings["Diaspora Export"] = "Exportació de diàspora";
+$a->strings["Enable Diaspora Post Addon"] = "Habilita Addon Post de Diaspora";
+$a->strings["Diaspora username"] = "Nom d'usuari de diàspora";
+$a->strings["Diaspora password"] = "Contrasenya de diàspora";
+$a->strings["Diaspora site URL"] = "URL del lloc de diàspora";
+$a->strings["Post to Diaspora by default"] = "Publica a Diaspora de manera predeterminada";
+$a->strings["Save Settings"] = "Desa la configuració";
+$a->strings["Diaspora post failed. Queued for retry."] = "La publicació de la diàspora ha fallat Feu cua per tornar a provar.";
diff --git a/diaspora/lang/cs/strings.php b/diaspora/lang/cs/strings.php
index db5d6428..649b02c7 100644
--- a/diaspora/lang/cs/strings.php
+++ b/diaspora/lang/cs/strings.php
@@ -3,15 +3,16 @@
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
 	$n = intval($n);
-	if (($n == 1 && $n % 1 == 0)) { return 0; } else if (($n >= 2 && $n <= 4 && $n % 1 == 0)) { return 1; } else if (($n % 1 != 0 )) { return 2; } else  { return 3; }
+	return ($n == 1 && $n % 1 == 0) ? 0 : ($n >= 2 && $n <= 4 && $n % 1 == 0) ? 1: ($n % 1 != 0 ) ? 2 : 3;;
 }}
-$a->strings['Post to Diaspora'] = 'Odeslat na Diasporu';
-$a->strings['Can\'t login to your Diaspora account. Please check username and password and ensure you used the complete address (including http...)'] = 'Nelze se přihlásit na váš účet Diaspora. Prosím ověřte své uživatelské jméno a heslo a ujistěte se, že jste použili kompletní adresu (včetně http...)';
-$a->strings['Diaspora Export'] = 'Diaspora export';
-$a->strings['Enable Diaspora Post Addon'] = 'Povolit doplněk Diaspora Post';
-$a->strings['Diaspora username'] = 'Uživatelské jméno na Diaspora';
-$a->strings['Diaspora password'] = 'Heslo na Diaspora';
-$a->strings['Diaspora site URL'] = 'Adresa webu Diaspora';
-$a->strings['Post to Diaspora by default'] = 'Ve výchozím stavu zasílat příspěvky na Diaspora';
-$a->strings['Save Settings'] = 'Uložit nastavení';
-$a->strings['Diaspora post failed. Queued for retry.'] = 'Zaslání příspěvku na Diasporu selhalo. Příspěvek byl zařazen do fronty pro opakované odeslání.';
+;
+$a->strings["Post to Diaspora"] = "Odeslat na Diasporu";
+$a->strings["Can't login to your Diaspora account. Please check username and password and ensure you used the complete address (including http...)"] = "Nelze se přihlásit na váš účet Diaspora. Prosím ověřte své uživatelské jméno a heslo a ujistěte se, že jste použili kompletní adresu (včetně http...)";
+$a->strings["Diaspora Export"] = "Diaspora export";
+$a->strings["Enable Diaspora Post Addon"] = "Povolit doplněk Diaspora Post";
+$a->strings["Diaspora username"] = "Uživatelské jméno na Diaspora";
+$a->strings["Diaspora password"] = "Heslo na Diaspora";
+$a->strings["Diaspora site URL"] = "Adresa webu Diaspora";
+$a->strings["Post to Diaspora by default"] = "Ve výchozím stavu zasílat příspěvky na Diaspora";
+$a->strings["Save Settings"] = "Uložit nastavení";
+$a->strings["Diaspora post failed. Queued for retry."] = "Zaslání příspěvku na Diasporu selhalo. Příspěvek byl zařazen do fronty pro opakované odeslání.";
diff --git a/diaspora/lang/da-dk/messages.po b/diaspora/lang/da-dk/messages.po
deleted file mode 100644
index c544d33e..00000000
--- a/diaspora/lang/da-dk/messages.po
+++ /dev/null
@@ -1,102 +0,0 @@
-# ADDON diaspora
-# Copyright (C)
-# This file is distributed under the same license as the Friendica diaspora addon package.
-# 
-# 
-# Translators:
-# Anton <dev@atjn.dk>, 2022
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:17-0500\n"
-"PO-Revision-Date: 2014-06-22 11:39+0000\n"
-"Last-Translator: Anton <dev@atjn.dk>, 2022\n"
-"Language-Team: Danish (Denmark) (http://www.transifex.com/Friendica/friendica/language/da_DK/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: da_DK\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: diaspora.php:44
-msgid "Post to Diaspora"
-msgstr "Læg op på Diaspora"
-
-#: diaspora.php:67
-#, php-format
-msgid ""
-"Please remember: You can always be reached from Diaspora with your Friendica"
-" handle <strong>%s</strong>. "
-msgstr "Husk på: Du kan altid kontaktes fra Diaspora med dit Friendica handle <strong>%s</strong>. "
-
-#: diaspora.php:68
-msgid ""
-"This connector is only meant if you still want to use your old Diaspora "
-"account for some time. "
-msgstr ""
-
-#: diaspora.php:69
-#, php-format
-msgid ""
-"However, it is preferred that you tell your Diaspora contacts the new handle"
-" <strong>%s</strong> instead."
-msgstr ""
-
-#: diaspora.php:79
-msgid "All aspects"
-msgstr "Alle aspekter"
-
-#: diaspora.php:80
-msgid "Public"
-msgstr "Offentlig"
-
-#: diaspora.php:86
-msgid "Post to aspect:"
-msgstr ""
-
-#: diaspora.php:87
-#, php-format
-msgid "Connected with your Diaspora account <strong>%s</strong>"
-msgstr "Forbundet til din Diaspora-konto <strong>%s</strong>"
-
-#: diaspora.php:90
-msgid ""
-"Can't login to your Diaspora account. Please check handle (in the format "
-"user@domain.tld) and password."
-msgstr ""
-
-#: diaspora.php:97
-msgid "Information"
-msgstr "Information"
-
-#: diaspora.php:98
-msgid "Error"
-msgstr "Fejl"
-
-#: diaspora.php:104
-msgid "Enable Diaspora Post Addon"
-msgstr "Aktiver Diaspora-tilføjelsen"
-
-#: diaspora.php:105
-msgid "Diaspora handle"
-msgstr "Diaspora handle"
-
-#: diaspora.php:106
-msgid "Diaspora password"
-msgstr "Diaspora adgangskode"
-
-#: diaspora.php:106
-msgid ""
-"Privacy notice: Your Diaspora password will be stored unencrypted to "
-"authenticate you with your Diaspora pod. This means your Friendica node "
-"administrator can have access to it."
-msgstr ""
-
-#: diaspora.php:108
-msgid "Post to Diaspora by default"
-msgstr "Læg op på Diaspora som standard"
-
-#: diaspora.php:113
-msgid "Diaspora Export"
-msgstr ""
diff --git a/diaspora/lang/da-dk/strings.php b/diaspora/lang/da-dk/strings.php
deleted file mode 100644
index 73b1eedc..00000000
--- a/diaspora/lang/da-dk/strings.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_da_dk")) {
-function string_plural_select_da_dk($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Post to Diaspora'] = 'Læg op på Diaspora';
-$a->strings['Please remember: You can always be reached from Diaspora with your Friendica handle <strong>%s</strong>. '] = 'Husk på: Du kan altid kontaktes fra Diaspora med dit Friendica handle <strong>%s</strong>. ';
-$a->strings['All aspects'] = 'Alle aspekter';
-$a->strings['Public'] = 'Offentlig';
-$a->strings['Connected with your Diaspora account <strong>%s</strong>'] = 'Forbundet til din Diaspora-konto <strong>%s</strong>';
-$a->strings['Information'] = 'Information';
-$a->strings['Error'] = 'Fejl';
-$a->strings['Enable Diaspora Post Addon'] = 'Aktiver Diaspora-tilføjelsen';
-$a->strings['Diaspora handle'] = 'Diaspora handle';
-$a->strings['Diaspora password'] = 'Diaspora adgangskode';
-$a->strings['Post to Diaspora by default'] = 'Læg op på Diaspora som standard';
diff --git a/diaspora/lang/de/messages.po b/diaspora/lang/de/messages.po
index 34fd85b1..22187254 100644
--- a/diaspora/lang/de/messages.po
+++ b/diaspora/lang/de/messages.po
@@ -4,103 +4,59 @@
 # 
 # 
 # Translators:
-# foss <oss@disr.it>, 2020
-# Till Mohr <tmtrfx@till-mohr.de>, 2021
-# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2014
-# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2018,2020
-# Ulf Rompe <transifex.com@rompe.org>, 2019
+# bavatar <tobias.diekershoff@gmx.net>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:17-0500\n"
-"PO-Revision-Date: 2014-06-22 11:39+0000\n"
-"Last-Translator: Till Mohr <tmtrfx@till-mohr.de>, 2021\n"
-"Language-Team: German (http://app.transifex.com/Friendica/friendica/language/de/)\n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-08 19:10+0000\n"
+"Last-Translator: bavatar <tobias.diekershoff@gmx.net>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/friendica/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: diaspora.php:44
+#: diaspora.php:37
 msgid "Post to Diaspora"
 msgstr "Auf Diaspora veröffentlichen"
 
-#: diaspora.php:67
-#, php-format
+#: diaspora.php:142
 msgid ""
-"Please remember: You can always be reached from Diaspora with your Friendica"
-" handle <strong>%s</strong>. "
-msgstr "Denke daran: Du kannst jederzeit über deinen Friendica-Account <strong>%s</strong> von Diaspora aus erreicht werden."
+"Can't login to your Diaspora account. Please check username and password and"
+" ensure you used the complete address (including http...)"
+msgstr "Anmeldung bei deinem Diaspora Account fehlgeschlagen. Bitte überprüfe Nutzername und Passwort und stelle sicher, dass die komplette Adresse (inklusive des htto...) verwendet wurde."
 
-#: diaspora.php:68
-msgid ""
-"This connector is only meant if you still want to use your old Diaspora "
-"account for some time. "
-msgstr "Dieser Connector ist ausschließlich dafür gedacht, deinen alten Diaspora-Account noch ein wenig weiter zu betreiben."
+#: diaspora.php:149 diaspora.php:153
+msgid "Diaspora Export"
+msgstr "Diaspora Export"
 
-#: diaspora.php:69
-#, php-format
-msgid ""
-"However, it is preferred that you tell your Diaspora contacts the new handle"
-" <strong>%s</strong> instead."
-msgstr "Du solltest allerdings deinen Diaspora Kontakten deinen Friendica Account <strong>%s</strong> mitteilen, damit sie diesem folgen."
-
-#: diaspora.php:79
-msgid "All aspects"
-msgstr "Alle Aspekte"
-
-#: diaspora.php:80
-msgid "Public"
-msgstr "Öffentlich"
-
-#: diaspora.php:86
-msgid "Post to aspect:"
-msgstr "Bei aspect veröffentlichen:"
-
-#: diaspora.php:87
-#, php-format
-msgid "Connected with your Diaspora account <strong>%s</strong>"
-msgstr "Verbunden mit deinem Diaspora-Konto <strong>%s</strong>"
-
-#: diaspora.php:90
-msgid ""
-"Can't login to your Diaspora account. Please check handle (in the format "
-"user@domain.tld) and password."
-msgstr "Anmeldung bei deinem Diaspora-Konto fehlgeschlagen. Bitte überprüfe Handle (im Format user@domain.tld) und Passwort."
-
-#: diaspora.php:97
-msgid "Information"
-msgstr "Information"
-
-#: diaspora.php:98
-msgid "Error"
-msgstr "Fehler"
-
-#: diaspora.php:104
+#: diaspora.php:163
 msgid "Enable Diaspora Post Addon"
-msgstr "Diaspora-Post-Addon aktivieren"
+msgstr "Veröffentlichungen bei Diaspora erlauben"
 
-#: diaspora.php:105
-msgid "Diaspora handle"
-msgstr "Diaspora-Handle"
+#: diaspora.php:168
+msgid "Diaspora username"
+msgstr "Diaspora Nutzername"
 
-#: diaspora.php:106
+#: diaspora.php:173
 msgid "Diaspora password"
-msgstr "Diaspora-Passwort"
+msgstr "Diaspora Passwort"
 
-#: diaspora.php:106
-msgid ""
-"Privacy notice: Your Diaspora password will be stored unencrypted to "
-"authenticate you with your Diaspora pod. This means your Friendica node "
-"administrator can have access to it."
-msgstr "Datenschutzhinweis: Dein Diaspora-Passwort wird unverschlüsselt gespeichert, um dich an deinem Diaspora-Pod zu authentifizieren. Dadurch kann der Administrator deines Friendica-Knotens Zugriff darauf erlangen."
+#: diaspora.php:178
+msgid "Diaspora site URL"
+msgstr "URL der Diaspora Seite"
 
-#: diaspora.php:108
+#: diaspora.php:183
 msgid "Post to Diaspora by default"
 msgstr "Veröffentliche öffentliche Beiträge standardmäßig bei Diaspora"
 
-#: diaspora.php:113
-msgid "Diaspora Export"
-msgstr "Diaspora-Export"
+#: diaspora.php:189
+msgid "Save Settings"
+msgstr "Einstellungen speichern"
+
+#: diaspora.php:324
+msgid "Diaspora post failed. Queued for retry."
+msgstr "Veröffentlichung bei Diaspora gescheitert. Wir versuchen es später erneut."
diff --git a/diaspora/lang/de/strings.php b/diaspora/lang/de/strings.php
index 8168199a..22990765 100644
--- a/diaspora/lang/de/strings.php
+++ b/diaspora/lang/de/strings.php
@@ -2,23 +2,16 @@
 
 if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Post to Diaspora'] = 'Auf Diaspora veröffentlichen';
-$a->strings['Please remember: You can always be reached from Diaspora with your Friendica handle <strong>%s</strong>. '] = 'Denke daran: Du kannst jederzeit über deinen Friendica-Account <strong>%s</strong> von Diaspora aus erreicht werden.';
-$a->strings['This connector is only meant if you still want to use your old Diaspora account for some time. '] = 'Dieser Connector ist ausschließlich dafür gedacht, deinen alten Diaspora-Account noch ein wenig weiter zu betreiben.';
-$a->strings['However, it is preferred that you tell your Diaspora contacts the new handle <strong>%s</strong> instead.'] = 'Du solltest allerdings deinen Diaspora Kontakten deinen Friendica Account <strong>%s</strong> mitteilen, damit sie diesem folgen.';
-$a->strings['All aspects'] = 'Alle Aspekte';
-$a->strings['Public'] = 'Öffentlich';
-$a->strings['Post to aspect:'] = 'Bei aspect veröffentlichen:';
-$a->strings['Connected with your Diaspora account <strong>%s</strong>'] = 'Verbunden mit deinem Diaspora-Konto <strong>%s</strong>';
-$a->strings['Can\'t login to your Diaspora account. Please check handle (in the format user@domain.tld) and password.'] = 'Anmeldung bei deinem Diaspora-Konto fehlgeschlagen. Bitte überprüfe Handle (im Format user@domain.tld) und Passwort.';
-$a->strings['Information'] = 'Information';
-$a->strings['Error'] = 'Fehler';
-$a->strings['Enable Diaspora Post Addon'] = 'Diaspora-Post-Addon aktivieren';
-$a->strings['Diaspora handle'] = 'Diaspora-Handle';
-$a->strings['Diaspora password'] = 'Diaspora-Passwort';
-$a->strings['Privacy notice: Your Diaspora password will be stored unencrypted to authenticate you with your Diaspora pod. This means your Friendica node administrator can have access to it.'] = 'Datenschutzhinweis: Dein Diaspora-Passwort wird unverschlüsselt gespeichert, um dich an deinem Diaspora-Pod zu authentifizieren. Dadurch kann der Administrator deines Friendica-Knotens Zugriff darauf erlangen.';
-$a->strings['Post to Diaspora by default'] = 'Veröffentliche öffentliche Beiträge standardmäßig bei Diaspora';
-$a->strings['Diaspora Export'] = 'Diaspora-Export';
+;
+$a->strings["Post to Diaspora"] = "Auf Diaspora veröffentlichen";
+$a->strings["Can't login to your Diaspora account. Please check username and password and ensure you used the complete address (including http...)"] = "Anmeldung bei deinem Diaspora Account fehlgeschlagen. Bitte überprüfe Nutzername und Passwort und stelle sicher, dass die komplette Adresse (inklusive des htto...) verwendet wurde.";
+$a->strings["Diaspora Export"] = "Diaspora Export";
+$a->strings["Enable Diaspora Post Addon"] = "Veröffentlichungen bei Diaspora erlauben";
+$a->strings["Diaspora username"] = "Diaspora Nutzername";
+$a->strings["Diaspora password"] = "Diaspora Passwort";
+$a->strings["Diaspora site URL"] = "URL der Diaspora Seite";
+$a->strings["Post to Diaspora by default"] = "Veröffentliche öffentliche Beiträge standardmäßig bei Diaspora";
+$a->strings["Save Settings"] = "Einstellungen speichern";
+$a->strings["Diaspora post failed. Queued for retry."] = "Veröffentlichung bei Diaspora gescheitert. Wir versuchen es später erneut.";
diff --git a/diaspora/lang/en-gb/messages.po b/diaspora/lang/en-gb/messages.po
index 798e3b2d..ce3dd2f9 100644
--- a/diaspora/lang/en-gb/messages.po
+++ b/diaspora/lang/en-gb/messages.po
@@ -4,13 +4,13 @@
 # 
 # 
 # Translators:
-# Andy H3 <andy@hubup.pro>, 2018,2020
+# Andy H3 <andy@hubup.pro>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-05-07 00:15-0400\n"
-"PO-Revision-Date: 2020-06-23 16:10+0000\n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2018-03-22 08:36+0000\n"
 "Last-Translator: Andy H3 <andy@hubup.pro>\n"
 "Language-Team: English (United Kingdom) (http://www.transifex.com/Friendica/friendica/language/en_GB/)\n"
 "MIME-Version: 1.0\n"
@@ -19,96 +19,44 @@ msgstr ""
 "Language: en_GB\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: diaspora.php:53
+#: diaspora.php:37
 msgid "Post to Diaspora"
 msgstr "Post to Diaspora"
 
-#: diaspora.php:78
-#, php-format
+#: diaspora.php:142
 msgid ""
-"Please remember: You can always be reached from Diaspora with your Friendica"
-" handle <strong>%s</strong>. "
-msgstr "Please remember: You can always be reached from Diaspora with your Friendica handle <strong>%s</strong>. "
+"Can't login to your Diaspora account. Please check username and password and"
+" ensure you used the complete address (including http...)"
+msgstr "Can't login to your Diaspora account. Please check username and password and ensure you used the complete address (including http...)"
 
-#: diaspora.php:79
-msgid ""
-"This connector is only meant if you still want to use your old Diaspora "
-"account for some time. "
-msgstr "This connector is only meant if you still want to use your old Diaspora account for some time. "
-
-#: diaspora.php:80
-#, php-format
-msgid ""
-"However, it is preferred that you tell your Diaspora contacts the new handle"
-" <strong>%s</strong> instead."
-msgstr "It's preferrable that you tell your Diaspora contacts the new handle <strong>%s</strong> instead."
-
-#: diaspora.php:90
-msgid "All aspects"
-msgstr "All aspects"
-
-#: diaspora.php:91
-msgid "Public"
-msgstr "Public"
-
-#: diaspora.php:97
-msgid "Post to aspect:"
-msgstr "Post to aspect:"
-
-#: diaspora.php:98
-#, php-format
-msgid "Connected with your Diaspora account <strong>%s</strong>"
-msgstr "Connected with your Diaspora account <strong>%s</strong>"
-
-#: diaspora.php:101
-msgid ""
-"Can't login to your Diaspora account. Please check handle (in the format "
-"user@domain.tld) and password."
-msgstr "Can't login to your Diaspora account. Please check handle (in the format user@domain.tld) and password."
-
-#: diaspora.php:109
+#: diaspora.php:149 diaspora.php:153
 msgid "Diaspora Export"
 msgstr "Diaspora Export"
 
-#: diaspora.php:110
-msgid "Information"
-msgstr "Information"
-
-#: diaspora.php:111
-msgid "Error"
-msgstr "Error"
-
-#: diaspora.php:112
-msgid "Save Settings"
-msgstr "Save settings"
-
-#: diaspora.php:116
+#: diaspora.php:163
 msgid "Enable Diaspora Post Addon"
 msgstr "Enable Diaspora export"
 
-#: diaspora.php:117
-msgid "Diaspora handle"
-msgstr "Diaspora handle"
+#: diaspora.php:168
+msgid "Diaspora username"
+msgstr "Diaspora username"
 
-#: diaspora.php:118
+#: diaspora.php:173
 msgid "Diaspora password"
 msgstr "Diaspora password"
 
-#: diaspora.php:118
-msgid ""
-"Privacy notice: Your Diaspora password will be stored unencrypted to "
-"authenticate you with your Diaspora pod. This means your Friendica node "
-"administrator can have access to it."
-msgstr "Privacy notice: Your Diaspora password will be stored unencrypted to authenticate you with your Diaspora pod. This means your Friendica node administrator can have access to it."
+#: diaspora.php:178
+msgid "Diaspora site URL"
+msgstr "Diaspora site URL"
 
-#: diaspora.php:120
+#: diaspora.php:183
 msgid "Post to Diaspora by default"
 msgstr "Post to Diaspora by default"
 
-#: diaspora.php:138
-msgid "Diaspora settings updated."
-msgstr "Diaspora settings updated."
+#: diaspora.php:189
+msgid "Save Settings"
+msgstr "Save settings"
 
-#: diaspora.php:141
-msgid "Diaspora connector disabled."
-msgstr "Diaspora connector disabled."
+#: diaspora.php:324
+msgid "Diaspora post failed. Queued for retry."
+msgstr "Diaspora post failed. Queued for retry."
diff --git a/diaspora/lang/en-gb/strings.php b/diaspora/lang/en-gb/strings.php
index 15402393..5e375913 100644
--- a/diaspora/lang/en-gb/strings.php
+++ b/diaspora/lang/en-gb/strings.php
@@ -2,26 +2,16 @@
 
 if(! function_exists("string_plural_select_en_gb")) {
 function string_plural_select_en_gb($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Post to Diaspora'] = 'Post to Diaspora';
-$a->strings['Please remember: You can always be reached from Diaspora with your Friendica handle <strong>%s</strong>. '] = 'Please remember: You can always be reached from Diaspora with your Friendica handle <strong>%s</strong>. ';
-$a->strings['This connector is only meant if you still want to use your old Diaspora account for some time. '] = 'This connector is only meant if you still want to use your old Diaspora account for some time. ';
-$a->strings['However, it is preferred that you tell your Diaspora contacts the new handle <strong>%s</strong> instead.'] = 'It\'s preferrable that you tell your Diaspora contacts the new handle <strong>%s</strong> instead.';
-$a->strings['All aspects'] = 'All aspects';
-$a->strings['Public'] = 'Public';
-$a->strings['Post to aspect:'] = 'Post to aspect:';
-$a->strings['Connected with your Diaspora account <strong>%s</strong>'] = 'Connected with your Diaspora account <strong>%s</strong>';
-$a->strings['Can\'t login to your Diaspora account. Please check handle (in the format user@domain.tld) and password.'] = 'Can\'t login to your Diaspora account. Please check handle (in the format user@domain.tld) and password.';
-$a->strings['Diaspora Export'] = 'Diaspora Export';
-$a->strings['Information'] = 'Information';
-$a->strings['Error'] = 'Error';
-$a->strings['Save Settings'] = 'Save settings';
-$a->strings['Enable Diaspora Post Addon'] = 'Enable Diaspora export';
-$a->strings['Diaspora handle'] = 'Diaspora handle';
-$a->strings['Diaspora password'] = 'Diaspora password';
-$a->strings['Privacy notice: Your Diaspora password will be stored unencrypted to authenticate you with your Diaspora pod. This means your Friendica node administrator can have access to it.'] = 'Privacy notice: Your Diaspora password will be stored unencrypted to authenticate you with your Diaspora pod. This means your Friendica node administrator can have access to it.';
-$a->strings['Post to Diaspora by default'] = 'Post to Diaspora by default';
-$a->strings['Diaspora settings updated.'] = 'Diaspora settings updated.';
-$a->strings['Diaspora connector disabled.'] = 'Diaspora connector disabled.';
+;
+$a->strings["Post to Diaspora"] = "Post to Diaspora";
+$a->strings["Can't login to your Diaspora account. Please check username and password and ensure you used the complete address (including http...)"] = "Can't login to your Diaspora account. Please check username and password and ensure you used the complete address (including http...)";
+$a->strings["Diaspora Export"] = "Diaspora Export";
+$a->strings["Enable Diaspora Post Addon"] = "Enable Diaspora export";
+$a->strings["Diaspora username"] = "Diaspora username";
+$a->strings["Diaspora password"] = "Diaspora password";
+$a->strings["Diaspora site URL"] = "Diaspora site URL";
+$a->strings["Post to Diaspora by default"] = "Post to Diaspora by default";
+$a->strings["Save Settings"] = "Save settings";
+$a->strings["Diaspora post failed. Queued for retry."] = "Diaspora post failed. Queued for retry.";
diff --git a/diaspora/lang/en-us/messages.po b/diaspora/lang/en-us/messages.po
deleted file mode 100644
index ac7cef47..00000000
--- a/diaspora/lang/en-us/messages.po
+++ /dev/null
@@ -1,114 +0,0 @@
-# ADDON diaspora
-# Copyright (C)
-# This file is distributed under the same license as the Friendica diaspora addon package.
-# 
-# 
-# Translators:
-# Andy H3 <andy@hubup.pro>, 2018
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-05-07 00:15-0400\n"
-"PO-Revision-Date: 2020-05-07 06:50+0000\n"
-"Last-Translator: Transifex Bot <>\n"
-"Language-Team: English (United States) (http://www.transifex.com/Friendica/friendica/language/en_US/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: en_US\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: diaspora.php:53
-msgid "Post to Diaspora"
-msgstr "Post to Diaspora"
-
-#: diaspora.php:78
-#, php-format
-msgid ""
-"Please remember: You can always be reached from Diaspora with your Friendica"
-" handle <strong>%s</strong>. "
-msgstr ""
-
-#: diaspora.php:79
-msgid ""
-"This connector is only meant if you still want to use your old Diaspora "
-"account for some time. "
-msgstr ""
-
-#: diaspora.php:80
-#, php-format
-msgid ""
-"However, it is preferred that you tell your Diaspora contacts the new handle"
-" <strong>%s</strong> instead."
-msgstr ""
-
-#: diaspora.php:90
-msgid "All aspects"
-msgstr ""
-
-#: diaspora.php:91
-msgid "Public"
-msgstr ""
-
-#: diaspora.php:97
-msgid "Post to aspect:"
-msgstr ""
-
-#: diaspora.php:98
-#, php-format
-msgid "Connected with your Diaspora account <strong>%s</strong>"
-msgstr ""
-
-#: diaspora.php:101
-msgid ""
-"Can't login to your Diaspora account. Please check handle (in the format "
-"user@domain.tld) and password."
-msgstr ""
-
-#: diaspora.php:109
-msgid "Diaspora Export"
-msgstr "Diaspora Export"
-
-#: diaspora.php:110
-msgid "Information"
-msgstr ""
-
-#: diaspora.php:111
-msgid "Error"
-msgstr ""
-
-#: diaspora.php:112
-msgid "Save Settings"
-msgstr "Save settings"
-
-#: diaspora.php:116
-msgid "Enable Diaspora Post Addon"
-msgstr "Enable Diaspora export"
-
-#: diaspora.php:117
-msgid "Diaspora handle"
-msgstr ""
-
-#: diaspora.php:118
-msgid "Diaspora password"
-msgstr "Diaspora password"
-
-#: diaspora.php:118
-msgid ""
-"Privacy notice: Your Diaspora password will be stored unencrypted to "
-"authenticate you with your Diaspora pod. This means your Friendica node "
-"administrator can have access to it."
-msgstr ""
-
-#: diaspora.php:120
-msgid "Post to Diaspora by default"
-msgstr "Post to Diaspora by default"
-
-#: diaspora.php:138
-msgid "Diaspora settings updated."
-msgstr ""
-
-#: diaspora.php:141
-msgid "Diaspora connector disabled."
-msgstr ""
diff --git a/diaspora/lang/en-us/strings.php b/diaspora/lang/en-us/strings.php
deleted file mode 100644
index 11d4ab78..00000000
--- a/diaspora/lang/en-us/strings.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_en_us")) {
-function string_plural_select_en_us($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Post to Diaspora'] = 'Post to Diaspora';
-$a->strings['Diaspora Export'] = 'Diaspora Export';
-$a->strings['Save Settings'] = 'Save settings';
-$a->strings['Enable Diaspora Post Addon'] = 'Enable Diaspora export';
-$a->strings['Diaspora password'] = 'Diaspora password';
-$a->strings['Post to Diaspora by default'] = 'Post to Diaspora by default';
diff --git a/diaspora/lang/es/messages.po b/diaspora/lang/es/messages.po
index e40ac314..a7beaa04 100644
--- a/diaspora/lang/es/messages.po
+++ b/diaspora/lang/es/messages.po
@@ -4,16 +4,14 @@
 # 
 # 
 # Translators:
-# Boris Daniel Martinez Millàn <borisdanielmartinezmillan@gmail.com>, 2021
-# Senex Petrovic <javierruizo@hotmail.com>, 2021
 # Tupambae.org, 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2021-04-01 09:53+0000\n"
-"Last-Translator: Senex Petrovic <javierruizo@hotmail.com>\n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2016-04-18 19:36+0000\n"
+"Last-Translator: Tupambae.org\n"
 "Language-Team: Spanish (http://www.transifex.com/Friendica/friendica/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,88 +19,44 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: diaspora.php:43
+#: diaspora.php:37
 msgid "Post to Diaspora"
 msgstr "Publicar hacia Diaspora*"
 
-#: diaspora.php:68
-#, php-format
+#: diaspora.php:142
 msgid ""
-"Please remember: You can always be reached from Diaspora with your Friendica"
-" handle <strong>%s</strong>. "
-msgstr "Recuerde: siempre puede ser contactado desde Diaspora con su identificador de Friendica <strong>%s</strong>. "
+"Can't login to your Diaspora account. Please check username and password and"
+" ensure you used the complete address (including http...)"
+msgstr "No se puede ingresar a tu cuenta de Diaspora*. Por favor verificar nombre de usuario, contraseña y asegura de usar la dirección completa, incluyendo https.. ."
 
-#: diaspora.php:69
-msgid ""
-"This connector is only meant if you still want to use your old Diaspora "
-"account for some time. "
-msgstr "Este conector solo está diseñado si aún desea usar su antigua cuenta de Diaspora durante algún tiempo."
-
-#: diaspora.php:70
-#, php-format
-msgid ""
-"However, it is preferred that you tell your Diaspora contacts the new handle"
-" <strong>%s</strong> instead."
-msgstr "Sin embargo, es preferible que le diga a sus contactos de Diaspora el nuevo identificador <strong>%s</strong> en su lugar."
-
-#: diaspora.php:80
-msgid "All aspects"
-msgstr "Todos los aspectos"
-
-#: diaspora.php:81
-msgid "Public"
-msgstr "Publico"
-
-#: diaspora.php:87
-msgid "Post to aspect:"
-msgstr "Publicar para aspecto"
-
-#: diaspora.php:88
-#, php-format
-msgid "Connected with your Diaspora account <strong>%s</strong>"
-msgstr "Conectado con tu cuenta de Diaspora <strong>%s</strong>"
-
-#: diaspora.php:91
-msgid ""
-"Can't login to your Diaspora account. Please check handle (in the format "
-"user@domain.tld) and password."
-msgstr "No puedo iniciar sesión en su cuenta de Diaspora. Compruebe el identificador (en formato user@domain.tld) y la contraseña."
-
-#: diaspora.php:99
+#: diaspora.php:149 diaspora.php:153
 msgid "Diaspora Export"
 msgstr "Exportar a Diaspora*"
 
-#: diaspora.php:100
-msgid "Information"
-msgstr "Información"
-
-#: diaspora.php:101
-msgid "Error"
-msgstr "Error"
-
-#: diaspora.php:102
-msgid "Save Settings"
-msgstr "Guardar configuración"
-
-#: diaspora.php:106
+#: diaspora.php:163
 msgid "Enable Diaspora Post Addon"
-msgstr "Habilitar publicar a traves de Diaspora* plugin."
+msgstr "Habilitar publicar a traves de Diaspora* addon."
 
-#: diaspora.php:107
-msgid "Diaspora handle"
-msgstr "Diaspora handle"
+#: diaspora.php:168
+msgid "Diaspora username"
+msgstr "Nombre de usuario de Diaspora*."
 
-#: diaspora.php:108
+#: diaspora.php:173
 msgid "Diaspora password"
 msgstr "Contraseña Diaspora*"
 
-#: diaspora.php:108
-msgid ""
-"Privacy notice: Your Diaspora password will be stored unencrypted to "
-"authenticate you with your Diaspora pod. This means your Friendica node "
-"administrator can have access to it."
-msgstr "Aviso de privacidad: su contraseña de Diaspora se almacenará sin cifrar para autenticarlo con su pod de Diaspora. Esto significa que su administrador de nodo de Friendica puede tener acceso a él."
+#: diaspora.php:178
+msgid "Diaspora site URL"
+msgstr "URL sitio Diaspora*"
 
-#: diaspora.php:110
+#: diaspora.php:183
 msgid "Post to Diaspora by default"
 msgstr "Publicar hacia Diaspora* como estándar."
+
+#: diaspora.php:189
+msgid "Save Settings"
+msgstr "Guardar configuración"
+
+#: diaspora.php:324
+msgid "Diaspora post failed. Queued for retry."
+msgstr "La publicación hacia Diaspora* fallo, puesto en espera para nuevo intento."
diff --git a/diaspora/lang/es/strings.php b/diaspora/lang/es/strings.php
index d7fa1bd8..e25594c3 100644
--- a/diaspora/lang/es/strings.php
+++ b/diaspora/lang/es/strings.php
@@ -2,24 +2,16 @@
 
 if(! function_exists("string_plural_select_es")) {
 function string_plural_select_es($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Post to Diaspora'] = 'Publicar hacia Diaspora*';
-$a->strings['Please remember: You can always be reached from Diaspora with your Friendica handle <strong>%s</strong>. '] = 'Recuerde: siempre puede ser contactado desde Diaspora con su identificador de Friendica <strong>%s</strong>. ';
-$a->strings['This connector is only meant if you still want to use your old Diaspora account for some time. '] = 'Este conector solo está diseñado si aún desea usar su antigua cuenta de Diaspora durante algún tiempo.';
-$a->strings['However, it is preferred that you tell your Diaspora contacts the new handle <strong>%s</strong> instead.'] = 'Sin embargo, es preferible que le diga a sus contactos de Diaspora el nuevo identificador <strong>%s</strong> en su lugar.';
-$a->strings['All aspects'] = 'Todos los aspectos';
-$a->strings['Public'] = 'Publico';
-$a->strings['Post to aspect:'] = 'Publicar para aspecto';
-$a->strings['Connected with your Diaspora account <strong>%s</strong>'] = 'Conectado con tu cuenta de Diaspora <strong>%s</strong>';
-$a->strings['Can\'t login to your Diaspora account. Please check handle (in the format user@domain.tld) and password.'] = 'No puedo iniciar sesión en su cuenta de Diaspora. Compruebe el identificador (en formato user@domain.tld) y la contraseña.';
-$a->strings['Diaspora Export'] = 'Exportar a Diaspora*';
-$a->strings['Information'] = 'Información';
-$a->strings['Error'] = 'Error';
-$a->strings['Save Settings'] = 'Guardar configuración';
-$a->strings['Enable Diaspora Post Addon'] = 'Habilitar publicar a traves de Diaspora* plugin.';
-$a->strings['Diaspora handle'] = 'Diaspora handle';
-$a->strings['Diaspora password'] = 'Contraseña Diaspora*';
-$a->strings['Privacy notice: Your Diaspora password will be stored unencrypted to authenticate you with your Diaspora pod. This means your Friendica node administrator can have access to it.'] = 'Aviso de privacidad: su contraseña de Diaspora se almacenará sin cifrar para autenticarlo con su pod de Diaspora. Esto significa que su administrador de nodo de Friendica puede tener acceso a él.';
-$a->strings['Post to Diaspora by default'] = 'Publicar hacia Diaspora* como estándar.';
+;
+$a->strings["Post to Diaspora"] = "Publicar hacia Diaspora*";
+$a->strings["Can't login to your Diaspora account. Please check username and password and ensure you used the complete address (including http...)"] = "No se puede ingresar a tu cuenta de Diaspora*. Por favor verificar nombre de usuario, contraseña y asegura de usar la dirección completa, incluyendo https.. .";
+$a->strings["Diaspora Export"] = "Exportar a Diaspora*";
+$a->strings["Enable Diaspora Post Addon"] = "Habilitar publicar a traves de Diaspora* addon.";
+$a->strings["Diaspora username"] = "Nombre de usuario de Diaspora*.";
+$a->strings["Diaspora password"] = "Contraseña Diaspora*";
+$a->strings["Diaspora site URL"] = "URL sitio Diaspora*";
+$a->strings["Post to Diaspora by default"] = "Publicar hacia Diaspora* como estándar.";
+$a->strings["Save Settings"] = "Guardar configuración";
+$a->strings["Diaspora post failed. Queued for retry."] = "La publicación hacia Diaspora* fallo, puesto en espera para nuevo intento.";
diff --git a/diaspora/lang/fi-fi/strings.php b/diaspora/lang/fi-fi/strings.php
index 74d969ad..8d14a70b 100644
--- a/diaspora/lang/fi-fi/strings.php
+++ b/diaspora/lang/fi-fi/strings.php
@@ -3,15 +3,16 @@
 if(! function_exists("string_plural_select_fi_fi")) {
 function string_plural_select_fi_fi($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Post to Diaspora'] = 'Lähetä Diasporaan';
-$a->strings['Can\'t login to your Diaspora account. Please check username and password and ensure you used the complete address (including http...)'] = 'Kirjautuminen Diasporaan epäonnistui. Tarkista että käyttäjätunnus ja salasana ovat oikein ja varmista että kirjoitit täydellisen osoitteen (mukaan lukien http...).';
-$a->strings['Diaspora Export'] = 'Diaspora Export';
-$a->strings['Enable Diaspora Post Addon'] = 'Ota Diaspora-viestilisäosa käyttöön';
-$a->strings['Diaspora username'] = 'Diaspora -käyttäjätunnus';
-$a->strings['Diaspora password'] = 'Diaspora -salasana';
-$a->strings['Diaspora site URL'] = 'Diaspora -sivuston URL-osoite';
-$a->strings['Post to Diaspora by default'] = 'Lähetä Diasporaan oletuksena';
-$a->strings['Save Settings'] = 'Tallenna asetukset';
-$a->strings['Diaspora post failed. Queued for retry.'] = 'Diaspora -julkaisu epäonnistui. Jonossa uudelleenyritykseen.';
+;
+$a->strings["Post to Diaspora"] = "Lähetä Diasporaan";
+$a->strings["Can't login to your Diaspora account. Please check username and password and ensure you used the complete address (including http...)"] = "Kirjautuminen Diasporaan epäonnistui. Tarkista että käyttäjätunnus ja salasana ovat oikein ja varmista että kirjoitit täydellisen osoitteen (mukaan lukien http...).";
+$a->strings["Diaspora Export"] = "Diaspora Export";
+$a->strings["Enable Diaspora Post Addon"] = "Ota Diaspora-viestilisäosa käyttöön";
+$a->strings["Diaspora username"] = "Diaspora -käyttäjätunnus";
+$a->strings["Diaspora password"] = "Diaspora -salasana";
+$a->strings["Diaspora site URL"] = "Diaspora -sivuston URL-osoite";
+$a->strings["Post to Diaspora by default"] = "Lähetä Diasporaan oletuksena";
+$a->strings["Save Settings"] = "Tallenna asetukset";
+$a->strings["Diaspora post failed. Queued for retry."] = "Diaspora -julkaisu epäonnistui. Jonossa uudelleenyritykseen.";
diff --git a/diaspora/lang/fr/messages.po b/diaspora/lang/fr/messages.po
index abb4287c..d8f79f97 100644
--- a/diaspora/lang/fr/messages.po
+++ b/diaspora/lang/fr/messages.po
@@ -4,102 +4,60 @@
 # 
 # 
 # Translators:
-# bob lebonche <lebonche@tutanota.com>, 2021
 # Damien Goutte-Gattat <damien+transifex@incenp.org>, 2015
-# ea1cd8241cb389ffb6f92bc6891eff5d_dc12308 <70dced5587d47e18d88f9298024d96f8_93383>, 2015
-# Vincent Vindarel <vindarel@mailz.org>, 2018
+# Nicola Spanti <translations@nicola-spanti.info>, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:17-0500\n"
-"PO-Revision-Date: 2014-06-22 11:39+0000\n"
-"Last-Translator: bob lebonche <lebonche@tutanota.com>, 2021\n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2015-08-30 17:12+0000\n"
+"Last-Translator: Nicola Spanti <translations@nicola-spanti.info>\n"
 "Language-Team: French (http://www.transifex.com/Friendica/friendica/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fr\n"
-"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: diaspora.php:44
+#: diaspora.php:37
 msgid "Post to Diaspora"
 msgstr "Publier sur Diaspora"
 
-#: diaspora.php:67
-#, php-format
+#: diaspora.php:142
 msgid ""
-"Please remember: You can always be reached from Diaspora with your Friendica"
-" handle <strong>%s</strong>. "
-msgstr "Attention : vous pouvez toujours être joint par Diaspora avec votre identifiant Friendica <strong>%s</strong>. "
+"Can't login to your Diaspora account. Please check username and password and"
+" ensure you used the complete address (including http...)"
+msgstr "Impossible de se connecter à votre compte Diaspora. Veuillez vérifier votre identifiant et votre mot de passe, et assurez-vous d’avoir indiqué l’adresse complète (y compris le « http:// » initial)."
 
-#: diaspora.php:68
-msgid ""
-"This connector is only meant if you still want to use your old Diaspora "
-"account for some time. "
-msgstr "Ce connecteur ne doit être utilisé que si vous souhaitez encore utiliser votre ancien compte Diaspora."
+#: diaspora.php:149 diaspora.php:153
+msgid "Diaspora Export"
+msgstr "Export Diaspora"
 
-#: diaspora.php:69
-#, php-format
-msgid ""
-"However, it is preferred that you tell your Diaspora contacts the new handle"
-" <strong>%s</strong> instead."
-msgstr "Quoi qu'il en soit, il est préférable de communiquer son nouvel identifiant à ses contacts Diaspora <strong>%s</strong>."
-
-#: diaspora.php:79
-msgid "All aspects"
-msgstr "Tous les aspects"
-
-#: diaspora.php:80
-msgid "Public"
-msgstr "Public"
-
-#: diaspora.php:86
-msgid "Post to aspect:"
-msgstr "Publier avec l'aspect:"
-
-#: diaspora.php:87
-#, php-format
-msgid "Connected with your Diaspora account <strong>%s</strong>"
-msgstr "Connecté avec votre compte Diaspora <strong>%s</strong>"
-
-#: diaspora.php:90
-msgid ""
-"Can't login to your Diaspora account. Please check handle (in the format "
-"user@domain.tld) and password."
-msgstr "Connexion impossible à votre compte Diaspora. Merci de vérifier votre identifiant (au format user@domain.tld) et votre mot de passe."
-
-#: diaspora.php:97
-msgid "Information"
-msgstr "Information"
-
-#: diaspora.php:98
-msgid "Error"
-msgstr "Erreur"
-
-#: diaspora.php:104
+#: diaspora.php:163
 msgid "Enable Diaspora Post Addon"
 msgstr "Activer l’extension « Publier sur Diaspora »"
 
-#: diaspora.php:105
-msgid "Diaspora handle"
+#: diaspora.php:168
+msgid "Diaspora username"
 msgstr "Identifiant Diaspora"
 
-#: diaspora.php:106
+#: diaspora.php:173
 msgid "Diaspora password"
 msgstr "Mot de passe Diaspora"
 
-#: diaspora.php:106
-msgid ""
-"Privacy notice: Your Diaspora password will be stored unencrypted to "
-"authenticate you with your Diaspora pod. This means your Friendica node "
-"administrator can have access to it."
-msgstr "Vie privée : Votre mot de passe Diaspora sera stocké sans encryption pour vous identifier sur votre pod. Cela signifie que l’administrateur de votre pod Diaspora peut y avoir accès."
+#: diaspora.php:178
+msgid "Diaspora site URL"
+msgstr "Adresse du site Diaspora"
 
-#: diaspora.php:108
+#: diaspora.php:183
 msgid "Post to Diaspora by default"
 msgstr "Publier sur Diaspora par défaut"
 
-#: diaspora.php:113
-msgid "Diaspora Export"
-msgstr "Export Diaspora"
+#: diaspora.php:189
+msgid "Save Settings"
+msgstr "Sauvegarder les paramètres"
+
+#: diaspora.php:324
+msgid "Diaspora post failed. Queued for retry."
+msgstr "Échec de la publication sur Diaspora. Une nouvelle tentative est planifiée."
diff --git a/diaspora/lang/fr/strings.php b/diaspora/lang/fr/strings.php
index c208f4ef..c9037b6a 100644
--- a/diaspora/lang/fr/strings.php
+++ b/diaspora/lang/fr/strings.php
@@ -2,23 +2,16 @@
 
 if(! function_exists("string_plural_select_fr")) {
 function string_plural_select_fr($n){
-	$n = intval($n);
-	if (($n == 0 || $n == 1)) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
+	return ($n > 1);;
 }}
-$a->strings['Post to Diaspora'] = 'Publier sur Diaspora';
-$a->strings['Please remember: You can always be reached from Diaspora with your Friendica handle <strong>%s</strong>. '] = 'Attention : vous pouvez toujours être joint par Diaspora avec votre identifiant Friendica <strong>%s</strong>. ';
-$a->strings['This connector is only meant if you still want to use your old Diaspora account for some time. '] = 'Ce connecteur ne doit être utilisé que si vous souhaitez encore utiliser votre ancien compte Diaspora.';
-$a->strings['However, it is preferred that you tell your Diaspora contacts the new handle <strong>%s</strong> instead.'] = 'Quoi qu\'il en soit, il est préférable de communiquer son nouvel identifiant à ses contacts Diaspora <strong>%s</strong>.';
-$a->strings['All aspects'] = 'Tous les aspects';
-$a->strings['Public'] = 'Public';
-$a->strings['Post to aspect:'] = 'Publier avec l\'aspect:';
-$a->strings['Connected with your Diaspora account <strong>%s</strong>'] = 'Connecté avec votre compte Diaspora <strong>%s</strong>';
-$a->strings['Can\'t login to your Diaspora account. Please check handle (in the format user@domain.tld) and password.'] = 'Connexion impossible à votre compte Diaspora. Merci de vérifier votre identifiant (au format user@domain.tld) et votre mot de passe.';
-$a->strings['Information'] = 'Information';
-$a->strings['Error'] = 'Erreur';
-$a->strings['Enable Diaspora Post Addon'] = 'Activer l’extension « Publier sur Diaspora »';
-$a->strings['Diaspora handle'] = 'Identifiant Diaspora';
-$a->strings['Diaspora password'] = 'Mot de passe Diaspora';
-$a->strings['Privacy notice: Your Diaspora password will be stored unencrypted to authenticate you with your Diaspora pod. This means your Friendica node administrator can have access to it.'] = 'Vie privée : Votre mot de passe Diaspora sera stocké sans encryption pour vous identifier sur votre pod. Cela signifie que l’administrateur de votre pod Diaspora peut y avoir accès.';
-$a->strings['Post to Diaspora by default'] = 'Publier sur Diaspora par défaut';
-$a->strings['Diaspora Export'] = 'Export Diaspora';
+;
+$a->strings["Post to Diaspora"] = "Publier sur Diaspora";
+$a->strings["Can't login to your Diaspora account. Please check username and password and ensure you used the complete address (including http...)"] = "Impossible de se connecter à votre compte Diaspora. Veuillez vérifier votre identifiant et votre mot de passe, et assurez-vous d’avoir indiqué l’adresse complète (y compris le « http:// » initial).";
+$a->strings["Diaspora Export"] = "Export Diaspora";
+$a->strings["Enable Diaspora Post Addon"] = "Activer l’extension « Publier sur Diaspora »";
+$a->strings["Diaspora username"] = "Identifiant Diaspora";
+$a->strings["Diaspora password"] = "Mot de passe Diaspora";
+$a->strings["Diaspora site URL"] = "Adresse du site Diaspora";
+$a->strings["Post to Diaspora by default"] = "Publier sur Diaspora par défaut";
+$a->strings["Save Settings"] = "Sauvegarder les paramètres";
+$a->strings["Diaspora post failed. Queued for retry."] = "Échec de la publication sur Diaspora. Une nouvelle tentative est planifiée.";
diff --git a/diaspora/lang/hu/messages.po b/diaspora/lang/hu/messages.po
deleted file mode 100644
index 9ca3f322..00000000
--- a/diaspora/lang/hu/messages.po
+++ /dev/null
@@ -1,102 +0,0 @@
-# ADDON diaspora
-# Copyright (C)
-# This file is distributed under the same license as the Friendica diaspora addon package.
-# 
-# 
-# Translators:
-# Balázs Úr, 2020
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:17-0500\n"
-"PO-Revision-Date: 2014-06-22 11:39+0000\n"
-"Last-Translator: Balázs Úr, 2020\n"
-"Language-Team: Hungarian (http://www.transifex.com/Friendica/friendica/language/hu/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: hu\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: diaspora.php:44
-msgid "Post to Diaspora"
-msgstr "Beküldés a Diasporára"
-
-#: diaspora.php:67
-#, php-format
-msgid ""
-"Please remember: You can always be reached from Diaspora with your Friendica"
-" handle <strong>%s</strong>. "
-msgstr "Ne feledje: Ön mindig elérhető a Diasporáról a(z) <strong>%s</strong> Friendica kezelőjével. "
-
-#: diaspora.php:68
-msgid ""
-"This connector is only meant if you still want to use your old Diaspora "
-"account for some time. "
-msgstr "Ez az összekötő csak akkor szükséges, ha továbbra is használni szeretné a régi Diaspora-fiókját egy ideig. "
-
-#: diaspora.php:69
-#, php-format
-msgid ""
-"However, it is preferred that you tell your Diaspora contacts the new handle"
-" <strong>%s</strong> instead."
-msgstr "Azonban az ajánlott eljárás az, hogy inkább mondja meg a Diaspora partnereinek az új <strong>%s</strong> kezelőt."
-
-#: diaspora.php:79
-msgid "All aspects"
-msgstr "Minden szempont"
-
-#: diaspora.php:80
-msgid "Public"
-msgstr "Nyilvános"
-
-#: diaspora.php:86
-msgid "Post to aspect:"
-msgstr "Beküldés a szempontba:"
-
-#: diaspora.php:87
-#, php-format
-msgid "Connected with your Diaspora account <strong>%s</strong>"
-msgstr "Kapcsolódva a(z) <strong>%s</strong> Diaspora-fiókjával"
-
-#: diaspora.php:90
-msgid ""
-"Can't login to your Diaspora account. Please check handle (in the format "
-"user@domain.tld) and password."
-msgstr "Nem lehet bejelentkezni a Diaspora-fiókjába. Ellenőrizze a kezelőt (felhasználó@tartomány.tld formátumban) és a jelszót."
-
-#: diaspora.php:97
-msgid "Information"
-msgstr "Információ"
-
-#: diaspora.php:98
-msgid "Error"
-msgstr "Hiba"
-
-#: diaspora.php:104
-msgid "Enable Diaspora Post Addon"
-msgstr "A Diaspora-beküldő bővítmény engedélyezése"
-
-#: diaspora.php:105
-msgid "Diaspora handle"
-msgstr "Diaspora kezelő"
-
-#: diaspora.php:106
-msgid "Diaspora password"
-msgstr "Diaspora jelszó"
-
-#: diaspora.php:106
-msgid ""
-"Privacy notice: Your Diaspora password will be stored unencrypted to "
-"authenticate you with your Diaspora pod. This means your Friendica node "
-"administrator can have access to it."
-msgstr "Adatvédelmi figyelmeztetés: a Diaspora jelszava titkosítatlanul lesz eltárolva, hogy hitelesítse Önt a Diaspora csomópontján. Ez azt jelenti, hogy a Friendica csomópontjának adminisztrátora hozzáférhet."
-
-#: diaspora.php:108
-msgid "Post to Diaspora by default"
-msgstr "Beküldés a Diasporára alapértelmezetten"
-
-#: diaspora.php:113
-msgid "Diaspora Export"
-msgstr "Diaspora exportálás"
diff --git a/diaspora/lang/hu/strings.php b/diaspora/lang/hu/strings.php
deleted file mode 100644
index aa3875e7..00000000
--- a/diaspora/lang/hu/strings.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_hu")) {
-function string_plural_select_hu($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Post to Diaspora'] = 'Beküldés a Diasporára';
-$a->strings['Please remember: You can always be reached from Diaspora with your Friendica handle <strong>%s</strong>. '] = 'Ne feledje: Ön mindig elérhető a Diasporáról a(z) <strong>%s</strong> Friendica kezelőjével. ';
-$a->strings['This connector is only meant if you still want to use your old Diaspora account for some time. '] = 'Ez az összekötő csak akkor szükséges, ha továbbra is használni szeretné a régi Diaspora-fiókját egy ideig. ';
-$a->strings['However, it is preferred that you tell your Diaspora contacts the new handle <strong>%s</strong> instead.'] = 'Azonban az ajánlott eljárás az, hogy inkább mondja meg a Diaspora partnereinek az új <strong>%s</strong> kezelőt.';
-$a->strings['All aspects'] = 'Minden szempont';
-$a->strings['Public'] = 'Nyilvános';
-$a->strings['Post to aspect:'] = 'Beküldés a szempontba:';
-$a->strings['Connected with your Diaspora account <strong>%s</strong>'] = 'Kapcsolódva a(z) <strong>%s</strong> Diaspora-fiókjával';
-$a->strings['Can\'t login to your Diaspora account. Please check handle (in the format user@domain.tld) and password.'] = 'Nem lehet bejelentkezni a Diaspora-fiókjába. Ellenőrizze a kezelőt (felhasználó@tartomány.tld formátumban) és a jelszót.';
-$a->strings['Information'] = 'Információ';
-$a->strings['Error'] = 'Hiba';
-$a->strings['Enable Diaspora Post Addon'] = 'A Diaspora-beküldő bővítmény engedélyezése';
-$a->strings['Diaspora handle'] = 'Diaspora kezelő';
-$a->strings['Diaspora password'] = 'Diaspora jelszó';
-$a->strings['Privacy notice: Your Diaspora password will be stored unencrypted to authenticate you with your Diaspora pod. This means your Friendica node administrator can have access to it.'] = 'Adatvédelmi figyelmeztetés: a Diaspora jelszava titkosítatlanul lesz eltárolva, hogy hitelesítse Önt a Diaspora csomópontján. Ez azt jelenti, hogy a Friendica csomópontjának adminisztrátora hozzáférhet.';
-$a->strings['Post to Diaspora by default'] = 'Beküldés a Diasporára alapértelmezetten';
-$a->strings['Diaspora Export'] = 'Diaspora exportálás';
diff --git a/diaspora/lang/is/strings.php b/diaspora/lang/is/strings.php
index 68807841..6149a41b 100644
--- a/diaspora/lang/is/strings.php
+++ b/diaspora/lang/is/strings.php
@@ -3,14 +3,16 @@
 if(! function_exists("string_plural_select_is")) {
 function string_plural_select_is($n){
 	$n = intval($n);
-	return intval($n % 10 != 1 || $n % 100 == 11);
+	return ($n % 10 != 1 || $n % 100 == 11);;
 }}
-$a->strings['Post to Diaspora'] = 'Senda færslu á Diaspora';
-$a->strings['Diaspora Export'] = 'Diaspora útflutningur';
-$a->strings['Enable Diaspora Post Addon'] = 'Virkja sendiviðbót fyrir Diaspora';
-$a->strings['Diaspora username'] = 'Notandanafn á Diaspora';
-$a->strings['Diaspora password'] = 'Lykilorð á Diaspora';
-$a->strings['Diaspora site URL'] = 'Slóð á Diaspora-vefsvæði';
-$a->strings['Post to Diaspora by default'] = 'Senda sjálfgefið færslur á Diaspora';
-$a->strings['Save Settings'] = 'Vista stillingar';
-$a->strings['Diaspora post failed. Queued for retry.'] = 'Færsla Diaspora mistókst. Sett í biðröð til endurtekningar.';
+;
+$a->strings["Post to Diaspora"] = "Senda færslu á Diaspora";
+$a->strings["Can't login to your Diaspora account. Please check username and password and ensure you used the complete address (including http...)"] = "";
+$a->strings["Diaspora Export"] = "Diaspora útflutningur";
+$a->strings["Enable Diaspora Post Addon"] = "Virkja sendiviðbót fyrir Diaspora";
+$a->strings["Diaspora username"] = "Notandanafn á Diaspora";
+$a->strings["Diaspora password"] = "Lykilorð á Diaspora";
+$a->strings["Diaspora site URL"] = "Slóð á Diaspora-vefsvæði";
+$a->strings["Post to Diaspora by default"] = "Senda sjálfgefið færslur á Diaspora";
+$a->strings["Save Settings"] = "Vista stillingar";
+$a->strings["Diaspora post failed. Queued for retry."] = "Færsla Diaspora mistókst. Sett í biðröð til endurtekningar.";
diff --git a/diaspora/lang/it/messages.po b/diaspora/lang/it/messages.po
index f193a623..8c3265dc 100644
--- a/diaspora/lang/it/messages.po
+++ b/diaspora/lang/it/messages.po
@@ -5,14 +5,13 @@
 # 
 # Translators:
 # fabrixxm <fabrix.xm@gmail.com>, 2014,2018
-# Sylke Vicious <silkevicious@gmail.com>, 2020
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-05-07 00:15-0400\n"
-"PO-Revision-Date: 2020-09-01 10:54+0000\n"
-"Last-Translator: Sylke Vicious <silkevicious@gmail.com>\n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2018-03-19 13:21+0000\n"
+"Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,96 +19,44 @@ msgstr ""
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: diaspora.php:53
+#: diaspora.php:37
 msgid "Post to Diaspora"
 msgstr "Invia a Diaspora"
 
-#: diaspora.php:78
-#, php-format
+#: diaspora.php:142
 msgid ""
-"Please remember: You can always be reached from Diaspora with your Friendica"
-" handle <strong>%s</strong>. "
-msgstr "Ricorda: Puoi sempre essere raggiunto da Diaspora con il tuo indirizzo Friendica <strong>%s</strong>."
+"Can't login to your Diaspora account. Please check username and password and"
+" ensure you used the complete address (including http...)"
+msgstr "Non riesco ad autenticarmi con il tuo account Diaspora. Controlla il nome utente e la password e assicurati di aver usato l'indirizzo completo (compreso \"http\" o \"https\")"
 
-#: diaspora.php:79
-msgid ""
-"This connector is only meant if you still want to use your old Diaspora "
-"account for some time. "
-msgstr "Questo connettore è utile solo se vuoi utilizzare il tuo vecchio account Diaspora per un po'."
-
-#: diaspora.php:80
-#, php-format
-msgid ""
-"However, it is preferred that you tell your Diaspora contacts the new handle"
-" <strong>%s</strong> instead."
-msgstr "Comunque, è preferibile che tu comunichi ai tuoi contatti Diaspora il nuovo indirizzo <strong>%s</strong>."
-
-#: diaspora.php:90
-msgid "All aspects"
-msgstr "Tutti gli aspetti"
-
-#: diaspora.php:91
-msgid "Public"
-msgstr "Pubblico"
-
-#: diaspora.php:97
-msgid "Post to aspect:"
-msgstr "Invia all'aspetto:"
-
-#: diaspora.php:98
-#, php-format
-msgid "Connected with your Diaspora account <strong>%s</strong>"
-msgstr "Connesso con il tuo account Diaspora <strong>%s</strong>"
-
-#: diaspora.php:101
-msgid ""
-"Can't login to your Diaspora account. Please check handle (in the format "
-"user@domain.tld) and password."
-msgstr "Non è stato possibile accedere al tuo account Diaspora. Per favore controlla l'indirizzo (nel formato utente@dominio.tld) e password."
-
-#: diaspora.php:109
+#: diaspora.php:149 diaspora.php:153
 msgid "Diaspora Export"
 msgstr "Esporta Diaspora"
 
-#: diaspora.php:110
-msgid "Information"
-msgstr "Informazione"
-
-#: diaspora.php:111
-msgid "Error"
-msgstr "Errore"
-
-#: diaspora.php:112
-msgid "Save Settings"
-msgstr "Salva Impostazioni"
-
-#: diaspora.php:116
+#: diaspora.php:163
 msgid "Enable Diaspora Post Addon"
 msgstr "Abilita il componente aggiuntivo di invio a Diaspora"
 
-#: diaspora.php:117
-msgid "Diaspora handle"
-msgstr "Indirizzo Diaspora"
+#: diaspora.php:168
+msgid "Diaspora username"
+msgstr "Nome utente Diaspora"
 
-#: diaspora.php:118
+#: diaspora.php:173
 msgid "Diaspora password"
 msgstr "Password Diaspora"
 
-#: diaspora.php:118
-msgid ""
-"Privacy notice: Your Diaspora password will be stored unencrypted to "
-"authenticate you with your Diaspora pod. This means your Friendica node "
-"administrator can have access to it."
-msgstr "Nota sulla privacy: La tua password Diaspora sarà memorizzata in modo non criptato per autenticarti al tuo pod Diaspora. Questo significa che l'amministratore del tuo nodo Friendica può aver accesso a questa."
+#: diaspora.php:178
+msgid "Diaspora site URL"
+msgstr "Indirizzo sito Diaspora"
 
-#: diaspora.php:120
+#: diaspora.php:183
 msgid "Post to Diaspora by default"
 msgstr "Invia sempre a Diaspora"
 
-#: diaspora.php:138
-msgid "Diaspora settings updated."
-msgstr "Impostazioni Diaspora aggiornate."
+#: diaspora.php:189
+msgid "Save Settings"
+msgstr "Salva Impostazioni"
 
-#: diaspora.php:141
-msgid "Diaspora connector disabled."
-msgstr "Connettore Diaspora disabilitato."
+#: diaspora.php:324
+msgid "Diaspora post failed. Queued for retry."
+msgstr "Invio a Diaspora fallito. In attesa di riprovare."
diff --git a/diaspora/lang/it/strings.php b/diaspora/lang/it/strings.php
index e83526db..a7778c94 100644
--- a/diaspora/lang/it/strings.php
+++ b/diaspora/lang/it/strings.php
@@ -2,26 +2,16 @@
 
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Post to Diaspora'] = 'Invia a Diaspora';
-$a->strings['Please remember: You can always be reached from Diaspora with your Friendica handle <strong>%s</strong>. '] = 'Ricorda: Puoi sempre essere raggiunto da Diaspora con il tuo indirizzo Friendica <strong>%s</strong>.';
-$a->strings['This connector is only meant if you still want to use your old Diaspora account for some time. '] = 'Questo connettore è utile solo se vuoi utilizzare il tuo vecchio account Diaspora per un po\'.';
-$a->strings['However, it is preferred that you tell your Diaspora contacts the new handle <strong>%s</strong> instead.'] = 'Comunque, è preferibile che tu comunichi ai tuoi contatti Diaspora il nuovo indirizzo <strong>%s</strong>.';
-$a->strings['All aspects'] = 'Tutti gli aspetti';
-$a->strings['Public'] = 'Pubblico';
-$a->strings['Post to aspect:'] = 'Invia all\'aspetto:';
-$a->strings['Connected with your Diaspora account <strong>%s</strong>'] = 'Connesso con il tuo account Diaspora <strong>%s</strong>';
-$a->strings['Can\'t login to your Diaspora account. Please check handle (in the format user@domain.tld) and password.'] = 'Non è stato possibile accedere al tuo account Diaspora. Per favore controlla l\'indirizzo (nel formato utente@dominio.tld) e password.';
-$a->strings['Diaspora Export'] = 'Esporta Diaspora';
-$a->strings['Information'] = 'Informazione';
-$a->strings['Error'] = 'Errore';
-$a->strings['Save Settings'] = 'Salva Impostazioni';
-$a->strings['Enable Diaspora Post Addon'] = 'Abilita il componente aggiuntivo di invio a Diaspora';
-$a->strings['Diaspora handle'] = 'Indirizzo Diaspora';
-$a->strings['Diaspora password'] = 'Password Diaspora';
-$a->strings['Privacy notice: Your Diaspora password will be stored unencrypted to authenticate you with your Diaspora pod. This means your Friendica node administrator can have access to it.'] = 'Nota sulla privacy: La tua password Diaspora sarà memorizzata in modo non criptato per autenticarti al tuo pod Diaspora. Questo significa che l\'amministratore del tuo nodo Friendica può aver accesso a questa.';
-$a->strings['Post to Diaspora by default'] = 'Invia sempre a Diaspora';
-$a->strings['Diaspora settings updated.'] = 'Impostazioni Diaspora aggiornate.';
-$a->strings['Diaspora connector disabled.'] = 'Connettore Diaspora disabilitato.';
+;
+$a->strings["Post to Diaspora"] = "Invia a Diaspora";
+$a->strings["Can't login to your Diaspora account. Please check username and password and ensure you used the complete address (including http...)"] = "Non riesco ad autenticarmi con il tuo account Diaspora. Controlla il nome utente e la password e assicurati di aver usato l'indirizzo completo (compreso \"http\" o \"https\")";
+$a->strings["Diaspora Export"] = "Esporta Diaspora";
+$a->strings["Enable Diaspora Post Addon"] = "Abilita il componente aggiuntivo di invio a Diaspora";
+$a->strings["Diaspora username"] = "Nome utente Diaspora";
+$a->strings["Diaspora password"] = "Password Diaspora";
+$a->strings["Diaspora site URL"] = "Indirizzo sito Diaspora";
+$a->strings["Post to Diaspora by default"] = "Invia sempre a Diaspora";
+$a->strings["Save Settings"] = "Salva Impostazioni";
+$a->strings["Diaspora post failed. Queued for retry."] = "Invio a Diaspora fallito. In attesa di riprovare.";
diff --git a/diaspora/lang/nl/messages.po b/diaspora/lang/nl/messages.po
index 94be0bc1..25fee146 100644
--- a/diaspora/lang/nl/messages.po
+++ b/diaspora/lang/nl/messages.po
@@ -4,15 +4,14 @@
 # 
 # 
 # Translators:
-# Casper <casper@vrije-mens.org>, 2020
 # Jeroen De Meerleer <me@jeroened.be>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-05-07 00:15-0400\n"
-"PO-Revision-Date: 2020-09-04 21:05+0000\n"
-"Last-Translator: Casper <casper@vrije-mens.org>\n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2018-08-24 13:55+0000\n"
+"Last-Translator: Jeroen De Meerleer <me@jeroened.be>\n"
 "Language-Team: Dutch (http://www.transifex.com/Friendica/friendica/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,96 +19,44 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: diaspora.php:53
+#: diaspora.php:37
 msgid "Post to Diaspora"
 msgstr "Plaatsen op Diaspora"
 
-#: diaspora.php:78
-#, php-format
+#: diaspora.php:142
 msgid ""
-"Please remember: You can always be reached from Diaspora with your Friendica"
-" handle <strong>%s</strong>. "
-msgstr "Let op: vanuit Diaspora ben je altijd bereikbaar met je Friendica-handvat <strong>%s</strong>. "
+"Can't login to your Diaspora account. Please check username and password and"
+" ensure you used the complete address (including http...)"
+msgstr "Kan niet inloggen op je Diaspora account. Gelieve je gebruikersnaam en wachtwoord te controleren en het volledige adres (inclusief http) te controleren"
 
-#: diaspora.php:79
-msgid ""
-"This connector is only meant if you still want to use your old Diaspora "
-"account for some time. "
-msgstr "Deze connector is alleen bedoeld als je je oude diaspora-account nog enige tijd wilt gebruiken."
-
-#: diaspora.php:80
-#, php-format
-msgid ""
-"However, it is preferred that you tell your Diaspora contacts the new handle"
-" <strong>%s</strong> instead."
-msgstr "Het verdient echter de voorkeur dat u uw diaspora contacteert met de nieuwe handle <strong>%s</strong>."
-
-#: diaspora.php:90
-msgid "All aspects"
-msgstr "Alle aspecten"
-
-#: diaspora.php:91
-msgid "Public"
-msgstr "Openbaar"
-
-#: diaspora.php:97
-msgid "Post to aspect:"
-msgstr "Post naar aspect:"
-
-#: diaspora.php:98
-#, php-format
-msgid "Connected with your Diaspora account <strong>%s</strong>"
-msgstr "Verbonden met uw diaspora-account <strong>%s</strong>"
-
-#: diaspora.php:101
-msgid ""
-"Can't login to your Diaspora account. Please check handle (in the format "
-"user@domain.tld) and password."
-msgstr "U kunt niet inloggen op uw Diaspora-account. Controleer de handle (in het formaat gebruiker@domein.tld) ​​en het wachtwoord."
-
-#: diaspora.php:109
+#: diaspora.php:149 diaspora.php:153
 msgid "Diaspora Export"
 msgstr "Diaspora Exporteren"
 
-#: diaspora.php:110
-msgid "Information"
-msgstr "Informatie"
-
-#: diaspora.php:111
-msgid "Error"
-msgstr "Fout"
-
-#: diaspora.php:112
-msgid "Save Settings"
-msgstr "Instellingen opslaan"
-
-#: diaspora.php:116
+#: diaspora.php:163
 msgid "Enable Diaspora Post Addon"
 msgstr "Diaspora Post Addon inschakelen"
 
-#: diaspora.php:117
-msgid "Diaspora handle"
-msgstr ""
+#: diaspora.php:168
+msgid "Diaspora username"
+msgstr "Diaspora gebruikersnaam"
 
-#: diaspora.php:118
+#: diaspora.php:173
 msgid "Diaspora password"
 msgstr "Diaspora wachtwoord"
 
-#: diaspora.php:118
-msgid ""
-"Privacy notice: Your Diaspora password will be stored unencrypted to "
-"authenticate you with your Diaspora pod. This means your Friendica node "
-"administrator can have access to it."
-msgstr "Privacyverklaring: uw diaspora-wachtwoord wordt onversleuteld opgeslagen om u te authenticeren met uw diaspora-pod. Dit betekent dat uw Friendica-knooppuntbeheerder er toegang toe heeft."
+#: diaspora.php:178
+msgid "Diaspora site URL"
+msgstr "Diaspora pod URL"
 
-#: diaspora.php:120
+#: diaspora.php:183
 msgid "Post to Diaspora by default"
 msgstr "Plaatsen op Diaspora als standaard instellen "
 
-#: diaspora.php:138
-msgid "Diaspora settings updated."
-msgstr ""
+#: diaspora.php:189
+msgid "Save Settings"
+msgstr "Instellingen opslaan"
 
-#: diaspora.php:141
-msgid "Diaspora connector disabled."
-msgstr ""
+#: diaspora.php:324
+msgid "Diaspora post failed. Queued for retry."
+msgstr "Posten naar Diaspora mislukt. In wachtrij geplaatst om opnieuw te proberen."
diff --git a/diaspora/lang/nl/strings.php b/diaspora/lang/nl/strings.php
index 58bdf52d..698a875a 100644
--- a/diaspora/lang/nl/strings.php
+++ b/diaspora/lang/nl/strings.php
@@ -3,22 +3,16 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Post to Diaspora'] = 'Plaatsen op Diaspora';
-$a->strings['Please remember: You can always be reached from Diaspora with your Friendica handle <strong>%s</strong>. '] = 'Let op: vanuit Diaspora ben je altijd bereikbaar met je Friendica-handvat <strong>%s</strong>. ';
-$a->strings['This connector is only meant if you still want to use your old Diaspora account for some time. '] = 'Deze connector is alleen bedoeld als je je oude diaspora-account nog enige tijd wilt gebruiken.';
-$a->strings['However, it is preferred that you tell your Diaspora contacts the new handle <strong>%s</strong> instead.'] = 'Het verdient echter de voorkeur dat u uw diaspora contacteert met de nieuwe handle <strong>%s</strong>.';
-$a->strings['All aspects'] = 'Alle aspecten';
-$a->strings['Public'] = 'Openbaar';
-$a->strings['Post to aspect:'] = 'Post naar aspect:';
-$a->strings['Connected with your Diaspora account <strong>%s</strong>'] = 'Verbonden met uw diaspora-account <strong>%s</strong>';
-$a->strings['Can\'t login to your Diaspora account. Please check handle (in the format user@domain.tld) and password.'] = 'U kunt niet inloggen op uw Diaspora-account. Controleer de handle (in het formaat gebruiker@domein.tld) ​​en het wachtwoord.';
-$a->strings['Diaspora Export'] = 'Diaspora Exporteren';
-$a->strings['Information'] = 'Informatie';
-$a->strings['Error'] = 'Fout';
-$a->strings['Save Settings'] = 'Instellingen opslaan';
-$a->strings['Enable Diaspora Post Addon'] = 'Diaspora Post Addon inschakelen';
-$a->strings['Diaspora password'] = 'Diaspora wachtwoord';
-$a->strings['Privacy notice: Your Diaspora password will be stored unencrypted to authenticate you with your Diaspora pod. This means your Friendica node administrator can have access to it.'] = 'Privacyverklaring: uw diaspora-wachtwoord wordt onversleuteld opgeslagen om u te authenticeren met uw diaspora-pod. Dit betekent dat uw Friendica-knooppuntbeheerder er toegang toe heeft.';
-$a->strings['Post to Diaspora by default'] = 'Plaatsen op Diaspora als standaard instellen ';
+;
+$a->strings["Post to Diaspora"] = "Plaatsen op Diaspora";
+$a->strings["Can't login to your Diaspora account. Please check username and password and ensure you used the complete address (including http...)"] = "Kan niet inloggen op je Diaspora account. Gelieve je gebruikersnaam en wachtwoord te controleren en het volledige adres (inclusief http) te controleren";
+$a->strings["Diaspora Export"] = "Diaspora Exporteren";
+$a->strings["Enable Diaspora Post Addon"] = "Diaspora Post Addon inschakelen";
+$a->strings["Diaspora username"] = "Diaspora gebruikersnaam";
+$a->strings["Diaspora password"] = "Diaspora wachtwoord";
+$a->strings["Diaspora site URL"] = "Diaspora pod URL";
+$a->strings["Post to Diaspora by default"] = "Plaatsen op Diaspora als standaard instellen ";
+$a->strings["Save Settings"] = "Instellingen opslaan";
+$a->strings["Diaspora post failed. Queued for retry."] = "Posten naar Diaspora mislukt. In wachtrij geplaatst om opnieuw te proberen.";
diff --git a/diaspora/lang/pl/messages.po b/diaspora/lang/pl/messages.po
index 943a0422..086155b0 100644
--- a/diaspora/lang/pl/messages.po
+++ b/diaspora/lang/pl/messages.po
@@ -4,15 +4,14 @@
 # 
 # 
 # Translators:
-# Piotr Strębski <strebski@gmail.com>, 2022
-# Waldemar Stoczkowski, 2018,2020
+# Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:17-0500\n"
-"PO-Revision-Date: 2014-06-22 11:39+0000\n"
-"Last-Translator: Piotr Strębski <strebski@gmail.com>, 2022\n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2018-08-04 10:21+0000\n"
+"Last-Translator: Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.com/Friendica/friendica/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,84 +19,44 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
-#: diaspora.php:44
+#: diaspora.php:37
 msgid "Post to Diaspora"
 msgstr "Napisz do Diaspory"
 
-#: diaspora.php:67
-#, php-format
+#: diaspora.php:142
 msgid ""
-"Please remember: You can always be reached from Diaspora with your Friendica"
-" handle <strong>%s</strong>. "
-msgstr "Pamiętaj: Zawsze można do Ciebie dotrzeć z Diaspory za pomocą uchwytu Friendica <strong>%s</strong>. "
+"Can't login to your Diaspora account. Please check username and password and"
+" ensure you used the complete address (including http...)"
+msgstr "Nie możesz zalogować się na swoje konto Diaspora. Sprawdź nazwę użytkownika i hasło i upewnij się, że użyłeś pełnego adresu (w tym http ...)"
 
-#: diaspora.php:68
-msgid ""
-"This connector is only meant if you still want to use your old Diaspora "
-"account for some time. "
-msgstr "Ten łącznik jest przeznaczony do tego, gdy nadal chcesz korzystać ze starego konta Diaspora przez jakiś czas."
+#: diaspora.php:149 diaspora.php:153
+msgid "Diaspora Export"
+msgstr "Eksportuj do Diaspory"
 
-#: diaspora.php:69
-#, php-format
-msgid ""
-"However, it is preferred that you tell your Diaspora contacts the new handle"
-" <strong>%s</strong> instead."
-msgstr "Jednak zaleca się, aby zamiast tego poinformować swoją Diasporę o kontakt z nowym uchwytem <strong>%s</strong>."
-
-#: diaspora.php:79
-msgid "All aspects"
-msgstr "Wszystkie aspekty"
-
-#: diaspora.php:80
-msgid "Public"
-msgstr "Publiczny"
-
-#: diaspora.php:86
-msgid "Post to aspect:"
-msgstr "Napisz do aspektu:"
-
-#: diaspora.php:87
-#, php-format
-msgid "Connected with your Diaspora account <strong>%s</strong>"
-msgstr "Połączony ze swoim kontem Diaspora <strong>%s</strong>"
-
-#: diaspora.php:90
-msgid ""
-"Can't login to your Diaspora account. Please check handle (in the format "
-"user@domain.tld) and password."
-msgstr "Nie można zalogować się na Twoje konto w Diasporze. Sprawdź uchwyt (w formacie użytkownik@domena.tld) i hasło."
-
-#: diaspora.php:97
-msgid "Information"
-msgstr "Informacja"
-
-#: diaspora.php:98
-msgid "Error"
-msgstr "Błąd"
-
-#: diaspora.php:104
+#: diaspora.php:163
 msgid "Enable Diaspora Post Addon"
 msgstr "Włącz dodatek Diaspora"
 
-#: diaspora.php:105
-msgid "Diaspora handle"
-msgstr "Uchwyt Diaspory"
+#: diaspora.php:168
+msgid "Diaspora username"
+msgstr "Nazwa użytkownika Diaspora"
 
-#: diaspora.php:106
+#: diaspora.php:173
 msgid "Diaspora password"
 msgstr "Hasło Diaspora"
 
-#: diaspora.php:106
-msgid ""
-"Privacy notice: Your Diaspora password will be stored unencrypted to "
-"authenticate you with your Diaspora pod. This means your Friendica node "
-"administrator can have access to it."
-msgstr "Informacja o ochronie prywatności: Twoje hasło Diaspora będzie przechowywane w postaci niezaszyfrowanej w celu uwierzytelnienia użytkownika za pomocą Diaspora. Oznacza to, że administrator węzła Friendica może mieć do niego dostęp."
+#: diaspora.php:178
+msgid "Diaspora site URL"
+msgstr "Adres URL witryny Diaspora"
 
-#: diaspora.php:108
+#: diaspora.php:183
 msgid "Post to Diaspora by default"
 msgstr "Wyślij domyślnie do Diaspory"
 
-#: diaspora.php:113
-msgid "Diaspora Export"
-msgstr "Eksportuj do Diaspory"
+#: diaspora.php:189
+msgid "Save Settings"
+msgstr "Zapisz ustawienia"
+
+#: diaspora.php:324
+msgid "Diaspora post failed. Queued for retry."
+msgstr "Post do Diaspora nie powiódł się. W kolejce do ponowienia."
diff --git a/diaspora/lang/pl/strings.php b/diaspora/lang/pl/strings.php
index 7e15915b..fd9158da 100644
--- a/diaspora/lang/pl/strings.php
+++ b/diaspora/lang/pl/strings.php
@@ -3,22 +3,16 @@
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
 	$n = intval($n);
-	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
+	return ($n==1 ? 0 : ($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14) ? 1 : $n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14) ? 2 : 3);;
 }}
-$a->strings['Post to Diaspora'] = 'Napisz do Diaspory';
-$a->strings['Please remember: You can always be reached from Diaspora with your Friendica handle <strong>%s</strong>. '] = 'Pamiętaj: Zawsze można do Ciebie dotrzeć z Diaspory za pomocą uchwytu Friendica <strong>%s</strong>. ';
-$a->strings['This connector is only meant if you still want to use your old Diaspora account for some time. '] = 'Ten łącznik jest przeznaczony do tego, gdy nadal chcesz korzystać ze starego konta Diaspora przez jakiś czas.';
-$a->strings['However, it is preferred that you tell your Diaspora contacts the new handle <strong>%s</strong> instead.'] = 'Jednak zaleca się, aby zamiast tego poinformować swoją Diasporę o kontakt z nowym uchwytem <strong>%s</strong>.';
-$a->strings['All aspects'] = 'Wszystkie aspekty';
-$a->strings['Public'] = 'Publiczny';
-$a->strings['Post to aspect:'] = 'Napisz do aspektu:';
-$a->strings['Connected with your Diaspora account <strong>%s</strong>'] = 'Połączony ze swoim kontem Diaspora <strong>%s</strong>';
-$a->strings['Can\'t login to your Diaspora account. Please check handle (in the format user@domain.tld) and password.'] = 'Nie można zalogować się na Twoje konto w Diasporze. Sprawdź uchwyt (w formacie użytkownik@domena.tld) i hasło.';
-$a->strings['Information'] = 'Informacja';
-$a->strings['Error'] = 'Błąd';
-$a->strings['Enable Diaspora Post Addon'] = 'Włącz dodatek Diaspora';
-$a->strings['Diaspora handle'] = 'Uchwyt Diaspory';
-$a->strings['Diaspora password'] = 'Hasło Diaspora';
-$a->strings['Privacy notice: Your Diaspora password will be stored unencrypted to authenticate you with your Diaspora pod. This means your Friendica node administrator can have access to it.'] = 'Informacja o ochronie prywatności: Twoje hasło Diaspora będzie przechowywane w postaci niezaszyfrowanej w celu uwierzytelnienia użytkownika za pomocą Diaspora. Oznacza to, że administrator węzła Friendica może mieć do niego dostęp.';
-$a->strings['Post to Diaspora by default'] = 'Wyślij domyślnie do Diaspory';
-$a->strings['Diaspora Export'] = 'Eksportuj do Diaspory';
+;
+$a->strings["Post to Diaspora"] = "Napisz do Diaspory";
+$a->strings["Can't login to your Diaspora account. Please check username and password and ensure you used the complete address (including http...)"] = "Nie możesz zalogować się na swoje konto Diaspora. Sprawdź nazwę użytkownika i hasło i upewnij się, że użyłeś pełnego adresu (w tym http ...)";
+$a->strings["Diaspora Export"] = "Eksportuj do Diaspory";
+$a->strings["Enable Diaspora Post Addon"] = "Włącz dodatek Diaspora";
+$a->strings["Diaspora username"] = "Nazwa użytkownika Diaspora";
+$a->strings["Diaspora password"] = "Hasło Diaspora";
+$a->strings["Diaspora site URL"] = "Adres URL witryny Diaspora";
+$a->strings["Post to Diaspora by default"] = "Wyślij domyślnie do Diaspory";
+$a->strings["Save Settings"] = "Zapisz ustawienia";
+$a->strings["Diaspora post failed. Queued for retry."] = "Post do Diaspora nie powiódł się. W kolejce do ponowienia.";
diff --git a/diaspora/lang/pt-br/strings.php b/diaspora/lang/pt-br/strings.php
deleted file mode 100644
index 4c341ac1..00000000
--- a/diaspora/lang/pt-br/strings.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_pt_br")) {
-function string_plural_select_pt_br($n){
-	$n = intval($n);
-	return intval($n > 1);
-}}
-$a->strings['Post to Diaspora'] = 'Publicar na Diaspora';
-$a->strings['Can\'t login to your Diaspora account. Please check username and password and ensure you used the complete address (including http...)'] = 'Não foi possível entrar na sua conta Diaspora. Verifique seu nome de usuário e senha e certifique-se que usou o endereço completo (incluindo http...).';
-$a->strings['Enable Diaspora Post Addon'] = 'Habilitar plug-in para publicar na Diaspora';
-$a->strings['Diaspora username'] = 'Nome de usuário da Diaspora';
-$a->strings['Diaspora password'] = 'Senha da Diaspora';
-$a->strings['Post to Diaspora by default'] = 'Publicar na Diaspora por padrão';
-$a->strings['Save Settings'] = 'Salvar Configurações';
-$a->strings['Diaspora post failed. Queued for retry.'] = 'Falha ao publicar na Diaspora. Na fila para tentar novamente.';
diff --git a/diaspora/lang/ro/strings.php b/diaspora/lang/ro/strings.php
index 16a86dfa..3173251c 100644
--- a/diaspora/lang/ro/strings.php
+++ b/diaspora/lang/ro/strings.php
@@ -3,14 +3,16 @@
 if(! function_exists("string_plural_select_ro")) {
 function string_plural_select_ro($n){
 	$n = intval($n);
-	if ($n==1) { return 0; } else if ((($n%100>19)||(($n%100==0)&&($n!=0)))) { return 2; } else  { return 1; }
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
 }}
-$a->strings['Post to Diaspora'] = 'Postați pe Diaspora';
-$a->strings['Can\'t login to your Diaspora account. Please check username and password and ensure you used the complete address (including http...)'] = 'Nu se poate face autentificarea pe contul dvs. Diaspora. Verificați numele de utilizator şi parola şi asigurați-vă că ați folosit adresa completă  (inclusiv http ... )';
-$a->strings['Diaspora Export'] = 'Exportare pe Diaspora ';
-$a->strings['Diaspora username'] = 'Utilizator Diaspora';
-$a->strings['Diaspora password'] = 'Parola Diaspora';
-$a->strings['Diaspora site URL'] = 'URL site Diaspora';
-$a->strings['Post to Diaspora by default'] = 'Postați implicit pe Diaspora';
-$a->strings['Save Settings'] = 'Salvare Configurări';
-$a->strings['Diaspora post failed. Queued for retry.'] = 'Postarea pe Diaspora a eșuat. S-a pus în așteptare pentru reîncercare.';
+;
+$a->strings["Post to Diaspora"] = "Postați pe Diaspora";
+$a->strings["Can't login to your Diaspora account. Please check username and password and ensure you used the complete address (including http...)"] = "Nu se poate face autentificarea pe contul dvs. Diaspora. Verificați numele de utilizator şi parola şi asigurați-vă că ați folosit adresa completă  (inclusiv http ... )";
+$a->strings["Diaspora Export"] = "Exportare pe Diaspora ";
+$a->strings["Enable Diaspora Post Addon"] = "";
+$a->strings["Diaspora username"] = "Utilizator Diaspora";
+$a->strings["Diaspora password"] = "Parola Diaspora";
+$a->strings["Diaspora site URL"] = "URL site Diaspora";
+$a->strings["Post to Diaspora by default"] = "Postați implicit pe Diaspora";
+$a->strings["Save Settings"] = "Salvare Configurări";
+$a->strings["Diaspora post failed. Queued for retry."] = "Postarea pe Diaspora a eșuat. S-a pus în așteptare pentru reîncercare.";
diff --git a/diaspora/lang/ru/messages.po b/diaspora/lang/ru/messages.po
index 3c064fa1..34a8c323 100644
--- a/diaspora/lang/ru/messages.po
+++ b/diaspora/lang/ru/messages.po
@@ -4,15 +4,14 @@
 # 
 # 
 # Translators:
-# Alexander An <ravnina@gmail.com>, 2020
 # Stanislav N. <pztrn@pztrn.name>, 2017-2018
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-05-07 00:15-0400\n"
-"PO-Revision-Date: 2020-10-09 19:03+0000\n"
-"Last-Translator: Alexander An <ravnina@gmail.com>\n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2018-05-25 00:01+0000\n"
+"Last-Translator: Stanislav N. <pztrn@pztrn.name>\n"
 "Language-Team: Russian (http://www.transifex.com/Friendica/friendica/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,96 +19,44 @@ msgstr ""
 "Language: ru\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
-#: diaspora.php:53
+#: diaspora.php:37
 msgid "Post to Diaspora"
 msgstr "Отправить в Diaspora"
 
-#: diaspora.php:78
-#, php-format
+#: diaspora.php:142
 msgid ""
-"Please remember: You can always be reached from Diaspora with your Friendica"
-" handle <strong>%s</strong>. "
-msgstr "Помните: с вами всегда можно связаться из сети Diaspora по вашему адресу Friendica <strong>%s</strong>."
+"Can't login to your Diaspora account. Please check username and password and"
+" ensure you used the complete address (including http...)"
+msgstr "Невозможно войти в вашу учетную запись Diaspora. Пожалуйста, проверьте имя пользователя, пароль и убедитесь, что вы ввели полный адрес пода (включая http/https)"
 
-#: diaspora.php:79
-msgid ""
-"This connector is only meant if you still want to use your old Diaspora "
-"account for some time. "
-msgstr "Этот коннектор предназначен только для тех случаев, когда вы хотите использовать вашу старую учётную запись в Diaspora в течение какого-то времени."
-
-#: diaspora.php:80
-#, php-format
-msgid ""
-"However, it is preferred that you tell your Diaspora contacts the new handle"
-" <strong>%s</strong> instead."
-msgstr "Но будет лучше, если вы просто предложите вашим контактам в Diaspora использовать ваш новый адрес <strong>%s</strong>."
-
-#: diaspora.php:90
-msgid "All aspects"
-msgstr "Все контакты"
-
-#: diaspora.php:91
-msgid "Public"
-msgstr "Публично"
-
-#: diaspora.php:97
-msgid "Post to aspect:"
-msgstr "Для группы:"
-
-#: diaspora.php:98
-#, php-format
-msgid "Connected with your Diaspora account <strong>%s</strong>"
-msgstr "Соединено с вашей учётной записью Diaspora <strong>%s</strong>"
-
-#: diaspora.php:101
-msgid ""
-"Can't login to your Diaspora account. Please check handle (in the format "
-"user@domain.tld) and password."
-msgstr "Не получается зайти в вашу учётную запись Diaspora. Пожалуйста, проверьте правильность имени (в формате user@domain.tld) и пароль."
-
-#: diaspora.php:109
+#: diaspora.php:149 diaspora.php:153
 msgid "Diaspora Export"
 msgstr "Экспорт в Diaspora"
 
-#: diaspora.php:110
-msgid "Information"
-msgstr "Информация"
-
-#: diaspora.php:111
-msgid "Error"
-msgstr "Ошибка"
-
-#: diaspora.php:112
-msgid "Save Settings"
-msgstr "Сохранить настройки"
-
-#: diaspora.php:116
+#: diaspora.php:163
 msgid "Enable Diaspora Post Addon"
 msgstr "Включить аддон Diaspora Post"
 
-#: diaspora.php:117
-msgid "Diaspora handle"
-msgstr "Имя в Diaspora"
+#: diaspora.php:168
+msgid "Diaspora username"
+msgstr "Имя пользователя Diaspora"
 
-#: diaspora.php:118
+#: diaspora.php:173
 msgid "Diaspora password"
 msgstr "Пароль Diaspora"
 
-#: diaspora.php:118
-msgid ""
-"Privacy notice: Your Diaspora password will be stored unencrypted to "
-"authenticate you with your Diaspora pod. This means your Friendica node "
-"administrator can have access to it."
-msgstr "Предупреждение: Ваш пароль для Diaspora будет сохранён в открытом виде, чтобы производить вход в ваш сервер Diaspora. Это означает, что администратор этого узла Friendica может получить к нему доступ."
+#: diaspora.php:178
+msgid "Diaspora site URL"
+msgstr "URL пода Diaspora"
 
-#: diaspora.php:120
+#: diaspora.php:183
 msgid "Post to Diaspora by default"
 msgstr "Отправлять в Diaspora по умолчанию"
 
-#: diaspora.php:138
-msgid "Diaspora settings updated."
-msgstr "Настройки Diaspora обновлены."
+#: diaspora.php:189
+msgid "Save Settings"
+msgstr "Сохранить настройки"
 
-#: diaspora.php:141
-msgid "Diaspora connector disabled."
-msgstr "Коннектор Diaspora отключён."
+#: diaspora.php:324
+msgid "Diaspora post failed. Queued for retry."
+msgstr "Ошибка отправки сообщения в Diaspora. В очереди на еще одну попытку."
diff --git a/diaspora/lang/ru/strings.php b/diaspora/lang/ru/strings.php
index cfdbde20..c414f622 100644
--- a/diaspora/lang/ru/strings.php
+++ b/diaspora/lang/ru/strings.php
@@ -3,25 +3,16 @@
 if(! function_exists("string_plural_select_ru")) {
 function string_plural_select_ru($n){
 	$n = intval($n);
-	if ($n%10==1 && $n%100!=11) { return 0; } else if ($n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14)) { return 1; } else if ($n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)) { return 2; } else  { return 3; }
+	return ($n%10==1 && $n%100!=11 ? 0 : $n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14) ? 1 : $n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)? 2 : 3);;
 }}
-$a->strings['Post to Diaspora'] = 'Отправить в Diaspora';
-$a->strings['Please remember: You can always be reached from Diaspora with your Friendica handle <strong>%s</strong>. '] = 'Помните: с вами всегда можно связаться из сети Diaspora по вашему адресу Friendica <strong>%s</strong>.';
-$a->strings['This connector is only meant if you still want to use your old Diaspora account for some time. '] = 'Этот коннектор предназначен только для тех случаев, когда вы хотите использовать вашу старую учётную запись в Diaspora в течение какого-то времени.';
-$a->strings['However, it is preferred that you tell your Diaspora contacts the new handle <strong>%s</strong> instead.'] = 'Но будет лучше, если вы просто предложите вашим контактам в Diaspora использовать ваш новый адрес <strong>%s</strong>.';
-$a->strings['All aspects'] = 'Все контакты';
-$a->strings['Public'] = 'Публично';
-$a->strings['Post to aspect:'] = 'Для группы:';
-$a->strings['Connected with your Diaspora account <strong>%s</strong>'] = 'Соединено с вашей учётной записью Diaspora <strong>%s</strong>';
-$a->strings['Can\'t login to your Diaspora account. Please check handle (in the format user@domain.tld) and password.'] = 'Не получается зайти в вашу учётную запись Diaspora. Пожалуйста, проверьте правильность имени (в формате user@domain.tld) и пароль.';
-$a->strings['Diaspora Export'] = 'Экспорт в Diaspora';
-$a->strings['Information'] = 'Информация';
-$a->strings['Error'] = 'Ошибка';
-$a->strings['Save Settings'] = 'Сохранить настройки';
-$a->strings['Enable Diaspora Post Addon'] = 'Включить аддон Diaspora Post';
-$a->strings['Diaspora handle'] = 'Имя в Diaspora';
-$a->strings['Diaspora password'] = 'Пароль Diaspora';
-$a->strings['Privacy notice: Your Diaspora password will be stored unencrypted to authenticate you with your Diaspora pod. This means your Friendica node administrator can have access to it.'] = 'Предупреждение: Ваш пароль для Diaspora будет сохранён в открытом виде, чтобы производить вход в ваш сервер Diaspora. Это означает, что администратор этого узла Friendica может получить к нему доступ.';
-$a->strings['Post to Diaspora by default'] = 'Отправлять в Diaspora по умолчанию';
-$a->strings['Diaspora settings updated.'] = 'Настройки Diaspora обновлены.';
-$a->strings['Diaspora connector disabled.'] = 'Коннектор Diaspora отключён.';
+;
+$a->strings["Post to Diaspora"] = "Отправить в Diaspora";
+$a->strings["Can't login to your Diaspora account. Please check username and password and ensure you used the complete address (including http...)"] = "Невозможно войти в вашу учетную запись Diaspora. Пожалуйста, проверьте имя пользователя, пароль и убедитесь, что вы ввели полный адрес пода (включая http/https)";
+$a->strings["Diaspora Export"] = "Экспорт в Diaspora";
+$a->strings["Enable Diaspora Post Addon"] = "Включить аддон Diaspora Post";
+$a->strings["Diaspora username"] = "Имя пользователя Diaspora";
+$a->strings["Diaspora password"] = "Пароль Diaspora";
+$a->strings["Diaspora site URL"] = "URL пода Diaspora";
+$a->strings["Post to Diaspora by default"] = "Отправлять в Diaspora по умолчанию";
+$a->strings["Save Settings"] = "Сохранить настройки";
+$a->strings["Diaspora post failed. Queued for retry."] = "Ошибка отправки сообщения в Diaspora. В очереди на еще одну попытку.";
diff --git a/diaspora/lang/sv/messages.po b/diaspora/lang/sv/messages.po
deleted file mode 100644
index b23149c9..00000000
--- a/diaspora/lang/sv/messages.po
+++ /dev/null
@@ -1,102 +0,0 @@
-# ADDON diaspora
-# Copyright (C)
-# This file is distributed under the same license as the Friendica diaspora addon package.
-# 
-# 
-# Translators:
-# Kristoffer Grundström <lovaren@gmail.com>, 2022
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:17-0500\n"
-"PO-Revision-Date: 2022-01-15 23:38+0000\n"
-"Last-Translator: Kristoffer Grundström <lovaren@gmail.com>\n"
-"Language-Team: Swedish (http://www.transifex.com/Friendica/friendica/language/sv/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: sv\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: diaspora.php:44
-msgid "Post to Diaspora"
-msgstr ""
-
-#: diaspora.php:67
-#, php-format
-msgid ""
-"Please remember: You can always be reached from Diaspora with your Friendica"
-" handle <strong>%s</strong>. "
-msgstr ""
-
-#: diaspora.php:68
-msgid ""
-"This connector is only meant if you still want to use your old Diaspora "
-"account for some time. "
-msgstr ""
-
-#: diaspora.php:69
-#, php-format
-msgid ""
-"However, it is preferred that you tell your Diaspora contacts the new handle"
-" <strong>%s</strong> instead."
-msgstr ""
-
-#: diaspora.php:79
-msgid "All aspects"
-msgstr ""
-
-#: diaspora.php:80
-msgid "Public"
-msgstr ""
-
-#: diaspora.php:86
-msgid "Post to aspect:"
-msgstr ""
-
-#: diaspora.php:87
-#, php-format
-msgid "Connected with your Diaspora account <strong>%s</strong>"
-msgstr ""
-
-#: diaspora.php:90
-msgid ""
-"Can't login to your Diaspora account. Please check handle (in the format "
-"user@domain.tld) and password."
-msgstr ""
-
-#: diaspora.php:97
-msgid "Information"
-msgstr ""
-
-#: diaspora.php:98
-msgid "Error"
-msgstr ""
-
-#: diaspora.php:104
-msgid "Enable Diaspora Post Addon"
-msgstr ""
-
-#: diaspora.php:105
-msgid "Diaspora handle"
-msgstr ""
-
-#: diaspora.php:106
-msgid "Diaspora password"
-msgstr "Lösenord för Diaspora"
-
-#: diaspora.php:106
-msgid ""
-"Privacy notice: Your Diaspora password will be stored unencrypted to "
-"authenticate you with your Diaspora pod. This means your Friendica node "
-"administrator can have access to it."
-msgstr ""
-
-#: diaspora.php:108
-msgid "Post to Diaspora by default"
-msgstr ""
-
-#: diaspora.php:113
-msgid "Diaspora Export"
-msgstr ""
diff --git a/diaspora/lang/sv/strings.php b/diaspora/lang/sv/strings.php
deleted file mode 100644
index 0a2ccf31..00000000
--- a/diaspora/lang/sv/strings.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_sv")) {
-function string_plural_select_sv($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Diaspora password'] = 'Lösenord för Diaspora';
diff --git a/diaspora/lang/zh-cn/strings.php b/diaspora/lang/zh-cn/strings.php
index 060506e2..307a634f 100644
--- a/diaspora/lang/zh-cn/strings.php
+++ b/diaspora/lang/zh-cn/strings.php
@@ -2,16 +2,16 @@
 
 if(! function_exists("string_plural_select_zh_cn")) {
 function string_plural_select_zh_cn($n){
-	$n = intval($n);
-	return intval(0);
+	return 0;;
 }}
-$a->strings['Post to Diaspora'] = '发到 Diaspora';
-$a->strings['Can\'t login to your Diaspora account. Please check username and password and ensure you used the complete address (including http...)'] = '无法登录到你的 Diaspora 账户。请检查用户名和密码并确保你用了完整的地址（包括http...）';
-$a->strings['Diaspora Export'] = 'Diaspora 导出';
-$a->strings['Enable Diaspora Post Addon'] = '启用 Diaspora 发文插件';
-$a->strings['Diaspora username'] = 'Diaspora 用户名';
-$a->strings['Diaspora password'] = 'Diaspora 密码';
-$a->strings['Diaspora site URL'] = 'Diaspora 站点 URL';
-$a->strings['Post to Diaspora by default'] = '默认发文到 Diaspora';
-$a->strings['Save Settings'] = '保存设置';
-$a->strings['Diaspora post failed. Queued for retry.'] = 'Diaspora 发文失败。已经放入队列以重试。';
+;
+$a->strings["Post to Diaspora"] = "发到 Diaspora";
+$a->strings["Can't login to your Diaspora account. Please check username and password and ensure you used the complete address (including http...)"] = "无法登录到你的 Diaspora 账户。请检查用户名和密码并确保你用了完整的地址（包括http...）";
+$a->strings["Diaspora Export"] = "Diaspora 导出";
+$a->strings["Enable Diaspora Post Addon"] = "启用 Diaspora 发文插件";
+$a->strings["Diaspora username"] = "Diaspora 用户名";
+$a->strings["Diaspora password"] = "Diaspora 密码";
+$a->strings["Diaspora site URL"] = "Diaspora 站点 URL";
+$a->strings["Post to Diaspora by default"] = "默认发文到 Diaspora";
+$a->strings["Save Settings"] = "保存设置";
+$a->strings["Diaspora post failed. Queued for retry."] = "Diaspora 发文失败。已经放入队列以重试。";
diff --git a/diaspora/templates/connector_settings.tpl b/diaspora/templates/connector_settings.tpl
deleted file mode 100644
index 9f8e270e..00000000
--- a/diaspora/templates/connector_settings.tpl
+++ /dev/null
@@ -1,32 +0,0 @@
-{{if $info}}
-	<div class="panel panel-info">
-		<div class="panel-heading">
-			<h4 class="panel-title">{{$l10n.info_header}}</h4>
-		</div>
-		<p class="panel-body">
-			{{$info nofilter}}
-		</p>
-	</div>
-{{/if}}
-{{if $error}}
-	<div class="panel panel-danger">
-		<div class="panel-heading">
-			<h4 class="panel-title">{{$l10n.error_header}}</h4>
-		</div>
-		<p class="panel-body">
-			{{$error nofilter}}
-		</p>
-	</div>
-{{/if}}
-
-	{{include file="field_checkbox.tpl" field=$enabled}}
-
-{{if $aspect_select}}
-	{{include file="field_select.tpl" field=$aspect_select}}
-
-	{{include file="field_checkbox.tpl" field=$post_by_default}}
-{{else}}
-	{{include file="field_input.tpl" field=$handle}}
-
-	{{include file="field_password.tpl" field=$password}}
-{{/if}}
diff --git a/discourse/README b/discourse/README
deleted file mode 100644
index 338b10bf..00000000
--- a/discourse/README
+++ /dev/null
@@ -1,28 +0,0 @@
-Discourse connector
-===================
-
-The Discourse connectors detects incoming mails from Discourse and
-improves them by fetching the content and user data via API.
-
-Prerequisites
--------------
-The user has to configure the mail interface so that the user's mails
-can be fetched via Friendica. Then the user has to activate the
-mailing list mode in Discourse.
-
-The mailing list mode in Discourse knows two different options:
-1. Get all posts - including your own. This will create duplicates
-   if you post via Friendica.
-2. Don't get your own posts. Then you will missing all your posts
-   that you made directly on Discourse. Since you cannot create
-   a new post via this connector (only comments are possible)
-   this is not a good choice either.
-
-Known problems
---------------
-- You can't create starting posts
-- Either you don't get your own posts you made directly on Discourse
-  or you do get duplicates for every post you made via Friendica.
-- Non public categories are currently only working via some workaround
-  without the API, which most likely will cause some content problems.
-- links to Discourse profiles in the posts are invalid.
diff --git a/discourse/discourse.php b/discourse/discourse.php
deleted file mode 100644
index 298b3f3e..00000000
--- a/discourse/discourse.php
+++ /dev/null
@@ -1,343 +0,0 @@
-<?php
-
-/**
- * Name: Discourse Mail Connector
- * Description: Improves mails from Discourse in mailing list mode
- * Version: 0.1
- * Author: Michael Vogel <http://pirati.ca/profile/heluecht>
- *
- */
-
-use Friendica\App;
-use Friendica\Content\Text\Markdown;
-use Friendica\Core\Hook;
-use Friendica\Core\Logger;
-use Friendica\Core\Protocol;
-use Friendica\Core\Renderer;
-use Friendica\Database\DBA;
-use Friendica\DI;
-use Friendica\Model\Contact;
-use Friendica\Util\DateTimeFormat;
-use Friendica\Util\Strings;
-
-/* Todo:
- * - Obtaining API tokens to be able to read non public posts as well
- * - Handling duplicates (possibly using some non visible marker)
- * - Fetching missing posts
- * - Fetch topic information
- * - Support mail free mode when write tokens are available
- * - Fix incomplete (relative) links (hosts are missing)
-*/
-
-function discourse_install()
-{
-	Hook::register('email_getmessage',        __FILE__, 'discourse_email_getmessage');
-	Hook::register('connector_settings',      __FILE__, 'discourse_settings');
-	Hook::register('connector_settings_post', __FILE__, 'discourse_settings_post');
-}
-
-function discourse_settings(array &$data)
-{
-	if (!DI::userSession()->getLocalUserId()) {
-		return;
-	}
-
-	$enabled = intval(DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'discourse', 'enabled'));
-
-	$t    = Renderer::getMarkupTemplate('connector_settings.tpl', 'addon/discourse/');
-	$html = Renderer::replaceMacros($t, [
-		'$enabled' => ['enabled', DI::l10n()->t('Enable processing of Discourse mailing list mails'), $enabled, DI::l10n()->t('If enabled, incoming mails from Discourse will be improved so they look much better. To make it work, you have to configure the e-mail settings in Friendica. You also have to enable the mailing list mode in Discourse. Then you have to add the Discourse mail account as contact.')],
-	]);
-
-	$data = [
-		'connector' => 'discourse',
-		'title'     => DI::l10n()->t('Discourse'),
-		'image'     => 'images/discourse.png',
-		'enabled'   => $enabled,
-		'html'      => $html,
-	];
-}
-
-function discourse_settings_post()
-{
-	if (!DI::userSession()->getLocalUserId() || empty($_POST['discourse-submit'])) {
-                return;
-        }
-
-	DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'discourse', 'enabled', intval($_POST['enabled']));
-}
-
-function discourse_email_getmessage(&$message)
-{
-	if (empty($message['item']['uid'])) {
-		return;
-	}
-
-	if (!DI::pConfig()->get($message['item']['uid'], 'discourse', 'enabled')) {
-		return;
-	}
-
-	// We do assume that all Discourse servers are running with SSL
-	if (preg_match('=topic/(.*\d)/(.*\d)@(.*)=', $message['item']['uri'], $matches) &&
-		discourse_fetch_post_from_api($message, $matches[2], $matches[3])) {
-		Logger::info('Fetched comment via API (message-id mode)', ['host' => $matches[3], 'topic' => $matches[1], 'post' => $matches[2]]);
-		return;
-	}
-
-	if (preg_match('=topic/(.*\d)@(.*)=', $message['item']['uri'], $matches) &&
-		discourse_fetch_topic_from_api($message, 'https://' . $matches[2], $matches[1], 1)) {
-		Logger::info('Fetched starting post via API (message-id mode)', ['host' => $matches[2], 'topic' => $matches[1]]);
-		return;
-	}
-
-	// Search in the text part for the link to the discourse entry and the text body
-	if (!empty($message['text'])) {
-		$message = discourse_get_text($message);
-	}
-
-	if (empty($message['item']['plink']) || !preg_match('=(http.*)/t/.*/(.*\d)/(.*\d)=', $message['item']['plink'], $matches)) {
-		Logger::info('This is no Discourse post');
-		return;
-	}
-
-	if (discourse_fetch_topic_from_api($message, $matches[1], $matches[2], $matches[3])) {
-		Logger::info('Fetched post via API (plink mode)', ['host' => $matches[1], 'topic' => $matches[2], 'id' => $matches[3]]);
-		return;
-	}
-
-	Logger::info('Fallback mode', ['plink' => $message['item']['plink']]);
-	// Search in the HTML part for the discourse entry and the author profile
-	if (!empty($message['html'])) {
-		$message = discourse_get_html($message);
-	}
-
-	// Remove the title on comments, they don't serve any purpose there
-	if ($message['item']['thr-parent'] != $message['item']['uri']) {
-		unset($message['item']['title']);
-	}
-}
-
-function discourse_fetch_post($host, $topic, $pid)
-{
-	$url = $host . '/t/' . $topic . '/' . $pid . '.json';
-	$curlResult = DI::httpClient()->get($url);
-	if (!$curlResult->isSuccess()) {
-		Logger::info('No success', ['url' => $url]);
-		return false;
-	}
-
-	$raw = $curlResult->getBodyString();
-	$data = json_decode($raw, true);
-	$posts = $data['post_stream']['posts'];
-	foreach($posts as $post) {
-		if ($post['post_number'] != $pid) {
-			/// @todo Possibly fetch missing posts here
-			continue;
-		}
-		Logger::info('Got post data from topic', $post);
-		return $post;
-	}
-
-	Logger::info('Post not found', ['host' => $host, 'topic' => $topic, 'pid' => $pid]);
-	return false;
-}
-
-function discourse_fetch_topic_from_api(&$message, $host, $topic, $pid)
-{
-	$post = discourse_fetch_post($host, $topic, $pid);
-	if (empty($post)) {
-		return false;
-	}
-
-	$message = discourse_process_post($message, $post, $host);
-	return true;
-}
-
-function discourse_fetch_post_from_api(&$message, $post, $host)
-{
-	$hostaddr = 'https://' . $host;
-	$url = $hostaddr . '/posts/' . $post . '.json';
-	$curlResult = DI::httpClient()->get($url);
-	if (!$curlResult->isSuccess()) {
-		return false;
-	}
-
-	$raw = $curlResult->getBodyString();
-	$data = json_decode($raw, true);
-	if (empty($data)) {
-		return false;
-	}
-
-	$message = discourse_process_post($message, $data, $hostaddr);
-
-	Logger::info('Got API data', $message);
-	return true;
-}
-
-function discourse_get_user($post, $hostaddr)
-{
-	$host = parse_url($hostaddr, PHP_URL_HOST);
-
-	// Currently unused contact fields:
-	// - display_username
-	// - user_id
-
-	$contact = [];
-	$contact['uid'] = 0;
-	$contact['network'] = Protocol::DISCOURSE;
-	$contact['name'] = $contact['nick'] = $post['username'];
-	if (!empty($post['name'])) {
-		$contact['name'] = $post['name'];
-	}
-
-	$contact['about'] = $post['user_title'];
-
-	if (parse_url($post['avatar_template'], PHP_URL_SCHEME)) {
-		$contact['photo'] = str_replace('{size}', '300', $post['avatar_template']);
-	} else {
-		$contact['photo'] = $hostaddr . str_replace('{size}', '300', $post['avatar_template']);
-	}
-
-	$contact['addr'] = $contact['nick'] . '@' . $host;
-	$contact['contact-type'] = Contact::TYPE_PERSON;
-	$contact['url'] = $hostaddr . '/u/' . $contact['nick'];
-	$contact['nurl'] = Strings::normaliseLink($contact['url']);
-	$contact['baseurl'] = $hostaddr;
-	Logger::info('Contact', $contact);
-	$contact['id'] = Contact::getIdForURL($contact['url'], 0, false, $contact);
-        if (!empty($contact['id'])) {
-		$avatar = $contact['photo'];
-		unset($contact['photo']);
-		DBA::update('contact', $contact, ['id' => $contact['id']]);
-		Contact::updateAvatar($contact['id'], $avatar);
-		$contact['photo'] = $avatar;
-	}
-
-	return $contact;
-}
-
-function discourse_process_post($message, $post, $hostaddr)
-{
-	$host = parse_url($hostaddr, PHP_URL_HOST);
-
-	$message['html'] = $post['cooked'];
-
-	$contact = discourse_get_user($post, $hostaddr);
-	$message['item']['author-id'] = $contact['id'];
-	$message['item']['author-link'] = $contact['url'];
-	$message['item']['author-name'] = $contact['name'];
-	$message['item']['author-avatar'] = $contact['photo'];
-	$message['item']['created'] = DateTimeFormat::utc($post['created_at']);
-	$message['item']['plink'] = $hostaddr . '/t/' . $post['topic_slug'] . '/' . $post['topic_id'] . '/' . $post['post_number'];
-
-	if ($post['post_number'] == 1) {
-		$message['item']['parent-uri'] = $message['item']['uri'] = 'topic/' . $post['topic_id'] . '@' . $host;
-
-		// Remove the Discourse forum name from the subject
-		$pattern = '=\[.*\].*\s(\[.*\].*)=';
-		if (preg_match($pattern, $message['item']['title'])) {
-			$message['item']['title'] = preg_replace($pattern, '$1', $message['item']['title']);
-		}
-		/// @ToDo Fetch thread information
-	} else {
-		$message['item']['uri'] = 'topic/' . $post['topic_id'] . '/' . $post['id'] . '@' . $host;
-		unset($message['item']['title']);
-		if (empty($post['reply_to_post_number']) || $post['reply_to_post_number'] == 1) {
-			$message['item']['parent-uri'] = 'topic/' . $post['topic_id'] . '@' . $host;
-		} else {
-			$reply = discourse_fetch_post($hostaddr, $post['topic_id'], $post['reply_to_post_number']);
-			$message['item']['parent-uri'] = 'topic/' . $post['topic_id'] . '/' . $reply['id'] . '@' . $host;
-		}
-	}
-
-	return $message;
-}
-
-function discourse_get_html($message)
-{
-	$doc = new DOMDocument();
-	$doc2 = new DOMDocument();
-	$doc->preserveWhiteSpace = false;
-
-	$html = mb_convert_encoding($message['html'], 'HTML-ENTITIES', "UTF-8");
-	@$doc->loadHTML($html, LIBXML_HTML_NODEFDTD);
-
-	$xpath = new DomXPath($doc);
-
-	// Fetch the first 'div' before the 'hr' - hopefully this fits for all systems
-	$result = $xpath->query("//hr//preceding::div[1]");
-	$div = $doc2->importNode($result->item(0), true);
-	$doc2->appendChild($div);
-	$message['html'] = $doc2->saveHTML();
-	Logger::info('Found html body', ['html' => $message['html']]);
-
-	$profile = discourse_get_profile($xpath);
-	if (!empty($profile['url'])) {
-		Logger::info('Found profile', $profile);
-		$message['item']['author-id'] = Contact::getIdForURL($profile['url'], 0, false, $profile);
-		$message['item']['author-link'] = $profile['url'];
-		$message['item']['author-name'] = $profile['name'];
-		$message['item']['author-avatar'] = $profile['photo'];
-	}
-
-	return $message;
-}
-
-function discourse_get_text($message)
-{
-	$text = $message['text'];
-	$text = str_replace("\r", '', $text);
-	$pos = strpos($text, "\n---\n");
-	if ($pos == 0) {
-		Logger::info('No separator found', ['text' => $text]);
-		return $message;
-	}
-
-	$message['text'] = trim(substr($text, 0, $pos));
-
-	Logger::info('Found text body', ['text' => $message['text']]);
-
-	$message['text'] = Markdown::toBBCode($message['text']);
-
-	$text = substr($text, $pos);
-	Logger::info('Found footer', ['text' => $text]);
-	if (preg_match('=\((http.*/t/.*/.*\d/.*\d)\)=', $text, $link)) {
-		$message['item']['plink'] = $link[1];
-		Logger::info('Found plink', ['plink' => $message['item']['plink']]);
-	}
-	return $message;
-}
-
-function discourse_get_profile($xpath)
-{
-	$profile = [];
-	$list = $xpath->query("//td//following::img");
-	foreach ($list as $node) {
-		$attr = [];
-		foreach ($node->attributes as $attribute) {
-			$attr[$attribute->name] = $attribute->value;
-		}
-
-		if (!empty($attr['src']) && !empty($attr['title'])
-			&& !empty($attr['width']) && !empty($attr['height'])
-			&& ($attr['width'] == $attr['height'])) {
-			$profile = ['photo' => $attr['src'], 'name' => $attr['title']];
-			break;
-		}
-	}
-
-	$list = $xpath->query("//td//following::a");
-	foreach ($list as $node) {
-		if (!empty(trim($node->textContent)) && $node->attributes->length) {
-			$attr = [];
-			foreach ($node->attributes as $attribute) {
-				$attr[$attribute->name] = $attribute->value;
-			}
-			if (!empty($attr['href']) && (strpos($attr['href'], '/' . $profile['name']))) {
-				$profile['url'] = $attr['href'];
-				break;
-			}
-		}
-	}
-	return $profile;
-}
diff --git a/discourse/lang/C/messages.po b/discourse/lang/C/messages.po
deleted file mode 100644
index ba0809ee..00000000
--- a/discourse/lang/C/messages.po
+++ /dev/null
@@ -1,34 +0,0 @@
-# ADDON discourse
-# Copyright (C) 
-# This file is distributed under the same license as the Friendica discourse addon package.
-# 
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:17-0500\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: discourse.php:49
-msgid "Enable processing of Discourse mailing list mails"
-msgstr ""
-
-#: discourse.php:49
-msgid ""
-"If enabled, incoming mails from Discourse will be improved so they look much "
-"better. To make it work, you have to configure the e-mail settings in "
-"Friendica. You also have to enable the mailing list mode in Discourse. Then "
-"you have to add the Discourse mail account as contact."
-msgstr ""
-
-#: discourse.php:54
-msgid "Discourse"
-msgstr ""
diff --git a/discourse/templates/connector_settings.tpl b/discourse/templates/connector_settings.tpl
deleted file mode 100644
index 2f3f4ce7..00000000
--- a/discourse/templates/connector_settings.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{{include file="field_checkbox.tpl" field=$enabled}}
diff --git a/dwpost/dwpost.css b/dwpost/dwpost.css
new file mode 100644
index 00000000..3b0ee32a
--- /dev/null
+++ b/dwpost/dwpost.css
@@ -0,0 +1,15 @@
+
+#dwpost-enable-label, #dwpost-username-label, #dwpost-password-label, #dwpost-bydefault-label {
+float: left;
+width: 200px;
+margin-top: 10px;
+}
+
+#dwpost-checkbox, #dwpost-username, #dwpost-password, #dwpost-bydefault {
+float: left;
+margin-top: 10px;
+}
+
+#dwpost-submit {
+margin-top: 15px;
+}
diff --git a/dwpost/dwpost.php b/dwpost/dwpost.php
index 4ad5021f..ebba0232 100644
--- a/dwpost/dwpost.php
+++ b/dwpost/dwpost.php
@@ -11,13 +11,12 @@
 use Friendica\App;
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Hook;
+use Friendica\Core\L10n;
 use Friendica\Core\Logger;
-use Friendica\Core\Renderer;
-use Friendica\DI;
-use Friendica\Model\Post;
-use Friendica\Model\Tag;
-use Friendica\Model\User;
+use Friendica\Core\PConfig;
+use Friendica\Database\DBA;
 use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Network;
 use Friendica\Util\XML;
 
 function dwpost_install()
@@ -29,71 +28,107 @@ function dwpost_install()
 	Hook::register('connector_settings_post', 'addon/dwpost/dwpost.php', 'dwpost_settings_post');
 }
 
-function dwpost_jot_nets(array &$jotnets_fields)
+function dwpost_uninstall()
 {
-	if (!DI::userSession()->getLocalUserId()) {
+	Hook::unregister('post_local',              'addon/dwpost/dwpost.php', 'dwpost_post_local');
+	Hook::unregister('notifier_normal',         'addon/dwpost/dwpost.php', 'dwpost_send');
+	Hook::unregister('jot_networks',            'addon/dwpost/dwpost.php', 'dwpost_jot_nets');
+	Hook::unregister('connector_settings',      'addon/dwpost/dwpost.php', 'dwpost_settings');
+	Hook::unregister('connector_settings_post', 'addon/dwpost/dwpost.php', 'dwpost_settings_post');
+}
+
+function dwpost_jot_nets(App $a, array &$jotnets_fields)
+{
+	if (!local_user()) {
 		return;
 	}
 
-	if (DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'dwpost', 'post')) {
+	if (PConfig::get(local_user(), 'dwpost', 'post')) {
 		$jotnets_fields[] = [
 			'type' => 'checkbox',
 			'field' => [
 				'dwpost_enable',
-				DI::l10n()->t('Post to Dreamwidth'),
-				DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'dwpost', 'post_by_default')
+				L10n::t('Post to Dreamwidth'),
+				PConfig::get(local_user(), 'dwpost', 'post_by_default')
 			]
 		];
 	}
 }
 
 
-function dwpost_settings(array &$data)
+function dwpost_settings(App $a, &$s)
 {
-	if (!DI::userSession()->getLocalUserId()) {
+	if (!local_user()) {
 		return;
 	}
 
-	$enabled     = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'dwpost', 'post', false);
-	$dw_username = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'dwpost', 'dw_username');
-	$def_enabled = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'dwpost', 'post_by_default');
+	/* Add our stylesheet to the page so we can make our settings look nice */
+	$a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->getBaseURL() . '/addon/dwpost/dwpost.css' . '" media="all" />' . "\r\n";
 
-	$t    = Renderer::getMarkupTemplate('connector_settings.tpl', 'addon/dwpost/');
-	$html = Renderer::replaceMacros($t, [
-		'$enabled'   => ['dwpost', DI::l10n()->t('Enable Dreamwidth Post Addon'), $enabled],
-		'$username'  => ['dw_username', DI::l10n()->t('Dreamwidth username'), $dw_username],
-		'$password'  => ['dw_password', DI::l10n()->t('Dreamwidth password')],
-		'$bydefault' => ['dw_bydefault', DI::l10n()->t('Post to Dreamwidth by default'), $def_enabled],
-	]);
+	/* Get the current state of our config variables */
+	$enabled = PConfig::get(local_user(), 'dwpost', 'post');
 
-	$data = [
-		'connector' => 'dwpost',
-		'title'     => DI::l10n()->t('Dreamwidth Export'),
-		'image'     => 'images/dreamwidth.png',
-		'enabled'   => $enabled,
-		'html'      => $html,
-	];
+	$checked = (($enabled) ? ' checked="checked" ' : '');
+
+	$def_enabled = PConfig::get(local_user(), 'dwpost', 'post_by_default');
+
+	$def_checked = (($def_enabled) ? ' checked="checked" ' : '');
+
+	$dw_username = PConfig::get(local_user(), 'dwpost', 'dw_username');
+	$dw_password = PConfig::get(local_user(), 'dwpost', 'dw_password');
+
+	/* Add some HTML to the existing form */
+	$s .= '<span id="settings_dwpost_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_dwpost_expanded\'); openClose(\'settings_dwpost_inflated\');">';
+	$s .= '<img class="connector" src="images/dreamwidth.png" /><h3 class="connector">'. L10n::t("Dreamwidth Export").'</h3>';
+	$s .= '</span>';
+	$s .= '<div id="settings_dwpost_expanded" class="settings-block" style="display: none;">';
+	$s .= '<span class="fakelink" onclick="openClose(\'settings_dwpost_expanded\'); openClose(\'settings_dwpost_inflated\');">';
+	$s .= '<img class="connector" src="images/dreamwidth.png" /><h3 class="connector">'. L10n::t("Dreamwidth Export").'</h3>';
+	$s .= '</span>';
+
+	$s .= '<div id="dwpost-enable-wrapper">';
+	$s .= '<label id="dwpost-enable-label" for="dwpost-checkbox">' . L10n::t('Enable dreamwidth Post Addon') . '</label>';
+	$s .= '<input id="dwpost-checkbox" type="checkbox" name="dwpost" value="1" ' . $checked . '/>';
+	$s .= '</div><div class="clear"></div>';
+
+	$s .= '<div id="dwpost-username-wrapper">';
+	$s .= '<label id="dwpost-username-label" for="dwpost-username">' . L10n::t('dreamwidth username') . '</label>';
+	$s .= '<input id="dwpost-username" type="text" name="dw_username" value="' . $dw_username . '" />';
+	$s .= '</div><div class="clear"></div>';
+
+	$s .= '<div id="dwpost-password-wrapper">';
+	$s .= '<label id="dwpost-password-label" for="dwpost-password">' . L10n::t('dreamwidth password') . '</label>';
+	$s .= '<input id="dwpost-password" type="password" name="dw_password" value="' . $dw_password . '" />';
+	$s .= '</div><div class="clear"></div>';
+
+	$s .= '<div id="dwpost-bydefault-wrapper">';
+	$s .= '<label id="dwpost-bydefault-label" for="dwpost-bydefault">' . L10n::t('Post to dreamwidth by default') . '</label>';
+	$s .= '<input id="dwpost-bydefault" type="checkbox" name="dw_bydefault" value="1" ' . $def_checked . '/>';
+	$s .= '</div><div class="clear"></div>';
+
+	/* provide a submit button */
+	$s .= '<div class="settings-submit-wrapper" ><input type="submit" id="dwpost-submit" name="dwpost-submit" class="settings-submit" value="' . L10n::t('Save Settings') . '" /></div></div>';
 }
 
 
-function dwpost_settings_post(array &$b)
+function dwpost_settings_post(App $a, array &$b)
 {
 	if (!empty($_POST['dwpost-submit'])) {
-		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'dwpost', 'post',            intval($_POST['dwpost']));
-		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'dwpost', 'post_by_default', intval($_POST['dw_bydefault']));
-		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'dwpost', 'dw_username',     trim($_POST['dw_username']));
-		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'dwpost', 'dw_password',     trim($_POST['dw_password']));
+		PConfig::set(local_user(), 'dwpost', 'post',            intval($_POST['dwpost']));
+		PConfig::set(local_user(), 'dwpost', 'post_by_default', intval($_POST['dw_bydefault']));
+		PConfig::set(local_user(), 'dwpost', 'dw_username',     trim($_POST['dw_username']));
+		PConfig::set(local_user(), 'dwpost', 'dw_password',     trim($_POST['dw_password']));
 	}
 }
 
-function dwpost_post_local(array &$b)
+function dwpost_post_local(App $a, array &$b)
 {
 	// This can probably be changed to allow editing by pointing to a different API endpoint
 	if ($b['edit']) {
 		return;
 	}
 
-	if ((!DI::userSession()->getLocalUserId()) || (DI::userSession()->getLocalUserId() != $b['uid'])) {
+	if ((!local_user()) || (local_user() != $b['uid'])) {
 		return;
 	}
 
@@ -101,11 +136,11 @@ function dwpost_post_local(array &$b)
 		return;
 	}
 
-	$dw_post = intval(DI::pConfig()->get(DI::userSession()->getLocalUserId(),'dwpost','post'));
+	$dw_post = intval(PConfig::get(local_user(),'dwpost','post'));
 
 	$dw_enable = (($dw_post && !empty($_REQUEST['dwpost_enable'])) ? intval($_REQUEST['dwpost_enable']) : 0);
 
-	if ($b['api_source'] && intval(DI::pConfig()->get(DI::userSession()->getLocalUserId(),'dwpost','post_by_default'))) {
+	if ($b['api_source'] && intval(PConfig::get(local_user(),'dwpost','post_by_default'))) {
 		$dw_enable = 1;
 	}
 
@@ -120,13 +155,13 @@ function dwpost_post_local(array &$b)
 	$b['postopts'] .= 'dwpost';
 }
 
-function dwpost_send(array &$b)
+function dwpost_send(App $a, array &$b)
 {
 	if ($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited'])) {
 		return;
 	}
 
-	if (strpos($b['postopts'] ?? '', 'dwpost') === false) {
+	if (!strstr($b['postopts'],'dwpost')) {
 		return;
 	}
 
@@ -134,26 +169,30 @@ function dwpost_send(array &$b)
 		return;
 	}
 
-	$b['body'] = Post\Media::addAttachmentsToBody($b['uri-id'], DI::contentItem()->addSharedPost($b));
-
 	/*
 	 * dreamwidth post in the LJ user's timezone.
 	 * Hopefully the person's Friendica account
 	 * will be set to the same thing.
 	 */
+	$tz = 'UTC';
 
-	$user = User::getById($b['uid']);
-	$tz = $user['timezone'] ?: 'UTC';
+	$x = q("SELECT `timezone` FROM `user` WHERE `uid` = %d LIMIT 1",
+		intval($b['uid'])
+	);
 
-	$dw_username = DI::pConfig()->get($b['uid'],'dwpost','dw_username');
-	$dw_password = DI::pConfig()->get($b['uid'],'dwpost','dw_password');
+	if (DBA::isResult($x) && !empty($x[0]['timezone'])) {
+		$tz = $x[0]['timezone'];
+	}
+
+	$dw_username = PConfig::get($b['uid'],'dwpost','dw_username');
+	$dw_password = PConfig::get($b['uid'],'dwpost','dw_password');
 	$dw_blog = 'http://www.dreamwidth.org/interface/xmlrpc';
 
 	if ($dw_username && $dw_password && $dw_blog) {
 		$title = $b['title'];
-		$post = BBCode::convertForUriId($b['uri-id'], $b['body'], BBCode::CONNECTORS);
+		$post = BBCode::convert($b['body']);
 		$post = XML::escape($post);
-		$tags = Tag::getCSVByURIId($b['uri-id'], [Tag::HASHTAG]);
+		$tags = dwpost_get_tags($b['tag']);
 
 		$date = DateTimeFormat::convert($b['created'], $tz);
 		$year = intval(substr($date,0,4));
@@ -189,12 +228,21 @@ function dwpost_send(array &$b)
 
 EOT;
 
-		Logger::debug('dwpost: data: ' . $xml);
+		Logger::log('dwpost: data: ' . $xml, Logger::DATA);
 
 		if ($dw_blog !== 'test') {
-			$x = DI::httpClient()->post($dw_blog, $xml, ['Content-Type' => 'text/xml'])->getBodyString();
+			$x = Network::post($dw_blog, $xml, ["Content-Type: text/xml"])->getBody();
 		}
 
-		Logger::info('posted to dreamwidth: ' . ($x) ? $x : '');
+		Logger::log('posted to dreamwidth: ' . ($x) ? $x : '', Logger::DEBUG);
 	}
 }
+
+function dwpost_get_tags($post)
+{
+	preg_match_all("/\]([^\[#]+)\[/", $post, $matches);
+
+	$tags = implode(', ', $matches[1]);
+
+	return $tags;
+}
diff --git a/dwpost/lang/C/messages.po b/dwpost/lang/C/messages.po
index 0b27a70c..c81e9f0f 100644
--- a/dwpost/lang/C/messages.po
+++ b/dwpost/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:17-0500\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,26 +17,30 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: dwpost.php:43
+#: dwpost.php:39
 msgid "Post to Dreamwidth"
 msgstr ""
 
-#: dwpost.php:63
-msgid "Enable Dreamwidth Post Addon"
+#: dwpost.php:70
+msgid "Dreamwidth Post Settings"
 msgstr ""
 
-#: dwpost.php:64
-msgid "Dreamwidth username"
+#: dwpost.php:72
+msgid "Enable dreamwidth Post Addon"
 msgstr ""
 
-#: dwpost.php:65
-msgid "Dreamwidth password"
+#: dwpost.php:77
+msgid "dreamwidth username"
 msgstr ""
 
-#: dwpost.php:66
-msgid "Post to Dreamwidth by default"
+#: dwpost.php:82
+msgid "dreamwidth password"
 msgstr ""
 
-#: dwpost.php:71
-msgid "Dreamwidth Export"
+#: dwpost.php:87
+msgid "Post to dreamwidth by default"
+msgstr ""
+
+#: dwpost.php:93
+msgid "Submit"
 msgstr ""
diff --git a/dwpost/lang/ar/messages.po b/dwpost/lang/ar/messages.po
deleted file mode 100644
index 12d05554..00000000
--- a/dwpost/lang/ar/messages.po
+++ /dev/null
@@ -1,49 +0,0 @@
-# ADDON dwpost
-# Copyright (C)
-# This file is distributed under the same license as the Friendica dwpost addon package.
-# 
-# 
-# Translators:
-# abidin toumi <abidin24@tutanota.com>, 2021
-# Farida Khalaf <faridakhalaf@hotmail.com>, 2021
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2021-10-29 10:04+0000\n"
-"Last-Translator: abidin toumi <abidin24@tutanota.com>\n"
-"Language-Team: Arabic (http://www.transifex.com/Friendica/friendica/language/ar/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ar\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-
-#: dwpost.php:41
-msgid "Post to Dreamwidth"
-msgstr "انشر على دريمويدز"
-
-#: dwpost.php:72 dwpost.php:76
-msgid "Dreamwidth Export"
-msgstr " تصدير دريمويدز"
-
-#: dwpost.php:80
-msgid "Enable dreamwidth Post Addon"
-msgstr "فعل إضافة مشاركة دريمويدز "
-
-#: dwpost.php:85
-msgid "dreamwidth username"
-msgstr " اسم مستخدم دريمويدز"
-
-#: dwpost.php:90
-msgid "dreamwidth password"
-msgstr "كلمة مرور دريمويدز"
-
-#: dwpost.php:95
-msgid "Post to dreamwidth by default"
-msgstr " شارك على دريمويدز افتراضيا"
-
-#: dwpost.php:100
-msgid "Save Settings"
-msgstr "احفظ الإعدادات"
diff --git a/dwpost/lang/ar/strings.php b/dwpost/lang/ar/strings.php
deleted file mode 100644
index ef2eb30c..00000000
--- a/dwpost/lang/ar/strings.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_ar")) {
-function string_plural_select_ar($n){
-	$n = intval($n);
-	if ($n==0) { return 0; } else if ($n==1) { return 1; } else if ($n==2) { return 2; } else if ($n%100>=3 && $n%100<=10) { return 3; } else if ($n%100>=11 && $n%100<=99) { return 4; } else  { return 5; }
-}}
-$a->strings['Post to Dreamwidth'] = 'انشر على دريمويدز';
-$a->strings['Dreamwidth Export'] = ' تصدير دريمويدز';
-$a->strings['Enable dreamwidth Post Addon'] = 'فعل إضافة مشاركة دريمويدز ';
-$a->strings['dreamwidth username'] = ' اسم مستخدم دريمويدز';
-$a->strings['dreamwidth password'] = 'كلمة مرور دريمويدز';
-$a->strings['Post to dreamwidth by default'] = ' شارك على دريمويدز افتراضيا';
-$a->strings['Save Settings'] = 'احفظ الإعدادات';
diff --git a/dwpost/lang/ca/strings.php b/dwpost/lang/ca/strings.php
index 58d2bde9..cd5c1e1a 100644
--- a/dwpost/lang/ca/strings.php
+++ b/dwpost/lang/ca/strings.php
@@ -3,12 +3,13 @@
 if(! function_exists("string_plural_select_ca")) {
 function string_plural_select_ca($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Post to Dreamwidth'] = 'Publica a Dreamwidth';
-$a->strings['Dreamwidth Post Settings'] = 'Configuració de la publicació de Dreamwidth';
-$a->strings['Enable dreamwidth Post Addon'] = 'Habilita Addon Post Post';
-$a->strings['dreamwidth username'] = 'nom d\'usuari de dreamwidth';
-$a->strings['dreamwidth password'] = 'contrasenya de dreamwidth';
-$a->strings['Post to dreamwidth by default'] = 'Publica l\'amplada de somni de manera predeterminada';
-$a->strings['Submit'] = 'sotmetre\'s';
+;
+$a->strings["Post to Dreamwidth"] = "Publica a Dreamwidth";
+$a->strings["Dreamwidth Post Settings"] = "Configuració de la publicació de Dreamwidth";
+$a->strings["Enable dreamwidth Post Addon"] = "Habilita Addon Post Post";
+$a->strings["dreamwidth username"] = "nom d'usuari de dreamwidth";
+$a->strings["dreamwidth password"] = "contrasenya de dreamwidth";
+$a->strings["Post to dreamwidth by default"] = "Publica l'amplada de somni de manera predeterminada";
+$a->strings["Submit"] = "sotmetre's";
diff --git a/dwpost/lang/cs/messages.po b/dwpost/lang/cs/messages.po
index fc32a371..e5a9b25d 100644
--- a/dwpost/lang/cs/messages.po
+++ b/dwpost/lang/cs/messages.po
@@ -10,36 +10,40 @@ msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:17-0500\n"
-"PO-Revision-Date: 2014-06-22 11:41+0000\n"
-"Last-Translator: Aditoo, 2018\n"
-"Language-Team: Czech (http://app.transifex.com/Friendica/friendica/language/cs/)\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2018-06-14 10:13+0000\n"
+"Last-Translator: Aditoo\n"
+"Language-Team: Czech (http://www.transifex.com/Friendica/friendica/language/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: cs\n"
 "Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
 
-#: dwpost.php:43
+#: dwpost.php:39
 msgid "Post to Dreamwidth"
-msgstr "Odeslat na Dreamwidth"
+msgstr "Poslat na Dreamwidth"
 
-#: dwpost.php:63
-msgid "Enable Dreamwidth Post Addon"
-msgstr ""
+#: dwpost.php:70
+msgid "Dreamwidth Post Settings"
+msgstr "Nastavení Dreamwidth Post"
 
-#: dwpost.php:64
-msgid "Dreamwidth username"
-msgstr ""
+#: dwpost.php:72
+msgid "Enable dreamwidth Post Addon"
+msgstr "Povolit doplněk Dreamwidth Post"
 
-#: dwpost.php:65
-msgid "Dreamwidth password"
-msgstr ""
+#: dwpost.php:77
+msgid "dreamwidth username"
+msgstr "dreamwidth uživatelské jméno"
 
-#: dwpost.php:66
-msgid "Post to Dreamwidth by default"
-msgstr ""
+#: dwpost.php:82
+msgid "dreamwidth password"
+msgstr "dreamwidth heslo"
 
-#: dwpost.php:71
-msgid "Dreamwidth Export"
-msgstr ""
+#: dwpost.php:87
+msgid "Post to dreamwidth by default"
+msgstr "Ve výchozím stavu posílat na dreamwidth"
+
+#: dwpost.php:93
+msgid "Submit"
+msgstr "Odeslat"
diff --git a/dwpost/lang/cs/strings.php b/dwpost/lang/cs/strings.php
index 7378f061..0c1f68a4 100644
--- a/dwpost/lang/cs/strings.php
+++ b/dwpost/lang/cs/strings.php
@@ -3,6 +3,13 @@
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
 	$n = intval($n);
-	if (($n == 1 && $n % 1 == 0)) { return 0; } else if (($n >= 2 && $n <= 4 && $n % 1 == 0)) { return 1; } else if (($n % 1 != 0 )) { return 2; } else  { return 3; }
+	return ($n == 1 && $n % 1 == 0) ? 0 : ($n >= 2 && $n <= 4 && $n % 1 == 0) ? 1: ($n % 1 != 0 ) ? 2 : 3;;
 }}
-$a->strings['Post to Dreamwidth'] = 'Odeslat na Dreamwidth';
+;
+$a->strings["Post to Dreamwidth"] = "Poslat na Dreamwidth";
+$a->strings["Dreamwidth Post Settings"] = "Nastavení Dreamwidth Post";
+$a->strings["Enable dreamwidth Post Addon"] = "Povolit doplněk Dreamwidth Post";
+$a->strings["dreamwidth username"] = "dreamwidth uživatelské jméno";
+$a->strings["dreamwidth password"] = "dreamwidth heslo";
+$a->strings["Post to dreamwidth by default"] = "Ve výchozím stavu posílat na dreamwidth";
+$a->strings["Submit"] = "Odeslat";
diff --git a/dwpost/lang/da-dk/messages.po b/dwpost/lang/da-dk/messages.po
deleted file mode 100644
index e220f28f..00000000
--- a/dwpost/lang/da-dk/messages.po
+++ /dev/null
@@ -1,43 +0,0 @@
-# ADDON dwpost
-# Copyright (C)
-# This file is distributed under the same license as the Friendica dwpost addon package.
-# 
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:17-0500\n"
-"PO-Revision-Date: 2014-06-22 11:41+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Danish (Denmark) (http://www.transifex.com/Friendica/friendica/language/da_DK/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: da_DK\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: dwpost.php:43
-msgid "Post to Dreamwidth"
-msgstr ""
-
-#: dwpost.php:63
-msgid "Enable Dreamwidth Post Addon"
-msgstr ""
-
-#: dwpost.php:64
-msgid "Dreamwidth username"
-msgstr ""
-
-#: dwpost.php:65
-msgid "Dreamwidth password"
-msgstr ""
-
-#: dwpost.php:66
-msgid "Post to Dreamwidth by default"
-msgstr ""
-
-#: dwpost.php:71
-msgid "Dreamwidth Export"
-msgstr ""
diff --git a/dwpost/lang/da-dk/strings.php b/dwpost/lang/da-dk/strings.php
deleted file mode 100644
index 09554750..00000000
--- a/dwpost/lang/da-dk/strings.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_da_dk")) {
-function string_plural_select_da_dk($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
diff --git a/dwpost/lang/de/messages.po b/dwpost/lang/de/messages.po
index adfa56b1..07e6beb6 100644
--- a/dwpost/lang/de/messages.po
+++ b/dwpost/lang/de/messages.po
@@ -4,44 +4,46 @@
 # 
 # 
 # Translators:
-# Andreas H., 2014
-# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2014
-# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2018,2021-2022
-# Ulf Rompe <transifex.com@rompe.org>, 2019
+# Abrax <webmaster@a-zwenkau.de>, 2014
+# bavatar <tobias.diekershoff@gmx.net>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:17-0500\n"
-"PO-Revision-Date: 2014-06-22 11:41+0000\n"
-"Last-Translator: Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2018,2021-2022\n"
-"Language-Team: German (http://app.transifex.com/Friendica/friendica/language/de/)\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2014-10-15 12:18+0000\n"
+"Last-Translator: Abrax <webmaster@a-zwenkau.de>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/friendica/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: dwpost.php:43
+#: dwpost.php:39
 msgid "Post to Dreamwidth"
 msgstr "In Dreamwidth veröffentlichen"
 
-#: dwpost.php:63
-msgid "Enable Dreamwidth Post Addon"
-msgstr "Dreamwidth-Post-Addon aktivieren"
+#: dwpost.php:70
+msgid "Dreamwidth Post Settings"
+msgstr "Dreamwidth Veröffentlichungs-Einstellungen"
 
-#: dwpost.php:64
-msgid "Dreamwidth username"
-msgstr "Dreamwidth-Benutzername"
+#: dwpost.php:72
+msgid "Enable dreamwidth Post Addon"
+msgstr "Dreamwidth Post Addon aktivieren"
 
-#: dwpost.php:65
-msgid "Dreamwidth password"
-msgstr "Dreamwidth-Passwort"
+#: dwpost.php:77
+msgid "dreamwidth username"
+msgstr "Dreamwidth Benutzername"
 
-#: dwpost.php:66
-msgid "Post to Dreamwidth by default"
+#: dwpost.php:82
+msgid "dreamwidth password"
+msgstr "Dreamwidth Passwort"
+
+#: dwpost.php:87
+msgid "Post to dreamwidth by default"
 msgstr "Standardmäßig bei Dreamwidth veröffentlichen"
 
-#: dwpost.php:71
-msgid "Dreamwidth Export"
-msgstr "Dreamwidth Export"
+#: dwpost.php:93
+msgid "Submit"
+msgstr "Senden"
diff --git a/dwpost/lang/de/strings.php b/dwpost/lang/de/strings.php
index aea4bde0..a810f79e 100644
--- a/dwpost/lang/de/strings.php
+++ b/dwpost/lang/de/strings.php
@@ -2,12 +2,13 @@
 
 if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Post to Dreamwidth'] = 'In Dreamwidth veröffentlichen';
-$a->strings['Enable Dreamwidth Post Addon'] = 'Dreamwidth-Post-Addon aktivieren';
-$a->strings['Dreamwidth username'] = 'Dreamwidth-Benutzername';
-$a->strings['Dreamwidth password'] = 'Dreamwidth-Passwort';
-$a->strings['Post to Dreamwidth by default'] = 'Standardmäßig bei Dreamwidth veröffentlichen';
-$a->strings['Dreamwidth Export'] = 'Dreamwidth Export';
+;
+$a->strings["Post to Dreamwidth"] = "In Dreamwidth veröffentlichen";
+$a->strings["Dreamwidth Post Settings"] = "Dreamwidth Veröffentlichungs-Einstellungen";
+$a->strings["Enable dreamwidth Post Addon"] = "Dreamwidth Post Addon aktivieren";
+$a->strings["dreamwidth username"] = "Dreamwidth Benutzername";
+$a->strings["dreamwidth password"] = "Dreamwidth Passwort";
+$a->strings["Post to dreamwidth by default"] = "Standardmäßig bei Dreamwidth veröffentlichen";
+$a->strings["Submit"] = "Senden";
diff --git a/dwpost/lang/en-gb/strings.php b/dwpost/lang/en-gb/strings.php
index b7270d79..1f03e9b1 100644
--- a/dwpost/lang/en-gb/strings.php
+++ b/dwpost/lang/en-gb/strings.php
@@ -2,13 +2,13 @@
 
 if(! function_exists("string_plural_select_en_gb")) {
 function string_plural_select_en_gb($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Post to Dreamwidth'] = 'Post to Dreamwidth';
-$a->strings['Dreamwidth Post Settings'] = 'Dreamwidth Post Settings';
-$a->strings['Enable dreamwidth Post Addon'] = 'Enable Dreamwidth post addon';
-$a->strings['dreamwidth username'] = 'Dreamwidth username';
-$a->strings['dreamwidth password'] = 'Dreamwidth password';
-$a->strings['Post to dreamwidth by default'] = 'Post to Dreamwidth by default';
-$a->strings['Submit'] = 'Submit';
+;
+$a->strings["Post to Dreamwidth"] = "Post to Dreamwidth";
+$a->strings["Dreamwidth Post Settings"] = "Dreamwidth Post Settings";
+$a->strings["Enable dreamwidth Post Addon"] = "Enable Dreamwidth post addon";
+$a->strings["dreamwidth username"] = "Dreamwidth username";
+$a->strings["dreamwidth password"] = "Dreamwidth password";
+$a->strings["Post to dreamwidth by default"] = "Post to Dreamwidth by default";
+$a->strings["Submit"] = "Submit";
diff --git a/dwpost/lang/es/messages.po b/dwpost/lang/es/messages.po
index 44c1c0f8..18036677 100644
--- a/dwpost/lang/es/messages.po
+++ b/dwpost/lang/es/messages.po
@@ -4,15 +4,14 @@
 # 
 # 
 # Translators:
-# Albert, 2016
-# Senex Petrovic <javierruizo@hotmail.com>, 2021
+# Alberto Díaz Tormo <albertodiaztormo@gmail.com>, 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2021-04-01 09:54+0000\n"
-"Last-Translator: Senex Petrovic <javierruizo@hotmail.com>\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2016-10-23 11:33+0000\n"
+"Last-Translator: Alberto Díaz Tormo <albertodiaztormo@gmail.com>\n"
 "Language-Team: Spanish (http://www.transifex.com/Friendica/friendica/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,30 +19,30 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: dwpost.php:41
+#: dwpost.php:39
 msgid "Post to Dreamwidth"
 msgstr "Publicar en Dreamwidth"
 
-#: dwpost.php:72 dwpost.php:76
-msgid "Dreamwidth Export"
-msgstr "Dreamwidth Exportar"
+#: dwpost.php:70
+msgid "Dreamwidth Post Settings"
+msgstr "Ajustes de publicación de Dreamwidth"
 
-#: dwpost.php:80
+#: dwpost.php:72
 msgid "Enable dreamwidth Post Addon"
-msgstr "Activar el módulo de publicación en Dreamwidth"
+msgstr "Activar el addon de publicación dreamwidth"
 
-#: dwpost.php:85
+#: dwpost.php:77
 msgid "dreamwidth username"
 msgstr "Nombre de usuario de dreamwidth"
 
-#: dwpost.php:90
+#: dwpost.php:82
 msgid "dreamwidth password"
 msgstr "Contraseña de dreamwidth"
 
-#: dwpost.php:95
+#: dwpost.php:87
 msgid "Post to dreamwidth by default"
 msgstr "Publicar en dreamwidth por defecto"
 
-#: dwpost.php:100
-msgid "Save Settings"
-msgstr "Guardar ajustes"
+#: dwpost.php:93
+msgid "Submit"
+msgstr "Enviar"
diff --git a/dwpost/lang/es/strings.php b/dwpost/lang/es/strings.php
index 9f5a983b..4c5c116f 100644
--- a/dwpost/lang/es/strings.php
+++ b/dwpost/lang/es/strings.php
@@ -2,13 +2,13 @@
 
 if(! function_exists("string_plural_select_es")) {
 function string_plural_select_es($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Post to Dreamwidth'] = 'Publicar en Dreamwidth';
-$a->strings['Dreamwidth Export'] = 'Dreamwidth Exportar';
-$a->strings['Enable dreamwidth Post Addon'] = 'Activar el módulo de publicación en Dreamwidth';
-$a->strings['dreamwidth username'] = 'Nombre de usuario de dreamwidth';
-$a->strings['dreamwidth password'] = 'Contraseña de dreamwidth';
-$a->strings['Post to dreamwidth by default'] = 'Publicar en dreamwidth por defecto';
-$a->strings['Save Settings'] = 'Guardar ajustes';
+;
+$a->strings["Post to Dreamwidth"] = "Publicar en Dreamwidth";
+$a->strings["Dreamwidth Post Settings"] = "Ajustes de publicación de Dreamwidth";
+$a->strings["Enable dreamwidth Post Addon"] = "Activar el addon de publicación dreamwidth";
+$a->strings["dreamwidth username"] = "Nombre de usuario de dreamwidth";
+$a->strings["dreamwidth password"] = "Contraseña de dreamwidth";
+$a->strings["Post to dreamwidth by default"] = "Publicar en dreamwidth por defecto";
+$a->strings["Submit"] = "Enviar";
diff --git a/dwpost/lang/fi-fi/strings.php b/dwpost/lang/fi-fi/strings.php
index 51a5ea57..4c8de909 100644
--- a/dwpost/lang/fi-fi/strings.php
+++ b/dwpost/lang/fi-fi/strings.php
@@ -2,13 +2,13 @@
 
 if(! function_exists("string_plural_select_fi_fi")) {
 function string_plural_select_fi_fi($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Post to Dreamwidth'] = 'Lähetä Dreamwidthiin';
-$a->strings['Dreamwidth Post Settings'] = 'Dreamwidth -viestin asetukset';
-$a->strings['Enable dreamwidth Post Addon'] = 'Ota Dreamwidth-viestilisäosa käyttöön';
-$a->strings['dreamwidth username'] = 'dreamwidth -käyttäjätunnus';
-$a->strings['dreamwidth password'] = 'dreamwidth -salasana';
-$a->strings['Post to dreamwidth by default'] = 'Lähetä Dreamwidthiin oletuksena';
-$a->strings['Submit'] = 'Lähetä';
+;
+$a->strings["Post to Dreamwidth"] = "Lähetä Dreamwidthiin";
+$a->strings["Dreamwidth Post Settings"] = "Dreamwidth -viestin asetukset";
+$a->strings["Enable dreamwidth Post Addon"] = "Ota Dreamwidth-viestilisäosa käyttöön";
+$a->strings["dreamwidth username"] = "dreamwidth -käyttäjätunnus";
+$a->strings["dreamwidth password"] = "dreamwidth -salasana";
+$a->strings["Post to dreamwidth by default"] = "Lähetä Dreamwidthiin oletuksena";
+$a->strings["Submit"] = "Lähetä";
diff --git a/dwpost/lang/fr/messages.po b/dwpost/lang/fr/messages.po
index dd93d852..1277d590 100644
--- a/dwpost/lang/fr/messages.po
+++ b/dwpost/lang/fr/messages.po
@@ -4,44 +4,46 @@
 # 
 # 
 # Translators:
-# bob lebonche <lebonche@tutanota.com>, 2021
-# Hypolite Petovan <hypolite@mrpetovan.com>, 2022
-# ea1cd8241cb389ffb6f92bc6891eff5d_dc12308 <70dced5587d47e18d88f9298024d96f8_93383>, 2015
+# Nicola Spanti <translations@nicola-spanti.info>, 2015
 # StefOfficiel <pichard.stephane@free.fr>, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:17-0500\n"
-"PO-Revision-Date: 2014-06-22 11:41+0000\n"
-"Last-Translator: Hypolite Petovan <hypolite@mrpetovan.com>, 2022\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2015-08-30 17:12+0000\n"
+"Last-Translator: Nicola Spanti <translations@nicola-spanti.info>\n"
 "Language-Team: French (http://www.transifex.com/Friendica/friendica/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fr\n"
-"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: dwpost.php:43
+#: dwpost.php:39
 msgid "Post to Dreamwidth"
 msgstr "Publier sur Dreamwidth"
 
-#: dwpost.php:63
-msgid "Enable Dreamwidth Post Addon"
-msgstr "Activer l'extension Dreamwidth"
+#: dwpost.php:70
+msgid "Dreamwidth Post Settings"
+msgstr "Paramètres pour Dreamwidth"
 
-#: dwpost.php:64
-msgid "Dreamwidth username"
+#: dwpost.php:72
+msgid "Enable dreamwidth Post Addon"
+msgstr ""
+
+#: dwpost.php:77
+msgid "dreamwidth username"
 msgstr "Nom d'utilisateur Dreamwidth"
 
-#: dwpost.php:65
-msgid "Dreamwidth password"
-msgstr "Mot de passe Dreamwidth"
+#: dwpost.php:82
+msgid "dreamwidth password"
+msgstr "Mot de passe dreamwidth"
 
-#: dwpost.php:66
-msgid "Post to Dreamwidth by default"
-msgstr "Publier sur Dreamwidth par défaut"
+#: dwpost.php:87
+msgid "Post to dreamwidth by default"
+msgstr "Poster sur Dreamwidth par défaut"
 
-#: dwpost.php:71
-msgid "Dreamwidth Export"
-msgstr "Export Dreamwidth"
+#: dwpost.php:93
+msgid "Submit"
+msgstr "Envoyer"
diff --git a/dwpost/lang/fr/strings.php b/dwpost/lang/fr/strings.php
index f33e7404..5ecda471 100644
--- a/dwpost/lang/fr/strings.php
+++ b/dwpost/lang/fr/strings.php
@@ -2,12 +2,13 @@
 
 if(! function_exists("string_plural_select_fr")) {
 function string_plural_select_fr($n){
-	$n = intval($n);
-	if (($n == 0 || $n == 1)) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
+	return ($n > 1);;
 }}
-$a->strings['Post to Dreamwidth'] = 'Publier sur Dreamwidth';
-$a->strings['Enable Dreamwidth Post Addon'] = 'Activer l\'extension Dreamwidth';
-$a->strings['Dreamwidth username'] = 'Nom d\'utilisateur Dreamwidth';
-$a->strings['Dreamwidth password'] = 'Mot de passe Dreamwidth';
-$a->strings['Post to Dreamwidth by default'] = 'Publier sur Dreamwidth par défaut';
-$a->strings['Dreamwidth Export'] = 'Export Dreamwidth';
+;
+$a->strings["Post to Dreamwidth"] = "Publier sur Dreamwidth";
+$a->strings["Dreamwidth Post Settings"] = "Paramètres pour Dreamwidth";
+$a->strings["Enable dreamwidth Post Addon"] = "";
+$a->strings["dreamwidth username"] = "Nom d'utilisateur Dreamwidth";
+$a->strings["dreamwidth password"] = "Mot de passe dreamwidth";
+$a->strings["Post to dreamwidth by default"] = "Poster sur Dreamwidth par défaut";
+$a->strings["Submit"] = "Envoyer";
diff --git a/dwpost/lang/hu/messages.po b/dwpost/lang/hu/messages.po
deleted file mode 100644
index 98356f65..00000000
--- a/dwpost/lang/hu/messages.po
+++ /dev/null
@@ -1,44 +0,0 @@
-# ADDON dwpost
-# Copyright (C)
-# This file is distributed under the same license as the Friendica dwpost addon package.
-# 
-# 
-# Translators:
-# Balázs Úr, 2020-2021
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:17-0500\n"
-"PO-Revision-Date: 2014-06-22 11:41+0000\n"
-"Last-Translator: Balázs Úr, 2020-2021\n"
-"Language-Team: Hungarian (http://www.transifex.com/Friendica/friendica/language/hu/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: hu\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: dwpost.php:43
-msgid "Post to Dreamwidth"
-msgstr "Beküldés a Dreamwidth-re"
-
-#: dwpost.php:63
-msgid "Enable Dreamwidth Post Addon"
-msgstr "A Dreamwidth-beküldő bővítmény engedélyezése"
-
-#: dwpost.php:64
-msgid "Dreamwidth username"
-msgstr "Dreamwidth felhasználónév"
-
-#: dwpost.php:65
-msgid "Dreamwidth password"
-msgstr "Dreamwidth jelszó"
-
-#: dwpost.php:66
-msgid "Post to Dreamwidth by default"
-msgstr "Beküldés a Dreamwidth-re alapértelmezetten"
-
-#: dwpost.php:71
-msgid "Dreamwidth Export"
-msgstr "Dreamwidth exportálás"
diff --git a/dwpost/lang/hu/strings.php b/dwpost/lang/hu/strings.php
deleted file mode 100644
index f994189f..00000000
--- a/dwpost/lang/hu/strings.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_hu")) {
-function string_plural_select_hu($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Post to Dreamwidth'] = 'Beküldés a Dreamwidth-re';
-$a->strings['Enable Dreamwidth Post Addon'] = 'A Dreamwidth-beküldő bővítmény engedélyezése';
-$a->strings['Dreamwidth username'] = 'Dreamwidth felhasználónév';
-$a->strings['Dreamwidth password'] = 'Dreamwidth jelszó';
-$a->strings['Post to Dreamwidth by default'] = 'Beküldés a Dreamwidth-re alapértelmezetten';
-$a->strings['Dreamwidth Export'] = 'Dreamwidth exportálás';
diff --git a/dwpost/lang/it/messages.po b/dwpost/lang/it/messages.po
index 5f7c2ee2..9ce05fe2 100644
--- a/dwpost/lang/it/messages.po
+++ b/dwpost/lang/it/messages.po
@@ -5,14 +5,13 @@
 # 
 # Translators:
 # fabrixxm <fabrix.xm@gmail.com>, 2014,2018
-# Sylke Vicious <silkevicious@gmail.com>, 2020-2021
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2021-02-16 12:55+0000\n"
-"Last-Translator: Sylke Vicious <silkevicious@gmail.com>\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2018-03-19 13:21+0000\n"
+"Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,30 +19,30 @@ msgstr ""
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: dwpost.php:41
+#: dwpost.php:39
 msgid "Post to Dreamwidth"
 msgstr "Invia a Dreamwidth"
 
-#: dwpost.php:72 dwpost.php:76
-msgid "Dreamwidth Export"
-msgstr "Esporta Dreamwidth"
+#: dwpost.php:70
+msgid "Dreamwidth Post Settings"
+msgstr "Impostazioni Invio a Dreeamwidth"
 
-#: dwpost.php:80
+#: dwpost.php:72
 msgid "Enable dreamwidth Post Addon"
 msgstr "Abilita il componente aggiuntivo di invio a Dreamwidth"
 
-#: dwpost.php:85
+#: dwpost.php:77
 msgid "dreamwidth username"
 msgstr "Nome utente Dreamwidth"
 
-#: dwpost.php:90
+#: dwpost.php:82
 msgid "dreamwidth password"
 msgstr "password Dreamwidth"
 
-#: dwpost.php:95
+#: dwpost.php:87
 msgid "Post to dreamwidth by default"
 msgstr "Invia sempre a Dreamwidth"
 
-#: dwpost.php:100
-msgid "Save Settings"
-msgstr "Salva Impostazioni"
+#: dwpost.php:93
+msgid "Submit"
+msgstr "Salva"
diff --git a/dwpost/lang/it/strings.php b/dwpost/lang/it/strings.php
index 0234c1f7..0f40abc6 100644
--- a/dwpost/lang/it/strings.php
+++ b/dwpost/lang/it/strings.php
@@ -2,13 +2,13 @@
 
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Post to Dreamwidth'] = 'Invia a Dreamwidth';
-$a->strings['Dreamwidth Export'] = 'Esporta Dreamwidth';
-$a->strings['Enable dreamwidth Post Addon'] = 'Abilita il componente aggiuntivo di invio a Dreamwidth';
-$a->strings['dreamwidth username'] = 'Nome utente Dreamwidth';
-$a->strings['dreamwidth password'] = 'password Dreamwidth';
-$a->strings['Post to dreamwidth by default'] = 'Invia sempre a Dreamwidth';
-$a->strings['Save Settings'] = 'Salva Impostazioni';
+;
+$a->strings["Post to Dreamwidth"] = "Invia a Dreamwidth";
+$a->strings["Dreamwidth Post Settings"] = "Impostazioni Invio a Dreeamwidth";
+$a->strings["Enable dreamwidth Post Addon"] = "Abilita il componente aggiuntivo di invio a Dreamwidth";
+$a->strings["dreamwidth username"] = "Nome utente Dreamwidth";
+$a->strings["dreamwidth password"] = "password Dreamwidth";
+$a->strings["Post to dreamwidth by default"] = "Invia sempre a Dreamwidth";
+$a->strings["Submit"] = "Salva";
diff --git a/dwpost/lang/nl/strings.php b/dwpost/lang/nl/strings.php
index 902c9c12..ddf5083a 100644
--- a/dwpost/lang/nl/strings.php
+++ b/dwpost/lang/nl/strings.php
@@ -3,12 +3,13 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Post to Dreamwidth'] = 'Plaatsen op Dreamwidth';
-$a->strings['Dreamwidth Post Settings'] = 'Dreamwidth Post instellingen';
-$a->strings['Enable dreamwidth Post Addon'] = 'Dreamwidth Post Addon inschakelen';
-$a->strings['dreamwidth username'] = 'Dreawidth gebruikersnaam';
-$a->strings['dreamwidth password'] = 'Dreamwidth wachtwoord';
-$a->strings['Post to dreamwidth by default'] = 'Plaatsen op Dreamwidth als standaard instellen ';
-$a->strings['Submit'] = 'Opslaan';
+;
+$a->strings["Post to Dreamwidth"] = "Plaatsen op Dreamwidth";
+$a->strings["Dreamwidth Post Settings"] = "Dreamwidth Post instellingen";
+$a->strings["Enable dreamwidth Post Addon"] = "Dreamwidth Post Addon inschakelen";
+$a->strings["dreamwidth username"] = "Dreawidth gebruikersnaam";
+$a->strings["dreamwidth password"] = "Dreamwidth wachtwoord";
+$a->strings["Post to dreamwidth by default"] = "Plaatsen op Dreamwidth als standaard instellen ";
+$a->strings["Submit"] = "Opslaan";
diff --git a/dwpost/lang/pl/messages.po b/dwpost/lang/pl/messages.po
index ebc3924f..3eb0942e 100644
--- a/dwpost/lang/pl/messages.po
+++ b/dwpost/lang/pl/messages.po
@@ -4,15 +4,14 @@
 # 
 # 
 # Translators:
-# Piotr Strębski <strebski@gmail.com>, 2022
-# Waldemar Stoczkowski, 2018
+# Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:17-0500\n"
-"PO-Revision-Date: 2014-06-22 11:41+0000\n"
-"Last-Translator: Piotr Strębski <strebski@gmail.com>, 2022\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2018-08-04 10:46+0000\n"
+"Last-Translator: Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.com/Friendica/friendica/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,26 +19,30 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
-#: dwpost.php:43
+#: dwpost.php:39
 msgid "Post to Dreamwidth"
 msgstr "Opublikuj w Dreamwidth"
 
-#: dwpost.php:63
-msgid "Enable Dreamwidth Post Addon"
-msgstr "Włącz dodatek Dreamwidth Post"
+#: dwpost.php:70
+msgid "Dreamwidth Post Settings"
+msgstr "Ustawienia postów w Dreamwerze"
 
-#: dwpost.php:64
-msgid "Dreamwidth username"
-msgstr "Nazwa użytkownika Dreamwidth"
+#: dwpost.php:72
+msgid "Enable dreamwidth Post Addon"
+msgstr "Włącz dodatek dreamwidth Post"
 
-#: dwpost.php:65
-msgid "Dreamwidth password"
-msgstr "Hasło Dreamwidth"
+#: dwpost.php:77
+msgid "dreamwidth username"
+msgstr "nazwa użytkownika dreamwidth"
 
-#: dwpost.php:66
-msgid "Post to Dreamwidth by default"
-msgstr "Publikuj domyślnie w serwisie Dreamwidth"
+#: dwpost.php:82
+msgid "dreamwidth password"
+msgstr "hasło dreamwidth"
 
-#: dwpost.php:71
-msgid "Dreamwidth Export"
-msgstr "Eksport do Dreamwidth"
+#: dwpost.php:87
+msgid "Post to dreamwidth by default"
+msgstr "Opublikuj domyślnie w serwisie dreamwidth"
+
+#: dwpost.php:93
+msgid "Submit"
+msgstr "Wyślij"
diff --git a/dwpost/lang/pl/strings.php b/dwpost/lang/pl/strings.php
index 699e2493..7ed9b44e 100644
--- a/dwpost/lang/pl/strings.php
+++ b/dwpost/lang/pl/strings.php
@@ -3,11 +3,13 @@
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
 	$n = intval($n);
-	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
+	return ($n==1 ? 0 : ($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14) ? 1 : $n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14) ? 2 : 3);;
 }}
-$a->strings['Post to Dreamwidth'] = 'Opublikuj w Dreamwidth';
-$a->strings['Enable Dreamwidth Post Addon'] = 'Włącz dodatek Dreamwidth Post';
-$a->strings['Dreamwidth username'] = 'Nazwa użytkownika Dreamwidth';
-$a->strings['Dreamwidth password'] = 'Hasło Dreamwidth';
-$a->strings['Post to Dreamwidth by default'] = 'Publikuj domyślnie w serwisie Dreamwidth';
-$a->strings['Dreamwidth Export'] = 'Eksport do Dreamwidth';
+;
+$a->strings["Post to Dreamwidth"] = "Opublikuj w Dreamwidth";
+$a->strings["Dreamwidth Post Settings"] = "Ustawienia postów w Dreamwerze";
+$a->strings["Enable dreamwidth Post Addon"] = "Włącz dodatek dreamwidth Post";
+$a->strings["dreamwidth username"] = "nazwa użytkownika dreamwidth";
+$a->strings["dreamwidth password"] = "hasło dreamwidth";
+$a->strings["Post to dreamwidth by default"] = "Opublikuj domyślnie w serwisie dreamwidth";
+$a->strings["Submit"] = "Wyślij";
diff --git a/dwpost/lang/pt-br/strings.php b/dwpost/lang/pt-br/strings.php
index f65d10a2..03dc7d2d 100644
--- a/dwpost/lang/pt-br/strings.php
+++ b/dwpost/lang/pt-br/strings.php
@@ -1,14 +1,9 @@
-<?php
-
-if(! function_exists("string_plural_select_pt_br")) {
-function string_plural_select_pt_br($n){
-	$n = intval($n);
-	return intval($n > 1);
-}}
-$a->strings['Post to Dreamwidth'] = 'Publicar no Dreamwidth';
-$a->strings['Dreamwidth Post Settings'] = 'Configurações de publicação no Dreamwidth';
-$a->strings['Enable dreamwidth Post Addon'] = 'Habilitar plug-in para publicar no Dreamwidth';
-$a->strings['dreamwidth username'] = 'Nome de usuário no Dreamwidth';
-$a->strings['dreamwidth password'] = 'Senha do Dreamwidth';
-$a->strings['Post to dreamwidth by default'] = 'Publicar no Dreamwidth por padrão';
-$a->strings['Submit'] = 'Enviar';
+<?php
+
+$a->strings["Post to Dreamwidth"] = "Publicar no Dreamwidth";
+$a->strings["Dreamwidth Post Settings"] = "Configurações de publicação no Dreamwidth";
+$a->strings["Enable dreamwidth Post Addon"] = "Habilitar o addon de publicação no Dreamwidth";
+$a->strings["dreamwidth username"] = "Nome de usuário do Dreamwidth";
+$a->strings["dreamwidth password"] = "Senha do Dreamwidth";
+$a->strings["Post to dreamwidth by default"] = "Publicar no Dreamwidth por padrão";
+$a->strings["Submit"] = "Enviar";
diff --git a/dwpost/lang/ro/strings.php b/dwpost/lang/ro/strings.php
index 782ca09e..ed3ece27 100644
--- a/dwpost/lang/ro/strings.php
+++ b/dwpost/lang/ro/strings.php
@@ -2,13 +2,13 @@
 
 if(! function_exists("string_plural_select_ro")) {
 function string_plural_select_ro($n){
-	$n = intval($n);
-	if ($n==1) { return 0; } else if ((($n%100>19)||(($n%100==0)&&($n!=0)))) { return 2; } else  { return 1; }
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
 }}
-$a->strings['Post to Dreamwidth'] = 'Postați pe Dreamwidth';
-$a->strings['Dreamwidth Post Settings'] = 'Configurări Postări Dreamwidth ';
-$a->strings['Enable dreamwidth Post Addon'] = 'Activare Modul Postare pe Dreamwidth';
-$a->strings['dreamwidth username'] = 'Utilizator Dreamwidth';
-$a->strings['dreamwidth password'] = 'Parola Dreamwidth ';
-$a->strings['Post to dreamwidth by default'] = 'Postați implicit pe Dreamwidth';
-$a->strings['Submit'] = 'Trimite';
+;
+$a->strings["Post to Dreamwidth"] = "Postați pe Dreamwidth";
+$a->strings["Dreamwidth Post Settings"] = "Configurări Postări Dreamwidth ";
+$a->strings["Enable dreamwidth Post Addon"] = "Activare Modul Postare pe Dreamwidth";
+$a->strings["dreamwidth username"] = "Utilizator Dreamwidth";
+$a->strings["dreamwidth password"] = "Parola Dreamwidth ";
+$a->strings["Post to dreamwidth by default"] = "Postați implicit pe Dreamwidth";
+$a->strings["Submit"] = "Trimite";
diff --git a/dwpost/lang/ru/strings.php b/dwpost/lang/ru/strings.php
index c44d13f4..5c351320 100644
--- a/dwpost/lang/ru/strings.php
+++ b/dwpost/lang/ru/strings.php
@@ -3,12 +3,13 @@
 if(! function_exists("string_plural_select_ru")) {
 function string_plural_select_ru($n){
 	$n = intval($n);
-	if ($n%10==1 && $n%100!=11) { return 0; } else if ($n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14)) { return 1; } else if ($n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)) { return 2; } else  { return 3; }
+	return ($n%10==1 && $n%100!=11 ? 0 : $n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14) ? 1 : $n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)? 2 : 3);;
 }}
-$a->strings['Post to Dreamwidth'] = 'Отправить в Dreamwidth';
-$a->strings['Dreamwidth Post Settings'] = 'Настройки сообщений Dreamwidth';
-$a->strings['Enable dreamwidth Post Addon'] = 'Включить аддон dreamwidth Post';
-$a->strings['dreamwidth username'] = 'Имя пользователя Dreamwidth';
-$a->strings['dreamwidth password'] = 'Пароль Dreamwidth';
-$a->strings['Post to dreamwidth by default'] = 'Отправлять сообщения в Dreamwidth по умолчанию';
-$a->strings['Submit'] = 'Добавить';
+;
+$a->strings["Post to Dreamwidth"] = "Отправить в Dreamwidth";
+$a->strings["Dreamwidth Post Settings"] = "Настройки сообщений Dreamwidth";
+$a->strings["Enable dreamwidth Post Addon"] = "Включить аддон dreamwidth Post";
+$a->strings["dreamwidth username"] = "Имя пользователя Dreamwidth";
+$a->strings["dreamwidth password"] = "Пароль Dreamwidth";
+$a->strings["Post to dreamwidth by default"] = "Отправлять сообщения в Dreamwidth по умолчанию";
+$a->strings["Submit"] = "Добавить";
diff --git a/dwpost/lang/sv/messages.po b/dwpost/lang/sv/messages.po
deleted file mode 100644
index 6e3aa388..00000000
--- a/dwpost/lang/sv/messages.po
+++ /dev/null
@@ -1,43 +0,0 @@
-# ADDON dwpost
-# Copyright (C)
-# This file is distributed under the same license as the Friendica dwpost addon package.
-# 
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:17-0500\n"
-"PO-Revision-Date: 2021-12-22 16:17+0000\n"
-"Last-Translator: Transifex Bot <>\n"
-"Language-Team: Swedish (http://www.transifex.com/Friendica/friendica/language/sv/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: sv\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: dwpost.php:43
-msgid "Post to Dreamwidth"
-msgstr ""
-
-#: dwpost.php:63
-msgid "Enable Dreamwidth Post Addon"
-msgstr ""
-
-#: dwpost.php:64
-msgid "Dreamwidth username"
-msgstr ""
-
-#: dwpost.php:65
-msgid "Dreamwidth password"
-msgstr ""
-
-#: dwpost.php:66
-msgid "Post to Dreamwidth by default"
-msgstr ""
-
-#: dwpost.php:71
-msgid "Dreamwidth Export"
-msgstr ""
diff --git a/dwpost/lang/sv/strings.php b/dwpost/lang/sv/strings.php
index 72e9772f..3ec569a7 100644
--- a/dwpost/lang/sv/strings.php
+++ b/dwpost/lang/sv/strings.php
@@ -1,7 +1,3 @@
-<?php
-
-if(! function_exists("string_plural_select_sv")) {
-function string_plural_select_sv($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
+<?php
+
+$a->strings["Submit"] = "Spara";
diff --git a/dwpost/templates/connector_settings.tpl b/dwpost/templates/connector_settings.tpl
deleted file mode 100644
index 0abcd24e..00000000
--- a/dwpost/templates/connector_settings.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-{{include file="field_checkbox.tpl" field=$enabled}}
-{{include file="field_input.tpl" field=$username}}
-{{include file="field_password.tpl" field=$password}}
-{{include file="field_checkbox.tpl" field=$bydefault}}
diff --git a/fancybox/.gitignore b/fancybox/.gitignore
deleted file mode 100644
index fff07933..00000000
--- a/fancybox/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/dist/
-/test/
diff --git a/fancybox/CHANGELOG.md b/fancybox/CHANGELOG.md
deleted file mode 100644
index d597e0bf..00000000
--- a/fancybox/CHANGELOG.md
+++ /dev/null
@@ -1,27 +0,0 @@
-### Version 1.05
-
-* Added ALT and TITLE of original IMG to fancybox popup.
-
-### Version 1.04
-
-* Update supporting upcoming imnagegrid in posts
- 
-### Version 1.03
-
-* imgages in body-attach with title / alt attribute get them removed while adding fancy attributes
-* Added fancybox to image inlined in posts. Un-hooked the old lightbox from frio and vier and excahnged that with fancybox hooks.
-* Excluded images in "type-link" divs from being "fancied" as they have no images but pages linked to. 
-
-### Version 1.02
-
-* [MrPetovan](https://github.com/MrPetovan) optimized my noob regular expression code. 
-
-### Version 1.01
-
-* One gallery for each post
-* All media attached to a post are added to the posts gallery.
-* Loop scrolling: You can step from last media to first and vice versa.
-### Version 1.00
-
-* First test version released.
-* One fancybox per page displaying first media of each post.
\ No newline at end of file
diff --git a/fancybox/README.md b/fancybox/README.md
deleted file mode 100644
index 3e342ee9..00000000
--- a/fancybox/README.md
+++ /dev/null
@@ -1,19 +0,0 @@
-# Post image gallery using fancybox
-
-Addon author: [Grischa Brockhaus](https://brockha.us)
-
-## Description
-
-This addon loads all media attachments of a post into a "fancybox" instead of linking directly to the media.
-
-Each post gets its own attachment library, when there are more than one media attached you can scroll through them.
-
-## Licenses
-
-### Fancybox Library
-
-This AddOn is using the jQuery library [fancybox](https://github.com/fancyapps/fancybox). 
-
-The fancyBox libryry is licensed under the GPLv3 license for all open source applications. A commercial license is required for all commercial applications (including sites, themes and apps you plan to sell).
-
-[Read more about fancyBox license](https://github.com/fancyapps/fancybox).
\ No newline at end of file
diff --git a/fancybox/asset/fancybox/README.md b/fancybox/asset/fancybox/README.md
deleted file mode 100644
index e32b89e1..00000000
--- a/fancybox/asset/fancybox/README.md
+++ /dev/null
@@ -1,62 +0,0 @@
-# fancyBox 3.5.7
-
-jQuery lightbox script for displaying images, videos and more.
-Touch enabled, responsive and fully customizable.
-
-See the [project page](http://fancyapps.com/fancybox/3/) for documentation and a demonstration.
-
-Follow [@thefancyapps](//twitter.com/thefancyapps) for updates.
-
-
-## Quick start
-
-1\.  Add latest jQuery and fancyBox files
-
-```html
-<script src="https://code.jquery.com/jquery-3.3.1.min.js"></script>
-
-<link  href="/path/to/jquery.fancybox.min.css" rel="stylesheet">
-<script src="/path/to/jquery.fancybox.min.js"></script>
-```
-
-
-2\.  Create links
-
-```html
-<a data-fancybox="gallery" href="big_1.jpg">
-    <img src="small_1.jpg">
-</a>
-
-<a data-fancybox="gallery" href="big_2.jpg">
-    <img src="small_2.jpg">
-</a>
-```
-
-
-3\. Enjoy!
-
-
-## License
-
-fancyBox is licensed under the [GPLv3](http://choosealicense.com/licenses/gpl-3.0) license for all open source applications.
-A commercial license is required for all commercial applications (including sites, themes and apps you plan to sell).
-
-[Read more about fancyBox license](http://fancyapps.com/fancybox/3/#license).
-
-## Bugs and feature requests
-
-If you find a bug, please report it [here on Github](https://github.com/fancyapps/fancybox/issues).
-
-Guidelines for bug reports:
-
-1. Use the GitHub issue search — check if the issue has already been reported.
-2. Check if the issue has been fixed — try to reproduce it using the latest master or development branch in the repository.
-3. Isolate the problem — create a reduced test case and a live example. You can use CodePen to fork any demo found on documentation to use it as a template.
-
-A good bug report shouldn't leave others needing to chase you up for more information.
-Please try to be as detailed as possible in your report.
-
-
-Feature requests are welcome. Please look for existing ones and use GitHub's "reactions" feature to vote.
-
-Please do not use the issue tracker for personal support requests - use Stack Overflow ([fancybox-3](http://stackoverflow.com/questions/tagged/fancybox-3) tag) instead.
diff --git a/fancybox/asset/fancybox/fancybox.config.js b/fancybox/asset/fancybox/fancybox.config.js
deleted file mode 100644
index 233b423f..00000000
--- a/fancybox/asset/fancybox/fancybox.config.js
+++ /dev/null
@@ -1,13 +0,0 @@
-$(document).ready(function() {
-    $.fancybox.defaults.loop = "true";
-    // this disables the colorbox hook found in frio/js/modal.js:34
-    $("body").off("click", ".wall-item-body a img");
-
-    // Adds ALT/TITLE text to fancybox
-    $('a[data-fancybox').fancybox({
-        afterLoad : function(instance, current) {
-            current.$image.attr('alt', current.opts.$orig.find('img').attr('alt') );
-            current.$image.attr('title', current.opts.$orig.find('img').attr('title') );
-        }
-    });
-});
\ No newline at end of file
diff --git a/fancybox/asset/fancybox/jquery.fancybox.css b/fancybox/asset/fancybox/jquery.fancybox.css
deleted file mode 100644
index 16b01254..00000000
--- a/fancybox/asset/fancybox/jquery.fancybox.css
+++ /dev/null
@@ -1,895 +0,0 @@
-body.compensate-for-scrollbar {
-    overflow: hidden;
-}
-
-.fancybox-active {
-    height: auto;
-}
-
-.fancybox-is-hidden {
-    left: -9999px;
-    margin: 0;
-    position: absolute !important;
-    top: -9999px;
-    visibility: hidden;
-}
-
-.fancybox-container {
-    -webkit-backface-visibility: hidden;
-    height: 100%;
-    left: 0;
-    outline: none;
-    position: fixed;
-    -webkit-tap-highlight-color: transparent;
-    top: 0;
-    -ms-touch-action: manipulation;
-    touch-action: manipulation;
-    transform: translateZ(0);
-    width: 100%;
-    z-index: 99992;
-}
-
-.fancybox-container * {
-    box-sizing: border-box;
-}
-
-.fancybox-outer,
-.fancybox-inner,
-.fancybox-bg,
-.fancybox-stage {
-    bottom: 0;
-    left: 0;
-    position: absolute;
-    right: 0;
-    top: 0;
-}
-
-.fancybox-outer {
-    -webkit-overflow-scrolling: touch;
-    overflow-y: auto;
-}
-
-.fancybox-bg {
-    background: rgb(30, 30, 30);
-    opacity: 0;
-    transition-duration: inherit;
-    transition-property: opacity;
-    transition-timing-function: cubic-bezier(.47, 0, .74, .71);
-}
-
-.fancybox-is-open .fancybox-bg {
-    opacity: .9;
-    transition-timing-function: cubic-bezier(.22, .61, .36, 1);
-}
-
-.fancybox-infobar,
-.fancybox-toolbar,
-.fancybox-caption,
-.fancybox-navigation .fancybox-button {
-    direction: ltr;
-    opacity: 0;
-    position: absolute;
-    transition: opacity .25s ease, visibility 0s ease .25s;
-    visibility: hidden;
-    z-index: 99997;
-}
-
-.fancybox-show-infobar .fancybox-infobar,
-.fancybox-show-toolbar .fancybox-toolbar,
-.fancybox-show-caption .fancybox-caption,
-.fancybox-show-nav .fancybox-navigation .fancybox-button {
-    opacity: 1;
-    transition: opacity .25s ease 0s, visibility 0s ease 0s;
-    visibility: visible;
-}
-
-.fancybox-infobar {
-    color: #ccc;
-    font-size: 13px;
-    -webkit-font-smoothing: subpixel-antialiased;
-    height: 44px;
-    left: 0;
-    line-height: 44px;
-    min-width: 44px;
-    mix-blend-mode: difference;
-    padding: 0 10px;
-    pointer-events: none;
-    top: 0;
-    -webkit-touch-callout: none;
-    -webkit-user-select: none;
-    -moz-user-select: none;
-    -ms-user-select: none;
-    user-select: none;
-}
-
-.fancybox-toolbar {
-    right: 0;
-    top: 0;
-}
-
-.fancybox-stage {
-    direction: ltr;
-    overflow: visible;
-    transform: translateZ(0);
-    z-index: 99994;
-}
-
-.fancybox-is-open .fancybox-stage {
-    overflow: hidden;
-}
-
-.fancybox-slide {
-    -webkit-backface-visibility: hidden;
-    /* Using without prefix would break IE11 */
-    display: none;
-    height: 100%;
-    left: 0;
-    outline: none;
-    overflow: auto;
-    -webkit-overflow-scrolling: touch;
-    padding: 44px;
-    position: absolute;
-    text-align: center;
-    top: 0;
-    transition-property: transform, opacity;
-    white-space: normal;
-    width: 100%;
-    z-index: 99994;
-}
-
-.fancybox-slide::before {
-    content: '';
-    display: inline-block;
-    font-size: 0;
-    height: 100%;
-    vertical-align: middle;
-    width: 0;
-}
-
-.fancybox-is-sliding .fancybox-slide,
-.fancybox-slide--previous,
-.fancybox-slide--current,
-.fancybox-slide--next {
-    display: block;
-}
-
-.fancybox-slide--image {
-    overflow: hidden;
-    padding: 44px 0;
-}
-
-.fancybox-slide--image::before {
-    display: none;
-}
-
-.fancybox-slide--html {
-    padding: 6px;
-}
-
-.fancybox-content {
-    background: #fff;
-    display: inline-block;
-    margin: 0;
-    max-width: 100%;
-    overflow: auto;
-    -webkit-overflow-scrolling: touch;
-    padding: 44px;
-    position: relative;
-    text-align: left;
-    vertical-align: middle;
-}
-
-.fancybox-slide--image .fancybox-content {
-    animation-timing-function: cubic-bezier(.5, 0, .14, 1);
-    -webkit-backface-visibility: hidden;
-    background: transparent;
-    background-repeat: no-repeat;
-    background-size: 100% 100%;
-    left: 0;
-    max-width: none;
-    overflow: visible;
-    padding: 0;
-    position: absolute;
-    top: 0;
-    -ms-transform-origin: top left;
-    transform-origin: top left;
-    transition-property: transform, opacity;
-    -webkit-user-select: none;
-    -moz-user-select: none;
-    -ms-user-select: none;
-    user-select: none;
-    z-index: 99995;
-}
-
-.fancybox-can-zoomOut .fancybox-content {
-    cursor: zoom-out;
-}
-
-.fancybox-can-zoomIn .fancybox-content {
-    cursor: zoom-in;
-}
-
-.fancybox-can-swipe .fancybox-content,
-.fancybox-can-pan .fancybox-content {
-    cursor: -webkit-grab;
-    cursor: grab;
-}
-
-.fancybox-is-grabbing .fancybox-content {
-    cursor: -webkit-grabbing;
-    cursor: grabbing;
-}
-
-.fancybox-container [data-selectable='true'] {
-    cursor: text;
-}
-
-.fancybox-image,
-.fancybox-spaceball {
-    background: transparent;
-    border: 0;
-    height: 100%;
-    left: 0;
-    margin: 0;
-    max-height: none;
-    max-width: none;
-    padding: 0;
-    position: absolute;
-    top: 0;
-    -webkit-user-select: none;
-    -moz-user-select: none;
-    -ms-user-select: none;
-    user-select: none;
-    width: 100%;
-}
-
-.fancybox-spaceball {
-    z-index: 1;
-}
-
-.fancybox-slide--video .fancybox-content,
-.fancybox-slide--map .fancybox-content,
-.fancybox-slide--pdf .fancybox-content,
-.fancybox-slide--iframe .fancybox-content {
-    height: 100%;
-    overflow: visible;
-    padding: 0;
-    width: 100%;
-}
-
-.fancybox-slide--video .fancybox-content {
-    background: #000;
-}
-
-.fancybox-slide--map .fancybox-content {
-    background: #e5e3df;
-}
-
-.fancybox-slide--iframe .fancybox-content {
-    background: #fff;
-}
-
-.fancybox-video,
-.fancybox-iframe {
-    background: transparent;
-    border: 0;
-    display: block;
-    height: 100%;
-    margin: 0;
-    overflow: hidden;
-    padding: 0;
-    width: 100%;
-}
-
-/* Fix iOS */
-.fancybox-iframe {
-    left: 0;
-    position: absolute;
-    top: 0;
-}
-
-.fancybox-error {
-    background: #fff;
-    cursor: default;
-    max-width: 400px;
-    padding: 40px;
-    width: 100%;
-}
-
-.fancybox-error p {
-    color: #444;
-    font-size: 16px;
-    line-height: 20px;
-    margin: 0;
-    padding: 0;
-}
-
-/* Buttons */
-
-.fancybox-button {
-    background: rgba(30, 30, 30, .6);
-    border: 0;
-    border-radius: 0;
-    box-shadow: none;
-    cursor: pointer;
-    display: inline-block;
-    height: 44px;
-    margin: 0;
-    padding: 10px;
-    position: relative;
-    transition: color .2s;
-    vertical-align: top;
-    visibility: inherit;
-    width: 44px;
-}
-
-.fancybox-button,
-.fancybox-button:visited,
-.fancybox-button:link {
-    color: #ccc;
-}
-
-.fancybox-button:hover {
-    color: #fff;
-}
-
-.fancybox-button:focus {
-    outline: none;
-}
-
-.fancybox-button.fancybox-focus {
-    outline: 1px dotted;
-}
-
-.fancybox-button[disabled],
-.fancybox-button[disabled]:hover {
-    color: #888;
-    cursor: default;
-    outline: none;
-}
-
-/* Fix IE11 */
-.fancybox-button div {
-    height: 100%;
-}
-
-.fancybox-button svg {
-    display: block;
-    height: 100%;
-    overflow: visible;
-    position: relative;
-    width: 100%;
-}
-
-.fancybox-button svg path {
-    fill: currentColor;
-    stroke-width: 0;
-}
-
-.fancybox-button--play svg:nth-child(2),
-.fancybox-button--fsenter svg:nth-child(2) {
-    display: none;
-}
-
-.fancybox-button--pause svg:nth-child(1),
-.fancybox-button--fsexit svg:nth-child(1) {
-    display: none;
-}
-
-.fancybox-progress {
-    background: #ff5268;
-    height: 2px;
-    left: 0;
-    position: absolute;
-    right: 0;
-    top: 0;
-    -ms-transform: scaleX(0);
-    transform: scaleX(0);
-    -ms-transform-origin: 0;
-    transform-origin: 0;
-    transition-property: transform;
-    transition-timing-function: linear;
-    z-index: 99998;
-}
-
-/* Close button on the top right corner of html content */
-
-.fancybox-close-small {
-    background: transparent;
-    border: 0;
-    border-radius: 0;
-    color: #ccc;
-    cursor: pointer;
-    opacity: .8;
-    padding: 8px;
-    position: absolute;
-    right: -12px;
-    top: -44px;
-    z-index: 401;
-}
-
-.fancybox-close-small:hover {
-    color: #fff;
-    opacity: 1;
-}
-
-.fancybox-slide--html .fancybox-close-small {
-    color: currentColor;
-    padding: 10px;
-    right: 0;
-    top: 0;
-}
-
-.fancybox-slide--image.fancybox-is-scaling .fancybox-content {
-    overflow: hidden;
-}
-
-.fancybox-is-scaling .fancybox-close-small,
-.fancybox-is-zoomable.fancybox-can-pan .fancybox-close-small {
-    display: none;
-}
-
-/* Navigation arrows */
-
-.fancybox-navigation .fancybox-button {
-    background-clip: content-box;
-    height: 100px;
-    opacity: 0;
-    position: absolute;
-    top: calc(50% - 50px);
-    width: 70px;
-}
-
-.fancybox-navigation .fancybox-button div {
-    padding: 7px;
-}
-
-.fancybox-navigation .fancybox-button--arrow_left {
-    left: 0;
-    left: env(safe-area-inset-left);
-    padding: 31px 26px 31px 6px;
-}
-
-.fancybox-navigation .fancybox-button--arrow_right {
-    padding: 31px 6px 31px 26px;
-    right: 0;
-    right: env(safe-area-inset-right);
-}
-
-/* Caption */
-
-.fancybox-caption {
-    background: linear-gradient(to top,
-        rgba(0, 0, 0, .85) 0%,
-        rgba(0, 0, 0, .3) 50%,
-        rgba(0, 0, 0, .15) 65%,
-        rgba(0, 0, 0, .075) 75.5%,
-        rgba(0, 0, 0, .037) 82.85%,
-        rgba(0, 0, 0, .019) 88%,
-        rgba(0, 0, 0, 0) 100%);
-    bottom: 0;
-    color: #eee;
-    font-size: 14px;
-    font-weight: 400;
-    left: 0;
-    line-height: 1.5;
-    padding: 75px 44px 25px 44px;
-    pointer-events: none;
-    right: 0;
-    text-align: center;
-    z-index: 99996;
-}
-
-@supports (padding: max(0px)) {
-    .fancybox-caption {
-        padding: 75px max(44px, env(safe-area-inset-right)) max(25px, env(safe-area-inset-bottom)) max(44px, env(safe-area-inset-left));
-    }
-}
-
-.fancybox-caption--separate {
-    margin-top: -50px;
-}
-
-.fancybox-caption__body {
-    max-height: 50vh;
-    overflow: auto;
-    pointer-events: all;
-}
-
-.fancybox-caption a,
-.fancybox-caption a:link,
-.fancybox-caption a:visited {
-    color: #ccc;
-    text-decoration: none;
-}
-
-.fancybox-caption a:hover {
-    color: #fff;
-    text-decoration: underline;
-}
-
-/* Loading indicator */
-
-.fancybox-loading {
-    animation: fancybox-rotate 1s linear infinite;
-    background: transparent;
-    border: 4px solid #888;
-    border-bottom-color: #fff;
-    border-radius: 50%;
-    height: 50px;
-    left: 50%;
-    margin: -25px 0 0 -25px;
-    opacity: .7;
-    padding: 0;
-    position: absolute;
-    top: 50%;
-    width: 50px;
-    z-index: 99999;
-}
-
-@keyframes fancybox-rotate {
-    100% {
-        transform: rotate(360deg);
-    }
-}
-
-/* Transition effects */
-
-.fancybox-animated {
-    transition-timing-function: cubic-bezier(0, 0, .25, 1);
-}
-
-/* transitionEffect: slide */
-
-.fancybox-fx-slide.fancybox-slide--previous {
-    opacity: 0;
-    transform: translate3d(-100%, 0, 0);
-}
-
-.fancybox-fx-slide.fancybox-slide--next {
-    opacity: 0;
-    transform: translate3d(100%, 0, 0);
-}
-
-.fancybox-fx-slide.fancybox-slide--current {
-    opacity: 1;
-    transform: translate3d(0, 0, 0);
-}
-
-/* transitionEffect: fade */
-
-.fancybox-fx-fade.fancybox-slide--previous,
-.fancybox-fx-fade.fancybox-slide--next {
-    opacity: 0;
-    transition-timing-function: cubic-bezier(.19, 1, .22, 1);
-}
-
-.fancybox-fx-fade.fancybox-slide--current {
-    opacity: 1;
-}
-
-/* transitionEffect: zoom-in-out */
-
-.fancybox-fx-zoom-in-out.fancybox-slide--previous {
-    opacity: 0;
-    transform: scale3d(1.5, 1.5, 1.5);
-}
-
-.fancybox-fx-zoom-in-out.fancybox-slide--next {
-    opacity: 0;
-    transform: scale3d(.5, .5, .5);
-}
-
-.fancybox-fx-zoom-in-out.fancybox-slide--current {
-    opacity: 1;
-    transform: scale3d(1, 1, 1);
-}
-
-/* transitionEffect: rotate */
-
-.fancybox-fx-rotate.fancybox-slide--previous {
-    opacity: 0;
-    -ms-transform: rotate(-360deg);
-    transform: rotate(-360deg);
-}
-
-.fancybox-fx-rotate.fancybox-slide--next {
-    opacity: 0;
-    -ms-transform: rotate(360deg);
-    transform: rotate(360deg);
-}
-
-.fancybox-fx-rotate.fancybox-slide--current {
-    opacity: 1;
-    -ms-transform: rotate(0deg);
-    transform: rotate(0deg);
-}
-
-/* transitionEffect: circular */
-
-.fancybox-fx-circular.fancybox-slide--previous {
-    opacity: 0;
-    transform: scale3d(0, 0, 0) translate3d(-100%, 0, 0);
-}
-
-.fancybox-fx-circular.fancybox-slide--next {
-    opacity: 0;
-    transform: scale3d(0, 0, 0) translate3d(100%, 0, 0);
-}
-
-.fancybox-fx-circular.fancybox-slide--current {
-    opacity: 1;
-    transform: scale3d(1, 1, 1) translate3d(0, 0, 0);
-}
-
-/* transitionEffect: tube */
-
-.fancybox-fx-tube.fancybox-slide--previous {
-    transform: translate3d(-100%, 0, 0) scale(.1) skew(-10deg);
-}
-
-.fancybox-fx-tube.fancybox-slide--next {
-    transform: translate3d(100%, 0, 0) scale(.1) skew(10deg);
-}
-
-.fancybox-fx-tube.fancybox-slide--current {
-    transform: translate3d(0, 0, 0) scale(1);
-}
-
-/* Styling for Small-Screen Devices */
-@media all and (max-height: 576px) {
-    .fancybox-slide {
-        padding-left: 6px;
-        padding-right: 6px;
-    }
-
-    .fancybox-slide--image {
-        padding: 6px 0;
-    }
-
-    .fancybox-close-small {
-        right: -6px;
-    }
-
-    .fancybox-slide--image .fancybox-close-small {
-        background: #4e4e4e;
-        color: #f2f4f6;
-        height: 36px;
-        opacity: 1;
-        padding: 6px;
-        right: 0;
-        top: 0;
-        width: 36px;
-    }
-
-    .fancybox-caption {
-        padding-left: 12px;
-        padding-right: 12px;
-    }
-
-    @supports (padding: max(0px)) {
-        .fancybox-caption {
-            padding-left: max(12px, env(safe-area-inset-left));
-            padding-right: max(12px, env(safe-area-inset-right));
-        }
-    }
-}
-/* Share */
-
-.fancybox-share {
-    background: #f4f4f4;
-    border-radius: 3px;
-    max-width: 90%;
-    padding: 30px;
-    text-align: center;
-}
-
-.fancybox-share h1 {
-    color: #222;
-    font-size: 35px;
-    font-weight: 700;
-    margin: 0 0 20px 0;
-}
-
-.fancybox-share p {
-    margin: 0;
-    padding: 0;
-}
-
-.fancybox-share__button {
-    border: 0;
-    border-radius: 3px;
-    display: inline-block;
-    font-size: 14px;
-    font-weight: 700;
-    line-height: 40px;
-    margin: 0 5px 10px 5px;
-    min-width: 130px;
-    padding: 0 15px;
-    text-decoration: none;
-    transition: all .2s;
-    -webkit-user-select: none;
-    -moz-user-select: none;
-    -ms-user-select: none;
-    user-select: none;
-    white-space: nowrap;
-}
-
-.fancybox-share__button:visited,
-.fancybox-share__button:link {
-    color: #fff;
-}
-
-.fancybox-share__button:hover {
-    text-decoration: none;
-}
-
-.fancybox-share__button--fb {
-    background: #3b5998;
-}
-
-.fancybox-share__button--fb:hover {
-    background: #344e86;
-}
-
-.fancybox-share__button--pt {
-    background: #bd081d;
-}
-
-.fancybox-share__button--pt:hover {
-    background: #aa0719;
-}
-
-.fancybox-share__button--tw {
-    background: #1da1f2;
-}
-
-.fancybox-share__button--tw:hover {
-    background: #0d95e8;
-}
-
-.fancybox-share__button svg {
-    height: 25px;
-    margin-right: 7px;
-    position: relative;
-    top: -1px;
-    vertical-align: middle;
-    width: 25px;
-}
-
-.fancybox-share__button svg path {
-    fill: #fff;
-}
-
-.fancybox-share__input {
-    background: transparent;
-    border: 0;
-    border-bottom: 1px solid #d7d7d7;
-    border-radius: 0;
-    color: #5d5b5b;
-    font-size: 14px;
-    margin: 10px 0 0 0;
-    outline: none;
-    padding: 10px 15px;
-    width: 100%;
-}
-/* Thumbs */
-
-.fancybox-thumbs {
-    background: #ddd;
-    bottom: 0;
-    display: none;
-    margin: 0;
-    -webkit-overflow-scrolling: touch;
-    -ms-overflow-style: -ms-autohiding-scrollbar;
-    padding: 2px 2px 4px 2px;
-    position: absolute;
-    right: 0;
-    -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
-    top: 0;
-    width: 212px;
-    z-index: 99995;
-}
-
-.fancybox-thumbs-x {
-    overflow-x: auto;
-    overflow-y: hidden;
-}
-
-.fancybox-show-thumbs .fancybox-thumbs {
-    display: block;
-}
-
-.fancybox-show-thumbs .fancybox-inner {
-    right: 212px;
-}
-
-.fancybox-thumbs__list {
-    font-size: 0;
-    height: 100%;
-    list-style: none;
-    margin: 0;
-    overflow-x: hidden;
-    overflow-y: auto;
-    padding: 0;
-    position: absolute;
-    position: relative;
-    white-space: nowrap;
-    width: 100%;
-}
-
-.fancybox-thumbs-x .fancybox-thumbs__list {
-    overflow: hidden;
-}
-
-.fancybox-thumbs-y .fancybox-thumbs__list::-webkit-scrollbar {
-    width: 7px;
-}
-
-.fancybox-thumbs-y .fancybox-thumbs__list::-webkit-scrollbar-track {
-    background: #fff;
-    border-radius: 10px;
-    box-shadow: inset 0 0 6px rgba(0, 0, 0, .3);
-}
-
-.fancybox-thumbs-y .fancybox-thumbs__list::-webkit-scrollbar-thumb {
-    background: #2a2a2a;
-    border-radius: 10px;
-}
-
-.fancybox-thumbs__list a {
-    -webkit-backface-visibility: hidden;
-    backface-visibility: hidden;
-    background-color: rgba(0, 0, 0, .1);
-    background-position: center center;
-    background-repeat: no-repeat;
-    background-size: cover;
-    cursor: pointer;
-    float: left;
-    height: 75px;
-    margin: 2px;
-    max-height: calc(100% - 8px);
-    max-width: calc(50% - 4px);
-    outline: none;
-    overflow: hidden;
-    padding: 0;
-    position: relative;
-    -webkit-tap-highlight-color: transparent;
-    width: 100px;
-}
-
-.fancybox-thumbs__list a::before {
-    border: 6px solid #ff5268;
-    bottom: 0;
-    content: '';
-    left: 0;
-    opacity: 0;
-    position: absolute;
-    right: 0;
-    top: 0;
-    transition: all .2s cubic-bezier(.25, .46, .45, .94);
-    z-index: 99991;
-}
-
-.fancybox-thumbs__list a:focus::before {
-    opacity: .5;
-}
-
-.fancybox-thumbs__list a.fancybox-thumbs-active::before {
-    opacity: 1;
-}
-
-/* Styling for Small-Screen Devices */
-@media all and (max-width: 576px) {
-    .fancybox-thumbs {
-        width: 110px;
-    }
-
-    .fancybox-show-thumbs .fancybox-inner {
-        right: 110px;
-    }
-
-    .fancybox-thumbs__list a {
-        max-width: calc(100% - 10px);
-    }
-}
\ No newline at end of file
diff --git a/fancybox/asset/fancybox/jquery.fancybox.js b/fancybox/asset/fancybox/jquery.fancybox.js
deleted file mode 100644
index 806b2703..00000000
--- a/fancybox/asset/fancybox/jquery.fancybox.js
+++ /dev/null
@@ -1,5632 +0,0 @@
-// ==================================================
-// fancyBox v3.5.7
-//
-// Licensed GPLv3 for open source use
-// or fancyBox Commercial License for commercial use
-//
-// http://fancyapps.com/fancybox/
-// Copyright 2019 fancyApps
-//
-// ==================================================
-(function (window, document, $, undefined) {
-  "use strict";
-
-  window.console = window.console || {
-    info: function (stuff) {}
-  };
-
-  // If there's no jQuery, fancyBox can't work
-  // =========================================
-
-  if (!$) {
-    return;
-  }
-
-  // Check if fancyBox is already initialized
-  // ========================================
-
-  if ($.fn.fancybox) {
-    console.info("fancyBox already initialized");
-
-    return;
-  }
-
-  // Private default settings
-  // ========================
-
-  var defaults = {
-    // Close existing modals
-    // Set this to false if you do not need to stack multiple instances
-    closeExisting: false,
-
-    // Enable infinite gallery navigation
-    loop: false,
-
-    // Horizontal space between slides
-    gutter: 50,
-
-    // Enable keyboard navigation
-    keyboard: true,
-
-    // Should allow caption to overlap the content
-    preventCaptionOverlap: true,
-
-    // Should display navigation arrows at the screen edges
-    arrows: true,
-
-    // Should display counter at the top left corner
-    infobar: true,
-
-    // Should display close button (using `btnTpl.smallBtn` template) over the content
-    // Can be true, false, "auto"
-    // If "auto" - will be automatically enabled for "html", "inline" or "ajax" items
-    smallBtn: "auto",
-
-    // Should display toolbar (buttons at the top)
-    // Can be true, false, "auto"
-    // If "auto" - will be automatically hidden if "smallBtn" is enabled
-    toolbar: "auto",
-
-    // What buttons should appear in the top right corner.
-    // Buttons will be created using templates from `btnTpl` option
-    // and they will be placed into toolbar (class="fancybox-toolbar"` element)
-    buttons: [
-      "zoom",
-      //"share",
-      "slideShow",
-      //"fullScreen",
-      //"download",
-      "thumbs",
-      "close"
-    ],
-
-    // Detect "idle" time in seconds
-    idleTime: 3,
-
-    // Disable right-click and use simple image protection for images
-    protect: false,
-
-    // Shortcut to make content "modal" - disable keyboard navigtion, hide buttons, etc
-    modal: false,
-
-    image: {
-      // Wait for images to load before displaying
-      //   true  - wait for image to load and then display;
-      //   false - display thumbnail and load the full-sized image over top,
-      //           requires predefined image dimensions (`data-width` and `data-height` attributes)
-      preload: false
-    },
-
-    ajax: {
-      // Object containing settings for ajax request
-      settings: {
-        // This helps to indicate that request comes from the modal
-        // Feel free to change naming
-        data: {
-          fancybox: true
-        }
-      }
-    },
-
-    iframe: {
-      // Iframe template
-      tpl: '<iframe id="fancybox-frame{rnd}" name="fancybox-frame{rnd}" class="fancybox-iframe" allowfullscreen="allowfullscreen" allow="autoplay; fullscreen" src=""></iframe>',
-
-      // Preload iframe before displaying it
-      // This allows to calculate iframe content width and height
-      // (note: Due to "Same Origin Policy", you can't get cross domain data).
-      preload: true,
-
-      // Custom CSS styling for iframe wrapping element
-      // You can use this to set custom iframe dimensions
-      css: {},
-
-      // Iframe tag attributes
-      attr: {
-        scrolling: "auto"
-      }
-    },
-
-    // For HTML5 video only
-    video: {
-      tpl: '<video class="fancybox-video" controls controlsList="nodownload" poster="{{poster}}">' +
-        '<source src="{{src}}" type="{{format}}" />' +
-        'Sorry, your browser doesn\'t support embedded videos, <a href="{{src}}">download</a> and watch with your favorite video player!' +
-        "</video>",
-      format: "", // custom video format
-      autoStart: true
-    },
-
-    // Default content type if cannot be detected automatically
-    defaultType: "image",
-
-    // Open/close animation type
-    // Possible values:
-    //   false            - disable
-    //   "zoom"           - zoom images from/to thumbnail
-    //   "fade"
-    //   "zoom-in-out"
-    //
-    animationEffect: "zoom",
-
-    // Duration in ms for open/close animation
-    animationDuration: 366,
-
-    // Should image change opacity while zooming
-    // If opacity is "auto", then opacity will be changed if image and thumbnail have different aspect ratios
-    zoomOpacity: "auto",
-
-    // Transition effect between slides
-    //
-    // Possible values:
-    //   false            - disable
-    //   "fade'
-    //   "slide'
-    //   "circular'
-    //   "tube'
-    //   "zoom-in-out'
-    //   "rotate'
-    //
-    transitionEffect: "fade",
-
-    // Duration in ms for transition animation
-    transitionDuration: 366,
-
-    // Custom CSS class for slide element
-    slideClass: "",
-
-    // Custom CSS class for layout
-    baseClass: "",
-
-    // Base template for layout
-    baseTpl: '<div class="fancybox-container" role="dialog" tabindex="-1">' +
-      '<div class="fancybox-bg"></div>' +
-      '<div class="fancybox-inner">' +
-      '<div class="fancybox-infobar"><span data-fancybox-index></span>&nbsp;/&nbsp;<span data-fancybox-count></span></div>' +
-      '<div class="fancybox-toolbar">{{buttons}}</div>' +
-      '<div class="fancybox-navigation">{{arrows}}</div>' +
-      '<div class="fancybox-stage"></div>' +
-      '<div class="fancybox-caption"><div class="fancybox-caption__body"></div></div>' +
-      "</div>" +
-      "</div>",
-
-    // Loading indicator template
-    spinnerTpl: '<div class="fancybox-loading"></div>',
-
-    // Error message template
-    errorTpl: '<div class="fancybox-error"><p>{{ERROR}}</p></div>',
-
-    btnTpl: {
-      download: '<a download data-fancybox-download class="fancybox-button fancybox-button--download" title="{{DOWNLOAD}}" href="javascript:;">' +
-        '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M18.62 17.09V19H5.38v-1.91zm-2.97-6.96L17 11.45l-5 4.87-5-4.87 1.36-1.32 2.68 2.64V5h1.92v7.77z"/></svg>' +
-        "</a>",
-
-      zoom: '<button data-fancybox-zoom class="fancybox-button fancybox-button--zoom" title="{{ZOOM}}">' +
-        '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M18.7 17.3l-3-3a5.9 5.9 0 0 0-.6-7.6 5.9 5.9 0 0 0-8.4 0 5.9 5.9 0 0 0 0 8.4 5.9 5.9 0 0 0 7.7.7l3 3a1 1 0 0 0 1.3 0c.4-.5.4-1 0-1.5zM8.1 13.8a4 4 0 0 1 0-5.7 4 4 0 0 1 5.7 0 4 4 0 0 1 0 5.7 4 4 0 0 1-5.7 0z"/></svg>' +
-        "</button>",
-
-      close: '<button data-fancybox-close class="fancybox-button fancybox-button--close" title="{{CLOSE}}">' +
-        '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M12 10.6L6.6 5.2 5.2 6.6l5.4 5.4-5.4 5.4 1.4 1.4 5.4-5.4 5.4 5.4 1.4-1.4-5.4-5.4 5.4-5.4-1.4-1.4-5.4 5.4z"/></svg>' +
-        "</button>",
-
-      // Arrows
-      arrowLeft: '<button data-fancybox-prev class="fancybox-button fancybox-button--arrow_left" title="{{PREV}}">' +
-        '<div><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M11.28 15.7l-1.34 1.37L5 12l4.94-5.07 1.34 1.38-2.68 2.72H19v1.94H8.6z"/></svg></div>' +
-        "</button>",
-
-      arrowRight: '<button data-fancybox-next class="fancybox-button fancybox-button--arrow_right" title="{{NEXT}}">' +
-        '<div><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M15.4 12.97l-2.68 2.72 1.34 1.38L19 12l-4.94-5.07-1.34 1.38 2.68 2.72H5v1.94z"/></svg></div>' +
-        "</button>",
-
-      // This small close button will be appended to your html/inline/ajax content by default,
-      // if "smallBtn" option is not set to false
-      smallBtn: '<button type="button" data-fancybox-close class="fancybox-button fancybox-close-small" title="{{CLOSE}}">' +
-        '<svg xmlns="http://www.w3.org/2000/svg" version="1" viewBox="0 0 24 24"><path d="M13 12l5-5-1-1-5 5-5-5-1 1 5 5-5 5 1 1 5-5 5 5 1-1z"/></svg>' +
-        "</button>"
-    },
-
-    // Container is injected into this element
-    parentEl: "body",
-
-    // Hide browser vertical scrollbars; use at your own risk
-    hideScrollbar: true,
-
-    // Focus handling
-    // ==============
-
-    // Try to focus on the first focusable element after opening
-    autoFocus: true,
-
-    // Put focus back to active element after closing
-    backFocus: true,
-
-    // Do not let user to focus on element outside modal content
-    trapFocus: true,
-
-    // Module specific options
-    // =======================
-
-    fullScreen: {
-      autoStart: false
-    },
-
-    // Set `touch: false` to disable panning/swiping
-    touch: {
-      vertical: true, // Allow to drag content vertically
-      momentum: true // Continue movement after releasing mouse/touch when panning
-    },
-
-    // Hash value when initializing manually,
-    // set `false` to disable hash change
-    hash: null,
-
-    // Customize or add new media types
-    // Example:
-    /*
-      media : {
-        youtube : {
-          params : {
-            autoplay : 0
-          }
-        }
-      }
-    */
-    media: {},
-
-    slideShow: {
-      autoStart: false,
-      speed: 3000
-    },
-
-    thumbs: {
-      autoStart: false, // Display thumbnails on opening
-      hideOnClose: true, // Hide thumbnail grid when closing animation starts
-      parentEl: ".fancybox-container", // Container is injected into this element
-      axis: "y" // Vertical (y) or horizontal (x) scrolling
-    },
-
-    // Use mousewheel to navigate gallery
-    // If 'auto' - enabled for images only
-    wheel: "auto",
-
-    // Callbacks
-    //==========
-
-    // See Documentation/API/Events for more information
-    // Example:
-    /*
-      afterShow: function( instance, current ) {
-        console.info( 'Clicked element:' );
-        console.info( current.opts.$orig );
-      }
-    */
-
-    onInit: $.noop, // When instance has been initialized
-
-    beforeLoad: $.noop, // Before the content of a slide is being loaded
-    afterLoad: $.noop, // When the content of a slide is done loading
-
-    beforeShow: $.noop, // Before open animation starts
-    afterShow: $.noop, // When content is done loading and animating
-
-    beforeClose: $.noop, // Before the instance attempts to close. Return false to cancel the close.
-    afterClose: $.noop, // After instance has been closed
-
-    onActivate: $.noop, // When instance is brought to front
-    onDeactivate: $.noop, // When other instance has been activated
-
-    // Interaction
-    // ===========
-
-    // Use options below to customize taken action when user clicks or double clicks on the fancyBox area,
-    // each option can be string or method that returns value.
-    //
-    // Possible values:
-    //   "close"           - close instance
-    //   "next"            - move to next gallery item
-    //   "nextOrClose"     - move to next gallery item or close if gallery has only one item
-    //   "toggleControls"  - show/hide controls
-    //   "zoom"            - zoom image (if loaded)
-    //   false             - do nothing
-
-    // Clicked on the content
-    clickContent: function (current, event) {
-      return current.type === "image" ? "zoom" : false;
-    },
-
-    // Clicked on the slide
-    clickSlide: "close",
-
-    // Clicked on the background (backdrop) element;
-    // if you have not changed the layout, then most likely you need to use `clickSlide` option
-    clickOutside: "close",
-
-    // Same as previous two, but for double click
-    dblclickContent: false,
-    dblclickSlide: false,
-    dblclickOutside: false,
-
-    // Custom options when mobile device is detected
-    // =============================================
-
-    mobile: {
-      preventCaptionOverlap: false,
-      idleTime: false,
-      clickContent: function (current, event) {
-        return current.type === "image" ? "toggleControls" : false;
-      },
-      clickSlide: function (current, event) {
-        return current.type === "image" ? "toggleControls" : "close";
-      },
-      dblclickContent: function (current, event) {
-        return current.type === "image" ? "zoom" : false;
-      },
-      dblclickSlide: function (current, event) {
-        return current.type === "image" ? "zoom" : false;
-      }
-    },
-
-    // Internationalization
-    // ====================
-
-    lang: "en",
-    i18n: {
-      en: {
-        CLOSE: "Close",
-        NEXT: "Next",
-        PREV: "Previous",
-        ERROR: "The requested content cannot be loaded. <br/> Please try again later.",
-        PLAY_START: "Start slideshow",
-        PLAY_STOP: "Pause slideshow",
-        FULL_SCREEN: "Full screen",
-        THUMBS: "Thumbnails",
-        DOWNLOAD: "Download",
-        SHARE: "Share",
-        ZOOM: "Zoom"
-      },
-      de: {
-        CLOSE: "Schlie&szlig;en",
-        NEXT: "Weiter",
-        PREV: "Zur&uuml;ck",
-        ERROR: "Die angeforderten Daten konnten nicht geladen werden. <br/> Bitte versuchen Sie es sp&auml;ter nochmal.",
-        PLAY_START: "Diaschau starten",
-        PLAY_STOP: "Diaschau beenden",
-        FULL_SCREEN: "Vollbild",
-        THUMBS: "Vorschaubilder",
-        DOWNLOAD: "Herunterladen",
-        SHARE: "Teilen",
-        ZOOM: "Vergr&ouml;&szlig;ern"
-      }
-    }
-  };
-
-  // Few useful variables and methods
-  // ================================
-
-  var $W = $(window);
-  var $D = $(document);
-
-  var called = 0;
-
-  // Check if an object is a jQuery object and not a native JavaScript object
-  // ========================================================================
-  var isQuery = function (obj) {
-    return obj && obj.hasOwnProperty && obj instanceof $;
-  };
-
-  // Handle multiple browsers for "requestAnimationFrame" and "cancelAnimationFrame"
-  // ===============================================================================
-  var requestAFrame = (function () {
-    return (
-      window.requestAnimationFrame ||
-      window.webkitRequestAnimationFrame ||
-      window.mozRequestAnimationFrame ||
-      window.oRequestAnimationFrame ||
-      // if all else fails, use setTimeout
-      function (callback) {
-        return window.setTimeout(callback, 1000 / 60);
-      }
-    );
-  })();
-
-  var cancelAFrame = (function () {
-    return (
-      window.cancelAnimationFrame ||
-      window.webkitCancelAnimationFrame ||
-      window.mozCancelAnimationFrame ||
-      window.oCancelAnimationFrame ||
-      function (id) {
-        window.clearTimeout(id);
-      }
-    );
-  })();
-
-  // Detect the supported transition-end event property name
-  // =======================================================
-  var transitionEnd = (function () {
-    var el = document.createElement("fakeelement"),
-      t;
-
-    var transitions = {
-      transition: "transitionend",
-      OTransition: "oTransitionEnd",
-      MozTransition: "transitionend",
-      WebkitTransition: "webkitTransitionEnd"
-    };
-
-    for (t in transitions) {
-      if (el.style[t] !== undefined) {
-        return transitions[t];
-      }
-    }
-
-    return "transitionend";
-  })();
-
-  // Force redraw on an element.
-  // This helps in cases where the browser doesn't redraw an updated element properly
-  // ================================================================================
-  var forceRedraw = function ($el) {
-    return $el && $el.length && $el[0].offsetHeight;
-  };
-
-  // Exclude array (`buttons`) options from deep merging
-  // ===================================================
-  var mergeOpts = function (opts1, opts2) {
-    var rez = $.extend(true, {}, opts1, opts2);
-
-    $.each(opts2, function (key, value) {
-      if ($.isArray(value)) {
-        rez[key] = value;
-      }
-    });
-
-    return rez;
-  };
-
-  // How much of an element is visible in viewport
-  // =============================================
-
-  var inViewport = function (elem) {
-    var elemCenter, rez;
-
-    if (!elem || elem.ownerDocument !== document) {
-      return false;
-    }
-
-    $(".fancybox-container").css("pointer-events", "none");
-
-    elemCenter = {
-      x: elem.getBoundingClientRect().left + elem.offsetWidth / 2,
-      y: elem.getBoundingClientRect().top + elem.offsetHeight / 2
-    };
-
-    rez = document.elementFromPoint(elemCenter.x, elemCenter.y) === elem;
-
-    $(".fancybox-container").css("pointer-events", "");
-
-    return rez;
-  };
-
-  // Class definition
-  // ================
-
-  var FancyBox = function (content, opts, index) {
-    var self = this;
-
-    self.opts = mergeOpts({
-      index: index
-    }, $.fancybox.defaults);
-
-    if ($.isPlainObject(opts)) {
-      self.opts = mergeOpts(self.opts, opts);
-    }
-
-    if ($.fancybox.isMobile) {
-      self.opts = mergeOpts(self.opts, self.opts.mobile);
-    }
-
-    self.id = self.opts.id || ++called;
-
-    self.currIndex = parseInt(self.opts.index, 10) || 0;
-    self.prevIndex = null;
-
-    self.prevPos = null;
-    self.currPos = 0;
-
-    self.firstRun = true;
-
-    // All group items
-    self.group = [];
-
-    // Existing slides (for current, next and previous gallery items)
-    self.slides = {};
-
-    // Create group elements
-    self.addContent(content);
-
-    if (!self.group.length) {
-      return;
-    }
-
-    self.init();
-  };
-
-  $.extend(FancyBox.prototype, {
-    // Create DOM structure
-    // ====================
-
-    init: function () {
-      var self = this,
-        firstItem = self.group[self.currIndex],
-        firstItemOpts = firstItem.opts,
-        $container,
-        buttonStr;
-
-      if (firstItemOpts.closeExisting) {
-        $.fancybox.close(true);
-      }
-
-      // Hide scrollbars
-      // ===============
-
-      $("body").addClass("fancybox-active");
-
-      if (
-        !$.fancybox.getInstance() &&
-        firstItemOpts.hideScrollbar !== false &&
-        !$.fancybox.isMobile &&
-        document.body.scrollHeight > window.innerHeight
-      ) {
-        $("head").append(
-          '<style id="fancybox-style-noscroll" type="text/css">.compensate-for-scrollbar{margin-right:' +
-          (window.innerWidth - document.documentElement.clientWidth) +
-          "px;}</style>"
-        );
-
-        $("body").addClass("compensate-for-scrollbar");
-      }
-
-      // Build html markup and set references
-      // ====================================
-
-      // Build html code for buttons and insert into main template
-      buttonStr = "";
-
-      $.each(firstItemOpts.buttons, function (index, value) {
-        buttonStr += firstItemOpts.btnTpl[value] || "";
-      });
-
-      // Create markup from base template, it will be initially hidden to
-      // avoid unnecessary work like painting while initializing is not complete
-      $container = $(
-          self.translate(
-            self,
-            firstItemOpts.baseTpl
-            .replace("{{buttons}}", buttonStr)
-            .replace("{{arrows}}", firstItemOpts.btnTpl.arrowLeft + firstItemOpts.btnTpl.arrowRight)
-          )
-        )
-        .attr("id", "fancybox-container-" + self.id)
-        .addClass(firstItemOpts.baseClass)
-        .data("FancyBox", self)
-        .appendTo(firstItemOpts.parentEl);
-
-      // Create object holding references to jQuery wrapped nodes
-      self.$refs = {
-        container: $container
-      };
-
-      ["bg", "inner", "infobar", "toolbar", "stage", "caption", "navigation"].forEach(function (item) {
-        self.$refs[item] = $container.find(".fancybox-" + item);
-      });
-
-      self.trigger("onInit");
-
-      // Enable events, deactive previous instances
-      self.activate();
-
-      // Build slides, load and reveal content
-      self.jumpTo(self.currIndex);
-    },
-
-    // Simple i18n support - replaces object keys found in template
-    // with corresponding values
-    // ============================================================
-
-    translate: function (obj, str) {
-      var arr = obj.opts.i18n[obj.opts.lang] || obj.opts.i18n.en;
-
-      return str.replace(/\{\{(\w+)\}\}/g, function (match, n) {
-        return arr[n] === undefined ? match : arr[n];
-      });
-    },
-
-    // Populate current group with fresh content
-    // Check if each object has valid type and content
-    // ===============================================
-
-    addContent: function (content) {
-      var self = this,
-        items = $.makeArray(content),
-        thumbs;
-
-      $.each(items, function (i, item) {
-        var obj = {},
-          opts = {},
-          $item,
-          type,
-          found,
-          src,
-          srcParts;
-
-        // Step 1 - Make sure we have an object
-        // ====================================
-
-        if ($.isPlainObject(item)) {
-          // We probably have manual usage here, something like
-          // $.fancybox.open( [ { src : "image.jpg", type : "image" } ] )
-
-          obj = item;
-          opts = item.opts || item;
-        } else if ($.type(item) === "object" && $(item).length) {
-          // Here we probably have jQuery collection returned by some selector
-          $item = $(item);
-
-          // Support attributes like `data-options='{"touch" : false}'` and `data-touch='false'`
-          opts = $item.data() || {};
-          opts = $.extend(true, {}, opts, opts.options);
-
-          // Here we store clicked element
-          opts.$orig = $item;
-
-          obj.src = self.opts.src || opts.src || $item.attr("href");
-
-          // Assume that simple syntax is used, for example:
-          //   `$.fancybox.open( $("#test"), {} );`
-          if (!obj.type && !obj.src) {
-            obj.type = "inline";
-            obj.src = item;
-          }
-        } else {
-          // Assume we have a simple html code, for example:
-          //   $.fancybox.open( '<div><h1>Hi!</h1></div>' );
-          obj = {
-            type: "html",
-            src: item + ""
-          };
-        }
-
-        // Each gallery object has full collection of options
-        obj.opts = $.extend(true, {}, self.opts, opts);
-
-        // Do not merge buttons array
-        if ($.isArray(opts.buttons)) {
-          obj.opts.buttons = opts.buttons;
-        }
-
-        if ($.fancybox.isMobile && obj.opts.mobile) {
-          obj.opts = mergeOpts(obj.opts, obj.opts.mobile);
-        }
-
-        // Step 2 - Make sure we have content type, if not - try to guess
-        // ==============================================================
-
-        type = obj.type || obj.opts.type;
-        src = obj.src || "";
-
-        if (!type && src) {
-          if ((found = src.match(/\.(mp4|mov|ogv|webm)((\?|#).*)?$/i))) {
-            type = "video";
-
-            if (!obj.opts.video.format) {
-              obj.opts.video.format = "video/" + (found[1] === "ogv" ? "ogg" : found[1]);
-            }
-          } else if (src.match(/(^data:image\/[a-z0-9+\/=]*,)|(\.(jp(e|g|eg)|gif|png|bmp|webp|svg|ico)((\?|#).*)?$)/i)) {
-            type = "image";
-          } else if (src.match(/\.(pdf)((\?|#).*)?$/i)) {
-            type = "iframe";
-            obj = $.extend(true, obj, {
-              contentType: "pdf",
-              opts: {
-                iframe: {
-                  preload: false
-                }
-              }
-            });
-          } else if (src.charAt(0) === "#") {
-            type = "inline";
-          }
-        }
-
-        if (type) {
-          obj.type = type;
-        } else {
-          self.trigger("objectNeedsType", obj);
-        }
-
-        if (!obj.contentType) {
-          obj.contentType = $.inArray(obj.type, ["html", "inline", "ajax"]) > -1 ? "html" : obj.type;
-        }
-
-        // Step 3 - Some adjustments
-        // =========================
-
-        obj.index = self.group.length;
-
-        if (obj.opts.smallBtn == "auto") {
-          obj.opts.smallBtn = $.inArray(obj.type, ["html", "inline", "ajax"]) > -1;
-        }
-
-        if (obj.opts.toolbar === "auto") {
-          obj.opts.toolbar = !obj.opts.smallBtn;
-        }
-
-        // Find thumbnail image, check if exists and if is in the viewport
-        obj.$thumb = obj.opts.$thumb || null;
-
-        if (obj.opts.$trigger && obj.index === self.opts.index) {
-          obj.$thumb = obj.opts.$trigger.find("img:first");
-
-          if (obj.$thumb.length) {
-            obj.opts.$orig = obj.opts.$trigger;
-          }
-        }
-
-        if (!(obj.$thumb && obj.$thumb.length) && obj.opts.$orig) {
-          obj.$thumb = obj.opts.$orig.find("img:first");
-        }
-
-        if (obj.$thumb && !obj.$thumb.length) {
-          obj.$thumb = null;
-        }
-
-        obj.thumb = obj.opts.thumb || (obj.$thumb ? obj.$thumb[0].src : null);
-
-        // "caption" is a "special" option, it can be used to customize caption per gallery item
-        if ($.type(obj.opts.caption) === "function") {
-          obj.opts.caption = obj.opts.caption.apply(item, [self, obj]);
-        }
-
-        if ($.type(self.opts.caption) === "function") {
-          obj.opts.caption = self.opts.caption.apply(item, [self, obj]);
-        }
-
-        // Make sure we have caption as a string or jQuery object
-        if (!(obj.opts.caption instanceof $)) {
-          obj.opts.caption = obj.opts.caption === undefined ? "" : obj.opts.caption + "";
-        }
-
-        // Check if url contains "filter" used to filter the content
-        // Example: "ajax.html #something"
-        if (obj.type === "ajax") {
-          srcParts = src.split(/\s+/, 2);
-
-          if (srcParts.length > 1) {
-            obj.src = srcParts.shift();
-
-            obj.opts.filter = srcParts.shift();
-          }
-        }
-
-        // Hide all buttons and disable interactivity for modal items
-        if (obj.opts.modal) {
-          obj.opts = $.extend(true, obj.opts, {
-            trapFocus: true,
-            // Remove buttons
-            infobar: 0,
-            toolbar: 0,
-
-            smallBtn: 0,
-
-            // Disable keyboard navigation
-            keyboard: 0,
-
-            // Disable some modules
-            slideShow: 0,
-            fullScreen: 0,
-            thumbs: 0,
-            touch: 0,
-
-            // Disable click event handlers
-            clickContent: false,
-            clickSlide: false,
-            clickOutside: false,
-            dblclickContent: false,
-            dblclickSlide: false,
-            dblclickOutside: false
-          });
-        }
-
-        // Step 4 - Add processed object to group
-        // ======================================
-
-        self.group.push(obj);
-      });
-
-      // Update controls if gallery is already opened
-      if (Object.keys(self.slides).length) {
-        self.updateControls();
-
-        // Update thumbnails, if needed
-        thumbs = self.Thumbs;
-
-        if (thumbs && thumbs.isActive) {
-          thumbs.create();
-
-          thumbs.focus();
-        }
-      }
-    },
-
-    // Attach an event handler functions for:
-    //   - navigation buttons
-    //   - browser scrolling, resizing;
-    //   - focusing
-    //   - keyboard
-    //   - detecting inactivity
-    // ======================================
-
-    addEvents: function () {
-      var self = this;
-
-      self.removeEvents();
-
-      // Make navigation elements clickable
-      // ==================================
-
-      self.$refs.container
-        .on("click.fb-close", "[data-fancybox-close]", function (e) {
-          e.stopPropagation();
-          e.preventDefault();
-
-          self.close(e);
-        })
-        .on("touchstart.fb-prev click.fb-prev", "[data-fancybox-prev]", function (e) {
-          e.stopPropagation();
-          e.preventDefault();
-
-          self.previous();
-        })
-        .on("touchstart.fb-next click.fb-next", "[data-fancybox-next]", function (e) {
-          e.stopPropagation();
-          e.preventDefault();
-
-          self.next();
-        })
-        .on("click.fb", "[data-fancybox-zoom]", function (e) {
-          // Click handler for zoom button
-          self[self.isScaledDown() ? "scaleToActual" : "scaleToFit"]();
-        });
-
-      // Handle page scrolling and browser resizing
-      // ==========================================
-
-      $W.on("orientationchange.fb resize.fb", function (e) {
-        if (e && e.originalEvent && e.originalEvent.type === "resize") {
-          if (self.requestId) {
-            cancelAFrame(self.requestId);
-          }
-
-          self.requestId = requestAFrame(function () {
-            self.update(e);
-          });
-        } else {
-          if (self.current && self.current.type === "iframe") {
-            self.$refs.stage.hide();
-          }
-
-          setTimeout(
-            function () {
-              self.$refs.stage.show();
-
-              self.update(e);
-            },
-            $.fancybox.isMobile ? 600 : 250
-          );
-        }
-      });
-
-      $D.on("keydown.fb", function (e) {
-        var instance = $.fancybox ? $.fancybox.getInstance() : null,
-          current = instance.current,
-          keycode = e.keyCode || e.which;
-
-        // Trap keyboard focus inside of the modal
-        // =======================================
-
-        if (keycode == 9) {
-          if (current.opts.trapFocus) {
-            self.focus(e);
-          }
-
-          return;
-        }
-
-        // Enable keyboard navigation
-        // ==========================
-
-        if (!current.opts.keyboard || e.ctrlKey || e.altKey || e.shiftKey || $(e.target).is("input,textarea,video,audio,select")) {
-          return;
-        }
-
-        // Backspace and Esc keys
-        if (keycode === 8 || keycode === 27) {
-          e.preventDefault();
-
-          self.close(e);
-
-          return;
-        }
-
-        // Left arrow and Up arrow
-        if (keycode === 37 || keycode === 38) {
-          e.preventDefault();
-
-          self.previous();
-
-          return;
-        }
-
-        // Righ arrow and Down arrow
-        if (keycode === 39 || keycode === 40) {
-          e.preventDefault();
-
-          self.next();
-
-          return;
-        }
-
-        self.trigger("afterKeydown", e, keycode);
-      });
-
-      // Hide controls after some inactivity period
-      if (self.group[self.currIndex].opts.idleTime) {
-        self.idleSecondsCounter = 0;
-
-        $D.on(
-          "mousemove.fb-idle mouseleave.fb-idle mousedown.fb-idle touchstart.fb-idle touchmove.fb-idle scroll.fb-idle keydown.fb-idle",
-          function (e) {
-            self.idleSecondsCounter = 0;
-
-            if (self.isIdle) {
-              self.showControls();
-            }
-
-            self.isIdle = false;
-          }
-        );
-
-        self.idleInterval = window.setInterval(function () {
-          self.idleSecondsCounter++;
-
-          if (self.idleSecondsCounter >= self.group[self.currIndex].opts.idleTime && !self.isDragging) {
-            self.isIdle = true;
-            self.idleSecondsCounter = 0;
-
-            self.hideControls();
-          }
-        }, 1000);
-      }
-    },
-
-    // Remove events added by the core
-    // ===============================
-
-    removeEvents: function () {
-      var self = this;
-
-      $W.off("orientationchange.fb resize.fb");
-      $D.off("keydown.fb .fb-idle");
-
-      this.$refs.container.off(".fb-close .fb-prev .fb-next");
-
-      if (self.idleInterval) {
-        window.clearInterval(self.idleInterval);
-
-        self.idleInterval = null;
-      }
-    },
-
-    // Change to previous gallery item
-    // ===============================
-
-    previous: function (duration) {
-      return this.jumpTo(this.currPos - 1, duration);
-    },
-
-    // Change to next gallery item
-    // ===========================
-
-    next: function (duration) {
-      return this.jumpTo(this.currPos + 1, duration);
-    },
-
-    // Switch to selected gallery item
-    // ===============================
-
-    jumpTo: function (pos, duration) {
-      var self = this,
-        groupLen = self.group.length,
-        firstRun,
-        isMoved,
-        loop,
-        current,
-        previous,
-        slidePos,
-        stagePos,
-        prop,
-        diff;
-
-      if (self.isDragging || self.isClosing || (self.isAnimating && self.firstRun)) {
-        return;
-      }
-
-      // Should loop?
-      pos = parseInt(pos, 10);
-      loop = self.current ? self.current.opts.loop : self.opts.loop;
-
-      if (!loop && (pos < 0 || pos >= groupLen)) {
-        return false;
-      }
-
-      // Check if opening for the first time; this helps to speed things up
-      firstRun = self.firstRun = !Object.keys(self.slides).length;
-
-      // Create slides
-      previous = self.current;
-
-      self.prevIndex = self.currIndex;
-      self.prevPos = self.currPos;
-
-      current = self.createSlide(pos);
-
-      if (groupLen > 1) {
-        if (loop || current.index < groupLen - 1) {
-          self.createSlide(pos + 1);
-        }
-
-        if (loop || current.index > 0) {
-          self.createSlide(pos - 1);
-        }
-      }
-
-      self.current = current;
-      self.currIndex = current.index;
-      self.currPos = current.pos;
-
-      self.trigger("beforeShow", firstRun);
-
-      self.updateControls();
-
-      // Validate duration length
-      current.forcedDuration = undefined;
-
-      if ($.isNumeric(duration)) {
-        current.forcedDuration = duration;
-      } else {
-        duration = current.opts[firstRun ? "animationDuration" : "transitionDuration"];
-      }
-
-      duration = parseInt(duration, 10);
-
-      // Check if user has swiped the slides or if still animating
-      isMoved = self.isMoved(current);
-
-      // Make sure current slide is visible
-      current.$slide.addClass("fancybox-slide--current");
-
-      // Fresh start - reveal container, current slide and start loading content
-      if (firstRun) {
-        if (current.opts.animationEffect && duration) {
-          self.$refs.container.css("transition-duration", duration + "ms");
-        }
-
-        self.$refs.container.addClass("fancybox-is-open").trigger("focus");
-
-        // Attempt to load content into slide
-        // This will later call `afterLoad` -> `revealContent`
-        self.loadSlide(current);
-
-        self.preload("image");
-
-        return;
-      }
-
-      // Get actual slide/stage positions (before cleaning up)
-      slidePos = $.fancybox.getTranslate(previous.$slide);
-      stagePos = $.fancybox.getTranslate(self.$refs.stage);
-
-      // Clean up all slides
-      $.each(self.slides, function (index, slide) {
-        $.fancybox.stop(slide.$slide, true);
-      });
-
-      if (previous.pos !== current.pos) {
-        previous.isComplete = false;
-      }
-
-      previous.$slide.removeClass("fancybox-slide--complete fancybox-slide--current");
-
-      // If slides are out of place, then animate them to correct position
-      if (isMoved) {
-        // Calculate horizontal swipe distance
-        diff = slidePos.left - (previous.pos * slidePos.width + previous.pos * previous.opts.gutter);
-
-        $.each(self.slides, function (index, slide) {
-          slide.$slide.removeClass("fancybox-animated").removeClass(function (index, className) {
-            return (className.match(/(^|\s)fancybox-fx-\S+/g) || []).join(" ");
-          });
-
-          // Make sure that each slide is in equal distance
-          // This is mostly needed for freshly added slides, because they are not yet positioned
-          var leftPos = slide.pos * slidePos.width + slide.pos * slide.opts.gutter;
-
-          $.fancybox.setTranslate(slide.$slide, {
-            top: 0,
-            left: leftPos - stagePos.left + diff
-          });
-
-          if (slide.pos !== current.pos) {
-            slide.$slide.addClass("fancybox-slide--" + (slide.pos > current.pos ? "next" : "previous"));
-          }
-
-          // Redraw to make sure that transition will start
-          forceRedraw(slide.$slide);
-
-          // Animate the slide
-          $.fancybox.animate(
-            slide.$slide, {
-              top: 0,
-              left: (slide.pos - current.pos) * slidePos.width + (slide.pos - current.pos) * slide.opts.gutter
-            },
-            duration,
-            function () {
-              slide.$slide
-                .css({
-                  transform: "",
-                  opacity: ""
-                })
-                .removeClass("fancybox-slide--next fancybox-slide--previous");
-
-              if (slide.pos === self.currPos) {
-                self.complete();
-              }
-            }
-          );
-        });
-      } else if (duration && current.opts.transitionEffect) {
-        // Set transition effect for previously active slide
-        prop = "fancybox-animated fancybox-fx-" + current.opts.transitionEffect;
-
-        previous.$slide.addClass("fancybox-slide--" + (previous.pos > current.pos ? "next" : "previous"));
-
-        $.fancybox.animate(
-          previous.$slide,
-          prop,
-          duration,
-          function () {
-            previous.$slide.removeClass(prop).removeClass("fancybox-slide--next fancybox-slide--previous");
-          },
-          false
-        );
-      }
-
-      if (current.isLoaded) {
-        self.revealContent(current);
-      } else {
-        self.loadSlide(current);
-      }
-
-      self.preload("image");
-    },
-
-    // Create new "slide" element
-    // These are gallery items  that are actually added to DOM
-    // =======================================================
-
-    createSlide: function (pos) {
-      var self = this,
-        $slide,
-        index;
-
-      index = pos % self.group.length;
-      index = index < 0 ? self.group.length + index : index;
-
-      if (!self.slides[pos] && self.group[index]) {
-        $slide = $('<div class="fancybox-slide"></div>').appendTo(self.$refs.stage);
-
-        self.slides[pos] = $.extend(true, {}, self.group[index], {
-          pos: pos,
-          $slide: $slide,
-          isLoaded: false
-        });
-
-        self.updateSlide(self.slides[pos]);
-      }
-
-      return self.slides[pos];
-    },
-
-    // Scale image to the actual size of the image;
-    // x and y values should be relative to the slide
-    // ==============================================
-
-    scaleToActual: function (x, y, duration) {
-      var self = this,
-        current = self.current,
-        $content = current.$content,
-        canvasWidth = $.fancybox.getTranslate(current.$slide).width,
-        canvasHeight = $.fancybox.getTranslate(current.$slide).height,
-        newImgWidth = current.width,
-        newImgHeight = current.height,
-        imgPos,
-        posX,
-        posY,
-        scaleX,
-        scaleY;
-
-      if (self.isAnimating || self.isMoved() || !$content || !(current.type == "image" && current.isLoaded && !current.hasError)) {
-        return;
-      }
-
-      self.isAnimating = true;
-
-      $.fancybox.stop($content);
-
-      x = x === undefined ? canvasWidth * 0.5 : x;
-      y = y === undefined ? canvasHeight * 0.5 : y;
-
-      imgPos = $.fancybox.getTranslate($content);
-
-      imgPos.top -= $.fancybox.getTranslate(current.$slide).top;
-      imgPos.left -= $.fancybox.getTranslate(current.$slide).left;
-
-      scaleX = newImgWidth / imgPos.width;
-      scaleY = newImgHeight / imgPos.height;
-
-      // Get center position for original image
-      posX = canvasWidth * 0.5 - newImgWidth * 0.5;
-      posY = canvasHeight * 0.5 - newImgHeight * 0.5;
-
-      // Make sure image does not move away from edges
-      if (newImgWidth > canvasWidth) {
-        posX = imgPos.left * scaleX - (x * scaleX - x);
-
-        if (posX > 0) {
-          posX = 0;
-        }
-
-        if (posX < canvasWidth - newImgWidth) {
-          posX = canvasWidth - newImgWidth;
-        }
-      }
-
-      if (newImgHeight > canvasHeight) {
-        posY = imgPos.top * scaleY - (y * scaleY - y);
-
-        if (posY > 0) {
-          posY = 0;
-        }
-
-        if (posY < canvasHeight - newImgHeight) {
-          posY = canvasHeight - newImgHeight;
-        }
-      }
-
-      self.updateCursor(newImgWidth, newImgHeight);
-
-      $.fancybox.animate(
-        $content, {
-          top: posY,
-          left: posX,
-          scaleX: scaleX,
-          scaleY: scaleY
-        },
-        duration || 366,
-        function () {
-          self.isAnimating = false;
-        }
-      );
-
-      // Stop slideshow
-      if (self.SlideShow && self.SlideShow.isActive) {
-        self.SlideShow.stop();
-      }
-    },
-
-    // Scale image to fit inside parent element
-    // ========================================
-
-    scaleToFit: function (duration) {
-      var self = this,
-        current = self.current,
-        $content = current.$content,
-        end;
-
-      if (self.isAnimating || self.isMoved() || !$content || !(current.type == "image" && current.isLoaded && !current.hasError)) {
-        return;
-      }
-
-      self.isAnimating = true;
-
-      $.fancybox.stop($content);
-
-      end = self.getFitPos(current);
-
-      self.updateCursor(end.width, end.height);
-
-      $.fancybox.animate(
-        $content, {
-          top: end.top,
-          left: end.left,
-          scaleX: end.width / $content.width(),
-          scaleY: end.height / $content.height()
-        },
-        duration || 366,
-        function () {
-          self.isAnimating = false;
-        }
-      );
-    },
-
-    // Calculate image size to fit inside viewport
-    // ===========================================
-
-    getFitPos: function (slide) {
-      var self = this,
-        $content = slide.$content,
-        $slide = slide.$slide,
-        width = slide.width || slide.opts.width,
-        height = slide.height || slide.opts.height,
-        maxWidth,
-        maxHeight,
-        minRatio,
-        aspectRatio,
-        rez = {};
-
-      if (!slide.isLoaded || !$content || !$content.length) {
-        return false;
-      }
-
-      maxWidth = $.fancybox.getTranslate(self.$refs.stage).width;
-      maxHeight = $.fancybox.getTranslate(self.$refs.stage).height;
-
-      maxWidth -=
-        parseFloat($slide.css("paddingLeft")) +
-        parseFloat($slide.css("paddingRight")) +
-        parseFloat($content.css("marginLeft")) +
-        parseFloat($content.css("marginRight"));
-
-      maxHeight -=
-        parseFloat($slide.css("paddingTop")) +
-        parseFloat($slide.css("paddingBottom")) +
-        parseFloat($content.css("marginTop")) +
-        parseFloat($content.css("marginBottom"));
-
-      if (!width || !height) {
-        width = maxWidth;
-        height = maxHeight;
-      }
-
-      minRatio = Math.min(1, maxWidth / width, maxHeight / height);
-
-      width = minRatio * width;
-      height = minRatio * height;
-
-      // Adjust width/height to precisely fit into container
-      if (width > maxWidth - 0.5) {
-        width = maxWidth;
-      }
-
-      if (height > maxHeight - 0.5) {
-        height = maxHeight;
-      }
-
-      if (slide.type === "image") {
-        rez.top = Math.floor((maxHeight - height) * 0.5) + parseFloat($slide.css("paddingTop"));
-        rez.left = Math.floor((maxWidth - width) * 0.5) + parseFloat($slide.css("paddingLeft"));
-      } else if (slide.contentType === "video") {
-        // Force aspect ratio for the video
-        // "I say the whole world must learn of our peaceful ways… by force!"
-        aspectRatio = slide.opts.width && slide.opts.height ? width / height : slide.opts.ratio || 16 / 9;
-
-        if (height > width / aspectRatio) {
-          height = width / aspectRatio;
-        } else if (width > height * aspectRatio) {
-          width = height * aspectRatio;
-        }
-      }
-
-      rez.width = width;
-      rez.height = height;
-
-      return rez;
-    },
-
-    // Update content size and position for all slides
-    // ==============================================
-
-    update: function (e) {
-      var self = this;
-
-      $.each(self.slides, function (key, slide) {
-        self.updateSlide(slide, e);
-      });
-    },
-
-    // Update slide content position and size
-    // ======================================
-
-    updateSlide: function (slide, e) {
-      var self = this,
-        $content = slide && slide.$content,
-        width = slide.width || slide.opts.width,
-        height = slide.height || slide.opts.height,
-        $slide = slide.$slide;
-
-      // First, prevent caption overlap, if needed
-      self.adjustCaption(slide);
-
-      // Then resize content to fit inside the slide
-      if ($content && (width || height || slide.contentType === "video") && !slide.hasError) {
-        $.fancybox.stop($content);
-
-        $.fancybox.setTranslate($content, self.getFitPos(slide));
-
-        if (slide.pos === self.currPos) {
-          self.isAnimating = false;
-
-          self.updateCursor();
-        }
-      }
-
-      // Then some adjustments
-      self.adjustLayout(slide);
-
-      if ($slide.length) {
-        $slide.trigger("refresh");
-
-        if (slide.pos === self.currPos) {
-          self.$refs.toolbar
-            .add(self.$refs.navigation.find(".fancybox-button--arrow_right"))
-            .toggleClass("compensate-for-scrollbar", $slide.get(0).scrollHeight > $slide.get(0).clientHeight);
-        }
-      }
-
-      self.trigger("onUpdate", slide, e);
-    },
-
-    // Horizontally center slide
-    // =========================
-
-    centerSlide: function (duration) {
-      var self = this,
-        current = self.current,
-        $slide = current.$slide;
-
-      if (self.isClosing || !current) {
-        return;
-      }
-
-      $slide.siblings().css({
-        transform: "",
-        opacity: ""
-      });
-
-      $slide
-        .parent()
-        .children()
-        .removeClass("fancybox-slide--previous fancybox-slide--next");
-
-      $.fancybox.animate(
-        $slide, {
-          top: 0,
-          left: 0,
-          opacity: 1
-        },
-        duration === undefined ? 0 : duration,
-        function () {
-          // Clean up
-          $slide.css({
-            transform: "",
-            opacity: ""
-          });
-
-          if (!current.isComplete) {
-            self.complete();
-          }
-        },
-        false
-      );
-    },
-
-    // Check if current slide is moved (swiped)
-    // ========================================
-
-    isMoved: function (slide) {
-      var current = slide || this.current,
-        slidePos,
-        stagePos;
-
-      if (!current) {
-        return false;
-      }
-
-      stagePos = $.fancybox.getTranslate(this.$refs.stage);
-      slidePos = $.fancybox.getTranslate(current.$slide);
-
-      return (
-        !current.$slide.hasClass("fancybox-animated") &&
-        (Math.abs(slidePos.top - stagePos.top) > 0.5 || Math.abs(slidePos.left - stagePos.left) > 0.5)
-      );
-    },
-
-    // Update cursor style depending if content can be zoomed
-    // ======================================================
-
-    updateCursor: function (nextWidth, nextHeight) {
-      var self = this,
-        current = self.current,
-        $container = self.$refs.container,
-        canPan,
-        isZoomable;
-
-      if (!current || self.isClosing || !self.Guestures) {
-        return;
-      }
-
-      $container.removeClass("fancybox-is-zoomable fancybox-can-zoomIn fancybox-can-zoomOut fancybox-can-swipe fancybox-can-pan");
-
-      canPan = self.canPan(nextWidth, nextHeight);
-
-      isZoomable = canPan ? true : self.isZoomable();
-
-      $container.toggleClass("fancybox-is-zoomable", isZoomable);
-
-      $("[data-fancybox-zoom]").prop("disabled", !isZoomable);
-
-      if (canPan) {
-        $container.addClass("fancybox-can-pan");
-      } else if (
-        isZoomable &&
-        (current.opts.clickContent === "zoom" || ($.isFunction(current.opts.clickContent) && current.opts.clickContent(current) == "zoom"))
-      ) {
-        $container.addClass("fancybox-can-zoomIn");
-      } else if (current.opts.touch && (current.opts.touch.vertical || self.group.length > 1) && current.contentType !== "video") {
-        $container.addClass("fancybox-can-swipe");
-      }
-    },
-
-    // Check if current slide is zoomable
-    // ==================================
-
-    isZoomable: function () {
-      var self = this,
-        current = self.current,
-        fitPos;
-
-      // Assume that slide is zoomable if:
-      //   - image is still loading
-      //   - actual size of the image is smaller than available area
-      if (current && !self.isClosing && current.type === "image" && !current.hasError) {
-        if (!current.isLoaded) {
-          return true;
-        }
-
-        fitPos = self.getFitPos(current);
-
-        if (fitPos && (current.width > fitPos.width || current.height > fitPos.height)) {
-          return true;
-        }
-      }
-
-      return false;
-    },
-
-    // Check if current image dimensions are smaller than actual
-    // =========================================================
-
-    isScaledDown: function (nextWidth, nextHeight) {
-      var self = this,
-        rez = false,
-        current = self.current,
-        $content = current.$content;
-
-      if (nextWidth !== undefined && nextHeight !== undefined) {
-        rez = nextWidth < current.width && nextHeight < current.height;
-      } else if ($content) {
-        rez = $.fancybox.getTranslate($content);
-        rez = rez.width < current.width && rez.height < current.height;
-      }
-
-      return rez;
-    },
-
-    // Check if image dimensions exceed parent element
-    // ===============================================
-
-    canPan: function (nextWidth, nextHeight) {
-      var self = this,
-        current = self.current,
-        pos = null,
-        rez = false;
-
-      if (current.type === "image" && (current.isComplete || (nextWidth && nextHeight)) && !current.hasError) {
-        rez = self.getFitPos(current);
-
-        if (nextWidth !== undefined && nextHeight !== undefined) {
-          pos = {
-            width: nextWidth,
-            height: nextHeight
-          };
-        } else if (current.isComplete) {
-          pos = $.fancybox.getTranslate(current.$content);
-        }
-
-        if (pos && rez) {
-          rez = Math.abs(pos.width - rez.width) > 1.5 || Math.abs(pos.height - rez.height) > 1.5;
-        }
-      }
-
-      return rez;
-    },
-
-    // Load content into the slide
-    // ===========================
-
-    loadSlide: function (slide) {
-      var self = this,
-        type,
-        $slide,
-        ajaxLoad;
-
-      if (slide.isLoading || slide.isLoaded) {
-        return;
-      }
-
-      slide.isLoading = true;
-
-      if (self.trigger("beforeLoad", slide) === false) {
-        slide.isLoading = false;
-
-        return false;
-      }
-
-      type = slide.type;
-      $slide = slide.$slide;
-
-      $slide
-        .off("refresh")
-        .trigger("onReset")
-        .addClass(slide.opts.slideClass);
-
-      // Create content depending on the type
-      switch (type) {
-        case "image":
-          self.setImage(slide);
-
-          break;
-
-        case "iframe":
-          self.setIframe(slide);
-
-          break;
-
-        case "html":
-          self.setContent(slide, slide.src || slide.content);
-
-          break;
-
-        case "video":
-          self.setContent(
-            slide,
-            slide.opts.video.tpl
-            .replace(/\{\{src\}\}/gi, slide.src)
-            .replace("{{format}}", slide.opts.videoFormat || slide.opts.video.format || "")
-            .replace("{{poster}}", slide.thumb || "")
-          );
-
-          break;
-
-        case "inline":
-          if ($(slide.src).length) {
-            self.setContent(slide, $(slide.src));
-          } else {
-            self.setError(slide);
-          }
-
-          break;
-
-        case "ajax":
-          self.showLoading(slide);
-
-          ajaxLoad = $.ajax(
-            $.extend({}, slide.opts.ajax.settings, {
-              url: slide.src,
-              success: function (data, textStatus) {
-                if (textStatus === "success") {
-                  self.setContent(slide, data);
-                }
-              },
-              error: function (jqXHR, textStatus) {
-                if (jqXHR && textStatus !== "abort") {
-                  self.setError(slide);
-                }
-              }
-            })
-          );
-
-          $slide.one("onReset", function () {
-            ajaxLoad.abort();
-          });
-
-          break;
-
-        default:
-          self.setError(slide);
-
-          break;
-      }
-
-      return true;
-    },
-
-    // Use thumbnail image, if possible
-    // ================================
-
-    setImage: function (slide) {
-      var self = this,
-        ghost;
-
-      // Check if need to show loading icon
-      setTimeout(function () {
-        var $img = slide.$image;
-
-        if (!self.isClosing && slide.isLoading && (!$img || !$img.length || !$img[0].complete) && !slide.hasError) {
-          self.showLoading(slide);
-        }
-      }, 50);
-
-      //Check if image has srcset
-      self.checkSrcset(slide);
-
-      // This will be wrapper containing both ghost and actual image
-      slide.$content = $('<div class="fancybox-content"></div>')
-        .addClass("fancybox-is-hidden")
-        .appendTo(slide.$slide.addClass("fancybox-slide--image"));
-
-      // If we have a thumbnail, we can display it while actual image is loading
-      // Users will not stare at black screen and actual image will appear gradually
-      if (slide.opts.preload !== false && slide.opts.width && slide.opts.height && slide.thumb) {
-        slide.width = slide.opts.width;
-        slide.height = slide.opts.height;
-
-        ghost = document.createElement("img");
-
-        ghost.onerror = function () {
-          $(this).remove();
-
-          slide.$ghost = null;
-        };
-
-        ghost.onload = function () {
-          self.afterLoad(slide);
-        };
-
-        slide.$ghost = $(ghost)
-          .addClass("fancybox-image")
-          .appendTo(slide.$content)
-          .attr("src", slide.thumb);
-      }
-
-      // Start loading actual image
-      self.setBigImage(slide);
-    },
-
-    // Check if image has srcset and get the source
-    // ============================================
-    checkSrcset: function (slide) {
-      var srcset = slide.opts.srcset || slide.opts.image.srcset,
-        found,
-        temp,
-        pxRatio,
-        windowWidth;
-
-      // If we have "srcset", then we need to find first matching "src" value.
-      // This is necessary, because when you set an src attribute, the browser will preload the image
-      // before any javascript or even CSS is applied.
-      if (srcset) {
-        pxRatio = window.devicePixelRatio || 1;
-        windowWidth = window.innerWidth * pxRatio;
-
-        temp = srcset.split(",").map(function (el) {
-          var ret = {};
-
-          el.trim()
-            .split(/\s+/)
-            .forEach(function (el, i) {
-              var value = parseInt(el.substring(0, el.length - 1), 10);
-
-              if (i === 0) {
-                return (ret.url = el);
-              }
-
-              if (value) {
-                ret.value = value;
-                ret.postfix = el[el.length - 1];
-              }
-            });
-
-          return ret;
-        });
-
-        // Sort by value
-        temp.sort(function (a, b) {
-          return a.value - b.value;
-        });
-
-        // Ok, now we have an array of all srcset values
-        for (var j = 0; j < temp.length; j++) {
-          var el = temp[j];
-
-          if ((el.postfix === "w" && el.value >= windowWidth) || (el.postfix === "x" && el.value >= pxRatio)) {
-            found = el;
-            break;
-          }
-        }
-
-        // If not found, take the last one
-        if (!found && temp.length) {
-          found = temp[temp.length - 1];
-        }
-
-        if (found) {
-          slide.src = found.url;
-
-          // If we have default width/height values, we can calculate height for matching source
-          if (slide.width && slide.height && found.postfix == "w") {
-            slide.height = (slide.width / slide.height) * found.value;
-            slide.width = found.value;
-          }
-
-          slide.opts.srcset = srcset;
-        }
-      }
-    },
-
-    // Create full-size image
-    // ======================
-
-    setBigImage: function (slide) {
-      var self = this,
-        img = document.createElement("img"),
-        $img = $(img);
-
-      slide.$image = $img
-        .one("error", function () {
-          self.setError(slide);
-        })
-        .one("load", function () {
-          var sizes;
-
-          if (!slide.$ghost) {
-            self.resolveImageSlideSize(slide, this.naturalWidth, this.naturalHeight);
-
-            self.afterLoad(slide);
-          }
-
-          if (self.isClosing) {
-            return;
-          }
-
-          if (slide.opts.srcset) {
-            sizes = slide.opts.sizes;
-
-            if (!sizes || sizes === "auto") {
-              sizes =
-                (slide.width / slide.height > 1 && $W.width() / $W.height() > 1 ? "100" : Math.round((slide.width / slide.height) * 100)) +
-                "vw";
-            }
-
-            $img.attr("sizes", sizes).attr("srcset", slide.opts.srcset);
-          }
-
-          // Hide temporary image after some delay
-          if (slide.$ghost) {
-            setTimeout(function () {
-              if (slide.$ghost && !self.isClosing) {
-                slide.$ghost.hide();
-              }
-            }, Math.min(300, Math.max(1000, slide.height / 1600)));
-          }
-
-          self.hideLoading(slide);
-        })
-        .addClass("fancybox-image")
-        .attr("src", slide.src)
-        .appendTo(slide.$content);
-
-      if ((img.complete || img.readyState == "complete") && $img.naturalWidth && $img.naturalHeight) {
-        $img.trigger("load");
-      } else if (img.error) {
-        $img.trigger("error");
-      }
-    },
-
-    // Computes the slide size from image size and maxWidth/maxHeight
-    // ==============================================================
-
-    resolveImageSlideSize: function (slide, imgWidth, imgHeight) {
-      var maxWidth = parseInt(slide.opts.width, 10),
-        maxHeight = parseInt(slide.opts.height, 10);
-
-      // Sets the default values from the image
-      slide.width = imgWidth;
-      slide.height = imgHeight;
-
-      if (maxWidth > 0) {
-        slide.width = maxWidth;
-        slide.height = Math.floor((maxWidth * imgHeight) / imgWidth);
-      }
-
-      if (maxHeight > 0) {
-        slide.width = Math.floor((maxHeight * imgWidth) / imgHeight);
-        slide.height = maxHeight;
-      }
-    },
-
-    // Create iframe wrapper, iframe and bindings
-    // ==========================================
-
-    setIframe: function (slide) {
-      var self = this,
-        opts = slide.opts.iframe,
-        $slide = slide.$slide,
-        $iframe;
-
-      slide.$content = $('<div class="fancybox-content' + (opts.preload ? " fancybox-is-hidden" : "") + '"></div>')
-        .css(opts.css)
-        .appendTo($slide);
-
-      $slide.addClass("fancybox-slide--" + slide.contentType);
-
-      slide.$iframe = $iframe = $(opts.tpl.replace(/\{rnd\}/g, new Date().getTime()))
-        .attr(opts.attr)
-        .appendTo(slide.$content);
-
-      if (opts.preload) {
-        self.showLoading(slide);
-
-        // Unfortunately, it is not always possible to determine if iframe is successfully loaded
-        // (due to browser security policy)
-
-        $iframe.on("load.fb error.fb", function (e) {
-          this.isReady = 1;
-
-          slide.$slide.trigger("refresh");
-
-          self.afterLoad(slide);
-        });
-
-        // Recalculate iframe content size
-        // ===============================
-
-        $slide.on("refresh.fb", function () {
-          var $content = slide.$content,
-            frameWidth = opts.css.width,
-            frameHeight = opts.css.height,
-            $contents,
-            $body;
-
-          if ($iframe[0].isReady !== 1) {
-            return;
-          }
-
-          try {
-            $contents = $iframe.contents();
-            $body = $contents.find("body");
-          } catch (ignore) {}
-
-          // Calculate content dimensions, if it is accessible
-          if ($body && $body.length && $body.children().length) {
-            // Avoid scrolling to top (if multiple instances)
-            $slide.css("overflow", "visible");
-
-            $content.css({
-              width: "100%",
-              "max-width": "100%",
-              height: "9999px"
-            });
-
-            if (frameWidth === undefined) {
-              frameWidth = Math.ceil(Math.max($body[0].clientWidth, $body.outerWidth(true)));
-            }
-
-            $content.css("width", frameWidth ? frameWidth : "").css("max-width", "");
-
-            if (frameHeight === undefined) {
-              frameHeight = Math.ceil(Math.max($body[0].clientHeight, $body.outerHeight(true)));
-            }
-
-            $content.css("height", frameHeight ? frameHeight : "");
-
-            $slide.css("overflow", "auto");
-          }
-
-          $content.removeClass("fancybox-is-hidden");
-        });
-      } else {
-        self.afterLoad(slide);
-      }
-
-      $iframe.attr("src", slide.src);
-
-      // Remove iframe if closing or changing gallery item
-      $slide.one("onReset", function () {
-        // This helps IE not to throw errors when closing
-        try {
-          $(this)
-            .find("iframe")
-            .hide()
-            .unbind()
-            .attr("src", "//about:blank");
-        } catch (ignore) {}
-
-        $(this)
-          .off("refresh.fb")
-          .empty();
-
-        slide.isLoaded = false;
-        slide.isRevealed = false;
-      });
-    },
-
-    // Wrap and append content to the slide
-    // ======================================
-
-    setContent: function (slide, content) {
-      var self = this;
-
-      if (self.isClosing) {
-        return;
-      }
-
-      self.hideLoading(slide);
-
-      if (slide.$content) {
-        $.fancybox.stop(slide.$content);
-      }
-
-      slide.$slide.empty();
-
-      // If content is a jQuery object, then it will be moved to the slide.
-      // The placeholder is created so we will know where to put it back.
-      if (isQuery(content) && content.parent().length) {
-        // Make sure content is not already moved to fancyBox
-        if (content.hasClass("fancybox-content") || content.parent().hasClass("fancybox-content")) {
-          content.parents(".fancybox-slide").trigger("onReset");
-        }
-
-        // Create temporary element marking original place of the content
-        slide.$placeholder = $("<div>")
-          .hide()
-          .insertAfter(content);
-
-        // Make sure content is visible
-        content.css("display", "inline-block");
-      } else if (!slide.hasError) {
-        // If content is just a plain text, try to convert it to html
-        if ($.type(content) === "string") {
-          content = $("<div>")
-            .append($.trim(content))
-            .contents();
-        }
-
-        // If "filter" option is provided, then filter content
-        if (slide.opts.filter) {
-          content = $("<div>")
-            .html(content)
-            .find(slide.opts.filter);
-        }
-      }
-
-      slide.$slide.one("onReset", function () {
-        // Pause all html5 video/audio
-        $(this)
-          .find("video,audio")
-          .trigger("pause");
-
-        // Put content back
-        if (slide.$placeholder) {
-          slide.$placeholder.after(content.removeClass("fancybox-content").hide()).remove();
-
-          slide.$placeholder = null;
-        }
-
-        // Remove custom close button
-        if (slide.$smallBtn) {
-          slide.$smallBtn.remove();
-
-          slide.$smallBtn = null;
-        }
-
-        // Remove content and mark slide as not loaded
-        if (!slide.hasError) {
-          $(this).empty();
-
-          slide.isLoaded = false;
-          slide.isRevealed = false;
-        }
-      });
-
-      $(content).appendTo(slide.$slide);
-
-      if ($(content).is("video,audio")) {
-        $(content).addClass("fancybox-video");
-
-        $(content).wrap("<div></div>");
-
-        slide.contentType = "video";
-
-        slide.opts.width = slide.opts.width || $(content).attr("width");
-        slide.opts.height = slide.opts.height || $(content).attr("height");
-      }
-
-      slide.$content = slide.$slide
-        .children()
-        .filter("div,form,main,video,audio,article,.fancybox-content")
-        .first();
-
-      slide.$content.siblings().hide();
-
-      // Re-check if there is a valid content
-      // (in some cases, ajax response can contain various elements or plain text)
-      if (!slide.$content.length) {
-        slide.$content = slide.$slide
-          .wrapInner("<div></div>")
-          .children()
-          .first();
-      }
-
-      slide.$content.addClass("fancybox-content");
-
-      slide.$slide.addClass("fancybox-slide--" + slide.contentType);
-
-      self.afterLoad(slide);
-    },
-
-    // Display error message
-    // =====================
-
-    setError: function (slide) {
-      slide.hasError = true;
-
-      slide.$slide
-        .trigger("onReset")
-        .removeClass("fancybox-slide--" + slide.contentType)
-        .addClass("fancybox-slide--error");
-
-      slide.contentType = "html";
-
-      this.setContent(slide, this.translate(slide, slide.opts.errorTpl));
-
-      if (slide.pos === this.currPos) {
-        this.isAnimating = false;
-      }
-    },
-
-    // Show loading icon inside the slide
-    // ==================================
-
-    showLoading: function (slide) {
-      var self = this;
-
-      slide = slide || self.current;
-
-      if (slide && !slide.$spinner) {
-        slide.$spinner = $(self.translate(self, self.opts.spinnerTpl))
-          .appendTo(slide.$slide)
-          .hide()
-          .fadeIn("fast");
-      }
-    },
-
-    // Remove loading icon from the slide
-    // ==================================
-
-    hideLoading: function (slide) {
-      var self = this;
-
-      slide = slide || self.current;
-
-      if (slide && slide.$spinner) {
-        slide.$spinner.stop().remove();
-
-        delete slide.$spinner;
-      }
-    },
-
-    // Adjustments after slide content has been loaded
-    // ===============================================
-
-    afterLoad: function (slide) {
-      var self = this;
-
-      if (self.isClosing) {
-        return;
-      }
-
-      slide.isLoading = false;
-      slide.isLoaded = true;
-
-      self.trigger("afterLoad", slide);
-
-      self.hideLoading(slide);
-
-      // Add small close button
-      if (slide.opts.smallBtn && (!slide.$smallBtn || !slide.$smallBtn.length)) {
-        slide.$smallBtn = $(self.translate(slide, slide.opts.btnTpl.smallBtn)).appendTo(slide.$content);
-      }
-
-      // Disable right click
-      if (slide.opts.protect && slide.$content && !slide.hasError) {
-        slide.$content.on("contextmenu.fb", function (e) {
-          if (e.button == 2) {
-            e.preventDefault();
-          }
-
-          return true;
-        });
-
-        // Add fake element on top of the image
-        // This makes a bit harder for user to select image
-        if (slide.type === "image") {
-          $('<div class="fancybox-spaceball"></div>').appendTo(slide.$content);
-        }
-      }
-
-      self.adjustCaption(slide);
-
-      self.adjustLayout(slide);
-
-      if (slide.pos === self.currPos) {
-        self.updateCursor();
-      }
-
-      self.revealContent(slide);
-    },
-
-    // Prevent caption overlap,
-    // fix css inconsistency across browsers
-    // =====================================
-
-    adjustCaption: function (slide) {
-      var self = this,
-        current = slide || self.current,
-        caption = current.opts.caption,
-        preventOverlap = current.opts.preventCaptionOverlap,
-        $caption = self.$refs.caption,
-        $clone,
-        captionH = false;
-
-      $caption.toggleClass("fancybox-caption--separate", preventOverlap);
-
-      if (preventOverlap && caption && caption.length) {
-        if (current.pos !== self.currPos) {
-          $clone = $caption.clone().appendTo($caption.parent());
-
-          $clone
-            .children()
-            .eq(0)
-            .empty()
-            .html(caption);
-
-          captionH = $clone.outerHeight(true);
-
-          $clone.empty().remove();
-        } else if (self.$caption) {
-          captionH = self.$caption.outerHeight(true);
-        }
-
-        current.$slide.css("padding-bottom", captionH || "");
-      }
-    },
-
-    // Simple hack to fix inconsistency across browsers, described here (affects Edge, too):
-    // https://bugzilla.mozilla.org/show_bug.cgi?id=748518
-    // ====================================================================================
-
-    adjustLayout: function (slide) {
-      var self = this,
-        current = slide || self.current,
-        scrollHeight,
-        marginBottom,
-        inlinePadding,
-        actualPadding;
-
-      if (current.isLoaded && current.opts.disableLayoutFix !== true) {
-        current.$content.css("margin-bottom", "");
-
-        // If we would always set margin-bottom for the content,
-        // then it would potentially break vertical align
-        if (current.$content.outerHeight() > current.$slide.height() + 0.5) {
-          inlinePadding = current.$slide[0].style["padding-bottom"];
-          actualPadding = current.$slide.css("padding-bottom");
-
-          if (parseFloat(actualPadding) > 0) {
-            scrollHeight = current.$slide[0].scrollHeight;
-
-            current.$slide.css("padding-bottom", 0);
-
-            if (Math.abs(scrollHeight - current.$slide[0].scrollHeight) < 1) {
-              marginBottom = actualPadding;
-            }
-
-            current.$slide.css("padding-bottom", inlinePadding);
-          }
-        }
-
-        current.$content.css("margin-bottom", marginBottom);
-      }
-    },
-
-    // Make content visible
-    // This method is called right after content has been loaded or
-    // user navigates gallery and transition should start
-    // ============================================================
-
-    revealContent: function (slide) {
-      var self = this,
-        $slide = slide.$slide,
-        end = false,
-        start = false,
-        isMoved = self.isMoved(slide),
-        isRevealed = slide.isRevealed,
-        effect,
-        effectClassName,
-        duration,
-        opacity;
-
-      slide.isRevealed = true;
-
-      effect = slide.opts[self.firstRun ? "animationEffect" : "transitionEffect"];
-      duration = slide.opts[self.firstRun ? "animationDuration" : "transitionDuration"];
-
-      duration = parseInt(slide.forcedDuration === undefined ? duration : slide.forcedDuration, 10);
-
-      if (isMoved || slide.pos !== self.currPos || !duration) {
-        effect = false;
-      }
-
-      // Check if can zoom
-      if (effect === "zoom") {
-        if (slide.pos === self.currPos && duration && slide.type === "image" && !slide.hasError && (start = self.getThumbPos(slide))) {
-          end = self.getFitPos(slide);
-        } else {
-          effect = "fade";
-        }
-      }
-
-      // Zoom animation
-      // ==============
-      if (effect === "zoom") {
-        self.isAnimating = true;
-
-        end.scaleX = end.width / start.width;
-        end.scaleY = end.height / start.height;
-
-        // Check if we need to animate opacity
-        opacity = slide.opts.zoomOpacity;
-
-        if (opacity == "auto") {
-          opacity = Math.abs(slide.width / slide.height - start.width / start.height) > 0.1;
-        }
-
-        if (opacity) {
-          start.opacity = 0.1;
-          end.opacity = 1;
-        }
-
-        // Draw image at start position
-        $.fancybox.setTranslate(slide.$content.removeClass("fancybox-is-hidden"), start);
-
-        forceRedraw(slide.$content);
-
-        // Start animation
-        $.fancybox.animate(slide.$content, end, duration, function () {
-          self.isAnimating = false;
-
-          self.complete();
-        });
-
-        return;
-      }
-
-      self.updateSlide(slide);
-
-      // Simply show content if no effect
-      // ================================
-      if (!effect) {
-        slide.$content.removeClass("fancybox-is-hidden");
-
-        if (!isRevealed && isMoved && slide.type === "image" && !slide.hasError) {
-          slide.$content.hide().fadeIn("fast");
-        }
-
-        if (slide.pos === self.currPos) {
-          self.complete();
-        }
-
-        return;
-      }
-
-      // Prepare for CSS transiton
-      // =========================
-      $.fancybox.stop($slide);
-
-      //effectClassName = "fancybox-animated fancybox-slide--" + (slide.pos >= self.prevPos ? "next" : "previous") + " fancybox-fx-" + effect;
-      effectClassName = "fancybox-slide--" + (slide.pos >= self.prevPos ? "next" : "previous") + " fancybox-animated fancybox-fx-" + effect;
-
-      $slide.addClass(effectClassName).removeClass("fancybox-slide--current"); //.addClass(effectClassName);
-
-      slide.$content.removeClass("fancybox-is-hidden");
-
-      // Force reflow
-      forceRedraw($slide);
-
-      if (slide.type !== "image") {
-        slide.$content.hide().show(0);
-      }
-
-      $.fancybox.animate(
-        $slide,
-        "fancybox-slide--current",
-        duration,
-        function () {
-          $slide.removeClass(effectClassName).css({
-            transform: "",
-            opacity: ""
-          });
-
-          if (slide.pos === self.currPos) {
-            self.complete();
-          }
-        },
-        true
-      );
-    },
-
-    // Check if we can and have to zoom from thumbnail
-    //================================================
-
-    getThumbPos: function (slide) {
-      var rez = false,
-        $thumb = slide.$thumb,
-        thumbPos,
-        btw,
-        brw,
-        bbw,
-        blw;
-
-      if (!$thumb || !inViewport($thumb[0])) {
-        return false;
-      }
-
-      thumbPos = $.fancybox.getTranslate($thumb);
-
-      btw = parseFloat($thumb.css("border-top-width") || 0);
-      brw = parseFloat($thumb.css("border-right-width") || 0);
-      bbw = parseFloat($thumb.css("border-bottom-width") || 0);
-      blw = parseFloat($thumb.css("border-left-width") || 0);
-
-      rez = {
-        top: thumbPos.top + btw,
-        left: thumbPos.left + blw,
-        width: thumbPos.width - brw - blw,
-        height: thumbPos.height - btw - bbw,
-        scaleX: 1,
-        scaleY: 1
-      };
-
-      return thumbPos.width > 0 && thumbPos.height > 0 ? rez : false;
-    },
-
-    // Final adjustments after current gallery item is moved to position
-    // and it`s content is loaded
-    // ==================================================================
-
-    complete: function () {
-      var self = this,
-        current = self.current,
-        slides = {},
-        $el;
-
-      if (self.isMoved() || !current.isLoaded) {
-        return;
-      }
-
-      if (!current.isComplete) {
-        current.isComplete = true;
-
-        current.$slide.siblings().trigger("onReset");
-
-        self.preload("inline");
-
-        // Trigger any CSS transiton inside the slide
-        forceRedraw(current.$slide);
-
-        current.$slide.addClass("fancybox-slide--complete");
-
-        // Remove unnecessary slides
-        $.each(self.slides, function (key, slide) {
-          if (slide.pos >= self.currPos - 1 && slide.pos <= self.currPos + 1) {
-            slides[slide.pos] = slide;
-          } else if (slide) {
-            $.fancybox.stop(slide.$slide);
-
-            slide.$slide.off().remove();
-          }
-        });
-
-        self.slides = slides;
-      }
-
-      self.isAnimating = false;
-
-      self.updateCursor();
-
-      self.trigger("afterShow");
-
-      // Autoplay first html5 video/audio
-      if (!!current.opts.video.autoStart) {
-        current.$slide
-          .find("video,audio")
-          .filter(":visible:first")
-          .trigger("play")
-          .one("ended", function () {
-            if (Document.exitFullscreen) {
-              Document.exitFullscreen();
-            } else if (this.webkitExitFullscreen) {
-              this.webkitExitFullscreen();
-            }
-
-            self.next();
-          });
-      }
-
-      // Try to focus on the first focusable element
-      if (current.opts.autoFocus && current.contentType === "html") {
-        // Look for the first input with autofocus attribute
-        $el = current.$content.find("input[autofocus]:enabled:visible:first");
-
-        if ($el.length) {
-          $el.trigger("focus");
-        } else {
-          self.focus(null, true);
-        }
-      }
-
-      // Avoid jumping
-      current.$slide.scrollTop(0).scrollLeft(0);
-    },
-
-    // Preload next and previous slides
-    // ================================
-
-    preload: function (type) {
-      var self = this,
-        prev,
-        next;
-
-      if (self.group.length < 2) {
-        return;
-      }
-
-      next = self.slides[self.currPos + 1];
-      prev = self.slides[self.currPos - 1];
-
-      if (prev && prev.type === type) {
-        self.loadSlide(prev);
-      }
-
-      if (next && next.type === type) {
-        self.loadSlide(next);
-      }
-    },
-
-    // Try to find and focus on the first focusable element
-    // ====================================================
-
-    focus: function (e, firstRun) {
-      var self = this,
-        focusableStr = [
-          "a[href]",
-          "area[href]",
-          'input:not([disabled]):not([type="hidden"]):not([aria-hidden])',
-          "select:not([disabled]):not([aria-hidden])",
-          "textarea:not([disabled]):not([aria-hidden])",
-          "button:not([disabled]):not([aria-hidden])",
-          "iframe",
-          "object",
-          "embed",
-          "video",
-          "audio",
-          "[contenteditable]",
-          '[tabindex]:not([tabindex^="-"])'
-        ].join(","),
-        focusableItems,
-        focusedItemIndex;
-
-      if (self.isClosing) {
-        return;
-      }
-
-      if (e || !self.current || !self.current.isComplete) {
-        // Focus on any element inside fancybox
-        focusableItems = self.$refs.container.find("*:visible");
-      } else {
-        // Focus inside current slide
-        focusableItems = self.current.$slide.find("*:visible" + (firstRun ? ":not(.fancybox-close-small)" : ""));
-      }
-
-      focusableItems = focusableItems.filter(focusableStr).filter(function () {
-        return $(this).css("visibility") !== "hidden" && !$(this).hasClass("disabled");
-      });
-
-      if (focusableItems.length) {
-        focusedItemIndex = focusableItems.index(document.activeElement);
-
-        if (e && e.shiftKey) {
-          // Back tab
-          if (focusedItemIndex < 0 || focusedItemIndex == 0) {
-            e.preventDefault();
-
-            focusableItems.eq(focusableItems.length - 1).trigger("focus");
-          }
-        } else {
-          // Outside or Forward tab
-          if (focusedItemIndex < 0 || focusedItemIndex == focusableItems.length - 1) {
-            if (e) {
-              e.preventDefault();
-            }
-
-            focusableItems.eq(0).trigger("focus");
-          }
-        }
-      } else {
-        self.$refs.container.trigger("focus");
-      }
-    },
-
-    // Activates current instance - brings container to the front and enables keyboard,
-    // notifies other instances about deactivating
-    // =================================================================================
-
-    activate: function () {
-      var self = this;
-
-      // Deactivate all instances
-      $(".fancybox-container").each(function () {
-        var instance = $(this).data("FancyBox");
-
-        // Skip self and closing instances
-        if (instance && instance.id !== self.id && !instance.isClosing) {
-          instance.trigger("onDeactivate");
-
-          instance.removeEvents();
-
-          instance.isVisible = false;
-        }
-      });
-
-      self.isVisible = true;
-
-      if (self.current || self.isIdle) {
-        self.update();
-
-        self.updateControls();
-      }
-
-      self.trigger("onActivate");
-
-      self.addEvents();
-    },
-
-    // Start closing procedure
-    // This will start "zoom-out" animation if needed and clean everything up afterwards
-    // =================================================================================
-
-    close: function (e, d) {
-      var self = this,
-        current = self.current,
-        effect,
-        duration,
-        $content,
-        domRect,
-        opacity,
-        start,
-        end;
-
-      var done = function () {
-        self.cleanUp(e);
-      };
-
-      if (self.isClosing) {
-        return false;
-      }
-
-      self.isClosing = true;
-
-      // If beforeClose callback prevents closing, make sure content is centered
-      if (self.trigger("beforeClose", e) === false) {
-        self.isClosing = false;
-
-        requestAFrame(function () {
-          self.update();
-        });
-
-        return false;
-      }
-
-      // Remove all events
-      // If there are multiple instances, they will be set again by "activate" method
-      self.removeEvents();
-
-      $content = current.$content;
-      effect = current.opts.animationEffect;
-      duration = $.isNumeric(d) ? d : effect ? current.opts.animationDuration : 0;
-
-      current.$slide.removeClass("fancybox-slide--complete fancybox-slide--next fancybox-slide--previous fancybox-animated");
-
-      if (e !== true) {
-        $.fancybox.stop(current.$slide);
-      } else {
-        effect = false;
-      }
-
-      // Remove other slides
-      current.$slide
-        .siblings()
-        .trigger("onReset")
-        .remove();
-
-      // Trigger animations
-      if (duration) {
-        self.$refs.container
-          .removeClass("fancybox-is-open")
-          .addClass("fancybox-is-closing")
-          .css("transition-duration", duration + "ms");
-      }
-
-      // Clean up
-      self.hideLoading(current);
-
-      self.hideControls(true);
-
-      self.updateCursor();
-
-      // Check if possible to zoom-out
-      if (
-        effect === "zoom" &&
-        !($content && duration && current.type === "image" && !self.isMoved() && !current.hasError && (end = self.getThumbPos(current)))
-      ) {
-        effect = "fade";
-      }
-
-      if (effect === "zoom") {
-        $.fancybox.stop($content);
-
-        domRect = $.fancybox.getTranslate($content);
-
-        start = {
-          top: domRect.top,
-          left: domRect.left,
-          scaleX: domRect.width / end.width,
-          scaleY: domRect.height / end.height,
-          width: end.width,
-          height: end.height
-        };
-
-        // Check if we need to animate opacity
-        opacity = current.opts.zoomOpacity;
-
-        if (opacity == "auto") {
-          opacity = Math.abs(current.width / current.height - end.width / end.height) > 0.1;
-        }
-
-        if (opacity) {
-          end.opacity = 0;
-        }
-
-        $.fancybox.setTranslate($content, start);
-
-        forceRedraw($content);
-
-        $.fancybox.animate($content, end, duration, done);
-
-        return true;
-      }
-
-      if (effect && duration) {
-        $.fancybox.animate(
-          current.$slide.addClass("fancybox-slide--previous").removeClass("fancybox-slide--current"),
-          "fancybox-animated fancybox-fx-" + effect,
-          duration,
-          done
-        );
-      } else {
-        // If skip animation
-        if (e === true) {
-          setTimeout(done, duration);
-        } else {
-          done();
-        }
-      }
-
-      return true;
-    },
-
-    // Final adjustments after removing the instance
-    // =============================================
-
-    cleanUp: function (e) {
-      var self = this,
-        instance,
-        $focus = self.current.opts.$orig,
-        x,
-        y;
-
-      self.current.$slide.trigger("onReset");
-
-      self.$refs.container.empty().remove();
-
-      self.trigger("afterClose", e);
-
-      // Place back focus
-      if (!!self.current.opts.backFocus) {
-        if (!$focus || !$focus.length || !$focus.is(":visible")) {
-          $focus = self.$trigger;
-        }
-
-        if ($focus && $focus.length) {
-          x = window.scrollX;
-          y = window.scrollY;
-
-          $focus.trigger("focus");
-
-          $("html, body")
-            .scrollTop(y)
-            .scrollLeft(x);
-        }
-      }
-
-      self.current = null;
-
-      // Check if there are other instances
-      instance = $.fancybox.getInstance();
-
-      if (instance) {
-        instance.activate();
-      } else {
-        $("body").removeClass("fancybox-active compensate-for-scrollbar");
-
-        $("#fancybox-style-noscroll").remove();
-      }
-    },
-
-    // Call callback and trigger an event
-    // ==================================
-
-    trigger: function (name, slide) {
-      var args = Array.prototype.slice.call(arguments, 1),
-        self = this,
-        obj = slide && slide.opts ? slide : self.current,
-        rez;
-
-      if (obj) {
-        args.unshift(obj);
-      } else {
-        obj = self;
-      }
-
-      args.unshift(self);
-
-      if ($.isFunction(obj.opts[name])) {
-        rez = obj.opts[name].apply(obj, args);
-      }
-
-      if (rez === false) {
-        return rez;
-      }
-
-      if (name === "afterClose" || !self.$refs) {
-        $D.trigger(name + ".fb", args);
-      } else {
-        self.$refs.container.trigger(name + ".fb", args);
-      }
-    },
-
-    // Update infobar values, navigation button states and reveal caption
-    // ==================================================================
-
-    updateControls: function () {
-      var self = this,
-        current = self.current,
-        index = current.index,
-        $container = self.$refs.container,
-        $caption = self.$refs.caption,
-        caption = current.opts.caption;
-
-      // Recalculate content dimensions
-      current.$slide.trigger("refresh");
-
-      // Set caption
-      if (caption && caption.length) {
-        self.$caption = $caption;
-
-        $caption
-          .children()
-          .eq(0)
-          .html(caption);
-      } else {
-        self.$caption = null;
-      }
-
-      if (!self.hasHiddenControls && !self.isIdle) {
-        self.showControls();
-      }
-
-      // Update info and navigation elements
-      $container.find("[data-fancybox-count]").html(self.group.length);
-      $container.find("[data-fancybox-index]").html(index + 1);
-
-      $container.find("[data-fancybox-prev]").prop("disabled", !current.opts.loop && index <= 0);
-      $container.find("[data-fancybox-next]").prop("disabled", !current.opts.loop && index >= self.group.length - 1);
-
-      if (current.type === "image") {
-        // Re-enable buttons; update download button source
-        $container
-          .find("[data-fancybox-zoom]")
-          .show()
-          .end()
-          .find("[data-fancybox-download]")
-          .attr("href", current.opts.image.src || current.src)
-          .show();
-      } else if (current.opts.toolbar) {
-        $container.find("[data-fancybox-download],[data-fancybox-zoom]").hide();
-      }
-
-      // Make sure focus is not on disabled button/element
-      if ($(document.activeElement).is(":hidden,[disabled]")) {
-        self.$refs.container.trigger("focus");
-      }
-    },
-
-    // Hide toolbar and caption
-    // ========================
-
-    hideControls: function (andCaption) {
-      var self = this,
-        arr = ["infobar", "toolbar", "nav"];
-
-      if (andCaption || !self.current.opts.preventCaptionOverlap) {
-        arr.push("caption");
-      }
-
-      this.$refs.container.removeClass(
-        arr
-        .map(function (i) {
-          return "fancybox-show-" + i;
-        })
-        .join(" ")
-      );
-
-      this.hasHiddenControls = true;
-    },
-
-    showControls: function () {
-      var self = this,
-        opts = self.current ? self.current.opts : self.opts,
-        $container = self.$refs.container;
-
-      self.hasHiddenControls = false;
-      self.idleSecondsCounter = 0;
-
-      $container
-        .toggleClass("fancybox-show-toolbar", !!(opts.toolbar && opts.buttons))
-        .toggleClass("fancybox-show-infobar", !!(opts.infobar && self.group.length > 1))
-        .toggleClass("fancybox-show-caption", !!self.$caption)
-        .toggleClass("fancybox-show-nav", !!(opts.arrows && self.group.length > 1))
-        .toggleClass("fancybox-is-modal", !!opts.modal);
-    },
-
-    // Toggle toolbar and caption
-    // ==========================
-
-    toggleControls: function () {
-      if (this.hasHiddenControls) {
-        this.showControls();
-      } else {
-        this.hideControls();
-      }
-    }
-  });
-
-  $.fancybox = {
-    version: "3.5.7",
-    defaults: defaults,
-
-    // Get current instance and execute a command.
-    //
-    // Examples of usage:
-    //
-    //   $instance = $.fancybox.getInstance();
-    //   $.fancybox.getInstance().jumpTo( 1 );
-    //   $.fancybox.getInstance( 'jumpTo', 1 );
-    //   $.fancybox.getInstance( function() {
-    //       console.info( this.currIndex );
-    //   });
-    // ======================================================
-
-    getInstance: function (command) {
-      var instance = $('.fancybox-container:not(".fancybox-is-closing"):last').data("FancyBox"),
-        args = Array.prototype.slice.call(arguments, 1);
-
-      if (instance instanceof FancyBox) {
-        if ($.type(command) === "string") {
-          instance[command].apply(instance, args);
-        } else if ($.type(command) === "function") {
-          command.apply(instance, args);
-        }
-
-        return instance;
-      }
-
-      return false;
-    },
-
-    // Create new instance
-    // ===================
-
-    open: function (items, opts, index) {
-      return new FancyBox(items, opts, index);
-    },
-
-    // Close current or all instances
-    // ==============================
-
-    close: function (all) {
-      var instance = this.getInstance();
-
-      if (instance) {
-        instance.close();
-
-        // Try to find and close next instance
-        if (all === true) {
-          this.close(all);
-        }
-      }
-    },
-
-    // Close all instances and unbind all events
-    // =========================================
-
-    destroy: function () {
-      this.close(true);
-
-      $D.add("body").off("click.fb-start", "**");
-    },
-
-    // Try to detect mobile devices
-    // ============================
-
-    isMobile: /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent),
-
-    // Detect if 'translate3d' support is available
-    // ============================================
-
-    use3d: (function () {
-      var div = document.createElement("div");
-
-      return (
-        window.getComputedStyle &&
-        window.getComputedStyle(div) &&
-        window.getComputedStyle(div).getPropertyValue("transform") &&
-        !(document.documentMode && document.documentMode < 11)
-      );
-    })(),
-
-    // Helper function to get current visual state of an element
-    // returns array[ top, left, horizontal-scale, vertical-scale, opacity ]
-    // =====================================================================
-
-    getTranslate: function ($el) {
-      var domRect;
-
-      if (!$el || !$el.length) {
-        return false;
-      }
-
-      domRect = $el[0].getBoundingClientRect();
-
-      return {
-        top: domRect.top || 0,
-        left: domRect.left || 0,
-        width: domRect.width,
-        height: domRect.height,
-        opacity: parseFloat($el.css("opacity"))
-      };
-    },
-
-    // Shortcut for setting "translate3d" properties for element
-    // Can set be used to set opacity, too
-    // ========================================================
-
-    setTranslate: function ($el, props) {
-      var str = "",
-        css = {};
-
-      if (!$el || !props) {
-        return;
-      }
-
-      if (props.left !== undefined || props.top !== undefined) {
-        str =
-          (props.left === undefined ? $el.position().left : props.left) +
-          "px, " +
-          (props.top === undefined ? $el.position().top : props.top) +
-          "px";
-
-        if (this.use3d) {
-          str = "translate3d(" + str + ", 0px)";
-        } else {
-          str = "translate(" + str + ")";
-        }
-      }
-
-      if (props.scaleX !== undefined && props.scaleY !== undefined) {
-        str += " scale(" + props.scaleX + ", " + props.scaleY + ")";
-      } else if (props.scaleX !== undefined) {
-        str += " scaleX(" + props.scaleX + ")";
-      }
-
-      if (str.length) {
-        css.transform = str;
-      }
-
-      if (props.opacity !== undefined) {
-        css.opacity = props.opacity;
-      }
-
-      if (props.width !== undefined) {
-        css.width = props.width;
-      }
-
-      if (props.height !== undefined) {
-        css.height = props.height;
-      }
-
-      return $el.css(css);
-    },
-
-    // Simple CSS transition handler
-    // =============================
-
-    animate: function ($el, to, duration, callback, leaveAnimationName) {
-      var self = this,
-        from;
-
-      if ($.isFunction(duration)) {
-        callback = duration;
-        duration = null;
-      }
-
-      self.stop($el);
-
-      from = self.getTranslate($el);
-
-      $el.on(transitionEnd, function (e) {
-        // Skip events from child elements and z-index change
-        if (e && e.originalEvent && (!$el.is(e.originalEvent.target) || e.originalEvent.propertyName == "z-index")) {
-          return;
-        }
-
-        self.stop($el);
-
-        if ($.isNumeric(duration)) {
-          $el.css("transition-duration", "");
-        }
-
-        if ($.isPlainObject(to)) {
-          if (to.scaleX !== undefined && to.scaleY !== undefined) {
-            self.setTranslate($el, {
-              top: to.top,
-              left: to.left,
-              width: from.width * to.scaleX,
-              height: from.height * to.scaleY,
-              scaleX: 1,
-              scaleY: 1
-            });
-          }
-        } else if (leaveAnimationName !== true) {
-          $el.removeClass(to);
-        }
-
-        if ($.isFunction(callback)) {
-          callback(e);
-        }
-      });
-
-      if ($.isNumeric(duration)) {
-        $el.css("transition-duration", duration + "ms");
-      }
-
-      // Start animation by changing CSS properties or class name
-      if ($.isPlainObject(to)) {
-        if (to.scaleX !== undefined && to.scaleY !== undefined) {
-          delete to.width;
-          delete to.height;
-
-          if ($el.parent().hasClass("fancybox-slide--image")) {
-            $el.parent().addClass("fancybox-is-scaling");
-          }
-        }
-
-        $.fancybox.setTranslate($el, to);
-      } else {
-        $el.addClass(to);
-      }
-
-      // Make sure that `transitionend` callback gets fired
-      $el.data(
-        "timer",
-        setTimeout(function () {
-          $el.trigger(transitionEnd);
-        }, duration + 33)
-      );
-    },
-
-    stop: function ($el, callCallback) {
-      if ($el && $el.length) {
-        clearTimeout($el.data("timer"));
-
-        if (callCallback) {
-          $el.trigger(transitionEnd);
-        }
-
-        $el.off(transitionEnd).css("transition-duration", "");
-
-        $el.parent().removeClass("fancybox-is-scaling");
-      }
-    }
-  };
-
-  // Default click handler for "fancyboxed" links
-  // ============================================
-
-  function _run(e, opts) {
-    var items = [],
-      index = 0,
-      $target,
-      value,
-      instance;
-
-    // Avoid opening multiple times
-    if (e && e.isDefaultPrevented()) {
-      return;
-    }
-
-    e.preventDefault();
-
-    opts = opts || {};
-
-    if (e && e.data) {
-      opts = mergeOpts(e.data.options, opts);
-    }
-
-    $target = opts.$target || $(e.currentTarget).trigger("blur");
-    instance = $.fancybox.getInstance();
-
-    if (instance && instance.$trigger && instance.$trigger.is($target)) {
-      return;
-    }
-
-    if (opts.selector) {
-      items = $(opts.selector);
-    } else {
-      // Get all related items and find index for clicked one
-      value = $target.attr("data-fancybox") || "";
-
-      if (value) {
-        items = e.data ? e.data.items : [];
-        items = items.length ? items.filter('[data-fancybox="' + value + '"]') : $('[data-fancybox="' + value + '"]');
-      } else {
-        items = [$target];
-      }
-    }
-
-    index = $(items).index($target);
-
-    // Sometimes current item can not be found
-    if (index < 0) {
-      index = 0;
-    }
-
-    instance = $.fancybox.open(items, opts, index);
-
-    // Save last active element
-    instance.$trigger = $target;
-  }
-
-  // Create a jQuery plugin
-  // ======================
-
-  $.fn.fancybox = function (options) {
-    var selector;
-
-    options = options || {};
-    selector = options.selector || false;
-
-    if (selector) {
-      // Use body element instead of document so it executes first
-      $("body")
-        .off("click.fb-start", selector)
-        .on("click.fb-start", selector, {
-          options: options
-        }, _run);
-    } else {
-      this.off("click.fb-start").on(
-        "click.fb-start", {
-          items: this,
-          options: options
-        },
-        _run
-      );
-    }
-
-    return this;
-  };
-
-  // Self initializing plugin for all elements having `data-fancybox` attribute
-  // ==========================================================================
-
-  $D.on("click.fb-start", "[data-fancybox]", _run);
-
-  // Enable "trigger elements"
-  // =========================
-
-  $D.on("click.fb-start", "[data-fancybox-trigger]", function (e) {
-    $('[data-fancybox="' + $(this).attr("data-fancybox-trigger") + '"]')
-      .eq($(this).attr("data-fancybox-index") || 0)
-      .trigger("click.fb-start", {
-        $trigger: $(this)
-      });
-  });
-
-  // Track focus event for better accessibility styling
-  // ==================================================
-  (function () {
-    var buttonStr = ".fancybox-button",
-      focusStr = "fancybox-focus",
-      $pressed = null;
-
-    $D.on("mousedown mouseup focus blur", buttonStr, function (e) {
-      switch (e.type) {
-        case "mousedown":
-          $pressed = $(this);
-          break;
-        case "mouseup":
-          $pressed = null;
-          break;
-        case "focusin":
-          $(buttonStr).removeClass(focusStr);
-
-          if (!$(this).is($pressed) && !$(this).is("[disabled]")) {
-            $(this).addClass(focusStr);
-          }
-          break;
-        case "focusout":
-          $(buttonStr).removeClass(focusStr);
-          break;
-      }
-    });
-  })();
-})(window, document, jQuery);
-// ==========================================================================
-//
-// Media
-// Adds additional media type support
-//
-// ==========================================================================
-(function ($) {
-  "use strict";
-
-  // Object containing properties for each media type
-  var defaults = {
-    youtube: {
-      matcher: /(youtube\.com|youtu\.be|youtube\-nocookie\.com)\/(watch\?(.*&)?v=|v\/|u\/|embed\/?)?(videoseries\?list=(.*)|[\w-]{11}|\?listType=(.*)&list=(.*))(.*)/i,
-      params: {
-        autoplay: 1,
-        autohide: 1,
-        fs: 1,
-        rel: 0,
-        hd: 1,
-        wmode: "transparent",
-        enablejsapi: 1,
-        html5: 1
-      },
-      paramPlace: 8,
-      type: "iframe",
-      url: "https://www.youtube-nocookie.com/embed/$4",
-      thumb: "https://img.youtube.com/vi/$4/hqdefault.jpg"
-    },
-
-    vimeo: {
-      matcher: /^.+vimeo.com\/(.*\/)?([\d]+)(.*)?/,
-      params: {
-        autoplay: 1,
-        hd: 1,
-        show_title: 1,
-        show_byline: 1,
-        show_portrait: 0,
-        fullscreen: 1
-      },
-      paramPlace: 3,
-      type: "iframe",
-      url: "//player.vimeo.com/video/$2"
-    },
-
-    instagram: {
-      matcher: /(instagr\.am|instagram\.com)\/p\/([a-zA-Z0-9_\-]+)\/?/i,
-      type: "image",
-      url: "//$1/p/$2/media/?size=l"
-    },
-
-    // Examples:
-    // http://maps.google.com/?ll=48.857995,2.294297&spn=0.007666,0.021136&t=m&z=16
-    // https://www.google.com/maps/@37.7852006,-122.4146355,14.65z
-    // https://www.google.com/maps/@52.2111123,2.9237542,6.61z?hl=en
-    // https://www.google.com/maps/place/Googleplex/@37.4220041,-122.0833494,17z/data=!4m5!3m4!1s0x0:0x6c296c66619367e0!8m2!3d37.4219998!4d-122.0840572
-    gmap_place: {
-      matcher: /(maps\.)?google\.([a-z]{2,3}(\.[a-z]{2})?)\/(((maps\/(place\/(.*)\/)?\@(.*),(\d+.?\d+?)z))|(\?ll=))(.*)?/i,
-      type: "iframe",
-      url: function (rez) {
-        return (
-          "//maps.google." +
-          rez[2] +
-          "/?ll=" +
-          (rez[9] ? rez[9] + "&z=" + Math.floor(rez[10]) + (rez[12] ? rez[12].replace(/^\//, "&") : "") : rez[12] + "").replace(/\?/, "&") +
-          "&output=" +
-          (rez[12] && rez[12].indexOf("layer=c") > 0 ? "svembed" : "embed")
-        );
-      }
-    },
-
-    // Examples:
-    // https://www.google.com/maps/search/Empire+State+Building/
-    // https://www.google.com/maps/search/?api=1&query=centurylink+field
-    // https://www.google.com/maps/search/?api=1&query=47.5951518,-122.3316393
-    gmap_search: {
-      matcher: /(maps\.)?google\.([a-z]{2,3}(\.[a-z]{2})?)\/(maps\/search\/)(.*)/i,
-      type: "iframe",
-      url: function (rez) {
-        return "//maps.google." + rez[2] + "/maps?q=" + rez[5].replace("query=", "q=").replace("api=1", "") + "&output=embed";
-      }
-    }
-  };
-
-  // Formats matching url to final form
-  var format = function (url, rez, params) {
-    if (!url) {
-      return;
-    }
-
-    params = params || "";
-
-    if ($.type(params) === "object") {
-      params = $.param(params, true);
-    }
-
-    $.each(rez, function (key, value) {
-      url = url.replace("$" + key, value || "");
-    });
-
-    if (params.length) {
-      url += (url.indexOf("?") > 0 ? "&" : "?") + params;
-    }
-
-    return url;
-  };
-
-  $(document).on("objectNeedsType.fb", function (e, instance, item) {
-    var url = item.src || "",
-      type = false,
-      media,
-      thumb,
-      rez,
-      params,
-      urlParams,
-      paramObj,
-      provider;
-
-    media = $.extend(true, {}, defaults, item.opts.media);
-
-    // Look for any matching media type
-    $.each(media, function (providerName, providerOpts) {
-      rez = url.match(providerOpts.matcher);
-
-      if (!rez) {
-        return;
-      }
-
-      type = providerOpts.type;
-      provider = providerName;
-      paramObj = {};
-
-      if (providerOpts.paramPlace && rez[providerOpts.paramPlace]) {
-        urlParams = rez[providerOpts.paramPlace];
-
-        if (urlParams[0] == "?") {
-          urlParams = urlParams.substring(1);
-        }
-
-        urlParams = urlParams.split("&");
-
-        for (var m = 0; m < urlParams.length; ++m) {
-          var p = urlParams[m].split("=", 2);
-
-          if (p.length == 2) {
-            paramObj[p[0]] = decodeURIComponent(p[1].replace(/\+/g, " "));
-          }
-        }
-      }
-
-      params = $.extend(true, {}, providerOpts.params, item.opts[providerName], paramObj);
-
-      url =
-        $.type(providerOpts.url) === "function" ? providerOpts.url.call(this, rez, params, item) : format(providerOpts.url, rez, params);
-
-      thumb =
-        $.type(providerOpts.thumb) === "function" ? providerOpts.thumb.call(this, rez, params, item) : format(providerOpts.thumb, rez);
-
-      if (providerName === "youtube") {
-        url = url.replace(/&t=((\d+)m)?(\d+)s/, function (match, p1, m, s) {
-          return "&start=" + ((m ? parseInt(m, 10) * 60 : 0) + parseInt(s, 10));
-        });
-      } else if (providerName === "vimeo") {
-        url = url.replace("&%23", "#");
-      }
-
-      return false;
-    });
-
-    // If it is found, then change content type and update the url
-
-    if (type) {
-      if (!item.opts.thumb && !(item.opts.$thumb && item.opts.$thumb.length)) {
-        item.opts.thumb = thumb;
-      }
-
-      if (type === "iframe") {
-        item.opts = $.extend(true, item.opts, {
-          iframe: {
-            preload: false,
-            attr: {
-              scrolling: "no"
-            }
-          }
-        });
-      }
-
-      $.extend(item, {
-        type: type,
-        src: url,
-        origSrc: item.src,
-        contentSource: provider,
-        contentType: type === "image" ? "image" : provider == "gmap_place" || provider == "gmap_search" ? "map" : "video"
-      });
-    } else if (url) {
-      item.type = item.opts.defaultType;
-    }
-  });
-
-  // Load YouTube/Video API on request to detect when video finished playing
-  var VideoAPILoader = {
-    youtube: {
-      src: "https://www.youtube.com/iframe_api",
-      class: "YT",
-      loading: false,
-      loaded: false
-    },
-
-    vimeo: {
-      src: "https://player.vimeo.com/api/player.js",
-      class: "Vimeo",
-      loading: false,
-      loaded: false
-    },
-
-    load: function (vendor) {
-      var _this = this,
-        script;
-
-      if (this[vendor].loaded) {
-        setTimeout(function () {
-          _this.done(vendor);
-        });
-        return;
-      }
-
-      if (this[vendor].loading) {
-        return;
-      }
-
-      this[vendor].loading = true;
-
-      script = document.createElement("script");
-      script.type = "text/javascript";
-      script.src = this[vendor].src;
-
-      if (vendor === "youtube") {
-        window.onYouTubeIframeAPIReady = function () {
-          _this[vendor].loaded = true;
-          _this.done(vendor);
-        };
-      } else {
-        script.onload = function () {
-          _this[vendor].loaded = true;
-          _this.done(vendor);
-        };
-      }
-
-      document.body.appendChild(script);
-    },
-    done: function (vendor) {
-      var instance, $el, player;
-
-      if (vendor === "youtube") {
-        delete window.onYouTubeIframeAPIReady;
-      }
-
-      instance = $.fancybox.getInstance();
-
-      if (instance) {
-        $el = instance.current.$content.find("iframe");
-
-        if (vendor === "youtube" && YT !== undefined && YT) {
-          player = new YT.Player($el.attr("id"), {
-            events: {
-              onStateChange: function (e) {
-                if (e.data == 0) {
-                  instance.next();
-                }
-              }
-            }
-          });
-        } else if (vendor === "vimeo" && Vimeo !== undefined && Vimeo) {
-          player = new Vimeo.Player($el);
-
-          player.on("ended", function () {
-            instance.next();
-          });
-        }
-      }
-    }
-  };
-
-  $(document).on({
-    "afterShow.fb": function (e, instance, current) {
-      if (instance.group.length > 1 && (current.contentSource === "youtube" || current.contentSource === "vimeo")) {
-        VideoAPILoader.load(current.contentSource);
-      }
-    }
-  });
-})(jQuery);
-// ==========================================================================
-//
-// Guestures
-// Adds touch guestures, handles click and tap events
-//
-// ==========================================================================
-(function (window, document, $) {
-  "use strict";
-
-  var requestAFrame = (function () {
-    return (
-      window.requestAnimationFrame ||
-      window.webkitRequestAnimationFrame ||
-      window.mozRequestAnimationFrame ||
-      window.oRequestAnimationFrame ||
-      // if all else fails, use setTimeout
-      function (callback) {
-        return window.setTimeout(callback, 1000 / 60);
-      }
-    );
-  })();
-
-  var cancelAFrame = (function () {
-    return (
-      window.cancelAnimationFrame ||
-      window.webkitCancelAnimationFrame ||
-      window.mozCancelAnimationFrame ||
-      window.oCancelAnimationFrame ||
-      function (id) {
-        window.clearTimeout(id);
-      }
-    );
-  })();
-
-  var getPointerXY = function (e) {
-    var result = [];
-
-    e = e.originalEvent || e || window.e;
-    e = e.touches && e.touches.length ? e.touches : e.changedTouches && e.changedTouches.length ? e.changedTouches : [e];
-
-    for (var key in e) {
-      if (e[key].pageX) {
-        result.push({
-          x: e[key].pageX,
-          y: e[key].pageY
-        });
-      } else if (e[key].clientX) {
-        result.push({
-          x: e[key].clientX,
-          y: e[key].clientY
-        });
-      }
-    }
-
-    return result;
-  };
-
-  var distance = function (point2, point1, what) {
-    if (!point1 || !point2) {
-      return 0;
-    }
-
-    if (what === "x") {
-      return point2.x - point1.x;
-    } else if (what === "y") {
-      return point2.y - point1.y;
-    }
-
-    return Math.sqrt(Math.pow(point2.x - point1.x, 2) + Math.pow(point2.y - point1.y, 2));
-  };
-
-  var isClickable = function ($el) {
-    if (
-      $el.is('a,area,button,[role="button"],input,label,select,summary,textarea,video,audio,iframe') ||
-      $.isFunction($el.get(0).onclick) ||
-      $el.data("selectable")
-    ) {
-      return true;
-    }
-
-    // Check for attributes like data-fancybox-next or data-fancybox-close
-    for (var i = 0, atts = $el[0].attributes, n = atts.length; i < n; i++) {
-      if (atts[i].nodeName.substr(0, 14) === "data-fancybox-") {
-        return true;
-      }
-    }
-
-    return false;
-  };
-
-  var hasScrollbars = function (el) {
-    var overflowY = window.getComputedStyle(el)["overflow-y"],
-      overflowX = window.getComputedStyle(el)["overflow-x"],
-      vertical = (overflowY === "scroll" || overflowY === "auto") && el.scrollHeight > el.clientHeight,
-      horizontal = (overflowX === "scroll" || overflowX === "auto") && el.scrollWidth > el.clientWidth;
-
-    return vertical || horizontal;
-  };
-
-  var isScrollable = function ($el) {
-    var rez = false;
-
-    while (true) {
-      rez = hasScrollbars($el.get(0));
-
-      if (rez) {
-        break;
-      }
-
-      $el = $el.parent();
-
-      if (!$el.length || $el.hasClass("fancybox-stage") || $el.is("body")) {
-        break;
-      }
-    }
-
-    return rez;
-  };
-
-  var Guestures = function (instance) {
-    var self = this;
-
-    self.instance = instance;
-
-    self.$bg = instance.$refs.bg;
-    self.$stage = instance.$refs.stage;
-    self.$container = instance.$refs.container;
-
-    self.destroy();
-
-    self.$container.on("touchstart.fb.touch mousedown.fb.touch", $.proxy(self, "ontouchstart"));
-  };
-
-  Guestures.prototype.destroy = function () {
-    var self = this;
-
-    self.$container.off(".fb.touch");
-
-    $(document).off(".fb.touch");
-
-    if (self.requestId) {
-      cancelAFrame(self.requestId);
-      self.requestId = null;
-    }
-
-    if (self.tapped) {
-      clearTimeout(self.tapped);
-      self.tapped = null;
-    }
-  };
-
-  Guestures.prototype.ontouchstart = function (e) {
-    var self = this,
-      $target = $(e.target),
-      instance = self.instance,
-      current = instance.current,
-      $slide = current.$slide,
-      $content = current.$content,
-      isTouchDevice = e.type == "touchstart";
-
-    // Do not respond to both (touch and mouse) events
-    if (isTouchDevice) {
-      self.$container.off("mousedown.fb.touch");
-    }
-
-    // Ignore right click
-    if (e.originalEvent && e.originalEvent.button == 2) {
-      return;
-    }
-
-    // Ignore taping on links, buttons, input elements
-    if (!$slide.length || !$target.length || isClickable($target) || isClickable($target.parent())) {
-      return;
-    }
-    // Ignore clicks on the scrollbar
-    if (!$target.is("img") && e.originalEvent.clientX > $target[0].clientWidth + $target.offset().left) {
-      return;
-    }
-
-    // Ignore clicks while zooming or closing
-    if (!current || instance.isAnimating || current.$slide.hasClass("fancybox-animated")) {
-      e.stopPropagation();
-      e.preventDefault();
-
-      return;
-    }
-
-    self.realPoints = self.startPoints = getPointerXY(e);
-
-    if (!self.startPoints.length) {
-      return;
-    }
-
-    // Allow other scripts to catch touch event if "touch" is set to false
-    if (current.touch) {
-      e.stopPropagation();
-    }
-
-    self.startEvent = e;
-
-    self.canTap = true;
-    self.$target = $target;
-    self.$content = $content;
-    self.opts = current.opts.touch;
-
-    self.isPanning = false;
-    self.isSwiping = false;
-    self.isZooming = false;
-    self.isScrolling = false;
-    self.canPan = instance.canPan();
-
-    self.startTime = new Date().getTime();
-    self.distanceX = self.distanceY = self.distance = 0;
-
-    self.canvasWidth = Math.round($slide[0].clientWidth);
-    self.canvasHeight = Math.round($slide[0].clientHeight);
-
-    self.contentLastPos = null;
-    self.contentStartPos = $.fancybox.getTranslate(self.$content) || {
-      top: 0,
-      left: 0
-    };
-    self.sliderStartPos = $.fancybox.getTranslate($slide);
-
-    // Since position will be absolute, but we need to make it relative to the stage
-    self.stagePos = $.fancybox.getTranslate(instance.$refs.stage);
-
-    self.sliderStartPos.top -= self.stagePos.top;
-    self.sliderStartPos.left -= self.stagePos.left;
-
-    self.contentStartPos.top -= self.stagePos.top;
-    self.contentStartPos.left -= self.stagePos.left;
-
-    $(document)
-      .off(".fb.touch")
-      .on(isTouchDevice ? "touchend.fb.touch touchcancel.fb.touch" : "mouseup.fb.touch mouseleave.fb.touch", $.proxy(self, "ontouchend"))
-      .on(isTouchDevice ? "touchmove.fb.touch" : "mousemove.fb.touch", $.proxy(self, "ontouchmove"));
-
-    if ($.fancybox.isMobile) {
-      document.addEventListener("scroll", self.onscroll, true);
-    }
-
-    // Skip if clicked outside the sliding area
-    if (!(self.opts || self.canPan) || !($target.is(self.$stage) || self.$stage.find($target).length)) {
-      if ($target.is(".fancybox-image")) {
-        e.preventDefault();
-      }
-
-      if (!($.fancybox.isMobile && $target.parents(".fancybox-caption").length)) {
-        return;
-      }
-    }
-
-    self.isScrollable = isScrollable($target) || isScrollable($target.parent());
-
-    // Check if element is scrollable and try to prevent default behavior (scrolling)
-    if (!($.fancybox.isMobile && self.isScrollable)) {
-      e.preventDefault();
-    }
-
-    // One finger or mouse click - swipe or pan an image
-    if (self.startPoints.length === 1 || current.hasError) {
-      if (self.canPan) {
-        $.fancybox.stop(self.$content);
-
-        self.isPanning = true;
-      } else {
-        self.isSwiping = true;
-      }
-
-      self.$container.addClass("fancybox-is-grabbing");
-    }
-
-    // Two fingers - zoom image
-    if (self.startPoints.length === 2 && current.type === "image" && (current.isLoaded || current.$ghost)) {
-      self.canTap = false;
-      self.isSwiping = false;
-      self.isPanning = false;
-
-      self.isZooming = true;
-
-      $.fancybox.stop(self.$content);
-
-      self.centerPointStartX = (self.startPoints[0].x + self.startPoints[1].x) * 0.5 - $(window).scrollLeft();
-      self.centerPointStartY = (self.startPoints[0].y + self.startPoints[1].y) * 0.5 - $(window).scrollTop();
-
-      self.percentageOfImageAtPinchPointX = (self.centerPointStartX - self.contentStartPos.left) / self.contentStartPos.width;
-      self.percentageOfImageAtPinchPointY = (self.centerPointStartY - self.contentStartPos.top) / self.contentStartPos.height;
-
-      self.startDistanceBetweenFingers = distance(self.startPoints[0], self.startPoints[1]);
-    }
-  };
-
-  Guestures.prototype.onscroll = function (e) {
-    var self = this;
-
-    self.isScrolling = true;
-
-    document.removeEventListener("scroll", self.onscroll, true);
-  };
-
-  Guestures.prototype.ontouchmove = function (e) {
-    var self = this;
-
-    // Make sure user has not released over iframe or disabled element
-    if (e.originalEvent.buttons !== undefined && e.originalEvent.buttons === 0) {
-      self.ontouchend(e);
-      return;
-    }
-
-    if (self.isScrolling) {
-      self.canTap = false;
-      return;
-    }
-
-    self.newPoints = getPointerXY(e);
-
-    if (!(self.opts || self.canPan) || !self.newPoints.length || !self.newPoints.length) {
-      return;
-    }
-
-    if (!(self.isSwiping && self.isSwiping === true)) {
-      e.preventDefault();
-    }
-
-    self.distanceX = distance(self.newPoints[0], self.startPoints[0], "x");
-    self.distanceY = distance(self.newPoints[0], self.startPoints[0], "y");
-
-    self.distance = distance(self.newPoints[0], self.startPoints[0]);
-
-    // Skip false ontouchmove events (Chrome)
-    if (self.distance > 0) {
-      if (self.isSwiping) {
-        self.onSwipe(e);
-      } else if (self.isPanning) {
-        self.onPan();
-      } else if (self.isZooming) {
-        self.onZoom();
-      }
-    }
-  };
-
-  Guestures.prototype.onSwipe = function (e) {
-    var self = this,
-      instance = self.instance,
-      swiping = self.isSwiping,
-      left = self.sliderStartPos.left || 0,
-      angle;
-
-    // If direction is not yet determined
-    if (swiping === true) {
-      // We need at least 10px distance to correctly calculate an angle
-      if (Math.abs(self.distance) > 10) {
-        self.canTap = false;
-
-        if (instance.group.length < 2 && self.opts.vertical) {
-          self.isSwiping = "y";
-        } else if (instance.isDragging || self.opts.vertical === false || (self.opts.vertical === "auto" && $(window).width() > 800)) {
-          self.isSwiping = "x";
-        } else {
-          angle = Math.abs((Math.atan2(self.distanceY, self.distanceX) * 180) / Math.PI);
-
-          self.isSwiping = angle > 45 && angle < 135 ? "y" : "x";
-        }
-
-        if (self.isSwiping === "y" && $.fancybox.isMobile && self.isScrollable) {
-          self.isScrolling = true;
-
-          return;
-        }
-
-        instance.isDragging = self.isSwiping;
-
-        // Reset points to avoid jumping, because we dropped first swipes to calculate the angle
-        self.startPoints = self.newPoints;
-
-        $.each(instance.slides, function (index, slide) {
-          var slidePos, stagePos;
-
-          $.fancybox.stop(slide.$slide);
-
-          slidePos = $.fancybox.getTranslate(slide.$slide);
-          stagePos = $.fancybox.getTranslate(instance.$refs.stage);
-
-          slide.$slide
-            .css({
-              transform: "",
-              opacity: "",
-              "transition-duration": ""
-            })
-            .removeClass("fancybox-animated")
-            .removeClass(function (index, className) {
-              return (className.match(/(^|\s)fancybox-fx-\S+/g) || []).join(" ");
-            });
-
-          if (slide.pos === instance.current.pos) {
-            self.sliderStartPos.top = slidePos.top - stagePos.top;
-            self.sliderStartPos.left = slidePos.left - stagePos.left;
-          }
-
-          $.fancybox.setTranslate(slide.$slide, {
-            top: slidePos.top - stagePos.top,
-            left: slidePos.left - stagePos.left
-          });
-        });
-
-        // Stop slideshow
-        if (instance.SlideShow && instance.SlideShow.isActive) {
-          instance.SlideShow.stop();
-        }
-      }
-
-      return;
-    }
-
-    // Sticky edges
-    if (swiping == "x") {
-      if (
-        self.distanceX > 0 &&
-        (self.instance.group.length < 2 || (self.instance.current.index === 0 && !self.instance.current.opts.loop))
-      ) {
-        left = left + Math.pow(self.distanceX, 0.8);
-      } else if (
-        self.distanceX < 0 &&
-        (self.instance.group.length < 2 ||
-          (self.instance.current.index === self.instance.group.length - 1 && !self.instance.current.opts.loop))
-      ) {
-        left = left - Math.pow(-self.distanceX, 0.8);
-      } else {
-        left = left + self.distanceX;
-      }
-    }
-
-    self.sliderLastPos = {
-      top: swiping == "x" ? 0 : self.sliderStartPos.top + self.distanceY,
-      left: left
-    };
-
-    if (self.requestId) {
-      cancelAFrame(self.requestId);
-
-      self.requestId = null;
-    }
-
-    self.requestId = requestAFrame(function () {
-      if (self.sliderLastPos) {
-        $.each(self.instance.slides, function (index, slide) {
-          var pos = slide.pos - self.instance.currPos;
-
-          $.fancybox.setTranslate(slide.$slide, {
-            top: self.sliderLastPos.top,
-            left: self.sliderLastPos.left + pos * self.canvasWidth + pos * slide.opts.gutter
-          });
-        });
-
-        self.$container.addClass("fancybox-is-sliding");
-      }
-    });
-  };
-
-  Guestures.prototype.onPan = function () {
-    var self = this;
-
-    // Prevent accidental movement (sometimes, when tapping casually, finger can move a bit)
-    if (distance(self.newPoints[0], self.realPoints[0]) < ($.fancybox.isMobile ? 10 : 5)) {
-      self.startPoints = self.newPoints;
-      return;
-    }
-
-    self.canTap = false;
-
-    self.contentLastPos = self.limitMovement();
-
-    if (self.requestId) {
-      cancelAFrame(self.requestId);
-    }
-
-    self.requestId = requestAFrame(function () {
-      $.fancybox.setTranslate(self.$content, self.contentLastPos);
-    });
-  };
-
-  // Make panning sticky to the edges
-  Guestures.prototype.limitMovement = function () {
-    var self = this;
-
-    var canvasWidth = self.canvasWidth;
-    var canvasHeight = self.canvasHeight;
-
-    var distanceX = self.distanceX;
-    var distanceY = self.distanceY;
-
-    var contentStartPos = self.contentStartPos;
-
-    var currentOffsetX = contentStartPos.left;
-    var currentOffsetY = contentStartPos.top;
-
-    var currentWidth = contentStartPos.width;
-    var currentHeight = contentStartPos.height;
-
-    var minTranslateX, minTranslateY, maxTranslateX, maxTranslateY, newOffsetX, newOffsetY;
-
-    if (currentWidth > canvasWidth) {
-      newOffsetX = currentOffsetX + distanceX;
-    } else {
-      newOffsetX = currentOffsetX;
-    }
-
-    newOffsetY = currentOffsetY + distanceY;
-
-    // Slow down proportionally to traveled distance
-    minTranslateX = Math.max(0, canvasWidth * 0.5 - currentWidth * 0.5);
-    minTranslateY = Math.max(0, canvasHeight * 0.5 - currentHeight * 0.5);
-
-    maxTranslateX = Math.min(canvasWidth - currentWidth, canvasWidth * 0.5 - currentWidth * 0.5);
-    maxTranslateY = Math.min(canvasHeight - currentHeight, canvasHeight * 0.5 - currentHeight * 0.5);
-
-    //   ->
-    if (distanceX > 0 && newOffsetX > minTranslateX) {
-      newOffsetX = minTranslateX - 1 + Math.pow(-minTranslateX + currentOffsetX + distanceX, 0.8) || 0;
-    }
-
-    //    <-
-    if (distanceX < 0 && newOffsetX < maxTranslateX) {
-      newOffsetX = maxTranslateX + 1 - Math.pow(maxTranslateX - currentOffsetX - distanceX, 0.8) || 0;
-    }
-
-    //   \/
-    if (distanceY > 0 && newOffsetY > minTranslateY) {
-      newOffsetY = minTranslateY - 1 + Math.pow(-minTranslateY + currentOffsetY + distanceY, 0.8) || 0;
-    }
-
-    //   /\
-    if (distanceY < 0 && newOffsetY < maxTranslateY) {
-      newOffsetY = maxTranslateY + 1 - Math.pow(maxTranslateY - currentOffsetY - distanceY, 0.8) || 0;
-    }
-
-    return {
-      top: newOffsetY,
-      left: newOffsetX
-    };
-  };
-
-  Guestures.prototype.limitPosition = function (newOffsetX, newOffsetY, newWidth, newHeight) {
-    var self = this;
-
-    var canvasWidth = self.canvasWidth;
-    var canvasHeight = self.canvasHeight;
-
-    if (newWidth > canvasWidth) {
-      newOffsetX = newOffsetX > 0 ? 0 : newOffsetX;
-      newOffsetX = newOffsetX < canvasWidth - newWidth ? canvasWidth - newWidth : newOffsetX;
-    } else {
-      // Center horizontally
-      newOffsetX = Math.max(0, canvasWidth / 2 - newWidth / 2);
-    }
-
-    if (newHeight > canvasHeight) {
-      newOffsetY = newOffsetY > 0 ? 0 : newOffsetY;
-      newOffsetY = newOffsetY < canvasHeight - newHeight ? canvasHeight - newHeight : newOffsetY;
-    } else {
-      // Center vertically
-      newOffsetY = Math.max(0, canvasHeight / 2 - newHeight / 2);
-    }
-
-    return {
-      top: newOffsetY,
-      left: newOffsetX
-    };
-  };
-
-  Guestures.prototype.onZoom = function () {
-    var self = this;
-
-    // Calculate current distance between points to get pinch ratio and new width and height
-    var contentStartPos = self.contentStartPos;
-
-    var currentWidth = contentStartPos.width;
-    var currentHeight = contentStartPos.height;
-
-    var currentOffsetX = contentStartPos.left;
-    var currentOffsetY = contentStartPos.top;
-
-    var endDistanceBetweenFingers = distance(self.newPoints[0], self.newPoints[1]);
-
-    var pinchRatio = endDistanceBetweenFingers / self.startDistanceBetweenFingers;
-
-    var newWidth = Math.floor(currentWidth * pinchRatio);
-    var newHeight = Math.floor(currentHeight * pinchRatio);
-
-    // This is the translation due to pinch-zooming
-    var translateFromZoomingX = (currentWidth - newWidth) * self.percentageOfImageAtPinchPointX;
-    var translateFromZoomingY = (currentHeight - newHeight) * self.percentageOfImageAtPinchPointY;
-
-    // Point between the two touches
-    var centerPointEndX = (self.newPoints[0].x + self.newPoints[1].x) / 2 - $(window).scrollLeft();
-    var centerPointEndY = (self.newPoints[0].y + self.newPoints[1].y) / 2 - $(window).scrollTop();
-
-    // And this is the translation due to translation of the centerpoint
-    // between the two fingers
-    var translateFromTranslatingX = centerPointEndX - self.centerPointStartX;
-    var translateFromTranslatingY = centerPointEndY - self.centerPointStartY;
-
-    // The new offset is the old/current one plus the total translation
-    var newOffsetX = currentOffsetX + (translateFromZoomingX + translateFromTranslatingX);
-    var newOffsetY = currentOffsetY + (translateFromZoomingY + translateFromTranslatingY);
-
-    var newPos = {
-      top: newOffsetY,
-      left: newOffsetX,
-      scaleX: pinchRatio,
-      scaleY: pinchRatio
-    };
-
-    self.canTap = false;
-
-    self.newWidth = newWidth;
-    self.newHeight = newHeight;
-
-    self.contentLastPos = newPos;
-
-    if (self.requestId) {
-      cancelAFrame(self.requestId);
-    }
-
-    self.requestId = requestAFrame(function () {
-      $.fancybox.setTranslate(self.$content, self.contentLastPos);
-    });
-  };
-
-  Guestures.prototype.ontouchend = function (e) {
-    var self = this;
-
-    var swiping = self.isSwiping;
-    var panning = self.isPanning;
-    var zooming = self.isZooming;
-    var scrolling = self.isScrolling;
-
-    self.endPoints = getPointerXY(e);
-    self.dMs = Math.max(new Date().getTime() - self.startTime, 1);
-
-    self.$container.removeClass("fancybox-is-grabbing");
-
-    $(document).off(".fb.touch");
-
-    document.removeEventListener("scroll", self.onscroll, true);
-
-    if (self.requestId) {
-      cancelAFrame(self.requestId);
-
-      self.requestId = null;
-    }
-
-    self.isSwiping = false;
-    self.isPanning = false;
-    self.isZooming = false;
-    self.isScrolling = false;
-
-    self.instance.isDragging = false;
-
-    if (self.canTap) {
-      return self.onTap(e);
-    }
-
-    self.speed = 100;
-
-    // Speed in px/ms
-    self.velocityX = (self.distanceX / self.dMs) * 0.5;
-    self.velocityY = (self.distanceY / self.dMs) * 0.5;
-
-    if (panning) {
-      self.endPanning();
-    } else if (zooming) {
-      self.endZooming();
-    } else {
-      self.endSwiping(swiping, scrolling);
-    }
-
-    return;
-  };
-
-  Guestures.prototype.endSwiping = function (swiping, scrolling) {
-    var self = this,
-      ret = false,
-      len = self.instance.group.length,
-      distanceX = Math.abs(self.distanceX),
-      canAdvance = swiping == "x" && len > 1 && ((self.dMs > 130 && distanceX > 10) || distanceX > 50),
-      speedX = 300;
-
-    self.sliderLastPos = null;
-
-    // Close if swiped vertically / navigate if horizontally
-    if (swiping == "y" && !scrolling && Math.abs(self.distanceY) > 50) {
-      // Continue vertical movement
-      $.fancybox.animate(
-        self.instance.current.$slide, {
-          top: self.sliderStartPos.top + self.distanceY + self.velocityY * 150,
-          opacity: 0
-        },
-        200
-      );
-      ret = self.instance.close(true, 250);
-    } else if (canAdvance && self.distanceX > 0) {
-      ret = self.instance.previous(speedX);
-    } else if (canAdvance && self.distanceX < 0) {
-      ret = self.instance.next(speedX);
-    }
-
-    if (ret === false && (swiping == "x" || swiping == "y")) {
-      self.instance.centerSlide(200);
-    }
-
-    self.$container.removeClass("fancybox-is-sliding");
-  };
-
-  // Limit panning from edges
-  // ========================
-  Guestures.prototype.endPanning = function () {
-    var self = this,
-      newOffsetX,
-      newOffsetY,
-      newPos;
-
-    if (!self.contentLastPos) {
-      return;
-    }
-
-    if (self.opts.momentum === false || self.dMs > 350) {
-      newOffsetX = self.contentLastPos.left;
-      newOffsetY = self.contentLastPos.top;
-    } else {
-      // Continue movement
-      newOffsetX = self.contentLastPos.left + self.velocityX * 500;
-      newOffsetY = self.contentLastPos.top + self.velocityY * 500;
-    }
-
-    newPos = self.limitPosition(newOffsetX, newOffsetY, self.contentStartPos.width, self.contentStartPos.height);
-
-    newPos.width = self.contentStartPos.width;
-    newPos.height = self.contentStartPos.height;
-
-    $.fancybox.animate(self.$content, newPos, 366);
-  };
-
-  Guestures.prototype.endZooming = function () {
-    var self = this;
-
-    var current = self.instance.current;
-
-    var newOffsetX, newOffsetY, newPos, reset;
-
-    var newWidth = self.newWidth;
-    var newHeight = self.newHeight;
-
-    if (!self.contentLastPos) {
-      return;
-    }
-
-    newOffsetX = self.contentLastPos.left;
-    newOffsetY = self.contentLastPos.top;
-
-    reset = {
-      top: newOffsetY,
-      left: newOffsetX,
-      width: newWidth,
-      height: newHeight,
-      scaleX: 1,
-      scaleY: 1
-    };
-
-    // Reset scalex/scaleY values; this helps for perfomance and does not break animation
-    $.fancybox.setTranslate(self.$content, reset);
-
-    if (newWidth < self.canvasWidth && newHeight < self.canvasHeight) {
-      self.instance.scaleToFit(150);
-    } else if (newWidth > current.width || newHeight > current.height) {
-      self.instance.scaleToActual(self.centerPointStartX, self.centerPointStartY, 150);
-    } else {
-      newPos = self.limitPosition(newOffsetX, newOffsetY, newWidth, newHeight);
-
-      $.fancybox.animate(self.$content, newPos, 150);
-    }
-  };
-
-  Guestures.prototype.onTap = function (e) {
-    var self = this;
-    var $target = $(e.target);
-
-    var instance = self.instance;
-    var current = instance.current;
-
-    var endPoints = (e && getPointerXY(e)) || self.startPoints;
-
-    var tapX = endPoints[0] ? endPoints[0].x - $(window).scrollLeft() - self.stagePos.left : 0;
-    var tapY = endPoints[0] ? endPoints[0].y - $(window).scrollTop() - self.stagePos.top : 0;
-
-    var where;
-
-    var process = function (prefix) {
-      var action = current.opts[prefix];
-
-      if ($.isFunction(action)) {
-        action = action.apply(instance, [current, e]);
-      }
-
-      if (!action) {
-        return;
-      }
-
-      switch (action) {
-        case "close":
-          instance.close(self.startEvent);
-
-          break;
-
-        case "toggleControls":
-          instance.toggleControls();
-
-          break;
-
-        case "next":
-          instance.next();
-
-          break;
-
-        case "nextOrClose":
-          if (instance.group.length > 1) {
-            instance.next();
-          } else {
-            instance.close(self.startEvent);
-          }
-
-          break;
-
-        case "zoom":
-          if (current.type == "image" && (current.isLoaded || current.$ghost)) {
-            if (instance.canPan()) {
-              instance.scaleToFit();
-            } else if (instance.isScaledDown()) {
-              instance.scaleToActual(tapX, tapY);
-            } else if (instance.group.length < 2) {
-              instance.close(self.startEvent);
-            }
-          }
-
-          break;
-      }
-    };
-
-    // Ignore right click
-    if (e.originalEvent && e.originalEvent.button == 2) {
-      return;
-    }
-
-    // Skip if clicked on the scrollbar
-    if (!$target.is("img") && tapX > $target[0].clientWidth + $target.offset().left) {
-      return;
-    }
-
-    // Check where is clicked
-    if ($target.is(".fancybox-bg,.fancybox-inner,.fancybox-outer,.fancybox-container")) {
-      where = "Outside";
-    } else if ($target.is(".fancybox-slide")) {
-      where = "Slide";
-    } else if (
-      instance.current.$content &&
-      instance.current.$content
-      .find($target)
-      .addBack()
-      .filter($target).length
-    ) {
-      where = "Content";
-    } else {
-      return;
-    }
-
-    // Check if this is a double tap
-    if (self.tapped) {
-      // Stop previously created single tap
-      clearTimeout(self.tapped);
-      self.tapped = null;
-
-      // Skip if distance between taps is too big
-      if (Math.abs(tapX - self.tapX) > 50 || Math.abs(tapY - self.tapY) > 50) {
-        return this;
-      }
-
-      // OK, now we assume that this is a double-tap
-      process("dblclick" + where);
-    } else {
-      // Single tap will be processed if user has not clicked second time within 300ms
-      // or there is no need to wait for double-tap
-      self.tapX = tapX;
-      self.tapY = tapY;
-
-      if (current.opts["dblclick" + where] && current.opts["dblclick" + where] !== current.opts["click" + where]) {
-        self.tapped = setTimeout(function () {
-          self.tapped = null;
-
-          if (!instance.isAnimating) {
-            process("click" + where);
-          }
-        }, 500);
-      } else {
-        process("click" + where);
-      }
-    }
-
-    return this;
-  };
-
-  $(document)
-    .on("onActivate.fb", function (e, instance) {
-      if (instance && !instance.Guestures) {
-        instance.Guestures = new Guestures(instance);
-      }
-    })
-    .on("beforeClose.fb", function (e, instance) {
-      if (instance && instance.Guestures) {
-        instance.Guestures.destroy();
-      }
-    });
-})(window, document, jQuery);
-// ==========================================================================
-//
-// SlideShow
-// Enables slideshow functionality
-//
-// Example of usage:
-// $.fancybox.getInstance().SlideShow.start()
-//
-// ==========================================================================
-(function (document, $) {
-  "use strict";
-
-  $.extend(true, $.fancybox.defaults, {
-    btnTpl: {
-      slideShow: '<button data-fancybox-play class="fancybox-button fancybox-button--play" title="{{PLAY_START}}">' +
-        '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M6.5 5.4v13.2l11-6.6z"/></svg>' +
-        '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M8.33 5.75h2.2v12.5h-2.2V5.75zm5.15 0h2.2v12.5h-2.2V5.75z"/></svg>' +
-        "</button>"
-    },
-    slideShow: {
-      autoStart: false,
-      speed: 3000,
-      progress: true
-    }
-  });
-
-  var SlideShow = function (instance) {
-    this.instance = instance;
-    this.init();
-  };
-
-  $.extend(SlideShow.prototype, {
-    timer: null,
-    isActive: false,
-    $button: null,
-
-    init: function () {
-      var self = this,
-        instance = self.instance,
-        opts = instance.group[instance.currIndex].opts.slideShow;
-
-      self.$button = instance.$refs.toolbar.find("[data-fancybox-play]").on("click", function () {
-        self.toggle();
-      });
-
-      if (instance.group.length < 2 || !opts) {
-        self.$button.hide();
-      } else if (opts.progress) {
-        self.$progress = $('<div class="fancybox-progress"></div>').appendTo(instance.$refs.inner);
-      }
-    },
-
-    set: function (force) {
-      var self = this,
-        instance = self.instance,
-        current = instance.current;
-
-      // Check if reached last element
-      if (current && (force === true || current.opts.loop || instance.currIndex < instance.group.length - 1)) {
-        if (self.isActive && current.contentType !== "video") {
-          if (self.$progress) {
-            $.fancybox.animate(self.$progress.show(), {
-              scaleX: 1
-            }, current.opts.slideShow.speed);
-          }
-
-          self.timer = setTimeout(function () {
-            if (!instance.current.opts.loop && instance.current.index == instance.group.length - 1) {
-              instance.jumpTo(0);
-            } else {
-              instance.next();
-            }
-          }, current.opts.slideShow.speed);
-        }
-      } else {
-        self.stop();
-        instance.idleSecondsCounter = 0;
-        instance.showControls();
-      }
-    },
-
-    clear: function () {
-      var self = this;
-
-      clearTimeout(self.timer);
-
-      self.timer = null;
-
-      if (self.$progress) {
-        self.$progress.removeAttr("style").hide();
-      }
-    },
-
-    start: function () {
-      var self = this,
-        current = self.instance.current;
-
-      if (current) {
-        self.$button
-          .attr("title", (current.opts.i18n[current.opts.lang] || current.opts.i18n.en).PLAY_STOP)
-          .removeClass("fancybox-button--play")
-          .addClass("fancybox-button--pause");
-
-        self.isActive = true;
-
-        if (current.isComplete) {
-          self.set(true);
-        }
-
-        self.instance.trigger("onSlideShowChange", true);
-      }
-    },
-
-    stop: function () {
-      var self = this,
-        current = self.instance.current;
-
-      self.clear();
-
-      self.$button
-        .attr("title", (current.opts.i18n[current.opts.lang] || current.opts.i18n.en).PLAY_START)
-        .removeClass("fancybox-button--pause")
-        .addClass("fancybox-button--play");
-
-      self.isActive = false;
-
-      self.instance.trigger("onSlideShowChange", false);
-
-      if (self.$progress) {
-        self.$progress.removeAttr("style").hide();
-      }
-    },
-
-    toggle: function () {
-      var self = this;
-
-      if (self.isActive) {
-        self.stop();
-      } else {
-        self.start();
-      }
-    }
-  });
-
-  $(document).on({
-    "onInit.fb": function (e, instance) {
-      if (instance && !instance.SlideShow) {
-        instance.SlideShow = new SlideShow(instance);
-      }
-    },
-
-    "beforeShow.fb": function (e, instance, current, firstRun) {
-      var SlideShow = instance && instance.SlideShow;
-
-      if (firstRun) {
-        if (SlideShow && current.opts.slideShow.autoStart) {
-          SlideShow.start();
-        }
-      } else if (SlideShow && SlideShow.isActive) {
-        SlideShow.clear();
-      }
-    },
-
-    "afterShow.fb": function (e, instance, current) {
-      var SlideShow = instance && instance.SlideShow;
-
-      if (SlideShow && SlideShow.isActive) {
-        SlideShow.set();
-      }
-    },
-
-    "afterKeydown.fb": function (e, instance, current, keypress, keycode) {
-      var SlideShow = instance && instance.SlideShow;
-
-      // "P" or Spacebar
-      if (SlideShow && current.opts.slideShow && (keycode === 80 || keycode === 32) && !$(document.activeElement).is("button,a,input")) {
-        keypress.preventDefault();
-
-        SlideShow.toggle();
-      }
-    },
-
-    "beforeClose.fb onDeactivate.fb": function (e, instance) {
-      var SlideShow = instance && instance.SlideShow;
-
-      if (SlideShow) {
-        SlideShow.stop();
-      }
-    }
-  });
-
-  // Page Visibility API to pause slideshow when window is not active
-  $(document).on("visibilitychange", function () {
-    var instance = $.fancybox.getInstance(),
-      SlideShow = instance && instance.SlideShow;
-
-    if (SlideShow && SlideShow.isActive) {
-      if (document.hidden) {
-        SlideShow.clear();
-      } else {
-        SlideShow.set();
-      }
-    }
-  });
-})(document, jQuery);
-// ==========================================================================
-//
-// FullScreen
-// Adds fullscreen functionality
-//
-// ==========================================================================
-(function (document, $) {
-  "use strict";
-
-  // Collection of methods supported by user browser
-  var fn = (function () {
-    var fnMap = [
-      ["requestFullscreen", "exitFullscreen", "fullscreenElement", "fullscreenEnabled", "fullscreenchange", "fullscreenerror"],
-      // new WebKit
-      [
-        "webkitRequestFullscreen",
-        "webkitExitFullscreen",
-        "webkitFullscreenElement",
-        "webkitFullscreenEnabled",
-        "webkitfullscreenchange",
-        "webkitfullscreenerror"
-      ],
-      // old WebKit (Safari 5.1)
-      [
-        "webkitRequestFullScreen",
-        "webkitCancelFullScreen",
-        "webkitCurrentFullScreenElement",
-        "webkitCancelFullScreen",
-        "webkitfullscreenchange",
-        "webkitfullscreenerror"
-      ],
-      [
-        "mozRequestFullScreen",
-        "mozCancelFullScreen",
-        "mozFullScreenElement",
-        "mozFullScreenEnabled",
-        "mozfullscreenchange",
-        "mozfullscreenerror"
-      ],
-      ["msRequestFullscreen", "msExitFullscreen", "msFullscreenElement", "msFullscreenEnabled", "MSFullscreenChange", "MSFullscreenError"]
-    ];
-
-    var ret = {};
-
-    for (var i = 0; i < fnMap.length; i++) {
-      var val = fnMap[i];
-
-      if (val && val[1] in document) {
-        for (var j = 0; j < val.length; j++) {
-          ret[fnMap[0][j]] = val[j];
-        }
-
-        return ret;
-      }
-    }
-
-    return false;
-  })();
-
-  if (fn) {
-    var FullScreen = {
-      request: function (elem) {
-        elem = elem || document.documentElement;
-
-        elem[fn.requestFullscreen](elem.ALLOW_KEYBOARD_INPUT);
-      },
-      exit: function () {
-        document[fn.exitFullscreen]();
-      },
-      toggle: function (elem) {
-        elem = elem || document.documentElement;
-
-        if (this.isFullscreen()) {
-          this.exit();
-        } else {
-          this.request(elem);
-        }
-      },
-      isFullscreen: function () {
-        return Boolean(document[fn.fullscreenElement]);
-      },
-      enabled: function () {
-        return Boolean(document[fn.fullscreenEnabled]);
-      }
-    };
-
-    $.extend(true, $.fancybox.defaults, {
-      btnTpl: {
-        fullScreen: '<button data-fancybox-fullscreen class="fancybox-button fancybox-button--fsenter" title="{{FULL_SCREEN}}">' +
-          '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M7 14H5v5h5v-2H7v-3zm-2-4h2V7h3V5H5v5zm12 7h-3v2h5v-5h-2v3zM14 5v2h3v3h2V5h-5z"/></svg>' +
-          '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M5 16h3v3h2v-5H5zm3-8H5v2h5V5H8zm6 11h2v-3h3v-2h-5zm2-11V5h-2v5h5V8z"/></svg>' +
-          "</button>"
-      },
-      fullScreen: {
-        autoStart: false
-      }
-    });
-
-    $(document).on(fn.fullscreenchange, function () {
-      var isFullscreen = FullScreen.isFullscreen(),
-        instance = $.fancybox.getInstance();
-
-      if (instance) {
-        // If image is zooming, then force to stop and reposition properly
-        if (instance.current && instance.current.type === "image" && instance.isAnimating) {
-          instance.isAnimating = false;
-
-          instance.update(true, true, 0);
-
-          if (!instance.isComplete) {
-            instance.complete();
-          }
-        }
-
-        instance.trigger("onFullscreenChange", isFullscreen);
-
-        instance.$refs.container.toggleClass("fancybox-is-fullscreen", isFullscreen);
-
-        instance.$refs.toolbar
-          .find("[data-fancybox-fullscreen]")
-          .toggleClass("fancybox-button--fsenter", !isFullscreen)
-          .toggleClass("fancybox-button--fsexit", isFullscreen);
-      }
-    });
-  }
-
-  $(document).on({
-    "onInit.fb": function (e, instance) {
-      var $container;
-
-      if (!fn) {
-        instance.$refs.toolbar.find("[data-fancybox-fullscreen]").remove();
-
-        return;
-      }
-
-      if (instance && instance.group[instance.currIndex].opts.fullScreen) {
-        $container = instance.$refs.container;
-
-        $container.on("click.fb-fullscreen", "[data-fancybox-fullscreen]", function (e) {
-          e.stopPropagation();
-          e.preventDefault();
-
-          FullScreen.toggle();
-        });
-
-        if (instance.opts.fullScreen && instance.opts.fullScreen.autoStart === true) {
-          FullScreen.request();
-        }
-
-        // Expose API
-        instance.FullScreen = FullScreen;
-      } else if (instance) {
-        instance.$refs.toolbar.find("[data-fancybox-fullscreen]").hide();
-      }
-    },
-
-    "afterKeydown.fb": function (e, instance, current, keypress, keycode) {
-      // "F"
-      if (instance && instance.FullScreen && keycode === 70) {
-        keypress.preventDefault();
-
-        instance.FullScreen.toggle();
-      }
-    },
-
-    "beforeClose.fb": function (e, instance) {
-      if (instance && instance.FullScreen && instance.$refs.container.hasClass("fancybox-is-fullscreen")) {
-        FullScreen.exit();
-      }
-    }
-  });
-})(document, jQuery);
-// ==========================================================================
-//
-// Thumbs
-// Displays thumbnails in a grid
-//
-// ==========================================================================
-(function (document, $) {
-  "use strict";
-
-  var CLASS = "fancybox-thumbs",
-    CLASS_ACTIVE = CLASS + "-active";
-
-  // Make sure there are default values
-  $.fancybox.defaults = $.extend(
-    true, {
-      btnTpl: {
-        thumbs: '<button data-fancybox-thumbs class="fancybox-button fancybox-button--thumbs" title="{{THUMBS}}">' +
-          '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M14.59 14.59h3.76v3.76h-3.76v-3.76zm-4.47 0h3.76v3.76h-3.76v-3.76zm-4.47 0h3.76v3.76H5.65v-3.76zm8.94-4.47h3.76v3.76h-3.76v-3.76zm-4.47 0h3.76v3.76h-3.76v-3.76zm-4.47 0h3.76v3.76H5.65v-3.76zm8.94-4.47h3.76v3.76h-3.76V5.65zm-4.47 0h3.76v3.76h-3.76V5.65zm-4.47 0h3.76v3.76H5.65V5.65z"/></svg>' +
-          "</button>"
-      },
-      thumbs: {
-        autoStart: false, // Display thumbnails on opening
-        hideOnClose: true, // Hide thumbnail grid when closing animation starts
-        parentEl: ".fancybox-container", // Container is injected into this element
-        axis: "y" // Vertical (y) or horizontal (x) scrolling
-      }
-    },
-    $.fancybox.defaults
-  );
-
-  var FancyThumbs = function (instance) {
-    this.init(instance);
-  };
-
-  $.extend(FancyThumbs.prototype, {
-    $button: null,
-    $grid: null,
-    $list: null,
-    isVisible: false,
-    isActive: false,
-
-    init: function (instance) {
-      var self = this,
-        group = instance.group,
-        enabled = 0;
-
-      self.instance = instance;
-      self.opts = group[instance.currIndex].opts.thumbs;
-
-      instance.Thumbs = self;
-
-      self.$button = instance.$refs.toolbar.find("[data-fancybox-thumbs]");
-
-      // Enable thumbs if at least two group items have thumbnails
-      for (var i = 0, len = group.length; i < len; i++) {
-        if (group[i].thumb) {
-          enabled++;
-        }
-
-        if (enabled > 1) {
-          break;
-        }
-      }
-
-      if (enabled > 1 && !!self.opts) {
-        self.$button.removeAttr("style").on("click", function () {
-          self.toggle();
-        });
-
-        self.isActive = true;
-      } else {
-        self.$button.hide();
-      }
-    },
-
-    create: function () {
-      var self = this,
-        instance = self.instance,
-        parentEl = self.opts.parentEl,
-        list = [],
-        src;
-
-      if (!self.$grid) {
-        // Create main element
-        self.$grid = $('<div class="' + CLASS + " " + CLASS + "-" + self.opts.axis + '"></div>').appendTo(
-          instance.$refs.container
-          .find(parentEl)
-          .addBack()
-          .filter(parentEl)
-        );
-
-        // Add "click" event that performs gallery navigation
-        self.$grid.on("click", "a", function () {
-          instance.jumpTo($(this).attr("data-index"));
-        });
-      }
-
-      // Build the list
-      if (!self.$list) {
-        self.$list = $('<div class="' + CLASS + '__list">').appendTo(self.$grid);
-      }
-
-      $.each(instance.group, function (i, item) {
-        src = item.thumb;
-
-        if (!src && item.type === "image") {
-          src = item.src;
-        }
-
-        list.push(
-          '<a href="javascript:;" tabindex="0" data-index="' +
-          i +
-          '"' +
-          (src && src.length ? ' style="background-image:url(' + src + ')"' : 'class="fancybox-thumbs-missing"') +
-          "></a>"
-        );
-      });
-
-      self.$list[0].innerHTML = list.join("");
-
-      if (self.opts.axis === "x") {
-        // Set fixed width for list element to enable horizontal scrolling
-        self.$list.width(
-          parseInt(self.$grid.css("padding-right"), 10) +
-          instance.group.length *
-          self.$list
-          .children()
-          .eq(0)
-          .outerWidth(true)
-        );
-      }
-    },
-
-    focus: function (duration) {
-      var self = this,
-        $list = self.$list,
-        $grid = self.$grid,
-        thumb,
-        thumbPos;
-
-      if (!self.instance.current) {
-        return;
-      }
-
-      thumb = $list
-        .children()
-        .removeClass(CLASS_ACTIVE)
-        .filter('[data-index="' + self.instance.current.index + '"]')
-        .addClass(CLASS_ACTIVE);
-
-      thumbPos = thumb.position();
-
-      // Check if need to scroll to make current thumb visible
-      if (self.opts.axis === "y" && (thumbPos.top < 0 || thumbPos.top > $list.height() - thumb.outerHeight())) {
-        $list.stop().animate({
-            scrollTop: $list.scrollTop() + thumbPos.top
-          },
-          duration
-        );
-      } else if (
-        self.opts.axis === "x" &&
-        (thumbPos.left < $grid.scrollLeft() || thumbPos.left > $grid.scrollLeft() + ($grid.width() - thumb.outerWidth()))
-      ) {
-        $list
-          .parent()
-          .stop()
-          .animate({
-              scrollLeft: thumbPos.left
-            },
-            duration
-          );
-      }
-    },
-
-    update: function () {
-      var that = this;
-      that.instance.$refs.container.toggleClass("fancybox-show-thumbs", this.isVisible);
-
-      if (that.isVisible) {
-        if (!that.$grid) {
-          that.create();
-        }
-
-        that.instance.trigger("onThumbsShow");
-
-        that.focus(0);
-      } else if (that.$grid) {
-        that.instance.trigger("onThumbsHide");
-      }
-
-      // Update content position
-      that.instance.update();
-    },
-
-    hide: function () {
-      this.isVisible = false;
-      this.update();
-    },
-
-    show: function () {
-      this.isVisible = true;
-      this.update();
-    },
-
-    toggle: function () {
-      this.isVisible = !this.isVisible;
-      this.update();
-    }
-  });
-
-  $(document).on({
-    "onInit.fb": function (e, instance) {
-      var Thumbs;
-
-      if (instance && !instance.Thumbs) {
-        Thumbs = new FancyThumbs(instance);
-
-        if (Thumbs.isActive && Thumbs.opts.autoStart === true) {
-          Thumbs.show();
-        }
-      }
-    },
-
-    "beforeShow.fb": function (e, instance, item, firstRun) {
-      var Thumbs = instance && instance.Thumbs;
-
-      if (Thumbs && Thumbs.isVisible) {
-        Thumbs.focus(firstRun ? 0 : 250);
-      }
-    },
-
-    "afterKeydown.fb": function (e, instance, current, keypress, keycode) {
-      var Thumbs = instance && instance.Thumbs;
-
-      // "G"
-      if (Thumbs && Thumbs.isActive && keycode === 71) {
-        keypress.preventDefault();
-
-        Thumbs.toggle();
-      }
-    },
-
-    "beforeClose.fb": function (e, instance) {
-      var Thumbs = instance && instance.Thumbs;
-
-      if (Thumbs && Thumbs.isVisible && Thumbs.opts.hideOnClose !== false) {
-        Thumbs.$grid.hide();
-      }
-    }
-  });
-})(document, jQuery);
-//// ==========================================================================
-//
-// Share
-// Displays simple form for sharing current url
-//
-// ==========================================================================
-(function (document, $) {
-  "use strict";
-
-  $.extend(true, $.fancybox.defaults, {
-    btnTpl: {
-      share: '<button data-fancybox-share class="fancybox-button fancybox-button--share" title="{{SHARE}}">' +
-        '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M2.55 19c1.4-8.4 9.1-9.8 11.9-9.8V5l7 7-7 6.3v-3.5c-2.8 0-10.5 2.1-11.9 4.2z"/></svg>' +
-        "</button>"
-    },
-    share: {
-      url: function (instance, item) {
-        return (
-          (!instance.currentHash && !(item.type === "inline" || item.type === "html") ? item.origSrc || item.src : false) || window.location
-        );
-      },
-      tpl: '<div class="fancybox-share">' +
-        "<h1>{{SHARE}}</h1>" +
-        "<p>" +
-        '<a class="fancybox-share__button fancybox-share__button--fb" href="https://www.facebook.com/sharer/sharer.php?u={{url}}">' +
-        '<svg viewBox="0 0 512 512" xmlns="http://www.w3.org/2000/svg"><path d="m287 456v-299c0-21 6-35 35-35h38v-63c-7-1-29-3-55-3-54 0-91 33-91 94v306m143-254h-205v72h196" /></svg>' +
-        "<span>Facebook</span>" +
-        "</a>" +
-        '<a class="fancybox-share__button fancybox-share__button--tw" href="https://twitter.com/intent/tweet?url={{url}}&text={{descr}}">' +
-        '<svg viewBox="0 0 512 512" xmlns="http://www.w3.org/2000/svg"><path d="m456 133c-14 7-31 11-47 13 17-10 30-27 37-46-15 10-34 16-52 20-61-62-157-7-141 75-68-3-129-35-169-85-22 37-11 86 26 109-13 0-26-4-37-9 0 39 28 72 65 80-12 3-25 4-37 2 10 33 41 57 77 57-42 30-77 38-122 34 170 111 378-32 359-208 16-11 30-25 41-42z" /></svg>' +
-        "<span>Twitter</span>" +
-        "</a>" +
-        '<a class="fancybox-share__button fancybox-share__button--pt" href="https://www.pinterest.com/pin/create/button/?url={{url}}&description={{descr}}&media={{media}}">' +
-        '<svg viewBox="0 0 512 512" xmlns="http://www.w3.org/2000/svg"><path d="m265 56c-109 0-164 78-164 144 0 39 15 74 47 87 5 2 10 0 12-5l4-19c2-6 1-8-3-13-9-11-15-25-15-45 0-58 43-110 113-110 62 0 96 38 96 88 0 67-30 122-73 122-24 0-42-19-36-44 6-29 20-60 20-81 0-19-10-35-31-35-25 0-44 26-44 60 0 21 7 36 7 36l-30 125c-8 37-1 83 0 87 0 3 4 4 5 2 2-3 32-39 42-75l16-64c8 16 31 29 56 29 74 0 124-67 124-157 0-69-58-132-146-132z" fill="#fff"/></svg>' +
-        "<span>Pinterest</span>" +
-        "</a>" +
-        "</p>" +
-        '<p><input class="fancybox-share__input" type="text" value="{{url_raw}}" onclick="select()" /></p>' +
-        "</div>"
-    }
-  });
-
-  function escapeHtml(string) {
-    var entityMap = {
-      "&": "&amp;",
-      "<": "&lt;",
-      ">": "&gt;",
-      '"': "&quot;",
-      "'": "&#39;",
-      "/": "&#x2F;",
-      "`": "&#x60;",
-      "=": "&#x3D;"
-    };
-
-    return String(string).replace(/[&<>"'`=\/]/g, function (s) {
-      return entityMap[s];
-    });
-  }
-
-  $(document).on("click", "[data-fancybox-share]", function () {
-    var instance = $.fancybox.getInstance(),
-      current = instance.current || null,
-      url,
-      tpl;
-
-    if (!current) {
-      return;
-    }
-
-    if ($.type(current.opts.share.url) === "function") {
-      url = current.opts.share.url.apply(current, [instance, current]);
-    }
-
-    tpl = current.opts.share.tpl
-      .replace(/\{\{media\}\}/g, current.type === "image" ? encodeURIComponent(current.src) : "")
-      .replace(/\{\{url\}\}/g, encodeURIComponent(url))
-      .replace(/\{\{url_raw\}\}/g, escapeHtml(url))
-      .replace(/\{\{descr\}\}/g, instance.$caption ? encodeURIComponent(instance.$caption.text()) : "");
-
-    $.fancybox.open({
-      src: instance.translate(instance, tpl),
-      type: "html",
-      opts: {
-        touch: false,
-        animationEffect: false,
-        afterLoad: function (shareInstance, shareCurrent) {
-          // Close self if parent instance is closing
-          instance.$refs.container.one("beforeClose.fb", function () {
-            shareInstance.close(null, 0);
-          });
-
-          // Opening links in a popup window
-          shareCurrent.$content.find(".fancybox-share__button").click(function () {
-            window.open(this.href, "Share", "width=550, height=450");
-            return false;
-          });
-        },
-        mobile: {
-          autoFocus: false
-        }
-      }
-    });
-  });
-})(document, jQuery);
-// ==========================================================================
-//
-// Hash
-// Enables linking to each modal
-//
-// ==========================================================================
-(function (window, document, $) {
-  "use strict";
-
-  // Simple $.escapeSelector polyfill (for jQuery prior v3)
-  if (!$.escapeSelector) {
-    $.escapeSelector = function (sel) {
-      var rcssescape = /([\0-\x1f\x7f]|^-?\d)|^-$|[^\x80-\uFFFF\w-]/g;
-      var fcssescape = function (ch, asCodePoint) {
-        if (asCodePoint) {
-          // U+0000 NULL becomes U+FFFD REPLACEMENT CHARACTER
-          if (ch === "\0") {
-            return "\uFFFD";
-          }
-
-          // Control characters and (dependent upon position) numbers get escaped as code points
-          return ch.slice(0, -1) + "\\" + ch.charCodeAt(ch.length - 1).toString(16) + " ";
-        }
-
-        // Other potentially-special ASCII characters get backslash-escaped
-        return "\\" + ch;
-      };
-
-      return (sel + "").replace(rcssescape, fcssescape);
-    };
-  }
-
-  // Get info about gallery name and current index from url
-  function parseUrl() {
-    var hash = window.location.hash.substr(1),
-      rez = hash.split("-"),
-      index = rez.length > 1 && /^\+?\d+$/.test(rez[rez.length - 1]) ? parseInt(rez.pop(-1), 10) || 1 : 1,
-      gallery = rez.join("-");
-
-    return {
-      hash: hash,
-      /* Index is starting from 1 */
-      index: index < 1 ? 1 : index,
-      gallery: gallery
-    };
-  }
-
-  // Trigger click evnt on links to open new fancyBox instance
-  function triggerFromUrl(url) {
-    if (url.gallery !== "") {
-      // If we can find element matching 'data-fancybox' atribute,
-      // then triggering click event should start fancyBox
-      $("[data-fancybox='" + $.escapeSelector(url.gallery) + "']")
-        .eq(url.index - 1)
-        .focus()
-        .trigger("click.fb-start");
-    }
-  }
-
-  // Get gallery name from current instance
-  function getGalleryID(instance) {
-    var opts, ret;
-
-    if (!instance) {
-      return false;
-    }
-
-    opts = instance.current ? instance.current.opts : instance.opts;
-    ret = opts.hash || (opts.$orig ? opts.$orig.data("fancybox") || opts.$orig.data("fancybox-trigger") : "");
-
-    return ret === "" ? false : ret;
-  }
-
-  // Start when DOM becomes ready
-  $(function () {
-    // Check if user has disabled this module
-    if ($.fancybox.defaults.hash === false) {
-      return;
-    }
-
-    // Update hash when opening/closing fancyBox
-    $(document).on({
-      "onInit.fb": function (e, instance) {
-        var url, gallery;
-
-        if (instance.group[instance.currIndex].opts.hash === false) {
-          return;
-        }
-
-        url = parseUrl();
-        gallery = getGalleryID(instance);
-
-        // Make sure gallery start index matches index from hash
-        if (gallery && url.gallery && gallery == url.gallery) {
-          instance.currIndex = url.index - 1;
-        }
-      },
-
-      "beforeShow.fb": function (e, instance, current, firstRun) {
-        var gallery;
-
-        if (!current || current.opts.hash === false) {
-          return;
-        }
-
-        // Check if need to update window hash
-        gallery = getGalleryID(instance);
-
-        if (!gallery) {
-          return;
-        }
-
-        // Variable containing last hash value set by fancyBox
-        // It will be used to determine if fancyBox needs to close after hash change is detected
-        instance.currentHash = gallery + (instance.group.length > 1 ? "-" + (current.index + 1) : "");
-
-        // If current hash is the same (this instance most likely is opened by hashchange), then do nothing
-        if (window.location.hash === "#" + instance.currentHash) {
-          return;
-        }
-
-        if (firstRun && !instance.origHash) {
-          instance.origHash = window.location.hash;
-        }
-
-        if (instance.hashTimer) {
-          clearTimeout(instance.hashTimer);
-        }
-
-        // Update hash
-        instance.hashTimer = setTimeout(function () {
-          if ("replaceState" in window.history) {
-            window.history[firstRun ? "pushState" : "replaceState"]({},
-              document.title,
-              window.location.pathname + window.location.search + "#" + instance.currentHash
-            );
-
-            if (firstRun) {
-              instance.hasCreatedHistory = true;
-            }
-          } else {
-            window.location.hash = instance.currentHash;
-          }
-
-          instance.hashTimer = null;
-        }, 300);
-      },
-
-      "beforeClose.fb": function (e, instance, current) {
-        if (!current || current.opts.hash === false) {
-          return;
-        }
-
-        clearTimeout(instance.hashTimer);
-
-        // Goto previous history entry
-        if (instance.currentHash && instance.hasCreatedHistory) {
-          window.history.back();
-        } else if (instance.currentHash) {
-          if ("replaceState" in window.history) {
-            window.history.replaceState({}, document.title, window.location.pathname + window.location.search + (instance.origHash || ""));
-          } else {
-            window.location.hash = instance.origHash;
-          }
-        }
-
-        instance.currentHash = null;
-      }
-    });
-
-    // Check if need to start/close after url has changed
-    $(window).on("hashchange.fb", function () {
-      var url = parseUrl(),
-        fb = null;
-
-      // Find last fancyBox instance that has "hash"
-      $.each(
-        $(".fancybox-container")
-        .get()
-        .reverse(),
-        function (index, value) {
-          var tmp = $(value).data("FancyBox");
-
-          if (tmp && tmp.currentHash) {
-            fb = tmp;
-            return false;
-          }
-        }
-      );
-
-      if (fb) {
-        // Now, compare hash values
-        if (fb.currentHash !== url.gallery + "-" + url.index && !(url.index === 1 && fb.currentHash == url.gallery)) {
-          fb.currentHash = null;
-
-          fb.close();
-        }
-      } else if (url.gallery !== "") {
-        triggerFromUrl(url);
-      }
-    });
-
-    // Check current hash and trigger click event on matching element to start fancyBox, if needed
-    setTimeout(function () {
-      if (!$.fancybox.getInstance()) {
-        triggerFromUrl(parseUrl());
-      }
-    }, 50);
-  });
-})(window, document, jQuery);
-// ==========================================================================
-//
-// Wheel
-// Basic mouse weheel support for gallery navigation
-//
-// ==========================================================================
-(function (document, $) {
-  "use strict";
-
-  var prevTime = new Date().getTime();
-
-  $(document).on({
-    "onInit.fb": function (e, instance, current) {
-      instance.$refs.stage.on("mousewheel DOMMouseScroll wheel MozMousePixelScroll", function (e) {
-        var current = instance.current,
-          currTime = new Date().getTime();
-
-        if (instance.group.length < 2 || current.opts.wheel === false || (current.opts.wheel === "auto" && current.type !== "image")) {
-          return;
-        }
-
-        e.preventDefault();
-        e.stopPropagation();
-
-        if (current.$slide.hasClass("fancybox-animated")) {
-          return;
-        }
-
-        e = e.originalEvent || e;
-
-        if (currTime - prevTime < 250) {
-          return;
-        }
-
-        prevTime = currTime;
-
-        instance[(-e.deltaY || -e.deltaX || e.wheelDelta || -e.detail) < 0 ? "next" : "previous"]();
-      });
-    }
-  });
-})(document, jQuery);
\ No newline at end of file
diff --git a/fancybox/asset/fancybox/jquery.fancybox.min.css b/fancybox/asset/fancybox/jquery.fancybox.min.css
deleted file mode 100644
index 7cc60b29..00000000
--- a/fancybox/asset/fancybox/jquery.fancybox.min.css
+++ /dev/null
@@ -1 +0,0 @@
-body.compensate-for-scrollbar{overflow:hidden}.fancybox-active{height:auto}.fancybox-is-hidden{left:-9999px;margin:0;position:absolute!important;top:-9999px;visibility:hidden}.fancybox-container{-webkit-backface-visibility:hidden;height:100%;left:0;outline:none;position:fixed;-webkit-tap-highlight-color:transparent;top:0;-ms-touch-action:manipulation;touch-action:manipulation;transform:translateZ(0);width:100%;z-index:99992}.fancybox-container *{box-sizing:border-box}.fancybox-bg,.fancybox-inner,.fancybox-outer,.fancybox-stage{bottom:0;left:0;position:absolute;right:0;top:0}.fancybox-outer{-webkit-overflow-scrolling:touch;overflow-y:auto}.fancybox-bg{background:#1e1e1e;opacity:0;transition-duration:inherit;transition-property:opacity;transition-timing-function:cubic-bezier(.47,0,.74,.71)}.fancybox-is-open .fancybox-bg{opacity:.9;transition-timing-function:cubic-bezier(.22,.61,.36,1)}.fancybox-caption,.fancybox-infobar,.fancybox-navigation .fancybox-button,.fancybox-toolbar{direction:ltr;opacity:0;position:absolute;transition:opacity .25s ease,visibility 0s ease .25s;visibility:hidden;z-index:99997}.fancybox-show-caption .fancybox-caption,.fancybox-show-infobar .fancybox-infobar,.fancybox-show-nav .fancybox-navigation .fancybox-button,.fancybox-show-toolbar .fancybox-toolbar{opacity:1;transition:opacity .25s ease 0s,visibility 0s ease 0s;visibility:visible}.fancybox-infobar{color:#ccc;font-size:13px;-webkit-font-smoothing:subpixel-antialiased;height:44px;left:0;line-height:44px;min-width:44px;mix-blend-mode:difference;padding:0 10px;pointer-events:none;top:0;-webkit-touch-callout:none;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.fancybox-toolbar{right:0;top:0}.fancybox-stage{direction:ltr;overflow:visible;transform:translateZ(0);z-index:99994}.fancybox-is-open .fancybox-stage{overflow:hidden}.fancybox-slide{-webkit-backface-visibility:hidden;display:none;height:100%;left:0;outline:none;overflow:auto;-webkit-overflow-scrolling:touch;padding:44px;position:absolute;text-align:center;top:0;transition-property:transform,opacity;white-space:normal;width:100%;z-index:99994}.fancybox-slide:before{content:"";display:inline-block;font-size:0;height:100%;vertical-align:middle;width:0}.fancybox-is-sliding .fancybox-slide,.fancybox-slide--current,.fancybox-slide--next,.fancybox-slide--previous{display:block}.fancybox-slide--image{overflow:hidden;padding:44px 0}.fancybox-slide--image:before{display:none}.fancybox-slide--html{padding:6px}.fancybox-content{background:#fff;display:inline-block;margin:0;max-width:100%;overflow:auto;-webkit-overflow-scrolling:touch;padding:44px;position:relative;text-align:left;vertical-align:middle}.fancybox-slide--image .fancybox-content{animation-timing-function:cubic-bezier(.5,0,.14,1);-webkit-backface-visibility:hidden;background:transparent;background-repeat:no-repeat;background-size:100% 100%;left:0;max-width:none;overflow:visible;padding:0;position:absolute;top:0;transform-origin:top left;transition-property:transform,opacity;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;z-index:99995}.fancybox-can-zoomOut .fancybox-content{cursor:zoom-out}.fancybox-can-zoomIn .fancybox-content{cursor:zoom-in}.fancybox-can-pan .fancybox-content,.fancybox-can-swipe .fancybox-content{cursor:grab}.fancybox-is-grabbing .fancybox-content{cursor:grabbing}.fancybox-container [data-selectable=true]{cursor:text}.fancybox-image,.fancybox-spaceball{background:transparent;border:0;height:100%;left:0;margin:0;max-height:none;max-width:none;padding:0;position:absolute;top:0;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;width:100%}.fancybox-spaceball{z-index:1}.fancybox-slide--iframe .fancybox-content,.fancybox-slide--map .fancybox-content,.fancybox-slide--pdf .fancybox-content,.fancybox-slide--video .fancybox-content{height:100%;overflow:visible;padding:0;width:100%}.fancybox-slide--video .fancybox-content{background:#000}.fancybox-slide--map .fancybox-content{background:#e5e3df}.fancybox-slide--iframe .fancybox-content{background:#fff}.fancybox-iframe,.fancybox-video{background:transparent;border:0;display:block;height:100%;margin:0;overflow:hidden;padding:0;width:100%}.fancybox-iframe{left:0;position:absolute;top:0}.fancybox-error{background:#fff;cursor:default;max-width:400px;padding:40px;width:100%}.fancybox-error p{color:#444;font-size:16px;line-height:20px;margin:0;padding:0}.fancybox-button{background:rgba(30,30,30,.6);border:0;border-radius:0;box-shadow:none;cursor:pointer;display:inline-block;height:44px;margin:0;padding:10px;position:relative;transition:color .2s;vertical-align:top;visibility:inherit;width:44px}.fancybox-button,.fancybox-button:link,.fancybox-button:visited{color:#ccc}.fancybox-button:hover{color:#fff}.fancybox-button:focus{outline:none}.fancybox-button.fancybox-focus{outline:1px dotted}.fancybox-button[disabled],.fancybox-button[disabled]:hover{color:#888;cursor:default;outline:none}.fancybox-button div{height:100%}.fancybox-button svg{display:block;height:100%;overflow:visible;position:relative;width:100%}.fancybox-button svg path{fill:currentColor;stroke-width:0}.fancybox-button--fsenter svg:nth-child(2),.fancybox-button--fsexit svg:first-child,.fancybox-button--pause svg:first-child,.fancybox-button--play svg:nth-child(2){display:none}.fancybox-progress{background:#ff5268;height:2px;left:0;position:absolute;right:0;top:0;transform:scaleX(0);transform-origin:0;transition-property:transform;transition-timing-function:linear;z-index:99998}.fancybox-close-small{background:transparent;border:0;border-radius:0;color:#ccc;cursor:pointer;opacity:.8;padding:8px;position:absolute;right:-12px;top:-44px;z-index:401}.fancybox-close-small:hover{color:#fff;opacity:1}.fancybox-slide--html .fancybox-close-small{color:currentColor;padding:10px;right:0;top:0}.fancybox-slide--image.fancybox-is-scaling .fancybox-content{overflow:hidden}.fancybox-is-scaling .fancybox-close-small,.fancybox-is-zoomable.fancybox-can-pan .fancybox-close-small{display:none}.fancybox-navigation .fancybox-button{background-clip:content-box;height:100px;opacity:0;position:absolute;top:calc(50% - 50px);width:70px}.fancybox-navigation .fancybox-button div{padding:7px}.fancybox-navigation .fancybox-button--arrow_left{left:0;left:env(safe-area-inset-left);padding:31px 26px 31px 6px}.fancybox-navigation .fancybox-button--arrow_right{padding:31px 6px 31px 26px;right:0;right:env(safe-area-inset-right)}.fancybox-caption{background:linear-gradient(0deg,rgba(0,0,0,.85) 0,rgba(0,0,0,.3) 50%,rgba(0,0,0,.15) 65%,rgba(0,0,0,.075) 75.5%,rgba(0,0,0,.037) 82.85%,rgba(0,0,0,.019) 88%,transparent);bottom:0;color:#eee;font-size:14px;font-weight:400;left:0;line-height:1.5;padding:75px 44px 25px;pointer-events:none;right:0;text-align:center;z-index:99996}@supports (padding:max(0px)){.fancybox-caption{padding:75px max(44px,env(safe-area-inset-right)) max(25px,env(safe-area-inset-bottom)) max(44px,env(safe-area-inset-left))}}.fancybox-caption--separate{margin-top:-50px}.fancybox-caption__body{max-height:50vh;overflow:auto;pointer-events:all}.fancybox-caption a,.fancybox-caption a:link,.fancybox-caption a:visited{color:#ccc;text-decoration:none}.fancybox-caption a:hover{color:#fff;text-decoration:underline}.fancybox-loading{animation:a 1s linear infinite;background:transparent;border:4px solid #888;border-bottom-color:#fff;border-radius:50%;height:50px;left:50%;margin:-25px 0 0 -25px;opacity:.7;padding:0;position:absolute;top:50%;width:50px;z-index:99999}@keyframes a{to{transform:rotate(1turn)}}.fancybox-animated{transition-timing-function:cubic-bezier(0,0,.25,1)}.fancybox-fx-slide.fancybox-slide--previous{opacity:0;transform:translate3d(-100%,0,0)}.fancybox-fx-slide.fancybox-slide--next{opacity:0;transform:translate3d(100%,0,0)}.fancybox-fx-slide.fancybox-slide--current{opacity:1;transform:translateZ(0)}.fancybox-fx-fade.fancybox-slide--next,.fancybox-fx-fade.fancybox-slide--previous{opacity:0;transition-timing-function:cubic-bezier(.19,1,.22,1)}.fancybox-fx-fade.fancybox-slide--current{opacity:1}.fancybox-fx-zoom-in-out.fancybox-slide--previous{opacity:0;transform:scale3d(1.5,1.5,1.5)}.fancybox-fx-zoom-in-out.fancybox-slide--next{opacity:0;transform:scale3d(.5,.5,.5)}.fancybox-fx-zoom-in-out.fancybox-slide--current{opacity:1;transform:scaleX(1)}.fancybox-fx-rotate.fancybox-slide--previous{opacity:0;transform:rotate(-1turn)}.fancybox-fx-rotate.fancybox-slide--next{opacity:0;transform:rotate(1turn)}.fancybox-fx-rotate.fancybox-slide--current{opacity:1;transform:rotate(0deg)}.fancybox-fx-circular.fancybox-slide--previous{opacity:0;transform:scale3d(0,0,0) translate3d(-100%,0,0)}.fancybox-fx-circular.fancybox-slide--next{opacity:0;transform:scale3d(0,0,0) translate3d(100%,0,0)}.fancybox-fx-circular.fancybox-slide--current{opacity:1;transform:scaleX(1) translateZ(0)}.fancybox-fx-tube.fancybox-slide--previous{transform:translate3d(-100%,0,0) scale(.1) skew(-10deg)}.fancybox-fx-tube.fancybox-slide--next{transform:translate3d(100%,0,0) scale(.1) skew(10deg)}.fancybox-fx-tube.fancybox-slide--current{transform:translateZ(0) scale(1)}@media (max-height:576px){.fancybox-slide{padding-left:6px;padding-right:6px}.fancybox-slide--image{padding:6px 0}.fancybox-close-small{right:-6px}.fancybox-slide--image .fancybox-close-small{background:#4e4e4e;color:#f2f4f6;height:36px;opacity:1;padding:6px;right:0;top:0;width:36px}.fancybox-caption{padding-left:12px;padding-right:12px}@supports (padding:max(0px)){.fancybox-caption{padding-left:max(12px,env(safe-area-inset-left));padding-right:max(12px,env(safe-area-inset-right))}}}.fancybox-share{background:#f4f4f4;border-radius:3px;max-width:90%;padding:30px;text-align:center}.fancybox-share h1{color:#222;font-size:35px;font-weight:700;margin:0 0 20px}.fancybox-share p{margin:0;padding:0}.fancybox-share__button{border:0;border-radius:3px;display:inline-block;font-size:14px;font-weight:700;line-height:40px;margin:0 5px 10px;min-width:130px;padding:0 15px;text-decoration:none;transition:all .2s;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;white-space:nowrap}.fancybox-share__button:link,.fancybox-share__button:visited{color:#fff}.fancybox-share__button:hover{text-decoration:none}.fancybox-share__button--fb{background:#3b5998}.fancybox-share__button--fb:hover{background:#344e86}.fancybox-share__button--pt{background:#bd081d}.fancybox-share__button--pt:hover{background:#aa0719}.fancybox-share__button--tw{background:#1da1f2}.fancybox-share__button--tw:hover{background:#0d95e8}.fancybox-share__button svg{height:25px;margin-right:7px;position:relative;top:-1px;vertical-align:middle;width:25px}.fancybox-share__button svg path{fill:#fff}.fancybox-share__input{background:transparent;border:0;border-bottom:1px solid #d7d7d7;border-radius:0;color:#5d5b5b;font-size:14px;margin:10px 0 0;outline:none;padding:10px 15px;width:100%}.fancybox-thumbs{background:#ddd;bottom:0;display:none;margin:0;-webkit-overflow-scrolling:touch;-ms-overflow-style:-ms-autohiding-scrollbar;padding:2px 2px 4px;position:absolute;right:0;-webkit-tap-highlight-color:rgba(0,0,0,0);top:0;width:212px;z-index:99995}.fancybox-thumbs-x{overflow-x:auto;overflow-y:hidden}.fancybox-show-thumbs .fancybox-thumbs{display:block}.fancybox-show-thumbs .fancybox-inner{right:212px}.fancybox-thumbs__list{font-size:0;height:100%;list-style:none;margin:0;overflow-x:hidden;overflow-y:auto;padding:0;position:absolute;position:relative;white-space:nowrap;width:100%}.fancybox-thumbs-x .fancybox-thumbs__list{overflow:hidden}.fancybox-thumbs-y .fancybox-thumbs__list::-webkit-scrollbar{width:7px}.fancybox-thumbs-y .fancybox-thumbs__list::-webkit-scrollbar-track{background:#fff;border-radius:10px;box-shadow:inset 0 0 6px rgba(0,0,0,.3)}.fancybox-thumbs-y .fancybox-thumbs__list::-webkit-scrollbar-thumb{background:#2a2a2a;border-radius:10px}.fancybox-thumbs__list a{-webkit-backface-visibility:hidden;backface-visibility:hidden;background-color:rgba(0,0,0,.1);background-position:50%;background-repeat:no-repeat;background-size:cover;cursor:pointer;float:left;height:75px;margin:2px;max-height:calc(100% - 8px);max-width:calc(50% - 4px);outline:none;overflow:hidden;padding:0;position:relative;-webkit-tap-highlight-color:transparent;width:100px}.fancybox-thumbs__list a:before{border:6px solid #ff5268;bottom:0;content:"";left:0;opacity:0;position:absolute;right:0;top:0;transition:all .2s cubic-bezier(.25,.46,.45,.94);z-index:99991}.fancybox-thumbs__list a:focus:before{opacity:.5}.fancybox-thumbs__list a.fancybox-thumbs-active:before{opacity:1}@media (max-width:576px){.fancybox-thumbs{width:110px}.fancybox-show-thumbs .fancybox-inner{right:110px}.fancybox-thumbs__list a{max-width:calc(100% - 10px)}}
\ No newline at end of file
diff --git a/fancybox/asset/fancybox/jquery.fancybox.min.js b/fancybox/asset/fancybox/jquery.fancybox.min.js
deleted file mode 100644
index d5d10f6b..00000000
--- a/fancybox/asset/fancybox/jquery.fancybox.min.js
+++ /dev/null
@@ -1,13 +0,0 @@
-// ==================================================
-// fancyBox v3.5.7
-//
-// Licensed GPLv3 for open source use
-// or fancyBox Commercial License for commercial use
-//
-// http://fancyapps.com/fancybox/
-// Copyright 2019 fancyApps
-//
-// ==================================================
-!function(t,e,n,o){"use strict";function i(t,e){var o,i,a,s=[],r=0;t&&t.isDefaultPrevented()||(t.preventDefault(),e=e||{},t&&t.data&&(e=h(t.data.options,e)),o=e.$target||n(t.currentTarget).trigger("blur"),(a=n.fancybox.getInstance())&&a.$trigger&&a.$trigger.is(o)||(e.selector?s=n(e.selector):(i=o.attr("data-fancybox")||"",i?(s=t.data?t.data.items:[],s=s.length?s.filter('[data-fancybox="'+i+'"]'):n('[data-fancybox="'+i+'"]')):s=[o]),r=n(s).index(o),r<0&&(r=0),a=n.fancybox.open(s,e,r),a.$trigger=o))}if(t.console=t.console||{info:function(t){}},n){if(n.fn.fancybox)return void console.info("fancyBox already initialized");var a={closeExisting:!1,loop:!1,gutter:50,keyboard:!0,preventCaptionOverlap:!0,arrows:!0,infobar:!0,smallBtn:"auto",toolbar:"auto",buttons:["zoom","slideShow","thumbs","close"],idleTime:3,protect:!1,modal:!1,image:{preload:!1},ajax:{settings:{data:{fancybox:!0}}},iframe:{tpl:'<iframe id="fancybox-frame{rnd}" name="fancybox-frame{rnd}" class="fancybox-iframe" allowfullscreen="allowfullscreen" allow="autoplay; fullscreen" src=""></iframe>',preload:!0,css:{},attr:{scrolling:"auto"}},video:{tpl:'<video class="fancybox-video" controls controlsList="nodownload" poster="{{poster}}"><source src="{{src}}" type="{{format}}" />Sorry, your browser doesn\'t support embedded videos, <a href="{{src}}">download</a> and watch with your favorite video player!</video>',format:"",autoStart:!0},defaultType:"image",animationEffect:"zoom",animationDuration:366,zoomOpacity:"auto",transitionEffect:"fade",transitionDuration:366,slideClass:"",baseClass:"",baseTpl:'<div class="fancybox-container" role="dialog" tabindex="-1"><div class="fancybox-bg"></div><div class="fancybox-inner"><div class="fancybox-infobar"><span data-fancybox-index></span>&nbsp;/&nbsp;<span data-fancybox-count></span></div><div class="fancybox-toolbar">{{buttons}}</div><div class="fancybox-navigation">{{arrows}}</div><div class="fancybox-stage"></div><div class="fancybox-caption"><div class="fancybox-caption__body"></div></div></div></div>',spinnerTpl:'<div class="fancybox-loading"></div>',errorTpl:'<div class="fancybox-error"><p>{{ERROR}}</p></div>',btnTpl:{download:'<a download data-fancybox-download class="fancybox-button fancybox-button--download" title="{{DOWNLOAD}}" href="javascript:;"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M18.62 17.09V19H5.38v-1.91zm-2.97-6.96L17 11.45l-5 4.87-5-4.87 1.36-1.32 2.68 2.64V5h1.92v7.77z"/></svg></a>',zoom:'<button data-fancybox-zoom class="fancybox-button fancybox-button--zoom" title="{{ZOOM}}"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M18.7 17.3l-3-3a5.9 5.9 0 0 0-.6-7.6 5.9 5.9 0 0 0-8.4 0 5.9 5.9 0 0 0 0 8.4 5.9 5.9 0 0 0 7.7.7l3 3a1 1 0 0 0 1.3 0c.4-.5.4-1 0-1.5zM8.1 13.8a4 4 0 0 1 0-5.7 4 4 0 0 1 5.7 0 4 4 0 0 1 0 5.7 4 4 0 0 1-5.7 0z"/></svg></button>',close:'<button data-fancybox-close class="fancybox-button fancybox-button--close" title="{{CLOSE}}"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M12 10.6L6.6 5.2 5.2 6.6l5.4 5.4-5.4 5.4 1.4 1.4 5.4-5.4 5.4 5.4 1.4-1.4-5.4-5.4 5.4-5.4-1.4-1.4-5.4 5.4z"/></svg></button>',arrowLeft:'<button data-fancybox-prev class="fancybox-button fancybox-button--arrow_left" title="{{PREV}}"><div><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M11.28 15.7l-1.34 1.37L5 12l4.94-5.07 1.34 1.38-2.68 2.72H19v1.94H8.6z"/></svg></div></button>',arrowRight:'<button data-fancybox-next class="fancybox-button fancybox-button--arrow_right" title="{{NEXT}}"><div><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M15.4 12.97l-2.68 2.72 1.34 1.38L19 12l-4.94-5.07-1.34 1.38 2.68 2.72H5v1.94z"/></svg></div></button>',smallBtn:'<button type="button" data-fancybox-close class="fancybox-button fancybox-close-small" title="{{CLOSE}}"><svg xmlns="http://www.w3.org/2000/svg" version="1" viewBox="0 0 24 24"><path d="M13 12l5-5-1-1-5 5-5-5-1 1 5 5-5 5 1 1 5-5 5 5 1-1z"/></svg></button>'},parentEl:"body",hideScrollbar:!0,autoFocus:!0,backFocus:!0,trapFocus:!0,fullScreen:{autoStart:!1},touch:{vertical:!0,momentum:!0},hash:null,media:{},slideShow:{autoStart:!1,speed:3e3},thumbs:{autoStart:!1,hideOnClose:!0,parentEl:".fancybox-container",axis:"y"},wheel:"auto",onInit:n.noop,beforeLoad:n.noop,afterLoad:n.noop,beforeShow:n.noop,afterShow:n.noop,beforeClose:n.noop,afterClose:n.noop,onActivate:n.noop,onDeactivate:n.noop,clickContent:function(t,e){return"image"===t.type&&"zoom"},clickSlide:"close",clickOutside:"close",dblclickContent:!1,dblclickSlide:!1,dblclickOutside:!1,mobile:{preventCaptionOverlap:!1,idleTime:!1,clickContent:function(t,e){return"image"===t.type&&"toggleControls"},clickSlide:function(t,e){return"image"===t.type?"toggleControls":"close"},dblclickContent:function(t,e){return"image"===t.type&&"zoom"},dblclickSlide:function(t,e){return"image"===t.type&&"zoom"}},lang:"en",i18n:{en:{CLOSE:"Close",NEXT:"Next",PREV:"Previous",ERROR:"The requested content cannot be loaded. <br/> Please try again later.",PLAY_START:"Start slideshow",PLAY_STOP:"Pause slideshow",FULL_SCREEN:"Full screen",THUMBS:"Thumbnails",DOWNLOAD:"Download",SHARE:"Share",ZOOM:"Zoom"},de:{CLOSE:"Schlie&szlig;en",NEXT:"Weiter",PREV:"Zur&uuml;ck",ERROR:"Die angeforderten Daten konnten nicht geladen werden. <br/> Bitte versuchen Sie es sp&auml;ter nochmal.",PLAY_START:"Diaschau starten",PLAY_STOP:"Diaschau beenden",FULL_SCREEN:"Vollbild",THUMBS:"Vorschaubilder",DOWNLOAD:"Herunterladen",SHARE:"Teilen",ZOOM:"Vergr&ouml;&szlig;ern"}}},s=n(t),r=n(e),c=0,l=function(t){return t&&t.hasOwnProperty&&t instanceof n},d=function(){return t.requestAnimationFrame||t.webkitRequestAnimationFrame||t.mozRequestAnimationFrame||t.oRequestAnimationFrame||function(e){return t.setTimeout(e,1e3/60)}}(),u=function(){return t.cancelAnimationFrame||t.webkitCancelAnimationFrame||t.mozCancelAnimationFrame||t.oCancelAnimationFrame||function(e){t.clearTimeout(e)}}(),f=function(){var t,n=e.createElement("fakeelement"),o={transition:"transitionend",OTransition:"oTransitionEnd",MozTransition:"transitionend",WebkitTransition:"webkitTransitionEnd"};for(t in o)if(void 0!==n.style[t])return o[t];return"transitionend"}(),p=function(t){return t&&t.length&&t[0].offsetHeight},h=function(t,e){var o=n.extend(!0,{},t,e);return n.each(e,function(t,e){n.isArray(e)&&(o[t]=e)}),o},g=function(t){var o,i;return!(!t||t.ownerDocument!==e)&&(n(".fancybox-container").css("pointer-events","none"),o={x:t.getBoundingClientRect().left+t.offsetWidth/2,y:t.getBoundingClientRect().top+t.offsetHeight/2},i=e.elementFromPoint(o.x,o.y)===t,n(".fancybox-container").css("pointer-events",""),i)},b=function(t,e,o){var i=this;i.opts=h({index:o},n.fancybox.defaults),n.isPlainObject(e)&&(i.opts=h(i.opts,e)),n.fancybox.isMobile&&(i.opts=h(i.opts,i.opts.mobile)),i.id=i.opts.id||++c,i.currIndex=parseInt(i.opts.index,10)||0,i.prevIndex=null,i.prevPos=null,i.currPos=0,i.firstRun=!0,i.group=[],i.slides={},i.addContent(t),i.group.length&&i.init()};n.extend(b.prototype,{init:function(){var o,i,a=this,s=a.group[a.currIndex],r=s.opts;r.closeExisting&&n.fancybox.close(!0),n("body").addClass("fancybox-active"),!n.fancybox.getInstance()&&!1!==r.hideScrollbar&&!n.fancybox.isMobile&&e.body.scrollHeight>t.innerHeight&&(n("head").append('<style id="fancybox-style-noscroll" type="text/css">.compensate-for-scrollbar{margin-right:'+(t.innerWidth-e.documentElement.clientWidth)+"px;}</style>"),n("body").addClass("compensate-for-scrollbar")),i="",n.each(r.buttons,function(t,e){i+=r.btnTpl[e]||""}),o=n(a.translate(a,r.baseTpl.replace("{{buttons}}",i).replace("{{arrows}}",r.btnTpl.arrowLeft+r.btnTpl.arrowRight))).attr("id","fancybox-container-"+a.id).addClass(r.baseClass).data("FancyBox",a).appendTo(r.parentEl),a.$refs={container:o},["bg","inner","infobar","toolbar","stage","caption","navigation"].forEach(function(t){a.$refs[t]=o.find(".fancybox-"+t)}),a.trigger("onInit"),a.activate(),a.jumpTo(a.currIndex)},translate:function(t,e){var n=t.opts.i18n[t.opts.lang]||t.opts.i18n.en;return e.replace(/\{\{(\w+)\}\}/g,function(t,e){return void 0===n[e]?t:n[e]})},addContent:function(t){var e,o=this,i=n.makeArray(t);n.each(i,function(t,e){var i,a,s,r,c,l={},d={};n.isPlainObject(e)?(l=e,d=e.opts||e):"object"===n.type(e)&&n(e).length?(i=n(e),d=i.data()||{},d=n.extend(!0,{},d,d.options),d.$orig=i,l.src=o.opts.src||d.src||i.attr("href"),l.type||l.src||(l.type="inline",l.src=e)):l={type:"html",src:e+""},l.opts=n.extend(!0,{},o.opts,d),n.isArray(d.buttons)&&(l.opts.buttons=d.buttons),n.fancybox.isMobile&&l.opts.mobile&&(l.opts=h(l.opts,l.opts.mobile)),a=l.type||l.opts.type,r=l.src||"",!a&&r&&((s=r.match(/\.(mp4|mov|ogv|webm)((\?|#).*)?$/i))?(a="video",l.opts.video.format||(l.opts.video.format="video/"+("ogv"===s[1]?"ogg":s[1]))):r.match(/(^data:image\/[a-z0-9+\/=]*,)|(\.(jp(e|g|eg)|gif|png|bmp|webp|svg|ico)((\?|#).*)?$)/i)?a="image":r.match(/\.(pdf)((\?|#).*)?$/i)?(a="iframe",l=n.extend(!0,l,{contentType:"pdf",opts:{iframe:{preload:!1}}})):"#"===r.charAt(0)&&(a="inline")),a?l.type=a:o.trigger("objectNeedsType",l),l.contentType||(l.contentType=n.inArray(l.type,["html","inline","ajax"])>-1?"html":l.type),l.index=o.group.length,"auto"==l.opts.smallBtn&&(l.opts.smallBtn=n.inArray(l.type,["html","inline","ajax"])>-1),"auto"===l.opts.toolbar&&(l.opts.toolbar=!l.opts.smallBtn),l.$thumb=l.opts.$thumb||null,l.opts.$trigger&&l.index===o.opts.index&&(l.$thumb=l.opts.$trigger.find("img:first"),l.$thumb.length&&(l.opts.$orig=l.opts.$trigger)),l.$thumb&&l.$thumb.length||!l.opts.$orig||(l.$thumb=l.opts.$orig.find("img:first")),l.$thumb&&!l.$thumb.length&&(l.$thumb=null),l.thumb=l.opts.thumb||(l.$thumb?l.$thumb[0].src:null),"function"===n.type(l.opts.caption)&&(l.opts.caption=l.opts.caption.apply(e,[o,l])),"function"===n.type(o.opts.caption)&&(l.opts.caption=o.opts.caption.apply(e,[o,l])),l.opts.caption instanceof n||(l.opts.caption=void 0===l.opts.caption?"":l.opts.caption+""),"ajax"===l.type&&(c=r.split(/\s+/,2),c.length>1&&(l.src=c.shift(),l.opts.filter=c.shift())),l.opts.modal&&(l.opts=n.extend(!0,l.opts,{trapFocus:!0,infobar:0,toolbar:0,smallBtn:0,keyboard:0,slideShow:0,fullScreen:0,thumbs:0,touch:0,clickContent:!1,clickSlide:!1,clickOutside:!1,dblclickContent:!1,dblclickSlide:!1,dblclickOutside:!1})),o.group.push(l)}),Object.keys(o.slides).length&&(o.updateControls(),(e=o.Thumbs)&&e.isActive&&(e.create(),e.focus()))},addEvents:function(){var e=this;e.removeEvents(),e.$refs.container.on("click.fb-close","[data-fancybox-close]",function(t){t.stopPropagation(),t.preventDefault(),e.close(t)}).on("touchstart.fb-prev click.fb-prev","[data-fancybox-prev]",function(t){t.stopPropagation(),t.preventDefault(),e.previous()}).on("touchstart.fb-next click.fb-next","[data-fancybox-next]",function(t){t.stopPropagation(),t.preventDefault(),e.next()}).on("click.fb","[data-fancybox-zoom]",function(t){e[e.isScaledDown()?"scaleToActual":"scaleToFit"]()}),s.on("orientationchange.fb resize.fb",function(t){t&&t.originalEvent&&"resize"===t.originalEvent.type?(e.requestId&&u(e.requestId),e.requestId=d(function(){e.update(t)})):(e.current&&"iframe"===e.current.type&&e.$refs.stage.hide(),setTimeout(function(){e.$refs.stage.show(),e.update(t)},n.fancybox.isMobile?600:250))}),r.on("keydown.fb",function(t){var o=n.fancybox?n.fancybox.getInstance():null,i=o.current,a=t.keyCode||t.which;if(9==a)return void(i.opts.trapFocus&&e.focus(t));if(!(!i.opts.keyboard||t.ctrlKey||t.altKey||t.shiftKey||n(t.target).is("input,textarea,video,audio,select")))return 8===a||27===a?(t.preventDefault(),void e.close(t)):37===a||38===a?(t.preventDefault(),void e.previous()):39===a||40===a?(t.preventDefault(),void e.next()):void e.trigger("afterKeydown",t,a)}),e.group[e.currIndex].opts.idleTime&&(e.idleSecondsCounter=0,r.on("mousemove.fb-idle mouseleave.fb-idle mousedown.fb-idle touchstart.fb-idle touchmove.fb-idle scroll.fb-idle keydown.fb-idle",function(t){e.idleSecondsCounter=0,e.isIdle&&e.showControls(),e.isIdle=!1}),e.idleInterval=t.setInterval(function(){++e.idleSecondsCounter>=e.group[e.currIndex].opts.idleTime&&!e.isDragging&&(e.isIdle=!0,e.idleSecondsCounter=0,e.hideControls())},1e3))},removeEvents:function(){var e=this;s.off("orientationchange.fb resize.fb"),r.off("keydown.fb .fb-idle"),this.$refs.container.off(".fb-close .fb-prev .fb-next"),e.idleInterval&&(t.clearInterval(e.idleInterval),e.idleInterval=null)},previous:function(t){return this.jumpTo(this.currPos-1,t)},next:function(t){return this.jumpTo(this.currPos+1,t)},jumpTo:function(t,e){var o,i,a,s,r,c,l,d,u,f=this,h=f.group.length;if(!(f.isDragging||f.isClosing||f.isAnimating&&f.firstRun)){if(t=parseInt(t,10),!(a=f.current?f.current.opts.loop:f.opts.loop)&&(t<0||t>=h))return!1;if(o=f.firstRun=!Object.keys(f.slides).length,r=f.current,f.prevIndex=f.currIndex,f.prevPos=f.currPos,s=f.createSlide(t),h>1&&((a||s.index<h-1)&&f.createSlide(t+1),(a||s.index>0)&&f.createSlide(t-1)),f.current=s,f.currIndex=s.index,f.currPos=s.pos,f.trigger("beforeShow",o),f.updateControls(),s.forcedDuration=void 0,n.isNumeric(e)?s.forcedDuration=e:e=s.opts[o?"animationDuration":"transitionDuration"],e=parseInt(e,10),i=f.isMoved(s),s.$slide.addClass("fancybox-slide--current"),o)return s.opts.animationEffect&&e&&f.$refs.container.css("transition-duration",e+"ms"),f.$refs.container.addClass("fancybox-is-open").trigger("focus"),f.loadSlide(s),void f.preload("image");c=n.fancybox.getTranslate(r.$slide),l=n.fancybox.getTranslate(f.$refs.stage),n.each(f.slides,function(t,e){n.fancybox.stop(e.$slide,!0)}),r.pos!==s.pos&&(r.isComplete=!1),r.$slide.removeClass("fancybox-slide--complete fancybox-slide--current"),i?(u=c.left-(r.pos*c.width+r.pos*r.opts.gutter),n.each(f.slides,function(t,o){o.$slide.removeClass("fancybox-animated").removeClass(function(t,e){return(e.match(/(^|\s)fancybox-fx-\S+/g)||[]).join(" ")});var i=o.pos*c.width+o.pos*o.opts.gutter;n.fancybox.setTranslate(o.$slide,{top:0,left:i-l.left+u}),o.pos!==s.pos&&o.$slide.addClass("fancybox-slide--"+(o.pos>s.pos?"next":"previous")),p(o.$slide),n.fancybox.animate(o.$slide,{top:0,left:(o.pos-s.pos)*c.width+(o.pos-s.pos)*o.opts.gutter},e,function(){o.$slide.css({transform:"",opacity:""}).removeClass("fancybox-slide--next fancybox-slide--previous"),o.pos===f.currPos&&f.complete()})})):e&&s.opts.transitionEffect&&(d="fancybox-animated fancybox-fx-"+s.opts.transitionEffect,r.$slide.addClass("fancybox-slide--"+(r.pos>s.pos?"next":"previous")),n.fancybox.animate(r.$slide,d,e,function(){r.$slide.removeClass(d).removeClass("fancybox-slide--next fancybox-slide--previous")},!1)),s.isLoaded?f.revealContent(s):f.loadSlide(s),f.preload("image")}},createSlide:function(t){var e,o,i=this;return o=t%i.group.length,o=o<0?i.group.length+o:o,!i.slides[t]&&i.group[o]&&(e=n('<div class="fancybox-slide"></div>').appendTo(i.$refs.stage),i.slides[t]=n.extend(!0,{},i.group[o],{pos:t,$slide:e,isLoaded:!1}),i.updateSlide(i.slides[t])),i.slides[t]},scaleToActual:function(t,e,o){var i,a,s,r,c,l=this,d=l.current,u=d.$content,f=n.fancybox.getTranslate(d.$slide).width,p=n.fancybox.getTranslate(d.$slide).height,h=d.width,g=d.height;l.isAnimating||l.isMoved()||!u||"image"!=d.type||!d.isLoaded||d.hasError||(l.isAnimating=!0,n.fancybox.stop(u),t=void 0===t?.5*f:t,e=void 0===e?.5*p:e,i=n.fancybox.getTranslate(u),i.top-=n.fancybox.getTranslate(d.$slide).top,i.left-=n.fancybox.getTranslate(d.$slide).left,r=h/i.width,c=g/i.height,a=.5*f-.5*h,s=.5*p-.5*g,h>f&&(a=i.left*r-(t*r-t),a>0&&(a=0),a<f-h&&(a=f-h)),g>p&&(s=i.top*c-(e*c-e),s>0&&(s=0),s<p-g&&(s=p-g)),l.updateCursor(h,g),n.fancybox.animate(u,{top:s,left:a,scaleX:r,scaleY:c},o||366,function(){l.isAnimating=!1}),l.SlideShow&&l.SlideShow.isActive&&l.SlideShow.stop())},scaleToFit:function(t){var e,o=this,i=o.current,a=i.$content;o.isAnimating||o.isMoved()||!a||"image"!=i.type||!i.isLoaded||i.hasError||(o.isAnimating=!0,n.fancybox.stop(a),e=o.getFitPos(i),o.updateCursor(e.width,e.height),n.fancybox.animate(a,{top:e.top,left:e.left,scaleX:e.width/a.width(),scaleY:e.height/a.height()},t||366,function(){o.isAnimating=!1}))},getFitPos:function(t){var e,o,i,a,s=this,r=t.$content,c=t.$slide,l=t.width||t.opts.width,d=t.height||t.opts.height,u={};return!!(t.isLoaded&&r&&r.length)&&(e=n.fancybox.getTranslate(s.$refs.stage).width,o=n.fancybox.getTranslate(s.$refs.stage).height,e-=parseFloat(c.css("paddingLeft"))+parseFloat(c.css("paddingRight"))+parseFloat(r.css("marginLeft"))+parseFloat(r.css("marginRight")),o-=parseFloat(c.css("paddingTop"))+parseFloat(c.css("paddingBottom"))+parseFloat(r.css("marginTop"))+parseFloat(r.css("marginBottom")),l&&d||(l=e,d=o),i=Math.min(1,e/l,o/d),l*=i,d*=i,l>e-.5&&(l=e),d>o-.5&&(d=o),"image"===t.type?(u.top=Math.floor(.5*(o-d))+parseFloat(c.css("paddingTop")),u.left=Math.floor(.5*(e-l))+parseFloat(c.css("paddingLeft"))):"video"===t.contentType&&(a=t.opts.width&&t.opts.height?l/d:t.opts.ratio||16/9,d>l/a?d=l/a:l>d*a&&(l=d*a)),u.width=l,u.height=d,u)},update:function(t){var e=this;n.each(e.slides,function(n,o){e.updateSlide(o,t)})},updateSlide:function(t,e){var o=this,i=t&&t.$content,a=t.width||t.opts.width,s=t.height||t.opts.height,r=t.$slide;o.adjustCaption(t),i&&(a||s||"video"===t.contentType)&&!t.hasError&&(n.fancybox.stop(i),n.fancybox.setTranslate(i,o.getFitPos(t)),t.pos===o.currPos&&(o.isAnimating=!1,o.updateCursor())),o.adjustLayout(t),r.length&&(r.trigger("refresh"),t.pos===o.currPos&&o.$refs.toolbar.add(o.$refs.navigation.find(".fancybox-button--arrow_right")).toggleClass("compensate-for-scrollbar",r.get(0).scrollHeight>r.get(0).clientHeight)),o.trigger("onUpdate",t,e)},centerSlide:function(t){var e=this,o=e.current,i=o.$slide;!e.isClosing&&o&&(i.siblings().css({transform:"",opacity:""}),i.parent().children().removeClass("fancybox-slide--previous fancybox-slide--next"),n.fancybox.animate(i,{top:0,left:0,opacity:1},void 0===t?0:t,function(){i.css({transform:"",opacity:""}),o.isComplete||e.complete()},!1))},isMoved:function(t){var e,o,i=t||this.current;return!!i&&(o=n.fancybox.getTranslate(this.$refs.stage),e=n.fancybox.getTranslate(i.$slide),!i.$slide.hasClass("fancybox-animated")&&(Math.abs(e.top-o.top)>.5||Math.abs(e.left-o.left)>.5))},updateCursor:function(t,e){var o,i,a=this,s=a.current,r=a.$refs.container;s&&!a.isClosing&&a.Guestures&&(r.removeClass("fancybox-is-zoomable fancybox-can-zoomIn fancybox-can-zoomOut fancybox-can-swipe fancybox-can-pan"),o=a.canPan(t,e),i=!!o||a.isZoomable(),r.toggleClass("fancybox-is-zoomable",i),n("[data-fancybox-zoom]").prop("disabled",!i),o?r.addClass("fancybox-can-pan"):i&&("zoom"===s.opts.clickContent||n.isFunction(s.opts.clickContent)&&"zoom"==s.opts.clickContent(s))?r.addClass("fancybox-can-zoomIn"):s.opts.touch&&(s.opts.touch.vertical||a.group.length>1)&&"video"!==s.contentType&&r.addClass("fancybox-can-swipe"))},isZoomable:function(){var t,e=this,n=e.current;if(n&&!e.isClosing&&"image"===n.type&&!n.hasError){if(!n.isLoaded)return!0;if((t=e.getFitPos(n))&&(n.width>t.width||n.height>t.height))return!0}return!1},isScaledDown:function(t,e){var o=this,i=!1,a=o.current,s=a.$content;return void 0!==t&&void 0!==e?i=t<a.width&&e<a.height:s&&(i=n.fancybox.getTranslate(s),i=i.width<a.width&&i.height<a.height),i},canPan:function(t,e){var o=this,i=o.current,a=null,s=!1;return"image"===i.type&&(i.isComplete||t&&e)&&!i.hasError&&(s=o.getFitPos(i),void 0!==t&&void 0!==e?a={width:t,height:e}:i.isComplete&&(a=n.fancybox.getTranslate(i.$content)),a&&s&&(s=Math.abs(a.width-s.width)>1.5||Math.abs(a.height-s.height)>1.5)),s},loadSlide:function(t){var e,o,i,a=this;if(!t.isLoading&&!t.isLoaded){if(t.isLoading=!0,!1===a.trigger("beforeLoad",t))return t.isLoading=!1,!1;switch(e=t.type,o=t.$slide,o.off("refresh").trigger("onReset").addClass(t.opts.slideClass),e){case"image":a.setImage(t);break;case"iframe":a.setIframe(t);break;case"html":a.setContent(t,t.src||t.content);break;case"video":a.setContent(t,t.opts.video.tpl.replace(/\{\{src\}\}/gi,t.src).replace("{{format}}",t.opts.videoFormat||t.opts.video.format||"").replace("{{poster}}",t.thumb||""));break;case"inline":n(t.src).length?a.setContent(t,n(t.src)):a.setError(t);break;case"ajax":a.showLoading(t),i=n.ajax(n.extend({},t.opts.ajax.settings,{url:t.src,success:function(e,n){"success"===n&&a.setContent(t,e)},error:function(e,n){e&&"abort"!==n&&a.setError(t)}})),o.one("onReset",function(){i.abort()});break;default:a.setError(t)}return!0}},setImage:function(t){var o,i=this;setTimeout(function(){var e=t.$image;i.isClosing||!t.isLoading||e&&e.length&&e[0].complete||t.hasError||i.showLoading(t)},50),i.checkSrcset(t),t.$content=n('<div class="fancybox-content"></div>').addClass("fancybox-is-hidden").appendTo(t.$slide.addClass("fancybox-slide--image")),!1!==t.opts.preload&&t.opts.width&&t.opts.height&&t.thumb&&(t.width=t.opts.width,t.height=t.opts.height,o=e.createElement("img"),o.onerror=function(){n(this).remove(),t.$ghost=null},o.onload=function(){i.afterLoad(t)},t.$ghost=n(o).addClass("fancybox-image").appendTo(t.$content).attr("src",t.thumb)),i.setBigImage(t)},checkSrcset:function(e){var n,o,i,a,s=e.opts.srcset||e.opts.image.srcset;if(s){i=t.devicePixelRatio||1,a=t.innerWidth*i,o=s.split(",").map(function(t){var e={};return t.trim().split(/\s+/).forEach(function(t,n){var o=parseInt(t.substring(0,t.length-1),10);if(0===n)return e.url=t;o&&(e.value=o,e.postfix=t[t.length-1])}),e}),o.sort(function(t,e){return t.value-e.value});for(var r=0;r<o.length;r++){var c=o[r];if("w"===c.postfix&&c.value>=a||"x"===c.postfix&&c.value>=i){n=c;break}}!n&&o.length&&(n=o[o.length-1]),n&&(e.src=n.url,e.width&&e.height&&"w"==n.postfix&&(e.height=e.width/e.height*n.value,e.width=n.value),e.opts.srcset=s)}},setBigImage:function(t){var o=this,i=e.createElement("img"),a=n(i);t.$image=a.one("error",function(){o.setError(t)}).one("load",function(){var e;t.$ghost||(o.resolveImageSlideSize(t,this.naturalWidth,this.naturalHeight),o.afterLoad(t)),o.isClosing||(t.opts.srcset&&(e=t.opts.sizes,e&&"auto"!==e||(e=(t.width/t.height>1&&s.width()/s.height()>1?"100":Math.round(t.width/t.height*100))+"vw"),a.attr("sizes",e).attr("srcset",t.opts.srcset)),t.$ghost&&setTimeout(function(){t.$ghost&&!o.isClosing&&t.$ghost.hide()},Math.min(300,Math.max(1e3,t.height/1600))),o.hideLoading(t))}).addClass("fancybox-image").attr("src",t.src).appendTo(t.$content),(i.complete||"complete"==i.readyState)&&a.naturalWidth&&a.naturalHeight?a.trigger("load"):i.error&&a.trigger("error")},resolveImageSlideSize:function(t,e,n){var o=parseInt(t.opts.width,10),i=parseInt(t.opts.height,10);t.width=e,t.height=n,o>0&&(t.width=o,t.height=Math.floor(o*n/e)),i>0&&(t.width=Math.floor(i*e/n),t.height=i)},setIframe:function(t){var e,o=this,i=t.opts.iframe,a=t.$slide;t.$content=n('<div class="fancybox-content'+(i.preload?" fancybox-is-hidden":"")+'"></div>').css(i.css).appendTo(a),a.addClass("fancybox-slide--"+t.contentType),t.$iframe=e=n(i.tpl.replace(/\{rnd\}/g,(new Date).getTime())).attr(i.attr).appendTo(t.$content),i.preload?(o.showLoading(t),e.on("load.fb error.fb",function(e){this.isReady=1,t.$slide.trigger("refresh"),o.afterLoad(t)}),a.on("refresh.fb",function(){var n,o,s=t.$content,r=i.css.width,c=i.css.height;if(1===e[0].isReady){try{n=e.contents(),o=n.find("body")}catch(t){}o&&o.length&&o.children().length&&(a.css("overflow","visible"),s.css({width:"100%","max-width":"100%",height:"9999px"}),void 0===r&&(r=Math.ceil(Math.max(o[0].clientWidth,o.outerWidth(!0)))),s.css("width",r||"").css("max-width",""),void 0===c&&(c=Math.ceil(Math.max(o[0].clientHeight,o.outerHeight(!0)))),s.css("height",c||""),a.css("overflow","auto")),s.removeClass("fancybox-is-hidden")}})):o.afterLoad(t),e.attr("src",t.src),a.one("onReset",function(){try{n(this).find("iframe").hide().unbind().attr("src","//about:blank")}catch(t){}n(this).off("refresh.fb").empty(),t.isLoaded=!1,t.isRevealed=!1})},setContent:function(t,e){var o=this;o.isClosing||(o.hideLoading(t),t.$content&&n.fancybox.stop(t.$content),t.$slide.empty(),l(e)&&e.parent().length?((e.hasClass("fancybox-content")||e.parent().hasClass("fancybox-content"))&&e.parents(".fancybox-slide").trigger("onReset"),t.$placeholder=n("<div>").hide().insertAfter(e),e.css("display","inline-block")):t.hasError||("string"===n.type(e)&&(e=n("<div>").append(n.trim(e)).contents()),t.opts.filter&&(e=n("<div>").html(e).find(t.opts.filter))),t.$slide.one("onReset",function(){n(this).find("video,audio").trigger("pause"),t.$placeholder&&(t.$placeholder.after(e.removeClass("fancybox-content").hide()).remove(),t.$placeholder=null),t.$smallBtn&&(t.$smallBtn.remove(),t.$smallBtn=null),t.hasError||(n(this).empty(),t.isLoaded=!1,t.isRevealed=!1)}),n(e).appendTo(t.$slide),n(e).is("video,audio")&&(n(e).addClass("fancybox-video"),n(e).wrap("<div></div>"),t.contentType="video",t.opts.width=t.opts.width||n(e).attr("width"),t.opts.height=t.opts.height||n(e).attr("height")),t.$content=t.$slide.children().filter("div,form,main,video,audio,article,.fancybox-content").first(),t.$content.siblings().hide(),t.$content.length||(t.$content=t.$slide.wrapInner("<div></div>").children().first()),t.$content.addClass("fancybox-content"),t.$slide.addClass("fancybox-slide--"+t.contentType),o.afterLoad(t))},setError:function(t){t.hasError=!0,t.$slide.trigger("onReset").removeClass("fancybox-slide--"+t.contentType).addClass("fancybox-slide--error"),t.contentType="html",this.setContent(t,this.translate(t,t.opts.errorTpl)),t.pos===this.currPos&&(this.isAnimating=!1)},showLoading:function(t){var e=this;(t=t||e.current)&&!t.$spinner&&(t.$spinner=n(e.translate(e,e.opts.spinnerTpl)).appendTo(t.$slide).hide().fadeIn("fast"))},hideLoading:function(t){var e=this;(t=t||e.current)&&t.$spinner&&(t.$spinner.stop().remove(),delete t.$spinner)},afterLoad:function(t){var e=this;e.isClosing||(t.isLoading=!1,t.isLoaded=!0,e.trigger("afterLoad",t),e.hideLoading(t),!t.opts.smallBtn||t.$smallBtn&&t.$smallBtn.length||(t.$smallBtn=n(e.translate(t,t.opts.btnTpl.smallBtn)).appendTo(t.$content)),t.opts.protect&&t.$content&&!t.hasError&&(t.$content.on("contextmenu.fb",function(t){return 2==t.button&&t.preventDefault(),!0}),"image"===t.type&&n('<div class="fancybox-spaceball"></div>').appendTo(t.$content)),e.adjustCaption(t),e.adjustLayout(t),t.pos===e.currPos&&e.updateCursor(),e.revealContent(t))},adjustCaption:function(t){var e,n=this,o=t||n.current,i=o.opts.caption,a=o.opts.preventCaptionOverlap,s=n.$refs.caption,r=!1;s.toggleClass("fancybox-caption--separate",a),a&&i&&i.length&&(o.pos!==n.currPos?(e=s.clone().appendTo(s.parent()),e.children().eq(0).empty().html(i),r=e.outerHeight(!0),e.empty().remove()):n.$caption&&(r=n.$caption.outerHeight(!0)),o.$slide.css("padding-bottom",r||""))},adjustLayout:function(t){var e,n,o,i,a=this,s=t||a.current;s.isLoaded&&!0!==s.opts.disableLayoutFix&&(s.$content.css("margin-bottom",""),s.$content.outerHeight()>s.$slide.height()+.5&&(o=s.$slide[0].style["padding-bottom"],i=s.$slide.css("padding-bottom"),parseFloat(i)>0&&(e=s.$slide[0].scrollHeight,s.$slide.css("padding-bottom",0),Math.abs(e-s.$slide[0].scrollHeight)<1&&(n=i),s.$slide.css("padding-bottom",o))),s.$content.css("margin-bottom",n))},revealContent:function(t){var e,o,i,a,s=this,r=t.$slide,c=!1,l=!1,d=s.isMoved(t),u=t.isRevealed;return t.isRevealed=!0,e=t.opts[s.firstRun?"animationEffect":"transitionEffect"],i=t.opts[s.firstRun?"animationDuration":"transitionDuration"],i=parseInt(void 0===t.forcedDuration?i:t.forcedDuration,10),!d&&t.pos===s.currPos&&i||(e=!1),"zoom"===e&&(t.pos===s.currPos&&i&&"image"===t.type&&!t.hasError&&(l=s.getThumbPos(t))?c=s.getFitPos(t):e="fade"),"zoom"===e?(s.isAnimating=!0,c.scaleX=c.width/l.width,c.scaleY=c.height/l.height,a=t.opts.zoomOpacity,"auto"==a&&(a=Math.abs(t.width/t.height-l.width/l.height)>.1),a&&(l.opacity=.1,c.opacity=1),n.fancybox.setTranslate(t.$content.removeClass("fancybox-is-hidden"),l),p(t.$content),void n.fancybox.animate(t.$content,c,i,function(){s.isAnimating=!1,s.complete()})):(s.updateSlide(t),e?(n.fancybox.stop(r),o="fancybox-slide--"+(t.pos>=s.prevPos?"next":"previous")+" fancybox-animated fancybox-fx-"+e,r.addClass(o).removeClass("fancybox-slide--current"),t.$content.removeClass("fancybox-is-hidden"),p(r),"image"!==t.type&&t.$content.hide().show(0),void n.fancybox.animate(r,"fancybox-slide--current",i,function(){r.removeClass(o).css({transform:"",opacity:""}),t.pos===s.currPos&&s.complete()},!0)):(t.$content.removeClass("fancybox-is-hidden"),u||!d||"image"!==t.type||t.hasError||t.$content.hide().fadeIn("fast"),void(t.pos===s.currPos&&s.complete())))},getThumbPos:function(t){var e,o,i,a,s,r=!1,c=t.$thumb;return!(!c||!g(c[0]))&&(e=n.fancybox.getTranslate(c),o=parseFloat(c.css("border-top-width")||0),i=parseFloat(c.css("border-right-width")||0),a=parseFloat(c.css("border-bottom-width")||0),s=parseFloat(c.css("border-left-width")||0),r={top:e.top+o,left:e.left+s,width:e.width-i-s,height:e.height-o-a,scaleX:1,scaleY:1},e.width>0&&e.height>0&&r)},complete:function(){var t,e=this,o=e.current,i={};!e.isMoved()&&o.isLoaded&&(o.isComplete||(o.isComplete=!0,o.$slide.siblings().trigger("onReset"),e.preload("inline"),p(o.$slide),o.$slide.addClass("fancybox-slide--complete"),n.each(e.slides,function(t,o){o.pos>=e.currPos-1&&o.pos<=e.currPos+1?i[o.pos]=o:o&&(n.fancybox.stop(o.$slide),o.$slide.off().remove())}),e.slides=i),e.isAnimating=!1,e.updateCursor(),e.trigger("afterShow"),o.opts.video.autoStart&&o.$slide.find("video,audio").filter(":visible:first").trigger("play").one("ended",function(){Document.exitFullscreen?Document.exitFullscreen():this.webkitExitFullscreen&&this.webkitExitFullscreen(),e.next()}),o.opts.autoFocus&&"html"===o.contentType&&(t=o.$content.find("input[autofocus]:enabled:visible:first"),t.length?t.trigger("focus"):e.focus(null,!0)),o.$slide.scrollTop(0).scrollLeft(0))},preload:function(t){var e,n,o=this;o.group.length<2||(n=o.slides[o.currPos+1],e=o.slides[o.currPos-1],e&&e.type===t&&o.loadSlide(e),n&&n.type===t&&o.loadSlide(n))},focus:function(t,o){var i,a,s=this,r=["a[href]","area[href]",'input:not([disabled]):not([type="hidden"]):not([aria-hidden])',"select:not([disabled]):not([aria-hidden])","textarea:not([disabled]):not([aria-hidden])","button:not([disabled]):not([aria-hidden])","iframe","object","embed","video","audio","[contenteditable]",'[tabindex]:not([tabindex^="-"])'].join(",");s.isClosing||(i=!t&&s.current&&s.current.isComplete?s.current.$slide.find("*:visible"+(o?":not(.fancybox-close-small)":"")):s.$refs.container.find("*:visible"),i=i.filter(r).filter(function(){return"hidden"!==n(this).css("visibility")&&!n(this).hasClass("disabled")}),i.length?(a=i.index(e.activeElement),t&&t.shiftKey?(a<0||0==a)&&(t.preventDefault(),i.eq(i.length-1).trigger("focus")):(a<0||a==i.length-1)&&(t&&t.preventDefault(),i.eq(0).trigger("focus"))):s.$refs.container.trigger("focus"))},activate:function(){var t=this;n(".fancybox-container").each(function(){var e=n(this).data("FancyBox");e&&e.id!==t.id&&!e.isClosing&&(e.trigger("onDeactivate"),e.removeEvents(),e.isVisible=!1)}),t.isVisible=!0,(t.current||t.isIdle)&&(t.update(),t.updateControls()),t.trigger("onActivate"),t.addEvents()},close:function(t,e){var o,i,a,s,r,c,l,u=this,f=u.current,h=function(){u.cleanUp(t)};return!u.isClosing&&(u.isClosing=!0,!1===u.trigger("beforeClose",t)?(u.isClosing=!1,d(function(){u.update()}),!1):(u.removeEvents(),a=f.$content,o=f.opts.animationEffect,i=n.isNumeric(e)?e:o?f.opts.animationDuration:0,f.$slide.removeClass("fancybox-slide--complete fancybox-slide--next fancybox-slide--previous fancybox-animated"),!0!==t?n.fancybox.stop(f.$slide):o=!1,f.$slide.siblings().trigger("onReset").remove(),i&&u.$refs.container.removeClass("fancybox-is-open").addClass("fancybox-is-closing").css("transition-duration",i+"ms"),u.hideLoading(f),u.hideControls(!0),u.updateCursor(),"zoom"!==o||a&&i&&"image"===f.type&&!u.isMoved()&&!f.hasError&&(l=u.getThumbPos(f))||(o="fade"),"zoom"===o?(n.fancybox.stop(a),s=n.fancybox.getTranslate(a),c={top:s.top,left:s.left,scaleX:s.width/l.width,scaleY:s.height/l.height,width:l.width,height:l.height},r=f.opts.zoomOpacity,
-"auto"==r&&(r=Math.abs(f.width/f.height-l.width/l.height)>.1),r&&(l.opacity=0),n.fancybox.setTranslate(a,c),p(a),n.fancybox.animate(a,l,i,h),!0):(o&&i?n.fancybox.animate(f.$slide.addClass("fancybox-slide--previous").removeClass("fancybox-slide--current"),"fancybox-animated fancybox-fx-"+o,i,h):!0===t?setTimeout(h,i):h(),!0)))},cleanUp:function(e){var o,i,a,s=this,r=s.current.opts.$orig;s.current.$slide.trigger("onReset"),s.$refs.container.empty().remove(),s.trigger("afterClose",e),s.current.opts.backFocus&&(r&&r.length&&r.is(":visible")||(r=s.$trigger),r&&r.length&&(i=t.scrollX,a=t.scrollY,r.trigger("focus"),n("html, body").scrollTop(a).scrollLeft(i))),s.current=null,o=n.fancybox.getInstance(),o?o.activate():(n("body").removeClass("fancybox-active compensate-for-scrollbar"),n("#fancybox-style-noscroll").remove())},trigger:function(t,e){var o,i=Array.prototype.slice.call(arguments,1),a=this,s=e&&e.opts?e:a.current;if(s?i.unshift(s):s=a,i.unshift(a),n.isFunction(s.opts[t])&&(o=s.opts[t].apply(s,i)),!1===o)return o;"afterClose"!==t&&a.$refs?a.$refs.container.trigger(t+".fb",i):r.trigger(t+".fb",i)},updateControls:function(){var t=this,o=t.current,i=o.index,a=t.$refs.container,s=t.$refs.caption,r=o.opts.caption;o.$slide.trigger("refresh"),r&&r.length?(t.$caption=s,s.children().eq(0).html(r)):t.$caption=null,t.hasHiddenControls||t.isIdle||t.showControls(),a.find("[data-fancybox-count]").html(t.group.length),a.find("[data-fancybox-index]").html(i+1),a.find("[data-fancybox-prev]").prop("disabled",!o.opts.loop&&i<=0),a.find("[data-fancybox-next]").prop("disabled",!o.opts.loop&&i>=t.group.length-1),"image"===o.type?a.find("[data-fancybox-zoom]").show().end().find("[data-fancybox-download]").attr("href",o.opts.image.src||o.src).show():o.opts.toolbar&&a.find("[data-fancybox-download],[data-fancybox-zoom]").hide(),n(e.activeElement).is(":hidden,[disabled]")&&t.$refs.container.trigger("focus")},hideControls:function(t){var e=this,n=["infobar","toolbar","nav"];!t&&e.current.opts.preventCaptionOverlap||n.push("caption"),this.$refs.container.removeClass(n.map(function(t){return"fancybox-show-"+t}).join(" ")),this.hasHiddenControls=!0},showControls:function(){var t=this,e=t.current?t.current.opts:t.opts,n=t.$refs.container;t.hasHiddenControls=!1,t.idleSecondsCounter=0,n.toggleClass("fancybox-show-toolbar",!(!e.toolbar||!e.buttons)).toggleClass("fancybox-show-infobar",!!(e.infobar&&t.group.length>1)).toggleClass("fancybox-show-caption",!!t.$caption).toggleClass("fancybox-show-nav",!!(e.arrows&&t.group.length>1)).toggleClass("fancybox-is-modal",!!e.modal)},toggleControls:function(){this.hasHiddenControls?this.showControls():this.hideControls()}}),n.fancybox={version:"3.5.7",defaults:a,getInstance:function(t){var e=n('.fancybox-container:not(".fancybox-is-closing"):last').data("FancyBox"),o=Array.prototype.slice.call(arguments,1);return e instanceof b&&("string"===n.type(t)?e[t].apply(e,o):"function"===n.type(t)&&t.apply(e,o),e)},open:function(t,e,n){return new b(t,e,n)},close:function(t){var e=this.getInstance();e&&(e.close(),!0===t&&this.close(t))},destroy:function(){this.close(!0),r.add("body").off("click.fb-start","**")},isMobile:/Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent),use3d:function(){var n=e.createElement("div");return t.getComputedStyle&&t.getComputedStyle(n)&&t.getComputedStyle(n).getPropertyValue("transform")&&!(e.documentMode&&e.documentMode<11)}(),getTranslate:function(t){var e;return!(!t||!t.length)&&(e=t[0].getBoundingClientRect(),{top:e.top||0,left:e.left||0,width:e.width,height:e.height,opacity:parseFloat(t.css("opacity"))})},setTranslate:function(t,e){var n="",o={};if(t&&e)return void 0===e.left&&void 0===e.top||(n=(void 0===e.left?t.position().left:e.left)+"px, "+(void 0===e.top?t.position().top:e.top)+"px",n=this.use3d?"translate3d("+n+", 0px)":"translate("+n+")"),void 0!==e.scaleX&&void 0!==e.scaleY?n+=" scale("+e.scaleX+", "+e.scaleY+")":void 0!==e.scaleX&&(n+=" scaleX("+e.scaleX+")"),n.length&&(o.transform=n),void 0!==e.opacity&&(o.opacity=e.opacity),void 0!==e.width&&(o.width=e.width),void 0!==e.height&&(o.height=e.height),t.css(o)},animate:function(t,e,o,i,a){var s,r=this;n.isFunction(o)&&(i=o,o=null),r.stop(t),s=r.getTranslate(t),t.on(f,function(c){(!c||!c.originalEvent||t.is(c.originalEvent.target)&&"z-index"!=c.originalEvent.propertyName)&&(r.stop(t),n.isNumeric(o)&&t.css("transition-duration",""),n.isPlainObject(e)?void 0!==e.scaleX&&void 0!==e.scaleY&&r.setTranslate(t,{top:e.top,left:e.left,width:s.width*e.scaleX,height:s.height*e.scaleY,scaleX:1,scaleY:1}):!0!==a&&t.removeClass(e),n.isFunction(i)&&i(c))}),n.isNumeric(o)&&t.css("transition-duration",o+"ms"),n.isPlainObject(e)?(void 0!==e.scaleX&&void 0!==e.scaleY&&(delete e.width,delete e.height,t.parent().hasClass("fancybox-slide--image")&&t.parent().addClass("fancybox-is-scaling")),n.fancybox.setTranslate(t,e)):t.addClass(e),t.data("timer",setTimeout(function(){t.trigger(f)},o+33))},stop:function(t,e){t&&t.length&&(clearTimeout(t.data("timer")),e&&t.trigger(f),t.off(f).css("transition-duration",""),t.parent().removeClass("fancybox-is-scaling"))}},n.fn.fancybox=function(t){var e;return t=t||{},e=t.selector||!1,e?n("body").off("click.fb-start",e).on("click.fb-start",e,{options:t},i):this.off("click.fb-start").on("click.fb-start",{items:this,options:t},i),this},r.on("click.fb-start","[data-fancybox]",i),r.on("click.fb-start","[data-fancybox-trigger]",function(t){n('[data-fancybox="'+n(this).attr("data-fancybox-trigger")+'"]').eq(n(this).attr("data-fancybox-index")||0).trigger("click.fb-start",{$trigger:n(this)})}),function(){var t=null;r.on("mousedown mouseup focus blur",".fancybox-button",function(e){switch(e.type){case"mousedown":t=n(this);break;case"mouseup":t=null;break;case"focusin":n(".fancybox-button").removeClass("fancybox-focus"),n(this).is(t)||n(this).is("[disabled]")||n(this).addClass("fancybox-focus");break;case"focusout":n(".fancybox-button").removeClass("fancybox-focus")}})}()}}(window,document,jQuery),function(t){"use strict";var e={youtube:{matcher:/(youtube\.com|youtu\.be|youtube\-nocookie\.com)\/(watch\?(.*&)?v=|v\/|u\/|embed\/?)?(videoseries\?list=(.*)|[\w-]{11}|\?listType=(.*)&list=(.*))(.*)/i,params:{autoplay:1,autohide:1,fs:1,rel:0,hd:1,wmode:"transparent",enablejsapi:1,html5:1},paramPlace:8,type:"iframe",url:"https://www.youtube-nocookie.com/embed/$4",thumb:"https://img.youtube.com/vi/$4/hqdefault.jpg"},vimeo:{matcher:/^.+vimeo.com\/(.*\/)?([\d]+)(.*)?/,params:{autoplay:1,hd:1,show_title:1,show_byline:1,show_portrait:0,fullscreen:1},paramPlace:3,type:"iframe",url:"//player.vimeo.com/video/$2"},instagram:{matcher:/(instagr\.am|instagram\.com)\/p\/([a-zA-Z0-9_\-]+)\/?/i,type:"image",url:"//$1/p/$2/media/?size=l"},gmap_place:{matcher:/(maps\.)?google\.([a-z]{2,3}(\.[a-z]{2})?)\/(((maps\/(place\/(.*)\/)?\@(.*),(\d+.?\d+?)z))|(\?ll=))(.*)?/i,type:"iframe",url:function(t){return"//maps.google."+t[2]+"/?ll="+(t[9]?t[9]+"&z="+Math.floor(t[10])+(t[12]?t[12].replace(/^\//,"&"):""):t[12]+"").replace(/\?/,"&")+"&output="+(t[12]&&t[12].indexOf("layer=c")>0?"svembed":"embed")}},gmap_search:{matcher:/(maps\.)?google\.([a-z]{2,3}(\.[a-z]{2})?)\/(maps\/search\/)(.*)/i,type:"iframe",url:function(t){return"//maps.google."+t[2]+"/maps?q="+t[5].replace("query=","q=").replace("api=1","")+"&output=embed"}}},n=function(e,n,o){if(e)return o=o||"","object"===t.type(o)&&(o=t.param(o,!0)),t.each(n,function(t,n){e=e.replace("$"+t,n||"")}),o.length&&(e+=(e.indexOf("?")>0?"&":"?")+o),e};t(document).on("objectNeedsType.fb",function(o,i,a){var s,r,c,l,d,u,f,p=a.src||"",h=!1;s=t.extend(!0,{},e,a.opts.media),t.each(s,function(e,o){if(c=p.match(o.matcher)){if(h=o.type,f=e,u={},o.paramPlace&&c[o.paramPlace]){d=c[o.paramPlace],"?"==d[0]&&(d=d.substring(1)),d=d.split("&");for(var i=0;i<d.length;++i){var s=d[i].split("=",2);2==s.length&&(u[s[0]]=decodeURIComponent(s[1].replace(/\+/g," ")))}}return l=t.extend(!0,{},o.params,a.opts[e],u),p="function"===t.type(o.url)?o.url.call(this,c,l,a):n(o.url,c,l),r="function"===t.type(o.thumb)?o.thumb.call(this,c,l,a):n(o.thumb,c),"youtube"===e?p=p.replace(/&t=((\d+)m)?(\d+)s/,function(t,e,n,o){return"&start="+((n?60*parseInt(n,10):0)+parseInt(o,10))}):"vimeo"===e&&(p=p.replace("&%23","#")),!1}}),h?(a.opts.thumb||a.opts.$thumb&&a.opts.$thumb.length||(a.opts.thumb=r),"iframe"===h&&(a.opts=t.extend(!0,a.opts,{iframe:{preload:!1,attr:{scrolling:"no"}}})),t.extend(a,{type:h,src:p,origSrc:a.src,contentSource:f,contentType:"image"===h?"image":"gmap_place"==f||"gmap_search"==f?"map":"video"})):p&&(a.type=a.opts.defaultType)});var o={youtube:{src:"https://www.youtube.com/iframe_api",class:"YT",loading:!1,loaded:!1},vimeo:{src:"https://player.vimeo.com/api/player.js",class:"Vimeo",loading:!1,loaded:!1},load:function(t){var e,n=this;if(this[t].loaded)return void setTimeout(function(){n.done(t)});this[t].loading||(this[t].loading=!0,e=document.createElement("script"),e.type="text/javascript",e.src=this[t].src,"youtube"===t?window.onYouTubeIframeAPIReady=function(){n[t].loaded=!0,n.done(t)}:e.onload=function(){n[t].loaded=!0,n.done(t)},document.body.appendChild(e))},done:function(e){var n,o,i;"youtube"===e&&delete window.onYouTubeIframeAPIReady,(n=t.fancybox.getInstance())&&(o=n.current.$content.find("iframe"),"youtube"===e&&void 0!==YT&&YT?i=new YT.Player(o.attr("id"),{events:{onStateChange:function(t){0==t.data&&n.next()}}}):"vimeo"===e&&void 0!==Vimeo&&Vimeo&&(i=new Vimeo.Player(o),i.on("ended",function(){n.next()})))}};t(document).on({"afterShow.fb":function(t,e,n){e.group.length>1&&("youtube"===n.contentSource||"vimeo"===n.contentSource)&&o.load(n.contentSource)}})}(jQuery),function(t,e,n){"use strict";var o=function(){return t.requestAnimationFrame||t.webkitRequestAnimationFrame||t.mozRequestAnimationFrame||t.oRequestAnimationFrame||function(e){return t.setTimeout(e,1e3/60)}}(),i=function(){return t.cancelAnimationFrame||t.webkitCancelAnimationFrame||t.mozCancelAnimationFrame||t.oCancelAnimationFrame||function(e){t.clearTimeout(e)}}(),a=function(e){var n=[];e=e.originalEvent||e||t.e,e=e.touches&&e.touches.length?e.touches:e.changedTouches&&e.changedTouches.length?e.changedTouches:[e];for(var o in e)e[o].pageX?n.push({x:e[o].pageX,y:e[o].pageY}):e[o].clientX&&n.push({x:e[o].clientX,y:e[o].clientY});return n},s=function(t,e,n){return e&&t?"x"===n?t.x-e.x:"y"===n?t.y-e.y:Math.sqrt(Math.pow(t.x-e.x,2)+Math.pow(t.y-e.y,2)):0},r=function(t){if(t.is('a,area,button,[role="button"],input,label,select,summary,textarea,video,audio,iframe')||n.isFunction(t.get(0).onclick)||t.data("selectable"))return!0;for(var e=0,o=t[0].attributes,i=o.length;e<i;e++)if("data-fancybox-"===o[e].nodeName.substr(0,14))return!0;return!1},c=function(e){var n=t.getComputedStyle(e)["overflow-y"],o=t.getComputedStyle(e)["overflow-x"],i=("scroll"===n||"auto"===n)&&e.scrollHeight>e.clientHeight,a=("scroll"===o||"auto"===o)&&e.scrollWidth>e.clientWidth;return i||a},l=function(t){for(var e=!1;;){if(e=c(t.get(0)))break;if(t=t.parent(),!t.length||t.hasClass("fancybox-stage")||t.is("body"))break}return e},d=function(t){var e=this;e.instance=t,e.$bg=t.$refs.bg,e.$stage=t.$refs.stage,e.$container=t.$refs.container,e.destroy(),e.$container.on("touchstart.fb.touch mousedown.fb.touch",n.proxy(e,"ontouchstart"))};d.prototype.destroy=function(){var t=this;t.$container.off(".fb.touch"),n(e).off(".fb.touch"),t.requestId&&(i(t.requestId),t.requestId=null),t.tapped&&(clearTimeout(t.tapped),t.tapped=null)},d.prototype.ontouchstart=function(o){var i=this,c=n(o.target),d=i.instance,u=d.current,f=u.$slide,p=u.$content,h="touchstart"==o.type;if(h&&i.$container.off("mousedown.fb.touch"),(!o.originalEvent||2!=o.originalEvent.button)&&f.length&&c.length&&!r(c)&&!r(c.parent())&&(c.is("img")||!(o.originalEvent.clientX>c[0].clientWidth+c.offset().left))){if(!u||d.isAnimating||u.$slide.hasClass("fancybox-animated"))return o.stopPropagation(),void o.preventDefault();i.realPoints=i.startPoints=a(o),i.startPoints.length&&(u.touch&&o.stopPropagation(),i.startEvent=o,i.canTap=!0,i.$target=c,i.$content=p,i.opts=u.opts.touch,i.isPanning=!1,i.isSwiping=!1,i.isZooming=!1,i.isScrolling=!1,i.canPan=d.canPan(),i.startTime=(new Date).getTime(),i.distanceX=i.distanceY=i.distance=0,i.canvasWidth=Math.round(f[0].clientWidth),i.canvasHeight=Math.round(f[0].clientHeight),i.contentLastPos=null,i.contentStartPos=n.fancybox.getTranslate(i.$content)||{top:0,left:0},i.sliderStartPos=n.fancybox.getTranslate(f),i.stagePos=n.fancybox.getTranslate(d.$refs.stage),i.sliderStartPos.top-=i.stagePos.top,i.sliderStartPos.left-=i.stagePos.left,i.contentStartPos.top-=i.stagePos.top,i.contentStartPos.left-=i.stagePos.left,n(e).off(".fb.touch").on(h?"touchend.fb.touch touchcancel.fb.touch":"mouseup.fb.touch mouseleave.fb.touch",n.proxy(i,"ontouchend")).on(h?"touchmove.fb.touch":"mousemove.fb.touch",n.proxy(i,"ontouchmove")),n.fancybox.isMobile&&e.addEventListener("scroll",i.onscroll,!0),((i.opts||i.canPan)&&(c.is(i.$stage)||i.$stage.find(c).length)||(c.is(".fancybox-image")&&o.preventDefault(),n.fancybox.isMobile&&c.parents(".fancybox-caption").length))&&(i.isScrollable=l(c)||l(c.parent()),n.fancybox.isMobile&&i.isScrollable||o.preventDefault(),(1===i.startPoints.length||u.hasError)&&(i.canPan?(n.fancybox.stop(i.$content),i.isPanning=!0):i.isSwiping=!0,i.$container.addClass("fancybox-is-grabbing")),2===i.startPoints.length&&"image"===u.type&&(u.isLoaded||u.$ghost)&&(i.canTap=!1,i.isSwiping=!1,i.isPanning=!1,i.isZooming=!0,n.fancybox.stop(i.$content),i.centerPointStartX=.5*(i.startPoints[0].x+i.startPoints[1].x)-n(t).scrollLeft(),i.centerPointStartY=.5*(i.startPoints[0].y+i.startPoints[1].y)-n(t).scrollTop(),i.percentageOfImageAtPinchPointX=(i.centerPointStartX-i.contentStartPos.left)/i.contentStartPos.width,i.percentageOfImageAtPinchPointY=(i.centerPointStartY-i.contentStartPos.top)/i.contentStartPos.height,i.startDistanceBetweenFingers=s(i.startPoints[0],i.startPoints[1]))))}},d.prototype.onscroll=function(t){var n=this;n.isScrolling=!0,e.removeEventListener("scroll",n.onscroll,!0)},d.prototype.ontouchmove=function(t){var e=this;return void 0!==t.originalEvent.buttons&&0===t.originalEvent.buttons?void e.ontouchend(t):e.isScrolling?void(e.canTap=!1):(e.newPoints=a(t),void((e.opts||e.canPan)&&e.newPoints.length&&e.newPoints.length&&(e.isSwiping&&!0===e.isSwiping||t.preventDefault(),e.distanceX=s(e.newPoints[0],e.startPoints[0],"x"),e.distanceY=s(e.newPoints[0],e.startPoints[0],"y"),e.distance=s(e.newPoints[0],e.startPoints[0]),e.distance>0&&(e.isSwiping?e.onSwipe(t):e.isPanning?e.onPan():e.isZooming&&e.onZoom()))))},d.prototype.onSwipe=function(e){var a,s=this,r=s.instance,c=s.isSwiping,l=s.sliderStartPos.left||0;if(!0!==c)"x"==c&&(s.distanceX>0&&(s.instance.group.length<2||0===s.instance.current.index&&!s.instance.current.opts.loop)?l+=Math.pow(s.distanceX,.8):s.distanceX<0&&(s.instance.group.length<2||s.instance.current.index===s.instance.group.length-1&&!s.instance.current.opts.loop)?l-=Math.pow(-s.distanceX,.8):l+=s.distanceX),s.sliderLastPos={top:"x"==c?0:s.sliderStartPos.top+s.distanceY,left:l},s.requestId&&(i(s.requestId),s.requestId=null),s.requestId=o(function(){s.sliderLastPos&&(n.each(s.instance.slides,function(t,e){var o=e.pos-s.instance.currPos;n.fancybox.setTranslate(e.$slide,{top:s.sliderLastPos.top,left:s.sliderLastPos.left+o*s.canvasWidth+o*e.opts.gutter})}),s.$container.addClass("fancybox-is-sliding"))});else if(Math.abs(s.distance)>10){if(s.canTap=!1,r.group.length<2&&s.opts.vertical?s.isSwiping="y":r.isDragging||!1===s.opts.vertical||"auto"===s.opts.vertical&&n(t).width()>800?s.isSwiping="x":(a=Math.abs(180*Math.atan2(s.distanceY,s.distanceX)/Math.PI),s.isSwiping=a>45&&a<135?"y":"x"),"y"===s.isSwiping&&n.fancybox.isMobile&&s.isScrollable)return void(s.isScrolling=!0);r.isDragging=s.isSwiping,s.startPoints=s.newPoints,n.each(r.slides,function(t,e){var o,i;n.fancybox.stop(e.$slide),o=n.fancybox.getTranslate(e.$slide),i=n.fancybox.getTranslate(r.$refs.stage),e.$slide.css({transform:"",opacity:"","transition-duration":""}).removeClass("fancybox-animated").removeClass(function(t,e){return(e.match(/(^|\s)fancybox-fx-\S+/g)||[]).join(" ")}),e.pos===r.current.pos&&(s.sliderStartPos.top=o.top-i.top,s.sliderStartPos.left=o.left-i.left),n.fancybox.setTranslate(e.$slide,{top:o.top-i.top,left:o.left-i.left})}),r.SlideShow&&r.SlideShow.isActive&&r.SlideShow.stop()}},d.prototype.onPan=function(){var t=this;if(s(t.newPoints[0],t.realPoints[0])<(n.fancybox.isMobile?10:5))return void(t.startPoints=t.newPoints);t.canTap=!1,t.contentLastPos=t.limitMovement(),t.requestId&&i(t.requestId),t.requestId=o(function(){n.fancybox.setTranslate(t.$content,t.contentLastPos)})},d.prototype.limitMovement=function(){var t,e,n,o,i,a,s=this,r=s.canvasWidth,c=s.canvasHeight,l=s.distanceX,d=s.distanceY,u=s.contentStartPos,f=u.left,p=u.top,h=u.width,g=u.height;return i=h>r?f+l:f,a=p+d,t=Math.max(0,.5*r-.5*h),e=Math.max(0,.5*c-.5*g),n=Math.min(r-h,.5*r-.5*h),o=Math.min(c-g,.5*c-.5*g),l>0&&i>t&&(i=t-1+Math.pow(-t+f+l,.8)||0),l<0&&i<n&&(i=n+1-Math.pow(n-f-l,.8)||0),d>0&&a>e&&(a=e-1+Math.pow(-e+p+d,.8)||0),d<0&&a<o&&(a=o+1-Math.pow(o-p-d,.8)||0),{top:a,left:i}},d.prototype.limitPosition=function(t,e,n,o){var i=this,a=i.canvasWidth,s=i.canvasHeight;return n>a?(t=t>0?0:t,t=t<a-n?a-n:t):t=Math.max(0,a/2-n/2),o>s?(e=e>0?0:e,e=e<s-o?s-o:e):e=Math.max(0,s/2-o/2),{top:e,left:t}},d.prototype.onZoom=function(){var e=this,a=e.contentStartPos,r=a.width,c=a.height,l=a.left,d=a.top,u=s(e.newPoints[0],e.newPoints[1]),f=u/e.startDistanceBetweenFingers,p=Math.floor(r*f),h=Math.floor(c*f),g=(r-p)*e.percentageOfImageAtPinchPointX,b=(c-h)*e.percentageOfImageAtPinchPointY,m=(e.newPoints[0].x+e.newPoints[1].x)/2-n(t).scrollLeft(),v=(e.newPoints[0].y+e.newPoints[1].y)/2-n(t).scrollTop(),y=m-e.centerPointStartX,x=v-e.centerPointStartY,w=l+(g+y),$=d+(b+x),S={top:$,left:w,scaleX:f,scaleY:f};e.canTap=!1,e.newWidth=p,e.newHeight=h,e.contentLastPos=S,e.requestId&&i(e.requestId),e.requestId=o(function(){n.fancybox.setTranslate(e.$content,e.contentLastPos)})},d.prototype.ontouchend=function(t){var o=this,s=o.isSwiping,r=o.isPanning,c=o.isZooming,l=o.isScrolling;if(o.endPoints=a(t),o.dMs=Math.max((new Date).getTime()-o.startTime,1),o.$container.removeClass("fancybox-is-grabbing"),n(e).off(".fb.touch"),e.removeEventListener("scroll",o.onscroll,!0),o.requestId&&(i(o.requestId),o.requestId=null),o.isSwiping=!1,o.isPanning=!1,o.isZooming=!1,o.isScrolling=!1,o.instance.isDragging=!1,o.canTap)return o.onTap(t);o.speed=100,o.velocityX=o.distanceX/o.dMs*.5,o.velocityY=o.distanceY/o.dMs*.5,r?o.endPanning():c?o.endZooming():o.endSwiping(s,l)},d.prototype.endSwiping=function(t,e){var o=this,i=!1,a=o.instance.group.length,s=Math.abs(o.distanceX),r="x"==t&&a>1&&(o.dMs>130&&s>10||s>50);o.sliderLastPos=null,"y"==t&&!e&&Math.abs(o.distanceY)>50?(n.fancybox.animate(o.instance.current.$slide,{top:o.sliderStartPos.top+o.distanceY+150*o.velocityY,opacity:0},200),i=o.instance.close(!0,250)):r&&o.distanceX>0?i=o.instance.previous(300):r&&o.distanceX<0&&(i=o.instance.next(300)),!1!==i||"x"!=t&&"y"!=t||o.instance.centerSlide(200),o.$container.removeClass("fancybox-is-sliding")},d.prototype.endPanning=function(){var t,e,o,i=this;i.contentLastPos&&(!1===i.opts.momentum||i.dMs>350?(t=i.contentLastPos.left,e=i.contentLastPos.top):(t=i.contentLastPos.left+500*i.velocityX,e=i.contentLastPos.top+500*i.velocityY),o=i.limitPosition(t,e,i.contentStartPos.width,i.contentStartPos.height),o.width=i.contentStartPos.width,o.height=i.contentStartPos.height,n.fancybox.animate(i.$content,o,366))},d.prototype.endZooming=function(){var t,e,o,i,a=this,s=a.instance.current,r=a.newWidth,c=a.newHeight;a.contentLastPos&&(t=a.contentLastPos.left,e=a.contentLastPos.top,i={top:e,left:t,width:r,height:c,scaleX:1,scaleY:1},n.fancybox.setTranslate(a.$content,i),r<a.canvasWidth&&c<a.canvasHeight?a.instance.scaleToFit(150):r>s.width||c>s.height?a.instance.scaleToActual(a.centerPointStartX,a.centerPointStartY,150):(o=a.limitPosition(t,e,r,c),n.fancybox.animate(a.$content,o,150)))},d.prototype.onTap=function(e){var o,i=this,s=n(e.target),r=i.instance,c=r.current,l=e&&a(e)||i.startPoints,d=l[0]?l[0].x-n(t).scrollLeft()-i.stagePos.left:0,u=l[0]?l[0].y-n(t).scrollTop()-i.stagePos.top:0,f=function(t){var o=c.opts[t];if(n.isFunction(o)&&(o=o.apply(r,[c,e])),o)switch(o){case"close":r.close(i.startEvent);break;case"toggleControls":r.toggleControls();break;case"next":r.next();break;case"nextOrClose":r.group.length>1?r.next():r.close(i.startEvent);break;case"zoom":"image"==c.type&&(c.isLoaded||c.$ghost)&&(r.canPan()?r.scaleToFit():r.isScaledDown()?r.scaleToActual(d,u):r.group.length<2&&r.close(i.startEvent))}};if((!e.originalEvent||2!=e.originalEvent.button)&&(s.is("img")||!(d>s[0].clientWidth+s.offset().left))){if(s.is(".fancybox-bg,.fancybox-inner,.fancybox-outer,.fancybox-container"))o="Outside";else if(s.is(".fancybox-slide"))o="Slide";else{if(!r.current.$content||!r.current.$content.find(s).addBack().filter(s).length)return;o="Content"}if(i.tapped){if(clearTimeout(i.tapped),i.tapped=null,Math.abs(d-i.tapX)>50||Math.abs(u-i.tapY)>50)return this;f("dblclick"+o)}else i.tapX=d,i.tapY=u,c.opts["dblclick"+o]&&c.opts["dblclick"+o]!==c.opts["click"+o]?i.tapped=setTimeout(function(){i.tapped=null,r.isAnimating||f("click"+o)},500):f("click"+o);return this}},n(e).on("onActivate.fb",function(t,e){e&&!e.Guestures&&(e.Guestures=new d(e))}).on("beforeClose.fb",function(t,e){e&&e.Guestures&&e.Guestures.destroy()})}(window,document,jQuery),function(t,e){"use strict";e.extend(!0,e.fancybox.defaults,{btnTpl:{slideShow:'<button data-fancybox-play class="fancybox-button fancybox-button--play" title="{{PLAY_START}}"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M6.5 5.4v13.2l11-6.6z"/></svg><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M8.33 5.75h2.2v12.5h-2.2V5.75zm5.15 0h2.2v12.5h-2.2V5.75z"/></svg></button>'},slideShow:{autoStart:!1,speed:3e3,progress:!0}});var n=function(t){this.instance=t,this.init()};e.extend(n.prototype,{timer:null,isActive:!1,$button:null,init:function(){var t=this,n=t.instance,o=n.group[n.currIndex].opts.slideShow;t.$button=n.$refs.toolbar.find("[data-fancybox-play]").on("click",function(){t.toggle()}),n.group.length<2||!o?t.$button.hide():o.progress&&(t.$progress=e('<div class="fancybox-progress"></div>').appendTo(n.$refs.inner))},set:function(t){var n=this,o=n.instance,i=o.current;i&&(!0===t||i.opts.loop||o.currIndex<o.group.length-1)?n.isActive&&"video"!==i.contentType&&(n.$progress&&e.fancybox.animate(n.$progress.show(),{scaleX:1},i.opts.slideShow.speed),n.timer=setTimeout(function(){o.current.opts.loop||o.current.index!=o.group.length-1?o.next():o.jumpTo(0)},i.opts.slideShow.speed)):(n.stop(),o.idleSecondsCounter=0,o.showControls())},clear:function(){var t=this;clearTimeout(t.timer),t.timer=null,t.$progress&&t.$progress.removeAttr("style").hide()},start:function(){var t=this,e=t.instance.current;e&&(t.$button.attr("title",(e.opts.i18n[e.opts.lang]||e.opts.i18n.en).PLAY_STOP).removeClass("fancybox-button--play").addClass("fancybox-button--pause"),t.isActive=!0,e.isComplete&&t.set(!0),t.instance.trigger("onSlideShowChange",!0))},stop:function(){var t=this,e=t.instance.current;t.clear(),t.$button.attr("title",(e.opts.i18n[e.opts.lang]||e.opts.i18n.en).PLAY_START).removeClass("fancybox-button--pause").addClass("fancybox-button--play"),t.isActive=!1,t.instance.trigger("onSlideShowChange",!1),t.$progress&&t.$progress.removeAttr("style").hide()},toggle:function(){var t=this;t.isActive?t.stop():t.start()}}),e(t).on({"onInit.fb":function(t,e){e&&!e.SlideShow&&(e.SlideShow=new n(e))},"beforeShow.fb":function(t,e,n,o){var i=e&&e.SlideShow;o?i&&n.opts.slideShow.autoStart&&i.start():i&&i.isActive&&i.clear()},"afterShow.fb":function(t,e,n){var o=e&&e.SlideShow;o&&o.isActive&&o.set()},"afterKeydown.fb":function(n,o,i,a,s){var r=o&&o.SlideShow;!r||!i.opts.slideShow||80!==s&&32!==s||e(t.activeElement).is("button,a,input")||(a.preventDefault(),r.toggle())},"beforeClose.fb onDeactivate.fb":function(t,e){var n=e&&e.SlideShow;n&&n.stop()}}),e(t).on("visibilitychange",function(){var n=e.fancybox.getInstance(),o=n&&n.SlideShow;o&&o.isActive&&(t.hidden?o.clear():o.set())})}(document,jQuery),function(t,e){"use strict";var n=function(){for(var e=[["requestFullscreen","exitFullscreen","fullscreenElement","fullscreenEnabled","fullscreenchange","fullscreenerror"],["webkitRequestFullscreen","webkitExitFullscreen","webkitFullscreenElement","webkitFullscreenEnabled","webkitfullscreenchange","webkitfullscreenerror"],["webkitRequestFullScreen","webkitCancelFullScreen","webkitCurrentFullScreenElement","webkitCancelFullScreen","webkitfullscreenchange","webkitfullscreenerror"],["mozRequestFullScreen","mozCancelFullScreen","mozFullScreenElement","mozFullScreenEnabled","mozfullscreenchange","mozfullscreenerror"],["msRequestFullscreen","msExitFullscreen","msFullscreenElement","msFullscreenEnabled","MSFullscreenChange","MSFullscreenError"]],n={},o=0;o<e.length;o++){var i=e[o];if(i&&i[1]in t){for(var a=0;a<i.length;a++)n[e[0][a]]=i[a];return n}}return!1}();if(n){var o={request:function(e){e=e||t.documentElement,e[n.requestFullscreen](e.ALLOW_KEYBOARD_INPUT)},exit:function(){t[n.exitFullscreen]()},toggle:function(e){e=e||t.documentElement,this.isFullscreen()?this.exit():this.request(e)},isFullscreen:function(){return Boolean(t[n.fullscreenElement])},enabled:function(){return Boolean(t[n.fullscreenEnabled])}};e.extend(!0,e.fancybox.defaults,{btnTpl:{fullScreen:'<button data-fancybox-fullscreen class="fancybox-button fancybox-button--fsenter" title="{{FULL_SCREEN}}"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M7 14H5v5h5v-2H7v-3zm-2-4h2V7h3V5H5v5zm12 7h-3v2h5v-5h-2v3zM14 5v2h3v3h2V5h-5z"/></svg><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M5 16h3v3h2v-5H5zm3-8H5v2h5V5H8zm6 11h2v-3h3v-2h-5zm2-11V5h-2v5h5V8z"/></svg></button>'},fullScreen:{autoStart:!1}}),e(t).on(n.fullscreenchange,function(){var t=o.isFullscreen(),n=e.fancybox.getInstance();n&&(n.current&&"image"===n.current.type&&n.isAnimating&&(n.isAnimating=!1,n.update(!0,!0,0),n.isComplete||n.complete()),n.trigger("onFullscreenChange",t),n.$refs.container.toggleClass("fancybox-is-fullscreen",t),n.$refs.toolbar.find("[data-fancybox-fullscreen]").toggleClass("fancybox-button--fsenter",!t).toggleClass("fancybox-button--fsexit",t))})}e(t).on({"onInit.fb":function(t,e){var i;if(!n)return void e.$refs.toolbar.find("[data-fancybox-fullscreen]").remove();e&&e.group[e.currIndex].opts.fullScreen?(i=e.$refs.container,i.on("click.fb-fullscreen","[data-fancybox-fullscreen]",function(t){t.stopPropagation(),t.preventDefault(),o.toggle()}),e.opts.fullScreen&&!0===e.opts.fullScreen.autoStart&&o.request(),e.FullScreen=o):e&&e.$refs.toolbar.find("[data-fancybox-fullscreen]").hide()},"afterKeydown.fb":function(t,e,n,o,i){e&&e.FullScreen&&70===i&&(o.preventDefault(),e.FullScreen.toggle())},"beforeClose.fb":function(t,e){e&&e.FullScreen&&e.$refs.container.hasClass("fancybox-is-fullscreen")&&o.exit()}})}(document,jQuery),function(t,e){"use strict";var n="fancybox-thumbs";e.fancybox.defaults=e.extend(!0,{btnTpl:{thumbs:'<button data-fancybox-thumbs class="fancybox-button fancybox-button--thumbs" title="{{THUMBS}}"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M14.59 14.59h3.76v3.76h-3.76v-3.76zm-4.47 0h3.76v3.76h-3.76v-3.76zm-4.47 0h3.76v3.76H5.65v-3.76zm8.94-4.47h3.76v3.76h-3.76v-3.76zm-4.47 0h3.76v3.76h-3.76v-3.76zm-4.47 0h3.76v3.76H5.65v-3.76zm8.94-4.47h3.76v3.76h-3.76V5.65zm-4.47 0h3.76v3.76h-3.76V5.65zm-4.47 0h3.76v3.76H5.65V5.65z"/></svg></button>'},thumbs:{autoStart:!1,hideOnClose:!0,parentEl:".fancybox-container",axis:"y"}},e.fancybox.defaults);var o=function(t){this.init(t)};e.extend(o.prototype,{$button:null,$grid:null,$list:null,isVisible:!1,isActive:!1,init:function(t){var e=this,n=t.group,o=0;e.instance=t,e.opts=n[t.currIndex].opts.thumbs,t.Thumbs=e,e.$button=t.$refs.toolbar.find("[data-fancybox-thumbs]");for(var i=0,a=n.length;i<a&&(n[i].thumb&&o++,!(o>1));i++);o>1&&e.opts?(e.$button.removeAttr("style").on("click",function(){e.toggle()}),e.isActive=!0):e.$button.hide()},create:function(){var t,o=this,i=o.instance,a=o.opts.parentEl,s=[];o.$grid||(o.$grid=e('<div class="'+n+" "+n+"-"+o.opts.axis+'"></div>').appendTo(i.$refs.container.find(a).addBack().filter(a)),o.$grid.on("click","a",function(){i.jumpTo(e(this).attr("data-index"))})),o.$list||(o.$list=e('<div class="'+n+'__list">').appendTo(o.$grid)),e.each(i.group,function(e,n){t=n.thumb,t||"image"!==n.type||(t=n.src),s.push('<a href="javascript:;" tabindex="0" data-index="'+e+'"'+(t&&t.length?' style="background-image:url('+t+')"':'class="fancybox-thumbs-missing"')+"></a>")}),o.$list[0].innerHTML=s.join(""),"x"===o.opts.axis&&o.$list.width(parseInt(o.$grid.css("padding-right"),10)+i.group.length*o.$list.children().eq(0).outerWidth(!0))},focus:function(t){var e,n,o=this,i=o.$list,a=o.$grid;o.instance.current&&(e=i.children().removeClass("fancybox-thumbs-active").filter('[data-index="'+o.instance.current.index+'"]').addClass("fancybox-thumbs-active"),n=e.position(),"y"===o.opts.axis&&(n.top<0||n.top>i.height()-e.outerHeight())?i.stop().animate({scrollTop:i.scrollTop()+n.top},t):"x"===o.opts.axis&&(n.left<a.scrollLeft()||n.left>a.scrollLeft()+(a.width()-e.outerWidth()))&&i.parent().stop().animate({scrollLeft:n.left},t))},update:function(){var t=this;t.instance.$refs.container.toggleClass("fancybox-show-thumbs",this.isVisible),t.isVisible?(t.$grid||t.create(),t.instance.trigger("onThumbsShow"),t.focus(0)):t.$grid&&t.instance.trigger("onThumbsHide"),t.instance.update()},hide:function(){this.isVisible=!1,this.update()},show:function(){this.isVisible=!0,this.update()},toggle:function(){this.isVisible=!this.isVisible,this.update()}}),e(t).on({"onInit.fb":function(t,e){var n;e&&!e.Thumbs&&(n=new o(e),n.isActive&&!0===n.opts.autoStart&&n.show())},"beforeShow.fb":function(t,e,n,o){var i=e&&e.Thumbs;i&&i.isVisible&&i.focus(o?0:250)},"afterKeydown.fb":function(t,e,n,o,i){var a=e&&e.Thumbs;a&&a.isActive&&71===i&&(o.preventDefault(),a.toggle())},"beforeClose.fb":function(t,e){var n=e&&e.Thumbs;n&&n.isVisible&&!1!==n.opts.hideOnClose&&n.$grid.hide()}})}(document,jQuery),function(t,e){"use strict";function n(t){var e={"&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;","'":"&#39;","/":"&#x2F;","`":"&#x60;","=":"&#x3D;"};return String(t).replace(/[&<>"'`=\/]/g,function(t){return e[t]})}e.extend(!0,e.fancybox.defaults,{btnTpl:{share:'<button data-fancybox-share class="fancybox-button fancybox-button--share" title="{{SHARE}}"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M2.55 19c1.4-8.4 9.1-9.8 11.9-9.8V5l7 7-7 6.3v-3.5c-2.8 0-10.5 2.1-11.9 4.2z"/></svg></button>'},share:{url:function(t,e){return!t.currentHash&&"inline"!==e.type&&"html"!==e.type&&(e.origSrc||e.src)||window.location},
-tpl:'<div class="fancybox-share"><h1>{{SHARE}}</h1><p><a class="fancybox-share__button fancybox-share__button--fb" href="https://www.facebook.com/sharer/sharer.php?u={{url}}"><svg viewBox="0 0 512 512" xmlns="http://www.w3.org/2000/svg"><path d="m287 456v-299c0-21 6-35 35-35h38v-63c-7-1-29-3-55-3-54 0-91 33-91 94v306m143-254h-205v72h196" /></svg><span>Facebook</span></a><a class="fancybox-share__button fancybox-share__button--tw" href="https://twitter.com/intent/tweet?url={{url}}&text={{descr}}"><svg viewBox="0 0 512 512" xmlns="http://www.w3.org/2000/svg"><path d="m456 133c-14 7-31 11-47 13 17-10 30-27 37-46-15 10-34 16-52 20-61-62-157-7-141 75-68-3-129-35-169-85-22 37-11 86 26 109-13 0-26-4-37-9 0 39 28 72 65 80-12 3-25 4-37 2 10 33 41 57 77 57-42 30-77 38-122 34 170 111 378-32 359-208 16-11 30-25 41-42z" /></svg><span>Twitter</span></a><a class="fancybox-share__button fancybox-share__button--pt" href="https://www.pinterest.com/pin/create/button/?url={{url}}&description={{descr}}&media={{media}}"><svg viewBox="0 0 512 512" xmlns="http://www.w3.org/2000/svg"><path d="m265 56c-109 0-164 78-164 144 0 39 15 74 47 87 5 2 10 0 12-5l4-19c2-6 1-8-3-13-9-11-15-25-15-45 0-58 43-110 113-110 62 0 96 38 96 88 0 67-30 122-73 122-24 0-42-19-36-44 6-29 20-60 20-81 0-19-10-35-31-35-25 0-44 26-44 60 0 21 7 36 7 36l-30 125c-8 37-1 83 0 87 0 3 4 4 5 2 2-3 32-39 42-75l16-64c8 16 31 29 56 29 74 0 124-67 124-157 0-69-58-132-146-132z" fill="#fff"/></svg><span>Pinterest</span></a></p><p><input class="fancybox-share__input" type="text" value="{{url_raw}}" onclick="select()" /></p></div>'}}),e(t).on("click","[data-fancybox-share]",function(){var t,o,i=e.fancybox.getInstance(),a=i.current||null;a&&("function"===e.type(a.opts.share.url)&&(t=a.opts.share.url.apply(a,[i,a])),o=a.opts.share.tpl.replace(/\{\{media\}\}/g,"image"===a.type?encodeURIComponent(a.src):"").replace(/\{\{url\}\}/g,encodeURIComponent(t)).replace(/\{\{url_raw\}\}/g,n(t)).replace(/\{\{descr\}\}/g,i.$caption?encodeURIComponent(i.$caption.text()):""),e.fancybox.open({src:i.translate(i,o),type:"html",opts:{touch:!1,animationEffect:!1,afterLoad:function(t,e){i.$refs.container.one("beforeClose.fb",function(){t.close(null,0)}),e.$content.find(".fancybox-share__button").click(function(){return window.open(this.href,"Share","width=550, height=450"),!1})},mobile:{autoFocus:!1}}}))})}(document,jQuery),function(t,e,n){"use strict";function o(){var e=t.location.hash.substr(1),n=e.split("-"),o=n.length>1&&/^\+?\d+$/.test(n[n.length-1])?parseInt(n.pop(-1),10)||1:1,i=n.join("-");return{hash:e,index:o<1?1:o,gallery:i}}function i(t){""!==t.gallery&&n("[data-fancybox='"+n.escapeSelector(t.gallery)+"']").eq(t.index-1).focus().trigger("click.fb-start")}function a(t){var e,n;return!!t&&(e=t.current?t.current.opts:t.opts,""!==(n=e.hash||(e.$orig?e.$orig.data("fancybox")||e.$orig.data("fancybox-trigger"):""))&&n)}n.escapeSelector||(n.escapeSelector=function(t){return(t+"").replace(/([\0-\x1f\x7f]|^-?\d)|^-$|[^\x80-\uFFFF\w-]/g,function(t,e){return e?"\0"===t?"�":t.slice(0,-1)+"\\"+t.charCodeAt(t.length-1).toString(16)+" ":"\\"+t})}),n(function(){!1!==n.fancybox.defaults.hash&&(n(e).on({"onInit.fb":function(t,e){var n,i;!1!==e.group[e.currIndex].opts.hash&&(n=o(),(i=a(e))&&n.gallery&&i==n.gallery&&(e.currIndex=n.index-1))},"beforeShow.fb":function(n,o,i,s){var r;i&&!1!==i.opts.hash&&(r=a(o))&&(o.currentHash=r+(o.group.length>1?"-"+(i.index+1):""),t.location.hash!=="#"+o.currentHash&&(s&&!o.origHash&&(o.origHash=t.location.hash),o.hashTimer&&clearTimeout(o.hashTimer),o.hashTimer=setTimeout(function(){"replaceState"in t.history?(t.history[s?"pushState":"replaceState"]({},e.title,t.location.pathname+t.location.search+"#"+o.currentHash),s&&(o.hasCreatedHistory=!0)):t.location.hash=o.currentHash,o.hashTimer=null},300)))},"beforeClose.fb":function(n,o,i){i&&!1!==i.opts.hash&&(clearTimeout(o.hashTimer),o.currentHash&&o.hasCreatedHistory?t.history.back():o.currentHash&&("replaceState"in t.history?t.history.replaceState({},e.title,t.location.pathname+t.location.search+(o.origHash||"")):t.location.hash=o.origHash),o.currentHash=null)}}),n(t).on("hashchange.fb",function(){var t=o(),e=null;n.each(n(".fancybox-container").get().reverse(),function(t,o){var i=n(o).data("FancyBox");if(i&&i.currentHash)return e=i,!1}),e?e.currentHash===t.gallery+"-"+t.index||1===t.index&&e.currentHash==t.gallery||(e.currentHash=null,e.close()):""!==t.gallery&&i(t)}),setTimeout(function(){n.fancybox.getInstance()||i(o())},50))})}(window,document,jQuery),function(t,e){"use strict";var n=(new Date).getTime();e(t).on({"onInit.fb":function(t,e,o){e.$refs.stage.on("mousewheel DOMMouseScroll wheel MozMousePixelScroll",function(t){var o=e.current,i=(new Date).getTime();e.group.length<2||!1===o.opts.wheel||"auto"===o.opts.wheel&&"image"!==o.type||(t.preventDefault(),t.stopPropagation(),o.$slide.hasClass("fancybox-animated")||(t=t.originalEvent||t,i-n<250||(n=i,e[(-t.deltaY||-t.deltaX||t.wheelDelta||-t.detail)<0?"next":"previous"]())))})}})}(document,jQuery);
\ No newline at end of file
diff --git a/fancybox/createrelease b/fancybox/createrelease
deleted file mode 100755
index d31f3a63..00000000
--- a/fancybox/createrelease
+++ /dev/null
@@ -1,15 +0,0 @@
-MODULE=fancybox
-
-cd ..
-
-# old releases not needed anymore
-mkdir -p $MODULE/dist
-rm $MODULE/dist/*
-
-# create release for actual version
-zip -r9 $MODULE/dist/release.zip $MODULE/* -x $MODULE/dist/\* -x $MODULE/test/\* $MODULE/createrelease
-
-echo dist/release.zip created.
-
-cd $MODULE
-
diff --git a/fancybox/fancybox.php b/fancybox/fancybox.php
deleted file mode 100644
index 1a9ff634..00000000
--- a/fancybox/fancybox.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-/**
- * Name: Fancybox
- * Description: Open media attachments of posts into a fancybox overlay.
- * Version: 1.05
- * Author: Grischa Brockhaus <grischa@brockha.us>
- */
-
-use Friendica\App;
-use Friendica\Core\Hook;
-use Friendica\DI;
-
-function fancybox_install()
-{
-	Hook::register('head', __FILE__, 'fancybox_head');
-	Hook::register('footer', __FILE__, 'fancybox_footer');
-	Hook::register('prepare_body_final', __FILE__, 'fancybox_render');
-}
-
-function fancybox_head(string &$b)
-{
-	DI::page()->registerStylesheet(__DIR__ . '/asset/fancybox/jquery.fancybox.min.css');
-}
-
-function fancybox_footer(string &$str)
-{
-	DI::page()->registerFooterScript(__DIR__ . '/asset/fancybox/jquery.fancybox.min.js');
-	DI::page()->registerFooterScript(__DIR__ . '/asset/fancybox/fancybox.config.js');
-}
-
-function fancybox_render(array &$b){
-	$gallery = 'gallery-' . $b['item']['uri-id'] ?? random_int(1000000, 10000000);
-
-	// performWithEscapedBlocks escapes block defined with 2nd par pattern that won't be processed.
-	// We don't want to touch images in class="type-link":
-	$b['html'] = \Friendica\Util\Strings::performWithEscapedBlocks(
-		$b['html'],
-		'#<div class="type-link">.*?</div>#s',
-		function ($text) use ($gallery) {
-			// This processes images inlined in posts
-			// Frio / Vier hooks für lightbox are un-hooked in fancybox-config.js. So this works for them, too!
-			//if (!in_array(DI::app()->getCurrentTheme(),['vier','frio']))
-			$text = preg_replace(
-				'#<a[^>]*href="([^"]*)"[^>]*>(<img[^>]*src="[^"]*"[^>]*>)</a>#',
-				'<a data-fancybox="' . $gallery . '" href="$1">$2</a>',
-				$text);
-
-			// Local content images attached:
-			$text = preg_replace_callback(
-				'#<div class="(body-attach|imagegrid-column)">.*?</div>#s',
-				function ($matches) use ($gallery) {
-					return str_replace('<a href', '<a data-fancybox="' . $gallery . '" href', $matches[0]);
-				},
-				$text
-			);
-
-			return $text;
-		}
-	);
-}
diff --git a/forumdirectory/forumdirectory.php b/forumdirectory/forumdirectory.php
index 79267c4e..f7c8b244 100644
--- a/forumdirectory/forumdirectory.php
+++ b/forumdirectory/forumdirectory.php
@@ -4,67 +4,58 @@
  * Description: Add a directory of forums hosted on your server, with verbose descriptions.
  * Version: 1.1
  * Author: Thomas Willingham <https://beardyunixer.com/profile/beardyunixer>
- * Status: Unsupported
- * Note: Please use Group Directory instead
  */
 
 use Friendica\App;
 use Friendica\Content\Nav;
 use Friendica\Content\Pager;
 use Friendica\Content\Widget;
+use Friendica\Core\Config;
 use Friendica\Core\Hook;
+use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
-use Friendica\DI;
 use Friendica\Model\Profile;
-use Friendica\Model\User;
-
-global $forumdirectory_search;
+use Friendica\Util\Strings;
 
 function forumdirectory_install()
 {
 	Hook::register('app_menu', 'addon/forumdirectory/forumdirectory.php', 'forumdirectory_app_menu');
 }
 
-/**
- * This is a statement rather than an actual function definition. The simple
- * existence of this method is checked to figure out if the addon offers a
- * module.
- */
-/**
- * This is a statement rather than an actual function definition. The simple
- * existence of this method is checked to figure out if the addon offers a
- * module.
- */
-function forumdirectory_module() {}
-
-function forumdirectory_app_menu(array &$b)
+function forumdirectory_uninstall()
 {
-	$b['app_menu'][] = '<div class="app-title"><a href="forumdirectory">' . DI::l10n()->t('Forum Directory') . '</a></div>';
+	Hook::unregister('app_menu', 'addon/forumdirectory/forumdirectory.php', 'forumdirectory_app_menu');
 }
 
-function forumdirectory_init()
+function forumdirectory_module()
 {
-	if (DI::userSession()->getLocalUserId()) {
-		DI::page()['aside'] .= Widget::findPeople();
+	return;
+}
+
+function forumdirectory_app_menu(App $a, array &$b)
+{
+	$b['app_menu'][] = '<div class="app-title"><a href="forumdirectory">' . L10n::t('Forum Directory') . '</a></div>';
+}
+
+function forumdirectory_init(App $a)
+{
+	if (local_user()) {
+		$a->page['aside'] .= Widget::findPeople();
 	}
 }
 
-function forumdirectory_post()
+function forumdirectory_post(App $a)
 {
-	global $forumdirectory_search;
-
 	if (!empty($_POST['search'])) {
-		$forumdirectory_search = $_POST['search'];
+		$a->data['search'] = $_POST['search'];
 	}
 }
 
-function forumdirectory_content()
+function forumdirectory_content(App $a)
 {
-	global $forumdirectory_search;
-
-	if (DI::config()->get('system', 'block_public') && !DI::userSession()->getLocalUserId() && !DI::userSession()->getRemoteUserId()) {
-		DI::sysmsg()->addNotice(DI::l10n()->t('Public access denied.'));
+	if ((Config::get('system', 'block_public')) && (!local_user()) && (!remote_user())) {
+		notice(L10n::t('Public access denied.') . EOL);
 		return;
 	}
 
@@ -73,14 +64,14 @@ function forumdirectory_content()
 
 	Nav::setSelected('directory');
 
-	if (!empty($forumdirectory_search)) {
-		$search = trim($forumdirectory_search);
+	if (!empty($a->data['search'])) {
+		$search = Strings::escapeTags(trim($a->data['search']));
 	} else {
-		$search = (!empty($_GET['search']) ? trim(rawurldecode($_GET['search'])) : '');
+		$search = (!empty($_GET['search']) ? Strings::escapeTags(trim(rawurldecode($_GET['search']))) : '');
 	}
 
 	$gdirpath = '';
-	$dirurl = DI::config()->get('system', 'directory');
+	$dirurl = Config::get('system', 'directory');
 	if (strlen($dirurl)) {
 		$gdirpath = Profile::zrl($dirurl, true);
 	}
@@ -91,41 +82,47 @@ function forumdirectory_content()
 
 		$sql_extra = " AND ((`profile`.`name` LIKE '%$search%') OR
 				(`user`.`nickname` LIKE '%$search%') OR
-				(`profile`.`about` LIKE '%$search%') OR
+				(`profile`.`pdesc` LIKE '%$search%') OR
 				(`profile`.`locality` LIKE '%$search%') OR
 				(`profile`.`region` LIKE '%$search%') OR
 				(`profile`.`country-name` LIKE '%$search%') OR
+				(`profile`.`gender` LIKE '%$search%') OR
+				(`profile`.`marital` LIKE '%$search%') OR
+				(`profile`.`sexual` LIKE '%$search%') OR
+				(`profile`.`about` LIKE '%$search%') OR
+				(`profile`.`romance` LIKE '%$search%') OR
+				(`profile`.`work` LIKE '%$search%') OR
+				(`profile`.`education` LIKE '%$search%') OR
 				(`profile`.`pub_keywords` LIKE '%$search%') OR
 				(`profile`.`prv_keywords` LIKE '%$search%'))";
 	}
 
-	$publish = DI::config()->get('system', 'publish_all') ? '' : "`publish` = 1";
+	$publish = Config::get('system', 'publish_all') ? '' : " AND `publish` = 1 ";
 
 	$total = 0;
 	$cnt = DBA::fetchFirst("SELECT COUNT(*) AS `total` FROM `profile`
-				INNER JOIN `user` ON `user`.`uid` = `profile`.`uid`
-				WHERE $publish AND NOT `user`.`blocked` AND NOT `user`.`account_removed` AND `user`.`page-flags` = ? $sql_extra",
-				User::PAGE_FLAGS_COMMUNITY);
+				LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid`
+				WHERE `is-default` $publish AND NOT `user`.`blocked` AND NOT `user`.`account_removed` `user`.`page-flags` = 2 $sql_extra");
 	if (DBA::isResult($cnt)) {
 		$total = $cnt['total'];
 	}
 
-	$pager = new Pager(DI::l10n(), DI::args()->getQueryString(), 60);
+	$pager = new Pager($a->query_string, 60);
 
 	$order = " ORDER BY `name` ASC ";
 
 	$limit = $pager->getStart()."," . $pager->getItemsPerPage();
 
-	$r = DBA::p("SELECT `profile`.*, `user`.`nickname`, `user`.`timezone` , `user`.`page-flags`,
-			`contact`.`addr`, `contact`.`url` FROM `profile`
-			INNER JOIN `user` ON `user`.`uid` = `profile`.`uid`
-			INNER JOIN `contact` ON `contact`.`uid` = `user`.`uid`
-			WHERE $publish AND NOT `user`.`blocked` AND NOT `user`.`account_removed` AND `user`.`page-flags` = ? AND `contact`.`self`
-			$sql_extra $order LIMIT $limit", User::PAGE_FLAGS_COMMUNITY
+	$r = DBA::p("SELECT `profile`.*, `profile`.`uid` AS `profile_uid`, `user`.`nickname`, `user`.`timezone` , `user`.`page-flags`,
+			`contact`.`addr`, `contact`.`url` AS `profile_url` FROM `profile`
+			LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid`
+			LEFT JOIN `contact` ON `contact`.`uid` = `user`.`uid`
+			WHERE `is-default` $publish AND NOT `user`.`blocked` AND NOT `user`.`account_removed` AND `user`.`page-flags` = 2 AND `contact`.`self`
+			$sql_extra $order LIMIT $limit"
 	);
 
 	if (DBA::isResult($r)) {
-		if (in_array('small', DI::args()->getArgv())) {
+		if (in_array('small', $a->argv)) {
 			$photo = 'thumb';
 		} else {
 			$photo = 'photo';
@@ -136,21 +133,21 @@ function forumdirectory_content()
 		}
 		DBA::close($r);
 	} else {
-		DI::sysmsg()->addNotice(DI::l10n()->t("No entries \x28some entries may be hidden\x29."));
+		info(L10n::t("No entries \x28some entries may be hidden\x29.") . EOL);
 	}
 
 	$tpl = Renderer::getMarkupTemplate('directory_header.tpl');
 	$o .= Renderer::replaceMacros($tpl, [
 		'$search'     => $search,
-		'$globaldir'  => DI::l10n()->t('Global Directory'),
+		'$globaldir'  => L10n::t('Global Directory'),
 		'$gdirpath'   => $gdirpath,
-		'$desc'       => DI::l10n()->t('Find on this site'),
+		'$desc'       => L10n::t('Find on this site'),
 		'$contacts'   => $entries,
-		'$finding'    => DI::l10n()->t('Results for:'),
+		'$finding'    => L10n::t('Results for:'),
 		'$findterm'   => (strlen($search) ? $search : ""),
-		'$title'      => DI::l10n()->t('Forum Directory'),
+		'$title'      => L10n::t('Forum Directory'),
 		'$search_mod' => 'forumdirectory',
-		'$submit'     => DI::l10n()->t('Find'),
+		'$submit'     => L10n::t('Find'),
 		'$paginate'   => $pager->renderFull($total),
 	]);
 
diff --git a/forumdirectory/lang/C/messages.po b/forumdirectory/lang/C/messages.po
index 5beaff0b..fa467fea 100644
--- a/forumdirectory/lang/C/messages.po
+++ b/forumdirectory/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: forumdirectory.php:33 forumdirectory.php:137
+#: forumdirectory.php:22
 msgid "Forum Directory"
 msgstr ""
 
@@ -25,22 +25,54 @@ msgstr ""
 msgid "Public access denied."
 msgstr ""
 
-#: forumdirectory.php:125
-msgid "No entries (some entries may be hidden)."
-msgstr ""
-
-#: forumdirectory.php:131
+#: forumdirectory.php:71
 msgid "Global Directory"
 msgstr ""
 
-#: forumdirectory.php:133
+#: forumdirectory.php:79
 msgid "Find on this site"
 msgstr ""
 
-#: forumdirectory.php:135
-msgid "Results for:"
+#: forumdirectory.php:81
+msgid "Finding: "
 msgstr ""
 
-#: forumdirectory.php:139
+#: forumdirectory.php:82
+msgid "Site Directory"
+msgstr ""
+
+#: forumdirectory.php:83
 msgid "Find"
 msgstr ""
+
+#: forumdirectory.php:133
+msgid "Age: "
+msgstr ""
+
+#: forumdirectory.php:136
+msgid "Gender: "
+msgstr ""
+
+#: forumdirectory.php:156
+msgid "Location:"
+msgstr ""
+
+#: forumdirectory.php:158
+msgid "Gender:"
+msgstr ""
+
+#: forumdirectory.php:160
+msgid "Status:"
+msgstr ""
+
+#: forumdirectory.php:162
+msgid "Homepage:"
+msgstr ""
+
+#: forumdirectory.php:164
+msgid "About:"
+msgstr ""
+
+#: forumdirectory.php:201
+msgid "No entries (some entries may be hidden)."
+msgstr ""
diff --git a/forumdirectory/lang/ar/messages.po b/forumdirectory/lang/ar/messages.po
deleted file mode 100644
index 24380f0f..00000000
--- a/forumdirectory/lang/ar/messages.po
+++ /dev/null
@@ -1,50 +0,0 @@
-# ADDON forumdirectory
-# Copyright (C)
-# This file is distributed under the same license as the Friendica forumdirectory addon package.
-# 
-# 
-# Translators:
-# abidin toumi <abidin24@tutanota.com>, 2021
-# ButterflyOfFire, 2019
-# Farida Khalaf <faridakhalaf@hotmail.com>, 2021
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2021-10-29 10:27+0000\n"
-"Last-Translator: abidin toumi <abidin24@tutanota.com>\n"
-"Language-Team: Arabic (http://www.transifex.com/Friendica/friendica/language/ar/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ar\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-
-#: forumdirectory.php:33 forumdirectory.php:137
-msgid "Forum Directory"
-msgstr "دليل المنتدى"
-
-#: forumdirectory.php:53
-msgid "Public access denied."
-msgstr "رُفض الوصول العمومي."
-
-#: forumdirectory.php:125
-msgid "No entries (some entries may be hidden)."
-msgstr "لا توجد مدخلات (قد تكون بعض المدخلات مخفية)."
-
-#: forumdirectory.php:131
-msgid "Global Directory"
-msgstr "الدليل العالمي"
-
-#: forumdirectory.php:133
-msgid "Find on this site"
-msgstr "ابحث في هذا الموقع"
-
-#: forumdirectory.php:135
-msgid "Results for:"
-msgstr "النتائج:"
-
-#: forumdirectory.php:139
-msgid "Find"
-msgstr "ابحث"
diff --git a/forumdirectory/lang/ar/strings.php b/forumdirectory/lang/ar/strings.php
deleted file mode 100644
index eb6f3077..00000000
--- a/forumdirectory/lang/ar/strings.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_ar")) {
-function string_plural_select_ar($n){
-	$n = intval($n);
-	if ($n==0) { return 0; } else if ($n==1) { return 1; } else if ($n==2) { return 2; } else if ($n%100>=3 && $n%100<=10) { return 3; } else if ($n%100>=11 && $n%100<=99) { return 4; } else  { return 5; }
-}}
-$a->strings['Forum Directory'] = 'دليل المنتدى';
-$a->strings['Public access denied.'] = 'رُفض الوصول العمومي.';
-$a->strings['No entries (some entries may be hidden).'] = 'لا توجد مدخلات (قد تكون بعض المدخلات مخفية).';
-$a->strings['Global Directory'] = 'الدليل العالمي';
-$a->strings['Find on this site'] = 'ابحث في هذا الموقع';
-$a->strings['Results for:'] = 'النتائج:';
-$a->strings['Find'] = 'ابحث';
diff --git a/forumdirectory/lang/ca/strings.php b/forumdirectory/lang/ca/strings.php
index 07a39488..b8ba9d62 100644
--- a/forumdirectory/lang/ca/strings.php
+++ b/forumdirectory/lang/ca/strings.php
@@ -3,20 +3,21 @@
 if(! function_exists("string_plural_select_ca")) {
 function string_plural_select_ca($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Forum Directory'] = 'Directori de fòrums';
-$a->strings['Public access denied.'] = 'L\'accés al públic s\'ha denegat.';
-$a->strings['Global Directory'] = 'Directori global';
-$a->strings['Find on this site'] = 'Cerqueu en aquest lloc';
-$a->strings['Finding: '] = 'Trobament:';
-$a->strings['Site Directory'] = 'Directori de llocs';
-$a->strings['Find'] = 'trobar';
-$a->strings['Age: '] = 'Edat:';
-$a->strings['Gender: '] = 'Gènere:';
-$a->strings['Location:'] = 'Ubicació:';
-$a->strings['Gender:'] = 'Gènere:';
-$a->strings['Status:'] = 'Estat:';
-$a->strings['Homepage:'] = 'Pàgina inicial:';
-$a->strings['About:'] = 'Sobre:';
-$a->strings['No entries (some entries may be hidden).'] = 'No hi ha entrades (algunes entrades poden estar ocultes).';
+;
+$a->strings["Forum Directory"] = "Directori de fòrums";
+$a->strings["Public access denied."] = "L'accés al públic s'ha denegat.";
+$a->strings["Global Directory"] = "Directori global";
+$a->strings["Find on this site"] = "Cerqueu en aquest lloc";
+$a->strings["Finding: "] = "Trobament:";
+$a->strings["Site Directory"] = "Directori de llocs";
+$a->strings["Find"] = "trobar";
+$a->strings["Age: "] = "Edat:";
+$a->strings["Gender: "] = "Gènere:";
+$a->strings["Location:"] = "Ubicació:";
+$a->strings["Gender:"] = "Gènere:";
+$a->strings["Status:"] = "Estat:";
+$a->strings["Homepage:"] = "Pàgina inicial:";
+$a->strings["About:"] = "Sobre:";
+$a->strings["No entries (some entries may be hidden)."] = "No hi ha entrades (algunes entrades poden estar ocultes).";
diff --git a/forumdirectory/lang/cs/strings.php b/forumdirectory/lang/cs/strings.php
index 2e7d6378..f438ade9 100644
--- a/forumdirectory/lang/cs/strings.php
+++ b/forumdirectory/lang/cs/strings.php
@@ -3,20 +3,21 @@
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
 	$n = intval($n);
-	if (($n == 1 && $n % 1 == 0)) { return 0; } else if (($n >= 2 && $n <= 4 && $n % 1 == 0)) { return 1; } else if (($n % 1 != 0 )) { return 2; } else  { return 3; }
+	return ($n == 1 && $n % 1 == 0) ? 0 : ($n >= 2 && $n <= 4 && $n % 1 == 0) ? 1: ($n % 1 != 0 ) ? 2 : 3;;
 }}
-$a->strings['Forum Directory'] = 'Adresář fór';
-$a->strings['Public access denied.'] = 'Veřejný přístup odepřen.';
-$a->strings['Global Directory'] = 'Globální adresář';
-$a->strings['Find on this site'] = 'Najít na tomto webu';
-$a->strings['Finding: '] = 'Hledání: ';
-$a->strings['Site Directory'] = 'Adresář serveru';
-$a->strings['Find'] = 'Najít';
-$a->strings['Age: '] = 'Věk: ';
-$a->strings['Gender: '] = 'Pohlaví: ';
-$a->strings['Location:'] = 'Poloha:';
-$a->strings['Gender:'] = 'Pohlaví:';
-$a->strings['Status:'] = 'Stav:';
-$a->strings['Homepage:'] = 'Domovská stránka:';
-$a->strings['About:'] = 'O mě:';
-$a->strings['No entries (some entries may be hidden).'] = 'Žádné záznamy (některé položky mohou být skryty).';
+;
+$a->strings["Forum Directory"] = "Adresář fór";
+$a->strings["Public access denied."] = "Veřejný přístup odepřen.";
+$a->strings["Global Directory"] = "Globální adresář";
+$a->strings["Find on this site"] = "Najít na tomto webu";
+$a->strings["Finding: "] = "Hledání: ";
+$a->strings["Site Directory"] = "Adresář serveru";
+$a->strings["Find"] = "Najít";
+$a->strings["Age: "] = "Věk: ";
+$a->strings["Gender: "] = "Pohlaví: ";
+$a->strings["Location:"] = "Poloha:";
+$a->strings["Gender:"] = "Pohlaví:";
+$a->strings["Status:"] = "Stav:";
+$a->strings["Homepage:"] = "Domovská stránka:";
+$a->strings["About:"] = "O mě:";
+$a->strings["No entries (some entries may be hidden)."] = "Žádné záznamy (některé položky mohou být skryty).";
diff --git a/forumdirectory/lang/da-dk/messages.po b/forumdirectory/lang/da-dk/messages.po
deleted file mode 100644
index 882c896e..00000000
--- a/forumdirectory/lang/da-dk/messages.po
+++ /dev/null
@@ -1,48 +0,0 @@
-# ADDON forumdirectory
-# Copyright (C)
-# This file is distributed under the same license as the Friendica forumdirectory addon package.
-# 
-# 
-# Translators:
-# Anton <dev@atjn.dk>, 2022
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2014-06-22 12:31+0000\n"
-"Last-Translator: Anton <dev@atjn.dk>, 2022\n"
-"Language-Team: Danish (Denmark) (http://www.transifex.com/Friendica/friendica/language/da_DK/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: da_DK\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: forumdirectory.php:33 forumdirectory.php:137
-msgid "Forum Directory"
-msgstr "Forum adressebog"
-
-#: forumdirectory.php:53
-msgid "Public access denied."
-msgstr "Offentlig adgang nægtet."
-
-#: forumdirectory.php:125
-msgid "No entries (some entries may be hidden)."
-msgstr "Ingen poster (nogle poster er måske skjulte)."
-
-#: forumdirectory.php:131
-msgid "Global Directory"
-msgstr "Global adressebog"
-
-#: forumdirectory.php:133
-msgid "Find on this site"
-msgstr "Find på denne side"
-
-#: forumdirectory.php:135
-msgid "Results for:"
-msgstr "Resultater for:"
-
-#: forumdirectory.php:139
-msgid "Find"
-msgstr "Find"
diff --git a/forumdirectory/lang/da-dk/strings.php b/forumdirectory/lang/da-dk/strings.php
deleted file mode 100644
index fecaed71..00000000
--- a/forumdirectory/lang/da-dk/strings.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_da_dk")) {
-function string_plural_select_da_dk($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Forum Directory'] = 'Forum adressebog';
-$a->strings['Public access denied.'] = 'Offentlig adgang nægtet.';
-$a->strings['No entries (some entries may be hidden).'] = 'Ingen poster (nogle poster er måske skjulte).';
-$a->strings['Global Directory'] = 'Global adressebog';
-$a->strings['Find on this site'] = 'Find på denne side';
-$a->strings['Results for:'] = 'Resultater for:';
-$a->strings['Find'] = 'Find';
diff --git a/forumdirectory/lang/de/messages.po b/forumdirectory/lang/de/messages.po
index 35ee4a55..21f4f10a 100644
--- a/forumdirectory/lang/de/messages.po
+++ b/forumdirectory/lang/de/messages.po
@@ -4,23 +4,22 @@
 # 
 # 
 # Translators:
-# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2014
-# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2021
+# bavatar <tobias.diekershoff@gmx.net>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2014-06-22 12:31+0000\n"
-"Last-Translator: Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2021\n"
-"Language-Team: German (http://app.transifex.com/Friendica/friendica/language/de/)\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2014-07-11 06:00+0000\n"
+"Last-Translator: bavatar <tobias.diekershoff@gmx.net>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/friendica/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: forumdirectory.php:33 forumdirectory.php:137
+#: forumdirectory.php:22
 msgid "Forum Directory"
 msgstr "Foren Verzeichnis"
 
@@ -28,22 +27,54 @@ msgstr "Foren Verzeichnis"
 msgid "Public access denied."
 msgstr "Öffentlicher Zugriff verweigert."
 
-#: forumdirectory.php:125
-msgid "No entries (some entries may be hidden)."
-msgstr "Keine Einträge (einige Einträge könnten versteckt sein)."
-
-#: forumdirectory.php:131
+#: forumdirectory.php:71
 msgid "Global Directory"
 msgstr "Weltweites Verzeichnis"
 
-#: forumdirectory.php:133
+#: forumdirectory.php:79
 msgid "Find on this site"
 msgstr "Auf diesem Server suchen"
 
-#: forumdirectory.php:135
-msgid "Results for:"
-msgstr "Ergebnis für:"
+#: forumdirectory.php:81
+msgid "Finding: "
+msgstr "Funde: "
 
-#: forumdirectory.php:139
+#: forumdirectory.php:82
+msgid "Site Directory"
+msgstr "Verzeichnis"
+
+#: forumdirectory.php:83
 msgid "Find"
 msgstr "Finde"
+
+#: forumdirectory.php:133
+msgid "Age: "
+msgstr "Alter: "
+
+#: forumdirectory.php:136
+msgid "Gender: "
+msgstr "Geschlecht:"
+
+#: forumdirectory.php:156
+msgid "Location:"
+msgstr "Ort:"
+
+#: forumdirectory.php:158
+msgid "Gender:"
+msgstr "Geschlecht:"
+
+#: forumdirectory.php:160
+msgid "Status:"
+msgstr "Status:"
+
+#: forumdirectory.php:162
+msgid "Homepage:"
+msgstr "Homepage:"
+
+#: forumdirectory.php:164
+msgid "About:"
+msgstr "Über:"
+
+#: forumdirectory.php:201
+msgid "No entries (some entries may be hidden)."
+msgstr "Keine Einträge (einige Einträge könnten versteckt sein)."
diff --git a/forumdirectory/lang/de/strings.php b/forumdirectory/lang/de/strings.php
index 081f3152..dfacc62d 100644
--- a/forumdirectory/lang/de/strings.php
+++ b/forumdirectory/lang/de/strings.php
@@ -2,13 +2,21 @@
 
 if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Forum Directory'] = 'Foren Verzeichnis';
-$a->strings['Public access denied.'] = 'Öffentlicher Zugriff verweigert.';
-$a->strings['No entries (some entries may be hidden).'] = 'Keine Einträge (einige Einträge könnten versteckt sein).';
-$a->strings['Global Directory'] = 'Weltweites Verzeichnis';
-$a->strings['Find on this site'] = 'Auf diesem Server suchen';
-$a->strings['Results for:'] = 'Ergebnis für:';
-$a->strings['Find'] = 'Finde';
+;
+$a->strings["Forum Directory"] = "Foren Verzeichnis";
+$a->strings["Public access denied."] = "Öffentlicher Zugriff verweigert.";
+$a->strings["Global Directory"] = "Weltweites Verzeichnis";
+$a->strings["Find on this site"] = "Auf diesem Server suchen";
+$a->strings["Finding: "] = "Funde: ";
+$a->strings["Site Directory"] = "Verzeichnis";
+$a->strings["Find"] = "Finde";
+$a->strings["Age: "] = "Alter: ";
+$a->strings["Gender: "] = "Geschlecht:";
+$a->strings["Location:"] = "Ort:";
+$a->strings["Gender:"] = "Geschlecht:";
+$a->strings["Status:"] = "Status:";
+$a->strings["Homepage:"] = "Homepage:";
+$a->strings["About:"] = "Über:";
+$a->strings["No entries (some entries may be hidden)."] = "Keine Einträge (einige Einträge könnten versteckt sein).";
diff --git a/forumdirectory/lang/es/messages.po b/forumdirectory/lang/es/messages.po
index 74948223..ae1f3a48 100644
--- a/forumdirectory/lang/es/messages.po
+++ b/forumdirectory/lang/es/messages.po
@@ -4,15 +4,14 @@
 # 
 # 
 # Translators:
-# Albert, 2016
-# Senex Petrovic <javierruizo@hotmail.com>, 2021
+# Alberto Díaz Tormo <albertodiaztormo@gmail.com>, 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2021-04-01 09:54+0000\n"
-"Last-Translator: Senex Petrovic <javierruizo@hotmail.com>\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2016-10-23 11:38+0000\n"
+"Last-Translator: Alberto Díaz Tormo <albertodiaztormo@gmail.com>\n"
 "Language-Team: Spanish (http://www.transifex.com/Friendica/friendica/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,7 +19,7 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: forumdirectory.php:33 forumdirectory.php:137
+#: forumdirectory.php:22
 msgid "Forum Directory"
 msgstr "Directorio de foro"
 
@@ -28,22 +27,54 @@ msgstr "Directorio de foro"
 msgid "Public access denied."
 msgstr "Acceso público denegado."
 
-#: forumdirectory.php:125
-msgid "No entries (some entries may be hidden)."
-msgstr "Sin entradas (algunas entradas pueden estar ocultas)."
-
-#: forumdirectory.php:131
+#: forumdirectory.php:71
 msgid "Global Directory"
 msgstr "Directorio global"
 
-#: forumdirectory.php:133
+#: forumdirectory.php:79
 msgid "Find on this site"
 msgstr "Encontrar en esta página"
 
-#: forumdirectory.php:135
-msgid "Results for:"
-msgstr "Resultados para:"
+#: forumdirectory.php:81
+msgid "Finding: "
+msgstr "Conclusión:"
 
-#: forumdirectory.php:139
+#: forumdirectory.php:82
+msgid "Site Directory"
+msgstr "Directorio de página"
+
+#: forumdirectory.php:83
 msgid "Find"
 msgstr "Encontrar"
+
+#: forumdirectory.php:133
+msgid "Age: "
+msgstr "Edad:"
+
+#: forumdirectory.php:136
+msgid "Gender: "
+msgstr "Género:"
+
+#: forumdirectory.php:156
+msgid "Location:"
+msgstr "Ubicación:"
+
+#: forumdirectory.php:158
+msgid "Gender:"
+msgstr "Género:"
+
+#: forumdirectory.php:160
+msgid "Status:"
+msgstr "Estado:"
+
+#: forumdirectory.php:162
+msgid "Homepage:"
+msgstr "Página inicial:"
+
+#: forumdirectory.php:164
+msgid "About:"
+msgstr "Sobre:"
+
+#: forumdirectory.php:201
+msgid "No entries (some entries may be hidden)."
+msgstr "Sin entradas (algunas entradas pueden estar ocultas)."
diff --git a/forumdirectory/lang/es/strings.php b/forumdirectory/lang/es/strings.php
index 4f1a59f1..03341780 100644
--- a/forumdirectory/lang/es/strings.php
+++ b/forumdirectory/lang/es/strings.php
@@ -2,13 +2,21 @@
 
 if(! function_exists("string_plural_select_es")) {
 function string_plural_select_es($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Forum Directory'] = 'Directorio de foro';
-$a->strings['Public access denied.'] = 'Acceso público denegado.';
-$a->strings['No entries (some entries may be hidden).'] = 'Sin entradas (algunas entradas pueden estar ocultas).';
-$a->strings['Global Directory'] = 'Directorio global';
-$a->strings['Find on this site'] = 'Encontrar en esta página';
-$a->strings['Results for:'] = 'Resultados para:';
-$a->strings['Find'] = 'Encontrar';
+;
+$a->strings["Forum Directory"] = "Directorio de foro";
+$a->strings["Public access denied."] = "Acceso público denegado.";
+$a->strings["Global Directory"] = "Directorio global";
+$a->strings["Find on this site"] = "Encontrar en esta página";
+$a->strings["Finding: "] = "Conclusión:";
+$a->strings["Site Directory"] = "Directorio de página";
+$a->strings["Find"] = "Encontrar";
+$a->strings["Age: "] = "Edad:";
+$a->strings["Gender: "] = "Género:";
+$a->strings["Location:"] = "Ubicación:";
+$a->strings["Gender:"] = "Género:";
+$a->strings["Status:"] = "Estado:";
+$a->strings["Homepage:"] = "Página inicial:";
+$a->strings["About:"] = "Sobre:";
+$a->strings["No entries (some entries may be hidden)."] = "Sin entradas (algunas entradas pueden estar ocultas).";
diff --git a/forumdirectory/lang/fi-fi/strings.php b/forumdirectory/lang/fi-fi/strings.php
index 70657d3c..dfe4a7ec 100644
--- a/forumdirectory/lang/fi-fi/strings.php
+++ b/forumdirectory/lang/fi-fi/strings.php
@@ -3,19 +3,21 @@
 if(! function_exists("string_plural_select_fi_fi")) {
 function string_plural_select_fi_fi($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Forum Directory'] = 'Foorumihakemisto';
-$a->strings['Public access denied.'] = 'Julkinen käyttö estetty.';
-$a->strings['Global Directory'] = 'Maailmanlaajuinen hakemisto';
-$a->strings['Find on this site'] = 'Sivustohaku';
-$a->strings['Site Directory'] = 'Sivustoluettelo';
-$a->strings['Find'] = 'Etsi';
-$a->strings['Age: '] = 'Ikä:';
-$a->strings['Gender: '] = 'Sukupuoli:';
-$a->strings['Location:'] = 'Sijainti:';
-$a->strings['Gender:'] = 'Sukupuoli:';
-$a->strings['Status:'] = 'Tila:';
-$a->strings['Homepage:'] = 'Kotisivu:';
-$a->strings['About:'] = 'Lisätietoja:';
-$a->strings['No entries (some entries may be hidden).'] = 'Ei kohteita (jotkut kohteet saattaa olla piilotettuja).';
+;
+$a->strings["Forum Directory"] = "Foorumihakemisto";
+$a->strings["Public access denied."] = "Julkinen käyttö estetty.";
+$a->strings["Global Directory"] = "Maailmanlaajuinen hakemisto";
+$a->strings["Find on this site"] = "Sivustohaku";
+$a->strings["Finding: "] = "";
+$a->strings["Site Directory"] = "Sivustoluettelo";
+$a->strings["Find"] = "Etsi";
+$a->strings["Age: "] = "Ikä:";
+$a->strings["Gender: "] = "Sukupuoli:";
+$a->strings["Location:"] = "Sijainti:";
+$a->strings["Gender:"] = "Sukupuoli:";
+$a->strings["Status:"] = "Tila:";
+$a->strings["Homepage:"] = "Kotisivu:";
+$a->strings["About:"] = "Lisätietoja:";
+$a->strings["No entries (some entries may be hidden)."] = "Ei kohteita (jotkut kohteet saattaa olla piilotettuja).";
diff --git a/forumdirectory/lang/fr/messages.po b/forumdirectory/lang/fr/messages.po
index 7f9e2458..da0a8859 100644
--- a/forumdirectory/lang/fr/messages.po
+++ b/forumdirectory/lang/fr/messages.po
@@ -4,25 +4,24 @@
 # 
 # 
 # Translators:
-# bob lebonche <lebonche@tutanota.com>, 2021
 # Hypolite Petovan <hypolite@mrpetovan.com>, 2016
 # StefOfficiel <pichard.stephane@free.fr>, 2015
-# Valvin <vincent-forum@valvin.fr>, 2019
+# Valvin A <vincent-forum@valvin.fr>, 2019
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2014-06-22 12:31+0000\n"
-"Last-Translator: bob lebonche <lebonche@tutanota.com>, 2021\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2019-05-27 19:17+0000\n"
+"Last-Translator: Valvin A <vincent-forum@valvin.fr>\n"
 "Language-Team: French (http://www.transifex.com/Friendica/friendica/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fr\n"
-"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: forumdirectory.php:33 forumdirectory.php:137
+#: forumdirectory.php:22
 msgid "Forum Directory"
 msgstr "Annuaire de Forums"
 
@@ -30,22 +29,54 @@ msgstr "Annuaire de Forums"
 msgid "Public access denied."
 msgstr "Accès public refusé."
 
-#: forumdirectory.php:125
-msgid "No entries (some entries may be hidden)."
-msgstr "Pas de résultats (certains résultats peuvent être cachés)."
-
-#: forumdirectory.php:131
+#: forumdirectory.php:71
 msgid "Global Directory"
 msgstr "Annuaire Global"
 
-#: forumdirectory.php:133
+#: forumdirectory.php:79
 msgid "Find on this site"
 msgstr "Trouver sur cette instance"
 
-#: forumdirectory.php:135
-msgid "Results for:"
-msgstr "Résultats pour :"
+#: forumdirectory.php:81
+msgid "Finding: "
+msgstr "Résultats:"
 
-#: forumdirectory.php:139
+#: forumdirectory.php:82
+msgid "Site Directory"
+msgstr "Annuaire de l'instance"
+
+#: forumdirectory.php:83
 msgid "Find"
 msgstr "Chercher"
+
+#: forumdirectory.php:133
+msgid "Age: "
+msgstr "Age:"
+
+#: forumdirectory.php:136
+msgid "Gender: "
+msgstr "Genre:"
+
+#: forumdirectory.php:156
+msgid "Location:"
+msgstr "Localisation:"
+
+#: forumdirectory.php:158
+msgid "Gender:"
+msgstr "Genre:"
+
+#: forumdirectory.php:160
+msgid "Status:"
+msgstr "Statut:"
+
+#: forumdirectory.php:162
+msgid "Homepage:"
+msgstr "Page d'accueil:"
+
+#: forumdirectory.php:164
+msgid "About:"
+msgstr "À-propos:"
+
+#: forumdirectory.php:201
+msgid "No entries (some entries may be hidden)."
+msgstr "Pas de résultats (certains résultats peuvent être cachés)."
diff --git a/forumdirectory/lang/fr/strings.php b/forumdirectory/lang/fr/strings.php
index ac0e2323..6c71b096 100644
--- a/forumdirectory/lang/fr/strings.php
+++ b/forumdirectory/lang/fr/strings.php
@@ -3,12 +3,21 @@
 if(! function_exists("string_plural_select_fr")) {
 function string_plural_select_fr($n){
 	$n = intval($n);
-	if (($n == 0 || $n == 1)) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
+	return ($n > 1);;
 }}
-$a->strings['Forum Directory'] = 'Annuaire de Forums';
-$a->strings['Public access denied.'] = 'Accès public refusé.';
-$a->strings['No entries (some entries may be hidden).'] = 'Pas de résultats (certains résultats peuvent être cachés).';
-$a->strings['Global Directory'] = 'Annuaire Global';
-$a->strings['Find on this site'] = 'Trouver sur cette instance';
-$a->strings['Results for:'] = 'Résultats pour :';
-$a->strings['Find'] = 'Chercher';
+;
+$a->strings["Forum Directory"] = "Annuaire de Forums";
+$a->strings["Public access denied."] = "Accès public refusé.";
+$a->strings["Global Directory"] = "Annuaire Global";
+$a->strings["Find on this site"] = "Trouver sur cette instance";
+$a->strings["Finding: "] = "Résultats:";
+$a->strings["Site Directory"] = "Annuaire de l'instance";
+$a->strings["Find"] = "Chercher";
+$a->strings["Age: "] = "Age:";
+$a->strings["Gender: "] = "Genre:";
+$a->strings["Location:"] = "Localisation:";
+$a->strings["Gender:"] = "Genre:";
+$a->strings["Status:"] = "Statut:";
+$a->strings["Homepage:"] = "Page d'accueil:";
+$a->strings["About:"] = "À-propos:";
+$a->strings["No entries (some entries may be hidden)."] = "Pas de résultats (certains résultats peuvent être cachés).";
diff --git a/forumdirectory/lang/hu/messages.po b/forumdirectory/lang/hu/messages.po
deleted file mode 100644
index 996d310c..00000000
--- a/forumdirectory/lang/hu/messages.po
+++ /dev/null
@@ -1,48 +0,0 @@
-# ADDON forumdirectory
-# Copyright (C)
-# This file is distributed under the same license as the Friendica forumdirectory addon package.
-# 
-# 
-# Translators:
-# Balázs Úr, 2020-2021
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2014-06-22 12:31+0000\n"
-"Last-Translator: Balázs Úr, 2020-2021\n"
-"Language-Team: Hungarian (http://www.transifex.com/Friendica/friendica/language/hu/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: hu\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: forumdirectory.php:33 forumdirectory.php:137
-msgid "Forum Directory"
-msgstr "Fórumkönyvtár"
-
-#: forumdirectory.php:53
-msgid "Public access denied."
-msgstr "Nyilvános hozzáférés megtagadva."
-
-#: forumdirectory.php:125
-msgid "No entries (some entries may be hidden)."
-msgstr "Nincsenek bejegyzések (néhány bejegyzés rejtve lehet)."
-
-#: forumdirectory.php:131
-msgid "Global Directory"
-msgstr "Globális könyvtár"
-
-#: forumdirectory.php:133
-msgid "Find on this site"
-msgstr "Keresés ezen az oldalon"
-
-#: forumdirectory.php:135
-msgid "Results for:"
-msgstr "Találatok ehhez:"
-
-#: forumdirectory.php:139
-msgid "Find"
-msgstr "Keresés"
diff --git a/forumdirectory/lang/hu/strings.php b/forumdirectory/lang/hu/strings.php
deleted file mode 100644
index 290cf7ed..00000000
--- a/forumdirectory/lang/hu/strings.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_hu")) {
-function string_plural_select_hu($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Forum Directory'] = 'Fórumkönyvtár';
-$a->strings['Public access denied.'] = 'Nyilvános hozzáférés megtagadva.';
-$a->strings['No entries (some entries may be hidden).'] = 'Nincsenek bejegyzések (néhány bejegyzés rejtve lehet).';
-$a->strings['Global Directory'] = 'Globális könyvtár';
-$a->strings['Find on this site'] = 'Keresés ezen az oldalon';
-$a->strings['Results for:'] = 'Találatok ehhez:';
-$a->strings['Find'] = 'Keresés';
diff --git a/forumdirectory/lang/it/messages.po b/forumdirectory/lang/it/messages.po
index 8e3e5fa3..99fbee13 100644
--- a/forumdirectory/lang/it/messages.po
+++ b/forumdirectory/lang/it/messages.po
@@ -5,14 +5,13 @@
 # 
 # Translators:
 # fabrixxm <fabrix.xm@gmail.com>, 2014
-# Sylke Vicious <silkevicious@gmail.com>, 2021
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2021-02-16 12:56+0000\n"
-"Last-Translator: Sylke Vicious <silkevicious@gmail.com>\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2017-09-20 06:07+0000\n"
+"Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,7 +19,7 @@ msgstr ""
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: forumdirectory.php:33 forumdirectory.php:137
+#: forumdirectory.php:22
 msgid "Forum Directory"
 msgstr "Elenco Forum"
 
@@ -28,22 +27,54 @@ msgstr "Elenco Forum"
 msgid "Public access denied."
 msgstr "Accesso negato."
 
-#: forumdirectory.php:125
-msgid "No entries (some entries may be hidden)."
-msgstr "Nessuna voce (qualche voce potrebbe essere nascosta)."
-
-#: forumdirectory.php:131
+#: forumdirectory.php:71
 msgid "Global Directory"
 msgstr "Elenco globale"
 
-#: forumdirectory.php:133
+#: forumdirectory.php:79
 msgid "Find on this site"
 msgstr "Cerca nel sito"
 
-#: forumdirectory.php:135
-msgid "Results for:"
-msgstr "Risultati per:"
+#: forumdirectory.php:81
+msgid "Finding: "
+msgstr "Ricerca: "
 
-#: forumdirectory.php:139
+#: forumdirectory.php:82
+msgid "Site Directory"
+msgstr "Elenco del sito"
+
+#: forumdirectory.php:83
 msgid "Find"
 msgstr "Trova"
+
+#: forumdirectory.php:133
+msgid "Age: "
+msgstr "Età : "
+
+#: forumdirectory.php:136
+msgid "Gender: "
+msgstr "Genere:"
+
+#: forumdirectory.php:156
+msgid "Location:"
+msgstr "Posizione:"
+
+#: forumdirectory.php:158
+msgid "Gender:"
+msgstr "Genere:"
+
+#: forumdirectory.php:160
+msgid "Status:"
+msgstr "Stato:"
+
+#: forumdirectory.php:162
+msgid "Homepage:"
+msgstr "Homepage:"
+
+#: forumdirectory.php:164
+msgid "About:"
+msgstr "Informazioni:"
+
+#: forumdirectory.php:201
+msgid "No entries (some entries may be hidden)."
+msgstr "Nessuna voce (qualche voce potrebbe essere nascosta)."
diff --git a/forumdirectory/lang/it/strings.php b/forumdirectory/lang/it/strings.php
index 4378cec3..48ad5f49 100644
--- a/forumdirectory/lang/it/strings.php
+++ b/forumdirectory/lang/it/strings.php
@@ -2,13 +2,21 @@
 
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Forum Directory'] = 'Elenco Forum';
-$a->strings['Public access denied.'] = 'Accesso negato.';
-$a->strings['No entries (some entries may be hidden).'] = 'Nessuna voce (qualche voce potrebbe essere nascosta).';
-$a->strings['Global Directory'] = 'Elenco globale';
-$a->strings['Find on this site'] = 'Cerca nel sito';
-$a->strings['Results for:'] = 'Risultati per:';
-$a->strings['Find'] = 'Trova';
+;
+$a->strings["Forum Directory"] = "Elenco Forum";
+$a->strings["Public access denied."] = "Accesso negato.";
+$a->strings["Global Directory"] = "Elenco globale";
+$a->strings["Find on this site"] = "Cerca nel sito";
+$a->strings["Finding: "] = "Ricerca: ";
+$a->strings["Site Directory"] = "Elenco del sito";
+$a->strings["Find"] = "Trova";
+$a->strings["Age: "] = "Età : ";
+$a->strings["Gender: "] = "Genere:";
+$a->strings["Location:"] = "Posizione:";
+$a->strings["Gender:"] = "Genere:";
+$a->strings["Status:"] = "Stato:";
+$a->strings["Homepage:"] = "Homepage:";
+$a->strings["About:"] = "Informazioni:";
+$a->strings["No entries (some entries may be hidden)."] = "Nessuna voce (qualche voce potrebbe essere nascosta).";
diff --git a/forumdirectory/lang/nl/strings.php b/forumdirectory/lang/nl/strings.php
index ae764ed7..ca340c15 100644
--- a/forumdirectory/lang/nl/strings.php
+++ b/forumdirectory/lang/nl/strings.php
@@ -3,20 +3,21 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Forum Directory'] = 'Forum index';
-$a->strings['Public access denied.'] = 'Publieke toegang geweigerd';
-$a->strings['Global Directory'] = 'Globaal overzicht';
-$a->strings['Find on this site'] = 'Zoeken';
-$a->strings['Finding: '] = 'Zoeken...';
-$a->strings['Site Directory'] = 'Site overzicht';
-$a->strings['Find'] = 'Zoek';
-$a->strings['Age: '] = 'Leeftijd:';
-$a->strings['Gender: '] = 'Geslacht:';
-$a->strings['Location:'] = 'Woonplaats:';
-$a->strings['Gender:'] = 'Geslacht:';
-$a->strings['Status:'] = 'Status:';
-$a->strings['Homepage:'] = 'Website:';
-$a->strings['About:'] = 'Over:';
-$a->strings['No entries (some entries may be hidden).'] = 'Geen berichten (sommige berichten kunnen verborgen zijn).';
+;
+$a->strings["Forum Directory"] = "Forum index";
+$a->strings["Public access denied."] = "Publieke toegang geweigerd";
+$a->strings["Global Directory"] = "Globaal overzicht";
+$a->strings["Find on this site"] = "Zoeken";
+$a->strings["Finding: "] = "Zoeken...";
+$a->strings["Site Directory"] = "Site overzicht";
+$a->strings["Find"] = "Zoek";
+$a->strings["Age: "] = "Leeftijd:";
+$a->strings["Gender: "] = "Geslacht:";
+$a->strings["Location:"] = "Woonplaats:";
+$a->strings["Gender:"] = "Geslacht:";
+$a->strings["Status:"] = "Status:";
+$a->strings["Homepage:"] = "Website:";
+$a->strings["About:"] = "Over:";
+$a->strings["No entries (some entries may be hidden)."] = "Geen berichten (sommige berichten kunnen verborgen zijn).";
diff --git a/forumdirectory/lang/pl/messages.po b/forumdirectory/lang/pl/messages.po
index 49226ac0..d0f056fb 100644
--- a/forumdirectory/lang/pl/messages.po
+++ b/forumdirectory/lang/pl/messages.po
@@ -5,15 +5,14 @@
 # 
 # Translators:
 # TORminator <dominik+foss@danelski.pl>, 2015
-# Piotr Strębski <strebski@gmail.com>, 2022
-# Waldemar Stoczkowski, 2018
+# Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2014-06-22 12:31+0000\n"
-"Last-Translator: Piotr Strębski <strebski@gmail.com>, 2022\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2018-04-18 20:34+0000\n"
+"Last-Translator: Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.com/Friendica/friendica/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,7 +20,7 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
-#: forumdirectory.php:33 forumdirectory.php:137
+#: forumdirectory.php:22
 msgid "Forum Directory"
 msgstr "Katalog forum"
 
@@ -29,22 +28,54 @@ msgstr "Katalog forum"
 msgid "Public access denied."
 msgstr "Odmowa dostępu publicznego."
 
-#: forumdirectory.php:125
-msgid "No entries (some entries may be hidden)."
-msgstr "Brak wpisów (niektóre wpisy mogą być ukryte)."
-
-#: forumdirectory.php:131
+#: forumdirectory.php:71
 msgid "Global Directory"
 msgstr "Globalny katalog"
 
-#: forumdirectory.php:133
+#: forumdirectory.php:79
 msgid "Find on this site"
 msgstr "Znajdź na tej stronie"
 
-#: forumdirectory.php:135
-msgid "Results for:"
-msgstr "Wyniki dla:"
+#: forumdirectory.php:81
+msgid "Finding: "
+msgstr "Odkrycie:"
 
-#: forumdirectory.php:139
+#: forumdirectory.php:82
+msgid "Site Directory"
+msgstr "Katalog Strony"
+
+#: forumdirectory.php:83
 msgid "Find"
 msgstr "Szukaj"
+
+#: forumdirectory.php:133
+msgid "Age: "
+msgstr "Wiek:"
+
+#: forumdirectory.php:136
+msgid "Gender: "
+msgstr "Płeć:"
+
+#: forumdirectory.php:156
+msgid "Location:"
+msgstr "Lokalizacja"
+
+#: forumdirectory.php:158
+msgid "Gender:"
+msgstr "Płeć:"
+
+#: forumdirectory.php:160
+msgid "Status:"
+msgstr "Status"
+
+#: forumdirectory.php:162
+msgid "Homepage:"
+msgstr "Strona główna:"
+
+#: forumdirectory.php:164
+msgid "About:"
+msgstr "O sobie:"
+
+#: forumdirectory.php:201
+msgid "No entries (some entries may be hidden)."
+msgstr "Brak wpisów (niektóre wpisy mogą być ukryte)."
diff --git a/forumdirectory/lang/pl/strings.php b/forumdirectory/lang/pl/strings.php
index 9bf60bd7..6b24f0b0 100644
--- a/forumdirectory/lang/pl/strings.php
+++ b/forumdirectory/lang/pl/strings.php
@@ -2,13 +2,21 @@
 
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
-	$n = intval($n);
-	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
+	return ($n==1 ? 0 : ($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14) ? 1 : $n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14) ? 2 : 3);;
 }}
-$a->strings['Forum Directory'] = 'Katalog forum';
-$a->strings['Public access denied.'] = 'Odmowa dostępu publicznego.';
-$a->strings['No entries (some entries may be hidden).'] = 'Brak wpisów (niektóre wpisy mogą być ukryte).';
-$a->strings['Global Directory'] = 'Globalny katalog';
-$a->strings['Find on this site'] = 'Znajdź na tej stronie';
-$a->strings['Results for:'] = 'Wyniki dla:';
-$a->strings['Find'] = 'Szukaj';
+;
+$a->strings["Forum Directory"] = "Katalog forum";
+$a->strings["Public access denied."] = "Odmowa dostępu publicznego.";
+$a->strings["Global Directory"] = "Globalny katalog";
+$a->strings["Find on this site"] = "Znajdź na tej stronie";
+$a->strings["Finding: "] = "Odkrycie:";
+$a->strings["Site Directory"] = "Katalog Strony";
+$a->strings["Find"] = "Szukaj";
+$a->strings["Age: "] = "Wiek:";
+$a->strings["Gender: "] = "Płeć:";
+$a->strings["Location:"] = "Lokalizacja";
+$a->strings["Gender:"] = "Płeć:";
+$a->strings["Status:"] = "Status";
+$a->strings["Homepage:"] = "Strona główna:";
+$a->strings["About:"] = "O sobie:";
+$a->strings["No entries (some entries may be hidden)."] = "Brak wpisów (niektóre wpisy mogą być ukryte).";
diff --git a/forumdirectory/lang/pt-br/strings.php b/forumdirectory/lang/pt-br/strings.php
index 8c6d216e..622568b6 100644
--- a/forumdirectory/lang/pt-br/strings.php
+++ b/forumdirectory/lang/pt-br/strings.php
@@ -2,21 +2,21 @@
 
 if(! function_exists("string_plural_select_pt_br")) {
 function string_plural_select_pt_br($n){
-	$n = intval($n);
-	return intval($n > 1);
+	return ($n > 1);;
 }}
-$a->strings['Forum Directory'] = 'Diretório de Fóruns';
-$a->strings['Public access denied.'] = 'Acesso do público negado.';
-$a->strings['Global Directory'] = 'Diretório Global';
-$a->strings['Find on this site'] = 'Procurar neste site';
-$a->strings['Finding: '] = 'Procurando:';
-$a->strings['Site Directory'] = 'Diretório do Site';
-$a->strings['Find'] = 'Procurar';
-$a->strings['Age: '] = 'Idade:';
-$a->strings['Gender: '] = 'Sexo:';
-$a->strings['Location:'] = 'Local:';
-$a->strings['Gender:'] = 'Sexo:';
-$a->strings['Status:'] = 'Estado:';
-$a->strings['Homepage:'] = 'Página principal:';
-$a->strings['About:'] = 'Sobre:';
-$a->strings['No entries (some entries may be hidden).'] = 'Sem resultados (alguns resultados podem estar ocultos).';
+;
+$a->strings["Forum Directory"] = "Diretório de Fóruns";
+$a->strings["Public access denied."] = "Acesso do público negado.";
+$a->strings["Global Directory"] = "Diretório Global";
+$a->strings["Find on this site"] = "Procurar neste site";
+$a->strings["Finding: "] = "Procurando:";
+$a->strings["Site Directory"] = "Diretório do Site";
+$a->strings["Find"] = "Procurar";
+$a->strings["Age: "] = "Idade:";
+$a->strings["Gender: "] = "Sexo:";
+$a->strings["Location:"] = "Local:";
+$a->strings["Gender:"] = "Sexo:";
+$a->strings["Status:"] = "Estado:";
+$a->strings["Homepage:"] = "Página principal:";
+$a->strings["About:"] = "Sobre:";
+$a->strings["No entries (some entries may be hidden)."] = "Sem resultados (alguns resultados podem estar ocultos).";
diff --git a/forumdirectory/lang/ro/strings.php b/forumdirectory/lang/ro/strings.php
index 750fe1e1..357904b2 100644
--- a/forumdirectory/lang/ro/strings.php
+++ b/forumdirectory/lang/ro/strings.php
@@ -2,21 +2,21 @@
 
 if(! function_exists("string_plural_select_ro")) {
 function string_plural_select_ro($n){
-	$n = intval($n);
-	if ($n==1) { return 0; } else if ((($n%100>19)||(($n%100==0)&&($n!=0)))) { return 2; } else  { return 1; }
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
 }}
-$a->strings['Forum Directory'] = 'Director Forum';
-$a->strings['Public access denied.'] = 'Acces public refuzat.';
-$a->strings['Global Directory'] = 'Director Global';
-$a->strings['Find on this site'] = 'Căutați pe acest site';
-$a->strings['Finding: '] = 'Căutare:';
-$a->strings['Site Directory'] = 'Director Site';
-$a->strings['Find'] = 'Căutați';
-$a->strings['Age: '] = 'Vârsta:';
-$a->strings['Gender: '] = 'Sex:';
-$a->strings['Location:'] = 'Locație:';
-$a->strings['Gender:'] = 'Sex:';
-$a->strings['Status:'] = 'Status:';
-$a->strings['Homepage:'] = 'Pagină web:';
-$a->strings['About:'] = 'Despre:';
-$a->strings['No entries (some entries may be hidden).'] = 'Fără înregistrări (unele înregistrări pot fi ascunse).';
+;
+$a->strings["Forum Directory"] = "Director Forum";
+$a->strings["Public access denied."] = "Acces public refuzat.";
+$a->strings["Global Directory"] = "Director Global";
+$a->strings["Find on this site"] = "Căutați pe acest site";
+$a->strings["Finding: "] = "Căutare:";
+$a->strings["Site Directory"] = "Director Site";
+$a->strings["Find"] = "Căutați";
+$a->strings["Age: "] = "Vârsta:";
+$a->strings["Gender: "] = "Sex:";
+$a->strings["Location:"] = "Locație:";
+$a->strings["Gender:"] = "Sex:";
+$a->strings["Status:"] = "Status:";
+$a->strings["Homepage:"] = "Pagină web:";
+$a->strings["About:"] = "Despre:";
+$a->strings["No entries (some entries may be hidden)."] = "Fără înregistrări (unele înregistrări pot fi ascunse).";
diff --git a/forumdirectory/lang/ru/strings.php b/forumdirectory/lang/ru/strings.php
index 54954d72..17e6b1f9 100644
--- a/forumdirectory/lang/ru/strings.php
+++ b/forumdirectory/lang/ru/strings.php
@@ -2,21 +2,21 @@
 
 if(! function_exists("string_plural_select_ru")) {
 function string_plural_select_ru($n){
-	$n = intval($n);
-	if ($n%10==1 && $n%100!=11) { return 0; } else if ($n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14)) { return 1; } else if ($n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)) { return 2; } else  { return 3; }
+	return ($n%10==1 && $n%100!=11 ? 0 : $n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14) ? 1 : $n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)? 2 : 3);;
 }}
-$a->strings['Forum Directory'] = 'Каталог форумов';
-$a->strings['Public access denied.'] = 'Свободный доступ закрыт.';
-$a->strings['Global Directory'] = 'Глобальный каталог';
-$a->strings['Find on this site'] = 'Найти на этом сайте';
-$a->strings['Finding: '] = 'Результат поиска: ';
-$a->strings['Site Directory'] = 'Каталог сайта';
-$a->strings['Find'] = 'Найти';
-$a->strings['Age: '] = 'Возраст: ';
-$a->strings['Gender: '] = 'Пол: ';
-$a->strings['Location:'] = 'Откуда:';
-$a->strings['Gender:'] = 'Пол:';
-$a->strings['Status:'] = 'Статус:';
-$a->strings['Homepage:'] = 'Домашняя страничка:';
-$a->strings['About:'] = 'О себе:';
-$a->strings['No entries (some entries may be hidden).'] = 'Нет записей (некоторые записи могут быть скрыты).';
+;
+$a->strings["Forum Directory"] = "Каталог форумов";
+$a->strings["Public access denied."] = "Свободный доступ закрыт.";
+$a->strings["Global Directory"] = "Глобальный каталог";
+$a->strings["Find on this site"] = "Найти на этом сайте";
+$a->strings["Finding: "] = "Результат поиска: ";
+$a->strings["Site Directory"] = "Каталог сайта";
+$a->strings["Find"] = "Найти";
+$a->strings["Age: "] = "Возраст: ";
+$a->strings["Gender: "] = "Пол: ";
+$a->strings["Location:"] = "Откуда:";
+$a->strings["Gender:"] = "Пол:";
+$a->strings["Status:"] = "Статус:";
+$a->strings["Homepage:"] = "Домашняя страничка:";
+$a->strings["About:"] = "О себе:";
+$a->strings["No entries (some entries may be hidden)."] = "Нет записей (некоторые записи могут быть скрыты).";
diff --git a/forumdirectory/lang/sv/messages.po b/forumdirectory/lang/sv/messages.po
deleted file mode 100644
index cf3ebfde..00000000
--- a/forumdirectory/lang/sv/messages.po
+++ /dev/null
@@ -1,49 +0,0 @@
-# ADDON forumdirectory
-# Copyright (C)
-# This file is distributed under the same license as the Friendica forumdirectory addon package.
-# 
-# 
-# Translators:
-# Hypolite Petovan <hypolite@mrpetovan.com>, 2019
-# Kristoffer Grundström <lovaren@gmail.com>, 2022
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2022-01-15 23:39+0000\n"
-"Last-Translator: Kristoffer Grundström <lovaren@gmail.com>\n"
-"Language-Team: Swedish (http://www.transifex.com/Friendica/friendica/language/sv/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: sv\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: forumdirectory.php:33 forumdirectory.php:137
-msgid "Forum Directory"
-msgstr "Forum-mapp"
-
-#: forumdirectory.php:53
-msgid "Public access denied."
-msgstr "Publik åtkomst nekades."
-
-#: forumdirectory.php:125
-msgid "No entries (some entries may be hidden)."
-msgstr "Inget att visa. (Man kan välja att inte synas här)"
-
-#: forumdirectory.php:131
-msgid "Global Directory"
-msgstr "Medlemskatalog för flera sajter (global)"
-
-#: forumdirectory.php:133
-msgid "Find on this site"
-msgstr "Hitta på den här sidan"
-
-#: forumdirectory.php:135
-msgid "Results for:"
-msgstr ""
-
-#: forumdirectory.php:139
-msgid "Find"
-msgstr "Sök"
diff --git a/forumdirectory/lang/sv/strings.php b/forumdirectory/lang/sv/strings.php
index 0f06eaa3..70a9ca5a 100644
--- a/forumdirectory/lang/sv/strings.php
+++ b/forumdirectory/lang/sv/strings.php
@@ -1,13 +1,14 @@
-<?php
-
-if(! function_exists("string_plural_select_sv")) {
-function string_plural_select_sv($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Forum Directory'] = 'Forum-mapp';
-$a->strings['Public access denied.'] = 'Publik åtkomst nekades.';
-$a->strings['No entries (some entries may be hidden).'] = 'Inget att visa. (Man kan välja att inte synas här)';
-$a->strings['Global Directory'] = 'Medlemskatalog för flera sajter (global)';
-$a->strings['Find on this site'] = 'Hitta på den här sidan';
-$a->strings['Find'] = 'Sök';
+<?php
+
+$a->strings["Global Directory"] = "Medlemskatalog f&ouml;r flera sajter (global)";
+$a->strings["Finding: "] = "Hittar: ";
+$a->strings["Site Directory"] = "Medlemskatalog";
+$a->strings["Find"] = "S&ouml;k";
+$a->strings["Age: "] = "&Aring;lder: ";
+$a->strings["Gender: "] = "K&ouml;n: ";
+$a->strings["Location:"] = "Plats:";
+$a->strings["Gender:"] = "K&ouml;n:";
+$a->strings["Status:"] = "Status:";
+$a->strings["Homepage:"] = "Hemsida:";
+$a->strings["About:"] = "Om:";
+$a->strings["No entries (some entries may be hidden)."] = "Inget att visa. (Man kan v&auml;lja att inte synas h&auml;r)";
diff --git a/fromapp/fromapp.css b/fromapp/fromapp.css
new file mode 100644
index 00000000..422624a1
--- /dev/null
+++ b/fromapp/fromapp.css
@@ -0,0 +1,14 @@
+
+
+
+#fromapp-label, #fromapp-force-label {
+	float: left;
+	width: 200px;
+	margin-bottom: 25px;
+}
+
+#fromapp-input, #fromapp-force {
+	float: left;
+}
+
+
diff --git a/fromapp/fromapp.php b/fromapp/fromapp.php
index 0d5a5b16..5c9b4454 100644
--- a/fromapp/fromapp.php
+++ b/fromapp/fromapp.php
@@ -6,65 +6,95 @@
  * Author: Commander Zot
  *
  */
-
-use Friendica\App;
 use Friendica\Core\Hook;
+use Friendica\Core\L10n;
 use Friendica\Core\Logger;
-use Friendica\Core\Renderer;
-use Friendica\DI;
+use Friendica\Core\PConfig;
 
 function fromapp_install()
 {
 	Hook::register('post_local', 'addon/fromapp/fromapp.php', 'fromapp_post_hook');
 	Hook::register('addon_settings', 'addon/fromapp/fromapp.php', 'fromapp_settings');
 	Hook::register('addon_settings_post', 'addon/fromapp/fromapp.php', 'fromapp_settings_post');
-	Logger::notice("installed fromapp");
+	Logger::log("installed fromapp");
 }
 
-function fromapp_settings_post($post)
-{
-	if (!DI::userSession()->getLocalUserId() || empty($_POST['fromapp-submit'])) {
-		return;
-	}
 
-	DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'fromapp', 'app', $_POST['fromapp-input']);
-	DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'fromapp', 'force', intval($_POST['fromapp-force']));
+function fromapp_uninstall()
+{
+	Hook::unregister('post_local', 'addon/fromapp/fromapp.php', 'fromapp_post_hook');
+	Hook::unregister('addon_settings', 'addon/fromapp/fromapp.php', 'fromapp_settings');
+	Hook::unregister('addon_settings_post', 'addon/fromapp/fromapp.php', 'fromapp_settings_post');
+	Logger::log("removed fromapp");
 }
 
-function fromapp_settings(array &$data)
+function fromapp_settings_post($a, $post)
 {
-	if (!DI::userSession()->getLocalUserId()) {
+	if (!local_user() || empty($_POST['fromapp-submit'])) {
 		return;
 	}
 
-	$fromapp = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'fromapp', 'app', '');
-	$force   = intval(DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'fromapp', 'force'));
+	PConfig::set(local_user(), 'fromapp', 'app', $_POST['fromapp-input']);
+	PConfig::set(local_user(), 'fromapp', 'force', intval($_POST['fromapp-force']));
 
-	$t    = Renderer::getMarkupTemplate('settings.tpl', 'addon/fromapp/');
-	$html = Renderer::replaceMacros($t, [
-		'$fromapp' => ['fromapp-input', DI::l10n()->t('The application name you would like to show your posts originating from. Separate different app names with a comma. A random one will then be selected for every posting.'), $fromapp],
-		'$force'   => ['fromapp-force', DI::l10n()->t('Use this application name even if another application was used.'), $force],
-	]);
-
-	$data = [
-		'addon' => 'fromapp',
-		'title' => DI::l10n()->t('FromApp Settings'),
-		'html'  => $html,
-	];
+	info(L10n::t('Fromapp settings updated.') . EOL);
 }
 
-function fromapp_post_hook(&$item)
+function fromapp_settings(&$a, &$s)
 {
-	if (!DI::userSession()->getLocalUserId()) {
+	if (!local_user()) {
 		return;
 	}
 
-	if (DI::userSession()->getLocalUserId() != $item['uid']) {
+	/* Add our stylesheet to the page so we can make our settings look nice */
+
+	$a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->getBaseURL() . '/addon/fromapp/fromapp.css' . '" media="all" />' . "\r\n";
+
+	/* Get the current state of our config variable */
+
+	$fromapp = PConfig::get(local_user(), 'fromapp', 'app', '');
+
+	$force = intval(PConfig::get(local_user(), 'fromapp', 'force'));
+
+	$force_enabled = (($force) ? ' checked="checked" ' : '');
+
+	
+	/* Add some HTML to the existing form */
+
+	$s .= '<span id="settings_fromapp_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_fromapp_expanded\'); openClose(\'settings_fromapp_inflated\');">';
+	$s .= '<h3>' . L10n::t('FromApp Settings') . '</h3>';
+	$s .= '</span>';
+	$s .= '<div id="settings_fromapp_expanded" class="settings-block" style="display: none;">';
+	$s .= '<span class="fakelink" onclick="openClose(\'settings_fromapp_expanded\'); openClose(\'settings_fromapp_inflated\');">';
+	$s .= '<h3>' . L10n::t('FromApp Settings') . '</h3>';
+	$s .= '</span>';
+	$s .= '<div id="fromapp-wrapper">';
+	$s .= '<label id="fromapp-label" for="fromapp-input">' . L10n::t('The application name you would like to show your posts originating from. Separate different app names with a comma. A random one will then be selected for every posting.') . '</label>';
+	$s .= '<input id="fromapp-input" type="text" name="fromapp-input" value="' . $fromapp . '" ' . '/>';
+	$s .= '<div class="clear"></div>';
+
+	$s .= '<label id="fromapp-force-label" for="fromapp-force">' . L10n::t('Use this application name even if another application was used.') . '</label>';
+	$s .= '<input id="fromapp-force" type="checkbox" name="fromapp-force" value="1" ' . $force_enabled . '/>';
+
+	$s .= '</div><div class="clear"></div>';
+
+	/* provide a submit button */
+
+	$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="fromapp-submit" class="settings-submit" value="' . L10n::t('Save Settings') . '" /></div></div>';
+}
+
+function fromapp_post_hook(&$a, &$item)
+{
+	if (! local_user()) {
 		return;
 	}
 
-	$app = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'fromapp', 'app');
-	$force = intval(DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'fromapp', 'force'));
+	if (local_user() != $item['uid']) {
+		return;
+	}
+
+	$app = PConfig::get(local_user(), 'fromapp', 'app');
+	$force = intval(PConfig::get(local_user(), 'fromapp', 'force'));
 
 	if (is_null($app) || (! strlen($app))) {
 		return;
diff --git a/fromapp/lang/C/messages.po b/fromapp/lang/C/messages.po
index ce4a7827..18f24e02 100644
--- a/fromapp/lang/C/messages.po
+++ b/fromapp/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:14-0500\n"
+"POT-Creation-Date: 2019-02-19 16:42+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,17 +17,25 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: fromapp.php:45
+#: fromapp.php:40
+msgid "Fromapp settings updated."
+msgstr ""
+
+#: fromapp.php:65 fromapp.php:69
+msgid "FromApp Settings"
+msgstr ""
+
+#: fromapp.php:72
 msgid ""
 "The application name you would like to show your posts originating from. "
 "Separate different app names with a comma. A random one will then be "
 "selected for every posting."
 msgstr ""
 
-#: fromapp.php:46
+#: fromapp.php:76
 msgid "Use this application name even if another application was used."
 msgstr ""
 
-#: fromapp.php:51
-msgid "FromApp Settings"
+#: fromapp.php:83
+msgid "Save Settings"
 msgstr ""
diff --git a/fromapp/lang/ar/messages.po b/fromapp/lang/ar/messages.po
deleted file mode 100644
index 5b85425a..00000000
--- a/fromapp/lang/ar/messages.po
+++ /dev/null
@@ -1,40 +0,0 @@
-# ADDON fromapp
-# Copyright (C)
-# This file is distributed under the same license as the Friendica fromapp addon package.
-# 
-# 
-# Translators:
-# abidin toumi <abidin24@tutanota.com>, 2021
-# Farida Khalaf <faridakhalaf@hotmail.com>, 2021
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2021-10-29 10:32+0000\n"
-"Last-Translator: abidin toumi <abidin24@tutanota.com>\n"
-"Language-Team: Arabic (http://www.transifex.com/Friendica/friendica/language/ar/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ar\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-
-#: fromapp.php:53 fromapp.php:57
-msgid "FromApp Settings"
-msgstr "من إعدادات التطبيق"
-
-#: fromapp.php:60
-msgid ""
-"The application name you would like to show your posts originating from. "
-"Separate different app names with a comma. A random one will then be "
-"selected for every posting."
-msgstr "اسم التطبيق الذي تود إظهار منشوراتك منه. \nافصل بين أسماء التطبيقات المختلفة بفاصلة.\n  سيتم اختيار اسم  واحد عشوائي لكل عملية نشر."
-
-#: fromapp.php:64
-msgid "Use this application name even if another application was used."
-msgstr "استخدم اسم هذا التطبيق حتى إذا تم استخدام تطبيق آخر."
-
-#: fromapp.php:71
-msgid "Save Settings"
-msgstr "احفظ الإعدادات"
diff --git a/fromapp/lang/ar/strings.php b/fromapp/lang/ar/strings.php
deleted file mode 100644
index d0608957..00000000
--- a/fromapp/lang/ar/strings.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_ar")) {
-function string_plural_select_ar($n){
-	$n = intval($n);
-	if ($n==0) { return 0; } else if ($n==1) { return 1; } else if ($n==2) { return 2; } else if ($n%100>=3 && $n%100<=10) { return 3; } else if ($n%100>=11 && $n%100<=99) { return 4; } else  { return 5; }
-}}
-$a->strings['FromApp Settings'] = 'من إعدادات التطبيق';
-$a->strings['The application name you would like to show your posts originating from. Separate different app names with a comma. A random one will then be selected for every posting.'] = 'اسم التطبيق الذي تود إظهار منشوراتك منه. 
-افصل بين أسماء التطبيقات المختلفة بفاصلة.
-  سيتم اختيار اسم  واحد عشوائي لكل عملية نشر.';
-$a->strings['Use this application name even if another application was used.'] = 'استخدم اسم هذا التطبيق حتى إذا تم استخدام تطبيق آخر.';
-$a->strings['Save Settings'] = 'احفظ الإعدادات';
diff --git a/fromapp/lang/ca/strings.php b/fromapp/lang/ca/strings.php
index f3ea0512..c24ff44d 100644
--- a/fromapp/lang/ca/strings.php
+++ b/fromapp/lang/ca/strings.php
@@ -3,10 +3,11 @@
 if(! function_exists("string_plural_select_ca")) {
 function string_plural_select_ca($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Fromapp settings updated.'] = 'S\'ha actualitzat la configuració de Fromapp';
-$a->strings['FromApp Settings'] = 'Configuració de FromApp';
-$a->strings['The application name you would like to show your posts originating from. Separate different app names with a comma. A random one will then be selected for every posting.'] = 'El nom de l\'aplicació que voleu mostrar de les vostres publicacions originàries. Separeu diferents noms d\'aplicacions amb una coma. A continuació, se seleccionarà un aleatori per a cada publicació.';
-$a->strings['Use this application name even if another application was used.'] = 'Utilitzeu aquest nom d’aplicació encara que s’hagi utilitzat una altra aplicació.';
-$a->strings['Save Settings'] = 'Desa la Configuració';
+;
+$a->strings["Fromapp settings updated."] = "S'ha actualitzat la configuració de Fromapp";
+$a->strings["FromApp Settings"] = "Configuració de FromApp";
+$a->strings["The application name you would like to show your posts originating from. Separate different app names with a comma. A random one will then be selected for every posting."] = "El nom de l'aplicació que voleu mostrar de les vostres publicacions originàries. Separeu diferents noms d'aplicacions amb una coma. A continuació, se seleccionarà un aleatori per a cada publicació.";
+$a->strings["Use this application name even if another application was used."] = "Utilitzeu aquest nom d’aplicació encara que s’hagi utilitzat una altra aplicació.";
+$a->strings["Save Settings"] = "Desa la Configuració";
diff --git a/fromapp/lang/cs/strings.php b/fromapp/lang/cs/strings.php
index 28482f40..a8024c13 100644
--- a/fromapp/lang/cs/strings.php
+++ b/fromapp/lang/cs/strings.php
@@ -3,10 +3,11 @@
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
 	$n = intval($n);
-	if (($n == 1 && $n % 1 == 0)) { return 0; } else if (($n >= 2 && $n <= 4 && $n % 1 == 0)) { return 1; } else if (($n % 1 != 0 )) { return 2; } else  { return 3; }
+	return ($n == 1 && $n % 1 == 0) ? 0 : ($n >= 2 && $n <= 4 && $n % 1 == 0) ? 1: ($n % 1 != 0 ) ? 2 : 3;;
 }}
-$a->strings['Fromapp settings updated.'] = 'Nastavení FromApp aktualizována.';
-$a->strings['FromApp Settings'] = 'Nastavení FromApp';
-$a->strings['The application name you would like to show your posts originating from. Separate different app names with a comma. A random one will then be selected for every posting.'] = 'Název aplikace, ze které píšete své příspěvky, kterou chcete zobrazovat. Oddělujte různé názvy aplikací čárkou. Pro každý příspěvek bude zvolena náhodná.';
-$a->strings['Use this application name even if another application was used.'] = 'Použít toto jméno aplikace, i když byla použita jiná aplikace';
-$a->strings['Save Settings'] = 'Uložit nastavení';
+;
+$a->strings["Fromapp settings updated."] = "Nastavení FromApp aktualizována.";
+$a->strings["FromApp Settings"] = "Nastavení FromApp";
+$a->strings["The application name you would like to show your posts originating from. Separate different app names with a comma. A random one will then be selected for every posting."] = "Název aplikace, ze které píšete své příspěvky, kterou chcete zobrazovat. Oddělujte různé názvy aplikací čárkou. Pro každý příspěvek bude zvolena náhodná.";
+$a->strings["Use this application name even if another application was used."] = "Použít toto jméno aplikace, i když byla použita jiná aplikace";
+$a->strings["Save Settings"] = "Uložit nastavení";
diff --git a/fromapp/lang/da-dk/messages.po b/fromapp/lang/da-dk/messages.po
deleted file mode 100644
index 8a7aaf02..00000000
--- a/fromapp/lang/da-dk/messages.po
+++ /dev/null
@@ -1,35 +0,0 @@
-# ADDON fromapp
-# Copyright (C)
-# This file is distributed under the same license as the Friendica fromapp addon package.
-# 
-# 
-# Translators:
-# Anton <dev@atjn.dk>, 2022
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:14-0500\n"
-"PO-Revision-Date: 2014-06-22 12:33+0000\n"
-"Last-Translator: Anton <dev@atjn.dk>, 2022\n"
-"Language-Team: Danish (Denmark) (http://www.transifex.com/Friendica/friendica/language/da_DK/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: da_DK\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: fromapp.php:45
-msgid ""
-"The application name you would like to show your posts originating from. "
-"Separate different app names with a comma. A random one will then be "
-"selected for every posting."
-msgstr "Det app navn du vil vise at dine opslag kommer fra. Separér forskellige app navne med et komma. Et tilfældigt navn vil så blive valgt til hvert opslag."
-
-#: fromapp.php:46
-msgid "Use this application name even if another application was used."
-msgstr "Brug dette app-navn, også selvom en anden app faktisk blev brugt."
-
-#: fromapp.php:51
-msgid "FromApp Settings"
-msgstr "FraApp Indstillinger"
diff --git a/fromapp/lang/da-dk/strings.php b/fromapp/lang/da-dk/strings.php
deleted file mode 100644
index 4e2bb036..00000000
--- a/fromapp/lang/da-dk/strings.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_da_dk")) {
-function string_plural_select_da_dk($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['The application name you would like to show your posts originating from. Separate different app names with a comma. A random one will then be selected for every posting.'] = 'Det app navn du vil vise at dine opslag kommer fra. Separér forskellige app navne med et komma. Et tilfældigt navn vil så blive valgt til hvert opslag.';
-$a->strings['Use this application name even if another application was used.'] = 'Brug dette app-navn, også selvom en anden app faktisk blev brugt.';
-$a->strings['FromApp Settings'] = 'FraApp Indstillinger';
diff --git a/fromapp/lang/de/messages.po b/fromapp/lang/de/messages.po
index fa4c8c63..96b5832e 100644
--- a/fromapp/lang/de/messages.po
+++ b/fromapp/lang/de/messages.po
@@ -12,27 +12,35 @@ msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:14-0500\n"
-"PO-Revision-Date: 2014-06-22 12:33+0000\n"
-"Last-Translator: Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2019\n"
-"Language-Team: German (http://app.transifex.com/Friendica/friendica/language/de/)\n"
+"POT-Creation-Date: 2019-02-19 16:42+0100\n"
+"PO-Revision-Date: 2019-02-21 05:57+0000\n"
+"Last-Translator: Tobias Diekershoff <tobias.diekershoff@gmx.net>\n"
+"Language-Team: German (http://www.transifex.com/Friendica/friendica/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: fromapp.php:45
+#: fromapp.php:40
+msgid "Fromapp settings updated."
+msgstr "Fromapp-Einstellungen aktualisiert."
+
+#: fromapp.php:65 fromapp.php:69
+msgid "FromApp Settings"
+msgstr "FromApp-Einstellungen"
+
+#: fromapp.php:72
 msgid ""
 "The application name you would like to show your posts originating from. "
 "Separate different app names with a comma. A random one will then be "
 "selected for every posting."
 msgstr "Der Name der Applikation der als Quelle deiner Beiträge angezeigt werden soll. Unterschiedliche Namen können mit einem Komma von einander getrennt werden. Ist mehr als ein Name angegeben, wird für jeden Beitrag ein zufälliger Name aus der Liste ausgewählt."
 
-#: fromapp.php:46
+#: fromapp.php:76
 msgid "Use this application name even if another application was used."
 msgstr "Verwende diesen Namen, selbst wenn eine andere Applikation verwendet wurde"
 
-#: fromapp.php:51
-msgid "FromApp Settings"
-msgstr "FromApp-Einstellungen"
+#: fromapp.php:83
+msgid "Save Settings"
+msgstr "Einstellungen speichern"
diff --git a/fromapp/lang/de/strings.php b/fromapp/lang/de/strings.php
index 00fd8ef0..abcf7bfb 100644
--- a/fromapp/lang/de/strings.php
+++ b/fromapp/lang/de/strings.php
@@ -3,8 +3,11 @@
 if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['The application name you would like to show your posts originating from. Separate different app names with a comma. A random one will then be selected for every posting.'] = 'Der Name der Applikation der als Quelle deiner Beiträge angezeigt werden soll. Unterschiedliche Namen können mit einem Komma von einander getrennt werden. Ist mehr als ein Name angegeben, wird für jeden Beitrag ein zufälliger Name aus der Liste ausgewählt.';
-$a->strings['Use this application name even if another application was used.'] = 'Verwende diesen Namen, selbst wenn eine andere Applikation verwendet wurde';
-$a->strings['FromApp Settings'] = 'FromApp-Einstellungen';
+;
+$a->strings["Fromapp settings updated."] = "Fromapp-Einstellungen aktualisiert.";
+$a->strings["FromApp Settings"] = "FromApp-Einstellungen";
+$a->strings["The application name you would like to show your posts originating from. Separate different app names with a comma. A random one will then be selected for every posting."] = "Der Name der Applikation der als Quelle deiner Beiträge angezeigt werden soll. Unterschiedliche Namen können mit einem Komma von einander getrennt werden. Ist mehr als ein Name angegeben, wird für jeden Beitrag ein zufälliger Name aus der Liste ausgewählt.";
+$a->strings["Use this application name even if another application was used."] = "Verwende diesen Namen, selbst wenn eine andere Applikation verwendet wurde";
+$a->strings["Save Settings"] = "Einstellungen speichern";
diff --git a/fromapp/lang/en-gb/strings.php b/fromapp/lang/en-gb/strings.php
index d68745f6..b2be2285 100644
--- a/fromapp/lang/en-gb/strings.php
+++ b/fromapp/lang/en-gb/strings.php
@@ -3,10 +3,11 @@
 if(! function_exists("string_plural_select_en_gb")) {
 function string_plural_select_en_gb($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Fromapp settings updated.'] = 'FromApp settings updated.';
-$a->strings['FromApp Settings'] = 'FromApp';
-$a->strings['The application name you would like to show your posts originating from. Separate different app names with a comma. A random one will then be selected for every posting.'] = 'The application name you would like to show your posts originating from. Separate different app names with a comma and a random one will be selected for every post.';
-$a->strings['Use this application name even if another application was used.'] = 'Use this application name even if another application was used.';
-$a->strings['Save Settings'] = 'Save settings';
+;
+$a->strings["Fromapp settings updated."] = "FromApp settings updated.";
+$a->strings["FromApp Settings"] = "FromApp";
+$a->strings["The application name you would like to show your posts originating from. Separate different app names with a comma. A random one will then be selected for every posting."] = "The application name you would like to show your posts originating from. Separate different app names with a comma and a random one will be selected for every post.";
+$a->strings["Use this application name even if another application was used."] = "Use this application name even if another application was used.";
+$a->strings["Save Settings"] = "Save settings";
diff --git a/fromapp/lang/es/messages.po b/fromapp/lang/es/messages.po
index 34234226..4abce4a8 100644
--- a/fromapp/lang/es/messages.po
+++ b/fromapp/lang/es/messages.po
@@ -4,15 +4,14 @@
 # 
 # 
 # Translators:
-# Albert, 2016
-# Senex Petrovic <javierruizo@hotmail.com>, 2021
+# Alberto Díaz Tormo <albertodiaztormo@gmail.com>, 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2021-04-01 09:55+0000\n"
-"Last-Translator: Senex Petrovic <javierruizo@hotmail.com>\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2016-10-23 13:48+0000\n"
+"Last-Translator: Alberto Díaz Tormo <albertodiaztormo@gmail.com>\n"
 "Language-Team: Spanish (http://www.transifex.com/Friendica/friendica/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,21 +19,23 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: fromapp.php:53 fromapp.php:57
+#: fromapp.php:38
+msgid "Fromapp settings updated."
+msgstr "Ajustes de Fromapp actualizados."
+
+#: fromapp.php:64
 msgid "FromApp Settings"
 msgstr "Ajustes de FromApp"
 
-#: fromapp.php:60
+#: fromapp.php:66
 msgid ""
-"The application name you would like to show your posts originating from. "
-"Separate different app names with a comma. A random one will then be "
-"selected for every posting."
-msgstr "El nombre de la aplicación desde la que le gustaría mostrar sus publicaciones. Separe los diferentes nombres de aplicaciones con una coma. Luego, se seleccionará uno al azar para cada publicación."
+"The application name you would like to show your posts originating from."
+msgstr "El nombre de la aplicación desde la que le gustaría que se mostrasen sus publicaciones."
 
-#: fromapp.php:64
+#: fromapp.php:70
 msgid "Use this application name even if another application was used."
 msgstr "Utilice este nombre de aplicación incluso si otra aplicación fue utilizada."
 
-#: fromapp.php:71
-msgid "Save Settings"
-msgstr "Guardar Ajustes"
+#: fromapp.php:77
+msgid "Submit"
+msgstr "Enviar"
diff --git a/fromapp/lang/es/strings.php b/fromapp/lang/es/strings.php
index 6f9a8133..84e1dcf8 100644
--- a/fromapp/lang/es/strings.php
+++ b/fromapp/lang/es/strings.php
@@ -2,10 +2,11 @@
 
 if(! function_exists("string_plural_select_es")) {
 function string_plural_select_es($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['FromApp Settings'] = 'Ajustes de FromApp';
-$a->strings['The application name you would like to show your posts originating from. Separate different app names with a comma. A random one will then be selected for every posting.'] = 'El nombre de la aplicación desde la que le gustaría mostrar sus publicaciones. Separe los diferentes nombres de aplicaciones con una coma. Luego, se seleccionará uno al azar para cada publicación.';
-$a->strings['Use this application name even if another application was used.'] = 'Utilice este nombre de aplicación incluso si otra aplicación fue utilizada.';
-$a->strings['Save Settings'] = 'Guardar Ajustes';
+;
+$a->strings["Fromapp settings updated."] = "Ajustes de Fromapp actualizados.";
+$a->strings["FromApp Settings"] = "Ajustes de FromApp";
+$a->strings["The application name you would like to show your posts originating from."] = "El nombre de la aplicación desde la que le gustaría que se mostrasen sus publicaciones.";
+$a->strings["Use this application name even if another application was used."] = "Utilice este nombre de aplicación incluso si otra aplicación fue utilizada.";
+$a->strings["Submit"] = "Enviar";
diff --git a/fromapp/lang/fi-fi/strings.php b/fromapp/lang/fi-fi/strings.php
index caff9111..a41ae8b8 100644
--- a/fromapp/lang/fi-fi/strings.php
+++ b/fromapp/lang/fi-fi/strings.php
@@ -2,9 +2,11 @@
 
 if(! function_exists("string_plural_select_fi_fi")) {
 function string_plural_select_fi_fi($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Fromapp settings updated.'] = 'FromApp -asetukset päivitettiin.';
-$a->strings['FromApp Settings'] = 'FromApp -asetukset';
-$a->strings['Submit'] = 'Lähetä';
+;
+$a->strings["Fromapp settings updated."] = "FromApp -asetukset päivitettiin.";
+$a->strings["FromApp Settings"] = "FromApp -asetukset";
+$a->strings["The application name you would like to show your posts originating from."] = "";
+$a->strings["Use this application name even if another application was used."] = "";
+$a->strings["Submit"] = "Lähetä";
diff --git a/fromapp/lang/fr/messages.po b/fromapp/lang/fr/messages.po
deleted file mode 100644
index fec75102..00000000
--- a/fromapp/lang/fr/messages.po
+++ /dev/null
@@ -1,37 +0,0 @@
-# ADDON fromapp
-# Copyright (C)
-# This file is distributed under the same license as the Friendica fromapp addon package.
-# 
-# 
-# Translators:
-# bob lebonche <lebonche@tutanota.com>, 2021
-# Hypolite Petovan <hypolite@mrpetovan.com>, 2016
-# StefOfficiel <pichard.stephane@free.fr>, 2015
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:14-0500\n"
-"PO-Revision-Date: 2014-06-22 12:33+0000\n"
-"Last-Translator: bob lebonche <lebonche@tutanota.com>, 2021\n"
-"Language-Team: French (http://www.transifex.com/Friendica/friendica/language/fr/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: fr\n"
-"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
-
-#: fromapp.php:45
-msgid ""
-"The application name you would like to show your posts originating from. "
-"Separate different app names with a comma. A random one will then be "
-"selected for every posting."
-msgstr "Nom de l'application d'origine de votre publication. Séparer les noms des différentes applications par une virgule. Une application sera seléctionnée aléatoirement pour chaque publication. "
-
-#: fromapp.php:46
-msgid "Use this application name even if another application was used."
-msgstr "Utilisez le nom de cette application même si une autre application a été utilisé."
-
-#: fromapp.php:51
-msgid "FromApp Settings"
-msgstr "Paramètres de FromApp"
diff --git a/fromapp/lang/fr/strings.php b/fromapp/lang/fr/strings.php
index 9e49bf9f..a92ac854 100644
--- a/fromapp/lang/fr/strings.php
+++ b/fromapp/lang/fr/strings.php
@@ -1,10 +1,7 @@
-<?php
-
-if(! function_exists("string_plural_select_fr")) {
-function string_plural_select_fr($n){
-	$n = intval($n);
-	if (($n == 0 || $n == 1)) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
-}}
-$a->strings['The application name you would like to show your posts originating from. Separate different app names with a comma. A random one will then be selected for every posting.'] = 'Nom de l\'application d\'origine de votre publication. Séparer les noms des différentes applications par une virgule. Une application sera seléctionnée aléatoirement pour chaque publication. ';
-$a->strings['Use this application name even if another application was used.'] = 'Utilisez le nom de cette application même si une autre application a été utilisé.';
-$a->strings['FromApp Settings'] = 'Paramètres de FromApp';
+<?php
+
+$a->strings["Fromapp settings updated."] = "Réglages FromApp mis-à-jour";
+$a->strings["FromApp Settings"] = "FromApp";
+$a->strings["The application name you would like to show your posts originating from."] = "Le nom d'application que vous souhaiteriez que vos publications affichent comme source.";
+$a->strings["Use this application name even if another application was used."] = "Afficher ce nom d'application même si une autre a été utilisée.";
+$a->strings["Submit"] = "Envoyer";
diff --git a/fromapp/lang/hu/messages.po b/fromapp/lang/hu/messages.po
deleted file mode 100644
index 89168952..00000000
--- a/fromapp/lang/hu/messages.po
+++ /dev/null
@@ -1,35 +0,0 @@
-# ADDON fromapp
-# Copyright (C)
-# This file is distributed under the same license as the Friendica fromapp addon package.
-# 
-# 
-# Translators:
-# Balázs Úr, 2020
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:14-0500\n"
-"PO-Revision-Date: 2014-06-22 12:33+0000\n"
-"Last-Translator: Balázs Úr, 2020\n"
-"Language-Team: Hungarian (http://www.transifex.com/Friendica/friendica/language/hu/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: hu\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: fromapp.php:45
-msgid ""
-"The application name you would like to show your posts originating from. "
-"Separate different app names with a comma. A random one will then be "
-"selected for every posting."
-msgstr "Az alkalmazás neve, amelyet meg szeretne jeleníteni a bejegyzései származási helyeként. A különböző alkalmazásnevek vesszővel választhatók el. Ezután véletlenszerűen lesz kiválasztva az egyikük minden egyes beküldésnél."
-
-#: fromapp.php:46
-msgid "Use this application name even if another application was used."
-msgstr "Ezen alkalmazásnév használata akkor is, ha egy másik alkalmazás lett használva."
-
-#: fromapp.php:51
-msgid "FromApp Settings"
-msgstr "FromApp-beállítások"
diff --git a/fromapp/lang/hu/strings.php b/fromapp/lang/hu/strings.php
deleted file mode 100644
index 6d903f3c..00000000
--- a/fromapp/lang/hu/strings.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_hu")) {
-function string_plural_select_hu($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['The application name you would like to show your posts originating from. Separate different app names with a comma. A random one will then be selected for every posting.'] = 'Az alkalmazás neve, amelyet meg szeretne jeleníteni a bejegyzései származási helyeként. A különböző alkalmazásnevek vesszővel választhatók el. Ezután véletlenszerűen lesz kiválasztva az egyikük minden egyes beküldésnél.';
-$a->strings['Use this application name even if another application was used.'] = 'Ezen alkalmazásnév használata akkor is, ha egy másik alkalmazás lett használva.';
-$a->strings['FromApp Settings'] = 'FromApp-beállítások';
diff --git a/fromapp/lang/it/strings.php b/fromapp/lang/it/strings.php
index 7febfcd7..ffaa40cd 100644
--- a/fromapp/lang/it/strings.php
+++ b/fromapp/lang/it/strings.php
@@ -3,10 +3,11 @@
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Fromapp settings updated.'] = 'Impostazioni "FromApp" aggiornato.';
-$a->strings['FromApp Settings'] = 'Imnpostazioni "FromApp"';
-$a->strings['The application name you would like to show your posts originating from. Separate different app names with a comma. A random one will then be selected for every posting.'] = 'Il nome applicazione che vuoi compaia come origine dei tuoi messaggi. Separa differenti nomi con una virgola. Di questi, un nome a caso verrà selezionato per ogni invio.';
-$a->strings['Use this application name even if another application was used.'] = 'Usa questo nome anche se un\'altra applicazione è stata effettivamente usata.';
-$a->strings['Save Settings'] = 'Salva Impostazioni';
+;
+$a->strings["Fromapp settings updated."] = "Impostazioni \"FromApp\" aggiornato.";
+$a->strings["FromApp Settings"] = "Imnpostazioni \"FromApp\"";
+$a->strings["The application name you would like to show your posts originating from. Separate different app names with a comma. A random one will then be selected for every posting."] = "Il nome applicazione che vuoi compaia come origine dei tuoi messaggi. Separa differenti nomi con una virgola. Di questi, un nome a caso verrà selezionato per ogni invio.";
+$a->strings["Use this application name even if another application was used."] = "Usa questo nome anche se un'altra applicazione è stata effettivamente usata.";
+$a->strings["Save Settings"] = "Salva Impostazioni";
diff --git a/fromapp/lang/nl/strings.php b/fromapp/lang/nl/strings.php
index ab13e074..17852479 100644
--- a/fromapp/lang/nl/strings.php
+++ b/fromapp/lang/nl/strings.php
@@ -3,10 +3,11 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Fromapp settings updated.'] = 'Fromapp instellingen opgeslagen';
-$a->strings['FromApp Settings'] = 'FromApp instellingen';
-$a->strings['The application name you would like to show your posts originating from.'] = 'De applicatienaam die je wilt laten verschijnen bij je berichten';
-$a->strings['Use this application name even if another application was used.'] = 'Gebruik deze applicatienaam zelfs als een andere applicatie werd gebruikt';
-$a->strings['Submit'] = 'Opslaan';
+;
+$a->strings["Fromapp settings updated."] = "Fromapp instellingen opgeslagen";
+$a->strings["FromApp Settings"] = "FromApp instellingen";
+$a->strings["The application name you would like to show your posts originating from."] = "De applicatienaam die je wilt laten verschijnen bij je berichten";
+$a->strings["Use this application name even if another application was used."] = "Gebruik deze applicatienaam zelfs als een andere applicatie werd gebruikt";
+$a->strings["Submit"] = "Opslaan";
diff --git a/fromapp/lang/pl/messages.po b/fromapp/lang/pl/messages.po
index 4bfc3f81..e34a8541 100644
--- a/fromapp/lang/pl/messages.po
+++ b/fromapp/lang/pl/messages.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:14-0500\n"
-"PO-Revision-Date: 2014-06-22 12:33+0000\n"
-"Last-Translator: Waldemar Stoczkowski, 2018-2019\n"
+"POT-Creation-Date: 2019-02-19 16:42+0100\n"
+"PO-Revision-Date: 2019-03-07 19:25+0000\n"
+"Last-Translator: Waldemar Stoczkowski\n"
 "Language-Team: Polish (http://www.transifex.com/Friendica/friendica/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,17 +19,25 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
-#: fromapp.php:45
+#: fromapp.php:40
+msgid "Fromapp settings updated."
+msgstr "Zaktualizowano ustawienia Fromapp."
+
+#: fromapp.php:65 fromapp.php:69
+msgid "FromApp Settings"
+msgstr "Ustawienia FromApp"
+
+#: fromapp.php:72
 msgid ""
 "The application name you would like to show your posts originating from. "
 "Separate different app names with a comma. A random one will then be "
 "selected for every posting."
 msgstr "Nazwa aplikacji, z której chcesz wyświetlać swoje posty. Oddziel różne nazwy aplikacji przecinkami. Zostanie losowo wybrana dla każdej lokalizacji."
 
-#: fromapp.php:46
+#: fromapp.php:76
 msgid "Use this application name even if another application was used."
 msgstr "Użyj tej nazwy aplikacji, nawet jeśli użyto innej aplikacji."
 
-#: fromapp.php:51
-msgid "FromApp Settings"
-msgstr "Ustawienia FromApp"
+#: fromapp.php:83
+msgid "Save Settings"
+msgstr "Zapisz ustawienia"
diff --git a/fromapp/lang/pl/strings.php b/fromapp/lang/pl/strings.php
index f7b2da50..e65f47d5 100644
--- a/fromapp/lang/pl/strings.php
+++ b/fromapp/lang/pl/strings.php
@@ -3,8 +3,11 @@
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
 	$n = intval($n);
-	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
+	return ($n==1 ? 0 : ($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14) ? 1 : $n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14) ? 2 : 3);;
 }}
-$a->strings['The application name you would like to show your posts originating from. Separate different app names with a comma. A random one will then be selected for every posting.'] = 'Nazwa aplikacji, z której chcesz wyświetlać swoje posty. Oddziel różne nazwy aplikacji przecinkami. Zostanie losowo wybrana dla każdej lokalizacji.';
-$a->strings['Use this application name even if another application was used.'] = 'Użyj tej nazwy aplikacji, nawet jeśli użyto innej aplikacji.';
-$a->strings['FromApp Settings'] = 'Ustawienia FromApp';
+;
+$a->strings["Fromapp settings updated."] = "Zaktualizowano ustawienia Fromapp.";
+$a->strings["FromApp Settings"] = "Ustawienia FromApp";
+$a->strings["The application name you would like to show your posts originating from. Separate different app names with a comma. A random one will then be selected for every posting."] = "Nazwa aplikacji, z której chcesz wyświetlać swoje posty. Oddziel różne nazwy aplikacji przecinkami. Zostanie losowo wybrana dla każdej lokalizacji.";
+$a->strings["Use this application name even if another application was used."] = "Użyj tej nazwy aplikacji, nawet jeśli użyto innej aplikacji.";
+$a->strings["Save Settings"] = "Zapisz ustawienia";
diff --git a/fromapp/lang/ro/strings.php b/fromapp/lang/ro/strings.php
index adc01c05..075f881f 100644
--- a/fromapp/lang/ro/strings.php
+++ b/fromapp/lang/ro/strings.php
@@ -2,11 +2,11 @@
 
 if(! function_exists("string_plural_select_ro")) {
 function string_plural_select_ro($n){
-	$n = intval($n);
-	if ($n==1) { return 0; } else if ((($n%100>19)||(($n%100==0)&&($n!=0)))) { return 2; } else  { return 1; }
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
 }}
-$a->strings['Fromapp settings updated.'] = 'Configurările Fromapp au fost actualizate.';
-$a->strings['FromApp Settings'] = 'Configurări FromApp';
-$a->strings['The application name you would like to show your posts originating from.'] = 'Denumirea aplicației pe care doriți să o afișați ca și origine pentru postările dvs.';
-$a->strings['Use this application name even if another application was used.'] = 'Utilizați numele acestei aplicații chiar dacă o altă aplicație a fost utilizată.';
-$a->strings['Submit'] = 'Trimite';
+;
+$a->strings["Fromapp settings updated."] = "Configurările Fromapp au fost actualizate.";
+$a->strings["FromApp Settings"] = "Configurări FromApp";
+$a->strings["The application name you would like to show your posts originating from."] = "Denumirea aplicației pe care doriți să o afișați ca și origine pentru postările dvs.";
+$a->strings["Use this application name even if another application was used."] = "Utilizați numele acestei aplicații chiar dacă o altă aplicație a fost utilizată.";
+$a->strings["Submit"] = "Trimite";
diff --git a/fromapp/lang/ru/strings.php b/fromapp/lang/ru/strings.php
index 9289d408..c67a3e76 100644
--- a/fromapp/lang/ru/strings.php
+++ b/fromapp/lang/ru/strings.php
@@ -2,11 +2,11 @@
 
 if(! function_exists("string_plural_select_ru")) {
 function string_plural_select_ru($n){
-	$n = intval($n);
-	if ($n%10==1 && $n%100!=11) { return 0; } else if ($n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14)) { return 1; } else if ($n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)) { return 2; } else  { return 3; }
+	return ($n%10==1 && $n%100!=11 ? 0 : $n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14) ? 1 : $n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)? 2 : 3);;
 }}
-$a->strings['Fromapp settings updated.'] = 'Настройки Fromapp обновлены.';
-$a->strings['FromApp Settings'] = 'Настройки Fromapp';
-$a->strings['The application name you would like to show your posts originating from.'] = 'Имя приложения, которое будет показываться при просмотре сообщения.';
-$a->strings['Use this application name even if another application was used.'] = 'Использовать это имя приложения даже если используется другое приложение.';
-$a->strings['Submit'] = 'Добавить';
+;
+$a->strings["Fromapp settings updated."] = "Настройки Fromapp обновлены.";
+$a->strings["FromApp Settings"] = "Настройки Fromapp";
+$a->strings["The application name you would like to show your posts originating from."] = "Имя приложения, которое будет показываться при просмотре сообщения.";
+$a->strings["Use this application name even if another application was used."] = "Использовать это имя приложения даже если используется другое приложение.";
+$a->strings["Submit"] = "Добавить";
diff --git a/fromapp/lang/sv/messages.po b/fromapp/lang/sv/messages.po
deleted file mode 100644
index bc9e43fe..00000000
--- a/fromapp/lang/sv/messages.po
+++ /dev/null
@@ -1,34 +0,0 @@
-# ADDON fromapp
-# Copyright (C)
-# This file is distributed under the same license as the Friendica fromapp addon package.
-# 
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:14-0500\n"
-"PO-Revision-Date: 2021-12-22 15:15+0000\n"
-"Last-Translator: Transifex Bot <>\n"
-"Language-Team: Swedish (http://www.transifex.com/Friendica/friendica/language/sv/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: sv\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: fromapp.php:45
-msgid ""
-"The application name you would like to show your posts originating from. "
-"Separate different app names with a comma. A random one will then be "
-"selected for every posting."
-msgstr ""
-
-#: fromapp.php:46
-msgid "Use this application name even if another application was used."
-msgstr ""
-
-#: fromapp.php:51
-msgid "FromApp Settings"
-msgstr ""
diff --git a/fromapp/lang/sv/strings.php b/fromapp/lang/sv/strings.php
index 72e9772f..3ec569a7 100644
--- a/fromapp/lang/sv/strings.php
+++ b/fromapp/lang/sv/strings.php
@@ -1,7 +1,3 @@
-<?php
-
-if(! function_exists("string_plural_select_sv")) {
-function string_plural_select_sv($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
+<?php
+
+$a->strings["Submit"] = "Spara";
diff --git a/fromapp/templates/settings.tpl b/fromapp/templates/settings.tpl
deleted file mode 100644
index c74e5783..00000000
--- a/fromapp/templates/settings.tpl
+++ /dev/null
@@ -1,2 +0,0 @@
-{{include file="field_input.tpl" field=$fromapp}}
-{{include file="field_checkbox.tpl" field=$force}}
\ No newline at end of file
diff --git a/geocoordinates/geocoordinates.php b/geocoordinates/geocoordinates.php
index 5cb90efd..77bfa8e6 100644
--- a/geocoordinates/geocoordinates.php
+++ b/geocoordinates/geocoordinates.php
@@ -5,12 +5,14 @@
  * Version: 0.1
  * Author: Michael Vogel <https://pirati.ca/profile/heluecht>
  */
-
-use Friendica\App;
+use Friendica\Core\Cache;
+use Friendica\Core\Config;
 use Friendica\Core\Hook;
+use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
-use Friendica\DI;
+use Friendica\Util\Network;
+use Friendica\Util\Strings;
 
 function geocoordinates_install()
 {
@@ -18,83 +20,90 @@ function geocoordinates_install()
 	Hook::register('post_remote', 'addon/geocoordinates/geocoordinates.php', 'geocoordinates_post_hook');
 }
 
-function geocoordinates_resolve_item(array &$item)
+
+function geocoordinates_uninstall()
 {
-	if ((!$item['coord']) || ($item['location'])) {
+	Hook::unregister('post_local',    'addon/geocoordinates/geocoordinates.php', 'geocoordinates_post_hook');
+	Hook::unregister('post_remote',    'addon/geocoordinates/geocoordinates.php', 'geocoordinates_post_hook');
+}
+
+function geocoordinates_resolve_item(&$item)
+{
+	if((!$item["coord"]) || ($item["location"]))
 		return;
-	}
 
-	$key = DI::config()->get('geocoordinates', 'api_key');
-	if ($key == '') {
+	$key = Config::get("geocoordinates", "api_key");
+	if ($key == "")
 		return;
-	}
 
-	$language = DI::config()->get('geocoordinates', 'language');
-	if ($language == '') {
-		$language = 'de';
-	}
+	$language = Config::get("geocoordinates", "language");
+	if ($language == "")
+		$language = "de";
 
-	$coords = explode(' ', $item['coord']);
+	$coords = explode(' ',$item["coord"]);
 
-	if (count($coords) < 2) {
+	if (count($coords) < 2)
 		return;
-	}
 
 	$coords[0] = round($coords[0], 5);
 	$coords[1] = round($coords[1], 5);
 
-	$result = DI::cache()->get('geocoordinates:' . $language . ':' . $coords[0] . '-' . $coords[1]);
+	$result = Cache::get("geocoordinates:".$language.":".$coords[0]."-".$coords[1]);
 	if (!is_null($result)) {
-		$item['location'] = $result;
+		$item["location"] = $result;
 		return;
 	}
 
-	$s = DI::httpClient()->fetch('https://api.opencagedata.com/geocode/v1/json?q=' . $coords[0] . ',' . $coords[1] . '&key=' . $key . '&language=' . $language);
+	$s = Network::fetchUrl("https://api.opencagedata.com/geocode/v1/json?q=".$coords[0].",".$coords[1]."&key=".$key."&language=".$language);
 
 	if (!$s) {
-		Logger::info('API could not be queried');
+		Logger::log("API could not be queried", Logger::DEBUG);
 		return;
 	}
 
 	$data = json_decode($s);
 
-	if ($data->status->code != '200') {
-		Logger::info('API returned error ' . $data->status->code . ' ' . $data->status->message);
+	if ($data->status->code != "200") {
+		Logger::log("API returned error ".$data->status->code." ".$data->status->message, Logger::DEBUG);
 		return;
 	}
 
 	if (($data->total_results == 0) || (count($data->results) == 0)) {
-		Logger::info('No results found for coordinates ' . $item['coord']);
+		Logger::log("No results found for coordinates ".$item["coord"], Logger::DEBUG);
 		return;
 	}
 
-	$item['location'] = $data->results[0]->formatted;
+	$item["location"] = $data->results[0]->formatted;
 
-	Logger::info('Got location for coordinates ' . $coords[0] . '-' . $coords[1] . ': ' . $item['location']);
+	Logger::log("Got location for coordinates ".$coords[0]."-".$coords[1].": ".$item["location"], Logger::DEBUG);
 
-	if ($item['location'] != '') {
-		DI::cache()->set('geocoordinates:' . $language.':' . $coords[0] . '-' . $coords[1], $item['location']);
-	}
+	if ($item["location"] != "")
+		Cache::set("geocoordinates:".$language.":".$coords[0]."-".$coords[1], $item["location"]);
 }
 
-function geocoordinates_post_hook(&$item)
+function geocoordinates_post_hook($a, &$item)
 {
 	geocoordinates_resolve_item($item);
 }
 
-function geocoordinates_addon_admin(string &$o)
+function geocoordinates_addon_admin(&$a, &$o)
 {
-	$t = Renderer::getMarkupTemplate('admin.tpl', 'addon/geocoordinates/');
+
+	$t = Renderer::getMarkupTemplate("admin.tpl", "addon/geocoordinates/");
 
 	$o = Renderer::replaceMacros($t, [
-		'$submit' => DI::l10n()->t('Save Settings'),
-		'$api_key' => ['api_key', DI::l10n()->t('API Key'), DI::config()->get('geocoordinates', 'api_key'), ''],
-		'$language' => ['language', DI::l10n()->t('Language code (IETF format)'), DI::config()->get('geocoordinates', 'language'), ''],
+		'$submit' => L10n::t('Save Settings'),
+		'$api_key' => ['api_key', L10n::t('API Key'), Config::get('geocoordinates', 'api_key'), ''],
+		'$language' => ['language', L10n::t('Language code (IETF format)'), Config::get('geocoordinates', 'language'), ''],
 	]);
 }
 
-function geocoordinates_addon_admin_post()
+function geocoordinates_addon_admin_post(&$a)
 {
-	DI::config()->set('geocoordinates', 'api_key', trim($_POST['api_key'] ?? ''));
-	DI::config()->set('geocoordinates', 'language', trim($_POST['language'] ?? ''));
+	$api_key  = (!empty($_POST['api_key']) ? Strings::escapeTags(trim($_POST['api_key']))   : '');
+	Config::set('geocoordinates', 'api_key', $api_key);
+
+	$language  = (!empty($_POST['language']) ? Strings::escapeTags(trim($_POST['language']))   : '');
+	Config::set('geocoordinates', 'language', $language);
+	info(L10n::t('Settings updated.'). EOL);
 }
diff --git a/geonames/README.md b/geonames/README.md
index 7673840d..16b85b37 100644
--- a/geonames/README.md
+++ b/geonames/README.md
@@ -7,12 +7,10 @@ Use [Geonames service](https://www.geonames.org) to resolve nearest populated lo
 
 ## Installation
 
-Pre-requisite: Register a username at https://www.geonames.org/login and set it in `config/geonames.config.php`:
+Pre-requisite: Register a username at https://www.geonames.org/login and set it in `config/addon.config.php`
 
-	return [
-		'geonames' => [
-			'username' => 'your_username'
-		],
-	];
+    'geonames' => [
+        'username' => 'your_username'
+    ],
 
 Also visit https://geonames.org/manageaccount and enable access to the free web services.
diff --git a/geonames/config/geonames.config.php b/geonames/config/geonames.config.php
index 179fb56c..6af3634e 100644
--- a/geonames/config/geonames.config.php
+++ b/geonames/config/geonames.config.php
@@ -1,7 +1,7 @@
 <?php
 
 // Warning: Don't change this file! It only holds the default config values for this addon.
-// Instead, copy this file to config/geonames.config.php in your Friendica directory and set the correct values there
+// Instead overwrite these config values in config/addon.config.php in your Friendica directory
 
 return [
 	'geonames' => [
diff --git a/geonames/geonames.css b/geonames/geonames.css
new file mode 100644
index 00000000..0c67e7fc
--- /dev/null
+++ b/geonames/geonames.css
@@ -0,0 +1,14 @@
+
+
+
+#geonames-enable-label {
+	float: left;
+	width: 200px;
+	margin-bottom: 25px;
+}
+
+#geonames-checkbox {
+	float: left;
+}
+
+
diff --git a/geonames/geonames.php b/geonames/geonames.php
index dcbd65f8..c052cef6 100644
--- a/geonames/geonames.php
+++ b/geonames/geonames.php
@@ -7,11 +7,14 @@
  */
 
 use Friendica\App;
+use Friendica\Core\Config;
 use Friendica\Core\Hook;
+use Friendica\Core\L10n;
 use Friendica\Core\Logger;
+use Friendica\Core\PConfig;
 use Friendica\Core\Renderer;
-use Friendica\DI;
-use Friendica\Core\Config\Util\ConfigFileManager;
+use Friendica\Util\ConfigFileLoader;
+use Friendica\Util\Network;
 use Friendica\Util\XML;
 
 function geonames_install()
@@ -33,12 +36,12 @@ function geonames_install()
 	Hook::register('addon_settings_post', __FILE__, 'geonames_addon_settings_post');
 }
 
-function geonames_load_config(ConfigFileManager $loader)
+function geonames_load_config(App $a, ConfigFileLoader $loader)
 {
-	DI::app()->getConfigCache()->load($loader->loadAddonConfig('geonames'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
+	$a->getConfigCache()->load($loader->loadAddonConfig('geonames'));
 }
 
-function geonames_post_hook(array &$item)
+function geonames_post_hook(App $a, array &$item)
 {
 	/* An item was posted on the local system.
 	 * We are going to look for specific items:
@@ -46,13 +49,13 @@ function geonames_post_hook(array &$item)
 	 *      - The profile owner must have allowed our addon
 	 */
 
-	Logger::notice('geonames invoked');
+	Logger::log('geonames invoked');
 
-	if (!DI::userSession()->getLocalUserId()) {   /* non-zero if this is a logged in user of this system */
+	if (!local_user()) {   /* non-zero if this is a logged in user of this system */
 		return;
 	}
 
-	if (DI::userSession()->getLocalUserId() != $item['uid']) {   /* Does this person own the post? */
+	if (local_user() != $item['uid']) {   /* Does this person own the post? */
 		return;
 	}
 
@@ -62,8 +65,8 @@ function geonames_post_hook(array &$item)
 
 	/* Retrieve our personal config setting */
 
-	$geo_account = DI::config()->get('geonames', 'username');
-	$active = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'geonames', 'enable');
+	$geo_account = Config::get('geonames', 'username');
+	$active = PConfig::get(local_user(), 'geonames', 'enable');
 
 	if (!$geo_account || !$active) {
 		return;
@@ -77,7 +80,7 @@ function geonames_post_hook(array &$item)
 
 	/* OK, we're allowed to do our stuff. */
 
-	$s = DI::httpClient()->fetch('http://api.geonames.org/findNearbyPlaceName?lat=' . $coords[0] . '&lng=' . $coords[1] . '&username=' . $geo_account);
+	$s = Network::fetchUrl('http://api.geonames.org/findNearbyPlaceName?lat=' . $coords[0] . '&lng=' . $coords[1] . '&username=' . $geo_account);
 
 	if (!$s) {
 		return;
@@ -97,46 +100,52 @@ function geonames_post_hook(array &$item)
  * We will make sure we've got a valid user account
  * and if so set our configuration setting for this person.
  *
+ * @param App   $a
  * @param array $post The $_POST array
  */
-function geonames_addon_settings_post(array $post)
+function geonames_addon_settings_post(App $a, array $post)
 {
-	if (!DI::userSession()->getLocalUserId() || empty($_POST['geonames-submit'])) {
+	if (!local_user() || empty($_POST['geonames-submit'])) {
 		return;
 	}
 
-	DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'geonames', 'enable', intval($_POST['geonames-enable']));
+	PConfig::set(local_user(), 'geonames', 'enable', intval($_POST['geonames-enable']));
+
+	info(L10n::t('Geonames settings updated.'));
 }
 
 /**
  * Called from the Addon Setting form.
  * Add our own settings info to the page.
  *
- * @param array $data
+ * @param App    $a
+ * @param string $s
  * @throws Exception
  */
-function geonames_addon_settings(array &$data)
+function geonames_addon_settings(App $a, &$s)
 {
-	if (!DI::userSession()->getLocalUserId()) {
+	if (!local_user()) {
 		return;
 	}
 
-	$geo_account = DI::config()->get('geonames', 'username');
+	$geo_account = Config::get('geonames', 'username');
+
 	if (!$geo_account) {
 		return;
 	}
 
-	$enabled = intval(DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'geonames', 'enable'));
+	/* Add our stylesheet to the page so we can make our settings look nice */
+	$stylesheetPath = __DIR__ . '/geonames.css';
+	$a->registerStylesheet($stylesheetPath);
 
-	$t    = Renderer::getMarkupTemplate('settings.tpl', 'addon/geonames/');
-	$html = Renderer::replaceMacros($t, [
-		'$info'   => DI::l10n()->t('Replace numerical coordinates by the nearest populated location name in your posts.'),
-		'$enable' => ['geonames-enable', DI::l10n()->t('Enable Geonames Addon'), $enabled],
+	/* Get the current state of our config variable */
+	$enabled = intval(PConfig::get(local_user(), 'geonames', 'enable'));
+
+	$t = Renderer::getMarkupTemplate('settings.tpl', __DIR__);
+	$s .= Renderer::replaceMacros($t, [
+		'$title' => L10n::t('Geonames Settings'),
+		'$description' => L10n::t('Replace numerical coordinates by the nearest populated location name in your posts.'),
+		'$enable' => ['geonames-enable', L10n::t('Enable Geonames Addon'), $enabled],
+		'$submit' => L10n::t('Save Settings')
 	]);
-
-	$data = [
-		'addon' => 'geonames',
-		'title' => DI::l10n()->t('Geonames Settings'),
-		'html'  => $html,
-	];
 }
diff --git a/geonames/lang/C/messages.po b/geonames/lang/C/messages.po
index c7f73046..81c239d2 100644
--- a/geonames/lang/C/messages.po
+++ b/geonames/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:14-0500\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,16 +17,18 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: geonames.php:135
-msgid ""
-"Replace numerical coordinates by the nearest populated location name in your "
-"posts."
+#: geonames.php:143
+msgid "Geonames settings updated."
 msgstr ""
 
-#: geonames.php:136
+#: geonames.php:179
+msgid "Geonames Settings"
+msgstr ""
+
+#: geonames.php:181
 msgid "Enable Geonames Addon"
 msgstr ""
 
-#: geonames.php:141
-msgid "Geonames Settings"
+#: geonames.php:187
+msgid "Submit"
 msgstr ""
diff --git a/geonames/lang/ar/messages.po b/geonames/lang/ar/messages.po
deleted file mode 100644
index aa10cf93..00000000
--- a/geonames/lang/ar/messages.po
+++ /dev/null
@@ -1,39 +0,0 @@
-# ADDON geonames
-# Copyright (C)
-# This file is distributed under the same license as the Friendica geonames addon package.
-# 
-# 
-# Translators:
-# abidin toumi <abidin24@tutanota.com>, 2021
-# Farida Khalaf <faridakhalaf@hotmail.com>, 2021
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2021-10-29 10:33+0000\n"
-"Last-Translator: abidin toumi <abidin24@tutanota.com>\n"
-"Language-Team: Arabic (http://www.transifex.com/Friendica/friendica/language/ar/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ar\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-
-#: geonames.php:141
-msgid "Geonames Settings"
-msgstr "إعدادات الأسماء الجغرافية"
-
-#: geonames.php:142
-msgid ""
-"Replace numerical coordinates by the nearest populated location name in your"
-" posts."
-msgstr "استبدل الإحداثيات الرقمية بأقرب اسم موقع مأهول في مشاركاتك."
-
-#: geonames.php:143
-msgid "Enable Geonames Addon"
-msgstr " تفعيل إضافة الأسماء الجغرافية"
-
-#: geonames.php:144
-msgid "Save Settings"
-msgstr "احفظ الإعدادات"
diff --git a/geonames/lang/ar/strings.php b/geonames/lang/ar/strings.php
deleted file mode 100644
index f69c6665..00000000
--- a/geonames/lang/ar/strings.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_ar")) {
-function string_plural_select_ar($n){
-	$n = intval($n);
-	if ($n==0) { return 0; } else if ($n==1) { return 1; } else if ($n==2) { return 2; } else if ($n%100>=3 && $n%100<=10) { return 3; } else if ($n%100>=11 && $n%100<=99) { return 4; } else  { return 5; }
-}}
-$a->strings['Geonames Settings'] = 'إعدادات الأسماء الجغرافية';
-$a->strings['Replace numerical coordinates by the nearest populated location name in your posts.'] = 'استبدل الإحداثيات الرقمية بأقرب اسم موقع مأهول في مشاركاتك.';
-$a->strings['Enable Geonames Addon'] = ' تفعيل إضافة الأسماء الجغرافية';
-$a->strings['Save Settings'] = 'احفظ الإعدادات';
diff --git a/geonames/lang/cs/strings.php b/geonames/lang/cs/strings.php
index bab1bdff..f8f41c1b 100644
--- a/geonames/lang/cs/strings.php
+++ b/geonames/lang/cs/strings.php
@@ -3,9 +3,10 @@
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
 	$n = intval($n);
-	if (($n == 1 && $n % 1 == 0)) { return 0; } else if (($n >= 2 && $n <= 4 && $n % 1 == 0)) { return 1; } else if (($n % 1 != 0 )) { return 2; } else  { return 3; }
+	return ($n == 1 && $n % 1 == 0) ? 0 : ($n >= 2 && $n <= 4 && $n % 1 == 0) ? 1: ($n % 1 != 0 ) ? 2 : 3;;
 }}
-$a->strings['Geonames settings updated.'] = 'Nastavení Geonames aktualizována.';
-$a->strings['Geonames Settings'] = 'Nastavení Geonames';
-$a->strings['Enable Geonames Addon'] = 'Povolit doplněk Geonames';
-$a->strings['Submit'] = 'Odeslat';
+;
+$a->strings["Geonames settings updated."] = "Nastavení Geonames aktualizována.";
+$a->strings["Geonames Settings"] = "Nastavení Geonames";
+$a->strings["Enable Geonames Addon"] = "Povolit doplněk Geonames";
+$a->strings["Submit"] = "Odeslat";
diff --git a/geonames/lang/da-dk/messages.po b/geonames/lang/da-dk/messages.po
deleted file mode 100644
index fda74982..00000000
--- a/geonames/lang/da-dk/messages.po
+++ /dev/null
@@ -1,34 +0,0 @@
-# ADDON geonames
-# Copyright (C)
-# This file is distributed under the same license as the Friendica geonames addon package.
-# 
-# 
-# Translators:
-# Anton <dev@atjn.dk>, 2022
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:14-0500\n"
-"PO-Revision-Date: 2014-06-23 08:27+0000\n"
-"Last-Translator: Anton <dev@atjn.dk>, 2022\n"
-"Language-Team: Danish (Denmark) (http://www.transifex.com/Friendica/friendica/language/da_DK/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: da_DK\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: geonames.php:135
-msgid ""
-"Replace numerical coordinates by the nearest populated location name in your"
-" posts."
-msgstr "Erstat numeriske koordinater med den nærmeste beboede lokation i dine opslag."
-
-#: geonames.php:136
-msgid "Enable Geonames Addon"
-msgstr "Aktivér geonavne tilføjelse"
-
-#: geonames.php:141
-msgid "Geonames Settings"
-msgstr "Geonavne Indstillinger"
diff --git a/geonames/lang/da-dk/strings.php b/geonames/lang/da-dk/strings.php
deleted file mode 100644
index 2b27fd28..00000000
--- a/geonames/lang/da-dk/strings.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_da_dk")) {
-function string_plural_select_da_dk($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Replace numerical coordinates by the nearest populated location name in your posts.'] = 'Erstat numeriske koordinater med den nærmeste beboede lokation i dine opslag.';
-$a->strings['Enable Geonames Addon'] = 'Aktivér geonavne tilføjelse';
-$a->strings['Geonames Settings'] = 'Geonavne Indstillinger';
diff --git a/geonames/lang/de/messages.po b/geonames/lang/de/messages.po
index cbb9f74d..fdc3ed63 100644
--- a/geonames/lang/de/messages.po
+++ b/geonames/lang/de/messages.po
@@ -4,34 +4,34 @@
 # 
 # 
 # Translators:
-# Andreas H., 2014
-# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2014
-# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2018,2021
-# Ulf Rompe <transifex.com@rompe.org>, 2019
+# Abrax <webmaster@a-zwenkau.de>, 2014
+# bavatar <tobias.diekershoff@gmx.net>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:14-0500\n"
-"PO-Revision-Date: 2014-06-23 08:27+0000\n"
-"Last-Translator: Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2018,2021\n"
-"Language-Team: German (http://app.transifex.com/Friendica/friendica/language/de/)\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2014-10-15 12:28+0000\n"
+"Last-Translator: Abrax <webmaster@a-zwenkau.de>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/friendica/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: geonames.php:135
-msgid ""
-"Replace numerical coordinates by the nearest populated location name in your"
-" posts."
-msgstr "Ersetze numerische Koordinaten in Beiträgen mit dem Namen der nächst gelegenen Siedlung."
+#: geonames.php:143
+msgid "Geonames settings updated."
+msgstr "Geonames Einstellungen aktualisiert"
 
-#: geonames.php:136
-msgid "Enable Geonames Addon"
-msgstr "Geonames-Addon aktivieren"
-
-#: geonames.php:141
+#: geonames.php:179
 msgid "Geonames Settings"
-msgstr "Geonames-Einstellungen"
+msgstr "Geonames Einstellungen"
+
+#: geonames.php:181
+msgid "Enable Geonames Addon"
+msgstr "Geonames Addon aktivieren"
+
+#: geonames.php:187
+msgid "Submit"
+msgstr "Senden"
diff --git a/geonames/lang/de/strings.php b/geonames/lang/de/strings.php
index 3a31e793..26f2246e 100644
--- a/geonames/lang/de/strings.php
+++ b/geonames/lang/de/strings.php
@@ -2,9 +2,10 @@
 
 if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Replace numerical coordinates by the nearest populated location name in your posts.'] = 'Ersetze numerische Koordinaten in Beiträgen mit dem Namen der nächst gelegenen Siedlung.';
-$a->strings['Enable Geonames Addon'] = 'Geonames-Addon aktivieren';
-$a->strings['Geonames Settings'] = 'Geonames-Einstellungen';
+;
+$a->strings["Geonames settings updated."] = "Geonames Einstellungen aktualisiert";
+$a->strings["Geonames Settings"] = "Geonames Einstellungen";
+$a->strings["Enable Geonames Addon"] = "Geonames Addon aktivieren";
+$a->strings["Submit"] = "Senden";
diff --git a/geonames/lang/es/messages.po b/geonames/lang/es/messages.po
index e03b5a7d..84de85aa 100644
--- a/geonames/lang/es/messages.po
+++ b/geonames/lang/es/messages.po
@@ -5,14 +5,13 @@
 # 
 # Translators:
 # Albert, 2016
-# Senex Petrovic <javierruizo@hotmail.com>, 2021
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2021-04-01 09:56+0000\n"
-"Last-Translator: Senex Petrovic <javierruizo@hotmail.com>\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2016-11-16 16:35+0000\n"
+"Last-Translator: Albert\n"
 "Language-Team: Spanish (http://www.transifex.com/Friendica/friendica/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,20 +19,18 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: geonames.php:141
+#: geonames.php:143
+msgid "Geonames settings updated."
+msgstr "Ajustes de geonombres actualizados."
+
+#: geonames.php:179
 msgid "Geonames Settings"
 msgstr "Ajustes de Geonombres"
 
-#: geonames.php:142
-msgid ""
-"Replace numerical coordinates by the nearest populated location name in your"
-" posts."
-msgstr "Reemplace las coordenadas numéricas por el nombre de la ubicación poblada más cercana en sus publicaciones."
-
-#: geonames.php:143
+#: geonames.php:181
 msgid "Enable Geonames Addon"
-msgstr "Habilitar Plugin de Geonombres"
+msgstr "Habilitar Addon de Geonombres"
 
-#: geonames.php:144
-msgid "Save Settings"
-msgstr "Guardar Ajustes"
+#: geonames.php:187
+msgid "Submit"
+msgstr "Enviar"
diff --git a/geonames/lang/es/strings.php b/geonames/lang/es/strings.php
index ef08df42..d2cb635d 100644
--- a/geonames/lang/es/strings.php
+++ b/geonames/lang/es/strings.php
@@ -2,10 +2,10 @@
 
 if(! function_exists("string_plural_select_es")) {
 function string_plural_select_es($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Geonames Settings'] = 'Ajustes de Geonombres';
-$a->strings['Replace numerical coordinates by the nearest populated location name in your posts.'] = 'Reemplace las coordenadas numéricas por el nombre de la ubicación poblada más cercana en sus publicaciones.';
-$a->strings['Enable Geonames Addon'] = 'Habilitar Plugin de Geonombres';
-$a->strings['Save Settings'] = 'Guardar Ajustes';
+;
+$a->strings["Geonames settings updated."] = "Ajustes de geonombres actualizados.";
+$a->strings["Geonames Settings"] = "Ajustes de Geonombres";
+$a->strings["Enable Geonames Addon"] = "Habilitar Addon de Geonombres";
+$a->strings["Submit"] = "Enviar";
diff --git a/geonames/lang/fi-fi/strings.php b/geonames/lang/fi-fi/strings.php
index 95ca2896..d3bb53b6 100644
--- a/geonames/lang/fi-fi/strings.php
+++ b/geonames/lang/fi-fi/strings.php
@@ -2,10 +2,10 @@
 
 if(! function_exists("string_plural_select_fi_fi")) {
 function string_plural_select_fi_fi($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Geonames settings updated.'] = 'Geonames -asetukset päivitetty.';
-$a->strings['Geonames Settings'] = 'Geonames -asetukset';
-$a->strings['Enable Geonames Addon'] = 'Ota Geonames -lisäosa käyttöön';
-$a->strings['Submit'] = 'Lähetä';
+;
+$a->strings["Geonames settings updated."] = "Geonames -asetukset päivitetty.";
+$a->strings["Geonames Settings"] = "Geonames -asetukset";
+$a->strings["Enable Geonames Addon"] = "Ota Geonames -lisäosa käyttöön";
+$a->strings["Submit"] = "Lähetä";
diff --git a/geonames/lang/fr/messages.po b/geonames/lang/fr/messages.po
deleted file mode 100644
index b1cd8ce1..00000000
--- a/geonames/lang/fr/messages.po
+++ /dev/null
@@ -1,36 +0,0 @@
-# ADDON geonames
-# Copyright (C)
-# This file is distributed under the same license as the Friendica geonames addon package.
-# 
-# 
-# Translators:
-# bob lebonche <lebonche@tutanota.com>, 2021
-# ButterflyOfFire, 2020
-# Hypolite Petovan <hypolite@mrpetovan.com>, 2016
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:14-0500\n"
-"PO-Revision-Date: 2014-06-23 08:27+0000\n"
-"Last-Translator: bob lebonche <lebonche@tutanota.com>, 2021\n"
-"Language-Team: French (http://www.transifex.com/Friendica/friendica/language/fr/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: fr\n"
-"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
-
-#: geonames.php:135
-msgid ""
-"Replace numerical coordinates by the nearest populated location name in your"
-" posts."
-msgstr "Remplacer les coordonnées par le nom de la localité la plus proche dans votre publication."
-
-#: geonames.php:136
-msgid "Enable Geonames Addon"
-msgstr "Activer l'application complémentaire Geonames"
-
-#: geonames.php:141
-msgid "Geonames Settings"
-msgstr "Paramètres Geonames"
diff --git a/geonames/lang/fr/strings.php b/geonames/lang/fr/strings.php
index 297e3b73..10d6631e 100644
--- a/geonames/lang/fr/strings.php
+++ b/geonames/lang/fr/strings.php
@@ -1,10 +1,6 @@
-<?php
-
-if(! function_exists("string_plural_select_fr")) {
-function string_plural_select_fr($n){
-	$n = intval($n);
-	if (($n == 0 || $n == 1)) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
-}}
-$a->strings['Replace numerical coordinates by the nearest populated location name in your posts.'] = 'Remplacer les coordonnées par le nom de la localité la plus proche dans votre publication.';
-$a->strings['Enable Geonames Addon'] = 'Activer l\'application complémentaire Geonames';
-$a->strings['Geonames Settings'] = 'Paramètres Geonames';
+<?php
+
+$a->strings["Geonames settings updated."] = "Réglages Geonames sauvés.";
+$a->strings["Geonames Settings"] = "Réglages Geonames";
+$a->strings["Enable Geonames Addon"] = "Activer Geonames";
+$a->strings["Submit"] = "Envoyer";
diff --git a/geonames/lang/hu/messages.po b/geonames/lang/hu/messages.po
deleted file mode 100644
index 522f5146..00000000
--- a/geonames/lang/hu/messages.po
+++ /dev/null
@@ -1,34 +0,0 @@
-# ADDON geonames
-# Copyright (C)
-# This file is distributed under the same license as the Friendica geonames addon package.
-# 
-# 
-# Translators:
-# Balázs Úr, 2020-2021
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:14-0500\n"
-"PO-Revision-Date: 2014-06-23 08:27+0000\n"
-"Last-Translator: Balázs Úr, 2020-2021\n"
-"Language-Team: Hungarian (http://www.transifex.com/Friendica/friendica/language/hu/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: hu\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: geonames.php:135
-msgid ""
-"Replace numerical coordinates by the nearest populated location name in your"
-" posts."
-msgstr "Számokkal megadott koordináták cseréje a bejegyzéseiben a legközelebbi lakott hely nevére."
-
-#: geonames.php:136
-msgid "Enable Geonames Addon"
-msgstr "A földrajzi nevek bővítmény engedélyezése"
-
-#: geonames.php:141
-msgid "Geonames Settings"
-msgstr "Földrajzi nevek beállításai"
diff --git a/geonames/lang/hu/strings.php b/geonames/lang/hu/strings.php
deleted file mode 100644
index 86d69a60..00000000
--- a/geonames/lang/hu/strings.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_hu")) {
-function string_plural_select_hu($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Replace numerical coordinates by the nearest populated location name in your posts.'] = 'Számokkal megadott koordináták cseréje a bejegyzéseiben a legközelebbi lakott hely nevére.';
-$a->strings['Enable Geonames Addon'] = 'A földrajzi nevek bővítmény engedélyezése';
-$a->strings['Geonames Settings'] = 'Földrajzi nevek beállításai';
diff --git a/geonames/lang/is/strings.php b/geonames/lang/is/strings.php
index b1b57912..8462f4c3 100644
--- a/geonames/lang/is/strings.php
+++ b/geonames/lang/is/strings.php
@@ -3,6 +3,10 @@
 if(! function_exists("string_plural_select_is")) {
 function string_plural_select_is($n){
 	$n = intval($n);
-	return intval($n % 10 != 1 || $n % 100 == 11);
+	return ($n % 10 != 1 || $n % 100 == 11);;
 }}
-$a->strings['Submit'] = 'Senda inn';
+;
+$a->strings["Geonames settings updated."] = "";
+$a->strings["Geonames Settings"] = "";
+$a->strings["Enable Geonames Addon"] = "";
+$a->strings["Submit"] = "Senda inn";
diff --git a/geonames/lang/it/messages.po b/geonames/lang/it/messages.po
index 0297cef2..f186dd42 100644
--- a/geonames/lang/it/messages.po
+++ b/geonames/lang/it/messages.po
@@ -5,14 +5,13 @@
 # 
 # Translators:
 # fabrixxm <fabrix.xm@gmail.com>, 2014-2015,2018
-# Sylke Vicious <silkevicious@gmail.com>, 2021
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2021-02-16 12:59+0000\n"
-"Last-Translator: Sylke Vicious <silkevicious@gmail.com>\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2018-03-19 13:22+0000\n"
+"Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,20 +19,18 @@ msgstr ""
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: geonames.php:141
+#: geonames.php:143
+msgid "Geonames settings updated."
+msgstr "Impostazioni di Geonames aggiornate."
+
+#: geonames.php:179
 msgid "Geonames Settings"
 msgstr "Impostazioni Geonames"
 
-#: geonames.php:142
-msgid ""
-"Replace numerical coordinates by the nearest populated location name in your"
-" posts."
-msgstr "Sostituisci le coordinate numeriche con il nome della località abitata più vicina nei tuoi messaggi."
-
-#: geonames.php:143
+#: geonames.php:181
 msgid "Enable Geonames Addon"
 msgstr "Abilita componente aggiuntivo Geonames"
 
-#: geonames.php:144
-msgid "Save Settings"
-msgstr "Salva Impostazioni"
+#: geonames.php:187
+msgid "Submit"
+msgstr "Invia"
diff --git a/geonames/lang/it/strings.php b/geonames/lang/it/strings.php
index 797dd4b4..33148f6b 100644
--- a/geonames/lang/it/strings.php
+++ b/geonames/lang/it/strings.php
@@ -2,10 +2,10 @@
 
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Geonames Settings'] = 'Impostazioni Geonames';
-$a->strings['Replace numerical coordinates by the nearest populated location name in your posts.'] = 'Sostituisci le coordinate numeriche con il nome della località abitata più vicina nei tuoi messaggi.';
-$a->strings['Enable Geonames Addon'] = 'Abilita componente aggiuntivo Geonames';
-$a->strings['Save Settings'] = 'Salva Impostazioni';
+;
+$a->strings["Geonames settings updated."] = "Impostazioni di Geonames aggiornate.";
+$a->strings["Geonames Settings"] = "Impostazioni Geonames";
+$a->strings["Enable Geonames Addon"] = "Abilita componente aggiuntivo Geonames";
+$a->strings["Submit"] = "Invia";
diff --git a/geonames/lang/nl/strings.php b/geonames/lang/nl/strings.php
index 044702ad..baaf2e1e 100644
--- a/geonames/lang/nl/strings.php
+++ b/geonames/lang/nl/strings.php
@@ -3,9 +3,10 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Geonames settings updated.'] = 'Geonames instellingen opgeslagen';
-$a->strings['Geonames Settings'] = 'Geonames Instellingen';
-$a->strings['Enable Geonames Addon'] = 'Geonames Addon inschakelen';
-$a->strings['Submit'] = 'Toepassen';
+;
+$a->strings["Geonames settings updated."] = "Geonames instellingen opgeslagen";
+$a->strings["Geonames Settings"] = "Geonames Instellingen";
+$a->strings["Enable Geonames Addon"] = "Geonames Addon inschakelen";
+$a->strings["Submit"] = "Toepassen";
diff --git a/geonames/lang/pl/messages.po b/geonames/lang/pl/messages.po
index b0f9f4f6..16164435 100644
--- a/geonames/lang/pl/messages.po
+++ b/geonames/lang/pl/messages.po
@@ -4,15 +4,14 @@
 # 
 # 
 # Translators:
-# Piotr Strębski <strebski@gmail.com>, 2022
-# Waldemar Stoczkowski, 2018
+# Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:14-0500\n"
-"PO-Revision-Date: 2014-06-23 08:27+0000\n"
-"Last-Translator: Piotr Strębski <strebski@gmail.com>, 2022\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2018-03-31 19:23+0000\n"
+"Last-Translator: Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.com/Friendica/friendica/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,16 +19,18 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
-#: geonames.php:135
-msgid ""
-"Replace numerical coordinates by the nearest populated location name in your"
-" posts."
-msgstr "Zastąp w swoich wpisach współrzędne numeryczne nazwą najbliższej zaludnionej lokalizacji."
+#: geonames.php:143
+msgid "Geonames settings updated."
+msgstr "Zaktualizowano ustawienia Geonames."
 
-#: geonames.php:136
+#: geonames.php:179
+msgid "Geonames Settings"
+msgstr "Ustawienia Geonames"
+
+#: geonames.php:181
 msgid "Enable Geonames Addon"
 msgstr "Włącz dodatek Geonames"
 
-#: geonames.php:141
-msgid "Geonames Settings"
-msgstr "Ustawienia Geonames"
+#: geonames.php:187
+msgid "Submit"
+msgstr "Wyślij"
diff --git a/geonames/lang/pl/strings.php b/geonames/lang/pl/strings.php
index 2690516f..4a04e148 100644
--- a/geonames/lang/pl/strings.php
+++ b/geonames/lang/pl/strings.php
@@ -2,9 +2,10 @@
 
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
-	$n = intval($n);
-	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
+	return ($n==1 ? 0 : ($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14) ? 1 : $n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14) ? 2 : 3);;
 }}
-$a->strings['Replace numerical coordinates by the nearest populated location name in your posts.'] = 'Zastąp w swoich wpisach współrzędne numeryczne nazwą najbliższej zaludnionej lokalizacji.';
-$a->strings['Enable Geonames Addon'] = 'Włącz dodatek Geonames';
-$a->strings['Geonames Settings'] = 'Ustawienia Geonames';
+;
+$a->strings["Geonames settings updated."] = "Zaktualizowano ustawienia Geonames.";
+$a->strings["Geonames Settings"] = "Ustawienia Geonames";
+$a->strings["Enable Geonames Addon"] = "Włącz dodatek Geonames";
+$a->strings["Submit"] = "Wyślij";
diff --git a/geonames/lang/ro/strings.php b/geonames/lang/ro/strings.php
index 2747a877..b6258552 100644
--- a/geonames/lang/ro/strings.php
+++ b/geonames/lang/ro/strings.php
@@ -2,10 +2,10 @@
 
 if(! function_exists("string_plural_select_ro")) {
 function string_plural_select_ro($n){
-	$n = intval($n);
-	if ($n==1) { return 0; } else if ((($n%100>19)||(($n%100==0)&&($n!=0)))) { return 2; } else  { return 1; }
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
 }}
-$a->strings['Geonames settings updated.'] = 'Configurări Geonume actualizate.';
-$a->strings['Geonames Settings'] = 'Configurări Geonume';
-$a->strings['Enable Geonames Addon'] = 'Permite Modul Geonume';
-$a->strings['Submit'] = 'Trimite';
+;
+$a->strings["Geonames settings updated."] = "Configurări Geonume actualizate.";
+$a->strings["Geonames Settings"] = "Configurări Geonume";
+$a->strings["Enable Geonames Addon"] = "Permite Modul Geonume";
+$a->strings["Submit"] = "Trimite";
diff --git a/geonames/lang/ru/strings.php b/geonames/lang/ru/strings.php
index 7269f50c..282db750 100644
--- a/geonames/lang/ru/strings.php
+++ b/geonames/lang/ru/strings.php
@@ -3,9 +3,10 @@
 if(! function_exists("string_plural_select_ru")) {
 function string_plural_select_ru($n){
 	$n = intval($n);
-	if ($n%10==1 && $n%100!=11) { return 0; } else if ($n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14)) { return 1; } else if ($n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)) { return 2; } else  { return 3; }
+	return ($n%10==1 && $n%100!=11 ? 0 : $n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14) ? 1 : $n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)? 2 : 3);;
 }}
-$a->strings['Geonames settings updated.'] = 'Настройки Geonames обновлены.';
-$a->strings['Geonames Settings'] = 'Настройки Geonames';
-$a->strings['Enable Geonames Addon'] = 'Включить аддон Geonames';
-$a->strings['Submit'] = 'Добавить';
+;
+$a->strings["Geonames settings updated."] = "Настройки Geonames обновлены.";
+$a->strings["Geonames Settings"] = "Настройки Geonames";
+$a->strings["Enable Geonames Addon"] = "Включить аддон Geonames";
+$a->strings["Submit"] = "Добавить";
diff --git a/geonames/lang/sv/messages.po b/geonames/lang/sv/messages.po
deleted file mode 100644
index 54a96ebe..00000000
--- a/geonames/lang/sv/messages.po
+++ /dev/null
@@ -1,33 +0,0 @@
-# ADDON geonames
-# Copyright (C)
-# This file is distributed under the same license as the Friendica geonames addon package.
-# 
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:14-0500\n"
-"PO-Revision-Date: 2021-12-22 17:23+0000\n"
-"Last-Translator: Transifex Bot <>\n"
-"Language-Team: Swedish (http://www.transifex.com/Friendica/friendica/language/sv/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: sv\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: geonames.php:135
-msgid ""
-"Replace numerical coordinates by the nearest populated location name in your"
-" posts."
-msgstr ""
-
-#: geonames.php:136
-msgid "Enable Geonames Addon"
-msgstr ""
-
-#: geonames.php:141
-msgid "Geonames Settings"
-msgstr ""
diff --git a/geonames/lang/sv/strings.php b/geonames/lang/sv/strings.php
index 72e9772f..3ec569a7 100644
--- a/geonames/lang/sv/strings.php
+++ b/geonames/lang/sv/strings.php
@@ -1,7 +1,3 @@
-<?php
-
-if(! function_exists("string_plural_select_sv")) {
-function string_plural_select_sv($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
+<?php
+
+$a->strings["Submit"] = "Spara";
diff --git a/geonames/templates/settings.tpl b/geonames/templates/settings.tpl
index 796a544c..05897b6a 100644
--- a/geonames/templates/settings.tpl
+++ b/geonames/templates/settings.tpl
@@ -1,2 +1,14 @@
-<p>{{$info}}</p>
-{{include file="field_checkbox.tpl" field=$enable}}
+<span id="settings_geonames_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose('settings_geonames_expanded'); openClose('settings_geonames_inflated');">
+	<h3>{{$title}}</h3>
+</span>
+<div id="settings_geonames_expanded" class="settings-block" style="display: none;">
+	<span class="fakelink" onclick="openClose('settings_geonames_expanded'); openClose('settings_geonames_inflated');">
+		<h3>{{$title}}</h3>
+	</span>
+	<p>{{$description nofilter}}</p>
+	{{include file="field_checkbox.tpl" field=$enable}}
+	<div class="settings-submit-wrapper" >
+		<input type="submit" id="geonames-submit" name="geonames-submit" class="settings-submit" value="{{$submit}}" />
+	</div>
+</div>
+<div class="clear"></div>
\ No newline at end of file
diff --git a/gnot/gnot.css b/gnot/gnot.css
new file mode 100644
index 00000000..ccafdafb
--- /dev/null
+++ b/gnot/gnot.css
@@ -0,0 +1,16 @@
+
+#gnot-desc {
+	margin-bottom: 10px;
+}
+
+#gnot-label {
+	float: left;
+	width: 200px;
+	margin-bottom: 25px;
+}
+
+#gnot {
+	float: left;
+}
+
+
diff --git a/gnot/gnot.php b/gnot/gnot.php
index 15fb4da0..2168f97a 100644
--- a/gnot/gnot.php
+++ b/gnot/gnot.php
@@ -7,68 +7,92 @@
  * 
  *
  */
-
-use Friendica\App;
 use Friendica\Core\Hook;
+use Friendica\Core\L10n;
 use Friendica\Core\Logger;
+use Friendica\Core\PConfig;
 use Friendica\Core\Renderer;
-use Friendica\DI;
-use Friendica\Model\Notification;
 
-function gnot_install()
-{
+function gnot_install() {
+
 	Hook::register('addon_settings', 'addon/gnot/gnot.php', 'gnot_settings');
 	Hook::register('addon_settings_post', 'addon/gnot/gnot.php', 'gnot_settings_post');
 	Hook::register('enotify_mail', 'addon/gnot/gnot.php', 'gnot_enotify_mail');
 
-	Logger::notice("installed gnot");
+	Logger::log("installed gnot");
 }
 
+
+function gnot_uninstall() {
+
+	Hook::unregister('addon_settings', 'addon/gnot/gnot.php', 'gnot_settings');
+	Hook::unregister('addon_settings_post', 'addon/gnot/gnot.php', 'gnot_settings_post');
+	Hook::unregister('enotify_mail', 'addon/gnot/gnot.php', 'gnot_enotify_mail');
+
+
+	Logger::log("removed gnot");
+}
+
+
+
 /**
+ *
  * Callback from the settings post function.
  * $post contains the $_POST array.
  * We will make sure we've got a valid user account
  * and if so set our configuration setting for this person.
+ *
  */
-function gnot_settings_post($post) {
-	if(! DI::userSession()->getLocalUserId() || empty($_POST['gnot-submit']))
+
+function gnot_settings_post($a,$post) {
+	if(! local_user() || empty($_POST['gnot-submit']))
 		return;
 
-	DI::pConfig()->set(DI::userSession()->getLocalUserId(),'gnot','enable',intval($_POST['gnot']));
+	PConfig::set(local_user(),'gnot','enable',intval($_POST['gnot']));
+	info(L10n::t('Gnot settings updated.') . EOL);
 }
 
+
 /**
+ *
  * Called from the Addon Setting form. 
  * Add our own settings info to the page.
+ *
  */
-function gnot_settings(array &$data)
-{
-	if (!DI::userSession()->getLocalUserId()) {
+
+
+
+function gnot_settings(&$a,&$s) {
+
+	if(! local_user())
 		return;
-	}
 
-	$gnot = intval(DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'gnot', 'enable'));
+	/* Add our stylesheet to the page so we can make our settings look nice */
 
-	$t    = Renderer::getMarkupTemplate('settings.tpl', 'addon/gnot/');
-	$html = Renderer::replaceMacros($t, [
-		'$text'    => DI::l10n()->t("Allows threading of email comment notifications on Gmail and anonymising the subject line."),
-		'$enabled' => ['gnot', DI::l10n()->t('Enable this addon?'), $gnot],
+	$a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->getBaseURL() . '/addon/gnot/gnot.css' . '" media="all" />' . "\r\n";
+
+	/* Get the current state of our config variable */
+
+	$gnot = intval(PConfig::get(local_user(),'gnot','enable'));
+
+	$gnot_checked = (($gnot) ? ' checked="checked" ' : '' );
+	
+	$t = Renderer::getMarkupTemplate('settings.tpl', 'addon/gnot/');
+	/* Add some HTML to the existing form */
+
+	$s .= Renderer::replaceMacros($t, [
+		'$title' => L10n::t('Gnot Settings') ,
+		'$submit' => L10n::t('Save Settings'),
+		'$enable' => L10n::t('Enable this addon?'),
+		'$enabled' => $gnot_checked,
+		'$text' => L10n::t("Allows threading of email comment notifications on Gmail and anonymising the subject line.") 
 	]);
-
-	$data = [
-		'addon' => 'gnot',
-		'title' => DI::l10n()->t('Gnot Settings'),
-		'html'  => $html,
-	];
 }
 
-function gnot_enotify_mail(array &$b)
-{
-	if ((!$b['uid']) || (! intval(DI::pConfig()->get($b['uid'], 'gnot','enable')))) {
+
+function gnot_enotify_mail(&$a,&$b) {
+	if((! $b['uid']) || (! intval(PConfig::get($b['uid'], 'gnot','enable'))))
 		return;
-	}
-
-	if ($b['type'] == Notification\Type::COMMENT) {
-		$b['subject'] = DI::l10n()->t('[Friendica:Notify] Comment to conversation #%d', $b['parent']);
-	}
+	if($b['type'] == NOTIFY_COMMENT)
+		$b['subject'] = L10n::t('[Friendica:Notify] Comment to conversation #%d', $b['parent']);
 }
diff --git a/gnot/lang/C/messages.po b/gnot/lang/C/messages.po
index 8ca06d33..230d2364 100644
--- a/gnot/lang/C/messages.po
+++ b/gnot/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:14-0500\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,21 +17,29 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: gnot.php:63
+#: gnot.php:48
+msgid "Gnot settings updated."
+msgstr ""
+
+#: gnot.php:79
+msgid "Gnot Settings"
+msgstr ""
+
+#: gnot.php:81
 msgid ""
 "Allows threading of email comment notifications on Gmail and anonymising the "
 "subject line."
 msgstr ""
 
-#: gnot.php:64
+#: gnot.php:82
 msgid "Enable this addon?"
 msgstr ""
 
-#: gnot.php:69
-msgid "Gnot Settings"
+#: gnot.php:88
+msgid "Submit"
 msgstr ""
 
-#: gnot.php:79
+#: gnot.php:97
 #, php-format
 msgid "[Friendica:Notify] Comment to conversation #%d"
 msgstr ""
diff --git a/gnot/lang/ar/messages.po b/gnot/lang/ar/messages.po
deleted file mode 100644
index 89c5009a..00000000
--- a/gnot/lang/ar/messages.po
+++ /dev/null
@@ -1,44 +0,0 @@
-# ADDON gnot
-# Copyright (C)
-# This file is distributed under the same license as the Friendica gnot addon package.
-# 
-# 
-# Translators:
-# abidin toumi <abidin24@tutanota.com>, 2021
-# Farida Khalaf <faridakhalaf@hotmail.com>, 2021
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2021-10-29 10:35+0000\n"
-"Last-Translator: abidin toumi <abidin24@tutanota.com>\n"
-"Language-Team: Arabic (http://www.transifex.com/Friendica/friendica/language/ar/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ar\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-
-#: gnot.php:71
-msgid "Gnot Settings"
-msgstr "إعدادات Gnot"
-
-#: gnot.php:72
-msgid "Save Settings"
-msgstr "احفظ الإعدادات"
-
-#: gnot.php:73
-msgid "Enable this addon?"
-msgstr "أتريد تفعيل هذه الإضافة؟"
-
-#: gnot.php:75
-msgid ""
-"Allows threading of email comment notifications on Gmail and anonymising the"
-" subject line."
-msgstr "السماح بتسلسل تنبيهات التعليقات عبر البريد الإلكتروني على Gmail  وإخفاء هوية عنوان الموضوع."
-
-#: gnot.php:84
-#, php-format
-msgid "[Friendica:Notify] Comment to conversation #%d"
-msgstr "[فرنديكا:تنبيه] علق على المحادقة #%d"
diff --git a/gnot/lang/ar/strings.php b/gnot/lang/ar/strings.php
deleted file mode 100644
index bdfbc34a..00000000
--- a/gnot/lang/ar/strings.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_ar")) {
-function string_plural_select_ar($n){
-	$n = intval($n);
-	if ($n==0) { return 0; } else if ($n==1) { return 1; } else if ($n==2) { return 2; } else if ($n%100>=3 && $n%100<=10) { return 3; } else if ($n%100>=11 && $n%100<=99) { return 4; } else  { return 5; }
-}}
-$a->strings['Gnot Settings'] = 'إعدادات Gnot';
-$a->strings['Save Settings'] = 'احفظ الإعدادات';
-$a->strings['Enable this addon?'] = 'أتريد تفعيل هذه الإضافة؟';
-$a->strings['Allows threading of email comment notifications on Gmail and anonymising the subject line.'] = 'السماح بتسلسل تنبيهات التعليقات عبر البريد الإلكتروني على Gmail  وإخفاء هوية عنوان الموضوع.';
-$a->strings['[Friendica:Notify] Comment to conversation #%d'] = '[فرنديكا:تنبيه] علق على المحادقة #%d';
diff --git a/gnot/lang/ca/strings.php b/gnot/lang/ca/strings.php
index 67ac90f6..4a4187cf 100644
--- a/gnot/lang/ca/strings.php
+++ b/gnot/lang/ca/strings.php
@@ -3,11 +3,12 @@
 if(! function_exists("string_plural_select_ca")) {
 function string_plural_select_ca($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Gnot settings updated.'] = 'S\'ha actualitzat la configuració de Gnot.';
-$a->strings['Gnot Settings'] = 'Configuració de gnot';
-$a->strings['Allows threading of email comment notifications on Gmail and anonymising the subject line.'] = 'Permet llançar les notificacions de comentaris de correu electrònic a Gmail i anonimitzar la línia de l’assumpte.';
-$a->strings['Enable this addon?'] = 'Activar aquest addon?';
-$a->strings['Submit'] = 'Envia';
-$a->strings['[Friendica:Notify] Comment to conversation #%d'] = '[Friendica:Notify] comenta la conversa #%d';
+;
+$a->strings["Gnot settings updated."] = "S'ha actualitzat la configuració de Gnot.";
+$a->strings["Gnot Settings"] = "Configuració de gnot";
+$a->strings["Allows threading of email comment notifications on Gmail and anonymising the subject line."] = "Permet llançar les notificacions de comentaris de correu electrònic a Gmail i anonimitzar la línia de l’assumpte.";
+$a->strings["Enable this addon?"] = "Activar aquest addon?";
+$a->strings["Submit"] = "Envia";
+$a->strings["[Friendica:Notify] Comment to conversation #%d"] = "[Friendica:Notify] comenta la conversa #%d";
diff --git a/gnot/lang/cs/strings.php b/gnot/lang/cs/strings.php
index 2a522d33..633f0917 100644
--- a/gnot/lang/cs/strings.php
+++ b/gnot/lang/cs/strings.php
@@ -3,11 +3,12 @@
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
 	$n = intval($n);
-	if (($n == 1 && $n % 1 == 0)) { return 0; } else if (($n >= 2 && $n <= 4 && $n % 1 == 0)) { return 1; } else if (($n % 1 != 0 )) { return 2; } else  { return 3; }
+	return ($n == 1 && $n % 1 == 0) ? 0 : ($n >= 2 && $n <= 4 && $n % 1 == 0) ? 1: ($n % 1 != 0 ) ? 2 : 3;;
 }}
-$a->strings['Gnot settings updated.'] = 'Nastavení Gnot aktualizováno.';
-$a->strings['Gnot Settings'] = 'Nastavení Gnot';
-$a->strings['Allows threading of email comment notifications on Gmail and anonymising the subject line.'] = 'Umožnit řetězení emailových komentářových oznámení na Gmailu a anonymizací řádky předmětu.';
-$a->strings['Enable this addon?'] = 'Povolit tento doplněk?';
-$a->strings['Submit'] = 'Odeslat';
-$a->strings['[Friendica:Notify] Comment to conversation #%d'] = '[Friendica:Oznámení] Komentář ke konverzaci #%d';
+;
+$a->strings["Gnot settings updated."] = "Nastavení Gnot aktualizováno.";
+$a->strings["Gnot Settings"] = "Nastavení Gnot";
+$a->strings["Allows threading of email comment notifications on Gmail and anonymising the subject line."] = "Umožnit řetězení emailových komentářových oznámení na Gmailu a anonymizací řádky předmětu.";
+$a->strings["Enable this addon?"] = "Povolit tento doplněk?";
+$a->strings["Submit"] = "Odeslat";
+$a->strings["[Friendica:Notify] Comment to conversation #%d"] = "[Friendica:Oznámení] Komentář ke konverzaci #%d";
diff --git a/gnot/lang/da-dk/messages.po b/gnot/lang/da-dk/messages.po
deleted file mode 100644
index f9705fcf..00000000
--- a/gnot/lang/da-dk/messages.po
+++ /dev/null
@@ -1,38 +0,0 @@
-# ADDON gnot
-# Copyright (C)
-# This file is distributed under the same license as the Friendica gnot addon package.
-# 
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:14-0500\n"
-"PO-Revision-Date: 2014-06-23 08:30+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Danish (Denmark) (http://www.transifex.com/Friendica/friendica/language/da_DK/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: da_DK\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: gnot.php:63
-msgid ""
-"Allows threading of email comment notifications on Gmail and anonymising the"
-" subject line."
-msgstr ""
-
-#: gnot.php:64
-msgid "Enable this addon?"
-msgstr ""
-
-#: gnot.php:69
-msgid "Gnot Settings"
-msgstr ""
-
-#: gnot.php:79
-#, php-format
-msgid "[Friendica:Notify] Comment to conversation #%d"
-msgstr ""
diff --git a/gnot/lang/da-dk/strings.php b/gnot/lang/da-dk/strings.php
deleted file mode 100644
index 09554750..00000000
--- a/gnot/lang/da-dk/strings.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_da_dk")) {
-function string_plural_select_da_dk($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
diff --git a/gnot/lang/de/messages.po b/gnot/lang/de/messages.po
index a3ffbe12..747f1853 100644
--- a/gnot/lang/de/messages.po
+++ b/gnot/lang/de/messages.po
@@ -4,39 +4,45 @@
 # 
 # 
 # Translators:
-# Andreas H., 2014
-# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2014
-# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2018,2021
-# Ulf Rompe <transifex.com@rompe.org>, 2019
+# Abrax <webmaster@a-zwenkau.de>, 2014
+# bavatar <tobias.diekershoff@gmx.net>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:14-0500\n"
-"PO-Revision-Date: 2014-06-23 08:30+0000\n"
-"Last-Translator: Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2018,2021\n"
-"Language-Team: German (http://app.transifex.com/Friendica/friendica/language/de/)\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2014-10-15 12:29+0000\n"
+"Last-Translator: Abrax <webmaster@a-zwenkau.de>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/friendica/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: gnot.php:63
+#: gnot.php:48
+msgid "Gnot settings updated."
+msgstr "Gnot Einstellungen aktualisiert."
+
+#: gnot.php:79
+msgid "Gnot Settings"
+msgstr "Gnot Einstellungen"
+
+#: gnot.php:81
 msgid ""
 "Allows threading of email comment notifications on Gmail and anonymising the"
 " subject line."
-msgstr "Erlaubt das Veröffentlichen von E-Mail-Kommentar-Benachrichtigungen bei Gmail mit anonymisiertem Betreff"
+msgstr "Erlaubt das Veröffentlichen von E-Mail Kommentar Benachrichtigungen bei Gmail mit anonymisiertem Betreff"
 
-#: gnot.php:64
+#: gnot.php:82
 msgid "Enable this addon?"
 msgstr "Dieses Addon aktivieren?"
 
-#: gnot.php:69
-msgid "Gnot Settings"
-msgstr "Gnot-Einstellungen"
+#: gnot.php:88
+msgid "Submit"
+msgstr "Senden"
 
-#: gnot.php:79
+#: gnot.php:97
 #, php-format
 msgid "[Friendica:Notify] Comment to conversation #%d"
 msgstr "[Friendica-Benachrichtigung] Kommentar zum Beitrag #%d"
diff --git a/gnot/lang/de/strings.php b/gnot/lang/de/strings.php
index 4dacbc21..b798a21b 100644
--- a/gnot/lang/de/strings.php
+++ b/gnot/lang/de/strings.php
@@ -2,10 +2,12 @@
 
 if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Allows threading of email comment notifications on Gmail and anonymising the subject line.'] = 'Erlaubt das Veröffentlichen von E-Mail-Kommentar-Benachrichtigungen bei Gmail mit anonymisiertem Betreff';
-$a->strings['Enable this addon?'] = 'Dieses Addon aktivieren?';
-$a->strings['Gnot Settings'] = 'Gnot-Einstellungen';
-$a->strings['[Friendica:Notify] Comment to conversation #%d'] = '[Friendica-Benachrichtigung] Kommentar zum Beitrag #%d';
+;
+$a->strings["Gnot settings updated."] = "Gnot Einstellungen aktualisiert.";
+$a->strings["Gnot Settings"] = "Gnot Einstellungen";
+$a->strings["Allows threading of email comment notifications on Gmail and anonymising the subject line."] = "Erlaubt das Veröffentlichen von E-Mail Kommentar Benachrichtigungen bei Gmail mit anonymisiertem Betreff";
+$a->strings["Enable this addon?"] = "Dieses Addon aktivieren?";
+$a->strings["Submit"] = "Senden";
+$a->strings["[Friendica:Notify] Comment to conversation #%d"] = "[Friendica-Benachrichtigung] Kommentar zum Beitrag #%d";
diff --git a/gnot/lang/es/messages.po b/gnot/lang/es/messages.po
index 7abd2464..6e4b8569 100644
--- a/gnot/lang/es/messages.po
+++ b/gnot/lang/es/messages.po
@@ -5,14 +5,13 @@
 # 
 # Translators:
 # Albert, 2016
-# Senex Petrovic <javierruizo@hotmail.com>, 2021
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2021-04-01 09:56+0000\n"
-"Last-Translator: Senex Petrovic <javierruizo@hotmail.com>\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2016-11-16 16:38+0000\n"
+"Last-Translator: Albert\n"
 "Language-Team: Spanish (http://www.transifex.com/Friendica/friendica/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,25 +19,29 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: gnot.php:71
+#: gnot.php:48
+msgid "Gnot settings updated."
+msgstr "Ajustes de Gnot actualizados."
+
+#: gnot.php:79
 msgid "Gnot Settings"
 msgstr "Ajustes de Gnot"
 
-#: gnot.php:72
-msgid "Save Settings"
-msgstr "Guardar Ajustes"
-
-#: gnot.php:73
-msgid "Enable this addon?"
-msgstr "¿Habilitar este plugin/addon?"
-
-#: gnot.php:75
+#: gnot.php:81
 msgid ""
 "Allows threading of email comment notifications on Gmail and anonymising the"
 " subject line."
 msgstr "Permite limpiar las notificaciones de comentario de email en Gmail y anonimizar la línea del tema."
 
-#: gnot.php:84
+#: gnot.php:82
+msgid "Enable this addon?"
+msgstr "¿Habilitar este addon?"
+
+#: gnot.php:88
+msgid "Submit"
+msgstr "Enviar"
+
+#: gnot.php:97
 #, php-format
 msgid "[Friendica:Notify] Comment to conversation #%d"
 msgstr "[Friendica:Notify] Comentar en conversación #%d"
diff --git a/gnot/lang/es/strings.php b/gnot/lang/es/strings.php
index 766cb49b..2f9e7a8d 100644
--- a/gnot/lang/es/strings.php
+++ b/gnot/lang/es/strings.php
@@ -2,11 +2,12 @@
 
 if(! function_exists("string_plural_select_es")) {
 function string_plural_select_es($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Gnot Settings'] = 'Ajustes de Gnot';
-$a->strings['Save Settings'] = 'Guardar Ajustes';
-$a->strings['Enable this addon?'] = '¿Habilitar este plugin/addon?';
-$a->strings['Allows threading of email comment notifications on Gmail and anonymising the subject line.'] = 'Permite limpiar las notificaciones de comentario de email en Gmail y anonimizar la línea del tema.';
-$a->strings['[Friendica:Notify] Comment to conversation #%d'] = '[Friendica:Notify] Comentar en conversación #%d';
+;
+$a->strings["Gnot settings updated."] = "Ajustes de Gnot actualizados.";
+$a->strings["Gnot Settings"] = "Ajustes de Gnot";
+$a->strings["Allows threading of email comment notifications on Gmail and anonymising the subject line."] = "Permite limpiar las notificaciones de comentario de email en Gmail y anonimizar la línea del tema.";
+$a->strings["Enable this addon?"] = "¿Habilitar este addon?";
+$a->strings["Submit"] = "Enviar";
+$a->strings["[Friendica:Notify] Comment to conversation #%d"] = "[Friendica:Notify] Comentar en conversación #%d";
diff --git a/gnot/lang/fi-fi/strings.php b/gnot/lang/fi-fi/strings.php
index 4b5e1218..284bd29f 100644
--- a/gnot/lang/fi-fi/strings.php
+++ b/gnot/lang/fi-fi/strings.php
@@ -2,11 +2,12 @@
 
 if(! function_exists("string_plural_select_fi_fi")) {
 function string_plural_select_fi_fi($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Gnot settings updated.'] = 'Gnot -asetukset päivitetty.';
-$a->strings['Gnot Settings'] = 'Gnot -asetukset';
-$a->strings['Enable this addon?'] = 'Ota tämä lisäosa käyttöön?';
-$a->strings['Submit'] = 'Lähetä';
-$a->strings['[Friendica:Notify] Comment to conversation #%d'] = '[Friendica:Notify] Kommentti keskustelussa #%d';
+;
+$a->strings["Gnot settings updated."] = "Gnot -asetukset päivitetty.";
+$a->strings["Gnot Settings"] = "Gnot -asetukset";
+$a->strings["Allows threading of email comment notifications on Gmail and anonymising the subject line."] = "";
+$a->strings["Enable this addon?"] = "Ota tämä lisäosa käyttöön?";
+$a->strings["Submit"] = "Lähetä";
+$a->strings["[Friendica:Notify] Comment to conversation #%d"] = "[Friendica:Notify] Kommentti keskustelussa #%d";
diff --git a/gnot/lang/fr/messages.po b/gnot/lang/fr/messages.po
deleted file mode 100644
index 3ce82e7f..00000000
--- a/gnot/lang/fr/messages.po
+++ /dev/null
@@ -1,41 +0,0 @@
-# ADDON gnot
-# Copyright (C)
-# This file is distributed under the same license as the Friendica gnot addon package.
-# 
-# 
-# Translators:
-# bob lebonche <lebonche@tutanota.com>, 2021
-# ButterflyOfFire, 2020
-# Hypolite Petovan <hypolite@mrpetovan.com>, 2016
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:14-0500\n"
-"PO-Revision-Date: 2014-06-23 08:30+0000\n"
-"Last-Translator: bob lebonche <lebonche@tutanota.com>, 2021\n"
-"Language-Team: French (http://www.transifex.com/Friendica/friendica/language/fr/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: fr\n"
-"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
-
-#: gnot.php:63
-msgid ""
-"Allows threading of email comment notifications on Gmail and anonymising the"
-" subject line."
-msgstr "Permettre le filtrage des notifications de commentaires par courriel sur Gmail et l'anonymisation de l'objet."
-
-#: gnot.php:64
-msgid "Enable this addon?"
-msgstr "Activer cette application complémentaire ?"
-
-#: gnot.php:69
-msgid "Gnot Settings"
-msgstr "Paramètres Gnot"
-
-#: gnot.php:79
-#, php-format
-msgid "[Friendica:Notify] Comment to conversation #%d"
-msgstr "[Friendica:Notify] Commentaire vers conversation #%d"
diff --git a/gnot/lang/fr/strings.php b/gnot/lang/fr/strings.php
index c498f7e8..32caf46b 100644
--- a/gnot/lang/fr/strings.php
+++ b/gnot/lang/fr/strings.php
@@ -1,11 +1,8 @@
-<?php
-
-if(! function_exists("string_plural_select_fr")) {
-function string_plural_select_fr($n){
-	$n = intval($n);
-	if (($n == 0 || $n == 1)) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
-}}
-$a->strings['Allows threading of email comment notifications on Gmail and anonymising the subject line.'] = 'Permettre le filtrage des notifications de commentaires par courriel sur Gmail et l\'anonymisation de l\'objet.';
-$a->strings['Enable this addon?'] = 'Activer cette application complémentaire ?';
-$a->strings['Gnot Settings'] = 'Paramètres Gnot';
-$a->strings['[Friendica:Notify] Comment to conversation #%d'] = '[Friendica:Notify] Commentaire vers conversation #%d';
+<?php
+
+$a->strings["Gnot settings updated."] = "Réglages Gnot sauvés.";
+$a->strings["Gnot Settings"] = "Réglages Gnot";
+$a->strings["Allows threading of email comment notifications on Gmail and anonymising the subject line."] = "Autorise l'arborescence des notifications de commentaires sur GMail, et rend la ligne 'Sujet' anonyme.";
+$a->strings["Enable this addon?"] = "Activer cette extension?";
+$a->strings["Submit"] = "Envoyer";
+$a->strings["[Friendica:Notify] Comment to conversation #%d"] = "[Friendica:Notification] Commentaire sur la conversation #%d";
diff --git a/gnot/lang/hu/messages.po b/gnot/lang/hu/messages.po
deleted file mode 100644
index 0a902ba1..00000000
--- a/gnot/lang/hu/messages.po
+++ /dev/null
@@ -1,39 +0,0 @@
-# ADDON gnot
-# Copyright (C)
-# This file is distributed under the same license as the Friendica gnot addon package.
-# 
-# 
-# Translators:
-# Balázs Úr, 2020-2021
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:14-0500\n"
-"PO-Revision-Date: 2014-06-23 08:30+0000\n"
-"Last-Translator: Balázs Úr, 2020-2021\n"
-"Language-Team: Hungarian (http://www.transifex.com/Friendica/friendica/language/hu/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: hu\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: gnot.php:63
-msgid ""
-"Allows threading of email comment notifications on Gmail and anonymising the"
-" subject line."
-msgstr "Lehetővé teszi az e-mailes hozzászólás értesítéseinek szálkezelését a Gmailnél, és anonimizálja a tárgy sorát."
-
-#: gnot.php:64
-msgid "Enable this addon?"
-msgstr "Engedélyezi ezt a bővítményt?"
-
-#: gnot.php:69
-msgid "Gnot Settings"
-msgstr "Gnot beállítások"
-
-#: gnot.php:79
-#, php-format
-msgid "[Friendica:Notify] Comment to conversation #%d"
-msgstr "[Friendica: értesítés] Hozzászólás a(z) %d. beszélgetéshez"
diff --git a/gnot/lang/hu/strings.php b/gnot/lang/hu/strings.php
deleted file mode 100644
index 94d74535..00000000
--- a/gnot/lang/hu/strings.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_hu")) {
-function string_plural_select_hu($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Allows threading of email comment notifications on Gmail and anonymising the subject line.'] = 'Lehetővé teszi az e-mailes hozzászólás értesítéseinek szálkezelését a Gmailnél, és anonimizálja a tárgy sorát.';
-$a->strings['Enable this addon?'] = 'Engedélyezi ezt a bővítményt?';
-$a->strings['Gnot Settings'] = 'Gnot beállítások';
-$a->strings['[Friendica:Notify] Comment to conversation #%d'] = '[Friendica: értesítés] Hozzászólás a(z) %d. beszélgetéshez';
diff --git a/gnot/lang/it/messages.po b/gnot/lang/it/messages.po
index 4245469e..4c200ede 100644
--- a/gnot/lang/it/messages.po
+++ b/gnot/lang/it/messages.po
@@ -5,14 +5,13 @@
 # 
 # Translators:
 # fabrixxm <fabrix.xm@gmail.com>, 2014-2015,2018
-# Sylke Vicious <silkevicious@gmail.com>, 2021
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2021-02-16 12:47+0000\n"
-"Last-Translator: Sylke Vicious <silkevicious@gmail.com>\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2018-03-19 13:22+0000\n"
+"Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,25 +19,29 @@ msgstr ""
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: gnot.php:71
+#: gnot.php:48
+msgid "Gnot settings updated."
+msgstr "Impostazioni di \"Gnot\" aggiornate."
+
+#: gnot.php:79
 msgid "Gnot Settings"
 msgstr "Impostazioni Gnot"
 
-#: gnot.php:72
-msgid "Save Settings"
-msgstr "Salva Impostazioni"
-
-#: gnot.php:73
-msgid "Enable this addon?"
-msgstr "Abilita questo componente aggiuntivo?"
-
-#: gnot.php:75
+#: gnot.php:81
 msgid ""
 "Allows threading of email comment notifications on Gmail and anonymising the"
 " subject line."
 msgstr "Permetti di raggruppare le notifiche dei commenti in thread su Gmail e anonimizza l'oggetto"
 
-#: gnot.php:84
+#: gnot.php:82
+msgid "Enable this addon?"
+msgstr "Abilita questo componente aggiuntivo?"
+
+#: gnot.php:88
+msgid "Submit"
+msgstr "Invia"
+
+#: gnot.php:97
 #, php-format
 msgid "[Friendica:Notify] Comment to conversation #%d"
 msgstr "[Friendica:Notifica] Commento alla conversazione n° %d"
diff --git a/gnot/lang/it/strings.php b/gnot/lang/it/strings.php
index c82b12f2..c38bac29 100644
--- a/gnot/lang/it/strings.php
+++ b/gnot/lang/it/strings.php
@@ -2,11 +2,12 @@
 
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Gnot Settings'] = 'Impostazioni Gnot';
-$a->strings['Save Settings'] = 'Salva Impostazioni';
-$a->strings['Enable this addon?'] = 'Abilita questo componente aggiuntivo?';
-$a->strings['Allows threading of email comment notifications on Gmail and anonymising the subject line.'] = 'Permetti di raggruppare le notifiche dei commenti in thread su Gmail e anonimizza l\'oggetto';
-$a->strings['[Friendica:Notify] Comment to conversation #%d'] = '[Friendica:Notifica] Commento alla conversazione n° %d';
+;
+$a->strings["Gnot settings updated."] = "Impostazioni di \"Gnot\" aggiornate.";
+$a->strings["Gnot Settings"] = "Impostazioni Gnot";
+$a->strings["Allows threading of email comment notifications on Gmail and anonymising the subject line."] = "Permetti di raggruppare le notifiche dei commenti in thread su Gmail e anonimizza l'oggetto";
+$a->strings["Enable this addon?"] = "Abilita questo componente aggiuntivo?";
+$a->strings["Submit"] = "Invia";
+$a->strings["[Friendica:Notify] Comment to conversation #%d"] = "[Friendica:Notifica] Commento alla conversazione n° %d";
diff --git a/gnot/lang/nl/strings.php b/gnot/lang/nl/strings.php
index f7430214..30902b4a 100644
--- a/gnot/lang/nl/strings.php
+++ b/gnot/lang/nl/strings.php
@@ -3,8 +3,12 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Gnot settings updated.'] = 'Gnot instellingen opgeslagen';
-$a->strings['Gnot Settings'] = 'Gnot instellingen';
-$a->strings['Enable this addon?'] = 'Deze addon inschakelen?';
+;
+$a->strings["Gnot settings updated."] = "Gnot instellingen opgeslagen";
+$a->strings["Gnot Settings"] = "Gnot instellingen";
+$a->strings["Allows threading of email comment notifications on Gmail and anonymising the subject line."] = "";
+$a->strings["Enable this addon?"] = "Deze addon inschakelen?";
+$a->strings["Submit"] = "";
+$a->strings["[Friendica:Notify] Comment to conversation #%d"] = "";
diff --git a/gnot/lang/pl/messages.po b/gnot/lang/pl/messages.po
index 2e292c91..f3fba738 100644
--- a/gnot/lang/pl/messages.po
+++ b/gnot/lang/pl/messages.po
@@ -4,14 +4,14 @@
 # 
 # 
 # Translators:
-# Waldemar Stoczkowski, 2018
+# Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:14-0500\n"
-"PO-Revision-Date: 2014-06-23 08:30+0000\n"
-"Last-Translator: Waldemar Stoczkowski, 2018\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2018-03-31 19:43+0000\n"
+"Last-Translator: Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.com/Friendica/friendica/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,21 +19,29 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
-#: gnot.php:63
+#: gnot.php:48
+msgid "Gnot settings updated."
+msgstr "Zaktualizowano ustawienia Gnot."
+
+#: gnot.php:79
+msgid "Gnot Settings"
+msgstr "Ustawienia Gnot"
+
+#: gnot.php:81
 msgid ""
 "Allows threading of email comment notifications on Gmail and anonymising the"
 " subject line."
 msgstr "Umożliwia nawiązywanie powiadomień o komentarzach e-mail w Gmailu i anonimizowanie wiersza tematu."
 
-#: gnot.php:64
+#: gnot.php:82
 msgid "Enable this addon?"
 msgstr "Włączyć ten dodatek?"
 
-#: gnot.php:69
-msgid "Gnot Settings"
-msgstr "Ustawienia Gnot"
+#: gnot.php:88
+msgid "Submit"
+msgstr "Wyślij"
 
-#: gnot.php:79
+#: gnot.php:97
 #, php-format
 msgid "[Friendica:Notify] Comment to conversation #%d"
 msgstr "[Friendica:Powiadomienie] Komentarz do rozmowy #%d"
diff --git a/gnot/lang/pl/strings.php b/gnot/lang/pl/strings.php
index 8e6ff419..ccbe5dee 100644
--- a/gnot/lang/pl/strings.php
+++ b/gnot/lang/pl/strings.php
@@ -2,10 +2,12 @@
 
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
-	$n = intval($n);
-	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
+	return ($n==1 ? 0 : ($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14) ? 1 : $n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14) ? 2 : 3);;
 }}
-$a->strings['Allows threading of email comment notifications on Gmail and anonymising the subject line.'] = 'Umożliwia nawiązywanie powiadomień o komentarzach e-mail w Gmailu i anonimizowanie wiersza tematu.';
-$a->strings['Enable this addon?'] = 'Włączyć ten dodatek?';
-$a->strings['Gnot Settings'] = 'Ustawienia Gnot';
-$a->strings['[Friendica:Notify] Comment to conversation #%d'] = '[Friendica:Powiadomienie] Komentarz do rozmowy #%d';
+;
+$a->strings["Gnot settings updated."] = "Zaktualizowano ustawienia Gnot.";
+$a->strings["Gnot Settings"] = "Ustawienia Gnot";
+$a->strings["Allows threading of email comment notifications on Gmail and anonymising the subject line."] = "Umożliwia nawiązywanie powiadomień o komentarzach e-mail w Gmailu i anonimizowanie wiersza tematu.";
+$a->strings["Enable this addon?"] = "Włączyć ten dodatek?";
+$a->strings["Submit"] = "Wyślij";
+$a->strings["[Friendica:Notify] Comment to conversation #%d"] = "[Friendica:Powiadomienie] Komentarz do rozmowy #%d";
diff --git a/gnot/lang/ro/strings.php b/gnot/lang/ro/strings.php
index 363760cc..a3641f4e 100644
--- a/gnot/lang/ro/strings.php
+++ b/gnot/lang/ro/strings.php
@@ -2,12 +2,12 @@
 
 if(! function_exists("string_plural_select_ro")) {
 function string_plural_select_ro($n){
-	$n = intval($n);
-	if ($n==1) { return 0; } else if ((($n%100>19)||(($n%100==0)&&($n!=0)))) { return 2; } else  { return 1; }
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
 }}
-$a->strings['Gnot settings updated.'] = 'Configurările Gnot au fost actualizate.';
-$a->strings['Gnot Settings'] = 'Configurări Gnot';
-$a->strings['Allows threading of email comment notifications on Gmail and anonymising the subject line.'] = 'Permite înlănțuirea notificărilor prin email a comentariilor, în Gmail și anonimizarea  subiectului.';
-$a->strings['Enable this addon?'] = 'Activați acest modul/supliment?';
-$a->strings['Submit'] = 'Trimite';
-$a->strings['[Friendica:Notify] Comment to conversation #%d'] = '[Friendica:Notificare] Comentariu la conversația # %d';
+;
+$a->strings["Gnot settings updated."] = "Configurările Gnot au fost actualizate.";
+$a->strings["Gnot Settings"] = "Configurări Gnot";
+$a->strings["Allows threading of email comment notifications on Gmail and anonymising the subject line."] = "Permite înlănțuirea notificărilor prin email a comentariilor, în Gmail și anonimizarea  subiectului.";
+$a->strings["Enable this addon?"] = "Activați acest modul/supliment?";
+$a->strings["Submit"] = "Trimite";
+$a->strings["[Friendica:Notify] Comment to conversation #%d"] = "[Friendica:Notificare] Comentariu la conversația # %d";
diff --git a/gnot/lang/ru/strings.php b/gnot/lang/ru/strings.php
index ddf3023e..d49d0219 100644
--- a/gnot/lang/ru/strings.php
+++ b/gnot/lang/ru/strings.php
@@ -3,11 +3,12 @@
 if(! function_exists("string_plural_select_ru")) {
 function string_plural_select_ru($n){
 	$n = intval($n);
-	if ($n%10==1 && $n%100!=11) { return 0; } else if ($n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14)) { return 1; } else if ($n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)) { return 2; } else  { return 3; }
+	return ($n%10==1 && $n%100!=11 ? 0 : $n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14) ? 1 : $n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)? 2 : 3);;
 }}
-$a->strings['Gnot settings updated.'] = 'Настройки Gnot обновлены.';
-$a->strings['Gnot Settings'] = 'Настройки Gnot';
-$a->strings['Allows threading of email comment notifications on Gmail and anonymising the subject line.'] = 'Разрешить нитевание уведомлений о комментариях на Gmail и анонимизировать поле "Тема".';
-$a->strings['Enable this addon?'] = 'Включить этот аддон?';
-$a->strings['Submit'] = 'Добавить';
-$a->strings['[Friendica:Notify] Comment to conversation #%d'] = '[Friendica:Notify] Комментарий в теме #%d';
+;
+$a->strings["Gnot settings updated."] = "Настройки Gnot обновлены.";
+$a->strings["Gnot Settings"] = "Настройки Gnot";
+$a->strings["Allows threading of email comment notifications on Gmail and anonymising the subject line."] = "Разрешить нитевание уведомлений о комментариях на Gmail и анонимизировать поле \"Тема\".";
+$a->strings["Enable this addon?"] = "Включить этот аддон?";
+$a->strings["Submit"] = "Добавить";
+$a->strings["[Friendica:Notify] Comment to conversation #%d"] = "[Friendica:Notify] Комментарий в теме #%d";
diff --git a/gnot/lang/sv/messages.po b/gnot/lang/sv/messages.po
deleted file mode 100644
index 4d3464f0..00000000
--- a/gnot/lang/sv/messages.po
+++ /dev/null
@@ -1,39 +0,0 @@
-# ADDON gnot
-# Copyright (C)
-# This file is distributed under the same license as the Friendica gnot addon package.
-# 
-# 
-# Translators:
-# Kristoffer Grundström <lovaren@gmail.com>, 2022
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:14-0500\n"
-"PO-Revision-Date: 2022-01-15 23:39+0000\n"
-"Last-Translator: Kristoffer Grundström <lovaren@gmail.com>\n"
-"Language-Team: Swedish (http://www.transifex.com/Friendica/friendica/language/sv/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: sv\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: gnot.php:63
-msgid ""
-"Allows threading of email comment notifications on Gmail and anonymising the"
-" subject line."
-msgstr ""
-
-#: gnot.php:64
-msgid "Enable this addon?"
-msgstr ""
-
-#: gnot.php:69
-msgid "Gnot Settings"
-msgstr "Gnot-inställningar"
-
-#: gnot.php:79
-#, php-format
-msgid "[Friendica:Notify] Comment to conversation #%d"
-msgstr ""
diff --git a/gnot/lang/sv/strings.php b/gnot/lang/sv/strings.php
index 41d1308a..3ec569a7 100644
--- a/gnot/lang/sv/strings.php
+++ b/gnot/lang/sv/strings.php
@@ -1,8 +1,3 @@
-<?php
-
-if(! function_exists("string_plural_select_sv")) {
-function string_plural_select_sv($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Gnot Settings'] = 'Gnot-inställningar';
+<?php
+
+$a->strings["Submit"] = "Spara";
diff --git a/gnot/templates/settings.tpl b/gnot/templates/settings.tpl
index b153c623..1323eb4d 100644
--- a/gnot/templates/settings.tpl
+++ b/gnot/templates/settings.tpl
@@ -1,2 +1,20 @@
-<p>{{$text}}</p>
-{{include file="field_checkbox.tpl" field=$enabled}}
+<span id="settings_gnot_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_gnot_expanded\'); openClose(\'settings_gnot_inflated\');">
+	<h3>{{$title}}</h3>
+</span>
+<div id="settings_gnot_expanded" class="settings-block" style="display: none;">
+	<span class="fakelink" onclick="openClose(\'settings_gnot_expanded\'); openClose(\'settings_gnot_inflated\');">
+		<h3>{{$title}}</h3>
+	</span>
+	<div id="gnot-wrapper">
+		<div id="gnot-desc">{{$text}}</div>
+			<label id="gnot-label" for="gnot">{{$enable}}</label>
+			<input id="gnot-input" type="checkbox" name="gnot" value="1" {{$enabled}} />
+		</div>
+	<div class="clear"></div>
+
+	/* provide a submit button */
+
+	<div class="settings-submit-wrapper" >
+		<input type="submit" name="gnot-submit" class="settings-submit" value="{{$submit}}" />
+	</div>
+</div>
diff --git a/googlemaps/googlemaps.php b/googlemaps/googlemaps.php
index 356ce68c..09a566e8 100644
--- a/googlemaps/googlemaps.php
+++ b/googlemaps/googlemaps.php
@@ -6,8 +6,6 @@
  * Author: Michael Vogel <https://pirati.ca/profile/heluecht>
  *
  */
-
-use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 
@@ -15,26 +13,34 @@ function googlemaps_install()
 {
 	Hook::register('render_location', 'addon/googlemaps/googlemaps.php', 'googlemaps_location');
 
-	Logger::notice('installed googlemaps');
+	Logger::log("installed googlemaps");
 }
 
-function googlemaps_location(&$item)
+function googlemaps_uninstall()
 {
-	if (!(strlen($item['location']) || strlen($item['coord']))) {
+	Hook::unregister('render_location', 'addon/googlemaps/googlemaps.php', 'googlemaps_location');
+
+	Logger::log("removed googlemaps");
+}
+
+function googlemaps_location($a, &$item)
+{
+
+	if(! (strlen($item['location']) || strlen($item['coord']))) {
 		return;
 	}
 
-	if ($item['coord'] != '') {
-		$target = 'http://maps.google.com/?q=' . urlencode($item['coord']);
+	if ($item['coord'] != ""){ 
+		$target = "http://maps.google.com/?q=".urlencode($item['coord']);
 	} else {
-		$target = 'http://maps.google.com/?q=' . urlencode($item['location']);
+		$target = "http://maps.google.com/?q=".urlencode($item['location']);
 	}
 
-	if ($item['location'] != '') {
+	if ($item['location'] != "") {
 		$title = $item['location'];
 	} else {
 		$title = $item['coord'];
 	}
 
-	$item['html'] = '<a target="map" title="' . $title . '" href= "' . $target . '">' . $title . '</a>';
+	$item['html'] = '<a target="map" title="'.$title.'" href= "'.$target.'">'.$title.'</a>';
 }
diff --git a/gravatar/README.md b/gravatar/README.md
index a1c25a2a..02b9bfd2 100644
--- a/gravatar/README.md
+++ b/gravatar/README.md
@@ -30,22 +30,19 @@ Gravatar lets users self-rate their images to be used at appropriate audiences.
 See more information at [Gravatar][1].
 
 ## Alternative Configuration
-Open the `config/node.config.php` file and add "gravatar" to the list of activated addons:
+Open the `config/local.config.php` file and add "gravatar" to the list of activated addons:
 
-	'addons' => [
+	'system' => [
+		...
+		'addon' => '...,gravatar'
 		...
-		'gravatar' => [
-			admin => true,			
-		],
 	]
 
-You can add two configuration variables for the addon to the `config/gravatar.config.php` file:
+You can add two configuration variables for the addon to the `config/addon.config.php` file:
 
-	return [
-		'gravatar' => [
-			'default_avatar' => 'identicon',
-			'rating' => 'g',
-		],
-	];
+    'gravatar' => [
+        'default_avatar' => 'identicon',
+        'rating' => 'g',
+    ],
 
 [1]: http://www.gravatar.com/site/implement/images/ "See documentation at Gravatar for more information"
diff --git a/gravatar/config/gravatar.config.php b/gravatar/config/gravatar.config.php
index 2a399d93..75bab4fc 100644
--- a/gravatar/config/gravatar.config.php
+++ b/gravatar/config/gravatar.config.php
@@ -1,7 +1,7 @@
 <?php
 
 // Warning: Don't change this file! It only holds the default config values for this addon.
-// Instead, copy this file to config/gravatar.config.php in your Friendica directory and set the correct values there
+// Instead overwrite these config values in config/addon.config.php in your Friendica directory
 
 return [
 	'gravatar' => [
diff --git a/gravatar/gravatar.php b/gravatar/gravatar.php
index 83a8fbb9..68083b38 100644
--- a/gravatar/gravatar.php
+++ b/gravatar/gravatar.php
@@ -8,12 +8,13 @@
 
 use Friendica\App;
 use Friendica\BaseModule;
+use Friendica\Core\Config;
 use Friendica\Core\Hook;
+use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
-use Friendica\DI;
-use Friendica\Core\Config\Util\ConfigFileManager;
+use Friendica\Util\ConfigFileLoader;
 use Friendica\Util\Strings;
 
 /**
@@ -23,23 +24,33 @@ function gravatar_install() {
 	Hook::register('load_config',   'addon/gravatar/gravatar.php', 'gravatar_load_config');
 	Hook::register('avatar_lookup', 'addon/gravatar/gravatar.php', 'gravatar_lookup');
 
-	Logger::notice("registered gravatar in avatar_lookup hook");
+	Logger::log("registered gravatar in avatar_lookup hook");
 }
 
-function gravatar_load_config(ConfigFileManager $loader)
+/**
+ * Removes the addon hook
+ */
+function gravatar_uninstall() {
+	Hook::unregister('load_config',   'addon/gravatar/gravatar.php', 'gravatar_load_config');
+	Hook::unregister('avatar_lookup', 'addon/gravatar/gravatar.php', 'gravatar_lookup');
+
+	Logger::log("unregistered gravatar in avatar_lookup hook");
+}
+
+function gravatar_load_config(App $a, ConfigFileLoader $loader)
 {
-	DI::app()->getConfigCache()->load($loader->loadAddonConfig('gravatar'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
+	$a->getConfigCache()->load($loader->loadAddonConfig('gravatar'));
 }
 
 /**
  * Looks up the avatar at gravatar.com and returns the URL.
  *
+ * @param $a array
  * @param &$b array
  */
-function gravatar_lookup(array &$b)
-{
-	$default_avatar = DI::config()->get('gravatar', 'default_avatar');
-	$rating = DI::config()->get('gravatar', 'rating');
+function gravatar_lookup($a, &$b) {
+	$default_avatar = Config::get('gravatar', 'default_avatar');
+	$rating = Config::get('gravatar', 'rating');
 
 	// setting default value if nothing configured
 	if(! $default_avatar)
@@ -61,28 +72,25 @@ function gravatar_lookup(array &$b)
 /**
  * Display admin settings for this addon
  */
-function gravatar_addon_admin (string &$o)
-{
+function gravatar_addon_admin (&$a, &$o) {
 	$t = Renderer::getMarkupTemplate( "admin.tpl", "addon/gravatar/" );
 
-	$default_avatar = DI::config()->get('gravatar', 'default_avatar');
-	$rating = DI::config()->get('gravatar', 'rating');
+	$default_avatar = Config::get('gravatar', 'default_avatar');
+	$rating = Config::get('gravatar', 'rating');
 
 	// set default values for first configuration
-	if (!$default_avatar) {
+	if(! $default_avatar)
 		$default_avatar = 'identicon'; // pseudo-random geometric pattern based on email hash
-	}
-	if (!$rating) {
+	if(! $rating)
 		$rating = 'g'; // suitable for display on all websites with any audience type
-	}
 
 	// Available options for the select boxes
 	$default_avatars = [
-		'mm' => DI::l10n()->t('generic profile image'),
-		'identicon' => DI::l10n()->t('random geometric pattern'),
-		'monsterid' => DI::l10n()->t('monster face'),
-		'wavatar' => DI::l10n()->t('computer generated face'),
-		'retro' => DI::l10n()->t('retro arcade style face'),
+		'mm' => L10n::t('generic profile image'),
+		'identicon' => L10n::t('random geometric pattern'),
+		'monsterid' => L10n::t('monster face'),
+		'wavatar' => L10n::t('computer generated face'),
+		'retro' => L10n::t('retro arcade style face'),
 	];
 	$ratings = [
 		'g' => 'g',
@@ -92,26 +100,31 @@ function gravatar_addon_admin (string &$o)
 	];
 
 	// Check if Libravatar is enabled and show warning
-	if (!empty(DI::config()->get('addons', 'libravatar'))) {
-		$o = '<h5>' .DI::l10n()->t('Information') .'</h5><p>' .DI::l10n()->t('Libravatar addon is installed, too. Please disable Libravatar addon or this Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar.') .'</p><br><br>';
+	$r = q("SELECT * FROM `addon` WHERE `name` = '%s' and `installed` = 1",
+		DBA::escape('libravatar')
+	);
+	if (count($r)) {
+		$o = '<h5>' .L10n::t('Information') .'</h5><p>' .L10n::t('Libravatar addon is installed, too. Please disable Libravatar addon or this Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar.') .'</p><br><br>';
 	}
 
 	// output Gravatar settings
 	$o .= '<input type="hidden" name="form_security_token" value="' . BaseModule::getFormSecurityToken("gravatarsave") .'">';
 	$o .= Renderer::replaceMacros( $t, [
-		'$submit' => DI::l10n()->t('Save Settings'),
-		'$default_avatar' => ['avatar', DI::l10n()->t('Default avatar image'), $default_avatar, DI::l10n()->t('Select default avatar image if none was found at Gravatar. See README'), $default_avatars],
-		'$rating' => ['rating', DI::l10n()->t('Rating of images'), $rating, DI::l10n()->t('Select the appropriate avatar rating for your site. See README'), $ratings],
+		'$submit' => L10n::t('Save Settings'),
+		'$default_avatar' => ['avatar', L10n::t('Default avatar image'), $default_avatar, L10n::t('Select default avatar image if none was found at Gravatar. See README'), $default_avatars],
+		'$rating' => ['rating', L10n::t('Rating of images'), $rating, L10n::t('Select the appropriate avatar rating for your site. See README'), $ratings],
 	]);
 }
 
 /**
  * Save admin settings
  */
-function gravatar_addon_admin_post ()
-{
+function gravatar_addon_admin_post (&$a) {
 	BaseModule::checkFormSecurityToken('gravatarsave');
 
-	DI::config()->set('gravatar', 'default_avatar', trim($_POST['avatar'] ?? 'identicon'));
-	DI::config()->set('gravatar', 'rating', $rating = trim($_POST['rating'] ?? 'g'));
+	$default_avatar = (!empty($_POST['avatar']) ? Strings::escapeTags(trim($_POST['avatar'])) : 'identicon');
+	$rating = (!empty($_POST['rating']) ? Strings::escapeTags(trim($_POST['rating'])) : 'g');
+	Config::set('gravatar', 'default_avatar', $default_avatar);
+	Config::set('gravatar', 'rating', $rating);
+	info(L10n::t('Gravatar settings updated.') .EOL);
 }
diff --git a/gravatar/lang/C/messages.po b/gravatar/lang/C/messages.po
index a3311e05..dcbf653a 100644
--- a/gravatar/lang/C/messages.po
+++ b/gravatar/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,53 +17,57 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: gravatar.php:78
+#: gravatar.php:71
 msgid "generic profile image"
 msgstr ""
 
-#: gravatar.php:79
+#: gravatar.php:72
 msgid "random geometric pattern"
 msgstr ""
 
-#: gravatar.php:80
+#: gravatar.php:73
 msgid "monster face"
 msgstr ""
 
-#: gravatar.php:81
+#: gravatar.php:74
 msgid "computer generated face"
 msgstr ""
 
-#: gravatar.php:82
+#: gravatar.php:75
 msgid "retro arcade style face"
 msgstr ""
 
-#: gravatar.php:96
+#: gravatar.php:89
 msgid "Information"
 msgstr ""
 
-#: gravatar.php:96
+#: gravatar.php:89
 msgid ""
 "Libravatar addon is installed, too. Please disable Libravatar addon or this "
 "Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if "
 "nothing was found at Libravatar."
 msgstr ""
 
-#: gravatar.php:102
-msgid "Save Settings"
+#: gravatar.php:95
+msgid "Submit"
 msgstr ""
 
-#: gravatar.php:103
+#: gravatar.php:96
 msgid "Default avatar image"
 msgstr ""
 
-#: gravatar.php:103
+#: gravatar.php:96
 msgid "Select default avatar image if none was found at Gravatar. See README"
 msgstr ""
 
-#: gravatar.php:104
+#: gravatar.php:97
 msgid "Rating of images"
 msgstr ""
 
-#: gravatar.php:104
+#: gravatar.php:97
 msgid "Select the appropriate avatar rating for your site. See README"
 msgstr ""
+
+#: gravatar.php:111
+msgid "Gravatar settings updated."
+msgstr ""
diff --git a/gravatar/lang/ar/messages.po b/gravatar/lang/ar/messages.po
deleted file mode 100644
index d24d31be..00000000
--- a/gravatar/lang/ar/messages.po
+++ /dev/null
@@ -1,72 +0,0 @@
-# ADDON gravatar
-# Copyright (C)
-# This file is distributed under the same license as the Friendica gravatar addon package.
-# 
-# 
-# Translators:
-# abidin toumi <abidin24@tutanota.com>, 2021
-# Farida Khalaf <faridakhalaf@hotmail.com>, 2021
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2021-10-29 10:39+0000\n"
-"Last-Translator: abidin toumi <abidin24@tutanota.com>\n"
-"Language-Team: Arabic (http://www.transifex.com/Friendica/friendica/language/ar/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ar\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-
-#: gravatar.php:78
-msgid "generic profile image"
-msgstr "صورة عامة للملف الشخصي"
-
-#: gravatar.php:79
-msgid "random geometric pattern"
-msgstr "نمط هندسي عشوائي"
-
-#: gravatar.php:80
-msgid "monster face"
-msgstr "وجه الوحش"
-
-#: gravatar.php:81
-msgid "computer generated face"
-msgstr "وجه مولد من  الكمبيوتر"
-
-#: gravatar.php:82
-msgid "retro arcade style face"
-msgstr "نمط الوجه برجعية  الممرات"
-
-#: gravatar.php:96
-msgid "Information"
-msgstr "معلومات"
-
-#: gravatar.php:96
-msgid ""
-"Libravatar addon is installed, too. Please disable Libravatar addon or this "
-"Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if "
-"nothing was found at Libravatar."
-msgstr "إضافة ليبرافاتار مثبتة. يرجى تعطيل إحدى الإضافتين ليبرافاتار أو جرافاتار. ستعود إضافة ليبرافاتار إلى جرافاتار إذا لم يتم العثور على شيء في ليبرافاتار."
-
-#: gravatar.php:102
-msgid "Save Settings"
-msgstr "احفظ الإعدادات"
-
-#: gravatar.php:103
-msgid "Default avatar image"
-msgstr "الصورة الرمزية الافتراضية"
-
-#: gravatar.php:103
-msgid "Select default avatar image if none was found at Gravatar. See README"
-msgstr "حدد الصورة الرمزية الافتراضية إذا لم يتم العثور على أي منها في جرافاتار.راجع ملف README"
-
-#: gravatar.php:104
-msgid "Rating of images"
-msgstr "تقييم الصور"
-
-#: gravatar.php:104
-msgid "Select the appropriate avatar rating for your site. See README"
-msgstr "حدد تقييم الصور الرمزية المناسبة لموقعك. راجع ملف README"
diff --git a/gravatar/lang/ar/strings.php b/gravatar/lang/ar/strings.php
deleted file mode 100644
index a9ac2545..00000000
--- a/gravatar/lang/ar/strings.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_ar")) {
-function string_plural_select_ar($n){
-	$n = intval($n);
-	if ($n==0) { return 0; } else if ($n==1) { return 1; } else if ($n==2) { return 2; } else if ($n%100>=3 && $n%100<=10) { return 3; } else if ($n%100>=11 && $n%100<=99) { return 4; } else  { return 5; }
-}}
-$a->strings['generic profile image'] = 'صورة عامة للملف الشخصي';
-$a->strings['random geometric pattern'] = 'نمط هندسي عشوائي';
-$a->strings['monster face'] = 'وجه الوحش';
-$a->strings['computer generated face'] = 'وجه مولد من  الكمبيوتر';
-$a->strings['retro arcade style face'] = 'نمط الوجه برجعية  الممرات';
-$a->strings['Information'] = 'معلومات';
-$a->strings['Libravatar addon is installed, too. Please disable Libravatar addon or this Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar.'] = 'إضافة ليبرافاتار مثبتة. يرجى تعطيل إحدى الإضافتين ليبرافاتار أو جرافاتار. ستعود إضافة ليبرافاتار إلى جرافاتار إذا لم يتم العثور على شيء في ليبرافاتار.';
-$a->strings['Save Settings'] = 'احفظ الإعدادات';
-$a->strings['Default avatar image'] = 'الصورة الرمزية الافتراضية';
-$a->strings['Select default avatar image if none was found at Gravatar. See README'] = 'حدد الصورة الرمزية الافتراضية إذا لم يتم العثور على أي منها في جرافاتار.راجع ملف README';
-$a->strings['Rating of images'] = 'تقييم الصور';
-$a->strings['Select the appropriate avatar rating for your site. See README'] = 'حدد تقييم الصور الرمزية المناسبة لموقعك. راجع ملف README';
diff --git a/gravatar/lang/ca/strings.php b/gravatar/lang/ca/strings.php
index ad00c681..2c950e4c 100644
--- a/gravatar/lang/ca/strings.php
+++ b/gravatar/lang/ca/strings.php
@@ -3,18 +3,19 @@
 if(! function_exists("string_plural_select_ca")) {
 function string_plural_select_ca($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['generic profile image'] = 'imatge de perfil genèrica';
-$a->strings['random geometric pattern'] = 'patró geomètric aleatori';
-$a->strings['monster face'] = 'cara de monstre';
-$a->strings['computer generated face'] = 'cara generada per ordinador';
-$a->strings['retro arcade style face'] = 'cara d’estil d’arcades retro';
-$a->strings['Information'] = 'Informació';
-$a->strings['Libravatar addon is installed, too. Please disable Libravatar addon or this Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar.'] = 'També hi ha instal·lat l’addon Libravatar. Inhabiliteu l\'addon Libravatar o aquest addon Gravatar.<br>Si no es va trobar res a Libravatar, l\'afegit de Libravatar tornarà a aparèixer a Gravatar.';
-$a->strings['Submit'] = 'Presentar';
-$a->strings['Default avatar image'] = 'Imatge predeterminada d’avatar';
-$a->strings['Select default avatar image if none was found at Gravatar. See README'] = 'Seleccioneu la imatge d\'avatar per defecte si no s\'ha trobat cap a Gravatar. Vegeu LLEGIR';
-$a->strings['Rating of images'] = 'Valoració d\'imatges';
-$a->strings['Select the appropriate avatar rating for your site. See README'] = 'Seleccioneu la qualificació d\'avatar adequada per al vostre lloc. Vegeu LLEGIR';
-$a->strings['Gravatar settings updated.'] = 'S\'han actualitzat els paràmetres de Gravatar.';
+;
+$a->strings["generic profile image"] = "imatge de perfil genèrica";
+$a->strings["random geometric pattern"] = "patró geomètric aleatori";
+$a->strings["monster face"] = "cara de monstre";
+$a->strings["computer generated face"] = "cara generada per ordinador";
+$a->strings["retro arcade style face"] = "cara d’estil d’arcades retro";
+$a->strings["Information"] = "Informació";
+$a->strings["Libravatar addon is installed, too. Please disable Libravatar addon or this Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar."] = "També hi ha instal·lat l’addon Libravatar. Inhabiliteu l'addon Libravatar o aquest addon Gravatar.<br>Si no es va trobar res a Libravatar, l'afegit de Libravatar tornarà a aparèixer a Gravatar.";
+$a->strings["Submit"] = "Presentar";
+$a->strings["Default avatar image"] = "Imatge predeterminada d’avatar";
+$a->strings["Select default avatar image if none was found at Gravatar. See README"] = "Seleccioneu la imatge d'avatar per defecte si no s'ha trobat cap a Gravatar. Vegeu LLEGIR";
+$a->strings["Rating of images"] = "Valoració d'imatges";
+$a->strings["Select the appropriate avatar rating for your site. See README"] = "Seleccioneu la qualificació d'avatar adequada per al vostre lloc. Vegeu LLEGIR";
+$a->strings["Gravatar settings updated."] = "S'han actualitzat els paràmetres de Gravatar.";
diff --git a/gravatar/lang/cs/messages.po b/gravatar/lang/cs/messages.po
index 9950b02e..333f8be9 100644
--- a/gravatar/lang/cs/messages.po
+++ b/gravatar/lang/cs/messages.po
@@ -4,69 +4,72 @@
 # 
 # 
 # Translators:
-# Aditoo, 2018
-# michal_s <msupler@gmail.com>, 2014-2015
+# Michal Šupler <msupler@gmail.com>, 2014-2015
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2014-06-23 08:33+0000\n"
-"Last-Translator: Aditoo, 2018\n"
-"Language-Team: Czech (http://app.transifex.com/Friendica/friendica/language/cs/)\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2015-02-11 19:41+0000\n"
+"Last-Translator: Michal Šupler <msupler@gmail.com>\n"
+"Language-Team: Czech (http://www.transifex.com/projects/p/friendica/language/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: cs\n"
-"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: gravatar.php:78
+#: gravatar.php:71
 msgid "generic profile image"
 msgstr "generický profilový obrázek"
 
-#: gravatar.php:79
+#: gravatar.php:72
 msgid "random geometric pattern"
 msgstr "náhodný geometrický vzor"
 
-#: gravatar.php:80
+#: gravatar.php:73
 msgid "monster face"
 msgstr "tvář příšery"
 
-#: gravatar.php:81
+#: gravatar.php:74
 msgid "computer generated face"
 msgstr "počítačově generovaná tvář"
 
-#: gravatar.php:82
+#: gravatar.php:75
 msgid "retro arcade style face"
 msgstr "tvář v retro arkádovém stylu"
 
-#: gravatar.php:96
+#: gravatar.php:89
 msgid "Information"
 msgstr "Informace"
 
-#: gravatar.php:96
+#: gravatar.php:89
 msgid ""
 "Libravatar addon is installed, too. Please disable Libravatar addon or this "
 "Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if "
 "nothing was found at Libravatar."
-msgstr "Doplněk Libravatar je také nainstalován. Prosím zakažte doplněk Libravatar nebo tento doplněk Gravatar.<br>Doplněk Libravatar se přepne na Gravatar, pokud na Libravataru nebude nic nalezeno."
+msgstr "Libravatar doplněk je také nainstalován. Prosím zakažte doplněk Libravatar nebo tento doplněk Gravatar.<br>Libravatar doplněk se vrátí k doplňku Gravatar, pokud na Libravataru nebude nic nalezeno."
 
-#: gravatar.php:102
-msgid "Save Settings"
-msgstr ""
+#: gravatar.php:95
+msgid "Submit"
+msgstr "Odeslat"
 
-#: gravatar.php:103
+#: gravatar.php:96
 msgid "Default avatar image"
-msgstr "Výchozí avatarový obrázek"
+msgstr "Defaultní obrázek avataru"
 
-#: gravatar.php:103
+#: gravatar.php:96
 msgid "Select default avatar image if none was found at Gravatar. See README"
-msgstr "Nastavte výchozí avatarový obrázek, pokud ho již nemáte na Gravataru. Více viz. soubor README."
+msgstr "Nastavte defaulní obrázek avatara pokud ho již nemáte na Gravatar. Více viz. soubor README."
 
-#: gravatar.php:104
+#: gravatar.php:97
 msgid "Rating of images"
 msgstr "Hodnocení obrázků"
 
-#: gravatar.php:104
+#: gravatar.php:97
 msgid "Select the appropriate avatar rating for your site. See README"
-msgstr "Zadejte příslušné ohodnocení avataru pro vaši stránku. Viz README."
+msgstr "Zadejte ohodnocení příslušného avatara pro vaši stránku. Viz README."
+
+#: gravatar.php:111
+msgid "Gravatar settings updated."
+msgstr "Nastavení Gravatar aktualizováno."
diff --git a/gravatar/lang/cs/strings.php b/gravatar/lang/cs/strings.php
index 831f6ed8..5cec8194 100644
--- a/gravatar/lang/cs/strings.php
+++ b/gravatar/lang/cs/strings.php
@@ -2,17 +2,19 @@
 
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
-	$n = intval($n);
-	if (($n == 1 && $n % 1 == 0)) { return 0; } else if (($n >= 2 && $n <= 4 && $n % 1 == 0)) { return 1; } else if (($n % 1 != 0 )) { return 2; } else  { return 3; }
+	return ($n==1) ? 0 : ($n>=2 && $n<=4) ? 1 : 2;;
 }}
-$a->strings['generic profile image'] = 'generický profilový obrázek';
-$a->strings['random geometric pattern'] = 'náhodný geometrický vzor';
-$a->strings['monster face'] = 'tvář příšery';
-$a->strings['computer generated face'] = 'počítačově generovaná tvář';
-$a->strings['retro arcade style face'] = 'tvář v retro arkádovém stylu';
-$a->strings['Information'] = 'Informace';
-$a->strings['Libravatar addon is installed, too. Please disable Libravatar addon or this Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar.'] = 'Doplněk Libravatar je také nainstalován. Prosím zakažte doplněk Libravatar nebo tento doplněk Gravatar.<br>Doplněk Libravatar se přepne na Gravatar, pokud na Libravataru nebude nic nalezeno.';
-$a->strings['Default avatar image'] = 'Výchozí avatarový obrázek';
-$a->strings['Select default avatar image if none was found at Gravatar. See README'] = 'Nastavte výchozí avatarový obrázek, pokud ho již nemáte na Gravataru. Více viz. soubor README.';
-$a->strings['Rating of images'] = 'Hodnocení obrázků';
-$a->strings['Select the appropriate avatar rating for your site. See README'] = 'Zadejte příslušné ohodnocení avataru pro vaši stránku. Viz README.';
+;
+$a->strings["generic profile image"] = "generický profilový obrázek";
+$a->strings["random geometric pattern"] = "náhodný geometrický vzor";
+$a->strings["monster face"] = "tvář příšery";
+$a->strings["computer generated face"] = "počítačově generovaná tvář";
+$a->strings["retro arcade style face"] = "tvář v retro arkádovém stylu";
+$a->strings["Information"] = "Informace";
+$a->strings["Libravatar addon is installed, too. Please disable Libravatar addon or this Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar."] = "Libravatar doplněk je také nainstalován. Prosím zakažte doplněk Libravatar nebo tento doplněk Gravatar.<br>Libravatar doplněk se vrátí k doplňku Gravatar, pokud na Libravataru nebude nic nalezeno.";
+$a->strings["Submit"] = "Odeslat";
+$a->strings["Default avatar image"] = "Defaultní obrázek avataru";
+$a->strings["Select default avatar image if none was found at Gravatar. See README"] = "Nastavte defaulní obrázek avatara pokud ho již nemáte na Gravatar. Více viz. soubor README.";
+$a->strings["Rating of images"] = "Hodnocení obrázků";
+$a->strings["Select the appropriate avatar rating for your site. See README"] = "Zadejte ohodnocení příslušného avatara pro vaši stránku. Viz README.";
+$a->strings["Gravatar settings updated."] = "Nastavení Gravatar aktualizováno.";
diff --git a/gravatar/lang/da-dk/messages.po b/gravatar/lang/da-dk/messages.po
deleted file mode 100644
index 7bd5258a..00000000
--- a/gravatar/lang/da-dk/messages.po
+++ /dev/null
@@ -1,70 +0,0 @@
-# ADDON gravatar
-# Copyright (C)
-# This file is distributed under the same license as the Friendica gravatar addon package.
-# 
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2014-06-23 08:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Danish (Denmark) (http://www.transifex.com/Friendica/friendica/language/da_DK/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: da_DK\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: gravatar.php:78
-msgid "generic profile image"
-msgstr ""
-
-#: gravatar.php:79
-msgid "random geometric pattern"
-msgstr ""
-
-#: gravatar.php:80
-msgid "monster face"
-msgstr ""
-
-#: gravatar.php:81
-msgid "computer generated face"
-msgstr ""
-
-#: gravatar.php:82
-msgid "retro arcade style face"
-msgstr ""
-
-#: gravatar.php:96
-msgid "Information"
-msgstr ""
-
-#: gravatar.php:96
-msgid ""
-"Libravatar addon is installed, too. Please disable Libravatar addon or this "
-"Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if "
-"nothing was found at Libravatar."
-msgstr ""
-
-#: gravatar.php:102
-msgid "Save Settings"
-msgstr ""
-
-#: gravatar.php:103
-msgid "Default avatar image"
-msgstr ""
-
-#: gravatar.php:103
-msgid "Select default avatar image if none was found at Gravatar. See README"
-msgstr ""
-
-#: gravatar.php:104
-msgid "Rating of images"
-msgstr ""
-
-#: gravatar.php:104
-msgid "Select the appropriate avatar rating for your site. See README"
-msgstr ""
diff --git a/gravatar/lang/da-dk/strings.php b/gravatar/lang/da-dk/strings.php
deleted file mode 100644
index 09554750..00000000
--- a/gravatar/lang/da-dk/strings.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_da_dk")) {
-function string_plural_select_da_dk($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
diff --git a/gravatar/lang/de/messages.po b/gravatar/lang/de/messages.po
index 8f5fc3ce..f9563862 100644
--- a/gravatar/lang/de/messages.po
+++ b/gravatar/lang/de/messages.po
@@ -4,71 +4,73 @@
 # 
 # 
 # Translators:
-# Andreas H., 2014
-# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2014
-# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2021
-# Ulf Rompe <transifex.com@rompe.org>, 2019
+# Abrax <webmaster@a-zwenkau.de>, 2014
+# bavatar <tobias.diekershoff@gmx.net>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2014-06-23 08:33+0000\n"
-"Last-Translator: Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2021\n"
-"Language-Team: German (http://app.transifex.com/Friendica/friendica/language/de/)\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2014-10-15 12:29+0000\n"
+"Last-Translator: Abrax <webmaster@a-zwenkau.de>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/friendica/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: gravatar.php:78
+#: gravatar.php:71
 msgid "generic profile image"
 msgstr "generisches Profilbild"
 
-#: gravatar.php:79
+#: gravatar.php:72
 msgid "random geometric pattern"
 msgstr "zufälliges Profilbild"
 
-#: gravatar.php:80
+#: gravatar.php:73
 msgid "monster face"
 msgstr "Monsterfratze"
 
-#: gravatar.php:81
+#: gravatar.php:74
 msgid "computer generated face"
 msgstr "computergeneriertes Gesicht"
 
-#: gravatar.php:82
+#: gravatar.php:75
 msgid "retro arcade style face"
-msgstr "Retro-Arcade-Design-Gesicht"
+msgstr "Retro Arcade Design Gesicht"
 
-#: gravatar.php:96
+#: gravatar.php:89
 msgid "Information"
 msgstr "Information"
 
-#: gravatar.php:96
+#: gravatar.php:89
 msgid ""
 "Libravatar addon is installed, too. Please disable Libravatar addon or this "
 "Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if "
 "nothing was found at Libravatar."
-msgstr "Das Libravatar-Addon ist ebenfalls installiert. Bitte deaktiviere das Libravatar-Addon oder dieses Gravatar-Addon.<br>"
+msgstr "Das Libravatar Addon ist ebenfalls installiert. Bitte deaktiviere das Libravatar Addon oder dieses Gravatar Addon.<br>"
 
-#: gravatar.php:102
-msgid "Save Settings"
-msgstr "Einstellungen speichern"
+#: gravatar.php:95
+msgid "Submit"
+msgstr "Senden"
 
-#: gravatar.php:103
+#: gravatar.php:96
 msgid "Default avatar image"
-msgstr "Standard-Profilbild "
+msgstr "Standard Profilbild "
 
-#: gravatar.php:103
+#: gravatar.php:96
 msgid "Select default avatar image if none was found at Gravatar. See README"
-msgstr "Wähle das Standardprofilbild, wenn kein Bild auf Gravatar gefunden wurde. Siehe README"
+msgstr "Wähle das Standardprofilbild, wenn kein Bild auf Gravatar gefunden wurde. Schaue auch sonst im README nach."
 
-#: gravatar.php:104
+#: gravatar.php:97
 msgid "Rating of images"
 msgstr "Bildbewertung"
 
-#: gravatar.php:104
+#: gravatar.php:97
 msgid "Select the appropriate avatar rating for your site. See README"
-msgstr "Wähle eine angemessene Bildbewertung für deinen Server. Siehe README"
+msgstr "Wähle eine angemessene Bildbewertung für deinen Server. Schaue auch sonst im README nach."
+
+#: gravatar.php:111
+msgid "Gravatar settings updated."
+msgstr "Gravatar Einstellungen aktualisiert."
diff --git a/gravatar/lang/de/strings.php b/gravatar/lang/de/strings.php
index b224c4f9..4b5cd340 100644
--- a/gravatar/lang/de/strings.php
+++ b/gravatar/lang/de/strings.php
@@ -2,18 +2,19 @@
 
 if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['generic profile image'] = 'generisches Profilbild';
-$a->strings['random geometric pattern'] = 'zufälliges Profilbild';
-$a->strings['monster face'] = 'Monsterfratze';
-$a->strings['computer generated face'] = 'computergeneriertes Gesicht';
-$a->strings['retro arcade style face'] = 'Retro-Arcade-Design-Gesicht';
-$a->strings['Information'] = 'Information';
-$a->strings['Libravatar addon is installed, too. Please disable Libravatar addon or this Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar.'] = 'Das Libravatar-Addon ist ebenfalls installiert. Bitte deaktiviere das Libravatar-Addon oder dieses Gravatar-Addon.<br>';
-$a->strings['Save Settings'] = 'Einstellungen speichern';
-$a->strings['Default avatar image'] = 'Standard-Profilbild ';
-$a->strings['Select default avatar image if none was found at Gravatar. See README'] = 'Wähle das Standardprofilbild, wenn kein Bild auf Gravatar gefunden wurde. Siehe README';
-$a->strings['Rating of images'] = 'Bildbewertung';
-$a->strings['Select the appropriate avatar rating for your site. See README'] = 'Wähle eine angemessene Bildbewertung für deinen Server. Siehe README';
+;
+$a->strings["generic profile image"] = "generisches Profilbild";
+$a->strings["random geometric pattern"] = "zufälliges Profilbild";
+$a->strings["monster face"] = "Monsterfratze";
+$a->strings["computer generated face"] = "computergeneriertes Gesicht";
+$a->strings["retro arcade style face"] = "Retro Arcade Design Gesicht";
+$a->strings["Information"] = "Information";
+$a->strings["Libravatar addon is installed, too. Please disable Libravatar addon or this Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar."] = "Das Libravatar Addon ist ebenfalls installiert. Bitte deaktiviere das Libravatar Addon oder dieses Gravatar Addon.<br>";
+$a->strings["Submit"] = "Senden";
+$a->strings["Default avatar image"] = "Standard Profilbild ";
+$a->strings["Select default avatar image if none was found at Gravatar. See README"] = "Wähle das Standardprofilbild, wenn kein Bild auf Gravatar gefunden wurde. Schaue auch sonst im README nach.";
+$a->strings["Rating of images"] = "Bildbewertung";
+$a->strings["Select the appropriate avatar rating for your site. See README"] = "Wähle eine angemessene Bildbewertung für deinen Server. Schaue auch sonst im README nach.";
+$a->strings["Gravatar settings updated."] = "Gravatar Einstellungen aktualisiert.";
diff --git a/gravatar/lang/es/messages.po b/gravatar/lang/es/messages.po
index a58ffa43..fb1116d2 100644
--- a/gravatar/lang/es/messages.po
+++ b/gravatar/lang/es/messages.po
@@ -5,14 +5,13 @@
 # 
 # Translators:
 # Albert, 2016
-# Senex Petrovic <javierruizo@hotmail.com>, 2021
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2021-04-06 01:49+0000\n"
-"Last-Translator: Senex Petrovic <javierruizo@hotmail.com>\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2016-11-16 16:51+0000\n"
+"Last-Translator: Albert\n"
 "Language-Team: Spanish (http://www.transifex.com/Friendica/friendica/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,53 +19,57 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: gravatar.php:78
+#: gravatar.php:71
 msgid "generic profile image"
 msgstr "imagen de perfir genético"
 
-#: gravatar.php:79
+#: gravatar.php:72
 msgid "random geometric pattern"
 msgstr "patrón geométrico aleatorio"
 
-#: gravatar.php:80
+#: gravatar.php:73
 msgid "monster face"
 msgstr "cara de monstruo"
 
-#: gravatar.php:81
+#: gravatar.php:74
 msgid "computer generated face"
 msgstr "cara generada por ordenador"
 
-#: gravatar.php:82
+#: gravatar.php:75
 msgid "retro arcade style face"
 msgstr "cara estilo arcade clásico"
 
-#: gravatar.php:96
+#: gravatar.php:89
 msgid "Information"
 msgstr "información"
 
-#: gravatar.php:96
+#: gravatar.php:89
 msgid ""
 "Libravatar addon is installed, too. Please disable Libravatar addon or this "
 "Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if "
 "nothing was found at Libravatar."
 msgstr "El addon Libravatar está instalado también. Por favor deshabilite el addon de Libravatar o este addon de Gravatar.<br>El addon de Libravatar retrocederá a Gravatar si no se encuentra nada en Libravatar."
 
-#: gravatar.php:102
-msgid "Save Settings"
-msgstr "Grabar ajustes"
+#: gravatar.php:95
+msgid "Submit"
+msgstr "Enviar"
 
-#: gravatar.php:103
+#: gravatar.php:96
 msgid "Default avatar image"
 msgstr "Imagen de avatar por defecto"
 
-#: gravatar.php:103
+#: gravatar.php:96
 msgid "Select default avatar image if none was found at Gravatar. See README"
 msgstr "Seleccionar la imagen de avatar por defecto si no se encuentra ninguna en Gravatar. Vea README"
 
-#: gravatar.php:104
+#: gravatar.php:97
 msgid "Rating of images"
 msgstr "Clasificación de imágenes"
 
-#: gravatar.php:104
+#: gravatar.php:97
 msgid "Select the appropriate avatar rating for your site. See README"
 msgstr "Seleccionar la apropiada clasificación de avatar para su página. Vea README"
+
+#: gravatar.php:111
+msgid "Gravatar settings updated."
+msgstr "Ajustes de Gravatar actualizados."
diff --git a/gravatar/lang/es/strings.php b/gravatar/lang/es/strings.php
index ff9d1969..a4a247c6 100644
--- a/gravatar/lang/es/strings.php
+++ b/gravatar/lang/es/strings.php
@@ -2,18 +2,19 @@
 
 if(! function_exists("string_plural_select_es")) {
 function string_plural_select_es($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['generic profile image'] = 'imagen de perfir genético';
-$a->strings['random geometric pattern'] = 'patrón geométrico aleatorio';
-$a->strings['monster face'] = 'cara de monstruo';
-$a->strings['computer generated face'] = 'cara generada por ordenador';
-$a->strings['retro arcade style face'] = 'cara estilo arcade clásico';
-$a->strings['Information'] = 'información';
-$a->strings['Libravatar addon is installed, too. Please disable Libravatar addon or this Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar.'] = 'El addon Libravatar está instalado también. Por favor deshabilite el addon de Libravatar o este addon de Gravatar.<br>El addon de Libravatar retrocederá a Gravatar si no se encuentra nada en Libravatar.';
-$a->strings['Save Settings'] = 'Grabar ajustes';
-$a->strings['Default avatar image'] = 'Imagen de avatar por defecto';
-$a->strings['Select default avatar image if none was found at Gravatar. See README'] = 'Seleccionar la imagen de avatar por defecto si no se encuentra ninguna en Gravatar. Vea README';
-$a->strings['Rating of images'] = 'Clasificación de imágenes';
-$a->strings['Select the appropriate avatar rating for your site. See README'] = 'Seleccionar la apropiada clasificación de avatar para su página. Vea README';
+;
+$a->strings["generic profile image"] = "imagen de perfir genético";
+$a->strings["random geometric pattern"] = "patrón geométrico aleatorio";
+$a->strings["monster face"] = "cara de monstruo";
+$a->strings["computer generated face"] = "cara generada por ordenador";
+$a->strings["retro arcade style face"] = "cara estilo arcade clásico";
+$a->strings["Information"] = "información";
+$a->strings["Libravatar addon is installed, too. Please disable Libravatar addon or this Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar."] = "El addon Libravatar está instalado también. Por favor deshabilite el addon de Libravatar o este addon de Gravatar.<br>El addon de Libravatar retrocederá a Gravatar si no se encuentra nada en Libravatar.";
+$a->strings["Submit"] = "Enviar";
+$a->strings["Default avatar image"] = "Imagen de avatar por defecto";
+$a->strings["Select default avatar image if none was found at Gravatar. See README"] = "Seleccionar la imagen de avatar por defecto si no se encuentra ninguna en Gravatar. Vea README";
+$a->strings["Rating of images"] = "Clasificación de imágenes";
+$a->strings["Select the appropriate avatar rating for your site. See README"] = "Seleccionar la apropiada clasificación de avatar para su página. Vea README";
+$a->strings["Gravatar settings updated."] = "Ajustes de Gravatar actualizados.";
diff --git a/gravatar/lang/fi-fi/strings.php b/gravatar/lang/fi-fi/strings.php
index cbfd2d0a..3dc04e08 100644
--- a/gravatar/lang/fi-fi/strings.php
+++ b/gravatar/lang/fi-fi/strings.php
@@ -2,15 +2,19 @@
 
 if(! function_exists("string_plural_select_fi_fi")) {
 function string_plural_select_fi_fi($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['generic profile image'] = 'Yleinen profiilikuva';
-$a->strings['random geometric pattern'] = 'satunnainen geometrinen kuvio';
-$a->strings['monster face'] = 'hirviö';
-$a->strings['computer generated face'] = 'tietokoneella tuotettut kasvot';
-$a->strings['retro arcade style face'] = 'retro-videopeli kasvot';
-$a->strings['Information'] = 'Tietoja';
-$a->strings['Submit'] = 'Lähetä';
-$a->strings['Default avatar image'] = 'Avatarin oletuskuva';
-$a->strings['Gravatar settings updated.'] = 'Gravatar -asetukset päivitetty.';
+;
+$a->strings["generic profile image"] = "Yleinen profiilikuva";
+$a->strings["random geometric pattern"] = "satunnainen geometrinen kuvio";
+$a->strings["monster face"] = "hirviö";
+$a->strings["computer generated face"] = "tietokoneella tuotettut kasvot";
+$a->strings["retro arcade style face"] = "retro-videopeli kasvot";
+$a->strings["Information"] = "Tietoja";
+$a->strings["Libravatar addon is installed, too. Please disable Libravatar addon or this Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar."] = "";
+$a->strings["Submit"] = "Lähetä";
+$a->strings["Default avatar image"] = "Avatarin oletuskuva";
+$a->strings["Select default avatar image if none was found at Gravatar. See README"] = "";
+$a->strings["Rating of images"] = "";
+$a->strings["Select the appropriate avatar rating for your site. See README"] = "";
+$a->strings["Gravatar settings updated."] = "Gravatar -asetukset päivitetty.";
diff --git a/gravatar/lang/fr/messages.po b/gravatar/lang/fr/messages.po
index f8a64a1b..7df0f511 100644
--- a/gravatar/lang/fr/messages.po
+++ b/gravatar/lang/fr/messages.po
@@ -4,70 +4,73 @@
 # 
 # 
 # Translators:
-# bob lebonche <lebonche@tutanota.com>, 2021
 # Marie Olive <lacellule101@gmail.com>, 2018
-# ea1cd8241cb389ffb6f92bc6891eff5d_dc12308 <70dced5587d47e18d88f9298024d96f8_93383>, 2015
+# RyDroid <inactive+RyDroid@transifex.com>, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2014-06-23 08:33+0000\n"
-"Last-Translator: bob lebonche <lebonche@tutanota.com>, 2021\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2018-11-13 12:05+0000\n"
+"Last-Translator: Marie Olive <lacellule101@gmail.com>\n"
 "Language-Team: French (http://www.transifex.com/Friendica/friendica/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fr\n"
-"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: gravatar.php:78
+#: gravatar.php:71
 msgid "generic profile image"
 msgstr "image de profil générique"
 
-#: gravatar.php:79
+#: gravatar.php:72
 msgid "random geometric pattern"
 msgstr "Schéma géométrique aléatoire "
 
-#: gravatar.php:80
+#: gravatar.php:73
 msgid "monster face"
-msgstr "Face de monstre"
+msgstr ""
 
-#: gravatar.php:81
+#: gravatar.php:74
 msgid "computer generated face"
 msgstr "visage généré par ordinateur"
 
-#: gravatar.php:82
+#: gravatar.php:75
 msgid "retro arcade style face"
-msgstr "Face style retro arcade"
+msgstr ""
 
-#: gravatar.php:96
+#: gravatar.php:89
 msgid "Information"
 msgstr "Information"
 
-#: gravatar.php:96
+#: gravatar.php:89
 msgid ""
 "Libravatar addon is installed, too. Please disable Libravatar addon or this "
 "Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if "
 "nothing was found at Libravatar."
-msgstr "L'application complémentaire Libravatar est aussi installée. Merci de désactiver l'application complémentaire Libravatar ou cette application complémentaire Gravatar. L'application complémentaire se repliera sur Gravatar si rien n'est trouvé dans Libravatar."
+msgstr ""
 
-#: gravatar.php:102
-msgid "Save Settings"
-msgstr "Sauvegarder les paramètres."
+#: gravatar.php:95
+msgid "Submit"
+msgstr "Envoyer"
 
-#: gravatar.php:103
+#: gravatar.php:96
 msgid "Default avatar image"
 msgstr "Image par défaut d'avatar"
 
-#: gravatar.php:103
+#: gravatar.php:96
 msgid "Select default avatar image if none was found at Gravatar. See README"
-msgstr "Sélectionner l'avatar par défaut, si aucun n'est trouvé sur Gravatar. Voir Lisezmoi."
+msgstr ""
 
-#: gravatar.php:104
+#: gravatar.php:97
 msgid "Rating of images"
-msgstr "Notation des images"
+msgstr ""
 
-#: gravatar.php:104
+#: gravatar.php:97
 msgid "Select the appropriate avatar rating for your site. See README"
-msgstr "Sélectionner la notation d'avatar appropriée pour votre site. Voir Lisezmoi."
+msgstr ""
+
+#: gravatar.php:111
+msgid "Gravatar settings updated."
+msgstr "Paramètres de Gravatar mis à jour."
diff --git a/gravatar/lang/fr/strings.php b/gravatar/lang/fr/strings.php
index b826ab65..bc062845 100644
--- a/gravatar/lang/fr/strings.php
+++ b/gravatar/lang/fr/strings.php
@@ -3,17 +3,19 @@
 if(! function_exists("string_plural_select_fr")) {
 function string_plural_select_fr($n){
 	$n = intval($n);
-	if (($n == 0 || $n == 1)) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
+	return ($n > 1);;
 }}
-$a->strings['generic profile image'] = 'image de profil générique';
-$a->strings['random geometric pattern'] = 'Schéma géométrique aléatoire ';
-$a->strings['monster face'] = 'Face de monstre';
-$a->strings['computer generated face'] = 'visage généré par ordinateur';
-$a->strings['retro arcade style face'] = 'Face style retro arcade';
-$a->strings['Information'] = 'Information';
-$a->strings['Libravatar addon is installed, too. Please disable Libravatar addon or this Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar.'] = 'L\'application complémentaire Libravatar est aussi installée. Merci de désactiver l\'application complémentaire Libravatar ou cette application complémentaire Gravatar. L\'application complémentaire se repliera sur Gravatar si rien n\'est trouvé dans Libravatar.';
-$a->strings['Save Settings'] = 'Sauvegarder les paramètres.';
-$a->strings['Default avatar image'] = 'Image par défaut d\'avatar';
-$a->strings['Select default avatar image if none was found at Gravatar. See README'] = 'Sélectionner l\'avatar par défaut, si aucun n\'est trouvé sur Gravatar. Voir Lisezmoi.';
-$a->strings['Rating of images'] = 'Notation des images';
-$a->strings['Select the appropriate avatar rating for your site. See README'] = 'Sélectionner la notation d\'avatar appropriée pour votre site. Voir Lisezmoi.';
+;
+$a->strings["generic profile image"] = "image de profil générique";
+$a->strings["random geometric pattern"] = "Schéma géométrique aléatoire ";
+$a->strings["monster face"] = "";
+$a->strings["computer generated face"] = "visage généré par ordinateur";
+$a->strings["retro arcade style face"] = "";
+$a->strings["Information"] = "Information";
+$a->strings["Libravatar addon is installed, too. Please disable Libravatar addon or this Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar."] = "";
+$a->strings["Submit"] = "Envoyer";
+$a->strings["Default avatar image"] = "Image par défaut d'avatar";
+$a->strings["Select default avatar image if none was found at Gravatar. See README"] = "";
+$a->strings["Rating of images"] = "";
+$a->strings["Select the appropriate avatar rating for your site. See README"] = "";
+$a->strings["Gravatar settings updated."] = "Paramètres de Gravatar mis à jour.";
diff --git a/gravatar/lang/hu/messages.po b/gravatar/lang/hu/messages.po
deleted file mode 100644
index 4fd44a97..00000000
--- a/gravatar/lang/hu/messages.po
+++ /dev/null
@@ -1,71 +0,0 @@
-# ADDON gravatar
-# Copyright (C)
-# This file is distributed under the same license as the Friendica gravatar addon package.
-# 
-# 
-# Translators:
-# Balázs Úr, 2020-2021
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2014-06-23 08:33+0000\n"
-"Last-Translator: Balázs Úr, 2020-2021\n"
-"Language-Team: Hungarian (http://www.transifex.com/Friendica/friendica/language/hu/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: hu\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: gravatar.php:78
-msgid "generic profile image"
-msgstr "Általános profilkép"
-
-#: gravatar.php:79
-msgid "random geometric pattern"
-msgstr "Véletlen geometriai minta"
-
-#: gravatar.php:80
-msgid "monster face"
-msgstr "Szörnyarc"
-
-#: gravatar.php:81
-msgid "computer generated face"
-msgstr "Számítógéppel előállított arc"
-
-#: gravatar.php:82
-msgid "retro arcade style face"
-msgstr "Retró árkádstílusú arc"
-
-#: gravatar.php:96
-msgid "Information"
-msgstr "Információ"
-
-#: gravatar.php:96
-msgid ""
-"Libravatar addon is installed, too. Please disable Libravatar addon or this "
-"Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if "
-"nothing was found at Libravatar."
-msgstr "A Libravatar bővítmény is telepítve van. Tiltsa le a Libravatar bővítményt vagy ezt a Gravatar bővítményt.<br>A Libravatar bővítmény vissza fog állni a Gravatarra, ha semmi sem található a Libravatarnál."
-
-#: gravatar.php:102
-msgid "Save Settings"
-msgstr "Beállítások mentése"
-
-#: gravatar.php:103
-msgid "Default avatar image"
-msgstr "Alapértelmezett profilkép"
-
-#: gravatar.php:103
-msgid "Select default avatar image if none was found at Gravatar. See README"
-msgstr "Az alapértelmezett profilkép kiválasztása, ha semmi sem található a Gravatarnál. Nézze meg a README információkat."
-
-#: gravatar.php:104
-msgid "Rating of images"
-msgstr "Képek értékelése"
-
-#: gravatar.php:104
-msgid "Select the appropriate avatar rating for your site. See README"
-msgstr "A megfelelő profilkép-értékelés kiválasztása az oldalához. Nézze meg a README információkat."
diff --git a/gravatar/lang/hu/strings.php b/gravatar/lang/hu/strings.php
deleted file mode 100644
index cc4d4553..00000000
--- a/gravatar/lang/hu/strings.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_hu")) {
-function string_plural_select_hu($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['generic profile image'] = 'Általános profilkép';
-$a->strings['random geometric pattern'] = 'Véletlen geometriai minta';
-$a->strings['monster face'] = 'Szörnyarc';
-$a->strings['computer generated face'] = 'Számítógéppel előállított arc';
-$a->strings['retro arcade style face'] = 'Retró árkádstílusú arc';
-$a->strings['Information'] = 'Információ';
-$a->strings['Libravatar addon is installed, too. Please disable Libravatar addon or this Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar.'] = 'A Libravatar bővítmény is telepítve van. Tiltsa le a Libravatar bővítményt vagy ezt a Gravatar bővítményt.<br>A Libravatar bővítmény vissza fog állni a Gravatarra, ha semmi sem található a Libravatarnál.';
-$a->strings['Save Settings'] = 'Beállítások mentése';
-$a->strings['Default avatar image'] = 'Alapértelmezett profilkép';
-$a->strings['Select default avatar image if none was found at Gravatar. See README'] = 'Az alapértelmezett profilkép kiválasztása, ha semmi sem található a Gravatarnál. Nézze meg a README információkat.';
-$a->strings['Rating of images'] = 'Képek értékelése';
-$a->strings['Select the appropriate avatar rating for your site. See README'] = 'A megfelelő profilkép-értékelés kiválasztása az oldalához. Nézze meg a README információkat.';
diff --git a/gravatar/lang/it/messages.po b/gravatar/lang/it/messages.po
index 43ed3e83..d1a867a6 100644
--- a/gravatar/lang/it/messages.po
+++ b/gravatar/lang/it/messages.po
@@ -5,14 +5,13 @@
 # 
 # Translators:
 # fabrixxm <fabrix.xm@gmail.com>, 2014-2015
-# Sylke Vicious <silkevicious@gmail.com>, 2021
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2021-05-05 11:03+0000\n"
-"Last-Translator: Sylke Vicious <silkevicious@gmail.com>\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2017-09-20 06:08+0000\n"
+"Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,53 +19,57 @@ msgstr ""
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: gravatar.php:78
+#: gravatar.php:71
 msgid "generic profile image"
 msgstr "immagine generica del profilo"
 
-#: gravatar.php:79
+#: gravatar.php:72
 msgid "random geometric pattern"
 msgstr "schema geometrico casuale"
 
-#: gravatar.php:80
+#: gravatar.php:73
 msgid "monster face"
 msgstr "faccia di mostro"
 
-#: gravatar.php:81
+#: gravatar.php:74
 msgid "computer generated face"
 msgstr "faccia generata dal computer"
 
-#: gravatar.php:82
+#: gravatar.php:75
 msgid "retro arcade style face"
 msgstr "faccia stile retro arcade"
 
-#: gravatar.php:96
+#: gravatar.php:89
 msgid "Information"
 msgstr "Informazione"
 
-#: gravatar.php:96
+#: gravatar.php:89
 msgid ""
 "Libravatar addon is installed, too. Please disable Libravatar addon or this "
 "Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if "
 "nothing was found at Libravatar."
-msgstr "Il componente aggiuntivo Libravatar è installato. Disabilita il componente aggiuntivo Libravatar o questo componente aggiuntivo Gravatar<br>Il componente aggiuntivo Libravatar si appoggerà a Gravatar se non trova nulla su Libravatar."
+msgstr "I'addon Libravatar è installto. Disabilita l'addon Libravatar o questo addon Gravatar<br>L'addon Libravatar si appoggerà a Gravatar se non trova nulla su Libravatar."
 
-#: gravatar.php:102
-msgid "Save Settings"
-msgstr "Salva Impostazioni"
+#: gravatar.php:95
+msgid "Submit"
+msgstr "Invia"
 
-#: gravatar.php:103
+#: gravatar.php:96
 msgid "Default avatar image"
 msgstr "Immagine avatar predefinita"
 
-#: gravatar.php:103
+#: gravatar.php:96
 msgid "Select default avatar image if none was found at Gravatar. See README"
 msgstr "Seleziona l'immagine di default se non viene  trovato niente. Vedi README"
 
-#: gravatar.php:104
+#: gravatar.php:97
 msgid "Rating of images"
 msgstr "Valutazione delle immagini"
 
-#: gravatar.php:104
+#: gravatar.php:97
 msgid "Select the appropriate avatar rating for your site. See README"
 msgstr "Seleziona la valutazione dell'avatar appropriata per il tuo sito. Vedi README"
+
+#: gravatar.php:111
+msgid "Gravatar settings updated."
+msgstr "Impostazioni Gravatar aggiornate."
diff --git a/gravatar/lang/it/strings.php b/gravatar/lang/it/strings.php
index 22be01ee..5e55a761 100644
--- a/gravatar/lang/it/strings.php
+++ b/gravatar/lang/it/strings.php
@@ -2,18 +2,19 @@
 
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['generic profile image'] = 'immagine generica del profilo';
-$a->strings['random geometric pattern'] = 'schema geometrico casuale';
-$a->strings['monster face'] = 'faccia di mostro';
-$a->strings['computer generated face'] = 'faccia generata dal computer';
-$a->strings['retro arcade style face'] = 'faccia stile retro arcade';
-$a->strings['Information'] = 'Informazione';
-$a->strings['Libravatar addon is installed, too. Please disable Libravatar addon or this Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar.'] = 'Il componente aggiuntivo Libravatar è installato. Disabilita il componente aggiuntivo Libravatar o questo componente aggiuntivo Gravatar<br>Il componente aggiuntivo Libravatar si appoggerà a Gravatar se non trova nulla su Libravatar.';
-$a->strings['Save Settings'] = 'Salva Impostazioni';
-$a->strings['Default avatar image'] = 'Immagine avatar predefinita';
-$a->strings['Select default avatar image if none was found at Gravatar. See README'] = 'Seleziona l\'immagine di default se non viene  trovato niente. Vedi README';
-$a->strings['Rating of images'] = 'Valutazione delle immagini';
-$a->strings['Select the appropriate avatar rating for your site. See README'] = 'Seleziona la valutazione dell\'avatar appropriata per il tuo sito. Vedi README';
+;
+$a->strings["generic profile image"] = "immagine generica del profilo";
+$a->strings["random geometric pattern"] = "schema geometrico casuale";
+$a->strings["monster face"] = "faccia di mostro";
+$a->strings["computer generated face"] = "faccia generata dal computer";
+$a->strings["retro arcade style face"] = "faccia stile retro arcade";
+$a->strings["Information"] = "Informazione";
+$a->strings["Libravatar addon is installed, too. Please disable Libravatar addon or this Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar."] = "I'addon Libravatar è installto. Disabilita l'addon Libravatar o questo addon Gravatar<br>L'addon Libravatar si appoggerà a Gravatar se non trova nulla su Libravatar.";
+$a->strings["Submit"] = "Invia";
+$a->strings["Default avatar image"] = "Immagine avatar predefinita";
+$a->strings["Select default avatar image if none was found at Gravatar. See README"] = "Seleziona l'immagine di default se non viene  trovato niente. Vedi README";
+$a->strings["Rating of images"] = "Valutazione delle immagini";
+$a->strings["Select the appropriate avatar rating for your site. See README"] = "Seleziona la valutazione dell'avatar appropriata per il tuo sito. Vedi README";
+$a->strings["Gravatar settings updated."] = "Impostazioni Gravatar aggiornate.";
diff --git a/gravatar/lang/nl/messages.po b/gravatar/lang/nl/messages.po
index da18b107..95b06ecd 100644
--- a/gravatar/lang/nl/messages.po
+++ b/gravatar/lang/nl/messages.po
@@ -4,15 +4,14 @@
 # 
 # 
 # Translators:
-# Casper <casper@vrije-mens.org>, 2020
 # Jeroen De Meerleer <me@jeroened.be>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-02-27 05:01-0500\n"
-"PO-Revision-Date: 2020-03-27 08:59+0000\n"
-"Last-Translator: Casper <casper@vrije-mens.org>\n"
+"PO-Revision-Date: 2018-08-24 13:49+0000\n"
+"Last-Translator: Jeroen De Meerleer <me@jeroened.be>\n"
 "Language-Team: Dutch (http://www.transifex.com/Friendica/friendica/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -42,7 +41,7 @@ msgstr ""
 
 #: gravatar.php:89
 msgid "Information"
-msgstr "Informatie"
+msgstr ""
 
 #: gravatar.php:89
 msgid ""
diff --git a/gravatar/lang/nl/strings.php b/gravatar/lang/nl/strings.php
index fe59598d..4b930a53 100644
--- a/gravatar/lang/nl/strings.php
+++ b/gravatar/lang/nl/strings.php
@@ -3,9 +3,19 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['generic profile image'] = 'Generieke profiel-foto';
-$a->strings['random geometric pattern'] = 'Willekeurige geometrische figuur';
-$a->strings['Information'] = 'Informatie';
-$a->strings['Gravatar settings updated.'] = 'Gravatar instellingen opgeslagen';
+;
+$a->strings["generic profile image"] = "Generieke profiel-foto";
+$a->strings["random geometric pattern"] = "Willekeurige geometrische figuur";
+$a->strings["monster face"] = "";
+$a->strings["computer generated face"] = "";
+$a->strings["retro arcade style face"] = "";
+$a->strings["Information"] = "";
+$a->strings["Libravatar addon is installed, too. Please disable Libravatar addon or this Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar."] = "";
+$a->strings["Submit"] = "";
+$a->strings["Default avatar image"] = "";
+$a->strings["Select default avatar image if none was found at Gravatar. See README"] = "";
+$a->strings["Rating of images"] = "";
+$a->strings["Select the appropriate avatar rating for your site. See README"] = "";
+$a->strings["Gravatar settings updated."] = "Gravatar instellingen opgeslagen";
diff --git a/gravatar/lang/pl/messages.po b/gravatar/lang/pl/messages.po
index 33b08af7..763f5c04 100644
--- a/gravatar/lang/pl/messages.po
+++ b/gravatar/lang/pl/messages.po
@@ -4,15 +4,14 @@
 # 
 # 
 # Translators:
-# Piotr Strębski <strebski@gmail.com>, 2022
-# Waldemar Stoczkowski, 2018
+# Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2014-06-23 08:33+0000\n"
-"Last-Translator: Piotr Strębski <strebski@gmail.com>, 2022\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2018-08-04 11:41+0000\n"
+"Last-Translator: Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.com/Friendica/friendica/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,53 +19,57 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
-#: gravatar.php:78
+#: gravatar.php:71
 msgid "generic profile image"
 msgstr "ogólny obraz profilu"
 
-#: gravatar.php:79
+#: gravatar.php:72
 msgid "random geometric pattern"
 msgstr "losowy wzór geometryczny"
 
-#: gravatar.php:80
+#: gravatar.php:73
 msgid "monster face"
 msgstr "twarz potwora"
 
-#: gravatar.php:81
+#: gravatar.php:74
 msgid "computer generated face"
 msgstr "wygenerowana komputerowo twarz"
 
-#: gravatar.php:82
+#: gravatar.php:75
 msgid "retro arcade style face"
 msgstr "twarz w stylu retro arcade"
 
-#: gravatar.php:96
+#: gravatar.php:89
 msgid "Information"
 msgstr "Informacje"
 
-#: gravatar.php:96
+#: gravatar.php:89
 msgid ""
 "Libravatar addon is installed, too. Please disable Libravatar addon or this "
 "Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if "
 "nothing was found at Libravatar."
 msgstr "Zainstalowany jest także dodatek Libravatar. Wyłącz dodatek Libravatar lub dodatek Gravatar.<br> Dodatek Libravatar powróci do Gravatar, jeśli w Libravatar nie zostanie znaleziony żaden przedmiot."
 
-#: gravatar.php:102
-msgid "Save Settings"
-msgstr "Zapisz ustawienia"
+#: gravatar.php:95
+msgid "Submit"
+msgstr "Zatwierdź"
 
-#: gravatar.php:103
+#: gravatar.php:96
 msgid "Default avatar image"
 msgstr "Domyślny obraz awatara"
 
-#: gravatar.php:103
+#: gravatar.php:96
 msgid "Select default avatar image if none was found at Gravatar. See README"
 msgstr "Wybierz domyślny obraz awatara, jeśli nie znaleziono go w Gravatar. Zobacz README"
 
-#: gravatar.php:104
+#: gravatar.php:97
 msgid "Rating of images"
 msgstr "Ocena zdjęć"
 
-#: gravatar.php:104
+#: gravatar.php:97
 msgid "Select the appropriate avatar rating for your site. See README"
 msgstr "Wybierz odpowiednią ocenę awatara dla swojej witryny. Zobacz README"
+
+#: gravatar.php:111
+msgid "Gravatar settings updated."
+msgstr "Zaktualizowano ustawienia Gravatar."
diff --git a/gravatar/lang/pl/strings.php b/gravatar/lang/pl/strings.php
index bfefbccb..935fb7f1 100644
--- a/gravatar/lang/pl/strings.php
+++ b/gravatar/lang/pl/strings.php
@@ -3,17 +3,19 @@
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
 	$n = intval($n);
-	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
+	return ($n==1 ? 0 : ($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14) ? 1 : $n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14) ? 2 : 3);;
 }}
-$a->strings['generic profile image'] = 'ogólny obraz profilu';
-$a->strings['random geometric pattern'] = 'losowy wzór geometryczny';
-$a->strings['monster face'] = 'twarz potwora';
-$a->strings['computer generated face'] = 'wygenerowana komputerowo twarz';
-$a->strings['retro arcade style face'] = 'twarz w stylu retro arcade';
-$a->strings['Information'] = 'Informacje';
-$a->strings['Libravatar addon is installed, too. Please disable Libravatar addon or this Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar.'] = 'Zainstalowany jest także dodatek Libravatar. Wyłącz dodatek Libravatar lub dodatek Gravatar.<br> Dodatek Libravatar powróci do Gravatar, jeśli w Libravatar nie zostanie znaleziony żaden przedmiot.';
-$a->strings['Save Settings'] = 'Zapisz ustawienia';
-$a->strings['Default avatar image'] = 'Domyślny obraz awatara';
-$a->strings['Select default avatar image if none was found at Gravatar. See README'] = 'Wybierz domyślny obraz awatara, jeśli nie znaleziono go w Gravatar. Zobacz README';
-$a->strings['Rating of images'] = 'Ocena zdjęć';
-$a->strings['Select the appropriate avatar rating for your site. See README'] = 'Wybierz odpowiednią ocenę awatara dla swojej witryny. Zobacz README';
+;
+$a->strings["generic profile image"] = "ogólny obraz profilu";
+$a->strings["random geometric pattern"] = "losowy wzór geometryczny";
+$a->strings["monster face"] = "twarz potwora";
+$a->strings["computer generated face"] = "wygenerowana komputerowo twarz";
+$a->strings["retro arcade style face"] = "twarz w stylu retro arcade";
+$a->strings["Information"] = "Informacje";
+$a->strings["Libravatar addon is installed, too. Please disable Libravatar addon or this Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar."] = "Zainstalowany jest także dodatek Libravatar. Wyłącz dodatek Libravatar lub dodatek Gravatar.<br> Dodatek Libravatar powróci do Gravatar, jeśli w Libravatar nie zostanie znaleziony żaden przedmiot.";
+$a->strings["Submit"] = "Zatwierdź";
+$a->strings["Default avatar image"] = "Domyślny obraz awatara";
+$a->strings["Select default avatar image if none was found at Gravatar. See README"] = "Wybierz domyślny obraz awatara, jeśli nie znaleziono go w Gravatar. Zobacz README";
+$a->strings["Rating of images"] = "Ocena zdjęć";
+$a->strings["Select the appropriate avatar rating for your site. See README"] = "Wybierz odpowiednią ocenę awatara dla swojej witryny. Zobacz README";
+$a->strings["Gravatar settings updated."] = "Zaktualizowano ustawienia Gravatar.";
diff --git a/gravatar/lang/pt-br/strings.php b/gravatar/lang/pt-br/strings.php
index 9da2b471..c7b3754f 100644
--- a/gravatar/lang/pt-br/strings.php
+++ b/gravatar/lang/pt-br/strings.php
@@ -2,19 +2,19 @@
 
 if(! function_exists("string_plural_select_pt_br")) {
 function string_plural_select_pt_br($n){
-	$n = intval($n);
-	return intval($n > 1);
+	return ($n > 1);;
 }}
-$a->strings['generic profile image'] = 'imagem de perfil genérica';
-$a->strings['random geometric pattern'] = 'estampa geométrica aleatória';
-$a->strings['monster face'] = 'careta';
-$a->strings['computer generated face'] = 'rosto gerado por computador';
-$a->strings['retro arcade style face'] = 'rosto de personagem de fliperama';
-$a->strings['Information'] = 'Informação';
-$a->strings['Libravatar addon is installed, too. Please disable Libravatar addon or this Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar.'] = 'O complemento Libravatar também está instalado. Desabilite o  Libravatar ou este complemento, o Gravatar.<br>Se não encontrar nada, o Libravatar remeterá ao Gravatar.';
-$a->strings['Submit'] = 'Enviar';
-$a->strings['Default avatar image'] = 'Avatar padrão';
-$a->strings['Select default avatar image if none was found at Gravatar. See README'] = 'Selecione a imagem de avatar padrão que será usada se nenhuma for encontrada no Gravatar. Veja README.';
-$a->strings['Rating of images'] = 'Classificação de imagens';
-$a->strings['Select the appropriate avatar rating for your site. See README'] = 'Selecione a classificação apropriada para os avatares que serão mostrados no seu site. Veja README.';
-$a->strings['Gravatar settings updated.'] = 'As configurações do Gravatar foram atualizadas.';
+;
+$a->strings["generic profile image"] = "imagem de perfil genérica";
+$a->strings["random geometric pattern"] = "estampa geométrica aleatória";
+$a->strings["monster face"] = "careta";
+$a->strings["computer generated face"] = "rosto gerado por computador";
+$a->strings["retro arcade style face"] = "rosto de personagem de fliperama";
+$a->strings["Information"] = "Informação";
+$a->strings["Libravatar addon is installed, too. Please disable Libravatar addon or this Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar."] = "O complemento Libravatar também está instalado. Desabilite o  Libravatar ou este complemento, o Gravatar.<br>Se não encontrar nada, o Libravatar remeterá ao Gravatar.";
+$a->strings["Submit"] = "Enviar";
+$a->strings["Default avatar image"] = "Avatar padrão";
+$a->strings["Select default avatar image if none was found at Gravatar. See README"] = "Selecione a imagem de avatar padrão que será usada se nenhuma for encontrada no Gravatar. Veja README.";
+$a->strings["Rating of images"] = "Classificação de imagens";
+$a->strings["Select the appropriate avatar rating for your site. See README"] = "Selecione a classificação apropriada para os avatares que serão mostrados no seu site. Veja README.";
+$a->strings["Gravatar settings updated."] = "As configurações do Gravatar foram atualizadas.";
diff --git a/gravatar/lang/ro/strings.php b/gravatar/lang/ro/strings.php
index e88faa0b..b962b1a2 100644
--- a/gravatar/lang/ro/strings.php
+++ b/gravatar/lang/ro/strings.php
@@ -2,19 +2,19 @@
 
 if(! function_exists("string_plural_select_ro")) {
 function string_plural_select_ro($n){
-	$n = intval($n);
-	if ($n==1) { return 0; } else if ((($n%100>19)||(($n%100==0)&&($n!=0)))) { return 2; } else  { return 1; }
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
 }}
-$a->strings['generic profile image'] = 'imagine generică de profil';
-$a->strings['random geometric pattern'] = 'șablon geometric aleator';
-$a->strings['monster face'] = 'chip monstruos';
-$a->strings['computer generated face'] = 'chip generat de calculator';
-$a->strings['retro arcade style face'] = 'chip în stil jocuri arcade retro ';
-$a->strings['Information'] = 'Informaţii';
-$a->strings['Libravatar addon is installed, too. Please disable Libravatar addon or this Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar.'] = 'Modulul Libravatar este instalat, de asemenea. Vă rugăm să dezactivați modulul Libravatar sau acest modul Gravatar. <br>Modulul Libravatar va reveni înapoi la Gravatar, dacă nu s-a găsit nimic în Libravatar.';
-$a->strings['Submit'] = 'Trimite';
-$a->strings['Default avatar image'] = 'Imagine avatar implicită';
-$a->strings['Select default avatar image if none was found at Gravatar. See README'] = 'Selectați imagine avatar implicită, dacă nici una nu fost găsită în Gravatar. Consultați FIŞIERUL README';
-$a->strings['Rating of images'] = 'Evaluările imaginilor';
-$a->strings['Select the appropriate avatar rating for your site. See README'] = 'Selectați evaluarea adecvată a avatarului pentru site-ul dumneavoastră. Consultați FIŞIERUL README';
-$a->strings['Gravatar settings updated.'] = 'Configurările Gravatar au fost actualizate.';
+;
+$a->strings["generic profile image"] = "imagine generică de profil";
+$a->strings["random geometric pattern"] = "șablon geometric aleator";
+$a->strings["monster face"] = "chip monstruos";
+$a->strings["computer generated face"] = "chip generat de calculator";
+$a->strings["retro arcade style face"] = "chip în stil jocuri arcade retro ";
+$a->strings["Information"] = "Informaţii";
+$a->strings["Libravatar addon is installed, too. Please disable Libravatar addon or this Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar."] = "Modulul Libravatar este instalat, de asemenea. Vă rugăm să dezactivați modulul Libravatar sau acest modul Gravatar. <br>Modulul Libravatar va reveni înapoi la Gravatar, dacă nu s-a găsit nimic în Libravatar.";
+$a->strings["Submit"] = "Trimite";
+$a->strings["Default avatar image"] = "Imagine avatar implicită";
+$a->strings["Select default avatar image if none was found at Gravatar. See README"] = "Selectați imagine avatar implicită, dacă nici una nu fost găsită în Gravatar. Consultați FIŞIERUL README";
+$a->strings["Rating of images"] = "Evaluările imaginilor";
+$a->strings["Select the appropriate avatar rating for your site. See README"] = "Selectați evaluarea adecvată a avatarului pentru site-ul dumneavoastră. Consultați FIŞIERUL README";
+$a->strings["Gravatar settings updated."] = "Configurările Gravatar au fost actualizate.";
diff --git a/gravatar/lang/ru/strings.php b/gravatar/lang/ru/strings.php
index 6bb68b79..ee284a15 100644
--- a/gravatar/lang/ru/strings.php
+++ b/gravatar/lang/ru/strings.php
@@ -2,19 +2,19 @@
 
 if(! function_exists("string_plural_select_ru")) {
 function string_plural_select_ru($n){
-	$n = intval($n);
-	if ($n%10==1 && $n%100!=11) { return 0; } else if ($n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14)) { return 1; } else if ($n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)) { return 2; } else  { return 3; }
+	return ($n%10==1 && $n%100!=11 ? 0 : $n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14) ? 1 : $n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)? 2 : 3);;
 }}
-$a->strings['generic profile image'] = 'общее изображение профиля';
-$a->strings['random geometric pattern'] = 'случайный геометрический паттерн';
-$a->strings['monster face'] = 'monster face';
-$a->strings['computer generated face'] = 'сгенерированное лицо';
-$a->strings['retro arcade style face'] = 'лицо в стиле retro arcade';
-$a->strings['Information'] = 'Информация';
-$a->strings['Libravatar addon is installed, too. Please disable Libravatar addon or this Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar.'] = 'Аддон Libravatar тоже установлен. Пожалуйста, отключите его.<br>Libravatar использует Gravatar если Libravatar не может найти изображение у себя.';
-$a->strings['Submit'] = 'Добавить';
-$a->strings['Default avatar image'] = 'Аватар по умолчанию';
-$a->strings['Select default avatar image if none was found at Gravatar. See README'] = 'Выберите аватар по умолчанию если ничего не было найдено на Gravatar. Смотрите README';
-$a->strings['Rating of images'] = 'Рейтинг изображений';
-$a->strings['Select the appropriate avatar rating for your site. See README'] = 'Выберите нужный рейтинг изображений для вашего сайта. Смотрите README';
-$a->strings['Gravatar settings updated.'] = 'Настройки Gravatar обновлены.';
+;
+$a->strings["generic profile image"] = "общее изображение профиля";
+$a->strings["random geometric pattern"] = "случайный геометрический паттерн";
+$a->strings["monster face"] = "monster face";
+$a->strings["computer generated face"] = "сгенерированное лицо";
+$a->strings["retro arcade style face"] = "лицо в стиле retro arcade";
+$a->strings["Information"] = "Информация";
+$a->strings["Libravatar addon is installed, too. Please disable Libravatar addon or this Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar."] = "Аддон Libravatar тоже установлен. Пожалуйста, отключите его.<br>Libravatar использует Gravatar если Libravatar не может найти изображение у себя.";
+$a->strings["Submit"] = "Добавить";
+$a->strings["Default avatar image"] = "Аватар по умолчанию";
+$a->strings["Select default avatar image if none was found at Gravatar. See README"] = "Выберите аватар по умолчанию если ничего не было найдено на Gravatar. Смотрите README";
+$a->strings["Rating of images"] = "Рейтинг изображений";
+$a->strings["Select the appropriate avatar rating for your site. See README"] = "Выберите нужный рейтинг изображений для вашего сайта. Смотрите README";
+$a->strings["Gravatar settings updated."] = "Настройки Gravatar обновлены.";
diff --git a/gravatar/lang/sv/messages.po b/gravatar/lang/sv/messages.po
deleted file mode 100644
index f2f70a19..00000000
--- a/gravatar/lang/sv/messages.po
+++ /dev/null
@@ -1,71 +0,0 @@
-# ADDON gravatar
-# Copyright (C)
-# This file is distributed under the same license as the Friendica gravatar addon package.
-# 
-# 
-# Translators:
-# Kristoffer Grundström <lovaren@gmail.com>, 2022
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2022-01-16 00:35+0000\n"
-"Last-Translator: Kristoffer Grundström <lovaren@gmail.com>\n"
-"Language-Team: Swedish (http://www.transifex.com/Friendica/friendica/language/sv/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: sv\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: gravatar.php:78
-msgid "generic profile image"
-msgstr ""
-
-#: gravatar.php:79
-msgid "random geometric pattern"
-msgstr ""
-
-#: gravatar.php:80
-msgid "monster face"
-msgstr "monsteransikte"
-
-#: gravatar.php:81
-msgid "computer generated face"
-msgstr "datorgenererat ansikte"
-
-#: gravatar.php:82
-msgid "retro arcade style face"
-msgstr ""
-
-#: gravatar.php:96
-msgid "Information"
-msgstr "Information"
-
-#: gravatar.php:96
-msgid ""
-"Libravatar addon is installed, too. Please disable Libravatar addon or this "
-"Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if "
-"nothing was found at Libravatar."
-msgstr ""
-
-#: gravatar.php:102
-msgid "Save Settings"
-msgstr ""
-
-#: gravatar.php:103
-msgid "Default avatar image"
-msgstr ""
-
-#: gravatar.php:103
-msgid "Select default avatar image if none was found at Gravatar. See README"
-msgstr ""
-
-#: gravatar.php:104
-msgid "Rating of images"
-msgstr "Betygssättning av bilder"
-
-#: gravatar.php:104
-msgid "Select the appropriate avatar rating for your site. See README"
-msgstr ""
diff --git a/gravatar/lang/sv/strings.php b/gravatar/lang/sv/strings.php
index a2137fa7..3ec569a7 100644
--- a/gravatar/lang/sv/strings.php
+++ b/gravatar/lang/sv/strings.php
@@ -1,11 +1,3 @@
-<?php
-
-if(! function_exists("string_plural_select_sv")) {
-function string_plural_select_sv($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['monster face'] = 'monsteransikte';
-$a->strings['computer generated face'] = 'datorgenererat ansikte';
-$a->strings['Information'] = 'Information';
-$a->strings['Rating of images'] = 'Betygssättning av bilder';
+<?php
+
+$a->strings["Submit"] = "Spara";
diff --git a/group_text/group_text.css b/group_text/group_text.css
new file mode 100644
index 00000000..4122b67e
--- /dev/null
+++ b/group_text/group_text.css
@@ -0,0 +1,14 @@
+
+
+
+#group_text-enable-label {
+	float: left;
+	width: 200px;
+	margin-bottom: 25px;
+}
+
+#group_text-checkbox {
+	float: left;
+}
+
+
diff --git a/group_text/group_text.php b/group_text/group_text.php
index 02e9fd0a..47768df2 100644
--- a/group_text/group_text.php
+++ b/group_text/group_text.php
@@ -4,22 +4,32 @@
  * Description: Disable images in group edit menu
  * Version: 1.0
  * Author: Thomas Willingham <https://kakste.com/profile/beardyunixer>
- * Status: Unsupported
- * Note: Please use Circle Text instead
  */
-
-use Friendica\App;
 use Friendica\Core\Hook;
+use Friendica\Core\L10n;
 use Friendica\Core\Logger;
-use Friendica\Core\Renderer;
-use Friendica\DI;
+use Friendica\Core\PConfig;
+
+function group_text_install() {
 
-function group_text_install()
-{
 	Hook::register('addon_settings', 'addon/group_text/group_text.php', 'group_text_settings');
 	Hook::register('addon_settings_post', 'addon/group_text/group_text.php', 'group_text_settings_post');
+
+	Logger::log("installed group_text");
 }
 
+
+function group_text_uninstall() {
+
+	Hook::unregister('addon_settings', 'addon/group_text/group_text.php', 'group_text_settings');
+	Hook::unregister('addon_settings_post', 'addon/group_text/group_text.php', 'group_text_settings_post');
+
+
+	Logger::log("removed group_text");
+}
+
+
+
 /**
  *
  * Callback from the settings post function.
@@ -29,39 +39,49 @@ function group_text_install()
  *
  */
 
-function group_text_settings_post(array $post)
-{
-	if (!DI::userSession()->getLocalUserId() || empty($post['group_text-submit'])) {
+function group_text_settings_post($a,$post) {
+	if(! local_user() || empty($_POST['group_text-submit']))
 		return;
-	}
+	PConfig::set(local_user(),'system','groupedit_image_limit',intval($_POST['group_text']));
 
-	DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'system', 'groupedit_image_limit', intval($post['group_text']));
+	info(L10n::t('Group Text settings updated.') . EOL);
 }
 
 
 /**
  *
- * Called from the Addon Setting form.
+ * Called from the Addon Setting form. 
  * Add our own settings info to the page.
  *
  */
 
-function group_text_settings(array &$data)
-{
-	if (!DI::userSession()->getLocalUserId()) {
+
+
+function group_text_settings(&$a,&$s) {
+
+	if(! local_user())
 		return;
-	}
 
-	$enabled = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'system', 'groupedit_image_limit');
+	/* Add our stylesheet to the page so we can make our settings look nice */
 
-	$t    = Renderer::getMarkupTemplate('settings.tpl', 'addon/group_text/');
-	$html = Renderer::replaceMacros($t, [
-		'$enabled' => ['group_text', DI::l10n()->t('Use a text only (non-image) group selector in the "group edit" menu'), $enabled],
-	]);
+	$a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->getBaseURL() . '/addon/group_text/group_text.css' . '" media="all" />' . "\r\n";
+
+	/* Get the current state of our config variable */
+
+	$enabled = PConfig::get(local_user(),'system','groupedit_image_limit');
+	$checked = (($enabled) ? ' checked="checked" ' : '');
+
+	/* Add some HTML to the existing form */
+
+	$s .= '<div class="settings-block">';
+	$s .= '<h3>' . L10n::t('Group Text') . '</h3>';
+	$s .= '<div id="group_text-enable-wrapper">';
+	$s .= '<label id="group_text-enable-label" for="group_text-checkbox">' . L10n::t('Use a text only (non-image) group selector in the "group edit" menu') . '</label>';
+	$s .= '<input id="group_text-checkbox" type="checkbox" name="group_text" value="1" ' . $checked . '/>';
+	$s .= '</div><div class="clear"></div>';
+
+	/* provide a submit button */
+
+	$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="group_text-submit" class="settings-submit" value="' . L10n::t('Save Settings') . '" /></div></div>';
 
-	$data = [
-		'addon' => 'group_text',
-		'title' => DI::l10n()->t('Group Text'),
-		'html'  => $html,
-	];
 }
diff --git a/group_text/lang/C/messages.po b/group_text/lang/C/messages.po
index 0b7ce62e..781b923a 100644
--- a/group_text/lang/C/messages.po
+++ b/group_text/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:14-0500\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,10 +17,18 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: group_text.php:58
+#: group_text.php:46
+msgid "Group Text settings updated."
+msgstr ""
+
+#: group_text.php:76
+msgid "Group Text"
+msgstr ""
+
+#: group_text.php:78
 msgid "Use a text only (non-image) group selector in the \"group edit\" menu"
 msgstr ""
 
-#: group_text.php:63
-msgid "Group Text"
+#: group_text.php:84
+msgid "Submit"
 msgstr ""
diff --git a/group_text/lang/ar/messages.po b/group_text/lang/ar/messages.po
deleted file mode 100644
index cfe9bb63..00000000
--- a/group_text/lang/ar/messages.po
+++ /dev/null
@@ -1,32 +0,0 @@
-# ADDON group_text
-# Copyright (C)
-# This file is distributed under the same license as the Friendica group_text addon package.
-# 
-# 
-# Translators:
-# Farida Khalaf <faridakhalaf@hotmail.com>, 2021
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2021-02-21 02:59+0000\n"
-"Last-Translator: Farida Khalaf <faridakhalaf@hotmail.com>\n"
-"Language-Team: Arabic (http://www.transifex.com/Friendica/friendica/language/ar/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ar\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-
-#: group_text.php:62
-msgid "Group Text"
-msgstr "نص المجموعة:"
-
-#: group_text.php:64
-msgid "Use a text only (non-image) group selector in the \"group edit\" menu"
-msgstr "استخدم محدد نصي للمجموعة فقط (غير مصور) في قائمة \"تعديل المجموعة\""
-
-#: group_text.php:70
-msgid "Save Settings"
-msgstr "حفظ الإعدادات"
diff --git a/group_text/lang/ar/strings.php b/group_text/lang/ar/strings.php
deleted file mode 100644
index 20e8496a..00000000
--- a/group_text/lang/ar/strings.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_ar")) {
-function string_plural_select_ar($n){
-	$n = intval($n);
-	if ($n==0) { return 0; } else if ($n==1) { return 1; } else if ($n==2) { return 2; } else if ($n%100>=3 && $n%100<=10) { return 3; } else if ($n%100>=11 && $n%100<=99) { return 4; } else  { return 5; }
-}}
-$a->strings['Group Text'] = 'نص المجموعة:';
-$a->strings['Use a text only (non-image) group selector in the "group edit" menu'] = 'استخدم محدد نصي للمجموعة فقط (غير مصور) في قائمة "تعديل المجموعة"';
-$a->strings['Save Settings'] = 'حفظ الإعدادات';
diff --git a/group_text/lang/ca/strings.php b/group_text/lang/ca/strings.php
index b28db322..8072b46f 100644
--- a/group_text/lang/ca/strings.php
+++ b/group_text/lang/ca/strings.php
@@ -3,9 +3,10 @@
 if(! function_exists("string_plural_select_ca")) {
 function string_plural_select_ca($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Group Text settings updated.'] = 'La configuració del text del grup s\'ha actualitzat.';
-$a->strings['Group Text'] = 'Missatge del grup';
-$a->strings['Use a text only (non-image) group selector in the "group edit" menu'] = 'Utilitzeu un selector de grup de només text (que no sigui una imatge) al menú \'Edita grup\'';
-$a->strings['Submit'] = 'sotmetre\'s';
+;
+$a->strings["Group Text settings updated."] = "La configuració del text del grup s'ha actualitzat.";
+$a->strings["Group Text"] = "Missatge del grup";
+$a->strings["Use a text only (non-image) group selector in the \"group edit\" menu"] = "Utilitzeu un selector de grup de només text (que no sigui una imatge) al menú 'Edita grup'";
+$a->strings["Submit"] = "sotmetre's";
diff --git a/group_text/lang/cs/strings.php b/group_text/lang/cs/strings.php
index 510453af..c5055a29 100644
--- a/group_text/lang/cs/strings.php
+++ b/group_text/lang/cs/strings.php
@@ -3,9 +3,10 @@
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
 	$n = intval($n);
-	if (($n == 1 && $n % 1 == 0)) { return 0; } else if (($n >= 2 && $n <= 4 && $n % 1 == 0)) { return 1; } else if (($n % 1 != 0 )) { return 2; } else  { return 3; }
+	return ($n == 1 && $n % 1 == 0) ? 0 : ($n >= 2 && $n <= 4 && $n % 1 == 0) ? 1: ($n % 1 != 0 ) ? 2 : 3;;
 }}
-$a->strings['Group Text settings updated.'] = 'Nastavení Group Text aktualizována.';
-$a->strings['Group Text'] = 'Skupinový text';
-$a->strings['Use a text only (non-image) group selector in the "group edit" menu'] = 'Použijte pouze textový (bezobrázkový) výběr skupiny v menu úpravy skupin.';
-$a->strings['Submit'] = 'Odeslat';
+;
+$a->strings["Group Text settings updated."] = "Nastavení Group Text aktualizována.";
+$a->strings["Group Text"] = "Skupinový text";
+$a->strings["Use a text only (non-image) group selector in the \"group edit\" menu"] = "Použijte pouze textový (bezobrázkový) výběr skupiny v menu úpravy skupin.";
+$a->strings["Submit"] = "Odeslat";
diff --git a/group_text/lang/da-dk/messages.po b/group_text/lang/da-dk/messages.po
deleted file mode 100644
index 9f1fbefa..00000000
--- a/group_text/lang/da-dk/messages.po
+++ /dev/null
@@ -1,28 +0,0 @@
-# ADDON group_text
-# Copyright (C)
-# This file is distributed under the same license as the Friendica group_text addon package.
-# 
-# 
-# Translators:
-# Anton <dev@atjn.dk>, 2022
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:14-0500\n"
-"PO-Revision-Date: 2014-06-23 08:35+0000\n"
-"Last-Translator: Anton <dev@atjn.dk>, 2022\n"
-"Language-Team: Danish (Denmark) (http://www.transifex.com/Friendica/friendica/language/da_DK/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: da_DK\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: group_text.php:58
-msgid "Use a text only (non-image) group selector in the \"group edit\" menu"
-msgstr "Brug en kun-tekst (intet billede) gruppevælger i grupperedigeringsmenuen"
-
-#: group_text.php:63
-msgid "Group Text"
-msgstr "Gruppebesked"
diff --git a/group_text/lang/da-dk/strings.php b/group_text/lang/da-dk/strings.php
deleted file mode 100644
index 4306b769..00000000
--- a/group_text/lang/da-dk/strings.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_da_dk")) {
-function string_plural_select_da_dk($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Use a text only (non-image) group selector in the "group edit" menu'] = 'Brug en kun-tekst (intet billede) gruppevælger i grupperedigeringsmenuen';
-$a->strings['Group Text'] = 'Gruppebesked';
diff --git a/group_text/lang/de/messages.po b/group_text/lang/de/messages.po
index e4e5d782..0b1ad34e 100644
--- a/group_text/lang/de/messages.po
+++ b/group_text/lang/de/messages.po
@@ -4,28 +4,34 @@
 # 
 # 
 # Translators:
-# Andreas H., 2014
-# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2014
-# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2021
-# Ulf Rompe <transifex.com@rompe.org>, 2019
+# Abrax <webmaster@a-zwenkau.de>, 2014
+# bavatar <tobias.diekershoff@gmx.net>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:14-0500\n"
-"PO-Revision-Date: 2014-06-23 08:35+0000\n"
-"Last-Translator: Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2021\n"
-"Language-Team: German (http://app.transifex.com/Friendica/friendica/language/de/)\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2014-10-15 12:29+0000\n"
+"Last-Translator: Abrax <webmaster@a-zwenkau.de>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/friendica/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: group_text.php:58
+#: group_text.php:46
+msgid "Group Text settings updated."
+msgstr "Gruppen Text Einstellungen aktualisiert"
+
+#: group_text.php:76
+msgid "Group Text"
+msgstr "Gruppen als Text"
+
+#: group_text.php:78
 msgid "Use a text only (non-image) group selector in the \"group edit\" menu"
 msgstr "Beim Bearbeiten von Gruppen Text statt Bilder anzeigen"
 
-#: group_text.php:63
-msgid "Group Text"
-msgstr "Gruppen als Text"
+#: group_text.php:84
+msgid "Submit"
+msgstr "Senden"
diff --git a/group_text/lang/de/strings.php b/group_text/lang/de/strings.php
index 7a75b54d..87464fe8 100644
--- a/group_text/lang/de/strings.php
+++ b/group_text/lang/de/strings.php
@@ -2,8 +2,10 @@
 
 if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Use a text only (non-image) group selector in the "group edit" menu'] = 'Beim Bearbeiten von Gruppen Text statt Bilder anzeigen';
-$a->strings['Group Text'] = 'Gruppen als Text';
+;
+$a->strings["Group Text settings updated."] = "Gruppen Text Einstellungen aktualisiert";
+$a->strings["Group Text"] = "Gruppen als Text";
+$a->strings["Use a text only (non-image) group selector in the \"group edit\" menu"] = "Beim Bearbeiten von Gruppen Text statt Bilder anzeigen";
+$a->strings["Submit"] = "Senden";
diff --git a/group_text/lang/es/messages.po b/group_text/lang/es/messages.po
index 5d6d4107..87bdbe65 100644
--- a/group_text/lang/es/messages.po
+++ b/group_text/lang/es/messages.po
@@ -5,14 +5,13 @@
 # 
 # Translators:
 # Albert, 2016
-# Senex Petrovic <javierruizo@hotmail.com>, 2021
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2021-04-01 09:56+0000\n"
-"Last-Translator: Senex Petrovic <javierruizo@hotmail.com>\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2016-11-16 16:53+0000\n"
+"Last-Translator: Albert\n"
 "Language-Team: Spanish (http://www.transifex.com/Friendica/friendica/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,14 +19,18 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: group_text.php:62
+#: group_text.php:46
+msgid "Group Text settings updated."
+msgstr "Ajustes de Grupo de Texto actualizados"
+
+#: group_text.php:76
 msgid "Group Text"
 msgstr "Grupo de Texto"
 
-#: group_text.php:64
+#: group_text.php:78
 msgid "Use a text only (non-image) group selector in the \"group edit\" menu"
 msgstr "Utilice sólo el selector de grupo de texto (no imagen) en el menú \"edición de grupo\""
 
-#: group_text.php:70
-msgid "Save Settings"
-msgstr "Guardar Ajustes"
+#: group_text.php:84
+msgid "Submit"
+msgstr "Enviar"
diff --git a/group_text/lang/es/strings.php b/group_text/lang/es/strings.php
index 632130fd..9eccc680 100644
--- a/group_text/lang/es/strings.php
+++ b/group_text/lang/es/strings.php
@@ -2,9 +2,10 @@
 
 if(! function_exists("string_plural_select_es")) {
 function string_plural_select_es($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Group Text'] = 'Grupo de Texto';
-$a->strings['Use a text only (non-image) group selector in the "group edit" menu'] = 'Utilice sólo el selector de grupo de texto (no imagen) en el menú "edición de grupo"';
-$a->strings['Save Settings'] = 'Guardar Ajustes';
+;
+$a->strings["Group Text settings updated."] = "Ajustes de Grupo de Texto actualizados";
+$a->strings["Group Text"] = "Grupo de Texto";
+$a->strings["Use a text only (non-image) group selector in the \"group edit\" menu"] = "Utilice sólo el selector de grupo de texto (no imagen) en el menú \"edición de grupo\"";
+$a->strings["Submit"] = "Enviar";
diff --git a/group_text/lang/fi-fi/strings.php b/group_text/lang/fi-fi/strings.php
index 5bcd0ddc..7df538bb 100644
--- a/group_text/lang/fi-fi/strings.php
+++ b/group_text/lang/fi-fi/strings.php
@@ -2,9 +2,10 @@
 
 if(! function_exists("string_plural_select_fi_fi")) {
 function string_plural_select_fi_fi($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Group Text settings updated.'] = 'Group Text -asetukset päivitetty.';
-$a->strings['Group Text'] = 'Group Text';
-$a->strings['Submit'] = 'Lähetä';
+;
+$a->strings["Group Text settings updated."] = "Group Text -asetukset päivitetty.";
+$a->strings["Group Text"] = "Group Text";
+$a->strings["Use a text only (non-image) group selector in the \"group edit\" menu"] = "";
+$a->strings["Submit"] = "Lähetä";
diff --git a/group_text/lang/fr/messages.po b/group_text/lang/fr/messages.po
deleted file mode 100644
index c076d697..00000000
--- a/group_text/lang/fr/messages.po
+++ /dev/null
@@ -1,29 +0,0 @@
-# ADDON group_text
-# Copyright (C)
-# This file is distributed under the same license as the Friendica group_text addon package.
-# 
-# 
-# Translators:
-# bob lebonche <lebonche@tutanota.com>, 2021
-# Hypolite Petovan <hypolite@mrpetovan.com>, 2016
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:14-0500\n"
-"PO-Revision-Date: 2014-06-23 08:35+0000\n"
-"Last-Translator: bob lebonche <lebonche@tutanota.com>, 2021\n"
-"Language-Team: French (http://www.transifex.com/Friendica/friendica/language/fr/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: fr\n"
-"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
-
-#: group_text.php:58
-msgid "Use a text only (non-image) group selector in the \"group edit\" menu"
-msgstr "Utiliser uniquement un groupe de texte (pas d'image) dans le menu \"groupedit\""
-
-#: group_text.php:63
-msgid "Group Text"
-msgstr "Groupe de texte"
diff --git a/group_text/lang/fr/strings.php b/group_text/lang/fr/strings.php
index 657d7657..ddad5bf1 100644
--- a/group_text/lang/fr/strings.php
+++ b/group_text/lang/fr/strings.php
@@ -1,9 +1,5 @@
-<?php
-
-if(! function_exists("string_plural_select_fr")) {
-function string_plural_select_fr($n){
-	$n = intval($n);
-	if (($n == 0 || $n == 1)) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
-}}
-$a->strings['Use a text only (non-image) group selector in the "group edit" menu'] = 'Utiliser uniquement un groupe de texte (pas d\'image) dans le menu "groupedit"';
-$a->strings['Group Text'] = 'Groupe de texte';
+<?php
+
+$a->strings["Group Text"] = "Affichage textuel des groupes";
+$a->strings["Use a text only (non-image) group selector in the \"group edit\" menu"] = "Utilisez un sélecteur de groupe purement textuel (sans image) dans le menu d'édition des groupes";
+$a->strings["Submit"] = "Envoyer";
diff --git a/group_text/lang/hu/messages.po b/group_text/lang/hu/messages.po
deleted file mode 100644
index 2c4f19c9..00000000
--- a/group_text/lang/hu/messages.po
+++ /dev/null
@@ -1,28 +0,0 @@
-# ADDON group_text
-# Copyright (C)
-# This file is distributed under the same license as the Friendica group_text addon package.
-# 
-# 
-# Translators:
-# Balázs Úr, 2020-2021
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:14-0500\n"
-"PO-Revision-Date: 2014-06-23 08:35+0000\n"
-"Last-Translator: Balázs Úr, 2020-2021\n"
-"Language-Team: Hungarian (http://www.transifex.com/Friendica/friendica/language/hu/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: hu\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: group_text.php:58
-msgid "Use a text only (non-image) group selector in the \"group edit\" menu"
-msgstr "Csak szöveges (kép nélküli) csoportválasztó használata a „csoportszerkesztés” menüben"
-
-#: group_text.php:63
-msgid "Group Text"
-msgstr "Csoportszöveg"
diff --git a/group_text/lang/hu/strings.php b/group_text/lang/hu/strings.php
deleted file mode 100644
index ac72f9e0..00000000
--- a/group_text/lang/hu/strings.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_hu")) {
-function string_plural_select_hu($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Use a text only (non-image) group selector in the "group edit" menu'] = 'Csak szöveges (kép nélküli) csoportválasztó használata a „csoportszerkesztés” menüben';
-$a->strings['Group Text'] = 'Csoportszöveg';
diff --git a/group_text/lang/it/messages.po b/group_text/lang/it/messages.po
index daab3fb6..90871559 100644
--- a/group_text/lang/it/messages.po
+++ b/group_text/lang/it/messages.po
@@ -5,14 +5,13 @@
 # 
 # Translators:
 # fabrixxm <fabrix.xm@gmail.com>, 2014-2015
-# Sylke Vicious <silkevicious@gmail.com>, 2021
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2021-02-16 12:48+0000\n"
-"Last-Translator: Sylke Vicious <silkevicious@gmail.com>\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2017-09-20 06:08+0000\n"
+"Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,14 +19,18 @@ msgstr ""
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: group_text.php:62
+#: group_text.php:46
+msgid "Group Text settings updated."
+msgstr "Impostazioni di \"Editor Gruppi Testuale\" aggiornate."
+
+#: group_text.php:76
 msgid "Group Text"
 msgstr "Editor Gruppi Testuale"
 
-#: group_text.php:64
+#: group_text.php:78
 msgid "Use a text only (non-image) group selector in the \"group edit\" menu"
 msgstr "Usa un selettore testuale (senza immagini) nella pagina \"modifica gruppo\""
 
-#: group_text.php:70
-msgid "Save Settings"
-msgstr "Salva Impostazioni"
+#: group_text.php:84
+msgid "Submit"
+msgstr "Invia"
diff --git a/group_text/lang/it/strings.php b/group_text/lang/it/strings.php
index e52683e9..36eb872b 100644
--- a/group_text/lang/it/strings.php
+++ b/group_text/lang/it/strings.php
@@ -2,9 +2,10 @@
 
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Group Text'] = 'Editor Gruppi Testuale';
-$a->strings['Use a text only (non-image) group selector in the "group edit" menu'] = 'Usa un selettore testuale (senza immagini) nella pagina "modifica gruppo"';
-$a->strings['Save Settings'] = 'Salva Impostazioni';
+;
+$a->strings["Group Text settings updated."] = "Impostazioni di \"Editor Gruppi Testuale\" aggiornate.";
+$a->strings["Group Text"] = "Editor Gruppi Testuale";
+$a->strings["Use a text only (non-image) group selector in the \"group edit\" menu"] = "Usa un selettore testuale (senza immagini) nella pagina \"modifica gruppo\"";
+$a->strings["Submit"] = "Invia";
diff --git a/group_text/lang/nl/strings.php b/group_text/lang/nl/strings.php
index ba3cb3ec..2a99dc8e 100644
--- a/group_text/lang/nl/strings.php
+++ b/group_text/lang/nl/strings.php
@@ -3,7 +3,10 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Group Text settings updated.'] = 'Groupsberichten instellingen opgeslagen';
-$a->strings['Group Text'] = 'Groepsbericht';
+;
+$a->strings["Group Text settings updated."] = "Groupsberichten instellingen opgeslagen";
+$a->strings["Group Text"] = "Groepsbericht";
+$a->strings["Use a text only (non-image) group selector in the \"group edit\" menu"] = "";
+$a->strings["Submit"] = "";
diff --git a/group_text/lang/pl/messages.po b/group_text/lang/pl/messages.po
index a1d6a3c8..402bd26b 100644
--- a/group_text/lang/pl/messages.po
+++ b/group_text/lang/pl/messages.po
@@ -4,14 +4,14 @@
 # 
 # 
 # Translators:
-# Waldemar Stoczkowski, 2018
+# Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:14-0500\n"
-"PO-Revision-Date: 2014-06-23 08:35+0000\n"
-"Last-Translator: Waldemar Stoczkowski, 2018\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2018-03-30 17:29+0000\n"
+"Last-Translator: Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.com/Friendica/friendica/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,10 +19,18 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
-#: group_text.php:58
-msgid "Use a text only (non-image) group selector in the \"group edit\" menu"
-msgstr "Użyj tylko tekst (bez obrazu) selektor grupy w menu \"Edycja grupy\""
+#: group_text.php:46
+msgid "Group Text settings updated."
+msgstr "Zaktualizowano ustawienia tekstu grupowego."
 
-#: group_text.php:63
+#: group_text.php:76
 msgid "Group Text"
 msgstr "Grupuj tekst"
+
+#: group_text.php:78
+msgid "Use a text only (non-image) group selector in the \"group edit\" menu"
+msgstr "Użyj selektora grupy tylko tekst (inny niż obraz) w menu \"Edycja grupy\""
+
+#: group_text.php:84
+msgid "Submit"
+msgstr "Zatwierdź"
diff --git a/group_text/lang/pl/strings.php b/group_text/lang/pl/strings.php
index 96157c99..a2c95868 100644
--- a/group_text/lang/pl/strings.php
+++ b/group_text/lang/pl/strings.php
@@ -2,8 +2,10 @@
 
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
-	$n = intval($n);
-	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
+	return ($n==1 ? 0 : ($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14) ? 1 : $n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14) ? 2 : 3);;
 }}
-$a->strings['Use a text only (non-image) group selector in the "group edit" menu'] = 'Użyj tylko tekst (bez obrazu) selektor grupy w menu "Edycja grupy"';
-$a->strings['Group Text'] = 'Grupuj tekst';
+;
+$a->strings["Group Text settings updated."] = "Zaktualizowano ustawienia tekstu grupowego.";
+$a->strings["Group Text"] = "Grupuj tekst";
+$a->strings["Use a text only (non-image) group selector in the \"group edit\" menu"] = "Użyj selektora grupy tylko tekst (inny niż obraz) w menu \"Edycja grupy\"";
+$a->strings["Submit"] = "Zatwierdź";
diff --git a/group_text/lang/ro/strings.php b/group_text/lang/ro/strings.php
index 892ffc68..c4f68882 100644
--- a/group_text/lang/ro/strings.php
+++ b/group_text/lang/ro/strings.php
@@ -2,10 +2,10 @@
 
 if(! function_exists("string_plural_select_ro")) {
 function string_plural_select_ro($n){
-	$n = intval($n);
-	if ($n==1) { return 0; } else if ((($n%100>19)||(($n%100==0)&&($n!=0)))) { return 2; } else  { return 1; }
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
 }}
-$a->strings['Group Text settings updated.'] = 'Configurările Text Grup, au fost actualizate.';
-$a->strings['Group Text'] = 'Text Grup';
-$a->strings['Use a text only (non-image) group selector in the "group edit" menu'] = 'Folosiți în meniul "editare grup" un selector de grup strict textual (fără-imagine)';
-$a->strings['Submit'] = 'Trimite';
+;
+$a->strings["Group Text settings updated."] = "Configurările Text Grup, au fost actualizate.";
+$a->strings["Group Text"] = "Text Grup";
+$a->strings["Use a text only (non-image) group selector in the \"group edit\" menu"] = "Folosiți în meniul \"editare grup\" un selector de grup strict textual (fără-imagine)";
+$a->strings["Submit"] = "Trimite";
diff --git a/group_text/lang/ru/strings.php b/group_text/lang/ru/strings.php
index 0f74e7ca..895ba662 100644
--- a/group_text/lang/ru/strings.php
+++ b/group_text/lang/ru/strings.php
@@ -2,10 +2,10 @@
 
 if(! function_exists("string_plural_select_ru")) {
 function string_plural_select_ru($n){
-	$n = intval($n);
-	if ($n%10==1 && $n%100!=11) { return 0; } else if ($n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14)) { return 1; } else if ($n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)) { return 2; } else  { return 3; }
+	return ($n%10==1 && $n%100!=11 ? 0 : $n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14) ? 1 : $n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)? 2 : 3);;
 }}
-$a->strings['Group Text settings updated.'] = 'Настройки Group Text обновлены.';
-$a->strings['Group Text'] = 'Group Text';
-$a->strings['Use a text only (non-image) group selector in the "group edit" menu'] = 'Используйте текстовый (не изображение) селектор группы в режиме редактирования группы';
-$a->strings['Submit'] = 'Добавить';
+;
+$a->strings["Group Text settings updated."] = "Настройки Group Text обновлены.";
+$a->strings["Group Text"] = "Group Text";
+$a->strings["Use a text only (non-image) group selector in the \"group edit\" menu"] = "Используйте текстовый (не изображение) селектор группы в режиме редактирования группы";
+$a->strings["Submit"] = "Добавить";
diff --git a/group_text/lang/sv/messages.po b/group_text/lang/sv/messages.po
deleted file mode 100644
index 8ddc1806..00000000
--- a/group_text/lang/sv/messages.po
+++ /dev/null
@@ -1,28 +0,0 @@
-# ADDON group_text
-# Copyright (C)
-# This file is distributed under the same license as the Friendica group_text addon package.
-# 
-# 
-# Translators:
-# Kristoffer Grundström <lovaren@gmail.com>, 2022
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:14-0500\n"
-"PO-Revision-Date: 2022-01-16 00:35+0000\n"
-"Last-Translator: Kristoffer Grundström <lovaren@gmail.com>\n"
-"Language-Team: Swedish (http://www.transifex.com/Friendica/friendica/language/sv/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: sv\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: group_text.php:58
-msgid "Use a text only (non-image) group selector in the \"group edit\" menu"
-msgstr ""
-
-#: group_text.php:63
-msgid "Group Text"
-msgstr "Grupptext"
diff --git a/group_text/lang/sv/strings.php b/group_text/lang/sv/strings.php
index 5d5e98db..3ec569a7 100644
--- a/group_text/lang/sv/strings.php
+++ b/group_text/lang/sv/strings.php
@@ -1,8 +1,3 @@
-<?php
-
-if(! function_exists("string_plural_select_sv")) {
-function string_plural_select_sv($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Group Text'] = 'Grupptext';
+<?php
+
+$a->strings["Submit"] = "Spara";
diff --git a/group_text/templates/settings.tpl b/group_text/templates/settings.tpl
deleted file mode 100644
index 2f3f4ce7..00000000
--- a/group_text/templates/settings.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{{include file="field_checkbox.tpl" field=$enabled}}
diff --git a/groupdirectory/groupdirectory.php b/groupdirectory/groupdirectory.php
deleted file mode 100644
index 7bad1ef9..00000000
--- a/groupdirectory/groupdirectory.php
+++ /dev/null
@@ -1,155 +0,0 @@
-<?php
-/**
- * Name: Group Directory
- * Description: Add a directory of groups hosted on your server, with verbose descriptions.
- * Version: 1.1
- * Author: Thomas Willingham <https://beardyunixer.com/profile/beardyunixer>
- */
-
-use Friendica\Content\Nav;
-use Friendica\Content\Pager;
-use Friendica\Content\Widget;
-use Friendica\Core\Hook;
-use Friendica\Core\Renderer;
-use Friendica\Database\DBA;
-use Friendica\DI;
-use Friendica\Model\Profile;
-use Friendica\Model\User;
-
-global $groupdirectory_search;
-
-function groupdirectory_install()
-{
-	Hook::register('app_menu', __FILE__, 'groupdirectory_app_menu');
-}
-
-/**
- * This is a statement rather than an actual function definition. The simple
- * existence of this method is checked to figure out if the addon offers a
- * module.
- */
-/**
- * This is a statement rather than an actual function definition. The simple
- * existence of this method is checked to figure out if the addon offers a
- * module.
- */
-function groupdirectory_module() {}
-
-function groupdirectory_app_menu(array &$b)
-{
-	$b['app_menu'][] = '<div class="app-title"><a href="groupdirectory">' . DI::l10n()->t('Group Directory') . '</a></div>';
-}
-
-function groupdirectory_init()
-{
-	if (DI::userSession()->getLocalUserId()) {
-		DI::page()['aside'] .= Widget::findPeople();
-	}
-}
-
-function groupdirectory_post()
-{
-	global $groupdirectory_search;
-
-	if (!empty($_POST['search'])) {
-		$groupdirectory_search = $_POST['search'];
-	}
-}
-
-function groupdirectory_content()
-{
-	global $groupdirectory_search;
-
-	if (DI::config()->get('system', 'block_public') && !DI::userSession()->getLocalUserId() && !DI::userSession()->getRemoteUserId()) {
-		DI::sysmsg()->addNotice(DI::l10n()->t('Public access denied.'));
-		return '';
-	}
-
-	$o       = '';
-	$entries = [];
-
-	Nav::setSelected('directory');
-
-	if (!empty($groupdirectory_search)) {
-		$search = trim($groupdirectory_search);
-	} else {
-		$search = (!empty($_GET['search']) ? trim(rawurldecode($_GET['search'])) : '');
-	}
-
-	$gdirpath = '';
-	$dirurl   = DI::config()->get('system', 'directory');
-	if (strlen($dirurl)) {
-		$gdirpath = Profile::zrl($dirurl, true);
-	}
-
-	$sql_extra = '';
-	if (strlen($search)) {
-		$search = DBA::escape($search);
-
-		$sql_extra = " AND ((`profile`.`name` LIKE '%$search%') OR
-				(`user`.`nickname` LIKE '%$search%') OR
-				(`profile`.`about` LIKE '%$search%') OR
-				(`profile`.`locality` LIKE '%$search%') OR
-				(`profile`.`region` LIKE '%$search%') OR
-				(`profile`.`country-name` LIKE '%$search%') OR
-				(`profile`.`pub_keywords` LIKE '%$search%') OR
-				(`profile`.`prv_keywords` LIKE '%$search%'))";
-	}
-
-	$publish = DI::config()->get('system', 'publish_all') ? '' : "`publish` = 1";
-
-	$total = 0;
-	$cnt   = DBA::fetchFirst("SELECT COUNT(*) AS `total` FROM `profile`
-				INNER JOIN `user` ON `user`.`uid` = `profile`.`uid`
-				WHERE $publish AND NOT `user`.`blocked` AND NOT `user`.`account_removed` AND `user`.`page-flags` = ? $sql_extra",
-		User::PAGE_FLAGS_COMMUNITY);
-	if (DBA::isResult($cnt)) {
-		$total = $cnt['total'];
-	}
-
-	$pager = new Pager(DI::l10n(), DI::args()->getQueryString(), 60);
-
-	$order = " ORDER BY `name` ASC ";
-
-	$limit = $pager->getStart() . "," . $pager->getItemsPerPage();
-
-	$r = DBA::p("SELECT `profile`.*, `user`.`nickname`, `user`.`timezone` , `user`.`page-flags`,
-			`contact`.`addr`, `contact`.`url` FROM `profile`
-			INNER JOIN `user` ON `user`.`uid` = `profile`.`uid`
-			INNER JOIN `contact` ON `contact`.`uid` = `user`.`uid`
-			WHERE $publish AND NOT `user`.`blocked` AND NOT `user`.`account_removed` AND `user`.`page-flags` = ? AND `contact`.`self`
-			$sql_extra $order LIMIT $limit", User::PAGE_FLAGS_COMMUNITY
-	);
-
-	if (DBA::isResult($r)) {
-		if (in_array('small', DI::args()->getArgv())) {
-			$photo = 'thumb';
-		} else {
-			$photo = 'photo';
-		}
-
-		while ($rr = DBA::fetch($r)) {
-			$entries[] = Friendica\Module\Directory::formatEntry($rr, $photo);
-		}
-		DBA::close($r);
-	} else {
-		DI::sysmsg()->addNotice(DI::l10n()->t('No entries (some entries may be hidden).'));
-	}
-
-	$tpl = Renderer::getMarkupTemplate('directory_header.tpl');
-	$o   .= Renderer::replaceMacros($tpl, [
-		'$search'     => $search,
-		'$globaldir'  => DI::l10n()->t('Global Directory'),
-		'$gdirpath'   => $gdirpath,
-		'$desc'       => DI::l10n()->t('Find on this site'),
-		'$contacts'   => $entries,
-		'$finding'    => DI::l10n()->t('Results for:'),
-		'$findterm'   => (strlen($search) ? $search : ""),
-		'$title'      => DI::l10n()->t('Group Directory'),
-		'$search_mod' => 'groupdirectory',
-		'$submit'     => DI::l10n()->t('Find'),
-		'$paginate'   => $pager->renderFull($total),
-	]);
-
-	return $o;
-}
diff --git a/groupdirectory/lang/C/messages.po b/groupdirectory/lang/C/messages.po
deleted file mode 100644
index f83171f4..00000000
--- a/groupdirectory/lang/C/messages.po
+++ /dev/null
@@ -1,46 +0,0 @@
-# ADDON groupdirectory
-# Copyright (C) 
-# This file is distributed under the same license as the Friendica groupdirectory addon package.
-# 
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-06-03 15:49-0400\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: groupdirectory.php:40 groupdirectory.php:148
-msgid "Group Directory"
-msgstr ""
-
-#: groupdirectory.php:64
-msgid "Public access denied."
-msgstr ""
-
-#: groupdirectory.php:136
-msgid "No entries (some entries may be hidden)."
-msgstr ""
-
-#: groupdirectory.php:142
-msgid "Global Directory"
-msgstr ""
-
-#: groupdirectory.php:144
-msgid "Find on this site"
-msgstr ""
-
-#: groupdirectory.php:146
-msgid "Results for:"
-msgstr ""
-
-#: groupdirectory.php:150
-msgid "Find"
-msgstr ""
diff --git a/groupdirectory/lang/ar/messages.po b/groupdirectory/lang/ar/messages.po
deleted file mode 100644
index 24380f0f..00000000
--- a/groupdirectory/lang/ar/messages.po
+++ /dev/null
@@ -1,50 +0,0 @@
-# ADDON forumdirectory
-# Copyright (C)
-# This file is distributed under the same license as the Friendica forumdirectory addon package.
-# 
-# 
-# Translators:
-# abidin toumi <abidin24@tutanota.com>, 2021
-# ButterflyOfFire, 2019
-# Farida Khalaf <faridakhalaf@hotmail.com>, 2021
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2021-10-29 10:27+0000\n"
-"Last-Translator: abidin toumi <abidin24@tutanota.com>\n"
-"Language-Team: Arabic (http://www.transifex.com/Friendica/friendica/language/ar/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ar\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-
-#: forumdirectory.php:33 forumdirectory.php:137
-msgid "Forum Directory"
-msgstr "دليل المنتدى"
-
-#: forumdirectory.php:53
-msgid "Public access denied."
-msgstr "رُفض الوصول العمومي."
-
-#: forumdirectory.php:125
-msgid "No entries (some entries may be hidden)."
-msgstr "لا توجد مدخلات (قد تكون بعض المدخلات مخفية)."
-
-#: forumdirectory.php:131
-msgid "Global Directory"
-msgstr "الدليل العالمي"
-
-#: forumdirectory.php:133
-msgid "Find on this site"
-msgstr "ابحث في هذا الموقع"
-
-#: forumdirectory.php:135
-msgid "Results for:"
-msgstr "النتائج:"
-
-#: forumdirectory.php:139
-msgid "Find"
-msgstr "ابحث"
diff --git a/groupdirectory/lang/ar/strings.php b/groupdirectory/lang/ar/strings.php
deleted file mode 100644
index eb6f3077..00000000
--- a/groupdirectory/lang/ar/strings.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_ar")) {
-function string_plural_select_ar($n){
-	$n = intval($n);
-	if ($n==0) { return 0; } else if ($n==1) { return 1; } else if ($n==2) { return 2; } else if ($n%100>=3 && $n%100<=10) { return 3; } else if ($n%100>=11 && $n%100<=99) { return 4; } else  { return 5; }
-}}
-$a->strings['Forum Directory'] = 'دليل المنتدى';
-$a->strings['Public access denied.'] = 'رُفض الوصول العمومي.';
-$a->strings['No entries (some entries may be hidden).'] = 'لا توجد مدخلات (قد تكون بعض المدخلات مخفية).';
-$a->strings['Global Directory'] = 'الدليل العالمي';
-$a->strings['Find on this site'] = 'ابحث في هذا الموقع';
-$a->strings['Results for:'] = 'النتائج:';
-$a->strings['Find'] = 'ابحث';
diff --git a/groupdirectory/lang/ca/messages.po b/groupdirectory/lang/ca/messages.po
deleted file mode 100644
index 0aa19b1c..00000000
--- a/groupdirectory/lang/ca/messages.po
+++ /dev/null
@@ -1,80 +0,0 @@
-# ADDON forumdirectory
-# Copyright (C)
-# This file is distributed under the same license as the Friendica forumdirectory addon package.
-# 
-# 
-# Translators:
-# Joan Bar <friendica@tutanota.com>, 2019
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-27 05:01-0500\n"
-"PO-Revision-Date: 2019-10-18 18:57+0000\n"
-"Last-Translator: Joan Bar <friendica@tutanota.com>\n"
-"Language-Team: Catalan (http://www.transifex.com/Friendica/friendica/language/ca/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ca\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: forumdirectory.php:22
-msgid "Forum Directory"
-msgstr "Directori de fòrums"
-
-#: forumdirectory.php:53
-msgid "Public access denied."
-msgstr "L'accés al públic s'ha denegat."
-
-#: forumdirectory.php:71
-msgid "Global Directory"
-msgstr "Directori global"
-
-#: forumdirectory.php:79
-msgid "Find on this site"
-msgstr "Cerqueu en aquest lloc"
-
-#: forumdirectory.php:81
-msgid "Finding: "
-msgstr "Trobament:"
-
-#: forumdirectory.php:82
-msgid "Site Directory"
-msgstr "Directori de llocs"
-
-#: forumdirectory.php:83
-msgid "Find"
-msgstr "trobar"
-
-#: forumdirectory.php:133
-msgid "Age: "
-msgstr "Edat:"
-
-#: forumdirectory.php:136
-msgid "Gender: "
-msgstr "Gènere:"
-
-#: forumdirectory.php:156
-msgid "Location:"
-msgstr "Ubicació:"
-
-#: forumdirectory.php:158
-msgid "Gender:"
-msgstr "Gènere:"
-
-#: forumdirectory.php:160
-msgid "Status:"
-msgstr "Estat:"
-
-#: forumdirectory.php:162
-msgid "Homepage:"
-msgstr "Pàgina inicial:"
-
-#: forumdirectory.php:164
-msgid "About:"
-msgstr "Sobre:"
-
-#: forumdirectory.php:201
-msgid "No entries (some entries may be hidden)."
-msgstr "No hi ha entrades (algunes entrades poden estar ocultes)."
diff --git a/groupdirectory/lang/ca/strings.php b/groupdirectory/lang/ca/strings.php
deleted file mode 100644
index 07a39488..00000000
--- a/groupdirectory/lang/ca/strings.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_ca")) {
-function string_plural_select_ca($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Forum Directory'] = 'Directori de fòrums';
-$a->strings['Public access denied.'] = 'L\'accés al públic s\'ha denegat.';
-$a->strings['Global Directory'] = 'Directori global';
-$a->strings['Find on this site'] = 'Cerqueu en aquest lloc';
-$a->strings['Finding: '] = 'Trobament:';
-$a->strings['Site Directory'] = 'Directori de llocs';
-$a->strings['Find'] = 'trobar';
-$a->strings['Age: '] = 'Edat:';
-$a->strings['Gender: '] = 'Gènere:';
-$a->strings['Location:'] = 'Ubicació:';
-$a->strings['Gender:'] = 'Gènere:';
-$a->strings['Status:'] = 'Estat:';
-$a->strings['Homepage:'] = 'Pàgina inicial:';
-$a->strings['About:'] = 'Sobre:';
-$a->strings['No entries (some entries may be hidden).'] = 'No hi ha entrades (algunes entrades poden estar ocultes).';
diff --git a/groupdirectory/lang/cs/messages.po b/groupdirectory/lang/cs/messages.po
deleted file mode 100644
index 138c26f3..00000000
--- a/groupdirectory/lang/cs/messages.po
+++ /dev/null
@@ -1,81 +0,0 @@
-# ADDON forumdirectory
-# Copyright (C)
-# This file is distributed under the same license as the Friendica forumdirectory addon package.
-# 
-# 
-# Translators:
-# Aditoo, 2018
-# michal_s <msupler@gmail.com>, 2014
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-27 05:01-0500\n"
-"PO-Revision-Date: 2018-09-11 19:04+0000\n"
-"Last-Translator: Aditoo\n"
-"Language-Team: Czech (http://www.transifex.com/Friendica/friendica/language/cs/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: cs\n"
-"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
-
-#: forumdirectory.php:22
-msgid "Forum Directory"
-msgstr "Adresář fór"
-
-#: forumdirectory.php:53
-msgid "Public access denied."
-msgstr "Veřejný přístup odepřen."
-
-#: forumdirectory.php:71
-msgid "Global Directory"
-msgstr "Globální adresář"
-
-#: forumdirectory.php:79
-msgid "Find on this site"
-msgstr "Najít na tomto webu"
-
-#: forumdirectory.php:81
-msgid "Finding: "
-msgstr "Hledání: "
-
-#: forumdirectory.php:82
-msgid "Site Directory"
-msgstr "Adresář serveru"
-
-#: forumdirectory.php:83
-msgid "Find"
-msgstr "Najít"
-
-#: forumdirectory.php:133
-msgid "Age: "
-msgstr "Věk: "
-
-#: forumdirectory.php:136
-msgid "Gender: "
-msgstr "Pohlaví: "
-
-#: forumdirectory.php:156
-msgid "Location:"
-msgstr "Poloha:"
-
-#: forumdirectory.php:158
-msgid "Gender:"
-msgstr "Pohlaví:"
-
-#: forumdirectory.php:160
-msgid "Status:"
-msgstr "Stav:"
-
-#: forumdirectory.php:162
-msgid "Homepage:"
-msgstr "Domovská stránka:"
-
-#: forumdirectory.php:164
-msgid "About:"
-msgstr "O mě:"
-
-#: forumdirectory.php:201
-msgid "No entries (some entries may be hidden)."
-msgstr "Žádné záznamy (některé položky mohou být skryty)."
diff --git a/groupdirectory/lang/cs/strings.php b/groupdirectory/lang/cs/strings.php
deleted file mode 100644
index 2e7d6378..00000000
--- a/groupdirectory/lang/cs/strings.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_cs")) {
-function string_plural_select_cs($n){
-	$n = intval($n);
-	if (($n == 1 && $n % 1 == 0)) { return 0; } else if (($n >= 2 && $n <= 4 && $n % 1 == 0)) { return 1; } else if (($n % 1 != 0 )) { return 2; } else  { return 3; }
-}}
-$a->strings['Forum Directory'] = 'Adresář fór';
-$a->strings['Public access denied.'] = 'Veřejný přístup odepřen.';
-$a->strings['Global Directory'] = 'Globální adresář';
-$a->strings['Find on this site'] = 'Najít na tomto webu';
-$a->strings['Finding: '] = 'Hledání: ';
-$a->strings['Site Directory'] = 'Adresář serveru';
-$a->strings['Find'] = 'Najít';
-$a->strings['Age: '] = 'Věk: ';
-$a->strings['Gender: '] = 'Pohlaví: ';
-$a->strings['Location:'] = 'Poloha:';
-$a->strings['Gender:'] = 'Pohlaví:';
-$a->strings['Status:'] = 'Stav:';
-$a->strings['Homepage:'] = 'Domovská stránka:';
-$a->strings['About:'] = 'O mě:';
-$a->strings['No entries (some entries may be hidden).'] = 'Žádné záznamy (některé položky mohou být skryty).';
diff --git a/groupdirectory/lang/da-dk/messages.po b/groupdirectory/lang/da-dk/messages.po
deleted file mode 100644
index 882c896e..00000000
--- a/groupdirectory/lang/da-dk/messages.po
+++ /dev/null
@@ -1,48 +0,0 @@
-# ADDON forumdirectory
-# Copyright (C)
-# This file is distributed under the same license as the Friendica forumdirectory addon package.
-# 
-# 
-# Translators:
-# Anton <dev@atjn.dk>, 2022
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2014-06-22 12:31+0000\n"
-"Last-Translator: Anton <dev@atjn.dk>, 2022\n"
-"Language-Team: Danish (Denmark) (http://www.transifex.com/Friendica/friendica/language/da_DK/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: da_DK\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: forumdirectory.php:33 forumdirectory.php:137
-msgid "Forum Directory"
-msgstr "Forum adressebog"
-
-#: forumdirectory.php:53
-msgid "Public access denied."
-msgstr "Offentlig adgang nægtet."
-
-#: forumdirectory.php:125
-msgid "No entries (some entries may be hidden)."
-msgstr "Ingen poster (nogle poster er måske skjulte)."
-
-#: forumdirectory.php:131
-msgid "Global Directory"
-msgstr "Global adressebog"
-
-#: forumdirectory.php:133
-msgid "Find on this site"
-msgstr "Find på denne side"
-
-#: forumdirectory.php:135
-msgid "Results for:"
-msgstr "Resultater for:"
-
-#: forumdirectory.php:139
-msgid "Find"
-msgstr "Find"
diff --git a/groupdirectory/lang/da-dk/strings.php b/groupdirectory/lang/da-dk/strings.php
deleted file mode 100644
index fecaed71..00000000
--- a/groupdirectory/lang/da-dk/strings.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_da_dk")) {
-function string_plural_select_da_dk($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Forum Directory'] = 'Forum adressebog';
-$a->strings['Public access denied.'] = 'Offentlig adgang nægtet.';
-$a->strings['No entries (some entries may be hidden).'] = 'Ingen poster (nogle poster er måske skjulte).';
-$a->strings['Global Directory'] = 'Global adressebog';
-$a->strings['Find on this site'] = 'Find på denne side';
-$a->strings['Results for:'] = 'Resultater for:';
-$a->strings['Find'] = 'Find';
diff --git a/groupdirectory/lang/de/messages.po b/groupdirectory/lang/de/messages.po
deleted file mode 100644
index 35ee4a55..00000000
--- a/groupdirectory/lang/de/messages.po
+++ /dev/null
@@ -1,49 +0,0 @@
-# ADDON forumdirectory
-# Copyright (C)
-# This file is distributed under the same license as the Friendica forumdirectory addon package.
-# 
-# 
-# Translators:
-# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2014
-# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2021
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2014-06-22 12:31+0000\n"
-"Last-Translator: Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2021\n"
-"Language-Team: German (http://app.transifex.com/Friendica/friendica/language/de/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: de\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: forumdirectory.php:33 forumdirectory.php:137
-msgid "Forum Directory"
-msgstr "Foren Verzeichnis"
-
-#: forumdirectory.php:53
-msgid "Public access denied."
-msgstr "Öffentlicher Zugriff verweigert."
-
-#: forumdirectory.php:125
-msgid "No entries (some entries may be hidden)."
-msgstr "Keine Einträge (einige Einträge könnten versteckt sein)."
-
-#: forumdirectory.php:131
-msgid "Global Directory"
-msgstr "Weltweites Verzeichnis"
-
-#: forumdirectory.php:133
-msgid "Find on this site"
-msgstr "Auf diesem Server suchen"
-
-#: forumdirectory.php:135
-msgid "Results for:"
-msgstr "Ergebnis für:"
-
-#: forumdirectory.php:139
-msgid "Find"
-msgstr "Finde"
diff --git a/groupdirectory/lang/de/strings.php b/groupdirectory/lang/de/strings.php
deleted file mode 100644
index 081f3152..00000000
--- a/groupdirectory/lang/de/strings.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_de")) {
-function string_plural_select_de($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Forum Directory'] = 'Foren Verzeichnis';
-$a->strings['Public access denied.'] = 'Öffentlicher Zugriff verweigert.';
-$a->strings['No entries (some entries may be hidden).'] = 'Keine Einträge (einige Einträge könnten versteckt sein).';
-$a->strings['Global Directory'] = 'Weltweites Verzeichnis';
-$a->strings['Find on this site'] = 'Auf diesem Server suchen';
-$a->strings['Results for:'] = 'Ergebnis für:';
-$a->strings['Find'] = 'Finde';
diff --git a/groupdirectory/lang/eo/strings.php b/groupdirectory/lang/eo/strings.php
deleted file mode 100644
index 4ec15e76..00000000
--- a/groupdirectory/lang/eo/strings.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-$a->strings["Public access denied."] = "Publika atingo ne permesita.";
-$a->strings["Global Directory"] = "Tutmonda Katalogo";
-$a->strings["Find on this site"] = "Trovi en ĉi retejo";
-$a->strings["Finding: "] = "Trovata:";
-$a->strings["Site Directory"] = "Reteja Katalogo";
-$a->strings["Find"] = "Trovi";
-$a->strings["Age: "] = "Aĝo:";
-$a->strings["Gender: "] = "Sekso:";
-$a->strings["Location:"] = "Loko:";
-$a->strings["Gender:"] = "Sekso:";
-$a->strings["Status:"] = "Stato:";
-$a->strings["Homepage:"] = "Hejmpaĝo:";
-$a->strings["About:"] = "Pri:";
-$a->strings["No entries (some entries may be hidden)."] = "Neniom da afiŝoj (kelkaj afiŝoj eble ne estas videbla).";
diff --git a/groupdirectory/lang/es/messages.po b/groupdirectory/lang/es/messages.po
deleted file mode 100644
index 74948223..00000000
--- a/groupdirectory/lang/es/messages.po
+++ /dev/null
@@ -1,49 +0,0 @@
-# ADDON forumdirectory
-# Copyright (C)
-# This file is distributed under the same license as the Friendica forumdirectory addon package.
-# 
-# 
-# Translators:
-# Albert, 2016
-# Senex Petrovic <javierruizo@hotmail.com>, 2021
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2021-04-01 09:54+0000\n"
-"Last-Translator: Senex Petrovic <javierruizo@hotmail.com>\n"
-"Language-Team: Spanish (http://www.transifex.com/Friendica/friendica/language/es/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: es\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: forumdirectory.php:33 forumdirectory.php:137
-msgid "Forum Directory"
-msgstr "Directorio de foro"
-
-#: forumdirectory.php:53
-msgid "Public access denied."
-msgstr "Acceso público denegado."
-
-#: forumdirectory.php:125
-msgid "No entries (some entries may be hidden)."
-msgstr "Sin entradas (algunas entradas pueden estar ocultas)."
-
-#: forumdirectory.php:131
-msgid "Global Directory"
-msgstr "Directorio global"
-
-#: forumdirectory.php:133
-msgid "Find on this site"
-msgstr "Encontrar en esta página"
-
-#: forumdirectory.php:135
-msgid "Results for:"
-msgstr "Resultados para:"
-
-#: forumdirectory.php:139
-msgid "Find"
-msgstr "Encontrar"
diff --git a/groupdirectory/lang/es/strings.php b/groupdirectory/lang/es/strings.php
deleted file mode 100644
index 4f1a59f1..00000000
--- a/groupdirectory/lang/es/strings.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_es")) {
-function string_plural_select_es($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Forum Directory'] = 'Directorio de foro';
-$a->strings['Public access denied.'] = 'Acceso público denegado.';
-$a->strings['No entries (some entries may be hidden).'] = 'Sin entradas (algunas entradas pueden estar ocultas).';
-$a->strings['Global Directory'] = 'Directorio global';
-$a->strings['Find on this site'] = 'Encontrar en esta página';
-$a->strings['Results for:'] = 'Resultados para:';
-$a->strings['Find'] = 'Encontrar';
diff --git a/groupdirectory/lang/fi-fi/messages.po b/groupdirectory/lang/fi-fi/messages.po
deleted file mode 100644
index 6c4f08c9..00000000
--- a/groupdirectory/lang/fi-fi/messages.po
+++ /dev/null
@@ -1,81 +0,0 @@
-# ADDON forumdirectory
-# Copyright (C)
-# This file is distributed under the same license as the Friendica forumdirectory addon package.
-# 
-# 
-# Translators:
-# Kris, 2018
-# Kris, 2018
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-27 05:01-0500\n"
-"PO-Revision-Date: 2018-05-12 12:50+0000\n"
-"Last-Translator: Kris\n"
-"Language-Team: Finnish (Finland) (http://www.transifex.com/Friendica/friendica/language/fi_FI/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: fi_FI\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: forumdirectory.php:22
-msgid "Forum Directory"
-msgstr "Foorumihakemisto"
-
-#: forumdirectory.php:53
-msgid "Public access denied."
-msgstr "Julkinen käyttö estetty."
-
-#: forumdirectory.php:71
-msgid "Global Directory"
-msgstr "Maailmanlaajuinen hakemisto"
-
-#: forumdirectory.php:79
-msgid "Find on this site"
-msgstr "Sivustohaku"
-
-#: forumdirectory.php:81
-msgid "Finding: "
-msgstr ""
-
-#: forumdirectory.php:82
-msgid "Site Directory"
-msgstr "Sivustoluettelo"
-
-#: forumdirectory.php:83
-msgid "Find"
-msgstr "Etsi"
-
-#: forumdirectory.php:133
-msgid "Age: "
-msgstr "Ikä:"
-
-#: forumdirectory.php:136
-msgid "Gender: "
-msgstr "Sukupuoli:"
-
-#: forumdirectory.php:156
-msgid "Location:"
-msgstr "Sijainti:"
-
-#: forumdirectory.php:158
-msgid "Gender:"
-msgstr "Sukupuoli:"
-
-#: forumdirectory.php:160
-msgid "Status:"
-msgstr "Tila:"
-
-#: forumdirectory.php:162
-msgid "Homepage:"
-msgstr "Kotisivu:"
-
-#: forumdirectory.php:164
-msgid "About:"
-msgstr "Lisätietoja:"
-
-#: forumdirectory.php:201
-msgid "No entries (some entries may be hidden)."
-msgstr "Ei kohteita (jotkut kohteet saattaa olla piilotettuja)."
diff --git a/groupdirectory/lang/fi-fi/strings.php b/groupdirectory/lang/fi-fi/strings.php
deleted file mode 100644
index 70657d3c..00000000
--- a/groupdirectory/lang/fi-fi/strings.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_fi_fi")) {
-function string_plural_select_fi_fi($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Forum Directory'] = 'Foorumihakemisto';
-$a->strings['Public access denied.'] = 'Julkinen käyttö estetty.';
-$a->strings['Global Directory'] = 'Maailmanlaajuinen hakemisto';
-$a->strings['Find on this site'] = 'Sivustohaku';
-$a->strings['Site Directory'] = 'Sivustoluettelo';
-$a->strings['Find'] = 'Etsi';
-$a->strings['Age: '] = 'Ikä:';
-$a->strings['Gender: '] = 'Sukupuoli:';
-$a->strings['Location:'] = 'Sijainti:';
-$a->strings['Gender:'] = 'Sukupuoli:';
-$a->strings['Status:'] = 'Tila:';
-$a->strings['Homepage:'] = 'Kotisivu:';
-$a->strings['About:'] = 'Lisätietoja:';
-$a->strings['No entries (some entries may be hidden).'] = 'Ei kohteita (jotkut kohteet saattaa olla piilotettuja).';
diff --git a/groupdirectory/lang/fr/messages.po b/groupdirectory/lang/fr/messages.po
deleted file mode 100644
index 7f9e2458..00000000
--- a/groupdirectory/lang/fr/messages.po
+++ /dev/null
@@ -1,51 +0,0 @@
-# ADDON forumdirectory
-# Copyright (C)
-# This file is distributed under the same license as the Friendica forumdirectory addon package.
-# 
-# 
-# Translators:
-# bob lebonche <lebonche@tutanota.com>, 2021
-# Hypolite Petovan <hypolite@mrpetovan.com>, 2016
-# StefOfficiel <pichard.stephane@free.fr>, 2015
-# Valvin <vincent-forum@valvin.fr>, 2019
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2014-06-22 12:31+0000\n"
-"Last-Translator: bob lebonche <lebonche@tutanota.com>, 2021\n"
-"Language-Team: French (http://www.transifex.com/Friendica/friendica/language/fr/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: fr\n"
-"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
-
-#: forumdirectory.php:33 forumdirectory.php:137
-msgid "Forum Directory"
-msgstr "Annuaire de Forums"
-
-#: forumdirectory.php:53
-msgid "Public access denied."
-msgstr "Accès public refusé."
-
-#: forumdirectory.php:125
-msgid "No entries (some entries may be hidden)."
-msgstr "Pas de résultats (certains résultats peuvent être cachés)."
-
-#: forumdirectory.php:131
-msgid "Global Directory"
-msgstr "Annuaire Global"
-
-#: forumdirectory.php:133
-msgid "Find on this site"
-msgstr "Trouver sur cette instance"
-
-#: forumdirectory.php:135
-msgid "Results for:"
-msgstr "Résultats pour :"
-
-#: forumdirectory.php:139
-msgid "Find"
-msgstr "Chercher"
diff --git a/groupdirectory/lang/fr/strings.php b/groupdirectory/lang/fr/strings.php
deleted file mode 100644
index ac0e2323..00000000
--- a/groupdirectory/lang/fr/strings.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_fr")) {
-function string_plural_select_fr($n){
-	$n = intval($n);
-	if (($n == 0 || $n == 1)) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
-}}
-$a->strings['Forum Directory'] = 'Annuaire de Forums';
-$a->strings['Public access denied.'] = 'Accès public refusé.';
-$a->strings['No entries (some entries may be hidden).'] = 'Pas de résultats (certains résultats peuvent être cachés).';
-$a->strings['Global Directory'] = 'Annuaire Global';
-$a->strings['Find on this site'] = 'Trouver sur cette instance';
-$a->strings['Results for:'] = 'Résultats pour :';
-$a->strings['Find'] = 'Chercher';
diff --git a/groupdirectory/lang/hu/messages.po b/groupdirectory/lang/hu/messages.po
deleted file mode 100644
index 996d310c..00000000
--- a/groupdirectory/lang/hu/messages.po
+++ /dev/null
@@ -1,48 +0,0 @@
-# ADDON forumdirectory
-# Copyright (C)
-# This file is distributed under the same license as the Friendica forumdirectory addon package.
-# 
-# 
-# Translators:
-# Balázs Úr, 2020-2021
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2014-06-22 12:31+0000\n"
-"Last-Translator: Balázs Úr, 2020-2021\n"
-"Language-Team: Hungarian (http://www.transifex.com/Friendica/friendica/language/hu/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: hu\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: forumdirectory.php:33 forumdirectory.php:137
-msgid "Forum Directory"
-msgstr "Fórumkönyvtár"
-
-#: forumdirectory.php:53
-msgid "Public access denied."
-msgstr "Nyilvános hozzáférés megtagadva."
-
-#: forumdirectory.php:125
-msgid "No entries (some entries may be hidden)."
-msgstr "Nincsenek bejegyzések (néhány bejegyzés rejtve lehet)."
-
-#: forumdirectory.php:131
-msgid "Global Directory"
-msgstr "Globális könyvtár"
-
-#: forumdirectory.php:133
-msgid "Find on this site"
-msgstr "Keresés ezen az oldalon"
-
-#: forumdirectory.php:135
-msgid "Results for:"
-msgstr "Találatok ehhez:"
-
-#: forumdirectory.php:139
-msgid "Find"
-msgstr "Keresés"
diff --git a/groupdirectory/lang/hu/strings.php b/groupdirectory/lang/hu/strings.php
deleted file mode 100644
index 290cf7ed..00000000
--- a/groupdirectory/lang/hu/strings.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_hu")) {
-function string_plural_select_hu($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Forum Directory'] = 'Fórumkönyvtár';
-$a->strings['Public access denied.'] = 'Nyilvános hozzáférés megtagadva.';
-$a->strings['No entries (some entries may be hidden).'] = 'Nincsenek bejegyzések (néhány bejegyzés rejtve lehet).';
-$a->strings['Global Directory'] = 'Globális könyvtár';
-$a->strings['Find on this site'] = 'Keresés ezen az oldalon';
-$a->strings['Results for:'] = 'Találatok ehhez:';
-$a->strings['Find'] = 'Keresés';
diff --git a/groupdirectory/lang/is/strings.php b/groupdirectory/lang/is/strings.php
deleted file mode 100644
index da710b73..00000000
--- a/groupdirectory/lang/is/strings.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-$a->strings["Public access denied."] = "Alemennings aðgangur ekki veittur.";
-$a->strings["Global Directory"] = "Heims tengiliða skrá";
-$a->strings["Find on this site"] = "Leita á þessum vef";
-$a->strings["Finding: "] = "Niðurstöður:";
-$a->strings["Site Directory"] = "Vef tengiliða skrá";
-$a->strings["Find"] = "Finna";
-$a->strings["Age: "] = "Aldur:";
-$a->strings["Gender: "] = "Kyn:";
-$a->strings["Location:"] = "Staðsetning:";
-$a->strings["Gender:"] = "Kyn:";
-$a->strings["Status:"] = "Staða:";
-$a->strings["Homepage:"] = "Heimasíða:";
-$a->strings["About:"] = "Um:";
-$a->strings["No entries (some entries may be hidden)."] = "Engar færslur (sumar geta verið faldar).";
diff --git a/groupdirectory/lang/it/messages.po b/groupdirectory/lang/it/messages.po
deleted file mode 100644
index 8e3e5fa3..00000000
--- a/groupdirectory/lang/it/messages.po
+++ /dev/null
@@ -1,49 +0,0 @@
-# ADDON forumdirectory
-# Copyright (C)
-# This file is distributed under the same license as the Friendica forumdirectory addon package.
-# 
-# 
-# Translators:
-# fabrixxm <fabrix.xm@gmail.com>, 2014
-# Sylke Vicious <silkevicious@gmail.com>, 2021
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2021-02-16 12:56+0000\n"
-"Last-Translator: Sylke Vicious <silkevicious@gmail.com>\n"
-"Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: it\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: forumdirectory.php:33 forumdirectory.php:137
-msgid "Forum Directory"
-msgstr "Elenco Forum"
-
-#: forumdirectory.php:53
-msgid "Public access denied."
-msgstr "Accesso negato."
-
-#: forumdirectory.php:125
-msgid "No entries (some entries may be hidden)."
-msgstr "Nessuna voce (qualche voce potrebbe essere nascosta)."
-
-#: forumdirectory.php:131
-msgid "Global Directory"
-msgstr "Elenco globale"
-
-#: forumdirectory.php:133
-msgid "Find on this site"
-msgstr "Cerca nel sito"
-
-#: forumdirectory.php:135
-msgid "Results for:"
-msgstr "Risultati per:"
-
-#: forumdirectory.php:139
-msgid "Find"
-msgstr "Trova"
diff --git a/groupdirectory/lang/it/strings.php b/groupdirectory/lang/it/strings.php
deleted file mode 100644
index 4378cec3..00000000
--- a/groupdirectory/lang/it/strings.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_it")) {
-function string_plural_select_it($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Forum Directory'] = 'Elenco Forum';
-$a->strings['Public access denied.'] = 'Accesso negato.';
-$a->strings['No entries (some entries may be hidden).'] = 'Nessuna voce (qualche voce potrebbe essere nascosta).';
-$a->strings['Global Directory'] = 'Elenco globale';
-$a->strings['Find on this site'] = 'Cerca nel sito';
-$a->strings['Results for:'] = 'Risultati per:';
-$a->strings['Find'] = 'Trova';
diff --git a/groupdirectory/lang/nb-no/strings.php b/groupdirectory/lang/nb-no/strings.php
deleted file mode 100644
index bcc94233..00000000
--- a/groupdirectory/lang/nb-no/strings.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-$a->strings["Forum Directory"] = "";
-$a->strings["Public access denied."] = "Offentlig tilgang ikke tillatt.";
-$a->strings["Global Directory"] = "Global katalog";
-$a->strings["Find on this site"] = "";
-$a->strings["Finding: "] = "Fant:";
-$a->strings["Site Directory"] = "Stedets katalog";
-$a->strings["Find"] = "Finn";
-$a->strings["Age: "] = "Alder:";
-$a->strings["Gender: "] = "Kjønn:";
-$a->strings["Location:"] = "Plassering:";
-$a->strings["Gender:"] = "Kjønn:";
-$a->strings["Status:"] = "Status:";
-$a->strings["Homepage:"] = "Hjemmeside:";
-$a->strings["About:"] = "Om:";
-$a->strings["No entries (some entries may be hidden)."] = "Ingen oppføringer (noen oppføringer kan være skjulte).";
diff --git a/groupdirectory/lang/nl/messages.po b/groupdirectory/lang/nl/messages.po
deleted file mode 100644
index 746e1bff..00000000
--- a/groupdirectory/lang/nl/messages.po
+++ /dev/null
@@ -1,80 +0,0 @@
-# ADDON forumdirectory
-# Copyright (C)
-# This file is distributed under the same license as the Friendica forumdirectory addon package.
-# 
-# 
-# Translators:
-# Jeroen De Meerleer <me@jeroened.be>, 2018
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-27 05:01-0500\n"
-"PO-Revision-Date: 2018-08-24 13:21+0000\n"
-"Last-Translator: Jeroen De Meerleer <me@jeroened.be>\n"
-"Language-Team: Dutch (http://www.transifex.com/Friendica/friendica/language/nl/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: nl\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: forumdirectory.php:22
-msgid "Forum Directory"
-msgstr "Forum index"
-
-#: forumdirectory.php:53
-msgid "Public access denied."
-msgstr "Publieke toegang geweigerd"
-
-#: forumdirectory.php:71
-msgid "Global Directory"
-msgstr "Globaal overzicht"
-
-#: forumdirectory.php:79
-msgid "Find on this site"
-msgstr "Zoeken"
-
-#: forumdirectory.php:81
-msgid "Finding: "
-msgstr "Zoeken..."
-
-#: forumdirectory.php:82
-msgid "Site Directory"
-msgstr "Site overzicht"
-
-#: forumdirectory.php:83
-msgid "Find"
-msgstr "Zoek"
-
-#: forumdirectory.php:133
-msgid "Age: "
-msgstr "Leeftijd:"
-
-#: forumdirectory.php:136
-msgid "Gender: "
-msgstr "Geslacht:"
-
-#: forumdirectory.php:156
-msgid "Location:"
-msgstr "Woonplaats:"
-
-#: forumdirectory.php:158
-msgid "Gender:"
-msgstr "Geslacht:"
-
-#: forumdirectory.php:160
-msgid "Status:"
-msgstr "Status:"
-
-#: forumdirectory.php:162
-msgid "Homepage:"
-msgstr "Website:"
-
-#: forumdirectory.php:164
-msgid "About:"
-msgstr "Over:"
-
-#: forumdirectory.php:201
-msgid "No entries (some entries may be hidden)."
-msgstr "Geen berichten (sommige berichten kunnen verborgen zijn)."
diff --git a/groupdirectory/lang/nl/strings.php b/groupdirectory/lang/nl/strings.php
deleted file mode 100644
index ae764ed7..00000000
--- a/groupdirectory/lang/nl/strings.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_nl")) {
-function string_plural_select_nl($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Forum Directory'] = 'Forum index';
-$a->strings['Public access denied.'] = 'Publieke toegang geweigerd';
-$a->strings['Global Directory'] = 'Globaal overzicht';
-$a->strings['Find on this site'] = 'Zoeken';
-$a->strings['Finding: '] = 'Zoeken...';
-$a->strings['Site Directory'] = 'Site overzicht';
-$a->strings['Find'] = 'Zoek';
-$a->strings['Age: '] = 'Leeftijd:';
-$a->strings['Gender: '] = 'Geslacht:';
-$a->strings['Location:'] = 'Woonplaats:';
-$a->strings['Gender:'] = 'Geslacht:';
-$a->strings['Status:'] = 'Status:';
-$a->strings['Homepage:'] = 'Website:';
-$a->strings['About:'] = 'Over:';
-$a->strings['No entries (some entries may be hidden).'] = 'Geen berichten (sommige berichten kunnen verborgen zijn).';
diff --git a/groupdirectory/lang/pl/messages.po b/groupdirectory/lang/pl/messages.po
deleted file mode 100644
index 49226ac0..00000000
--- a/groupdirectory/lang/pl/messages.po
+++ /dev/null
@@ -1,50 +0,0 @@
-# ADDON forumdirectory
-# Copyright (C)
-# This file is distributed under the same license as the Friendica forumdirectory addon package.
-# 
-# 
-# Translators:
-# TORminator <dominik+foss@danelski.pl>, 2015
-# Piotr Strębski <strebski@gmail.com>, 2022
-# Waldemar Stoczkowski, 2018
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2014-06-22 12:31+0000\n"
-"Last-Translator: Piotr Strębski <strebski@gmail.com>, 2022\n"
-"Language-Team: Polish (http://www.transifex.com/Friendica/friendica/language/pl/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: pl\n"
-"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
-
-#: forumdirectory.php:33 forumdirectory.php:137
-msgid "Forum Directory"
-msgstr "Katalog forum"
-
-#: forumdirectory.php:53
-msgid "Public access denied."
-msgstr "Odmowa dostępu publicznego."
-
-#: forumdirectory.php:125
-msgid "No entries (some entries may be hidden)."
-msgstr "Brak wpisów (niektóre wpisy mogą być ukryte)."
-
-#: forumdirectory.php:131
-msgid "Global Directory"
-msgstr "Globalny katalog"
-
-#: forumdirectory.php:133
-msgid "Find on this site"
-msgstr "Znajdź na tej stronie"
-
-#: forumdirectory.php:135
-msgid "Results for:"
-msgstr "Wyniki dla:"
-
-#: forumdirectory.php:139
-msgid "Find"
-msgstr "Szukaj"
diff --git a/groupdirectory/lang/pl/strings.php b/groupdirectory/lang/pl/strings.php
deleted file mode 100644
index 9bf60bd7..00000000
--- a/groupdirectory/lang/pl/strings.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_pl")) {
-function string_plural_select_pl($n){
-	$n = intval($n);
-	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
-}}
-$a->strings['Forum Directory'] = 'Katalog forum';
-$a->strings['Public access denied.'] = 'Odmowa dostępu publicznego.';
-$a->strings['No entries (some entries may be hidden).'] = 'Brak wpisów (niektóre wpisy mogą być ukryte).';
-$a->strings['Global Directory'] = 'Globalny katalog';
-$a->strings['Find on this site'] = 'Znajdź na tej stronie';
-$a->strings['Results for:'] = 'Wyniki dla:';
-$a->strings['Find'] = 'Szukaj';
diff --git a/groupdirectory/lang/pt-br/messages.po b/groupdirectory/lang/pt-br/messages.po
deleted file mode 100644
index c8d528ed..00000000
--- a/groupdirectory/lang/pt-br/messages.po
+++ /dev/null
@@ -1,80 +0,0 @@
-# ADDON forumdirectory
-# Copyright (C)
-# This file is distributed under the same license as the Friendica forumdirectory addon package.
-# 
-# 
-# Translators:
-# Beatriz Vital <vitalb@riseup.net>, 2016
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-27 05:01-0500\n"
-"PO-Revision-Date: 2016-08-19 17:03+0000\n"
-"Last-Translator: Beatriz Vital <vitalb@riseup.net>\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.com/Friendica/friendica/language/pt_BR/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: pt_BR\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-#: forumdirectory.php:22
-msgid "Forum Directory"
-msgstr "Diretório de Fóruns"
-
-#: forumdirectory.php:53
-msgid "Public access denied."
-msgstr "Acesso do público negado."
-
-#: forumdirectory.php:71
-msgid "Global Directory"
-msgstr "Diretório Global"
-
-#: forumdirectory.php:79
-msgid "Find on this site"
-msgstr "Procurar neste site"
-
-#: forumdirectory.php:81
-msgid "Finding: "
-msgstr "Procurando:"
-
-#: forumdirectory.php:82
-msgid "Site Directory"
-msgstr "Diretório do Site"
-
-#: forumdirectory.php:83
-msgid "Find"
-msgstr "Procurar"
-
-#: forumdirectory.php:133
-msgid "Age: "
-msgstr "Idade:"
-
-#: forumdirectory.php:136
-msgid "Gender: "
-msgstr "Sexo:"
-
-#: forumdirectory.php:156
-msgid "Location:"
-msgstr "Local:"
-
-#: forumdirectory.php:158
-msgid "Gender:"
-msgstr "Sexo:"
-
-#: forumdirectory.php:160
-msgid "Status:"
-msgstr "Estado:"
-
-#: forumdirectory.php:162
-msgid "Homepage:"
-msgstr "Página principal:"
-
-#: forumdirectory.php:164
-msgid "About:"
-msgstr "Sobre:"
-
-#: forumdirectory.php:201
-msgid "No entries (some entries may be hidden)."
-msgstr "Sem resultados (alguns resultados podem estar ocultos)."
diff --git a/groupdirectory/lang/pt-br/strings.php b/groupdirectory/lang/pt-br/strings.php
deleted file mode 100644
index 8c6d216e..00000000
--- a/groupdirectory/lang/pt-br/strings.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_pt_br")) {
-function string_plural_select_pt_br($n){
-	$n = intval($n);
-	return intval($n > 1);
-}}
-$a->strings['Forum Directory'] = 'Diretório de Fóruns';
-$a->strings['Public access denied.'] = 'Acesso do público negado.';
-$a->strings['Global Directory'] = 'Diretório Global';
-$a->strings['Find on this site'] = 'Procurar neste site';
-$a->strings['Finding: '] = 'Procurando:';
-$a->strings['Site Directory'] = 'Diretório do Site';
-$a->strings['Find'] = 'Procurar';
-$a->strings['Age: '] = 'Idade:';
-$a->strings['Gender: '] = 'Sexo:';
-$a->strings['Location:'] = 'Local:';
-$a->strings['Gender:'] = 'Sexo:';
-$a->strings['Status:'] = 'Estado:';
-$a->strings['Homepage:'] = 'Página principal:';
-$a->strings['About:'] = 'Sobre:';
-$a->strings['No entries (some entries may be hidden).'] = 'Sem resultados (alguns resultados podem estar ocultos).';
diff --git a/groupdirectory/lang/ro/messages.po b/groupdirectory/lang/ro/messages.po
deleted file mode 100644
index 84de16f3..00000000
--- a/groupdirectory/lang/ro/messages.po
+++ /dev/null
@@ -1,79 +0,0 @@
-# ADDON forumdirectory
-# Copyright (C)
-# This file is distributed under the same license as the Friendica forumdirectory addon package.
-# 
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-27 05:01-0500\n"
-"PO-Revision-Date: 2014-07-08 11:49+0000\n"
-"Last-Translator: Arian - Cazare Muncitori <arianserv@gmail.com>\n"
-"Language-Team: Romanian (Romania) (http://www.transifex.com/projects/p/friendica/language/ro_RO/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ro_RO\n"
-"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
-
-#: forumdirectory.php:22
-msgid "Forum Directory"
-msgstr "Director Forum"
-
-#: forumdirectory.php:53
-msgid "Public access denied."
-msgstr "Acces public refuzat."
-
-#: forumdirectory.php:71
-msgid "Global Directory"
-msgstr "Director Global"
-
-#: forumdirectory.php:79
-msgid "Find on this site"
-msgstr "Căutați pe acest site"
-
-#: forumdirectory.php:81
-msgid "Finding: "
-msgstr "Căutare:"
-
-#: forumdirectory.php:82
-msgid "Site Directory"
-msgstr "Director Site"
-
-#: forumdirectory.php:83
-msgid "Find"
-msgstr "Căutați"
-
-#: forumdirectory.php:133
-msgid "Age: "
-msgstr "Vârsta:"
-
-#: forumdirectory.php:136
-msgid "Gender: "
-msgstr "Sex:"
-
-#: forumdirectory.php:156
-msgid "Location:"
-msgstr "Locație:"
-
-#: forumdirectory.php:158
-msgid "Gender:"
-msgstr "Sex:"
-
-#: forumdirectory.php:160
-msgid "Status:"
-msgstr "Status:"
-
-#: forumdirectory.php:162
-msgid "Homepage:"
-msgstr "Pagină web:"
-
-#: forumdirectory.php:164
-msgid "About:"
-msgstr "Despre:"
-
-#: forumdirectory.php:201
-msgid "No entries (some entries may be hidden)."
-msgstr "Fără înregistrări (unele înregistrări pot fi ascunse)."
diff --git a/groupdirectory/lang/ro/strings.php b/groupdirectory/lang/ro/strings.php
deleted file mode 100644
index 750fe1e1..00000000
--- a/groupdirectory/lang/ro/strings.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_ro")) {
-function string_plural_select_ro($n){
-	$n = intval($n);
-	if ($n==1) { return 0; } else if ((($n%100>19)||(($n%100==0)&&($n!=0)))) { return 2; } else  { return 1; }
-}}
-$a->strings['Forum Directory'] = 'Director Forum';
-$a->strings['Public access denied.'] = 'Acces public refuzat.';
-$a->strings['Global Directory'] = 'Director Global';
-$a->strings['Find on this site'] = 'Căutați pe acest site';
-$a->strings['Finding: '] = 'Căutare:';
-$a->strings['Site Directory'] = 'Director Site';
-$a->strings['Find'] = 'Căutați';
-$a->strings['Age: '] = 'Vârsta:';
-$a->strings['Gender: '] = 'Sex:';
-$a->strings['Location:'] = 'Locație:';
-$a->strings['Gender:'] = 'Sex:';
-$a->strings['Status:'] = 'Status:';
-$a->strings['Homepage:'] = 'Pagină web:';
-$a->strings['About:'] = 'Despre:';
-$a->strings['No entries (some entries may be hidden).'] = 'Fără înregistrări (unele înregistrări pot fi ascunse).';
diff --git a/groupdirectory/lang/ru/messages.po b/groupdirectory/lang/ru/messages.po
deleted file mode 100644
index 48250ba6..00000000
--- a/groupdirectory/lang/ru/messages.po
+++ /dev/null
@@ -1,80 +0,0 @@
-# ADDON forumdirectory
-# Copyright (C)
-# This file is distributed under the same license as the Friendica forumdirectory addon package.
-# 
-# 
-# Translators:
-# Stanislav N. <pztrn@pztrn.name>, 2017
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-27 05:01-0500\n"
-"PO-Revision-Date: 2017-04-08 17:12+0000\n"
-"Last-Translator: Stanislav N. <pztrn@pztrn.name>\n"
-"Language-Team: Russian (http://www.transifex.com/Friendica/friendica/language/ru/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ru\n"
-"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
-
-#: forumdirectory.php:22
-msgid "Forum Directory"
-msgstr "Каталог форумов"
-
-#: forumdirectory.php:53
-msgid "Public access denied."
-msgstr "Свободный доступ закрыт."
-
-#: forumdirectory.php:71
-msgid "Global Directory"
-msgstr "Глобальный каталог"
-
-#: forumdirectory.php:79
-msgid "Find on this site"
-msgstr "Найти на этом сайте"
-
-#: forumdirectory.php:81
-msgid "Finding: "
-msgstr "Результат поиска: "
-
-#: forumdirectory.php:82
-msgid "Site Directory"
-msgstr "Каталог сайта"
-
-#: forumdirectory.php:83
-msgid "Find"
-msgstr "Найти"
-
-#: forumdirectory.php:133
-msgid "Age: "
-msgstr "Возраст: "
-
-#: forumdirectory.php:136
-msgid "Gender: "
-msgstr "Пол: "
-
-#: forumdirectory.php:156
-msgid "Location:"
-msgstr "Откуда:"
-
-#: forumdirectory.php:158
-msgid "Gender:"
-msgstr "Пол:"
-
-#: forumdirectory.php:160
-msgid "Status:"
-msgstr "Статус:"
-
-#: forumdirectory.php:162
-msgid "Homepage:"
-msgstr "Домашняя страничка:"
-
-#: forumdirectory.php:164
-msgid "About:"
-msgstr "О себе:"
-
-#: forumdirectory.php:201
-msgid "No entries (some entries may be hidden)."
-msgstr "Нет записей (некоторые записи могут быть скрыты)."
diff --git a/groupdirectory/lang/ru/strings.php b/groupdirectory/lang/ru/strings.php
deleted file mode 100644
index 54954d72..00000000
--- a/groupdirectory/lang/ru/strings.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_ru")) {
-function string_plural_select_ru($n){
-	$n = intval($n);
-	if ($n%10==1 && $n%100!=11) { return 0; } else if ($n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14)) { return 1; } else if ($n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)) { return 2; } else  { return 3; }
-}}
-$a->strings['Forum Directory'] = 'Каталог форумов';
-$a->strings['Public access denied.'] = 'Свободный доступ закрыт.';
-$a->strings['Global Directory'] = 'Глобальный каталог';
-$a->strings['Find on this site'] = 'Найти на этом сайте';
-$a->strings['Finding: '] = 'Результат поиска: ';
-$a->strings['Site Directory'] = 'Каталог сайта';
-$a->strings['Find'] = 'Найти';
-$a->strings['Age: '] = 'Возраст: ';
-$a->strings['Gender: '] = 'Пол: ';
-$a->strings['Location:'] = 'Откуда:';
-$a->strings['Gender:'] = 'Пол:';
-$a->strings['Status:'] = 'Статус:';
-$a->strings['Homepage:'] = 'Домашняя страничка:';
-$a->strings['About:'] = 'О себе:';
-$a->strings['No entries (some entries may be hidden).'] = 'Нет записей (некоторые записи могут быть скрыты).';
diff --git a/groupdirectory/lang/sv/messages.po b/groupdirectory/lang/sv/messages.po
deleted file mode 100644
index cf3ebfde..00000000
--- a/groupdirectory/lang/sv/messages.po
+++ /dev/null
@@ -1,49 +0,0 @@
-# ADDON forumdirectory
-# Copyright (C)
-# This file is distributed under the same license as the Friendica forumdirectory addon package.
-# 
-# 
-# Translators:
-# Hypolite Petovan <hypolite@mrpetovan.com>, 2019
-# Kristoffer Grundström <lovaren@gmail.com>, 2022
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2022-01-15 23:39+0000\n"
-"Last-Translator: Kristoffer Grundström <lovaren@gmail.com>\n"
-"Language-Team: Swedish (http://www.transifex.com/Friendica/friendica/language/sv/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: sv\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: forumdirectory.php:33 forumdirectory.php:137
-msgid "Forum Directory"
-msgstr "Forum-mapp"
-
-#: forumdirectory.php:53
-msgid "Public access denied."
-msgstr "Publik åtkomst nekades."
-
-#: forumdirectory.php:125
-msgid "No entries (some entries may be hidden)."
-msgstr "Inget att visa. (Man kan välja att inte synas här)"
-
-#: forumdirectory.php:131
-msgid "Global Directory"
-msgstr "Medlemskatalog för flera sajter (global)"
-
-#: forumdirectory.php:133
-msgid "Find on this site"
-msgstr "Hitta på den här sidan"
-
-#: forumdirectory.php:135
-msgid "Results for:"
-msgstr ""
-
-#: forumdirectory.php:139
-msgid "Find"
-msgstr "Sök"
diff --git a/groupdirectory/lang/sv/strings.php b/groupdirectory/lang/sv/strings.php
deleted file mode 100644
index 0f06eaa3..00000000
--- a/groupdirectory/lang/sv/strings.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_sv")) {
-function string_plural_select_sv($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Forum Directory'] = 'Forum-mapp';
-$a->strings['Public access denied.'] = 'Publik åtkomst nekades.';
-$a->strings['No entries (some entries may be hidden).'] = 'Inget att visa. (Man kan välja att inte synas här)';
-$a->strings['Global Directory'] = 'Medlemskatalog för flera sajter (global)';
-$a->strings['Find on this site'] = 'Hitta på den här sidan';
-$a->strings['Find'] = 'Sök';
diff --git a/groupdirectory/lang/zh-cn/strings.php b/groupdirectory/lang/zh-cn/strings.php
deleted file mode 100644
index 4b5c78ba..00000000
--- a/groupdirectory/lang/zh-cn/strings.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-$a->strings["Forum Directory"] = "评坛目录";
-$a->strings["Public access denied."] = "公众看拒绝";
-$a->strings["Global Directory"] = "综合目录";
-$a->strings["Find on this site"] = "找在这网站";
-$a->strings["Finding: "] = "找着：";
-$a->strings["Site Directory"] = "网站目录";
-$a->strings["Find"] = "搜索";
-$a->strings["Age: "] = "年纪：";
-$a->strings["Gender: "] = "性别：";
-$a->strings["Location:"] = "位置:";
-$a->strings["Gender:"] = "性别:";
-$a->strings["Status:"] = "现状:";
-$a->strings["Homepage:"] = "主页:";
-$a->strings["About:"] = "关于：";
-$a->strings["No entries (some entries may be hidden)."] = "没有文章(有的文章会被隐藏)。";
diff --git a/highlightjs/asset/styles/brown-papersq.png b/highlightjs/asset/styles/brown-papersq.png
index 8ee339f8..3813903d 100644
Binary files a/highlightjs/asset/styles/brown-papersq.png and b/highlightjs/asset/styles/brown-papersq.png differ
diff --git a/highlightjs/highlightjs.php b/highlightjs/highlightjs.php
index 097d34c7..258cb4ad 100644
--- a/highlightjs/highlightjs.php
+++ b/highlightjs/highlightjs.php
@@ -8,7 +8,6 @@
 
 use Friendica\App;
 use Friendica\Core\Hook;
-use Friendica\DI;
 
 function highlightjs_install()
 {
@@ -16,19 +15,25 @@ function highlightjs_install()
 	Hook::register('footer', __FILE__, 'highlightjs_footer');
 }
 
-function highlightjs_head(string &$str)
+function highlightjs_uninstall()
 {
-	if (DI::app()->getCurrentTheme() == 'frio') {
+	Hook::unregister('head'  , __FILE__, 'highlightjs_head');
+	Hook::unregister('footer', __FILE__, 'highlightjs_footer');
+}
+
+function highlightjs_head(App $a, &$b)
+{
+	if ($a->getCurrentTheme() == 'frio') {
 		$style = 'bootstrap';
 	} else {
 		$style = 'default';
 	}
 
-	DI::page()->registerStylesheet(__DIR__ . '/asset/styles/' . $style . '.css');
+	$a->registerStylesheet(__DIR__ . '/asset/styles/' . $style . '.css');
 }
 
-function highlightjs_footer(string &$str)
+function highlightjs_footer(App $a, &$b)
 {
-	DI::page()->registerFooterScript(__DIR__ . '/asset/highlight.pack.js');
-	DI::page()->registerFooterScript(__DIR__ . '/highlightjs.js');
+	$a->registerFooterScript(__DIR__ . '/asset/highlight.pack.js');
+	$a->registerFooterScript(__DIR__ . '/highlightjs.js');
 }
diff --git a/ifttt/ifttt.php b/ifttt/ifttt.php
index 6d4f402c..3bb55f35 100644
--- a/ifttt/ifttt.php
+++ b/ifttt/ifttt.php
@@ -6,15 +6,15 @@
  * Version: 0.1
  * Author: Michael Vogel <https://pirati.ca/profile/heluecht>
  */
+require_once 'mod/item.php';
 use Friendica\App;
-use Friendica\Content\PageInfo;
 use Friendica\Core\Hook;
+use Friendica\Core\L10n;
 use Friendica\Core\Logger;
-use Friendica\Core\Renderer;
-use Friendica\Core\Worker;
+use Friendica\Core\PConfig;
+use Friendica\Core\Protocol;
 use Friendica\Database\DBA;
-use Friendica\DI;
-use Friendica\Model\Post;
+use Friendica\Model\Item;
 use Friendica\Util\Strings;
 
 function ifttt_install()
@@ -23,88 +23,103 @@ function ifttt_install()
 	Hook::register('connector_settings_post', 'addon/ifttt/ifttt.php', 'ifttt_settings_post');
 }
 
-/**
- * This is a statement rather than an actual function definition. The simple
- * existence of this method is checked to figure out if the addon offers a
- * module.
- */
-function ifttt_module() {}
-
-function ifttt_content() {}
-
-function ifttt_settings(array &$data)
+function ifttt_uninstall()
 {
-	if (!DI::userSession()->getLocalUserId()) {
+	Hook::unregister('connector_settings', 'addon/ifttt/ifttt.php', 'ifttt_settings');
+	Hook::unregister('connector_settings_post', 'addon/ifttt/ifttt.php', 'ifttt_settings_post');
+}
+
+function ifttt_module()
+{
+
+}
+
+function ifttt_content()
+{
+
+}
+
+function ifttt_settings(App $a, &$s)
+{
+	if (!local_user()) {
 		return;
 	}
 
-	$key = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'ifttt', 'key');
+	$key = PConfig::get(local_user(), 'ifttt', 'key');
+
 	if (!$key) {
 		$key = Strings::getRandomHex(20);
-		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'ifttt', 'key', $key);
+		PConfig::set(local_user(), 'ifttt', 'key', $key);
 	}
 
-	$t    = Renderer::getMarkupTemplate('connector_settings.tpl', 'addon/ifttt/');
-	$html = Renderer::replaceMacros($t, [
-		'$l10n'                    => [
-			'intro'                   => DI::l10n()->t('Create an account at <a href="http://www.ifttt.com">IFTTT</a>. Create three Facebook recipes that are connected with <a href="https://ifttt.com/maker">Maker</a> (In the form "if Facebook then Maker") with the following parameters:'),
-			'url'                     => DI::l10n()->t('URL'),
-			'method'                  => DI::l10n()->t('Method'),
-			'content_type'            => DI::l10n()->t('Content Type'),
-			'new_status_message_body' => DI::l10n()->t('Body for "new status message"'),
-			'new_photo_upload_body'   => DI::l10n()->t('Body for "new photo upload"'),
-			'new_link_post_body'      => DI::l10n()->t('Body for "new link post"'),
-		],
-		'$url'                     => DI::baseUrl() . '/ifttt/' . DI::userSession()->getLocalUserNickname(),
-		'$new_status_message_body' => 'key=' . $key . '&type=status&msg=<<<{{Message}}>>>&date=<<<{{UpdatedAt}}>>>&url=<<<{{PageUrl}}>>>',
-		'$new_photo_upload_body'   => 'key=' . $key . '&type=photo&link=<<<{{Link}}>>>&image=<<<{{ImageSource}}>>>&msg=<<<{{Caption}}>>>&date=<<<{{CreatedAt}}>>>&url=<<<{{PageUrl}}>>>',
-		'$new_link_post_body'      => 'key=' . $key . '&type=link&link=<<<{{Link}}>>>&title=<<<{{Title}}>>>&msg=<<<{{Message}}>>>&description=<<<{{Description}}>>>&date=<<<{{CreatedAt}}>>>&url=<<<{{PageUrl}}>>>',
-	]);
+	$s .= '<span id="settings_ifttt_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_ifttt_expanded\'); openClose(\'settings_ifttt_inflated\');">';
+	$s .= '<img class="connector" src="addon/ifttt/ifttt.png" /><h3 class="connector">' . L10n::t('IFTTT Mirror') . '</h3>';
+	$s .= '</span>';
+	$s .= '<div id="settings_ifttt_expanded" class="settings-block" style="display: none;">';
+	$s .= '<span class="fakelink" onclick="openClose(\'settings_ifttt_expanded\'); openClose(\'settings_ifttt_inflated\');">';
+	$s .= '<img class="connector" src="addon/ifttt/ifttt.png" /><h3 class="connector">' . L10n::t('IFTTT Mirror') . '</h3>';
+	$s .= '</span>';
 
-	$data = [
-		'connector' => 'ifttt',
-		'title'     => DI::l10n()->t('IFTTT Mirror'),
-		'image'     => 'addon/ifttt/ifttt.png',
-		'html'      => $html,
-		'submit'    => DI::l10n()->t('Generate new key'),
-	];
+	$s .= '<div id="ifttt-configuration-wrapper">';
+	$s .= '<p>' . L10n::t('Create an account at <a href="http://www.ifttt.com">IFTTT</a>. Create three Facebook recipes that are connected with <a href="https://ifttt.com/maker">Maker</a> (In the form "if Facebook then Maker") with the following parameters:') . '</p>';
+	$s .= '<h4>URL</h4>';
+	$s .= '<p>' . $a->getBaseURL() . '/ifttt/' . $a->user['nickname'] . '</p>';
+	$s .= '<h4>Method</h4>';
+	$s .= '<p>POST</p>';
+	$s .= '<h4>Content Type</h4>';
+	$s .= '<p>application/x-www-form-urlencoded</p>';
+	$s .= '<h4>' . L10n::t('Body for "new status message"') . '</h4>';
+	$s .= '<p><code>' . htmlentities('key=' . $key . '&type=status&msg=<<<{{Message}}>>>&date=<<<{{UpdatedAt}}>>>&url=<<<{{PageUrl}}>>>') . '</code></p>';
+	$s .= '<h4>' . L10n::t('Body for "new photo upload"') . '</h4>';
+	$s .= '<p><code>' . htmlentities('key=' . $key . '&type=photo&link=<<<{{Link}}>>>&image=<<<{{ImageSource}}>>>&msg=<<<{{Caption}}>>>&date=<<<{{CreatedAt}}>>>&url=<<<{{PageUrl}}>>>') . '</code></p>';
+	$s .= '<h4>' . L10n::t('Body for "new link post"') . '</h4>';
+	$s .= '<p><code>' . htmlentities('key=' . $key . '&type=link&link=<<<{{Link}}>>>&title=<<<{{Title}}>>>&msg=<<<{{Message}}>>>&description=<<<{{Description}}>>>&date=<<<{{CreatedAt}}>>>&url=<<<{{PageUrl}}>>>') . '</code></p>';
+	$s .= '</div><div class="clear"></div>';
+
+	$s .= '<div id="ifttt-rekey-wrapper">';
+	$s .= '<label id="ifttt-rekey-label" for="ifttt-checkbox">' . L10n::t('Generate new key') . '</label>';
+	$s .= '<input id="ifttt-checkbox" type="checkbox" name="ifttt-rekey" value="1" />';
+	$s .= '</div><div class="clear"></div>';
+
+	$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="ifttt-submit" class="settings-submit" value="' . L10n::t('Save Settings') . '" /></div>';
+	$s .= '</div>';
 }
 
 function ifttt_settings_post()
 {
-	if (!empty($_POST['ifttt-submit'])) {
-		DI::pConfig()->delete(DI::userSession()->getLocalUserId(), 'ifttt', 'key');
+	if (!empty($_POST['ifttt-submit']) && isset($_POST['ifttt-rekey'])) {
+		PConfig::delete(local_user(), 'ifttt', 'key');
 	}
 }
 
-function ifttt_post()
+function ifttt_post(App $a)
 {
-	if (DI::args()->getArgc() != 2) {
+	if ($a->argc != 2) {
 		return;
 	}
 
-	$nickname = DI::args()->getArgv()[1];
+	$nickname = $a->argv[1];
 
 	$user = DBA::selectFirst('user', ['uid'], ['nickname' => $nickname]);
 	if (!DBA::isResult($user)) {
-		Logger::info('User ' . $nickname . ' not found.');
+		Logger::log('User ' . $nickname . ' not found.', Logger::DEBUG);
 		return;
 	}
 
 	$uid = $user['uid'];
 
-	Logger::info('Received a post for user ' . $uid . ' from ifttt ' . print_r($_REQUEST, true));
+	Logger::log('Received a post for user ' . $uid . ' from ifttt ' . print_r($_REQUEST, true), Logger::DEBUG);
 
 	if (!isset($_REQUEST['key'])) {
-		Logger::notice('No key found.');
+		Logger::log('No key found.');
 		return;
 	}
 
 	$key = $_REQUEST['key'];
 
 	// Check the key
-	if ($key != DI::pConfig()->get($uid, 'ifttt', 'key')) {
-		Logger::info('Invalid key for user ' . $uid);
+	if ($key != PConfig::get($uid, 'ifttt', 'key')) {
+		Logger::log('Invalid key for user ' . $uid, Logger::DEBUG);
 		return;
 	}
 
@@ -115,7 +130,7 @@ function ifttt_post()
 	}
 
 	if (!in_array($item['type'], ['status', 'link', 'photo'])) {
-		Logger::info('Unknown item type ' . $item['type']);
+		Logger::log('Unknown item type ' . $item['type'], Logger::DEBUG);
 		return;
 	}
 
@@ -150,17 +165,28 @@ function ifttt_post()
 
 function ifttt_message($uid, $item)
 {
-	$post = [];
-	$post['uid'] = $uid;
-	$post['app'] = 'IFTTT';
-	$post['title'] = '';
-	$post['body'] = $item['msg'];
-	//$post['date'] = $item['date'];
-	//$post['uri'] = $item['url'];
+	$a = \get_app();
+
+	$_SESSION['authenticated'] = true;
+	$_SESSION['uid'] = $uid;
+
+	unset($_REQUEST);
+	$_REQUEST['api_source'] = true;
+	$_REQUEST['profile_uid'] = $uid;
+	$_REQUEST['source'] = 'IFTTT';
+	$_REQUEST['title'] = '';
+	$_REQUEST['body'] = $item['msg'];
+	//$_REQUEST['date'] = $item['date'];
+	//$_REQUEST['uri'] = $item['url'];
+
+	if (!empty($item['url']) && strstr($item['url'], 'facebook.com')) {
+		$hash = hash('ripemd128', $item['url']);
+		$_REQUEST['extid'] = Protocol::FACEBOOK;
+		$_REQUEST['message_id'] = Item::newURI($uid, Protocol::FACEBOOK . ':' . $hash);
+	}
 
 	if ($item['type'] == 'link') {
-		$link = $item['link'];
-		$data = PageInfo::queryUrl($item['link']);
+		$data = query_page_info($item['link']);
 
 		if (isset($item['title']) && (trim($item['title']) != '')) {
 			$data['title'] = $item['title'];
@@ -170,15 +196,10 @@ function ifttt_message($uid, $item)
 			$data['text'] = $item['description'];
 		}
 
-		$post['body'] .= "\n" . PageInfo::getFooterFromData($data);
+		$_REQUEST['body'] .= add_page_info_data($data);
 	} elseif (($item['type'] == 'photo') && ($item['image'] != '')) {
-		$link = $item['image'];
-		$post['body'] .= "\n\n[img]" . $item['image'] . "[/img]\n";
-	} elseif (!empty($item['url'])) {
-		$link = $item['url'];
-	} else {
-		$link = hash('ripemd128', $item['msg']);
+		$_REQUEST['body'] .= "\n\n[img]" . $item['image'] . "[/img]\n";
 	}
 
-	Post\Delayed::add($link, $post, Worker::PRIORITY_MEDIUM, Post\Delayed::PREPARED);
+	item_post($a);
 }
diff --git a/ifttt/lang/C/messages.po b/ifttt/lang/C/messages.po
index 077328b0..1ea670bc 100644
--- a/ifttt/lang/C/messages.po
+++ b/ifttt/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:17-0500\n"
+"POT-Creation-Date: 2017-11-27 09:30+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,7 +17,11 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ifttt.php:52
+#: ifttt.php:53 ifttt.php:57
+msgid "IFTTT Mirror"
+msgstr ""
+
+#: ifttt.php:61
 msgid ""
 "Create an account at <a href=\"http://www.ifttt.com\">IFTTT</a>. Create "
 "three Facebook recipes that are connected with <a href=\"https://ifttt.com/"
@@ -25,34 +29,22 @@ msgid ""
 "following parameters:"
 msgstr ""
 
-#: ifttt.php:53
-msgid "URL"
-msgstr ""
-
-#: ifttt.php:54
-msgid "Method"
-msgstr ""
-
-#: ifttt.php:55
-msgid "Content Type"
-msgstr ""
-
-#: ifttt.php:56
+#: ifttt.php:68
 msgid "Body for \"new status message\""
 msgstr ""
 
-#: ifttt.php:57
+#: ifttt.php:70
 msgid "Body for \"new photo upload\""
 msgstr ""
 
-#: ifttt.php:58
+#: ifttt.php:72
 msgid "Body for \"new link post\""
 msgstr ""
 
-#: ifttt.php:68
-msgid "IFTTT Mirror"
-msgstr ""
-
-#: ifttt.php:71
+#: ifttt.php:77
 msgid "Generate new key"
 msgstr ""
+
+#: ifttt.php:81
+msgid "Save Settings"
+msgstr ""
diff --git a/ifttt/lang/ar/messages.po b/ifttt/lang/ar/messages.po
deleted file mode 100644
index 73483746..00000000
--- a/ifttt/lang/ar/messages.po
+++ /dev/null
@@ -1,57 +0,0 @@
-# ADDON ifttt
-# Copyright (C)
-# This file is distributed under the same license as the Friendica ifttt addon package.
-# 
-# 
-# Translators:
-# Farida Khalaf <faridakhalaf@hotmail.com>, 2021
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-25 13:17+0000\n"
-"PO-Revision-Date: 2017-11-27 10:37+0000\n"
-"Last-Translator: Farida Khalaf <faridakhalaf@hotmail.com>, 2021\n"
-"Language-Team: Arabic (https://www.transifex.com/Friendica/teams/12172/ar/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ar\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-
-#: ifttt.php:50 ifttt.php:54
-msgid "IFTTT Mirror"
-msgstr "مرآة IFTTT  "
-
-#: ifttt.php:58
-msgid ""
-"Create an account at <a href=\"http://www.ifttt.com\">IFTTT</a>. Create "
-"three Facebook recipes that are connected with <a "
-"href=\"https://ifttt.com/maker\">Maker</a> (In the form \"if Facebook then "
-"Maker\") with the following parameters:"
-msgstr ""
-"قم بإنشاء حساب على IFTTT. أنشئ ثلاث طرق على Facebook بتطبيق الMaker (في "
-"النموذج \"if Facebook ثم Maker\") بالمعايير التالية:<a "
-"href=\"http://www.ifttt.com\"></a><a href=\"https://ifttt.com/maker\"></a>"
-
-#: ifttt.php:65
-msgid "Body for \"new status message\""
-msgstr "نص \"رسالة الحالة الجديدة\""
-
-#: ifttt.php:67
-msgid "Body for \"new photo upload\""
-msgstr "نص \"تحميل صورة جديدة\""
-
-#: ifttt.php:69
-msgid "Body for \"new link post\""
-msgstr "نص \"مشاركة ارتباط جديدة\""
-
-#: ifttt.php:74
-msgid "Generate new key"
-msgstr "إنشاء مفتاح جديد"
-
-#: ifttt.php:78
-msgid "Save Settings"
-msgstr "حفظ الإعدادات"
diff --git a/ifttt/lang/ar/strings.php b/ifttt/lang/ar/strings.php
deleted file mode 100644
index cb0a2db4..00000000
--- a/ifttt/lang/ar/strings.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_ar")) {
-function string_plural_select_ar($n){
-	$n = intval($n);
-	if ($n==0) { return 0; } else if ($n==1) { return 1; } else if ($n==2) { return 2; } else if ($n%100>=3 && $n%100<=10) { return 3; } else if ($n%100>=11 && $n%100<=99) { return 4; } else  { return 5; }
-}}
-$a->strings['IFTTT Mirror'] = 'مرآة IFTTT  ';
-$a->strings['Create an account at <a href="http://www.ifttt.com">IFTTT</a>. Create three Facebook recipes that are connected with <a href="https://ifttt.com/maker">Maker</a> (In the form "if Facebook then Maker") with the following parameters:'] = 'قم بإنشاء حساب على IFTTT. أنشئ ثلاث طرق على Facebook بتطبيق الMaker (في النموذج "if Facebook ثم Maker") بالمعايير التالية:<a href="http://www.ifttt.com"></a><a href="https://ifttt.com/maker"></a>';
-$a->strings['Body for "new status message"'] = 'نص "رسالة الحالة الجديدة"';
-$a->strings['Body for "new photo upload"'] = 'نص "تحميل صورة جديدة"';
-$a->strings['Body for "new link post"'] = 'نص "مشاركة ارتباط جديدة"';
-$a->strings['Generate new key'] = 'إنشاء مفتاح جديد';
-$a->strings['Save Settings'] = 'حفظ الإعدادات';
diff --git a/ifttt/lang/cs/strings.php b/ifttt/lang/cs/strings.php
index 5985f455..45587f39 100644
--- a/ifttt/lang/cs/strings.php
+++ b/ifttt/lang/cs/strings.php
@@ -3,12 +3,13 @@
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
 	$n = intval($n);
-	if (($n == 1 && $n % 1 == 0)) { return 0; } else if (($n >= 2 && $n <= 4 && $n % 1 == 0)) { return 1; } else if (($n % 1 != 0 )) { return 2; } else  { return 3; }
+	return ($n == 1 && $n % 1 == 0) ? 0 : ($n >= 2 && $n <= 4 && $n % 1 == 0) ? 1: ($n % 1 != 0 ) ? 2 : 3;;
 }}
-$a->strings['IFTTT Mirror'] = 'Zrcadlení IFTTT';
-$a->strings['Create an account at <a href="http://www.ifttt.com">IFTTT</a>. Create three Facebook recipes that are connected with <a href="https://ifttt.com/maker">Maker</a> (In the form "if Facebook then Maker") with the following parameters:'] = 'Vytvořte si účet na <a href="http://www.ifttt.com">IFTTT</a>. Vytvořte si tři recepty na Facebooku, které jsou připojeny k <a href="https://ifttt.com/maker">Makeru</a> (ve formě "If Facebook then Maker") s následujícími parametry:';
-$a->strings['Body for "new status message"'] = 'Tělo pole "nová statusová zpráva"';
-$a->strings['Body for "new photo upload"'] = 'Tělo pole "nová nahraná fotografie"';
-$a->strings['Body for "new link post"'] = 'Tělo pole "nový příspěvek"';
-$a->strings['Generate new key'] = 'Generovat nový klíč';
-$a->strings['Save Settings'] = 'Uložit nastavení';
+;
+$a->strings["IFTTT Mirror"] = "Zrcadlení IFTTT";
+$a->strings["Create an account at <a href=\"http://www.ifttt.com\">IFTTT</a>. Create three Facebook recipes that are connected with <a href=\"https://ifttt.com/maker\">Maker</a> (In the form \"if Facebook then Maker\") with the following parameters:"] = "Vytvořte si účet na <a href=\"http://www.ifttt.com\">IFTTT</a>. Vytvořte si tři recepty na Facebooku, které jsou připojeny k <a href=\"https://ifttt.com/maker\">Makeru</a> (ve formě \"If Facebook then Maker\") s následujícími parametry:";
+$a->strings["Body for \"new status message\""] = "Tělo pole \"nová statusová zpráva\"";
+$a->strings["Body for \"new photo upload\""] = "Tělo pole \"nová nahraná fotografie\"";
+$a->strings["Body for \"new link post\""] = "Tělo pole \"nový příspěvek\"";
+$a->strings["Generate new key"] = "Generovat nový klíč";
+$a->strings["Save Settings"] = "Uložit nastavení";
diff --git a/ifttt/lang/da-dk/messages.po b/ifttt/lang/da-dk/messages.po
deleted file mode 100644
index dc501115..00000000
--- a/ifttt/lang/da-dk/messages.po
+++ /dev/null
@@ -1,58 +0,0 @@
-# ADDON ifttt
-# Copyright (C)
-# This file is distributed under the same license as the Friendica ifttt addon package.
-# 
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:17-0500\n"
-"PO-Revision-Date: 2017-11-27 10:37+0000\n"
-"Language-Team: Danish (Denmark) (https://www.transifex.com/Friendica/teams/12172/da_DK/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: da_DK\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: ifttt.php:52
-msgid ""
-"Create an account at <a href=\"http://www.ifttt.com\">IFTTT</a>. Create "
-"three Facebook recipes that are connected with <a "
-"href=\"https://ifttt.com/maker\">Maker</a> (In the form \"if Facebook then "
-"Maker\") with the following parameters:"
-msgstr ""
-
-#: ifttt.php:53
-msgid "URL"
-msgstr ""
-
-#: ifttt.php:54
-msgid "Method"
-msgstr ""
-
-#: ifttt.php:55
-msgid "Content Type"
-msgstr ""
-
-#: ifttt.php:56
-msgid "Body for \"new status message\""
-msgstr ""
-
-#: ifttt.php:57
-msgid "Body for \"new photo upload\""
-msgstr ""
-
-#: ifttt.php:58
-msgid "Body for \"new link post\""
-msgstr ""
-
-#: ifttt.php:68
-msgid "IFTTT Mirror"
-msgstr ""
-
-#: ifttt.php:71
-msgid "Generate new key"
-msgstr ""
diff --git a/ifttt/lang/da-dk/strings.php b/ifttt/lang/da-dk/strings.php
deleted file mode 100644
index 09554750..00000000
--- a/ifttt/lang/da-dk/strings.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_da_dk")) {
-function string_plural_select_da_dk($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
diff --git a/ifttt/lang/de/messages.po b/ifttt/lang/de/messages.po
index b36f4112..1cacfc90 100644
--- a/ifttt/lang/de/messages.po
+++ b/ifttt/lang/de/messages.po
@@ -3,66 +3,53 @@
 # This file is distributed under the same license as the Friendica ifttt addon package.
 # 
 # 
-# Translators:
-# Andreas H., 2017
-# Ulf Rompe <transifex.com@rompe.org>, 2019
-# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2022
-# 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:17-0500\n"
-"PO-Revision-Date: 2017-11-27 10:37+0000\n"
-"Last-Translator: Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2022\n"
-"Language-Team: German (https://app.transifex.com/Friendica/teams/12172/de/)\n"
+"POT-Creation-Date: 2017-11-27 09:30+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Andreas H. <webmaster@a-zwenkau.de>, 2017\n"
+"Language-Team: German (https://www.transifex.com/Friendica/teams/12172/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ifttt.php:52
+#: ifttt.php:53 ifttt.php:57
+msgid "IFTTT Mirror"
+msgstr "IFTTT Spiegel"
+
+#: ifttt.php:61
 msgid ""
 "Create an account at <a href=\"http://www.ifttt.com\">IFTTT</a>. Create "
 "three Facebook recipes that are connected with <a "
 "href=\"https://ifttt.com/maker\">Maker</a> (In the form \"if Facebook then "
 "Maker\") with the following parameters:"
 msgstr ""
-"Lege ein Konto bei <a href=\"http://www.ifttt.com\"> IFTTT an</a>. Lege drei"
-" Facebook-Recipes an, die mit <a href=\"https://ifttt.com/maker\">Maker </a>"
-" verbunden sind (in der Form \"wenn Facebook dann Maker\"), mit den "
+"Lege ein Konto bei <a href=\"http://www.ifttt.com\"> IFTTT an</a>. Gebe drei"
+" Facebook Empfänger ein, die mit <a href=\"https://ifttt.com/maker\">Maker "
+"</a> verbunden sind (in der Form \"wenn Facebook dann Maker\"), mit den "
 "folgenden Parametern:"
 
-#: ifttt.php:53
-msgid "URL"
-msgstr "URL"
-
-#: ifttt.php:54
-msgid "Method"
-msgstr "Methode"
-
-#: ifttt.php:55
-msgid "Content Type"
-msgstr "Content Typ"
-
-#: ifttt.php:56
+#: ifttt.php:68
 msgid "Body for \"new status message\""
-msgstr "Body für \"Neue Statusmeldung\""
+msgstr "Body für \"Neue Status Meldung\""
 
-#: ifttt.php:57
+#: ifttt.php:70
 msgid "Body for \"new photo upload\""
 msgstr "Body für \"Neues Foto hochgeladen\""
 
-#: ifttt.php:58
+#: ifttt.php:72
 msgid "Body for \"new link post\""
 msgstr "Body für \"Neue Nachricht\""
 
-#: ifttt.php:68
-msgid "IFTTT Mirror"
-msgstr "IFTTT Spiegel"
-
-#: ifttt.php:71
+#: ifttt.php:77
 msgid "Generate new key"
 msgstr "Generiere neuen Schlüssel"
+
+#: ifttt.php:81
+msgid "Save Settings"
+msgstr "Speichere Einstellungen"
diff --git a/ifttt/lang/de/strings.php b/ifttt/lang/de/strings.php
index 0f26aaeb..a16db4e9 100644
--- a/ifttt/lang/de/strings.php
+++ b/ifttt/lang/de/strings.php
@@ -2,15 +2,13 @@
 
 if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Create an account at <a href="http://www.ifttt.com">IFTTT</a>. Create three Facebook recipes that are connected with <a href="https://ifttt.com/maker">Maker</a> (In the form "if Facebook then Maker") with the following parameters:'] = 'Lege ein Konto bei <a href="http://www.ifttt.com"> IFTTT an</a>. Lege drei Facebook-Recipes an, die mit <a href="https://ifttt.com/maker">Maker </a> verbunden sind (in der Form "wenn Facebook dann Maker"), mit den folgenden Parametern:';
-$a->strings['URL'] = 'URL';
-$a->strings['Method'] = 'Methode';
-$a->strings['Content Type'] = 'Content Typ';
-$a->strings['Body for "new status message"'] = 'Body für "Neue Statusmeldung"';
-$a->strings['Body for "new photo upload"'] = 'Body für "Neues Foto hochgeladen"';
-$a->strings['Body for "new link post"'] = 'Body für "Neue Nachricht"';
-$a->strings['IFTTT Mirror'] = 'IFTTT Spiegel';
-$a->strings['Generate new key'] = 'Generiere neuen Schlüssel';
+;
+$a->strings["IFTTT Mirror"] = "IFTTT Spiegel";
+$a->strings["Create an account at <a href=\"http://www.ifttt.com\">IFTTT</a>. Create three Facebook recipes that are connected with <a href=\"https://ifttt.com/maker\">Maker</a> (In the form \"if Facebook then Maker\") with the following parameters:"] = "Lege ein Konto bei <a href=\"http://www.ifttt.com\"> IFTTT an</a>. Gebe drei Facebook Empfänger ein, die mit <a href=\"https://ifttt.com/maker\">Maker </a> verbunden sind (in der Form \"wenn Facebook dann Maker\"), mit den folgenden Parametern:";
+$a->strings["Body for \"new status message\""] = "Body für \"Neue Status Meldung\"";
+$a->strings["Body for \"new photo upload\""] = "Body für \"Neues Foto hochgeladen\"";
+$a->strings["Body for \"new link post\""] = "Body für \"Neue Nachricht\"";
+$a->strings["Generate new key"] = "Generiere neuen Schlüssel";
+$a->strings["Save Settings"] = "Speichere Einstellungen";
diff --git a/ifttt/lang/en-gb/strings.php b/ifttt/lang/en-gb/strings.php
index b9b4791f..0b5aaead 100644
--- a/ifttt/lang/en-gb/strings.php
+++ b/ifttt/lang/en-gb/strings.php
@@ -3,12 +3,13 @@
 if(! function_exists("string_plural_select_en_gb")) {
 function string_plural_select_en_gb($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['IFTTT Mirror'] = 'IFTTT Mirror';
-$a->strings['Create an account at <a href="http://www.ifttt.com">IFTTT</a>. Create three Facebook recipes that are connected with <a href="https://ifttt.com/maker">Maker</a> (In the form "if Facebook then Maker") with the following parameters:'] = 'Create an account at <a href="http://www.ifttt.com">IFTTT</a>. Create three Facebook recipes that are connected with <a href="https://ifttt.com/maker">Maker</a> (In the form "if Facebook then Maker") with the following parameters:';
-$a->strings['Body for "new status message"'] = 'Body for "new status message"';
-$a->strings['Body for "new photo upload"'] = 'Body for "new photo upload"';
-$a->strings['Body for "new link post"'] = 'Body for "new link post"';
-$a->strings['Generate new key'] = 'Generate new key';
-$a->strings['Save Settings'] = 'Save settings';
+;
+$a->strings["IFTTT Mirror"] = "IFTTT Mirror";
+$a->strings["Create an account at <a href=\"http://www.ifttt.com\">IFTTT</a>. Create three Facebook recipes that are connected with <a href=\"https://ifttt.com/maker\">Maker</a> (In the form \"if Facebook then Maker\") with the following parameters:"] = "Create an account at <a href=\"http://www.ifttt.com\">IFTTT</a>. Create three Facebook recipes that are connected with <a href=\"https://ifttt.com/maker\">Maker</a> (In the form \"if Facebook then Maker\") with the following parameters:";
+$a->strings["Body for \"new status message\""] = "Body for \"new status message\"";
+$a->strings["Body for \"new photo upload\""] = "Body for \"new photo upload\"";
+$a->strings["Body for \"new link post\""] = "Body for \"new link post\"";
+$a->strings["Generate new key"] = "Generate new key";
+$a->strings["Save Settings"] = "Save settings";
diff --git a/ifttt/lang/es/messages.po b/ifttt/lang/es/messages.po
deleted file mode 100644
index cd45ebb8..00000000
--- a/ifttt/lang/es/messages.po
+++ /dev/null
@@ -1,58 +0,0 @@
-# ADDON ifttt
-# Copyright (C)
-# This file is distributed under the same license as the Friendica ifttt addon package.
-# 
-# 
-# Translators:
-# Senex Petrovic <javierruizo@hotmail.com>, 2021
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2017-11-27 10:37+0000\n"
-"Last-Translator: Senex Petrovic <javierruizo@hotmail.com>, 2021\n"
-"Language-Team: Spanish (https://www.transifex.com/Friendica/teams/12172/es/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: es\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: ifttt.php:50 ifttt.php:54
-msgid "IFTTT Mirror"
-msgstr "IFTTT Espejo"
-
-#: ifttt.php:58
-msgid ""
-"Create an account at <a href=\"http://www.ifttt.com\">IFTTT</a>. Create "
-"three Facebook recipes that are connected with <a "
-"href=\"https://ifttt.com/maker\">Maker</a> (In the form \"if Facebook then "
-"Maker\") with the following parameters:"
-msgstr ""
-"Crea una cuenta en <a href=\"http://www.ifttt.com\">IFTTT</a>. Crea tres "
-"recetas de Facebook que estén conectadas con <a "
-"href=\"https://ifttt.com/maker\">Fabricante</a> (En el formulario \"si "
-"Facebook, entonces Maker\") con los siguientes parámetros:"
-
-#: ifttt.php:65
-msgid "Body for \"new status message\""
-msgstr "Cuerpo de \"Nuevo mensaje de estatus\""
-
-#: ifttt.php:67
-msgid "Body for \"new photo upload\""
-msgstr "Cuerpo de \"nueva foto a subir\""
-
-#: ifttt.php:69
-msgid "Body for \"new link post\""
-msgstr "Cuerpo de \"Nuevo vinculo de artículo\""
-
-#: ifttt.php:74
-msgid "Generate new key"
-msgstr "Generar clave nueva"
-
-#: ifttt.php:78
-msgid "Save Settings"
-msgstr "Guardar ajustes"
diff --git a/ifttt/lang/es/strings.php b/ifttt/lang/es/strings.php
deleted file mode 100644
index 7c0ab7e9..00000000
--- a/ifttt/lang/es/strings.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_es")) {
-function string_plural_select_es($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['IFTTT Mirror'] = 'IFTTT Espejo';
-$a->strings['Create an account at <a href="http://www.ifttt.com">IFTTT</a>. Create three Facebook recipes that are connected with <a href="https://ifttt.com/maker">Maker</a> (In the form "if Facebook then Maker") with the following parameters:'] = 'Crea una cuenta en <a href="http://www.ifttt.com">IFTTT</a>. Crea tres recetas de Facebook que estén conectadas con <a href="https://ifttt.com/maker">Fabricante</a> (En el formulario "si Facebook, entonces Maker") con los siguientes parámetros:';
-$a->strings['Body for "new status message"'] = 'Cuerpo de "Nuevo mensaje de estatus"';
-$a->strings['Body for "new photo upload"'] = 'Cuerpo de "nueva foto a subir"';
-$a->strings['Body for "new link post"'] = 'Cuerpo de "Nuevo vinculo de artículo"';
-$a->strings['Generate new key'] = 'Generar clave nueva';
-$a->strings['Save Settings'] = 'Guardar ajustes';
diff --git a/ifttt/lang/fi-fi/strings.php b/ifttt/lang/fi-fi/strings.php
index 6df942f7..3ca734cb 100644
--- a/ifttt/lang/fi-fi/strings.php
+++ b/ifttt/lang/fi-fi/strings.php
@@ -2,8 +2,13 @@
 
 if(! function_exists("string_plural_select_fi_fi")) {
 function string_plural_select_fi_fi($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Generate new key'] = 'Luo uusi avain';
-$a->strings['Save Settings'] = 'Tallenna asetukset';
+;
+$a->strings["IFTTT Mirror"] = "";
+$a->strings["Create an account at <a href=\"http://www.ifttt.com\">IFTTT</a>. Create three Facebook recipes that are connected with <a href=\"https://ifttt.com/maker\">Maker</a> (In the form \"if Facebook then Maker\") with the following parameters:"] = "";
+$a->strings["Body for \"new status message\""] = "";
+$a->strings["Body for \"new photo upload\""] = "";
+$a->strings["Body for \"new link post\""] = "";
+$a->strings["Generate new key"] = "Luo uusi avain";
+$a->strings["Save Settings"] = "Tallenna asetukset";
diff --git a/ifttt/lang/fr/messages.po b/ifttt/lang/fr/messages.po
deleted file mode 100644
index 0e24fdc6..00000000
--- a/ifttt/lang/fr/messages.po
+++ /dev/null
@@ -1,68 +0,0 @@
-# ADDON ifttt
-# Copyright (C)
-# This file is distributed under the same license as the Friendica ifttt addon package.
-# 
-# 
-# Translators:
-# bob lebonche <lebonche@tutanota.com>, 2021
-# Hypolite Petovan <hypolite@mrpetovan.com>, 2022
-# Nicolas Derive, 2022
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:17-0500\n"
-"PO-Revision-Date: 2017-11-27 10:37+0000\n"
-"Last-Translator: Nicolas Derive, 2022\n"
-"Language-Team: French (https://www.transifex.com/Friendica/teams/12172/fr/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: fr\n"
-"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
-
-#: ifttt.php:52
-msgid ""
-"Create an account at <a href=\"http://www.ifttt.com\">IFTTT</a>. Create "
-"three Facebook recipes that are connected with <a "
-"href=\"https://ifttt.com/maker\">Maker</a> (In the form \"if Facebook then "
-"Maker\") with the following parameters:"
-msgstr ""
-"Créez un compte sur <a href=\"http://www.ifttt.com\">IFTTT</a>. Créer trois "
-"'recipe' Facebook qui sont connectées avec <a "
-"href=\"https://ifttt.com/maker\">Maker</a> (Sous la forme \"if Facebook then"
-" Maker\") avec les paramètres suivants:"
-
-#: ifttt.php:53
-msgid "URL"
-msgstr "URL"
-
-#: ifttt.php:54
-msgid "Method"
-msgstr "Méthode"
-
-#: ifttt.php:55
-msgid "Content Type"
-msgstr "Type de contenu"
-
-#: ifttt.php:56
-msgid "Body for \"new status message\""
-msgstr "Corps du \"nouveau message de statut\""
-
-#: ifttt.php:57
-msgid "Body for \"new photo upload\""
-msgstr "Corps du \"nouveau téléversement de photo\""
-
-#: ifttt.php:58
-msgid "Body for \"new link post\""
-msgstr "Corps du \"nouveau lien de publication\""
-
-#: ifttt.php:68
-msgid "IFTTT Mirror"
-msgstr "Mirroir IFTTT"
-
-#: ifttt.php:71
-msgid "Generate new key"
-msgstr "Générer une nouvelle clé"
diff --git a/ifttt/lang/fr/strings.php b/ifttt/lang/fr/strings.php
deleted file mode 100644
index d8a192f6..00000000
--- a/ifttt/lang/fr/strings.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_fr")) {
-function string_plural_select_fr($n){
-	$n = intval($n);
-	if (($n == 0 || $n == 1)) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
-}}
-$a->strings['Create an account at <a href="http://www.ifttt.com">IFTTT</a>. Create three Facebook recipes that are connected with <a href="https://ifttt.com/maker">Maker</a> (In the form "if Facebook then Maker") with the following parameters:'] = 'Créez un compte sur <a href="http://www.ifttt.com">IFTTT</a>. Créer trois \'recipe\' Facebook qui sont connectées avec <a href="https://ifttt.com/maker">Maker</a> (Sous la forme "if Facebook then Maker") avec les paramètres suivants:';
-$a->strings['URL'] = 'URL';
-$a->strings['Method'] = 'Méthode';
-$a->strings['Content Type'] = 'Type de contenu';
-$a->strings['Body for "new status message"'] = 'Corps du "nouveau message de statut"';
-$a->strings['Body for "new photo upload"'] = 'Corps du "nouveau téléversement de photo"';
-$a->strings['Body for "new link post"'] = 'Corps du "nouveau lien de publication"';
-$a->strings['IFTTT Mirror'] = 'Mirroir IFTTT';
-$a->strings['Generate new key'] = 'Générer une nouvelle clé';
diff --git a/ifttt/lang/hu/messages.po b/ifttt/lang/hu/messages.po
deleted file mode 100644
index e74ac522..00000000
--- a/ifttt/lang/hu/messages.po
+++ /dev/null
@@ -1,66 +0,0 @@
-# ADDON ifttt
-# Copyright (C)
-# This file is distributed under the same license as the Friendica ifttt addon package.
-# 
-# 
-# Translators:
-# Balázs Úr, 2021
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:17-0500\n"
-"PO-Revision-Date: 2017-11-27 10:37+0000\n"
-"Last-Translator: Balázs Úr, 2021\n"
-"Language-Team: Hungarian (https://www.transifex.com/Friendica/teams/12172/hu/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: hu\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: ifttt.php:52
-msgid ""
-"Create an account at <a href=\"http://www.ifttt.com\">IFTTT</a>. Create "
-"three Facebook recipes that are connected with <a "
-"href=\"https://ifttt.com/maker\">Maker</a> (In the form \"if Facebook then "
-"Maker\") with the following parameters:"
-msgstr ""
-"Hozzon létre egy fiókot az <a href=\"http://www.ifttt.com\">IFTTT</a> "
-"oldalon. Hozzon létre három Facebook receptet, amelyek össze vannak "
-"kapcsolva a <a href=\"https://ifttt.com/maker\">Maker</a> szolgáltatással (a"
-" „ha Facebook, akkor Maker” űrlapon) a következő paraméterekkel:"
-
-#: ifttt.php:53
-msgid "URL"
-msgstr "URL"
-
-#: ifttt.php:54
-msgid "Method"
-msgstr "Módszer"
-
-#: ifttt.php:55
-msgid "Content Type"
-msgstr "Tartalomtípus"
-
-#: ifttt.php:56
-msgid "Body for \"new status message\""
-msgstr "Az „új állapotüzenet” törzse"
-
-#: ifttt.php:57
-msgid "Body for \"new photo upload\""
-msgstr "Az „új fényképfeltöltés” törzse"
-
-#: ifttt.php:58
-msgid "Body for \"new link post\""
-msgstr "Az „új hivatkozásbeküldés” törzse"
-
-#: ifttt.php:68
-msgid "IFTTT Mirror"
-msgstr "IFTTT tükör"
-
-#: ifttt.php:71
-msgid "Generate new key"
-msgstr "Új kulcs előállítása"
diff --git a/ifttt/lang/hu/strings.php b/ifttt/lang/hu/strings.php
deleted file mode 100644
index 152a087b..00000000
--- a/ifttt/lang/hu/strings.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_hu")) {
-function string_plural_select_hu($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Create an account at <a href="http://www.ifttt.com">IFTTT</a>. Create three Facebook recipes that are connected with <a href="https://ifttt.com/maker">Maker</a> (In the form "if Facebook then Maker") with the following parameters:'] = 'Hozzon létre egy fiókot az <a href="http://www.ifttt.com">IFTTT</a> oldalon. Hozzon létre három Facebook receptet, amelyek össze vannak kapcsolva a <a href="https://ifttt.com/maker">Maker</a> szolgáltatással (a „ha Facebook, akkor Maker” űrlapon) a következő paraméterekkel:';
-$a->strings['URL'] = 'URL';
-$a->strings['Method'] = 'Módszer';
-$a->strings['Content Type'] = 'Tartalomtípus';
-$a->strings['Body for "new status message"'] = 'Az „új állapotüzenet” törzse';
-$a->strings['Body for "new photo upload"'] = 'Az „új fényképfeltöltés” törzse';
-$a->strings['Body for "new link post"'] = 'Az „új hivatkozásbeküldés” törzse';
-$a->strings['IFTTT Mirror'] = 'IFTTT tükör';
-$a->strings['Generate new key'] = 'Új kulcs előállítása';
diff --git a/ifttt/lang/pl/messages.po b/ifttt/lang/pl/messages.po
index 08ddf24b..38d889ea 100644
--- a/ifttt/lang/pl/messages.po
+++ b/ifttt/lang/pl/messages.po
@@ -3,18 +3,14 @@
 # This file is distributed under the same license as the Friendica ifttt addon package.
 # 
 # 
-# Translators:
-# Waldemar Stoczkowski, 2018
-# Piotr Strębski <strebski@gmail.com>, 2022
-# 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:17-0500\n"
-"PO-Revision-Date: 2017-11-27 10:37+0000\n"
-"Last-Translator: Piotr Strębski <strebski@gmail.com>, 2022\n"
+"POT-Creation-Date: 2017-11-27 09:30+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>, 2018\n"
 "Language-Team: Polish (https://www.transifex.com/Friendica/teams/12172/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,7 +18,11 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
-#: ifttt.php:52
+#: ifttt.php:53 ifttt.php:57
+msgid "IFTTT Mirror"
+msgstr "Lustro IFTTT"
+
+#: ifttt.php:61
 msgid ""
 "Create an account at <a href=\"http://www.ifttt.com\">IFTTT</a>. Create "
 "three Facebook recipes that are connected with <a "
@@ -34,34 +34,22 @@ msgstr ""
 "href=\"https://ifttt.com/maker\">Maker</a> (W formie \"jeśli Facebook "
 "następnie Maker\") z następujących parametrów:"
 
-#: ifttt.php:53
-msgid "URL"
-msgstr "URL"
-
-#: ifttt.php:54
-msgid "Method"
-msgstr "Metoda"
-
-#: ifttt.php:55
-msgid "Content Type"
-msgstr "Rodzaj treści"
-
-#: ifttt.php:56
+#: ifttt.php:68
 msgid "Body for \"new status message\""
 msgstr "Treść dla \"nowy status wiadomości\""
 
-#: ifttt.php:57
+#: ifttt.php:70
 msgid "Body for \"new photo upload\""
 msgstr "Treść dla \"nowe przesyłanie zdjęć\""
 
-#: ifttt.php:58
+#: ifttt.php:72
 msgid "Body for \"new link post\""
 msgstr "Treść dla \"nowe łącza postu\""
 
-#: ifttt.php:68
-msgid "IFTTT Mirror"
-msgstr "Lustro IFTTT"
-
-#: ifttt.php:71
+#: ifttt.php:77
 msgid "Generate new key"
 msgstr "Wygeneruj nowy klucz"
+
+#: ifttt.php:81
+msgid "Save Settings"
+msgstr "Zapisz ustawienia"
diff --git a/ifttt/lang/pl/strings.php b/ifttt/lang/pl/strings.php
index 1ef99909..eab45ef5 100644
--- a/ifttt/lang/pl/strings.php
+++ b/ifttt/lang/pl/strings.php
@@ -2,15 +2,13 @@
 
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
-	$n = intval($n);
-	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
+	return ($n==1 ? 0 : ($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14) ? 1 : $n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14) ? 2 : 3);;
 }}
-$a->strings['Create an account at <a href="http://www.ifttt.com">IFTTT</a>. Create three Facebook recipes that are connected with <a href="https://ifttt.com/maker">Maker</a> (In the form "if Facebook then Maker") with the following parameters:'] = 'Utwórz konto na <a href="http://www.ifttt.com">IFTTT</a>. Utwórz trzy przepisy na Facebooku, które są powiązane z <a href="https://ifttt.com/maker">Maker</a> (W formie "jeśli Facebook następnie Maker") z następujących parametrów:';
-$a->strings['URL'] = 'URL';
-$a->strings['Method'] = 'Metoda';
-$a->strings['Content Type'] = 'Rodzaj treści';
-$a->strings['Body for "new status message"'] = 'Treść dla "nowy status wiadomości"';
-$a->strings['Body for "new photo upload"'] = 'Treść dla "nowe przesyłanie zdjęć"';
-$a->strings['Body for "new link post"'] = 'Treść dla "nowe łącza postu"';
-$a->strings['IFTTT Mirror'] = 'Lustro IFTTT';
-$a->strings['Generate new key'] = 'Wygeneruj nowy klucz';
+;
+$a->strings["IFTTT Mirror"] = "Lustro IFTTT";
+$a->strings["Create an account at <a href=\"http://www.ifttt.com\">IFTTT</a>. Create three Facebook recipes that are connected with <a href=\"https://ifttt.com/maker\">Maker</a> (In the form \"if Facebook then Maker\") with the following parameters:"] = "Utwórz konto na <a href=\"http://www.ifttt.com\">IFTTT</a>. Utwórz trzy przepisy na Facebooku, które są powiązane z <a href=\"https://ifttt.com/maker\">Maker</a> (W formie \"jeśli Facebook następnie Maker\") z następujących parametrów:";
+$a->strings["Body for \"new status message\""] = "Treść dla \"nowy status wiadomości\"";
+$a->strings["Body for \"new photo upload\""] = "Treść dla \"nowe przesyłanie zdjęć\"";
+$a->strings["Body for \"new link post\""] = "Treść dla \"nowe łącza postu\"";
+$a->strings["Generate new key"] = "Wygeneruj nowy klucz";
+$a->strings["Save Settings"] = "Zapisz ustawienia";
diff --git a/ifttt/lang/sv/messages.po b/ifttt/lang/sv/messages.po
deleted file mode 100644
index 26ae0d88..00000000
--- a/ifttt/lang/sv/messages.po
+++ /dev/null
@@ -1,58 +0,0 @@
-# ADDON ifttt
-# Copyright (C)
-# This file is distributed under the same license as the Friendica ifttt addon package.
-# 
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:17-0500\n"
-"PO-Revision-Date: 2017-11-27 10:37+0000\n"
-"Language-Team: Swedish (https://www.transifex.com/Friendica/teams/12172/sv/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: sv\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: ifttt.php:52
-msgid ""
-"Create an account at <a href=\"http://www.ifttt.com\">IFTTT</a>. Create "
-"three Facebook recipes that are connected with <a "
-"href=\"https://ifttt.com/maker\">Maker</a> (In the form \"if Facebook then "
-"Maker\") with the following parameters:"
-msgstr ""
-
-#: ifttt.php:53
-msgid "URL"
-msgstr ""
-
-#: ifttt.php:54
-msgid "Method"
-msgstr ""
-
-#: ifttt.php:55
-msgid "Content Type"
-msgstr ""
-
-#: ifttt.php:56
-msgid "Body for \"new status message\""
-msgstr ""
-
-#: ifttt.php:57
-msgid "Body for \"new photo upload\""
-msgstr ""
-
-#: ifttt.php:58
-msgid "Body for \"new link post\""
-msgstr ""
-
-#: ifttt.php:68
-msgid "IFTTT Mirror"
-msgstr ""
-
-#: ifttt.php:71
-msgid "Generate new key"
-msgstr ""
diff --git a/ifttt/lang/sv/strings.php b/ifttt/lang/sv/strings.php
deleted file mode 100644
index 72e9772f..00000000
--- a/ifttt/lang/sv/strings.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_sv")) {
-function string_plural_select_sv($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
diff --git a/ifttt/lang/zh-cn/messages.po b/ifttt/lang/zh-cn/messages.po
deleted file mode 100644
index 2d5863ab..00000000
--- a/ifttt/lang/zh-cn/messages.po
+++ /dev/null
@@ -1,57 +0,0 @@
-# ADDON ifttt
-# Copyright (C)
-# This file is distributed under the same license as the Friendica ifttt addon package.
-# 
-# 
-# Translators:
-# Finn Dean <vicdorke@gmail.com>, 2021
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-25 13:17+0000\n"
-"PO-Revision-Date: 2017-11-27 10:37+0000\n"
-"Last-Translator: Finn Dean <vicdorke@gmail.com>, 2021\n"
-"Language-Team: Chinese (China) (https://www.transifex.com/Friendica/teams/12172/zh_CN/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: zh_CN\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-
-#: ifttt.php:50 ifttt.php:54
-msgid "IFTTT Mirror"
-msgstr "IFTTT 镜像"
-
-#: ifttt.php:58
-msgid ""
-"Create an account at <a href=\"http://www.ifttt.com\">IFTTT</a>. Create "
-"three Facebook recipes that are connected with <a "
-"href=\"https://ifttt.com/maker\">Maker</a> (In the form \"if Facebook then "
-"Maker\") with the following parameters:"
-msgstr ""
-"在<a href=\"http://www.ifttt.com\">IFTTT</a>创建帐户。使用以下参数创建三个与<a "
-"href=\"https://ifttt.com/maker\">Maker</a>连接的Facebook回执(格式为\"If Facebook "
-"Then Maker\"):"
-
-#: ifttt.php:65
-msgid "Body for \"new status message\""
-msgstr "正文“新状态消息”"
-
-#: ifttt.php:67
-msgid "Body for \"new photo upload\""
-msgstr "正文“新照片上传”"
-
-#: ifttt.php:69
-msgid "Body for \"new link post\""
-msgstr "正文“新发布链接”"
-
-#: ifttt.php:74
-msgid "Generate new key"
-msgstr "生成新的密钥"
-
-#: ifttt.php:78
-msgid "Save Settings"
-msgstr "保存设置"
diff --git a/ifttt/lang/zh-cn/strings.php b/ifttt/lang/zh-cn/strings.php
deleted file mode 100644
index 5f0d7f4e..00000000
--- a/ifttt/lang/zh-cn/strings.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_zh_cn")) {
-function string_plural_select_zh_cn($n){
-	$n = intval($n);
-	return intval(0);
-}}
-$a->strings['IFTTT Mirror'] = 'IFTTT 镜像';
-$a->strings['Create an account at <a href="http://www.ifttt.com">IFTTT</a>. Create three Facebook recipes that are connected with <a href="https://ifttt.com/maker">Maker</a> (In the form "if Facebook then Maker") with the following parameters:'] = '在<a href="http://www.ifttt.com">IFTTT</a>创建帐户。使用以下参数创建三个与<a href="https://ifttt.com/maker">Maker</a>连接的Facebook回执(格式为"If Facebook Then Maker"):';
-$a->strings['Body for "new status message"'] = '正文“新状态消息”';
-$a->strings['Body for "new photo upload"'] = '正文“新照片上传”';
-$a->strings['Body for "new link post"'] = '正文“新发布链接”';
-$a->strings['Generate new key'] = '生成新的密钥';
-$a->strings['Save Settings'] = '保存设置';
diff --git a/ifttt/templates/connector_settings.tpl b/ifttt/templates/connector_settings.tpl
deleted file mode 100644
index dfa824c0..00000000
--- a/ifttt/templates/connector_settings.tpl
+++ /dev/null
@@ -1,15 +0,0 @@
-<p>{{$l10n.intro nofilter}}</p>
-<dl>
-	<dt>{{$l10n.url}}</dt>
-	<dd>{{$url}}</dd>
-	<dt>{{$l10n.method}}</dt>
-	<dd>POST</dd>
-	<dt>{{$l10n.content_type}}</dt>
-	<dd>application/x-www-form-urlencoded</dd>
-	<dt>{{$l10n.new_status_message_body}}</dt>
-	<dd><code>{{$new_status_message_body}}</code></dd>
-	<dt>{{$l10n.new_photo_upload_body}}</dt>
-	<dd><code>{{$new_photo_upload_body}}</code></dd>
-	<dt>{{$l10n.new_link_post_body}}</dt>
-	<dd><code>{{$new_link_post_body}}</code></dd>
-</dl>
diff --git a/ijpost/ijpost.css b/ijpost/ijpost.css
new file mode 100644
index 00000000..8b424917
--- /dev/null
+++ b/ijpost/ijpost.css
@@ -0,0 +1,15 @@
+
+#ijpost-enable-label, #ijpost-username-label, #ijpost-password-label, #ijpost-bydefault-label {
+float: left;
+width: 200px;
+margin-top: 10px;
+}
+
+#ijpost-checkbox, #ijpost-username, #ijpost-password, #ijpost-bydefault {
+float: left;
+margin-top: 10px;
+}
+
+#ijpost-submit {
+margin-top: 15px;
+}
diff --git a/ijpost/ijpost.php b/ijpost/ijpost.php
index 885bc289..020dd221 100644
--- a/ijpost/ijpost.php
+++ b/ijpost/ijpost.php
@@ -8,15 +8,13 @@
  * Author: Cat Gray <https://free-haven.org/profile/catness>
  */
 
-use Friendica\App;
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Hook;
+use Friendica\Core\L10n;
 use Friendica\Core\Logger;
-use Friendica\Core\Renderer;
-use Friendica\DI;
-use Friendica\Model\Tag;
-use Friendica\Model\User;
+use Friendica\Core\PConfig;
 use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Network;
 use Friendica\Util\XML;
 
 function ijpost_install()
@@ -28,62 +26,100 @@ function ijpost_install()
 	Hook::register('connector_settings_post', 'addon/ijpost/ijpost.php', 'ijpost_settings_post');
 }
 
-function ijpost_jot_nets(array &$jotnets_fields)
+function ijpost_uninstall()
 {
-	if (!DI::userSession()->getLocalUserId()) {
+	Hook::unregister('post_local',       'addon/ijpost/ijpost.php', 'ijpost_post_local');
+	Hook::unregister('notifier_normal',  'addon/ijpost/ijpost.php', 'ijpost_send');
+	Hook::unregister('jot_networks',     'addon/ijpost/ijpost.php', 'ijpost_jot_nets');
+	Hook::unregister('connector_settings',      'addon/ijpost/ijpost.php', 'ijpost_settings');
+	Hook::unregister('connector_settings_post', 'addon/ijpost/ijpost.php', 'ijpost_settings_post');
+}
+
+function ijpost_jot_nets(\Friendica\App &$a, array &$jotnets_fields)
+{
+	if (!local_user()) {
 		return;
 	}
 
-	if (DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'ijpost', 'post')) {
+	if (PConfig::get(local_user(), 'ijpost', 'post')) {
 		$jotnets_fields[] = [
 			'type' => 'checkbox',
 			'field' => [
 				'ijpost_enable',
-				DI::l10n()->t('Post to Insanejournal'),
-				DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'ijpost', 'post_by_default')
+				L10n::t('Post to Insanejournal'),
+				PConfig::get(local_user(), 'ijpost', 'post_by_default')
 			]
 		];
 	}
 }
 
-function ijpost_settings(array &$data)
+function ijpost_settings(&$a, &$s)
 {
-	if (!DI::userSession()->getLocalUserId()) {
+	if (!local_user()) {
 		return;
 	}
 
-	$enabled     = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'ijpost', 'post', false);
-	$ij_username = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'ijpost', 'ij_username');
-	$def_enabled = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'ijpost', 'post_by_default');
+	/* Add our stylesheet to the page so we can make our settings look nice */
 
-	$t    = Renderer::getMarkupTemplate('connector_settings.tpl', 'addon/ijpost/');
-	$html = Renderer::replaceMacros($t, [
-		'$enabled'   => ['ijpost', DI::l10n()->t('Enable InsaneJournal Post Addon'), $enabled],
-		'$username'  => ['ij_username', DI::l10n()->t('InsaneJournal username'), $ij_username],
-		'$password'  => ['ij_password', DI::l10n()->t('InsaneJournal password')],
-		'$bydefault' => ['ij_bydefault', DI::l10n()->t('Post to InsaneJournal by default'), $def_enabled],
-	]);
+	$a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->getBaseURL() . '/addon/ijpost/ijpost.css' . '" media="all" />' . "\r\n";
 
-	$data = [
-		'connector' => 'ijpost',
-		'title'     => DI::l10n()->t('InsaneJournal Export'),
-		'image'     => 'images/insanejournal.gif',
-		'enabled'   => $enabled,
-		'html'      => $html,
-	];
+	/* Get the current state of our config variables */
+
+	$enabled = PConfig::get(local_user(), 'ijpost', 'post');
+
+	$checked = (($enabled) ? ' checked="checked" ' : '');
+
+	$def_enabled = PConfig::get(local_user(), 'ijpost', 'post_by_default');
+
+	$def_checked = (($def_enabled) ? ' checked="checked" ' : '');
+
+	$ij_username = PConfig::get(local_user(), 'ijpost', 'ij_username');
+	$ij_password = PConfig::get(local_user(), 'ijpost', 'ij_password');
+
+	/* Add some HTML to the existing form */
+	$s .= '<span id="settings_ijpost_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_ijpost_expanded\'); openClose(\'settings_ijpost_inflated\');">';
+	$s .= '<img class="connector" src="images/insanejournal.gif" /><h3 class="connector">'. L10n::t("InsaneJournal Export").'</h3>';
+	$s .= '</span>';
+	$s .= '<div id="settings_ijpost_expanded" class="settings-block" style="display: none;">';
+	$s .= '<span class="fakelink" onclick="openClose(\'settings_ijpost_expanded\'); openClose(\'settings_ijpost_inflated\');">';
+	$s .= '<img class="connector" src="images/insanejournal.gif" /><h3 class="connector">'. L10n::t("InsaneJournal Export").'</h3>';
+	$s .= '</span>';
+
+	$s .= '<div id="ijpost-enable-wrapper">';
+	$s .= '<label id="ijpost-enable-label" for="ijpost-checkbox">' . L10n::t('Enable InsaneJournal Post Addon') . '</label>';
+	$s .= '<input id="ijpost-checkbox" type="checkbox" name="ijpost" value="1" ' . $checked . '/>';
+	$s .= '</div><div class="clear"></div>';
+
+	$s .= '<div id="ijpost-username-wrapper">';
+	$s .= '<label id="ijpost-username-label" for="ijpost-username">' . L10n::t('InsaneJournal username') . '</label>';
+	$s .= '<input id="ijpost-username" type="text" name="ij_username" value="' . $ij_username . '" />';
+	$s .= '</div><div class="clear"></div>';
+
+	$s .= '<div id="ijpost-password-wrapper">';
+	$s .= '<label id="ijpost-password-label" for="ijpost-password">' . L10n::t('InsaneJournal password') . '</label>';
+	$s .= '<input id="ijpost-password" type="password" name="ij_password" value="' . $ij_password . '" />';
+	$s .= '</div><div class="clear"></div>';
+
+	$s .= '<div id="ijpost-bydefault-wrapper">';
+	$s .= '<label id="ijpost-bydefault-label" for="ijpost-bydefault">' . L10n::t('Post to InsaneJournal by default') . '</label>';
+	$s .= '<input id="ijpost-bydefault" type="checkbox" name="ij_bydefault" value="1" ' . $def_checked . '/>';
+	$s .= '</div><div class="clear"></div>';
+
+	/* provide a submit button */
+	$s .= '<div class="settings-submit-wrapper" ><input type="submit" id="ijpost-submit" name="ijpost-submit" class="settings-submit" value="' . L10n::t('Save Settings') . '" /></div></div>';
 }
 
-function ijpost_settings_post(array &$b)
+function ijpost_settings_post(&$a, &$b)
 {
 	if (!empty($_POST['ijpost-submit'])) {
-		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'ijpost', 'post', intval($_POST['ijpost']));
-		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'ijpost', 'post_by_default', intval($_POST['ij_bydefault']));
-		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'ijpost', 'ij_username', trim($_POST['ij_username']));
-		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'ijpost', 'ij_password', trim($_POST['ij_password']));
+		PConfig::set(local_user(), 'ijpost', 'post', intval($_POST['ijpost']));
+		PConfig::set(local_user(), 'ijpost', 'post_by_default', intval($_POST['ij_bydefault']));
+		PConfig::set(local_user(), 'ijpost', 'ij_username', trim($_POST['ij_username']));
+		PConfig::set(local_user(), 'ijpost', 'ij_password', trim($_POST['ij_password']));
 	}
 }
 
-function ijpost_post_local(array &$b)
+function ijpost_post_local(&$a, &$b)
 {
 	// This can probably be changed to allow editing by pointing to a different API endpoint
 
@@ -91,7 +127,7 @@ function ijpost_post_local(array &$b)
 		return;
 	}
 
-	if (!DI::userSession()->getLocalUserId() || (DI::userSession()->getLocalUserId() != $b['uid'])) {
+	if (!local_user() || (local_user() != $b['uid'])) {
 		return;
 	}
 
@@ -99,11 +135,11 @@ function ijpost_post_local(array &$b)
 		return;
 	}
 
-	$ij_post   = intval(DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'ijpost', 'post'));
+	$ij_post   = intval(PConfig::get(local_user(), 'ijpost', 'post'));
 
 	$ij_enable = (($ij_post && !empty($_REQUEST['ijpost_enable'])) ? intval($_REQUEST['ijpost_enable']) : 0);
 
-	if ($b['api_source'] && intval(DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'ijpost', 'post_by_default'))) {
+	if ($b['api_source'] && intval(PConfig::get(local_user(), 'ijpost', 'post_by_default'))) {
 		$ij_enable = 1;
 	}
 
@@ -118,7 +154,7 @@ function ijpost_post_local(array &$b)
 	$b['postopts'] .= 'ijpost';
 }
 
-function ijpost_send(array &$b)
+function ijpost_send(&$a, &$b)
 {
 	if ($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited'])) {
 		return;
@@ -136,18 +172,25 @@ function ijpost_send(array &$b)
 	// Hopefully the person's Friendica account
 	// will be set to the same thing.
 
-	$user = User::getById($b['uid']);
-	$tz = $user['timezone'] ?: 'UTC';
+	$tz = 'UTC';
 
-	$ij_username = DI::pConfig()->get($b['uid'], 'ijpost', 'ij_username');
-	$ij_password = DI::pConfig()->get($b['uid'], 'ijpost', 'ij_password');
+	$x = q("select timezone from user where uid = %d limit 1",
+		intval($b['uid'])
+	);
+
+	if ($x && strlen($x[0]['timezone'])) {
+		$tz = $x[0]['timezone'];
+	}
+
+	$ij_username = PConfig::get($b['uid'], 'ijpost', 'ij_username');
+	$ij_password = PConfig::get($b['uid'], 'ijpost', 'ij_password');
 	$ij_blog = 'http://www.insanejournal.com/interface/xmlrpc';
 
 	if ($ij_username && $ij_password && $ij_blog) {
 		$title = $b['title'];
-		$post = BBCode::convertForUriId($b['uri-id'], $b['body'], BBCode::CONNECTORS);
+		$post = BBCode::convert($b['body']);
 		$post = XML::escape($post);
-		$tags = Tag::getCSVByURIId($b['uri-id'], [Tag::HASHTAG]);
+		$tags = ijpost_get_tags($b['tag']);
 
 		$date = DateTimeFormat::convert($b['created'], $tz);
 		$year = intval(substr($date,0,4));
@@ -183,11 +226,18 @@ function ijpost_send(array &$b)
 
 EOT;
 
-		Logger::debug('ijpost: data: ' . $xml);
+		Logger::log('ijpost: data: ' . $xml, Logger::DATA);
 
 		if ($ij_blog !== 'test') {
-			$x = DI::httpClient()->post($ij_blog, $xml, ['Content-Type' => 'text/xml'])->getBodyString();
+			$x = Network::post($ij_blog, $xml, ["Content-Type: text/xml"])->getBody();
 		}
-		Logger::info('posted to insanejournal: ' . $x ? $x : '');
+		Logger::log('posted to insanejournal: ' . $x ? $x : '', Logger::DEBUG);
 	}
 }
+
+function ijpost_get_tags($post)
+{
+	preg_match_all("/\]([^\[#]+)\[/", $post, $matches);
+	$tags = implode(', ', $matches[1]);
+	return $tags;
+}
diff --git a/ijpost/lang/C/messages.po b/ijpost/lang/C/messages.po
index cfcd7f39..33e9c31a 100644
--- a/ijpost/lang/C/messages.po
+++ b/ijpost/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:17-0500\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,26 +17,30 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ijpost.php:42
+#: ijpost.php:39
 msgid "Post to Insanejournal"
 msgstr ""
 
-#: ijpost.php:61
+#: ijpost.php:70
+msgid "InsaneJournal Post Settings"
+msgstr ""
+
+#: ijpost.php:72
 msgid "Enable InsaneJournal Post Addon"
 msgstr ""
 
-#: ijpost.php:62
+#: ijpost.php:77
 msgid "InsaneJournal username"
 msgstr ""
 
-#: ijpost.php:63
+#: ijpost.php:82
 msgid "InsaneJournal password"
 msgstr ""
 
-#: ijpost.php:64
+#: ijpost.php:87
 msgid "Post to InsaneJournal by default"
 msgstr ""
 
-#: ijpost.php:69
-msgid "InsaneJournal Export"
+#: ijpost.php:93
+msgid "Submit"
 msgstr ""
diff --git a/ijpost/lang/ar/messages.po b/ijpost/lang/ar/messages.po
deleted file mode 100644
index 339ec597..00000000
--- a/ijpost/lang/ar/messages.po
+++ /dev/null
@@ -1,48 +0,0 @@
-# ADDON ijpost
-# Copyright (C)
-# This file is distributed under the same license as the Friendica ijpost addon package.
-# 
-# 
-# Translators:
-# Farida Khalaf <faridakhalaf@hotmail.com>, 2021
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2021-02-21 18:11+0000\n"
-"Last-Translator: Farida Khalaf <faridakhalaf@hotmail.com>\n"
-"Language-Team: Arabic (http://www.transifex.com/Friendica/friendica/language/ar/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ar\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-
-#: ijpost.php:39
-msgid "Post to Insanejournal"
-msgstr "انشر في انسينجورنال"
-
-#: ijpost.php:71 ijpost.php:75
-msgid "InsaneJournal Export"
-msgstr "تصدير انسينجورنال"
-
-#: ijpost.php:79
-msgid "Enable InsaneJournal Post Addon"
-msgstr "تمكين انسينجورنال إضافة ملحق"
-
-#: ijpost.php:84
-msgid "InsaneJournal username"
-msgstr "اسم المستخدم انسينجورنال"
-
-#: ijpost.php:89
-msgid "InsaneJournal password"
-msgstr "كلمة مرور انسينجورنال"
-
-#: ijpost.php:94
-msgid "Post to InsaneJournal by default"
-msgstr "انشر في انسينجورنال بشكل افتراضي "
-
-#: ijpost.php:99
-msgid "Save Settings"
-msgstr "حفظ الإعدادات"
diff --git a/ijpost/lang/ar/strings.php b/ijpost/lang/ar/strings.php
deleted file mode 100644
index af85865a..00000000
--- a/ijpost/lang/ar/strings.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_ar")) {
-function string_plural_select_ar($n){
-	$n = intval($n);
-	if ($n==0) { return 0; } else if ($n==1) { return 1; } else if ($n==2) { return 2; } else if ($n%100>=3 && $n%100<=10) { return 3; } else if ($n%100>=11 && $n%100<=99) { return 4; } else  { return 5; }
-}}
-$a->strings['Post to Insanejournal'] = 'انشر في انسينجورنال';
-$a->strings['InsaneJournal Export'] = 'تصدير انسينجورنال';
-$a->strings['Enable InsaneJournal Post Addon'] = 'تمكين انسينجورنال إضافة ملحق';
-$a->strings['InsaneJournal username'] = 'اسم المستخدم انسينجورنال';
-$a->strings['InsaneJournal password'] = 'كلمة مرور انسينجورنال';
-$a->strings['Post to InsaneJournal by default'] = 'انشر في انسينجورنال بشكل افتراضي ';
-$a->strings['Save Settings'] = 'حفظ الإعدادات';
diff --git a/ijpost/lang/ca/strings.php b/ijpost/lang/ca/strings.php
index 1c4baadf..c0f8d9c0 100644
--- a/ijpost/lang/ca/strings.php
+++ b/ijpost/lang/ca/strings.php
@@ -3,12 +3,13 @@
 if(! function_exists("string_plural_select_ca")) {
 function string_plural_select_ca($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Post to Insanejournal'] = 'Enviar a Insanejournal';
-$a->strings['InsaneJournal Post Settings'] = 'Configuració de la publicació de InsaneJournal';
-$a->strings['Enable InsaneJournal Post Addon'] = 'Activa la secció Addon InsaneJournal';
-$a->strings['InsaneJournal username'] = 'Nom d\'usuari de InsaneJournal';
-$a->strings['InsaneJournal password'] = 'Contrasenya de InsaneJournal';
-$a->strings['Post to InsaneJournal by default'] = 'Publica-ho de manera predeterminada a InsaneJournal';
-$a->strings['Submit'] = 'sotmetre\'s';
+;
+$a->strings["Post to Insanejournal"] = "Enviar a Insanejournal";
+$a->strings["InsaneJournal Post Settings"] = "Configuració de la publicació de InsaneJournal";
+$a->strings["Enable InsaneJournal Post Addon"] = "Activa la secció Addon InsaneJournal";
+$a->strings["InsaneJournal username"] = "Nom d'usuari de InsaneJournal";
+$a->strings["InsaneJournal password"] = "Contrasenya de InsaneJournal";
+$a->strings["Post to InsaneJournal by default"] = "Publica-ho de manera predeterminada a InsaneJournal";
+$a->strings["Submit"] = "sotmetre's";
diff --git a/ijpost/lang/cs/strings.php b/ijpost/lang/cs/strings.php
index e055ded3..c9ef7978 100644
--- a/ijpost/lang/cs/strings.php
+++ b/ijpost/lang/cs/strings.php
@@ -3,12 +3,13 @@
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
 	$n = intval($n);
-	if (($n == 1 && $n % 1 == 0)) { return 0; } else if (($n >= 2 && $n <= 4 && $n % 1 == 0)) { return 1; } else if (($n % 1 != 0 )) { return 2; } else  { return 3; }
+	return ($n == 1 && $n % 1 == 0) ? 0 : ($n >= 2 && $n <= 4 && $n % 1 == 0) ? 1: ($n % 1 != 0 ) ? 2 : 3;;
 }}
-$a->strings['Post to Insanejournal'] = 'Posílat na InsaneJournal';
-$a->strings['InsaneJournal Post Settings'] = 'Nastavení InsaneJournal Post';
-$a->strings['Enable InsaneJournal Post Addon'] = 'Povolit doplněk InsaneJournal Post';
-$a->strings['InsaneJournal username'] = 'Uživatelské jméno InsaneJournal';
-$a->strings['InsaneJournal password'] = 'Heslo InsaneJournal';
-$a->strings['Post to InsaneJournal by default'] = 'Ve výchozím stavu posílat příspěvky na InsaneJournal';
-$a->strings['Submit'] = 'Odeslat';
+;
+$a->strings["Post to Insanejournal"] = "Posílat na InsaneJournal";
+$a->strings["InsaneJournal Post Settings"] = "Nastavení InsaneJournal Post";
+$a->strings["Enable InsaneJournal Post Addon"] = "Povolit doplněk InsaneJournal Post";
+$a->strings["InsaneJournal username"] = "Uživatelské jméno InsaneJournal";
+$a->strings["InsaneJournal password"] = "Heslo InsaneJournal";
+$a->strings["Post to InsaneJournal by default"] = "Ve výchozím stavu posílat příspěvky na InsaneJournal";
+$a->strings["Submit"] = "Odeslat";
diff --git a/ijpost/lang/da-dk/messages.po b/ijpost/lang/da-dk/messages.po
deleted file mode 100644
index 0d54f8b8..00000000
--- a/ijpost/lang/da-dk/messages.po
+++ /dev/null
@@ -1,43 +0,0 @@
-# ADDON ijpost
-# Copyright (C)
-# This file is distributed under the same license as the Friendica ijpost addon package.
-# 
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:17-0500\n"
-"PO-Revision-Date: 2014-06-23 08:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Danish (Denmark) (http://www.transifex.com/Friendica/friendica/language/da_DK/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: da_DK\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: ijpost.php:42
-msgid "Post to Insanejournal"
-msgstr ""
-
-#: ijpost.php:61
-msgid "Enable InsaneJournal Post Addon"
-msgstr ""
-
-#: ijpost.php:62
-msgid "InsaneJournal username"
-msgstr ""
-
-#: ijpost.php:63
-msgid "InsaneJournal password"
-msgstr ""
-
-#: ijpost.php:64
-msgid "Post to InsaneJournal by default"
-msgstr ""
-
-#: ijpost.php:69
-msgid "InsaneJournal Export"
-msgstr ""
diff --git a/ijpost/lang/da-dk/strings.php b/ijpost/lang/da-dk/strings.php
deleted file mode 100644
index 09554750..00000000
--- a/ijpost/lang/da-dk/strings.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_da_dk")) {
-function string_plural_select_da_dk($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
diff --git a/ijpost/lang/de/messages.po b/ijpost/lang/de/messages.po
index 8dac5676..35101521 100644
--- a/ijpost/lang/de/messages.po
+++ b/ijpost/lang/de/messages.po
@@ -4,44 +4,46 @@
 # 
 # 
 # Translators:
-# Andreas H., 2014
-# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2014
-# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2018,2021
-# Ulf Rompe <transifex.com@rompe.org>, 2019
+# Abrax <webmaster@a-zwenkau.de>, 2014
+# bavatar <tobias.diekershoff@gmx.net>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:17-0500\n"
-"PO-Revision-Date: 2014-06-23 08:37+0000\n"
-"Last-Translator: Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2018,2021\n"
-"Language-Team: German (http://app.transifex.com/Friendica/friendica/language/de/)\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2014-10-15 12:29+0000\n"
+"Last-Translator: Abrax <webmaster@a-zwenkau.de>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/friendica/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ijpost.php:42
+#: ijpost.php:39
 msgid "Post to Insanejournal"
 msgstr "Auf InsaneJournal posten."
 
-#: ijpost.php:61
+#: ijpost.php:70
+msgid "InsaneJournal Post Settings"
+msgstr "InsaneJournal Beitrags-Einstellungen"
+
+#: ijpost.php:72
 msgid "Enable InsaneJournal Post Addon"
-msgstr "InsaneJournal-Addon aktivieren"
+msgstr "InsaneJournal Addon aktivieren"
 
-#: ijpost.php:62
+#: ijpost.php:77
 msgid "InsaneJournal username"
-msgstr "InsaneJournal-Benutzername"
+msgstr "InsaneJournal Benutzername"
 
-#: ijpost.php:63
+#: ijpost.php:82
 msgid "InsaneJournal password"
-msgstr "InsaneJournal-Passwort"
+msgstr "InsaneJournal Passwort"
 
-#: ijpost.php:64
+#: ijpost.php:87
 msgid "Post to InsaneJournal by default"
 msgstr "Standardmäßig auf InsaneJournal posten."
 
-#: ijpost.php:69
-msgid "InsaneJournal Export"
-msgstr "InsaneJournal Export"
+#: ijpost.php:93
+msgid "Submit"
+msgstr "Senden"
diff --git a/ijpost/lang/de/strings.php b/ijpost/lang/de/strings.php
index 4dd461e1..3b8dbb6d 100644
--- a/ijpost/lang/de/strings.php
+++ b/ijpost/lang/de/strings.php
@@ -2,12 +2,13 @@
 
 if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Post to Insanejournal'] = 'Auf InsaneJournal posten.';
-$a->strings['Enable InsaneJournal Post Addon'] = 'InsaneJournal-Addon aktivieren';
-$a->strings['InsaneJournal username'] = 'InsaneJournal-Benutzername';
-$a->strings['InsaneJournal password'] = 'InsaneJournal-Passwort';
-$a->strings['Post to InsaneJournal by default'] = 'Standardmäßig auf InsaneJournal posten.';
-$a->strings['InsaneJournal Export'] = 'InsaneJournal Export';
+;
+$a->strings["Post to Insanejournal"] = "Auf InsaneJournal posten.";
+$a->strings["InsaneJournal Post Settings"] = "InsaneJournal Beitrags-Einstellungen";
+$a->strings["Enable InsaneJournal Post Addon"] = "InsaneJournal Addon aktivieren";
+$a->strings["InsaneJournal username"] = "InsaneJournal Benutzername";
+$a->strings["InsaneJournal password"] = "InsaneJournal Passwort";
+$a->strings["Post to InsaneJournal by default"] = "Standardmäßig auf InsaneJournal posten.";
+$a->strings["Submit"] = "Senden";
diff --git a/ijpost/lang/es/messages.po b/ijpost/lang/es/messages.po
index 6a8c303c..7aa4e1a8 100644
--- a/ijpost/lang/es/messages.po
+++ b/ijpost/lang/es/messages.po
@@ -5,14 +5,13 @@
 # 
 # Translators:
 # Albert, 2016
-# Senex Petrovic <javierruizo@hotmail.com>, 2021
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2021-04-01 10:01+0000\n"
-"Last-Translator: Senex Petrovic <javierruizo@hotmail.com>\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2016-11-16 16:55+0000\n"
+"Last-Translator: Albert\n"
 "Language-Team: Spanish (http://www.transifex.com/Friendica/friendica/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,26 +23,26 @@ msgstr ""
 msgid "Post to Insanejournal"
 msgstr "Publicar en Insanejournal"
 
-#: ijpost.php:71 ijpost.php:75
-msgid "InsaneJournal Export"
-msgstr "InsaneJournal Exportar"
+#: ijpost.php:70
+msgid "InsaneJournal Post Settings"
+msgstr "Ajustes de Entrada de InsaneJournal"
 
-#: ijpost.php:79
+#: ijpost.php:72
 msgid "Enable InsaneJournal Post Addon"
-msgstr "Habilitar el Plugin de Entrada InsaneJournal"
+msgstr "Habilitar el Addon de Entrada InsaneJournal"
 
-#: ijpost.php:84
+#: ijpost.php:77
 msgid "InsaneJournal username"
 msgstr "Nombre de usuario InsaneJournal"
 
-#: ijpost.php:89
+#: ijpost.php:82
 msgid "InsaneJournal password"
 msgstr "Contraseña de InsaneJournal"
 
-#: ijpost.php:94
+#: ijpost.php:87
 msgid "Post to InsaneJournal by default"
 msgstr "Publicar en InsaneJournal por defecto"
 
-#: ijpost.php:99
-msgid "Save Settings"
-msgstr "Guardar Ajustes"
+#: ijpost.php:93
+msgid "Submit"
+msgstr "Enviar"
diff --git a/ijpost/lang/es/strings.php b/ijpost/lang/es/strings.php
index e3ff1c63..76c9e5f9 100644
--- a/ijpost/lang/es/strings.php
+++ b/ijpost/lang/es/strings.php
@@ -2,13 +2,13 @@
 
 if(! function_exists("string_plural_select_es")) {
 function string_plural_select_es($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Post to Insanejournal'] = 'Publicar en Insanejournal';
-$a->strings['InsaneJournal Export'] = 'InsaneJournal Exportar';
-$a->strings['Enable InsaneJournal Post Addon'] = 'Habilitar el Plugin de Entrada InsaneJournal';
-$a->strings['InsaneJournal username'] = 'Nombre de usuario InsaneJournal';
-$a->strings['InsaneJournal password'] = 'Contraseña de InsaneJournal';
-$a->strings['Post to InsaneJournal by default'] = 'Publicar en InsaneJournal por defecto';
-$a->strings['Save Settings'] = 'Guardar Ajustes';
+;
+$a->strings["Post to Insanejournal"] = "Publicar en Insanejournal";
+$a->strings["InsaneJournal Post Settings"] = "Ajustes de Entrada de InsaneJournal";
+$a->strings["Enable InsaneJournal Post Addon"] = "Habilitar el Addon de Entrada InsaneJournal";
+$a->strings["InsaneJournal username"] = "Nombre de usuario InsaneJournal";
+$a->strings["InsaneJournal password"] = "Contraseña de InsaneJournal";
+$a->strings["Post to InsaneJournal by default"] = "Publicar en InsaneJournal por defecto";
+$a->strings["Submit"] = "Enviar";
diff --git a/ijpost/lang/fi-fi/strings.php b/ijpost/lang/fi-fi/strings.php
index 994d5789..9b4b280d 100644
--- a/ijpost/lang/fi-fi/strings.php
+++ b/ijpost/lang/fi-fi/strings.php
@@ -2,13 +2,13 @@
 
 if(! function_exists("string_plural_select_fi_fi")) {
 function string_plural_select_fi_fi($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Post to Insanejournal'] = 'Lähetä InsaneJournaliin';
-$a->strings['InsaneJournal Post Settings'] = 'InsaneJournal -viestin asetukset';
-$a->strings['Enable InsaneJournal Post Addon'] = 'Ota InsaneJournal -viestilisäosa käyttöön';
-$a->strings['InsaneJournal username'] = 'InsaneJournal -käyttäjätunnus';
-$a->strings['InsaneJournal password'] = 'InsaneJournal -salasana';
-$a->strings['Post to InsaneJournal by default'] = 'Lähetä InsaneJournaliin oletuksena';
-$a->strings['Submit'] = 'Lähetä';
+;
+$a->strings["Post to Insanejournal"] = "Lähetä InsaneJournaliin";
+$a->strings["InsaneJournal Post Settings"] = "InsaneJournal -viestin asetukset";
+$a->strings["Enable InsaneJournal Post Addon"] = "Ota InsaneJournal -viestilisäosa käyttöön";
+$a->strings["InsaneJournal username"] = "InsaneJournal -käyttäjätunnus";
+$a->strings["InsaneJournal password"] = "InsaneJournal -salasana";
+$a->strings["Post to InsaneJournal by default"] = "Lähetä InsaneJournaliin oletuksena";
+$a->strings["Submit"] = "Lähetä";
diff --git a/ijpost/lang/fr/messages.po b/ijpost/lang/fr/messages.po
deleted file mode 100644
index bc322337..00000000
--- a/ijpost/lang/fr/messages.po
+++ /dev/null
@@ -1,45 +0,0 @@
-# ADDON ijpost
-# Copyright (C)
-# This file is distributed under the same license as the Friendica ijpost addon package.
-# 
-# 
-# Translators:
-# bob lebonche <lebonche@tutanota.com>, 2021
-# Hypolite Petovan <hypolite@mrpetovan.com>, 2016
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:17-0500\n"
-"PO-Revision-Date: 2014-06-23 08:37+0000\n"
-"Last-Translator: bob lebonche <lebonche@tutanota.com>, 2021\n"
-"Language-Team: French (http://www.transifex.com/Friendica/friendica/language/fr/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: fr\n"
-"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
-
-#: ijpost.php:42
-msgid "Post to Insanejournal"
-msgstr "Publier sur Insanejournal"
-
-#: ijpost.php:61
-msgid "Enable InsaneJournal Post Addon"
-msgstr "Activer l'application complémentaire InsaneJournalPost"
-
-#: ijpost.php:62
-msgid "InsaneJournal username"
-msgstr "Identifiant du InsaneJournal"
-
-#: ijpost.php:63
-msgid "InsaneJournal password"
-msgstr "Mot de passe du InsaneJournal"
-
-#: ijpost.php:64
-msgid "Post to InsaneJournal by default"
-msgstr "Publier sur le InsaneJournal par défaut"
-
-#: ijpost.php:69
-msgid "InsaneJournal Export"
-msgstr "Export vers journal Insane "
diff --git a/ijpost/lang/fr/strings.php b/ijpost/lang/fr/strings.php
index d8e3e95d..398e3c62 100644
--- a/ijpost/lang/fr/strings.php
+++ b/ijpost/lang/fr/strings.php
@@ -1,13 +1,9 @@
-<?php
-
-if(! function_exists("string_plural_select_fr")) {
-function string_plural_select_fr($n){
-	$n = intval($n);
-	if (($n == 0 || $n == 1)) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
-}}
-$a->strings['Post to Insanejournal'] = 'Publier sur Insanejournal';
-$a->strings['Enable InsaneJournal Post Addon'] = 'Activer l\'application complémentaire InsaneJournalPost';
-$a->strings['InsaneJournal username'] = 'Identifiant du InsaneJournal';
-$a->strings['InsaneJournal password'] = 'Mot de passe du InsaneJournal';
-$a->strings['Post to InsaneJournal by default'] = 'Publier sur le InsaneJournal par défaut';
-$a->strings['InsaneJournal Export'] = 'Export vers journal Insane ';
+<?php
+
+$a->strings["Post to Insanejournal"] = "Publier vers InsaneJournal";
+$a->strings["InsaneJournal Post Settings"] = "Réglages InsaneJournal";
+$a->strings["Enable InsaneJournal Post Addon"] = "Activer le connecteur InsaneJournal";
+$a->strings["InsaneJournal username"] = "Utilisateur InsaneJournal";
+$a->strings["InsaneJournal password"] = "Mot de passe InsaneJournal";
+$a->strings["Post to InsaneJournal by default"] = "Publier sur InsaneJournal par défaut";
+$a->strings["Submit"] = "Envoyer";
diff --git a/ijpost/lang/hu/messages.po b/ijpost/lang/hu/messages.po
deleted file mode 100644
index 5a0d6e5d..00000000
--- a/ijpost/lang/hu/messages.po
+++ /dev/null
@@ -1,44 +0,0 @@
-# ADDON ijpost
-# Copyright (C)
-# This file is distributed under the same license as the Friendica ijpost addon package.
-# 
-# 
-# Translators:
-# Balázs Úr, 2020-2021
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:17-0500\n"
-"PO-Revision-Date: 2014-06-23 08:37+0000\n"
-"Last-Translator: Balázs Úr, 2020-2021\n"
-"Language-Team: Hungarian (http://www.transifex.com/Friendica/friendica/language/hu/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: hu\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: ijpost.php:42
-msgid "Post to Insanejournal"
-msgstr "Beküldés az InsaneJournalra"
-
-#: ijpost.php:61
-msgid "Enable InsaneJournal Post Addon"
-msgstr "Az InsaneJournal beküldési bővítmény engedélyezése"
-
-#: ijpost.php:62
-msgid "InsaneJournal username"
-msgstr "InsaneJournal felhasználónév"
-
-#: ijpost.php:63
-msgid "InsaneJournal password"
-msgstr "InsaneJournal jelszó"
-
-#: ijpost.php:64
-msgid "Post to InsaneJournal by default"
-msgstr "Beküldés az InsaneJournalra alapértelmezetten"
-
-#: ijpost.php:69
-msgid "InsaneJournal Export"
-msgstr "InsaneJournal exportálás"
diff --git a/ijpost/lang/hu/strings.php b/ijpost/lang/hu/strings.php
deleted file mode 100644
index 0f1eaddd..00000000
--- a/ijpost/lang/hu/strings.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_hu")) {
-function string_plural_select_hu($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Post to Insanejournal'] = 'Beküldés az InsaneJournalra';
-$a->strings['Enable InsaneJournal Post Addon'] = 'Az InsaneJournal beküldési bővítmény engedélyezése';
-$a->strings['InsaneJournal username'] = 'InsaneJournal felhasználónév';
-$a->strings['InsaneJournal password'] = 'InsaneJournal jelszó';
-$a->strings['Post to InsaneJournal by default'] = 'Beküldés az InsaneJournalra alapértelmezetten';
-$a->strings['InsaneJournal Export'] = 'InsaneJournal exportálás';
diff --git a/ijpost/lang/it/messages.po b/ijpost/lang/it/messages.po
index b113cbd1..a98a2be3 100644
--- a/ijpost/lang/it/messages.po
+++ b/ijpost/lang/it/messages.po
@@ -5,14 +5,13 @@
 # 
 # Translators:
 # fabrixxm <fabrix.xm@gmail.com>, 2014-2015,2018
-# Sylke Vicious <silkevicious@gmail.com>, 2021
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2021-02-16 12:55+0000\n"
-"Last-Translator: Sylke Vicious <silkevicious@gmail.com>\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2018-03-19 13:22+0000\n"
+"Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,26 +23,26 @@ msgstr ""
 msgid "Post to Insanejournal"
 msgstr "Invia a InsaneJournal"
 
-#: ijpost.php:71 ijpost.php:75
-msgid "InsaneJournal Export"
-msgstr "Esporta InsaneJournal"
+#: ijpost.php:70
+msgid "InsaneJournal Post Settings"
+msgstr "Impostazioni post InsaneJournal"
 
-#: ijpost.php:79
+#: ijpost.php:72
 msgid "Enable InsaneJournal Post Addon"
 msgstr "Abilita il componente aggiuntivo di invio a InsaneJournal"
 
-#: ijpost.php:84
+#: ijpost.php:77
 msgid "InsaneJournal username"
 msgstr "Nome utente InsaneJournal"
 
-#: ijpost.php:89
+#: ijpost.php:82
 msgid "InsaneJournal password"
 msgstr "Password InsaneJournal"
 
-#: ijpost.php:94
+#: ijpost.php:87
 msgid "Post to InsaneJournal by default"
 msgstr "Invia sempre a InsaneJournal"
 
-#: ijpost.php:99
-msgid "Save Settings"
-msgstr "Salva Impostazioni"
+#: ijpost.php:93
+msgid "Submit"
+msgstr "Invia"
diff --git a/ijpost/lang/it/strings.php b/ijpost/lang/it/strings.php
index fcbfbde3..d8bd49e9 100644
--- a/ijpost/lang/it/strings.php
+++ b/ijpost/lang/it/strings.php
@@ -2,13 +2,13 @@
 
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Post to Insanejournal'] = 'Invia a InsaneJournal';
-$a->strings['InsaneJournal Export'] = 'Esporta InsaneJournal';
-$a->strings['Enable InsaneJournal Post Addon'] = 'Abilita il componente aggiuntivo di invio a InsaneJournal';
-$a->strings['InsaneJournal username'] = 'Nome utente InsaneJournal';
-$a->strings['InsaneJournal password'] = 'Password InsaneJournal';
-$a->strings['Post to InsaneJournal by default'] = 'Invia sempre a InsaneJournal';
-$a->strings['Save Settings'] = 'Salva Impostazioni';
+;
+$a->strings["Post to Insanejournal"] = "Invia a InsaneJournal";
+$a->strings["InsaneJournal Post Settings"] = "Impostazioni post InsaneJournal";
+$a->strings["Enable InsaneJournal Post Addon"] = "Abilita il componente aggiuntivo di invio a InsaneJournal";
+$a->strings["InsaneJournal username"] = "Nome utente InsaneJournal";
+$a->strings["InsaneJournal password"] = "Password InsaneJournal";
+$a->strings["Post to InsaneJournal by default"] = "Invia sempre a InsaneJournal";
+$a->strings["Submit"] = "Invia";
diff --git a/ijpost/lang/nl/strings.php b/ijpost/lang/nl/strings.php
index 0f15a26f..4e0dbf3d 100644
--- a/ijpost/lang/nl/strings.php
+++ b/ijpost/lang/nl/strings.php
@@ -3,9 +3,13 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Post to Insanejournal'] = 'Plaatsen op Insanejournal';
-$a->strings['InsaneJournal Post Settings'] = 'InsaneJournal Post instellingen';
-$a->strings['Enable InsaneJournal Post Addon'] = 'InsaneJournal Post Addon inschakelen';
-$a->strings['Post to InsaneJournal by default'] = 'Plaatsen op InsaneJournal als standaard instellen ';
+;
+$a->strings["Post to Insanejournal"] = "Plaatsen op Insanejournal";
+$a->strings["InsaneJournal Post Settings"] = "InsaneJournal Post instellingen";
+$a->strings["Enable InsaneJournal Post Addon"] = "InsaneJournal Post Addon inschakelen";
+$a->strings["InsaneJournal username"] = "";
+$a->strings["InsaneJournal password"] = "";
+$a->strings["Post to InsaneJournal by default"] = "Plaatsen op InsaneJournal als standaard instellen ";
+$a->strings["Submit"] = "";
diff --git a/ijpost/lang/pl/messages.po b/ijpost/lang/pl/messages.po
index e7b08fcc..84154384 100644
--- a/ijpost/lang/pl/messages.po
+++ b/ijpost/lang/pl/messages.po
@@ -4,15 +4,14 @@
 # 
 # 
 # Translators:
-# Piotr Strębski <strebski@gmail.com>, 2022
-# Waldemar Stoczkowski, 2018
+# Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:17-0500\n"
-"PO-Revision-Date: 2014-06-23 08:37+0000\n"
-"Last-Translator: Piotr Strębski <strebski@gmail.com>, 2022\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2018-03-31 19:43+0000\n"
+"Last-Translator: Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.com/Friendica/friendica/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,26 +19,30 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
-#: ijpost.php:42
+#: ijpost.php:39
 msgid "Post to Insanejournal"
-msgstr "Opublikuj w InsaneJournal"
+msgstr "Opublikuj w Insanejournal"
 
-#: ijpost.php:61
+#: ijpost.php:70
+msgid "InsaneJournal Post Settings"
+msgstr "InsaneJournal Ustawienia Post"
+
+#: ijpost.php:72
 msgid "Enable InsaneJournal Post Addon"
 msgstr "Włącz dodatek InsaneJournal"
 
-#: ijpost.php:62
+#: ijpost.php:77
 msgid "InsaneJournal username"
-msgstr "Nazwa użytkownika InsaneJournal"
+msgstr "InsaneJournal nazwa użytkownika"
 
-#: ijpost.php:63
+#: ijpost.php:82
 msgid "InsaneJournal password"
 msgstr "Hasło InsaneJournal"
 
-#: ijpost.php:64
+#: ijpost.php:87
 msgid "Post to InsaneJournal by default"
 msgstr "Wyślij domyślnie do InsaneJournal"
 
-#: ijpost.php:69
-msgid "InsaneJournal Export"
-msgstr "Eksportuj InsaneJournal"
+#: ijpost.php:93
+msgid "Submit"
+msgstr "Wyślij"
diff --git a/ijpost/lang/pl/strings.php b/ijpost/lang/pl/strings.php
index 56cfb7da..eea5e0eb 100644
--- a/ijpost/lang/pl/strings.php
+++ b/ijpost/lang/pl/strings.php
@@ -2,12 +2,13 @@
 
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
-	$n = intval($n);
-	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
+	return ($n==1 ? 0 : ($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14) ? 1 : $n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14) ? 2 : 3);;
 }}
-$a->strings['Post to Insanejournal'] = 'Opublikuj w InsaneJournal';
-$a->strings['Enable InsaneJournal Post Addon'] = 'Włącz dodatek InsaneJournal';
-$a->strings['InsaneJournal username'] = 'Nazwa użytkownika InsaneJournal';
-$a->strings['InsaneJournal password'] = 'Hasło InsaneJournal';
-$a->strings['Post to InsaneJournal by default'] = 'Wyślij domyślnie do InsaneJournal';
-$a->strings['InsaneJournal Export'] = 'Eksportuj InsaneJournal';
+;
+$a->strings["Post to Insanejournal"] = "Opublikuj w Insanejournal";
+$a->strings["InsaneJournal Post Settings"] = "InsaneJournal Ustawienia Post";
+$a->strings["Enable InsaneJournal Post Addon"] = "Włącz dodatek InsaneJournal";
+$a->strings["InsaneJournal username"] = "InsaneJournal nazwa użytkownika";
+$a->strings["InsaneJournal password"] = "Hasło InsaneJournal";
+$a->strings["Post to InsaneJournal by default"] = "Wyślij domyślnie do InsaneJournal";
+$a->strings["Submit"] = "Wyślij";
diff --git a/ijpost/lang/pt-br/strings.php b/ijpost/lang/pt-br/strings.php
index 682bc7a2..fbc1f284 100644
--- a/ijpost/lang/pt-br/strings.php
+++ b/ijpost/lang/pt-br/strings.php
@@ -2,13 +2,13 @@
 
 if(! function_exists("string_plural_select_pt_br")) {
 function string_plural_select_pt_br($n){
-	$n = intval($n);
-	return intval($n > 1);
+	return ($n > 1);;
 }}
-$a->strings['Post to Insanejournal'] = 'Publicar no Insanejournal';
-$a->strings['InsaneJournal Post Settings'] = 'Configurações de publicação no InsaneJournal';
-$a->strings['Enable InsaneJournal Post Addon'] = 'Habilitar plug-in para publicar no InsaneJournal';
-$a->strings['InsaneJournal username'] = 'Nome de usuário no InsaneJournal';
-$a->strings['InsaneJournal password'] = 'Senha do InsaneJournal';
-$a->strings['Post to InsaneJournal by default'] = 'Publicar no InsaneJournal por padrão';
-$a->strings['Submit'] = 'Enviar';
+;
+$a->strings["Post to Insanejournal"] = "Publicar no Insanejournal";
+$a->strings["InsaneJournal Post Settings"] = "Configurações de publicação no InsaneJournal";
+$a->strings["Enable InsaneJournal Post Addon"] = "Habilitar plug-in para publicar no InsaneJournal";
+$a->strings["InsaneJournal username"] = "Nome de usuário no InsaneJournal";
+$a->strings["InsaneJournal password"] = "Senha do InsaneJournal";
+$a->strings["Post to InsaneJournal by default"] = "Publicar no InsaneJournal por padrão";
+$a->strings["Submit"] = "Enviar";
diff --git a/ijpost/lang/ro/strings.php b/ijpost/lang/ro/strings.php
index e87a4b51..35d64ea6 100644
--- a/ijpost/lang/ro/strings.php
+++ b/ijpost/lang/ro/strings.php
@@ -2,13 +2,13 @@
 
 if(! function_exists("string_plural_select_ro")) {
 function string_plural_select_ro($n){
-	$n = intval($n);
-	if ($n==1) { return 0; } else if ((($n%100>19)||(($n%100==0)&&($n!=0)))) { return 2; } else  { return 1; }
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
 }}
-$a->strings['Post to Insanejournal'] = 'Postare pe Insanejournal';
-$a->strings['InsaneJournal Post Settings'] = 'Configurări Postări Insaneournal';
-$a->strings['Enable InsaneJournal Post Addon'] = 'Activare Modul Postare InsaneJournal';
-$a->strings['InsaneJournal username'] = 'Utilizator InsaneJournal ';
-$a->strings['InsaneJournal password'] = 'Parolă InsaneJournal ';
-$a->strings['Post to InsaneJournal by default'] = 'Postați implicit pe InsaneJournal ';
-$a->strings['Submit'] = 'Trimite';
+;
+$a->strings["Post to Insanejournal"] = "Postare pe Insanejournal";
+$a->strings["InsaneJournal Post Settings"] = "Configurări Postări Insaneournal";
+$a->strings["Enable InsaneJournal Post Addon"] = "Activare Modul Postare InsaneJournal";
+$a->strings["InsaneJournal username"] = "Utilizator InsaneJournal ";
+$a->strings["InsaneJournal password"] = "Parolă InsaneJournal ";
+$a->strings["Post to InsaneJournal by default"] = "Postați implicit pe InsaneJournal ";
+$a->strings["Submit"] = "Trimite";
diff --git a/ijpost/lang/ru/messages.po b/ijpost/lang/ru/messages.po
deleted file mode 100644
index 00211299..00000000
--- a/ijpost/lang/ru/messages.po
+++ /dev/null
@@ -1,44 +0,0 @@
-# ADDON ijpost
-# Copyright (C)
-# This file is distributed under the same license as the Friendica ijpost addon package.
-# 
-# 
-# Translators:
-# Alexander An <ravnina@gmail.com>, 2022
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:17-0500\n"
-"PO-Revision-Date: 2014-06-23 08:37+0000\n"
-"Last-Translator: Alexander An <ravnina@gmail.com>, 2022\n"
-"Language-Team: Russian (http://www.transifex.com/Friendica/friendica/language/ru/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ru\n"
-"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
-
-#: ijpost.php:42
-msgid "Post to Insanejournal"
-msgstr "Отправить в Insanejournal"
-
-#: ijpost.php:61
-msgid "Enable InsaneJournal Post Addon"
-msgstr "Включить дополнение для InsaneJournal"
-
-#: ijpost.php:62
-msgid "InsaneJournal username"
-msgstr "Имя пользователя InsaneJournal"
-
-#: ijpost.php:63
-msgid "InsaneJournal password"
-msgstr "Пароль в InsaneJournal"
-
-#: ijpost.php:64
-msgid "Post to InsaneJournal by default"
-msgstr "Отправлять записи в InsaneJournal по-умолчанию"
-
-#: ijpost.php:69
-msgid "InsaneJournal Export"
-msgstr "Экспорт InsaneJournal"
diff --git a/ijpost/lang/ru/strings.php b/ijpost/lang/ru/strings.php
index ac1f4df9..dc869896 100644
--- a/ijpost/lang/ru/strings.php
+++ b/ijpost/lang/ru/strings.php
@@ -1,13 +1,9 @@
-<?php
-
-if(! function_exists("string_plural_select_ru")) {
-function string_plural_select_ru($n){
-	$n = intval($n);
-	if ($n%10==1 && $n%100!=11) { return 0; } else if ($n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14)) { return 1; } else if ($n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)) { return 2; } else  { return 3; }
-}}
-$a->strings['Post to Insanejournal'] = 'Отправить в Insanejournal';
-$a->strings['Enable InsaneJournal Post Addon'] = 'Включить дополнение для InsaneJournal';
-$a->strings['InsaneJournal username'] = 'Имя пользователя InsaneJournal';
-$a->strings['InsaneJournal password'] = 'Пароль в InsaneJournal';
-$a->strings['Post to InsaneJournal by default'] = 'Отправлять записи в InsaneJournal по-умолчанию';
-$a->strings['InsaneJournal Export'] = 'Экспорт InsaneJournal';
+<?php
+
+$a->strings["Post to Insanejournal"] = "";
+$a->strings["InsaneJournal Post Settings"] = "";
+$a->strings["Enable InsaneJournal Post Addon"] = "Включить InsaneJournal  плагин сообщений";
+$a->strings["InsaneJournal username"] = "";
+$a->strings["InsaneJournal password"] = "";
+$a->strings["Post to InsaneJournal by default"] = "";
+$a->strings["Submit"] = "Подтвердить";
diff --git a/ijpost/lang/sv/messages.po b/ijpost/lang/sv/messages.po
deleted file mode 100644
index 02ad9c7a..00000000
--- a/ijpost/lang/sv/messages.po
+++ /dev/null
@@ -1,44 +0,0 @@
-# ADDON ijpost
-# Copyright (C)
-# This file is distributed under the same license as the Friendica ijpost addon package.
-# 
-# 
-# Translators:
-# Kristoffer Grundström <lovaren@gmail.com>, 2022
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:17-0500\n"
-"PO-Revision-Date: 2022-01-16 00:35+0000\n"
-"Last-Translator: Kristoffer Grundström <lovaren@gmail.com>\n"
-"Language-Team: Swedish (http://www.transifex.com/Friendica/friendica/language/sv/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: sv\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: ijpost.php:42
-msgid "Post to Insanejournal"
-msgstr ""
-
-#: ijpost.php:61
-msgid "Enable InsaneJournal Post Addon"
-msgstr ""
-
-#: ijpost.php:62
-msgid "InsaneJournal username"
-msgstr "Användarnamn för InsaneJournal"
-
-#: ijpost.php:63
-msgid "InsaneJournal password"
-msgstr "Lösenord för InsaneJournal"
-
-#: ijpost.php:64
-msgid "Post to InsaneJournal by default"
-msgstr ""
-
-#: ijpost.php:69
-msgid "InsaneJournal Export"
-msgstr ""
diff --git a/ijpost/lang/sv/strings.php b/ijpost/lang/sv/strings.php
index 132ff892..3ec569a7 100644
--- a/ijpost/lang/sv/strings.php
+++ b/ijpost/lang/sv/strings.php
@@ -1,9 +1,3 @@
-<?php
-
-if(! function_exists("string_plural_select_sv")) {
-function string_plural_select_sv($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['InsaneJournal username'] = 'Användarnamn för InsaneJournal';
-$a->strings['InsaneJournal password'] = 'Lösenord för InsaneJournal';
+<?php
+
+$a->strings["Submit"] = "Spara";
diff --git a/ijpost/templates/connector_settings.tpl b/ijpost/templates/connector_settings.tpl
deleted file mode 100644
index 0abcd24e..00000000
--- a/ijpost/templates/connector_settings.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-{{include file="field_checkbox.tpl" field=$enabled}}
-{{include file="field_input.tpl" field=$username}}
-{{include file="field_password.tpl" field=$password}}
-{{include file="field_checkbox.tpl" field=$bydefault}}
diff --git a/impressum/README.md b/impressum/README.md
index 52034008..ca78d9a0 100644
--- a/impressum/README.md
+++ b/impressum/README.md
@@ -16,16 +16,14 @@ Simply fill in the fields in the impressium settings page in the addons area of
 
 Manual Configuration
 --------------------
-If you for any reason you prefer to use a configuration file instead, you can set the following variables in the `config/impressum.config.php` file
+If you for any reason you prefer to use a configuration file instead, you can set the following variables in the `config/addon.config.php` file
 
-	return [
-		'impressum' => [
-			'owner' => '',           // This is the Name of the Operator
-			'ownerprofile' => '',    // This is an optional Friendica account where the above owner name will link to
-			'email' => '',           // A contact email address (optional)
-									 // Will be displayed slightly obfuscated as name(at)example(dot)com
-			'postal' => '',          // Should contain a postal address where you can be reached at (optional)
-			'notes' => '',           // Additional informations that should be displayed in the Impressum block
-			'footer_text' => '',     // Text that will be displayed at the bottom of the pages.
-		],
-	];
+	'impressum' => [
+        'owner' => '',           This is the Name of the Operator
+        'ownerprofile' => '',    This is an optional Friendica account where the above owner name will link to
+        'email' => '',           A contact email address (optional)
+                                 Will be displayed slightly obfuscated as name(at)example(dot)com
+        'postal' => '',          Should contain a postal address where you can be reached at (optional)
+        'notes' => '',           Additional informations that should be displayed in the Impressum block
+        'footer_text' => '',     Text that will be displayed at the bottom of the pages.
+    ],
diff --git a/impressum/config/impressum.config.php b/impressum/config/impressum.config.php
index b4de4f37..9fe672fc 100644
--- a/impressum/config/impressum.config.php
+++ b/impressum/config/impressum.config.php
@@ -1,7 +1,7 @@
 <?php
 
 // Warning: Don't change this file! It only holds the default config values for this addon.
-// Instead, copy this file to config/impressum.config.php in your Friendica directory and set the correct values there
+// Instead overwrite these config values in config/addon.config.php in your Friendica directory
 
 return [
 	'impressum' => [
diff --git a/impressum/impressum.php b/impressum/impressum.php
index 754cb828..dc5d3552 100644
--- a/impressum/impressum.php
+++ b/impressum/impressum.php
@@ -7,111 +7,110 @@
  * License: 3-clause BSD license
  */
 
-use Friendica\App;
 use Friendica\Content\Text\BBCode;
+use Friendica\Core\Config;
 use Friendica\Core\Hook;
+use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
-use Friendica\DI;
-use Friendica\Core\Config\Util\ConfigFileManager;
-use Friendica\Model\User;
+use Friendica\Util\ConfigFileLoader;
+use Friendica\Util\Proxy as ProxyUtils;
+use Friendica\Util\Strings;
 
-function impressum_install()
-{
+function impressum_install() {
 	Hook::register('load_config', 'addon/impressum/impressum.php', 'impressum_load_config');
-	Hook::register('about_hook', 'addon/impressum/impressum.php', 'impressum_show');
-	Hook::register('page_end', 'addon/impressum/impressum.php', 'impressum_footer');
-	Logger::notice("installed impressum Addon");
+    Hook::register('about_hook', 'addon/impressum/impressum.php', 'impressum_show');
+    Hook::register('page_end', 'addon/impressum/impressum.php', 'impressum_footer');
+    Logger::log("installed impressum Addon");
 }
 
-/**
- * This is a statement rather than an actual function definition. The simple
- * existence of this method is checked to figure out if the addon offers a
- * module.
- */
-function impressum_module() {}
+function impressum_uninstall() {
+	Hook::unregister('load_config', 'addon/impressum/impressum.php', 'impressum_load_config');
+    Hook::unregister('about_hook', 'addon/impressum/impressum.php', 'impressum_show');
+    Hook::unregister('page_end', 'addon/impressum/impressum.php', 'impressum_footer');
+    Logger::log("uninstalled impressum Addon");
+}
 
-function impressum_content()
+function impressum_module() {
+}
+function impressum_content() {
+    $a = \get_app();
+    $a->internalRedirect('friendica/');
+}
+
+function obfuscate_email ($s) {
+    $s = str_replace('@','(at)',$s);
+    $s = str_replace('.','(dot)',$s);
+    return $s;
+}
+function impressum_footer($a, &$b) {
+    $text = ProxyUtils::proxifyHtml(BBCode::convert(Config::get('impressum','footer_text')));
+
+    if (! $text == '') {
+        $a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="'.$a->getBaseURL().'/addon/impressum/impressum.css" media="all" />';
+        $b .= '<div class="clear"></div>';
+        $b .= '<div id="impressum_footer">'.$text.'</div>';
+    }
+}
+
+function impressum_load_config(\Friendica\App $a, ConfigFileLoader $loader)
 {
-	DI::baseUrl()->redirect('friendica/');
+	$a->getConfigCache()->load($loader->loadAddonConfig('impressum'));
 }
 
-function obfuscate_email (string $s): string
-{
-	$s = str_replace('@', '(at)', $s);
-	$s = str_replace('.', '(dot)', $s);
-	return $s;
+function impressum_show($a,&$b) {
+    $b .= '<h3>'.L10n::t('Impressum').'</h3>';
+    $owner = Config::get('impressum', 'owner');
+    $owner_profile = Config::get('impressum','ownerprofile');
+    $postal = ProxyUtils::proxifyHtml(BBCode::convert(Config::get('impressum', 'postal')));
+    $notes = ProxyUtils::proxifyHtml(BBCode::convert(Config::get('impressum', 'notes')));
+    $email = obfuscate_email( Config::get('impressum','email') );
+    if (strlen($owner)) {
+        if (strlen($owner_profile)) {
+            $tmp = '<a href="'.$owner_profile.'">'.$owner.'</a>';
+        } else {
+            $tmp = $owner;
+        }
+        if (strlen($email)) {
+            $b .= '<p><strong>'.L10n::t('Site Owner').'</strong>: '. $tmp .'<br /><strong>'.L10n::t('Email Address').'</strong>: '.$email.'</p>';
+        } else {
+            $b .= '<p><strong>'.L10n::t('Site Owner').'</strong>: '. $tmp .'</p>';
+        }
+        if (strlen($postal)) {
+            $b .= '<p><strong>'.L10n::t('Postal Address').'</strong><br />'. $postal .'</p>';
+        }
+        if (strlen($notes)) {
+            $b .= '<p>'.$notes.'</p>';
+        }
+    } else {
+        $b .= '<p>'.L10n::t('The impressum addon needs to be configured!<br />Please add at least the <tt>owner</tt> variable to your config file. For other variables please refer to the README file of the addon.').'</p>';
+    }
 }
 
-function impressum_footer(string &$body)
-{
-	$text = BBCode::convertForUriId(User::getSystemUriId(), DI::config()->get('impressum', 'footer_text'));
-
-	if ($text != '') {
-		DI::page()['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="' . DI::baseUrl() . '/addon/impressum/impressum.css" media="all" />';
-		$body .= '<div class="clear"></div>';
-		$body .= '<div id="impressum_footer">' . $text . '</div>';
-	}
+function impressum_addon_admin_post (&$a) {
+    $owner = (!empty($_POST['owner']) ? Strings::escapeTags(trim($_POST['owner'])) : '');
+    $ownerprofile = (!empty($_POST['ownerprofile']) ? Strings::escapeTags(trim($_POST['ownerprofile'])) : '');
+    $postal = (!empty($_POST['postal']) ? (trim($_POST['postal'])) : '');
+    $notes = (!empty($_POST['notes']) ? (trim($_POST['notes'])) : '');
+    $email = (!empty($_POST['email']) ? Strings::escapeTags(trim($_POST['email'])) : '');
+    $footer_text = (!empty($_POST['footer_text']) ? (trim($_POST['footer_text'])) : '');
+    Config::set('impressum','owner',strip_tags($owner));
+    Config::set('impressum','ownerprofile',strip_tags($ownerprofile));
+    Config::set('impressum','postal',strip_tags($postal));
+    Config::set('impressum','email',strip_tags($email));
+    Config::set('impressum','notes',strip_tags($notes));
+    Config::set('impressum','footer_text',strip_tags($footer_text));
+    info(L10n::t('Settings updated.'). EOL );
 }
-
-function impressum_load_config(ConfigFileManager $loader)
-{
-	DI::app()->getConfigCache()->load($loader->loadAddonConfig('impressum'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
-}
-
-function impressum_show(string &$body)
-{
-	$body          .= '<h3>' . DI::l10n()->t('Impressum') . '</h3>';
-	$owner         = DI::config()->get('impressum', 'owner');
-	$owner_profile = DI::config()->get('impressum', 'ownerprofile');
-	$postal        = BBCode::convertForUriId(User::getSystemUriId(), DI::config()->get('impressum', 'postal'));
-	$notes         = BBCode::convertForUriId(User::getSystemUriId(), DI::config()->get('impressum', 'notes'));
-
-	if ($owner) {
-		if ($owner_profile) {
-			$tmp = '<a href="' . $owner_profile . '">' . $owner . '</a>';
-		} else {
-			$tmp = $owner;
-		}
-
-		if ($email = DI::config()->get('impressum', 'email')) {
-			$body .= '<p><strong>' . DI::l10n()->t('Site Owner').'</strong>: ' . $tmp .'<br /><strong>' . DI::l10n()->t('Email Address') . '</strong>: ' . obfuscate_email($email) . '</p>';
-		} else {
-			$body .= '<p><strong>' . DI::l10n()->t('Site Owner').'</strong>: ' . $tmp .'</p>';
-		}
-
-		if ($postal) {
-			$body .= '<p><strong>' . DI::l10n()->t('Postal Address') . '</strong><br />' . $postal . '</p>';
-		}
-
-		if ($notes) {
-			$body .= '<p>' . $notes . '</p>';
-		}
-	} else {
-		$body .= '<p>' . DI::l10n()->t('The impressum addon needs to be configured!<br />Please add at least the <tt>owner</tt> variable to your config file. For other variables please refer to the README file of the addon.') . '</p>';
-	}
-}
-
-function impressum_addon_admin_post ()
-{
-	DI::config()->set('impressum', 'owner', strip_tags(trim($_POST['owner'] ?? '')));
-	DI::config()->set('impressum', 'ownerprofile', strip_tags(trim($_POST['ownerprofile'] ?? '')));
-	DI::config()->set('impressum', 'postal', strip_tags(trim($_POST['postal'] ?? '')));
-	DI::config()->set('impressum', 'email', strip_tags(trim($_POST['email'] ?? '')));
-	DI::config()->set('impressum', 'notes', strip_tags(trim($_POST['notes'] ?? '')));
-	DI::config()->set('impressum', 'footer_text', strip_tags(trim($_POST['footer_text'] ?? '')));
-}
-
-function impressum_addon_admin (string &$o)
-{
-	$t = Renderer::getMarkupTemplate('admin.tpl', 'addon/impressum/' );
-	$o = Renderer::replaceMacros($t, [
-		'$submit' => DI::l10n()->t('Save Settings'),
-		'$owner' => ['owner', DI::l10n()->t('Site Owner'), DI::config()->get('impressum','owner'), DI::l10n()->t('The page operators name.')],
-		'$ownerprofile' => ['ownerprofile', DI::l10n()->t('Site Owners Profile'), DI::config()->get('impressum','ownerprofile'), DI::l10n()->t('Profile address of the operator.')],
-		'$postal' => ['postal', DI::l10n()->t('Postal Address'), DI::config()->get('impressum','postal'), DI::l10n()->t('How to contact the operator via snail mail. You can use BBCode here.')],
-		'$notes' => ['notes', DI::l10n()->t('Notes'), DI::config()->get('impressum','notes'), DI::l10n()->t('Additional notes that are displayed beneath the contact information. You can use BBCode here.')],
-		'$email' => ['email', DI::l10n()->t('Email Address'), DI::config()->get('impressum','email'), DI::l10n()->t('How to contact the operator via email. (will be displayed obfuscated)')],
-		'$footer_text' => ['footer_text', DI::l10n()->t('Footer note'), DI::config()->get('impressum','footer_text'), DI::l10n()->t('Text for the footer. You can use BBCode here.')],
-	]);
+function impressum_addon_admin (&$a, &$o) {
+    $t = Renderer::getMarkupTemplate( "admin.tpl", "addon/impressum/" );
+    $o = Renderer::replaceMacros($t, [
+        '$submit' => L10n::t('Save Settings'),
+        '$owner' => ['owner', L10n::t('Site Owner'), Config::get('impressum','owner'), L10n::t('The page operators name.')],
+        '$ownerprofile' => ['ownerprofile', L10n::t('Site Owners Profile'), Config::get('impressum','ownerprofile'), L10n::t('Profile address of the operator.')],
+        '$postal' => ['postal', L10n::t('Postal Address'), Config::get('impressum','postal'), L10n::t('How to contact the operator via snail mail. You can use BBCode here.')],
+        '$notes' => ['notes', L10n::t('Notes'), Config::get('impressum','notes'), L10n::t('Additional notes that are displayed beneath the contact information. You can use BBCode here.')],
+        '$email' => ['email', L10n::t('Email Address'), Config::get('impressum','email'), L10n::t('How to contact the operator via email. (will be displayed obfuscated)')],
+        '$footer_text' => ['footer_text', L10n::t('Footer note'), Config::get('impressum','footer_text'), L10n::t('Text for the footer. You can use BBCode here.')],
+    ]);
 }
diff --git a/impressum/lang/C/messages.po b/impressum/lang/C/messages.po
index a1ca6659..0700e210 100644
--- a/impressum/lang/C/messages.po
+++ b/impressum/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,67 +17,71 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: impressum.php:53
+#: impressum.php:37
 msgid "Impressum"
 msgstr ""
 
-#: impressum.php:66 impressum.php:68 impressum.php:99
+#: impressum.php:50 impressum.php:52 impressum.php:84
 msgid "Site Owner"
 msgstr ""
 
-#: impressum.php:66 impressum.php:103
+#: impressum.php:50 impressum.php:88
 msgid "Email Address"
 msgstr ""
 
-#: impressum.php:71 impressum.php:101
+#: impressum.php:55 impressum.php:86
 msgid "Postal Address"
 msgstr ""
 
-#: impressum.php:77
+#: impressum.php:61
 msgid ""
 "The impressum addon needs to be configured!<br />Please add at least the "
 "<tt>owner</tt> variable to your config file. For other variables please "
 "refer to the README file of the addon."
 msgstr ""
 
-#: impressum.php:98
-msgid "Save Settings"
+#: impressum.php:78
+msgid "Settings updated."
 msgstr ""
 
-#: impressum.php:99
+#: impressum.php:83
+msgid "Submit"
+msgstr ""
+
+#: impressum.php:84
 msgid "The page operators name."
 msgstr ""
 
-#: impressum.php:100
+#: impressum.php:85
 msgid "Site Owners Profile"
 msgstr ""
 
-#: impressum.php:100
+#: impressum.php:85
 msgid "Profile address of the operator."
 msgstr ""
 
-#: impressum.php:101
+#: impressum.php:86
 msgid "How to contact the operator via snail mail. You can use BBCode here."
 msgstr ""
 
-#: impressum.php:102
+#: impressum.php:87
 msgid "Notes"
 msgstr ""
 
-#: impressum.php:102
+#: impressum.php:87
 msgid ""
 "Additional notes that are displayed beneath the contact information. You can "
 "use BBCode here."
 msgstr ""
 
-#: impressum.php:103
+#: impressum.php:88
 msgid "How to contact the operator via email. (will be displayed obfuscated)"
 msgstr ""
 
-#: impressum.php:104
+#: impressum.php:89
 msgid "Footer note"
 msgstr ""
 
-#: impressum.php:104
+#: impressum.php:89
 msgid "Text for the footer. You can use BBCode here."
 msgstr ""
diff --git a/impressum/lang/ar/messages.po b/impressum/lang/ar/messages.po
deleted file mode 100644
index 06fc106b..00000000
--- a/impressum/lang/ar/messages.po
+++ /dev/null
@@ -1,85 +0,0 @@
-# ADDON impressum
-# Copyright (C)
-# This file is distributed under the same license as the Friendica impressum addon package.
-# 
-# 
-# Translators:
-# Farida Khalaf <faridakhalaf@hotmail.com>, 2021
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2021-02-21 18:31+0000\n"
-"Last-Translator: Farida Khalaf <faridakhalaf@hotmail.com>\n"
-"Language-Team: Arabic (http://www.transifex.com/Friendica/friendica/language/ar/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ar\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-
-#: impressum.php:53
-msgid "Impressum"
-msgstr "تحرير"
-
-#: impressum.php:66 impressum.php:68 impressum.php:99
-msgid "Site Owner"
-msgstr "مالك الموقع"
-
-#: impressum.php:66 impressum.php:103
-msgid "Email Address"
-msgstr "البريد الالكتروني"
-
-#: impressum.php:71 impressum.php:101
-msgid "Postal Address"
-msgstr "العنوان البريدي"
-
-#: impressum.php:77
-msgid ""
-"The impressum addon needs to be configured!<br />Please add at least the "
-"<tt>owner</tt> variable to your config file. For other variables please "
-"refer to the README file of the addon."
-msgstr "يجب تكوين ملحق تحرير. <br />الرجاء إضافة <tt> المالك </tt>على الأقل إلى ملف التكوين المتغير الخاص بك. بالنسبة للمتغيرات الأخرى ، يرجى الرجوع إلى ملف README الخاص بالملحق"
-
-#: impressum.php:98
-msgid "Save Settings"
-msgstr "Save Settings"
-
-#: impressum.php:99
-msgid "The page operators name."
-msgstr "اسم مشغلي الصفحة."
-
-#: impressum.php:100
-msgid "Site Owners Profile"
-msgstr "الملف الشخصي لمالك الموقع"
-
-#: impressum.php:100
-msgid "Profile address of the operator."
-msgstr "عنوان مشغلي الصفحة."
-
-#: impressum.php:101
-msgid "How to contact the operator via snail mail. You can use BBCode here."
-msgstr "كيفية الاتصال بالمشغل عبر البريد العادي. يمكنك استخدام BBCode هنا."
-
-#: impressum.php:102
-msgid "Notes"
-msgstr "ملاحظات"
-
-#: impressum.php:102
-msgid ""
-"Additional notes that are displayed beneath the contact information. You can"
-" use BBCode here."
-msgstr "الملاحظات الإضافية المعروضة أسفل معلومات الاتصال. يمكنك استخدام BBCode هنا"
-
-#: impressum.php:103
-msgid "How to contact the operator via email. (will be displayed obfuscated)"
-msgstr "كيفية الاتصال بالمشغل عبر البريد الإلكتروني. (سيتم عرضه معتم)"
-
-#: impressum.php:104
-msgid "Footer note"
-msgstr "ملاحظة التذييل"
-
-#: impressum.php:104
-msgid "Text for the footer. You can use BBCode here."
-msgstr "نص التذييل. يمكنك استخدام BBCode هنا."
diff --git a/impressum/lang/ar/strings.php b/impressum/lang/ar/strings.php
deleted file mode 100644
index f9feb3f4..00000000
--- a/impressum/lang/ar/strings.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_ar")) {
-function string_plural_select_ar($n){
-	$n = intval($n);
-	if ($n==0) { return 0; } else if ($n==1) { return 1; } else if ($n==2) { return 2; } else if ($n%100>=3 && $n%100<=10) { return 3; } else if ($n%100>=11 && $n%100<=99) { return 4; } else  { return 5; }
-}}
-$a->strings['Impressum'] = 'تحرير';
-$a->strings['Site Owner'] = 'مالك الموقع';
-$a->strings['Email Address'] = 'البريد الالكتروني';
-$a->strings['Postal Address'] = 'العنوان البريدي';
-$a->strings['The impressum addon needs to be configured!<br />Please add at least the <tt>owner</tt> variable to your config file. For other variables please refer to the README file of the addon.'] = 'يجب تكوين ملحق تحرير. <br />الرجاء إضافة <tt> المالك </tt>على الأقل إلى ملف التكوين المتغير الخاص بك. بالنسبة للمتغيرات الأخرى ، يرجى الرجوع إلى ملف README الخاص بالملحق';
-$a->strings['Save Settings'] = 'Save Settings';
-$a->strings['The page operators name.'] = 'اسم مشغلي الصفحة.';
-$a->strings['Site Owners Profile'] = 'الملف الشخصي لمالك الموقع';
-$a->strings['Profile address of the operator.'] = 'عنوان مشغلي الصفحة.';
-$a->strings['How to contact the operator via snail mail. You can use BBCode here.'] = 'كيفية الاتصال بالمشغل عبر البريد العادي. يمكنك استخدام BBCode هنا.';
-$a->strings['Notes'] = 'ملاحظات';
-$a->strings['Additional notes that are displayed beneath the contact information. You can use BBCode here.'] = 'الملاحظات الإضافية المعروضة أسفل معلومات الاتصال. يمكنك استخدام BBCode هنا';
-$a->strings['How to contact the operator via email. (will be displayed obfuscated)'] = 'كيفية الاتصال بالمشغل عبر البريد الإلكتروني. (سيتم عرضه معتم)';
-$a->strings['Footer note'] = 'ملاحظة التذييل';
-$a->strings['Text for the footer. You can use BBCode here.'] = 'نص التذييل. يمكنك استخدام BBCode هنا.';
diff --git a/impressum/lang/ca/strings.php b/impressum/lang/ca/strings.php
index 64334152..2f2e59e2 100644
--- a/impressum/lang/ca/strings.php
+++ b/impressum/lang/ca/strings.php
@@ -3,21 +3,22 @@
 if(! function_exists("string_plural_select_ca")) {
 function string_plural_select_ca($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Impressum'] = 'empremta';
-$a->strings['Site Owner'] = 'Propietari del lloc';
-$a->strings['Email Address'] = 'Correu electrònic';
-$a->strings['Postal Address'] = 'Adreça postal';
-$a->strings['The impressum addon needs to be configured!<br />Please add at least the <tt>owner</tt> variable to your config file. For other variables please refer to the README file of the addon.'] = 'Cal configurar l’addon impressum<br />Afegiu com a mínim la secció <tt>owner</tt> variable del fitxer de configuració. Per a altres variables, consulteu el fitxer README de l’adjunció.';
-$a->strings['Settings updated.'] = 'La configuració s\'ha actualitzat.';
-$a->strings['Submit'] = 'sotmetre\'s';
-$a->strings['The page operators name.'] = 'El nom dels operadors de pàgina.';
-$a->strings['Site Owners Profile'] = 'Perfil dels propietaris del lloc';
-$a->strings['Profile address of the operator.'] = 'Adreça del perfil de l\'operador.';
-$a->strings['How to contact the operator via snail mail. You can use BBCode here.'] = 'Com contactar amb l\'operador mitjançant correu cargol. Podeu utilitzar BBCode aquí.';
-$a->strings['Notes'] = 'nota';
-$a->strings['Additional notes that are displayed beneath the contact information. You can use BBCode here.'] = 'Notes addicionals que es mostren a sota de la informació de contacte. Podeu utilitzar BBCode aquí.';
-$a->strings['How to contact the operator via email. (will be displayed obfuscated)'] = 'Com contactar amb l\'operador per correu electrònic. (es mostrarà ofuscat)';
-$a->strings['Footer note'] = 'Nota de peu de pàgina';
-$a->strings['Text for the footer. You can use BBCode here.'] = 'Text for the footer. You can use BBCode here.';
+;
+$a->strings["Impressum"] = "empremta";
+$a->strings["Site Owner"] = "Propietari del lloc";
+$a->strings["Email Address"] = "Correu electrònic";
+$a->strings["Postal Address"] = "Adreça postal";
+$a->strings["The impressum addon needs to be configured!<br />Please add at least the <tt>owner</tt> variable to your config file. For other variables please refer to the README file of the addon."] = "Cal configurar l’addon impressum<br />Afegiu com a mínim la secció <tt>owner</tt> variable del fitxer de configuració. Per a altres variables, consulteu el fitxer README de l’adjunció.";
+$a->strings["Settings updated."] = "La configuració s'ha actualitzat.";
+$a->strings["Submit"] = "sotmetre's";
+$a->strings["The page operators name."] = "El nom dels operadors de pàgina.";
+$a->strings["Site Owners Profile"] = "Perfil dels propietaris del lloc";
+$a->strings["Profile address of the operator."] = "Adreça del perfil de l'operador.";
+$a->strings["How to contact the operator via snail mail. You can use BBCode here."] = "Com contactar amb l'operador mitjançant correu cargol. Podeu utilitzar BBCode aquí.";
+$a->strings["Notes"] = "nota";
+$a->strings["Additional notes that are displayed beneath the contact information. You can use BBCode here."] = "Notes addicionals que es mostren a sota de la informació de contacte. Podeu utilitzar BBCode aquí.";
+$a->strings["How to contact the operator via email. (will be displayed obfuscated)"] = "Com contactar amb l'operador per correu electrònic. (es mostrarà ofuscat)";
+$a->strings["Footer note"] = "Nota de peu de pàgina";
+$a->strings["Text for the footer. You can use BBCode here."] = "Text for the footer. You can use BBCode here.";
diff --git a/impressum/lang/cs/strings.php b/impressum/lang/cs/strings.php
index e26ada45..9e49b43a 100644
--- a/impressum/lang/cs/strings.php
+++ b/impressum/lang/cs/strings.php
@@ -3,21 +3,22 @@
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
 	$n = intval($n);
-	if (($n == 1 && $n % 1 == 0)) { return 0; } else if (($n >= 2 && $n <= 4 && $n % 1 == 0)) { return 1; } else if (($n % 1 != 0 )) { return 2; } else  { return 3; }
+	return ($n == 1 && $n % 1 == 0) ? 0 : ($n >= 2 && $n <= 4 && $n % 1 == 0) ? 1: ($n % 1 != 0 ) ? 2 : 3;;
 }}
-$a->strings['Impressum'] = 'Impressum';
-$a->strings['Site Owner'] = 'Majitel webu';
-$a->strings['Email Address'] = 'E-mailová adresa';
-$a->strings['Postal Address'] = 'Poštovní adresa';
-$a->strings['The impressum addon needs to be configured!<br />Please add at least the <tt>owner</tt> variable to your config file. For other variables please refer to the README file of the addon.'] = 'Doplněk Impressum musí být nakonfigurován!<br />Prosím, přidejte alespoň proměnnou <tt>owner</tt> do konfiguračního souboru. Pro nastavení ostatních proměnných se seznamte s nápovědou v souboru README tohoto doplňku.';
-$a->strings['Settings updated.'] = 'Nastavení aktualizována.';
-$a->strings['Submit'] = 'Odeslat';
-$a->strings['The page operators name.'] = 'Jméno operátora stránky.';
-$a->strings['Site Owners Profile'] = 'Profil majitele webu';
-$a->strings['Profile address of the operator.'] = 'Profilová adresa operátora.';
-$a->strings['How to contact the operator via snail mail. You can use BBCode here.'] = 'Jak kontaktovat operátora prostřednictvím klasické pošty. Zde můžete použít BBCode.';
-$a->strings['Notes'] = 'Poznámky';
-$a->strings['Additional notes that are displayed beneath the contact information. You can use BBCode here.'] = 'Další poznámky, které jsou zobrazeny pod kontaktními informacemi. Zde můžete použít BBCode.';
-$a->strings['How to contact the operator via email. (will be displayed obfuscated)'] = 'Jak konktaktovat operátora přes mail. (bude zobrazeno "obfuskovaně")';
-$a->strings['Footer note'] = 'Poznámka v zápatí';
-$a->strings['Text for the footer. You can use BBCode here.'] = 'Text pro zápatí. Zde můžete použít BBCode.';
+;
+$a->strings["Impressum"] = "Impressum";
+$a->strings["Site Owner"] = "Majitel webu";
+$a->strings["Email Address"] = "E-mailová adresa";
+$a->strings["Postal Address"] = "Poštovní adresa";
+$a->strings["The impressum addon needs to be configured!<br />Please add at least the <tt>owner</tt> variable to your config file. For other variables please refer to the README file of the addon."] = "Doplněk Impressum musí být nakonfigurován!<br />Prosím, přidejte alespoň proměnnou <tt>owner</tt> do konfiguračního souboru. Pro nastavení ostatních proměnných se seznamte s nápovědou v souboru README tohoto doplňku.";
+$a->strings["Settings updated."] = "Nastavení aktualizována.";
+$a->strings["Submit"] = "Odeslat";
+$a->strings["The page operators name."] = "Jméno operátora stránky.";
+$a->strings["Site Owners Profile"] = "Profil majitele webu";
+$a->strings["Profile address of the operator."] = "Profilová adresa operátora.";
+$a->strings["How to contact the operator via snail mail. You can use BBCode here."] = "Jak kontaktovat operátora prostřednictvím klasické pošty. Zde můžete použít BBCode.";
+$a->strings["Notes"] = "Poznámky";
+$a->strings["Additional notes that are displayed beneath the contact information. You can use BBCode here."] = "Další poznámky, které jsou zobrazeny pod kontaktními informacemi. Zde můžete použít BBCode.";
+$a->strings["How to contact the operator via email. (will be displayed obfuscated)"] = "Jak konktaktovat operátora přes mail. (bude zobrazeno \"obfuskovaně\")";
+$a->strings["Footer note"] = "Poznámka v zápatí";
+$a->strings["Text for the footer. You can use BBCode here."] = "Text pro zápatí. Zde můžete použít BBCode.";
diff --git a/impressum/lang/da-dk/messages.po b/impressum/lang/da-dk/messages.po
deleted file mode 100644
index e704e78a..00000000
--- a/impressum/lang/da-dk/messages.po
+++ /dev/null
@@ -1,85 +0,0 @@
-# ADDON impressum
-# Copyright (C)
-# This file is distributed under the same license as the Friendica impressum addon package.
-# 
-# 
-# Translators:
-# Anton <dev@atjn.dk>, 2022
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2014-06-23 08:39+0000\n"
-"Last-Translator: Anton <dev@atjn.dk>, 2022\n"
-"Language-Team: Danish (Denmark) (http://www.transifex.com/Friendica/friendica/language/da_DK/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: da_DK\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: impressum.php:53
-msgid "Impressum"
-msgstr "Indtryk"
-
-#: impressum.php:66 impressum.php:68 impressum.php:99
-msgid "Site Owner"
-msgstr "Sideejer"
-
-#: impressum.php:66 impressum.php:103
-msgid "Email Address"
-msgstr "Email-adresse"
-
-#: impressum.php:71 impressum.php:101
-msgid "Postal Address"
-msgstr "Postadresse"
-
-#: impressum.php:77
-msgid ""
-"The impressum addon needs to be configured!<br />Please add at least the "
-"<tt>owner</tt> variable to your config file. For other variables please "
-"refer to the README file of the addon."
-msgstr "Indtryk-tilføjelsen skal konfigureres!<br />Tilføj venligst som det allermindste <tt>owner</tt> (sideejer) variablen til din konfigurationsfil. For andre variabler, referer venligst til tilføjelsens README fil."
-
-#: impressum.php:98
-msgid "Save Settings"
-msgstr "Gem indstillinger"
-
-#: impressum.php:99
-msgid "The page operators name."
-msgstr "Sideoperatorens navn."
-
-#: impressum.php:100
-msgid "Site Owners Profile"
-msgstr "Sideejerens profil"
-
-#: impressum.php:100
-msgid "Profile address of the operator."
-msgstr "Operatorens profiladresse."
-
-#: impressum.php:101
-msgid "How to contact the operator via snail mail. You can use BBCode here."
-msgstr "Hvordan man kan kontakte operatoren via sneglepost. Du kan bruge BBCode her."
-
-#: impressum.php:102
-msgid "Notes"
-msgstr "Noter"
-
-#: impressum.php:102
-msgid ""
-"Additional notes that are displayed beneath the contact information. You can"
-" use BBCode here."
-msgstr "Ekstra noter som er vist under kontaktinformationen. Du kan bruge BBCode her."
-
-#: impressum.php:103
-msgid "How to contact the operator via email. (will be displayed obfuscated)"
-msgstr "Hvordan man kan kontakte operatoren via email. (vil blive vist obfuskeret)"
-
-#: impressum.php:104
-msgid "Footer note"
-msgstr "Sidefodsnote"
-
-#: impressum.php:104
-msgid "Text for the footer. You can use BBCode here."
-msgstr "Tekst til sidefoden. Du kan bruge BBCode her."
diff --git a/impressum/lang/da-dk/strings.php b/impressum/lang/da-dk/strings.php
deleted file mode 100644
index 0e422524..00000000
--- a/impressum/lang/da-dk/strings.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_da_dk")) {
-function string_plural_select_da_dk($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Impressum'] = 'Indtryk';
-$a->strings['Site Owner'] = 'Sideejer';
-$a->strings['Email Address'] = 'Email-adresse';
-$a->strings['Postal Address'] = 'Postadresse';
-$a->strings['The impressum addon needs to be configured!<br />Please add at least the <tt>owner</tt> variable to your config file. For other variables please refer to the README file of the addon.'] = 'Indtryk-tilføjelsen skal konfigureres!<br />Tilføj venligst som det allermindste <tt>owner</tt> (sideejer) variablen til din konfigurationsfil. For andre variabler, referer venligst til tilføjelsens README fil.';
-$a->strings['Save Settings'] = 'Gem indstillinger';
-$a->strings['The page operators name.'] = 'Sideoperatorens navn.';
-$a->strings['Site Owners Profile'] = 'Sideejerens profil';
-$a->strings['Profile address of the operator.'] = 'Operatorens profiladresse.';
-$a->strings['How to contact the operator via snail mail. You can use BBCode here.'] = 'Hvordan man kan kontakte operatoren via sneglepost. Du kan bruge BBCode her.';
-$a->strings['Notes'] = 'Noter';
-$a->strings['Additional notes that are displayed beneath the contact information. You can use BBCode here.'] = 'Ekstra noter som er vist under kontaktinformationen. Du kan bruge BBCode her.';
-$a->strings['How to contact the operator via email. (will be displayed obfuscated)'] = 'Hvordan man kan kontakte operatoren via email. (vil blive vist obfuskeret)';
-$a->strings['Footer note'] = 'Sidefodsnote';
-$a->strings['Text for the footer. You can use BBCode here.'] = 'Tekst til sidefoden. Du kan bruge BBCode her.';
diff --git a/impressum/lang/de/messages.po b/impressum/lang/de/messages.po
index 9a51a73d..11d4a512 100644
--- a/impressum/lang/de/messages.po
+++ b/impressum/lang/de/messages.po
@@ -4,85 +4,87 @@
 # 
 # 
 # Translators:
-# Andreas H., 2014
-# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2014
-# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2021
-# Ulf Rompe <transifex.com@rompe.org>, 2019
+# Abrax <webmaster@a-zwenkau.de>, 2014
+# bavatar <tobias.diekershoff@gmx.net>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2014-06-23 08:39+0000\n"
-"Last-Translator: Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2021\n"
-"Language-Team: German (http://app.transifex.com/Friendica/friendica/language/de/)\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2014-10-15 12:29+0000\n"
+"Last-Translator: Abrax <webmaster@a-zwenkau.de>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/friendica/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: impressum.php:53
+#: impressum.php:37
 msgid "Impressum"
 msgstr "Impressum"
 
-#: impressum.php:66 impressum.php:68 impressum.php:99
+#: impressum.php:50 impressum.php:52 impressum.php:84
 msgid "Site Owner"
 msgstr "Betreiber der Seite"
 
-#: impressum.php:66 impressum.php:103
+#: impressum.php:50 impressum.php:88
 msgid "Email Address"
-msgstr "E-Mail-Adresse"
+msgstr "Email Adresse"
 
-#: impressum.php:71 impressum.php:101
+#: impressum.php:55 impressum.php:86
 msgid "Postal Address"
 msgstr "Postalische Anschrift"
 
-#: impressum.php:77
+#: impressum.php:61
 msgid ""
 "The impressum addon needs to be configured!<br />Please add at least the "
 "<tt>owner</tt> variable to your config file. For other variables please "
 "refer to the README file of the addon."
-msgstr "Das Impressums-Plugin muss noch konfiguriert werden.<br />Bitte gebe mindestens den <tt>Betreiber</tt> in der Konfiguration an. Alle weiteren Parameter werden in der README-Datei des Addons erläutert."
+msgstr "Das Impressums-Addon muss noch konfiguriert werden.<br />Bitte gebe mindestens den <tt>Betreiber</tt> in der Konfiguration an. Alle weiteren Parameter werden in der README-Datei des Addons erläutert."
 
-#: impressum.php:98
-msgid "Save Settings"
-msgstr "Einstellungen speichern"
+#: impressum.php:78
+msgid "Settings updated."
+msgstr "Einstellungen aktualisiert."
 
-#: impressum.php:99
+#: impressum.php:83
+msgid "Submit"
+msgstr "Senden"
+
+#: impressum.php:84
 msgid "The page operators name."
 msgstr "Name des Server-Administrators"
 
-#: impressum.php:100
+#: impressum.php:85
 msgid "Site Owners Profile"
 msgstr "Profil des Seitenbetreibers"
 
-#: impressum.php:100
+#: impressum.php:85
 msgid "Profile address of the operator."
 msgstr "Profil-Adresse des Server-Administrators"
 
-#: impressum.php:101
+#: impressum.php:86
 msgid "How to contact the operator via snail mail. You can use BBCode here."
 msgstr "Kontaktmöglichkeiten zum Administrator via Schneckenpost. Du kannst BBCode verwenden."
 
-#: impressum.php:102
+#: impressum.php:87
 msgid "Notes"
 msgstr "Hinweise"
 
-#: impressum.php:102
+#: impressum.php:87
 msgid ""
 "Additional notes that are displayed beneath the contact information. You can"
 " use BBCode here."
-msgstr "Zusätzliche Informationen, die neben den Kontaktmöglichkeiten angezeigt werden. Du kannst BBCode verwenden."
+msgstr "Zusätzliche Informationen die neben den Kontaktmöglichkeiten angezeigt werden. Du kannst BBCode verwenden."
 
-#: impressum.php:103
+#: impressum.php:88
 msgid "How to contact the operator via email. (will be displayed obfuscated)"
 msgstr "Wie man den Betreiber per Email erreicht. (Adresse wird verschleiert dargestellt)"
 
-#: impressum.php:104
+#: impressum.php:89
 msgid "Footer note"
 msgstr "Fußnote"
 
-#: impressum.php:104
+#: impressum.php:89
 msgid "Text for the footer. You can use BBCode here."
 msgstr "Text für die Fußzeile. Du kannst BBCode verwenden."
diff --git a/impressum/lang/de/strings.php b/impressum/lang/de/strings.php
index 4af5509f..0cf1a4ae 100644
--- a/impressum/lang/de/strings.php
+++ b/impressum/lang/de/strings.php
@@ -2,21 +2,22 @@
 
 if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Impressum'] = 'Impressum';
-$a->strings['Site Owner'] = 'Betreiber der Seite';
-$a->strings['Email Address'] = 'E-Mail-Adresse';
-$a->strings['Postal Address'] = 'Postalische Anschrift';
-$a->strings['The impressum addon needs to be configured!<br />Please add at least the <tt>owner</tt> variable to your config file. For other variables please refer to the README file of the addon.'] = 'Das Impressums-Plugin muss noch konfiguriert werden.<br />Bitte gebe mindestens den <tt>Betreiber</tt> in der Konfiguration an. Alle weiteren Parameter werden in der README-Datei des Addons erläutert.';
-$a->strings['Save Settings'] = 'Einstellungen speichern';
-$a->strings['The page operators name.'] = 'Name des Server-Administrators';
-$a->strings['Site Owners Profile'] = 'Profil des Seitenbetreibers';
-$a->strings['Profile address of the operator.'] = 'Profil-Adresse des Server-Administrators';
-$a->strings['How to contact the operator via snail mail. You can use BBCode here.'] = 'Kontaktmöglichkeiten zum Administrator via Schneckenpost. Du kannst BBCode verwenden.';
-$a->strings['Notes'] = 'Hinweise';
-$a->strings['Additional notes that are displayed beneath the contact information. You can use BBCode here.'] = 'Zusätzliche Informationen, die neben den Kontaktmöglichkeiten angezeigt werden. Du kannst BBCode verwenden.';
-$a->strings['How to contact the operator via email. (will be displayed obfuscated)'] = 'Wie man den Betreiber per Email erreicht. (Adresse wird verschleiert dargestellt)';
-$a->strings['Footer note'] = 'Fußnote';
-$a->strings['Text for the footer. You can use BBCode here.'] = 'Text für die Fußzeile. Du kannst BBCode verwenden.';
+;
+$a->strings["Impressum"] = "Impressum";
+$a->strings["Site Owner"] = "Betreiber der Seite";
+$a->strings["Email Address"] = "Email Adresse";
+$a->strings["Postal Address"] = "Postalische Anschrift";
+$a->strings["The impressum addon needs to be configured!<br />Please add at least the <tt>owner</tt> variable to your config file. For other variables please refer to the README file of the addon."] = "Das Impressums-Addon muss noch konfiguriert werden.<br />Bitte gebe mindestens den <tt>Betreiber</tt> in der Konfiguration an. Alle weiteren Parameter werden in der README-Datei des Addons erläutert.";
+$a->strings["Settings updated."] = "Einstellungen aktualisiert.";
+$a->strings["Submit"] = "Senden";
+$a->strings["The page operators name."] = "Name des Server-Administrators";
+$a->strings["Site Owners Profile"] = "Profil des Seitenbetreibers";
+$a->strings["Profile address of the operator."] = "Profil-Adresse des Server-Administrators";
+$a->strings["How to contact the operator via snail mail. You can use BBCode here."] = "Kontaktmöglichkeiten zum Administrator via Schneckenpost. Du kannst BBCode verwenden.";
+$a->strings["Notes"] = "Hinweise";
+$a->strings["Additional notes that are displayed beneath the contact information. You can use BBCode here."] = "Zusätzliche Informationen die neben den Kontaktmöglichkeiten angezeigt werden. Du kannst BBCode verwenden.";
+$a->strings["How to contact the operator via email. (will be displayed obfuscated)"] = "Wie man den Betreiber per Email erreicht. (Adresse wird verschleiert dargestellt)";
+$a->strings["Footer note"] = "Fußnote";
+$a->strings["Text for the footer. You can use BBCode here."] = "Text für die Fußzeile. Du kannst BBCode verwenden.";
diff --git a/impressum/lang/en-gb/strings.php b/impressum/lang/en-gb/strings.php
index c7418c59..3d1a2ec1 100644
--- a/impressum/lang/en-gb/strings.php
+++ b/impressum/lang/en-gb/strings.php
@@ -2,22 +2,22 @@
 
 if(! function_exists("string_plural_select_en_gb")) {
 function string_plural_select_en_gb($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Impressum'] = 'Impressum';
-$a->strings['Site Owner'] = 'Site Owner';
-$a->strings['Email Address'] = 'Email Address';
-$a->strings['Postal Address'] = 'Postal Address';
-$a->strings['The impressum addon needs to be configured!<br />Please add at least the <tt>owner</tt> variable to your config file. For other variables please refer to the README file of the addon.'] = 'The Impressum addon needs to be configured!<br />Please add at least the <tt>owner</tt> variable to your config file. For other variables, please refer to the addon\'s README file.';
-$a->strings['Settings updated.'] = 'Settings updated.';
-$a->strings['Submit'] = 'Submit';
-$a->strings['The page operators name.'] = 'The site operator\'s name';
-$a->strings['Site Owners Profile'] = 'Site owner\'s profile';
-$a->strings['Profile address of the operator.'] = 'Profile address of the operator.';
-$a->strings['How to contact the operator via snail mail. You can use BBCode here.'] = 'How to contact the site operator via snail mail. You can use BBCode here.';
-$a->strings['Notes'] = 'Notes';
-$a->strings['Additional notes that are displayed beneath the contact information. You can use BBCode here.'] = 'Additional notes that are displayed beneath the contact information. You can use BBCode here.';
-$a->strings['How to contact the operator via email. (will be displayed obfuscated)'] = 'How to contact the operator via email. (The e-mail address will be obfuscated to avoid spam.)';
-$a->strings['Footer note'] = 'Footer notes';
-$a->strings['Text for the footer. You can use BBCode here.'] = 'Text for the footer. You can use BBCode here.';
+;
+$a->strings["Impressum"] = "Impressum";
+$a->strings["Site Owner"] = "Site Owner";
+$a->strings["Email Address"] = "Email Address";
+$a->strings["Postal Address"] = "Postal Address";
+$a->strings["The impressum addon needs to be configured!<br />Please add at least the <tt>owner</tt> variable to your config file. For other variables please refer to the README file of the addon."] = "The Impressum addon needs to be configured!<br />Please add at least the <tt>owner</tt> variable to your config file. For other variables, please refer to the addon's README file.";
+$a->strings["Settings updated."] = "Settings updated.";
+$a->strings["Submit"] = "Submit";
+$a->strings["The page operators name."] = "The site operator's name";
+$a->strings["Site Owners Profile"] = "Site owner's profile";
+$a->strings["Profile address of the operator."] = "Profile address of the operator.";
+$a->strings["How to contact the operator via snail mail. You can use BBCode here."] = "How to contact the site operator via snail mail. You can use BBCode here.";
+$a->strings["Notes"] = "Notes";
+$a->strings["Additional notes that are displayed beneath the contact information. You can use BBCode here."] = "Additional notes that are displayed beneath the contact information. You can use BBCode here.";
+$a->strings["How to contact the operator via email. (will be displayed obfuscated)"] = "How to contact the operator via email. (The e-mail address will be obfuscated to avoid spam.)";
+$a->strings["Footer note"] = "Footer notes";
+$a->strings["Text for the footer. You can use BBCode here."] = "Text for the footer. You can use BBCode here.";
diff --git a/impressum/lang/es/messages.po b/impressum/lang/es/messages.po
index b491315f..0fe87cc5 100644
--- a/impressum/lang/es/messages.po
+++ b/impressum/lang/es/messages.po
@@ -5,14 +5,13 @@
 # 
 # Translators:
 # Albert, 2016
-# Senex Petrovic <javierruizo@hotmail.com>, 2021
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2021-04-01 10:01+0000\n"
-"Last-Translator: Senex Petrovic <javierruizo@hotmail.com>\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2016-11-17 13:13+0000\n"
+"Last-Translator: Albert\n"
 "Language-Team: Spanish (http://www.transifex.com/Friendica/friendica/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,67 +19,71 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: impressum.php:53
+#: impressum.php:37
 msgid "Impressum"
 msgstr "Impressum"
 
-#: impressum.php:66 impressum.php:68 impressum.php:99
+#: impressum.php:50 impressum.php:52 impressum.php:84
 msgid "Site Owner"
 msgstr "Propietario de la página"
 
-#: impressum.php:66 impressum.php:103
+#: impressum.php:50 impressum.php:88
 msgid "Email Address"
 msgstr "Dirección de Email"
 
-#: impressum.php:71 impressum.php:101
+#: impressum.php:55 impressum.php:86
 msgid "Postal Address"
 msgstr "Dirección postal"
 
-#: impressum.php:77
+#: impressum.php:61
 msgid ""
 "The impressum addon needs to be configured!<br />Please add at least the "
 "<tt>owner</tt> variable to your config file. For other variables please "
 "refer to the README file of the addon."
 msgstr "¡El addon impressum necesita ser configurado!<br />Por favor añada al menos <tt>propietario</tt> disponible en su archivo de configuración. Para otros valores por favor dirígase al archivo README del addon."
 
-#: impressum.php:98
-msgid "Save Settings"
-msgstr "Guardar Ajustes"
+#: impressum.php:78
+msgid "Settings updated."
+msgstr "Ajustes actualizados"
 
-#: impressum.php:99
+#: impressum.php:83
+msgid "Submit"
+msgstr "Enviar"
+
+#: impressum.php:84
 msgid "The page operators name."
 msgstr "El nombre de los operadores de página"
 
-#: impressum.php:100
+#: impressum.php:85
 msgid "Site Owners Profile"
 msgstr "Perfil del Propietario de la Página"
 
-#: impressum.php:100
+#: impressum.php:85
 msgid "Profile address of the operator."
 msgstr "Dirección del perfil del operador."
 
-#: impressum.php:101
+#: impressum.php:86
 msgid "How to contact the operator via snail mail. You can use BBCode here."
 msgstr "Cómo contactar con el operador via correo ordinario. Puede usar BBCode aquí."
 
-#: impressum.php:102
+#: impressum.php:87
 msgid "Notes"
 msgstr "Notas"
 
-#: impressum.php:102
+#: impressum.php:87
 msgid ""
 "Additional notes that are displayed beneath the contact information. You can"
 " use BBCode here."
 msgstr "Notas adicionales que se muestran bajo la información de contacto. Puede usar BBCode aquí."
 
-#: impressum.php:103
+#: impressum.php:88
 msgid "How to contact the operator via email. (will be displayed obfuscated)"
 msgstr "Cómo contactar con el operador via email. (se mostrará ofuscado)"
 
-#: impressum.php:104
+#: impressum.php:89
 msgid "Footer note"
 msgstr "Nota de pie de página"
 
-#: impressum.php:104
+#: impressum.php:89
 msgid "Text for the footer. You can use BBCode here."
 msgstr "Texto para el pie de página. Puede usar BBCode aquí"
diff --git a/impressum/lang/es/strings.php b/impressum/lang/es/strings.php
index 80862a69..fea759eb 100644
--- a/impressum/lang/es/strings.php
+++ b/impressum/lang/es/strings.php
@@ -2,21 +2,22 @@
 
 if(! function_exists("string_plural_select_es")) {
 function string_plural_select_es($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Impressum'] = 'Impressum';
-$a->strings['Site Owner'] = 'Propietario de la página';
-$a->strings['Email Address'] = 'Dirección de Email';
-$a->strings['Postal Address'] = 'Dirección postal';
-$a->strings['The impressum addon needs to be configured!<br />Please add at least the <tt>owner</tt> variable to your config file. For other variables please refer to the README file of the addon.'] = '¡El addon impressum necesita ser configurado!<br />Por favor añada al menos <tt>propietario</tt> disponible en su archivo de configuración. Para otros valores por favor dirígase al archivo README del addon.';
-$a->strings['Save Settings'] = 'Guardar Ajustes';
-$a->strings['The page operators name.'] = 'El nombre de los operadores de página';
-$a->strings['Site Owners Profile'] = 'Perfil del Propietario de la Página';
-$a->strings['Profile address of the operator.'] = 'Dirección del perfil del operador.';
-$a->strings['How to contact the operator via snail mail. You can use BBCode here.'] = 'Cómo contactar con el operador via correo ordinario. Puede usar BBCode aquí.';
-$a->strings['Notes'] = 'Notas';
-$a->strings['Additional notes that are displayed beneath the contact information. You can use BBCode here.'] = 'Notas adicionales que se muestran bajo la información de contacto. Puede usar BBCode aquí.';
-$a->strings['How to contact the operator via email. (will be displayed obfuscated)'] = 'Cómo contactar con el operador via email. (se mostrará ofuscado)';
-$a->strings['Footer note'] = 'Nota de pie de página';
-$a->strings['Text for the footer. You can use BBCode here.'] = 'Texto para el pie de página. Puede usar BBCode aquí';
+;
+$a->strings["Impressum"] = "Impressum";
+$a->strings["Site Owner"] = "Propietario de la página";
+$a->strings["Email Address"] = "Dirección de Email";
+$a->strings["Postal Address"] = "Dirección postal";
+$a->strings["The impressum addon needs to be configured!<br />Please add at least the <tt>owner</tt> variable to your config file. For other variables please refer to the README file of the addon."] = "¡El addon impressum necesita ser configurado!<br />Por favor añada al menos <tt>propietario</tt> disponible en su archivo de configuración. Para otros valores por favor dirígase al archivo README del addon.";
+$a->strings["Settings updated."] = "Ajustes actualizados";
+$a->strings["Submit"] = "Enviar";
+$a->strings["The page operators name."] = "El nombre de los operadores de página";
+$a->strings["Site Owners Profile"] = "Perfil del Propietario de la Página";
+$a->strings["Profile address of the operator."] = "Dirección del perfil del operador.";
+$a->strings["How to contact the operator via snail mail. You can use BBCode here."] = "Cómo contactar con el operador via correo ordinario. Puede usar BBCode aquí.";
+$a->strings["Notes"] = "Notas";
+$a->strings["Additional notes that are displayed beneath the contact information. You can use BBCode here."] = "Notas adicionales que se muestran bajo la información de contacto. Puede usar BBCode aquí.";
+$a->strings["How to contact the operator via email. (will be displayed obfuscated)"] = "Cómo contactar con el operador via email. (se mostrará ofuscado)";
+$a->strings["Footer note"] = "Nota de pie de página";
+$a->strings["Text for the footer. You can use BBCode here."] = "Texto para el pie de página. Puede usar BBCode aquí";
diff --git a/impressum/lang/fi-fi/strings.php b/impressum/lang/fi-fi/strings.php
index 5c9e22bf..404f0f13 100644
--- a/impressum/lang/fi-fi/strings.php
+++ b/impressum/lang/fi-fi/strings.php
@@ -3,15 +3,22 @@
 if(! function_exists("string_plural_select_fi_fi")) {
 function string_plural_select_fi_fi($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Impressum'] = 'Impressum';
-$a->strings['Site Owner'] = 'Sivuston omistaja';
-$a->strings['Email Address'] = 'Sähköpostiosoite';
-$a->strings['Postal Address'] = 'Postiosoite';
-$a->strings['Settings updated.'] = 'Asetukset tallennettu';
-$a->strings['Submit'] = 'Lähetä';
-$a->strings['The page operators name.'] = 'Sivuston ylläpitäjän nimi.';
-$a->strings['Site Owners Profile'] = 'Sivuston omistajan profiili';
-$a->strings['Profile address of the operator.'] = 'Ylläpitäjän profiiliosoite.';
-$a->strings['Notes'] = 'Muistiinpanot';
+;
+$a->strings["Impressum"] = "Impressum";
+$a->strings["Site Owner"] = "Sivuston omistaja";
+$a->strings["Email Address"] = "Sähköpostiosoite";
+$a->strings["Postal Address"] = "Postiosoite";
+$a->strings["The impressum addon needs to be configured!<br />Please add at least the <tt>owner</tt> variable to your config file. For other variables please refer to the README file of the addon."] = "";
+$a->strings["Settings updated."] = "Asetukset tallennettu";
+$a->strings["Submit"] = "Lähetä";
+$a->strings["The page operators name."] = "Sivuston ylläpitäjän nimi.";
+$a->strings["Site Owners Profile"] = "Sivuston omistajan profiili";
+$a->strings["Profile address of the operator."] = "Ylläpitäjän profiiliosoite.";
+$a->strings["How to contact the operator via snail mail. You can use BBCode here."] = "";
+$a->strings["Notes"] = "Muistiinpanot";
+$a->strings["Additional notes that are displayed beneath the contact information. You can use BBCode here."] = "";
+$a->strings["How to contact the operator via email. (will be displayed obfuscated)"] = "";
+$a->strings["Footer note"] = "";
+$a->strings["Text for the footer. You can use BBCode here."] = "";
diff --git a/impressum/lang/fr/messages.po b/impressum/lang/fr/messages.po
index 18845ac8..1762039e 100644
--- a/impressum/lang/fr/messages.po
+++ b/impressum/lang/fr/messages.po
@@ -4,83 +4,86 @@
 # 
 # 
 # Translators:
-# bob lebonche <lebonche@tutanota.com>, 2021
 # Damien Goutte-Gattat <damien+transifex@incenp.org>, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2014-06-23 08:39+0000\n"
-"Last-Translator: bob lebonche <lebonche@tutanota.com>, 2021\n"
-"Language-Team: French (http://www.transifex.com/Friendica/friendica/language/fr/)\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2015-02-04 11:56+0000\n"
+"Last-Translator: Damien Goutte-Gattat <damien+transifex@incenp.org>\n"
+"Language-Team: French (http://www.transifex.com/projects/p/friendica/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fr\n"
-"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: impressum.php:53
+#: impressum.php:37
 msgid "Impressum"
 msgstr "Mentions légales"
 
-#: impressum.php:66 impressum.php:68 impressum.php:99
+#: impressum.php:50 impressum.php:52 impressum.php:84
 msgid "Site Owner"
 msgstr "Propriétaire du site"
 
-#: impressum.php:66 impressum.php:103
+#: impressum.php:50 impressum.php:88
 msgid "Email Address"
 msgstr "Adresse courriel"
 
-#: impressum.php:71 impressum.php:101
+#: impressum.php:55 impressum.php:86
 msgid "Postal Address"
 msgstr "Adresse postale"
 
-#: impressum.php:77
+#: impressum.php:61
 msgid ""
 "The impressum addon needs to be configured!<br />Please add at least the "
 "<tt>owner</tt> variable to your config file. For other variables please "
 "refer to the README file of the addon."
 msgstr "L’extension “Impressum” (Mentions légales) n’est pas configurée !<br />Veuillez renseigner au minimum la variable <tt>owner</tt> dans votre fichier de configuration. Pour les autres variables, reportez-vous au fichier README accompagnant l’extension."
 
-#: impressum.php:98
-msgid "Save Settings"
-msgstr "Sauvegarder les paramètres"
+#: impressum.php:78
+msgid "Settings updated."
+msgstr "Réglages mis à jour."
 
-#: impressum.php:99
+#: impressum.php:83
+msgid "Submit"
+msgstr "Envoyer"
+
+#: impressum.php:84
 msgid "The page operators name."
 msgstr "Le nom de l'administrateur de la page."
 
-#: impressum.php:100
+#: impressum.php:85
 msgid "Site Owners Profile"
 msgstr "Profil du propriétaire"
 
-#: impressum.php:100
+#: impressum.php:85
 msgid "Profile address of the operator."
 msgstr "L’adresse du profil de l’administrateur."
 
-#: impressum.php:101
+#: impressum.php:86
 msgid "How to contact the operator via snail mail. You can use BBCode here."
 msgstr "Comment contacter l’administrateur par courrier postal. Vous pouvez utiliser du BBCode."
 
-#: impressum.php:102
+#: impressum.php:87
 msgid "Notes"
 msgstr "Notes"
 
-#: impressum.php:102
+#: impressum.php:87
 msgid ""
 "Additional notes that are displayed beneath the contact information. You can"
 " use BBCode here."
 msgstr "Notes additionnelles à afficher sous les informations de contact. Vous pouvez utiliser du BBCode."
 
-#: impressum.php:103
+#: impressum.php:88
 msgid "How to contact the operator via email. (will be displayed obfuscated)"
 msgstr "Comment contacter l’administrateur par courriel. (L’adresse sera modifiée à l’affichage pour brouiller les collecteurs d’adresses.)"
 
-#: impressum.php:104
+#: impressum.php:89
 msgid "Footer note"
 msgstr "Note de bas de page"
 
-#: impressum.php:104
+#: impressum.php:89
 msgid "Text for the footer. You can use BBCode here."
 msgstr "Texte du pied de page. Vous pouvez utiliser du BBCode."
diff --git a/impressum/lang/fr/strings.php b/impressum/lang/fr/strings.php
index baecfeb5..f0f15d8f 100644
--- a/impressum/lang/fr/strings.php
+++ b/impressum/lang/fr/strings.php
@@ -2,21 +2,22 @@
 
 if(! function_exists("string_plural_select_fr")) {
 function string_plural_select_fr($n){
-	$n = intval($n);
-	if (($n == 0 || $n == 1)) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
+	return ($n > 1);;
 }}
-$a->strings['Impressum'] = 'Mentions légales';
-$a->strings['Site Owner'] = 'Propriétaire du site';
-$a->strings['Email Address'] = 'Adresse courriel';
-$a->strings['Postal Address'] = 'Adresse postale';
-$a->strings['The impressum addon needs to be configured!<br />Please add at least the <tt>owner</tt> variable to your config file. For other variables please refer to the README file of the addon.'] = 'L’extension “Impressum” (Mentions légales) n’est pas configurée !<br />Veuillez renseigner au minimum la variable <tt>owner</tt> dans votre fichier de configuration. Pour les autres variables, reportez-vous au fichier README accompagnant l’extension.';
-$a->strings['Save Settings'] = 'Sauvegarder les paramètres';
-$a->strings['The page operators name.'] = 'Le nom de l\'administrateur de la page.';
-$a->strings['Site Owners Profile'] = 'Profil du propriétaire';
-$a->strings['Profile address of the operator.'] = 'L’adresse du profil de l’administrateur.';
-$a->strings['How to contact the operator via snail mail. You can use BBCode here.'] = 'Comment contacter l’administrateur par courrier postal. Vous pouvez utiliser du BBCode.';
-$a->strings['Notes'] = 'Notes';
-$a->strings['Additional notes that are displayed beneath the contact information. You can use BBCode here.'] = 'Notes additionnelles à afficher sous les informations de contact. Vous pouvez utiliser du BBCode.';
-$a->strings['How to contact the operator via email. (will be displayed obfuscated)'] = 'Comment contacter l’administrateur par courriel. (L’adresse sera modifiée à l’affichage pour brouiller les collecteurs d’adresses.)';
-$a->strings['Footer note'] = 'Note de bas de page';
-$a->strings['Text for the footer. You can use BBCode here.'] = 'Texte du pied de page. Vous pouvez utiliser du BBCode.';
+;
+$a->strings["Impressum"] = "Mentions légales";
+$a->strings["Site Owner"] = "Propriétaire du site";
+$a->strings["Email Address"] = "Adresse courriel";
+$a->strings["Postal Address"] = "Adresse postale";
+$a->strings["The impressum addon needs to be configured!<br />Please add at least the <tt>owner</tt> variable to your config file. For other variables please refer to the README file of the addon."] = "L’extension “Impressum” (Mentions légales) n’est pas configurée !<br />Veuillez renseigner au minimum la variable <tt>owner</tt> dans votre fichier de configuration. Pour les autres variables, reportez-vous au fichier README accompagnant l’extension.";
+$a->strings["Settings updated."] = "Réglages mis à jour.";
+$a->strings["Submit"] = "Envoyer";
+$a->strings["The page operators name."] = "Le nom de l'administrateur de la page.";
+$a->strings["Site Owners Profile"] = "Profil du propriétaire";
+$a->strings["Profile address of the operator."] = "L’adresse du profil de l’administrateur.";
+$a->strings["How to contact the operator via snail mail. You can use BBCode here."] = "Comment contacter l’administrateur par courrier postal. Vous pouvez utiliser du BBCode.";
+$a->strings["Notes"] = "Notes";
+$a->strings["Additional notes that are displayed beneath the contact information. You can use BBCode here."] = "Notes additionnelles à afficher sous les informations de contact. Vous pouvez utiliser du BBCode.";
+$a->strings["How to contact the operator via email. (will be displayed obfuscated)"] = "Comment contacter l’administrateur par courriel. (L’adresse sera modifiée à l’affichage pour brouiller les collecteurs d’adresses.)";
+$a->strings["Footer note"] = "Note de bas de page";
+$a->strings["Text for the footer. You can use BBCode here."] = "Texte du pied de page. Vous pouvez utiliser du BBCode.";
diff --git a/impressum/lang/hu/messages.po b/impressum/lang/hu/messages.po
deleted file mode 100644
index 2615b2c8..00000000
--- a/impressum/lang/hu/messages.po
+++ /dev/null
@@ -1,85 +0,0 @@
-# ADDON impressum
-# Copyright (C)
-# This file is distributed under the same license as the Friendica impressum addon package.
-# 
-# 
-# Translators:
-# Balázs Úr, 2020-2021
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2014-06-23 08:39+0000\n"
-"Last-Translator: Balázs Úr, 2020-2021\n"
-"Language-Team: Hungarian (http://www.transifex.com/Friendica/friendica/language/hu/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: hu\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: impressum.php:53
-msgid "Impressum"
-msgstr "Impresszum"
-
-#: impressum.php:66 impressum.php:68 impressum.php:99
-msgid "Site Owner"
-msgstr "Oldal tulajdonosa"
-
-#: impressum.php:66 impressum.php:103
-msgid "Email Address"
-msgstr "E-mail-cím"
-
-#: impressum.php:71 impressum.php:101
-msgid "Postal Address"
-msgstr "Postai cím"
-
-#: impressum.php:77
-msgid ""
-"The impressum addon needs to be configured!<br />Please add at least the "
-"<tt>owner</tt> variable to your config file. For other variables please "
-"refer to the README file of the addon."
-msgstr "Az impresszum bővítményt be kell állítani!<br />Legalább az <tt>owner</tt> változót adja hozzá a beállítófájlhoz. Az egyéb változókért nézze meg a bővítmény README fájlját."
-
-#: impressum.php:98
-msgid "Save Settings"
-msgstr "Beállítások mentése"
-
-#: impressum.php:99
-msgid "The page operators name."
-msgstr "Az oldal üzemeltetőinek neve."
-
-#: impressum.php:100
-msgid "Site Owners Profile"
-msgstr "Oldaltulajdonosok profilja"
-
-#: impressum.php:100
-msgid "Profile address of the operator."
-msgstr "Az üzemeltető profilcíme."
-
-#: impressum.php:101
-msgid "How to contact the operator via snail mail. You can use BBCode here."
-msgstr "Hogyan léphet kapcsolatba az üzemeltetővel postai úton. Itt használhat BBCode-ot."
-
-#: impressum.php:102
-msgid "Notes"
-msgstr "Megjegyzések"
-
-#: impressum.php:102
-msgid ""
-"Additional notes that are displayed beneath the contact information. You can"
-" use BBCode here."
-msgstr "További megjegyzések, amelyek a kapcsolatfelvételi információk alatt jelennek meg. Itt használhat BBCode-ot."
-
-#: impressum.php:103
-msgid "How to contact the operator via email. (will be displayed obfuscated)"
-msgstr "Hogyan léphet kapcsolatba az üzemeltetővel e-mailben (rejtjelezve lesz megjelenítve)."
-
-#: impressum.php:104
-msgid "Footer note"
-msgstr "Lábjegyzet"
-
-#: impressum.php:104
-msgid "Text for the footer. You can use BBCode here."
-msgstr "A lábléc szövege. Itt használhat BBCode-ot."
diff --git a/impressum/lang/hu/strings.php b/impressum/lang/hu/strings.php
deleted file mode 100644
index 031def75..00000000
--- a/impressum/lang/hu/strings.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_hu")) {
-function string_plural_select_hu($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Impressum'] = 'Impresszum';
-$a->strings['Site Owner'] = 'Oldal tulajdonosa';
-$a->strings['Email Address'] = 'E-mail-cím';
-$a->strings['Postal Address'] = 'Postai cím';
-$a->strings['The impressum addon needs to be configured!<br />Please add at least the <tt>owner</tt> variable to your config file. For other variables please refer to the README file of the addon.'] = 'Az impresszum bővítményt be kell állítani!<br />Legalább az <tt>owner</tt> változót adja hozzá a beállítófájlhoz. Az egyéb változókért nézze meg a bővítmény README fájlját.';
-$a->strings['Save Settings'] = 'Beállítások mentése';
-$a->strings['The page operators name.'] = 'Az oldal üzemeltetőinek neve.';
-$a->strings['Site Owners Profile'] = 'Oldaltulajdonosok profilja';
-$a->strings['Profile address of the operator.'] = 'Az üzemeltető profilcíme.';
-$a->strings['How to contact the operator via snail mail. You can use BBCode here.'] = 'Hogyan léphet kapcsolatba az üzemeltetővel postai úton. Itt használhat BBCode-ot.';
-$a->strings['Notes'] = 'Megjegyzések';
-$a->strings['Additional notes that are displayed beneath the contact information. You can use BBCode here.'] = 'További megjegyzések, amelyek a kapcsolatfelvételi információk alatt jelennek meg. Itt használhat BBCode-ot.';
-$a->strings['How to contact the operator via email. (will be displayed obfuscated)'] = 'Hogyan léphet kapcsolatba az üzemeltetővel e-mailben (rejtjelezve lesz megjelenítve).';
-$a->strings['Footer note'] = 'Lábjegyzet';
-$a->strings['Text for the footer. You can use BBCode here.'] = 'A lábléc szövege. Itt használhat BBCode-ot.';
diff --git a/impressum/lang/it/messages.po b/impressum/lang/it/messages.po
index b9951d13..60f25ac5 100644
--- a/impressum/lang/it/messages.po
+++ b/impressum/lang/it/messages.po
@@ -5,14 +5,13 @@
 # 
 # Translators:
 # fabrixxm <fabrix.xm@gmail.com>, 2014-2015
-# Sylke Vicious <silkevicious@gmail.com>, 2021
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2021-02-16 12:57+0000\n"
-"Last-Translator: Sylke Vicious <silkevicious@gmail.com>\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2017-09-20 06:08+0000\n"
+"Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,67 +19,71 @@ msgstr ""
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: impressum.php:53
+#: impressum.php:37
 msgid "Impressum"
 msgstr "Colophon"
 
-#: impressum.php:66 impressum.php:68 impressum.php:99
+#: impressum.php:50 impressum.php:52 impressum.php:84
 msgid "Site Owner"
 msgstr "Proprietario del sito"
 
-#: impressum.php:66 impressum.php:103
+#: impressum.php:50 impressum.php:88
 msgid "Email Address"
 msgstr "Indirizzo email"
 
-#: impressum.php:71 impressum.php:101
+#: impressum.php:55 impressum.php:86
 msgid "Postal Address"
 msgstr "Indirizzo"
 
-#: impressum.php:77
+#: impressum.php:61
 msgid ""
 "The impressum addon needs to be configured!<br />Please add at least the "
 "<tt>owner</tt> variable to your config file. For other variables please "
 "refer to the README file of the addon."
 msgstr "Il plugin Colophon deve essere configurato!<br>Aggiungi almeno il Proprietario del sito."
 
-#: impressum.php:98
-msgid "Save Settings"
-msgstr "Salva Impostazioni"
+#: impressum.php:78
+msgid "Settings updated."
+msgstr "Impostazioni aggiornate."
 
-#: impressum.php:99
+#: impressum.php:83
+msgid "Submit"
+msgstr "Invia"
+
+#: impressum.php:84
 msgid "The page operators name."
 msgstr "Nome del gestore della pagina."
 
-#: impressum.php:100
+#: impressum.php:85
 msgid "Site Owners Profile"
 msgstr "Profilo del proprietario del sito"
 
-#: impressum.php:100
+#: impressum.php:85
 msgid "Profile address of the operator."
 msgstr "Indirizzo del profilo del gestore della pagina"
 
-#: impressum.php:101
+#: impressum.php:86
 msgid "How to contact the operator via snail mail. You can use BBCode here."
 msgstr "Come contattare il gestore via posta cartacea. Puoi usare BBCode."
 
-#: impressum.php:102
+#: impressum.php:87
 msgid "Notes"
 msgstr "Note"
 
-#: impressum.php:102
+#: impressum.php:87
 msgid ""
 "Additional notes that are displayed beneath the contact information. You can"
 " use BBCode here."
 msgstr "Note aggiuntive mostrate sotto le informazioni di contatto. Puoi usare BBCode."
 
-#: impressum.php:103
+#: impressum.php:88
 msgid "How to contact the operator via email. (will be displayed obfuscated)"
 msgstr "Come contattare l'operatore via email. (verrà mostrato offuscato)"
 
-#: impressum.php:104
+#: impressum.php:89
 msgid "Footer note"
 msgstr "Nota a piè di pagina"
 
-#: impressum.php:104
+#: impressum.php:89
 msgid "Text for the footer. You can use BBCode here."
 msgstr "Testo per il piè di pagina. Puoi usare BBCode."
diff --git a/impressum/lang/it/strings.php b/impressum/lang/it/strings.php
index 12790962..25f3b1be 100644
--- a/impressum/lang/it/strings.php
+++ b/impressum/lang/it/strings.php
@@ -2,21 +2,22 @@
 
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Impressum'] = 'Colophon';
-$a->strings['Site Owner'] = 'Proprietario del sito';
-$a->strings['Email Address'] = 'Indirizzo email';
-$a->strings['Postal Address'] = 'Indirizzo';
-$a->strings['The impressum addon needs to be configured!<br />Please add at least the <tt>owner</tt> variable to your config file. For other variables please refer to the README file of the addon.'] = 'Il plugin Colophon deve essere configurato!<br>Aggiungi almeno il Proprietario del sito.';
-$a->strings['Save Settings'] = 'Salva Impostazioni';
-$a->strings['The page operators name.'] = 'Nome del gestore della pagina.';
-$a->strings['Site Owners Profile'] = 'Profilo del proprietario del sito';
-$a->strings['Profile address of the operator.'] = 'Indirizzo del profilo del gestore della pagina';
-$a->strings['How to contact the operator via snail mail. You can use BBCode here.'] = 'Come contattare il gestore via posta cartacea. Puoi usare BBCode.';
-$a->strings['Notes'] = 'Note';
-$a->strings['Additional notes that are displayed beneath the contact information. You can use BBCode here.'] = 'Note aggiuntive mostrate sotto le informazioni di contatto. Puoi usare BBCode.';
-$a->strings['How to contact the operator via email. (will be displayed obfuscated)'] = 'Come contattare l\'operatore via email. (verrà mostrato offuscato)';
-$a->strings['Footer note'] = 'Nota a piè di pagina';
-$a->strings['Text for the footer. You can use BBCode here.'] = 'Testo per il piè di pagina. Puoi usare BBCode.';
+;
+$a->strings["Impressum"] = "Colophon";
+$a->strings["Site Owner"] = "Proprietario del sito";
+$a->strings["Email Address"] = "Indirizzo email";
+$a->strings["Postal Address"] = "Indirizzo";
+$a->strings["The impressum addon needs to be configured!<br />Please add at least the <tt>owner</tt> variable to your config file. For other variables please refer to the README file of the addon."] = "Il plugin Colophon deve essere configurato!<br>Aggiungi almeno il Proprietario del sito.";
+$a->strings["Settings updated."] = "Impostazioni aggiornate.";
+$a->strings["Submit"] = "Invia";
+$a->strings["The page operators name."] = "Nome del gestore della pagina.";
+$a->strings["Site Owners Profile"] = "Profilo del proprietario del sito";
+$a->strings["Profile address of the operator."] = "Indirizzo del profilo del gestore della pagina";
+$a->strings["How to contact the operator via snail mail. You can use BBCode here."] = "Come contattare il gestore via posta cartacea. Puoi usare BBCode.";
+$a->strings["Notes"] = "Note";
+$a->strings["Additional notes that are displayed beneath the contact information. You can use BBCode here."] = "Note aggiuntive mostrate sotto le informazioni di contatto. Puoi usare BBCode.";
+$a->strings["How to contact the operator via email. (will be displayed obfuscated)"] = "Come contattare l'operatore via email. (verrà mostrato offuscato)";
+$a->strings["Footer note"] = "Nota a piè di pagina";
+$a->strings["Text for the footer. You can use BBCode here."] = "Testo per il piè di pagina. Puoi usare BBCode.";
diff --git a/impressum/lang/nl/strings.php b/impressum/lang/nl/strings.php
index e5994204..bfc0f756 100644
--- a/impressum/lang/nl/strings.php
+++ b/impressum/lang/nl/strings.php
@@ -3,8 +3,22 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Impressum'] = 'Colofon';
-$a->strings['Site Owner'] = 'Siteeigenaar';
-$a->strings['Settings updated.'] = 'Instellingen opgeslagen';
+;
+$a->strings["Impressum"] = "Colofon";
+$a->strings["Site Owner"] = "Siteeigenaar";
+$a->strings["Email Address"] = "";
+$a->strings["Postal Address"] = "";
+$a->strings["The impressum addon needs to be configured!<br />Please add at least the <tt>owner</tt> variable to your config file. For other variables please refer to the README file of the addon."] = "";
+$a->strings["Settings updated."] = "Instellingen opgeslagen";
+$a->strings["Submit"] = "";
+$a->strings["The page operators name."] = "";
+$a->strings["Site Owners Profile"] = "";
+$a->strings["Profile address of the operator."] = "";
+$a->strings["How to contact the operator via snail mail. You can use BBCode here."] = "";
+$a->strings["Notes"] = "";
+$a->strings["Additional notes that are displayed beneath the contact information. You can use BBCode here."] = "";
+$a->strings["How to contact the operator via email. (will be displayed obfuscated)"] = "";
+$a->strings["Footer note"] = "";
+$a->strings["Text for the footer. You can use BBCode here."] = "";
diff --git a/impressum/lang/pl/messages.po b/impressum/lang/pl/messages.po
index 89316322..142b0aa9 100644
--- a/impressum/lang/pl/messages.po
+++ b/impressum/lang/pl/messages.po
@@ -4,15 +4,14 @@
 # 
 # 
 # Translators:
-# Piotr Strębski <strebski@gmail.com>, 2022
-# Waldemar Stoczkowski, 2018
+# Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2014-06-23 08:39+0000\n"
-"Last-Translator: Piotr Strębski <strebski@gmail.com>, 2022\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2018-04-01 14:36+0000\n"
+"Last-Translator: Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.com/Friendica/friendica/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,67 +19,71 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
-#: impressum.php:53
+#: impressum.php:37
 msgid "Impressum"
 msgstr "Stopka redakcyjna"
 
-#: impressum.php:66 impressum.php:68 impressum.php:99
+#: impressum.php:50 impressum.php:52 impressum.php:84
 msgid "Site Owner"
 msgstr "Właściciel witryny"
 
-#: impressum.php:66 impressum.php:103
+#: impressum.php:50 impressum.php:88
 msgid "Email Address"
 msgstr "Adres e-mail"
 
-#: impressum.php:71 impressum.php:101
+#: impressum.php:55 impressum.php:86
 msgid "Postal Address"
 msgstr "Adres pocztowy"
 
-#: impressum.php:77
+#: impressum.php:61
 msgid ""
 "The impressum addon needs to be configured!<br />Please add at least the "
 "<tt>owner</tt> variable to your config file. For other variables please "
 "refer to the README file of the addon."
 msgstr "Dodatek impressum musi zostać skonfigurowany!<br />Dodaj co najmniej zmienną <tt>właściciela</tt> do pliku konfiguracyjnego. Inne zmienne można znaleźć w pliku README dodatku."
 
-#: impressum.php:98
-msgid "Save Settings"
-msgstr "Zapisz ustawienia"
+#: impressum.php:78
+msgid "Settings updated."
+msgstr "Ustawienia zaktualizowane."
 
-#: impressum.php:99
+#: impressum.php:83
+msgid "Submit"
+msgstr "Wyślij"
+
+#: impressum.php:84
 msgid "The page operators name."
 msgstr "Nazwa operatora strony."
 
-#: impressum.php:100
+#: impressum.php:85
 msgid "Site Owners Profile"
 msgstr "Profil właściciela witryny"
 
-#: impressum.php:100
+#: impressum.php:85
 msgid "Profile address of the operator."
 msgstr "Adres profilu operatora."
 
-#: impressum.php:101
+#: impressum.php:86
 msgid "How to contact the operator via snail mail. You can use BBCode here."
-msgstr "Jak skontaktować się z operatorem za pośrednictwem poczty elektronicznej. Możesz tutaj użyć BBCode."
+msgstr "Jak skontaktować się z operatorem za pośrednictwem poczty elektronicznej. Możesz użyć BBCode tutaj."
 
-#: impressum.php:102
+#: impressum.php:87
 msgid "Notes"
 msgstr "Notatki"
 
-#: impressum.php:102
+#: impressum.php:87
 msgid ""
 "Additional notes that are displayed beneath the contact information. You can"
 " use BBCode here."
-msgstr "Dodatkowe uwagi, które są wyświetlane pod danymi kontaktowymi. Możesz tutaj użyć BBCode."
+msgstr "Dodatkowe uwagi, które są wyświetlane pod danymi kontaktowymi. Możesz użyć BBCode tutaj."
 
-#: impressum.php:103
+#: impressum.php:88
 msgid "How to contact the operator via email. (will be displayed obfuscated)"
 msgstr "Jak skontaktować się z operatorem za pośrednictwem poczty elektronicznej. (zostanie wyświetlony ukryty)"
 
-#: impressum.php:104
+#: impressum.php:89
 msgid "Footer note"
 msgstr "Notatka w stopce"
 
-#: impressum.php:104
+#: impressum.php:89
 msgid "Text for the footer. You can use BBCode here."
-msgstr "Tekst stopki. Możesz tutaj użyć BBCode."
+msgstr "Tekst stopki. Tutaj można użyć BBCode."
diff --git a/impressum/lang/pl/strings.php b/impressum/lang/pl/strings.php
index 1a5cd98a..fec7b84b 100644
--- a/impressum/lang/pl/strings.php
+++ b/impressum/lang/pl/strings.php
@@ -2,21 +2,22 @@
 
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
-	$n = intval($n);
-	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
+	return ($n==1 ? 0 : ($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14) ? 1 : $n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14) ? 2 : 3);;
 }}
-$a->strings['Impressum'] = 'Stopka redakcyjna';
-$a->strings['Site Owner'] = 'Właściciel witryny';
-$a->strings['Email Address'] = 'Adres e-mail';
-$a->strings['Postal Address'] = 'Adres pocztowy';
-$a->strings['The impressum addon needs to be configured!<br />Please add at least the <tt>owner</tt> variable to your config file. For other variables please refer to the README file of the addon.'] = 'Dodatek impressum musi zostać skonfigurowany!<br />Dodaj co najmniej zmienną <tt>właściciela</tt> do pliku konfiguracyjnego. Inne zmienne można znaleźć w pliku README dodatku.';
-$a->strings['Save Settings'] = 'Zapisz ustawienia';
-$a->strings['The page operators name.'] = 'Nazwa operatora strony.';
-$a->strings['Site Owners Profile'] = 'Profil właściciela witryny';
-$a->strings['Profile address of the operator.'] = 'Adres profilu operatora.';
-$a->strings['How to contact the operator via snail mail. You can use BBCode here.'] = 'Jak skontaktować się z operatorem za pośrednictwem poczty elektronicznej. Możesz tutaj użyć BBCode.';
-$a->strings['Notes'] = 'Notatki';
-$a->strings['Additional notes that are displayed beneath the contact information. You can use BBCode here.'] = 'Dodatkowe uwagi, które są wyświetlane pod danymi kontaktowymi. Możesz tutaj użyć BBCode.';
-$a->strings['How to contact the operator via email. (will be displayed obfuscated)'] = 'Jak skontaktować się z operatorem za pośrednictwem poczty elektronicznej. (zostanie wyświetlony ukryty)';
-$a->strings['Footer note'] = 'Notatka w stopce';
-$a->strings['Text for the footer. You can use BBCode here.'] = 'Tekst stopki. Możesz tutaj użyć BBCode.';
+;
+$a->strings["Impressum"] = "Stopka redakcyjna";
+$a->strings["Site Owner"] = "Właściciel witryny";
+$a->strings["Email Address"] = "Adres e-mail";
+$a->strings["Postal Address"] = "Adres pocztowy";
+$a->strings["The impressum addon needs to be configured!<br />Please add at least the <tt>owner</tt> variable to your config file. For other variables please refer to the README file of the addon."] = "Dodatek impressum musi zostać skonfigurowany!<br />Dodaj co najmniej zmienną <tt>właściciela</tt> do pliku konfiguracyjnego. Inne zmienne można znaleźć w pliku README dodatku.";
+$a->strings["Settings updated."] = "Ustawienia zaktualizowane.";
+$a->strings["Submit"] = "Wyślij";
+$a->strings["The page operators name."] = "Nazwa operatora strony.";
+$a->strings["Site Owners Profile"] = "Profil właściciela witryny";
+$a->strings["Profile address of the operator."] = "Adres profilu operatora.";
+$a->strings["How to contact the operator via snail mail. You can use BBCode here."] = "Jak skontaktować się z operatorem za pośrednictwem poczty elektronicznej. Możesz użyć BBCode tutaj.";
+$a->strings["Notes"] = "Notatki";
+$a->strings["Additional notes that are displayed beneath the contact information. You can use BBCode here."] = "Dodatkowe uwagi, które są wyświetlane pod danymi kontaktowymi. Możesz użyć BBCode tutaj.";
+$a->strings["How to contact the operator via email. (will be displayed obfuscated)"] = "Jak skontaktować się z operatorem za pośrednictwem poczty elektronicznej. (zostanie wyświetlony ukryty)";
+$a->strings["Footer note"] = "Notatka w stopce";
+$a->strings["Text for the footer. You can use BBCode here."] = "Tekst stopki. Tutaj można użyć BBCode.";
diff --git a/impressum/lang/pt-br/strings.php b/impressum/lang/pt-br/strings.php
index 6b8eb2a2..90273f96 100644
--- a/impressum/lang/pt-br/strings.php
+++ b/impressum/lang/pt-br/strings.php
@@ -2,14 +2,22 @@
 
 if(! function_exists("string_plural_select_pt_br")) {
 function string_plural_select_pt_br($n){
-	$n = intval($n);
-	return intval($n > 1);
+	return ($n > 1);;
 }}
-$a->strings['Impressum'] = 'Impressum';
-$a->strings['Site Owner'] = 'Responsável pelo site';
-$a->strings['Email Address'] = 'Endereço de e-mail';
-$a->strings['Postal Address'] = 'Endereço postal';
-$a->strings['Settings updated.'] = 'As configurações foram atualizadas.';
-$a->strings['Submit'] = 'Enviar';
-$a->strings['Site Owners Profile'] = 'Perfil do responsável pelo site';
-$a->strings['Footer note'] = 'Nota de rodapé';
+;
+$a->strings["Impressum"] = "Impressum";
+$a->strings["Site Owner"] = "Responsável pelo site";
+$a->strings["Email Address"] = "Endereço de e-mail";
+$a->strings["Postal Address"] = "Endereço postal";
+$a->strings["The impressum addon needs to be configured!<br />Please add at least the <tt>owner</tt> variable to your config file. For other variables please refer to the README file of the addon."] = "";
+$a->strings["Settings updated."] = "As configurações foram atualizadas.";
+$a->strings["Submit"] = "Enviar";
+$a->strings["The page operators name."] = "";
+$a->strings["Site Owners Profile"] = "Perfil do responsável pelo site";
+$a->strings["Profile address of the operator."] = "";
+$a->strings["How to contact the operator via snail mail. You can use BBCode here."] = "";
+$a->strings["Notes"] = "";
+$a->strings["Additional notes that are displayed beneath the contact information. You can use BBCode here."] = "";
+$a->strings["How to contact the operator via email. (will be displayed obfuscated)"] = "";
+$a->strings["Footer note"] = "Nota de rodapé";
+$a->strings["Text for the footer. You can use BBCode here."] = "";
diff --git a/impressum/lang/ro/strings.php b/impressum/lang/ro/strings.php
index 949d4854..0b7d9ebb 100644
--- a/impressum/lang/ro/strings.php
+++ b/impressum/lang/ro/strings.php
@@ -2,22 +2,22 @@
 
 if(! function_exists("string_plural_select_ro")) {
 function string_plural_select_ro($n){
-	$n = intval($n);
-	if ($n==1) { return 0; } else if ((($n%100>19)||(($n%100==0)&&($n!=0)))) { return 2; } else  { return 1; }
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
 }}
-$a->strings['Impressum'] = 'Impressum';
-$a->strings['Site Owner'] = 'Deținător Site';
-$a->strings['Email Address'] = 'Adresă de mail';
-$a->strings['Postal Address'] = 'Adresă poștală';
-$a->strings['The impressum addon needs to be configured!<br />Please add at least the <tt>owner</tt> variable to your config file. For other variables please refer to the README file of the addon.'] = 'Modulul Impressum trebuie configurat! <br />Vă rugăm să adăugați cel puțin variabila <tt>deținător</tt> în fișierul de configurare. Pentru alte variabile vă rugăm să consultați fișierul README al modulului.';
-$a->strings['Settings updated.'] = 'Configurări actualizate.';
-$a->strings['Submit'] = 'Trimite';
-$a->strings['The page operators name.'] = 'Pagina numelor operatorilor.';
-$a->strings['Site Owners Profile'] = 'Profil Deținători Site ';
-$a->strings['Profile address of the operator.'] = 'Adresa de profil a operatorului.';
-$a->strings['How to contact the operator via snail mail. You can use BBCode here.'] = 'Cum să contactați operatorul prin corespondență lentă. Puteți folosi aici Codul BB.';
-$a->strings['Notes'] = 'Note';
-$a->strings['Additional notes that are displayed beneath the contact information. You can use BBCode here.'] = 'Notele suplimentare care sunt afișate sub informațiile de contact. Puteți folosi aici Codul BB.';
-$a->strings['How to contact the operator via email. (will be displayed obfuscated)'] = 'Modul de contactare al operatorului prin e-mail. (va fi afișat eclipsat)';
-$a->strings['Footer note'] = 'Notă de Subsol';
-$a->strings['Text for the footer. You can use BBCode here.'] = 'Textul de pagina de subsol. Puteți folosi aici Codul BB.';
+;
+$a->strings["Impressum"] = "Impressum";
+$a->strings["Site Owner"] = "Deținător Site";
+$a->strings["Email Address"] = "Adresă de mail";
+$a->strings["Postal Address"] = "Adresă poștală";
+$a->strings["The impressum addon needs to be configured!<br />Please add at least the <tt>owner</tt> variable to your config file. For other variables please refer to the README file of the addon."] = "Modulul Impressum trebuie configurat! <br />Vă rugăm să adăugați cel puțin variabila <tt>deținător</tt> în fișierul de configurare. Pentru alte variabile vă rugăm să consultați fișierul README al modulului.";
+$a->strings["Settings updated."] = "Configurări actualizate.";
+$a->strings["Submit"] = "Trimite";
+$a->strings["The page operators name."] = "Pagina numelor operatorilor.";
+$a->strings["Site Owners Profile"] = "Profil Deținători Site ";
+$a->strings["Profile address of the operator."] = "Adresa de profil a operatorului.";
+$a->strings["How to contact the operator via snail mail. You can use BBCode here."] = "Cum să contactați operatorul prin corespondență lentă. Puteți folosi aici Codul BB.";
+$a->strings["Notes"] = "Note";
+$a->strings["Additional notes that are displayed beneath the contact information. You can use BBCode here."] = "Notele suplimentare care sunt afișate sub informațiile de contact. Puteți folosi aici Codul BB.";
+$a->strings["How to contact the operator via email. (will be displayed obfuscated)"] = "Modul de contactare al operatorului prin e-mail. (va fi afișat eclipsat)";
+$a->strings["Footer note"] = "Notă de Subsol";
+$a->strings["Text for the footer. You can use BBCode here."] = "Textul de pagina de subsol. Puteți folosi aici Codul BB.";
diff --git a/impressum/lang/sv/messages.po b/impressum/lang/sv/messages.po
deleted file mode 100644
index 0eb8b906..00000000
--- a/impressum/lang/sv/messages.po
+++ /dev/null
@@ -1,86 +0,0 @@
-# ADDON impressum
-# Copyright (C)
-# This file is distributed under the same license as the Friendica impressum addon package.
-# 
-# 
-# Translators:
-# Hypolite Petovan <hypolite@mrpetovan.com>, 2019
-# Kristoffer Grundström <lovaren@gmail.com>, 2022
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2022-01-16 00:37+0000\n"
-"Last-Translator: Kristoffer Grundström <lovaren@gmail.com>\n"
-"Language-Team: Swedish (http://www.transifex.com/Friendica/friendica/language/sv/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: sv\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: impressum.php:53
-msgid "Impressum"
-msgstr "Intryck"
-
-#: impressum.php:66 impressum.php:68 impressum.php:99
-msgid "Site Owner"
-msgstr "Sidans ägare"
-
-#: impressum.php:66 impressum.php:103
-msgid "Email Address"
-msgstr "E-postadress"
-
-#: impressum.php:71 impressum.php:101
-msgid "Postal Address"
-msgstr "Postadress"
-
-#: impressum.php:77
-msgid ""
-"The impressum addon needs to be configured!<br />Please add at least the "
-"<tt>owner</tt> variable to your config file. For other variables please "
-"refer to the README file of the addon."
-msgstr ""
-
-#: impressum.php:98
-msgid "Save Settings"
-msgstr ""
-
-#: impressum.php:99
-msgid "The page operators name."
-msgstr ""
-
-#: impressum.php:100
-msgid "Site Owners Profile"
-msgstr ""
-
-#: impressum.php:100
-msgid "Profile address of the operator."
-msgstr ""
-
-#: impressum.php:101
-msgid "How to contact the operator via snail mail. You can use BBCode here."
-msgstr "Hur man kontaktar operatören via snigelpost. Du kan använda BB-kod här."
-
-#: impressum.php:102
-msgid "Notes"
-msgstr "Anteckningar"
-
-#: impressum.php:102
-msgid ""
-"Additional notes that are displayed beneath the contact information. You can"
-" use BBCode here."
-msgstr ""
-
-#: impressum.php:103
-msgid "How to contact the operator via email. (will be displayed obfuscated)"
-msgstr ""
-
-#: impressum.php:104
-msgid "Footer note"
-msgstr "Fotnotering"
-
-#: impressum.php:104
-msgid "Text for the footer. You can use BBCode here."
-msgstr ""
diff --git a/impressum/lang/sv/strings.php b/impressum/lang/sv/strings.php
index 0c7d419e..1942b0b1 100644
--- a/impressum/lang/sv/strings.php
+++ b/impressum/lang/sv/strings.php
@@ -1,14 +1,4 @@
-<?php
-
-if(! function_exists("string_plural_select_sv")) {
-function string_plural_select_sv($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Impressum'] = 'Intryck';
-$a->strings['Site Owner'] = 'Sidans ägare';
-$a->strings['Email Address'] = 'E-postadress';
-$a->strings['Postal Address'] = 'Postadress';
-$a->strings['How to contact the operator via snail mail. You can use BBCode here.'] = 'Hur man kontaktar operatören via snigelpost. Du kan använda BB-kod här.';
-$a->strings['Notes'] = 'Anteckningar';
-$a->strings['Footer note'] = 'Fotnotering';
+<?php
+
+$a->strings["Settings updated."] = "Inst&auml;llningarna har uppdaterats.";
+$a->strings["Submit"] = "Spara";
diff --git a/infiniteimprobabilitydrive/infiniteimprobabilitydrive.php b/infiniteimprobabilitydrive/infiniteimprobabilitydrive.php
index aff7aec0..a71fe651 100644
--- a/infiniteimprobabilitydrive/infiniteimprobabilitydrive.php
+++ b/infiniteimprobabilitydrive/infiniteimprobabilitydrive.php
@@ -5,37 +5,40 @@
 * Version: 1.0
 * Author: Thomas Willingham <https://kakste.com/profile/beardyunixer>
 */
-
-use Friendica\App;
 use Friendica\Core\Hook;
-use Friendica\DI;
+use Friendica\Core\L10n;
 
 function infiniteimprobabilitydrive_install()
 {
 	Hook::register('app_menu', 'addon/infiniteimprobabilitydrive/infiniteimprobabilitydrive.php', 'infiniteimprobabilitydrive_app_menu');
 }
 
-function infiniteimprobabilitydrive_app_menu(array &$b)
+function infiniteimprobabilitydrive_uninstall()
 {
-	$b['app_menu'][] = '<div class="app-title"><a href="infiniteimprobabilitydrive">' . DI::l10n()->t('Infinite Improbability Drive') . '</a></div>';
+	Hook::unregister('app_menu', 'addon/infiniteimprobabilitydrive/infiniteimprobabilitydrive.php', 'infiniteimprobabilitydrive_app_menu');
 }
 
-/**
- * This is a statement rather than an actual function definition. The simple
- * existence of this method is checked to figure out if the addon offers a
- * module.
- */
-function infiniteimprobabilitydrive_module() {}
-
-
-function infiniteimprobabilitydrive_content()
+function infiniteimprobabilitydrive_app_menu($a, &$b)
 {
+	$b['app_menu'][] = '<div class="app-title"><a href="infiniteimprobabilitydrive">' . L10n::t('Infinite Improbability Drive') . '</a></div>';
+}
+
+
+function infiniteimprobabilitydrive_module()
+{
+	return;
+}
+
+
+function infiniteimprobabilitydrive_content(&$a)
+{
+	$baseurl = $a->getBaseURL() . '/addon/infiniteimprobabilitydrive';
 	$o = '';
 
-	DI::page()['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="'.DI::baseUrl().'/addon/infiniteimprobabilitydrive/infiniteimprobabilitydrive.css"/>';
+	$a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="'.$a->getBaseURL().'/addon/infiniteimprobabilitydrive/infiniteimprobabilitydrive.css"/>';
 
 
-	$baseurl = (string)DI::baseUrl();
+	$baseurl = $a->getBaseURL();
 
 	$o .= <<< EOT
 
diff --git a/infiniteimprobabilitydrive/lang/C/messages.po b/infiniteimprobabilitydrive/lang/C/messages.po
index aed36761..0e867643 100644
--- a/infiniteimprobabilitydrive/lang/C/messages.po
+++ b/infiniteimprobabilitydrive/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,6 +17,6 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: infiniteimprobabilitydrive.php:18
+#: infiniteimprobabilitydrive.php:19
 msgid "Infinite Improbability Drive"
 msgstr ""
diff --git a/infiniteimprobabilitydrive/lang/ar/messages.po b/infiniteimprobabilitydrive/lang/ar/messages.po
deleted file mode 100644
index 901b1cb5..00000000
--- a/infiniteimprobabilitydrive/lang/ar/messages.po
+++ /dev/null
@@ -1,24 +0,0 @@
-# ADDON infiniteimprobabilitydrive
-# Copyright (C)
-# This file is distributed under the same license as the Friendica infiniteimprobabilitydrive addon package.
-# 
-# 
-# Translators:
-# Farida Khalaf <faridakhalaf@hotmail.com>, 2021
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2021-02-21 02:54+0000\n"
-"Last-Translator: Farida Khalaf <faridakhalaf@hotmail.com>\n"
-"Language-Team: Arabic (http://www.transifex.com/Friendica/friendica/language/ar/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ar\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-
-#: infiniteimprobabilitydrive.php:18
-msgid "Infinite Improbability Drive"
-msgstr "محرك اللااحتمالية اللانهائية"
diff --git a/infiniteimprobabilitydrive/lang/ar/strings.php b/infiniteimprobabilitydrive/lang/ar/strings.php
deleted file mode 100644
index 1bcaaba9..00000000
--- a/infiniteimprobabilitydrive/lang/ar/strings.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_ar")) {
-function string_plural_select_ar($n){
-	$n = intval($n);
-	if ($n==0) { return 0; } else if ($n==1) { return 1; } else if ($n==2) { return 2; } else if ($n%100>=3 && $n%100<=10) { return 3; } else if ($n%100>=11 && $n%100<=99) { return 4; } else  { return 5; }
-}}
-$a->strings['Infinite Improbability Drive'] = 'محرك اللااحتمالية اللانهائية';
diff --git a/infiniteimprobabilitydrive/lang/ca/strings.php b/infiniteimprobabilitydrive/lang/ca/strings.php
index 3d564a48..9020ca59 100644
--- a/infiniteimprobabilitydrive/lang/ca/strings.php
+++ b/infiniteimprobabilitydrive/lang/ca/strings.php
@@ -3,6 +3,7 @@
 if(! function_exists("string_plural_select_ca")) {
 function string_plural_select_ca($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Infinite Improbability Drive'] = 'Unitat de millora de la infinitat';
+;
+$a->strings["Infinite Improbability Drive"] = "Unitat de millora de la infinitat";
diff --git a/infiniteimprobabilitydrive/lang/cs/messages.po b/infiniteimprobabilitydrive/lang/cs/messages.po
index be0f3ddd..e264d190 100644
--- a/infiniteimprobabilitydrive/lang/cs/messages.po
+++ b/infiniteimprobabilitydrive/lang/cs/messages.po
@@ -4,21 +4,21 @@
 # 
 # 
 # Translators:
-# michal_s <msupler@gmail.com>, 2014
+# Michal Šupler <msupler@gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2014-06-23 08:41+0000\n"
-"Last-Translator: michal_s <msupler@gmail.com>, 2014\n"
-"Language-Team: Czech (http://app.transifex.com/Friendica/friendica/language/cs/)\n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-07 19:12+0000\n"
+"Last-Translator: Michal Šupler <msupler@gmail.com>\n"
+"Language-Team: Czech (http://www.transifex.com/projects/p/friendica/language/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: cs\n"
-"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: infiniteimprobabilitydrive.php:18
+#: infiniteimprobabilitydrive.php:19
 msgid "Infinite Improbability Drive"
 msgstr "Infinite Improbability Drive"
diff --git a/infiniteimprobabilitydrive/lang/cs/strings.php b/infiniteimprobabilitydrive/lang/cs/strings.php
index 72422ae6..9dec8bcc 100644
--- a/infiniteimprobabilitydrive/lang/cs/strings.php
+++ b/infiniteimprobabilitydrive/lang/cs/strings.php
@@ -2,7 +2,7 @@
 
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
-	$n = intval($n);
-	if (($n == 1 && $n % 1 == 0)) { return 0; } else if (($n >= 2 && $n <= 4 && $n % 1 == 0)) { return 1; } else if (($n % 1 != 0 )) { return 2; } else  { return 3; }
+	return ($n==1) ? 0 : ($n>=2 && $n<=4) ? 1 : 2;;
 }}
-$a->strings['Infinite Improbability Drive'] = 'Infinite Improbability Drive';
+;
+$a->strings["Infinite Improbability Drive"] = "Infinite Improbability Drive";
diff --git a/infiniteimprobabilitydrive/lang/da-dk/messages.po b/infiniteimprobabilitydrive/lang/da-dk/messages.po
deleted file mode 100644
index 3f2fbac5..00000000
--- a/infiniteimprobabilitydrive/lang/da-dk/messages.po
+++ /dev/null
@@ -1,24 +0,0 @@
-# ADDON infiniteimprobabilitydrive
-# Copyright (C)
-# This file is distributed under the same license as the Friendica infiniteimprobabilitydrive addon package.
-# 
-# 
-# Translators:
-# Anton <dev@atjn.dk>, 2022
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2014-06-23 08:41+0000\n"
-"Last-Translator: Anton <dev@atjn.dk>, 2022\n"
-"Language-Team: Danish (Denmark) (http://www.transifex.com/Friendica/friendica/language/da_DK/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: da_DK\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: infiniteimprobabilitydrive.php:18
-msgid "Infinite Improbability Drive"
-msgstr "Uendelig usandsynlighedsmotor"
diff --git a/infiniteimprobabilitydrive/lang/da-dk/strings.php b/infiniteimprobabilitydrive/lang/da-dk/strings.php
deleted file mode 100644
index caf39fe9..00000000
--- a/infiniteimprobabilitydrive/lang/da-dk/strings.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_da_dk")) {
-function string_plural_select_da_dk($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Infinite Improbability Drive'] = 'Uendelig usandsynlighedsmotor';
diff --git a/infiniteimprobabilitydrive/lang/de/messages.po b/infiniteimprobabilitydrive/lang/de/messages.po
index 3fc09443..e9ecccb5 100644
--- a/infiniteimprobabilitydrive/lang/de/messages.po
+++ b/infiniteimprobabilitydrive/lang/de/messages.po
@@ -4,21 +4,21 @@
 # 
 # 
 # Translators:
-# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2014
+# bavatar <tobias.diekershoff@gmx.net>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2014-06-23 08:41+0000\n"
-"Last-Translator: Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2014\n"
-"Language-Team: German (http://app.transifex.com/Friendica/friendica/language/de/)\n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-06 12:15+0000\n"
+"Last-Translator: bavatar <tobias.diekershoff@gmx.net>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/friendica/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: infiniteimprobabilitydrive.php:18
+#: infiniteimprobabilitydrive.php:19
 msgid "Infinite Improbability Drive"
 msgstr "Infinite Improbability Drive"
diff --git a/infiniteimprobabilitydrive/lang/de/strings.php b/infiniteimprobabilitydrive/lang/de/strings.php
index e6cad2c7..d98dd403 100644
--- a/infiniteimprobabilitydrive/lang/de/strings.php
+++ b/infiniteimprobabilitydrive/lang/de/strings.php
@@ -2,7 +2,7 @@
 
 if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Infinite Improbability Drive'] = 'Infinite Improbability Drive';
+;
+$a->strings["Infinite Improbability Drive"] = "Infinite Improbability Drive";
diff --git a/infiniteimprobabilitydrive/lang/es/strings.php b/infiniteimprobabilitydrive/lang/es/strings.php
index 9d0aa331..7387f4dd 100644
--- a/infiniteimprobabilitydrive/lang/es/strings.php
+++ b/infiniteimprobabilitydrive/lang/es/strings.php
@@ -2,7 +2,7 @@
 
 if(! function_exists("string_plural_select_es")) {
 function string_plural_select_es($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Infinite Improbability Drive'] = 'Drive de improbabilidad infinita';
+;
+$a->strings["Infinite Improbability Drive"] = "Drive de improbabilidad infinita";
diff --git a/infiniteimprobabilitydrive/lang/fr/messages.po b/infiniteimprobabilitydrive/lang/fr/messages.po
deleted file mode 100644
index 998a7a85..00000000
--- a/infiniteimprobabilitydrive/lang/fr/messages.po
+++ /dev/null
@@ -1,24 +0,0 @@
-# ADDON infiniteimprobabilitydrive
-# Copyright (C)
-# This file is distributed under the same license as the Friendica infiniteimprobabilitydrive addon package.
-# 
-# 
-# Translators:
-# Hypolite Petovan <hypolite@mrpetovan.com>, 2016
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2014-06-23 08:41+0000\n"
-"Last-Translator: Hypolite Petovan <hypolite@mrpetovan.com>, 2016\n"
-"Language-Team: French (http://www.transifex.com/Friendica/friendica/language/fr/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: fr\n"
-"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
-
-#: infiniteimprobabilitydrive.php:18
-msgid "Infinite Improbability Drive"
-msgstr "Générateur d'improbabilté infinie"
diff --git a/infiniteimprobabilitydrive/lang/fr/strings.php b/infiniteimprobabilitydrive/lang/fr/strings.php
index 6b170598..ac788655 100644
--- a/infiniteimprobabilitydrive/lang/fr/strings.php
+++ b/infiniteimprobabilitydrive/lang/fr/strings.php
@@ -1,8 +1,3 @@
-<?php
-
-if(! function_exists("string_plural_select_fr")) {
-function string_plural_select_fr($n){
-	$n = intval($n);
-	if (($n == 0 || $n == 1)) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
-}}
-$a->strings['Infinite Improbability Drive'] = 'Générateur d\'improbabilté infinie';
+<?php
+
+$a->strings["Infinite Improbability Drive"] = "Générateur d'improbabilté infinie";
diff --git a/infiniteimprobabilitydrive/lang/hu/messages.po b/infiniteimprobabilitydrive/lang/hu/messages.po
deleted file mode 100644
index bfb49fca..00000000
--- a/infiniteimprobabilitydrive/lang/hu/messages.po
+++ /dev/null
@@ -1,24 +0,0 @@
-# ADDON infiniteimprobabilitydrive
-# Copyright (C)
-# This file is distributed under the same license as the Friendica infiniteimprobabilitydrive addon package.
-# 
-# 
-# Translators:
-# Balázs Úr, 2020-2021
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2014-06-23 08:41+0000\n"
-"Last-Translator: Balázs Úr, 2020-2021\n"
-"Language-Team: Hungarian (http://www.transifex.com/Friendica/friendica/language/hu/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: hu\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: infiniteimprobabilitydrive.php:18
-msgid "Infinite Improbability Drive"
-msgstr "Végtelen valószínűségű meghajtó"
diff --git a/infiniteimprobabilitydrive/lang/hu/strings.php b/infiniteimprobabilitydrive/lang/hu/strings.php
deleted file mode 100644
index 261aa913..00000000
--- a/infiniteimprobabilitydrive/lang/hu/strings.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_hu")) {
-function string_plural_select_hu($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Infinite Improbability Drive'] = 'Végtelen valószínűségű meghajtó';
diff --git a/infiniteimprobabilitydrive/lang/it/messages.po b/infiniteimprobabilitydrive/lang/it/messages.po
index 41110b5a..be86c98b 100644
--- a/infiniteimprobabilitydrive/lang/it/messages.po
+++ b/infiniteimprobabilitydrive/lang/it/messages.po
@@ -9,16 +9,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2014-06-23 08:41+0000\n"
-"Last-Translator: fabrixxm <fabrix.xm@gmail.com>, 2014\n"
-"Language-Team: Italian (http://app.transifex.com/Friendica/friendica/language/it/)\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2017-09-20 06:08+0000\n"
+"Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n"
+"Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: it\n"
-"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: infiniteimprobabilitydrive.php:18
+#: infiniteimprobabilitydrive.php:19
 msgid "Infinite Improbability Drive"
 msgstr "Motore ad Improbabilità Infinita"
diff --git a/infiniteimprobabilitydrive/lang/it/strings.php b/infiniteimprobabilitydrive/lang/it/strings.php
index fc7dda5c..5909f754 100644
--- a/infiniteimprobabilitydrive/lang/it/strings.php
+++ b/infiniteimprobabilitydrive/lang/it/strings.php
@@ -2,7 +2,7 @@
 
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
-	$n = intval($n);
-	if ($n == 1) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
+	return ($n != 1);;
 }}
-$a->strings['Infinite Improbability Drive'] = 'Motore ad Improbabilità Infinita';
+;
+$a->strings["Infinite Improbability Drive"] = "Motore ad Improbabilità Infinita";
diff --git a/infiniteimprobabilitydrive/lang/nl/strings.php b/infiniteimprobabilitydrive/lang/nl/strings.php
index 4e68c1fc..9da6a726 100644
--- a/infiniteimprobabilitydrive/lang/nl/strings.php
+++ b/infiniteimprobabilitydrive/lang/nl/strings.php
@@ -3,6 +3,7 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Infinite Improbability Drive'] = 'Oneindige schijf voor onbetrouwbaarheid';
+;
+$a->strings["Infinite Improbability Drive"] = "Oneindige schijf voor onbetrouwbaarheid";
diff --git a/infiniteimprobabilitydrive/lang/pl/messages.po b/infiniteimprobabilitydrive/lang/pl/messages.po
index fd2c4563..34848456 100644
--- a/infiniteimprobabilitydrive/lang/pl/messages.po
+++ b/infiniteimprobabilitydrive/lang/pl/messages.po
@@ -4,14 +4,14 @@
 # 
 # 
 # Translators:
-# Waldemar Stoczkowski, 2018
+# Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2014-06-23 08:41+0000\n"
-"Last-Translator: Waldemar Stoczkowski, 2018\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2018-04-20 20:59+0000\n"
+"Last-Translator: Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.com/Friendica/friendica/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,6 +19,6 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
-#: infiniteimprobabilitydrive.php:18
+#: infiniteimprobabilitydrive.php:19
 msgid "Infinite Improbability Drive"
 msgstr "Wyświetl losowego użytkownika"
diff --git a/infiniteimprobabilitydrive/lang/pl/strings.php b/infiniteimprobabilitydrive/lang/pl/strings.php
index e7fc2d7c..85356333 100644
--- a/infiniteimprobabilitydrive/lang/pl/strings.php
+++ b/infiniteimprobabilitydrive/lang/pl/strings.php
@@ -2,7 +2,7 @@
 
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
-	$n = intval($n);
-	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
+	return ($n==1 ? 0 : ($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14) ? 1 : $n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14) ? 2 : 3);;
 }}
-$a->strings['Infinite Improbability Drive'] = 'Wyświetl losowego użytkownika';
+;
+$a->strings["Infinite Improbability Drive"] = "Wyświetl losowego użytkownika";
diff --git a/infiniteimprobabilitydrive/lang/pt-br/strings.php b/infiniteimprobabilitydrive/lang/pt-br/strings.php
index 55a88c64..10c7f46e 100644
--- a/infiniteimprobabilitydrive/lang/pt-br/strings.php
+++ b/infiniteimprobabilitydrive/lang/pt-br/strings.php
@@ -2,7 +2,7 @@
 
 if(! function_exists("string_plural_select_pt_br")) {
 function string_plural_select_pt_br($n){
-	$n = intval($n);
-	return intval($n > 1);
+	return ($n > 1);;
 }}
-$a->strings['Infinite Improbability Drive'] = 'Gerador de improbabilidade infinita';
+;
+$a->strings["Infinite Improbability Drive"] = "Gerador de improbabilidade infinita";
diff --git a/infiniteimprobabilitydrive/lang/ro/strings.php b/infiniteimprobabilitydrive/lang/ro/strings.php
index c9b8cb19..b082c2e8 100644
--- a/infiniteimprobabilitydrive/lang/ro/strings.php
+++ b/infiniteimprobabilitydrive/lang/ro/strings.php
@@ -2,7 +2,7 @@
 
 if(! function_exists("string_plural_select_ro")) {
 function string_plural_select_ro($n){
-	$n = intval($n);
-	if ($n==1) { return 0; } else if ((($n%100>19)||(($n%100==0)&&($n!=0)))) { return 2; } else  { return 1; }
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
 }}
-$a->strings['Infinite Improbability Drive'] = 'Unitate improbabil infinită';
+;
+$a->strings["Infinite Improbability Drive"] = "Unitate improbabil infinită";
diff --git a/infiniteimprobabilitydrive/lang/ru/messages.po b/infiniteimprobabilitydrive/lang/ru/messages.po
deleted file mode 100644
index 4e99e2db..00000000
--- a/infiniteimprobabilitydrive/lang/ru/messages.po
+++ /dev/null
@@ -1,24 +0,0 @@
-# ADDON infiniteimprobabilitydrive
-# Copyright (C)
-# This file is distributed under the same license as the Friendica infiniteimprobabilitydrive addon package.
-# 
-# 
-# Translators:
-# Alexander An <ravnina@gmail.com>, 2020
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-27 05:01-0500\n"
-"PO-Revision-Date: 2020-04-23 14:28+0000\n"
-"Last-Translator: Alexander An <ravnina@gmail.com>\n"
-"Language-Team: Russian (http://www.transifex.com/Friendica/friendica/language/ru/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ru\n"
-"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
-
-#: infiniteimprobabilitydrive.php:19
-msgid "Infinite Improbability Drive"
-msgstr "Infinite Improbability Drive"
diff --git a/infiniteimprobabilitydrive/lang/ru/strings.php b/infiniteimprobabilitydrive/lang/ru/strings.php
index 9c13b93c..8f1e62de 100644
--- a/infiniteimprobabilitydrive/lang/ru/strings.php
+++ b/infiniteimprobabilitydrive/lang/ru/strings.php
@@ -1,8 +1,3 @@
-<?php
-
-if(! function_exists("string_plural_select_ru")) {
-function string_plural_select_ru($n){
-	$n = intval($n);
-	if ($n%10==1 && $n%100!=11) { return 0; } else if ($n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14)) { return 1; } else if ($n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)) { return 2; } else  { return 3; }
-}}
-$a->strings['Infinite Improbability Drive'] = 'Infinite Improbability Drive';
+<?php
+
+$a->strings["Infinite Improbability Drive"] = "";
diff --git a/infiniteimprobabilitydrive/lang/sv/messages.po b/infiniteimprobabilitydrive/lang/sv/messages.po
deleted file mode 100644
index 1aa843f0..00000000
--- a/infiniteimprobabilitydrive/lang/sv/messages.po
+++ /dev/null
@@ -1,23 +0,0 @@
-# ADDON infiniteimprobabilitydrive
-# Copyright (C)
-# This file is distributed under the same license as the Friendica infiniteimprobabilitydrive addon package.
-# 
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2014-06-23 08:41+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Swedish (http://www.transifex.com/Friendica/friendica/language/sv/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: sv\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: infiniteimprobabilitydrive.php:18
-msgid "Infinite Improbability Drive"
-msgstr ""
diff --git a/infiniteimprobabilitydrive/lang/sv/strings.php b/infiniteimprobabilitydrive/lang/sv/strings.php
index 72e9772f..ab4fa67a 100644
--- a/infiniteimprobabilitydrive/lang/sv/strings.php
+++ b/infiniteimprobabilitydrive/lang/sv/strings.php
@@ -1,7 +1,2 @@
-<?php
-
-if(! function_exists("string_plural_select_sv")) {
-function string_plural_select_sv($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
+<?php
+
diff --git a/invidious/README.md b/invidious/README.md
deleted file mode 100644
index 0f91fa02..00000000
--- a/invidious/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-invidious Addon for Friendica
-==========================
-
-This addon will replace "youtube.com" with the chosen Invidious instance
diff --git a/invidious/invidious.php b/invidious/invidious.php
deleted file mode 100644
index 1078d26d..00000000
--- a/invidious/invidious.php
+++ /dev/null
@@ -1,104 +0,0 @@
-<?php
-/*
- * Name: invidious
- * Description: Replaces links to youtube.com to an invidious instance in all displays of postings on a node.
- * Version: 0.3
- * Author: Matthias Ebers <https://loma.ml/profile/feb>
- * Author: Michael Vogel <https://pirati.ca/profile/heluecht>
- * Status: Unsupported
- * Note: Please use the URL Replace addon instead
- */
-
-use Friendica\Core\Hook;
-use Friendica\Core\Renderer;
-use Friendica\DI;
-
-CONST INVIDIOUS_DEFAULT = 'https://invidio.us';
-
-function invidious_install()
-{
-	Hook::register('prepare_body_final',  __FILE__, 'invidious_render');
-	Hook::register('addon_settings',      __FILE__, 'invidious_settings');
-	Hook::register('addon_settings_post', __FILE__, 'invidious_settings_post');
-}
-
-/* Handle the send data from the admin settings
- */
-function invidious_addon_admin_post()
-{
-	DI::config()->set('invidious', 'server', trim($_POST['invidiousserver'], " \n\r\t\v\x00/"));
-}
-
-/* Hook into the admin settings to let the admin choose an
- * invidious server to use for the replacement.
- */
-function invidious_addon_admin(string &$o)
-{
-	$invidiousserver = DI::config()->get('invidious', 'server', INVIDIOUS_DEFAULT);
-	$t = Renderer::getMarkupTemplate('admin.tpl', 'addon/invidious/');
-	$o = Renderer::replaceMacros($t, [
-		'$settingdescription' => DI::l10n()->t('Which Invidious server shall be used for the replacements in the post bodies? Use the URL with servername and protocol. See %s for a list of available public Invidious servers.', 'https://redirect.invidious.io'),
-		'$invidiousserver'    => ['invidiousserver', DI::l10n()->t('Invidious server'), $invidiousserver, DI::l10n()->t('See %s for a list of available Invidious servers.', '<a href="https://api.invidious.io/">https://api.invidious.io/</a>')],
-		'$submit'             => DI::l10n()->t('Save Settings'),
-	]);
-}
-
-function invidious_settings(array &$data)
-{
-	if (!DI::userSession()->getLocalUserId()) {
-		return;
-	}
-
-	$enabled = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'invidious', 'enabled');
-	$server  = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'invidious', 'server', DI::config()->get('invidious', 'server', INVIDIOUS_DEFAULT));
-
-	$t    = Renderer::getMarkupTemplate('settings.tpl', 'addon/invidious/');
-	$html = Renderer::replaceMacros($t, [
-		'$enabled' => ['enabled', DI::l10n()->t('Replace Youtube links with links to an Invidious server'), $enabled, DI::l10n()->t('If enabled, Youtube links are replaced with the links to the specified Invidious server.')],
-		'$server'  => ['server', DI::l10n()->t('Invidious server'), $server, DI::l10n()->t('See %s for a list of available Invidious servers.', '<a href="https://api.invidious.io/">https://api.invidious.io/</a>')],
-	]);
-
-	$data = [
-		'addon' => 'invidious',
-		'title' => DI::l10n()->t('Invidious Settings'),
-		'html'  => $html,
-	];
-}
-
-function invidious_settings_post(array &$b)
-{
-	if (!DI::userSession()->getLocalUserId() || empty($_POST['invidious-submit'])) {
-		return;
-	}
-
-	DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'invidious', 'enabled', (bool)$_POST['enabled']);
-
-	$server = trim($_POST['server'], " \n\r\t\v\x00/");
-	if ($server != DI::config()->get('invidious', 'server', INVIDIOUS_DEFAULT) && !empty($server)) {
-		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'invidious', 'server', $server);
-	} else {
-		DI::pConfig()->delete(DI::userSession()->getLocalUserId(), 'invidious', 'server');
-	}
-}
-
-/*
- *  replace "youtube.com" with the chosen Invidious instance
- */
-function invidious_render(array &$b)
-{
-	if (!DI::userSession()->getLocalUserId() || !DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'invidious', 'enabled')) {
-		return;
-	}
-
-	$original = $b['html'];
-	$server   = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'invidious', 'server', DI::config()->get('invidious', 'server', INVIDIOUS_DEFAULT));
-
-	$b['html'] = preg_replace("/https?:\/\/www.youtube.com\/watch\?v\=(.*?)/ism", $server . '/watch?v=$1', $b['html']);
-	$b['html'] = preg_replace("/https?:\/\/www.youtube.com\/embed\/(.*?)/ism", $server . '/embed/$1', $b['html']);
-	$b['html'] = preg_replace("/https?:\/\/www.youtube.com\/shorts\/(.*?)/ism", $server . '/shorts/$1', $b['html']);
-	$b['html'] = preg_replace("/https?:\/\/youtu.be\/(.*?)/ism", $server . '/watch?v=$1', $b['html']);
-
-	if ($original != $b['html']) {
-		$b['html'] .= '<hr><p><small>' . DI::l10n()->t('(Invidious addon enabled: YouTube links via %s)', $server) . '</small></p>';
-	}
-}
diff --git a/invidious/lang/C/messages.po b/invidious/lang/C/messages.po
deleted file mode 100644
index b9de496c..00000000
--- a/invidious/lang/C/messages.po
+++ /dev/null
@@ -1,58 +0,0 @@
-# ADDON invidious
-# Copyright (C) 
-# This file is distributed under the same license as the Friendica invidious addon package.
-# 
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-12-18 17:23+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: invidious.php:39
-#, php-format
-msgid ""
-"Which Invidious server shall be used for the replacements in the post "
-"bodies? Use the URL with servername and protocol. See %s for a list of "
-"available public Invidious servers."
-msgstr ""
-
-#: invidious.php:40 invidious.php:57
-msgid "Invidious server"
-msgstr ""
-
-#: invidious.php:40 invidious.php:57
-#, php-format
-msgid "See %s for a list of available Invidious servers."
-msgstr ""
-
-#: invidious.php:41
-msgid "Save Settings"
-msgstr ""
-
-#: invidious.php:56
-msgid "Replace Youtube links with links to an Invidious server"
-msgstr ""
-
-#: invidious.php:56
-msgid ""
-"If enabled, Youtube links are replaced with the links to the specified "
-"Invidious server."
-msgstr ""
-
-#: invidious.php:62
-msgid "Invidious Settings"
-msgstr ""
-
-#: invidious.php:101
-#, php-format
-msgid "(Invidious addon enabled: YouTube links via %s)"
-msgstr ""
diff --git a/invidious/templates/admin.tpl b/invidious/templates/admin.tpl
deleted file mode 100644
index 1db85ff9..00000000
--- a/invidious/templates/admin.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-<p>{{$settingdescription}}</p>
-
-{{include file="field_input.tpl" field=$invidiousserver}}
-
-<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
diff --git a/invidious/templates/settings.tpl b/invidious/templates/settings.tpl
deleted file mode 100644
index 387286ef..00000000
--- a/invidious/templates/settings.tpl
+++ /dev/null
@@ -1,2 +0,0 @@
-{{include file="field_checkbox.tpl" field=$enabled}}
-{{include file="field_input.tpl" field=$server}}
diff --git a/irc/irc.php b/irc/irc.php
index d4435851..d02b2cbd 100644
--- a/irc/irc.php
+++ b/irc/irc.php
@@ -7,141 +7,144 @@
 * Author: Tobias Diekershoff <https://f.diekershoff.de/u/tobias>
 */
 
-use Friendica\App;
+use Friendica\Core\Config;
 use Friendica\Core\Hook;
+use Friendica\Core\L10n;
+use Friendica\Core\PConfig;
 use Friendica\Core\Renderer;
-use Friendica\DI;
 
-function irc_install()
-{
+function irc_install() {
 	Hook::register('app_menu', 'addon/irc/irc.php', 'irc_app_menu');
 	Hook::register('addon_settings', 'addon/irc/irc.php', 'irc_addon_settings');
 	Hook::register('addon_settings_post', 'addon/irc/irc.php', 'irc_addon_settings_post');
 }
 
-function irc_addon_settings(array &$data)
-{
-	if (!DI::userSession()->getLocalUserId()) {
+function irc_uninstall() {
+	Hook::unregister('app_menu', 'addon/irc/irc.php', 'irc_app_menu');
+	Hook::unregister('addon_settings', 'addon/irc/irc.php', 'irc_addon_settings');
+
+}
+
+
+function irc_addon_settings(&$a,&$s) {
+	if(! local_user())
 		return;
-	}
 
-	$sitechats = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'irc', 'sitechats'); /* popular channels */
-	$autochans = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'irc', 'autochans');  /* auto connect chans */
+    /* Add our stylesheet to the page so we can make our settings look nice */
 
-	$t    = Renderer::getMarkupTemplate('settings.tpl', 'addon/irc/');
-	$html = Renderer::replaceMacros($t, [
-		'$info'      => DI::l10n()->t('Here you can change the system wide settings for the channels to automatically join and access via the side bar. Note the changes you do here, only effect the channel selection if you are logged in.'),
-		'$autochans' => ['autochans', DI::l10n()->t('Channel(s) to auto connect (comma separated)'), $autochans, DI::l10n()->t('List of channels that shall automatically connected to when the app is launched.')],
-		'$sitechats' => ['sitechats', DI::l10n()->t('Popular Channels (comma separated)'), $sitechats, DI::l10n()->t('List of popular channels, will be displayed at the side and hotlinked for easy joining.')],
+//	$a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->getBaseURL() . '/addon/irc/irc.css' . '" media="all" />' . "\r\n";
+
+    /* setting popular channels, auto connect channels */
+	$sitechats = PConfig::get( local_user(), 'irc','sitechats'); /* popular channels */
+	$autochans = PConfig::get( local_user(), 'irc','autochans');  /* auto connect chans */
+
+	$t = Renderer::getMarkupTemplate( "settings.tpl", "addon/irc/" );
+	$s .= Renderer::replaceMacros($t, [
+	    	'$header' => L10n::t('IRC Settings'),
+		'$info' => L10n::t('Here you can change the system wide settings for the channels to automatically join and access via the side bar. Note the changes you do here, only effect the channel selection if you are logged in.'),
+		'$submit' => L10n::t('Save Settings'),
+		'$autochans' => [ 'autochans', L10n::t('Channel(s) to auto connect (comma separated)'), $autochans, L10n::t('List of channels that shall automatically connected to when the app is launched.')],
+		'$sitechats' => [ 'sitechats', L10n::t('Popular Channels (comma separated)'), $sitechats, L10n::t('List of popular channels, will be displayed at the side and hotlinked for easy joining.') ]
 	]);
 
-	$data = [
-		'addon' => 'irc',
-		'title' => DI::l10n()->t('IRC Settings'),
-		'html'  => $html,
-	];
+
+	return;
+
 }
 
-function irc_addon_settings_post(array &$b)
-{
-	if (!DI::userSession()->getLocalUserId()) {
+function irc_addon_settings_post(&$a, &$b) {
+	if(!local_user())
 		return;
-	}
 
-	if (!empty($_POST['irc-submit'])) {
+	if(!empty($_POST['irc-submit'])) {
 		if (isset($_POST['autochans'])) {
-			DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'irc', 'autochans', trim(($_POST['autochans'])));
+			PConfig::set(local_user(), 'irc', 'autochans', trim(($_POST['autochans'])));
 		}
 		if (isset($_POST['sitechats'])) {
-			DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'irc', 'sitechats', trim($_POST['sitechats']));
+			PConfig::set(local_user(), 'irc', 'sitechats', trim($_POST['sitechats']));
 		}
 		/* upid pop-up thing */
+		info(L10n::t('IRC settings saved.') . EOL);
 	}
 }
 
-function irc_app_menu(array &$b)
-{
-	$b['app_menu'][] = '<div class="app-title"><a href="irc">' . DI::l10n()->t('IRC Chatroom') . '</a></div>';
+function irc_app_menu($a,&$b) {
+	$b['app_menu'][] = '<div class="app-title"><a href="irc">' . L10n::t('IRC Chatroom') . '</a></div>';
 }
 
-/**
- * This is a statement rather than an actual function definition. The simple
- * existence of this method is checked to figure out if the addon offers a
- * module.
- */
-function irc_module() {}
 
-function irc_content()
-{
-	$baseurl = DI::baseUrl() . '/addon/irc';
+function irc_module() {
+	return;
+}
+
+
+function irc_content(&$a) {
+
+	$baseurl = $a->getBaseURL() . '/addon/irc';
 	$o = '';
 
 	/* set the list of popular channels */
-	if (DI::userSession()->getLocalUserId()) {
-		$sitechats = DI::pConfig()->get( DI::userSession()->getLocalUserId(), 'irc', 'sitechats');
-		if (!$sitechats) {
-			$sitechats = DI::config()->get('irc', 'sitechats');
-		}
+	if (local_user()) {
+	    $sitechats = PConfig::get( local_user(), 'irc', 'sitechats');
+	    if (!$sitechats)
+		$sitechats = Config::get('irc', 'sitechats');
 	} else {
-		$sitechats = DI::config()->get('irc','sitechats');
+	    $sitechats = Config::get('irc','sitechats');
 	}
-
-	if ($sitechats) {
+	if($sitechats)
 		$chats = explode(',',$sitechats);
-	} else {
+	else
 		$chats = ['friendica','chat','chatback','hottub','ircbar','dateroom','debian'];
-	}
 
 
-	DI::page()['aside'] .= '<div class="widget"><h3>' . DI::l10n()->t('Popular Channels') . '</h3><ul>';
-	foreach ($chats as $chat) {
-		DI::page()['aside'] .= '<li><a href="' . DI::baseUrl() . '/irc?channels=' . $chat . '" >' . '#' . $chat . '</a></li>';
+	$a->page['aside'] .= '<div class="widget"><h3>' . L10n::t('Popular Channels') . '</h3><ul>';
+	foreach($chats as $chat) {
+		$a->page['aside'] .= '<li><a href="' . $a->getBaseURL() . '/irc?channels=' . $chat . '" >' . '#' . $chat . '</a></li>';
 	}
-	DI::page()['aside'] .= '</ul></div>';
+	$a->page['aside'] .= '</ul></div>';
 
         /* setting the channel(s) to auto connect */
-	if (DI::userSession()->getLocalUserId()) {
-	    $autochans = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'irc', 'autochans');
+	if (local_user()) {
+	    $autochans = PConfig::get(local_user(), 'irc', 'autochans');
 	    if (!$autochans)
-		$autochans = DI::config()->get('irc','autochans');
+		$autochans = Config::get('irc','autochans');
 	} else {
-	    $autochans = DI::config()->get('irc','autochans');
+	    $autochans = Config::get('irc','autochans');
 	}
-
-	if ($autochans) {
+	if($autochans)
 		$channels = $autochans;
-	} else {
+	else
 		$channels = ($_GET['channels'] ?? '') ?: 'friendica';
-	}
 
 /* add the chatroom frame and some html */
   $o .= <<< EOT
 <h2>IRC chat</h2>
-<p><a href="https://tldp.org/HOWTO/IRC/beginners.html" target="_blank" rel="noopener noreferrer">A beginner's guide to using IRC. [en]</a></p>
-<iframe src="//web.libera.chat?channels=$channels" style="width:100%; max-width:900px; height: 600px;"></iframe>
+<p><a href="http://tldp.org/HOWTO/IRC/beginners.html" target="_blank">A beginner's guide to using IRC. [en]</a></p>
+<iframe src="//webchat.freenode.net?channels=$channels" style="width:100%; max-width:900px; height: 600px;"></iframe>
 EOT;
 
-	return $o;
+return $o;
+
 }
 
-function irc_addon_admin_post ()
-{
-	if (!DI::userSession()->isSiteAdmin()) {
+function irc_addon_admin_post (&$a) {
+	if(! is_site_admin())
 		return;
-	}
 
-	if ($_POST['irc-submit']) {
-		DI::config()->set('irc', 'autochans', trim($_POST['autochans']));
-		DI::config()->set('irc', 'sitechats', trim($_POST['sitechats']));
+	if($_POST['irc-submit']) {
+		Config::set('irc','autochans',trim($_POST['autochans']));
+		Config::set('irc','sitechats',trim($_POST['sitechats']));
+		/* stupid pop-up thing */
+		info(L10n::t('IRC settings saved.') . EOL);
 	}
 }
-function irc_addon_admin (string &$o) {
-	$sitechats = DI::config()->get('irc', 'sitechats'); /* popular channels */
-	$autochans = DI::config()->get('irc', 'autochans');  /* auto connect chans */
-	$t = Renderer::getMarkupTemplate('admin.tpl', 'addon/irc/' );
+function irc_addon_admin (&$a, &$o) {
+	$sitechats = Config::get('irc','sitechats'); /* popular channels */
+	$autochans = Config::get('irc','autochans');  /* auto connect chans */
+	$t = Renderer::getMarkupTemplate( "admin.tpl", "addon/irc/" );
 	$o = Renderer::replaceMacros($t, [
-		'$submit' => DI::l10n()->t('Save Settings'),
-		'$autochans' => [ 'autochans', DI::l10n()->t('Channel(s) to auto connect (comma separated)'), $autochans, DI::l10n()->t('List of channels that shall automatically connected to when the app is launched.')],
-		'$sitechats' => [ 'sitechats', DI::l10n()->t('Popular Channels (comma separated)'), $sitechats, DI::l10n()->t('List of popular channels, will be displayed at the side and hotlinked for easy joining.') ]
+		'$submit' => L10n::t('Save Settings'),
+		'$autochans' => [ 'autochans', L10n::t('Channel(s) to auto connect (comma separated)'), $autochans, L10n::t('List of channels that shall automatically connected to when the app is launched.')],
+		'$sitechats' => [ 'sitechats', L10n::t('Popular Channels (comma separated)'), $sitechats, L10n::t('List of popular channels, will be displayed at the side and hotlinked for easy joining.') ]
 	]);
 }
diff --git a/irc/lang/C/messages.po b/irc/lang/C/messages.po
index 859cdf16..86c203aa 100644
--- a/irc/lang/C/messages.po
+++ b/irc/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:14-0500\n"
+"POT-Creation-Date: 2015-07-08 13:17+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,45 +17,49 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: irc.php:32
+#: irc.php:37
+msgid "IRC Settings"
+msgstr ""
+
+#: irc.php:38
 msgid ""
 "Here you can change the system wide settings for the channels to "
 "automatically join and access via the side bar. Note the changes you do "
 "here, only effect the channel selection if you are logged in."
 msgstr ""
 
-#: irc.php:33 irc.php:133
+#: irc.php:39 irc.php:136
+msgid "Save Settings"
+msgstr ""
+
+#: irc.php:40 irc.php:137
 msgid "Channel(s) to auto connect (comma separated)"
 msgstr ""
 
-#: irc.php:33 irc.php:133
+#: irc.php:40 irc.php:137
 msgid ""
 "List of channels that shall automatically connected to when the app is "
 "launched."
 msgstr ""
 
-#: irc.php:34 irc.php:134
+#: irc.php:41 irc.php:138
 msgid "Popular Channels (comma separated)"
 msgstr ""
 
-#: irc.php:34 irc.php:134
+#: irc.php:41 irc.php:138
 msgid ""
 "List of popular channels, will be displayed at the side and hotlinked for "
 "easy joining."
 msgstr ""
 
-#: irc.php:39
-msgid "IRC Settings"
+#: irc.php:57 irc.php:128
+msgid "IRC settings saved."
 msgstr ""
 
-#: irc.php:60
+#: irc.php:62
 msgid "IRC Chatroom"
 msgstr ""
 
-#: irc.php:88
+#: irc.php:90
 msgid "Popular Channels"
 msgstr ""
-
-#: irc.php:132
-msgid "Save Settings"
-msgstr ""
diff --git a/irc/lang/ar/messages.po b/irc/lang/ar/messages.po
deleted file mode 100644
index ecea413f..00000000
--- a/irc/lang/ar/messages.po
+++ /dev/null
@@ -1,63 +0,0 @@
-# ADDON irc
-# Copyright (C)
-# This file is distributed under the same license as the Friendica irc addon package.
-# 
-# 
-# Translators:
-# Farida Khalaf <faridakhalaf@hotmail.com>, 2021
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2021-02-22 01:27+0000\n"
-"Last-Translator: Farida Khalaf <faridakhalaf@hotmail.com>\n"
-"Language-Team: Arabic (http://www.transifex.com/Friendica/friendica/language/ar/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ar\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-
-#: irc.php:34
-msgid "IRC Settings"
-msgstr "إعدادات IRC"
-
-#: irc.php:35
-msgid ""
-"Here you can change the system wide settings for the channels to "
-"automatically join and access via the side bar. Note the changes you do "
-"here, only effect the channel selection if you are logged in."
-msgstr "هنا يمكنك تغيير الإعدادات الواسعة لنظام القنوات للانضمام والوصول تلقائيًا عبر الشريط الجانبي.\n لاحظ التغييرات التي تجريها هنا ، تؤثر  إذا قمت بتسجيل  الدخول على اختيار القناة فقط ."
-
-#: irc.php:36 irc.php:134
-msgid "Save Settings"
-msgstr "حفظ الإعدادات"
-
-#: irc.php:37 irc.php:135
-msgid "Channel(s) to auto connect (comma separated)"
-msgstr "القناة (القنوات) للاتصال التلقائي (مفصولة بفواصل)"
-
-#: irc.php:37 irc.php:135
-msgid ""
-"List of channels that shall automatically connected to when the app is "
-"launched."
-msgstr "قائمة القنوات التي سيتم الاتصال بها تلقائيًا عند بدء تشغيل التطبيق."
-
-#: irc.php:38 irc.php:136
-msgid "Popular Channels (comma separated)"
-msgstr "أشهر القنوات (مفصولة بفواصل)"
-
-#: irc.php:38 irc.php:136
-msgid ""
-"List of popular channels, will be displayed at the side and hotlinked for "
-"easy joining."
-msgstr "قائمة القنوات المشهورة ، سيتم عرضها على الجانب ويتم ربطها بسهولة للانضمام إليها."
-
-#: irc.php:62
-msgid "IRC Chatroom"
-msgstr "غرفة محادثة IRC"
-
-#: irc.php:90
-msgid "Popular Channels"
-msgstr "أشهر القنوات"
diff --git a/irc/lang/ar/strings.php b/irc/lang/ar/strings.php
deleted file mode 100644
index a5738a83..00000000
--- a/irc/lang/ar/strings.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_ar")) {
-function string_plural_select_ar($n){
-	$n = intval($n);
-	if ($n==0) { return 0; } else if ($n==1) { return 1; } else if ($n==2) { return 2; } else if ($n%100>=3 && $n%100<=10) { return 3; } else if ($n%100>=11 && $n%100<=99) { return 4; } else  { return 5; }
-}}
-$a->strings['IRC Settings'] = 'إعدادات IRC';
-$a->strings['Here you can change the system wide settings for the channels to automatically join and access via the side bar. Note the changes you do here, only effect the channel selection if you are logged in.'] = 'هنا يمكنك تغيير الإعدادات الواسعة لنظام القنوات للانضمام والوصول تلقائيًا عبر الشريط الجانبي.
- لاحظ التغييرات التي تجريها هنا ، تؤثر  إذا قمت بتسجيل  الدخول على اختيار القناة فقط .';
-$a->strings['Save Settings'] = 'حفظ الإعدادات';
-$a->strings['Channel(s) to auto connect (comma separated)'] = 'القناة (القنوات) للاتصال التلقائي (مفصولة بفواصل)';
-$a->strings['List of channels that shall automatically connected to when the app is launched.'] = 'قائمة القنوات التي سيتم الاتصال بها تلقائيًا عند بدء تشغيل التطبيق.';
-$a->strings['Popular Channels (comma separated)'] = 'أشهر القنوات (مفصولة بفواصل)';
-$a->strings['List of popular channels, will be displayed at the side and hotlinked for easy joining.'] = 'قائمة القنوات المشهورة ، سيتم عرضها على الجانب ويتم ربطها بسهولة للانضمام إليها.';
-$a->strings['IRC Chatroom'] = 'غرفة محادثة IRC';
-$a->strings['Popular Channels'] = 'أشهر القنوات';
diff --git a/irc/lang/cs/messages.po b/irc/lang/cs/messages.po
index 8f25d7ed..29d5fcea 100644
--- a/irc/lang/cs/messages.po
+++ b/irc/lang/cs/messages.po
@@ -11,55 +11,59 @@ msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:14-0500\n"
-"PO-Revision-Date: 2014-06-23 08:41+0000\n"
-"Last-Translator: Aditoo, 2018\n"
-"Language-Team: Czech (http://app.transifex.com/Friendica/friendica/language/cs/)\n"
+"POT-Creation-Date: 2015-07-08 13:17+0200\n"
+"PO-Revision-Date: 2018-06-14 14:36+0000\n"
+"Last-Translator: Aditoo\n"
+"Language-Team: Czech (http://www.transifex.com/Friendica/friendica/language/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: cs\n"
 "Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
 
-#: irc.php:32
+#: irc.php:37
+msgid "IRC Settings"
+msgstr "Nastavení IRC"
+
+#: irc.php:38
 msgid ""
 "Here you can change the system wide settings for the channels to "
 "automatically join and access via the side bar. Note the changes you do "
 "here, only effect the channel selection if you are logged in."
-msgstr "Zde můžete změnit systémová nastavení pro kanály pro automatické spojení a přístup přes postranní lištu. Mějte na paměti, že změny, které zde provedete, ovlivní výběr kanálů pouze, pokud jste přihlášen/a."
+msgstr ""
 
-#: irc.php:33 irc.php:133
+#: irc.php:39 irc.php:136
+msgid "Save Settings"
+msgstr "Uložit nastavení"
+
+#: irc.php:40 irc.php:137
 msgid "Channel(s) to auto connect (comma separated)"
 msgstr "Kanál(y) pro automatické připojení (oddělené čárkami)"
 
-#: irc.php:33 irc.php:133
+#: irc.php:40 irc.php:137
 msgid ""
 "List of channels that shall automatically connected to when the app is "
 "launched."
 msgstr "Seznam kanálů, které budou při spuštění aplikace automaticky připojeny."
 
-#: irc.php:34 irc.php:134
+#: irc.php:41 irc.php:138
 msgid "Popular Channels (comma separated)"
 msgstr "Populární kanály (oddělené čárkami)"
 
-#: irc.php:34 irc.php:134
+#: irc.php:41 irc.php:138
 msgid ""
 "List of popular channels, will be displayed at the side and hotlinked for "
 "easy joining."
 msgstr "Seznam populárních kanálů, bude zobrazen na straně a bude obsahovat odkazy pro snadné připojení."
 
-#: irc.php:39
-msgid "IRC Settings"
-msgstr "Nastavení IRC"
+#: irc.php:57 irc.php:128
+msgid "IRC settings saved."
+msgstr "IRC Nastavení uloženo."
 
-#: irc.php:60
+#: irc.php:62
 msgid "IRC Chatroom"
 msgstr "IRC Místnost"
 
-#: irc.php:88
+#: irc.php:90
 msgid "Popular Channels"
 msgstr "Populární kanály"
-
-#: irc.php:132
-msgid "Save Settings"
-msgstr "Uložit nastavení"
diff --git a/irc/lang/cs/strings.php b/irc/lang/cs/strings.php
index 6c6d5aea..f97b463e 100644
--- a/irc/lang/cs/strings.php
+++ b/irc/lang/cs/strings.php
@@ -3,14 +3,16 @@
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
 	$n = intval($n);
-	if (($n == 1 && $n % 1 == 0)) { return 0; } else if (($n >= 2 && $n <= 4 && $n % 1 == 0)) { return 1; } else if (($n % 1 != 0 )) { return 2; } else  { return 3; }
+	return ($n == 1 && $n % 1 == 0) ? 0 : ($n >= 2 && $n <= 4 && $n % 1 == 0) ? 1: ($n % 1 != 0 ) ? 2 : 3;;
 }}
-$a->strings['Here you can change the system wide settings for the channels to automatically join and access via the side bar. Note the changes you do here, only effect the channel selection if you are logged in.'] = 'Zde můžete změnit systémová nastavení pro kanály pro automatické spojení a přístup přes postranní lištu. Mějte na paměti, že změny, které zde provedete, ovlivní výběr kanálů pouze, pokud jste přihlášen/a.';
-$a->strings['Channel(s) to auto connect (comma separated)'] = 'Kanál(y) pro automatické připojení (oddělené čárkami)';
-$a->strings['List of channels that shall automatically connected to when the app is launched.'] = 'Seznam kanálů, které budou při spuštění aplikace automaticky připojeny.';
-$a->strings['Popular Channels (comma separated)'] = 'Populární kanály (oddělené čárkami)';
-$a->strings['List of popular channels, will be displayed at the side and hotlinked for easy joining.'] = 'Seznam populárních kanálů, bude zobrazen na straně a bude obsahovat odkazy pro snadné připojení.';
-$a->strings['IRC Settings'] = 'Nastavení IRC';
-$a->strings['IRC Chatroom'] = 'IRC Místnost';
-$a->strings['Popular Channels'] = 'Populární kanály';
-$a->strings['Save Settings'] = 'Uložit nastavení';
+;
+$a->strings["IRC Settings"] = "Nastavení IRC";
+$a->strings["Here you can change the system wide settings for the channels to automatically join and access via the side bar. Note the changes you do here, only effect the channel selection if you are logged in."] = "";
+$a->strings["Save Settings"] = "Uložit nastavení";
+$a->strings["Channel(s) to auto connect (comma separated)"] = "Kanál(y) pro automatické připojení (oddělené čárkami)";
+$a->strings["List of channels that shall automatically connected to when the app is launched."] = "Seznam kanálů, které budou při spuštění aplikace automaticky připojeny.";
+$a->strings["Popular Channels (comma separated)"] = "Populární kanály (oddělené čárkami)";
+$a->strings["List of popular channels, will be displayed at the side and hotlinked for easy joining."] = "Seznam populárních kanálů, bude zobrazen na straně a bude obsahovat odkazy pro snadné připojení.";
+$a->strings["IRC settings saved."] = "IRC Nastavení uloženo.";
+$a->strings["IRC Chatroom"] = "IRC Místnost";
+$a->strings["Popular Channels"] = "Populární kanály";
diff --git a/irc/lang/da-dk/messages.po b/irc/lang/da-dk/messages.po
deleted file mode 100644
index 0b429bcb..00000000
--- a/irc/lang/da-dk/messages.po
+++ /dev/null
@@ -1,62 +0,0 @@
-# ADDON irc
-# Copyright (C)
-# This file is distributed under the same license as the Friendica irc addon package.
-# 
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:14-0500\n"
-"PO-Revision-Date: 2014-06-23 08:41+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Danish (Denmark) (http://www.transifex.com/Friendica/friendica/language/da_DK/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: da_DK\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: irc.php:32
-msgid ""
-"Here you can change the system wide settings for the channels to "
-"automatically join and access via the side bar. Note the changes you do "
-"here, only effect the channel selection if you are logged in."
-msgstr ""
-
-#: irc.php:33 irc.php:133
-msgid "Channel(s) to auto connect (comma separated)"
-msgstr ""
-
-#: irc.php:33 irc.php:133
-msgid ""
-"List of channels that shall automatically connected to when the app is "
-"launched."
-msgstr ""
-
-#: irc.php:34 irc.php:134
-msgid "Popular Channels (comma separated)"
-msgstr ""
-
-#: irc.php:34 irc.php:134
-msgid ""
-"List of popular channels, will be displayed at the side and hotlinked for "
-"easy joining."
-msgstr ""
-
-#: irc.php:39
-msgid "IRC Settings"
-msgstr ""
-
-#: irc.php:60
-msgid "IRC Chatroom"
-msgstr ""
-
-#: irc.php:88
-msgid "Popular Channels"
-msgstr ""
-
-#: irc.php:132
-msgid "Save Settings"
-msgstr ""
diff --git a/irc/lang/da-dk/strings.php b/irc/lang/da-dk/strings.php
deleted file mode 100644
index 09554750..00000000
--- a/irc/lang/da-dk/strings.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_da_dk")) {
-function string_plural_select_da_dk($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
diff --git a/irc/lang/de/messages.po b/irc/lang/de/messages.po
index 84c95f4a..3ab048b9 100644
--- a/irc/lang/de/messages.po
+++ b/irc/lang/de/messages.po
@@ -4,62 +4,65 @@
 # 
 # 
 # Translators:
-# Andreas H., 2014-2015
-# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2014-2015
-# Ulf Rompe <transifex.com@rompe.org>, 2019
+# Abrax <webmaster@a-zwenkau.de>, 2014-2015
+# bavatar <tobias.diekershoff@gmx.net>, 2014-2015
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:14-0500\n"
-"PO-Revision-Date: 2014-06-23 08:41+0000\n"
-"Last-Translator: Ulf Rompe <transifex.com@rompe.org>, 2019\n"
-"Language-Team: German (http://app.transifex.com/Friendica/friendica/language/de/)\n"
+"POT-Creation-Date: 2015-07-08 13:17+0200\n"
+"PO-Revision-Date: 2015-07-19 10:11+0000\n"
+"Last-Translator: bavatar <tobias.diekershoff@gmx.net>\n"
+"Language-Team: German (http://www.transifex.com/p/friendica/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: irc.php:32
+#: irc.php:37
+msgid "IRC Settings"
+msgstr "IRC Einstellungen"
+
+#: irc.php:38
 msgid ""
 "Here you can change the system wide settings for the channels to "
 "automatically join and access via the side bar. Note the changes you do "
 "here, only effect the channel selection if you are logged in."
-msgstr "Hier können die systemweiten Einstellungen für beliebte Kanäle und solche, die automatisch betreten werden sollen, festgelegt werden. Achtung: Die Einstellungen, die hier getroffen werden, können von eingeloggten Nutzern für sich überschrieben werden."
+msgstr "Hier könne die systemweiten Einstellungen für beliebte Kanäle und solche die automatisch betreten werden sollen festgelegt werden. Achtung: Die Einstellungen die her getroffen werden können von eingeloggten Nutzern für sich überschrieben werden."
 
-#: irc.php:33 irc.php:133
+#: irc.php:39 irc.php:136
+msgid "Save Settings"
+msgstr "Einstellungen speichern"
+
+#: irc.php:40 irc.php:137
 msgid "Channel(s) to auto connect (comma separated)"
-msgstr "Kanäle, die automatisch betreten werden (mit Komma getrennt)"
+msgstr "mit diesen Kanälen soll man automatisch verbunden werden (Komma getrennt)"
 
-#: irc.php:33 irc.php:133
+#: irc.php:40 irc.php:137
 msgid ""
 "List of channels that shall automatically connected to when the app is "
 "launched."
-msgstr "Liste von Chaträumen, die automatisch betreten werden sollen, wenn die App gestartet wird."
+msgstr "Liste von Chaträumen die automatisch betreten werden sollen wenn die App gestartet wurde."
 
-#: irc.php:34 irc.php:134
+#: irc.php:41 irc.php:138
 msgid "Popular Channels (comma separated)"
 msgstr "Beliebte Kanäle (mit Komma getrennt)"
 
-#: irc.php:34 irc.php:134
+#: irc.php:41 irc.php:138
 msgid ""
 "List of popular channels, will be displayed at the side and hotlinked for "
 "easy joining."
-msgstr "Liste populärer Chaträume, die zum schnellen Betreten am Seitenrand aufgelistet und verlinkt werden."
+msgstr "Liste populärer Chaträume die vverlinkt am Seitenrand aufgelistet werden zum schnelleren betreten."
 
-#: irc.php:39
-msgid "IRC Settings"
-msgstr "IRC-Einstellungen"
+#: irc.php:57 irc.php:128
+msgid "IRC settings saved."
+msgstr "IRC Einstellungen gespeichert."
 
-#: irc.php:60
+#: irc.php:62
 msgid "IRC Chatroom"
-msgstr "IRC-Chatraum"
+msgstr "IRC Chatraum"
 
-#: irc.php:88
+#: irc.php:90
 msgid "Popular Channels"
 msgstr "Beliebte Räume"
-
-#: irc.php:132
-msgid "Save Settings"
-msgstr "Einstellungen speichern"
diff --git a/irc/lang/de/strings.php b/irc/lang/de/strings.php
index c3273a04..cb1ba7c4 100644
--- a/irc/lang/de/strings.php
+++ b/irc/lang/de/strings.php
@@ -2,15 +2,16 @@
 
 if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Here you can change the system wide settings for the channels to automatically join and access via the side bar. Note the changes you do here, only effect the channel selection if you are logged in.'] = 'Hier können die systemweiten Einstellungen für beliebte Kanäle und solche, die automatisch betreten werden sollen, festgelegt werden. Achtung: Die Einstellungen, die hier getroffen werden, können von eingeloggten Nutzern für sich überschrieben werden.';
-$a->strings['Channel(s) to auto connect (comma separated)'] = 'Kanäle, die automatisch betreten werden (mit Komma getrennt)';
-$a->strings['List of channels that shall automatically connected to when the app is launched.'] = 'Liste von Chaträumen, die automatisch betreten werden sollen, wenn die App gestartet wird.';
-$a->strings['Popular Channels (comma separated)'] = 'Beliebte Kanäle (mit Komma getrennt)';
-$a->strings['List of popular channels, will be displayed at the side and hotlinked for easy joining.'] = 'Liste populärer Chaträume, die zum schnellen Betreten am Seitenrand aufgelistet und verlinkt werden.';
-$a->strings['IRC Settings'] = 'IRC-Einstellungen';
-$a->strings['IRC Chatroom'] = 'IRC-Chatraum';
-$a->strings['Popular Channels'] = 'Beliebte Räume';
-$a->strings['Save Settings'] = 'Einstellungen speichern';
+;
+$a->strings["IRC Settings"] = "IRC Einstellungen";
+$a->strings["Here you can change the system wide settings for the channels to automatically join and access via the side bar. Note the changes you do here, only effect the channel selection if you are logged in."] = "Hier könne die systemweiten Einstellungen für beliebte Kanäle und solche die automatisch betreten werden sollen festgelegt werden. Achtung: Die Einstellungen die her getroffen werden können von eingeloggten Nutzern für sich überschrieben werden.";
+$a->strings["Save Settings"] = "Einstellungen speichern";
+$a->strings["Channel(s) to auto connect (comma separated)"] = "mit diesen Kanälen soll man automatisch verbunden werden (Komma getrennt)";
+$a->strings["List of channels that shall automatically connected to when the app is launched."] = "Liste von Chaträumen die automatisch betreten werden sollen wenn die App gestartet wurde.";
+$a->strings["Popular Channels (comma separated)"] = "Beliebte Kanäle (mit Komma getrennt)";
+$a->strings["List of popular channels, will be displayed at the side and hotlinked for easy joining."] = "Liste populärer Chaträume die vverlinkt am Seitenrand aufgelistet werden zum schnelleren betreten.";
+$a->strings["IRC settings saved."] = "IRC Einstellungen gespeichert.";
+$a->strings["IRC Chatroom"] = "IRC Chatraum";
+$a->strings["Popular Channels"] = "Beliebte Räume";
diff --git a/irc/lang/es/strings.php b/irc/lang/es/strings.php
index 3180a848..870c53f0 100644
--- a/irc/lang/es/strings.php
+++ b/irc/lang/es/strings.php
@@ -2,16 +2,16 @@
 
 if(! function_exists("string_plural_select_es")) {
 function string_plural_select_es($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['IRC Settings'] = 'Ajustes de IRC';
-$a->strings['Here you can change the system wide settings for the channels to automatically join and access via the side bar. Note the changes you do here, only effect the channel selection if you are logged in.'] = 'Aquí puede cambiar los ajustes de todo el sistema de los canales para unirse y acceder automáticamente mediante la barra lateral. Note que los cambios que hace aquí sólo afectan a la selección del canal si usted está conectado.';
-$a->strings['Save Settings'] = 'Guardar Ajustes';
-$a->strings['Channel(s) to auto connect (comma separated)'] = 'Canal(s) para autocorregir (separados por comas)';
-$a->strings['List of channels that shall automatically connected to when the app is launched.'] = 'Lista de canales que se conectarán automáticamente cuando la aplicación sea lanzada.';
-$a->strings['Popular Channels (comma separated)'] = 'Canales Populares (separados por comas)';
-$a->strings['List of popular channels, will be displayed at the side and hotlinked for easy joining.'] = 'Lista de canales populares, se mostrará al lado y tendrá un enlace para unirse fácilmente.';
-$a->strings['IRC settings saved.'] = 'Ajustes de IRC guardados.';
-$a->strings['IRC Chatroom'] = 'Sala de chat de IRC';
-$a->strings['Popular Channels'] = 'Canales Populares';
+;
+$a->strings["IRC Settings"] = "Ajustes de IRC";
+$a->strings["Here you can change the system wide settings for the channels to automatically join and access via the side bar. Note the changes you do here, only effect the channel selection if you are logged in."] = "Aquí puede cambiar los ajustes de todo el sistema de los canales para unirse y acceder automáticamente mediante la barra lateral. Note que los cambios que hace aquí sólo afectan a la selección del canal si usted está conectado.";
+$a->strings["Save Settings"] = "Guardar Ajustes";
+$a->strings["Channel(s) to auto connect (comma separated)"] = "Canal(s) para autocorregir (separados por comas)";
+$a->strings["List of channels that shall automatically connected to when the app is launched."] = "Lista de canales que se conectarán automáticamente cuando la aplicación sea lanzada.";
+$a->strings["Popular Channels (comma separated)"] = "Canales Populares (separados por comas)";
+$a->strings["List of popular channels, will be displayed at the side and hotlinked for easy joining."] = "Lista de canales populares, se mostrará al lado y tendrá un enlace para unirse fácilmente.";
+$a->strings["IRC settings saved."] = "Ajustes de IRC guardados.";
+$a->strings["IRC Chatroom"] = "Sala de chat de IRC";
+$a->strings["Popular Channels"] = "Canales Populares";
diff --git a/irc/lang/fi-fi/strings.php b/irc/lang/fi-fi/strings.php
index f5e92721..4c1c3e33 100644
--- a/irc/lang/fi-fi/strings.php
+++ b/irc/lang/fi-fi/strings.php
@@ -3,13 +3,16 @@
 if(! function_exists("string_plural_select_fi_fi")) {
 function string_plural_select_fi_fi($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['IRC Settings'] = 'IRC-asetukset';
-$a->strings['Save Settings'] = 'Tallenna asetukset';
-$a->strings['Channel(s) to auto connect (comma separated)'] = 'Kanavat jota yhdistetään automaattisesti (pilkuilla eroteltu luettelo)';
-$a->strings['List of channels that shall automatically connected to when the app is launched.'] = 'Kanavat johon luodaan yhteys automaattisesti kun sovellus käynnistyy.';
-$a->strings['Popular Channels (comma separated)'] = 'Suositut kanavat (pilkuilla eroteltu luettelo)';
-$a->strings['IRC settings saved.'] = 'IRC-asetukset tallennettu.';
-$a->strings['IRC Chatroom'] = 'IRC-tsättihuone';
-$a->strings['Popular Channels'] = 'Suositut kanavat';
+;
+$a->strings["IRC Settings"] = "IRC-asetukset";
+$a->strings["Here you can change the system wide settings for the channels to automatically join and access via the side bar. Note the changes you do here, only effect the channel selection if you are logged in."] = "";
+$a->strings["Save Settings"] = "Tallenna asetukset";
+$a->strings["Channel(s) to auto connect (comma separated)"] = "Kanavat jota yhdistetään automaattisesti (pilkuilla eroteltu luettelo)";
+$a->strings["List of channels that shall automatically connected to when the app is launched."] = "Kanavat johon luodaan yhteys automaattisesti kun sovellus käynnistyy.";
+$a->strings["Popular Channels (comma separated)"] = "Suositut kanavat (pilkuilla eroteltu luettelo)";
+$a->strings["List of popular channels, will be displayed at the side and hotlinked for easy joining."] = "";
+$a->strings["IRC settings saved."] = "IRC-asetukset tallennettu.";
+$a->strings["IRC Chatroom"] = "IRC-tsättihuone";
+$a->strings["Popular Channels"] = "Suositut kanavat";
diff --git a/irc/lang/fr/messages.po b/irc/lang/fr/messages.po
deleted file mode 100644
index e4a355ce..00000000
--- a/irc/lang/fr/messages.po
+++ /dev/null
@@ -1,65 +0,0 @@
-# ADDON irc
-# Copyright (C)
-# This file is distributed under the same license as the Friendica irc addon package.
-# 
-# 
-# Translators:
-# bob lebonche <lebonche@tutanota.com>, 2021
-# ButterflyOfFire, 2020
-# StefOfficiel <pichard.stephane@free.fr>, 2015
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:14-0500\n"
-"PO-Revision-Date: 2014-06-23 08:41+0000\n"
-"Last-Translator: bob lebonche <lebonche@tutanota.com>, 2021\n"
-"Language-Team: French (http://www.transifex.com/Friendica/friendica/language/fr/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: fr\n"
-"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
-
-#: irc.php:32
-msgid ""
-"Here you can change the system wide settings for the channels to "
-"automatically join and access via the side bar. Note the changes you do "
-"here, only effect the channel selection if you are logged in."
-msgstr "Vous pouvez modifier ici tous les paramètres système pour connecter et joindre les chaînes grâce à la barre latérale. Notez que les changement effectués ici, n'affectent la sélection de chaînes qui si vous êtes connecté."
-
-#: irc.php:33 irc.php:133
-msgid "Channel(s) to auto connect (comma separated)"
-msgstr "Chaîne(s) à connecter automatiquement (séparée(s) par une virgule)"
-
-#: irc.php:33 irc.php:133
-msgid ""
-"List of channels that shall automatically connected to when the app is "
-"launched."
-msgstr "Liste des chaînes devant être automatiquement connectées au lancement de l'application."
-
-#: irc.php:34 irc.php:134
-msgid "Popular Channels (comma separated)"
-msgstr "Chaînes populaires (séparées par une virgule)"
-
-#: irc.php:34 irc.php:134
-msgid ""
-"List of popular channels, will be displayed at the side and hotlinked for "
-"easy joining."
-msgstr "La liste des chaînes populaires et leur lien sera affichée sur le coté pour un accès facile"
-
-#: irc.php:39
-msgid "IRC Settings"
-msgstr "Paramètres de l'IRC"
-
-#: irc.php:60
-msgid "IRC Chatroom"
-msgstr "Salon IRC"
-
-#: irc.php:88
-msgid "Popular Channels"
-msgstr "Chaînes populaires"
-
-#: irc.php:132
-msgid "Save Settings"
-msgstr "Sauvegarder les paramètres"
diff --git a/irc/lang/fr/strings.php b/irc/lang/fr/strings.php
index c862b148..b1693194 100644
--- a/irc/lang/fr/strings.php
+++ b/irc/lang/fr/strings.php
@@ -1,16 +1,9 @@
-<?php
-
-if(! function_exists("string_plural_select_fr")) {
-function string_plural_select_fr($n){
-	$n = intval($n);
-	if (($n == 0 || $n == 1)) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
-}}
-$a->strings['Here you can change the system wide settings for the channels to automatically join and access via the side bar. Note the changes you do here, only effect the channel selection if you are logged in.'] = 'Vous pouvez modifier ici tous les paramètres système pour connecter et joindre les chaînes grâce à la barre latérale. Notez que les changement effectués ici, n\'affectent la sélection de chaînes qui si vous êtes connecté.';
-$a->strings['Channel(s) to auto connect (comma separated)'] = 'Chaîne(s) à connecter automatiquement (séparée(s) par une virgule)';
-$a->strings['List of channels that shall automatically connected to when the app is launched.'] = 'Liste des chaînes devant être automatiquement connectées au lancement de l\'application.';
-$a->strings['Popular Channels (comma separated)'] = 'Chaînes populaires (séparées par une virgule)';
-$a->strings['List of popular channels, will be displayed at the side and hotlinked for easy joining.'] = 'La liste des chaînes populaires et leur lien sera affichée sur le coté pour un accès facile';
-$a->strings['IRC Settings'] = 'Paramètres de l\'IRC';
-$a->strings['IRC Chatroom'] = 'Salon IRC';
-$a->strings['Popular Channels'] = 'Chaînes populaires';
-$a->strings['Save Settings'] = 'Sauvegarder les paramètres';
+<?php
+
+$a->strings["IRC Settings"] = "Réglages IRC";
+$a->strings["Channel(s) to auto connect (comma separated)"] = "Canaux à rejoindre automatiquement (séparés par des virgules)";
+$a->strings["Popular Channels (comma separated)"] = "Canaux populaires (séparés par des virgules)";
+$a->strings["Submit"] = "Envoyer";
+$a->strings["IRC settings saved."] = "Réglages IRC sauvés.";
+$a->strings["IRC Chatroom"] = "Salon IRC";
+$a->strings["Popular Channels"] = "Canaux populaires";
diff --git a/irc/lang/hu/messages.po b/irc/lang/hu/messages.po
deleted file mode 100644
index 72c2dda5..00000000
--- a/irc/lang/hu/messages.po
+++ /dev/null
@@ -1,63 +0,0 @@
-# ADDON irc
-# Copyright (C)
-# This file is distributed under the same license as the Friendica irc addon package.
-# 
-# 
-# Translators:
-# Balázs Úr, 2020-2021
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:14-0500\n"
-"PO-Revision-Date: 2014-06-23 08:41+0000\n"
-"Last-Translator: Balázs Úr, 2020-2021\n"
-"Language-Team: Hungarian (http://www.transifex.com/Friendica/friendica/language/hu/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: hu\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: irc.php:32
-msgid ""
-"Here you can change the system wide settings for the channels to "
-"automatically join and access via the side bar. Note the changes you do "
-"here, only effect the channel selection if you are logged in."
-msgstr "Itt változtathatja meg a csatornák rendszerszintű beállításait, hogy automatikusan csatlakozzon és hozzáférjen az oldalsávon keresztül. Ne feledje, hogy az itt elvégzett változtatások csak akkor vannak hatással a csatornakiválasztásra, ha be van jelentkezve."
-
-#: irc.php:33 irc.php:133
-msgid "Channel(s) to auto connect (comma separated)"
-msgstr "Csatornák az automatikus kapcsolódáshoz (vesszővel elválasztva)"
-
-#: irc.php:33 irc.php:133
-msgid ""
-"List of channels that shall automatically connected to when the app is "
-"launched."
-msgstr "Csatornák listája, amelyekhez automatikusan lehet kapcsolódni, ha az alkalmazást elindították."
-
-#: irc.php:34 irc.php:134
-msgid "Popular Channels (comma separated)"
-msgstr "Népszerű csatornák (vesszővel elválasztva)"
-
-#: irc.php:34 irc.php:134
-msgid ""
-"List of popular channels, will be displayed at the side and hotlinked for "
-"easy joining."
-msgstr "Népszerű csatornák listája, amelyek oldalt lesznek megjelenítve, és gyors hivatkozás lesz rájuk az egyszerű csatlakozáshoz."
-
-#: irc.php:39
-msgid "IRC Settings"
-msgstr "IRC beállítások"
-
-#: irc.php:60
-msgid "IRC Chatroom"
-msgstr "IRC csevegőszoba"
-
-#: irc.php:88
-msgid "Popular Channels"
-msgstr "Népszerű csatornák"
-
-#: irc.php:132
-msgid "Save Settings"
-msgstr "Beállítások mentése"
diff --git a/irc/lang/hu/strings.php b/irc/lang/hu/strings.php
deleted file mode 100644
index 113c1978..00000000
--- a/irc/lang/hu/strings.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_hu")) {
-function string_plural_select_hu($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Here you can change the system wide settings for the channels to automatically join and access via the side bar. Note the changes you do here, only effect the channel selection if you are logged in.'] = 'Itt változtathatja meg a csatornák rendszerszintű beállításait, hogy automatikusan csatlakozzon és hozzáférjen az oldalsávon keresztül. Ne feledje, hogy az itt elvégzett változtatások csak akkor vannak hatással a csatornakiválasztásra, ha be van jelentkezve.';
-$a->strings['Channel(s) to auto connect (comma separated)'] = 'Csatornák az automatikus kapcsolódáshoz (vesszővel elválasztva)';
-$a->strings['List of channels that shall automatically connected to when the app is launched.'] = 'Csatornák listája, amelyekhez automatikusan lehet kapcsolódni, ha az alkalmazást elindították.';
-$a->strings['Popular Channels (comma separated)'] = 'Népszerű csatornák (vesszővel elválasztva)';
-$a->strings['List of popular channels, will be displayed at the side and hotlinked for easy joining.'] = 'Népszerű csatornák listája, amelyek oldalt lesznek megjelenítve, és gyors hivatkozás lesz rájuk az egyszerű csatlakozáshoz.';
-$a->strings['IRC Settings'] = 'IRC beállítások';
-$a->strings['IRC Chatroom'] = 'IRC csevegőszoba';
-$a->strings['Popular Channels'] = 'Népszerű csatornák';
-$a->strings['Save Settings'] = 'Beállítások mentése';
diff --git a/irc/lang/it/messages.po b/irc/lang/it/messages.po
index 8144342b..69d28e89 100644
--- a/irc/lang/it/messages.po
+++ b/irc/lang/it/messages.po
@@ -5,60 +5,63 @@
 # 
 # Translators:
 # fabrixxm <fabrix.xm@gmail.com>, 2014-2015
-# Sylke Vicious <silkevicious@gmail.com>, 2020
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:14-0500\n"
-"PO-Revision-Date: 2014-06-23 08:41+0000\n"
-"Last-Translator: Sylke Vicious <silkevicious@gmail.com>, 2020\n"
-"Language-Team: Italian (http://app.transifex.com/Friendica/friendica/language/it/)\n"
+"POT-Creation-Date: 2015-07-08 13:17+0200\n"
+"PO-Revision-Date: 2017-09-20 06:08+0000\n"
+"Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n"
+"Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: it\n"
-"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: irc.php:32
+#: irc.php:37
+msgid "IRC Settings"
+msgstr "Impostazioni IRC"
+
+#: irc.php:38
 msgid ""
 "Here you can change the system wide settings for the channels to "
 "automatically join and access via the side bar. Note the changes you do "
 "here, only effect the channel selection if you are logged in."
 msgstr "Qui puoi modificare le impostazioni globali di sistema per i canali a cui accedere automaticamente attraverso la barra laterale. Nota che le modifiche che effetti qui hanno effetto sulla selezione di canali solo se sei loggato."
 
-#: irc.php:33 irc.php:133
+#: irc.php:39 irc.php:136
+msgid "Save Settings"
+msgstr "Salva Impostazioni"
+
+#: irc.php:40 irc.php:137
 msgid "Channel(s) to auto connect (comma separated)"
 msgstr "Canale(i) a cui autocollegarsi (separati da virgola)"
 
-#: irc.php:33 irc.php:133
+#: irc.php:40 irc.php:137
 msgid ""
 "List of channels that shall automatically connected to when the app is "
 "launched."
 msgstr "Lista di canali che a cui connettersi automaticamente quando l'app è avviata."
 
-#: irc.php:34 irc.php:134
+#: irc.php:41 irc.php:138
 msgid "Popular Channels (comma separated)"
 msgstr "Canali popolari (separati da virgola)"
 
-#: irc.php:34 irc.php:134
+#: irc.php:41 irc.php:138
 msgid ""
 "List of popular channels, will be displayed at the side and hotlinked for "
 "easy joining."
-msgstr "Lista di canali popolari: sarà visualizzata a lato e provvista di collegamento per facilitare l'adesione."
+msgstr "Lista di canali popolari: sarà visualizzata a lato e provvista di link per facilitare l'adesione."
 
-#: irc.php:39
-msgid "IRC Settings"
-msgstr "Impostazioni IRC"
+#: irc.php:57 irc.php:128
+msgid "IRC settings saved."
+msgstr "Impostazioni IRC salvate."
 
-#: irc.php:60
+#: irc.php:62
 msgid "IRC Chatroom"
 msgstr "Stanza IRC"
 
-#: irc.php:88
+#: irc.php:90
 msgid "Popular Channels"
 msgstr "Canali Popolari"
-
-#: irc.php:132
-msgid "Save Settings"
-msgstr "Salva Impostazioni"
diff --git a/irc/lang/it/strings.php b/irc/lang/it/strings.php
index 09aafe6e..19b55649 100644
--- a/irc/lang/it/strings.php
+++ b/irc/lang/it/strings.php
@@ -2,15 +2,16 @@
 
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
-	$n = intval($n);
-	if ($n == 1) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
+	return ($n != 1);;
 }}
-$a->strings['Here you can change the system wide settings for the channels to automatically join and access via the side bar. Note the changes you do here, only effect the channel selection if you are logged in.'] = 'Qui puoi modificare le impostazioni globali di sistema per i canali a cui accedere automaticamente attraverso la barra laterale. Nota che le modifiche che effetti qui hanno effetto sulla selezione di canali solo se sei loggato.';
-$a->strings['Channel(s) to auto connect (comma separated)'] = 'Canale(i) a cui autocollegarsi (separati da virgola)';
-$a->strings['List of channels that shall automatically connected to when the app is launched.'] = 'Lista di canali che a cui connettersi automaticamente quando l\'app è avviata.';
-$a->strings['Popular Channels (comma separated)'] = 'Canali popolari (separati da virgola)';
-$a->strings['List of popular channels, will be displayed at the side and hotlinked for easy joining.'] = 'Lista di canali popolari: sarà visualizzata a lato e provvista di collegamento per facilitare l\'adesione.';
-$a->strings['IRC Settings'] = 'Impostazioni IRC';
-$a->strings['IRC Chatroom'] = 'Stanza IRC';
-$a->strings['Popular Channels'] = 'Canali Popolari';
-$a->strings['Save Settings'] = 'Salva Impostazioni';
+;
+$a->strings["IRC Settings"] = "Impostazioni IRC";
+$a->strings["Here you can change the system wide settings for the channels to automatically join and access via the side bar. Note the changes you do here, only effect the channel selection if you are logged in."] = "Qui puoi modificare le impostazioni globali di sistema per i canali a cui accedere automaticamente attraverso la barra laterale. Nota che le modifiche che effetti qui hanno effetto sulla selezione di canali solo se sei loggato.";
+$a->strings["Save Settings"] = "Salva Impostazioni";
+$a->strings["Channel(s) to auto connect (comma separated)"] = "Canale(i) a cui autocollegarsi (separati da virgola)";
+$a->strings["List of channels that shall automatically connected to when the app is launched."] = "Lista di canali che a cui connettersi automaticamente quando l'app è avviata.";
+$a->strings["Popular Channels (comma separated)"] = "Canali popolari (separati da virgola)";
+$a->strings["List of popular channels, will be displayed at the side and hotlinked for easy joining."] = "Lista di canali popolari: sarà visualizzata a lato e provvista di link per facilitare l'adesione.";
+$a->strings["IRC settings saved."] = "Impostazioni IRC salvate.";
+$a->strings["IRC Chatroom"] = "Stanza IRC";
+$a->strings["Popular Channels"] = "Canali Popolari";
diff --git a/irc/lang/ja/messages.po b/irc/lang/ja/messages.po
deleted file mode 100644
index 06d797d0..00000000
--- a/irc/lang/ja/messages.po
+++ /dev/null
@@ -1,63 +0,0 @@
-# ADDON irc
-# Copyright (C)
-# This file is distributed under the same license as the Friendica irc addon package.
-# 
-# 
-# Translators:
-# XMPPはいいぞ, 2021
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2021-08-06 05:52+0000\n"
-"Last-Translator: XMPPはいいぞ\n"
-"Language-Team: Japanese (http://www.transifex.com/Friendica/friendica/language/ja/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ja\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-
-#: irc.php:34
-msgid "IRC Settings"
-msgstr "IRC設定"
-
-#: irc.php:35
-msgid ""
-"Here you can change the system wide settings for the channels to "
-"automatically join and access via the side bar. Note the changes you do "
-"here, only effect the channel selection if you are logged in."
-msgstr "ここでは、システム全体の設定を変更して、自動的にチャンネルに参加したり、サイドバーからアクセスしたりすることができます。なお、ここで行った変更は、ログインしている場合にのみチャンネルの選択に影響します。"
-
-#: irc.php:36 irc.php:134
-msgid "Save Settings"
-msgstr "設定を保存"
-
-#: irc.php:37 irc.php:135
-msgid "Channel(s) to auto connect (comma separated)"
-msgstr "自動接続するチャンネル（カンマで区切る）"
-
-#: irc.php:37 irc.php:135
-msgid ""
-"List of channels that shall automatically connected to when the app is "
-"launched."
-msgstr "アプリ起動時に自動接続されるチャンネルの一覧。"
-
-#: irc.php:38 irc.php:136
-msgid "Popular Channels (comma separated)"
-msgstr ""
-
-#: irc.php:38 irc.php:136
-msgid ""
-"List of popular channels, will be displayed at the side and hotlinked for "
-"easy joining."
-msgstr ""
-
-#: irc.php:62
-msgid "IRC Chatroom"
-msgstr ""
-
-#: irc.php:90
-msgid "Popular Channels"
-msgstr ""
diff --git a/irc/lang/ja/strings.php b/irc/lang/ja/strings.php
deleted file mode 100644
index 11f77121..00000000
--- a/irc/lang/ja/strings.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_ja")) {
-function string_plural_select_ja($n){
-	$n = intval($n);
-	return intval(0);
-}}
-$a->strings['IRC Settings'] = 'IRC設定';
-$a->strings['Here you can change the system wide settings for the channels to automatically join and access via the side bar. Note the changes you do here, only effect the channel selection if you are logged in.'] = 'ここでは、システム全体の設定を変更して、自動的にチャンネルに参加したり、サイドバーからアクセスしたりすることができます。なお、ここで行った変更は、ログインしている場合にのみチャンネルの選択に影響します。';
-$a->strings['Save Settings'] = '設定を保存';
-$a->strings['Channel(s) to auto connect (comma separated)'] = '自動接続するチャンネル（カンマで区切る）';
-$a->strings['List of channels that shall automatically connected to when the app is launched.'] = 'アプリ起動時に自動接続されるチャンネルの一覧。';
diff --git a/irc/lang/nl/strings.php b/irc/lang/nl/strings.php
index 0a693749..c834f69c 100644
--- a/irc/lang/nl/strings.php
+++ b/irc/lang/nl/strings.php
@@ -3,15 +3,16 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['IRC Settings'] = 'IRC instellingen';
-$a->strings['Here you can change the system wide settings for the channels to automatically join and access via the side bar. Note the changes you do here, only effect the channel selection if you are logged in.'] = 'Hier kan je de systeeminstellingen wijzigen voor de kanalen waarbij je je automatisch wil aanmelden en toegang hebben via de zijbalk. Opmerking: de aanpassingen die je hier doet hebben alleen impact op de kanaal selectie wanneer je ingelogd bent.';
-$a->strings['Save Settings'] = 'Instellingen Opslaan';
-$a->strings['Channel(s) to auto connect (comma separated)'] = 'Automatisch connecteren op dit/deze kana(a)l(en) (gescheiden door een komma)';
-$a->strings['List of channels that shall automatically connected to when the app is launched.'] = 'Lijst van kanalen waar je automatisch op connecteert als je de applicatie start.';
-$a->strings['Popular Channels (comma separated)'] = 'Populaire Kanalen (gescheiden door een komma)';
-$a->strings['List of popular channels, will be displayed at the side and hotlinked for easy joining.'] = 'Lijst van populaire kanalen, zullen opzij getoond worden met een link om gemakkelijk aan te melden.';
-$a->strings['IRC settings saved.'] = 'IRC instellingen opgeslagen.';
-$a->strings['IRC Chatroom'] = 'IRC Chatroom';
-$a->strings['Popular Channels'] = 'Populaire Kanalen';
+;
+$a->strings["IRC Settings"] = "IRC instellingen";
+$a->strings["Here you can change the system wide settings for the channels to automatically join and access via the side bar. Note the changes you do here, only effect the channel selection if you are logged in."] = "Hier kan je de systeeminstellingen wijzigen voor de kanalen waarbij je je automatisch wil aanmelden en toegang hebben via de zijbalk. Opmerking: de aanpassingen die je hier doet hebben alleen impact op de kanaal selectie wanneer je ingelogd bent.";
+$a->strings["Save Settings"] = "Instellingen Opslaan";
+$a->strings["Channel(s) to auto connect (comma separated)"] = "Automatisch connecteren op dit/deze kana(a)l(en) (gescheiden door een komma)";
+$a->strings["List of channels that shall automatically connected to when the app is launched."] = "Lijst van kanalen waar je automatisch op connecteert als je de applicatie start.";
+$a->strings["Popular Channels (comma separated)"] = "Populaire Kanalen (gescheiden door een komma)";
+$a->strings["List of popular channels, will be displayed at the side and hotlinked for easy joining."] = "Lijst van populaire kanalen, zullen opzij getoond worden met een link om gemakkelijk aan te melden.";
+$a->strings["IRC settings saved."] = "IRC instellingen opgeslagen.";
+$a->strings["IRC Chatroom"] = "IRC Chatroom";
+$a->strings["Popular Channels"] = "Populaire Kanalen";
diff --git a/irc/lang/pl/messages.po b/irc/lang/pl/messages.po
index 4355200c..c39003c2 100644
--- a/irc/lang/pl/messages.po
+++ b/irc/lang/pl/messages.po
@@ -4,14 +4,14 @@
 # 
 # 
 # Translators:
-# Waldemar Stoczkowski, 2018
+# Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:14-0500\n"
-"PO-Revision-Date: 2014-06-23 08:41+0000\n"
-"Last-Translator: Waldemar Stoczkowski, 2018\n"
+"POT-Creation-Date: 2015-07-08 13:17+0200\n"
+"PO-Revision-Date: 2018-03-31 20:41+0000\n"
+"Last-Translator: Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.com/Friendica/friendica/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,45 +19,49 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
-#: irc.php:32
+#: irc.php:37
+msgid "IRC Settings"
+msgstr "Ustawienia IRC"
+
+#: irc.php:38
 msgid ""
 "Here you can change the system wide settings for the channels to "
 "automatically join and access via the side bar. Note the changes you do "
 "here, only effect the channel selection if you are logged in."
 msgstr "Tutaj możesz zmienić ustawienia systemowe dla kanałów, aby automatycznie łączyć się i uzyskać dostęp za pomocą paska bocznego. Zwróć uwagę na zmiany, które tu zrobisz, wpływają tylko na wybór kanału, jeśli jesteś zalogowany."
 
-#: irc.php:33 irc.php:133
+#: irc.php:39 irc.php:136
+msgid "Save Settings"
+msgstr "Zapisz ustawienia"
+
+#: irc.php:40 irc.php:137
 msgid "Channel(s) to auto connect (comma separated)"
 msgstr "Kanał(y) do ​​automatycznego połączenia (oddzielone przecinkami)"
 
-#: irc.php:33 irc.php:133
+#: irc.php:40 irc.php:137
 msgid ""
 "List of channels that shall automatically connected to when the app is "
 "launched."
 msgstr "Lista kanałów, które będą automatycznie połączone z uruchomieniem aplikacji."
 
-#: irc.php:34 irc.php:134
+#: irc.php:41 irc.php:138
 msgid "Popular Channels (comma separated)"
 msgstr "Popularne kanały (oddzielone przecinkami)"
 
-#: irc.php:34 irc.php:134
+#: irc.php:41 irc.php:138
 msgid ""
 "List of popular channels, will be displayed at the side and hotlinked for "
 "easy joining."
 msgstr "Lista popularnych kanałów zostanie wyświetlona z boku i połączona w celu łatwego dołączenia."
 
-#: irc.php:39
-msgid "IRC Settings"
-msgstr "Ustawienia IRC"
+#: irc.php:57 irc.php:128
+msgid "IRC settings saved."
+msgstr "Zapisano ustawienia IRC."
 
-#: irc.php:60
+#: irc.php:62
 msgid "IRC Chatroom"
 msgstr "Czat na IRC"
 
-#: irc.php:88
+#: irc.php:90
 msgid "Popular Channels"
 msgstr "Popularne kanały"
-
-#: irc.php:132
-msgid "Save Settings"
-msgstr "Zapisz ustawienia"
diff --git a/irc/lang/pl/strings.php b/irc/lang/pl/strings.php
index 48d88e71..25a825d7 100644
--- a/irc/lang/pl/strings.php
+++ b/irc/lang/pl/strings.php
@@ -2,15 +2,16 @@
 
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
-	$n = intval($n);
-	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
+	return ($n==1 ? 0 : ($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14) ? 1 : $n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14) ? 2 : 3);;
 }}
-$a->strings['Here you can change the system wide settings for the channels to automatically join and access via the side bar. Note the changes you do here, only effect the channel selection if you are logged in.'] = 'Tutaj możesz zmienić ustawienia systemowe dla kanałów, aby automatycznie łączyć się i uzyskać dostęp za pomocą paska bocznego. Zwróć uwagę na zmiany, które tu zrobisz, wpływają tylko na wybór kanału, jeśli jesteś zalogowany.';
-$a->strings['Channel(s) to auto connect (comma separated)'] = 'Kanał(y) do ​​automatycznego połączenia (oddzielone przecinkami)';
-$a->strings['List of channels that shall automatically connected to when the app is launched.'] = 'Lista kanałów, które będą automatycznie połączone z uruchomieniem aplikacji.';
-$a->strings['Popular Channels (comma separated)'] = 'Popularne kanały (oddzielone przecinkami)';
-$a->strings['List of popular channels, will be displayed at the side and hotlinked for easy joining.'] = 'Lista popularnych kanałów zostanie wyświetlona z boku i połączona w celu łatwego dołączenia.';
-$a->strings['IRC Settings'] = 'Ustawienia IRC';
-$a->strings['IRC Chatroom'] = 'Czat na IRC';
-$a->strings['Popular Channels'] = 'Popularne kanały';
-$a->strings['Save Settings'] = 'Zapisz ustawienia';
+;
+$a->strings["IRC Settings"] = "Ustawienia IRC";
+$a->strings["Here you can change the system wide settings for the channels to automatically join and access via the side bar. Note the changes you do here, only effect the channel selection if you are logged in."] = "Tutaj możesz zmienić ustawienia systemowe dla kanałów, aby automatycznie łączyć się i uzyskać dostęp za pomocą paska bocznego. Zwróć uwagę na zmiany, które tu zrobisz, wpływają tylko na wybór kanału, jeśli jesteś zalogowany.";
+$a->strings["Save Settings"] = "Zapisz ustawienia";
+$a->strings["Channel(s) to auto connect (comma separated)"] = "Kanał(y) do ​​automatycznego połączenia (oddzielone przecinkami)";
+$a->strings["List of channels that shall automatically connected to when the app is launched."] = "Lista kanałów, które będą automatycznie połączone z uruchomieniem aplikacji.";
+$a->strings["Popular Channels (comma separated)"] = "Popularne kanały (oddzielone przecinkami)";
+$a->strings["List of popular channels, will be displayed at the side and hotlinked for easy joining."] = "Lista popularnych kanałów zostanie wyświetlona z boku i połączona w celu łatwego dołączenia.";
+$a->strings["IRC settings saved."] = "Zapisano ustawienia IRC.";
+$a->strings["IRC Chatroom"] = "Czat na IRC";
+$a->strings["Popular Channels"] = "Popularne kanały";
diff --git a/irc/lang/pt-br/strings.php b/irc/lang/pt-br/strings.php
index 43932f31..28a4e468 100644
--- a/irc/lang/pt-br/strings.php
+++ b/irc/lang/pt-br/strings.php
@@ -2,16 +2,16 @@
 
 if(! function_exists("string_plural_select_pt_br")) {
 function string_plural_select_pt_br($n){
-	$n = intval($n);
-	return intval($n > 1);
+	return ($n > 1);;
 }}
-$a->strings['IRC Settings'] = 'Configurações do IRC';
-$a->strings['Here you can change the system wide settings for the channels to automatically join and access via the side bar. Note the changes you do here, only effect the channel selection if you are logged in.'] = 'Aqui você pode mudar as configurações dos canais para dar opções de inscrição e de acesso automáticos pela barra lateral. Observe que as mudanças feitas aqui só afetam o canal selecionado se você tiver feito login.';
-$a->strings['Save Settings'] = 'Salvar Configurações';
-$a->strings['Channel(s) to auto connect (comma separated)'] = 'Canais de conexão automática (separados por vírgula)';
-$a->strings['List of channels that shall automatically connected to when the app is launched.'] = 'Lista de canais a serem conectados automaticamente quando o aplicativo for iniciado.';
-$a->strings['Popular Channels (comma separated)'] = 'Canais Populares (separados por vírgula)';
-$a->strings['List of popular channels, will be displayed at the side and hotlinked for easy joining.'] = 'Lista de canais populares, que será exibida ao lado e terá link para facilitar a inscrição.';
-$a->strings['IRC settings saved.'] = 'As configurações do IRC foram salvas.';
-$a->strings['IRC Chatroom'] = 'Sala de bate-papo IRC';
-$a->strings['Popular Channels'] = 'Canais Populares';
+;
+$a->strings["IRC Settings"] = "Configurações do IRC";
+$a->strings["Here you can change the system wide settings for the channels to automatically join and access via the side bar. Note the changes you do here, only effect the channel selection if you are logged in."] = "Aqui você pode mudar as configurações dos canais para dar opções de inscrição e de acesso automáticos pela barra lateral. Observe que as mudanças feitas aqui só afetam o canal selecionado se você tiver feito login.";
+$a->strings["Save Settings"] = "Salvar Configurações";
+$a->strings["Channel(s) to auto connect (comma separated)"] = "Canais de conexão automática (separados por vírgula)";
+$a->strings["List of channels that shall automatically connected to when the app is launched."] = "Lista de canais a serem conectados automaticamente quando o aplicativo for iniciado.";
+$a->strings["Popular Channels (comma separated)"] = "Canais Populares (separados por vírgula)";
+$a->strings["List of popular channels, will be displayed at the side and hotlinked for easy joining."] = "Lista de canais populares, que será exibida ao lado e terá link para facilitar a inscrição.";
+$a->strings["IRC settings saved."] = "As configurações do IRC foram salvas.";
+$a->strings["IRC Chatroom"] = "Sala de bate-papo IRC";
+$a->strings["Popular Channels"] = "Canais Populares";
diff --git a/irc/lang/ro/strings.php b/irc/lang/ro/strings.php
index c9626abc..bf70bbe6 100644
--- a/irc/lang/ro/strings.php
+++ b/irc/lang/ro/strings.php
@@ -2,13 +2,13 @@
 
 if(! function_exists("string_plural_select_ro")) {
 function string_plural_select_ro($n){
-	$n = intval($n);
-	if ($n==1) { return 0; } else if ((($n%100>19)||(($n%100==0)&&($n!=0)))) { return 2; } else  { return 1; }
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
 }}
-$a->strings['IRC Settings'] = 'Configurări IRC';
-$a->strings['Channel(s) to auto connect (comma separated)'] = 'Canal(e) pentru auto-conectare (separate prin virgulă)';
-$a->strings['Popular Channels (comma separated)'] = 'Canale Populare (separate prin virgulă)';
-$a->strings['Submit'] = 'Trimite';
-$a->strings['IRC settings saved.'] = 'Configurările IRC au fost salvate.';
-$a->strings['IRC Chatroom'] = 'Spațiu Chat IRC';
-$a->strings['Popular Channels'] = 'Canale populare';
+;
+$a->strings["IRC Settings"] = "Configurări IRC";
+$a->strings["Channel(s) to auto connect (comma separated)"] = "Canal(e) pentru auto-conectare (separate prin virgulă)";
+$a->strings["Popular Channels (comma separated)"] = "Canale Populare (separate prin virgulă)";
+$a->strings["Submit"] = "Trimite";
+$a->strings["IRC settings saved."] = "Configurările IRC au fost salvate.";
+$a->strings["IRC Chatroom"] = "Spațiu Chat IRC";
+$a->strings["Popular Channels"] = "Canale populare";
diff --git a/irc/lang/sv/messages.po b/irc/lang/sv/messages.po
deleted file mode 100644
index 98b66039..00000000
--- a/irc/lang/sv/messages.po
+++ /dev/null
@@ -1,63 +0,0 @@
-# ADDON irc
-# Copyright (C)
-# This file is distributed under the same license as the Friendica irc addon package.
-# 
-# 
-# Translators:
-# Kristoffer Grundström <lovaren@gmail.com>, 2022
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:14-0500\n"
-"PO-Revision-Date: 2022-01-16 01:02+0000\n"
-"Last-Translator: Kristoffer Grundström <lovaren@gmail.com>\n"
-"Language-Team: Swedish (http://www.transifex.com/Friendica/friendica/language/sv/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: sv\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: irc.php:32
-msgid ""
-"Here you can change the system wide settings for the channels to "
-"automatically join and access via the side bar. Note the changes you do "
-"here, only effect the channel selection if you are logged in."
-msgstr ""
-
-#: irc.php:33 irc.php:133
-msgid "Channel(s) to auto connect (comma separated)"
-msgstr "Kanal(er) att ansluta till automatiskt (separerade med komma)"
-
-#: irc.php:33 irc.php:133
-msgid ""
-"List of channels that shall automatically connected to when the app is "
-"launched."
-msgstr ""
-
-#: irc.php:34 irc.php:134
-msgid "Popular Channels (comma separated)"
-msgstr "Populära kanaler (separerade med komma)"
-
-#: irc.php:34 irc.php:134
-msgid ""
-"List of popular channels, will be displayed at the side and hotlinked for "
-"easy joining."
-msgstr ""
-
-#: irc.php:39
-msgid "IRC Settings"
-msgstr "IRC-inställningar"
-
-#: irc.php:60
-msgid "IRC Chatroom"
-msgstr "Chatt-rum för IRC"
-
-#: irc.php:88
-msgid "Popular Channels"
-msgstr "Populära kanaler"
-
-#: irc.php:132
-msgid "Save Settings"
-msgstr "Spara inställningar"
diff --git a/irc/lang/sv/strings.php b/irc/lang/sv/strings.php
index 36294e00..3ec569a7 100644
--- a/irc/lang/sv/strings.php
+++ b/irc/lang/sv/strings.php
@@ -1,13 +1,3 @@
-<?php
-
-if(! function_exists("string_plural_select_sv")) {
-function string_plural_select_sv($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Channel(s) to auto connect (comma separated)'] = 'Kanal(er) att ansluta till automatiskt (separerade med komma)';
-$a->strings['Popular Channels (comma separated)'] = 'Populära kanaler (separerade med komma)';
-$a->strings['IRC Settings'] = 'IRC-inställningar';
-$a->strings['IRC Chatroom'] = 'Chatt-rum för IRC';
-$a->strings['Popular Channels'] = 'Populära kanaler';
-$a->strings['Save Settings'] = 'Spara inställningar';
+<?php
+
+$a->strings["Submit"] = "Spara";
diff --git a/irc/lang/zh-cn/messages.po b/irc/lang/zh-cn/messages.po
deleted file mode 100644
index 46714652..00000000
--- a/irc/lang/zh-cn/messages.po
+++ /dev/null
@@ -1,68 +0,0 @@
-# ADDON irc
-# Copyright (C)
-# This file is distributed under the same license as the Friendica irc addon package.
-# 
-# 
-# Translators:
-# steve jobs <vicdorke@gmail.com>, 2020
-# 朱陈锬 <tangenters@outlook.com>, 2018
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-07-08 13:17+0200\n"
-"PO-Revision-Date: 2020-06-10 12:33+0000\n"
-"Last-Translator: steve jobs <vicdorke@gmail.com>\n"
-"Language-Team: Chinese (China) (http://www.transifex.com/Friendica/friendica/language/zh_CN/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: zh_CN\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-
-#: irc.php:37
-msgid "IRC Settings"
-msgstr "IRC 设置"
-
-#: irc.php:38
-msgid ""
-"Here you can change the system wide settings for the channels to "
-"automatically join and access via the side bar. Note the changes you do "
-"here, only effect the channel selection if you are logged in."
-msgstr "在这里，您可以更改系统范围内的设置，以便通过侧栏自动连接和访问频道。请注意此处所做的更改，仅当您登录时才影响频道选择。"
-
-#: irc.php:39 irc.php:136
-msgid "Save Settings"
-msgstr "保存设置"
-
-#: irc.php:40 irc.php:137
-msgid "Channel(s) to auto connect (comma separated)"
-msgstr "要自动连接的通道（逗号分隔）"
-
-#: irc.php:40 irc.php:137
-msgid ""
-"List of channels that shall automatically connected to when the app is "
-"launched."
-msgstr "应用程序启动时应自动连接的频道列表。"
-
-#: irc.php:41 irc.php:138
-msgid "Popular Channels (comma separated)"
-msgstr "热门频道 (逗号分隔)"
-
-#: irc.php:41 irc.php:138
-msgid ""
-"List of popular channels, will be displayed at the side and hotlinked for "
-"easy joining."
-msgstr "热门频道列表将显示在侧边，并提供链接以方便加入。"
-
-#: irc.php:57 irc.php:128
-msgid "IRC settings saved."
-msgstr "IRC 设置已保存。"
-
-#: irc.php:62
-msgid "IRC Chatroom"
-msgstr "IRC 聊天室"
-
-#: irc.php:90
-msgid "Popular Channels"
-msgstr "热门频道"
diff --git a/irc/lang/zh-cn/strings.php b/irc/lang/zh-cn/strings.php
index f17733a0..e526182f 100644
--- a/irc/lang/zh-cn/strings.php
+++ b/irc/lang/zh-cn/strings.php
@@ -1,17 +1,9 @@
-<?php
-
-if(! function_exists("string_plural_select_zh_cn")) {
-function string_plural_select_zh_cn($n){
-	$n = intval($n);
-	return intval(0);
-}}
-$a->strings['IRC Settings'] = 'IRC 设置';
-$a->strings['Here you can change the system wide settings for the channels to automatically join and access via the side bar. Note the changes you do here, only effect the channel selection if you are logged in.'] = '在这里，您可以更改系统范围内的设置，以便通过侧栏自动连接和访问频道。请注意此处所做的更改，仅当您登录时才影响频道选择。';
-$a->strings['Save Settings'] = '保存设置';
-$a->strings['Channel(s) to auto connect (comma separated)'] = '要自动连接的通道（逗号分隔）';
-$a->strings['List of channels that shall automatically connected to when the app is launched.'] = '应用程序启动时应自动连接的频道列表。';
-$a->strings['Popular Channels (comma separated)'] = '热门频道 (逗号分隔)';
-$a->strings['List of popular channels, will be displayed at the side and hotlinked for easy joining.'] = '热门频道列表将显示在侧边，并提供链接以方便加入。';
-$a->strings['IRC settings saved.'] = 'IRC 设置已保存。';
-$a->strings['IRC Chatroom'] = 'IRC 聊天室';
-$a->strings['Popular Channels'] = '热门频道';
+<?php
+
+$a->strings["IRC Settings"] = "IRC设置";
+$a->strings["Channel(s) to auto connect (comma separated)"] = "频道要自动地连接（逗号分隔）";
+$a->strings["Popular Channels (comma separated)"] = "流行频道（逗号分隔）";
+$a->strings["Submit"] = "提交";
+$a->strings["IRC settings saved."] = "IRC设置保存了。";
+$a->strings["IRC Chatroom"] = "IRC聊间";
+$a->strings["Popular Channels"] = "流行频道";
diff --git a/irc/templates/settings.tpl b/irc/templates/settings.tpl
index 215b8f3f..e463a59c 100644
--- a/irc/templates/settings.tpl
+++ b/irc/templates/settings.tpl
@@ -1,3 +1,15 @@
-<p>{{$info}}</p>
-{{include file="field_input.tpl" field=$autochans}}
-{{include file="field_input.tpl" field=$sitechats}}
+<span id="settings_irc_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose('settings_irc_expanded'); openClose('settings_irc_inflated');">
+	<h3>{{$header}}</h3>
+</span>
+<div id="settings_irc_expanded" class="settings-block" style="display: none;">
+	<span class="fakelink" onclick="openClose('settings_irc_expanded'); openClose('settings_irc_inflated');">
+		<h3>{{$header}}</h3>
+	</span>
+	<p>{{$info}}</p>
+	{{include file="field_input.tpl" field=$autochans}}
+	{{include file="field_input.tpl" field=$sitechats}}
+
+	<div class="settings-submit-wrapper" >
+		<input type="submit" id="irc-submit" name="irc-submit" class="settings-submit" value="{{$submit}}" />
+	</div>
+</div>
diff --git a/jappixmini/MIT.txt b/jappixmini/MIT.txt
new file mode 100644
index 00000000..2517727f
--- /dev/null
+++ b/jappixmini/MIT.txt
@@ -0,0 +1,7 @@
+You may distribute all files which are not within the jappix/ folder under the following conditions:
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/jappixmini/README b/jappixmini/README
new file mode 100644
index 00000000..0343d060
--- /dev/null
+++ b/jappixmini/README
@@ -0,0 +1,31 @@
+Jappix Mini Addon
+==================
+
+This quick-and-dirty addon allows you to add a Jabber-based, Facebook-like chat
+to Friendica. It uses Jappix Mini.
+
+It is necessary to use a BOSH host - so to use this addon, each users need to
+know the address of a BOSH host that works with his account. The BOSH server of
+the Jappix project (https://bind.jappix.com/) is not locked to a specific XMPP
+provider, but keep in mind that only personal usage is approved according to
+http://codingteam.net/project/jappix/doc/BoshServer.
+If you have a larger server, it is recommended that you install your own BOSH
+server and recommend it using the configuration help field. If it is on the
+same server, you can also deactivate the BOSH proxy. This should improve the
+performance.
+
+The addon has an experimental autosubscribe and autosuggest functionality which
+tries to add your Friendica contacts to your roster automatically.
+
+Limitations:
+ - Jabber passwords can only be encrypted if they are at most 39 characters
+   long.
+
+Notes on the license
+--------------------
+
+The license of this addon is AGPL, as required by Jappix Mini. If you make
+modifications to the addon, you are responsible for providing a proper facility
+for downloading the changed source code.
+Moreover, it may be necessary that you publish the source code of the Friendica
+application and all other used addons if you do not use standard versions.
diff --git a/jappixmini/jappix/AUTHORS b/jappixmini/jappix/AUTHORS
new file mode 100644
index 00000000..0086eb6a
--- /dev/null
+++ b/jappixmini/jappix/AUTHORS
@@ -0,0 +1,54 @@
+Jappix - An open social platform
+These are the authors of Jappix
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 15/01/12
+
+-------------------------------------------------
+
+Here are the Jappix contributors, who coded or translated the application (Codingteam.net nicknames):
+
+# DEVELOPERS
+	- am0ur3ux
+	- LinkMauve
+	- Maranda
+	- Mathieui
+	- Olivier
+	- sim6
+	- Vanaryon
+
+# TRANSLATORS
+	- allan
+	- Arsimael
+	- Belzeneph
+	- Catdarko
+	- Cerritus
+	- chunzu
+	- ebraminio
+	- Finkregh
+	- hamano
+	- JanCBorchardt
+	- jarda
+	- joeka
+	- kr2ysiek
+	- krohn
+	- Lenwe
+	- LinkMauve
+	- Liverbool
+	- lwj
+	- m1st
+	- Maime
+	- Maranda
+	- mbajur
+	- mentalo
+	- mkwm
+	- Otourly
+	- pocamon
+	- quimi
+	- sahwar
+	- Vanaryon
+	- vitalyster
+	- Zash
diff --git a/jappixmini/jappix/COPYING b/jappixmini/jappix/COPYING
new file mode 100644
index 00000000..84ae389f
--- /dev/null
+++ b/jappixmini/jappix/COPYING
@@ -0,0 +1,662 @@
+                    GNU AFFERO GENERAL PUBLIC LICENSE
+                       Version 3, 19 November 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU Affero General Public License is a free, copyleft license
+for software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
+
+  The licenses for most software and other practical works are
+designed to take away your freedom to share and change the works.  By
+contrast, our General Public Licenses are intended to guarantee your
+freedom to share and change all versions of a program--to make sure it
+remains free software for all its users.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
+
+  A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate.  Many developers of free software are heartened and
+encouraged by the resulting cooperation.  However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
+
+  The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community.  It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server.  Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
+
+  An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals.  This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU Affero General Public
+License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds
+of works, such as semiconductor masks.
+ 
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further restriction,
+you may remove that term.  If a license document contains a further
+restriction but permits relicensing or conveying under this License, you
+may add to a covered work material governed by the terms of that license
+document, provided that the further restriction does not survive such
+relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Remote Network Interaction; Use with the GNU General Public License.
+
+  Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software.  This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
+
+  Notwithstanding any other provision of this License, you have permission
+to link or combine any covered work with a work licensed under version 3
+of the GNU General Public License into a single combined work, and to
+convey the resulting work.  The terms of this License will continue to
+apply to the part which is the covered work, but the work with which it is
+combined will remain governed by version 3 of the GNU General Public
+License.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU Affero General Public License from time to time.  Such new
+versions will be similar in spirit to the present version, but may differ
+in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU Affero
+General Public License "or any later version" applies to it, you have
+the option of following the terms and conditions either of that
+numbered version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number
+of the GNU Affero General Public License, you may choose any version
+ever published by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU Affero General Public License can be used, that
+proxy's public statement of acceptance of a version permanently
+authorizes you to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                       END OF TERMS AND CONDITIONS
+
+              How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as
+    published by the Free Software Foundation, either version 3 of the
+    License, or (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source.  For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code.  There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU AGPL, see
+<http://www.gnu.org/licenses/>.
\ No newline at end of file
diff --git a/jappixmini/jappix/INSTALL b/jappixmini/jappix/INSTALL
new file mode 100644
index 00000000..652c1be7
--- /dev/null
+++ b/jappixmini/jappix/INSTALL
@@ -0,0 +1,23 @@
+Jappix - An open social platform
+These are the installation instructions for Jappix
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 15/09/10
+
+-------------------------------------------------
+
+It's very simple to install Jappix on your webserver, you just have to follow these things:
+
+# INSTALLATION
+	- The HTTP server : http://codingteam.net/project/jappix/doc/HttpServer
+	- The XMPP server : http://codingteam.net/project/jappix/doc/XmppServer
+	- The BOSH server : http://codingteam.net/project/jappix/doc/BoshServer
+	- The Jappix app. : http://codingteam.net/project/jappix/doc/JappixApp
+
+# MORE
+	- The whole documentation is available at : http://codingteam.net/project/jappix/doc
+
+Now, you can use Jappix. Happy socializing!
diff --git a/jappixmini/jappix/README b/jappixmini/jappix/README
new file mode 100644
index 00000000..49cbf974
--- /dev/null
+++ b/jappixmini/jappix/README
@@ -0,0 +1,20 @@
+Jappix - An open social platform
+This is the readme file for Jappix
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 18/02/11
+
+-------------------------------------------------
+
+Please refer to the installation instructions that are located in the INSTALL file to process the Jappix installation.
+
+The Jappix Project official service:  https://www.jappix.com/
+The Jappix Project website: 	      https://project.jappix.com/
+The Jappix Project panel: 	      http://codingteam.net/project/jappix
+
+Jappix is released under the terms of the AGPL license. See COPYING for details.
+
+Have fun with Jappix!
diff --git a/jappixmini/jappix/THANKS b/jappixmini/jappix/THANKS
new file mode 100644
index 00000000..a5b12227
--- /dev/null
+++ b/jappixmini/jappix/THANKS
@@ -0,0 +1,27 @@
+Jappix - An open social platform
+These are the special thanks for Jappix
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 16/02/11
+
+-------------------------------------------------
+
+We would like to thanks the authors of these tools, coming from other projects:
+
+# PROJECTS
+	- Base64		http://rumkin.com
+	- DrawSVGChart		http://codingteam.net/project/codingteam
+	- idzXHR		http://www.iadvize.com/plugin_strophe_xmpp.html
+	- JSJaC			http://blog.jwchat.org/jsjac/
+	- jQuery		http://jquery.com/
+	- jQuery Form		http://jquery.malsup.com/form/
+	- jQuery Timers		http://plugins.jquery.com/project/timers
+	- jXHR			http://mulletxhr.com/
+	- Mobile Detect		http://code.google.com/p/php-mobile-detect/
+	- JSMin			http://github.com/rgrove/jsmin-php/
+	- PHP-gettext		https://launchpad.net/php-gettext	
+	- Silk icons		http://www.famfamfam.com/lab/icons/silk/
+	- Smileys		http://www.gajim.org/
diff --git a/jappixmini/jappix/VERSION b/jappixmini/jappix/VERSION
new file mode 100644
index 00000000..76892598
--- /dev/null
+++ b/jappixmini/jappix/VERSION
@@ -0,0 +1 @@
+Spaco [0.9]
diff --git a/jappixmini/jappix/css/adhoc.css b/jappixmini/jappix/css/adhoc.css
new file mode 100644
index 00000000..68d0383f
--- /dev/null
+++ b/jappixmini/jappix/css/adhoc.css
@@ -0,0 +1,26 @@
+/*
+
+Jappix - An open social platform
+This is the Ad-Hoc CSS stylesheet for Jappix
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 20/12/10
+
+*/
+
+#adhoc .content {
+	padding: 10px 0 10px 0;
+}
+
+#adhoc .adhoc-head {
+	background-color: #f1f6fd;
+	border: 1px #9dc4fc solid;
+	width: 598px;
+	height: 18px;
+	font-size: 0.9em;
+	margin: 0 10px 12px 10px;
+	padding: 6px 10px;
+}
diff --git a/jappixmini/jappix/css/anonymous.css b/jappixmini/jappix/css/anonymous.css
new file mode 100644
index 00000000..f61a79c6
--- /dev/null
+++ b/jappixmini/jappix/css/anonymous.css
@@ -0,0 +1,29 @@
+/*
+
+Jappix - An open social platform
+This is the anonymous mode CSS stylesheet for Jappix
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 06/11/10
+
+*/
+
+#top-content {
+	min-width: 500px !important;
+}
+
+#main-content {
+	min-width: 490px !important;
+	min-height: 450px !important;
+}
+
+#left-content {
+	display: none;
+}
+
+#right-content {
+	left: 0;
+}
diff --git a/jappixmini/jappix/css/archives.css b/jappixmini/jappix/css/archives.css
new file mode 100644
index 00000000..5e60a8be
--- /dev/null
+++ b/jappixmini/jappix/css/archives.css
@@ -0,0 +1,93 @@
+/*
+
+Jappix - An open social platform
+This is the archives CSS stylesheet for Jappix
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 19/12/10
+
+*/
+
+#archives .content {
+	padding: 10px 0 10px 0;
+}
+
+#archives .filter {
+	background-color: #e9f1fd;
+	border-right: 1px solid #9dc4fc;
+	width: 180px;
+	padding: 12px;
+	position: absolute;
+	top: 0;
+	left: 0;
+	bottom: 0;
+	float: left;
+	border-top-left-radius: 4px;
+	border-bottom-left-radius: 4px;
+	-moz-border-radius-topleft: 4px;
+	-moz-border-radius-bottomleft: 4px;
+	-webkit-border-top-left-radius: 4px;
+	-webkit-border-bottom-left-radius: 4px;
+}
+
+#archives .filter .friend {
+	margin-bottom: 12px;
+}
+
+#archives .filter .friend {
+	height: 210px;
+	width: 180px;
+	float: none;
+}
+
+#archives .current,
+#archives .logs {
+	position: absolute;
+	bottom: 0;
+	right: 0;
+	left: 204px;
+}
+
+#archives .current {
+	background-color: #e4eef9;
+	border-bottom: 1px solid #9dc4fc;
+	font-size: 0.9em;
+	height: 16px;
+	padding: 6px;
+	top: 0;
+}
+
+#archives .current span {
+	height: 16px;
+	overflow: hidden;
+}
+
+#archives .current .name {
+	max-width: 160px;
+	font-weight: bold;
+	float: left;
+}
+
+#archives .current .time {
+	color: #47646a;
+	font-size: 0.95em;
+	float: right;
+}
+
+#archives .logs {
+	color: black;
+	font-size: 0.9em;
+	overflow: auto;
+	padding: 8px 10px 0;
+	float: left;
+	position: absolute;
+	top: 29px;
+}
+
+#archives .logs a {
+	color: black;
+	text-decoration: underline;
+}
diff --git a/jappixmini/jappix/css/board.css b/jappixmini/jappix/css/board.css
new file mode 100644
index 00000000..91e6dcf9
--- /dev/null
+++ b/jappixmini/jappix/css/board.css
@@ -0,0 +1,47 @@
+/*
+
+Jappix - An open social platform
+This is the board CSS stylesheet for Jappix
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 26/08/11
+
+*/
+
+#board .one-board {
+	display: none;
+	position: fixed;
+	top: 0;
+	left: 0;
+	right: 0;
+	height: 18px;
+	z-index: 10000;
+	font-size: 0.92em;
+	padding: 6px 8px;
+	box-shadow: 0 0 8px #5c5c5c;
+	-moz-box-shadow: 0 0 8px #5c5c5c;
+	-webkit-box-shadow: 0 0 8px #5c5c5c;
+}
+
+#board .one-board:hover {
+	cursor: pointer;
+}
+
+#board .one-board.visible {
+	display: block;
+}
+
+#board .one-board.error {
+	background-color: rgb(241,160,160);
+	background-color: rgba(241,160,160,0.9);
+	color: #420c0c;
+}
+
+#board .one-board.info {
+	background-color: rgb(248,246,186);
+	background-color: rgba(248,246,186,0.9);
+	color: #2f2a02;
+}
diff --git a/jappixmini/jappix/css/buddylist.css b/jappixmini/jappix/css/buddylist.css
new file mode 100644
index 00000000..3bfa70cb
--- /dev/null
+++ b/jappixmini/jappix/css/buddylist.css
@@ -0,0 +1,530 @@
+/*
+ 
+Jappix - An open social platform
+This is the buddy-list CSS stylesheet for Jappix
+ 
+-------------------------------------------------
+ 
+License: AGPL
+Author: Vanaryon
+Last revision: 31/08/11
+ 
+*/
+ 
+#buddy-list {
+        background-color: rgb(20,20,20);
+        background-color: rgba(20,20,20,0.85);
+        color: #919191;
+        padding: 15px 6px 4px 6px;
+        border-radius: 4px;
+        -moz-border-radius: 4px;
+        -webkit-border-radius: 4px;
+        box-shadow: 0 0 6px #5c5c5c;
+        -moz-box-shadow: 0 0 6px #5c5c5c;
+        -webkit-box-shadow: 0 0 6px #5c5c5c;
+}
+ 
+#buddy-list .content {
+	background: #e8f1f3;
+	background: -moz-linear-gradient(top, #e8f1f3, #e4edef);
+	background: -webkit-gradient(linear, left top, left bottom, from(#e8f1f3), to(#e4edef));
+        color: #666666;
+        height: 207px;
+        padding: 4px 4px 0 4px;
+        overflow-x: hidden;
+        overflow-y: auto;
+        border-top-left-radius: 3px;
+        border-top-right-radius: 3px;
+        -moz-border-radius-topleft: 3px;
+        -moz-border-radius-topright: 3px;
+        -webkit-border-top-left-radius: 3px;
+        -webkit-border-top-right-radius: 3px;
+}
+ 
+#buddy-list .one-group {
+        margin-bottom: 10px;
+}
+ 
+#buddy-list .one-group a.group {
+        color: #202c2f;
+        font-size: 0.8em;
+        margin: 3px 6px;
+        padding-left: 12px;
+        max-height: 15px;
+        text-decoration: none;
+        overflow: hidden;
+        display: block;
+}
+ 
+#buddy-list .one-group a.group.plus {
+        background-position: -4px -1143px;
+}
+ 
+#buddy-list .one-group a.group.minus {
+        background-position: -4px -1162px;
+}
+ 
+#buddy-list .one-group a.group:hover {
+        cursor: pointer;
+}
+ 
+#buddy-list .hidden-buddy,
+#buddy-list .foot-edit-finish,
+.buddy-conf-more-display-available {
+        display: none;
+}
+ 
+#buddy-list .buddy {
+        width: 100%;
+        height: 50px;
+        margin-bottom: 4px;
+}
+ 
+#buddy-list .buddy-click {
+        background: #d9e7ea;
+        width: 100%;
+        height: 100%;
+        overflow: hidden;
+        border-radius: 3px;
+        -moz-border-radius: 3px;
+        -webkit-border-radius: 3px;
+}
+ 
+#buddy-list .buddy-click:hover,
+#buddy-list .buddy-click:focus {
+        background: #cedee1;
+        cursor: pointer;
+}
+ 
+#buddy-list .buddy-click:active {
+        background: #c3d3d7;
+}
+ 
+#buddy-list .gateway {
+        height: 27px;
+}
+ 
+#buddy-list .gateway .name {
+        margin-left: 0;
+}
+ 
+#buddy-list .gateway .buddy-presence {
+        float: left;
+        overflow: hidden;
+        width: 0;
+        margin: 0 4px;
+}
+ 
+#buddy-list .avatar-container {
+        float: left;
+        text-align: center;
+        margin: 3px;
+        width: 46px;
+        height: 46px;
+}
+ 
+#buddy-list .avatar {
+        max-width: 44px;
+        max-height: 44px;
+}
+ 
+#buddy-list .name {
+        margin: 4px 3px 5px 56px;
+}
+ 
+#buddy-list .buddy-name {
+        height: 17px;
+        font-weight: bold;
+        font-size: 0.8em;
+        color: #264249;
+        margin: 5px 0 5px 2px;
+        overflow: hidden;
+}
+ 
+#buddy-list .buddy.blocked p.buddy-name {
+        text-decoration: line-through;
+}
+ 
+#buddy-list .buddy-presence {
+        height: 14px;
+        font-size: 0.7em;
+        color: #3a585e;
+        padding: 2px 0 0 16px;
+        margin-top: -3px;
+}
+ 
+#buddy-list .unavailable,
+#page-switch .unavailable,
+#page-engine p.bc-infos span.show.unavailable {
+        background-position: 0 -153px;
+}
+ 
+#buddy-list .available,
+#page-engine p.bc-infos span.show.available,
+#page-engine .list .available,
+#page-engine .list .chat,
+#page-switch .available,
+#my-infos .f-presence a[data-value=available] span {
+        background-position: 0 -169px;
+}
+ 
+#buddy-list .away,
+#page-engine p.bc-infos span.show.away,
+#page-engine .list .away,
+#page-switch .away,
+#my-infos .f-presence a[data-value=away] span {
+        background-position: 0 -185px;
+}
+ 
+#buddy-list .busy,
+#page-engine p.bc-infos span.show.busy,
+#page-engine .list .xa,
+#page-engine .list .dnd,
+#page-switch .busy,
+#my-infos .f-presence a[data-value=xa] span {
+        background-position: 0 -201px;
+}
+ 
+#buddy-list .error,
+#page-switch .error,
+#page-engine p.bc-infos span.show.error {
+        background-position: 0 -217px;
+}
+ 
+#buddy-list .buddy-infos {
+	position: absolute;
+        z-index: 100;
+        width: 337px;
+        color: white;
+        font-size: 0.8em;
+}
+ 
+.buddy-infos-subarrow {
+        background-position: 0 -241px;
+        opacity: 0.8;
+        width: 9px;
+        height: 20px;
+        margin-top: 12px;
+        float: left;
+}
+ 
+.buddy-infos-subitem {
+        background-color: rgb(0,0,0);
+        background-color: rgba(0,0,0,0.8);
+        padding: 8px 10px;
+        width: 308px;
+        text-shadow: 0 1px 1px black;
+        float: left;
+	border-radius: 5px;
+	-moz-border-radius: 5px;
+	-webkit-border-radius: 5px;
+}
+ 
+.manage-infos p.bm-authorize,
+#rosterx .oneresult span.action.add {
+        background-position: 0 -1181px;
+}
+ 
+.manage-infos p.bm-remove,
+#rosterx .oneresult span.action.delete,
+#attach div.one-file a.remove {
+        background-position: 0 -1200px;
+}
+ 
+.manage-infos p.bm-remove {
+        margin-bottom: 18px;
+}
+ 
+.manage-infos p.bm-rename {
+        background-position: 0 -1216px;
+}
+ 
+.manage-infos p.bm-group {
+        background-position: 0 -1241px;
+}
+ 
+.manage-infos div.bm-choose {
+        max-height: 95px;
+        margin: 0 0 8px 102px;
+        overflow: auto;
+}
+ 
+.manage-infos div.bm-choose label {
+        float: left;
+        clear: both;
+        margin-bottom: 1px;
+}
+ 
+.manage-infos div.bm-choose input {
+        float: left;
+}
+ 
+.manage-infos div.bm-choose input[type=checkbox] {
+        margin: 0 6px 0 0;
+}
+ 
+.manage-infos div.bm-choose div {
+        clear: both;
+}
+ 
+.manage-infos p.bm-rename,
+.manage-infos p.bm-group {
+        height: 26px;
+}
+ 
+.manage-infos p.bm-rename label,
+.manage-infos p.bm-group label {
+        width: 80px;
+        padding-top: 3px;
+        float: left;
+}
+ 
+.manage-infos p.bm-rename input,
+.manage-infos p.bm-group input {
+        float: left;
+        width: 155px;
+}
+ 
+.manage-infos a.save {
+        float: right;
+        margin: 4px;
+}
+ 
+.buddy-infos-subitem p {
+        margin: 6px 0;
+        padding-left: 22px;
+        height: 16px;
+        overflow: hidden;
+}
+ 
+.buddy-infos-subitem a {
+        color: white;
+        text-decoration: underline;
+}
+ 
+.tune-note {
+        background-position: 0 -676px;
+}
+ 
+.location-world {
+        background-position: 0 -658px;
+}
+ 
+.view-individual {
+        background-position: 0 -34px;
+}
+ 
+.edit-buddy {
+        background-position: 0 -1008px;
+}
+ 
+#buddy-list .filter {
+        background-color: white;
+        border-top: 1px solid #b8c2c4;
+        height: 15px;
+        padding: 2px 4px;
+        font-size: 0.8em;
+        border-bottom-left-radius: 3px;
+        border-bottom-right-radius: 3px;
+        -moz-border-radius-bottomleft: 3px;
+        -moz-border-radius-bottomright: 3px;
+        -webkit-border-bottom-left-radius: 3px;
+        -webkit-border-bottom-right-radius: 3px;
+}
+ 
+#buddy-list .filter input {
+        border: none;
+        color: #273a3f;
+        width: 211px;
+        padding: 0;
+        box-shadow: none;
+        -moz-box-shadow: none;
+        -webkit-box-shadow: none;
+}
+ 
+#buddy-list .filter a {
+        display: none;
+        background-color: #9a2d2d;
+        color: white;
+        height: 13px;
+        width: 13px;
+        margin-top: 1px;
+        font-size: 0.8em;
+        text-align: center;
+        text-decoration: none;
+        float: right;
+        border-radius: 2px;
+        -moz-border-radius: 2px;
+        -webkit-border-radius: 2px;
+}
+ 
+#buddy-list .filter a:hover,
+#buddy-list .filter a:focus {
+        background-color: #8c2121;
+}
+ 
+#buddy-list .filter a:active {
+        background-color: #7e1919;
+}
+ 
+#buddy-list .foot {
+        padding: 9px 1px 3px;
+}
+ 
+#buddy-list .buddy-list-icon {
+        height: 16px;
+        width: 16px;
+        margin: -3px 5px 0 0;
+        float: left;
+}
+ 
+#buddy-list .buddy-list-icon a.talk-images {
+        height: 16px;
+        width: 16px;
+        display: block;
+}
+ 
+#buddy-list .add,
+#page-engine .text .tools-add {
+        background-position: 0 -1047px;
+}
+ 
+#buddy-list .join {
+        background-position: 0 -1065px;
+}
+ 
+#buddy-list .groupchat,
+#page-switch .groupchat-default {
+        background-position: 0 -1082px;
+}
+ 
+#buddy-list .more {
+        background-position: 0 -1100px;
+}
+ 
+#buddy-list .foot-edit-finish a {
+        color: white;
+        font-size: 0.8em;
+        margin: -3px 4px 0 0;
+        float: right;
+        display: block;
+}
+ 
+#buddy-list .foot-edit-finish a:hover,
+#buddy-list .foot-edit-finish a:focus {
+        text-decoration: underline;
+        cursor: pointer;
+}
+ 
+.buddy-conf-item {
+        position: absolute;
+        width: 263px;
+        color: white;
+        z-index: 9998;
+        text-align: left;
+        font-size: 0.8em;
+        margin-left: -10px;
+}
+ 
+.buddy-conf-item:hover {
+        cursor: default;
+}
+ 
+.buddy-conf-subarrow {
+        background-position: 0 -241px;
+        opacity: 0.8;
+        height: 10px;
+        width: 18px;
+        margin-left: 9px;
+}
+ 
+.buddy-conf-subitem {
+        background-color: rgb(0,0,0);
+        background-color: rgba(0,0,0,0.8);
+        padding: 10px;
+        text-shadow: 0 1px 1px black;
+	border-radius: 5px;
+	-moz-border-radius: 5px;
+	-webkit-border-radius: 5px;
+}
+ 
+.buddy-conf-p {
+        margin-bottom: 4px;
+        width: 220px;
+        font-weight: bold;
+        float: left;
+}
+ 
+.buddy-conf-input {
+        padding-top: 2px;
+}
+ 
+.buddy-conf-text {
+        font-size: 11px;
+        clear: both;
+        margin-bottom: 3px;
+}
+ 
+.buddy-conf-text a {
+        color: white;
+}
+ 
+.buddy-conf-text a:hover,
+.buddy-conf-text a:focus {
+        cursor: pointer;
+        text-decoration: underline;
+}
+ 
+.buddy-conf-text a.buddy-conf-add-search {
+        text-decoration: underline;
+        margin-top: 6px;
+        display: block;
+}
+ 
+.buddy-conf-select {
+        font-size: 1.1em;
+        clear: both;
+        margin-bottom: 8px;
+        width: 180px;
+        height: 23px;
+}
+ 
+.join-jid {
+        width: 220px;
+        margin-top: 5px;
+}
+ 
+.add-contact-jid,
+.add-contact-name,
+.add-contact-gateway {
+        width: 156px;
+        margin-bottom: 4px;
+}
+ 
+.add-contact-name-get {
+        font-size: 0.8em;
+        display: none;
+}
+ 
+.buddy-conf-subitem label {
+        clear: both;
+}
+ 
+.buddy-conf-subitem label span {
+        width: 76px;
+        height: 14px;
+        margin-top: 3px;
+        overflow: hidden;
+        float: left;
+}
+ 
+#buddy-conf-join ul {
+        width: 224px;
+        max-height: 160px;
+        left: 10px;
+        top: 51px;
+}
+ 
+.buddy-conf-join-select {
+        margin: 8px 0 0 0;
+}
diff --git a/jappixmini/jappix/css/channel.css b/jappixmini/jappix/css/channel.css
new file mode 100644
index 00000000..671d25ea
--- /dev/null
+++ b/jappixmini/jappix/css/channel.css
@@ -0,0 +1,545 @@
+/*
+
+Jappix - An open social platform
+This is the channel CSS stylesheet for Jappix
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 26/08/11
+
+*/
+
+#channel .top div.update {
+	position: absolute;
+	top: 12px;
+	left: 115px;
+	right: 15px;
+	bottom: 15px;
+	border-radius: 20px;
+	-moz-border-radius: 20px;
+	-webkit-border-radius: 20px;
+}
+
+#channel .top p {
+	font-size: 0.9em;
+	margin-bottom: 10px;
+}
+
+#channel .top h2 {
+	font-size: 1.6em;
+	margin-bottom: 10px;
+	color: #232323;
+}
+
+#channel .top a {
+	font-size: 0.9em;
+	color: #232323;
+}
+
+#channel .top.individual div.update {
+	right: 36px;
+}
+
+#channel .top.individual div.shortcuts,
+#userinfos .main-infos div.shortcuts {
+	width: 16px;
+	float: right;
+}
+
+#channel .top.individual div.shortcuts {
+	margin: 2px 5px 0 0;
+}
+
+#channel .top.individual div.shortcuts a,
+#userinfos .main-infos div.shortcuts a {
+	height: 16px;
+	width: 16px;
+	margin-bottom: 4px;
+	display: block;
+}
+
+#channel .top.individual div.shortcuts a.message,
+#userinfos .main-infos a.message {
+	background-position: 0 -1717px;
+}
+
+#channel .top.individual div.shortcuts a.chat,
+#userinfos .main-infos a.chat {
+	background-position: 0 -1737px;
+}
+
+#channel .top.individual div.shortcuts a.command,
+#userinfos .main-infos a.command {
+	background-position: 0 -1758px;
+}
+
+#channel .microblog-body {
+	height: 20px;
+	margin-right: 50px;
+}
+
+#channel .microblog-body input {
+	width: 100%;
+	height: 100%;
+	padding: 8px;
+}
+
+#channel .one-microblog-icon {
+	position: absolute;
+	top: 38px;
+	right: 0;
+}
+
+#channel div.update .one-microblog-icon,
+#channel div.update .postit {
+	width: 16px;
+	height: 16px;
+	display: block;
+}
+
+#channel div.update .attach {
+	background-position: 0 -79px;
+	display: none;
+}
+
+#attach {
+	position: absolute;
+	width: 263px;
+	margin-left: -227px;
+	color: white;
+	font-size: 0.85em;
+	z-index: 9998;
+	text-align: left;
+	display: none;
+}
+
+#attach p {
+	margin-bottom: 6px !important;
+}
+
+#attach input[type=submit] {
+	margin: 8px 0 6px 0;
+}
+
+#attach .wait {
+	float: right;
+	margin: 7px 5px;
+}
+
+#attach div.one-file {
+	height: 16px;
+	margin-top: 2px;
+}
+
+#attach div.one-file a.link {
+	color: white;
+	width: 215px;
+	height: 14px;
+	margin-left: 2px;
+	overflow: hidden;
+	float: left;
+}
+
+#attach div.one-file a.remove {
+	width: 16px;
+	height: 16px;
+	float: left;
+}
+
+.attach-subarrow {
+	background-position: 0 -241px;
+	opacity: 0.8;
+	height: 10px;
+	width: 18px;
+	margin-left: 226px;
+}
+
+.attach-subitem {
+	background-color: rgb(0,0,0);
+	background-color: rgba(0,0,0,0.8);
+	padding: 10px;
+	text-shadow: 0 1px 1px black;
+	border-radius: 5px;
+	-moz-border-radius: 5px;
+	-webkit-border-radius: 5px;
+}
+
+.attach-p {
+	font-weight: bold;
+	float: left;
+}
+
+#channel .one-update {
+	margin-bottom: 12px;
+	padding: 6px 6px 8px 6px;
+	border-bottom: 1px dotted #d0d0d0;
+	min-height: 50px;
+	color: black;
+	position: relative;
+	display: none;
+}
+
+#channel .one-update .avatar-container {
+	text-align: center;
+	margin-right: 16px;
+	float: left;
+	height: 50px;
+	width: 50px;
+}
+
+#channel .one-update .avatar-container:hover {
+	cursor: pointer;
+}
+
+#channel .one-update img.avatar {
+	max-height: 50px;
+	max-width: 50px;
+}
+
+#channel .one-update div.body {
+	margin-left: 65px;
+	opacity: 0.8;
+}
+
+#channel .one-update:hover div.body {
+	opacity: 1;
+}
+
+#channel .one-update a.repeat {
+	background-position: 0 -1681px;
+	height: 16px;
+	width: 16px;
+	margin-right: 4px;
+	float: left;
+}
+
+#channel .one-update span a {
+	text-decoration: underline;
+}
+
+#channel .one-update p {
+	display: block;
+	margin: 0 12px 5px 0;
+}
+
+#channel .one-update p b.name:hover {
+	cursor: pointer;
+	text-decoration: underline;
+}
+
+#channel .one-update p.infos {
+	font-size: 0.9em;
+}
+
+#channel .one-update p.infos a.geoloc {
+	background-position: 0 -1778px;
+	color: #363636;
+	margin-left: 18px;
+	padding-left: 14px;
+}
+
+#channel .one-update p.infos a.geoloc:hover,
+#channel .one-update p.infos a.geoloc:focus,
+#channel .one-update p.infos a.geoloc:active {
+	color: #141414;
+}
+
+#channel .one-update p.file {
+	font-size: 0.9em;
+	margin: 6px 0 5px 10px;
+}
+
+#channel .one-update p.file a.link,
+#inbox .inbox-new-file a.file {
+	min-height: 16px;
+	padding-left: 22px;
+	text-decoration: underline;
+	display: block;
+}
+
+#channel .one-update p.file a.link {
+	margin-top: 4px;
+}
+
+#channel p.file a,
+#inbox .inbox-new-file a.file {
+	background-position: 0 -988px;
+}
+
+#channel p.file a.audio,
+#inbox .inbox-new-file a.file.audio {
+	background-position: 0 -899px;
+}
+
+#channel p.file a.image,
+#inbox .inbox-new-file a.file.image {
+	background-position: 0 -917px;
+}
+
+#channel p.file a.video,
+#inbox .inbox-new-file a.file.video {
+	background-position: 0 -935px;
+}
+
+#channel p.file a.document,
+#inbox .inbox-new-file a.file.document {
+	background-position: 0 -953px;
+}
+
+#channel p.file a.package,
+#inbox .inbox-new-file a.file.package {
+	background-position: 0 -971px;
+}
+
+#channel .one-update p.file a.thumb img {
+	border: 1px solid #a2a2a2;
+	max-width: 140px;
+	max-height: 105px;
+	margin: 4px 10px 2px 0;
+	padding: 1px;
+}
+
+#channel .one-update p.file a.thumb img:hover {
+	border-color: #464646;
+}
+
+#channel .one-update div.comments,
+.popup.large div.comments {
+	width: 410px;
+	margin: 2px 0 2px 76px;
+}
+
+#channel .one-update div.comments div.arrow,
+.popup.large div.comments div.arrow {
+	background-position: 0 -1702px;
+	width: 20px;
+	height: 8px;
+	margin-left: 20px;
+	display: block;
+}
+
+#channel .one-update div.comments div.comments-content,
+.popup.large div.comments div.comments-content {
+	background-color: #e5ebec;
+	color: black;
+	font-size: 0.9em;
+	text-shadow: 0 1px 0 white;
+}
+
+#channel .one-update div.comments input,
+.popup.large div.comments input {
+	width: 356px;
+	margin: 6px 0;
+	padding: 4px 5px;
+}
+
+#channel .one-update div.comments span.icon,
+.popup.large div.comments span.icon {
+	background-position: 0 -1082px;
+	height: 16px;
+	width: 16px;
+	margin: 10px;
+	float: left;
+}
+
+#channel .one-update div.comments .one-comment.loading span.icon,
+.popup.large div.comments .one-comment.loading span.icon {
+	margin: 0 10px 0 0;
+}
+
+#channel .one-update div.comments .one-comment,
+.popup.large div.comments .one-comment {
+	border-bottom: 1px solid #f4f4f4;
+	padding: 4px 8px 0px 8px;
+	position: relative;
+	display: block;
+}
+
+#channel .one-update div.comments .one-comment.compose,
+.popup.large div.comments .one-comment.compose {
+	border-bottom: 2px solid #f4f4f4;
+	height: 36px;
+	padding: 0;
+}
+
+#channel .one-update div.comments .one-comment.new,
+.popup.large div.comments .one-comment.new {
+	display: none;
+}
+
+#channel .one-update div.comments a.one-comment,
+.popup.large div.comments a.one-comment {
+	text-decoration: none;
+}
+
+#channel .one-update div.comments a.one-comment:hover,
+#channel .one-update div.comments a.one-comment:focus,
+.popup.large div.comments a.one-comment:hover,
+.popup.large div.comments a.one-comment:focus {
+	text-decoration: underline;
+}
+
+#channel .one-update div.comments .one-comment.loading,
+.popup.large div.comments .one-comment.loading {
+	padding-bottom: 5px;
+}
+
+#channel .one-update div.comments .one-comment div.marker,
+.popup.large div.comments .one-comment div.marker {
+	background-color: #6d8387;
+	width: 2px;
+	position: absolute;
+	top: 0;
+	left: 0;
+	bottom: 0;
+}
+
+#channel .one-update div.comments .one-comment .avatar-container,
+.popup.large div.comments .one-comment .avatar-container {
+	text-align: center;
+	width: 30px;
+	height: 30px;
+	margin: 2px 8px 0 0;
+	float: left;
+}
+
+#channel .one-update div.comments .one-comment .avatar-container:hover,
+.popup.large div.comments .one-comment .avatar-container:hover {
+	cursor: pointer;
+}
+
+#channel .one-update div.comments .one-comment img.avatar,
+.popup.large div.comments .one-comment img.avatar {
+	max-height: 30px;
+	max-width: 30px;
+}
+
+#channel .one-update div.comments .one-comment .comment-container,
+.popup.large div.comments .one-comment .comment-container {
+	float: left;
+}
+
+#channel .one-update div.comments .one-comment a.name,
+.popup.large div.comments .one-comment a.name {
+	font-weight: bold;
+	text-decoration: none;
+	font-size: 0.95em;
+	padding-bottom: 2px;
+	float: left;
+}
+
+#channel .one-update div.comments .one-comment a.name:hover,
+#channel .one-update div.comments .one-comment a.name:focus,
+.popup.large div.comments .one-comment a.name:hover,
+.popup.large div.comments .one-comment a.name:focus {
+	text-decoration: underline;
+}
+
+#channel .one-update div.comments .one-comment span.date,
+#channel .one-update div.comments .one-comment a.remove,
+.popup.large div.comments .one-comment span.date,
+.popup.large div.comments .one-comment a.remove {
+	font-size: 0.85em;
+	float: right;
+}
+
+#channel .one-update div.comments .one-comment.me:hover span.date,
+.popup.large div.comments .one-comment.me:hover span.date {
+	display: none;
+}
+
+#channel .one-update div.comments .one-comment.me a.remove,
+.popup.large div.comments .one-comment.me a.remove {
+	display: none;
+}
+
+#channel .one-update div.comments .one-comment.me:hover a.remove,
+.popup.large div.comments .one-comment.me:hover a.remove {
+	display: block;
+}
+
+#channel .one-update div.comments .one-comment p.body,
+.popup.large div.comments .one-comment p.body {
+	clear: both;
+}
+
+#channel a.more {
+	background-position: 0 -334px;
+	color: black;
+	height: 16px;
+	text-decoration: none;
+	margin: -2px 0 0 4px;
+	padding: 0 0 14px 20px;
+	display: block;
+	visibility: hidden;
+}
+
+#channel a.more:hover,
+#channel a.more:focus {
+	text-decoration: underline;
+}
+
+#channel a.mbtool {
+	width: 11px;
+	height: 11px;
+	display: none;
+	position: absolute;
+	right: 0;
+}
+
+#channel .one-update:hover a.mbtool {
+	display: block;
+}
+
+#channel a.mbtool:hover,
+#channel a.mbtool:focus {
+	text-decoration: none;
+}
+
+#channel a.mbtool.profile {
+	background-position: -1px -1333px;
+	top: 24px;
+}
+
+#channel a.mbtool.repost {
+	background-position: -1px -1354px;
+}
+
+#channel a.mbtool.remove {
+	background-position: -1px -1312px;
+}
+
+#channel a.mbtool.repost,
+#channel a.mbtool.remove {
+	top: 6px;
+}
+
+#channel .footer {
+	bottom: 0;
+	border-bottom-left-radius: 4px;
+	border-bottom-right-radius: 4px;
+	-moz-border-radius-bottomleft: 4px;
+	-moz-border-radius-bottomright: 4px;
+	-webkit-border-bottom-left-radius: 4px;
+	-webkit-border-bottom-right-radius: 4px;
+}
+
+#channel .footer div {
+	margin-left: 5px;
+	padding-left: 24px;
+	min-height: 16px;
+	font-size: 0.85em;
+	width: auto !important;
+}
+
+#channel .footer .sync {
+	background-position: 0 -804px;
+	display: none;
+}
+
+#channel .footer .unsync {
+	background-position: 0 -830px;
+	display: none;
+}
diff --git a/jappixmini/jappix/css/directory.css b/jappixmini/jappix/css/directory.css
new file mode 100644
index 00000000..34b32312
--- /dev/null
+++ b/jappixmini/jappix/css/directory.css
@@ -0,0 +1,16 @@
+/*
+
+Jappix - An open social platform
+This is the directory tool CSS stylesheet for Jappix
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 13/02/11
+
+*/
+
+#directory .content {
+	padding: 10px 0 10px 0;
+}
diff --git a/jappixmini/jappix/css/discovery.css b/jappixmini/jappix/css/discovery.css
new file mode 100644
index 00000000..f66456b6
--- /dev/null
+++ b/jappixmini/jappix/css/discovery.css
@@ -0,0 +1,61 @@
+/*
+
+Jappix - An open social platform
+This is the discovery CSS stylesheet for Jappix
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 13/02/11
+
+*/
+
+#discovery .content {
+	padding: 10px 0 10px 0;
+}
+
+#discovery .content p {
+	margin: 5px 10px 5px 10px;
+	text-align: justify;
+	font-size: 0.85em;
+}
+
+#discovery .discovery-head,
+#directory .directory-head,
+#rosterx .rosterx-head,
+#privacy .privacy-head {
+	width: 606px;
+	height: 24px;
+	margin: 0 10px 10px 10px;
+	padding: 6px;
+	background: #f1f6fd;
+	border: 1px #9dc4fc solid;
+}
+
+#discovery .disco-server-text,
+#directory .directory-server-text {
+	float: left;
+	font-size: 0.9em;
+	margin: 3px;
+}
+
+#discovery .disco-server-input,
+#directory .directory-server-input {
+	float: right;
+	width: 200px;
+	padding: 2px;
+	height: 18px;
+	float: right;
+	margin-right: 10px;
+	padding: 2px;
+}
+
+#discovery .disco-category {
+	display: none;
+	margin-bottom: 22px;
+}
+
+#discovery .disco-category-title {
+	font-weight: bold;
+}
diff --git a/jappixmini/jappix/css/favorites.css b/jappixmini/jappix/css/favorites.css
new file mode 100644
index 00000000..5d3fd51d
--- /dev/null
+++ b/jappixmini/jappix/css/favorites.css
@@ -0,0 +1,179 @@
+/*
+
+Jappix - An open social platform
+This is the favorites CSS stylesheet for Jappix
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 28/12/10
+
+*/
+
+#favorites .content {
+	padding: 10px 0 10px 0;
+}
+
+#favorites .fedit-head-select {
+	min-width: 190px;
+	max-width: 210px;
+}
+
+#favorites .switch-fav {
+	margin: 0 10px 0 10px;
+	width: 200px;
+	height: 355px;
+	border-right: 1px #c0c0c0 dotted;
+	float: left;
+}
+
+#favorites .room-switcher {
+	width: 188px;
+	height: 18px;
+	border-bottom: 1px #9dc4fc solid;
+	float: left;
+	padding: 10px 6px;
+	font-size: 0.9em;
+}
+
+#favorites .room-switcher:hover {
+	background-color: #e9f1fd;
+	cursor: pointer;
+}
+
+#favorites .room-switcher:active {
+	background-color: #f1f6fd;
+}
+
+#favorites .switch-fav .icon {
+	float: left;
+	height: 16px;
+	width: 16px;
+	margin: 0 8px 0 0;
+}
+
+#favorites .switch-fav .room-list .list-icon {
+	background-position: 0 -855px;
+}
+
+#favorites .switch-fav .room-search .search-icon {
+	background-position: 0 -876px;
+}
+
+#favorites .static-fav {
+	width: 385px;
+	height: 335px;
+	margin: 0 10px 0 0;
+	padding: 10px;
+	float: right;
+}
+
+#favorites .favorites-search {
+	display: none;
+}
+
+#favorites .static-fav-head {
+	width: 393px;
+	margin: -10px;
+}
+
+#favorites .static-fav-results {
+	width: 406px;
+	height: 314px;
+	margin: 10px -10px -10px -10px;
+	padding: 6px 0 0 0;
+}
+
+#favorites .fedit-line {
+	height: 30px;
+	font-size: 0.9em;
+	padding: 10px 0 4px 4px;
+	border-bottom: 1px #9dc4fc solid;
+}
+
+#favorites .fedit-line:hover {
+	background: #e9f1fd;
+}
+
+#favorites label {
+	width: 140px;
+	margin-top: 3px;
+}
+
+#favorites input {
+	height: 18px;
+	width: 186px;
+	margin-top: 0;
+	padding: 2px;
+}
+
+#favorites .fedit-select {
+	min-width: 160px;
+}
+
+#favorites .fedit-actions {
+	margin: 10px 0 0;
+	font-size: 0.9em;
+	float: right;
+}
+
+#favorites input[type=checkbox] {
+	margin-top: 5px;
+}
+
+#favorites .fedit-terminate {
+	float: right;
+}
+
+#favorites .fedit-add {
+	display: block;
+}
+
+#favorites .fedit-edit {
+	background-position: 2px -1240px;
+}
+
+#favorites .fedit-remove {
+	margin: 0 8px 0 0;
+}
+
+#favorites .add,
+.popup .results .one-button.one-add {
+	background-position: 3px -1177px;
+}
+
+#favorites .remove,
+#inbox .remove {
+	background-position: 3px -1196px;
+}
+
+#favorites .join,
+#inbox .reply,
+#inbox .send,
+.popup .results .one-button.one-chat {
+	background-position: 3px -124px;
+}
+
+#favorites .one-button,
+#inbox .one-button,
+.popup .results .one-button {
+	padding-left: 20px !important;
+	font-size: 0.98em;
+}
+
+#favorites .fsearch-results {
+	overflow: auto;
+}
+
+#favorites .room-name {
+	margin: 4px 2px 5px;
+	max-width: 210px;
+	float: left;
+}
+
+#favorites .fsearch-noresults {
+	display: none;
+	font-size: 0.9em;
+	font-weight: bold;
+}
diff --git a/jappixmini/jappix/css/home.css b/jappixmini/jappix/css/home.css
new file mode 100644
index 00000000..789ea4d9
--- /dev/null
+++ b/jappixmini/jappix/css/home.css
@@ -0,0 +1,579 @@
+/*
+
+Jappix - An open social platform
+This is the home CSS stylesheet for Jappix
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 15/01/12
+
+*/
+
+#home {
+	position: absolute;
+	top: 0;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	min-height: 550px;
+	min-width: 875px;
+}
+
+#home .corporation,
+#home .corporation .corp_network,
+#home .locale,
+#home .obsolete {
+	background-color: rgb(20,20,20);
+	background-color: rgba(20,20,20,0.70);
+	color: white;
+	position: absolute;
+	top: 0;
+	text-shadow: 0 0 1px black;
+	z-index: 100;
+	border-bottom-left-radius: 3px;
+	border-bottom-right-radius: 3px;
+	-moz-border-radius-bottomleft: 3px;
+	-moz-border-radius-bottomright: 3px;
+	-webkit-border-bottom-left-radius: 3px;
+	-webkit-border-bottom-right-radius: 3px;
+}
+
+#home .corporation {
+	background-position: 9px -357px;
+	left: 12px;
+	height: 26px;
+	width: 34px;
+}
+
+#home .corporation.hovered {
+	height: 28px;
+	border-radius: 0;
+	-moz-border-radius: 0;
+	-webkit-border-radius: 0;
+}
+
+#home .corporation .corp_network {
+	width: 180px;
+	padding: 10px 12px;
+	top: 28px;
+	display: none;
+	border-top-right-radius: 3px;
+	-moz-border-radius-topright: 3px;
+	-webkit-border-top-right-radius: 3px;
+}
+
+#home .corporation.hovered .corp_network {
+	display: block;
+}
+
+#home .corporation .corp_network h2 {
+	font-size: 1.1em;
+	margin: 14px 0 4px 0;
+}
+
+#home .corporation .corp_network h2.nomargin {
+	margin-top: 0;
+}
+
+#home .corporation .corp_network a {
+	font-size: 0.8em;
+	margin: 2px 0;
+	padding: 2px 6px;
+	border-radius: 2px;
+	-moz-border-radius: 2px;
+	-webkit-border-radius: 2px;
+}
+
+#home .corporation .corp_network a span {
+	margin: 2px 0;
+	display: block;
+}
+
+#home .corporation .corp_network a span.name {
+	font-weight: bold;
+}
+
+#home .corporation .corp_network a span.desc {
+	font-size: 0.9em;
+	margin-left: 2px;
+}
+
+#home .locale {
+	left: 52px;
+	font-size: 0.8em;
+}
+
+#home .locale .current {
+	height: 19px;
+	padding: 3px 12px 4px 12px;
+	font-weight: bold;
+}
+
+#home .locale .current:hover {
+	cursor: default;
+}
+
+#home .locale .current .current_align {
+	height: 19px;
+	vertical-align: middle;
+	display: table-cell;
+}
+
+#home .locale .list {
+	margin: 2px 0 2px;
+}
+
+#home .locale .list a,
+#home .corporation .corp_network a {
+	color: white;
+	text-decoration: none;
+	display: block;
+}
+
+#home .locale .list a {
+	padding: 3px 10px;
+}
+
+#home .locale .list a:hover,
+#home .locale .list a:focus,
+#home .corporation .corp_network a:hover,
+#home .corporation .corp_network a:focus {
+	background-color: rgb(255,255,255);
+	background-color: rgba(255,255,255,0.1);
+	cursor: pointer;
+}
+
+#home .locale .list a:active,
+#home .corporation .corp_network a:active {
+	background-color: rgb(255,255,255);
+	background-color: rgba(255,255,255,0.14);
+}
+
+#home .obsolete {
+	height: 60px;
+	padding: 4px 10px;
+	right: 12px;
+	font-size: 0.9em;
+	font-weight: bold;
+	display: none;
+}
+
+#home .obsolete a {
+	height: 33px;
+	width: 33px;
+	margin: 5px 2px 0 0;
+	float: left;
+}
+
+#home .obsolete a:hover,
+#home .obsolete a:focus {
+	opacity: 0.8;
+}
+
+#home .obsolete a:active {
+	opacity: 0.6;
+}
+
+#home .obsolete a.firefox {
+	background-position: 1px 0;
+}
+
+#home .obsolete a.chrome {
+	background-position: -34px 0;
+}
+
+#home .obsolete a.safari {
+	background-position: -68px 0;
+}
+
+#home .obsolete a.opera {
+	background-position: -101px 0;
+}
+
+#home .obsolete a.ie {
+	background-position: -135px 0;
+}
+
+#home .plane {
+	background-position: 0 -384px;
+	width: 507px;
+	height: 328px;
+	position: absolute;
+	left: 0;
+	top: 60px;
+}
+
+#home .main {
+	background-color: rgb(20,20,20);
+	background-color: rgba(20,20,20,0.85);
+	position: absolute;
+	top: 50%;
+	margin-top: -200px;
+	width: 800px;
+	height: 400px;
+	left: 50%;
+	margin-left: -400px;
+	z-index: 50;
+	border-radius: 10px;
+	-moz-border-radius: 10px;
+	-webkit-border-radius: 10px;
+	box-shadow: 0 0 35px #5c5c5c;
+	-moz-box-shadow: 0 0 35px #5c5c5c;
+	-webkit-box-shadow: 0 0 35px #5c5c5c;
+}
+
+#home .left {
+	float: left;
+	width: 350px;
+	height: 370px;
+	margin: 15px 0 15px 15px;
+	color: white;
+	text-align: center;
+	text-shadow: 0 1px 1px black;
+}
+
+#home .left .logo {
+	background-position: 0 0;
+	float: left;
+	margin: 30px 20px;
+	width: 311px;
+	height: 113px;
+}
+
+#home .left p.upper {
+	margin: 12px 0 20px 0;
+}
+
+#home .left p.secondary {
+	margin: 8px 0 0 16px;
+	font-size: 0.9em;
+	width: 320px;
+}
+
+#home .right {
+	background: #e4eef9;
+	background: -moz-linear-gradient(top, #e4eef9, #C5E1FF);
+	background: -webkit-gradient(linear, left top, left bottom, from(#e4eef9), to(#C5E1FF));
+	float: right;
+	width: 385px;
+	height: 350px;
+	margin: 15px 15px 15px 0;
+	padding: 10px;
+	font-size: 13px;
+	text-align: justify;
+	border-radius: 5px;
+	-moz-border-radius: 5px;
+	-webkit-border-radius: 5px;
+	box-shadow: 0 0 20px black;
+	-moz-box-shadow: 0 0 20px black;
+	-webkit-box-shadow: 0 0 20px black;
+}
+
+#home .right h1 {
+	font-size: 16px;
+	padding-bottom: 4px;
+	border-bottom: 1px black dotted;
+}
+
+#home .right p {
+	margin-bottom: 4px;
+}
+
+#home .right p a {
+	border-width: 0 0 1px 0;
+	border-style: dotted;
+	border-color: black;
+}
+
+#home .right p a:hover,
+#home .right p a:focus {
+	border-style: solid;
+	text-decoration: none;
+}
+
+#home .right button {
+	display: block;
+	margin-left: 22px;
+	width: 342px;
+	height: 64px;
+	text-decoration: none;
+	font-weight: bold;
+	border-radius: 4px;
+	-moz-border-radius: 4px;
+	-webkit-border-radius: 4px;
+}
+
+#home .right button:hover {
+	cursor: pointer;
+}
+
+#home .right button span {
+	float: left;
+}
+
+#home .right button span.home-images {
+	height: 16px;
+	width: 16px;
+	margin: 5px 7px 7px 24px;
+}
+
+#home .right button span.text {
+	padding-left: 20px;
+	font-size: 1.5em;
+}
+
+#home .right .login {
+	background-color: #72d071;
+	background-position: 0 0;
+	border: 1px solid #5cb55c;
+	margin-top: 22px;
+	box-shadow: 0 0 10px #89e389;
+	-moz-box-shadow: 0 0 10px #89e389;
+	-webkit-box-shadow: 0 0 10px #89e389;
+}
+
+#home .right .login:hover,
+#home .right .login:focus {
+	border: 1px solid #419141;
+	box-shadow: 0 0 15px #72d071;
+	-moz-box-shadow: 0 0 15px #72d071;
+	-webkit-box-shadow: 0 0 15px #72d071;
+}
+
+#home .right .login:active {
+	background-color: #97e896;
+	background-position: 0 -80px;
+}
+
+#home .right .login span.text {
+	color: #2d612d;
+	text-shadow: 1px 1px 1px #5cb55c;
+}
+
+#home .right .login span.home-images {
+	background-position: 0 -230px;
+}
+
+#home .right .register {
+	background-color: #f6ef82;
+	background-position: 0 -160px;
+	border: 1px solid #e3db56;
+	margin-top: 15px;
+	box-shadow: 0 0 15px #f1e968;
+	-moz-box-shadow: 0 0 15px #f1e968;
+	-webkit-box-shadow: 0 0 15px #f1e968;
+}
+
+#home .right .register:hover,
+#home .right .register:focus {
+	border: 1px solid #d2c93f;
+	box-shadow: 0 0 15px #e0d743;
+	-moz-box-shadow: 0 0 15px #e0d743;
+	-webkit-box-shadow: 0 0 15px #e0d743;
+}
+
+#home .right .register:active {
+	background-color: #fdf7af;
+	background-position: 0 -240px;
+}
+
+#home .right .register span.text {
+	color: #6d6813;
+	text-shadow: 1px 1px 1px #dbd56e;
+}
+
+#home .right .register span.home-images {
+	background-position: 0 -204px;
+}
+
+#home .right p.notice {
+	margin-top: 24px;
+	font-size: 0.9em;
+}
+
+#home .right .navigation {
+	clear: both;
+	width: 385px;
+	border-top: 1px black dotted;
+	position: absolute;
+	text-align: right;
+	bottom: 25px;
+	right: 25px;
+	padding-top: 6px;
+}
+
+#home .right .navigation a {
+	margin-left: 9px;
+	color: black;
+	text-decoration: none;
+	font-size: 0.9em;
+	height: 12px;
+	padding: 0 0 4px 20px;
+	float: right;
+}
+
+#home .right .navigation a:hover,
+#home .right .navigation a:focus {
+	text-decoration: underline;
+}
+
+#home .right .navigation a.unencrypted {
+	background-position: 0 -256px;
+}
+
+#home .right .navigation a.encrypted {
+	background-position: 0 -282px;
+}
+
+#home .right .navigation a.project {
+	background-position: 0 -126px;
+}
+
+#home .right .navigation a.manager {
+	background-position: 0 -152px;
+}
+
+#home .right .navigation a.mobile {
+	background-position: 0 -178px;
+}
+
+#home a.advanced {
+	background-position: 0 -334px;
+	font-size: 0.9em;
+	height: 16px;
+	margin-bottom: 10px;
+	padding-left: 16px;
+	display: block;
+}
+
+#home fieldset.advanced {
+	display: none;
+}
+
+#home .anonymouser input[type=text] {
+	width: 160px;
+}
+
+#home .homediv.registerer .success a {
+	font-weight: bold;
+	text-decoration: underline;
+}
+
+#home fieldset {
+	border: 1px solid black;
+	margin: 12px 0 12px 0;
+	padding: 5px 0 4px 0;
+	border-radius: 3px;
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 3px;
+}
+
+#home legend {
+	font-size: 0.9em;
+	margin: 0 0 0 15px;
+	padding: 0 2px;
+	text-transform: uppercase;
+}
+
+#home label {
+	width: 110px;
+	display: block;
+	float: left;
+	clear: both;
+	margin: 0 0 5px 12px;
+}
+
+#home input,
+#home select {
+	float: left;
+	margin-bottom: 5px;
+}
+
+#home input[type=text],
+#home input[type=password],
+#home select {
+	width: 140px;
+	margin-top: -2px;
+}
+
+#home input[type=submit] {
+	min-width: 120px;
+	float: right;
+}
+
+#home span.jid {
+	display: block;
+	float: left;
+	margin: 0 4px;
+}
+
+#home input.nick, #home input.server {
+	width: 110px;
+}
+
+#home .info {
+	padding: 6px;
+	position: absolute;
+	bottom: 62px;
+	right: 35px;
+	border-width: 1px;
+	border-style: dotted;
+	clear: both;
+	width: 350px;
+}
+
+#home .info.success {
+	background-color: #aee578;
+	border-color: #85b05c;
+	display: none;
+}
+
+#home .info.fail {
+	background-color: #f19d9d;
+	border-color: #b34f4f;
+}
+
+#home .info.report {
+	background-color: #f3f48b;
+	border-color: #c9c66b;
+	display: none;
+}
+
+#home .info.report span {
+	text-decoration: underline;
+}
+
+#home .notice.simple {
+	background-color: rgb(20,20,20);
+	background-color: rgba(20,20,20,0.7);
+	color: white;
+	font-size: 0.9em;
+	text-decoration: none;
+	text-shadow: 0 1px 0 black;
+	position: fixed;
+	bottom: 0;
+	left: 0;
+	right: 0;
+	padding: 8px 20px;
+	z-index: 100;
+	box-shadow: 0 0 25px #ababab;
+	-moz-box-shadow: 0 0 25px #ababab;
+	-webkit-box-shadow: 0 0 25px #ababab;
+}
+
+#home .notice.simple .title {
+	background-color: rgb(20,20,20);
+	background-color: rgba(20,20,20,0.4);
+	background-position: 8px -299px;
+	border-width: 0 1px 1px 1px;
+	border-style: solid;
+	border-color: #141414;
+	font-weight: bold;
+	padding: 8px 8px 8px 30px;
+}
+
+#home .notice.simple .text {
+	margin-left: 20px;
+}
diff --git a/jappixmini/jappix/css/ie.css b/jappixmini/jappix/css/ie.css
new file mode 100644
index 00000000..8808b50b
--- /dev/null
+++ b/jappixmini/jappix/css/ie.css
@@ -0,0 +1,146 @@
+/*
+
+Jappix - An open social platform
+These are all the IE compliant CSS classes
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 22/04/11
+
+*/
+
+/* rgba(255,255,255,0.9) */
+.search ul {
+	background: transparent;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#edffffff,endColorstr=#edffffff);
+}
+
+/* rgba(255,255,255,0.3) */
+a.finish:active,
+#manager-buttons input:active,
+#install-buttons input:active {
+	background: transparent;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#49ffffff,endColorstr=#49ffffff);
+}
+
+/* rgba(255,255,255,0.2) */
+a.finish:hover,
+a.finish:focus,
+#manager-buttons input:hover,
+#manager-buttons input:focus,
+#install-buttons input:hover,
+#install-buttons input:focus,
+.notifications-content .one-notification:active {
+	background: transparent;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#33ffffff,endColorstr=#33ffffff);
+}
+
+/* rgba(255,255,255,0.14) */
+#home .locale .list a:active {
+	background: transparent;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#2fffffff,endColorstr=#2fffffff);
+}
+
+/* rgba(255,255,255,0.1) */
+#home .locale .list a:hover,
+#home .locale .list a:focus,
+a.finish,
+a.finish.disabled:hover,
+a.finish.disabled:focus,
+a.finish.disabled:active,
+#manager-buttons input,
+#install-buttons input,
+.notifications-content .one-notification:hover,
+.notifications-content .one-notification:focus {
+	background: transparent;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#20ffffff,endColorstr=#20ffffff);
+}
+
+/* rgba(255,239,104,0.8) */
+.popup .infos {
+	background: transparent;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#deffef68,endColorstr=#deffef68);
+}
+
+/* rgba(225,160,20,0.3) */
+.search ul li.hovered {
+	background: transparent;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#46e1a014,endColorstr=#46e1a014);
+}
+
+/* rgba(248,246,186,0.9) */
+#board .one-board.info {
+	background: transparent;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#edf8f6ba,endColorstr=#edf8f6ba);
+}
+
+/* rgba(241,160,160,0.9) */
+#board .one-board.error {
+	background: transparent;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#edf1a0a0,endColorstr=#edf1a0a0);
+}
+
+/* rgba(234,234,234,0.8) */
+#page-engine .chatstate {
+	background: transparent;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#deeaeaea,endColorstr=#deeaeaea);
+}
+
+/* rgba(20,20,20,0.6) */
+#home .locale,
+#home .obsolete,
+#home .notice.simple {
+	background: transparent;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#a0141414,endColorstr=#a0141414);
+}
+
+/* rgba(20,20,20,0.8) */
+#home .main,
+#reconnect .pane,
+#my-infos,
+#right-content,
+#buddy-list,
+#manager,
+#install {
+	background: transparent;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#de141414,endColorstr=#de141414);
+}
+
+/* rgba(20,20,20,0.9) */
+.popup {
+	background: transparent;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#ed141414,endColorstr=#ed141414);
+}
+
+/* rgba(0,0,0,0.2) */
+#install-top .step {
+	background: transparent;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#33000000,endColorstr=#33000000);
+}
+
+/* rgba(0,0,0,0.6) */
+.lock {
+	background: url(../img/others/lock.png) repeat !important;
+}
+
+/* rgba(0,0,0,0.8) */
+#page-engine .tooltip-subitem,
+.attach-subitem,
+.buddy-infos-subitem,
+.buddy-conf-subitem,
+.tools-content-subitem {
+	background: transparent;
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#de000000,endColorstr=#de000000);
+}
+
+/* Fix a fieldset padding bug */
+legend {
+	margin-bottom: 5px !important;
+}
+
+/* Fix an opacity bug */
+a.finish.disabled {
+	filter: alpha(opacity = 20) !important;
+}
diff --git a/jappixmini/jappix/css/images.css b/jappixmini/jappix/css/images.css
new file mode 100644
index 00000000..2dfb756f
--- /dev/null
+++ b/jappixmini/jappix/css/images.css
@@ -0,0 +1,89 @@
+/*
+
+Jappix - An open social platform
+This is the images CSS stylesheet for Jappix
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 16/01/12
+
+*/
+
+.body-images {
+	background-image: url(../img/sprites/background.png);
+	background-repeat: repeat;
+	background-color: #93c5fa;
+}
+
+.install-images {
+	background-image: url(../img/sprites/install.png);
+	background-repeat: no-repeat;
+}
+
+.home-images {
+	background-image: url(../img/sprites/home.png);
+	background-repeat: no-repeat;
+}
+
+.browsers-images {
+	background-image: url(../img/sprites/browsers.png);
+	background-repeat: no-repeat;
+}
+
+.buttons-images {
+	background-image: url(../img/sprites/buttons.png);
+	background-repeat: repeat-x;
+}
+
+.talk-images {
+	background-image: url(../img/sprites/talk.png);
+	background-repeat: no-repeat;
+}
+
+.smileys-images {
+	background-image: url(../img/sprites/smileys.png);
+	background-repeat: no-repeat;
+}
+
+.welcome-images {
+	background-image: url(../img/sprites/welcome.png);
+	background-repeat: no-repeat;
+}
+
+.me-images {
+	background-image: url(../img/sprites/me.png);
+	background-repeat: no-repeat;
+}
+
+.manager-images {
+	background-image: url(../img/sprites/manager.png);
+	background-repeat: no-repeat;
+}
+
+.mobile-images {
+	background-image: url(../img/sprites/mobile.png);
+	background-repeat: no-repeat;
+}
+
+.wait-small {
+	background-image: url(../img/wait/wait-small.gif);
+	background-repeat: no-repeat;
+	height: 16px;
+	width: 16px;
+}
+
+.wait-medium {
+	background-image: url(../img/wait/wait-medium.png);
+	background-repeat: no-repeat;
+	height: 24px;
+	width: 24px;
+}
+
+.wait-big {
+	background-image: url(../img/wait/wait-big.gif);
+	background-repeat: no-repeat;
+	height: 30px;
+	width: 30px;
+}
diff --git a/jappixmini/jappix/css/inbox.css b/jappixmini/jappix/css/inbox.css
new file mode 100644
index 00000000..1ef05886
--- /dev/null
+++ b/jappixmini/jappix/css/inbox.css
@@ -0,0 +1,202 @@
+/*
+
+Jappix - An open social platform
+This is the inbox CSS stylesheet for Jappix
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 28/12/10
+
+*/
+
+#inbox .content {
+	padding: 10px 0 10px 0;
+}
+
+#inbox .content p {
+	margin: 3px 10px;
+	text-align: justify;
+	font-size: 0.9em;
+}
+
+#inbox .inbox-results {
+	height: 310px;
+	width: 620px;
+	margin: -5px 0 0 10px;
+	padding: 6px 0 0 0;
+	overflow: auto;
+}
+
+#inbox .message-unread {
+	background-color: #E9F1FD;
+}
+
+#inbox .one-message {
+	font-size: 0.9em;
+	border-bottom: 1px #b2c7cb solid;
+}
+
+#inbox .message-head {
+	padding: 6px 0 7px 4px;
+	overflow: hidden;
+}
+
+#inbox .message-head:hover {
+	background-color: #e9f1fd;
+	cursor: pointer;
+}
+
+#inbox .message-head:active {
+	background-color: #f1f6fd;
+}
+
+#inbox .one-message.message-reading,
+#inbox .one-message.message-reading .message-head {
+	background-color: #f1f6fd;
+}
+
+#inbox .avatar-container {
+	float: left;
+	width: 40px;
+	height: 40px;
+	margin-right: 7px;
+	text-align: center;
+	background-repeat: no-repeat;
+}
+
+#inbox .avatar {
+	max-width: 40px;
+	max-height: 40px;
+}
+
+#inbox .message-jid,
+#inbox .message-subject {
+	float: left;
+	margin: 0 2px;
+	overflow: hidden;
+}
+
+#inbox .message-jid {
+	width: 165px;
+	font-weight: bold;
+}
+
+#inbox .message-subject {
+	width: 355px;
+}
+
+#inbox .message-truncated {
+	color: #42646b;
+	font-size: 0.8em;
+	margin: 23px 0 0 49px;
+}
+
+#inbox .message-body {
+	padding: 8px 5px 5px 5px;
+}
+
+#inbox .message-body a {
+	text-decoration: underline;
+}
+
+#inbox .message-meta {
+	margin-top: 6px;
+	padding: 3px 4px;
+	border-top: 1px #b2c7cb dotted;
+}
+
+#inbox .message-meta span.date {
+	color: #28474e;
+	font-size: 0.8em;
+	margin: 10px 0 0 4px;
+	float: left;
+}
+
+#inbox .message-meta a {
+	font-size: 0.98em;
+	margin: 5px;
+	float: right;
+	display: block;
+}
+
+#inbox .inbox-noresults {
+	font-weight: bold;
+	display: none;
+}
+
+#inbox .a-show-messages {
+	display: none;
+}
+
+#inbox .inbox-new {
+	display: none;
+	height: 300px;
+	width: 620px;
+	margin: -5px 0 0 10px;
+	padding: 16px 0 0 0;
+}
+
+#inbox .inbox-new-block {
+	border-top: 1px #686868 dotted;
+	padding-top: 9px;
+	min-height: 32px;
+	clear: both;
+}
+
+#inbox .inbox-new-text {
+	float: left;
+	width: 100px;
+}
+
+#inbox .inbox-new-textarea {
+	width: 460px;
+	height: 109px;
+	margin-bottom: 10px;
+	float: left;
+}
+
+#inbox .inbox-new input {
+	float: left;
+}
+
+#inbox .inbox-new-to ul {
+	width: 264px;
+	max-height: 168px;
+	font-size: 0.9em;
+	left: 120px;
+	top: 31px;
+}
+
+#inbox .inbox-new-to-input {
+	width: 260px;
+}
+
+#inbox .inbox-new-subject-input {
+	width: 380px;
+}
+
+#inbox .inbox-new-file a {
+	display: block;
+	float: left;
+}
+
+#inbox .inbox-new-file a.file {
+	font-size: 0.85em;
+	height: 16px;
+	max-width: 320px;
+	margin: 3px 0 15px 013px;
+	overflow: hidden;
+}
+
+#inbox .inbox-new-file a.one-button {
+	font-size: 0.85em;
+	margin: -2px 0 0 25px;
+}
+
+#inbox .inbox-new-send a {
+	font-size: 0.85em;
+	float: right;
+	display: block;
+}
diff --git a/jappixmini/jappix/css/install.css b/jappixmini/jappix/css/install.css
new file mode 100644
index 00000000..9dbde3fc
--- /dev/null
+++ b/jappixmini/jappix/css/install.css
@@ -0,0 +1,285 @@
+/*
+
+Jappix - An open social platform
+This is the install CSS stylesheet for Jappix
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 08/06/11
+
+*/
+
+body {
+	color: white;
+}
+
+#install {
+	background-color: rgb(20,20,20);
+	background-color: rgba(20,20,20,0.85);
+	width: 800px;
+	margin: 35px auto;
+	padding-bottom: 17px;
+	border-radius: 6px;
+	-moz-border-radius: 6px;
+	-webkit-border-radius: 6px;
+	box-shadow: 0 0 35px #5c5c5c;
+	-moz-box-shadow: 0 0 35px #5c5c5c;
+	-webkit-box-shadow: 0 0 35px #5c5c5c;
+}
+
+#install a {
+	color: black;
+	text-decoration: underline;
+}
+
+#install .clear {
+	clear: both;
+}
+
+#install fieldset {
+	border: 1px solid black;
+	margin: 22px 0 15px 0;
+	padding: 7px 2px 5px 2px;
+	border-radius: 3px;
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 3px;
+}
+
+#install legend {
+	font-size: 0.9em;
+	margin: 0 0 0 15px;
+	padding: 0 2px;
+	text-transform: uppercase;
+}
+
+#install label {
+	width: 200px;
+	display: block;
+	float: left;
+	clear: both;
+	margin: 0 0 9px 12px;
+}
+
+#install input {
+	float: left;
+	margin-bottom: 5px;
+}
+
+#install input[type=text],
+#install input[type=url],
+#install input[type=password] {
+	margin-top: -2px;
+	padding: 3px;
+	font-size: 0.95em;
+	min-width: 220px;
+}
+
+#install input.icon {
+	padding-left: 24px;
+	min-width: 199px;
+	max-height: 18px;
+}
+
+#install input.icon#user_name {
+	background-position: 4px -204px;
+}
+
+#install input.icon#user_password {
+	background-position: 4px -226px;
+}
+
+#install input.icon#user_repassword {
+	background-position: 4px -248px;
+}
+
+#install-top {
+	padding: 30px 45px;
+}
+
+#install-top .logo {
+	background-position: 0 0;
+	min-width: 88px;
+	height: 36px;
+	padding: 32px 0 0 66px;
+	font-size: 32px;
+	color: white;
+	text-transform: lowercase;
+	float: left;
+	text-shadow: 0 1px 1px black;
+}
+
+#install-top .step {
+	background-color: rgb(0,0,0);
+	background-color: rgba(0,0,0,0.2);
+	border: 2px solid white;
+	padding: 6px 21px;
+	font-size: 2.7em;
+	text-shadow: 0 1px 1px black;
+	float: right;
+	border-radius: 40px;
+	-moz-border-radius: 40px;
+	-webkit-border-radius: 40px;
+	box-shadow: 0 0 10px #202020;
+	-moz-box-shadow: 0 0 10px #202020;
+	-webkit-box-shadow: 0 0 10px #202020;
+}
+
+#install-top .step span {
+	font-size: 0.6em;
+}
+
+#install-content {
+	background: #e4eef9;
+	background: -moz-linear-gradient(top, #e4eef9, #d0e5fa);
+	background: -webkit-gradient(linear, left top, left bottom, from(#e4eef9), to(#d0e5fa));
+	color: black;
+	font-size: 0.9em;
+	margin: 0 10px;
+	padding: 20px 24px;
+	min-height: 260px;
+	clear: both;
+	right: 10px;
+	border-radius: 3px;
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 3px;
+	box-shadow: 0 0 20px #202020;
+	-moz-box-shadow: 0 0 20px #202020;
+	-webkit-box-shadow: 0 0 20px #202020;
+}
+
+#install-content h3 {
+	padding-left: 24px;
+	margin-bottom: 15px;
+}
+
+#install-content h3.start {
+	background-position: 0 -73px;
+}
+
+#install-content h3.storage {
+	background-position: 0 -95px;
+}
+
+#install-content h3.account {
+	background-position: 0 -117px;
+}
+
+#install-content h3.main {
+	background-position: 0 -139px;
+}
+
+#install-content h3.hosts {
+	background-position: 0 -161px;
+}
+
+#install-content h3.services {
+	background-position: 0 -183px;
+}
+
+#install-content p {
+	margin-bottom: 10px;
+}
+
+#install-content .info {
+	color: black;
+	border-width: 1px;
+	border-style: dashed;
+	padding: 6px 8px;
+	display: block;
+	text-decoration: none;
+}
+
+#install-content .info.smallspace {
+	margin: 14px 0 10px 0;
+}
+
+#install-content .info.bigspace {
+	margin: 35px 0 20px 0;
+}
+
+#install-content .info.first {
+	margin-top: 28px;
+}
+
+#install-content .info.last {
+	margin-bottom: 28px;
+}
+
+#install-content .info.neutral {
+	background-color: #f0f19d;
+	border-color: #b3ad4f;
+}
+
+#install-content a.info.neutral:hover,
+#install-content a.info.neutral:focus {
+	background-color: #eced96;
+}
+
+#install-content a.info.neutral:active {
+	background-color: #e9ea93;
+}
+
+#install-content .info.success {
+	background-color: #a8dca9;
+	border-color: #5e9f5f;
+}
+
+#install-content a.info.success:hover,
+#install-content a.info.success:focus {
+	background-color: #a0d5a1;
+}
+
+#install-content a.info.success:active {
+	background-color: #9ad09b;
+}
+
+#install-content .info.fail {
+	background-color: #f19d9d;
+	border-color: #b34f4f;
+}
+
+#install-content ol {
+	margin: 20px 30px;
+}
+
+#install-content ol li {
+	margin-bottom: 1px;
+}
+
+#install-buttons {
+	margin-top: 22px;
+}
+
+#install-buttons input {
+	border: 1px solid white;
+	background-color: rgb(255,255,255);
+	background-color: rgba(255,255,255,0.1);
+	color: white;
+	padding: 4px 8px;
+	margin-right: 20px;
+	text-shadow: 0 1px 1px black;
+	float: right;
+	border-radius: 3px;
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 3px;
+	box-shadow: 0 0 5px #202020;
+	-moz-box-shadow: 0 0 5px #202020;
+	-webkit-box-shadow: 0 0 5px #202020;
+}
+
+#install-buttons input:hover,
+#install-buttons input:focus {
+	cursor: pointer;
+	background-color: rgb(255,255,255);
+	background-color: rgba(255,255,255,0.2);
+	box-shadow: 0 0 15px #202020;
+	-moz-box-shadow: 0 0 15px #202020;
+	-webkit-box-shadow: 0 0 15px #202020;
+}
+
+#install-buttons input:active {
+	background-color: rgb(255,255,255);
+	background-color: rgba(255,255,255,0.3);
+}
diff --git a/jappixmini/jappix/css/integratebox.css b/jappixmini/jappix/css/integratebox.css
new file mode 100644
index 00000000..b5cb9c9f
--- /dev/null
+++ b/jappixmini/jappix/css/integratebox.css
@@ -0,0 +1,34 @@
+/*
+
+Jappix - An open social platform
+This is the integratebox CSS stylesheet for Jappix
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 06/11/10
+
+*/
+
+#integratebox .top {
+	height: 40px;
+}
+
+#integratebox .content {
+	text-align: center;
+	height: 385px;
+}
+
+#integratebox .one-media img {
+	max-height: 385px;
+	max-width: 640px;
+}
+
+#integratebox .one-media a img {
+	border: none;
+}
+
+#integratebox .one-media audio {
+	margin-top: 170px;
+}
diff --git a/jappixmini/jappix/css/jquery.datepicker.css b/jappixmini/jappix/css/jquery.datepicker.css
new file mode 100644
index 00000000..264cd544
--- /dev/null
+++ b/jappixmini/jappix/css/jquery.datepicker.css
@@ -0,0 +1,148 @@
+/*
+
+Jappix - An open social platform
+This is the datepicker CSS stylesheet
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 28/12/10
+
+*/
+
+div.datepicker {
+	position: relative;
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 12px;
+	width: 196px;
+	height: 147px;
+	position: absolute;
+	cursor: default;
+	top: 0;
+	left: 0;
+	display: none;
+}
+
+.datepickerHidden {
+	display: none;
+}
+
+div.datepicker table {
+	border-collapse:collapse;
+}
+
+div.datepicker a {
+	text-decoration: none;
+	cursor: default;
+	outline: none;
+}
+
+div.datepicker table td {
+	text-align: right;
+	padding: 0;
+	margin: 0;
+}
+
+div.datepicker th {
+	text-align: center;
+	color: #47646a;
+	font-weight: normal;
+}
+
+div.datepicker tbody th {
+	text-align: left;
+}
+
+div.datepicker tbody a {
+	display: block;
+}
+
+.datepickerDays a {
+	width: 20px;
+	line-height: 16px;
+	height: 16px;
+	padding-right: 2px;
+}
+
+.datepickerYears a,
+.datepickerMonths a {
+	width: 44px;
+	line-height: 36px;
+	height: 36px;
+	text-align: center;
+}
+
+td.datepickerNotInMonth {
+	background: #c7d1d4;
+}
+
+tbody.datepickerDays td.datepickerSelected {
+	background: #b0bdc1;
+}
+
+tbody.datepickerYears td.datepickerSelected,
+tbody.datepickerMonths td.datepickerSelected {
+	background: #9daaae;
+}
+
+div.datepicker a:hover,
+div.datepicker a:focus {
+	color: #3d7682;
+}
+
+div.datepicker tbody th {
+	text-align: left;
+}
+
+.datepickerSpace div {
+	width: 20px;
+}
+
+.datepickerGoNext a,
+.datepickerGoPrev a,
+.datepickerMonth a {
+	text-align: center;
+	height: 20px;
+	line-height: 20px;
+}
+
+.datepickerGoNext a {
+	float: right;
+	width: 20px;
+}
+
+.datepickerGoPrev a {
+	float: left;
+	width: 20px;
+}
+
+table.datepickerViewDays tbody.datepickerMonths,
+table.datepickerViewDays tbody.datepickerYears {
+	display: none;
+}
+
+table.datepickerViewMonths tbody.datepickerDays,
+table.datepickerViewMonths tbody.datepickerYears,
+table.datepickerViewMonths tr.datepickerDoW {
+	display: none;
+}
+
+table.datepickerViewYears tbody.datepickerDays,
+table.datepickerViewYears tbody.datepickerMonths,
+table.datepickerViewYears tr.datepickerDoW {
+	display: none;
+}
+
+td.datepickerDisabled a,
+td.datepickerDisabled.datepickerNotInMonth a {
+	color: #333;
+}
+
+td.datepickerSpecial a {
+	background: #700;
+}
+
+td.datepickerSpecial.datepickerSelected a {
+	background: #a00;
+}
diff --git a/jappixmini/jappix/css/main.css b/jappixmini/jappix/css/main.css
new file mode 100644
index 00000000..68254814
--- /dev/null
+++ b/jappixmini/jappix/css/main.css
@@ -0,0 +1,131 @@
+/*
+
+Jappix - An open social platform
+This is the main CSS stylesheet for Jappix
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 05/10/11
+
+*/
+
+* {
+	margin: 0;
+	padding: 0;
+}
+
+body {
+	font: normal 14.4px Helvetica, Verdana, sans-serif;
+	text-shadow: 0 0 5px white;
+}
+
+h1 {
+	margin-bottom: 15px;
+}
+
+a {
+	text-decoration: none;
+	color: black;
+	outline-style: none;
+}
+
+a:hover,
+a:focus {
+	cursor: pointer;
+	text-decoration: underline;
+}
+
+legend {
+	color: black;
+}
+
+input,
+textarea {
+	background-color: white;
+	border: 1px solid #636363;
+	font-size: 0.95em;
+	padding: 2px;
+	border-radius: 2px;
+	-moz-border-radius: 2px;
+	-webkit-border-radius: 2px;
+	box-shadow: inset 0 3px 10px #dcdcdc;
+	-moz-box-shadow: inset 0 3px 10px #dcdcdc;
+	-webkit-box-shadow: inset 0 3px 10px #dcdcdc;
+}
+
+textarea {
+	font-size: 1.1em;
+}
+
+input:focus,
+input[type=submit]:hover,
+input[type=reset]:hover,
+textarea:focus {
+	border: 1px solid #e1a014;
+	box-shadow: inset 0 3px 10px #edd9bc;
+	-moz-box-shadow: inset 0 3px 10px #edd9bc;
+	-webkit-box-shadow: inset 0 3px 10px #edd9bc;
+}
+
+input[type=submit],
+input[type=reset] {
+	cursor: pointer;
+}
+
+input[type=submit]:active,
+input[type=reset]:active {
+	box-shadow: inset 0 3px 15px #e1a753;
+	-moz-box-shadow: inset 0 3px 15px #e1a753;
+	-webkit-box-shadow: inset 0 3px 15px #e1a753;
+}
+
+input[disabled],
+textarea[disabled] {
+	background-color: #f3f3f3;
+	border: 1px solid #989898;
+}
+
+input:placeholder {
+	color: #67787c !important;
+}
+
+input:-moz-placeholder {
+	color: #67787c !important;
+}
+
+input::-webkit-input-placeholder {
+	color: #67787c !important;
+}
+
+input.placeholder {
+	color: #67787c !important;
+}
+
+input[type=checkbox] {
+	margin-top: 2px;
+}
+
+input[type=checkbox],
+input[type=radio] {
+	background: transparent none !important;
+	border: 0 none !important;
+}
+
+.please-complete,
+.please-complete:hover,
+.please-complete:focus {
+	border: 1px #ac2525 solid !important;
+	box-shadow: inset 0 3px 10px #f39c9c !important;
+	-moz-box-shadow: inset 0 3px 10px #f39c9c !important;
+	-webkit-box-shadow: inset 0 3px 10px #f39c9c !important;
+}
+
+.hidden {
+	display: none !important;
+}
+
+.clear {
+	clear: both !important;
+}
diff --git a/jappixmini/jappix/css/manager.css b/jappixmini/jappix/css/manager.css
new file mode 100644
index 00000000..c1dd358c
--- /dev/null
+++ b/jappixmini/jappix/css/manager.css
@@ -0,0 +1,543 @@
+/*
+
+Jappix - An open social platform
+This is the manager CSS stylesheet for Jappix
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 31/08/11
+
+*/
+
+#manager {
+	background-color: rgb(20,20,20);
+	background-color: rgba(20,20,20,0.85);
+	width: 945px;
+	margin: 0 auto 25px;
+	padding-bottom: 17px;
+	border-bottom-left-radius: 4px;
+	border-bottom-right-radius: 4px;
+	-moz-border-radius-bottomleft: 4px;
+	-moz-border-radius-bottomright: 4px;
+	-webkit-border-bottom-left-radius: 4px;
+	-webkit-border-bottom-right-radius: 4px;
+	box-shadow: 0 0 35px #5c5c5c;
+	-moz-box-shadow: 0 0 35px #5c5c5c;
+	-webkit-box-shadow: 0 0 35px #5c5c5c;
+}
+
+#manager a {
+	color: black;
+	text-decoration: underline;
+}
+
+#manager .clear {
+	clear: both;
+}
+
+#manager fieldset {
+	border: 1px solid black;
+	margin: 22px 0 15px 0;
+	padding: 7px 2px 5px 2px;
+	border-radius: 3px;
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 3px;
+}
+
+#manager legend {
+	font-size: 0.9em;
+	margin: 0 0 0 15px;
+	padding: 0 2px;
+	text-transform: uppercase;
+}
+
+#manager label {
+	width: 200px;
+	display: block;
+	float: left;
+	clear: both;
+	margin: 0 0 9px 12px;
+}
+
+#manager label.master {
+	text-decoration: underline;
+}
+
+#manager input,
+#manager select {
+	float: left;
+	margin-bottom: 5px;
+}
+
+#manager input[type=radio] {
+	margin: 2px 8px 5px 0;
+}
+
+#manager input[type=text],
+#manager input[type=url],
+#manager input[type=password],
+#manager select {
+	margin-top: -2px;
+	font-size: 0.95em;
+}
+
+#manager input[type=text],
+#manager input[type=url],
+#manager input[type=password] {
+	padding: 3px;
+	min-width: 220px;
+}
+
+#manager input.icon {
+	padding-left: 24px;
+	min-width: 199px;
+	max-height: 18px;
+}
+
+#manager input.icon#admin_name {
+	background-position: 4px -510px;
+}
+
+#manager input.icon#admin_password,
+#manager input.icon#user_repassword {
+	background-position: 4px -532px;
+}
+
+#manager input.icon#user_name,
+#manager input.icon#music_artist {
+	background-position: 4px -554px;
+}
+
+#manager input.icon#user_password {
+	background-position: 4px -576px;
+}
+
+#manager input.icon#music_title {
+	background-position: 4px -598px;
+}
+
+#manager input.icon#music_album {
+	background-position: 4px -620px;
+}
+
+#manager input.icon#background_image_color,
+#manager input.icon#background_color_color {
+	background-position: 4px -641px;
+}
+
+#manager select {
+	min-width: 160px;
+	max-width: 230px;
+}
+
+#manager-top {
+	padding: 25px 45px 30px;
+}
+
+#manager-top .logo {
+	background-position: 0 0;
+	min-width: 89px;
+	height: 40px;
+	padding: 28px 0 0 65px;
+	font-size: 32px;
+	color: white;
+	text-transform: lowercase;
+	float: left;
+	text-shadow: 0 1px 1px black;
+}
+
+#manager-top .meta {
+	background-color: #e0eaec;
+	font-size: 0.9em;
+	padding: 12px 7px 12px 14px;
+	float: right;
+	border-radius: 3px;
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 3px;
+	box-shadow: 0 0 10px #202020;
+	-moz-box-shadow: 0 0 10px #202020;
+	-webkit-box-shadow: 0 0 10px #202020;
+}
+
+#manager-top .meta span {
+	margin-right: 10px;
+	color: black;
+}
+
+#manager-top .meta a {
+	background-color: #f1f6fd;
+	border: 1px solid #b9cbcf;
+	color: #224249;
+	padding: 4px 8px 4px 21px;
+	margin-left: 2px;
+	text-decoration: none;
+	border-radius: 2px;
+	-moz-border-radius: 2px;
+	-webkit-border-radius: 2px;
+}
+
+#manager-top .meta a:hover,
+#manager-top .meta a:focus {
+	border: 1px solid #95b1b7;
+}
+
+#manager-top .meta a:active {
+	border: 1px solid #77989f;
+}
+
+#manager-top .meta a.logout {
+	background-position: 3px -69px;
+}
+
+#manager-top .meta a.close {
+	background-position: 3px -90px;
+}
+
+#manager-tabs {
+	margin-left: 12px;
+}
+
+#manager-tabs a {
+	background-color: #d9e7ea;
+	color: #204249;
+	width: 107px;
+	height: 17px;
+	padding: 4px 4px 4px 16px;
+	margin-left: 4px;
+	font-size: 0.94em;
+	text-decoration: none;
+	overflow: hidden;
+	float: left;
+	border-top-right-radius: 3px;
+	border-top-left-radius: 3px;
+	-moz-border-radius-topright: 3px;
+	-moz-border-radius-topleft: 3px;
+	-webkit-border-top-right-radius: 3px;
+	-webkit-border-top-left-radius: 3px;
+}
+
+#manager-tabs a:hover,
+#manager-tabs a:focus {
+	background-color: #cedee1;
+	text-decoration: none;
+}
+
+#manager-tabs a:active {
+	background-color: #c3d3d7;
+	text-decoration: none;
+}
+
+#manager-tabs a.tab-active {
+	background-color: #e4eef9 !important;
+}
+
+#manager-content {
+	background: #e4eef9;
+	background: -moz-linear-gradient(top, #e4eef9, #d0e5fa);
+	background: -webkit-gradient(linear, left top, left bottom, from(#e4eef9), to(#d0e5fa));
+	color: black;
+	font-size: 0.9em;
+	margin: 0 10px;
+	padding: 20px 24px;
+	min-height: 260px;
+	clear: both;
+	right: 10px;
+	border-radius: 3px;
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 3px;
+	box-shadow: 0 0 20px #202020;
+	-moz-box-shadow: 0 0 20px #202020;
+	-webkit-box-shadow: 0 0 20px #202020;
+}
+
+#manager-content h3 {
+	padding-left: 24px;
+	margin-bottom: 15px;
+}
+
+#manager-content h3.login {
+	background-position: 0 -466px;
+}
+
+#manager-content h3.statistics {
+	background-position: 0 -203px;
+}
+
+#manager-content h3.configuration {
+	background-position: 0 -224px;
+}
+
+#manager-content h3.hosts {
+	background-position: 0 -246px;
+}
+
+#manager-content h3.storage {
+	background-position: 0 -268px;
+}
+
+#manager-content h3.design {
+	background-position: 0 -290px;
+}
+
+#manager-content h3.users {
+	background-position: 0 -312px;
+}
+
+#manager-content h3.updates {
+	background-position: 0 -334px;
+}
+
+#manager-content h4 {
+	border-top: 1px dotted black;
+	padding-top: 5px;
+	margin: 20px 0 14px;
+	clear: both;
+}
+
+#manager-content ul,
+#manager-content ol {
+	width: 380px;
+	margin: 8px 0 20px 18px;
+}
+
+#manager-content li {
+	margin-bottom: 3px;
+}
+
+#manager-content li.total {
+	margin-bottom: 14px;
+}
+
+#manager-content li b {
+	width: 190px;
+	float: left;
+}
+
+#manager-content li span {
+	margin-left: 10px;
+	float: left;
+}
+
+#manager-content ul.stats,
+#manager-content ol.stats {
+	float: left;
+}
+
+#manager-content object.stats {
+	border: 1px dotted #bed4d9;
+	width: 450px;
+	height: 270px;
+	margin-bottom: 20px;
+	float: right;
+}
+
+#manager-content p,
+#manager-content div {
+	margin-bottom: 10px;
+}
+
+#manager-content .info {
+	color: black;
+	border-width: 1px;
+	border-style: dashed;
+	padding: 6px 8px;
+	display: block;
+	text-decoration: none;
+}
+
+#manager-content .info.bottomspace {
+	margin-bottom: 16px;
+}
+
+#manager-content .info.smallspace {
+	margin: 14px 0 10px 0;
+}
+
+#manager-content .info.bigspace {
+	margin: 35px 0 20px 0;
+}
+
+#manager-content .info.neutral {
+	background-color: #f0f19d;
+	border-color: #b3ad4f;
+}
+
+#manager-content a.info.neutral:hover,
+#manager-content a.info.neutral:focus {
+	background-color: #eced96;
+}
+
+#manager-content a.info.neutral:active {
+	background-color: #e9ea93;
+}
+
+#manager-content .info.success {
+	background-color: #a8dca9;
+	border-color: #5e9f5f;
+}
+
+#manager-content a.info.success:hover,
+#manager-content a.info.success:focus {
+	background-color: #a0d5a1;
+}
+
+#manager-content a.info.success:active {
+	background-color: #9ad09b;
+}
+
+#manager-content .info.fail {
+	background-color: #f19d9d;
+	border-color: #b34f4f;
+}
+
+#manager-content a.info.fail:hover,
+#manager-content a.info.fail:focus {
+	background-color: #ea9595;
+}
+
+#manager-content a.info.fail:active {
+	background-color: #e59090;
+}
+
+#manager-content .browse {
+	margin: 2px 0 6px;
+	max-height: 243px;
+	overflow: auto;
+}
+
+#manager-content .browse .one-browse {
+	padding: 5px 10px 5px 34px;
+	height: 17px;
+}
+
+#manager-content .browse .user {
+	background-position: 9px -111px;
+}
+
+#manager-content .browse .other {
+	background-position: 9px -133px;
+}
+
+#manager-content .browse .folder {
+	background-position: 9px -178px;
+}
+
+#manager-content .browse .audio {
+	background-position: 9px -154px;
+}
+
+#manager-content .browse .alert {
+	background-position: 9px -353px;
+}
+
+#manager-content .browse .image {
+	background-position: 9px -374px;
+}
+
+#manager-content .browse .video {
+	background-position: 9px -397px;
+}
+
+#manager-content .browse .document {
+	background-position: 9px -418px;
+}
+
+#manager-content .browse .package {
+	background-position: 9px -441px;
+}
+
+#manager-content .browse .previous {
+	background-position: 9px -485px;
+	margin-bottom: 4px;
+}
+
+#manager-content .browse div {
+	margin: 0;
+}
+
+#manager-content .browse input {
+	float: right;
+	margin: 1px 0;
+}
+
+#manager-content .browse .odd {
+	background-color: #e9f1fd;
+}
+
+#manager-content .browse .even {
+	background-color: #f1f6fd;
+}
+
+#manager-content .sub {
+	border-left: 1px solid black;
+	margin: 5px 0 20px 22px;
+	padding-left: 12px;
+	clear: both;
+}
+
+#manager span.logo_links a {
+	width: 16px;
+	height: 16px;
+	margin-right: 6px;
+	float: left;
+}
+
+#manager span.logo_links a.remove {
+	background-position: 0 -688px;
+}
+
+#manager span.logo_links a.view {
+	background-position: 0 -666px;
+}
+
+#manager-content .clear {
+	margin: 0;
+}
+
+#manager-content textarea.notice-text {
+	height: 70px;
+	width: 600px;
+	margin-left: 4px;
+	padding: 5px;
+	font-size: 1.2em;
+}
+
+#manager-buttons {
+	margin-top: 22px;
+}
+
+#manager-buttons input {
+	border: 1px solid white;
+	background-color: rgb(255,255,255);
+	background-color: rgba(255,255,255,0.1);
+	color: white;
+	padding: 4px 8px;
+	margin-left: -12px;
+	margin-right: 20px;
+	font-size: 1em;
+	text-shadow: 0 1px 1px black;
+	float: right;
+	border-radius: 3px;
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 3px;
+	box-shadow: 0 0 5px #202020;
+	-moz-box-shadow: 0 0 5px #202020;
+	-webkit-box-shadow: 0 0 5px #202020;
+}
+
+#manager-buttons input:hover,
+#manager-buttons input:focus {
+	cursor: pointer;
+	background-color: rgb(255,255,255);
+	background-color: rgba(255,255,255,0.2);
+	box-shadow: 0 0 15px #202020;
+	-moz-box-shadow: 0 0 15px #202020;
+	-webkit-box-shadow: 0 0 15px #202020;
+}
+
+#manager-buttons input:active {
+	background-color: rgb(255,255,255);
+	background-color: rgba(255,255,255,0.3);
+}
diff --git a/jappixmini/jappix/css/me.css b/jappixmini/jappix/css/me.css
new file mode 100644
index 00000000..2ff74fbd
--- /dev/null
+++ b/jappixmini/jappix/css/me.css
@@ -0,0 +1,49 @@
+/*
+
+Jappix - An open social platform
+This is the Jappix Me tool CSS stylesheet for Jappix
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 16/01/12
+
+*/
+
+#me .content {
+	padding: 10px 0;
+}
+
+#me .logo {
+	background-position: 0 0;
+	width: 300px;
+	height: 61px;
+	margin: 20px auto 0 auto;
+	display: block;
+}
+
+#me .infos {
+	margin-top: 30px;
+}
+
+#me .infos p {
+	margin-top: 8px;
+}
+
+#me .infos p.infos-title {
+	margin-top: 0;
+}
+
+#me .infos a {
+	text-decoration: underline;
+}
+
+#me a.go {
+	text-align: center;
+	font-weight: bold;
+	width: 300px;
+	margin: 30px auto 0 auto;
+	padding: 8px 12px;
+	display: block;
+}
\ No newline at end of file
diff --git a/jappixmini/jappix/css/mini-ie.css b/jappixmini/jappix/css/mini-ie.css
new file mode 100644
index 00000000..d8f4b908
--- /dev/null
+++ b/jappixmini/jappix/css/mini-ie.css
@@ -0,0 +1,73 @@
+/*
+
+Jappix - An open social platform
+This is the Jappix Mini legacy IE CSS stylesheet
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 20/03/11
+
+*/
+
+#jappix_mini {
+	width: expression(document.documentElement.clientWidth - 150 + 'px') !important;
+	position: absolute !important;
+	bottom: auto !important;
+	right: auto !important;
+	top: expression(((document.documentElement.clientHeight - this.offsetHeight) + (ignoreMiniTop = document.documentElement.scrollTop ? document.documentElement.scrollTop : document.body.scrollTop)) + 'px') !important;
+	left: expression((150 + this.offsetWidth - (document.documentElement.clientWidth ? document.documentElement.clientWidth : document.body.clientWidth) + (ignoreMiniLeft = document.documentElement.scrollLeft ? document.documentElement.scrollLeft : document.body.scrollLeft)) + 'px') !important;
+}
+
+#jappix_mini .jm_images {
+	background-image: url(../img/sprites/mini.gif) !important;
+}
+
+#jappix_mini .jm_images_animate {
+	background-image: url(../img/sprites/animate.gif) !important;
+}
+
+#jappix_mini a.jm_button {
+	width: 1px !important;
+}
+
+#jappix_mini div.jm_roster {
+	right: -1px !important;
+	bottom: 23px !important;
+}
+
+#jappix_mini div.jm_roster div.jm_buddies {
+	height: expression(this.scrollHeight > (document.documentElement.clientHeight - 70) ? (document.documentElement.clientHeight - 70) + 'px' : 'auto') !important;
+}
+
+#jappix_mini a.jm_pane {
+	height: 12px !important;
+	overflow-y: hidden !important;
+}
+
+#jappix_mini a.jm_button.jm_clicked {
+	background-image: none !important;
+}
+
+#jappix_mini div.jm_conversations a.jm_clicked {
+	border-right: none !important;
+	padding: 7px 6px 6px 6px !important;
+}
+
+#jappix_mini div.jm_chat-content {
+	bottom: 23px !important;
+	right: -2px !important;
+}
+
+#jappix_popup {
+	height: expression(document.documentElement.clientHeight + 'px') !important;
+	width: expression(document.documentElement.clientWidth + 'px') !important;
+	position: absolute !important;
+	top: expression(((ignorePopupTop = document.documentElement.scrollTop ? document.documentElement.scrollTop : document.body.scrollTop)) + 'px') !important;
+	left: expression(((ignorePopupLeft = document.documentElement.scrollLeft ? document.documentElement.scrollLeft : document.body.scrollLeft)) + 'px') !important;
+}
+
+#jappix_popup div.jm_prompt {
+	position: absolute !important;
+}
diff --git a/jappixmini/jappix/css/mini.css b/jappixmini/jappix/css/mini.css
new file mode 100644
index 00000000..6d77540d
--- /dev/null
+++ b/jappixmini/jappix/css/mini.css
@@ -0,0 +1,540 @@
+/*
+
+Jappix - An open social platform
+This is the Jappix Mini CSS stylesheet
+
+-------------------------------------------------
+
+License: AGPL
+Authors: Vanaryon, Julien
+Last revision: 16/01/12
+
+*/
+
+#jappix_mini,
+#jappix_popup {
+	font: normal 11px helvetica, "Lucida Grande", "Lucida Sans", "Lucida Sans Unicode", Arial, sans-serif;
+}
+
+#jappix_mini {
+	margin-left: 130px;
+	position: fixed;
+	bottom: 0;
+	right: 20px;
+	z-index: 999;
+}
+
+#jappix_mini *,
+#jappix_popup * {
+	border: none;
+	color: black;
+	width: auto;
+	height: auto;
+	margin: 0;
+	padding: 0;
+	overflow: visible;
+	font-size: 11px;
+	text-align: left;
+	text-transform: none;
+	text-shadow: none;
+	opacity: 1.0;
+	border-radius: 0;
+	-moz-border-radius: 0;
+	-webkit-border-radius: 0;
+	box-shadow: none;
+	-moz-box-shadow: none;
+	-webkit-box-shadow: none;
+}
+
+#jappix_mini .jm_images {
+	background-image: url(../img/sprites/mini.png);
+	background-repeat: no-repeat;
+}
+
+#jappix_mini .jm_images_animate {
+	background-image: url(../img/sprites/animate.png);
+	background-repeat: no-repeat;
+}
+
+#jappix_mini a {
+	text-decoration: none;
+	cursor: pointer;
+}
+
+#jappix_mini a:hover {
+	cursor: pointer;
+}
+
+#jappix_mini div.jm_position {
+	float: right;
+}
+
+#jappix_mini a.jm_pane {
+	background-color: #f4f4f4;
+	background-position: 0 -100px;
+	background-repeat: repeat-x;
+	border-color: #999999;
+	border-style: solid;
+	border-width: 1px 1px 0 1px;
+	font-weight: bold;
+	outline-style: none;
+	display: block;
+	padding: 6px;
+	height: 13px;
+}
+
+#jappix_mini a.jm_pane:hover {
+	background: white;
+}
+
+#jappix_mini a.jm_pane:hover,
+#jappix_mini a.jm_pane:focus {
+	border-color: #666666;
+}
+
+#jappix_mini div.jm_starter,
+#jappix_mini div.jm_conversations,
+#jappix_mini div.jm_conversation {
+	float: left;
+	position: relative;
+}
+
+#jappix_mini div.jm_conversation {
+	width: 153px;
+}
+
+#jappix_mini a.jm_chat-tab {
+	border-width: 1px 0 0 1px;
+	width: 140px;
+	float: right;
+	overflow: hidden;
+}
+
+#jappix_mini a.jm_chat-tab.jm_clicked {
+	background: white;
+	position: relative;
+	border-top: none;
+	border-left: 1px solid #999999;
+	padding-top: 7px;
+}
+
+#jappix_mini a.jm_chat-tab span.jm_notify {
+	position: absolute;
+	top: 6px;
+	right: 9px;
+}
+
+#jappix_mini a.jm_chat-tab span.jm_notify span {
+	float: left;
+}
+
+#jappix_mini a.jm_chat-tab span.jm_notify span.jm_notify_left {
+	background-position: 0 -360px;
+}
+
+#jappix_mini a.jm_chat-tab span.jm_notify span.jm_notify_right {
+	background-position: -7px -360px;
+}
+
+#jappix_mini a.jm_chat-tab span.jm_notify span.jm_notify_left,
+#jappix_mini a.jm_chat-tab span.jm_notify span.jm_notify_right {
+	height: 16px;
+	width: 7px;
+}
+
+#jappix_mini a.jm_chat-tab span.jm_notify span.jm_notify_middle {
+	background-color: #c60505;
+	color: white;
+	font-size: 0.85em;
+	height: 14px;
+	padding-top: 2px;
+}
+
+#jappix_mini div.jm_conversation.jm_type_groupchat span.jm_name {
+	margin-left: 4px;
+}
+
+#jappix_mini div.jm_chat-content {
+	background-color: white;
+	border: 1px solid #999999;
+	height: 300px;
+	width: 260px;
+	position: absolute;
+	right: -1px;
+	bottom: 25px;
+	display: none;
+}
+
+#jappix_mini div.jm_actions {
+	background-color: #565d5e;
+	border-bottom: 1px solid #3a3a3a;
+	height: 14px;
+	padding: 4px 6px;
+	font-weight: bold;
+	overflow: hidden;
+}
+
+#jappix_mini div.jm_actions span.jm_nick {
+	color: white;
+	height: 16px;
+	width: 225px;
+	overflow: hidden;
+	float: left;
+}
+
+#jappix_mini div.jm_actions a.jm_one-action {
+	background-color: #727879;
+	margin: 0 -2px 0 5px;
+	height: 15px;
+	width: 15px;
+	outline-style: none;
+	float: right;
+}
+
+#jappix_mini div.jm_actions a.jm_one-action:hover,
+#jappix_mini div.jm_actions a.jm_one-action:focus {
+	background-color: #7f8788;
+}
+
+#jappix_mini div.jm_actions a.jm_one-action:active {
+	background-color: #8c9293;
+}
+
+#jappix_mini div.jm_actions a.jm_logo {
+	background-position: 7px 2px;
+	width: 81px;
+	height: 22px;
+	margin: -4px 0 0 -2px;
+	outline-style: none;
+	float: left;
+}
+
+#jappix_mini div.jm_actions a.jm_logo:hover,
+#jappix_mini div.jm_actions a.jm_logo:focus {
+	background-color: #636a6b;
+}
+
+#jappix_mini div.jm_actions a.jm_logo:active {
+	background-color: #707677;
+}
+
+#jappix_mini div.jm_actions a.jm_close {
+	background-position: 1px -341px;
+}
+
+#jappix_mini div.jm_actions a.jm_join {
+	background-position: 0 -327px;
+}
+
+#jappix_mini div.jm_received-messages {
+	background-color: white;
+	padding: 5px 0 4px;
+	height: 242px;
+	overflow: auto;
+}
+
+#jappix_mini div.jm_received-messages p {
+	margin: 3px 0;
+	word-wrap: break-word;
+}
+
+#jappix_mini div.jm_received-messages p,
+#jappix_mini div.jm_received-messages a {
+	color: black !important;
+}
+
+#jappix_mini div.jm_received-messages div.jm_group {
+	margin: 2px 6px 9px 6px;
+	padding-bottom: 8px;
+	border-bottom: 1px solid #eaeaea;
+}
+
+#jappix_mini div.jm_received-messages div.jm_system-message p,
+#jappix_mini div.jm_received-messages div.jm_system-message a {
+	color: #053805 !important;
+	font-style: italic !important;
+}
+
+#jappix_mini div.jm_received-messages p a {
+	text-decoration: underline;
+}
+
+#jappix_mini div.jm_received-messages b {
+	margin-bottom: 3px;
+	display: block;
+}
+
+#jappix_mini div.jm_received-messages b.jm_me {
+	color: #123a5c;
+}
+
+#jappix_mini div.jm_received-messages b.jm_him {
+	color: #801e1e;
+}
+
+#jappix_mini div.jm_received-messages span.jm_date {
+	font-size: 0.8em;
+	float: right;
+	display: none;
+}
+
+#jappix_mini div.jm_received-messages div.jm_group:hover span.jm_date {
+	display: block;
+}
+
+#jappix_mini input.jm_send-messages {
+	background-color: white;
+	border-color: #999999;
+	border-style: solid;
+	border-width: 1px 0 0 0;
+	padding: 5px;
+	width: 250px;
+	min-height: 14px;
+}
+
+#jappix_mini div.jm_disabled div.jm_chat-content,
+#jappix_mini div.jm_disabled input.jm_send-messages,
+#jappix_mini div.jm_disabled a.jm_pane {
+	background: #f3f3f3 !important;
+}
+
+#jappix_mini div.jm_disabled input.jm_send-messages {
+	color: #9d9d9d;
+}
+
+#jappix_mini div.jm_roster {
+	background-color: white;
+	border: 1px solid #999999;
+	width: 160px;
+	position: absolute;
+	right: 0;
+	bottom: 25px;
+	display: none;
+}
+
+#jappix_mini div.jm_roster div.jm_buddies {
+	width: 100%;
+	max-height: 300px;
+	padding: 5px 0;
+	overflow: auto;
+}
+
+#jappix_mini div.jm_roster div.jm_grouped {
+	margin: 2px 0;
+}
+
+#jappix_mini div.jm_roster div.jm_grouped div.jm_name {
+	margin-bottom: 2px;
+	padding: 4px 8px 0;
+	font-weight: bold;
+}
+
+#jappix_mini a.jm_friend {
+	border-color: white;
+	border-style: solid;
+	border-width: 1px 0;
+	outline-style: none;
+	padding: 6px;
+	display: block;
+}
+
+#jappix_mini a.jm_friend.jm_offline {
+	display: none;
+}
+
+#jappix_mini a.jm_friend:hover,
+#jappix_mini a.jm_friend:focus {
+	background-color: #888888;
+	border-color: #494949;
+	color: white;
+}
+
+#jappix_mini a.jm_friend:hover span.jm_presence,
+#jappix_mini a.jm_friend:focus span.jm_presence {
+	background-position: 0 -84px;
+}
+
+#jappix_mini a.jm_button {
+	padding: 6px 10px;
+	position: relative;
+	z-index: 1;
+}
+
+#jappix_mini a.jm_button.jm_clicked {
+	background: white;
+	border-top: none;
+	border-left: 1px solid #999999;
+	border-right: 1px solid #999999;
+	padding: 7px 10px 6px 10px;
+}
+
+#jappix_mini span.jm_animate {
+	background-position: 0 0;
+	width: 111px;
+	height: 102px;
+	position: absolute;
+	top: -100px;
+	left: -74px;
+	z-index: 1;
+	display: block;
+}
+
+#jappix_mini span.jm_counter {
+	background-position: 0 -288px;
+	color: #333333;
+	height: 16px;
+	padding-left: 25px;
+	display: block;
+}
+
+#jappix_mini span.jm_counter.jm_error {
+	background-position: 0 -305px;
+}
+
+#jappix_mini span.jm_presence {
+	display: block;
+	height: 16px;
+	width: 16px;
+	margin-right: 4px;
+	float: left;
+}
+
+#jappix_mini span.jm_name {
+	color: #272727;
+	height: 14px;
+	width: 105px;
+	overflow: hidden;
+	float: left;
+}
+
+#jappix_mini .jm_available,
+#jappix_mini .jm_chat {
+	background-position: 0 -20px;
+}
+
+#jappix_mini .jm_away {
+	background-position: 0 -36px;
+}
+
+#jappix_mini .jm_xa,
+#jappix_mini .jm_dnd {
+	background-position: 0 -52px;
+}
+
+#jappix_mini .jm_unavailable {
+	background-position: 0 -68px;
+}
+
+#jappix_mini .jm_smiley {
+	border: 0 none;
+	height: 16px;
+	width: 16px;
+	vertical-align: bottom;
+}
+
+#jappix_mini .jm_smiley-wink {
+	background-position: 0 -148px;
+}
+
+#jappix_mini .jm_smiley-waii {
+	background-position: 0 -164px;
+}
+
+#jappix_mini .jm_smiley-unhappy {
+	background-position: 0 -180px;
+}
+
+#jappix_mini .jm_smiley-tongue {
+	background-position: 0 -196px;
+}
+
+#jappix_mini .jm_smiley-surprised {
+	background-position: 0 -212px;
+}
+
+#jappix_mini .jm_smiley-smile {
+	background-position: 0 -228px;
+}
+
+#jappix_mini .jm_smiley-happy {
+	background-position: 0 -244px;
+}
+
+#jappix_mini .jm_smiley-grin {
+	background-position: 0 -260px;
+}
+
+#jappix_popup {
+	background: url(../img/others/blank.gif) repeat;
+	position: fixed;
+	top: 0;
+	bottom: 0;
+	left: 0;
+	right: 0;
+	z-index: 999;
+}
+
+#jappix_popup div.jm_prompt {
+	background-color: #565d5e;
+	border: 1px solid #3a3a3a;
+	width: 346px;
+	position: fixed;
+	top: 50%;
+	left: 50%;
+	margin-left: -175px;
+	padding: 16px 2px 2px 2px;
+	border-top-right-radius: 4px;
+	border-top-left-radius: 4px;
+	-moz-border-radius-topright: 4px;
+	-moz-border-radius-topleft: 4px;
+	-webkit-border-top-right-radius: 4px;
+	-webkit-border-top-left-radius: 4px;
+	box-shadow: 0 0 35px #232323;
+	-moz-box-shadow: 0 0 35px #232323;
+	-webkit-box-shadow: 0 0 35px #232323;
+}
+
+#jappix_popup div.jm_prompt form {
+	background-color: white;
+	border: 1px solid #3a3a3a;
+	width: 332px;
+	padding: 6px;
+}
+
+#jappix_popup div.jm_prompt form input {
+	background-color: #f9f9f9;
+	border: 1px solid #666666;
+	font-size: 1.1em;
+	padding: 1px 2px;
+}
+
+#jappix_popup div.jm_prompt form input:hover,
+#jappix_popup div.jm_prompt form input:focus {
+	border: 1px solid #202020;
+}
+
+#jappix_popup div.jm_prompt form input.jm_text {
+	width: 326px;
+	margin: 6px 0;
+	display: block;
+}
+
+#jappix_popup div.jm_prompt form input.jm_submit {
+	text-align: center;
+	margin-left: 3px;
+	float: right;
+}
+
+#jappix_popup div.jm_prompt form input.jm_submit:hover,
+#jappix_popup div.jm_prompt form input.jm_submit:focus {
+	background-color: #f3f3f3;
+	cursor: pointer;
+}
+
+#jappix_popup div.jm_prompt form input.jm_submit:active {
+	background-color: #e8e8e8;
+}
+
+#jappix_popup div.jm_prompt div.jm_clear {
+	clear: both;
+}
diff --git a/jappixmini/jappix/css/mobile.css b/jappixmini/jappix/css/mobile.css
new file mode 100644
index 00000000..ed44cc03
--- /dev/null
+++ b/jappixmini/jappix/css/mobile.css
@@ -0,0 +1,288 @@
+/*
+
+Jappix - An open social platform
+This is the Jappix Mobile CSS stylesheet
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 05/10/11
+
+*/
+
+/* BEGIN GENERAL STYLE */
+
+* {
+	margin: 0;
+	padding: 0;
+}
+
+body {
+	font: normal 14.4px Helvetica, Verdana, sans-serif;
+	background-color: #dcdcdc;
+	margin: 0 auto;
+	text-align: center;
+	min-width: 200px;
+	min-height: 260px;
+}
+
+a {
+	color: black;
+}
+
+/* END GENERAL STYLE */
+
+/* BEGIN HEADER STYLE */
+
+.header {
+	background-color: #2d2d2d;
+	border-bottom: 1px solid #6d6d6d;
+	color: #405964;
+	padding: 6px 0;
+	height: 30px;
+}
+
+.header div {
+	background-position: 0 0;
+	width: 83px;
+	height: 30px;
+}
+
+/* END HEADER STYLE */
+
+/* BEGIN HOME STYLE */
+
+#home .header div {
+	margin: 0 auto;
+}
+
+#home .notification {
+	padding: 2px;
+	margin-top: -1px;
+}
+
+#noscript {
+	background: #86a2ff;
+	border-bottom: 1px solid #5890d6;
+	color: #1e4b82;
+}
+
+#error {
+	background: #ff8686;
+	border-bottom: 1px solid #d65858;
+	color: #821e1e;
+	display: none;
+}
+
+#info {
+	background: #f3eba7;
+	border-bottom: 1px solid #d9d085;
+	color: #5e5616;
+	display: none;
+}
+
+#home .login {
+	padding: 8px 0;
+	margin: 30px 0 30px 0;
+}
+
+#home .login input {
+	margin-top: 5px;
+	padding: 2px;
+}
+
+#home .login input.xid,
+#home .login input.password {
+	display: block;
+	margin: 4px auto;
+	font-size: 0.85em;
+	padding: 4px;
+	background-color: white;
+	border: 1px solid #636363;
+	width: 150px;
+	padding-left: 24px;
+}
+
+#home .login input.xid {
+	background-position: 4px -30px;
+}
+
+#home .login input.password {
+	background-position: 4px -53px;
+}
+
+#home .login label {
+	margin-bottom: 12px;
+	display: block;
+}
+
+#home .login label input {
+	margin-right: 4px;
+}
+
+#home a {
+	font-size: 0.8em;
+}
+
+/* END HOME STYLE */
+
+/* BEGIN TALK STYLE */
+
+#talk .header div,
+#chat .header div {
+	float: left;
+	margin-left: 7px;
+}
+
+#talk .header button,
+#chat .header button {
+	float: right;
+	margin-right: 7px;
+	padding: 2px;
+}
+
+#talk a.one-buddy {
+	display: none;
+	background-color: #87a5ab;
+	border-bottom: 1px solid #5b8088;
+	text-shadow: 1px 1px 1px #5b8088;
+	text-decoration: none;
+	color: white;
+	outline-style: none;
+	padding: 10px 0;
+}
+
+#talk a.one-buddy:hover {
+	cursor: pointer;
+}
+
+#talk a.available,
+#talk a.chat {
+	background-color: #83b187;
+	border-bottom: 1px solid #4d8252;
+	text-shadow: 1px 1px 1px #4d8252;
+}
+
+#talk a.available:hover,
+#talk a.chat:hover,
+#talk a.available:focus,
+#talk a.chat:focus {
+	background-color: #89c68e;
+}
+
+#talk a.available:active,
+#talk a.chat:active {
+	background-color: #90d496;
+}
+
+#talk a.away {
+	background-color: #e0be7b;
+	border-bottom: 1px solid #ae8941;
+	text-shadow: 1px 1px 1px #ae8941;
+}
+
+#talk a.away:hover,
+#talk a.away:focus {
+	background-color: #eac784;
+}
+
+#talk a.away:active {
+	background-color: #f3d294;
+}
+
+#talk a.xa,
+#talk a.dnd {
+	background-color: #db8989;
+	border-bottom: 1px solid #a24343;
+	text-shadow: 1px 1px 1px #a24343;
+}
+
+#talk a.xa:hover,
+#talk a.dnd:hover,
+#talk a.xa:focus,
+#talk a.dnd:focus {
+	background-color: #e89797;
+}
+
+#talk a.xa:active,
+#talk a.dnd:active {
+	background-color: #ef9f9f;
+}
+
+/* END TALK STYLE */
+
+/* BEGIN CHAT STYLE */
+
+#chat {
+	display: none;
+}
+
+#chat .one-chat,
+#chat .one-chat p,
+#chat .one-chat div,
+#chat .one-chat input {
+	position: absolute;
+	bottom: 0;
+	right: 0;
+}
+
+#chat .one-chat {
+	top: 43px;
+	left: 0;
+}
+
+#chat .one-chat p {
+	background-color: #87a5ab;
+	border-bottom: 1px solid #5b8088;
+	text-shadow: 1px 1px 1px #5b8088;
+	color: white;
+	top: 0;
+	left: 0;
+	height: 18px;
+	padding: 2px 0;
+	font-size: 0.9em;
+}
+
+#chat .one-chat div {
+	border-bottom: 1px solid #cbcbcb;
+	top: 23px;
+	left: 0;
+	bottom: 25px;
+	overflow: auto;
+	text-align: left;
+}
+
+#chat .one-chat span {
+	display: block;
+	font-size: 0.85em;
+	margin: 4px 6px;
+	word-wrap: break-word;
+}
+
+#chat .one-chat b {
+	margin-right: 3px;
+}
+
+#chat .one-chat b.me {
+	color: #123a5c;
+}
+
+#chat .one-chat b.him {
+	color: #801e1e;
+}
+
+#chat .one-chat input {
+	background-color: white;
+	bottom: 0;
+	height: 25px;
+	width: 100%;
+	border: none;
+}
+
+#chat .one-chat input.submit {
+	right: 0;
+	width: 35px;
+}
+
+/* END CHAT STYLE */
diff --git a/jappixmini/jappix/css/mucadmin.css b/jappixmini/jappix/css/mucadmin.css
new file mode 100644
index 00000000..3fe1c754
--- /dev/null
+++ b/jappixmini/jappix/css/mucadmin.css
@@ -0,0 +1,91 @@
+/*
+
+Jappix - An open social platform
+This is the mucadmin CSS stylesheet for Jappix
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 11/05/11
+
+*/
+
+#mucadmin .content {
+	padding: 10px 0 10px 0;
+}
+
+#mucadmin .content p {
+	margin: 5px 10px 5px 10px;
+	text-align: justify;
+}
+
+#mucadmin .mucadmin-head-jid {
+	text-decoration: underline;
+	font-size: 0.9em;
+	float: right;
+	margin: 1px 4px 1px 1px;
+}
+
+#mucadmin .mucadmin-forms {
+	height: 310px;
+	width: 620px;
+	margin: -5px 0 0 10px;
+	padding: 6px 0 0 0;
+	overflow: auto;
+}
+
+#mucadmin .mucadmin-forms label {
+	width: 260px;
+}
+
+#mucadmin .mucadmin-topic label,
+#mucadmin .mucadmin-aut label,
+#mucadmin .mucadmin-others label {
+	font-size: 0.9em;
+}
+
+#mucadmin .mucadmin-forms textarea {
+	height: 60px;
+	width: 300px;
+	margin: 5px 12px 10px 0;
+}
+
+#mucadmin .results {
+	height: auto;
+	width: auto;
+	overflow: visible;
+	margin: 5px;
+}
+
+#mucadmin .aut-group {
+	float: left;
+	padding-bottom: 4px;
+}
+
+#mucadmin .one-aut {
+	clear: both;
+	margin: 0 10px 5px 0;
+}
+
+#mucadmin .aut-add {
+	clear: both;
+	float: left;
+	margin-bottom: 5px;
+	font-size: 0.9em;
+}
+
+#mucadmin .aut-remove {
+	float: left;
+}
+
+#mucadmin .aut-remove:hover,
+#mucadmin .aut-remove:focus {
+	font-weight: bold;
+	text-decoration: none;
+}
+
+#mucadmin .mucadmin-others a {
+	float: left;
+	font-size: 0.9em;
+}
diff --git a/jappixmini/jappix/css/myinfos.css b/jappixmini/jappix/css/myinfos.css
new file mode 100644
index 00000000..83262268
--- /dev/null
+++ b/jappixmini/jappix/css/myinfos.css
@@ -0,0 +1,330 @@
+/*
+
+Jappix - An open social platform
+This is the my-infos CSS stylesheet for Jappix
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 31/08/11
+
+*/
+
+#my-infos {
+	background-color: rgb(20,20,20);
+	background-color: rgba(20,20,20,0.85);
+	color: #919191;
+	margin-top: 8px;
+	padding: 15px 6px 6px 6px;
+	border-radius: 4px;
+	-moz-border-radius: 4px;
+	-webkit-border-radius: 4px;
+	box-shadow: 0 0 6px #5c5c5c;
+	-moz-box-shadow: 0 0 6px #5c5c5c;
+	-webkit-box-shadow: 0 0 6px #5c5c5c;
+}
+
+#my-infos .content {
+	background: #e8f1f3;
+	background: -moz-linear-gradient(top, #e4edef, #e8f1f3);
+	background: -webkit-gradient(linear, left top, left bottom, from(#e4edef), to(#e8f1f3));
+	color: #919191;
+	max-height: 140px;
+	padding: 1px 0;
+	border-radius: 3px;
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 3px;
+}
+
+#my-infos .element {
+	height: 24px;
+	margin: 6px 0;
+	position: relative;
+}
+
+#my-infos .element .icon {
+	background-color: white;
+	border-color: #636363;
+	border-width: 1px;
+	border-style: solid;
+	margin-left: 6px;
+	height: 22px;
+	width: 25px;
+	border-radius: 2px;
+	-moz-border-radius: 2px;
+	-webkit-border-radius: 2px;
+}
+
+#my-infos .element div.bubble a {
+	width: 100%;
+	height: 20px;
+}
+
+#my-infos .element .icon:hover,
+#my-infos .element div.bubble a:hover {
+	background-color: #f4f4f4;
+}
+
+#my-infos .element .icon:active,
+#my-infos .element div.bubble a:active {
+	background-color: #ededed;
+}
+
+#my-infos .f-presence div.bubble a[data-value=available] {
+	background-position: 4px -167px;
+}
+
+#my-infos .f-presence div.bubble a[data-value=away] {
+	background-position: 4px -183px;
+}
+
+#my-infos .f-presence div.bubble a[data-value=xa] {
+	background-position: 4px -199px;
+}
+
+#my-infos .f-mood div.bubble a[data-value=crazy] {
+	background-position: 4px -296px;
+}
+
+#my-infos .f-mood div.bubble a[data-value=excited] {
+	background-position: 4px -314px;
+}
+
+#my-infos .f-mood div.bubble a[data-value=playful] {
+	background-position: 4px -332px;
+}
+
+#my-infos .f-mood div.bubble a[data-value=happy] {
+	background-position: 4px -350px;
+}
+
+#my-infos .f-mood div.bubble a[data-value=shocked] {
+	background-position: 4px -368px;
+}
+
+#my-infos .f-mood div.bubble a[data-value=hot] {
+	background-position: 4px -386px;
+}
+
+#my-infos .f-mood div.bubble a[data-value=sad] {
+	background-position: 4px -404px;
+}
+
+#my-infos .f-mood div.bubble a[data-value=amorous] {
+	background-position: 4px -422px;
+}
+
+#my-infos .f-mood div.bubble a[data-value=confident] {
+	background-position: 4px -440px;
+}
+
+#my-infos .f-mood a[data-value] span {
+	background-position: 0 -352px;
+}
+
+#my-infos .f-mood a[data-value=crazy] span,
+.mood-one {
+	background-position: 0 -298px;
+}
+
+#my-infos .f-mood a[data-value=excited] span,
+.mood-two {
+	background-position: 0 -316px;
+}
+
+#my-infos .f-mood a[data-value=playful] span,
+.mood-three {
+	background-position: 0 -334px;
+}
+
+#my-infos .f-mood a[data-value=happy] span,
+.mood-four {
+	background-position: 0 -352px;
+}
+
+#my-infos .f-mood a[data-value=shocked] span,
+.mood-five {
+	background-position: 0 -370px;
+}
+
+#my-infos .f-mood a[data-value=hot] span,
+.mood-six {
+	background-position: 0 -388px;
+}
+
+#my-infos .f-mood a[data-value=sad] span,
+.mood-seven {
+	background-position: 0 -406px;
+}
+
+#my-infos .f-mood a[data-value=amorous] span,
+.mood-eight {
+	background-position: 0 -424px;
+}
+
+#my-infos .f-mood a[data-value=confident] span,
+.mood-nine {
+	background-position: 0 -442px;
+}
+
+#my-infos .f-activity div.bubble a[data-value=doing_chores] {
+	background-position: 4px -458px;
+}
+
+#my-infos .f-activity div.bubble a[data-value=drinking] {
+	background-position: 4px -476px;
+}
+
+#my-infos .f-activity div.bubble a[data-value=eating] {
+	background-position: 4px -494px;
+}
+
+#my-infos .f-activity div.bubble a[data-value=exercising] {
+	background-position: 4px -512px;
+}
+
+#my-infos .f-activity div.bubble a[data-value=grooming] {
+	background-position: 4px -548px;
+}
+
+#my-infos .f-activity div.bubble a[data-value=having_appointment] {
+	background-position: 4px -566px;
+}
+
+#my-infos .f-activity div.bubble a[data-value=inactive] {
+	background-position: 4px -530px;
+}
+
+#my-infos .f-activity div.bubble a[data-value=relaxing] {
+	background-position: 4px -620px;
+}
+
+#my-infos .f-activity div.bubble a[data-value=talking] {
+	background-position: 4px -602px;
+}
+
+#my-infos .f-activity div.bubble a[data-value=traveling] {
+	background-position: 4px -584px;
+}
+
+#my-infos .f-activity div.bubble a[data-value=working] {
+	background-position: 4px -638px;
+}
+
+#my-infos .f-activity a[data-value] span {
+	background-position: 0 -514px;
+}
+
+#my-infos .f-activity a[data-value=doing_chores] span,
+.activity-doing_chores {
+	background-position: 0 -460px;
+}
+
+#my-infos .f-activity a[data-value=drinking] span,
+.activity-drinking {
+	background-position: 0 -478px;
+}
+
+#my-infos .f-activity a[data-value=eating] span,
+.activity-eating {
+	background-position: 0 -496px;
+}
+
+#my-infos .f-activity a[data-value=exercising] span,
+.activity-exercising {
+	background-position: 0 -514px;
+}
+
+#my-infos .f-activity a[data-value=grooming] span,
+.activity-grooming {
+	background-position: 0 -550px;
+}
+
+#my-infos .f-activity a[data-value=having_appointment] span,
+.activity-having_appointment {
+	background-position: 0 -568px;
+}
+
+#my-infos .f-activity a[data-value=inactive] span,
+.activity-inactive {
+	background-position: 0 -532px;
+}
+
+#my-infos .f-activity a[data-value=relaxing] span,
+.activity-relaxing {
+	background-position: 0 -622px;
+}
+
+#my-infos .f-activity a[data-value=talking] span,
+.activity-talking {
+	background-position: 0 -604px;
+}
+
+#my-infos .f-activity a[data-value=traveling] span,
+.activity-traveling {
+	background-position: 0 -586px;
+}
+
+#my-infos .f-activity a[data-value=working] span,
+.activity-working {
+	background-position: 0 -640px;
+}
+
+#my-infos .element .icon.picker {
+	border-width: 1px 0 1px 1px;
+	border-top-right-radius: 0;
+	border-bottom-right-radius: 0;
+	-moz-border-radius-topright: 0;
+	-moz-border-radius-bottomright: 0;
+	-webkit-border-top-right-radius: 0;
+	-webkit-border-bottom-right-radius: 0;
+}
+
+#my-infos .element .icon.disabled {
+	background-color: #f3f3f3;
+	border-color: #989898;
+	cursor: default;
+}
+
+#my-infos .element div.bubble {
+	background-color: white;
+	border-color: #636363;
+	border-width: 1px 1px 0 1px;
+	border-style: solid;
+	width: 25px;
+	padding: 1px 0;
+	position: absolute;
+	bottom: 21px;
+	left: 6px;
+	border-top-left-radius: 2px;
+	border-top-right-radius: 2px;
+	-moz-border-radius-topleft: 2px;
+	-moz-border-radius-topright: 2px;
+	-webkit-border-top-left-radius: 2px;
+	-webkit-border-top-right-radius: 2px;
+}
+
+#my-infos .element a {
+	float: left;
+}
+
+#my-infos .element .icon span {
+	height: 16px;
+	width: 16px;
+	margin: 3px 4px;
+	display: block;
+}
+
+#my-infos .element input {
+	height: 18px;
+	width: 190px;
+	font-size: 0.85em;
+	padding-left: 4px;
+	border-top-left-radius: 0;
+	border-bottom-left-radius: 0;
+	-moz-border-radius-topleft: 0;
+	-moz-border-radius-bottomleft: 0;
+	-webkit-border-top-left-radius: 0;
+	-webkit-border-top-bottom-radius: 0;
+}
diff --git a/jappixmini/jappix/css/options.css b/jappixmini/jappix/css/options.css
new file mode 100644
index 00000000..6dc4ecdb
--- /dev/null
+++ b/jappixmini/jappix/css/options.css
@@ -0,0 +1,97 @@
+/*
+
+Jappix - An open social platform
+This is the options CSS stylesheet for Jappix
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 26/04/11
+
+*/
+
+#options label {
+	width: 190px;
+	font-size: 0.94em;
+}
+
+#options .forms {
+	width: 610px;
+	height: 328px;
+	margin: 15px 15px 15px 15px;
+	float: left;
+}
+
+#options .forms select {
+	margin-top: -3px;
+	min-width: 120px;
+	float: left;
+}
+
+#options .forms a.linked {
+	font-size: 0.9em;
+	float: left;
+}
+
+#options fieldset.privacy {
+	display: none;
+}
+
+#options .sub-ask-delete, #options .sub-ask-pass, #options .sub-ask-pass-success {
+	display: none;
+}
+
+#options .sub-ask {
+	display: none;
+	width: 592px;
+	padding: 8px;
+	float: left;
+	border: 1px #879da2 dotted;
+	background: #cbdde1;
+}
+
+#options .sub-ask-top {
+	font-size: 0.9em;
+	margin-top: -3px;
+}
+
+#options .sub-ask-title {
+	margin-bottom: 4px;
+	float: left;
+}
+
+#options .sub-ask-close {
+	float: right;
+}
+
+#options .sub-ask-close:hover {
+	cursor: pointer;
+}
+
+#options .sub-ask-content {
+	clear: both;
+	height: 25px;
+	font-size: 0.9em;
+	border-top: 1px #416972 solid;
+	padding: 12px 0;
+}
+
+#options .sub-ask-content label {
+	width: 125px;
+}
+
+#options .sub-ask-content input {
+	width: 125px;
+}
+
+#options .sub-ask-bottom {
+	clear: both;
+	font-size: 0.9em;
+	float: right;
+	text-decoration: underline;
+}
+
+#options .sub-ask-bottom:hover {
+	cursor: pointer;
+}
diff --git a/jappixmini/jappix/css/others.css b/jappixmini/jappix/css/others.css
new file mode 100644
index 00000000..f3e2461f
--- /dev/null
+++ b/jappixmini/jappix/css/others.css
@@ -0,0 +1,118 @@
+/*
+ 
+Jappix - An open social platform
+This is the others CSS stylesheet for Jappix
+ 
+-------------------------------------------------
+ 
+License: AGPL
+Author: Vanaryon
+Last revision: 31/08/11
+ 
+*/
+ 
+#audio {
+        display: none;
+}
+ 
+#top-content {
+        position: absolute;
+        right: 5px;
+        left: 5px;
+        top: 0;
+        min-width: 860px;
+        z-index: 50;
+}
+ 
+#main-content {
+        position: absolute;
+        top: 34px;
+        left: 5px;
+        right: 5px;
+        bottom: 5px;
+        min-width: 850px;
+        min-height: 450px;
+}
+ 
+#left-content {
+        position: absolute;
+        top: 0;
+        left: 0;
+        bottom: 0;
+        width: 248px;
+}
+ 
+#right-content {
+        background-color: rgb(20,20,20);
+        background-color: rgba(20,20,20,0.85);
+        position: absolute;
+        top: 0;
+        right: 0;
+        bottom: 0;
+        left: 260px;
+        z-index: 10;
+        border-radius: 4px;
+        -moz-border-radius: 4px;
+        -webkit-border-radius: 4px;
+        box-shadow: 0 0 6px #5c5c5c;
+        -moz-box-shadow: 0 0 6px #5c5c5c;
+        -webkit-box-shadow: 0 0 6px #5c5c5c;
+}
+ 
+#general-wait {
+	background: url(../img/others/blank.gif) repeat;
+        z-index: 10000;
+        position: fixed;
+        top: 0;
+        bottom: 0;
+        left: 0;
+        right: 0;
+}
+ 
+.general-wait-content {
+        background-color: rgb(255,255,255);
+        background-color: rgba(255,255,255,0.9);
+        background-position: 8px 8px;
+        padding: 8px;
+        position: absolute;
+        right: 5px;
+        bottom: 5px;
+        border-radius: 4px;
+        -moz-border-radius: 4px;
+        -webkit-border-radius: 4px;
+        box-shadow: 0 0 2px #000;
+        -moz-box-shadow: 0 0 2px #000;
+        -webkit-box-shadow: 0 0 2px #000;
+}
+ 
+.inbox-hidable,
+.options-hidable,
+.pep-hidable,
+.pubsub-hidable,
+.archives-hidable,
+.commands-hidable,
+.privacy-hidable,
+.xmpplinks-hidable {
+        display: none;
+}
+ 
+#reconnect .pane {
+        background-color: rgb(20,20,20);
+        background-color: rgba(20,20,20,0.85);
+        color: white;
+        padding: 25px;
+        z-index: 10000;
+        text-shadow: 0 1px 1px black;
+        position: absolute;
+        left: 0;
+        right: 0;
+        top: 0;
+        box-shadow: 0 0 35px #232323;
+        -moz-box-shadow: 0 0 35px #232323;
+        -webkit-box-shadow: 0 0 35px #232323;
+}
+ 
+#reconnect .pane a {
+        margin-top: -4px;
+        float: right;
+}
diff --git a/jappixmini/jappix/css/pageengine.css b/jappixmini/jappix/css/pageengine.css
new file mode 100644
index 00000000..75038b6c
--- /dev/null
+++ b/jappixmini/jappix/css/pageengine.css
@@ -0,0 +1,601 @@
+/*
+
+Jappix - An open social platform
+This is the page-engine CSS stylesheet for Jappix
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 31/08/11
+
+*/
+
+#page-engine {
+	background-color: #f4f4f4;
+	position: absolute;
+	top: 40px;
+	bottom: 6px;
+	right: 6px;
+	left: 6px;
+	z-index: 8;
+	border-radius: 3px;
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 3px;
+}
+
+#page-engine .top {
+	background: #e8f1f3;
+	background: -moz-linear-gradient(top, #e8f1f3, #dee8ea);
+	background: -webkit-gradient(linear, left top, left bottom, from(#e8f1f3), to(#dee8ea));
+	border-bottom: 1px solid #d0d0d0;
+	color: black;
+	position: absolute;
+	top: 0;
+	left: 0;
+	right: 0;
+	padding: 6px;
+	height: 80px;
+	border-top-right-radius: 3px;
+	border-top-left-radius: 3px;
+	-moz-border-radius-topright: 3px;
+	-moz-border-radius-topleft: 3px;
+	-webkit-border-top-right-radius: 3px;
+	-webkit-border-top-left-radius: 3px;
+}
+
+#page-engine .top .avatar-container {
+	text-align: center;
+	margin: 2px 0 0 10px;
+	height: 76px;
+	width: 76px;
+	float: left;
+}
+
+#page-engine .top .avatar {
+	max-height: 76px;
+	max-width: 76px;
+}
+
+#page-engine .top .name {
+	text-align: right;
+	padding: 7px;
+}
+
+#page-engine p.bc-name {
+	font-size: 2.3em;
+	margin-bottom: 5px;
+}
+
+#page-engine p.bc-infos {
+	font-size: 0.85em;
+	height: 16px;
+	overflow: hidden;
+	position: absolute;
+	left: 115px;
+	right: 12px;
+}
+
+#page-engine .page-engine-chan[data-type=groupchat] p.bc-infos {
+	left: 12px;
+}
+
+#page-engine p.bc-infos span.show {
+	padding-left: 18px;
+}
+
+#page-engine p.bc-infos a {
+	text-decoration: underline;
+}
+
+#page-engine div.bc-pep {
+	float: right;
+}
+
+#page-engine div.bc-pep a {
+	height: 16px;
+	width: 16px;
+	margin-left: 4px;
+	float: left;
+}
+
+#page-engine div.bc-pep a:hover {
+	cursor: default;
+}
+
+#page-engine div.bc-pep a[href]:hover {
+	cursor: pointer;
+}
+
+#page-engine .content,
+#page-engine .list {
+	font-size: 0.9em;
+	position: absolute;
+	top: 93px;
+	right: 0;
+	bottom: 29px;
+	overflow: auto;
+	box-shadow: inset 0 3px 10px #e8e8e8;
+	-moz-box-shadow: inset 0 3px 10px #e8e8e8;
+	-webkit-box-shadow: inset 0 3px 10px #e8e8e8;
+}
+
+#page-engine .content {
+	left: 0;
+	padding: 12px 14px 0;
+}
+
+#page-engine .content a {
+	text-decoration: underline;
+}
+
+#page-engine .page-engine-chan {
+	display: none;
+}
+
+#page-engine .chat .content,
+#page-engine .chat .list {
+	bottom: 93px;
+}
+
+#page-engine .chat .content {
+	padding-bottom: 24px;
+}
+
+#page-engine .groupchat-content {
+	padding-bottom: 16px !important;
+	right: 191px !important;
+}
+
+#page-engine .list {
+	border-left: 1px solid #c8c8c8;
+	padding: 8px 0 0;
+	width: 190px;
+	right: 0;
+}
+
+#page-engine .list .role {
+	display: none;
+	margin-bottom: 10px;
+}
+
+#page-engine .list .title {
+	font-weight: bold;
+	color: #383838;
+	margin-left: 8px;
+}
+
+#page-engine .list .user {
+	background: #eff2f2;
+	background: -moz-linear-gradient(top, #eff2f2, #ecefef);
+	background: -webkit-gradient(linear, left top, left bottom, from(#eff2f2), to(#ecefef));
+	border-color: #c8c8c8;
+	border-width: 1px 0;
+	border-style: solid;
+	color: #383838;
+	margin-bottom: 3px;
+	height: 32px;
+	overflow: hidden;
+}
+
+#page-engine .list .user:hover {
+	background: #e9ecec;
+	cursor: pointer;
+}
+
+#page-engine .list .user:active {
+	background: #e3e7e7;
+}
+
+#page-engine .list .user.myself {
+	background-color: #eff2f2;
+	cursor: default;
+}
+
+#page-engine .list .user .name {
+	float: left;
+	height: 18px;
+	overflow: hidden;
+	margin: 7px 0 7px 3px;
+	padding-left: 18px;
+}
+
+#page-engine .list .user .avatar-container {
+	text-align: center;
+	float: right;
+	height: 32px;
+	width: 32px;
+}
+
+#page-engine .list .user .avatar {
+	max-height: 32px;
+	max-width: 32px;
+}
+
+#page-engine .one-group,
+#archives .one-group {
+	border-bottom: 1px dotted #d0d0d0;
+	padding-bottom: 8px;
+	margin-bottom: 10px;
+}
+
+#page-engine .one-line,
+#archives .one-line,
+#page-engine .one-group b.name,
+#archives .one-group b.name {
+	padding-left: 50px;
+	word-wrap: break-word;
+}
+
+#page-engine .one-group b.name,
+#archives .one-group b.name {
+	display: block;
+	margin-bottom: 4px;
+}
+
+#page-engine .one-group b.name.me,
+#archives .one-group b.name.me {
+	color: #123a5c;
+}
+
+#page-engine .one-group b.name.him,
+#archives .one-group b.name.him {
+	color: #801e1e;
+}
+
+#page-engine .one-group span.date,
+#archives .one-group span.date {
+	float: right;
+	font-size: 0.9em;
+}
+
+#page-engine .one-group .avatar-container,
+#archives .one-group .avatar-container {
+	text-align: center;
+	margin: 4px 0 0 6px;
+	height: 30px;
+	width: 30px;
+	float: left;
+}
+
+#page-engine .one-group .avatar,
+#archives .one-group .avatar {
+	max-height: 30px;
+	max-width: 30px;
+}
+
+#page-engine b.name.talk-images {
+	background-position: 50px -99px;
+	padding-left: 68px;
+}
+
+#page-engine .user-message,
+#archives .user-message {
+	margin-bottom: 3px;
+}
+
+#page-engine .system-message {
+	color: #053805 !important;
+	margin-bottom: 3px !important;
+	padding-left: 0 !important;
+}
+
+#page-engine .system-message a {
+	color: #053805 !important;
+}
+
+#page-engine .system-message p.help b {
+	margin-bottom: 5px;
+	text-decoration: underline;
+	display: block;
+}
+
+#page-engine .system-message p.help em {
+	width: 240px;
+	text-decoration: underline;
+	margin-left: 5px;
+	float: left;
+}
+
+#page-engine .my-nick {
+	font-weight: bold;
+}
+
+#page-engine .old-message {
+	font-size: 11px !important;
+	margin-bottom: 1px !important;
+}
+
+#page-engine .chatstate {
+	background-color: rgb(234,234,234);
+	background-color: rgba(234,234,234,0.8);
+	color: #2c2c2c;
+	padding: 3px 10px 2px 8px;
+	position: absolute;
+	bottom: 93px;
+	left: 0;
+	font-size: 0.75em;
+	border-top-right-radius: 3px;
+	-moz-border-radius-topright: 3px;
+	-webkit-border-top-right-radius: 3px;
+}
+
+#page-engine .text {
+	height: 93px;
+	position: absolute;
+	bottom: 0;
+	left: 0;
+	right: 0;
+}
+
+#page-engine .footer {
+	background: #e8f1f3;
+	background: -moz-linear-gradient(top, #dee8ea, #e8f1f3);
+	background: -webkit-gradient(linear, left top, left bottom, from(#dee8ea), to(#e8f1f3));
+	border-color: #d0d0d0;
+	border-width: 1px 0 0;
+	border-style: solid;
+	color: black;
+	position: absolute;
+	left: 0;
+	right: 0;
+	padding: 6px;
+	height: 16px;
+}
+
+#page-engine .chat .footer {
+	border-width: 1px 0;
+	position: static;
+}
+
+#page-engine .chat-tools-content {
+	height: 16px;
+	width: 16px;
+	margin-right: 8px;
+	float: left;
+}
+
+#page-engine .tools-tooltip {
+	display: block;
+	height: 16px;
+	width: 16px;
+	overflow: hidden;
+	float: left;
+}
+
+#page-engine .text .chat-tools-smileys {
+	margin-left: 4px;
+}
+
+#page-engine .text .chat-tools-file {
+	display: none;
+}
+
+#page-engine .text .chat-tools-file.mini .bubble-file {
+	z-index: 39;
+}
+
+#page-engine .text .chat-tools-file.mini .tooltip-subitem {
+	width: 22px;
+	height: 20px;
+}
+
+#page-engine .text .chat-tools-file.mini .wait {
+	margin: -2px 0 0 -1px;
+}
+
+#page-engine .text .tools-smileys {
+	background-position: 0 -388px;
+}
+
+#page-engine .text .tools-style {
+	background-position: 0 -700px;
+}
+
+#page-engine .text .tools-file {
+	background-position: 0 -1956px;
+}
+
+#page-engine .text .tools-save {
+	background-position: 0 -719px;
+}
+
+#page-engine .text .tools-clear {
+	background-position: 0 -739px;
+}
+
+#page-engine .text .tools-infos,
+#channel .top div.shortcuts a.profile {
+	background-position: 0 -758px;
+}
+
+#page-engine .text .tools-add,
+#page-engine .text .tools-archives,
+#page-engine .text .tools-mucadmin {
+	display: none;
+}
+
+#page-engine .text .tools-mucadmin {
+	background-position: 0 -777px;
+}
+
+#page-engine .bubble-style label.bold {
+	font-weight: bold;
+}
+
+#page-engine .bubble-style label.italic {
+	font-style: italic;
+}
+
+#page-engine .bubble-style label.underline {
+	text-decoration: underline;
+}
+
+#page-engine .bubble-style a.color {
+	height: 18px;
+	width: 18px;
+	border-color: white;
+	border-width: 1px;
+	border-style: solid;
+	margin: 6px 5px 0 0;
+	float: left;
+	opacity: 0.6;
+	border-radius: 3px;
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 3px;
+	box-shadow: 0 0 5px black;
+	-moz-box-shadow: 0 0 5px black;
+	-webkit-box-shadow: 0 0 5px black;
+}
+
+#page-engine .bubble-style a.color:hover,
+#page-engine .bubble-style a.color:focus {
+	opacity: 0.7;
+}
+
+#page-engine .bubble-style a.color.selected {
+	opacity: 1;
+	border-color: #ffb20d;
+}
+
+#page-engine .bubble-file .tooltip-subitem {
+	width: 240px;
+}
+
+#page-engine .bubble-file input[type=file] {
+	width: 220px;
+}
+
+#page-engine .bubble-file input[type=submit],
+#page-engine .bubble-file input[type=reset] {
+	margin: 4px 4px 0 0;
+}
+
+#page-engine .text .compose,
+#page-engine .muc-ask {
+	position: absolute;
+	left: 0;
+}
+
+#page-engine .text .compose {
+	top: 29px;
+	right: 12px;
+	bottom: 12px;
+}
+
+#page-engine .muc-ask {
+	right: 0;
+	bottom: 0;
+}
+
+#page-engine .text textarea {
+	border: 1px solid #c8c8c8;
+	padding: 5px;
+	height: 100%;
+	width: 100%;
+	font-size: 1.1em;
+	border-radius: 3px;
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 3px;
+	border-top-right-radius: 0;
+	border-top-left-radius: 0;
+	-moz-border-radius-topright: 0;
+	-moz-border-radius-topleft: 0;
+	-webkit-border-top-right-radius: 0;
+	-webkit-border-top-left-radius: 0;
+}
+
+#page-engine .muc-ask {
+	background-color: #e8f1f3;
+	height: 64px;
+	font-size: 0.9em;
+	right: 0;
+	z-index: 2;
+	border-bottom-left-radius: 3px;
+	border-bottom-right-radius: 3px;
+	-moz-border-radius-bottomleft: 3px;
+	-moz-border-radius-bottomright: 3px;
+	-webkit-border-bottom-left-radius: 3px;
+	-webkit-border-bottom-right-radius: 3px;
+}
+
+#page-engine .muc-ask label {
+	color: #224249;
+	margin: 23px 10px 0 16px;
+	font-weight: bold;
+}
+
+#page-engine .muc-ask input {
+	width: 200px;
+	margin: 19px 10px 0 10px;
+	padding: 3px;
+}
+
+#page-engine .tooltip {
+	position: absolute;
+	bottom: 84px;
+	margin-left: -13px;
+	z-index: 40;
+	font-size: 0.8em;
+	color: white;
+}
+
+#page-engine .tooltip a {
+	color: white;
+	text-decoration: underline;
+}
+
+#page-engine .tooltip-subitem {
+	background-color: rgb(0,0,0);
+	background-color: rgba(0,0,0,0.8);
+	padding: 10px;
+	width: 200px;
+	height: 110px;
+	text-shadow: 0 1px 1px black;
+	border-radius: 5px;
+	-moz-border-radius: 5px;
+	-webkit-border-radius: 5px;
+}
+
+#page-engine .tooltip-subarrow {
+	background-position: 0 -251px;
+	opacity: 0.8;
+	height: 10px;
+	width: 18px;
+	margin-left: 12px;
+}
+
+#page-engine .tooltip .tooltip-top {
+	margin-bottom: 8px;
+	font-weight: bold;
+}
+
+#page-engine .tooltip label {
+	margin-bottom: 4px;
+	float: left;
+	clear: both;
+}
+
+#page-engine .tooltip label input[type=checkbox] {
+	margin: 0 6px 0 0;
+	float: left;
+}
+
+#page-engine .tooltip label.select {
+	margin-top: 5px;
+}
+
+#page-engine .tooltip input,
+#page-engine .tooltip select {
+	float: left;
+}
+
+#page-engine .tooltip select {
+	width: 100px;
+}
+
+#page-engine .tooltip .tooltip-actionlog:hover,
+#page-engine .tooltip .tooltip-actionlog:focus {
+	cursor: pointer;
+	text-decoration: underline;
+}
diff --git a/jappixmini/jappix/css/pageswitch.css b/jappixmini/jappix/css/pageswitch.css
new file mode 100644
index 00000000..59830049
--- /dev/null
+++ b/jappixmini/jappix/css/pageswitch.css
@@ -0,0 +1,209 @@
+/*
+
+Jappix - An open social platform
+This is the page-switch CSS stylesheet for Jappix
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 22/05/11
+
+*/
+
+#page-switch {
+	position: absolute;
+	top: 15px;
+	left: 10px;
+	right: 10px;
+	z-index: 9;
+}
+
+#page-switch .chans {
+	position: absolute;
+	left: 0;
+	right: 40px;
+	top: 0;
+	height: 25px;
+	overflow: hidden;
+}
+
+#page-switch .more {
+	position: absolute;
+	right: 0;
+	top: 0;
+}
+
+#page-switch .more-button {
+	background-position: 6px -1372px;
+	background-color: #d9e7ea;
+	width: 7px;
+	height: 17px;
+	padding: 1px 6px;
+	font-size: 0.9em;
+	text-decoration: none;
+	border-radius: 2px;
+	-moz-border-radius: 2px;
+	-webkit-border-radius: 2px;
+}
+
+#page-switch .more-content {
+	background-color: #d9e7ea;
+	width: 200px;
+	max-height: 400px;
+	overflow: auto;
+	position: absolute;
+	margin: -2px 0 0 -181px;
+	padding: 4px 0;
+	font-size: 0.95em;
+	border-top-left-radius: 3px;
+	border-bottom-left-radius: 3px;
+	border-bottom-right-radius: 3px;
+	-moz-border-radius-topleft: 3px;
+	-moz-border-radius-bottomleft: 3px;
+	-moz-border-radius-bottomright: 3px;
+	-webkit-border-top-left-radius: 3px;
+	-webkit-border-bottom-left-radius: 3px;
+	-webkit-border-bottom-right-radius: 3px;
+}
+
+#page-switch .switcher {
+	background-color: #d9e7ea;
+	color: #17353b;
+	height: 15px;
+	padding: 5px 10px 5px 5px;
+	margin: 0 2px;
+	font-size: 0.85em;
+	float: left;
+	border-top-right-radius: 3px;
+	border-top-left-radius: 3px;
+	-moz-border-radius-topright: 3px;
+	-moz-border-radius-topleft: 3px;
+	-webkit-border-top-right-radius: 3px;
+	-webkit-border-top-left-radius: 3px;
+}
+
+#page-switch .more-content .switcher {
+	background-color: #d9e7ea;
+	float: none;
+	margin: 0;
+	font-size: 0.9em;
+	border-radius: 0;
+	-moz-border-radius: 0;
+	-webkit-border-radius: 0;
+}
+
+#page-switch .more-content .switcher .exit {
+	display: block;
+}
+
+#page-switch .more-button:hover,
+#page-switch .more-button:focus,
+#page-switch .switcher:hover,
+#page-switch .switcher:focus,
+#page-switch .more-content .switcher:hover,
+#page-switch .more-content .switcher:focus {
+	background-color: #cedee1;
+	cursor: pointer;
+}
+
+#page-switch .more-button:active,
+#page-switch .switcher:active,
+#page-switch .more-content .switcher:active {
+	background-color: #c3d3d7;
+}
+
+#page-switch .switcher.activechan {
+	background-color: #e8f1f3;
+}
+
+#page-switch .more-content .switcher.activechan {
+	background-color: #d1e0e3;
+}
+
+#page-switch .icon {
+	height: 16px;
+	width: 16px;
+	float: left;
+}
+
+#page-switch .name {
+	float: left;
+	margin-left: 4px;
+	max-height: 16px;
+	max-width: 140px;
+	overflow: hidden;
+}
+
+#page-switch .exit {
+	display: none;
+	background-color: #bdd9dc;
+	border: 1px solid #80aab0;
+	color: #355e64;
+	height: 14px;
+	width: 13px;
+	margin-left: 10px;
+	font-size: 0.85em;
+	text-align: center;
+	text-decoration: none;
+	float: right;
+	border-radius: 2px;
+	-moz-border-radius: 2px;
+	-webkit-border-radius: 2px;
+}
+
+#page-switch .exit:hover,
+#page-switch .exit:focus {
+	background-color: #aac7cb;
+}
+
+#page-switch .exit:active {
+	background-color: #9bbdc1;
+}
+
+#page-switch .activechan .exit {
+	display: block;
+	float: right;
+}
+
+#page-switch .chan-newmessage {
+	background-color: #f6edc3 !important;
+}
+
+#page-switch .chan-newmessage:hover,
+#page-switch .chan-newmessage:focus {
+	background-color: #f1eac0 !important;
+}
+
+#page-switch .chan-newmessage:active {
+	background-color: #ede4b8 !important;
+}
+
+#page-switch .composing,
+#page-engine .list .user.composing {
+	color: #217021 !important;
+}
+
+#page-switch .paused,
+#page-switch .chan-unread .name,
+#page-engine .list .user.paused {
+	color: #2431ac !important;
+}
+
+#page-switch .active,
+#page-engine .list .user.active {
+	color: #353535 !important;
+}
+
+#page-switch .inactive,
+#page-engine .list .user.inactive {
+	color: #585858 !important;
+}
+
+#page-switch .gone {
+	color: #851313 !important;
+}
+
+#page-switch .channel .icon {
+	background-position: 0 -55px;
+}
diff --git a/jappixmini/jappix/css/popup.css b/jappixmini/jappix/css/popup.css
new file mode 100644
index 00000000..e5b3eb92
--- /dev/null
+++ b/jappixmini/jappix/css/popup.css
@@ -0,0 +1,612 @@
+/*
+
+Jappix - An open social platform
+This is the popup CSS stylesheet for Jappix
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 02/05/11
+
+*/
+
+.lock {
+	background-color: rgb(0,0,0);
+	background-color: rgba(0,0,0,0.6);
+	left: 0;
+	right: 0;
+	top: 0;
+	bottom: 0;
+	position: fixed;
+	z-index: 9999;
+}
+
+.popup {
+	background-color: rgb(20,20,20);
+	background-color: rgba(20,20,20,0.95);
+	margin-top: -250px;
+	margin-left: -330px;
+	width: 640px;
+	height: 500px;
+	padding: 0 10px;
+	position: absolute;
+	z-index: 10000;
+	left: 50%;
+	top: 50%;
+	border-radius: 5px;
+	-moz-border-radius: 5px;
+	-webkit-border-radius: 5px;
+	box-shadow: 0 0 35px #232323;
+	-moz-box-shadow: 0 0 35px #232323;
+	-webkit-box-shadow: 0 0 35px #232323;
+}
+
+.popup.large {
+	margin-left: -460px;
+	width: 920px;
+}
+
+.popup .top {
+	width: 600px;
+	height: 45px;
+	font-size: 1.2em;
+	padding-top: 9px;
+	color: white;
+	margin: 14px 0 0 40px;
+	text-transform: uppercase;
+	text-decoration: none;
+	font-weight: bold;
+	text-shadow: 0 2px 2px black;
+}
+
+.popup .tab {
+	width: 620px;
+	height: 25px;
+	margin: -5px 10px 0 10px;
+	position: relative;
+	z-index: 1;
+}
+
+.popup .tab a {
+	background-color: #d9e7ea;
+	color: #204249;
+	width: 180px;
+	height: 17px;
+	padding: 4px 4px 4px 16px;
+	margin-left: 5px;
+	font-size: 0.94em;
+	overflow: hidden;
+	float: left;
+	border-top-right-radius: 3px;
+	border-top-left-radius: 3px;
+	-moz-border-radius-topright: 3px;
+	-moz-border-radius-topleft: 3px;
+	-webkit-border-top-right-radius: 3px;
+	-webkit-border-top-left-radius: 3px;
+}
+
+.popup .tab a:hover,
+.popup .tab a:focus {
+	background-color: #cedee1;
+	text-decoration: none;
+}
+
+.popup .tab a:active {
+	background-color: #c3d3d7;
+	text-decoration: none;
+}
+
+.popup .tab a.tab-active {
+	background-color: #e4eef9 !important;
+}
+
+.popup .one-lap {
+	display: none;
+}
+
+.popup .one-lap.lap-active {
+	display: block;
+}
+
+.popup .content {
+	background: #e4eef9;
+	background: -moz-linear-gradient(top, #e4eef9, #D0E5FA);
+	background: -webkit-gradient(linear, left top, left bottom, from(#e4eef9), to(#D0E5FA));
+	height: 358px;
+	width: 640px;
+	position: absolute;
+	left: 10px;
+	border-radius: 3px;
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 3px;
+	box-shadow: 0 0 20px black;
+	-moz-box-shadow: 0 0 20px black;
+	-webkit-box-shadow: 0 0 20px black;
+}
+
+.popup .content,
+.popup .content a {
+	color: #112a2f;
+}
+
+.popup.large div.comments {
+	background-color: #f4f4f4;
+	width: 272px;
+	margin: 0;
+	position: absolute;
+	right: 10px;
+	top: 63px;
+	bottom: 10px;
+	overflow-x: hidden;
+	overflow-y: auto;
+	border-radius: 3px;
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 3px;
+}
+
+.popup.large div.comments div.comments-content {
+	font-size: 0.8em;
+}
+
+.popup.large div.comments input {
+	width: 185px;
+	min-width: 0;
+}
+
+.popup.large div.comments .one-comment {
+	padding-bottom: 4px;
+}
+
+.popup.large div.comments .one-comment a {
+	text-decoration: underline;
+}
+
+.popup.large div.comments div.comments-content {
+	border-top-right-radius: 3px;
+	border-top-left-radius: 3px;
+	-moz-border-radius-topright: 3px;
+	-moz-border-radius-topleft: 3px;
+	-webkit-border-top-right-radius: 3px;
+	-webkit-border-top-left-radius: 3px;
+}
+
+.popup .head {
+	background: #f1f6fd;
+	border: 1px #9dc4fc solid;
+	width: 606px;
+	height: 24px;
+	margin: 0 10px 10px 10px;
+	padding: 6px;
+}
+
+.popup .head-text {
+	float: left;
+	font-size: 0.9em;
+	margin: 3px;
+}
+
+.popup .head-actions {
+	float: right;
+	margin-top: 2px;
+}
+
+.popup .head-actions a {
+	font-size: 0.9em;
+	margin: 0 4px;
+}
+
+.popup .actions a {
+	color: #30575f;
+	font-size: 0.9em;
+	margin-left: 5px;
+}
+
+.popup .head .head-input {
+	float: right;
+	width: 200px;
+	padding: 2px;
+}
+
+.popup .head .head-select {
+	float: right;
+	height: 24px;
+}
+
+.popup .forms {
+	width: 390px;
+	height: 328px;
+	margin: 15px;
+	float: left;
+}
+
+.popup fieldset {
+	border: 1px #547177 solid;
+	margin: 0 0 15px 0;
+	padding: 8px 2px 3px 2px;
+	border-radius: 3px;
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 3px;
+}
+
+.popup legend {
+	font-size: 0.9em;
+	margin: 0 0 0 15px;
+	padding: 0 2px;
+	text-transform: uppercase;
+}
+
+.popup label {
+	color: #1b1b1b;
+	width: 150px;
+	margin: 0 0 10px 12px;
+	clear: both;
+	float: left;
+}
+
+.popup input,
+.popup select {
+	margin: 0 10px 10px 0;
+	float: left;
+}
+
+.popup input[type=text] {
+	min-width: 174px;
+}
+
+.popup select {
+	min-height: 20px;
+}
+
+.popup .results {
+	height: 310px;
+	width: 620px;
+	margin: -5px 0 0 10px;
+	padding: 6px 0 0 0;
+	overflow: auto;
+}
+
+.popup .results .no-results {
+	margin: 6px 0;
+	font-size: 0.85em;
+	font-weight: bold;
+}
+
+.popup .results label {
+	width: 180px;
+	margin: 6px 4px 4px 4px;
+}
+
+.popup .results input,
+.popup .results textarea,
+.popup .results select {
+	margin: 4px;
+}
+
+.popup .results input,
+.popup .results select {
+	min-width: 180px;
+}
+
+.popup .results input[type=checkbox],
+.popup .results input[type=radio] {
+	margin-top: 7px;
+}
+
+.popup .results textarea {
+	width: 380px;
+}
+
+.popup .results .avatar-container {
+	float: left;
+	width: 60px;
+	height: 60px;
+	margin: 5px 12px 5px 9px;
+	text-align: center;
+	background-repeat: no-repeat;
+}
+
+.popup .results img.avatar {
+	max-width: 60px;
+	max-height: 60px;
+}
+
+.popup .results .one-icon {
+	height: 16px;
+	width: 16px;
+	margin: 10px 3px 0 8px;
+	float: left;
+}
+
+.popup .results .one-icon.account,
+.popup .results .one-icon.auth {
+	background-position: 0 -777px;
+}
+
+.popup .results .one-icon.automation,
+.popup .results .one-icon.client {
+	background-position: 0 -1500px;
+}
+
+.popup .results .one-icon.collaboration {
+	background-position: 0 -1520px;
+}
+
+.popup .results .one-icon.proxy,
+.popup .results .one-icon.server,
+.popup .results .one-icon.others {
+	background-position: 0 -1540px;
+}
+
+.popup .results .one-icon.component,
+.popup .results .one-icon.gateway {
+	background-position: 0 -1560px;
+}
+
+.popup .results .one-icon.conference {
+	background-position: 0 -1082px;
+}
+
+.popup .results .one-icon.directory {
+	background-position: 0 -876px;
+}
+
+.popup .results .one-icon.headline,
+.popup .results .one-icon.hierarchy {
+	background-position: 0 -1580px;
+}
+
+.popup .results .one-icon.pubsub,
+.popup .results .one-icon.store {
+	background-position: 0 -1600px;
+}
+
+.popup .results .one-icon.loading {
+	background-position: 0 -1620px;
+}
+
+.popup .results .one-icon.down {
+	background-position: 0 -1640px;
+}
+
+.popup .results .one-host {
+	font-weight: bold;
+	width: 170px;
+}
+
+.popup .results .one-type {
+	width: 210px;
+}
+
+.popup .results .one-type,
+.popup .results .one-host {
+	float: left;
+	overflow: hidden;
+	margin: 9px 8px;
+}
+
+.popup .results .one-jid,
+.popup .results .one-ctry,
+.popup .results .one-fn {
+	margin: 4px;
+	width: 400px;
+}
+
+.popup .results .one-fn {
+	font-weight: bold;
+}
+
+.popup .results .one-jid {
+	margin-top: 8px;
+	font-size: 0.9em;
+}
+
+.popup .results .one-name {
+	float: left;
+	margin: 4px;
+}
+
+.popup a.one-button {
+	display: none;
+	background-color: #f1f6fd;
+	border: 1px solid #b9cbcf;
+	margin-top: 1px;
+	padding: 4px 8px;
+	text-decoration: none;
+	border-radius: 2px;
+	-moz-border-radius: 2px;
+	-webkit-border-radius: 2px;
+}
+
+.popup a.one-button:hover,
+.popup a.one-button:focus {
+	border: 1px solid #95b1b7;
+}
+
+.popup a.one-button:active {
+	border: 1px solid #77989f;
+}
+
+.popup .results .oneresult:hover a.one-button {
+	display: block;
+}
+
+.popup .results a.one-button,
+#inbox .one-message a.one-button {
+	float: right;
+	padding: 3px 6px;
+	margin-right: 4px;
+}
+
+.popup .results a.one-vjud {
+	position: absolute;
+	right: 4px;
+}
+
+.popup .results a.one-add {
+	top: 8px;
+}
+
+.popup .results a.one-chat {
+	top: 42px;
+}
+
+.popup .results .one-next {
+	float: right;
+	margin: 4px 8px 4px 4px;
+	font-weight: bold;
+}
+
+.popup .results .one-actions {
+	width: 148px;
+	margin: 4px;
+	float: left;
+}
+
+.popup .results .one-actions a {
+	width: 16px;
+	height: 16px;
+	padding: 2px 2px 4px 5px !important;
+	margin-top: 2px;
+}
+
+.popup .results .one-actions a.browse {
+	background-position: 3px -1396px;
+}
+
+.popup .results .one-actions a.command {
+	background-position: 3px -1415px;
+}
+
+.popup .results .one-actions a.subscribe {
+	background-position: 4px -1435px;
+}
+
+.popup .results .one-actions a.join {
+	background-position: 3px -1455px;
+}
+
+.popup .results .one-actions a.search {
+	background-position: 4px -1475px;
+}
+
+.popup .results a.submit,
+.popup .results a.cancel,
+.popup .results a.back {
+	margin-right: 8px;
+	float: right;
+}
+
+.popup .onetitle {
+	font-size: 0.9em;
+	padding: 4px;
+	font-weight: bold;
+}
+
+.popup .oneinstructions {
+	font-size: 0.9em;
+	padding: 4px;
+	margin: 8px 0;
+}
+
+.popup .oneresult {
+	font-size: 0.9em;
+	padding: 3px 0 4px 4px;
+	border-bottom: 1px #9dc4fc solid;
+	overflow: hidden;
+	position: relative;
+}
+
+.popup .oneresult:hover {
+	background: #e9f1fd;
+}
+
+.popup .oneresult[onclick]:hover {
+	cursor: pointer;
+}
+
+.popup .oneresult[onclick]:active {
+	background: #f1f6fd;
+}
+
+.popup .infos {
+	background-color: rgb(255,239,104);
+	background-color: rgba(255,239,104,0.8);
+	border: 1px #decb2f solid;
+	color: #3f3f3f;
+	padding: 8px;
+	margin: 10px;
+	font-size: 0.8em;
+}
+
+.popup .infos p {
+	margin-top: 10px;
+}
+
+.popup .infos p.infos-title {
+	font-weight: bold;
+}
+
+.popup .bottom {
+	width: 640px;
+	height: 40px;
+	position: absolute;
+	bottom: 8px;
+}
+
+.popup .wait {
+	display: none;
+	margin: 8px 0 0 3px;
+	float: left;
+}
+
+a.finish {
+	border: 1px solid white;
+	background-color: rgb(255,255,255);
+	background-color: rgba(255,255,255,0.1);
+	color: white;
+	padding: 4px 8px;
+	margin-right: 7px;
+	font-size: 0.95em;
+	text-align: center;
+	text-decoration: none;
+	text-shadow: 0 1px 1px black;
+	border-radius: 3px;
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 3px;
+	box-shadow: 0 0 5px black;
+	-moz-box-shadow: 0 0 5px black;
+	-webkit-box-shadow: 0 0 5px black;
+}
+
+a.finish:hover,
+a.finish:focus {
+	cursor: pointer;
+	background-color: rgb(255,255,255);
+	background-color: rgba(255,255,255,0.2);
+	box-shadow: 0 0 15px black;
+	-moz-box-shadow: 0 0 15px black;
+	-webkit-box-shadow: 0 0 15px black;
+}
+
+a.finish:active {
+	background-color: rgb(255,255,255);
+	background-color: rgba(255,255,255,0.3);
+}
+
+a.finish.disabled {
+	opacity: 0.2;
+}
+
+a.finish.disabled:hover,
+a.finish.disabled:focus,
+a.finish.disabled:active {
+	cursor: default;
+	background-color: rgb(255,255,255);
+	background-color: rgba(255,255,255,0.1);
+}
+
+.popup a.finish {
+	margin-top: 6px;
+	float: right;
+}
diff --git a/jappixmini/jappix/css/privacy.css b/jappixmini/jappix/css/privacy.css
new file mode 100644
index 00000000..521be322
--- /dev/null
+++ b/jappixmini/jappix/css/privacy.css
@@ -0,0 +1,197 @@
+/*
+
+Jappix - An open social platform
+This is the privacy CSS stylesheet for Jappix
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 16/02/11
+
+*/
+
+#privacy .content {
+	padding: 10px 0 10px 0;
+}
+
+#privacy .privacy-head div.list-left,
+#privacy .privacy-head div.list-center,
+#privacy .privacy-head div.list-right,
+#privacy .privacy-first {
+	float: left;
+}
+
+#privacy .privacy-head div.list-left {
+	margin-left: 5px;
+}
+
+#privacy .privacy-head div.list-center {
+	border-right: 1px dotted #1b393f;
+	height: 24px;
+	width: 1px;
+	margin-right: 15px;
+	padding-left: 18px;
+}
+
+#privacy .privacy-head span,
+#privacy .privacy-head a,
+#privacy .privacy-item span,
+#privacy .privacy-item a {
+	float: left;
+}
+
+#privacy .privacy-head span {
+	font-size: 0.9em;
+	font-weight: bold;
+	margin: 3px 10px 0 0;
+}
+
+#privacy .privacy-head input,
+#privacy .privacy-head select {
+	width: 180px;
+}
+
+#privacy .privacy-head input {
+	margin-top: 1px;
+}
+
+#privacy .privacy-head select,
+#privacy .privacy-item select {
+	margin-top: -2px;
+}
+
+#privacy .privacy-head span.left-space {
+	margin-left: 16px;
+}
+
+#privacy .privacy-head a,
+#privacy .privacy-item a {
+	width: 20px;
+	height: 20px;
+	padding: 0;
+	display: block;
+}
+
+#privacy .privacy-item a.item-add {
+	background-position: 2px -1178px;
+}
+
+#privacy .privacy-head a.list-remove,
+#privacy .privacy-item a.item-remove {
+	background-position: 2px -1197px;
+}
+
+#privacy .privacy-item a.item-save {
+	background-position: 3px -126px;
+	width: auto;
+	height: 19px;
+	padding: 1px 7px 0 21px;
+}
+
+#privacy .privacy-item,
+#privacy form,
+#privacy .privacy-active {
+	clear: both;
+}
+
+#privacy .privacy-item {
+	margin: 17px 12px;
+	font-size: 0.9em;
+}
+
+#privacy .privacy-item span {
+	font-weight: bold;
+}
+
+#privacy .privacy-item select {
+	width: 300px;
+	margin: -4px 30px 0 10px;
+}
+
+#privacy .privacy-item a {
+	margin: -2px 6px 0 0;
+}
+
+#privacy .privacy-first,
+#privacy .privacy-second,
+#privacy .privacy-third {
+	height: 195px;
+	font-size: 0.9em;
+	margin: 10px 0 0 10px;
+	float: left;
+}
+
+#privacy .privacy-first,
+#privacy .privacy-second {
+	border-right: 1px dotted #1b393f;
+	padding-right: 14px;
+}
+
+#privacy .privacy-first {
+	width: 125px;
+}
+
+#privacy .privacy-first label {
+	margin: 50px 0 0 15px;
+}
+
+#privacy .privacy-first label input {
+	margin-top: 2px;
+}
+
+#privacy .privacy-second {
+	width: 205px;
+}
+
+#privacy .privacy-second label {
+	margin: 2px 0 0 12px;
+}
+
+#privacy .privacy-second input[type=radio],
+#privacy .privacy-third input[type=checkbox] {
+	margin-top: 2px;
+	margin-bottom: 2px;
+}
+
+#privacy .privacy-second input[type=text],
+#privacy .privacy-second select {
+	width: 170px;
+	margin: 2px 0 11px 12px;
+	float: none;
+}
+
+#privacy .privacy-third label {
+	width: auto;
+	margin-top: 11px;
+}
+
+#privacy .privacy-third {
+	width: 240px;
+}
+
+#privacy .privacy-active {
+	margin: 34px 16px 0 16px;
+	font-size: 0.9em;
+}
+
+#privacy .privacy-active-elements {
+	float: right;
+}
+
+#privacy .privacy-active input[type=text] {
+	width: 30px;
+	margin: 0 0 0 8px;
+	float: none;
+}
+
+#privacy .privacy-active input[type=checkbox] {
+	margin: 2px 8px 0 0;
+	float: left;
+}
+
+#privacy .privacy-active label {
+	width: auto;
+	margin: 0 15px 0 0;
+	clear: none;
+}
diff --git a/jappixmini/jappix/css/rosterx.css b/jappixmini/jappix/css/rosterx.css
new file mode 100644
index 00000000..4f159ac8
--- /dev/null
+++ b/jappixmini/jappix/css/rosterx.css
@@ -0,0 +1,53 @@
+/*
+
+Jappix - An open social platform
+This is the Roster Item Exchange tool CSS stylesheet for Jappix
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 05/02/11
+
+*/
+
+#rosterx .content {
+	padding: 10px 0 10px 0;
+}
+
+#rosterx .rosterx-head a {
+	font-size: 0.9em;
+	margin: 3px 4px;
+	float: left;
+}
+
+#rosterx .oneresult:hover {
+	cursor: pointer;
+}
+
+#rosterx .oneresult span {
+	margin: 2px 5px 0 5px;
+	overflow: hidden;
+	float: left;
+}
+
+#rosterx .oneresult span.name {
+	width: 230px;
+	font-weight: bold;
+}
+
+#rosterx .oneresult span.xid {
+	width: 270px;
+	font-size: 0.9em;
+}
+
+#rosterx .oneresult span.action {
+	width: 16px;
+	height: 16px;
+	margin-top: 4px;
+	float: right;
+}
+
+#rosterx .oneresult span.action.modify {
+	background-position: 0 -1244px;
+}
diff --git a/jappixmini/jappix/css/search.css b/jappixmini/jappix/css/search.css
new file mode 100644
index 00000000..505b17d9
--- /dev/null
+++ b/jappixmini/jappix/css/search.css
@@ -0,0 +1,60 @@
+/*
+
+Jappix - An open social platform
+This is the search tool CSS stylesheet for Jappix
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 23/01/11
+
+*/
+
+.search {
+	position: relative;
+}
+
+.search input.suggested {
+	border-bottom: 1px solid white;
+	border-bottom-right-radius: 0;
+	border-bottom-left-radius: 0;
+	-moz-border-radius-bottomright: 0;
+	-moz-border-radius-bottomleft: 0;
+	-webkit-border-bottom-right-radius: 0;
+	-webkit-border-bottom-left-radius: 0;
+}
+
+.search ul {
+	background-color: rgb(255,255,255);
+	background-color: rgba(255,255,255,0.9);
+	border-color: #e1a014;
+	border-style: solid;
+	border-width: 0 1px 1px 1px;
+	position: absolute;
+	z-index: 1;
+	padding: 3px 0;
+	list-style: none;
+	overflow: auto;
+	border-bottom-right-radius: 3px;
+	border-bottom-left-radius: 3px;
+	-moz-border-radius-bottomright: 3px;
+	-moz-border-radius-bottomleft: 3px;
+	-webkit-border-bottom-right-radius: 3px;
+	-webkit-border-bottom-left-radius: 3px;
+}
+
+.search ul li {
+	padding: 2px 6px;
+	color: #3d3d3d;
+	text-shadow: none;
+}
+
+.search ul li:hover {
+	cursor: pointer;
+}
+
+.search ul li.hovered {
+	background-color: rgb(225,160,20);
+	background-color: rgba(225,160,20,0.3);
+}
diff --git a/jappixmini/jappix/css/smileys.css b/jappixmini/jappix/css/smileys.css
new file mode 100644
index 00000000..faad478b
--- /dev/null
+++ b/jappixmini/jappix/css/smileys.css
@@ -0,0 +1,196 @@
+/*
+
+Jappix - An open social platform
+This is the smileys CSS stylesheet for Jappix
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 16/02/11
+
+*/
+
+.emoticon {
+	width: 16px;
+	height: 16px;
+}
+
+a.emoticon {
+	margin: 2px;
+	float: left;
+}
+
+a.emoticon:hover,
+a.emoticon:focus {
+	opacity: 0.8;
+}
+
+a.emoticon:active {
+	opacity: 0.7;
+}
+
+img.emoticon {
+	border: 0 none;
+	vertical-align: bottom;
+}
+
+.emoticon-biggrin {
+	background-position: 0 0;
+}
+
+.emoticon-devil {
+	background-position: -16px 0;
+}
+
+.emoticon-coolglasses {
+	background-position: -32px 0;
+}
+
+.emoticon-tongue {
+	background-position: -48px 0;
+}
+
+.emoticon-smile {
+	background-position: -64px 0;
+}
+
+.emoticon-wink {
+	background-position: -80px 0;
+}
+
+.emoticon-blush {
+	background-position: -96px 0;
+}
+
+.emoticon-stare {
+	background-position: -112px 0;
+}
+
+.emoticon-frowning {
+	background-position: -128px 0;
+}
+
+.emoticon-oh {
+	background-position: -144px 0;
+}
+
+.emoticon-unhappy {
+	background-position: -160px 0;
+}
+
+.emoticon-cry {
+	background-position: -176px 0;
+}
+
+.emoticon-angry {
+	background-position: -192px 0;
+}
+
+.emoticon-puke {
+	background-position: -208px 0;
+}
+
+.emoticon-hugright {
+	background-position: -224px 0;
+}
+
+.emoticon-hugleft {
+	background-position: -240px 0;
+}
+
+.emoticon-lion {
+	background-position: -256px 0;
+}
+
+.emoticon-pussy {
+	background-position: -272px 0;
+}
+
+.emoticon-bat {
+	background-position: -288px 0;
+}
+
+.emoticon-kiss {
+	background-position: -304px 0;
+}
+
+.emoticon-heart {
+	background-position: -320px 0;
+}
+
+.emoticon-brheart {
+	background-position: -336px 0;
+}
+
+.emoticon-flower {
+	background-position: -352px 0;
+}
+
+.emoticon-brflower {
+	background-position: -368px 0;
+}
+
+.emoticon-thumbup {
+	background-position: -384px 0;
+}
+
+.emoticon-thumbdown {
+	background-position: -400px 0;
+}
+
+.emoticon-lamp {
+	background-position: -416px 0;
+}
+
+.emoticon-coffee {
+	background-position: -432px 0;
+}
+
+.emoticon-drink {
+	background-position: -448px 0;
+}
+
+.emoticon-beer {
+	background-position: -464px 0;
+}
+
+.emoticon-boy {
+	background-position: -480px 0;
+}
+
+.emoticon-girl {
+	background-position: -496px 0;
+}
+
+.emoticon-phone {
+	background-position: -512px 0;
+}
+
+.emoticon-photo {
+	background-position: -528px 0;
+}
+
+.emoticon-music {
+	background-position: -544px 0;
+}
+
+.emoticon-cuffs {
+	background-position: -560px 0;
+}
+
+.emoticon-mail {
+	background-position: -576px 0;
+}
+
+.emoticon-rainbow {
+	background-position: -592px 0;
+}
+
+.emoticon-star {
+	background-position: -608px 0;
+}
+
+.emoticon-moon {
+	background-position: -624px 0;
+}
diff --git a/jappixmini/jappix/css/stats-svg.css b/jappixmini/jappix/css/stats-svg.css
new file mode 100644
index 00000000..f512a939
--- /dev/null
+++ b/jappixmini/jappix/css/stats-svg.css
@@ -0,0 +1,71 @@
+/*
+
+Jappix - An open social platform
+This is the SVG stats CSS stylesheet for Jappix
+
+-------------------------------------------------
+
+License: AGPL
+Author: Erwan Briand, Vanaryon
+Last revision: 20/11/10
+
+*/
+
+svg {
+	background-color: #e8f1f3;
+}
+
+.refline {
+    stroke: #596171;
+    stroke-width: 2px;
+}
+
+.refleft {
+    fill: #000000;
+    font-family: "Inconsolata", "DejaVu Serif sans", Verdana, sans-serif;
+    font-size: 8px;
+}
+
+.reftext {
+    fill: #586070;
+    font-family: "Inconsolata", "DejaVu Serif sans", Verdana, sans-serif;
+    font-size: 10px;
+}
+
+.bubbletextblue,
+.bubbletextred {
+    fill: none;
+    font-family: "Inconsolata", "DejaVu Serif sans", Verdana, sans-serif;
+    font-size: 8px;
+    text-anchor: end;
+}
+
+.bluebar {
+    fill: "#6C84C0";
+    fill-opacity: "0.6";
+}
+
+.gbar:hover .bluebar {
+    fill: #2A3F73;
+}
+
+.gbar:hover .redbar {
+    fill: #C70705;
+}
+
+.gbar:hover #bubble {
+    fill: white;
+    stroke: grey;
+}
+
+.gbar:hover .bubbletextblue {
+    fill: #2A3F73;
+}
+
+.gbar:hover .bubbletextred {
+    fill: #C70705;
+}
+
+.gbar:hover .reftext {
+    fill: #000000;
+}
diff --git a/jappixmini/jappix/css/tools.css b/jappixmini/jappix/css/tools.css
new file mode 100644
index 00000000..8b689f54
--- /dev/null
+++ b/jappixmini/jappix/css/tools.css
@@ -0,0 +1,346 @@
+/*
+
+Jappix - An open social platform
+This is the tools CSS stylesheet for Jappix
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 27/08/11
+
+*/
+
+#top-content .tools {
+	background-color: rgb(232,241,243);
+	background-color: rgba(232,241,243,0.6);
+	padding: 3px 8px 5px 8px;
+	min-width: 10px;
+	height: 17px;
+	border-bottom-left-radius: 4px;
+	border-bottom-right-radius: 4px;
+	-moz-border-radius-bottomleft: 4px;
+	-moz-border-radius-bottomright: 4px;
+	-webkit-border-bottom-left-radius: 4px;
+	-webkit-border-bottom-right-radius: 4px;
+}
+
+#top-content .tools a {
+	color: black;
+	padding: 0 3px;
+	margin: 0 1.5px;
+}
+
+#top-content .tools a:hover,
+#top-content .tools a:focus {
+	cursor: pointer;
+	text-decoration: underline;
+}
+
+#top-content .tools-logo {
+	background-position: 9px 2px;
+	width: 74px;
+	float: left;
+}
+
+#top-content .tools-all {
+	float: right;
+	text-align: right;
+	margin-left: 8px;
+	font-size: 0.9em;
+	color: black;
+}
+
+#top-content .notifications {
+	background-position: 7px -1264px;
+}
+
+#top-content .music {
+	background-position: 6px -1286px;
+}
+
+#top-content .notifications:hover,
+#top-content .music:hover {
+	cursor: pointer;
+}
+
+#top-content .music:hover,
+#top-content .notifications:hover,
+#top-content .music:focus,
+#top-content .notifications:focus {
+	background-color: rgb(232,241,243);
+	background-color: rgba(232,241,243,0.7);
+}
+
+#top-content .music:active,
+#top-content .notifications:active {
+	background-color: rgb(232,241,243);
+	background-color: rgba(232,241,243,0.8);
+}
+
+#top-content .actived,
+#top-content .actived:hover,
+#top-content .actived:focus,
+#top-content .actived:active {
+	background-color: rgb(232,241,243) !important;
+	background-color: rgba(232,241,243,0.9) !important;
+}
+
+#top-content .notify {
+	background-color: #c60505;
+	color: white;
+	font-size: 0.7em;
+	font-weight: bold;
+	margin-left: -10px;
+	padding: 1px 4px;
+	position: absolute;
+	bottom: -2px;
+	border-radius: 10px;
+	-moz-border-radius: 10px;
+	-webkit-border-radius: 10px;
+}
+
+#top-content .tools-content {
+	display: none;
+	position: absolute;
+	top: 25px;
+	margin-left: -8px;
+}
+
+.tools-content-subarrow {
+	background-position: 0 -241px;
+	opacity: 0.8;
+	height: 10px;
+	width: 18px;
+	margin-left: 12px;
+}
+
+.tools-content-subitem {
+	background-color: rgb(0,0,0);
+	background-color: rgba(0,0,0,0.8);
+	padding: 14px 6px 6px 6px;
+	border-radius: 5px;
+	-moz-border-radius: 5px;
+	-webkit-border-radius: 5px;
+}
+
+.notifications-content {
+	width: 240px;
+}
+
+.notifications-content .tools-content-subitem {
+	max-height: 250px;
+	color: white;
+	text-shadow: 0 1px 1px black;
+	text-align: left;
+	overflow-x: none;
+	overflow-y: auto;
+}
+
+.notifications-content .empty {
+	color: white;
+	font-size: 0.9em;
+	text-decoration: underline;
+	margin: -8px 4px 2px 0;
+	display: none;
+	float: right;
+}
+
+.notifications-content .nothing {
+	font-size: 0.9em;
+	margin: 5px;
+}
+
+.notifications-content .one-notification {
+	padding: 6px 4px;
+	font-size: 0.85em;
+	clear: both;
+	border-radius: 2px;
+	-moz-border-radius: 2px;
+	-webkit-border-radius: 2px;
+}
+
+.notifications-content .one-notification:hover,
+.notifications-content .one-notification:focus {
+	background-color: rgb(255,255,255);
+	background-color: rgba(255,255,255,0.1);
+}
+
+.notifications-content .one-notification:active {
+	background-color: rgb(255,255,255);
+	background-color: rgba(255,255,255,0.2);
+}
+
+.notifications-content .avatar-container {
+	float: left;
+	width: 40px;
+	height: 40px;
+	margin: 0 8px 8px 0;
+	text-align: center;
+	background-repeat: no-repeat;
+}
+
+.notifications-content .avatar {
+	max-width: 40px;
+	max-height: 40px;
+}
+
+.notifications-content .notification-text,
+.notifications-content .notification-actions {
+	margin-left: 48px;
+	overflow: hidden;
+}
+
+.notifications-content .notification-actions {
+	margin-top: 3px;
+}
+
+.notifications-content .notification-actions a {
+	color: white;
+	font-weight: bold;
+	font-size: 0.9em;
+	text-decoration: underline;
+	margin-right: 8px;
+}
+
+.notifications-content .one-notification .notification-actions span.talk-images {
+	background-position: 0 -1828px;
+	width: 16px;
+	height: 16px;
+	margin: -1px 6px 0 0;
+	float: left;
+}
+
+.notifications-content .one-notification[data-type=subscribe] .notification-actions span.talk-images {
+	background-position: 0 -1796px;
+}
+
+.notifications-content .one-notification[data-type=invite_room] .notification-actions span.talk-images {
+	background-position: 0 -1812px;
+}
+
+.notifications-content .one-notification[data-type=send] .notification-actions span.talk-images,
+.notifications-content .one-notification[data-type=send_accept] .notification-actions span.talk-images,
+.notifications-content .one-notification[data-type=send_reject] .notification-actions span.talk-images,
+.notifications-content .one-notification[data-type=send_fail] .notification-actions span.talk-images {
+	background-position: 0 -1956px;
+}
+
+.notifications-content .one-notification[data-type=rosterx] .notification-actions span.talk-images {
+	background-position: 0 -1844px;
+}
+
+.notifications-content .one-notification[data-type=comment] .notification-actions span.talk-images {
+	background-position: 0 -1860px;
+}
+
+.notifications-content .one-notification[data-type=like] .notification-actions span.talk-images {
+	background-position: 0 -1876px;
+}
+
+.notifications-content .one-notification[data-type=quote] .notification-actions span.talk-images {
+	background-position: 0 -1892px;
+}
+
+.notifications-content .one-notification[data-type=wall] .notification-actions span.talk-images {
+	background-position: 0 -1908px;
+}
+
+.notifications-content .one-notification[data-type=photo] .notification-actions span.talk-images {
+	background-position: 0 -1924px;
+}
+
+.notifications-content .one-notification[data-type=video] .notification-actions span.talk-images {
+	background-position: 0 -1940px;
+}
+
+.music-content {
+	width: 220px;
+}
+
+.music-content .tools-content-subitem {
+	height: 247px;
+}
+
+.music-content .player {
+	background: #b5d5db;
+	background: -moz-linear-gradient(top, #b5d5db, #adced4);
+	background: -webkit-gradient(linear, left top, left bottom, from(#b5d5db), to(#adced4));
+	height: 20px;
+	padding: 2px 5px;
+	border-top-right-radius: 4px;
+	border-top-left-radius: 4px;
+	-moz-border-radius-topright: 4px;
+	-moz-border-radius-topleft: 4px;
+	-webkit-border-top-right-radius: 4px;
+	-webkit-border-top-left-radius: 4px;
+}
+
+.music-content .player a {
+	margin: 2px;
+	height: 16px;
+	width: 16px;
+	float: left;
+}
+
+.music-content .player a:hover,
+.music-content .player a:focus {
+	opacity: 0.8;
+}
+
+.music-content .player a:active {
+	opacity: 0.6;
+}
+
+.music-content .stop {
+	display: none;
+	background-position: 0 -270px;
+}
+
+.music-content .list {
+	background-color: #e8f1f3;
+	height: 188px;
+	padding: 5px;
+	text-align: left;
+	overflow-y: auto;
+	overflow-x: hidden;
+}
+
+.music-content p.no-results {
+	display: none;
+	color: black;
+	font-size: 0.9em;
+}
+
+.music-content div.special {
+	padding-bottom: 2px;
+	margin-bottom: 6px;
+	border-bottom: 1px solid #c3d4d7;
+}
+
+.music-content .song {
+	display: block;
+	margin: 3px 0;
+	font-size: 0.8em;
+}
+
+.music-content .playing {
+	font-weight: bold;
+}
+
+.music-content .search {
+	background-color: #e8f1f3;
+	height: 25px;
+	border-bottom-left-radius: 4px;
+	border-bottom-right-radius: 4px;
+	-moz-border-radius-bottomleft: 4px;
+	-moz-border-radius-bottomright: 4px;
+	-webkit-border-bottom-right-radius: 4px;
+	-webkit-border-bottom-right-radius: 4px;
+}
+
+.music-content .search input {
+	margin: 2px;
+	width: 198px;
+	height: 15px;
+}
diff --git a/jappixmini/jappix/css/userinfos.css b/jappixmini/jappix/css/userinfos.css
new file mode 100644
index 00000000..59bab655
--- /dev/null
+++ b/jappixmini/jappix/css/userinfos.css
@@ -0,0 +1,100 @@
+/*
+
+Jappix - An open social platform
+This is the user-infos CSS stylesheet for Jappix
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 27/03/11
+
+*/
+
+#userinfos .content {
+	overflow: auto;
+}
+
+#userinfos .one-lap a {
+	text-decoration: underline;
+}
+
+#userinfos .main-infos {
+	margin: 20px 20px 8px 20px;
+	height: 120px;
+	background: white;
+	position: relative;
+	border-radius: 4px;
+	-moz-border-radius: 4px;
+	-webkit-border-radius: 4px;
+}
+
+#userinfos .avatar-container {
+	float: left;
+	text-align: center;
+	margin: 20px 35px;
+	width: 80px;
+	height: 80px;
+}
+
+#userinfos .avatar {
+	max-width: 80px;
+	max-height: 80px;
+}
+
+#userinfos h1,
+#userinfos h2,
+#userinfos h3 {
+	width: 410px;
+	overflow: hidden;
+}
+
+#userinfos h1 {
+	font-size: 2em;
+	padding-top: 12px;
+	margin-bottom: 4px;
+}
+
+#userinfos h2 {
+	color: #447079;
+	font-size: 1.1em;
+	margin-bottom: 10px;
+}
+
+#userinfos h3 {
+	color: #6e8388;
+	font-size: 0.8em;
+}
+
+#userinfos .main-infos div.shortcuts {
+	position: absolute;
+	top: 10px;
+	right: 12px;
+}
+
+#userinfos .block-infos {
+	margin: 7px 20px;
+	float: left;
+}
+
+#userinfos .one-line {
+	margin: 4px 0;
+	font-size: 0.9em;
+	float: left;
+}
+
+#userinfos .one-line b {
+	width: 120px;
+	float: left;
+}
+
+#userinfos .one-line span.reset-info {
+	float: left;
+	width: 460px;
+}
+
+#userinfos textarea {
+	margin: 30px 0 0 30px;
+	width: 572px;
+	height: 292px;
+}
diff --git a/jappixmini/jappix/css/vcard.css b/jappixmini/jappix/css/vcard.css
new file mode 100644
index 00000000..59dfc486
--- /dev/null
+++ b/jappixmini/jappix/css/vcard.css
@@ -0,0 +1,106 @@
+/*
+
+Jappix - An open social platform
+This is the vCard CSS stylesheet for Jappix
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 16/01/12
+
+*/
+
+#vcard label {
+	font-size: 0.94em;
+	margin-top: 2px;
+}
+
+#vcard #vcard-avatar input[type=file] {
+	margin-left: 15px;
+}
+
+#vcard .avatar-container {
+	float: left;
+	text-align: center;
+	margin: 20px 0 35px 35px;
+	max-width: 96px;
+	max-height: 96px;
+}
+
+#vcard .avatar {
+	max-width: 96px;
+	max-height: 96px;
+}
+
+#vcard .avatar-delete {
+	background-position: 3px -1195px;
+	margin: 12px 25px 0 025px;
+	padding-left: 20px;
+	font-size: 0.9em;
+	float: right;
+}
+
+#vcard .no-avatar {
+	width: 300px;
+	color: #7c2222;
+	padding: 10px;
+	margin: 15px 0 20px 40px;
+	background: #f8cece;
+	border: 1px #ba6d6d solid;
+	font-size: 0.8em;
+}
+
+#vcard .forms textarea {
+	height: 111px;
+	width: 358px;
+	margin: 5px 12px 10px 12px;
+}
+
+#vcard .forms .avatar-info {
+	border-width: 1px;
+	border-style: solid;
+	display: none;
+	width: 370px;
+	height: 15px;
+	font-size: 0.85em;
+	padding: 10px;
+}
+
+#vcard .forms .avatar-wait {
+	background-color: #9bcbed;
+	color: #0a3858;
+	border-color: #306780;
+}
+
+#vcard .forms .avatar-ok {
+	background-color: #c4ed9b;
+	color: #325213;
+	border-color: #578030;
+}
+
+#vcard .forms .avatar-error {
+	background-color: #e79595;
+	color: #6a0b0b;
+	border-color: #7c1010;
+}
+
+#vcard .infos {
+	width: 179px;
+	height: 328px;
+	margin: 15px 15px 15px 0;
+	padding: 0 8px;
+	float: right;
+}
+
+#vcard .infos a {
+	text-decoration: underline;
+}
+
+#vcard .send {
+	float: right;
+}
+
+#vcard .send:hover {
+	cursor: pointer;
+}
diff --git a/jappixmini/jappix/css/welcome.css b/jappixmini/jappix/css/welcome.css
new file mode 100644
index 00000000..71b31ef2
--- /dev/null
+++ b/jappixmini/jappix/css/welcome.css
@@ -0,0 +1,170 @@
+/*
+
+Jappix - An open social platform
+This is the welcome tool CSS stylesheet for Jappix
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 26/04/11
+
+*/
+
+#welcome .infos {
+	margin: 15px;
+}
+
+#welcome .infos p {
+	margin-top: 6px;
+}
+
+#welcome .infos p.infos-title {
+	margin-top: 0;
+}
+
+#welcome a.box {
+	background-color: #e4eef9;
+	border: 1px solid #ccdbde;
+	margin: 12px 11px 4px 15px;
+	padding: 10px;
+	width: 270px;
+	text-decoration: none;
+	float: left;
+	border-radius: 4px;
+	-moz-border-radius: 4px;
+	-webkit-border-radius: 4px;
+}
+
+#welcome a.box.share {
+	width: 350px;
+	margin: 4px 130px;
+	padding: 4px 10px;
+	clear: both;
+}
+
+#welcome a.box.share.first {
+	margin-top: 0;
+}
+
+#welcome a.box.share:hover span.go {
+	display: block;
+}
+
+#welcome a.box:hover,
+#welcome a.box:focus {
+	border: 1px solid #93c5fa;
+}
+
+#welcome a.box:active {
+	border: 1px solid #419afa;
+}
+
+#welcome a.box.enabled {
+	background-color: #f1f6fd;
+	border: 1px solid #9dc4fc;
+}
+
+#welcome a.box span {
+	margin: 3px 0;
+	display: block;
+}
+
+#welcome a.box span.logo {
+	height: 35px;
+	width: 35px;
+	margin-right: 15px;
+	float: left;
+}
+
+#welcome a.box span.logo.facebook {
+	background-position: 0 0;
+}
+
+#welcome a.box span.logo.twitter {
+	background-position: -35px 0;
+}
+
+#welcome a.box span.logo.buzz {
+	background-position: -70px 0;
+}
+
+#welcome a.box span.logo.identica {
+	background-position: -105px 0;
+}
+
+#welcome a.box span.option,
+#welcome a.box span.name {
+	font-size: 0.9em;
+	font-weight: bold;
+}
+
+#welcome a.box span.description {
+	font-size: 0.7em;
+	margin-top: 7px;
+}
+
+#welcome a.box.share span.description {
+	margin-top: 4px;
+}
+
+#welcome a.box span.image {
+	height: 16px;
+	width: 16px;
+	margin: -30px 12px 0 0;
+	float: right;
+}
+
+#welcome a.box span.image.sound {
+	background-position: 0 -900px;
+}
+
+#welcome a.box span.image.geolocation {
+	background-position: 0 -658px;
+}
+
+#welcome a.box span.image.xmpp {
+	background-position: 0 -990px;
+}
+
+#welcome a.box span.image.archives,
+#page-engine .text .tools-archives {
+	background-position: 0 -1025px;
+}
+
+#welcome a.box span.image.offline {
+	background-position: 0 -80px;
+}
+
+#welcome a.box span.tick,
+#welcome a.box span.go {
+	height: 16px;
+	width: 16px;
+	display: none;
+	float: right;
+}
+
+#welcome a.box span.tick {
+	background-position: 0 -1661px;
+	margin: -52px -15px 0 0;
+}
+
+#welcome a.box span.go {
+	background-position: 0 -1120px;
+	margin: -28px 5px 0 0;
+}
+
+#welcome a.box.enabled span.tick {
+	display: block;
+}
+
+#welcome div.results {
+	margin: -7px 15px;
+	padding: 0;
+	height: 272px;
+	overflow: auto;
+}
+
+#welcome .bottom .finish.save {
+	display: none;
+}
diff --git a/jappixmini/jappix/favicon.ico b/jappixmini/jappix/favicon.ico
new file mode 100644
index 00000000..dc203776
Binary files /dev/null and b/jappixmini/jappix/favicon.ico differ
diff --git a/jappixmini/jappix/img/others/blank.gif b/jappixmini/jappix/img/others/blank.gif
new file mode 100644
index 00000000..35d42e80
Binary files /dev/null and b/jappixmini/jappix/img/others/blank.gif differ
diff --git a/jappixmini/jappix/img/others/default-avatar.png b/jappixmini/jappix/img/others/default-avatar.png
new file mode 100644
index 00000000..7cda4c64
Binary files /dev/null and b/jappixmini/jappix/img/others/default-avatar.png differ
diff --git a/jappixmini/jappix/img/others/lock.png b/jappixmini/jappix/img/others/lock.png
new file mode 100644
index 00000000..cba6c0d3
Binary files /dev/null and b/jappixmini/jappix/img/others/lock.png differ
diff --git a/jappixmini/jappix/img/sprites/animate.gif b/jappixmini/jappix/img/sprites/animate.gif
new file mode 100644
index 00000000..cbf55da5
Binary files /dev/null and b/jappixmini/jappix/img/sprites/animate.gif differ
diff --git a/jappixmini/jappix/img/sprites/animate.png b/jappixmini/jappix/img/sprites/animate.png
new file mode 100644
index 00000000..3d89e5db
Binary files /dev/null and b/jappixmini/jappix/img/sprites/animate.png differ
diff --git a/jappixmini/jappix/img/sprites/background.png b/jappixmini/jappix/img/sprites/background.png
new file mode 100644
index 00000000..4ae286d8
Binary files /dev/null and b/jappixmini/jappix/img/sprites/background.png differ
diff --git a/jappixmini/jappix/img/sprites/browsers.png b/jappixmini/jappix/img/sprites/browsers.png
new file mode 100644
index 00000000..8fadb7b3
Binary files /dev/null and b/jappixmini/jappix/img/sprites/browsers.png differ
diff --git a/jappixmini/jappix/img/sprites/buttons.png b/jappixmini/jappix/img/sprites/buttons.png
new file mode 100644
index 00000000..4c32b14d
Binary files /dev/null and b/jappixmini/jappix/img/sprites/buttons.png differ
diff --git a/jappixmini/jappix/img/sprites/home.png b/jappixmini/jappix/img/sprites/home.png
new file mode 100644
index 00000000..cd3ca4a1
Binary files /dev/null and b/jappixmini/jappix/img/sprites/home.png differ
diff --git a/jappixmini/jappix/img/sprites/install.png b/jappixmini/jappix/img/sprites/install.png
new file mode 100644
index 00000000..e2f4cd26
Binary files /dev/null and b/jappixmini/jappix/img/sprites/install.png differ
diff --git a/jappixmini/jappix/img/sprites/logs.png b/jappixmini/jappix/img/sprites/logs.png
new file mode 100644
index 00000000..db99a206
Binary files /dev/null and b/jappixmini/jappix/img/sprites/logs.png differ
diff --git a/jappixmini/jappix/img/sprites/manager.png b/jappixmini/jappix/img/sprites/manager.png
new file mode 100644
index 00000000..d63a3fec
Binary files /dev/null and b/jappixmini/jappix/img/sprites/manager.png differ
diff --git a/jappixmini/jappix/img/sprites/me.png b/jappixmini/jappix/img/sprites/me.png
new file mode 100644
index 00000000..8a8bc0fb
Binary files /dev/null and b/jappixmini/jappix/img/sprites/me.png differ
diff --git a/jappixmini/jappix/img/sprites/mini.gif b/jappixmini/jappix/img/sprites/mini.gif
new file mode 100644
index 00000000..661abafc
Binary files /dev/null and b/jappixmini/jappix/img/sprites/mini.gif differ
diff --git a/jappixmini/jappix/img/sprites/mini.png b/jappixmini/jappix/img/sprites/mini.png
new file mode 100644
index 00000000..83cedc46
Binary files /dev/null and b/jappixmini/jappix/img/sprites/mini.png differ
diff --git a/jappixmini/jappix/img/sprites/mobile.png b/jappixmini/jappix/img/sprites/mobile.png
new file mode 100644
index 00000000..2e5a16ac
Binary files /dev/null and b/jappixmini/jappix/img/sprites/mobile.png differ
diff --git a/jappixmini/jappix/img/sprites/smileys.png b/jappixmini/jappix/img/sprites/smileys.png
new file mode 100644
index 00000000..1c33243d
Binary files /dev/null and b/jappixmini/jappix/img/sprites/smileys.png differ
diff --git a/jappixmini/jappix/img/sprites/talk.png b/jappixmini/jappix/img/sprites/talk.png
new file mode 100644
index 00000000..a307e19e
Binary files /dev/null and b/jappixmini/jappix/img/sprites/talk.png differ
diff --git a/jappixmini/jappix/img/sprites/welcome.png b/jappixmini/jappix/img/sprites/welcome.png
new file mode 100644
index 00000000..9044bd9c
Binary files /dev/null and b/jappixmini/jappix/img/sprites/welcome.png differ
diff --git a/jappixmini/jappix/img/wait/wait-big.gif b/jappixmini/jappix/img/wait/wait-big.gif
new file mode 100644
index 00000000..c6573207
Binary files /dev/null and b/jappixmini/jappix/img/wait/wait-big.gif differ
diff --git a/jappixmini/jappix/img/wait/wait-medium.png b/jappixmini/jappix/img/wait/wait-medium.png
new file mode 100644
index 00000000..14a5fd66
Binary files /dev/null and b/jappixmini/jappix/img/wait/wait-medium.png differ
diff --git a/jappixmini/jappix/img/wait/wait-small.gif b/jappixmini/jappix/img/wait/wait-small.gif
new file mode 100644
index 00000000..c4b5787e
Binary files /dev/null and b/jappixmini/jappix/img/wait/wait-small.gif differ
diff --git a/jappixmini/jappix/js/adhoc.js b/jappixmini/jappix/js/adhoc.js
new file mode 100644
index 00000000..499d709f
--- /dev/null
+++ b/jappixmini/jappix/js/adhoc.js
@@ -0,0 +1,85 @@
+/*
+
+Jappix - An open social platform
+These are the Ad-Hoc JS scripts for Jappix
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 11/07/11
+
+*/
+
+// Opens the adhoc popup
+function openAdHoc() {
+	// Popup HTML content
+	var html = 
+	'<div class="top">' + _e("Commands") + '</div>' + 
+	
+	'<div class="content">' + 
+		'<div class="adhoc-head"></div>' + 
+		
+		'<div class="results adhoc-results"></div>' + 
+	'</div>' + 
+	
+	'<div class="bottom">' + 
+		'<div class="wait wait-medium"></div>' + 
+		
+		'<a href="#" class="finish">' + _e("Close") + '</a>' + 
+	'</div>';
+	
+	// Create the popup
+	createPopup('adhoc', html);
+	
+	// Associate the events
+	launchAdHoc();
+	
+	return false;
+}
+
+// Quits the adhoc popup
+function closeAdHoc() {
+	// Destroy the popup
+	destroyPopup('adhoc');
+	
+	return false;
+}
+
+// Retrieves an entity adhoc command
+function retrieveAdHoc(xid) {
+	// Open the popup
+	openAdHoc();
+	
+	// Add a XID marker
+	$('#adhoc .adhoc-head').html('<b>' + getBuddyName(xid).htmlEnc() + '</b> (' + xid.htmlEnc() + ')');
+	
+	// Get the highest entity resource
+	var highest = getHighestResource(xid);
+	
+	if(highest)
+		xid = highest;
+	
+	// Start a new adhoc command
+	dataForm(xid, 'command', '', '', 'adhoc');
+	
+	return false;
+}
+
+// Starts an adhoc command on the user server
+function serverAdHoc(server) {
+	// Open the popup
+	openAdHoc();
+	
+	// Add a XID marker
+	$('#adhoc .adhoc-head').html('<b>' + server.htmlEnc() + '</b>');
+	
+	// Start a new adhoc command
+	dataForm(server, 'command', '', '', 'adhoc');
+}
+
+// Addon launcher
+function launchAdHoc() {
+	// Click event
+	$('#adhoc .bottom .finish').click(closeAdHoc);
+}
diff --git a/jappixmini/jappix/js/anonymous.js b/jappixmini/jappix/js/anonymous.js
new file mode 100644
index 00000000..af4ecb59
--- /dev/null
+++ b/jappixmini/jappix/js/anonymous.js
@@ -0,0 +1,131 @@
+/*
+
+Jappix - An open social platform
+These are the anonymous mode JS script for Jappix
+
+-------------------------------------------------
+
+License: AGPL
+Authors: Vanaryon, LinkMauve
+Last revision: 02/10/11
+
+*/
+
+// Connected to an anonymous session
+function anonymousConnected(con) {
+	logThis('Jappix (anonymous) is now connected.', 3);
+	
+	// Connected marker
+	CONNECTED = true;
+	CURRENT_SESSION = true;
+	RECONNECT_TRY = 0;
+	RECONNECT_TIMER = 0;
+	
+	// Not resumed?
+	if(!RESUME) {
+		// Create the app
+		createTalkPage();
+		
+		// Send our first presence
+		firstPresence('');
+		
+		// Set last activity stamp
+		LAST_ACTIVITY = getTimeStamp();
+		
+		// Create the new groupchat
+		checkChatCreate(generateXID(ANONYMOUS_ROOM, 'groupchat'), 'groupchat');
+		
+		// Remove some nasty elements for the anonymous mode
+		$('.tools-mucadmin, .tools-add').remove();
+	}
+	
+	// Resumed
+	else {
+		// Send again our presence
+		presenceSend();
+		
+		// Change the title
+		updateTitle();
+	}
+	
+	// Remove the waiting icon
+	removeGeneralWait();
+}
+
+// Disconnected from an anonymous session
+function anonymousDisconnected() {
+	logThis('Jappix (anonymous) is now disconnected.', 3);
+}
+
+// Logins to a anonymous account
+function anonymousLogin(server) {
+	try {
+		// We define the http binding parameters
+		oArgs = new Object();
+		
+		if(HOST_BOSH_MAIN)
+			oArgs.httpbase = HOST_BOSH_MAIN;
+		else
+			oArgs.httpbase = HOST_BOSH;
+		
+		// We create the new http-binding connection
+		con = new JSJaCHttpBindingConnection(oArgs);
+		
+		// And we handle everything that happen
+		con.registerHandler('message', handleMessage);
+		con.registerHandler('presence', handlePresence);
+		con.registerHandler('iq', handleIQ);
+		con.registerHandler('onconnect', anonymousConnected);
+		con.registerHandler('onerror', handleError);
+		con.registerHandler('ondisconnect', anonymousDisconnected);
+		
+		// We set the anonymous connection parameters
+		oArgs = new Object();
+		oArgs.domain = server;
+		oArgs.authtype = 'saslanon';
+		oArgs.resource = JAPPIX_RESOURCE + ' Anonymous (' + (new Date()).getTime() + ')';
+		oArgs.secure = true;
+		oArgs.xmllang = XML_LANG;
+		
+		// We connect !
+		con.connect(oArgs);
+		
+		// Change the page title
+		pageTitle('wait');
+	}
+	
+	catch(e) {
+		// Logs errors
+		logThis('Error while anonymous loggin in: ' + e, 1);
+		
+		// Reset Jappix
+		anonymousDisconnected();
+		
+		// Open an unknown error
+		openThisError(2);
+	}
+	
+	finally {
+		return false;
+	}
+}
+
+// Addon launcher
+function launchAnonymous() {
+	logThis('Anonymous mode detected, connecting...', 3);
+	
+	// We add the login wait div
+	showGeneralWait();
+	
+	// Get the vars
+	if(LINK_VARS['r'])
+		ANONYMOUS_ROOM = LINK_VARS['r'];
+	if(LINK_VARS['n'])
+		ANONYMOUS_NICK = LINK_VARS['n'];
+	
+	// Fire the login action
+	anonymousLogin(HOST_ANONYMOUS);
+}
+
+// Launch this addon!
+$(document).ready(launchAnonymous);
diff --git a/jappixmini/jappix/js/archives.js b/jappixmini/jappix/js/archives.js
new file mode 100644
index 00000000..e6a08029
--- /dev/null
+++ b/jappixmini/jappix/js/archives.js
@@ -0,0 +1,418 @@
+/*
+
+Jappix - An open social platform
+These are the archives functions for Jappix
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 03/03/11
+
+*/
+
+// Opens the archive tools
+function openArchives() {
+	// Popup HTML content
+	var html = 
+	'<div class="top">' + _e("Message archives") + '</div>' + 
+	
+	'<div class="content">' + 
+		'<div class="filter">' + 
+			'<select class="friend" multiple=""></select>' + 
+			
+			'<div class="date"></div>' + 
+		'</div>' + 
+		
+		'<div class="current">' + 
+			'<span class="name"></span>' + 
+			'<span class="time">' + _e("Please select a friend to view the chat history.") + '</span>' + 
+		'</div>' + 
+		
+		'<div class="logs" id="chat-content-archives"></div>' + 
+	'</div>' + 
+	
+	'<div class="bottom">' + 
+		'<div class="wait wait-medium"></div>' + 
+		
+		'<a href="#" class="finish">' + _e("Close") + '</a>' + 
+	'</div>';
+	
+	// Create the popup
+	createPopup('archives', html);
+	
+	// Associate the events
+	launchArchives();
+	
+	// Get all the buddies in our roster
+	var buddies = getAllBuddies();
+	var options = '';
+	
+	for(i in buddies) {
+		var current = buddies[i];
+		
+		// Add the current buddy
+		options += '<option value="' + encodeQuotes(current) + '">' + getBuddyName(current).htmlEnc() + '</option>';
+	}
+	
+	// Can append the buddy HTML code?
+	if(options)
+		$('#archives .filter .friend').append(options);
+	
+	return false;
+}
+
+// Closes the archive tools
+function closeArchives() {
+	// Destroy the popup
+	destroyPopup('archives');
+	
+	return false;
+}
+
+// Gets the archives list for a buddy
+function getListArchives(xid) {
+	// Reset the archives viewer
+	$('#archives .logs').empty();
+	
+	// Show the waiting icon
+	$('#archives .wait').show();
+	
+	// Apply the ID
+	var id = genID();
+	$('#archives').attr('data-session', id);
+	
+	// New IQ
+	var iq = new JSJaCIQ();
+	iq.setType('get');
+	iq.setID(id);
+	
+	var list = iq.appendNode('list', {'xmlns': NS_URN_ARCHIVE, 'with': xid});
+	var set = list.appendChild(iq.buildNode('set', {'xmlns': NS_RSM}));
+	set.appendChild(iq.buildNode('max', {'xmlns': NS_RSM}, '0'));
+	
+	con.send(iq, handleListArchives);
+	
+	logThis('Getting archives list for: ' + xid + '...');
+}
+
+// Handles the archives list for a buddy
+function handleListArchives(iq) {
+	// Hide the waiting icon
+	$('#archives .wait').hide();
+	
+	// Any error?
+	if(handleErrorReply(iq) || !exists('#archives[data-session=' + iq.getID() + ']'))
+		return;
+	
+	// Get the last archive date
+	var last = $(iq.getNode()).find('list set changed').text();
+	
+	// Any last archive?
+	if(last) {
+		// Read the date
+		var date = Date.jab2date(last);
+		
+		// Change the datepicker value
+		$('#archives .filter .date').DatePickerSetDate(date, true);
+		
+		// Retrieve the archives
+		checkChangeArchives();
+	}
+	
+	logThis('Got archives list.', 2);
+}
+
+// Gets the archives for a day
+function getDayArchives(xid, date) {
+	// Reset the archives viewer
+	$('#archives .logs').empty();
+	
+	// Show the waiting icon
+	$('#archives .wait').show();
+	
+	// Apply the ID
+	var id = genID();
+	$('#archives').attr('data-session', id);
+	
+	// New IQ
+	var iq = new JSJaCIQ();
+	iq.setType('get');
+	iq.setID(id);
+	
+	iq.appendNode('list', {'xmlns': NS_URN_ARCHIVE, 'with': xid, 'start': date + 'T00:00:00Z', 'end': date + 'T23:59:59Z'});
+	
+	con.send(iq, handleDayArchives);
+	
+	logThis('Getting day archives (' + date + ') for: ' + xid + '...');
+}
+
+// Handles the archives for a day
+function handleDayArchives(iq) {
+	// Hide the waiting icon
+	$('#archives .wait').hide();
+	
+	// Any error?
+	if(handleErrorReply(iq) || !exists('#archives[data-session=' + iq.getID() + ']'))
+		return;
+	
+	// Get each archive thread
+	$(iq.getNode()).find('chat').each(function() {
+		// Current values
+		var xid = $(this).attr('with');
+		var start = $(this).attr('start');
+		
+		if(xid && start)
+			$('#archives .logs').append('<input class="archives-pending" type="hidden" data-with="' + encodeQuotes(xid) + '" data-start="' + encodeQuotes(start) + '" />');
+	});
+	
+	// Display the day
+	var date = parseDay($('#archives .filter .date').DatePickerGetDate(true) + 'T00:00:00Z' + getDateTZO());
+	
+	// Try to get the first thread
+	var pending = '#archives input.archives-pending:first';
+	
+	if(!exists(pending))
+		date = printf(_e("Nothing found for: %s"), date);
+	
+	else {
+		retrieveArchives($(pending).attr('data-with'), $(pending).attr('data-start'));
+		$(pending).remove();
+	}
+	
+	$('#archives .current .time').text(date);
+	
+	logThis('Got day archives.', 2);
+}
+
+// Retrieves a specified archive collection
+function retrieveArchives(xid, start) {
+	// Show the waiting icon
+	$('#archives .wait').show();
+	
+	// Apply the ID
+	var id = genID();
+	$('#archives').attr('data-session', id);
+	
+	// New IQ
+	var iq = new JSJaCIQ();
+	iq.setType('get');
+	iq.setID(id);
+	
+	var list = iq.appendNode('retrieve', {'xmlns': NS_URN_ARCHIVE, 'with': xid, 'start': start});
+	
+	con.send(iq, handleRetrieveArchives);
+	
+	logThis('Retrieving archives (start: ' + start + ') for: ' + xid + '...');
+}
+
+// Handles a specified archive collection
+function handleRetrieveArchives(iq) {
+	// Hide the waiting icon
+	$('#archives .wait').hide();
+	
+	// Any error?
+	if(handleErrorReply(iq) || !exists('#archives[data-session=' + iq.getID() + ']'))
+		return;
+	
+	// Get the node
+	var chat = $(iq.getNode()).find('chat:first');
+	
+	// Get the buddy XID
+	var xid = bareXID(chat.attr('with'));
+	
+	// Get the start date & stamp
+	var start_date = Date.jab2date(chat.attr('start'));
+	var start_stamp = extractStamp(start_date);
+	
+	// Parse the result chat
+	chat.find('to, from').each(function() {
+		var node = (this).nodeName;
+		var stamp = start_stamp + parseInt($(this).attr('secs'));
+		var date = extractTime(new Date(stamp * 1000));
+		var body = $(this).find('body').text();
+		
+		// Is it my message?
+		if((node == 'to') && body)
+			displayMessage('chat', getXID(), 'archives', getBuddyName(getXID()).htmlEnc(), body, date, start_stamp, 'user-message', true, '', 'me');
+		
+		// Is it a buddy message?
+		else if((node == 'from') && body)
+			displayMessage('chat', xid, 'archives', getBuddyName(xid).htmlEnc(), body, date, start_stamp, 'user-message', true, '', 'him');
+	});
+	
+	// Not the latest thread?
+	var pending = '#archives input.archives-pending:first';
+	
+	if(exists(pending)) {
+		retrieveArchives($(pending).attr('data-with'), $(pending).attr('data-start'));
+		$(pending).remove();
+	}
+	
+	// Everything has been retrieved, get the avatars
+	else {
+		getAvatar(getXID(), 'cache', 'true', 'forget');
+		getAvatar(xid, 'cache', 'true', 'forget');
+	}
+	
+	logThis('Got archives.', 2);
+}
+
+// Gets the archiving configuration
+function getConfigArchives() {
+	// Lock the archiving options
+	$('#archiving').attr('checked', false).attr('disabled', true);
+	
+	// Get the archiving configuration
+	var iq = new JSJaCIQ();
+	iq.setType('get');
+	
+	iq.appendNode('pref', {'xmlns': NS_URN_ARCHIVE});
+	
+	con.send(iq, handleGetConfigArchives);
+}
+
+// Handles the archiving configuration
+function handleGetConfigArchives(iq) {
+	// Reset the options stuffs
+	waitOptions('archives');
+	
+	// Unlock the archiving options
+	$('#archiving').removeAttr('disabled');
+	
+	// End if not a result
+	if(!iq || (iq.getType() != 'result'))
+		return;
+	
+	// Extract the preferences from the IQ
+	var enabled = $(iq.getNode()).find('pref auto').attr('save');
+	
+	// Define the input enabling/disabling vars
+	var checked = true;
+	
+	if(enabled != 'true')
+		checked = false;
+	
+	// Apply the values
+	$('#archiving').attr('checked', checked);
+}
+
+// Configures the archiving on the server
+function configArchives(enabled) {
+	// Configure the auto element
+	var iq = new JSJaCIQ();
+	iq.setType('set');
+	
+	iq.appendNode('auto', {'xmlns': NS_URN_ARCHIVE, 'save': enabled});
+	
+	con.send(iq, handleConfigArchives);
+	
+	// Configure the default element
+	var iq = new JSJaCIQ();
+	iq.setType('set');
+	
+	var pref = iq.appendNode('pref', {'xmlns': NS_URN_ARCHIVE});
+	pref.appendChild(iq.appendNode('default', {'xmlns': NS_URN_ARCHIVE, 'otr': 'concede', 'save': 'body'}));
+	
+	con.send(iq);
+	
+	// Configure the method element
+	var iq = new JSJaCIQ();
+	iq.setType('set');
+	
+	var mType = new Array('auto', 'local', 'manual');
+	var mUse = new Array('prefer', 'concede', 'concede');
+	
+	var pref = iq.appendNode('pref', {'xmlns': NS_URN_ARCHIVE});
+	
+	for(i in mType)
+		pref.appendChild(iq.appendNode('method', {'xmlns': NS_URN_ARCHIVE, 'type': mType[i], 'use': mUse[i]}));
+	
+	con.send(iq);
+	
+	// Logger
+	logThis('Configuring archives...', 3);
+}
+
+// Handles the archives configuration
+function handleConfigArchives(iq) {
+	if(!iq || (iq.getType() != 'result'))
+		logThis('Archives not configured.', 2);
+	else
+		logThis('Archives configured.', 3);
+}
+
+// Checks if the datepicker has changed
+function checkChangeArchives() {
+	var xid = $('#archives .filter .friend').val();
+	var date = $('#archives .filter .date').DatePickerGetDate(true);
+	
+	// No XID?
+	if(!xid || !xid.length)
+		return;
+	
+	// Too many value?
+	if(xid.length > 1) {
+		$('#archives .filter .friend').val(xid[0]);
+		
+		return;
+	}
+	
+	// Get the first XID
+	xid = xid[0];
+	
+	// Get the archives
+	getDayArchives(xid, date);
+}
+
+// Update the archives with the selected XID
+function updateArchives() {
+	// Read the values
+	var xid = $('#archives .filter .friend').val();
+	var date = $('#archives .filter .date').DatePickerGetDate(true);
+	
+	// No XID?
+	if(!xid || !xid.length)
+		return;
+	
+	// Too many value?
+	if(xid.length > 1) {
+		$('#archives .filter .friend').val(xid[0]);
+		
+		return;
+	}
+	
+	// Get the first XID
+	xid = xid[0];
+	
+	// Apply the current marker
+	$('#archives .current .name').text(getBuddyName(xid));
+	$('#archives .current .time').text(parseDay(date + 'T00:00:00Z' + getDateTZO()));
+	
+	// Get the archives
+	getListArchives(xid, date);
+}
+
+// Addon launcher
+function launchArchives() {
+	// Current date
+	var current_date = explodeThis('T', getXMPPTime(), 0);
+	
+	// Datepicker
+	$('#archives .filter .date').DatePicker({
+		flat: true,
+		date: current_date,
+		current: current_date,
+		calendars: 1,
+		starts: 1,
+		onChange: checkChangeArchives
+	});
+	
+	// Click events
+	$('#archives .bottom .finish').click(function() {
+		return closeArchives();
+	});
+	
+	// Change event
+	$('#archives .filter .friend').change(updateArchives);
+}
diff --git a/jappixmini/jappix/js/audio.js b/jappixmini/jappix/js/audio.js
new file mode 100644
index 00000000..f83583a9
--- /dev/null
+++ b/jappixmini/jappix/js/audio.js
@@ -0,0 +1,46 @@
+/*
+
+Jappix - An open social platform
+These are the audio JS scripts for Jappix
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 10/08/11
+
+*/
+
+// Plays the given sound ID
+function soundPlay(num) {
+	try {
+		// Not supported!
+		if((BrowserDetect.browser == 'Explorer') && (BrowserDetect.version < 9))
+			return false;
+		
+		// If the sounds are enabled
+		if(getDB('options', 'sounds') == '1') {
+			// If the audio elements aren't yet in the DOM
+			if(!exists('#audio')) {
+				$('body').append(
+					'<div id="audio">' + 
+						'<audio id="new-chat" src="./snd/new-chat.oga" type="audio/ogg" />' + 
+						'<audio id="receive-message" src="./snd/receive-message.oga" type="audio/ogg" />' + 
+						'<audio id="notification" src="./snd/notification.oga" type="audio/ogg" />' + 
+					'</div>'
+				);
+			}
+			
+			// We play the target sound
+			var playThis = document.getElementById('audio').getElementsByTagName('audio')[num];
+			playThis.load();
+			playThis.play();
+		}
+	}
+	
+	catch(e) {}
+	
+	finally {
+		return false;
+	}
+}
diff --git a/jappixmini/jappix/js/autocompletion.js b/jappixmini/jappix/js/autocompletion.js
new file mode 100644
index 00000000..52d3c47e
--- /dev/null
+++ b/jappixmini/jappix/js/autocompletion.js
@@ -0,0 +1,99 @@
+/*
+
+Jappix - An open social platform
+These are the autocompletion tools JS script for Jappix
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 12/11/10
+
+*/
+
+// Sort an array with insensitivity to the case
+function caseInsensitiveSort(a, b) { 
+	// Put the two strings into lower case
+	a = a.toLowerCase();
+	b = b.toLowerCase();
+	
+	// Process the sort
+	if(a > b)
+		return 1;
+	if(a < b)
+		return -1;
+}
+
+// Creates an array with the autocompletion results
+function processAutocompletion(query, id) {
+	// Replace forbidden characters in regex
+	query = escapeRegex(query);
+	
+	// Create an empty array
+	var results = new Array();
+	
+	// Search in the roster
+	$('#' + id + ' .user').each(function() {
+		var nick = $(this).find('.name').text();
+		var regex = new RegExp('(^)' + query, 'gi');
+		
+		if(nick.match(regex))
+			results.push(nick);
+	});
+	
+	// Sort the array
+	results = results.sort(caseInsensitiveSort);
+	
+	// Return the results array
+	return results;
+}
+
+// Resets the autocompletion tools
+function resetAutocompletion(hash) {
+	$('#' + hash + ' .message-area').removeAttr('data-autocompletion-pointer').removeAttr('data-autocompletion-query');
+}
+
+// Autocompletes the chat input nick
+function createAutocompletion(hash) {
+	// Initialize
+	var vSelector = $('#' + hash + ' .message-area');
+	var value = vSelector.val();
+	if(!value)
+		resetAutocompletion(hash);
+	var query = vSelector.attr('data-autocompletion-query');
+	
+	// The autocompletion has not been yet launched
+	if(query == undefined) {
+		query = value;
+		vSelector.attr('data-autocompletion-query', query);
+	}
+	
+	// Get the pointer
+	var pointer = vSelector.attr('data-autocompletion-pointer');
+	var i = 0;
+	
+	if(pointer)
+		i = parseInt(pointer);
+	
+	// We get the nickname
+	var nick = processAutocompletion(query, hash)[i];
+	
+	// Shit, this is my nick!
+	if((nick != undefined) && (nick.toLowerCase() == getMUCNick(hash).toLowerCase())) {
+		// Increment
+		i++;
+		
+		// Get the next nick
+		nick = processAutocompletion(query, hash)[i];
+	}
+	
+	// We quote the nick
+	if(nick != undefined) {
+		// Increment
+		i++;
+		quoteMyNick(hash, nick);
+		
+		// Put a pointer
+		vSelector.attr('data-autocompletion-pointer', i);
+	}
+}
diff --git a/jappixmini/jappix/js/avatar.js b/jappixmini/jappix/js/avatar.js
new file mode 100644
index 00000000..4234ffc7
--- /dev/null
+++ b/jappixmini/jappix/js/avatar.js
@@ -0,0 +1,205 @@
+/*
+
+Jappix - An open social platform
+These are the avatar JS scripts for Jappix
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 01/03/11
+
+*/
+
+// Requests the avatar of a given user
+var AVATAR_PENDING = [];
+
+function getAvatar(xid, mode, enabled, photo) {
+	/* REF: http://xmpp.org/extensions/xep-0153.html */
+	
+	// No need to get the avatar, another process is yet running
+	if(existArrayValue(AVATAR_PENDING, xid))
+		return false;
+	
+	// Initialize: XML data is in one SQL entry, because some browser are sloooow with SQL requests
+	var xml = XMLFromString(getPersistent('avatar', xid));
+	var forced = false;
+	
+	// Retrieving forced?
+	if($(xml).find('forced').text() == 'true')
+		forced = true;
+	
+	// No avatar in presence
+	if(!photo && !forced && (enabled == 'true')) {
+		// Pending marker
+		AVATAR_PENDING.push(xid);
+		
+		// Reset the avatar
+		resetAvatar(xid, hex_md5(xid));
+		
+		logThis('No avatar for: ' + xid, 2);
+	}
+	
+	// Try to catch the avatar
+	else {
+		// Define some stuffs
+		var type = $(xml).find('type').text();
+		var binval = $(xml).find('binval').text();
+		var checksum = $(xml).find('checksum').text();
+		var updated = false;
+		
+		// Process the checksum of the avatar
+		if((checksum == photo) || (photo == 'forget') || forced)
+			updated = true;
+		
+		// If the avatar is yet stored and a new retrieving is not needed
+		if((mode == 'cache') && type && binval && checksum && updated) {
+			// Pending marker
+			AVATAR_PENDING.push(xid);
+			
+			// Display the cache avatar
+			displayAvatar(xid, hex_md5(xid), type, binval);
+			
+			logThis('Read avatar from cache: ' + xid, 3);
+		}
+		
+		// Else if the request has not yet been fired, we get it
+		else if((!updated || (mode == 'cache' && !updated) || (mode == 'force') || (photo = 'forget')) && (enabled != 'false')) {
+			// Pending marker
+			AVATAR_PENDING.push(xid);
+			
+			// Get the latest avatar
+			var iq = new JSJaCIQ();
+			iq.setType('get');
+			iq.setTo(xid);
+			
+			iq.appendNode('vCard', {'xmlns': NS_VCARD});
+			
+			con.send(iq, handleAvatar);
+			
+			logThis('Get avatar from server: ' + xid, 3);
+		}
+	}
+	
+	return true;
+}
+
+// Handles the avatar
+function handleAvatar(iq) {
+	// Extract the XML values
+	var handleXML = iq.getNode();
+	var handleFrom = fullXID(getStanzaFrom(iq));
+	
+	// Is this me? Remove the resource!
+	if(bareXID(handleFrom) == getXID())
+		handleFrom = bareXID(handleFrom);
+	
+	// Get some other values
+	var hash = hex_md5(handleFrom);
+	var find = $(handleXML).find('vCard');
+	var aChecksum = 'none';
+	var oChecksum = null;
+	
+	// Read our own checksum
+	if(handleFrom == getXID()) {
+		oChecksum = getDB('checksum', 1);
+		
+		// Avoid the "null" value
+		if(!oChecksum)
+			oChecksum = '';
+	}
+	
+	// vCard not empty?
+	if(find.size()) {
+		// We get our profile details
+		if(handleFrom == getXID()) {
+			// Get the names
+			var names = generateBuddyName(iq);
+			
+			// Write the values to the database
+			setDB('profile', 'name', names[0]);
+			setDB('profile', 'nick', names[1]);
+		}
+		
+		// We get the avatar
+		var aType = find.find('TYPE:first').text();
+		var aBinval = find.find('BINVAL:first').text();
+		
+		// No binval?
+		if(!aBinval) {
+			aType = 'none';
+			aBinval = 'none';
+		}
+		
+		// Enough data
+		else {
+			// No type?
+			if(!aType)
+				aType = 'image/png';
+			
+			// Process the checksum
+			else
+				aChecksum = hex_sha1(Base64.decode(aBinval));
+		}
+		
+		// We display the user avatar
+		displayAvatar(handleFrom, hash, aType, aBinval);
+		
+		// Store the avatar
+		setPersistent('avatar', handleFrom, '<avatar><type>' + aType + '</type><binval>' + aBinval + '</binval><checksum>' + aChecksum + '</checksum><forced>false</forced></avatar>');
+		
+		logThis('Avatar retrieved from server: ' + handleFrom, 3);
+	}
+	
+	// vCard is empty
+	else
+		resetAvatar(handleFrom);
+	
+	// We got a new checksum for us?
+	if(((oChecksum != null) && (oChecksum != aChecksum)) || !FIRST_PRESENCE_SENT) {
+		// Define a proper checksum
+		var pChecksum = aChecksum;
+		
+		if(pChecksum == 'none')
+			pChecksum = '';
+		
+		// Update our temp. checksum
+		setDB('checksum', 1, pChecksum);
+		
+		// Send the stanza
+		if(FIRST_PRESENCE_SENT)
+			presenceSend(pChecksum);
+		else
+			getStorage(NS_OPTIONS);
+	}
+}
+
+// Reset the avatar of an user
+function resetAvatar(xid, hash) {
+	// Store the empty avatar
+	setPersistent('avatar', xid, '<avatar><type>none</type><binval>none</binval><checksum>none</checksum><forced>false</forced></avatar>');
+	
+	// Display the empty avatar
+	displayAvatar(xid, hash, 'none', 'none');
+}
+
+// Displays the avatar of an user
+function displayAvatar(xid, hash, type, binval) {
+	// Initialize the vars
+	var container = hash + ' .avatar-container';
+	var code = '<img class="avatar" src="';
+	
+	// If the avatar exists
+	if((type != 'none') && (binval != 'none'))
+		code += 'data:' + type + ';base64,' + binval;
+	else
+		code += './img/others/default-avatar.png';
+	
+	code += '" alt="" />';
+	
+	// Replace with the new avatar (in the roster and in the chat)
+	$('.' + container).html(code);
+	
+	// We can remove the pending marker
+	removeArrayValue(AVATAR_PENDING, xid);
+}
diff --git a/jappixmini/jappix/js/base64.js b/jappixmini/jappix/js/base64.js
new file mode 100644
index 00000000..1cf2dc74
--- /dev/null
+++ b/jappixmini/jappix/js/base64.js
@@ -0,0 +1,80 @@
+// This code was written by Tyler Akins and has been placed in the
+// public domain.  It would be nice if you left this header intact.
+// Base64 code from Tyler Akins -- http://rumkin.com
+
+var Base64 = (function () {
+    var keyStr = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
+
+    var obj = {
+        /**
+         * Encodes a string in base64
+         * @param {String} input The string to encode in base64.
+         */
+        encode: function (input) {
+            var output = "";
+            var chr1, chr2, chr3;
+            var enc1, enc2, enc3, enc4;
+            var i = 0;
+        
+            do {
+                chr1 = input.charCodeAt(i++);
+                chr2 = input.charCodeAt(i++);
+                chr3 = input.charCodeAt(i++);
+                
+                enc1 = chr1 >> 2;
+                enc2 = ((chr1 & 3) << 4) | (chr2 >> 4);
+                enc3 = ((chr2 & 15) << 2) | (chr3 >> 6);
+                enc4 = chr3 & 63;
+
+                if (isNaN(chr2)) {
+                    enc3 = enc4 = 64;
+                } else if (isNaN(chr3)) {
+                    enc4 = 64;
+                }
+                
+                output = output + keyStr.charAt(enc1) + keyStr.charAt(enc2) +
+                    keyStr.charAt(enc3) + keyStr.charAt(enc4);
+            } while (i < input.length);
+            
+            return output;
+        },
+        
+        /**
+         * Decodes a base64 string.
+         * @param {String} input The string to decode.
+         */
+        decode: function (input) {
+            var output = "";
+            var chr1, chr2, chr3;
+            var enc1, enc2, enc3, enc4;
+            var i = 0;
+            
+            // remove all characters that are not A-Z, a-z, 0-9, +, /, or =
+            input = input.replace(/[^A-Za-z0-9\+\/\=]/g, "");
+            
+            do {
+                enc1 = keyStr.indexOf(input.charAt(i++));
+                enc2 = keyStr.indexOf(input.charAt(i++));
+                enc3 = keyStr.indexOf(input.charAt(i++));
+                enc4 = keyStr.indexOf(input.charAt(i++));
+                
+                chr1 = (enc1 << 2) | (enc2 >> 4);
+                chr2 = ((enc2 & 15) << 4) | (enc3 >> 2);
+                chr3 = ((enc3 & 3) << 6) | enc4;
+                
+                output = output + String.fromCharCode(chr1);
+                
+                if (enc3 != 64) {
+                    output = output + String.fromCharCode(chr2);
+                }
+                if (enc4 != 64) {
+                    output = output + String.fromCharCode(chr3);
+                }
+            } while (i < input.length);
+            
+            return output;
+        }
+    };
+
+    return obj;
+})();
diff --git a/jappixmini/jappix/js/board.js b/jappixmini/jappix/js/board.js
new file mode 100644
index 00000000..1d26acee
--- /dev/null
+++ b/jappixmini/jappix/js/board.js
@@ -0,0 +1,141 @@
+/*
+
+Jappix - An open social platform
+These are the notification board JS script for Jappix
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 12/03/11
+
+*/
+
+// Creates a board panel
+function createBoard(type, id) {
+	// Text var
+	var text = '';
+	
+	// Info
+	if(type == 'info') {
+		switch(id) {
+			// Password change
+			case 1:
+				text = _e("Your password has been changed, now you can connect to your account with your new login data.");
+				
+				break;
+			
+			// Account deletion
+			case 2:
+				text = _e("Your XMPP account has been removed, bye!");
+				
+				break;
+			
+			// Account logout
+			case 3:
+				text = _e("You have been logged out of your XMPP account, have a nice day!");
+				
+				break;
+			
+			// Groupchat join
+			case 4:
+				text = _e("The room you joined seems not to exist. You should create it!");
+				
+				break;
+			
+			// Groupchat removal
+			case 5:
+				text = _e("The groupchat has been removed, now someone else will be able to recreate it.");
+				
+				break;
+			
+			// Non-existant groupchat user
+			case 6:
+				text = _e("The user that you want to reach is not present in the room.");
+				
+				break;
+		}
+	}
+	
+	// Error
+	else {
+		switch(id) {
+			// Custom error
+			case 1:
+				text = '<b>' + _e("Error") + '</b> &raquo; <span></span>';
+				
+				break;
+			
+			// Network error
+			case 2:
+				text = _e("Jappix has been interrupted by a network issue, a bug or bad login (check that you entered the right credentials), sorry for the inconvenience.");
+				
+				break;
+			
+			// List retrieving error
+			case 3:
+				text = _e("The element list on this server could not be obtained!");
+				
+				break;
+			
+			// Attaching error
+			case 4:
+				text = printf(_e("An error occured while uploading your file: maybe it is too big (%s maximum) or forbidden!"), JAPPIX_MAX_UPLOAD);
+				
+				break;
+		}
+	}
+	
+	// No text?
+	if(!text)
+		return false;
+	
+	// Append the content
+	$('#board').append('<div class="one-board ' + type + '" data-id="' + id + '">' + text + '</div>');
+	
+	// Events (click and auto-hide)
+	$('#board .one-board.' + type + '[data-id=' + id + ']')
+	
+	.click(function() {
+		closeThisBoard(this);
+	})
+	
+	.oneTime('5s', function() {
+		closeThisBoard(this);
+	})
+	
+	.slideDown();
+	
+	return true;
+}
+
+// Destroys the existing board notifications
+function destroyBoard() {
+	$('#board').empty();
+}
+
+// Executes a given action on the notification board
+function actionBoard(id, type) {
+	// In a first, we destroy other boards
+	destroyBoard();
+	
+	// Then we display the board
+	createBoard(type, id);
+}
+
+// Opens a given error ID
+function openThisError(id) {
+	actionBoard(id, 'error');
+}
+
+// Opens a given info ID
+function openThisInfo(id) {
+	actionBoard(id, 'info');
+}
+
+// Closes a given board
+function closeThisBoard(board) {
+	$(board).slideUp('normal', function() {
+		$(this).remove();
+	});
+}
diff --git a/jappixmini/jappix/js/browser-detect.js b/jappixmini/jappix/js/browser-detect.js
new file mode 100644
index 00000000..39edaf2b
--- /dev/null
+++ b/jappixmini/jappix/js/browser-detect.js
@@ -0,0 +1,124 @@
+/* BROWSER DETECT
+ * http://www.quirksmode.org/js/detect.html
+ */
+
+var BrowserDetect = {
+	init: function () {
+		this.browser = this.searchString(this.dataBrowser) || "An unknown browser";
+		this.version = this.searchVersion(navigator.userAgent)
+			|| this.searchVersion(navigator.appVersion)
+			|| "an unknown version";
+		this.OS = this.searchString(this.dataOS) || "an unknown OS";
+	},
+	
+	searchString: function (data) {
+		for (var i=0;i<data.length;i++)	{
+			var dataString = data[i].string;
+			var dataProp = data[i].prop;
+			this.versionSearchString = data[i].versionSearch || data[i].identity;
+			if (dataString) {
+				if (dataString.indexOf(data[i].subString) != -1)
+					return data[i].identity;
+			}
+			else if (dataProp)
+				return data[i].identity;
+		}
+	},
+	
+	searchVersion: function (dataString) {
+		var index = dataString.indexOf(this.versionSearchString);
+		if (index == -1) return;
+		return parseFloat(dataString.substring(index+this.versionSearchString.length+1));
+	},
+	
+	dataBrowser: [
+		{
+			string: navigator.userAgent,
+			subString: "Chrome",
+			identity: "Chrome"
+		},
+		{ 	string: navigator.userAgent,
+			subString: "OmniWeb",
+			versionSearch: "OmniWeb/",
+			identity: "OmniWeb"
+		},
+		{
+			string: navigator.vendor,
+			subString: "Apple",
+			identity: "Safari",
+			versionSearch: "Version"
+		},
+		{
+			prop: window.opera,
+			identity: "Opera"
+		},
+		{
+			string: navigator.vendor,
+			subString: "iCab",
+			identity: "iCab"
+		},
+		{
+			string: navigator.vendor,
+			subString: "KDE",
+			identity: "Konqueror"
+		},
+		{
+			string: navigator.userAgent,
+			subString: "Firefox",
+			identity: "Firefox"
+		},
+		{
+			string: navigator.vendor,
+			subString: "Camino",
+			identity: "Camino"
+		},
+		{		// for newer Netscapes (6+)
+			string: navigator.userAgent,
+			subString: "Netscape",
+			identity: "Netscape"
+		},
+		{
+			string: navigator.userAgent,
+			subString: "MSIE",
+			identity: "Explorer",
+			versionSearch: "MSIE"
+		},
+		{
+			string: navigator.userAgent,
+			subString: "Gecko",
+			identity: "Mozilla",
+			versionSearch: "rv"
+		},
+		{ 		// for older Netscapes (4-)
+			string: navigator.userAgent,
+			subString: "Mozilla",
+			identity: "Netscape",
+			versionSearch: "Mozilla"
+		}
+	],
+	
+	dataOS : [
+		{
+			string: navigator.platform,
+			subString: "Win",
+			identity: "Windows"
+		},
+		{
+			string: navigator.platform,
+			subString: "Mac",
+			identity: "Mac"
+		},
+		{
+			   string: navigator.userAgent,
+			   subString: "iPhone",
+			   identity: "iPhone/iPod"
+	    },
+		{
+			string: navigator.platform,
+			subString: "Linux",
+			identity: "Linux"
+		}
+	]
+};
+
+BrowserDetect.init();
diff --git a/jappixmini/jappix/js/bubble.js b/jappixmini/jappix/js/bubble.js
new file mode 100644
index 00000000..9006f645
--- /dev/null
+++ b/jappixmini/jappix/js/bubble.js
@@ -0,0 +1,59 @@
+/*
+
+Jappix - An open social platform
+These are the bubble JS scripts for Jappix
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 11/12/10
+
+*/
+
+// Closes all the opened bubbles
+function closeBubbles() {
+	// Destroy all the elements
+	$('.bubble.hidable:visible').hide();
+	$('.bubble.removable').remove();
+	$('body').die('click');
+	
+	return false;
+}
+
+// Click function when a bubble is opened
+function showBubble(selector) {
+	// Hidable bubbles special things
+	if($(selector).is('.hidable')) {
+		// This bubble is yet displayed? So abort!
+		if($(selector).is(':visible'))
+			return closeBubbles();
+		
+		// Close all the bubbles
+		closeBubbles();
+		
+		// Show the requested bubble
+		$(selector).show();
+	}
+	
+	// Removable bubbles special things
+	else {
+		// This bubble is yet added? So abort!
+		if(exists(selector))
+			return closeBubbles();
+		
+		// Close all the bubbles
+		closeBubbles();
+	}
+	
+	// Creates a new click event to close the bubble
+	$('body').live('click', function(evt) {
+		var target = evt.target;
+		
+		// If this is a click away from a bubble
+		if(!$(target).parents('.ibubble').size())
+			closeBubbles();
+	});
+	
+	return false;
+}
diff --git a/jappixmini/jappix/js/caps.js b/jappixmini/jappix/js/caps.js
new file mode 100644
index 00000000..d33949c4
--- /dev/null
+++ b/jappixmini/jappix/js/caps.js
@@ -0,0 +1,349 @@
+/*
+
+Jappix - An open social platform
+These are the CAPS JS script for Jappix
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 26/08/11
+
+*/
+
+// Returns an array of the Jappix disco#infos
+function myDiscoInfos() {
+	var fArray = new Array(
+		NS_MUC,
+		NS_MUC_USER,
+		NS_MUC_ADMIN,
+		NS_MUC_OWNER,
+		NS_MUC_CONFIG,
+		NS_DISCO_INFO,
+		NS_DISCO_ITEMS,
+		NS_PUBSUB_RI,
+		NS_BOSH,
+		NS_CAPS,
+		NS_MOOD,
+		NS_ACTIVITY,
+		NS_TUNE,
+		NS_GEOLOC,
+		NS_NICK,
+		NS_URN_ADATA,
+		NS_URN_AMETA,
+		NS_URN_MBLOG,
+		NS_URN_INBOX,
+		NS_MOOD + NS_NOTIFY,
+		NS_ACTIVITY + NS_NOTIFY,
+		NS_TUNE + NS_NOTIFY,
+		NS_GEOLOC + NS_NOTIFY,
+		NS_URN_MBLOG + NS_NOTIFY,
+		NS_URN_INBOX + NS_NOTIFY,
+		NS_URN_DELAY,
+		NS_ROSTER,
+		NS_ROSTERX,
+		NS_HTTP_AUTH,
+		NS_CHATSTATES,
+		NS_XHTML_IM,
+		NS_IPV6,
+		NS_LAST,
+		NS_PRIVATE,
+		NS_REGISTER,
+		NS_SEARCH,
+		NS_COMMANDS,
+		NS_VERSION,
+		NS_XDATA,
+		NS_VCARD,
+		NS_URN_TIME,
+		NS_URN_PING,
+		NS_URN_ARCHIVE,
+		NS_URN_AR_PREF,
+		NS_URN_RECEIPTS,
+		NS_PRIVACY,
+		NS_IQOOB,
+		NS_XOOB
+	);
+	
+	return fArray;
+}
+
+// Gets the disco#infos of an entity
+function getDiscoInfos(to, caps) {
+	// No CAPS
+	if(!caps) {
+		logThis('No CAPS: ' + to, 2);
+		
+		displayDiscoInfos(to, '');
+		
+		return false;
+	}
+	
+	// Get the stored disco infos
+	var xml = XMLFromString(getPersistent('caps', caps));
+	
+	// Yet stored
+	if(xml) {
+		logThis('CAPS from cache: ' + to, 3);
+		
+		displayDiscoInfos(to, xml);
+		
+		return true;
+	}
+	
+	logThis('CAPS from the network: ' + to, 3);
+	
+	// Not stored: get the disco#infos
+	var iq = new JSJaCIQ();
+	
+	iq.setTo(to);
+	iq.setType('get');
+	iq.setQuery(NS_DISCO_INFO);
+	
+	con.send(iq, handleDiscoInfos);
+	
+	return true;
+}
+
+// Handles the disco#infos of an entity
+function handleDiscoInfos(iq) {
+	if(!iq || (iq.getType() == 'error'))
+		return;
+	
+	// IQ received, get some values
+	var from = fullXID(getStanzaFrom(iq));
+	var query = iq.getQuery();
+	
+	// Generate the CAPS-processing values
+	var identities = new Array();
+	var features = new Array();
+	var data_forms = new Array();
+	
+	// Identity values
+	$(query).find('identity').each(function() {
+		var pCategory = $(this).attr('category');
+		var pType = $(this).attr('type');
+		var pLang = $(this).attr('xml:lang');
+		var pName = $(this).attr('name');
+		
+		if(!pCategory)
+			pCategory = '';
+		if(!pType)
+			pType = '';
+		if(!pLang)
+			pLang = '';
+		if(!pName)
+			pName = '';
+		
+		identities.push(pCategory + '/' + pType + '/' + pLang + '/' + pName);
+	});
+	
+	// Feature values
+	$(query).find('feature').each(function() {
+		var pVar = $(this).attr('var');
+		
+		// Add the current value to the array
+		if(pVar)
+			features.push(pVar);
+	});
+	
+	// Data-form values
+	$(query).find('x[xmlns=' + NS_XDATA + ']').each(function() {
+		// Initialize some stuffs
+		var pString = '';
+		var sortVar = new Array();
+		
+		// Add the form type field
+		$(this).find('field[var=FORM_TYPE] value').each(function() {
+			var cText = $(this).text();
+			
+			if(cText)
+				pString += cText + '<';
+		});
+		
+		// Add the var attributes into an array
+		$(this).find('field:not([var=FORM_TYPE])').each(function() {
+			var cVar = $(this).attr('var');
+			
+			if(cVar)
+				sortVar.push(cVar);
+		});
+		
+		// Sort the var attributes
+		sortVar = sortVar.sort();
+		
+		// Loop this sorted var attributes
+		for(i in sortVar) {
+			// Initialize the value sorting
+			var sortVal = new Array();
+			
+			// Append it to the string
+			pString += sortVar[i] + '<';
+			
+			// Add each value to the array
+			$(this).find('field[var=' + sortVar[i] + '] value').each(function() {
+				sortVal.push($(this).text());
+			});
+			
+			// Sort the values
+			sortVal = sortVal.sort();
+			
+			// Append the values to the string
+			for(j in sortVal)
+				pString += sortVal[j] + '<';
+		}
+		
+		// Any string?
+		if(pString) {
+			// Remove the undesired double '<' from the string
+			if(pString.match(/(.+)(<)+$/))
+				pString = pString.substring(0, pString.length - 1);
+			
+			// Add the current string to the array
+			data_forms.push(pString);
+		}
+	});
+	
+	// Process the CAPS
+	var caps = processCaps(identities, features, data_forms);
+	
+	// Get the XML string
+	var xml = xmlToString(query);
+	
+	// Store the disco infos
+	setPersistent('caps', caps, xml);
+	
+	// This is our server
+	if(from == getServer()) {
+		// Handle the features
+		handleFeatures(xml);
+		
+		logThis('Got our server CAPS', 3);
+	}
+	
+	else {
+		// Display the disco infos
+		displayDiscoInfos(from, xml);
+		
+		logThis('Got CAPS: ' + from, 3);
+	}
+}
+
+// Displays the disco#infos everywhere needed for an entity
+function displayDiscoInfos(from, xml) {
+	// Generate the chat path
+	var xid = bareXID(from);
+	
+	// This comes from a private groupchat chat?
+	if(isPrivate(xid))
+		xid = from;
+	
+	hash = hex_md5(xid);
+	
+	// Support indicators
+	var xhtml_im = false;
+	var iq_oob = false;
+	var x_oob = false;
+	var receipts = false;
+	
+	// Display the supported features
+	$(xml).find('feature').each(function() {
+		var current = $(this).attr('var');
+		
+		// xHTML-IM
+		if(current == NS_XHTML_IM)
+			xhtml_im = true;
+		
+		// Out of Band Data (IQ)
+		if(current == NS_IQOOB)
+			iq_oob = true;
+		
+		// Out of Band Data (X)
+		if(current == NS_XOOB)
+			x_oob = true;
+		
+		// Receipts
+		else if(current == NS_URN_RECEIPTS)
+			receipts = true;
+	});
+	
+	// Paths
+	var path = $('#' + hash);
+	var message_area = path.find('.message-area');
+	var style = path.find('.chat-tools-style');
+	var file = path.find('.chat-tools-file');
+	
+	// Apply xHTML-IM
+	if(xhtml_im)
+		style.show();
+	else {
+		// Remove the tooltip elements
+		style.hide();
+		style.find('.bubble-style').remove();
+		
+		// Reset the markers
+		message_area.removeAttr('style')
+			    .removeAttr('data-color')
+			    .removeAttr('data-bold')
+			    .removeAttr('data-italic')
+			    .removeAttr('data-underline');
+	}
+	
+	// Apply Out of Band Data
+	if(iq_oob || x_oob) {
+		file.show();
+		
+		// Set a marker
+		if(iq_oob)
+			file.attr('data-oob', 'iq');
+		else
+			file.attr('data-oob', 'x');
+	}
+	
+	else {
+		// Remove the tooltip elements
+		file.hide();
+		file.find('.bubble-style').remove();
+		
+		// Reset the marker
+		file.removeAttr('data-oob');
+	}
+	
+	// Apply receipts
+	if(receipts)
+		message_area.attr('data-receipts', 'true');
+	else
+		message_area.removeAttr('data-receipts');
+}
+
+// Generates the CAPS hash
+function processCaps(cIdentities, cFeatures, cDataForms) {
+	// Initialize
+	var cString = '';
+	
+	// Sort the arrays
+	cIdentities = cIdentities.sort();
+	cFeatures = cFeatures.sort();
+	cDataForms = cDataForms.sort();
+	
+	// Process the sorted identity string
+	for(a in cIdentities)
+		cString += cIdentities[a] + '<';
+	
+	// Process the sorted feature string
+	for(b in cFeatures)
+		cString += cFeatures[b] + '<';
+	
+	// Process the sorted data-form string
+	for(c in cDataForms)
+		cString += cDataForms[c] + '<';
+	
+	// Process the SHA-1 hash
+	var cHash = b64_sha1(cString);
+	
+	return cHash;
+}
+
+// Generates the Jappix CAPS hash
+function myCaps() {
+	return processCaps(new Array('client/web//Jappix'), myDiscoInfos(), new Array());
+}
diff --git a/jappixmini/jappix/js/chat.js b/jappixmini/jappix/js/chat.js
new file mode 100644
index 00000000..c67bfac7
--- /dev/null
+++ b/jappixmini/jappix/js/chat.js
@@ -0,0 +1,297 @@
+/*
+
+Jappix - An open social platform
+These are the chat JS scripts for Jappix
+
+-------------------------------------------------
+
+License: AGPL
+Authors: Vanaryon, Eric
+Last revision: 16/10/11
+
+*/
+
+// Correctly opens a new chat
+function checkChatCreate(xid, type, nickname, password, title) {
+	// No XID?
+	if(!xid)
+		return false;
+	
+	// We generate some stuffs
+	var hash = hex_md5(xid);
+	var name;
+	
+	// Gets the name of the user/title of the room
+	if(title)
+		name = title;
+	
+	else {
+		// Private groupchat chat
+		if(type == 'private')
+			name = thisResource(xid);
+		
+		// XMPP-ID
+		else if(xid.indexOf('@') != -1)
+			name = getBuddyName(xid);
+		
+		// Gateway
+		else
+			name = xid;
+	}
+	
+	// If the target div does not exist
+	if(!exists('#' + hash)) {
+		// We check the type of the chat to open
+		if((type == 'chat') || (type == 'private'))
+			chatCreate(hash, xid, name, type);
+		
+		else if(type == 'groupchat') {
+			// Try to read the room stored configuration
+			if(!isAnonymous() && (!nickname || !password || !title)) {
+				// Catch the room data
+				var fData = $(XMLFromString(getDB('favorites', xid)));
+				var fNick = fData.find('nick').text();
+				var fPwd = fData.find('password').text();
+				var fName = fData.find('name').text();
+				
+				// Apply the room data
+				if(!nickname && fNick)
+					nickname = fNick;
+				if(!password && fPwd)
+					password = fPwd;
+				if(!title && fName)
+					name = fName;
+			}
+			
+			groupchatCreate(hash, xid, name, nickname, password);
+		}
+	}
+	
+	// Switch to the newly-created chat
+	switchChan(hash);
+	
+	return false;
+}
+
+// Generates the chat DOM elements
+function generateChat(type, id, xid, nick) {
+	// Generate some stuffs
+	var path = '#' + id + ' .';
+	var escaped_xid = escape(xid);
+	
+	// Special code
+	var specialAttributes, specialAvatar, specialName, specialCode, specialLink, specialDisabled, specialStyle;
+	
+	// Groupchat special code
+	if(type == 'groupchat') {
+		specialAttributes = ' data-type="groupchat"';
+		specialAvatar = '';
+		specialName = '<p class="bc-infos"><b>' + _e("Subject") + '</b> <span class="muc-topic">' + _e("no subject defined for this room.") + '</span></p>';
+		specialCode = '<div class="content groupchat-content" id="chat-content-' + id + '"></div><div class="list"><div class="moderator role"><p class="title">' + _e("Moderators") + '</p></div><div class="participant role"><p class="title">' + _e("Participants") + '</p></div><div class="visitor role"><p class="title">' + _e("Visitors") + '</p></div><div class="none role"><p class="title">' + _e("Others") + '</p></div></div>';
+		specialLink = '<a href="#" class="tools-mucadmin tools-tooltip talk-images chat-tools-content" title="' + _e("Administration panel for this room") + '"></a>';
+		specialStyle = '';
+		
+		// Is this a gateway?
+		if(xid.match(/%/))
+			specialDisabled = '';
+		else
+			specialDisabled = ' disabled=""';
+	}
+	
+	// Chat (or other things?!) special code
+	else {
+		specialAttributes = ' data-type="chat"';
+		specialAvatar = '<div class="avatar-container"><img class="avatar" src="' + './img/others/default-avatar.png' + '" alt="" /></div>';
+		specialName = '<div class="bc-pep"></div><p class="bc-infos"><span class="unavailable show talk-images"></span></p>';
+		specialCode = '<div class="content" id="chat-content-' + id + '"></div>';
+		specialLink = '<a href="#" class="tools-archives tools-tooltip talk-images chat-tools-content" title="' + _e("View chat history") + '"></a><a href="#" class="tools-infos tools-tooltip talk-images chat-tools-content" title="' + _e("Show user profile") + '"></a>';
+		specialStyle = ' style="display: none;"';
+		specialDisabled = '';
+	}
+	
+	// Not a groupchat private chat, we can use the buddy add icon
+	if((type == 'chat') || (type == 'groupchat')) {
+		var addTitle;
+		
+		if(type == 'chat')
+			addTitle = _e("Add this contact to your friends");
+		else
+			addTitle = _e("Add this groupchat to your favorites");
+		
+		specialLink += '<a href="#" class="tools-add tools-tooltip talk-images chat-tools-content" title="' + addTitle + '"></a>';
+	}
+	
+	// IE DOM parsing bug fix
+	var specialStylePicker = '<div class="chat-tools-content chat-tools-style"' + specialStyle + '>' + 
+					'<a href="#" class="tools-style tools-tooltip talk-images"></a>' + 
+				 '</div>';
+	
+	if((BrowserDetect.browser == 'Explorer') && (BrowserDetect.version < 9))
+		specialStylePicker = '';
+	
+	// Append the chat HTML code
+	$('#page-engine').append(
+		'<div id="' + id + '" class="page-engine-chan chat one-counter"' + specialAttributes + ' data-xid="' + escaped_xid + '">' + 
+			'<div class="top ' + id + '">' + 
+				specialAvatar + 
+				
+				'<div class="name">' + 
+					'<p class="bc-name bc-name-nick">' + nick.htmlEnc() + '</p>' + 
+					specialName + 
+				'</div>' + 
+			'</div>' + 
+			
+			specialCode + 
+			
+			'<div class="text">' + 
+				'<div class="footer">' + 
+					'<div class="chat-tools-content chat-tools-smileys">' + 
+						'<a href="#" class="tools-smileys tools-tooltip talk-images"></a>' + 
+					'</div>' + 
+					
+					specialStylePicker + 
+					
+					'<div class="chat-tools-content chat-tools-file">' + 
+						'<a href="#" class="tools-file tools-tooltip talk-images"></a>' + 
+					'</div>' + 
+					
+					'<div class="chat-tools-content chat-tools-save">' + 
+						'<a href="#" class="tools-save tools-tooltip talk-images"></a>' + 
+					'</div>' + 
+					
+					'<a href="#" class="tools-clear tools-tooltip talk-images chat-tools-content" title="' + _e("Clean current chat") + '"></a>' + 
+					
+					specialLink + 
+				'</div>' + 
+				
+				'<div class="compose">' + 
+					'<textarea class="message-area focusable" ' + specialDisabled + ' data-to="' + escaped_xid + '" /></textarea>' + 
+				'</div>' + 
+			'</div>' + 
+		'</div>'
+	);
+	
+	// Click event: chat cleaner
+	$(path + 'tools-clear').click(function() {
+		cleanChat(id);
+	});
+	
+	// Click event: user-infos
+	$(path + 'tools-infos').click(function() {
+		openUserInfos(xid);
+	});
+}
+
+// Generates the chat switch elements
+function generateSwitch(type, id, xid, nick) {
+	// Path to the element
+	var chat_switch = '#page-switch .';
+	
+	// Special code
+	var specialClass = ' unavailable';
+	var show_close = true;
+	
+	// Groupchat
+	if(type == 'groupchat') {
+		specialClass = ' groupchat-default';
+		
+		if(isAnonymous() && (xid == generateXID(ANONYMOUS_ROOM, 'groupchat')))
+			show_close = false;
+	}
+	
+	// Generate the HTML code
+	var html = '<div class="' + id + ' switcher chan" onclick="return switchChan(\'' + encodeOnclick(id) + '\')">' + 
+			'<div class="icon talk-images' + specialClass + '"></div>' + 
+			
+			'<div class="name">' + nick.htmlEnc() + '</div>';
+	
+	// Show the close button if not MUC and not anonymous
+	if(show_close)
+		html += '<div class="exit" title="' + _e("Close this tab") + '" onclick="return quitThisChat(\'' + encodeOnclick(xid) + '\', \'' + encodeOnclick(id) + '\', \'' + encodeOnclick(type) + '\');">x</div>';
+	
+	// Close the HTML
+	html += '</div>';
+	
+	// Append the HTML code
+	$(chat_switch + 'chans, ' + chat_switch + 'more-content').append(html);
+}
+
+// Cleans given the chat lines
+function cleanChat(chat) {
+	$('#page-engine #' + chat + ' .content .one-group').remove();
+	
+	$(document).oneTime(10, function() {
+		$('#page-engine #' + chat + ' .text .message-area').focus();
+	});
+}
+
+// Creates a new chat
+function chatCreate(hash, xid, nick, type) {
+	logThis('New chat: ' + xid, 3);
+	
+	// Create the chat content
+	generateChat(type, hash, xid, nick);
+	
+	// Create the chat switcher
+	generateSwitch(type, hash, xid, nick);
+	
+	// If the user is not in our buddy-list
+	if(type == 'chat') {
+		// Add button
+		if(!exists('#buddy-list .buddy[data-xid=' + escape(xid) + ']'))
+			$('#' + hash + ' .tools-add').click(function() {
+				// Hide the icon (to tell the user all is okay)
+				$(this).hide();
+				
+				// Send the subscribe request
+				addThisContact(xid, nick);
+			}).show();
+		
+		// Archives button
+		else if(enabledArchives() || enabledArchives('auto') || enabledArchives('manual') || enabledArchives('manage'))
+			$('#' + hash + ' .tools-archives').click(function() {
+				// Open the archives popup
+				openArchives();
+				
+				// Get the archives for this user
+				$('#archives .filter .friend').val(xid);
+				updateArchives();
+			}).show();
+	}
+	
+	// We catch the user's informations (like this avatar, vcard, and so on...)
+	getUserInfos(hash, xid, nick, type);
+	
+	// The icons-hover functions
+	tooltipIcons(xid, hash);
+	
+	// The event handlers
+	var inputDetect = $('#page-engine #' + hash + ' .message-area');
+	
+	inputDetect.focus(function() {
+		chanCleanNotify(hash);
+	})
+	
+	inputDetect.keypress(function(e) {
+		// Enter key
+		if(e.keyCode == 13) {
+			// Add a new line
+			if(e.shiftKey)
+				inputDetect.val(inputDetect.val() + '\n');
+			
+			// Send the message
+			else {
+				// Send the message
+				sendMessage(hash, 'chat');
+				
+				// Reset the composing database entry
+				setDB('chatstate', xid, 'off');
+			}
+			
+			return false;
+		}
+	});
+	
+	// Chatstate events
+	eventsChatState(inputDetect, xid, hash);
+}
diff --git a/jappixmini/jappix/js/chatstate.js b/jappixmini/jappix/js/chatstate.js
new file mode 100644
index 00000000..de7e7966
--- /dev/null
+++ b/jappixmini/jappix/js/chatstate.js
@@ -0,0 +1,174 @@
+/*
+
+Jappix - An open social platform
+These are the chatstate JS script for Jappix
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 25/08/11
+
+*/
+
+// Sends a given chatstate to a given entity
+function chatStateSend(state, xid, hash) {
+	var user_type = $('#' + hash).attr('data-type');
+	
+	// If the friend client supports chatstates and is online
+	if((user_type == 'groupchat') || ((user_type == 'chat') && $('#' + hash + ' .message-area').attr('data-chatstates') && !exists('#page-switch .' + hash + ' .unavailable'))) {
+		// Already sent?
+		if(getDB('currentchatstate', xid) == state)
+			return;
+		
+		// Write the state
+		setDB('currentchatstate', xid, state);
+		
+		// New message stanza
+		var aMsg = new JSJaCMessage();
+		aMsg.setTo(xid);
+		aMsg.setType(user_type);
+		
+		// Append the chatstate node
+		aMsg.appendNode(state, {'xmlns': NS_CHATSTATES});
+		
+		// Send this!
+		con.send(aMsg);
+	}
+}
+
+// Displays a given chatstate in a given chat
+function displayChatState(state, hash, type) {
+	// Groupchat?
+	if(type == 'groupchat') {
+		resetChatState(hash, type);
+		
+		// "gone" state not allowed
+		if(state != 'gone')
+			$('#page-engine .page-engine-chan .user.' + hash).addClass(state);
+	}
+	
+	// Chat
+	else {
+		// We change the buddy name color in the page-switch
+		resetChatState(hash, type);
+		$('#page-switch .' + hash + ' .name').addClass(state);
+		
+		// We generate the chatstate text
+		var text = '';
+		
+		switch(state) {
+			// Active
+			case 'active':
+				text = _e("Your friend is paying attention to the conversation.");
+				
+				break;
+			
+			// Composing
+			case 'composing':
+				text = _e("Your friend is writing a message...");
+				
+				break;
+			
+			// Paused
+			case 'paused':
+				text = _e("Your friend stopped writing a message.");
+				
+				break;
+			
+			// Inactive
+			case 'inactive':
+				text = _e("Your friend is doing something else.");
+				
+				break;
+			
+			// Gone
+			case 'gone':
+				text = _e("Your friend closed the chat.");
+				
+				break;
+		}
+		
+		// We reset the previous state
+		$('#' + hash + ' .chatstate').remove();
+		
+		// We create the chatstate
+		$('#' + hash + ' .content').after('<div class="' + state + ' chatstate">' + text + '</div>');
+	}
+}
+
+// Resets the chatstate switcher marker
+function resetChatState(hash, type) {
+	// Define the selector
+	var selector;
+	
+	if(type == 'groupchat')
+		selector = $('#page-engine .page-engine-chan .user.' + hash);
+	else
+		selector = $('#page-switch .' + hash + ' .name');
+	
+	// Reset!
+	selector.removeClass('active')
+	selector.removeClass('composing')
+	selector.removeClass('paused')
+	selector.removeClass('inactive')
+	selector.removeClass('gone');
+}
+
+// Adds the chatstate events
+function eventsChatState(target, xid, hash) {
+	target.keyup(function(e) {
+		if(e.keyCode != 13) {
+			// Composing a message
+			if($(this).val() && (getDB('chatstate', xid) != 'on')) {
+				// We change the state detect input
+				setDB('chatstate', xid, 'on');
+				
+				// We send the friend a "composing" chatstate
+				chatStateSend('composing', xid, hash);
+			}
+			
+			// Stopped composing a message
+			else if(!$(this).val() && (getDB('chatstate', xid) == 'on')) {
+				// We change the state detect input
+				setDB('chatstate', xid, 'off');
+				
+				// We send the friend an "active" chatstate
+				chatStateSend('active', xid, hash);
+			}
+		}
+	});
+	
+	target.change(function() {
+		// Reset the composing database entry
+		setDB('chatstate', xid, 'off');
+	});
+	
+	target.focus(function() {
+		// Not needed
+		if(target.is(':disabled'))
+			return;
+		
+		// Nothing in the input, user is active
+		if(!$(this).val())
+			chatStateSend('active', xid, hash);
+		
+		// Something was written, user started writing again
+		else
+			chatStateSend('composing', xid, hash);
+	});
+	
+	target.blur(function() {
+		// Not needed
+		if(target.is(':disabled'))
+			return;
+		
+		// Nothing in the input, user is inactive
+		if(!$(this).val())
+			chatStateSend('inactive', xid, hash);
+		
+		// Something was written, user paused
+		else
+			chatStateSend('paused', xid, hash);
+	});
+}
diff --git a/jappixmini/jappix/js/common.js b/jappixmini/jappix/js/common.js
new file mode 100644
index 00000000..ab10d6e7
--- /dev/null
+++ b/jappixmini/jappix/js/common.js
@@ -0,0 +1,311 @@
+/*
+
+Jappix - An open social platform
+These are the common JS script for Jappix
+
+-------------------------------------------------
+
+License: AGPL
+Authors: Vanaryon, olivierm
+Last revision: 24/06/11
+
+*/
+
+// Checks if an element exists in the DOM
+function exists(selector) {
+	if(jQuery(selector).size() > 0)
+		return true;
+	else
+		return false;
+}
+
+// Checks if Jappix is connected
+function isConnected() {
+	if((typeof con != 'undefined') && con && con.connected())
+		return true;
+	
+	return false;
+}
+
+// Checks if Jappix has focus
+function isFocused() {
+	try {
+		if(document.hasFocus())
+			return true;
+		
+		return false;
+	}
+	
+	catch(e) {
+		return true;
+	}
+}
+
+// Generates the good XID
+function generateXID(xid, type) {
+	// XID needs to be transformed
+	if(xid && (xid.indexOf('@') == -1)) {
+		// Groupchat
+		if(type == 'groupchat')
+			return xid + '@' + HOST_MUC;
+		
+		// One-to-one chat
+		if(xid.indexOf('.') == -1)
+			return xid + '@' + HOST_MAIN;
+		
+		// It might be a gateway?
+		return xid;
+	}
+	
+	// Nothing special (yet bare XID)
+	return xid;
+}
+
+// Gets the asked translated string
+function _e(string) {
+	return string;
+}
+
+// Replaces '%s' to a given value for a translated string
+function printf(string, value) {
+	return string.replace('%s', value);
+}
+
+// Properly explodes a string with a given character
+function explodeThis(toEx, toStr, i) {
+	// Get the index of our char to explode
+	var index = toStr.indexOf(toEx);
+	
+	// We split if necessary the string
+	if(index != -1) {
+		if(i == 0)
+			toStr = toStr.substr(0, index);
+		else
+			toStr = toStr.substr(index + 1);
+	}
+	
+	// We return the value
+	return toStr;
+}
+
+// Cuts the resource of a XID
+function cutResource(aXID) {
+	return explodeThis('/', aXID, 0);
+}
+
+// Gets the resource of a XID
+function thisResource(aXID) {
+	// Any resource?
+	if(aXID.indexOf('/') != -1)
+		return explodeThis('/', aXID, 1);
+	
+	// No resource
+	return '';
+}
+
+// Does stringprep on a string
+function stringPrep(string) {
+	// Replacement arrays
+	var invalid = new Array('Š', 'š', 'Đ', 'đ', 'Ž', 'ž', 'Č', 'č', 'Ć', 'ć', 'À', 'Á', 'Â', 'Ã', 'Ä', 'Å', 'Æ', 'Ç', 'È', 'É', 'Ê', 'Ë', 'Ì', 'Í', 'Î', 'Ï', 'Ñ', 'Ò', 'Ó', 'Ô', 'Õ', 'Ö', 'Ø', 'Ù', 'Ú', 'Û', 'Ü', 'Ý', 'Þ', 'ß', 'à', 'á', 'â', 'ã', 'ä', 'å', 'æ', 'ç', 'è', 'é', 'ê', 'ë', 'ì', 'í', 'î', 'ï', 'ð', 'ñ', 'ò', 'ó', 'ô', 'õ', 'ö', 'ø', 'ù', 'ú', 'û', 'ý', 'þ', 'ÿ', 'Ŕ', 'ŕ');
+	
+	var valid   = new Array('S', 's', 'Dj', 'dj', 'Z', 'z', 'C', 'c', 'C', 'c', 'A', 'A', 'A', 'A', 'A', 'A', 'A', 'C', 'E', 'E', 'E', 'E', 'I', 'I', 'I', 'I', 'N', 'O', 'O', 'O', 'O', 'O', 'O', 'U', 'U', 'U', 'U', 'Y', 'B', 'Ss', 'a', 'a', 'a', 'a', 'a', 'a', 'a', 'c', 'e', 'e', 'e', 'e', 'i', 'i', 'i', 'i', 'o', 'n', 'o', 'o', 'o', 'o', 'o', 'o', 'u', 'u', 'u', 'y', 'b', 'y', 'R', 'r');
+	
+	// Compute a new string
+	for(i in invalid)
+		string = string.replace(invalid[i], valid[i]);
+	
+	return string;
+}
+
+// Encodes quotes in a string
+function encodeQuotes(str) {
+	return (str + '').replace(/"/g, '&quot;');
+}
+
+// Gets the bare XID from a XID
+function bareXID(xid) {
+	// Cut the resource
+	xid = cutResource(xid);
+	
+	// Launch the stringprep
+	xid = stringPrep(xid);
+	
+	// Set the XID to lower case
+	xid = xid.toLowerCase();
+	
+	return xid;
+}
+
+// Gets the full XID from a XID
+function fullXID(xid) {
+	// Normalizes the XID
+	var full = bareXID(xid);
+	var resource = thisResource(xid);
+	
+	// Any resource?
+	if(resource)
+		full += '/' + resource;
+	
+	return full;
+}
+
+// Gets the nick from a XID
+function getXIDNick(aXID) {
+	return explodeThis('@', aXID, 0);
+}
+
+// Gets the host from a XID
+function getXIDHost(aXID) {
+	return explodeThis('@', aXID, 1);
+}
+
+// Checks if we are in developer mode
+function isDeveloper() {
+	if(DEVELOPER == 'on')
+		return true;
+	
+	return false;
+}
+
+// Checks if anonymous mode is allowed
+function allowedAnonymous() {
+	if(ANONYMOUS == 'on')
+		return true;
+	
+	return false;
+}
+
+// Checks if host is locked
+function lockHost() {
+	if(LOCK_HOST == 'on')
+		return true;
+	
+	return false;
+}
+
+// Gets the full XID of the user
+function getXID() {
+	// Return the XID of the user
+	if(con.username && con.domain)
+		return con.username + '@' + con.domain;
+	
+	return '';
+}
+
+// Generates the colors for a given user XID
+function generateColor(xid) {
+	var colors = new Array(
+			'ac0000',
+			'a66200',
+			'007703',
+			'00705f',
+			'00236b',
+			'4e005c'
+		     );
+	
+	var number = 0;
+	
+	for(var i = 0; i < xid.length; i++)
+		number += xid.charCodeAt(i);
+	
+	var color = '#' + colors[number % (colors.length)];
+	
+	return color;
+}
+
+// Checks if the XID is a gateway
+function isGateway(xid) {
+	if(xid.indexOf('@') != -1)
+		return false;
+	
+	return true;
+}
+
+// Gets the from attribute of a stanza (overrides some servers like Prosody missing from attributes)
+function getStanzaFrom(stanza) {
+	var from = stanza.getFrom();
+	
+	// No from, we assume this is our XID
+	if(!from)
+		from = getXID();
+	
+	return from;
+}
+
+// Logs a given data in the console
+function logThis(data, level) {
+	// Console not available
+	if(!isDeveloper() || (typeof(console) == 'undefined'))
+		return false;
+	
+	// Switch the log level
+	switch(level) {
+		// Debug
+		case 0:
+			console.debug(data);
+			
+			break;
+		
+		// Error
+		case 1:
+			console.error(data);
+			
+			break;
+		
+		// Warning
+		case 2:
+			console.warn(data);
+			
+			break;
+		
+		// Information
+		case 3:
+			console.info(data);
+			
+			break;
+		
+		// Default log level
+		default:
+			console.log(data);
+			
+			break;
+	}
+	
+	return true;
+}
+
+// Gets the current Jappix app. location
+function getJappixLocation() {
+	var url = window.location.href;
+	
+	// If the URL has variables, remove them
+	if(url.indexOf('?') != -1)
+		url = url.split('?')[0];
+	if(url.indexOf('#') != -1)
+		url = url.split('#')[0];
+	
+	// No "/" at the end
+	if(!url.match(/(.+)\/$/))
+		url += '/';
+	
+	return url;
+}
+
+// Removes spaces at the beginning & the end of a string
+function trim(str) {
+	return str.replace(/^\s+/g,'').replace(/\s+$/g,'');
+}
+
+// Adds a zero to a date when needed
+function padZero(i) {
+	// Negative number (without first 0)
+	if(i > -10 && i < 0)
+		return '-0' + (i * -1);
+	
+	// Positive number (without first 0)
+	if(i < 10 && i >= 0)
+		return '0' + i;
+	
+	// All is okay
+	return i;
+}
diff --git a/jappixmini/jappix/js/connection.js b/jappixmini/jappix/js/connection.js
new file mode 100644
index 00000000..afd1f6e8
--- /dev/null
+++ b/jappixmini/jappix/js/connection.js
@@ -0,0 +1,526 @@
+/*
+
+Jappix - An open social platform
+These are the connection JS script for Jappix
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 29/08/11
+
+*/
+
+// Does the user login
+var CURRENT_SESSION = false;
+
+function doLogin(lNick, lServer, lPass, lResource, lPriority, lRemember) {
+	try {
+		// We remove the not completed class to avoid problems
+		$('#home .loginer input').removeClass('please-complete');
+		
+		// We add the login wait div
+		showGeneralWait();
+		
+		// We define the http binding parameters
+		oArgs = new Object();
+		
+		if(HOST_BOSH_MAIN)
+			oArgs.httpbase = HOST_BOSH_MAIN;
+		else
+			oArgs.httpbase = HOST_BOSH;
+		
+		// We create the new http-binding connection
+		con = new JSJaCHttpBindingConnection(oArgs);
+		
+		// And we handle everything that happen
+		setupCon(con);
+		
+		// Generate a resource
+		var random_resource = getDB('session', 'resource');
+		
+		if(!random_resource)
+			random_resource = lResource + ' (' + (new Date()).getTime() + ')';
+		
+		// We retrieve what the user typed in the login inputs
+		oArgs = new Object();
+		oArgs.domain = trim(lServer);
+		oArgs.username = trim(lNick);
+		oArgs.resource = random_resource;
+		oArgs.pass = lPass;
+		oArgs.secure = true;
+		oArgs.xmllang = XML_LANG;
+		
+		// Store the resource (for reconnection)
+		setDB('session', 'resource', random_resource);
+		
+		// Generate a session XML to be stored
+		session_xml = '<session><stored>true</stored><domain>' + lServer.htmlEnc() + '</domain><username>' + lNick.htmlEnc() + '</username><resource>' + lResource.htmlEnc() + '</resource><password>' + lPass.htmlEnc() + '</password><priority>' + lPriority.htmlEnc() + '</priority></session>';
+		
+		// Save the session parameters (for reconnect if network issue)
+		CURRENT_SESSION = session_xml;
+		
+		// Remember me?
+		if(lRemember)
+			setDB('remember', 'session', 1);
+		
+		// We store the infos of the user into the data-base
+		setDB('priority', 1, lPriority);
+		
+		// We connect !
+		con.connect(oArgs);
+		
+		// Change the page title
+		pageTitle('wait');
+		
+		logThis('Jappix is connecting...', 3);
+	}
+	
+	catch(e) {
+		// Logs errors
+		logThis('Error while logging in: ' + e, 1);
+		
+		// Reset Jappix
+		destroyTalkPage();
+		
+		// Open an unknown error
+		openThisError(2);
+	}
+	
+	finally {
+		return false;
+	}
+}
+
+// Handles the user registration
+function handleRegistered() {
+	logThis('A new account has been registered.', 3);
+	
+	// We remove the waiting image
+	removeGeneralWait();
+	
+	// Reset the title
+	pageTitle('home');
+	
+	// We show the success information
+	$('#home .registerer .success').fadeIn('fast');
+	
+	// We quit the session
+	logout();
+}
+
+// Does the user registration
+function doRegister(username, domain, pass) {
+	logThis('Trying to register an account...', 3);
+	
+	try {
+		// We define the http binding parameters
+		oArgs = new Object();
+		
+		if(HOST_BOSH_MAIN)
+			oArgs.httpbase = HOST_BOSH_MAIN;
+		else
+			oArgs.httpbase = HOST_BOSH;
+		
+		// We create the new http-binding connection
+		con = new JSJaCHttpBindingConnection(oArgs);
+		
+		// We setup the connection !
+		con.registerHandler('onconnect', handleRegistered);
+		con.registerHandler('onerror', handleError);
+		
+		// We retrieve what the user typed in the register inputs
+		oArgs = new Object();
+		oArgs.domain = trim(domain);
+		oArgs.username = trim(username);
+		oArgs.resource = JAPPIX_RESOURCE + ' Register (' + (new Date()).getTime() + ')';
+		oArgs.pass = pass;
+		oArgs.register = true;
+		oArgs.secure = true;
+		oArgs.xmllang = XML_LANG;
+		
+		con.connect(oArgs);
+		
+		// We change the registered information text
+		$('#home .homediv.registerer').append(
+			'<div class="info success">' + 
+				_e("You have been registered, here is your XMPP address:") + ' <b>' + con.username.htmlEnc() + '@' + con.domain.htmlEnc() + '</b> - <a href="#">' + _e("Login") + '</a>' + 
+			'</div>'
+		);
+		
+		// Login link
+		$('#home .homediv.registerer .success a').click(function() {
+			return doLogin(con.username, con.domain, con.pass, con.resource, '10', false);
+		});
+		
+		// Show the waiting image
+		showGeneralWait();
+		
+		// Change the page title
+		pageTitle('wait');
+	}
+	
+	catch(e) {
+		// Logs errors
+		logThis(e, 1);
+	}
+	
+	finally {
+		return false;
+	}
+}
+
+// Does the user anonymous login
+function doAnonymous() {
+	logThis('Trying to login anonymously...', 3);
+	
+	var aPath = '#home .anonymouser ';
+	var room = $(aPath + '.room').val();
+	var nick = $(aPath + '.nick').val();
+	
+	// If the form is correctly completed
+	if(room && nick) {
+		// We remove the not completed class to avoid problems
+		$('#home .anonymouser input').removeClass('please-complete');
+		
+		// Redirect the user to the anonymous room
+		window.location.href = JAPPIX_LOCATION + '?r=' + room + '&n=' + nick;
+	}
+	
+	// We check if the form is entirely completed
+	else {
+		$(aPath + 'input[type=text]').each(function() {
+			var select = $(this);
+			
+			if(!select.val())
+				$(document).oneTime(10, function() {
+					select.addClass('please-complete').focus();
+				});
+			else
+				select.removeClass('please-complete');	
+		});
+	}
+	
+	return false;
+}
+
+// Handles the user connected event
+var CONNECTED = false;
+
+function handleConnected() {
+	logThis('Jappix is now connected.', 3);
+	
+	// Connection markers
+	CONNECTED = true;
+	RECONNECT_TRY = 0;
+	RECONNECT_TIMER = 0;
+	
+	// We hide the home page
+	$('#home').hide();
+	
+	// Not resumed?
+	if(!RESUME) {
+		// Remember the session?
+		if(getDB('remember', 'session'))
+			setPersistent('session', 1, CURRENT_SESSION);
+		
+		// We show the chatting app.
+		createTalkPage();
+		
+		// We reset the homepage
+		switchHome('default');
+		
+		// We get all the other things
+		getEverything();
+		
+		// Set last activity stamp
+		LAST_ACTIVITY = getTimeStamp();
+	}
+	
+	// Resumed
+	else {
+		// Send our presence
+		presenceSend();
+		
+		// Change the title
+		updateTitle();
+	}
+	
+	// Remove the waiting item
+	removeGeneralWait();
+}
+
+// Handles the user disconnected event
+function handleDisconnected() {
+	logThis('Jappix is now disconnected.', 3);
+	
+	// Normal disconnection
+	if(!CURRENT_SESSION && !CONNECTED)
+		destroyTalkPage();
+}
+
+// Setups the normal connection
+function setupCon(con) {
+	// We setup all the necessary handlers for the connection
+	con.registerHandler('message', handleMessage);
+	con.registerHandler('presence', handlePresence);
+	con.registerHandler('iq', handleIQ);
+	con.registerHandler('onconnect', handleConnected);
+	con.registerHandler('onerror', handleError);
+	con.registerHandler('ondisconnect', handleDisconnected);
+}
+
+// Logouts from the server
+function logout() {
+	// We are not connected
+	if(!isConnected())
+		return false;
+	
+	// Disconnect from the XMPP server
+	con.disconnect();
+	
+	logThis('Jappix is disconnecting...', 3);
+}
+
+// Terminates a session
+function terminate() {
+	if(!isConnected())
+		return;
+	
+	// Clear temporary session storage
+	resetConMarkers();
+	
+	// Show the waiting item (useful if BOSH is sloooow)
+	showGeneralWait();
+	
+	// Change the page title
+	pageTitle('wait');
+	
+	// Disconnect from the XMPP server
+	logout();
+}
+
+// Quitss a session
+function quit() {
+	if(!isConnected())
+		return;
+	
+	// We show the waiting image
+	showGeneralWait();
+	
+	// Change the page title
+	pageTitle('wait');
+	
+	// We disconnect from the XMPP server
+	logout();
+}
+
+// Creates the reconnect pane
+var RECONNECT_TRY = 0;
+var RECONNECT_TIMER = 0;
+
+function createReconnect(mode) {
+	logThis('This is not a normal disconnection, show the reconnect pane...', 1);
+	
+	// Reconnect pane not yet displayed?
+	if(!exists('#reconnect')) {
+		// Blur the focused input/textarea/select
+		$('input, select, textarea').blur();
+		
+		// Create the HTML code
+		var html = '<div id="reconnect" class="lock">' + 
+				'<div class="pane">' + 
+					_e("Due to a network issue, you were disconnected. What do you want to do now?");
+		
+		// Can we cancel reconnection?
+		if(mode == 'normal')
+			html += '<a href="#" class="finish cancel">' + _e("Cancel") + '</a>';
+		
+		html += '<a href="#" class="finish reconnect">' + _e("Reconnect") + '</a>' + 
+			'</div></div>';
+		
+		// Append the code
+		$('body').append(html);
+		
+		// Click events
+		if(mode == 'normal')
+			$('#reconnect a.finish.cancel').click(function() {
+				return cancelReconnect();
+			});
+		
+		$('#reconnect a.finish.reconnect').click(function() {
+			return acceptReconnect(mode);
+		});
+		
+		// Try to reconnect automatically after a while
+		if(RECONNECT_TRY < 5)
+			RECONNECT_TIMER = 5 + (5 * RECONNECT_TRY);
+		else
+			RECONNECT_TIMER = 120;
+		
+		// Change the try number
+		RECONNECT_TRY++;
+		
+		// Fire the event!
+		$('#reconnect a.finish.reconnect').everyTime('1s', function() {
+			// We can reconnect!
+			if(RECONNECT_TIMER == 0)
+				return acceptReconnect(mode);
+			
+			// Button text
+			if(RECONNECT_TIMER <= 10)
+				$(this).text(_e("Reconnect") + ' (' + RECONNECT_TIMER + ')');
+			
+			// Remove 1 second
+			RECONNECT_TIMER--;
+		});
+		
+		// Page title
+		updateTitle();
+	}
+}
+
+// Reconnects the user if he was disconnected (network issue)
+var RESUME = false;
+
+function acceptReconnect(mode) {
+	logThis('Trying to reconnect the user...', 3);
+	
+	// Resume marker
+	RESUME = true;
+	
+	// Show waiting item
+	showGeneralWait();
+	
+	// Reset some various stuffs
+	var groupchats = '#page-engine .page-engine-chan[data-type=groupchat]';
+	$(groupchats + ' .list .role').hide();
+	$(groupchats + ' .one-group, ' + groupchats + ' .list .user').remove();
+	$(groupchats).attr('data-initial', 'false');
+	
+	// Stop the timer
+	$('#reconnect a.finish.reconnect').stopTime();
+	
+	// Remove the reconnect pane
+	$('#reconnect').remove();
+	
+	// Try to login again
+	if(mode == 'normal')
+		loginFromSession(XMLFromString(CURRENT_SESSION));
+	else if(mode == 'anonymous')
+		anonymousLogin(HOST_ANONYMOUS);
+	
+	return false;
+}
+
+// Cancel the reconnection of user account (network issue)
+function cancelReconnect() {
+	logThis('User has canceled automatic reconnection...', 3);
+	
+	// Stop the timer
+	$('#reconnect a.finish.reconnect').stopTime();
+	
+	// Remove the reconnect pane
+	$('#reconnect').remove();
+	
+	// Destroy the talk page
+	destroyTalkPage();
+	
+	// Renitialize the previous session parameters
+	resetConMarkers();
+	
+	return false;
+}
+
+// Clears session reminder database
+function clearLastSession() {
+	// Clear temporary storage
+	resetConMarkers();
+	
+	// Clear persistent storage
+	if($(XMLFromString(getPersistent('session', 1))).find('stored').text() == 'true')
+		removePersistent('session', 1);
+}
+
+// Resets the connection markers
+function resetConMarkers() {
+	CURRENT_SESSION = false;
+	CONNECTED = false;
+	RESUME = false;
+	RECONNECT_TRY = 0;
+	RECONNECT_TIMER = 0;
+}
+
+// Logins from a saved session
+function loginFromSession(data) {
+	// Select the data
+	var session = $(data);
+	
+	// Fire the login event
+	doLogin(
+		session.find('username').text(),
+		session.find('domain').text(),
+		session.find('password').text(),
+		session.find('resource').text(),
+		session.find('priority').text(),
+		false
+	);
+}
+
+// Quits a session normally
+function normalQuit() {
+	// Reset our database
+	clearLastSession();
+	
+	// We quit the current session
+	quit();
+	
+	// We show an info
+	openThisInfo(3);
+	
+	return false;
+}
+
+// Gets all the users stuffs
+function getEverything() {
+	getFeatures();
+	getRoster();
+	listPrivacy();
+	getStorage(NS_ROSTERNOTES);
+}
+
+// Addon launcher
+function launchConnection() {
+	// Logouts when Jappix is closed
+	$(window).bind('beforeunload', terminate);
+	
+	// Nothing to do when anonymous!
+	if(isAnonymous())
+		return;
+	
+	// Try to resume a stored session, if not anonymous
+	var session = XMLFromString(getPersistent('session', 1));
+	
+	if($(session).find('stored').text() == 'true') {
+		// Hide the homepage
+		$('#home').hide();
+		
+		// Show the waiting icon
+		showGeneralWait();
+		
+		// Login!
+		loginFromSession(session);
+		
+		logThis('Saved session found, resuming it...', 3);
+	}
+	
+	// Not connected, maybe a XMPP link is submitted?
+	else if((parent.location.hash != '#OK') && LINK_VARS['x']) {
+		switchHome('loginer');
+		
+		logThis('A XMPP link is set, switch to login page.', 3);
+	}
+}
+
+// Launch this addon!
+$(document).ready(launchConnection);
diff --git a/jappixmini/jappix/js/constants.js b/jappixmini/jappix/js/constants.js
new file mode 100644
index 00000000..bc59bd75
--- /dev/null
+++ b/jappixmini/jappix/js/constants.js
@@ -0,0 +1,211 @@
+/*
+
+Jappix - An open social platform
+These are the constants JS scripts for Jappix
+
+-------------------------------------------------
+
+License: AGPL
+Authors: Stefan Strigler, Vanaryon
+Last revision: 26/08/11
+
+*/
+
+// XMPP XMLNS attributes
+var NS_PROTOCOL =     'http://jabber.org/protocol/';
+var NS_FEATURES =     'http://jabber.org/features/';
+var NS_CLIENT =       'jabber:client';
+var NS_IQ =           'jabber:iq:';
+var NS_X =            'jabber:x:';
+var NS_IETF =         'urn:ietf:params:xml:ns:xmpp-';
+var NS_XMPP =         'urn:xmpp:';
+
+var NS_STORAGE =      'storage:';
+var NS_BOOKMARKS =    NS_STORAGE + 'bookmarks';
+var NS_ROSTERNOTES =  NS_STORAGE + 'rosternotes';
+
+var NS_JAPPIX =       'jappix:';
+var NS_INBOX =        NS_JAPPIX + 'inbox';
+var NS_OPTIONS =      NS_JAPPIX + 'options';
+
+var NS_DISCO_ITEMS =  NS_PROTOCOL + 'disco#items';
+var NS_DISCO_INFO =   NS_PROTOCOL + 'disco#info';
+var NS_VCARD =        'vcard-temp';
+var NS_VCARD_P =      NS_VCARD + ':x:update';
+var NS_AUTH =         NS_IQ + 'auth';
+var NS_AUTH_ERROR =   NS_IQ + 'auth:error';
+var NS_REGISTER =     NS_IQ + 'register';
+var NS_SEARCH =       NS_IQ + 'search';
+var NS_ROSTER =       NS_IQ + 'roster';
+var NS_PRIVACY =      NS_IQ + 'privacy';
+var NS_PRIVATE =      NS_IQ + 'private';
+var NS_VERSION =      NS_IQ + 'version';
+var NS_TIME =         NS_IQ + 'time';
+var NS_LAST =         NS_IQ + 'last';
+var NS_IQDATA =       NS_IQ + 'data';
+var NS_XDATA =        NS_X + 'data';
+var NS_IQOOB =        NS_IQ + 'oob';
+var NS_XOOB =         NS_X + 'oob';
+var NS_DELAY =        NS_X + 'delay';
+var NS_EXPIRE =       NS_X + 'expire';
+var NS_EVENT =        NS_X + 'event';
+var NS_XCONFERENCE =  NS_X + 'conference';
+var NS_STATS =        NS_PROTOCOL + 'stats';
+var NS_MUC =          NS_PROTOCOL + 'muc';
+var NS_MUC_USER =     NS_MUC + '#user';
+var NS_MUC_ADMIN =    NS_MUC + '#admin';
+var NS_MUC_OWNER =    NS_MUC + '#owner';
+var NS_MUC_CONFIG =   NS_MUC + '#roomconfig';
+var NS_PUBSUB =       NS_PROTOCOL + 'pubsub';
+var NS_PUBSUB_EVENT = NS_PUBSUB + '#event';
+var NS_PUBSUB_OWNER = NS_PUBSUB + '#owner';
+var NS_PUBSUB_NMI =   NS_PUBSUB + '#node-meta-info';
+var NS_PUBSUB_NC =    NS_PUBSUB + '#node_config';
+var NS_PUBSUB_RI =    NS_PUBSUB + '#retrieve-items';
+var NS_COMMANDS =     NS_PROTOCOL + 'commands';
+var NS_BOSH =         NS_PROTOCOL + 'httpbind';
+var NS_STREAM =       'http://etherx.jabber.org/streams';
+var NS_URN_TIME =     NS_XMPP + 'time';
+var NS_URN_PING =     NS_XMPP + 'ping';
+var NS_URN_ADATA =    NS_XMPP + 'avatar:data';
+var NS_URN_AMETA =    NS_XMPP + 'avatar:metadata';
+var NS_URN_MBLOG =    NS_XMPP + 'microblog:0';
+var NS_URN_INBOX =    NS_XMPP + 'inbox';
+var NS_URN_ARCHIVE =  NS_XMPP + 'archive';
+var NS_URN_AR_PREF =  NS_URN_ARCHIVE + ':pref';
+var NS_URN_AR_AUTO =  NS_URN_ARCHIVE + ':auto';
+var NS_URN_AR_MANUAL =  NS_URN_ARCHIVE + ':manual';
+var NS_URN_AR_MANAGE =  NS_URN_ARCHIVE + ':manage';
+var NS_URN_DELAY =    NS_XMPP + 'delay';
+var NS_URN_RECEIPTS = NS_XMPP + 'receipts';
+var NS_RSM =          NS_PROTOCOL + 'rsm';
+var NS_IPV6 =         'ipv6';
+var NS_XHTML =        'http://www.w3.org/1999/xhtml';
+var NS_XHTML_IM =     NS_PROTOCOL + 'xhtml-im';
+var NS_CHATSTATES =   NS_PROTOCOL + 'chatstates';
+var NS_HTTP_AUTH =    NS_PROTOCOL + 'http-auth';
+var NS_ROSTERX =      NS_PROTOCOL + 'rosterx';
+var NS_MOOD =         NS_PROTOCOL + 'mood';
+var NS_ACTIVITY =     NS_PROTOCOL + 'activity';
+var NS_TUNE =         NS_PROTOCOL + 'tune';
+var NS_GEOLOC =       NS_PROTOCOL + 'geoloc';
+var NS_NICK =         NS_PROTOCOL + 'nick';
+var NS_NOTIFY =       '+notify';
+var NS_CAPS =         NS_PROTOCOL + 'caps';
+var NS_ATOM =         'http://www.w3.org/2005/Atom';
+
+var NS_STANZAS =      NS_IETF + 'stanzas';
+var NS_STREAMS =      NS_IETF + 'streams';
+
+var NS_TLS =          NS_IETF + 'tls';
+var NS_SASL =         NS_IETF + 'sasl';
+var NS_SESSION =      NS_IETF + 'session';
+var NS_BIND =         NS_IETF + 'bind';
+
+var NS_FEATURE_IQAUTH = NS_FEATURES + 'iq-auth';
+var NS_FEATURE_IQREGISTER = NS_FEATURES + 'iq-register';
+var NS_FEATURE_COMPRESS = NS_FEATURES + 'compress';
+
+var NS_COMPRESS =     NS_PROTOCOL + 'compress';
+
+// Available locales
+var LOCALES_AVAILABLE_ID = new Array();
+var LOCALES_AVAILABLE_NAMES = new Array();
+
+// XML lang
+var XML_LANG = null;
+
+// Jappix parameters
+var JAPPIX_STATIC = null;
+var JAPPIX_VERSION = null;
+var JAPPIX_MAX_FILE_SIZE = null;
+var JAPPIX_MAX_UPLOAD = null;
+
+// Jappix main configuration
+var SERVICE_NAME = null;
+var SERVICE_DESC = null;
+var JAPPIX_RESOURCE = null;
+var LOCK_HOST = null;
+var ANONYMOUS = null;
+var REGISTRATION = null;
+var BOSH_PROXY = null;
+var MANAGER_LINK = null;
+var GROUPCHATS_JOIN = null;
+var ENCRYPTION = null;
+var HTTPS_STORAGE = null;
+var HTTPS_FORCE = null;
+var COMPRESSION = null;
+var MULTI_FILES = null;
+var DEVELOPER = null;
+
+// Jappix hosts configuration
+var HOST_MAIN = null;
+var HOST_MUC = null;
+var HOST_PUBSUB = null;
+var HOST_VJUD = null;
+var HOST_ANONYMOUS = null;
+var HOST_BOSH = null;
+var HOST_BOSH_MAIN = null;
+var HOST_BOSH_MINI = null;
+var HOST_STATIC = null;
+var HOST_UPLOAD = null;
+
+// Anonymous mode
+var ANONYMOUS_ROOM = null;
+var ANONYMOUS_NICK = null;
+
+// Node parameters
+var JAPPIX_LOCATION = getJappixLocation();
+
+// XMPP error stanzas
+function STANZA_ERROR(code, type, cond) {
+	if (window == this)
+		return new STANZA_ERROR(code, type, cond);
+	
+	this.code = code;
+	this.type = type;
+	this.cond = cond;
+}
+
+var ERR_BAD_REQUEST =
+	STANZA_ERROR('400', 'modify', 'bad-request');
+var ERR_CONFLICT =
+	STANZA_ERROR('409', 'cancel', 'conflict');
+var ERR_FEATURE_NOT_IMPLEMENTED =
+	STANZA_ERROR('501', 'cancel', 'feature-not-implemented');
+var ERR_FORBIDDEN =
+	STANZA_ERROR('403', 'auth',   'forbidden');
+var ERR_GONE =
+	STANZA_ERROR('302', 'modify', 'gone');
+var ERR_INTERNAL_SERVER_ERROR =
+	STANZA_ERROR('500', 'wait',   'internal-server-error');
+var ERR_ITEM_NOT_FOUND =
+	STANZA_ERROR('404', 'cancel', 'item-not-found');
+var ERR_JID_MALFORMED =
+	STANZA_ERROR('400', 'modify', 'jid-malformed');
+var ERR_NOT_ACCEPTABLE =
+	STANZA_ERROR('406', 'modify', 'not-acceptable');
+var ERR_NOT_ALLOWED =
+	STANZA_ERROR('405', 'cancel', 'not-allowed');
+var ERR_NOT_AUTHORIZED =
+	STANZA_ERROR('401', 'auth',   'not-authorized');
+var ERR_PAYMENT_REQUIRED =
+	STANZA_ERROR('402', 'auth',   'payment-required');
+var ERR_RECIPIENT_UNAVAILABLE =
+	STANZA_ERROR('404', 'wait',   'recipient-unavailable');
+var ERR_REDIRECT =
+	STANZA_ERROR('302', 'modify', 'redirect');
+var ERR_REGISTRATION_REQUIRED =
+	STANZA_ERROR('407', 'auth',   'registration-required');
+var ERR_REMOTE_SERVER_NOT_FOUND =
+	STANZA_ERROR('404', 'cancel', 'remote-server-not-found');
+var ERR_REMOTE_SERVER_TIMEOUT =
+	STANZA_ERROR('504', 'wait',   'remote-server-timeout');
+var ERR_RESOURCE_CONSTRAINT =
+	STANZA_ERROR('500', 'wait',   'resource-constraint');
+var ERR_SERVICE_UNAVAILABLE =
+	STANZA_ERROR('503', 'cancel', 'service-unavailable');
+var ERR_SUBSCRIPTION_REQUIRED =
+	STANZA_ERROR('407', 'auth',   'subscription-required');
+var ERR_UNEXPECTED_REQUEST =
+	STANZA_ERROR('400', 'wait',   'unexpected-request');
diff --git a/jappixmini/jappix/js/dataform.js b/jappixmini/jappix/js/dataform.js
new file mode 100644
index 00000000..7fbea89d
--- /dev/null
+++ b/jappixmini/jappix/js/dataform.js
@@ -0,0 +1,921 @@
+/*
+
+Jappix - An open social platform
+These are the dataform JS scripts for Jappix
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 28/08/11
+
+*/
+
+// Gets the defined dataform elements
+function dataForm(host, type, node, action, target) {
+	// Clean the current session
+	cleanDataForm(target);
+	
+	// We tell the user that a search has been launched
+	$('#' + target + ' .wait').show();
+	
+	// If we have enough data
+	if(host && type) {
+		// Generate a session ID
+		var sessionID = Math.round(100000.5 + (((900000.49999) - (100000.5)) * Math.random()));
+		var id = target + '-' + sessionID + '-' + genID();
+		$('.' + target + '-results').attr('data-session', target + '-' + sessionID);
+		
+		// We request the service item
+		var iq = new JSJaCIQ();
+		iq.setID(id);
+		iq.setTo(host);
+		iq.setType('get');
+		
+		// MUC admin query
+		if(type == 'muc') {
+			iq.setQuery(NS_MUC_OWNER);
+			con.send(iq, handleDataFormMuc);
+		}
+		
+		// Browse query
+		else if(type == 'browse') {
+			var iqQuery = iq.setQuery(NS_DISCO_ITEMS);
+			
+			if(node)
+				iqQuery.setAttribute('node', node);
+			
+			con.send(iq, handleDataFormBrowse);
+		}
+		
+		// Command
+		else if(type == 'command') {
+			var items;
+			
+			if(node)
+				items = iq.appendNode('command', {'node': node, 'xmlns': NS_COMMANDS});
+			
+			else {
+				items = iq.setQuery(NS_DISCO_ITEMS);
+				items.setAttribute('node', NS_COMMANDS);
+			}
+			
+			if(action && node) {
+				iq.setType('set');
+				items.setAttribute('action', action);
+			}
+			
+			con.send(iq, handleDataFormCommand);
+		}
+		
+		// Search query
+		else if(type == 'search') {
+			iq.setQuery(NS_SEARCH);
+			con.send(iq, handleDataFormSearch);
+		}
+		
+		// Subscribe query
+		else if(type == 'subscribe') {
+			iq.setQuery(NS_REGISTER);
+			con.send(iq, handleDataFormSubscribe);
+		}
+		
+		// Join
+		else if(type == 'join') {
+			if(target == 'discovery')
+				closeDiscovery();
+			
+			checkChatCreate(host, 'groupchat');
+		}
+	}
+	
+	return false;
+}
+
+// Sends a given dataform
+function sendDataForm(type, action, x_type, id, xid, node, sessionid, target) {
+	// Path
+	var pathID = '#' + target + ' .results[data-session=' + id + ']';
+	
+	// New IQ
+	var iq = new JSJaCIQ();
+	iq.setTo(xid);
+	iq.setType('set');
+	
+	// Set the correct query
+	var query;
+	
+	if(type == 'subscribe')
+		iqQuery = iq.setQuery(NS_REGISTER);
+	else if(type == 'search')
+		iqQuery = iq.setQuery(NS_SEARCH);
+	else if(type == 'command')
+		iqQuery = iq.appendNode('command', {'xmlns': NS_COMMANDS, 'node': node, 'sessionid': sessionid, 'action': action});
+	else if(type == 'x')
+		iqQuery = iq.setQuery(NS_MUC_OWNER);
+	
+	// Build the XML document
+	if(action != 'cancel') {
+		// No X node
+		if(exists('input.register-special') && (type == 'subscribe')) {
+			$('input.register-special').each(function() {
+				var iName = $(this).attr('name');
+				var iValue = $(this).val();
+				
+				iqQuery.appendChild(iq.buildNode(iName, {'xmlns': NS_REGISTER}, iValue));
+			});
+		}
+		
+		// Can create the X node
+		else {
+			var iqX = iqQuery.appendChild(iq.buildNode('x', {'xmlns': NS_XDATA, 'type': x_type}));
+			
+			// Each input
+			$(pathID + ' .oneresult input, ' + pathID + ' .oneresult textarea, ' + pathID + ' .oneresult select').each(function() {
+				// Get the current input value
+				var iVar = $(this).attr('name');
+				var iType = $(this).attr('data-type');
+				var iValue = $(this).val();
+				
+				// Build a new field node
+				var field = iqX.appendChild(iq.buildNode('field', {'var': iVar, 'type': iType, 'xmlns': NS_XDATA}));
+				
+				// Boolean input?
+				if(iType == 'boolean') {
+					if($(this).filter(':checked').size())
+						iValue = '1';
+					else
+						iValue = '0';
+				}
+				
+				// JID-multi input?
+				if(iType == 'jid-multi') {
+					// Values array
+					var xid_arr = [iValue];
+					var xid_check = [];
+					
+					// Try to split it
+					if(iValue.indexOf(',') != -1)
+						xid_arr = iValue.split(',');
+					
+					// Append each value to the XML document
+					for(i in xid_arr) {
+						// Get the current value
+						xid_current = trim(xid_arr[i]);
+						
+						// No current value?
+						if(!xid_current)
+							continue;
+						
+						// Add the current value
+						if(!existArrayValue(xid_check, xid_current)) {
+							xid_check.push(xid_current);
+							field.appendChild(iq.buildNode('value', {'xmlns': NS_XDATA}, xid_current));
+						}
+					}
+				}
+				
+				// List-multi selector?
+				else if(iType == 'list-multi') {
+					// Any value?
+					if(iValue && iValue.length) {
+						for(i in iValue)
+							field.appendChild(iq.buildNode('value', {'xmlns': NS_XDATA}, iValue[i]));
+					}
+				}
+				
+				// Other inputs?
+				else
+					field.appendChild(iq.buildNode('value', {'xmlns': NS_XDATA}, iValue));
+			});
+		}
+	}
+	
+	// Clean the current session
+	cleanDataForm(target);
+	
+	// Show the waiting item
+	$('#' + target + ' .wait').show();
+	
+	// Change the ID of the current discovered item
+	var iqID = target + '-' + genID();
+	$('#' + target + ' .' + target + '-results').attr('data-session', iqID);
+	iq.setID(iqID);
+	
+	// Send the IQ
+	if(type == 'subscribe')
+		con.send(iq, handleDataFormSubscribe);
+	else if(type == 'search')
+		con.send(iq, handleDataFormSearch);
+	else if(type == 'command')
+		con.send(iq, handleDataFormCommand);
+	else
+		con.send(iq);
+	
+	return false;
+}
+
+// Displays the good dataform buttons
+function buttonsDataForm(type, action, id, xid, node, sessionid, target, pathID) {
+	// No need to use buttons?
+	if(type == 'muc')
+		return;
+	
+	// Override the "undefined" output
+	if(!id)
+		id = '';
+	if(!xid)
+		xid = '';
+	if(!node)
+		node = '';
+	if(!sessionid)
+		sessionid = '';
+	
+	// We generate the buttons code
+	var buttonsCode = '<div class="oneresult ' + target + '-oneresult ' + target + '-formtools">';
+	
+	if(action == 'submit') {
+		if((target == 'adhoc') && (type == 'command')) {
+			buttonsCode += '<a href="#" class="submit" onclick="return sendDataForm(\'' + encodeOnclick(type) + '\', \'execute\', \'submit\', \'' + encodeOnclick(id) + '\', \'' + encodeOnclick(xid) + '\', \'' + encodeOnclick(node) + '\', \'' + encodeOnclick(sessionid) + '\', \'' + encodeOnclick(target) + '\');">' + _e("Submit") + '</a>';
+			
+			// When keyup on one text input
+			$(pathID + ' input').keyup(function(e) {
+				if(e.keyCode == 13) {
+					sendDataForm(type, 'execute', 'submit', id, xid, node, sessionid, target);
+					
+					return false;
+				}
+			});
+		}
+		
+		else {
+			buttonsCode += '<a href="#" class="submit" onclick="return sendDataForm(\'' + encodeOnclick(type) + '\', \'submit\', \'submit\', \'' + encodeOnclick(id) + '\', \'' + encodeOnclick(xid) + '\', \'' + encodeOnclick(node) + '\', \'' + encodeOnclick(sessionid) + '\', \'' + encodeOnclick(target) + '\');">' + _e("Submit") + '</a>';
+			
+			// When keyup on one text input
+			$(pathID + ' input').keyup(function(e) {
+				if(e.keyCode == 13) {
+					sendDataForm(type, 'submit', 'submit', id, xid, node, sessionid, target);
+					
+					return false;
+				}
+			});
+		}
+	}
+	
+	if((action == 'submit') && (type != 'subscribe') && (type != 'search'))
+		buttonsCode += '<a href="#" class="submit" onclick="return sendDataForm(\'' + encodeOnclick(type) + '\', \'cancel\', \'cancel\', \'' + encodeOnclick(id) + '\', \'' + encodeOnclick(xid) + '\', \'' + encodeOnclick(node) + '\', \'' + encodeOnclick(sessionid) + '\', \'' + encodeOnclick(target) + '\');">' + _e("Cancel") + '</a>';
+	
+	if(((action == 'back') || (type == 'subscribe') || (type == 'search')) && (target == 'discovery'))
+		buttonsCode += '<a href="#" class="back" onclick="return startDiscovery();">' + _e("Close") + '</a>';
+	
+	if((action == 'back') && ((target == 'welcome') || (target == 'directory')))
+		buttonsCode += '<a href="#" class="back" onclick="return dataForm(HOST_VJUD, \'search\', \'\', \'\', \'' + target + '\');">' + _e("Previous") + '</a>';
+	
+	if((action == 'back') && (target == 'adhoc'))
+		buttonsCode += '<a href="#" class="back" onclick="return dataForm(\'' + encodeOnclick(xid) + '\', \'command\', \'\', \'\', \'adhoc\');">' + _e("Previous") + '</a>';
+	
+	buttonsCode += '</div>';
+	
+	// We display the buttons code
+	$(pathID).append(buttonsCode);
+	
+	// If no submit link, lock the form
+	if(!exists(pathID + ' a.submit'))
+		$(pathID + ' input, ' + pathID + ' textarea').attr('readonly', true);
+}
+
+// Handles the MUC dataform
+function handleDataFormMuc(iq) {
+	handleErrorReply(iq);
+	handleDataFormContent(iq, 'muc');
+}
+
+// Handles the browse dataform
+function handleDataFormBrowse(iq) {
+	handleErrorReply(iq);
+	handleDataFormContent(iq, 'browse');
+}
+
+// Handles the command dataform
+function handleDataFormCommand(iq) {
+	handleErrorReply(iq);
+	handleDataFormContent(iq, 'command');
+}
+
+// Handles the subscribe dataform
+function handleDataFormSubscribe(iq) {
+	handleErrorReply(iq);
+	handleDataFormContent(iq, 'subscribe');
+}
+
+// Handles the search dataform
+function handleDataFormSearch(iq) {
+	handleErrorReply(iq);
+	handleDataFormContent(iq, 'search');
+}
+
+// Handles the dataform content
+function handleDataFormContent(iq, type) {
+	// Get the ID
+	var sID = iq.getID();
+	
+	// Get the target
+	var splitted = sID.split('-');
+	var target = splitted[0];
+	var sessionID = target + '-' + splitted[1];
+	var from = fullXID(getStanzaFrom(iq));
+	var pathID = '#' + target + ' .results[data-session=' + sessionID + ']';
+	
+	// If an error occured
+	if(!iq || (iq.getType() != 'result'))
+		noResultDataForm(pathID);
+	
+	// If we got something okay
+	else {
+		var handleXML = iq.getNode();
+		
+		if(type == 'browse') {
+			if($(handleXML).find('item').attr('jid')) {
+				// Get the query node
+				var queryNode = $(handleXML).find('query').attr('node');
+				
+				$(handleXML).find('item').each(function() {
+					// We parse the received xml
+					var itemHost = $(this).attr('jid');
+					var itemNode = $(this).attr('node');
+					var itemName = $(this).attr('name');
+					var itemHash = hex_md5(itemHost);
+					
+					// Node
+					if(itemNode)
+						$(pathID).append(
+							'<div class="oneresult ' + target + '-oneresult" onclick="return dataForm(\'' + encodeOnclick(itemHost) + '\', \'browse\', \'' + encodeOnclick(itemNode) + '\', \'\', \'' + encodeOnclick(target) + '\');">' + 
+								'<div class="one-name">' + itemNode.htmlEnc() + '</div>' + 
+							'</div>'
+						);
+					
+					// Item
+					else if(queryNode && itemName)
+						$(pathID).append(
+							'<div class="oneresult ' + target + '-oneresult">' + 
+								'<div class="one-name">' + itemName.htmlEnc() + '</div>' + 
+							'</div>'
+						);
+					
+					// Item with children
+					else {
+						// We display the waiting element
+						$(pathID + ' .disco-wait .disco-category-title').after(
+							'<div class="oneresult ' + target + '-oneresult ' + itemHash + '">' + 
+								'<div class="one-icon loading talk-images"></div>' + 
+								'<div class="one-host">' + itemHost + '</div>' + 
+								'<div class="one-type">' + _e("Requesting this service...") + '</div>' + 
+							'</div>'
+						);
+						
+						// We display the category
+						$('#' + target + ' .disco-wait').show();
+						
+						// We ask the server what's the service type
+						getDataFormType(itemHost, itemNode, sessionID);
+					}
+				});
+			}
+			
+			// Else, there are no items for this query
+			else
+				noResultDataForm(pathID);
+		}
+		
+		else if((type == 'muc') || (type == 'search') || (type == 'subscribe') || ((type == 'command') && $(handleXML).find('command').attr('xmlns'))) {
+			// Get some values
+			var xCommand = $(handleXML).find('command');
+			var bNode = xCommand.attr('node');
+			var bSession = xCommand.attr('sessionid');
+			var bStatus = xCommand.attr('status');
+			var xRegister = $(handleXML).find('query[xmlns=' + NS_REGISTER + ']').text();
+			var xElement = $(handleXML).find('x');
+			
+			// Search done
+			if((xElement.attr('type') == 'result') && (type == 'search')) {
+				var bPath = pathID;
+				
+				// Display the result
+				$(handleXML).find('item').each(function() {
+					var bXID = $(this).find('field[var=jid] value:first').text();
+					var bName = $(this).find('field[var=fn] value:first').text();
+					var bCountry = $(this).find('field[var=ctry] value:first').text();
+					var dName = bName;
+					
+					// Override "undefined" value
+					if(!bXID)
+						bXID = '';
+					if(!bName)
+						bName = _e("Unknown name");
+					if(!bCountry)
+						bCountry = _e("Unknown country");
+					
+					// User hash
+					var bHash = hex_md5(bXID);
+					
+					// HTML code
+					var bHTML = '<div class="oneresult ' + target + '-oneresult ' + bHash + '">' + 
+							'<div class="avatar-container">' + 
+								'<img class="avatar" src="' + './img/others/default-avatar.png' + '" alt="" />' + 
+							'</div>' + 
+							'<div class="one-fn">' + bName + '</div>' + 
+							'<div class="one-ctry">' + bCountry + '</div>' + 
+							'<div class="one-jid">' + bXID + '</div>' + 
+							'<div class="buttons-container">';
+					
+					// The buddy is not in our buddy list?
+					if(!exists('#buddy-list .buddy[data-xid=' + escape(bXID) + ']'))
+						bHTML += '<a href="#" class="one-add one-vjud one-button talk-images">' + _e("Add") + '</a>';
+					
+					// Chat button, if not in welcome/directory mode
+					if(target == 'discovery')
+						bHTML += '<a href="#" class="one-chat one-vjud one-button talk-images">' + _e("Chat") + '</a>';
+					
+					// Close the HTML element
+					bHTML += '</div></div>';
+					
+					$(bPath).append(bHTML);
+					
+					// Click events
+					$(bPath + ' .' + bHash + ' a').click(function() {
+						// Buddy add
+						if($(this).is('.one-add')) {
+							$(this).hide();
+							
+							addThisContact(bXID, dName);
+						}
+						
+						// Buddy chat
+						if($(this).is('.one-chat')) {
+							if(target == 'discovery')
+								closeDiscovery();
+							
+							checkChatCreate(bXID , 'chat', '', '', dName);
+						}
+						
+						return false;
+					});
+					
+					// Get the user's avatar
+					if(bXID)
+						getAvatar(bXID, 'cache', 'true', 'forget');
+				});
+				
+				// No result?
+				if(!$(handleXML).find('item').size())
+					noResultDataForm(pathID);
+				
+				// Previous button
+				buttonsDataForm(type, 'back', sessionID, from, bNode, bSession, target, pathID);
+			}
+			
+			// Command to complete
+			else if(xElement.attr('xmlns') || ((type == 'subscribe') && xRegister)) {
+				// We display the elements
+				fillDataForm(handleXML, sessionID);
+				
+				// We display the buttons
+				if(bStatus != 'completed')
+					buttonsDataForm(type, 'submit', sessionID, from, bNode, bSession, target, pathID);
+				else
+					buttonsDataForm(type, 'back', sessionID, from, bNode, bSession, target, pathID);
+			}
+			
+			// Command completed or subscription done
+			else if(((bStatus == 'completed') && (type == 'command')) || (!xRegister && (type == 'subscribe'))) {
+				// Display the good text
+				var cNote = $(xCommand).find('note');
+				
+				// Any note?
+				if(cNote.size()) {
+					cNote.each(function() {
+						$(pathID).append(
+							'<div class="onetitle ' + target + '-oneresult">' + $(this).text().htmlEnc() + '</div>'
+						);
+					});
+				}
+				
+				// Default text
+				else
+					$(pathID).append('<div class="oneinstructions ' + target + '-oneresult">' + _e("Your form has been sent.") + '</div>');
+				
+				// Display the back button
+				buttonsDataForm(type, 'back', sessionID, from, '', '', target, pathID);
+				
+				// Add the gateway to our roster if subscribed
+				if(type == 'subscribe')
+					addThisContact(from);
+			}
+			
+			// Command canceled
+			else if((bStatus == 'canceled') && (type == 'command')) {
+				if(target == 'discovery')
+					startDiscovery();
+				else if(target == 'adhoc')
+					dataForm(from, 'command', '', '', 'adhoc');
+			}
+			
+			// No items for this query
+			else
+				noResultDataForm(pathID);
+		}
+		
+		else if(type == 'command') {
+			if($(handleXML).find('item').attr('jid')) {
+				// We display the elements
+				$(handleXML).find('item').each(function() {
+					// We parse the received xml
+					var itemHost = $(this).attr('jid');
+					var itemNode = $(this).attr('node');
+					var itemName = $(this).attr('name');
+					var itemHash = hex_md5(itemHost);
+					
+					// We display the waiting element
+					$(pathID).prepend(
+						'<div class="oneresult ' + target + '-oneresult ' + itemHash + '" onclick="return dataForm(\'' + encodeOnclick(itemHost) + '\', \'command\', \'' + encodeOnclick(itemNode) + '\', \'execute\', \'' + encodeOnclick(target) + '\');">' + 
+							'<div class="one-name">' + itemName + '</div>' + 
+							'<div class="one-next">»</div>' + 
+						'</div>'
+					);
+				});
+			}
+			
+			// Else, there are no items for this query
+			else
+				noResultDataForm(pathID);
+		}
+	}
+	
+	// Focus on the first input
+	$(document).oneTime(10, function() {
+		$(pathID + ' input:visible:first').focus();
+	});
+	
+	// Hide the wait icon
+	$('#' + target + ' .wait').hide();
+}
+
+// Fills the dataform elements
+function fillDataForm(xml, id) {
+	/* REF: http://xmpp.org/extensions/xep-0004.html */
+	
+	// Initialize new vars
+	var target = id.split('-')[0];
+	var pathID = '#' + target + ' .results[data-session=' + id + ']';
+	var selector, is_dataform;
+	
+	// Is it a dataform?
+	if($(xml).find('x[xmlns=' + NS_XDATA + ']').size())
+		is_dataform = true;
+	else
+		is_dataform = false;
+	
+	// Determines the good selector to use
+	if(is_dataform)
+		selector = $(xml).find('x[xmlns=' + NS_XDATA + ']');
+	else
+		selector = $(xml);
+	
+	// Form title
+	selector.find('title').each(function() {
+		$(pathID).append(
+			'<div class="onetitle ' + target + '-oneresult">' + $(this).text().htmlEnc() + '</div>'
+		);
+	});
+	
+	// Form instructions
+	selector.find('instructions').each(function() {
+		$(pathID).append(
+			'<div class="oneinstructions ' + target + '-oneresult">' + $(this).text().htmlEnc() + '</div>'
+		);
+	});
+	
+	// Register?
+	if(!is_dataform) {
+		// Items to detect
+		var reg_names = [_e("Nickname"), _e("Name"), _e("Password"), _e("E-mail")];
+		var reg_ids = ['username', 'name', 'password', 'email'];
+		
+		// Append these inputs
+		for(a in reg_names) {
+			selector.find(reg_ids[a]).each(function() {
+				$(pathID).append(
+					'<div class="oneresult ' + target + '-oneresult">' + 
+						'<label>' + reg_names[a] + '</label>' + 
+						'<input name="' + reg_ids[a] + '" type="text" class="register-special dataform-i" />' + 
+					'</div>'
+				);
+			});
+		}
+		
+		return false;
+	}
+	
+	// Dataform?
+	selector.find('field').each(function() {
+		// We parse the received xml
+		var type = $(this).attr('type');
+		var label = $(this).attr('label');
+		var field = $(this).attr('var');
+		var value = $(this).find('value:first').text();
+		var required = '';
+		
+		// No value?
+		if(!field)
+			return;
+		
+		// Required input?
+		if($(this).find('required').size())
+			required = ' required=""';
+		
+		// Compatibility fix
+		if(!label)
+			label = field;
+		
+		if(!type)
+			type = '';
+		
+		// Generate some values
+		var input;
+		var hideThis = '';
+		
+		// Fixed field
+		if(type == 'fixed')
+			$(pathID).append('<div class="oneinstructions">' + value.htmlEnc() + '</div>');
+		
+		else {
+			// Hidden field
+			if(type == 'hidden') {
+				hideThis = ' style="display: none;"';
+				input = '<input name="' + encodeQuotes(field) + '" data-type="' + encodeQuotes(type) + '" type="hidden" class="dataform-i" value="' + encodeQuotes(value) + '" ' + required + ' />';
+			}
+
+			// Boolean field
+			else if(type == 'boolean') {
+				var checked;
+				
+				if(value == '1')
+					checked = 'checked';
+				else
+					checked = '';
+				
+				input = '<input name="' + encodeQuotes(field) + '" type="checkbox" data-type="' + encodeQuotes(type) + '" class="dataform-i df-checkbox" ' + checked + required + ' />';
+			}
+			
+			// List-single/list-multi field
+			else if((type == 'list-single') || (type == 'list-multi')) {
+				var multiple = '';
+				
+				// Multiple options?
+				if(type == 'list-multi')
+					multiple = ' multiple=""';
+				
+				// Append the select field
+				input = '<select name="' + encodeQuotes(field) + '" data-type="' + encodeQuotes(type) + '" class="dataform-i"' + required + multiple + '>';
+				var selected;
+				
+				// Append the available options
+				$(this).find('option').each(function() {
+					var nLabel = $(this).attr('label');
+					var nValue = $(this).find('value').text();
+					
+					// No label?
+					if(!nLabel)
+						nLabel = nValue;
+					
+					// If this is the selected value
+					if(nValue == value)
+						selected = 'selected';
+					else
+						selected = '';
+					
+					input += '<option ' + selected + ' value="' + encodeQuotes(nValue) + '">' + nLabel.htmlEnc() + '</option>';
+				});
+				
+				input += '</select>';
+			}
+			
+			// Text-multi field
+			else if(type == 'text-multi')
+				input = '<textarea rows="8" cols="60" data-type="' + encodeQuotes(type) + '" name="' + encodeQuotes(field) + '" class="dataform-i"' + required + '>' + value.htmlEnc() + '</textarea>';
+			
+			// JID-multi field
+			else if(type == 'jid-multi') {
+				// Put the XID into an array
+				var xid_arr = [];
+				
+				$(this).find('value').each(function() {
+					var cValue = $(this).text();
+					
+					if(!existArrayValue(xid_arr, cValue))
+						xid_arr.push(cValue);
+				});
+				
+				// Sort the array
+				xid_arr.sort();
+				
+				// Create the input
+				var xid_value = '';
+				
+				if(xid_arr.length) {
+					for(i in xid_arr) {
+						// Any pre-value
+						if(xid_value)
+							xid_value += ', ';
+						
+						// Add the current XID
+						xid_value += xid_arr[i];
+					}
+				}
+				
+				input = '<input name="' + encodeQuotes(field) + '" data-type="' + encodeQuotes(type) + '" type="text" class="dataform-i" value="' + encodeQuotes(xid_value) + '" placeholder="jack@jappix.com, jones@jappix.com"' + required + ' />';
+			}
+			
+			// Other stuffs that are similar
+			else {
+				// Text-single field
+				var iType = 'text';
+				
+				// Text-private field
+				if(type == 'text-private')
+					iType = 'password';
+				
+				// JID-single field
+				else if(type == 'jid-single')
+					iType = 'email';
+				
+				input = '<input name="' + encodeQuotes(field) + '" data-type="' + encodeQuotes(type) + '" type="' + iType + '" class="dataform-i" value="' + encodeQuotes(value) + '"' + required + ' />';
+			}
+			
+			// Append the HTML markup for this field
+			$(pathID).append(
+				'<div class="oneresult ' + target + '-oneresult"' + hideThis + '>' + 
+					'<label>' + label.htmlEnc() + '</label>' + 
+					input + 
+				'</div>'
+			);
+		}
+	});
+	
+	return false;
+}
+
+// Gets the dataform type
+function getDataFormType(host, node, id) {
+	var iq = new JSJaCIQ();
+	iq.setID(id + '-' + genID());
+	iq.setTo(host);
+	iq.setType('get');
+	
+	var iqQuery = iq.setQuery(NS_DISCO_INFO);
+	
+	if(node)
+		iqQuery.setAttribute('node', node);
+	
+	con.send(iq, handleThisBrowse);
+}
+
+// Handles the browse stanza
+function handleThisBrowse(iq) {
+	/* REF: http://xmpp.org/registrar/disco-categories.html */
+	
+	var id = iq.getID();
+	var splitted = id.split('-');
+	var target = splitted[0];
+	var sessionID = target + '-' + splitted[1];
+	var from = fullXID(getStanzaFrom(iq));
+	var hash = hex_md5(from);
+	var handleXML = iq.getQuery();
+	var pathID = '#' + target + ' .results[data-session=' + sessionID + ']';
+	
+	// We first remove the waiting element
+	$(pathID + ' .disco-wait .' + hash).remove();
+	
+	if($(handleXML).find('identity').attr('type')) {
+		var category = $(handleXML).find('identity').attr('category');
+		var type = $(handleXML).find('identity').attr('type');
+		var named = $(handleXML).find('identity').attr('name');
+		
+		if(named)
+			gName = named;
+		else
+			gName = '';
+		
+		var one, two, three, four, five;
+		
+		// Get the features that this entity supports
+		var findFeature = $(handleXML).find('feature');
+		
+		for(i in findFeature) {
+			var current = findFeature.eq(i).attr('var');
+			
+			switch(current) {
+				case NS_SEARCH:
+					one = 1;
+					break;
+				
+				case NS_MUC:
+					two = 1;
+					break;
+				
+				case NS_REGISTER:
+					three = 1;
+					break;
+				
+				case NS_COMMANDS:
+					four = 1;
+					break;
+				
+				case NS_DISCO_ITEMS:
+					five = 1;
+					break;
+				
+				default:
+					break;
+			}
+		}
+		
+		var buttons = Array(one, two, three, four, five);
+		
+		// We define the toolbox links depending on the supported features
+		var tools = '';
+		var aTools = Array('search', 'join', 'subscribe', 'command', 'browse');
+		var bTools = Array(_e("Search"), _e("Join"), _e("Subscribe"), _e("Command"), _e("Browse"));
+		
+		for(i in buttons) {
+			if(buttons[i])
+				tools += '<a href="#" class="one-button ' + aTools[i] + ' talk-images" onclick="return dataForm(\'' + encodeOnclick(from) + '\', \'' + encodeOnclick(aTools[i]) + '\', \'\', \'\', \'' + encodeOnclick(target) + '\');" title="' + encodeOnclick(bTools[i]) + '"></a>';
+		}
+		
+		// As defined in the ref, we detect the type of each category to put an icon
+		switch(category) {
+			case 'account':
+			case 'auth':
+			case 'automation':
+			case 'client':
+			case 'collaboration':
+			case 'component':
+			case 'conference':
+			case 'directory':
+			case 'gateway':
+			case 'headline':
+			case 'hierarchy':
+			case 'proxy':
+			case 'pubsub':
+			case 'server':
+			case 'store':
+				break;
+			
+			default:
+				category = 'others';
+		}
+		
+		// We display the item we found
+		$(pathID + ' .disco-' + category + ' .disco-category-title').after(
+			'<div class="oneresult ' + target + '-oneresult ' + hash + '">' + 
+				'<div class="one-icon ' + category + ' talk-images"></div>' + 
+				'<div class="one-host">' + from + '</div>' + 
+				'<div class="one-type">' + gName + '</div>' + 
+				'<div class="one-actions">' + tools + '</div>' + 
+			'</div>'
+		);
+		
+		// We display the category
+		$(pathID + ' .disco-' + category).show();
+	}
+	
+	else {
+		$(pathID + ' .disco-others .disco-category-title').after(
+			'<div class="oneresult ' + target + '-oneresult">' + 
+				'<div class="one-icon down talk-images"></div>' + 
+				'<div class="one-host">' + from + '</div>' + 
+				'<div class="one-type">' + _e("Service offline or broken") + '</div>' + 
+			'</div>'
+		);
+		
+		// We display the category
+		$(pathID + ' .disco-others').show();
+	}
+	
+	// We hide the waiting stuffs if there's no remaining loading items
+	if(!$(pathID + ' .disco-wait .' + target + '-oneresult').size())
+		$(pathID + ' .disco-wait, #' + target + ' .wait').hide();
+}
+
+// Cleans the current data-form popup
+function cleanDataForm(target) {
+	if(target == 'discovery')
+		cleanDiscovery();
+	else
+		$('#' + target + ' div.results').empty();
+}
+
+// Displays the no result indicator
+function noResultDataForm(path) {
+	$(path).prepend('<p class="no-results">' + _e("Sorry, but the entity didn't return any result!") + '</p>');
+}
diff --git a/jappixmini/jappix/js/datastore.js b/jappixmini/jappix/js/datastore.js
new file mode 100644
index 00000000..b818b301
--- /dev/null
+++ b/jappixmini/jappix/js/datastore.js
@@ -0,0 +1,209 @@
+/*
+
+Jappix - An open social platform
+These are the temporary/persistent data store functions
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 23/06/11
+
+*/
+
+// Temporary: returns whether it is available or not
+function hasDB() {
+	if(window.sessionStorage)
+		return true;
+	
+	return false;
+}
+
+// Temporary: used to read a database entry
+function getDB(type, id) {
+	try {
+		return sessionStorage.getItem(type + '_' + id);
+	}
+	
+	catch(e) {
+		logThis('Error while getting a temporary database entry (' + type + ' -> ' + id + '): ' + e, 1);
+		
+		return null;
+	}
+}
+
+// Temporary: used to update a database entry
+function setDB(type, id, value) {
+	try {
+		sessionStorage.setItem(type + '_' + id, value);
+		
+		return true;
+	}
+	
+	catch(e) {
+		logThis('Error while writing a temporary database entry (' + type + ' -> ' + id + '): ' + e, 1);
+		
+		return false;
+	}
+}
+
+// Temporary: used to remove a database entry
+function removeDB(type, id) {
+	try {
+		sessionStorage.removeItem(type + '_' + id);
+		
+		return true;
+	}
+	
+	catch(e) {
+		logThis('Error while removing a temporary database entry (' + type + ' -> ' + id + '): ' + e, 1);
+		
+		return false;
+	}
+}
+
+// Temporary: used to check a database entry exists
+function existDB(type, id) {
+	var read = getDB(type, id);
+	
+	if(read != null)
+		return true;
+	
+	return false;
+}
+
+// Temporary: used to clear all the database
+function resetDB() {
+	try {
+		sessionStorage.clear();
+		
+		logThis('Temporary database cleared.', 3);
+		
+		return true;
+	}
+	
+	catch(e) {
+		logThis('Error while clearing temporary database: ' + e, 1);
+		
+		return false;
+	}
+}
+
+// Persistent: returns whether it is available or not
+function hasPersistent() {
+	if(window.localStorage)
+		return true;
+	
+	return false;
+}
+
+// Persistent: used to read a database entry
+function getPersistent(type, id) {
+	try {
+		return localStorage.getItem(type + '_' + id);
+	}
+	
+	catch(e) {
+		logThis('Error while getting a persistent database entry (' + type + ' -> ' + id + '): ' + e, 1);
+		
+		return null;
+	}
+}
+
+// Persistent: used to update a database entry
+function setPersistent(type, id, value) {
+	try {
+		localStorage.setItem(type + '_' + id, value);
+		
+		return true;
+	}
+	
+	// Database might be full
+	catch(e) {
+		logThis('Retrying: could not write a persistent database entry (' + type + ' -> ' + id + '): ' + e, 2);
+		
+		// Flush it!
+		flushPersistent();
+		
+		// Set the item again
+		try {
+			localStorage.setItem(type + '_' + id, value);
+			
+			return true;
+		}
+		
+		// New error!
+		catch(e) {
+			logThis('Aborted: error while writing a persistent database entry (' + type + ' -> ' + id + '): ' + e, 1);
+			
+			return false;
+		}
+	}
+}
+
+// Persistent: used to remove a database entry
+function removePersistent(type, id) {
+	try {
+		localStorage.removeItem(type + '_' + id);
+		
+		return true;
+	}
+	
+	catch(e) {
+		logThis('Error while removing a persistent database entry (' + type + ' -> ' + id + '): ' + e, 1);
+		
+		return false;
+	}
+}
+
+// Persistent: used to check a database entry exists
+function existPersistent(type, id) {
+	var read = getPersistent(type, id);
+	
+	if(read != null)
+		return true;
+	
+	return false;
+}
+
+// Persistent: used to clear all the database
+function resetPersistent() {
+	try {
+		localStorage.clear();
+		
+		logThis('Persistent database cleared.', 3);
+		
+		return true;
+	}
+	
+	catch(e) {
+		logThis('Error while clearing persistent database: ' + e, 1);
+		
+		return false;
+	}
+}
+
+// Persistent: used to flush the database
+function flushPersistent() {
+	try {
+		// Get the stored session entry
+		var session = getPersistent('session', 1);
+		
+		// Clear the persistent database
+		localStorage.clear();
+		
+		// Restaure the stored session entry
+		if(session)
+			setPersistent('session', 1, session);
+		
+		logThis('Persistent database flushed.', 3);
+		
+		return true;
+	}
+	
+	catch(e) {
+		logThis('Error while flushing persistent database: ' + e, 1);
+		
+		return false;
+	}
+}
diff --git a/jappixmini/jappix/js/date.js b/jappixmini/jappix/js/date.js
new file mode 100644
index 00000000..adbe01c8
--- /dev/null
+++ b/jappixmini/jappix/js/date.js
@@ -0,0 +1,214 @@
+/*
+
+Jappix - An open social platform
+These are the date related JS scripts for Jappix
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 17/08/11
+
+*/
+
+// Gets a stamp from a date
+function extractStamp(date) {
+	return Math.round(date.getTime() / 1000);
+}
+
+// Gets the time from a date
+function extractTime(date) {
+	return date.toLocaleTimeString();
+}
+
+// Gets the actual date stamp
+function getTimeStamp() {
+	return extractStamp(new Date());
+}
+
+// Gets the last user activity in seconds
+var LAST_ACTIVITY = 0;
+
+function getLastActivity() {
+	// Last activity not yet initialized?
+	if(LAST_ACTIVITY == 0)
+		return 0;
+	
+	return getTimeStamp() - LAST_ACTIVITY;
+}
+
+// Gets the last user available presence in seconds
+var PRESENCE_LAST_ACTIVITY = 0;
+
+function getPresenceLast() {
+	// Last presence stamp not yet initialized?
+	if(PRESENCE_LAST_ACTIVITY == 0)
+		return 0;
+	
+	return getTimeStamp() - PRESENCE_LAST_ACTIVITY;
+}
+
+// Generates the time for XMPP
+function getXMPPTime(location) {
+	/* FROM : http://trac.jwchat.org/jsjac/browser/branches/jsjac_1.0/jsextras.js?rev=221 */
+	
+	// Initialize
+	var jInit = new Date();
+	var year, month, day, hours, minutes, seconds;
+	
+	// Gets the UTC date
+	if(location == 'utc') {
+		year = jInit.getUTCFullYear();
+		month = jInit.getUTCMonth();
+		day = jInit.getUTCDate();
+		hours = jInit.getUTCHours();
+		minutes = jInit.getUTCMinutes();
+		seconds = jInit.getUTCSeconds();
+	}
+	
+	// Gets the local date
+	else {
+		year = jInit.getFullYear();
+		month = jInit.getMonth();
+		day = jInit.getDate();
+		hours = jInit.getHours();
+		minutes = jInit.getMinutes();
+		seconds = jInit.getSeconds();
+	}
+	
+	// Generates the date string
+	var jDate = year + '-';
+	jDate += padZero(month + 1) + '-';
+	jDate += padZero(day) + 'T';
+	jDate += padZero(hours) + ':';
+	jDate += padZero(minutes) + ':';
+	jDate += padZero(seconds) + 'Z';
+	
+	// Returns the date string
+	return jDate;
+}
+
+// Generates then human time
+function getCompleteTime() {
+	var init = new Date();
+	var time = padZero(init.getHours()) + ':';
+	time += padZero(init.getMinutes()) + ':';
+	time += padZero(init.getSeconds());
+	
+	return time;
+}
+
+// Gets the TZO of a date
+function getDateTZO() {
+	// Get the date
+	var date = new Date();
+	var offset = date.getTimezoneOffset();
+	
+	// Default vars
+	var sign = '';
+	var hours = 0;
+	var minutes = 0;
+	
+	// Process a neutral offset
+	if(offset < 0) {
+		offset = offset * -1;
+		sign = '+';
+	}
+	
+	// Get the values
+	var n_date = new Date(offset * 60 * 1000);
+	hours = n_date.getHours() - 1;
+	minutes = n_date.getMinutes();
+	
+	// Process the TZO
+	tzo = sign + padZero(hours) + ':' + padZero(minutes);
+	
+	// Return the processed value
+	return tzo;
+}
+
+// Parses a XMPP date (yyyy-mm-dd, hh-mm-ss) into an human-readable one
+function parseDate(to_parse) {
+	var date = Date.jab2date(to_parse);
+	var parsed = date.toLocaleDateString() + ' (' + date.toLocaleTimeString() + ')';
+	
+	return parsed; 
+}
+
+// Parses a XMPP date (yyyy-mm-dd) into an human-readable one
+function parseDay(to_parse) {
+	var date = Date.jab2date(to_parse);
+	var parsed = date.toLocaleDateString();
+	
+	return parsed; 
+}
+
+// Parses a XMPP date (hh-mm-ss) into an human-readable one
+function parseTime(to_parse) {
+	var date = Date.jab2date(to_parse);
+	var parsed = date.toLocaleTimeString();
+	
+	return parsed; 
+}
+
+// Parses a XMPP date stamp into a relative one
+function relativeDate(to_parse) {
+	// Get the current date
+	var current_date = Date.jab2date(getXMPPTime('utc'));
+	var current_day = current_date.getDate();
+	var current_stamp = current_date.getTime();
+	
+	// Parse the given date
+	var old_date = Date.jab2date(to_parse);
+	var old_day = old_date.getDate();
+	var old_stamp = old_date.getTime();
+	var old_time = old_date.toLocaleTimeString();
+	
+	// Get the day number between the two dates
+	var days = Math.round((current_stamp - old_stamp) / 86400000);
+	
+	// Invalid date?
+	if(isNaN(old_stamp) || isNaN(days))
+		return getCompleteTime();
+	
+	// Is it today?
+	if(current_day == old_day)
+		return old_time;
+	
+	// It is yesterday?
+	if(days <= 1)
+		return _e("Yesterday") + ' - ' + old_time;
+	
+	// Is it less than a week ago?
+	if(days <= 7)
+		return printf(_e("%s days ago"), days) + ' - ' + old_time;
+	
+	// Another longer period
+	return old_date.toLocaleDateString() + ' - ' + old_time;
+}
+
+// Reads a message delay
+function readMessageDelay(node) {
+    try {
+	// Initialize
+	var delay, d_delay;
+	
+	// Read the delay
+	d_delay = jQuery(node).find('delay[xmlns=' + NS_URN_DELAY + ']:first').attr('stamp');
+	
+	// New delay (valid XEP)
+	if(d_delay)
+		delay = d_delay;
+	
+	// Old delay (obsolete XEP!)
+	else {
+		// Try to read the old-school delay
+		var x_delay = jQuery(node).find('x[xmlns=' + NS_DELAY + ']:first').attr('stamp');
+		
+		if(x_delay)
+			delay = x_delay.replace(/^(\w{4})(\w{2})(\w{2})T(\w{2}):(\w{2}):(\w{2})Z?(\S+)?/, '$1-$2-$3T$4:$5:$6Z$7');
+	}
+	
+	return delay;
+    } catch(e) {}
+}
diff --git a/jappixmini/jappix/js/directory.js b/jappixmini/jappix/js/directory.js
new file mode 100644
index 00000000..d1f69492
--- /dev/null
+++ b/jappixmini/jappix/js/directory.js
@@ -0,0 +1,87 @@
+/*
+
+Jappix - An open social platform
+These are the directory JS scripts for Jappix
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 03/03/11
+
+*/
+
+// Opens the directory popup
+function openDirectory() {
+	// Popup HTML content
+	var html = 
+	'<div class="top">' + _e("User directory") + '</div>' + 
+	
+	'<div class="content">' + 
+		'<div class="directory-head">' + 
+			'<div class="directory-server-text">' + _e("Server to query") + '</div>' + 
+			
+			'<input name="directory-server-input" class="directory-server-input" value="' + encodeQuotes(HOST_VJUD) + '" />' + 
+		'</div>' + 
+		
+		'<div class="results directory-results"></div>' + 
+	'</div>' + 
+	
+	'<div class="bottom">' + 
+		'<div class="wait wait-medium"></div>' + 
+		
+		'<a href="#" class="finish">' + _e("Close") + '</a>' + 
+	'</div>';
+	
+	// Create the popup
+	createPopup('directory', html);
+	
+	// Associate the events
+	launchDirectory();
+	
+	// Start a search!
+	startDirectory();
+	
+	return false;
+}
+
+// Quits the directory popup
+function closeDirectory() {
+	// Destroy the popup
+	destroyPopup('directory');
+	
+	return false;
+}
+
+// Launches a directory search
+function startDirectory() {
+	// Get the server to query
+	var server = $('#directory .directory-server-input').val();
+	
+	// Launch the search!
+	dataForm($('#directory .directory-server-input').val(), 'search', '', '', 'directory');
+	
+	logThis('Directory search launched: ' + server);
+	
+	return false;
+}
+
+// Addon launcher
+function launchDirectory() {
+	// Click event
+	$('#directory .bottom .finish').click(closeDirectory);
+	
+	// Keyboard event
+	$('#directory .directory-server-input').keyup(function(e) {
+		if(e.keyCode == 13) {
+			// No value?
+			if(!$(this).val())
+				$(this).val(HOST_VJUD);
+			
+			// Start the directory search
+			startDirectory();
+			
+			return false;
+		}
+	});
+}
diff --git a/jappixmini/jappix/js/discovery.js b/jappixmini/jappix/js/discovery.js
new file mode 100644
index 00000000..f4bc0d42
--- /dev/null
+++ b/jappixmini/jappix/js/discovery.js
@@ -0,0 +1,169 @@
+/*
+
+Jappix - An open social platform
+These are the discovery JS scripts for Jappix
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 03/03/11
+
+*/
+
+// Opens the discovery popup
+function openDiscovery() {
+	// Popup HTML content
+	var html = 
+	'<div class="top">' + _e("Service discovery") + '</div>' + 
+	
+	'<div class="content">' + 
+		'<div class="discovery-head">' + 
+			'<div class="disco-server-text">' + _e("Server to query") + '</div>' + 
+			
+			'<input name="disco-server-input" class="disco-server-input" value="' + encodeQuotes(HOST_MAIN) + '" />' + 
+		'</div>' + 
+		
+		'<div class="results discovery-results">' + 
+			'<div class="disco-category disco-account">' + 
+				'<p class="disco-category-title">' + _e("Accounts") + '</p>' + 
+			'</div>' + 
+			
+			'<div class="disco-category disco-auth">' + 
+				'<p class="disco-category-title">' + _e("Authentications") + '</p>' + 
+			'</div>' + 
+			
+			'<div class="disco-category disco-automation">' + 
+				'<p class="disco-category-title">' + _e("Automation") + '</p>' + 
+			'</div>' + 
+			
+			'<div class="disco-category disco-client">' + 
+				'<p class="disco-category-title">' + _e("Clients") + '</p>' + 
+			'</div>' + 
+			
+			'<div class="disco-category disco-collaboration">' + 
+				'<p class="disco-category-title">' + _e("Collaboration") + '</p>' + 
+			'</div>' + 
+			
+			'<div class="disco-category disco-component">' + 
+				'<p class="disco-category-title">' + _e("Components") + '</p>' + 
+			'</div>' + 
+			
+			'<div class="disco-category disco-conference">' + 
+				'<p class="disco-category-title">' + _e("Rooms") + '</p>' + 
+			'</div>' + 
+			
+			'<div class="disco-category disco-directory">' + 
+				'<p class="disco-category-title">' + _e("Directories") + '</p>' + 
+			'</div>' + 
+			
+			'<div class="disco-category disco-gateway">' + 
+				'<p class="disco-category-title">' + _e("Gateways") + '</p>' + 
+			'</div>' + 
+			
+			'<div class="disco-category disco-headline">' + 
+				'<p class="disco-category-title">' + _e("News") + '</p>' + 
+			'</div>' + 
+			
+			'<div class="disco-category disco-hierarchy">' + 
+				'<p class="disco-category-title">' + _e("Hierarchy") + '</p>' + 
+			'</div>' + 
+			
+			'<div class="disco-category disco-proxy">' + 
+				'<p class="disco-category-title">' + _e("Proxies") + '</p>' + 
+			'</div>' + 
+			
+			'<div class="disco-category disco-pubsub">' + 
+				'<p class="disco-category-title">' + _e("Publication/Subscription") + '</p>' + 
+			'</div>' + 
+			
+			'<div class="disco-category disco-server">' + 
+				'<p class="disco-category-title">' + _e("Server") + '</p>' + 
+			'</div>' + 
+			
+			'<div class="disco-category disco-store">' + 
+				'<p class="disco-category-title">' + _e("Storage") + '</p>' + 
+			'</div>' + 
+			
+			'<div class="disco-category disco-others">' + 
+				'<p class="disco-category-title">' + _e("Others") + '</p>' + 
+			'</div>' + 
+			
+			'<div class="disco-category disco-wait">' + 
+				'<p class="disco-category-title">' + _e("Loading") + '</p>' + 
+			'</div>' + 
+		'</div>' + 
+	'</div>' + 
+	
+	'<div class="bottom">' + 
+		'<div class="wait wait-medium"></div>' + 
+		
+		'<a href="#" class="finish">' + _e("Close") + '</a>' + 
+	'</div>';
+	
+	// Create the popup
+	createPopup('discovery', html);
+	
+	// Associate the events
+	launchDiscovery();
+	
+	// We request a disco to the default server
+	startDiscovery();
+	
+	return false;
+}
+
+// Quits the discovery popup
+function closeDiscovery() {
+	// Destroy the popup
+	destroyPopup('discovery');
+	
+	return false;
+}
+
+// Launches a discovery
+function startDiscovery() {
+	/* REF: http://xmpp.org/extensions/xep-0030.html */
+	
+	// We get the server to query
+	var discoServer = $('#discovery .disco-server-input').val();
+	
+	// We launch the items query
+	dataForm(discoServer, 'browse', '', '', 'discovery');
+	
+	logThis('Service discovery launched: ' + discoServer);
+	
+	return false;
+}
+
+// Cleans the discovery results
+function cleanDiscovery() {
+	// We remove the results
+	$('#discovery .discovery-oneresult, #discovery .oneinstructions, #discovery .onetitle, #discovery .no-results').remove();
+	
+	// We clean the user info
+	$('#discovery .disco-server-info').text('');
+	
+	// We hide the wait icon, the no result alert and the results
+	$('#discovery .wait, #discovery .disco-category').hide();
+}
+
+// Addon launcher
+function launchDiscovery() {
+	// Click event
+	$('#discovery .bottom .finish').click(closeDiscovery);
+	
+	// Keyboard event
+	$('#discovery .disco-server-input').keyup(function(e) {
+		if(e.keyCode == 13) {
+			// No value?
+			if(!$(this).val())
+				$(this).val(HOST_MAIN);
+			
+			// Start the discovery
+			startDiscovery();
+			
+			return false;
+		}
+	});
+}
diff --git a/jappixmini/jappix/js/error.js b/jappixmini/jappix/js/error.js
new file mode 100644
index 00000000..c16ca2a5
--- /dev/null
+++ b/jappixmini/jappix/js/error.js
@@ -0,0 +1,139 @@
+/*
+
+Jappix - An open social platform
+These are the error functions for Jappix
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 02/04/11
+
+*/
+
+// Shows the given error output
+function showError(condition, reason, type) {
+	// Enough data to output the error
+	if(condition || reason) {
+		// Initialize the error text
+		var eText = '';
+		
+		// Any error condition
+		if(condition)
+			eText += condition;
+		
+		// Any error type
+		if(type && eText)
+			eText += ' (' + type + ')';
+		
+		// Any error reason
+		if(reason) {
+			if(eText)
+				eText += ' - ';
+			
+			eText += reason;
+		}
+		
+		// We reveal the error
+		openThisError(1);
+		
+		// Create the error text
+		$('#board .one-board.error[data-id=1] span').text(eText);
+	}
+	
+	// Not enough data to output the error: output a generic board
+	else
+		openThisError(2);
+}
+
+// Handles the error from a packet and return true if any error
+function handleError(packet) {
+	/* REF: http://xmpp.org/extensions/xep-0086.html */
+	
+	// Initialize
+	var type, code, reason, condition;
+	var node = $(packet);
+	
+	// First level error (connection error)
+	if(node.is('error')) {
+		// Get the value
+		code = node.attr('code');
+		
+		// Specific error reason
+		switch(code) {
+			case '401':
+				reason = _e("Authorization failed");
+				break;
+			
+			case '409':
+				reason = _e("Registration failed, please choose a different username");
+				break;
+			
+			case '503':
+				reason = _e("Service unavailable");
+				break;
+			
+			case '500':
+				reason = _e("Internal server error, try later");
+				break;
+			
+			default:
+				reason = node.find('text').text();
+				break;
+		}
+		
+		// Remove the general wait item (security)
+		removeGeneralWait();
+		
+		// Show reconnect pane
+		if(CURRENT_SESSION && CONNECTED) {
+			// Anonymous?
+			if(isAnonymous())
+				createReconnect('anonymous');
+			else
+				createReconnect('normal');
+		}
+		
+		// Show the homepage (security)
+		else if(!CURRENT_SESSION || !CONNECTED) {
+			$('#home').show();
+			pageTitle('home');
+		}
+		
+		// Still connected? (security)
+		if(isConnected())
+			con.disconnect();
+		
+		logThis('First level error received.', 1);
+	}
+	
+	// Second level error (another error)
+	else if(node.find('error').size()) {
+		type = node.find('error').attr('type');
+		reason = node.find('error text').text();
+		condition = packet.getElementsByTagName('error').item(0).childNodes.item(0).nodeName.replace(/-/g, ' ');
+		
+		logThis('Second level error received.', 1);
+	}
+	
+	// No error
+	else
+		return false;
+	
+	// Show the error board
+	showError(condition, reason, type);
+	
+	// Return there's an error
+	return true;
+}
+
+// Handles the error reply of a packet
+function handleErrorReply(packet) {
+	return handleError(packet.getNode());
+}
+
+// Handles the error reply for a message
+function handleMessageError(packet) {
+	if(!handleErrorReply(packet))
+		handleMessage(packet);
+}
diff --git a/jappixmini/jappix/js/favorites.js b/jappixmini/jappix/js/favorites.js
new file mode 100644
index 00000000..0b4f1cb0
--- /dev/null
+++ b/jappixmini/jappix/js/favorites.js
@@ -0,0 +1,537 @@
+/*
+
+Jappix - An open social platform
+These are the favorites JS scripts for Jappix
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 23/06/11
+
+*/
+
+// Opens the favorites popup
+function openFavorites() {
+	// Popup HTML content
+	var html = 
+	'<div class="top">' + _e("Manage favorite rooms") + '</div>' + 
+	
+	'<div class="content">' + 
+		'<div class="switch-fav">' + 
+			'<div class="room-switcher room-list">' + 
+				'<div class="icon list-icon talk-images"></div>' + 
+				
+				_e("Change favorites") + 
+			'</div>' + 
+			
+			'<div class="room-switcher room-search">' + 
+				'<div class="icon search-icon talk-images"></div>' + 
+				
+				_e("Search a room") + 
+			'</div>' + 
+		'</div>' + 
+		
+		'<div class="static-fav">' + 
+			'<div class="favorites-edit favorites-content">' + 
+				'<div class="head fedit-head static-fav-head">' + 
+					'<div class="head-text fedit-head-text">' + _e("Select a favorite") + '</div>' + 
+					
+					'<select name="fedit-head-select" class="head-select fedit-head-select"></select>' + 
+				'</div>' + 
+				
+				'<div class="results fedit-results static-fav-results">' + 
+					'<div class="fedit-line">' + 
+						'<label>' + _e("Name") + '</label>' + 
+						
+						'<input class="fedit-title" type="text" required="" />' + 
+					'</div>' + 
+					
+					'<div class="fedit-line">' + 
+						'<label>' + _e("Nickname") + '</label>' + 
+						
+						'<input class="fedit-nick" type="text" value="' + getNick() + '" required="" />' + 
+					'</div>' + 
+					
+					'<div class="fedit-line">' + 
+						'<label>' + _e("Room") + '</label>' + 
+						
+						'<input class="fedit-chan" type="text" required="" />' + 
+					'</div>' + 
+					
+					'<div class="fedit-line">' + 
+						'<label>' + _e("Server") + '</label>' + 
+						
+						'<input class="fedit-server" type="text" value="' + HOST_MUC + '" required="" />' + 
+					'</div>' + 
+					
+					'<div class="fedit-line">' + 
+						'<label>' + _e("Password") + '</label>' + 
+						
+						'<input class="fedit-password" type="password" />' + 
+					'</div>' + 
+					
+					'<div class="fedit-line">' + 
+						'<label>' + _e("Automatic") + '</label>' + 
+						
+						'<input type="checkbox" class="fedit-autojoin" />' + 
+					'</div>' + 
+					
+					'<div class="fedit-actions">' + 
+						'<a href="#" class="fedit-terminate fedit-add add one-button talk-images">' + _e("Add") + '</a>' + 
+						'<a href="#" class="fedit-terminate fedit-edit one-button talk-images">' + _e("Edit") + '</a>' + 
+						'<a href="#" class="fedit-terminate fedit-remove remove one-button talk-images">' + _e("Remove") + '</a>' + 
+					'</div>' + 
+				'</div>' + 
+			'</div>' + 
+			
+			'<div class="favorites-search favorites-content">' + 
+				'<div class="head fsearch-head static-fav-head">' + 
+					'<div class="head-text fsearch-head-text">' + _e("Search a room on") + '</div>' + 
+					
+					'<input type="text" class="head-input fsearch-head-server" value="' + HOST_MUC + '" />' + 
+				'</div>' + 
+				
+				'<div class="results fsearch-results static-fav-results">' + 
+					'<p class="fsearch-noresults">' + _e("No room found on this server.") + '</p>' + 
+				'</div>' + 
+			'</div>' + 
+		'</div>' + 
+	'</div>' + 
+	
+	'<div class="bottom">' + 
+		'<div class="wait wait-medium"></div>' + 
+		
+		'<a href="#" class="finish">' + _e("Close") + '</a>' + 
+	'</div>';
+	
+	// Create the popup
+	createPopup('favorites', html);
+	
+	// Load the favorites
+	loadFavorites();
+	
+	// Associate the events
+	launchFavorites();
+}
+
+// Resets the favorites elements
+function resetFavorites() {
+	var path = '#favorites ';
+	
+	$(path + '.wait, ' + path + '.fedit-terminate').hide();
+	$(path + '.fedit-add').show();
+	$(path + '.fsearch-oneresult').remove();
+	$(path + 'input').val('');
+	$(path + '.please-complete').removeClass('please-complete');
+	$(path + '.fedit-nick').val(getNick());
+	$(path + '.fsearch-head-server, ' + path + '.fedit-server').val(HOST_MUC);
+	$(path + '.fedit-autojoin').attr('checked', false);
+}
+
+// Quits the favorites popup
+function quitFavorites() {
+	// Destroy the popup
+	destroyPopup('favorites');
+	
+	return false;
+}
+
+// Adds a room to the favorites
+function addThisFavorite(roomXID, roomName) {
+	// Button path
+	var button = '#favorites .fsearch-results div[data-xid=' + escape(roomXID) + '] a.one-button';
+	
+	// Add a remove button instead of the add one
+	$(button + '.add').replaceWith('<a href="#" class="one-button remove talk-images">' + _e("Remove") + '</a>');
+	
+	// Click event
+	$(button + '.remove').click(function() {
+		return removeThisFavorite(roomXID, roomName);
+	});
+	
+	// Hide the add button in the (opened?) groupchat
+	$('#' + hex_md5(roomXID) + ' .tools-add').hide();
+	
+	// Add the database entry
+	displayFavorites(roomXID, explodeThis(' (', roomName, 0), getNick(), '0', '');
+	
+	// Publish the favorites
+	favoritePublish();
+	
+	return false;
+}
+
+// Removes a room from the favorites
+function removeThisFavorite(roomXID, roomName) {
+	// Button path
+	var button = '#favorites .fsearch-results div[data-xid=' + escape(roomXID) + '] a.one-button';
+	
+	// Add a remove button instead of the add one
+	$(button + '.remove').replaceWith('<a href="#" class="one-button add talk-images">' + _e("Add") + '</a>');
+	
+	// Click event
+	$(button + '.add').click(function() {
+		return addThisFavorite(roomXID, roomName);
+	});
+	
+	// Show the add button in the (opened?) groupchat
+	$('#' + hex_md5(roomXID) + ' .tools-add').show();
+	
+	// Remove the favorite
+	removeFavorite(roomXID, true);
+	
+	// Publish the favorites
+	favoritePublish();
+	
+	return false;
+}
+
+// Edits a favorite
+function editFavorite() {
+	// Path to favorites
+	var favorites = '#favorites .';
+	
+	// Reset the favorites
+	resetFavorites();
+	
+	// Show the edit/remove button, hide the others
+	$(favorites + 'fedit-terminate').hide();
+	$(favorites + 'fedit-edit').show();
+	$(favorites + 'fedit-remove').show();
+	
+	// We retrieve the values
+	var xid = $(favorites + 'fedit-head-select').val();
+	var data = XMLFromString(getDB('favorites', xid));
+	
+	// If this is not the default room
+	if(xid != 'none') {
+		// We apply the values
+		$(favorites + 'fedit-title').val($(data).find('name').text());
+		$(favorites + 'fedit-nick').val($(data).find('nick').text());
+		$(favorites + 'fedit-chan').val(getXIDNick(xid));
+		$(favorites + 'fedit-server').val(getXIDHost(xid));
+		$(favorites + 'fedit-password').val($(data).find('password').text());
+		
+		if($(data).find('autojoin').text() == '1')
+			$(favorites + 'fedit-autojoin').attr('checked', true);
+	}
+	
+	else
+		resetFavorites();
+}
+
+// Adds a favorite
+function addFavorite() {
+	// Path to favorites
+	var favorites = '#favorites .';
+	
+	// We reset the inputs
+	$(favorites + 'fedit-title, ' + favorites + 'fedit-nick, ' + favorites + 'fedit-chan, ' + favorites + 'fedit-server, ' + favorites + 'fedit-password').val('');
+	
+	// Show the add button, hide the others
+	$(favorites + 'fedit-terminate').hide();
+	$(favorites + 'fedit-add').show();
+}
+
+// Terminate a favorite editing
+function terminateThisFavorite(type) {
+	// Path to favorites
+	var favorites = '#favorites ';
+	
+	// We get the values of the current edited groupchat
+	var old_xid = $(favorites + '.fedit-head-select').val();
+	
+	var title = $(favorites + '.fedit-title').val();
+	var nick = $(favorites + '.fedit-nick').val();
+	var room = $(favorites + '.fedit-chan').val();
+	var server = $(favorites + '.fedit-server').val();
+	var xid = room + '@' + server;
+	var password = $(favorites + '.fedit-password').val();
+	var autojoin = '0';
+	
+	if($(favorites + '.fedit-autojoin').filter(':checked').size())
+		autojoin = '1';
+	
+	// We check the missing values and send this if okay
+	if((type == 'add') || (type == 'edit')) {
+		if(title && nick && room && server) {
+			// Remove the edited room
+			if(type == 'edit')
+				removeFavorite(old_xid, true);
+			
+			// Display the favorites
+			displayFavorites(xid, title, nick, autojoin, password);
+			
+			// Reset the inputs
+			resetFavorites();
+		}
+		
+		else {
+			$(favorites + 'input[required]').each(function() {
+				var select = $(this);
+				
+				if(!select.val())
+					$(document).oneTime(10, function() {
+						select.addClass('please-complete').focus();
+					});
+				else
+					select.removeClass('please-complete');	
+			});
+		}
+	}
+	
+	// Must remove a favorite?
+	else if(type == 'remove') {
+		removeFavorite(old_xid, true);
+		
+		// Reset the inputs
+		resetFavorites();
+	}
+	
+	// Publish the new favorites
+	favoritePublish();
+	
+	logThis('Action on this bookmark: ' + room + '@' + server + ' / ' + type, 3);
+	
+	return false;
+}
+
+// Removes a favorite
+function removeFavorite(xid, database) {
+	// We remove the target favorite everywhere needed
+	$('.buddy-conf-groupchat-select option[value=' + xid + ']').remove();
+	$('.fedit-head-select option[value=' + xid + ']').remove();
+	
+	// Must remove it from database?
+	if(database)
+		removeDB('favorites', xid);
+}
+
+// Sends a favorite to the XMPP server
+function favoritePublish() {
+	var iq = new JSJaCIQ();
+	iq.setType('set');
+	
+	var query = iq.setQuery(NS_PRIVATE);
+	var storage = query.appendChild(iq.buildNode('storage', {'xmlns': NS_BOOKMARKS}));
+	
+	// We generate the XML
+	for(var i = 0; i < sessionStorage.length; i++) {
+		// Get the pointer values
+		var current = sessionStorage.key(i);
+		
+		// If the pointer is on a stored favorite
+		if(explodeThis('_', current, 0) == 'favorites') {
+			var data = XMLFromString(sessionStorage.getItem(current));
+			var xid = $(data).find('xid').text();
+			var rName = $(data).find('name').text();
+			var nick = $(data).find('nick').text();
+			var password = $(data).find('password').text();
+			var autojoin = $(data).find('autojoin').text();
+			
+			// We create the node for this groupchat
+			var item = storage.appendChild(iq.buildNode('conference', {'name': rName, 'jid': xid, 'autojoin': autojoin, xmlns: NS_BOOKMARKS}));
+			item.appendChild(iq.buildNode('nick', {xmlns: NS_BOOKMARKS}, nick));
+			
+			if(password)
+				item.appendChild(iq.buildNode('password', {xmlns: NS_BOOKMARKS}, password));
+			
+			logThis('Bookmark sent: ' + xid, 3);
+		}
+	}
+	
+	con.send(iq);
+}
+
+// Gets a list of the MUC items on a given server
+function getGCList() {
+	var path = '#favorites .';
+	var gcServer = $('.fsearch-head-server').val();
+	
+	// We reset some things
+	$(path + 'fsearch-oneresult').remove();
+	$(path + 'fsearch-noresults').hide();
+	$(path + 'wait').show();
+	
+	var iq = new JSJaCIQ();
+	iq.setType('get');
+	iq.setTo(gcServer);
+	
+	iq.setQuery(NS_DISCO_ITEMS);
+	
+	con.send(iq, handleGCList);
+}
+
+// Handles the MUC items list
+function handleGCList(iq) {
+	var path = '#favorites .';
+	var from = fullXID(getStanzaFrom(iq));
+	
+	if (!iq || (iq.getType() != 'result')) {
+		openThisError(3);
+		
+		$(path + 'wait').hide();
+		
+		logThis('Error while retrieving the rooms: ' + from, 1);
+	}
+	
+	else {
+		var handleXML = iq.getQuery();
+		
+		if($(handleXML).find('item').size()) {
+			// Initialize the HTML code
+			var html = '';
+			
+			$(handleXML).find('item').each(function() {
+				var roomXID = $(this).attr('jid');
+				var roomName = $(this).attr('name');
+				
+				if(roomXID && roomName) {
+					// Escaped values
+					var escaped_xid = encodeOnclick(roomXID);
+					var escaped_name = encodeOnclick(roomName);
+					
+					// Initialize the room HTML
+					html += '<div class="oneresult fsearch-oneresult" data-xid="' + escape(roomXID) + '">' + 
+							'<div class="room-name">' + roomName.htmlEnc() + '</div>' + 
+							'<a href="#" class="one-button join talk-images" onclick="return joinFavorite(\'' + escaped_xid + '\');">' + _e("Join") + '</a>';
+					
+					// This room is yet a favorite
+					if(existDB('favorites', roomXID))
+						html += '<a href="#" class="one-button remove talk-images" onclick="return removeThisFavorite(\'' + escaped_xid + '\', \'' + escaped_name + '\');">' + _e("Remove") + '</a>';
+					else
+						html += '<a href="#" class="one-button add talk-images" onclick="return addThisFavorite(\'' + escaped_xid + '\', \'' + escaped_name + '\');">' + _e("Add") + '</a>';
+					
+					// Close the room HTML
+					html += '</div>';
+				}
+			});
+			
+			// Append this code to the popup
+			$(path + 'fsearch-results').append(html);
+		}
+		
+		else
+			$(path + 'fsearch-noresults').show();
+		
+		logThis('Rooms retrieved: ' + from, 3);
+	}
+	
+	$(path + 'wait').hide();
+}
+
+// Joins a groupchat from favorites
+function joinFavorite(room) {
+	quitFavorites();
+	checkChatCreate(room, 'groupchat', '', '', getXIDNick(room));
+	
+	return false;
+}
+
+// Displays a given favorite
+function displayFavorites(xid, name, nick, autojoin, password) {
+	// Generate the HTML code
+	var html = '<option value="' + encodeQuotes(xid) + '">' + name.htmlEnc() + '</option>';
+	
+	// Remove the existing favorite
+	removeFavorite(xid, false);
+	
+	// We complete the select forms
+	$('#buddy-list .gc-join-first-option, #favorites .fedit-head-select-first-option').after(html);
+	
+	// We store the informations
+	var value = '<groupchat><xid>' + xid.htmlEnc() + '</xid><name>' + name.htmlEnc() + '</name><nick>' + nick.htmlEnc() + '</nick><autojoin>' + autojoin.htmlEnc() + '</autojoin><password>' + password.htmlEnc() + '</password></groupchat>';
+	setDB('favorites', xid, value);
+}
+
+// Loads the favorites for the popup
+function loadFavorites() {
+	// Initialize the HTML code
+	var html = '';
+	
+	// Read the database
+	for(var i = 0; i < sessionStorage.length; i++) {
+		// Get the pointer values
+		var current = sessionStorage.key(i);
+		
+		// If the pointer is on a stored favorite
+		if(explodeThis('_', current, 0) == 'favorites') {
+			var data = XMLFromString(sessionStorage.getItem(current));
+			
+			// Add the current favorite to the HTML code
+			html += '<option value="' + encodeQuotes($(data).find('xid').text()) + '">' + $(data).find('name').text().htmlEnc() + '</option>';
+		}
+	}
+	
+	// Generate specific HTML code
+	var favorites_bubble = '<option value="none" class="gc-join-first-option" selected="">' + _e("Select a favorite") +  '</option>' + html;
+	var favorites_popup = '<option value="none" class="fedit-head-select-first-option" selected="">' + _e("Select a favorite") + '</option>' + html;
+	
+	// Append the HTML code
+	$('#buddy-list .buddy-conf-groupchat-select').html(favorites_bubble);
+	$('#favorites .fedit-head-select').html(favorites_popup);
+}
+
+// Addon launcher
+function launchFavorites() {
+	var path = '#favorites .';
+	
+	// Keyboard events
+	$(path + 'fsearch-head-server').keyup(function(e) {
+		if(e.keyCode == 13) {
+			// No value?
+			if(!$(this).val())
+				$(this).val(HOST_MUC);
+			
+			// Get the list
+			getGCList();
+		}
+	});
+	
+	$(path + 'fedit-line input').keyup(function(e) {
+		if(e.keyCode == 13) {
+			// Edit a favorite
+			if($(path + 'fedit-edit').is(':visible'))
+				terminateThisFavorite('edit');
+			
+			// Add a favorite
+			else
+				terminateThisFavorite('add');
+		}
+	});
+	
+	// Change events
+	$('.fedit-head-select').change(editFavorite);
+	
+	// Click events
+	$(path + 'room-switcher').click(function() {
+		$(path + 'favorites-content').hide();
+		resetFavorites();
+	});
+	
+	$(path + 'room-list').click(function() {
+		$(path + 'favorites-edit').show();
+	});
+	
+	$(path + 'room-search').click(function() {
+		$(path + 'favorites-search').show();
+		getGCList();
+	});
+	
+	$(path + 'fedit-add').click(function() {
+		return terminateThisFavorite('add');
+	});
+	
+	$(path + 'fedit-edit').click(function() {
+		return terminateThisFavorite('edit');
+	});
+	
+	$(path + 'fedit-remove').click(function() {
+		return terminateThisFavorite('remove');
+	});
+	
+	$(path + 'bottom .finish').click(function() {
+		return quitFavorites();
+	});
+}
diff --git a/jappixmini/jappix/js/features.js b/jappixmini/jappix/js/features.js
new file mode 100644
index 00000000..4944be0a
--- /dev/null
+++ b/jappixmini/jappix/js/features.js
@@ -0,0 +1,213 @@
+/*
+
+Jappix - An open social platform
+This is the server features JS script for Jappix
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 01/06/11
+
+*/
+
+// Gets the features of a server
+function getFeatures() {
+	/* REF: http://xmpp.org/extensions/xep-0030.html */
+	
+	// Get the main values
+	var to = getServer();
+	var caps = con.server_caps;
+	var xml = null;
+	
+	// Try to get the stored data
+	if(caps)
+		xml = XMLFromString(getPersistent('caps', caps));
+	
+	// Any stored data?
+	if(xml) {
+		handleFeatures(xml);
+		
+		logThis('Read server CAPS from cache.');
+	}
+	
+	// Not stored (or no CAPS)!
+	else {
+		var iq = new JSJaCIQ();
+		
+		iq.setTo(to);
+		iq.setType('get');
+		iq.setQuery(NS_DISCO_INFO);
+		
+		con.send(iq, handleDiscoInfos);
+		
+		logThis('Read server CAPS from network.');
+	}
+}
+
+// Handles the features of a server
+function handleFeatures(xml) {
+	// Selector
+	var selector = $(xml);
+	
+	// Markers
+	var pep = false;
+	var pubsub = false;
+	var archive = false;
+	var archive_auto = false;
+	var archive_manual = false;
+	var archive_manage = false;
+	var archive_pref = false;
+	var commands = false;
+	
+	// Scan the features
+	if(selector.find('identity[category=pubsub][type=pep]').size())
+		pep = true;
+	if(selector.find('feature[var=' + NS_PUBSUB + ']').size())
+		pubsub = true;
+	if(selector.find('feature[var=' + NS_URN_ARCHIVE + ']').size())
+		archive = true;
+	if(selector.find('feature[var=' + NS_URN_AR_AUTO + ']').size())
+		archive_auto = true;
+	if(selector.find('feature[var=' + NS_URN_AR_MANUAL + ']').size())
+		archive_manual = true;
+	if(selector.find('feature[var=' + NS_URN_AR_MANAGE + ']').size())
+		archive_manage = true;
+	if(selector.find('feature[var=' + NS_URN_AR_PREF + ']').size())
+		archive_pref = true;
+	if(selector.find('feature[var=' + NS_COMMANDS + ']').size())
+		commands = true;
+	
+	// Enable the pep elements if available
+	if(pep) {
+		// Update our database
+		enableFeature('pep');
+		
+		// Get the microblog
+		getInitMicroblog();
+		
+		// Get the notifications
+		getNotifications();
+		
+		// Geolocate the user
+		geolocate();
+		
+		// Enable microblogging send tools
+		waitMicroblog('sync');
+		$('.postit.attach').css('display', 'block');
+		
+		logThis('XMPP server supports PEP.', 3);
+	}
+	
+	// Disable microblogging send tools (no PEP!)
+	else {
+		waitMicroblog('unsync');
+		
+		logThis('XMPP server does not support PEP.', 2);
+	}
+	
+	// Enable the pubsub features if available
+	if(pubsub)
+		enableFeature(NS_PUBSUB);
+	
+	// Enable the archiving features if available
+	if(archive)
+		enableFeature(NS_URN_ARCHIVE);
+	
+	// Enable the archiving sub-features if available
+	if(archive_pref)
+		enableFeature(NS_URN_AR_PREF);
+	if(archive_auto)
+		enableFeature(NS_URN_AR_AUTO);
+	if(archive_manual)
+		enableFeature(NS_URN_AR_MANUAL);
+	if(archive_manage)
+		enableFeature(NS_URN_AR_MANAGE);
+	
+	// Enable the commands features if available
+	if(commands)
+		enableFeature(NS_COMMANDS);
+	
+	// Hide the private life fieldset if nothing to show
+	if(!pep && !archive_pref)
+		$('#options fieldset.privacy').hide();
+	
+	// Apply the features
+	applyFeatures('talk');
+	
+	// Process the buddy-list height
+	if(pep)
+		adaptRoster();
+	
+	return false;
+}
+
+// The function to apply the features to an element
+function applyFeatures(id) {
+	// Path to the elements
+	var path = '#' + id + ' .';
+	
+	// PEP features
+	if(enabledPEP())
+		$(path + 'pep-hidable').show();
+	
+	// PubSub features
+	if(enabledPubSub())
+		$(path + 'pubsub-hidable').show();
+	
+	// Archives features
+	if(enabledArchives() || enabledArchives('auto') || enabledArchives('manual') || enabledArchives('manage')) {
+		$(path + 'archives-hidable:not(.pref)').show();
+		
+		// Sub-feature: archives preferences
+		if(enabledArchives('pref'))
+			$(path + 'archives-hidable.pref').show();
+	}
+	
+	// Commands features
+	if(enabledCommands())
+		$(path + 'commands-hidable').show();
+	
+	// XMPP links (browser feature)
+	if(navigator.registerProtocolHandler)
+		$(path + 'xmpplinks-hidable').show();
+}
+
+// Enables a feature
+function enableFeature(feature) {
+	setDB('feature', feature, 'true');
+}
+
+// Checks if a feature is enabled
+function enabledFeature(feature) {
+	if(getDB('feature', feature) == 'true')
+		return true;
+	else
+		return false;
+}
+
+// Returns the XMPP server PEP support
+function enabledPEP() {
+	return enabledFeature('pep');
+}
+
+// Returns the XMPP server PubSub support
+function enabledPubSub() {
+	return enabledFeature(NS_PUBSUB);
+}
+
+// Returns the XMPP server archives support
+function enabledArchives(sub) {
+	var xmlns = NS_URN_ARCHIVE;
+	
+	// Any sub element sent?
+	if(sub)
+		xmlns += ':' + sub;
+	
+	return enabledFeature(xmlns);
+}
+
+// Returns the XMPP server commands support
+function enabledCommands() {
+	return enabledFeature(NS_COMMANDS);
+}
diff --git a/jappixmini/jappix/js/filter.js b/jappixmini/jappix/js/filter.js
new file mode 100644
index 00000000..48e5238f
--- /dev/null
+++ b/jappixmini/jappix/js/filter.js
@@ -0,0 +1,189 @@
+/*
+
+Jappix - An open social platform
+These are the filtering JS script for Jappix
+
+-------------------------------------------------
+
+License: AGPL
+Authors: Vanaryon, Maranda
+Last revision: 04/08/11
+
+*/
+
+// Generates a given emoticon HTML code
+function emoteImage(image, text, after) {
+	return ' <img class="emoticon emoticon-' + image + ' smileys-images" alt="' + encodeQuotes(text) + '" src="' + './img/others/blank.gif' + '" /> ' + after;
+}
+
+// Filters a given message
+function filterThisMessage(neutralMessage, nick, html_encode) {
+	var filteredMessage = neutralMessage;
+	
+	// We encode the HTML special chars
+	if(html_encode)
+		filteredMessage = filteredMessage.htmlEnc();
+	
+	// /me command
+	filteredMessage = filteredMessage.replace(/((^)|((.+)(>)))(\/me )([^<]+)/, nick + ' $7')
+	
+	// We replace the smilies text into images
+	.replace(/(:-?@)($|\s|<)/gi, emoteImage('angry', '$1', '$2'))
+	.replace(/(:-?\[)($|\s|<)/gi, emoteImage('bat', '$1', '$2'))
+	.replace(/(\(B\))($|\s|<)/g, emoteImage('beer', '$1', '$2'))
+	.replace(/((:-?D)|(XD))($|\s|<)/gi, emoteImage('biggrin', '$1', '$4'))
+	.replace(/(:-?\$)($|\s|<)/gi, emoteImage('blush', '$1', '$2'))
+	.replace(/(\(Z\))($|\s|<)/g, emoteImage('boy', '$1', '$2'))
+	.replace(/(\(W\))($|\s|<)/g, emoteImage('brflower', '$1', '$2'))			
+	.replace(/((&lt;\/3)|(\(U\)))($|\s|<)/g, emoteImage('brheart', '$1', '$4'))			
+	.replace(/(\(C\))($|\s|<)/g, emoteImage('coffee', '$1', '$2'))			
+	.replace(/((8-\))|(\(H\)))($|\s|<)/g, emoteImage('coolglasses', '$1', '$4'))
+	.replace(/(:'-?\()($|\s|<)/gi, emoteImage('cry', '$1', '$2'))
+	.replace(/(\(%\))($|\s|<)/g, emoteImage('cuffs', '$1', '$2'))
+	.replace(/(\]:-?&gt;)($|\s|<)/gi, emoteImage('devil', '$1', '$2'))			
+	.replace(/(\(D\))($|\s|<)/g, emoteImage('drink', '$1', '$2'))
+	.replace(/(@}-&gt;--)($|\s|<)/gi, emoteImage('flower', '$1', '$2'))
+	.replace(/((:-?\/)|(:-?S))($|\s|<)/gi, emoteImage('frowning', '$1', '$4'))
+	.replace(/(\(X\))($|\s|<)/g, emoteImage('girl', '$1', '$2'))
+	.replace(/((&lt;3)|(\(L\)))($|\s|<)/g, emoteImage('heart', '$1', '$4'))
+	.replace(/(\(}\))($|\s|<)/g, emoteImage('hugleft', '$1', '$2'))			
+	.replace(/(\({\))($|\s|<)/g, emoteImage('hugright', '$1', '$2'))
+	.replace(/(:-?{})($|\s|<)/gi, emoteImage('kiss', '$1', '$2'))
+	.replace(/(\(I\))($|\s|<)/g, emoteImage('lamp', '$1', '$2'))
+	.replace(/(:-?3)($|\s|<)/gi, emoteImage('lion', '$1', '$2'))
+	.replace(/(\(E\))($|\s|<)/g, emoteImage('mail', '$1', '$2'))
+	.replace(/(\(S\))($|\s|<)/g, emoteImage('moon', '$1', '$2'))
+	.replace(/(\(8\))($|\s|<)/g, emoteImage('music', '$1', '$2'))
+	.replace(/((=-?O)|(:-?O))($|\s|<)/gi, emoteImage('oh', '$1', '$4'))
+	.replace(/(\(T\))($|\s|<)/g, emoteImage('phone', '$1', '$2'))
+	.replace(/(\(P\))($|\s|<)/g, emoteImage('photo', '$1', '$2'))
+	.replace(/(:-?!)($|\s|<)/gi, emoteImage('puke', '$1', '$2'))
+	.replace(/(\(@\))($|\s|<)/g, emoteImage('pussy', '$1', '$2'))
+	.replace(/(\(R\))($|\s|<)/g, emoteImage('rainbow', '$1', '$2'))
+	.replace(/(:-?\))($|\s|<)/gi, emoteImage('smile', '$1', '$2'))
+	.replace(/(\(\*\))($|\s|<)/g, emoteImage('star', '$1', '$2'))
+	.replace(/(:-?\|)($|\s|<)/gi, emoteImage('stare', '$1', '$2'))
+	.replace(/(\(N\))($|\s|<)/g, emoteImage('thumbdown', '$1', '$2'))
+	.replace(/(\(Y\))($|\s|<)/g, emoteImage('thumbup', '$1', '$2'))
+	.replace(/(:-?P)($|\s|<)/gi, emoteImage('tongue', '$1', '$2'))
+	.replace(/(:-?\()($|\s|<)/gi, emoteImage('unhappy', '$1', '$2'))
+	.replace(/(;-?\))($|\s|<)/gi, emoteImage('wink', '$1', '$2'))
+	
+	// Text in bold
+	.replace(/(^|\s|>)((\*)([^<>'"]+)(\*))($|\s|<)/gi, '$1<b>$2</b>$6')
+	
+	// Italic text
+	.replace(/(^|\s|>)((\/)([^<>'"]+)(\/))($|\s|<)/gi, '$1<i>$2</i>$6')
+	
+	// Underlined text
+	.replace(/(^|\s|>)((_)([^<>'"]+)(_))($|\s|<)/gi, '$1<span style="text-decoration: underline;">$2</span>$6');
+	
+	// Add the links
+	if(html_encode)
+		filteredMessage = applyLinks(filteredMessage, 'desktop');
+	
+	// Filter integratebox links
+	filteredMessage = filterIntegrateBox(filteredMessage);
+	
+	return filteredMessage;
+}
+
+// Filters a xHTML message to be displayed in Jappix
+function filterThisXHTML(code) {
+	// Allowed elements array
+	var elements = new Array(
+				 'a',
+				 'abbr',
+			         'acronym',
+			         'address',
+			         'blockquote',
+				 'body',
+				 'br',
+				 'cite',
+			         'code',
+			         'dd',
+			         'dfn',
+			         'div',
+			         'dt',
+			         'em',
+			         'h1',
+			         'h2',
+			         'h3',
+			         'h4',
+			         'h5',
+			         'h6',
+			         'head',
+			         'html',
+			         'img',
+			         'kbd',
+			         'li',
+			         'ol',
+			         'p',
+			         'pre',
+			         'q',
+			         'samp',
+			         'span',
+			         'strong',
+			         'title',
+			         'ul',
+			         'var'
+			        );
+	
+	// Allowed attributes array
+	var attributes = new Array(
+				   'accesskey',
+				   'alt',
+				   'charset',
+				   'cite',
+				   'class',
+				   'height',
+				   'href',
+				   'hreflang',
+				   'id',
+				   'longdesc',
+				   'profile',
+				   'rel',
+				   'rev',
+				   'src',
+				   'style',
+				   'tabindex',
+				   'title',
+				   'type',
+				   'uri',
+				   'version',
+				   'width',
+				   'xml:lang',
+				   'xmlns'
+				  );
+	
+	// Remove forbidden elements
+	$(code).find('html body *').each(function() {
+		// This element is not authorized
+		if(!existArrayValue(elements, (this).nodeName.toLowerCase()))
+			$(this).remove();
+	});
+	
+	// Remove forbidden attributes
+	$(code).find('html body *').each(function() {
+		// Put a pointer on this element (jQuery way & normal way)
+		var cSelector = $(this);
+		var cElement = (this);
+		
+		// Loop the attributes of the current element
+		$(cElement.attributes).each(function(index) {
+			// Read the current attribute
+			var cAttr = cElement.attributes[index];
+			var cName = cAttr.name;
+			var cVal = cAttr.value;
+			
+			// This attribute is not authorized, or contains JS code
+			if(!existArrayValue(attributes, cName.toLowerCase()) || ((cVal.toLowerCase()).match(/(^|"|')javascript:/)))
+				cSelector.removeAttr(cName);
+		});
+	});
+	
+	// Filter some other elements
+	$(code).find('a').attr('target', '_blank');
+	
+	return $(code).find('html body').html();
+}
diff --git a/jappixmini/jappix/js/groupchat.js b/jappixmini/jappix/js/groupchat.js
new file mode 100644
index 00000000..c8dd13b1
--- /dev/null
+++ b/jappixmini/jappix/js/groupchat.js
@@ -0,0 +1,283 @@
+/*
+
+Jappix - An open social platform
+These are the groupchat JS scripts for Jappix
+
+-------------------------------------------------
+
+License: AGPL
+Authors: Vanaryon, Maranda, Eric
+Last revision: 28/08/11
+
+*/
+
+// Displays the MUC admin elements
+function displayMucAdmin(affiliation, id, xid, statuscode) {
+	// We must be in the "login" mode
+	if(isAnonymous())
+		return;
+	
+	// We check if the user is a room owner or administrator to give him privileges
+	if(affiliation == 'owner' || affiliation == 'admin')
+		$('#' + id + ' .tools-mucadmin').show();
+	
+	// We check if the room hasn't been yet created
+	if(statuscode == 201)
+		openThisInfo(4);
+	
+	// We add the click event
+	$('#' + id + ' .tools-mucadmin').click(function() {
+		openMucAdmin(xid, affiliation);
+	});
+}
+
+// Initializes a connection with a MUC groupchat
+function getMUC(room, nickname, password) {
+	// Room hash
+	var hash = hex_md5(room);
+	
+	// Reset the elements
+	$('#' + hash + ' .muc-ask').remove();
+	$('#' + hash + ' .compose').show();
+	
+	// No nickname?
+	if(!nickname) {
+		// Get some values
+		if(!isAnonymous())
+			nickname = getNick();
+		else
+			nickname = ANONYMOUS_NICK;
+		
+		// If the nickname could not be retrieved, ask it
+		if(!nickname)
+			generateMUCAsk('nickname', room, hash, nickname, password);
+	}
+	
+	// Got our nickname?
+	if(nickname) {
+		// Get our general presence
+		var show = getDB('presence-show', 1);
+		var status = getDB('options', 'presence-status');
+	
+		// Set my nick
+		$('#' + hash).attr('data-nick', escape(nickname));
+	
+		// Send the appropriate presence
+		sendPresence(room + '/' + nickname, '', show, status, '', true, password, handleMUC);
+	}
+	
+	return false;
+}
+
+// Handles the MUC main elements
+function handleMUC(presence) {
+	// We get the xml content
+	var xml = presence.getNode();
+	var from = fullXID(getStanzaFrom(presence));
+	var room = bareXID(from);
+	var nickname = thisResource(from);
+	var hash = hex_md5(room);
+	
+	// No ID: must fix M-Link bug
+	if(presence.getID() == null)
+		presence.setID(1);
+	
+	logThis('First MUC presence: ' + from, 3);
+	
+	// Catch the errors
+	if(!handleError(xml)) {
+		// Define some stuffs
+		var muc_user = $(xml).find('x[xmlns=' + NS_MUC_USER + ']');
+		var affiliation = muc_user.find('item').attr('affiliation');
+                var statuscode = parseInt(muc_user.find('status').attr('code'));
+		
+		// Handle my presence
+		handlePresence(presence);
+		
+		// Check if I am a room owner
+		displayMucAdmin(affiliation, hash, room, statuscode);
+		
+		// Tell the MUC we can notify the incoming presences
+		$(document).oneTime('15s', function() {
+			$('#' + hash).attr('data-initial', 'true');
+		});
+		
+		// Enable the chatting input
+		$(document).oneTime(10, function() {
+			$('#' + hash + ' .message-area').removeAttr('disabled').focus();
+		});
+	}
+	
+	// A password is required
+	else if($(xml).find('error[type=auth] not-authorized').size())
+		generateMUCAsk('password', room, hash, nickname);
+	
+	// There's a nickname conflict
+	else if($(xml).find('error[type=cancel] conflict').size())
+		generateMUCAsk('nickname', room, hash);
+}
+
+// Generates a correct MUC asker
+function generateMUCAsk(type, room, hash, nickname, password) {
+	// Generate the path to the elements
+	var path_to = '#' + hash + ' .muc-ask';
+	
+	// Define the label text
+	var label_text;
+	
+	switch(type) {
+		case 'nickname':
+			label_text = _e("Nickname");
+			break;
+		
+		case 'password':
+			label_text = _e("Password");
+			break;
+	}
+	
+	// Create the HTML markup
+	$('#' + hash + ' .compose').hide();
+	
+	$('#' + hash).append(
+		'<div class="muc-ask text">' + 
+			'<label>' + label_text + '</label>' + 
+			'<input class="focusable" type="text" />' + 
+		'</div>'
+	);
+	
+	// When a key is pressed in the input
+	$(path_to + ' input').keyup(function(e) {
+		var value_input = $(this).val();
+		
+		// Enter key pressed
+		if((e.keyCode == 13) && value_input) {
+			if(type == 'nickname')
+				nickname = value_input;
+			else if(type == 'password')
+				password = value_input;
+			
+			return getMUC(room, nickname, password);
+		}
+	});
+	
+	// Focus on the input
+	$(document).oneTime(10, function() {
+		$(path_to + ' input').focus();
+	});
+}
+
+// Creates a new groupchat
+function groupchatCreate(hash, room, chan, nickname, password) {
+	/* REF: http://xmpp.org/extensions/xep-0045.html */
+	
+	logThis('New groupchat: ' + room, 3);
+	
+	// Create the chat content
+	generateChat('groupchat', hash, room, chan);
+	
+	// Create the chat switcher
+	generateSwitch('groupchat', hash, room, chan);
+	
+	// The icons-hover functions
+	tooltipIcons(room, hash);
+	
+	// Click event on the add tool
+	$('#' + hash + ' .tools-add').click(function() {
+		// Hide the icon (to tell the user all is okay)
+		$(this).hide();
+		
+		// Add the groupchat to the user favorites
+		addThisFavorite(room, chan);
+	});
+	
+	// Must show the add button?
+	if(!existDB('favorites', room))
+		$('#' + hash + ' .tools-add').show();
+	
+	// The event handlers
+	var inputDetect = $('#' + hash + ' .message-area');
+	
+	// Focus event
+	inputDetect.focus(function() {
+		chanCleanNotify(hash);
+	})
+	
+	// Blur event
+	inputDetect.blur(function() {
+		resetAutocompletion(hash);
+	})
+	
+	// Lock to the input
+	inputDetect.keypress(function(e) {
+		// Enter key
+		if(e.keyCode == 13) {
+			// Add a new line
+			if(e.shiftKey)
+				inputDetect.val(inputDetect.val() + '\n');
+			
+			// Send the message
+			else {
+				sendMessage(hash, 'groupchat');
+				
+				// Reset the composing database entry
+				setDB('chatstate', room, 'off');
+			}
+			
+			return false;
+		}
+		
+		// Tabulation key
+		else if(e.keyCode == 9) {
+			createAutocompletion(hash);
+			
+			return false;
+		}
+		
+		// Reset the autocompleter
+		else
+			resetAutocompletion(hash);
+	});
+	
+	// Chatstate events
+	eventsChatState(inputDetect, room, hash);
+	
+	// Get the current muc informations and content
+	getMUC(room, nickname, password);
+}
+
+// Joins the defined groupchats
+function joinConfGroupchats() {
+	// Nothing to join?
+	if(!GROUPCHATS_JOIN)
+		return;
+	
+	// Values array
+	var muc_arr = [GROUPCHATS_JOIN];
+	var new_arr = [];
+	
+	// Try to split it
+	if(GROUPCHATS_JOIN.indexOf(',') != -1)
+		muc_arr = GROUPCHATS_JOIN.split(',');
+	
+	for(i in muc_arr) {
+		// Get the current value
+		var muc_current = trim(muc_arr[i]);
+		
+		// No current value?
+		if(!muc_current)
+			continue;
+		
+		// Filter the current value
+		muc_current = generateXID(muc_current, 'groupchat');
+		
+		// Add the current value
+		if(!existArrayValue(new_arr, muc_current))
+			new_arr.push(muc_current);
+	}
+	
+	// Join the chats
+	if(new_arr.length) {
+		for(g in new_arr)
+			checkChatCreate(new_arr[g], 'groupchat');
+	}
+}
diff --git a/jappixmini/jappix/js/home.js b/jappixmini/jappix/js/home.js
new file mode 100644
index 00000000..fdaba56b
--- /dev/null
+++ b/jappixmini/jappix/js/home.js
@@ -0,0 +1,371 @@
+/*
+
+Jappix - An open social platform
+These are the homepage JS scripts for Jappix
+
+-------------------------------------------------
+
+License: AGPL
+Authors: Vanaryon, LinkMauve
+Last revision: 15/01/12
+
+*/
+
+// Allows the user to switch the difference home page elements
+function switchHome(div) {
+	// Path to
+	var home = '#home .';
+	var right = home + 'right ';
+	var current = right + '.homediv.' + div;
+	
+	// We switch the div
+	$(right + '.homediv, ' + right + '.top').hide();
+	$(right + '.' + div).show();
+	
+	// We reset the homedivs
+	$(home + 'homediv:not(.default), ' + home + 'top:not(.default)').remove();
+	
+	// Get the HTML code to display
+	var disable_form = '';
+	var lock_host = '';
+	var code = '';
+	
+	// Apply the previous link
+	switch(div) {
+		case 'loginer':
+		case 'anonymouser':
+		case 'registerer':
+			if(!exists(right + '.top.sub')) {
+				// Append the HTML code for previous link
+				$(right + '.top.default').after('<h1 class="top sub loginer anonymouser registerer">&laquo; <a href="#" class="previous">' + _e("Previous") + '</a></h1>');
+				
+				// Click event on previous link
+				$(home + 'top.sub a.previous').click(function() {
+					return switchHome('default');
+				});
+			}
+		
+		break;
+	}
+	
+	// Apply the form
+	switch(div) {
+		// Login tool
+		case 'loginer':
+			lock_host = disableInput(LOCK_HOST, 'on');
+			code = '<p>' + printf(_e("Login to your existing XMPP account. You can also use the %s to join a groupchat."), '<a href="#" class="to-anonymous">' + _e("anonymous mode") + '</a>') + '</p>' + 
+				
+				'<form action="#" method="post">' + 
+					'<fieldset>' + 
+						'<legend>' + _e("Required") + '</legend>' + 
+						
+						'<label for="lnick">' + _e("Address") + '</label>' + 
+						'<input type="text" class="nick" id="lnick" pattern="[^@/]+" required="" /><span class="jid">@</span><input type="text" class="server" id="lserver" value="' + HOST_MAIN + '" ' + lock_host + ' pattern="[^@/]+" required="" />' + 
+						'<label for="lpassword">' + _e("Password") + '</label>' + 
+						'<input type="password" class="password" id="lpassword" required="" />' + 
+						'<label for="lremember">' + _e("Remember me") + '</label>' + 
+						'<input type="checkbox" class="remember" id="lremember" />' + 
+					'</fieldset>' + 
+					
+					'<a href="#" class="advanced home-images">' + _e("Advanced") + '</a>' + 
+					
+					'<fieldset class="advanced">' + 
+						'<legend>' + _e("Advanced") + '</legend>' + 
+						
+						'<label for="lresource">' + _e("Resource") + '</label>' + 
+						'<input type="text" class="resource" id="lresource" value="' + JAPPIX_RESOURCE + '" />' + 
+						'<label for="lpriority">' + _e("Priority") + '</label>' + 
+						'<select class="priority" id="lpriority">' + 
+							'<option value="1">' + _e("Low") + '</option>' + 
+							'<option value="10" selected="">' + _e("Medium") + '</option>' + 
+							'<option value="100">' + _e("High") + '</option>' + 
+						'</select>' + 
+					'</fieldset>' + 
+					
+					'<input type="submit" value="' + _e("Here we go!") + '" />' + 
+				'</form>';
+			
+			break;
+		
+		// Anonymous login tool
+		case 'anonymouser':
+			disable_form = disableInput(ANONYMOUS, 'off');
+			code = '<p>' + printf(_e("Enter the groupchat you want to join and the nick you want to have. You can also go back to the %s."), '<a href="#" class="to-home">' + _e("login page") + '</a>') + '</p>' + 
+				
+				'<form action="#" method="post">' + 
+					'<fieldset>' + 
+						'<legend>' + _e("Required") + '</legend>' + 
+						
+						'<label>' + _e("Room") + '</label>' + 
+						'<input type="text" class="room"' + disable_form + ' pattern="[^/]+" required="" />' + 
+						
+						'<label>' + _e("Nickname") + '</label>' + 
+						'<input type="text" class="nick"' + disable_form + ' required="" />' + 
+					'</fieldset>' + 
+					
+					'<input type="submit" value="' + _e("Here we go!") + '"' + disable_form + ' />' + 
+				'</form>' + 
+				
+				'<div class="info report">' + 
+					_e("Share this link with your friends:") + ' <span></span>' + 
+				'</div>';
+			
+			break;
+		
+		// Register tool
+		case 'registerer':
+			disable_form = disableInput(REGISTRATION, 'off');
+			
+			if(!disable_form)
+				lock_host = disableInput(LOCK_HOST, 'on');
+			
+			code = '<p>' + _e("Register a new XMPP account to join your friends on your own social cloud. That's simple!") + '</p>' + 
+				
+				'<form action="#" method="post">' + 
+					'<fieldset>' + 
+						'<legend>' + _e("Required") + '</legend>' + 
+						
+						'<label for="rnick">' + _e("Address") + '</label>' + 
+						'<input type="text" class="nick" id="rnick" ' + disable_form + ' pattern="[^@/]+" required="" /><span class="jid">@</span><input type="text" class="server" id="rserver" value="' + HOST_MAIN + '" ' + disable_form + lock_host + ' pattern="[^@/]+" required="" />' + 
+						'<label for="rpassword">' + _e("Password") + '</label>' + 
+						'<input type="password" class="password" id="rpassword" ' + disable_form + ' required="" />' + 
+						'<label for="spassword">' + _e("Confirm") + '</label><input type="password" class="spassword" id="spassword" ' + disable_form + ' required="" />' + 
+					'</fieldset>' + 
+					
+					'<input type="submit" value="' + _e("Here we go!") + '" ' + disable_form + '/>' + 
+				'</form>';
+			
+			break;
+	}
+	
+	// Form disabled?
+	if(disable_form)
+		code += '<div class="info fail">' + 
+				_e("This tool has been disabled, you cannot use it!") + 
+			'</div>';
+	
+	// Create this HTML code
+	if(code && !exists(current)) {
+		// Append it!
+		$(right + '.homediv.default').after('<div class="' + div + ' homediv">' + code + '</div>');
+		
+		// Create the attached events
+		switch(div) {
+			// Login tool
+			case 'loginer':
+				$(current + ' a.to-anonymous').click(function() {
+					return switchHome('anonymouser');
+				});
+				
+				$(current + ' a.advanced').click(showAdvanced);
+				
+				$(current + ' form').submit(loginForm);
+				
+				break;
+			
+			// Anonymous login tool
+			case 'anonymouser':
+				$(current + ' a.to-home').click(function() {
+					return switchHome('loginer');
+				});
+				
+				$(current + ' form').submit(doAnonymous);
+				
+				// Keyup event on anonymous join's room input
+				$(current + ' input.room').keyup(function() {
+					var value = $(this).val();
+					var report = current + ' .report';
+					var span = report + ' span';
+					
+					if(!value) {
+						$(report).hide();
+						$(span).text('');
+					}
+					
+					else {
+						$(report).show();
+						$(span).text(JAPPIX_LOCATION + '?r=' + value);
+					}
+				});
+				
+				break;
+			
+			// Register tool
+			case 'registerer':
+				$(current + ' form').submit(registerForm);
+				
+				break;
+		}
+	}
+	
+	// We focus on the first input
+	$(document).oneTime(10, function() {
+		$(right + 'input:visible:first').focus();
+	});
+	
+	return false;
+}
+
+// Allows the user to display the advanced login options
+function showAdvanced() {
+	// Hide the link
+	$('#home a.advanced').hide();
+	
+	// Show the fieldset
+	$('#home fieldset.advanced').show();
+	
+	return false;
+}
+
+// Reads the login form values
+function loginForm() {
+	// We get the values
+	var lPath = '#home .loginer ';
+	var lServer = $(lPath + '.server').val();
+	var lNick = $(lPath + '.nick').val();
+	var lPass = $(lPath + '.password').val();
+	var lResource = $(lPath + '.resource').val();
+	var lPriority = $(lPath + '.priority').val();
+	var lRemember = $(lPath + '.remember').filter(':checked').size();
+	
+	// Enough values?
+	if(lServer && lNick && lPass && lResource && lPriority)
+		doLogin(lNick, lServer, lPass, lResource, lPriority, lRemember);
+	
+	// Something is missing?
+	else {
+		$(lPath + 'input[type=text], ' + lPath + 'input[type=password]').each(function() {
+			var select = $(this);
+			
+			if(!select.val())
+				$(document).oneTime(10, function() {
+					select.addClass('please-complete').focus();
+				});
+			else
+				select.removeClass('please-complete');	
+		});
+	}
+	
+	return false;
+}
+
+// Reads the register form values
+function registerForm() {
+	var rPath = '#home .registerer ';
+	
+	// Remove the success info
+	$(rPath + '.success').remove();
+	
+	// Get the values
+	var username = $(rPath + '.nick').val();
+	var domain = $(rPath + '.server').val();
+	var pass = $(rPath + '.password').val();
+	var spass = $(rPath + '.spassword').val();
+	
+	// Enough values?
+	if(domain && username && pass && spass && (pass == spass)) {
+		// We remove the not completed class to avoid problems
+		$('#home .registerer input').removeClass('please-complete');
+		
+		// Fire the register event!
+		doRegister(username, domain, pass);
+	}
+	
+	// Something is missing?
+	else {
+		$(rPath + 'input[type=text], ' + rPath + 'input[type=password]').each(function() {
+			var select = $(this);
+			
+			if(!select.val() || (select.is('#spassword') && pass && (pass != spass)))
+				$(document).oneTime(10, function() {
+					select.addClass('please-complete').focus();
+				});
+			else
+				select.removeClass('please-complete');	
+		});
+	}
+	
+	return false;
+}
+
+// Addon launcher
+function launchHome() {
+	// Define the vars
+	var home = '#home ';
+	var button = home + 'button';
+	var corp = home + '.corporation';
+	var locale = home + '.locale';
+	
+	// Removes the <noscript /> elements to lighten the DOM
+	$('noscript').remove();
+	
+	// Allows the user to switch the home page
+	$(button).click(function() {
+		// Login button
+		if($(this).is('.login'))
+			return switchHome('loginer');
+		
+		// Register button
+		else
+			return switchHome('registerer');
+	});
+	
+	// Allows the user to view the corporation infobox
+	$(corp).hover(function() {
+		$(corp).addClass('hovered');
+	}, function() {
+		$(corp).removeClass('hovered');
+	});
+	
+	// Allows the user to switch the language
+	$(locale).hover(function() {
+		// Initialize the HTML code
+		var keepget = $(locale).attr('data-keepget');
+		var html = '<div class="list">';
+		
+		// Generate each locale HTML code
+		for(i in LOCALES_AVAILABLE_ID)
+			html += '<a href="./?l=' + LOCALES_AVAILABLE_ID[i] + keepget + '">' + LOCALES_AVAILABLE_NAMES[i].htmlEnc() + '</a>';
+		
+		html += '</div>';
+		
+		// Append the HTML code
+		$(locale).append(html);
+	}, function() {
+		$(locale + ' .list').remove();
+	});
+	
+	// Disables the browser HTTP-requests stopper
+	$(document).keydown(function(e) {
+		if((e.keyCode == 27) && !isDeveloper())
+			return false;
+	});
+	
+	// Warns for an obsolete browser
+	if(isObsolete()) {
+		// Add the code
+		$(locale).after(
+			'<div class="obsolete">' + 
+				'<p>' + _e("Your browser is out of date!") + '</p>' + 
+				
+				'<a class="firefox browsers-images" title="' + printf(_e("Last %s version is better!"), 'Mozilla Firefox') + '" href="http://www.mozilla.com/firefox/"></a>' + 
+				'<a class="chrome browsers-images" title="' + printf(_e("Last %s version is better!"), 'Google Chrome') + '" href="http://www.google.com/chrome"></a>' + 
+				'<a class="safari browsers-images" title="' + printf(_e("Last %s version is better!"), 'Safari') + '" href="http://www.apple.com/safari/"></a>' + 
+				'<a class="opera browsers-images" title="' + printf(_e("Last %s version is better!"), 'Opera') + '" href="http://www.opera.com/"></a>' + 
+				'<a class="ie browsers-images" title="' + printf(_e("Last %s version is better!"), 'Internet Explorer') + '" href="http://www.microsoft.com/hk/windows/internet-explorer/"></a>' + 
+			'</div>'
+		);
+		
+		// Display it later
+		$(home + '.obsolete').oneTime('1s', function() {
+			$(this).slideDown();
+		});
+		
+		logThis('Jappix does not support this browser!', 2);
+	}
+	
+	logThis('Welcome to Jappix! Happy coding in developer mode!');
+}
+
+// Launch this addon!
+$(document).ready(launchHome);
diff --git a/jappixmini/jappix/js/httpauth.js b/jappixmini/jappix/js/httpauth.js
new file mode 100644
index 00000000..857de6d6
--- /dev/null
+++ b/jappixmini/jappix/js/httpauth.js
@@ -0,0 +1,41 @@
+/*
+
+Jappix - An open social platform
+These are the http-auth JS scripts for Jappix
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 16/11/10
+
+*/
+
+// Replies to a HTTP request
+function requestReply(value, xml) {
+	// We parse the xml content
+	var from = fullXID(getStanzaFrom(xml));
+	var confirm = $(xml.getNode()).find('confirm');
+	var xmlns = confirm.attr('xmlns');
+	var id = confirm.attr('id');
+	var method = confirm.attr('method');
+	var url = confirm.attr('url');
+	
+	// We generate the reply message
+	var aMsg = new JSJaCMessage();
+	aMsg.setTo(from);
+	
+	// If "no"
+	if(value == 'no') {
+		aMsg.setType('error');
+		aMsg.appendNode('error', {'code': '401', 'type': 'auth'});
+	}
+	
+	// We set the confirm node
+	aMsg.appendNode('confirm', {'xmlns': xmlns, 'url': url, 'id': id, 'method': method});
+	
+	// We send the message
+	con.send(aMsg, handleErrorReply);
+	
+	logThis('Replying HTTP auth request: ' + from, 3);
+}
diff --git a/jappixmini/jappix/js/inbox.js b/jappixmini/jappix/js/inbox.js
new file mode 100644
index 00000000..2fe32730
--- /dev/null
+++ b/jappixmini/jappix/js/inbox.js
@@ -0,0 +1,694 @@
+/*
+
+Jappix - An open social platform
+These are the inbox JS script for Jappix
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 08/06/11
+
+*/
+
+// Opens the inbox popup
+function openInbox() {
+	// Popup HTML content
+	var html = 
+	'<div class="top">' + _e("Your inbox") + '</div>' + 
+	
+	'<div class="content">' + 
+		'<div class="head inbox-head">' + 
+			'<div class="head-text inbox-head-text">' + _e("Available actions") + '</div>' + 
+			
+			'<div class="head-actions inbox-head-actions">' + 
+				'<a href="#" class="a-delete-messages">' + _e("Clean") + '</a>' + 
+				'<a href="#" class="a-new-message">' + _e("New") + '</a>' + 
+				'<a href="#" class="a-show-messages">' + _e("Received") + '</a>' + 
+			'</div>' + 
+		'</div>' + 
+		
+		'<div class="inbox-results">' + 
+			'<p class="inbox-noresults">' + _e("Your inbox is empty.") + '</p>' + 
+			
+			'<div class="inbox"></div>' + 
+		'</div>' + 
+		
+		'<div class="inbox-new">' + 
+			'<div class="inbox-new-to inbox-new-block search">' + 
+				'<p class="inbox-new-text">' + _e("To") + '</p>' + 
+				
+				'<input name="inbox-new-to-input" class="inbox-new-input inbox-new-to-input" type="text" required="" />' + 
+			'</div>' + 
+			
+			'<div class="inbox-new-topic inbox-new-block">' + 
+				'<p class="inbox-new-text">' + _e("Subject") + '</p>' + 
+				
+				'<input name="inbox-new-subject-input" class="inbox-new-input inbox-new-subject-input" type="text" required="" />' + 
+			'</div>' + 
+			
+			'<div class="inbox-new-body inbox-new-block">' + 
+				'<p class="inbox-new-text">' + _e("Content") + '</p>' + 
+				
+				'<textarea class="inbox-new-textarea" rows="8" cols="60" required=""></textarea>' + 
+			'</div>' + 
+			
+			'<form class="inbox-new-file inbox-new-block" action="./php/file-share.php" method="post" enctype="multipart/form-data">' + 
+				'<p class="inbox-new-text">' + _e("File") + '</p>' + 
+				
+				generateFileShare() + 
+			'</form>' + 
+			
+			'<div class="inbox-new-send inbox-new-block">' + 
+				'<a href="#" class="send one-button talk-images">' + _e("Send message") + '</a>' + 
+			'</div>' + 
+		'</div>' + 
+	'</div>' + 
+	
+	'<div class="bottom">' + 
+		'<div class="wait wait-medium"></div>' + 
+		
+		'<a href="#" class="finish">' + _e("Close") + '</a>' + 
+	'</div>';
+	
+	// Create the popup
+	createPopup('inbox', html);
+	
+	// Associate the events
+	launchInbox();
+	
+	// Load the messages
+	loadInbox();
+	
+	return false;
+}
+
+// Closes the inbox popup
+function closeInbox() {
+	// Destroy the popup
+	destroyPopup('inbox');
+	
+	return false;
+}
+
+// Opens the message compose tool
+function composeInboxMessage(xid) {
+	// Open things
+	openInbox();
+	newInboxMessage();
+	
+	// Apply XID
+	$('#inbox .inbox-new-to-input').val(xid);
+	
+	// Focus to the next item
+	$(document).oneTime(10, function() {
+		$('#inbox .inbox-new-subject-input').focus();
+	});
+	
+	return false;
+}
+
+// Stores the inbox
+function storeInbox() {
+	var iq = new JSJaCIQ();
+	iq.setType('set');
+	var query = iq.setQuery(NS_PRIVATE);
+	var storage = query.appendChild(iq.buildNode('storage', {'xmlns': NS_INBOX}));
+	
+	for(var i = 0; i < sessionStorage.length; i++) {
+		// Get the pointer values
+		var current = sessionStorage.key(i);
+		
+		// If the pointer is on a stored message
+		if(explodeThis('_', current, 0) == 'inbox') {
+			// Get the values
+			var value = $(XMLFromString(sessionStorage.getItem(current)));
+			
+			// Create the storage node
+			storage.appendChild(iq.buildNode('message', {
+								     'id': value.find('id').text().revertHtmlEnc(),
+								     'from': value.find('from').text().revertHtmlEnc(),
+								     'subject': value.find('subject').text().revertHtmlEnc(),
+								     'status': value.find('status').text().revertHtmlEnc(),
+								     'date': value.find('date').text().revertHtmlEnc(),
+								     'xmlns': NS_INBOX
+								    },
+								    
+								    value.find('content').text().revertHtmlEnc()
+							));
+		}
+	}
+	
+	con.send(iq);
+}
+
+// Creates a new normal message
+function newInboxMessage() {
+	// Init
+	var mPath = '#inbox .';
+	
+	// Reset the previous buddy search
+	resetBuddySearch('#inbox .inbox-new-to');
+	
+	// We switch the divs
+	$(mPath + 'inbox-results, #inbox .a-new-message, #inbox .a-delete-messages').hide();
+	$(mPath + 'inbox-new, #inbox .a-show-messages').show();
+	
+	// We focus on the first input
+	$(document).oneTime(10, function() {
+		$(mPath + 'inbox-new-to-input').focus();
+	});
+	
+	// We reset some stuffs
+	cleanNewInboxMessage();
+	
+	return false;
+}
+
+// Cleans the inbox
+function cleanNewInboxMessage() {
+	// Init
+	var mPath = '#inbox .';
+	
+	// We reset the forms
+	$(mPath + 'inbox-new-block:not(form) input, ' + mPath + 'inbox-new textarea').val('').removeClass('please-complete');
+	$(mPath + 'inbox-new-file a').remove();
+	$(mPath + 'inbox-new-file input').show();
+	
+	// We close an eventual opened message
+	$(mPath + 'message-content').remove();
+	$(mPath + 'one-message').removeClass('message-reading');
+}
+
+// Sends a normal message
+function sendInboxMessage(to, subject, body) {
+	// We send the message
+	var mess = new JSJaCMessage();
+	
+	// Main attributes
+	mess.setTo(to);
+	mess.setSubject(subject);
+	mess.setType('normal');
+	
+	// Any file to attach?
+	var attached = '#inbox .inbox-new-file a.file';
+	
+	if(exists(attached))
+		body += '\n' + 
+			'\n' + 
+			$(attached).attr('data-attachedtitle') + ' - ' + $(attached).attr('data-attachedhref');
+	
+	// Set body
+	mess.setBody(body);
+	
+	con.send(mess, handleErrorReply);
+}
+
+// Performs the normal message sender checks
+function checkInboxMessage() {
+	// We get some informations
+	var mPath = '#inbox ';
+	var to = $(mPath + '.inbox-new-to-input').val();
+	var body = $(mPath + '.inbox-new-textarea').val();
+	var subject = $(mPath + '.inbox-new-subject-input').val();
+	
+	if(to && body && subject) {
+		// New array of XID
+		var xid = new Array(to);
+		
+		// More than one XID
+		if(to.indexOf(',') != -1)
+			xid = to.split(',');
+		
+		for(i in xid) {
+			var current = xid[i];
+			
+			// No current value?
+			if(!current || current.match(/^(\s+)$/))
+				continue;
+			
+			// Edit the XID if needed
+			current = current.replace(/ /g, '');
+			current = generateXID(current, 'chat');
+			
+			// We send the message
+			sendInboxMessage(current, subject, body);
+			
+			// We clean the inputs
+			cleanNewInboxMessage();
+			
+			logThis('Inbox message sent: ' + current, 3);
+		}
+		
+		// Close the inbox
+		closeInbox();
+	}
+	
+	else {
+		$(mPath + 'input[type=text], ' + mPath + 'textarea').each(function() {
+			var current = this;
+			
+			if(!$(current).val()) {
+				$(document).oneTime(10, function() {
+					$(current).addClass('please-complete').focus();
+				});
+			}
+			
+			else
+				$(current).removeClass('please-complete');	
+		});
+	}
+	
+	return false;
+}
+
+// Shows the inbox messages
+function showInboxMessages() {
+	// Init
+	var mPath = '#inbox .';
+	
+	// We switch the divs
+	$(mPath + 'inbox-new').hide();
+	$(mPath + 'inbox-results').show();
+	
+	// We show a new link in the menu
+	$(mPath + 'a-show-messages').hide();
+	$(mPath + 'a-delete-messages').show();
+	$(mPath + 'a-new-message').show();
+	
+	// We reset some stuffs
+	cleanNewInboxMessage();
+	
+	return false;
+}
+
+// Displays a normal message
+function displayInboxMessage(from, subject, content, status, id, date) {
+	// Generate some paths
+	var inbox = '#inbox .';
+	var one_message = inbox + 'one-message.' + id;
+	
+	// Message yet displayed!
+	if(exists(one_message))
+		return false;
+	
+	// Get the nearest element
+	var stamp = extractStamp(Date.jab2date(date));
+	var nearest = sortElementByStamp(stamp, '#inbox .one-message');
+	
+	// Get the buddy name
+	var name = getBuddyName(from).htmlEnc();
+	
+	// We generate the html code
+	var nContent = '<div class="one-message message-' + status + ' ' + id + ' ' + hex_md5(from) + '" data-stamp="' + stamp + '">' + 
+				'<div class="message-head">' + 
+					'<div class="avatar-container">' + 
+						'<img class="avatar" src="' + './img/others/default-avatar.png' + '" alt="" />' + 
+					'</div>' + 
+					
+					'<div class="message-jid">' + name + '</div>' + 
+					'<div class="message-subject">' + subject.htmlEnc() + '</div>' + 
+					
+					'<div class="message-truncated">' + truncate(noLines(content), 90).htmlEnc() + '</div>' + 
+				'</div>' + 
+			'</div>';
+	
+	// Display the message
+	if(nearest == 0)
+		$(inbox + 'inbox-results .inbox').append(nContent);
+	else
+		$('#inbox .one-message[data-stamp=' + nearest + ']:first').before(nContent);
+	
+	// Click events
+	$(one_message + ' .message-head').click(function() {
+		if(!exists(one_message + ' .message-content'))
+			revealInboxMessage(id, from, subject, content, name, date, status);
+		else
+			hideInboxMessage(id);
+		
+		return false;
+	});
+	
+	// Get the user avatar
+	getAvatar(from, 'cache', 'true', 'forget');
+	
+	return true;
+}
+
+// Stores an inbox message
+function storeInboxMessage(from, subject, content, status, id, date) {
+	// Initialize the XML data
+	var xml = '<message><id>' + id.htmlEnc().htmlEnc() + '</id><date>' + date.htmlEnc().htmlEnc() + '</date><from>' + from.htmlEnc().htmlEnc() + '</from><subject>' + subject.htmlEnc().htmlEnc() + '</subject><status>' + status.htmlEnc().htmlEnc() + '</status><content>' + content.htmlEnc().htmlEnc() + '</content>';
+	
+	// End the XML data
+	xml += '</message>';
+	
+	// Store this message!
+	setDB('inbox', id, xml);
+}
+
+// Removes a given normal message
+function deleteInboxMessage(id) {
+	// Remove the message from the inbox
+	$('#inbox .one-message.' + id).remove();
+	
+	// Remove the message from the database
+	removeDB('inbox', id);
+	
+	// Check the unread messages
+	checkInboxMessages();
+	
+	// Store the new inbox
+	storeInbox();
+	
+	return false;
+}
+
+// Removes all the inbox messages
+function purgeInbox() {
+	// Remove all the messages from the database
+	for(var i = 0; i < sessionStorage.length; i++) {
+		// Get the pointer values
+		var current = sessionStorage.key(i);
+		
+		// If the pointer is on a stored message
+		if(explodeThis('_', current, 0) == 'inbox')
+			removeDB('inbox', explodeThis('_', current, 1));
+	}
+	
+	// Prevent the database lag
+	$(document).oneTime(100, function() {
+		// Store the new inbox
+		storeInbox();
+		
+		// Remove all the messages from the inbox
+		$('#inbox .one-message').remove();
+		
+		// Reload the inbox
+		loadInbox();
+	});
+	
+	return false;
+}
+
+// Checks if there are new messages to be notified
+function checkInboxMessages() {
+	// Selectors
+	var inbox_link = '#top-content a.inbox-hidable';
+	var no_results = '#inbox .inbox-noresults';
+	
+	// Marker
+	var has_messages = false;
+	
+	// Read the number of unread messages
+	var unread = 0;
+	
+	// Read the local inbox database
+	for(var i = 0; i < sessionStorage.length; i++) {
+		// Database pointer
+		var current = sessionStorage.key(i);
+		
+		// Check inbox messages
+		if(explodeThis('_', current, 0) == 'inbox') {
+			// Read the current status
+			var status = $(XMLFromString(sessionStorage.getItem(current))).find('status').text();
+			
+			// Found an unread message
+			if(status == 'unread')
+				unread++;
+			
+			// Update the marker
+			has_messages = true;
+		}
+	}
+	
+	// No message?
+	if(!has_messages)
+		$(no_results).show();
+	else
+		$(no_results).hide();
+	
+	// Reset notifications
+	$(inbox_link + ' .notify').remove();
+	
+	// Any unread message?
+	if(unread) {
+		// Notify the user
+		$(inbox_link).prepend('<div class="notify one-counter" data-counter="' + unread + '">' + unread + '</div>');
+		
+		// Update the title
+		updateTitle();
+		
+		return true;
+	}
+	
+	// Anyway, update the title
+	updateTitle();
+	
+	return false;
+}
+
+// Reveal a normal message content
+function revealInboxMessage(id, from, subject, content, name, date, status) {
+	// Message path
+	var all_message = '#inbox .one-message';
+	var one_message = all_message + '.' + id;
+	var one_content = one_message + ' .message-content';
+	
+	// We reset all the other messages
+	$(all_message + ' .message-content').remove();
+	$(all_message).removeClass('message-reading');
+	
+	// Message content
+	var html = 
+		'<div class="message-content">' + 
+			'<div class="message-body">' + filterThisMessage(content, name, true) + '</div>' + 
+			
+			'<div class="message-meta">' + 
+				'<span class="date">' + parseDate(date) + '</span>' + 
+				
+				'<a href="#" class="reply one-button talk-images">' + _e("Reply") + '</a>' + 
+				'<a href="#" class="remove one-button talk-images">' + _e("Delete") + '</a>' + 
+				
+				'<div class="clear">' + 
+			'</div>' + 
+		'</div>';
+	
+	// Message content
+	html += '</div>';
+	
+	$(one_message).append(html).addClass('message-reading');
+	
+	// Click events
+	$(one_content + ' a.reply').click(function() {
+		return replyInboxMessage(id, from, subject, content);
+	});
+	
+	$(one_content + ' a.remove').click(function() {
+		return deleteInboxMessage(id);
+	});
+	
+	// Unread message
+	if(status == 'unread') {
+		// Update our database
+		var xml = getDB('inbox', id).replace(/<status>unread<\/status>/i,'<status>read</status>');
+		setDB('inbox', id, xml);
+		
+		// Remove the unread class
+		$(one_message).removeClass('message-unread');
+		
+		// Send it to the server!
+		storeInbox();
+	}
+	
+	// Check the unread messages
+	checkInboxMessages();
+}
+
+// Hides a normal message content
+function hideInboxMessage(id) {
+	// Define the paths
+	var inbox = '#inbox .';
+	var one_message = inbox + 'one-message.' + id;
+	
+	// Reset this message
+	$(one_message).removeClass('message-reading');
+	$(one_message + ' .message-content').remove();
+}
+
+// Replies to a given normal message
+function replyInboxMessage(id, from, subject, body) {
+	// We switch to the writing div
+	newInboxMessage();
+	
+	// Inbox path
+	var inbox = '#inbox .';
+	
+	// Generate the body
+	var body = '\n' + '____________' + '\n\n' + truncate(body, 120);
+	
+	// We apply the generated values to the form
+	$(inbox + 'inbox-new-to-input').val(from);
+	$(inbox + 'inbox-new-subject-input').val(subject);
+	
+	$(document).oneTime(10, function() {
+		$(inbox + 'inbox-new-textarea').val(body).focus().selectRange(1, 0);
+	});
+	
+	return false;
+}
+
+// Loads the inbox messages
+function loadInbox() {
+	// Read the local database
+	for(var i = 0; i < sessionStorage.length; i++) {
+		// Get the pointer values
+		var current = sessionStorage.key(i);
+		
+		// If the pointer is on a stored message
+		if(explodeThis('_', current, 0) == 'inbox') {
+			// Get the current value
+			var value = $(XMLFromString(sessionStorage.getItem(current)));
+			
+			// Display the current message
+			displayInboxMessage(
+						value.find('from').text().revertHtmlEnc(),
+						value.find('subject').text().revertHtmlEnc(),
+						value.find('content').text().revertHtmlEnc(),
+						value.find('status').text().revertHtmlEnc(),
+						value.find('id').text().revertHtmlEnc(),
+						value.find('date').text().revertHtmlEnc()
+					   );
+		}
+	}
+	
+	// Check new messages
+	checkInboxMessages();
+}
+
+// Wait event for file attaching
+function waitInboxAttach() {
+	$('#inbox .wait').show();
+}
+
+// Success event for file attaching
+function handleInboxAttach(responseXML) {
+	// Data selector
+	var dData = $(responseXML).find('jappix');
+	
+	// Process the returned data
+	if(dData.find('error').size()) {
+		openThisError(4);
+		
+		logThis('Error while attaching the file: ' + dData.find('error').text(), 1);
+	}
+	
+	else {
+		// Get the file values
+		var fName = dData.find('title').text();
+		var fType = dData.find('type').text();
+		var fURL = dData.find('href').text();
+		
+		// Hide the attach link, show the unattach one
+		$('#inbox .inbox-new-file input').hide();
+		$('#inbox .inbox-new-file').append('<a class="file ' + encodeQuotes(fileCategory(explodeThis('/', fType, 1))) + ' talk-images" href="' + encodeQuotes(fURL) + '" target="_blank">' + fName.htmlEnc() + '</a><a href="#" class="remove one-button talk-images">' + _e("Remove") + '</a>');
+		
+		// Set values to the file link
+		$('#inbox .inbox-new-file a.file').attr('data-attachedtitle', fName)
+						  .attr('data-attachedhref',  fURL);
+		
+		// Click events
+		$('#inbox .inbox-new-file a.remove').click(function() {
+			$('#inbox .inbox-new-file a').remove();
+			$('#inbox .inbox-new-file input').show();
+			
+			return false;
+		});
+		
+		logThis('File attached.', 3);
+	}
+	
+	// Reset the attach bubble
+	$('#inbox .inbox-new-file input[type=file]').val('');
+	$('#inbox .wait').hide();
+}
+
+// Addon launcher
+function launchInbox() {
+	// Define the pats
+	var inbox = '#inbox .';
+	
+	// Define the buddy search vars
+	var destination = inbox + 'inbox-new-to';
+	var dHovered = destination + ' ul li.hovered:first';
+	
+	// Send the message when enter pressend
+	$(inbox + 'inbox-new input').keyup(function(e) {
+		if(e.keyCode == 13) {
+			if(exists(dHovered))
+				addBuddySearch(destination, $(dHovered).attr('data-xid'));
+			else
+				checkInboxMessage();
+		}
+	});
+	
+	// Buddy search
+	$(inbox + 'inbox-new-to-input').keyup(function(e) {
+		if(e.keyCode != 13) {
+			// New buddy search
+			if((e.keyCode != 40) && (e.keyCode != 38))
+				createBuddySearch(destination);
+			
+			// Navigating with keyboard in the results
+			arrowsBuddySearch(e, destination);
+		}
+	})
+	
+	// Buddy search lost focus
+	.blur(function() {
+		if(!$(destination + ' ul').attr('mouse-hover'))
+			resetBuddySearch(destination);
+	})
+	
+	// Buddy search got focus
+	.focus(function() {
+		var value = $(this).val();
+		
+		// Add a comma at the end
+		if(value && !value.match(/^(.+)((,)(\s)?)$/))
+			$(this).val(value + ', ');
+	});
+	
+	// Click events
+	$(inbox + 'a-delete-messages').click(purgeInbox);
+	$(inbox + 'a-new-message').click(newInboxMessage);
+	$(inbox + 'a-show-messages').click(showInboxMessages);
+	$(inbox + 'inbox-new-send a').click(checkInboxMessage);
+	
+	$(inbox + 'bottom .finish').click(function() {
+		return closeInbox();
+	});
+	
+	// File upload
+	var attach_options = {
+		dataType:	'xml',
+		beforeSubmit:	waitInboxAttach,
+		success:	handleInboxAttach
+	};
+	
+	// Upload form submit event
+	$('#inbox .inbox-new-file').submit(function() {
+		if($('#inbox .wait').is(':hidden') && $('#inbox .inbox-new-file input[type=file]').val())
+			$(this).ajaxSubmit(attach_options);
+		
+		return false;
+	});
+	
+	// Upload input change event
+	$('#inbox .inbox-new-file input[type=file]').change(function() {
+		if($('#inbox .wait').is(':hidden') && $(this).val())
+			$('#inbox .inbox-new-file').ajaxSubmit(attach_options);
+		
+		return false;
+	});
+}
diff --git a/jappixmini/jappix/js/integratebox.js b/jappixmini/jappix/js/integratebox.js
new file mode 100644
index 00000000..6d33df13
--- /dev/null
+++ b/jappixmini/jappix/js/integratebox.js
@@ -0,0 +1,340 @@
+/*
+
+Jappix - An open social platform
+These are the integratebox JS scripts for Jappix
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 03/12/11
+
+*/
+
+// Opens the integratebox popup
+function openIntegrateBox() {
+	// Popup HTML content
+	var html = 
+	'<div class="top">' + _e("Media viewer") + '</div>' + 
+	
+	'<div class="content"></div>' + 
+	
+	'<div class="bottom">' + 
+		'<div class="wait wait-medium"></div>' + 
+		
+		'<a href="#" class="finish close">' + _e("Close") + '</a>' + 
+		'<a href="#" class="finish next disabled" title="' + _e("Next") + '">&gt;</a>' + 
+		'<a href="#" class="finish previous disabled" title="' + _e("Previous") + '">&lt;</a>' + 
+	'</div>';
+	
+	// Create the popup
+	createPopup('integratebox', html);
+	
+	// Associate the events
+	launchIntegratebox();
+}
+
+// Closes the integratebox popup
+function closeIntegrateBox() {
+	// Destroy the popup
+	destroyPopup('integratebox');
+	
+	return false;
+}
+
+// Generates the integratebox HTML code
+function codeIntegrateBox(serv, url) {
+	var code = '';
+	
+	// Protocol to use
+	var protocol = 'http';
+	
+	if(isHTTPS())
+		protocol = 'https';
+	
+	// Legacy browser
+	var legacy = false;
+	
+	if((BrowserDetect.browser == 'Explorer') && (BrowserDetect.version < 9))
+		legacy = true;
+	
+	// Switch to get the good DOM code
+	switch(serv) {
+		case 'youtube':
+			if(legacy)
+				code = '<object width="640" height="385"><param name="movie" value="http://www.youtube.com/v/' + url + '&amp;autoplay=1"></param><embed src="http://www.youtube.com/v/' + encodeQuotes(url) + '&amp;autoplay=1" type="application/x-shockwave-flash" width="640" height="385"></embed></object>';
+			else
+				code = '<object width="640" height="385" data="' + encodeQuotes(protocol) + '://www.youtube.com/embed/' + encodeQuotes(url) + '?autoplay=1" type="text/html"><a href="http://www.youtube.com/watch?v=' + encodeQuotes(url) + '" target="_blank">http://www.youtube.com/watch?v=' + encodeQuotes(url) + '</a></object>';
+			
+			break;
+		
+		case 'dailymotion':
+			code = '<object width="640" height="385"><param name="movie" value="http://www.dailymotion.com/swf/video/' + url + '&amp;autoplay=1"></param><param name="allowFullScreen" value="false"></param><embed type="application/x-shockwave-flash" src="http://www.dailymotion.com/swf/video/' + encodeQuotes(url) + '&amp;autoplay=1" width="640" height="385" allowfullscreen="true" allowscriptaccess="always"></embed></object>';
+			
+			break;
+		
+		case 'vimeo':
+			code = '<object width="640" height="385"><param name="allowfullscreen" value="true" /><param name="movie" value="http://vimeo.com/moogaloop.swf?clip_id=' + encodeQuotes(url) + '&amp;server=vimeo.com&amp;show_title=1&amp;show_byline=1&amp;show_portrait=0&amp;color=&amp;fullscreen=1&amp;autoplay=1" /><embed src="http://vimeo.com/moogaloop.swf?clip_id=' + encodeQuotes(url) + '&amp;server=vimeo.com&amp;show_title=1&amp;show_byline=1&amp;show_portrait=0&amp;color=&amp;fullscreen=1&amp;autoplay=1" type="application/x-shockwave-flash" allowfullscreen="true" allowscriptaccess="always" width="640" height="385"></embed></object>';
+			
+			break;
+		
+		case 'theora':
+		case 'video':
+			code = '<video width="640" height="385" src="' + encodeQuotes(url) + '" controls autoplay><a href="' + encodeQuotes(url) + '" target="_blank">' + encodeQuotes(url) + '</a></video>';
+			
+			break;
+		
+		case 'vorbis':
+		case 'audio':
+			code = '<audio src="' + encodeQuotes(url) + '" controls autoplay><a href="' + encodeQuotes(url) + '" target="_blank">' + encodeQuotes(url) + '</a></audio>';
+			
+			break;
+		
+		case 'image':
+			code = '<a href="' + encodeQuotes(url) + '" target="_blank"><img alt="" src="' + encodeQuotes(url) + '" /></a>';
+		
+			break;
+	}
+	
+	return code;
+}
+
+// Applies a given integratebox element
+function applyIntegrateBox(url, service, url_list, services_list, comments_e_list, comments_n_list, width_style) {
+	// Close the integratebox
+	closeIntegrateBox();
+	
+	// Media integration not wanted?
+	if(getDB('options', 'integratemedias') == '0')
+		return true;
+	
+	// Apply the HTML code
+	var dom_code = codeIntegrateBox(service, url);
+	
+	// Any code: apply it!
+	if(dom_code) {
+		// We show the integratebox
+		openIntegrateBox();
+		
+		// We add the code to the DOM
+		$('#integratebox .content').prepend('<div class="one-media">' + dom_code + '</div>');
+		
+		// Image waiting icon
+		if(service == 'image') {
+			var waitItem = $('#integratebox .wait');
+			
+			// Show it while it is loading
+			waitItem.show();
+			
+			// Hide it when it is loaded
+			$('#integratebox img').load(function() {
+				waitItem.hide();
+				
+				// Center the image vertically
+				$(this).oneTime(10, function() {
+					$(this).css('margin-top', (($('#integratebox .content').height() - $(this).height()) / 2));
+				});
+			});
+		}
+		
+		// Large style?
+		var comments_id = genID();
+		
+		if(width_style == 'large') {
+			// Make the popup large
+			$('#integratebox .popup').addClass('large');
+			
+			// Add the right content
+			$('#integratebox .content').after(
+				'<div class="comments" data-id="' + encodeQuotes(comments_id) + '">' + 
+					'<div class="comments-content">' + 
+						'<div class="one-comment loading"><span class="icon talk-images"></span>' + _e("Loading comments...") + '</div>' + 
+					'</div>' + 
+				'</div>'
+			);
+		}
+		
+		// Previous and next items?
+		var url_array = stringToArray(url_list);
+		var services_array = stringToArray(services_list);
+		var comments_e_array = stringToArray(comments_e_list);
+		var comments_n_array = stringToArray(comments_n_list);
+		var index = indexArrayValue(url_array, url);
+		
+		// Any comments?
+		if(exists('#integratebox .comments')) {
+			if(comments_e_array[index] && comments_n_array[index])
+				getCommentsMicroblog(comments_e_array[index], comments_n_array[index], comments_id);
+			else
+				$('#integratebox .comments .comments-content').html('<div class="one-comment loading"><span class="icon talk-images"></span>' + _e("Comments locked!") + '</div>');
+		}
+			
+		// Get the previous values
+		var previous_url = url_array[index - 1];
+		var previous_services = services_array[index - 1];
+		
+		// Get the next values
+		var next_url = url_array[index + 1];
+		var next_services = services_array[index + 1];
+		
+		// Enable/disable buttons
+		if(previous_url && previous_services)
+			$('#integratebox .bottom .finish.previous').removeClass('disabled');
+		else
+			$('#integratebox .bottom .finish.previous').addClass('disabled');
+		
+		if(next_url && next_services)
+			$('#integratebox .bottom .finish.next').removeClass('disabled');
+		else
+			$('#integratebox .bottom .finish.next').addClass('disabled');
+		
+		// Click events
+		$('#integratebox .bottom .finish.previous, #integratebox .bottom .finish.next').click(function() {
+			// Not acceptable?
+			if($(this).is('.disabled'))
+				return false;
+			
+			// Apply the event!
+			if($(this).is('.previous'))
+				applyIntegrateBox(previous_url, previous_services, url_list, services_list, comments_e_list, comments_n_list, width_style);
+			else
+				applyIntegrateBox(next_url, next_services, url_list, services_list, comments_e_list, comments_n_list, width_style);
+			
+			return false;
+		});
+		
+		if(width_style == 'large')
+			$('#integratebox .content a:has(img)').click(function() {
+				if(next_url && next_services)
+					applyIntegrateBox(next_url, next_services, url_list, services_list, comments_e_list, comments_n_list, width_style);
+				
+				return false;
+			});
+		
+		return false;
+	}
+	
+	// Nothing: return true to be able to open the URL in a new tab
+	return true;
+}
+
+// Checks whether the file ext can use integratebox or not
+function canIntegrateBox(ext) {
+	// Can use?
+	if(ext && ((ext == 'jpg') || (ext == 'jpeg') || (ext == 'png') || (ext == 'gif') || (ext == 'ogg') || (ext == 'oga') || (ext == 'ogv')))
+		return true;
+	
+	return false;
+}
+
+// Filters a string to apply the integratebox links
+function filterIntegrateBox(data) {
+	// Encapsulates the string into two <div /> elements
+	var xml = $('<div><div>' + data + '</div></div>').contents();
+	
+	// Loop the <a /> elements
+	$(xml).find('a').each(function() {
+		// Initialize this element
+		var href = $(this).attr('href');
+		var to, url, service, event;
+		
+		// XMPP ID
+		if(href.match(/^xmpp:(.+)/i))
+			to = RegExp.$1;
+		
+		// YouTube video box
+		else if(href.match(/(\w{3,5})(:)(\S+)((\.youtube\.com\/watch(\?v|\?\S+v|\#\!v|\#\!\S+v)\=)|(youtu\.be\/))([^& ]+)((&amp;\S)|(&\S)|\s|$)/gim)) {
+			url = RegExp.$8;
+			service = 'youtube';
+		}
+		
+		// Dailymotion video box
+		else if(href.match(/(\w{3,5})(:)(\S+)\.dailymotion\.com\/video\/([\w\-]+)((\#[\w\-]+)|\s|$)/gim)) {
+			url = RegExp.$4;
+			service = 'dailymotion';
+		}
+		
+		// Vimeo video box
+		else if(href.match(/((\w{3,5})(:)(\S+)(vimeo|www\.vimeo)\.com\/([\w\-]+))/gim)) {
+			url = RegExp.$1;
+			service = 'vimeo';
+		}
+		
+		// Theora video box
+		else if(href.match(/((\w{3,5})(:)(\S+)(\.)(ogv|ogg))/gim)) {
+			url = RegExp.$1;
+			service = 'theora';
+		}
+		
+		// Vorbis audio box
+		else if(href.match(/((\w{3,5})(:)(\S+)(\.oga))/gim)) {
+			url = RegExp.$1;
+			service = 'vorbis';
+		}
+		
+		// Image box
+		else if(href.match(/((\w{3,5})(:)(\S+)(\.)(jpg|jpeg|png|gif|tif|bmp))/gim)) {
+			url = RegExp.$1;
+			service = 'image';
+		}
+		
+		// Define the good event
+		if(to)
+			event = 'xmppLink(\'' + encodeOnclick(to) + '\')';
+		else if(url && service)
+			event = 'applyIntegrateBox(\'' + encodeOnclick(url) + '\', \'' + encodeOnclick(service) + '\')';
+		
+		// Any click event to apply?
+		if(event) {
+			// Regenerate the link element (for onclick)
+			var new_a = '<a';
+			var element_a = (this);
+			
+			// Attributes
+			$(element_a.attributes).each(function(index) {
+				// Read the current attribute
+				var current_attr = element_a.attributes[index];
+				
+				// Apply the current attribute
+				new_a += ' ' + encodeQuotes(current_attr.name) + '="' + encodeQuotes(current_attr.value) + '"';
+			});
+			
+			// Add onclick attribute
+			new_a += ' onclick="return ' + event + ';"';
+			
+			// Value
+			new_a += '>' + $(this).text().htmlEnc() + '</a>';
+			
+			// Replace it!
+			$(this).replaceWith(new_a);
+		}
+	});
+	
+	// Regenerate the HTML code (include string into a div to be readable)
+	var string = $(xml).html();
+	
+	return string;
+}
+
+// Addon launcher
+function launchIntegratebox() {
+	// Click event
+	$('#integratebox .bottom .finish.close').click(closeIntegrateBox);
+}
+
+// Addon keyup event
+$(document).keyup(function(e) {
+	// Previous item?
+	if((exists('#integratebox .bottom .finish.previous:not(.disabled)')) && (e.keyCode == 37)) {
+		$('#integratebox .bottom .finish.previous').click();
+		
+		return false;
+	}
+	
+	// Next item?
+	if((exists('#integratebox .bottom .finish.next:not(.disabled)')) && (e.keyCode == 39)) {
+		$('#integratebox .bottom .finish.next').click();
+		
+		return false;
+	}
+});
diff --git a/jappixmini/jappix/js/interface.js b/jappixmini/jappix/js/interface.js
new file mode 100644
index 00000000..5fe6593b
--- /dev/null
+++ b/jappixmini/jappix/js/interface.js
@@ -0,0 +1,386 @@
+/*
+
+Jappix - An open social platform
+These are the interface JS scripts for Jappix
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 26/08/11
+
+*/
+
+// Changes the title of the document
+function pageTitle(title) {
+	// Anonymous mode?
+	var head_name = getName();
+	
+	if(isAnonymous())
+		head_name = ANONYMOUS_ROOM + ' (' + _e("anonymous mode") + ')';
+	
+	// We change the title to give essential informations
+	switch(title) {
+		case 'home':
+			document.title = SERVICE_NAME + ' • ' + _e("An open social network");
+			
+			break;
+		
+		case 'talk':
+			document.title = 'Jappix • ' + head_name;
+			
+			break;
+		
+		case 'new':
+			document.title = '[' + pendingEvents() + '] Jappix • ' + head_name;
+			
+			break;
+		
+		case 'wait':
+			document.title = 'Jappix • ' + _e("Please wait...");
+			
+			break;
+	}
+}
+
+// Creates a general-wait item
+function showGeneralWait() {
+	// Item exists?
+	if(exists('#general-wait'))
+		return false;
+	
+	// Generate the HTML code
+	var html = 
+	'<div id="general-wait" class="removable">' + 
+		'<div class="general-wait-content wait-big"></div>' + 
+	'</div>';
+	
+	// Append the HTML code
+	$('body').append(html);
+	
+	return true;
+}
+
+// Removes the general-wait item
+function removeGeneralWait() {
+	$('#general-wait').remove();
+}
+
+// Generates a file upload valid form content
+function generateFileShare() {
+	return  '<input type="hidden" name="MAX_FILE_SIZE" value="' + encodeQuotes(JAPPIX_MAX_FILE_SIZE) + '">' + 
+		'<input type="hidden" name="user" value="' + encodeQuotes(getXID()) + '" />' + 
+		'<input type="hidden" name="location" value="' + encodeQuotes(generateURL(JAPPIX_LOCATION)) + '" />' + 
+		'<input type="hidden" name="id" value="' + (new Date()).getTime() + '" />' + 
+		'<input type="file" name="file" required="" />' + 
+		'<input type="submit" value="' + _e("Send") + '" />';
+}
+
+// Switches to the given chan
+function switchChan(id) {
+	if(exists('#' + id)) {
+		// We show the page-engine content
+		$('.page-engine-chan').hide();
+		$('#' + id).show();
+		
+		// We edit the tab switcher
+		$('#page-switch .switcher').removeClass('activechan').addClass('chan');
+		$('#page-switch .' + id).addClass('activechan').removeClass('chan');
+		
+		// Scroll down to the last message
+		if(id != 'channel')
+			autoScroll(id);
+		
+		// Manage input focus
+		inputFocus();
+	}
+	
+	return false;
+}
+
+// Loads the complete chat switcher
+function loadChatSwitch() {
+	// Path
+	var more_content = '#page-switch .more-content';
+	
+	// Yet displayed?
+	if(exists(more_content))
+		return closeBubbles();
+	
+	// Add the bubble
+	showBubble(more_content);
+	
+	// Append the content
+	$('#page-switch .more').append(
+		'<div class="more-content bubble removable">' + 
+			$('#page-switch .chans').html() + 
+		'</div>'
+	);
+	
+	return false;
+}
+
+// Puts the selected smiley in the good page-engine input
+function insertSmiley(smiley, hash) {
+	// We define the variables
+	var selector = $('#' + hash + ' .message-area');
+	var oValue = selector.val();
+	
+	// Any old value?
+	if(oValue && !oValue.match(/^(.+)(\s)+$/))
+		oValue += ' ';
+	
+	var nValue = oValue + smiley + ' ';
+	
+	// Put the new value and focus on it
+	$(document).oneTime(10, function() {
+		selector.val(nValue).focus();
+	});
+	
+	return false;
+}
+
+// Deletes all the associated elements of the chat we want to remove
+function deleteThisChat(hash) {
+	$('#' + hash + ', #page-switch .' + hash).remove();
+}
+
+// Closes the given chat
+function quitThisChat(xid, hash, type) {
+	if(type == 'groupchat') {
+		// Send our unavailable presence
+		sendPresence(xid + '/' + getMUCNick(hash), 'unavailable');
+		
+		// Remove all presence database entries for this groupchat
+		for(var i = 0; i < sessionStorage.length; i++) {
+			// Get the pointer values
+			var current = sessionStorage.key(i);
+			var cXID = explodeThis('_', current, 1);
+			
+			// If the pointer is on a presence from this groupchat
+			if((explodeThis('_', current, 0) == 'presence') && (bareXID(cXID) == xid)) {
+				// Generate the hash for the current XID
+				var cHash = hex_md5(cXID);
+				
+				// Disable the message textarea
+				$('#' + cHash + ' .message-area').attr('disabled', true);
+				
+				// Remove the presence for this XID
+				removeDB('presence', cXID);
+				presenceFunnel(cXID, cHash);
+			}
+		}
+	}
+	
+	else
+		chatStateSend('gone', xid, hash);
+	
+	// Get the chat ID which is before
+	var previous = $('#' + hash).prev().attr('id');
+	
+	// Remove the chat
+	deleteThisChat(hash);
+	
+	// Reset the switcher
+	if(!exists('#page-switch .switcher.activechan'))
+		switchChan(previous);
+	
+	// Reset the notifications
+	chanCleanNotify(hash);
+	
+	return false;
+}
+
+// Generates the chat logs
+function generateChatLog(xid, hash) {
+	// Get the main values
+	var path = '#' + hash + ' .';
+	var content = $(path + 'content').clone().contents();
+	var avatar = $(path + 'top .avatar-container:first').html();
+	var nick = $(path + 'top .bc-name').text();
+	var date = getXMPPTime('local');
+	var type = $('#' + hash).attr('data-type');
+	
+	// Filter the content smileys
+	$(content).find('img.emoticon').each(function() {
+		$(this).replaceWith($(this).attr('alt'));
+	});
+	
+	// Remove the useless attributes
+	$(content).removeAttr('data-type').removeAttr('data-stamp');
+	
+	// Remove the content avatars
+	$(content).find('.avatar-container').remove();
+	
+	// Remove the content click events
+	$(content).find('a').removeAttr('onclick');
+	
+	// Extract the content HTML code
+	content = $(content).parent().html();
+	
+	// No avatar?
+	if(!avatar || !avatar.match(/data:/))
+		avatar = 'none';
+	
+	// POST the values to the server
+	$.post('./php/generate-chat.php', { content: content, xid: xid, nick: nick, avatar: avatar, date: date, type: type }, function(data) {
+		// Handled!
+		$(path + 'tooltip-waitlog').replaceWith('<a class="tooltip-actionlog" href="./php/download-chat.php?id=' + data + '" target="_blank">' + _e("Download file!") + '</a>');
+	});
+	
+	return false;
+}
+
+// Notifies the user from a new incoming message
+function messageNotify(hash, type) {
+	// Initialize the vars
+	var chat_switch = '#page-switch .';
+	var tested = chat_switch + hash;
+	var active = $(tested).hasClass('activechan');
+	
+	// We notify the user if he has not the focus on the chat
+	if(!active || !isFocused()) {
+		if(!active) {
+			if(type == 'personnal')
+				$(tested + ', ' + chat_switch + 'more-button').addClass('chan-newmessage');
+			else if(type == 'unread')
+				$(tested).addClass('chan-unread');
+		}
+		
+		// Count the number of pending messages
+		var pending = 1;
+		
+		if(exists('#' + hash + '[data-counter]'))
+			pending = parseInt($('#' + hash).attr('data-counter')) + 1;
+		
+		$('#' + hash).attr('data-counter', pending);
+	}
+	
+	// Update the page title
+	updateTitle();
+}
+
+// Returns the number of pending events
+function pendingEvents() {
+	// Count the number of notifications
+	var number = 0;
+	
+	$('.one-counter[data-counter]').each(function() {
+		number = number + parseInt($(this).attr('data-counter'));
+	});
+	
+	return number;
+}
+
+// Updates the page title
+function updateTitle() {
+	// Any pending events?
+	if(exists('.one-counter[data-counter]'))
+		pageTitle('new');
+	else
+		pageTitle('talk');
+}
+
+// Cleans the given chat notifications
+function chanCleanNotify(hash) {
+	// We remove the class that tell the user of a new message
+	var chat_switch = '#page-switch .';
+	$(chat_switch + hash).removeClass('chan-newmessage chan-unread');
+	
+	// We reset the global notifications if no more unread messages
+	if(!$(chat_switch + 'chans .chan-newmessage').size())
+		$(chat_switch + 'more-button').removeClass('chan-newmessage');
+	
+	// We reset the chat counter
+	$('#' + hash).removeAttr('data-counter');
+	
+	// Update the page title
+	updateTitle();
+}
+
+// Scrolls to the last chat message
+function autoScroll(hash) {
+	// Avoid a JS error
+	if(exists('#' + hash)) {
+		var container = document.getElementById('chat-content-' + hash);
+		
+		// Scroll down!
+		container.scrollTop = container.scrollHeight;
+	}
+}
+
+// Shows all the buddies in the buddy-list
+function showAllBuddies(from) {
+	// Put a marker
+	BLIST_ALL = true;
+	
+	// We switch the two modes
+	$('.buddy-conf-more-display-unavailable').hide();
+	$('.buddy-conf-more-display-available').show();
+	
+	// Security: reset all the groups toggle event
+	$('#buddy-list .group-buddies').show();
+	$('#buddy-list .group span').text('-');
+	
+	// We show the disconnected buddies
+	$('.hidden-buddy').show();
+	
+	// We show all the groups
+	$('#buddy-list .one-group').show();
+	
+	if(SEARCH_FILTERED)
+		funnelFilterBuddySearch();
+	
+	// Store this in the options
+	if((from == 'roster') && loadedOptions()) {
+		setDB('options', 'roster-showall', '1');
+		storeOptions();
+	}
+}
+
+// Shows only the online buddies in the buddy-list
+function showOnlineBuddies(from) {
+	// Remove the marker
+	BLIST_ALL = false;
+	
+	// We switch the two modes
+	$('.buddy-conf-more-display-available').hide();
+	$('.buddy-conf-more-display-unavailable').show();
+	
+	// Security: reset all the groups toggle event
+	$('#buddy-list .group-buddies').show();
+	$('#buddy-list .group span').text('-');
+	
+	// We hide the disconnected buddies
+	$('.hidden-buddy').hide();
+	
+	// We check the groups to hide
+	updateGroups();
+	
+	if(SEARCH_FILTERED)
+		funnelFilterBuddySearch();
+	
+	// Store this in the options
+	if((from == 'roster') && loadedOptions()) {
+		setDB('options', 'roster-showall', '0');
+		storeOptions();
+	}
+}
+
+// Focuses on the right input
+function inputFocus() {
+	// No popup shown
+	if(!exists('.popup'))
+		$(document).oneTime(10, function() {
+			$('.focusable:visible:first').focus();
+		});
+}
+
+// Addon launcher
+function launchInterface() {
+	// Focus on the first visible input
+	$(window).focus(inputFocus);
+}
+
+// Launch this addon!
+$(document).ready(launchInterface);
diff --git a/jappixmini/jappix/js/iq.js b/jappixmini/jappix/js/iq.js
new file mode 100644
index 00000000..1e16292e
--- /dev/null
+++ b/jappixmini/jappix/js/iq.js
@@ -0,0 +1,193 @@
+/*
+
+Jappix - An open social platform
+These are the IQ JS scripts for Jappix
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 27/08/11
+
+*/
+
+// Handles an incoming IQ packet
+function handleIQ(iq) {
+	// Gets the IQ content
+	var iqNode = iq.getNode();
+	var iqFrom = fullXID(getStanzaFrom(iq));
+	var iqID = iq.getID();
+	var iqQueryXMLNS = iq.getQueryXMLNS();
+	var iqQuery = iq.getQuery();
+	var iqType = iq.getType();
+	
+	// Build the response
+	var iqResponse = new JSJaCIQ();
+	
+	iqResponse.setID(iqID);
+	iqResponse.setTo(iqFrom);
+	iqResponse.setType('result');
+	
+	// OOB request
+	if((iqQueryXMLNS == NS_IQOOB) && (iqType == 'set')) {
+		/* REF: http://xmpp.org/extensions/xep-0066.html */
+		
+		handleOOB(iqFrom, iqID, 'iq', iqNode);
+		
+		logThis('Received IQ OOB request: ' + iqFrom);
+	}
+	
+	// OOB reply
+	else if(getDB('send/url', iqID)) {
+		// Get the values
+		var oob_url = getDB('send/url', iqID);
+		var oob_desc = getDB('send/desc', iqID);
+		var notif_id = hex_md5(oob_url + oob_desc + iqType + iqFrom + iqID);
+		
+		// Error?
+		if($(iqNode).find('error').size()) {
+			// Rejected?
+			if($(iqNode).find('error not-acceptable').size())
+				newNotification('send_reject', iqFrom, [iqFrom, oob_url, 'iq', iqID, iqNode], oob_desc, notif_id);
+			
+			// Failed?
+			else
+				newNotification('send_fail', iqFrom, [iqFrom, oob_url, 'iq', iqID, iqNode], oob_desc, notif_id);
+			
+			// Remove the file
+			$.get(oob_url + '&action=remove');
+		}
+		
+		// Success?
+		else if(iqType == 'result')
+			newNotification('send_accept', iqFrom, [iqFrom, oob_url, 'iq', iqID, iqNode], oob_desc, notif_id);
+	}
+	
+	// Software version query
+	else if((iqQueryXMLNS == NS_VERSION) && (iqType == 'get')) {
+		/* REF: http://xmpp.org/extensions/xep-0092.html */
+		
+		var iqQuery = iqResponse.setQuery(NS_VERSION);
+		
+		iqQuery.appendChild(iq.buildNode('name', {'xmlns': NS_VERSION}, 'Jappix'));
+		iqQuery.appendChild(iq.buildNode('version', {'xmlns': NS_VERSION}, JAPPIX_VERSION));
+		iqQuery.appendChild(iq.buildNode('os', {'xmlns': NS_VERSION}, BrowserDetect.OS));
+		
+		con.send(iqResponse);
+		
+		logThis('Received software version query: ' + iqFrom);
+	}
+	
+	// Last activity query
+	else if((iqQueryXMLNS == NS_LAST) && (iqType == 'get')) {
+		/* REF: http://xmpp.org/extensions/xep-0012.html */
+		
+		var iqQuery = iqResponse.setQuery(NS_LAST);
+		iqQuery.setAttribute('seconds', getLastActivity());
+		
+		con.send(iqResponse);
+		
+		logThis('Received last activity query: ' + iqFrom);
+	}
+	
+	// Privacy lists push
+	else if((iqQueryXMLNS == NS_PRIVACY) && (iqType == 'set')) {
+		// REF : http://xmpp.org/extensions/xep-0016.html
+		
+		// Roster push
+		con.send(iqResponse);
+		
+		// Get the lists
+		$(iqQuery).find('list').each(function() {
+			getPrivacy($(this).attr('name'));
+		});
+		
+		logThis('Received privacy lists push: ' + iqFrom);
+	}
+	
+	// Roster push
+	else if((iqQueryXMLNS == NS_ROSTER) && (iqType == 'set')) {
+		// REF : http://xmpp.org/extensions/xep-0092.html
+		
+		// Roster push
+		con.send(iqResponse);
+		
+		// Get the values
+		$(iqQuery).find('item').each(function() {
+			parseRoster($(this), 'presence');
+		});
+		
+		logThis('Received roster push: ' + iqFrom);
+	}
+	
+	// Roster Item Exchange query
+	else if($(iqNode).find('x[xmlns=' + NS_ROSTERX + ']').size()) {
+		// Open a new notification
+		newNotification('rosterx', iqFrom, [iqNode], '');
+		
+		logThis('Roster Item Exchange from: ' + iqFrom);
+	}
+	
+	// Disco info query
+	else if((iqQueryXMLNS == NS_DISCO_INFO) && (iqType == 'get')) {
+		/* REF: http://xmpp.org/extensions/xep-0030.html */
+		
+		var iqQuery = iqResponse.setQuery(NS_DISCO_INFO);
+		
+		// We set the name of the client
+		iqQuery.appendChild(iq.buildNode('identity', {
+			'category': 'client',
+			'type': 'web',
+			'name': 'Jappix',
+			'xmlns': NS_DISCO_INFO
+		}));
+		
+		// We set all the supported features
+		var fArray = myDiscoInfos();
+		
+		for(i in fArray)
+			iqQuery.appendChild(iq.buildNode('feature', {'var': fArray[i], 'xmlns': NS_DISCO_INFO}));
+		
+		con.send(iqResponse);
+		
+		logThis('Received disco#infos query: ' + iqFrom);
+	}
+	
+	// User time query
+	else if($(iqNode).find('time').size() && (iqType == 'get')) {
+		/* REF: http://xmpp.org/extensions/xep-0202.html */
+		
+		var iqTime = iqResponse.appendNode('time', {'xmlns': NS_URN_TIME});
+		iqTime.appendChild(iq.buildNode('tzo', {'xmlns': NS_URN_TIME}, getDateTZO()));
+		iqTime.appendChild(iq.buildNode('utc', {'xmlns': NS_URN_TIME}, getXMPPTime('utc')));
+		
+		con.send(iqResponse);
+		
+		logThis('Received local time query: ' + iqFrom);
+	}
+	
+	// Ping
+	else if($(iqNode).find('ping').size() && (iqType == 'get')) {
+		/* REF: http://xmpp.org/extensions/xep-0199.html */
+		
+		con.send(iqResponse);
+		
+		logThis('Received a ping: ' + iqFrom);
+	}
+	
+	// Not implemented
+	else if(!$(iqNode).find('error').size() && ((iqType == 'get') || (iqType == 'set'))) {
+		// Append stanza content
+		for(var i = 0; i < iqNode.childNodes.length; i++)
+			iqResponse.getNode().appendChild(iqNode.childNodes.item(i).cloneNode(true));
+		
+		// Append error content
+		var iqError = iqResponse.appendNode('error', {'xmlns': NS_CLIENT, 'code': '501', 'type': 'cancel'});
+		iqError.appendChild(iq.buildNode('feature-not-implemented', {'xmlns': NS_STANZAS}));
+		iqError.appendChild(iq.buildNode('text', {'xmlns': NS_STANZAS}, _e("The feature requested is not implemented by the recipient or server and therefore cannot be processed.")));
+		
+		con.send(iqResponse);
+		
+		logThis('Received an unsupported IQ query from: ' + iqFrom);
+	}
+}
diff --git a/jappixmini/jappix/js/jquery.datepicker.js b/jappixmini/jappix/js/jquery.datepicker.js
new file mode 100644
index 00000000..d4786f90
--- /dev/null
+++ b/jappixmini/jappix/js/jquery.datepicker.js
@@ -0,0 +1,896 @@
+/*
+
+Jappix - An open social platform
+These are the datepicker JS script
+
+-------------------------------------------------
+
+Licenses: MIT, GPL, AGPL
+Authors: Stefan Petre, Vanaryon
+Last revision: 19/12/10
+
+*/
+
+(function ($) {
+	var DatePicker = function () {
+		var	ids = {},
+			views = {
+				years: 'datepickerViewYears',
+				moths: 'datepickerViewMonths',
+				days: 'datepickerViewDays'
+			},
+			tpl = {
+				wrapper: '<div class="datepicker"><div class="datepickerBorderT" /><div class="datepickerBorderB" /><div class="datepickerBorderL" /><div class="datepickerBorderR" /><div class="datepickerBorderTL" /><div class="datepickerBorderTR" /><div class="datepickerBorderBL" /><div class="datepickerBorderBR" /><div class="datepickerContainer"><table cellspacing="0" cellpadding="0"><tbody><tr></tr></tbody></table></div></div>',
+				head: [
+					'<td>',
+					'<table cellspacing="0" cellpadding="0">',
+						'<thead>',
+							'<tr>',
+								'<th class="datepickerGoPrev"><a href="#"><span><%=prev%></span></a></th>',
+								'<th colspan="6" class="datepickerMonth"><a href="#"><span></span></a></th>',
+								'<th class="datepickerGoNext"><a href="#"><span><%=next%></span></a></th>',
+							'</tr>',
+							'<tr class="datepickerDoW">',
+								'<th><span><%=week%></span></th>',
+								'<th><span><%=day1%></span></th>',
+								'<th><span><%=day2%></span></th>',
+								'<th><span><%=day3%></span></th>',
+								'<th><span><%=day4%></span></th>',
+								'<th><span><%=day5%></span></th>',
+								'<th><span><%=day6%></span></th>',
+								'<th><span><%=day7%></span></th>',
+							'</tr>',
+						'</thead>',
+					'</table></td>'
+				],
+				space : '<td class="datepickerSpace"><div></div></td>',
+				days: [
+					'<tbody class="datepickerDays">',
+						'<tr>',
+							'<th class="datepickerWeek"><a href="#"><span><%=weeks[0].week%></span></a></th>',
+							'<td class="<%=weeks[0].days[0].classname%>"><a href="#"><span><%=weeks[0].days[0].text%></span></a></td>',
+							'<td class="<%=weeks[0].days[1].classname%>"><a href="#"><span><%=weeks[0].days[1].text%></span></a></td>',
+							'<td class="<%=weeks[0].days[2].classname%>"><a href="#"><span><%=weeks[0].days[2].text%></span></a></td>',
+							'<td class="<%=weeks[0].days[3].classname%>"><a href="#"><span><%=weeks[0].days[3].text%></span></a></td>',
+							'<td class="<%=weeks[0].days[4].classname%>"><a href="#"><span><%=weeks[0].days[4].text%></span></a></td>',
+							'<td class="<%=weeks[0].days[5].classname%>"><a href="#"><span><%=weeks[0].days[5].text%></span></a></td>',
+							'<td class="<%=weeks[0].days[6].classname%>"><a href="#"><span><%=weeks[0].days[6].text%></span></a></td>',
+						'</tr>',
+						'<tr>',
+							'<th class="datepickerWeek"><a href="#"><span><%=weeks[1].week%></span></a></th>',
+							'<td class="<%=weeks[1].days[0].classname%>"><a href="#"><span><%=weeks[1].days[0].text%></span></a></td>',
+							'<td class="<%=weeks[1].days[1].classname%>"><a href="#"><span><%=weeks[1].days[1].text%></span></a></td>',
+							'<td class="<%=weeks[1].days[2].classname%>"><a href="#"><span><%=weeks[1].days[2].text%></span></a></td>',
+							'<td class="<%=weeks[1].days[3].classname%>"><a href="#"><span><%=weeks[1].days[3].text%></span></a></td>',
+							'<td class="<%=weeks[1].days[4].classname%>"><a href="#"><span><%=weeks[1].days[4].text%></span></a></td>',
+							'<td class="<%=weeks[1].days[5].classname%>"><a href="#"><span><%=weeks[1].days[5].text%></span></a></td>',
+							'<td class="<%=weeks[1].days[6].classname%>"><a href="#"><span><%=weeks[1].days[6].text%></span></a></td>',
+						'</tr>',
+						'<tr>',
+							'<th class="datepickerWeek"><a href="#"><span><%=weeks[2].week%></span></a></th>',
+							'<td class="<%=weeks[2].days[0].classname%>"><a href="#"><span><%=weeks[2].days[0].text%></span></a></td>',
+							'<td class="<%=weeks[2].days[1].classname%>"><a href="#"><span><%=weeks[2].days[1].text%></span></a></td>',
+							'<td class="<%=weeks[2].days[2].classname%>"><a href="#"><span><%=weeks[2].days[2].text%></span></a></td>',
+							'<td class="<%=weeks[2].days[3].classname%>"><a href="#"><span><%=weeks[2].days[3].text%></span></a></td>',
+							'<td class="<%=weeks[2].days[4].classname%>"><a href="#"><span><%=weeks[2].days[4].text%></span></a></td>',
+							'<td class="<%=weeks[2].days[5].classname%>"><a href="#"><span><%=weeks[2].days[5].text%></span></a></td>',
+							'<td class="<%=weeks[2].days[6].classname%>"><a href="#"><span><%=weeks[2].days[6].text%></span></a></td>',
+						'</tr>',
+						'<tr>',
+							'<th class="datepickerWeek"><a href="#"><span><%=weeks[3].week%></span></a></th>',
+							'<td class="<%=weeks[3].days[0].classname%>"><a href="#"><span><%=weeks[3].days[0].text%></span></a></td>',
+							'<td class="<%=weeks[3].days[1].classname%>"><a href="#"><span><%=weeks[3].days[1].text%></span></a></td>',
+							'<td class="<%=weeks[3].days[2].classname%>"><a href="#"><span><%=weeks[3].days[2].text%></span></a></td>',
+							'<td class="<%=weeks[3].days[3].classname%>"><a href="#"><span><%=weeks[3].days[3].text%></span></a></td>',
+							'<td class="<%=weeks[3].days[4].classname%>"><a href="#"><span><%=weeks[3].days[4].text%></span></a></td>',
+							'<td class="<%=weeks[3].days[5].classname%>"><a href="#"><span><%=weeks[3].days[5].text%></span></a></td>',
+							'<td class="<%=weeks[3].days[6].classname%>"><a href="#"><span><%=weeks[3].days[6].text%></span></a></td>',
+						'</tr>',
+						'<tr>',
+							'<th class="datepickerWeek"><a href="#"><span><%=weeks[4].week%></span></a></th>',
+							'<td class="<%=weeks[4].days[0].classname%>"><a href="#"><span><%=weeks[4].days[0].text%></span></a></td>',
+							'<td class="<%=weeks[4].days[1].classname%>"><a href="#"><span><%=weeks[4].days[1].text%></span></a></td>',
+							'<td class="<%=weeks[4].days[2].classname%>"><a href="#"><span><%=weeks[4].days[2].text%></span></a></td>',
+							'<td class="<%=weeks[4].days[3].classname%>"><a href="#"><span><%=weeks[4].days[3].text%></span></a></td>',
+							'<td class="<%=weeks[4].days[4].classname%>"><a href="#"><span><%=weeks[4].days[4].text%></span></a></td>',
+							'<td class="<%=weeks[4].days[5].classname%>"><a href="#"><span><%=weeks[4].days[5].text%></span></a></td>',
+							'<td class="<%=weeks[4].days[6].classname%>"><a href="#"><span><%=weeks[4].days[6].text%></span></a></td>',
+						'</tr>',
+						'<tr>',
+							'<th class="datepickerWeek"><a href="#"><span><%=weeks[5].week%></span></a></th>',
+							'<td class="<%=weeks[5].days[0].classname%>"><a href="#"><span><%=weeks[5].days[0].text%></span></a></td>',
+							'<td class="<%=weeks[5].days[1].classname%>"><a href="#"><span><%=weeks[5].days[1].text%></span></a></td>',
+							'<td class="<%=weeks[5].days[2].classname%>"><a href="#"><span><%=weeks[5].days[2].text%></span></a></td>',
+							'<td class="<%=weeks[5].days[3].classname%>"><a href="#"><span><%=weeks[5].days[3].text%></span></a></td>',
+							'<td class="<%=weeks[5].days[4].classname%>"><a href="#"><span><%=weeks[5].days[4].text%></span></a></td>',
+							'<td class="<%=weeks[5].days[5].classname%>"><a href="#"><span><%=weeks[5].days[5].text%></span></a></td>',
+							'<td class="<%=weeks[5].days[6].classname%>"><a href="#"><span><%=weeks[5].days[6].text%></span></a></td>',
+						'</tr>',
+					'</tbody>'
+				],
+				months: [
+					'<tbody class="<%=className%>">',
+						'<tr>',
+							'<td colspan="2"><a href="#"><span><%=data[0]%></span></a></td>',
+							'<td colspan="2"><a href="#"><span><%=data[1]%></span></a></td>',
+							'<td colspan="2"><a href="#"><span><%=data[2]%></span></a></td>',
+							'<td colspan="2"><a href="#"><span><%=data[3]%></span></a></td>',
+						'</tr>',
+						'<tr>',
+							'<td colspan="2"><a href="#"><span><%=data[4]%></span></a></td>',
+							'<td colspan="2"><a href="#"><span><%=data[5]%></span></a></td>',
+							'<td colspan="2"><a href="#"><span><%=data[6]%></span></a></td>',
+							'<td colspan="2"><a href="#"><span><%=data[7]%></span></a></td>',
+						'</tr>',
+						'<tr>',
+							'<td colspan="2"><a href="#"><span><%=data[8]%></span></a></td>',
+							'<td colspan="2"><a href="#"><span><%=data[9]%></span></a></td>',
+							'<td colspan="2"><a href="#"><span><%=data[10]%></span></a></td>',
+							'<td colspan="2"><a href="#"><span><%=data[11]%></span></a></td>',
+						'</tr>',
+					'</tbody>'
+				]
+			},
+			defaults = {
+				flat: false,
+				starts: 1,
+				prev: '&#9664;',
+				next: '&#9654;',
+				lastSel: false,
+				mode: 'single',
+				view: 'days',
+				calendars: 1,
+				format: 'Y-m-d',
+				position: 'bottom',
+				eventName: 'click',
+				onRender: function(){return {};},
+				onChange: function(){return true;},
+				onShow: function(){return true;},
+				onBeforeShow: function(){return true;},
+				onHide: function(){return true;},
+				locale: {
+					days: [_e("Sunday"), _e("Monday"), _e("Tuesday"), _e("Wednesday"), _e("Thursday"), _e("Friday"), _e("Saturday"), _e("Sunday")],
+					daysShort: [cut(_e("Sunday"), 3), cut(_e("Monday"), 3), cut(_e("Tuesday"), 3), cut(_e("Wednesday"), 3), cut(_e("Thursday"), 3), cut(_e("Friday"), 3), cut(_e("Saturday"), 3), cut(_e("Sunday"), 3)],
+					daysMin: [cut(_e("Sunday"), 2), cut(_e("Monday"), 2), cut(_e("Tuesday"), 2), cut(_e("Wednesday"), 2), cut(_e("Thursday"), 2), cut(_e("Friday"), 2), cut(_e("Saturday"), 2), cut(_e("Sunday"), 2)],
+					months: [_e("January"), _e("February"), _e("March"), _e("April"), _e("May"), _e("June"), _e("July"), _e("August"), _e("September"), _e("October"), _e("November"), _e("December")],
+					monthsShort: [cut(_e("January"), 3), cut(_e("February"), 3), cut(_e("March"), 3), cut(_e("April"), 3), cut(_e("May"), 3), cut(_e("June"), 3), cut(_e("July"), 3), cut(_e("August"), 3), cut(_e("September"), 3), cut(_e("October"), 3), cut(_e("November"), 3), cut(_e("December"), 3)],
+					weekMin: ''
+				}
+			},
+			fill = function(el) {
+				var options = $(el).data('datepicker');
+				var cal = $(el);
+				var currentCal = Math.floor(options.calendars/2), date, data, dow, month, cnt = 0, week, days, indic, indic2, html, tblCal;
+				cal.find('td>table tbody').remove();
+				for (var i = 0; i < options.calendars; i++) {
+					date = new Date(options.current);
+					date.addMonths(-currentCal + i);
+					tblCal = cal.find('table').eq(i+1);
+					switch (tblCal[0].className) {
+						case 'datepickerViewDays':
+							dow = formatDate(date, 'B, Y');
+							break;
+						case 'datepickerViewMonths':
+							dow = date.getFullYear();
+							break;
+						case 'datepickerViewYears':
+							dow = (date.getFullYear()-6) + ' - ' + (date.getFullYear()+5);
+							break;
+					} 
+					tblCal.find('thead tr:first th:eq(1) span').text(dow);
+					dow = date.getFullYear()-6;
+					data = {
+						data: [],
+						className: 'datepickerYears'
+					}
+					for ( var j = 0; j < 12; j++) {
+						data.data.push(dow + j);
+					}
+					html = tmpl(tpl.months.join(''), data);
+					date.setDate(1);
+					data = {weeks:[], test: 10};
+					month = date.getMonth();
+					var dow = (date.getDay() - options.starts) % 7;
+					date.addDays(-(dow + (dow < 0 ? 7 : 0)));
+					week = -1;
+					cnt = 0;
+					while (cnt < 42) {
+						indic = parseInt(cnt/7,10);
+						indic2 = cnt%7;
+						if (!data.weeks[indic]) {
+							week = date.getWeekNumber();
+							data.weeks[indic] = {
+								week: week,
+								days: []
+							};
+						}
+						data.weeks[indic].days[indic2] = {
+							text: date.getDate(),
+							classname: []
+						};
+						if (month != date.getMonth()) {
+							data.weeks[indic].days[indic2].classname.push('datepickerNotInMonth');
+						}
+						if (date.getDay() == 0) {
+							data.weeks[indic].days[indic2].classname.push('datepickerSunday');
+						}
+						if (date.getDay() == 6) {
+							data.weeks[indic].days[indic2].classname.push('datepickerSaturday');
+						}
+						var fromUser = options.onRender(date);
+						var val = date.valueOf();
+						if (fromUser.selected || options.date == val || $.inArray(val, options.date) > -1 || (options.mode == 'range' && val >= options.date[0] && val <= options.date[1])) {
+							data.weeks[indic].days[indic2].classname.push('datepickerSelected');
+						}
+						if (fromUser.disabled) {
+							data.weeks[indic].days[indic2].classname.push('datepickerDisabled');
+						}
+						if (fromUser.className) {
+							data.weeks[indic].days[indic2].classname.push(fromUser.className);
+						}
+						data.weeks[indic].days[indic2].classname = data.weeks[indic].days[indic2].classname.join(' ');
+						cnt++;
+						date.addDays(1);
+					}
+					html = tmpl(tpl.days.join(''), data) + html;
+					data = {
+						data: options.locale.monthsShort,
+						className: 'datepickerMonths'
+					};
+					html = tmpl(tpl.months.join(''), data) + html;
+					tblCal.append(html);
+				}
+			},
+			parseDate = function (date, format) {
+				if (date.constructor == Date) {
+					return new Date(date);
+				}
+				var parts = date.split(/\W+/);
+				var against = format.split(/\W+/), d, m, y, h, min, now = new Date();
+				for (var i = 0; i < parts.length; i++) {
+					switch (against[i]) {
+						case 'd':
+						case 'e':
+							d = parseInt(parts[i],10);
+							break;
+						case 'm':
+							m = parseInt(parts[i], 10)-1;
+							break;
+						case 'Y':
+						case 'y':
+							y = parseInt(parts[i], 10);
+							y += y > 100 ? 0 : (y < 29 ? 2000 : 1900);
+							break;
+						case 'H':
+						case 'I':
+						case 'k':
+						case 'l':
+							h = parseInt(parts[i], 10);
+							break;
+						case 'P':
+						case 'p':
+							if (/pm/i.test(parts[i]) && h < 12) {
+								h += 12;
+							} else if (/am/i.test(parts[i]) && h >= 12) {
+								h -= 12;
+							}
+							break;
+						case 'M':
+							min = parseInt(parts[i], 10);
+							break;
+					}
+				}
+				return new Date(
+					y === undefined ? now.getFullYear() : y,
+					m === undefined ? now.getMonth() : m,
+					d === undefined ? now.getDate() : d,
+					h === undefined ? now.getHours() : h,
+					min === undefined ? now.getMinutes() : min,
+					0
+				);
+			},
+			formatDate = function(date, format) {
+				var m = date.getMonth();
+				var d = date.getDate();
+				var y = date.getFullYear();
+				var wn = date.getWeekNumber();
+				var w = date.getDay();
+				var s = {};
+				var hr = date.getHours();
+				var pm = (hr >= 12);
+				var ir = (pm) ? (hr - 12) : hr;
+				var dy = date.getDayOfYear();
+				if (ir == 0) {
+					ir = 12;
+				}
+				var min = date.getMinutes();
+				var sec = date.getSeconds();
+				var parts = format.split(''), part;
+				for ( var i = 0; i < parts.length; i++ ) {
+					part = parts[i];
+					switch (parts[i]) {
+						case 'a':
+							part = date.getDayName();
+							break;
+						case 'A':
+							part = date.getDayName(true);
+							break;
+						case 'b':
+							part = date.getMonthName();
+							break;
+						case 'B':
+							part = date.getMonthName(true);
+							break;
+						case 'C':
+							part = 1 + Math.floor(y / 100);
+							break;
+						case 'd':
+							part = (d < 10) ? ("0" + d) : d;
+							break;
+						case 'e':
+							part = d;
+							break;
+						case 'H':
+							part = (hr < 10) ? ("0" + hr) : hr;
+							break;
+						case 'I':
+							part = (ir < 10) ? ("0" + ir) : ir;
+							break;
+						case 'j':
+							part = (dy < 100) ? ((dy < 10) ? ("00" + dy) : ("0" + dy)) : dy;
+							break;
+						case 'k':
+							part = hr;
+							break;
+						case 'l':
+							part = ir;
+							break;
+						case 'm':
+							part = (m < 9) ? ("0" + (1+m)) : (1+m);
+							break;
+						case 'M':
+							part = (min < 10) ? ("0" + min) : min;
+							break;
+						case 'p':
+						case 'P':
+							part = pm ? "PM" : "AM";
+							break;
+						case 's':
+							part = Math.floor(date.getTime() / 1000);
+							break;
+						case 'S':
+							part = (sec < 10) ? ("0" + sec) : sec;
+							break;
+						case 'u':
+							part = w + 1;
+							break;
+						case 'w':
+							part = w;
+							break;
+						case 'y':
+							part = ('' + y).substr(2, 2);
+							break;
+						case 'Y':
+							part = y;
+							break;
+					}
+					parts[i] = part;
+				}
+				return parts.join('');
+			},
+			extendDate = function(options) {
+				if (Date.prototype.tempDate) {
+					return;
+				}
+				Date.prototype.tempDate = null;
+				Date.prototype.months = options.months;
+				Date.prototype.monthsShort = options.monthsShort;
+				Date.prototype.days = options.days;
+				Date.prototype.daysShort = options.daysShort;
+				Date.prototype.getMonthName = function(fullName) {
+					return this[fullName ? 'months' : 'monthsShort'][this.getMonth()];
+				};
+				Date.prototype.getDayName = function(fullName) {
+					return this[fullName ? 'days' : 'daysShort'][this.getDay()];
+				};
+				Date.prototype.addDays = function (n) {
+					this.setDate(this.getDate() + n);
+					this.tempDate = this.getDate();
+				};
+				Date.prototype.addMonths = function (n) {
+					if (this.tempDate == null) {
+						this.tempDate = this.getDate();
+					}
+					this.setDate(1);
+					this.setMonth(this.getMonth() + n);
+					this.setDate(Math.min(this.tempDate, this.getMaxDays()));
+				};
+				Date.prototype.addYears = function (n) {
+					if (this.tempDate == null) {
+						this.tempDate = this.getDate();
+					}
+					this.setDate(1);
+					this.setFullYear(this.getFullYear() + n);
+					this.setDate(Math.min(this.tempDate, this.getMaxDays()));
+				};
+				Date.prototype.getMaxDays = function() {
+					var tmpDate = new Date(Date.parse(this)),
+						d = 28, m;
+					m = tmpDate.getMonth();
+					d = 28;
+					while (tmpDate.getMonth() == m) {
+						d ++;
+						tmpDate.setDate(d);
+					}
+					return d - 1;
+				};
+				Date.prototype.getFirstDay = function() {
+					var tmpDate = new Date(Date.parse(this));
+					tmpDate.setDate(1);
+					return tmpDate.getDay();
+				};
+				Date.prototype.getWeekNumber = function() {
+					var tempDate = new Date(this);
+					tempDate.setDate(tempDate.getDate() - (tempDate.getDay() + 6) % 7 + 3);
+					var dms = tempDate.valueOf();
+					tempDate.setMonth(0);
+					tempDate.setDate(4);
+					return Math.round((dms - tempDate.valueOf()) / (604800000)) + 1;
+				};
+				Date.prototype.getDayOfYear = function() {
+					var now = new Date(this.getFullYear(), this.getMonth(), this.getDate(), 0, 0, 0);
+					var then = new Date(this.getFullYear(), 0, 0, 0, 0, 0);
+					var time = now - then;
+					return Math.floor(time / 24*60*60*1000);
+				};
+			},
+			layout = function (el) {
+				var options = $(el).data('datepicker');
+				var cal = $('#' + options.id);
+				if (!options.extraHeight) {
+					var divs = $(el).find('div');
+					options.extraHeight = divs.get(0).offsetHeight + divs.get(1).offsetHeight;
+					options.extraWidth = divs.get(2).offsetWidth + divs.get(3).offsetWidth;
+				}
+				var tbl = cal.find('table:first').get(0);
+				var width = tbl.offsetWidth;
+				var height = tbl.offsetHeight;
+				cal.css({
+					width: width + options.extraWidth + 'px',
+					height: height + options.extraHeight + 'px'
+				}).find('div.datepickerContainer').css({
+					width: width + 'px',
+					height: height + 'px'
+				});
+			},
+			click = function(ev) {
+				if ($(ev.target).is('span')) {
+					ev.target = ev.target.parentNode;
+				}
+				var el = $(ev.target);
+				if (el.is('a')) {
+					ev.target.blur();
+					if (el.hasClass('datepickerDisabled')) {
+						return false;
+					}
+					var options = $(this).data('datepicker');
+					var parentEl = el.parent();
+					var tblEl = parentEl.parent().parent().parent();
+					var tblIndex = $('table', this).index(tblEl.get(0)) - 1;
+					var tmp = new Date(options.current);
+					var changed = false;
+					var fillIt = false;
+					if (parentEl.is('th')) {
+						if (parentEl.hasClass('datepickerWeek') && options.mode == 'range' && !parentEl.next().hasClass('datepickerDisabled')) {
+							var val = parseInt(parentEl.next().text(), 10);
+							tmp.addMonths(tblIndex - Math.floor(options.calendars/2));
+							if (parentEl.next().hasClass('datepickerNotInMonth')) {
+								tmp.addMonths(val > 15 ? -1 : 1);
+							}
+							tmp.setDate(val);
+							options.date[0] = (tmp.setHours(0,0,0,0)).valueOf();
+							tmp.setHours(23,59,59,0);
+							tmp.addDays(6);
+							options.date[1] = tmp.valueOf();
+							fillIt = true;
+							changed = true;
+							options.lastSel = false;
+						} else if (parentEl.hasClass('datepickerMonth')) {
+							tmp.addMonths(tblIndex - Math.floor(options.calendars/2));
+							switch (tblEl.get(0).className) {
+								case 'datepickerViewDays':
+									tblEl.get(0).className = 'datepickerViewMonths';
+									el.find('span').text(tmp.getFullYear());
+									break;
+								case 'datepickerViewMonths':
+									tblEl.get(0).className = 'datepickerViewYears';
+									el.find('span').text((tmp.getFullYear()-6) + ' - ' + (tmp.getFullYear()+5));
+									break;
+								case 'datepickerViewYears':
+									tblEl.get(0).className = 'datepickerViewDays';
+									el.find('span').text(formatDate(tmp, 'B, Y'));
+									break;
+							}
+						} else if (parentEl.parent().parent().is('thead')) {
+							switch (tblEl.get(0).className) {
+								case 'datepickerViewDays':
+									options.current.addMonths(parentEl.hasClass('datepickerGoPrev') ? -1 : 1);
+									break;
+								case 'datepickerViewMonths':
+									options.current.addYears(parentEl.hasClass('datepickerGoPrev') ? -1 : 1);
+									break;
+								case 'datepickerViewYears':
+									options.current.addYears(parentEl.hasClass('datepickerGoPrev') ? -12 : 12);
+									break;
+							}
+							fillIt = true;
+						}
+					} else if (parentEl.is('td') && !parentEl.hasClass('datepickerDisabled')) {
+						switch (tblEl.get(0).className) {
+							case 'datepickerViewMonths':
+								options.current.setMonth(tblEl.find('tbody.datepickerMonths td').index(parentEl));
+								options.current.setFullYear(parseInt(tblEl.find('thead th.datepickerMonth span').text(), 10));
+								options.current.addMonths(Math.floor(options.calendars/2) - tblIndex);
+								tblEl.get(0).className = 'datepickerViewDays';
+								break;
+							case 'datepickerViewYears':
+								options.current.setFullYear(parseInt(el.text(), 10));
+								tblEl.get(0).className = 'datepickerViewMonths';
+								break;
+							default:
+								var val = parseInt(el.text(), 10);
+								tmp.addMonths(tblIndex - Math.floor(options.calendars/2));
+								if (parentEl.hasClass('datepickerNotInMonth')) {
+									tmp.addMonths(val > 15 ? -1 : 1);
+								}
+								tmp.setDate(val);
+								switch (options.mode) {
+									case 'multiple':
+										val = (tmp.setHours(0,0,0,0)).valueOf();
+										if ($.inArray(val, options.date) > -1) {
+											$.each(options.date, function(nr, dat){
+												if (dat == val) {
+													options.date.splice(nr,1);
+													return false;
+												}
+											});
+										} else {
+											options.date.push(val);
+										}
+										break;
+									case 'range':
+										if (!options.lastSel) {
+											options.date[0] = (tmp.setHours(0,0,0,0)).valueOf();
+										}
+										val = (tmp.setHours(23,59,59,0)).valueOf();
+										if (val < options.date[0]) {
+											options.date[1] = options.date[0] + 86399000;
+											options.date[0] = val - 86399000;
+										} else {
+											options.date[1] = val;
+										}
+										options.lastSel = !options.lastSel;
+										break;
+									default:
+										options.date = tmp.valueOf();
+										break;
+								}
+								break;
+						}
+						fillIt = true;
+						changed = true;
+					}
+					if (fillIt) {
+						fill(this);
+					}
+					if (changed) {
+						options.onChange.apply(this, prepareDate(options));
+					}
+				}
+				return false;
+			},
+			prepareDate = function (options) {
+				var tmp;
+				if (options.mode == 'single') {
+					tmp = new Date(options.date);
+					return [formatDate(tmp, options.format), tmp, options.el];
+				} else {
+					tmp = [[],[], options.el];
+					$.each(options.date, function(nr, val){
+						var date = new Date(val);
+						tmp[0].push(formatDate(date, options.format));
+						tmp[1].push(date);
+					});
+					return tmp;
+				}
+			},
+			getViewport = function () {
+				var m = document.compatMode == 'CSS1Compat';
+				return {
+					l : window.pageXOffset || (m ? document.documentElement.scrollLeft : document.body.scrollLeft),
+					t : window.pageYOffset || (m ? document.documentElement.scrollTop : document.body.scrollTop),
+					w : window.innerWidth || (m ? document.documentElement.clientWidth : document.body.clientWidth),
+					h : window.innerHeight || (m ? document.documentElement.clientHeight : document.body.clientHeight)
+				};
+			},
+			isChildOf = function(parentEl, el, container) {
+				if (parentEl == el) {
+					return true;
+				}
+				if (parentEl.contains) {
+					return parentEl.contains(el);
+				}
+				if ( parentEl.compareDocumentPosition ) {
+					return !!(parentEl.compareDocumentPosition(el) & 16);
+				}
+				var prEl = el.parentNode;
+				while(prEl && prEl != container) {
+					if (prEl == parentEl)
+						return true;
+					prEl = prEl.parentNode;
+				}
+				return false;
+			},
+			show = function (ev) {
+				var cal = $('#' + $(this).data('datepickerId'));
+				if (!cal.is(':visible')) {
+					var calEl = cal.get(0);
+					fill(calEl);
+					var options = cal.data('datepicker');
+					options.onBeforeShow.apply(this, [cal.get(0)]);
+					var pos = $(this).offset();
+					var viewPort = getViewport();
+					var top = pos.top;
+					var left = pos.left;
+					var oldDisplay = $.curCSS(calEl, 'display');
+					cal.css({
+						visibility: 'hidden',
+						display: 'block'
+					});
+					layout(calEl);
+					switch (options.position){
+						case 'top':
+							top -= calEl.offsetHeight;
+							break;
+						case 'left':
+							left -= calEl.offsetWidth;
+							break;
+						case 'right':
+							left += this.offsetWidth;
+							break;
+						case 'bottom':
+							top += this.offsetHeight;
+							break;
+					}
+					if (top + calEl.offsetHeight > viewPort.t + viewPort.h) {
+						top = pos.top  - calEl.offsetHeight;
+					}
+					if (top < viewPort.t) {
+						top = pos.top + this.offsetHeight + calEl.offsetHeight;
+					}
+					if (left + calEl.offsetWidth > viewPort.l + viewPort.w) {
+						left = pos.left - calEl.offsetWidth;
+					}
+					if (left < viewPort.l) {
+						left = pos.left + this.offsetWidth
+					}
+					cal.css({
+						visibility: 'visible',
+						display: 'block',
+						top: top + 'px',
+						left: left + 'px'
+					});
+					if (options.onShow.apply(this, [cal.get(0)]) != false) {
+						cal.show();
+					}
+					$(document).bind('mousedown', {cal: cal, trigger: this}, hide);
+				}
+				return false;
+			},
+			hide = function (ev) {
+				if (ev.target != ev.data.trigger && !isChildOf(ev.data.cal.get(0), ev.target, ev.data.cal.get(0))) {
+					if (ev.data.cal.data('datepicker').onHide.apply(this, [ev.data.cal.get(0)]) != false) {
+						ev.data.cal.hide();
+					}
+					$(document).unbind('mousedown', hide);
+				}
+			};
+		return {
+			init: function(options){
+				options = $.extend({}, defaults, options||{});
+				extendDate(options.locale);
+				options.calendars = Math.max(1, parseInt(options.calendars,10)||1);
+				options.mode = /single|multiple|range/.test(options.mode) ? options.mode : 'single';
+				return this.each(function(){
+					if (!$(this).data('datepicker')) {
+						options.el = this;
+						if (options.date.constructor == String) {
+							options.date = parseDate(options.date, options.format);
+							options.date.setHours(0,0,0,0);
+						}
+						if (options.mode != 'single') {
+							if (options.date.constructor != Array) {
+								options.date = [options.date.valueOf()];
+								if (options.mode == 'range') {
+									options.date.push(((new Date(options.date[0])).setHours(23,59,59,0)).valueOf());
+								}
+							} else {
+								for (var i = 0; i < options.date.length; i++) {
+									options.date[i] = (parseDate(options.date[i], options.format).setHours(0,0,0,0)).valueOf();
+								}
+								if (options.mode == 'range') {
+									options.date[1] = ((new Date(options.date[1])).setHours(23,59,59,0)).valueOf();
+								}
+							}
+						} else {
+							options.date = options.date.valueOf();
+						}
+						if (!options.current) {
+							options.current = new Date();
+						} else {
+							options.current = parseDate(options.current, options.format);
+						} 
+						options.current.setDate(1);
+						options.current.setHours(0,0,0,0);
+						var id = 'datepicker_' + parseInt(Math.random() * 1000), cnt;
+						options.id = id;
+						$(this).data('datepickerId', options.id);
+						var cal = $(tpl.wrapper).attr('id', id).bind('click', click).data('datepicker', options);
+						if (options.className) {
+							cal.addClass(options.className);
+						}
+						var html = '';
+						for (var i = 0; i < options.calendars; i++) {
+							cnt = options.starts;
+							if (i > 0) {
+								html += tpl.space;
+							}
+							html += tmpl(tpl.head.join(''), {
+									week: options.locale.weekMin,
+									prev: options.prev,
+									next: options.next,
+									day1: options.locale.daysMin[(cnt++)%7],
+									day2: options.locale.daysMin[(cnt++)%7],
+									day3: options.locale.daysMin[(cnt++)%7],
+									day4: options.locale.daysMin[(cnt++)%7],
+									day5: options.locale.daysMin[(cnt++)%7],
+									day6: options.locale.daysMin[(cnt++)%7],
+									day7: options.locale.daysMin[(cnt++)%7]
+								});
+						}
+						cal
+							.find('tr:first').append(html)
+								.find('table').addClass(views[options.view]);
+						fill(cal.get(0));
+						if (options.flat) {
+							cal.appendTo(this).show().css('position', 'relative');
+							layout(cal.get(0));
+						} else {
+							cal.appendTo(document.body);
+							$(this).bind(options.eventName, show);
+						}
+					}
+				});
+			},
+			showPicker: function() {
+				return this.each( function () {
+					if ($(this).data('datepickerId')) {
+						show.apply(this);
+					}
+				});
+			},
+			hidePicker: function() {
+				return this.each( function () {
+					if ($(this).data('datepickerId')) {
+						$('#' + $(this).data('datepickerId')).hide();
+					}
+				});
+			},
+			setDate: function(date, shiftTo){
+				return this.each(function(){
+					if ($(this).data('datepickerId')) {
+						var cal = $('#' + $(this).data('datepickerId'));
+						var options = cal.data('datepicker');
+						options.date = date;
+						if (options.date.constructor == String) {
+							options.date = parseDate(options.date, options.format);
+							options.date.setHours(0,0,0,0);
+						}
+						if (options.mode != 'single') {
+							if (options.date.constructor != Array) {
+								options.date = [options.date.valueOf()];
+								if (options.mode == 'range') {
+									options.date.push(((new Date(options.date[0])).setHours(23,59,59,0)).valueOf());
+								}
+							} else {
+								for (var i = 0; i < options.date.length; i++) {
+									options.date[i] = (parseDate(options.date[i], options.format).setHours(0,0,0,0)).valueOf();
+								}
+								if (options.mode == 'range') {
+									options.date[1] = ((new Date(options.date[1])).setHours(23,59,59,0)).valueOf();
+								}
+							}
+						} else {
+							options.date = options.date.valueOf();
+						}
+						if (shiftTo) {
+							options.current = new Date (options.mode != 'single' ? options.date[0] : options.date);
+						}
+						fill(cal.get(0));
+					}
+				});
+			},
+			getDate: function(formated) {
+				if (this.size() > 0) {
+					return prepareDate($('#' + $(this).data('datepickerId')).data('datepicker'))[formated ? 0 : 1];
+				}
+			},
+			clear: function(){
+				return this.each(function(){
+					if ($(this).data('datepickerId')) {
+						var cal = $('#' + $(this).data('datepickerId'));
+						var options = cal.data('datepicker');
+						if (options.mode != 'single') {
+							options.date = [];
+							fill(cal.get(0));
+						}
+					}
+				});
+			},
+			fixLayout: function(){
+				return this.each(function(){
+					if ($(this).data('datepickerId')) {
+						var cal = $('#' + $(this).data('datepickerId'));
+						var options = cal.data('datepicker');
+						if (options.flat) {
+							layout(cal.get(0));
+						}
+					}
+				});
+			}
+		};
+	}();
+	$.fn.extend({
+		DatePicker: DatePicker.init,
+		DatePickerHide: DatePicker.hidePicker,
+		DatePickerShow: DatePicker.showPicker,
+		DatePickerSetDate: DatePicker.setDate,
+		DatePickerGetDate: DatePicker.getDate,
+		DatePickerClear: DatePicker.clear,
+		DatePickerLayout: DatePicker.fixLayout
+	});
+})(jQuery);
+
+(function(){
+  var cache = {};
+ 
+  this.tmpl = function tmpl(str, data){
+    // Figure out if we're getting a template, or if we need to
+    // load the template - and be sure to cache the result.
+    var fn = !/\W/.test(str) ?
+      cache[str] = cache[str] ||
+        tmpl(document.getElementById(str).innerHTML) :
+     
+      // Generate a reusable function that will serve as a template
+      // generator (and which will be cached).
+      new Function("obj",
+        "var p=[],print=function(){p.push.apply(p,arguments);};" +
+       
+        // Introduce the data as local variables using with(){}
+        "with(obj){p.push('" +
+       
+        // Convert the template into pure JavaScript
+        str
+          .replace(/[\r\t\n]/g, " ")
+          .split("<%").join("\t")
+          .replace(/((^|%>)[^\t]*)'/g, "$1\r")
+          .replace(/\t=(.*?)%>/g, "',$1,'")
+          .split("\t").join("');")
+          .split("%>").join("p.push('")
+          .split("\r").join("\\'")
+      + "');}return p.join('');");
+   
+    // Provide some basic currying to the user
+    return data ? fn( data ) : fn;
+  };
+})();
diff --git a/jappixmini/jappix/js/jquery.form.js b/jappixmini/jappix/js/jquery.form.js
new file mode 100644
index 00000000..2b853df4
--- /dev/null
+++ b/jappixmini/jappix/js/jquery.form.js
@@ -0,0 +1,785 @@
+/*!
+ * jQuery Form Plugin
+ * version: 2.49 (18-OCT-2010)
+ * @requires jQuery v1.3.2 or later
+ *
+ * Examples and documentation at: http://malsup.com/jquery/form/
+ * Dual licensed under the MIT and GPL licenses:
+ *   http://www.opensource.org/licenses/mit-license.php
+ *   http://www.gnu.org/licenses/gpl.html
+ */
+;(function($) {
+
+/*
+	Usage Note:
+	-----------
+	Do not use both ajaxSubmit and ajaxForm on the same form.  These
+	functions are intended to be exclusive.  Use ajaxSubmit if you want
+	to bind your own submit handler to the form.  For example,
+
+	$(document).ready(function() {
+		$('#myForm').bind('submit', function(e) {
+			e.preventDefault(); // <-- important
+			$(this).ajaxSubmit({
+				target: '#output'
+			});
+		});
+	});
+
+	Use ajaxForm when you want the plugin to manage all the event binding
+	for you.  For example,
+
+	$(document).ready(function() {
+		$('#myForm').ajaxForm({
+			target: '#output'
+		});
+	});
+
+	When using ajaxForm, the ajaxSubmit function will be invoked for you
+	at the appropriate time.
+*/
+
+/**
+ * ajaxSubmit() provides a mechanism for immediately submitting
+ * an HTML form using AJAX.
+ */
+$.fn.ajaxSubmit = function(options) {
+	// fast fail if nothing selected (http://dev.jquery.com/ticket/2752)
+	if (!this.length) {
+		log('ajaxSubmit: skipping submit process - no element selected');
+		return this;
+	}
+
+	if (typeof options == 'function') {
+		options = { success: options };
+	}
+
+	var url = $.trim(this.attr('action'));
+	if (url) {
+		// clean url (don't include hash vaue)
+		url = (url.match(/^([^#]+)/)||[])[1];
+	}
+	url = url || window.location.href || '';
+
+	options = $.extend(true, {
+		url:  url,
+		type: this.attr('method') || 'GET',
+		iframeSrc: /^https/i.test(window.location.href || '') ? 'javascript:false' : 'about:blank'
+	}, options);
+
+	// hook for manipulating the form data before it is extracted;
+	// convenient for use with rich editors like tinyMCE or FCKEditor
+	var veto = {};
+	this.trigger('form-pre-serialize', [this, options, veto]);
+	if (veto.veto) {
+		log('ajaxSubmit: submit vetoed via form-pre-serialize trigger');
+		return this;
+	}
+
+	// provide opportunity to alter form data before it is serialized
+	if (options.beforeSerialize && options.beforeSerialize(this, options) === false) {
+		log('ajaxSubmit: submit aborted via beforeSerialize callback');
+		return this;
+	}
+
+	var n,v,a = this.formToArray(options.semantic);
+	if (options.data) {
+		options.extraData = options.data;
+		for (n in options.data) {
+			if(options.data[n] instanceof Array) {
+				for (var k in options.data[n]) {
+					a.push( { name: n, value: options.data[n][k] } );
+				}
+			}
+			else {
+				v = options.data[n];
+				v = $.isFunction(v) ? v() : v; // if value is fn, invoke it
+				a.push( { name: n, value: v } );
+			}
+		}
+	}
+
+	// give pre-submit callback an opportunity to abort the submit
+	if (options.beforeSubmit && options.beforeSubmit(a, this, options) === false) {
+		log('ajaxSubmit: submit aborted via beforeSubmit callback');
+		return this;
+	}
+
+	// fire vetoable 'validate' event
+	this.trigger('form-submit-validate', [a, this, options, veto]);
+	if (veto.veto) {
+		log('ajaxSubmit: submit vetoed via form-submit-validate trigger');
+		return this;
+	}
+
+	var q = $.param(a);
+
+	if (options.type.toUpperCase() == 'GET') {
+		options.url += (options.url.indexOf('?') >= 0 ? '&' : '?') + q;
+		options.data = null;  // data is null for 'get'
+	}
+	else {
+		options.data = q; // data is the query string for 'post'
+	}
+
+	var $form = this, callbacks = [];
+	if (options.resetForm) {
+		callbacks.push(function() { $form.resetForm(); });
+	}
+	if (options.clearForm) {
+		callbacks.push(function() { $form.clearForm(); });
+	}
+
+	// perform a load on the target only if dataType is not provided
+	if (!options.dataType && options.target) {
+		var oldSuccess = options.success || function(){};
+		callbacks.push(function(data) {
+			var fn = options.replaceTarget ? 'replaceWith' : 'html';
+			$(options.target)[fn](data).each(oldSuccess, arguments);
+		});
+	}
+	else if (options.success) {
+		callbacks.push(options.success);
+	}
+
+	options.success = function(data, status, xhr) { // jQuery 1.4+ passes xhr as 3rd arg
+		var context = options.context || options;   // jQuery 1.4+ supports scope context 
+		for (var i=0, max=callbacks.length; i < max; i++) {
+			callbacks[i].apply(context, [data, status, xhr || $form, $form]);
+		}
+	};
+
+	// are there files to upload?
+	var fileInputs = $('input:file', this).length > 0;
+	var mp = 'multipart/form-data';
+	var multipart = ($form.attr('enctype') == mp || $form.attr('encoding') == mp);
+
+	// options.iframe allows user to force iframe mode
+	// 06-NOV-09: now defaulting to iframe mode if file input is detected
+   if (options.iframe !== false && (fileInputs || options.iframe || multipart)) {
+	   // hack to fix Safari hang (thanks to Tim Molendijk for this)
+	   // see:  http://groups.google.com/group/jquery-dev/browse_thread/thread/36395b7ab510dd5d
+	   if (options.closeKeepAlive) {
+		   $.get(options.closeKeepAlive, fileUpload);
+		}
+	   else {
+		   fileUpload();
+		}
+   }
+   else {
+	   $.ajax(options);
+   }
+
+	// fire 'notify' event
+	this.trigger('form-submit-notify', [this, options]);
+	return this;
+
+
+	// private function for handling file uploads (hat tip to YAHOO!)
+	function fileUpload() {
+		var form = $form[0];
+
+		if ($(':input[name=submit],:input[id=submit]', form).length) {
+			// if there is an input with a name or id of 'submit' then we won't be
+			// able to invoke the submit fn on the form (at least not x-browser)
+			alert('Error: Form elements must not have name or id of "submit".');
+			return;
+		}
+		
+		var s = $.extend(true, {}, $.ajaxSettings, options);
+		s.context = s.context || s;
+		var id = 'jqFormIO' + (new Date().getTime()), fn = '_'+id;
+		window[fn] = function() {
+			var f = $io.data('form-plugin-onload');
+			if (f) {
+				f();
+				window[fn] = undefined;
+				try { delete window[fn]; } catch(e){}
+			}
+		}
+		var $io = $('<iframe id="' + id + '" name="' + id + '" src="'+ s.iframeSrc +'" onload="window[\'_\'+this.id]()" />');
+		var io = $io[0];
+
+		$io.css({ position: 'absolute', top: '-1000px', left: '-1000px' });
+
+		var xhr = { // mock object
+			aborted: 0,
+			responseText: null,
+			responseXML: null,
+			status: 0,
+			statusText: 'n/a',
+			getAllResponseHeaders: function() {},
+			getResponseHeader: function() {},
+			setRequestHeader: function() {},
+			abort: function() {
+				this.aborted = 1;
+				$io.attr('src', s.iframeSrc); // abort op in progress
+			}
+		};
+
+		var g = s.global;
+		// trigger ajax global events so that activity/block indicators work like normal
+		if (g && ! $.active++) {
+			$.event.trigger("ajaxStart");
+		}
+		if (g) {
+			$.event.trigger("ajaxSend", [xhr, s]);
+		}
+
+		if (s.beforeSend && s.beforeSend.call(s.context, xhr, s) === false) {
+			if (s.global) { 
+				$.active--;
+			}
+			return;
+		}
+		if (xhr.aborted) {
+			return;
+		}
+
+		var cbInvoked = false;
+		var timedOut = 0;
+
+		// add submitting element to data if we know it
+		var sub = form.clk;
+		if (sub) {
+			var n = sub.name;
+			if (n && !sub.disabled) {
+				s.extraData = s.extraData || {};
+				s.extraData[n] = sub.value;
+				if (sub.type == "image") {
+					s.extraData[n+'.x'] = form.clk_x;
+					s.extraData[n+'.y'] = form.clk_y;
+				}
+			}
+		}
+
+		// take a breath so that pending repaints get some cpu time before the upload starts
+		function doSubmit() {
+			// make sure form attrs are set
+			var t = $form.attr('target'), a = $form.attr('action');
+
+			// update form attrs in IE friendly way
+			form.setAttribute('target',id);
+			if (form.getAttribute('method') != 'POST') {
+				form.setAttribute('method', 'POST');
+			}
+			if (form.getAttribute('action') != s.url) {
+				form.setAttribute('action', s.url);
+			}
+
+			// ie borks in some cases when setting encoding
+			if (! s.skipEncodingOverride) {
+				$form.attr({
+					encoding: 'multipart/form-data',
+					enctype:  'multipart/form-data'
+				});
+			}
+
+			// support timout
+			if (s.timeout) {
+				setTimeout(function() { timedOut = true; cb(); }, s.timeout);
+			}
+
+			// add "extra" data to form if provided in options
+			var extraInputs = [];
+			try {
+				if (s.extraData) {
+					for (var n in s.extraData) {
+						extraInputs.push(
+							$('<input type="hidden" name="'+n+'" value="'+s.extraData[n]+'" />')
+								.appendTo(form)[0]);
+					}
+				}
+
+				// add iframe to doc and submit the form
+				$io.appendTo('body');
+				$io.data('form-plugin-onload', cb);
+				form.submit();
+			}
+			finally {
+				// reset attrs and remove "extra" input elements
+				form.setAttribute('action',a);
+				if(t) {
+					form.setAttribute('target', t);
+				} else {
+					$form.removeAttr('target');
+				}
+				$(extraInputs).remove();
+			}
+		}
+
+		if (s.forceSync) {
+			doSubmit();
+		}
+		else {
+			setTimeout(doSubmit, 10); // this lets dom updates render
+		}
+	
+		var data, doc, domCheckCount = 50;
+
+		function cb() {
+			if (cbInvoked) {
+				return;
+			}
+
+			$io.removeData('form-plugin-onload');
+			
+			var ok = true;
+			try {
+				if (timedOut) {
+					throw 'timeout';
+				}
+				// extract the server response from the iframe
+				doc = io.contentWindow ? io.contentWindow.document : io.contentDocument ? io.contentDocument : io.document;
+				
+				var isXml = s.dataType == 'xml' || doc.XMLDocument || $.isXMLDoc(doc);
+				log('isXml='+isXml);
+				if (!isXml && window.opera && (doc.body == null || doc.body.innerHTML == '')) {
+					if (--domCheckCount) {
+						// in some browsers (Opera) the iframe DOM is not always traversable when
+						// the onload callback fires, so we loop a bit to accommodate
+						log('requeing onLoad callback, DOM not available');
+						setTimeout(cb, 250);
+						return;
+					}
+					// let this fall through because server response could be an empty document
+					//log('Could not access iframe DOM after mutiple tries.');
+					//throw 'DOMException: not available';
+				}
+
+				//log('response detected');
+				cbInvoked = true;
+				xhr.responseText = doc.documentElement ? doc.documentElement.innerHTML : null; 
+				xhr.responseXML = doc.XMLDocument ? doc.XMLDocument : doc;
+				xhr.getResponseHeader = function(header){
+					var headers = {'content-type': s.dataType};
+					return headers[header];
+				};
+
+				var scr = /(json|script)/.test(s.dataType);
+				if (scr || s.textarea) {
+					// see if user embedded response in textarea
+					var ta = doc.getElementsByTagName('textarea')[0];
+					if (ta) {
+						xhr.responseText = ta.value;
+					}
+					else if (scr) {
+						// account for browsers injecting pre around json response
+						var pre = doc.getElementsByTagName('pre')[0];
+						var b = doc.getElementsByTagName('body')[0];
+						if (pre) {
+							xhr.responseText = pre.innerHTML;
+						}
+						else if (b) {
+							xhr.responseText = b.innerHTML;
+						}
+					}			  
+				}
+				else if (s.dataType == 'xml' && !xhr.responseXML && xhr.responseText != null) {
+					xhr.responseXML = toXml(xhr.responseText);
+				}
+				data = $.httpData(xhr, s.dataType);
+			}
+			catch(e){
+				log('error caught:',e);
+				ok = false;
+				xhr.error = e;
+				$.handleError(s, xhr, 'error', e);
+			}
+
+			// ordering of these callbacks/triggers is odd, but that's how $.ajax does it
+			if (ok) {
+				s.success.call(s.context, data, 'success', xhr);
+				if (g) {
+					$.event.trigger("ajaxSuccess", [xhr, s]);
+				}
+			}
+			if (g) {
+				$.event.trigger("ajaxComplete", [xhr, s]);
+			}
+			if (g && ! --$.active) {
+				$.event.trigger("ajaxStop");
+			}
+			if (s.complete) {
+				s.complete.call(s.context, xhr, ok ? 'success' : 'error');
+			}
+
+			// clean up
+			setTimeout(function() {
+				$io.removeData('form-plugin-onload');
+				$io.remove();
+				xhr.responseXML = null;
+			}, 100);
+		}
+
+		function toXml(s, doc) {
+			if (window.ActiveXObject) {
+				doc = new ActiveXObject('Microsoft.XMLDOM');
+				doc.async = 'false';
+				doc.loadXML(s);
+			}
+			else {
+				doc = (new DOMParser()).parseFromString(s, 'text/xml');
+			}
+			return (doc && doc.documentElement && doc.documentElement.tagName != 'parsererror') ? doc : null;
+		}
+	}
+};
+
+/**
+ * ajaxForm() provides a mechanism for fully automating form submission.
+ *
+ * The advantages of using this method instead of ajaxSubmit() are:
+ *
+ * 1: This method will include coordinates for <input type="image" /> elements (if the element
+ *	is used to submit the form).
+ * 2. This method will include the submit element's name/value data (for the element that was
+ *	used to submit the form).
+ * 3. This method binds the submit() method to the form for you.
+ *
+ * The options argument for ajaxForm works exactly as it does for ajaxSubmit.  ajaxForm merely
+ * passes the options argument along after properly binding events for submit elements and
+ * the form itself.
+ */
+$.fn.ajaxForm = function(options) {
+	// in jQuery 1.3+ we can fix mistakes with the ready state
+	if (this.length === 0) {
+		var o = { s: this.selector, c: this.context };
+		if (!$.isReady && o.s) {
+			log('DOM not ready, queuing ajaxForm');
+			$(function() {
+				$(o.s,o.c).ajaxForm(options);
+			});
+			return this;
+		}
+		// is your DOM ready?  http://docs.jquery.com/Tutorials:Introducing_$(document).ready()
+		log('terminating; zero elements found by selector' + ($.isReady ? '' : ' (DOM not ready)'));
+		return this;
+	}
+	
+	return this.ajaxFormUnbind().bind('submit.form-plugin', function(e) {
+		if (!e.isDefaultPrevented()) { // if event has been canceled, don't proceed
+			e.preventDefault();
+			$(this).ajaxSubmit(options);
+		}
+	}).bind('click.form-plugin', function(e) {
+		var target = e.target;
+		var $el = $(target);
+		if (!($el.is(":submit,input:image"))) {
+			// is this a child element of the submit el?  (ex: a span within a button)
+			var t = $el.closest(':submit');
+			if (t.length == 0) {
+				return;
+			}
+			target = t[0];
+		}
+		var form = this;
+		form.clk = target;
+		if (target.type == 'image') {
+			if (e.offsetX != undefined) {
+				form.clk_x = e.offsetX;
+				form.clk_y = e.offsetY;
+			} else if (typeof $.fn.offset == 'function') { // try to use dimensions plugin
+				var offset = $el.offset();
+				form.clk_x = e.pageX - offset.left;
+				form.clk_y = e.pageY - offset.top;
+			} else {
+				form.clk_x = e.pageX - target.offsetLeft;
+				form.clk_y = e.pageY - target.offsetTop;
+			}
+		}
+		// clear form vars
+		setTimeout(function() { form.clk = form.clk_x = form.clk_y = null; }, 100);
+	});
+};
+
+// ajaxFormUnbind unbinds the event handlers that were bound by ajaxForm
+$.fn.ajaxFormUnbind = function() {
+	return this.unbind('submit.form-plugin click.form-plugin');
+};
+
+/**
+ * formToArray() gathers form element data into an array of objects that can
+ * be passed to any of the following ajax functions: $.get, $.post, or load.
+ * Each object in the array has both a 'name' and 'value' property.  An example of
+ * an array for a simple login form might be:
+ *
+ * [ { name: 'username', value: 'jresig' }, { name: 'password', value: 'secret' } ]
+ *
+ * It is this array that is passed to pre-submit callback functions provided to the
+ * ajaxSubmit() and ajaxForm() methods.
+ */
+$.fn.formToArray = function(semantic) {
+	var a = [];
+	if (this.length === 0) {
+		return a;
+	}
+
+	var form = this[0];
+	var els = semantic ? form.getElementsByTagName('*') : form.elements;
+	if (!els) {
+		return a;
+	}
+	
+	var i,j,n,v,el,max,jmax;
+	for(i=0, max=els.length; i < max; i++) {
+		el = els[i];
+		n = el.name;
+		if (!n) {
+			continue;
+		}
+
+		if (semantic && form.clk && el.type == "image") {
+			// handle image inputs on the fly when semantic == true
+			if(!el.disabled && form.clk == el) {
+				a.push({name: n, value: $(el).val()});
+				a.push({name: n+'.x', value: form.clk_x}, {name: n+'.y', value: form.clk_y});
+			}
+			continue;
+		}
+
+		v = $.fieldValue(el, true);
+		if (v && v.constructor == Array) {
+			for(j=0, jmax=v.length; j < jmax; j++) {
+				a.push({name: n, value: v[j]});
+			}
+		}
+		else if (v !== null && typeof v != 'undefined') {
+			a.push({name: n, value: v});
+		}
+	}
+
+	if (!semantic && form.clk) {
+		// input type=='image' are not found in elements array! handle it here
+		var $input = $(form.clk), input = $input[0];
+		n = input.name;
+		if (n && !input.disabled && input.type == 'image') {
+			a.push({name: n, value: $input.val()});
+			a.push({name: n+'.x', value: form.clk_x}, {name: n+'.y', value: form.clk_y});
+		}
+	}
+	return a;
+};
+
+/**
+ * Serializes form data into a 'submittable' string. This method will return a string
+ * in the format: name1=value1&amp;name2=value2
+ */
+$.fn.formSerialize = function(semantic) {
+	//hand off to jQuery.param for proper encoding
+	return $.param(this.formToArray(semantic));
+};
+
+/**
+ * Serializes all field elements in the jQuery object into a query string.
+ * This method will return a string in the format: name1=value1&amp;name2=value2
+ */
+$.fn.fieldSerialize = function(successful) {
+	var a = [];
+	this.each(function() {
+		var n = this.name;
+		if (!n) {
+			return;
+		}
+		var v = $.fieldValue(this, successful);
+		if (v && v.constructor == Array) {
+			for (var i=0,max=v.length; i < max; i++) {
+				a.push({name: n, value: v[i]});
+			}
+		}
+		else if (v !== null && typeof v != 'undefined') {
+			a.push({name: this.name, value: v});
+		}
+	});
+	//hand off to jQuery.param for proper encoding
+	return $.param(a);
+};
+
+/**
+ * Returns the value(s) of the element in the matched set.  For example, consider the following form:
+ *
+ *  <form><fieldset>
+ *	  <input name="A" type="text" />
+ *	  <input name="A" type="text" />
+ *	  <input name="B" type="checkbox" value="B1" />
+ *	  <input name="B" type="checkbox" value="B2"/>
+ *	  <input name="C" type="radio" value="C1" />
+ *	  <input name="C" type="radio" value="C2" />
+ *  </fieldset></form>
+ *
+ *  var v = $(':text').fieldValue();
+ *  // if no values are entered into the text inputs
+ *  v == ['','']
+ *  // if values entered into the text inputs are 'foo' and 'bar'
+ *  v == ['foo','bar']
+ *
+ *  var v = $(':checkbox').fieldValue();
+ *  // if neither checkbox is checked
+ *  v === undefined
+ *  // if both checkboxes are checked
+ *  v == ['B1', 'B2']
+ *
+ *  var v = $(':radio').fieldValue();
+ *  // if neither radio is checked
+ *  v === undefined
+ *  // if first radio is checked
+ *  v == ['C1']
+ *
+ * The successful argument controls whether or not the field element must be 'successful'
+ * (per http://www.w3.org/TR/html4/interact/forms.html#successful-controls).
+ * The default value of the successful argument is true.  If this value is false the value(s)
+ * for each element is returned.
+ *
+ * Note: This method *always* returns an array.  If no valid value can be determined the
+ *	   array will be empty, otherwise it will contain one or more values.
+ */
+$.fn.fieldValue = function(successful) {
+	for (var val=[], i=0, max=this.length; i < max; i++) {
+		var el = this[i];
+		var v = $.fieldValue(el, successful);
+		if (v === null || typeof v == 'undefined' || (v.constructor == Array && !v.length)) {
+			continue;
+		}
+		v.constructor == Array ? $.merge(val, v) : val.push(v);
+	}
+	return val;
+};
+
+/**
+ * Returns the value of the field element.
+ */
+$.fieldValue = function(el, successful) {
+	var n = el.name, t = el.type, tag = el.tagName.toLowerCase();
+	if (successful === undefined) {
+		successful = true;
+	}
+
+	if (successful && (!n || el.disabled || t == 'reset' || t == 'button' ||
+		(t == 'checkbox' || t == 'radio') && !el.checked ||
+		(t == 'submit' || t == 'image') && el.form && el.form.clk != el ||
+		tag == 'select' && el.selectedIndex == -1)) {
+			return null;
+	}
+
+	if (tag == 'select') {
+		var index = el.selectedIndex;
+		if (index < 0) {
+			return null;
+		}
+		var a = [], ops = el.options;
+		var one = (t == 'select-one');
+		var max = (one ? index+1 : ops.length);
+		for(var i=(one ? index : 0); i < max; i++) {
+			var op = ops[i];
+			if (op.selected) {
+				var v = op.value;
+				if (!v) { // extra pain for IE...
+					v = (op.attributes && op.attributes['value'] && !(op.attributes['value'].specified)) ? op.text : op.value;
+				}
+				if (one) {
+					return v;
+				}
+				a.push(v);
+			}
+		}
+		return a;
+	}
+	return $(el).val();
+};
+
+/**
+ * Clears the form data.  Takes the following actions on the form's input fields:
+ *  - input text fields will have their 'value' property set to the empty string
+ *  - select elements will have their 'selectedIndex' property set to -1
+ *  - checkbox and radio inputs will have their 'checked' property set to false
+ *  - inputs of type submit, button, reset, and hidden will *not* be effected
+ *  - button elements will *not* be effected
+ */
+$.fn.clearForm = function() {
+	return this.each(function() {
+		$('input,select,textarea', this).clearFields();
+	});
+};
+
+/**
+ * Clears the selected form elements.
+ */
+$.fn.clearFields = $.fn.clearInputs = function() {
+	return this.each(function() {
+		var t = this.type, tag = this.tagName.toLowerCase();
+		if (t == 'text' || t == 'password' || tag == 'textarea') {
+			this.value = '';
+		}
+		else if (t == 'checkbox' || t == 'radio') {
+			this.checked = false;
+		}
+		else if (tag == 'select') {
+			this.selectedIndex = -1;
+		}
+	});
+};
+
+/**
+ * Resets the form data.  Causes all form elements to be reset to their original value.
+ */
+$.fn.resetForm = function() {
+	return this.each(function() {
+		// guard against an input with the name of 'reset'
+		// note that IE reports the reset function as an 'object'
+		if (typeof this.reset == 'function' || (typeof this.reset == 'object' && !this.reset.nodeType)) {
+			this.reset();
+		}
+	});
+};
+
+/**
+ * Enables or disables any matching elements.
+ */
+$.fn.enable = function(b) {
+	if (b === undefined) {
+		b = true;
+	}
+	return this.each(function() {
+		this.disabled = !b;
+	});
+};
+
+/**
+ * Checks/unchecks any matching checkboxes or radio buttons and
+ * selects/deselects and matching option elements.
+ */
+$.fn.selected = function(select) {
+	if (select === undefined) {
+		select = true;
+	}
+	return this.each(function() {
+		var t = this.type;
+		if (t == 'checkbox' || t == 'radio') {
+			this.checked = select;
+		}
+		else if (this.tagName.toLowerCase() == 'option') {
+			var $sel = $(this).parent('select');
+			if (select && $sel[0] && $sel[0].type == 'select-one') {
+				// deselect all other options
+				$sel.find('option').selected(false);
+			}
+			this.selected = select;
+		}
+	});
+};
+
+// helper fn for console logging
+// set $.fn.ajaxSubmit.debug to true to enable debug logging
+function log() {
+	if ($.fn.ajaxSubmit.debug) {
+		var msg = '[jquery.form] ' + Array.prototype.join.call(arguments,'');
+		if (window.console && window.console.log) {
+			window.console.log(msg);
+		}
+		else if (window.opera && window.opera.postError) {
+			window.opera.postError(msg);
+		}
+	}
+};
+
+})(jQuery);
diff --git a/jappixmini/jappix/js/jquery.js b/jappixmini/jappix/js/jquery.js
new file mode 100644
index 00000000..7b0be75f
--- /dev/null
+++ b/jappixmini/jappix/js/jquery.js
@@ -0,0 +1,7179 @@
+/*!
+ * jQuery JavaScript Library v1.4.4
+ * http://jquery.com/
+ *
+ * Copyright 2010, John Resig
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * Includes Sizzle.js
+ * http://sizzlejs.com/
+ * Copyright 2010, The Dojo Foundation
+ * Released under the MIT, BSD, and GPL Licenses.
+ *
+ * Date: Thu Nov 11 19:04:53 2010 -0500
+ */
+(function( window, undefined ) {
+
+// Use the correct document accordingly with window argument (sandbox)
+var document = window.document;
+var jQuery = (function() {
+
+// Define a local copy of jQuery
+var jQuery = function( selector, context ) {
+		// The jQuery object is actually just the init constructor 'enhanced'
+		return new jQuery.fn.init( selector, context );
+	},
+
+	// Map over jQuery in case of overwrite
+	_jQuery = window.jQuery,
+
+	// Map over the $ in case of overwrite
+	_$ = window.$,
+
+	// A central reference to the root jQuery(document)
+	rootjQuery,
+
+	// A simple way to check for HTML strings or ID strings
+	// (both of which we optimize for)
+	quickExpr = /^(?:[^<]*(<[\w\W]+>)[^>]*$|#([\w\-]+)$)/,
+
+	// Is it a simple selector
+	isSimple = /^.[^:#\[\.,]*$/,
+
+	// Check if a string has a non-whitespace character in it
+	rnotwhite = /\S/,
+	rwhite = /\s/,
+
+	// Used for trimming whitespace
+	trimLeft = /^\s+/,
+	trimRight = /\s+$/,
+
+	// Check for non-word characters
+	rnonword = /\W/,
+
+	// Check for digits
+	rdigit = /\d/,
+
+	// Match a standalone tag
+	rsingleTag = /^<(\w+)\s*\/?>(?:<\/\1>)?$/,
+
+	// JSON RegExp
+	rvalidchars = /^[\],:{}\s]*$/,
+	rvalidescape = /\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,
+	rvalidtokens = /"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,
+	rvalidbraces = /(?:^|:|,)(?:\s*\[)+/g,
+
+	// Useragent RegExp
+	rwebkit = /(webkit)[ \/]([\w.]+)/,
+	ropera = /(opera)(?:.*version)?[ \/]([\w.]+)/,
+	rmsie = /(msie) ([\w.]+)/,
+	rmozilla = /(mozilla)(?:.*? rv:([\w.]+))?/,
+
+	// Keep a UserAgent string for use with jQuery.browser
+	userAgent = navigator.userAgent,
+
+	// For matching the engine and version of the browser
+	browserMatch,
+	
+	// Has the ready events already been bound?
+	readyBound = false,
+	
+	// The functions to execute on DOM ready
+	readyList = [],
+
+	// The ready event handler
+	DOMContentLoaded,
+
+	// Save a reference to some core methods
+	toString = Object.prototype.toString,
+	hasOwn = Object.prototype.hasOwnProperty,
+	push = Array.prototype.push,
+	slice = Array.prototype.slice,
+	trim = String.prototype.trim,
+	indexOf = Array.prototype.indexOf,
+	
+	// [[Class]] -> type pairs
+	class2type = {};
+
+jQuery.fn = jQuery.prototype = {
+	init: function( selector, context ) {
+		var match, elem, ret, doc;
+
+		// Handle $(""), $(null), or $(undefined)
+		if ( !selector ) {
+			return this;
+		}
+
+		// Handle $(DOMElement)
+		if ( selector.nodeType ) {
+			this.context = this[0] = selector;
+			this.length = 1;
+			return this;
+		}
+		
+		// The body element only exists once, optimize finding it
+		if ( selector === "body" && !context && document.body ) {
+			this.context = document;
+			this[0] = document.body;
+			this.selector = "body";
+			this.length = 1;
+			return this;
+		}
+
+		// Handle HTML strings
+		if ( typeof selector === "string" ) {
+			// Are we dealing with HTML string or an ID?
+			match = quickExpr.exec( selector );
+
+			// Verify a match, and that no context was specified for #id
+			if ( match && (match[1] || !context) ) {
+
+				// HANDLE: $(html) -> $(array)
+				if ( match[1] ) {
+					doc = (context ? context.ownerDocument || context : document);
+
+					// If a single string is passed in and it's a single tag
+					// just do a createElement and skip the rest
+					ret = rsingleTag.exec( selector );
+
+					if ( ret ) {
+						if ( jQuery.isPlainObject( context ) ) {
+							selector = [ document.createElement( ret[1] ) ];
+							jQuery.fn.attr.call( selector, context, true );
+
+						} else {
+							selector = [ doc.createElement( ret[1] ) ];
+						}
+
+					} else {
+						ret = jQuery.buildFragment( [ match[1] ], [ doc ] );
+						selector = (ret.cacheable ? ret.fragment.cloneNode(true) : ret.fragment).childNodes;
+					}
+					
+					return jQuery.merge( this, selector );
+					
+				// HANDLE: $("#id")
+				} else {
+					elem = document.getElementById( match[2] );
+
+					// Check parentNode to catch when Blackberry 4.6 returns
+					// nodes that are no longer in the document #6963
+					if ( elem && elem.parentNode ) {
+						// Handle the case where IE and Opera return items
+						// by name instead of ID
+						if ( elem.id !== match[2] ) {
+							return rootjQuery.find( selector );
+						}
+
+						// Otherwise, we inject the element directly into the jQuery object
+						this.length = 1;
+						this[0] = elem;
+					}
+
+					this.context = document;
+					this.selector = selector;
+					return this;
+				}
+
+			// HANDLE: $("TAG")
+			} else if ( !context && !rnonword.test( selector ) ) {
+				this.selector = selector;
+				this.context = document;
+				selector = document.getElementsByTagName( selector );
+				return jQuery.merge( this, selector );
+
+			// HANDLE: $(expr, $(...))
+			} else if ( !context || context.jquery ) {
+				return (context || rootjQuery).find( selector );
+
+			// HANDLE: $(expr, context)
+			// (which is just equivalent to: $(context).find(expr)
+			} else {
+				return jQuery( context ).find( selector );
+			}
+
+		// HANDLE: $(function)
+		// Shortcut for document ready
+		} else if ( jQuery.isFunction( selector ) ) {
+			return rootjQuery.ready( selector );
+		}
+
+		if (selector.selector !== undefined) {
+			this.selector = selector.selector;
+			this.context = selector.context;
+		}
+
+		return jQuery.makeArray( selector, this );
+	},
+
+	// Start with an empty selector
+	selector: "",
+
+	// The current version of jQuery being used
+	jquery: "1.4.4",
+
+	// The default length of a jQuery object is 0
+	length: 0,
+
+	// The number of elements contained in the matched element set
+	size: function() {
+		return this.length;
+	},
+
+	toArray: function() {
+		return slice.call( this, 0 );
+	},
+
+	// Get the Nth element in the matched element set OR
+	// Get the whole matched element set as a clean array
+	get: function( num ) {
+		return num == null ?
+
+			// Return a 'clean' array
+			this.toArray() :
+
+			// Return just the object
+			( num < 0 ? this.slice(num)[ 0 ] : this[ num ] );
+	},
+
+	// Take an array of elements and push it onto the stack
+	// (returning the new matched element set)
+	pushStack: function( elems, name, selector ) {
+		// Build a new jQuery matched element set
+		var ret = jQuery();
+
+		if ( jQuery.isArray( elems ) ) {
+			push.apply( ret, elems );
+		
+		} else {
+			jQuery.merge( ret, elems );
+		}
+
+		// Add the old object onto the stack (as a reference)
+		ret.prevObject = this;
+
+		ret.context = this.context;
+
+		if ( name === "find" ) {
+			ret.selector = this.selector + (this.selector ? " " : "") + selector;
+		} else if ( name ) {
+			ret.selector = this.selector + "." + name + "(" + selector + ")";
+		}
+
+		// Return the newly-formed element set
+		return ret;
+	},
+
+	// Execute a callback for every element in the matched set.
+	// (You can seed the arguments with an array of args, but this is
+	// only used internally.)
+	each: function( callback, args ) {
+		return jQuery.each( this, callback, args );
+	},
+	
+	ready: function( fn ) {
+		// Attach the listeners
+		jQuery.bindReady();
+
+		// If the DOM is already ready
+		if ( jQuery.isReady ) {
+			// Execute the function immediately
+			fn.call( document, jQuery );
+
+		// Otherwise, remember the function for later
+		} else if ( readyList ) {
+			// Add the function to the wait list
+			readyList.push( fn );
+		}
+
+		return this;
+	},
+	
+	eq: function( i ) {
+		return i === -1 ?
+			this.slice( i ) :
+			this.slice( i, +i + 1 );
+	},
+
+	first: function() {
+		return this.eq( 0 );
+	},
+
+	last: function() {
+		return this.eq( -1 );
+	},
+
+	slice: function() {
+		return this.pushStack( slice.apply( this, arguments ),
+			"slice", slice.call(arguments).join(",") );
+	},
+
+	map: function( callback ) {
+		return this.pushStack( jQuery.map(this, function( elem, i ) {
+			return callback.call( elem, i, elem );
+		}));
+	},
+	
+	end: function() {
+		return this.prevObject || jQuery(null);
+	},
+
+	// For internal use only.
+	// Behaves like an Array's method, not like a jQuery method.
+	push: push,
+	sort: [].sort,
+	splice: [].splice
+};
+
+// Give the init function the jQuery prototype for later instantiation
+jQuery.fn.init.prototype = jQuery.fn;
+
+jQuery.extend = jQuery.fn.extend = function() {
+	 var options, name, src, copy, copyIsArray, clone,
+		target = arguments[0] || {},
+		i = 1,
+		length = arguments.length,
+		deep = false;
+
+	// Handle a deep copy situation
+	if ( typeof target === "boolean" ) {
+		deep = target;
+		target = arguments[1] || {};
+		// skip the boolean and the target
+		i = 2;
+	}
+
+	// Handle case when target is a string or something (possible in deep copy)
+	if ( typeof target !== "object" && !jQuery.isFunction(target) ) {
+		target = {};
+	}
+
+	// extend jQuery itself if only one argument is passed
+	if ( length === i ) {
+		target = this;
+		--i;
+	}
+
+	for ( ; i < length; i++ ) {
+		// Only deal with non-null/undefined values
+		if ( (options = arguments[ i ]) != null ) {
+			// Extend the base object
+			for ( name in options ) {
+				src = target[ name ];
+				copy = options[ name ];
+
+				// Prevent never-ending loop
+				if ( target === copy ) {
+					continue;
+				}
+
+				// Recurse if we're merging plain objects or arrays
+				if ( deep && copy && ( jQuery.isPlainObject(copy) || (copyIsArray = jQuery.isArray(copy)) ) ) {
+					if ( copyIsArray ) {
+						copyIsArray = false;
+						clone = src && jQuery.isArray(src) ? src : [];
+
+					} else {
+						clone = src && jQuery.isPlainObject(src) ? src : {};
+					}
+
+					// Never move original objects, clone them
+					target[ name ] = jQuery.extend( deep, clone, copy );
+
+				// Don't bring in undefined values
+				} else if ( copy !== undefined ) {
+					target[ name ] = copy;
+				}
+			}
+		}
+	}
+
+	// Return the modified object
+	return target;
+};
+
+jQuery.extend({
+	noConflict: function( deep ) {
+		window.$ = _$;
+
+		if ( deep ) {
+			window.jQuery = _jQuery;
+		}
+
+		return jQuery;
+	},
+	
+	// Is the DOM ready to be used? Set to true once it occurs.
+	isReady: false,
+
+	// A counter to track how many items to wait for before
+	// the ready event fires. See #6781
+	readyWait: 1,
+	
+	// Handle when the DOM is ready
+	ready: function( wait ) {
+		// A third-party is pushing the ready event forwards
+		if ( wait === true ) {
+			jQuery.readyWait--;
+		}
+
+		// Make sure that the DOM is not already loaded
+		if ( !jQuery.readyWait || (wait !== true && !jQuery.isReady) ) {
+			// Make sure body exists, at least, in case IE gets a little overzealous (ticket #5443).
+			if ( !document.body ) {
+				return setTimeout( jQuery.ready, 1 );
+			}
+
+			// Remember that the DOM is ready
+			jQuery.isReady = true;
+
+			// If a normal DOM Ready event fired, decrement, and wait if need be
+			if ( wait !== true && --jQuery.readyWait > 0 ) {
+				return;
+			}
+
+			// If there are functions bound, to execute
+			if ( readyList ) {
+				// Execute all of them
+				var fn,
+					i = 0,
+					ready = readyList;
+
+				// Reset the list of functions
+				readyList = null;
+
+				while ( (fn = ready[ i++ ]) ) {
+					fn.call( document, jQuery );
+				}
+
+				// Trigger any bound ready events
+				if ( jQuery.fn.trigger ) {
+					jQuery( document ).trigger( "ready" ).unbind( "ready" );
+				}
+			}
+		}
+	},
+	
+	bindReady: function() {
+		if ( readyBound ) {
+			return;
+		}
+
+		readyBound = true;
+
+		// Catch cases where $(document).ready() is called after the
+		// browser event has already occurred.
+		if ( document.readyState === "complete" ) {
+			// Handle it asynchronously to allow scripts the opportunity to delay ready
+			return setTimeout( jQuery.ready, 1 );
+		}
+
+		// Mozilla, Opera and webkit nightlies currently support this event
+		if ( document.addEventListener ) {
+			// Use the handy event callback
+			document.addEventListener( "DOMContentLoaded", DOMContentLoaded, false );
+			
+			// A fallback to window.onload, that will always work
+			window.addEventListener( "load", jQuery.ready, false );
+
+		// If IE event model is used
+		} else if ( document.attachEvent ) {
+			// ensure firing before onload,
+			// maybe late but safe also for iframes
+			document.attachEvent("onreadystatechange", DOMContentLoaded);
+			
+			// A fallback to window.onload, that will always work
+			window.attachEvent( "onload", jQuery.ready );
+
+			// If IE and not a frame
+			// continually check to see if the document is ready
+			var toplevel = false;
+
+			try {
+				toplevel = window.frameElement == null;
+			} catch(e) {}
+
+			if ( document.documentElement.doScroll && toplevel ) {
+				doScrollCheck();
+			}
+		}
+	},
+
+	// See test/unit/core.js for details concerning isFunction.
+	// Since version 1.3, DOM methods and functions like alert
+	// aren't supported. They return false on IE (#2968).
+	isFunction: function( obj ) {
+		return jQuery.type(obj) === "function";
+	},
+
+	isArray: Array.isArray || function( obj ) {
+		return jQuery.type(obj) === "array";
+	},
+
+	// A crude way of determining if an object is a window
+	isWindow: function( obj ) {
+		return obj && typeof obj === "object" && "setInterval" in obj;
+	},
+
+	isNaN: function( obj ) {
+		return obj == null || !rdigit.test( obj ) || isNaN( obj );
+	},
+
+	type: function( obj ) {
+		return obj == null ?
+			String( obj ) :
+			class2type[ toString.call(obj) ] || "object";
+	},
+
+	isPlainObject: function( obj ) {
+		// Must be an Object.
+		// Because of IE, we also have to check the presence of the constructor property.
+		// Make sure that DOM nodes and window objects don't pass through, as well
+		if ( !obj || jQuery.type(obj) !== "object" || obj.nodeType || jQuery.isWindow( obj ) ) {
+			return false;
+		}
+		
+		// Not own constructor property must be Object
+		if ( obj.constructor &&
+			!hasOwn.call(obj, "constructor") &&
+			!hasOwn.call(obj.constructor.prototype, "isPrototypeOf") ) {
+			return false;
+		}
+		
+		// Own properties are enumerated firstly, so to speed up,
+		// if last one is own, then all properties are own.
+	
+		var key;
+		for ( key in obj ) {}
+		
+		return key === undefined || hasOwn.call( obj, key );
+	},
+
+	isEmptyObject: function( obj ) {
+		for ( var name in obj ) {
+			return false;
+		}
+		return true;
+	},
+	
+	error: function( msg ) {
+		throw msg;
+	},
+	
+	parseJSON: function( data ) {
+		if ( typeof data !== "string" || !data ) {
+			return null;
+		}
+
+		// Make sure leading/trailing whitespace is removed (IE can't handle it)
+		data = jQuery.trim( data );
+		
+		// Make sure the incoming data is actual JSON
+		// Logic borrowed from http://json.org/json2.js
+		if ( rvalidchars.test(data.replace(rvalidescape, "@")
+			.replace(rvalidtokens, "]")
+			.replace(rvalidbraces, "")) ) {
+
+			// Try to use the native JSON parser first
+			return window.JSON && window.JSON.parse ?
+				window.JSON.parse( data ) :
+				(new Function("return " + data))();
+
+		} else {
+			jQuery.error( "Invalid JSON: " + data );
+		}
+	},
+
+	noop: function() {},
+
+	// Evalulates a script in a global context
+	globalEval: function( data ) {
+		if ( data && rnotwhite.test(data) ) {
+			// Inspired by code by Andrea Giammarchi
+			// http://webreflection.blogspot.com/2007/08/global-scope-evaluation-and-dom.html
+			var head = document.getElementsByTagName("head")[0] || document.documentElement,
+				script = document.createElement("script");
+
+			script.type = "text/javascript";
+
+			if ( jQuery.support.scriptEval ) {
+				script.appendChild( document.createTextNode( data ) );
+			} else {
+				script.text = data;
+			}
+
+			// Use insertBefore instead of appendChild to circumvent an IE6 bug.
+			// This arises when a base node is used (#2709).
+			head.insertBefore( script, head.firstChild );
+			head.removeChild( script );
+		}
+	},
+
+	nodeName: function( elem, name ) {
+		return elem.nodeName && elem.nodeName.toUpperCase() === name.toUpperCase();
+	},
+
+	// args is for internal usage only
+	each: function( object, callback, args ) {
+		var name, i = 0,
+			length = object.length,
+			isObj = length === undefined || jQuery.isFunction(object);
+
+		if ( args ) {
+			if ( isObj ) {
+				for ( name in object ) {
+					if ( callback.apply( object[ name ], args ) === false ) {
+						break;
+					}
+				}
+			} else {
+				for ( ; i < length; ) {
+					if ( callback.apply( object[ i++ ], args ) === false ) {
+						break;
+					}
+				}
+			}
+
+		// A special, fast, case for the most common use of each
+		} else {
+			if ( isObj ) {
+				for ( name in object ) {
+					if ( callback.call( object[ name ], name, object[ name ] ) === false ) {
+						break;
+					}
+				}
+			} else {
+				for ( var value = object[0];
+					i < length && callback.call( value, i, value ) !== false; value = object[++i] ) {}
+			}
+		}
+
+		return object;
+	},
+
+	// Use native String.trim function wherever possible
+	trim: trim ?
+		function( text ) {
+			return text == null ?
+				"" :
+				trim.call( text );
+		} :
+
+		// Otherwise use our own trimming functionality
+		function( text ) {
+			return text == null ?
+				"" :
+				text.toString().replace( trimLeft, "" ).replace( trimRight, "" );
+		},
+
+	// results is for internal usage only
+	makeArray: function( array, results ) {
+		var ret = results || [];
+
+		if ( array != null ) {
+			// The window, strings (and functions) also have 'length'
+			// The extra typeof function check is to prevent crashes
+			// in Safari 2 (See: #3039)
+			// Tweaked logic slightly to handle Blackberry 4.7 RegExp issues #6930
+			var type = jQuery.type(array);
+
+			if ( array.length == null || type === "string" || type === "function" || type === "regexp" || jQuery.isWindow( array ) ) {
+				push.call( ret, array );
+			} else {
+				jQuery.merge( ret, array );
+			}
+		}
+
+		return ret;
+	},
+
+	inArray: function( elem, array ) {
+		if ( array.indexOf ) {
+			return array.indexOf( elem );
+		}
+
+		for ( var i = 0, length = array.length; i < length; i++ ) {
+			if ( array[ i ] === elem ) {
+				return i;
+			}
+		}
+
+		return -1;
+	},
+
+	merge: function( first, second ) {
+		var i = first.length,
+			j = 0;
+
+		if ( typeof second.length === "number" ) {
+			for ( var l = second.length; j < l; j++ ) {
+				first[ i++ ] = second[ j ];
+			}
+		
+		} else {
+			while ( second[j] !== undefined ) {
+				first[ i++ ] = second[ j++ ];
+			}
+		}
+
+		first.length = i;
+
+		return first;
+	},
+
+	grep: function( elems, callback, inv ) {
+		var ret = [], retVal;
+		inv = !!inv;
+
+		// Go through the array, only saving the items
+		// that pass the validator function
+		for ( var i = 0, length = elems.length; i < length; i++ ) {
+			retVal = !!callback( elems[ i ], i );
+			if ( inv !== retVal ) {
+				ret.push( elems[ i ] );
+			}
+		}
+
+		return ret;
+	},
+
+	// arg is for internal usage only
+	map: function( elems, callback, arg ) {
+		var ret = [], value;
+
+		// Go through the array, translating each of the items to their
+		// new value (or values).
+		for ( var i = 0, length = elems.length; i < length; i++ ) {
+			value = callback( elems[ i ], i, arg );
+
+			if ( value != null ) {
+				ret[ ret.length ] = value;
+			}
+		}
+
+		return ret.concat.apply( [], ret );
+	},
+
+	// A global GUID counter for objects
+	guid: 1,
+
+	proxy: function( fn, proxy, thisObject ) {
+		if ( arguments.length === 2 ) {
+			if ( typeof proxy === "string" ) {
+				thisObject = fn;
+				fn = thisObject[ proxy ];
+				proxy = undefined;
+
+			} else if ( proxy && !jQuery.isFunction( proxy ) ) {
+				thisObject = proxy;
+				proxy = undefined;
+			}
+		}
+
+		if ( !proxy && fn ) {
+			proxy = function() {
+				return fn.apply( thisObject || this, arguments );
+			};
+		}
+
+		// Set the guid of unique handler to the same of original handler, so it can be removed
+		if ( fn ) {
+			proxy.guid = fn.guid = fn.guid || proxy.guid || jQuery.guid++;
+		}
+
+		// So proxy can be declared as an argument
+		return proxy;
+	},
+
+	// Mutifunctional method to get and set values to a collection
+	// The value/s can be optionally by executed if its a function
+	access: function( elems, key, value, exec, fn, pass ) {
+		var length = elems.length;
+	
+		// Setting many attributes
+		if ( typeof key === "object" ) {
+			for ( var k in key ) {
+				jQuery.access( elems, k, key[k], exec, fn, value );
+			}
+			return elems;
+		}
+	
+		// Setting one attribute
+		if ( value !== undefined ) {
+			// Optionally, function values get executed if exec is true
+			exec = !pass && exec && jQuery.isFunction(value);
+		
+			for ( var i = 0; i < length; i++ ) {
+				fn( elems[i], key, exec ? value.call( elems[i], i, fn( elems[i], key ) ) : value, pass );
+			}
+		
+			return elems;
+		}
+	
+		// Getting an attribute
+		return length ? fn( elems[0], key ) : undefined;
+	},
+
+	now: function() {
+		return (new Date()).getTime();
+	},
+
+	// Use of jQuery.browser is frowned upon.
+	// More details: http://docs.jquery.com/Utilities/jQuery.browser
+	uaMatch: function( ua ) {
+		ua = ua.toLowerCase();
+
+		var match = rwebkit.exec( ua ) ||
+			ropera.exec( ua ) ||
+			rmsie.exec( ua ) ||
+			ua.indexOf("compatible") < 0 && rmozilla.exec( ua ) ||
+			[];
+
+		return { browser: match[1] || "", version: match[2] || "0" };
+	},
+
+	browser: {}
+});
+
+// Populate the class2type map
+jQuery.each("Boolean Number String Function Array Date RegExp Object".split(" "), function(i, name) {
+	class2type[ "[object " + name + "]" ] = name.toLowerCase();
+});
+
+browserMatch = jQuery.uaMatch( userAgent );
+if ( browserMatch.browser ) {
+	jQuery.browser[ browserMatch.browser ] = true;
+	jQuery.browser.version = browserMatch.version;
+}
+
+// Deprecated, use jQuery.browser.webkit instead
+if ( jQuery.browser.webkit ) {
+	jQuery.browser.safari = true;
+}
+
+if ( indexOf ) {
+	jQuery.inArray = function( elem, array ) {
+		return indexOf.call( array, elem );
+	};
+}
+
+// Verify that \s matches non-breaking spaces
+// (IE fails on this test)
+if ( !rwhite.test( "\xA0" ) ) {
+	trimLeft = /^[\s\xA0]+/;
+	trimRight = /[\s\xA0]+$/;
+}
+
+// All jQuery objects should point back to these
+rootjQuery = jQuery(document);
+
+// Cleanup functions for the document ready method
+if ( document.addEventListener ) {
+	DOMContentLoaded = function() {
+		document.removeEventListener( "DOMContentLoaded", DOMContentLoaded, false );
+		jQuery.ready();
+	};
+
+} else if ( document.attachEvent ) {
+	DOMContentLoaded = function() {
+		// Make sure body exists, at least, in case IE gets a little overzealous (ticket #5443).
+		if ( document.readyState === "complete" ) {
+			document.detachEvent( "onreadystatechange", DOMContentLoaded );
+			jQuery.ready();
+		}
+	};
+}
+
+// The DOM ready check for Internet Explorer
+function doScrollCheck() {
+	if ( jQuery.isReady ) {
+		return;
+	}
+
+	try {
+		// If IE is used, use the trick by Diego Perini
+		// http://javascript.nwbox.com/IEContentLoaded/
+		document.documentElement.doScroll("left");
+	} catch(e) {
+		setTimeout( doScrollCheck, 1 );
+		return;
+	}
+
+	// and execute any waiting functions
+	jQuery.ready();
+}
+
+// Expose jQuery to the global object
+return (window.jQuery = window.$ = jQuery);
+
+})();
+
+
+(function() {
+
+	jQuery.support = {};
+
+	var root = document.documentElement,
+		script = document.createElement("script"),
+		div = document.createElement("div"),
+		id = "script" + jQuery.now();
+
+	div.style.display = "none";
+	div.innerHTML = "   <link/><table></table><a href='/a' style='color:red;float:left;opacity:.55;'>a</a><input type='checkbox'/>";
+
+	var all = div.getElementsByTagName("*"),
+		a = div.getElementsByTagName("a")[0],
+		select = document.createElement("select"),
+		opt = select.appendChild( document.createElement("option") );
+
+	// Can't get basic test support
+	if ( !all || !all.length || !a ) {
+		return;
+	}
+
+	jQuery.support = {
+		// IE strips leading whitespace when .innerHTML is used
+		leadingWhitespace: div.firstChild.nodeType === 3,
+
+		// Make sure that tbody elements aren't automatically inserted
+		// IE will insert them into empty tables
+		tbody: !div.getElementsByTagName("tbody").length,
+
+		// Make sure that link elements get serialized correctly by innerHTML
+		// This requires a wrapper element in IE
+		htmlSerialize: !!div.getElementsByTagName("link").length,
+
+		// Get the style information from getAttribute
+		// (IE uses .cssText insted)
+		style: /red/.test( a.getAttribute("style") ),
+
+		// Make sure that URLs aren't manipulated
+		// (IE normalizes it by default)
+		hrefNormalized: a.getAttribute("href") === "/a",
+
+		// Make sure that element opacity exists
+		// (IE uses filter instead)
+		// Use a regex to work around a WebKit issue. See #5145
+		opacity: /^0.55$/.test( a.style.opacity ),
+
+		// Verify style float existence
+		// (IE uses styleFloat instead of cssFloat)
+		cssFloat: !!a.style.cssFloat,
+
+		// Make sure that if no value is specified for a checkbox
+		// that it defaults to "on".
+		// (WebKit defaults to "" instead)
+		checkOn: div.getElementsByTagName("input")[0].value === "on",
+
+		// Make sure that a selected-by-default option has a working selected property.
+		// (WebKit defaults to false instead of true, IE too, if it's in an optgroup)
+		optSelected: opt.selected,
+
+		// Will be defined later
+		deleteExpando: true,
+		optDisabled: false,
+		checkClone: false,
+		scriptEval: false,
+		noCloneEvent: true,
+		boxModel: null,
+		inlineBlockNeedsLayout: false,
+		shrinkWrapBlocks: false,
+		reliableHiddenOffsets: true
+	};
+
+	// Make sure that the options inside disabled selects aren't marked as disabled
+	// (WebKit marks them as diabled)
+	select.disabled = true;
+	jQuery.support.optDisabled = !opt.disabled;
+
+	script.type = "text/javascript";
+	try {
+		script.appendChild( document.createTextNode( "window." + id + "=1;" ) );
+	} catch(e) {}
+
+	root.insertBefore( script, root.firstChild );
+
+	// Make sure that the execution of code works by injecting a script
+	// tag with appendChild/createTextNode
+	// (IE doesn't support this, fails, and uses .text instead)
+	if ( window[ id ] ) {
+		jQuery.support.scriptEval = true;
+		delete window[ id ];
+	}
+
+	// Test to see if it's possible to delete an expando from an element
+	// Fails in Internet Explorer
+	try {
+		delete script.test;
+
+	} catch(e) {
+		jQuery.support.deleteExpando = false;
+	}
+
+	root.removeChild( script );
+
+	if ( div.attachEvent && div.fireEvent ) {
+		div.attachEvent("onclick", function click() {
+			// Cloning a node shouldn't copy over any
+			// bound event handlers (IE does this)
+			jQuery.support.noCloneEvent = false;
+			div.detachEvent("onclick", click);
+		});
+		div.cloneNode(true).fireEvent("onclick");
+	}
+
+	div = document.createElement("div");
+	div.innerHTML = "<input type='radio' name='radiotest' checked='checked'/>";
+
+	var fragment = document.createDocumentFragment();
+	fragment.appendChild( div.firstChild );
+
+	// WebKit doesn't clone checked state correctly in fragments
+	jQuery.support.checkClone = fragment.cloneNode(true).cloneNode(true).lastChild.checked;
+
+	// Figure out if the W3C box model works as expected
+	// document.body must exist before we can do this
+	jQuery(function() {
+		var div = document.createElement("div");
+		div.style.width = div.style.paddingLeft = "1px";
+
+		document.body.appendChild( div );
+		jQuery.boxModel = jQuery.support.boxModel = div.offsetWidth === 2;
+
+		if ( "zoom" in div.style ) {
+			// Check if natively block-level elements act like inline-block
+			// elements when setting their display to 'inline' and giving
+			// them layout
+			// (IE < 8 does this)
+			div.style.display = "inline";
+			div.style.zoom = 1;
+			jQuery.support.inlineBlockNeedsLayout = div.offsetWidth === 2;
+
+			// Check if elements with layout shrink-wrap their children
+			// (IE 6 does this)
+			div.style.display = "";
+			div.innerHTML = "<div style='width:4px;'></div>";
+			jQuery.support.shrinkWrapBlocks = div.offsetWidth !== 2;
+		}
+
+		div.innerHTML = "<table><tr><td style='padding:0;display:none'></td><td>t</td></tr></table>";
+		var tds = div.getElementsByTagName("td");
+
+		// Check if table cells still have offsetWidth/Height when they are set
+		// to display:none and there are still other visible table cells in a
+		// table row; if so, offsetWidth/Height are not reliable for use when
+		// determining if an element has been hidden directly using
+		// display:none (it is still safe to use offsets if a parent element is
+		// hidden; don safety goggles and see bug #4512 for more information).
+		// (only IE 8 fails this test)
+		jQuery.support.reliableHiddenOffsets = tds[0].offsetHeight === 0;
+
+		tds[0].style.display = "";
+		tds[1].style.display = "none";
+
+		// Check if empty table cells still have offsetWidth/Height
+		// (IE < 8 fail this test)
+		jQuery.support.reliableHiddenOffsets = jQuery.support.reliableHiddenOffsets && tds[0].offsetHeight === 0;
+		div.innerHTML = "";
+
+		document.body.removeChild( div ).style.display = "none";
+		div = tds = null;
+	});
+
+	// Technique from Juriy Zaytsev
+	// http://thinkweb2.com/projects/prototype/detecting-event-support-without-browser-sniffing/
+	var eventSupported = function( eventName ) {
+		var el = document.createElement("div");
+		eventName = "on" + eventName;
+
+		var isSupported = (eventName in el);
+		if ( !isSupported ) {
+			el.setAttribute(eventName, "return;");
+			isSupported = typeof el[eventName] === "function";
+		}
+		el = null;
+
+		return isSupported;
+	};
+
+	jQuery.support.submitBubbles = eventSupported("submit");
+	jQuery.support.changeBubbles = eventSupported("change");
+
+	// release memory in IE
+	root = script = div = all = a = null;
+})();
+
+
+
+var windowData = {},
+	rbrace = /^(?:\{.*\}|\[.*\])$/;
+
+jQuery.extend({
+	cache: {},
+
+	// Please use with caution
+	uuid: 0,
+
+	// Unique for each copy of jQuery on the page	
+	expando: "jQuery" + jQuery.now(),
+
+	// The following elements throw uncatchable exceptions if you
+	// attempt to add expando properties to them.
+	noData: {
+		"embed": true,
+		// Ban all objects except for Flash (which handle expandos)
+		"object": "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",
+		"applet": true
+	},
+
+	data: function( elem, name, data ) {
+		if ( !jQuery.acceptData( elem ) ) {
+			return;
+		}
+
+		elem = elem == window ?
+			windowData :
+			elem;
+
+		var isNode = elem.nodeType,
+			id = isNode ? elem[ jQuery.expando ] : null,
+			cache = jQuery.cache, thisCache;
+
+		if ( isNode && !id && typeof name === "string" && data === undefined ) {
+			return;
+		}
+
+		// Get the data from the object directly
+		if ( !isNode ) {
+			cache = elem;
+
+		// Compute a unique ID for the element
+		} else if ( !id ) {
+			elem[ jQuery.expando ] = id = ++jQuery.uuid;
+		}
+
+		// Avoid generating a new cache unless none exists and we
+		// want to manipulate it.
+		if ( typeof name === "object" ) {
+			if ( isNode ) {
+				cache[ id ] = jQuery.extend(cache[ id ], name);
+
+			} else {
+				jQuery.extend( cache, name );
+			}
+
+		} else if ( isNode && !cache[ id ] ) {
+			cache[ id ] = {};
+		}
+
+		thisCache = isNode ? cache[ id ] : cache;
+
+		// Prevent overriding the named cache with undefined values
+		if ( data !== undefined ) {
+			thisCache[ name ] = data;
+		}
+
+		return typeof name === "string" ? thisCache[ name ] : thisCache;
+	},
+
+	removeData: function( elem, name ) {
+		if ( !jQuery.acceptData( elem ) ) {
+			return;
+		}
+
+		elem = elem == window ?
+			windowData :
+			elem;
+
+		var isNode = elem.nodeType,
+			id = isNode ? elem[ jQuery.expando ] : elem,
+			cache = jQuery.cache,
+			thisCache = isNode ? cache[ id ] : id;
+
+		// If we want to remove a specific section of the element's data
+		if ( name ) {
+			if ( thisCache ) {
+				// Remove the section of cache data
+				delete thisCache[ name ];
+
+				// If we've removed all the data, remove the element's cache
+				if ( isNode && jQuery.isEmptyObject(thisCache) ) {
+					jQuery.removeData( elem );
+				}
+			}
+
+		// Otherwise, we want to remove all of the element's data
+		} else {
+			if ( isNode && jQuery.support.deleteExpando ) {
+				delete elem[ jQuery.expando ];
+
+			} else if ( elem.removeAttribute ) {
+				elem.removeAttribute( jQuery.expando );
+
+			// Completely remove the data cache
+			} else if ( isNode ) {
+				delete cache[ id ];
+
+			// Remove all fields from the object
+			} else {
+				for ( var n in elem ) {
+					delete elem[ n ];
+				}
+			}
+		}
+	},
+
+	// A method for determining if a DOM node can handle the data expando
+	acceptData: function( elem ) {
+		if ( elem.nodeName ) {
+			var match = jQuery.noData[ elem.nodeName.toLowerCase() ];
+
+			if ( match ) {
+				return !(match === true || elem.getAttribute("classid") !== match);
+			}
+		}
+
+		return true;
+	}
+});
+
+jQuery.fn.extend({
+	data: function( key, value ) {
+		var data = null;
+
+		if ( typeof key === "undefined" ) {
+			if ( this.length ) {
+				var attr = this[0].attributes, name;
+				data = jQuery.data( this[0] );
+
+				for ( var i = 0, l = attr.length; i < l; i++ ) {
+					name = attr[i].name;
+
+					if ( name.indexOf( "data-" ) === 0 ) {
+						name = name.substr( 5 );
+						dataAttr( this[0], name, data[ name ] );
+					}
+				}
+			}
+
+			return data;
+
+		} else if ( typeof key === "object" ) {
+			return this.each(function() {
+				jQuery.data( this, key );
+			});
+		}
+
+		var parts = key.split(".");
+		parts[1] = parts[1] ? "." + parts[1] : "";
+
+		if ( value === undefined ) {
+			data = this.triggerHandler("getData" + parts[1] + "!", [parts[0]]);
+
+			// Try to fetch any internally stored data first
+			if ( data === undefined && this.length ) {
+				data = jQuery.data( this[0], key );
+				data = dataAttr( this[0], key, data );
+			}
+
+			return data === undefined && parts[1] ?
+				this.data( parts[0] ) :
+				data;
+
+		} else {
+			return this.each(function() {
+				var $this = jQuery( this ),
+					args = [ parts[0], value ];
+
+				$this.triggerHandler( "setData" + parts[1] + "!", args );
+				jQuery.data( this, key, value );
+				$this.triggerHandler( "changeData" + parts[1] + "!", args );
+			});
+		}
+	},
+
+	removeData: function( key ) {
+		return this.each(function() {
+			jQuery.removeData( this, key );
+		});
+	}
+});
+
+function dataAttr( elem, key, data ) {
+	// If nothing was found internally, try to fetch any
+	// data from the HTML5 data-* attribute
+	if ( data === undefined && elem.nodeType === 1 ) {
+		data = elem.getAttribute( "data-" + key );
+
+		if ( typeof data === "string" ) {
+			try {
+				data = data === "true" ? true :
+				data === "false" ? false :
+				data === "null" ? null :
+				!jQuery.isNaN( data ) ? parseFloat( data ) :
+					rbrace.test( data ) ? jQuery.parseJSON( data ) :
+					data;
+			} catch( e ) {}
+
+			// Make sure we set the data so it isn't changed later
+			jQuery.data( elem, key, data );
+
+		} else {
+			data = undefined;
+		}
+	}
+
+	return data;
+}
+
+
+
+
+jQuery.extend({
+	queue: function( elem, type, data ) {
+		if ( !elem ) {
+			return;
+		}
+
+		type = (type || "fx") + "queue";
+		var q = jQuery.data( elem, type );
+
+		// Speed up dequeue by getting out quickly if this is just a lookup
+		if ( !data ) {
+			return q || [];
+		}
+
+		if ( !q || jQuery.isArray(data) ) {
+			q = jQuery.data( elem, type, jQuery.makeArray(data) );
+
+		} else {
+			q.push( data );
+		}
+
+		return q;
+	},
+
+	dequeue: function( elem, type ) {
+		type = type || "fx";
+
+		var queue = jQuery.queue( elem, type ),
+			fn = queue.shift();
+
+		// If the fx queue is dequeued, always remove the progress sentinel
+		if ( fn === "inprogress" ) {
+			fn = queue.shift();
+		}
+
+		if ( fn ) {
+			// Add a progress sentinel to prevent the fx queue from being
+			// automatically dequeued
+			if ( type === "fx" ) {
+				queue.unshift("inprogress");
+			}
+
+			fn.call(elem, function() {
+				jQuery.dequeue(elem, type);
+			});
+		}
+	}
+});
+
+jQuery.fn.extend({
+	queue: function( type, data ) {
+		if ( typeof type !== "string" ) {
+			data = type;
+			type = "fx";
+		}
+
+		if ( data === undefined ) {
+			return jQuery.queue( this[0], type );
+		}
+		return this.each(function( i ) {
+			var queue = jQuery.queue( this, type, data );
+
+			if ( type === "fx" && queue[0] !== "inprogress" ) {
+				jQuery.dequeue( this, type );
+			}
+		});
+	},
+	dequeue: function( type ) {
+		return this.each(function() {
+			jQuery.dequeue( this, type );
+		});
+	},
+
+	// Based off of the addon by Clint Helfers, with permission.
+	// http://blindsignals.com/index.php/2009/07/jquery-delay/
+	delay: function( time, type ) {
+		time = jQuery.fx ? jQuery.fx.speeds[time] || time : time;
+		type = type || "fx";
+
+		return this.queue( type, function() {
+			var elem = this;
+			setTimeout(function() {
+				jQuery.dequeue( elem, type );
+			}, time );
+		});
+	},
+
+	clearQueue: function( type ) {
+		return this.queue( type || "fx", [] );
+	}
+});
+
+
+
+
+var rclass = /[\n\t]/g,
+	rspaces = /\s+/,
+	rreturn = /\r/g,
+	rspecialurl = /^(?:href|src|style)$/,
+	rtype = /^(?:button|input)$/i,
+	rfocusable = /^(?:button|input|object|select|textarea)$/i,
+	rclickable = /^a(?:rea)?$/i,
+	rradiocheck = /^(?:radio|checkbox)$/i;
+
+jQuery.props = {
+	"for": "htmlFor",
+	"class": "className",
+	readonly: "readOnly",
+	maxlength: "maxLength",
+	cellspacing: "cellSpacing",
+	rowspan: "rowSpan",
+	colspan: "colSpan",
+	tabindex: "tabIndex",
+	usemap: "useMap",
+	frameborder: "frameBorder"
+};
+
+jQuery.fn.extend({
+	attr: function( name, value ) {
+		return jQuery.access( this, name, value, true, jQuery.attr );
+	},
+
+	removeAttr: function( name, fn ) {
+		return this.each(function(){
+			jQuery.attr( this, name, "" );
+			if ( this.nodeType === 1 ) {
+				this.removeAttribute( name );
+			}
+		});
+	},
+
+	addClass: function( value ) {
+		if ( jQuery.isFunction(value) ) {
+			return this.each(function(i) {
+				var self = jQuery(this);
+				self.addClass( value.call(this, i, self.attr("class")) );
+			});
+		}
+
+		if ( value && typeof value === "string" ) {
+			var classNames = (value || "").split( rspaces );
+
+			for ( var i = 0, l = this.length; i < l; i++ ) {
+				var elem = this[i];
+
+				if ( elem.nodeType === 1 ) {
+					if ( !elem.className ) {
+						elem.className = value;
+
+					} else {
+						var className = " " + elem.className + " ",
+							setClass = elem.className;
+
+						for ( var c = 0, cl = classNames.length; c < cl; c++ ) {
+							if ( className.indexOf( " " + classNames[c] + " " ) < 0 ) {
+								setClass += " " + classNames[c];
+							}
+						}
+						elem.className = jQuery.trim( setClass );
+					}
+				}
+			}
+		}
+
+		return this;
+	},
+
+	removeClass: function( value ) {
+		if ( jQuery.isFunction(value) ) {
+			return this.each(function(i) {
+				var self = jQuery(this);
+				self.removeClass( value.call(this, i, self.attr("class")) );
+			});
+		}
+
+		if ( (value && typeof value === "string") || value === undefined ) {
+			var classNames = (value || "").split( rspaces );
+
+			for ( var i = 0, l = this.length; i < l; i++ ) {
+				var elem = this[i];
+
+				if ( elem.nodeType === 1 && elem.className ) {
+					if ( value ) {
+						var className = (" " + elem.className + " ").replace(rclass, " ");
+						for ( var c = 0, cl = classNames.length; c < cl; c++ ) {
+							className = className.replace(" " + classNames[c] + " ", " ");
+						}
+						elem.className = jQuery.trim( className );
+
+					} else {
+						elem.className = "";
+					}
+				}
+			}
+		}
+
+		return this;
+	},
+
+	toggleClass: function( value, stateVal ) {
+		var type = typeof value,
+			isBool = typeof stateVal === "boolean";
+
+		if ( jQuery.isFunction( value ) ) {
+			return this.each(function(i) {
+				var self = jQuery(this);
+				self.toggleClass( value.call(this, i, self.attr("class"), stateVal), stateVal );
+			});
+		}
+
+		return this.each(function() {
+			if ( type === "string" ) {
+				// toggle individual class names
+				var className,
+					i = 0,
+					self = jQuery( this ),
+					state = stateVal,
+					classNames = value.split( rspaces );
+
+				while ( (className = classNames[ i++ ]) ) {
+					// check each className given, space seperated list
+					state = isBool ? state : !self.hasClass( className );
+					self[ state ? "addClass" : "removeClass" ]( className );
+				}
+
+			} else if ( type === "undefined" || type === "boolean" ) {
+				if ( this.className ) {
+					// store className if set
+					jQuery.data( this, "__className__", this.className );
+				}
+
+				// toggle whole className
+				this.className = this.className || value === false ? "" : jQuery.data( this, "__className__" ) || "";
+			}
+		});
+	},
+
+	hasClass: function( selector ) {
+		var className = " " + selector + " ";
+		for ( var i = 0, l = this.length; i < l; i++ ) {
+			if ( (" " + this[i].className + " ").replace(rclass, " ").indexOf( className ) > -1 ) {
+				return true;
+			}
+		}
+
+		return false;
+	},
+
+	val: function( value ) {
+		if ( !arguments.length ) {
+			var elem = this[0];
+
+			if ( elem ) {
+				if ( jQuery.nodeName( elem, "option" ) ) {
+					// attributes.value is undefined in Blackberry 4.7 but
+					// uses .value. See #6932
+					var val = elem.attributes.value;
+					return !val || val.specified ? elem.value : elem.text;
+				}
+
+				// We need to handle select boxes special
+				if ( jQuery.nodeName( elem, "select" ) ) {
+					var index = elem.selectedIndex,
+						values = [],
+						options = elem.options,
+						one = elem.type === "select-one";
+
+					// Nothing was selected
+					if ( index < 0 ) {
+						return null;
+					}
+
+					// Loop through all the selected options
+					for ( var i = one ? index : 0, max = one ? index + 1 : options.length; i < max; i++ ) {
+						var option = options[ i ];
+
+						// Don't return options that are disabled or in a disabled optgroup
+						if ( option.selected && (jQuery.support.optDisabled ? !option.disabled : option.getAttribute("disabled") === null) && 
+								(!option.parentNode.disabled || !jQuery.nodeName( option.parentNode, "optgroup" )) ) {
+
+							// Get the specific value for the option
+							value = jQuery(option).val();
+
+							// We don't need an array for one selects
+							if ( one ) {
+								return value;
+							}
+
+							// Multi-Selects return an array
+							values.push( value );
+						}
+					}
+
+					return values;
+				}
+
+				// Handle the case where in Webkit "" is returned instead of "on" if a value isn't specified
+				if ( rradiocheck.test( elem.type ) && !jQuery.support.checkOn ) {
+					return elem.getAttribute("value") === null ? "on" : elem.value;
+				}
+				
+
+				// Everything else, we just grab the value
+				return (elem.value || "").replace(rreturn, "");
+
+			}
+
+			return undefined;
+		}
+
+		var isFunction = jQuery.isFunction(value);
+
+		return this.each(function(i) {
+			var self = jQuery(this), val = value;
+
+			if ( this.nodeType !== 1 ) {
+				return;
+			}
+
+			if ( isFunction ) {
+				val = value.call(this, i, self.val());
+			}
+
+			// Treat null/undefined as ""; convert numbers to string
+			if ( val == null ) {
+				val = "";
+			} else if ( typeof val === "number" ) {
+				val += "";
+			} else if ( jQuery.isArray(val) ) {
+				val = jQuery.map(val, function (value) {
+					return value == null ? "" : value + "";
+				});
+			}
+
+			if ( jQuery.isArray(val) && rradiocheck.test( this.type ) ) {
+				this.checked = jQuery.inArray( self.val(), val ) >= 0;
+
+			} else if ( jQuery.nodeName( this, "select" ) ) {
+				var values = jQuery.makeArray(val);
+
+				jQuery( "option", this ).each(function() {
+					this.selected = jQuery.inArray( jQuery(this).val(), values ) >= 0;
+				});
+
+				if ( !values.length ) {
+					this.selectedIndex = -1;
+				}
+
+			} else {
+				this.value = val;
+			}
+		});
+	}
+});
+
+jQuery.extend({
+	attrFn: {
+		val: true,
+		css: true,
+		html: true,
+		text: true,
+		data: true,
+		width: true,
+		height: true,
+		offset: true
+	},
+		
+	attr: function( elem, name, value, pass ) {
+		// don't set attributes on text and comment nodes
+		if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 ) {
+			return undefined;
+		}
+
+		if ( pass && name in jQuery.attrFn ) {
+			return jQuery(elem)[name](value);
+		}
+
+		var notxml = elem.nodeType !== 1 || !jQuery.isXMLDoc( elem ),
+			// Whether we are setting (or getting)
+			set = value !== undefined;
+
+		// Try to normalize/fix the name
+		name = notxml && jQuery.props[ name ] || name;
+
+		// These attributes require special treatment
+		var special = rspecialurl.test( name );
+
+		// Safari mis-reports the default selected property of an option
+		// Accessing the parent's selectedIndex property fixes it
+		if ( name === "selected" && !jQuery.support.optSelected ) {
+			var parent = elem.parentNode;
+			if ( parent ) {
+				parent.selectedIndex;
+
+				// Make sure that it also works with optgroups, see #5701
+				if ( parent.parentNode ) {
+					parent.parentNode.selectedIndex;
+				}
+			}
+		}
+
+		// If applicable, access the attribute via the DOM 0 way
+		// 'in' checks fail in Blackberry 4.7 #6931
+		if ( (name in elem || elem[ name ] !== undefined) && notxml && !special ) {
+			if ( set ) {
+				// We can't allow the type property to be changed (since it causes problems in IE)
+				if ( name === "type" && rtype.test( elem.nodeName ) && elem.parentNode ) {
+					jQuery.error( "type property can't be changed" );
+				}
+
+				if ( value === null ) {
+					if ( elem.nodeType === 1 ) {
+						elem.removeAttribute( name );
+					}
+
+				} else {
+					elem[ name ] = value;
+				}
+			}
+
+			// browsers index elements by id/name on forms, give priority to attributes.
+			if ( jQuery.nodeName( elem, "form" ) && elem.getAttributeNode(name) ) {
+				return elem.getAttributeNode( name ).nodeValue;
+			}
+
+			// elem.tabIndex doesn't always return the correct value when it hasn't been explicitly set
+			// http://fluidproject.org/blog/2008/01/09/getting-setting-and-removing-tabindex-values-with-javascript/
+			if ( name === "tabIndex" ) {
+				var attributeNode = elem.getAttributeNode( "tabIndex" );
+
+				return attributeNode && attributeNode.specified ?
+					attributeNode.value :
+					rfocusable.test( elem.nodeName ) || rclickable.test( elem.nodeName ) && elem.href ?
+						0 :
+						undefined;
+			}
+
+			return elem[ name ];
+		}
+
+		if ( !jQuery.support.style && notxml && name === "style" ) {
+			if ( set ) {
+				elem.style.cssText = "" + value;
+			}
+
+			return elem.style.cssText;
+		}
+
+		if ( set ) {
+			// convert the value to a string (all browsers do this but IE) see #1070
+			elem.setAttribute( name, "" + value );
+		}
+
+		// Ensure that missing attributes return undefined
+		// Blackberry 4.7 returns "" from getAttribute #6938
+		if ( !elem.attributes[ name ] && (elem.hasAttribute && !elem.hasAttribute( name )) ) {
+			return undefined;
+		}
+
+		var attr = !jQuery.support.hrefNormalized && notxml && special ?
+				// Some attributes require a special call on IE
+				elem.getAttribute( name, 2 ) :
+				elem.getAttribute( name );
+
+		// Non-existent attributes return null, we normalize to undefined
+		return attr === null ? undefined : attr;
+	}
+});
+
+
+
+
+var rnamespaces = /\.(.*)$/,
+	rformElems = /^(?:textarea|input|select)$/i,
+	rperiod = /\./g,
+	rspace = / /g,
+	rescape = /[^\w\s.|`]/g,
+	fcleanup = function( nm ) {
+		return nm.replace(rescape, "\\$&");
+	},
+	focusCounts = { focusin: 0, focusout: 0 };
+
+/*
+ * A number of helper functions used for managing events.
+ * Many of the ideas behind this code originated from
+ * Dean Edwards' addEvent library.
+ */
+jQuery.event = {
+
+	// Bind an event to an element
+	// Original by Dean Edwards
+	add: function( elem, types, handler, data ) {
+		if ( elem.nodeType === 3 || elem.nodeType === 8 ) {
+			return;
+		}
+
+		// For whatever reason, IE has trouble passing the window object
+		// around, causing it to be cloned in the process
+		if ( jQuery.isWindow( elem ) && ( elem !== window && !elem.frameElement ) ) {
+			elem = window;
+		}
+
+		if ( handler === false ) {
+			handler = returnFalse;
+		} else if ( !handler ) {
+			// Fixes bug #7229. Fix recommended by jdalton
+		  return;
+		}
+
+		var handleObjIn, handleObj;
+
+		if ( handler.handler ) {
+			handleObjIn = handler;
+			handler = handleObjIn.handler;
+		}
+
+		// Make sure that the function being executed has a unique ID
+		if ( !handler.guid ) {
+			handler.guid = jQuery.guid++;
+		}
+
+		// Init the element's event structure
+		var elemData = jQuery.data( elem );
+
+		// If no elemData is found then we must be trying to bind to one of the
+		// banned noData elements
+		if ( !elemData ) {
+			return;
+		}
+
+		// Use a key less likely to result in collisions for plain JS objects.
+		// Fixes bug #7150.
+		var eventKey = elem.nodeType ? "events" : "__events__",
+			events = elemData[ eventKey ],
+			eventHandle = elemData.handle;
+			
+		if ( typeof events === "function" ) {
+			// On plain objects events is a fn that holds the the data
+			// which prevents this data from being JSON serialized
+			// the function does not need to be called, it just contains the data
+			eventHandle = events.handle;
+			events = events.events;
+
+		} else if ( !events ) {
+			if ( !elem.nodeType ) {
+				// On plain objects, create a fn that acts as the holder
+				// of the values to avoid JSON serialization of event data
+				elemData[ eventKey ] = elemData = function(){};
+			}
+
+			elemData.events = events = {};
+		}
+
+		if ( !eventHandle ) {
+			elemData.handle = eventHandle = function() {
+				// Handle the second event of a trigger and when
+				// an event is called after a page has unloaded
+				return typeof jQuery !== "undefined" && !jQuery.event.triggered ?
+					jQuery.event.handle.apply( eventHandle.elem, arguments ) :
+					undefined;
+			};
+		}
+
+		// Add elem as a property of the handle function
+		// This is to prevent a memory leak with non-native events in IE.
+		eventHandle.elem = elem;
+
+		// Handle multiple events separated by a space
+		// jQuery(...).bind("mouseover mouseout", fn);
+		types = types.split(" ");
+
+		var type, i = 0, namespaces;
+
+		while ( (type = types[ i++ ]) ) {
+			handleObj = handleObjIn ?
+				jQuery.extend({}, handleObjIn) :
+				{ handler: handler, data: data };
+
+			// Namespaced event handlers
+			if ( type.indexOf(".") > -1 ) {
+				namespaces = type.split(".");
+				type = namespaces.shift();
+				handleObj.namespace = namespaces.slice(0).sort().join(".");
+
+			} else {
+				namespaces = [];
+				handleObj.namespace = "";
+			}
+
+			handleObj.type = type;
+			if ( !handleObj.guid ) {
+				handleObj.guid = handler.guid;
+			}
+
+			// Get the current list of functions bound to this event
+			var handlers = events[ type ],
+				special = jQuery.event.special[ type ] || {};
+
+			// Init the event handler queue
+			if ( !handlers ) {
+				handlers = events[ type ] = [];
+
+				// Check for a special event handler
+				// Only use addEventListener/attachEvent if the special
+				// events handler returns false
+				if ( !special.setup || special.setup.call( elem, data, namespaces, eventHandle ) === false ) {
+					// Bind the global event handler to the element
+					if ( elem.addEventListener ) {
+						elem.addEventListener( type, eventHandle, false );
+
+					} else if ( elem.attachEvent ) {
+						elem.attachEvent( "on" + type, eventHandle );
+					}
+				}
+			}
+			
+			if ( special.add ) { 
+				special.add.call( elem, handleObj ); 
+
+				if ( !handleObj.handler.guid ) {
+					handleObj.handler.guid = handler.guid;
+				}
+			}
+
+			// Add the function to the element's handler list
+			handlers.push( handleObj );
+
+			// Keep track of which events have been used, for global triggering
+			jQuery.event.global[ type ] = true;
+		}
+
+		// Nullify elem to prevent memory leaks in IE
+		elem = null;
+	},
+
+	global: {},
+
+	// Detach an event or set of events from an element
+	remove: function( elem, types, handler, pos ) {
+		// don't do events on text and comment nodes
+		if ( elem.nodeType === 3 || elem.nodeType === 8 ) {
+			return;
+		}
+
+		if ( handler === false ) {
+			handler = returnFalse;
+		}
+
+		var ret, type, fn, j, i = 0, all, namespaces, namespace, special, eventType, handleObj, origType,
+			eventKey = elem.nodeType ? "events" : "__events__",
+			elemData = jQuery.data( elem ),
+			events = elemData && elemData[ eventKey ];
+
+		if ( !elemData || !events ) {
+			return;
+		}
+		
+		if ( typeof events === "function" ) {
+			elemData = events;
+			events = events.events;
+		}
+
+		// types is actually an event object here
+		if ( types && types.type ) {
+			handler = types.handler;
+			types = types.type;
+		}
+
+		// Unbind all events for the element
+		if ( !types || typeof types === "string" && types.charAt(0) === "." ) {
+			types = types || "";
+
+			for ( type in events ) {
+				jQuery.event.remove( elem, type + types );
+			}
+
+			return;
+		}
+
+		// Handle multiple events separated by a space
+		// jQuery(...).unbind("mouseover mouseout", fn);
+		types = types.split(" ");
+
+		while ( (type = types[ i++ ]) ) {
+			origType = type;
+			handleObj = null;
+			all = type.indexOf(".") < 0;
+			namespaces = [];
+
+			if ( !all ) {
+				// Namespaced event handlers
+				namespaces = type.split(".");
+				type = namespaces.shift();
+
+				namespace = new RegExp("(^|\\.)" + 
+					jQuery.map( namespaces.slice(0).sort(), fcleanup ).join("\\.(?:.*\\.)?") + "(\\.|$)");
+			}
+
+			eventType = events[ type ];
+
+			if ( !eventType ) {
+				continue;
+			}
+
+			if ( !handler ) {
+				for ( j = 0; j < eventType.length; j++ ) {
+					handleObj = eventType[ j ];
+
+					if ( all || namespace.test( handleObj.namespace ) ) {
+						jQuery.event.remove( elem, origType, handleObj.handler, j );
+						eventType.splice( j--, 1 );
+					}
+				}
+
+				continue;
+			}
+
+			special = jQuery.event.special[ type ] || {};
+
+			for ( j = pos || 0; j < eventType.length; j++ ) {
+				handleObj = eventType[ j ];
+
+				if ( handler.guid === handleObj.guid ) {
+					// remove the given handler for the given type
+					if ( all || namespace.test( handleObj.namespace ) ) {
+						if ( pos == null ) {
+							eventType.splice( j--, 1 );
+						}
+
+						if ( special.remove ) {
+							special.remove.call( elem, handleObj );
+						}
+					}
+
+					if ( pos != null ) {
+						break;
+					}
+				}
+			}
+
+			// remove generic event handler if no more handlers exist
+			if ( eventType.length === 0 || pos != null && eventType.length === 1 ) {
+				if ( !special.teardown || special.teardown.call( elem, namespaces ) === false ) {
+					jQuery.removeEvent( elem, type, elemData.handle );
+				}
+
+				ret = null;
+				delete events[ type ];
+			}
+		}
+
+		// Remove the expando if it's no longer used
+		if ( jQuery.isEmptyObject( events ) ) {
+			var handle = elemData.handle;
+			if ( handle ) {
+				handle.elem = null;
+			}
+
+			delete elemData.events;
+			delete elemData.handle;
+
+			if ( typeof elemData === "function" ) {
+				jQuery.removeData( elem, eventKey );
+
+			} else if ( jQuery.isEmptyObject( elemData ) ) {
+				jQuery.removeData( elem );
+			}
+		}
+	},
+
+	// bubbling is internal
+	trigger: function( event, data, elem /*, bubbling */ ) {
+		// Event object or event type
+		var type = event.type || event,
+			bubbling = arguments[3];
+
+		if ( !bubbling ) {
+			event = typeof event === "object" ?
+				// jQuery.Event object
+				event[ jQuery.expando ] ? event :
+				// Object literal
+				jQuery.extend( jQuery.Event(type), event ) :
+				// Just the event type (string)
+				jQuery.Event(type);
+
+			if ( type.indexOf("!") >= 0 ) {
+				event.type = type = type.slice(0, -1);
+				event.exclusive = true;
+			}
+
+			// Handle a global trigger
+			if ( !elem ) {
+				// Don't bubble custom events when global (to avoid too much overhead)
+				event.stopPropagation();
+
+				// Only trigger if we've ever bound an event for it
+				if ( jQuery.event.global[ type ] ) {
+					jQuery.each( jQuery.cache, function() {
+						if ( this.events && this.events[type] ) {
+							jQuery.event.trigger( event, data, this.handle.elem );
+						}
+					});
+				}
+			}
+
+			// Handle triggering a single element
+
+			// don't do events on text and comment nodes
+			if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 ) {
+				return undefined;
+			}
+
+			// Clean up in case it is reused
+			event.result = undefined;
+			event.target = elem;
+
+			// Clone the incoming data, if any
+			data = jQuery.makeArray( data );
+			data.unshift( event );
+		}
+
+		event.currentTarget = elem;
+
+		// Trigger the event, it is assumed that "handle" is a function
+		var handle = elem.nodeType ?
+			jQuery.data( elem, "handle" ) :
+			(jQuery.data( elem, "__events__" ) || {}).handle;
+
+		if ( handle ) {
+			handle.apply( elem, data );
+		}
+
+		var parent = elem.parentNode || elem.ownerDocument;
+
+		// Trigger an inline bound script
+		try {
+			if ( !(elem && elem.nodeName && jQuery.noData[elem.nodeName.toLowerCase()]) ) {
+				if ( elem[ "on" + type ] && elem[ "on" + type ].apply( elem, data ) === false ) {
+					event.result = false;
+					event.preventDefault();
+				}
+			}
+
+		// prevent IE from throwing an error for some elements with some event types, see #3533
+		} catch (inlineError) {}
+
+		if ( !event.isPropagationStopped() && parent ) {
+			jQuery.event.trigger( event, data, parent, true );
+
+		} else if ( !event.isDefaultPrevented() ) {
+			var old,
+				target = event.target,
+				targetType = type.replace( rnamespaces, "" ),
+				isClick = jQuery.nodeName( target, "a" ) && targetType === "click",
+				special = jQuery.event.special[ targetType ] || {};
+
+			if ( (!special._default || special._default.call( elem, event ) === false) && 
+				!isClick && !(target && target.nodeName && jQuery.noData[target.nodeName.toLowerCase()]) ) {
+
+				try {
+					if ( target[ targetType ] ) {
+						// Make sure that we don't accidentally re-trigger the onFOO events
+						old = target[ "on" + targetType ];
+
+						if ( old ) {
+							target[ "on" + targetType ] = null;
+						}
+
+						jQuery.event.triggered = true;
+						target[ targetType ]();
+					}
+
+				// prevent IE from throwing an error for some elements with some event types, see #3533
+				} catch (triggerError) {}
+
+				if ( old ) {
+					target[ "on" + targetType ] = old;
+				}
+
+				jQuery.event.triggered = false;
+			}
+		}
+	},
+
+	handle: function( event ) {
+		var all, handlers, namespaces, namespace_re, events,
+			namespace_sort = [],
+			args = jQuery.makeArray( arguments );
+
+		event = args[0] = jQuery.event.fix( event || window.event );
+		event.currentTarget = this;
+
+		// Namespaced event handlers
+		all = event.type.indexOf(".") < 0 && !event.exclusive;
+
+		if ( !all ) {
+			namespaces = event.type.split(".");
+			event.type = namespaces.shift();
+			namespace_sort = namespaces.slice(0).sort();
+			namespace_re = new RegExp("(^|\\.)" + namespace_sort.join("\\.(?:.*\\.)?") + "(\\.|$)");
+		}
+
+		event.namespace = event.namespace || namespace_sort.join(".");
+
+		events = jQuery.data(this, this.nodeType ? "events" : "__events__");
+
+		if ( typeof events === "function" ) {
+			events = events.events;
+		}
+
+		handlers = (events || {})[ event.type ];
+
+		if ( events && handlers ) {
+			// Clone the handlers to prevent manipulation
+			handlers = handlers.slice(0);
+
+			for ( var j = 0, l = handlers.length; j < l; j++ ) {
+				var handleObj = handlers[ j ];
+
+				// Filter the functions by class
+				if ( all || namespace_re.test( handleObj.namespace ) ) {
+					// Pass in a reference to the handler function itself
+					// So that we can later remove it
+					event.handler = handleObj.handler;
+					event.data = handleObj.data;
+					event.handleObj = handleObj;
+	
+					var ret = handleObj.handler.apply( this, args );
+
+					if ( ret !== undefined ) {
+						event.result = ret;
+						if ( ret === false ) {
+							event.preventDefault();
+							event.stopPropagation();
+						}
+					}
+
+					if ( event.isImmediatePropagationStopped() ) {
+						break;
+					}
+				}
+			}
+		}
+
+		return event.result;
+	},
+
+	props: "altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode layerX layerY metaKey newValue offsetX offsetY pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "),
+
+	fix: function( event ) {
+		if ( event[ jQuery.expando ] ) {
+			return event;
+		}
+
+		// store a copy of the original event object
+		// and "clone" to set read-only properties
+		var originalEvent = event;
+		event = jQuery.Event( originalEvent );
+
+		for ( var i = this.props.length, prop; i; ) {
+			prop = this.props[ --i ];
+			event[ prop ] = originalEvent[ prop ];
+		}
+
+		// Fix target property, if necessary
+		if ( !event.target ) {
+			// Fixes #1925 where srcElement might not be defined either
+			event.target = event.srcElement || document;
+		}
+
+		// check if target is a textnode (safari)
+		if ( event.target.nodeType === 3 ) {
+			event.target = event.target.parentNode;
+		}
+
+		// Add relatedTarget, if necessary
+		if ( !event.relatedTarget && event.fromElement ) {
+			event.relatedTarget = event.fromElement === event.target ? event.toElement : event.fromElement;
+		}
+
+		// Calculate pageX/Y if missing and clientX/Y available
+		if ( event.pageX == null && event.clientX != null ) {
+			var doc = document.documentElement,
+				body = document.body;
+
+			event.pageX = event.clientX + (doc && doc.scrollLeft || body && body.scrollLeft || 0) - (doc && doc.clientLeft || body && body.clientLeft || 0);
+			event.pageY = event.clientY + (doc && doc.scrollTop  || body && body.scrollTop  || 0) - (doc && doc.clientTop  || body && body.clientTop  || 0);
+		}
+
+		// Add which for key events
+		if ( event.which == null && (event.charCode != null || event.keyCode != null) ) {
+			event.which = event.charCode != null ? event.charCode : event.keyCode;
+		}
+
+		// Add metaKey to non-Mac browsers (use ctrl for PC's and Meta for Macs)
+		if ( !event.metaKey && event.ctrlKey ) {
+			event.metaKey = event.ctrlKey;
+		}
+
+		// Add which for click: 1 === left; 2 === middle; 3 === right
+		// Note: button is not normalized, so don't use it
+		if ( !event.which && event.button !== undefined ) {
+			event.which = (event.button & 1 ? 1 : ( event.button & 2 ? 3 : ( event.button & 4 ? 2 : 0 ) ));
+		}
+
+		return event;
+	},
+
+	// Deprecated, use jQuery.guid instead
+	guid: 1E8,
+
+	// Deprecated, use jQuery.proxy instead
+	proxy: jQuery.proxy,
+
+	special: {
+		ready: {
+			// Make sure the ready event is setup
+			setup: jQuery.bindReady,
+			teardown: jQuery.noop
+		},
+
+		live: {
+			add: function( handleObj ) {
+				jQuery.event.add( this,
+					liveConvert( handleObj.origType, handleObj.selector ),
+					jQuery.extend({}, handleObj, {handler: liveHandler, guid: handleObj.handler.guid}) ); 
+			},
+
+			remove: function( handleObj ) {
+				jQuery.event.remove( this, liveConvert( handleObj.origType, handleObj.selector ), handleObj );
+			}
+		},
+
+		beforeunload: {
+			setup: function( data, namespaces, eventHandle ) {
+				// We only want to do this special case on windows
+				if ( jQuery.isWindow( this ) ) {
+					this.onbeforeunload = eventHandle;
+				}
+			},
+
+			teardown: function( namespaces, eventHandle ) {
+				if ( this.onbeforeunload === eventHandle ) {
+					this.onbeforeunload = null;
+				}
+			}
+		}
+	}
+};
+
+jQuery.removeEvent = document.removeEventListener ?
+	function( elem, type, handle ) {
+		if ( elem.removeEventListener ) {
+			elem.removeEventListener( type, handle, false );
+		}
+	} : 
+	function( elem, type, handle ) {
+		if ( elem.detachEvent ) {
+			elem.detachEvent( "on" + type, handle );
+		}
+	};
+
+jQuery.Event = function( src ) {
+	// Allow instantiation without the 'new' keyword
+	if ( !this.preventDefault ) {
+		return new jQuery.Event( src );
+	}
+
+	// Event object
+	if ( src && src.type ) {
+		this.originalEvent = src;
+		this.type = src.type;
+	// Event type
+	} else {
+		this.type = src;
+	}
+
+	// timeStamp is buggy for some events on Firefox(#3843)
+	// So we won't rely on the native value
+	this.timeStamp = jQuery.now();
+
+	// Mark it as fixed
+	this[ jQuery.expando ] = true;
+};
+
+function returnFalse() {
+	return false;
+}
+function returnTrue() {
+	return true;
+}
+
+// jQuery.Event is based on DOM3 Events as specified by the ECMAScript Language Binding
+// http://www.w3.org/TR/2003/WD-DOM-Level-3-Events-20030331/ecma-script-binding.html
+jQuery.Event.prototype = {
+	preventDefault: function() {
+		this.isDefaultPrevented = returnTrue;
+
+		var e = this.originalEvent;
+		if ( !e ) {
+			return;
+		}
+		
+		// if preventDefault exists run it on the original event
+		if ( e.preventDefault ) {
+			e.preventDefault();
+
+		// otherwise set the returnValue property of the original event to false (IE)
+		} else {
+			e.returnValue = false;
+		}
+	},
+	stopPropagation: function() {
+		this.isPropagationStopped = returnTrue;
+
+		var e = this.originalEvent;
+		if ( !e ) {
+			return;
+		}
+		// if stopPropagation exists run it on the original event
+		if ( e.stopPropagation ) {
+			e.stopPropagation();
+		}
+		// otherwise set the cancelBubble property of the original event to true (IE)
+		e.cancelBubble = true;
+	},
+	stopImmediatePropagation: function() {
+		this.isImmediatePropagationStopped = returnTrue;
+		this.stopPropagation();
+	},
+	isDefaultPrevented: returnFalse,
+	isPropagationStopped: returnFalse,
+	isImmediatePropagationStopped: returnFalse
+};
+
+// Checks if an event happened on an element within another element
+// Used in jQuery.event.special.mouseenter and mouseleave handlers
+var withinElement = function( event ) {
+	// Check if mouse(over|out) are still within the same parent element
+	var parent = event.relatedTarget;
+
+	// Firefox sometimes assigns relatedTarget a XUL element
+	// which we cannot access the parentNode property of
+	try {
+		// Traverse up the tree
+		while ( parent && parent !== this ) {
+			parent = parent.parentNode;
+		}
+
+		if ( parent !== this ) {
+			// set the correct event type
+			event.type = event.data;
+
+			// handle event if we actually just moused on to a non sub-element
+			jQuery.event.handle.apply( this, arguments );
+		}
+
+	// assuming we've left the element since we most likely mousedover a xul element
+	} catch(e) { }
+},
+
+// In case of event delegation, we only need to rename the event.type,
+// liveHandler will take care of the rest.
+delegate = function( event ) {
+	event.type = event.data;
+	jQuery.event.handle.apply( this, arguments );
+};
+
+// Create mouseenter and mouseleave events
+jQuery.each({
+	mouseenter: "mouseover",
+	mouseleave: "mouseout"
+}, function( orig, fix ) {
+	jQuery.event.special[ orig ] = {
+		setup: function( data ) {
+			jQuery.event.add( this, fix, data && data.selector ? delegate : withinElement, orig );
+		},
+		teardown: function( data ) {
+			jQuery.event.remove( this, fix, data && data.selector ? delegate : withinElement );
+		}
+	};
+});
+
+// submit delegation
+if ( !jQuery.support.submitBubbles ) {
+
+	jQuery.event.special.submit = {
+		setup: function( data, namespaces ) {
+			if ( this.nodeName.toLowerCase() !== "form" ) {
+				jQuery.event.add(this, "click.specialSubmit", function( e ) {
+					var elem = e.target,
+						type = elem.type;
+
+					if ( (type === "submit" || type === "image") && jQuery( elem ).closest("form").length ) {
+						e.liveFired = undefined;
+						return trigger( "submit", this, arguments );
+					}
+				});
+	 
+				jQuery.event.add(this, "keypress.specialSubmit", function( e ) {
+					var elem = e.target,
+						type = elem.type;
+
+					if ( (type === "text" || type === "password") && jQuery( elem ).closest("form").length && e.keyCode === 13 ) {
+						e.liveFired = undefined;
+						return trigger( "submit", this, arguments );
+					}
+				});
+
+			} else {
+				return false;
+			}
+		},
+
+		teardown: function( namespaces ) {
+			jQuery.event.remove( this, ".specialSubmit" );
+		}
+	};
+
+}
+
+// change delegation, happens here so we have bind.
+if ( !jQuery.support.changeBubbles ) {
+
+	var changeFilters,
+
+	getVal = function( elem ) {
+		var type = elem.type, val = elem.value;
+
+		if ( type === "radio" || type === "checkbox" ) {
+			val = elem.checked;
+
+		} else if ( type === "select-multiple" ) {
+			val = elem.selectedIndex > -1 ?
+				jQuery.map( elem.options, function( elem ) {
+					return elem.selected;
+				}).join("-") :
+				"";
+
+		} else if ( elem.nodeName.toLowerCase() === "select" ) {
+			val = elem.selectedIndex;
+		}
+
+		return val;
+	},
+
+	testChange = function testChange( e ) {
+		var elem = e.target, data, val;
+
+		if ( !rformElems.test( elem.nodeName ) || elem.readOnly ) {
+			return;
+		}
+
+		data = jQuery.data( elem, "_change_data" );
+		val = getVal(elem);
+
+		// the current data will be also retrieved by beforeactivate
+		if ( e.type !== "focusout" || elem.type !== "radio" ) {
+			jQuery.data( elem, "_change_data", val );
+		}
+		
+		if ( data === undefined || val === data ) {
+			return;
+		}
+
+		if ( data != null || val ) {
+			e.type = "change";
+			e.liveFired = undefined;
+			return jQuery.event.trigger( e, arguments[1], elem );
+		}
+	};
+
+	jQuery.event.special.change = {
+		filters: {
+			focusout: testChange, 
+
+			beforedeactivate: testChange,
+
+			click: function( e ) {
+				var elem = e.target, type = elem.type;
+
+				if ( type === "radio" || type === "checkbox" || elem.nodeName.toLowerCase() === "select" ) {
+					return testChange.call( this, e );
+				}
+			},
+
+			// Change has to be called before submit
+			// Keydown will be called before keypress, which is used in submit-event delegation
+			keydown: function( e ) {
+				var elem = e.target, type = elem.type;
+
+				if ( (e.keyCode === 13 && elem.nodeName.toLowerCase() !== "textarea") ||
+					(e.keyCode === 32 && (type === "checkbox" || type === "radio")) ||
+					type === "select-multiple" ) {
+					return testChange.call( this, e );
+				}
+			},
+
+			// Beforeactivate happens also before the previous element is blurred
+			// with this event you can't trigger a change event, but you can store
+			// information
+			beforeactivate: function( e ) {
+				var elem = e.target;
+				jQuery.data( elem, "_change_data", getVal(elem) );
+			}
+		},
+
+		setup: function( data, namespaces ) {
+			if ( this.type === "file" ) {
+				return false;
+			}
+
+			for ( var type in changeFilters ) {
+				jQuery.event.add( this, type + ".specialChange", changeFilters[type] );
+			}
+
+			return rformElems.test( this.nodeName );
+		},
+
+		teardown: function( namespaces ) {
+			jQuery.event.remove( this, ".specialChange" );
+
+			return rformElems.test( this.nodeName );
+		}
+	};
+
+	changeFilters = jQuery.event.special.change.filters;
+
+	// Handle when the input is .focus()'d
+	changeFilters.focus = changeFilters.beforeactivate;
+}
+
+function trigger( type, elem, args ) {
+	args[0].type = type;
+	return jQuery.event.handle.apply( elem, args );
+}
+
+// Create "bubbling" focus and blur events
+if ( document.addEventListener ) {
+	jQuery.each({ focus: "focusin", blur: "focusout" }, function( orig, fix ) {
+		jQuery.event.special[ fix ] = {
+			setup: function() {
+				if ( focusCounts[fix]++ === 0 ) {
+					document.addEventListener( orig, handler, true );
+				}
+			}, 
+			teardown: function() { 
+				if ( --focusCounts[fix] === 0 ) {
+					document.removeEventListener( orig, handler, true );
+				}
+			}
+		};
+
+		function handler( e ) { 
+			e = jQuery.event.fix( e );
+			e.type = fix;
+			return jQuery.event.trigger( e, null, e.target );
+		}
+	});
+}
+
+jQuery.each(["bind", "one"], function( i, name ) {
+	jQuery.fn[ name ] = function( type, data, fn ) {
+		// Handle object literals
+		if ( typeof type === "object" ) {
+			for ( var key in type ) {
+				this[ name ](key, data, type[key], fn);
+			}
+			return this;
+		}
+		
+		if ( jQuery.isFunction( data ) || data === false ) {
+			fn = data;
+			data = undefined;
+		}
+
+		var handler = name === "one" ? jQuery.proxy( fn, function( event ) {
+			jQuery( this ).unbind( event, handler );
+			return fn.apply( this, arguments );
+		}) : fn;
+
+		if ( type === "unload" && name !== "one" ) {
+			this.one( type, data, fn );
+
+		} else {
+			for ( var i = 0, l = this.length; i < l; i++ ) {
+				jQuery.event.add( this[i], type, handler, data );
+			}
+		}
+
+		return this;
+	};
+});
+
+jQuery.fn.extend({
+	unbind: function( type, fn ) {
+		// Handle object literals
+		if ( typeof type === "object" && !type.preventDefault ) {
+			for ( var key in type ) {
+				this.unbind(key, type[key]);
+			}
+
+		} else {
+			for ( var i = 0, l = this.length; i < l; i++ ) {
+				jQuery.event.remove( this[i], type, fn );
+			}
+		}
+
+		return this;
+	},
+	
+	delegate: function( selector, types, data, fn ) {
+		return this.live( types, data, fn, selector );
+	},
+	
+	undelegate: function( selector, types, fn ) {
+		if ( arguments.length === 0 ) {
+				return this.unbind( "live" );
+		
+		} else {
+			return this.die( types, null, fn, selector );
+		}
+	},
+	
+	trigger: function( type, data ) {
+		return this.each(function() {
+			jQuery.event.trigger( type, data, this );
+		});
+	},
+
+	triggerHandler: function( type, data ) {
+		if ( this[0] ) {
+			var event = jQuery.Event( type );
+			event.preventDefault();
+			event.stopPropagation();
+			jQuery.event.trigger( event, data, this[0] );
+			return event.result;
+		}
+	},
+
+	toggle: function( fn ) {
+		// Save reference to arguments for access in closure
+		var args = arguments,
+			i = 1;
+
+		// link all the functions, so any of them can unbind this click handler
+		while ( i < args.length ) {
+			jQuery.proxy( fn, args[ i++ ] );
+		}
+
+		return this.click( jQuery.proxy( fn, function( event ) {
+			// Figure out which function to execute
+			var lastToggle = ( jQuery.data( this, "lastToggle" + fn.guid ) || 0 ) % i;
+			jQuery.data( this, "lastToggle" + fn.guid, lastToggle + 1 );
+
+			// Make sure that clicks stop
+			event.preventDefault();
+
+			// and execute the function
+			return args[ lastToggle ].apply( this, arguments ) || false;
+		}));
+	},
+
+	hover: function( fnOver, fnOut ) {
+		return this.mouseenter( fnOver ).mouseleave( fnOut || fnOver );
+	}
+});
+
+var liveMap = {
+	focus: "focusin",
+	blur: "focusout",
+	mouseenter: "mouseover",
+	mouseleave: "mouseout"
+};
+
+jQuery.each(["live", "die"], function( i, name ) {
+	jQuery.fn[ name ] = function( types, data, fn, origSelector /* Internal Use Only */ ) {
+		var type, i = 0, match, namespaces, preType,
+			selector = origSelector || this.selector,
+			context = origSelector ? this : jQuery( this.context );
+		
+		if ( typeof types === "object" && !types.preventDefault ) {
+			for ( var key in types ) {
+				context[ name ]( key, data, types[key], selector );
+			}
+			
+			return this;
+		}
+
+		if ( jQuery.isFunction( data ) ) {
+			fn = data;
+			data = undefined;
+		}
+
+		types = (types || "").split(" ");
+
+		while ( (type = types[ i++ ]) != null ) {
+			match = rnamespaces.exec( type );
+			namespaces = "";
+
+			if ( match )  {
+				namespaces = match[0];
+				type = type.replace( rnamespaces, "" );
+			}
+
+			if ( type === "hover" ) {
+				types.push( "mouseenter" + namespaces, "mouseleave" + namespaces );
+				continue;
+			}
+
+			preType = type;
+
+			if ( type === "focus" || type === "blur" ) {
+				types.push( liveMap[ type ] + namespaces );
+				type = type + namespaces;
+
+			} else {
+				type = (liveMap[ type ] || type) + namespaces;
+			}
+
+			if ( name === "live" ) {
+				// bind live handler
+				for ( var j = 0, l = context.length; j < l; j++ ) {
+					jQuery.event.add( context[j], "live." + liveConvert( type, selector ),
+						{ data: data, selector: selector, handler: fn, origType: type, origHandler: fn, preType: preType } );
+				}
+
+			} else {
+				// unbind live handler
+				context.unbind( "live." + liveConvert( type, selector ), fn );
+			}
+		}
+		
+		return this;
+	};
+});
+
+function liveHandler( event ) {
+	var stop, maxLevel, related, match, handleObj, elem, j, i, l, data, close, namespace, ret,
+		elems = [],
+		selectors = [],
+		events = jQuery.data( this, this.nodeType ? "events" : "__events__" );
+
+	if ( typeof events === "function" ) {
+		events = events.events;
+	}
+
+	// Make sure we avoid non-left-click bubbling in Firefox (#3861)
+	if ( event.liveFired === this || !events || !events.live || event.button && event.type === "click" ) {
+		return;
+	}
+	
+	if ( event.namespace ) {
+		namespace = new RegExp("(^|\\.)" + event.namespace.split(".").join("\\.(?:.*\\.)?") + "(\\.|$)");
+	}
+
+	event.liveFired = this;
+
+	var live = events.live.slice(0);
+
+	for ( j = 0; j < live.length; j++ ) {
+		handleObj = live[j];
+
+		if ( handleObj.origType.replace( rnamespaces, "" ) === event.type ) {
+			selectors.push( handleObj.selector );
+
+		} else {
+			live.splice( j--, 1 );
+		}
+	}
+
+	match = jQuery( event.target ).closest( selectors, event.currentTarget );
+
+	for ( i = 0, l = match.length; i < l; i++ ) {
+		close = match[i];
+
+		for ( j = 0; j < live.length; j++ ) {
+			handleObj = live[j];
+
+			if ( close.selector === handleObj.selector && (!namespace || namespace.test( handleObj.namespace )) ) {
+				elem = close.elem;
+				related = null;
+
+				// Those two events require additional checking
+				if ( handleObj.preType === "mouseenter" || handleObj.preType === "mouseleave" ) {
+					event.type = handleObj.preType;
+					related = jQuery( event.relatedTarget ).closest( handleObj.selector )[0];
+				}
+
+				if ( !related || related !== elem ) {
+					elems.push({ elem: elem, handleObj: handleObj, level: close.level });
+				}
+			}
+		}
+	}
+
+	for ( i = 0, l = elems.length; i < l; i++ ) {
+		match = elems[i];
+
+		if ( maxLevel && match.level > maxLevel ) {
+			break;
+		}
+
+		event.currentTarget = match.elem;
+		event.data = match.handleObj.data;
+		event.handleObj = match.handleObj;
+
+		ret = match.handleObj.origHandler.apply( match.elem, arguments );
+
+		if ( ret === false || event.isPropagationStopped() ) {
+			maxLevel = match.level;
+
+			if ( ret === false ) {
+				stop = false;
+			}
+			if ( event.isImmediatePropagationStopped() ) {
+				break;
+			}
+		}
+	}
+
+	return stop;
+}
+
+function liveConvert( type, selector ) {
+	return (type && type !== "*" ? type + "." : "") + selector.replace(rperiod, "`").replace(rspace, "&");
+}
+
+jQuery.each( ("blur focus focusin focusout load resize scroll unload click dblclick " +
+	"mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave " +
+	"change select submit keydown keypress keyup error").split(" "), function( i, name ) {
+
+	// Handle event binding
+	jQuery.fn[ name ] = function( data, fn ) {
+		if ( fn == null ) {
+			fn = data;
+			data = null;
+		}
+
+		return arguments.length > 0 ?
+			this.bind( name, data, fn ) :
+			this.trigger( name );
+	};
+
+	if ( jQuery.attrFn ) {
+		jQuery.attrFn[ name ] = true;
+	}
+});
+
+// Prevent memory leaks in IE
+// Window isn't included so as not to unbind existing unload events
+// More info:
+//  - http://isaacschlueter.com/2006/10/msie-memory-leaks/
+if ( window.attachEvent && !window.addEventListener ) {
+	jQuery(window).bind("unload", function() {
+		for ( var id in jQuery.cache ) {
+			if ( jQuery.cache[ id ].handle ) {
+				// Try/Catch is to handle iframes being unloaded, see #4280
+				try {
+					jQuery.event.remove( jQuery.cache[ id ].handle.elem );
+				} catch(e) {}
+			}
+		}
+	});
+}
+
+
+/*!
+ * Sizzle CSS Selector Engine - v1.0
+ *  Copyright 2009, The Dojo Foundation
+ *  Released under the MIT, BSD, and GPL Licenses.
+ *  More information: http://sizzlejs.com/
+ */
+(function(){
+
+var chunker = /((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,
+	done = 0,
+	toString = Object.prototype.toString,
+	hasDuplicate = false,
+	baseHasDuplicate = true;
+
+// Here we check if the JavaScript engine is using some sort of
+// optimization where it does not always call our comparision
+// function. If that is the case, discard the hasDuplicate value.
+//   Thus far that includes Google Chrome.
+[0, 0].sort(function() {
+	baseHasDuplicate = false;
+	return 0;
+});
+
+var Sizzle = function( selector, context, results, seed ) {
+	results = results || [];
+	context = context || document;
+
+	var origContext = context;
+
+	if ( context.nodeType !== 1 && context.nodeType !== 9 ) {
+		return [];
+	}
+	
+	if ( !selector || typeof selector !== "string" ) {
+		return results;
+	}
+
+	var m, set, checkSet, extra, ret, cur, pop, i,
+		prune = true,
+		contextXML = Sizzle.isXML( context ),
+		parts = [],
+		soFar = selector;
+	
+	// Reset the position of the chunker regexp (start from head)
+	do {
+		chunker.exec( "" );
+		m = chunker.exec( soFar );
+
+		if ( m ) {
+			soFar = m[3];
+		
+			parts.push( m[1] );
+		
+			if ( m[2] ) {
+				extra = m[3];
+				break;
+			}
+		}
+	} while ( m );
+
+	if ( parts.length > 1 && origPOS.exec( selector ) ) {
+
+		if ( parts.length === 2 && Expr.relative[ parts[0] ] ) {
+			set = posProcess( parts[0] + parts[1], context );
+
+		} else {
+			set = Expr.relative[ parts[0] ] ?
+				[ context ] :
+				Sizzle( parts.shift(), context );
+
+			while ( parts.length ) {
+				selector = parts.shift();
+
+				if ( Expr.relative[ selector ] ) {
+					selector += parts.shift();
+				}
+				
+				set = posProcess( selector, set );
+			}
+		}
+
+	} else {
+		// Take a shortcut and set the context if the root selector is an ID
+		// (but not if it'll be faster if the inner selector is an ID)
+		if ( !seed && parts.length > 1 && context.nodeType === 9 && !contextXML &&
+				Expr.match.ID.test(parts[0]) && !Expr.match.ID.test(parts[parts.length - 1]) ) {
+
+			ret = Sizzle.find( parts.shift(), context, contextXML );
+			context = ret.expr ?
+				Sizzle.filter( ret.expr, ret.set )[0] :
+				ret.set[0];
+		}
+
+		if ( context ) {
+			ret = seed ?
+				{ expr: parts.pop(), set: makeArray(seed) } :
+				Sizzle.find( parts.pop(), parts.length === 1 && (parts[0] === "~" || parts[0] === "+") && context.parentNode ? context.parentNode : context, contextXML );
+
+			set = ret.expr ?
+				Sizzle.filter( ret.expr, ret.set ) :
+				ret.set;
+
+			if ( parts.length > 0 ) {
+				checkSet = makeArray( set );
+
+			} else {
+				prune = false;
+			}
+
+			while ( parts.length ) {
+				cur = parts.pop();
+				pop = cur;
+
+				if ( !Expr.relative[ cur ] ) {
+					cur = "";
+				} else {
+					pop = parts.pop();
+				}
+
+				if ( pop == null ) {
+					pop = context;
+				}
+
+				Expr.relative[ cur ]( checkSet, pop, contextXML );
+			}
+
+		} else {
+			checkSet = parts = [];
+		}
+	}
+
+	if ( !checkSet ) {
+		checkSet = set;
+	}
+
+	if ( !checkSet ) {
+		Sizzle.error( cur || selector );
+	}
+
+	if ( toString.call(checkSet) === "[object Array]" ) {
+		if ( !prune ) {
+			results.push.apply( results, checkSet );
+
+		} else if ( context && context.nodeType === 1 ) {
+			for ( i = 0; checkSet[i] != null; i++ ) {
+				if ( checkSet[i] && (checkSet[i] === true || checkSet[i].nodeType === 1 && Sizzle.contains(context, checkSet[i])) ) {
+					results.push( set[i] );
+				}
+			}
+
+		} else {
+			for ( i = 0; checkSet[i] != null; i++ ) {
+				if ( checkSet[i] && checkSet[i].nodeType === 1 ) {
+					results.push( set[i] );
+				}
+			}
+		}
+
+	} else {
+		makeArray( checkSet, results );
+	}
+
+	if ( extra ) {
+		Sizzle( extra, origContext, results, seed );
+		Sizzle.uniqueSort( results );
+	}
+
+	return results;
+};
+
+Sizzle.uniqueSort = function( results ) {
+	if ( sortOrder ) {
+		hasDuplicate = baseHasDuplicate;
+		results.sort( sortOrder );
+
+		if ( hasDuplicate ) {
+			for ( var i = 1; i < results.length; i++ ) {
+				if ( results[i] === results[ i - 1 ] ) {
+					results.splice( i--, 1 );
+				}
+			}
+		}
+	}
+
+	return results;
+};
+
+Sizzle.matches = function( expr, set ) {
+	return Sizzle( expr, null, null, set );
+};
+
+Sizzle.matchesSelector = function( node, expr ) {
+	return Sizzle( expr, null, null, [node] ).length > 0;
+};
+
+Sizzle.find = function( expr, context, isXML ) {
+	var set;
+
+	if ( !expr ) {
+		return [];
+	}
+
+	for ( var i = 0, l = Expr.order.length; i < l; i++ ) {
+		var match,
+			type = Expr.order[i];
+		
+		if ( (match = Expr.leftMatch[ type ].exec( expr )) ) {
+			var left = match[1];
+			match.splice( 1, 1 );
+
+			if ( left.substr( left.length - 1 ) !== "\\" ) {
+				match[1] = (match[1] || "").replace(/\\/g, "");
+				set = Expr.find[ type ]( match, context, isXML );
+
+				if ( set != null ) {
+					expr = expr.replace( Expr.match[ type ], "" );
+					break;
+				}
+			}
+		}
+	}
+
+	if ( !set ) {
+		set = context.getElementsByTagName( "*" );
+	}
+
+	return { set: set, expr: expr };
+};
+
+Sizzle.filter = function( expr, set, inplace, not ) {
+	var match, anyFound,
+		old = expr,
+		result = [],
+		curLoop = set,
+		isXMLFilter = set && set[0] && Sizzle.isXML( set[0] );
+
+	while ( expr && set.length ) {
+		for ( var type in Expr.filter ) {
+			if ( (match = Expr.leftMatch[ type ].exec( expr )) != null && match[2] ) {
+				var found, item,
+					filter = Expr.filter[ type ],
+					left = match[1];
+
+				anyFound = false;
+
+				match.splice(1,1);
+
+				if ( left.substr( left.length - 1 ) === "\\" ) {
+					continue;
+				}
+
+				if ( curLoop === result ) {
+					result = [];
+				}
+
+				if ( Expr.preFilter[ type ] ) {
+					match = Expr.preFilter[ type ]( match, curLoop, inplace, result, not, isXMLFilter );
+
+					if ( !match ) {
+						anyFound = found = true;
+
+					} else if ( match === true ) {
+						continue;
+					}
+				}
+
+				if ( match ) {
+					for ( var i = 0; (item = curLoop[i]) != null; i++ ) {
+						if ( item ) {
+							found = filter( item, match, i, curLoop );
+							var pass = not ^ !!found;
+
+							if ( inplace && found != null ) {
+								if ( pass ) {
+									anyFound = true;
+
+								} else {
+									curLoop[i] = false;
+								}
+
+							} else if ( pass ) {
+								result.push( item );
+								anyFound = true;
+							}
+						}
+					}
+				}
+
+				if ( found !== undefined ) {
+					if ( !inplace ) {
+						curLoop = result;
+					}
+
+					expr = expr.replace( Expr.match[ type ], "" );
+
+					if ( !anyFound ) {
+						return [];
+					}
+
+					break;
+				}
+			}
+		}
+
+		// Improper expression
+		if ( expr === old ) {
+			if ( anyFound == null ) {
+				Sizzle.error( expr );
+
+			} else {
+				break;
+			}
+		}
+
+		old = expr;
+	}
+
+	return curLoop;
+};
+
+Sizzle.error = function( msg ) {
+	throw "Syntax error, unrecognized expression: " + msg;
+};
+
+var Expr = Sizzle.selectors = {
+	order: [ "ID", "NAME", "TAG" ],
+
+	match: {
+		ID: /#((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,
+		CLASS: /\.((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,
+		NAME: /\[name=['"]*((?:[\w\u00c0-\uFFFF\-]|\\.)+)['"]*\]/,
+		ATTR: /\[\s*((?:[\w\u00c0-\uFFFF\-]|\\.)+)\s*(?:(\S?=)\s*(['"]*)(.*?)\3|)\s*\]/,
+		TAG: /^((?:[\w\u00c0-\uFFFF\*\-]|\\.)+)/,
+		CHILD: /:(only|nth|last|first)-child(?:\((even|odd|[\dn+\-]*)\))?/,
+		POS: /:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^\-]|$)/,
+		PSEUDO: /:((?:[\w\u00c0-\uFFFF\-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/
+	},
+
+	leftMatch: {},
+
+	attrMap: {
+		"class": "className",
+		"for": "htmlFor"
+	},
+
+	attrHandle: {
+		href: function( elem ) {
+			return elem.getAttribute( "href" );
+		}
+	},
+
+	relative: {
+		"+": function(checkSet, part){
+			var isPartStr = typeof part === "string",
+				isTag = isPartStr && !/\W/.test( part ),
+				isPartStrNotTag = isPartStr && !isTag;
+
+			if ( isTag ) {
+				part = part.toLowerCase();
+			}
+
+			for ( var i = 0, l = checkSet.length, elem; i < l; i++ ) {
+				if ( (elem = checkSet[i]) ) {
+					while ( (elem = elem.previousSibling) && elem.nodeType !== 1 ) {}
+
+					checkSet[i] = isPartStrNotTag || elem && elem.nodeName.toLowerCase() === part ?
+						elem || false :
+						elem === part;
+				}
+			}
+
+			if ( isPartStrNotTag ) {
+				Sizzle.filter( part, checkSet, true );
+			}
+		},
+
+		">": function( checkSet, part ) {
+			var elem,
+				isPartStr = typeof part === "string",
+				i = 0,
+				l = checkSet.length;
+
+			if ( isPartStr && !/\W/.test( part ) ) {
+				part = part.toLowerCase();
+
+				for ( ; i < l; i++ ) {
+					elem = checkSet[i];
+
+					if ( elem ) {
+						var parent = elem.parentNode;
+						checkSet[i] = parent.nodeName.toLowerCase() === part ? parent : false;
+					}
+				}
+
+			} else {
+				for ( ; i < l; i++ ) {
+					elem = checkSet[i];
+
+					if ( elem ) {
+						checkSet[i] = isPartStr ?
+							elem.parentNode :
+							elem.parentNode === part;
+					}
+				}
+
+				if ( isPartStr ) {
+					Sizzle.filter( part, checkSet, true );
+				}
+			}
+		},
+
+		"": function(checkSet, part, isXML){
+			var nodeCheck,
+				doneName = done++,
+				checkFn = dirCheck;
+
+			if ( typeof part === "string" && !/\W/.test(part) ) {
+				part = part.toLowerCase();
+				nodeCheck = part;
+				checkFn = dirNodeCheck;
+			}
+
+			checkFn( "parentNode", part, doneName, checkSet, nodeCheck, isXML );
+		},
+
+		"~": function( checkSet, part, isXML ) {
+			var nodeCheck,
+				doneName = done++,
+				checkFn = dirCheck;
+
+			if ( typeof part === "string" && !/\W/.test( part ) ) {
+				part = part.toLowerCase();
+				nodeCheck = part;
+				checkFn = dirNodeCheck;
+			}
+
+			checkFn( "previousSibling", part, doneName, checkSet, nodeCheck, isXML );
+		}
+	},
+
+	find: {
+		ID: function( match, context, isXML ) {
+			if ( typeof context.getElementById !== "undefined" && !isXML ) {
+				var m = context.getElementById(match[1]);
+				// Check parentNode to catch when Blackberry 4.6 returns
+				// nodes that are no longer in the document #6963
+				return m && m.parentNode ? [m] : [];
+			}
+		},
+
+		NAME: function( match, context ) {
+			if ( typeof context.getElementsByName !== "undefined" ) {
+				var ret = [],
+					results = context.getElementsByName( match[1] );
+
+				for ( var i = 0, l = results.length; i < l; i++ ) {
+					if ( results[i].getAttribute("name") === match[1] ) {
+						ret.push( results[i] );
+					}
+				}
+
+				return ret.length === 0 ? null : ret;
+			}
+		},
+
+		TAG: function( match, context ) {
+			return context.getElementsByTagName( match[1] );
+		}
+	},
+	preFilter: {
+		CLASS: function( match, curLoop, inplace, result, not, isXML ) {
+			match = " " + match[1].replace(/\\/g, "") + " ";
+
+			if ( isXML ) {
+				return match;
+			}
+
+			for ( var i = 0, elem; (elem = curLoop[i]) != null; i++ ) {
+				if ( elem ) {
+					if ( not ^ (elem.className && (" " + elem.className + " ").replace(/[\t\n]/g, " ").indexOf(match) >= 0) ) {
+						if ( !inplace ) {
+							result.push( elem );
+						}
+
+					} else if ( inplace ) {
+						curLoop[i] = false;
+					}
+				}
+			}
+
+			return false;
+		},
+
+		ID: function( match ) {
+			return match[1].replace(/\\/g, "");
+		},
+
+		TAG: function( match, curLoop ) {
+			return match[1].toLowerCase();
+		},
+
+		CHILD: function( match ) {
+			if ( match[1] === "nth" ) {
+				// parse equations like 'even', 'odd', '5', '2n', '3n+2', '4n-1', '-n+6'
+				var test = /(-?)(\d*)n((?:\+|-)?\d*)/.exec(
+					match[2] === "even" && "2n" || match[2] === "odd" && "2n+1" ||
+					!/\D/.test( match[2] ) && "0n+" + match[2] || match[2]);
+
+				// calculate the numbers (first)n+(last) including if they are negative
+				match[2] = (test[1] + (test[2] || 1)) - 0;
+				match[3] = test[3] - 0;
+			}
+
+			// TODO: Move to normal caching system
+			match[0] = done++;
+
+			return match;
+		},
+
+		ATTR: function( match, curLoop, inplace, result, not, isXML ) {
+			var name = match[1].replace(/\\/g, "");
+			
+			if ( !isXML && Expr.attrMap[name] ) {
+				match[1] = Expr.attrMap[name];
+			}
+
+			if ( match[2] === "~=" ) {
+				match[4] = " " + match[4] + " ";
+			}
+
+			return match;
+		},
+
+		PSEUDO: function( match, curLoop, inplace, result, not ) {
+			if ( match[1] === "not" ) {
+				// If we're dealing with a complex expression, or a simple one
+				if ( ( chunker.exec(match[3]) || "" ).length > 1 || /^\w/.test(match[3]) ) {
+					match[3] = Sizzle(match[3], null, null, curLoop);
+
+				} else {
+					var ret = Sizzle.filter(match[3], curLoop, inplace, true ^ not);
+
+					if ( !inplace ) {
+						result.push.apply( result, ret );
+					}
+
+					return false;
+				}
+
+			} else if ( Expr.match.POS.test( match[0] ) || Expr.match.CHILD.test( match[0] ) ) {
+				return true;
+			}
+			
+			return match;
+		},
+
+		POS: function( match ) {
+			match.unshift( true );
+
+			return match;
+		}
+	},
+	
+	filters: {
+		enabled: function( elem ) {
+			return elem.disabled === false && elem.type !== "hidden";
+		},
+
+		disabled: function( elem ) {
+			return elem.disabled === true;
+		},
+
+		checked: function( elem ) {
+			return elem.checked === true;
+		},
+		
+		selected: function( elem ) {
+			// Accessing this property makes selected-by-default
+			// options in Safari work properly
+			elem.parentNode.selectedIndex;
+			
+			return elem.selected === true;
+		},
+
+		parent: function( elem ) {
+			return !!elem.firstChild;
+		},
+
+		empty: function( elem ) {
+			return !elem.firstChild;
+		},
+
+		has: function( elem, i, match ) {
+			return !!Sizzle( match[3], elem ).length;
+		},
+
+		header: function( elem ) {
+			return (/h\d/i).test( elem.nodeName );
+		},
+
+		text: function( elem ) {
+			return "text" === elem.type;
+		},
+		radio: function( elem ) {
+			return "radio" === elem.type;
+		},
+
+		checkbox: function( elem ) {
+			return "checkbox" === elem.type;
+		},
+
+		file: function( elem ) {
+			return "file" === elem.type;
+		},
+		password: function( elem ) {
+			return "password" === elem.type;
+		},
+
+		submit: function( elem ) {
+			return "submit" === elem.type;
+		},
+
+		image: function( elem ) {
+			return "image" === elem.type;
+		},
+
+		reset: function( elem ) {
+			return "reset" === elem.type;
+		},
+
+		button: function( elem ) {
+			return "button" === elem.type || elem.nodeName.toLowerCase() === "button";
+		},
+
+		input: function( elem ) {
+			return (/input|select|textarea|button/i).test( elem.nodeName );
+		}
+	},
+	setFilters: {
+		first: function( elem, i ) {
+			return i === 0;
+		},
+
+		last: function( elem, i, match, array ) {
+			return i === array.length - 1;
+		},
+
+		even: function( elem, i ) {
+			return i % 2 === 0;
+		},
+
+		odd: function( elem, i ) {
+			return i % 2 === 1;
+		},
+
+		lt: function( elem, i, match ) {
+			return i < match[3] - 0;
+		},
+
+		gt: function( elem, i, match ) {
+			return i > match[3] - 0;
+		},
+
+		nth: function( elem, i, match ) {
+			return match[3] - 0 === i;
+		},
+
+		eq: function( elem, i, match ) {
+			return match[3] - 0 === i;
+		}
+	},
+	filter: {
+		PSEUDO: function( elem, match, i, array ) {
+			var name = match[1],
+				filter = Expr.filters[ name ];
+
+			if ( filter ) {
+				return filter( elem, i, match, array );
+
+			} else if ( name === "contains" ) {
+				return (elem.textContent || elem.innerText || Sizzle.getText([ elem ]) || "").indexOf(match[3]) >= 0;
+
+			} else if ( name === "not" ) {
+				var not = match[3];
+
+				for ( var j = 0, l = not.length; j < l; j++ ) {
+					if ( not[j] === elem ) {
+						return false;
+					}
+				}
+
+				return true;
+
+			} else {
+				Sizzle.error( "Syntax error, unrecognized expression: " + name );
+			}
+		},
+
+		CHILD: function( elem, match ) {
+			var type = match[1],
+				node = elem;
+
+			switch ( type ) {
+				case "only":
+				case "first":
+					while ( (node = node.previousSibling) )	 {
+						if ( node.nodeType === 1 ) { 
+							return false; 
+						}
+					}
+
+					if ( type === "first" ) { 
+						return true; 
+					}
+
+					node = elem;
+
+				case "last":
+					while ( (node = node.nextSibling) )	 {
+						if ( node.nodeType === 1 ) { 
+							return false; 
+						}
+					}
+
+					return true;
+
+				case "nth":
+					var first = match[2],
+						last = match[3];
+
+					if ( first === 1 && last === 0 ) {
+						return true;
+					}
+					
+					var doneName = match[0],
+						parent = elem.parentNode;
+	
+					if ( parent && (parent.sizcache !== doneName || !elem.nodeIndex) ) {
+						var count = 0;
+						
+						for ( node = parent.firstChild; node; node = node.nextSibling ) {
+							if ( node.nodeType === 1 ) {
+								node.nodeIndex = ++count;
+							}
+						} 
+
+						parent.sizcache = doneName;
+					}
+					
+					var diff = elem.nodeIndex - last;
+
+					if ( first === 0 ) {
+						return diff === 0;
+
+					} else {
+						return ( diff % first === 0 && diff / first >= 0 );
+					}
+			}
+		},
+
+		ID: function( elem, match ) {
+			return elem.nodeType === 1 && elem.getAttribute("id") === match;
+		},
+
+		TAG: function( elem, match ) {
+			return (match === "*" && elem.nodeType === 1) || elem.nodeName.toLowerCase() === match;
+		},
+		
+		CLASS: function( elem, match ) {
+			return (" " + (elem.className || elem.getAttribute("class")) + " ")
+				.indexOf( match ) > -1;
+		},
+
+		ATTR: function( elem, match ) {
+			var name = match[1],
+				result = Expr.attrHandle[ name ] ?
+					Expr.attrHandle[ name ]( elem ) :
+					elem[ name ] != null ?
+						elem[ name ] :
+						elem.getAttribute( name ),
+				value = result + "",
+				type = match[2],
+				check = match[4];
+
+			return result == null ?
+				type === "!=" :
+				type === "=" ?
+				value === check :
+				type === "*=" ?
+				value.indexOf(check) >= 0 :
+				type === "~=" ?
+				(" " + value + " ").indexOf(check) >= 0 :
+				!check ?
+				value && result !== false :
+				type === "!=" ?
+				value !== check :
+				type === "^=" ?
+				value.indexOf(check) === 0 :
+				type === "$=" ?
+				value.substr(value.length - check.length) === check :
+				type === "|=" ?
+				value === check || value.substr(0, check.length + 1) === check + "-" :
+				false;
+		},
+
+		POS: function( elem, match, i, array ) {
+			var name = match[2],
+				filter = Expr.setFilters[ name ];
+
+			if ( filter ) {
+				return filter( elem, i, match, array );
+			}
+		}
+	}
+};
+
+var origPOS = Expr.match.POS,
+	fescape = function(all, num){
+		return "\\" + (num - 0 + 1);
+	};
+
+for ( var type in Expr.match ) {
+	Expr.match[ type ] = new RegExp( Expr.match[ type ].source + (/(?![^\[]*\])(?![^\(]*\))/.source) );
+	Expr.leftMatch[ type ] = new RegExp( /(^(?:.|\r|\n)*?)/.source + Expr.match[ type ].source.replace(/\\(\d+)/g, fescape) );
+}
+
+var makeArray = function( array, results ) {
+	array = Array.prototype.slice.call( array, 0 );
+
+	if ( results ) {
+		results.push.apply( results, array );
+		return results;
+	}
+	
+	return array;
+};
+
+// Perform a simple check to determine if the browser is capable of
+// converting a NodeList to an array using builtin methods.
+// Also verifies that the returned array holds DOM nodes
+// (which is not the case in the Blackberry browser)
+try {
+	Array.prototype.slice.call( document.documentElement.childNodes, 0 )[0].nodeType;
+
+// Provide a fallback method if it does not work
+} catch( e ) {
+	makeArray = function( array, results ) {
+		var i = 0,
+			ret = results || [];
+
+		if ( toString.call(array) === "[object Array]" ) {
+			Array.prototype.push.apply( ret, array );
+
+		} else {
+			if ( typeof array.length === "number" ) {
+				for ( var l = array.length; i < l; i++ ) {
+					ret.push( array[i] );
+				}
+
+			} else {
+				for ( ; array[i]; i++ ) {
+					ret.push( array[i] );
+				}
+			}
+		}
+
+		return ret;
+	};
+}
+
+var sortOrder, siblingCheck;
+
+if ( document.documentElement.compareDocumentPosition ) {
+	sortOrder = function( a, b ) {
+		if ( a === b ) {
+			hasDuplicate = true;
+			return 0;
+		}
+
+		if ( !a.compareDocumentPosition || !b.compareDocumentPosition ) {
+			return a.compareDocumentPosition ? -1 : 1;
+		}
+
+		return a.compareDocumentPosition(b) & 4 ? -1 : 1;
+	};
+
+} else {
+	sortOrder = function( a, b ) {
+		var al, bl,
+			ap = [],
+			bp = [],
+			aup = a.parentNode,
+			bup = b.parentNode,
+			cur = aup;
+
+		// The nodes are identical, we can exit early
+		if ( a === b ) {
+			hasDuplicate = true;
+			return 0;
+
+		// If the nodes are siblings (or identical) we can do a quick check
+		} else if ( aup === bup ) {
+			return siblingCheck( a, b );
+
+		// If no parents were found then the nodes are disconnected
+		} else if ( !aup ) {
+			return -1;
+
+		} else if ( !bup ) {
+			return 1;
+		}
+
+		// Otherwise they're somewhere else in the tree so we need
+		// to build up a full list of the parentNodes for comparison
+		while ( cur ) {
+			ap.unshift( cur );
+			cur = cur.parentNode;
+		}
+
+		cur = bup;
+
+		while ( cur ) {
+			bp.unshift( cur );
+			cur = cur.parentNode;
+		}
+
+		al = ap.length;
+		bl = bp.length;
+
+		// Start walking down the tree looking for a discrepancy
+		for ( var i = 0; i < al && i < bl; i++ ) {
+			if ( ap[i] !== bp[i] ) {
+				return siblingCheck( ap[i], bp[i] );
+			}
+		}
+
+		// We ended someplace up the tree so do a sibling check
+		return i === al ?
+			siblingCheck( a, bp[i], -1 ) :
+			siblingCheck( ap[i], b, 1 );
+	};
+
+	siblingCheck = function( a, b, ret ) {
+		if ( a === b ) {
+			return ret;
+		}
+
+		var cur = a.nextSibling;
+
+		while ( cur ) {
+			if ( cur === b ) {
+				return -1;
+			}
+
+			cur = cur.nextSibling;
+		}
+
+		return 1;
+	};
+}
+
+// Utility function for retreiving the text value of an array of DOM nodes
+Sizzle.getText = function( elems ) {
+	var ret = "", elem;
+
+	for ( var i = 0; elems[i]; i++ ) {
+		elem = elems[i];
+
+		// Get the text from text nodes and CDATA nodes
+		if ( elem.nodeType === 3 || elem.nodeType === 4 ) {
+			ret += elem.nodeValue;
+
+		// Traverse everything else, except comment nodes
+		} else if ( elem.nodeType !== 8 ) {
+			ret += Sizzle.getText( elem.childNodes );
+		}
+	}
+
+	return ret;
+};
+
+// Check to see if the browser returns elements by name when
+// querying by getElementById (and provide a workaround)
+(function(){
+	// We're going to inject a fake input element with a specified name
+	var form = document.createElement("div"),
+		id = "script" + (new Date()).getTime(),
+		root = document.documentElement;
+
+	form.innerHTML = "<a name='" + id + "'/>";
+
+	// Inject it into the root element, check its status, and remove it quickly
+	root.insertBefore( form, root.firstChild );
+
+	// The workaround has to do additional checks after a getElementById
+	// Which slows things down for other browsers (hence the branching)
+	if ( document.getElementById( id ) ) {
+		Expr.find.ID = function( match, context, isXML ) {
+			if ( typeof context.getElementById !== "undefined" && !isXML ) {
+				var m = context.getElementById(match[1]);
+
+				return m ?
+					m.id === match[1] || typeof m.getAttributeNode !== "undefined" && m.getAttributeNode("id").nodeValue === match[1] ?
+						[m] :
+						undefined :
+					[];
+			}
+		};
+
+		Expr.filter.ID = function( elem, match ) {
+			var node = typeof elem.getAttributeNode !== "undefined" && elem.getAttributeNode("id");
+
+			return elem.nodeType === 1 && node && node.nodeValue === match;
+		};
+	}
+
+	root.removeChild( form );
+
+	// release memory in IE
+	root = form = null;
+})();
+
+(function(){
+	// Check to see if the browser returns only elements
+	// when doing getElementsByTagName("*")
+
+	// Create a fake element
+	var div = document.createElement("div");
+	div.appendChild( document.createComment("") );
+
+	// Make sure no comments are found
+	if ( div.getElementsByTagName("*").length > 0 ) {
+		Expr.find.TAG = function( match, context ) {
+			var results = context.getElementsByTagName( match[1] );
+
+			// Filter out possible comments
+			if ( match[1] === "*" ) {
+				var tmp = [];
+
+				for ( var i = 0; results[i]; i++ ) {
+					if ( results[i].nodeType === 1 ) {
+						tmp.push( results[i] );
+					}
+				}
+
+				results = tmp;
+			}
+
+			return results;
+		};
+	}
+
+	// Check to see if an attribute returns normalized href attributes
+	div.innerHTML = "<a href='#'></a>";
+
+	if ( div.firstChild && typeof div.firstChild.getAttribute !== "undefined" &&
+			div.firstChild.getAttribute("href") !== "#" ) {
+
+		Expr.attrHandle.href = function( elem ) {
+			return elem.getAttribute( "href", 2 );
+		};
+	}
+
+	// release memory in IE
+	div = null;
+})();
+
+if ( document.querySelectorAll ) {
+	(function(){
+		var oldSizzle = Sizzle,
+			div = document.createElement("div"),
+			id = "__sizzle__";
+
+		div.innerHTML = "<p class='TEST'></p>";
+
+		// Safari can't handle uppercase or unicode characters when
+		// in quirks mode.
+		if ( div.querySelectorAll && div.querySelectorAll(".TEST").length === 0 ) {
+			return;
+		}
+	
+		Sizzle = function( query, context, extra, seed ) {
+			context = context || document;
+
+			// Make sure that attribute selectors are quoted
+			query = query.replace(/\=\s*([^'"\]]*)\s*\]/g, "='$1']");
+
+			// Only use querySelectorAll on non-XML documents
+			// (ID selectors don't work in non-HTML documents)
+			if ( !seed && !Sizzle.isXML(context) ) {
+				if ( context.nodeType === 9 ) {
+					try {
+						return makeArray( context.querySelectorAll(query), extra );
+					} catch(qsaError) {}
+
+				// qSA works strangely on Element-rooted queries
+				// We can work around this by specifying an extra ID on the root
+				// and working up from there (Thanks to Andrew Dupont for the technique)
+				// IE 8 doesn't work on object elements
+				} else if ( context.nodeType === 1 && context.nodeName.toLowerCase() !== "object" ) {
+					var old = context.getAttribute( "id" ),
+						nid = old || id;
+
+					if ( !old ) {
+						context.setAttribute( "id", nid );
+					}
+
+					try {
+						return makeArray( context.querySelectorAll( "#" + nid + " " + query ), extra );
+
+					} catch(pseudoError) {
+					} finally {
+						if ( !old ) {
+							context.removeAttribute( "id" );
+						}
+					}
+				}
+			}
+		
+			return oldSizzle(query, context, extra, seed);
+		};
+
+		for ( var prop in oldSizzle ) {
+			Sizzle[ prop ] = oldSizzle[ prop ];
+		}
+
+		// release memory in IE
+		div = null;
+	})();
+}
+
+(function(){
+	var html = document.documentElement,
+		matches = html.matchesSelector || html.mozMatchesSelector || html.webkitMatchesSelector || html.msMatchesSelector,
+		pseudoWorks = false;
+
+	try {
+		// This should fail with an exception
+		// Gecko does not error, returns false instead
+		matches.call( document.documentElement, "[test!='']:sizzle" );
+	
+	} catch( pseudoError ) {
+		pseudoWorks = true;
+	}
+
+	if ( matches ) {
+		Sizzle.matchesSelector = function( node, expr ) {
+			// Make sure that attribute selectors are quoted
+			expr = expr.replace(/\=\s*([^'"\]]*)\s*\]/g, "='$1']");
+
+			if ( !Sizzle.isXML( node ) ) {
+				try { 
+					if ( pseudoWorks || !Expr.match.PSEUDO.test( expr ) && !/!=/.test( expr ) ) {
+						return matches.call( node, expr );
+					}
+				} catch(e) {}
+			}
+
+			return Sizzle(expr, null, null, [node]).length > 0;
+		};
+	}
+})();
+
+(function(){
+	var div = document.createElement("div");
+
+	div.innerHTML = "<div class='test e'></div><div class='test'></div>";
+
+	// Opera can't find a second classname (in 9.6)
+	// Also, make sure that getElementsByClassName actually exists
+	if ( !div.getElementsByClassName || div.getElementsByClassName("e").length === 0 ) {
+		return;
+	}
+
+	// Safari caches class attributes, doesn't catch changes (in 3.2)
+	div.lastChild.className = "e";
+
+	if ( div.getElementsByClassName("e").length === 1 ) {
+		return;
+	}
+	
+	Expr.order.splice(1, 0, "CLASS");
+	Expr.find.CLASS = function( match, context, isXML ) {
+		if ( typeof context.getElementsByClassName !== "undefined" && !isXML ) {
+			return context.getElementsByClassName(match[1]);
+		}
+	};
+
+	// release memory in IE
+	div = null;
+})();
+
+function dirNodeCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) {
+	for ( var i = 0, l = checkSet.length; i < l; i++ ) {
+		var elem = checkSet[i];
+
+		if ( elem ) {
+			var match = false;
+
+			elem = elem[dir];
+
+			while ( elem ) {
+				if ( elem.sizcache === doneName ) {
+					match = checkSet[elem.sizset];
+					break;
+				}
+
+				if ( elem.nodeType === 1 && !isXML ){
+					elem.sizcache = doneName;
+					elem.sizset = i;
+				}
+
+				if ( elem.nodeName.toLowerCase() === cur ) {
+					match = elem;
+					break;
+				}
+
+				elem = elem[dir];
+			}
+
+			checkSet[i] = match;
+		}
+	}
+}
+
+function dirCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) {
+	for ( var i = 0, l = checkSet.length; i < l; i++ ) {
+		var elem = checkSet[i];
+
+		if ( elem ) {
+			var match = false;
+			
+			elem = elem[dir];
+
+			while ( elem ) {
+				if ( elem.sizcache === doneName ) {
+					match = checkSet[elem.sizset];
+					break;
+				}
+
+				if ( elem.nodeType === 1 ) {
+					if ( !isXML ) {
+						elem.sizcache = doneName;
+						elem.sizset = i;
+					}
+
+					if ( typeof cur !== "string" ) {
+						if ( elem === cur ) {
+							match = true;
+							break;
+						}
+
+					} else if ( Sizzle.filter( cur, [elem] ).length > 0 ) {
+						match = elem;
+						break;
+					}
+				}
+
+				elem = elem[dir];
+			}
+
+			checkSet[i] = match;
+		}
+	}
+}
+
+if ( document.documentElement.contains ) {
+	Sizzle.contains = function( a, b ) {
+		return a !== b && (a.contains ? a.contains(b) : true);
+	};
+
+} else if ( document.documentElement.compareDocumentPosition ) {
+	Sizzle.contains = function( a, b ) {
+		return !!(a.compareDocumentPosition(b) & 16);
+	};
+
+} else {
+	Sizzle.contains = function() {
+		return false;
+	};
+}
+
+Sizzle.isXML = function( elem ) {
+	// documentElement is verified for cases where it doesn't yet exist
+	// (such as loading iframes in IE - #4833) 
+	var documentElement = (elem ? elem.ownerDocument || elem : 0).documentElement;
+
+	return documentElement ? documentElement.nodeName !== "HTML" : false;
+};
+
+var posProcess = function( selector, context ) {
+	var match,
+		tmpSet = [],
+		later = "",
+		root = context.nodeType ? [context] : context;
+
+	// Position selectors must be done after the filter
+	// And so must :not(positional) so we move all PSEUDOs to the end
+	while ( (match = Expr.match.PSEUDO.exec( selector )) ) {
+		later += match[0];
+		selector = selector.replace( Expr.match.PSEUDO, "" );
+	}
+
+	selector = Expr.relative[selector] ? selector + "*" : selector;
+
+	for ( var i = 0, l = root.length; i < l; i++ ) {
+		Sizzle( selector, root[i], tmpSet );
+	}
+
+	return Sizzle.filter( later, tmpSet );
+};
+
+// EXPOSE
+jQuery.find = Sizzle;
+jQuery.expr = Sizzle.selectors;
+jQuery.expr[":"] = jQuery.expr.filters;
+jQuery.unique = Sizzle.uniqueSort;
+jQuery.text = Sizzle.getText;
+jQuery.isXMLDoc = Sizzle.isXML;
+jQuery.contains = Sizzle.contains;
+
+
+})();
+
+
+var runtil = /Until$/,
+	rparentsprev = /^(?:parents|prevUntil|prevAll)/,
+	// Note: This RegExp should be improved, or likely pulled from Sizzle
+	rmultiselector = /,/,
+	isSimple = /^.[^:#\[\.,]*$/,
+	slice = Array.prototype.slice,
+	POS = jQuery.expr.match.POS;
+
+jQuery.fn.extend({
+	find: function( selector ) {
+		var ret = this.pushStack( "", "find", selector ),
+			length = 0;
+
+		for ( var i = 0, l = this.length; i < l; i++ ) {
+			length = ret.length;
+			jQuery.find( selector, this[i], ret );
+
+			if ( i > 0 ) {
+				// Make sure that the results are unique
+				for ( var n = length; n < ret.length; n++ ) {
+					for ( var r = 0; r < length; r++ ) {
+						if ( ret[r] === ret[n] ) {
+							ret.splice(n--, 1);
+							break;
+						}
+					}
+				}
+			}
+		}
+
+		return ret;
+	},
+
+	has: function( target ) {
+		var targets = jQuery( target );
+		return this.filter(function() {
+			for ( var i = 0, l = targets.length; i < l; i++ ) {
+				if ( jQuery.contains( this, targets[i] ) ) {
+					return true;
+				}
+			}
+		});
+	},
+
+	not: function( selector ) {
+		return this.pushStack( winnow(this, selector, false), "not", selector);
+	},
+
+	filter: function( selector ) {
+		return this.pushStack( winnow(this, selector, true), "filter", selector );
+	},
+	
+	is: function( selector ) {
+		return !!selector && jQuery.filter( selector, this ).length > 0;
+	},
+
+	closest: function( selectors, context ) {
+		var ret = [], i, l, cur = this[0];
+
+		if ( jQuery.isArray( selectors ) ) {
+			var match, selector,
+				matches = {},
+				level = 1;
+
+			if ( cur && selectors.length ) {
+				for ( i = 0, l = selectors.length; i < l; i++ ) {
+					selector = selectors[i];
+
+					if ( !matches[selector] ) {
+						matches[selector] = jQuery.expr.match.POS.test( selector ) ? 
+							jQuery( selector, context || this.context ) :
+							selector;
+					}
+				}
+
+				while ( cur && cur.ownerDocument && cur !== context ) {
+					for ( selector in matches ) {
+						match = matches[selector];
+
+						if ( match.jquery ? match.index(cur) > -1 : jQuery(cur).is(match) ) {
+							ret.push({ selector: selector, elem: cur, level: level });
+						}
+					}
+
+					cur = cur.parentNode;
+					level++;
+				}
+			}
+
+			return ret;
+		}
+
+		var pos = POS.test( selectors ) ? 
+			jQuery( selectors, context || this.context ) : null;
+
+		for ( i = 0, l = this.length; i < l; i++ ) {
+			cur = this[i];
+
+			while ( cur ) {
+				if ( pos ? pos.index(cur) > -1 : jQuery.find.matchesSelector(cur, selectors) ) {
+					ret.push( cur );
+					break;
+
+				} else {
+					cur = cur.parentNode;
+					if ( !cur || !cur.ownerDocument || cur === context ) {
+						break;
+					}
+				}
+			}
+		}
+
+		ret = ret.length > 1 ? jQuery.unique(ret) : ret;
+		
+		return this.pushStack( ret, "closest", selectors );
+	},
+	
+	// Determine the position of an element within
+	// the matched set of elements
+	index: function( elem ) {
+		if ( !elem || typeof elem === "string" ) {
+			return jQuery.inArray( this[0],
+				// If it receives a string, the selector is used
+				// If it receives nothing, the siblings are used
+				elem ? jQuery( elem ) : this.parent().children() );
+		}
+		// Locate the position of the desired element
+		return jQuery.inArray(
+			// If it receives a jQuery object, the first element is used
+			elem.jquery ? elem[0] : elem, this );
+	},
+
+	add: function( selector, context ) {
+		var set = typeof selector === "string" ?
+				jQuery( selector, context || this.context ) :
+				jQuery.makeArray( selector ),
+			all = jQuery.merge( this.get(), set );
+
+		return this.pushStack( isDisconnected( set[0] ) || isDisconnected( all[0] ) ?
+			all :
+			jQuery.unique( all ) );
+	},
+
+	andSelf: function() {
+		return this.add( this.prevObject );
+	}
+});
+
+// A painfully simple check to see if an element is disconnected
+// from a document (should be improved, where feasible).
+function isDisconnected( node ) {
+	return !node || !node.parentNode || node.parentNode.nodeType === 11;
+}
+
+jQuery.each({
+	parent: function( elem ) {
+		var parent = elem.parentNode;
+		return parent && parent.nodeType !== 11 ? parent : null;
+	},
+	parents: function( elem ) {
+		return jQuery.dir( elem, "parentNode" );
+	},
+	parentsUntil: function( elem, i, until ) {
+		return jQuery.dir( elem, "parentNode", until );
+	},
+	next: function( elem ) {
+		return jQuery.nth( elem, 2, "nextSibling" );
+	},
+	prev: function( elem ) {
+		return jQuery.nth( elem, 2, "previousSibling" );
+	},
+	nextAll: function( elem ) {
+		return jQuery.dir( elem, "nextSibling" );
+	},
+	prevAll: function( elem ) {
+		return jQuery.dir( elem, "previousSibling" );
+	},
+	nextUntil: function( elem, i, until ) {
+		return jQuery.dir( elem, "nextSibling", until );
+	},
+	prevUntil: function( elem, i, until ) {
+		return jQuery.dir( elem, "previousSibling", until );
+	},
+	siblings: function( elem ) {
+		return jQuery.sibling( elem.parentNode.firstChild, elem );
+	},
+	children: function( elem ) {
+		return jQuery.sibling( elem.firstChild );
+	},
+	contents: function( elem ) {
+		return jQuery.nodeName( elem, "iframe" ) ?
+			elem.contentDocument || elem.contentWindow.document :
+			jQuery.makeArray( elem.childNodes );
+	}
+}, function( name, fn ) {
+	jQuery.fn[ name ] = function( until, selector ) {
+		var ret = jQuery.map( this, fn, until );
+		
+		if ( !runtil.test( name ) ) {
+			selector = until;
+		}
+
+		if ( selector && typeof selector === "string" ) {
+			ret = jQuery.filter( selector, ret );
+		}
+
+		ret = this.length > 1 ? jQuery.unique( ret ) : ret;
+
+		if ( (this.length > 1 || rmultiselector.test( selector )) && rparentsprev.test( name ) ) {
+			ret = ret.reverse();
+		}
+
+		return this.pushStack( ret, name, slice.call(arguments).join(",") );
+	};
+});
+
+jQuery.extend({
+	filter: function( expr, elems, not ) {
+		if ( not ) {
+			expr = ":not(" + expr + ")";
+		}
+
+		return elems.length === 1 ?
+			jQuery.find.matchesSelector(elems[0], expr) ? [ elems[0] ] : [] :
+			jQuery.find.matches(expr, elems);
+	},
+	
+	dir: function( elem, dir, until ) {
+		var matched = [],
+			cur = elem[ dir ];
+
+		while ( cur && cur.nodeType !== 9 && (until === undefined || cur.nodeType !== 1 || !jQuery( cur ).is( until )) ) {
+			if ( cur.nodeType === 1 ) {
+				matched.push( cur );
+			}
+			cur = cur[dir];
+		}
+		return matched;
+	},
+
+	nth: function( cur, result, dir, elem ) {
+		result = result || 1;
+		var num = 0;
+
+		for ( ; cur; cur = cur[dir] ) {
+			if ( cur.nodeType === 1 && ++num === result ) {
+				break;
+			}
+		}
+
+		return cur;
+	},
+
+	sibling: function( n, elem ) {
+		var r = [];
+
+		for ( ; n; n = n.nextSibling ) {
+			if ( n.nodeType === 1 && n !== elem ) {
+				r.push( n );
+			}
+		}
+
+		return r;
+	}
+});
+
+// Implement the identical functionality for filter and not
+function winnow( elements, qualifier, keep ) {
+	if ( jQuery.isFunction( qualifier ) ) {
+		return jQuery.grep(elements, function( elem, i ) {
+			var retVal = !!qualifier.call( elem, i, elem );
+			return retVal === keep;
+		});
+
+	} else if ( qualifier.nodeType ) {
+		return jQuery.grep(elements, function( elem, i ) {
+			return (elem === qualifier) === keep;
+		});
+
+	} else if ( typeof qualifier === "string" ) {
+		var filtered = jQuery.grep(elements, function( elem ) {
+			return elem.nodeType === 1;
+		});
+
+		if ( isSimple.test( qualifier ) ) {
+			return jQuery.filter(qualifier, filtered, !keep);
+		} else {
+			qualifier = jQuery.filter( qualifier, filtered );
+		}
+	}
+
+	return jQuery.grep(elements, function( elem, i ) {
+		return (jQuery.inArray( elem, qualifier ) >= 0) === keep;
+	});
+}
+
+
+
+
+var rinlinejQuery = / jQuery\d+="(?:\d+|null)"/g,
+	rleadingWhitespace = /^\s+/,
+	rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,
+	rtagName = /<([\w:]+)/,
+	rtbody = /<tbody/i,
+	rhtml = /<|&#?\w+;/,
+	rnocache = /<(?:script|object|embed|option|style)/i,
+	// checked="checked" or checked (html5)
+	rchecked = /checked\s*(?:[^=]|=\s*.checked.)/i,
+	raction = /\=([^="'>\s]+\/)>/g,
+	wrapMap = {
+		option: [ 1, "<select multiple='multiple'>", "</select>" ],
+		legend: [ 1, "<fieldset>", "</fieldset>" ],
+		thead: [ 1, "<table>", "</table>" ],
+		tr: [ 2, "<table><tbody>", "</tbody></table>" ],
+		td: [ 3, "<table><tbody><tr>", "</tr></tbody></table>" ],
+		col: [ 2, "<table><tbody></tbody><colgroup>", "</colgroup></table>" ],
+		area: [ 1, "<map>", "</map>" ],
+		_default: [ 0, "", "" ]
+	};
+
+wrapMap.optgroup = wrapMap.option;
+wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead;
+wrapMap.th = wrapMap.td;
+
+// IE can't serialize <link> and <script> tags normally
+if ( !jQuery.support.htmlSerialize ) {
+	wrapMap._default = [ 1, "div<div>", "</div>" ];
+}
+
+jQuery.fn.extend({
+	text: function( text ) {
+		if ( jQuery.isFunction(text) ) {
+			return this.each(function(i) {
+				var self = jQuery( this );
+
+				self.text( text.call(this, i, self.text()) );
+			});
+		}
+
+		if ( typeof text !== "object" && text !== undefined ) {
+			return this.empty().append( (this[0] && this[0].ownerDocument || document).createTextNode( text ) );
+		}
+
+		return jQuery.text( this );
+	},
+
+	wrapAll: function( html ) {
+		if ( jQuery.isFunction( html ) ) {
+			return this.each(function(i) {
+				jQuery(this).wrapAll( html.call(this, i) );
+			});
+		}
+
+		if ( this[0] ) {
+			// The elements to wrap the target around
+			var wrap = jQuery( html, this[0].ownerDocument ).eq(0).clone(true);
+
+			if ( this[0].parentNode ) {
+				wrap.insertBefore( this[0] );
+			}
+
+			wrap.map(function() {
+				var elem = this;
+
+				while ( elem.firstChild && elem.firstChild.nodeType === 1 ) {
+					elem = elem.firstChild;
+				}
+
+				return elem;
+			}).append(this);
+		}
+
+		return this;
+	},
+
+	wrapInner: function( html ) {
+		if ( jQuery.isFunction( html ) ) {
+			return this.each(function(i) {
+				jQuery(this).wrapInner( html.call(this, i) );
+			});
+		}
+
+		return this.each(function() {
+			var self = jQuery( this ),
+				contents = self.contents();
+
+			if ( contents.length ) {
+				contents.wrapAll( html );
+
+			} else {
+				self.append( html );
+			}
+		});
+	},
+
+	wrap: function( html ) {
+		return this.each(function() {
+			jQuery( this ).wrapAll( html );
+		});
+	},
+
+	unwrap: function() {
+		return this.parent().each(function() {
+			if ( !jQuery.nodeName( this, "body" ) ) {
+				jQuery( this ).replaceWith( this.childNodes );
+			}
+		}).end();
+	},
+
+	append: function() {
+		return this.domManip(arguments, true, function( elem ) {
+			if ( this.nodeType === 1 ) {
+				this.appendChild( elem );
+			}
+		});
+	},
+
+	prepend: function() {
+		return this.domManip(arguments, true, function( elem ) {
+			if ( this.nodeType === 1 ) {
+				this.insertBefore( elem, this.firstChild );
+			}
+		});
+	},
+
+	before: function() {
+		if ( this[0] && this[0].parentNode ) {
+			return this.domManip(arguments, false, function( elem ) {
+				this.parentNode.insertBefore( elem, this );
+			});
+		} else if ( arguments.length ) {
+			var set = jQuery(arguments[0]);
+			set.push.apply( set, this.toArray() );
+			return this.pushStack( set, "before", arguments );
+		}
+	},
+
+	after: function() {
+		if ( this[0] && this[0].parentNode ) {
+			return this.domManip(arguments, false, function( elem ) {
+				this.parentNode.insertBefore( elem, this.nextSibling );
+			});
+		} else if ( arguments.length ) {
+			var set = this.pushStack( this, "after", arguments );
+			set.push.apply( set, jQuery(arguments[0]).toArray() );
+			return set;
+		}
+	},
+	
+	// keepData is for internal use only--do not document
+	remove: function( selector, keepData ) {
+		for ( var i = 0, elem; (elem = this[i]) != null; i++ ) {
+			if ( !selector || jQuery.filter( selector, [ elem ] ).length ) {
+				if ( !keepData && elem.nodeType === 1 ) {
+					jQuery.cleanData( elem.getElementsByTagName("*") );
+					jQuery.cleanData( [ elem ] );
+				}
+
+				if ( elem.parentNode ) {
+					 elem.parentNode.removeChild( elem );
+				}
+			}
+		}
+		
+		return this;
+	},
+
+	empty: function() {
+		for ( var i = 0, elem; (elem = this[i]) != null; i++ ) {
+			// Remove element nodes and prevent memory leaks
+			if ( elem.nodeType === 1 ) {
+				jQuery.cleanData( elem.getElementsByTagName("*") );
+			}
+
+			// Remove any remaining nodes
+			while ( elem.firstChild ) {
+				elem.removeChild( elem.firstChild );
+			}
+		}
+		
+		return this;
+	},
+
+	clone: function( events ) {
+		// Do the clone
+		var ret = this.map(function() {
+			if ( !jQuery.support.noCloneEvent && !jQuery.isXMLDoc(this) ) {
+				// IE copies events bound via attachEvent when
+				// using cloneNode. Calling detachEvent on the
+				// clone will also remove the events from the orignal
+				// In order to get around this, we use innerHTML.
+				// Unfortunately, this means some modifications to
+				// attributes in IE that are actually only stored
+				// as properties will not be copied (such as the
+				// the name attribute on an input).
+				var html = this.outerHTML,
+					ownerDocument = this.ownerDocument;
+
+				if ( !html ) {
+					var div = ownerDocument.createElement("div");
+					div.appendChild( this.cloneNode(true) );
+					html = div.innerHTML;
+				}
+
+				return jQuery.clean([html.replace(rinlinejQuery, "")
+					// Handle the case in IE 8 where action=/test/> self-closes a tag
+					.replace(raction, '="$1">')
+					.replace(rleadingWhitespace, "")], ownerDocument)[0];
+			} else {
+				return this.cloneNode(true);
+			}
+		});
+
+		// Copy the events from the original to the clone
+		if ( events === true ) {
+			cloneCopyEvent( this, ret );
+			cloneCopyEvent( this.find("*"), ret.find("*") );
+		}
+
+		// Return the cloned set
+		return ret;
+	},
+
+	html: function( value ) {
+		if ( value === undefined ) {
+			return this[0] && this[0].nodeType === 1 ?
+				this[0].innerHTML.replace(rinlinejQuery, "") :
+				null;
+
+		// See if we can take a shortcut and just use innerHTML
+		} else if ( typeof value === "string" && !rnocache.test( value ) &&
+			(jQuery.support.leadingWhitespace || !rleadingWhitespace.test( value )) &&
+			!wrapMap[ (rtagName.exec( value ) || ["", ""])[1].toLowerCase() ] ) {
+
+			value = value.replace(rxhtmlTag, "<$1></$2>");
+
+			try {
+				for ( var i = 0, l = this.length; i < l; i++ ) {
+					// Remove element nodes and prevent memory leaks
+					if ( this[i].nodeType === 1 ) {
+						jQuery.cleanData( this[i].getElementsByTagName("*") );
+						this[i].innerHTML = value;
+					}
+				}
+
+			// If using innerHTML throws an exception, use the fallback method
+			} catch(e) {
+				this.empty().append( value );
+			}
+
+		} else if ( jQuery.isFunction( value ) ) {
+			this.each(function(i){
+				var self = jQuery( this );
+
+				self.html( value.call(this, i, self.html()) );
+			});
+
+		} else {
+			this.empty().append( value );
+		}
+
+		return this;
+	},
+
+	replaceWith: function( value ) {
+		if ( this[0] && this[0].parentNode ) {
+			// Make sure that the elements are removed from the DOM before they are inserted
+			// this can help fix replacing a parent with child elements
+			if ( jQuery.isFunction( value ) ) {
+				return this.each(function(i) {
+					var self = jQuery(this), old = self.html();
+					self.replaceWith( value.call( this, i, old ) );
+				});
+			}
+
+			if ( typeof value !== "string" ) {
+				value = jQuery( value ).detach();
+			}
+
+			return this.each(function() {
+				var next = this.nextSibling,
+					parent = this.parentNode;
+
+				jQuery( this ).remove();
+
+				if ( next ) {
+					jQuery(next).before( value );
+				} else {
+					jQuery(parent).append( value );
+				}
+			});
+		} else {
+			return this.pushStack( jQuery(jQuery.isFunction(value) ? value() : value), "replaceWith", value );
+		}
+	},
+
+	detach: function( selector ) {
+		return this.remove( selector, true );
+	},
+
+	domManip: function( args, table, callback ) {
+		var results, first, fragment, parent,
+			value = args[0],
+			scripts = [];
+
+		// We can't cloneNode fragments that contain checked, in WebKit
+		if ( !jQuery.support.checkClone && arguments.length === 3 && typeof value === "string" && rchecked.test( value ) ) {
+			return this.each(function() {
+				jQuery(this).domManip( args, table, callback, true );
+			});
+		}
+
+		if ( jQuery.isFunction(value) ) {
+			return this.each(function(i) {
+				var self = jQuery(this);
+				args[0] = value.call(this, i, table ? self.html() : undefined);
+				self.domManip( args, table, callback );
+			});
+		}
+
+		if ( this[0] ) {
+			parent = value && value.parentNode;
+
+			// If we're in a fragment, just use that instead of building a new one
+			if ( jQuery.support.parentNode && parent && parent.nodeType === 11 && parent.childNodes.length === this.length ) {
+				results = { fragment: parent };
+
+			} else {
+				results = jQuery.buildFragment( args, this, scripts );
+			}
+			
+			fragment = results.fragment;
+			
+			if ( fragment.childNodes.length === 1 ) {
+				first = fragment = fragment.firstChild;
+			} else {
+				first = fragment.firstChild;
+			}
+
+			if ( first ) {
+				table = table && jQuery.nodeName( first, "tr" );
+
+				for ( var i = 0, l = this.length; i < l; i++ ) {
+					callback.call(
+						table ?
+							root(this[i], first) :
+							this[i],
+						i > 0 || results.cacheable || this.length > 1  ?
+							fragment.cloneNode(true) :
+							fragment
+					);
+				}
+			}
+
+			if ( scripts.length ) {
+				jQuery.each( scripts, evalScript );
+			}
+		}
+
+		return this;
+	}
+});
+
+function root( elem, cur ) {
+	return jQuery.nodeName(elem, "table") ?
+		(elem.getElementsByTagName("tbody")[0] ||
+		elem.appendChild(elem.ownerDocument.createElement("tbody"))) :
+		elem;
+}
+
+function cloneCopyEvent(orig, ret) {
+	var i = 0;
+
+	ret.each(function() {
+		if ( this.nodeName !== (orig[i] && orig[i].nodeName) ) {
+			return;
+		}
+
+		var oldData = jQuery.data( orig[i++] ),
+			curData = jQuery.data( this, oldData ),
+			events = oldData && oldData.events;
+
+		if ( events ) {
+			delete curData.handle;
+			curData.events = {};
+
+			for ( var type in events ) {
+				for ( var handler in events[ type ] ) {
+					jQuery.event.add( this, type, events[ type ][ handler ], events[ type ][ handler ].data );
+				}
+			}
+		}
+	});
+}
+
+jQuery.buildFragment = function( args, nodes, scripts ) {
+	var fragment, cacheable, cacheresults,
+		doc = (nodes && nodes[0] ? nodes[0].ownerDocument || nodes[0] : document);
+
+	// Only cache "small" (1/2 KB) strings that are associated with the main document
+	// Cloning options loses the selected state, so don't cache them
+	// IE 6 doesn't like it when you put <object> or <embed> elements in a fragment
+	// Also, WebKit does not clone 'checked' attributes on cloneNode, so don't cache
+	if ( args.length === 1 && typeof args[0] === "string" && args[0].length < 512 && doc === document &&
+		!rnocache.test( args[0] ) && (jQuery.support.checkClone || !rchecked.test( args[0] )) ) {
+
+		cacheable = true;
+		cacheresults = jQuery.fragments[ args[0] ];
+		if ( cacheresults ) {
+			if ( cacheresults !== 1 ) {
+				fragment = cacheresults;
+			}
+		}
+	}
+
+	if ( !fragment ) {
+		fragment = doc.createDocumentFragment();
+		jQuery.clean( args, doc, fragment, scripts );
+	}
+
+	if ( cacheable ) {
+		jQuery.fragments[ args[0] ] = cacheresults ? fragment : 1;
+	}
+
+	return { fragment: fragment, cacheable: cacheable };
+};
+
+jQuery.fragments = {};
+
+jQuery.each({
+	appendTo: "append",
+	prependTo: "prepend",
+	insertBefore: "before",
+	insertAfter: "after",
+	replaceAll: "replaceWith"
+}, function( name, original ) {
+	jQuery.fn[ name ] = function( selector ) {
+		var ret = [],
+			insert = jQuery( selector ),
+			parent = this.length === 1 && this[0].parentNode;
+		
+		if ( parent && parent.nodeType === 11 && parent.childNodes.length === 1 && insert.length === 1 ) {
+			insert[ original ]( this[0] );
+			return this;
+			
+		} else {
+			for ( var i = 0, l = insert.length; i < l; i++ ) {
+				var elems = (i > 0 ? this.clone(true) : this).get();
+				jQuery( insert[i] )[ original ]( elems );
+				ret = ret.concat( elems );
+			}
+		
+			return this.pushStack( ret, name, insert.selector );
+		}
+	};
+});
+
+jQuery.extend({
+	clean: function( elems, context, fragment, scripts ) {
+		context = context || document;
+
+		// !context.createElement fails in IE with an error but returns typeof 'object'
+		if ( typeof context.createElement === "undefined" ) {
+			context = context.ownerDocument || context[0] && context[0].ownerDocument || document;
+		}
+
+		var ret = [];
+
+		for ( var i = 0, elem; (elem = elems[i]) != null; i++ ) {
+			if ( typeof elem === "number" ) {
+				elem += "";
+			}
+
+			if ( !elem ) {
+				continue;
+			}
+
+			// Convert html string into DOM nodes
+			if ( typeof elem === "string" && !rhtml.test( elem ) ) {
+				elem = context.createTextNode( elem );
+
+			} else if ( typeof elem === "string" ) {
+				// Fix "XHTML"-style tags in all browsers
+				elem = elem.replace(rxhtmlTag, "<$1></$2>");
+
+				// Trim whitespace, otherwise indexOf won't work as expected
+				var tag = (rtagName.exec( elem ) || ["", ""])[1].toLowerCase(),
+					wrap = wrapMap[ tag ] || wrapMap._default,
+					depth = wrap[0],
+					div = context.createElement("div");
+
+				// Go to html and back, then peel off extra wrappers
+				div.innerHTML = wrap[1] + elem + wrap[2];
+
+				// Move to the right depth
+				while ( depth-- ) {
+					div = div.lastChild;
+				}
+
+				// Remove IE's autoinserted <tbody> from table fragments
+				if ( !jQuery.support.tbody ) {
+
+					// String was a <table>, *may* have spurious <tbody>
+					var hasBody = rtbody.test(elem),
+						tbody = tag === "table" && !hasBody ?
+							div.firstChild && div.firstChild.childNodes :
+
+							// String was a bare <thead> or <tfoot>
+							wrap[1] === "<table>" && !hasBody ?
+								div.childNodes :
+								[];
+
+					for ( var j = tbody.length - 1; j >= 0 ; --j ) {
+						if ( jQuery.nodeName( tbody[ j ], "tbody" ) && !tbody[ j ].childNodes.length ) {
+							tbody[ j ].parentNode.removeChild( tbody[ j ] );
+						}
+					}
+
+				}
+
+				// IE completely kills leading whitespace when innerHTML is used
+				if ( !jQuery.support.leadingWhitespace && rleadingWhitespace.test( elem ) ) {
+					div.insertBefore( context.createTextNode( rleadingWhitespace.exec(elem)[0] ), div.firstChild );
+				}
+
+				elem = div.childNodes;
+			}
+
+			if ( elem.nodeType ) {
+				ret.push( elem );
+			} else {
+				ret = jQuery.merge( ret, elem );
+			}
+		}
+
+		if ( fragment ) {
+			for ( i = 0; ret[i]; i++ ) {
+				if ( scripts && jQuery.nodeName( ret[i], "script" ) && (!ret[i].type || ret[i].type.toLowerCase() === "text/javascript") ) {
+					scripts.push( ret[i].parentNode ? ret[i].parentNode.removeChild( ret[i] ) : ret[i] );
+				
+				} else {
+					if ( ret[i].nodeType === 1 ) {
+						ret.splice.apply( ret, [i + 1, 0].concat(jQuery.makeArray(ret[i].getElementsByTagName("script"))) );
+					}
+					fragment.appendChild( ret[i] );
+				}
+			}
+		}
+
+		return ret;
+	},
+	
+	cleanData: function( elems ) {
+		var data, id, cache = jQuery.cache,
+			special = jQuery.event.special,
+			deleteExpando = jQuery.support.deleteExpando;
+		
+		for ( var i = 0, elem; (elem = elems[i]) != null; i++ ) {
+			if ( elem.nodeName && jQuery.noData[elem.nodeName.toLowerCase()] ) {
+				continue;
+			}
+
+			id = elem[ jQuery.expando ];
+			
+			if ( id ) {
+				data = cache[ id ];
+				
+				if ( data && data.events ) {
+					for ( var type in data.events ) {
+						if ( special[ type ] ) {
+							jQuery.event.remove( elem, type );
+
+						} else {
+							jQuery.removeEvent( elem, type, data.handle );
+						}
+					}
+				}
+				
+				if ( deleteExpando ) {
+					delete elem[ jQuery.expando ];
+
+				} else if ( elem.removeAttribute ) {
+					elem.removeAttribute( jQuery.expando );
+				}
+				
+				delete cache[ id ];
+			}
+		}
+	}
+});
+
+function evalScript( i, elem ) {
+	if ( elem.src ) {
+		jQuery.ajax({
+			url: elem.src,
+			async: false,
+			dataType: "script"
+		});
+	} else {
+		jQuery.globalEval( elem.text || elem.textContent || elem.innerHTML || "" );
+	}
+
+	if ( elem.parentNode ) {
+		elem.parentNode.removeChild( elem );
+	}
+}
+
+
+
+
+var ralpha = /alpha\([^)]*\)/i,
+	ropacity = /opacity=([^)]*)/,
+	rdashAlpha = /-([a-z])/ig,
+	rupper = /([A-Z])/g,
+	rnumpx = /^-?\d+(?:px)?$/i,
+	rnum = /^-?\d/,
+
+	cssShow = { position: "absolute", visibility: "hidden", display: "block" },
+	cssWidth = [ "Left", "Right" ],
+	cssHeight = [ "Top", "Bottom" ],
+	curCSS,
+
+	getComputedStyle,
+	currentStyle,
+
+	fcamelCase = function( all, letter ) {
+		return letter.toUpperCase();
+	};
+
+jQuery.fn.css = function( name, value ) {
+	// Setting 'undefined' is a no-op
+	if ( arguments.length === 2 && value === undefined ) {
+		return this;
+	}
+
+	return jQuery.access( this, name, value, true, function( elem, name, value ) {
+		return value !== undefined ?
+			jQuery.style( elem, name, value ) :
+			jQuery.css( elem, name );
+	});
+};
+
+jQuery.extend({
+	// Add in style property hooks for overriding the default
+	// behavior of getting and setting a style property
+	cssHooks: {
+		opacity: {
+			get: function( elem, computed ) {
+				if ( computed ) {
+					// We should always get a number back from opacity
+					var ret = curCSS( elem, "opacity", "opacity" );
+					return ret === "" ? "1" : ret;
+
+				} else {
+					return elem.style.opacity;
+				}
+			}
+		}
+	},
+
+	// Exclude the following css properties to add px
+	cssNumber: {
+		"zIndex": true,
+		"fontWeight": true,
+		"opacity": true,
+		"zoom": true,
+		"lineHeight": true
+	},
+
+	// Add in properties whose names you wish to fix before
+	// setting or getting the value
+	cssProps: {
+		// normalize float css property
+		"float": jQuery.support.cssFloat ? "cssFloat" : "styleFloat"
+	},
+
+	// Get and set the style property on a DOM Node
+	style: function( elem, name, value, extra ) {
+		// Don't set styles on text and comment nodes
+		if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 || !elem.style ) {
+			return;
+		}
+
+		// Make sure that we're working with the right name
+		var ret, origName = jQuery.camelCase( name ),
+			style = elem.style, hooks = jQuery.cssHooks[ origName ];
+
+		name = jQuery.cssProps[ origName ] || origName;
+
+		// Check if we're setting a value
+		if ( value !== undefined ) {
+			// Make sure that NaN and null values aren't set. See: #7116
+			if ( typeof value === "number" && isNaN( value ) || value == null ) {
+				return;
+			}
+
+			// If a number was passed in, add 'px' to the (except for certain CSS properties)
+			if ( typeof value === "number" && !jQuery.cssNumber[ origName ] ) {
+				value += "px";
+			}
+
+			// If a hook was provided, use that value, otherwise just set the specified value
+			if ( !hooks || !("set" in hooks) || (value = hooks.set( elem, value )) !== undefined ) {
+				// Wrapped to prevent IE from throwing errors when 'invalid' values are provided
+				// Fixes bug #5509
+				try {
+					style[ name ] = value;
+				} catch(e) {}
+			}
+
+		} else {
+			// If a hook was provided get the non-computed value from there
+			if ( hooks && "get" in hooks && (ret = hooks.get( elem, false, extra )) !== undefined ) {
+				return ret;
+			}
+
+			// Otherwise just get the value from the style object
+			return style[ name ];
+		}
+	},
+
+	css: function( elem, name, extra ) {
+		// Make sure that we're working with the right name
+		var ret, origName = jQuery.camelCase( name ),
+			hooks = jQuery.cssHooks[ origName ];
+
+		name = jQuery.cssProps[ origName ] || origName;
+
+		// If a hook was provided get the computed value from there
+		if ( hooks && "get" in hooks && (ret = hooks.get( elem, true, extra )) !== undefined ) {
+			return ret;
+
+		// Otherwise, if a way to get the computed value exists, use that
+		} else if ( curCSS ) {
+			return curCSS( elem, name, origName );
+		}
+	},
+
+	// A method for quickly swapping in/out CSS properties to get correct calculations
+	swap: function( elem, options, callback ) {
+		var old = {};
+
+		// Remember the old values, and insert the new ones
+		for ( var name in options ) {
+			old[ name ] = elem.style[ name ];
+			elem.style[ name ] = options[ name ];
+		}
+
+		callback.call( elem );
+
+		// Revert the old values
+		for ( name in options ) {
+			elem.style[ name ] = old[ name ];
+		}
+	},
+
+	camelCase: function( string ) {
+		return string.replace( rdashAlpha, fcamelCase );
+	}
+});
+
+// DEPRECATED, Use jQuery.css() instead
+jQuery.curCSS = jQuery.css;
+
+jQuery.each(["height", "width"], function( i, name ) {
+	jQuery.cssHooks[ name ] = {
+		get: function( elem, computed, extra ) {
+			var val;
+
+			if ( computed ) {
+				if ( elem.offsetWidth !== 0 ) {
+					val = getWH( elem, name, extra );
+
+				} else {
+					jQuery.swap( elem, cssShow, function() {
+						val = getWH( elem, name, extra );
+					});
+				}
+
+				if ( val <= 0 ) {
+					val = curCSS( elem, name, name );
+
+					if ( val === "0px" && currentStyle ) {
+						val = currentStyle( elem, name, name );
+					}
+
+					if ( val != null ) {
+						// Should return "auto" instead of 0, use 0 for
+						// temporary backwards-compat
+						return val === "" || val === "auto" ? "0px" : val;
+					}
+				}
+
+				if ( val < 0 || val == null ) {
+					val = elem.style[ name ];
+
+					// Should return "auto" instead of 0, use 0 for
+					// temporary backwards-compat
+					return val === "" || val === "auto" ? "0px" : val;
+				}
+
+				return typeof val === "string" ? val : val + "px";
+			}
+		},
+
+		set: function( elem, value ) {
+			if ( rnumpx.test( value ) ) {
+				// ignore negative width and height values #1599
+				value = parseFloat(value);
+
+				if ( value >= 0 ) {
+					return value + "px";
+				}
+
+			} else {
+				return value;
+			}
+		}
+	};
+});
+
+if ( !jQuery.support.opacity ) {
+	jQuery.cssHooks.opacity = {
+		get: function( elem, computed ) {
+			// IE uses filters for opacity
+			return ropacity.test((computed && elem.currentStyle ? elem.currentStyle.filter : elem.style.filter) || "") ?
+				(parseFloat(RegExp.$1) / 100) + "" :
+				computed ? "1" : "";
+		},
+
+		set: function( elem, value ) {
+			var style = elem.style;
+
+			// IE has trouble with opacity if it does not have layout
+			// Force it by setting the zoom level
+			style.zoom = 1;
+
+			// Set the alpha filter to set the opacity
+			var opacity = jQuery.isNaN(value) ?
+				"" :
+				"alpha(opacity=" + value * 100 + ")",
+				filter = style.filter || "";
+
+			style.filter = ralpha.test(filter) ?
+				filter.replace(ralpha, opacity) :
+				style.filter + ' ' + opacity;
+		}
+	};
+}
+
+if ( document.defaultView && document.defaultView.getComputedStyle ) {
+	getComputedStyle = function( elem, newName, name ) {
+		var ret, defaultView, computedStyle;
+
+		name = name.replace( rupper, "-$1" ).toLowerCase();
+
+		if ( !(defaultView = elem.ownerDocument.defaultView) ) {
+			return undefined;
+		}
+
+		if ( (computedStyle = defaultView.getComputedStyle( elem, null )) ) {
+			ret = computedStyle.getPropertyValue( name );
+			if ( ret === "" && !jQuery.contains( elem.ownerDocument.documentElement, elem ) ) {
+				ret = jQuery.style( elem, name );
+			}
+		}
+
+		return ret;
+	};
+}
+
+if ( document.documentElement.currentStyle ) {
+	currentStyle = function( elem, name ) {
+		var left, rsLeft,
+			ret = elem.currentStyle && elem.currentStyle[ name ],
+			style = elem.style;
+
+		// From the awesome hack by Dean Edwards
+		// http://erik.eae.net/archives/2007/07/27/18.54.15/#comment-102291
+
+		// If we're not dealing with a regular pixel number
+		// but a number that has a weird ending, we need to convert it to pixels
+		if ( !rnumpx.test( ret ) && rnum.test( ret ) ) {
+			// Remember the original values
+			left = style.left;
+			rsLeft = elem.runtimeStyle.left;
+
+			// Put in the new values to get a computed value out
+			elem.runtimeStyle.left = elem.currentStyle.left;
+			style.left = name === "fontSize" ? "1em" : (ret || 0);
+			ret = style.pixelLeft + "px";
+
+			// Revert the changed values
+			style.left = left;
+			elem.runtimeStyle.left = rsLeft;
+		}
+
+		return ret === "" ? "auto" : ret;
+	};
+}
+
+curCSS = getComputedStyle || currentStyle;
+
+function getWH( elem, name, extra ) {
+	var which = name === "width" ? cssWidth : cssHeight,
+		val = name === "width" ? elem.offsetWidth : elem.offsetHeight;
+
+	if ( extra === "border" ) {
+		return val;
+	}
+
+	jQuery.each( which, function() {
+		if ( !extra ) {
+			val -= parseFloat(jQuery.css( elem, "padding" + this )) || 0;
+		}
+
+		if ( extra === "margin" ) {
+			val += parseFloat(jQuery.css( elem, "margin" + this )) || 0;
+
+		} else {
+			val -= parseFloat(jQuery.css( elem, "border" + this + "Width" )) || 0;
+		}
+	});
+
+	return val;
+}
+
+if ( jQuery.expr && jQuery.expr.filters ) {
+	jQuery.expr.filters.hidden = function( elem ) {
+		var width = elem.offsetWidth,
+			height = elem.offsetHeight;
+
+		return (width === 0 && height === 0) || (!jQuery.support.reliableHiddenOffsets && (elem.style.display || jQuery.css( elem, "display" )) === "none");
+	};
+
+	jQuery.expr.filters.visible = function( elem ) {
+		return !jQuery.expr.filters.hidden( elem );
+	};
+}
+
+
+
+
+var jsc = jQuery.now(),
+	rscript = /<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,
+	rselectTextarea = /^(?:select|textarea)/i,
+	rinput = /^(?:color|date|datetime|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,
+	rnoContent = /^(?:GET|HEAD)$/,
+	rbracket = /\[\]$/,
+	jsre = /\=\?(&|$)/,
+	rquery = /\?/,
+	rts = /([?&])_=[^&]*/,
+	rurl = /^(\w+:)?\/\/([^\/?#]+)/,
+	r20 = /%20/g,
+	rhash = /#.*$/,
+
+	// Keep a copy of the old load method
+	_load = jQuery.fn.load;
+
+jQuery.fn.extend({
+	load: function( url, params, callback ) {
+		if ( typeof url !== "string" && _load ) {
+			return _load.apply( this, arguments );
+
+		// Don't do a request if no elements are being requested
+		} else if ( !this.length ) {
+			return this;
+		}
+
+		var off = url.indexOf(" ");
+		if ( off >= 0 ) {
+			var selector = url.slice(off, url.length);
+			url = url.slice(0, off);
+		}
+
+		// Default to a GET request
+		var type = "GET";
+
+		// If the second parameter was provided
+		if ( params ) {
+			// If it's a function
+			if ( jQuery.isFunction( params ) ) {
+				// We assume that it's the callback
+				callback = params;
+				params = null;
+
+			// Otherwise, build a param string
+			} else if ( typeof params === "object" ) {
+				params = jQuery.param( params, jQuery.ajaxSettings.traditional );
+				type = "POST";
+			}
+		}
+
+		var self = this;
+
+		// Request the remote document
+		jQuery.ajax({
+			url: url,
+			type: type,
+			dataType: "html",
+			data: params,
+			complete: function( res, status ) {
+				// If successful, inject the HTML into all the matched elements
+				if ( status === "success" || status === "notmodified" ) {
+					// See if a selector was specified
+					self.html( selector ?
+						// Create a dummy div to hold the results
+						jQuery("<div>")
+							// inject the contents of the document in, removing the scripts
+							// to avoid any 'Permission Denied' errors in IE
+							.append(res.responseText.replace(rscript, ""))
+
+							// Locate the specified elements
+							.find(selector) :
+
+						// If not, just inject the full result
+						res.responseText );
+				}
+
+				if ( callback ) {
+					self.each( callback, [res.responseText, status, res] );
+				}
+			}
+		});
+
+		return this;
+	},
+
+	serialize: function() {
+		return jQuery.param(this.serializeArray());
+	},
+
+	serializeArray: function() {
+		return this.map(function() {
+			return this.elements ? jQuery.makeArray(this.elements) : this;
+		})
+		.filter(function() {
+			return this.name && !this.disabled &&
+				(this.checked || rselectTextarea.test(this.nodeName) ||
+					rinput.test(this.type));
+		})
+		.map(function( i, elem ) {
+			var val = jQuery(this).val();
+
+			return val == null ?
+				null :
+				jQuery.isArray(val) ?
+					jQuery.map( val, function( val, i ) {
+						return { name: elem.name, value: val };
+					}) :
+					{ name: elem.name, value: val };
+		}).get();
+	}
+});
+
+// Attach a bunch of functions for handling common AJAX events
+jQuery.each( "ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "), function( i, o ) {
+	jQuery.fn[o] = function( f ) {
+		return this.bind(o, f);
+	};
+});
+
+jQuery.extend({
+	get: function( url, data, callback, type ) {
+		// shift arguments if data argument was omited
+		if ( jQuery.isFunction( data ) ) {
+			type = type || callback;
+			callback = data;
+			data = null;
+		}
+
+		return jQuery.ajax({
+			type: "GET",
+			url: url,
+			data: data,
+			success: callback,
+			dataType: type
+		});
+	},
+
+	getScript: function( url, callback ) {
+		return jQuery.get(url, null, callback, "script");
+	},
+
+	getJSON: function( url, data, callback ) {
+		return jQuery.get(url, data, callback, "json");
+	},
+
+	post: function( url, data, callback, type ) {
+		// shift arguments if data argument was omited
+		if ( jQuery.isFunction( data ) ) {
+			type = type || callback;
+			callback = data;
+			data = {};
+		}
+
+		return jQuery.ajax({
+			type: "POST",
+			url: url,
+			data: data,
+			success: callback,
+			dataType: type
+		});
+	},
+
+	ajaxSetup: function( settings ) {
+		jQuery.extend( jQuery.ajaxSettings, settings );
+	},
+
+	ajaxSettings: {
+		url: location.href,
+		global: true,
+		type: "GET",
+		contentType: "application/x-www-form-urlencoded",
+		processData: true,
+		async: true,
+		/*
+		timeout: 0,
+		data: null,
+		username: null,
+		password: null,
+		traditional: false,
+		*/
+		// This function can be overriden by calling jQuery.ajaxSetup
+		xhr: function() {
+			return new window.XMLHttpRequest();
+		},
+		accepts: {
+			xml: "application/xml, text/xml",
+			html: "text/html",
+			script: "text/javascript, application/javascript",
+			json: "application/json, text/javascript",
+			text: "text/plain",
+			_default: "*/*"
+		}
+	},
+
+	ajax: function( origSettings ) {
+		var s = jQuery.extend(true, {}, jQuery.ajaxSettings, origSettings),
+			jsonp, status, data, type = s.type.toUpperCase(), noContent = rnoContent.test(type);
+
+		s.url = s.url.replace( rhash, "" );
+
+		// Use original (not extended) context object if it was provided
+		s.context = origSettings && origSettings.context != null ? origSettings.context : s;
+
+		// convert data if not already a string
+		if ( s.data && s.processData && typeof s.data !== "string" ) {
+			s.data = jQuery.param( s.data, s.traditional );
+		}
+
+		// Handle JSONP Parameter Callbacks
+		if ( s.dataType === "jsonp" ) {
+			if ( type === "GET" ) {
+				if ( !jsre.test( s.url ) ) {
+					s.url += (rquery.test( s.url ) ? "&" : "?") + (s.jsonp || "callback") + "=?";
+				}
+			} else if ( !s.data || !jsre.test(s.data) ) {
+				s.data = (s.data ? s.data + "&" : "") + (s.jsonp || "callback") + "=?";
+			}
+			s.dataType = "json";
+		}
+
+		// Build temporary JSONP function
+		if ( s.dataType === "json" && (s.data && jsre.test(s.data) || jsre.test(s.url)) ) {
+			jsonp = s.jsonpCallback || ("jsonp" + jsc++);
+
+			// Replace the =? sequence both in the query string and the data
+			if ( s.data ) {
+				s.data = (s.data + "").replace(jsre, "=" + jsonp + "$1");
+			}
+
+			s.url = s.url.replace(jsre, "=" + jsonp + "$1");
+
+			// We need to make sure
+			// that a JSONP style response is executed properly
+			s.dataType = "script";
+
+			// Handle JSONP-style loading
+			var customJsonp = window[ jsonp ];
+
+			window[ jsonp ] = function( tmp ) {
+				if ( jQuery.isFunction( customJsonp ) ) {
+					customJsonp( tmp );
+
+				} else {
+					// Garbage collect
+					window[ jsonp ] = undefined;
+
+					try {
+						delete window[ jsonp ];
+					} catch( jsonpError ) {}
+				}
+
+				data = tmp;
+				jQuery.handleSuccess( s, xhr, status, data );
+				jQuery.handleComplete( s, xhr, status, data );
+				
+				if ( head ) {
+					head.removeChild( script );
+				}
+			};
+		}
+
+		if ( s.dataType === "script" && s.cache === null ) {
+			s.cache = false;
+		}
+
+		if ( s.cache === false && noContent ) {
+			var ts = jQuery.now();
+
+			// try replacing _= if it is there
+			var ret = s.url.replace(rts, "$1_=" + ts);
+
+			// if nothing was replaced, add timestamp to the end
+			s.url = ret + ((ret === s.url) ? (rquery.test(s.url) ? "&" : "?") + "_=" + ts : "");
+		}
+
+		// If data is available, append data to url for GET/HEAD requests
+		if ( s.data && noContent ) {
+			s.url += (rquery.test(s.url) ? "&" : "?") + s.data;
+		}
+
+		// Watch for a new set of requests
+		if ( s.global && jQuery.active++ === 0 ) {
+			jQuery.event.trigger( "ajaxStart" );
+		}
+
+		// Matches an absolute URL, and saves the domain
+		var parts = rurl.exec( s.url ),
+			remote = parts && (parts[1] && parts[1].toLowerCase() !== location.protocol || parts[2].toLowerCase() !== location.host);
+
+		// If we're requesting a remote document
+		// and trying to load JSON or Script with a GET
+		if ( s.dataType === "script" && type === "GET" && remote ) {
+			var head = document.getElementsByTagName("head")[0] || document.documentElement;
+			var script = document.createElement("script");
+			if ( s.scriptCharset ) {
+				script.charset = s.scriptCharset;
+			}
+			script.src = s.url;
+
+			// Handle Script loading
+			if ( !jsonp ) {
+				var done = false;
+
+				// Attach handlers for all browsers
+				script.onload = script.onreadystatechange = function() {
+					if ( !done && (!this.readyState ||
+							this.readyState === "loaded" || this.readyState === "complete") ) {
+						done = true;
+						jQuery.handleSuccess( s, xhr, status, data );
+						jQuery.handleComplete( s, xhr, status, data );
+
+						// Handle memory leak in IE
+						script.onload = script.onreadystatechange = null;
+						if ( head && script.parentNode ) {
+							head.removeChild( script );
+						}
+					}
+				};
+			}
+
+			// Use insertBefore instead of appendChild  to circumvent an IE6 bug.
+			// This arises when a base node is used (#2709 and #4378).
+			head.insertBefore( script, head.firstChild );
+
+			// We handle everything using the script element injection
+			return undefined;
+		}
+
+		var requestDone = false;
+
+		// Create the request object
+		var xhr = s.xhr();
+
+		if ( !xhr ) {
+			return;
+		}
+
+		// Open the socket
+		// Passing null username, generates a login popup on Opera (#2865)
+		if ( s.username ) {
+			xhr.open(type, s.url, s.async, s.username, s.password);
+		} else {
+			xhr.open(type, s.url, s.async);
+		}
+
+		// Need an extra try/catch for cross domain requests in Firefox 3
+		try {
+			// Set content-type if data specified and content-body is valid for this type
+			if ( (s.data != null && !noContent) || (origSettings && origSettings.contentType) ) {
+				xhr.setRequestHeader("Content-Type", s.contentType);
+			}
+
+			// Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
+			if ( s.ifModified ) {
+				if ( jQuery.lastModified[s.url] ) {
+					xhr.setRequestHeader("If-Modified-Since", jQuery.lastModified[s.url]);
+				}
+
+				if ( jQuery.etag[s.url] ) {
+					xhr.setRequestHeader("If-None-Match", jQuery.etag[s.url]);
+				}
+			}
+
+			// Set header so the called script knows that it's an XMLHttpRequest
+			// Only send the header if it's not a remote XHR
+			if ( !remote ) {
+				xhr.setRequestHeader("X-Requested-With", "XMLHttpRequest");
+			}
+
+			// Set the Accepts header for the server, depending on the dataType
+			xhr.setRequestHeader("Accept", s.dataType && s.accepts[ s.dataType ] ?
+				s.accepts[ s.dataType ] + ", */*; q=0.01" :
+				s.accepts._default );
+		} catch( headerError ) {}
+
+		// Allow custom headers/mimetypes and early abort
+		if ( s.beforeSend && s.beforeSend.call(s.context, xhr, s) === false ) {
+			// Handle the global AJAX counter
+			if ( s.global && jQuery.active-- === 1 ) {
+				jQuery.event.trigger( "ajaxStop" );
+			}
+
+			// close opended socket
+			xhr.abort();
+			return false;
+		}
+
+		if ( s.global ) {
+			jQuery.triggerGlobal( s, "ajaxSend", [xhr, s] );
+		}
+
+		// Wait for a response to come back
+		var onreadystatechange = xhr.onreadystatechange = function( isTimeout ) {
+			// The request was aborted
+			if ( !xhr || xhr.readyState === 0 || isTimeout === "abort" ) {
+				// Opera doesn't call onreadystatechange before this point
+				// so we simulate the call
+				if ( !requestDone ) {
+					jQuery.handleComplete( s, xhr, status, data );
+				}
+
+				requestDone = true;
+				if ( xhr ) {
+					xhr.onreadystatechange = jQuery.noop;
+				}
+
+			// The transfer is complete and the data is available, or the request timed out
+			} else if ( !requestDone && xhr && (xhr.readyState === 4 || isTimeout === "timeout") ) {
+				requestDone = true;
+				xhr.onreadystatechange = jQuery.noop;
+
+				status = isTimeout === "timeout" ?
+					"timeout" :
+					!jQuery.httpSuccess( xhr ) ?
+						"error" :
+						s.ifModified && jQuery.httpNotModified( xhr, s.url ) ?
+							"notmodified" :
+							"success";
+
+				var errMsg;
+
+				if ( status === "success" ) {
+					// Watch for, and catch, XML document parse errors
+					try {
+						// process the data (runs the xml through httpData regardless of callback)
+						data = jQuery.httpData( xhr, s.dataType, s );
+					} catch( parserError ) {
+						status = "parsererror";
+						errMsg = parserError;
+					}
+				}
+
+				// Make sure that the request was successful or notmodified
+				if ( status === "success" || status === "notmodified" ) {
+					// JSONP handles its own success callback
+					if ( !jsonp ) {
+						jQuery.handleSuccess( s, xhr, status, data );
+					}
+				} else {
+					jQuery.handleError( s, xhr, status, errMsg );
+				}
+
+				// Fire the complete handlers
+				if ( !jsonp ) {
+					jQuery.handleComplete( s, xhr, status, data );
+				}
+
+				if ( isTimeout === "timeout" ) {
+					xhr.abort();
+				}
+
+				// Stop memory leaks
+				if ( s.async ) {
+					xhr = null;
+				}
+			}
+		};
+
+		// Override the abort handler, if we can (IE 6 doesn't allow it, but that's OK)
+		// Opera doesn't fire onreadystatechange at all on abort
+		try {
+			var oldAbort = xhr.abort;
+			xhr.abort = function() {
+				if ( xhr ) {
+					// oldAbort has no call property in IE7 so
+					// just do it this way, which works in all
+					// browsers
+					Function.prototype.call.call( oldAbort, xhr );
+				}
+
+				onreadystatechange( "abort" );
+			};
+		} catch( abortError ) {}
+
+		// Timeout checker
+		if ( s.async && s.timeout > 0 ) {
+			setTimeout(function() {
+				// Check to see if the request is still happening
+				if ( xhr && !requestDone ) {
+					onreadystatechange( "timeout" );
+				}
+			}, s.timeout);
+		}
+
+		// Send the data
+		try {
+			xhr.send( noContent || s.data == null ? null : s.data );
+
+		} catch( sendError ) {
+			jQuery.handleError( s, xhr, null, sendError );
+
+			// Fire the complete handlers
+			jQuery.handleComplete( s, xhr, status, data );
+		}
+
+		// firefox 1.5 doesn't fire statechange for sync requests
+		if ( !s.async ) {
+			onreadystatechange();
+		}
+
+		// return XMLHttpRequest to allow aborting the request etc.
+		return xhr;
+	},
+
+	// Serialize an array of form elements or a set of
+	// key/values into a query string
+	param: function( a, traditional ) {
+		var s = [],
+			add = function( key, value ) {
+				// If value is a function, invoke it and return its value
+				value = jQuery.isFunction(value) ? value() : value;
+				s[ s.length ] = encodeURIComponent(key) + "=" + encodeURIComponent(value);
+			};
+		
+		// Set traditional to true for jQuery <= 1.3.2 behavior.
+		if ( traditional === undefined ) {
+			traditional = jQuery.ajaxSettings.traditional;
+		}
+		
+		// If an array was passed in, assume that it is an array of form elements.
+		if ( jQuery.isArray(a) || a.jquery ) {
+			// Serialize the form elements
+			jQuery.each( a, function() {
+				add( this.name, this.value );
+			});
+			
+		} else {
+			// If traditional, encode the "old" way (the way 1.3.2 or older
+			// did it), otherwise encode params recursively.
+			for ( var prefix in a ) {
+				buildParams( prefix, a[prefix], traditional, add );
+			}
+		}
+
+		// Return the resulting serialization
+		return s.join("&").replace(r20, "+");
+	}
+});
+
+function buildParams( prefix, obj, traditional, add ) {
+	if ( jQuery.isArray(obj) && obj.length ) {
+		// Serialize array item.
+		jQuery.each( obj, function( i, v ) {
+			if ( traditional || rbracket.test( prefix ) ) {
+				// Treat each array item as a scalar.
+				add( prefix, v );
+
+			} else {
+				// If array item is non-scalar (array or object), encode its
+				// numeric index to resolve deserialization ambiguity issues.
+				// Note that rack (as of 1.0.0) can't currently deserialize
+				// nested arrays properly, and attempting to do so may cause
+				// a server error. Possible fixes are to modify rack's
+				// deserialization algorithm or to provide an option or flag
+				// to force array serialization to be shallow.
+				buildParams( prefix + "[" + ( typeof v === "object" || jQuery.isArray(v) ? i : "" ) + "]", v, traditional, add );
+			}
+		});
+			
+	} else if ( !traditional && obj != null && typeof obj === "object" ) {
+		if ( jQuery.isEmptyObject( obj ) ) {
+			add( prefix, "" );
+
+		// Serialize object item.
+		} else {
+			jQuery.each( obj, function( k, v ) {
+				buildParams( prefix + "[" + k + "]", v, traditional, add );
+			});
+		}
+					
+	} else {
+		// Serialize scalar item.
+		add( prefix, obj );
+	}
+}
+
+// This is still on the jQuery object... for now
+// Want to move this to jQuery.ajax some day
+jQuery.extend({
+
+	// Counter for holding the number of active queries
+	active: 0,
+
+	// Last-Modified header cache for next request
+	lastModified: {},
+	etag: {},
+
+	handleError: function( s, xhr, status, e ) {
+		// If a local callback was specified, fire it
+		if ( s.error ) {
+			s.error.call( s.context, xhr, status, e );
+		}
+
+		// Fire the global callback
+		if ( s.global ) {
+			jQuery.triggerGlobal( s, "ajaxError", [xhr, s, e] );
+		}
+	},
+
+	handleSuccess: function( s, xhr, status, data ) {
+		// If a local callback was specified, fire it and pass it the data
+		if ( s.success ) {
+			s.success.call( s.context, data, status, xhr );
+		}
+
+		// Fire the global callback
+		if ( s.global ) {
+			jQuery.triggerGlobal( s, "ajaxSuccess", [xhr, s] );
+		}
+	},
+
+	handleComplete: function( s, xhr, status ) {
+		// Process result
+		if ( s.complete ) {
+			s.complete.call( s.context, xhr, status );
+		}
+
+		// The request was completed
+		if ( s.global ) {
+			jQuery.triggerGlobal( s, "ajaxComplete", [xhr, s] );
+		}
+
+		// Handle the global AJAX counter
+		if ( s.global && jQuery.active-- === 1 ) {
+			jQuery.event.trigger( "ajaxStop" );
+		}
+	},
+		
+	triggerGlobal: function( s, type, args ) {
+		(s.context && s.context.url == null ? jQuery(s.context) : jQuery.event).trigger(type, args);
+	},
+
+	// Determines if an XMLHttpRequest was successful or not
+	httpSuccess: function( xhr ) {
+		try {
+			// IE error sometimes returns 1223 when it should be 204 so treat it as success, see #1450
+			return !xhr.status && location.protocol === "file:" ||
+				xhr.status >= 200 && xhr.status < 300 ||
+				xhr.status === 304 || xhr.status === 1223;
+		} catch(e) {}
+
+		return false;
+	},
+
+	// Determines if an XMLHttpRequest returns NotModified
+	httpNotModified: function( xhr, url ) {
+		var lastModified = xhr.getResponseHeader("Last-Modified"),
+			etag = xhr.getResponseHeader("Etag");
+
+		if ( lastModified ) {
+			jQuery.lastModified[url] = lastModified;
+		}
+
+		if ( etag ) {
+			jQuery.etag[url] = etag;
+		}
+
+		return xhr.status === 304;
+	},
+
+	httpData: function( xhr, type, s ) {
+		var ct = xhr.getResponseHeader("content-type") || "",
+			xml = type === "xml" || !type && ct.indexOf("xml") >= 0,
+			data = xml ? xhr.responseXML : xhr.responseText;
+
+		if ( xml && data.documentElement.nodeName === "parsererror" ) {
+			jQuery.error( "parsererror" );
+		}
+
+		// Allow a pre-filtering function to sanitize the response
+		// s is checked to keep backwards compatibility
+		if ( s && s.dataFilter ) {
+			data = s.dataFilter( data, type );
+		}
+
+		// The filter can actually parse the response
+		if ( typeof data === "string" ) {
+			// Get the JavaScript object, if JSON is used.
+			if ( type === "json" || !type && ct.indexOf("json") >= 0 ) {
+				data = jQuery.parseJSON( data );
+
+			// If the type is "script", eval it in global context
+			} else if ( type === "script" || !type && ct.indexOf("javascript") >= 0 ) {
+				jQuery.globalEval( data );
+			}
+		}
+
+		return data;
+	}
+
+});
+
+/*
+ * Create the request object; Microsoft failed to properly
+ * implement the XMLHttpRequest in IE7 (can't request local files),
+ * so we use the ActiveXObject when it is available
+ * Additionally XMLHttpRequest can be disabled in IE7/IE8 so
+ * we need a fallback.
+ */
+if ( window.ActiveXObject ) {
+	jQuery.ajaxSettings.xhr = function() {
+		if ( window.location.protocol !== "file:" ) {
+			try {
+				return new window.XMLHttpRequest();
+			} catch(xhrError) {}
+		}
+
+		try {
+			return new window.ActiveXObject("Microsoft.XMLHTTP");
+		} catch(activeError) {}
+	};
+}
+
+// Does this browser support XHR requests?
+jQuery.support.ajax = !!jQuery.ajaxSettings.xhr();
+
+
+
+
+var elemdisplay = {},
+	rfxtypes = /^(?:toggle|show|hide)$/,
+	rfxnum = /^([+\-]=)?([\d+.\-]+)(.*)$/,
+	timerId,
+	fxAttrs = [
+		// height animations
+		[ "height", "marginTop", "marginBottom", "paddingTop", "paddingBottom" ],
+		// width animations
+		[ "width", "marginLeft", "marginRight", "paddingLeft", "paddingRight" ],
+		// opacity animations
+		[ "opacity" ]
+	];
+
+jQuery.fn.extend({
+	show: function( speed, easing, callback ) {
+		var elem, display;
+
+		if ( speed || speed === 0 ) {
+			return this.animate( genFx("show", 3), speed, easing, callback);
+
+		} else {
+			for ( var i = 0, j = this.length; i < j; i++ ) {
+				elem = this[i];
+				display = elem.style.display;
+
+				// Reset the inline display of this element to learn if it is
+				// being hidden by cascaded rules or not
+				if ( !jQuery.data(elem, "olddisplay") && display === "none" ) {
+					display = elem.style.display = "";
+				}
+
+				// Set elements which have been overridden with display: none
+				// in a stylesheet to whatever the default browser style is
+				// for such an element
+				if ( display === "" && jQuery.css( elem, "display" ) === "none" ) {
+					jQuery.data(elem, "olddisplay", defaultDisplay(elem.nodeName));
+				}
+			}
+
+			// Set the display of most of the elements in a second loop
+			// to avoid the constant reflow
+			for ( i = 0; i < j; i++ ) {
+				elem = this[i];
+				display = elem.style.display;
+
+				if ( display === "" || display === "none" ) {
+					elem.style.display = jQuery.data(elem, "olddisplay") || "";
+				}
+			}
+
+			return this;
+		}
+	},
+
+	hide: function( speed, easing, callback ) {
+		if ( speed || speed === 0 ) {
+			return this.animate( genFx("hide", 3), speed, easing, callback);
+
+		} else {
+			for ( var i = 0, j = this.length; i < j; i++ ) {
+				var display = jQuery.css( this[i], "display" );
+
+				if ( display !== "none" ) {
+					jQuery.data( this[i], "olddisplay", display );
+				}
+			}
+
+			// Set the display of the elements in a second loop
+			// to avoid the constant reflow
+			for ( i = 0; i < j; i++ ) {
+				this[i].style.display = "none";
+			}
+
+			return this;
+		}
+	},
+
+	// Save the old toggle function
+	_toggle: jQuery.fn.toggle,
+
+	toggle: function( fn, fn2, callback ) {
+		var bool = typeof fn === "boolean";
+
+		if ( jQuery.isFunction(fn) && jQuery.isFunction(fn2) ) {
+			this._toggle.apply( this, arguments );
+
+		} else if ( fn == null || bool ) {
+			this.each(function() {
+				var state = bool ? fn : jQuery(this).is(":hidden");
+				jQuery(this)[ state ? "show" : "hide" ]();
+			});
+
+		} else {
+			this.animate(genFx("toggle", 3), fn, fn2, callback);
+		}
+
+		return this;
+	},
+
+	fadeTo: function( speed, to, easing, callback ) {
+		return this.filter(":hidden").css("opacity", 0).show().end()
+					.animate({opacity: to}, speed, easing, callback);
+	},
+
+	animate: function( prop, speed, easing, callback ) {
+		var optall = jQuery.speed(speed, easing, callback);
+
+		if ( jQuery.isEmptyObject( prop ) ) {
+			return this.each( optall.complete );
+		}
+
+		return this[ optall.queue === false ? "each" : "queue" ](function() {
+			// XXX 'this' does not always have a nodeName when running the
+			// test suite
+
+			var opt = jQuery.extend({}, optall), p,
+				isElement = this.nodeType === 1,
+				hidden = isElement && jQuery(this).is(":hidden"),
+				self = this;
+
+			for ( p in prop ) {
+				var name = jQuery.camelCase( p );
+
+				if ( p !== name ) {
+					prop[ name ] = prop[ p ];
+					delete prop[ p ];
+					p = name;
+				}
+
+				if ( prop[p] === "hide" && hidden || prop[p] === "show" && !hidden ) {
+					return opt.complete.call(this);
+				}
+
+				if ( isElement && ( p === "height" || p === "width" ) ) {
+					// Make sure that nothing sneaks out
+					// Record all 3 overflow attributes because IE does not
+					// change the overflow attribute when overflowX and
+					// overflowY are set to the same value
+					opt.overflow = [ this.style.overflow, this.style.overflowX, this.style.overflowY ];
+
+					// Set display property to inline-block for height/width
+					// animations on inline elements that are having width/height
+					// animated
+					if ( jQuery.css( this, "display" ) === "inline" &&
+							jQuery.css( this, "float" ) === "none" ) {
+						if ( !jQuery.support.inlineBlockNeedsLayout ) {
+							this.style.display = "inline-block";
+
+						} else {
+							var display = defaultDisplay(this.nodeName);
+
+							// inline-level elements accept inline-block;
+							// block-level elements need to be inline with layout
+							if ( display === "inline" ) {
+								this.style.display = "inline-block";
+
+							} else {
+								this.style.display = "inline";
+								this.style.zoom = 1;
+							}
+						}
+					}
+				}
+
+				if ( jQuery.isArray( prop[p] ) ) {
+					// Create (if needed) and add to specialEasing
+					(opt.specialEasing = opt.specialEasing || {})[p] = prop[p][1];
+					prop[p] = prop[p][0];
+				}
+			}
+
+			if ( opt.overflow != null ) {
+				this.style.overflow = "hidden";
+			}
+
+			opt.curAnim = jQuery.extend({}, prop);
+
+			jQuery.each( prop, function( name, val ) {
+				var e = new jQuery.fx( self, opt, name );
+
+				if ( rfxtypes.test(val) ) {
+					e[ val === "toggle" ? hidden ? "show" : "hide" : val ]( prop );
+
+				} else {
+					var parts = rfxnum.exec(val),
+						start = e.cur() || 0;
+
+					if ( parts ) {
+						var end = parseFloat( parts[2] ),
+							unit = parts[3] || "px";
+
+						// We need to compute starting value
+						if ( unit !== "px" ) {
+							jQuery.style( self, name, (end || 1) + unit);
+							start = ((end || 1) / e.cur()) * start;
+							jQuery.style( self, name, start + unit);
+						}
+
+						// If a +=/-= token was provided, we're doing a relative animation
+						if ( parts[1] ) {
+							end = ((parts[1] === "-=" ? -1 : 1) * end) + start;
+						}
+
+						e.custom( start, end, unit );
+
+					} else {
+						e.custom( start, val, "" );
+					}
+				}
+			});
+
+			// For JS strict compliance
+			return true;
+		});
+	},
+
+	stop: function( clearQueue, gotoEnd ) {
+		var timers = jQuery.timers;
+
+		if ( clearQueue ) {
+			this.queue([]);
+		}
+
+		this.each(function() {
+			// go in reverse order so anything added to the queue during the loop is ignored
+			for ( var i = timers.length - 1; i >= 0; i-- ) {
+				if ( timers[i].elem === this ) {
+					if (gotoEnd) {
+						// force the next step to be the last
+						timers[i](true);
+					}
+
+					timers.splice(i, 1);
+				}
+			}
+		});
+
+		// start the next in the queue if the last step wasn't forced
+		if ( !gotoEnd ) {
+			this.dequeue();
+		}
+
+		return this;
+	}
+
+});
+
+function genFx( type, num ) {
+	var obj = {};
+
+	jQuery.each( fxAttrs.concat.apply([], fxAttrs.slice(0,num)), function() {
+		obj[ this ] = type;
+	});
+
+	return obj;
+}
+
+// Generate shortcuts for custom animations
+jQuery.each({
+	slideDown: genFx("show", 1),
+	slideUp: genFx("hide", 1),
+	slideToggle: genFx("toggle", 1),
+	fadeIn: { opacity: "show" },
+	fadeOut: { opacity: "hide" },
+	fadeToggle: { opacity: "toggle" }
+}, function( name, props ) {
+	jQuery.fn[ name ] = function( speed, easing, callback ) {
+		return this.animate( props, speed, easing, callback );
+	};
+});
+
+jQuery.extend({
+	speed: function( speed, easing, fn ) {
+		var opt = speed && typeof speed === "object" ? jQuery.extend({}, speed) : {
+			complete: fn || !fn && easing ||
+				jQuery.isFunction( speed ) && speed,
+			duration: speed,
+			easing: fn && easing || easing && !jQuery.isFunction(easing) && easing
+		};
+
+		opt.duration = jQuery.fx.off ? 0 : typeof opt.duration === "number" ? opt.duration :
+			opt.duration in jQuery.fx.speeds ? jQuery.fx.speeds[opt.duration] : jQuery.fx.speeds._default;
+
+		// Queueing
+		opt.old = opt.complete;
+		opt.complete = function() {
+			if ( opt.queue !== false ) {
+				jQuery(this).dequeue();
+			}
+			if ( jQuery.isFunction( opt.old ) ) {
+				opt.old.call( this );
+			}
+		};
+
+		return opt;
+	},
+
+	easing: {
+		linear: function( p, n, firstNum, diff ) {
+			return firstNum + diff * p;
+		},
+		swing: function( p, n, firstNum, diff ) {
+			return ((-Math.cos(p*Math.PI)/2) + 0.5) * diff + firstNum;
+		}
+	},
+
+	timers: [],
+
+	fx: function( elem, options, prop ) {
+		this.options = options;
+		this.elem = elem;
+		this.prop = prop;
+
+		if ( !options.orig ) {
+			options.orig = {};
+		}
+	}
+
+});
+
+jQuery.fx.prototype = {
+	// Simple function for setting a style value
+	update: function() {
+		if ( this.options.step ) {
+			this.options.step.call( this.elem, this.now, this );
+		}
+
+		(jQuery.fx.step[this.prop] || jQuery.fx.step._default)( this );
+	},
+
+	// Get the current size
+	cur: function() {
+		if ( this.elem[this.prop] != null && (!this.elem.style || this.elem.style[this.prop] == null) ) {
+			return this.elem[ this.prop ];
+		}
+
+		var r = parseFloat( jQuery.css( this.elem, this.prop ) );
+		return r && r > -10000 ? r : 0;
+	},
+
+	// Start an animation from one number to another
+	custom: function( from, to, unit ) {
+		var self = this,
+			fx = jQuery.fx;
+
+		this.startTime = jQuery.now();
+		this.start = from;
+		this.end = to;
+		this.unit = unit || this.unit || "px";
+		this.now = this.start;
+		this.pos = this.state = 0;
+
+		function t( gotoEnd ) {
+			return self.step(gotoEnd);
+		}
+
+		t.elem = this.elem;
+
+		if ( t() && jQuery.timers.push(t) && !timerId ) {
+			timerId = setInterval(fx.tick, fx.interval);
+		}
+	},
+
+	// Simple 'show' function
+	show: function() {
+		// Remember where we started, so that we can go back to it later
+		this.options.orig[this.prop] = jQuery.style( this.elem, this.prop );
+		this.options.show = true;
+
+		// Begin the animation
+		// Make sure that we start at a small width/height to avoid any
+		// flash of content
+		this.custom(this.prop === "width" || this.prop === "height" ? 1 : 0, this.cur());
+
+		// Start by showing the element
+		jQuery( this.elem ).show();
+	},
+
+	// Simple 'hide' function
+	hide: function() {
+		// Remember where we started, so that we can go back to it later
+		this.options.orig[this.prop] = jQuery.style( this.elem, this.prop );
+		this.options.hide = true;
+
+		// Begin the animation
+		this.custom(this.cur(), 0);
+	},
+
+	// Each step of an animation
+	step: function( gotoEnd ) {
+		var t = jQuery.now(), done = true;
+
+		if ( gotoEnd || t >= this.options.duration + this.startTime ) {
+			this.now = this.end;
+			this.pos = this.state = 1;
+			this.update();
+
+			this.options.curAnim[ this.prop ] = true;
+
+			for ( var i in this.options.curAnim ) {
+				if ( this.options.curAnim[i] !== true ) {
+					done = false;
+				}
+			}
+
+			if ( done ) {
+				// Reset the overflow
+				if ( this.options.overflow != null && !jQuery.support.shrinkWrapBlocks ) {
+					var elem = this.elem,
+						options = this.options;
+
+					jQuery.each( [ "", "X", "Y" ], function (index, value) {
+						elem.style[ "overflow" + value ] = options.overflow[index];
+					} );
+				}
+
+				// Hide the element if the "hide" operation was done
+				if ( this.options.hide ) {
+					jQuery(this.elem).hide();
+				}
+
+				// Reset the properties, if the item has been hidden or shown
+				if ( this.options.hide || this.options.show ) {
+					for ( var p in this.options.curAnim ) {
+						jQuery.style( this.elem, p, this.options.orig[p] );
+					}
+				}
+
+				// Execute the complete function
+				this.options.complete.call( this.elem );
+			}
+
+			return false;
+
+		} else {
+			var n = t - this.startTime;
+			this.state = n / this.options.duration;
+
+			// Perform the easing function, defaults to swing
+			var specialEasing = this.options.specialEasing && this.options.specialEasing[this.prop];
+			var defaultEasing = this.options.easing || (jQuery.easing.swing ? "swing" : "linear");
+			this.pos = jQuery.easing[specialEasing || defaultEasing](this.state, n, 0, 1, this.options.duration);
+			this.now = this.start + ((this.end - this.start) * this.pos);
+
+			// Perform the next step of the animation
+			this.update();
+		}
+
+		return true;
+	}
+};
+
+jQuery.extend( jQuery.fx, {
+	tick: function() {
+		var timers = jQuery.timers;
+
+		for ( var i = 0; i < timers.length; i++ ) {
+			if ( !timers[i]() ) {
+				timers.splice(i--, 1);
+			}
+		}
+
+		if ( !timers.length ) {
+			jQuery.fx.stop();
+		}
+	},
+
+	interval: 13,
+
+	stop: function() {
+		clearInterval( timerId );
+		timerId = null;
+	},
+
+	speeds: {
+		slow: 600,
+		fast: 200,
+		// Default speed
+		_default: 400
+	},
+
+	step: {
+		opacity: function( fx ) {
+			jQuery.style( fx.elem, "opacity", fx.now );
+		},
+
+		_default: function( fx ) {
+			if ( fx.elem.style && fx.elem.style[ fx.prop ] != null ) {
+				fx.elem.style[ fx.prop ] = (fx.prop === "width" || fx.prop === "height" ? Math.max(0, fx.now) : fx.now) + fx.unit;
+			} else {
+				fx.elem[ fx.prop ] = fx.now;
+			}
+		}
+	}
+});
+
+if ( jQuery.expr && jQuery.expr.filters ) {
+	jQuery.expr.filters.animated = function( elem ) {
+		return jQuery.grep(jQuery.timers, function( fn ) {
+			return elem === fn.elem;
+		}).length;
+	};
+}
+
+function defaultDisplay( nodeName ) {
+	if ( !elemdisplay[ nodeName ] ) {
+		var elem = jQuery("<" + nodeName + ">").appendTo("body"),
+			display = elem.css("display");
+
+		elem.remove();
+
+		if ( display === "none" || display === "" ) {
+			display = "block";
+		}
+
+		elemdisplay[ nodeName ] = display;
+	}
+
+	return elemdisplay[ nodeName ];
+}
+
+
+
+
+var rtable = /^t(?:able|d|h)$/i,
+	rroot = /^(?:body|html)$/i;
+
+if ( "getBoundingClientRect" in document.documentElement ) {
+	jQuery.fn.offset = function( options ) {
+		var elem = this[0], box;
+
+		if ( options ) { 
+			return this.each(function( i ) {
+				jQuery.offset.setOffset( this, options, i );
+			});
+		}
+
+		if ( !elem || !elem.ownerDocument ) {
+			return null;
+		}
+
+		if ( elem === elem.ownerDocument.body ) {
+			return jQuery.offset.bodyOffset( elem );
+		}
+
+		try {
+			box = elem.getBoundingClientRect();
+		} catch(e) {}
+
+		var doc = elem.ownerDocument,
+			docElem = doc.documentElement;
+
+		// Make sure we're not dealing with a disconnected DOM node
+		if ( !box || !jQuery.contains( docElem, elem ) ) {
+			return box || { top: 0, left: 0 };
+		}
+
+		var body = doc.body,
+			win = getWindow(doc),
+			clientTop  = docElem.clientTop  || body.clientTop  || 0,
+			clientLeft = docElem.clientLeft || body.clientLeft || 0,
+			scrollTop  = (win.pageYOffset || jQuery.support.boxModel && docElem.scrollTop  || body.scrollTop ),
+			scrollLeft = (win.pageXOffset || jQuery.support.boxModel && docElem.scrollLeft || body.scrollLeft),
+			top  = box.top  + scrollTop  - clientTop,
+			left = box.left + scrollLeft - clientLeft;
+
+		return { top: top, left: left };
+	};
+
+} else {
+	jQuery.fn.offset = function( options ) {
+		var elem = this[0];
+
+		if ( options ) { 
+			return this.each(function( i ) {
+				jQuery.offset.setOffset( this, options, i );
+			});
+		}
+
+		if ( !elem || !elem.ownerDocument ) {
+			return null;
+		}
+
+		if ( elem === elem.ownerDocument.body ) {
+			return jQuery.offset.bodyOffset( elem );
+		}
+
+		jQuery.offset.initialize();
+
+		var computedStyle,
+			offsetParent = elem.offsetParent,
+			prevOffsetParent = elem,
+			doc = elem.ownerDocument,
+			docElem = doc.documentElement,
+			body = doc.body,
+			defaultView = doc.defaultView,
+			prevComputedStyle = defaultView ? defaultView.getComputedStyle( elem, null ) : elem.currentStyle,
+			top = elem.offsetTop,
+			left = elem.offsetLeft;
+
+		while ( (elem = elem.parentNode) && elem !== body && elem !== docElem ) {
+			if ( jQuery.offset.supportsFixedPosition && prevComputedStyle.position === "fixed" ) {
+				break;
+			}
+
+			computedStyle = defaultView ? defaultView.getComputedStyle(elem, null) : elem.currentStyle;
+			top  -= elem.scrollTop;
+			left -= elem.scrollLeft;
+
+			if ( elem === offsetParent ) {
+				top  += elem.offsetTop;
+				left += elem.offsetLeft;
+
+				if ( jQuery.offset.doesNotAddBorder && !(jQuery.offset.doesAddBorderForTableAndCells && rtable.test(elem.nodeName)) ) {
+					top  += parseFloat( computedStyle.borderTopWidth  ) || 0;
+					left += parseFloat( computedStyle.borderLeftWidth ) || 0;
+				}
+
+				prevOffsetParent = offsetParent;
+				offsetParent = elem.offsetParent;
+			}
+
+			if ( jQuery.offset.subtractsBorderForOverflowNotVisible && computedStyle.overflow !== "visible" ) {
+				top  += parseFloat( computedStyle.borderTopWidth  ) || 0;
+				left += parseFloat( computedStyle.borderLeftWidth ) || 0;
+			}
+
+			prevComputedStyle = computedStyle;
+		}
+
+		if ( prevComputedStyle.position === "relative" || prevComputedStyle.position === "static" ) {
+			top  += body.offsetTop;
+			left += body.offsetLeft;
+		}
+
+		if ( jQuery.offset.supportsFixedPosition && prevComputedStyle.position === "fixed" ) {
+			top  += Math.max( docElem.scrollTop, body.scrollTop );
+			left += Math.max( docElem.scrollLeft, body.scrollLeft );
+		}
+
+		return { top: top, left: left };
+	};
+}
+
+jQuery.offset = {
+	initialize: function() {
+		var body = document.body, container = document.createElement("div"), innerDiv, checkDiv, table, td, bodyMarginTop = parseFloat( jQuery.css(body, "marginTop") ) || 0,
+			html = "<div style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;'><div></div></div><table style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;' cellpadding='0' cellspacing='0'><tr><td></td></tr></table>";
+
+		jQuery.extend( container.style, { position: "absolute", top: 0, left: 0, margin: 0, border: 0, width: "1px", height: "1px", visibility: "hidden" } );
+
+		container.innerHTML = html;
+		body.insertBefore( container, body.firstChild );
+		innerDiv = container.firstChild;
+		checkDiv = innerDiv.firstChild;
+		td = innerDiv.nextSibling.firstChild.firstChild;
+
+		this.doesNotAddBorder = (checkDiv.offsetTop !== 5);
+		this.doesAddBorderForTableAndCells = (td.offsetTop === 5);
+
+		checkDiv.style.position = "fixed";
+		checkDiv.style.top = "20px";
+
+		// safari subtracts parent border width here which is 5px
+		this.supportsFixedPosition = (checkDiv.offsetTop === 20 || checkDiv.offsetTop === 15);
+		checkDiv.style.position = checkDiv.style.top = "";
+
+		innerDiv.style.overflow = "hidden";
+		innerDiv.style.position = "relative";
+
+		this.subtractsBorderForOverflowNotVisible = (checkDiv.offsetTop === -5);
+
+		this.doesNotIncludeMarginInBodyOffset = (body.offsetTop !== bodyMarginTop);
+
+		body.removeChild( container );
+		body = container = innerDiv = checkDiv = table = td = null;
+		jQuery.offset.initialize = jQuery.noop;
+	},
+
+	bodyOffset: function( body ) {
+		var top = body.offsetTop,
+			left = body.offsetLeft;
+
+		jQuery.offset.initialize();
+
+		if ( jQuery.offset.doesNotIncludeMarginInBodyOffset ) {
+			top  += parseFloat( jQuery.css(body, "marginTop") ) || 0;
+			left += parseFloat( jQuery.css(body, "marginLeft") ) || 0;
+		}
+
+		return { top: top, left: left };
+	},
+	
+	setOffset: function( elem, options, i ) {
+		var position = jQuery.css( elem, "position" );
+
+		// set position first, in-case top/left are set even on static elem
+		if ( position === "static" ) {
+			elem.style.position = "relative";
+		}
+
+		var curElem = jQuery( elem ),
+			curOffset = curElem.offset(),
+			curCSSTop = jQuery.css( elem, "top" ),
+			curCSSLeft = jQuery.css( elem, "left" ),
+			calculatePosition = (position === "absolute" && jQuery.inArray('auto', [curCSSTop, curCSSLeft]) > -1),
+			props = {}, curPosition = {}, curTop, curLeft;
+
+		// need to be able to calculate position if either top or left is auto and position is absolute
+		if ( calculatePosition ) {
+			curPosition = curElem.position();
+		}
+
+		curTop  = calculatePosition ? curPosition.top  : parseInt( curCSSTop,  10 ) || 0;
+		curLeft = calculatePosition ? curPosition.left : parseInt( curCSSLeft, 10 ) || 0;
+
+		if ( jQuery.isFunction( options ) ) {
+			options = options.call( elem, i, curOffset );
+		}
+
+		if (options.top != null) {
+			props.top = (options.top - curOffset.top) + curTop;
+		}
+		if (options.left != null) {
+			props.left = (options.left - curOffset.left) + curLeft;
+		}
+		
+		if ( "using" in options ) {
+			options.using.call( elem, props );
+		} else {
+			curElem.css( props );
+		}
+	}
+};
+
+
+jQuery.fn.extend({
+	position: function() {
+		if ( !this[0] ) {
+			return null;
+		}
+
+		var elem = this[0],
+
+		// Get *real* offsetParent
+		offsetParent = this.offsetParent(),
+
+		// Get correct offsets
+		offset       = this.offset(),
+		parentOffset = rroot.test(offsetParent[0].nodeName) ? { top: 0, left: 0 } : offsetParent.offset();
+
+		// Subtract element margins
+		// note: when an element has margin: auto the offsetLeft and marginLeft
+		// are the same in Safari causing offset.left to incorrectly be 0
+		offset.top  -= parseFloat( jQuery.css(elem, "marginTop") ) || 0;
+		offset.left -= parseFloat( jQuery.css(elem, "marginLeft") ) || 0;
+
+		// Add offsetParent borders
+		parentOffset.top  += parseFloat( jQuery.css(offsetParent[0], "borderTopWidth") ) || 0;
+		parentOffset.left += parseFloat( jQuery.css(offsetParent[0], "borderLeftWidth") ) || 0;
+
+		// Subtract the two offsets
+		return {
+			top:  offset.top  - parentOffset.top,
+			left: offset.left - parentOffset.left
+		};
+	},
+
+	offsetParent: function() {
+		return this.map(function() {
+			var offsetParent = this.offsetParent || document.body;
+			while ( offsetParent && (!rroot.test(offsetParent.nodeName) && jQuery.css(offsetParent, "position") === "static") ) {
+				offsetParent = offsetParent.offsetParent;
+			}
+			return offsetParent;
+		});
+	}
+});
+
+
+// Create scrollLeft and scrollTop methods
+jQuery.each( ["Left", "Top"], function( i, name ) {
+	var method = "scroll" + name;
+
+	jQuery.fn[ method ] = function(val) {
+		var elem = this[0], win;
+		
+		if ( !elem ) {
+			return null;
+		}
+
+		if ( val !== undefined ) {
+			// Set the scroll offset
+			return this.each(function() {
+				win = getWindow( this );
+
+				if ( win ) {
+					win.scrollTo(
+						!i ? val : jQuery(win).scrollLeft(),
+						 i ? val : jQuery(win).scrollTop()
+					);
+
+				} else {
+					this[ method ] = val;
+				}
+			});
+		} else {
+			win = getWindow( elem );
+
+			// Return the scroll offset
+			return win ? ("pageXOffset" in win) ? win[ i ? "pageYOffset" : "pageXOffset" ] :
+				jQuery.support.boxModel && win.document.documentElement[ method ] ||
+					win.document.body[ method ] :
+				elem[ method ];
+		}
+	};
+});
+
+function getWindow( elem ) {
+	return jQuery.isWindow( elem ) ?
+		elem :
+		elem.nodeType === 9 ?
+			elem.defaultView || elem.parentWindow :
+			false;
+}
+
+
+
+
+// Create innerHeight, innerWidth, outerHeight and outerWidth methods
+jQuery.each([ "Height", "Width" ], function( i, name ) {
+
+	var type = name.toLowerCase();
+
+	// innerHeight and innerWidth
+	jQuery.fn["inner" + name] = function() {
+		return this[0] ?
+			parseFloat( jQuery.css( this[0], type, "padding" ) ) :
+			null;
+	};
+
+	// outerHeight and outerWidth
+	jQuery.fn["outer" + name] = function( margin ) {
+		return this[0] ?
+			parseFloat( jQuery.css( this[0], type, margin ? "margin" : "border" ) ) :
+			null;
+	};
+
+	jQuery.fn[ type ] = function( size ) {
+		// Get window width or height
+		var elem = this[0];
+		if ( !elem ) {
+			return size == null ? null : this;
+		}
+		
+		if ( jQuery.isFunction( size ) ) {
+			return this.each(function( i ) {
+				var self = jQuery( this );
+				self[ type ]( size.call( this, i, self[ type ]() ) );
+			});
+		}
+
+		if ( jQuery.isWindow( elem ) ) {
+			// Everyone else use document.documentElement or document.body depending on Quirks vs Standards mode
+			return elem.document.compatMode === "CSS1Compat" && elem.document.documentElement[ "client" + name ] ||
+				elem.document.body[ "client" + name ];
+
+		// Get document width or height
+		} else if ( elem.nodeType === 9 ) {
+			// Either scroll[Width/Height] or offset[Width/Height], whichever is greater
+			return Math.max(
+				elem.documentElement["client" + name],
+				elem.body["scroll" + name], elem.documentElement["scroll" + name],
+				elem.body["offset" + name], elem.documentElement["offset" + name]
+			);
+
+		// Get or set width or height on the element
+		} else if ( size === undefined ) {
+			var orig = jQuery.css( elem, type ),
+				ret = parseFloat( orig );
+
+			return jQuery.isNaN( ret ) ? orig : ret;
+
+		// Set the width or height on the element (default to pixels if value is unitless)
+		} else {
+			return this.css( type, typeof size === "string" ? size : size + "px" );
+		}
+	};
+
+});
+
+
+})(window);
diff --git a/jappixmini/jappix/js/jquery.placeholder.js b/jappixmini/jappix/js/jquery.placeholder.js
new file mode 100644
index 00000000..d9162f0f
--- /dev/null
+++ b/jappixmini/jappix/js/jquery.placeholder.js
@@ -0,0 +1,116 @@
+(function($) {
+	$.extend({
+		placeholder : {
+			settings : {
+				focusClass: 'placeholderFocus',
+				activeClass: 'placeholder',
+				overrideSupport: false,
+				preventRefreshIssues: true
+			},
+			debug : false,
+			log : function(msg){
+				if(!$.placeholder.debug) return;
+				msg = "[Placeholder] " + msg;
+				$.placeholder.hasFirebug ?
+				console.log(msg) :
+				$.placeholder.hasConsoleLog ?
+					window.console.log(msg) :
+					alert(msg);
+			},
+			hasFirebug : "console" in window && "firebug" in window.console,
+			hasConsoleLog: "console" in window && "log" in window.console
+		}
+
+	});
+
+    // check browser support for placeholder
+    $.support.placeholder = 'placeholder' in document.createElement('input');
+
+	// Replace the val function to never return placeholders
+	$.fn.plVal = $.fn.val;
+	$.fn.val = function(value) {
+		$.placeholder.log('in val');
+		if(this[0]) {
+			$.placeholder.log('have found an element');
+			var el = $(this[0]);
+			if(value != undefined)
+			{
+				$.placeholder.log('in setter');
+				var currentValue = el.plVal();
+				var returnValue = $(this).plVal(value);
+				if(el.hasClass($.placeholder.settings.activeClass) && currentValue == el.attr('placeholder')){
+					el.removeClass($.placeholder.settings.activeClass);
+				}
+				return returnValue;
+			}
+
+			if(el.hasClass($.placeholder.settings.activeClass) && el.plVal() == el.attr('placeholder')) {
+				$.placeholder.log('returning empty because its a placeholder');
+				return '';
+			} else {
+				$.placeholder.log('returning original val');
+				return el.plVal();
+			}
+		}
+		$.placeholder.log('returning undefined');
+		return undefined;
+	};
+
+	// Clear placeholder values upon page reload
+	$(window).bind('beforeunload.placeholder', function() {
+		var els = $('input.placeholderActive' );
+		if(els.length > 0)
+			els.val('').attr('autocomplete','off');
+	});
+
+
+    // addon code
+	$.fn.placeholder = function(opts) {
+		opts = $.extend({},$.placeholder.settings, opts);
+
+		// we don't have to do anything if the browser supports placeholder
+		if(!opts.overrideSupport && $.support.placeholder)
+		    return this;
+			
+        return this.each(function() {
+            var $el = $(this);
+
+            // skip if we do not have the placeholder attribute
+            if(!$el.is('[placeholder]'))
+                return;
+
+            // we cannot do password fields, but supported browsers can
+            if($el.is(':password'))
+                return;
+			
+			// Prevent values from being reapplied on refresh
+			if(opts.preventRefreshIssues)
+				$el.attr('autocomplete','off');
+
+            $el.bind('focus.placeholder', function(){
+                var $el = $(this);
+                if(this.value == $el.attr('placeholder') && $el.hasClass(opts.activeClass))
+                    $el.val('')
+                       .removeClass(opts.activeClass)
+                       .addClass(opts.focusClass);
+            });
+            $el.bind('blur.placeholder', function(){
+                var $el = $(this);
+				
+				$el.removeClass(opts.focusClass);
+
+                if(this.value == '')
+                  $el.val($el.attr('placeholder'))
+                     .addClass(opts.activeClass);
+            });
+
+            $el.triggerHandler('blur');
+			
+			// Prevent incorrect form values being posted
+			$el.parents('form').submit(function(){
+				$el.triggerHandler('focus.placeholder');
+			});
+
+        });
+    };
+})(jQuery);
diff --git a/jappixmini/jappix/js/jquery.textrange.js b/jappixmini/jappix/js/jquery.textrange.js
new file mode 100644
index 00000000..20bd028c
--- /dev/null
+++ b/jappixmini/jappix/js/jquery.textrange.js
@@ -0,0 +1,14 @@
+$.fn.selectRange = function(start, end) {
+    return this.each(function() {
+        if (this.setSelectionRange) {
+            this.focus();
+            this.setSelectionRange(start, end);
+        } else if (this.createTextRange) {
+            var range = this.createTextRange();
+            range.collapse(true);
+            range.moveEnd('character', end);
+            range.moveStart('character', start);
+            range.select();
+        }
+    });
+};
diff --git a/jappixmini/jappix/js/jquery.timers.js b/jappixmini/jappix/js/jquery.timers.js
new file mode 100644
index 00000000..ae3d6acc
--- /dev/null
+++ b/jappixmini/jappix/js/jquery.timers.js
@@ -0,0 +1,138 @@
+/**
+ * jQuery.timers - Timer abstractions for jQuery
+ * Written by Blair Mitchelmore (blair DOT mitchelmore AT gmail DOT com)
+ * Licensed under the WTFPL (http://sam.zoy.org/wtfpl/).
+ * Date: 2009/10/16
+ *
+ * @author Blair Mitchelmore
+ * @version 1.2
+ *
+ **/
+
+jQuery.fn.extend({
+	everyTime: function(interval, label, fn, times) {
+		return this.each(function() {
+			jQuery.timer.add(this, interval, label, fn, times);
+		});
+	},
+	oneTime: function(interval, label, fn) {
+		return this.each(function() {
+			jQuery.timer.add(this, interval, label, fn, 1);
+		});
+	},
+	stopTime: function(label, fn) {
+		return this.each(function() {
+			jQuery.timer.remove(this, label, fn);
+		});
+	}
+});
+
+jQuery.extend({
+	timer: {
+		global: [],
+		guid: 1,
+		dataKey: "jQuery.timer",
+		regex: /^([0-9]+(?:\.[0-9]*)?)\s*(.*s)?$/,
+		powers: {
+			// Yeah this is major overkill...
+			'ms': 1,
+			'cs': 10,
+			'ds': 100,
+			's': 1000,
+			'das': 10000,
+			'hs': 100000,
+			'ks': 1000000
+		},
+		timeParse: function(value) {
+			if (value == undefined || value == null)
+				return null;
+			var result = this.regex.exec(jQuery.trim(value.toString()));
+			if (result[2]) {
+				var num = parseFloat(result[1]);
+				var mult = this.powers[result[2]] || 1;
+				return num * mult;
+			} else {
+				return value;
+			}
+		},
+		add: function(element, interval, label, fn, times) {
+			var counter = 0;
+
+			if (jQuery.isFunction(label)) {
+				if (!times)
+					times = fn;
+				fn = label;
+				label = interval;
+			}
+
+			interval = jQuery.timer.timeParse(interval);
+
+			if (typeof interval != 'number' || isNaN(interval) || interval < 0)
+				return;
+
+			if (typeof times != 'number' || isNaN(times) || times < 0)
+				times = 0;
+
+			times = times || 0;
+
+			var timers = jQuery.data(element, this.dataKey) || jQuery.data(element, this.dataKey, {});
+
+			if (!timers[label])
+				timers[label] = {};
+
+			fn.timerID = fn.timerID || this.guid++;
+
+			var handler = function() {
+				if ((++counter > times && times !== 0) || fn.call(element, counter) === false)
+					jQuery.timer.remove(element, label, fn);
+			};
+
+			handler.timerID = fn.timerID;
+
+			if (!timers[label][fn.timerID])
+				timers[label][fn.timerID] = window.setInterval(handler,interval);
+
+			this.global.push( element );
+
+		},
+		remove: function(element, label, fn) {
+			var timers = jQuery.data(element, this.dataKey), ret;
+
+			if ( timers ) {
+
+				if (!label) {
+					for ( label in timers )
+						this.remove(element, label, fn);
+				} else if ( timers[label] ) {
+					if ( fn ) {
+						if ( fn.timerID ) {
+							window.clearInterval(timers[label][fn.timerID]);
+							delete timers[label][fn.timerID];
+						}
+					} else {
+						for ( var fn in timers[label] ) {
+							window.clearInterval(timers[label][fn]);
+							delete timers[label][fn];
+						}
+					}
+
+					for ( ret in timers[label] ) break;
+					if ( !ret ) {
+						ret = null;
+						delete timers[label];
+					}
+				}
+
+				for ( ret in timers ) break;
+				if ( !ret )
+					jQuery.removeData(element, this.dataKey);
+			}
+		}
+	}
+});
+
+jQuery(window).bind("unload", function() {
+	jQuery.each(jQuery.timer.global, function(index, item) {
+		jQuery.timer.remove(item);
+	});
+});
diff --git a/jappixmini/jappix/js/jsjac.js b/jappixmini/jappix/js/jsjac.js
new file mode 100644
index 00000000..752747dc
--- /dev/null
+++ b/jappixmini/jappix/js/jsjac.js
@@ -0,0 +1,4288 @@
+/*
+
+Jappix - An open social platform
+This is the JSJaC library for Jappix (from trunk)
+
+-------------------------------------------------
+
+Licenses: Mozilla Public License version 1.1, GNU GPL, AGPL
+Authors: Stefan Strigler, Vanaryon, Zash
+Last revision: 25/08/11
+
+*/
+
+/**
+ * @fileoverview Magic dependency loading. Taken from script.aculo.us
+ * and modified to break it.
+ * @author Stefan Strigler steve@zeank.in-berlin.de 
+ * @version $Revision$
+ */
+
+var JSJaC = {
+  Version: '$Rev$',
+  bind: function(fn, obj, optArg) {
+    return function(arg) {
+      return fn.apply(obj, [arg, optArg]);
+    };
+  }
+};
+
+if (typeof JSJaCConnection == 'undefined')
+  JSJaC.load();
+
+
+
+/* Copyright 2006 Erik Arvidsson
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you
+ * may not use this file except in compliance with the License.  You
+ * may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ * implied.  See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+/**
+ * @fileoverview Wrapper to make working with XmlHttpRequest and the
+ * DOM more convenient (cross browser compliance).
+ * this code is taken from
+ * http://webfx.eae.net/dhtml/xmlextras/xmlextras.html
+ * @author Stefan Strigler steve@zeank.in-berlin.de
+ * @version $Revision$
+ */
+
+/**
+ * XmlHttp factory
+ * @private
+ */
+function XmlHttp() {}
+
+/**
+ * creates a cross browser compliant XmlHttpRequest object
+ */
+XmlHttp.create = function () {
+  try {
+    // Are we cross-domain?
+    if(((BOSH_PROXY == 'on') || (HOST_BOSH_MINI)) && (typeof jXHR == "function")) {
+        // Able to use CORS?
+        if (window.XMLHttpRequest) {
+          var req = new XMLHttpRequest();
+          
+          if (req.withCredentials !== undefined)
+            return req;
+        }
+        
+    	return new jXHR();
+    }
+    // Might be local-domain?
+    if (window.XMLHttpRequest) {
+      var req = new XMLHttpRequest();
+      
+      // some versions of Moz do not support the readyState property
+      // and the onreadystate event so we patch it!
+      if (req.readyState == null) {
+	req.readyState = 1;
+	req.addEventListener("load", function () {
+			       req.readyState = 4;
+			       if (typeof req.onreadystatechange == "function")
+				 req.onreadystatechange();
+			     }, false);
+      }
+      
+      return req;
+    }
+    if (window.ActiveXObject) {
+      return new ActiveXObject(XmlHttp.getPrefix() + ".XmlHttp");
+    }
+  }
+  catch (ex) {}
+  // fell through
+  throw new Error("Your browser does not support XmlHttp objects");
+};
+
+/**
+ * used to find the Automation server name
+ * @private
+ */
+XmlHttp.getPrefix = function() {
+  if (XmlHttp.prefix) // I know what you did last summer
+    return XmlHttp.prefix;
+ 
+  var prefixes = ["MSXML2", "Microsoft", "MSXML", "MSXML3"];
+  var o;
+  for (var i = 0; i < prefixes.length; i++) {
+    try {
+      // try to create the objects
+      o = new ActiveXObject(prefixes[i] + ".XmlHttp");
+      return XmlHttp.prefix = prefixes[i];
+    }
+    catch (ex) {};
+  }
+ 
+  throw new Error("Could not find an installed XML parser");
+};
+
+
+/**
+ * XmlDocument factory
+ * @private
+ */
+function XmlDocument() {}
+
+XmlDocument.create = function (name,ns) {
+  name = name || 'foo';
+  ns = ns || '';
+
+  try {
+    var doc;
+    // DOM2
+    if (document.implementation && document.implementation.createDocument) {
+      doc = document.implementation.createDocument(ns, name, null);
+      // some versions of Moz do not support the readyState property
+      // and the onreadystate event so we patch it!
+      if (doc.readyState == null) {
+	doc.readyState = 1;
+	doc.addEventListener("load", function () {
+			       doc.readyState = 4;
+			       if (typeof doc.onreadystatechange == "function")
+				 doc.onreadystatechange();
+			     }, false);
+      }
+    } else if (window.ActiveXObject) {
+      doc = new ActiveXObject(XmlDocument.getPrefix() + ".DomDocument");
+    }
+   
+    if (!doc.documentElement || doc.documentElement.tagName != name ||
+        (doc.documentElement.namespaceURI &&
+         doc.documentElement.namespaceURI != ns)) {
+          try {
+            if (ns != '')
+              doc.appendChild(doc.createElement(name)).
+                setAttribute('xmlns',ns);
+            else
+              doc.appendChild(doc.createElement(name));
+          } catch (dex) {
+            doc = document.implementation.createDocument(ns,name,null);
+           
+            if (doc.documentElement == null)
+              doc.appendChild(doc.createElement(name));
+
+             // fix buggy opera 8.5x
+            if (ns != '' &&
+                doc.documentElement.getAttribute('xmlns') != ns) {
+              doc.documentElement.setAttribute('xmlns',ns);
+            }
+          }
+        }
+   
+    return doc;
+  }
+  catch (ex) { }
+  throw new Error("Your browser does not support XmlDocument objects");
+};
+
+/**
+ * used to find the Automation server name
+ * @private
+ */
+XmlDocument.getPrefix = function() {
+  if (XmlDocument.prefix)
+    return XmlDocument.prefix;
+
+  var prefixes = ["MSXML2", "Microsoft", "MSXML", "MSXML3"];
+  var o;
+  for (var i = 0; i < prefixes.length; i++) {
+    try {
+      // try to create the objects
+      o = new ActiveXObject(prefixes[i] + ".DomDocument");
+      return XmlDocument.prefix = prefixes[i];
+    }
+    catch (ex) {};
+  }
+ 
+  throw new Error("Could not find an installed XML parser");
+};
+
+
+// Create the loadXML method
+if (typeof(Document) != 'undefined' && window.DOMParser) {
+
+  /**
+   * XMLDocument did not extend the Document interface in some
+   * versions of Mozilla.
+   * @private
+   */
+  Document.prototype.loadXML = function (s) {
+	
+    // parse the string to a new doc
+    var doc2 = (new DOMParser()).parseFromString(s, "text/xml");
+	
+    // remove all initial children
+    while (this.hasChildNodes())
+      this.removeChild(this.lastChild);
+		
+    // insert and import nodes
+    for (var i = 0; i < doc2.childNodes.length; i++) {
+      this.appendChild(this.importNode(doc2.childNodes[i], true));
+    }
+  };
+ }
+
+// Create xml getter for Mozilla
+if (window.XMLSerializer &&
+    window.Node && Node.prototype && Node.prototype.__defineGetter__) {
+
+  /**
+   * xml getter
+   *
+   * This serializes the DOM tree to an XML String
+   *
+   * Usage: var sXml = oNode.xml
+   * @deprecated
+   * @private
+   */
+  // XMLDocument did not extend the Document interface in some versions
+  // of Mozilla. Extend both!
+  XMLDocument.prototype.__defineGetter__("xml", function () {
+                                           return (new XMLSerializer()).serializeToString(this);
+                                         });
+  /**
+   * xml getter
+   *
+   * This serializes the DOM tree to an XML String
+   *
+   * Usage: var sXml = oNode.xml
+   * @deprecated
+   * @private
+   */
+  Document.prototype.__defineGetter__("xml", function () {
+                                        return (new XMLSerializer()).serializeToString(this);
+                                      });
+
+  /**
+   * xml getter
+   *
+   * This serializes the DOM tree to an XML String
+   *
+   * Usage: var sXml = oNode.xml
+   * @deprecated
+   * @private
+   */
+  Node.prototype.__defineGetter__("xml", function () {
+                                    return (new XMLSerializer()).serializeToString(this);
+                                  });
+ }
+
+
+/**
+ * @fileoverview Collection of functions to make live easier
+ * @author Stefan Strigler
+ * @version $Revision$
+ */
+
+/**
+ * Convert special chars to HTML entities
+ * @addon
+ * @return The string with chars encoded for HTML
+ * @type String
+ */
+String.prototype.htmlEnc = function() {
+  if(!this)
+    return this;
+  
+  var str = this.replace(/&/g,"&amp;");
+  str = str.replace(/</g,"&lt;");
+  str = str.replace(/>/g,"&gt;");
+  str = str.replace(/\"/g,"&quot;");
+  str = str.replace(/\n/g,"<br />");
+  return str;
+};
+
+/**
+ * Convert HTML entities to special chars
+ * @addon
+ * @return The normal string
+ * @type String
+ */
+String.prototype.revertHtmlEnc = function() {
+  if(!this)
+    return this;
+  
+  var str = this.replace(/&amp;/gi,'&');
+  str = str.replace(/&lt;/gi,'<');
+  str = str.replace(/&gt;/gi,'>');
+  str = str.replace(/&quot;/gi,'\"');
+  str = str.replace(/<br( )?(\/)?>/gi,'\n');
+  return str;
+};
+
+/**
+ * Converts from jabber timestamps to JavaScript Date objects
+ * @addon
+ * @param {String} ts A string representing a jabber datetime timestamp as
+ * defined by {@link http://www.xmpp.org/extensions/xep-0082.html XEP-0082}
+ * @return A javascript Date object corresponding to the jabber DateTime given
+ * @type Date
+ */
+Date.jab2date = function(ts) {
+  // Get the UTC date
+  var date = new Date(Date.UTC(ts.substr(0,4),ts.substr(5,2)-1,ts.substr(8,2),ts.substr(11,2),ts.substr(14,2),ts.substr(17,2)));
+  
+  if (ts.substr(ts.length-6,1) != 'Z') { // there's an offset
+    var date_offset = date.getTimezoneOffset() * 60 * 1000;
+    var offset = new Date();
+    offset.setTime(0);
+    offset.setUTCHours(ts.substr(ts.length-5,2));
+    offset.setUTCMinutes(ts.substr(ts.length-2,2));
+    if (ts.substr(ts.length-6,1) == '+')
+      date.setTime(date.getTime() + offset.getTime() + date_offset);
+    else if (ts.substr(ts.length-6,1) == '-')
+      date.setTime(date.getTime() - offset.getTime() + date_offset);
+  }
+  return date;
+};
+
+/**
+ * Takes a timestamp in the form of 2004-08-13T12:07:04+02:00 as argument
+ * and converts it to some sort of humane readable format
+ * @addon
+ */
+Date.hrTime = function(ts) {
+  return Date.jab2date(ts).toLocaleString();
+};
+
+/**
+ * somewhat opposit to {@link #hrTime}
+ * expects a javascript Date object as parameter and returns a jabber
+ * date string conforming to
+ * {@link http://www.xmpp.org/extensions/xep-0082.html XEP-0082}
+ * @see #hrTime
+ * @return The corresponding jabber DateTime string
+ * @type String
+ */
+Date.prototype.jabberDate = function() {
+  var padZero = function(i) {
+    if (i < 10) return "0" + i;
+    return i;
+  };
+
+  var jDate = this.getUTCFullYear() + "-";
+  jDate += padZero(this.getUTCMonth()+1) + "-";
+  jDate += padZero(this.getUTCDate()) + "T";
+  jDate += padZero(this.getUTCHours()) + ":";
+  jDate += padZero(this.getUTCMinutes()) + ":";
+  jDate += padZero(this.getUTCSeconds()) + "Z";
+
+  return jDate;
+};
+
+/**
+ * Determines the maximum of two given numbers
+ * @addon
+ * @param {Number} A a number
+ * @param {Number} B another number
+ * @return the maximum of A and B
+ * @type Number
+ */
+Number.max = function(A, B) {
+  return (A > B)? A : B;
+};
+
+Number.min = function(A, B) {
+  return (A < B)? A : B;
+};
+
+
+/* Copyright (c) 1998 - 2007, Paul Johnston & Contributors
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following
+ * disclaimer. Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided
+ * with the distribution.
+ *
+ * Neither the name of the author nor the names of its contributors
+ * may be used to endorse or promote products derived from this
+ * software without specific prior written permission.
+ *
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+/**
+ * @fileoverview Collection of MD5 and SHA1 hashing and encoding
+ * methods.
+ * @author Stefan Strigler steve@zeank.in-berlin.de
+ * @version $Revision$
+ */
+
+/*
+ * A JavaScript implementation of the Secure Hash Algorithm, SHA-1, as defined
+ * in FIPS PUB 180-1
+ * Version 2.1a Copyright Paul Johnston 2000 - 2002.
+ * Other contributors: Greg Holt, Andrew Kepert, Ydnar, Lostinet
+ * Distributed under the BSD License
+ * See http://pajhome.org.uk/crypt/md5 for details.
+ */
+
+/*
+ * Configurable variables. You may need to tweak these to be compatible with
+ * the server-side, but the defaults work in most cases.
+ */
+var hexcase = 0;  /* hex output format. 0 - lowercase; 1 - uppercase        */
+var b64pad  = "="; /* base-64 pad character. "=" for strict RFC compliance   */
+var chrsz   = 8;  /* bits per input character. 8 - ASCII; 16 - Unicode      */
+
+/*
+ * These are the functions you'll usually want to call
+ * They take string arguments and return either hex or base-64 encoded strings
+ */
+function hex_sha1(s){return binb2hex(core_sha1(str2binb(s),s.length * chrsz));}
+function b64_sha1(s){return binb2b64(core_sha1(str2binb(s),s.length * chrsz));}
+function str_sha1(s){return binb2str(core_sha1(str2binb(s),s.length * chrsz));}
+function hex_hmac_sha1(key, data){ return binb2hex(core_hmac_sha1(key, data));}
+function b64_hmac_sha1(key, data){ return binb2b64(core_hmac_sha1(key, data));}
+function str_hmac_sha1(key, data){ return binb2str(core_hmac_sha1(key, data));}
+
+/*
+ * Perform a simple self-test to see if the VM is working
+ */
+function sha1_vm_test()
+{
+  return hex_sha1("abc") == "a9993e364706816aba3e25717850c26c9cd0d89d";
+}
+
+/*
+ * Calculate the SHA-1 of an array of big-endian words, and a bit length
+ */
+function core_sha1(x, len)
+{
+  /* append padding */
+  x[len >> 5] |= 0x80 << (24 - len % 32);
+  x[((len + 64 >> 9) << 4) + 15] = len;
+
+  var w = Array(80);
+  var a =  1732584193;
+  var b = -271733879;
+  var c = -1732584194;
+  var d =  271733878;
+  var e = -1009589776;
+
+  for(var i = 0; i < x.length; i += 16)
+    {
+      var olda = a;
+      var oldb = b;
+      var oldc = c;
+      var oldd = d;
+      var olde = e;
+
+      for(var j = 0; j < 80; j++)
+        {
+          if(j < 16) w[j] = x[i + j];
+          else w[j] = rol(w[j-3] ^ w[j-8] ^ w[j-14] ^ w[j-16], 1);
+          var t = safe_add(safe_add(rol(a, 5), sha1_ft(j, b, c, d)),
+                           safe_add(safe_add(e, w[j]), sha1_kt(j)));
+          e = d;
+          d = c;
+          c = rol(b, 30);
+          b = a;
+          a = t;
+        }
+
+      a = safe_add(a, olda);
+      b = safe_add(b, oldb);
+      c = safe_add(c, oldc);
+      d = safe_add(d, oldd);
+      e = safe_add(e, olde);
+    }
+  return Array(a, b, c, d, e);
+
+}
+
+/*
+ * Perform the appropriate triplet combination function for the current
+ * iteration
+ */
+function sha1_ft(t, b, c, d)
+{
+  if(t < 20) return (b & c) | ((~b) & d);
+  if(t < 40) return b ^ c ^ d;
+  if(t < 60) return (b & c) | (b & d) | (c & d);
+  return b ^ c ^ d;
+}
+
+/*
+ * Determine the appropriate additive constant for the current iteration
+ */
+function sha1_kt(t)
+{
+  return (t < 20) ?  1518500249 : (t < 40) ?  1859775393 :
+    (t < 60) ? -1894007588 : -899497514;
+}
+
+/*
+ * Calculate the HMAC-SHA1 of a key and some data
+ */
+function core_hmac_sha1(key, data)
+{
+  var bkey = str2binb(key);
+  if(bkey.length > 16) bkey = core_sha1(bkey, key.length * chrsz);
+
+  var ipad = Array(16), opad = Array(16);
+  for(var i = 0; i < 16; i++)
+    {
+      ipad[i] = bkey[i] ^ 0x36363636;
+      opad[i] = bkey[i] ^ 0x5C5C5C5C;
+    }
+
+  var hash = core_sha1(ipad.concat(str2binb(data)), 512 + data.length * chrsz);
+  return core_sha1(opad.concat(hash), 512 + 160);
+}
+
+/*
+ * Bitwise rotate a 32-bit number to the left.
+ */
+function rol(num, cnt)
+{
+  return (num << cnt) | (num >>> (32 - cnt));
+}
+
+/*
+ * Convert an 8-bit or 16-bit string to an array of big-endian words
+ * In 8-bit function, characters >255 have their hi-byte silently ignored.
+ */
+function str2binb(str)
+{
+  var bin = Array();
+  var mask = (1 << chrsz) - 1;
+  for(var i = 0; i < str.length * chrsz; i += chrsz)
+    bin[i>>5] |= (str.charCodeAt(i / chrsz) & mask) << (32 - chrsz - i%32);
+  return bin;
+}
+
+/*
+ * Convert an array of big-endian words to a string
+ */
+function binb2str(bin)
+{
+  var str = "";
+  var mask = (1 << chrsz) - 1;
+  for(var i = 0; i < bin.length * 32; i += chrsz)
+    str += String.fromCharCode((bin[i>>5] >>> (32 - chrsz - i%32)) & mask);
+  return str;
+}
+
+/*
+ * Convert an array of big-endian words to a hex string.
+ */
+function binb2hex(binarray)
+{
+  var hex_tab = hexcase ? "0123456789ABCDEF" : "0123456789abcdef";
+  var str = "";
+  for(var i = 0; i < binarray.length * 4; i++)
+    {
+      str += hex_tab.charAt((binarray[i>>2] >> ((3 - i%4)*8+4)) & 0xF) +
+        hex_tab.charAt((binarray[i>>2] >> ((3 - i%4)*8  )) & 0xF);
+    }
+  return str;
+}
+
+/*
+ * Convert an array of big-endian words to a base-64 string
+ */
+function binb2b64(binarray)
+{
+  var tab = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+  var str = "";
+  for(var i = 0; i < binarray.length * 4; i += 3)
+    {
+      var triplet = (((binarray[i   >> 2] >> 8 * (3 -  i   %4)) & 0xFF) << 16)
+        | (((binarray[i+1 >> 2] >> 8 * (3 - (i+1)%4)) & 0xFF) << 8 )
+        |  ((binarray[i+2 >> 2] >> 8 * (3 - (i+2)%4)) & 0xFF);
+      for(var j = 0; j < 4; j++)
+        {
+          if(i * 8 + j * 6 > binarray.length * 32) str += b64pad;
+          else str += tab.charAt((triplet >> 6*(3-j)) & 0x3F);
+        }
+    }
+  return str.replace(/AAA\=(\=*?)$/,'$1'); // cleans garbage chars at end of string
+}
+
+/*
+ * A JavaScript implementation of the RSA Data Security, Inc. MD5 Message
+ * Digest Algorithm, as defined in RFC 1321.
+ * Version 2.1 Copyright (C) Paul Johnston 1999 - 2002.
+ * Other contributors: Greg Holt, Andrew Kepert, Ydnar, Lostinet
+ * Distributed under the BSD License
+ * See http://pajhome.org.uk/crypt/md5 for more info.
+ */
+
+/*
+ * Configurable variables. You may need to tweak these to be compatible with
+ * the server-side, but the defaults work in most cases.
+ */
+// var hexcase = 0;  /* hex output format. 0 - lowercase; 1 - uppercase        */
+// var b64pad  = ""; /* base-64 pad character. "=" for strict RFC compliance   */
+// var chrsz   = 8;  /* bits per input character. 8 - ASCII; 16 - Unicode      */
+
+/*
+ * These are the functions you'll usually want to call
+ * They take string arguments and return either hex or base-64 encoded strings
+ */
+function hex_md5(s){ return binl2hex(core_md5(str2binl(s), s.length * chrsz));}
+function b64_md5(s){ return binl2b64(core_md5(str2binl(s), s.length * chrsz));}
+function str_md5(s){ return binl2str(core_md5(str2binl(s), s.length * chrsz));}
+function hex_hmac_md5(key, data) { return binl2hex(core_hmac_md5(key, data)); }
+function b64_hmac_md5(key, data) { return binl2b64(core_hmac_md5(key, data)); }
+function str_hmac_md5(key, data) { return binl2str(core_hmac_md5(key, data)); }
+
+/*
+ * Perform a simple self-test to see if the VM is working
+ */
+function md5_vm_test()
+{
+  return hex_md5("abc") == "900150983cd24fb0d6963f7d28e17f72";
+}
+
+/*
+ * Calculate the MD5 of an array of little-endian words, and a bit length
+ */
+function core_md5(x, len)
+{
+  /* append padding */
+  x[len >> 5] |= 0x80 << ((len) % 32);
+  x[(((len + 64) >>> 9) << 4) + 14] = len;
+
+  var a =  1732584193;
+  var b = -271733879;
+  var c = -1732584194;
+  var d =  271733878;
+
+  for(var i = 0; i < x.length; i += 16)
+  {
+    var olda = a;
+    var oldb = b;
+    var oldc = c;
+    var oldd = d;
+
+    a = md5_ff(a, b, c, d, x[i+ 0], 7 , -680876936);
+    d = md5_ff(d, a, b, c, x[i+ 1], 12, -389564586);
+    c = md5_ff(c, d, a, b, x[i+ 2], 17,  606105819);
+    b = md5_ff(b, c, d, a, x[i+ 3], 22, -1044525330);
+    a = md5_ff(a, b, c, d, x[i+ 4], 7 , -176418897);
+    d = md5_ff(d, a, b, c, x[i+ 5], 12,  1200080426);
+    c = md5_ff(c, d, a, b, x[i+ 6], 17, -1473231341);
+    b = md5_ff(b, c, d, a, x[i+ 7], 22, -45705983);
+    a = md5_ff(a, b, c, d, x[i+ 8], 7 ,  1770035416);
+    d = md5_ff(d, a, b, c, x[i+ 9], 12, -1958414417);
+    c = md5_ff(c, d, a, b, x[i+10], 17, -42063);
+    b = md5_ff(b, c, d, a, x[i+11], 22, -1990404162);
+    a = md5_ff(a, b, c, d, x[i+12], 7 ,  1804603682);
+    d = md5_ff(d, a, b, c, x[i+13], 12, -40341101);
+    c = md5_ff(c, d, a, b, x[i+14], 17, -1502002290);
+    b = md5_ff(b, c, d, a, x[i+15], 22,  1236535329);
+
+    a = md5_gg(a, b, c, d, x[i+ 1], 5 , -165796510);
+    d = md5_gg(d, a, b, c, x[i+ 6], 9 , -1069501632);
+    c = md5_gg(c, d, a, b, x[i+11], 14,  643717713);
+    b = md5_gg(b, c, d, a, x[i+ 0], 20, -373897302);
+    a = md5_gg(a, b, c, d, x[i+ 5], 5 , -701558691);
+    d = md5_gg(d, a, b, c, x[i+10], 9 ,  38016083);
+    c = md5_gg(c, d, a, b, x[i+15], 14, -660478335);
+    b = md5_gg(b, c, d, a, x[i+ 4], 20, -405537848);
+    a = md5_gg(a, b, c, d, x[i+ 9], 5 ,  568446438);
+    d = md5_gg(d, a, b, c, x[i+14], 9 , -1019803690);
+    c = md5_gg(c, d, a, b, x[i+ 3], 14, -187363961);
+    b = md5_gg(b, c, d, a, x[i+ 8], 20,  1163531501);
+    a = md5_gg(a, b, c, d, x[i+13], 5 , -1444681467);
+    d = md5_gg(d, a, b, c, x[i+ 2], 9 , -51403784);
+    c = md5_gg(c, d, a, b, x[i+ 7], 14,  1735328473);
+    b = md5_gg(b, c, d, a, x[i+12], 20, -1926607734);
+
+    a = md5_hh(a, b, c, d, x[i+ 5], 4 , -378558);
+    d = md5_hh(d, a, b, c, x[i+ 8], 11, -2022574463);
+    c = md5_hh(c, d, a, b, x[i+11], 16,  1839030562);
+    b = md5_hh(b, c, d, a, x[i+14], 23, -35309556);
+    a = md5_hh(a, b, c, d, x[i+ 1], 4 , -1530992060);
+    d = md5_hh(d, a, b, c, x[i+ 4], 11,  1272893353);
+    c = md5_hh(c, d, a, b, x[i+ 7], 16, -155497632);
+    b = md5_hh(b, c, d, a, x[i+10], 23, -1094730640);
+    a = md5_hh(a, b, c, d, x[i+13], 4 ,  681279174);
+    d = md5_hh(d, a, b, c, x[i+ 0], 11, -358537222);
+    c = md5_hh(c, d, a, b, x[i+ 3], 16, -722521979);
+    b = md5_hh(b, c, d, a, x[i+ 6], 23,  76029189);
+    a = md5_hh(a, b, c, d, x[i+ 9], 4 , -640364487);
+    d = md5_hh(d, a, b, c, x[i+12], 11, -421815835);
+    c = md5_hh(c, d, a, b, x[i+15], 16,  530742520);
+    b = md5_hh(b, c, d, a, x[i+ 2], 23, -995338651);
+
+    a = md5_ii(a, b, c, d, x[i+ 0], 6 , -198630844);
+    d = md5_ii(d, a, b, c, x[i+ 7], 10,  1126891415);
+    c = md5_ii(c, d, a, b, x[i+14], 15, -1416354905);
+    b = md5_ii(b, c, d, a, x[i+ 5], 21, -57434055);
+    a = md5_ii(a, b, c, d, x[i+12], 6 ,  1700485571);
+    d = md5_ii(d, a, b, c, x[i+ 3], 10, -1894986606);
+    c = md5_ii(c, d, a, b, x[i+10], 15, -1051523);
+    b = md5_ii(b, c, d, a, x[i+ 1], 21, -2054922799);
+    a = md5_ii(a, b, c, d, x[i+ 8], 6 ,  1873313359);
+    d = md5_ii(d, a, b, c, x[i+15], 10, -30611744);
+    c = md5_ii(c, d, a, b, x[i+ 6], 15, -1560198380);
+    b = md5_ii(b, c, d, a, x[i+13], 21,  1309151649);
+    a = md5_ii(a, b, c, d, x[i+ 4], 6 , -145523070);
+    d = md5_ii(d, a, b, c, x[i+11], 10, -1120210379);
+    c = md5_ii(c, d, a, b, x[i+ 2], 15,  718787259);
+    b = md5_ii(b, c, d, a, x[i+ 9], 21, -343485551);
+
+    a = safe_add(a, olda);
+    b = safe_add(b, oldb);
+    c = safe_add(c, oldc);
+    d = safe_add(d, oldd);
+  }
+  return Array(a, b, c, d);
+
+}
+
+/*
+ * These functions implement the four basic operations the algorithm uses.
+ */
+function md5_cmn(q, a, b, x, s, t)
+{
+  return safe_add(bit_rol(safe_add(safe_add(a, q), safe_add(x, t)), s),b);
+}
+function md5_ff(a, b, c, d, x, s, t)
+{
+  return md5_cmn((b & c) | ((~b) & d), a, b, x, s, t);
+}
+function md5_gg(a, b, c, d, x, s, t)
+{
+  return md5_cmn((b & d) | (c & (~d)), a, b, x, s, t);
+}
+function md5_hh(a, b, c, d, x, s, t)
+{
+  return md5_cmn(b ^ c ^ d, a, b, x, s, t);
+}
+function md5_ii(a, b, c, d, x, s, t)
+{
+  return md5_cmn(c ^ (b | (~d)), a, b, x, s, t);
+}
+
+/*
+ * Calculate the HMAC-MD5, of a key and some data
+ */
+function core_hmac_md5(key, data)
+{
+  var bkey = str2binl(key);
+  if(bkey.length > 16) bkey = core_md5(bkey, key.length * chrsz);
+
+  var ipad = Array(16), opad = Array(16);
+  for(var i = 0; i < 16; i++)
+  {
+    ipad[i] = bkey[i] ^ 0x36363636;
+    opad[i] = bkey[i] ^ 0x5C5C5C5C;
+  }
+
+  var hash = core_md5(ipad.concat(str2binl(data)), 512 + data.length * chrsz);
+  return core_md5(opad.concat(hash), 512 + 128);
+}
+
+/*
+ * Add integers, wrapping at 2^32. This uses 16-bit operations internally
+ * to work around bugs in some JS interpreters.
+ */
+function safe_add(x, y)
+{
+  var lsw = (x & 0xFFFF) + (y & 0xFFFF);
+  var msw = (x >> 16) + (y >> 16) + (lsw >> 16);
+  return (msw << 16) | (lsw & 0xFFFF);
+}
+
+/*
+ * Bitwise rotate a 32-bit number to the left.
+ */
+function bit_rol(num, cnt)
+{
+  return (num << cnt) | (num >>> (32 - cnt));
+}
+
+/*
+ * Convert a string to an array of little-endian words
+ * If chrsz is ASCII, characters >255 have their hi-byte silently ignored.
+ */
+function str2binl(str)
+{
+  var bin = Array();
+  var mask = (1 << chrsz) - 1;
+  for(var i = 0; i < str.length * chrsz; i += chrsz)
+    bin[i>>5] |= (str.charCodeAt(i / chrsz) & mask) << (i%32);
+  return bin;
+}
+
+/*
+ * Convert an array of little-endian words to a string
+ */
+function binl2str(bin)
+{
+  var str = "";
+  var mask = (1 << chrsz) - 1;
+  for(var i = 0; i < bin.length * 32; i += chrsz)
+    str += String.fromCharCode((bin[i>>5] >>> (i % 32)) & mask);
+  return str;
+}
+
+/*
+ * Convert an array of little-endian words to a hex string.
+ */
+function binl2hex(binarray)
+{
+  var hex_tab = hexcase ? "0123456789ABCDEF" : "0123456789abcdef";
+  var str = "";
+  for(var i = 0; i < binarray.length * 4; i++)
+  {
+    str += hex_tab.charAt((binarray[i>>2] >> ((i%4)*8+4)) & 0xF) +
+           hex_tab.charAt((binarray[i>>2] >> ((i%4)*8  )) & 0xF);
+  }
+  return str;
+}
+
+/*
+ * Convert an array of little-endian words to a base-64 string
+ */
+function binl2b64(binarray)
+{
+  var tab = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+  var str = "";
+  for(var i = 0; i < binarray.length * 4; i += 3)
+  {
+    var triplet = (((binarray[i   >> 2] >> 8 * ( i   %4)) & 0xFF) << 16)
+                | (((binarray[i+1 >> 2] >> 8 * ((i+1)%4)) & 0xFF) << 8 )
+                |  ((binarray[i+2 >> 2] >> 8 * ((i+2)%4)) & 0xFF);
+    for(var j = 0; j < 4; j++)
+    {
+      if(i * 8 + j * 6 > binarray.length * 32) str += b64pad;
+      else str += tab.charAt((triplet >> 6*(3-j)) & 0x3F);
+    }
+  }
+  return str;
+}
+
+/* #############################################################################
+   UTF-8 Decoder and Encoder
+   base64 Encoder and Decoder
+   written by Tobias Kieslich, justdreams
+   Contact: tobias@justdreams.de				http://www.justdreams.de/
+   ############################################################################# */
+
+// returns an array of byterepresenting dezimal numbers which represent the
+// plaintext in an UTF-8 encoded version. Expects a string.
+// This function includes an exception management for those nasty browsers like
+// NN401, which returns negative decimal numbers for chars>128. I hate it!!
+// This handling is unfortunately limited to the user's charset. Anyway, it works
+// in most of the cases! Special signs with an unicode>256 return numbers, which
+// can not be converted to the actual unicode and so not to the valid utf-8
+// representation. Anyway, this function does always return values which can not
+// misinterpretd by RC4 or base64 en- or decoding, because every value is >0 and
+// <255!!
+// Arrays are faster and easier to handle in b64 encoding or encrypting....
+function utf8t2d(t)
+{
+  t = t.replace(/\r\n/g,"\n");
+  var d=new Array; var test=String.fromCharCode(237);
+  if (test.charCodeAt(0) < 0)
+    for(var n=0; n<t.length; n++)
+      {
+        var c=t.charCodeAt(n);
+        if (c>0)
+          d[d.length]= c;
+        else {
+          d[d.length]= (((256+c)>>6)|192);
+          d[d.length]= (((256+c)&63)|128);}
+      }
+  else
+    for(var n=0; n<t.length; n++)
+      {
+        var c=t.charCodeAt(n);
+        // all the signs of asci => 1byte
+        if (c<128)
+          d[d.length]= c;
+        // all the signs between 127 and 2047 => 2byte
+        else if((c>127) && (c<2048)) {
+          d[d.length]= ((c>>6)|192);
+          d[d.length]= ((c&63)|128);}
+        // all the signs between 2048 and 66536 => 3byte
+        else {
+          d[d.length]= ((c>>12)|224);
+          d[d.length]= (((c>>6)&63)|128);
+          d[d.length]= ((c&63)|128);}
+      }
+  return d;
+}
+	
+// returns plaintext from an array of bytesrepresenting dezimal numbers, which
+// represent an UTF-8 encoded text; browser which does not understand unicode
+// like NN401 will show "?"-signs instead
+// expects an array of byterepresenting decimals; returns a string
+function utf8d2t(d)
+{
+  var r=new Array; var i=0;
+  while(i<d.length)
+    {
+      if (d[i]<128) {
+        r[r.length]= String.fromCharCode(d[i]); i++;}
+      else if((d[i]>191) && (d[i]<224)) {
+        r[r.length]= String.fromCharCode(((d[i]&31)<<6) | (d[i+1]&63)); i+=2;}
+      else {
+        r[r.length]= String.fromCharCode(((d[i]&15)<<12) | ((d[i+1]&63)<<6) | (d[i+2]&63)); i+=3;}
+    }
+  return r.join("");
+}
+
+// included in <body onload="b64arrays"> it creates two arrays which makes base64
+// en- and decoding faster
+// this speed is noticeable especially when coding larger texts (>5k or so)
+function b64arrays() {
+  var b64s='ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/';
+  b64 = new Array();f64 =new Array();
+  for (var i=0; i<b64s.length ;i++) {
+    b64[i] = b64s.charAt(i);
+    f64[b64s.charAt(i)] = i;
+  }
+}
+
+// creates a base64 encoded text out of an array of byerepresenting dezimals
+// it is really base64 :) this makes serversided handling easier
+// expects an array; returns a string
+function b64d2t(d) {
+  var r=new Array; var i=0; var dl=d.length;
+  // this is for the padding
+  if ((dl%3) == 1) {
+    d[d.length] = 0; d[d.length] = 0;}
+  if ((dl%3) == 2)
+    d[d.length] = 0;
+  // from here conversion
+  while (i<d.length)
+    {
+      r[r.length] = b64[d[i]>>2];
+      r[r.length] = b64[((d[i]&3)<<4) | (d[i+1]>>4)];
+      r[r.length] = b64[((d[i+1]&15)<<2) | (d[i+2]>>6)];
+      r[r.length] = b64[d[i+2]&63];
+      i+=3;
+    }
+  // this is again for the padding
+  if ((dl%3) == 1)
+    r[r.length-1] = r[r.length-2] = "=";
+  if ((dl%3) == 2)
+    r[r.length-1] = "=";
+  // we join the array to return a textstring
+  var t=r.join("");
+  return t;
+}
+
+// returns array of byterepresenting numbers created of an base64 encoded text
+// it is still the slowest function in this modul; I hope I can make it faster
+// expects string; returns an array
+function b64t2d(t) {
+  var d=new Array; var i=0;
+  // here we fix this CRLF sequenz created by MS-OS; arrrgh!!!
+  t=t.replace(/\n|\r/g,""); t=t.replace(/=/g,"");
+  while (i<t.length)
+    {
+      d[d.length] = (f64[t.charAt(i)]<<2) | (f64[t.charAt(i+1)]>>4);
+      d[d.length] = (((f64[t.charAt(i+1)]&15)<<4) | (f64[t.charAt(i+2)]>>2));
+      d[d.length] = (((f64[t.charAt(i+2)]&3)<<6) | (f64[t.charAt(i+3)]));
+      i+=4;
+    }
+  if (t.length%4 == 2)
+    d = d.slice(0, d.length-2);
+  if (t.length%4 == 3)
+    d = d.slice(0, d.length-1);
+  return d;
+}
+
+b64arrays();
+
+b64decode = function(s) {
+  return utf8d2t(b64t2d(s));
+}
+
+b64encode = function(s) {
+  return b64d2t(utf8t2d(s));
+}
+
+function cnonce(size) {
+  var tab = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
+  var cnonce = '';
+  for (var i=0; i<size; i++) {
+    cnonce += tab.charAt(Math.round(Math.random(new Date().getTime())*(tab.length-1)));
+  }
+  return cnonce;
+}
+
+
+
+JSJAC_HAVEKEYS = true;          // whether to use keys
+JSJAC_NKEYS    = 16;            // number of keys to generate
+JSJAC_INACTIVITY = 300;         // qnd hack to make suspend/resume 
+                                    // work more smoothly with polling
+JSJAC_ERR_COUNT = 10;           // number of retries in case of connection
+                                    // errors
+
+JSJAC_ALLOW_PLAIN = true;       // whether to allow plaintext logins
+
+JSJAC_CHECKQUEUEINTERVAL = 100;   // msecs to poll send queue
+JSJAC_CHECKINQUEUEINTERVAL = 100; // msecs to poll incoming queue
+JSJAC_TIMERVAL = 2000;          // default polling interval
+
+// Options specific to HTTP Binding (BOSH)
+JSJACHBC_MAX_HOLD = 1;          // default for number of connections held by 
+                                    // connection manager 
+JSJACHBC_MAX_WAIT = 20;        // default 'wait' param - how long an idle connection
+                                    // should be held by connection manager
+
+JSJACHBC_BOSH_VERSION  = "1.6";
+JSJACHBC_USE_BOSH_VER  = true;
+
+JSJACHBC_MAXPAUSE = 20;        // how long a suspend/resume cycle may take
+
+/*** END CONFIG ***/
+
+
+/* Copyright (c) 2005-2007 Sam Stephenson
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use, copy,
+ * modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+/*
+  json.js
+  taken from prototype.js, made static
+*/
+function JSJaCJSON() {}
+JSJaCJSON.toString = function (obj) {
+  var m = {
+    '\b': '\\b',
+    '\t': '\\t',
+    '\n': '\\n',
+    '\f': '\\f',
+    '\r': '\\r',
+    '"' : '\\"',
+    '\\': '\\\\'
+  },
+  s = {
+    array: function (x) {
+      var a = ['['], b, f, i, l = x.length, v;
+      for (i = 0; i < l; i += 1) {
+        v = x[i];
+        f = s[typeof v];
+        if (f) {
+	  try {
+            v = f(v);
+            if (typeof v == 'string') {
+              if (b) {
+                a[a.length] = ',';
+              }
+              a[a.length] = v;
+              b = true;
+            }
+	  } catch(e) { 
+	  }
+        }
+      }
+      a[a.length] = ']';
+      return a.join('');
+    },
+    'boolean': function (x) {
+      return String(x);
+    },
+    'null': function (x) {
+      return "null";
+    },
+    number: function (x) {
+      return isFinite(x) ? String(x) : 'null';
+    },
+    object: function (x) {
+      if (x) {
+        if (x instanceof Array) {
+          return s.array(x);
+        }
+        var a = ['{'], b, f, i, v;
+        for (i in x) {
+          if (x.hasOwnProperty(i)) {
+            v = x[i];
+            f = s[typeof v];
+            if (f) {
+	      try {
+                v = f(v);
+                if (typeof v == 'string') {
+                  if (b) {
+                    a[a.length] = ',';
+                  }
+                  a.push(s.string(i), ':', v);
+                  b = true;
+                }
+	      } catch(e) {
+	      }
+            }
+          }
+        }
+         
+        a[a.length] = '}';
+        return a.join('');
+      }
+      return 'null';
+    },
+    string: function (x) {
+      if (/["\\\x00-\x1f]/.test(x)) {
+                    x = x.replace(/([\x00-\x1f\\"])/g, function(a, b) {
+          var c = m[b];
+          if (c) {
+            return c;
+          }
+          c = b.charCodeAt();
+          return '\\u00' +
+          Math.floor(c / 16).toString(16) +
+          (c % 16).toString(16);
+        });
+  }
+  return '"' + x + '"';
+}
+  };
+
+switch (typeof(obj)) {
+ case 'object':
+   return s.object(obj);
+ case 'array':
+   return s.array(obj);
+   
+ }
+};
+
+JSJaCJSON.parse = function (str) {
+  try {
+    return !(/[^,:{}\[\]0-9.\-+Eaeflnr-u \n\r\t]/.test(
+                                                       str.replace(/"(\\.|[^"\\])*"/g, ''))) &&
+            eval('(' + str + ')');
+    } catch (e) {
+        return false;
+    }
+};
+
+
+/**
+ * @fileoverview This file contains all things that make life easier when
+ * dealing with JIDs
+ * @author Stefan Strigler
+ * @version $Revision$
+ */
+
+/**
+ * list of forbidden chars for nodenames
+ * @private
+ */
+var JSJACJID_FORBIDDEN = ['"',' ','&','\'','/',':','<','>','@'];
+
+/**
+ * Creates a new JSJaCJID object
+ * @class JSJaCJID models xmpp jid objects
+ * @constructor
+ * @param {Object} jid jid may be either of type String or a JID represented
+ * by JSON with fields 'node', 'domain' and 'resource'
+ * @throws JSJaCJIDInvalidException Thrown if jid is not valid
+ * @return a new JSJaCJID object
+ */
+function JSJaCJID(jid) {
+  /**
+   *@private
+   */
+  this._node = '';
+  /**
+   *@private
+   */
+  this._domain = '';
+  /**
+   *@private
+   */
+  this._resource = '';
+
+  if (typeof(jid) == 'string') {
+    if (jid.indexOf('@') != -1) {
+        this.setNode(jid.substring(0,jid.indexOf('@')));
+        jid = jid.substring(jid.indexOf('@')+1);
+    }
+    if (jid.indexOf('/') != -1) {
+      this.setResource(jid.substring(jid.indexOf('/')+1));
+      jid = jid.substring(0,jid.indexOf('/'));
+    }
+    this.setDomain(jid);
+  } else {
+    this.setNode(jid.node);
+    this.setDomain(jid.domain);
+    this.setResource(jid.resource);
+  }
+}
+
+
+/**
+ * Gets the node part of the jid
+ * @return A string representing the node name
+ * @type String
+ */
+JSJaCJID.prototype.getNode = function() { return this._node; };
+
+/**
+ * Gets the domain part of the jid
+ * @return A string representing the domain name
+ * @type String
+ */
+JSJaCJID.prototype.getDomain = function() { return this._domain; };
+
+/**
+ * Gets the resource part of the jid
+ * @return A string representing the resource
+ * @type String
+ */
+JSJaCJID.prototype.getResource = function() { return this._resource; };
+
+
+/**
+ * Sets the node part of the jid
+ * @param {String} node Name of the node
+ * @throws JSJaCJIDInvalidException Thrown if node name contains invalid chars
+ * @return This object
+ * @type JSJaCJID
+ */
+JSJaCJID.prototype.setNode = function(node) {
+  JSJaCJID._checkNodeName(node);
+  this._node = node || '';
+  return this;
+};
+
+/**
+ * Sets the domain part of the jid
+ * @param {String} domain Name of the domain
+ * @throws JSJaCJIDInvalidException Thrown if domain name contains invalid
+ * chars or is empty
+ * @return This object
+ * @type JSJaCJID
+ */
+JSJaCJID.prototype.setDomain = function(domain) {
+  if (!domain || domain == '')
+    throw new JSJaCJIDInvalidException("domain name missing");
+  // chars forbidden for a node are not allowed in domain names
+  // anyway, so let's check
+  JSJaCJID._checkNodeName(domain);
+  this._domain = domain;
+  return this;
+};
+
+/**
+ * Sets the resource part of the jid
+ * @param {String} resource Name of the resource
+ * @return This object
+ * @type JSJaCJID
+ */
+JSJaCJID.prototype.setResource = function(resource) {
+  this._resource = resource || '';
+  return this;
+};
+
+/**
+ * The string representation of the full jid
+ * @return A string representing the jid
+ * @type String
+ */
+JSJaCJID.prototype.toString = function() {
+  var jid = '';
+  if (this.getNode() && this.getNode() != '')
+    jid = this.getNode() + '@';
+  jid += this.getDomain(); // we always have a domain
+  if (this.getResource() && this.getResource() != "")
+    jid += '/' + this.getResource();
+  return jid;
+};
+
+/**
+ * Removes the resource part of the jid
+ * @return This object
+ * @type JSJaCJID
+ */
+JSJaCJID.prototype.removeResource = function() {
+  return this.setResource();
+};
+
+/**
+ * creates a copy of this JSJaCJID object
+ * @return A copy of this
+ * @type JSJaCJID
+ */
+JSJaCJID.prototype.clone = function() {
+  return new JSJaCJID(this.toString());
+};
+
+/**
+ * Compares two jids if they belong to the same entity (i.e. w/o resource)
+ * @param {String} jid a jid as string or JSJaCJID object
+ * @return 'true' if jid is same entity as this
+ * @type Boolean
+ */
+JSJaCJID.prototype.isEntity = function(jid) {
+  if (typeof jid == 'string')
+	  jid = (new JSJaCJID(jid));
+  jid.removeResource();
+  return (this.clone().removeResource().toString() === jid.toString());
+};
+
+/**
+ * Check if node name is valid
+ * @private
+ * @param {String} node A name for a node
+ * @throws JSJaCJIDInvalidException Thrown if name for node is not allowed
+ */
+JSJaCJID._checkNodeName = function(nodeprep) {
+    if (!nodeprep || nodeprep == '')
+      return;
+    for (var i=0; i< JSJACJID_FORBIDDEN.length; i++) {
+      if (nodeprep.indexOf(JSJACJID_FORBIDDEN[i]) != -1) {
+        throw new JSJaCJIDInvalidException("forbidden char in nodename: "+JSJACJID_FORBIDDEN[i]);
+      }
+    }
+};
+
+/**
+ * Creates a new Exception of type JSJaCJIDInvalidException
+ * @class Exception to indicate invalid values for a jid
+ * @constructor
+ * @param {String} message The message associated with this Exception
+ */
+function JSJaCJIDInvalidException(message) {
+  /**
+   * The exceptions associated message
+   * @type String
+   */
+  this.message = message;
+  /**
+   * The name of the exception
+   * @type String
+   */
+  this.name = "JSJaCJIDInvalidException";
+}
+
+
+/* Copyright (c) 2005 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use, copy,
+ * modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+/**
+ * @private
+ * This code is taken from {@link
+ * http://wiki.script.aculo.us/scriptaculous/show/Builder
+ * script.aculo.us' Dom Builder} and has been modified to suit our
+ * needs.<br/>
+ * The original parts of the code do have the following
+ * copyright and license notice:<br/>
+ * Copyright (c) 2005, 2006 Thomas Fuchs (http://script.aculo.us,
+ * http://mir.acu lo.us) <br/>
+ * script.aculo.us is freely distributable under the terms of an
+ * MIT-style license.<br>
+ * For details, see the script.aculo.us web site:
+ * http://script.aculo.us/<br>
+ */
+var JSJaCBuilder = {
+  /**
+   * @private
+   */
+  buildNode: function(doc, elementName) {
+
+    var element, ns = arguments[4];
+
+    // attributes (or text)
+    if(arguments[2])
+      if(JSJaCBuilder._isStringOrNumber(arguments[2]) ||
+         (arguments[2] instanceof Array)) {
+        element = this._createElement(doc, elementName, ns);
+        JSJaCBuilder._children(doc, element, arguments[2]);
+      } else {
+        ns = arguments[2]['xmlns'] || ns;
+        element = this._createElement(doc, elementName, ns);
+        for(attr in arguments[2]) {
+          if (arguments[2].hasOwnProperty(attr) && attr != 'xmlns')
+            element.setAttribute(attr, arguments[2][attr]);
+        }
+      }
+    else
+      element = this._createElement(doc, elementName, ns);
+    // text, or array of children
+    if(arguments[3])
+      JSJaCBuilder._children(doc, element, arguments[3], ns);
+
+    return element;
+  },
+
+  _createElement: function(doc, elementName, ns) {
+    try {
+      if (ns)
+        return doc.createElementNS(ns, elementName);
+    } catch (ex) { }
+
+    var el = doc.createElement(elementName);
+
+    if (ns)
+      el.setAttribute("xmlns", ns);
+
+    return el;
+  },
+
+  /**
+   * @private
+   */
+  _text: function(doc, text) {
+    return doc.createTextNode(text);
+  },
+
+  /**
+   * @private
+   */
+  _children: function(doc, element, children, ns) {
+    if(typeof children=='object') { // array can hold nodes and text
+      for (var i in children) {
+        if (children.hasOwnProperty(i)) {
+          var e = children[i];
+          if (typeof e=='object') {
+            if (e instanceof Array) {
+              var node = JSJaCBuilder.buildNode(doc, e[0], e[1], e[2], ns);
+              element.appendChild(node);
+            } else {
+              element.appendChild(e);
+            }
+          } else {
+            if(JSJaCBuilder._isStringOrNumber(e)) {
+              element.appendChild(JSJaCBuilder._text(doc, e));
+            }
+          }
+        }
+      }
+    } else {
+      if(JSJaCBuilder._isStringOrNumber(children)) {
+        element.appendChild(JSJaCBuilder._text(doc, children));
+      }
+    }
+  },
+
+  _attributes: function(attributes) {
+    var attrs = [];
+    for(attribute in attributes)
+      if (attributes.hasOwnProperty(attribute))
+        attrs.push(attribute +
+          '="' + attributes[attribute].toString().htmlEnc() + '"');
+    return attrs.join(" ");
+  },
+
+  _isStringOrNumber: function(param) {
+    return(typeof param=='string' || typeof param=='number');
+  }
+};
+
+
+/**
+ * @fileoverview Contains all Jabber/XMPP packet related classes.
+ * @author Stefan Strigler steve@zeank.in-berlin.de
+ * @version $Revision$
+ */
+
+var JSJACPACKET_USE_XMLNS = true;
+
+/**
+ * Creates a new packet with given root tag name (for internal use)
+ * @class Somewhat abstract base class for all kinds of specialised packets
+ * @param {String} name The root tag name of the packet
+ * (i.e. one of 'message', 'iq' or 'presence')
+ */
+function JSJaCPacket(name) {
+  /**
+   * @private
+   */
+  this.name = name;
+
+  if (typeof(JSJACPACKET_USE_XMLNS) != 'undefined' && JSJACPACKET_USE_XMLNS)
+    /**
+     * @private
+     */
+    this.doc = XmlDocument.create(name,'jabber:client');
+  else
+    /**
+     * @private
+     */
+    this.doc = XmlDocument.create(name,'');
+}
+
+/**
+ * Gets the type (name of root element) of this packet, i.e. one of
+ * 'presence', 'message' or 'iq'
+ * @return the top level tag name
+ * @type String
+ */
+JSJaCPacket.prototype.pType = function() { return this.name; };
+
+/**
+ * Gets the associated Document for this packet.
+ * @type {@link http://www.w3.org/TR/2000/REC-DOM-Level-2-Core-20001113/core.html#i-Document Document}
+ */
+JSJaCPacket.prototype.getDoc = function() {
+  return this.doc;
+};
+/**
+ * Gets the root node of this packet
+ * @type {@link http://www.w3.org/TR/2000/REC-DOM-Level-2-Core-20001113/core.html#ID-1950641247 Node}
+ */
+JSJaCPacket.prototype.getNode = function() {
+  if (this.getDoc() && this.getDoc().documentElement)
+    return this.getDoc().documentElement;
+  else
+    return null;
+};
+
+/**
+ * Sets the 'to' attribute of the root node of this packet
+ * @param {String} to
+ * @type JSJaCPacket
+ */
+JSJaCPacket.prototype.setTo = function(to) {
+  if (!to || to == '')
+    this.getNode().removeAttribute('to');
+  else if (typeof(to) == 'string')
+    this.getNode().setAttribute('to',to);
+  else
+    this.getNode().setAttribute('to',to.toString());
+  return this;
+};
+/**
+ * Sets the 'from' attribute of the root node of this
+ * packet. Usually this is not needed as the server will take care
+ * of this automatically.
+ * @type JSJaCPacket
+ */
+JSJaCPacket.prototype.setFrom = function(from) {
+  if (!from || from == '')
+    this.getNode().removeAttribute('from');
+  else if (typeof(from) == 'string')
+    this.getNode().setAttribute('from',from);
+  else
+    this.getNode().setAttribute('from',from.toString());
+  return this;
+};
+/**
+ * Sets 'id' attribute of the root node of this packet.
+ * @param {String} id The id of the packet.
+ * @type JSJaCPacket
+ */
+JSJaCPacket.prototype.setID = function(id) {
+  if (!id || id == '')
+    this.getNode().removeAttribute('id');
+  else
+    this.getNode().setAttribute('id',id);
+  return this;
+};
+/**
+ * Sets the 'type' attribute of the root node of this packet.
+ * @param {String} type The type of the packet.
+ * @type JSJaCPacket
+ */
+JSJaCPacket.prototype.setType = function(type) {
+  if (!type || type == '')
+    this.getNode().removeAttribute('type');
+  else
+    this.getNode().setAttribute('type',type);
+  return this;
+};
+/**
+ * Sets 'xml:lang' for this packet
+ * @param {String} xmllang The xml:lang of the packet.
+ * @type JSJaCPacket
+ */
+JSJaCPacket.prototype.setXMLLang = function(xmllang) {
+  // Fix IE9+ bug with xml:lang attribute
+  if (BrowserDetect && (BrowserDetect.browser == 'Explorer') && (BrowserDetect.version >= 9))
+    return this;
+  if (!xmllang || xmllang == '')
+    this.getNode().removeAttribute('xml:lang');
+  else
+    this.getNode().setAttribute('xml:lang',xmllang);
+  return this;
+};
+
+/**
+ * Gets the 'to' attribute of this packet
+ * @type String
+ */
+JSJaCPacket.prototype.getTo = function() {
+  return this.getNode().getAttribute('to');
+};
+/**
+ * Gets the 'from' attribute of this packet.
+ * @type String
+ */
+JSJaCPacket.prototype.getFrom = function() {
+  return this.getNode().getAttribute('from');
+};
+/**
+ * Gets the 'to' attribute of this packet as a JSJaCJID object
+ * @type JSJaCJID
+ */
+JSJaCPacket.prototype.getToJID = function() {
+  return new JSJaCJID(this.getTo());
+};
+/**
+ * Gets the 'from' attribute of this packet as a JSJaCJID object
+ * @type JSJaCJID
+ */
+JSJaCPacket.prototype.getFromJID = function() {
+  return new JSJaCJID(this.getFrom());
+};
+/**
+ * Gets the 'id' of this packet
+ * @type String
+ */
+JSJaCPacket.prototype.getID = function() {
+  return this.getNode().getAttribute('id');
+};
+/**
+ * Gets the 'type' of this packet
+ * @type String
+ */
+JSJaCPacket.prototype.getType = function() {
+  return this.getNode().getAttribute('type');
+};
+/**
+ * Gets the 'xml:lang' of this packet
+ * @type String
+ */
+JSJaCPacket.prototype.getXMLLang = function() {
+  return this.getNode().getAttribute('xml:lang');
+};
+/**
+ * Gets the 'xmlns' (xml namespace) of the root node of this packet
+ * @type String
+ */
+JSJaCPacket.prototype.getXMLNS = function() {
+  return this.getNode().namespaceURI || this.getNode().getAttribute('xmlns');
+};
+
+/**
+ * Gets a child element of this packet. If no params given returns first child.
+ * @param {String} name Tagname of child to retrieve. Use '*' to match any tag. [optional]
+ * @param {String} ns   Namespace of child. Use '*' to match any ns.[optional]
+ * @return The child node, null if none found
+ * @type {@link http://www.w3.org/TR/2000/REC-DOM-Level-2-Core-20001113/core.html#ID-1950641247 Node}
+ */
+JSJaCPacket.prototype.getChild = function(name, ns) {
+  if (!this.getNode()) {
+    return null;
+  }
+
+  name = name || '*';
+  ns = ns || '*';
+
+  if (this.getNode().getElementsByTagNameNS) {
+    return this.getNode().getElementsByTagNameNS(ns, name).item(0);
+  }
+
+  // fallback
+  var nodes = this.getNode().getElementsByTagName(name);
+  if (ns != '*') {
+    for (var i=0; i<nodes.length; i++) {
+      if (nodes.item(i).namespaceURI == ns || nodes.item(i).getAttribute('xmlns') == ns) {
+        return nodes.item(i);
+      }
+    }
+  } else {
+    return nodes.item(0);
+  }
+  return null; // nothing found
+};
+
+/**
+ * Gets the node value of a child element of this packet.
+ * @param {String} name Tagname of child to retrieve.
+ * @param {String} ns   Namespace of child
+ * @return The value of the child node, empty string if none found
+ * @type String
+ */
+JSJaCPacket.prototype.getChildVal = function(name, ns) {
+  var node = this.getChild(name, ns);
+  var ret = '';
+  if (node && node.hasChildNodes()) {
+    // concatenate all values from childNodes
+    for (var i=0; i<node.childNodes.length; i++)
+      if (node.childNodes.item(i).nodeValue)
+        ret += node.childNodes.item(i).nodeValue;
+  }
+  return ret;
+};
+
+/**
+ * Returns a copy of this node
+ * @return a copy of this node
+ * @type JSJaCPacket
+ */
+JSJaCPacket.prototype.clone = function() {
+  return JSJaCPacket.wrapNode(this.getNode());
+};
+
+/**
+ * Checks if packet is of type 'error'
+ * @return 'true' if this packet is of type 'error', 'false' otherwise
+ * @type boolean
+ */
+JSJaCPacket.prototype.isError = function() {
+  return (this.getType() == 'error');
+};
+
+/**
+ * Returns an error condition reply according to {@link http://www.xmpp.org/extensions/xep-0086.html XEP-0086}. Creates a clone of the calling packet with senders and recipient exchanged and error stanza appended.
+ * @param {STANZA_ERROR} stanza_error an error stanza containing error cody, type and condition of the error to be indicated
+ * @return an error reply packet
+ * @type JSJaCPacket
+ */
+JSJaCPacket.prototype.errorReply = function(stanza_error) {
+  var rPacket = this.clone();
+  rPacket.setTo(this.getFrom());
+  rPacket.setFrom();
+  rPacket.setType('error');
+
+  rPacket.appendNode('error',
+                     {code: stanza_error.code, type: stanza_error.type},
+                     [[stanza_error.cond]]);
+
+  return rPacket;
+};
+
+/**
+ * Returns a string representation of the raw xml content of this packet.
+ * @type String
+ */
+JSJaCPacket.prototype.xml = typeof XMLSerializer != 'undefined' ?
+function() {
+  var r = (new XMLSerializer()).serializeToString(this.getNode());
+  if (typeof(r) == 'undefined')
+    r = (new XMLSerializer()).serializeToString(this.doc); // oldschool
+  return r
+} :
+function() {// IE
+  return this.getDoc().xml
+};
+
+
+// PRIVATE METHODS DOWN HERE
+
+/**
+ * Gets an attribute of the root element
+ * @private
+ */
+JSJaCPacket.prototype._getAttribute = function(attr) {
+  return this.getNode().getAttribute(attr);
+};
+
+
+if (document.ELEMENT_NODE == null) {
+  document.ELEMENT_NODE = 1;
+  document.ATTRIBUTE_NODE = 2;
+  document.TEXT_NODE = 3;
+  document.CDATA_SECTION_NODE = 4;
+  document.ENTITY_REFERENCE_NODE = 5;
+  document.ENTITY_NODE = 6;
+  document.PROCESSING_INSTRUCTION_NODE = 7;
+  document.COMMENT_NODE = 8;
+  document.DOCUMENT_NODE = 9;
+  document.DOCUMENT_TYPE_NODE = 10;
+  document.DOCUMENT_FRAGMENT_NODE = 11;
+  document.NOTATION_NODE = 12;
+}
+
+/**
+ * import node into this packets document
+ * @private
+ */
+JSJaCPacket.prototype._importNode = function(node, allChildren) {
+  switch (node.nodeType) {
+  case document.ELEMENT_NODE:
+
+  if (this.getDoc().createElementNS) {
+    var newNode = this.getDoc().createElementNS(node.namespaceURI, node.nodeName);
+  } else {
+    var newNode = this.getDoc().createElement(node.nodeName);
+  }
+
+  /* does the node have any attributes to add? */
+  if (node.attributes && node.attributes.length > 0)
+    for (var i = 0, il = node.attributes.length;i < il; i++) {
+      var attr = node.attributes.item(i);
+      if (attr.nodeName == 'xmlns' && newNode.getAttribute('xmlns') != null ) continue;
+      if (newNode.setAttributeNS && attr.namespaceURI) {
+        newNode.setAttributeNS(attr.namespaceURI,
+                               attr.nodeName,
+                               attr.nodeValue);
+      } else {
+        newNode.setAttribute(attr.nodeName,
+                             attr.nodeValue);
+      }
+    }
+  /* are we going after children too, and does the node have any? */
+  if (allChildren && node.childNodes && node.childNodes.length > 0) {
+    for (var i = 0, il = node.childNodes.length; i < il; i++) {
+      newNode.appendChild(this._importNode(node.childNodes.item(i), allChildren));
+    }
+  }
+  return newNode;
+  break;
+  case document.TEXT_NODE:
+  case document.CDATA_SECTION_NODE:
+  case document.COMMENT_NODE:
+  return this.getDoc().createTextNode(node.nodeValue);
+  break;
+  }
+};
+
+/**
+ * Set node value of a child node
+ * @private
+ */
+JSJaCPacket.prototype._setChildNode = function(nodeName, nodeValue) {
+  var aNode = this.getChild(nodeName);
+  var tNode = this.getDoc().createTextNode(nodeValue);
+  if (aNode)
+    try {
+      aNode.replaceChild(tNode,aNode.firstChild);
+    } catch (e) { }
+  else {
+    try {
+      aNode = this.getDoc().createElementNS(this.getNode().namespaceURI,
+                                            nodeName);
+    } catch (ex) {
+      aNode = this.getDoc().createElement(nodeName)
+    }
+    this.getNode().appendChild(aNode);
+    aNode.appendChild(tNode);
+  }
+  return aNode;
+};
+
+/**
+ * Builds a node using {@link
+ * http://wiki.script.aculo.us/scriptaculous/show/Builder
+ * script.aculo.us' Dom Builder} notation.
+ * This code is taken from {@link
+ * http://wiki.script.aculo.us/scriptaculous/show/Builder
+ * script.aculo.us' Dom Builder} and has been modified to suit our
+ * needs.<br/>
+ * The original parts of the code do have the following copyright
+ * and license notice:<br/>
+ * Copyright (c) 2005, 2006 Thomas Fuchs (http://script.aculo.us,
+ * http://mir.acu lo.us) <br/>
+ * script.aculo.us is freely distributable under the terms of an
+ * MIT-style licen se.  // For details, see the script.aculo.us web
+ * site: http://script.aculo.us/<br>
+ * @author Thomas Fuchs
+ * @author Stefan Strigler
+ * @return The newly created node
+ * @type {@link http://www.w3.org/TR/2000/REC-DOM-Level-2-Core-20001113/core.html#ID-1950641247 Node}
+ */
+JSJaCPacket.prototype.buildNode = function(elementName) {
+  return JSJaCBuilder.buildNode(this.getDoc(),
+                                elementName,
+                                arguments[1],
+                                arguments[2]);
+};
+
+/**
+ * Appends node created by buildNode to this packets parent node.
+ * @param {@link http://www.w3.org/TR/2000/REC-DOM-Level-2-Core-20001113/core.html#ID-1950641247 Node} element The node to append or
+ * @param {String} element A name plus an object hash with attributes (optional) plus an array of childnodes (optional)
+ * @see #buildNode
+ * @return This packet
+ * @type JSJaCPacket
+ */
+JSJaCPacket.prototype.appendNode = function(element) {
+  if (typeof element=='object') { // seems to be a prebuilt node
+    return this.getNode().appendChild(element)
+  } else { // build node
+    return this.getNode().appendChild(this.buildNode(element,
+                                                     arguments[1],
+                                                     arguments[2],
+                                                     null,
+                                                     this.getNode().namespaceURI));
+  }
+};
+
+
+/**
+ * A jabber/XMPP presence packet
+ * @class Models the XMPP notion of a 'presence' packet
+ * @extends JSJaCPacket
+ */
+function JSJaCPresence() {
+  /**
+   * @ignore
+   */
+  this.base = JSJaCPacket;
+  this.base('presence');
+}
+JSJaCPresence.prototype = new JSJaCPacket;
+
+/**
+ * Sets the status message for current status. Usually this is set
+ * to some human readable string indicating what the user is
+ * doing/feel like currently.
+ * @param {String} status A status message
+ * @return this
+ * @type JSJaCPacket
+ */
+JSJaCPresence.prototype.setStatus = function(status) {
+  this._setChildNode("status", status);
+  return this;
+};
+/**
+ * Sets the online status for this presence packet.
+ * @param {String} show An XMPP complient status indicator. Must
+ * be one of 'chat', 'away', 'xa', 'dnd'
+ * @return this
+ * @type JSJaCPacket
+ */
+JSJaCPresence.prototype.setShow = function(show) {
+  if (show == 'chat' || show == 'away' || show == 'xa' || show == 'dnd')
+    this._setChildNode("show",show);
+  return this;
+};
+/**
+ * Sets the priority of the resource bind to with this connection
+ * @param {int} prio The priority to set this resource to
+ * @return this
+ * @type JSJaCPacket
+ */
+JSJaCPresence.prototype.setPriority = function(prio) {
+  this._setChildNode("priority", prio);
+  return this;
+};
+/**
+ * Some combined method that allowes for setting show, status and
+ * priority at once
+ * @param {String} show A status message
+ * @param {String} status A status indicator as defined by XMPP
+ * @param {int} prio A priority for this resource
+ * @return this
+ * @type JSJaCPacket
+ */
+JSJaCPresence.prototype.setPresence = function(show,status,prio) {
+  if (show)
+    this.setShow(show);
+  if (status)
+    this.setStatus(status);
+  if (prio)
+    this.setPriority(prio);
+  return this;
+};
+
+/**
+ * Gets the status message of this presence
+ * @return The (human readable) status message
+ * @type String
+ */
+JSJaCPresence.prototype.getStatus = function() {
+  return this.getChildVal('status');
+};
+/**
+ * Gets the status of this presence.
+ * Either one of 'chat', 'away', 'xa' or 'dnd' or null.
+ * @return The status indicator as defined by XMPP
+ * @type String
+ */
+JSJaCPresence.prototype.getShow = function() {
+  return this.getChildVal('show');
+};
+/**
+ * Gets the priority of this status message
+ * @return A resource priority
+ * @type int
+ */
+JSJaCPresence.prototype.getPriority = function() {
+  return this.getChildVal('priority');
+};
+
+
+/**
+ * A jabber/XMPP iq packet
+ * @class Models the XMPP notion of an 'iq' packet
+ * @extends JSJaCPacket
+ */
+function JSJaCIQ() {
+  /**
+   * @ignore
+   */
+  this.base = JSJaCPacket;
+  this.base('iq');
+}
+JSJaCIQ.prototype = new JSJaCPacket;
+
+/**
+ * Some combined method to set 'to', 'type' and 'id' at once
+ * @param {String} to the recepients JID
+ * @param {String} type A XMPP compliant iq type (one of 'set', 'get', 'result' and 'error'
+ * @param {String} id A packet ID
+ * @return this
+ * @type JSJaCIQ
+ */
+JSJaCIQ.prototype.setIQ = function(to,type,id) {
+  if (to)
+    this.setTo(to);
+  if (type)
+    this.setType(type);
+  if (id)
+    this.setID(id);
+  return this;
+};
+/**
+ * Creates a 'query' child node with given XMLNS
+ * @param {String} xmlns The namespace for the 'query' node
+ * @return The query node
+ * @type {@link  http://www.w3.org/TR/2000/REC-DOM-Level-2-Core-20001113/core.html#ID-1950641247 Node}
+ */
+JSJaCIQ.prototype.setQuery = function(xmlns) {
+  var query;
+  try {
+    query = this.getDoc().createElementNS(xmlns,'query');
+  } catch (e) {
+    query = this.getDoc().createElement('query');
+	query.setAttribute('xmlns',xmlns);
+  }
+  this.getNode().appendChild(query);
+  return query;
+};
+
+/**
+ * Gets the 'query' node of this packet
+ * @return The query node
+ * @type {@link  http://www.w3.org/TR/2000/REC-DOM-Level-2-Core-20001113/core.html#ID-1950641247 Node}
+ */
+JSJaCIQ.prototype.getQuery = function() {
+  return this.getNode().getElementsByTagName('query').item(0);
+};
+/**
+ * Gets the XMLNS of the query node contained within this packet
+ * @return The namespace of the query node
+ * @type String
+ */
+JSJaCIQ.prototype.getQueryXMLNS = function() {
+  if (this.getQuery()) {
+    return this.getQuery().namespaceURI || this.getQuery().getAttribute('xmlns');
+  } else {
+    return null;
+  }
+};
+
+/**
+ * Creates an IQ reply with type set to 'result'. If given appends payload to first child if IQ. Payload maybe XML as string or a DOM element (or an array of such elements as well).
+ * @param {Element} payload A payload to be appended [optional]
+ * @return An IQ reply packet
+ * @type JSJaCIQ
+ */
+JSJaCIQ.prototype.reply = function(payload) {
+  var rIQ = this.clone();
+  rIQ.setTo(this.getFrom());
+  rIQ.setFrom();
+  rIQ.setType('result');
+  if (payload) {
+    if (typeof payload == 'string')
+      rIQ.getChild().appendChild(rIQ.getDoc().loadXML(payload));
+    else if (payload.constructor == Array) {
+      var node = rIQ.getChild();
+      for (var i=0; i<payload.length; i++)
+        if(typeof payload[i] == 'string')
+          node.appendChild(rIQ.getDoc().loadXML(payload[i]));
+        else if (typeof payload[i] == 'object')
+          node.appendChild(payload[i]);
+    }
+    else if (typeof payload == 'object')
+      rIQ.getChild().appendChild(payload);
+  }
+  return rIQ;
+};
+
+/**
+ * A jabber/XMPP message packet
+ * @class Models the XMPP notion of an 'message' packet
+ * @extends JSJaCPacket
+ */
+function JSJaCMessage() {
+  /**
+   * @ignore
+   */
+  this.base = JSJaCPacket;
+  this.base('message');
+}
+JSJaCMessage.prototype = new JSJaCPacket;
+
+/**
+ * Sets the body of the message
+ * @param {String} body Your message to be sent along
+ * @return this message
+ * @type JSJaCMessage
+ */
+JSJaCMessage.prototype.setBody = function(body) {
+  this._setChildNode("body",body);
+  return this;
+};
+/**
+ * Sets the subject of the message
+ * @param {String} subject Your subject to be sent along
+ * @return this message
+ * @type JSJaCMessage
+ */
+JSJaCMessage.prototype.setSubject = function(subject) {
+  this._setChildNode("subject",subject);
+  return this;
+};
+/**
+ * Sets the 'tread' attribute for this message. This is used to identify
+ * threads in chat conversations
+ * @param {String} thread Usually a somewhat random hash.
+ * @return this message
+ * @type JSJaCMessage
+ */
+JSJaCMessage.prototype.setThread = function(thread) {
+  this._setChildNode("thread", thread);
+  return this;
+};
+/**
+ * Gets the 'thread' identifier for this message
+ * @return A thread identifier
+ * @type String
+ */
+JSJaCMessage.prototype.getThread = function() {
+  return this.getChildVal('thread');
+};
+/**
+ * Gets the body of this message
+ * @return The body of this message
+ * @type String
+ */
+JSJaCMessage.prototype.getBody = function() {
+  return this.getChildVal('body');
+};
+/**
+ * Gets the subject of this message
+ * @return The subject of this message
+ * @type String
+ */
+JSJaCMessage.prototype.getSubject = function() {
+  return this.getChildVal('subject')
+};
+
+
+/**
+ * Tries to transform a w3c DOM node to JSJaC's internal representation
+ * (JSJaCPacket type, one of JSJaCPresence, JSJaCMessage, JSJaCIQ)
+ * @param: {Node
+ * http://www.w3.org/TR/2000/REC-DOM-Level-2-Core-20001113/core.html#ID-1950641247}
+ * node The node to be transformed
+ * @return A JSJaCPacket representing the given node. If node's root
+ * elemenent is not one of 'message', 'presence' or 'iq',
+ * <code>null</code> is being returned.
+ * @type JSJaCPacket
+ */
+JSJaCPacket.wrapNode = function(node) {
+  var oPacket = null;
+
+  switch (node.nodeName.toLowerCase()) {
+  case 'presence':
+      oPacket = new JSJaCPresence();
+      break;
+  case 'message':
+      oPacket = new JSJaCMessage();
+      break;
+  case 'iq':
+      oPacket = new JSJaCIQ();
+      break;
+  }
+
+  if (oPacket) {
+    oPacket.getDoc().replaceChild(oPacket._importNode(node, true),
+                                  oPacket.getNode());
+  }
+
+  return oPacket;
+};
+
+
+
+/**
+ * an error packet for internal use
+ * @private
+ * @constructor
+ */
+function JSJaCError(code,type,condition) {
+  var xmldoc = XmlDocument.create("error","jsjac");
+
+  xmldoc.documentElement.setAttribute('code',code);
+  xmldoc.documentElement.setAttribute('type',type);
+  if (condition)
+    xmldoc.documentElement.appendChild(xmldoc.createElement(condition)).
+      setAttribute('xmlns','urn:ietf:params:xml:ns:xmpp-stanzas');
+  return xmldoc.documentElement;
+}
+
+
+
+/**
+ * Creates a new set of hash keys
+ * @class Reflects a set of sha1/md5 hash keys for securing sessions
+ * @constructor
+ * @param {Function} func The hash function to be used for creating the keys
+ * @param {Debugger} oDbg Reference to debugger implementation [optional]
+ */									 
+function JSJaCKeys(func,oDbg) {
+  var seed = Math.random();
+
+  /**
+   * @private
+   */
+  this._k = new Array();
+  this._k[0] = seed.toString();
+  if (oDbg)
+    /**
+     * Reference to Debugger
+     * @type Debugger
+     */
+    this.oDbg = oDbg;
+  else {
+    this.oDbg = {};
+    this.oDbg.log = function() {};
+  }
+
+  if (func) {
+    for (var i=1; i<JSJAC_NKEYS; i++) {
+      this._k[i] = func(this._k[i-1]);
+      oDbg.log(i+": "+this._k[i],4);
+    }
+  }
+
+  /**
+   * @private
+   */
+  this._indexAt = JSJAC_NKEYS-1;
+  /**
+   * Gets next key from stack
+   * @return New hash key
+   * @type String
+   */
+  this.getKey = function() {
+    return this._k[this._indexAt--];
+  };
+  /**
+   * Indicates whether there's only one key left
+   * @return <code>true</code> if there's only one key left, false otherwise
+   * @type boolean
+   */
+  this.lastKey = function() { return (this._indexAt == 0); };
+  /**
+   * Returns number of overall/initial stack size
+   * @return Number of keys created
+   * @type int
+   */
+  this.size = function() { return this._k.length; };
+
+  /**
+   * @private
+   */
+  this._getSuspendVars = function() {
+    return ('_k,_indexAt').split(',');
+  }
+}
+
+
+/**
+ * @fileoverview Contains all things in common for all subtypes of connections
+ * supported.
+ * @author Stefan Strigler steve@zeank.in-berlin.de
+ * @version $Revision$
+ */
+
+/**
+ * Creates a new Jabber connection (a connection to a jabber server)
+ * @class Somewhat abstract base class for jabber connections. Contains all
+ * of the code in common for all jabber connections
+ * @constructor
+ * @param {JSON http://www.json.org/index} oArg JSON with properties: <br>
+ * * <code>httpbase</code> the http base address of the service to be used for
+ * connecting to jabber<br>
+ * * <code>oDbg</code> (optional) a reference to a debugger interface
+ */
+function JSJaCConnection(oArg) {
+
+  if (oArg && oArg.oDbg && oArg.oDbg.log) {
+      /**
+       * Reference to debugger interface
+       * (needs to implement method <code>log</code>)
+       * @type Debugger
+       */
+    this.oDbg = oArg.oDbg;
+  } else {
+    this.oDbg = new Object(); // always initialise a debugger
+    this.oDbg.log = function() { };
+  }
+
+  if (oArg && oArg.timerval)
+    this.setPollInterval(oArg.timerval);
+  else
+    this.setPollInterval(JSJAC_TIMERVAL);
+
+  if (oArg && oArg.httpbase)
+      /**
+       * @private
+       */
+    this._httpbase = oArg.httpbase;
+
+  if (oArg &&oArg.allow_plain)
+      /**
+       * @private
+       */
+    this.allow_plain = oArg.allow_plain;
+  else
+    this.allow_plain = JSJAC_ALLOW_PLAIN;
+
+  if (oArg && oArg.cookie_prefix)
+      /**
+       * @private
+       */
+    this._cookie_prefix = oArg.cookie_prefix;
+  else
+    this._cookie_prefix = "";
+
+  /**
+   * @private
+   */
+  this._connected = false;
+  /**
+   * @private
+   */
+  this._events = new Array();
+  /**
+   * @private
+   */
+  this._keys = null;
+  /**
+   * @private
+   */
+  this._ID = 0;
+  /**
+   * @private
+   */
+  this._inQ = new Array();
+  /**
+   * @private
+   */
+  this._pQueue = new Array();
+  /**
+   * @private
+   */
+  this._regIDs = new Array();
+  /**
+   * @private
+   */
+  this._req = new Array();
+  /**
+   * @private
+   */
+  this._status = 'intialized';
+  /**
+   * @private
+   */
+  this._errcnt = 0;
+  /**
+   * @private
+   */
+  this._inactivity = JSJAC_INACTIVITY;
+  /**
+   * @private
+   */
+  this._sendRawCallbacks = new Array();
+}
+
+// Generates an ID
+var STANZA_ID = 1;
+
+function genID() {
+  return STANZA_ID++;
+}
+
+JSJaCConnection.prototype.connect = function(oArg) {
+    this._setStatus('connecting');
+
+    this.domain = oArg.domain || 'localhost';
+    this.username = oArg.username;
+    this.resource = oArg.resource;
+    this.pass = oArg.pass;
+    this.register = oArg.register;
+
+    this.authhost = oArg.authhost || this.domain;
+    this.authtype = oArg.authtype || 'sasl';
+
+    if (oArg.xmllang && oArg.xmllang != '')
+        this._xmllang = oArg.xmllang;
+    else
+        this._xmllang = 'en';
+
+    this.host = oArg.host || this.domain;
+    this.port = oArg.port || 5222;
+    if (oArg.secure)
+        this.secure = 'true';
+    else
+        this.secure = 'false';
+
+    if (oArg.wait)
+        this._wait = oArg.wait;
+
+    this.jid = this.username + '@' + this.domain;
+    this.fulljid = this.jid + '/' + this.resource;
+
+    this._rid  = Math.round( 100000.5 + ( ( (900000.49999) - (100000.5) ) * Math.random() ) );
+
+    // setupRequest must be done after rid is created but before first use in reqstr
+    var slot = this._getFreeSlot();
+    this._req[slot] = this._setupRequest(true);
+
+    var reqstr = this._getInitialRequestString();
+
+    this.oDbg.log(reqstr,4);
+
+    this._req[slot].r.onreadystatechange =
+        JSJaC.bind(function() {
+            var r = this._req[slot].r;
+            if (r.readyState == 4) {
+                this.oDbg.log("async recv: "+r.responseText,4);
+                this._handleInitialResponse(r); // handle response
+            }
+        }, this);
+
+    if (typeof(this._req[slot].r.onerror) != 'undefined') {
+        this._req[slot].r.onerror =
+            JSJaC.bind(function(e) {
+                this.oDbg.log('XmlHttpRequest error',1);
+                return false;
+            }, this);
+    }
+
+    this._req[slot].r.send(reqstr);
+};
+
+/**
+ * Tells whether this connection is connected
+ * @return <code>true</code> if this connections is connected,
+ * <code>false</code> otherwise
+ * @type boolean
+ */
+JSJaCConnection.prototype.connected = function() { return this._connected; };
+
+/**
+ * Disconnects from jabber server and terminates session (if applicable)
+ */
+JSJaCConnection.prototype.disconnect = function() {
+  this._setStatus('disconnecting');
+ 
+  if (!this.connected())
+    return;
+  this._connected = false;
+ 
+  clearInterval(this._interval);
+  clearInterval(this._inQto);
+ 
+  if (this._timeout)
+    clearTimeout(this._timeout); // remove timer
+ 
+  var slot = this._getFreeSlot();
+  // Intentionally synchronous
+  this._req[slot] = this._setupRequest(false);
+ 
+  request = this._getRequestString(false, true);
+ 
+  this.oDbg.log("Disconnecting: " + request,4);
+  this._req[slot].r.send(request);
+ 
+  try {
+    removeDB('jsjac', 'state');
+  } catch (e) {}
+ 
+  this.oDbg.log("Disconnected: "+this._req[slot].r.responseText,2);
+  this._handleEvent('ondisconnect');
+};
+
+/**
+ * Gets current value of polling interval
+ * @return Polling interval in milliseconds
+ * @type int
+ */
+JSJaCConnection.prototype.getPollInterval = function() {
+  return this._timerval;
+};
+
+/**
+ * Registers an event handler (callback) for this connection.
+
+ * <p>Note: All of the packet handlers for specific packets (like
+ * message_in, presence_in and iq_in) fire only if there's no
+ * callback associated with the id.<br>
+
+ * <p>Example:<br/>
+ * <code>con.registerHandler('iq', 'query', 'jabber:iq:version', handleIqVersion);</code>
+
+
+ * @param {String} event One of
+
+ * <ul>
+ * <li>onConnect - connection has been established and authenticated</li>
+ * <li>onDisconnect - connection has been disconnected</li>
+ * <li>onResume - connection has been resumed</li>
+
+ * <li>onStatusChanged - connection status has changed, current
+ * status as being passed argument to handler. See {@link #status}.</li>
+
+ * <li>onError - an error has occured, error node is supplied as
+ * argument, like this:<br><code>&lt;error code='404' type='cancel'&gt;<br>
+ * &lt;item-not-found xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/&gt;<br>
+ * &lt;/error&gt;</code></li>
+
+ * <li>packet_in - a packet has been received (argument: the
+ * packet)</li>
+
+ * <li>packet_out - a packet is to be sent(argument: the
+ * packet)</li>
+
+ * <li>message_in | message - a message has been received (argument:
+ * the packet)</li>
+
+ * <li>message_out - a message packet is to be sent (argument: the
+ * packet)</li>
+
+ * <li>presence_in | presence - a presence has been received
+ * (argument: the packet)</li>
+
+ * <li>presence_out - a presence packet is to be sent (argument: the
+ * packet)</li>
+
+ * <li>iq_in | iq - an iq has been received (argument: the packet)</li>
+ * <li>iq_out - an iq is to be sent (argument: the packet)</li>
+ * </ul>
+
+ * @param {String} childName A childnode's name that must occur within a
+ * retrieved packet [optional]
+
+ * @param {String} childNS A childnode's namespace that must occure within
+ * a retrieved packet (works only if childName is given) [optional]
+
+ * @param {String} type The type of the packet to handle (works only if childName and chidNS are given (both may be set to '*' in order to get skipped) [optional]
+
+ * @param {Function} handler The handler to be called when event occurs. If your handler returns 'true' it cancels bubbling of the event. No other registered handlers for this event will be fired.
+ */
+JSJaCConnection.prototype.registerHandler = function(event) {
+  event = event.toLowerCase(); // don't be case-sensitive here
+  var eArg = {handler: arguments[arguments.length-1],
+              childName: '*',
+              childNS: '*',
+              type: '*'};
+  if (arguments.length > 2)
+    eArg.childName = arguments[1];
+  if (arguments.length > 3)
+    eArg.childNS = arguments[2];
+  if (arguments.length > 4)
+    eArg.type = arguments[3];
+  if (!this._events[event])
+    this._events[event] = new Array(eArg);
+  else
+    this._events[event] = this._events[event].concat(eArg);
+
+  // sort events in order how specific they match criterias thus using
+  // wildcard patterns puts them back in queue when it comes to
+  // bubbling the event
+  this._events[event] =
+  this._events[event].sort(function(a,b) {
+    var aRank = 0;
+    var bRank = 0;
+    with (a) {
+      if (type == '*')
+        aRank++;
+      if (childNS == '*')
+        aRank++;
+      if (childName == '*')
+        aRank++;
+    }
+    with (b) {
+      if (type == '*')
+        bRank++;
+      if (childNS == '*')
+        bRank++;
+      if (childName == '*')
+        bRank++;
+    }
+    if (aRank > bRank)
+      return 1;
+    if (aRank < bRank)
+      return -1;
+    return 0;
+  });
+  this.oDbg.log("registered handler for event '"+event+"'",2);
+};
+
+JSJaCConnection.prototype.unregisterHandler = function(event,handler) {
+  event = event.toLowerCase(); // don't be case-sensitive here
+
+  if (!this._events[event])
+    return;
+
+  var arr = this._events[event], res = new Array();
+  for (var i=0; i<arr.length; i++)
+    if (arr[i].handler != handler)
+      res.push(arr[i]);
+
+  if (arr.length != res.length) {
+    this._events[event] = res;
+    this.oDbg.log("unregistered handler for event '"+event+"'",2);
+  }
+};
+
+/**
+ * Register for iq packets of type 'get'.
+ * @param {String} childName A childnode's name that must occur within a
+ * retrieved packet
+
+ * @param {String} childNS A childnode's namespace that must occure within
+ * a retrieved packet (works only if childName is given)
+
+ * @param {Function} handler The handler to be called when event occurs. If your handler returns 'true' it cancels bubbling of the event. No other registered handlers for this event will be fired.
+ */
+JSJaCConnection.prototype.registerIQGet = function(childName, childNS, handler) {
+  this.registerHandler('iq', childName, childNS, 'get', handler);
+};
+
+/**
+ * Register for iq packets of type 'set'.
+ * @param {String} childName A childnode's name that must occur within a
+ * retrieved packet
+
+ * @param {String} childNS A childnode's namespace that must occure within
+ * a retrieved packet (works only if childName is given)
+
+ * @param {Function} handler The handler to be called when event occurs. If your handler returns 'true' it cancels bubbling of the event. No other registered handlers for this event will be fired.
+ */
+JSJaCConnection.prototype.registerIQSet = function(childName, childNS, handler) {
+  this.registerHandler('iq', childName, childNS, 'set', handler);
+};
+
+/**
+ * Resumes this connection from saved state (cookie)
+ * @return Whether resume was successful
+ * @type boolean
+ */
+JSJaCConnection.prototype.resume = function() {
+  try {
+    var json = getDB('jsjac', 'state');
+    this.oDbg.log('read cookie: '+json,2);
+    removeDB('jsjac', 'state');
+
+    return this.resumeFromData(JSJaCJSON.parse(json));
+  } catch (e) {}
+  return false; // sth went wrong
+};
+
+/**
+ * Resumes BOSH connection from data
+ * @param {Object} serialized jsjac state information
+ * @return Whether resume was successful
+ * @type boolean
+ */
+JSJaCConnection.prototype.resumeFromData = function(data) {
+  try {
+    this._setStatus('resuming');
+
+    for (var i in data)
+      if (data.hasOwnProperty(i))
+        this[i] = data[i];
+
+    // copy keys - not being very generic here :-/
+    if (this._keys) {
+      this._keys2 = new JSJaCKeys();
+      var u = this._keys2._getSuspendVars();
+      for (var i=0; i<u.length; i++)
+        this._keys2[u[i]] = this._keys[u[i]];
+      this._keys = this._keys2;
+    }
+
+    if (this._connected) {
+      // don't poll too fast!
+      this._handleEvent('onresume');
+      setTimeout(JSJaC.bind(this._resume, this),this.getPollInterval());
+      this._interval = setInterval(JSJaC.bind(this._checkQueue, this),
+				   JSJAC_CHECKQUEUEINTERVAL);
+      this._inQto = setInterval(JSJaC.bind(this._checkInQ, this),
+				JSJAC_CHECKINQUEUEINTERVAL);
+    }
+
+    return (this._connected === true);
+  } catch (e) {
+    if (e.message)
+      this.oDbg.log("Resume failed: "+e.message, 1);
+    else
+      this.oDbg.log("Resume failed: "+e, 1);
+    return false;
+  }
+};
+
+/**
+ * Sends a JSJaCPacket
+ * @param {JSJaCPacket} packet  The packet to send
+ * @param {Function}    cb      The callback to be called if there's a reply
+ * to this packet (identified by id) [optional]
+ * @param {Object}      arg     Arguments passed to the callback
+ * (additionally to the packet received) [optional]
+ * @return 'true' if sending was successfull, 'false' otherwise
+ * @type boolean
+ */
+JSJaCConnection.prototype.send = function(packet,cb,arg) {
+  if (!packet || !packet.pType) {
+    this.oDbg.log("no packet: "+packet, 1);
+    return false;
+  }
+
+  if (!this.connected())
+    return false;
+
+  // generate an ID for the packet
+  if (!packet.getID())
+    packet.setID(genID());
+
+  // packet xml:lang
+  if (!packet.getXMLLang())
+    packet.setXMLLang(XML_LANG);
+
+  // remember id for response if callback present
+  if (cb)
+    this._registerPID(packet.getID(),cb,arg);
+
+  try {
+    this._handleEvent(packet.pType()+'_out', packet);
+    this._handleEvent("packet_out", packet);
+    this._pQueue = this._pQueue.concat(packet.xml());
+  } catch (e) {
+    this.oDbg.log(e.toString(),1);
+    return false;
+  }
+
+  return true;
+};
+
+/**
+ * Sends an IQ packet. Has default handlers for each reply type.
+ * Those maybe overriden by passing an appropriate handler.
+ * @param {JSJaCIQPacket} iq - the iq packet to send
+ * @param {Object} handlers - object with properties 'error_handler',
+ *                            'result_handler' and 'default_handler'
+ *                            with appropriate functions
+ * @param {Object} arg - argument to handlers
+ * @return 'true' if sending was successfull, 'false' otherwise
+ * @type boolean
+ */
+JSJaCConnection.prototype.sendIQ = function(iq, handlers, arg) {
+  if (!iq || iq.pType() != 'iq') {
+    return false;
+  }
+
+  handlers = handlers || {};
+    var error_handler = handlers.error_handler || JSJaC.bind(function(aIq) {
+        this.oDbg.log(aIq.xml(), 1);
+    }, this);
+
+    var result_handler = handlers.result_handler ||  JSJaC.bind(function(aIq) {
+        this.oDbg.log(aIq.xml(), 2);
+    }, this);
+
+  var iqHandler = function(aIq, arg) {
+    switch (aIq.getType()) {
+      case 'error':
+      error_handler(aIq);
+      break;
+      case 'result':
+      result_handler(aIq, arg);
+      break;
+    }
+  };
+  return this.send(iq, iqHandler, arg);
+};
+
+/**
+ * Sets polling interval for this connection
+ * @param {int} millisecs Milliseconds to set timer to
+ * @return effective interval this connection has been set to
+ * @type int
+ */
+JSJaCConnection.prototype.setPollInterval = function(timerval) {
+  if (timerval && !isNaN(timerval))
+    this._timerval = timerval;
+  return this._timerval;
+};
+
+/**
+ * Returns current status of this connection
+ * @return String to denote current state. One of
+ * <ul>
+ * <li>'initializing' ... well
+ * <li>'connecting' if connect() was called
+ * <li>'resuming' if resume() was called
+ * <li>'processing' if it's about to operate as normal
+ * <li>'onerror_fallback' if there was an error with the request object
+ * <li>'protoerror_fallback' if there was an error at the http binding protocol flow (most likely that's where you interested in)
+ * <li>'internal_server_error' in case of an internal server error
+ * <li>'suspending' if suspend() is being called
+ * <li>'aborted' if abort() was called
+ * <li>'disconnecting' if disconnect() has been called
+ * </ul>
+ * @type String
+ */
+JSJaCConnection.prototype.status = function() { return this._status; };
+
+/**
+ * Suspends this connection (saving state for later resume)
+ * Saves state to cookie
+ * @return Whether suspend (saving to cookie) was successful
+ * @type boolean
+ */
+JSJaCConnection.prototype.suspend = function(has_pause) {
+  var data = this.suspendToData(has_pause);
+  
+  try {
+    var c = setDB('jsjac', 'state', JSJaCJSON.toString(data));
+    return c;
+  } catch (e) {
+    this.oDbg.log("Failed creating cookie '"+this._cookie_prefix+
+                  "JSJaC_State': "+e.message,1);
+  }
+  return false;
+};
+
+/**
+ * Suspend connection and return serialized JSJaC connection state
+ * @return JSJaC connection state object
+ * @type Object
+ */
+JSJaCConnection.prototype.suspendToData = function(has_pause) {
+  
+  // remove timers
+  if(has_pause) {
+    clearTimeout(this._timeout);
+    clearInterval(this._interval);
+    clearInterval(this._inQto);
+
+    this._suspend();
+  }
+  
+  var u = ('_connected,_keys,_ID,_inQ,_pQueue,_regIDs,_errcnt,_inactivity,domain,username,resource,jid,fulljid,_sid,_httpbase,_timerval,_is_polling').split(',');
+  u = u.concat(this._getSuspendVars());
+  var s = new Object();
+
+  for (var i=0; i<u.length; i++) {
+    if (!this[u[i]]) continue; // hu? skip these!
+    if (this[u[i]]._getSuspendVars) {
+      var uo = this[u[i]]._getSuspendVars();
+      var o = new Object();
+      for (var j=0; j<uo.length; j++)
+        o[uo[j]] = this[u[i]][uo[j]];
+    } else
+      var o = this[u[i]];
+
+    s[u[i]] = o;
+  }
+  
+  if(has_pause) {
+    this._connected = false;
+    this._setStatus('suspending');
+  }
+  
+  return s;
+};
+
+/**
+ * @private
+ */
+JSJaCConnection.prototype._abort = function() {
+  clearTimeout(this._timeout); // remove timer
+
+  clearInterval(this._inQto);
+  clearInterval(this._interval);
+
+  this._connected = false;
+
+  this._setStatus('aborted');
+
+  this.oDbg.log("Disconnected.",1);
+  this._handleEvent('ondisconnect');
+  this._handleEvent('onerror',
+                    JSJaCError('500','cancel','service-unavailable'));
+};
+
+/**
+ * @private
+ */
+JSJaCConnection.prototype._checkInQ = function() {
+  for (var i=0; i<this._inQ.length && i<10; i++) {
+    var item = this._inQ[0];
+    this._inQ = this._inQ.slice(1,this._inQ.length);
+    var packet = JSJaCPacket.wrapNode(item);
+
+    if (!packet)
+      return;
+
+    this._handleEvent("packet_in", packet);
+
+    if (packet.pType && !this._handlePID(packet)) {
+      this._handleEvent(packet.pType()+'_in',packet);
+      this._handleEvent(packet.pType(),packet);
+    }
+  }
+};
+
+/**
+ * @private
+ */
+JSJaCConnection.prototype._checkQueue = function() {
+  if (this._pQueue.length != 0)
+    this._process();
+  return true;
+};
+
+/**
+ * @private
+ */
+JSJaCConnection.prototype._doAuth = function() {
+  if (this.has_sasl && this.authtype == 'nonsasl')
+    this.oDbg.log("Warning: SASL present but not used", 1);
+
+  if (!this._doSASLAuth() &&
+      !this._doLegacyAuth()) {
+    this.oDbg.log("Auth failed for authtype "+this.authtype,1);
+    this.disconnect();
+    return false;
+  }
+  return true;
+};
+
+/**
+ * @private
+ */
+JSJaCConnection.prototype._doInBandReg = function() {
+  if (this.authtype == 'saslanon' || this.authtype == 'anonymous')
+    return; // bullshit - no need to register if anonymous
+
+  /* ***
+   * In-Band Registration see JEP-0077
+   */
+
+  var iq = new JSJaCIQ();
+  iq.setType('set');
+  iq.setID('reg1');
+  iq.appendNode("query", {xmlns: "jabber:iq:register"},
+                [["username", this.username],
+                 ["password", this.pass]]);
+
+  this.send(iq,this._doInBandRegDone);
+};
+
+/**
+ * @private
+ */
+JSJaCConnection.prototype._doInBandRegDone = function(iq) {
+  if (iq && iq.getType() == 'error') { // we failed to register
+    this.oDbg.log("registration failed for "+this.username,0);
+    this._handleEvent('onerror',iq.getChild('error'));
+    return;
+  }
+
+  this.oDbg.log(this.username + " registered succesfully",0);
+
+  this._doAuth();
+};
+
+/**
+ * @private
+ */
+JSJaCConnection.prototype._doLegacyAuth = function() {
+  if (this.authtype != 'nonsasl' && this.authtype != 'anonymous')
+    return false;
+
+  /* ***
+   * Non-SASL Authentication as described in JEP-0078
+   */
+  var iq = new JSJaCIQ();
+  iq.setIQ(null,'get','auth1');
+  iq.appendNode('query', {xmlns: 'jabber:iq:auth'},
+                [['username', this.username]]);
+
+  this.send(iq,this._doLegacyAuth2);
+  return true;
+};
+
+/**
+ * @private
+ */
+JSJaCConnection.prototype._doLegacyAuth2 = function(iq) {
+  if (!iq || iq.getType() != 'result') {
+    if (iq && iq.getType() == 'error')
+      this._handleEvent('onerror',iq.getChild('error'));
+    this.disconnect();
+    return;
+  }
+
+  var use_digest = (iq.getChild('digest') != null);
+
+  /* ***
+   * Send authentication
+   */
+  var iq = new JSJaCIQ();
+  iq.setIQ(null,'set','auth2');
+
+  query = iq.appendNode('query', {xmlns: 'jabber:iq:auth'},
+                        [['username', this.username],
+                         ['resource', this.resource]]);
+
+  if (use_digest) { // digest login
+    query.appendChild(iq.buildNode('digest', {xmlns: 'jabber:iq:auth'},
+                                   hex_sha1(this.streamid + this.pass)));
+  } else if (this.allow_plain) { // use plaintext auth
+    query.appendChild(iq.buildNode('password', {xmlns: 'jabber:iq:auth'},
+                                   this.pass));
+  } else {
+    this.oDbg.log("no valid login mechanism found",1);
+    this.disconnect();
+    return false;
+  }
+
+  this.send(iq,this._doLegacyAuthDone);
+};
+
+/**
+ * @private
+ */
+JSJaCConnection.prototype._doLegacyAuthDone = function(iq) {
+  if (iq.getType() != 'result') { // auth' failed
+    if (iq.getType() == 'error')
+      this._handleEvent('onerror',iq.getChild('error'));
+    this.disconnect();
+  } else
+    this._handleEvent('onconnect');
+};
+
+/**
+ * @private
+ */
+JSJaCConnection.prototype._doSASLAuth = function() {
+  if (this.authtype == 'nonsasl' || this.authtype == 'anonymous')
+    return false;
+
+  if (this.authtype == 'saslanon') {
+    if (this.mechs['ANONYMOUS']) {
+      this.oDbg.log("SASL using mechanism 'ANONYMOUS'",2);
+      return this._sendRaw("<auth xmlns='urn:ietf:params:xml:ns:xmpp-sasl' mechanism='ANONYMOUS'/>",
+                           this._doSASLAuthDone);
+    }
+    this.oDbg.log("SASL ANONYMOUS requested but not supported",1);
+  } else {
+    if (this.mechs['DIGEST-MD5']) {
+      this.oDbg.log("SASL using mechanism 'DIGEST-MD5'",2);
+      return this._sendRaw("<auth xmlns='urn:ietf:params:xml:ns:xmpp-sasl' mechanism='DIGEST-MD5'/>",
+                           this._doSASLAuthDigestMd5S1);
+    } else if (this.allow_plain && this.mechs['PLAIN']) {
+      this.oDbg.log("SASL using mechanism 'PLAIN'",2);
+      var authStr = this.username+'@'+
+      this.domain+String.fromCharCode(0)+
+      this.username+String.fromCharCode(0)+
+      this.pass;
+      this.oDbg.log("authenticating with '"+authStr+"'",2);
+      authStr = b64encode(authStr);
+      return this._sendRaw("<auth xmlns='urn:ietf:params:xml:ns:xmpp-sasl' mechanism='PLAIN'>"+authStr+"</auth>",
+                           this._doSASLAuthDone);
+    }
+    this.oDbg.log("No SASL mechanism applied",1);
+    this.authtype = 'nonsasl'; // fallback
+  }
+  return false;
+};
+
+/**
+ * @private
+ */
+JSJaCConnection.prototype._doSASLAuthDigestMd5S1 = function(el) {
+  if (el.nodeName != "challenge") {
+    this.oDbg.log("challenge missing",1);
+    this._handleEvent('onerror',JSJaCError('401','auth','not-authorized'));
+    this.disconnect();
+  } else {
+    var challenge = b64decode(el.firstChild.nodeValue);
+    this.oDbg.log("got challenge: "+challenge,2);
+    this._nonce = challenge.substring(challenge.indexOf("nonce=")+7);
+    this._nonce = this._nonce.substring(0,this._nonce.indexOf("\""));
+    this.oDbg.log("nonce: "+this._nonce,2);
+    if (this._nonce == '' || this._nonce.indexOf('\"') != -1) {
+      this.oDbg.log("nonce not valid, aborting",1);
+      this.disconnect();
+      return;
+    }
+
+    this._digest_uri = "xmpp/";
+    //     if (typeof(this.host) != 'undefined' && this.host != '') {
+    //       this._digest-uri += this.host;
+    //       if (typeof(this.port) != 'undefined' && this.port)
+    //         this._digest-uri += ":" + this.port;
+    //       this._digest-uri += '/';
+    //     }
+    this._digest_uri += this.domain;
+
+    this._cnonce = cnonce(14);
+
+    this._nc = '00000001';
+
+    var A1 = str_md5(this.username+':'+this.domain+':'+this.pass)+
+    ':'+this._nonce+':'+this._cnonce;
+
+    var A2 = 'AUTHENTICATE:'+this._digest_uri;
+
+    var response = hex_md5(hex_md5(A1)+':'+this._nonce+':'+this._nc+':'+
+                           this._cnonce+':auth:'+hex_md5(A2));
+
+    var rPlain = 'username="'+this.username+'",realm="'+this.domain+
+    '",nonce="'+this._nonce+'",cnonce="'+this._cnonce+'",nc="'+this._nc+
+    '",qop=auth,digest-uri="'+this._digest_uri+'",response="'+response+
+    '",charset="utf-8"';
+
+    this.oDbg.log("response: "+rPlain,2);
+
+    this._sendRaw("<response xmlns='urn:ietf:params:xml:ns:xmpp-sasl'>"+
+                  b64encode(rPlain)+"</response>",
+                  this._doSASLAuthDigestMd5S2);
+  }
+};
+
+/**
+ * @private
+ */
+JSJaCConnection.prototype._doSASLAuthDigestMd5S2 = function(el) {
+  if (el.nodeName == 'failure') {
+    if (el.xml)
+      this.oDbg.log("auth error: "+el.xml,1);
+    else
+      this.oDbg.log("auth error",1);
+    this._handleEvent('onerror',JSJaCError('401','auth','not-authorized'));
+    this.disconnect();
+    return;
+  }
+
+  var response = b64decode(el.firstChild.nodeValue);
+  this.oDbg.log("response: "+response,2);
+
+  var rspauth = response.substring(response.indexOf("rspauth=")+8);
+  this.oDbg.log("rspauth: "+rspauth,2);
+
+  var A1 = str_md5(this.username+':'+this.domain+':'+this.pass)+
+  ':'+this._nonce+':'+this._cnonce;
+
+  var A2 = ':'+this._digest_uri;
+
+  var rsptest = hex_md5(hex_md5(A1)+':'+this._nonce+':'+this._nc+':'+
+                        this._cnonce+':auth:'+hex_md5(A2));
+  this.oDbg.log("rsptest: "+rsptest,2);
+
+  if (rsptest != rspauth) {
+    this.oDbg.log("SASL Digest-MD5: server repsonse with wrong rspauth",1);
+    this.disconnect();
+    return;
+  }
+
+    if (el.nodeName == 'success') {
+        this._reInitStream(JSJaC.bind(this._doStreamBind, this));
+    } else { // some extra turn
+        this._sendRaw("<response xmlns='urn:ietf:params:xml:ns:xmpp-sasl'/>",
+                      this._doSASLAuthDone);
+    }
+};
+
+/**
+ * @private
+ */
+JSJaCConnection.prototype._doSASLAuthDone = function (el) {
+    if (el.nodeName != 'success') {
+        this.oDbg.log("auth failed",1);
+        this._handleEvent('onerror',JSJaCError('401','auth','not-authorized'));
+        this.disconnect();
+    } else {
+        this._reInitStream(JSJaC.bind(this._doStreamBind, this));
+    }
+};
+
+/**
+ * @private
+ */
+JSJaCConnection.prototype._doStreamBind = function() {
+  var iq = new JSJaCIQ();
+  iq.setIQ(null,'set','bind_1');
+  iq.appendNode("bind", {xmlns: "urn:ietf:params:xml:ns:xmpp-bind"},
+                [["resource", this.resource]]);
+  this.oDbg.log(iq.xml());
+  this.send(iq,this._doXMPPSess);
+};
+
+/**
+ * @private
+ */
+JSJaCConnection.prototype._doXMPPSess = function(iq) {
+  if (iq.getType() != 'result' || iq.getType() == 'error') { // failed
+    this.disconnect();
+    if (iq.getType() == 'error')
+      this._handleEvent('onerror',iq.getChild('error'));
+    return;
+  }
+
+  this.fulljid = iq.getChildVal("jid");
+  this.jid = this.fulljid.substring(0,this.fulljid.lastIndexOf('/'));
+
+  iq = new JSJaCIQ();
+  iq.setIQ(null,'set','sess_1');
+  iq.appendNode("session", {xmlns: "urn:ietf:params:xml:ns:xmpp-session"},
+                []);
+  this.oDbg.log(iq.xml());
+  this.send(iq,this._doXMPPSessDone);
+};
+
+/**
+ * @private
+ */
+JSJaCConnection.prototype._doXMPPSessDone = function(iq) {
+  if (iq.getType() != 'result' || iq.getType() == 'error') { // failed
+    this.disconnect();
+    if (iq.getType() == 'error')
+      this._handleEvent('onerror',iq.getChild('error'));
+    return;
+  } else
+    this._handleEvent('onconnect');
+};
+
+/**
+ * @private
+ */
+JSJaCConnection.prototype._handleEvent = function(event,arg) {
+  event = event.toLowerCase(); // don't be case-sensitive here
+  this.oDbg.log("incoming event '"+event+"'",3);
+  if (!this._events[event])
+    return;
+  this.oDbg.log("handling event '"+event+"'",2);
+  for (var i=0;i<this._events[event].length; i++) {
+    var aEvent = this._events[event][i];
+    if (typeof aEvent.handler == 'function') {
+      try {
+        if (arg) {
+          if (arg.pType) { // it's a packet
+            if ((!arg.getNode().hasChildNodes() && aEvent.childName != '*') ||
+				(arg.getNode().hasChildNodes() &&
+				 !arg.getChild(aEvent.childName, aEvent.childNS)))
+              continue;
+            if (aEvent.type != '*' &&
+                arg.getType() != aEvent.type)
+              continue;
+            this.oDbg.log(aEvent.childName+"/"+aEvent.childNS+"/"+aEvent.type+" => match for handler "+aEvent.handler,3);
+          }
+          if (aEvent.handler(arg)) {
+            // handled!
+            break;
+          }
+        }
+        else
+          if (aEvent.handler()) {
+            // handled!
+            break;
+          }
+      } catch (e) {
+
+        if (e.fileName&&e.lineNumber) {
+            this.oDbg.log(aEvent.handler+"\n>>>"+e.name+": "+ e.message+' in '+e.fileName+' line '+e.lineNumber,1);
+        } else {
+            this.oDbg.log(aEvent.handler+"\n>>>"+e.name+": "+ e.message,1);
+        }
+
+      }
+    }
+  }
+};
+
+/**
+ * @private
+ */
+JSJaCConnection.prototype._handlePID = function(aJSJaCPacket) {
+  if (!aJSJaCPacket.getID())
+    return false;
+  for (var i in this._regIDs) {
+    if (this._regIDs.hasOwnProperty(i) &&
+        this._regIDs[i] && i == aJSJaCPacket.getID()) {
+      var pID = aJSJaCPacket.getID();
+      this.oDbg.log("handling "+pID,3);
+      try {
+        if (this._regIDs[i].cb.call(this, aJSJaCPacket, this._regIDs[i].arg) === false) {
+          // don't unregister
+          return false;
+        } else {
+          this._unregisterPID(pID);
+          return true;
+        }
+      } catch (e) {
+        // broken handler?
+        this.oDbg.log(e.name+": "+ e.message, 1);
+        this._unregisterPID(pID);
+        return true;
+      }
+    }
+  }
+  return false;
+};
+
+/**
+ * @private
+ */
+JSJaCConnection.prototype._handleResponse = function(req) {
+  var rootEl = this._parseResponse(req);
+
+  if (!rootEl)
+    return;
+
+  for (var i=0; i<rootEl.childNodes.length; i++) {
+    if (this._sendRawCallbacks.length) {
+      var cb = this._sendRawCallbacks[0];
+      this._sendRawCallbacks = this._sendRawCallbacks.slice(1, this._sendRawCallbacks.length);
+      cb.fn.call(this, rootEl.childNodes.item(i), cb.arg);
+      continue;
+    }
+    this._inQ = this._inQ.concat(rootEl.childNodes.item(i));
+  }
+};
+
+/**
+ * @private
+ */
+JSJaCConnection.prototype._parseStreamFeatures = function(doc) {
+    if (!doc) {
+        this.oDbg.log("nothing to parse ... aborting",1);
+        return false;
+    }
+
+    var errorTag;
+    if (doc.getElementsByTagNameNS) {
+        errorTag = doc.getElementsByTagNameNS("http://etherx.jabber.org/streams", "error").item(0);
+    } else {
+        var errors = doc.getElementsByTagName("error");
+        for (var i=0; i<errors.length; i++)
+            if (errors.item(i).namespaceURI == "http://etherx.jabber.org/streams" ||
+                errors.item(i).getAttribute('xmlns') == "http://etherx.jabber.org/streams") {
+                errorTag = errors.item(i);
+                break;
+            }
+    }
+
+    if (errorTag) {
+        this._setStatus("internal_server_error");
+        clearTimeout(this._timeout); // remove timer
+        clearInterval(this._interval);
+        clearInterval(this._inQto);
+        this._handleEvent('onerror',JSJaCError('503','cancel','session-terminate'));
+        this._connected = false;
+        this.oDbg.log("Disconnected.",1);
+        this._handleEvent('ondisconnect');
+        return false;
+    }
+    
+    this.mechs = new Object();
+    var lMec1 = doc.getElementsByTagName("mechanisms");
+    this.has_sasl = false;
+    for (var i=0; i<lMec1.length; i++)
+        if (lMec1.item(i).getAttribute("xmlns") ==
+            "urn:ietf:params:xml:ns:xmpp-sasl") {
+            this.has_sasl=true;
+            var lMec2 = lMec1.item(i).getElementsByTagName("mechanism");
+            for (var j=0; j<lMec2.length; j++)
+                this.mechs[lMec2.item(j).firstChild.nodeValue] = true;
+            break;
+        }
+    if (this.has_sasl)
+        this.oDbg.log("SASL detected",2);
+    else {
+        this.oDbg.log("No support for SASL detected",2);
+        return false;
+    }
+    
+    // Get the server CAPS (if available)
+    this.server_caps=null;
+    var sCaps = doc.getElementsByTagName("c");
+    for (var i=0; i<sCaps.length; i++) {
+      var c_sCaps=sCaps.item(i);
+      var x_sCaps=c_sCaps.getAttribute("xmlns");
+      var v_sCaps=c_sCaps.getAttribute("ver");
+      
+      if ((x_sCaps == NS_CAPS) && v_sCaps) {
+        this.server_caps=v_sCaps;
+        break;
+      }
+    }
+    
+    return true;
+};
+
+/**
+ * @private
+ */
+JSJaCConnection.prototype._process = function(timerval) {
+  if (!this.connected()) {
+    this.oDbg.log("Connection lost ...",1);
+    if (this._interval)
+      clearInterval(this._interval);
+    return;
+  }
+
+  this.setPollInterval(timerval);
+
+  if (this._timeout)
+    clearTimeout(this._timeout);
+
+  var slot = this._getFreeSlot();
+
+  if (slot < 0)
+    return;
+
+  if (typeof(this._req[slot]) != 'undefined' &&
+      typeof(this._req[slot].r) != 'undefined' &&
+      this._req[slot].r.readyState != 4) {
+    this.oDbg.log("Slot "+slot+" is not ready");
+    return;
+  }
+
+  if (!this.isPolling() && this._pQueue.length == 0 &&
+      this._req[(slot+1)%2] && this._req[(slot+1)%2].r.readyState != 4) {
+    this.oDbg.log("all slots busy, standby ...", 2);
+    return;
+  }
+
+  if (!this.isPolling())
+    this.oDbg.log("Found working slot at "+slot,2);
+
+  this._req[slot] = this._setupRequest(true);
+
+  /* setup onload handler for async send */
+  this._req[slot].r.onreadystatechange =
+  JSJaC.bind(function() {
+               if (this._req[slot].r.readyState == 4) {
+                 this._setStatus('processing');
+                 this.oDbg.log("async recv: "+this._req[slot].r.responseText,4);
+                 this._handleResponse(this._req[slot]);
+
+                 if (!this.connected())
+                   return;
+
+                 // schedule next tick
+                 if (this._pQueue.length) {
+                   this._timeout = setTimeout(JSJaC.bind(this._process, this),100);
+                 } else {
+                   this.oDbg.log("scheduling next poll in "+this.getPollInterval()+
+                                 " msec", 4);
+                   this._timeout = setTimeout(JSJaC.bind(this._process, this),this.getPollInterval());
+                 }
+               }
+             }, this);
+
+  try {
+    this._req[slot].r.onerror =
+      JSJaC.bind(function() {
+                   if (!this.connected())
+                     return;
+                   this._errcnt++;
+                   this.oDbg.log('XmlHttpRequest error ('+this._errcnt+')',1);
+                   if (this._errcnt > JSJAC_ERR_COUNT) {
+                     // abort
+                     this._abort();
+                     return false;
+                   }
+
+                   this._setStatus('onerror_fallback');
+
+                   // schedule next tick
+                   setTimeout(JSJaC.bind(this._resume, this),this.getPollInterval());
+                   return false;
+                 }, this);
+  } catch(e) { } // well ... no onerror property available, maybe we
+  // can catch the error somewhere else ...
+
+  var reqstr = this._getRequestString();
+
+  if (typeof(this._rid) != 'undefined') // remember request id if any
+    this._req[slot].rid = this._rid;
+
+  this.oDbg.log("sending: " + reqstr,4);
+  this._req[slot].r.send(reqstr);
+};
+
+/**
+ * @private
+ */
+JSJaCConnection.prototype._registerPID = function(pID,cb,arg) {
+  if (!pID || !cb)
+    return false;
+  this._regIDs[pID] = new Object();
+  this._regIDs[pID].cb = cb;
+  if (arg)
+    this._regIDs[pID].arg = arg;
+  this.oDbg.log("registered "+pID,3);
+  return true;
+};
+
+/**
+ * partial function binding sendEmpty to callback
+ * @private
+ */
+JSJaCConnection.prototype._prepSendEmpty = function(cb, ctx) {
+    return function() {
+        ctx._sendEmpty(JSJaC.bind(cb, ctx));
+    };
+};
+
+/**
+ * send empty request
+ * waiting for stream id to be able to proceed with authentication
+ * @private
+ */
+JSJaCConnection.prototype._sendEmpty = function(cb) {
+  var slot = this._getFreeSlot();
+  this._req[slot] = this._setupRequest(true);
+
+  this._req[slot].r.onreadystatechange =
+  JSJaC.bind(function() {
+               if (this._req[slot].r.readyState == 4) {
+                 this.oDbg.log("async recv: "+this._req[slot].r.responseText,4);
+                   cb(this._req[slot].r); // handle response
+               }
+             },this);
+
+  if (typeof(this._req[slot].r.onerror) != 'undefined') {
+    this._req[slot].r.onerror =
+      JSJaC.bind(function(e) {
+                   this.oDbg.log('XmlHttpRequest error',1);
+                   return false;
+                 }, this);
+  }
+
+  var reqstr = this._getRequestString();
+  this.oDbg.log("sending: " + reqstr,4);
+  this._req[slot].r.send(reqstr);
+};
+
+/**
+ * @private
+ */
+JSJaCConnection.prototype._sendRaw = function(xml,cb,arg) {
+  if (cb)
+    this._sendRawCallbacks.push({fn: cb, arg: arg});
+
+  this._pQueue.push(xml);
+  this._process();
+
+  return true;
+};
+
+/**
+ * @private
+ */
+JSJaCConnection.prototype._setStatus = function(status) {
+  if (!status || status == '')
+    return;
+  if (status != this._status) { // status changed!
+    this._status = status;
+    this._handleEvent('onstatuschanged', status);
+    this._handleEvent('status_changed', status);
+  }
+};
+
+/**
+ * @private
+ */
+JSJaCConnection.prototype._unregisterPID = function(pID) {
+  if (!this._regIDs[pID])
+    return false;
+  this._regIDs[pID] = null;
+  this.oDbg.log("unregistered "+pID,3);
+  return true;
+};
+
+
+/**
+ * @fileoverview All stuff related to HTTP Binding
+ * @author Stefan Strigler steve@zeank.in-berlin.de
+ * @version $Revision$
+ */
+
+/**
+ * Instantiates an HTTP Binding session
+ * @class Implementation of {@link
+ * http://www.xmpp.org/extensions/xep-0206.html XMPP Over BOSH}
+ * formerly known as HTTP Binding.
+ * @extends JSJaCConnection
+ * @constructor
+ */
+function JSJaCHttpBindingConnection(oArg) {
+  /**
+   * @ignore
+   */
+  this.base = JSJaCConnection;
+  this.base(oArg);
+
+  // member vars
+  /**
+   * @private
+   */
+  this._hold = JSJACHBC_MAX_HOLD;
+  /**
+   * @private
+   */
+  this._inactivity = 0;
+  /**
+   * @private
+   */
+  this._last_requests = new Object(); // 'hash' storing hold+1 last requests
+  /**
+   * @private
+   */
+  this._last_rid = 0;                 // I know what you did last summer
+  /**
+   * @private
+   */
+  this._min_polling = 0;
+
+  /**
+   * @private
+   */
+  this._pause = 0;
+  /**
+   * @private
+   */
+  this._wait = JSJACHBC_MAX_WAIT;
+}
+JSJaCHttpBindingConnection.prototype = new JSJaCConnection();
+
+/**
+ * Inherit an instantiated HTTP Binding session
+ */
+JSJaCHttpBindingConnection.prototype.inherit = function(oArg) {
+  if (oArg.jid) {
+    var oJid = new JSJaCJID(oArg.jid);
+    this.domain = oJid.getDomain();
+    this.username = oJid.getNode();
+    this.resource = oJid.getResource();
+  } else {
+    this.domain = oArg.domain || 'localhost';
+    this.username = oArg.username;
+    this.resource = oArg.resource;
+  }
+  this._sid = oArg.sid;
+  this._rid = oArg.rid;
+  this._min_polling = oArg.polling;
+  this._inactivity = oArg.inactivity;
+  this._setHold(oArg.requests-1);
+  this.setPollInterval(this._timerval);
+  if (oArg.wait)
+    this._wait = oArg.wait; // for whatever reason
+
+  this._connected = true;
+
+  this._handleEvent('onconnect');
+
+  this._interval= setInterval(JSJaC.bind(this._checkQueue, this),
+                              JSJAC_CHECKQUEUEINTERVAL);
+  this._inQto = setInterval(JSJaC.bind(this._checkInQ, this),
+                            JSJAC_CHECKINQUEUEINTERVAL);
+  this._timeout = setTimeout(JSJaC.bind(this._process, this),
+                             this.getPollInterval());
+};
+
+/**
+ * Sets poll interval
+ * @param {int} timerval the interval in seconds
+ */
+JSJaCHttpBindingConnection.prototype.setPollInterval = function(timerval) {
+  if (timerval && !isNaN(timerval)) {
+    if (!this.isPolling())
+      this._timerval = 100;
+    else if (this._min_polling && timerval < this._min_polling*1000)
+      this._timerval = this._min_polling*1000;
+    else if (this._inactivity && timerval > this._inactivity*1000)
+      this._timerval = this._inactivity*1000;
+    else
+      this._timerval = timerval;
+  }
+  return this._timerval;
+};
+
+/**
+ * whether this session is in polling mode
+ * @type boolean
+ */
+JSJaCHttpBindingConnection.prototype.isPolling = function() { return (this._hold == 0) };
+
+/**
+ * @private
+ */
+JSJaCHttpBindingConnection.prototype._getFreeSlot = function() {
+  for (var i=0; i<this._hold+1; i++)
+    if (typeof(this._req[i]) == 'undefined' || typeof(this._req[i].r) == 'undefined' || this._req[i].r.readyState == 4)
+      return i;
+  return -1; // nothing found
+};
+
+/**
+ * @private
+ */
+JSJaCHttpBindingConnection.prototype._getHold = function() { return this._hold; };
+
+/**
+ * @private
+ */
+JSJaCHttpBindingConnection.prototype._getRequestString = function(raw, last) {
+  raw = raw || '';
+  var reqstr = '';
+
+  // check if we're repeating a request
+
+  if (this._rid <= this._last_rid && typeof(this._last_requests[this._rid]) != 'undefined') // repeat!
+    reqstr = this._last_requests[this._rid].xml;
+  else { // grab from queue
+    var xml = '';
+    while (this._pQueue.length) {
+      var curNode = this._pQueue[0];
+      xml += curNode;
+      this._pQueue = this._pQueue.slice(1,this._pQueue.length);
+    }
+
+    reqstr = "<body xml:lang='"+XML_LANG+"' rid='"+this._rid+"' sid='"+this._sid+"' xmlns='http://jabber.org/protocol/httpbind' ";
+    if (JSJAC_HAVEKEYS) {
+      reqstr += "key='"+this._keys.getKey()+"' ";
+      if (this._keys.lastKey()) {
+        this._keys = new JSJaCKeys(hex_sha1,this.oDbg);
+        reqstr += "newkey='"+this._keys.getKey()+"' ";
+      }
+    }
+    if (last)
+      reqstr += "type='terminate'";
+    else if (this._reinit) {
+      if (JSJACHBC_USE_BOSH_VER)
+        reqstr += "xmpp:restart='true' xmlns:xmpp='urn:xmpp:xbosh' to='"+this.domain+"'";
+      this._reinit = false;
+    }
+
+    if (xml != '' || raw != '') {
+      reqstr += ">" + raw + xml + "</body>";
+    } else {
+      reqstr += "/>";
+    }
+
+    this._last_requests[this._rid] = new Object();
+    this._last_requests[this._rid].xml = reqstr;
+    this._last_rid = this._rid;
+
+    for (var i in this._last_requests)
+      if (this._last_requests.hasOwnProperty(i) &&
+          i < this._rid-this._hold)
+        delete(this._last_requests[i]); // truncate
+  }
+
+  return reqstr;
+};
+
+/**
+ * @private
+ */
+JSJaCHttpBindingConnection.prototype._getInitialRequestString = function() {
+  var reqstr = "<body xml:lang='"+XML_LANG+"' content='text/xml; charset=utf-8' hold='"+this._hold+"' xmlns='http://jabber.org/protocol/httpbind' to='"+this.authhost+"' wait='"+this._wait+"' rid='"+this._rid+"'";
+  if (this.secure)
+    reqstr += " secure='"+this.secure+"'";
+  if (JSJAC_HAVEKEYS) {
+    this._keys = new JSJaCKeys(hex_sha1,this.oDbg); // generate first set of keys
+    key = this._keys.getKey();
+    reqstr += " newkey='"+key+"'";
+  }
+
+  if (JSJACHBC_USE_BOSH_VER) {
+    reqstr += " ver='" + JSJACHBC_BOSH_VERSION + "'";
+    reqstr += " xmlns:xmpp='urn:xmpp:xbosh'";
+    if (this.authtype == 'sasl' || this.authtype == 'saslanon')
+      reqstr += " xmpp:version='1.0'";
+  }
+  reqstr += "/>";
+  return reqstr;
+};
+
+/**
+ * @private
+ */
+JSJaCHttpBindingConnection.prototype._getStreamID = function(req) {
+
+  this.oDbg.log(req.responseText,4);
+
+  if (!req.responseXML || !req.responseXML.documentElement) {
+    this._handleEvent('onerror',JSJaCError('503','cancel','service-unavailable'));
+    return;
+  }
+  var body = req.responseXML.documentElement;
+  
+  // any session error?
+  if(body.getAttribute('type') == 'terminate') {
+    this._handleEvent('onerror',JSJaCError('503','cancel','service-unavailable'));
+    return;
+  }
+  
+  // extract stream id used for non-SASL authentication
+  if (body.getAttribute('authid')) {
+    this.streamid = body.getAttribute('authid');
+    this.oDbg.log("got streamid: "+this.streamid,2);
+  }
+
+  if (!this._parseStreamFeatures(body)) {
+      this._sendEmpty(JSJaC.bind(this._getStreamID, this));
+      return;
+  }
+
+  this._timeout = setTimeout(JSJaC.bind(this._process, this),
+                             this.getPollInterval());
+
+  if (this.register)
+    this._doInBandReg();
+  else
+    this._doAuth();
+};
+
+/**
+ * @private
+ */
+JSJaCHttpBindingConnection.prototype._getSuspendVars = function() {
+  return ('host,port,secure,_rid,_last_rid,_wait,_min_polling,_inactivity,_hold,_last_requests,_pause').split(',');
+};
+
+/**
+ * @private
+ */
+JSJaCHttpBindingConnection.prototype._handleInitialResponse = function(req) {
+  try {
+    // This will throw an error on Mozilla when the connection was refused
+    this.oDbg.log(req.getAllResponseHeaders(),4);
+    this.oDbg.log(req.responseText,4);
+  } catch(ex) {
+    this.oDbg.log("No response",4);
+  }
+
+  if (req.status != 200 || !req.responseXML) {
+    this.oDbg.log("initial response broken (status: "+req.status+")",1);
+    this._handleEvent('onerror',JSJaCError('503','cancel','service-unavailable'));
+    return;
+  }
+  var body = req.responseXML.documentElement;
+
+  if (!body || body.tagName != 'body' || body.namespaceURI != 'http://jabber.org/protocol/httpbind') {
+    this.oDbg.log("no body element or incorrect body in initial response",1);
+    this._handleEvent("onerror",JSJaCError("500","wait","internal-service-error"));
+    return;
+  }
+
+  // Check for errors from the server
+  if (body.getAttribute("type") == "terminate") {
+    this.oDbg.log("invalid response:\n" + req.responseText,1);
+    clearTimeout(this._timeout); // remove timer
+    this._connected = false;
+    this.oDbg.log("Disconnected.",1);
+    this._handleEvent('ondisconnect');
+    this._handleEvent('onerror',JSJaCError('503','cancel','service-unavailable'));
+    return;
+  }
+
+  // get session ID
+  this._sid = body.getAttribute('sid');
+  this.oDbg.log("got sid: "+this._sid,2);
+
+  // get attributes from response body
+  if (body.getAttribute('polling'))
+    this._min_polling = body.getAttribute('polling');
+
+  if (body.getAttribute('inactivity'))
+    this._inactivity = body.getAttribute('inactivity');
+
+  if (body.getAttribute('requests'))
+    this._setHold(body.getAttribute('requests')-1);
+  this.oDbg.log("set hold to " + this._getHold(),2);
+
+  if (body.getAttribute('ver'))
+    this._bosh_version = body.getAttribute('ver');
+
+  if (body.getAttribute('maxpause'))
+    this._pause = Number.min(body.getAttribute('maxpause'), JSJACHBC_MAXPAUSE);
+
+  // must be done after response attributes have been collected
+  this.setPollInterval(this._timerval);
+
+  /* start sending from queue for not polling connections */
+  this._connected = true;
+
+  this._inQto = setInterval(JSJaC.bind(this._checkInQ, this),
+                            JSJAC_CHECKINQUEUEINTERVAL);
+  this._interval= setInterval(JSJaC.bind(this._checkQueue, this),
+                              JSJAC_CHECKQUEUEINTERVAL);
+
+  /* wait for initial stream response to extract streamid needed
+   * for digest auth
+   */
+  this._getStreamID(req);
+};
+
+/**
+ * @private
+ */
+JSJaCHttpBindingConnection.prototype._parseResponse = function(req) {
+  if (!this.connected() || !req)
+    return null;
+
+  var r = req.r; // the XmlHttpRequest
+
+  try {
+    if (r.status == 404 || r.status == 403) {
+      // connection manager killed session
+      this._abort();
+      return null;
+    }
+
+    if (r.status != 200 || !r.responseXML) {
+      this._errcnt++;
+      var errmsg = "invalid response ("+r.status+"):\n" + r.getAllResponseHeaders()+"\n"+r.responseText;
+      if (!r.responseXML)
+        errmsg += "\nResponse failed to parse!";
+      this.oDbg.log(errmsg,1);
+      if (this._errcnt > JSJAC_ERR_COUNT) {
+        // abort
+        this._abort();
+        return null;
+      }
+
+      if (this.connected()) {
+        this.oDbg.log("repeating ("+this._errcnt+")",1);
+        this._setStatus('proto_error_fallback');
+
+        // schedule next tick
+        setTimeout(JSJaC.bind(this._resume, this),
+                   this.getPollInterval());
+      }
+
+      return null;
+    }
+  } catch (e) {
+    this.oDbg.log("XMLHttpRequest error: status not available", 1);
+	  this._errcnt++;
+	  if (this._errcnt > JSJAC_ERR_COUNT) {
+	    // abort
+	    this._abort();
+	  } else {
+      if (this.connected()) {
+	      this.oDbg.log("repeating ("+this._errcnt+")",1);
+
+	      this._setStatus('proto_error_fallback');
+
+	      // schedule next tick
+	      setTimeout(JSJaC.bind(this._resume, this),
+                   this.getPollInterval());
+      }
+    }
+    return null;
+  }
+
+  var body = r.responseXML.documentElement;
+  if (!body || body.tagName != 'body' ||
+	  body.namespaceURI != 'http://jabber.org/protocol/httpbind') {
+    this.oDbg.log("invalid response:\n" + r.responseText,1);
+
+    clearTimeout(this._timeout); // remove timer
+    clearInterval(this._interval);
+    clearInterval(this._inQto);
+
+    this._connected = false;
+    this.oDbg.log("Disconnected.",1);
+    this._handleEvent('ondisconnect');
+
+    this._setStatus('internal_server_error');
+    this._handleEvent('onerror',
+		      JSJaCError('500','wait','internal-server-error'));
+
+    return null;
+  }
+
+  if (typeof(req.rid) != 'undefined' && this._last_requests[req.rid]) {
+    if (this._last_requests[req.rid].handled) {
+      this.oDbg.log("already handled "+req.rid,2);
+      return null;
+    } else
+      this._last_requests[req.rid].handled = true;
+  }
+
+
+  // Check for errors from the server
+  if (body.getAttribute("type") == "terminate") {
+    // read condition
+    var condition = body.getAttribute('condition');
+
+    if (condition != "item-not-found") {
+      this.oDbg.log("session terminated:\n" + r.responseText,1);
+
+      clearTimeout(this._timeout); // remove timer
+      clearInterval(this._interval);
+      clearInterval(this._inQto);
+
+      try {
+        removeDB('jsjac', 'state');
+      } catch (e) {}
+
+      this._connected = false;
+
+      if (condition == "remote-stream-error")
+        if (body.getElementsByTagName("conflict").length > 0)
+          this._setStatus("session-terminate-conflict");
+      if (condition == null)
+        condition = 'session-terminate';
+      this._handleEvent('onerror',JSJaCError('503','cancel',condition));
+
+      this.oDbg.log("Aborting remaining connections",4);
+
+      for (var i=0; i<this._hold+1; i++) {
+        try {
+          this._req[i].r.abort();
+        } catch(e) { this.oDbg.log(e, 1); }
+      }
+
+      this.oDbg.log("parseResponse done with terminating", 3);
+
+      this.oDbg.log("Disconnected.",1);
+      this._handleEvent('ondisconnect');
+    } else {
+      this._errcnt++;
+      if (this._errcnt > JSJAC_ERR_COUNT)
+        this._abort();
+    }
+    return null;
+  }
+
+  // no error
+  this._errcnt = 0;
+  return r.responseXML.documentElement;
+};
+
+/**
+ * @private
+ */
+JSJaCHttpBindingConnection.prototype._reInitStream = function(cb) {
+    // tell http binding to reinit stream with/before next request
+    this._reinit = true;
+
+    this._sendEmpty(this._prepReInitStreamWait(cb));
+};
+
+
+JSJaCHttpBindingConnection.prototype._prepReInitStreamWait = function(cb) {
+    return JSJaC.bind(function(req) {
+        this._reInitStreamWait(req, cb);
+    }, this);
+};
+
+/**
+ * @private
+ */
+JSJaCHttpBindingConnection.prototype._reInitStreamWait = function(req, cb) {
+    this.oDbg.log("checking for stream features");
+    var doc = req.responseXML.documentElement;
+    this.oDbg.log(doc);
+    if (doc.getElementsByTagNameNS) {
+        this.oDbg.log("checking with namespace");
+        var features = doc.getElementsByTagNameNS('http://etherx.jabber.org/streams',
+                                                'features').item(0);
+        if (features) {
+            var bind = features.getElementsByTagNameNS('urn:ietf:params:xml:ns:xmpp-bind',
+                                                       'bind').item(0);
+        }
+    } else {
+        var featuresNL = doc.getElementsByTagName('stream:features');
+        for (var i=0, l=featuresNL.length; i<l; i++) {
+            if (featuresNL.item(i).namespaceURI == 'http://etherx.jabber.org/streams' ||
+                featuresNL.item(i).getAttribute('xmlns') == 
+                'http://etherx.jabber.org/streams') {
+                var features = featuresNL.item(i);
+                break;
+            }
+        }
+        if (features) {
+            var bind = features.getElementsByTagName('bind');
+            for (var i=0, l=bind.length; i<l; i++) {
+                if (bind.item(i).namespaceURI == 'urn:ietf:params:xml:ns:xmpp-bind' ||
+                    bind.item(i).getAttribute('xmlns') == 
+                    'urn:ietf:params:xml:ns:xmpp-bind') {
+                    bind = bind.item(i);
+                    break;
+                }
+            }
+        }
+    }
+    this.oDbg.log(features);
+    this.oDbg.log(bind);
+    
+    if (features) {
+        if (bind) {
+            cb();
+        } else {
+            this.oDbg.log("no bind feature - giving up",1);
+            this._handleEvent('onerror',JSJaCError('503','cancel',"service-unavailable"));
+            this._connected = false;
+            this.oDbg.log("Disconnected.",1);
+            this._handleEvent('ondisconnect');
+        }
+    } else {
+        // wait
+        this._sendEmpty(this._prepReInitStreamWait(cb));
+    }
+};
+
+/**
+ * @private
+ */
+JSJaCHttpBindingConnection.prototype._resume = function() {
+  /* make sure to repeat last request as we can be sure that
+   * it had failed (only if we're not using the 'pause' attribute
+   */
+  if (this._pause == 0 && this._rid >= this._last_rid)
+    this._rid = this._last_rid-1;
+
+  this._process();
+};
+
+/**
+ * @private
+ */
+JSJaCHttpBindingConnection.prototype._setHold = function(hold)  {
+  if (!hold || isNaN(hold) || hold < 0)
+    hold = 0;
+  else if (hold > JSJACHBC_MAX_HOLD)
+    hold = JSJACHBC_MAX_HOLD;
+  this._hold = hold;
+  return this._hold;
+};
+
+/**
+ * @private
+ */
+JSJaCHttpBindingConnection.prototype._setupRequest = function(async) {
+  var req = new Object();
+  var r = XmlHttp.create();
+  try {
+    r.open("POST",this._httpbase,async);
+    r.setRequestHeader('Content-Type','text/xml; charset=utf-8');
+  } catch(e) { this.oDbg.log(e,1); }
+  req.r = r;
+  this._rid++;
+  req.rid = this._rid;
+  return req;
+};
+
+/**
+ * @private
+ */
+JSJaCHttpBindingConnection.prototype._suspend = function() {
+  if (this._pause == 0)
+    return; // got nothing to do
+
+  var slot = this._getFreeSlot();
+  // Intentionally synchronous
+  this._req[slot] = this._setupRequest(false);
+
+  var reqstr = "<body xml:lang='"+XML_LANG+"' pause='"+this._pause+"' xmlns='http://jabber.org/protocol/httpbind' sid='"+this._sid+"' rid='"+this._rid+"'";
+  if (JSJAC_HAVEKEYS) {
+    reqstr += " key='"+this._keys.getKey()+"'";
+    if (this._keys.lastKey()) {
+      this._keys = new JSJaCKeys(hex_sha1,this.oDbg);
+      reqstr += " newkey='"+this._keys.getKey()+"'";
+    }
+
+  }
+  reqstr += ">";
+
+  while (this._pQueue.length) {
+    var curNode = this._pQueue[0];
+    reqstr += curNode;
+    this._pQueue = this._pQueue.slice(1,this._pQueue.length);
+  }
+
+  //reqstr += "<presence type='unavailable' xmlns='jabber:client'/>";
+  reqstr += "</body>";
+
+  this.oDbg.log("Disconnecting: " + reqstr,4);
+  this._req[slot].r.send(reqstr);
+};
diff --git a/jappixmini/jappix/js/jxhr.js b/jappixmini/jappix/js/jxhr.js
new file mode 100644
index 00000000..deaf5117
--- /dev/null
+++ b/jappixmini/jappix/js/jxhr.js
@@ -0,0 +1,116 @@
+// jXHR.js (JSON-P XHR)
+// v0.1 (c) Kyle Simpson
+// MIT License
+// modified by gueron Jonathan to work with strophe lib
+// for http://www.iadvize.com
+
+(function(global){
+	var SETTIMEOUT = global.setTimeout, // for better compression
+		doc = global.document,
+		callback_counter = 0;
+		
+	global.jXHR = function() {
+		var script_url,
+			script_loaded,
+			jsonp_callback,
+			scriptElem,
+			publicAPI = null;
+			
+		function removeScript() { try { scriptElem.parentNode.removeChild(scriptElem); } catch (err) { } }
+			
+		function reset() {
+			script_loaded = false;
+			script_url = "";
+			removeScript();
+			scriptElem = null;
+			fireReadyStateChange(0);
+		}
+		
+		function ThrowError(msg) {
+			try { 
+				publicAPI.onerror.call(publicAPI,msg,script_url); 
+			} catch (err) { 
+				//throw new Error(msg); 
+			}
+		}
+
+		function handleScriptLoad() {
+			if ((this.readyState && this.readyState!=="complete" && this.readyState!=="loaded") || script_loaded) { return; }
+			this.onload = this.onreadystatechange = null; // prevent memory leak
+			script_loaded = true;
+			if (publicAPI.readyState !== 4) ThrowError("handleScriptLoad: Script failed to load ["+script_url+"].");
+			removeScript();
+		}
+		
+		function parseXMLString(xmlStr) {
+			var xmlDoc = null;
+			if(window.DOMParser) {
+				var parser = new DOMParser();
+				xmlDoc = parser.parseFromString(xmlStr,"text/xml");
+			}
+			else {
+				xmlDoc = new ActiveXObject("Microsoft.XMLDOM"); 
+				xmlDoc.async="false";
+				xmlDoc.loadXML(xmlStr);
+			}
+			return xmlDoc;
+		}
+		
+		function fireReadyStateChange(rs,args) {
+		
+			args = args || [];
+			publicAPI.readyState = rs;
+			if (rs == 4) {
+				publicAPI.responseText = args[0].reply;
+				publicAPI.responseXML = parseXMLString(args[0].reply);
+			}
+			if (typeof publicAPI.onreadystatechange === "function") publicAPI.onreadystatechange.apply(publicAPI,args);
+		}
+				
+		publicAPI = {
+			onerror:null,
+			onreadystatechange:null,
+			readyState:0,
+			status:200,
+			responseBody: null,
+			responseText: null,
+			responseXML: null,
+			open:function(method,url){
+				reset();
+				var internal_callback = "cb"+(callback_counter++);
+				(function(icb){
+					global.jXHR[icb] = function() {
+						try { fireReadyStateChange.call(publicAPI,4,arguments); } 
+						catch(err) { 
+							publicAPI.readyState = -1;
+							ThrowError("Script failed to run ["+script_url+"]."); 
+						}
+						global.jXHR[icb] = null;
+					};
+				})(internal_callback);
+				script_url = url + '?callback=?jXHR&data=';
+				script_url = script_url.replace(/=\?jXHR/,"=jXHR."+internal_callback);
+				fireReadyStateChange(1);
+			},
+			send:function(data){
+				script_url = script_url + encodeURIComponent(data);
+				SETTIMEOUT(function(){
+					scriptElem = doc.createElement("script");
+					scriptElem.setAttribute("type","text/javascript");
+					scriptElem.onload = scriptElem.onreadystatechange = function(){handleScriptLoad.call(scriptElem);};
+					scriptElem.setAttribute("src",script_url);
+					doc.getElementsByTagName("head")[0].appendChild(scriptElem);
+				},0);
+				fireReadyStateChange(2);
+			},
+			abort:function(){},
+			setRequestHeader:function(){}, // noop
+			getResponseHeader:function(){return "";}, // basically noop
+			getAllResponseHeaders:function(){return [];} // ditto
+		};
+
+		reset();
+		
+		return publicAPI;
+	};
+})(window);
diff --git a/jappixmini/jappix/js/links.js b/jappixmini/jappix/js/links.js
new file mode 100644
index 00000000..d0e4339f
--- /dev/null
+++ b/jappixmini/jappix/js/links.js
@@ -0,0 +1,38 @@
+/*
+
+Jappix - An open social platform
+These are the links JS script for Jappix
+
+-------------------------------------------------
+
+License: AGPL
+Authors: Vanaryon, Maranda
+Last revision: 26/08/11
+
+*/
+
+// Apply links in a string
+function applyLinks(string, mode, style) {
+	// Special stuffs
+	var style, target;
+	
+	// Links style
+	if(!style)
+		style = '';
+	else
+		style = ' style="' + style + '"';
+	
+	// Open in new tabs
+	if(mode != 'xhtml-im')
+		target = ' target="_blank"';
+	else
+		target = '';
+	
+	// XMPP address
+	string = string.replace(/(\s|<br \/>|^)(([a-zA-Z0-9\._-]+)@([a-zA-Z0-9\.\/_-]+))(,|\s|$)/gi, '$1<a href="xmpp:$2" target="_blank"' + style + '>$2</a>$5');
+	
+	// Simple link
+	string = string.replace(/(\s|<br \/>|^|\()((https?|ftp|file|xmpp|irc|mailto|vnc|webcal|ssh|ldap|smb|magnet|spotify)(:)([^<>'"\s\)]+))/gim, '$1<a href="$2"' + target + style + '>$2</a>');
+	
+	return string;
+}
diff --git a/jappixmini/jappix/js/me.js b/jappixmini/jappix/js/me.js
new file mode 100644
index 00000000..bc303805
--- /dev/null
+++ b/jappixmini/jappix/js/me.js
@@ -0,0 +1,62 @@
+/*
+
+Jappix - An open social platform
+These are the Jappix Me tool functions for Jappix
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 16/01/12
+
+*/
+
+// Opens the Me tools
+function openMe() {	
+	// Popup HTML content
+	var html = 
+	'<div class="top">' + _e("Public profile") + '</div>' + 
+	
+	'<div class="content">' + 
+		'<a class="me-images logo" href="https://me.jappix.com/" target="_blank"></a>' + 
+		
+		'<div class="infos">' + 
+			'<p class="infos-title">' + _e("Your profile anywhere on the Web.") + '</p>' + 
+			'<p>' + printf(_e("%s is a Jappix.com service which makes your XMPP profile public. It is easier to share it. No XMPP account is required to view your social channel, your current position and your contact details."), '<a href="https://me.jappix.com/" target="_blank">Jappix Me</a>') + '</p>' + 
+			'<p>' + _e("Furthermore, every picture you post in your social channel is added to a beautiful picture timeline. You can now view the pictures you shared year by year.") + '</p>' + 
+			'<p>' + _e("You can also use your XMPP avatar as a single avatar for every website, blog and forum you use. When you change it on XMPP, the new avatar appears everywhere. What a genious improvement!") + '</p>' + 
+		'</div>' + 
+		
+		'<a class="go one-button" href="https://me.jappix.com/new" target="_blank">' + _e("Yay, let's create my public profile!") + '</a>' + 
+	'</div>' + 
+	
+	'<div class="bottom">' + 
+		'<a href="#" class="finish">' + _e("Close") + '</a>' + 
+	'</div>';
+	
+	// Create the popup
+	createPopup('me', html);
+	
+	// Associate the events
+	launchMe();
+	
+	logThis('Public profile tool opened.');
+}
+
+// Closes the Me tools
+function closeMe() {
+	// Destroy the popup
+	destroyPopup('me');
+	
+	return false;
+}
+
+// Addon launcher
+function launchMe() {
+	// Click events
+	$('#me .content a.go').click(function() {
+		closeMe();
+	});
+	
+	$('#me .bottom .finish').click(closeMe);
+}
\ No newline at end of file
diff --git a/jappixmini/jappix/js/message.js b/jappixmini/jappix/js/message.js
new file mode 100644
index 00000000..0b7eaeb3
--- /dev/null
+++ b/jappixmini/jappix/js/message.js
@@ -0,0 +1,900 @@
+/*
+
+Jappix - An open social platform
+These are the messages JS scripts for Jappix
+
+-------------------------------------------------
+
+License: AGPL
+Authors: Vanaryon, Maranda
+Last revision: 01/09/11
+
+*/
+
+// Handles the incoming message packets
+function handleMessage(message) {
+	// Error packet? Stop!
+	if(handleErrorReply(message))
+		return;
+	
+	// We get the message items
+	var from = fullXID(getStanzaFrom(message));
+	var id = message.getID();
+	var type = message.getType();
+	var body = trim(message.getBody());
+	var node = message.getNode();
+	var subject = trim(message.getSubject());
+	
+	// We generate some values
+	var xid = bareXID(from);
+	var resource = thisResource(from);
+	var hash = hex_md5(xid);
+	var xHTML = $(node).find('html body').size();
+	var GCUser = false;
+	
+	// This message comes from a groupchat user
+	if(isPrivate(xid) && ((type == 'chat') || !type) && resource) {
+		GCUser = true;
+		xid = from;
+		hash = hex_md5(xid);
+	}
+	
+	// Get message date
+	var time, stamp, d_stamp;
+	
+	// Read the delay
+	var delay = readMessageDelay(node);
+	
+	// Any delay?
+	if(delay) {
+		time = relativeDate(delay);
+		d_stamp = Date.jab2date(delay);
+	}
+	
+	// No delay: get actual time
+	else {
+		time = getCompleteTime();
+		d_stamp = new Date();
+	}
+	
+	// Get the date stamp
+	stamp = extractStamp(d_stamp);
+	
+	// Received message
+	if(hasReceived(message))
+		return messageReceived(hash, id);
+	
+	// Chatstate message
+	if(node && !delay && ((((type == 'chat') || !type) && !exists('#page-switch .' + hash + ' .unavailable')) || (type == 'groupchat'))) {
+		/* REF: http://xmpp.org/extensions/xep-0085.html */
+		
+		// Re-process the hash
+		var chatstate_hash = hash;
+		
+		if(type == 'groupchat')
+			chatstate_hash = hex_md5(from);
+		
+		// Do something depending of the received state
+		if($(node).find('active').size()) {
+			displayChatState('active', chatstate_hash, type);
+			
+			// Tell Jappix the entity supports chatstates
+			$('#' + chatstate_hash + ' .message-area').attr('data-chatstates', 'true');
+			
+			logThis('Active chatstate received from: ' + from);
+		}
+		
+		else if($(node).find('composing').size())
+			displayChatState('composing', chatstate_hash, type);
+		
+		else if($(node).find('paused').size())
+			displayChatState('paused', chatstate_hash, type);
+		
+		else if($(node).find('inactive').size())
+			displayChatState('inactive', chatstate_hash, type);
+		
+		else if($(node).find('gone').size())
+			displayChatState('gone', chatstate_hash, type);
+	}
+	
+	// Invite message
+	if($(node).find('x[xmlns=' + NS_MUC_USER + '] invite').size()) {
+		// We get the needed values
+		var iFrom = $(node).find('x[xmlns=' + NS_MUC_USER + '] invite').attr('from');
+		var iRoom = $(node).find('x[xmlns=' + NS_XCONFERENCE + ']').attr('jid');
+		
+		// Old invite method?
+		if(!iRoom)
+			iRoom = from;
+		
+		// We display the notification
+		newNotification('invite_room', iFrom, [iRoom], body);
+		
+		logThis('Invite Request from: ' + iFrom + ' to join: ' + iRoom);
+		
+		return false;
+	}
+	
+	// Request message
+	if(message.getChild('confirm', NS_HTTP_AUTH)) {
+		// Open a new notification
+		newNotification('request', xid, [message], body);
+		
+		logThis('HTTP Request from: ' + xid);
+		
+		return false;
+	}
+	
+	// OOB message
+	if(message.getChild('x', NS_XOOB)) {
+		handleOOB(from, id, 'x', node);
+		
+		logThis('Message OOB request from: ' + xid);
+		
+		return false;
+	}
+	
+	// Roster Item Exchange message
+	if(message.getChild('x', NS_ROSTERX)) {
+		// Open a new notification
+		newNotification('rosterx', xid, [message], body);
+		
+		logThis('Roster Item Exchange from: ' + xid);
+		
+		return false;
+	}
+	
+	// Normal message
+	if((type == 'normal') && body) {
+		// Message date
+		var messageDate = delay;
+		
+		// No message date?
+		if(!messageDate)
+			messageDate = getXMPPTime('utc');
+		
+		// Message ID
+		var messageID = hex_md5(xid + subject + messageDate);
+		
+		// We store the received message
+		storeInboxMessage(xid, subject, body, 'unread', messageID, messageDate);
+		
+		// Display the inbox message
+		if(exists('#inbox'))
+			displayInboxMessage(xid, subject, body, 'unread', messageID, messageDate);
+		
+		// Check we have new messages (play a sound if any unread messages)
+		if(checkInboxMessages())
+			soundPlay(2);
+		
+		// Send it to the server
+		storeInbox();
+		
+		return false;
+	}
+	
+	// PubSub event
+	if($(node).find('event').attr('xmlns') == NS_PUBSUB_EVENT) {
+		// We get the needed values
+		var iParse = $(node).find('event items');
+		var iNode = iParse.attr('node');
+		
+		// Turn around the different result cases
+		if(iNode) {
+			switch(iNode) {
+				// Mood
+				case NS_MOOD:
+					// Retrieve the values
+					var iMood = iParse.find('mood');
+					var fValue = '';
+					var tText = '';
+					
+					// There's something
+					if(iMood.children().size()) {
+						// Read the value
+						fValue = node.getElementsByTagName('mood').item(0).childNodes.item(0).nodeName;
+						
+						// Read the text
+						tText = iMood.find('text').text();
+						
+						// Avoid errors
+						if(!fValue)
+							fValue = '';
+					}
+					
+					// Store the PEP event (and display it)
+					storePEP(xid, 'mood', fValue, tText);
+					
+					break;
+				
+				// Activity
+				case NS_ACTIVITY:
+					// Retrieve the values
+					var iActivity = iParse.find('activity');
+					var sValue = '';
+					var tText = '';
+					
+					// There's something
+					if(iActivity.children().size()) {
+						// Read the value
+						fValue = node.getElementsByTagName('activity').item(0).childNodes.item(0).nodeName;
+						
+						// Read the text
+						tText = iActivity.find('text').text();
+						
+						// Avoid errors
+						if(!fValue)
+							fValue = '';
+					}
+					
+					// Store the PEP event (and display it)
+					storePEP(xid, 'activity', fValue, tText);
+					
+					break;
+				
+				// Tune
+				case NS_TUNE:
+					// Retrieve the values
+					var iTune = iParse.find('tune');
+					var tArtist = iTune.find('artist').text();
+					var tSource = iTune.find('source').text();
+					var tTitle = iTune.find('title').text();
+					var tURI = iTune.find('uri').text();
+					
+					// Store the PEP event (and display it)
+					storePEP(xid, 'tune', tArtist, tTitle, tSource, tURI);
+					
+					break;
+				
+				// Geolocation
+				case NS_GEOLOC:
+					// Retrieve the values
+					var iGeoloc = iParse.find('geoloc');
+					var tLat = iGeoloc.find('lat').text();
+					var tLon = iGeoloc.find('lon').text();
+					
+					// Any extra-values?
+					var tLocality = iGeoloc.find('locality').text();
+					var tRegion = iGeoloc.find('region').text();
+					var tCountry = iGeoloc.find('country').text();
+					var tHuman = humanPosition(tLocality, tRegion, tCountry);
+					
+					// Store the PEP event (and display it)
+					storePEP(xid, 'geoloc', tLat, tLon, tHuman);
+					
+					break;
+				
+				// Microblog
+				case NS_URN_MBLOG:
+					displayMicroblog(message, xid, hash, 'mixed', 'push');
+					
+					break;
+				
+				// Inbox
+				case NS_URN_INBOX:
+					// Do not handle friend's notifications
+					if(xid == getXID())
+						handleNotifications(message);
+					
+					break;
+			}
+		}
+		
+		return false;
+	}
+	
+	// If this is a room topic message
+	if(subject && (type == 'groupchat')) {
+		// Filter the vars
+		var filter_subject = subject.replace(/\n+/g, ' ');
+		var filteredSubject = filterThisMessage(filter_subject, resource, true);
+		var filteredName = resource.htmlEnc();
+		
+		// Display the new subject at the top
+		$('#' + hash + ' .top .name .bc-infos .muc-topic').replaceWith('<span class="muc-topic" title="' + filter_subject + '">' + filteredSubject + '</span>');
+		
+		// Display the new subject as a system message
+		if(resource) {
+			var topic_body = filteredName + ' ' + _e("changed the subject to:") + ' ' + filterThisMessage(subject, resource, true);
+			displayMessage(type, from, hash, filteredName, topic_body, time, stamp, 'system-message', false);
+		}
+	}
+	
+	// If the message has a content
+	if(xHTML || body) {
+		var filteredMessage;
+		var notXHTML = true;
+		
+		// IE bug fix
+		if((BrowserDetect.browser == 'Explorer') && (BrowserDetect.version < 9))
+			xHTML = 0;
+		
+		//If this is a xHTML message
+		if(xHTML) {
+			notXHTML = false;
+			
+			// Filter the xHTML message
+			body = filterThisXHTML(node);
+		}
+		
+		// Groupchat message
+		if(type == 'groupchat') {
+			/* REF: http://xmpp.org/extensions/xep-0045.html */
+			
+			// We generate the message type and time
+			var message_type = 'user-message';
+			
+			// This is an old message
+			if(delay && resource)
+				message_type = 'old-message';
+			
+			// This is a system message
+			else if(!resource)
+				message_type = 'system-message';
+			
+			var nickQuote = '';
+			
+			// If this is not an old message
+			if(message_type == 'user-message') {
+				var myNick = getMUCNick(hash);
+				
+				// If an user quoted our nick (with some checks)
+				var regex = new RegExp('((^)|( )|(@))' + escapeRegex(myNick) + '(($)|(:)|(,)|( ))', 'gi');
+				
+				if(body.match(regex) && (myNick != resource) && (message_type == 'user-message'))
+					nickQuote = ' my-nick';
+				
+				// We notify the user if there's a new personnal message
+				if(nickQuote) {
+					messageNotify(hash, 'personnal');
+					soundPlay(1);
+				}
+				
+				// We notify the user there's a new unread muc message
+				else
+					messageNotify(hash, 'unread');
+			}
+			
+			// Display the received message
+			displayMessage(type, from, hash, resource.htmlEnc(), body, time, stamp, message_type, notXHTML, nickQuote);
+		}
+		
+		// Chat message
+		else if((type == 'chat') || !type) {
+			// Gets the nickname of the user
+			var fromName = resource;
+			var chatType = 'chat';
+			
+			// Must send a receipt notification?
+			if(hasReceipt(message) && (id != null))
+				sendReceived(type, from, id);
+			
+			// It does not come from a groupchat user, get the full name
+			if(!GCUser)
+				fromName = getBuddyName(xid);
+			else
+				chatType = 'private';
+			
+			// If the chat isn't yet opened, open it !
+			if(!exists('#' + hash)) {
+				// We create a new chat
+				chatCreate(hash, xid, fromName, chatType);
+				
+				// We tell the user that a new chat has started
+				soundPlay(0);
+			}
+			
+			else
+				soundPlay(1);
+			
+			// Display the received message
+			displayMessage(type, xid, hash, fromName.htmlEnc(), body, time, stamp, 'user-message', notXHTML, '', 'him');
+			
+			// We notify the user
+			messageNotify(hash, 'personnal');
+		}
+		
+		return false;
+	}
+	
+	return false;
+}
+
+// Sends a given message
+function sendMessage(hash, type) {
+	// Get the values
+	var message_area = $('#' + hash + ' .message-area');
+	var body = trim(message_area.val());
+	var xid = unescape(message_area.attr('data-to'));
+	
+	// If the user didn't entered any message, stop
+	if(!body || !xid)
+		return false;
+	
+	try {
+		// We send the message through the XMPP network
+		var aMsg = new JSJaCMessage();
+		aMsg.setTo(xid);
+		
+		// Set an ID
+		var id = genID();
+		aMsg.setID(id);
+		
+		// /help shortcut
+		if(body.match(/^\/help\s*(.*)/)) {
+			// Help text
+			var help_text = '<p class="help" xmlns="http://www.w3.org/1999/xhtml">';
+			help_text += '<b>' + _e("Available shortcuts:") + '</b>';
+			
+			// Shortcuts array
+			var shortcuts = [];
+			
+			// Common shortcuts
+			shortcuts.push(printf(_e("%s removes the chat logs"), '<em>/clear</em>'));
+			shortcuts.push(printf(_e("%s joins a groupchat"), '<em>/join jid</em>'));
+			shortcuts.push(printf(_e("%s closes the chat"), '<em>/part</em>'));
+			shortcuts.push(printf(_e("%s shows the user profile"), '<em>/whois jid</em>'));
+			
+			// Groupchat shortcuts
+			if(type == 'groupchat') {
+				shortcuts.push(printf(_e("%s sends a message to the room"), '<em>/say message</em>'));
+				shortcuts.push(printf(_e("%s changes your nickname"), '<em>/nick nickname</em>'));
+				shortcuts.push(printf(_e("%s sends a message to someone in the room"), '<em>/msg nickname message</em>'));
+				shortcuts.push(printf(_e("%s changes the room topic"), '<em>/topic subject</em>'));
+				shortcuts.push(printf(_e("%s kicks an user of the room"), '<em>/kick nickname reason</em>'));
+				shortcuts.push(printf(_e("%s bans an user of the room"), '<em>/ban nickname reason</em>'));
+				shortcuts.push(printf(_e("%s invites someone to join the room"), '<em>/invite jid message</em>'));
+			}
+			
+			// Generate the code from the array
+			shortcuts = shortcuts.sort();
+			
+			for(s in shortcuts)
+				help_text += shortcuts[s] + '<br />';
+			
+			help_text += '</p>';
+			
+			// Display the message
+			displayMessage(type, xid, hash, 'help', help_text, getCompleteTime(), getTimeStamp(), 'system-message', false);
+			
+			// Reset chatstate
+			chatStateSend('active', xid, hash);
+		}
+		
+		// /clear shortcut
+		else if(body.match(/^\/clear/)) {
+			cleanChat(hex_md5(xid));
+			
+			// Reset chatstate
+			chatStateSend('active', xid, hash);
+		}
+		
+		// /join shortcut
+		else if(body.match(/^\/join (\S+)\s*(.*)/)) {
+			// Join
+			var room = generateXID(RegExp.$1, 'groupchat');
+			var pass = RegExp.$2;
+			
+			checkChatCreate(room, 'groupchat');
+			
+			// Reset chatstate
+			chatStateSend('active', xid, hash);
+		}
+		
+		// /part shortcut
+		else if(body.match(/^\/part\s*(.*)/) && (!isAnonymous() || (isAnonymous() && (xid != generateXID(ANONYMOUS_ROOM, 'groupchat')))))
+			quitThisChat(xid, hex_md5(xid), type);
+		
+		// /whois shortcut
+		else if(body.match(/^\/whois(( (\S+))|($))/)) {
+			var whois_xid = RegExp.$3;
+			
+			// Groupchat WHOIS
+			if(type == 'groupchat') {
+				var nXID = getMUCUserXID(xid, whois_xid);
+				
+				if(!nXID)
+					openThisInfo(6);
+				else
+					openUserInfos(nXID);
+			}
+			
+			// Chat or private WHOIS
+			else {
+				if(!whois_xid)
+					openUserInfos(xid);
+				else
+					openUserInfos(whois_xid);
+			}
+			
+			// Reset chatstate
+			chatStateSend('active', xid, hash);
+		}
+		
+		// Chat message type
+		else if(type == 'chat') {
+			aMsg.setType('chat');
+			
+			// Generates the correct message depending of the choosen style
+			var notXHTML = true;
+			var genMsg = generateMessage(aMsg, body, hash);
+			
+			if(genMsg == 'XHTML')
+				notXHTML = false;
+			
+			// Receipt request
+			var receipt_request = receiptRequest(hash);
+			
+			if(receipt_request)
+				aMsg.appendNode('request', {'xmlns': NS_URN_RECEIPTS});
+			
+			// Chatstate
+			aMsg.appendNode('active', {'xmlns': NS_CHATSTATES});
+			
+			// Send it!
+			con.send(aMsg, handleErrorReply);
+			
+			// Filter the xHTML message (for us!)
+			if(!notXHTML)
+				body = filterThisXHTML(aMsg.getNode());
+			
+			// Finally we display the message we just sent
+			var my_xid = getXID();
+			
+			displayMessage('chat', my_xid, hash, getBuddyName(my_xid).htmlEnc(), body, getCompleteTime(), getTimeStamp(), 'user-message', notXHTML, '', 'me', id);
+			
+			// Receipt timer
+			if(receipt_request)
+				checkReceived(hash, id);
+		}
+		
+		// Groupchat message type
+		else if(type == 'groupchat') {
+			// /say shortcut
+			if(body.match(/^\/say (.+)/)) {
+				body = body.replace(/^\/say (.+)/, '$1');
+				
+				aMsg.setType('groupchat');
+				generateMessage(aMsg, body, hash);
+				
+				con.send(aMsg, handleErrorReply);
+			}
+			
+			// /nick shortcut
+			else if(body.match(/^\/nick (.+)/)) {
+				var nick = body.replace(/^\/nick (.+)/, '$1');
+				
+				// Does not exist yet?
+				if(!getMUCUserXID(xid, nick)) {
+					// Send a new presence
+					sendPresence(xid + '/' + nick, '', getUserShow(), getUserStatus(), '', false, false, handleErrorReply);
+					
+					// Change the stored nickname
+					$('#' + hex_md5(xid)).attr('data-nick', escape(nick));
+					
+					// Reset chatstate
+					chatStateSend('active', xid, hash);
+				}
+			}
+			
+			// /msg shortcut
+			else if(body.match(/^\/msg (\S+)\s+(.+)/)) {
+				var nick = RegExp.$1;
+				var body = RegExp.$2;
+				var nXID = getMUCUserXID(xid, nick);
+				
+				// We check if the user exists
+				if(!nXID)
+					openThisInfo(6);
+				
+				// If the private message is not empty
+				else if(body) {
+					aMsg.setType('chat');
+					aMsg.setTo(nXID);
+					generateMessage(aMsg, body, hash);
+					
+					con.send(aMsg, handleErrorReply);
+				}
+			}
+			
+			// /topic shortcut
+			else if(body.match(/^\/topic (.+)/)) {
+				var topic = body.replace(/^\/topic (.+)/, '$1');
+				
+				aMsg.setType('groupchat');
+				aMsg.setSubject(topic);
+				
+				con.send(aMsg, handleMessageError);
+				
+				// Reset chatstate
+				chatStateSend('active', xid, hash);
+			}
+			
+			// /ban shortcut
+			else if(body.match(/^\/ban (\S+)\s*(.*)/)) {
+				var nick = RegExp.$1;
+				var reason = RegExp.$2;
+				var nXID = getMUCUserRealXID(xid, nick);
+				
+				// We check if the user exists
+				if(!nXID)
+					openThisInfo(6);
+				
+				else {
+					// We generate the ban IQ
+					var iq = new JSJaCIQ();
+					iq.setTo(xid);
+					iq.setType('set');
+					
+					var iqQuery = iq.setQuery(NS_MUC_ADMIN);
+					var item = iqQuery.appendChild(iq.buildNode('item', {'affiliation': 'outcast', 'jid': nXID, 'xmlns': NS_MUC_ADMIN}));
+					
+					if(reason)
+						item.appendChild(iq.buildNode('reason', {'xmlns': NS_MUC_ADMIN}, reason));
+					
+					con.send(iq, handleErrorReply);
+				}
+				
+				// Reset chatstate
+				chatStateSend('active', xid, hash);
+			}
+			
+			// /kick shortcut
+			else if(body.match(/^\/kick (\S+)\s*(.*)/)) {
+				var nick = RegExp.$1;
+				var reason = RegExp.$2;
+				var nXID = getMUCUserXID(xid, nick);
+				
+				// We check if the user exists
+				if(!nXID)
+					openThisInfo(6);
+				
+				else {
+					// We generate the kick IQ
+					var iq = new JSJaCIQ();
+					iq.setTo(xid);
+					iq.setType('set');
+					
+					var iqQuery = iq.setQuery(NS_MUC_ADMIN);
+					var item = iqQuery.appendChild(iq.buildNode('item', {'nick': nick, 'role': 'none', 'xmlns': NS_MUC_ADMIN}));
+					
+					if(reason)
+						item.appendChild(iq.buildNode('reason', {'xmlns': NS_MUC_ADMIN}, reason));
+					
+					con.send(iq, handleErrorReply);
+				}
+				
+				// Reset chatstate
+				chatStateSend('active', xid, hash);
+			}
+			
+			// /invite shortcut
+			else if(body.match(/^\/invite (\S+)\s*(.*)/)) {
+				var i_xid = RegExp.$1;
+				var reason = RegExp.$2;
+				
+				var x = aMsg.appendNode('x', {'xmlns': NS_MUC_USER});
+				var aNode = x.appendChild(aMsg.buildNode('invite', {'to': i_xid, 'xmlns': NS_MUC_USER}));
+				
+				if(reason)
+					aNode.appendChild(aMsg.buildNode('reason', {'xmlns': NS_MUC_USER}, reason));
+				
+				con.send(aMsg, handleErrorReply);
+				
+				// Reset chatstate
+				chatStateSend('active', xid, hash);
+			}
+			
+			// No shortcut, this is a message
+			else {
+				aMsg.setType('groupchat');
+				
+				// Chatstate
+				aMsg.appendNode('active', {'xmlns': NS_CHATSTATES});
+				
+				generateMessage(aMsg, body, hash);
+				
+				con.send(aMsg, handleMessageError);
+				
+				logThis('Message sent to: ' + xid + ' / ' + type, 3);
+			}
+		}
+		
+		// We reset the message input
+		$('#' + hash + ' .message-area').val('');
+	}
+	
+	finally {
+		return false;
+	}
+}
+
+// Generates the correct message area style
+function generateStyle(hash) {
+	// Initialize the vars
+	var styles = '#' + hash + ' div.bubble-style';
+	var checkbox = styles + ' input[type=checkbox]';
+	var color = styles + ' a.color.selected';
+	var style = '';
+	
+	// Loop the input values
+	$(checkbox).filter(':checked').each(function() {
+		// If there is a previous element
+		if(style)
+			style += ' ';
+		
+		// Get the current style
+		switch($(this).attr('class')) {
+			case 'bold':
+				style += 'font-weight: bold;';
+				break;
+			
+			case 'italic':
+				style += 'font-style: italic;';
+				break;
+			
+			case 'underline':
+				style += 'text-decoration: underline;';
+				break;
+		}
+	});
+	
+	// Get the color value
+	$(color).each(function() {
+		style += 'color: #' + $(this).attr('data-color');
+	});
+	
+	return style;
+}
+
+// Generates the correct message code
+function generateMessage(aMsg, body, hash) {
+	// Create the classical body
+	aMsg.setBody(body);
+	
+	// Get the style
+	var style = $('#' + hash + ' .message-area').attr('style');
+	
+	// A message style is choosen
+	if(style) {
+		// Explode the message body new lines (to create one <p /> element by line)
+		var new_lines = new Array(body);
+		
+		if(body.match(/\n/))
+			new_lines = body.split('\n');
+		
+		// Create the XML elements
+		var aHtml = aMsg.appendNode('html', {'xmlns': NS_XHTML_IM});
+		var aBody = aHtml.appendChild(aMsg.buildNode('body', {'xmlns': NS_XHTML}));
+		
+		// Use the exploded body array to create one element per entry
+		for(i in new_lines) {
+			// Current line
+			var cLine = new_lines[i];
+			
+			// Blank line, we put a <br />
+			if(cLine.match(/(^)(\s+)($)/) || !cLine)
+				aBody.appendChild(aMsg.buildNode('br', {'xmlns': NS_XHTML}));
+			
+			// Line with content, we put a <p />
+			else {
+				// HTML encode the line
+				cLine = cLine.htmlEnc();
+				
+				// Filter the links
+				cLine = applyLinks(cLine, 'xhtml-im', style);
+				
+				// Append the filtered line
+				$(aBody).append($('<p style="' + style + '">' + cLine + '</p>'));
+			}
+		}
+		
+		return 'XHTML';
+	}
+	
+	return 'PLAIN';
+}
+
+// Displays a given message in a chat tab
+function displayMessage(type, xid, hash, name, body, time, stamp, message_type, is_xhtml, nick_quote, mode, id) {
+	// Generate some stuffs
+	var has_avatar = false;
+	var xid_hash = '';
+	
+	if(!nick_quote)
+		nick_quote = '';
+	
+	if(message_type != 'system-message') {
+		has_avatar = true;
+		xid_hash = hex_md5(xid);
+	}
+	
+	// Can scroll?
+	var cont_scroll = document.getElementById('chat-content-' + hash);
+	var can_scroll = false;
+	
+	if(!cont_scroll.scrollTop || ((cont_scroll.clientHeight + cont_scroll.scrollTop) == cont_scroll.scrollHeight))
+		can_scroll = true;
+	
+	// Any ID?
+	var data_id = '';
+	
+	if(id)
+		data_id = ' data-id="' + id + '"';
+	
+	// Filter the message
+	var filteredMessage = filterThisMessage(body, name, is_xhtml);
+	
+	// Display the received message in the room
+	var messageCode = '<div class="one-line ' + message_type + nick_quote + '"' + data_id + '>';
+	
+	// Name color attribute
+	if(type == 'groupchat')
+		attribute = ' style="color: ' + generateColor(name) + ';" class="name';
+	else {
+		attribute = ' class="name';
+		
+		if(mode)
+			attribute += ' ' + mode;
+	}
+	
+	// Close the class attribute
+	if(message_type == 'system-message')
+		attribute += ' hidden"';
+	else
+		attribute += '"';
+	
+	// Filter the previous displayed message
+	var last = $('#' + hash + ' .one-group:last');
+	var last_name = last.find('b.name').attr('data-xid');
+	var last_type = last.attr('data-type');
+	var last_stamp = parseInt(last.attr('data-stamp'));
+	var grouped = false;
+	
+	// We can group it with another previous message
+	if((last_name == xid) && (message_type == last_type) && ((stamp - last_stamp) <= 1800))
+		grouped = true;
+	
+	// Is it a /me command?
+	if(body.match(/(^|>)(\/me )([^<]+)/))
+		filteredMessage = '<i>' + filteredMessage + '</i>';
+	
+	messageCode += filteredMessage + '</div>';
+	
+	// Must group it?
+	var group_path = ' .one-group:last';
+	
+	if(!grouped) {
+		// Generate message headers
+		var message_head = '';
+		
+		// Any avatar to add?
+		if(has_avatar)
+			message_head += '<div class="avatar-container"><img class="avatar" src="' + './img/others/default-avatar.png' + '" alt="" /></div>';
+		
+		// Add the date & the name
+		message_head += '<span class="date">' + time + '</span><b data-xid="' + encodeQuotes(xid) + '" ' + attribute + '>' + name + '</b>';
+		
+		// Generate message code
+		group_path = '';
+		messageCode = '<div class="one-group ' + xid_hash + '" data-type="' + message_type + '" data-stamp="' + stamp + '">' + message_head + messageCode + '</div>';
+	}
+	
+	// Archive message
+	if(hash == 'archives')
+		$('#archives .logs' + group_path).append(messageCode);
+	
+	// Instant message
+	else {
+		// Write the code in the DOM
+		$('#' + hash + ' .content' + group_path).append(messageCode);
+		
+		// Must get the avatar?
+		if(has_avatar && xid)
+			getAvatar(xid, 'cache', 'true', 'forget');
+	}
+	
+	// Scroll to this message
+	if(can_scroll)
+		autoScroll(hash);
+}
diff --git a/jappixmini/jappix/js/microblog.js b/jappixmini/jappix/js/microblog.js
new file mode 100644
index 00000000..5d489081
--- /dev/null
+++ b/jappixmini/jappix/js/microblog.js
@@ -0,0 +1,1447 @@
+/*
+
+Jappix - An open social platform
+These are the microblog JS scripts for Jappix
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 03/12/11
+
+*/
+
+// Completes arrays of an entry's attached files
+function attachedMicroblog(selector, tFName, tFURL, tFThumb, tFSource, tFType, tFLength, tFEComments, tFNComments) {
+	if($(selector).attr('title'))
+		tFName.push($(selector).attr('title'));
+	else
+		tFName.push('');
+	
+	if($(selector).attr('href'))
+		tFURL.push($(selector).attr('href'));
+	else
+		tFURL.push('');
+	
+	if($(selector).find('link[rel=self][title=thumb]:first').attr('href'))
+		tFThumb.push($(selector).find('link[rel=self][title=thumb]:first').attr('href'));
+	else
+		tFThumb.push('');
+	
+	if($(selector).attr('source'))
+		tFSource.push($(selector).attr('source'));
+	else
+		tFSource.push('');
+	
+	if($(selector).attr('type'))
+		tFType.push($(selector).attr('type'));
+	else
+		tFType.push('');
+	
+	if($(selector).attr('length'))
+		tFLength.push($(selector).attr('length'));
+	else
+		tFLength.push('');
+	
+	// Comments?
+	var comments_href_c = $(selector).find('link[rel=replies][title=comments_file]:first').attr('href');
+	
+	if(comments_href_c && comments_href_c.match(/^xmpp:(.+)\?;node=(.+)/)) {
+		tFEComments.push(RegExp.$1);
+		tFNComments.push(decodeURIComponent(RegExp.$2));
+	}
+	
+	else {
+		tFEComments.push('');
+		tFNComments.push('');
+	}
+}
+
+// Displays a given microblog item
+function displayMicroblog(packet, from, hash, mode, way) {
+	// Get some values
+	var iParse = $(packet.getNode()).find('items item');
+	
+	iParse.each(function() {
+		// Initialize
+		var tTitle, tFiltered, tTime, tDate, tStamp, tBody, tName, tID, tHash, tIndividual, tFEClick;
+		
+		// Arrays
+		var tFName = [];
+		var tFURL = [];
+		var tFThumb = [];
+		var tFSource = [];
+		var tFType = [];
+		var tFLength = [];
+		var tFEComments = [];
+		var tFNComments = [];
+		var aFURL = [];
+		var aFCat = [];
+		
+		// Get the values
+		tDate = $(this).find('published').text();
+		tBody = $(this).find('body').text();
+		tID = $(this).attr('id');
+		tName = getBuddyName(from);
+		tHash = 'update-' + hex_md5(tName + tDate + tID);
+		
+		// Read attached files with a thumb (place them at first)
+		$(this).find('link[rel=enclosure]:has(link[rel=self][title=thumb])').each(function() {
+			attachedMicroblog(this, tFName, tFURL, tFThumb, tFSource, tFType, tFLength, tFEComments, tFNComments);
+		});
+		
+		// Read attached files without any thumb
+		$(this).find('link[rel=enclosure]:not(:has(link[rel=self][title=thumb]))').each(function() {
+			attachedMicroblog(this, tFName, tFURL, tFThumb, tFSource, tFType, tFLength, tFEComments, tFNComments);
+		});
+		
+		// Get the repeat value
+		var uRepeat = [$(this).find('source author name').text(), explodeThis(':', $(this).find('source author uri').text(), 1)];
+		var uRepeated = false;
+		
+		if(!uRepeat[0])
+			uRepeat = [getBuddyName(from), uRepeat[1]];
+		if(!uRepeat[1])
+			uRepeat = [uRepeat[0], from];
+		
+		// Repeated?
+		if(uRepeat[1] != from)
+			uRepeated = true;
+		
+		// Get the comments node
+		var entityComments, nodeComments;
+		
+		// Get the comments
+		var comments_href = $(this).find('link[title=comments]:first').attr('href');
+		
+		if(comments_href && comments_href.match(/^xmpp:(.+)\?;node=(.+)/)) {
+			entityComments = RegExp.$1;
+			nodeComments = decodeURIComponent(RegExp.$2);
+		}
+		
+		// No comments node?
+		if(!entityComments || !nodeComments) {
+			entityComments = '';
+			nodeComments = '';
+		}
+		
+		// Get the stamp & time
+		if(tDate) {
+			tStamp = extractStamp(Date.jab2date(tDate));
+			tTime = relativeDate(tDate);
+		}
+		
+		else {
+			tStamp = getTimeStamp();
+			tTime = '';
+		}
+		
+		// Get the item geoloc
+		var tGeoloc = '';
+		var sGeoloc = $(this).find('geoloc[xmlns=' + NS_GEOLOC + ']:first');
+		var gLat = sGeoloc.find('lat').text();
+		var gLon = sGeoloc.find('lon').text();
+		
+		if(gLat && gLon) {
+			tGeoloc += '<a class="geoloc talk-images" href="http://maps.google.com/?q=' + encodeQuotes(gLat) + ',' + encodeQuotes(gLon) + '" target="_blank">';
+			
+			// Human-readable name?
+			var gHuman = humanPosition(
+		                           sGeoloc.find('locality').text(),
+		                           sGeoloc.find('region').text(),
+		                           sGeoloc.find('country').text()
+		                          );
+			
+			if(gHuman)
+				tGeoloc += gHuman.htmlEnc();
+			else
+				tGeoloc += gLat.htmlEnc() + '; ' + gLon.htmlEnc();
+			
+			tGeoloc += '</a>';
+		}
+		
+		// Retrieve the message body
+		tTitle = $(this).find('content[type=text]').text();
+		
+		if(!tTitle) {
+			// Legacy?
+			tTitle = $(this).find('title:not(source > title)').text();
+			
+			// Last chance?
+			if(!tTitle)
+				tTitle = tBody;
+		}
+		
+		// Trim the content
+		tTitle = trim(tTitle);
+		
+		// Any content?
+		if(tTitle) {
+			// Apply links to message body
+			tFiltered = filterThisMessage(tTitle, tName.htmlEnc(), true);
+			
+			// Display the received message
+			var html = '<div class="one-update update_' + hash + ' ' + tHash + '" data-stamp="' + encodeQuotes(tStamp) + '" data-id="' + encodeQuotes(tID) + '" data-xid="' + encodeQuotes(from) + '">' + 
+					'<div class="' + hash + '">' + 
+						'<div class="avatar-container">' + 
+							'<img class="avatar" src="' + './img/others/default-avatar.png' + '" alt="" />' + 
+						'</div>' + 
+					'</div>' + 
+					
+					'<div class="body">' + 
+						'<p>';
+			
+			// Is it a repeat?
+			if(uRepeated)
+				html += '<a href="#" class="repeat talk-images" title="' + encodeQuotes(printf(_e("This is a repeat from %s"), uRepeat[0] + ' (' + uRepeat[1] + ')')) + '" onclick="return checkChatCreate(\'' + encodeOnclick(uRepeat[1]) + '\', \'chat\');" data-xid="' + encodeQuotes(uRepeat[1]) + '"></a>';
+			
+			html += '<b title="' + from + '" class="name">' + tName.htmlEnc() + '</b> <span>' + tFiltered + '</span></p>' + 
+				'<p class="infos">' + tTime + tGeoloc + '</p>';
+			
+			// Any file to display?
+			if(tFURL.length)
+				html += '<p class="file">';
+			
+			// Generate an array of the files URL
+			for(var a = 0; a < tFURL.length; a++) {
+				// Not enough data?
+				if(!tFURL[a])
+					continue;
+				
+				// Push the current URL! (YouTube or file)
+				if(tFURL[a].match(/(\w{3,5})(:)(\S+)((\.youtube\.com\/watch(\?v|\?\S+v|\#\!v|\#\!\S+v)\=)|(youtu\.be\/))([^& ]+)((&amp;\S)|(&\S)|\s|$)/gim)) {
+					aFURL.push(trim(RegExp.$8));
+					aFCat.push('youtube');
+				}
+				
+				else if(canIntegrateBox(explodeThis('/', tFType[a], 1))) {
+					aFURL.push(tFURL[a]);
+					aFCat.push(fileCategory(explodeThis('/', tFType[a], 1)));
+				}
+			}
+			
+			// Add each file code
+			for(var f = 0; f < tFURL.length; f++) {
+				// Not enough data?
+				if(!tFURL[f])
+					continue;
+				
+				// Get the file type
+				var tFExt = explodeThis('/', tFType[f], 1);
+				var tFCat = fileCategory(tFExt);
+				var tFLink = tFURL[f];
+				
+				// Youtube video?
+				if(tFLink.match(/(\w{3,5})(:)(\S+)((\.youtube\.com\/watch(\?v|\?\S+v|\#\!v|\#\!\S+v)\=)|(youtu\.be\/))([^& ]+)((&amp;\S)|(&\S)|\s|$)/gim)) {
+					tFLink = trim(RegExp.$8);
+					tFCat = 'youtube';
+				}
+				
+				// Supported image/video/sound
+				if(canIntegrateBox(tFExt) || (tFCat == 'youtube'))
+					tFEClick = 'onclick="return applyIntegrateBox(\'' + encodeOnclick(tFLink) + '\', \'' + encodeOnclick(tFCat) + '\', \'' + encodeOnclick(aFURL) + '\', \'' + encodeOnclick(aFCat) + '\', \'' + encodeOnclick(tFEComments) + '\', \'' + encodeOnclick(tFNComments) + '\', \'large\');" ';
+				else
+					tFEClick = '';
+				
+				// Any thumbnail?
+				if(tFThumb[f])
+					html += '<a class="thumb" ' + tFEClick + 'href="' + encodeQuotes(tFURL[f]) + '" target="_blank" title="' + encodeQuotes(tFName[f]) + '" data-node="' + encodeQuotes(tFNComments) + '"><img src="' + encodeQuotes(tFThumb[f]) + '" alt="" /></a>';
+				else
+					html += '<a class="' + encodeQuotes(tFCat) + ' link talk-images" ' + tFEClick + 'href="' + encodeQuotes(tFURL[f]) + '" target="_blank" data-node="' + encodeQuotes(tFNComments) + '">' + tFName[f].htmlEnc() + '</a>';
+			}
+			
+			if(tFURL.length)
+				html += '</p>';
+			
+			// It's my own notice, we can remove it!
+			if(from == getXID())
+				html += '<a href="#" onclick="return removeMicroblog(\'' + encodeOnclick(tID) + '\', \'' + encodeOnclick(tHash) + '\');" title="' + _e("Remove this notice") + '" class="mbtool remove talk-images"></a>';
+			
+			// Notice from another user
+			else {
+				// User profile
+				html += '<a href="#" title="' + _e("View profile") + '" class="mbtool profile talk-images" onclick="return openUserInfos(\'' + encodeOnclick(from) + '\');"></a>';
+				
+				// If PEP is enabled
+				if(enabledPEP())
+					html += '<a href="#" title="' + _e("Repeat this notice") + '" class="mbtool repost talk-images"></a>';
+			}
+			
+			html += '</div><div class="comments-container" data-node="' + encodeQuotes(nodeComments) + '"></div></div>';
+			
+			// Mixed mode
+			if((mode == 'mixed') && !exists('.mixed .' + tHash)) {
+				// Remove the old element
+				if(way == 'push')
+					$('#channel .content.mixed .one-update.update_' + hash).remove();
+				
+				// Get the nearest element
+				var nearest = sortElementByStamp(tStamp, '#channel .mixed .one-update');
+				
+				// Append the content at the right position (date relative)
+				if(nearest == 0)
+					$('#channel .content.mixed').append(html);
+				else
+					$('#channel .one-update[data-stamp=' + nearest + ']:first').before(html);
+				
+				// Show the new item
+				if(way == 'push')
+					$('#channel .content.mixed .one-update.' + tHash).fadeIn('fast');
+				else
+					$('#channel .content.mixed .one-update.' + tHash).show();
+				
+				// Remove the old notices to make the DOM lighter
+				var oneUpdate = '#channel .content.mixed .one-update';
+				
+				if($(oneUpdate).size() > 80)
+					$(oneUpdate + ':last').remove();
+				
+				// Click event on avatar/name
+				$('.mixed .' + tHash + ' .avatar-container, .mixed .' + tHash + ' .body b').click(function() {
+					getMicroblog(from, hash);
+				});
+			}
+			
+			// Individual mode
+			tIndividual = '#channel .content.individual.microblog-' + hash;
+			
+			// Can append individual content?
+			var can_individual = true;
+			
+			if($('#channel .top.individual input[name=comments]').val() && exists(tIndividual + ' .one-update'))
+				can_individual = false;
+			
+			if(can_individual && exists(tIndividual) && !exists('.individual .' + tHash)) {
+				if(mode == 'mixed')
+					$(tIndividual).prepend(html);
+				else
+					$(tIndividual + ' a.more').before(html);
+				
+				// Show the new item
+				if(way == 'push')
+					$('#channel .content.individual .one-update.' + tHash).fadeIn('fast');
+				else
+					$('#channel .content.individual .one-update.' + tHash).show();
+				
+				// Make 'more' link visible
+				$(tIndividual + ' a.more').css('visibility', 'visible');
+				
+				// Click event on name (if not me!)
+				if(from != getXID())
+					$('.individual .' + tHash + ' .avatar-container, .individual .' + tHash + ' .body b').click(function() {
+						checkChatCreate(from, 'chat');
+					});
+			}
+			
+			// Apply the click event
+			$('.' + tHash + ' a.repost:not([data-event=true])').click(function() {
+				return publishMicroblog(tTitle, tFName, tFURL, tFType, tFLength, tFThumb, uRepeat, entityComments, nodeComments, tFEComments, tFNComments);
+			})
+			
+			.attr('data-event', 'true');
+			
+			// Apply the hover event
+			if(nodeComments)
+				$('.' + mode + ' .' + tHash).hover(function() {
+					showCommentsMicroblog($(this), entityComments, nodeComments, tHash);
+				}, function() {
+					if($(this).find('div.comments a.one-comment.loading').size())
+						$(this).find('div.comments').remove();
+				});
+		}
+	});
+	
+	// Display the avatar of this buddy
+	getAvatar(from, 'cache', 'true', 'forget');
+}
+
+// Removes a given microblog item
+function removeMicroblog(id, hash) {
+	/* REF: http://xmpp.org/extensions/xep-0060.html#publisher-delete */
+	
+	// Initialize
+	var selector = $('.' + hash);
+	var get_last = false;
+	
+	// Get the latest item for the mixed mode
+	if(exists('#channel .content.mixed .' + hash))
+		get_last = true;
+	
+	// Remove the item from our DOM
+	selector.fadeOut('fast', function() {
+		$(this).remove();
+	});
+	
+	// Send the IQ to remove the item (and get eventual error callback)
+	var iq = new JSJaCIQ();
+	iq.setType('set');
+	
+	var pubsub = iq.appendNode('pubsub', {'xmlns': NS_PUBSUB});
+	var retract = pubsub.appendChild(iq.buildNode('retract', {'node': NS_URN_MBLOG, 'xmlns': NS_PUBSUB}));
+	retract.appendChild(iq.buildNode('item', {'id': id, 'xmlns': NS_PUBSUB}));
+	
+	if(get_last)
+		con.send(iq, handleRemoveMicroblog);
+	else
+		con.send(iq, handleErrorReply);
+	
+	return false;
+}
+
+// Handles the microblog item removal
+function handleRemoveMicroblog(iq) {
+	// Handle the error reply
+	handleErrorReply(iq);
+	
+	// Get the latest item
+	requestMicroblog(getXID(), '1', false, handleUpdateRemoveMicroblog);
+}
+
+// Handles the microblog update
+function handleUpdateRemoveMicroblog(iq) {
+	// Error?
+	if(iq.getType() == 'error')
+		return;
+	
+	// Initialize
+	var xid = bareXID(getStanzaFrom(iq));
+	var hash = hex_md5(xid);
+	
+	// Display the item!
+	displayMicroblog(iq, xid, hash, 'mixed', 'push');
+}
+
+// Gets a given microblog comments node
+function getCommentsMicroblog(server, node, id) {
+	/* REF: http://xmpp.org/extensions/xep-0060.html#subscriber-retrieve-requestall */
+	
+	var iq = new JSJaCIQ();
+	iq.setType('get');
+	iq.setID('get_' + genID() + '-' + id);
+	iq.setTo(server);
+	
+	var pubsub = iq.appendNode('pubsub', {'xmlns': NS_PUBSUB});
+	pubsub.appendChild(iq.buildNode('items', {'node': node, 'xmlns': NS_PUBSUB}));
+	
+	con.send(iq, handleCommentsMicroblog);
+	
+	return false;
+}
+
+// Handles a microblog comments node items
+function handleCommentsMicroblog(iq) {
+	// Path
+	var id = explodeThis('-', iq.getID(), 1);
+	var path = 'div.comments[data-id=' + id + '] div.comments-content';
+	
+	// Does not exist?
+	if(!exists(path))
+		return false;
+	
+	// Any error?
+	if(handleErrorReply(iq)) {
+		$(path).html('<div class="one-comment loading">' + _e("Could not get the comments!") + '</div>');
+		
+		return false;
+	}
+	
+	// Initialize
+	var data = iq.getNode();
+	var server = bareXID(getStanzaFrom(iq));
+	var node = $(data).find('items:first').attr('node');
+	var users_xid = [];
+	var code = '';
+	
+	// No node?
+	if(!node)
+		node = $(data).find('publish:first').attr('node');
+	
+	// Get the parent microblog item
+	var parent_select = $('#channel .one-update:has(*[data-node=' + node + '])');
+	var parent_data = [parent_select.attr('data-xid'), NS_URN_MBLOG, parent_select.attr('data-id')];
+	
+	// Get the owner XID
+	var owner_xid = parent_select.attr('data-xid');
+	var repeat_xid = parent_select.find('a.repeat').attr('data-xid');
+	
+	// Must we create the complete DOM?
+	var complete = true;
+	
+	if($(path).find('.one-comment.compose').size())
+		complete = false;
+	
+	// Add the comment tool
+	if(complete)
+		code += '<div class="one-comment compose">' + 
+				'<span class="icon talk-images"></span><input type="text" placeholder="' + _e("Type your comment here...") + '" />' + 
+			'</div>';
+	
+	// Append the comments
+	$(data).find('item').each(function() {
+		// Get comment
+		var current_id = $(this).attr('id');
+		var current_xid = explodeThis(':', $(this).find('source author uri').text(), 1);
+		var current_name = $(this).find('source author name').text();
+		var current_date = $(this).find('published').text();
+		var current_body = $(this).find('content[type=text]').text();
+		var current_bname = getBuddyName(current_xid);
+		
+		// Legacy?
+		if(!current_body)
+			current_body = $(this).find('title:not(source > title)').text();
+		
+		// Yet displayed? (continue the loop)
+		if($(path).find('.one-comment[data-id=' + current_id + ']').size())
+			return;
+		
+		// No XID?
+		if(!current_xid) {
+			current_xid = '';
+			
+			if(!current_name)
+				current_name = _e("unknown");
+		}
+		
+		else if(!current_name || (current_bname != getXIDNick(current_xid)))
+			current_name = current_bname;
+		
+		// Any date?
+		if(current_date)
+			current_date = relativeDate(current_date);
+		else
+			current_date = getCompleteTime();
+		
+		// Click event
+		var onclick = 'false';
+		
+		if(current_xid != getXID())
+			onclick = 'checkChatCreate(\'' + encodeOnclick(current_xid) + '\', \'chat\')';
+		
+		// If this is my comment, add a marker
+		var type = 'him';
+		var marker = '';
+		var remove = '';
+		
+		if(current_xid == getXID()) {
+			type = 'me';
+			marker = '<div class="marker"></div>';
+			remove = '<a href="#" class="remove" onclick="return removeCommentMicroblog(\'' + encodeOnclick(server) + '\', \'' + encodeOnclick(node) + '\', \'' + encodeOnclick(current_id) + '\');">' + _e("Remove") + '</a>';
+		}
+		
+		// New comment?
+		var new_class = '';
+		
+		if(!complete)
+			new_class = ' new';
+		
+		// Add the comment
+		if(current_body) {
+			// Add the XID
+			if(!existArrayValue(users_xid, current_xid))
+				users_xid.push(current_xid);
+			
+			// Add the HTML code
+			code += '<div class="one-comment ' + hex_md5(current_xid) + ' ' + type + new_class + '" data-id="' + encodeQuotes(current_id) + '">' + 
+					marker + 
+					
+					'<div class="avatar-container" onclick="return ' + onclick + ';">' + 
+						'<img class="avatar" src="' + './img/others/default-avatar.png' + '" alt="" />' + 
+					'</div>' + 
+					
+					'<div class="comment-container">' + 
+						'<a href="#" onclick="return ' + onclick + ';" title="' + encodeQuotes(current_xid) + '" class="name">' + current_name.htmlEnc() + '</a>' + 
+						'<span class="date">' + current_date.htmlEnc() + '</span>' + 
+						remove + 
+					
+						'<p class="body">' + filterThisMessage(current_body, current_name, true) + '</p>' + 
+					'</div>' + 
+					
+					'<div class="clear"></div>' + 
+				'</div>';
+		}
+	});
+	
+	// Add the HTML
+	if(complete) {
+		$(path).html(code);
+		
+		// Focus on the compose input
+		$(document).oneTime(10, function() {
+			$(path).find('.one-comment.compose input').focus();
+		});
+	}
+	
+	else {
+		$(path).find('.one-comment.compose').after(code);
+		
+		// Beautiful effect
+		$(path).find('.one-comment.new').slideDown('fast', function() {
+			adaptCommentMicroblog(id);
+		}).removeClass('new');
+	}
+	
+	// Set the good widths
+	adaptCommentMicroblog(id);
+	
+	// Get the avatars
+	for(a in users_xid)
+		getAvatar(users_xid[a], 'cache', 'true', 'forget');
+	
+	// Add the owner XID
+	if(owner_xid && owner_xid.match('@') && !existArrayValue(users_xid, owner_xid))
+		users_xid.push(owner_xid);
+	
+	// Add the repeated from XID
+	if(repeat_xid && repeat_xid.match('@') && !existArrayValue(users_xid, repeat_xid))
+		users_xid.push(repeat_xid);
+	
+	// Remove my own XID
+	removeArrayValue(users_xid, getXID());
+	
+	// DOM events
+	if(complete) {
+		// Update timer
+		$(path).everyTime('60s', function() {
+			getCommentsMicroblog(server, node, id);
+			
+			logThis('Updating comments node: ' + node + ' on ' + server + '...');
+		});
+		
+		// Input key event
+		$(path).find('.one-comment.compose input').placeholder()
+			             .keyup(function(e) {
+			             		if((e.keyCode == 13) && $(this).val()) {
+			             			// Send the comment!
+			             			sendCommentMicroblog($(this).val(), server, node, id, users_xid, parent_data);
+			             			
+			             			// Reset the input value
+			             			$(this).val('');
+			             			
+			             			return false;
+			             		}
+			             });
+	}
+}
+
+// Shows the microblog comments box
+function showCommentsMicroblog(path, entityComments, nodeComments, tHash) {
+	// Do not display it twice!
+	if(path.find('div.comments').size())
+		return;
+	
+	// Generate an unique ID
+	var idComments = genID();
+	
+	// Create comments container
+	path.find('div.comments-container').append(
+		'<div class="comments" data-id="' + encodeQuotes(idComments) + '">' + 
+			'<div class="arrow talk-images"></div>' + 
+			'<div class="comments-content">' + 
+				'<a href="#" class="one-comment loading"><span class="icon talk-images"></span>' + _e("Show comments") + '</a>' + 
+			'</div>' + 
+		'</div>'
+	);
+	
+	// Click event
+	path.find('div.comments a.one-comment').click(function() {
+		// Set loading info
+		$(this).parent().html('<div class="one-comment loading"><span class="icon talk-images"></span>' + _e("Loading comments...") + '</div>');
+		
+		// Request comments
+		getCommentsMicroblog(entityComments, nodeComments, idComments);
+		
+		// Remove the comments from the DOM if click away
+		if(tHash) {
+			$('#channel').die('click');
+			
+			$('#channel').live('click', function(evt) {
+				if(!$(evt.target).parents('.' + tHash).size()) {
+					$('#channel').die('click');
+					$('#channel .one-update div.comments-content').stopTime();
+					$('#channel .one-update div.comments').remove();
+				}
+			});
+		}
+		
+		return false;
+	});
+}
+
+// Sends a comment on a given microblog comments node
+function sendCommentMicroblog(value, server, node, id, notifiy_arr, parent_data) {
+	/* REF: http://xmpp.org/extensions/xep-0060.html#publisher-publish */
+	
+	// Not enough data?
+	if(!value || !server || !node)
+		return false;
+	
+	// Get some values
+	var date = getXMPPTime('utc');
+	var hash = hex_md5(value + date);
+	
+	// New IQ
+	var iq = new JSJaCIQ();
+	iq.setType('set');
+	iq.setTo(server);
+	iq.setID('set_' + genID() + '-' + id);
+	
+	// PubSub main elements
+	var pubsub = iq.appendNode('pubsub', {'xmlns': NS_PUBSUB});
+	var publish = pubsub.appendChild(iq.buildNode('publish', {'node': node, 'xmlns': NS_PUBSUB}));
+	var item = publish.appendChild(iq.buildNode('item', {'id': hash, 'xmlns': NS_PUBSUB}));
+	var entry = item.appendChild(iq.buildNode('entry', {'xmlns': NS_ATOM}));
+	
+	// Author infos
+	var Source = entry.appendChild(iq.buildNode('source', {'xmlns': NS_ATOM}));
+	var author = Source.appendChild(iq.buildNode('author', {'xmlns': NS_ATOM}));
+	author.appendChild(iq.buildNode('name', {'xmlns': NS_ATOM}, getName()));
+	author.appendChild(iq.buildNode('uri', {'xmlns': NS_ATOM}, 'xmpp:' + getXID()));
+	
+	// Create the comment
+	entry.appendChild(iq.buildNode('content', {'type': 'text', 'xmlns': NS_ATOM}, value));
+	entry.appendChild(iq.buildNode('published', {'xmlns': NS_ATOM}, date));
+	
+	con.send(iq);
+	
+	// Handle this comment!
+	iq.setFrom(server);
+	handleCommentsMicroblog(iq);
+	
+	// Notify users
+	if(notifiy_arr && notifiy_arr.length) {
+		// XMPP link to the item
+		var href = 'xmpp:' + server + '?;node=' + encodeURIComponent(node) + ';item=' + encodeURIComponent(hash);
+		
+		// Loop!
+		for(n in notifiy_arr)
+			sendNotification(notifiy_arr[n], 'comment', href, value, parent_data);
+	}
+	
+	return false;
+}
+
+// Removes a given microblog comment item
+function removeCommentMicroblog(server, node, id) {
+	/* REF: http://xmpp.org/extensions/xep-0060.html#publisher-delete */
+	
+	// Remove the item from our DOM
+	$('.one-comment[data-id=' + id + ']').slideUp('fast', function() {
+		// Get the parent ID
+		var parent_id = $(this).parents('div.comments').attr('data-id');
+		
+		// Remove it!
+		$(this).remove();
+		
+		// Adapt the width
+		adaptCommentMicroblog(parent_id);
+	});
+	
+	// Send the IQ to remove the item (and get eventual error callback)
+	var iq = new JSJaCIQ();
+	iq.setType('set');
+	iq.setTo(server);
+	
+	var pubsub = iq.appendNode('pubsub', {'xmlns': NS_PUBSUB});
+	var retract = pubsub.appendChild(iq.buildNode('retract', {'node': node, 'xmlns': NS_PUBSUB}));
+	retract.appendChild(iq.buildNode('item', {'id': id, 'xmlns': NS_PUBSUB}));
+	
+	con.send(iq);
+	
+	return false;
+}
+
+// Adapts the comment elements width
+function adaptCommentMicroblog(id) {
+	var selector = $('div.comments[data-id=' + id + '] div.comments-content');
+	var selector_width = selector.width();
+	
+	// Change widths
+	selector.find('.one-comment.compose input').css('width', selector_width - 60);
+	selector.find('.one-comment .comment-container').css('width', selector_width - 55);
+}
+
+// Handles the microblog of an user
+function handleMicroblog(iq) {
+	// Get the from attribute of this IQ
+	var from = bareXID(getStanzaFrom(iq));
+	
+	// Define the selector path
+	var selector = '#channel .top.individual input[name=';
+	
+	// Is this request still alive?
+	if(from == $(selector + 'jid]').val()) {
+		var hash = hex_md5(from);
+		
+		// Update the items counter
+		var old_count = parseInt($(selector + 'counter]').val());
+		$(selector + 'counter]').val(old_count + 20);
+		
+		// Display the microblog
+		displayMicroblog(iq, from, hash, 'individual', 'request');
+		
+		// Hide the waiting icon
+		if(enabledPEP())
+			waitMicroblog('sync');
+		else
+			waitMicroblog('unsync');
+		
+		// Hide the 'more items' link?
+		if($(iq.getNode()).find('item').size() < old_count)
+			$('#channel .individual a.more').remove();
+		
+		// Get the comments?
+		var comments_node = $('#channel .top.individual input[name=comments]').val();
+		
+		if(comments_node && comments_node.match(/^xmpp:(.+)\?;node=(.+);item=(.+)/)) {
+			// Get the values
+			var comments_entity = RegExp.$1;
+			comments_node = decodeURIComponent(RegExp.$2);
+			
+			// Selectors
+			var file_link = $('#channel .individual .one-update p.file a[data-node=' + comments_node + ']');
+			var entry_link = $('#channel .individual .one-update:has(*[data-node=' + comments_node + '])');
+			
+			// Is it a file?
+			if(file_link.size())
+				file_link.click();
+			
+			// Is it a microblog entry?
+			else if(entry_link.size()) {
+				showCommentsMicroblog(entry_link, comments_entity, comments_node);
+				entry_link.find('a.one-comment').click();
+			}
+		}
+	}
+	
+	logThis('Microblog got: ' + from, 3);
+}
+
+// Resets the microblog elements
+function resetMicroblog() {
+	// Reset everything
+	$('#channel .individual .one-update div.comments-content').stopTime();
+	$('#channel .individual').remove();
+	$('#channel .mixed').show();
+	
+	// Hide the waiting icon
+	if(enabledPEP())
+		waitMicroblog('sync');
+	else
+		waitMicroblog('unsync');
+	
+	return false;
+}
+
+// Gets the user's microblog to check it exists
+function getInitMicroblog() {
+	getMicroblog(getXID(), hex_md5(getXID()), true);
+}
+
+// Handles the user's microblog to create it in case of error
+function handleInitMicroblog(iq) {
+	// Any error?
+	if((iq.getType() == 'error') && $(iq.getNode()).find('item-not-found').size()) {
+		// The node may not exist, create it!
+		setupMicroblog('', NS_URN_MBLOG, '1', '1000000', '', '', true);
+		
+		logThis('Error while getting microblog, trying to reconfigure the Pubsub node!', 2);
+	}
+}
+
+// Requests an user's microblog
+function requestMicroblog(xid, items, get_item, handler) {
+	// Ask the server the user's microblog 
+	var iq = new JSJaCIQ();
+	iq.setType('get');
+	iq.setTo(xid);
+	
+	var pubsub = iq.appendNode('pubsub', {'xmlns': NS_PUBSUB});
+	var ps_items = pubsub.appendChild(iq.buildNode('items', {'node': NS_URN_MBLOG, 'xmlns': NS_PUBSUB}));
+	
+	// Request a particular item?
+	if(get_item)
+		ps_items.appendChild(iq.buildNode('item', {'id': get_item, 'xmlns': NS_PUBSUB}));
+	else
+		ps_items.setAttribute('max_items', items);
+	
+	if(handler)
+		con.send(iq, handler);
+	else
+		con.send(iq, handleMicroblog);
+	
+	return false;
+}
+
+// Gets the microblog of an user
+function getMicroblog(xid, hash, check) {
+	/* REF: http://xmpp.org/extensions/xep-0060.html#subscriber-retrieve */
+	
+	logThis('Get the microblog: ' + xid, 3);
+	
+	// Fire the wait event
+	waitMicroblog('fetch');
+	
+	// XMPP URI?
+	var get_item = '';
+	
+	if(xid.match(/^xmpp:(.+)\?;node=(.+);item=(.+)/)) {
+		xid = RegExp.$1;
+		get_item = decodeURIComponent(RegExp.$3);
+	}
+	
+	// No hash?
+	if(!hash)
+		hash = hex_md5(xid);
+	
+	// Can display the individual channel?
+	if(!check && !exists('#channel .individual')) {
+		// Hide the mixed channel
+		$('#channel .mixed').hide();
+		
+		// Get the channel title depending on the XID
+		var cTitle;
+		var cShortcuts = '';
+		
+		if(xid == getXID())
+			cTitle = _e("Your channel");
+		else {
+			cTitle = _e("Channel of") + ' ' + getBuddyName(xid).htmlEnc();
+			cShortcuts = '<div class="shortcuts">' + 
+						'<a href="#" class="message talk-images" title="' + _e("Send him/her a message") + '" onclick="return composeInboxMessage(\'' + encodeOnclick(xid) + '\');"></a>' + 
+						'<a href="#" class="chat talk-images" title="' + _e("Start a chat with him/her") + '" onclick="return checkChatCreate(\'' + encodeOnclick(xid) + '\', \'chat\');"></a>' + 
+						'<a href="#" class="command talk-images" title="' + _e("Command") + '" onclick="return retrieveAdHoc(\'' + encodeOnclick(xid) + '\');"></a>' + 
+						'<a href="#" class="profile talk-images" title="' + _e("Show user profile") + '" onclick="return openUserInfos(\'' + encodeOnclick(xid) + '\');"></a>' + 
+			             '</div>';
+		}
+		
+		// Create a new individual channel
+		$('#channel .content.mixed').after(
+				'<div class="content individual microblog-' + hash + '">' + 
+					'<a href="#" class="more home-images" onclick="return getMicroblog(\'' + encodeOnclick(xid) + '\', \'' + encodeOnclick(hash) + '\');">' + _e("More notices...") + '</a>' + 
+				'</div>'
+						 )
+					   
+					   .before(
+				'<div class="top individual ' + hash + '">' + 
+					'<div class="avatar-container">' + 
+						'<img class="avatar" src="' + './img/others/default-avatar.png' + '" alt="" />' + 
+					'</div>' + 
+					
+					'<div class="update">' + 
+						'<h2>' + cTitle + '</h2>' + 
+						'<a href="#" onclick="return resetMicroblog();">« ' + _e("Previous") + '</a>' + 
+					'</div>' + 
+					
+					cShortcuts + 
+					
+					'<input type="hidden" name="jid" value="' + encodeQuotes(xid) + '" />' + 
+					'<input type="hidden" name="counter" value="20" />' + 
+				'</div>'
+						 );
+		
+		// Display the user avatar
+		getAvatar(xid, 'cache', 'true', 'forget');
+	}
+	
+	// Get the number of items to retrieve
+	var items = '0';
+	
+	if(!check)
+		items = $('#channel .top.individual input[name=counter]').val();
+	
+	// Request
+	if(check)
+		requestMicroblog(xid, items, get_item, handleInitMicroblog);
+	else
+		requestMicroblog(xid, items, get_item, handleMicroblog);
+	
+	return false;
+}
+
+// Show a given microblog waiting status
+function waitMicroblog(type) {
+	// First hide all the infos elements
+	$('#channel .footer div').hide();
+	
+	// Display the good one
+	$('#channel .footer div.' + type).show();
+	
+	// Depending on the type, disable/enable certain tools
+	var selector = $('#channel .top input[name=microblog_body]');
+	
+	if(type == 'unsync')
+		selector.attr('disabled', true);
+	else if(type == 'sync')
+		$(document).oneTime(10, function() {
+			selector.removeAttr('disabled').focus();
+		});
+}
+
+// Setups a new microblog
+function setupMicroblog(entity, node, persist, maximum, access, publish, create) {
+	/* REF: http://xmpp.org/extensions/xep-0060.html#owner-create-and-configure */
+	
+	// Create the PubSub node
+	var iq = new JSJaCIQ();
+	iq.setType('set');
+	
+	// Any external entity?
+	if(entity)
+		iq.setTo(entity);
+	
+	// Create it?
+	if(create) {
+		var pubsub = iq.appendNode('pubsub', {'xmlns': NS_PUBSUB});
+		pubsub.appendChild(iq.buildNode('create', {'xmlns': NS_PUBSUB, 'node': node}));
+	}
+	
+	else
+		var pubsub = iq.appendNode('pubsub', {'xmlns': NS_PUBSUB_OWNER});
+	
+	// Configure it!
+	var configure = pubsub.appendChild(iq.buildNode('configure', {'node': node, 'xmlns': NS_PUBSUB}));
+	var x = configure.appendChild(iq.buildNode('x', {'xmlns': NS_XDATA, 'type': 'submit'}));
+	
+	var field1 = x.appendChild(iq.buildNode('field', {'var': 'FORM_TYPE', 'type': 'hidden', 'xmlns': NS_XDATA}));
+	field1.appendChild(iq.buildNode('value', {'xmlns': NS_XDATA}, NS_PUBSUB_NC));
+	
+	// Persist items?
+	if(persist) {
+		var field2 = x.appendChild(iq.buildNode('field', {'var': 'pubsub#persist_items', 'xmlns': NS_XDATA}));
+		field2.appendChild(iq.buildNode('value', {'xmlns': NS_XDATA}, persist));
+	}
+	
+	// Maximum items?
+	if(maximum) {
+		var field3 = x.appendChild(iq.buildNode('field', {'var': 'pubsub#max_items', 'xmlns': NS_XDATA}));
+		field3.appendChild(iq.buildNode('value', {'xmlns': NS_XDATA}, maximum));
+	}
+	
+	// Access rights?
+	if(access) {
+		var field4 = x.appendChild(iq.buildNode('field', {'var': 'pubsub#access_model', 'xmlns': NS_XDATA}));
+		field4.appendChild(iq.buildNode('value', {'xmlns': NS_XDATA}, access));
+	}
+	
+	// Publish rights?
+	if(publish) {
+		var field5 = x.appendChild(iq.buildNode('field', {'var': 'pubsub#publish_model', 'xmlns': NS_XDATA}));
+		field5.appendChild(iq.buildNode('value', {'xmlns': NS_XDATA}, publish));
+	}
+	
+	con.send(iq);
+}
+
+// Gets the microblog configuration
+function getConfigMicroblog() {
+	// Lock the microblog options
+	$('#persistent, #maxnotices').attr('disabled', true);
+	
+	// Get the microblog configuration
+	var iq = new JSJaCIQ();
+	iq.setType('get');
+	
+	var pubsub = iq.appendNode('pubsub', {'xmlns': NS_PUBSUB_OWNER});
+	pubsub.appendChild(iq.buildNode('configure', {'node': NS_URN_MBLOG, 'xmlns': NS_PUBSUB_OWNER}));
+	
+	con.send(iq, handleGetConfigMicroblog);
+}
+
+// Handles the microblog configuration
+function handleGetConfigMicroblog(iq) {
+	// Reset the options stuffs
+	waitOptions('microblog');
+	
+	// Unlock the microblog options
+	$('#persistent, #maxnotices').removeAttr('disabled');
+	
+	// End if not a result
+	if(!iq || (iq.getType() != 'result'))
+		return;
+	
+	// Initialize the values
+	var selector = $(iq.getNode());
+	var persistent = '0';
+	var maxnotices = '1000000';
+	
+	// Get the values
+	var xPersistent = selector.find('field[var=pubsub#persist_items] value:first').text();
+	var xMaxnotices = selector.find('field[var=pubsub#max_items] value:first').text();
+	
+	// Any value?
+	if(xPersistent)
+		persistent = xPersistent;
+	
+	if(xMaxnotices)
+		maxnotices = xMaxnotices;
+	
+	// Change the maxnotices value
+	switch(maxnotices) {
+		case '1':
+		case '100':
+		case '1000':
+		case '10000':
+		case '100000':
+		case '1000000':
+			break;
+		
+		default:
+			maxnotices = '1000000';
+			break;
+	}
+	
+	// Apply persistent value
+	if(persistent == '0')
+		$('#persistent').attr('checked', false);
+	else
+		$('#persistent').attr('checked', true);
+	
+	// Apply maxnotices value
+	$('#maxnotices').val(maxnotices);
+}
+
+// Handles the user's microblog
+function handleMyMicroblog(packet) {
+	// Reset the entire form
+	$('#channel .top input[name=microblog_body]').removeAttr('disabled').val('');
+	$('#channel .top input[name=microblog_body]').placeholder();
+	unattachMicroblog();
+	
+	// Check for errors
+	handleErrorReply(packet);
+}
+
+// Performs the microblog sender checks
+function sendMicroblog() {
+	logThis('Send a new microblog item', 3);
+	
+	// Avoid nasty errors
+	try {
+		// Get the values
+		var selector = $('#channel .top input[name=microblog_body]');
+		var body = trim(selector.val());
+		
+		// Sufficient parameters
+		if(body) {
+			// Disable & blur our input
+			selector.attr('disabled', true).blur();
+			
+			// Files array
+			var fName = [];
+			var fType = [];
+			var fLength = [];
+			var fURL = [];
+			var fThumb = [];
+			
+			// Read the files
+			$('#attach .one-file').each(function() {
+				// Push the values!
+				fName.push($(this).find('a.link').text());
+				fType.push($(this).attr('data-type'));
+				fLength.push($(this).attr('data-length'));
+				fURL.push($(this).find('a.link').attr('href'));
+				fThumb.push($(this).attr('data-thumb'));
+			});
+			
+			// Containing YouTube videos?
+			var yt_matches = body.match(/(\w{3,5})(:)(\S+)((\.youtube\.com\/watch(\?v|\?\S+v|\#\!v|\#\!\S+v)\=)|(youtu\.be\/))([^& ]+)((&amp;\S)|(&\S)|\s|$)/gim);
+			
+			for(y in yt_matches) {
+				fName.push('');
+				fType.push('text/html');
+				fLength.push('');
+				fURL.push(trim(yt_matches[y]));
+				fThumb.push('https://img.youtube.com/vi/' + trim(yt_matches[y].replace(/(\w{3,5})(:)(\S+)((\.youtube\.com\/watch(\?v|\?\S+v|\#\!v|\#\!\S+v)\=)|(youtu\.be\/))([^& ]+)((&amp;\S)|(&\S)|\s|$)/gim, '$8')) + '/0.jpg');
+			}
+			
+			// Send the message on the XMPP network
+			publishMicroblog(body, fName, fURL, fType, fLength, fThumb);
+		}
+	}
+	
+	// Return false (security)
+	finally {
+		return false;
+	}
+}
+
+// Publishes a given microblog item
+function publishMicroblog(body, attachedname, attachedurl, attachedtype, attachedlength, attachedthumb, repeat, comments_entity, comments_node, comments_entity_file, comments_node_file) {
+	/* REF: http://xmpp.org/extensions/xep-0277.html */
+	
+	// Generate some values
+	var time = getXMPPTime('utc');
+	var id = hex_md5(body + time);
+	var nick = getName();
+	var xid = getXID();
+	
+	// Define repeat options
+	var author_nick = nick;
+	var author_xid = xid;
+	
+	if(repeat && repeat.length) {
+		author_nick = repeat[0];
+		author_xid = repeat[1];
+	}
+	
+	// Define comments options
+	var node_create = false;
+	
+	if(!comments_entity || !comments_node) {
+		node_create = true;
+		comments_entity = HOST_PUBSUB;
+		comments_node = NS_URN_MBLOG + ':comments/' + id;
+	}
+	
+	if(!comments_entity_file)
+		comments_entity_file = [];
+	if(!comments_node_file)
+		comments_node_file = [];
+	
+	// Don't create another comments node if only 1 file is attached
+	if(attachedurl && (attachedurl.length == 1) && (!comments_entity_file[0] || !comments_node_file[0])) {
+		comments_entity_file = [comments_entity];
+		comments_node_file = [comments_node];
+	}
+	
+	// New IQ
+	var iq = new JSJaCIQ();
+	iq.setType('set');
+	iq.setTo(xid);
+	
+	// Create the main XML nodes/childs
+	var pubsub = iq.appendNode('pubsub', {'xmlns': NS_PUBSUB});
+	var publish = pubsub.appendChild(iq.buildNode('publish', {'node': NS_URN_MBLOG, 'xmlns': NS_PUBSUB}));
+	var item = publish.appendChild(iq.buildNode('item', {'id': id, 'xmlns': NS_PUBSUB}));
+	var entry = item.appendChild(iq.buildNode('entry', {'xmlns': NS_ATOM}));
+	
+	// Create the XML source childs
+	var Source = entry.appendChild(iq.buildNode('source', {'xmlns': NS_ATOM}));
+	var author = Source.appendChild(iq.buildNode('author', {'xmlns': NS_ATOM}));
+	author.appendChild(iq.buildNode('name', {'xmlns': NS_ATOM}, author_nick));
+	author.appendChild(iq.buildNode('uri', {'xmlns': NS_ATOM}, 'xmpp:' + author_xid));
+	
+	// Create the XML entry childs
+	entry.appendChild(iq.buildNode('content', {'type': 'text', 'xmlns': NS_ATOM}, body));
+	entry.appendChild(iq.buildNode('published', {'xmlns': NS_ATOM}, time));
+	entry.appendChild(iq.buildNode('updated', {'xmlns': NS_ATOM}, time));
+	entry.appendChild(iq.buildNode('link', {
+			'rel': 'alternate',
+			'href': 'xmpp:' + xid + '?;node=' + encodeURIComponent(NS_URN_MBLOG) + ';item=' + encodeURIComponent(id),
+			'xmlns': NS_ATOM
+	}));
+	
+	// Create the attached files nodes
+	for(var i = 0; i < attachedurl.length; i++) {
+		// Not enough data?
+		if(!attachedurl[i])
+			continue;
+		
+		// Append a new file element
+		var file = entry.appendChild(iq.buildNode('link', {'xmlns': NS_ATOM, 'rel': 'enclosure', 'href': attachedurl[i]}));
+		
+		// Add attributes
+		if(attachedname[i])
+			file.setAttribute('title', attachedname[i]);
+		if(attachedtype[i])
+			file.setAttribute('type', attachedtype[i]);
+		if(attachedlength[i])
+			file.setAttribute('length', attachedlength[i]);
+		
+		// Any thumbnail?
+		if(attachedthumb[i])
+			file.appendChild(iq.buildNode('link', {'xmlns': NS_URN_MBLOG, 'rel': 'self', 'title': 'thumb', 'type': attachedtype[i], 'href': attachedthumb[i]}));
+		
+		// Any comments node?
+		if(!comments_entity_file[i] || !comments_node_file[i]) {
+			// Generate values
+			comments_entity_file[i] = HOST_PUBSUB;
+			comments_node_file[i] = NS_URN_MBLOG + ':comments/' + hex_md5(attachedurl[i] + attachedname[i] + attachedtype[i] + attachedlength[i] + time);
+			
+			// Create the node
+			setupMicroblog(comments_entity_file[i], comments_node_file[i], '1', '1000000', 'open', 'open', true);
+		}
+		
+		file.appendChild(iq.buildNode('link', {'xmlns': NS_URN_MBLOG, 'rel': 'replies', 'title': 'comments_file', 'href': 'xmpp:' + comments_entity_file[i] + '?;node=' + encodeURIComponent(comments_node_file[i])}));
+	}
+	
+	// Create the comments child
+	entry.appendChild(iq.buildNode('link', {'xmlns': NS_ATOM, 'rel': 'replies', 'title': 'comments', 'href': 'xmpp:' + comments_entity + '?;node=' + encodeURIComponent(comments_node)}));
+	
+	// Create the geoloc child
+	var geoloc_xml = getDB('geolocation', 'now');
+	
+	if(geoloc_xml) {
+		// Create two position arrays
+		var geo_names  = ['lat', 'lon', 'country', 'countrycode', 'region', 'postalcode', 'locality', 'street', 'building', 'text', 'uri', 'timestamp'];
+		var geo_values = parsePosition(XMLFromString(geoloc_xml));
+		
+		// New geoloc child
+		var geoloc = entry.appendChild(iq.buildNode('geoloc', {'xmlns': NS_GEOLOC}));
+		
+		// Append the geoloc content
+		for(var g = 0; g < geo_names.length; g++) {
+			if(geo_names[g] && geo_values[g])
+				geoloc.appendChild(iq.buildNode(geo_names[g], {'xmlns': NS_GEOLOC}, geo_values[g]));
+		}
+	}
+	
+	// Send the IQ
+	con.send(iq, handleMyMicroblog);
+	
+	// Create the XML comments PubSub nodes
+	if(node_create)
+		setupMicroblog(comments_entity, comments_node, '1', '1000000', 'open', 'open', true);
+	
+	return false;
+}
+
+// Attaches a file to a microblog post
+function attachMicroblog() {
+	// File upload vars
+	var attach_options = {
+		dataType:	'xml',
+		beforeSubmit:	waitMicroblogAttach,
+		success:	handleMicroblogAttach
+	};
+	
+	// Upload form submit event
+	$('#attach').submit(function() {
+		if(!exists('#attach .wait') && $('#attach input[type=file]').val())
+			$(this).ajaxSubmit(attach_options);
+		
+		return false;
+	});
+	
+	// Upload input change event
+	$('#attach input[type=file]').change(function() {
+		if(!exists('#attach .wait') && $(this).val())
+			$('#attach').ajaxSubmit(attach_options);
+		
+		return false;
+	});
+}
+
+// Unattaches a microblog file
+function unattachMicroblog(id) {
+	// Individual removal?
+	if(id)
+		$('#attach .one-file[data-id=' + id + ']').remove();
+	else
+		$('#attach .one-file').remove();
+	
+	// Must enable the popup again?
+	if(!exists('#attach .one-file')) {
+		// Restore the bubble class
+		$('#attach').addClass('bubble');
+		
+		// Enable the bubble click events
+		if(id) {
+			$('#attach').hide();
+			showBubble('#attach');
+		}
+		
+		else
+			closeBubbles();
+	}
+	
+	return false;
+}
+
+// Wait event for file attaching
+function waitMicroblogAttach() {
+	// Append the wait icon
+	$('#attach input[type=submit]').after('<div class="wait wait-medium"></div>');
+	
+	// Lock the bubble
+	$('#attach').removeClass('bubble');
+}
+
+// Success event for file attaching
+function handleMicroblogAttach(responseXML) {
+	// Data selector
+	var dData = $(responseXML).find('jappix');
+	
+	// Process the returned data
+	if(!dData.find('error').size()) {
+		// Do not allow this bubble to be hidden
+		$('#attach').removeClass('bubble');
+		
+		// Get the file values
+		var fName = dData.find('title').text();
+		var fType = dData.find('type').text();
+		var fLength = dData.find('length').text();
+		var fURL = dData.find('href').text();
+		var fThumb = dData.find('thumb').text();
+		
+		// Generate a file ID
+		var fID = hex_md5(fURL);
+		
+		// Add this file
+		$('#attach .attach-subitem').append(
+			'<div class="one-file" data-type="' + encodeQuotes(fType) + '" data-length="' + encodeQuotes(fLength) + '" data-thumb="' + encodeQuotes(fThumb) + '" data-id="' + fID + '">' + 
+				'<a class="remove talk-images" href="#" title="' + encodeQuotes(_e("Unattach the file")) + '"></a>' + 
+				'<a class="link" href="' + encodeQuotes(fURL) + '" target="_blank">' + fName.htmlEnc() + '</a>' + 
+			'</div>'
+		);
+		
+		// Click event
+		$('#attach .one-file[data-id=' + fID + '] a.remove').click(function() {
+			return unattachMicroblog(fID);
+		});
+		
+		logThis('File attached.', 3);
+	}
+	
+	// Any error?
+	else {
+		openThisError(4);
+		
+		// Unlock the bubble?
+		if(!exists('#attach .one-file')) {
+			$('#attach').addClass('bubble').hide();
+			
+			// Show the bubble again!
+			showBubble('#attach');
+		}
+		
+		logThis('Error while attaching the file: ' + dData.find('error').text(), 1);
+	}
+	
+	// Reset the attach bubble
+	$('#attach input[type=file]').val('');
+	$('#attach .wait').remove();
+	
+	// Focus on the text input
+	$(document).oneTime(10, function() {
+		$('#channel .top input[name=microblog_body]').focus();
+	});
+}
+
+// Shows the microblog of an user from his infos
+function fromInfosMicroblog(xid, hash) {
+	// Renitialize the channel
+	resetMicroblog();
+	
+	// Switch to the channel
+	switchChan('channel');
+	
+	// Get the microblog
+	getMicroblog(xid, hash);
+}
+
+// Addon launcher
+function launchMicroblog() {
+	// Keyboard event
+	$('#channel .top input[name=microblog_body]').keyup(function(e) {
+		// Enter pressed: send the microblog notice
+		if((e.keyCode == 13) && !exists('#attach .wait'))
+			return sendMicroblog();
+	})
+	
+	// Placeholder
+	.placeholder();
+	
+	// Microblog file attacher
+	attachMicroblog();
+}
diff --git a/jappixmini/jappix/js/mini.js b/jappixmini/jappix/js/mini.js
new file mode 100644
index 00000000..112fbb4c
--- /dev/null
+++ b/jappixmini/jappix/js/mini.js
@@ -0,0 +1,1623 @@
+/*
+
+Jappix - An open social platform
+These are the Jappix Mini JS scripts for Jappix
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 04/08/11
+
+*/
+
+// Jappix Mini vars
+var MINI_DISCONNECT	= false;
+var MINI_AUTOCONNECT	= false;
+var MINI_SHOWPANE	= false;
+var MINI_INITIALIZED	= false;
+var MINI_ANONYMOUS	= false;
+var MINI_ANIMATE	= false;
+var MINI_NICKNAME	= null;
+var MINI_TITLE		= null;
+var MINI_DOMAIN		= null;
+var MINI_USER		= null;
+var MINI_PASSWORD	= null;
+var MINI_RECONNECT	= 0;
+var MINI_GROUPCHATS	= [];
+var MINI_PASSWORDS	= [];
+var MINI_RESOURCE	= JAPPIX_RESOURCE + ' Mini';
+
+// Setups connection handlers
+function setupConMini(con) {
+	con.registerHandler('message', handleMessageMini);
+	con.registerHandler('presence', handlePresenceMini);
+	con.registerHandler('iq', handleIQMini);
+	con.registerHandler('onerror', handleErrorMini);
+	con.registerHandler('onconnect', connectedMini);
+}
+
+// Connects the user with the given logins
+function connectMini(domain, user, password) {
+	try {
+		// We define the http binding parameters
+		oArgs = new Object();
+		
+		if(HOST_BOSH_MINI)
+			oArgs.httpbase = HOST_BOSH_MINI;
+		else
+			oArgs.httpbase = HOST_BOSH;
+		
+		// We create the new http-binding connection
+		con = new JSJaCHttpBindingConnection(oArgs);
+		
+		// And we handle everything that happen
+		setupConMini(con);
+		
+		// Generate a resource
+		var random_resource = getDB('jappix-mini', 'resource');
+		
+		if(!random_resource)
+			random_resource = MINI_RESOURCE + ' (' + (new Date()).getTime() + ')';
+		
+		// We retrieve what the user typed in the login inputs
+		oArgs = new Object();
+		oArgs.secure = true;
+		oArgs.xmllang = XML_LANG;
+		oArgs.resource = random_resource;
+		oArgs.domain = domain;
+		
+		// Store the resource (for reconnection)
+		setDB('jappix-mini', 'resource', random_resource);
+		
+		// Anonymous login?
+		if(MINI_ANONYMOUS) {
+			// Anonymous mode disabled?
+			if(!allowedAnonymous()) {
+				logThis('Not allowed to use anonymous mode.', 2);
+				
+				// Notify this error
+				notifyErrorMini();
+				
+				return false;
+			}
+			
+			// Bad domain?
+			else if(lockHost() && (domain != HOST_ANONYMOUS)) {
+				logThis('Not allowed to connect to this anonymous domain: ' + domain, 2);
+				
+				// Notify this error
+				notifyErrorMini();
+				
+				return false;
+			}
+			
+			oArgs.authtype = 'saslanon';
+		}
+		
+		// Normal login
+		else {
+			// Bad domain?
+			if(lockHost() && (domain != HOST_MAIN)) {
+				logThis('Not allowed to connect to this main domain: ' + domain, 2);
+				
+				// Notify this error
+				notifyErrorMini();
+				
+				return false;
+			}
+			
+			// No nickname?
+			if(!MINI_NICKNAME)
+				MINI_NICKNAME = user;
+			
+			oArgs.username = user;
+			oArgs.pass = password;
+		}
+		
+		// We connect !
+		con.connect(oArgs);
+		
+		logThis('Jappix Mini is connecting...', 3);
+	}
+	
+	catch(e) {
+		// Logs errors
+		logThis('Error while logging in: ' + e, 1);
+		
+		// Reset Jappix Mini
+		disconnectedMini();
+	}
+	
+	finally {
+		return false;
+	}
+}
+
+// When the user is connected
+function connectedMini() {
+	// Update the roster
+	jQuery('#jappix_mini a.jm_pane.jm_button span.jm_counter').text('0');
+	
+	// Do not get the roster if anonymous
+	if(MINI_ANONYMOUS)
+		initializeMini();
+	else
+		getRosterMini();
+	
+	// For logger
+	if(MINI_RECONNECT)
+		logThis('Jappix Mini is now reconnected.', 3);
+	else
+		logThis('Jappix Mini is now connected.', 3);
+	
+	// Reset reconnect var
+	MINI_RECONNECT = 0;
+}
+
+// When the user disconnects
+function saveSessionMini() {
+	// Not connected?
+	if(!isConnected())
+		return;
+	
+	// Save the actual Jappix Mini DOM
+	setDB('jappix-mini', 'dom', jQuery('#jappix_mini').html());
+	setDB('jappix-mini', 'nickname', MINI_NICKNAME);
+	
+	// Save the scrollbar position
+	var scroll_position = '';
+	var scroll_hash = jQuery('#jappix_mini div.jm_conversation:has(a.jm_pane.jm_clicked)').attr('data-hash');
+	
+	if(scroll_hash)
+		scroll_position = document.getElementById('received-' + scroll_hash).scrollTop + '';
+	
+	setDB('jappix-mini', 'scroll', scroll_position);
+	
+	// Save the session stamp
+	setDB('jappix-mini', 'stamp', getTimeStamp());
+	
+	// Suspend connection
+	con.suspend(false);
+	
+	logThis('Jappix Mini session save tool launched.', 3);
+}
+
+// Disconnects the connected user
+function disconnectMini() {
+	// No connection?
+	if(!isConnected())
+		return false;
+	
+	// Change markers
+	MINI_DISCONNECT = true;
+	MINI_INITIALIZED = false;
+	
+	// Add disconnection handler
+	con.registerHandler('ondisconnect', disconnectedMini);
+	
+	// Disconnect the user
+	con.disconnect();
+	
+	logThis('Jappix Mini is disconnecting...', 3);
+	
+	return false;
+}
+
+// When the user is disconnected
+function disconnectedMini() {
+	// Remove the stored items
+	removeDB('jappix-mini', 'dom');
+	removeDB('jappix-mini', 'nickname');
+	removeDB('jappix-mini', 'scroll');
+	removeDB('jappix-mini', 'stamp');
+	
+	// Connection error?
+	if(!MINI_DISCONNECT || MINI_INITIALIZED) {
+		// Browser error?
+		notifyErrorMini();
+		
+		// Reset reconnect timer
+		jQuery('#jappix_mini').stopTime();
+		
+		// Try to reconnect after a while
+		if(MINI_INITIALIZED && (MINI_RECONNECT < 5)) {
+			// Reconnect interval
+			var reconnect_interval = 10;
+			
+			if(MINI_RECONNECT)
+				reconnect_interval = (5 + (5 * MINI_RECONNECT)) * 1000;
+			
+			MINI_RECONNECT++;
+			
+			// Set timer
+			jQuery('#jappix_mini').oneTime(reconnect_interval, function() {
+				launchMini(true, MINI_SHOWPANE, MINI_DOMAIN, MINI_USER, MINI_PASSWORD);
+			});
+		}
+	}
+	
+	// Normal disconnection?
+	else
+		launchMini(false, MINI_SHOWPANE, MINI_DOMAIN, MINI_USER, MINI_PASSWORD);
+	
+	// Reset markers
+	MINI_DISCONNECT = false;
+	MINI_INITIALIZED = false;
+	
+	logThis('Jappix Mini is now disconnected.', 3);
+}
+
+// Handles the incoming messages
+function handleMessageMini(msg) {
+	var type = msg.getType();
+	
+	// This is a message Jappix can handle
+	if((type == 'chat') || (type == 'normal') || (type == 'groupchat') || !type) {
+		// Get the body
+		var body = trim(msg.getBody());
+		
+		// Any subject?
+		var subject = trim(msg.getSubject());
+		
+		if(subject)
+			body = subject;
+		
+		if(body) {
+			// Get the values
+			var from = fullXID(getStanzaFrom(msg));
+			var xid = bareXID(from);
+			var use_xid = xid;
+			var hash = hex_md5(xid);
+			var nick = thisResource(from);
+			
+			// Read the delay
+			var delay = readMessageDelay(msg.getNode());
+			var d_stamp;
+			
+			// Manage this delay
+			if(delay) {
+				time = relativeDate(delay);
+				d_stamp = Date.jab2date(delay);
+			}
+			
+			else {
+				time = getCompleteTime();
+				d_stamp = new Date();
+			}
+			
+			// Get the stamp
+			var stamp = extractStamp(d_stamp);
+			
+			// Is this a groupchat private message?
+			if(exists('#jappix_mini #chat-' + hash + '[data-type=groupchat]')) {
+				// Regenerate some stuffs
+				if((type == 'chat') || !type) {
+					xid = from;
+					hash = hex_md5(xid);
+				}
+				
+				// XID to use for a groupchat
+				else
+					use_xid = from;
+			}
+			
+			// Message type
+			var message_type = 'user-message';
+			
+			// Grouphat values
+			if(type == 'groupchat') {
+				// Old message
+				if(msg.getChild('delay', NS_URN_DELAY) || msg.getChild('x', NS_DELAY))
+					message_type = 'old-message';
+				
+				// System message?
+				if(!nick || subject) {
+					nick = '';
+					message_type = 'system-message';
+				}
+			}
+			
+			// Chat values
+			else {
+				nick = jQuery('#jappix_mini a#friend-' + hash).text().revertHtmlEnc();
+				
+				// No nickname?
+				if(!nick)
+					nick = getXIDNick(xid);
+			}
+			
+			// Define the target div
+			var target = '#jappix_mini #chat-' + hash;
+			
+			// Create the chat if it does not exist
+			if(!exists(target) && (type != 'groupchat'))
+				chatMini(type, xid, nick, hash);
+			
+			// Display the message
+			displayMessageMini(type, body, use_xid, nick, hash, time, stamp, message_type);
+			
+			// Notify the user if not focused & the message is not a groupchat old one
+			if((!jQuery(target + ' a.jm_chat-tab').hasClass('jm_clicked') || !isFocused()) && (message_type == 'user-message'))
+				notifyMessageMini(hash);
+			
+			logThis('Message received from: ' + from);
+		}
+	}
+}
+
+// Handles the incoming IQs
+function handleIQMini(iq) {
+	// Define some variables
+	var iqFrom = fullXID(getStanzaFrom(iq));
+	var iqID = iq.getID();
+	var iqQueryXMLNS = iq.getQueryXMLNS();
+	var iqType = iq.getType();
+	var iqNode = iq.getNode();
+	
+	// Build the response
+	var iqResponse = new JSJaCIQ();
+	
+	iqResponse.setID(iqID);
+	iqResponse.setTo(iqFrom);
+	iqResponse.setType('result');
+	
+	// Software version query
+	if((iqQueryXMLNS == NS_VERSION) && (iqType == 'get')) {
+		/* REF: http://xmpp.org/extensions/xep-0092.html */
+		
+		var iqQuery = iqResponse.setQuery(NS_VERSION);
+		
+		iqQuery.appendChild(iq.buildNode('name', {'xmlns': NS_VERSION}, 'Jappix Mini'));
+		iqQuery.appendChild(iq.buildNode('version', {'xmlns': NS_VERSION}, JAPPIX_VERSION));
+		iqQuery.appendChild(iq.buildNode('os', {'xmlns': NS_VERSION}, BrowserDetect.OS));
+		
+		con.send(iqResponse);
+		
+		logThis('Received software version query: ' + iqFrom);
+	}
+	
+	// Roster push
+	else if((iqQueryXMLNS == NS_ROSTER) && (iqType == 'set')) {
+		// Display the friend
+		handleRosterMini(iq);
+		
+		con.send(iqResponse);
+		
+		logThis('Received a roster push.');
+	}
+	
+	// Disco info query
+	else if((iqQueryXMLNS == NS_DISCO_INFO) && (iqType == 'get')) {
+		/* REF: http://xmpp.org/extensions/xep-0030.html */
+		
+		var iqQuery = iqResponse.setQuery(NS_DISCO_INFO);
+		
+		// We set the name of the client
+		iqQuery.appendChild(iq.appendNode('identity', {
+			'category': 'client',
+			'type': 'web',
+			'name': 'Jappix Mini',
+			'xmlns': NS_DISCO_INFO
+		}));
+		
+		// We set all the supported features
+		var fArray = new Array(
+			NS_DISCO_INFO,
+			NS_VERSION,
+			NS_ROSTER,
+			NS_MUC,
+			NS_VERSION,
+			NS_URN_TIME
+		);
+		
+		for(i in fArray)
+			iqQuery.appendChild(iq.buildNode('feature', {'var': fArray[i], 'xmlns': NS_DISCO_INFO}));
+		
+		con.send(iqResponse);
+		
+		logThis('Received a disco#infos query.');
+	}
+	
+	// User time query
+	else if(jQuery(iqNode).find('time').size() && (iqType == 'get')) {
+		/* REF: http://xmpp.org/extensions/xep-0202.html */
+		
+		var iqTime = iqResponse.appendNode('time', {'xmlns': NS_URN_TIME});
+		iqTime.appendChild(iq.buildNode('tzo', {'xmlns': NS_URN_TIME}, getDateTZO()));
+		iqTime.appendChild(iq.buildNode('utc', {'xmlns': NS_URN_TIME}, getXMPPTime('utc')));
+		
+		con.send(iqResponse);
+		
+		logThis('Received local time query: ' + iqFrom);
+	}
+}
+
+// Handles the incoming errors
+function handleErrorMini(err) {
+	// First level error (connection error)
+	if(jQuery(err).is('error')) {
+		// Notify this error
+		disconnectedMini();
+		
+		logThis('First level error received.', 1);
+	}
+}
+
+// Handles the incoming presences
+function handlePresenceMini(pr) {
+	// Get the values
+	var from = fullXID(getStanzaFrom(pr));
+	var xid = bareXID(from);
+	var resource = thisResource(from);
+	var hash = hex_md5(xid);
+	var type = pr.getType();
+	var show = pr.getShow();
+	
+	// Manage the received presence values
+	if((type == 'error') || (type == 'unavailable'))
+		show = 'unavailable';
+	
+	else {
+		switch(show) {
+			case 'chat':
+			case 'away':
+			case 'xa':
+			case 'dnd':
+				break;
+			
+			default:
+				show = 'available';
+				
+				break;
+		}
+	}
+	
+	// Is this a groupchat presence?
+	var groupchat_path = '#jappix_mini #chat-' + hash + '[data-type=groupchat]';
+	
+	if(exists(groupchat_path)) {
+		// Groupchat buddy presence (not me)
+		if(resource != unescape(jQuery(groupchat_path).attr('data-nick'))) {
+			// Regenerate some stuffs
+			var groupchat = xid;
+			xid = from;
+			hash = hex_md5(xid);
+			
+			// Remove this from the roster
+			if(show == 'unavailable')
+				removeBuddyMini(hash, groupchat);
+			
+			// Add this to the roster
+			else
+				addBuddyMini(xid, hash, resource, groupchat);
+		}
+	}
+	
+	// Friend path
+	var chat = '#jappix_mini #chat-' + hash;
+	var friend = '#jappix_mini a#friend-' + hash;
+	var send_input = chat + ' input.jm_send-messages';
+	
+	// Is this friend online?
+	if(show == 'unavailable') {
+		// Offline marker
+		jQuery(friend).addClass('jm_offline').removeClass('jm_online');
+		
+		// Disable the chat tools
+		jQuery(chat).addClass('jm_disabled');
+		jQuery(send_input).attr('disabled', true).attr('data-value', _e("Unavailable")).val(_e("Unavailable"));
+	}
+	
+	else {
+		// Online marker
+		jQuery(friend).removeClass('jm_offline').addClass('jm_online');
+		
+		// Enable the chat input
+		jQuery(chat).removeClass('jm_disabled');
+		jQuery(send_input).removeAttr('disabled').val('');
+	}
+	
+	// Change the show presence of this buddy
+	jQuery(friend + ' span.jm_presence, ' + chat + ' span.jm_presence').attr('class', 'jm_presence jm_images jm_' + show);
+	
+	// Update the presence counter
+	updateRosterMini();
+	
+	logThis('Presence received from: ' + from);
+}
+
+// Handles the MUC main elements
+function handleMUCMini(pr) {
+	// We get the xml content
+	var xml = pr.getNode();
+	var from = fullXID(getStanzaFrom(pr));
+	var room = bareXID(from);
+	var hash = hex_md5(room);
+	var resource = thisResource(from);
+	
+	// Is it a valid server presence?
+	var valid = false;
+	
+	if(!resource || (resource == unescape(jQuery('#jappix_mini #chat-' + hash + '[data-type=groupchat]').attr('data-nick'))))
+		valid = true;
+	
+	// Password required?
+	if(valid && jQuery(xml).find('error[type=auth] not-authorized').size()) {
+		// Create a new prompt
+		openPromptMini(printf(_e("This room (%s) is protected with a password."), room));
+		
+		// When prompt submitted
+		jQuery('#jappix_popup div.jm_prompt form').submit(function() {
+			try {
+				// Read the value
+				var password = closePromptMini();
+				
+				// Any submitted chat to join?
+				if(password) {
+					// Send the password
+					presenceMini('', '', '', '', from, password, true, handleMUCMini);
+					
+					// Focus on the pane again
+					switchPaneMini('chat-' + hash, hash);
+				}
+			}
+			
+			catch(e) {}
+			
+			finally {
+				return false;
+			}
+		});
+		
+		return;
+	}
+	
+	// Nickname conflict?
+	else if(valid && jQuery(xml).find('error[type=cancel] conflict').size()) {
+		// New nickname
+		var nickname = resource + '_';
+		
+		// Send the new presence
+		presenceMini('', '', '', '', room + '/' + nickname, '', true, handleMUCMini);
+		
+		// Update the nickname marker
+		jQuery('#jappix_mini #chat-' + hash).attr('data-nick', escape(nickname));
+	}
+	
+	// Handle normal presence
+	else
+		handlePresenceMini(pr);
+}
+
+// Updates the user presence
+function presenceMini(type, show, priority, status, to, password, limit_history, handler) {
+	var pr = new JSJaCPresence();
+	
+	// Add the attributes
+	if(to)
+		pr.setTo(to);
+	if(type)
+		pr.setType(type);
+	if(show)
+		pr.setShow(show);
+	if(priority)
+		pr.setPriority(priority);
+	if(status)
+		pr.setStatus(status);
+	
+	// Special presence elements
+	if(password || limit_history) {
+		var x = pr.appendNode('x', {'xmlns': NS_MUC});
+		
+		// Any password?
+		if(password)
+			x.appendChild(pr.buildNode('password', {'xmlns': NS_MUC}, password));
+		
+		// Any history limit?
+		if(limit_history)
+			x.appendChild(pr.buildNode('history', {'maxstanzas': 10, 'seconds': 86400, 'xmlns': NS_MUC}));
+	}
+	
+	// Send the packet
+	if(handler)
+		con.send(pr, handler);
+	else
+		con.send(pr);
+	
+	// No type?
+	if(!type)
+		type = 'available';
+	
+	logThis('Presence sent: ' + type, 3);
+}
+
+// Sends a given message
+function sendMessageMini(aForm) {
+	try {
+		var body = trim(aForm.body.value);
+		var xid = aForm.xid.value;
+		var type = aForm.type.value;
+		var hash = hex_md5(xid);
+		
+		if(body && xid) {
+			// Send the message
+			var aMsg = new JSJaCMessage();
+			
+			aMsg.setTo(xid);
+			aMsg.setType(type);
+			aMsg.setBody(body);
+			
+			con.send(aMsg);
+			
+			// Clear the input
+			aForm.body.value = '';
+			
+			// Display the message we sent
+			if(type != 'groupchat')
+				displayMessageMini(type, body, getXID(), 'me', hash, getCompleteTime(), getTimeStamp(), 'user-message');
+			
+			logThis('Message (' + type + ') sent to: ' + xid);
+		}
+	}
+	
+	catch(e) {}
+	
+	finally {
+		return false;
+	}
+}
+
+// Generates the asked smiley image
+function smileyMini(image, text) {
+	return ' <img class="jm_smiley jm_smiley-' + image + ' jm_images" alt="' + encodeQuotes(text) + '" src="' + JAPPIX_STATIC + 'php/get.php?t=img&amp;f=others/blank.gif" /> ';
+}
+
+// Notifies incoming chat messages
+function notifyMessageMini(hash) {
+	// Define the paths
+	var tab = '#jappix_mini #chat-' + hash + ' a.jm_chat-tab';
+	var notify = tab + ' span.jm_notify';
+	var notify_middle = notify + ' span.jm_notify_middle';
+	
+	// Notification box not yet added
+	if(!exists(notify))
+		jQuery(tab).append(
+			'<span class="jm_notify">' + 
+				'<span class="jm_notify_left jm_images"></span>' + 
+				'<span class="jm_notify_middle">0</span>' + 
+				'<span class="jm_notify_right jm_images"></span>' + 
+			'</span>'
+		);
+	
+	// Increment the notification number
+	var number = parseInt(jQuery(notify_middle).text());
+	jQuery(notify_middle).text(number + 1);
+	
+	// Change the page title
+	notifyTitleMini();
+}
+
+// Notifies the user from a session error
+function notifyErrorMini() {
+	// Replace the Jappix Mini DOM content
+	jQuery('#jappix_mini').html(
+		'<div class="jm_starter">' + 
+			'<a class="jm_pane jm_button jm_images" href="https://mini.jappix.com/issues" target="_blank" title="' + _e("Click here to solve the error") + '">' + 
+				'<span class="jm_counter jm_error jm_images">' + _e("Error") + '</span>' + 
+			'</a>' + 
+		'</div>'
+	);
+}
+
+// Updates the page title with the new notifications
+function notifyTitleMini() {
+	// No saved title? Abort!
+	if(MINI_TITLE == null)
+		return false;
+	
+	// Page title code
+	var title = MINI_TITLE;
+	
+	// Count the number of notifications
+	var number = 0;
+	
+	jQuery('#jappix_mini span.jm_notify span.jm_notify_middle').each(function() {
+		number = number + parseInt(jQuery(this).text());
+	});
+	
+	// No new stuffs? Reset the title!
+	if(number)
+		title = '[' + number + '] ' + title;
+	
+	// Apply the title
+	document.title = title;
+	
+	return true;
+}
+
+// Clears the notifications
+function clearNotificationsMini(hash) {
+	// Not focused?
+	if(!isFocused())
+		return false;
+	
+	// Remove the notifications counter
+	jQuery('#jappix_mini #chat-' + hash + ' span.jm_notify').remove();
+	
+	// Update the page title
+	notifyTitleMini();
+	
+	return true;
+}
+
+// Updates the roster counter
+function updateRosterMini() {
+	jQuery('#jappix_mini a.jm_button span.jm_counter').text(jQuery('#jappix_mini a.jm_online').size());
+}
+
+// Creates the Jappix Mini DOM content
+function createMini(domain, user, password) {
+	// Try to restore the DOM
+        var dom = getDB('jappix-mini', 'dom');
+        var stamp = parseInt(getDB('jappix-mini', 'stamp'));
+	var suspended = false;
+	
+	// Invalid stored DOM?
+	if(dom && isNaN(jQuery(dom).find('a.jm_pane.jm_button span.jm_counter').text()))
+		dom = null;
+	
+	// Can resume a session?
+	con = new JSJaCHttpBindingConnection();
+	setupConMini(con);
+	
+	// Old DOM?
+	if(dom && ((getTimeStamp() - stamp) < JSJACHBC_MAX_WAIT) && con.resume()) {
+		// Read the old nickname
+		MINI_NICKNAME = getDB('jappix-mini', 'nickname');
+		
+		// Marker
+		suspended = true;
+	}
+	
+	// New DOM?
+	else {
+		dom =   '<div class="jm_position">' + 
+				'<div class="jm_conversations"></div>' + 
+				
+				'<div class="jm_starter">' + 
+					'<div class="jm_roster">' + 
+						'<div class="jm_actions">' + 
+							'<a class="jm_logo jm_images" href="https://mini.jappix.com/" target="_blank"></a>' + 
+							'<a class="jm_one-action jm_join jm_images" title="' + _e("Join a chat") + '" href="#"></a>' + 
+						'</div>' + 
+						
+						'<div class="jm_buddies"></div>' + 
+					'</div>' + 
+					
+					'<a class="jm_pane jm_button jm_images" href="#">' + 
+						'<span class="jm_counter jm_images">' + _e("Please wait...") + '</span>' + 
+					'</a>' + 
+				'</div>' + 
+			'</div>';
+	}
+	
+	// Create the DOM
+	jQuery('body').append('<div id="jappix_mini">' + dom + '</div>');
+	
+	// Adapt roster height
+	adaptRosterMini();
+	
+	// The click events
+	jQuery('#jappix_mini a.jm_button').click(function() {
+		// Using a try/catch override IE issues
+		try {
+			// Presence counter
+			var counter = '#jappix_mini a.jm_pane.jm_button span.jm_counter';
+			
+			// Cannot open the roster?
+			if(jQuery(counter).text() == _e("Please wait..."))
+				return false;
+			
+			// Not yet connected?
+			if(jQuery(counter).text() == _e("Chat")) {
+				// Remove the animated bubble
+				jQuery('#jappix_mini div.jm_starter span.jm_animate').stopTime().remove();
+				
+				// Add a waiting marker
+				jQuery(counter).text(_e("Please wait..."));
+				
+				// Launch the connection!
+				connectMini(domain, user, password);
+				
+				return false;
+			}
+			
+			// Normal actions
+			if(!jQuery(this).hasClass('jm_clicked'))
+				showRosterMini();
+			else
+				hideRosterMini();
+		}
+		
+		catch(e) {}
+		
+		finally {
+			return false;
+		}
+	});
+	
+	jQuery('#jappix_mini div.jm_actions a.jm_join').click(function() {
+		// Using a try/catch override IE issues
+		try {
+			// Create a new prompt
+			openPromptMini(_e("Please enter the group chat address to join."));
+			
+			// When prompt submitted
+			jQuery('#jappix_popup div.jm_prompt form').submit(function() {
+				try {
+					// Read the value
+					var join_this = closePromptMini();
+					
+					// Any submitted chat to join?
+					if(join_this) {
+						// Get the chat room to join
+						chat_room = bareXID(generateXID(join_this, 'groupchat'));
+						
+						// Create a new groupchat
+						chatMini('groupchat', chat_room, getXIDNick(chat_room), hex_md5(chat_room));
+					}
+				}
+				
+				catch(e) {}
+				
+				finally {
+					return false;
+				}
+			});
+		}
+		
+		catch(e) {}
+		
+		finally {
+			return false;
+		}
+	});
+	
+	// Hides the roster when clicking away of Jappix Mini
+	jQuery(document).click(function(evt) {
+		if(!jQuery(evt.target).parents('#jappix_mini').size() && !exists('#jappix_popup'))
+			hideRosterMini();
+	});
+	
+	// Hides all panes double clicking away of Jappix Mini
+	jQuery(document).dblclick(function(evt) {
+		if(!jQuery(evt.target).parents('#jappix_mini').size() && !exists('#jappix_popup'))
+			switchPaneMini();
+	});
+	
+	// Suspended session resumed?
+	if(suspended) {
+		// Initialized marker
+		MINI_INITIALIZED = true;
+		
+		// Restore chat input values
+		jQuery('#jappix_mini div.jm_conversation input.jm_send-messages').each(function() {
+			var chat_value = jQuery(this).attr('data-value');
+			
+			if(chat_value)
+				jQuery(this).val(chat_value);
+		});
+		
+		// Restore buddy click events
+		jQuery('#jappix_mini a.jm_friend').click(function() {
+			// Using a try/catch override IE issues
+			try {
+				chatMini('chat', unescape(jQuery(this).attr('data-xid')), unescape(jQuery(this).attr('data-nick')), jQuery(this).attr('data-hash'));
+			}
+			
+			catch(e) {}
+			
+			finally {
+				return false;
+			}
+		});
+		
+		// Restore chat click events
+		jQuery('#jappix_mini div.jm_conversation').each(function() {
+			chatEventsMini(jQuery(this).attr('data-type'), unescape(jQuery(this).attr('data-xid')), jQuery(this).attr('data-hash'));
+		});
+		
+		// Scroll down to the last message
+		var scroll_hash = jQuery('#jappix_mini div.jm_conversation:has(a.jm_pane.jm_clicked)').attr('data-hash');
+		var scroll_position = getDB('jappix-mini', 'scroll');
+		
+		// Any scroll position?
+		if(scroll_position)
+			scroll_position = parseInt(scroll_position);
+		
+		if(scroll_hash) {
+			// Use a timer to override the DOM lag issue
+			jQuery(document).oneTime(200, function() {
+				messageScrollMini(scroll_hash, scroll_position);
+			});
+		}
+		
+		// Update title notifications
+		notifyTitleMini();
+	}
+	
+	// Can auto-connect?
+	else if(MINI_AUTOCONNECT)
+		connectMini(domain, user, password);
+	
+	// Cannot auto-connect?
+	else {
+		// Chat text
+		jQuery('#jappix_mini a.jm_pane.jm_button span.jm_counter').text(_e("Chat"));
+		
+		// Must animate?
+		if(MINI_ANIMATE) {
+			// Add content
+			jQuery('#jappix_mini div.jm_starter').prepend(
+				'<span class="jm_animate jm_images_animate"></span>'
+			);
+			
+			// IE6 makes the image blink when animated...
+			if((BrowserDetect.browser == 'Explorer') && (BrowserDetect.version < 7))
+				return;
+			
+			// Add timers
+			var anim_i = 0;
+			
+			jQuery('#jappix_mini div.jm_starter span.jm_animate').everyTime(10, function() {
+				// Next
+				anim_i++;
+				
+				// Margins
+				var m_top = Math.cos(anim_i * 0.02) * 3;
+				var m_left = Math.sin(anim_i * 0.02) * 3;
+				
+				// Apply new position!
+				jQuery(this).css('margin-top', m_top + 'px')
+				            .css('margin-left', m_left + 'px');
+			});
+		}
+	}
+}
+
+// Displays a given message
+function displayMessageMini(type, body, xid, nick, hash, time, stamp, message_type) {
+	// Generate path
+	var path = '#chat-' + hash;
+	
+	// Can scroll?
+	var cont_scroll = document.getElementById('received-' + hash);
+	var can_scroll = false;
+	
+	if(!cont_scroll.scrollTop || ((cont_scroll.clientHeight + cont_scroll.scrollTop) == cont_scroll.scrollHeight))
+		can_scroll = true;
+	
+	// Remove the previous message border if needed
+	var last = jQuery(path + ' div.jm_group:last');
+	var last_stamp = parseInt(last.attr('data-stamp'));
+	var last_b = jQuery(path + ' b:last');
+	var last_xid = last_b.attr('data-xid');
+	var last_type = last.attr('data-type');
+	var grouped = false;
+	var header = '';
+	
+	if((last_xid == xid) && (message_type == last_type) && ((stamp - last_stamp) <= 1800))
+		grouped = true;
+	
+	else {
+		// Write the message date
+		if(nick)
+			header += '<span class="jm_date">' + time + '</span>';
+		
+		// Write the buddy name at the top of the message group
+		if(type == 'groupchat')
+			header += '<b style="color: ' + generateColor(nick) + ';" data-xid="' + encodeQuotes(xid) + '">' + nick.htmlEnc() + '</b>';
+		else if(nick == 'me')
+			header += '<b class="jm_me" data-xid="' + encodeQuotes(xid) + '">' + _e("You") + '</b>';
+		else
+			header += '<b class="jm_him" data-xid="' + encodeQuotes(xid) + '">' + nick.htmlEnc() + '</b>';
+	}
+	
+	// Apply the /me command
+	var me_command = false;
+	
+	if(body.match(/^\/me /i)) {
+		body = body.replace(/^\/me /i, nick + ' ');
+		
+		// Marker
+		me_command = true;
+	}
+	
+	// HTML-encode the message
+	body = body.htmlEnc();
+	
+	// Apply the smileys
+	body = body.replace(/(;-?\))(\s|$)/gi, smileyMini('wink', '$1'))
+	           .replace(/(:-?3)(\s|$)/gi, smileyMini('waii', '$1'))
+	           .replace(/(:-?\()(\s|$)/gi, smileyMini('unhappy', '$1'))
+	           .replace(/(:-?P)(\s|$)/gi, smileyMini('tongue', '$1'))
+	           .replace(/(:-?O)(\s|$)/gi, smileyMini('surprised', '$1'))
+	           .replace(/(:-?\))(\s|$)/gi, smileyMini('smile', '$1'))
+	           .replace(/(\^_?\^)(\s|$)/gi, smileyMini('happy', '$1'))
+	           .replace(/(:-?D)(\s|$)/gi, smileyMini('grin', '$1'));
+	
+	// Filter the links
+	body = applyLinks(body, 'mini');
+	
+	// Generate the message code
+	if(me_command)
+		body = '<em>' + body + '</em>';
+	
+	body = '<p>' + body + '</p>';
+	
+	// Create the message
+	if(grouped)
+		jQuery('#jappix_mini #chat-' + hash + ' div.jm_received-messages div.jm_group:last').append(body);
+	else
+		jQuery('#jappix_mini #chat-' + hash + ' div.jm_received-messages').append('<div class="jm_group jm_' + message_type + '" data-type="' + message_type + '" data-stamp="' + stamp + '">' + header + body + '</div>');
+	
+	// Scroll to this message
+	if(can_scroll)
+		messageScrollMini(hash);
+}
+
+// Switches to a given point
+function switchPaneMini(element, hash) {
+	// Hide every item
+	jQuery('#jappix_mini a.jm_pane').removeClass('jm_clicked');
+	jQuery('#jappix_mini div.jm_roster, #jappix_mini div.jm_chat-content').hide();
+	
+	// Show the asked element
+	if(element && (element != 'roster')) {
+		var current = '#jappix_mini #' + element;
+		
+		jQuery(current + ' a.jm_pane').addClass('jm_clicked');
+		jQuery(current + ' div.jm_chat-content').show();
+		
+		// Use a timer to override the DOM lag issue
+		jQuery(document).oneTime(10, function() {
+			jQuery(current + ' input.jm_send-messages').focus();
+		});
+		
+		// Scroll to the last message
+		if(hash)
+			messageScrollMini(hash);
+	}
+}
+
+// Scrolls to the last chat message
+function messageScrollMini(hash, position) {
+	var id = document.getElementById('received-' + hash);
+	
+	// No defined position?
+	if(!position)
+		position = id.scrollHeight;
+	
+	id.scrollTop = position;
+}
+
+// Prompts the user with a given text
+function openPromptMini(text, value) {
+	// Initialize
+	var prompt = '#jappix_popup div.jm_prompt';
+	var input = prompt + ' form input';
+	var value_input = input + '[type=text]';
+	
+	// Remove the existing prompt
+	closePromptMini();
+	
+	// Add the prompt
+	jQuery('body').append(
+		'<div id="jappix_popup">' + 
+			'<div class="jm_prompt">' + 
+				'<form>' + 
+					text + 
+					'<input class="jm_text" type="text" value="" />' + 
+					'<input class="jm_submit" type="submit" value="' + _e("Submit") + '" />' + 
+					'<input class="jm_submit" type="reset" value="' + _e("Cancel") + '" />' + 
+					'<div class="jm_clear"></div>' + 
+				'</form>' + 
+			'</div>' + 
+		'</div>'
+	);
+	
+	// Vertical center
+	var vert_pos = '-' + ((jQuery(prompt).height() / 2) + 10) + 'px';
+	jQuery(prompt).css('margin-top', vert_pos);
+	
+	// Apply the value?
+	if(value)
+		jQuery(value_input).val(value);
+	
+	// Focus on the input
+	jQuery(document).oneTime(10, function() {
+		jQuery(value_input).focus();
+	});
+	
+	// Cancel event
+	jQuery(input + '[type=reset]').click(function() {
+		try {
+			closePromptMini();
+		}
+		
+		catch(e) {}
+		
+		finally {
+			return false;
+		}
+	});
+}
+
+// Returns the prompt value
+function closePromptMini() {
+	// Read the value
+	var value = jQuery('#jappix_popup div.jm_prompt form input').val();
+	
+	// Remove the popup
+	jQuery('#jappix_popup').remove();
+	
+	return value;
+}
+
+// Manages and creates a chat
+function chatMini(type, xid, nick, hash, pwd, show_pane) {
+	var current = '#jappix_mini #chat-' + hash;
+	
+	// Not yet added?
+	if(!exists(current)) {
+		// Groupchat nickname
+		if(type == 'groupchat') {
+			var nickname = MINI_NICKNAME;
+			
+			// No nickname?
+			if(!nickname) {
+				// Create a new prompt
+				openPromptMini(printf(_e("Please enter your nickname to join %s."), xid));
+				
+				// When prompt submitted
+				jQuery('#jappix_popup div.jm_prompt form').submit(function() {
+					try {
+						// Read the value
+						var nickname = closePromptMini();
+						
+						// Update the stored one
+						if(nickname)
+							MINI_NICKNAME = nickname;
+						
+						// Launch it again!
+						chatMini(type, xid, nick, hash, pwd);
+					}
+					
+					catch(e) {}
+					
+					finally {
+						return false;
+					}
+				});
+				
+				return;
+			}
+		}
+		
+		// Create the HTML markup
+		var html = '<div class="jm_conversation jm_type_' + type + '" id="chat-' + hash + '" data-xid="' + escape(xid) + '" data-type="' + type + '" data-nick="' + escape(nick) + '" data-hash="' + hash + '" data-origin="' + escape(cutResource(xid)) + '">' + 
+				'<div class="jm_chat-content">' + 
+					'<div class="jm_actions">' + 
+						'<span class="jm_nick">' + nick + '</span>';
+		
+		// Check if the groupchat exists
+		var groupchat_exists = false;
+		
+		if(MINI_GROUPCHATS && MINI_GROUPCHATS.length) {
+			for(g in MINI_GROUPCHATS) {
+				if(xid == bareXID(generateXID(MINI_GROUPCHATS[g], 'groupchat'))) {
+					groupchat_exists = true;
+					
+					break;
+				}
+			}
+		}
+		
+		// Any close button to display?
+		if(((type == 'groupchat') && !groupchat_exists) || (type != 'groupchat'))
+			html += '<a class="jm_one-action jm_close jm_images" title="' + _e("Close") + '" href="#"></a>';
+		
+		html += '</div>' + 
+			
+			'<div class="jm_received-messages" id="received-' + hash + '"></div>' + 
+				'<form action="#" method="post">' + 
+					'<input type="text" class="jm_send-messages" name="body" autocomplete="off" />' + 
+					'<input type="hidden" name="xid" value="' + xid + '" />' + 
+					'<input type="hidden" name="type" value="' + type + '" />' + 
+				'</form>' + 
+			'</div>' + 
+			
+			'<a class="jm_pane jm_chat-tab jm_images" href="#">' + 
+				'<span class="jm_name">' + nick.htmlEnc() + '</span>' + 
+			'</a>' + 
+		'</div>';
+		
+		jQuery('#jappix_mini div.jm_conversations').prepend(html);
+		
+		// Get the presence of this friend
+		if(type != 'groupchat') {
+			var selector = jQuery('#jappix_mini a#friend-' + hash + ' span.jm_presence');
+			
+			// Default presence
+			var show = 'available';
+			
+			// Read the presence
+			if(selector.hasClass('jm_unavailable'))
+				show = 'unavailable';
+			else if(selector.hasClass('jm_chat'))
+				show = 'chat';
+			else if(selector.hasClass('jm_away'))
+				show = 'away';
+			else if(selector.hasClass('jm_xa'))
+				show = 'xa';
+			else if(selector.hasClass('jm_dnd'))
+				show = 'dnd';
+			
+			// Create the presence marker
+			jQuery(current + ' a.jm_chat-tab').prepend('<span class="jm_presence jm_images jm_' + show + '"></span>');
+		}
+		
+		// The click events
+		chatEventsMini(type, xid, hash);
+		
+		// Join the groupchat
+		if(type == 'groupchat') {
+			// Add the nickname value
+			jQuery(current).attr('data-nick', escape(nickname));
+			
+			// Send the first groupchat presence
+			presenceMini('', '', '', '', xid + '/' + nickname, pwd, true, handleMUCMini);
+		}
+	}
+	
+	// Focus on our pane
+	if(show_pane != false)
+		jQuery(document).oneTime(10, function() {
+			switchPaneMini('chat-' + hash, hash);
+		});
+	
+	return false;
+}
+
+// Events on the chat tool
+function chatEventsMini(type, xid, hash) {
+	var current = '#jappix_mini #chat-' + hash;
+	
+	// Submit the form
+	jQuery(current + ' form').submit(function() {
+		return sendMessageMini(this);
+	});
+	
+	// Click on the tab
+	jQuery(current + ' a.jm_chat-tab').click(function() {
+		// Using a try/catch override IE issues
+		try {
+			// Not yet opened: open it!
+			if(!jQuery(this).hasClass('jm_clicked')) {
+				// Show it!
+				switchPaneMini('chat-' + hash, hash);
+				
+				// Clear the eventual notifications
+				clearNotificationsMini(hash);
+			}
+			
+			// Yet opened: close it!
+			else
+				switchPaneMini();
+		}
+		
+		catch(e) {}
+		
+		finally {
+			return false;
+		}
+	});
+	
+	// Click on the close button
+	jQuery(current + ' a.jm_close').click(function() {
+		// Using a try/catch override IE issues
+		try {
+			jQuery(current).remove();
+			
+			// Quit the groupchat?
+			if(type == 'groupchat') {
+				// Send an unavailable presence
+				presenceMini('unavailable', '', '', '', xid + '/' + unescape(jQuery(current).attr('data-nick')));
+				
+				// Remove this groupchat!
+				removeGroupchatMini(xid);
+			}
+		}
+		
+		catch(e) {}
+		
+		finally {
+			return false;
+		}
+	});
+	
+	// Click on the chat content
+	jQuery(current + ' div.jm_received-messages').click(function() {
+		try {
+			jQuery(document).oneTime(10, function() {
+				jQuery(current + ' input.jm_send-messages').focus();
+			});
+		}
+		
+		catch(e) {}
+	});
+	
+	// Focus on the chat input
+	jQuery(current + ' input.jm_send-messages').focus(function() {
+		clearNotificationsMini(hash);
+	})
+	
+	// Change on the chat input
+	.keyup(function() {
+		jQuery(this).attr('data-value', jQuery(this).val());
+	});
+}
+
+// Shows the roster
+function showRosterMini() {
+	switchPaneMini('roster');
+	jQuery('#jappix_mini div.jm_roster').show();
+	jQuery('#jappix_mini a.jm_button').addClass('jm_clicked');
+}
+
+// Hides the roster
+function hideRosterMini() {
+	jQuery('#jappix_mini div.jm_roster').hide();
+	jQuery('#jappix_mini a.jm_button').removeClass('jm_clicked');
+}
+
+// Removes a groupchat from DOM
+function removeGroupchatMini(xid) {
+	// Remove the groupchat private chats & the groupchat buddies from the roster
+	jQuery('#jappix_mini div.jm_conversation[data-origin=' + escape(cutResource(xid)) + '], #jappix_mini div.jm_roster div.jm_grouped[data-xid=' + escape(xid) + ']').remove();
+	
+	// Update the presence counter
+	updateRosterMini();
+}
+
+// Initializes Jappix Mini
+function initializeMini() {
+	// Update the marker
+	MINI_INITIALIZED = true;
+	
+	// Send the initial presence
+	if(!MINI_ANONYMOUS)
+		presenceMini();
+	
+	// Join the groupchats
+	for(var i = 0; i < MINI_GROUPCHATS.length; i++) {
+		// Empty value?
+		if(!MINI_GROUPCHATS[i])
+			continue;
+		
+		// Using a try/catch override IE issues
+		try {
+			// Current chat room
+			var chat_room = bareXID(generateXID(MINI_GROUPCHATS[i], 'groupchat'));
+			
+			// Open the current chat
+			chatMini('groupchat', chat_room, getXIDNick(chat_room), hex_md5(chat_room), MINI_PASSWORDS[i], MINI_SHOWPANE);
+		}
+		
+		catch(e) {}
+	}
+	
+	// Must show the roster?
+	if(!MINI_AUTOCONNECT && !MINI_GROUPCHATS.length)
+		jQuery(document).oneTime(10, function() {
+			showRosterMini();
+		});
+}
+
+// Displays a roster buddy
+function addBuddyMini(xid, hash, nick, groupchat) {
+	// Element
+	var element = '#jappix_mini a.jm_friend#friend-' + hash;
+	
+	// Yet added?
+	if(exists(element))
+		return false;
+	
+	// Generate the path
+	var path = '#jappix_mini div.jm_roster div.jm_buddies';
+	
+	// Groupchat buddy
+	if(groupchat) {
+		// Generate the groupchat group path
+		path = '#jappix_mini div.jm_roster div.jm_grouped[data-xid=' + escape(groupchat) + ']';
+		
+		// Must add a groupchat group?
+		if(!exists(path)) {
+			jQuery('#jappix_mini div.jm_roster div.jm_buddies').append(
+				'<div class="jm_grouped" data-xid="' + escape(groupchat) + '">' + 
+					'<div class="jm_name">' + getXIDNick(groupchat).htmlEnc() + '</div>' + 
+				'</div>'
+			);
+		}
+	}
+	
+	// Append this buddy content
+	var code = '<a class="jm_friend jm_offline" id="friend-' + hash + '" data-xid="' + escape(xid) + '" data-nick="' + escape(nick) +  '" data-hash="' + hash + '" href="#"><span class="jm_presence jm_images jm_unavailable"></span>' + nick.htmlEnc() + '</a>';
+	
+	if(groupchat)
+		jQuery(path).append(code);
+	else
+		jQuery(path).prepend(code);
+	
+	// Click event on this buddy
+	jQuery(element).click(function() {
+		// Using a try/catch override IE issues
+		try {
+			chatMini('chat', xid, nick, hash);
+		}
+		
+		catch(e) {}
+		
+		finally {
+			return false;
+		}
+	});
+	
+	return true;
+}
+
+// Removes a roster buddy
+function removeBuddyMini(hash, groupchat) {
+	// Remove the buddy from the roster
+	jQuery('#jappix_mini a.jm_friend#friend-' + hash).remove();
+	
+	// Empty group?
+	var group = '#jappix_mini div.jm_roster div.jm_grouped[data-xid=' + escape(groupchat) + ']';
+	
+	if(groupchat && !jQuery(group + ' a.jm_friend').size())
+		jQuery(group).remove();
+	
+	return true;
+}
+
+// Gets the user's roster
+function getRosterMini() {
+	var iq = new JSJaCIQ();
+	iq.setType('get');
+	iq.setQuery(NS_ROSTER);
+	con.send(iq, handleRosterMini);
+	
+	logThis('Getting roster...', 3);
+}
+
+// Handles the user's roster
+function handleRosterMini(iq) {
+	// Parse the roster
+	jQuery(iq.getQuery()).find('item').each(function() {
+		// Get the values
+		var current = jQuery(this);
+		var xid = current.attr('jid');
+		var subscription = current.attr('subscription');
+		
+		// Not a gateway
+		if(!isGateway(xid)) {
+			var nick = current.attr('name');
+			var hash = hex_md5(xid);
+			
+			// No name is defined?
+			if(!nick)
+				nick = getXIDNick(xid);
+			
+			// Action on the current buddy
+			if(subscription == 'remove')
+				removeBuddyMini(hash);
+			else
+				addBuddyMini(xid, hash, nick);
+		}
+	});
+	
+	// Not yet initialized
+	if(!MINI_INITIALIZED)
+		initializeMini();
+	
+	logThis('Roster got.', 3);
+}
+
+// Adapts the roster height to the window
+function adaptRosterMini() {
+	// Process the new height
+	var height = jQuery(window).height() - 70;
+	
+	// Apply the new height
+	jQuery('#jappix_mini div.jm_roster div.jm_buddies').css('max-height', height);
+}
+
+// Addon launcher
+function launchMini(autoconnect, show_pane, domain, user, password) {
+	// Save infos to reconnect
+	MINI_DOMAIN = domain;
+	MINI_USER = user;
+	MINI_PASSWORD = password;
+	
+	// Anonymous mode?
+	if(!user || !password)
+		MINI_ANONYMOUS = true;
+	else
+		MINI_ANONYMOUS = false;
+	
+	// Autoconnect (only if storage available to avoid floods)?
+	if(autoconnect && hasDB())
+		MINI_AUTOCONNECT = true;
+	else
+		MINI_AUTOCONNECT = false;
+	
+	// Show pane?
+	if(show_pane)
+		MINI_SHOWPANE = true;
+	else
+		MINI_SHOWPANE = false;
+	
+	// Remove Jappix Mini
+	jQuery('#jappix_mini').remove();
+	
+	// Reconnect?
+	if(MINI_RECONNECT) {
+		logThis('Trying to reconnect (try: ' + MINI_RECONNECT + ')!');
+		
+		return createMini(domain, user, password);
+	}
+	
+	// Append the Mini stylesheet
+	jQuery('head').append('<link rel="stylesheet" href="' + JAPPIX_STATIC + 'php/get.php?t=css&amp;g=mini.xml" type="text/css" media="all" />');
+	
+	// Legacy IE stylesheet
+	if((BrowserDetect.browser == 'Explorer') && (BrowserDetect.version < 7))
+		jQuery('head').append('<link rel="stylesheet" href="' + JAPPIX_STATIC + 'php/get.php?t=css&amp;f=mini-ie.css" type="text/css" media="all" />');
+	
+	// Disables the browser HTTP-requests stopper
+	jQuery(document).keydown(function(e) {
+		if((e.keyCode == 27) && !isDeveloper())
+			return false;
+	});
+	
+	// Save the page title
+	MINI_TITLE = document.title;
+	
+	// Sets the good roster max-height
+	jQuery(window).resize(adaptRosterMini);
+	
+	// Logouts when Jappix is closed
+	if(BrowserDetect.browser == 'Opera') {
+		// Emulates onbeforeunload on Opera (link clicked)
+		jQuery('a[href]:not([onclick])').click(function() {
+			// Link attributes
+			var href = jQuery(this).attr('href') || '';
+			var target = jQuery(this).attr('target') || '';
+			
+			// Not new window or JS link
+			if(href && !href.match(/^#/i) && !target.match(/_blank|_new/i))
+				saveSessionMini();
+		});
+		
+		// Emulates onbeforeunload on Opera (form submitted)
+		jQuery('form:not([onsubmit])').submit(saveSessionMini);
+	}
+	
+	jQuery(window).bind('beforeunload', saveSessionMini);
+	
+	// Create the Jappix Mini DOM content
+	createMini(domain, user, password);
+	
+	logThis('Welcome to Jappix Mini! Happy coding in developer mode!');
+}
diff --git a/jappixmini/jappix/js/mobile.js b/jappixmini/jappix/js/mobile.js
new file mode 100644
index 00000000..40130a5b
--- /dev/null
+++ b/jappixmini/jappix/js/mobile.js
@@ -0,0 +1,592 @@
+/*
+
+Jappix - An open social platform
+These are the Jappix Mobile lightweight JS script
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 10/07/11
+
+*/
+
+/* BEGIN CONNECTION FUNCTIONS */
+
+function doLogin(aForm) {
+	try {
+		// Reset the panels
+		resetPanel();
+		
+		// Get the values
+		var xid = aForm.xid.value;
+		var username, domain;
+		
+		// A domain is specified
+		if(xid.indexOf('@') != -1) {
+			username = getXIDNick(xid);
+			domain = getXIDHost(xid);
+			
+			// Domain is locked and not the same
+			if((LOCK_HOST == 'on') && (domain != HOST_MAIN)) {
+				showThis('error');
+				
+				return false;
+			}
+		}
+		
+		// No "@" in the XID, we should add the default domain
+		else {
+			username = xid;
+			domain = HOST_MAIN;
+		}
+		
+		var pwd = aForm.pwd.value;
+		var reg = false;
+		
+		if(aForm.reg)
+			reg = aForm.reg.checked;
+		
+		// Enough parameters
+		if(username && domain && pwd) {
+			// Show the info notification
+			showThis('info');
+			
+			// We define the http binding parameters
+			oArgs = new Object();
+			
+			if(HOST_BOSH_MAIN)
+				oArgs.httpbase = HOST_BOSH_MAIN;
+			else
+				oArgs.httpbase = HOST_BOSH;
+			
+			// We create the new http-binding connection
+			con = new JSJaCHttpBindingConnection(oArgs);
+			
+			// And we handle everything that happen
+			con.registerHandler('message', handleMessage);
+			con.registerHandler('presence', handlePresence);
+			con.registerHandler('iq', handleIQ);
+			con.registerHandler('onconnect', handleConnected);
+			con.registerHandler('onerror', handleError);
+			con.registerHandler('ondisconnect', handleDisconnected);
+			
+			// We retrieve what the user typed in the login inputs
+			oArgs = new Object();
+			oArgs.username = username;
+			oArgs.domain = domain;
+			oArgs.resource = JAPPIX_RESOURCE + ' Mobile (' + (new Date()).getTime() + ')';
+			oArgs.pass = pwd;
+			oArgs.secure = true;
+			oArgs.xmllang = XML_LANG;
+			
+			// Register?
+			if(reg)
+				oArgs.register = true;
+			
+			// We connect !
+			con.connect(oArgs);
+		}
+		
+		// Not enough parameters
+		else
+			showThis('error');
+	}
+	
+	catch(e) {
+		// An error happened
+		resetPanel('error');
+	}
+	
+	finally {
+		return false;
+	}
+}
+
+function doLogout() {
+	con.disconnect();
+}
+
+/* END CONNECTION FUNCTIONS */
+
+/* BEGIN SHOW/HIDE FUNCTIONS */
+
+function showThis(id) {
+	document.getElementById(id).style.display = 'block';
+}
+
+function hideThis(id) {
+	document.getElementById(id).style.display = 'none';
+}
+
+function resetPanel(id) {
+	// Hide the opened panels
+	hideThis('info');
+	hideThis('error');
+	
+	//Show the target panel
+	if(id)
+		showThis(id);
+}
+
+function resetDOM() {
+	// Reset the "secret" input values
+	document.getElementById('pwd').value = '';
+	
+	// Remove the useless DOM elements
+	var body = document.getElementsByTagName('body')[0];
+	body.removeChild(document.getElementById('talk'));
+	body.removeChild(document.getElementById('chat'));
+}
+
+/* END SHOW/HIDE FUNCTIONS */
+
+/* BEGIN SYSTEM FUNCTIONS */
+
+function exists(id) {
+	if(!document.getElementById(id))
+		return false;
+	else
+		return true;
+}
+
+function _e(string) {
+	return string;
+}
+
+function encodeOnclick(str) {
+	return str.replace(/'/g, '\\$&').replace(/"/g, '&quot;');
+}
+
+function getJappixLocation() {
+	var url = window.location.href;
+	
+	// If the URL has variables, remove them
+	if(url.indexOf('?') != -1)
+		url = url.split('?')[0];
+	if(url.indexOf('#') != -1)
+		url = url.split('#')[0];
+	
+	// No "/" at the end
+	if(!url.match(/(.+)\/$/))
+		url += '/';
+	
+	return url;
+}
+
+/* END SYSTEM FUNCTIONS */
+
+/* BEGIN HANDLING FUNCTIONS */
+
+function handleMessage(msg) {
+	var type = msg.getType();
+	
+	if(type == 'chat' || type == 'normal') {
+		// Get the body
+		var body = msg.getBody();
+		
+		if(body) {
+			// Get the values
+			var xid = cutResource(msg.getFrom());
+			var hash = hex_md5(xid);
+			var nick = getNick(xid, hash);
+			
+			// No nickname?
+			if(!nick)
+				nick = xid;
+		
+			// Create the chat if it does not exist
+			chat(xid, nick);
+		
+			// Display the message
+			displayMessage(xid, body, nick, hash);
+		}
+	}
+}
+
+function handlePresence(pre) {
+	// Define the variables
+	var xid = cutResource(pre.getFrom());
+	var hash = hex_md5(xid);
+	var type = pre.getType();
+	var show = pre.getShow();
+	
+	// Online buddy: show it!
+	if(!type) {
+		showThis('buddy-' + hash);
+		
+		// Display the correct presence
+		switch(show) {
+			case 'chat':
+				displayPresence(hash, show);
+				break;
+			
+			case 'away':
+				displayPresence(hash, show);
+				break;
+			
+			case 'xa':
+				displayPresence(hash, show);
+				break;
+			
+			case 'dnd':
+				displayPresence(hash, show);
+				break;
+			
+			default:
+				displayPresence(hash, 'available');
+				break;
+		}
+	}
+	
+	else
+		hideThis('buddy-' + hash);
+}
+
+function handleIQ(iq) {
+	// Get the content
+	var iqFrom = iq.getFrom();
+	var iqID = iq.getID();
+	var iqQueryXMLNS = iq.getQueryXMLNS();
+	var iqType = iq.getType();
+	
+	// Create the response
+	if((iqType == 'get') && ((iqQueryXMLNS == NS_DISCO_INFO) || (iqQueryXMLNS == NS_VERSION))) {
+		var iqResponse = new JSJaCIQ();
+		iqResponse.setID(iqID);
+		iqResponse.setTo(iqFrom);
+		iqResponse.setType('result');
+	}
+	
+	// Disco#infos query
+	if((iqQueryXMLNS == NS_DISCO_INFO) && (iqType == 'get')) {
+		/* REF: http://xmpp.org/extensions/xep-0030.html */
+		
+		var iqQuery = iqResponse.setQuery(NS_DISCO_INFO);
+		
+		// We set the name of the client
+		iqQuery.appendChild(iq.appendNode('identity', {
+			'category': 'client',
+			'type': 'mobile',
+			'name': 'Jappix Mobile'
+		}));
+		
+		// We set all the supported features
+		var fArray = new Array(
+			NS_DISCO_INFO,
+			NS_VERSION
+		);
+		
+		for(i in fArray)
+			iqQuery.appendChild(iq.buildNode('feature', {'var': fArray[i]}));
+		
+		con.send(iqResponse);
+	}
+	
+	// Software version query
+	else if((iqQueryXMLNS == NS_VERSION) && (iqType == 'get')) {
+		/* REF: http://xmpp.org/extensions/xep-0092.html */
+		
+		var iqQuery = iqResponse.setQuery(NS_VERSION);
+		
+		iqQuery.appendChild(iq.buildNode('name', 'Jappix Mobile'));
+		iqQuery.appendChild(iq.buildNode('version', JAPPIX_VERSION));
+		iqQuery.appendChild(iq.buildNode('os', BrowserDetect.OS));
+		
+		con.send(iqResponse);
+	}
+}
+
+function handleConnected() {
+	// Reset the elements
+	hideThis('home');
+	resetPanel();
+	
+	// Create the talk page
+	document.getElementsByTagName('body')[0].innerHTML +=
+	'<div id="talk">' + 
+		'<div class="header">' + 
+			'<div class="mobile-images"></div>' + 
+			'<button onclick="doLogout();">' + _e("Disconnect") + '</button>' + 
+		'</div>' + 
+		
+		'<div id="roster"></div>' + 
+	'</div>' + 
+	
+	'<div id="chat">' + 
+		'<div class="header">' + 
+			'<div class="mobile-images"></div>' + 
+			'<button onclick="returnToRoster();">' + _e("Previous") + '</button>' + 
+		'</div>' + 
+		
+		'<div id="chans"></div>' + 
+	'</div>';
+	
+	// Get the roster items
+	getRoster();
+}
+
+function handleError(error) {
+	resetPanel('error');
+}
+
+function handleDisconnected() {
+	// Reset the elements
+	resetDOM();
+	
+	// Show the home page
+	showThis('home');
+}
+
+function handleRoster(iq) {
+	// Error: send presence anyway
+	if(!iq || (iq.getType() != 'result'))
+		return sendPresence('', 'available', 1);
+  	
+  	// Define some pre-vars
+  	var current, xid, nick, oneBuddy, oneID, hash;
+  	var roster = document.getElementById('roster');
+  	
+	// Get roster items
+	var iqNode = iq.getNode();
+	var bItems = iqNode.getElementsByTagName('item');
+	
+	// Display each elements from the roster
+	for(var i = 0; i < bItems.length; i++) {
+		// Get the values
+		current = iqNode.getElementsByTagName('item').item(i);
+		xid = current.getAttribute('jid').htmlEnc();
+		nick = current.getAttribute('name');
+		hash = hex_md5(xid);
+		
+		// No defined nick?
+		if(!nick)
+			nick = getDirectNick(xid);
+		
+		// Display the values
+		oneBuddy = document.createElement('a');
+		oneID = 'buddy-' + hash;
+		oneBuddy.setAttribute('href', '#');
+		oneBuddy.setAttribute('id', oneID);
+		oneBuddy.setAttribute('class', 'one-buddy');
+		oneBuddy.setAttribute('onclick', 'return chat(\'' + encodeOnclick(xid) + '\', \'' + encodeOnclick(nick) + '\');');
+		oneBuddy.innerHTML = nick.htmlEnc();
+		roster.appendChild(oneBuddy);
+	}
+	
+	// Start handling buddies presence
+	sendPresence('', 'available', 1);
+}
+
+/* END HANDLING FUNCTIONS */
+
+/* BEGIN SENDING FUNCTIONS */
+
+function sendMessage(aForm) {
+	try {
+		var body = aForm.body.value;
+		var xid = aForm.xid.value;
+		var hash = hex_md5(xid);
+		
+		if(body && xid) {
+			// Send the message
+			var aMsg = new JSJaCMessage();
+			aMsg.setTo(xid);
+			aMsg.setType('chat');
+			aMsg.setBody(body);
+			con.send(aMsg);
+			
+			// Clear our input
+			aForm.body.value = '';
+			
+			// Display the message we sent
+			displayMessage(xid, body, 'me', hash);
+		}
+	}
+	
+	finally {
+		return false;
+	}
+}
+
+function sendPresence(type, show, priority, status) {
+	var presence = new JSJaCPresence();
+	
+	if(type)
+		presence.setType(type);
+	if(show)
+		presence.setShow(show);
+	if(priority)
+		presence.setPriority(priority);
+	if(status)
+		presence.setStatus(status);
+	
+	con.send(presence);
+}
+
+/* END SENDING FUNCTIONS */
+
+/* BEGIN GETTING FUNCTIONS */
+
+function getRoster() {
+	iq = new JSJaCIQ();
+	iq.setType('get');
+	iq.setQuery(NS_ROSTER);
+	
+	con.send(iq, handleRoster);
+}
+
+function getDirectNick(xid) {
+	return explodeThis('@', xid, 0);
+}
+
+function getNick(xid, hash) {
+	var path = 'buddy-' + hash;
+	
+	if(exists(path))
+		return document.getElementById(path).innerHTML;
+	
+	else
+		getDirectNick(xid);
+}
+
+/* END GETTING FUNCTIONS */
+
+/* BEGIN RESOURCES FUNCTIONS */
+function explodeThis(toEx, toStr, i) {
+	// Get the index of our char to explode
+	var index = toStr.indexOf(toEx);
+	
+	// We split if necessary the string
+	if(index != -1) {
+		if(i == 0)
+			toStr = toStr.substr(0, index);
+		else
+			toStr = toStr.substr(index + 1);
+	}
+	
+	// We return the value
+	return toStr;
+}
+
+function cutResource(aXID) {
+	return explodeThis('/', aXID, 0);
+}
+
+function getXIDNick(aXID) {
+	return explodeThis('@', aXID, 0);
+}
+
+function getXIDHost(aXID) {
+	return explodeThis('@', aXID, 1);
+}
+/* END RESOURCES FUNCTIONS */
+
+/* BEGIN CHAT FUNCTIONS */
+
+function filter(msg) {
+	var msg = msg
+	
+	// Encode in HTML
+	.htmlEnc()
+	
+	// Highlighted text
+	.replace(/(\s|^)\*(.+)\*(\s|$)/gi,'$1<em>$2</em>$3');
+	
+	// Links
+	msg = applyLinks(msg, 'mini');
+	
+	return msg;
+}
+
+function displayMessage(xid, body, nick, hash) {
+	// Get the path
+	var path = 'content-' + hash;
+	
+	// Display the message
+	html = '<span><b';
+	
+	if(nick == 'me')
+		html += ' class="me">' + _e("You");
+	else
+		html += ' class="him">' + nick;
+	
+	html += '</b> ' + filter(body) + '</span>';
+	
+	document.getElementById(path).innerHTML += html;
+	
+	// Scroll to the last element
+	document.getElementById(path).lastChild.scrollIntoView();
+}
+
+function returnToRoster() {
+	// Hide the chats
+	hideThis('chat');
+	
+	// Show the roster
+	showThis('talk');
+}
+
+function chatSwitch(hash) {
+	// Hide the roster page
+	hideThis('talk');
+	
+	// Hide the other chats
+	var divs = document.getElementsByTagName('div');
+	
+	for(var i = 0; i < divs.length; i++) {
+		if(divs.item(i).getAttribute('class') == 'one-chat')
+			divs.item(i).style.display = 'none';
+	}
+	
+	// Show the chat
+	showThis('chat');
+	showThis(hash);
+}
+
+function createChat(xid, nick, hash) {
+	// Define the variables
+	var chat = document.getElementById('chans');
+	var oneChat = document.createElement('div');
+	
+	// Apply the DOM modification
+	oneChat.setAttribute('id', 'chat-' + hash);
+	oneChat.setAttribute('class', 'one-chat');
+	oneChat.innerHTML = '<p>' + nick + '</p><div id="content-' + hash + '"></div><form action="#" method="post" onsubmit="return sendMessage(this);"><input type="text" name="body" /><input type="hidden" name="xid" value="' + xid + '" /><input type="submit" class="submit" value="OK" /></form>';
+	chat.appendChild(oneChat);
+}
+
+function chat(xid, nick) {
+	var hash = hex_md5(xid);
+	
+	// If the chat was not yet opened
+	if(!exists('chat-' + hash)) {
+		// No nick?
+		if(!nick)
+			nick = getNick(xid, hash);
+		
+		// Create the chat
+		createChat(xid, nick, hash);
+	}
+	
+	// Switch to the chat
+	chatSwitch('chat-' + hash);
+	
+	return false;
+}
+
+/* END CHAT FUNCTIONS */
+
+/* BEGIN PRESENCE FUNCTIONS */
+
+function displayPresence(hash, show) {
+	document.getElementById('buddy-' + hash).setAttribute('class', 'one-buddy ' + show);
+}
+
+/* END PRESENCE FUNCTIONS */
+
+/* BEGIN DOCUMENT EVENTS FUNCTIONS */
+
+onbeforeunload = doLogout;
+
+/* END DOCUMENT EVENTS FUNCTIONS */
diff --git a/jappixmini/jappix/js/mucadmin.js b/jappixmini/jappix/js/mucadmin.js
new file mode 100644
index 00000000..ca2e89d1
--- /dev/null
+++ b/jappixmini/jappix/js/mucadmin.js
@@ -0,0 +1,373 @@
+/*
+
+Jappix - An open social platform
+These are the mucadmin JS scripts for Jappix
+
+-------------------------------------------------
+
+License: AGPL
+Authors: Vanaryon, Maranda
+Last revision: 03/03/11
+
+*/
+
+// Opens the MUC admin popup
+function openMucAdmin(xid, aff) {
+	// Popup HTML content
+	var html_full = 
+	'<div class="top">' + _e("MUC administration") + '</div>' + 
+	
+	'<div class="content">' + 
+		'<div class="head mucadmin-head">' + 
+			'<div class="head-text mucadmin-head-text">' + _e("You administrate this room") + '</div>' + 
+			
+			'<div class="mucadmin-head-jid">' + xid + '</div>' + 
+		'</div>' + 
+		
+		'<div class="mucadmin-forms">' + 
+			'<div class="mucadmin-topic">' + 
+				'<fieldset>' + 
+					'<legend>' + _e("Subject") + '</legend>' + 
+					
+					'<label for="topic-text">' + _e("Enter new subject") + '</label>' + 
+					'<textarea id="topic-text" name="room-topic" rows="8" cols="60" ></textarea>' + 
+				'</fieldset>' + 
+			'</div>' + 
+			
+			'<div class="mucadmin-conf">' + 
+				'<fieldset>' + 
+					'<legend>' + _e("Configuration") + '</legend>' + 
+					
+					'<div class="results mucadmin-results"></div>' + 
+				'</fieldset>' + 
+			'</div>' + 
+			
+			'<div class="mucadmin-aut">' + 
+				'<fieldset>' + 
+					'<legend>' + _e("Authorizations") + '</legend>' + 
+					
+					'<label>' + _e("Member list") + '</label>' + 
+					'<div class="aut-member aut-group">' + 
+						'<a href="#" class="aut-add" onclick="return addInputMucAdmin(\'\', \'member\');">' + _e("Add an input") + '</a>' + 
+					'</div>' + 
+					
+					'<label>' + _e("Owner list") + '</label>' + 
+					'<div class="aut-owner aut-group">' + 
+						'<a href="#" class="aut-add" onclick="return addInputMucAdmin(\'\', \'owner\');">' + _e("Add an input") + '</a>' + 
+					'</div>' + 
+					
+					'<label>' + _e("Administrator list") + '</label>' + 
+					'<div class="aut-admin aut-group">' + 
+						'<a href="#" class="aut-add" onclick="return addInputMucAdmin(\'\', \'admin\');">' + _e("Add an input") + '</a>' + 
+					'</div>' + 
+					
+					'<label>' + _e("Outcast list") + '</label>' + 
+					'<div class="aut-outcast aut-group">' + 
+						'<a href="#" class="aut-add" onclick="return addInputMucAdmin(\'\', \'outcast\');">' + _e("Add an input") + '</a>' + 
+					'</div>' + 
+				'</fieldset>' + 
+			'</div>' + 
+			
+			'<div class="mucadmin-others">' + 
+				'<fieldset>' + 
+					'<legend>' + _e("Others") + '</legend>' + 
+					
+					'<label>' + _e("Destroy this MUC") + '</label>' + 
+					'<a href="#" onclick="return destroyMucAdmin();">' + _e("Yes, let's do it!") + '</a>' + 
+				'</fieldset>' + 
+			'</div>' + 
+		'</div>' + 
+	'</div>' + 
+	
+	'<div class="bottom">' + 
+		'<div class="wait wait-medium"></div>' + 
+		
+		'<a href="#" class="finish save">' + _e("Save") + '</a>' + 
+		'<a href="#" class="finish cancel">' + _e("Cancel") + '</a>' + 
+	'</div>';
+	
+	var html_partial = 
+	'<div class="top">' + _e("MUC administration") + '</div>' + 
+	
+	'<div class="content">' + 
+		'<div class="head mucadmin-head">' + 
+			'<div class="head-text mucadmin-head-text">' + _e("You administrate this room") + '</div>' + 
+			
+			'<div class="mucadmin-head-jid">' + xid + '</div>' + 
+		'</div>' + 
+		
+		'<div class="mucadmin-forms">' + 
+			'<div class="mucadmin-aut">' + 
+				'<fieldset>' + 
+					'<legend>' + _e("Authorizations") + '</legend>' + 
+					
+					'<label>' + _e("Member list") + '</label>' + 
+					'<div class="aut-member aut-group">' + 
+						'<a href="#" class="aut-add" onclick="return addInputMucAdmin(\'\', \'member\');">' + _e("Add an input") + '</a>' + 
+					'</div>' + 
+					
+					'<label>' + _e("Outcast list") + '</label>' + 
+					'<div class="aut-outcast aut-group">' + 
+						'<a href="#" class="aut-add" onclick="return addInputMucAdmin(\'\', \'outcast\');">' + _e("Add an input") + '</a>' + 
+					'</div>' + 
+				'</fieldset>' + 
+			'</div>' + 
+		'</div>' + 
+	'</div>' + 
+	
+	'<div class="bottom">' + 
+		'<div class="wait wait-medium"></div>' + 
+		
+		'<a href="#" class="finish save">' + _e("Save") + '</a>' + 
+		'<a href="#" class="finish cancel">' + _e("Cancel") + '</a>' + 
+	'</div>';	
+	
+	// Create the popup
+	if(aff == 'owner')
+		createPopup('mucadmin', html_full);
+	if(aff == 'admin')
+		createPopup('mucadmin', html_partial);
+	
+	// Associate the events
+	launchMucAdmin();
+		
+	// We get the affiliated user's privileges
+	if(aff == 'owner') {
+		queryMucAdmin(xid, 'member');
+		queryMucAdmin(xid, 'owner');
+		queryMucAdmin(xid, 'admin');
+		queryMucAdmin(xid, 'outcast');
+		// We query the room to edit
+		dataForm(xid, 'muc', '', '', 'mucadmin');
+	} else if(aff == 'admin') {
+		queryMucAdmin(xid, 'member');
+		queryMucAdmin(xid, 'outcast');
+	}
+}
+
+// Closes the MUC admin popup
+function closeMucAdmin() {
+	// Destroy the popup
+	destroyPopup('mucadmin');
+	
+	return false;
+}
+
+// Removes a MUC admin input
+function removeInputMucAdmin(element) {
+	var path = $(element).parent();
+	
+	// We first hide the container of the input
+	path.hide();
+	
+	// Then, we add a special class to the input
+	path.find('input').addClass('aut-dustbin');
+	
+	return false;
+}
+
+// Adds a MUC admin input
+function addInputMucAdmin(xid, affiliation) {
+	var hash = hex_md5(xid + affiliation);
+	
+	// Add the HTML code
+	$('#mucadmin .aut-' + affiliation + ' .aut-add').after(
+		'<div class="one-aut ' + hash + '">' + 
+			'<input id="aut-' + affiliation + '" name="' + affiliation + '" type="text" class="mucadmin-i" value="' + xid + '" />' + 
+			'<a href="#" class="aut-remove">[-]</a>' + 
+		'</div>'
+	);
+	
+	// Click event
+	$('#mucadmin .' + hash + ' .aut-remove').click(function() {
+		return removeInputMucAdmin(this);
+	});
+	
+	// Focus on the input we added
+	if(!xid)
+		$(document).oneTime(10, function() {
+			$('#mucadmin .' + hash + ' input').focus();
+		});
+	
+	return false;
+}
+
+// Handles the MUC admin form
+function handleMucAdminAuth(iq) {
+	// We got the authorizations results
+	$(iq.getQuery()).find('item').each(function() {
+		// We parse the received xml
+		var xid = $(this).attr('jid');
+		var affiliation = $(this).attr('affiliation');
+		
+		// We create one input for one XID
+		addInputMucAdmin(xid, affiliation);
+	});
+	
+	// Hide the wait icon
+	$('#mucadmin .wait').hide();
+	
+	logThis('MUC admin items received: ' + fullXID(getStanzaFrom(iq)));
+}
+
+// Queries the MUC admin form
+function queryMucAdmin(xid, type) {
+	// Show the wait icon
+	$('#mucadmin .wait').show();
+	
+	// New IQ
+	var iq = new JSJaCIQ();
+	
+	iq.setTo(xid);
+	iq.setType('get');
+	
+	var iqQuery = iq.setQuery(NS_MUC_ADMIN);
+	iqQuery.appendChild(iq.buildNode('item', {'affiliation': type, 'xmlns': NS_MUC_ADMIN}));
+	
+	con.send(iq, handleMucAdminAuth);
+}
+
+// Sends the new chat-room topic
+function sendMucAdminTopic(xid) {
+	// We get the new topic
+	var topic = $('.mucadmin-topic textarea').val();
+	
+	// We send the new topic if not blank
+	if(topic) {
+		var m = new JSJaCMessage();
+		m.setTo(xid);
+		m.setType('groupchat');
+		m.setSubject(topic);
+		con.send(m);
+		
+		logThis('MUC admin topic sent: ' + topic, 3);
+	}
+}
+
+// Sends the MUC admin auth form
+function sendMucAdminAuth(xid) {
+	// We define the values array
+	var types = new Array('member', 'owner', 'admin', 'outcast');
+
+	for(i in types) {
+		// We get the current type
+		var tType = types[i];
+		
+		// We loop for all the elements
+		$('.mucadmin-aut .aut-' + tType + ' input').each(function() {
+			// We set the iq headers
+			var iq = new JSJaCIQ();
+			iq.setTo(xid);
+			iq.setType('set');
+
+			var iqQuery = iq.setQuery(NS_MUC_ADMIN);
+	
+			// We get the needed values
+			var value = $(this).val();
+			
+			// If there's a value
+			if(value)
+				var item = iqQuery.appendChild(iq.buildNode('item', {'jid': value, 'xmlns': NS_MUC_ADMIN}));
+			
+			// It the user had removed the XID
+			if($(this).hasClass('aut-dustbin') && value)
+				item.setAttribute('affiliation', 'none');
+			
+			// If the value is not blank and okay
+			else if(value)
+				item.setAttribute('affiliation', tType);
+	
+			// We send the iq !
+			con.send(iq, handleErrorReply);
+		});
+	}	
+	
+	logThis('MUC admin authorizations form sent: ' + xid, 3);
+}
+
+// Checks if the MUC room was destroyed
+function handleDestroyMucAdminIQ(iq) {
+	if(!handleErrorReply(iq)) {
+		// We close the groupchat
+		var room = fullXID(getStanzaFrom(iq));
+		var hash = hex_md5(room);
+		quitThisChat(room, hash, 'groupchat');
+		
+		// We close the muc admin popup
+		closeMucAdmin();
+		
+		// We tell the user that all is okay
+		openThisInfo(5);
+		
+		// We remove the user's favorite
+		if(existDB('favorites', room))
+			removeThisFavorite(room, explodeThis('@', room, 0));
+		
+		logThis('MUC admin destroyed: ' + room, 3);
+	}
+	
+	// We hide the wait icon
+	$('#mucadmin .wait').hide();
+}
+
+// Destroys a MUC room
+function destroyMucAdminIQ(xid) {
+	// We ask the server to delete the room
+	var iq = new JSJaCIQ();
+	
+	iq.setTo(xid);
+	iq.setType('set');
+	var iqQuery = iq.setQuery(NS_MUC_OWNER);
+	iqQuery.appendChild(iq.buildNode('destroy', {'xmlns': NS_MUC_OWNER}));
+	
+	con.send(iq, handleDestroyMucAdminIQ);
+	
+	logThis('MUC admin destroy sent: ' + xid, 3);
+	
+	return false;
+}
+
+// Performs the MUC room destroy functions
+function destroyMucAdmin() {
+	// We get the XID of the current room
+	var xid = $('#mucadmin .mucadmin-head-jid').text();
+	
+	// We show the wait icon
+	$('#mucadmin .wait').show();
+	
+	// We send the iq
+	destroyMucAdminIQ(xid);
+}
+
+// Sends all the MUC admin stuffs
+function sendMucAdmin() {
+	// We get the XID of the current room
+	var xid = $('#mucadmin .mucadmin-head-jid').text();
+	
+	// We change the room topic
+	sendMucAdminTopic(xid);
+	
+	// We send the needed queries
+	sendDataForm('x', 'submit', 'submit', $('#mucadmin .mucadmin-results').attr('data-session'), xid, '', '', 'mucadmin');
+	sendMucAdminAuth(xid);
+}
+
+// Saves the MUC admin elements
+function saveMucAdmin() {
+	// We send the new options
+	sendMucAdmin();
+	
+	// And we quit the popup
+	return closeMucAdmin();
+}
+
+// Addon launcher
+function launchMucAdmin() {
+	// Click events
+	$('#mucadmin .bottom .finish').click(function() {
+		if($(this).is('.cancel'))
+			return closeMucAdmin();
+		if($(this).is('.save'))
+			return saveMucAdmin();
+	});
+}
diff --git a/jappixmini/jappix/js/music.js b/jappixmini/jappix/js/music.js
new file mode 100644
index 00000000..af86a060
--- /dev/null
+++ b/jappixmini/jappix/js/music.js
@@ -0,0 +1,259 @@
+/*
+
+Jappix - An open social platform
+These are the music JS scripts for Jappix
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 25/04/11
+
+*/
+
+// Opens the music bubble
+function openMusic() {
+	var path = '.music-content';
+	
+	// Show the music bubble
+	showBubble(path);
+	
+	$(document).oneTime(10, function() {
+		$(path + ' input').focus();
+	});
+	
+	return false;
+}
+
+// Parses the music search XML
+function parseMusic(xml, type) {
+	var path = '.music-content ';
+	var content = path + '.list';
+	var path_type = content + ' .' + type;
+	
+	// Create the result container
+	if(!exists(path_type)) {
+		var code = '<div class="' + type + '"></div>';
+		
+		if(type == 'local')
+			$(content).prepend(code);
+		else
+			$(content).append(code);
+	}
+	
+	// Fill the results
+	$(xml).find('track').each(function() {
+		// Parse the XML
+		var id = $(this).find('id').text();
+		var title = $(this).find('name').text();
+		var artist = $(this).find('artist').text();
+		var source = $(this).find('source').text();
+		var duration = $(this).find('duration').text();
+		var uri = $(this).find('url').text();
+		var mime = $(this).find('type').text();
+		
+		// No ID?
+		if(!id)
+			id = hex_md5(uri);
+		
+		// No MIME?
+		if(!mime)
+			mime = 'audio/ogg';
+		
+		// Local URL?
+		if(type == 'local')
+			uri = generateURL(uri);
+		
+		// Append the HTML code
+		$(path_type).append('<a href="#" class="song" data-id="' + id + '">' + title + '</a>');
+		
+		// Current playing song?
+		var current_song = $(path_type + ' a[data-id=' + id + ']');
+		
+		if(exists('.music-audio[data-id=' + id + ']'))
+			current_song.addClass('playing');
+		
+		// Click event
+		current_song.click(function() {
+			return addMusic(id,  title, artist, source, duration, uri, mime, type);
+		});
+	});
+	
+	// The search is finished
+	if(exists(content + ' .jamendo') && exists(content + ' .local')) {
+		// Get the result values
+		var jamendo = $(content + ' .jamendo').text();
+		var local = $(content + ' .local').text();
+		
+		// Enable the input
+		$(path + 'input').val('').removeAttr('disabled');
+		
+		// No result
+		if(!jamendo && !local)
+			$(path + '.no-results').show();
+		
+		// We must put a separator between the categories
+		if(jamendo && local)
+			$(content + ' .local').addClass('special');
+	}
+}
+
+// Sends the music search requests
+function searchMusic() {
+	var path = '.music-content ';
+	
+	// We get the input string
+	var string = $(path + 'input').val();
+	
+	// We lock the search input
+	$(path + 'input').attr('disabled', true);
+	
+	// We reset the results
+	$(path + '.list div').remove();
+	$(path + '.no-results').hide();
+	
+	// Get the Jamendo results
+	$.get('./php/music-search.php', {searchquery: string, location: 'jamendo'}, function(data) {
+		parseMusic(data, 'jamendo');
+	});
+	
+	// Get the local results
+	$.get('./php/music-search.php', {searchquery: string, location: JAPPIX_LOCATION}, function(data) {
+		parseMusic(data, 'local');
+	});
+}
+
+// Performs an action on the music player
+function actionMusic(action) {
+	try {
+		// Initialize
+		var playThis = document.getElementById('top-content').getElementsByTagName('audio')[0];
+		
+		// Nothing to play, exit
+		if(!playThis)
+			return false;
+		
+		var stopButton = $('#top-content a.stop');
+		
+		// User play a song
+		if(action == 'play') {
+			stopButton.show();
+			playThis.load();
+			playThis.play();
+			playThis.addEventListener('ended', function() {
+				actionMusic('stop');
+			}, true);  
+			
+			logThis('Music is now playing.');
+		}
+		
+		// User stop the song or the song came to its end
+		else if(action == 'stop') {
+			stopButton.hide();
+			playThis.pause();
+			$('#top-content .music').removeClass('actived');
+			$('.music-content .list a').removeClass('playing');
+			$('.music-audio').remove();
+			publishMusic();
+			
+			logThis('Music is now stopped.');
+		}
+	}
+	
+	catch(e) {}
+	
+	finally {
+		return false;
+	}
+}
+
+// Publishes the current title over PEP
+function publishMusic(title, artist, source, duration, uri) {
+	// We share the tune on PEP if enabled
+	if(enabledPEP()) {
+		/* REF: http://xmpp.org/extensions/xep-0118.html */
+		
+		var iq = new JSJaCIQ();
+		iq.setType('set');
+		
+		// Create the main PubSub nodes
+		var pubsub = iq.appendNode('pubsub', {'xmlns': NS_PUBSUB});
+		var publish = pubsub.appendChild(iq.buildNode('publish', {'node': NS_TUNE, 'xmlns': NS_PUBSUB}));
+		var item = publish.appendChild(iq.buildNode('item', {'xmlns': NS_PUBSUB}));
+		var tune = item.appendChild(iq.buildNode('tune', {'xmlns': NS_TUNE}));
+		
+		// Enough data?
+		if(title || artist || source || uri) {
+			// Data array
+			var nodes = new Array(
+					'title',
+					'artist',
+					'source',
+					'length',
+					'uri'
+				    );
+			
+			var values = new Array(
+					title,
+					artist,
+					source,
+					length,
+					uri
+				     );
+			
+			// Create the children nodes
+			for(i in nodes) {
+				if(values[i])
+					tune.appendChild(iq.buildNode(nodes[i], {'xmlns': NS_TUNE}, values[i]));
+			}
+		}
+		
+		con.send(iq);
+		
+		logThis('New tune sent: ' + title, 3);
+	}
+}
+
+// Adds a music title to the results
+function addMusic(id, title, artist, source, duration, uri, mime, type) {
+	var path = '.music-content ';
+	
+	// We remove & create a new audio tag
+	$('.music-audio').remove();
+	$(path + '.player').prepend('<audio class="music-audio" type="' + mime + '" data-id="' + id + '" />');
+	
+	// We apply the new source to the player
+	if(type == 'jamendo')
+		$('.music-audio').attr('src', 'http://api.jamendo.com/get2/stream/track/redirect/?id=' + id + '&streamencoding=ogg2');
+	else
+		$('.music-audio').attr('src', uri);
+	
+	// We play the target sound
+	actionMusic('play');
+	
+	// We set the actived class
+	$('#top-content .music').addClass('actived');
+	
+	// We set a current played track indicator
+	$(path + '.list a').removeClass('playing');
+	$(path + 'a[data-id=' + id + ']').addClass('playing');
+	
+	// We publish what we listen
+	publishMusic(title, artist, source, duration, uri);
+	
+	return false;
+}
+
+// Addon launcher
+function launchMusic() {
+	// When music search string submitted
+	$('.music-content input').keyup(function(e) {
+		// Enter : send
+		if(e.keyCode == 13 && $(this).val())
+			searchMusic();
+		
+		// Escape : quit
+		if(e.keyCode == 27)
+			closeBubbles();
+	});
+}
diff --git a/jappixmini/jappix/js/name.js b/jappixmini/jappix/js/name.js
new file mode 100644
index 00000000..aad7839d
--- /dev/null
+++ b/jappixmini/jappix/js/name.js
@@ -0,0 +1,131 @@
+/*
+
+Jappix - An open social platform
+These are the buddy name related JS scripts for Jappix
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 29/04/11
+
+*/
+
+// Gets an user name for buddy add tool
+function getAddUserName(xid) {
+	var iq = new JSJaCIQ();
+	iq.setType('get');
+	iq.setTo(xid);
+	
+	iq.appendNode('vCard', {'xmlns': NS_VCARD});
+	
+	con.send(iq, handleAddUserName);
+}
+
+// Handles an user name for buddy add tool
+function handleAddUserName(iq) {
+	// Was it an obsolete request?
+	if(!exists('.add-contact-name-get[data-for=' + escape(bareXID(getStanzaFrom(iq))) + ']'))
+		return false;
+	
+	// Reset the waiting item
+	$('.add-contact-name-get').hide().removeAttr('data-for');
+	
+	// Get the names
+	if(iq.getType() == 'result') {
+		var full_name = generateBuddyName(iq)[0];
+		
+		if(full_name)
+			$('.add-contact-name').val(full_name);
+	}
+	
+	return false;
+}
+
+// Generates the good buddy name from a vCard IQ reply
+function generateBuddyName(iq) {
+	// Get the IQ content
+	var xml = $(iq.getNode()).find('vCard');
+	
+	// Get the full name & the nickname
+	var pFull = xml.find('FN:first').text();
+	var pNick = xml.find('NICKNAME:first').text();
+	
+	// No full name?
+	if(!pFull) {
+		// Get the given name
+		var pN = xml.find('N:first');
+		var pGiven = pN.find('GIVEN:first').text();
+		
+		if(pGiven) {
+			pFull = pGiven;
+			
+			// Get the family name (optional)
+			var pFamily = pN.find('FAMILY:first').text();
+			
+			if(pFamily)
+				pFull += ' ' + pFamily;
+		}
+	}
+	
+	return [pFull, pNick];
+}
+
+// Returns the given XID buddy name
+function getBuddyName(xid) {
+	// Initialize
+	var cname, bname;
+	
+	// Cut the XID resource
+	xid = bareXID(xid);
+	
+	// This is me?
+	if(isAnonymous() && !xid)
+		bname = _e("You");
+	else if(xid == getXID())
+		bname = getName();
+	
+	// Not me!
+	else {
+		cname = $('#buddy-list .buddy[data-xid=' + escape(xid) + ']:first .buddy-name').html();
+		
+		// If the complete name exists
+		if(cname)
+			bname = cname.revertHtmlEnc();
+		
+		// Else, we just get the nickname of the buddy
+		else
+			bname = getXIDNick(xid);
+	}
+	
+	return bname;
+}
+
+// Gets the nickname of the user
+function getNick() {
+	// Try to read the user nickname
+	var nick = getDB('profile', 'nick');
+	
+	// No nick?
+	if(!nick)
+		nick = con.username;
+	
+	return nick;
+}
+
+// Gets the full name of the user
+function getName() {
+	// Try to read the user name
+	var name = getDB('profile', 'name');
+	
+	// No name? Use the nickname instead!
+	if(!name)
+		name = getNick();
+	
+	return name;
+}
+
+// Gets the MUC nickname of the user
+function getMUCNick(id) {
+	return unescape($('#' + id).attr('data-nick'));
+}
diff --git a/jappixmini/jappix/js/notification.js b/jappixmini/jappix/js/notification.js
new file mode 100644
index 00000000..603d37ad
--- /dev/null
+++ b/jappixmini/jappix/js/notification.js
@@ -0,0 +1,422 @@
+/*
+
+Jappix - An open social platform
+These are the notification JS scripts for Jappix
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 27/08/11
+
+*/
+
+// Resets the notifications alert if no one remaining
+function closeEmptyNotifications() {
+	if(!$('.one-notification').size())
+		closeBubbles();
+}
+
+// Checks if there are pending notifications
+function checkNotifications() {
+	// Define the selectors
+	var notif = '#top-content .notifications';
+	var nothing = '.notifications-content .nothing';
+	var empty = '.notifications-content .empty';
+	
+	// Get the notifications number
+	var number = $('.one-notification').size();
+	
+	// Remove the red notify bubble
+	$(notif + ' .notify').remove();
+	
+	// Any notification?
+	if(number) {
+		$(notif).prepend('<div class="notify one-counter" data-counter="' + number + '">' + number + '</div>');
+		$(nothing).hide();
+		$(empty).show();
+	}
+	
+	// No notification!
+	else {
+		$(empty).hide();
+		$(nothing).show();
+		
+		// Purge the social inbox node
+		purgeNotifications();
+	}
+	
+	// Update the page title
+	updateTitle();
+}
+
+// Creates a new notification
+function newNotification(type, from, data, body, id, inverse) {
+	if(!type || !from)
+		return;
+	
+	// Generate an ID hash
+	if(!id)
+		var id = hex_md5(type + from);
+	
+	// Generate the text to be displayed
+	var text, action, code;
+	var yes_path = 'href="#"';
+	
+	// User things
+	from = bareXID(from);
+	var hash = hex_md5(from);
+	
+	switch(type) {
+		case 'subscribe':
+			// Get the name to display
+			var display_name = data[1];
+			
+			if(!display_name)
+				display_name = data[0];
+			
+			text = '<b>' + display_name.htmlEnc() + '</b> ' + _e("would like to add you as a friend.") + ' ' + _e("Do you accept?");
+			
+			break;
+		
+		case 'invite_room':
+			text = '<b>' + getBuddyName(from).htmlEnc() + '</b> ' + _e("would like you to join this chatroom:") + ' <em>' + data[0].htmlEnc() + '</em> ' + _e("Do you accept?");
+			
+			break;
+		
+		case 'request':
+			text = '<b>' + from.htmlEnc() + '</b> ' + _e("would like to get authorization.") + ' ' + _e("Do you accept?");
+			
+			break;
+		
+		case 'send':
+			yes_path = 'href="' + encodeQuotes(data[1]) + '" target="_blank"';
+			
+			text = '<b>' + getBuddyName(from).htmlEnc() + '</b> ' + printf(_e("would like to send you a file: “%s”.").htmlEnc(), '<em>' + truncate(body, 25).htmlEnc() + '</em>') + ' ' + _e("Do you accept?");
+			
+			break;
+		
+		case 'send_pending':
+			text = '<b>' + getBuddyName(from).htmlEnc() + '</b> ' + printf(_e("has received a file exchange request: “%s”.").htmlEnc(), '<em>' + truncate(body, 25).htmlEnc() + '</em>');
+			
+			break;
+		
+		case 'send_accept':
+			text = '<b>' + getBuddyName(from).htmlEnc() + '</b> ' + printf(_e("has accepted to received your file: “%s”.").htmlEnc(), '<em>' + truncate(body, 25).htmlEnc() + '</em>');
+			
+			break;
+		
+		case 'send_reject':
+			text = '<b>' + getBuddyName(from).htmlEnc() + '</b> ' + printf(_e("has rejected to receive your file: “%s”.").htmlEnc(), '<em>' + truncate(body, 25).htmlEnc() + '</em>');
+			
+			break;
+		
+		case 'send_fail':
+			text = '<b>' + getBuddyName(from).htmlEnc() + '</b> ' + printf(_e("could not receive your file: “%s”.").htmlEnc(), '<em>' + truncate(body, 25).htmlEnc() + '</em>');
+			
+			break;
+		
+		case 'rosterx':
+			text = printf(_e("Do you want to see the friends %s suggests you?").htmlEnc(), '<b>' + getBuddyName(from).htmlEnc() + '</b>');
+			
+			break;
+		
+		case 'comment':
+			text = '<b>' + data[0].htmlEnc() + '</b> ' + printf(_e("commented an item you follow: “%s”.").htmlEnc(), '<em>' + truncate(body, 25).htmlEnc() + '</em>');
+			
+			break;
+		
+		case 'like':
+			text = '<b>' + data[0].htmlEnc() + '</b> ' + printf(_e("liked your post: “%s”.").htmlEnc(), '<em>' + truncate(body, 25).htmlEnc() + '</em>');
+			
+			break;
+		
+		case 'quote':
+			text = '<b>' + data[0].htmlEnc() + '</b> ' + printf(_e("quoted you somewhere: “%s”.").htmlEnc(), '<em>' + truncate(body, 25).htmlEnc() + '</em>');
+			
+			break;
+		
+		case 'wall':
+			text = '<b>' + data[0].htmlEnc() + '</b> ' + printf(_e("published on your wall: “%s”.").htmlEnc(), '<em>' + truncate(body, 25).htmlEnc() + '</em>');
+			
+			break;
+		
+		case 'photo':
+			text = '<b>' + data[0].htmlEnc() + '</b> ' + printf(_e("tagged you in a photo (%s).").htmlEnc(), '<em>' + truncate(body, 25).htmlEnc() + '</em>');
+			
+			break;
+		
+		case 'video':
+			text = '<b>' + data[0].htmlEnc() + '</b> ' + printf(_e("tagged you in a video (%s).").htmlEnc(), '<em>' + truncate(body, 25).htmlEnc() + '</em>');
+			
+			break;
+		
+		default:
+			break;
+	}
+	
+	// No text?
+	if(!text)
+		return;
+	
+	// Action links?
+	if((type == 'send_pending') || (type == 'send_accept') || (type == 'send_reject') || (type == 'send_fail') || (type == 'comment') || (type == 'like') || (type == 'quote') || (type == 'wall') || (type == 'photo') || (type == 'video')) {
+		action = '<a href="#" class="no">' + _e("Hide") + '</a>';
+		
+		// Any parent link?
+		if((type == 'comment') && data[2])
+			action = '<a href="#" class="yes">' + _e("Show") + '</a>' + action;
+	}
+	
+	else	
+		action = '<a ' + yes_path + ' class="yes">' + _e("Yes") + '</a><a href="#" class="no">' + _e("No") + '</a>';
+	
+	if(text) {
+		// We display the notification
+		if(!exists('.notifications-content .' + id)) {
+			// We create the html markup depending of the notification type
+			code = '<div class="one-notification ' + id + ' ' + hash + '" title="' + encodeQuotes(body) + '" data-type="' + encodeQuotes(type) + '">' + 
+					'<div class="avatar-container">' + 
+						'<img class="avatar" src="' + './img/others/default-avatar.png' + '" alt="" />' + 
+					'</div>' + 
+					
+					'<p class="notification-text">' + text + '</p>' + 
+					'<p class="notification-actions">' + 
+						'<span class="talk-images" />' + 
+						action + 
+					'</p>' + 
+			       '</div>';
+			
+			// Add the HTML code
+			if(inverse)
+				$('.notifications-content .nothing').before(code);
+			else
+				$('.notifications-content .empty').after(code);
+			
+			// Play a sound to alert the user
+			soundPlay(2);
+			
+			// The yes click function
+			$('.' + id + ' a.yes').click(function() {
+				actionNotification(type, data, 'yes', id);
+				
+				if(($(this).attr('href') == '#') && ($(this).attr('target') != '_blank'))
+					return false;
+			});
+			
+			// The no click function
+			$('.' + id + ' a.no').click(function() {
+				return actionNotification(type, data, 'no', id);
+			});
+			
+			// Get the user avatar
+			getAvatar(from, 'cache', 'true', 'forget');
+		}
+	}
+	
+	// We tell the user he has a new pending notification
+	checkNotifications();
+	
+	logThis('New notification: ' + from, 3);
+}
+
+// Performs an action on a given notification
+function actionNotification(type, data, value, id) {
+	// We launch a function depending of the type
+	if((type == 'subscribe') && (value == 'yes'))
+		acceptSubscribe(data[0], data[1]);
+	
+	else if((type == 'subscribe') && (value == 'no'))
+		sendSubscribe(data[0], 'unsubscribed');
+	
+	else if((type == 'invite_room') && (value == 'yes'))
+		checkChatCreate(data[0], 'groupchat');
+	
+	else if(type == 'request')
+		requestReply(value, data[0]);
+	
+	if((type == 'send') && (value == 'yes'))
+		replyOOB(data[0], data[3], 'accept', data[2], data[4]);
+	
+	else if((type == 'send') && (value == 'no'))
+		replyOOB(data[0], data[3], 'reject', data[2], data[4]);
+	
+	else if((type == 'rosterx') && (value == 'yes'))
+		openRosterX(data[0]);
+	
+	else if((type == 'comment') || (type == 'like') || (type == 'quote') || (type == 'wall') || (type == 'photo') || (type == 'video')) {
+		if(value == 'yes') {
+			// Get the microblog item
+			fromInfosMicroblog(data[2]);
+			
+			// Append the marker
+			$('#channel .top.individual').append('<input type="hidden" name="comments" value="' + encodeQuotes(data[1]) + '" />');
+		}
+		
+		removeNotification(data[3]);
+	}
+	
+	// We remove the notification
+	$('.notifications-content .' + id).remove();
+	
+	// We check if there's any other pending notification
+	closeEmptyNotifications();
+	checkNotifications();
+	
+	return false;
+}
+
+// Clear the social notifications
+function clearNotifications() {
+	// Remove notifications
+	$('.one-notification').remove();
+	
+	// Refresh
+	closeEmptyNotifications();
+	checkNotifications();
+	
+	return false;
+}
+
+// Gets the pending social notifications
+function getNotifications() {
+	var iq = new JSJaCIQ();
+	iq.setType('get');
+	
+	var pubsub = iq.appendNode('pubsub', {'xmlns': NS_PUBSUB});
+	pubsub.appendChild(iq.buildNode('items', {'node': NS_URN_INBOX, 'xmlns': NS_PUBSUB}));
+	
+	con.send(iq, handleNotifications);
+	
+	logThis('Getting social notifications...');
+}
+
+// Handles the social notifications
+function handleNotifications(iq) {
+	// Any error?
+	if((iq.getType() == 'error') && $(iq.getNode()).find('item-not-found').size()) {
+		// The node may not exist, create it!
+		setupMicroblog('', NS_URN_INBOX, '1', '1000000', 'whitelist', 'open', true);
+		
+		logThis('Error while getting social notifications, trying to reconfigure the Pubsub node!', 2);
+	}
+	
+	// Selector
+	var items = $(iq.getNode()).find('item');
+	
+	// Should we inverse?
+	var inverse = true;
+	
+	if(items.size() == 1)
+		inverse = false;
+	
+	// Parse notifications
+	items.each(function() {
+		// Parse the current item
+		var current_item = $(this).attr('id');
+		var current_type = $(this).find('link[rel=via]:first').attr('title');
+		var current_href = $(this).find('link[rel=via]:first').attr('href');
+		var current_parent_href = $(this).find('link[rel=related]:first').attr('href');
+		var current_xid = explodeThis(':', $(this).find('source author uri').text(), 1);
+		var current_name = $(this).find('source author name').text();
+		var current_text = $(this).find('content[type=text]:first').text();
+		var current_bname = getBuddyName(current_xid);
+		var current_id = hex_md5(current_type + current_xid + current_href + current_text);
+		
+		// Choose the good name!
+		if(!current_name || (current_bname != getXIDNick(current_xid)))
+			current_name = current_bname;
+		
+		// Create it!
+		newNotification(current_type, current_xid, [current_name, current_href, current_parent_href, current_item], current_text, current_id, inverse);
+	});
+	
+	logThis(items.size() + ' social notification(s) got!', 3);
+}
+
+// Sends a social notification
+function sendNotification(xid, type, href, text, parent) {
+	// Notification ID
+	var id = hex_md5(xid + text + getTimeStamp());
+	
+	// IQ
+	var iq = new JSJaCIQ();
+	iq.setType('set');
+	iq.setTo(xid);
+	
+	// ATOM content
+	var pubsub = iq.appendNode('pubsub', {'xmlns': NS_PUBSUB});
+	var publish = pubsub.appendChild(iq.buildNode('publish', {'node': NS_URN_INBOX, 'xmlns': NS_PUBSUB}));
+	var item = publish.appendChild(iq.buildNode('item', {'id': id, 'xmlns': NS_PUBSUB}));
+	var entry = item.appendChild(iq.buildNode('entry', {'xmlns': NS_ATOM}));
+	
+	// Notification author (us)
+	var Source = entry.appendChild(iq.buildNode('source', {'xmlns': NS_ATOM}));
+	var author = Source.appendChild(iq.buildNode('author', {'xmlns': NS_ATOM}));
+	author.appendChild(iq.buildNode('name', {'xmlns': NS_ATOM}, getName()));
+	author.appendChild(iq.buildNode('uri', {'xmlns': NS_ATOM}, 'xmpp:' + getXID()));
+	
+	// Notification content
+	entry.appendChild(iq.buildNode('published', {'xmlns': NS_ATOM}, getXMPPTime('utc')));
+	entry.appendChild(iq.buildNode('content', {'type': 'text', 'xmlns': NS_ATOM}, text));
+	entry.appendChild(iq.buildNode('link', {'rel': 'via', 'title': type, 'href': href, 'xmlns': NS_ATOM}));
+	
+	// Any parent item?
+	if(parent && parent[0] && parent[1] && parent[2]) {
+		// Generate the parent XMPP URI
+		var parent_href = 'xmpp:' + parent[0] + '?;node=' + encodeURIComponent(parent[1]) + ';item=' + encodeURIComponent(parent[2]);
+		
+		entry.appendChild(iq.buildNode('link', {'rel': 'related', 'href': parent_href, 'xmlns': NS_ATOM}));
+	}
+	
+	con.send(iq);
+	
+	logThis('Sending a social notification to ' + xid + ' (type: ' + type + ')...');
+}
+
+// Removes a social notification
+function removeNotification(id) {
+	var iq = new JSJaCIQ();
+	iq.setType('set');
+	
+	var pubsub = iq.appendNode('pubsub', {'xmlns': NS_PUBSUB});
+	var retract = pubsub.appendChild(iq.buildNode('retract', {'node': NS_URN_INBOX, 'xmlns': NS_PUBSUB}));
+	retract.appendChild(iq.buildNode('item', {'id': id, 'xmlns': NS_PUBSUB}));
+	
+	con.send(iq);
+}
+
+// Purge the social notifications
+function purgeNotifications() {
+	var iq = new JSJaCIQ();
+	iq.setType('set');
+	
+	var pubsub = iq.appendNode('pubsub', {'xmlns': NS_PUBSUB_OWNER});
+	pubsub.appendChild(iq.buildNode('purge', {'node': NS_URN_INBOX, 'xmlns': NS_PUBSUB_OWNER}));
+	
+	con.send(iq);
+	
+	return false;
+}
+
+// Adapt the notifications bubble max-height
+function adaptNotifications() {
+	// Process the new height
+	var max_height = $('#right-content').height() - 22;
+	
+	// New height too small
+	if(max_height < 250)
+		max_height = 250;
+	
+	// Apply the new height
+	$('.notifications-content .tools-content-subitem').css('max-height', max_height);
+}
+
+// Addon launcher
+function launchNotifications() {
+	// Adapt the notifications height
+	adaptNotifications();
+}
+
+// Window resize event handler
+$(window).resize(adaptNotifications);
diff --git a/jappixmini/jappix/js/oob.js b/jappixmini/jappix/js/oob.js
new file mode 100644
index 00000000..72422610
--- /dev/null
+++ b/jappixmini/jappix/js/oob.js
@@ -0,0 +1,184 @@
+/*
+
+Jappix - An open social platform
+These are the Out of Band Data JS scripts for Jappix
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 27/08/11
+
+*/
+
+// Sends an OOB request to someone
+function sendOOB(to, type, url, desc) {
+	// IQ stanza?
+	if(type == 'iq') {
+		// Get some values
+		var id = hex_md5(genID() + to + url + desc);
+		to = getHighestResource(to);
+		
+		// IQs cannot be sent to offline users
+		if(!to)
+			return;
+		
+		// Register the ID
+		setDB('send/url', id, url);
+		setDB('send/desc', id, desc);
+		
+		var aIQ = new JSJaCIQ();
+		aIQ.setTo(fullXID(to));
+		aIQ.setType('set');
+		aIQ.setID(id);
+		
+		// Append the query content
+		var aQuery = aIQ.setQuery(NS_IQOOB);
+		aQuery.appendChild(aIQ.buildNode('url', {'xmlns': NS_IQOOB}, url));
+		aQuery.appendChild(aIQ.buildNode('desc', {'xmlns': NS_IQOOB}, desc));
+		
+		con.send(aIQ);
+	}
+	
+	// Message stanza?
+	else {
+		var aMsg = new JSJaCMessage();
+		aMsg.setTo(bareXID(to));
+		
+		// Append the content
+		aMsg.setBody(desc);
+		var aX = aMsg.appendNode('x', {'xmlns': NS_XOOB});
+		aX.appendChild(aMsg.buildNode('url', {'xmlns': NS_XOOB}, url));
+		
+		con.send(aMsg);
+	}
+	
+	logThis('Sent OOB request to: ' + to + ' (' + desc + ')');
+}
+
+// Handles an OOB request
+function handleOOB(from, id, type, node) {
+	var xid = url = desc = '';
+	
+	// IQ stanza?
+	if(type == 'iq') {
+		xid = fullXID(from);
+		url = $(node).find('url').text();
+		desc = $(node).find('desc').text();
+	}
+	
+	// Message stanza?
+	else {
+		xid = bareXID(from);
+		url = $(node).find('url').text();
+		desc = $(node).find('body').text();
+	}
+	
+	// No desc?
+	if(!desc)
+		desc = url;
+	
+	// Open a new notification
+	if(type && xid && url && desc)
+		newNotification('send', xid, [xid, url, type, id, node], desc, hex_md5(xid + url + desc + id));
+}
+
+// Replies to an OOB request
+function replyOOB(to, id, choice, type, node) {
+	// Not IQ type?
+	if(type != 'iq')
+		return;
+	
+	// New IQ
+	var aIQ = new JSJaCIQ();
+	aIQ.setTo(to);
+	aIQ.setID(id);
+	
+	// OOB request accepted
+	if(choice == 'accept') {
+		aIQ.setType('result');
+		
+		logThis('Accepted file request from: ' + to, 3);
+	}
+	
+	// OOB request rejected
+	else {
+		aIQ.setType('error');
+		
+		// Append stanza content
+		for(var i = 0; i < node.childNodes.length; i++)
+			aIQ.getNode().appendChild(node.childNodes.item(i).cloneNode(true));
+		
+		// Append error content
+		var aError = aIQ.appendNode('error', {'xmlns': NS_CLIENT, 'code': '406', 'type': 'modify'});
+		aError.appendChild(aIQ.buildNode('not-acceptable', {'xmlns': NS_STANZAS}));
+		
+		logThis('Rejected file request from: ' + to, 3);
+	}
+	
+	con.send(aIQ);
+}
+
+// Wait event for OOB upload
+function waitUploadOOB() {
+	// Append the wait icon
+	$('#page-engine .chat-tools-file:not(.mini) .tooltip-subitem *').hide();
+	$('#page-engine .chat-tools-file:not(.mini) .tooltip-subitem').append('<div class="wait wait-medium"></div>');
+	
+	// Lock the bubble
+	$('#page-engine .chat-tools-file:not(.mini)').addClass('mini');
+}
+
+// Success event for OOB upload
+function handleUploadOOB(responseXML) {
+	// Data selector
+	var dData = $(responseXML).find('jappix');
+	
+	// Get the values
+	var fID = dData.find('id').text();
+	var fURL = dData.find('url').text();
+	var fDesc = dData.find('desc').text();
+	
+	// Get the OOB values
+	var oob_has;
+	
+	// No ID provided?
+	if(!fID)
+		oob_has = ':has(.wait)';
+	else
+		oob_has = ':has(#oob-upload input[value=' + fID + '])';
+	
+	var xid = $('#page-engine .page-engine-chan' + oob_has).attr('data-xid');
+	var oob_type = $('#page-engine .chat-tools-file' + oob_has).attr('data-oob');
+	
+	// Reset the file send tool
+	$('#page-engine .chat-tools-file' + oob_has).removeClass('mini');
+	$('#page-engine .bubble-file' + oob_has).remove();
+	
+	// Not available?
+	if($('#page-engine .chat-tools-file' + oob_has).is(':hidden') && (oob_type == 'iq')) {
+		openThisError(4);
+		
+		// Remove the file we sent
+		if(fURL)
+			$.get(fURL + '&action=remove');
+	}
+	
+	// Everything okay?
+	else if(fURL && fDesc && !dData.find('error').size()) {
+		// Send the OOB request
+		sendOOB(xid, oob_type, fURL, fDesc);
+		
+		// Notify the sender
+		newNotification('send_pending', xid, [xid, fURL, oob_type, '', ''], fDesc, hex_md5(fURL + fDesc + fID));
+		
+		logThis('File request sent.', 3);
+	}
+	
+	// Upload error?
+	else {
+		openThisError(4);
+		
+		logThis('Error while sending the file: ' + dData.find('error').text(), 1);
+	}
+}
diff --git a/jappixmini/jappix/js/options.js b/jappixmini/jappix/js/options.js
new file mode 100644
index 00000000..8f1ea190
--- /dev/null
+++ b/jappixmini/jappix/js/options.js
@@ -0,0 +1,643 @@
+/*
+
+Jappix - An open social platform
+These are the options JS scripts for Jappix
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 17/07/11
+
+*/
+
+// Opens the options popup
+function optionsOpen() {
+	// Popup HTML content
+	var html = 
+	'<div class="top">' + _e("Edit options") + '</div>' + 
+	
+	'<div class="tab">' + 
+		'<a href="#" class="tab-active" data-key="1">' + _e("General") + '</a>' + 
+		'<a href="#" class="pubsub-hidable" data-key="2">' + _e("Channel") + '</a>' + 
+		'<a href="#" data-key="3">' + _e("Account") + '</a>' + 
+	'</div>' + 
+	
+	'<div class="content">' + 
+		'<div id="conf1" class="lap-active one-lap forms">' + 
+			'<fieldset class="privacy">' + 
+				'<legend>' + _e("Privacy") + '</legend>' + 
+				
+				'<label for="geolocation" class="pep-hidable">' + _e("Geolocation") + '</label>' + 
+				'<input id="geolocation" type="checkbox" class="pep-hidable" />' + 
+				
+				'<label for="archiving" class="archives-hidable pref">' + _e("Message archiving") + '</label>' + 
+				'<input id="archiving" type="checkbox" class="archives-hidable pref" />' + 
+			'</fieldset>' + 
+			
+			'<fieldset>' + 
+				'<legend>' + _e("Application") + '</legend>' + 
+				
+				'<label for="sounds">' + _e("Sounds") + '</label>' + 
+				'<input id="sounds" type="checkbox" />' + 
+				
+				'<label for="showall">' + _e("Show all friends") + '</label>' + 
+				'<input id="showall" type="checkbox" />' + 
+				
+				'<label for="integratemedias">' + _e("Media integration") + '</label>' + 
+				'<input id="integratemedias" type="checkbox" />' + 
+				
+				'<label class="xmpplinks-hidable">' + _e("XMPP links") + '</label>' + 
+				'<a href="#" class="linked xmpp-links xmpplinks-hidable">' + _e("Open XMPP links with Jappix") + '</a>' + 
+			'</fieldset>' + 
+		'</div>' + 
+		
+		'<div id="conf2" class="one-lap forms">' + 
+			'<fieldset>' + 
+				'<legend>' + _e("Channel") + '</legend>' + 
+				
+				'<label>' + _e("Empty") + '</label>' + 
+				'<a href="#" class="linked empty-channel">' + _e("Empty channel") + '</a>' + 
+				
+				'<label>' + _e("Persistent") + '</label>' + 
+				'<input id="persistent" type="checkbox" />' + 
+				
+				'<label>' + _e("Maximum notices") + '</label>' + 
+				'<select id="maxnotices">' + 
+					'<option value="1">1</option>' + 
+					'<option value="100">100</option>' + 
+					'<option value="1000">1000</option>' + 
+					'<option value="10000">10000</option>' + 
+					'<option value="100000">100000</option>' + 
+					'<option value="1000000">1000000</option>' + 
+				'</select>' + 
+			'</fieldset>' + 
+			
+			'<div class="sub-ask sub-ask-empty sub-ask-element">' + 
+				'<div class="sub-ask-top">' + 
+					'<div class="sub-ask-title">' + _e("Empty channel") + '</div>' + 
+					'<a href="#" class="sub-ask-close">X</a>' + 
+				'</div>' + 
+				
+				'<div class="sub-ask-content">' + 
+					'<label>' + _e("Password") + '</label>' + 
+					'<input type="password" class="purge-microblog check-empty" required="" />' + 
+				'</div>' + 
+				
+				'<a href="#" class="sub-ask-bottom">' + _e("Empty") + ' &raquo;</a>' + 
+			'</div>' + 
+		'</div>' + 
+		
+		'<div id="conf3" class="one-lap forms">' + 
+			'<fieldset>' + 
+				'<legend>' + _e("Account") + '</legend>' + 
+				
+				'<label>' + _e("Password") + '</label>' + 
+				'<a href="#" class="linked change-password">' + _e("Change password") + '</a>' + 
+				
+				'<label>' + _e("Delete") + '</label>' + 
+				'<a href="#" class="linked delete-account">' + _e("Delete account") + '</a>' + 
+			'</fieldset>' + 
+				
+			'<div class="sub-ask sub-ask-pass sub-ask-element">' + 
+				'<div class="sub-ask-top">' + 
+					'<div class="sub-ask-title">' + _e("Change password") + '</div>' + 
+					'<a href="#" class="sub-ask-close">X</a>' + 
+				'</div>' + 
+				
+				'<div class="sub-ask-content">' + 
+					'<label>' + _e("Old") + '</label>' + 
+					'<input type="password" class="password-change old" required="" />' + 
+					
+					'<label>' + _e("New (2 times)") + '</label>' + 
+					'<input type="password" class="password-change new1" required="" />' + 
+					'<input type="password" class="password-change new2" required="" />' + 
+				'</div>' + 
+				
+				'<a href="#" class="sub-ask-bottom">' + _e("Continue") + ' &raquo;</a>' + 
+			'</div>' + 
+			
+			'<div class="sub-ask sub-ask-delete sub-ask-element">' + 
+				'<div class="sub-ask-top">' + 
+					'<div class="sub-ask-title">' + _e("Delete account") + '</div>' + 
+					'<a href="#" class="sub-ask-close">X</a>' + 
+				'</div>' + 
+				
+				'<div class="sub-ask-content">' + 
+					'<label>' + _e("Password") + '</label>' + 
+					'<input type="password" class="delete-account check-password" required="" />' + 
+				'</div>' + 
+				
+				'<a href="#" class="sub-ask-bottom">' + _e("Delete") + ' &raquo;</a>' + 
+			'</div>' + 
+		'</div>' + 
+	'</div>' + 
+	
+	'<div class="bottom">' + 
+		'<div class="wait wait-medium"></div>' + 
+		
+		'<a href="#" class="finish save">' + _e("Save") + '</a>' + 
+		'<a href="#" class="finish cancel">' + _e("Cancel") + '</a>' + 
+	'</div>';
+	
+	// Create the popup
+	createPopup('options', html);
+	
+	// Apply the features
+	applyFeatures('options');
+	
+	// Associate the events
+	launchOptions();
+	
+	return false;
+}
+
+// Closes the options popup
+function closeOptions() {
+	// Destroy the popup
+	destroyPopup('options');
+	
+	return false;
+}
+
+// Checks whether the options are loaded or not
+function loadedOptions() {
+	if($('.options-hidable').is(':visible'))
+		return true;
+	
+	return false;
+}
+
+// Switches between the options tabs
+function switchOptions(id) {
+	$('#options .one-lap').hide();
+	$('#options #conf' + id).show();
+	$('#options .tab a').removeClass('tab-active');
+	$('#options .tab a[data-key=' + id + ']').addClass('tab-active');
+	
+	return false;
+}
+
+// Manages the options wait item
+function waitOptions(id) {
+	var sOptions = $('#options .content');
+	
+	// Remove the current item class
+	sOptions.removeClass(id);
+	
+	// Hide the waiting items if all was received
+	if(!sOptions.hasClass('microblog') && !sOptions.hasClass('archives')) {
+		$('#options .wait').hide();
+		$('#options .finish:first').removeClass('disabled');
+	}
+}
+
+// Sends the options to the XMPP server
+function storeOptions() {
+	// Get the values
+	var sounds = getDB('options', 'sounds');
+	var geolocation = getDB('options', 'geolocation');
+	var showall = getDB('options', 'roster-showall');
+	var integratemedias = getDB('options', 'integratemedias');
+	var status = getDB('options', 'presence-status');
+	
+	// Create an array to be looped
+	var oType = new Array('sounds', 'geolocation', 'roster-showall', 'integratemedias', 'presence-status');
+	var oContent = new Array(sounds, geolocation, showall, integratemedias, status);
+	
+	// New IQ
+	var iq = new JSJaCIQ();
+	iq.setType('set');
+	
+	var query = iq.setQuery(NS_PRIVATE);
+	var storage = query.appendChild(iq.buildNode('storage', {'xmlns': NS_OPTIONS}));
+	
+	// Loop the array
+	for(i in oType)
+		storage.appendChild(iq.buildNode('option', {'type': oType[i], 'xmlns': NS_OPTIONS}, oContent[i]));
+	
+	con.send(iq, handleStoreOptions);
+	
+	logThis('Storing options...', 3);
+}
+
+// Handles the option storing
+function handleStoreOptions(iq) {
+	if(!iq || (iq.getType() != 'result'))
+		logThis('Options not stored.', 2);
+	else
+		logThis('Options stored.', 3);
+}
+
+// Saves the user options
+function saveOptions() {
+	// We apply the sounds
+	var sounds = '0';
+	
+	if($('#sounds').filter(':checked').size())
+		sounds = '1';
+	
+	setDB('options', 'sounds', sounds);
+	
+	// We apply the geolocation
+	if($('#geolocation').filter(':checked').size()) {
+		setDB('options', 'geolocation', '1');
+		
+		// We geolocate the user on the go
+		geolocate();
+	}
+	
+	else {
+		setDB('options', 'geolocation', '0');
+		
+		// We delete the geolocation informations
+		sendPosition();
+		removeDB('geolocation', 'now');
+	}
+	
+	// We apply the roster show all
+	if($('#showall').filter(':checked').size()) {
+		setDB('options', 'roster-showall', '1');
+		showAllBuddies('options');
+	}
+	
+	else {
+		setDB('options', 'roster-showall', '0');
+		showOnlineBuddies('options');
+	}
+	
+	// We apply the media integration
+	var integratemedias = '0';
+	
+	if($('#integratemedias').filter(':checked').size())
+		integratemedias = '1';
+	
+	setDB('options', 'integratemedias', integratemedias);
+	
+	// We apply the message archiving
+	if(enabledArchives('pref')) {
+		var aEnabled = false;
+		
+		if($('#archiving').filter(':checked').size())
+			aEnabled = true;
+		
+		configArchives(aEnabled);
+	}
+	
+	// We apply the microblog configuration
+	var persist = '0';
+	var maximum = $('#maxnotices').val();
+	
+	if($('#persistent').filter(':checked').size())
+		persist = '1';
+	
+	if(enabledPEP() && enabledPubSub())
+		setupMicroblog('', NS_URN_MBLOG, persist, maximum, '', '', false);
+	
+	// We send the options to the database
+	storeOptions();
+	
+	// Close the options
+	closeOptions();
+	
+	return false;
+}
+
+// Handles the password changing
+function handlePwdChange(iq) {
+	// Remove the general wait item
+	removeGeneralWait();
+	
+	// If no errors
+	if(!handleErrorReply(iq)) {
+		clearLastSession();
+		quit();
+		openThisInfo(1);
+		
+		logThis('Password changed.', 3);
+	}
+	
+	else
+		logThis('Password not changed.', 2);
+}
+
+// Sends the new account password
+function sendNewPassword() {
+	/* REF: http://xmpp.org/extensions/xep-0077.html#usecases-changepw */
+	
+	var password0 = $('#options .old').val();
+	var password1 = $('#options .new1').val();
+	var password2 = $('#options .new2').val();
+	
+	if ((password1 == password2) && (password0 == getPassword())) {
+		// We show the waiting image
+		showGeneralWait();
+		
+		// We send the IQ
+		var iq = new JSJaCIQ();
+		
+		iq.setTo(getServer());
+		iq.setType('set');
+		
+		var iqQuery = iq.setQuery(NS_REGISTER);
+		
+		iqQuery.appendChild(iq.buildNode('username', {'xmlns': NS_REGISTER}, con.username));
+		iqQuery.appendChild(iq.buildNode('password', {'xmlns': NS_REGISTER}, password1));
+		
+		con.send(iq, handlePwdChange);
+		
+		logThis('Password change sent.', 3);
+	}
+	
+	else {
+		$('.sub-ask-pass input').each(function() {
+			var select = $(this);
+			
+			if(!select.val())
+				$(document).oneTime(10, function() {
+					select.addClass('please-complete').focus();
+				});
+			else
+				select.removeClass('please-complete');	
+		});
+		
+		if(password0 != getPassword())
+			$(document).oneTime(10, function() {
+				$('#options .old').addClass('please-complete').focus();
+			});
+		if(password1 != password2)
+			$(document).oneTime(10, function() {
+				$('#options .new1, #options .new2').addClass('please-complete').focus();
+			});
+	}
+	
+	return false;
+}
+
+// Handles the account deletion request
+function handleAccDeletion(iq) {
+	// Remove the general wait item
+	removeGeneralWait();
+	
+	// If no errors
+	if(!handleErrorReply(iq)) {
+		clearLastSession();
+		destroyTalkPage();
+		openThisInfo(2);
+		logout();
+		
+		logThis('Account deleted.', 3);
+	}
+	
+	else
+		logThis('Account not deleted.', 2);
+}
+
+// Purge the user's microblog items
+function purgeMyMicroblog() {
+	/* REF: http://xmpp.org/extensions/xep-0060.html#owner-purge */
+	
+	var password = $('#options .check-empty').val();
+	
+	if(password == getPassword()) {
+		// Send the IQ to remove the item (and get eventual error callback)
+		var iq = new JSJaCIQ();
+		iq.setType('set');
+		
+		var pubsub = iq.appendNode('pubsub', {'xmlns': NS_PUBSUB_OWNER});
+		pubsub.appendChild(iq.buildNode('purge', {'node': NS_URN_MBLOG, 'xmlns': NS_PUBSUB_OWNER}));
+		
+		con.send(iq, handleMicroblogPurge);
+		
+		// Hide the tool
+		$('#options .sub-ask').hide();
+		
+		logThis('Microblog purge sent.', 3);
+	}
+	
+	else {
+		var selector = $('#options .check-empty');
+		
+		if(password != getPassword())
+			$(document).oneTime(10, function() {
+				selector.addClass('please-complete').focus();
+			});
+		else
+			selector.removeClass('please-complete');
+	}
+	
+	return false;
+}
+
+// Handles the microblog purge
+function handleMicroblogPurge(iq) {
+	// If no errors
+	if(!handleErrorReply(iq)) {
+		// Remove the microblog items
+		$('.one-update.update_' + hex_md5(getXID())).remove();
+		
+		logThis('Microblog purged.', 3);
+	}
+	
+	else
+		logThis('Microblog not purged.', 2);
+}
+
+// Deletes the user's account
+function deleteMyAccount() {
+	/* REF: http://xmpp.org/extensions/xep-0077.html#usecases-cancel */
+	
+	var password = $('#options .check-password').val();
+	
+	if(password == getPassword()) {
+		// We show the waiting image
+		showGeneralWait();
+		
+		// We send the IQ
+		var iq = new JSJaCIQ();
+		iq.setType('set');
+		
+		var iqQuery = iq.setQuery(NS_REGISTER);
+		iqQuery.appendChild(iq.buildNode('remove', {'xmlns': NS_REGISTER}));
+		
+		con.send(iq, handleAccDeletion);
+		
+		logThis('Delete account sent.', 3);
+	}
+	
+	else {
+		var selector = $('#options .check-password');
+		
+		if(password != getPassword())
+			$(document).oneTime(10, function() {
+				selector.addClass('please-complete').focus();
+			});
+		else
+			selector.removeClass('please-complete');
+	}
+	
+	return false;
+}
+
+// Loads the user options
+function loadOptions() {
+	// Process the good stuffs, depending of the server features
+	var enabled_archives_pref = enabledArchives('pref');
+	var enabled_pubsub = enabledPubSub();
+	var enabled_pep = enabledPEP();
+	var sWait = $('#options .content');
+	
+	// Show the waiting items if necessary
+	if(enabled_archives_pref || (enabled_pep && enabled_pubsub)) {
+		$('#options .wait').show();
+		$('#options .finish:first').addClass('disabled');
+	}
+	
+	// We get the archiving configuration
+	if(enabled_archives_pref) {
+		sWait.addClass('archives');
+		getConfigArchives();
+	}
+	
+	// We get the microblog configuration
+	if(enabled_pubsub && enabled_pep) {
+		sWait.addClass('microblog');
+		getConfigMicroblog();
+	}
+	
+	// We show the "privacy" form if something is visible into it
+	if(enabled_archives_pref || enabled_pep)
+		$('#options fieldset.privacy').show();
+	
+	// We get the values of the forms for the sounds
+	if(getDB('options', 'sounds') == '0')
+		$('#sounds').attr('checked', false);
+	else
+		$('#sounds').attr('checked', true);
+	
+	// We get the values of the forms for the geolocation
+	if(getDB('options', 'geolocation') == '1')
+		$('#geolocation').attr('checked', true);
+	else
+		$('#geolocation').attr('checked', false);
+	
+	// We get the values of the forms for the roster show all
+	if(getDB('options', 'roster-showall') == '1')
+		$('#showall').attr('checked', true);
+	else
+		$('#showall').attr('checked', false);
+	
+	// We get the values of the forms for the integratemedias
+	if(getDB('options', 'integratemedias') == '0')
+		$('#integratemedias').attr('checked', false);
+	else
+		$('#integratemedias').attr('checked', true);
+}
+
+// Addon launcher
+function launchOptions() {
+	// Click events
+	$('#options .tab a').click(function() {
+		// Yet active?
+		if($(this).hasClass('tab-active'))
+			return false;
+		
+		// Switch to the good tab
+		var key = parseInt($(this).attr('data-key'));
+		
+		return switchOptions(key);
+	});
+	
+	$('#options .linked').click(function() {
+		$('#options .sub-ask').hide();
+	});
+	
+	$('#options .xmpp-links').click(function() {
+		xmppLinksHandler();
+		
+		return false;
+	});
+	
+	$('#options .empty-channel').click(function() {
+		var selector = '#options .sub-ask-empty';
+		
+		$(selector).show();
+		
+		$(document).oneTime(10, function() {
+			$(selector + ' input').focus();
+		});
+		
+		return false;
+	});
+	
+	$('#options .change-password').click(function() {
+		var selector = '#options .sub-ask-pass';
+		
+		$(selector).show();
+		
+		$(document).oneTime(10, function() {
+			$(selector + ' input:first').focus();
+		});
+		
+		return false;
+	});
+	
+	$('#options .delete-account').click(function() {
+		var selector = '#options .sub-ask-delete';
+		
+		$(selector).show();
+		
+		$(document).oneTime(10, function() {
+			$(selector + ' input').focus();
+		});
+		
+		return false;
+	});
+	
+	$('#options .sub-ask-pass .sub-ask-bottom').click(function() {
+		return sendNewPassword();
+	});
+	
+	$('#options .sub-ask-empty .sub-ask-bottom').click(function() {
+		return purgeMyMicroblog();
+	});
+	
+	$('#options .sub-ask-delete .sub-ask-bottom').click(function() {
+		return deleteMyAccount();
+	});
+	
+	$('#options .sub-ask-close').click(function() {
+		$('#options .sub-ask').hide();
+		
+		return false;
+	});
+	
+	$('#options .bottom .finish').click(function() {
+		if($(this).is('.save') && !$(this).hasClass('disabled'))
+			return saveOptions();
+		if($(this).is('.cancel'))
+			return closeOptions();
+		
+		return false;
+	});
+	
+	// The keyup events
+	$('#options .sub-ask input').keyup(function(e) {
+		if(e.keyCode == 13) {
+			// Microblog purge
+			if($(this).is('.purge-microblog'))
+				return purgeMyMicroblog();
+			
+			// Password change
+			else if($(this).is('.password-change'))
+				return sendNewPassword();
+			
+			// Account deletion
+			else if($(this).is('.delete-account'))
+				return deleteMyAccount();
+		}
+	});
+	
+	// Load the options
+	loadOptions();
+}
diff --git a/jappixmini/jappix/js/pep.js b/jappixmini/jappix/js/pep.js
new file mode 100644
index 00000000..2a3ee1ac
--- /dev/null
+++ b/jappixmini/jappix/js/pep.js
@@ -0,0 +1,827 @@
+/*
+
+Jappix - An open social platform
+These are the PEP JS scripts for Jappix
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 26/08/11
+
+*/
+
+// Stores the PEP items
+function storePEP(xid, type, value1, value2, value3, value4) {
+	// Handle the correct values
+	if(!value1)
+		value1 = '';
+	if(!value2)
+		value2 = '';
+	if(!value3)
+		value3 = '';
+	if(!value4)
+		value4 = '';
+	
+	// If one value
+	if(value1 || value2 || value3 || value4) {
+		// Define the XML variable
+		var xml = '<pep type="' + type + '">';
+		
+		// Generate the correct XML
+		if(type == 'tune')
+			xml += '<artist>' + value1.htmlEnc() + '</artist><title>' + value2.htmlEnc() + '</title><album>' + value3.htmlEnc() + '</album><uri>' + value4.htmlEnc() + '</uri>';
+		else if(type == 'geoloc')
+			xml += '<lat>' + value1.htmlEnc() + '</lat><lon>' + value2.htmlEnc() + '</lon><human>' + value3.htmlEnc() + '</human>';
+		else
+			xml += '<value>' + value1.htmlEnc() + '</value><text>' + value2.htmlEnc() + '</text>';
+		
+		// End the XML node
+		xml += '</pep>';
+		
+		// Update the input with the new value
+		setDB('pep-' + type, xid, xml);
+	}
+	
+	else
+		removeDB('pep-' + type, xid);
+	
+	// Display the PEP event
+	displayPEP(xid, type);
+}
+
+// Displays a PEP item
+function displayPEP(xid, type) {
+	// Read the target input for values
+	var value = $(XMLFromString(getDB('pep-' + type, xid)));
+	var dText;
+	var aLink = ''
+	
+	// If the PEP element exists
+	if(type) {
+		// Get the user hash
+		var hash = hex_md5(xid);
+		
+		// Initialize
+		var fText, fValue;
+		var dText = '';
+		
+		// Parse the XML for mood and activity
+		if((type == 'mood') || (type == 'activity')) {
+			if(value) {
+				var pepValue = value.find('value').text();
+				var pepText = value.find('text').text();
+				
+				// No value?
+				if(!pepValue)
+					pepValue = 'none';
+				
+				// Apply the good values
+				if(type == 'mood')
+					fValue = moodIcon(pepValue);
+				else if(type == 'activity')
+					fValue = activityIcon(pepValue);
+				if(!pepText)
+					fText = _e("unknown");
+				else
+					fText = pepText;
+			}
+			
+			else {
+				if(type == 'mood')
+					fValue = moodIcon('undefined');
+				else if(type == 'activity')
+					fValue = activityIcon('exercising');
+				
+				fText = _e("unknown");
+			}
+			
+			dText = fText;
+			fText = fText.htmlEnc();
+		}
+		
+		else if(type == 'tune') {
+			fValue = 'tune-note';
+			
+			if(value) {
+				// Parse the tune XML
+				var tArtist = value.find('artist').text();
+				var tTitle = value.find('title').text();
+				var tAlbum = value.find('album').text();
+				var tURI = value.find('uri').text();
+				var fArtist, fTitle, fAlbum, fURI;
+				
+				// Apply the good values
+				if(!tArtist && !tAlbum && !tTitle) {
+					fText = _e("unknown");
+					dText = fText;
+				}
+				
+				else {
+					// URI element
+					if(!tURI)
+						fURI = 'http://grooveshark.com/search?q=' + encodeURIComponent(tArtist + ' ' + tTitle + ' ' + tAlbum);
+					else
+						fURI = tURI;
+					
+					// Artist element
+					if(!tArtist)
+						fArtist = _e("unknown");
+					else
+						fArtist = tArtist;
+					
+					// Title element
+					if(!tTitle)
+						fTitle = _e("unknown");
+					else
+						fTitle = tTitle;
+					
+					// Album element
+					if(!tAlbum)
+						fAlbum = _e("unknown");
+					else
+						fAlbum = tAlbum;
+					
+					// Generate the link to the title
+					aLink = ' href="' + fURI + '" target="_blank"';
+					
+					// Generate the text to be displayed
+					dText = fArtist + ' - ' + fTitle + ' (' + fAlbum + ')';
+					fText =  '<a' + aLink + '>' + dText + '</a>';
+				}
+			}
+			
+			else {
+				fText = _e("unknown");
+				dText = fText;
+			}
+		}
+		
+		else if(type == 'geoloc') {
+			fValue = 'location-world';
+			
+			if(value) {
+				// Parse the geoloc XML
+				var tLat = value.find('lat').text();
+				var tLon = value.find('lon').text();
+				var tHuman = value.find('human').text();
+				var tReal = tHuman;
+				
+				// No human location?
+				if(!tHuman)
+					tHuman = _e("See his/her position on the globe");
+				
+				// Generate the text to be displayed
+				if(tLat && tLon) {
+					aLink = ' href="http://maps.google.com/?q=' + encodeQuotes(tLat) + ',' + encodeQuotes(tLon) + '" target="_blank"';
+					fText = '<a' + aLink + '>' + tHuman.htmlEnc() + '</a>';
+					
+					if(tReal)
+						dText = tReal;
+					else
+						dText = tLat + '; ' + tLon;
+				}
+				
+				else {
+					fText = _e("unknown");
+					dText = fText;
+				}
+			}
+			
+			else {
+				fText = _e("unknown");
+				dText = fText;
+			}
+		}
+		
+		// Apply the text to the buddy infos
+		var this_buddy = '#buddy-list .buddy[data-xid=' + escape(xid) + ']';
+		
+		if(exists(this_buddy))
+			$(this_buddy + ' .bi-' + type).replaceWith('<p class="bi-' + type + ' talk-images ' + fValue + '" title="' + encodeQuotes(dText) + '">' + fText + '</p>');
+		
+		// Apply the text to the buddy chat
+		if(exists('#' + hash)) {
+			// Selector
+			var bc_pep = $('#' + hash + ' .bc-pep');
+			
+			// We remove the old PEP item
+			bc_pep.find('a.bi-' + type).remove();
+			
+			// If the new PEP item is not null, create a new one
+			if(fText != _e("unknown"))
+				bc_pep.prepend(
+					'<a' + aLink + ' class="bi-' + type + ' talk-images ' + fValue + '" title="' + encodeQuotes(dText) + '"></a>'
+				);
+			
+			// Process the new status position
+			adaptChatPresence(hash);
+		}
+		
+		// If this is the PEP values of the logged in user
+		if(xid == getXID()) {
+			// Change the icon/value of the target element
+			if((type == 'mood') || (type == 'activity')) {
+				// Change the input value
+				var dVal = '';
+				var dAttr = pepValue;
+				
+				// Must apply default values?
+				if(pepValue == 'none') {
+					if(type == 'mood')
+						dAttr = 'happy';
+					else
+						dAttr = 'exercising';
+				}
+				
+				// No text?
+				if(dText != _e("unknown"))
+					dVal = dText;
+				
+				// Store this user event in our database
+				setDB(type + '-value', 1, dAttr);
+				setDB(type + '-text', 1, dVal);
+				
+				// Apply this PEP event
+				$('#my-infos .f-' + type + ' a.picker').attr('data-value', dAttr);
+				$('#my-infos .f-' + type + ' input').val(dVal);
+				$('#my-infos .f-' + type + ' input').placeholder();
+			}
+			
+			else if((type == 'tune') || (type == 'geoloc')) {
+				// Reset the values
+				$('#my-infos .f-others a.' + type).remove();
+				
+				// Not empty?
+				if(dText != _e("unknown")) {
+					// Specific stuffs
+					var href, title, icon_class;
+					
+					if(type == 'tune') {
+						href = fURI;
+						title = dText;
+						icon_class = 'tune-note';
+					}
+					
+					else {
+						href = 'http://maps.google.com/?q=' + encodeQuotes(tLat) + ',' + encodeQuotes(tLon);
+						title = _e("Where are you?") + ' (' + dText + ')';
+						icon_class = 'location-world';
+					}
+					
+					// Must create the container?
+					if(!exists('#my-infos .f-others'))
+						$('#my-infos .content').append('<div class="element f-others"></div>');
+					
+					// Create the element
+					$('#my-infos .f-others').prepend(
+						'<a class="icon ' + type + '" href="' + encodeQuotes(href) + '" target="_blank" title="' + encodeQuotes(title) +  '">' + 
+							'<span class="talk-images ' + icon_class + '"></span>' + 
+						'</a>'
+					);
+				}
+				
+				// Empty?
+				else if(!exists('#my-infos .f-others a.icon'))
+					$('#my-infos .f-others').remove();
+				
+				// Process the buddy-list height again
+				adaptRoster();
+			}
+		}
+	}
+}
+
+// Changes the mood icon
+function moodIcon(value) {
+	// The main var
+	var icon;
+	
+	// Switch the values
+	switch(value) {
+		case 'angry':
+		case 'cranky':
+		case 'hot':
+		case 'invincible':
+		case 'mean':
+		case 'restless':
+		case 'serious':
+		case 'strong':
+			icon = 'mood-one';
+			break;
+		
+		case 'contemplative':
+		case 'happy':
+		case 'playful':
+			icon = 'mood-two';
+			break;
+		
+		case 'aroused':
+		case 'envious':
+		case 'excited':
+		case 'interested':
+		case 'lucky':
+		case 'proud':
+		case 'relieved':
+		case 'satisfied':
+		case 'shy':
+			icon = 'mood-three';
+			break;
+		
+		case 'calm':
+		case 'cautious':
+		case 'contented':
+		case 'creative':
+		case 'humbled':
+		case 'lonely':
+		case 'undefined':
+		case 'none':
+			icon = 'mood-four';
+			break;
+		
+		case 'afraid':
+		case 'amazed':
+		case 'confused':
+		case 'dismayed':
+		case 'hungry':
+		case 'in_awe':
+		case 'indignant':
+		case 'jealous':
+		case 'lost':
+		case 'offended':
+		case 'outraged':
+		case 'shocked':
+		case 'surprised':
+		case 'embarrassed':
+		case 'impressed':
+			icon = 'mood-five';
+			break;
+		
+		case 'crazy':
+		case 'distracted':
+		case 'neutral':
+		case 'relaxed':
+		case 'thirsty':
+			icon = 'mood-six';
+			break;
+		
+		case 'amorous':
+		case 'curious':
+		case 'in_love':
+		case 'nervous':
+		case 'sarcastic':
+			icon = 'mood-eight';
+			break;
+		
+		case 'brave':
+		case 'confident':
+		case 'hopeful':
+		case 'grateful':
+		case 'spontaneous':
+		case 'thankful':
+			icon = 'mood-nine';
+			break;
+		
+		default:
+			icon = 'mood-seven';
+			break;
+	}
+	
+	// Return the good icon name
+	return icon;
+}
+
+// Changes the activity icon
+function activityIcon(value) {
+	// The main var
+	var icon;
+	
+	// Switch the values
+	switch(value) {
+		case 'doing_chores':
+			icon = 'activity-doing_chores';
+			break;
+		
+		case 'drinking':
+			icon = 'activity-drinking';
+			break;
+		
+		case 'eating':
+			icon = 'activity-eating';
+			break;
+		
+		case 'grooming':
+			icon = 'activity-grooming';
+			break;
+		
+		case 'having_appointment':
+			icon = 'activity-having_appointment';
+			break;
+		
+		case 'inactive':
+			icon = 'activity-inactive';
+			break;
+		
+		case 'relaxing':
+			icon = 'activity-relaxing';
+			break;
+		
+		case 'talking':
+			icon = 'activity-talking';
+			break;
+		
+		case 'traveling':
+			icon = 'activity-traveling';
+			break;
+		
+		case 'working':
+			icon = 'activity-working';
+			break;
+		default:
+			icon = 'activity-exercising';
+			break;
+	}
+	
+	// Return the good icon name
+	return icon;
+}
+
+// Sends the user's mood
+function sendMood(value, text) {
+	/* REF: http://xmpp.org/extensions/xep-0107.html */
+	
+	// We propagate the mood on the xmpp network
+	var iq = new JSJaCIQ();
+	iq.setType('set');
+	
+	// We create the XML document
+	var pubsub = iq.appendNode('pubsub', {'xmlns': NS_PUBSUB});
+	var publish = pubsub.appendChild(iq.buildNode('publish', {'node': NS_MOOD, 'xmlns': NS_PUBSUB}));
+	var item = publish.appendChild(iq.buildNode('item', {'xmlns': NS_PUBSUB}));
+	var mood = item.appendChild(iq.buildNode('mood', {'xmlns': NS_MOOD}));
+	
+	if(value != 'none') {
+		mood.appendChild(iq.buildNode(value, {'xmlns': NS_MOOD}));
+		mood.appendChild(iq.buildNode('text', {'xmlns': NS_MOOD}, text));
+	}
+	
+	// And finally we send the mood that is set
+	con.send(iq);
+	
+	logThis('New mood sent: ' + value + ' (' + text + ')', 3);
+}
+
+// Sends the user's activity
+function sendActivity(main, sub, text) {
+	// We propagate the mood on the xmpp network
+	var iq = new JSJaCIQ();
+	iq.setType('set');
+	
+	// We create the XML document
+	var pubsub = iq.appendNode('pubsub', {'xmlns': NS_PUBSUB});
+	var publish = pubsub.appendChild(iq.buildNode('publish', {'node': NS_ACTIVITY, 'xmlns': NS_PUBSUB}));
+	var item = publish.appendChild(iq.buildNode('item', {'xmlns': NS_PUBSUB}));
+	var activity = item.appendChild(iq.buildNode('activity', {'xmlns': NS_ACTIVITY}));
+	
+	if(main != 'none') {
+		var mainType = activity.appendChild(iq.buildNode(main, {'xmlns': NS_ACTIVITY}));
+		
+		// Child nodes
+		if(sub)
+			mainType.appendChild(iq.buildNode(sub, {'xmlns': NS_ACTIVITY}));
+		if(text)
+			activity.appendChild(iq.buildNode('text', {'xmlns': NS_ACTIVITY}, text));
+	}
+	
+	// And finally we send the mood that is set
+	con.send(iq);
+	
+	logThis('New activity sent: ' + main + ' (' + text + ')', 3);
+}
+
+// Sends the user's geographic position
+function sendPosition(vLat, vLon, vAlt, vCountry, vCountrycode, vRegion, vPostalcode, vLocality, vStreet, vBuilding, vText, vURI) {
+	/* REF: http://xmpp.org/extensions/xep-0080.html */
+	
+	// We propagate the position on pubsub
+	var iq = new JSJaCIQ();
+	iq.setType('set');
+	
+	// We create the XML document
+	var pubsub = iq.appendNode('pubsub', {'xmlns': NS_PUBSUB});
+	var publish = pubsub.appendChild(iq.buildNode('publish', {'node': NS_GEOLOC, 'xmlns': NS_PUBSUB}));
+	var item = publish.appendChild(iq.buildNode('item', {'xmlns': NS_PUBSUB}));
+	var geoloc = item.appendChild(iq.buildNode('geoloc', {'xmlns': NS_GEOLOC}));
+	
+	// Create two position arrays
+	var pos_names  = ['lat', 'lon', 'alt', 'country', 'countrycode', 'region', 'postalcode', 'locality', 'street', 'building', 'text', 'uri', 'timestamp'];
+	var pos_values = [ vLat,  vLon,  vAlt,  vCountry,  vCountrycode,  vRegion,  vPostalcode,  vLocality,  vStreet,  vBuilding,  vText,  vURI,  getXMPPTime('utc')];
+	
+	for(var i = 0; i < pos_names.length; i++) {
+		if(pos_names[i] && pos_values[i])
+			geoloc.appendChild(iq.buildNode(pos_names[i], {'xmlns': NS_GEOLOC}, pos_values[i]));
+	}
+	
+	// And finally we send the XML
+	con.send(iq);
+	
+	// For logger
+	if(vLat && vLon)
+		logThis('Geolocated.', 3);
+	else
+		logThis('Not geolocated.', 2);
+}
+
+// Parses the user's geographic position
+function parsePosition(data) {
+	var result = $(data).find('result:first');
+	
+	// Get latitude and longitude
+	var lat = result.find('geometry:first location:first lat').text();
+	var lng = result.find('geometry:first location:first lng').text();
+	
+	var array = [
+	             lat,
+	             lng,
+	             result.find('address_component:has(type:contains("country")):first long_name').text(),
+	             result.find('address_component:has(type:contains("country")):first short_name').text(),
+	             result.find('address_component:has(type:contains("administrative_area_level_1")):first long_name').text(),
+	             result.find('address_component:has(type:contains("postal_code")):first long_name').text(),
+	             result.find('address_component:has(type:contains("locality")):first long_name').text(),
+	             result.find('address_component:has(type:contains("route")):first long_name').text(),
+	             result.find('address_component:has(type:contains("street_number")):first long_name').text(),
+	             result.find('formatted_address:first').text(),
+	             'http://maps.google.com/?q=' + encodeQuotes(lat) + ',' + encodeQuotes(lng)
+	            ];
+	
+	return array;
+}
+
+// Converts a position into an human-readable one
+function humanPosition(tLocality, tRegion, tCountry) {
+	var tHuman = '';
+	
+	// Any locality?
+	if(tLocality) {
+		tHuman += tLocality;
+		
+		if(tRegion)
+			tHuman += ', ' + tRegion;
+		if(tCountry)
+			tHuman += ', ' + tCountry;
+	}
+	
+	// Any region?
+	else if(tRegion) {
+		tHuman += tRegion;
+		
+		if(tCountry)
+			tHuman += ', ' + tCountry;
+	}
+	
+	// Any country?
+	else if(tCountry)
+		tHuman += tCountry;
+	
+	return tHuman;
+}
+
+// Gets the user's geographic position
+function getPosition(position) {
+	// Convert integers to strings
+	var vLat = '' + position.coords.latitude;
+	var vLon = '' + position.coords.longitude;
+	var vAlt = '' + position.coords.altitude;
+	
+	// Get full position (from Google Maps API)
+	$.get('./php/geolocation.php', {latitude: vLat, longitude: vLon, language: XML_LANG}, function(data) {
+		// Parse data!
+		var results = parsePosition(data);
+		
+		// Handled!
+		sendPosition(
+		             vLat,
+		             vLon,
+		             vAlt,
+		             results[2],
+		             results[3],
+		             results[4],
+		             results[5],
+		             results[6],
+		             results[7],
+		             results[8],
+		             results[9],
+		             results[10]
+		            );
+		
+		// Store data
+		setDB('geolocation', 'now', xmlToString(data));
+		
+		logThis('Position details got from Google Maps API.');
+	});
+	
+	logThis('Position got: latitude > ' + vLat + ' / longitude > ' + vLon + ' / altitude > ' + vAlt);
+}
+
+// Geolocates the user
+function geolocate() {
+	// Don't fire it until options & features are not retrieved!
+	if(!getDB('options', 'geolocation') || (getDB('options', 'geolocation') == '0') || !enabledPEP())
+		return;
+	
+	// We publish the user location if allowed
+	if(navigator.geolocation) {
+		// Wait a bit... (to fix a bug)
+		$('#my-infos').stopTime().oneTime('1s', function() {
+			navigator.geolocation.getCurrentPosition(getPosition);
+		});
+		
+		logThis('Geolocating...', 3);
+	}
+	
+	// Any error?
+	else
+		logThis('Not geolocated: browser does not support it.', 1);
+}
+
+// Displays all the supported PEP events for a given XID
+function displayAllPEP(xid) {
+	displayPEP(xid, 'mood');
+	displayPEP(xid, 'activity');
+	displayPEP(xid, 'tune');
+	displayPEP(xid, 'geoloc');
+}
+
+// Addon launcher
+function launchPEP() {
+	// Apply empty values to the PEP database
+	setDB('mood-value', 1, '');
+	setDB('mood-text', 1, '');
+	setDB('activity-value', 1, '');
+	setDB('activity-text', 1, '');
+	
+	// Click event for user mood
+	$('#my-infos .f-mood a.picker').click(function() {
+		// Initialize some vars
+		var path = '#my-infos .f-mood div.bubble';
+		var mood_id = ['crazy', 'excited', 'playful', 'happy', 'shocked', 'hot', 'sad', 'amorous', 'confident'];
+		var mood_lang = [_e("Crazy"), _e("Excited"), _e("Playful"), _e("Happy"), _e("Shocked"), _e("Hot"), _e("Sad"), _e("Amorous"), _e("Confident")];
+		var mood_val = $('#my-infos .f-mood a.picker').attr('data-value');
+		
+		// Yet displayed?
+		var can_append = true;
+		
+		if(exists(path))
+			can_append = false;
+		
+		// Add this bubble!
+		showBubble(path);
+		
+		if(!can_append)
+			return false;
+		
+		// Generate the HTML code
+		var html = '<div class="bubble removable">';
+		
+		for(i in mood_id) {
+			// Yet in use: no need to display it!
+			if(mood_id[i] == mood_val)
+				continue;
+			
+			html += '<a href="#" class="talk-images" data-value="' + mood_id[i] + '" title="' + mood_lang[i] + '"></a>';
+		}
+		
+		html += '</div>';
+		
+		// Append the HTML code
+		$('#my-infos .f-mood').append(html);
+		
+		// Click event
+		$(path + ' a').click(function() {
+			// Update the mood marker
+			$('#my-infos .f-mood a.picker').attr('data-value', $(this).attr('data-value'));
+			
+			// Close the bubble
+			closeBubbles();
+			
+			// Focus on the status input
+			$(document).oneTime(10, function() {
+				$('#mood-text').focus();
+			});
+			
+			return false;
+		});
+		
+		return false;
+	});
+	
+	// Click event for user activity
+	$('#my-infos .f-activity a.picker').click(function() {
+		// Initialize some vars
+		var path = '#my-infos .f-activity div.bubble';
+		var activity_id = ['doing_chores', 'drinking', 'eating', 'exercising', 'grooming', 'having_appointment', 'inactive', 'relaxing', 'talking', 'traveling', 'working'];
+		var activity_lang = [_e("Chores"), _e("Drinking"), _e("Eating"), _e("Exercising"), _e("Grooming"), _e("Appointment"), _e("Inactive"), _e("Relaxing"), _e("Talking"), _e("Traveling"), _e("Working")];
+		var activity_val = $('#my-infos .f-activity a.picker').attr('data-value');
+		
+		// Yet displayed?
+		var can_append = true;
+		
+		if(exists(path))
+			can_append = false;
+		
+		// Add this bubble!
+		showBubble(path);
+		
+		if(!can_append)
+			return false;
+		
+		// Generate the HTML code
+		var html = '<div class="bubble removable">';
+		
+		for(i in activity_id) {
+			// Yet in use: no need to display it!
+			if(activity_id[i] == activity_val)
+				continue;
+			
+			html += '<a href="#" class="talk-images" data-value="' + activity_id[i] + '" title="' + activity_lang[i] + '"></a>';
+		}
+		
+		html += '</div>';
+		
+		// Append the HTML code
+		$('#my-infos .f-activity').append(html);
+		
+		// Click event
+		$(path + ' a').click(function() {
+			// Update the activity marker
+			$('#my-infos .f-activity a.picker').attr('data-value', $(this).attr('data-value'));
+			
+			// Close the bubble
+			closeBubbles();
+			
+			// Focus on the status input
+			$(document).oneTime(10, function() {
+				$('#activity-text').focus();
+			});
+			
+			return false;
+		});
+		
+		return false;
+	});
+	
+	// Submit events for PEP inputs
+	$('#mood-text, #activity-text').placeholder()
+	
+	.keyup(function(e) {
+		if(e.keyCode == 13) {
+			$(this).blur();
+			
+			return false;
+		}
+	});
+	
+	// Input blur handler
+	$('#mood-text').blur(function() {
+		// Read the parameters
+		var value = $('#my-infos .f-mood a.picker').attr('data-value');
+		var text = $(this).val();
+		
+		// Must send the mood?
+		if((value != getDB('mood-value', 1)) || (text != getDB('mood-text', 1))) {
+			// Update the local stored values
+			setDB('mood-value', 1, value);
+			setDB('mood-text', 1, text);
+			
+			// Send it!
+			sendMood(value, text);
+		}
+	})
+	
+	// Input focus handler
+	.focus(function() {
+		closeBubbles();
+	});
+	
+	// Input blur handler
+	$('#activity-text').blur(function() {
+		// Read the parameters
+		var value = $('#my-infos .f-activity a.picker').attr('data-value');
+		var text = $(this).val();
+		
+		// Must send the activity?
+		if((value != getDB('activity-value', 1)) || (text != getDB('activity-text', 1))) {
+			// Update the local stored values
+			setDB('activity-value', 1, value);
+			setDB('activity-text', 1, text);
+			
+			// Send it!
+			sendActivity(value, '', text);
+		}
+	})
+	
+	// Input focus handler
+	.focus(function() {
+		closeBubbles();
+	});
+}
diff --git a/jappixmini/jappix/js/popup.js b/jappixmini/jappix/js/popup.js
new file mode 100644
index 00000000..0d799ccd
--- /dev/null
+++ b/jappixmini/jappix/js/popup.js
@@ -0,0 +1,42 @@
+/*
+
+Jappix - An open social platform
+These are the popup JS scripts for Jappix
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 26/04/11
+
+*/
+
+// Creates a popup code
+function createPopup(id, content) {
+	// Popup exists?
+	if(exists('#' + id))
+		return false;
+	
+	// Append the popup code
+	$('body').append(
+		'<div id="' + id + '" class="lock removable">' + 
+			'<div class="popup">' + 
+				content + 
+			'</div>' + 
+		'</div>'
+	);
+	
+	return true;
+}
+
+// Destroys a popup code
+function destroyPopup(id) {
+	// Stop the popup timers
+	$('#' + id + ' *').stopTime();
+	
+	// Remove the popup
+	$('#' + id).remove();
+	
+	// Manage input focus
+	inputFocus();
+}
diff --git a/jappixmini/jappix/js/presence.js b/jappixmini/jappix/js/presence.js
new file mode 100644
index 00000000..ef5c1c67
--- /dev/null
+++ b/jappixmini/jappix/js/presence.js
@@ -0,0 +1,1075 @@
+/*
+
+Jappix - An open social platform
+These are the presence JS scripts for Jappix
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 23/09/11
+
+*/
+
+// Sends the user first presence
+var FIRST_PRESENCE_SENT = false;
+
+function firstPresence(checksum) {
+	logThis('First presence sent.', 3);
+	
+	// Jappix is now ready: change the title
+	pageTitle('talk');
+	
+	// Anonymous check
+	var is_anonymous = isAnonymous();
+	
+	// Update our marker
+	FIRST_PRESENCE_SENT = true;
+	
+	// Try to use the last status message
+	var status = getDB('options', 'presence-status');
+	
+	if(!status)
+		status = '';
+	
+	// We tell the world that we are online
+	if(!is_anonymous)
+		sendPresence('', '', '', status, checksum);
+	
+	// Any status to apply?
+	if(status)
+		$('#presence-status').val(status);
+	
+	// Enable the presence picker
+	$('#presence-status').removeAttr('disabled');
+	$('#my-infos .f-presence a.picker').removeClass('disabled');
+	
+	// We set the last activity stamp
+	PRESENCE_LAST_ACTIVITY = getTimeStamp();
+	
+	// We store our presence
+	setDB('presence-show', 1, 'available');
+	
+	// Not anonymous
+	if(!is_anonymous) {
+		// We get the stored bookmarks (because of the photo hash and some other stuffs, we must get it later)
+		getStorage(NS_BOOKMARKS);
+		
+		// We open a new chat if a XMPP link was submitted
+		if((parent.location.hash != '#OK') && LINK_VARS['x']) {
+			// A link is submitted in the URL
+			xmppLink(LINK_VARS['x']);
+			
+			// Set a OK status
+			parent.location.hash = 'OK';
+		}
+	}
+}
+
+// Handles incoming presence packets
+function handlePresence(presence) {
+	// We define everything needed here
+	var from = fullXID(getStanzaFrom(presence));
+	var hash = hex_md5(from);
+	var node = presence.getNode();
+	var xid = bareXID(from);
+	var xidHash = hex_md5(xid);
+	
+	// We get the type content
+	var type = presence.getType();
+	if(!type)
+		type = '';
+	
+	// We get the priority content
+	var priority = presence.getPriority() + '';
+	if(!priority || (type == 'error'))
+		priority = '0';
+	
+	// We get the show content
+	var show = presence.getShow();
+	if(!show || (type == 'error'))
+		show = '';
+	
+	// We get the status content
+	var status = presence.getStatus();
+	if(!status || (type == 'error'))
+		status = '';
+	
+	// We get the photo content
+	var photo = $(node).find('x[xmlns=' + NS_VCARD_P + ']:first photo');
+	var checksum = photo.text();
+	var hasPhoto = photo.size();
+	
+	if(hasPhoto && (type != 'error'))
+		hasPhoto = 'true';
+	else
+		hasPhoto = 'false';
+	
+	// We get the CAPS content
+	var caps = $(node).find('c[xmlns=' + NS_CAPS + ']:first').attr('ver');
+	if(!caps || (type == 'error'))
+		caps = '';
+	
+	// This presence comes from another resource of my account with a difference avatar checksum
+	if((xid == getXID()) && (hasPhoto == 'true') && (checksum != getDB('checksum', 1)))
+		getAvatar(getXID(), 'force', 'true', 'forget');
+	
+	// This presence comes from a groupchat
+	if(isPrivate(xid)) {
+		var x_muc = $(node).find('x[xmlns=' + NS_MUC_USER + ']:first');
+		var item = x_muc.find('item');
+		var affiliation = item.attr('affiliation');
+		var role = item.attr('role');
+		var reason = item.find('reason').text();
+		var iXID = item.attr('jid');
+		var iNick = item.attr('nick');
+		var nick = thisResource(from);
+		var messageTime = getCompleteTime();
+		var notInitial = true;
+		
+		// Read the status code
+		var status_code = new Array();
+		
+		x_muc.find('status').each(function() {
+			status_code.push(parseInt($(this).attr('code')));
+		});
+		
+		// If this is an initial presence (when user join the room)
+		if(exists('#' + xidHash + '[data-initial=true]'))
+			notInitial = false;
+		
+		// If one user is quitting
+		if(type && (type == 'unavailable')) {
+			displayMucPresence(from, xidHash, hash, type, show, status, affiliation, role, reason, status_code, iXID, iNick, messageTime, nick, notInitial);
+			
+			removeDB('presence', from);
+		}
+		
+		// If one user is joining
+		else {
+			// Fixes M-Link first presence bug (missing ID!)
+			if((nick == getMUCNick(xidHash)) && (presence.getID() == null) && !exists('#page-engine #' + xidHash + ' .list .' + hash)) {
+				handleMUC(presence);
+				
+				logThis('Passed M-Link MUC first presence handling.', 2);
+			}
+			
+			else {
+				displayMucPresence(from, xidHash, hash, type, show, status, affiliation, role, reason, status_code, iXID, iNick, messageTime, nick, notInitial);
+				
+				var xml = '<presence from="' + encodeQuotes(from) + '"><priority>' + priority.htmlEnc() + '</priority><show>' + show.htmlEnc() + '</show><type>' + type.htmlEnc() + '</type><status>' + status.htmlEnc() + '</status><avatar>' + hasPhoto.htmlEnc() + '</avatar><checksum>' + checksum.htmlEnc() + '</checksum><caps>' + caps.htmlEnc() + '</caps></presence>';
+				
+				setDB('presence', from, xml);
+			}
+		}
+		
+		// Manage the presence
+		presenceFunnel(from, hash);
+	}
+	
+	// This presence comes from an user or a gateway
+	else {
+		// Subscribed & unsubscribed stanzas
+		if((type == 'subscribed') || (type == 'unsubscribed'))
+			return;
+		
+		// Subscribe stanza
+		else if(type == 'subscribe') {
+			// This is a buddy we can safely authorize, because we added him to our roster
+			if(exists('#buddy-list .buddy[data-xid=' + escape(xid) + ']'))
+				acceptSubscribe(xid);
+			
+			// We do not know this entity, we'd be better ask the user
+			else {
+				// Get the nickname
+				var nickname = $(node).find('nick[xmlns=' + NS_NICK + ']:first').text();
+				
+				// New notification
+				newNotification('subscribe', xid, [xid, nickname], status);
+			}
+		}
+		
+		// Unsubscribe stanza
+		else if(type == 'unsubscribe')
+			sendRoster(xid, 'remove');
+		
+		// Other stanzas
+		else {
+			// Unavailable/error presence
+			if(type == 'unavailable')
+				removeDB('presence', from);
+			
+			// Other presence (available, subscribe...)
+			else {
+				var xml = '<presence from="' + encodeQuotes(from) + '"><priority>' + priority.htmlEnc() + '</priority><show>' + show.htmlEnc() + '</show><type>' + type.htmlEnc() + '</type><status>' + status.htmlEnc() + '</status><avatar>' + hasPhoto.htmlEnc() + '</avatar><checksum>' + checksum.htmlEnc() + '</checksum><caps>' + caps.htmlEnc() + '</caps></presence>';
+				
+				setDB('presence', from, xml);
+			}
+			
+			// We manage the presence
+			presenceFunnel(xid, xidHash);
+			
+			// We display the presence in the current chat
+			if(exists('#' + xidHash)) {
+				var dStatus = filterStatus(xid, status, false);
+				
+				if(dStatus)
+					dStatus = ' (' + dStatus + ')';
+				
+				// Generate the presence-in-chat code
+				var dName = getBuddyName(from).htmlEnc();
+				var dBody = dName + ' (' + from + ') ' + _e("is now") + ' ' + humanShow(show, type) + dStatus;
+				
+				// Check whether it has been previously displayed
+				var can_display = true;
+				
+				if($('#' + xidHash + ' .one-line.system-message:last').html() == dBody)
+					can_display = false;
+				
+				if(can_display)
+					displayMessage('chat', xid, xidHash, dName, dBody, getCompleteTime(), getTimeStamp(), 'system-message', false);
+			}
+		}
+	}
+	
+	// For logger
+	if(!show) {
+		if(!type)
+			show = 'available';
+		else
+			show = 'unavailable';
+	}
+	
+	logThis('Presence received: ' + show + ', from ' + from);
+}
+
+// Displays a MUC presence
+function displayMucPresence(from, roomHash, hash, type, show, status, affiliation, role, reason, status_code, iXID, iNick, messageTime, nick, initial) {
+	// Generate the values
+	var thisUser = '#page-engine #' + roomHash + ' .list .' + hash;
+	var thisPrivate = $('#' + hash + ' .message-area');
+	var nick_html = nick.htmlEnc();
+	var real_xid = '';
+	var write = nick_html + ' ';
+	var notify = false;
+	
+	// Reset data?
+	if(!role)
+		role = 'participant';
+	if(!affiliation)
+		affiliation = 'none';
+	
+	// Must update the role?
+	if(exists(thisUser) && (($(thisUser).attr('data-role') != role) || ($(thisUser).attr('data-affiliation') != affiliation)))
+		$(thisUser).remove();
+	
+	// Any XID submitted?
+	if(iXID) {
+		real_xid = ' data-realxid="' + iXID + '"';
+		iXID = bareXID(iXID);
+		write += ' (<a onclick="return checkChatCreate(\'' + encodeOnclick(iXID) + '\', \'chat\');" href="xmpp:' + encodeOnclick(iXID) + '">' + iXID + '</a>) ';
+	}
+	
+	// User does not exists yet
+	if(!exists(thisUser) && (!type || (type == 'available'))) {
+		var myself = '';
+		
+		// Is it me?
+		if(nick == getMUCNick(roomHash)) {
+			// Enable the room
+			$('#' + roomHash + ' .message-area').removeAttr('disabled');
+			
+			// Marker
+			myself = ' myself';
+		}
+		
+		// Set the user in the MUC list
+		$('#' + roomHash + ' .list .' + role + ' .title').after(
+			'<div class="user ' + hash + myself + '" data-xid="' + encodeQuotes(from) + '" data-nick="' + escape(nick) + '"' + real_xid + ' data-role="' + encodeQuotes(role) + '" data-affiliation="' + encodeQuotes(affiliation) + '">' + 
+				'<div class="name talk-images available">' + nick_html + '</div>' + 
+				
+				'<div class="avatar-container">' + 
+					'<img class="avatar" src="' + './img/others/default-avatar.png' + '" alt="" />' + 
+				'</div>' + 
+			'</div>'
+		);
+		
+		// Click event
+		if(nick != getMUCNick(roomHash))
+			$(thisUser).live('click', function() {
+				checkChatCreate(from, 'private');
+			});
+		
+		// We tell the user that someone entered the room
+		if(!initial) {
+			notify = true;
+			write += _e("joined the chat room");
+			
+			// Any status?
+			if(status)
+				write += ' (' + filterThisMessage(status, nick_html, true) + ')';
+			else
+				write += ' (' + _e("no status") + ')';
+		}
+		
+		// Enable the private chat input
+		thisPrivate.removeAttr('disabled');
+	}
+	
+	else if((type == 'unavailable') || (type == 'error')) {
+		// Is it me?
+		if(nick == getMUCNick(roomHash)) {
+			$(thisUser).remove();
+			
+			// Disable the groupchat input
+			$('#' + roomHash + ' .message-area').attr('disabled', true);
+			
+			// Remove all the groupchat users
+			$('#' + roomHash + ' .list .user').remove();
+		}
+		
+		// Someone has been kicked or banned?
+		if(existArrayValue(status_code, 301) || existArrayValue(status_code, 307)) {
+			$(thisUser).remove();
+			notify = true;
+			
+			// Kicked?
+			if(existArrayValue(status_code, 307))
+				write += _e("has been kicked");
+			
+			// Banned?
+			if(existArrayValue(status_code, 301))
+				write += _e("has been banned");
+			
+			// Any reason?
+			if(reason)
+				write += ' (' + filterThisMessage(reason, nick_html, true) + ')';
+			else
+				write += ' (' + _e("no reason") + ')';
+		}
+		
+		// Nickname change?
+		else if(existArrayValue(status_code, 303) && iNick) {
+			notify = true;
+			write += printf(_e("changed his/her nickname to %s"), iNick.htmlEnc());
+			
+			// New values
+			var new_xid = cutResource(from) + '/' + iNick;
+			var new_hash = hex_md5(new_xid);
+			var new_class = 'user ' + new_hash;
+			
+			if($(thisUser).hasClass('myself'))
+				new_class += ' myself';
+			
+			// Die the click event
+			$(thisUser).die('click');
+			
+			// Change to the new nickname
+			$(thisUser).attr('data-nick', iNick)
+			           .attr('data-xid', new_xid)
+			           .find('.name').text(iNick);
+			
+			// Change the user class
+			$(thisUser).attr('class', new_class);
+			
+			// New click event
+			$('#page-engine #' + roomHash + ' .list .' + new_hash).live('click', function() {
+				checkChatCreate(new_xid, 'private');
+			});
+		}
+		
+		// We tell the user that someone left the room
+		else if(!initial) {
+			$(thisUser).remove();
+			notify = true;
+			write += _e("left the chat room");
+			
+			// Any status?
+			if(status)
+				write += ' (' + filterThisMessage(status, nick_html, true) + ')';
+			else
+				write += ' (' + _e("no status") + ')';
+		}
+		
+		// Disable the private chat input
+		thisPrivate.attr('disabled', true);
+	}
+	
+	// Must notify something
+	if(notify)
+		displayMessage('groupchat', from, roomHash, nick_html, write, messageTime, getTimeStamp(), 'system-message', false);
+	
+	// Set the good status show icon
+	switch(show) {
+		case 'chat':
+		case 'away':
+		case 'xa':
+		case 'dnd':
+			break;
+		
+		default:
+			show = 'available';
+			break;
+	}
+	
+	$(thisUser + ' .name').attr('class', 'name talk-images ' + show);
+	
+	// Set the good status text
+	var uTitle = nick;
+	
+	// Any XID to add?
+	if(iXID)
+		uTitle += ' (' + iXID + ')';
+	
+	// Any status to add?
+	if(status)
+		uTitle += ' - ' + status;
+	
+	$(thisUser).attr('title', uTitle);
+	
+	// Show or hide the role category, depending of its content
+	$('#' + roomHash + ' .list .role').each(function() {
+		if($(this).find('.user').size())
+			$(this).show();
+		else
+			$(this).hide();
+	});
+}
+
+// Filters a given status
+function filterStatus(xid, status, cut) {
+	var dStatus = '';
+	
+	if(!status)
+		status = '';
+	
+	else {
+		if(cut)
+			dStatus = truncate(status, 50);
+		else
+			dStatus = status;
+		
+		dStatus = filterThisMessage(dStatus, getBuddyName(xid).htmlEnc(), true);
+	}
+	
+	return dStatus;
+}
+
+// Displays a user's presence
+function displayPresence(value, type, show, status, hash, xid, avatar, checksum, caps) {
+	// Display the presence in the roster
+	var path = '#buddy-list .' + hash;
+	var buddy = $('#buddy-list .content .' + hash);
+	var dStatus = filterStatus(xid, status, false);
+	var tStatus = encodeQuotes(status);
+	var biStatus;
+	
+	// The buddy presence behind his name
+	$(path + ' .name .buddy-presence').replaceWith('<p class="buddy-presence talk-images ' + type + '">' + value + '</p>');
+	
+	// The buddy presence in the buddy infos
+	if(dStatus)
+		biStatus = dStatus;
+	else
+		biStatus = value;
+	
+	$(path + ' .bi-status').replaceWith('<p class="bi-status talk-images ' + type + '" title="' + tStatus + '">' + biStatus + '</p>');
+	
+	// When the buddy disconnect himself, we hide him
+	if((type == 'unavailable') || (type == 'error')) {
+		// Set a special class to the buddy
+		buddy.addClass('hidden-buddy');
+		
+		// No filtering is launched?
+		if(!SEARCH_FILTERED)
+			buddy.hide();
+		
+		// All the buddies are shown?
+		if(BLIST_ALL)
+			buddy.show();
+		
+		// Chat stuffs
+		if(exists('#' + hash)) {
+			// Remove the chatstate stuffs
+			resetChatState(hash);
+			$('#' + hash + ' .chatstate').remove();
+			$('#' + hash + ' .message-area').removeAttr('data-chatstates');
+			
+			// Get the buddy avatar (only if a chat is opened)
+			getAvatar(xid, 'cache', 'true', 'forget');
+		}
+	}
+	
+	// If the buddy is online
+	else {
+		// When the buddy is online, we show it
+		buddy.removeClass('hidden-buddy');
+		
+		// No filtering is launched?
+		if(!SEARCH_FILTERED)
+			buddy.show();
+		
+		// Get the online buddy avatar if not a gateway
+		getAvatar(xid, 'cache', avatar, checksum);
+	}
+	
+	// Display the presence in the chat
+	if(exists('#' + hash)) {
+		// We generate a well formed status message
+		if(dStatus) {
+			// No need to write the same status two times
+			if(dStatus == value)
+				dStatus = '';
+			else
+				dStatus = ' (' + dStatus + ')';
+		}
+		
+		// We show the presence value
+		$('#' + hash + ' .bc-infos').replaceWith('<p class="bc-infos" title="' + tStatus + '"><span class="' + type + ' show talk-images">' + value + '</span>' + dStatus + '</p>');
+		
+		// Process the new status position
+		adaptChatPresence(hash);
+		
+		// Get the disco#infos for this user
+		var highest = getHighestResource(xid);
+		
+		if(highest)
+			getDiscoInfos(highest, caps);
+		else
+			displayDiscoInfos(xid, '');
+	}
+	
+	// Display the presence in the switcher
+	if(exists('#page-switch .' + hash))
+		$('#page-switch .' + hash + ' .icon').removeClass('available unavailable error away busy').addClass(type);
+	
+	// Update roster groups
+	if(!SEARCH_FILTERED)
+		updateGroups();
+	else
+		funnelFilterBuddySearch();
+}
+
+// Process the chat presence position
+function adaptChatPresence(hash) {
+	// Get values
+	var pep_numb = $('#' + hash + ' .bc-pep').find('a').size();
+	
+	// Process the right position
+	var presence_right = 12;
+	
+	if(pep_numb)
+		presence_right = (pep_numb * 20) + 18;
+	
+	// Apply the right position
+	$('#' + hash + ' p.bc-infos').css('right', presence_right);
+}
+
+// Convert the presence "show" element into a human-readable output
+function humanShow(show, type) {
+	if(type == 'unavailable')
+		show = _e("Unavailable");
+	
+	else if(type == 'error')
+		show = _e("Error");
+	
+	else {
+		switch(show) {
+			case 'chat':
+				show = _e("Talkative");
+				break;
+			
+			case 'away':
+				show = _e("Away");
+				break;
+			
+			case 'xa':
+				show = _e("Not available");
+				break;
+			
+			case 'dnd':
+				show = _e("Busy");
+				break;
+			
+			default:
+				show = _e("Available");
+				break;
+		}
+	}
+	
+	return show;
+}
+
+// Makes the presence data go in the right way
+function presenceIA(type, show, status, hash, xid, avatar, checksum, caps) {
+	// Is there a status defined?
+	if(!status)
+		status = humanShow(show, type);
+	
+	// Then we can handle the events
+	if(type == 'error')
+		displayPresence(_e("Error"), 'error', show, status, hash, xid, avatar, checksum, caps);
+	
+	else if(type == 'unavailable')
+		displayPresence(_e("Unavailable"), 'unavailable', show, status, hash, xid, avatar, checksum, caps);
+	
+	else {
+		switch(show) {
+			case 'chat':
+				displayPresence(_e("Talkative"), 'available', show, status, hash, xid, avatar, checksum, caps);
+				break;
+			
+			case 'away':
+				displayPresence(_e("Away"), 'away', show, status, hash, xid, avatar, checksum, caps);
+				break;
+			
+			case 'xa':
+				displayPresence(_e("Not available"), 'busy', show, status, hash, xid, avatar, checksum, caps);
+				break;
+			
+			case 'dnd':
+				displayPresence(_e("Busy"), 'busy', show, status, hash, xid, avatar, checksum, caps);
+				break;
+			
+			default:
+				displayPresence(_e("Available"), 'available', show, status, hash, xid, avatar, checksum, caps);
+				break;
+		}
+	}
+}
+
+// Gets the highest resource priority for an user
+function highestPriority(xid) {
+	var maximum = null;
+	var selector, priority, type, highest;
+	
+	// This is a groupchat presence
+	if(xid.indexOf('/') != -1)
+		highest = XMLFromString(getDB('presence', xid));
+	
+	// This is a "normal" presence: get the highest priority resource
+	else {
+		for(var i = 0; i < sessionStorage.length; i++) {
+			// Get the pointer values
+			var current = sessionStorage.key(i);
+			
+			// If the pointer is on a stored presence
+			if(explodeThis('_', current, 0) == 'presence') {
+				// Get the current XID
+				var now = bareXID(explodeThis('_', current, 1));
+				
+				// If the current XID equals the asked XID
+				if(now == xid) {
+					var xml = XMLFromString(sessionStorage.getItem(current));
+					var priority = parseInt($(xml).find('priority').text());
+					
+					// Higher priority
+					if((priority >= maximum) || (maximum == null)) {
+						maximum = priority;
+						highest = xml;
+					}
+				}
+			}
+		}
+	}
+	
+	// The user might be offline if no highest
+	if(!highest)
+		highest = XMLFromString('<presence><type>unavailable</type></presence>');
+	
+	return highest;
+}
+
+// Gets the resource from a XID which has the highest priority
+function getHighestResource(xid) {
+	var xml = $(highestPriority(xid));
+	var highest = xml.find('presence').attr('from');
+	var type = xml.find('type').text();
+	
+	// If the use is online, we can return its highest resource
+	if(!type || (type == 'available') || (type == 'null'))
+		return highest;
+	else
+		return false;
+}
+
+// Makes something easy to process for the presence IA
+function presenceFunnel(xid, hash) {
+	// Get the highest priority presence value
+	var xml = $(highestPriority(xid));
+	var type = xml.find('type').text();
+	var show = xml.find('show').text();
+	var status = xml.find('status').text();
+	var avatar = xml.find('avatar').text();
+	var checksum = xml.find('checksum').text();
+	var caps = xml.find('caps').text();
+	
+	// Display the presence with that stored value
+	if(!type && !show)
+		presenceIA('', 'available', status, hash, xid, avatar, checksum, caps);
+	else
+		presenceIA(type, show, status, hash, xid, avatar, checksum, caps);
+}
+
+// Sends a defined presence packet
+function sendPresence(to, type, show, status, checksum, limit_history, password, handle) {
+	// Get some stuffs
+	var priority = getDB('priority', 1);
+	
+	if(!priority)
+		priority = '1';
+	if(!checksum)
+		checksum = getDB('checksum', 1);
+	if(show == 'available')
+		show = '';
+	if(type == 'available')
+		type = '';
+	
+	// New presence
+	var presence = new JSJaCPresence();
+	
+	// Avoid "null" or "none" if nothing stored
+	if(!checksum || (checksum == 'none'))
+		checksum = '';
+	
+	// Presence headers
+	if(to)
+		presence.setTo(to);
+	if(type)
+		presence.setType(type);
+	if(show)
+		presence.setShow(show);
+	if(status)
+		presence.setStatus(status);
+	
+	presence.setPriority(priority);
+	
+	// CAPS (entity capabilities)
+	presence.appendNode('c', {'xmlns': NS_CAPS, 'hash': 'sha-1', 'node': 'https://www.jappix.com/', 'ver': myCaps()});
+	
+	// Nickname
+	var nickname = getName();
+	
+	if(nickname)
+		presence.appendNode('nick', {'xmlns': NS_NICK}, nickname);
+	
+	// vcard-temp:x:update node
+	var x = presence.appendNode('x', {'xmlns': NS_VCARD_P});
+	x.appendChild(presence.buildNode('photo', {'xmlns': NS_VCARD_P}, checksum));
+	
+	// MUC X data
+	if(limit_history || password) {
+		var xMUC = presence.appendNode('x', {'xmlns': NS_MUC});
+		
+		// Max messages age (for MUC)
+		if(limit_history)
+			xMUC.appendChild(presence.buildNode('history', {'maxstanzas': 20, 'seconds': 86400, 'xmlns': NS_MUC}));
+		
+		// Room password
+		if(password)
+			xMUC.appendChild(presence.buildNode('password', {'xmlns': NS_MUC}, password));
+	}
+	
+	// If away, send a last activity time
+	if((show == 'away') || (show == 'xa')) {
+		/* REF: http://xmpp.org/extensions/xep-0256.html */
+		
+		presence.appendNode(presence.buildNode('query', {
+			'xmlns': NS_LAST,
+			'seconds': getPresenceLast()
+		}));
+	}
+	
+	// Else, set a new last activity stamp
+	else
+		PRESENCE_LAST_ACTIVITY = getTimeStamp();
+	
+	// Send the presence packet
+	if(handle)
+		con.send(presence, handle);
+	else
+		con.send(presence);
+	
+	if(!type)
+		type = 'available';
+	
+	logThis('Presence sent: ' + type, 3);
+}
+
+// Performs all the actions to get the presence data
+function presenceSend(checksum, autoidle) {
+	// We get the values of the inputs
+	var show = getUserShow();
+	var status = getUserStatus();
+	
+	// Send the presence
+	if(!isAnonymous())
+		sendPresence('', '', show, status, checksum);
+	
+	// We set the good icon
+	presenceIcon(show);
+	
+	// We store our presence
+	if(!autoidle)
+		setDB('presence-show', 1, show);
+	
+	// We send the presence to our active MUC
+	$('.page-engine-chan[data-type=groupchat]').each(function() {
+		var tmp_nick = $(this).attr('data-nick');
+		
+		if(!tmp_nick)
+			return;
+		
+		var room = unescape($(this).attr('data-xid'));
+		var nick = unescape(tmp_nick);
+		
+		// Must re-initialize?
+		if(RESUME)
+			getMUC(room, nick);
+		
+		// Not disabled?
+		else if(!$(this).find('.message-area').attr('disabled'))
+			sendPresence(room + '/' + nick, '', show, status, '', true);
+	});
+}
+
+// Changes the presence icon
+function presenceIcon(value) {
+	$('#my-infos .f-presence a.picker').attr('data-value', value);
+}
+
+// Sends a subscribe stanza
+function sendSubscribe(to, type) {
+	var status = '';
+	
+	// Subscribe request?
+	if(type == 'subscribe')
+		status = printf(_e("Hi, I am %s, I would like to add you as my friend."), getName());
+	
+	sendPresence(to, type, '', status);
+}
+
+// Accepts the subscription from another entity
+function acceptSubscribe(xid, name) {
+	// We update our chat
+	$('#' + hex_md5(xid) + ' .tools-add').hide();
+	
+	// We send a subsribed presence (to confirm)
+	sendSubscribe(xid, 'subscribed');
+	
+	// We send a subscription request (subscribe both sides)
+	sendSubscribe(xid, 'subscribe');
+	
+	// Specify the buddy name (if any)
+	if(name)
+		sendRoster(xid, '', name)
+}
+
+// Sends automatic away presence
+var AUTO_IDLE = false;
+
+function autoIdle() {
+	// Not connected?
+	if(!isConnected())
+		return;
+	
+	// Stop if an xa presence was set manually
+	var last_presence = getUserShow();
+	
+	if(!AUTO_IDLE && ((last_presence == 'away') || (last_presence == 'xa')))
+		return;
+	
+	var idle_presence;
+	var activity_limit;
+	
+	// Can we extend to auto extended away mode (20 minutes)?
+	if(AUTO_IDLE && (last_presence == 'away')) {
+		idle_presence = 'xa';
+		activity_limit = 1200;
+	}
+	
+	// We must set the user to auto-away (10 minutes)
+	else {
+		idle_presence = 'away';
+		activity_limit = 600;
+	}
+	
+	// The user is really inactive and has set another presence than extended away
+	if(((!AUTO_IDLE && (last_presence != 'away')) || (AUTO_IDLE && (last_presence == 'away'))) && (getLastActivity() >= activity_limit)) {
+		// Then tell we use an auto presence
+		AUTO_IDLE = true;
+		
+		// Get the old status message
+		var status = getDB('options', 'presence-status');
+		
+		if(!status)
+			status = '';
+		
+		// Change the presence input
+		$('#my-infos .f-presence a.picker').attr('data-value', idle_presence);
+		$('#presence-status').val(status);
+		
+		// Then send the xa presence
+		presenceSend('', true);
+		
+		logThis('Auto-idle presence sent: ' + idle_presence, 3);
+	}
+}
+
+// Restores the old presence on a document bind
+function eventIdle() {
+	// If we were idle, restore our old presence
+	if(AUTO_IDLE) {
+		// Get the values
+		var show = getDB('presence-show', 1);
+		var status = getDB('options', 'presence-status');
+		
+		// Change the presence input
+		$('#my-infos .f-presence a.picker').attr('data-value', show);
+		$('#presence-status').val(status);
+		$('#presence-status').placeholder();
+		
+		// Then restore the old presence
+		presenceSend('', true);
+		
+		if(!show)
+			show = 'available';
+		
+		logThis('Presence restored: ' + show, 3);
+	}
+	
+	// Apply some values
+	AUTO_IDLE = false;
+	LAST_ACTIVITY = getTimeStamp();
+}
+
+// Lives the auto idle functions
+function liveIdle() {
+	// Apply the autoIdle function every minute
+	AUTO_IDLE = false;
+	$('#my-infos .f-presence').everyTime('30s', autoIdle);
+	
+	// On body bind (click & key event)
+	$('body').live('mousedown', eventIdle)
+		 .live('mousemove', eventIdle)
+		 .live('keydown', eventIdle);
+}
+
+// Kills the auto idle functions
+function dieIdle() {
+	// Remove the event detector
+	$('body').die('mousedown', eventIdle)
+		 .die('mousemove', eventIdle)
+		 .die('keydown', eventIdle);
+}
+
+// Gets the user presence show
+function getUserShow() {
+	return $('#my-infos .f-presence a.picker').attr('data-value');
+}
+
+// Gets the user presence status
+function getUserStatus() {
+	return $('#presence-status').val();
+}
+
+// Addon launcher
+function launchPresence() {
+	// Click event for user presence show
+	$('#my-infos .f-presence a.picker').click(function() {
+		// Disabled?
+		if($(this).hasClass('disabled'))
+			return false;
+		
+		// Initialize some vars
+		var path = '#my-infos .f-presence div.bubble';
+		var show_id = ['xa', 'away', 'available'];
+		var show_lang = [_e("Not available"), _e("Away"), _e("Available")];
+		var show_val = getUserShow();
+		
+		// Yet displayed?
+		var can_append = true;
+		
+		if(exists(path))
+			can_append = false;
+		
+		// Add this bubble!
+		showBubble(path);
+		
+		if(!can_append)
+			return false;
+		
+		// Generate the HTML code
+		var html = '<div class="bubble removable">';
+		
+		for(i in show_id) {
+			// Yet in use: no need to display it!
+			if(show_id[i] == show_val)
+				continue;
+			
+			html += '<a href="#" class="talk-images" data-value="' + show_id[i] + '" title="' + show_lang[i] + '"></a>';
+		}
+		
+		html += '</div>';
+		
+		// Append the HTML code
+		$('#my-infos .f-presence').append(html);
+		
+		// Click event
+		$(path + ' a').click(function() {
+			// Update the presence show marker
+			$('#my-infos .f-presence a.picker').attr('data-value', $(this).attr('data-value'));
+			
+			// Close the bubble
+			closeBubbles();
+			
+			// Focus on the status input
+			$(document).oneTime(10, function() {
+				$('#presence-status').focus();
+			});
+			
+			return false;
+		});
+		
+		return false;
+	});
+	
+	// Submit events for user presence status
+	$('#presence-status').placeholder()
+	
+	.keyup(function(e) {
+		if(e.keyCode == 13) {
+			$(this).blur();
+			
+			return false;
+		}
+	})
+	
+	.blur(function() {
+		// Read the parameters
+		var show = getUserShow();
+		var status = getUserStatus();
+		
+		// Read the old parameters
+		var old_show = getDB('presence-show', 1);
+		var old_status = getDB('options', 'presence-status');
+		
+		// Must send the presence?
+		if((show != old_show) || (status != old_status)) {
+			// Update the local stored status
+			setDB('options', 'presence-status', status);
+			
+			// Update the server stored status
+			if(status != old_status)
+				storeOptions();
+			
+			// Send the presence
+			presenceSend();
+		}
+	})
+	
+	// Input focus handler
+	.focus(function() {
+		closeBubbles();
+	});
+}
diff --git a/jappixmini/jappix/js/privacy.js b/jappixmini/jappix/js/privacy.js
new file mode 100644
index 00000000..d9cd46b6
--- /dev/null
+++ b/jappixmini/jappix/js/privacy.js
@@ -0,0 +1,963 @@
+/*
+
+Jappix - An open social platform
+These are the privacy JS scripts for Jappix
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 23/06/11
+
+*/
+
+// Opens the privacy popup
+function openPrivacy() {
+	// Popup HTML content
+	var html = 
+	'<div class="top">' + _e("Privacy") + '</div>' + 
+	
+	'<div class="content">' + 
+		'<div class="privacy-head">' + 
+			'<div class="list-left">' + 
+				'<span>' + _e("Choose") + '</span>' + 
+				'<select disabled=""></select>' + 
+				'<a href="#" class="list-remove one-button talk-images" title="' + _e("Remove") + '"></a>' + 
+			'</div>' + 
+			
+			'<div class="list-center"></div>' + 
+			
+			'<div class="list-right">' + 
+				'<span>' + _e("Add") + '</span>' + 
+				'<input type="text" placeholder="' + _e("List name") + '" />' + 
+			'</div>' + 
+		'</div>' + 
+		
+		'<div class="privacy-item">' + 
+			'<span>' + _e("Item") + '</span>' + 
+			'<select disabled=""></select>' + 
+			'<a href="#" class="item-add one-button talk-images" title="' + _e("Add") + '"></a>' + 
+			'<a href="#" class="item-remove one-button talk-images" title="' + _e("Remove") + '"></a>' + 
+			'<a href="#" class="item-save one-button talk-images">' + _e("Save") + '</a>' + 
+			
+			'<div class="clear"></div>' + 
+		'</div>' + 
+		
+		'<div class="privacy-form">' + 
+			'<div class="privacy-first">' + 
+				'<label><input type="radio" name="action" value="allow" disabled="" />' + _e("Allow") + '</label>' + 
+				'<label><input type="radio" name="action" value="deny" disabled="" />' + _e("Deny") + '</label>' + 
+			'</div>' + 
+			
+			'<div class="privacy-second">' + 
+				'<label><input type="radio" name="type" value="jid" disabled="" />' + _e("Address") + '</label>' + 
+				'<input type="text" name="jid" disabled="" />' + 
+				
+				'<label><input type="radio" name="type" value="group" disabled="" />' + _e("Group") + '</label>' + 
+				'<select name="group" disabled="">' + groupsToHtmlPrivacy() + '</select>' + 
+				
+				'<label><input type="radio" name="type" value="subscription" disabled="" />' + _e("Subscription") + '</label>' + 
+				'<select name="subscription" disabled="">' + 
+					'<option value="none">' + _e("None") + '</option>' + 
+					'<option value="both">' + _e("Both") + '</option>' + 
+					'<option value="from">' + _e("From") + '</option>' + 
+					'<option value="to">' + _e("To") + '</option>' + 
+				'</select>' + 
+				
+				'<label><input type="radio" name="type" value="everybody" disabled="" />' + _e("Everybody") + '</label>' + 
+			'</div>' + 
+			
+			'<div class="privacy-third">' + 
+				'<label><input type="checkbox" name="send-messages" disabled="" />' + _e("Send messages") + '</label>' + 
+				'<label><input type="checkbox" name="send-queries" disabled="" />' + _e("Send queries") + '</label>' + 
+				'<label><input type="checkbox" name="see-status" disabled="" />' + _e("See my status") + '</label>' + 
+				'<label><input type="checkbox" name="send-status" disabled="" />' + _e("Send his/her status") + '</label>' + 
+				'<label><input type="checkbox" name="everything" disabled="" />' + _e("Everything") + '</label>' + 
+			'</div>' + 
+			
+			'<div class="clear"></div>' + 
+		'</div>' + 
+		
+		'<div class="privacy-active">' + 
+			'<label>' + _e("Order") + '<input type="text" name="order" value="1" disabled="" /></label>' + 
+			
+			'<div class="privacy-active-elements">' + 
+				'<label><input type="checkbox" name="active" disabled="" />' + _e("Active for this session") + '</label>' + 
+				'<label><input type="checkbox" name="default" disabled="" />' + _e("Always active") + '</label>' + 
+			'</div>' + 
+		'</div>' + 
+	'</div>' + 
+	
+	'<div class="bottom">' + 
+		'<div class="wait wait-medium"></div>' + 
+		
+		'<a href="#" class="finish">' + _e("Close") + '</a>' + 
+	'</div>';
+	
+	// Create the popup
+	createPopup('privacy', html);
+	
+	// Associate the events
+	launchPrivacy();
+	
+	// Display the available privacy lists
+	displayListsPrivacy();
+	
+	// Get the first list items
+	displayItemsPrivacy();
+	
+	return false;
+}
+
+// Quits the privacy popup
+function closePrivacy() {
+	// Destroy the popup
+	destroyPopup('privacy');
+	
+	return false;
+}
+
+// Sets the received state for privacy block list
+function receivedPrivacy() {
+	// Store marker
+	setDB('privacy-marker', 'available', 'true');
+	
+	// Show privacy elements
+	$('.privacy-hidable').show();
+}
+
+// Gets available privacy lists
+function listPrivacy() {
+	// Build query
+	var iq = new JSJaCIQ();
+	iq.setType('get');
+	
+	iq.setQuery(NS_PRIVACY);
+	
+	con.send(iq, handleListPrivacy);
+	
+	logThis('Getting available privacy list(s)...');
+}
+
+// Handles available privacy lists
+function handleListPrivacy(iq) {
+	// Error?
+	if(iq.getType() == 'error')
+		return logThis('Privacy lists not supported!', 2);
+	
+	// Get IQ query content
+	var iqQuery = iq.getQuery();
+	
+	// Save the content
+	setDB('privacy-lists', 'available', xmlToString(iqQuery));
+	
+	// Any block list?
+	if($(iqQuery).find('list[name=block]').size()) {
+		// Not the default one?
+		if(!$(iqQuery).find('default[name=block]').size())
+			changePrivacy('block', 'default');
+		else
+			setDB('privacy-marker', 'default', 'block');
+		
+		// Not the active one?
+		if(!$(iqQuery).find('active[name=block]').size())
+			changePrivacy('block', 'active');
+		else
+			setDB('privacy-marker', 'active', 'block');
+		
+		// Get the block list rules
+		getPrivacy('block');
+	}
+	
+	// Apply the received marker here
+	else
+		receivedPrivacy();
+	
+	logThis('Got available privacy list(s).', 3);
+}
+
+// Gets privacy lists
+function getPrivacy(list) {
+	// Build query
+	var iq = new JSJaCIQ();
+	iq.setType('get');
+	
+	// Privacy query
+	var iqQuery = iq.setQuery(NS_PRIVACY);
+	iqQuery.appendChild(iq.buildNode('list', {'xmlns': NS_PRIVACY, 'name': list}));
+	
+	con.send(iq, handleGetPrivacy);
+	
+	// Must show the wait item?
+	if(exists('#privacy'))
+		$('#privacy .wait').show();
+	
+	logThis('Getting privacy list(s): ' + list);
+}
+
+// Handles privacy lists
+function handleGetPrivacy(iq) {
+	// Apply a "received" marker
+	receivedPrivacy();
+	
+	// Store the data for each list
+	$(iq.getQuery()).find('list').each(function() {
+		// Read list name
+		var list_name = $(this).attr('name');
+		
+		// Store list content
+		setDB('privacy', list_name, xmlToString(this));
+		
+		// Is this a block list?
+		if(list_name == 'block') {
+			// Reset buddies
+			$('#buddy-list .buddy').removeClass('blocked');
+			
+			// XID types
+			$(this).find('item[action=deny][type=jid]').each(function() {
+				$('#buddy-list .buddy[data-xid=' + escape($(this).attr('value')) + ']').addClass('blocked');
+			});
+			
+			// Group types
+			$(this).find('item[action=deny][type=group]').each(function() {
+				$('#buddy-list .group' + hex_md5($(this).attr('value')) + ' .buddy').addClass('blocked');
+			});
+		}
+	});
+	
+	// Must display it to the popup?
+	if(exists('#privacy')) {
+		displayItemsPrivacy();
+		
+		$('#privacy .wait').hide();
+	}
+	
+	logThis('Got privacy list(s).', 3);
+}
+
+// Sets a privacy list
+function setPrivacy(list, types, values, actions, orders, presence_in, presence_out, msg, iq_p) {
+	// Build query
+	var iq = new JSJaCIQ();
+	iq.setType('set');
+	
+	// Privacy query
+	var iqQuery = iq.setQuery(NS_PRIVACY);
+	var iqList = iqQuery.appendChild(iq.buildNode('list', {'xmlns': NS_PRIVACY, 'name': list}));
+	
+	// Build the item elements
+	if(types && types.length) {
+		for(var i = 0; i < types.length; i++) {
+			// Item element
+			var iqItem = iqList.appendChild(iq.buildNode('item', {'xmlns': NS_PRIVACY}));
+			
+			// Item attributes
+			if(types[i])
+				iqItem.setAttribute('type', types[i]);
+			if(values[i])
+				iqItem.setAttribute('value', values[i]);
+			if(actions[i])
+				iqItem.setAttribute('action', actions[i]);
+			if(orders[i])
+				iqItem.setAttribute('order', orders[i]);
+			
+			// Child elements
+			if(presence_in[i])
+				iqItem.appendChild(iq.buildNode('presence-in', {'xmlns': NS_PRIVACY}));
+			if(presence_out[i])
+				iqItem.appendChild(iq.buildNode('presence-out', {'xmlns': NS_PRIVACY}));
+			if(msg[i])
+				iqItem.appendChild(iq.buildNode('message', {'xmlns': NS_PRIVACY}));
+			if(iq_p[i])
+				iqItem.appendChild(iq.buildNode('iq', {'xmlns': NS_PRIVACY}));
+		}
+	}
+	
+	con.send(iq);
+	
+	logThis('Sending privacy list: ' + list);
+}
+
+// Push a privacy list item to a list
+function pushPrivacy(list, type, value, action, order, presence_in, presence_out, msg, iq_p, hash, special_action) {
+	// Read the stored elements (to add them)
+	var stored = XMLFromString(getDB('privacy', list));
+	
+	// Read the first value
+	var first_val = value[0];
+	
+	// Must remove the given value?
+	if(special_action == 'remove') {
+		type = [];
+		value = [];
+		action = [];
+		order = [];
+		presence_in = [];
+		presence_out = [];
+		iq_p = [];
+	}
+	
+	// Serialize them to an array
+	$(stored).find('item').each(function() {
+		// Attributes
+		var c_type = $(this).attr('type');
+		var c_value = $(this).attr('value');
+		var c_action = $(this).attr('action');
+		var c_order = $(this).attr('order');
+		
+		// Generate hash
+		var c_hash = hex_md5(c_type + c_value + c_action + c_order);
+		
+		// Do not push it twice!
+		if(((c_hash != hash) && (special_action != 'roster')) || ((first_val != c_value) && (special_action == 'roster'))) {
+			if(!c_type)
+				c_type = '';
+			if(!c_value)
+				c_value = '';
+			if(!c_action)
+				c_action = '';
+			if(!c_order)
+				c_order = '';
+			
+			type.push(c_type);
+			value.push(c_value);
+			action.push(c_action);
+			order.push(c_order);
+			
+			// Child elements
+			if($(this).find('presence-in').size())
+				presence_in.push(true);
+			else
+				presence_in.push(false);
+			
+			if($(this).find('presence-out').size())
+				presence_out.push(true);
+			else
+				presence_out.push(false);
+			
+			if($(this).find('message').size())
+				msg.push(true);
+			else
+				msg.push(false);
+			
+			if($(this).find('iq').size())
+				iq_p.push(true);
+			else
+				iq_p.push(false);
+		}
+	});
+	
+	// Send it!
+	setPrivacy(list, type, value, action, order, presence_in, presence_out, msg, iq_p);
+}
+
+// Change a privacy list status
+function changePrivacy(list, status) {
+	// Yet sent?
+	if(getDB('privacy-marker', status) == list)
+		return;
+	
+	// Write a marker
+	setDB('privacy-marker', status, list);
+	
+	// Build query
+	var iq = new JSJaCIQ();
+	iq.setType('set');
+	
+	// Privacy query
+	var iqQuery = iq.setQuery(NS_PRIVACY);
+	var iqStatus = iqQuery.appendChild(iq.buildNode(status, {'xmlns': NS_PRIVACY}));
+	
+	// Can add a "name" attribute?
+	if(list)
+		iqStatus.setAttribute('name', list);
+	
+	con.send(iq);
+	
+	logThis('Changing privacy list status: ' + list + ' to: ' + status);
+}
+
+// Checks the privacy status (action) of a value
+function statusPrivacy(list, value) {
+	return $(XMLFromString(getDB('privacy', list))).find('item[value=' + value + ']').attr('action');
+}
+
+// Converts the groups array into a <option /> string
+function groupsToHtmlPrivacy() {
+	var groups = getAllGroups();
+	var html = '';
+	
+	// Generate HTML
+	for(i in groups) {
+		html += '<option value="' + encodeQuotes(groups[i]) +'">' + groups[i].htmlEnc() + '</option>';
+	}
+	
+	return html;
+}
+
+// Displays the privacy lists
+function displayListsPrivacy() {
+	// Initialize
+	var code = '';
+	var select = $('#privacy .privacy-head .list-left select');
+	var data = XMLFromString(getDB('privacy-lists', 'available'));
+	
+	// Parse the XML data!
+	$(data).find('list').each(function() {
+		var list_name = $(this).attr('name');
+		
+		if(list_name)
+			code += '<option value="' + encodeQuotes(list_name) + '">' + list_name.htmlEnc() + '</option>';
+	});
+	
+	// Apply HTML code
+	select.html(code);
+	
+	// Not empty?
+	if(code)
+		select.removeAttr('disabled');
+	else
+		select.attr('disabled', true);
+	
+	return true;
+}
+
+// Displays the privacy items for a list
+function displayItemsPrivacy() {
+	// Reset the form
+	clearFormPrivacy();
+	disableFormPrivacy();
+	
+	// Initialize
+	var code = '';
+	var select = $('#privacy .privacy-item select');
+	var list = $('#privacy .privacy-head .list-left select').val();
+	
+	// Reset the item select
+	select.html('');
+	
+	// No list?
+	if(!list)
+		return false;
+	
+	// Reset the list status
+	$('#privacy .privacy-active input[type=checkbox]').removeAttr('checked');
+	
+	// Display the list status
+	var status = ['active', 'default'];
+	
+	for(s in status) {
+		if(getDB('privacy-marker', status[s]) == list)
+			$('#privacy .privacy-active input[name=' + status[s] + ']').attr('checked', true);
+	}
+	
+	// Try to read the stored items
+	var items = XMLFromString(getDB('privacy', list));
+	
+	// Must retrieve the data?
+	if(!items) {
+		select.attr('disabled', true);
+		
+		return getPrivacy(list);
+	}
+	
+	else
+		select.removeAttr('disabled');
+	
+	// Parse the XML data!
+	$(items).find('item').each(function() {
+		// Read attributes
+		var item_type = $(this).attr('type');
+		var item_value = $(this).attr('value');
+		var item_action = $(this).attr('action');
+		var item_order = $(this).attr('order');
+		
+		// Generate hash
+		var item_hash = hex_md5(item_type + item_value + item_action + item_order);
+		
+		// Read sub-elements
+		var item_presencein = $(this).find('presence-in').size();
+		var item_presenceout = $(this).find('presence-out').size();
+		var item_message = $(this).find('message').size();
+		var item_iq = $(this).find('iq').size();
+		
+		// Apply default values (if missing)
+		if(!item_type)
+			item_type = '';
+		if(!item_value)
+			item_value = '';
+		if(!item_action)
+			item_action = 'allow';
+		if(!item_order)
+			item_order = '1';
+		
+		// Apply sub-elements values
+		if(item_presencein)
+			item_presencein = 'true';
+		else
+			item_presencein = 'false';
+		
+		if(item_presenceout)
+			item_presenceout = 'true';
+		else
+			item_presenceout = 'false';
+		
+		if(item_message)
+			item_message = 'true';
+		else
+			item_message = 'false';
+		
+		if(item_iq)
+			item_iq = 'true';
+		else
+			item_iq = 'false';
+		
+		// Generate item description
+		var desc = '';
+		var desc_arr = [item_type, item_value, item_action, item_order];
+		
+		for(d in desc_arr) {
+			// Nothing to display?
+			if(!desc_arr[d])
+				continue;
+			
+			if(desc)
+				desc += ' - ';
+			
+			desc += desc_arr[d];
+		}
+		
+		// Add the select option
+		code += '<option data-type="' + encodeQuotes(item_type) + '" data-value="' + encodeQuotes(item_value) + '" data-action="' + encodeQuotes(item_action) + '" data-order="' + encodeQuotes(item_order) + '" data-presence_in="' + encodeQuotes(item_presencein) + '" data-presence_out="' + encodeQuotes(item_presenceout) + '" data-message="' + encodeQuotes(item_message) + '" data-iq="' + encodeQuotes(item_iq) + '" data-hash="' + encodeQuotes(item_hash) + '">' + 
+				desc + 
+			'</option>';
+	});
+	
+	// Append the code
+	select.append(code);
+	
+	// Display the first item form
+	var first_item = select.find('option:first');
+	displayFormPrivacy(
+			   first_item.attr('data-type'),
+			   first_item.attr('data-value'),
+			   first_item.attr('data-action'),
+			   first_item.attr('data-order'),
+			   first_item.attr('data-presence_in'),
+			   first_item.attr('data-presence_out'),
+			   first_item.attr('data-message'),
+			   first_item.attr('data-iq')
+			  );
+	
+	return true;
+}
+
+// Displays the privacy form for an item
+function displayFormPrivacy(type, value, action, order, presence_in, presence_out, message, iq) {
+	// Reset the form
+	clearFormPrivacy();
+	
+	// Apply the action
+	$('#privacy .privacy-first input[name=action][value=' + action + ']').attr('checked', true);
+	
+	// Apply the type & value
+	var privacy_second = '#privacy .privacy-second';
+	var privacy_type = privacy_second + ' input[name=type]';
+	var type_check, value_input;
+	
+	switch(type) {
+		case 'jid':
+			type_check = privacy_type + '[value=jid]';
+			value_input = privacy_second + ' input[type=text][name=jid]';
+			
+			break;
+		
+		case 'group':
+			type_check = privacy_type + '[value=group]';
+			value_input = privacy_second + ' select[name=group]';
+			
+			break;
+		
+		case 'subscription':
+			type_check = privacy_type + '[value=subscription]';
+			value_input = privacy_second + ' select[name=subscription]';
+			
+			break;
+		
+		default:
+			type_check = privacy_type + '[value=everybody]';
+			
+			break;
+	}
+	
+	// Check the target
+	$(type_check).attr('checked', true);
+	
+	// Can apply a value?
+	if(value_input)
+		$(value_input).val(value);
+	
+	// Apply the things to do
+	var privacy_do = '#privacy .privacy-third input[type=checkbox]';
+	
+	if(presence_in == 'true')
+		$(privacy_do + '[name=send-status]').attr('checked', true);
+	if(presence_out == 'true')
+		$(privacy_do + '[name=see-status]').attr('checked', true);
+	if(message == 'true')
+		$(privacy_do + '[name=send-messages]').attr('checked', true);
+	if(iq == 'true')
+		$(privacy_do + '[name=send-queries]').attr('checked', true);
+	
+	if(!$(privacy_do).filter(':checked').size())
+		$(privacy_do + '[name=everything]').attr('checked', true);
+	
+	// Apply the order
+	$('#privacy .privacy-active input[name=order]').val(order);
+	
+	// Enable the forms
+	$('#privacy .privacy-form input, #privacy .privacy-form select, #privacy .privacy-active input').removeAttr('disabled');
+}
+
+// Clears the privacy list form
+function clearFormPrivacy() {
+	// Uncheck checkboxes & radio inputs
+	$('#privacy .privacy-form input[type=checkbox], #privacy .privacy-form input[type=radio]').removeAttr('checked');
+	
+	// Reset select
+	$('#privacy .privacy-form select option').removeAttr('selected');
+	$('#privacy .privacy-form select option:first').attr('selected', true);
+	
+	// Reset text input
+	$('#privacy .privacy-form input[type=text]').val('');
+	
+	// Reset order input
+	$('#privacy .privacy-active input[name=order]').val('1');
+}
+
+// Disables the privacy list form
+function disableFormPrivacy() {
+	$('#privacy .privacy-form input, #privacy .privacy-form select, #privacy .privacy-active input').attr('disabled', true);
+}
+
+// Enables the privacy list form
+function enableFormPrivacy(rank) {
+	$('#privacy .privacy-' + rank + ' input, #privacy .privacy-' + rank + ' select').removeAttr('disabled');
+}
+
+// Addon launcher
+function launchPrivacy() {
+	// Click events
+	$('#privacy .bottom .finish').click(closePrivacy);
+	
+	// Placeholder events
+	$('#privacy input[placeholder]').placeholder();
+	
+	// Form events
+	$('#privacy .privacy-head a.list-remove').click(function() {
+		// Get list name
+		var list = $('#privacy .privacy-head .list-left select').val();
+		
+		// No value?
+		if(!list)
+			return false;
+		
+		// Remove it from popup
+		$('#privacy .privacy-head .list-left select option[value=' + list + ']').remove();
+		
+		// Nothing remaining?
+		if(!exists('#privacy .privacy-head .list-left select option'))
+			$('#privacy .privacy-head .list-left select option').attr('disabled', true);
+		
+		// Empty the item select
+		$('#privacy .privacy-item select').attr('disabled', true).html('');
+		
+		// Disable this list before removing it
+		var status = ['active', 'default'];
+		
+		for(s in status) {
+			if(getDB('privacy-marker', status[s]) == list)
+				changePrivacy('', status[s]);
+		}
+		
+		// Remove from server
+		setPrivacy(list);
+		
+		// Reset the form
+		clearFormPrivacy();
+		disableFormPrivacy();
+		
+		return false;
+	});
+	
+	$('#privacy .privacy-head .list-right input').keyup(function(e) {
+		// Not enter?
+		if(e.keyCode != 13)
+			return;
+		
+		// Get list name
+		var list = $('#privacy .privacy-head .list-right input').val();
+		var select = '#privacy .privacy-head .list-left select';
+		var existed = true;
+		
+		// Create the new element
+		if(!exists(select + ' option[value=' + list + ']')) {
+			// Marker
+			existed = false;
+			
+			// Create a new option
+			$(select).append('<option value="' + encodeQuotes(list) + '">' + list.htmlEnc() + '</option>');
+			
+			// Reset the item select
+			$('#privacy .privacy-item select').attr('disabled', true).html('');
+		}
+		
+		// Change the select value & enable it
+		$(select).val(list).removeAttr('disabled');
+		
+		// Reset its value
+		$(this).val('');
+		
+		// Reset the form
+		clearFormPrivacy();
+		disableFormPrivacy();
+		
+		// Must reload the list items?
+		if(existed) {
+			displayItemsPrivacy();
+			$('#privacy .privacy-item select').removeAttr('disabled');
+		}
+	});
+	
+	$('#privacy .privacy-head .list-left select').change(displayItemsPrivacy);
+	
+	$('#privacy .privacy-item select').change(function() {
+		// Get the selected item
+		var item = $(this).find('option:selected');
+		
+		// Display the data!
+		displayFormPrivacy(
+			   item.attr('data-type'),
+			   item.attr('data-value'),
+			   item.attr('data-action'),
+			   item.attr('data-order'),
+			   item.attr('data-presence_in'),
+			   item.attr('data-presence_out'),
+			   item.attr('data-message'),
+			   item.attr('data-iq')
+			  );
+	});
+	
+	$('#privacy .privacy-item a.item-add').click(function() {
+		// Cannot add anything?
+		if(!exists('#privacy .privacy-head .list-left select option:selected'))
+			return false;
+		
+		// Disable item select
+		$('#privacy .privacy-item select').attr('disabled', true);
+		
+		// Reset the form
+		clearFormPrivacy();
+		disableFormPrivacy();
+		
+		// Enable first form item
+		enableFormPrivacy('first');
+		enableFormPrivacy('active');
+		
+		return false;
+	});
+	
+	$('#privacy .privacy-item a.item-remove').click(function() {
+		// Cannot add anything?
+		if(!exists('#privacy .privacy-head .list-left select option:selected'))
+			return false;
+		
+		// Get values
+		var list = $('#privacy .privacy-head .list-left select').val();
+		var selected = $('#privacy .privacy-item select option:selected');
+		var item = selected.attr('data-value');
+		var hash = selected.attr('data-hash');
+		
+		// Remove it from popup
+		$('#privacy .privacy-item select option:selected').remove();
+		
+		// No more items in this list?
+		if(!exists('#privacy .privacy-item select option')) {
+			// Disable this select
+			$('#privacy .privacy-item select').attr('disabled', true);
+			
+			// Remove the privacy list select item
+			$('#privacy .privacy-head .list-left select option[value=' + list + ']').remove();
+			
+			// No more privacy lists?
+			if(!exists('#privacy .privacy-head .list-left select option'))
+				$('#privacy .privacy-head .list-left select').attr('disabled', true);
+			
+			// Disable this list before removing it
+			var status = ['active', 'default'];
+			
+			for(s in status) {
+				if(getDB('privacy-marker', status[s]) == list)
+					changePrivacy('', status[s]);
+			}
+		}
+		
+		// Synchronize it with server
+		pushPrivacy(list, [], [item], [], [], [], [], [], [], hash, 'remove');
+		
+		// Reset the form
+		clearFormPrivacy();
+		disableFormPrivacy();
+		
+		return false;
+	});
+	
+	$('#privacy .privacy-item a.item-save').click(function() {
+		// Canot push item?
+		if(exists('#privacy .privacy-form input:disabled'))
+			return false;
+		
+		// Get the hash
+		var item_hash = '';
+		
+		if(!$('#privacy .privacy-item select').is(':disabled'))
+			item_hash = $('#privacy .privacy-item select option:selected').attr('data-hash');
+		
+		// Read the form
+		var privacy_second = '#privacy .privacy-second';
+		var item_list = $('#privacy .privacy-head .list-left select').val();
+		var item_action = $('#privacy .privacy-first input[name=action]').filter(':checked').val();
+		var item_type = $(privacy_second + ' input[name=type]').filter(':checked').val();
+		var item_order = $('#privacy .privacy-active input[name=order]').val();
+		var item_value = '';
+		
+		// Switch the type to get the value
+		switch(item_type) {
+			case 'jid':
+				item_value = $(privacy_second + ' input[type=text][name=jid]').val();
+				
+				break;
+			
+			case 'group':
+				item_value = $(privacy_second + ' select[name=group]').val();
+				
+				break;
+			
+			case 'subscription':
+				item_value = $(privacy_second + ' select[name=subscription]').val();
+				
+				break;
+			
+			default:
+				item_type = '';
+				
+				break;
+		}
+		
+		// Get the selected things to do
+		var privacy_third_cb = '#privacy .privacy-third input[type=checkbox]';
+		var item_prin = false;
+		var item_prout = false;
+		var item_msg = false;
+		var item_iq = false;
+		
+		// Individual select?
+		if(!$(privacy_third_cb + '[name=everything]').filter(':checked').size()) {
+			if($(privacy_third_cb + '[name=send-messages]').filter(':checked').size())
+				item_msg = true;
+			if($(privacy_third_cb + '[name=send-queries]').filter(':checked').size())
+				item_iq = true;
+			if($(privacy_third_cb + '[name=send-queries]').filter(':checked').size())
+				item_iq = true;
+			if($(privacy_third_cb + '[name=see-status]').filter(':checked').size())
+				item_prout = true;
+			if($(privacy_third_cb + '[name=send-status]').filter(':checked').size())
+				item_prin = true;
+		}
+		
+		// Push item to the server!
+		pushPrivacy(
+			    item_list,
+			    [item_type],
+			    [item_value],
+			    [item_action],
+			    [item_order],
+			    [item_prin],
+			    [item_prout],
+			    [item_msg],
+			    [item_iq],
+			    item_hash
+			   );
+		
+		return false;
+	});
+	
+	$('#privacy .privacy-first input').change(function() {
+		enableFormPrivacy('second');
+	});
+	
+	$('#privacy .privacy-second input').change(function() {
+		enableFormPrivacy('third');
+	});
+	
+	$('#privacy .privacy-third input[type=checkbox]').change(function() {
+		// Target
+		var target = '#privacy .privacy-third input[type=checkbox]';
+		
+		// Must tick "everything" checkbox?
+		if(!$(target).filter(':checked').size())
+			$(target + '[name=everything]').attr('checked', true);
+		
+		// Must untick the other checkboxes?
+		else if($(this).is('[name=everything]'))
+			$(target + ':not([name=everything])').removeAttr('checked');
+		
+		// Must untick "everything" checkbox?
+		else
+			$(target + '[name=everything]').removeAttr('checked');
+	});
+	
+	$('#privacy .privacy-active input[name=order]').keyup(function() {
+		// Get the value
+		var value = $(this).val();
+		
+		// No value?
+		if(!value)
+			return;
+		
+		// Not a number?
+		if(isNaN(value))
+			value = 1;
+		else
+			value = parseInt(value);
+		
+		// Negative?		
+		if(value < 0)
+			value = value * -1;
+		
+		// Apply the filtered value
+		$(this).val(value);
+	})
+	
+	.blur(function() {
+		// No value?
+		if(!$(this).val())
+			$(this).val('1');
+	});
+	
+	$('#privacy .privacy-active .privacy-active-elements input').change(function() {
+		// Get the values
+		var list_name = $('#privacy .privacy-head .list-left select').val();
+		var state_name = $(this).attr('name');
+		
+		// Cannot continue?
+		if(!list_name || !state_name)
+			return;
+		
+		// Change the current list status
+		if($(this).filter(':checked').size())
+			changePrivacy(list_name, state_name);
+		else
+			changePrivacy('', state_name);
+	});
+}
diff --git a/jappixmini/jappix/js/receipts.js b/jappixmini/jappix/js/receipts.js
new file mode 100644
index 00000000..1e6bf678
--- /dev/null
+++ b/jappixmini/jappix/js/receipts.js
@@ -0,0 +1,94 @@
+/*
+
+Jappix - An open social platform
+These are the receipts JS scripts for Jappix
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 26/12/10
+
+*/
+
+// Checks if we can send a receipt request
+function receiptRequest(hash) {
+	// Entity have support for receipt?
+	if($('#' + hash + ' .message-area').attr('data-receipts') == 'true')
+		return true;
+	
+	return false;
+}
+
+// Checks if there is a receipt request
+function hasReceipt(packet) {
+	// Any receipt request?
+	if(packet.getChild('request', NS_URN_RECEIPTS))
+		return true;
+	
+	return false;
+}
+
+// Checks if there is a received reply
+function hasReceived(packet) {
+	// Any received reply?
+	if(packet.getChild('received', NS_URN_RECEIPTS))
+		return true;
+	
+	return false;
+}
+
+// Sends a received notification
+function sendReceived(type, to, id) {
+	var aMsg = new JSJaCMessage();
+	aMsg.setTo(to);
+	aMsg.setID(id);
+	
+	// Any type?
+	if(type)
+		aMsg.setType(type);
+	
+	// Append the received node
+	aMsg.appendNode('received', {'xmlns': NS_URN_RECEIPTS, 'id': id});
+	
+	con.send(aMsg);
+	
+	logThis('Sent received to: ' + to);
+}
+
+// Tells the message has been received
+function messageReceived(hash, id) {
+	// Line selector
+	var path = $('#' + hash + ' .one-line[data-id=' + id + ']');
+	
+	// Add a received marker
+	path.attr('data-received', 'true')
+	    .removeAttr('data-lost');
+	
+	// Group selector
+	var group = path.parent();
+	
+	// Remove the group marker
+	if(!group.find('.one-line[data-lost]').size()) {
+		group.find('b.name').removeClass('talk-images')
+				    .removeAttr('title');
+	}
+	
+	return false;
+}
+
+// Checks if the message has been received
+function checkReceived(hash, id) {
+	// Fire a check 10 seconds later
+	$('#' + hash + ' .one-line[data-id=' + id + ']').oneTime('10s', function() {
+		// Not received?
+		if($(this).attr('data-received') != 'true') {
+			// Add a "lost" marker
+			$(this).attr('data-lost', 'true');
+			
+			// Add a warn on the buddy-name
+			$(this).parent().find('b.name').addClass('talk-images')
+						       .attr('title', _e("Your friend seems not to have received your message(s)!"));
+		}
+	});
+}
diff --git a/jappixmini/jappix/js/roster.js b/jappixmini/jappix/js/roster.js
new file mode 100644
index 00000000..4dca501c
--- /dev/null
+++ b/jappixmini/jappix/js/roster.js
@@ -0,0 +1,1122 @@
+/*
+
+Jappix - An open social platform
+These are the roster JS scripts for Jappix
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 19/05/11
+
+*/
+
+// Gets the roster items
+function getRoster() {
+	var iq = new JSJaCIQ();
+	
+	iq.setType('get');
+	iq.setQuery(NS_ROSTER);
+	
+	con.send(iq, handleRoster);
+}
+
+// Handles the roster items
+function handleRoster(iq) {
+	// Define some variables
+	var handleXML = iq.getQuery();
+	var current, xid, dName, subscription, group, xidHash, getNick, nick;
+	
+	// Parse the vcard xml
+	$(handleXML).find('item').each(function() {
+		parseRoster($(this), 'load');
+	});
+	
+	// Update our avatar (if changed), and send our presence
+	getAvatar(getXID(), 'force', 'true', 'forget');
+	
+	logThis('Roster received.');
+}
+
+// Parses the group XML and display the roster
+function parseRoster(current, mode) {
+	// Get the values
+	xid = current.attr('jid');
+	dName = current.attr('name');
+	subscription = current.attr('subscription');
+	xidHash = hex_md5(xid);
+	
+	// Create an array containing the groups
+	var groups = new Array();
+	
+	current.find('group').each(function() {
+		var group_text = $(this).text();
+		
+		if(group_text)
+			groups.push(group_text);
+	});
+	
+	// No group?
+	if(!groups.length)
+		groups.push(_e("Unclassified"));
+	
+	// If no name is defined, we get the default nick of the buddy
+	if(!dName)
+		dName = getXIDNick(xid);
+	
+	displayRoster(xid, xidHash, dName, subscription, groups, mode);
+}
+
+// Updates the roster groups
+function updateGroups() {
+	$('#buddy-list .one-group').each(function() {
+		// Current values
+		var check = $(this).find('.buddy').size();
+		var hidden = $(this).find('.buddy:not(.hidden-buddy:hidden)').size();
+		
+		// Special case: the filtering tool
+		if(SEARCH_FILTERED)
+			hidden = $(this).find('.buddy:visible').size();
+		
+		// If the group is empty
+		if(!check)
+			$(this).remove();
+		
+		// If the group contains no online buddy (and is not just hidden)
+		if(!hidden && $(this).find('a.group').hasClass('minus'))
+			$(this).hide();
+		else
+			$(this).show();
+	});
+}
+
+// Displays a defined roster item
+function displayRoster(dXID, dXIDHash, dName, dSubscription, dGroup, dMode) {
+	// First remove the buddy
+	$('#buddy-list .' + dXIDHash).remove();
+	
+	// Define some things around the groups
+	var is_gateway = isGateway(dXID);
+	var gateway = '';
+	
+	if(is_gateway) {
+		gateway = ' gateway';
+		dGroup = new Array(_e("Gateways"));
+	}
+	
+	// Remove request (empty his social channel)
+	if(dSubscription == 'remove')
+		$('#channel .mixed .one-update.update_' + dXIDHash).remove();
+	
+	// Other request
+	else {
+		// Is this buddy blocked?
+		var privacy_class = '';
+		var privacy_state = statusPrivacy('block', dXID);
+		
+		if(privacy_state == 'deny')
+			privacy_class = ' blocked';
+		
+		// For each group this buddy has
+		for(i in dGroup) {
+			var cGroup = dGroup[i];
+			
+			if(cGroup) {
+				// Process some vars
+				var groupHash = 'group' + hex_md5(cGroup);
+				var groupContent = '#buddy-list .' + groupHash;
+				var groupBuddies = groupContent + ' .group-buddies';
+				
+				// Is this group blocked?
+				if((statusPrivacy('block', cGroup) == 'deny') && (privacy_state != 'allow'))
+					privacy_class = ' blocked';
+				
+				// Group not yet displayed
+				if(!exists(groupContent)) {
+					// Define some things
+					var groupCont = '#buddy-list .content';
+					var groupToggle = groupCont + ' .' + groupHash + ' a.group';
+					
+					// Create the HTML markup of the group
+					$(groupCont).prepend(
+						'<div class="' + groupHash + ' one-group" data-group="' + escape(cGroup) + '">' + 
+							'<a href="#" class="group talk-images minus">' + cGroup.htmlEnc() + '</a>' + 
+							'<div class="group-buddies"></div>' + 
+						'</div>'
+					);
+					
+					// Create the click event which will hide and show the content
+					$(groupToggle).click(function() {
+						var group = $(groupBuddies);
+						var group_toggle = $(groupContent + ' a.group');
+						
+						// We must hide the buddies
+						if(group_toggle.hasClass('minus')) {
+							group.hide();
+							group_toggle.removeClass('minus').addClass('plus');
+							
+							// Remove the group opened buddy-info
+							closeBubbles();
+						}
+						
+						// We must show the buddies
+						else {
+							group_toggle.removeClass('plus').addClass('minus');
+							group.show();
+						}
+						
+						return false;
+					});
+				}
+				
+				// Initialize the HTML code
+				var name_code = '<p class="buddy-name">' + dName.htmlEnc() + '</p>';
+				var presence_code = '<p class="buddy-presence talk-images unavailable">' + _e("Unavailable") + '</p>';
+				
+				var html = '<div class="hidden-buddy buddy ibubble ' + dXIDHash + gateway + privacy_class + '" data-xid="' + escape(dXID) + '">' + 
+						'<div class="buddy-click">';
+				
+				// Display avatar if not gateway
+				if(!is_gateway)
+					html += '<div class="avatar-container">' + 
+							'<img class="avatar" src="' + './img/others/default-avatar.png' + '" alt="" />' + 
+						'</div>';
+				
+				html += '<div class="name">';
+				
+				// Special gateway code
+				if(is_gateway)
+					html += presence_code +
+						name_code;
+				
+				else
+					html += name_code + 
+						presence_code;
+				
+				html += '</div></div></div>';
+				
+				// Create the DOM element for this buddy
+				$(groupBuddies).append(html);
+				
+				// Apply the hover event
+				applyBuddyHover(dXID, dXIDHash, dName, dSubscription, dGroup, groupHash);
+			}
+		}
+		
+		// Click event on this buddy
+		$('#buddy-list .' + dXIDHash + ' .buddy-click').click(function() {
+			return checkChatCreate(dXID, 'chat');
+		});
+		
+		// We get the user presence if necessary
+		if(dMode == 'presence')
+			presenceFunnel(dXID, dXIDHash);
+		
+		// If the buddy must be shown
+		if(BLIST_ALL)
+			$('#buddy-list .' + dXIDHash).show();
+	}
+	
+	// We update our groups
+	if(!SEARCH_FILTERED)
+		updateGroups();
+	else
+		funnelFilterBuddySearch();
+}
+
+// Applies the buddy editing input events
+function applyBuddyInput(xid) {
+	// Initialize
+	var path = '#buddy-list .buddy[data-xid=' + escape(xid) + ']';
+	var rename = path + ' .bm-rename input';
+	var group = path + ' .bm-group input';
+	var manage_infos = path + ' .manage-infos';
+	var bm_choose = manage_infos + ' div.bm-choose';
+	
+	// Keyup events
+	$(rename).keyup(function(e) {
+		if(e.keyCode == 13) {
+			// Send the item
+			sendRoster(xid, '', trim($(rename).val()), thisBuddyGroups(xid));
+			
+			// Remove the buddy editor
+			closeBubbles();
+			
+			return false;
+		}
+	});
+	
+	$(group).keyup(function(e) {
+		if(e.keyCode == 13) {
+			// Empty input?
+			if(!trim($(this).val())) {
+				// Send the item
+				sendRoster(xid, '', trim($(rename).val()), thisBuddyGroups(xid));
+				
+				// Remove the buddy editor
+				closeBubbles();
+				
+				return false;
+			}
+			
+			// Get the values
+			var this_value = trim($(this).val());
+			var escaped_value = escape(this_value);
+			
+			// Check if the group yet exists
+			var group_exists = false;
+			
+			$(bm_choose + ' label span').each(function() {
+				if($(this).text() == this_value)
+					group_exists = true;
+			});
+			
+			// Create a new checked checkbox
+			if(!group_exists)
+				$(bm_choose).prepend('<label><input type="checkbox" data-group="' + escaped_value + '" /><span>' + this_value.htmlEnc() + '</span></label>');
+			
+			// Check the checkbox
+			$(bm_choose + ' input[data-group=' + escaped_value + ']').attr('checked', true);
+			
+			// Reset the value of this input
+			$(this).val('');
+			
+			return false;
+		}
+	});
+	
+	// Click events
+	$(manage_infos + ' p.bm-authorize a.to').click(function() {
+		closeBubbles();
+		sendSubscribe(xid, 'subscribed');
+		
+		return false;
+	});
+	
+	$(manage_infos + ' p.bm-authorize a.from').click(function() {
+		closeBubbles();
+		sendSubscribe(xid, 'subscribe');
+		
+		return false;
+	});
+	
+	$(manage_infos + ' p.bm-authorize a.unblock').click(function() {
+		closeBubbles();
+		
+		// Update privacy settings
+		pushPrivacy('block', ['jid'], [xid], ['allow'], ['1'], [false], [true], [true], [true], '', 'roster');
+		$(path).removeClass('blocked');
+		
+		// Enable the "block" list
+		changePrivacy('block', 'active');
+		changePrivacy('block', 'default');
+		
+		// Send an available presence
+		sendPresence(xid, 'available', getUserShow(), getUserStatus());
+		
+		return false;
+	});
+	
+	$(manage_infos + ' p.bm-remove a.remove').click(function() {
+		closeBubbles();
+		sendRoster(xid, 'remove');
+		
+		return false;
+	});
+	
+	$(manage_infos + ' p.bm-remove a.prohibit').click(function() {
+		closeBubbles();
+		sendSubscribe(xid, 'unsubscribed');
+		
+		return false;
+	});
+	
+	$(manage_infos + ' p.bm-remove a.block').click(function() {
+		closeBubbles();
+		
+		// Update privacy settings
+		pushPrivacy('block', ['jid'], [xid], ['deny'], ['1'], [false], [true], [true], [true], '', 'roster');
+		$(path).addClass('blocked');
+		
+		// Enable the "block" list
+		changePrivacy('block', 'active');
+		changePrivacy('block', 'default');
+		
+		// Send an unavailable presence
+		sendPresence(xid, 'unavailable');
+		
+		// Remove the user presence
+		for(var i = 0; i < sessionStorage.length; i++) {
+			// Get the pointer values
+			var current = sessionStorage.key(i);
+			
+			// If the pointer is on a stored presence
+			if((explodeThis('_', current, 0) == 'presence') && (bareXID(explodeThis('_', current, 1)) == xid))
+				sessionStorage.removeItem(current);
+		}
+		
+		// Manage his new presence
+		presenceFunnel(xid, hex_md5(xid));
+		
+		return false;
+	});
+	
+	$(manage_infos + ' a.save').click(function() {
+		// Send the item
+		sendRoster(xid, '', trim($(rename).val()), thisBuddyGroups(xid));
+		
+		// Remove the buddy editor
+		closeBubbles();
+		
+		return false;
+	});
+}
+
+// Applies the buddy editing hover events
+function applyBuddyHover(xid, hash, nick, subscription, groups, group_hash) {
+	// Generate the values
+	var bPath = '#buddy-list .' + group_hash + ' .buddy[data-xid=' + escape(xid) + ']';
+	var iPath = bPath + ' .buddy-infos';
+	
+	// Apply the hover event
+	$(bPath).hover(function() {
+		// Another bubble exist
+		if(exists('#buddy-list .buddy-infos'))
+			return false;
+		
+		$(bPath).oneTime(200, function() {
+			// Another bubble exist
+			if(exists('#buddy-list .buddy-infos'))
+				return false;
+			
+			// Add this bubble!
+			showBubble(iPath);
+			
+			// Create the buddy infos DOM element
+			$(bPath).append(
+				'<div class="buddy-infos bubble removable">' + 
+					'<div class="buddy-infos-subarrow talk-images"></div>' + 
+					'<div class="buddy-infos-subitem">' + 
+						'<div class="pep-infos">' + 
+							'<p class="bi-status talk-images unavailable">' + _e("unknown") + '</p>' + 
+							'<p class="bi-mood talk-images mood-four">' + _e("unknown") + '</p>' + 
+							'<p class="bi-activity talk-images activity-exercising">' + _e("unknown") + '</p>' + 
+							'<p class="bi-tune talk-images tune-note">' + _e("unknown") + '</p>' + 
+							'<p class="bi-geoloc talk-images location-world">' + _e("unknown") + '</p>' + 
+							'<p class="bi-view talk-images view-individual"><a href="#" class="profile">' + _e("Profile") + '</a> / <a href="#" class="channel">' + _e("Channel") + '</a> / <a href="#" class="commands">' + _e("Commands") + '</a></p>' + 
+							'<p class="bi-edit talk-images edit-buddy"><a href="#">' + _e("Edit") + '</a></p>' + 
+						'</div>' + 
+					'</div>' + 
+				'</div>'
+			);
+			
+			// Sets the good position
+			buddyInfosPosition(xid, group_hash);
+			
+			// Get the presence
+			presenceFunnel(xid, hash);
+			
+			// Get the PEP infos
+			displayAllPEP(xid);
+			
+			// Click events
+			$(bPath + ' .bi-view a').click(function() {
+				// Renitialize the buddy infos
+				closeBubbles();
+				
+				// Profile
+				if($(this).is('.profile'))
+					openUserInfos(xid);
+				
+				// Channel
+				else if($(this).is('.channel'))
+					fromInfosMicroblog(xid, hash);
+				
+				// Command
+				else if($(this).is('.commands'))
+					retrieveAdHoc(xid);
+				
+				return false;
+			});
+			
+			$(bPath + ' .bi-edit a').click(function() {
+				buddyEdit(xid, nick, subscription, groups);
+				
+				return false;
+			});
+		});
+	}, function() {
+		if(!exists(iPath + ' .manage-infos'))
+			closeBubbles();
+		
+		$(bPath).stopTime();
+	});
+}
+
+// Sets the good buddy-infos position
+function buddyInfosPosition(xid, group_hash) {
+	// Paths
+	var group = '#buddy-list .' + group_hash;
+	var buddy = group + ' .buddy[data-xid=' + escape(xid) + ']';
+	var buddy_infos = buddy + ' .buddy-infos';
+	
+	// Get the offset to define
+	var offset = 3;
+	
+	if(isGateway(xid))
+		offset = -8;
+	
+	// Process the position
+	var top = $(buddy).position().top + offset;
+	var left = $(buddy).width() - 10;
+	
+	// Apply the top position
+	$(buddy_infos).css('top', top)
+	              .css('left', left);
+}
+
+// Generates an array of the current groups of a buddy
+function thisBuddyGroups(xid) {
+	var path = '#buddy-list .buddy[data-xid=' + escape(xid) + '] ';
+	var array = new Array();
+	
+	// Each checked checkboxes
+	$(path + 'div.bm-choose input[type=checkbox]').filter(':checked').each(function() {
+		array.push(unescape($(this).attr('data-group')));
+	});
+	
+	// Entered input value (and not yet in the array)
+	var value = trim($(path + 'p.bm-group input').val());
+	
+	if(value && !existArrayValue(array, value))
+		array.push(value);
+	
+	return array;
+}
+
+// Adds a given contact to our roster
+function addThisContact(xid, name) {
+	logThis('Add this contact: ' + xid + ', as ' + name, 3);
+	
+	// Cut the resource of this XID
+	xid = bareXID(xid);
+	
+	// If the form is complete
+	if(xid) {
+		// We send the subscription
+		sendSubscribe(xid, 'subscribe');
+		sendRoster(xid, '', name);
+		
+		// We hide the bubble
+		closeBubbles();
+	}
+}
+
+// Gets an array of all the groups in the roster
+function getAllGroups() {
+	var groups = new Array();
+	
+	$('#buddy-list .one-group').each(function() {
+		var current = unescape($(this).attr('data-group'));
+		
+		if((current != _e("Unclassified")) && (current != _e("Gateways")))
+			groups.push(current);
+	});
+	
+	return groups.sort();
+}
+
+// Edits buddy informations
+function buddyEdit(xid, nick, subscription, groups) {
+	logThis('Buddy edit: ' + xid, 3);
+	
+	// Initialize
+	var path = '#buddy-list .buddy[data-xid=' + escape(xid) + '] .';
+	var html = '<div class="manage-infos">';
+	
+	// Get the privacy state
+	var privacy_state = statusPrivacy('block', xid);
+	var privacy_active = getDB('privacy-marker', 'available');
+	
+	// Get the group privacy state
+	for(g in groups) {
+		if((statusPrivacy('block', groups[g]) == 'deny') && (privacy_state != 'allow'))
+			privacy_state = 'deny';
+	}
+	
+	// The subscription with this buddy is not full
+	if((subscription != 'both') || ((privacy_state == 'deny') && privacy_active)) {
+		var authorize_links = '';
+		html += '<p class="bm-authorize talk-images">';
+		
+		// Link to allow to see our status
+		if((subscription == 'to') || (subscription == 'none'))
+			authorize_links += '<a href="#" class="to">' + _e("Authorize") + '</a>';
+		
+		// Link to ask to see his/her status
+		if((subscription == 'from') || (subscription == 'none')) {
+			if(authorize_links)
+				authorize_links += ' / ';
+			
+			authorize_links += '<a href="#" class="from">' + _e("Ask for authorization") + '</a>';
+		}
+		
+		// Link to unblock this buddy
+		if((privacy_state == 'deny') && privacy_active) {
+			if(authorize_links)
+				authorize_links += ' / ';
+			
+			html += '<a href="#" class="unblock">' + _e("Unblock") + '</a>';
+		}
+		
+		html += authorize_links + '</p>';
+	}
+	
+	// Complete the HTML code
+	var remove_links = '';
+	html += '<p class="bm-remove talk-images">';
+	remove_links = '<a href="#" class="remove">' + _e("Remove") + '</a>';
+	
+	// This buddy is allowed to see our presence, we can show a "prohibit" link
+	if((subscription == 'both') || (subscription == 'from'))
+		remove_links += ' / <a href="#" class="prohibit">' + _e("Prohibit") + '</a>';
+	
+	// Complete the HTML code
+	if((privacy_state != 'deny') && privacy_active) {
+		if(remove_links)
+			remove_links += ' / ';
+		
+		remove_links += '<a href="#" class="block">' + _e("Block") + '</a>';
+	}
+	
+	// Complete the HTML code
+	html += remove_links + 
+		'</p>' + 
+		'<p class="bm-rename talk-images"><label>' + _e("Rename") + '</label> <input type="text" value="' + encodeQuotes(nick) + '" /></p>';
+	
+	// Only show group tool if not a gateway
+	if(!isGateway(xid))
+		html += '<p class="bm-group talk-images"><label>' + _e("Groups") + '</label> <input type="text" /></p>' + 
+			'<div class="bm-choose">' + 
+				'<div></div>' + 
+			'</div>';
+	
+	// Close the DOM element
+	html += '<a href="#" class="save">' + _e("Save") + '</a>' + 
+		'</div>';
+	
+	// We update the DOM elements
+	$(path + 'pep-infos').replaceWith(html);
+	
+	// Gets all the existing groups
+	var all_groups = getAllGroups();
+	var all_groups_dom = '';
+	
+	for(a in all_groups) {
+		// Current group
+		var all_groups_current = all_groups[a];
+		
+		// Is the current group checked?
+		var checked = '';
+		
+		if(existArrayValue(groups, all_groups_current))
+			checked = ' checked="true"';
+		
+		// Add the current group HTML
+		all_groups_dom += '<label><input type="checkbox" data-group="' + escape(all_groups_current) + '"' + checked + ' /><span>' + all_groups_current.htmlEnc() + '</span></label>';
+	}
+	
+	// Prepend this in the DOM
+	var bm_choose = path + 'manage-infos div.bm-choose';
+	
+	$(bm_choose).prepend(all_groups_dom);
+	
+	// Apply the editing input events
+	applyBuddyInput(xid);
+}
+
+// Updates the roster items
+function sendRoster(xid, subscription, name, group) {
+	// We send the new buddy name
+	var iq = new JSJaCIQ();
+	iq.setType('set');
+	
+	var iqQuery = iq.setQuery(NS_ROSTER);
+	var item = iqQuery.appendChild(iq.buildNode('item', {'xmlns': NS_ROSTER, 'jid': xid}));
+	
+	// Any subscription?
+	if(subscription)
+		item.setAttribute('subscription', subscription);
+	
+	// Any name?
+	if(name)
+		item.setAttribute('name', name);
+	
+	// Any group?
+	if(group && group.length) {
+		for(i in group)
+			item.appendChild(iq.buildNode('group', {'xmlns': NS_ROSTER}, group[i]));
+	}
+	
+	con.send(iq);
+	
+	logThis('Roster item sent: ' + xid, 3);
+}
+
+// Adapts the roster height, depending of the window size
+function adaptRoster() {
+	// Process the new height
+	var new_height = $('#left-content').height() - $('#my-infos').height() - 97;
+	
+	// New height too small
+	if(new_height < 211)
+		new_height = 211;
+	
+	// Apply the new height
+	$('#buddy-list .content').css('height', new_height);
+}
+
+// Gets all the buddies in our roster
+function getAllBuddies() {
+	var buddies = new Array();
+	
+	$('#buddy-list .buddy').each(function() {
+		var xid = unescape($(this).attr('data-xid'));
+		
+		if(xid)
+			buddies.push(xid);
+	});
+	
+	return buddies;
+}
+
+// Gets the user gateways
+function getGateways() {
+	// New array
+	var gateways = new Array();
+	var buddies = getAllBuddies();
+	
+	// Get the gateways
+	for(c in buddies) {
+		if(isGateway(buddies[c]))
+			gateways.push(buddies[c]);
+	}
+	
+	return gateways;
+}
+
+// Define a global var for buddy list all buddies displayed
+var BLIST_ALL = false;
+
+// Addon launcher
+function launchRoster() {
+	// Filtering tool
+	var iFilter = $('#buddy-list .filter input');
+	var aFilter = $('#buddy-list .filter a');
+	
+	iFilter.placeholder()
+	
+	.blur(function() {
+		// Nothing is entered, put the placeholder instead
+		if(!trim($(this).val()))
+			aFilter.hide();
+		else
+			aFilter.show();
+	})
+	
+	.keyup(function(e) {
+		funnelFilterBuddySearch(e.keyCode);
+	});
+	
+	aFilter.click(function() {
+		// Reset the input
+		$(this).hide();
+		iFilter.val('');
+		iFilter.placeholder();
+		
+		// Security: show all the groups, empty or not
+		$('#buddy-list .one-group').show();
+		
+		// Reset the filtering tool
+		resetFilterBuddySearch();
+		
+		return false;
+	});
+	
+	// When the user click on the add button, show the contact adding tool
+	$('#buddy-list .foot .add').click(function() {
+		// Yet displayed?
+		if(exists('#buddy-conf-add'))
+			return closeBubbles();
+		
+		// Add the bubble
+		showBubble('#buddy-conf-add');
+		
+		// Append the content
+		$('#buddy-list .buddy-list-add').append(
+			'<div id="buddy-conf-add" class="buddy-conf-item bubble removable">' + 
+				'<div class="buddy-conf-subarrow talk-images"></div>' + 
+				
+				'<div class="buddy-conf-subitem">' + 
+					'<p class="buddy-conf-p">' + _e("Add a friend") +  '</p>' + 
+					
+					'<label><span>' + _e("Address") +  '</span><input type="text" class="buddy-conf-input add-contact-jid" required="" /></label>' + 
+					'<label><span>' + _e("Name") +  '</span><input type="text" class="buddy-conf-input add-contact-name" /></label>' +  
+					'<label>' + 
+						'<span>' + _e("Gateway") +  '</span>' + 
+						'<select class="buddy-conf-select add-contact-gateway">' + 
+							'<option value="none" selected="">' + _e("None") +  '</option>' + 
+						'</select>' + 
+					'</label>' +  
+					'<span class="add-contact-name-get">' + _e("Getting the name...") + '</span>' + 
+					
+					'<p class="buddy-conf-text">' + 
+						'<a href="#" class="buddy-conf-add-search">' + _e("Search a friend") +  '</a>' + 
+					'</p>' + 
+				'</div>' + 
+			'</div>'
+		);
+		
+		// Add the gateways
+		var gateways = getGateways();
+		
+		// Any gateway?
+		if(gateways.length) {
+			// Append the gateways
+			for(i in gateways)
+				$('.add-contact-gateway').append('<option value="' + escape(gateways[i]) + '">' + gateways[i].htmlEnc() +  '</option>');
+			
+			// Show the gateway selector
+			$('.add-contact-gateway').parent().show();
+		}
+		
+		// No gateway?
+		else
+			$('.add-contact-gateway').parent().hide();
+		
+		// Blur event on the add contact input
+		$('.add-contact-jid').blur(function() {
+			// Read the value
+			var value = trim($(this).val());
+			
+			// Try to catch the buddy name
+			if(value && !trim($('.add-contact-name').val()) && ($('.add-contact-gateway').val() == 'none')) {
+				// User XID
+				var xid = generateXID(value, 'chat');
+				
+				// Notice for the user
+				$('.add-contact-name-get').attr('data-for', escape(xid)).show();
+				
+				// Request the user vCard
+				getAddUserName(xid);
+			}
+		});
+		
+		// When a key is pressed...
+		$('#buddy-conf-add input, #buddy-conf-add select').keyup(function(e) {
+			// Enter : continue
+			if(e.keyCode == 13) {
+				// Get the values
+				var xid = trim($('.add-contact-jid').val());
+				var name = trim($('.add-contact-name').val());
+				var gateway = unescape($('.add-contact-gateway').val());
+				
+				// Generate the XID to add
+				if((gateway != 'none') && xid)
+					xid = xid.replace(/@/g, '%') + '@' + gateway;
+				else
+					xid = generateXID(xid, 'chat');
+				
+				// Submit the form
+				if(xid && (xid != getXID()))
+					addThisContact(xid, name);
+				else
+					$(document).oneTime(10, function() {
+						$('.add-contact-jid').addClass('please-complete').focus();
+					});
+				
+				return false;
+			}
+			
+			// Escape : quit
+			if(e.keyCode == 27)
+				closeBubbles();
+		});
+		
+		// Click event on search link
+		$('.buddy-conf-add-search').click(function() {
+			closeBubbles();
+			return openDirectory();
+		});
+		
+		// Focus on the input
+		$(document).oneTime(10, function() {
+			$('.add-contact-jid').focus();
+		});
+		
+		return false;
+	});
+	
+	// When the user click on the join button, show the chat joining tool
+	$('#buddy-list .foot .join').click(function() {
+		// Yet displayed?
+		if(exists('#buddy-conf-join'))
+			return closeBubbles();
+		
+		// Add the bubble
+		showBubble('#buddy-conf-join');
+		
+		// Append the content
+		$('#buddy-list .buddy-list-join').append(
+			'<div id="buddy-conf-join" class="buddy-conf-item bubble removable">' + 
+				'<div class="buddy-conf-subarrow talk-images"></div>' + 
+				
+				'<div class="buddy-conf-subitem search">' + 
+					'<p class="buddy-conf-p" style="margin-bottom: 0;">' + _e("Join a chat") +  '</p>' + 
+					
+					'<input type="text" class="buddy-conf-input join-jid" required="" />' + 
+					'<select class="buddy-conf-select buddy-conf-join-select join-type">' + 
+						'<option value="chat" selected="">' + _e("Chat") +  '</option>' + 
+						'<option value="groupchat">' + _e("Groupchat") +  '</option>' + 
+					'</select>' + 
+				'</div>' + 
+			'</div>'
+		);
+		
+		// Input vars
+		var destination = '#buddy-conf-join .search';
+		var dHovered = destination + ' ul li.hovered:first';
+		
+		// When a key is pressed...
+		$('#buddy-conf-join input, #buddy-conf-join select').keyup(function(e) {
+			// Enter: continue
+			if(e.keyCode == 13) {
+				// Select something from the search
+				if(exists(dHovered))
+					addBuddySearch(destination, $(dHovered).attr('data-xid'));
+				
+				// Join something
+				else {
+					var xid = trim($('.join-jid').val());
+					var type = $('.buddy-conf-join-select').val();
+					
+					if(xid && type) {
+						// Generate a correct XID
+						xid = generateXID(xid, type);
+						
+						// Not me
+						if(xid != getXID()) {
+							// Update some things
+							$('.join-jid').removeClass('please-complete');
+							closeBubbles();
+							
+							// Create a new chat
+							checkChatCreate(xid, type);
+						}
+						
+						else
+							$('.join-jid').addClass('please-complete');
+					}
+					
+					else
+						$('.join-jid').addClass('please-complete');
+				}
+				
+				return false;
+			}
+			
+			// Escape: quit
+			else if(e.keyCode == 27)
+				closeBubbles();
+			
+			// Buddy search?
+			else if($('.buddy-conf-join-select').val() == 'chat') {
+				// New buddy search
+				if((e.keyCode != 40) && (e.keyCode != 38))
+					createBuddySearch(destination);
+				
+				// Navigating with keyboard in the results
+				arrowsBuddySearch(e, destination);
+			}
+		});
+		
+		// Buddy search lost focus
+		$('#buddy-conf-join input').blur(function() {
+			if(!$(destination + ' ul').attr('mouse-hover'))
+				resetBuddySearch(destination);
+		});
+		
+		// Re-focus on the text input
+		$('#buddy-conf-join select').change(function() {
+			$(document).oneTime(10, function() {
+				$('#buddy-conf-join input').focus();
+			});
+		});
+		
+		// We focus on the input
+		$(document).oneTime(10, function() {
+			$('#buddy-conf-join .join-jid').focus();
+		});
+		
+		return false;
+	});
+	
+	// When the user click on the groupchat button, show the groupchat menu
+	$('#buddy-list .foot .groupchat').click(function() {
+		// Yet displayed?
+		if(exists('#buddy-conf-groupchat'))
+			return closeBubbles();
+		
+		// Add the bubble
+		showBubble('#buddy-conf-groupchat');
+		
+		// Append the content
+		$('#buddy-list .buddy-list-groupchat').append(
+			'<div id="buddy-conf-groupchat" class="buddy-conf-item bubble removable">' + 
+				'<div class="buddy-conf-subarrow talk-images"></div>' + 
+				
+				'<div class="buddy-conf-subitem">' + 
+					'<p class="buddy-conf-p">' + _e("Your groupchats") +  '</p>' + 
+					
+					'<select name="groupchat-join" class="buddy-conf-select buddy-conf-groupchat-select"></select>' + 
+					
+					'<p class="buddy-conf-text">' + 
+						'- <a href="#" class="buddy-conf-groupchat-edit">' + _e("Manage your favorite groupchats") +  '</a>' + 
+					'</p>' + 
+				'</div>' + 
+			'</div>'
+		);
+		
+		// When the user wants to edit his groupchat favorites
+		$('.buddy-conf-groupchat-edit').click(function() {
+			openFavorites();
+			closeBubbles();
+			
+			return false;
+		});
+		
+		// Change event
+		$('.buddy-conf-groupchat-select').change(function() {
+			var groupchat = trim($(this).val());
+			
+			if(groupchat != 'none') {
+				// We hide the bubble
+				closeBubbles();
+				
+				// Create the chat
+				checkChatCreate(groupchat, 'groupchat');
+				
+				// We reset the select value
+				$(this).val('none');
+			}
+		});
+		
+		// Load the favorites
+		loadFavorites();
+		
+		return false;
+	});
+	
+	// When the user click on the more button, show the more menu
+	$('#buddy-list .foot .more').click(function() {
+		// Yet displayed?
+		if(exists('#buddy-conf-more'))
+			return closeBubbles();
+		
+		// Add the bubble
+		showBubble('#buddy-conf-more');
+		
+		// Append the content
+		$('#buddy-list .buddy-list-more').append(
+			'<div id="buddy-conf-more" class="buddy-conf-item bubble removable">' + 
+				'<div class="buddy-conf-subarrow talk-images"></div>' + 
+				
+				'<div class="buddy-conf-subitem">' + 
+					'<p class="buddy-conf-p">' + _e("More stuff") +  '</p>' + 
+					
+					'<p class="buddy-conf-text">' + 
+						'- <a href="#" class="buddy-conf-more-display-unavailable">' + _e("Show all friends") +  '</a>' + 
+						'<a href="#" class="buddy-conf-more-display-available">' + _e("Only show connected friends") +  '</a>' + 
+					'</p>' + 
+					
+					'<p class="buddy-conf-text archives-hidable">' + 
+						'- <a href="#" class="buddy-conf-more-archives">' + _e("Message archives") +  '</a>' + 
+					'</p>' + 
+					
+					'<p class="buddy-conf-text privacy-hidable">' + 
+						'- <a href="#" class="buddy-conf-more-privacy">' + _e("Privacy") +  '</a>' + 
+					'</p>' + 
+					
+					'<p class="buddy-conf-text">' + 
+						'- <a href="#" class="buddy-conf-more-service-disco">' + _e("Service discovery") +  '</a>' + 
+					'</p>' + 
+					
+					'<p class="buddy-conf-text commands-hidable"">' + 
+						'- <a href="#" class="buddy-conf-more-commands">' + _e("Commands") +  '</a>' + 
+					'</p>' + 
+				'</div>' + 
+			'</div>'
+		);
+		
+		// Close bubble when link clicked
+		$('#buddy-conf-more a').click(function() {
+			closeBubbles();
+		});
+		
+		// When the user wants to display all his buddies
+		$('.buddy-conf-more-display-unavailable').click(function() {
+			showAllBuddies('roster');
+			
+			return false;
+		});
+		
+		// When the user wants to display only online buddies
+		$('.buddy-conf-more-display-available').click(function() {
+			showOnlineBuddies('roster');
+			
+			return false;
+		});
+		
+		// When the user click on the archives link
+		$('.buddy-conf-more-archives').click(openArchives);
+		
+		// When the user click on the privacy link
+		$('.buddy-conf-more-privacy').click(openPrivacy);
+		
+		// When the user click on the service discovery link
+		$('.buddy-conf-more-service-disco').click(openDiscovery);
+		
+		// When the user click on the command link
+		$('.buddy-conf-more-commands').click(function() {
+			serverAdHoc(con.domain);
+			
+			return false;
+		});
+		
+		// Manage the displayed links
+		if(BLIST_ALL) {
+			$('.buddy-conf-more-display-unavailable').hide();
+			$('.buddy-conf-more-display-available').show();
+		}
+		
+		if(enabledArchives() || enabledArchives('auto') || enabledArchives('manual') || enabledArchives('manage'))
+			$('.buddy-conf-more-archives').parent().show();
+		
+		if(enabledCommands())
+			$('.buddy-conf-more-commands').parent().show();
+		
+		if(getDB('privacy-marker', 'available'))
+			$('.buddy-conf-more-privacy').parent().show();
+		
+		return false;
+	});
+	
+	// When the user scrolls the buddy list
+	$('#buddy-list .content').scroll(function() {
+		// Close the opened buddy infos bubble
+		closeBubbles();
+	});
+}
+
+// Window resize event handler
+$(window).resize(adaptRoster);
diff --git a/jappixmini/jappix/js/rosterx.js b/jappixmini/jappix/js/rosterx.js
new file mode 100644
index 00000000..5cfe1180
--- /dev/null
+++ b/jappixmini/jappix/js/rosterx.js
@@ -0,0 +1,187 @@
+/*
+
+Jappix - An open social platform
+These are the Roster Item Exchange JS script for Jappix
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 23/06/11
+
+*/
+
+// Opens the welcome tools
+function openRosterX(data) {
+	// Popup HTML content
+	var html = 
+	'<div class="top">' + _e("Suggested friends") + '</div>' + 
+	
+	'<div class="content">' + 
+		'<div class="rosterx-head">' + 
+			'<a href="#" class="uncheck">' + _e("Uncheck all") + '</a>' + 
+			'<a href="#" class="check">' + _e("Check all") + '</a>' + 
+		'</div>' + 
+		
+		'<div class="results"></div>' + 
+	'</div>' + 
+	
+	'<div class="bottom">' + 
+		'<a href="#" class="finish save">' + _e("Save") + '</a>' + 
+		'<a href="#" class="finish cancel">' + _e("Cancel") + '</a>' + 
+	'</div>';
+	
+	// Create the popup
+	createPopup('rosterx', html);
+	
+	// Associate the events
+	launchRosterX();
+	
+	// Parse the data
+	parseRosterX(data);
+	
+	logThis('Roster Item Exchange popup opened.');
+}
+
+// Closes the welcome tools
+function closeRosterX() {
+	// Destroy the popup
+	destroyPopup('rosterx');
+	
+	return false;
+}
+
+// Parses a rosterx query
+function parseRosterX(data) {
+	// Main selector
+	var x = $(data).find('x[xmlns=' + NS_ROSTERX + ']:first');
+	
+	// Parse data
+	x.find('item').each(function() {
+		// Generate group XML
+		var group = '';
+		
+		$(this).find('group').each(function() {
+			group += '<group>' + $(this).text().htmlEnc() + '</group>';
+		});
+		
+		if(group)
+			group = '<groups>' + group + '</groups>';
+		
+		// Display it!
+		displayRosterX($(this).attr('jid'), $(this).attr('name'), group, $(this).attr('action'));
+	});
+	
+	// Click to check/uncheck
+	$('#rosterx .oneresult').click(function(evt) {
+		// No need to apply when click on input
+		if($(evt.target).is('input[type=checkbox]'))
+			return;
+		
+		// Input selector
+		var checkbox = $(this).find('input[type=checkbox]');
+		
+		// Check or uncheck?
+		if(checkbox.filter(':checked').size())
+			checkbox.removeAttr('checked');
+		else
+			checkbox.attr('checked', true);
+	});
+}
+
+// Displays a rosterx item
+function displayRosterX(xid, nick, group, action) {
+	// End if no XID
+	if(!xid)
+		return false;
+	
+	// Set up a default action if no one
+	if(!action || (action != 'modify') || (action != 'delete'))
+		action = 'add';
+	
+	// Override "undefined" for nickname
+	if(!nick)
+		nick = '';
+	
+	// Display it
+	$('#rosterx .results').append(
+		'<div class="oneresult">' + 
+			'<input type="checkbox" checked="" data-name="' + encodeQuotes(nick) + '" data-xid="' + encodeQuotes(xid) + '" data-action="' + encodeQuotes(action) + '" data-group="' + encodeQuotes(group) + '" />' + 
+			'<span class="name">' + nick.htmlEnc() + '</span>' + 
+			'<span class="xid">' + xid.htmlEnc() + '</span>' + 
+			'<span class="action ' + action + ' talk-images"></span>' + 
+		'</div>'
+	);
+}
+
+// Saves the rosterx settings
+function saveRosterX() {
+	// Send the requests
+	$('#rosterx .results input[type=checkbox]').filter(':checked').each(function() {
+		// Read the attributes
+		var nick = $(this).attr('data-name');
+		var xid = $(this).attr('data-xid');
+		var action = $(this).attr('data-action');
+		var group = $(this).attr('data-group');
+		
+		// Parse groups XML
+		if(group) {
+			var group_arr = []
+			
+			$(group).find('group').each(function() {
+				group_arr.push($(this).text().revertHtmlEnc());
+			});
+		}
+		
+		// Process the asked action
+		var roster_item = $('#buddy-list .' + hex_md5(xid));
+		
+		switch(action) {
+			// Buddy add
+			case 'add':
+				if(!exists(roster_item)) {
+					sendSubscribe(xid, 'subscribe');
+					sendRoster(xid, '', nick, group_arr);
+				}
+				
+				break;
+			
+			// Buddy edit
+			case 'modify':
+				if(exists(roster_item))
+					sendRoster(xid, '', nick, group_arr);
+				
+				break;
+			
+			// Buddy delete
+			case 'delete':
+				if(exists(roster_item))
+					sendRoster(xid, 'remove');
+				
+				break;
+		}
+	});
+	
+	// Close the popup
+	closeRosterX();
+}
+
+// Addon launcher
+function launchRosterX() {
+	// Click events
+	$('#rosterx .bottom .finish').click(function() {
+		if($(this).is('.save'))
+			return saveRosterX();
+		if($(this).is('.cancel'))
+			return closeRosterX();
+	});
+	
+	$('#rosterx .rosterx-head a').click(function() {
+		if($(this).is('.check'))
+			$('#rosterx .results input[type=checkbox]').attr('checked', true);
+		else if($(this).is('.uncheck'))
+			$('#rosterx .results input[type=checkbox]').removeAttr('checked');
+		
+		return false;
+	});
+}
diff --git a/jappixmini/jappix/js/search.js b/jappixmini/jappix/js/search.js
new file mode 100644
index 00000000..75b1dfdc
--- /dev/null
+++ b/jappixmini/jappix/js/search.js
@@ -0,0 +1,288 @@
+/*
+
+Jappix - An open social platform
+These are the seach tools JS script for Jappix
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 19/03/11
+
+*/
+
+// Searches in the user's buddy list
+function processBuddySearch(query) {
+	// No query submitted?
+	if(!query)
+		return;
+	
+	// Wildcard (*) submitted
+	if(query == '*')
+		query = '';
+	
+	// Replace forbidden characters in regex
+	query = escapeRegex(query);
+	
+	// Create an empty array
+	var results = new Array();
+	
+	// Search regex
+	var regex = new RegExp('((^)|( ))' + query, 'gi');
+	
+	// Search in the roster
+	var buddies = getAllBuddies();
+	
+	for(i in buddies) {
+		var xid = buddies[i];
+		var nick = getBuddyName(xid);
+		
+		// Buddy match our search, and not yet in the array
+		if(nick.match(regex) && !existArrayValue(results, xid))
+			results.push(xid);
+	}
+	
+	// Return the results array
+	return results;
+}
+
+// Resets the buddy search tool
+function resetBuddySearch(destination) {
+	$(destination + ' ul').remove();
+	$(destination + ' input').removeClass('suggested');
+}
+
+// Add the clicked XID to the input
+function addBuddySearch(destination, xid) {
+	// Remove the search tool
+	resetBuddySearch(destination);
+	
+	// Define a selector
+	var input = $(destination + ' input');
+	var value = input.val();
+	
+	// Get the old value (if there's another value)
+	var old = '';
+	
+	if(value.match(/(^(.+)(,)(\s)?)(\w+)$/))
+		old = RegExp.$1;
+	
+	// Add the XID to the "to" input and focus on it
+	$(document).oneTime(10, function() {
+		input.val(old + xid).focus();
+	});
+	
+	return false;
+}
+
+// Creates the appropriate markup for the search results
+function createBuddySearch(destination) {
+	// Reset the search engine
+	resetBuddySearch(destination);
+	
+	// Get the entered value
+	var value = $(destination + ' input').val();
+	
+	// Separation with a comma?
+	if(value.match(/^(.+)((,)(\s)?)(\w+)$/))
+		value = RegExp.$5;
+	
+	// Get the result array
+	var entered = processBuddySearch(value);
+	
+	// Display each result (if any)
+	if(entered && entered.length) {
+		// Set a special class to the search input
+		$(destination + ' input').addClass('suggested');
+		
+		// Append each found buddy in the container 
+		var regex = new RegExp('((^)|( ))' + value, 'gi');
+		
+		// Initialize the code generation
+		var code = '<ul>';
+		
+		for(b in entered) {
+			// Get some values from the XID
+			var current = getBuddyName(entered[b]).htmlEnc();
+			current = current.replace(regex, '<b>$&</b>');
+			
+			// Add the current element to the global code
+			code += '<li onclick="return addBuddySearch(\'' + encodeOnclick(destination) + '\', \'' + encodeOnclick(entered[b]) + '\');" data-xid="' + encodeQuotes(entered[b]) + '">' + current + '</li>';
+		}
+		
+		// Finish the code generation
+		code += '</ul>';
+		
+		// Creates the code in the DOM
+		$(destination).append(code);
+		
+		// Put the hover on the first element
+		$(destination + ' ul li:first').addClass('hovered');
+		
+		// Hover event, to not to remove this onblur and loose the click event
+		$(destination + ' ul li').hover(function() {
+			$(destination + ' ul li').removeClass('hovered');
+			$(this).addClass('hovered');
+			
+			// Add a marker for the blur event
+			$(destination + ' ul').attr('mouse-hover', 'true');
+		}, function() {
+			$(this).removeClass('hovered');
+			
+			// Remove the mouse over marker
+			$(destination + ' ul').removeAttr('mouse-hover');
+		});
+	}
+}
+
+// Handles the keyboard arrows press when searching
+function arrowsBuddySearch(e, destination) {
+	// Down arrow: 40
+	// Up arrown: 38
+	
+	// Initialize
+	var code = e.keyCode;
+	
+	// Not the key we want here
+	if((code != 40) && (code != 38))
+		return;
+	
+	// Remove the eventual mouse hover marker
+	$(destination + ' ul').removeAttr('mouse-hover');
+	
+	// Create the path & get its size
+	var path = destination + ' ul li';
+	var pSize = $(path).size();
+	
+	// Define the i value
+	var i = 0;
+	
+	// Switching yet launched
+	if(exists(path + '.hovered')) {
+		var index = $(path).attr('data-hovered');
+		
+		if(index)
+			i = parseInt(index);
+		
+		if(code == 40)
+			i++;
+		else
+			i--;
+	}
+	
+	else if(code == 38)
+		i = pSize - 1;
+	
+	// We must not override the maximum i limit
+	if(i >= pSize)
+		i = 0;
+	
+	// We must not have negative i
+	else if(i < 0)
+		i = pSize - 1;
+	
+	// Modify the list
+	$(path + '.hovered').removeClass('hovered');
+	$(path).eq(i).addClass('hovered');
+	
+	// Store the i index
+	$(path).attr('data-hovered', i);
+	
+	return false;
+}
+
+// Filters the buddies in the roster
+var SEARCH_FILTERED = false;
+
+function goFilterBuddySearch(vFilter) {
+	// Put a marker
+	SEARCH_FILTERED = true;
+	
+	// Show the buddies that match the search string
+	var rFilter = processBuddySearch(vFilter);
+	
+	// Hide all the buddies
+	$('#buddy-list .buddy').hide();
+	
+	// Only show the buddies which match the search
+	for(i in rFilter) {
+		// Choose the correct selector for this search
+		if(!BLIST_ALL)
+			$('#buddy-list .buddy[data-xid=' + escape(rFilter[i]) + ']:not(.hidden-buddy)').show();
+		else
+			$('#buddy-list .buddy[data-xid=' + escape(rFilter[i]) + ']').show();
+	}
+}
+
+// Resets the buddy filtering in the roster
+function resetFilterBuddySearch() {
+	// Remove the marker
+	SEARCH_FILTERED = false;
+	
+	// Show all the buddies
+	$('#buddy-list .buddy').show();
+	
+	// Only show available buddies
+	if(!BLIST_ALL)
+		$('#buddy-list .buddy.hidden-buddy').hide();
+	
+	// Update the groups
+	updateGroups();
+}
+
+// Funnels the buddy filtering
+function funnelFilterBuddySearch(keycode) {
+	// Get the input value
+	var input = $('#buddy-list .filter input');
+	var cancel = $('#buddy-list .filter a');
+	var value = input.val();
+	
+	// Security: reset all the groups, empty or not, deployed or not
+	$('#buddy-list .one-group, #buddy-list .group-buddies').show();
+	$('#buddy-list .group span').text('-');
+	
+	// Nothing is entered, or escape pressed
+	if(!value || (keycode == 27)) {
+		if(keycode == 27)
+			input.val('');
+		
+		resetFilterBuddySearch();
+		cancel.hide();
+	}
+	
+	// Process the filtering
+	else {
+		cancel.show();
+		goFilterBuddySearch(value);
+	}
+	
+	// Update the groups
+	updateGroups();
+}
+
+// Searches for the nearest element (with a lower stamp than the current one)
+function sortElementByStamp(stamp, element) {
+	var array = new Array();
+	var i = 0;
+	var nearest = 0;
+	
+	// Add the stamp values to the array
+	$(element).each(function() {
+		var current_stamp = parseInt($(this).attr('data-stamp'));
+		
+		// Push it!
+		array.push(current_stamp);
+	});
+	
+	// Sort the array
+	array.sort();
+	
+	// Get the nearest stamp value
+	while(stamp > array[i]) {
+		nearest = array[i];
+		
+		i++;
+	}
+	
+	return nearest;
+}
diff --git a/jappixmini/jappix/js/smileys.js b/jappixmini/jappix/js/smileys.js
new file mode 100644
index 00000000..62b405f9
--- /dev/null
+++ b/jappixmini/jappix/js/smileys.js
@@ -0,0 +1,113 @@
+/*
+
+Jappix - An open social platform
+These are the smileys JS scripts for Jappix
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 21/03/11
+
+*/
+
+// Generates the correct HTML code for an emoticon insertion tool
+function emoteLink(smiley, image, hash) {
+	return '<a href="#" class="emoticon emoticon-' + image + ' smileys-images" data-smiley="' + smiley + '"></a>';
+}
+
+// Emoticon links arrays
+function smileyLinks(hash) {
+	var links = '';
+	
+	var sArray = new Array(
+		':-D',
+		']:->',
+		'8-)',
+		':-P',
+		':-)',
+		';-)',
+		':-$',
+		':-|',
+		':-/',
+		'=-O',
+		':-(',
+		':\'-(',
+		':-@',
+		':-!',
+		'({)',
+		'(})',
+		':3',
+		'(@)',
+		':-[',
+		':-{}',
+		'<3',
+		'</3',
+		'@}->--',
+		'(W)',
+		'(Y)',
+		'(N)',
+		'(I)',
+		'(C)',
+		'(D)',
+		'(B)',
+		'(Z)',
+		'(X)',
+		'(P)',
+		'(T)',
+		'(8)',
+		'(%)',
+		'(E)',
+		'(R)',
+		'(*)',
+		'(S)'
+	);
+	
+	var cArray = new Array(
+		'biggrin',
+		'devil',
+		'coolglasses',
+		'tongue',
+		'smile',
+		'wink',
+		'blush',
+		'stare',
+		'frowning',
+		'oh',
+		'unhappy',
+		'cry',
+		'angry',
+		'puke',
+		'hugright',
+		'hugleft',
+		'lion',
+		'pussy',
+		'bat',
+		'kiss',
+		'heart',
+		'brheart',
+		'flower',
+		'brflower',
+		'thumbup',
+		'thumbdown',
+		'lamp',
+		'coffee',
+		'drink',
+		'beer',
+		'boy',
+		'girl',
+		'photo',
+		'phone',
+		'music',
+		'cuffs',
+		'mail',
+		'rainbow',
+		'star',
+		'moon'
+	);
+	
+	for(i in sArray)
+		links += emoteLink(sArray[i], cArray[i], hash);
+	
+	return links;
+}
diff --git a/jappixmini/jappix/js/storage.js b/jappixmini/jappix/js/storage.js
new file mode 100644
index 00000000..36cf544a
--- /dev/null
+++ b/jappixmini/jappix/js/storage.js
@@ -0,0 +1,134 @@
+/*
+
+Jappix - An open social platform
+These are the storage JS scripts for Jappix
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 26/08/11
+
+*/
+
+// Gets the storage items of the user
+function getStorage(type) {
+	/* REF: http://xmpp.org/extensions/xep-0049.html */
+	
+	var iq = new JSJaCIQ();
+	iq.setType('get');
+	
+	var iqQuery = iq.setQuery(NS_PRIVATE);
+	iqQuery.appendChild(iq.buildNode('storage', {'xmlns': type}));
+	
+	con.send(iq, handleStorage);
+}
+
+// Handles the storage items
+function handleStorage(iq) {
+	var handleXML = iq.getQuery();
+	var handleFrom = fullXID(getStanzaFrom(iq));
+	
+	// Define some vars
+	var options = $(handleXML).find('storage[xmlns=' + NS_OPTIONS + ']');
+	var inbox = $(handleXML).find('storage[xmlns=' + NS_INBOX + ']');
+	var bookmarks = $(handleXML).find('storage[xmlns=' + NS_BOOKMARKS + ']');
+	var rosternotes = $(handleXML).find('storage[xmlns=' + NS_ROSTERNOTES + ']');
+	
+	// No options and node not yet configured
+	if(options.size() && !options.find('option').size() && (iq.getType() != 'error'))
+		openWelcome();
+	
+	// Parse the options xml
+	options.find('option').each(function() {
+		// We retrieve the informations
+		var type = $(this).attr('type');
+		var value = $(this).text();
+		
+		// We display the storage
+		setDB('options', type, value);
+		
+		// If this is the buddy list show status
+		if((type == 'roster-showall') && (value == '1'))
+			showAllBuddies('storage');
+	});
+	
+	// Parse the inbox xml
+	inbox.find('message').each(function() {
+		storeInboxMessage(
+				  $(this).attr('from'),
+				  $(this).attr('subject'),
+				  $(this).text(),
+				  $(this).attr('status'),
+				  $(this).attr('id'),
+				  $(this).attr('date'),
+				  [
+				   $(this).attr('file_title'),
+				   $(this).attr('file_href'),
+				   $(this).attr('file_type'),
+				   $(this).attr('file_length')
+				  ]
+				 );
+	});
+	
+	// Parse the bookmarks xml
+	bookmarks.find('conference').each(function() {
+		// We retrieve the informations
+		var xid = $(this).attr('jid');
+		var name = $(this).attr('name');
+		var autojoin = $(this).attr('autojoin');
+		var password = $(this).find('password').text();
+		var nick = $(this).find('nick').text();
+		
+		// We display the storage
+		displayFavorites(xid, name, nick, autojoin, password);
+		
+		// Join the chat if autojoin is enabled
+		if(autojoin == '1')
+			checkChatCreate(xid, 'groupchat', nick, password, name);
+	});
+	
+	// Parse the roster notes xml
+	rosternotes.find('note').each(function() {
+		setDB('rosternotes', $(this).attr('jid'), $(this).text());
+	});
+	
+	// Options received
+	if(options.size()) {
+		logThis('Options received.');
+		
+		// Now, get the inbox
+		getStorage(NS_INBOX);
+		
+		// Geolocate the user
+		geolocate();
+		
+		$('.options-hidable').show();
+	}
+	
+	// Inbox received
+	else if(inbox.size()) {
+		logThis('Inbox received.');
+		
+		// Send the first presence!
+		firstPresence(getDB('checksum', 1));
+		
+		// Check we have new messages (play a sound if any unread messages)
+		if(checkInboxMessages())
+			soundPlay(2);
+		
+		$('.inbox-hidable').show();
+	}
+	
+	// Bookmarks received
+	else if(bookmarks.size()) {
+		// Join the groupchats the admin defined (if any)
+		joinConfGroupchats();
+		
+		logThis('Bookmarks received.');
+	}
+	
+	// Roster notes received (for logger)
+	else if(rosternotes.size())
+		logThis('Roster notes received.');
+}
diff --git a/jappixmini/jappix/js/talk.js b/jappixmini/jappix/js/talk.js
new file mode 100644
index 00000000..529de6c7
--- /dev/null
+++ b/jappixmini/jappix/js/talk.js
@@ -0,0 +1,263 @@
+/*
+
+Jappix - An open social platform
+These are the talkpage JS scripts for Jappix
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 06/05/11
+
+*/
+
+// Creates the talkpage events
+function eventsTalkPage() {
+	// Launch all associated addons
+	launchMicroblog();
+	launchRoster();
+	launchPresence();
+	launchPEP();
+	launchNotifications();
+	launchMusic();
+}
+
+// Creates the talkpage code
+function createTalkPage() {
+	// Talkpage exists?
+	if(exists('#talk'))
+		return false;
+	
+	// Anonymous detector
+	var anonymous = isAnonymous();
+	
+	// Generate the HTML code
+	var html = 
+	'<div id="talk" class="removable">' + 
+		'<div id="top-content">' + 
+			'<div class="tools tools-logo talk-images"></div>' + 
+			
+			'<div class="tools tools-all">';
+				
+				if(!anonymous) html += 
+				'<a href="#" onclick="return openInbox();" class="inbox-hidable">' + _e("Messages") +  '</a>' + 
+				'<a href="#" onclick="return openVCard();">' + _e("Profile") +  '</a>' + 
+				'<a href="#" onclick="return optionsOpen();" class="options-hidable">' + _e("Options") +  '</a>' + 
+				'<a href="#" onclick="return normalQuit();">' + _e("Disconnect") +  '</a>';
+				
+				else html +=
+				'<a href="./">' + _e("Disconnect") +  '</a>';
+			
+			html +=
+			'</div>';
+			
+			if(!anonymous && document.createElement('audio').canPlayType) html += 
+			'<div class="tools-all ibubble">' + 
+				'<div class="tools music talk-images" onclick="return openMusic();"></div>' + 
+				
+				'<div class="music-content tools-content bubble hidable">' + 
+					'<div class="tools-content-subarrow talk-images"></div>' + 
+					
+					'<div class="tools-content-subitem">' + 
+						'<div class="player">' + 
+							'<a href="#" class="stop talk-images" onclick="return actionMusic(\'stop\');"></a>' + 
+						'</div>' + 
+						
+						'<div class="list">' + 
+							'<p class="no-results">' + _e("No result!") +  '</p>' + 
+						'</div>' + 
+						
+						'<div class="search">' + 
+							'<input type="text" />' + 
+						'</div>' + 
+					'</div>' + 
+				'</div>' + 
+			'</div>';
+			
+			if(!anonymous) html += 
+			'<div class="tools-all ibubble">' + 
+				'<div class="tools notifications talk-images" onclick="return showBubble(\'.notifications-content\');"></div>' + 
+				
+				'<div class="notifications-content tools-content bubble hidable">' + 
+					'<div class="tools-content-subarrow talk-images"></div>' + 
+					
+					'<div class="tools-content-subitem">' + 
+						'<a class="empty" href="#" onclick="return clearNotifications();">' + _e("Empty") +  '</a>' + 
+						'<p class="nothing">' + _e("No notifications.") +  '</p>' + 
+					'</div>' + 
+				'</div>' + 
+			'</div>';
+		
+		html +=
+		'</div>' + 
+		
+		'<div id="main-content">' + 
+			'<div id="left-content">';
+				if(!anonymous) html += 
+				'<div id="buddy-list">' + 
+					'<div class="content"></div>' + 
+					
+					'<div class="filter">' + 
+						'<input type="text" placeholder="' + _e("Filter") +  '" />' + 
+						'<a href="#">x</a>' + 
+					'</div>' + 
+					
+					'<div class="foot ibubble">' + 
+						'<div class="buddy-list-add buddy-list-icon">' + 
+							'<a href="#" class="add talk-images" title="' + _e("Add a friend") +  '"></a>' + 
+						'</div>' + 
+						
+						'<div class="buddy-list-join buddy-list-icon">' + 
+							'<a href="#" class="join talk-images" title="' + _e("Join a chat") +  '"></a>' + 
+						'</div>' + 
+						
+						'<div class="buddy-list-groupchat buddy-list-icon">' + 
+							'<a href="#" class="groupchat talk-images" title="' + _e("Your groupchats") +  '"></a>' + 
+						'</div>' + 
+						
+						'<div class="buddy-list-more buddy-list-icon">' + 
+							'<a href="#" class="more talk-images" title="' + _e("More stuff") +  '"></a>' + 
+						'</div>' + 
+						
+						'<div style="clear: both;"></div>' + 
+					'</div>' + 
+				'</div>';
+				
+				html +=
+				'<div id="my-infos">' + 
+					'<div class="content">' + 
+						'<div class="element f-presence ibubble">' + 
+							'<a href="#" class="icon picker disabled" data-value="available">' + 
+								'<span class="talk-images"></span>' + 
+							'</a>' + 
+							
+							'<input id="presence-status" type="text" placeholder="' + _e("Status") + '" disabled="" />' + 
+						'</div>';
+						
+						if(!anonymous) html += 
+						'<div class="element f-mood pep-hidable ibubble">' + 
+							'<a href="#" class="icon picker" data-value="happy">' + 
+								'<span class="talk-images"></span>' + 
+							'</a>' + 
+							
+							'<input id="mood-text" type="text" placeholder="' + _e("Mood") + '" />' + 
+						'</div>' + 
+						
+						'<div class="element f-activity pep-hidable ibubble">' + 
+							'<a href="#" class="icon picker" data-value="exercising">' + 
+								'<span class="talk-images activity-exercising"></span>' + 
+							'</a>' + 
+							
+							'<input id="activity-text" type="text" placeholder="' + _e("Activity") + '" />' + 
+						'</div>';
+					
+					html +=
+					'</div>' + 
+				'</div>' + 
+			'</div>' + 
+			
+			'<div id="right-content">' + 
+				'<div id="page-switch">' + 
+					'<div class="chans">';
+						if(!anonymous) html += 
+						'<div class="channel switcher activechan" onclick="return switchChan(\'channel\');">' + 
+							'<div class="icon talk-images"></div>' + 
+						
+							'<div class="name">' + _e("Channel") +  '</div>' + 
+						'</div>';
+					
+					html +=
+					'</div>' + 
+					
+					'<div class="more ibubble">' + 
+						'<div class="more-button talk-images" onclick="return loadChatSwitch();" title="' + _e("All tabs") +  '"></div>' + 
+					'</div>' + 
+				'</div>' + 
+				
+				'<div id="page-engine">';
+					if(!anonymous) html += 
+					'<div id="channel" class="page-engine-chan" style="display: block;">' + 
+						'<div class="top mixed ' + hex_md5(getXID()) + '">' + 
+							'<div class="avatar-container">' + 
+								'<img class="avatar" src="' + './img/others/default-avatar.png' + '" alt="" />' + 
+							'</div>' + 
+							
+							'<div class="update">' + 
+								'<p>' + _e("What\'s up with you?") +  '</p>' + 
+								
+								'<div class="microblog-body">' + 
+									'<input class="focusable" type="text" name="microblog_body" placeholder="' + _e("Type something you want to share with your friends...") + '" disabled="" />' + 
+								'</div>' + 
+								
+								'<div class="one-microblog-icon ibubble">' + 
+									'<a href="#" onclick="return showBubble(\'#attach\');" title="' + _e("Attach a file") +  '" class="postit attach talk-images"></a>' + 
+									
+									'<form id="attach" class="bubble hidable" action="./php/file-share.php" method="post" enctype="multipart/form-data">' + 
+										'<div class="attach-subarrow talk-images"></div>' + 
+										
+										'<div class="attach-subitem">' + 
+											'<p class="attach-p">' + _e("Attach a file") +  '</p>' + 
+											generateFileShare() + 
+										'</div>' + 
+									'</form>' + 
+								'</div>' + 
+							'</div>' + 
+						'</div>' + 
+						
+						'<div class="content mixed"></div>' + 
+						
+						'<div class="footer">' + 
+							'<div class="sync talk-images">' + _e("You are synchronized with your network.") +  '</div>' + 
+							
+							'<div class="unsync talk-images">' + _e("Cannot send anything: you can only receive notices!") +  '</div>' + 
+							
+							'<div class="fetch wait-small">' + _e("Fetching the social channel...") +  '</div>' + 
+						'</div>' + 
+					'</div>';
+				
+				html +=
+				'</div>' + 
+			'</div>' + 
+		'</div>' + 
+	'</div>';
+	
+	// Create the HTML code
+	$('body').prepend(html);
+	
+	// Adapt the buddy-list size
+	adaptRoster();
+	
+	// Create JS events
+	eventsTalkPage();
+	
+	// Start the auto idle functions
+	liveIdle();
+	
+	return true;
+}
+
+// Destroys the talkpage code
+function destroyTalkPage() {
+	// Reset our database
+	resetDB();
+	
+	// Reset some vars
+	STANZA_ID = 1;
+	BLIST_ALL = false;
+	FIRST_PRESENCE_SENT = false;
+	SEARCH_FILTERED = false;
+	AVATAR_PENDING = [];
+	
+	// Kill all timers, exept the board ones
+	$('*:not(#board .one-board)').stopTime();
+	
+	// Kill the auto idle functions
+	dieIdle();
+	
+	// We renitalise the html markup as its initiale look
+	$('.removable').remove();
+	pageTitle('home');
+	
+	// Finally we show the homepage
+	$('#home').show();
+}
diff --git a/jappixmini/jappix/js/tooltip.js b/jappixmini/jappix/js/tooltip.js
new file mode 100644
index 00000000..2ba87ab8
--- /dev/null
+++ b/jappixmini/jappix/js/tooltip.js
@@ -0,0 +1,268 @@
+/*
+
+Jappix - An open social platform
+These are the tooltip JS scripts for Jappix
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 27/08/11
+
+*/
+
+// Creates a tooltip code
+function createTooltip(xid, hash, type) {
+	// Path to the element
+	var path = '#' + hash;
+	var path_tooltip = path + ' .chat-tools-' + type;
+	var path_bubble = path_tooltip + ' .bubble-' + type;
+	
+	// Yet exists?
+	if(exists(path_bubble))
+		return false;
+	
+	// Generates special tooltip HTML code
+	var title = '';
+	var content = '';
+	
+	switch(type) {
+		// Smileys
+		case 'smileys':
+			title = _e("Smiley insertion");
+			content = smileyLinks(hash);
+			
+			break;
+		
+		// Style
+		case 'style':
+			title = _e("Change style");
+			content = 
+				'<label class="bold"><input type="checkbox" class="bold" />' + _e("Text in bold") + '</label>' + 
+				'<label class="italic"><input type="checkbox" class="italic" />' + _e("Text in italic") + '</label>' + 
+				'<label class="underline"><input type="checkbox" class="underline" />' + _e("Underlined text") + '</label>' + 
+				'<a href="#" class="color" style="background-color: #b10808; clear: both;" data-color="b10808"></a>' + 
+				'<a href="#" class="color" style="background-color: #e5860c;" data-color="e5860c"></a>' + 
+				'<a href="#" class="color" style="background-color: #f0f30e;" data-color="f0f30e"></a>' + 
+				'<a href="#" class="color" style="background-color: #009a04;" data-color="009a04"></a>' + 
+				'<a href="#" class="color" style="background-color: #0ba9a0;" data-color="0ba9a0"></a>' + 
+				'<a href="#" class="color" style="background-color: #04228f;" data-color="04228f"></a>' + 
+				'<a href="#" class="color" style="background-color: #9d0ab7;" data-color="9d0ab7"></a>' + 
+				'<a href="#" class="color" style="background-color: #8a8a8a;" data-color="8a8a8a"></a>';
+			
+			break;
+		
+		// File send
+		case 'file':
+			title = _e("Send a file");
+			content = '<p style="margin-bottom: 8px;">' + _e("Once uploaded, your friend will be prompted to download the file you sent.") + '</p>';
+			content += '<form id="oob-upload" action="./php/send.php" method="post" enctype="multipart/form-data">' + generateFileShare() + '</form>';
+			
+			break;
+		
+		// Chat log
+		case 'save':
+			title = _e("Save chat");
+			content = '<p style="margin-bottom: 8px;">' + _e("Click on the following link to get the chat log, and wait. Then click again to get the file.") + '</p>';
+			
+			// Possible to generate any log?
+			if($(path + ' .one-line').size())
+				content += '<a href="#" class="tooltip-actionlog">' + _e("Generate file!") + '</a>';
+			else
+				content += '<span class="tooltip-nolog">' + _e("This chat is empty!") + '</span>';
+			
+			break;
+	}
+	
+	// Generates general tooltip HTML code
+	var html = 
+		'<div class="tooltip bubble-' + type + '">' + 
+			'<div class="tooltip-subitem">' + 
+				'<p class="tooltip-top">' + title + '</p>' + 
+				content + 
+			'</div>' + 
+			
+			'<div class="tooltip-subarrow talk-images"></div>' + 
+		'</div>';
+	
+	// Append the HTML code
+	$(path_tooltip).append(html);
+	
+	// Special events
+	switch(type) {
+		// Smileys
+		case 'smileys':
+			// Apply click event on smiley links
+			$(path_tooltip + ' a.emoticon').click(function() {
+				return insertSmiley($(this).attr('data-smiley'), hash);
+			});
+			
+			break;
+		
+		// Style
+		case 'style':
+			// Paths to items
+			var message_area = path + ' .message-area';
+			var bubble_style = path_tooltip + ' .bubble-style ';
+			var style = bubble_style + 'input:checkbox';
+			var colors = bubble_style + 'a.color';
+			
+			// Click event on color picker
+			$(colors).click(function() {
+				// The clicked color is yet selected
+				if($(this).hasClass('selected')) {
+					$(message_area).removeAttr('data-color');
+					$(this).removeClass('selected');
+				}
+				
+				else {
+					$(message_area).attr('data-color', $(this).attr('data-color'));
+					$(colors).removeClass('selected');
+					$(this).addClass('selected');
+				}
+				
+				return false;
+			});
+			
+			// Change event on text style checkboxes
+			$(style).change(function() {
+				// Get current type
+				var style_data = 'data-' + $(this).attr('class');
+				
+				// Checked checkbox?
+				if($(this).filter(':checked').size())
+					$(message_area).attr(style_data, true);
+				else
+					$(message_area).removeAttr(style_data);
+			});
+			
+			// Update the textarea style when it is changed
+			$(style + ', ' + colors).click(function() {
+				var style = generateStyle(hash);
+				
+				// Any style to apply?
+				if(style)
+					$(message_area).attr('style', style);
+				else
+					$(message_area).removeAttr('style');
+				
+				// Focus again on the message textarea
+				$(document).oneTime(10, function() {
+					$(message_area).focus();
+				});
+			});
+			
+			// Load current style
+			loadStyleSelector(hash);
+			
+			break;
+		
+		// File send
+		case 'file':
+			// File upload vars
+			var oob_upload_options = {
+				dataType:	'xml',
+				beforeSubmit:	waitUploadOOB,
+				success:	handleUploadOOB
+			};
+			
+			// Upload form submit event
+			$(path_tooltip + ' #oob-upload').submit(function() {
+				if($(path_tooltip + ' #oob-upload input[type=file]').val())
+					$(this).ajaxSubmit(oob_upload_options);
+				
+				return false;
+			});
+			
+			// Upload input change event
+			$(path_tooltip + ' #oob-upload input[type=file]').change(function() {
+				if($(this).val())
+					$(path_tooltip + ' #oob-upload').ajaxSubmit(oob_upload_options);
+				
+				return false;
+			});
+			
+			// Input click event
+			$(path_tooltip + ' #oob-upload input[type=file], ' + path_tooltip + ' #oob-upload input[type=submit]').click(function() {
+				if(exists(path_tooltip + ' #oob-upload input[type=reset]'))
+					return;
+				
+				// Lock the bubble
+				$(path_bubble).addClass('locked');
+				
+				// Add a cancel button
+				$(this).after('<input type="reset" value="' + _e("Cancel") + '" />');
+				
+				// Cancel button click event
+				$(path_tooltip + ' #oob-upload input[type=reset]').click(function() {
+					// Remove the bubble
+					$(path_bubble).removeClass('locked');
+					destroyTooltip(hash, 'file');
+				});
+			});
+			
+			break;
+		
+		// Chat log
+		case 'save':
+			// Chat log generation click event
+			$(path_tooltip + ' .tooltip-actionlog').click(function() {
+				// Replace it with a waiting notice
+				$(this).replaceWith('<span class="tooltip-waitlog">' + _e("Please wait...") + '</span>');
+				
+				generateChatLog(xid, hash);
+				
+				return false;
+			});
+			
+			break;
+	}
+	
+	return true;
+}
+
+// Destroys a tooltip code
+function destroyTooltip(hash, type) {
+	$('#' + hash + ' .chat-tools-content:not(.mini) .bubble-' + type + ':not(.locked)').remove();
+}
+
+// Applies the page-engine tooltips hover event
+function hoverTooltip(xid, hash, type) {
+	$('#' + hash + ' .chat-tools-' + type).hover(function() {
+		createTooltip(xid, hash, type);
+	}, function() {
+		destroyTooltip(hash, type)
+	});
+}
+
+// Applies the hoverTooltip function to the needed things
+function tooltipIcons(xid, hash) {
+	// Hover events
+	hoverTooltip(xid, hash, 'smileys');
+	hoverTooltip(xid, hash, 'style');
+	hoverTooltip(xid, hash, 'file');
+	hoverTooltip(xid, hash, 'save');
+	
+	// Click events
+	$('#' + hash + ' a.chat-tools-content, #' + hash + ' .chat-tools-content a').click(function() {
+		return false;
+	});
+}
+
+// Loads the style selector options
+function loadStyleSelector(hash) {
+	// Define the vars
+	var path = '#' + hash;
+	var message_area = $(path + ' .message-area');
+	var bubble_style = path + ' .bubble-style';
+	
+	// Apply the options to the style selector
+	$(bubble_style + ' input[type=checkbox]').each(function() {
+		// Current input enabled?
+		if(message_area.attr('data-' + $(this).attr('class')))
+			$(this).attr('checked', true);
+	});
+	
+	// Apply message color
+	$(bubble_style + ' a.color[data-color=' + message_area.attr('data-color') + ']').addClass('selected');
+}
diff --git a/jappixmini/jappix/js/userinfos.js b/jappixmini/jappix/js/userinfos.js
new file mode 100644
index 00000000..885f3163
--- /dev/null
+++ b/jappixmini/jappix/js/userinfos.js
@@ -0,0 +1,426 @@
+/*
+
+Jappix - An open social platform
+These are the user-infos JS scripts for Jappix
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 27/03/11
+
+*/
+
+// Opens the user-infos popup
+function openUserInfos(xid) {
+	// Can show shortcuts?
+	var shortcuts = '';
+	
+	if(xid != getXID()) {
+		shortcuts = '<div class="shortcuts">' + 
+					'<a href="#" class="message talk-images" title="' + _e("Send him/her a message") + '" onclick="closeUserInfos(); return composeInboxMessage(\'' + encodeOnclick(xid) + '\');"></a>' + 
+					'<a href="#" class="chat talk-images" title="' + _e("Start a chat with him/her") + '" onclick="closeUserInfos(); return checkChatCreate(\'' + encodeOnclick(xid) + '\', \'chat\');"></a>' + 
+					'<a href="#" class="command talk-images" title="' + _e("Command") + '" onclick="closeUserInfos(); return retrieveAdHoc(\'' + encodeOnclick(xid) + '\');"></a>' + 
+		             '</div>';
+	}
+	
+	// Popup HTML content
+	var html = 
+	'<div class="top">' + _e("User profile") + '</div>' + 
+	
+	'<div class="tab">' + 
+		'<a href="#" class="tab-active" data-key="1">' + _e("General") + '</a>' + 
+		'<a href="#" data-key="2">' + _e("Advanced") + '</a>' + 
+		'<a href="#" data-key="3">' + _e("Comments") + '</a>' + 
+	'</div>' + 
+	
+	'<div class="content">' + 
+		'<div class="lap-active one-lap info1">' + 
+			'<div class="main-infos">' + 
+				'<div class="avatar-container">' + 
+					'<img class="avatar" src="' + './img/others/default-avatar.png' + '" alt="" />' + 
+				'</div>' + 
+				
+				'<h1 id="BUDDY-FN" class="reset-info">' + _e("unknown") + '</h1>' + 
+				'<h2 class="buddy-xid" class="reset-info">' + _e("unknown") + '</h2>' + 
+				'<h3 class="buddy-last" class="reset-info">' + _e("unknown") + '</h3>' + 
+				
+				shortcuts + 
+			'</div>' + 
+			
+			'<div class="block-infos">' + 
+				'<div class="one-line"><b>' + _e("Date of birth") + '</b><span id="BUDDY-BDAY" class="reset-info">' + _e("unknown") + '</span></div>' + 
+				
+				'<div class="one-line"><b>' + _e("E-mail") + '</b><span id="BUDDY-EMAIL-USERID" class="reset-info">' + _e("unknown") + '</span></div>' + 
+				
+				'<div class="one-line"><b>' + _e("Phone") + '</b><span id="BUDDY-TEL-NUMBER" class="reset-info">' + _e("unknown") + '</span></div>' + 
+				
+				'<div class="one-line"><b>' + _e("Website") + '</b><span id="BUDDY-URL" class="reset-info">' + _e("unknown") + '</span></div>' + 
+			'</div>' + 
+			
+			'<div class="block-infos">' + 
+				'<div class="one-line"><b>' + _e("Client") + '</b><span id="BUDDY-CLIENT" class="reset-info">' + _e("unknown") + '</span></div>' + 
+				
+				'<div class="one-line"><b>' + _e("System") + '</b><span id="BUDDY-SYSTEM" class="reset-info">' + _e("unknown") + '</span></div>' + 
+				
+				'<div class="one-line"><b>' + _e("Local time") + '</b><span id="BUDDY-TIME" class="reset-info">' + _e("unknown") + '</span></div>' + 
+			'</div>' + 
+		'</div>' + 
+		
+		'<div class="one-lap info2">' + 
+			'<div class="block-infos">' + 
+				'<div class="one-line"><b>' + _e("Street") + '</b><span id="BUDDY-ADR-STREET" class="reset-info">' + _e("unknown") + '</span></div>' + 
+				
+				'<div class="one-line"><b>' + _e("City") + '</b><span id="BUDDY-ADR-LOCALITY" class="reset-info">' + _e("unknown") + '</span></div>' + 
+				
+				'<div class="one-line"><b>' + _e("Postal code") + '</b><span id="BUDDY-ADR-PCODE" class="reset-info">' + _e("unknown") + '</span></div>' + 
+				
+				'<div class="one-line"><b>' + _e("Country") + '</b><span id="BUDDY-ADR-CTRY" class="reset-info">' + _e("unknown") + '</span></div>' + 
+			'</div>' + 
+			
+			'<div class="block-infos">' + 
+				'<div class="one-line"><b>' + _e("Biography") + '</b><span id="BUDDY-DESC" class="reset-info">' + _e("unknown") + '</span></div>' + 
+			'</div>' + 
+		'</div>' + 
+		
+		'<div class="one-lap info3">' + 
+			'<textarea class="rosternotes" rows="8" cols="60"></textarea>' + 
+		'</div>' + 
+	'</div>' + 
+	
+	'<div class="bottom">' + 
+		'<div class="wait wait-medium"></div>' + 
+		
+		'<a href="#" class="finish">' + _e("Close") + '</a>' + 
+	'</div>';
+	
+	// Create the popup
+	createPopup('userinfos', html);
+	
+	// Associate the events
+	launchUserInfos();
+	
+	// We retrieve the user's vcard
+	retrieveUserInfos(xid);
+	
+	return false;
+}
+
+// Closes the user-infos popup
+function closeUserInfos() {
+	// Send the buddy comments
+	sendBuddyComments();
+	
+	// Destroy the popup
+	destroyPopup('userinfos');
+	
+	return false;
+}
+
+// Gets the user-infos
+function retrieveUserInfos(xid) {
+	// We setup the waiting indicator
+	markers = 'vcard last';
+	
+	// We put the user's XID
+	$('#userinfos .buddy-xid').text(xid);
+	
+	// We get the vCard
+	getVCard(xid, 'buddy');
+	
+	// Get the highest resource for this XID
+	var cXID = getHighestResource(xid);
+	var pXID = xid;
+	
+	// If the user is logged in
+	if(cXID) {
+		// Change the XID
+		pXID = cXID;
+		
+		// We request the user's system infos
+		queryUserInfos(cXID, 'version')
+		
+		// We request the user's local time
+		queryUserInfos(cXID, 'time')
+		
+		// Add these to the markers
+		markers += ' version time';
+	}
+	
+	// We request the user's last activity
+	queryUserInfos(pXID, 'last');
+	
+	// Add the markers
+	$('#userinfos .content').addClass(markers);
+	
+	// We request all the user's comments
+	displayBuddyComments(xid);
+}
+
+// Builds the asked user-infos query
+function queryUserInfos(xid, mode) {
+	// Generate a session ID
+	var id = genID();
+	$('#userinfos').attr('data-' + mode, id);
+	
+	// New IQ
+	var iq = new JSJaCIQ();
+	
+	iq.setID(id);
+	iq.setType('get');
+	iq.setTo(xid);
+	
+	// Last activity query
+	if(mode == 'last') {
+		iq.setQuery(NS_LAST);
+		con.send(iq, lastActivityUserInfos);
+	}
+	
+	// Time query
+	else if(mode == 'time') {
+		iq.appendNode('time', {'xmlns': NS_URN_TIME});
+		con.send(iq, localTimeUserInfos);
+	}
+	
+	// Version query
+	else if(mode == 'version') {
+		iq.setQuery(NS_VERSION);
+		con.send(iq, versionUserInfos);
+	}
+}
+
+// Checks if the waiting item can be hidden
+function vCardBuddyInfos() {
+	$('#userinfos .content').removeClass('vcard');
+	wUserInfos();
+}
+
+// Displays the buddy comments
+function displayBuddyComments(xid) {
+	// We get the value in the database
+	var value = getDB('rosternotes', xid);
+	
+	// Display the value
+	if(value)
+		$('#userinfos .rosternotes').val(value);
+}
+
+// Displays the user's last activity result
+function lastActivityUserInfos(iq) {
+	// Extract the request ID
+	var id = iq.getID();
+	var path = '#userinfos[data-last=' + id + ']';
+	
+	// End if session does not exist
+	if(!exists(path))
+		return;
+	
+	if(iq && (iq.getType() == 'result')) {
+		// Get the values
+		var from = fullXID(getStanzaFrom(iq));
+		var seconds = $(iq.getNode()).find('query').attr('seconds');
+		
+		// Any seconds?
+		if(seconds != undefined) {
+			// Initialize the parsing
+			var last;
+			seconds = parseInt(seconds);
+			
+			// Active user
+			if(seconds <= 60)
+				last = _e("User currently active");
+			
+			// Inactive user
+			else {
+				// Parse the date
+				var date_now = new Date();
+				var time_now = date_now.getTime();
+				var date_last = new Date(date_now - (seconds * 1000));
+				var date = date_last.toLocaleString();
+				
+				// Offline user
+				if(from.indexOf('/') == -1)
+					last = printf(_e("Last seen: %s"), date);
+				
+				// Online user
+				else
+					last = printf(_e("Inactive since: %s"), date);
+			}
+			
+			// Append this text
+			$('#userinfos .buddy-last').text(last);
+		}
+		
+		logThis('Last activity received: ' + from);
+	}
+	
+	$('#userinfos .content').removeClass('last');
+	wUserInfos();
+}
+
+// Displays the user's software version result
+function versionUserInfos(iq) {
+	// Extract the request ID
+	var id = iq.getID();
+	var path = '#userinfos[data-version=' + id + ']';
+	
+	// End if session does not exist
+	if(!exists(path))
+		return;
+	
+	// Extract the reply data
+	if(iq && (iq.getType() == 'result')) {
+		// Get the values
+		var xml = iq.getQuery();
+		var name = $(xml).find('name').text();
+		var version = $(xml).find('version').text();
+		var os = $(xml).find('os').text();
+		
+		// Put the values together
+		if(name && version)
+			name = name + ' ' + version;
+		
+		// Display the values
+		if(name)
+			$(path + ' #BUDDY-CLIENT').text(name);
+		if(os)
+			$(path + ' #BUDDY-SYSTEM').text(os);
+		
+		logThis('Software version received: ' + fullXID(getStanzaFrom(iq)));
+	}
+	
+	$('#userinfos .content').removeClass('version');
+	wUserInfos();
+}
+
+// Displays the user's local time result
+function localTimeUserInfos(iq) {
+	// Extract the request ID
+	var id = iq.getID();
+	var path = '#userinfos[data-time=' + id + ']';
+	
+	// End if session does not exist
+	if(!exists(path))
+		return;
+	
+	if(iq && (iq.getType() == 'result')) {
+		// Get the values
+		var xml = iq.getNode();
+		var tzo = $(xml).find('tzo').text();
+		var utc = $(xml).find('utc').text();
+		
+		// Any UTC?
+		if(utc) {
+			// Add the TZO if there's no one
+			if(tzo && utc.match(/^(.+)Z$/))
+				utc = RegExp.$1 + tzo;
+			
+			// Get the local date string
+			var local_string = Date.hrTime(utc);
+			
+			// Then display it
+			$(path + ' #BUDDY-TIME').text(local_string);
+		}
+		
+		logThis('Local time received: ' + fullXID(getStanzaFrom(iq)));
+	}
+	
+	$('#userinfos .content').removeClass('time');
+	wUserInfos();
+}
+
+// Hides the waiting image if needed
+function wUserInfos() {
+	var selector = $('#userinfos .content');
+	
+	if(!selector.hasClass('vcard') && !selector.hasClass('last') && !selector.hasClass('version') && !selector.hasClass('time'))
+		$('#userinfos .wait').hide();
+}
+
+// Sends the buddy comments
+function sendBuddyComments() {
+	// Update the current value
+	var value = $('#userinfos .rosternotes').val();
+	var xid = $('#userinfos .buddy-xid').text();
+	
+	// Necessary to update?
+	var old_value = getDB('rosternotes', xid);
+	
+	if((old_value == value) || (!old_value && !value))
+		return false;
+	
+	// Update the database
+	setDB('rosternotes', xid, value);
+	
+	// Send the new buddy storage values
+	var iq = new JSJaCIQ();
+	iq.setType('set');
+	var query = iq.setQuery(NS_PRIVATE);
+	var storage = query.appendChild(iq.buildNode('storage', {'xmlns': NS_ROSTERNOTES}));
+	
+	// We regenerate the XML
+	for(var i = 0; i < sessionStorage.length; i++) {
+		// Get the pointer values
+		var current = sessionStorage.key(i);
+		
+		// If the pointer is on a stored rosternote
+		if(explodeThis('_', current, 0) == 'rosternotes') {
+			var xid = explodeThis('_', current, 1);
+			var value = sessionStorage.getItem(current);
+			
+			if(xid && value)
+				storage.appendChild(iq.buildNode('note', {'jid': xid, 'xmlns': NS_ROSTERNOTES}, value));
+		}
+	}
+	
+	con.send(iq);
+	
+	return false;
+}
+
+// Switches the user-infos tabs
+function switchUInfos(id) {
+	$('#userinfos .content .one-lap').hide();
+	$('#userinfos .content .info' + id).show();
+	$('#userinfos .tab a').removeClass('tab-active');
+	$('#userinfos .tab a[data-key=' + id + ']').addClass('tab-active');
+	
+	return false;
+}
+
+// Gets the user's informations when creating a new chat
+function getUserInfos(hash, xid, nick, type) {
+	// This is a normal chat
+	if(type != 'private') {
+		// Display the buddy name
+		if(nick) {
+			$('#' + hash + ' .top .name .bc-name').text(nick);
+			$('#page-switch .' + hash + ' .name').text(nick);
+		}
+		
+		// Get the buddy PEP informations
+		displayAllPEP(xid);
+	}
+	
+	// Display the buddy presence
+	presenceFunnel(xid, hash);
+}
+
+// Addon launcher
+function launchUserInfos() {
+	// Click events
+	$('#userinfos .tab a').click(function() {
+		// Yet active?
+		if($(this).hasClass('tab-active'))
+			return false;
+		
+		// Switch to the good tab
+		var key = parseInt($(this).attr('data-key'));
+		
+		return switchUInfos(key);
+	});
+	
+	$('#userinfos .bottom .finish').click(function() {
+		return closeUserInfos();
+	});
+}
diff --git a/jappixmini/jappix/js/utilities.js b/jappixmini/jappix/js/utilities.js
new file mode 100644
index 00000000..b28a6a75
--- /dev/null
+++ b/jappixmini/jappix/js/utilities.js
@@ -0,0 +1,437 @@
+/*
+
+Jappix - An open social platform
+These are the utilities JS script for Jappix
+
+-------------------------------------------------
+
+License: AGPL
+Authors: Vanaryon, olivierm
+Last revision: 24/06/11
+
+*/
+
+// Checks if a function exists
+function functionExists(func) {
+	if(typeof func == 'function')
+		return true;
+	
+	return false;
+}
+
+// Returns whether using HTTPS or not
+function isHTTPS() {
+	if(window.location.href && (window.location.href).match(/^https/i))
+		return true;
+	
+	return false;
+}
+
+// Generates the good storage URL
+function generateURL(url) {
+	// HTTPS not allowed
+	if((HTTPS_STORAGE != 'on') && url.match(/^https(.+)/))
+		url = 'http' + RegExp.$1;
+	
+	return url;
+}
+
+// Disables an input if needed
+function disableInput(value, condition) {
+	if(value == condition)
+		return ' disabled=""';
+	
+	return '';
+}
+
+// Cuts a string
+function cut(string, limit) {
+	return string.substr(0, limit);
+}
+
+// Truncates a string
+function truncate(string, limit) {
+	// Must truncate the string
+	if(string.length > limit)
+		string = string.substr(0, limit) + '...';
+	
+	return string;
+}
+
+// Removes the new lines
+function noLines(string) {
+	return string.replace(/\n/g, ' ');
+}
+
+// Encodes a string for onclick attribute
+function encodeOnclick(str) {
+	return (encodeQuotes(str)).replace(/'/g, '\\$&');
+}
+
+// Checks if we are in the anonymous mode
+function isAnonymous() {
+	if(allowedAnonymous() && LINK_VARS['r'])
+		return true;
+	
+	return false;
+}
+
+// Checks if this is a private chat user
+function isPrivate(xid) {
+	if(exists('[data-xid=' + escape(xid) + '][data-type=groupchat]'))
+		return true;
+	
+	return false;
+}
+
+// Checks if the user browser is obsolete
+function isObsolete() {
+	// Get browser name & version
+	var browser_name = BrowserDetect.browser;
+	var browser_version = BrowserDetect.version;
+	
+	// No DOM storage
+	if(!hasDB() || !hasPersistent())
+		return true;
+	
+	// Obsolete IE
+	if((browser_name == 'Explorer') && (browser_version < 8))
+		return true;
+	
+	// Obsolete Chrome
+	if((browser_name == 'Chrome') && (browser_version < 7))
+		return true;
+	
+	// Obsolete Safari
+	if((browser_name == 'Safari') && (browser_version < 4))
+		return true;
+	
+	// Obsolete Firefox
+	if((browser_name == 'Firefox') && (browser_version < 3.5))
+		return true;
+	
+	// Obsolete Opera
+	if((browser_name == 'Opera') && (browser_version < 9))
+		return true;
+	
+	return false;
+}
+
+// Gets a MUC user XID
+function getMUCUserXID(room, nick) {
+	return $('div.chat[data-xid=' + escape(room) + '] div[data-nick=' + escape(nick) + ']').attr('data-xid');
+}
+
+// Gets a MUC user read XID
+function getMUCUserRealXID(room, nick) {
+	return $('div.chat[data-xid=' + escape(room) + '] div[data-nick=' + escape(nick) + ']').attr('data-realxid');
+}
+
+// Gets the server of the user
+function getServer() {
+	// Return the domain of the user
+	return con.domain;
+}
+
+// Gets the password of the user
+function getPassword() {
+	// Return the password of the user
+	return con.pass;
+}
+
+// Quotes the nick of an user
+function quoteMyNick(hash, nick) {
+	$(document).oneTime(10, function() {
+		$('#page-engine #' + hash + ' .message-area').val(nick + ', ').focus();
+	});
+}
+
+// Escapes a string for a regex usage
+function escapeRegex(query) {
+	return query.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, '\\$&');
+}
+
+// Converts a XML document to a string
+function xmlToString(xmlData) {
+	try {
+		// For Mozilla, Firefox, Opera, etc.
+		if(window.XMLSerializer)
+			return (new XMLSerializer()).serializeToString(xmlData);
+		
+		// For Internet Explorer
+		if(window.ActiveXObject)
+			return xmlData.xml;
+		
+		return null;
+	}
+	
+	catch(e) {
+		return null;
+	}
+}
+
+// Converts a string to a XML document
+function XMLFromString(sXML) {
+	try {
+		// No data?
+		if(!sXML)
+			return '';
+		
+		// Add the XML tag
+		if(!sXML.match(/^<\?xml/i))
+			sXML = '<?xml version="1.0"?>' + sXML;
+		
+		// Parse it!
+		if(window.DOMParser)
+			return (new DOMParser()).parseFromString(sXML, 'text/xml');
+		
+		if(window.ActiveXObject) {
+			var oXML = new ActiveXObject('Microsoft.XMLDOM');
+			oXML.loadXML(sXML);
+			
+	 		return oXML;
+		}
+	}
+	
+	catch(e) {
+		return '';
+	}
+}
+
+// Return the file category
+function fileCategory(ext) {
+	var cat;
+	
+	switch(ext) {
+		// Images
+		case 'jpg':
+		case 'jpeg':
+		case 'png':
+		case 'bmp':
+		case 'gif':
+		case 'tif':
+		case 'svg':
+		case 'psp':
+		case 'xcf':
+			cat = 'image';
+			
+			break;
+		
+		// Videos
+		case 'ogv':
+		case 'ogg':
+		case 'mkv':
+		case 'avi':
+		case 'mov':
+		case 'mp4':
+		case 'm4v':
+		case 'wmv':
+		case 'asf':
+		case 'mpg':
+		case 'mpeg':
+		case 'ogm':
+		case 'rmvb':
+		case 'rmv':
+		case 'qt':
+		case 'flv':
+		case 'ram':
+		case '3gp':
+		case 'avc':
+			cat = 'video';
+			
+			break;
+		
+		// Sounds
+		case 'oga':
+		case 'mka':
+		case 'flac':
+		case 'mp3':
+		case 'wav':
+		case 'm4a':
+		case 'wma':
+		case 'rmab':
+		case 'rma':
+		case 'bwf':
+		case 'aiff':
+		case 'caf':
+		case 'cda':
+		case 'atrac':
+		case 'vqf':
+		case 'au':
+		case 'aac':
+		case 'm3u':
+		case 'mid':
+		case 'mp2':
+		case 'snd':
+		case 'voc':
+			cat = 'audio';
+			
+			break;
+		
+		// Documents
+		case 'pdf':
+		case 'odt':
+		case 'ott':
+		case 'sxw':
+		case 'stw':
+		case 'ots':
+		case 'sxc':
+		case 'stc':
+		case 'sxi':
+		case 'sti':
+		case 'pot':
+		case 'odp':
+		case 'ods':
+		case 'doc':
+		case 'docx':
+		case 'docm':
+		case 'xls':
+		case 'xlsx':
+		case 'xlsm':
+		case 'xlt':
+		case 'ppt':
+		case 'pptx':
+		case 'pptm':
+		case 'pps':
+		case 'odg':
+		case 'otp':
+		case 'sxd':
+		case 'std':
+		case 'std':
+		case 'rtf':
+		case 'txt':
+		case 'htm':
+		case 'html':
+		case 'shtml':
+		case 'dhtml':
+		case 'mshtml':
+			cat = 'document';
+			
+			break;
+		
+		// Packages
+		case 'tgz':
+		case 'gz':
+		case 'tar':
+		case 'ar':
+		case 'cbz':
+		case 'jar':
+		case 'tar.7z':
+		case 'tar.bz2':
+		case 'tar.gz':
+		case 'tar.lzma':
+		case 'tar.xz':
+		case 'zip':
+		case 'xz':
+		case 'rar':
+		case 'bz':
+		case 'deb':
+		case 'rpm':
+		case '7z':
+		case 'ace':
+		case 'cab':
+		case 'arj':
+		case 'msi':
+			cat = 'package';
+			
+			break;
+		
+		// Others
+		default:
+			cat = 'other';
+			
+			break;
+	}
+	
+	return cat;
+}
+
+// Registers Jappix as the default XMPP links handler
+function xmppLinksHandler() {
+	try {
+		navigator.registerProtocolHandler('xmpp', JAPPIX_LOCATION + '?x=%s', SERVICE_NAME);
+		
+		return true;
+	}
+	
+	catch(e) {
+		return false;
+	}
+}
+
+// Checks if a value exists in an array
+function existArrayValue(array, value) {
+	try {
+		// Loop in the array
+		for(i in array) {
+			if(array[i] == value)
+				return true;
+		}
+		
+		return false;
+	}
+	
+	catch(e) {
+		return false;
+	}
+}
+
+// Removes a value from an array
+function removeArrayValue(array, value) {
+	for(i in array) {
+		// It matches, remove it!
+		if(array[i] == value) {
+			array.splice(i, 1);
+			
+			return true;
+		}
+	}
+	
+	return false;
+}
+
+// Converts a string to an array
+function stringToArray(string) {
+	var array = [];
+	
+	// Any string to convert?
+	if(string) {
+		// More than one item
+		if(string.match(/,/gi)) {
+			var string_split = string.split(',');
+			
+			for(i in string_split) {
+				if(string_split[i])
+					array.push(string_split[i]);
+				else
+					array.push('');
+			}
+		}
+		
+		// Only one item
+		else
+			array.push(string);
+	}
+	
+	return array;
+}
+
+// Get the index of an array value
+function indexArrayValue(array, value) {
+	// Nothing?
+	if(!array || !array.length)
+		return 0;
+	
+	// Read the index of the value
+	var index = 0;
+	
+	for(var i = 0; i < array.length; i++) {
+		if(array[i] == value) {
+			index = i;
+			
+			break;
+		}
+	}
+	
+	return index;
+}
diff --git a/jappixmini/jappix/js/vcard.js b/jappixmini/jappix/js/vcard.js
new file mode 100644
index 00000000..f61ca990
--- /dev/null
+++ b/jappixmini/jappix/js/vcard.js
@@ -0,0 +1,630 @@
+/*
+
+Jappix - An open social platform
+These are the vCard JS scripts for Jappix
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 16/01/12
+
+*/
+
+// Opens the vCard popup
+function openVCard() {
+	// Popup HTML content
+	var html =
+	'<div class="top">' + _e("Your profile") + '</div>' + 
+	
+	'<div class="tab">' + 
+		'<a href="#" class="tab-active" data-key="1">' + _e("Identity") + '</a>' + 
+		'<a href="#" data-key="2">' + _e("Profile image") + '</a>' + 
+		'<a href="#" data-key="3">' + _e("Others") + '</a>' + 
+	'</div>' + 
+	
+	'<div class="content">' + 
+		'<div id="lap1" class="lap-active one-lap forms">' + 
+			'<fieldset>' + 
+				'<legend>' + _e("Personal") + '</legend>' + 
+				
+				'<label for="USER-FN">' + _e("Complete name") + '</label>' + 
+				'<input type="text" id="USER-FN" class="vcard-item" />' + 
+				
+				'<label for="USER-NICKNAME">' + _e("Nickname") + '</label>' + 
+				'<input type="text" id="USER-NICKNAME" class="vcard-item" />' + 
+				
+				'<label for="USER-N-GIVEN">' + _e("First name") + '</label>' + 
+				'<input type="text" id="USER-N-GIVEN" class="vcard-item" />' + 
+				
+				'<label for="USER-N-FAMILY">' + _e("Last name") + '</label>' + 
+				'<input type="text" id="USER-N-FAMILY" class="vcard-item" />' + 
+				
+				'<label for="USER-BDAY">' + _e("Date of birth") + '</label>' + 
+				'<input type="text" id="USER-BDAY" class="vcard-item" />' + 
+			'</fieldset>' + 
+			
+			'<fieldset>' + 
+				'<legend>' + _e("Contact") + '</legend>' + 
+				
+				'<label for="USER-EMAIL-USERID">' + _e("E-mail") + '</label>' + 
+				'<input type="text" id="USER-EMAIL-USERID" class="vcard-item" />' + 
+				
+				'<label for="USER-TEL-NUMBER">' + _e("Phone") + '</label>' + 
+				'<input type="text" id="USER-TEL-NUMBER" class="vcard-item" />' + 
+				
+				'<label for="USER-URL">' + _e("Website") + '</label>' + 
+				'<input type="text" id="USER-URL" class="vcard-item" />' + 
+			'</fieldset>' + 
+		'</div>' + 
+		
+		'<div id="lap2" class="one-lap forms">' + 
+			'<fieldset>' + 
+				'<legend>' + _e("New") + '</legend>' + 
+				
+				'<input type="hidden" id="USER-PHOTO-TYPE" class="vcard-item" />' + 
+				'<input type="hidden" id="USER-PHOTO-BINVAL" class="vcard-item" />' + 
+				
+				'<form id="vcard-avatar" action="./php/avatar-upload.php" method="post" enctype="multipart/form-data">' + 
+					generateFileShare() + 
+				'</form>' + 
+			'</fieldset>' + 
+			
+			'<fieldset>' + 
+				'<legend>' + _e("Current") + '</legend>' + 
+				
+				'<div class="avatar-container"></div>' + 
+				
+				'<a href="#" class="one-button avatar-delete talk-images">' + _e("Delete") + '</a>' + 
+				'<div class="no-avatar">' + _e("What a pity! You have no profile image defined in your identity card!") + '</div>' + 
+			'</fieldset>' + 
+			
+			'<div class="avatar-wait avatar-info">' + _e("Please wait while your avatar is uploaded...") + '</div>' + 
+			'<div class="avatar-ok avatar-info">' + _e("Here it is! A new beautiful profile image!") + '</div>' + 
+			'<div class="avatar-error avatar-info">' + _e("The image file is not supported or has a bad size.") + '</div>' + 
+		'</div>' + 
+		
+		'<div id="lap3" class="one-lap forms">' + 
+			'<fieldset>' + 
+				'<legend>' + _e("Address") + '</legend>' + 
+				
+				'<label for="USER-ADR-STREET">' + _e("Street") + '</label>' + 
+				'<input type="text" id="USER-ADR-STREET" class="vcard-item" />' + 
+				
+				'<label for="USER-ADR-LOCALITY">' + _e("City") + '</label>' + 
+				'<input type="text" id="USER-ADR-LOCALITY" class="vcard-item" />' + 
+				
+				'<label for="USER-ADR-PCODE">' + _e("Postal code") + '</label>' + 
+				'<input type="text" id="USER-ADR-PCODE" class="vcard-item" />' + 
+				
+				'<label for="USER-ADR-CTRY">' + _e("Country") + '</label>' + 
+				'<input type="text" id="USER-ADR-CTRY" class="vcard-item" />' + 
+			'</fieldset>' + 
+			
+			'<fieldset>' + 
+				'<legend>' + _e("Biography") + '</legend>' + 
+				
+				'<textarea id="USER-DESC" rows="8" cols="60" class="vcard-item"></textarea>' + 
+			'</fieldset>' + 
+		'</div>' + 
+		
+		'<div class="infos">' + 
+			'<p class="infos-title">' + _e("Important notice") + '</p>' + 
+			
+			'<p>' + _e("Be careful of the information you write into your profile, because it could be accessed by everyone (even someone you don't want to).") + '</p>' + 
+			'<p>' + _e("Not everything is private on XMPP; this is one of those things, your public profile (vCard).") + '</p>' + 
+			'<p>' + printf(_e("It is strongly recommended to upload a profile image (%s maximum), like a picture of yourself, because that makes you easily recognizable by your friends."), JAPPIX_MAX_UPLOAD) + '</p>' + 
+			'<p><a href="https://me.jappix.com/new" target="_blank">' + _e("Enable my public profile") + ' »</a></p>' + 
+		'</div>' + 
+	'</div>' + 
+	
+	'<div class="bottom">' + 
+		'<div class="wait wait-medium"></div>' + 
+		
+		'<a href="#" class="finish save disabled">' + _e("Save") + '</a>' + 
+		'<a href="#" class="finish cancel">' + _e("Cancel") + '</a>' + 
+	'</div>';
+	
+	// Create the popup
+	createPopup('vcard', html);
+	
+	// Associate the events
+	launchVCard();
+	
+	// We get the VCard informations
+	getVCard(getXID(), 'user');
+	
+	return false;
+}
+
+// Closes the vCard popup
+function closeVCard() {
+	// Destroy the popup
+	destroyPopup('vcard');
+	
+	// Create the welcome end popup?
+	if(END_WELCOME)
+		openMe();
+	
+	return false;
+}
+
+// Switches the vCard popup tabs
+function switchVCard(id) {
+	$('#vcard .one-lap').removeClass('lap-active');
+	$('#vcard #lap' + id).addClass('lap-active');
+	$('#vcard .tab a').removeClass('tab-active');
+	$('#vcard .tab a[data-key=' + id + ']').addClass('tab-active');
+	
+	return false;
+}
+
+// Waits for the avatar upload reply
+function waitAvatarUpload() {
+	// Reset the avatar info
+	$('#vcard .avatar-info').hide().stopTime();
+	
+	// Show the wait info
+	$('#vcard .avatar-wait').show();
+}
+
+// Handles the avatar upload reply
+function handleAvatarUpload(responseXML) {
+	// Data selector
+	var dData = $(responseXML).find('jappix');
+	
+	// Not current upload session?
+	if(parseInt(dData.attr('id')) != parseInt($('#vcard-avatar input[name=id]').val()))
+		return;
+	
+	// Reset the avatar info
+	$('#vcard .avatar-info').hide().stopTime();
+	
+	// Process the returned data
+	if(!dData.find('error').size()) {
+		// Read the values
+		var aType = dData.find('type').text();
+		var aBinval = dData.find('binval').text();
+		
+		// We remove everything that isn't useful right here
+		$('#vcard .no-avatar').hide();
+		$('#vcard .avatar').remove();
+		
+		// We display the delete button
+		$('#vcard .avatar-delete').show();
+		
+		// We tell the user it's okay
+		$('#vcard .avatar-ok').show();
+		
+		// Timer
+		$('#vcard .avatar-info').oneTime('10s', function() {
+			$(this).hide();
+		});
+		
+		// We put the base64 values in a hidden input to be sent
+		$('#USER-PHOTO-TYPE').val(aType);
+		$('#USER-PHOTO-BINVAL').val(aBinval);
+		
+		// We display the avatar !
+		$('#vcard .avatar-container').replaceWith('<div class="avatar-container"><img class="avatar" src="data:' + aType + ';base64,' + aBinval + '" alt="" /></div>');
+	}
+	
+	// Any error?
+	else {
+		$('#vcard .avatar-error').show();
+		
+		// Timer
+		$('#vcard .avatar-info').oneTime('10s', function() {
+			$(this).hide();
+		});
+		
+		logThis('Error while uploading the avatar: ' + dData.find('error').text(), 1);
+	}
+}
+
+// Deletes the encoded avatar of an user
+function deleteAvatar() {
+	// We remove the avatar displayed elements
+	$('#vcard .avatar-info').stopTime();
+	$('#vcard .avatar-info, #vcard .avatar-wait, #vcard .avatar-error, #vcard .avatar-ok, #vcard .avatar-delete').hide();
+	$('#vcard .avatar').remove();
+	
+	// We reset the input value
+	$('#USER-PHOTO-TYPE, #USER-PHOTO-BINVAL').val('');
+	
+	// We show the avatar-uploading request
+	$('#vcard .no-avatar').show();
+	
+	return false;
+}
+
+// Creates a special vCard input
+function createInputVCard(id, type) {
+	// Generate the new ID
+	id = 'USER-' + id;
+	
+	// Can append the content
+	if((type == 'user') && !exists('#vcard #' + id))
+		$('#vcard .content').append('<input id="' + id + '" class="vcard-item" type="hidden" />');
+}
+
+// Gets the vCard of a XID
+function getVCard(to, type) {
+	// Generate a special ID
+	var id = genID();
+	
+	// New IQ
+	var iq = new JSJaCIQ();
+	iq.setID(id);
+	iq.setType('get');
+	iq.appendNode('vCard', {'xmlns': NS_VCARD});
+	
+	// Send the IQ to the good user
+	if(type == 'user') {
+		// Show the wait icon
+		$('#vcard .wait').show();
+		
+		// Apply the session ID
+		$('#vcard').attr('data-vcard', id);
+		
+		// Send the IQ
+		con.send(iq, handeUVCard);
+	}
+	
+	else {
+		// Show the wait icon
+		$('#userinfos .wait').show();
+		
+		// Apply the session ID
+		$('#userinfos').attr('data-vcard', id);
+		
+		// Send the IQ
+		iq.setTo(to);
+		con.send(iq, handeBVCard);
+	}
+}
+
+// Handles the current connected user's vCard
+function handeUVCard(iq) {
+	handleVCard(iq, 'user');
+}
+
+// Handles an external buddy vCard
+function handeBVCard(iq) {
+	handleVCard(iq, 'buddy');
+}
+
+// Handles a vCard stanza
+function handleVCard(iq, type) {
+	// Extract the data
+	var iqID = iq.getID();
+	var iqFrom = fullXID(getStanzaFrom(iq));
+	var iqNode = iq.getNode();
+	
+	// Define some paths
+	var path_vCard = '#vcard[data-vcard=' + iqID + ']';
+	var path_userInfos = '#userinfos[data-vcard=' + iqID + ']';
+	
+	// End if the session does not exist
+	if(((type == 'user') && !exists(path_vCard)) || ((type == 'buddy') && !exists(path_userInfos)))
+		return;
+	
+	// We retrieve main values
+	var values_yet = [];
+	
+	$(iqNode).find('vCard').children().each(function() {
+		// Read the current parent node name
+		var tokenname = (this).nodeName.toUpperCase();
+		
+		// Node with a parent
+		if($(this).children().size()) {
+			$(this).children().each(function() {
+				// Get the node values
+				var currentID = tokenname + '-' + (this).nodeName.toUpperCase();
+				var currentText = $(this).text();
+				
+				// Not yet added?
+				if(!existArrayValue(values_yet, currentID)) {
+					// Create an input if it does not exist
+					createInputVCard(values_yet, type);
+					
+					// Userinfos viewer popup
+					if((type == 'buddy') && currentText) {
+						if(currentID == 'EMAIL-USERID')
+							$(path_userInfos + ' #BUDDY-' + currentID).html('<a href="mailto:' + currentText.htmlEnc() + '" target="_blank">' + currentText.htmlEnc() + '</a>');
+						else
+							$(path_userInfos + ' #BUDDY-' + currentID).text(currentText.htmlEnc());
+					}
+					
+					// Profile editor popup
+					else if(type == 'user')
+						$(path_vCard + ' #USER-' + currentID).val(currentText);
+					
+					// Avoid duplicating the value
+					values_yet.push(currentID);
+				}
+			});
+		}
+		
+		// Node without any parent
+		else {
+			// Get the node values
+			var currentText = $(this).text();
+			
+			// Not yet added?
+			if(!existArrayValue(values_yet, tokenname)) {
+				// Create an input if it does not exist
+				createInputVCard(tokenname, type);
+				
+				// Userinfos viewer popup
+				if((type == 'buddy') && currentText) {
+					// URL modification
+					if(tokenname == 'URL') {
+						// No http:// or https:// prefix, we should add it
+						if(!currentText.match(/^https?:\/\/(.+)/))
+							currentText = 'http://' + currentText;
+						
+						currentText = '<a href="' + currentText + '" target="_blank">' + currentText.htmlEnc() + '</a>';
+					}
+					
+					// Description modification
+					else if(tokenname == 'DESC')
+						currentText = filterThisMessage(currentText, getBuddyName(iqFrom).htmlEnc(), true);
+					
+					// Other stuffs
+					else
+						currentText = currentText.htmlEnc();
+					
+					$(path_userInfos + ' #BUDDY-' + tokenname).html(currentText);
+				}
+				
+				// Profile editor popup
+				else if(type == 'user')
+					$(path_vCard + ' #USER-' + tokenname).val(currentText);
+				
+				// Avoid duplicating the value
+				values_yet.push(tokenname);
+			}
+		}
+	});
+	
+	// Update the stored avatar
+	if(type == 'buddy') {
+		// Get the avatar XML
+		var xml = getPersistent('avatar', iqFrom);
+		
+		// If there were no stored avatar previously
+		if($(XMLFromString(xml)).find('type').text() == 'none') {
+			xml = xml.replace(/<forced>false<\/forced>/gi, '<forced>true</forced>');
+			setPersistent('avatar', iqFrom, xml);
+		}
+		
+		// Handle the user avatar
+		handleAvatar(iq);
+	}
+	
+	// The avatar values targets
+	var aBinval, aType, aContainer;
+	
+	if(type == 'user') {
+		aBinval = $('#USER-PHOTO-BINVAL').val();
+		aType = $('#USER-PHOTO-TYPE').val();
+		aContainer = path_vCard + ' .avatar-container';
+	}
+	
+	else {
+		aBinval = $(iqNode).find('BINVAL:first').text();
+		aType = $(iqNode).find('TYPE:first').text();
+		aContainer = path_userInfos + ' .avatar-container';
+	}
+	
+	// We display the avatar if retrieved
+	if(aBinval) {
+		// No type?
+		if(!aType)
+			aType = 'image/png';
+		
+		if(type == 'user') {
+			// We move all the things that we don't need in that case
+			$(path_vCard + ' .no-avatar').hide();
+			$(path_vCard + ' .avatar-delete').show();
+			$(path_vCard + ' .avatar').remove();
+		}
+		
+		// We display the avatar we have just received
+		$(aContainer).replaceWith('<div class="avatar-container"><img class="avatar" src="data:' + aType + ';base64,' + aBinval + '" alt="" /></div>');
+	}
+	
+	else if(type == 'buddy')
+		$(aContainer).replaceWith('<div class="avatar-container"><img class="avatar" src="' + './img/others/default-avatar.png' + '" alt="" /></div>');
+	
+	// Do someting depending of the type
+	if(type == 'user') {
+		$(path_vCard + ' .wait').hide();
+		$(path_vCard + ' .finish:first').removeClass('disabled');
+	}
+	
+	else
+		vCardBuddyInfos();
+	
+	logThis('vCard received: ' + iqFrom);
+}
+
+// Sends the vCard of the user
+function sendVCard() {
+	// Initialize the IQ
+	var iq = new JSJaCIQ();
+	iq.setType('set');
+	
+	var vCard = iq.appendNode('vCard', {'xmlns': NS_VCARD});
+	
+	// We send the identity part of the form
+	$('#vcard .vcard-item').each(function() {
+		var itemID = $(this).attr('id').replace(/^USER-(.+)/, '$1');
+		var itemVal = $(this).val();
+		
+		if(itemVal && itemID) {
+			if(itemID.indexOf('-') != -1) {
+				var tagname = explodeThis('-', itemID, 0);
+				var aNode;
+				
+				if(vCard.getElementsByTagName(tagname).length > 0)
+					aNode = vCard.getElementsByTagName(tagname).item(0);
+				else
+					aNode = vCard.appendChild(iq.buildNode(tagname, {'xmlns': NS_VCARD}));
+				
+				aNode.appendChild(iq.buildNode(explodeThis('-', itemID, 1), {'xmlns': NS_VCARD}, itemVal));
+			}
+			
+			else
+				vCard.appendChild(iq.buildNode(itemID, {'xmlns': NS_VCARD}, itemVal));
+		}
+	});
+	
+	// Send the IQ
+	con.send(iq);
+	
+	// Send the user nickname & avatar over PEP
+	if(enabledPEP()) {
+		// Read values
+		var user_nick = $('#USER-NICKNAME').val();
+		var photo_bin = $('#USER-PHOTO-BINVAL').val();
+		var photo_type = $('#USER-PHOTO-TYPE').val();
+		var photo_data = Base64.decode(photo_bin) || '';
+		var photo_bytes = photo_data.length || '';
+		var photo_id = hex_sha1(photo_data) || '';
+		
+		// Values array
+		var read = [
+			user_nick,
+			photo_bin,
+			[photo_type, photo_id, photo_bytes]
+		];
+		
+		// Nodes array
+		var node = [
+			NS_NICK,
+			NS_URN_ADATA,
+			NS_URN_AMETA
+		];
+		
+		// Generate the XML
+		for(i in read) {
+			var iq = new JSJaCIQ();
+			iq.setType('set');
+			
+			var pubsub = iq.appendNode('pubsub', {'xmlns': NS_PUBSUB});
+			var publish = pubsub.appendChild(iq.buildNode('publish', {'node': node[i], 'xmlns': NS_PUBSUB}));
+			
+			if((i == 0) && read[0]) {
+				var item = publish.appendChild(iq.buildNode('item', {'xmlns': NS_PUBSUB}));
+				
+				// Nickname element
+				item.appendChild(iq.buildNode('nick', {'xmlns': NS_NICK}, read[i]));
+			}
+			
+			else if(((i == 1) || (i == 2)) && read[1]) {
+				var item = publish.appendChild(iq.buildNode('item', {'xmlns': NS_PUBSUB}));
+				
+				// Apply the SHA-1 hash
+				if(photo_id)
+					item.setAttribute('id', photo_id);
+				
+				// Avatar data node
+				if(i == 1)
+					item.appendChild(iq.buildNode('data', {'xmlns': NS_URN_ADATA}, read[i]));
+				
+				// Avatar metadata node
+				else {
+					var metadata = item.appendChild(iq.buildNode('metadata', {'xmlns': NS_URN_AMETA}));
+					
+					if(read[i]) {
+						var meta_info = metadata.appendChild(iq.buildNode('info', {'xmlns': NS_URN_AMETA}));
+						
+						if(read[i][0])
+							meta_info.setAttribute('type', read[i][0]);
+						if(read[i][1])
+							meta_info.setAttribute('id', read[i][1]);
+						if(read[i][2])
+							meta_info.setAttribute('bytes', read[i][2]);
+					}
+				}
+			}
+			
+			con.send(iq);
+		}
+	}
+	
+	// Close the vCard stuffs
+	closeVCard();
+	
+	// Get our new avatar
+	getAvatar(getXID(), 'force', 'true', 'forget');
+	
+	logThis('vCard sent.');
+	
+	return false;
+}
+
+// Addon launcher
+function launchVCard() {
+	// Focus on the first input
+	$(document).oneTime(10, function() {
+		$('#vcard input:first').focus();
+	});
+	
+	// Keyboard events
+	$('#vcard input[type=text]').keyup(function(e) {
+		// Enter pressed: send the vCard
+		if((e.keyCode == 13) && !$('#vcard .finish.save').hasClass('disabled'))
+			return sendVCard();
+	});
+	
+	// Click events
+	$('#vcard .tab a').click(function() {
+		// Yet active?
+		if($(this).hasClass('tab-active'))
+			return false;
+		
+		// Switch to the good tab
+		var key = parseInt($(this).attr('data-key'));
+		
+		return switchVCard(key);
+	});
+	
+	$('#vcard .avatar-delete').click(function() {
+		return deleteAvatar();
+	});
+	
+	$('#vcard .bottom .finish').click(function() {
+		if($(this).is('.cancel'))
+			return closeVCard();
+		if($(this).is('.save') && !$(this).hasClass('disabled'))
+			return sendVCard();
+		
+		return false;
+	});
+	
+	// Avatar upload vars
+	var avatar_options = {
+		dataType:	'xml',
+		beforeSubmit:	waitAvatarUpload,
+		success:	handleAvatarUpload
+	};
+	
+	// Avatar upload form submit event
+	$('#vcard-avatar').submit(function() {
+		if($('#vcard .wait').is(':hidden') && $('#vcard .avatar-info.avatar-wait').is(':hidden') && $('#vcard-avatar input[type=file]').val())
+			$(this).ajaxSubmit(avatar_options);
+		
+		return false;
+	});
+	
+	// Avatar upload input change event
+	$('#vcard-avatar input[type=file]').change(function() {
+		if($('#vcard .wait').is(':hidden') && $('#vcard .avatar-info.avatar-wait').is(':hidden') && $(this).val())
+			$('#vcard-avatar').ajaxSubmit(avatar_options);
+		
+		return false;
+	});
+}
diff --git a/jappixmini/jappix/js/welcome.js b/jappixmini/jappix/js/welcome.js
new file mode 100644
index 00000000..ff193302
--- /dev/null
+++ b/jappixmini/jappix/js/welcome.js
@@ -0,0 +1,299 @@
+/*
+
+Jappix - An open social platform
+These are the welcome tool functions for Jappix
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 16/01/12
+
+*/
+
+// Opens the welcome tools
+function openWelcome() {	
+	// Share message
+	var share_msg = printf(_e("Using Jappix, an open social platform. I am %s!"), getXID());
+	
+	// Popup HTML content
+	var html = 
+	'<div class="top">' + _e("Welcome!") + '</div>' + 
+	
+	'<div class="tab">' + 
+		'<a href="#" class="tab-active" data-step="1">' + _e("Options") + '</a>' + 
+		'<a href="#" class="tab-missing" data-step="2">' + _e("Friends") + '</a>' + 
+		'<a href="#" class="tab-missing" data-step="3">' + _e("Share") + '</a>' + 
+	'</div>' + 
+	
+	'<div class="content">' + 
+		'<div class="lap-active one-lap welcome1">' + 
+			'<div class="infos">' + 
+				'<p class="infos-title">' + _e("Welcome on Jappix, your own social cloud!") + '</p>' + 
+				'<p>' + _e("Before you start using it, you will have to change some settings, search for friends and complete your profile.") + '</p>' + 
+			'</div>' + 
+			
+			'<a href="#" class="box enabled" title="' + _e("Click to disable") + '">' + 
+				'<span class="option">' + _e("Sounds") + '</span>' + 
+				'<span class="description">' + _e("Enable notification sounds") + '</span>' + 
+				'<span class="image sound talk-images"></span>' + 
+				'<span class="tick talk-images"></span>' + 
+			'</a>' + 
+			
+			'<a href="#" class="box enabled pep-hidable" title="' + _e("Click to disable") + '">' + 
+				'<span class="option">' + _e("Geolocation") + '</span>' + 
+				'<span class="description">' + _e("Share your position on the globe") + '</span>' + 
+				'<span class="image geolocation talk-images"></span>' + 
+				'<span class="tick talk-images"></span>' + 
+			'</a>' + 
+			
+			'<a href="#" class="box xmpplinks-hidable" title="' + _e("Click to enable") + '">' + 
+				'<span class="option">' + _e("XMPP links") + '</span>' + 
+				'<span class="description">' + _e("Open XMPP links with Jappix") + '</span>' + 
+				'<span class="image xmpp talk-images"></span>' + 
+				'<span class="tick talk-images"></span>' + 
+			'</a>' + 
+			
+			'<a href="#" class="box enabled archives-hidable pref" title="' + _e("Click to enable") + '">' + 
+				'<span class="option">' + _e("Message archiving") + '</span>' + 
+				'<span class="description">' + _e("Store a history of your chats") + '</span>' + 
+				'<span class="image archives talk-images"></span>' + 
+				'<span class="tick talk-images"></span>' + 
+			'</a>' + 
+			
+			'<a href="#" class="box" title="' + _e("Click to enable") + '">' + 
+				'<span class="option">' + _e("Offline friends") + '</span>' + 
+				'<span class="description">' + _e("Don\'t hide offline friends") + '</span>' + 
+				'<span class="image offline talk-images"></span>' + 
+				'<span class="tick talk-images"></span>' + 
+			'</a>' + 
+		'</div>' + 
+		
+		'<div class="one-lap welcome2">' + 
+			'<div class="infos">' + 
+				'<p class="infos-title">' + _e("Friends") + '</p>' + 
+				'<p>' + _e("Use this tool to find your friends on the server you are using right now, or add them later.") + '</p>' + 
+			'</div>' + 
+			
+			'<div class="results welcome-results"></div>' + 
+		'</div>' + 
+		
+		'<div class="one-lap welcome3">' + 
+			'<div class="infos">' + 
+				'<p class="infos-title">' + _e("Share") + '</p>' + 
+				'<p>' + _e("Great work! Now, you can share Jappix with your friends!") + '</p>' + 
+				'<p>' + _e("When you will press the save button, the profile editor will be opened. Happy socializing!") + '</p>' + 
+			'</div>' + 
+			
+			'<a class="box share first" href="http://www.facebook.com/sharer/sharer.php?u=' + encodeQuotes(generateURL(JAPPIX_LOCATION)) + '" target="_blank">' + 
+				'<span class="logo facebook welcome-images"></span>' + 
+				'<span class="name">Facebook</span>' + 
+				'<span class="description">' + printf(_e("Share Jappix on %s"), 'Facebook') + '</span>' + 
+				'<span class="go talk-images"></span>' + 
+			'</a>' + 
+			
+			'<a class="box share" href="http://twitter.com/intent/tweet?text=' + encodeQuotes(share_msg) + '&amp;url=' + encodeQuotes(generateURL(JAPPIX_LOCATION)) + '" target="_blank">' + 
+				'<span class="logo twitter welcome-images"></span>' + 
+				'<span class="name">Twitter</span>' + 
+				'<span class="description">' + printf(_e("Share Jappix on %s"), 'Twitter') + '</span>' + 
+				'<span class="go talk-images"></span>' + 
+			'</a>' + 
+			
+			'<a class="box share" href="http://www.google.com/buzz/post?message=' + encodeQuotes(share_msg) + '&amp;url=' + encodeQuotes(generateURL(JAPPIX_LOCATION)) + '" target="_blank">' + 
+				'<span class="logo buzz welcome-images"></span>' + 
+				'<span class="name">Google Buzz</span>' + 
+				'<span class="description">' + printf(_e("Share Jappix on %s"), 'Google Buzz') + '</span>' + 
+				'<span class="go talk-images"></span>' + 
+			'</a>' + 
+			
+			'<a class="box share" href="http://identi.ca/index.php?action=newnotice&amp;status_textarea=' + encodeQuotes(share_msg) + ' ' + encodeQuotes(generateURL(JAPPIX_LOCATION)) + '" target="_blank">' + 
+				'<span class="logo identica welcome-images"></span>' + 
+				'<span class="name">Identi.ca</span>' + 
+				'<span class="description">' + printf(_e("Share Jappix on %s"), 'Identi.ca') + '</span>' + 
+				'<span class="go talk-images"></span>' + 
+			'</a>' + 
+		'</div>' + 
+	'</div>' + 
+	
+	'<div class="bottom">' + 
+		'<div class="wait wait-medium"></div>' + 
+		
+		'<a href="#" class="finish next">' + _e("Next") + ' »</a>' + 
+		'<a href="#" class="finish save">' + _e("Save") + '</a>' + 
+	'</div>';
+	
+	// Create the popup
+	createPopup('welcome', html);
+	
+	// Apply the features
+	applyFeatures('welcome');
+	
+	// Associate the events
+	launchWelcome();
+	
+	logThis('Welcome assistant opened.');
+}
+
+// Closes the welcome tools
+function closeWelcome() {
+	// Destroy the popup
+	destroyPopup('welcome');
+	
+	return false;
+}
+
+// Switches the welcome tabs
+function switchWelcome(id) {
+	// Path to
+	var welcome = '#welcome ';
+	var content = welcome + '.content .';
+	var tab = welcome + '.tab ';
+	var wait = $(welcome + '.wait');
+	
+	$(content + 'one-lap').hide();
+	$(content + 'welcome' + id).show();
+	$(tab + 'a').removeClass('tab-active');
+	$(tab + 'a[data-step=' + id + ']').addClass('tab-active').removeClass('tab-missing');
+	
+	// Update the "save" button if all is okay
+	if(!exists(tab + '.tab-missing')) {
+		var finish = welcome + '.finish.';
+		$(finish + 'save').show();
+		$(finish + 'next').hide();
+	}
+	
+	// If this is ID 2: vJUD search
+	if(id == 2) {
+		wait.show();
+		dataForm(HOST_VJUD, 'search', '', '', 'welcome');
+	}
+	
+	else
+		wait.hide();
+	
+	return false;
+}
+
+// Sends the welcome options
+function sendWelcome(array) {
+	// Sends the options
+	var iq = new JSJaCIQ();
+	iq.setType('set');
+	
+	var query = iq.setQuery(NS_PRIVATE);
+	var storage = query.appendChild(iq.buildNode('storage', {'xmlns': NS_OPTIONS}));
+	
+	// Value array
+	var tags = new Array('sounds', 'geolocation', '', '', 'roster-showall');
+	
+	// Build the XML with the array
+	for(i in array) {
+		var value = array[i];
+		var tag = tags[i];
+		
+		if((i != 2) && (i != 3) && tag && value) {
+			storage.appendChild(iq.buildNode('option', {'type': tag, 'xmlns': NS_OPTIONS}, value));
+			setDB('options', tag, value);
+		}
+	}
+	
+	con.send(iq);
+	
+	// If geolocation is enabled
+	if(array[1] == '1')
+		geolocate();
+}
+
+// Saves the welcome options
+var END_WELCOME = false;
+
+function saveWelcome() {
+	// Get the new options
+	var array = new Array();
+	
+	$('#welcome a.box').each(function() {
+		var current = '0';
+		
+		if($(this).hasClass('enabled'))
+			current = '1';
+		
+		array.push(current);
+	});
+	
+	// If XMPP links is enabled
+	if(array[2] == '1')
+		xmppLinksHandler();
+	
+	// If offline buddies showing is enabled
+	if(array[4] == '1')
+		showAllBuddies('welcome');
+	
+	// If archiving is supported by the server
+	if(enabledArchives('pref')) {
+		var aEnabled = false;
+		
+		// If archiving is enabled
+		if(array[3] == '1')
+			aEnabled = true;
+		
+		// Send the archives configuration
+		configArchives(aEnabled);
+	}
+	
+	// Send the new options
+	sendWelcome(array);
+	
+	// Close the welcome tool
+	closeWelcome();
+	
+	// Open the profile editor
+	openVCard();
+	
+	END_WELCOME = true;
+	
+	return false;
+}
+
+// Goes to the next welcome step
+function nextWelcome() {
+	// Check the next step to go to
+	var next = 1;
+	var missing = '#welcome .tab a.tab-missing';
+	
+	if(exists(missing))
+		next = parseInt($(missing + ':first').attr('data-step'));
+	
+	// Switch to the next step
+	switchWelcome(next);
+	
+	return false;
+}
+
+// Addon launcher
+function launchWelcome() {
+	// Click events
+	$('#welcome .tab a').click(function() {
+		// Switch to the good tab
+		var key = parseInt($(this).attr('data-step'));
+		
+		return switchWelcome(key);
+	});
+	
+	$('#welcome a.box:not(.share)').click(function() {
+		if($(this).hasClass('enabled'))
+			$(this).removeClass('enabled').attr('title', _e("Click to enable"));
+		else
+			$(this).addClass('enabled').attr('title', _e("Click to disable"));
+		
+		return false;
+	});
+	
+	$('#welcome .bottom .finish').click(function() {
+		if($(this).is('.next'))
+			return nextWelcome();
+		if($(this).is('.save'))
+			return saveWelcome();
+		
+		return false;
+	});
+}
diff --git a/jappixmini/jappix/js/xmpplinks.js b/jappixmini/jappix/js/xmpplinks.js
new file mode 100644
index 00000000..a75ad552
--- /dev/null
+++ b/jappixmini/jappix/js/xmpplinks.js
@@ -0,0 +1,78 @@
+/*
+
+Jappix - An open social platform
+These are the XMPP links handling JS scripts for Jappix
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 08/05/11
+
+*/
+
+// Does an action with the provided XMPP link
+function xmppLink(link) {
+	/* REF: http://xmpp.org/registrar/querytypes.html */
+	
+	// Remove the "xmpp:" string
+	link = explodeThis(':', link, 1);
+	
+	// The XMPP URI has no "?"
+	if(link.indexOf('?') == -1)
+		checkChatCreate(link, 'chat');
+	
+	// Parse the URI
+	else {
+		var xid = explodeThis('?', link, 0);
+		var action = explodeThis('?', link, 1);
+		
+		switch(action) {
+			// Groupchat
+			case 'join':
+				checkChatCreate(xid, 'groupchat');
+				
+				break;
+			
+			// Profile
+			case 'vcard':
+				openUserInfos(xid);
+				
+				break;
+			
+			// Subscription
+			case 'subscribe':
+				addThisContact(xid);
+				
+				break;
+			
+			// Unsubscription
+			case 'unsubscribe':
+				sendRoster(xid, 'remove');
+				
+				break;
+			
+			// Private chat
+			default:
+				checkChatCreate(xid, 'chat');
+				
+				break;
+		}
+	}
+	
+	return false;
+}
+
+// Gets the links vars (get parameters in URL)
+var LINK_VARS = (function() {
+	var vars = [], hash;
+	var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+	
+	for(var i = 0; i < hashes.length; i++) {
+		var hash = hashes[i].split('=');
+		vars.push(hash[0]);
+		vars[hash[0]] = decodeURIComponent(hash[1]);
+	}
+	
+	return vars;
+})();
diff --git a/jappixmini/jappix/lang/ar/LC_MESSAGES/main.mo b/jappixmini/jappix/lang/ar/LC_MESSAGES/main.mo
new file mode 100644
index 00000000..0f0ec43f
Binary files /dev/null and b/jappixmini/jappix/lang/ar/LC_MESSAGES/main.mo differ
diff --git a/jappixmini/jappix/lang/ar/LC_MESSAGES/main.po b/jappixmini/jappix/lang/ar/LC_MESSAGES/main.po
new file mode 100644
index 00000000..697e7f2f
--- /dev/null
+++ b/jappixmini/jappix/lang/ar/LC_MESSAGES/main.po
@@ -0,0 +1,1870 @@
+# Arabic translations for Jappix package.
+# This file is distributed under the same license as the Jappix package.
+# This file was translated from CodingTeam at <http://codingteam.net/>.
+msgid ""
+msgstr ""
+"Project-Id-Version: Jappix\n"
+"PO-Revision-Date: 2012-01-16 21:25+0100\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"POT-Creation-Date: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+
+msgid "JavaScript is missing in your web browser, so that you will not be able to launch Jappix! Please fix this."
+msgstr "الجافا سكريبت في متصفحك مفقود، لن تتمكن من بدأ Jappix! يرجى إصلاحه."
+
+msgid "An open social network"
+msgstr "شبكة إجتماعية مفتوحة."
+
+msgid "Jappix has been interrupted by a network issue, a bug or bad login (check that you entered the right credentials), sorry for the inconvenience."
+msgstr "Jappix قد إتقطع بسبب مشكلة في الشبكة، مشكلة أو دخول سيء (تأكد أنك أدخلت المعلومات بشكل صحيح)، نأسف على الإزعاج."
+
+msgid "The element list on this server could not be obtained!"
+msgstr "هذا العنصر من القائمة على هذا الخادم لا يمكن الوصول إليه."
+
+msgid "Your password has been changed, now you can connect to your account with your new login data."
+msgstr "لقد تم تغيير رقمك السري، بإمكانك الآن إستخدام حسابك مع المعلومات الجديدة."
+
+msgid "Your XMPP account has been removed, bye!"
+msgstr "لقد تم حذف حسابك XMPP, وداعًا!"
+
+msgid "You have been logged out of your XMPP account, have a nice day!"
+msgstr "لقد تم تسجيل خروجك من حسابك XMPP, يومًا طيبًا لك!"
+
+msgid "The room you joined seems not to exist. You should create it!"
+msgstr "الغرفة التي تحاول الدخول عليها غير متوفرة. قم بإنشاؤها!"
+
+msgid "The groupchat has been removed, now someone else will be able to recreate it."
+msgstr "لقد تم حذف غرفة الدردشة، الآن بإمكان شخص آخر إنشاؤها."
+
+msgid "The user that you want to reach is not present in the room."
+msgstr "المستخدم الذي تحاول الوصول إليه غير متواجد في الغرفة."
+
+msgid "Please enter the group chat address to join."
+msgstr "يرجى إدخال عنوان مجموعة الدردشة للدخول."
+
+msgid "Please enter your nickname to join %s."
+msgstr "يرجى إدخال إسمك المستعار للدخول %s."
+
+msgid "This room (%s) is protected with a password."
+msgstr "هذه الغرفة (%s) .محميّة بكلمة مرور"
+
+msgid "Your browser is out of date!"
+msgstr "متصفحك قديم و عديم الصلاحية"
+
+msgid "Last %s version is better!"
+msgstr ""
+
+msgid "Login"
+msgstr "دخول"
+
+msgid "Register"
+msgstr "تسجيل"
+
+msgid "Here we go!"
+msgstr "هنا ننطلق!"
+
+msgid "Server"
+msgstr "خادم"
+
+msgid "Password"
+msgstr "كلمة سر"
+
+msgid "Remember me"
+msgstr "تذكرني"
+
+msgid "This tool has been disabled, you cannot use it!"
+msgstr "هذه الخاصيّة معطلّة، لن تتمكن من إستخدامها!"
+
+msgid "Due to a network issue, you were disconnected. What do you want to do now?"
+msgstr "بسبب مشكلة في الشبكة، أصبحت غير متصل. ماذا تريد أن تفعل الآن؟"
+
+msgid "Reconnect"
+msgstr "إعادة إتصال"
+
+msgid "Messages"
+msgstr "رسائل"
+
+msgid "Profile"
+msgstr "ملف شخصي"
+
+msgid "Options"
+msgstr "خيّارات"
+
+msgid "Disconnect"
+msgstr "غير متصل"
+
+msgid "Filter"
+msgstr "مرشح"
+
+msgid "Add a friend"
+msgstr "أضف صديق."
+
+msgid "Your groupchats"
+msgstr "غرفة الدردشة الخاصة بك"
+
+msgid "Manage your favorite groupchats"
+msgstr "تحكم بغرف الدردشة المفضلة لديك"
+
+msgid "More stuff"
+msgstr "خيارات أكثر"
+
+msgid "Show all friends"
+msgstr "أعرض جميع الأصدقاء"
+
+msgid "Only show connected friends"
+msgstr "أعرض فقط الأصدقاء المتصلين"
+
+msgid "Message archives"
+msgstr "أرشفة الرسائل"
+
+msgid "Date"
+msgstr "التاريخ"
+
+msgid "Please select a friend to view the chat history."
+msgstr ""
+
+msgid "Nothing found for: %s"
+msgstr ""
+
+msgid "A short message?"
+msgstr "رسالة قصيرة؟"
+
+msgid "How are you?"
+msgstr "كيف حالك؟"
+
+msgid "What are you doing?"
+msgstr "ماذا تفعل؟"
+
+msgid "Join a chat"
+msgstr "دخول الدردشة"
+
+msgid "Status"
+msgstr "حالة"
+
+msgid "Available"
+msgstr "متاح"
+
+msgid "Talkative"
+msgstr "ثرثرة"
+
+msgid "Away"
+msgstr "بالخارج"
+
+msgid "Not available"
+msgstr "غير متصل"
+
+msgid "Busy"
+msgstr "مشغول"
+
+msgid "Mood"
+msgstr "مزاجي"
+
+msgid "None"
+msgstr "لا شيء"
+
+msgid "Crazy"
+msgstr "مجنون"
+
+msgid "Excited"
+msgstr "متحمس"
+
+msgid "Playful"
+msgstr "لعوب"
+
+msgid "Happy"
+msgstr "سعيد"
+
+msgid "Shocked"
+msgstr "مصدوم"
+
+msgid "Hot"
+msgstr "حر!"
+
+msgid "Sad"
+msgstr "حزين"
+
+msgid "Amorous"
+msgstr "مغرم"
+
+msgid "Confident"
+msgstr "واثق"
+
+msgid "Activity"
+msgstr "نشيط"
+
+msgid "Chores"
+msgstr "أعمال منزلية"
+
+msgid "Drinking"
+msgstr "يشرب"
+
+msgid "Eating"
+msgstr "يأكل"
+
+msgid "Exercising"
+msgstr "يمارس التمارين"
+
+msgid "Grooming"
+msgstr "تبرج"
+
+msgid "Appointment"
+msgstr "تجهيز"
+
+msgid "Inactive"
+msgstr "غير نشط"
+
+msgid "Relaxing"
+msgstr "مسترخي"
+
+msgid "Talking"
+msgstr "يتحدث"
+
+msgid "Traveling"
+msgstr "مسافر"
+
+msgid "Working"
+msgstr "يعمل"
+
+msgid "View profile"
+msgstr "مشاهدة الملف الشخصي"
+
+msgid "Repeat this notice"
+msgstr "كرّر هذه الملاحظة"
+
+msgid "Remove this notice"
+msgstr "أحذف هذه الملاحظة"
+
+msgid "Your profile"
+msgstr "ملفك الشخصي"
+
+msgid "Identity"
+msgstr "الهوية"
+
+msgid "Profile image"
+msgstr "صورة الملف الشخصي"
+
+msgid "Others"
+msgstr "آخرين"
+
+msgid "Personal"
+msgstr "شخصي"
+
+msgid "Complete name"
+msgstr "الإسم كامل"
+
+msgid "Nickname"
+msgstr "الإسم المستعار"
+
+msgid "First name"
+msgstr "الإسم الأول"
+
+msgid "Last name"
+msgstr "الإسم الأخير"
+
+msgid "Date of birth"
+msgstr "تاريخ عيد الميلاد"
+
+msgid "Contact"
+msgstr "إتصل"
+
+msgid "E-mail"
+msgstr "البريد الإلكتروني"
+
+msgid "Phone"
+msgstr "الهاتف"
+
+msgid "Website"
+msgstr "الموقع الشخصي"
+
+msgid "Current"
+msgstr "الحالي"
+
+msgid "Delete"
+msgstr "حذف"
+
+msgid "What a pity! You have no profile image defined in your identity card!"
+msgstr "كم مثير للشفقة! لا توجد صورة للملف الشخصي في هويتك!"
+
+msgid "Address"
+msgstr "العنوان"
+
+msgid "Street"
+msgstr "الشارع"
+
+msgid "City"
+msgstr "المدينة"
+
+msgid "Postal code"
+msgstr "الرمز البريدي"
+
+msgid "Country"
+msgstr "الدولة"
+
+msgid "Biography"
+msgstr "نبذة شخصية"
+
+msgid "Important notice"
+msgstr "ملاحظة هامة"
+
+msgid "Be careful of the information you write into your profile, because it could be accessed by everyone (even someone you don't want to)."
+msgstr "كن حذرًا عند وضع معلوماتك في ملفك الشخصي، بإمكان الجميع الوصول إليها (حتى الأشخاص الذين لا تود أن يصلون إليها)."
+
+msgid "Not everything is private on XMPP; this is one of those things, your public profile (vCard)."
+msgstr "لا يوجد شي خاص على XMPP; هذه واحدة من الأمور، ملفك الشخصي عام (vCard)."
+
+msgid "It is strongly recommended to upload a profile image (%s maximum), like a picture of yourself, because that makes you easily recognizable by your friends."
+msgstr ""
+
+msgid "Save"
+msgstr "إحفظ"
+
+msgid "Cancel"
+msgstr "إلغاء"
+
+msgid "Edit options"
+msgstr "تحرير الخيارات"
+
+msgid "Channel"
+msgstr "القناة"
+
+msgid "Commands"
+msgstr ""
+
+msgid "Sounds"
+msgstr "الأصوات"
+
+msgid "Privacy"
+msgstr "الخصوصية"
+
+msgid "Message archiving"
+msgstr "أرشفة الرسالة"
+
+msgid "Store a history of your chats"
+msgstr "خزن رسائل الدردشة"
+
+msgid "Geolocation"
+msgstr "تحديد الموقع الجغرافي"
+
+msgid "Empty"
+msgstr "خالي"
+
+msgid "Empty channel"
+msgstr "قناة خالية"
+
+msgid "Persistent"
+msgstr "مستمر"
+
+msgid "Maximum notices"
+msgstr "الحد الأقصى للملاحظات"
+
+msgid "Account"
+msgstr "الحساب"
+
+msgid "Change password"
+msgstr "تغيير كلمة السر"
+
+msgid "Delete account"
+msgstr "حذف الحساب"
+
+msgid "Old"
+msgstr "العمر"
+
+msgid "New (2 times)"
+msgstr "جديد (عنصرين)"
+
+msgid "Continue"
+msgstr "إستمرار"
+
+msgid "To"
+msgstr "إلى"
+
+msgid "Close"
+msgstr "أغلق"
+
+msgid "unknown"
+msgstr "غير معروف"
+
+msgid "Unavailable"
+msgstr "غير متاح"
+
+msgid "is now"
+msgstr "الآن"
+
+msgid "Please wait while your avatar is uploaded..."
+msgstr "المرجو الانتضار ، يتم رفع صورتك"
+
+msgid "Here it is! A new beautiful profile image!"
+msgstr "إنها هنا! صورة ملف شخصي جديدة."
+
+msgid "The image file is not supported or has a bad size."
+msgstr "ملف الصورة لا يدعم أو الحجم لا يتناسب."
+
+msgid "Reply"
+msgstr "الرد"
+
+msgid "Error"
+msgstr "خطأ"
+
+msgid "Click here to solve the error"
+msgstr "انقر هنا لحل المشكل"
+
+msgid "You"
+msgstr "أنت"
+
+msgid "Remove"
+msgstr "حذف"
+
+msgid "Rename"
+msgstr "إعادة الإسم"
+
+msgid "Hi, I am %s, I would like to add you as my friend."
+msgstr "مرحبا، أنا %s، أرغب بإضافتك كصديق لدي."
+
+msgid "Smiley insertion"
+msgstr "إضافة رمز"
+
+msgid "Change style"
+msgstr "التنسيق"
+
+msgid "Text in bold"
+msgstr "نص عريض"
+
+msgid "Text in italic"
+msgstr "نص مائل"
+
+msgid "Underlined text"
+msgstr "نص أسفله خط"
+
+msgid "Save chat"
+msgstr "حفظ الدردشة"
+
+msgid "Click on the following link to get the chat log, and wait. Then click again to get the file."
+msgstr "إضغط على الوصلة التالية للحصول على سجل الدردشة وإنتظر. ومن ثم إضغط مجددًا للحصول على الملف."
+
+msgid "This chat is empty!"
+msgstr "هذه دردشة خالية!"
+
+msgid "Generate file!"
+msgstr "إنشاء ملف!"
+
+msgid "Download file!"
+msgstr "تحميل الملف"
+
+msgid "Clean current chat"
+msgstr "مسح الدردشة الحالية"
+
+msgid "View chat history"
+msgstr ""
+
+msgid "Show user profile"
+msgstr "إظهار ملف العضو الشخصي"
+
+msgid "Add this contact to your friends"
+msgstr "قم بإضافة هذا الحساب إلى أصدقائك"
+
+msgid "Add this groupchat to your favorites"
+msgstr "قم بإضافة مجموعة الدردشة هذه إلى المفضلة"
+
+msgid "All tabs"
+msgstr "جميع التبويب"
+
+msgid "Close this tab"
+msgstr "أغلق هذا التبويب"
+
+msgid "no subject defined for this room."
+msgstr "لا يوجد عنوان إلى هذه الغرفة"
+
+msgid "Administration panel for this room"
+msgstr "لوحة التحكم إلى هذه الغرفة"
+
+msgid "Moderators"
+msgstr "المدراء"
+
+msgid "Participants"
+msgstr "المشاركون"
+
+msgid "Visitors"
+msgstr "الزوار"
+
+msgid "Manage favorite rooms"
+msgstr "التحكم بالغرف المفضلة"
+
+msgid "Change favorites"
+msgstr "تغيير المفضلة"
+
+msgid "Search a room"
+msgstr "إختر غرفة"
+
+msgid "Select a favorite"
+msgstr "إختر مفضلة"
+
+msgid "Getting the name..."
+msgstr "الحصول على إسم"
+
+msgid "Gateway"
+msgstr "بوابة"
+
+msgid "Name"
+msgstr "الإسم"
+
+msgid "Room"
+msgstr "غرفة"
+
+msgid "Add"
+msgstr "إضافة"
+
+msgid "Edit"
+msgstr "تحرير"
+
+msgid "Search a room on"
+msgstr "يبحث عن غرفة"
+
+msgid "No room found on this server."
+msgstr "لا توجد غرفة على هذا الخادم."
+
+msgid "Service discovery"
+msgstr "استكشاف الخدمة"
+
+msgid "Server to query"
+msgstr "خادم للإستعلام"
+
+msgid "Sorry, but the entity didn't return any result!"
+msgstr ""
+
+msgid "Accounts"
+msgstr "حسابات"
+
+msgid "Authentications"
+msgstr "مصادقة"
+
+msgid "Automation"
+msgstr "تشغيل آلي"
+
+msgid "Clients"
+msgstr "عملاء"
+
+msgid "Collaboration"
+msgstr "إشتراك"
+
+msgid "Components"
+msgstr "محتويات"
+
+msgid "Rooms"
+msgstr "غرف"
+
+msgid "Directories"
+msgstr ""
+
+msgid "Gateways"
+msgstr ""
+
+msgid "News"
+msgstr ""
+
+msgid "Hierarchy"
+msgstr ""
+
+msgid "Proxies"
+msgstr ""
+
+msgid "Publication/Subscription"
+msgstr ""
+
+msgid "Storage"
+msgstr ""
+
+msgid "Service offline or broken"
+msgstr ""
+
+msgid "Your inbox"
+msgstr "بريدك الوارد"
+
+msgid "Available actions"
+msgstr ""
+
+msgid "Clean"
+msgstr ""
+
+msgid "New"
+msgstr "جديد"
+
+msgid "Received"
+msgstr ""
+
+msgid "Subject"
+msgstr "موضوع"
+
+msgid "Content"
+msgstr "محتوى"
+
+msgid "Send message"
+msgstr "أرسل رسالة"
+
+msgid "Your inbox is empty."
+msgstr "بريدك الوارد فارغ"
+
+msgid "MUC administration"
+msgstr ""
+
+msgid "You administrate this room"
+msgstr "أنت تدير هذه الغرفة"
+
+msgid "Enter new subject"
+msgstr "قم بادخال موضوع جديد"
+
+msgid "Configuration"
+msgstr ""
+
+msgid "Authorizations"
+msgstr ""
+
+msgid "Member list"
+msgstr ""
+
+msgid "Owner list"
+msgstr ""
+
+msgid "Administrator list"
+msgstr ""
+
+msgid "Outcast list"
+msgstr ""
+
+msgid "Add an input"
+msgstr ""
+
+msgid "Destroy this MUC"
+msgstr ""
+
+msgid "Yes, let's do it!"
+msgstr ""
+
+msgid "Your friend is paying attention to the conversation."
+msgstr "صديقك يعير اهتماما للمحادثة"
+
+msgid "Your friend is writing a message..."
+msgstr ""
+
+msgid "Your friend stopped writing a message."
+msgstr ""
+
+msgid "Your friend is doing something else."
+msgstr ""
+
+msgid "Your friend closed the chat."
+msgstr ""
+
+msgid "Requesting this service..."
+msgstr ""
+
+msgid "Loading"
+msgstr ""
+
+msgid "joined the chat room"
+msgstr ""
+
+msgid "left the chat room"
+msgstr ""
+
+msgid "no status"
+msgstr ""
+
+msgid "has been kicked"
+msgstr ""
+
+msgid "has been banned"
+msgstr ""
+
+msgid "no reason"
+msgstr ""
+
+msgid "Communicate with the entire world!"
+msgstr ""
+
+msgid "It allows you to get in touch with the millions of users who currently use the XMPP network like you do with Jappix. Join the community and stay free!"
+msgstr ""
+
+msgid "Hi there!"
+msgstr ""
+
+msgid "Welcome on %1s, “%2s”."
+msgstr ""
+
+msgid "Login to your existing XMPP account or create a new one for free!"
+msgstr ""
+
+msgid "Jappix is an open-source project from PostPro, a non-profit organization which provides us a great help."
+msgstr ""
+
+msgid "Login to your existing XMPP account. You can also use the %s to join a groupchat."
+msgstr ""
+
+msgid "Previous"
+msgstr ""
+
+msgid "General"
+msgstr ""
+
+msgid "Advanced"
+msgstr ""
+
+msgid "Resource"
+msgstr ""
+
+msgid "Priority"
+msgstr ""
+
+msgid "Low"
+msgstr ""
+
+msgid "Medium"
+msgstr ""
+
+msgid "High"
+msgstr ""
+
+msgid "Enter the groupchat you want to join and the nick you want to have. You can also go back to the %s."
+msgstr ""
+
+msgid "login page"
+msgstr ""
+
+msgid "Share this link with your friends:"
+msgstr ""
+
+msgid "Register a new XMPP account to join your friends on your own social cloud. That's simple!"
+msgstr ""
+
+msgid "Required"
+msgstr ""
+
+msgid "You have been registered, here is your XMPP address:"
+msgstr ""
+
+msgid "Manager"
+msgstr ""
+
+msgid "Project"
+msgstr ""
+
+msgid "Encrypted"
+msgstr ""
+
+msgid "Unencrypted"
+msgstr ""
+
+msgid "Where are you?"
+msgstr ""
+
+msgid "What's up with you?"
+msgstr ""
+
+msgid "Fetching the social channel..."
+msgstr ""
+
+msgid "You are synchronized with your network."
+msgstr ""
+
+msgid "Cannot send anything: you can only receive notices!"
+msgstr ""
+
+msgid "Media viewer"
+msgstr ""
+
+msgid "Browse"
+msgstr ""
+
+msgid "Command"
+msgstr ""
+
+msgid "Subscribe"
+msgstr ""
+
+msgid "Join"
+msgstr ""
+
+msgid "Automatic"
+msgstr ""
+
+msgid "Search"
+msgstr ""
+
+msgid "No result!"
+msgstr ""
+
+msgid "No notifications."
+msgstr ""
+
+msgid "would like to add you as a friend."
+msgstr ""
+
+msgid "would like you to join this chatroom:"
+msgstr ""
+
+msgid "Do you accept?"
+msgstr ""
+
+msgid "Yes"
+msgstr ""
+
+msgid "No"
+msgstr ""
+
+msgid "would like to get authorization."
+msgstr ""
+
+msgid "Do you want to see the friends %s suggests you?"
+msgstr ""
+
+msgid "Submit"
+msgstr ""
+
+msgid "Client"
+msgstr ""
+
+msgid "System"
+msgstr ""
+
+msgid "Local time"
+msgstr ""
+
+msgid "Comments"
+msgstr ""
+
+msgid "User profile"
+msgstr ""
+
+msgid "See his/her position on the globe"
+msgstr ""
+
+msgid "Confirm"
+msgstr ""
+
+msgid "anonymous mode"
+msgstr ""
+
+msgid "Groups"
+msgstr ""
+
+msgid "Unclassified"
+msgstr ""
+
+msgid "Authorize"
+msgstr ""
+
+msgid "Ask for authorization"
+msgstr ""
+
+msgid "Unblock"
+msgstr ""
+
+msgid "Prohibit"
+msgstr ""
+
+msgid "Block"
+msgstr ""
+
+msgid "Chat"
+msgstr ""
+
+msgid "Groupchat"
+msgstr ""
+
+msgid "Jappix Mobile"
+msgstr ""
+
+msgid "Desktop"
+msgstr ""
+
+msgid "Mobile"
+msgstr ""
+
+msgid "Please wait..."
+msgstr ""
+
+msgid "Please enable JavaScript"
+msgstr ""
+
+msgid "Your channel"
+msgstr ""
+
+msgid "Channel of"
+msgstr ""
+
+msgid "More notices..."
+msgstr ""
+
+msgid "Attach a file"
+msgstr ""
+
+msgid "Send"
+msgstr ""
+
+msgid "Unattach the file"
+msgstr ""
+
+msgid "An error occured while uploading your file: maybe it is too big (%s maximum) or forbidden!"
+msgstr ""
+
+msgid "Authorization failed"
+msgstr ""
+
+msgid "Registration failed, please choose a different username"
+msgstr ""
+
+msgid "Service unavailable"
+msgstr ""
+
+msgid "Internal server error, try later"
+msgstr ""
+
+msgid "Your form has been sent."
+msgstr ""
+
+msgid "Application"
+msgstr ""
+
+msgid "XMPP links"
+msgstr ""
+
+msgid "Open XMPP links with Jappix"
+msgstr ""
+
+msgid "changed the subject to:"
+msgstr ""
+
+msgid "Welcome!"
+msgstr ""
+
+msgid "Friends"
+msgstr ""
+
+msgid "Welcome on Jappix, your own social cloud!"
+msgstr ""
+
+msgid "Before you start using it, you will have to change some settings, search for friends and complete your profile."
+msgstr ""
+
+msgid "Enable notification sounds"
+msgstr ""
+
+msgid "Share your position on the globe"
+msgstr ""
+
+msgid "Offline friends"
+msgstr ""
+
+msgid "Don't hide offline friends"
+msgstr ""
+
+msgid "Use this tool to find your friends on the server you are using right now, or add them later."
+msgstr ""
+
+msgid "Great work! Now, you can share Jappix with your friends!"
+msgstr ""
+
+msgid "When you will press the save button, the profile editor will be opened. Happy socializing!"
+msgstr ""
+
+msgid "Share Jappix on %s"
+msgstr ""
+
+msgid "Using Jappix, an open social platform. I am %s!"
+msgstr ""
+
+msgid "Unknown name"
+msgstr ""
+
+msgid "Unknown country"
+msgstr ""
+
+msgid "Click to enable"
+msgstr ""
+
+msgid "Click to disable"
+msgstr ""
+
+msgid "Installation"
+msgstr ""
+
+msgid "Jappix installation"
+msgstr ""
+
+msgid "Welcome to the Jappix installation!"
+msgstr ""
+
+msgid "This tool will help you fastly install Jappix, the first full-featured XMPP-based social platform, on your server. You don't even need any technical knowledge."
+msgstr ""
+
+msgid "Let's have a look at the installation steps:"
+msgstr ""
+
+msgid "Welcome"
+msgstr "مرحباً"
+
+msgid "Storage configuration"
+msgstr ""
+
+msgid "Administrator account"
+msgstr "حساب المدير"
+
+msgid "Main configuration"
+msgstr ""
+
+msgid "Hosts configuration"
+msgstr ""
+
+msgid "Services installation"
+msgstr ""
+
+msgid "If the current language does not match yours (%1s), you can make Jappix speak %2s it will be saved."
+msgstr ""
+
+msgid "If you want to get some help about the Jappix installation and configuration, you can use our whole documentation, available at:"
+msgstr ""
+
+msgid "It's time to build your own social cloud: just go to the next step!"
+msgstr ""
+
+msgid "Jappix stores persistent data (such as shared files, chat logs, your own music and its configuration) into a single secured storage folder."
+msgstr ""
+
+msgid "Jappix must be able to write in this folder to create its sub-directories. If not, you must set the rights to %1s or change the folder owner to %2s (depending of your configuration)."
+msgstr ""
+
+msgid "The folder is writable, you can continue!"
+msgstr ""
+
+msgid "Jappix offers you the possibility to manage your configuration, install new addons or search for updates. That's why you must create an administrator account to access the manager."
+msgstr ""
+
+msgid "When Jappix will be installed, just click on the manager link on the home page to access it."
+msgstr ""
+
+msgid "Oops, you missed something or the two passwords do not match!"
+msgstr ""
+
+msgid "Jappix needs that you specify some values to work. Please correct the following inputs (or keep the default values, which are sufficient for most people)."
+msgstr ""
+
+msgid "Note that if you don't specify a value which is compulsory, it will be automatically completed with the default one."
+msgstr ""
+
+msgid "User"
+msgstr ""
+
+msgid "Service"
+msgstr ""
+
+msgid "Service name"
+msgstr ""
+
+msgid "Service description"
+msgstr ""
+
+msgid "Connection"
+msgstr ""
+
+msgid "Lock the host"
+msgstr ""
+
+msgid "Anonymous mode"
+msgstr ""
+
+msgid "Registration allowed"
+msgstr ""
+
+msgid "Use a proxy"
+msgstr ""
+
+msgid "Encryption"
+msgstr ""
+
+msgid "HTTPS storage"
+msgstr ""
+
+msgid "Force HTTPS"
+msgstr ""
+
+msgid "Compression"
+msgstr ""
+
+msgid "This page helps you specify the default hosts Jappix will connect to. You can leave it as it is and continue if you want to use the official service hosts."
+msgstr ""
+
+msgid "Maybe you don't know what a BOSH server is? In fact, this is a relay between a Jappix client and a XMPP server, which is necessary because of technical limitations."
+msgstr ""
+
+msgid "Main host"
+msgstr ""
+
+msgid "Groupchat host"
+msgstr ""
+
+msgid "Anonymous host"
+msgstr ""
+
+msgid "Directory host"
+msgstr ""
+
+msgid "BOSH host"
+msgstr ""
+
+msgid "You can install some extra softwares on your server, to extend your Jappix features. Some others might be modified, because of security restrictions which are set by default."
+msgstr ""
+
+msgid "To perform this, you must be able to access your server's shell and be logged in as root. Remember this is facultative, Jappix will work without these modules, but some of its features will be unavailable."
+msgstr ""
+
+msgid "After you finished the setup, Jappix will generate the cache files. It might be slow, just wait until the application is displayed and do not press any button."
+msgstr ""
+
+msgid "Thanks for using Jappix!"
+msgstr ""
+
+msgid "Next"
+msgstr ""
+
+msgid "Finish"
+msgstr ""
+
+msgid "Check again"
+msgstr ""
+
+msgid "The folder is not writable, set the right permissions to the %s directory."
+msgstr ""
+
+msgid "%s is installed on your system."
+msgstr ""
+
+msgid "%1s is not installed on your system, you should install %2s."
+msgstr ""
+
+msgid "PHP maximum upload size is sufficient (%s)."
+msgstr ""
+
+msgid "PHP maximum upload size is not sufficient (%1s), you should define it to %2s in %3s."
+msgstr ""
+
+msgid "Jappix manager"
+msgstr ""
+
+msgid "Manager access"
+msgstr ""
+
+msgid "Statistics"
+msgstr ""
+
+msgid "Hosts"
+msgstr ""
+
+msgid "Design"
+msgstr ""
+
+msgid "Repeat"
+msgstr ""
+
+msgid "All"
+msgstr ""
+
+msgid "Horizontal"
+msgstr ""
+
+msgid "Vertical"
+msgstr ""
+
+msgid "Center"
+msgstr ""
+
+msgid "Left"
+msgstr ""
+
+msgid "Right"
+msgstr ""
+
+msgid "Top"
+msgstr ""
+
+msgid "Bottom"
+msgstr ""
+
+msgid "Adapt"
+msgstr ""
+
+msgid "Color"
+msgstr ""
+
+msgid "Users"
+msgstr ""
+
+msgid "Updates"
+msgstr ""
+
+msgid "This is a restricted area: only the authorized users can manage this Jappix node."
+msgstr ""
+
+msgid "Please use the form below to login to the administration panel."
+msgstr ""
+
+msgid "To improve security, sessions are limited in time and when your browser will be closed, you will be logged out."
+msgstr ""
+
+msgid "Credentials"
+msgstr ""
+
+msgid "You have been logged out. Goodbye!"
+msgstr ""
+
+msgid "Oops, you could not be recognized as a valid administrator. Check your credentials!"
+msgstr ""
+
+msgid "Basic statistics are processed by Jappix about some important things, you can find them below."
+msgstr ""
+
+msgid "Change your Jappix node configuration with this tool."
+msgstr ""
+
+msgid "Change the XMPP hosts that this Jappix node serve with this tool."
+msgstr ""
+
+msgid "All this Jappix node stored files can be managed with this tool: please select a sub-folder and start editing its content!"
+msgstr ""
+
+msgid "Jappix is fully customisable: you can change its design right here."
+msgstr ""
+
+msgid "This is not a valid image, please use PNG, GIF or JPG!"
+msgstr ""
+
+msgid "The image could not be received, would you mind retry?"
+msgstr ""
+
+msgid "Your image was added to the list!"
+msgstr ""
+
+msgid "Changes saved!"
+msgstr ""
+
+msgid "You can define more than one administrator for this Jappix node. You can also change a password with this tool."
+msgstr ""
+
+msgid "Update your Jappix node with this tool, or check if a new one is available. Informations about the latest version are also displayed (in english)."
+msgstr ""
+
+msgid "Access statistics"
+msgstr ""
+
+msgid "Share statistics"
+msgstr ""
+
+msgid "Other statistics"
+msgstr ""
+
+msgid "January"
+msgstr ""
+
+msgid "February"
+msgstr ""
+
+msgid "March"
+msgstr ""
+
+msgid "April"
+msgstr ""
+
+msgid "May"
+msgstr ""
+
+msgid "June"
+msgstr ""
+
+msgid "July"
+msgstr ""
+
+msgid "August"
+msgstr ""
+
+msgid "September"
+msgstr ""
+
+msgid "October"
+msgstr ""
+
+msgid "November"
+msgstr ""
+
+msgid "December"
+msgstr ""
+
+msgid "Monday"
+msgstr ""
+
+msgid "Tuesday"
+msgstr ""
+
+msgid "Wednesday"
+msgstr ""
+
+msgid "Thursday"
+msgstr ""
+
+msgid "Friday"
+msgstr ""
+
+msgid "Saturday"
+msgstr ""
+
+msgid "Sunday"
+msgstr ""
+
+msgid "Total"
+msgstr ""
+
+msgid "Cache"
+msgstr ""
+
+msgid "Logs"
+msgstr ""
+
+msgid "Music"
+msgstr ""
+
+msgid "Backgrounds"
+msgstr ""
+
+msgid "Share"
+msgstr ""
+
+msgid "Background"
+msgstr ""
+
+msgid "Notice"
+msgstr ""
+
+msgid "Your design preferences have been saved!"
+msgstr ""
+
+msgid "Please check your inputs: something is missing!"
+msgstr ""
+
+msgid "Change your Jappix node background with this tool. You can either set a custom color or an uploaded image. Let your creativity flow!"
+msgstr ""
+
+msgid "Use default background"
+msgstr ""
+
+msgid "Use your own image"
+msgstr ""
+
+msgid "Select a background to use and change the display options."
+msgstr ""
+
+msgid "Use your own color"
+msgstr ""
+
+msgid "Type the hexadecimal color value you want to use as a background."
+msgstr ""
+
+msgid "Manage backgrounds"
+msgstr ""
+
+msgid "You can add a new background to the list with this tool. Please send a valid image."
+msgstr ""
+
+msgid "If you want to remove some backgrounds, use the browser below."
+msgstr ""
+
+msgid "Define a homepage notice for all your users, such as a warn, an important message or an advert with this tool."
+msgstr ""
+
+msgid "Simple notice"
+msgstr ""
+
+msgid "This notice only needs simple text to be displayed, but no code is allowed!"
+msgstr ""
+
+msgid "Advanced notice"
+msgstr ""
+
+msgid "You can customize your notice with embedded HTML, CSS and JavaScript, but you need to code the style."
+msgstr ""
+
+msgid "Available updates"
+msgstr ""
+
+msgid "What's new?"
+msgstr ""
+
+msgid "Your storage folders are not writable, please apply the good rights!"
+msgstr ""
+
+msgid "%1s may cause problems to the proxy, please increase %2s value up to %3s!"
+msgstr ""
+
+msgid "You are using a development version of Jappix. Update it through our repository by executing: %s."
+msgstr ""
+
+msgid "A new Jappix version is available! Check what is new and launch the update!"
+msgstr ""
+
+msgid "Your version is out to date. Update it now to %s by clicking here!"
+msgstr ""
+
+msgid "Your version seems to be up to date, but you can check updates manually by clicking here."
+msgstr ""
+
+msgid "Check for updates"
+msgstr ""
+
+msgid "Update in progress"
+msgstr ""
+
+msgid "Jappix has been updated: you are now running the latest version. Have fun!"
+msgstr ""
+
+msgid "The update has failed! Please try again later."
+msgstr ""
+
+msgid "Downloading package..."
+msgstr ""
+
+msgid "Removing current Jappix system files..."
+msgstr ""
+
+msgid "Extracting package..."
+msgstr ""
+
+msgid "Regenerating storage folder tree..."
+msgstr ""
+
+msgid "Jappix is now up to date!"
+msgstr ""
+
+msgid "Aborted: socket error!"
+msgstr ""
+
+msgid "Aborted: buffer error!"
+msgstr ""
+
+msgid "Aborted: everything is not writable!"
+msgstr ""
+
+msgid "Aborted: could not extract the package!"
+msgstr ""
+
+msgid "Visits"
+msgstr ""
+
+msgid "Daily"
+msgstr ""
+
+msgid "Weekly"
+msgstr ""
+
+msgid "Monthly"
+msgstr ""
+
+msgid "Yearly"
+msgstr ""
+
+msgid "Size"
+msgstr ""
+
+msgid "Clean everything"
+msgstr ""
+
+msgid "Purge cache"
+msgstr ""
+
+msgid "Purge logs"
+msgstr ""
+
+msgid "Purge updates"
+msgstr ""
+
+msgid "The storage folder you wanted to clean is now empty!"
+msgstr ""
+
+msgid "Keep your Jappix node fresh and fast, clean the storage folders regularly!"
+msgstr ""
+
+msgid "Upload your music (Ogg Vorbis, MP3 or WAV) to be able to listen to it in Jappix!"
+msgstr ""
+
+msgid "The file you want to upload must be smaller than %s."
+msgstr ""
+
+msgid "Stay tuned in what your users store on your server and remove undesired content with this tool."
+msgstr ""
+
+msgid "Title"
+msgstr ""
+
+msgid "Artist"
+msgstr ""
+
+msgid "Album"
+msgstr ""
+
+msgid "File"
+msgstr ""
+
+msgid "Upload"
+msgstr ""
+
+msgid "The folder is empty."
+msgstr ""
+
+msgid "The music could not be received, please retry!"
+msgstr ""
+
+msgid "This is not a valid music file, please encode in Ogg Vorbis, MP3 or WAV!"
+msgstr ""
+
+msgid "Your music has been added!"
+msgstr ""
+
+msgid "The selected elements have been removed."
+msgstr ""
+
+msgid "You must select elements to remove!"
+msgstr ""
+
+msgid "Add a new user with this tool, or change a password (type an existing username). Please submit a strong password!"
+msgstr ""
+
+msgid "Manage"
+msgstr ""
+
+msgid "List"
+msgstr ""
+
+msgid "Remove users with this tool. Note that you cannot remove an user if he is the only one remaining."
+msgstr ""
+
+msgid "The user has been added!"
+msgstr ""
+
+msgid "The chosen users have been removed."
+msgstr ""
+
+msgid "You must select one or more users to be removed!"
+msgstr ""
+
+msgid "Yesterday"
+msgstr ""
+
+msgid "%s days ago"
+msgstr ""
+
+msgid "User currently active"
+msgstr ""
+
+msgid "Last seen: %s"
+msgstr ""
+
+msgid "Inactive since: %s"
+msgstr ""
+
+msgid "Your friend seems not to have received your message(s)!"
+msgstr ""
+
+msgid "Static content server"
+msgstr ""
+
+msgid "This is the static content server for %1s, “%2s”."
+msgstr ""
+
+msgid "Suggested friends"
+msgstr ""
+
+msgid "Check all"
+msgstr ""
+
+msgid "Uncheck all"
+msgstr ""
+
+msgid "Choose"
+msgstr ""
+
+msgid "List name"
+msgstr ""
+
+msgid "Allow"
+msgstr ""
+
+msgid "Deny"
+msgstr ""
+
+msgid "Group"
+msgstr ""
+
+msgid "Subscription"
+msgstr ""
+
+msgid "Both"
+msgstr ""
+
+msgid "From"
+msgstr ""
+
+msgid "Everybody"
+msgstr ""
+
+msgid "Send messages"
+msgstr ""
+
+msgid "Send queries"
+msgstr ""
+
+msgid "See my status"
+msgstr ""
+
+msgid "Send his/her status"
+msgstr ""
+
+msgid "Everything"
+msgstr ""
+
+msgid "Item"
+msgstr ""
+
+msgid "Order"
+msgstr ""
+
+msgid "Active for this session"
+msgstr ""
+
+msgid "Always active"
+msgstr ""
+
+msgid "User directory"
+msgstr ""
+
+msgid "Search a friend"
+msgstr ""
+
+msgid "The feature requested is not implemented by the recipient or server and therefore cannot be processed."
+msgstr ""
+
+msgid "This is a repeat from %s"
+msgstr ""
+
+msgid "Loading comments..."
+msgstr ""
+
+msgid "Type your comment here..."
+msgstr ""
+
+msgid "Could not get the comments!"
+msgstr ""
+
+msgid "Show comments"
+msgstr ""
+
+msgid "Send him/her a message"
+msgstr ""
+
+msgid "Start a chat with him/her"
+msgstr ""
+
+msgid "Media integration"
+msgstr ""
+
+msgid "Comments locked!"
+msgstr ""
+
+msgid "Type something you want to share with your friends..."
+msgstr ""
+
+msgid "changed his/her nickname to %s"
+msgstr ""
+
+msgid "commented an item you follow: “%s”."
+msgstr ""
+
+msgid "Hide"
+msgstr ""
+
+msgid "liked your post: “%s”."
+msgstr ""
+
+msgid "quoted you somewhere: “%s”."
+msgstr ""
+
+msgid "published on your wall: “%s”."
+msgstr ""
+
+msgid "tagged you in a photo (%s)."
+msgstr ""
+
+msgid "tagged you in a video (%s)."
+msgstr ""
+
+msgid "Show"
+msgstr ""
+
+msgid "Need help? You'd better read our documentation page about how to fill this form!"
+msgstr ""
+
+msgid "Pubsub host"
+msgstr ""
+
+msgid "Jappix is a great social platform, that you can access wherever you are, whenever you want and communicate with whovever you want."
+msgstr ""
+
+msgid "Manager link"
+msgstr ""
+
+msgid "User uploads server"
+msgstr ""
+
+msgid "This is the user uploads server for %1s, “%2s”."
+msgstr ""
+
+msgid "Logo"
+msgstr ""
+
+msgid "You can set your own service logo to replace the default one. Take care of the size and the main color of each logo!"
+msgstr ""
+
+msgid "Upload each logo with the recommended maximum pixel size."
+msgstr ""
+
+msgid "This is not a valid image, please use the PNG format!"
+msgstr ""
+
+msgid "Your service logo has been successfully changed!"
+msgstr ""
+
+msgid "Your logo format must be PNG. Leave a field empty and the logo will not be changed."
+msgstr ""
+
+msgid "Remove this logo"
+msgstr ""
+
+msgid "View this logo"
+msgstr ""
+
+msgid "Send a file"
+msgstr ""
+
+msgid "Once uploaded, your friend will be prompted to download the file you sent."
+msgstr ""
+
+msgid "Groupchats to join"
+msgstr ""
+
+msgid "Purge sent files"
+msgstr ""
+
+msgid "would like to send you a file: “%s”."
+msgstr ""
+
+msgid "has accepted to received your file: “%s”."
+msgstr ""
+
+msgid "has rejected to receive your file: “%s”."
+msgstr ""
+
+msgid "could not receive your file: “%s”."
+msgstr ""
+
+msgid "has received a file exchange request: “%s”."
+msgstr ""
+
+msgid "Available shortcuts:"
+msgstr ""
+
+msgid "%s removes the chat logs"
+msgstr ""
+
+msgid "%s joins a groupchat"
+msgstr ""
+
+msgid "%s closes the chat"
+msgstr ""
+
+msgid "%s shows the user profile"
+msgstr ""
+
+msgid "%s sends a message to the room"
+msgstr ""
+
+msgid "%s changes your nickname"
+msgstr ""
+
+msgid "%s sends a message to someone in the room"
+msgstr ""
+
+msgid "%s changes the room topic"
+msgstr ""
+
+msgid "%s kicks an user of the room"
+msgstr ""
+
+msgid "%s bans an user of the room"
+msgstr ""
+
+msgid "%s invites someone to join the room"
+msgstr ""
+
+msgid "Social channel, chat and more."
+msgstr ""
+
+msgid "Create your public profile."
+msgstr ""
+
+msgid "A mini-chat for your website."
+msgstr ""
+
+msgid "Get Jappix, get support."
+msgstr ""
+
+msgid "Statistics around Jappix."
+msgstr ""
+
+msgid "Download Jappix for free."
+msgstr ""
+
+msgid "Find a public Jappix node."
+msgstr ""
+
+msgid "Public profile"
+msgstr ""
+
+msgid "Your profile anywhere on the Web."
+msgstr ""
+
+msgid "%s is a Jappix.com service which makes your XMPP profile public. It is easier to share it. No XMPP account is required to view your social channel, your current position and your contact details."
+msgstr ""
+
+msgid "Furthermore, every picture you post in your social channel is added to a beautiful picture timeline. You can now view the pictures you shared year by year."
+msgstr ""
+
+msgid "You can also use your XMPP avatar as a single avatar for every website, blog and forum you use. When you change it on XMPP, the new avatar appears everywhere. What a genious improvement!"
+msgstr ""
+
+msgid "Yay, let's create my public profile!"
+msgstr ""
+
+msgid "Enable my public profile"
+msgstr ""
+
+#~ msgid "Jappix is a non-profit social platform, that you can access wherever you are, whenever you want and communicate with whovever you want."
+#~ msgstr ""
+
+#~ msgid "See"
+#~ msgstr ""
+
+#~ msgid "Use default logo"
+#~ msgstr ""
+
+#~ msgid "Use your own logo"
+#~ msgstr ""
+
+#~ msgid "The recommended image format is PNG. Leave a field empty and the logo will not be changed."
+#~ msgstr ""
diff --git a/jappixmini/jappix/lang/bg/LC_MESSAGES/main.mo b/jappixmini/jappix/lang/bg/LC_MESSAGES/main.mo
new file mode 100644
index 00000000..36a4231c
Binary files /dev/null and b/jappixmini/jappix/lang/bg/LC_MESSAGES/main.mo differ
diff --git a/jappixmini/jappix/lang/bg/LC_MESSAGES/main.po b/jappixmini/jappix/lang/bg/LC_MESSAGES/main.po
new file mode 100644
index 00000000..6f4a7339
--- /dev/null
+++ b/jappixmini/jappix/lang/bg/LC_MESSAGES/main.po
@@ -0,0 +1,1870 @@
+# Bulgarian translations for Jappix package.
+# This file is distributed under the same license as the Jappix package.
+# This file was translated from CodingTeam at <http://codingteam.net/>.
+msgid ""
+msgstr ""
+"Project-Id-Version: Jappix\n"
+"PO-Revision-Date: 2012-01-16 21:25+0100\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"POT-Creation-Date: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+
+msgid "JavaScript is missing in your web browser, so that you will not be able to launch Jappix! Please fix this."
+msgstr "JavaScript на вашия браузър липсва или не е включен, поради което няма да можете да заредите и стартирате Jappix! Моля, поправете/променете това."
+
+msgid "An open social network"
+msgstr "отворена социална мрежа"
+
+msgid "Jappix has been interrupted by a network issue, a bug or bad login (check that you entered the right credentials), sorry for the inconvenience."
+msgstr "Jappix беше прекъснат от мрежови проблем, бъг/буболечка (грешка в кода на програмата) или лошо въведени данни за вход (login) (проверете дали сте въвели правилно потребителските си данни за вход), извинете за неудобството."
+
+msgid "The element list on this server could not be obtained!"
+msgstr "Списъкът с елементи на/от този сървър не можа да бъде получен!"
+
+msgid "Your password has been changed, now you can connect to your account with your new login data."
+msgstr "Паролата ви е променена, сега можете да се свържете със своята потребителска сметка (акаунт) с новите си потребителски данни за вход."
+
+msgid "Your XMPP account has been removed, bye!"
+msgstr "Вашата потребителска сметка (акаунт) в XMPP е премахната/изтрита, довиждане!"
+
+msgid "You have been logged out of your XMPP account, have a nice day!"
+msgstr "Излязохте от потребителската си сметка (акаунт) в XMPP, приятен ден!"
+
+msgid "The room you joined seems not to exist. You should create it!"
+msgstr "Стаята, в която влязохте, изглежда не съществува. Би трябвало да я създадете сами!"
+
+msgid "The groupchat has been removed, now someone else will be able to recreate it."
+msgstr "Груповият чат беше премахнат, сега някой друг ще може да го възстанови (пресъздаде)."
+
+msgid "The user that you want to reach is not present in the room."
+msgstr "Потребителят, с когото се опитвате да се свържете, не е наличен в чат стаята."
+
+msgid "Please enter the group chat address to join."
+msgstr "Моля, въведете адреса на груповия чат, за да се присъедините към него."
+
+msgid "Please enter your nickname to join %s."
+msgstr "Моля, въведете вашия псевдоним (nickname, потребителско име), за да се присъедините към %s."
+
+msgid "This room (%s) is protected with a password."
+msgstr "Тази стаия (%s) е защитена с парола."
+
+msgid "Your browser is out of date!"
+msgstr "Използвате стар браузър. Моля, обновете го до по-нова стабилна версия чрез Интернет, или го сменете с друг."
+
+msgid "Last %s version is better!"
+msgstr "Последната %s версия е по-добра!"
+
+msgid "Login"
+msgstr "Вход"
+
+msgid "Register"
+msgstr "Регистрация"
+
+msgid "Here we go!"
+msgstr "Хайде!"
+
+msgid "Server"
+msgstr "Сървър"
+
+msgid "Password"
+msgstr "Парола"
+
+msgid "Remember me"
+msgstr "Запомняне"
+
+msgid "This tool has been disabled, you cannot use it!"
+msgstr "Този инструмент (тази възможност) е изключена, не можете да я ползвате!"
+
+msgid "Due to a network issue, you were disconnected. What do you want to do now?"
+msgstr "Поради мрежова грешка връзката беше прекъсната. Какво искате да направите сега?"
+
+msgid "Reconnect"
+msgstr "Възвръщане на връзката"
+
+msgid "Messages"
+msgstr "Съобщения"
+
+msgid "Profile"
+msgstr "Профил"
+
+msgid "Options"
+msgstr "Настройки"
+
+msgid "Disconnect"
+msgstr "Изключване/прекъсване на връзката"
+
+msgid "Filter"
+msgstr "Филтър"
+
+msgid "Add a friend"
+msgstr "Добяване на приятел"
+
+msgid "Your groupchats"
+msgstr "Вашите групови чатове"
+
+msgid "Manage your favorite groupchats"
+msgstr "Управление на любимите ви групови чатове"
+
+msgid "More stuff"
+msgstr "Още неща"
+
+msgid "Show all friends"
+msgstr "Показване на всички приятели"
+
+msgid "Only show connected friends"
+msgstr "Показване само на свързаните приятели"
+
+msgid "Message archives"
+msgstr "Архив на съобщенията"
+
+msgid "Date"
+msgstr "Дата"
+
+msgid "Please select a friend to view the chat history."
+msgstr "Моля, изберете приятел, за да видите историята на чата (архива на съобщенията)."
+
+msgid "Nothing found for: %s"
+msgstr "Не е намерено нищо за/относно: %s"
+
+msgid "A short message?"
+msgstr "Кратко съобщение?"
+
+msgid "How are you?"
+msgstr "Как сте?"
+
+msgid "What are you doing?"
+msgstr "Какво правите? Как сте?"
+
+msgid "Join a chat"
+msgstr "Присъединяване към чат"
+
+msgid "Status"
+msgstr "Статус"
+
+msgid "Available"
+msgstr "На разположение (онлайн)"
+
+msgid "Talkative"
+msgstr "Готов за разговори"
+
+msgid "Away"
+msgstr "отсъстващ"
+
+msgid "Not available"
+msgstr "не е на разположение"
+
+msgid "Busy"
+msgstr "зает"
+
+msgid "Mood"
+msgstr "Настроение"
+
+msgid "None"
+msgstr "(без)"
+
+msgid "Crazy"
+msgstr "луд"
+
+msgid "Excited"
+msgstr "развълнуван"
+
+msgid "Playful"
+msgstr "игрив"
+
+msgid "Happy"
+msgstr "щастлив/доволен"
+
+msgid "Shocked"
+msgstr "шокиран"
+
+msgid "Hot"
+msgstr "разгорещен"
+
+msgid "Sad"
+msgstr "тъжен"
+
+msgid "Amorous"
+msgstr "чувствен/страстен/влюбчив"
+
+msgid "Confident"
+msgstr "уверен"
+
+msgid "Activity"
+msgstr "дейност"
+
+msgid "Chores"
+msgstr "задължения"
+
+msgid "Drinking"
+msgstr "пиене"
+
+msgid "Eating"
+msgstr "ядене"
+
+msgid "Exercising"
+msgstr "упражнения"
+
+msgid "Grooming"
+msgstr "в момента се подкрепям/поддържам"
+
+msgid "Appointment"
+msgstr "на среща/служба"
+
+msgid "Inactive"
+msgstr "неактивен"
+
+msgid "Relaxing"
+msgstr "релаксира"
+
+msgid "Talking"
+msgstr "говори (в дискусия)"
+
+msgid "Traveling"
+msgstr "пътува (на път)"
+
+msgid "Working"
+msgstr "работи (на работа)"
+
+msgid "View profile"
+msgstr "Преглед на профила"
+
+msgid "Repeat this notice"
+msgstr "Повторение на съобщението"
+
+msgid "Remove this notice"
+msgstr "Премахване на съобщението"
+
+msgid "Your profile"
+msgstr "Вашият профил"
+
+msgid "Identity"
+msgstr "Идентичност"
+
+msgid "Profile image"
+msgstr "Изображение за профила"
+
+msgid "Others"
+msgstr "Други"
+
+msgid "Personal"
+msgstr "Лични"
+
+msgid "Complete name"
+msgstr "Пълно име"
+
+msgid "Nickname"
+msgstr "Псевдоним (nickname)"
+
+msgid "First name"
+msgstr "Първо име (лично име)"
+
+msgid "Last name"
+msgstr "Последно име (фамилия)"
+
+msgid "Date of birth"
+msgstr "Дата на раждане"
+
+msgid "Contact"
+msgstr "Контакт"
+
+msgid "E-mail"
+msgstr "Имейл (е-поща)"
+
+msgid "Phone"
+msgstr "Телефон"
+
+msgid "Website"
+msgstr "Уебсайт"
+
+msgid "Current"
+msgstr "Настоящ"
+
+msgid "Delete"
+msgstr "Изтриване"
+
+msgid "What a pity! You have no profile image defined in your identity card!"
+msgstr "Колко жалко! Вие нямате зададено изображение за профила си в картата си за самоличност!"
+
+msgid "Address"
+msgstr "Адрес"
+
+msgid "Street"
+msgstr "Улица"
+
+msgid "City"
+msgstr "Град"
+
+msgid "Postal code"
+msgstr "Пощенски код"
+
+msgid "Country"
+msgstr "Страна/държава"
+
+msgid "Biography"
+msgstr "Биография"
+
+msgid "Important notice"
+msgstr "Важно съобщение"
+
+msgid "Be careful of the information you write into your profile, because it could be accessed by everyone (even someone you don't want to)."
+msgstr "Внимавайте каква и колко информация вписвате в профила си, защото е достъпна за всички (дори за хора, които не искате)."
+
+msgid "Not everything is private on XMPP; this is one of those things, your public profile (vCard)."
+msgstr "Не всичко е конфиденциално/поверително в XMPP; вашият публичен профил (vCard) е едно от тези неща."
+
+msgid "It is strongly recommended to upload a profile image (%s maximum), like a picture of yourself, because that makes you easily recognizable by your friends."
+msgstr ""
+
+msgid "Save"
+msgstr "Запазване"
+
+msgid "Cancel"
+msgstr "Отказ"
+
+msgid "Edit options"
+msgstr "Редакция на настройките"
+
+msgid "Channel"
+msgstr "Канал"
+
+msgid "Commands"
+msgstr "Команди"
+
+msgid "Sounds"
+msgstr "Звуци"
+
+msgid "Privacy"
+msgstr "Поверителност"
+
+msgid "Message archiving"
+msgstr "Архивиране на съобщенията"
+
+msgid "Store a history of your chats"
+msgstr "Запазване на история (водене на архив) на вашите чатове"
+
+msgid "Geolocation"
+msgstr "Геолокация"
+
+msgid "Empty"
+msgstr "Празно"
+
+msgid "Empty channel"
+msgstr "Празен канал"
+
+msgid "Persistent"
+msgstr "Натрапчивост/постоянство"
+
+msgid "Maximum notices"
+msgstr "Максимален брой съобщения"
+
+msgid "Account"
+msgstr "Потребителска сметка (акаунт)"
+
+msgid "Change password"
+msgstr "Промяна на паролата"
+
+msgid "Delete account"
+msgstr "Изтриване на потребителската сметка (акаунт)"
+
+msgid "Old"
+msgstr "Стар(и)"
+
+msgid "New (2 times)"
+msgstr "Нов(и) (2 пъти)"
+
+msgid "Continue"
+msgstr "Продължаване"
+
+msgid "To"
+msgstr "Към/за"
+
+msgid "Close"
+msgstr "Затваряне"
+
+msgid "unknown"
+msgstr "непознат"
+
+msgid "Unavailable"
+msgstr "Не е на разположение (офлайн)"
+
+msgid "is now"
+msgstr "е сега"
+
+msgid "Please wait while your avatar is uploaded..."
+msgstr "Моля, изчакайте докато аватарът ви се качва (ъплоудва)..."
+
+msgid "Here it is! A new beautiful profile image!"
+msgstr "Ето го! Хубаво ново изображение (аватар) за профила ви!"
+
+msgid "The image file is not supported or has a bad size."
+msgstr "Файлът от тип изображение не се поддържа или има грешна големина."
+
+msgid "Reply"
+msgstr "Отговор"
+
+msgid "Error"
+msgstr "Грешка"
+
+msgid "Click here to solve the error"
+msgstr "Натиснете тук, за да поправите грешката"
+
+msgid "You"
+msgstr "Ти/Вие"
+
+msgid "Remove"
+msgstr "Премахване"
+
+msgid "Rename"
+msgstr "Преименуване"
+
+msgid "Hi, I am %s, I would like to add you as my friend."
+msgstr "Здравей, аз съм %s, бих искал да ви добавя към моя списък с приятели."
+
+msgid "Smiley insertion"
+msgstr "Въвеждане на емотикон(и)"
+
+msgid "Change style"
+msgstr "Промяна на стила"
+
+msgid "Text in bold"
+msgstr "Удебелен текст (bold)"
+
+msgid "Text in italic"
+msgstr "Курсивен текст (italic)"
+
+msgid "Underlined text"
+msgstr "Подчертан текст"
+
+msgid "Save chat"
+msgstr "Запазване на чата"
+
+msgid "Click on the following link to get the chat log, and wait. Then click again to get the file."
+msgstr "Натиснете следната връзка (хиперлинк), за да получите историята на чата, след това изчакайте. След това натиснете отново, за да изтеглите файла с историята на чата."
+
+msgid "This chat is empty!"
+msgstr "Чатът е празен!"
+
+msgid "Generate file!"
+msgstr "Генериране на файл!"
+
+msgid "Download file!"
+msgstr "Изтегляне (даунлоуд) на файл!"
+
+msgid "Clean current chat"
+msgstr "Изчистване на настоящия чат"
+
+msgid "View chat history"
+msgstr "Преглед на историята на чата"
+
+msgid "Show user profile"
+msgstr "Показване на потребителския профил"
+
+msgid "Add this contact to your friends"
+msgstr "Добавяне на контакта към списъка с приятели"
+
+msgid "Add this groupchat to your favorites"
+msgstr "Добавяне на груповия чат към твоите любими"
+
+msgid "All tabs"
+msgstr "Всички подпрозорци (табове)"
+
+msgid "Close this tab"
+msgstr "Затваряне на подпрозореца (таба)"
+
+msgid "no subject defined for this room."
+msgstr "Не е дефинирана тема за тази чат стая."
+
+msgid "Administration panel for this room"
+msgstr "Администрационен панел за стаята"
+
+msgid "Moderators"
+msgstr "Модератори"
+
+msgid "Participants"
+msgstr "Участници"
+
+msgid "Visitors"
+msgstr "Посетители"
+
+msgid "Manage favorite rooms"
+msgstr "Управление на любимите стаи"
+
+msgid "Change favorites"
+msgstr "Промяна на любимите"
+
+msgid "Search a room"
+msgstr "Търсене из/в стаята"
+
+msgid "Select a favorite"
+msgstr "Избор на любим(и)"
+
+msgid "Getting the name..."
+msgstr "Прихващане на имена..."
+
+msgid "Gateway"
+msgstr "Врата/вход/път"
+
+msgid "Name"
+msgstr "Име"
+
+msgid "Room"
+msgstr "Стая"
+
+msgid "Add"
+msgstr "Добавяне"
+
+msgid "Edit"
+msgstr "Редактиране"
+
+msgid "Search a room on"
+msgstr "Потърси статия от/в(ъв)"
+
+msgid "No room found on this server."
+msgstr "Не са намерени стаи на този сървър."
+
+msgid "Service discovery"
+msgstr "Откриване на услуги"
+
+msgid "Server to query"
+msgstr "Заявка за сървър"
+
+msgid "Sorry, but the entity didn't return any result!"
+msgstr "Съжалявам, но търсенето за обекта не върна никакъв резултат!"
+
+msgid "Accounts"
+msgstr "Потребителски сметки (акаунти)"
+
+msgid "Authentications"
+msgstr "Удостоверения за идентификация"
+
+msgid "Automation"
+msgstr "Автоматизация"
+
+msgid "Clients"
+msgstr "Клиенти"
+
+msgid "Collaboration"
+msgstr "Сътрудничество (колаборация)"
+
+msgid "Components"
+msgstr "Компоненти"
+
+msgid "Rooms"
+msgstr "Стаи"
+
+msgid "Directories"
+msgstr "Директории"
+
+msgid "Gateways"
+msgstr "Пътища/входове"
+
+msgid "News"
+msgstr "Новини"
+
+msgid "Hierarchy"
+msgstr "Йерархия"
+
+msgid "Proxies"
+msgstr "Проксита (сървъри-посредници)"
+
+msgid "Publication/Subscription"
+msgstr "Публикация/Абонамент"
+
+msgid "Storage"
+msgstr "Хранилище"
+
+msgid "Service offline or broken"
+msgstr "Услугата е офлайн (извън линия) или е счупена/повредена"
+
+msgid "Your inbox"
+msgstr "Вашата входяща кутия"
+
+msgid "Available actions"
+msgstr "Действия на разположение"
+
+msgid "Clean"
+msgstr "Изчистване"
+
+msgid "New"
+msgstr "Нов(и)"
+
+msgid "Received"
+msgstr "Получен(и)"
+
+msgid "Subject"
+msgstr "Тема"
+
+msgid "Content"
+msgstr "Съдържание"
+
+msgid "Send message"
+msgstr "Изпращане на съобщението"
+
+msgid "Your inbox is empty."
+msgstr "Входящата ви кутия е празна."
+
+msgid "MUC administration"
+msgstr "Администрация на MUC"
+
+msgid "You administrate this room"
+msgstr "Вие сте администраторът на тази стая"
+
+msgid "Enter new subject"
+msgstr "Въвеждане на това тема"
+
+msgid "Configuration"
+msgstr "Конфигурация"
+
+msgid "Authorizations"
+msgstr "Права и пълномощни"
+
+msgid "Member list"
+msgstr "Списък с участници"
+
+msgid "Owner list"
+msgstr "Списък със собственици"
+
+msgid "Administrator list"
+msgstr "Списък с администратори"
+
+msgid "Outcast list"
+msgstr "Списък с outcast-и"
+
+msgid "Add an input"
+msgstr "Добавяне на входни данни"
+
+msgid "Destroy this MUC"
+msgstr "Унищожаване на този MUC (многопотребителски чат)"
+
+msgid "Yes, let's do it!"
+msgstr "Да, да го направим!"
+
+msgid "Your friend is paying attention to the conversation."
+msgstr "Приятелят ви обръща внимание на дискусията."
+
+msgid "Your friend is writing a message..."
+msgstr "Приятелят ви пише съобщение..."
+
+msgid "Your friend stopped writing a message."
+msgstr "Приятелят ви спря да пише съобщение."
+
+msgid "Your friend is doing something else."
+msgstr "Приятелят ви прави нещо друго."
+
+msgid "Your friend closed the chat."
+msgstr "Приятелят ви затваря чата."
+
+msgid "Requesting this service..."
+msgstr "Заявка на тази услуга..."
+
+msgid "Loading"
+msgstr "Зареждане"
+
+msgid "joined the chat room"
+msgstr "се присъедини към чат стаята"
+
+msgid "left the chat room"
+msgstr "напусна чат стаята"
+
+msgid "no status"
+msgstr "без статус"
+
+msgid "has been kicked"
+msgstr "беше изхвърлен (kick-нат) [от стаята]"
+
+msgid "has been banned"
+msgstr "е баннат"
+
+msgid "no reason"
+msgstr "без причина"
+
+msgid "Communicate with the entire world!"
+msgstr "Комуникирай с целия свят!"
+
+msgid "It allows you to get in touch with the millions of users who currently use the XMPP network like you do with Jappix. Join the community and stay free!"
+msgstr "Позволява ви да се свързвате с милиони потребители, които използват мрежата XMPP както и ти с Jappix. Присъедини се към общността и остани свободен. Пояснение: XMPP = екс-ем-пи-пи, eXtensible Messaging and Presence Protocol, http://xmpp.org/."
+
+msgid "Hi there!"
+msgstr "Ей, ти там, здравей!"
+
+msgid "Welcome on %1s, “%2s”."
+msgstr "Добре дошли в %1s, “%2s”."
+
+msgid "Login to your existing XMPP account or create a new one for free!"
+msgstr "Влезте във вашата вече съществуваща XMPP потребителска сметка (акаунт) или създайте нова свободно и безплатно!"
+
+msgid "Jappix is an open-source project from PostPro, a non-profit organization which provides us a great help."
+msgstr "Jappix е проект с отворен код (FLOSS, свободен софтуер) от PostPro, некомерсиална (non-profit) организация, която ни осигурява много помощ."
+
+msgid "Login to your existing XMPP account. You can also use the %s to join a groupchat."
+msgstr "Влезте във вече наличната си (съществуваща) XMPP потребителска сметка (акаунт). Също така можете да използвате %s, за да се присъедините към групов чат."
+
+msgid "Previous"
+msgstr "Предишни"
+
+msgid "General"
+msgstr "Общи"
+
+msgid "Advanced"
+msgstr "Разширени"
+
+msgid "Resource"
+msgstr "Ресурс"
+
+msgid "Priority"
+msgstr "Приоритет"
+
+msgid "Low"
+msgstr "Нисък"
+
+msgid "Medium"
+msgstr "Среден"
+
+msgid "High"
+msgstr "Висок"
+
+msgid "Enter the groupchat you want to join and the nick you want to have. You can also go back to the %s."
+msgstr "Въведете адреса на груповия чат, към който искате да се присъедините, както и псевдонимът, който искате да използвате. Също така можете да се върнете към %s."
+
+msgid "login page"
+msgstr "страница за вход"
+
+msgid "Share this link with your friends:"
+msgstr "Споделяне на връзката с вашите приятели:"
+
+msgid "Register a new XMPP account to join your friends on your own social cloud. That's simple!"
+msgstr "Регистрирайте нова потребителска сметка (акаунт) за XMPP, за да се присъедините към вашите приятели от вашия собствен социален облак. Просто е!"
+
+msgid "Required"
+msgstr "задължително"
+
+msgid "You have been registered, here is your XMPP address:"
+msgstr "Вие се регистрирахте успешно, ето ви вашия личен XMPP адрес:"
+
+msgid "Manager"
+msgstr "Мениджър (адм. управление)"
+
+msgid "Project"
+msgstr "Проект"
+
+msgid "Encrypted"
+msgstr "Криптиран (шифрован) вход"
+
+msgid "Unencrypted"
+msgstr "Некриптиран (нешифрован) вход"
+
+msgid "Where are you?"
+msgstr "Къде сте?"
+
+msgid "What's up with you?"
+msgstr "Как сте?"
+
+msgid "Fetching the social channel..."
+msgstr "Прихващане на социалния канал..."
+
+msgid "You are synchronized with your network."
+msgstr "Синхронизиран сте с мрежата си."
+
+msgid "Cannot send anything: you can only receive notices!"
+msgstr "Не можете да изпращате нищо: можете само да получавате известия!"
+
+msgid "Media viewer"
+msgstr "Медиен преглед/разглеждане"
+
+msgid "Browse"
+msgstr "Разглеждане/преглед"
+
+msgid "Command"
+msgstr "Команда"
+
+msgid "Subscribe"
+msgstr "Абонамент"
+
+msgid "Join"
+msgstr "Присъединяване"
+
+msgid "Automatic"
+msgstr "Автоматично"
+
+msgid "Search"
+msgstr "Търсене"
+
+msgid "No result!"
+msgstr "Няма резултат!"
+
+msgid "No notifications."
+msgstr "Няма известия."
+
+msgid "would like to add you as a friend."
+msgstr "желае да ви добави към списъка си с приятели."
+
+msgid "would like you to join this chatroom:"
+msgstr "желае вие да се присъедините към следната чат стая:"
+
+msgid "Do you accept?"
+msgstr "Приемате ли?"
+
+msgid "Yes"
+msgstr "Да/ОК"
+
+msgid "No"
+msgstr "Не"
+
+msgid "would like to get authorization."
+msgstr "желае да получи пълномощно."
+
+msgid "Do you want to see the friends %s suggests you?"
+msgstr "Желаете ли да видите списъка с приятели, които %s ви предлага?"
+
+msgid "Submit"
+msgstr "Изпращане"
+
+msgid "Client"
+msgstr "Клиент"
+
+msgid "System"
+msgstr "Система"
+
+msgid "Local time"
+msgstr "Местно време"
+
+msgid "Comments"
+msgstr "Коментари"
+
+msgid "User profile"
+msgstr "Потребителски профил"
+
+msgid "See his/her position on the globe"
+msgstr "Вижте неговата/нейната позиция (местоположение) на глобуса [чрез геолокация]"
+
+msgid "Confirm"
+msgstr "Потвърждаване"
+
+msgid "anonymous mode"
+msgstr "режим инкогнито (в анонимност)"
+
+msgid "Groups"
+msgstr "Групи"
+
+msgid "Unclassified"
+msgstr "Некласифицирани"
+
+msgid "Authorize"
+msgstr "Разрешаване/упълномощаване"
+
+msgid "Ask for authorization"
+msgstr "Питай/-не за разрешение/упълномощение"
+
+msgid "Unblock"
+msgstr "Отблокиране"
+
+msgid "Prohibit"
+msgstr "Забрана"
+
+msgid "Block"
+msgstr "Блокиране"
+
+msgid "Chat"
+msgstr "Чат"
+
+msgid "Groupchat"
+msgstr "Групов чат"
+
+msgid "Jappix Mobile"
+msgstr "мобилна версия на Jappix"
+
+msgid "Desktop"
+msgstr "Desktop (десктоп, настолна версия)"
+
+msgid "Mobile"
+msgstr "Mobile (мобилна версия)"
+
+msgid "Please wait..."
+msgstr "Моля, изчакайте..."
+
+msgid "Please enable JavaScript"
+msgstr "Моля, включете JavaScript"
+
+msgid "Your channel"
+msgstr "Вашия канал"
+
+msgid "Channel of"
+msgstr "Канал на"
+
+msgid "More notices..."
+msgstr "Още известия..."
+
+msgid "Attach a file"
+msgstr "Прикачване на файл"
+
+msgid "Send"
+msgstr "Изпращане"
+
+msgid "Unattach the file"
+msgstr "Премахване на прикачения файл"
+
+msgid "An error occured while uploading your file: maybe it is too big (%s maximum) or forbidden!"
+msgstr "Грешка при качването (ъплоудването) на вашия файл: може би е прекалено голям (максимумът е %s) или е от забранен тип файлово разширение!"
+
+msgid "Authorization failed"
+msgstr "Неуспешно потвърждение на потребителските данни"
+
+msgid "Registration failed, please choose a different username"
+msgstr "Регистрацията е неуспешна, моля, изберете друго потребителско име/псевдоним"
+
+msgid "Service unavailable"
+msgstr "Услугата не е на разположение (офлайн, извън линия)"
+
+msgid "Internal server error, try later"
+msgstr "Вътрешна сървърна грешка, пробвайте отново по-късно"
+
+msgid "Your form has been sent."
+msgstr "Формулярът ви беше изпратен."
+
+msgid "Application"
+msgstr "Приложение"
+
+msgid "XMPP links"
+msgstr "XMPP връзки"
+
+msgid "Open XMPP links with Jappix"
+msgstr "Отваряне на XMPP връзки с Jappix"
+
+msgid "changed the subject to:"
+msgstr "промени темата на:"
+
+msgid "Welcome!"
+msgstr "Добре дошли!"
+
+msgid "Friends"
+msgstr "Приятели"
+
+msgid "Welcome on Jappix, your own social cloud!"
+msgstr "Добре дошли в Jappix, твоят собствен социален облак!"
+
+msgid "Before you start using it, you will have to change some settings, search for friends and complete your profile."
+msgstr "Преди да започнете да го използвате, трябва да промените някои настройки, да потърсите приятели и да попълните профила си."
+
+msgid "Enable notification sounds"
+msgstr "Включване на звуци за известия"
+
+msgid "Share your position on the globe"
+msgstr "Споделяне на позицията (местоположението) ви на глобуса"
+
+msgid "Offline friends"
+msgstr "Приятели извън линия"
+
+msgid "Don't hide offline friends"
+msgstr "Без скриване на прителите извън линия"
+
+msgid "Use this tool to find your friends on the server you are using right now, or add them later."
+msgstr "Използвайте този помощник/инструмент, за да намерите приятелите си на сървъра, който използвате в момента, или ги добавете по-късно."
+
+msgid "Great work! Now, you can share Jappix with your friends!"
+msgstr "Добра работа! Сега можете да споделите Jappix със своите приятели!"
+
+msgid "When you will press the save button, the profile editor will be opened. Happy socializing!"
+msgstr "Когато натиснете бутона за запазване, ще бъде отворен редакторът на профила. Приятно социализиране!"
+
+msgid "Share Jappix on %s"
+msgstr "Споделяне на Jappix по %s"
+
+msgid "Using Jappix, an open social platform. I am %s!"
+msgstr "Използвам Jappix, отворена социална платформа. Аз съм %s!"
+
+msgid "Unknown name"
+msgstr "Неизвестно име"
+
+msgid "Unknown country"
+msgstr "Неизвестна страна/държава"
+
+msgid "Click to enable"
+msgstr "Натиснете за включване"
+
+msgid "Click to disable"
+msgstr "Натиснете за изключване"
+
+msgid "Installation"
+msgstr "Инсталация"
+
+msgid "Jappix installation"
+msgstr "Инсталация на Jappix"
+
+msgid "Welcome to the Jappix installation!"
+msgstr "Добре дошли в инсталацията за/на Jappix!"
+
+msgid "This tool will help you fastly install Jappix, the first full-featured XMPP-based social platform, on your server. You don't even need any technical knowledge."
+msgstr "Този помощник/инструмент ще ви помогне бързо да инсталирате Jappix, първата пълноценна онлайн социална платформа, базирана на XMPP, на вашия сървър. Дори не са ви нужни технически познания."
+
+msgid "Let's have a look at the installation steps:"
+msgstr "Нека да разгледаме стъпките при/на инсталацията:"
+
+msgid "Welcome"
+msgstr "Здравейте"
+
+msgid "Storage configuration"
+msgstr "Конфигурация на хранилището"
+
+msgid "Administrator account"
+msgstr "Администраторска потребителска сметка (акаунт)"
+
+msgid "Main configuration"
+msgstr "Основна конфигурация"
+
+msgid "Hosts configuration"
+msgstr "Конфигурация на хостовете"
+
+msgid "Services installation"
+msgstr "Инсталация на услуги"
+
+msgid "If the current language does not match yours (%1s), you can make Jappix speak %2s it will be saved."
+msgstr "Ако настоящият език не съвпада с вашия (%1s), можете да направите Jappix да говори на %2s, като това ще се запази."
+
+msgid "If you want to get some help about the Jappix installation and configuration, you can use our whole documentation, available at:"
+msgstr "Ако желаете да получите помощ относно инсталацията и конфигурацията на Jappix, можете да използвате цялата наша документация на програмата, която е на разположение от:"
+
+msgid "It's time to build your own social cloud: just go to the next step!"
+msgstr "Време е да построите вашия собствен социален облак: просто отидете на следващата стъпка!"
+
+msgid "Jappix stores persistent data (such as shared files, chat logs, your own music and its configuration) into a single secured storage folder."
+msgstr "Jappix съхранява натрапчиви/постоянни данни (като споделени файлове, дневници/архиви на чатовете, вашата музика и собствената си конфигурация) в своята собствена сигурна папка/директория за съхранение."
+
+msgid "Jappix must be able to write in this folder to create its sub-directories. If not, you must set the rights to %1s or change the folder owner to %2s (depending of your configuration)."
+msgstr "Jappix трябва да може да вписва данни в тази папка/директория, за да създаде своите поддиректории. Ако това е невъзможно, трябва да настроите правомощията на %1s или да промените собственика на папката на %2s (в зависимост от вашата конфигурация)."
+
+msgid "The folder is writable, you can continue!"
+msgstr "В тази папка/директория може да се записва, можете да продължите!"
+
+msgid "Jappix offers you the possibility to manage your configuration, install new addons or search for updates. That's why you must create an administrator account to access the manager."
+msgstr "Jappix ви позволява да управлявате и менажирате вашата конфигурация, да инсталирате нови разширения (плъгини) или да потърсите за обновления на програмата (ъпдейти). Затова трябва да създадете администраторска потребителска сметка (акаунт), за да можете да имате достъп до мениджъра с настройките на Jappix."
+
+msgid "When Jappix will be installed, just click on the manager link on the home page to access it."
+msgstr "Когато Jappix се инсталира, просто натиснете върху хипервръзката към мениджъра с настройките за програмата, намиращ се на домашната страница, за да влезете в него."
+
+msgid "Oops, you missed something or the two passwords do not match!"
+msgstr "Опа, пропуснали сте нещо или двете пароли не съвпадат!"
+
+msgid "Jappix needs that you specify some values to work. Please correct the following inputs (or keep the default values, which are sufficient for most people)."
+msgstr "Jappix изисква да му въведете някои стойности, за да функционира правилно. Моля, коригирайте следните входни данни (или останете със стойностите по подразбиране, които вършат работа на повечето хора)."
+
+msgid "Note that if you don't specify a value which is compulsory, it will be automatically completed with the default one."
+msgstr "Обърнете внимание на това, че ако не изберете ръчно стойност, която е задължителна, тя автоматично ще бъде попълнена с фабрична стойност по подразбиране."
+
+msgid "User"
+msgstr "Потребител"
+
+msgid "Service"
+msgstr "Услуга"
+
+msgid "Service name"
+msgstr "Наименование на услугата"
+
+msgid "Service description"
+msgstr "Описание на услугата"
+
+msgid "Connection"
+msgstr "Връзка"
+
+msgid "Lock the host"
+msgstr "Заключване на хоста"
+
+msgid "Anonymous mode"
+msgstr "Режим инкогнито (в анонимност)"
+
+msgid "Registration allowed"
+msgstr "Регистрациите са разрешени"
+
+msgid "Use a proxy"
+msgstr "Използване на прокси (сървър-посредник)"
+
+msgid "Encryption"
+msgstr "Криптиране (шифроване)"
+
+msgid "HTTPS storage"
+msgstr "съхранение/складиране с HTTPS"
+
+msgid "Force HTTPS"
+msgstr "Принудително използване на HTTPS"
+
+msgid "Compression"
+msgstr "Компресия"
+
+msgid "This page helps you specify the default hosts Jappix will connect to. You can leave it as it is and continue if you want to use the official service hosts."
+msgstr "Тази страница ви помага да настроите хостовете по подразбиране, с които Jappix ще се свързва. Можете да оставите настройките такива, каквито са по подразбиране, и да продължите напред, ако искате да използвате официалните хостове на услуги."
+
+msgid "Maybe you don't know what a BOSH server is? In fact, this is a relay between a Jappix client and a XMPP server, which is necessary because of technical limitations."
+msgstr "Може би не знаете какво е BOSH сървър? Всъщност, това е вид междинна станция между Jappix клиента и определен XMPP сървър, като тя е нужна поради технически ограничения."
+
+msgid "Main host"
+msgstr "Основен хост"
+
+msgid "Groupchat host"
+msgstr "Хост на групови чатове"
+
+msgid "Anonymous host"
+msgstr "Анонимен хост"
+
+msgid "Directory host"
+msgstr "Хост на директорията"
+
+msgid "BOSH host"
+msgstr "BOSH хост"
+
+msgid "You can install some extra softwares on your server, to extend your Jappix features. Some others might be modified, because of security restrictions which are set by default."
+msgstr "Можете да инсталирате допълнителни софтурни продукти на вашия сървър, с които да разширите възможностите на вашата инсталация на Jappix. Някои други могат да бъдат модифицирани поради ограничения заради сигурността, които са сложени по подразбиране."
+
+msgid "To perform this, you must be able to access your server's shell and be logged in as root. Remember this is facultative, Jappix will work without these modules, but some of its features will be unavailable."
+msgstr "За да изпълните това действие е необходимо да имате достъп до shell-а (черупката) на вашия сървър и да бъдете влезли в системата му като root (корен) потребител, т.е. с административни права. Запомнете, че това е незадължително, Jappix ще работи и без тези модули, но някои от неговите възможности може да не са налични за използване поради това."
+
+msgid "After you finished the setup, Jappix will generate the cache files. It might be slow, just wait until the application is displayed and do not press any button."
+msgstr "След като приключите с инсталацията, Jappix ще генерира/създаде кеш (cache) файловете. Това може да бъде бавен процес, затова просто покачайте, докато приложението не се визуализира, и междувременно не натискайте каквито и да е бутони."
+
+msgid "Thanks for using Jappix!"
+msgstr "Благодарим ви, че използвате Jappix!"
+
+msgid "Next"
+msgstr "Следващ/напред"
+
+msgid "Finish"
+msgstr "Край"
+
+msgid "Check again"
+msgstr "Проверете отново"
+
+msgid "The folder is not writable, set the right permissions to the %s directory."
+msgstr "Не можете да записвате в тази папка/директория, поставете правилните пълномощни права/свойства на директорията %s."
+
+msgid "%s is installed on your system."
+msgstr "%s е инсталиран на вашата система."
+
+msgid "%1s is not installed on your system, you should install %2s."
+msgstr "%1s не е инсталиран/а/о на вашата система, нужно е да инсталирате %2s."
+
+msgid "PHP maximum upload size is sufficient (%s)."
+msgstr "Максималната големина за качване на PHP е достатъчна (%s)."
+
+msgid "PHP maximum upload size is not sufficient (%1s), you should define it to %2s in %3s."
+msgstr "Максималната големина за качване на/чрез/с PHP е недостатъчна (%1s), нужно е да я промените към %2s в %3s."
+
+msgid "Jappix manager"
+msgstr "Jappix мениджър"
+
+msgid "Manager access"
+msgstr "Мениджърски достъп"
+
+msgid "Statistics"
+msgstr "Статистики"
+
+msgid "Hosts"
+msgstr "Хостове"
+
+msgid "Design"
+msgstr "Дизайн"
+
+msgid "Repeat"
+msgstr "повтаряне"
+
+msgid "All"
+msgstr "Всички"
+
+msgid "Horizontal"
+msgstr "Хоризонтално"
+
+msgid "Vertical"
+msgstr "Вертикално"
+
+msgid "Center"
+msgstr "Централно"
+
+msgid "Left"
+msgstr "Отляво"
+
+msgid "Right"
+msgstr "Отдясно"
+
+msgid "Top"
+msgstr "горе"
+
+msgid "Bottom"
+msgstr "Долу"
+
+msgid "Adapt"
+msgstr "Адаптивно"
+
+msgid "Color"
+msgstr "Цвят"
+
+msgid "Users"
+msgstr "Потребители"
+
+msgid "Updates"
+msgstr "Обновления"
+
+msgid "This is a restricted area: only the authorized users can manage this Jappix node."
+msgstr "Това е ограничена зона: само оправомощени потребители могат да управляват този Jappix възел."
+
+msgid "Please use the form below to login to the administration panel."
+msgstr "Моля, използвайте формуляра надолу, за да влезете в администрационния панел."
+
+msgid "To improve security, sessions are limited in time and when your browser will be closed, you will be logged out."
+msgstr "За подобряване на сигурността, сесиите са времево ограничени и когато уеббраузърът ви бъде затворен, вие автоматично ще бъдете изхвърлени от системата."
+
+msgid "Credentials"
+msgstr "Акредитивни пълномощни/права"
+
+msgid "You have been logged out. Goodbye!"
+msgstr "Вие излязохте. Довиждане!"
+
+msgid "Oops, you could not be recognized as a valid administrator. Check your credentials!"
+msgstr "Опа, системата не ви разпознава като валиден администратор. Моля, проверете верността на данните си за вход!"
+
+msgid "Basic statistics are processed by Jappix about some important things, you can find them below."
+msgstr ""
+
+msgid "Change your Jappix node configuration with this tool."
+msgstr "Променете конфигурацията на вашия Jappix възел с този инструмент/помощник."
+
+msgid "Change the XMPP hosts that this Jappix node serve with this tool."
+msgstr "Промяна на XMPP хостовете, които обслужва този Jappix възел, с този инструмент/помощник."
+
+msgid "All this Jappix node stored files can be managed with this tool: please select a sub-folder and start editing its content!"
+msgstr "Всички съхранени файлове за/на този Jappix възел могат да бъдат управлявани с този инструмент/помощник: за целта, моля, изберете подпапка и започнете да редактирате съдържанието ѝ!"
+
+msgid "Jappix is fully customisable: you can change its design right here."
+msgstr "Jappix може напълно да се промени по вкуса ви: можете да промените неговия дизайн от тук."
+
+msgid "This is not a valid image, please use PNG, GIF or JPG!"
+msgstr "Изображението е невалидно, моля, използвайте изображения с файлови формати PNG, GIF или JPG!"
+
+msgid "The image could not be received, would you mind retry?"
+msgstr "Изображението не може да бъде получено, бихте ли пробвали да го изпратите отново?"
+
+msgid "Your image was added to the list!"
+msgstr "Вашето изображение е добавено към списъка!"
+
+msgid "Changes saved!"
+msgstr "Промените са запазени!"
+
+msgid "You can define more than one administrator for this Jappix node. You can also change a password with this tool."
+msgstr "Можете да изберете повече от един администратор за този Jappix възел. Също така можете да промените парола чрез този инструмент/помощник."
+
+msgid "Update your Jappix node with this tool, or check if a new one is available. Informations about the latest version are also displayed (in english)."
+msgstr "С този инструмент/помощник можете да обновите версията на вашия Jappix възел, или да проверите дали е налична нова версия. Информация относно най-новата версия също се показва (на английски)."
+
+msgid "Access statistics"
+msgstr "Достъп до статистиките"
+
+msgid "Share statistics"
+msgstr "Споделяне на статистиките"
+
+msgid "Other statistics"
+msgstr "Други статистики"
+
+msgid "January"
+msgstr "януари"
+
+msgid "February"
+msgstr "февруари"
+
+msgid "March"
+msgstr "март"
+
+msgid "April"
+msgstr "април"
+
+msgid "May"
+msgstr "май"
+
+msgid "June"
+msgstr "юни"
+
+msgid "July"
+msgstr "юли"
+
+msgid "August"
+msgstr "август"
+
+msgid "September"
+msgstr "септември"
+
+msgid "October"
+msgstr "октомври"
+
+msgid "November"
+msgstr "ноември"
+
+msgid "December"
+msgstr "декември"
+
+msgid "Monday"
+msgstr "понеделник"
+
+msgid "Tuesday"
+msgstr "вторник"
+
+msgid "Wednesday"
+msgstr "сряда"
+
+msgid "Thursday"
+msgstr "четвъртък"
+
+msgid "Friday"
+msgstr "петък"
+
+msgid "Saturday"
+msgstr "събота"
+
+msgid "Sunday"
+msgstr "неделя"
+
+msgid "Total"
+msgstr "Общо"
+
+msgid "Cache"
+msgstr "Кеш (cache)"
+
+msgid "Logs"
+msgstr "Дневници (logs)"
+
+msgid "Music"
+msgstr "Музика"
+
+msgid "Backgrounds"
+msgstr "Фонове"
+
+msgid "Share"
+msgstr "Споделяне"
+
+msgid "Background"
+msgstr "Фон"
+
+msgid "Notice"
+msgstr "Бележка"
+
+msgid "Your design preferences have been saved!"
+msgstr "Предпочитанията ви за дизайна са запазени!"
+
+msgid "Please check your inputs: something is missing!"
+msgstr "Моля, проверете своите входни данни: нещо липсва!"
+
+msgid "Change your Jappix node background with this tool. You can either set a custom color or an uploaded image. Let your creativity flow!"
+msgstr "Променете фона на вашия Jappix възел с този инструмент. Можете или да сложите цвят по избор за фон, или да използвате качено изображение за фон. Нека вашата креативност се лее!"
+
+msgid "Use default background"
+msgstr "Използване на фона по подразбиране (фабричния фон)"
+
+msgid "Use your own image"
+msgstr "Използване на ваше изображение"
+
+msgid "Select a background to use and change the display options."
+msgstr "Изберете фона, който ще използвате, и променете настройките за визуализация."
+
+msgid "Use your own color"
+msgstr "Използване на цвят по ваш избор"
+
+msgid "Type the hexadecimal color value you want to use as a background."
+msgstr "Въведете шестнадесетичната (HTML hex) стойност на цвета, който искате да използвате за фон."
+
+msgid "Manage backgrounds"
+msgstr "Управление на фоновете"
+
+msgid "You can add a new background to the list with this tool. Please send a valid image."
+msgstr "Можете да добавите нов фон към списъка с помощта на този инструмент/помощник. Моля, качете валидно изображение."
+
+msgid "If you want to remove some backgrounds, use the browser below."
+msgstr ""
+
+msgid "Define a homepage notice for all your users, such as a warn, an important message or an advert with this tool."
+msgstr "С този инструмент/помощник можете да дефинирате съдържанието на бележка (за показване на основната страница на Jappix възела ви), например предупреждение, важно съобщение или реклама."
+
+msgid "Simple notice"
+msgstr "Проста бележка"
+
+msgid "This notice only needs simple text to be displayed, but no code is allowed!"
+msgstr "Това известие изисква визуализацията само на прост текст, но не е позволена употребата на код в него!"
+
+msgid "Advanced notice"
+msgstr "Разширена бележка"
+
+msgid "You can customize your notice with embedded HTML, CSS and JavaScript, but you need to code the style."
+msgstr "Можете да промените по вкуса ви бележката чрез вградени (embedded) HTML, CSS и JavaScript, но трябва сами да кодирате (напишете кода) на стила."
+
+msgid "Available updates"
+msgstr "Обновления (ъпдейти) на разположение"
+
+msgid "What's new?"
+msgstr "Какво ново?"
+
+msgid "Your storage folders are not writable, please apply the good rights!"
+msgstr "Вашите папките/директории хранилища не позволяват запис в тях, моля, приложете правилните правомощия/свойства за папките!"
+
+msgid "%1s may cause problems to the proxy, please increase %2s value up to %3s!"
+msgstr "%1s може да предизвика проблеми на проксито (сървъра-посредник), моля, увеличете стойността %2s до %3s!"
+
+msgid "You are using a development version of Jappix. Update it through our repository by executing: %s."
+msgstr "Използвате версия на Jappix за разработчици (т.е. не стабилна версия за крайни потребители, а нестабилна версия за разработчици). Можете да обновите Jappix чрез нашето хранилище, като изпълните командата: %s."
+
+msgid "A new Jappix version is available! Check what is new and launch the update!"
+msgstr "Налична е нова версия на Jappix! Проверете какво ново има и пуснете да се инсталира обновлението (ъпдейта)!"
+
+msgid "Your version is out to date. Update it now to %s by clicking here!"
+msgstr "Използвате остаряла версия. Можете да обновите Jappix до по-новата налична версия (%s), като натиснете тук!"
+
+msgid "Your version seems to be up to date, but you can check updates manually by clicking here."
+msgstr "Вашата версия на програмата изглежда е най-новата налична, но по желание можете да проверявате ръчно за обновления (ъпдейти), като натиснете тук."
+
+msgid "Check for updates"
+msgstr "Проверка за обновления (ъпдейти)"
+
+msgid "Update in progress"
+msgstr "В процес на обновление (ъпдейтване)..."
+
+msgid "Jappix has been updated: you are now running the latest version. Have fun!"
+msgstr "Jappix е обновен: сега използвате най-новата версия. Приятно ползване!"
+
+msgid "The update has failed! Please try again later."
+msgstr "Обновяването е неуспешно! Моля, опитайте отново по-късно!"
+
+msgid "Downloading package..."
+msgstr "Изтегляне на пакета..."
+
+msgid "Removing current Jappix system files..."
+msgstr "Премахване/изтриване на настоящите системни файлове на Jappix..."
+
+msgid "Extracting package..."
+msgstr "Извличане на пакета..."
+
+msgid "Regenerating storage folder tree..."
+msgstr "Презареждане на дървовидната структура на хранилищните папки..."
+
+msgid "Jappix is now up to date!"
+msgstr "Jappix е вече обновен до най-новата версия!"
+
+msgid "Aborted: socket error!"
+msgstr "Прекъсната операция: цокълна (socket) грешка!"
+
+msgid "Aborted: buffer error!"
+msgstr "Неуспешна операция: буферна грешка!"
+
+msgid "Aborted: everything is not writable!"
+msgstr "Неуспех: не всичко е записваемо (writable)!"
+
+msgid "Aborted: could not extract the package!"
+msgstr "Операцията е неуспешна: пакетът не може да се извлече!"
+
+msgid "Visits"
+msgstr "Посещения"
+
+msgid "Daily"
+msgstr "дневно"
+
+msgid "Weekly"
+msgstr "седмично"
+
+msgid "Monthly"
+msgstr "месечно"
+
+msgid "Yearly"
+msgstr "годишно"
+
+msgid "Size"
+msgstr "Големина"
+
+msgid "Clean everything"
+msgstr "Изчистване на всичко/-и"
+
+msgid "Purge cache"
+msgstr "Изтриване на кеша (cache)"
+
+msgid "Purge logs"
+msgstr "Изтриване на дневниците (logs)"
+
+msgid "Purge updates"
+msgstr "Изтриване/очистване на обновления"
+
+msgid "The storage folder you wanted to clean is now empty!"
+msgstr "Папката за съхранение, която искахте да прочистите, е опразнена!"
+
+msgid "Keep your Jappix node fresh and fast, clean the storage folders regularly!"
+msgstr "Поддържайте вашия Jappix възел свеж и бърз като прочиствате хранилищните папки често!"
+
+msgid "Upload your music (Ogg Vorbis, MP3 or WAV) to be able to listen to it in Jappix!"
+msgstr "Качете (ъплоуднете) ваша музика (позволени файлови формати: Ogg Vorbis, MP3 или WAV), за да можете да я слушате в Jappix."
+
+msgid "The file you want to upload must be smaller than %s."
+msgstr "Файлът, който искате да качите (ъплоуднете) трябва да е по-малък от %s."
+
+msgid "Stay tuned in what your users store on your server and remove undesired content with this tool."
+msgstr "Следете какво потребителите ви съхраняват на вашия сървър и премахвайте/изтривайте нежелателно съдържание чрез този инструмент/помощник."
+
+msgid "Title"
+msgstr "Заглавие"
+
+msgid "Artist"
+msgstr "Изпълнител/автор"
+
+msgid "Album"
+msgstr "Албум"
+
+msgid "File"
+msgstr "Файл"
+
+msgid "Upload"
+msgstr "Качване"
+
+msgid "The folder is empty."
+msgstr "Тази папка/директория е празна."
+
+msgid "The music could not be received, please retry!"
+msgstr "Музикалният файл не може да бъде получен, моля, пробвайте отново!"
+
+msgid "This is not a valid music file, please encode in Ogg Vorbis, MP3 or WAV!"
+msgstr "Това е невалиден музикален (аудио) файл, моля, прекодирайте (транскодирайте) файла към формати като Ogg Vorbis, MP3 или WAV!"
+
+msgid "Your music has been added!"
+msgstr "Музиката ви е добавена!"
+
+msgid "The selected elements have been removed."
+msgstr "Избраните елементи са премахнати/изтрити."
+
+msgid "You must select elements to remove!"
+msgstr "Трябва да изберете елементи за премахване!"
+
+msgid "Add a new user with this tool, or change a password (type an existing username). Please submit a strong password!"
+msgstr "С този инструмент можете да добавите нов потребител или да промените парола (за това е нужно да въведете потребителското име/псевдоним на съществуващ потребител). Моля, използвайте силна (сигурна) парола!"
+
+msgid "Manage"
+msgstr "Управление"
+
+msgid "List"
+msgstr "Списък"
+
+msgid "Remove users with this tool. Note that you cannot remove an user if he is the only one remaining."
+msgstr "С този инструмент/помощник можете да премахвате/изтривате потребители. Обърнете внимание на това, че не можете да премахнете потребител от системата, ако той е единственият съществуващ/вписан."
+
+msgid "The user has been added!"
+msgstr "Потребителят е добавен!"
+
+msgid "The chosen users have been removed."
+msgstr "Избраните потребители са премахнати."
+
+msgid "You must select one or more users to be removed!"
+msgstr "Трябва да изберете един или повече потребители, които искате да премахнете от списъка!"
+
+msgid "Yesterday"
+msgstr "вчера"
+
+msgid "%s days ago"
+msgstr "преди %s дни"
+
+msgid "User currently active"
+msgstr "Потребителят е активен в момента"
+
+msgid "Last seen: %s"
+msgstr "Последно видян(и): %s"
+
+msgid "Inactive since: %s"
+msgstr "Неактивен от: %s"
+
+msgid "Your friend seems not to have received your message(s)!"
+msgstr "Приятелят ви изглежда не е получил вашето съобщение/-я!"
+
+msgid "Static content server"
+msgstr "Статичен сървър за съдържанието"
+
+msgid "This is the static content server for %1s, “%2s”."
+msgstr "Това е статичният сървър за съдържанието за %1s, “%2s”."
+
+msgid "Suggested friends"
+msgstr "Предложени приятели"
+
+msgid "Check all"
+msgstr "Маркиране/избиране на всички"
+
+msgid "Uncheck all"
+msgstr "Размаркиране/премахване на всички"
+
+msgid "Choose"
+msgstr "Избиране"
+
+msgid "List name"
+msgstr "Име на списъка"
+
+msgid "Allow"
+msgstr "Позволяване"
+
+msgid "Deny"
+msgstr "Отказване/отхвърляне"
+
+msgid "Group"
+msgstr "Група"
+
+msgid "Subscription"
+msgstr "Абонамент"
+
+msgid "Both"
+msgstr "И двамата/двете"
+
+msgid "From"
+msgstr "От"
+
+msgid "Everybody"
+msgstr "Всички"
+
+msgid "Send messages"
+msgstr "Изпращане на съобщения"
+
+msgid "Send queries"
+msgstr "Изпращане на заявки"
+
+msgid "See my status"
+msgstr "Разглеждане на моя статус"
+
+msgid "Send his/her status"
+msgstr "Изпращане на неговия/нейния статус"
+
+msgid "Everything"
+msgstr "Всичко/-и"
+
+msgid "Item"
+msgstr "Номер"
+
+msgid "Order"
+msgstr "Ред"
+
+msgid "Active for this session"
+msgstr "Активен за тази сесия"
+
+msgid "Always active"
+msgstr "Винаги активен"
+
+msgid "User directory"
+msgstr "Потребителска директория"
+
+msgid "Search a friend"
+msgstr "Търсене за приятел"
+
+msgid "The feature requested is not implemented by the recipient or server and therefore cannot be processed."
+msgstr "Изисканата възможност не е имплементирана от получателя или сървъра и поради това не може да бъде обработена."
+
+msgid "This is a repeat from %s"
+msgstr "Това е повторение от %s"
+
+msgid "Loading comments..."
+msgstr "Зареждане на коментарите..."
+
+msgid "Type your comment here..."
+msgstr "Въведете вашия коментар тук..."
+
+msgid "Could not get the comments!"
+msgstr "Коментарите не могат да бъдат заредени!"
+
+msgid "Show comments"
+msgstr "Показване на коментарите"
+
+msgid "Send him/her a message"
+msgstr "Изпращане на съобщение за него/нея"
+
+msgid "Start a chat with him/her"
+msgstr "Започване на чат с него/нея"
+
+msgid "Media integration"
+msgstr "Медийна интеграция"
+
+msgid "Comments locked!"
+msgstr "Коментарите са заключени!"
+
+msgid "Type something you want to share with your friends..."
+msgstr "Въведете нещо, което бихте искали да споделите с вашите приятели..."
+
+msgid "changed his/her nickname to %s"
+msgstr "промени своя псевдоним на %s"
+
+msgid "commented an item you follow: “%s”."
+msgstr ""
+
+msgid "Hide"
+msgstr ""
+
+msgid "liked your post: “%s”."
+msgstr ""
+
+msgid "quoted you somewhere: “%s”."
+msgstr ""
+
+msgid "published on your wall: “%s”."
+msgstr ""
+
+msgid "tagged you in a photo (%s)."
+msgstr ""
+
+msgid "tagged you in a video (%s)."
+msgstr ""
+
+msgid "Show"
+msgstr ""
+
+msgid "Need help? You'd better read our documentation page about how to fill this form!"
+msgstr ""
+
+msgid "Pubsub host"
+msgstr ""
+
+msgid "Jappix is a great social platform, that you can access wherever you are, whenever you want and communicate with whovever you want."
+msgstr ""
+
+msgid "Manager link"
+msgstr ""
+
+msgid "User uploads server"
+msgstr ""
+
+msgid "This is the user uploads server for %1s, “%2s”."
+msgstr ""
+
+msgid "Logo"
+msgstr ""
+
+msgid "You can set your own service logo to replace the default one. Take care of the size and the main color of each logo!"
+msgstr ""
+
+msgid "Upload each logo with the recommended maximum pixel size."
+msgstr ""
+
+msgid "This is not a valid image, please use the PNG format!"
+msgstr ""
+
+msgid "Your service logo has been successfully changed!"
+msgstr ""
+
+msgid "Your logo format must be PNG. Leave a field empty and the logo will not be changed."
+msgstr ""
+
+msgid "Remove this logo"
+msgstr ""
+
+msgid "View this logo"
+msgstr ""
+
+msgid "Send a file"
+msgstr ""
+
+msgid "Once uploaded, your friend will be prompted to download the file you sent."
+msgstr ""
+
+msgid "Groupchats to join"
+msgstr ""
+
+msgid "Purge sent files"
+msgstr ""
+
+msgid "would like to send you a file: “%s”."
+msgstr ""
+
+msgid "has accepted to received your file: “%s”."
+msgstr ""
+
+msgid "has rejected to receive your file: “%s”."
+msgstr ""
+
+msgid "could not receive your file: “%s”."
+msgstr ""
+
+msgid "has received a file exchange request: “%s”."
+msgstr ""
+
+msgid "Available shortcuts:"
+msgstr ""
+
+msgid "%s removes the chat logs"
+msgstr ""
+
+msgid "%s joins a groupchat"
+msgstr ""
+
+msgid "%s closes the chat"
+msgstr ""
+
+msgid "%s shows the user profile"
+msgstr ""
+
+msgid "%s sends a message to the room"
+msgstr ""
+
+msgid "%s changes your nickname"
+msgstr ""
+
+msgid "%s sends a message to someone in the room"
+msgstr ""
+
+msgid "%s changes the room topic"
+msgstr ""
+
+msgid "%s kicks an user of the room"
+msgstr ""
+
+msgid "%s bans an user of the room"
+msgstr ""
+
+msgid "%s invites someone to join the room"
+msgstr ""
+
+msgid "Social channel, chat and more."
+msgstr ""
+
+msgid "Create your public profile."
+msgstr ""
+
+msgid "A mini-chat for your website."
+msgstr ""
+
+msgid "Get Jappix, get support."
+msgstr ""
+
+msgid "Statistics around Jappix."
+msgstr ""
+
+msgid "Download Jappix for free."
+msgstr ""
+
+msgid "Find a public Jappix node."
+msgstr ""
+
+msgid "Public profile"
+msgstr ""
+
+msgid "Your profile anywhere on the Web."
+msgstr ""
+
+msgid "%s is a Jappix.com service which makes your XMPP profile public. It is easier to share it. No XMPP account is required to view your social channel, your current position and your contact details."
+msgstr ""
+
+msgid "Furthermore, every picture you post in your social channel is added to a beautiful picture timeline. You can now view the pictures you shared year by year."
+msgstr ""
+
+msgid "You can also use your XMPP avatar as a single avatar for every website, blog and forum you use. When you change it on XMPP, the new avatar appears everywhere. What a genious improvement!"
+msgstr ""
+
+msgid "Yay, let's create my public profile!"
+msgstr ""
+
+msgid "Enable my public profile"
+msgstr ""
+
+#~ msgid "Jappix is a non-profit social platform, that you can access wherever you are, whenever you want and communicate with whovever you want."
+#~ msgstr "Jappix (Джапикс) е некомерсиална (non-profit) социална платформа, която е достъпно навсякъде [стига да имате компютър и активна Интернет връзка], по всяко време, когато пожелаете, и с която можете да комуникирате с когото поискате."
+
+#~ msgid "See"
+#~ msgstr ""
+
+#~ msgid "Use default logo"
+#~ msgstr ""
+
+#~ msgid "Use your own logo"
+#~ msgstr ""
+
+#~ msgid "The recommended image format is PNG. Leave a field empty and the logo will not be changed."
+#~ msgstr ""
diff --git a/jappixmini/jappix/lang/cs/LC_MESSAGES/main.mo b/jappixmini/jappix/lang/cs/LC_MESSAGES/main.mo
new file mode 100644
index 00000000..6b1bb2dc
Binary files /dev/null and b/jappixmini/jappix/lang/cs/LC_MESSAGES/main.mo differ
diff --git a/jappixmini/jappix/lang/cs/LC_MESSAGES/main.po b/jappixmini/jappix/lang/cs/LC_MESSAGES/main.po
new file mode 100644
index 00000000..9063b52d
--- /dev/null
+++ b/jappixmini/jappix/lang/cs/LC_MESSAGES/main.po
@@ -0,0 +1,1870 @@
+# Czech translations for Jappix package.
+# This file is distributed under the same license as the Jappix package.
+# This file was translated from CodingTeam at <http://codingteam.net/>.
+msgid ""
+msgstr ""
+"Project-Id-Version: Jappix\n"
+"PO-Revision-Date: 2012-01-16 21:26+0100\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"POT-Creation-Date: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+
+msgid "JavaScript is missing in your web browser, so that you will not be able to launch Jappix! Please fix this."
+msgstr "Ve vašem prohlížeči chybí JavaScript, takže nebude možné spustit Jappix! Prosím napravte to."
+
+msgid "An open social network"
+msgstr "Otevřená sociální síť"
+
+msgid "Jappix has been interrupted by a network issue, a bug or bad login (check that you entered the right credentials), sorry for the inconvenience."
+msgstr "Činnost Jappixe byla přerušena buď chybou ve spojenim , programu nebo nesprávnými přihlašovacími údaji (zkontrolujte vaše přihlašovací údaje), omlouváme se za komplikace"
+
+msgid "The element list on this server could not be obtained!"
+msgstr "Seznam položek na tomto cloud serveru není možné získat!"
+
+msgid "Your password has been changed, now you can connect to your account with your new login data."
+msgstr "Vaše heslo bylo změněno, nyní se můžete přihlásit k vašemu účtu s novými údaji."
+
+msgid "Your XMPP account has been removed, bye!"
+msgstr "Váš XMPP účet byl zrušen, nashledanou!"
+
+msgid "You have been logged out of your XMPP account, have a nice day!"
+msgstr "Byli jste odhlášeni z vašeho XMPP účtu, přejeme pěkný den!"
+
+msgid "The room you joined seems not to exist. You should create it!"
+msgstr "Zdá se, že místnost do které vstoupujete neexistuje. Nejprve jí založte!"
+
+msgid "The groupchat has been removed, now someone else will be able to recreate it."
+msgstr "Skupinový rozhovor byl odstraněn, nyí ho může vytvořit někdo jiný."
+
+msgid "The user that you want to reach is not present in the room."
+msgstr "Uživatel, kterého chcete zastihnout se v této místnosti nenachází."
+
+msgid "Please enter the group chat address to join."
+msgstr "Prosím, vložte adresu skupinového rozhovoru ke kterému se chcete připojit."
+
+msgid "Please enter your nickname to join %s."
+msgstr "Prosím, vložte přezdívku pro připojení do %s."
+
+msgid "This room (%s) is protected with a password."
+msgstr "Místnost (%s) je chráněna heslem."
+
+msgid "Your browser is out of date!"
+msgstr "Váš prohlížeš je zastaralý."
+
+msgid "Last %s version is better!"
+msgstr "Poslední %s verze je lepší!"
+
+msgid "Login"
+msgstr "Přihlášení"
+
+msgid "Register"
+msgstr "Registrace"
+
+msgid "Here we go!"
+msgstr "Pojďme na to!"
+
+msgid "Server"
+msgstr "Server"
+
+msgid "Password"
+msgstr "Heslo"
+
+msgid "Remember me"
+msgstr "Zapamatuj si mě"
+
+msgid "This tool has been disabled, you cannot use it!"
+msgstr "Tato možnost je zakázána, nelze jí použít!"
+
+msgid "Due to a network issue, you were disconnected. What do you want to do now?"
+msgstr "Byli jste odhlášeni, potože se vyskytly potíže se sítí. Co si přejete udělat?"
+
+msgid "Reconnect"
+msgstr "Znovu připojit"
+
+msgid "Messages"
+msgstr "Zprávy"
+
+msgid "Profile"
+msgstr "Profil"
+
+msgid "Options"
+msgstr "Nastavení"
+
+msgid "Disconnect"
+msgstr "Odpojit se"
+
+msgid "Filter"
+msgstr "Filtr"
+
+msgid "Add a friend"
+msgstr "Přidat kamaráda"
+
+msgid "Your groupchats"
+msgstr "Vaše skupinové rozhovory"
+
+msgid "Manage your favorite groupchats"
+msgstr "Spravovat vaše blíbené skupinové rozhovory"
+
+msgid "More stuff"
+msgstr "Další možnosti"
+
+msgid "Show all friends"
+msgstr "Zobrazit všechny kamarády"
+
+msgid "Only show connected friends"
+msgstr "Zobrazit pouze připojené kamarády"
+
+msgid "Message archives"
+msgstr "Archiv zpráv"
+
+msgid "Date"
+msgstr "Datum"
+
+msgid "Please select a friend to view the chat history."
+msgstr "Prosím, vyperte kamaráda pro zobrazení historie rozhovoru."
+
+msgid "Nothing found for: %s"
+msgstr "Žádný výsledek pro: %s"
+
+msgid "A short message?"
+msgstr "Krátká zpráva?"
+
+msgid "How are you?"
+msgstr "Jak se vede ?"
+
+msgid "What are you doing?"
+msgstr "Co děláš?"
+
+msgid "Join a chat"
+msgstr "Zahájit rozhovor"
+
+msgid "Status"
+msgstr "Stav"
+
+msgid "Available"
+msgstr "Přítomen"
+
+msgid "Talkative"
+msgstr "Hovorný"
+
+msgid "Away"
+msgstr "Pryč"
+
+msgid "Not available"
+msgstr "Nedostupný"
+
+msgid "Busy"
+msgstr "Nerušit"
+
+msgid "Mood"
+msgstr "Nálada"
+
+msgid "None"
+msgstr "Neuvedena"
+
+msgid "Crazy"
+msgstr "Bláznivý"
+
+msgid "Excited"
+msgstr "Vzrušený"
+
+msgid "Playful"
+msgstr "Hravý"
+
+msgid "Happy"
+msgstr "Šťastný"
+
+msgid "Shocked"
+msgstr "Šokovaný"
+
+msgid "Hot"
+msgstr "Nažhavený"
+
+msgid "Sad"
+msgstr "Smutný"
+
+msgid "Amorous"
+msgstr "Zamilovaný"
+
+msgid "Confident"
+msgstr "Důvěřivý"
+
+msgid "Activity"
+msgstr "Činnost"
+
+msgid "Chores"
+msgstr "Nakupuje"
+
+msgid "Drinking"
+msgstr "Pije"
+
+msgid "Eating"
+msgstr "Jí"
+
+msgid "Exercising"
+msgstr "Cvíčí"
+
+msgid "Grooming"
+msgstr "Pečuje"
+
+msgid "Appointment"
+msgstr "Schůzka"
+
+msgid "Inactive"
+msgstr "Nečinný"
+
+msgid "Relaxing"
+msgstr "Relaxuje"
+
+msgid "Talking"
+msgstr "Hovoří"
+
+msgid "Traveling"
+msgstr "Cestuje"
+
+msgid "Working"
+msgstr "Pracuje"
+
+msgid "View profile"
+msgstr "Zobrazit profil"
+
+msgid "Repeat this notice"
+msgstr "Opakovat toto upozornění"
+
+msgid "Remove this notice"
+msgstr "Odstranit upozornění"
+
+msgid "Your profile"
+msgstr "Váš profil"
+
+msgid "Identity"
+msgstr "Osobní údaje"
+
+msgid "Profile image"
+msgstr "Fotografie k profilu"
+
+msgid "Others"
+msgstr "Ostatní"
+
+msgid "Personal"
+msgstr "Osobní"
+
+msgid "Complete name"
+msgstr "Celé jméno"
+
+msgid "Nickname"
+msgstr "Přezdívka"
+
+msgid "First name"
+msgstr "Jméno"
+
+msgid "Last name"
+msgstr "Příjmení"
+
+msgid "Date of birth"
+msgstr "Datum narození"
+
+msgid "Contact"
+msgstr "Kontakt"
+
+msgid "E-mail"
+msgstr "E-mail"
+
+msgid "Phone"
+msgstr "Telefon"
+
+msgid "Website"
+msgstr "Webová stránka"
+
+msgid "Current"
+msgstr "Současná"
+
+msgid "Delete"
+msgstr "Smazat"
+
+msgid "What a pity! You have no profile image defined in your identity card!"
+msgstr "Jaká škoda! Nemáte nastavenou fotografii u profilu ve vaší vizitce!"
+
+msgid "Address"
+msgstr "Adresa"
+
+msgid "Street"
+msgstr "Ulice"
+
+msgid "City"
+msgstr "Město"
+
+msgid "Postal code"
+msgstr "PSČ"
+
+msgid "Country"
+msgstr "Země"
+
+msgid "Biography"
+msgstr "O mě"
+
+msgid "Important notice"
+msgstr "Důležité upozornění"
+
+msgid "Be careful of the information you write into your profile, because it could be accessed by everyone (even someone you don't want to)."
+msgstr "Buďte opatrní, informace, které vyplníte v profilu jsou přístupné každému (i tomu, komu nechcete)."
+
+msgid "Not everything is private on XMPP; this is one of those things, your public profile (vCard)."
+msgstr "Není všechno v XMPP jen soukromé; toto je jednou z těch věcí, které nejsou, váš veřejný profil (vCard)."
+
+msgid "It is strongly recommended to upload a profile image (%s maximum), like a picture of yourself, because that makes you easily recognizable by your friends."
+msgstr "Vřele doporučujeme nahrát obrázek k profilu (%s maximálně), například vaší fotografii, aby vás kamarádi lépe poznali. "
+
+msgid "Save"
+msgstr "Uložit"
+
+msgid "Cancel"
+msgstr "Zrušit"
+
+msgid "Edit options"
+msgstr "Upravit nastavení"
+
+msgid "Channel"
+msgstr "Kanál"
+
+msgid "Commands"
+msgstr "Příkazy"
+
+msgid "Sounds"
+msgstr "Zvuky"
+
+msgid "Privacy"
+msgstr "Soukromí"
+
+msgid "Message archiving"
+msgstr "Archivace zpráv"
+
+msgid "Store a history of your chats"
+msgstr "Ukládat historii vašich rozhovorů"
+
+msgid "Geolocation"
+msgstr "Geologická poloha"
+
+msgid "Empty"
+msgstr "Odstranit"
+
+msgid "Empty channel"
+msgstr "Vymazat kanál"
+
+msgid "Persistent"
+msgstr "Natrvalo"
+
+msgid "Maximum notices"
+msgstr "Maximum upozornění"
+
+msgid "Account"
+msgstr "Účet"
+
+msgid "Change password"
+msgstr "Změnit heslo"
+
+msgid "Delete account"
+msgstr "Zrušit účet"
+
+msgid "Old"
+msgstr "Staré"
+
+msgid "New (2 times)"
+msgstr "Nové (2 krát)"
+
+msgid "Continue"
+msgstr "Pokračovat"
+
+msgid "To"
+msgstr "Komu"
+
+msgid "Close"
+msgstr "Zavřít"
+
+msgid "unknown"
+msgstr "neznámá"
+
+msgid "Unavailable"
+msgstr "Odpojen"
+
+msgid "is now"
+msgstr ""
+
+msgid "Please wait while your avatar is uploaded..."
+msgstr "Prosím čekejte, než se váš avatar nahraje ..."
+
+msgid "Here it is! A new beautiful profile image!"
+msgstr "Zde je! Nový krásný obrázek profilu!"
+
+msgid "The image file is not supported or has a bad size."
+msgstr "Soubor s obrázkem není podporován nebo je příliš velký."
+
+msgid "Reply"
+msgstr "Odpovědět"
+
+msgid "Error"
+msgstr "Chyba"
+
+msgid "Click here to solve the error"
+msgstr "KLikněte zde pro řešení problému"
+
+msgid "You"
+msgstr "Ty"
+
+msgid "Remove"
+msgstr "Odstranit"
+
+msgid "Rename"
+msgstr "Přejmenovat"
+
+msgid "Hi, I am %s, I would like to add you as my friend."
+msgstr "Ahoj, Já jsem %s, chci si Tě přidat jako kamaráda."
+
+msgid "Smiley insertion"
+msgstr "Vložit smajlíka"
+
+msgid "Change style"
+msgstr "Písmo"
+
+msgid "Text in bold"
+msgstr "Tučné"
+
+msgid "Text in italic"
+msgstr "Kurzíva"
+
+msgid "Underlined text"
+msgstr "Podtržené"
+
+msgid "Save chat"
+msgstr "Uložit rozhovor"
+
+msgid "Click on the following link to get the chat log, and wait. Then click again to get the file."
+msgstr "Klikni na nasledující odkaz pro vytvoření logu rozhovoru, a počkej. Potom klikni znovu ke stažení souboru."
+
+msgid "This chat is empty!"
+msgstr "Tento rozhovor je prázdný!"
+
+msgid "Generate file!"
+msgstr "Vygeneruj soubor!"
+
+msgid "Download file!"
+msgstr "Stažení souboru!"
+
+msgid "Clean current chat"
+msgstr "Vyčistit probíhající rozhovor"
+
+msgid "View chat history"
+msgstr "Zobrazit historii rozhovoru"
+
+msgid "Show user profile"
+msgstr "Zobrazit profil uživatele"
+
+msgid "Add this contact to your friends"
+msgstr "Přidej tento kontakt mezi své kamarády"
+
+msgid "Add this groupchat to your favorites"
+msgstr "Přidej tento skupinový rozhovor do oblíbených"
+
+msgid "All tabs"
+msgstr "Všechny listy"
+
+msgid "Close this tab"
+msgstr "Zavřít tento list"
+
+msgid "no subject defined for this room."
+msgstr "Není nastaven předmět pro tuto místnost"
+
+msgid "Administration panel for this room"
+msgstr "Panel administrace pro tuto místnost"
+
+msgid "Moderators"
+msgstr "Moderátoři"
+
+msgid "Participants"
+msgstr "Členové"
+
+msgid "Visitors"
+msgstr "Návštěvníci"
+
+msgid "Manage favorite rooms"
+msgstr "Spravovat oblíbené skupinové rozhovory"
+
+msgid "Change favorites"
+msgstr "Změnit oblíbené"
+
+msgid "Search a room"
+msgstr "Najít místnost"
+
+msgid "Select a favorite"
+msgstr "Vyberte oblíbenou"
+
+msgid "Getting the name..."
+msgstr "Získávám jméno ..."
+
+msgid "Gateway"
+msgstr "Brána"
+
+msgid "Name"
+msgstr "Jméno"
+
+msgid "Room"
+msgstr "Místnost"
+
+msgid "Add"
+msgstr "Přidat"
+
+msgid "Edit"
+msgstr "Upravit"
+
+msgid "Search a room on"
+msgstr "Najít místnost na"
+
+msgid "No room found on this server."
+msgstr "Na tomto serveru nebyla nalezena žádná místnost."
+
+msgid "Service discovery"
+msgstr "Zjištění služeb"
+
+msgid "Server to query"
+msgstr "Prohledávaný server"
+
+msgid "Sorry, but the entity didn't return any result!"
+msgstr "Promiňte, ale hledaný výraz nebyl nalezen!"
+
+msgid "Accounts"
+msgstr "Účty"
+
+msgid "Authentications"
+msgstr "Ověřování"
+
+msgid "Automation"
+msgstr "Automaticky"
+
+msgid "Clients"
+msgstr "Klienti"
+
+msgid "Collaboration"
+msgstr "Spolupráce"
+
+msgid "Components"
+msgstr "Komponenty"
+
+msgid "Rooms"
+msgstr "Místnosti"
+
+msgid "Directories"
+msgstr "Adresáře"
+
+msgid "Gateways"
+msgstr "Brány"
+
+msgid "News"
+msgstr "Novinky"
+
+msgid "Hierarchy"
+msgstr "Hierarchie"
+
+msgid "Proxies"
+msgstr "Proxy server"
+
+msgid "Publication/Subscription"
+msgstr "Publikování/Odebírání"
+
+msgid "Storage"
+msgstr "Úložiště"
+
+msgid "Service offline or broken"
+msgstr "Služba je vypnutá nebo nedostupná"
+
+msgid "Your inbox"
+msgstr "Vaše schránka"
+
+msgid "Available actions"
+msgstr "Dostupné akce"
+
+msgid "Clean"
+msgstr "Vyčistit"
+
+msgid "New"
+msgstr "Nová"
+
+msgid "Received"
+msgstr "Přijaté"
+
+msgid "Subject"
+msgstr "Předmět"
+
+msgid "Content"
+msgstr "Obsah"
+
+msgid "Send message"
+msgstr "Odeslat zprávu"
+
+msgid "Your inbox is empty."
+msgstr "Vaše schránka je prázdná."
+
+msgid "MUC administration"
+msgstr "Administrace MUC"
+
+msgid "You administrate this room"
+msgstr "Spravujte tuto místnost"
+
+msgid "Enter new subject"
+msgstr "Vložte nový přednět"
+
+msgid "Configuration"
+msgstr "Nastavení"
+
+msgid "Authorizations"
+msgstr "Povolení"
+
+msgid "Member list"
+msgstr "Seznam členů"
+
+msgid "Owner list"
+msgstr "Seznam vlastníků"
+
+msgid "Administrator list"
+msgstr "Seznam správců"
+
+msgid "Outcast list"
+msgstr "Seznam nežádoucích"
+
+msgid "Add an input"
+msgstr "Přidej člena"
+
+msgid "Destroy this MUC"
+msgstr "Zrušit tento MUC"
+
+msgid "Yes, let's do it!"
+msgstr "Ano, pojďme na to!"
+
+msgid "Your friend is paying attention to the conversation."
+msgstr "Váš kamarád sleduje rozhovor."
+
+msgid "Your friend is writing a message..."
+msgstr "Váš kamarád píše ..."
+
+msgid "Your friend stopped writing a message."
+msgstr "Váš kamarád přestal psát."
+
+msgid "Your friend is doing something else."
+msgstr "Váš kamarád se věnuje něčemu jinému."
+
+msgid "Your friend closed the chat."
+msgstr "Váš kamarád ukončil rozhovor."
+
+msgid "Requesting this service..."
+msgstr "Žádám o tuto službu ..."
+
+msgid "Loading"
+msgstr "Načítání"
+
+msgid "joined the chat room"
+msgstr "Vstoupit do místnosti"
+
+msgid "left the chat room"
+msgstr "opustit místnost"
+
+msgid "no status"
+msgstr "bez statusu"
+
+msgid "has been kicked"
+msgstr "byl vyloučen"
+
+msgid "has been banned"
+msgstr "byl zakázán"
+
+msgid "no reason"
+msgstr "bez důvodu"
+
+msgid "Communicate with the entire world!"
+msgstr "Komunikujte s celým světem!"
+
+msgid "It allows you to get in touch with the millions of users who currently use the XMPP network like you do with Jappix. Join the community and stay free!"
+msgstr "Umožní vám být v kontaktu s milióny uživateli, kteří právě využívají XMPP síť stejně jako vy s Jabbixem. Přidpojte se ke komunitě a zůstaňte svobodní."
+
+msgid "Hi there!"
+msgstr "Ahoj!"
+
+msgid "Welcome on %1s, “%2s”."
+msgstr "Vítejte na %1s, “%2s”."
+
+msgid "Login to your existing XMPP account or create a new one for free!"
+msgstr "Přihlaste se ke svému již existujícímu XMPP účtu nebo si zaregistrujte zdarma nový!"
+
+msgid "Jappix is an open-source project from PostPro, a non-profit organization which provides us a great help."
+msgstr "Jappix je open-source projekt od PostPro, neziskové organizace, která poskytuje velkou podporu."
+
+msgid "Login to your existing XMPP account. You can also use the %s to join a groupchat."
+msgstr "Přihlaš se ke svému již existujícímu XMPP účtu. Také můžeš použít %s pro připojení ke skupinovému rozhovoru."
+
+msgid "Previous"
+msgstr "Předchozí"
+
+msgid "General"
+msgstr "Obecné"
+
+msgid "Advanced"
+msgstr "Rozšířené"
+
+msgid "Resource"
+msgstr "Zdroj"
+
+msgid "Priority"
+msgstr "Priorita"
+
+msgid "Low"
+msgstr "Nízká"
+
+msgid "Medium"
+msgstr "Střední"
+
+msgid "High"
+msgstr "Vysoká"
+
+msgid "Enter the groupchat you want to join and the nick you want to have. You can also go back to the %s."
+msgstr "Zadejte název skupinového rozhovoru ke kterému se chcete připojit a zvolte si přezdívku. Nebo se můžete vrátit na %s."
+
+msgid "login page"
+msgstr "přihlašovací stránku"
+
+msgid "Share this link with your friends:"
+msgstr "Sdílejte tento odkaz s kamarády:"
+
+msgid "Register a new XMPP account to join your friends on your own social cloud. That's simple!"
+msgstr "Zaregistruj si nový XMPP účet a spoj se s kamarády ve vlastní sociální síti. Je to jednoduché!"
+
+msgid "Required"
+msgstr "Povinné"
+
+msgid "You have been registered, here is your XMPP address:"
+msgstr "Jste zaregistrivání, toto je vaše XMPP adresa:"
+
+msgid "Manager"
+msgstr "Správce"
+
+msgid "Project"
+msgstr "Projekt"
+
+msgid "Encrypted"
+msgstr "Šifrovaně"
+
+msgid "Unencrypted"
+msgstr "Bez šifrování"
+
+msgid "Where are you?"
+msgstr "Kde jsi?"
+
+msgid "What's up with you?"
+msgstr "Co je s tebou?"
+
+msgid "Fetching the social channel..."
+msgstr "Stahuji kanál ..."
+
+msgid "You are synchronized with your network."
+msgstr "Nyní jste synchronizovaný s vaší sítí."
+
+msgid "Cannot send anything: you can only receive notices!"
+msgstr "Nelze nic odesílat: můžete pouze přijímat zprávy!"
+
+msgid "Media viewer"
+msgstr "Prohlížeč médií"
+
+msgid "Browse"
+msgstr "Prohlížet"
+
+msgid "Command"
+msgstr "Příkaz"
+
+msgid "Subscribe"
+msgstr "Registrace"
+
+msgid "Join"
+msgstr "Připojit"
+
+msgid "Automatic"
+msgstr "Automaticky"
+
+msgid "Search"
+msgstr "Hledat"
+
+msgid "No result!"
+msgstr "Nic nenalezeno!"
+
+msgid "No notifications."
+msgstr "Žádné upozornění."
+
+msgid "would like to add you as a friend."
+msgstr "si vás chce přidat jako kamaráda."
+
+msgid "would like you to join this chatroom:"
+msgstr "žádá vás aby jste vstoupili do místnosti."
+
+msgid "Do you accept?"
+msgstr "Souhlasíte?"
+
+msgid "Yes"
+msgstr "Ano"
+
+msgid "No"
+msgstr "Ne"
+
+msgid "would like to get authorization."
+msgstr "žádá o povolení."
+
+msgid "Do you want to see the friends %s suggests you?"
+msgstr "Přejete si vidět kamarády, které vám %s navrhuje?"
+
+msgid "Submit"
+msgstr "Odeslat"
+
+msgid "Client"
+msgstr "Klient"
+
+msgid "System"
+msgstr "Systém"
+
+msgid "Local time"
+msgstr "Místní čas"
+
+msgid "Comments"
+msgstr "Komentáře"
+
+msgid "User profile"
+msgstr "Profil uživatele"
+
+msgid "See his/her position on the globe"
+msgstr "Zobraz jeho/její polohu na zeměkouli"
+
+msgid "Confirm"
+msgstr "Ověřit"
+
+msgid "anonymous mode"
+msgstr "anonymní mód"
+
+msgid "Groups"
+msgstr "Skupiny"
+
+msgid "Unclassified"
+msgstr "Nezařazené"
+
+msgid "Authorize"
+msgstr "Oprávnit"
+
+msgid "Ask for authorization"
+msgstr "Požádat o oprávnění"
+
+msgid "Unblock"
+msgstr "Odblokovat"
+
+msgid "Prohibit"
+msgstr "Zakázat"
+
+msgid "Block"
+msgstr "Blokovat"
+
+msgid "Chat"
+msgstr "Rozhovor"
+
+msgid "Groupchat"
+msgstr "Skupinový rozhovor"
+
+msgid "Jappix Mobile"
+msgstr "Jabbix pro Mobil"
+
+msgid "Desktop"
+msgstr "Počítač"
+
+msgid "Mobile"
+msgstr "Mobil"
+
+msgid "Please wait..."
+msgstr "Čekejte prosím ..."
+
+msgid "Please enable JavaScript"
+msgstr "Prosím povolte JavaScript"
+
+msgid "Your channel"
+msgstr "Váš kanál"
+
+msgid "Channel of"
+msgstr "Kanál uživatele"
+
+msgid "More notices..."
+msgstr "Další upozornění ..."
+
+msgid "Attach a file"
+msgstr "Připojit soubor"
+
+msgid "Send"
+msgstr "Odeslat"
+
+msgid "Unattach the file"
+msgstr "Odebrat soubor"
+
+msgid "An error occured while uploading your file: maybe it is too big (%s maximum) or forbidden!"
+msgstr "Nastala chyba během nahrávání souboru: buď je příliš velký (%s maximálně) nebo není povolen!"
+
+msgid "Authorization failed"
+msgstr "Autorizace se nezdařila"
+
+msgid "Registration failed, please choose a different username"
+msgstr "Registrace se nezdařila, zvolte prosím jiné uživatelské jméno"
+
+msgid "Service unavailable"
+msgstr "Služba je nedostupná"
+
+msgid "Internal server error, try later"
+msgstr "Vnitřní chyba serveru, zkuste později"
+
+msgid "Your form has been sent."
+msgstr "Váš formulář byl odeslán."
+
+msgid "Application"
+msgstr "Aplikace"
+
+msgid "XMPP links"
+msgstr "XMPP odkaz"
+
+msgid "Open XMPP links with Jappix"
+msgstr "Otevřít XMPP odkaz pomocí Jappix"
+
+msgid "changed the subject to:"
+msgstr "změnit předmět na:"
+
+msgid "Welcome!"
+msgstr "Vítejte!"
+
+msgid "Friends"
+msgstr "Kamarádi"
+
+msgid "Welcome on Jappix, your own social cloud!"
+msgstr "Vítejte v Jappix, vaší vlastní sociální síti!"
+
+msgid "Before you start using it, you will have to change some settings, search for friends and complete your profile."
+msgstr "Dříve než jí začnete používat, měli by jste upravit některá nastavení, vyhledat kamarády a vyplnit svůj profil."
+
+msgid "Enable notification sounds"
+msgstr "Povolit upozorňování pomocí zvuků"
+
+msgid "Share your position on the globe"
+msgstr "Sdílet svojí polohu na zeměkouli"
+
+msgid "Offline friends"
+msgstr "Odpojení kamarádi"
+
+msgid "Don't hide offline friends"
+msgstr "Neskrývat odpojené kamarády"
+
+msgid "Use this tool to find your friends on the server you are using right now, or add them later."
+msgstr "Použijte tento nástroj na vyhledání kamarádů na tomto serveru. Nebo je můžete přidat později."
+
+msgid "Great work! Now, you can share Jappix with your friends!"
+msgstr "Skvěle! Nyní můžete sdílet Jappix se svými kamarády!"
+
+msgid "When you will press the save button, the profile editor will be opened. Happy socializing!"
+msgstr "Nyní, když stisknete tlačitko Uložit, následuje otevření editoru vašeho profilu."
+
+msgid "Share Jappix on %s"
+msgstr "Sdílejte Jappix na %s"
+
+msgid "Using Jappix, an open social platform. I am %s!"
+msgstr "Používám Jappix, otevřenou sociální platformu. Jsem %s!"
+
+msgid "Unknown name"
+msgstr "Neznámé jméno"
+
+msgid "Unknown country"
+msgstr "Neznámá země"
+
+msgid "Click to enable"
+msgstr "Klikni pro povolení"
+
+msgid "Click to disable"
+msgstr "Klikni pro zakázání"
+
+msgid "Installation"
+msgstr "Instalace"
+
+msgid "Jappix installation"
+msgstr "Jappix instalace"
+
+msgid "Welcome to the Jappix installation!"
+msgstr "Vítejte v Jappix instalaci!"
+
+msgid "This tool will help you fastly install Jappix, the first full-featured XMPP-based social platform, on your server. You don't even need any technical knowledge."
+msgstr "Tento nástroj vám pomůže rychle nainstalovat Jappix, první plnohodnotnou sociální platformu založenou na XMPP, na váš server. Nebudete dokonce potřebovat žádné technické znalosti."
+
+msgid "Let's have a look at the installation steps:"
+msgstr "Přejděme k instalačním krokům:"
+
+msgid "Welcome"
+msgstr "Vítejte"
+
+msgid "Storage configuration"
+msgstr "Nastavení úložiště"
+
+msgid "Administrator account"
+msgstr "Účet administrátora"
+
+msgid "Main configuration"
+msgstr "Hlavní nastavení"
+
+msgid "Hosts configuration"
+msgstr "Nastavení hostitele"
+
+msgid "Services installation"
+msgstr "Instalace služeb"
+
+msgid "If the current language does not match yours (%1s), you can make Jappix speak %2s it will be saved."
+msgstr "Pokud se tento jazyk (%1s) neshoduje s vaším, můžete nechat Jappix mluvit jiným jazykem %2s. Volba bude uložena."
+
+msgid "If you want to get some help about the Jappix installation and configuration, you can use our whole documentation, available at:"
+msgstr "Pokud potřebujete pomoci s instalací a nastavením Jappix, můžete využít dokumentaci, kterou naleznete zde:"
+
+msgid "It's time to build your own social cloud: just go to the next step!"
+msgstr "Nastal čas vybudovat vlastní sociální síť: stačí přejít k nasledujícímu kroku!"
+
+msgid "Jappix stores persistent data (such as shared files, chat logs, your own music and its configuration) into a single secured storage folder."
+msgstr "Jappix ukládá natrvalo data (sdílené soubory, vaše vlastní hudba a konfigurace) do jediného zabezpečeného adresáře. "
+
+msgid "Jappix must be able to write in this folder to create its sub-directories. If not, you must set the rights to %1s or change the folder owner to %2s (depending of your configuration)."
+msgstr "Jappix musí mít oprávnění zapisovat do tohoto adresáře pro vytvoření vlastních podadresářů.Pokud tomu tak není, je třeba nastavit oprávnění na %1s a nebo nastavit vlastníka adresáře na %2s (závisí to na vašem nastavení)."
+
+msgid "The folder is writable, you can continue!"
+msgstr "Do adresáře je povolen zápis, můžete pokračovat!"
+
+msgid "Jappix offers you the possibility to manage your configuration, install new addons or search for updates. That's why you must create an administrator account to access the manager."
+msgstr "Jappix vám úmožňuje spravovat vaší konfiguraci, instalovat addony nebo vyhledávat aktualizace. Proto je nutné si vytvořit účet administrátora ke vstupu do Správy Jappix."
+
+msgid "When Jappix will be installed, just click on the manager link on the home page to access it."
+msgstr "Když je Jappix nainstalován, stačí kliknout na odkaz Správce na výchozí stránce pro vstup do Správy. "
+
+msgid "Oops, you missed something or the two passwords do not match!"
+msgstr "Jejda, něco vám uniklo, nebo se hesla neshodují!"
+
+msgid "Jappix needs that you specify some values to work. Please correct the following inputs (or keep the default values, which are sufficient for most people)."
+msgstr "Jappix vyžaduje nastavení některých údajů. Prosím upravtel následující údaje (nebo nechte přednastavené, které většině uživatelů vyhovují)."
+
+msgid "Note that if you don't specify a value which is compulsory, it will be automatically completed with the default one."
+msgstr "Pokud nenastavíte povinné údaje, budou nastaveny na výchozí."
+
+msgid "User"
+msgstr "Uživatel"
+
+msgid "Service"
+msgstr "Služba"
+
+msgid "Service name"
+msgstr "Název služby"
+
+msgid "Service description"
+msgstr "Popis služby"
+
+msgid "Connection"
+msgstr "Připojení"
+
+msgid "Lock the host"
+msgstr "Uzamknout hostitele"
+
+msgid "Anonymous mode"
+msgstr "Anonymní mód"
+
+msgid "Registration allowed"
+msgstr "Registrace povolena"
+
+msgid "Use a proxy"
+msgstr "Použít proxy"
+
+msgid "Encryption"
+msgstr "Šifrování"
+
+msgid "HTTPS storage"
+msgstr "HTTPS úložiště"
+
+msgid "Force HTTPS"
+msgstr "Vynutit HTTPS"
+
+msgid "Compression"
+msgstr "Komprese"
+
+msgid "This page helps you specify the default hosts Jappix will connect to. You can leave it as it is and continue if you want to use the official service hosts."
+msgstr "Tato stránka vám pomůže nastavit výchozího hostitele. Použijte přednastavené hodnoty, pokud chcete využívat oficiální službu hostitele."
+
+msgid "Maybe you don't know what a BOSH server is? In fact, this is a relay between a Jappix client and a XMPP server, which is necessary because of technical limitations."
+msgstr "BOSH server v podstatě předává informace mezi Jappix klientem a XMPP serverem a je nutný vzhledem k technickému omezení."
+
+msgid "Main host"
+msgstr "Hlavní hostitel"
+
+msgid "Groupchat host"
+msgstr "Hostitel skupinových rozhovorů (Groupchat host)"
+
+msgid "Anonymous host"
+msgstr "Anonymní host"
+
+msgid "Directory host"
+msgstr "Directory host"
+
+msgid "BOSH host"
+msgstr "BOSH host"
+
+msgid "You can install some extra softwares on your server, to extend your Jappix features. Some others might be modified, because of security restrictions which are set by default."
+msgstr "Můžete nainstalovat další software pro rozšíření funkcí vašeho Jappix. Některé jiné funkce můžete upravit, zejména z důvodů bezpečnosti, protože byly nastaveny na vychozí hodnoty."
+
+msgid "To perform this, you must be able to access your server's shell and be logged in as root. Remember this is facultative, Jappix will work without these modules, but some of its features will be unavailable."
+msgstr "K tomu je nutný přístup na konzoli serveru a mít oprávnění root uživatele, Jappix bude pracovat i bez těchto dalších modulů, ale některé funkce budou nedostupné."
+
+msgid "After you finished the setup, Jappix will generate the cache files. It might be slow, just wait until the application is displayed and do not press any button."
+msgstr "Po ukončení nastavení Jappix vygeneruje cache soubory. Toto může nějaký čas trvat, počkejte až se zobrazí aplikace a do té doby nemačkejte jakoukoli klávesu."
+
+msgid "Thanks for using Jappix!"
+msgstr "Děkujeme za používání Jappix!"
+
+msgid "Next"
+msgstr "Další"
+
+msgid "Finish"
+msgstr "Dokončit"
+
+msgid "Check again"
+msgstr "Opakovat"
+
+msgid "The folder is not writable, set the right permissions to the %s directory."
+msgstr "Do adresáře nelze zapisovat, nastavte oprávnění na %s."
+
+msgid "%s is installed on your system."
+msgstr "%s je nainstalován na vašem systému."
+
+msgid "%1s is not installed on your system, you should install %2s."
+msgstr "%1s není na vašem systému nainstalován, nainstalujte %2s."
+
+msgid "PHP maximum upload size is sufficient (%s)."
+msgstr "PHP maximální velikost nahrávaného souboru je dostatečná (%s)."
+
+msgid "PHP maximum upload size is not sufficient (%1s), you should define it to %2s in %3s."
+msgstr "PHP maximální velikost nahrávaného souboru není dostatečná (%1s), měli byste jí nastavit na %2s v %3s."
+
+msgid "Jappix manager"
+msgstr "Jappix správce"
+
+msgid "Manager access"
+msgstr "Přístup ke Správě"
+
+msgid "Statistics"
+msgstr "Statistika"
+
+msgid "Hosts"
+msgstr "Hostitelé"
+
+msgid "Design"
+msgstr "Vzhled"
+
+msgid "Repeat"
+msgstr "Opakovat"
+
+msgid "All"
+msgstr "Vše"
+
+msgid "Horizontal"
+msgstr "Horizontálně"
+
+msgid "Vertical"
+msgstr "Vertikálně"
+
+msgid "Center"
+msgstr "Střed"
+
+msgid "Left"
+msgstr "Vlevo"
+
+msgid "Right"
+msgstr "Vpravo"
+
+msgid "Top"
+msgstr "Nahoře"
+
+msgid "Bottom"
+msgstr "Dole"
+
+msgid "Adapt"
+msgstr "Přizpůsobit"
+
+msgid "Color"
+msgstr "Barva"
+
+msgid "Users"
+msgstr "Uživatelé"
+
+msgid "Updates"
+msgstr "Aktualizace"
+
+msgid "This is a restricted area: only the authorized users can manage this Jappix node."
+msgstr "Omezený přístup: pouze oprávnění uživatelé mohou spravovat tento Jappix uzel."
+
+msgid "Please use the form below to login to the administration panel."
+msgstr "Prosím požijte následující formulář pro přihlášení do administrátorského rozhraní."
+
+msgid "To improve security, sessions are limited in time and when your browser will be closed, you will be logged out."
+msgstr "Pro zvýšení bezpečnosti je přihlášení časově omezeno a pokud zavřetel prohlížeč budete odhlášeni."
+
+msgid "Credentials"
+msgstr "Ověření"
+
+msgid "You have been logged out. Goodbye!"
+msgstr "Jste odhlášeni, Nashledanou!"
+
+msgid "Oops, you could not be recognized as a valid administrator. Check your credentials!"
+msgstr "Jejda, nejste platný správce. Zkontrolujte, vaše přihlašovací údaje!"
+
+msgid "Basic statistics are processed by Jappix about some important things, you can find them below."
+msgstr "Základní statisticky o některých důležitých údajích zpracováváných Jappixem najdete níže."
+
+msgid "Change your Jappix node configuration with this tool."
+msgstr "Změna konfiguraci vašeho Jabbix uzlu pomocí správce."
+
+msgid "Change the XMPP hosts that this Jappix node serve with this tool."
+msgstr "Změnit nastavení XMPP hostitelů, které tento Jappix uzel využívá, lze v tomto panelu."
+
+msgid "All this Jappix node stored files can be managed with this tool: please select a sub-folder and start editing its content!"
+msgstr "Všechny soubory uložené na tomot Jappix uzlu můžete spravovat v tomto panelu: zvolte podadresář a můžete upravovat obsah."
+
+msgid "Jappix is fully customisable: you can change its design right here."
+msgstr "Jappix je zcela přizpůsobitelný: jeho vzhled si můžete zde upravit."
+
+msgid "This is not a valid image, please use PNG, GIF or JPG!"
+msgstr "Toto není povolený obrázek, prosím použijte PNG, GIF nebo JPG!"
+
+msgid "The image could not be received, would you mind retry?"
+msgstr "Obrázek nebyl přijat, přejete si akci zopakovat?"
+
+msgid "Your image was added to the list!"
+msgstr "Váš obrázek byl přidán do seznamu!"
+
+msgid "Changes saved!"
+msgstr "Změny byly uloženy!"
+
+msgid "You can define more than one administrator for this Jappix node. You can also change a password with this tool."
+msgstr "Na tomto Jappix uzlu lze zadat více správců. Také lze změnit heslo v tomto panelu."
+
+msgid "Update your Jappix node with this tool, or check if a new one is available. Informations about the latest version are also displayed (in english)."
+msgstr "Aktualizuj Jappix uzel v tohoto panelu nebo zjisti, zda není dostupná nové verze. Informace o poslední verzi se také zobrazí (anglicky)."
+
+msgid "Access statistics"
+msgstr "Statistiky přístupů"
+
+msgid "Share statistics"
+msgstr "Statistiky sdílení"
+
+msgid "Other statistics"
+msgstr "Oatatní statistiky"
+
+msgid "January"
+msgstr "Leden"
+
+msgid "February"
+msgstr "Únor"
+
+msgid "March"
+msgstr "Březen"
+
+msgid "April"
+msgstr "Duben"
+
+msgid "May"
+msgstr "Květen"
+
+msgid "June"
+msgstr "Červen"
+
+msgid "July"
+msgstr "Červenec"
+
+msgid "August"
+msgstr "Srpen"
+
+msgid "September"
+msgstr "Září"
+
+msgid "October"
+msgstr "Říjen"
+
+msgid "November"
+msgstr "Listopad"
+
+msgid "December"
+msgstr "Prosinec"
+
+msgid "Monday"
+msgstr "Pondělí"
+
+msgid "Tuesday"
+msgstr "Úterý"
+
+msgid "Wednesday"
+msgstr "Středa"
+
+msgid "Thursday"
+msgstr "Čtvrtek"
+
+msgid "Friday"
+msgstr "Pátek"
+
+msgid "Saturday"
+msgstr "Sobota"
+
+msgid "Sunday"
+msgstr "Neděle"
+
+msgid "Total"
+msgstr "Celkem"
+
+msgid "Cache"
+msgstr "Keš"
+
+msgid "Logs"
+msgstr "Logy"
+
+msgid "Music"
+msgstr "Hudba"
+
+msgid "Backgrounds"
+msgstr "Pozadí"
+
+msgid "Share"
+msgstr "Sdílení"
+
+msgid "Background"
+msgstr "Pozadí"
+
+msgid "Notice"
+msgstr "Upozornění"
+
+msgid "Your design preferences have been saved!"
+msgstr "Nastavení vašeho vzhledu bylo uloženo."
+
+msgid "Please check your inputs: something is missing!"
+msgstr "Zkontrolujte údaje: nejsou kompletní!"
+
+msgid "Change your Jappix node background with this tool. You can either set a custom color or an uploaded image. Let your creativity flow!"
+msgstr "V tomto panelu lze nastavit vzhled vašeho Jappix uzlu. Lze nastavit vlastní barvu či uložený obrázek. Nechte volnost své tvořivosti!"
+
+msgid "Use default background"
+msgstr "Použít výchozí pozadí"
+
+msgid "Use your own image"
+msgstr "Použít vlastní obrázek"
+
+msgid "Select a background to use and change the display options."
+msgstr "Zvolte pozadí a upravte nastavení zobrazení."
+
+msgid "Use your own color"
+msgstr "Použijte vlastní barvu"
+
+msgid "Type the hexadecimal color value you want to use as a background."
+msgstr "Zadejte hexadecimálně barvu vašeho pozadí."
+
+msgid "Manage backgrounds"
+msgstr "Správa pozadí"
+
+msgid "You can add a new background to the list with this tool. Please send a valid image."
+msgstr "V tomto panelu lze přidat nové pozadí do seznamu. Prosím odešlete platný obrázek."
+
+msgid "If you want to remove some backgrounds, use the browser below."
+msgstr "Pokud chcete některé pozadí odstranit, použijte následující prohlížeč."
+
+msgid "Define a homepage notice for all your users, such as a warn, an important message or an advert with this tool."
+msgstr "Nastavení upozornění na výchozí stránce pro všechny uživatele, např. varování, důležité oznámení či raklama."
+
+msgid "Simple notice"
+msgstr "Jednoduché upozornění"
+
+msgid "This notice only needs simple text to be displayed, but no code is allowed!"
+msgstr "Toto upozornění umožňuje pouze jednoduchý text. Žádný kód není povolen."
+
+msgid "Advanced notice"
+msgstr "Rozšířené upozornění"
+
+msgid "You can customize your notice with embedded HTML, CSS and JavaScript, but you need to code the style."
+msgstr "Vaše upozornění lze upravit vložením HTML, CSS a JavaScript, ale je třeba i kód stylu."
+
+msgid "Available updates"
+msgstr "Dostupné aktualizace"
+
+msgid "What's new?"
+msgstr "Co je nového?"
+
+msgid "Your storage folders are not writable, please apply the good rights!"
+msgstr "Do adresáře k ukládání nelze zapisovat, prosím upravte oprávnění!"
+
+msgid "%1s may cause problems to the proxy, please increase %2s value up to %3s!"
+msgstr "%1s může způsobit problémy s proxy, prosím zvyšte hodnotu %2s na %3s!"
+
+msgid "You are using a development version of Jappix. Update it through our repository by executing: %s."
+msgstr "Právě používáte vývojovou verzi Jappix. Aktualizujte jí z repozitáře spůštěním %s."
+
+msgid "A new Jappix version is available! Check what is new and launch the update!"
+msgstr "Je dostupná nová verze Jappix! Zjistěte co je v ní nového a proveďte update!"
+
+msgid "Your version is out to date. Update it now to %s by clicking here!"
+msgstr "Vaše verze je zastaralá. Aktualizujte ji nyní na %s kliknutím zde!"
+
+msgid "Your version seems to be up to date, but you can check updates manually by clicking here."
+msgstr "Vaše verze se zdá být aktuální, ale je možné zkontrolovat aktualizace ručně kliknutím zde."
+
+msgid "Check for updates"
+msgstr "Dostupné aktualizace"
+
+msgid "Update in progress"
+msgstr "Prohíhá aktualizace"
+
+msgid "Jappix has been updated: you are now running the latest version. Have fun!"
+msgstr "Jabbix byl aktualizován: právě používáte nejnovější verzi. Příjemnou zábavu!"
+
+msgid "The update has failed! Please try again later."
+msgstr "Aktualizace selhala! Prosím opakujte později."
+
+msgid "Downloading package..."
+msgstr "Stahuji balíček ..."
+
+msgid "Removing current Jappix system files..."
+msgstr "Odstraňování aktuálních systémových souborů Jappixe ..."
+
+msgid "Extracting package..."
+msgstr "Rozbaluji balíček ..."
+
+msgid "Regenerating storage folder tree..."
+msgstr "Obnovování stromu adresáře úložiště ..."
+
+msgid "Jappix is now up to date!"
+msgstr "Jappix je aktualizován!"
+
+msgid "Aborted: socket error!"
+msgstr "Nezdařilo se: chyba soketu!"
+
+msgid "Aborted: buffer error!"
+msgstr "Nezdařilo se: chyba bufferu!"
+
+msgid "Aborted: everything is not writable!"
+msgstr "Nezdařilo se: nelze zapsat!"
+
+msgid "Aborted: could not extract the package!"
+msgstr "Nezdařilo se: nelze rozbalti balíček!"
+
+msgid "Visits"
+msgstr "Návštěvnost"
+
+msgid "Daily"
+msgstr "Denně"
+
+msgid "Weekly"
+msgstr "Týdně"
+
+msgid "Monthly"
+msgstr "Měsíčně"
+
+msgid "Yearly"
+msgstr "Ročně"
+
+msgid "Size"
+msgstr "Velikost"
+
+msgid "Clean everything"
+msgstr "Vše odstranit"
+
+msgid "Purge cache"
+msgstr "Vymazat keš"
+
+msgid "Purge logs"
+msgstr "Vymazat logy"
+
+msgid "Purge updates"
+msgstr "Vymazat aktualizace"
+
+msgid "The storage folder you wanted to clean is now empty!"
+msgstr "Odkládací adresář, který chcete vymazat je nyní prázdny!"
+
+msgid "Keep your Jappix node fresh and fast, clean the storage folders regularly!"
+msgstr "Udržujte váš uzel Jappix čistý a rychlý, pravidelně čistěte adkládací prostor!"
+
+msgid "Upload your music (Ogg Vorbis, MP3 or WAV) to be able to listen to it in Jappix!"
+msgstr "Nahrajte vlastní hudbu (Ogg Vorbis, MP3 or WAV) a můžete jí poslouchat v Jappixu!"
+
+msgid "The file you want to upload must be smaller than %s."
+msgstr "Soubor který chcete nahrát nesmí být větší než %s."
+
+msgid "Stay tuned in what your users store on your server and remove undesired content with this tool."
+msgstr "Buďte v obraze o tom co vaši uživatelé ukládají na server a odstraňte nevhodný obsah v tomto panelu."
+
+msgid "Title"
+msgstr "Název"
+
+msgid "Artist"
+msgstr "Zpěvák/Zpěvačka"
+
+msgid "Album"
+msgstr "Album"
+
+msgid "File"
+msgstr "Soubor"
+
+msgid "Upload"
+msgstr "Nahrát"
+
+msgid "The folder is empty."
+msgstr "Adresář je prázdný."
+
+msgid "The music could not be received, please retry!"
+msgstr "Hudba nebyla přijata, prosím opakujte akci!"
+
+msgid "This is not a valid music file, please encode in Ogg Vorbis, MP3 or WAV!"
+msgstr "Toto není platný hudební soubor, prosím použijte Ogg Vorbis, MP3 nebo WAV!"
+
+msgid "Your music has been added!"
+msgstr "Vaše písnička byla přidána!"
+
+msgid "The selected elements have been removed."
+msgstr "Vybrané položky budou nyní odstraněny."
+
+msgid "You must select elements to remove!"
+msgstr "Musíte vybrat položky k odstranění!"
+
+msgid "Add a new user with this tool, or change a password (type an existing username). Please submit a strong password!"
+msgstr "Zde lze přidat uživatele, změnit heslo (použijte existující uživatelské jméno). Zvolte silné heslo!"
+
+msgid "Manage"
+msgstr "Spravovat"
+
+msgid "List"
+msgstr "Seznam"
+
+msgid "Remove users with this tool. Note that you cannot remove an user if he is the only one remaining."
+msgstr "V tomto panelu lze odstranit uživatele. Mějte na paměti, že nelze odstranit uživatele, pokud je poslední."
+
+msgid "The user has been added!"
+msgstr "Uživatel byl přidán!"
+
+msgid "The chosen users have been removed."
+msgstr "Zvolený uživatel byl odstraněn."
+
+msgid "You must select one or more users to be removed!"
+msgstr "Musíte zvolit jednoho nebo více uživatelu k odstranění!"
+
+msgid "Yesterday"
+msgstr "Včera"
+
+msgid "%s days ago"
+msgstr "Před %s dny"
+
+msgid "User currently active"
+msgstr "Uživatel je nyní aktivní"
+
+msgid "Last seen: %s"
+msgstr "Naposledy viděn: %s"
+
+msgid "Inactive since: %s"
+msgstr "Nečinný od: %s"
+
+msgid "Your friend seems not to have received your message(s)!"
+msgstr "Zdá se, že váš kamarád nedostal vaší zprávu(y)!"
+
+msgid "Static content server"
+msgstr "Statický obsah serveru"
+
+msgid "This is the static content server for %1s, “%2s”."
+msgstr "Toto je statický obsah serveru před %1s, “%2s”."
+
+msgid "Suggested friends"
+msgstr "Navrhovaní kamarádi"
+
+msgid "Check all"
+msgstr "Označit vše"
+
+msgid "Uncheck all"
+msgstr "Zrušit označení všeho"
+
+msgid "Choose"
+msgstr "Vybrat"
+
+msgid "List name"
+msgstr "Jméno seznamu"
+
+msgid "Allow"
+msgstr "Povolit"
+
+msgid "Deny"
+msgstr "Zakázat"
+
+msgid "Group"
+msgstr "Skupina"
+
+msgid "Subscription"
+msgstr "Oprávnění"
+
+msgid "Both"
+msgstr "Obojí"
+
+msgid "From"
+msgstr "Od"
+
+msgid "Everybody"
+msgstr "Všichni"
+
+msgid "Send messages"
+msgstr "Odeslat zprávu"
+
+msgid "Send queries"
+msgstr "Odeslat žádost"
+
+msgid "See my status"
+msgstr "Vidět můj status"
+
+msgid "Send his/her status"
+msgstr "Odeslat jemu/ji status"
+
+msgid "Everything"
+msgstr "Vše"
+
+msgid "Item"
+msgstr "Položka"
+
+msgid "Order"
+msgstr "Pořadí"
+
+msgid "Active for this session"
+msgstr "Aktivní v tomto sezení"
+
+msgid "Always active"
+msgstr "Stále aktivní"
+
+msgid "User directory"
+msgstr "Adresář uživatelů"
+
+msgid "Search a friend"
+msgstr "Najít kamaráda"
+
+msgid "The feature requested is not implemented by the recipient or server and therefore cannot be processed."
+msgstr "Požadovanou vlastnost nepodporuje buď příjemce nebo server, a proto nemůže být vykonána."
+
+msgid "This is a repeat from %s"
+msgstr "Jedná se o opakování od %s"
+
+msgid "Loading comments..."
+msgstr "Načítám komentáře..."
+
+msgid "Type your comment here..."
+msgstr "Napište svůj komentář zde ..."
+
+msgid "Could not get the comments!"
+msgstr "Nelze získat komentáře!"
+
+msgid "Show comments"
+msgstr "Zobrazit komentáře"
+
+msgid "Send him/her a message"
+msgstr "Odeslat jemu/jí zprávu"
+
+msgid "Start a chat with him/her"
+msgstr "Začít rozhovor s ním/ní"
+
+msgid "Media integration"
+msgstr "Integrovat media"
+
+msgid "Comments locked!"
+msgstr "Komentáře jsou uzamčené!"
+
+msgid "Type something you want to share with your friends..."
+msgstr "Zde napište, co si přejete sdílet s vašimi přáteli ..."
+
+msgid "changed his/her nickname to %s"
+msgstr "byla změněna jeho/její přezdívka na %s"
+
+msgid "commented an item you follow: “%s”."
+msgstr "pro komentování položky postupujte následovně: “%s”."
+
+msgid "Hide"
+msgstr "Skrýt"
+
+msgid "liked your post: “%s”."
+msgstr "váš oblíbený příspěvek: “%s”."
+
+msgid "quoted you somewhere: “%s”."
+msgstr "citoval jste někde: “%s”."
+
+msgid "published on your wall: “%s”."
+msgstr "zvěřejněno na vaší nástěnce: “%s”."
+
+msgid "tagged you in a photo (%s)."
+msgstr "jste označen na fotografii (%s)."
+
+msgid "tagged you in a video (%s)."
+msgstr "jste označen na videu (%s)."
+
+msgid "Show"
+msgstr "Zobrazit"
+
+msgid "Need help? You'd better read our documentation page about how to fill this form!"
+msgstr "Potřebujete pomoct? Raději si nejprve přečtete v dokumentaci stránku jak vyplnit tento formulář!"
+
+msgid "Pubsub host"
+msgstr "Pubsub hostitel"
+
+msgid "Jappix is a great social platform, that you can access wherever you are, whenever you want and communicate with whovever you want."
+msgstr "Jappix je velká sociální platforma, ke které máte přístup ať jste kdekoliv, kdykoliv chcete s někým komunikovat."
+
+msgid "Manager link"
+msgstr "Odkaz správce"
+
+msgid "User uploads server"
+msgstr "Uživate nahrávající na server"
+
+msgid "This is the user uploads server for %1s, “%2s”."
+msgstr "Toto je uživatel nahrávající na server pro  %1s, “%2s”."
+
+msgid "Logo"
+msgstr "Logo"
+
+msgid "You can set your own service logo to replace the default one. Take care of the size and the main color of each logo!"
+msgstr "Můžete si nastavit vlastní logo služby, které nahradí to výchozí. Dávejte při tom pozor na velikost a hlavní barvu každého loga!"
+
+msgid "Upload each logo with the recommended maximum pixel size."
+msgstr "Nahrát každé logo s doporučeným maximálním rozměrem v pixelech."
+
+msgid "This is not a valid image, please use the PNG format!"
+msgstr "Toto není platný obrázek, použijte prosím PNG formát!"
+
+msgid "Your service logo has been successfully changed!"
+msgstr "Vaše logo služby bylo úspěšně změněno!"
+
+msgid "Your logo format must be PNG. Leave a field empty and the logo will not be changed."
+msgstr "Vaše logo musí být ve formátu PNG. Pokud je pole prázdné logo se nezmění."
+
+msgid "Remove this logo"
+msgstr "Odstranit toto logo"
+
+msgid "View this logo"
+msgstr "Zobrazit toto logo"
+
+msgid "Send a file"
+msgstr "Odeslat soubor"
+
+msgid "Once uploaded, your friend will be prompted to download the file you sent."
+msgstr "Jakmile dojde k nahrání, bude váš kamarád vyzván ke stažení souboru, který jste odeslal."
+
+msgid "Groupchats to join"
+msgstr "Připojit skupinové rozhovory"
+
+msgid "Purge sent files"
+msgstr "Vyčistit odeslané soubory"
+
+msgid "would like to send you a file: “%s”."
+msgstr "přejete si odeslat soubor: “%s”."
+
+msgid "has accepted to received your file: “%s”."
+msgstr "souhlasí s přijetím souboru: “%s”."
+
+msgid "has rejected to receive your file: “%s”."
+msgstr "odmítl přijmout soubor: “%s”."
+
+msgid "could not receive your file: “%s”."
+msgstr "nelze přijmout soubor: “%s”."
+
+msgid "has received a file exchange request: “%s”."
+msgstr "obdržel žádost pro výměnu souboru: “%s”."
+
+msgid "Available shortcuts:"
+msgstr "Dostupné klávesové zkratky:"
+
+msgid "%s removes the chat logs"
+msgstr "%s odstraní chat logy"
+
+msgid "%s joins a groupchat"
+msgstr "%s připojí skupinivý rozhovor"
+
+msgid "%s closes the chat"
+msgstr "%s uzavře rozhovor"
+
+msgid "%s shows the user profile"
+msgstr "%s zobrazí profil uživatele"
+
+msgid "%s sends a message to the room"
+msgstr "%s odešle zprávu do místnosti"
+
+msgid "%s changes your nickname"
+msgstr "%s změní vaší přezdívku"
+
+msgid "%s sends a message to someone in the room"
+msgstr "%s odešle zprávu  někomu v místnosti"
+
+msgid "%s changes the room topic"
+msgstr "%s změní téma místnosti"
+
+msgid "%s kicks an user of the room"
+msgstr "%s vykáže uživatele z místnosti"
+
+msgid "%s bans an user of the room"
+msgstr "%s zakáže uživateli přístup do místnosti"
+
+msgid "%s invites someone to join the room"
+msgstr "%s zve někoho do místnosti"
+
+msgid "Social channel, chat and more."
+msgstr ""
+
+msgid "Create your public profile."
+msgstr ""
+
+msgid "A mini-chat for your website."
+msgstr ""
+
+msgid "Get Jappix, get support."
+msgstr ""
+
+msgid "Statistics around Jappix."
+msgstr ""
+
+msgid "Download Jappix for free."
+msgstr ""
+
+msgid "Find a public Jappix node."
+msgstr ""
+
+msgid "Public profile"
+msgstr ""
+
+msgid "Your profile anywhere on the Web."
+msgstr ""
+
+msgid "%s is a Jappix.com service which makes your XMPP profile public. It is easier to share it. No XMPP account is required to view your social channel, your current position and your contact details."
+msgstr ""
+
+msgid "Furthermore, every picture you post in your social channel is added to a beautiful picture timeline. You can now view the pictures you shared year by year."
+msgstr ""
+
+msgid "You can also use your XMPP avatar as a single avatar for every website, blog and forum you use. When you change it on XMPP, the new avatar appears everywhere. What a genious improvement!"
+msgstr ""
+
+msgid "Yay, let's create my public profile!"
+msgstr ""
+
+msgid "Enable my public profile"
+msgstr ""
+
+#~ msgid "Jappix is a non-profit social platform, that you can access wherever you are, whenever you want and communicate with whovever you want."
+#~ msgstr "Jappix je nezisková sociální platforma, ke které máte přístup ať jste kdekoliv, kdykoli budete chtít s někým komunikovat."
+
+#~ msgid "See"
+#~ msgstr ""
+
+#~ msgid "Use default logo"
+#~ msgstr ""
+
+#~ msgid "Use your own logo"
+#~ msgstr ""
+
+#~ msgid "The recommended image format is PNG. Leave a field empty and the logo will not be changed."
+#~ msgstr ""
diff --git a/jappixmini/jappix/lang/de/LC_MESSAGES/main.mo b/jappixmini/jappix/lang/de/LC_MESSAGES/main.mo
new file mode 100644
index 00000000..e30d849a
Binary files /dev/null and b/jappixmini/jappix/lang/de/LC_MESSAGES/main.mo differ
diff --git a/jappixmini/jappix/lang/de/LC_MESSAGES/main.po b/jappixmini/jappix/lang/de/LC_MESSAGES/main.po
new file mode 100644
index 00000000..352e9674
--- /dev/null
+++ b/jappixmini/jappix/lang/de/LC_MESSAGES/main.po
@@ -0,0 +1,1870 @@
+# German translations for Jappix package.
+# This file is distributed under the same license as the Jappix package.
+# This file was translated from CodingTeam at <http://codingteam.net/>.
+msgid ""
+msgstr ""
+"Project-Id-Version: Jappix\n"
+"PO-Revision-Date: 2012-01-16 21:42+0100\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"POT-Creation-Date: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+
+msgid "JavaScript is missing in your web browser, so that you will not be able to launch Jappix! Please fix this."
+msgstr "Jappix benötigt JavaScript um zu funktionieren. Bitte erlaube die Ausführung von JavaScript."
+
+msgid "An open social network"
+msgstr "Ein offenes soziales Netzwerk"
+
+msgid "Jappix has been interrupted by a network issue, a bug or bad login (check that you entered the right credentials), sorry for the inconvenience."
+msgstr "Jappix wurde von einem Netzwerkproblem, einem Programmfehler oder einer ungültigen Anmeldung unterbrochen. Bitte überprüfe, ob du deine Daten richtig eingegeben hast. Entschuldige die Störung."
+
+msgid "The element list on this server could not be obtained!"
+msgstr "Die Elementliste konnte nicht vom Server geladen werden."
+
+msgid "Your password has been changed, now you can connect to your account with your new login data."
+msgstr "Dein Passwort wurde geändert. Du kannst dich jetzt mit deinen neuen Anmeldedaten anmelden."
+
+msgid "Your XMPP account has been removed, bye!"
+msgstr "Dein XMPP-Konto wurde entfernt."
+
+msgid "You have been logged out of your XMPP account, have a nice day!"
+msgstr "Du wurdest von Jappix abgemeldet."
+
+msgid "The room you joined seems not to exist. You should create it!"
+msgstr "Der Chatraum, den du betreten hast, scheint nicht zu existieren. Du solltest ihn erstellen!"
+
+msgid "The groupchat has been removed, now someone else will be able to recreate it."
+msgstr "Der Chatraum wurde gelöscht. Jetzt kann ihn jemand anders registrieren."
+
+msgid "The user that you want to reach is not present in the room."
+msgstr "Der Benutzer, den du erreichen möchtest, ist nicht in diesem Raum."
+
+msgid "Please enter the group chat address to join."
+msgstr "Gib die Adresse des Gruppenchats ein, um beizutreten."
+
+msgid "Please enter your nickname to join %s."
+msgstr "Gib deinen Spitznamen ein, um %s beizutreten."
+
+msgid "This room (%s) is protected with a password."
+msgstr "Dieser Raum (%s) ist passwortgeschützt."
+
+msgid "Your browser is out of date!"
+msgstr "Dein Browser ist veraltet!"
+
+msgid "Last %s version is better!"
+msgstr "Die letzte Version von %s ist besser!"
+
+msgid "Login"
+msgstr "Anmelden"
+
+msgid "Register"
+msgstr "Registrieren"
+
+msgid "Here we go!"
+msgstr "Los geht’s!"
+
+msgid "Server"
+msgstr "Anbieter"
+
+msgid "Password"
+msgstr "Passwort"
+
+msgid "Remember me"
+msgstr "Anmeldung merken"
+
+msgid "This tool has been disabled, you cannot use it!"
+msgstr "Dieses Werkzeug wurde deaktiviert, du kannst es nicht verwenden."
+
+msgid "Due to a network issue, you were disconnected. What do you want to do now?"
+msgstr "Aufgrund eines Netzwerkproblems wurde die Verbindung getrennt. Was möchtest du jetzt tun?"
+
+msgid "Reconnect"
+msgstr "Wiederverbinden"
+
+msgid "Messages"
+msgstr "Nachrichten"
+
+msgid "Profile"
+msgstr "Profil"
+
+msgid "Options"
+msgstr "Optionen"
+
+msgid "Disconnect"
+msgstr "Abmelden"
+
+msgid "Filter"
+msgstr "Filter"
+
+msgid "Add a friend"
+msgstr "Freund hinzufügen"
+
+msgid "Your groupchats"
+msgstr "Deine Gruppengespräche"
+
+msgid "Manage your favorite groupchats"
+msgstr "Verwalte deine Lieblings-Gruppenchats"
+
+msgid "More stuff"
+msgstr "Weitere Funktionen"
+
+msgid "Show all friends"
+msgstr "Alle Freunde anzeigen"
+
+msgid "Only show connected friends"
+msgstr "Nur verfügbare Freunde anzeigen"
+
+msgid "Message archives"
+msgstr "Nachrichtenarchiv"
+
+msgid "Date"
+msgstr "Datum"
+
+msgid "Please select a friend to view the chat history."
+msgstr "Wähle einen Freund, um den Gesprächsverlauf anzusehen."
+
+msgid "Nothing found for: %s"
+msgstr "Nichts gefunden für: %s"
+
+msgid "A short message?"
+msgstr "Eine kurze Nachricht?"
+
+msgid "How are you?"
+msgstr "Wie geht es dir?"
+
+msgid "What are you doing?"
+msgstr "Was machst du gerade?"
+
+msgid "Join a chat"
+msgstr "Ein Gespräch betreten"
+
+msgid "Status"
+msgstr "Status"
+
+msgid "Available"
+msgstr "Verfügbar"
+
+msgid "Talkative"
+msgstr "Gesprächig"
+
+msgid "Away"
+msgstr "Abwesend"
+
+msgid "Not available"
+msgstr "Nicht verfügbar"
+
+msgid "Busy"
+msgstr "Beschäftigt"
+
+msgid "Mood"
+msgstr "Laune"
+
+msgid "None"
+msgstr "Nichts"
+
+msgid "Crazy"
+msgstr "Verrückt"
+
+msgid "Excited"
+msgstr "Aufgeregt"
+
+msgid "Playful"
+msgstr "Verspielt"
+
+msgid "Happy"
+msgstr "Glücklich"
+
+msgid "Shocked"
+msgstr "Schockiert"
+
+msgid "Hot"
+msgstr "Heiß"
+
+msgid "Sad"
+msgstr "Traurig"
+
+msgid "Amorous"
+msgstr "Verliebt"
+
+msgid "Confident"
+msgstr "Zuversichtlich"
+
+msgid "Activity"
+msgstr "Aktivität"
+
+msgid "Chores"
+msgstr "Haushalt"
+
+msgid "Drinking"
+msgstr "Trinken"
+
+msgid "Eating"
+msgstr "Essen"
+
+msgid "Exercising"
+msgstr "Bewegung"
+
+msgid "Grooming"
+msgstr "Hygiene"
+
+msgid "Appointment"
+msgstr "Termin"
+
+msgid "Inactive"
+msgstr "Inaktiv"
+
+msgid "Relaxing"
+msgstr "Entspannt sich"
+
+msgid "Talking"
+msgstr "Unterhält sich"
+
+msgid "Traveling"
+msgstr "Auf Reise"
+
+msgid "Working"
+msgstr "Arbeiten"
+
+msgid "View profile"
+msgstr "Profil ansehen"
+
+msgid "Repeat this notice"
+msgstr "Wiederhole diese Nachricht"
+
+msgid "Remove this notice"
+msgstr "Entferne diese Nachricht"
+
+msgid "Your profile"
+msgstr "Dein Profil"
+
+msgid "Identity"
+msgstr "Identität"
+
+msgid "Profile image"
+msgstr "Profilbild"
+
+msgid "Others"
+msgstr "Andere"
+
+msgid "Personal"
+msgstr "Persönlich"
+
+msgid "Complete name"
+msgstr "Vollständiger Name"
+
+msgid "Nickname"
+msgstr "Spitzname"
+
+msgid "First name"
+msgstr "Vorname"
+
+msgid "Last name"
+msgstr "Nachname"
+
+msgid "Date of birth"
+msgstr "Geburtstag"
+
+msgid "Contact"
+msgstr "Kontakt"
+
+msgid "E-mail"
+msgstr "E-Mail"
+
+msgid "Phone"
+msgstr "Telefon"
+
+msgid "Website"
+msgstr "Internetseite"
+
+msgid "Current"
+msgstr "Momentan"
+
+msgid "Delete"
+msgstr "Löschen"
+
+msgid "What a pity! You have no profile image defined in your identity card!"
+msgstr "Schade, du hast kein Profilbild angegeben."
+
+msgid "Address"
+msgstr "Adresse"
+
+msgid "Street"
+msgstr "Straße"
+
+msgid "City"
+msgstr "Stadt"
+
+msgid "Postal code"
+msgstr "Postleitzahl"
+
+msgid "Country"
+msgstr "Land"
+
+msgid "Biography"
+msgstr "Biografie"
+
+msgid "Important notice"
+msgstr "Wichtige Nachricht"
+
+msgid "Be careful of the information you write into your profile, because it could be accessed by everyone (even someone you don't want to)."
+msgstr "Sei vorsichtig mit Informationen, die du in dein Profil schreibst. Diese Infos können von allen gelesen werden."
+
+msgid "Not everything is private on XMPP; this is one of those things, your public profile (vCard)."
+msgstr "Nicht alles ist privat bei XMPP. Das hier ist eines davon: dein öffentliches Profil (vCard)."
+
+msgid "It is strongly recommended to upload a profile image (%s maximum), like a picture of yourself, because that makes you easily recognizable by your friends."
+msgstr "Es wird empfohlen ein Profilbild hochzuladen (maximal %s), z.b. ein Bild von dir damit deine Freunde dich leichter wieder erkennen können."
+
+msgid "Save"
+msgstr "Speichern"
+
+msgid "Cancel"
+msgstr "Abbrechen"
+
+msgid "Edit options"
+msgstr "Eigenschaften bearbeiten"
+
+msgid "Channel"
+msgstr "Kanal"
+
+msgid "Commands"
+msgstr "Befehle"
+
+msgid "Sounds"
+msgstr "Geräusche"
+
+msgid "Privacy"
+msgstr "Privatsphäre"
+
+msgid "Message archiving"
+msgstr "Nachrichtenarchivierung"
+
+msgid "Store a history of your chats"
+msgstr "Speichere einen Verlauf deiner Gespräche"
+
+msgid "Geolocation"
+msgstr "Geodaten"
+
+msgid "Empty"
+msgstr "Leer"
+
+msgid "Empty channel"
+msgstr "Leerer Kanal"
+
+msgid "Persistent"
+msgstr "Dauerhaft"
+
+msgid "Maximum notices"
+msgstr "Maximale Benachrichtigungen"
+
+msgid "Account"
+msgstr "Account"
+
+msgid "Change password"
+msgstr "Passwort ändern"
+
+msgid "Delete account"
+msgstr "Konto löschen"
+
+msgid "Old"
+msgstr "Alt"
+
+msgid "New (2 times)"
+msgstr "Neu (zwei Mal)"
+
+msgid "Continue"
+msgstr "Fortsetzen"
+
+msgid "To"
+msgstr "An"
+
+msgid "Close"
+msgstr "Schließen"
+
+msgid "unknown"
+msgstr "Unbekannt"
+
+msgid "Unavailable"
+msgstr "Nicht erreichbar"
+
+msgid "is now"
+msgstr "ist jetzt"
+
+msgid "Please wait while your avatar is uploaded..."
+msgstr "Bitte warte während dein Avatar hochgeladen wird..."
+
+msgid "Here it is! A new beautiful profile image!"
+msgstr "Hier ist es! Ein wunderschönes, neues Profilbild."
+
+msgid "The image file is not supported or has a bad size."
+msgstr "Die Bilddatei hat ein falsches Format oder ist zu groß."
+
+msgid "Reply"
+msgstr "Antworten"
+
+msgid "Error"
+msgstr "Fehler"
+
+msgid "Click here to solve the error"
+msgstr "Klicke hier, um den Fehler zu beheben"
+
+msgid "You"
+msgstr "Du"
+
+msgid "Remove"
+msgstr "Entfernen"
+
+msgid "Rename"
+msgstr "Umbenennen"
+
+msgid "Hi, I am %s, I would like to add you as my friend."
+msgstr "Hey, ich bin %s. Ich möchte dich gerne als Freund hinzufügen."
+
+msgid "Smiley insertion"
+msgstr "Smilie einfügen"
+
+msgid "Change style"
+msgstr "Stil ändern"
+
+msgid "Text in bold"
+msgstr "Text fett"
+
+msgid "Text in italic"
+msgstr "Text kursiv"
+
+msgid "Underlined text"
+msgstr "Text unterstrichen"
+
+msgid "Save chat"
+msgstr "Protokoll speichern"
+
+msgid "Click on the following link to get the chat log, and wait. Then click again to get the file."
+msgstr "Klicke auf den folgenden Link, um das Chatprotokoll zu erhalten. Warte ein bisschen und klicke noch Mal, um die Datei zu bekommen."
+
+msgid "This chat is empty!"
+msgstr "Dieses Gespräch ist leer."
+
+msgid "Generate file!"
+msgstr "Datei generieren!"
+
+msgid "Download file!"
+msgstr "Datei herunterladen!"
+
+msgid "Clean current chat"
+msgstr "Aktuelles Gespräch leeren"
+
+msgid "View chat history"
+msgstr "Gesprächsverlauf anzeigen"
+
+msgid "Show user profile"
+msgstr "Nutzerprofil zeigen"
+
+msgid "Add this contact to your friends"
+msgstr "Kontakt zu Freunden hinzufügen"
+
+msgid "Add this groupchat to your favorites"
+msgstr "Gruppengespräch zu Favoriten hinzufügen"
+
+msgid "All tabs"
+msgstr "Alle Tabs"
+
+msgid "Close this tab"
+msgstr "Diesen Tab schließen"
+
+msgid "no subject defined for this room."
+msgstr "Für diesen Raum ist kein Thema festgelegt."
+
+msgid "Administration panel for this room"
+msgstr "Verwaltung für diesen Raum"
+
+msgid "Moderators"
+msgstr "Moderatoren"
+
+msgid "Participants"
+msgstr "Teilnehmer"
+
+msgid "Visitors"
+msgstr "Besucher"
+
+msgid "Manage favorite rooms"
+msgstr "Favorisierte Räume verwalten"
+
+msgid "Change favorites"
+msgstr "Favoriten ändern"
+
+msgid "Search a room"
+msgstr "Raum suchen"
+
+msgid "Select a favorite"
+msgstr "Einen Favoriten wählen"
+
+msgid "Getting the name..."
+msgstr "Name wird geladen …"
+
+msgid "Gateway"
+msgstr "Gateway"
+
+msgid "Name"
+msgstr "Name"
+
+msgid "Room"
+msgstr "Raum"
+
+msgid "Add"
+msgstr "Hinzufügen"
+
+msgid "Edit"
+msgstr "Bearbeiten"
+
+msgid "Search a room on"
+msgstr "Einen Raum suchen in "
+
+msgid "No room found on this server."
+msgstr "Auf diesem Server wurden keine Räume gefunden."
+
+msgid "Service discovery"
+msgstr "Übersicht der Dienste"
+
+msgid "Server to query"
+msgstr "Server zur Abfrage"
+
+msgid "Sorry, but the entity didn't return any result!"
+msgstr "Es wurde kein Ergebnis gefunden."
+
+msgid "Accounts"
+msgstr "Konten"
+
+msgid "Authentications"
+msgstr "Genehmigung"
+
+msgid "Automation"
+msgstr "Automatisierung"
+
+msgid "Clients"
+msgstr "Klienten"
+
+msgid "Collaboration"
+msgstr "Zusammenarbeit"
+
+msgid "Components"
+msgstr "Komponenten"
+
+msgid "Rooms"
+msgstr "Räume"
+
+msgid "Directories"
+msgstr "Verzeichnisse"
+
+msgid "Gateways"
+msgstr "Gateways"
+
+msgid "News"
+msgstr "Neuigkeiten"
+
+msgid "Hierarchy"
+msgstr "Hierarchie"
+
+msgid "Proxies"
+msgstr "Proxys"
+
+msgid "Publication/Subscription"
+msgstr "Veröffentlichung / Abonnement"
+
+msgid "Storage"
+msgstr "Speicher"
+
+msgid "Service offline or broken"
+msgstr "Service offline oder abgestürzt"
+
+msgid "Your inbox"
+msgstr "Posteingang"
+
+msgid "Available actions"
+msgstr "Verfügbare Aktionen"
+
+msgid "Clean"
+msgstr "Säubern"
+
+msgid "New"
+msgstr "Neu"
+
+msgid "Received"
+msgstr "Erhalten"
+
+msgid "Subject"
+msgstr "Betreff"
+
+msgid "Content"
+msgstr "Inhalt"
+
+msgid "Send message"
+msgstr "Nachricht schicken"
+
+msgid "Your inbox is empty."
+msgstr "Dein Posteingang ist leer."
+
+msgid "MUC administration"
+msgstr "MUC-Administration"
+
+msgid "You administrate this room"
+msgstr "Du verwaltest diesen Raum."
+
+msgid "Enter new subject"
+msgstr "Neuer Betreff"
+
+msgid "Configuration"
+msgstr "Einstellungen"
+
+msgid "Authorizations"
+msgstr "Genehmigung"
+
+msgid "Member list"
+msgstr "Mitgliederliste"
+
+msgid "Owner list"
+msgstr "Besitzerliste"
+
+msgid "Administrator list"
+msgstr "Verwalterliste"
+
+msgid "Outcast list"
+msgstr "Gebannten-Liste"
+
+msgid "Add an input"
+msgstr "Eingabe hinzufügen"
+
+msgid "Destroy this MUC"
+msgstr "Diesen MUC schließen"
+
+msgid "Yes, let's do it!"
+msgstr "Ja, los geht's!"
+
+msgid "Your friend is paying attention to the conversation."
+msgstr "Dein Freund tippt."
+
+msgid "Your friend is writing a message..."
+msgstr "Dein Freund schreibt eine Nachricht."
+
+msgid "Your friend stopped writing a message."
+msgstr "Dein Freund hat aufgehört, eine Nachricht zu schreiben."
+
+msgid "Your friend is doing something else."
+msgstr "Dein Freund tut etwas anderes."
+
+msgid "Your friend closed the chat."
+msgstr "Dein Freund hat die Unterhaltung beendet."
+
+msgid "Requesting this service..."
+msgstr "Dienst wird angefordert …"
+
+msgid "Loading"
+msgstr "Lädt …"
+
+msgid "joined the chat room"
+msgstr "hat den Raum betreten"
+
+msgid "left the chat room"
+msgstr "hat den Raum verlassen"
+
+msgid "no status"
+msgstr "kein Status"
+
+msgid "has been kicked"
+msgstr "wurde rausgeschmissen."
+
+msgid "has been banned"
+msgstr "wurde verbannt."
+
+msgid "no reason"
+msgstr "kein Grund"
+
+msgid "Communicate with the entire world!"
+msgstr "Kommuniziere mit der ganzen Welt!"
+
+msgid "It allows you to get in touch with the millions of users who currently use the XMPP network like you do with Jappix. Join the community and stay free!"
+msgstr "Du kannst Kontakt aufnehmen mit den Millionen von Nutzern des XMPP-Netzwerkes. Tritt der Gemeinschaft bei und bleib frei!"
+
+msgid "Hi there!"
+msgstr "Hallo du!"
+
+msgid "Welcome on %1s, “%2s”."
+msgstr "Willkommen bei %1s, »%2s«."
+
+msgid "Login to your existing XMPP account or create a new one for free!"
+msgstr "Melde dich mit deinem bestehenden XMPP-Konto an oder erstelle gratis ein Neues!"
+
+msgid "Jappix is an open-source project from PostPro, a non-profit organization which provides us a great help."
+msgstr "Jappix ist ein quelloffenes Projekt von PostPro, einer gemeinnützigen Organisation die uns großartig unterstützt."
+
+msgid "Login to your existing XMPP account. You can also use the %s to join a groupchat."
+msgstr "Melde dich mit deinem XMPP-Konto an. Du kannst auch %s benutzen, um einem Gruppenchat beizutreten."
+
+msgid "Previous"
+msgstr "Vorhergehend"
+
+msgid "General"
+msgstr "Allgemeines"
+
+msgid "Advanced"
+msgstr "Erweitert"
+
+msgid "Resource"
+msgstr "Ressource"
+
+msgid "Priority"
+msgstr "Priorität"
+
+msgid "Low"
+msgstr "Niedrig"
+
+msgid "Medium"
+msgstr "Mittel"
+
+msgid "High"
+msgstr "Hoch"
+
+msgid "Enter the groupchat you want to join and the nick you want to have. You can also go back to the %s."
+msgstr "Nenne den Chat, dem du beitreten willst und das Pseudonym, das du haben willst. Du kannst auch zurück zu %s."
+
+msgid "login page"
+msgstr "Anmeldeseite"
+
+msgid "Share this link with your friends:"
+msgstr "Teile diesen Verweis mit deinen Freunden:"
+
+msgid "Register a new XMPP account to join your friends on your own social cloud. That's simple!"
+msgstr "Registriere ein neues XMPP-Konto, um mit deinen Freunden dein eigenes soziales Netz zu bilden. Es ist so einfach!"
+
+msgid "Required"
+msgstr "Notwendig"
+
+msgid "You have been registered, here is your XMPP address:"
+msgstr "Du wurdest registriert, deine XMPP-Adresse lautet:"
+
+msgid "Manager"
+msgstr "Verwalter"
+
+msgid "Project"
+msgstr "Projekt"
+
+msgid "Encrypted"
+msgstr "Verschlüsselt"
+
+msgid "Unencrypted"
+msgstr "Unverschlüsselt"
+
+msgid "Where are you?"
+msgstr "Wo bist du?"
+
+msgid "What's up with you?"
+msgstr "Was gibt’s?"
+
+msgid "Fetching the social channel..."
+msgstr "Sozialer Kanal wird abgerufen …"
+
+msgid "You are synchronized with your network."
+msgstr "Du bist mit deinen Netzwerken abgeglichen."
+
+msgid "Cannot send anything: you can only receive notices!"
+msgstr "Nichts kann gesendet werden: Du kannst nur Nachrichten empfangen!"
+
+msgid "Media viewer"
+msgstr "Medienbibliothek"
+
+msgid "Browse"
+msgstr "Durchblättern"
+
+msgid "Command"
+msgstr "Befehl"
+
+msgid "Subscribe"
+msgstr "Abonnieren"
+
+msgid "Join"
+msgstr "Beitreten"
+
+msgid "Automatic"
+msgstr "Automatisch"
+
+msgid "Search"
+msgstr "Suchen"
+
+msgid "No result!"
+msgstr "Kein Ergebnis!"
+
+msgid "No notifications."
+msgstr "Keine Benachrichtigungen."
+
+msgid "would like to add you as a friend."
+msgstr "würde dich gerne als Freund hinzufügen."
+
+msgid "would like you to join this chatroom:"
+msgstr "würde gerne diesen Chatraum betreten."
+
+msgid "Do you accept?"
+msgstr "Akzeptieren?"
+
+msgid "Yes"
+msgstr "Ja"
+
+msgid "No"
+msgstr "Nein"
+
+msgid "would like to get authorization."
+msgstr "möchte bestätigt werden."
+
+msgid "Do you want to see the friends %s suggests you?"
+msgstr "Möchtest du die Freunde sehen, die %s dir empfiehlt?"
+
+msgid "Submit"
+msgstr "Senden"
+
+msgid "Client"
+msgstr "Client"
+
+msgid "System"
+msgstr "System"
+
+msgid "Local time"
+msgstr "Lokale Zeit"
+
+msgid "Comments"
+msgstr "Kommentare"
+
+msgid "User profile"
+msgstr "Benutzerprofil"
+
+msgid "See his/her position on the globe"
+msgstr "Position auf der Welt"
+
+msgid "Confirm"
+msgstr "Bestätigen"
+
+msgid "anonymous mode"
+msgstr "Anonymer Modus"
+
+msgid "Groups"
+msgstr "Gruppen"
+
+msgid "Unclassified"
+msgstr "Nicht eingeordnet"
+
+msgid "Authorize"
+msgstr "Genehmigen"
+
+msgid "Ask for authorization"
+msgstr "Frage nach Genehmigung"
+
+msgid "Unblock"
+msgstr "Freischalten"
+
+msgid "Prohibit"
+msgstr "Verbieten"
+
+msgid "Block"
+msgstr "Blockieren"
+
+msgid "Chat"
+msgstr "Chat"
+
+msgid "Groupchat"
+msgstr "Gruppenchat"
+
+msgid "Jappix Mobile"
+msgstr "Jappix unterwegs"
+
+msgid "Desktop"
+msgstr "Desktop"
+
+msgid "Mobile"
+msgstr "Unterwegs"
+
+msgid "Please wait..."
+msgstr "Bitte warten …"
+
+msgid "Please enable JavaScript"
+msgstr "Bitte JavaScript aktivieren"
+
+msgid "Your channel"
+msgstr "Dein Kanal"
+
+msgid "Channel of"
+msgstr "Kanal von"
+
+msgid "More notices..."
+msgstr "Mehr Nachrichten …"
+
+msgid "Attach a file"
+msgstr "Datei anhängen"
+
+msgid "Send"
+msgstr "Senden"
+
+msgid "Unattach the file"
+msgstr "Angehängte Datei löschen"
+
+msgid "An error occured while uploading your file: maybe it is too big (%s maximum) or forbidden!"
+msgstr "Beim Hochladen deiner Datei ist ein Fehler aufgetreten: Wahrscheinlich ist es zu groß (maximal %s) oder verboten!"
+
+msgid "Authorization failed"
+msgstr "Genehmigung fehlgeschlagen"
+
+msgid "Registration failed, please choose a different username"
+msgstr "Registrierung fehlgeschlagen. Bitte wähle einen anderen Benutzernamen."
+
+msgid "Service unavailable"
+msgstr "Dienst nicht erreichbar"
+
+msgid "Internal server error, try later"
+msgstr "Interner Serverfehler. Versuche es später noch Mal."
+
+msgid "Your form has been sent."
+msgstr "Das Formular wurde versendet."
+
+msgid "Application"
+msgstr "Anwendung"
+
+msgid "XMPP links"
+msgstr "XMPP-Verweise"
+
+msgid "Open XMPP links with Jappix"
+msgstr "XMPP-Verweise mit Jappix öffnen"
+
+msgid "changed the subject to:"
+msgstr "hat das Thema geändert zu:"
+
+msgid "Welcome!"
+msgstr "Willkommen!"
+
+msgid "Friends"
+msgstr "Freunde"
+
+msgid "Welcome on Jappix, your own social cloud!"
+msgstr "Willkommen bei Jappix!"
+
+msgid "Before you start using it, you will have to change some settings, search for friends and complete your profile."
+msgstr "Bevor du beginnst, musst du noch einiges einstellen, nach Freunden suchen und dein Profil ausfüllen."
+
+msgid "Enable notification sounds"
+msgstr "Benachrichtigungsgeräusche einschalten"
+
+msgid "Share your position on the globe"
+msgstr "Deine Position freigeben"
+
+msgid "Offline friends"
+msgstr "Freunde (nicht verfügbar)"
+
+msgid "Don't hide offline friends"
+msgstr "Nicht verfügbare Freunde anzeigen"
+
+msgid "Use this tool to find your friends on the server you are using right now, or add them later."
+msgstr "Benutze dieses Werkzeug, um Freunde auf dem aktuellen Server zu finden, oder versuche es später."
+
+msgid "Great work! Now, you can share Jappix with your friends!"
+msgstr "Gut gemacht! Jetzt kannst du Jappix mit deinen Freunden teilen!"
+
+msgid "When you will press the save button, the profile editor will be opened. Happy socializing!"
+msgstr "Wenn du Speichern klickst, wird die Profilbearbeitung geöffnet. Fröhliches Netzwerken!"
+
+msgid "Share Jappix on %s"
+msgstr "Jappix über %s teilen"
+
+msgid "Using Jappix, an open social platform. I am %s!"
+msgstr "Ich nutze Jappix, ein freies soziales Netzwerk. Ich bin %s!"
+
+msgid "Unknown name"
+msgstr "Unbekannter Name"
+
+msgid "Unknown country"
+msgstr "Unbekanntes Land"
+
+msgid "Click to enable"
+msgstr "Zum Einschalten klicken"
+
+msgid "Click to disable"
+msgstr "Zum Ausschalten klicken"
+
+msgid "Installation"
+msgstr "Installation"
+
+msgid "Jappix installation"
+msgstr "Jappix-Installation"
+
+msgid "Welcome to the Jappix installation!"
+msgstr "Willkommen zur Jappix-Installation"
+
+msgid "This tool will help you fastly install Jappix, the first full-featured XMPP-based social platform, on your server. You don't even need any technical knowledge."
+msgstr "Dieses Tool wird dir helfen Jappix, die erste voll funktionstüchtige XMPP-basierte soziale Platform, schnell auf deinem Server zu installieren. Du brauchst dazu nichteinmal technisches Wissen."
+
+msgid "Let's have a look at the installation steps:"
+msgstr "Lass uns die Installationsschritte durchgehen."
+
+msgid "Welcome"
+msgstr "Willkommen"
+
+msgid "Storage configuration"
+msgstr "Speicher-Konfiguration"
+
+msgid "Administrator account"
+msgstr "Verwalter-Konto"
+
+msgid "Main configuration"
+msgstr "Haupteinstellungen"
+
+msgid "Hosts configuration"
+msgstr "Host-Einstellungen"
+
+msgid "Services installation"
+msgstr "Installation von Diensten"
+
+msgid "If the current language does not match yours (%1s), you can make Jappix speak %2s it will be saved."
+msgstr "Wenn die derzeitige Sprache nicht deine ist (%1s), kann Jappix deine sprechen %2s dies wird gespeichert werden."
+
+msgid "If you want to get some help about the Jappix installation and configuration, you can use our whole documentation, available at:"
+msgstr "Wenn du Hilfe bei der Jappix-Installation und -Konfiguration benötigst, kannst du unsere ganze Dokumentation verwenden:"
+
+msgid "It's time to build your own social cloud: just go to the next step!"
+msgstr "Es ist Zeit dein eigenes soziales Netzt zu bauen: Gehe zum nächsten Schritt!"
+
+msgid "Jappix stores persistent data (such as shared files, chat logs, your own music and its configuration) into a single secured storage folder."
+msgstr "Jappix speichert permanente Dateien (wie öffentliche Dateien, Chatlogs, deine Musik und die Einstellungen) in einem separat gesicherten Ordner."
+
+msgid "Jappix must be able to write in this folder to create its sub-directories. If not, you must set the rights to %1s or change the folder owner to %2s (depending of your configuration)."
+msgstr "Jappix muss Schreibberechtigungen in diesem Ordner haben um sein Unterordner zu erzeugen. Wenn nicht, setze die Rechte zu %1s oder ändere den Besitzer des Ordners zu %2s, je nach deiner Konfiguration."
+
+msgid "The folder is writable, you can continue!"
+msgstr "Der Ordner ist schreibbar, du kannst weitermachen!"
+
+msgid "Jappix offers you the possibility to manage your configuration, install new addons or search for updates. That's why you must create an administrator account to access the manager."
+msgstr "Jappix bietet dir die Möglichkeit, deine Konfiguration einzustellen, neue Addons zu installieren oder nach Updates zu suchen. Deshalb musst Du ein Admin-Account anlegen um auf die Verwaltung zugreifen zu können."
+
+msgid "When Jappix will be installed, just click on the manager link on the home page to access it."
+msgstr "Wenn Jappix installiert ist, klicke einfach auf den Manager-Link auf der Homepage um darauf zuzugreifen."
+
+msgid "Oops, you missed something or the two passwords do not match!"
+msgstr "Du hast etwas vergessen, oder die beiden Passwörter stimmen nicht überein."
+
+msgid "Jappix needs that you specify some values to work. Please correct the following inputs (or keep the default values, which are sufficient for most people)."
+msgstr "Jappix benötigt einige Werte um richtig zum Funktionieren. Bitte ändere die folgenden Eingaben (oder behalte die Vorgaben, welche für die meisten Leute passen)."
+
+msgid "Note that if you don't specify a value which is compulsory, it will be automatically completed with the default one."
+msgstr "Beachte, wenn ein obligatorischer Wert nicht gesetzt wird, so wird dieser automatisch mit dem vorgegebenen ersetzt. "
+
+msgid "User"
+msgstr "Benutzer"
+
+msgid "Service"
+msgstr "Dienst"
+
+msgid "Service name"
+msgstr "Name des Dienstes"
+
+msgid "Service description"
+msgstr "Dienst-Beschreibung"
+
+msgid "Connection"
+msgstr "Verbindung"
+
+msgid "Lock the host"
+msgstr "Sperre den Host"
+
+msgid "Anonymous mode"
+msgstr "Anonymer Modus"
+
+msgid "Registration allowed"
+msgstr "Registrieren erlaubt"
+
+msgid "Use a proxy"
+msgstr "Einen Proxy nutzen"
+
+msgid "Encryption"
+msgstr "Verschlüsselung"
+
+msgid "HTTPS storage"
+msgstr "HTTPS-Speicher"
+
+msgid "Force HTTPS"
+msgstr "Sichere Verbindung erzwingen"
+
+msgid "Compression"
+msgstr "Komprimierung"
+
+msgid "This page helps you specify the default hosts Jappix will connect to. You can leave it as it is and continue if you want to use the official service hosts."
+msgstr "Diese Seite hilft dir Jappix' Default-Hosts zu spezifizieren. Du kannst alles lassen wie es ist, wenn du den offiziellen Service-Host nutzen willst."
+
+msgid "Maybe you don't know what a BOSH server is? In fact, this is a relay between a Jappix client and a XMPP server, which is necessary because of technical limitations."
+msgstr "Vielleicht weißt du nicht, was ein BOSH-Server ist? Es ist ein Verbindung zwischen dem Jappix-Client und einem XMPP-Server, welcher aufgrund technischer Beschränkungen nötig ist."
+
+msgid "Main host"
+msgstr "Haupt-Host"
+
+msgid "Groupchat host"
+msgstr "Gruppenchat-Host"
+
+msgid "Anonymous host"
+msgstr "Anonymer Host"
+
+msgid "Directory host"
+msgstr "Verzeichnis-Host"
+
+msgid "BOSH host"
+msgstr "BOSH-Host"
+
+msgid "You can install some extra softwares on your server, to extend your Jappix features. Some others might be modified, because of security restrictions which are set by default."
+msgstr "Du kannst einige extra Software auf deinem Server installieren um Jappix Funktionen zu erweitern. Manche müssen vielleicht aufgrund von Sicherheitsbeschränkungen modifiziert werden."
+
+msgid "To perform this, you must be able to access your server's shell and be logged in as root. Remember this is facultative, Jappix will work without these modules, but some of its features will be unavailable."
+msgstr "Um dies durchzuführen, musst du Zugriff auf Konsole des Servers mit Root-Rechten haben. Dies ist fakultativ. Jappix wird ohne die Module funktionieren, aber einige Features werden nicht verfügbar sein."
+
+msgid "After you finished the setup, Jappix will generate the cache files. It might be slow, just wait until the application is displayed and do not press any button."
+msgstr "Nach dem Ende der Installation wird Jappix die Cache-Files erzeugen. Dies kann etwas dauern. Bitte warte, bis die Anwendung angezeigt wird und drücke keine währenddessen keine Taste."
+
+msgid "Thanks for using Jappix!"
+msgstr "Vielen Dank für die Benutzung von Jappix!"
+
+msgid "Next"
+msgstr "Weiter"
+
+msgid "Finish"
+msgstr "Beenden"
+
+msgid "Check again"
+msgstr "Nochmals überprüfen"
+
+msgid "The folder is not writable, set the right permissions to the %s directory."
+msgstr "Der Ordner ist nicht beschreibbar. Setze die korrekten Berechtigungen für den Ordner %s"
+
+msgid "%s is installed on your system."
+msgstr "%s ist auf deinem System installiert."
+
+msgid "%1s is not installed on your system, you should install %2s."
+msgstr "%1s ist nicht auf denem System installiert, du solltest %2s installieren."
+
+msgid "PHP maximum upload size is sufficient (%s)."
+msgstr "Die maximale Größe für PHP-Uploads reicht aus (%s)."
+
+msgid "PHP maximum upload size is not sufficient (%1s), you should define it to %2s in %3s."
+msgstr "Die maximale Größe für PHP-Uploads reicht nicht aus (%1s), du solltest es für %2s in %3s bestimmen."
+
+msgid "Jappix manager"
+msgstr "Jappix-Verwaltung"
+
+msgid "Manager access"
+msgstr "Verwalter-Zugang"
+
+msgid "Statistics"
+msgstr "Statistiken"
+
+msgid "Hosts"
+msgstr "Hosts"
+
+msgid "Design"
+msgstr "Gestaltung"
+
+msgid "Repeat"
+msgstr "Wiederholen"
+
+msgid "All"
+msgstr "Alle"
+
+msgid "Horizontal"
+msgstr "Horizontal"
+
+msgid "Vertical"
+msgstr "Vertikal"
+
+msgid "Center"
+msgstr "Zentriert"
+
+msgid "Left"
+msgstr "Links"
+
+msgid "Right"
+msgstr "Rechts"
+
+msgid "Top"
+msgstr "Oben"
+
+msgid "Bottom"
+msgstr "Unten"
+
+msgid "Adapt"
+msgstr "Anpassen"
+
+msgid "Color"
+msgstr "Farbe"
+
+msgid "Users"
+msgstr "Benutzer"
+
+msgid "Updates"
+msgstr "Aktualisierungen"
+
+msgid "This is a restricted area: only the authorized users can manage this Jappix node."
+msgstr "Dies ist ein eingeschränkter Bereich: Nur genehmigte Benutzer können diese Jappix-Node verwalten."
+
+msgid "Please use the form below to login to the administration panel."
+msgstr "Benutze das Formular für die Anmeldung in den Verwaltungsbereich."
+
+msgid "To improve security, sessions are limited in time and when your browser will be closed, you will be logged out."
+msgstr "Zur Sicherheit sind Sitzungen zeitbegrenzt. Wenn du den Browser schließt, wirst du ebenfalls abgemeldet."
+
+msgid "Credentials"
+msgstr "Anmeldedaten"
+
+msgid "You have been logged out. Goodbye!"
+msgstr "Du wurdest abgemeldet. Auf Wiedersehen!"
+
+msgid "Oops, you could not be recognized as a valid administrator. Check your credentials!"
+msgstr "Du konntest nicht als Verwalter erkannt werden. Bitte prüfe deine Eingabe."
+
+msgid "Basic statistics are processed by Jappix about some important things, you can find them below."
+msgstr "Grundsätzliche Statistiken einiger wichtiger Dinge werden von Jappix erfasst. Du findest sie untenstehend."
+
+msgid "Change your Jappix node configuration with this tool."
+msgstr "Ändere die Jappix Node-Konfiguration mit diesem Tool."
+
+msgid "Change the XMPP hosts that this Jappix node serve with this tool."
+msgstr "Ändere den XMPP-Hosts den dieser Jappix-Node nutzt mit diesem Tool."
+
+msgid "All this Jappix node stored files can be managed with this tool: please select a sub-folder and start editing its content!"
+msgstr "Alle Datein dieses Jappix-Nodes können mit diesem Tool verwaltet werden: Bitte wähle ein Unterverzeichnis und editiere dessen Inhalt."
+
+msgid "Jappix is fully customisable: you can change its design right here."
+msgstr "Jappix ist voll anpassbar: Du kannst sein Design hier ändern."
+
+msgid "This is not a valid image, please use PNG, GIF or JPG!"
+msgstr "Ungültiges Bildformat! Benutze bitte PNG, GIF oder JPEG!"
+
+msgid "The image could not be received, would you mind retry?"
+msgstr "Das Bild konnte nicht übertragen werden. Bitte versuche es noch Mal."
+
+msgid "Your image was added to the list!"
+msgstr "Dein Bild wurde hinzugefügt!"
+
+msgid "Changes saved!"
+msgstr "Änderungen gespeichert!"
+
+msgid "You can define more than one administrator for this Jappix node. You can also change a password with this tool."
+msgstr "Du kannst mehr als einen Administrator für diesen Jappix-Node festlegen. Du kannst mit diesem Tool auch ein Password ändern."
+
+msgid "Update your Jappix node with this tool, or check if a new one is available. Informations about the latest version are also displayed (in english)."
+msgstr "Aktualisiere deinen Jappix-Node mit diesem Tool, oder schau nach, ob ein neues verfügbar ist. Informationen über die neuste Version werden auch (in englisch) angezeigt."
+
+msgid "Access statistics"
+msgstr "Zugriffs-Statistiken"
+
+msgid "Share statistics"
+msgstr "Freigabe-Statistiken"
+
+msgid "Other statistics"
+msgstr "Andere Statistiken"
+
+msgid "January"
+msgstr "Januar"
+
+msgid "February"
+msgstr "Februar"
+
+msgid "March"
+msgstr "März"
+
+msgid "April"
+msgstr "April"
+
+msgid "May"
+msgstr "Mai"
+
+msgid "June"
+msgstr "Juni"
+
+msgid "July"
+msgstr "Juli"
+
+msgid "August"
+msgstr "August"
+
+msgid "September"
+msgstr "September"
+
+msgid "October"
+msgstr "Oktober"
+
+msgid "November"
+msgstr "November"
+
+msgid "December"
+msgstr "Dezember"
+
+msgid "Monday"
+msgstr "Montag"
+
+msgid "Tuesday"
+msgstr "Dienstag"
+
+msgid "Wednesday"
+msgstr "Mittwoch"
+
+msgid "Thursday"
+msgstr "Donnerstag"
+
+msgid "Friday"
+msgstr "Freitag"
+
+msgid "Saturday"
+msgstr "Samstag"
+
+msgid "Sunday"
+msgstr "Sonntag"
+
+msgid "Total"
+msgstr "Gesamt"
+
+msgid "Cache"
+msgstr "Zwischenspeicher"
+
+msgid "Logs"
+msgstr "Protokolle"
+
+msgid "Music"
+msgstr "Musik"
+
+msgid "Backgrounds"
+msgstr "Hintergründe"
+
+msgid "Share"
+msgstr "Freigabe"
+
+msgid "Background"
+msgstr "Hintergrund"
+
+msgid "Notice"
+msgstr "Hinweis"
+
+msgid "Your design preferences have been saved!"
+msgstr "Deine Gestaltung wurde gespeichert."
+
+msgid "Please check your inputs: something is missing!"
+msgstr "Bitte kontrolliere deine Eingaben: Es fehlt etwas!"
+
+msgid "Change your Jappix node background with this tool. You can either set a custom color or an uploaded image. Let your creativity flow!"
+msgstr "Ändere Dein Jappix-Node Hintergrund mit diesem Tool. Du kannst entweder eine eigene Farbe oder ein hochgeladenes Bild wählen. Sei kreativ!"
+
+msgid "Use default background"
+msgstr "Vorgegebenen Hintergrund verwenden"
+
+msgid "Use your own image"
+msgstr "Bild selber wählen"
+
+msgid "Select a background to use and change the display options."
+msgstr "Einen Hintergrund wählen und die Gestaltung ändern."
+
+msgid "Use your own color"
+msgstr "Farbe selber wählen"
+
+msgid "Type the hexadecimal color value you want to use as a background."
+msgstr "Der hexadezimale Farbwert für den Hintergrund."
+
+msgid "Manage backgrounds"
+msgstr "Hintergründe verwalten"
+
+msgid "You can add a new background to the list with this tool. Please send a valid image."
+msgstr "Du kannst einen neuen Hintergrund hinzufügen. Bitte sende ein gültiges Bild."
+
+msgid "If you want to remove some backgrounds, use the browser below."
+msgstr "Wenn du einen Hintergrund entfernen möchtest, benutze den untenstehenden Browser."
+
+msgid "Define a homepage notice for all your users, such as a warn, an important message or an advert with this tool."
+msgstr "Einen Hinweis auf der Startseite für all deine Besucher erstellen."
+
+msgid "Simple notice"
+msgstr "Einfacher Hinweis"
+
+msgid "This notice only needs simple text to be displayed, but no code is allowed!"
+msgstr "Diesen Hinweis kannst du mit normalem Text nutzen, Code ist nicht erlaubt!"
+
+msgid "Advanced notice"
+msgstr "Erweiterter Hinweis"
+
+msgid "You can customize your notice with embedded HTML, CSS and JavaScript, but you need to code the style."
+msgstr "Du kannst deine Ankündigung mit HTML, CSS und JavaScript bearbeiten. Aber du musst den Code selbst erstellen."
+
+msgid "Available updates"
+msgstr "Verfügbare Aktualisierungen"
+
+msgid "What's new?"
+msgstr "Was gibt’s Neues?"
+
+msgid "Your storage folders are not writable, please apply the good rights!"
+msgstr "Deine Speicherordner haben keine Schreibrechte, bitte ändere das!"
+
+msgid "%1s may cause problems to the proxy, please increase %2s value up to %3s!"
+msgstr "%1s kann Probleme mit dem Proxy verursachen. Bitte erhöhe den Wert von %2s auf %3s."
+
+msgid "You are using a development version of Jappix. Update it through our repository by executing: %s."
+msgstr "Du benutzt eine Entwicklerversion von Jappix. Du kannst über unser Repository Updates beziehen wenn du %s ausführst."
+
+msgid "A new Jappix version is available! Check what is new and launch the update!"
+msgstr "Eine neue Version von Jappix ist verfügbar! Schau’ dir die Neuerungen an und starte die Aktualisierung!"
+
+msgid "Your version is out to date. Update it now to %s by clicking here!"
+msgstr "Deine Version ist veraltet. Klicke hier, um auf %2 zu aktualisieren."
+
+msgid "Your version seems to be up to date, but you can check updates manually by clicking here."
+msgstr "Deine Version schein aktuell zu sein, aber du kannst es manuell prüfen, indem du hier klickst."
+
+msgid "Check for updates"
+msgstr "Nach Updates suchen"
+
+msgid "Update in progress"
+msgstr "Wird aktualisiert"
+
+msgid "Jappix has been updated: you are now running the latest version. Have fun!"
+msgstr "Jappix wurde aktualisiert: Du benutzt nun die neueste Version. Viel Spaß!"
+
+msgid "The update has failed! Please try again later."
+msgstr "Die Aktualisierung schlug fehl! Bitte versuche es später noch ein Mal."
+
+msgid "Downloading package..."
+msgstr "Wird heruntergeladen …"
+
+msgid "Removing current Jappix system files..."
+msgstr "Aktuelle Jappix-Systemdateien werden entfernt …"
+
+msgid "Extracting package..."
+msgstr "Wird entpackt …"
+
+msgid "Regenerating storage folder tree..."
+msgstr "Verzeichnisbaum wird neu erstellt …"
+
+msgid "Jappix is now up to date!"
+msgstr "Jappix ist jetzt aktuell!"
+
+msgid "Aborted: socket error!"
+msgstr "Abbruch: Socket-Fehler!"
+
+msgid "Aborted: buffer error!"
+msgstr "Abbruch: Puffer-Fehler!"
+
+msgid "Aborted: everything is not writable!"
+msgstr "Abbruch: Keine Schreibrechte!"
+
+msgid "Aborted: could not extract the package!"
+msgstr "Abbruch: Paket konnte nicht entpackt werden!"
+
+msgid "Visits"
+msgstr "Besuche"
+
+msgid "Daily"
+msgstr "Täglich"
+
+msgid "Weekly"
+msgstr "Wöchentlich"
+
+msgid "Monthly"
+msgstr "Monatlich"
+
+msgid "Yearly"
+msgstr "Jährlich"
+
+msgid "Size"
+msgstr "Größe"
+
+msgid "Clean everything"
+msgstr "Alles säubern"
+
+msgid "Purge cache"
+msgstr "Cache leeren"
+
+msgid "Purge logs"
+msgstr "Protokolle löschen"
+
+msgid "Purge updates"
+msgstr "Aktualisierungen löschen"
+
+msgid "The storage folder you wanted to clean is now empty!"
+msgstr "Das Speicher-Verzeichnis, das du säubern wolltest ist jetzt leer!"
+
+msgid "Keep your Jappix node fresh and fast, clean the storage folders regularly!"
+msgstr "Halte deinen Jappix-Node frisch und schnell, säubere die Speicher-Ordner regelmäßig!"
+
+msgid "Upload your music (Ogg Vorbis, MP3 or WAV) to be able to listen to it in Jappix!"
+msgstr "Lade deine Musik (Ogg Vorbis, MP3 oder WAV) hoch um sie in Jappix zu hören."
+
+msgid "The file you want to upload must be smaller than %s."
+msgstr "Die hochzuladende Datei muss kleiner als %s sein."
+
+msgid "Stay tuned in what your users store on your server and remove undesired content with this tool."
+msgstr "Bleib auf dem Laufenden, was Deine Nutzer auf deinem Server speichern und entferne ungewünschte Inhalte mit diesem Tool."
+
+msgid "Title"
+msgstr "Titel"
+
+msgid "Artist"
+msgstr "Künstler"
+
+msgid "Album"
+msgstr "Album"
+
+msgid "File"
+msgstr "Datei"
+
+msgid "Upload"
+msgstr "Hochladen"
+
+msgid "The folder is empty."
+msgstr "Dieser Ordner ist leer."
+
+msgid "The music could not be received, please retry!"
+msgstr "Deine Musik konnte nicht empfangen werden, bitte versuche es noch ein Mal."
+
+msgid "This is not a valid music file, please encode in Ogg Vorbis, MP3 or WAV!"
+msgstr "Das ist keine gültige Musikdatei, bitte nimm eine Ogg Vorbis, MP3 oder WAV!"
+
+msgid "Your music has been added!"
+msgstr "Deine Musik wurde hinzugefügt."
+
+msgid "The selected elements have been removed."
+msgstr "Die ausgewählten Elemente wurden entfernt."
+
+msgid "You must select elements to remove!"
+msgstr "Sie müssen Elemente auswählen um welche zu entfernen!"
+
+msgid "Add a new user with this tool, or change a password (type an existing username). Please submit a strong password!"
+msgstr "Füge neue Beutzer mit diesem Tool hinzu. Ändere ein Passwort (gebe einen existierenden Benutzernamen ein). Bitte benutze ein starkes Passwort!"
+
+msgid "Manage"
+msgstr "Verwalten"
+
+msgid "List"
+msgstr "Liste"
+
+msgid "Remove users with this tool. Note that you cannot remove an user if he is the only one remaining."
+msgstr "Entferne Benutzer mit diesem Tool. Beachte, dass du keinen Benutzer entfernen kannst, wenn er der einzig exisierende ist."
+
+msgid "The user has been added!"
+msgstr "Der Benutzer wurde hinzugefügt."
+
+msgid "The chosen users have been removed."
+msgstr "Die ausgewählten Benutzer wurden entfernt."
+
+msgid "You must select one or more users to be removed!"
+msgstr "Du musst einen oder mehrere Benutzer auswählen, die gelöscht werden sollen!"
+
+msgid "Yesterday"
+msgstr "Gestern"
+
+msgid "%s days ago"
+msgstr "Vor %s Tagen"
+
+msgid "User currently active"
+msgstr "Benutzer momentan aktiv"
+
+msgid "Last seen: %s"
+msgstr "Zuletzt gesehen: %s"
+
+msgid "Inactive since: %s"
+msgstr "Inaktiv seit: %s"
+
+msgid "Your friend seems not to have received your message(s)!"
+msgstr "Dein Freund hat deine Nachricht anscheinend nicht erhalten!"
+
+msgid "Static content server"
+msgstr "Statischer Inhaltsserver"
+
+msgid "This is the static content server for %1s, “%2s”."
+msgstr "Dies ist der statische Inhaltsserver für %1s, »%2s«."
+
+msgid "Suggested friends"
+msgstr "Empfohlene Freunde"
+
+msgid "Check all"
+msgstr "Alle auswählen"
+
+msgid "Uncheck all"
+msgstr "Alle abwählen"
+
+msgid "Choose"
+msgstr "Wählen"
+
+msgid "List name"
+msgstr "Listenname"
+
+msgid "Allow"
+msgstr "Erlauben"
+
+msgid "Deny"
+msgstr "Ablehnen"
+
+msgid "Group"
+msgstr "Gruppe"
+
+msgid "Subscription"
+msgstr "Abonnement"
+
+msgid "Both"
+msgstr "Beides"
+
+msgid "From"
+msgstr "Von"
+
+msgid "Everybody"
+msgstr "Jeder"
+
+msgid "Send messages"
+msgstr "Nachrichten senden"
+
+msgid "Send queries"
+msgstr "Anfragen senden"
+
+msgid "See my status"
+msgstr "Status einsehen"
+
+msgid "Send his/her status"
+msgstr "Status senden"
+
+msgid "Everything"
+msgstr "Alles"
+
+msgid "Item"
+msgstr "Element"
+
+msgid "Order"
+msgstr "Reihenfolge"
+
+msgid "Active for this session"
+msgstr "Aktiv in dieser Sitzung"
+
+msgid "Always active"
+msgstr "Immer aktiv"
+
+msgid "User directory"
+msgstr "Nutzerverzeichnis"
+
+msgid "Search a friend"
+msgstr "Einen Freund suchen"
+
+msgid "The feature requested is not implemented by the recipient or server and therefore cannot be processed."
+msgstr "Die anfegorderte Funktion ist beim Server oder Empfänger nicht implementiert und kann daher nicht ausgeführt werden."
+
+msgid "This is a repeat from %s"
+msgstr "Dies ist eine Wiederholung von %s"
+
+msgid "Loading comments..."
+msgstr "Lade Kommentare..."
+
+msgid "Type your comment here..."
+msgstr "Gebe dein Kommentar hier ein..."
+
+msgid "Could not get the comments!"
+msgstr "Konnte Kommentare nicht laden!"
+
+msgid "Show comments"
+msgstr "Zeige Kommentare"
+
+msgid "Send him/her a message"
+msgstr "Sende Ihm/Ihr eine Nachricht"
+
+msgid "Start a chat with him/her"
+msgstr "Starte Chat mit Ihm/Ihr"
+
+msgid "Media integration"
+msgstr "Medien Einbindung"
+
+msgid "Comments locked!"
+msgstr "Kommentare sind gesperrt!"
+
+msgid "Type something you want to share with your friends..."
+msgstr "Schreibe etwas, um es mit deinen Freunden zu teilen..."
+
+msgid "changed his/her nickname to %s"
+msgstr "hat Seinen Spitznamen zu %s geändert"
+
+msgid "commented an item you follow: “%s”."
+msgstr "hat ein Item, dem du folgst, kommentiert: »%s«."
+
+msgid "Hide"
+msgstr "Verstecken"
+
+msgid "liked your post: “%s”."
+msgstr ""
+
+msgid "quoted you somewhere: “%s”."
+msgstr "hat dich zitiert: »%s«."
+
+msgid "published on your wall: “%s”."
+msgstr ""
+
+msgid "tagged you in a photo (%s)."
+msgstr "hat dich in einem Foto markiert (%s)."
+
+msgid "tagged you in a video (%s)."
+msgstr "hat dich in einem Video markiert (%s)."
+
+msgid "Show"
+msgstr "Zeigen"
+
+msgid "Need help? You'd better read our documentation page about how to fill this form!"
+msgstr "Brauchst du Hilfe? Lies unsere Dokumentation, wie man dieses Formular ausfüllt!"
+
+msgid "Pubsub host"
+msgstr "Pubsub Anbieter"
+
+msgid "Jappix is a great social platform, that you can access wherever you are, whenever you want and communicate with whovever you want."
+msgstr "Jappix ist eine großartige soziale Platform, auf die du immer und überall Zugriff hast und auf der du kommunizieren kannst, mit wem du willst."
+
+msgid "Manager link"
+msgstr "Manager Link"
+
+msgid "User uploads server"
+msgstr "Nutzer-Uploadserver"
+
+msgid "This is the user uploads server for %1s, “%2s”."
+msgstr "Dies ist der Nutzer-Uploadserver für %1s, »%2s«."
+
+msgid "Logo"
+msgstr "Logo"
+
+msgid "You can set your own service logo to replace the default one. Take care of the size and the main color of each logo!"
+msgstr "Du kannst dein eigenes Service-Logo setzen, um das Standard-Logo zu ersetzen. Pass auf die Größe und Hauptfarbe jedes Logos auf!"
+
+msgid "Upload each logo with the recommended maximum pixel size."
+msgstr "Lade jedes Logo mit der empfohlenen maximalen Auflösung hoch."
+
+msgid "This is not a valid image, please use the PNG format!"
+msgstr "Dies ist kein gültiges Bild, bitte verwende das PNG format!"
+
+msgid "Your service logo has been successfully changed!"
+msgstr "Dein Service-Logo wurde erfolgreich geändert!"
+
+msgid "Your logo format must be PNG. Leave a field empty and the logo will not be changed."
+msgstr "Das Format deines Logos muss PNG sein. Lasse ein Feld aus und das Logo wird nicht geändert."
+
+msgid "Remove this logo"
+msgstr "Entferne dieses Logo."
+
+msgid "View this logo"
+msgstr "Zeige dieses Logo"
+
+msgid "Send a file"
+msgstr "Eine Datei senden"
+
+msgid "Once uploaded, your friend will be prompted to download the file you sent."
+msgstr "Wenn hochgeladen, werden deine Freunde dazu aufgefordert, die Datei herunterzuladen."
+
+msgid "Groupchats to join"
+msgstr "Gruppenchats zum Beitreten"
+
+msgid "Purge sent files"
+msgstr "Die gesendeten Dateien leeren"
+
+msgid "would like to send you a file: “%s”."
+msgstr "würde dir gerne eine Datei senden: “%s”."
+
+msgid "has accepted to received your file: “%s”."
+msgstr "ist damit einverstanden, deine Datei zu empfangen: “%s”."
+
+msgid "has rejected to receive your file: “%s”."
+msgstr "will deine Datei nicht empfangen: “%s”."
+
+msgid "could not receive your file: “%s”."
+msgstr "konnte deine Datei nicht empfangen: “%s”"
+
+msgid "has received a file exchange request: “%s”."
+msgstr "hat eine Anfrage zum Dateiaustausch empfangen: “%s”"
+
+msgid "Available shortcuts:"
+msgstr "Verfügbare Tastenkombinationen:"
+
+msgid "%s removes the chat logs"
+msgstr "%s entfernt die Chat-Protokolle"
+
+msgid "%s joins a groupchat"
+msgstr "%s tritt einem Gruppenchat bei"
+
+msgid "%s closes the chat"
+msgstr "%s schließt den Chat"
+
+msgid "%s shows the user profile"
+msgstr "%s zeigt das Benutzerprofil"
+
+msgid "%s sends a message to the room"
+msgstr "%s sendet eine Nachricht in den Raum"
+
+msgid "%s changes your nickname"
+msgstr "%s ändert deinen Nicknamen"
+
+msgid "%s sends a message to someone in the room"
+msgstr "%s sendet eine Nachricht zu jemandem im Raum"
+
+msgid "%s changes the room topic"
+msgstr "%s ändert das Thema des Raumes"
+
+msgid "%s kicks an user of the room"
+msgstr "%s schmeißt jemanden aus dem Raum"
+
+msgid "%s bans an user of the room"
+msgstr "%s bannt jemanden aus dem Raum"
+
+msgid "%s invites someone to join the room"
+msgstr "%s lädt jemanden ein, den Raum beizutreten"
+
+msgid "Social channel, chat and more."
+msgstr ""
+
+msgid "Create your public profile."
+msgstr ""
+
+msgid "A mini-chat for your website."
+msgstr ""
+
+msgid "Get Jappix, get support."
+msgstr ""
+
+msgid "Statistics around Jappix."
+msgstr ""
+
+msgid "Download Jappix for free."
+msgstr ""
+
+msgid "Find a public Jappix node."
+msgstr ""
+
+msgid "Public profile"
+msgstr ""
+
+msgid "Your profile anywhere on the Web."
+msgstr ""
+
+msgid "%s is a Jappix.com service which makes your XMPP profile public. It is easier to share it. No XMPP account is required to view your social channel, your current position and your contact details."
+msgstr ""
+
+msgid "Furthermore, every picture you post in your social channel is added to a beautiful picture timeline. You can now view the pictures you shared year by year."
+msgstr ""
+
+msgid "You can also use your XMPP avatar as a single avatar for every website, blog and forum you use. When you change it on XMPP, the new avatar appears everywhere. What a genious improvement!"
+msgstr ""
+
+msgid "Yay, let's create my public profile!"
+msgstr ""
+
+msgid "Enable my public profile"
+msgstr ""
+
+#~ msgid "Jappix is a non-profit social platform, that you can access wherever you are, whenever you want and communicate with whovever you want."
+#~ msgstr "Jappix in eine gemeinnützige soziale Plattform, die du nutzen kannst wo du auch bist, wann immer du willst und egal mit wem du dich unterhalten möchtest."
+
+#~ msgid "See"
+#~ msgstr ""
+
+#~ msgid "Use default logo"
+#~ msgstr ""
+
+#~ msgid "Use your own logo"
+#~ msgstr ""
+
+#~ msgid "The recommended image format is PNG. Leave a field empty and the logo will not be changed."
+#~ msgstr ""
diff --git a/jappixmini/jappix/lang/en/LC_MESSAGES/main.pot b/jappixmini/jappix/lang/en/LC_MESSAGES/main.pot
new file mode 100644
index 00000000..108bb18a
--- /dev/null
+++ b/jappixmini/jappix/lang/en/LC_MESSAGES/main.pot
@@ -0,0 +1,1856 @@
+# Jappix - An open social platform
+# These are the default english strings of Jappix
+
+# -------------------------------------------------
+
+# License: AGPL
+# Authors: Vanaryon, JanCBorchardt
+# Last revision: 16/01/12
+
+msgid "JavaScript is missing in your web browser, so that you will not be able to launch Jappix! Please fix this."
+msgstr ""
+
+msgid "An open social network"
+msgstr ""
+
+msgid "Social channel, chat and more."
+msgstr ""
+
+msgid "Create your public profile."
+msgstr ""
+
+msgid "A mini-chat for your website."
+msgstr ""
+
+msgid "Get Jappix, get support."
+msgstr ""
+
+msgid "Statistics around Jappix."
+msgstr ""
+
+msgid "Download Jappix for free."
+msgstr ""
+
+msgid "Find a public Jappix node."
+msgstr ""
+
+msgid "Jappix has been interrupted by a network issue, a bug or bad login (check that you entered the right credentials), sorry for the inconvenience."
+msgstr ""
+
+msgid "The element list on this server could not be obtained!"
+msgstr ""
+
+msgid "Your password has been changed, now you can connect to your account with your new login data."
+msgstr ""
+
+msgid "Your XMPP account has been removed, bye!"
+msgstr ""
+
+msgid "You have been logged out of your XMPP account, have a nice day!"
+msgstr ""
+
+msgid "The room you joined seems not to exist. You should create it!"
+msgstr ""
+
+msgid "The groupchat has been removed, now someone else will be able to recreate it."
+msgstr ""
+
+msgid "The user that you want to reach is not present in the room."
+msgstr ""
+
+msgid "Please enter the group chat address to join."
+msgstr ""
+
+msgid "Please enter your nickname to join %s."
+msgstr ""
+
+msgid "This room (%s) is protected with a password."
+msgstr ""
+
+msgid "Your browser is out of date!"
+msgstr ""
+
+msgid "Last %s version is better!"
+msgstr ""
+
+msgid "Login"
+msgstr ""
+
+msgid "Register"
+msgstr ""
+
+msgid "Here we go!"
+msgstr ""
+
+msgid "Server"
+msgstr ""
+
+msgid "Password"
+msgstr ""
+
+msgid "Remember me"
+msgstr ""
+
+msgid "This tool has been disabled, you cannot use it!"
+msgstr ""
+
+msgid "Due to a network issue, you were disconnected. What do you want to do now?"
+msgstr ""
+
+msgid "Reconnect"
+msgstr ""
+
+msgid "Messages"
+msgstr ""
+
+msgid "Profile"
+msgstr ""
+
+msgid "Options"
+msgstr ""
+
+msgid "Disconnect"
+msgstr ""
+
+msgid "Filter"
+msgstr ""
+
+msgid "Add a friend"
+msgstr ""
+
+msgid "Your groupchats"
+msgstr ""
+
+msgid "Manage your favorite groupchats"
+msgstr ""
+
+msgid "More stuff"
+msgstr ""
+
+msgid "Show all friends"
+msgstr ""
+
+msgid "Only show connected friends"
+msgstr ""
+
+msgid "Message archives"
+msgstr ""
+
+msgid "Date"
+msgstr ""
+
+msgid "Please select a friend to view the chat history."
+msgstr ""
+
+msgid "Nothing found for: %s"
+msgstr ""
+
+msgid "A short message?"
+msgstr ""
+
+msgid "How are you?"
+msgstr ""
+
+msgid "What are you doing?"
+msgstr ""
+
+msgid "Join a chat"
+msgstr ""
+
+msgid "Status"
+msgstr ""
+
+msgid "Available"
+msgstr ""
+
+msgid "Talkative"
+msgstr ""
+
+msgid "Away"
+msgstr ""
+
+msgid "Not available"
+msgstr ""
+
+msgid "Busy"
+msgstr ""
+
+msgid "Mood"
+msgstr ""
+
+msgid "None"
+msgstr ""
+
+msgid "Crazy"
+msgstr ""
+
+msgid "Excited"
+msgstr ""
+
+msgid "Playful"
+msgstr ""
+
+msgid "Happy"
+msgstr ""
+
+msgid "Shocked"
+msgstr ""
+
+msgid "Hot"
+msgstr ""
+
+msgid "Sad"
+msgstr ""
+
+msgid "Amorous"
+msgstr ""
+
+msgid "Confident"
+msgstr ""
+
+msgid "Activity"
+msgstr ""
+
+msgid "Chores"
+msgstr ""
+
+msgid "Drinking"
+msgstr ""
+
+msgid "Eating"
+msgstr ""
+
+msgid "Exercising"
+msgstr ""
+
+msgid "Grooming"
+msgstr ""
+
+msgid "Appointment"
+msgstr ""
+
+msgid "Inactive"
+msgstr ""
+
+msgid "Relaxing"
+msgstr ""
+
+msgid "Talking"
+msgstr ""
+
+msgid "Traveling"
+msgstr ""
+
+msgid "Working"
+msgstr ""
+
+msgid "View profile"
+msgstr ""
+
+msgid "This is a repeat from %s"
+msgstr ""
+
+msgid "Repeat this notice"
+msgstr ""
+
+msgid "Remove this notice"
+msgstr ""
+
+msgid "Your profile"
+msgstr ""
+
+msgid "Identity"
+msgstr ""
+
+msgid "Profile image"
+msgstr ""
+
+msgid "Others"
+msgstr ""
+
+msgid "Personal"
+msgstr ""
+
+msgid "Complete name"
+msgstr ""
+
+msgid "Nickname"
+msgstr ""
+
+msgid "First name"
+msgstr ""
+
+msgid "Last name"
+msgstr ""
+
+msgid "Date of birth"
+msgstr ""
+
+msgid "Contact"
+msgstr ""
+
+msgid "E-mail"
+msgstr ""
+
+msgid "Phone"
+msgstr ""
+
+msgid "Website"
+msgstr ""
+
+msgid "Current"
+msgstr ""
+
+msgid "Delete"
+msgstr ""
+
+msgid "What a pity! You have no profile image defined in your identity card!"
+msgstr ""
+
+msgid "Address"
+msgstr ""
+
+msgid "Street"
+msgstr ""
+
+msgid "City"
+msgstr ""
+
+msgid "Postal code"
+msgstr ""
+
+msgid "Country"
+msgstr ""
+
+msgid "Biography"
+msgstr ""
+
+msgid "Important notice"
+msgstr ""
+
+msgid "Be careful of the information you write into your profile, because it could be accessed by everyone (even someone you don't want to)."
+msgstr ""
+
+msgid "Not everything is private on XMPP; this is one of those things, your public profile (vCard)."
+msgstr ""
+
+msgid "It is strongly recommended to upload a profile image (%s maximum), like a picture of yourself, because that makes you easily recognizable by your friends."
+msgstr ""
+
+msgid "Save"
+msgstr ""
+
+msgid "Cancel"
+msgstr ""
+
+msgid "Edit options"
+msgstr ""
+
+msgid "Channel"
+msgstr ""
+
+msgid "Commands"
+msgstr ""
+
+msgid "Sounds"
+msgstr ""
+
+msgid "Inactive"
+msgstr ""
+
+msgid "Privacy"
+msgstr ""
+
+msgid "Message archiving"
+msgstr ""
+
+msgid "Store a history of your chats"
+msgstr ""
+
+msgid "Geolocation"
+msgstr ""
+
+msgid "Empty"
+msgstr ""
+
+msgid "Empty channel"
+msgstr ""
+
+msgid "Persistent"
+msgstr ""
+
+msgid "Maximum notices"
+msgstr ""
+
+msgid "Account"
+msgstr ""
+
+msgid "Change password"
+msgstr ""
+
+msgid "Delete account"
+msgstr ""
+
+msgid "Old"
+msgstr ""
+
+msgid "New (2 times)"
+msgstr ""
+
+msgid "Continue"
+msgstr ""
+
+msgid "To"
+msgstr ""
+
+msgid "Close"
+msgstr ""
+
+msgid "unknown"
+msgstr ""
+
+msgid "Unavailable"
+msgstr ""
+
+msgid "is now"
+msgstr ""
+
+msgid "Please wait while your avatar is uploaded..."
+msgstr ""
+
+msgid "Here it is! A new beautiful profile image!"
+msgstr ""
+
+msgid "The image file is not supported or has a bad size."
+msgstr ""
+
+msgid "Reply"
+msgstr ""
+
+msgid "Error"
+msgstr ""
+
+msgid "Click here to solve the error"
+msgstr ""
+
+msgid "You"
+msgstr ""
+
+msgid "Remove"
+msgstr ""
+
+msgid "Rename"
+msgstr ""
+
+msgid "Hi, I am %s, I would like to add you as my friend."
+msgstr ""
+
+msgid "Smiley insertion"
+msgstr ""
+
+msgid "Change style"
+msgstr ""
+
+msgid "Text in bold"
+msgstr ""
+
+msgid "Text in italic"
+msgstr ""
+
+msgid "Underlined text"
+msgstr ""
+
+msgid "Send a file"
+msgstr ""
+
+msgid "Once uploaded, your friend will be prompted to download the file you sent."
+msgstr ""
+
+msgid "Save chat"
+msgstr ""
+
+msgid "Click on the following link to get the chat log, and wait. Then click again to get the file."
+msgstr ""
+
+msgid "This chat is empty!"
+msgstr ""
+
+msgid "Generate file!"
+msgstr ""
+
+msgid "Download file!"
+msgstr ""
+
+msgid "Clean current chat"
+msgstr ""
+
+msgid "View chat history"
+msgstr ""
+
+msgid "Show user profile"
+msgstr ""
+
+msgid "Add this contact to your friends"
+msgstr ""
+
+msgid "Add this groupchat to your favorites"
+msgstr ""
+
+msgid "All tabs"
+msgstr ""
+
+msgid "Close this tab"
+msgstr ""
+
+msgid "no subject defined for this room."
+msgstr ""
+
+msgid "Administration panel for this room"
+msgstr ""
+
+msgid "Moderators"
+msgstr ""
+
+msgid "Participants"
+msgstr ""
+
+msgid "Visitors"
+msgstr ""
+
+msgid "Manage favorite rooms"
+msgstr ""
+
+msgid "Change favorites"
+msgstr ""
+
+msgid "Search a room"
+msgstr ""
+
+msgid "Select a favorite"
+msgstr ""
+
+msgid "Getting the name..."
+msgstr ""
+
+msgid "Gateway"
+msgstr ""
+
+msgid "Name"
+msgstr ""
+
+msgid "Room"
+msgstr ""
+
+msgid "Add"
+msgstr ""
+
+msgid "Edit"
+msgstr ""
+
+msgid "Search a room on"
+msgstr ""
+
+msgid "No room found on this server."
+msgstr ""
+
+msgid "Service discovery"
+msgstr ""
+
+msgid "Server to query"
+msgstr ""
+
+msgid "Sorry, but the entity didn't return any result!"
+msgstr ""
+
+msgid "Accounts"
+msgstr ""
+
+msgid "Authentications"
+msgstr ""
+
+msgid "Automation"
+msgstr ""
+
+msgid "Clients"
+msgstr ""
+
+msgid "Collaboration"
+msgstr ""
+
+msgid "Components"
+msgstr ""
+
+msgid "Rooms"
+msgstr ""
+
+msgid "Directories"
+msgstr ""
+
+msgid "Gateways"
+msgstr ""
+
+msgid "News"
+msgstr ""
+
+msgid "Hierarchy"
+msgstr ""
+
+msgid "Proxies"
+msgstr ""
+
+msgid "Publication/Subscription"
+msgstr ""
+
+msgid "Storage"
+msgstr ""
+
+msgid "Service offline or broken"
+msgstr ""
+
+msgid "Your inbox"
+msgstr ""
+
+msgid "Available actions"
+msgstr ""
+
+msgid "Clean"
+msgstr ""
+
+msgid "New"
+msgstr ""
+
+msgid "Received"
+msgstr ""
+
+msgid "Subject"
+msgstr ""
+
+msgid "Content"
+msgstr ""
+
+msgid "Send message"
+msgstr ""
+
+msgid "Your inbox is empty."
+msgstr ""
+
+msgid "MUC administration"
+msgstr ""
+
+msgid "You administrate this room"
+msgstr ""
+
+msgid "Enter new subject"
+msgstr ""
+
+msgid "Configuration"
+msgstr ""
+
+msgid "Authorizations"
+msgstr ""
+
+msgid "Member list"
+msgstr ""
+
+msgid "Owner list"
+msgstr ""
+
+msgid "Administrator list"
+msgstr ""
+
+msgid "Outcast list"
+msgstr ""
+
+msgid "Add an input"
+msgstr ""
+
+msgid "Destroy this MUC"
+msgstr ""
+
+msgid "Yes, let's do it!"
+msgstr ""
+
+msgid "Your friend is paying attention to the conversation."
+msgstr ""
+
+msgid "Your friend is writing a message..."
+msgstr ""
+
+msgid "Your friend stopped writing a message."
+msgstr ""
+
+msgid "Your friend is doing something else."
+msgstr ""
+
+msgid "Your friend closed the chat."
+msgstr ""
+
+msgid "Requesting this service..."
+msgstr ""
+
+msgid "Loading"
+msgstr ""
+
+msgid "changed his/her nickname to %s"
+msgstr ""
+
+msgid "joined the chat room"
+msgstr ""
+
+msgid "left the chat room"
+msgstr ""
+
+msgid "no status"
+msgstr ""
+
+msgid "has been kicked"
+msgstr ""
+
+msgid "has been banned"
+msgstr ""
+
+msgid "no reason"
+msgstr ""
+
+msgid "Communicate with the entire world!"
+msgstr ""
+
+msgid "Jappix is a great social platform, that you can access wherever you are, whenever you want and communicate with whovever you want."
+msgstr ""
+
+msgid "It allows you to get in touch with the millions of users who currently use the XMPP network like you do with Jappix. Join the community and stay free!"
+msgstr ""
+
+msgid "Hi there!"
+msgstr ""
+
+msgid "Welcome on %1s, “%2s”."
+msgstr ""
+
+msgid "Login to your existing XMPP account or create a new one for free!"
+msgstr ""
+
+msgid "Jappix is an open-source project from PostPro, a non-profit organization which provides us a great help."
+msgstr ""
+
+msgid "Login to your existing XMPP account. You can also use the %s to join a groupchat."
+msgstr ""
+
+msgid "Previous"
+msgstr ""
+
+msgid "General"
+msgstr ""
+
+msgid "Advanced"
+msgstr ""
+
+msgid "Resource"
+msgstr ""
+
+msgid "Priority"
+msgstr ""
+
+msgid "Low"
+msgstr ""
+
+msgid "Medium"
+msgstr ""
+
+msgid "High"
+msgstr ""
+
+msgid "Enter the groupchat you want to join and the nick you want to have. You can also go back to the %s."
+msgstr ""
+
+msgid "login page"
+msgstr ""
+
+msgid "Share this link with your friends:"
+msgstr ""
+
+msgid "Register a new XMPP account to join your friends on your own social cloud. That's simple!"
+msgstr ""
+
+msgid "Required"
+msgstr ""
+
+msgid "You have been registered, here is your XMPP address:"
+msgstr ""
+
+msgid "Manager"
+msgstr ""
+
+msgid "Project"
+msgstr ""
+
+msgid "Encrypted"
+msgstr ""
+
+msgid "Unencrypted"
+msgstr ""
+
+msgid "Where are you?"
+msgstr ""
+
+msgid "What's up with you?"
+msgstr ""
+
+msgid "Type something you want to share with your friends..."
+msgstr ""
+
+msgid "Fetching the social channel..."
+msgstr ""
+
+msgid "You are synchronized with your network."
+msgstr ""
+
+msgid "Cannot send anything: you can only receive notices!"
+msgstr ""
+
+msgid "Media viewer"
+msgstr ""
+
+msgid "Browse"
+msgstr ""
+
+msgid "Command"
+msgstr ""
+
+msgid "Subscribe"
+msgstr ""
+
+msgid "Join"
+msgstr ""
+
+msgid "Automatic"
+msgstr ""
+
+msgid "Search"
+msgstr ""
+
+msgid "No result!"
+msgstr ""
+
+msgid "No notifications."
+msgstr ""
+
+msgid "would like to add you as a friend."
+msgstr ""
+
+msgid "would like you to join this chatroom:"
+msgstr ""
+
+msgid "Do you accept?"
+msgstr ""
+
+msgid "Yes"
+msgstr ""
+
+msgid "No"
+msgstr ""
+
+msgid "would like to get authorization."
+msgstr ""
+
+msgid "would like to send you a file: “%s”."
+msgstr ""
+
+msgid "has received a file exchange request: “%s”."
+msgstr ""
+
+msgid "has accepted to received your file: “%s”."
+msgstr ""
+
+msgid "has rejected to receive your file: “%s”."
+msgstr ""
+
+msgid "could not receive your file: “%s”."
+msgstr ""
+
+msgid "Do you want to see the friends %s suggests you?"
+msgstr ""
+
+msgid "commented an item you follow: “%s”."
+msgstr ""
+
+msgid "liked your post: “%s”."
+msgstr ""
+
+msgid "quoted you somewhere: “%s”."
+msgstr ""
+
+msgid "published on your wall: “%s”."
+msgstr ""
+
+msgid "tagged you in a photo (%s)."
+msgstr ""
+
+msgid "tagged you in a video (%s)."
+msgstr ""
+
+msgid "Show"
+msgstr ""
+
+msgid "Hide"
+msgstr ""
+
+msgid "Submit"
+msgstr ""
+
+msgid "Client"
+msgstr ""
+
+msgid "System"
+msgstr ""
+
+msgid "Local time"
+msgstr ""
+
+msgid "Comments"
+msgstr ""
+
+msgid "User profile"
+msgstr ""
+
+msgid "See his/her position on the globe"
+msgstr ""
+
+msgid "Confirm"
+msgstr ""
+
+msgid "anonymous mode"
+msgstr ""
+
+msgid "Groups"
+msgstr ""
+
+msgid "Unclassified"
+msgstr ""
+
+msgid "Authorize"
+msgstr ""
+
+msgid "Ask for authorization"
+msgstr ""
+
+msgid "Unblock"
+msgstr ""
+
+msgid "Prohibit"
+msgstr ""
+
+msgid "Block"
+msgstr ""
+
+msgid "Chat"
+msgstr ""
+
+msgid "Groupchat"
+msgstr ""
+
+msgid "Jappix Mobile"
+msgstr ""
+
+msgid "Desktop"
+msgstr ""
+
+msgid "Mobile"
+msgstr ""
+
+msgid "Please wait..."
+msgstr ""
+
+msgid "Please enable JavaScript"
+msgstr ""
+
+msgid "Show comments"
+msgstr ""
+
+msgid "Loading comments..."
+msgstr ""
+
+msgid "Could not get the comments!"
+msgstr ""
+
+msgid "Comments locked!"
+msgstr ""
+
+msgid "Type your comment here..."
+msgstr ""
+
+msgid "Your channel"
+msgstr ""
+
+msgid "Channel of"
+msgstr ""
+
+msgid "More notices..."
+msgstr ""
+
+msgid "Attach a file"
+msgstr ""
+
+msgid "Send"
+msgstr ""
+
+msgid "Unattach the file"
+msgstr ""
+
+msgid "An error occured while uploading your file: maybe it is too big (%s maximum) or forbidden!"
+msgstr ""
+
+msgid "Authorization failed"
+msgstr ""
+
+msgid "Registration failed, please choose a different username"
+msgstr ""
+
+msgid "Service unavailable"
+msgstr ""
+
+msgid "Internal server error, try later"
+msgstr ""
+
+msgid "Your form has been sent."
+msgstr ""
+
+msgid "Application"
+msgstr ""
+
+msgid "Media integration"
+msgstr ""
+
+msgid "XMPP links"
+msgstr ""
+
+msgid "Open XMPP links with Jappix"
+msgstr ""
+
+msgid "changed the subject to:"
+msgstr ""
+
+msgid "Welcome!"
+msgstr ""
+
+msgid "Friends"
+msgstr ""
+
+msgid "Welcome on Jappix, your own social cloud!"
+msgstr ""
+
+msgid "Before you start using it, you will have to change some settings, search for friends and complete your profile."
+msgstr ""
+
+msgid "Enable notification sounds"
+msgstr ""
+
+msgid "Share your position on the globe"
+msgstr ""
+
+msgid "Offline friends"
+msgstr ""
+
+msgid "Don't hide offline friends"
+msgstr ""
+
+msgid "Use this tool to find your friends on the server you are using right now, or add them later."
+msgstr ""
+
+msgid "Great work! Now, you can share Jappix with your friends!"
+msgstr ""
+
+msgid "When you will press the save button, the profile editor will be opened. Happy socializing!"
+msgstr ""
+
+msgid "Share Jappix on %s"
+msgstr ""
+
+msgid "Using Jappix, an open social platform. I am %s!"
+msgstr ""
+
+msgid "Unknown name"
+msgstr ""
+
+msgid "Unknown country"
+msgstr ""
+
+msgid "Click to enable"
+msgstr ""
+
+msgid "Click to disable"
+msgstr ""
+
+msgid "Installation"
+msgstr ""
+
+msgid "Jappix installation"
+msgstr ""
+
+msgid "Welcome to the Jappix installation!"
+msgstr ""
+
+msgid "This tool will help you fastly install Jappix, the first full-featured XMPP-based social platform, on your server. You don't even need any technical knowledge."
+msgstr ""
+
+msgid "Let's have a look at the installation steps:"
+msgstr ""
+
+msgid "Welcome"
+msgstr ""
+
+msgid "Storage configuration"
+msgstr ""
+
+msgid "Administrator account"
+msgstr ""
+
+msgid "Main configuration"
+msgstr ""
+
+msgid "Hosts configuration"
+msgstr ""
+
+msgid "Services installation"
+msgstr ""
+
+msgid "If the current language does not match yours (%1s), you can make Jappix speak %2s it will be saved."
+msgstr ""
+
+msgid "If you want to get some help about the Jappix installation and configuration, you can use our whole documentation, available at:"
+msgstr ""
+
+msgid "It's time to build your own social cloud: just go to the next step!"
+msgstr ""
+
+msgid "Jappix stores persistent data (such as shared files, chat logs, your own music and its configuration) into a single secured storage folder."
+msgstr ""
+
+msgid "Jappix must be able to write in this folder to create its sub-directories. If not, you must set the rights to %1s or change the folder owner to %2s (depending of your configuration)."
+msgstr ""
+
+msgid "The folder is writable, you can continue!"
+msgstr ""
+
+msgid "Jappix offers you the possibility to manage your configuration, install new addons or search for updates. That's why you must create an administrator account to access the manager."
+msgstr ""
+
+msgid "When Jappix will be installed, just click on the manager link on the home page to access it."
+msgstr ""
+
+msgid "Oops, you missed something or the two passwords do not match!"
+msgstr ""
+
+msgid "Jappix needs that you specify some values to work. Please correct the following inputs (or keep the default values, which are sufficient for most people)."
+msgstr ""
+
+msgid "Note that if you don't specify a value which is compulsory, it will be automatically completed with the default one."
+msgstr ""
+
+msgid "Need help? You'd better read our documentation page about how to fill this form!"
+msgstr ""
+
+msgid "User"
+msgstr ""
+
+msgid "Service"
+msgstr ""
+
+msgid "Service name"
+msgstr ""
+
+msgid "Service description"
+msgstr ""
+
+msgid "Connection"
+msgstr ""
+
+msgid "Lock the host"
+msgstr ""
+
+msgid "Anonymous mode"
+msgstr ""
+
+msgid "Registration allowed"
+msgstr ""
+
+msgid "Use a proxy"
+msgstr ""
+
+msgid "Manager link"
+msgstr ""
+
+msgid "Groupchats to join"
+msgstr ""
+
+msgid "Encryption"
+msgstr ""
+
+msgid "HTTPS storage"
+msgstr ""
+
+msgid "Force HTTPS"
+msgstr ""
+
+msgid "Compression"
+msgstr ""
+
+msgid "This page helps you specify the default hosts Jappix will connect to. You can leave it as it is and continue if you want to use the official service hosts."
+msgstr ""
+
+msgid "Maybe you don't know what a BOSH server is? In fact, this is a relay between a Jappix client and a XMPP server, which is necessary because of technical limitations."
+msgstr ""
+
+msgid "Main host"
+msgstr ""
+
+msgid "Groupchat host"
+msgstr ""
+
+msgid "Pubsub host"
+msgstr ""
+
+msgid "Anonymous host"
+msgstr ""
+
+msgid "Directory host"
+msgstr ""
+
+msgid "BOSH host"
+msgstr ""
+
+msgid "You can install some extra softwares on your server, to extend your Jappix features. Some others might be modified, because of security restrictions which are set by default."
+msgstr ""
+
+msgid "To perform this, you must be able to access your server's shell and be logged in as root. Remember this is facultative, Jappix will work without these modules, but some of its features will be unavailable."
+msgstr ""
+
+msgid "After you finished the setup, Jappix will generate the cache files. It might be slow, just wait until the application is displayed and do not press any button."
+msgstr ""
+
+msgid "Thanks for using Jappix!"
+msgstr ""
+
+msgid "Next"
+msgstr ""
+
+msgid "Finish"
+msgstr ""
+
+msgid "Check again"
+msgstr ""
+
+msgid "The folder is not writable, set the right permissions to the %s directory."
+msgstr ""
+
+msgid "%s is installed on your system."
+msgstr ""
+
+msgid "%1s is not installed on your system, you should install %2s."
+msgstr ""
+
+msgid "PHP maximum upload size is sufficient (%s)."
+msgstr ""
+
+msgid "PHP maximum upload size is not sufficient (%1s), you should define it to %2s in %3s."
+msgstr ""
+
+msgid "Jappix manager"
+msgstr ""
+
+msgid "Manager access"
+msgstr ""
+
+msgid "Statistics"
+msgstr ""
+
+msgid "Hosts"
+msgstr ""
+
+msgid "Design"
+msgstr ""
+
+msgid "Repeat"
+msgstr ""
+
+msgid "All"
+msgstr ""
+
+msgid "Horizontal"
+msgstr ""
+
+msgid "Vertical"
+msgstr ""
+
+msgid "Center"
+msgstr ""
+
+msgid "Left"
+msgstr ""
+
+msgid "Right"
+msgstr ""
+
+msgid "Top"
+msgstr ""
+
+msgid "Bottom"
+msgstr ""
+
+msgid "Adapt"
+msgstr ""
+
+msgid "Color"
+msgstr ""
+
+msgid "Users"
+msgstr ""
+
+msgid "Updates"
+msgstr ""
+
+msgid "This is a restricted area: only the authorized users can manage this Jappix node."
+msgstr ""
+
+msgid "Please use the form below to login to the administration panel."
+msgstr ""
+
+msgid "To improve security, sessions are limited in time and when your browser will be closed, you will be logged out."
+msgstr ""
+
+msgid "Credentials"
+msgstr ""
+
+msgid "You have been logged out. Goodbye!"
+msgstr ""
+
+msgid "Oops, you could not be recognized as a valid administrator. Check your credentials!"
+msgstr ""
+
+msgid "Basic statistics are processed by Jappix about some important things, you can find them below."
+msgstr ""
+
+msgid "Change your Jappix node configuration with this tool."
+msgstr ""
+
+msgid "Change the XMPP hosts that this Jappix node serve with this tool."
+msgstr ""
+
+msgid "All this Jappix node stored files can be managed with this tool: please select a sub-folder and start editing its content!"
+msgstr ""
+
+msgid "Jappix is fully customisable: you can change its design right here."
+msgstr ""
+
+msgid "This is not a valid image, please use PNG, GIF or JPG!"
+msgstr ""
+
+msgid "This is not a valid image, please use the PNG format!"
+msgstr ""
+
+msgid "The image could not be received, would you mind retry?"
+msgstr ""
+
+msgid "Your service logo has been successfully changed!"
+msgstr ""
+
+msgid "Your image was added to the list!"
+msgstr ""
+
+msgid "Changes saved!"
+msgstr ""
+
+msgid "Logo"
+msgstr ""
+
+msgid "You can set your own service logo to replace the default one. Take care of the size and the main color of each logo!"
+msgstr ""
+
+msgid "Upload each logo with the recommended maximum pixel size."
+msgstr ""
+
+msgid "Your logo format must be PNG. Leave a field empty and the logo will not be changed."
+msgstr ""
+
+msgid "Remove this logo"
+msgstr ""
+
+msgid "View this logo"
+msgstr ""
+
+msgid "You can define more than one administrator for this Jappix node. You can also change a password with this tool."
+msgstr ""
+
+msgid "Update your Jappix node with this tool, or check if a new one is available. Informations about the latest version are also displayed (in english)."
+msgstr ""
+
+msgid "Access statistics"
+msgstr ""
+
+msgid "Share statistics"
+msgstr ""
+
+msgid "Other statistics"
+msgstr ""
+
+msgid "January"
+msgstr ""
+
+msgid "February"
+msgstr ""
+
+msgid "March"
+msgstr ""
+
+msgid "April"
+msgstr ""
+
+msgid "May"
+msgstr ""
+
+msgid "June"
+msgstr ""
+
+msgid "July"
+msgstr ""
+
+msgid "August"
+msgstr ""
+
+msgid "September"
+msgstr ""
+
+msgid "October"
+msgstr ""
+
+msgid "November"
+msgstr ""
+
+msgid "December"
+msgstr ""
+
+msgid "Monday"
+msgstr ""
+
+msgid "Tuesday"
+msgstr ""
+
+msgid "Wednesday"
+msgstr ""
+
+msgid "Thursday"
+msgstr ""
+
+msgid "Friday"
+msgstr ""
+
+msgid "Saturday"
+msgstr ""
+
+msgid "Sunday"
+msgstr ""
+
+msgid "Total"
+msgstr ""
+
+msgid "Cache"
+msgstr ""
+
+msgid "Logs"
+msgstr ""
+
+msgid "Music"
+msgstr ""
+
+msgid "Backgrounds"
+msgstr ""
+
+msgid "Share"
+msgstr ""
+
+msgid "Background"
+msgstr ""
+
+msgid "Notice"
+msgstr ""
+
+msgid "Your design preferences have been saved!"
+msgstr ""
+
+msgid "Please check your inputs: something is missing!"
+msgstr ""
+
+msgid "Change your Jappix node background with this tool. You can either set a custom color or an uploaded image. Let your creativity flow!"
+msgstr ""
+
+msgid "Use default background"
+msgstr ""
+
+msgid "Use your own image"
+msgstr ""
+
+msgid "Select a background to use and change the display options."
+msgstr ""
+
+msgid "Use your own color"
+msgstr ""
+
+msgid "Type the hexadecimal color value you want to use as a background."
+msgstr ""
+
+msgid "Manage backgrounds"
+msgstr ""
+
+msgid "You can add a new background to the list with this tool. Please send a valid image."
+msgstr ""
+
+msgid "If you want to remove some backgrounds, use the browser below."
+msgstr ""
+
+msgid "Define a homepage notice for all your users, such as a warn, an important message or an advert with this tool."
+msgstr ""
+
+msgid "Simple notice"
+msgstr ""
+
+msgid "This notice only needs simple text to be displayed, but no code is allowed!"
+msgstr ""
+
+msgid "Advanced notice"
+msgstr ""
+
+msgid "You can customize your notice with embedded HTML, CSS and JavaScript, but you need to code the style."
+msgstr ""
+
+msgid "Available updates"
+msgstr ""
+
+msgid "What's new?"
+msgstr ""
+
+msgid "Your storage folders are not writable, please apply the good rights!"
+msgstr ""
+
+msgid "%1s may cause problems to the proxy, please increase %2s value up to %3s!"
+msgstr ""
+
+msgid "You are using a development version of Jappix. Update it through our repository by executing: %s."
+msgstr ""
+
+msgid "A new Jappix version is available! Check what is new and launch the update!"
+msgstr ""
+
+msgid "Your version is out to date. Update it now to %s by clicking here!"
+msgstr ""
+
+msgid "Your version seems to be up to date, but you can check updates manually by clicking here."
+msgstr ""
+
+msgid "Check for updates"
+msgstr ""
+
+msgid "Update in progress"
+msgstr ""
+
+msgid "Jappix has been updated: you are now running the latest version. Have fun!"
+msgstr ""
+
+msgid "The update has failed! Please try again later."
+msgstr ""
+
+msgid "Downloading package..."
+msgstr ""
+
+msgid "Removing current Jappix system files..."
+msgstr ""
+
+msgid "Extracting package..."
+msgstr ""
+
+msgid "Regenerating storage folder tree..."
+msgstr ""
+
+msgid "Jappix is now up to date!"
+msgstr ""
+
+msgid "Aborted: socket error!"
+msgstr ""
+
+msgid "Aborted: buffer error!"
+msgstr ""
+
+msgid "Aborted: everything is not writable!"
+msgstr ""
+
+msgid "Aborted: could not extract the package!"
+msgstr ""
+
+msgid "Visits"
+msgstr ""
+
+msgid "Daily"
+msgstr ""
+
+msgid "Weekly"
+msgstr ""
+
+msgid "Monthly"
+msgstr ""
+
+msgid "Yearly"
+msgstr ""
+
+msgid "Size"
+msgstr ""
+
+msgid "Clean everything"
+msgstr ""
+
+msgid "Purge cache"
+msgstr ""
+
+msgid "Purge logs"
+msgstr ""
+
+msgid "Purge sent files"
+msgstr ""
+
+msgid "Purge updates"
+msgstr ""
+
+msgid "The storage folder you wanted to clean is now empty!"
+msgstr ""
+
+msgid "Keep your Jappix node fresh and fast, clean the storage folders regularly!"
+msgstr ""
+
+msgid "Upload your music (Ogg Vorbis, MP3 or WAV) to be able to listen to it in Jappix!"
+msgstr ""
+
+msgid "The file you want to upload must be smaller than %s."
+msgstr ""
+
+msgid "Stay tuned in what your users store on your server and remove undesired content with this tool."
+msgstr ""
+
+msgid "Title"
+msgstr ""
+
+msgid "Artist"
+msgstr ""
+
+msgid "Album"
+msgstr ""
+
+msgid "File"
+msgstr ""
+
+msgid "Upload"
+msgstr ""
+
+msgid "The folder is empty."
+msgstr ""
+
+msgid "The music could not be received, please retry!"
+msgstr ""
+
+msgid "This is not a valid music file, please encode in Ogg Vorbis, MP3 or WAV!"
+msgstr ""
+
+msgid "Your music has been added!"
+msgstr ""
+
+msgid "The selected elements have been removed."
+msgstr ""
+
+msgid "You must select elements to remove!"
+msgstr ""
+
+msgid "Add a new user with this tool, or change a password (type an existing username). Please submit a strong password!"
+msgstr ""
+
+msgid "Manage"
+msgstr ""
+
+msgid "List"
+msgstr ""
+
+msgid "Remove users with this tool. Note that you cannot remove an user if he is the only one remaining."
+msgstr ""
+
+msgid "The user has been added!"
+msgstr ""
+
+msgid "The chosen users have been removed."
+msgstr ""
+
+msgid "You must select one or more users to be removed!"
+msgstr ""
+
+msgid "Yesterday"
+msgstr ""
+
+msgid "%s days ago"
+msgstr ""
+
+msgid "User currently active"
+msgstr ""
+
+msgid "Last seen: %s"
+msgstr ""
+
+msgid "Last seen: %s"
+msgstr ""
+
+msgid "Inactive since: %s"
+msgstr ""
+
+msgid "Your friend seems not to have received your message(s)!"
+msgstr ""
+
+msgid "Static content server"
+msgstr ""
+
+msgid "This is the static content server for %1s, “%2s”."
+msgstr ""
+
+msgid "User uploads server"
+msgstr ""
+
+msgid "This is the user uploads server for %1s, “%2s”."
+msgstr ""
+
+msgid "Suggested friends"
+msgstr ""
+
+msgid "Check all"
+msgstr ""
+
+msgid "Uncheck all"
+msgstr ""
+
+msgid "Choose"
+msgstr ""
+
+msgid "List name"
+msgstr ""
+
+msgid "Allow"
+msgstr ""
+
+msgid "Deny"
+msgstr ""
+
+msgid "Group"
+msgstr ""
+
+msgid "Subscription"
+msgstr ""
+
+msgid "Both"
+msgstr ""
+
+msgid "From"
+msgstr ""
+
+msgid "Everybody"
+msgstr ""
+
+msgid "Send messages"
+msgstr ""
+
+msgid "Send queries"
+msgstr ""
+
+msgid "See my status"
+msgstr ""
+
+msgid "Send his/her status"
+msgstr ""
+
+msgid "Everything"
+msgstr ""
+
+msgid "Item"
+msgstr ""
+
+msgid "Order"
+msgstr ""
+
+msgid "Active for this session"
+msgstr ""
+
+msgid "Always active"
+msgstr ""
+
+msgid "User directory"
+msgstr ""
+
+msgid "Search a friend"
+msgstr ""
+
+msgid "The feature requested is not implemented by the recipient or server and therefore cannot be processed."
+msgstr ""
+
+msgid "Send him/her a message"
+msgstr ""
+
+msgid "Start a chat with him/her"
+msgstr ""
+
+msgid "Available shortcuts:"
+msgstr ""
+
+msgid "%s removes the chat logs"
+msgstr ""
+
+msgid "%s joins a groupchat"
+msgstr ""
+
+msgid "%s closes the chat"
+msgstr ""
+
+msgid "%s shows the user profile"
+msgstr ""
+
+msgid "%s sends a message to the room"
+msgstr ""
+
+msgid "%s changes your nickname"
+msgstr ""
+
+msgid "%s sends a message to someone in the room"
+msgstr ""
+
+msgid "%s changes the room topic"
+msgstr ""
+
+msgid "%s kicks an user of the room"
+msgstr ""
+
+msgid "%s bans an user of the room"
+msgstr ""
+
+msgid "%s invites someone to join the room"
+msgstr ""
+
+msgid "Public profile"
+msgstr ""
+
+msgid "Your profile anywhere on the Web."
+msgstr ""
+
+msgid "%s is a Jappix.com service which makes your XMPP profile public. It is easier to share it. No XMPP account is required to view your social channel, your current position and your contact details."
+msgstr ""
+
+msgid "Furthermore, every picture you post in your social channel is added to a beautiful picture timeline. You can now view the pictures you shared year by year."
+msgstr ""
+
+msgid "You can also use your XMPP avatar as a single avatar for every website, blog and forum you use. When you change it on XMPP, the new avatar appears everywhere. What a genious improvement!"
+msgstr ""
+
+msgid "Yay, let's create my public profile!"
+msgstr ""
+
+msgid "Enable my public profile"
+msgstr ""
\ No newline at end of file
diff --git a/jappixmini/jappix/lang/eo/LC_MESSAGES/main.mo b/jappixmini/jappix/lang/eo/LC_MESSAGES/main.mo
new file mode 100644
index 00000000..3b0d07dd
Binary files /dev/null and b/jappixmini/jappix/lang/eo/LC_MESSAGES/main.mo differ
diff --git a/jappixmini/jappix/lang/eo/LC_MESSAGES/main.po b/jappixmini/jappix/lang/eo/LC_MESSAGES/main.po
new file mode 100644
index 00000000..8926bdae
--- /dev/null
+++ b/jappixmini/jappix/lang/eo/LC_MESSAGES/main.po
@@ -0,0 +1,1870 @@
+# Esperanto translations for Jappix package.
+# This file is distributed under the same license as the Jappix package.
+# This file was translated from CodingTeam at <http://codingteam.net/>.
+msgid ""
+msgstr ""
+"Project-Id-Version: Jappix\n"
+"PO-Revision-Date: 2012-01-16 21:45+0100\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"POT-Creation-Date: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+
+msgid "JavaScript is missing in your web browser, so that you will not be able to launch Jappix! Please fix this."
+msgstr "Ĝavaskripto mankas en via retumilo, do vi ne povas lanĉi Jappix-on! Bonvolu ripari tion ĉi."
+
+msgid "An open social network"
+msgstr "Malferma socia reto"
+
+msgid "Jappix has been interrupted by a network issue, a bug or bad login (check that you entered the right credentials), sorry for the inconvenience."
+msgstr "Jappix estis interrompita pro reta problemo, cimo aŭ malbona ensaluto (bv. kontroli ke vi tajpis la ĝustan pasvorton). Pardonon por la ĝeno."
+
+msgid "The element list on this server could not be obtained!"
+msgstr "La elementa listo sur ĉi tiu servilo ne povus esti akirita!"
+
+msgid "Your password has been changed, now you can connect to your account with your new login data."
+msgstr "Via pasvorto estis ŝanĝita, nun vi povas konekti al via konto kun via nova ensaluta datumo."
+
+msgid "Your XMPP account has been removed, bye!"
+msgstr "Via XMPPa konto estis forigita. Ĝis!"
+
+msgid "You have been logged out of your XMPP account, have a nice day!"
+msgstr "Vi estis adiaŭita de via XMPPa konto. Belan tagon!"
+
+msgid "The room you joined seems not to exist. You should create it!"
+msgstr "La ĉambro vi aliĝis ŝajnas ke ne ekzistas. Vi devus krei ĝin!"
+
+msgid "The groupchat has been removed, now someone else will be able to recreate it."
+msgstr "La retbabilejo estis forigita.Iu alia estos nun kapabla krei ĝi denove."
+
+msgid "The user that you want to reach is not present in the room."
+msgstr "La uzanto ke vi deziras atingi ne estas en la ĉambro."
+
+msgid "Please enter the group chat address to join."
+msgstr "Bonvolu tajpi la retbabilejan adreson por aliĝi."
+
+msgid "Please enter your nickname to join %s."
+msgstr "Bonvolu tajpi vian kromnomon por aliĝi %s."
+
+msgid "This room (%s) is protected with a password."
+msgstr "Ĉi tiu ĉambro (%s) estas protektita kun pasvorto."
+
+msgid "Your browser is out of date!"
+msgstr "Via retumilo tro malnovas!"
+
+msgid "Last %s version is better!"
+msgstr "Lasta %s versio estas pli bona!"
+
+msgid "Login"
+msgstr "Ensaluti"
+
+msgid "Register"
+msgstr "Registri"
+
+msgid "Here we go!"
+msgstr "Ek!"
+
+msgid "Server"
+msgstr "Servilo"
+
+msgid "Password"
+msgstr "Pasvorto"
+
+msgid "Remember me"
+msgstr "Memoru min"
+
+msgid "This tool has been disabled, you cannot use it!"
+msgstr "Ĉi tiu ilo estis malaktivigita, vi ne povas uzi ĝin!"
+
+msgid "Due to a network issue, you were disconnected. What do you want to do now?"
+msgstr "Pro reta problemo, vi estis malkonektita. Kio vi deziras fari nun?"
+
+msgid "Reconnect"
+msgstr "Rekonekti"
+
+msgid "Messages"
+msgstr "Mesaĝoj"
+
+msgid "Profile"
+msgstr "Profilo"
+
+msgid "Options"
+msgstr "Opcioj"
+
+msgid "Disconnect"
+msgstr "Elsaluti"
+
+msgid "Filter"
+msgstr "Filtri"
+
+msgid "Add a friend"
+msgstr "Aldoni amikon"
+
+msgid "Your groupchats"
+msgstr "Viaj babilejoj"
+
+msgid "Manage your favorite groupchats"
+msgstr "Administri viajn preferatajn retbabilejojn"
+
+msgid "More stuff"
+msgstr "Pli aĵoj"
+
+msgid "Show all friends"
+msgstr "Montri ĉiojn amikojn"
+
+msgid "Only show connected friends"
+msgstr "Nur montri konektitajn amikojn"
+
+msgid "Message archives"
+msgstr "Mesaĝaj arkivoj"
+
+msgid "Date"
+msgstr "Dato"
+
+msgid "Please select a friend to view the chat history."
+msgstr "Bonvolu elekti amikon por vidi la konversacian historion."
+
+msgid "Nothing found for: %s"
+msgstr "Nenion trovita por: %s"
+
+msgid "A short message?"
+msgstr "Mallonga mesaĝo?"
+
+msgid "How are you?"
+msgstr "Kiel vi fartas?"
+
+msgid "What are you doing?"
+msgstr "Kion vi faras?"
+
+msgid "Join a chat"
+msgstr "Aliĝi babilejo"
+
+msgid "Status"
+msgstr "Stato"
+
+msgid "Available"
+msgstr "Enrete"
+
+msgid "Talkative"
+msgstr "Babilema"
+
+msgid "Away"
+msgstr "Fora"
+
+msgid "Not available"
+msgstr "Nedisponebla"
+
+msgid "Busy"
+msgstr "Okupata"
+
+msgid "Mood"
+msgstr "Humoro"
+
+msgid "None"
+msgstr "Neniu"
+
+msgid "Crazy"
+msgstr "Freneza"
+
+msgid "Excited"
+msgstr "Ekscitema"
+
+msgid "Playful"
+msgstr "Ludema"
+
+msgid "Happy"
+msgstr "Feliĉa"
+
+msgid "Shocked"
+msgstr "Ŝokita"
+
+msgid "Hot"
+msgstr "Varma"
+
+msgid "Sad"
+msgstr "Malfeliĉa"
+
+msgid "Amorous"
+msgstr "Amorema"
+
+msgid "Confident"
+msgstr "Fidema"
+
+msgid "Activity"
+msgstr "Aktiveco"
+
+msgid "Chores"
+msgstr "Taskoj"
+
+msgid "Drinking"
+msgstr "Drinkante"
+
+msgid "Eating"
+msgstr "Manĝante"
+
+msgid "Exercising"
+msgstr "Ekzercante"
+
+msgid "Grooming"
+msgstr "Tualetante"
+
+msgid "Appointment"
+msgstr "Rendevuo"
+
+msgid "Inactive"
+msgstr "Senfara"
+
+msgid "Relaxing"
+msgstr "Ripozante"
+
+msgid "Talking"
+msgstr "Parolante"
+
+msgid "Traveling"
+msgstr "Vojaĝante"
+
+msgid "Working"
+msgstr "Laborante"
+
+msgid "View profile"
+msgstr "Vidi profilon"
+
+msgid "Repeat this notice"
+msgstr "Ripeti tion avizon"
+
+msgid "Remove this notice"
+msgstr "Forigi tion avizon"
+
+msgid "Your profile"
+msgstr "Via profilo"
+
+msgid "Identity"
+msgstr "Identeco"
+
+msgid "Profile image"
+msgstr "Profila bildo"
+
+msgid "Others"
+msgstr "Aliaj"
+
+msgid "Personal"
+msgstr "Persona"
+
+msgid "Complete name"
+msgstr "Tuta nomo"
+
+msgid "Nickname"
+msgstr "Pseŭdonimo"
+
+msgid "First name"
+msgstr "Antaŭa nomo"
+
+msgid "Last name"
+msgstr "Familia nomo"
+
+msgid "Date of birth"
+msgstr "Dato de nasko"
+
+msgid "Contact"
+msgstr "Kontakto"
+
+msgid "E-mail"
+msgstr "Retpoŝto"
+
+msgid "Phone"
+msgstr "Telefono"
+
+msgid "Website"
+msgstr "Retpaĝo"
+
+msgid "Current"
+msgstr "Aktuala"
+
+msgid "Delete"
+msgstr "Forviŝi"
+
+msgid "What a pity! You have no profile image defined in your identity card!"
+msgstr "Kio domaĝo! Vi ne havas profilan bildon en via identeca karto!"
+
+msgid "Address"
+msgstr "Adreso"
+
+msgid "Street"
+msgstr "Strato"
+
+msgid "City"
+msgstr "Urbo"
+
+msgid "Postal code"
+msgstr "Poŝtkodo"
+
+msgid "Country"
+msgstr "Lando"
+
+msgid "Biography"
+msgstr "Vivhistorio"
+
+msgid "Important notice"
+msgstr "Grava avizo"
+
+msgid "Be careful of the information you write into your profile, because it could be accessed by everyone (even someone you don't want to)."
+msgstr "Estu zorgema pri la informojn vi skribas en via profilo, ĉar ĝi povus esti alirita de ĉiuj (eĉ iu kiu vi ne deziras montri)."
+
+msgid "Not everything is private on XMPP; this is one of those things, your public profile (vCard)."
+msgstr "Ne ĉio estas privata sur XMPP. Via publika profilo (vCard) estas unu el tiuj aferoj."
+
+msgid "It is strongly recommended to upload a profile image (%s maximum), like a picture of yourself, because that makes you easily recognizable by your friends."
+msgstr "Alŝuti profila bildo estas forte rekomendita (%s maksimumo), kiel bildo de vi mem, ĉar ĝi faras vin facile rekonebla de viaj amikoj."
+
+msgid "Save"
+msgstr "Akcepti"
+
+msgid "Cancel"
+msgstr "Nuligi"
+
+msgid "Edit options"
+msgstr "Modifi opciojn"
+
+msgid "Channel"
+msgstr "Kanalo"
+
+msgid "Commands"
+msgstr "Komandoj"
+
+msgid "Sounds"
+msgstr "Sonoj"
+
+msgid "Privacy"
+msgstr "Privateco"
+
+msgid "Message archiving"
+msgstr "Mesaĝa enarkivago"
+
+msgid "Store a history of your chats"
+msgstr "Entenas historion de viaj konversacioj"
+
+msgid "Geolocation"
+msgstr "Surtera loko"
+
+msgid "Empty"
+msgstr "Malplena"
+
+msgid "Empty channel"
+msgstr "Malplena kanalo"
+
+msgid "Persistent"
+msgstr "Daŭra"
+
+msgid "Maximum notices"
+msgstr "Maksimumaj avizoj"
+
+msgid "Account"
+msgstr "Konto"
+
+msgid "Change password"
+msgstr "Ŝanĝi pasvorton"
+
+msgid "Delete account"
+msgstr "Forigi konton"
+
+msgid "Old"
+msgstr "Malnova"
+
+msgid "New (2 times)"
+msgstr "Nova (2 fojoj)"
+
+msgid "Continue"
+msgstr "Daŭri"
+
+msgid "To"
+msgstr "Al"
+
+msgid "Close"
+msgstr "Fermi"
+
+msgid "unknown"
+msgstr "nekonata"
+
+msgid "Unavailable"
+msgstr "Nedisponebla"
+
+msgid "is now"
+msgstr "nun estas"
+
+msgid "Please wait while your avatar is uploaded..."
+msgstr "Bonvolu atendi dum via avatar estos alŝutita…"
+
+msgid "Here it is! A new beautiful profile image!"
+msgstr "Jen! Nova bela profila bildo!"
+
+msgid "The image file is not supported or has a bad size."
+msgstr "La bilda dosiero havas nesubtenita tipon aŭ malbonan grandecon."
+
+msgid "Reply"
+msgstr "Respondo"
+
+msgid "Error"
+msgstr "Eraro"
+
+msgid "Click here to solve the error"
+msgstr "Klaku ĉi-tie por solvi la eraron"
+
+msgid "You"
+msgstr "Vi"
+
+msgid "Remove"
+msgstr "Forigi"
+
+msgid "Rename"
+msgstr "Renomi"
+
+msgid "Hi, I am %s, I would like to add you as my friend."
+msgstr "Saluton, mi estas %s, mi ŝatus aldoni vin kiel mia amiko."
+
+msgid "Smiley insertion"
+msgstr "Ridetula inserto"
+
+msgid "Change style"
+msgstr "Ŝanĝi stilon"
+
+msgid "Text in bold"
+msgstr "Grasa"
+
+msgid "Text in italic"
+msgstr "Kursiva"
+
+msgid "Underlined text"
+msgstr "Substreka"
+
+msgid "Save chat"
+msgstr "Registrigi babilon"
+
+msgid "Click on the following link to get the chat log, and wait. Then click again to get the file."
+msgstr "Klaku sur la sekvanta ligo por akiri la konversacian protokolan dosieron kaj atendu. Tiam klaku denove por akiri la dosieron."
+
+msgid "This chat is empty!"
+msgstr "Tio babilejo estas malplena!"
+
+msgid "Generate file!"
+msgstr "Generi dosieron!"
+
+msgid "Download file!"
+msgstr "Elŝuti dosieron!"
+
+msgid "Clean current chat"
+msgstr "Forviŝi nun babilon"
+
+msgid "View chat history"
+msgstr "Vidi konversacio historio"
+
+msgid "Show user profile"
+msgstr "Montri uzatan profilon"
+
+msgid "Add this contact to your friends"
+msgstr "Aldoni ĉi-tiun kontakton al viaj amikoj"
+
+msgid "Add this groupchat to your favorites"
+msgstr "Aldoni ĉi tiu retbabilejo al via ŝatolisto"
+
+msgid "All tabs"
+msgstr "Tutaj folioj"
+
+msgid "Close this tab"
+msgstr "Fermi tion folion"
+
+msgid "no subject defined for this room."
+msgstr "neniu temo difinita por ĉi tiu ĉambro."
+
+msgid "Administration panel for this room"
+msgstr "Administra panelo por ĉi tiu ĉambro."
+
+msgid "Moderators"
+msgstr "Kontrolantoj"
+
+msgid "Participants"
+msgstr "Partoprenantoj"
+
+msgid "Visitors"
+msgstr "Vizituloj"
+
+msgid "Manage favorite rooms"
+msgstr "Administri preferatajn ĉambrojn"
+
+msgid "Change favorites"
+msgstr "Ŝanĝi ŝatolisto"
+
+msgid "Search a room"
+msgstr "Serĉi babilejon"
+
+msgid "Select a favorite"
+msgstr "Elekti ŝatolistero"
+
+msgid "Getting the name..."
+msgstr "Akirante la nomon…"
+
+msgid "Gateway"
+msgstr "Kluzo"
+
+msgid "Name"
+msgstr "Nomo"
+
+msgid "Room"
+msgstr "Babilejo"
+
+msgid "Add"
+msgstr "Aldoni"
+
+msgid "Edit"
+msgstr "Modifi"
+
+msgid "Search a room on"
+msgstr "Serĉi babilejon sur"
+
+msgid "No room found on this server."
+msgstr "Neniu ĉambro trovita sur ĉi tiu servilo."
+
+msgid "Service discovery"
+msgstr "Serva eltrovo"
+
+msgid "Server to query"
+msgstr "Servilo por pridemandi"
+
+msgid "Sorry, but the entity didn't return any result!"
+msgstr "Pardonu, sed la ento ne revenis ajnan rezulton!"
+
+msgid "Accounts"
+msgstr "Kontoj"
+
+msgid "Authentications"
+msgstr "Aŭtentokontroloj"
+
+msgid "Automation"
+msgstr "Aŭtomatigo"
+
+msgid "Clients"
+msgstr "Klientoj"
+
+msgid "Collaboration"
+msgstr "Kunlaborado"
+
+msgid "Components"
+msgstr "Komponento"
+
+msgid "Rooms"
+msgstr "Babilejoj"
+
+msgid "Directories"
+msgstr "Dosierujoj"
+
+msgid "Gateways"
+msgstr "Kluzoj"
+
+msgid "News"
+msgstr "Novaĵoj"
+
+msgid "Hierarchy"
+msgstr "Hierarkio"
+
+msgid "Proxies"
+msgstr "Prokuraj serviloj"
+
+msgid "Publication/Subscription"
+msgstr "Eldona/Abono"
+
+msgid "Storage"
+msgstr "Konservado"
+
+msgid "Service offline or broken"
+msgstr "Servo elretan aŭ rompita"
+
+msgid "Your inbox"
+msgstr "Via enirkesto"
+
+msgid "Available actions"
+msgstr "Haveblaj agoj"
+
+msgid "Clean"
+msgstr "Purigi"
+
+msgid "New"
+msgstr "Nova"
+
+msgid "Received"
+msgstr "Ricevitaj"
+
+msgid "Subject"
+msgstr "Temo"
+
+msgid "Content"
+msgstr "Enhavo"
+
+msgid "Send message"
+msgstr "Sendi mesaĝon"
+
+msgid "Your inbox is empty."
+msgstr "Via enirkesto estas malplene."
+
+msgid "MUC administration"
+msgstr "Retbabileja administrado."
+
+msgid "You administrate this room"
+msgstr "Vi administras ĉi-tiun ĉambron"
+
+msgid "Enter new subject"
+msgstr "Tajpu novan subjekton"
+
+msgid "Configuration"
+msgstr "Agordoj"
+
+msgid "Authorizations"
+msgstr "Aŭtentigoj"
+
+msgid "Member list"
+msgstr "Membra listo"
+
+msgid "Owner list"
+msgstr "Posedanta listo"
+
+msgid "Administrator list"
+msgstr "Administranta listo"
+
+msgid "Outcast list"
+msgstr "Forĵetuloj listo"
+
+msgid "Add an input"
+msgstr "Aldonas enigon"
+
+msgid "Destroy this MUC"
+msgstr "Detrui la retbabilejon"
+
+msgid "Yes, let's do it!"
+msgstr "Jes, faru ni!"
+
+msgid "Your friend is paying attention to the conversation."
+msgstr "Via amiko estas atentita al la konversacio."
+
+msgid "Your friend is writing a message..."
+msgstr "Via amiko estas skribanti mesaĝon... "
+
+msgid "Your friend stopped writing a message."
+msgstr "Via amiko haltis skribi mesaĝon."
+
+msgid "Your friend is doing something else."
+msgstr "Via amiko estas farante ion alia."
+
+msgid "Your friend closed the chat."
+msgstr "Via amiko fermis la konversacion."
+
+msgid "Requesting this service..."
+msgstr "Petanta ĉi-tiun servon…"
+
+msgid "Loading"
+msgstr "Ŝargi"
+
+msgid "joined the chat room"
+msgstr "aliĝis al la babilejo"
+
+msgid "left the chat room"
+msgstr "foriris la babilejo"
+
+msgid "no status"
+msgstr "neniu stato"
+
+msgid "has been kicked"
+msgstr "estas elpelita"
+
+msgid "has been banned"
+msgstr "estis ekskludita"
+
+msgid "no reason"
+msgstr "neniu motivo"
+
+msgid "Communicate with the entire world!"
+msgstr "Komuniku kun la tuta mondo!"
+
+msgid "It allows you to get in touch with the millions of users who currently use the XMPP network like you do with Jappix. Join the community and stay free!"
+msgstr "Kontaktu la milionojn de uzantoj kiu nuntempe uzas la XMPPan reton, kiel vi faras uzante Jappix-on. Aliĝu la komunumon kaj restu libere!"
+
+msgid "Hi there!"
+msgstr "Saluton!"
+
+msgid "Welcome on %1s, “%2s”."
+msgstr "Bonvenon en %1s, “%2s”."
+
+msgid "Login to your existing XMPP account or create a new one for free!"
+msgstr "Ensalutu al via ekzistanta XMPP konto, aŭ krei novan senkoste!"
+
+msgid "Jappix is an open-source project from PostPro, a non-profit organization which provides us a great help."
+msgstr "Jappix estas malferma-fonta projekto de PostPro, neprofita organizo kiu grande helpas nin."
+
+msgid "Login to your existing XMPP account. You can also use the %s to join a groupchat."
+msgstr "Ensalutu kun via ekzistanta XMPP-a konto. Vi ankaŭ povas uzi la %s por aliĝi retbabilejon."
+
+msgid "Previous"
+msgstr "Antaŭa"
+
+msgid "General"
+msgstr "Ĝenerala"
+
+msgid "Advanced"
+msgstr "Krome"
+
+msgid "Resource"
+msgstr "Risurco"
+
+msgid "Priority"
+msgstr "Prioritato"
+
+msgid "Low"
+msgstr "Malgrava"
+
+msgid "Medium"
+msgstr "Norma"
+
+msgid "High"
+msgstr "Grava"
+
+msgid "Enter the groupchat you want to join and the nick you want to have. You can also go back to the %s."
+msgstr "Eniru la retbablejon vi deziras aliĝi, kaj la kromnomon kiu vi deziras. Vi ankaŭ povas reveni al la %s."
+
+msgid "login page"
+msgstr "ensaluta paĝo"
+
+msgid "Share this link with your friends:"
+msgstr "Kundividu ĉi-tiun ligon kun viaj amikoj:"
+
+msgid "Register a new XMPP account to join your friends on your own social cloud. That's simple!"
+msgstr "Registru novan XMPPan konton por aligi viajn amikojn sur via propra socia nubo. Tio estas simpla!"
+
+msgid "Required"
+msgstr "Postulita"
+
+msgid "You have been registered, here is your XMPP address:"
+msgstr "Vi estis registrita, jen via XMPPa adreso:"
+
+msgid "Manager"
+msgstr "Administrilo"
+
+msgid "Project"
+msgstr "Projekto"
+
+msgid "Encrypted"
+msgstr "Ĉifrita"
+
+msgid "Unencrypted"
+msgstr "Neĉifrita"
+
+msgid "Where are you?"
+msgstr "Kie vi estas?"
+
+msgid "What's up with you?"
+msgstr "Kio nova?"
+
+msgid "Fetching the social channel..."
+msgstr "Akirante la socian kanalon..."
+
+msgid "You are synchronized with your network."
+msgstr "Vi estas samtempigita kun via reto."
+
+msgid "Cannot send anything: you can only receive notices!"
+msgstr "Ne povas sendi ion-ajn: vi nur povas ricevi avizojn!"
+
+msgid "Media viewer"
+msgstr "Aŭdvidaĵa legilo"
+
+msgid "Browse"
+msgstr "Foliumi"
+
+msgid "Command"
+msgstr "Komando"
+
+msgid "Subscribe"
+msgstr "Aboni"
+
+msgid "Join"
+msgstr "Aliĝi"
+
+msgid "Automatic"
+msgstr "Aŭtomata"
+
+msgid "Search"
+msgstr "Serĉi"
+
+msgid "No result!"
+msgstr "Neniu trafo!"
+
+msgid "No notifications."
+msgstr "Neniuj sciigoj."
+
+msgid "would like to add you as a friend."
+msgstr "ŝatus aldoni vin kiel amiko."
+
+msgid "would like you to join this chatroom:"
+msgstr "ŝatus vin aliĝi ĉi tiun babilejon:"
+
+msgid "Do you accept?"
+msgstr "Ĉu vi akceptas?"
+
+msgid "Yes"
+msgstr "Jes"
+
+msgid "No"
+msgstr "Ne"
+
+msgid "would like to get authorization."
+msgstr "ŝatus akiri rajtigon."
+
+msgid "Do you want to see the friends %s suggests you?"
+msgstr "Ĉu vi deziras vidi la amikojn %s sugestas vin?"
+
+msgid "Submit"
+msgstr "Sendi"
+
+msgid "Client"
+msgstr "Kliento"
+
+msgid "System"
+msgstr "Sistemo"
+
+msgid "Local time"
+msgstr "Loka tempo"
+
+msgid "Comments"
+msgstr "Komentoj"
+
+msgid "User profile"
+msgstr "Uzanta profilo"
+
+msgid "See his/her position on the globe"
+msgstr "Vidi lia/ŝia pozicio sur Tero"
+
+msgid "Confirm"
+msgstr "Konfirmi"
+
+msgid "anonymous mode"
+msgstr "anonima modo"
+
+msgid "Groups"
+msgstr "Grupoj"
+
+msgid "Unclassified"
+msgstr "Neklasigita"
+
+msgid "Authorize"
+msgstr "Rajtigi"
+
+msgid "Ask for authorization"
+msgstr "Peto por rajtigo"
+
+msgid "Unblock"
+msgstr "Malbloki"
+
+msgid "Prohibit"
+msgstr "Malpermesi"
+
+msgid "Block"
+msgstr "Bloki"
+
+msgid "Chat"
+msgstr "Babilado"
+
+msgid "Groupchat"
+msgstr "Retbabilejo"
+
+msgid "Jappix Mobile"
+msgstr "Poŝtelefona Jappix"
+
+msgid "Desktop"
+msgstr "Surtabla versio"
+
+msgid "Mobile"
+msgstr "Poŝtelefona versio"
+
+msgid "Please wait..."
+msgstr "Momenton…"
+
+msgid "Please enable JavaScript"
+msgstr "Bonvolu enŝalti Ĝavoskripton"
+
+msgid "Your channel"
+msgstr "Via kanalo"
+
+msgid "Channel of"
+msgstr "Kanalo da"
+
+msgid "More notices..."
+msgstr "Pli da avizoj…"
+
+msgid "Attach a file"
+msgstr "Alligas dosieron "
+
+msgid "Send"
+msgstr "Sendi"
+
+msgid "Unattach the file"
+msgstr "Malalligas dosieron "
+
+msgid "An error occured while uploading your file: maybe it is too big (%s maximum) or forbidden!"
+msgstr "Eraro okazis dum via dosiero elŝutado: eble ĝi estas tro granda (%s maksimuma) aŭ malpermesita!"
+
+msgid "Authorization failed"
+msgstr "Rajtigo malsuksesis"
+
+msgid "Registration failed, please choose a different username"
+msgstr "Registrigo malsuksesis. Bonvolu elekti alian salutnomon."
+
+msgid "Service unavailable"
+msgstr "Maldisponebla servo"
+
+msgid "Internal server error, try later"
+msgstr "Interna servila eraro, provas poste"
+
+msgid "Your form has been sent."
+msgstr "Via formo estis sendita."
+
+msgid "Application"
+msgstr "Aplikaĵo"
+
+msgid "XMPP links"
+msgstr "XMPPa ligoj"
+
+msgid "Open XMPP links with Jappix"
+msgstr "Malfermi XMPPan ligojn kun Jappix"
+
+msgid "changed the subject to:"
+msgstr "ŝanĝis la temon al:"
+
+msgid "Welcome!"
+msgstr "Bonvenon!"
+
+msgid "Friends"
+msgstr "Amikoj"
+
+msgid "Welcome on Jappix, your own social cloud!"
+msgstr "Bonvenon ĉe Jappix, via propra socia nubo!"
+
+msgid "Before you start using it, you will have to change some settings, search for friends and complete your profile."
+msgstr "Antaŭ ol vi komencas uzi ĝin, vi devos ŝanĝi kelkajn agordojn, serĉi amikojn kaj kompletigi vian profilon."
+
+msgid "Enable notification sounds"
+msgstr "Enŝalti sciigajn sonojn"
+
+msgid "Share your position on the globe"
+msgstr "Komuniku vian lokon sur Tero"
+
+msgid "Offline friends"
+msgstr "Eksterretaj amikoj"
+
+msgid "Don't hide offline friends"
+msgstr "Ne kaŝi eksterretajn amikojn"
+
+msgid "Use this tool to find your friends on the server you are using right now, or add them later."
+msgstr "Uzi ĉi tiun ilon por trovi viajn amikojn sur la servilo kiu vi ĝus uzas nun, aŭ aldoni ilin poste."
+
+msgid "Great work! Now, you can share Jappix with your friends!"
+msgstr "Bonege! Nun, vi povas kunuzi Jappix kun viaj amikoj!"
+
+msgid "When you will press the save button, the profile editor will be opened. Happy socializing!"
+msgstr "Kiam vi premos la “savi” butonon, la profila redaktorilo estos malfermita. Feliĉan societumon!"
+
+msgid "Share Jappix on %s"
+msgstr "Kunuzigi Jappix-on ĉe %s"
+
+msgid "Using Jappix, an open social platform. I am %s!"
+msgstr "Uzante Jappix-on, malferma socia platformo. Mi estas %s!"
+
+msgid "Unknown name"
+msgstr "Nekonata nomo"
+
+msgid "Unknown country"
+msgstr "Nekonata lando"
+
+msgid "Click to enable"
+msgstr "Premi por enŝalti"
+
+msgid "Click to disable"
+msgstr "Premi por elŝalti"
+
+msgid "Installation"
+msgstr "Instalado"
+
+msgid "Jappix installation"
+msgstr "Jappix-a instalado"
+
+msgid "Welcome to the Jappix installation!"
+msgstr "Bonvenon en la instalado de Jappix!"
+
+msgid "This tool will help you fastly install Jappix, the first full-featured XMPP-based social platform, on your server. You don't even need any technical knowledge."
+msgstr "Ĉi tiu ilo helpos vin instali Jappix-on rapide, la unua  XMPP-bazita socian platformon, sur via servilo. Vi ne eĉ devas ajnan teknikan scion."
+
+msgid "Let's have a look at the installation steps:"
+msgstr "Jen la instaladaj paŝoj:"
+
+msgid "Welcome"
+msgstr "Bonvenon"
+
+msgid "Storage configuration"
+msgstr "Konservada agordo"
+
+msgid "Administrator account"
+msgstr "Administranta konto"
+
+msgid "Main configuration"
+msgstr "Ĉefa agordo"
+
+msgid "Hosts configuration"
+msgstr "Agordo de gastigoj"
+
+msgid "Services installation"
+msgstr "Instalado de servoj"
+
+msgid "If the current language does not match yours (%1s), you can make Jappix speak %2s it will be saved."
+msgstr "Se la nuna lingvo ne kongruas la vian (%1s), vi povas paroligi Jappix %2s ĝi estos savita."
+
+msgid "If you want to get some help about the Jappix installation and configuration, you can use our whole documentation, available at:"
+msgstr "Se vi deziras akiri helpon pri la Jappix-a instalaĵo kaj agordaĵo, vi povas uzi nian tutan dokumentaron, havebla ĉe:"
+
+msgid "It's time to build your own social cloud: just go to the next step!"
+msgstr "Estas tempo por konstrui vian propran socian nubon: nur iru al la sekvanta paŝo!"
+
+msgid "Jappix stores persistent data (such as shared files, chat logs, your own music and its configuration) into a single secured storage folder."
+msgstr "Jappix entenas persistan datumon (kiel komunaj dosieroj, konversaciaj ŝtipoj, via propra muziko kaj ĝia konfiguracio) en ununura gardata konservada dosierujo."
+
+msgid "Jappix must be able to write in this folder to create its sub-directories. If not, you must set the rights to %1s or change the folder owner to %2s (depending of your configuration)."
+msgstr "Jappix devas esti kapabla skribi en ĉi tiu teko krei ĝia sub-adresaroj. Se ne, vi devas fiksi la rajtojn al %1s aŭ ŝanĝi la tekan posedanton al %2s (dependanta de via konfiguracio)."
+
+msgid "The folder is writable, you can continue!"
+msgstr "La dosierujo estas skribebla, vi povas daŭri!"
+
+msgid "Jappix offers you the possibility to manage your configuration, install new addons or search for updates. That's why you must create an administrator account to access the manager."
+msgstr "Jappix ebligas vin administri vian konfiguron, instali novajn kromaĵojn aŭ serĉi ĝisdatigojn. Tio estas kial vi devas krei administrantan konton por aliri la manaĝeron."
+
+msgid "When Jappix will be installed, just click on the manager link on the home page to access it."
+msgstr "Kiam Jappix estos instalita, ĵus klaku sur la manaĝera ligo ĉe la hejmpaĝo por aliri ĝin."
+
+msgid "Oops, you missed something or the two passwords do not match!"
+msgstr "Ohoh, vi perdiĝis ion aŭ la du pasvortoj ne kongruas!"
+
+msgid "Jappix needs that you specify some values to work. Please correct the following inputs (or keep the default values, which are sufficient for most people)."
+msgstr "Jappix necesas ke vi specifu kelkajn valorojn por funkcii. Bonvolu ĝustigi la sekvantajn enigojn (aŭ teni la apriorajn valorojn, kiu estas sufiĉa por plejpartoj de homoj)."
+
+msgid "Note that if you don't specify a value which is compulsory, it will be automatically completed with the default one."
+msgstr "Notu ke se vi ne specifas valoron kiu estas deviga, ĝi estos aŭtomate kompletigita kun la apriora unu."
+
+msgid "User"
+msgstr "Uzanto"
+
+msgid "Service"
+msgstr "Servo"
+
+msgid "Service name"
+msgstr "Serva nomo"
+
+msgid "Service description"
+msgstr "Serva priskribo"
+
+msgid "Connection"
+msgstr "Konekto"
+
+msgid "Lock the host"
+msgstr "Ŝlozi la gastigon"
+
+msgid "Anonymous mode"
+msgstr "Sennoma modo"
+
+msgid "Registration allowed"
+msgstr "Registriĝo permesita"
+
+msgid "Use a proxy"
+msgstr "Uzi prokurilon"
+
+msgid "Encryption"
+msgstr "Ĉifrado"
+
+msgid "HTTPS storage"
+msgstr "HTTPS-a konservado"
+
+msgid "Force HTTPS"
+msgstr "Perforti HTTPS-n"
+
+msgid "Compression"
+msgstr "Densigo"
+
+msgid "This page helps you specify the default hosts Jappix will connect to. You can leave it as it is and continue if you want to use the official service hosts."
+msgstr "Ĉi-tiu paĝo helpas vin por specifi la apriorajn gastigojn kiu konektos al Jappix. Vi povas lasi ĝin kiel ĝi estas, kaj daŭri se vi deziras uzi la oficialajn servajn gastigojn."
+
+msgid "Maybe you don't know what a BOSH server is? In fact, this is a relay between a Jappix client and a XMPP server, which is necessary because of technical limitations."
+msgstr "Eble vi ne scias kiu BOSH-a servilo estas? Fakte, tio ĉi estas transsendado inter Jappix kliento kaj XMPP-a servilo, kiu estas necesa pro teknikaj limoj."
+
+msgid "Main host"
+msgstr "Ĉefa gastigo"
+
+msgid "Groupchat host"
+msgstr "Retbabileja gastigo"
+
+msgid "Anonymous host"
+msgstr "Sennoma gastigo"
+
+msgid "Directory host"
+msgstr "Dosieruja gastigo"
+
+msgid "BOSH host"
+msgstr "BOSH-a gastigo"
+
+msgid "You can install some extra softwares on your server, to extend your Jappix features. Some others might be modified, because of security restrictions which are set by default."
+msgstr "Vi povas instali kelkajn kromaĵojn sur via servilo, etendi vian Jappix-an funkciojn. Kelkaj aliaj povus esti modifita, pro sekurecaj restriktoj kiuj estas fiksita apriore."
+
+msgid "To perform this, you must be able to access your server's shell and be logged in as root. Remember this is facultative, Jappix will work without these modules, but some of its features will be unavailable."
+msgstr "Por fari tion-ĉi, vi devas esti kapabla aliri la via servila ŝelo, kaj esti ensalutita kiel administranto. Memori ĉi-tion ne estas deviga, Jappix laboros sen ĉi-tiuj kapsuloj, sed kelkaj el funkcioj estos malhaveblaj."
+
+msgid "After you finished the setup, Jappix will generate the cache files. It might be slow, just wait until the application is displayed and do not press any button."
+msgstr "Kiam tiam vi finigis la agordon, Jappix produktos la kaŝdosierojn. Povus esti malrapida, bv. atendi ĝis la aplikaĵo estos montrita kaj ne premu iu-ajnan butonon."
+
+msgid "Thanks for using Jappix!"
+msgstr "Dankon por uzi Jappix-n!"
+
+msgid "Next"
+msgstr "Laŭ"
+
+msgid "Finish"
+msgstr "Fini"
+
+msgid "Check again"
+msgstr "Denove kontroli"
+
+msgid "The folder is not writable, set the right permissions to the %s directory."
+msgstr "La dosierujo ne estas skribebla. Bonvolu agordi la ĝustajn permesojn al la %s dosierujon."
+
+msgid "%s is installed on your system."
+msgstr "%s estas instalita sur via sistemo."
+
+msgid "%1s is not installed on your system, you should install %2s."
+msgstr "%1s ne estas instalita sur via sistemo. Vi devus instali %2s."
+
+msgid "PHP maximum upload size is sufficient (%s)."
+msgstr "PHP maksimuma alŝuta grando estas sufiĉa (%s)."
+
+msgid "PHP maximum upload size is not sufficient (%1s), you should define it to %2s in %3s."
+msgstr "PHP maksimuma alŝuta grando ne estas sufiĉa (%1s). Vi devus defini ĝin inter %2s kaj %3s."
+
+msgid "Jappix manager"
+msgstr "Jappix-a administrilo"
+
+msgid "Manager access"
+msgstr "Administrila aliro"
+
+msgid "Statistics"
+msgstr "Statistiko"
+
+msgid "Hosts"
+msgstr "Gastigoj"
+
+msgid "Design"
+msgstr "Fasonado"
+
+msgid "Repeat"
+msgstr "Ripeti"
+
+msgid "All"
+msgstr "Ĉio"
+
+msgid "Horizontal"
+msgstr "Horizontala"
+
+msgid "Vertical"
+msgstr "Vertikala"
+
+msgid "Center"
+msgstr "Centre"
+
+msgid "Left"
+msgstr "Maldekstre"
+
+msgid "Right"
+msgstr "Dekstre"
+
+msgid "Top"
+msgstr "Supre"
+
+msgid "Bottom"
+msgstr "Fundo"
+
+msgid "Adapt"
+msgstr "Adapti"
+
+msgid "Color"
+msgstr "koloro"
+
+msgid "Users"
+msgstr "Uzantoj"
+
+msgid "Updates"
+msgstr "Ĝisdatigoj"
+
+msgid "This is a restricted area: only the authorized users can manage this Jappix node."
+msgstr "Tio ĉi estas restriktita zonon: nur la rajtigitaj uzantoj povus administri ĉi-tiun Jappix-an nodon."
+
+msgid "Please use the form below to login to the administration panel."
+msgstr "Bonvolu uzi la suban formularon por ensaluti en la administrita panelo."
+
+msgid "To improve security, sessions are limited in time and when your browser will be closed, you will be logged out."
+msgstr "Por plibonigi sekurecon, sesioj estas limigitaj per tempo kaj kiam via retumilo estos fermita, vi estos adiaŭita."
+
+msgid "Credentials"
+msgstr "Legitimaĵo"
+
+msgid "You have been logged out. Goodbye!"
+msgstr "Vi estis elsalutita. Ĝis!"
+
+msgid "Oops, you could not be recognized as a valid administrator. Check your credentials!"
+msgstr "Hoho, vi ne povus esti rekonita kiel valida administranto. Bonvolu kontroli vian leĝitimaĵon!"
+
+msgid "Basic statistics are processed by Jappix about some important things, you can find them below."
+msgstr "Bazan statistikon estas faritaj per Jappix pri kelkaj gravaj aferoj. Vi povas trovi ilin malsupre."
+
+msgid "Change your Jappix node configuration with this tool."
+msgstr "Ŝanĝu vian Jappix-an nodna konfiguracion kun ĉi-tiu ilo."
+
+msgid "Change the XMPP hosts that this Jappix node serve with this tool."
+msgstr "Ŝanĝu la XMPP-an gastigojn ke ĉi-tiu Jappix-a nodo povas servi kun ĉi-tiu ilo."
+
+msgid "All this Jappix node stored files can be managed with this tool: please select a sub-folder and start editing its content!"
+msgstr "Ĉiuj Jappix-a noda konservitaj dosierojn povas esti administrita kun ĉi tiu ilo: bonvolu elekti subdosierujon kaj komenci redakti ĝian enhavon!"
+
+msgid "Jappix is fully customisable: you can change its design right here."
+msgstr "Jappix estas tute tajlorebla: vi povas ŝanĝi ĝian fasonadon ĉi-tie."
+
+msgid "This is not a valid image, please use PNG, GIF or JPG!"
+msgstr "Tio-ĉi ne estas valida bildo. Bonvolu uzi PNG, GIF aŭ JPG!"
+
+msgid "The image could not be received, would you mind retry?"
+msgstr "La bildo ne povus esti ricevita. Bonvolu provi denove."
+
+msgid "Your image was added to the list!"
+msgstr "Vian bildon estas aldonita al la listo!"
+
+msgid "Changes saved!"
+msgstr "Ŝanĝoj konservitaj"
+
+msgid "You can define more than one administrator for this Jappix node. You can also change a password with this tool."
+msgstr "Vi povas difini pli ol unu administranto por ĉi-tiu Jappix nodo. Vi ankaŭ povas ŝanĝi pasvorton kun ĉi tiu ilo."
+
+msgid "Update your Jappix node with this tool, or check if a new one is available. Informations about the latest version are also displayed (in english)."
+msgstr "Ĝisdatigu vian Jappix-an nodon kun ĉi-tiu ilo, aŭ kontroli se nova estas havebla. Informoj pri la plej lasta versio estas ankaŭ montritaj (en la angla)."
+
+msgid "Access statistics"
+msgstr "Iri al statistiko"
+
+msgid "Share statistics"
+msgstr "Disvastigi statistikon"
+
+msgid "Other statistics"
+msgstr "Alia statistiko"
+
+msgid "January"
+msgstr "Januaro"
+
+msgid "February"
+msgstr "Februaro"
+
+msgid "March"
+msgstr "Marto"
+
+msgid "April"
+msgstr "Aprilo"
+
+msgid "May"
+msgstr "Majo"
+
+msgid "June"
+msgstr "Junio"
+
+msgid "July"
+msgstr "Julio"
+
+msgid "August"
+msgstr "Aŭgusto"
+
+msgid "September"
+msgstr "Septembro"
+
+msgid "October"
+msgstr "Oktobro"
+
+msgid "November"
+msgstr "Novembro"
+
+msgid "December"
+msgstr "Decembro"
+
+msgid "Monday"
+msgstr "lundo"
+
+msgid "Tuesday"
+msgstr "mardo"
+
+msgid "Wednesday"
+msgstr "merkredo"
+
+msgid "Thursday"
+msgstr "jaŭdo"
+
+msgid "Friday"
+msgstr "vendredo"
+
+msgid "Saturday"
+msgstr "sabato"
+
+msgid "Sunday"
+msgstr "dimanĉo"
+
+msgid "Total"
+msgstr "Totala"
+
+msgid "Cache"
+msgstr "Kaŝmemoro"
+
+msgid "Logs"
+msgstr "Protokoloj"
+
+msgid "Music"
+msgstr "Muziko"
+
+msgid "Backgrounds"
+msgstr "Fonoj"
+
+msgid "Share"
+msgstr "Disvastigi"
+
+msgid "Background"
+msgstr "Fono"
+
+msgid "Notice"
+msgstr "Avizo"
+
+msgid "Your design preferences have been saved!"
+msgstr "Viaj fasonaj preferoj estis savita!"
+
+msgid "Please check your inputs: something is missing!"
+msgstr "Bonvolu kontroli viajn enigojn: io mankas!"
+
+msgid "Change your Jappix node background with this tool. You can either set a custom color or an uploaded image. Let your creativity flow!"
+msgstr "Ŝanĝu vian Jappix-an nodan fonon kun ĉi tiu ilo. Vi povas agordi propran koloron aŭ alŝutitan bildon. Lasu vian kreecon flui!"
+
+msgid "Use default background"
+msgstr "Uzi aprioran fonon"
+
+msgid "Use your own image"
+msgstr "Uzi vian propran bildon"
+
+msgid "Select a background to use and change the display options."
+msgstr "Elektu fonon por uzi kaj ŝanĝi la vidigajn elektojn."
+
+msgid "Use your own color"
+msgstr "Uzi vian propran koloron"
+
+msgid "Type the hexadecimal color value you want to use as a background."
+msgstr "Tajpu la deksesuman koloran valoron kiun vi deziras uzi kiel fono."
+
+msgid "Manage backgrounds"
+msgstr "Administri fonojn"
+
+msgid "You can add a new background to the list with this tool. Please send a valid image."
+msgstr "Vi povas aldoni novan fonon al la listo kun ĉi-tiu ilo. Bonvolu sendi validan bildon."
+
+msgid "If you want to remove some backgrounds, use the browser below."
+msgstr "Se vi deziras forigi kelkajn fonojn, uzu la suban retumilon."
+
+msgid "Define a homepage notice for all your users, such as a warn, an important message or an advert with this tool."
+msgstr "Difinu ĉefpaĝan avizon por ĉiuj viaj uzantoj, ekzemple averto, grava mesaĝo aŭ reklamo kun ĉi-tiu ilo."
+
+msgid "Simple notice"
+msgstr "Simple avizo"
+
+msgid "This notice only needs simple text to be displayed, but no code is allowed!"
+msgstr "Ĉi-tiu avizo nur bezonas simplan tekston por esti montrita, sed kodo ne estas permesita!"
+
+msgid "Advanced notice"
+msgstr "Kroma avizo"
+
+msgid "You can customize your notice with embedded HTML, CSS and JavaScript, but you need to code the style."
+msgstr "Vi povas agordi vian avizon kun enigita HTML, CSS kaj Ĝavoskripto, sed vi bezonas kodi la stilon."
+
+msgid "Available updates"
+msgstr "Haveblaj ĝisdatigoj"
+
+msgid "What's new?"
+msgstr "Kio nova?"
+
+msgid "Your storage folders are not writable, please apply the good rights!"
+msgstr "Viaj konservaj dosierujon ne estas skribeblaj. Bonvolu apliki la ĝustajn rajtojn!"
+
+msgid "%1s may cause problems to the proxy, please increase %2s value up to %3s!"
+msgstr "%1s povas kaŭzi problemojn al la prokurilo. Bonvolu pliigi %2s valoro ĝis %3s!"
+
+msgid "You are using a development version of Jappix. Update it through our repository by executing: %s."
+msgstr "Vi estas uzanta konstruatan version de Jappix. Ĝisdatigu ĝin tra nia deponejo plenumigante: %s."
+
+msgid "A new Jappix version is available! Check what is new and launch the update!"
+msgstr "Nova versio de Jappix estas havebla! Kontrolu kion estas nova kaj lanĉu la ĝisdatigon!"
+
+msgid "Your version is out to date. Update it now to %s by clicking here!"
+msgstr "Via versio ne estas ĝisdatiga. Bonvolu nun ĝisdatigi al %s, klakante ĉi-tie!"
+
+msgid "Your version seems to be up to date, but you can check updates manually by clicking here."
+msgstr "Via versio ŝajnas esti ĝisdatiga, sed vi povas kontroli ĝisdatigojn mane, klakante ĉi-tie."
+
+msgid "Check for updates"
+msgstr "Kontroli ĝisdatigoj"
+
+msgid "Update in progress"
+msgstr "Ĝisdatigante…"
+
+msgid "Jappix has been updated: you are now running the latest version. Have fun!"
+msgstr "Jappix estis ĝisdatigita: vi nun uzas la plej lastan version. Amuziĝu!"
+
+msgid "The update has failed! Please try again later."
+msgstr "La ĝisdatigo fiaskis! Bonvolu provi denove poste."
+
+msgid "Downloading package..."
+msgstr "Elŝutante pakaĵon…"
+
+msgid "Removing current Jappix system files..."
+msgstr "Forigas nunajn Jappix-an sistemajn dosierojn…"
+
+msgid "Extracting package..."
+msgstr "Eltirante pakaĵon…"
+
+msgid "Regenerating storage folder tree..."
+msgstr "Regenerante konservadan dosierujan arbon..."
+
+msgid "Jappix is now up to date!"
+msgstr "Jappix estas nun ĝisdatigita!"
+
+msgid "Aborted: socket error!"
+msgstr "Ĉesita: inga eraro!"
+
+msgid "Aborted: buffer error!"
+msgstr "Ĉesita: bufra eraro!"
+
+msgid "Aborted: everything is not writable!"
+msgstr "Ĉesita: ĉio ne skribeblas!"
+
+msgid "Aborted: could not extract the package!"
+msgstr "Ĉesita: ne povas eltiri la pakaĵon!"
+
+msgid "Visits"
+msgstr "Vizitoj"
+
+msgid "Daily"
+msgstr "Ĉiutaga"
+
+msgid "Weekly"
+msgstr "Ĉiusemajna"
+
+msgid "Monthly"
+msgstr "Ĉiumonata"
+
+msgid "Yearly"
+msgstr "Ĉiujara"
+
+msgid "Size"
+msgstr "Grando"
+
+msgid "Clean everything"
+msgstr "Viŝi ĉion"
+
+msgid "Purge cache"
+msgstr "Viŝi kaŝmemoron"
+
+msgid "Purge logs"
+msgstr "Viŝi protokolojn"
+
+msgid "Purge updates"
+msgstr "Viŝi ĝisdatigojn"
+
+msgid "The storage folder you wanted to clean is now empty!"
+msgstr "La konservada dosiero tiun, kiun vi volus viŝi estas nun malplena!"
+
+msgid "Keep your Jappix node fresh and fast, clean the storage folders regularly!"
+msgstr "Tenu vian Jappix-an nodon freŝe kaj rapide, viŝu la konservadan dosieron regule!"
+
+msgid "Upload your music (Ogg Vorbis, MP3 or WAV) to be able to listen to it in Jappix!"
+msgstr "Alŝutu vian muzikon (Ogg Vorbis, Mp3 aŭ WAV) por esti kapabla aŭskulti ĝin ĉe Jappix!"
+
+msgid "The file you want to upload must be smaller than %s."
+msgstr "La dosiero vi deziras alŝuti devus esti malpli grande ol %s."
+
+msgid "Stay tuned in what your users store on your server and remove undesired content with this tool."
+msgstr "Estu vigla pri kion viaj uzantoj konservas en via servilo, kaj forigu nedezireman enhavon kun ĉi tiu ilo."
+
+msgid "Title"
+msgstr "Titolo"
+
+msgid "Artist"
+msgstr "Artisto"
+
+msgid "Album"
+msgstr "Albumo"
+
+msgid "File"
+msgstr "Dosiero"
+
+msgid "Upload"
+msgstr "Alŝuti"
+
+msgid "The folder is empty."
+msgstr "La dosieraro estas malplena."
+
+msgid "The music could not be received, please retry!"
+msgstr "La muziko ne povus esti ricevita, bonvolu provi denove!"
+
+msgid "This is not a valid music file, please encode in Ogg Vorbis, MP3 or WAV!"
+msgstr "Tio ĉi ne estas valida muzika dosiero. Bonvolu kodigi en Ogg Vorbis, Mp3 aŭ WAV."
+
+msgid "Your music has been added!"
+msgstr "Via muziko ĵus estas aldonita!"
+
+msgid "The selected elements have been removed."
+msgstr "La elektitajn elementojn estas forigita."
+
+msgid "You must select elements to remove!"
+msgstr "Vin devas elekti forigendajn elementojn!"
+
+msgid "Add a new user with this tool, or change a password (type an existing username). Please submit a strong password!"
+msgstr "Aldonu novan uzanton kun ĉi-tiu ilo, aŭ ŝanĝu pasvorton (tajpu ekzistantan salutnomon). Bonvolu sendi fortan pasvorton!"
+
+msgid "Manage"
+msgstr "Administri"
+
+msgid "List"
+msgstr "Listo"
+
+msgid "Remove users with this tool. Note that you cannot remove an user if he is the only one remaining."
+msgstr "Forigu uzantojn kun ĉi-tiu ilo. Notu ke vi ne povas forigi uzanton se li estas la ununura restante."
+
+msgid "The user has been added!"
+msgstr "La uzanto estis aldonita!"
+
+msgid "The chosen users have been removed."
+msgstr "La elektitaj uzantoj estis forigita."
+
+msgid "You must select one or more users to be removed!"
+msgstr "Vi devas elekti unu aŭ pli da uzantoj por esti forigi!"
+
+msgid "Yesterday"
+msgstr "Hieraŭ"
+
+msgid "%s days ago"
+msgstr "%s tagoj antaŭe"
+
+msgid "User currently active"
+msgstr "Uzanto nune aktiva"
+
+msgid "Last seen: %s"
+msgstr "Laste vidita: %s"
+
+msgid "Inactive since: %s"
+msgstr "Malaktiva ekde: %s"
+
+msgid "Your friend seems not to have received your message(s)!"
+msgstr "Via amiko ŝajnas ke li ne ricevas viajn mesaĝojn! "
+
+msgid "Static content server"
+msgstr "Senmova enhava servilo"
+
+msgid "This is the static content server for %1s, “%2s”."
+msgstr "Tiu estas la senmova enhava servilo por %1s, “%2s”."
+
+msgid "Suggested friends"
+msgstr "Proponi amikojn"
+
+msgid "Check all"
+msgstr "Enŝalti ĉion"
+
+msgid "Uncheck all"
+msgstr "Elŝalti ĉion"
+
+msgid "Choose"
+msgstr "Elekti"
+
+msgid "List name"
+msgstr "Lista nomo"
+
+msgid "Allow"
+msgstr "Permesi"
+
+msgid "Deny"
+msgstr "Malpermesi"
+
+msgid "Group"
+msgstr "Groupo"
+
+msgid "Subscription"
+msgstr "Abono"
+
+msgid "Both"
+msgstr "Ambaŭ"
+
+msgid "From"
+msgstr "De"
+
+msgid "Everybody"
+msgstr "Ĉiuj"
+
+msgid "Send messages"
+msgstr "Sendi mesaĝojn"
+
+msgid "Send queries"
+msgstr "Sendi petojn"
+
+msgid "See my status"
+msgstr "Vidi mia stato"
+
+msgid "Send his/her status"
+msgstr "Sendi lia/ŝia staton"
+
+msgid "Everything"
+msgstr "Ĉio"
+
+msgid "Item"
+msgstr "Elemento"
+
+msgid "Order"
+msgstr "Ordo"
+
+msgid "Active for this session"
+msgstr "Aktiva por tiu seanco"
+
+msgid "Always active"
+msgstr "Ĉiam aktiva"
+
+msgid "User directory"
+msgstr "Jarlibro de uzantoj"
+
+msgid "Search a friend"
+msgstr "Serĉi amikon"
+
+msgid "The feature requested is not implemented by the recipient or server and therefore cannot be processed."
+msgstr "La petita funkcio ne estas efektivigita de la ricevinto aŭ servilo kaj sekve ne povas esti pretigita."
+
+msgid "This is a repeat from %s"
+msgstr "Tio estas ripeto de %s"
+
+msgid "Loading comments..."
+msgstr "Ĉarĝante komentojn…"
+
+msgid "Type your comment here..."
+msgstr "Tajpu vian komenton ĉi-tie…"
+
+msgid "Could not get the comments!"
+msgstr "Ne povis akiri komentojn!"
+
+msgid "Show comments"
+msgstr "Montri komentojn"
+
+msgid "Send him/her a message"
+msgstr "Sendi mesaĝon al li/ŝi"
+
+msgid "Start a chat with him/her"
+msgstr "Komenci babilon kun li/ŝi"
+
+msgid "Media integration"
+msgstr "Aŭdvidaĵo integrado"
+
+msgid "Comments locked!"
+msgstr "Komentoj ŝlositaj!"
+
+msgid "Type something you want to share with your friends..."
+msgstr "Tajpu ion vi deziras disvastigi al viaj amikoj..."
+
+msgid "changed his/her nickname to %s"
+msgstr "ŝanĝis lia/ŝia kromnomo al %s"
+
+msgid "commented an item you follow: “%s”."
+msgstr "komentis elementon kiun vi sekvas: “%s”."
+
+msgid "Hide"
+msgstr "Kaŝi"
+
+msgid "liked your post: “%s”."
+msgstr "ŝatas vian afiĝon: “%s”."
+
+msgid "quoted you somewhere: “%s”."
+msgstr "citigis vin ie: “%s”."
+
+msgid "published on your wall: “%s”."
+msgstr "publikigis sur via muro: “%s”."
+
+msgid "tagged you in a photo (%s)."
+msgstr "markis vin sur bildon (%s)."
+
+msgid "tagged you in a video (%s)."
+msgstr "markis vin sur videon (%s)."
+
+msgid "Show"
+msgstr "Montri"
+
+msgid "Need help? You'd better read our documentation page about how to fill this form!"
+msgstr "Bezoni helpon? Vi povus legi nian dokumentaran paĝon pri kiel plenigi ĉi-tiun formularon!"
+
+msgid "Pubsub host"
+msgstr "Pubsub-a gastigo"
+
+msgid "Jappix is a great social platform, that you can access wherever you are, whenever you want and communicate with whovever you want."
+msgstr "Jappix estas genia socia platformo, kiu vi povas aliri ie-ajn vi estas, iam-ajn vi deziras kaj komuniki kun kiu-ajn vi deziras."
+
+msgid "Manager link"
+msgstr "Administra ligilo"
+
+msgid "User uploads server"
+msgstr "Uzanta alŝutitaj servilo"
+
+msgid "This is the user uploads server for %1s, “%2s”."
+msgstr "Ĉi-tio estas la uzanta alŝutaj servilo por %1s, “%2s”."
+
+msgid "Logo"
+msgstr "Emblemo"
+
+msgid "You can set your own service logo to replace the default one. Take care of the size and the main color of each logo!"
+msgstr "Vi povas agordi vian propran servan emblemon por anstataŭigi la aprioran unun. Zorgu la grandon kaj la ĉefan koloron de ĉiu emblemo!"
+
+msgid "Upload each logo with the recommended maximum pixel size."
+msgstr "Alŝutu ĉiun emblemon kun la rekomenda maksimuma bildera grandeco."
+
+msgid "This is not a valid image, please use the PNG format!"
+msgstr "Ne estas valida bildo. Bonvolu uzi la formato PNG."
+
+msgid "Your service logo has been successfully changed!"
+msgstr "Via serva emblemo estas sukcese ŝanĝita!"
+
+msgid "Your logo format must be PNG. Leave a field empty and the logo will not be changed."
+msgstr "Via emblema formato devus esti PNG. La emblemon ne estos ŝanĝita se vi lasu malplenan kampon."
+
+msgid "Remove this logo"
+msgstr "Forviŝi ĉi-tiun emblemon"
+
+msgid "View this logo"
+msgstr "Vidi ĉi-tiun emblemon"
+
+msgid "Send a file"
+msgstr "Sendi dosieron"
+
+msgid "Once uploaded, your friend will be prompted to download the file you sent."
+msgstr "Kiam alŝutita, via amiko estos invitata por elŝuti la senditan dosieron."
+
+msgid "Groupchats to join"
+msgstr "Alireblaj retbabilejoj"
+
+msgid "Purge sent files"
+msgstr "Viŝi senditajn dosierojn"
+
+msgid "would like to send you a file: “%s”."
+msgstr "deziras sendi al vi dosieron: “%s”."
+
+msgid "has accepted to received your file: “%s”."
+msgstr "akceptis ricevi vian dosieron:“%s”."
+
+msgid "has rejected to receive your file: “%s”."
+msgstr "malakceptis ricevi vian dosieron:“%s”."
+
+msgid "could not receive your file: “%s”."
+msgstr "ne povas ricevi vian dosieron: “%s”."
+
+msgid "has received a file exchange request: “%s”."
+msgstr "ricevis dosieran interŝanĝan peton:“%s”."
+
+msgid "Available shortcuts:"
+msgstr "Haveblaj fulmoklavoj:"
+
+msgid "%s removes the chat logs"
+msgstr "%s forigas la babilemajn protokoldosierojn"
+
+msgid "%s joins a groupchat"
+msgstr "%s aliris retbabilejon"
+
+msgid "%s closes the chat"
+msgstr "%s fermas la babilejon"
+
+msgid "%s shows the user profile"
+msgstr "%s montras la uzantan profilon"
+
+msgid "%s sends a message to the room"
+msgstr "%s sendas mesaĝon al la babilejo"
+
+msgid "%s changes your nickname"
+msgstr "%s ŝanĝas vian kromnomon"
+
+msgid "%s sends a message to someone in the room"
+msgstr "%s sendas mesaĝon al iu en la babilejo"
+
+msgid "%s changes the room topic"
+msgstr "%s ŝanĝas la babilejan subjekton"
+
+msgid "%s kicks an user of the room"
+msgstr "%s forpelas uzanton el la babilejo"
+
+msgid "%s bans an user of the room"
+msgstr "%s ekskludas uzanton el la babilejo"
+
+msgid "%s invites someone to join the room"
+msgstr "%s invitas iun por aliri la babilejon"
+
+msgid "Social channel, chat and more."
+msgstr ""
+
+msgid "Create your public profile."
+msgstr ""
+
+msgid "A mini-chat for your website."
+msgstr ""
+
+msgid "Get Jappix, get support."
+msgstr ""
+
+msgid "Statistics around Jappix."
+msgstr ""
+
+msgid "Download Jappix for free."
+msgstr ""
+
+msgid "Find a public Jappix node."
+msgstr ""
+
+msgid "Public profile"
+msgstr ""
+
+msgid "Your profile anywhere on the Web."
+msgstr ""
+
+msgid "%s is a Jappix.com service which makes your XMPP profile public. It is easier to share it. No XMPP account is required to view your social channel, your current position and your contact details."
+msgstr ""
+
+msgid "Furthermore, every picture you post in your social channel is added to a beautiful picture timeline. You can now view the pictures you shared year by year."
+msgstr ""
+
+msgid "You can also use your XMPP avatar as a single avatar for every website, blog and forum you use. When you change it on XMPP, the new avatar appears everywhere. What a genious improvement!"
+msgstr ""
+
+msgid "Yay, let's create my public profile!"
+msgstr ""
+
+msgid "Enable my public profile"
+msgstr ""
+
+#~ msgid "Jappix is a non-profit social platform, that you can access wherever you are, whenever you want and communicate with whovever you want."
+#~ msgstr ""
+
+#~ msgid "See"
+#~ msgstr ""
+
+#~ msgid "Use default logo"
+#~ msgstr ""
+
+#~ msgid "Use your own logo"
+#~ msgstr ""
+
+#~ msgid "The recommended image format is PNG. Leave a field empty and the logo will not be changed."
+#~ msgstr ""
diff --git a/jappixmini/jappix/lang/es/LC_MESSAGES/main.mo b/jappixmini/jappix/lang/es/LC_MESSAGES/main.mo
new file mode 100644
index 00000000..94a7132b
Binary files /dev/null and b/jappixmini/jappix/lang/es/LC_MESSAGES/main.mo differ
diff --git a/jappixmini/jappix/lang/es/LC_MESSAGES/main.po b/jappixmini/jappix/lang/es/LC_MESSAGES/main.po
new file mode 100644
index 00000000..9716a39e
--- /dev/null
+++ b/jappixmini/jappix/lang/es/LC_MESSAGES/main.po
@@ -0,0 +1,1870 @@
+# Spanish translations for Jappix package.
+# This file is distributed under the same license as the Jappix package.
+# This file was translated from CodingTeam at <http://codingteam.net/>.
+msgid ""
+msgstr ""
+"Project-Id-Version: Jappix\n"
+"PO-Revision-Date: 2012-01-16 21:27+0100\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"POT-Creation-Date: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+
+msgid "JavaScript is missing in your web browser, so that you will not be able to launch Jappix! Please fix this."
+msgstr "Javascript no se encuentra activado en tu navegador, de modo que no podrás poner en marcha Jappix! Por favor, corrige esto."
+
+msgid "An open social network"
+msgstr "Una red social abierta"
+
+msgid "Jappix has been interrupted by a network issue, a bug or bad login (check that you entered the right credentials), sorry for the inconvenience."
+msgstr "Jappix ha sido interrumpido por un problema de red, un fallo o un acceso incorrecto (comprueba que has introducido las credenciales correctas). Lamentamos el inconveniente."
+
+msgid "The element list on this server could not be obtained!"
+msgstr "¡No se pudo conseguir la lista de elementos de este servidor!"
+
+msgid "Your password has been changed, now you can connect to your account with your new login data."
+msgstr "Tu contraseña ha sido cambiada, ahora puedes conectarte a tu cuenta con los nuevos datos de acceso."
+
+msgid "Your XMPP account has been removed, bye!"
+msgstr "Tu cuenta XMPP ha sido suprimida... ¡Adiós!"
+
+msgid "You have been logged out of your XMPP account, have a nice day!"
+msgstr "Ya saliste de tu cuenta de XMPP, ¡que disfrutes el resto del día!"
+
+msgid "The room you joined seems not to exist. You should create it!"
+msgstr "La sala a la que te has unido no existe. ¡La deberías crear primero!"
+
+msgid "The groupchat has been removed, now someone else will be able to recreate it."
+msgstr "El grupo de charla ha sido eliminado, ahora culquiera puede volver a crearla."
+
+msgid "The user that you want to reach is not present in the room."
+msgstr "El usuario no se encuentra en esta sala."
+
+msgid "Please enter the group chat address to join."
+msgstr "Escribe el nombre de la sala donde quieres entrar."
+
+msgid "Please enter your nickname to join %s."
+msgstr "¿Qué apodo quieres tener en la sala %s?"
+
+msgid "This room (%s) is protected with a password."
+msgstr "La sala %s está protegida por una clave."
+
+msgid "Your browser is out of date!"
+msgstr "¡Necesita actualizar tu navegador!"
+
+msgid "Last %s version is better!"
+msgstr "¡La última versión de %s es mejor!"
+
+msgid "Login"
+msgstr "Acceder"
+
+msgid "Register"
+msgstr "Registrarse"
+
+msgid "Here we go!"
+msgstr "¡Allá vamos!"
+
+msgid "Server"
+msgstr "Servidor"
+
+msgid "Password"
+msgstr "Contraseña"
+
+msgid "Remember me"
+msgstr "Recordarme"
+
+msgid "This tool has been disabled, you cannot use it!"
+msgstr "No se puede usar esta herramienta porque no está activada."
+
+msgid "Due to a network issue, you were disconnected. What do you want to do now?"
+msgstr "Debido a un problema de red, se le ha desconectado. ¿Qué quieres hacer ahora?"
+
+msgid "Reconnect"
+msgstr "Volver a conectar"
+
+msgid "Messages"
+msgstr "Mensajes"
+
+msgid "Profile"
+msgstr "Perfil"
+
+msgid "Options"
+msgstr "Opciones"
+
+msgid "Disconnect"
+msgstr "Desconectar"
+
+msgid "Filter"
+msgstr "Filtro"
+
+msgid "Add a friend"
+msgstr "Agregar a un amigo"
+
+msgid "Your groupchats"
+msgstr "Tus salas de conversación"
+
+msgid "Manage your favorite groupchats"
+msgstr "Gestiona tus grupos de chat favoritos"
+
+msgid "More stuff"
+msgstr "Más cosas"
+
+msgid "Show all friends"
+msgstr "Mostrar a todos los amigos"
+
+msgid "Only show connected friends"
+msgstr "Mostrar sólo a los amigos conectados"
+
+msgid "Message archives"
+msgstr "Archivos de mensajes"
+
+msgid "Date"
+msgstr "Fecha"
+
+msgid "Please select a friend to view the chat history."
+msgstr "Selecciona el amigo con el cual quieres ver el historial de conversaciones"
+
+msgid "Nothing found for: %s"
+msgstr "Nada se encontró para: %s"
+
+msgid "A short message?"
+msgstr "¿Un mensaje corto?"
+
+msgid "How are you?"
+msgstr "¿Cómo estás?"
+
+msgid "What are you doing?"
+msgstr "¿Qué estás haciendo?"
+
+msgid "Join a chat"
+msgstr "Unirse al chat"
+
+msgid "Status"
+msgstr "Estado"
+
+msgid "Available"
+msgstr "Disponible"
+
+msgid "Talkative"
+msgstr "Hablador"
+
+msgid "Away"
+msgstr "Ausente"
+
+msgid "Not available"
+msgstr "No disponible"
+
+msgid "Busy"
+msgstr "Ocupado"
+
+msgid "Mood"
+msgstr "Humor"
+
+msgid "None"
+msgstr "Ninguno"
+
+msgid "Crazy"
+msgstr "Loco"
+
+msgid "Excited"
+msgstr "Excitado"
+
+msgid "Playful"
+msgstr "Juguetón"
+
+msgid "Happy"
+msgstr "Feliz"
+
+msgid "Shocked"
+msgstr "Conmocionado"
+
+msgid "Hot"
+msgstr "Caliente"
+
+msgid "Sad"
+msgstr "Triste"
+
+msgid "Amorous"
+msgstr "Amoroso"
+
+msgid "Confident"
+msgstr "Seguro"
+
+msgid "Activity"
+msgstr "Actividad"
+
+msgid "Chores"
+msgstr "Tareas"
+
+msgid "Drinking"
+msgstr "Bebiendo"
+
+msgid "Eating"
+msgstr "Comiendo"
+
+msgid "Exercising"
+msgstr "Haciendo ejercicio"
+
+msgid "Grooming"
+msgstr "Aseando"
+
+msgid "Appointment"
+msgstr "Cita"
+
+msgid "Inactive"
+msgstr "Inactivos"
+
+msgid "Relaxing"
+msgstr "Relajando"
+
+msgid "Talking"
+msgstr "Hablando"
+
+msgid "Traveling"
+msgstr "Viajando"
+
+msgid "Working"
+msgstr "Trabajando"
+
+msgid "View profile"
+msgstr "Ver el perfil"
+
+msgid "Repeat this notice"
+msgstr "Repetir este aviso"
+
+msgid "Remove this notice"
+msgstr "Eliminar este aviso"
+
+msgid "Your profile"
+msgstr "Tu perfil"
+
+msgid "Identity"
+msgstr "Identidad"
+
+msgid "Profile image"
+msgstr "Imagen del perfil"
+
+msgid "Others"
+msgstr "Otros"
+
+msgid "Personal"
+msgstr "Personal"
+
+msgid "Complete name"
+msgstr "Nombre completo"
+
+msgid "Nickname"
+msgstr "Apodo"
+
+msgid "First name"
+msgstr "Nombre"
+
+msgid "Last name"
+msgstr "Apellido"
+
+msgid "Date of birth"
+msgstr "Fecha de nacimiento"
+
+msgid "Contact"
+msgstr "Contacto"
+
+msgid "E-mail"
+msgstr "E-mail"
+
+msgid "Phone"
+msgstr "Teléfono"
+
+msgid "Website"
+msgstr "Sitio web"
+
+msgid "Current"
+msgstr "Actual"
+
+msgid "Delete"
+msgstr "Borrar"
+
+msgid "What a pity! You have no profile image defined in your identity card!"
+msgstr "Qué pena, no tienes imagen en tu tarjeta de visita..."
+
+msgid "Address"
+msgstr "Dirección"
+
+msgid "Street"
+msgstr "Calle"
+
+msgid "City"
+msgstr "Ciudad"
+
+msgid "Postal code"
+msgstr "Código postal"
+
+msgid "Country"
+msgstr "País"
+
+msgid "Biography"
+msgstr "Biografía"
+
+msgid "Important notice"
+msgstr "Aviso importante"
+
+msgid "Be careful of the information you write into your profile, because it could be accessed by everyone (even someone you don't want to)."
+msgstr "Cuidado con la difusión de la información que le pongas a tu perfil: todo el mundo va a poder verla."
+
+msgid "Not everything is private on XMPP; this is one of those things, your public profile (vCard)."
+msgstr "No todo es privado en XMPP. Por ejemplo tu tarjeta de visita no lo es."
+
+msgid "It is strongly recommended to upload a profile image (%s maximum), like a picture of yourself, because that makes you easily recognizable by your friends."
+msgstr ""
+
+msgid "Save"
+msgstr "Guardar"
+
+msgid "Cancel"
+msgstr "Cancelar"
+
+msgid "Edit options"
+msgstr "Editar opciones"
+
+msgid "Channel"
+msgstr "Canal"
+
+msgid "Commands"
+msgstr "Comandos"
+
+msgid "Sounds"
+msgstr "Sonidos"
+
+msgid "Privacy"
+msgstr "Privacidad"
+
+msgid "Message archiving"
+msgstr "Archivado de mensajes"
+
+msgid "Store a history of your chats"
+msgstr "Guardar un historial de tus chats"
+
+msgid "Geolocation"
+msgstr "Geolocalización"
+
+msgid "Empty"
+msgstr "Vaciar"
+
+msgid "Empty channel"
+msgstr "Canal vacío"
+
+msgid "Persistent"
+msgstr "Persistente"
+
+msgid "Maximum notices"
+msgstr "Máximo de avisos"
+
+msgid "Account"
+msgstr "Cuenta"
+
+msgid "Change password"
+msgstr "Cambiar la contraseña"
+
+msgid "Delete account"
+msgstr "Eliminar cuenta"
+
+msgid "Old"
+msgstr "Antigua"
+
+msgid "New (2 times)"
+msgstr "Nueva (2 veces)"
+
+msgid "Continue"
+msgstr "Continuar"
+
+msgid "To"
+msgstr "A"
+
+msgid "Close"
+msgstr "Cerrar"
+
+msgid "unknown"
+msgstr "desconocido"
+
+msgid "Unavailable"
+msgstr "No disponible"
+
+msgid "is now"
+msgstr "es ahora"
+
+msgid "Please wait while your avatar is uploaded..."
+msgstr ""
+
+msgid "Here it is! A new beautiful profile image!"
+msgstr "Ya está! Una nueva y bonita imagen en tu tarjeta de visita!"
+
+msgid "The image file is not supported or has a bad size."
+msgstr "No se maneja este tipo de imagen, o tal vez sea un problema de tamaño."
+
+msgid "Reply"
+msgstr "Responder"
+
+msgid "Error"
+msgstr "Error"
+
+msgid "Click here to solve the error"
+msgstr "Dale clic aquí para solucionar el problema"
+
+msgid "You"
+msgstr "Tú"
+
+msgid "Remove"
+msgstr "Eliminar"
+
+msgid "Rename"
+msgstr "Renombrar"
+
+msgid "Hi, I am %s, I would like to add you as my friend."
+msgstr "Hola, soy %s. Me gustaría tenerte como amigo en mi lista."
+
+msgid "Smiley insertion"
+msgstr "Inserción de emoticono"
+
+msgid "Change style"
+msgstr "Cambio de estilo"
+
+msgid "Text in bold"
+msgstr "Texto en negrita"
+
+msgid "Text in italic"
+msgstr "Texto en cursiva"
+
+msgid "Underlined text"
+msgstr "Texto subrayado"
+
+msgid "Save chat"
+msgstr "Chat guardado"
+
+msgid "Click on the following link to get the chat log, and wait. Then click again to get the file."
+msgstr "Haz click en el siguiente enlace para guardar la conversación, y espera un momento. Luego haz click de nuevo para descargar el archivo."
+
+msgid "This chat is empty!"
+msgstr "¡La sala está vacía!"
+
+msgid "Generate file!"
+msgstr "¡Generar archivo!"
+
+msgid "Download file!"
+msgstr "¡Bajar el archivo!"
+
+msgid "Clean current chat"
+msgstr "Limpieza del chat"
+
+msgid "View chat history"
+msgstr "Ver el historial del chat"
+
+msgid "Show user profile"
+msgstr "Visualizar el perfil del usuario"
+
+msgid "Add this contact to your friends"
+msgstr "Añadir a este contacto como amigo"
+
+msgid "Add this groupchat to your favorites"
+msgstr "Añadir este grupo de chat a tus favoritos"
+
+msgid "All tabs"
+msgstr "Todas las pestañas"
+
+msgid "Close this tab"
+msgstr "Cerrar esta pestaña"
+
+msgid "no subject defined for this room."
+msgstr "no se especificó un tema para esta sala."
+
+msgid "Administration panel for this room"
+msgstr "Panel de administración de la sala"
+
+msgid "Moderators"
+msgstr "Moderadores"
+
+msgid "Participants"
+msgstr "Participantes"
+
+msgid "Visitors"
+msgstr "Visitantes"
+
+msgid "Manage favorite rooms"
+msgstr "Organiza tus salas favoritas"
+
+msgid "Change favorites"
+msgstr "Cambiar tus favoritos"
+
+msgid "Search a room"
+msgstr "Buscar una sala"
+
+msgid "Select a favorite"
+msgstr "Seleccionar un favorito"
+
+msgid "Getting the name..."
+msgstr "Consiguiendo el nombre..."
+
+msgid "Gateway"
+msgstr "Pasarela"
+
+msgid "Name"
+msgstr "Nombre"
+
+msgid "Room"
+msgstr "Sala"
+
+msgid "Add"
+msgstr "Añadir"
+
+msgid "Edit"
+msgstr "Editar"
+
+msgid "Search a room on"
+msgstr "Buscar una sala en"
+
+msgid "No room found on this server."
+msgstr "No se encontraron salas en este servidor."
+
+msgid "Service discovery"
+msgstr "Descubrir servicios"
+
+msgid "Server to query"
+msgstr "Servidor que consultar"
+
+msgid "Sorry, but the entity didn't return any result!"
+msgstr "Esta entidad no mandó ningún resultado..."
+
+msgid "Accounts"
+msgstr "Cuentas"
+
+msgid "Authentications"
+msgstr "Autentificaciones"
+
+msgid "Automation"
+msgstr "Automatización"
+
+msgid "Clients"
+msgstr "Clientes"
+
+msgid "Collaboration"
+msgstr "Colaboración"
+
+msgid "Components"
+msgstr "Componentes"
+
+msgid "Rooms"
+msgstr "Salas"
+
+msgid "Directories"
+msgstr "Directorios"
+
+msgid "Gateways"
+msgstr "Pasarelas"
+
+msgid "News"
+msgstr "Noticias"
+
+msgid "Hierarchy"
+msgstr "Jerarquía"
+
+msgid "Proxies"
+msgstr "Servidores proxy"
+
+msgid "Publication/Subscription"
+msgstr "Publicación/Suscripción"
+
+msgid "Storage"
+msgstr "Almacenamiento"
+
+msgid "Service offline or broken"
+msgstr "Servidor fuera de línea o roto"
+
+msgid "Your inbox"
+msgstr "Tu bandeja de entrada"
+
+msgid "Available actions"
+msgstr "Acciones disponibles"
+
+msgid "Clean"
+msgstr "Limpiar"
+
+msgid "New"
+msgstr "Nuevo"
+
+msgid "Received"
+msgstr "Recibido"
+
+msgid "Subject"
+msgstr "Asunto"
+
+msgid "Content"
+msgstr "Contenido"
+
+msgid "Send message"
+msgstr "Enviar mensaje"
+
+msgid "Your inbox is empty."
+msgstr "Tu bandeja de entrada está vacía"
+
+msgid "MUC administration"
+msgstr "Administración de MUC"
+
+msgid "You administrate this room"
+msgstr "Tú administras esta sala"
+
+msgid "Enter new subject"
+msgstr "Introduce el nuevo asunto"
+
+msgid "Configuration"
+msgstr "Configuración"
+
+msgid "Authorizations"
+msgstr "Autorizaciones"
+
+msgid "Member list"
+msgstr "Lista de miembros"
+
+msgid "Owner list"
+msgstr "Lista de propietarios"
+
+msgid "Administrator list"
+msgstr "Lista de administradores"
+
+msgid "Outcast list"
+msgstr "Lista de rechazados"
+
+msgid "Add an input"
+msgstr "Añadir una entrada"
+
+msgid "Destroy this MUC"
+msgstr "Destruir este MUC"
+
+msgid "Yes, let's do it!"
+msgstr "Sí, ¡hagámoslo!"
+
+msgid "Your friend is paying attention to the conversation."
+msgstr "Tu amigo está prestando atención a la conversación."
+
+msgid "Your friend is writing a message..."
+msgstr "Tu amigo está escribiendo un mensaje..."
+
+msgid "Your friend stopped writing a message."
+msgstr "Tu amigo dejó de escribir un mensaje."
+
+msgid "Your friend is doing something else."
+msgstr "Tu amigo está haciendo otra cosa."
+
+msgid "Your friend closed the chat."
+msgstr "Tu amigo cerró el chat."
+
+msgid "Requesting this service..."
+msgstr "Solicitando este servicio..."
+
+msgid "Loading"
+msgstr "Cargando"
+
+msgid "joined the chat room"
+msgstr "se unió al chat"
+
+msgid "left the chat room"
+msgstr "ha dejado el chat"
+
+msgid "no status"
+msgstr "no tiene estado"
+
+msgid "has been kicked"
+msgstr "ha sido expulsado"
+
+msgid "has been banned"
+msgstr "ha sido prohibido"
+
+msgid "no reason"
+msgstr "ninguna razón"
+
+msgid "Communicate with the entire world!"
+msgstr "¡Comunícate con el mundo entero!"
+
+msgid "It allows you to get in touch with the millions of users who currently use the XMPP network like you do with Jappix. Join the community and stay free!"
+msgstr "Te permite mantenerte en contacto con los millones de usuarios que en la actualidad usan la red XMPP como tú con Jappix. ¡Únete a la comunidad y sigue libre!"
+
+msgid "Hi there!"
+msgstr "¡Hola!"
+
+msgid "Welcome on %1s, “%2s”."
+msgstr "Bienvenida en %1s: “%2s”."
+
+msgid "Login to your existing XMPP account or create a new one for free!"
+msgstr "Entra a tu cuenta de XMPP existente, o crea una nueva!"
+
+msgid "Jappix is an open-source project from PostPro, a non-profit organization which provides us a great help."
+msgstr "Jappix es un proyecto de código abierto de PostPro, una organización sin ánimo de lucro que nos proporciona una gran ayuda."
+
+msgid "Login to your existing XMPP account. You can also use the %s to join a groupchat."
+msgstr "Entra a tu cuenta de XMPP existente. También se puede usar el %s para entrar a una sala de charla."
+
+msgid "Previous"
+msgstr "Atrás"
+
+msgid "General"
+msgstr "General"
+
+msgid "Advanced"
+msgstr "Avanzado"
+
+msgid "Resource"
+msgstr "Recurso"
+
+msgid "Priority"
+msgstr "Prioridad"
+
+msgid "Low"
+msgstr "Bajo"
+
+msgid "Medium"
+msgstr "Medio"
+
+msgid "High"
+msgstr "Alto"
+
+msgid "Enter the groupchat you want to join and the nick you want to have. You can also go back to the %s."
+msgstr "Introduce el grupo de chat al que deseas unirte y el nick que quieres tener. También puedes volver a la %s."
+
+msgid "login page"
+msgstr "Página de acceso"
+
+msgid "Share this link with your friends:"
+msgstr "Comparte este enlace con tus amigos"
+
+msgid "Register a new XMPP account to join your friends on your own social cloud. That's simple!"
+msgstr "Crea una nueva cuenta XMPP para unirte a tus amigos en vuestra propia nube social. ¡Es fácil!"
+
+msgid "Required"
+msgstr "Requerido"
+
+msgid "You have been registered, here is your XMPP address:"
+msgstr "Ya creaste tu cuenta, aquí viene tu dirección de XMPP:"
+
+msgid "Manager"
+msgstr "Gerente"
+
+msgid "Project"
+msgstr "Proyecto"
+
+msgid "Encrypted"
+msgstr "Encriptado"
+
+msgid "Unencrypted"
+msgstr "No cifrado."
+
+msgid "Where are you?"
+msgstr "¿Dónde estás?"
+
+msgid "What's up with you?"
+msgstr "¿Que pasa contigo?"
+
+msgid "Fetching the social channel..."
+msgstr "Consiguiendo el canal social..."
+
+msgid "You are synchronized with your network."
+msgstr "Estás sincronizadx con tu red."
+
+msgid "Cannot send anything: you can only receive notices!"
+msgstr "No puedes enviar nada: ¡solo puedes recibir avisos!"
+
+msgid "Media viewer"
+msgstr "Visor de medios"
+
+msgid "Browse"
+msgstr "Examinar"
+
+msgid "Command"
+msgstr "Comando"
+
+msgid "Subscribe"
+msgstr "Suscribirse"
+
+msgid "Join"
+msgstr "Unirse"
+
+msgid "Automatic"
+msgstr "Automático"
+
+msgid "Search"
+msgstr "Buscar"
+
+msgid "No result!"
+msgstr "¡Sin resultados!"
+
+msgid "No notifications."
+msgstr "Ninguna notificación."
+
+msgid "would like to add you as a friend."
+msgstr "le gustaría añadirte como amigo/a."
+
+msgid "would like you to join this chatroom:"
+msgstr "le gustaría que te unieras a esta sala:"
+
+msgid "Do you accept?"
+msgstr "¿Aceptas?"
+
+msgid "Yes"
+msgstr "Si"
+
+msgid "No"
+msgstr "No"
+
+msgid "would like to get authorization."
+msgstr "quisiera tener autorización de ver tu estado."
+
+msgid "Do you want to see the friends %s suggests you?"
+msgstr "¿Quiere ver las amistades que %s te sugiere?"
+
+msgid "Submit"
+msgstr "Enviar"
+
+msgid "Client"
+msgstr "Cliente"
+
+msgid "System"
+msgstr "Sistema"
+
+msgid "Local time"
+msgstr "Hora local"
+
+msgid "Comments"
+msgstr "Comentarios"
+
+msgid "User profile"
+msgstr "Perfil de usuaria/o"
+
+msgid "See his/her position on the globe"
+msgstr "Ver su ubicación el el mapa mundial"
+
+msgid "Confirm"
+msgstr "Confirmar"
+
+msgid "anonymous mode"
+msgstr "modo anónimo"
+
+msgid "Groups"
+msgstr "Grupos"
+
+msgid "Unclassified"
+msgstr "Sin clasificar"
+
+msgid "Authorize"
+msgstr "Autorizar"
+
+msgid "Ask for authorization"
+msgstr "Pedir autorización"
+
+msgid "Unblock"
+msgstr "Desbloquear"
+
+msgid "Prohibit"
+msgstr "Prohibir"
+
+msgid "Block"
+msgstr "Bloque"
+
+msgid "Chat"
+msgstr "Chat"
+
+msgid "Groupchat"
+msgstr "Chat en grupo"
+
+msgid "Jappix Mobile"
+msgstr "Jappix Móvil"
+
+msgid "Desktop"
+msgstr "Escritorio"
+
+msgid "Mobile"
+msgstr "Móvil"
+
+msgid "Please wait..."
+msgstr "Por favor, espera..."
+
+msgid "Please enable JavaScript"
+msgstr "Por favor, habilita JavaScript"
+
+msgid "Your channel"
+msgstr "Tu canal"
+
+msgid "Channel of"
+msgstr "Canal de"
+
+msgid "More notices..."
+msgstr "Más avisos..."
+
+msgid "Attach a file"
+msgstr "Adjuntar un archivo"
+
+msgid "Send"
+msgstr "Enviar"
+
+msgid "Unattach the file"
+msgstr "Ya no adjuntar el archivo"
+
+msgid "An error occured while uploading your file: maybe it is too big (%s maximum) or forbidden!"
+msgstr "Hubo un error al tratar de enviar tu archivo: a lo mejor pesa demasiado (el máximo es %s), o está prohibido!"
+
+msgid "Authorization failed"
+msgstr "Falló la autorización"
+
+msgid "Registration failed, please choose a different username"
+msgstr "Falló el registro, por favor, elije otro nombre de usuario"
+
+msgid "Service unavailable"
+msgstr "Servicio no disponible"
+
+msgid "Internal server error, try later"
+msgstr "Error interno del servidor, intentar más tarde"
+
+msgid "Your form has been sent."
+msgstr "Ya se envió tu formulario."
+
+msgid "Application"
+msgstr "Aplicación"
+
+msgid "XMPP links"
+msgstr "Enlaces XMPP"
+
+msgid "Open XMPP links with Jappix"
+msgstr "Abrir enlaces XMPP con Jappix"
+
+msgid "changed the subject to:"
+msgstr "asunto cambiado a:"
+
+msgid "Welcome!"
+msgstr "¡Bienvenido!"
+
+msgid "Friends"
+msgstr "Amigos"
+
+msgid "Welcome on Jappix, your own social cloud!"
+msgstr "¡Bienvenido a Jappix, tu propia nube social!"
+
+msgid "Before you start using it, you will have to change some settings, search for friends and complete your profile."
+msgstr "Antes de que lo empiezes a usar, tendrás que cambiar unos parametros, buscar a amigxs, y completar tu perfil."
+
+msgid "Enable notification sounds"
+msgstr "Habilitar notificación por sonidos"
+
+msgid "Share your position on the globe"
+msgstr "Comparte tu ubicación geográfica"
+
+msgid "Offline friends"
+msgstr "Amigos fuera de línea"
+
+msgid "Don't hide offline friends"
+msgstr "Que aparezcan mis amigos no conectados"
+
+msgid "Use this tool to find your friends on the server you are using right now, or add them later."
+msgstr "Usa esta herramienta para encontrar a tus amigos en el servidor que estás usando ahora mismo, o añádelos más tarde."
+
+msgid "Great work! Now, you can share Jappix with your friends!"
+msgstr "Muy bien! Ahora puedes compartir Jappix con tus amigxs!"
+
+msgid "When you will press the save button, the profile editor will be opened. Happy socializing!"
+msgstr "Cuando uses el botón “Guardar”, el editor de perfil se abrirá. ¡Te deseamos buena socialización!"
+
+msgid "Share Jappix on %s"
+msgstr "Comparte Jappix en %s"
+
+msgid "Using Jappix, an open social platform. I am %s!"
+msgstr "Soy %s, y estoy usando Jappix, una plataforma social abierta."
+
+msgid "Unknown name"
+msgstr "Nombre desconocido"
+
+msgid "Unknown country"
+msgstr "País desconocido"
+
+msgid "Click to enable"
+msgstr "Haz click para habilitar"
+
+msgid "Click to disable"
+msgstr "Haz click para deshabilitar"
+
+msgid "Installation"
+msgstr "Instalación"
+
+msgid "Jappix installation"
+msgstr "Instalación de Jappix"
+
+msgid "Welcome to the Jappix installation!"
+msgstr "¡Bienvenido a la instalación de Jappix!"
+
+msgid "This tool will help you fastly install Jappix, the first full-featured XMPP-based social platform, on your server. You don't even need any technical knowledge."
+msgstr "Esta herramienta te ayudará a instalar Jappix más rápidamente, la primera plataforma social con todas las funciones y basada en XMPP, en tu servidor. Ni siquiera necesitas conocimientos técnicos."
+
+msgid "Let's have a look at the installation steps:"
+msgstr "Vamos a ver los pasos de instalación:"
+
+msgid "Welcome"
+msgstr "Bienvenido"
+
+msgid "Storage configuration"
+msgstr "Configuración de almacenamiento"
+
+msgid "Administrator account"
+msgstr "Cuenta de administrador"
+
+msgid "Main configuration"
+msgstr "Configuración principal"
+
+msgid "Hosts configuration"
+msgstr "Configuración de los huéspedes"
+
+msgid "Services installation"
+msgstr "Instalación de servicios"
+
+msgid "If the current language does not match yours (%1s), you can make Jappix speak %2s it will be saved."
+msgstr "Si el idioma actual no coincide con el tuyo (%1s), puedes hacer que Jappix hable en %2s. Esta opción se guardará."
+
+msgid "If you want to get some help about the Jappix installation and configuration, you can use our whole documentation, available at:"
+msgstr "Si deseas obtener ayuda sobre la instalación y configuración de Jappix, puedes utilizar toda nuestra documentación, disponible en:"
+
+msgid "It's time to build your own social cloud: just go to the next step!"
+msgstr "Es hora de construir nuestra propia nube social: ¡solo tienes que ir al siguiente paso! "
+
+msgid "Jappix stores persistent data (such as shared files, chat logs, your own music and its configuration) into a single secured storage folder."
+msgstr "Jappix almacena información permanente (archivos compartidos, historial de conversaciones, su música, y la configuración) dentro de una carpeta segura."
+
+msgid "Jappix must be able to write in this folder to create its sub-directories. If not, you must set the rights to %1s or change the folder owner to %2s (depending of your configuration)."
+msgstr "Jappix debe ser capaz de escribir en esta carpeta para crear sus sub-directorios. Si no es así, debes establecer los derechos a 1s% o cambiar el propietario de la carpeta a 2s% (dependiendo de tu configuración)."
+
+msgid "The folder is writable, you can continue!"
+msgstr "La carpeta es escribible, ¡puedes continuar!"
+
+msgid "Jappix offers you the possibility to manage your configuration, install new addons or search for updates. That's why you must create an administrator account to access the manager."
+msgstr "Jappix te ofrece la posibilidad de gestionar tu configuración, instalar nuevos addons y buscar actualizaciones. Por eso tienes que crear una cuenta de administración para acceder al gerente."
+
+msgid "When Jappix will be installed, just click on the manager link on the home page to access it."
+msgstr "Cuando Jappix esté instalado, basta con hacer clic en el enlace de gerente en la página principal para acceder."
+
+msgid "Oops, you missed something or the two passwords do not match!"
+msgstr "Uy, ¡se olvidó algo o las dos contraseñas no coinciden!"
+
+msgid "Jappix needs that you specify some values to work. Please correct the following inputs (or keep the default values, which are sufficient for most people)."
+msgstr "Jappix necesita que especifiques algunos valores para trabajar. Por favor, corrije las siguientes entradas (o mantén los valores por defecto, que bastan para la mayoría de la gente)."
+
+msgid "Note that if you don't specify a value which is compulsory, it will be automatically completed with the default one."
+msgstr "Ten en cuenta que si no especificas un valor que es obligatorio, se completará automáticamente con la opción por defecto."
+
+msgid "User"
+msgstr "Usuario"
+
+msgid "Service"
+msgstr "Servicio"
+
+msgid "Service name"
+msgstr "Nombre del servicio"
+
+msgid "Service description"
+msgstr "Descripción del servicio"
+
+msgid "Connection"
+msgstr "Conexión"
+
+msgid "Lock the host"
+msgstr "Bloquear el anfitrión "
+
+msgid "Anonymous mode"
+msgstr "Modo anónimo"
+
+msgid "Registration allowed"
+msgstr "Permitir la creación de cuentas"
+
+msgid "Use a proxy"
+msgstr "Usar un proxy"
+
+msgid "Encryption"
+msgstr "Cifrado"
+
+msgid "HTTPS storage"
+msgstr "Almacenamiento con HTTPS"
+
+msgid "Force HTTPS"
+msgstr "Forzar el uso de HTTPS"
+
+msgid "Compression"
+msgstr "Compresión"
+
+msgid "This page helps you specify the default hosts Jappix will connect to. You can leave it as it is and continue if you want to use the official service hosts."
+msgstr "Esta página te ayuda a especificar los hosts por defecto a los que Jappix se conectará. Puedes dejarlo como está y continuar si quieres usar los hosts oficiales del servicio."
+
+msgid "Maybe you don't know what a BOSH server is? In fact, this is a relay between a Jappix client and a XMPP server, which is necessary because of technical limitations."
+msgstr "Quizá no sepas lo que es un servidor BOSH. De hecho, hay un enlace entre un cliente Jappix y un servidor XMPP, que es necesario debido a limitaciones técnicas."
+
+msgid "Main host"
+msgstr "Host principal"
+
+msgid "Groupchat host"
+msgstr "Host de chat en grupo"
+
+msgid "Anonymous host"
+msgstr "Host anónimo"
+
+msgid "Directory host"
+msgstr "Host directorio"
+
+msgid "BOSH host"
+msgstr "Host BOSH"
+
+msgid "You can install some extra softwares on your server, to extend your Jappix features. Some others might be modified, because of security restrictions which are set by default."
+msgstr "Puedes instalar algunos programas adicionales en tu servidor, para ampliar las funciones de Jappix. Otros podrían ser modificados, debido a las restricciones de seguridad que se establecen de forma predeterminada."
+
+msgid "To perform this, you must be able to access your server's shell and be logged in as root. Remember this is facultative, Jappix will work without these modules, but some of its features will be unavailable."
+msgstr "Para realizar esto, debes poder acceder al shell de tu servidor e iniciar una sesión como root. Recuerda que esto es facultativo, Jappix funcionará sin estos módulos, pero algunas de sus características no estarán disponibles."
+
+msgid "After you finished the setup, Jappix will generate the cache files. It might be slow, just wait until the application is displayed and do not press any button."
+msgstr "Después de terminar la instalación, Jappix generará los archivos de cache. Puede ser lento, sólo tienes que esperar hasta que se muestre la aplicación, sin presionar ningún botón."
+
+msgid "Thanks for using Jappix!"
+msgstr "¡Gracias por usar Jappix!"
+
+msgid "Next"
+msgstr "Siguiente"
+
+msgid "Finish"
+msgstr "Terminar"
+
+msgid "Check again"
+msgstr "Comprobar otra vez"
+
+msgid "The folder is not writable, set the right permissions to the %s directory."
+msgstr "La carpeta no tiene permisos de escritura, configura correctamente los permisos al directorio %s."
+
+msgid "%s is installed on your system."
+msgstr "%s está instalado en tu sistema."
+
+msgid "%1s is not installed on your system, you should install %2s."
+msgstr "%1s no está instalado en tu sistema, debes instalar %2s."
+
+msgid "PHP maximum upload size is sufficient (%s)."
+msgstr "El peso máximo de envío que acepta PHP es suficiente (%s)."
+
+msgid "PHP maximum upload size is not sufficient (%1s), you should define it to %2s in %3s."
+msgstr "El peso máximo de envío que acepta PHP no es suficiente (%1s). Le deberías indicar un valor de %2s en el archivo %3s."
+
+msgid "Jappix manager"
+msgstr "Gerente de Jappix"
+
+msgid "Manager access"
+msgstr "Administrador de acceso"
+
+msgid "Statistics"
+msgstr "Estadísticas"
+
+msgid "Hosts"
+msgstr "Anfitriones"
+
+msgid "Design"
+msgstr "Diseño"
+
+msgid "Repeat"
+msgstr "Repita"
+
+msgid "All"
+msgstr "Todo"
+
+msgid "Horizontal"
+msgstr "Horizontal"
+
+msgid "Vertical"
+msgstr "Vertical"
+
+msgid "Center"
+msgstr "Centro"
+
+msgid "Left"
+msgstr "Izquierda"
+
+msgid "Right"
+msgstr "Derecha"
+
+msgid "Top"
+msgstr "Arriba"
+
+msgid "Bottom"
+msgstr "Abajo"
+
+msgid "Adapt"
+msgstr "Adaptar"
+
+msgid "Color"
+msgstr "Color"
+
+msgid "Users"
+msgstr "Usuarios"
+
+msgid "Updates"
+msgstr "Actualizaciones"
+
+msgid "This is a restricted area: only the authorized users can manage this Jappix node."
+msgstr "Ésta es un área restringida: sólo los usuarios autorizados pueden gestionar este nodo Jappix."
+
+msgid "Please use the form below to login to the administration panel."
+msgstr "Por favor, utiliza el formulario de abajo para acceder al panel de administración."
+
+msgid "To improve security, sessions are limited in time and when your browser will be closed, you will be logged out."
+msgstr "Para mejorar la seguridad, las sesiones son limitadas en tiempo y cuando se cierre el navegador, la sesión se cerrará."
+
+msgid "Credentials"
+msgstr "Credenciales"
+
+msgid "You have been logged out. Goodbye!"
+msgstr "Se ha cerrado la sesión. ¡Adiós!"
+
+msgid "Oops, you could not be recognized as a valid administrator. Check your credentials!"
+msgstr "Uy, no ha sido posible reconocerte como administrador válido. Comprueba tus credenciales!"
+
+msgid "Basic statistics are processed by Jappix about some important things, you can find them below."
+msgstr "Las estadísticas básicas son procesadas por Jappix sobre algunas cosas importantes, Las puedes encontrar más abajo."
+
+msgid "Change your Jappix node configuration with this tool."
+msgstr "Modifica la configuración de tu nodo Jappix con esta herramienta"
+
+msgid "Change the XMPP hosts that this Jappix node serve with this tool."
+msgstr "Con esta herramienta, modifica los anfitriones manejados por Jappix"
+
+msgid "All this Jappix node stored files can be managed with this tool: please select a sub-folder and start editing its content!"
+msgstr "Todos los archivos de almacenamiento dentro de Jappix se pueden organizar con esta herramienta: selecciona una carpeta para ir editando su contenido!"
+
+msgid "Jappix is fully customisable: you can change its design right here."
+msgstr "Jappix es totalmente configurable: aquí se puede cambiar su diseño."
+
+msgid "This is not a valid image, please use PNG, GIF or JPG!"
+msgstr "Ésta no es una imagen válida, por favor usa PNG, GIF o JPG!"
+
+msgid "The image could not be received, would you mind retry?"
+msgstr "La imagen no se pudo recibir. ¿Sería posible intentarlo nuevamente?"
+
+msgid "Your image was added to the list!"
+msgstr "¡Tu imagen se agregó a la lista!"
+
+msgid "Changes saved!"
+msgstr "Los cambios han sido guardados!"
+
+msgid "You can define more than one administrator for this Jappix node. You can also change a password with this tool."
+msgstr "Se puede definir más de un administrador de Jappix. También se puede cambiar contraseñas."
+
+msgid "Update your Jappix node with this tool, or check if a new one is available. Informations about the latest version are also displayed (in english)."
+msgstr "Actualiza tu nodo de Jappix aquí, o revisa si existe alguna nueva versión. También aparece información sobre la versión más reciente (en inglés)."
+
+msgid "Access statistics"
+msgstr "Acceder a las estadísticas"
+
+msgid "Share statistics"
+msgstr "Compartir estadísticas"
+
+msgid "Other statistics"
+msgstr "Otras estadísticas"
+
+msgid "January"
+msgstr "Enero"
+
+msgid "February"
+msgstr "Febrero"
+
+msgid "March"
+msgstr "Marzo"
+
+msgid "April"
+msgstr "Abril"
+
+msgid "May"
+msgstr "Mayo"
+
+msgid "June"
+msgstr "Junio"
+
+msgid "July"
+msgstr "Julio"
+
+msgid "August"
+msgstr "Agosto"
+
+msgid "September"
+msgstr "Septiembre"
+
+msgid "October"
+msgstr "Octubre"
+
+msgid "November"
+msgstr "Noviembre"
+
+msgid "December"
+msgstr "Diciembre"
+
+msgid "Monday"
+msgstr "Lunes"
+
+msgid "Tuesday"
+msgstr "Martes"
+
+msgid "Wednesday"
+msgstr "Miércoles"
+
+msgid "Thursday"
+msgstr "Jueves"
+
+msgid "Friday"
+msgstr "Viernes"
+
+msgid "Saturday"
+msgstr "Sábado"
+
+msgid "Sunday"
+msgstr "Domingo"
+
+msgid "Total"
+msgstr "Total"
+
+msgid "Cache"
+msgstr "Cache"
+
+msgid "Logs"
+msgstr "Registros"
+
+msgid "Music"
+msgstr "Música"
+
+msgid "Backgrounds"
+msgstr "Fondos de pantalla"
+
+msgid "Share"
+msgstr "Compartir"
+
+msgid "Background"
+msgstr "Fondo de pantalla"
+
+msgid "Notice"
+msgstr "Aviso"
+
+msgid "Your design preferences have been saved!"
+msgstr "¡Ya se guardaron tus preferencias de diseño!"
+
+msgid "Please check your inputs: something is missing!"
+msgstr "Por favor comprueba los datos introducidos: ¡falta algo!"
+
+msgid "Change your Jappix node background with this tool. You can either set a custom color or an uploaded image. Let your creativity flow!"
+msgstr "Aquí puedes cambiar el fondo de pantalla de Jappix. Puede ser el color que quieras, o una imagen. ¡Deja que tu creatividad fluya!"
+
+msgid "Use default background"
+msgstr "Usar el fondo de pantalla por defecto"
+
+msgid "Use your own image"
+msgstr "Usa tu propia imagen"
+
+msgid "Select a background to use and change the display options."
+msgstr "Seleccione un fondo para usar y modificar las opciones de visualización."
+
+msgid "Use your own color"
+msgstr "Usa tu propio color"
+
+msgid "Type the hexadecimal color value you want to use as a background."
+msgstr "Escribe el valor en hexadecimal del color que deseas tener como fondo."
+
+msgid "Manage backgrounds"
+msgstr "Organizar los fondos de pantalla"
+
+msgid "You can add a new background to the list with this tool. Please send a valid image."
+msgstr "Aquí puedes agregarle imágenes de fondo a la lista. Gracias por enviar una imagen válida."
+
+msgid "If you want to remove some backgrounds, use the browser below."
+msgstr "Si deseas quitar algunos fondos, utiliza el navegador a continuación."
+
+msgid "Define a homepage notice for all your users, such as a warn, an important message or an advert with this tool."
+msgstr "Define un aviso de inicio que vean todxs lxs usuarixs. Puede ser una alerta, un mensaje importante, o una publicidad."
+
+msgid "Simple notice"
+msgstr "Aviso simple "
+
+msgid "This notice only needs simple text to be displayed, but no code is allowed!"
+msgstr "Este aviso sólo necesita un texto simple para ser visualizado, pero no se permite código!"
+
+msgid "Advanced notice"
+msgstr "Aviso avanzado"
+
+msgid "You can customize your notice with embedded HTML, CSS and JavaScript, but you need to code the style."
+msgstr "Puedes personalizar tu aviso con código HTML, CSS y Javascript, pero necesitarás programar el estilo."
+
+msgid "Available updates"
+msgstr "Actualizaciones disponibles"
+
+msgid "What's new?"
+msgstr "¿Qué hay de nuevo?"
+
+msgid "Your storage folders are not writable, please apply the good rights!"
+msgstr "No se puede escribir en tu carpeta de almacenamiento. Gracias por otorgarle al servidor los permisos adecuados."
+
+msgid "%1s may cause problems to the proxy, please increase %2s value up to %3s!"
+msgstr "%1s le puede causar problemas al proxy. Por favor, sube el valor de %2s a %3s."
+
+msgid "You are using a development version of Jappix. Update it through our repository by executing: %s."
+msgstr "Estas utilizando una versión de desarrollo de Jappix. Actualizala con nuestro repositorio ejecutando: %s"
+
+msgid "A new Jappix version is available! Check what is new and launch the update!"
+msgstr "Una nueva versión de Jappix está disponible! Comprueba las novedades y ejecuta la actualización!"
+
+msgid "Your version is out to date. Update it now to %s by clicking here!"
+msgstr "Esta versión ya no es la más reciente. Actualízala ahora a %s haciendo clic aquí!"
+
+msgid "Your version seems to be up to date, but you can check updates manually by clicking here."
+msgstr "Esta versión parece ser la más reciente, pero todavía puedes buscar actualizaciones manualmente con este enlace."
+
+msgid "Check for updates"
+msgstr "Buscar actualizaciones"
+
+msgid "Update in progress"
+msgstr "Actualización en curso"
+
+msgid "Jappix has been updated: you are now running the latest version. Have fun!"
+msgstr "Jappix ha sido actualizado: ahora estás ejecutando la última versión. Que te diviertas!"
+
+msgid "The update has failed! Please try again later."
+msgstr "La actualización ha fallado! Por favor, inténtalo nuevamente más tarde."
+
+msgid "Downloading package..."
+msgstr "Descargando el paquete..."
+
+msgid "Removing current Jappix system files..."
+msgstr "Eliminación de archivos del sistema actual de Jappix ..."
+
+msgid "Extracting package..."
+msgstr "Extrayendo el paquete..."
+
+msgid "Regenerating storage folder tree..."
+msgstr "Generando otra vez la jerarquía de almacenamiento..."
+
+msgid "Jappix is now up to date!"
+msgstr "Jappix está actualizado!"
+
+msgid "Aborted: socket error!"
+msgstr "Abortada: error de socket!"
+
+msgid "Aborted: buffer error!"
+msgstr "Abortada: Error de buffer!"
+
+msgid "Aborted: everything is not writable!"
+msgstr "Abortada: faltan algunos permisos de escritura!"
+
+msgid "Aborted: could not extract the package!"
+msgstr "Abortado: no se pudo extraer el paquete!"
+
+msgid "Visits"
+msgstr "Visitas"
+
+msgid "Daily"
+msgstr "Diario"
+
+msgid "Weekly"
+msgstr "Semanal"
+
+msgid "Monthly"
+msgstr "Mensual"
+
+msgid "Yearly"
+msgstr "Anual"
+
+msgid "Size"
+msgstr "Tamaño"
+
+msgid "Clean everything"
+msgstr "Limpiar todo"
+
+msgid "Purge cache"
+msgstr "Purgar caché"
+
+msgid "Purge logs"
+msgstr "Purgar registros"
+
+msgid "Purge updates"
+msgstr "Purgar actualizaciones"
+
+msgid "The storage folder you wanted to clean is now empty!"
+msgstr "La carpeta de almacenamiento que querías limpiar está vacía ahora!"
+
+msgid "Keep your Jappix node fresh and fast, clean the storage folders regularly!"
+msgstr "Mantén tu nodo de Jappix fresco y dinámico, limpiando las carpetas de almacenamiento regularmente!"
+
+msgid "Upload your music (Ogg Vorbis, MP3 or WAV) to be able to listen to it in Jappix!"
+msgstr "Carga tu música (Ogg Vorbis, MP3 o WAV) para poder escucharla en Jappix!"
+
+msgid "The file you want to upload must be smaller than %s."
+msgstr "El archivo que quieres subir tiene que pesar menos de %s."
+
+msgid "Stay tuned in what your users store on your server and remove undesired content with this tool."
+msgstr "Aquí puedes quedarte al tanto de lo que tus usuarios guarden en el servidor, y quitarle cualquier contenido no deseable."
+
+msgid "Title"
+msgstr "Título"
+
+msgid "Artist"
+msgstr "Artista"
+
+msgid "Album"
+msgstr "Album"
+
+msgid "File"
+msgstr "Archivo"
+
+msgid "Upload"
+msgstr "Cargar"
+
+msgid "The folder is empty."
+msgstr "La carpeta está vacía."
+
+msgid "The music could not be received, please retry!"
+msgstr "La música no se pudo recibir, por favor intenta otra vez!"
+
+msgid "This is not a valid music file, please encode in Ogg Vorbis, MP3 or WAV!"
+msgstr "Éste no es un archivo de música válida. Por favor, ¡codifícalo en formato Ogg Vorbis, MP3 o WAV!"
+
+msgid "Your music has been added!"
+msgstr "¡Ya se agregó tu música!"
+
+msgid "The selected elements have been removed."
+msgstr "Los elementos seleccionados han sido suprimidos."
+
+msgid "You must select elements to remove!"
+msgstr "Debes seleccionar elementos que quitar!"
+
+msgid "Add a new user with this tool, or change a password (type an existing username). Please submit a strong password!"
+msgstr "Aquí puedes agregar un nuevo usuario, o cambiar contraseñas (introduce un nombre de usuario existente). Por favor, ¡usa una contraseña fuerte!"
+
+msgid "Manage"
+msgstr "Administrar"
+
+msgid "List"
+msgstr "Lista"
+
+msgid "Remove users with this tool. Note that you cannot remove an user if he is the only one remaining."
+msgstr "Aquí se pueden quitar usuarios. El último que quede no se puede quitar."
+
+msgid "The user has been added!"
+msgstr "El usuario ha sido agregado!"
+
+msgid "The chosen users have been removed."
+msgstr "Los usuarios seleccionados han sido suprimidos"
+
+msgid "You must select one or more users to be removed!"
+msgstr "Debes seleccionar por lo menos un usuario que quitar!"
+
+msgid "Yesterday"
+msgstr "Ayer"
+
+msgid "%s days ago"
+msgstr "hace %s días"
+
+msgid "User currently active"
+msgstr "Usuario activo actualmente"
+
+msgid "Last seen: %s"
+msgstr "Se vió por última vez: %s"
+
+msgid "Inactive since: %s"
+msgstr "Inactivo desde: %s"
+
+msgid "Your friend seems not to have received your message(s)!"
+msgstr "Parece que tu amigo no recibió el mensaje!"
+
+msgid "Static content server"
+msgstr "Servidor de contenido estático"
+
+msgid "This is the static content server for %1s, “%2s”."
+msgstr "Éste es el servidor de contenido estático para %1s: “%2s”."
+
+msgid "Suggested friends"
+msgstr "Amistades recomendadas"
+
+msgid "Check all"
+msgstr "Activar todo"
+
+msgid "Uncheck all"
+msgstr "Deactivar todo"
+
+msgid "Choose"
+msgstr "Escoga"
+
+msgid "List name"
+msgstr ""
+
+msgid "Allow"
+msgstr "Permitir"
+
+msgid "Deny"
+msgstr "prohibir"
+
+msgid "Group"
+msgstr "Grupo"
+
+msgid "Subscription"
+msgstr "suscripción"
+
+msgid "Both"
+msgstr "Ambos"
+
+msgid "From"
+msgstr "De"
+
+msgid "Everybody"
+msgstr "Todo el mundo"
+
+msgid "Send messages"
+msgstr "Enviar mensajes"
+
+msgid "Send queries"
+msgstr "Enviar peticiones"
+
+msgid "See my status"
+msgstr "Ver mi estado"
+
+msgid "Send his/her status"
+msgstr "Enviar su estado"
+
+msgid "Everything"
+msgstr "Todo"
+
+msgid "Item"
+msgstr "Artículo"
+
+msgid "Order"
+msgstr "Orden"
+
+msgid "Active for this session"
+msgstr "Activo en esta sesión"
+
+msgid "Always active"
+msgstr "Siempre activo"
+
+msgid "User directory"
+msgstr "Directorio del usuario"
+
+msgid "Search a friend"
+msgstr "Buscar a un amigo"
+
+msgid "The feature requested is not implemented by the recipient or server and therefore cannot be processed."
+msgstr ""
+
+msgid "This is a repeat from %s"
+msgstr ""
+
+msgid "Loading comments..."
+msgstr ""
+
+msgid "Type your comment here..."
+msgstr ""
+
+msgid "Could not get the comments!"
+msgstr ""
+
+msgid "Show comments"
+msgstr ""
+
+msgid "Send him/her a message"
+msgstr ""
+
+msgid "Start a chat with him/her"
+msgstr ""
+
+msgid "Media integration"
+msgstr ""
+
+msgid "Comments locked!"
+msgstr ""
+
+msgid "Type something you want to share with your friends..."
+msgstr ""
+
+msgid "changed his/her nickname to %s"
+msgstr ""
+
+msgid "commented an item you follow: “%s”."
+msgstr ""
+
+msgid "Hide"
+msgstr ""
+
+msgid "liked your post: “%s”."
+msgstr ""
+
+msgid "quoted you somewhere: “%s”."
+msgstr ""
+
+msgid "published on your wall: “%s”."
+msgstr ""
+
+msgid "tagged you in a photo (%s)."
+msgstr ""
+
+msgid "tagged you in a video (%s)."
+msgstr ""
+
+msgid "Show"
+msgstr ""
+
+msgid "Need help? You'd better read our documentation page about how to fill this form!"
+msgstr ""
+
+msgid "Pubsub host"
+msgstr ""
+
+msgid "Jappix is a great social platform, that you can access wherever you are, whenever you want and communicate with whovever you want."
+msgstr ""
+
+msgid "Manager link"
+msgstr ""
+
+msgid "User uploads server"
+msgstr ""
+
+msgid "This is the user uploads server for %1s, “%2s”."
+msgstr ""
+
+msgid "Logo"
+msgstr ""
+
+msgid "You can set your own service logo to replace the default one. Take care of the size and the main color of each logo!"
+msgstr ""
+
+msgid "Upload each logo with the recommended maximum pixel size."
+msgstr ""
+
+msgid "This is not a valid image, please use the PNG format!"
+msgstr ""
+
+msgid "Your service logo has been successfully changed!"
+msgstr ""
+
+msgid "Your logo format must be PNG. Leave a field empty and the logo will not be changed."
+msgstr ""
+
+msgid "Remove this logo"
+msgstr ""
+
+msgid "View this logo"
+msgstr ""
+
+msgid "Send a file"
+msgstr ""
+
+msgid "Once uploaded, your friend will be prompted to download the file you sent."
+msgstr ""
+
+msgid "Groupchats to join"
+msgstr ""
+
+msgid "Purge sent files"
+msgstr ""
+
+msgid "would like to send you a file: “%s”."
+msgstr ""
+
+msgid "has accepted to received your file: “%s”."
+msgstr ""
+
+msgid "has rejected to receive your file: “%s”."
+msgstr ""
+
+msgid "could not receive your file: “%s”."
+msgstr ""
+
+msgid "has received a file exchange request: “%s”."
+msgstr ""
+
+msgid "Available shortcuts:"
+msgstr ""
+
+msgid "%s removes the chat logs"
+msgstr ""
+
+msgid "%s joins a groupchat"
+msgstr ""
+
+msgid "%s closes the chat"
+msgstr ""
+
+msgid "%s shows the user profile"
+msgstr ""
+
+msgid "%s sends a message to the room"
+msgstr ""
+
+msgid "%s changes your nickname"
+msgstr ""
+
+msgid "%s sends a message to someone in the room"
+msgstr ""
+
+msgid "%s changes the room topic"
+msgstr ""
+
+msgid "%s kicks an user of the room"
+msgstr ""
+
+msgid "%s bans an user of the room"
+msgstr ""
+
+msgid "%s invites someone to join the room"
+msgstr ""
+
+msgid "Social channel, chat and more."
+msgstr ""
+
+msgid "Create your public profile."
+msgstr ""
+
+msgid "A mini-chat for your website."
+msgstr ""
+
+msgid "Get Jappix, get support."
+msgstr ""
+
+msgid "Statistics around Jappix."
+msgstr ""
+
+msgid "Download Jappix for free."
+msgstr ""
+
+msgid "Find a public Jappix node."
+msgstr ""
+
+msgid "Public profile"
+msgstr ""
+
+msgid "Your profile anywhere on the Web."
+msgstr ""
+
+msgid "%s is a Jappix.com service which makes your XMPP profile public. It is easier to share it. No XMPP account is required to view your social channel, your current position and your contact details."
+msgstr ""
+
+msgid "Furthermore, every picture you post in your social channel is added to a beautiful picture timeline. You can now view the pictures you shared year by year."
+msgstr ""
+
+msgid "You can also use your XMPP avatar as a single avatar for every website, blog and forum you use. When you change it on XMPP, the new avatar appears everywhere. What a genious improvement!"
+msgstr ""
+
+msgid "Yay, let's create my public profile!"
+msgstr ""
+
+msgid "Enable my public profile"
+msgstr ""
+
+#~ msgid "Jappix is a non-profit social platform, that you can access wherever you are, whenever you want and communicate with whovever you want."
+#~ msgstr "Jappix es una plataforma social sin ánimo de lucro que se puede acceder en cualquier lugar, cualquier momento y comunicarse con quien desees."
+
+#~ msgid "See"
+#~ msgstr ""
+
+#~ msgid "Use default logo"
+#~ msgstr ""
+
+#~ msgid "Use your own logo"
+#~ msgstr ""
+
+#~ msgid "The recommended image format is PNG. Leave a field empty and the logo will not be changed."
+#~ msgstr ""
diff --git a/jappixmini/jappix/lang/et/LC_MESSAGES/main.mo b/jappixmini/jappix/lang/et/LC_MESSAGES/main.mo
new file mode 100644
index 00000000..33445882
Binary files /dev/null and b/jappixmini/jappix/lang/et/LC_MESSAGES/main.mo differ
diff --git a/jappixmini/jappix/lang/et/LC_MESSAGES/main.po b/jappixmini/jappix/lang/et/LC_MESSAGES/main.po
new file mode 100644
index 00000000..b48715a9
--- /dev/null
+++ b/jappixmini/jappix/lang/et/LC_MESSAGES/main.po
@@ -0,0 +1,1870 @@
+# Estonian translations for Jappix package.
+# This file is distributed under the same license as the Jappix package.
+# This file was translated from CodingTeam at <http://codingteam.net/>.
+msgid ""
+msgstr ""
+"Project-Id-Version: Jappix\n"
+"PO-Revision-Date: 2012-01-16 21:25+0100\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"POT-Creation-Date: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+
+msgid "JavaScript is missing in your web browser, so that you will not be able to launch Jappix! Please fix this."
+msgstr "Teie brauseris puudub JavaScript, mis tähendab seda et teil ei ole võimalik Jappixit käivitada! Palun parandage see."
+
+msgid "An open social network"
+msgstr "Avatud sotsiaalvõrgustik"
+
+msgid "Jappix has been interrupted by a network issue, a bug or bad login (check that you entered the right credentials), sorry for the inconvenience."
+msgstr "Jappixi töö on katkestatud võrgu tõrke, halva sisselogimise või mõne muu vea tõttu (kontrollige, et sisestasite õiged andmed), vabandame ebameeldivuste pärast."
+
+msgid "The element list on this server could not be obtained!"
+msgstr "Selle serveri elemendi nimekirja polnud võimalik omandada."
+
+msgid "Your password has been changed, now you can connect to your account with your new login data."
+msgstr "Teie parool on muudetud, Te saate taas sisse logida kasutades uusi andmeid."
+
+msgid "Your XMPP account has been removed, bye!"
+msgstr "Teie XMPP konto on eemaldatud, hüvasti!"
+
+msgid "You have been logged out of your XMPP account, have a nice day!"
+msgstr "Te olete oma XMPP kontost välja logitud, head päeva!"
+
+msgid "The room you joined seems not to exist. You should create it!"
+msgstr "Ruum millega Te liituda proovisite ei eksisteeri. Proovige see ise teha!"
+
+msgid "The groupchat has been removed, now someone else will be able to recreate it."
+msgstr "Grupivestlus on eemaldatud, nüüd saab keegi teine selle uuesti luua."
+
+msgid "The user that you want to reach is not present in the room."
+msgstr "Kasutaja, kellega te püüate ühendust saada, ei eksisteeri enam selles ruumis."
+
+msgid "Please enter the group chat address to join."
+msgstr "Palun sisestage grupivestluse aadress millega liituda."
+
+msgid "Please enter your nickname to join %s."
+msgstr "Palun sisestage oma hüüdnimi, et liituda %s."
+
+msgid "This room (%s) is protected with a password."
+msgstr "Ruum (%s) on parooliga kaitstud."
+
+msgid "Your browser is out of date!"
+msgstr "Teil on liiga vana brauser!"
+
+msgid "Last %s version is better!"
+msgstr "Viimane versioon %s on parem!"
+
+msgid "Login"
+msgstr "Sisse logimine"
+
+msgid "Register"
+msgstr "Registreerimine"
+
+msgid "Here we go!"
+msgstr "Läks!"
+
+msgid "Server"
+msgstr "Server"
+
+msgid "Password"
+msgstr "Parool"
+
+msgid "Remember me"
+msgstr "Jäta mind meelde"
+
+msgid "This tool has been disabled, you cannot use it!"
+msgstr "See tööriist on keelatud, Te ei saa seda kasutada!"
+
+msgid "Due to a network issue, you were disconnected. What do you want to do now?"
+msgstr "Võrgu tõrke tõttu katkes ühendus serveriga. Mida te järgmiseks teha soovite?"
+
+msgid "Reconnect"
+msgstr "Taasühendus"
+
+msgid "Messages"
+msgstr "Sõnumid"
+
+msgid "Profile"
+msgstr "Profiil"
+
+msgid "Options"
+msgstr "Valikud"
+
+msgid "Disconnect"
+msgstr "Katkesta ühendus"
+
+msgid "Filter"
+msgstr "Filter"
+
+msgid "Add a friend"
+msgstr "Lisa kontakt"
+
+msgid "Your groupchats"
+msgstr "Minu grupivestlused"
+
+msgid "Manage your favorite groupchats"
+msgstr "Halda oma lemmikuid grupivestluseid"
+
+msgid "More stuff"
+msgstr "Rohkem asju"
+
+msgid "Show all friends"
+msgstr "Näita kõiki sõpru"
+
+msgid "Only show connected friends"
+msgstr "Näita ainult sisselogitud sõpru"
+
+msgid "Message archives"
+msgstr "Sõnumite arhiiv"
+
+msgid "Date"
+msgstr "Kuupäev"
+
+msgid "Please select a friend to view the chat history."
+msgstr "Palun valige kontakt, et näha vestluse ajalugu."
+
+msgid "Nothing found for: %s"
+msgstr "Midagi ei leitud: %s"
+
+msgid "A short message?"
+msgstr "Lühisõnum?"
+
+msgid "How are you?"
+msgstr "Kuidas läheb?"
+
+msgid "What are you doing?"
+msgstr "Mida sa teed?"
+
+msgid "Join a chat"
+msgstr "Liitu vestlusega"
+
+msgid "Status"
+msgstr "Staatus"
+
+msgid "Available"
+msgstr "Saadaval"
+
+msgid "Talkative"
+msgstr "Jutukas"
+
+msgid "Away"
+msgstr "Eemal"
+
+msgid "Not available"
+msgstr "Mitte saadaval"
+
+msgid "Busy"
+msgstr "Hõivatud"
+
+msgid "Mood"
+msgstr "Meeleolu"
+
+msgid "None"
+msgstr "Midagi"
+
+msgid "Crazy"
+msgstr "Pöörane"
+
+msgid "Excited"
+msgstr "Elevil"
+
+msgid "Playful"
+msgstr "Vallatu"
+
+msgid "Happy"
+msgstr "Õnnelik"
+
+msgid "Shocked"
+msgstr "Šokeeritud"
+
+msgid "Hot"
+msgstr "Kuum"
+
+msgid "Sad"
+msgstr "Kurb"
+
+msgid "Amorous"
+msgstr "Armunud"
+
+msgid "Confident"
+msgstr "Enesekindel"
+
+msgid "Activity"
+msgstr "Tegevus"
+
+msgid "Chores"
+msgstr "Tööd"
+
+msgid "Drinking"
+msgstr "Joomine"
+
+msgid "Eating"
+msgstr "Söömine"
+
+msgid "Exercising"
+msgstr "Sportimine"
+
+msgid "Grooming"
+msgstr "Hooldamine"
+
+msgid "Appointment"
+msgstr "Kohtumine"
+
+msgid "Inactive"
+msgstr "Tegevusetu"
+
+msgid "Relaxing"
+msgstr "Lõõgastumine"
+
+msgid "Talking"
+msgstr "Rääkimine"
+
+msgid "Traveling"
+msgstr "Reisimine"
+
+msgid "Working"
+msgstr "Töötamine"
+
+msgid "View profile"
+msgstr "Vaata profiili"
+
+msgid "Repeat this notice"
+msgstr "Korda seda teadet"
+
+msgid "Remove this notice"
+msgstr "Eemalda see teade"
+
+msgid "Your profile"
+msgstr "Sinu profiil"
+
+msgid "Identity"
+msgstr "Identiteet"
+
+msgid "Profile image"
+msgstr "Profiili pilt"
+
+msgid "Others"
+msgstr "Muu"
+
+msgid "Personal"
+msgstr "Personaalne"
+
+msgid "Complete name"
+msgstr "Täisnimi"
+
+msgid "Nickname"
+msgstr "Hüüdnimi"
+
+msgid "First name"
+msgstr "Eesnimi"
+
+msgid "Last name"
+msgstr "Perekonnanimi"
+
+msgid "Date of birth"
+msgstr "Sünniaeg"
+
+msgid "Contact"
+msgstr "Kontakt"
+
+msgid "E-mail"
+msgstr "E-mail"
+
+msgid "Phone"
+msgstr "Telefon"
+
+msgid "Website"
+msgstr "Koduleht"
+
+msgid "Current"
+msgstr "Praegune"
+
+msgid "Delete"
+msgstr "Kustuta"
+
+msgid "What a pity! You have no profile image defined in your identity card!"
+msgstr "Kui kahju! Teil ei ole oma identiteedi kaardil profiili pilti!"
+
+msgid "Address"
+msgstr "Aadress"
+
+msgid "Street"
+msgstr "Tänav"
+
+msgid "City"
+msgstr "Linn"
+
+msgid "Postal code"
+msgstr "Postiindeks"
+
+msgid "Country"
+msgstr "Riik"
+
+msgid "Biography"
+msgstr "Elulugu"
+
+msgid "Important notice"
+msgstr "Oluline teave"
+
+msgid "Be careful of the information you write into your profile, because it could be accessed by everyone (even someone you don't want to)."
+msgstr "Olge ettevaatlik millist infot Te oma profiili alla lisate, sest seda võidakse kergesti näha teiste kasutajate poolt (isegi nende poolt keda Te ei soovi)."
+
+msgid "Not everything is private on XMPP; this is one of those things, your public profile (vCard)."
+msgstr "Mitte kõik pole XMPP's privaatne, see siin on üks nendest asjadest, teie avalik profiil (vCard)."
+
+msgid "It is strongly recommended to upload a profile image (%s maximum), like a picture of yourself, because that makes you easily recognizable by your friends."
+msgstr "On soovitatav üles laadida enda profiili pilt (%s maximum), sest see muudab Teid paremini äratuntavaks."
+
+msgid "Save"
+msgstr "Salvesta"
+
+msgid "Cancel"
+msgstr "Tühista"
+
+msgid "Edit options"
+msgstr "Muuda valikuid"
+
+msgid "Channel"
+msgstr "Kanal"
+
+msgid "Commands"
+msgstr "Käsud"
+
+msgid "Sounds"
+msgstr "Helid"
+
+msgid "Privacy"
+msgstr "Privaatsus"
+
+msgid "Message archiving"
+msgstr "Sõnumite arhiveerimine"
+
+msgid "Store a history of your chats"
+msgstr "Salvesta oma vestlused"
+
+msgid "Geolocation"
+msgstr "Geolokatsioon"
+
+msgid "Empty"
+msgstr "Tühi"
+
+msgid "Empty channel"
+msgstr "Tühi kanal"
+
+msgid "Persistent"
+msgstr "Püsiv"
+
+msgid "Maximum notices"
+msgstr "Maksimaalsed teavitused"
+
+msgid "Account"
+msgstr "Konto"
+
+msgid "Change password"
+msgstr "Muuda parool"
+
+msgid "Delete account"
+msgstr "Kustuta konto"
+
+msgid "Old"
+msgstr "Vana"
+
+msgid "New (2 times)"
+msgstr "Uus"
+
+msgid "Continue"
+msgstr "Jätka"
+
+msgid "To"
+msgstr "Kellele"
+
+msgid "Close"
+msgstr "Sulge"
+
+msgid "unknown"
+msgstr "tundmatu"
+
+msgid "Unavailable"
+msgstr "Mitte saadaval"
+
+msgid "is now"
+msgstr "on nüüd"
+
+msgid "Please wait while your avatar is uploaded..."
+msgstr "Palun oodake kuni Teie pilt on üles laetud..."
+
+msgid "Here it is! A new beautiful profile image!"
+msgstr "Siin see on! Uus ilus profiili pilt"
+
+msgid "The image file is not supported or has a bad size."
+msgstr "Pildi formaat ei ole toetatud või on suurus mitte sobiv."
+
+msgid "Reply"
+msgstr "Vasta"
+
+msgid "Error"
+msgstr "Viga"
+
+msgid "Click here to solve the error"
+msgstr "Kliki siia, et viga lahendada"
+
+msgid "You"
+msgstr "Teie"
+
+msgid "Remove"
+msgstr "Eemalda"
+
+msgid "Rename"
+msgstr "Nimeta ümber"
+
+msgid "Hi, I am %s, I would like to add you as my friend."
+msgstr "Tere, ma olen %s, Ma sooviksin Teid endale sõbraks lisada."
+
+msgid "Smiley insertion"
+msgstr "Smaili sisestamine"
+
+msgid "Change style"
+msgstr "Muuda stiili"
+
+msgid "Text in bold"
+msgstr "Tekst paksult"
+
+msgid "Text in italic"
+msgstr "Tekst kaldkirjas"
+
+msgid "Underlined text"
+msgstr "Tekst allajoonitult"
+
+msgid "Save chat"
+msgstr "Salvesta vestlus"
+
+msgid "Click on the following link to get the chat log, and wait. Then click again to get the file."
+msgstr "Vajutage järgnevale lingile ja oodake, et saada vestluslogi. Seejärel klikkige uuesti, et saada fail."
+
+msgid "This chat is empty!"
+msgstr "See vestlus on tühi!"
+
+msgid "Generate file!"
+msgstr "Genereeri fail!"
+
+msgid "Download file!"
+msgstr "Lae fail alla!"
+
+msgid "Clean current chat"
+msgstr "Puhasta hetkeline vestlus"
+
+msgid "View chat history"
+msgstr "Vaata vestluse ajalugu"
+
+msgid "Show user profile"
+msgstr "Näita kasutaja profiili"
+
+msgid "Add this contact to your friends"
+msgstr "Lisa see kontakt oma kontakti nimekirja"
+
+msgid "Add this groupchat to your favorites"
+msgstr "Lisa see grupivestlus oma lemmikutesse"
+
+msgid "All tabs"
+msgstr "Kõik kaardid"
+
+msgid "Close this tab"
+msgstr "Sulge see kaart"
+
+msgid "no subject defined for this room."
+msgstr "sellele ruumile ei ole teemat pandud"
+
+msgid "Administration panel for this room"
+msgstr "Selle ruumi administratsiooni paneel"
+
+msgid "Moderators"
+msgstr "Moderaatorid"
+
+msgid "Participants"
+msgstr "Osalejad"
+
+msgid "Visitors"
+msgstr "Külastajad"
+
+msgid "Manage favorite rooms"
+msgstr "Halda lemmik ruume"
+
+msgid "Change favorites"
+msgstr "Muuda lemmikuid"
+
+msgid "Search a room"
+msgstr "Otsi ruumi"
+
+msgid "Select a favorite"
+msgstr "Vali lemmik"
+
+msgid "Getting the name..."
+msgstr "Hangin nime..."
+
+msgid "Gateway"
+msgstr "Värav"
+
+msgid "Name"
+msgstr "Nimi"
+
+msgid "Room"
+msgstr "Ruum"
+
+msgid "Add"
+msgstr "Lisa"
+
+msgid "Edit"
+msgstr "Muuda"
+
+msgid "Search a room on"
+msgstr "Otsi ruumi"
+
+msgid "No room found on this server."
+msgstr "Ruumi ei leitud sellest serverist."
+
+msgid "Service discovery"
+msgstr "Teenuse avastamine"
+
+msgid "Server to query"
+msgstr "Serveri päring"
+
+msgid "Sorry, but the entity didn't return any result!"
+msgstr "Vabandame, aga tulemusi ei leitud!"
+
+msgid "Accounts"
+msgstr "Kontod"
+
+msgid "Authentications"
+msgstr "Autentimised"
+
+msgid "Automation"
+msgstr "Automaatika"
+
+msgid "Clients"
+msgstr "Kliendid"
+
+msgid "Collaboration"
+msgstr "Koostöö"
+
+msgid "Components"
+msgstr "Komponendid"
+
+msgid "Rooms"
+msgstr "Ruumid"
+
+msgid "Directories"
+msgstr "Kataloogid"
+
+msgid "Gateways"
+msgstr "Väravad"
+
+msgid "News"
+msgstr "Uudised"
+
+msgid "Hierarchy"
+msgstr "Hierarhia"
+
+msgid "Proxies"
+msgstr "Proksid"
+
+msgid "Publication/Subscription"
+msgstr "Avalikustamine/Tellimus"
+
+msgid "Storage"
+msgstr "Hoiuruum"
+
+msgid "Service offline or broken"
+msgstr "Teenus lahti ühendatud või katki"
+
+msgid "Your inbox"
+msgstr "Teie postkast"
+
+msgid "Available actions"
+msgstr "Saadaval valikud"
+
+msgid "Clean"
+msgstr "Puhasta"
+
+msgid "New"
+msgstr "Uus"
+
+msgid "Received"
+msgstr "Vastu võetud"
+
+msgid "Subject"
+msgstr "Teema"
+
+msgid "Content"
+msgstr "Sisu"
+
+msgid "Send message"
+msgstr "Saada sõnum"
+
+msgid "Your inbox is empty."
+msgstr "Teie postkast on tühi."
+
+msgid "MUC administration"
+msgstr "MUC administratsioon"
+
+msgid "You administrate this room"
+msgstr "Teie olete ruumi administraator"
+
+msgid "Enter new subject"
+msgstr "Sisestage uus teema"
+
+msgid "Configuration"
+msgstr "Seadistus"
+
+msgid "Authorizations"
+msgstr "Load"
+
+msgid "Member list"
+msgstr "Liikmete nimekiri"
+
+msgid "Owner list"
+msgstr "Omanike nimekiri"
+
+msgid "Administrator list"
+msgstr "Administraatorite nimekiri"
+
+msgid "Outcast list"
+msgstr "Hüljatute nimekiri"
+
+msgid "Add an input"
+msgstr "Lisa sisend"
+
+msgid "Destroy this MUC"
+msgstr "Hävita see MUC"
+
+msgid "Yes, let's do it!"
+msgstr "Jah, teeme seda!"
+
+msgid "Your friend is paying attention to the conversation."
+msgstr "Teie sõber jälgib vestlust."
+
+msgid "Your friend is writing a message..."
+msgstr "Teie sõber kirjutab..."
+
+msgid "Your friend stopped writing a message."
+msgstr "Teie sõber lõpetas kirjutamise."
+
+msgid "Your friend is doing something else."
+msgstr "Teie sõber teeb midagi muud."
+
+msgid "Your friend closed the chat."
+msgstr "Teie sõber sulges vestluse."
+
+msgid "Requesting this service..."
+msgstr "Pärin seda teenust..."
+
+msgid "Loading"
+msgstr "Laen"
+
+msgid "joined the chat room"
+msgstr "liitus jututoaga"
+
+msgid "left the chat room"
+msgstr "lahkus jututoast"
+
+msgid "no status"
+msgstr "staatus puudub"
+
+msgid "has been kicked"
+msgstr "on välja visatud"
+
+msgid "has been banned"
+msgstr "on keelu alla pandud"
+
+msgid "no reason"
+msgstr "põhjust pole"
+
+msgid "Communicate with the entire world!"
+msgstr "Suhtle terve maailmaga!"
+
+msgid "It allows you to get in touch with the millions of users who currently use the XMPP network like you do with Jappix. Join the community and stay free!"
+msgstr "See lubab Teil miljonite inimestega kontakteeruda kes kasutavad XMPP võrgustikku nagu Teie kasutate Jappix'it. Liitu sõpruskonnaga ja ole vaba!"
+
+msgid "Hi there!"
+msgstr "Tere!"
+
+msgid "Welcome on %1s, “%2s”."
+msgstr "Tere tulemast %1s, “%2s”."
+
+msgid "Login to your existing XMPP account or create a new one for free!"
+msgstr "Logi sisse enda XMPP kontole või tee tasuta uus!"
+
+msgid "Jappix is an open-source project from PostPro, a non-profit organization which provides us a great help."
+msgstr "Jappix on avatud lähtekoodiga projekt PostPro'lt, mittetulundusühingult kes pakub meile suurt abi."
+
+msgid "Login to your existing XMPP account. You can also use the %s to join a groupchat."
+msgstr "Logige sisse oma XMPP kontole. Te saate kasutada ka %s et liituda grupivestlusega."
+
+msgid "Previous"
+msgstr "Eelmine"
+
+msgid "General"
+msgstr "Üldine"
+
+msgid "Advanced"
+msgstr "Muud"
+
+msgid "Resource"
+msgstr "Vahend"
+
+msgid "Priority"
+msgstr "Eelis"
+
+msgid "Low"
+msgstr "Madal"
+
+msgid "Medium"
+msgstr "Keskmine"
+
+msgid "High"
+msgstr "Kõrge"
+
+msgid "Enter the groupchat you want to join and the nick you want to have. You can also go back to the %s."
+msgstr "Sisestage grupivestlus millega soovite liituda ja oma hüüdnimi. Te saate ka alati minna tagasi %s."
+
+msgid "login page"
+msgstr "sisselogimise leht"
+
+msgid "Share this link with your friends:"
+msgstr "Jaga seda linki oma sõpradega:"
+
+msgid "Register a new XMPP account to join your friends on your own social cloud. That's simple!"
+msgstr "Registreeri uus XMPP konto ja liitu oma sõpradega. See on lihtne!"
+
+msgid "Required"
+msgstr "Kohustuslik"
+
+msgid "You have been registered, here is your XMPP address:"
+msgstr "Te olete registreeritud, siin on Teie XMPP aadress:"
+
+msgid "Manager"
+msgstr "Haldur"
+
+msgid "Project"
+msgstr "Projekt"
+
+msgid "Encrypted"
+msgstr "Krüpteeritud"
+
+msgid "Unencrypted"
+msgstr "Krüpteerimata"
+
+msgid "Where are you?"
+msgstr "Kus Te olete?"
+
+msgid "What's up with you?"
+msgstr "Mis toimub?"
+
+msgid "Fetching the social channel..."
+msgstr "Püüan kanalit..."
+
+msgid "You are synchronized with your network."
+msgstr "Te olete oma võrguga sünkroniseeritud."
+
+msgid "Cannot send anything: you can only receive notices!"
+msgstr "Ei saa midagi saata: te saate ainult teateid vastu võtta!"
+
+msgid "Media viewer"
+msgstr "Meedia vaatur"
+
+msgid "Browse"
+msgstr "Brausi"
+
+msgid "Command"
+msgstr "Käsk"
+
+msgid "Subscribe"
+msgstr "Telli"
+
+msgid "Join"
+msgstr "Liitu"
+
+msgid "Automatic"
+msgstr "Automaatne"
+
+msgid "Search"
+msgstr "Otsi"
+
+msgid "No result!"
+msgstr "Ühtegi tulemust!"
+
+msgid "No notifications."
+msgstr "Pole teateid."
+
+msgid "would like to add you as a friend."
+msgstr "soovib lisada Teid sõbraks."
+
+msgid "would like you to join this chatroom:"
+msgstr "soovib kutsuda Teid sellesse jututuppa:"
+
+msgid "Do you accept?"
+msgstr "Kas Te olete nõus?"
+
+msgid "Yes"
+msgstr "Jah"
+
+msgid "No"
+msgstr "Ei"
+
+msgid "would like to get authorization."
+msgstr "soovib saada luba."
+
+msgid "Do you want to see the friends %s suggests you?"
+msgstr "Kas Te soovite näha mida sõbra %s Teile soovitab?"
+
+msgid "Submit"
+msgstr "Kinnita"
+
+msgid "Client"
+msgstr "Klient"
+
+msgid "System"
+msgstr "Süsteem"
+
+msgid "Local time"
+msgstr "Kohalik aeg"
+
+msgid "Comments"
+msgstr "Kommentaarid"
+
+msgid "User profile"
+msgstr "Kasutaja profiil"
+
+msgid "See his/her position on the globe"
+msgstr "Vaata tema asukohta kaardil"
+
+msgid "Confirm"
+msgstr "Kinnita"
+
+msgid "anonymous mode"
+msgstr "anonüümne režiim"
+
+msgid "Groups"
+msgstr "Grupid"
+
+msgid "Unclassified"
+msgstr "Liigitamata"
+
+msgid "Authorize"
+msgstr "Autoriseeri"
+
+msgid "Ask for authorization"
+msgstr "Küsi autoriseerimist"
+
+msgid "Unblock"
+msgstr "Deblokeeri"
+
+msgid "Prohibit"
+msgstr "Keela"
+
+msgid "Block"
+msgstr "Blokeeri"
+
+msgid "Chat"
+msgstr "Vestlus"
+
+msgid "Groupchat"
+msgstr "Grupivestlus"
+
+msgid "Jappix Mobile"
+msgstr "Jappix Mobiilis"
+
+msgid "Desktop"
+msgstr "Pealeht"
+
+msgid "Mobile"
+msgstr "Mobiil"
+
+msgid "Please wait..."
+msgstr "Palun oodake..."
+
+msgid "Please enable JavaScript"
+msgstr "Palun lubage JavaScript"
+
+msgid "Your channel"
+msgstr "Teie kanal"
+
+msgid "Channel of"
+msgstr "Kanal kuulub"
+
+msgid "More notices..."
+msgstr "Rohkem teateid..."
+
+msgid "Attach a file"
+msgstr "Lisa fail"
+
+msgid "Send"
+msgstr "Saada"
+
+msgid "Unattach the file"
+msgstr "Eemalda fail"
+
+msgid "An error occured while uploading your file: maybe it is too big (%s maximum) or forbidden!"
+msgstr "Faili üleslaadimisel tekkis viga: äkki on see liiga suur (%s maximum) või keelatud!"
+
+msgid "Authorization failed"
+msgstr "Autoriseerimine ebaõnnestus"
+
+msgid "Registration failed, please choose a different username"
+msgstr "Registreerimine ebaõnnestus, palun valige teine kasutajanimi"
+
+msgid "Service unavailable"
+msgstr "Teenus mitte saadaval"
+
+msgid "Internal server error, try later"
+msgstr "Serverisisene viga, proovige hiljem uuesti"
+
+msgid "Your form has been sent."
+msgstr "Teie ankeet on saadetud."
+
+msgid "Application"
+msgstr "Aplikatsioon"
+
+msgid "XMPP links"
+msgstr "XMPP lingid"
+
+msgid "Open XMPP links with Jappix"
+msgstr "Ava XMPP lingid Jappix'iga"
+
+msgid "changed the subject to:"
+msgstr "muutis teema:"
+
+msgid "Welcome!"
+msgstr "Tere tulemast!"
+
+msgid "Friends"
+msgstr "Sõbrad"
+
+msgid "Welcome on Jappix, your own social cloud!"
+msgstr "Tere tulemast Jappix'isse, Teie isiklik sotsiaalvõrgustik!"
+
+msgid "Before you start using it, you will have to change some settings, search for friends and complete your profile."
+msgstr "Enne kui Te seda kasutama hakkate, peate te mõned seaded salvestama, otsima sõpru ja täitma oma profiili."
+
+msgid "Enable notification sounds"
+msgstr "Võimalda teadete helid"
+
+msgid "Share your position on the globe"
+msgstr "Jaga oma asukohta kaardil"
+
+msgid "Offline friends"
+msgstr "Ühenduseta sõbrad"
+
+msgid "Don't hide offline friends"
+msgstr "Ära peida ühenduseta sõpru"
+
+msgid "Use this tool to find your friends on the server you are using right now, or add them later."
+msgstr "Kasuta seda tööriista, et leida oma sõpru serverist või lisa nad hiljem."
+
+msgid "Great work! Now, you can share Jappix with your friends!"
+msgstr "Hea töö! Nüüd saate te Jappix'it sõpradega jagada!"
+
+msgid "When you will press the save button, the profile editor will be opened. Happy socializing!"
+msgstr "Kui te vajutate salvestamise nuppu siis avaneb profiili muutmise aken."
+
+msgid "Share Jappix on %s"
+msgstr "Jaga Jappix'it %s"
+
+msgid "Using Jappix, an open social platform. I am %s!"
+msgstr "Kasutan Jappix'it, avatud sotsiaalvõrgustik. Ma olen %s!"
+
+msgid "Unknown name"
+msgstr "Tundmatu nimi"
+
+msgid "Unknown country"
+msgstr "Tundmatu riik"
+
+msgid "Click to enable"
+msgstr "Kliki, et võimaldada"
+
+msgid "Click to disable"
+msgstr "Kliki, et keelata"
+
+msgid "Installation"
+msgstr "Paigaldus"
+
+msgid "Jappix installation"
+msgstr "jappixi paigaldus"
+
+msgid "Welcome to the Jappix installation!"
+msgstr "Tere tulemast Jappixi paigaldajasse!"
+
+msgid "This tool will help you fastly install Jappix, the first full-featured XMPP-based social platform, on your server. You don't even need any technical knowledge."
+msgstr "See tööriist aitab Teil kiiresti paigaldada Jappixi, avatud sotsiaalvõrgustiku, Teie serverisse. Teil ei ole isegi vaja tehnilist taipu."
+
+msgid "Let's have a look at the installation steps:"
+msgstr "Vaatame paigalduse samme:"
+
+msgid "Welcome"
+msgstr "Tere tulemast"
+
+msgid "Storage configuration"
+msgstr "Hoiuruumi konfiguratsioon"
+
+msgid "Administrator account"
+msgstr "Administraatori konto"
+
+msgid "Main configuration"
+msgstr "Põhiline konfiguratsioon"
+
+msgid "Hosts configuration"
+msgstr "Hosti konfiguratsioon"
+
+msgid "Services installation"
+msgstr "Teenuste paigaldus"
+
+msgid "If the current language does not match yours (%1s), you can make Jappix speak %2s it will be saved."
+msgstr "Kui hetkeline keel (%1s) ei kattu teie omaga siis saate muuta keele %2s."
+
+msgid "If you want to get some help about the Jappix installation and configuration, you can use our whole documentation, available at:"
+msgstr "Kui te soovite abi Jappixi paigalduse kohta siis Te võite vaadata tervet dokumentatsiooni, mis on saadaval:"
+
+msgid "It's time to build your own social cloud: just go to the next step!"
+msgstr "On aeg paigaldada Teie enda isiklik avatud sotsiaalvõrgustik: Minge järgmise sammu juurde!"
+
+msgid "Jappix stores persistent data (such as shared files, chat logs, your own music and its configuration) into a single secured storage folder."
+msgstr "Jappix hoiab säilivaid andmeid (nagu nt jagatud failid, vestluse logid, Teie muusika ja konfiguratsioon) ühes ainsas turvatud kataloogis."
+
+msgid "Jappix must be able to write in this folder to create its sub-directories. If not, you must set the rights to %1s or change the folder owner to %2s (depending of your configuration)."
+msgstr "Jappixil peab olema siia ja alamkataloogidesse kirjutusõigus. Kui see puudub siis peate Te muutma õigused %1s või muutma kataloogi omaniku %2s (olenevalt Teie konfiguratsioonist)."
+
+msgid "The folder is writable, you can continue!"
+msgstr "Kataloogil on kirjutusõigused, Te võite jätkata!"
+
+msgid "Jappix offers you the possibility to manage your configuration, install new addons or search for updates. That's why you must create an administrator account to access the manager."
+msgstr "Jappix pakub võimalust hallata oma konfiguratsiooni, installida uusi addonaid või otsida uuendusi. Sellepärast peate te tegema administraatori konto, et haldus lehele ligi pääseda."
+
+msgid "When Jappix will be installed, just click on the manager link on the home page to access it."
+msgstr "Kui Jappix on paigaldatud siis lihtsalt vajutage Haldaja lingile avalehel, et sellele ligi pääseda."
+
+msgid "Oops, you missed something or the two passwords do not match!"
+msgstr "Tundub, et Teil jäi midagi märkamata või need kaks parooli ei klapi omavahel!"
+
+msgid "Jappix needs that you specify some values to work. Please correct the following inputs (or keep the default values, which are sufficient for most people)."
+msgstr "Jappixi töötamiseks on vajalik mõned väärtused muuta. Palun muutke järgmised väljad (või jätke need samaks, mis peaksid samuti töötama)."
+
+msgid "Note that if you don't specify a value which is compulsory, it will be automatically completed with the default one."
+msgstr "NB: Kui Te ei kinnita vajalikke väljasid siis kasutatakse olemasolevaid seadeid."
+
+msgid "User"
+msgstr "Kasutaja"
+
+msgid "Service"
+msgstr "Teenus"
+
+msgid "Service name"
+msgstr "Teenuse nimi"
+
+msgid "Service description"
+msgstr "Teenuse kirjeldus"
+
+msgid "Connection"
+msgstr "Ühendus"
+
+msgid "Lock the host"
+msgstr "Lukusta host"
+
+msgid "Anonymous mode"
+msgstr "Anonüümne režiim"
+
+msgid "Registration allowed"
+msgstr "Registreerimine lubatud"
+
+msgid "Use a proxy"
+msgstr "Kasuta proksit"
+
+msgid "Encryption"
+msgstr "Krüpteering"
+
+msgid "HTTPS storage"
+msgstr "HTTPS hoiustus"
+
+msgid "Force HTTPS"
+msgstr "Sunni HTTPS kasutus"
+
+msgid "Compression"
+msgstr "Pakkimine"
+
+msgid "This page helps you specify the default hosts Jappix will connect to. You can leave it as it is and continue if you want to use the official service hosts."
+msgstr "See lehekülg aitab Teil täpsustada hosti kuhu Jappix ennast ühendab. Te võite selle jätta nii nagu on kui soovite kasutada ametliku teenuse hosti."
+
+msgid "Maybe you don't know what a BOSH server is? In fact, this is a relay between a Jappix client and a XMPP server, which is necessary because of technical limitations."
+msgstr "Võib-olla Te ei tea mis on BOSH server? See on vahelüli Jappixi ja XMPP serveri vahel, see on vajalik tehniliste piirangute tõttu."
+
+msgid "Main host"
+msgstr "Põhiline host"
+
+msgid "Groupchat host"
+msgstr "Grupivestluse host"
+
+msgid "Anonymous host"
+msgstr "Anonüümne host"
+
+msgid "Directory host"
+msgstr "Kataloogi host"
+
+msgid "BOSH host"
+msgstr "BOSH host"
+
+msgid "You can install some extra softwares on your server, to extend your Jappix features. Some others might be modified, because of security restrictions which are set by default."
+msgstr "Te saate paigaldada lisatarkvara oma serverile, et laiendada Jappixi võimalusi."
+
+msgid "To perform this, you must be able to access your server's shell and be logged in as root. Remember this is facultative, Jappix will work without these modules, but some of its features will be unavailable."
+msgstr "Et seda tegevust sooritada, peate Te olema serverisse sisse logitud administraatorina."
+
+msgid "After you finished the setup, Jappix will generate the cache files. It might be slow, just wait until the application is displayed and do not press any button."
+msgstr "Kui te olete seadistamise lõpetanud, tekitab Jappix vahemälu failid. See võib aega võtta nii, et oodake millal rakendus on nähtaval ning ärge vajutage ühtegi nuppu."
+
+msgid "Thanks for using Jappix!"
+msgstr "Aitäh, et kasutate Jappixit!"
+
+msgid "Next"
+msgstr "Järgmine"
+
+msgid "Finish"
+msgstr "Valmis"
+
+msgid "Check again"
+msgstr "Kontrolli uuesti"
+
+msgid "The folder is not writable, set the right permissions to the %s directory."
+msgstr "Kataloogil ei ole kirjutusõigusi, lisage need õigused sellele asukohale %s."
+
+msgid "%s is installed on your system."
+msgstr "%s on Teie süsteemi paigaldatud."
+
+msgid "%1s is not installed on your system, you should install %2s."
+msgstr "%1s ei ole Teie süsteemi paigaldatud, Te peaksite paigaldama %2s."
+
+msgid "PHP maximum upload size is sufficient (%s)."
+msgstr "PHP maksimaalse faili üleslaadimise mahu piirang on piisav (%s)."
+
+msgid "PHP maximum upload size is not sufficient (%1s), you should define it to %2s in %3s."
+msgstr "PHP maksimaalse faili üleslaadimise mahu piirang ei ole piisav (%1s), Te peaksite selle %2s määrama %3s."
+
+msgid "Jappix manager"
+msgstr "Jappixi haldur"
+
+msgid "Manager access"
+msgstr "Halduri juurdepääs"
+
+msgid "Statistics"
+msgstr "Statistika"
+
+msgid "Hosts"
+msgstr "Hostid"
+
+msgid "Design"
+msgstr "Disain"
+
+msgid "Repeat"
+msgstr "Korda"
+
+msgid "All"
+msgstr "Kõik"
+
+msgid "Horizontal"
+msgstr "Horisontaalne"
+
+msgid "Vertical"
+msgstr "Vertikaalne"
+
+msgid "Center"
+msgstr "Keskel"
+
+msgid "Left"
+msgstr "Vasakule"
+
+msgid "Right"
+msgstr "Paremale"
+
+msgid "Top"
+msgstr "Üles"
+
+msgid "Bottom"
+msgstr "Alla"
+
+msgid "Adapt"
+msgstr "Kohanda"
+
+msgid "Color"
+msgstr "Värv"
+
+msgid "Users"
+msgstr "Kasutajad"
+
+msgid "Updates"
+msgstr "Uuendused"
+
+msgid "This is a restricted area: only the authorized users can manage this Jappix node."
+msgstr "See on keelatud ala: ainult autoriseeritud kasutajad saavad siia juurdepääsu."
+
+msgid "Please use the form below to login to the administration panel."
+msgstr "Palun täitke alljärgnev vorm, et administraatori paneelile juurdepääs saada."
+
+msgid "To improve security, sessions are limited in time and when your browser will be closed, you will be logged out."
+msgstr "Et turvalisust suurendada, siis sessioonid on ajalise piiranguga ja kui brauser sulgeda siis Teid logitakse välja."
+
+msgid "Credentials"
+msgstr "Isikutunnistus"
+
+msgid "You have been logged out. Goodbye!"
+msgstr "Teid on välja logitud. Nägemiseni!"
+
+msgid "Oops, you could not be recognized as a valid administrator. Check your credentials!"
+msgstr "Teid ei olnud võimalik kinnitada kui administraatorit. Kontrollige sisestatud andmeid!"
+
+msgid "Basic statistics are processed by Jappix about some important things, you can find them below."
+msgstr "Põhiline statistika on protsessitud Jappixi poolt, Te leiate selle siit alt."
+
+msgid "Change your Jappix node configuration with this tool."
+msgstr "Muutke oma Jappixi konfiguratsiooni selle tööriista abil."
+
+msgid "Change the XMPP hosts that this Jappix node serve with this tool."
+msgstr "Muutke XMPP hosti, mida Jappix pakub, selle tööriista abil."
+
+msgid "All this Jappix node stored files can be managed with this tool: please select a sub-folder and start editing its content!"
+msgstr "Kõiki Jappixi poolt salvestatud faile saab hallata selle tööriista abil: palun valige alamkataloog ja hakake selle sisu muutma!"
+
+msgid "Jappix is fully customisable: you can change its design right here."
+msgstr "Jappix on täielikult kohandatav: Te saate selle kujundust muuta siin."
+
+msgid "This is not a valid image, please use PNG, GIF or JPG!"
+msgstr "See ei ole õige pildi formaat, palun kasutage PNG, GIF või JPG formaati!"
+
+msgid "The image could not be received, would you mind retry?"
+msgstr "Pilti ei olnud võimalik vastu võtta, kas soovite uuesti proovida?"
+
+msgid "Your image was added to the list!"
+msgstr "Teie pilt lisati nimekirja!"
+
+msgid "Changes saved!"
+msgstr "Muudatused salvestatud!"
+
+msgid "You can define more than one administrator for this Jappix node. You can also change a password with this tool."
+msgstr "Te saate lisada rohkem kui ühe administraatori. Selle tööriistaga saate ka parooli muuta."
+
+msgid "Update your Jappix node with this tool, or check if a new one is available. Informations about the latest version are also displayed (in english)."
+msgstr "Selle tööriistaga saate Jappixit uuendada või vaadata kas uus versioon on saadaval. Informatsioon uue versiooni kohta on inglise keeles."
+
+msgid "Access statistics"
+msgstr "Juurdepääs statistikale"
+
+msgid "Share statistics"
+msgstr "Jaga statistikat"
+
+msgid "Other statistics"
+msgstr "Muu statistika"
+
+msgid "January"
+msgstr "Jaanuar"
+
+msgid "February"
+msgstr "Veebruar"
+
+msgid "March"
+msgstr "Märts"
+
+msgid "April"
+msgstr "Aprill"
+
+msgid "May"
+msgstr "Mai"
+
+msgid "June"
+msgstr "Juuni"
+
+msgid "July"
+msgstr "Juuli"
+
+msgid "August"
+msgstr "August"
+
+msgid "September"
+msgstr "September"
+
+msgid "October"
+msgstr "Oktoober"
+
+msgid "November"
+msgstr "November"
+
+msgid "December"
+msgstr "Detsember"
+
+msgid "Monday"
+msgstr "Esmaspäev"
+
+msgid "Tuesday"
+msgstr "Teisipäev"
+
+msgid "Wednesday"
+msgstr "Kolmapäev"
+
+msgid "Thursday"
+msgstr "Neljapäev"
+
+msgid "Friday"
+msgstr "Reede"
+
+msgid "Saturday"
+msgstr "Laupäev"
+
+msgid "Sunday"
+msgstr "Pühapäev"
+
+msgid "Total"
+msgstr "Kokku"
+
+msgid "Cache"
+msgstr "Vahemälu"
+
+msgid "Logs"
+msgstr "Logid"
+
+msgid "Music"
+msgstr "Muusika"
+
+msgid "Backgrounds"
+msgstr "Tagataustad"
+
+msgid "Share"
+msgstr "Jaga"
+
+msgid "Background"
+msgstr "Tagataust"
+
+msgid "Notice"
+msgstr "Teade"
+
+msgid "Your design preferences have been saved!"
+msgstr "Teie kujunduse seadistused on salvestatud!"
+
+msgid "Please check your inputs: something is missing!"
+msgstr "Palun kontrollige väljasid: midagi on puudu!"
+
+msgid "Change your Jappix node background with this tool. You can either set a custom color or an uploaded image. Let your creativity flow!"
+msgstr "Selle tööriistaga saate muuta Jappixi tagatausta. Te saate panna kas ühte värvi tagatausta või üles laadida pildi. Laske kujutlusvõimel lennata!"
+
+msgid "Use default background"
+msgstr "Kasutage olemasolevat tagatausta"
+
+msgid "Use your own image"
+msgstr "Kasutage enda üles laetud pilti"
+
+msgid "Select a background to use and change the display options."
+msgstr "Valige tagaataust ja seejärel valige kuidas seda kuvama peaks."
+
+msgid "Use your own color"
+msgstr "Kasutage enda valitud värvi"
+
+msgid "Type the hexadecimal color value you want to use as a background."
+msgstr "Kirjutage HEX väärtusega värvi valik mida Te soovite tagataustaks kasutada."
+
+msgid "Manage backgrounds"
+msgstr "Tagataustade haldamine"
+
+msgid "You can add a new background to the list with this tool. Please send a valid image."
+msgstr "Selle tööriistaga saate Te lisada uusi tagatausta pilte."
+
+msgid "If you want to remove some backgrounds, use the browser below."
+msgstr "Kui Te soovite mingisuguseid taustapilte eemaldada siis kasutage all olevat brauserit."
+
+msgid "Define a homepage notice for all your users, such as a warn, an important message or an advert with this tool."
+msgstr "Defineerige avalehe märguanne oma teenuse kasutajatele. Nagu näiteks hoiatus sõnumid, märguanded või reklaam."
+
+msgid "Simple notice"
+msgstr "Lihtne märguanne"
+
+msgid "This notice only needs simple text to be displayed, but no code is allowed!"
+msgstr "Sellele märguandele saab kirjutada tavalist teksti, kood ei ole lubatud!"
+
+msgid "Advanced notice"
+msgstr "Ülendatud märguanne"
+
+msgid "You can customize your notice with embedded HTML, CSS and JavaScript, but you need to code the style."
+msgstr "Te saate lisada märguande kus võite kasutada HTML'i, CSS'i ja JavaScripti, aga Te peate kodeerima stiili."
+
+msgid "Available updates"
+msgstr "Saadaval olevad uuendused"
+
+msgid "What's new?"
+msgstr "Mis on uut?"
+
+msgid "Your storage folders are not writable, please apply the good rights!"
+msgstr "Teie failihoidla kataloogil ei ole kirjutusõigusi, palun lisage need!"
+
+msgid "%1s may cause problems to the proxy, please increase %2s value up to %3s!"
+msgstr "%1s võib põhjustada proksi probleeme, palun suurendage väärtust %2s kuni %3s!"
+
+msgid "You are using a development version of Jappix. Update it through our repository by executing: %s."
+msgstr "Te kasutate Jappixi arendusversiooni. Uuendage seda läbi repository (hoidla) käivitades %s."
+
+msgid "A new Jappix version is available! Check what is new and launch the update!"
+msgstr "Uus Jappixi versioon on saadaval! Vaadake mis on uut ja käivitage uuendus!"
+
+msgid "Your version is out to date. Update it now to %s by clicking here!"
+msgstr "Teil on vana Jappixi versioon. Uuendage see versioonini %s siia klikkides!"
+
+msgid "Your version seems to be up to date, but you can check updates manually by clicking here."
+msgstr "Teil näib olevat Jappixi uusim versioon, aga te saate ka manuaalselt uuendusi kontrollida siia klikkides."
+
+msgid "Check for updates"
+msgstr "Kontrolli uuendusi"
+
+msgid "Update in progress"
+msgstr "Uuendamine käigus"
+
+msgid "Jappix has been updated: you are now running the latest version. Have fun!"
+msgstr "Jappix on uuendatud: Teil on nüüd kõige uuem versioon."
+
+msgid "The update has failed! Please try again later."
+msgstr "Uuendamine ebaõnnestus! Palun proovige hiljem uuesti."
+
+msgid "Downloading package..."
+msgstr "Pakkide alla laadimine..."
+
+msgid "Removing current Jappix system files..."
+msgstr "Eemaldan hetkelisi Jappixi süsteemi faile..."
+
+msgid "Extracting package..."
+msgstr "Pakin pakke lahti..."
+
+msgid "Regenerating storage folder tree..."
+msgstr "Taastan hoiukataloogi..."
+
+msgid "Jappix is now up to date!"
+msgstr "Jappix on nüüd uuendatud!"
+
+msgid "Aborted: socket error!"
+msgstr "Katkestatud: pesa viga!"
+
+msgid "Aborted: buffer error!"
+msgstr "Katkestatud: puhvri viga!"
+
+msgid "Aborted: everything is not writable!"
+msgstr "Katkestatud: kõikidel vajalikel asjadel ei ole kirjutusõigusi!"
+
+msgid "Aborted: could not extract the package!"
+msgstr "Katkestatud: ei saanud pakke lahti pakkida!"
+
+msgid "Visits"
+msgstr "Külastused"
+
+msgid "Daily"
+msgstr "Päevane"
+
+msgid "Weekly"
+msgstr "Nädalane"
+
+msgid "Monthly"
+msgstr "Kuine"
+
+msgid "Yearly"
+msgstr "Aastane"
+
+msgid "Size"
+msgstr "Suurus"
+
+msgid "Clean everything"
+msgstr "Puhasta kõik"
+
+msgid "Purge cache"
+msgstr "Puhasta vahemälu"
+
+msgid "Purge logs"
+msgstr "Puhasta logid"
+
+msgid "Purge updates"
+msgstr "Puhasta uuendused"
+
+msgid "The storage folder you wanted to clean is now empty!"
+msgstr "Failihoidla mida Te puhastasite on nüüd tühi!"
+
+msgid "Keep your Jappix node fresh and fast, clean the storage folders regularly!"
+msgstr "Hoidke oma Jappix värske ja kiire, puhastage failihoidlaid regulaarselt!"
+
+msgid "Upload your music (Ogg Vorbis, MP3 or WAV) to be able to listen to it in Jappix!"
+msgstr "Lae üles oma muusikat (OGG Vorbis, MP3 või WAV) et seda saaks Jappix'is kuulata!"
+
+msgid "The file you want to upload must be smaller than %s."
+msgstr "Fail mida Te tahtsite üles laadida peab olema väiksem kui %s."
+
+msgid "Stay tuned in what your users store on your server and remove undesired content with this tool."
+msgstr "Selle tööriistaga saate ennast kursis hoida mida Teie kasutajad serveris hoiavad ja vajaduse korral eemaldada ebasobivaid materjale."
+
+msgid "Title"
+msgstr "Pealkiri"
+
+msgid "Artist"
+msgstr "Esitaja"
+
+msgid "Album"
+msgstr "Album"
+
+msgid "File"
+msgstr "Fail"
+
+msgid "Upload"
+msgstr "Üleslaadimine"
+
+msgid "The folder is empty."
+msgstr "Kaust on tühi."
+
+msgid "The music could not be received, please retry!"
+msgstr "Muusikat ei saadud vastu võtta, proovige uuesti!"
+
+msgid "This is not a valid music file, please encode in Ogg Vorbis, MP3 or WAV!"
+msgstr "Vale muusikafaili formaat, palun laadige üles OGG Vorbis, MP3 või WAV formaadis!"
+
+msgid "Your music has been added!"
+msgstr "Teie muusika on lisatud!"
+
+msgid "The selected elements have been removed."
+msgstr "Valitud elemendid on eemaldatud."
+
+msgid "You must select elements to remove!"
+msgstr "Te peate valima elemente mida eemaldada!"
+
+msgid "Add a new user with this tool, or change a password (type an existing username). Please submit a strong password!"
+msgstr "Selle tööriistaga saate lisada uue kasutaja või muuta parooli. Palun lisage tugev parool!"
+
+msgid "Manage"
+msgstr "Halda"
+
+msgid "List"
+msgstr "Nimekiri"
+
+msgid "Remove users with this tool. Note that you cannot remove an user if he is the only one remaining."
+msgstr "Selle tööriistaga saate eemaldada kasutajaid. Viimast kasutajat eemaldada ei saa, vähemalt üks peab alati alles jääma."
+
+msgid "The user has been added!"
+msgstr "Kasutaja on lisatud!"
+
+msgid "The chosen users have been removed."
+msgstr "Valitud kasutajad on eemaldatud."
+
+msgid "You must select one or more users to be removed!"
+msgstr "Te peate valima ühe või mitu kasutajat keda eemaldada!"
+
+msgid "Yesterday"
+msgstr "Eile"
+
+msgid "%s days ago"
+msgstr "%s päeva tagasi"
+
+msgid "User currently active"
+msgstr "Hetkel aktiivsed kasutajad"
+
+msgid "Last seen: %s"
+msgstr "Viimati nähtud: %s"
+
+msgid "Inactive since: %s"
+msgstr "Inaktiivsed alates: %s"
+
+msgid "Your friend seems not to have received your message(s)!"
+msgstr "Näib, et Teie sõber ei ole Teie sõnumeid kätte saanud!"
+
+msgid "Static content server"
+msgstr "Staatilise sisuga server"
+
+msgid "This is the static content server for %1s, “%2s”."
+msgstr "Siin on staatilise sisuga serverid %1s, “%2s”."
+
+msgid "Suggested friends"
+msgstr "Soovitatud sõbrad"
+
+msgid "Check all"
+msgstr "Vali kõik"
+
+msgid "Uncheck all"
+msgstr "Eemalda valik kõigelt"
+
+msgid "Choose"
+msgstr "Vali"
+
+msgid "List name"
+msgstr "Näita nime"
+
+msgid "Allow"
+msgstr "Luba"
+
+msgid "Deny"
+msgstr "Keela"
+
+msgid "Group"
+msgstr "Grupp"
+
+msgid "Subscription"
+msgstr "Tellimus"
+
+msgid "Both"
+msgstr "Mõlemad"
+
+msgid "From"
+msgstr "Kellelt"
+
+msgid "Everybody"
+msgstr "Igaüks"
+
+msgid "Send messages"
+msgstr "Saada sõnum"
+
+msgid "Send queries"
+msgstr "Saada päringud"
+
+msgid "See my status"
+msgstr "Vaata minu staatust"
+
+msgid "Send his/her status"
+msgstr "Saada tema staatus"
+
+msgid "Everything"
+msgstr "Kõik"
+
+msgid "Item"
+msgstr "Ühik"
+
+msgid "Order"
+msgstr "Järjekord"
+
+msgid "Active for this session"
+msgstr "Selleks sessiooniks aktiivne"
+
+msgid "Always active"
+msgstr "Alati aktiivne"
+
+msgid "User directory"
+msgstr "Kasutaja kataloog"
+
+msgid "Search a friend"
+msgstr "Otsi sõpra"
+
+msgid "The feature requested is not implemented by the recipient or server and therefore cannot be processed."
+msgstr "Server ei toeta nõutud detaili või ei ole see saadaval, seega detaili protsessimine on katkestatud."
+
+msgid "This is a repeat from %s"
+msgstr "%s kordab seda"
+
+msgid "Loading comments..."
+msgstr "Laen kommentaare..."
+
+msgid "Type your comment here..."
+msgstr "Kirjuta oma kommentaar siia..."
+
+msgid "Could not get the comments!"
+msgstr "Ei saanud kommentaare kätte!"
+
+msgid "Show comments"
+msgstr "Näita kommentaare"
+
+msgid "Send him/her a message"
+msgstr "Saada temale sõnum"
+
+msgid "Start a chat with him/her"
+msgstr "Alusta temaga vestlust"
+
+msgid "Media integration"
+msgstr "Meedia integratsioon"
+
+msgid "Comments locked!"
+msgstr "Kommentaarid lukus!"
+
+msgid "Type something you want to share with your friends..."
+msgstr "Kirjuta midagi mida sa tahad oma sõpradega jagada..."
+
+msgid "changed his/her nickname to %s"
+msgstr "muutis oma hüüdnime %s"
+
+msgid "commented an item you follow: “%s”."
+msgstr "kommenteeris asja üle mida sa jälgid: “%s”."
+
+msgid "Hide"
+msgstr "Peida"
+
+msgid "liked your post: “%s”."
+msgstr "linkis sinu postituse: “%s”."
+
+msgid "quoted you somewhere: “%s”."
+msgstr "tsiteeris sind kuskil: “%s”."
+
+msgid "published on your wall: “%s”."
+msgstr "kirjutas sinu seinale: “%s”."
+
+msgid "tagged you in a photo (%s)."
+msgstr "sildistas sind fotol (%s)."
+
+msgid "tagged you in a video (%s)."
+msgstr "sildistas sind videol (%s)."
+
+msgid "Show"
+msgstr "Näita"
+
+msgid "Need help? You'd better read our documentation page about how to fill this form!"
+msgstr "Vajad abi? Parem oleks kui sa loed meie dokumentatsiooni lehte enne kui sa selle vormi täidad!"
+
+msgid "Pubsub host"
+msgstr "Pubsub host"
+
+msgid "Jappix is a great social platform, that you can access wherever you are, whenever you want and communicate with whovever you want."
+msgstr "Jappix on suurepärane sotsiaalvõrgustik millele Te saate ligi pääseda kusiganes Te olete, millal iganes Te soovite ja suhelda kellega iganes Te soovite."
+
+msgid "Manager link"
+msgstr "Halduri link"
+
+msgid "User uploads server"
+msgstr "Kasutajate üleslaadimised serverisse"
+
+msgid "This is the user uploads server for %1s, “%2s”."
+msgstr "Siin on kasutajate üleslaadimised %1s, “%2s”."
+
+msgid "Logo"
+msgstr "Logo"
+
+msgid "You can set your own service logo to replace the default one. Take care of the size and the main color of each logo!"
+msgstr "Te saate lisada enda teenuse logo ja asendada olemasoleva. Hoolitsege selle eest, et suurus ja värvid oleksid õiged!"
+
+msgid "Upload each logo with the recommended maximum pixel size."
+msgstr "Lae üles iga logo soovitatud pikseli suurusega."
+
+msgid "This is not a valid image, please use the PNG format!"
+msgstr "See ei ole õige pildi formaat, palun valige PNG formaat!"
+
+msgid "Your service logo has been successfully changed!"
+msgstr "Teie teenuse logo on edukalt muudetud!"
+
+msgid "Your logo format must be PNG. Leave a field empty and the logo will not be changed."
+msgstr "Teie logo formaat peab olema PNG. Kui te jätate välja tühjaks siis logo ei muutu."
+
+msgid "Remove this logo"
+msgstr "Eemalda see logo"
+
+msgid "View this logo"
+msgstr "Vaata seda logo"
+
+msgid "Send a file"
+msgstr "Saada fail"
+
+msgid "Once uploaded, your friend will be prompted to download the file you sent."
+msgstr "Kui te olete faili üles laadinud siis Teie sõber saab märguande Teie saadetud faili kohta."
+
+msgid "Groupchats to join"
+msgstr "Grupivestlused millega liituda"
+
+msgid "Purge sent files"
+msgstr "Puhasta saadetud failid"
+
+msgid "would like to send you a file: “%s”."
+msgstr "soovib Teile saata faili: “%s”."
+
+msgid "has accepted to received your file: “%s”."
+msgstr "on nõustunud Teie saadetud faili vastu võtma: “%s”."
+
+msgid "has rejected to receive your file: “%s”."
+msgstr "on keeldunud Teie saadetud faili vastu võtmast: “%s”."
+
+msgid "could not receive your file: “%s”."
+msgstr "ei saanud Teie faili kätte: “%s”."
+
+msgid "has received a file exchange request: “%s”."
+msgstr "On failivahetuse pakkumise vastu võtnud: “%s”."
+
+msgid "Available shortcuts:"
+msgstr "Saadaolevad otseteed:"
+
+msgid "%s removes the chat logs"
+msgstr "%s eemaldab vestluse logid"
+
+msgid "%s joins a groupchat"
+msgstr "%s liitub grupivestlusega"
+
+msgid "%s closes the chat"
+msgstr "%s sulgeb vestluse"
+
+msgid "%s shows the user profile"
+msgstr "%s näitab kasutaja profiili"
+
+msgid "%s sends a message to the room"
+msgstr "%s saadab ruumi sõnumi"
+
+msgid "%s changes your nickname"
+msgstr "%s muudab Teie hüüdnime"
+
+msgid "%s sends a message to someone in the room"
+msgstr "%s saadab kellegile ruumis olevale sõnumi"
+
+msgid "%s changes the room topic"
+msgstr "%s muudab ruumi teema"
+
+msgid "%s kicks an user of the room"
+msgstr "%s lööb kasutaja ruumist välja"
+
+msgid "%s bans an user of the room"
+msgstr "%s paneb kasutajale ruumi keelu"
+
+msgid "%s invites someone to join the room"
+msgstr "%s kutsub kellegi ruumiga liituma"
+
+msgid "Social channel, chat and more."
+msgstr ""
+
+msgid "Create your public profile."
+msgstr ""
+
+msgid "A mini-chat for your website."
+msgstr ""
+
+msgid "Get Jappix, get support."
+msgstr ""
+
+msgid "Statistics around Jappix."
+msgstr ""
+
+msgid "Download Jappix for free."
+msgstr ""
+
+msgid "Find a public Jappix node."
+msgstr ""
+
+msgid "Public profile"
+msgstr ""
+
+msgid "Your profile anywhere on the Web."
+msgstr ""
+
+msgid "%s is a Jappix.com service which makes your XMPP profile public. It is easier to share it. No XMPP account is required to view your social channel, your current position and your contact details."
+msgstr ""
+
+msgid "Furthermore, every picture you post in your social channel is added to a beautiful picture timeline. You can now view the pictures you shared year by year."
+msgstr ""
+
+msgid "You can also use your XMPP avatar as a single avatar for every website, blog and forum you use. When you change it on XMPP, the new avatar appears everywhere. What a genious improvement!"
+msgstr ""
+
+msgid "Yay, let's create my public profile!"
+msgstr ""
+
+msgid "Enable my public profile"
+msgstr ""
+
+#~ msgid "Jappix is a non-profit social platform, that you can access wherever you are, whenever you want and communicate with whovever you want."
+#~ msgstr ""
+
+#~ msgid "See"
+#~ msgstr ""
+
+#~ msgid "Use default logo"
+#~ msgstr ""
+
+#~ msgid "Use your own logo"
+#~ msgstr ""
+
+#~ msgid "The recommended image format is PNG. Leave a field empty and the logo will not be changed."
+#~ msgstr ""
diff --git a/jappixmini/jappix/lang/fa/LC_MESSAGES/main.mo b/jappixmini/jappix/lang/fa/LC_MESSAGES/main.mo
new file mode 100644
index 00000000..4ed874aa
Binary files /dev/null and b/jappixmini/jappix/lang/fa/LC_MESSAGES/main.mo differ
diff --git a/jappixmini/jappix/lang/fa/LC_MESSAGES/main.po b/jappixmini/jappix/lang/fa/LC_MESSAGES/main.po
new file mode 100644
index 00000000..ed3782ca
--- /dev/null
+++ b/jappixmini/jappix/lang/fa/LC_MESSAGES/main.po
@@ -0,0 +1,1870 @@
+# Persian translations for Jappix package.
+# This file is distributed under the same license as the Jappix package.
+# This file was translated from CodingTeam at <http://codingteam.net/>.
+msgid ""
+msgstr ""
+"Project-Id-Version: Jappix\n"
+"PO-Revision-Date: 2012-01-16 21:25+0100\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"POT-Creation-Date: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+
+msgid "JavaScript is missing in your web browser, so that you will not be able to launch Jappix! Please fix this."
+msgstr "نمی‌توان جاوااسکریپت را در مرورگر شما یافت. بنابراین شما نمی‌توانید Jappix را ببینید! لطفاً این را اصلاح کنید."
+
+msgid "An open social network"
+msgstr "یک شما اجتماعی باز"
+
+msgid "Jappix has been interrupted by a network issue, a bug or bad login (check that you entered the right credentials), sorry for the inconvenience."
+msgstr "Jappix توسط یک اشکال شبکه متوقف شده‌است. یک اشکال یا ورود بد (بررسی کنید که اعتبارات درست را وارد کرده‌اید). شرمنده بابات دردسر ایجاد شده."
+
+msgid "The element list on this server could not be obtained!"
+msgstr "فهرست عناصر این سرور نمی‌تواند گرفته شود!"
+
+msgid "Your password has been changed, now you can connect to your account with your new login data."
+msgstr "گذرواژهٔ شما تغییر کرده‌است. شما می‌توانید با داده‌ها جدید ورودی متصل شوید."
+
+msgid "Your XMPP account has been removed, bye!"
+msgstr "حساب XMPP شما حذف شده‌است. بدرود!"
+
+msgid "You have been logged out of your XMPP account, have a nice day!"
+msgstr "شما از حساب XMPP خود خارج شده‌اید. روز خوش!"
+
+msgid "The room you joined seems not to exist. You should create it!"
+msgstr "اتاقی که شما به آن وصل شده‌اید به نظر وجود ندارد. شما می‌توانید ایجادش کنید!"
+
+msgid "The groupchat has been removed, now someone else will be able to recreate it."
+msgstr "چپ گروهی خذف شد. الآن هر کس دیگری می‌تواند آن را ایجاد کند."
+
+msgid "The user that you want to reach is not present in the room."
+msgstr ""
+
+msgid "Please enter the group chat address to join."
+msgstr ""
+
+msgid "Please enter your nickname to join %s."
+msgstr ""
+
+msgid "This room (%s) is protected with a password."
+msgstr ""
+
+msgid "Your browser is out of date!"
+msgstr "مرورگر شما منسوخ است!"
+
+msgid "Last %s version is better!"
+msgstr ""
+
+msgid "Login"
+msgstr "وارد شدن"
+
+msgid "Register"
+msgstr "ثبت نام"
+
+msgid "Here we go!"
+msgstr "اینجا می‌رویم!"
+
+msgid "Server"
+msgstr "سرور"
+
+msgid "Password"
+msgstr "پسورد"
+
+msgid "Remember me"
+msgstr "مرا به خاطر بسپار"
+
+msgid "This tool has been disabled, you cannot use it!"
+msgstr "این سرویس غیر فعال شده و دسترسی شما به ان ممکن نیست"
+
+msgid "Due to a network issue, you were disconnected. What do you want to do now?"
+msgstr "به دلیل مشکل شبکه‌ای، شما قطع شده‌اید. الآن چه می‌خواهید بکنید؟"
+
+msgid "Reconnect"
+msgstr "اتصال مجدد"
+
+msgid "Messages"
+msgstr "پیغام‌ها"
+
+msgid "Profile"
+msgstr "پروفایل"
+
+msgid "Options"
+msgstr "گزینه‌ها"
+
+msgid "Disconnect"
+msgstr "قطع"
+
+msgid "Filter"
+msgstr "پالایه"
+
+msgid "Add a friend"
+msgstr "افزودن یک دوست"
+
+msgid "Your groupchats"
+msgstr "گروه‌های چت شما"
+
+msgid "Manage your favorite groupchats"
+msgstr "گفتگوی گروهی محبوبتان را مدیریت کنید"
+
+msgid "More stuff"
+msgstr "چیزهای بیشتر"
+
+msgid "Show all friends"
+msgstr "مشاهده همه دوستان"
+
+msgid "Only show connected friends"
+msgstr "مشاهده دوستان انلاین"
+
+msgid "Message archives"
+msgstr "بایگانی‌های پیغام"
+
+msgid "Date"
+msgstr "تاریخ"
+
+msgid "Please select a friend to view the chat history."
+msgstr ""
+
+msgid "Nothing found for: %s"
+msgstr "چیزی یافت نشد برای: %s"
+
+msgid "A short message?"
+msgstr "یک پیغام کوتاه؟"
+
+msgid "How are you?"
+msgstr "چطورید؟"
+
+msgid "What are you doing?"
+msgstr "چکاری می‌کنید؟"
+
+msgid "Join a chat"
+msgstr "ورود به گفتگو"
+
+msgid "Status"
+msgstr "وضعیت"
+
+msgid "Available"
+msgstr "حاضر"
+
+msgid "Talkative"
+msgstr "پرحرف"
+
+msgid "Away"
+msgstr "دور"
+
+msgid "Not available"
+msgstr "ناحاضر"
+
+msgid "Busy"
+msgstr "مشغول"
+
+msgid "Mood"
+msgstr "حالت"
+
+msgid "None"
+msgstr "هیچ"
+
+msgid "Crazy"
+msgstr "دیوانه"
+
+msgid "Excited"
+msgstr "هیحان زده"
+
+msgid "Playful"
+msgstr "اهل بازی"
+
+msgid "Happy"
+msgstr "خوشحال"
+
+msgid "Shocked"
+msgstr "پاسخ همراه با اعلان"
+
+msgid "Hot"
+msgstr "داغ"
+
+msgid "Sad"
+msgstr "غمگین"
+
+msgid "Amorous"
+msgstr "عاشق"
+
+msgid "Confident"
+msgstr "اعتماد به نقس"
+
+msgid "Activity"
+msgstr "فعالیت"
+
+msgid "Chores"
+msgstr ""
+
+msgid "Drinking"
+msgstr "نوشیدن"
+
+msgid "Eating"
+msgstr "خوردن"
+
+msgid "Exercising"
+msgstr "تمرین‌کردن"
+
+msgid "Grooming"
+msgstr "آراسته‌کردن"
+
+msgid "Appointment"
+msgstr "انتصاب"
+
+msgid "Inactive"
+msgstr "غیرفعال"
+
+msgid "Relaxing"
+msgstr "آرامش"
+
+msgid "Talking"
+msgstr "گفتگو"
+
+msgid "Traveling"
+msgstr "سفر کردن"
+
+msgid "Working"
+msgstr "کار کردن"
+
+msgid "View profile"
+msgstr "نمایش مشخصات"
+
+msgid "Repeat this notice"
+msgstr "تکرار این موضوع"
+
+msgid "Remove this notice"
+msgstr "حذف این موضوع"
+
+msgid "Your profile"
+msgstr "مشخصات شما"
+
+msgid "Identity"
+msgstr "هویت"
+
+msgid "Profile image"
+msgstr "مشخصات شما"
+
+msgid "Others"
+msgstr "دیگران"
+
+msgid "Personal"
+msgstr "شخصی"
+
+msgid "Complete name"
+msgstr "نام کامل"
+
+msgid "Nickname"
+msgstr "نام کاربری"
+
+msgid "First name"
+msgstr "نام"
+
+msgid "Last name"
+msgstr "نام خانوادگی"
+
+msgid "Date of birth"
+msgstr "تاریخ تولد"
+
+msgid "Contact"
+msgstr "مشخصات تماس"
+
+msgid "E-mail"
+msgstr "ایمیل"
+
+msgid "Phone"
+msgstr "تلفن"
+
+msgid "Website"
+msgstr "آدرس وب سایت"
+
+msgid "Current"
+msgstr "واحد پول"
+
+msgid "Delete"
+msgstr "حذف‌کردن"
+
+msgid "What a pity! You have no profile image defined in your identity card!"
+msgstr "چه متأسر کننده! شما تصویر پروفایلی در کارت شناساییتان تعیین نکرده‌اید!"
+
+msgid "Address"
+msgstr "نشانی"
+
+msgid "Street"
+msgstr "خیابان"
+
+msgid "City"
+msgstr "شهر"
+
+msgid "Postal code"
+msgstr "کد پستی"
+
+msgid "Country"
+msgstr "کشور"
+
+msgid "Biography"
+msgstr "زندگی‌نامه"
+
+msgid "Important notice"
+msgstr "اخطار مهم"
+
+msgid "Be careful of the information you write into your profile, because it could be accessed by everyone (even someone you don't want to)."
+msgstr ""
+
+msgid "Not everything is private on XMPP; this is one of those things, your public profile (vCard)."
+msgstr ""
+
+msgid "It is strongly recommended to upload a profile image (%s maximum), like a picture of yourself, because that makes you easily recognizable by your friends."
+msgstr ""
+
+msgid "Save"
+msgstr "ذخیره"
+
+msgid "Cancel"
+msgstr "انصراف"
+
+msgid "Edit options"
+msgstr "ویرایش اختیارات"
+
+msgid "Channel"
+msgstr "کانال"
+
+msgid "Commands"
+msgstr "دستورات"
+
+msgid "Sounds"
+msgstr "صداها"
+
+msgid "Privacy"
+msgstr "حریم خصوصی"
+
+msgid "Message archiving"
+msgstr "بایگانی پیام"
+
+msgid "Store a history of your chats"
+msgstr "ذخیرهٔ تاریخچهٔ گفتگوهای شما"
+
+msgid "Geolocation"
+msgstr "منطقهٔ جغرافیایی"
+
+msgid "Empty"
+msgstr "خالی"
+
+msgid "Empty channel"
+msgstr "کانال خالی"
+
+msgid "Persistent"
+msgstr "ماندگار"
+
+msgid "Maximum notices"
+msgstr "بیشترین آگاهی‌دادن‌ها"
+
+msgid "Account"
+msgstr "حساب"
+
+msgid "Change password"
+msgstr "تغییر گذرواژه"
+
+msgid "Delete account"
+msgstr "حذف حساب"
+
+msgid "Old"
+msgstr "قدیمی"
+
+msgid "New (2 times)"
+msgstr "جدید (۲ مرتبه)"
+
+msgid "Continue"
+msgstr "ادامه"
+
+msgid "To"
+msgstr "به"
+
+msgid "Close"
+msgstr "بستن"
+
+msgid "unknown"
+msgstr "ناشناخته"
+
+msgid "Unavailable"
+msgstr "ناموجود"
+
+msgid "is now"
+msgstr "الآن هست"
+
+msgid "Please wait while your avatar is uploaded..."
+msgstr "لظفاً صبر کنید تا آواتار شما بارگذاری شود..."
+
+msgid "Here it is! A new beautiful profile image!"
+msgstr "اینجاست! یک تصویر زیبا و جدید پروفایل!"
+
+msgid "The image file is not supported or has a bad size."
+msgstr ""
+
+msgid "Reply"
+msgstr "پاسخ"
+
+msgid "Error"
+msgstr "خطا"
+
+msgid "Click here to solve the error"
+msgstr "اینجا را برای حل ایراد کلیک کنید"
+
+msgid "You"
+msgstr "شما"
+
+msgid "Remove"
+msgstr "حذف"
+
+msgid "Rename"
+msgstr "تغییر نام"
+
+msgid "Hi, I am %s, I would like to add you as my friend."
+msgstr ""
+
+msgid "Smiley insertion"
+msgstr "افزودن شکلک"
+
+msgid "Change style"
+msgstr "تغییر سبک"
+
+msgid "Text in bold"
+msgstr "متن ضخیم"
+
+msgid "Text in italic"
+msgstr "متن مورب"
+
+msgid "Underlined text"
+msgstr "متن زیرخط کشیده شده"
+
+msgid "Save chat"
+msgstr "ذخیرهٔ گفتگو"
+
+msgid "Click on the following link to get the chat log, and wait. Then click again to get the file."
+msgstr ""
+
+msgid "This chat is empty!"
+msgstr "این گفتگو خالی‌است!"
+
+msgid "Generate file!"
+msgstr "ساختن پرونده!"
+
+msgid "Download file!"
+msgstr "بارگیری پرونده!"
+
+msgid "Clean current chat"
+msgstr "پاکسازی گفتگوی فعلی"
+
+msgid "View chat history"
+msgstr "دیدن تاریخچهٔ گفتگو"
+
+msgid "Show user profile"
+msgstr "نمایش پروفایل کاربری"
+
+msgid "Add this contact to your friends"
+msgstr "افزودن این تماس به دوستان شما"
+
+msgid "Add this groupchat to your favorites"
+msgstr "افزودن این گفتگوی گروهی به محبوب‌ها شما"
+
+msgid "All tabs"
+msgstr "همهٔ برگه‌ها"
+
+msgid "Close this tab"
+msgstr "بستن این برگه"
+
+msgid "no subject defined for this room."
+msgstr "موضوعی برای این اتاق تعیین نشده‌است."
+
+msgid "Administration panel for this room"
+msgstr "پنل مدیریتی این اتاق"
+
+msgid "Moderators"
+msgstr "مدیران"
+
+msgid "Participants"
+msgstr "شریک‌ها"
+
+msgid "Visitors"
+msgstr "بازدیدکنندگان"
+
+msgid "Manage favorite rooms"
+msgstr "مدیریت اتاق‌ها محبوب شده"
+
+msgid "Change favorites"
+msgstr "عوض‌کردن محبوب شده‌ها"
+
+msgid "Search a room"
+msgstr "جستجوی یک اتاق"
+
+msgid "Select a favorite"
+msgstr "انتخاب یکی از محبوب شده‌ها"
+
+msgid "Getting the name..."
+msgstr "گرفتن نام..."
+
+msgid "Gateway"
+msgstr "دروازه"
+
+msgid "Name"
+msgstr "نام"
+
+msgid "Room"
+msgstr "اتاق"
+
+msgid "Add"
+msgstr "افزودن"
+
+msgid "Edit"
+msgstr "ویرایش"
+
+msgid "Search a room on"
+msgstr ""
+
+msgid "No room found on this server."
+msgstr "اتاقی در این سرور یافت نشد."
+
+msgid "Service discovery"
+msgstr "جستجوی "
+
+msgid "Server to query"
+msgstr "کارساز برای پرس‌وجو"
+
+msgid "Sorry, but the entity didn't return any result!"
+msgstr "شرمنده. ولی موجودیت هیچ نتیجه‌ای را برنگرداند!"
+
+msgid "Accounts"
+msgstr "حساب‌ها"
+
+msgid "Authentications"
+msgstr "تصدیقات"
+
+msgid "Automation"
+msgstr "خودکاری"
+
+msgid "Clients"
+msgstr "مشتری‌ها"
+
+msgid "Collaboration"
+msgstr "همکاری"
+
+msgid "Components"
+msgstr "اجزاء"
+
+msgid "Rooms"
+msgstr "اتاق‌ها"
+
+msgid "Directories"
+msgstr ""
+
+msgid "Gateways"
+msgstr "دروازه‌ها"
+
+msgid "News"
+msgstr "اخبار"
+
+msgid "Hierarchy"
+msgstr "سلسه مراتبی"
+
+msgid "Proxies"
+msgstr "پروکسی‌ها"
+
+msgid "Publication/Subscription"
+msgstr ""
+
+msgid "Storage"
+msgstr "انباره"
+
+msgid "Service offline or broken"
+msgstr ""
+
+msgid "Your inbox"
+msgstr "صندوق ورودی شما"
+
+msgid "Available actions"
+msgstr "اقدام‌ها موجود"
+
+msgid "Clean"
+msgstr "تمیز"
+
+msgid "New"
+msgstr "جدید"
+
+msgid "Received"
+msgstr "دریافت شده"
+
+msgid "Subject"
+msgstr "موضوع"
+
+msgid "Content"
+msgstr "محتوا"
+
+msgid "Send message"
+msgstr "فرستادن پیام"
+
+msgid "Your inbox is empty."
+msgstr "صندوق ورودی شما خالی‌است."
+
+msgid "MUC administration"
+msgstr "مدیریت MUC"
+
+msgid "You administrate this room"
+msgstr ""
+
+msgid "Enter new subject"
+msgstr "افزودن عنوان جدید"
+
+msgid "Configuration"
+msgstr "پیکربندی"
+
+msgid "Authorizations"
+msgstr "اجازه‌ها"
+
+msgid "Member list"
+msgstr "فهرست عضو"
+
+msgid "Owner list"
+msgstr "فهرست دارنده"
+
+msgid "Administrator list"
+msgstr "فهرست مدیران"
+
+msgid "Outcast list"
+msgstr ""
+
+msgid "Add an input"
+msgstr "افزودن یک وررو"
+
+msgid "Destroy this MUC"
+msgstr "نابودسازی این MUC"
+
+msgid "Yes, let's do it!"
+msgstr "بله. بگذار انجامش دهیم!"
+
+msgid "Your friend is paying attention to the conversation."
+msgstr "دوست شما به مکالمه توجه می‌کنند."
+
+msgid "Your friend is writing a message..."
+msgstr "دوست شما در حال نوشتن یک پیام است..."
+
+msgid "Your friend stopped writing a message."
+msgstr "دوست شما از نوشتن پیامی باز ایستاد."
+
+msgid "Your friend is doing something else."
+msgstr "دوست شما کا دیگری می‌کند."
+
+msgid "Your friend closed the chat."
+msgstr "دوست شما گفتگو را بست."
+
+msgid "Requesting this service..."
+msgstr "درخواست کردن این سرویس..."
+
+msgid "Loading"
+msgstr "بارگیری"
+
+msgid "joined the chat room"
+msgstr "به اتاق گفتگو پیوست"
+
+msgid "left the chat room"
+msgstr "ترک‌کردن اتاق گفتگو"
+
+msgid "no status"
+msgstr "بی‌وضعیت"
+
+msgid "has been kicked"
+msgstr "بیرون شده‌است"
+
+msgid "has been banned"
+msgstr "بسته شده‌است"
+
+msgid "no reason"
+msgstr "بی‌دلیل"
+
+msgid "Communicate with the entire world!"
+msgstr ""
+
+msgid "It allows you to get in touch with the millions of users who currently use the XMPP network like you do with Jappix. Join the community and stay free!"
+msgstr ""
+
+msgid "Hi there!"
+msgstr "سلام!"
+
+msgid "Welcome on %1s, “%2s”."
+msgstr "خوش‌آمدید به %1s. «%2s»"
+
+msgid "Login to your existing XMPP account or create a new one for free!"
+msgstr ""
+
+msgid "Jappix is an open-source project from PostPro, a non-profit organization which provides us a great help."
+msgstr ""
+
+msgid "Login to your existing XMPP account. You can also use the %s to join a groupchat."
+msgstr ""
+
+msgid "Previous"
+msgstr "قبلی"
+
+msgid "General"
+msgstr "عمومی"
+
+msgid "Advanced"
+msgstr "پیشرفته"
+
+msgid "Resource"
+msgstr "منبع"
+
+msgid "Priority"
+msgstr "اولویت"
+
+msgid "Low"
+msgstr "کم"
+
+msgid "Medium"
+msgstr "متوسط"
+
+msgid "High"
+msgstr "زیاد"
+
+msgid "Enter the groupchat you want to join and the nick you want to have. You can also go back to the %s."
+msgstr ""
+
+msgid "login page"
+msgstr "صفحهٔ واردشدن"
+
+msgid "Share this link with your friends:"
+msgstr "اشتراک این پیوند با دوستانتان:"
+
+msgid "Register a new XMPP account to join your friends on your own social cloud. That's simple!"
+msgstr ""
+
+msgid "Required"
+msgstr "مورد نیاز"
+
+msgid "You have been registered, here is your XMPP address:"
+msgstr ""
+
+msgid "Manager"
+msgstr "مدیر"
+
+msgid "Project"
+msgstr "پروژه"
+
+msgid "Encrypted"
+msgstr "رمزنگاری‌شده"
+
+msgid "Unencrypted"
+msgstr "رمزنگاری‌نشده"
+
+msgid "Where are you?"
+msgstr ""
+
+msgid "What's up with you?"
+msgstr ""
+
+msgid "Fetching the social channel..."
+msgstr ""
+
+msgid "You are synchronized with your network."
+msgstr ""
+
+msgid "Cannot send anything: you can only receive notices!"
+msgstr ""
+
+msgid "Media viewer"
+msgstr "نمایشگر رسانه"
+
+msgid "Browse"
+msgstr "جستجو"
+
+msgid "Command"
+msgstr "دستور"
+
+msgid "Subscribe"
+msgstr "تصویب‌کردن"
+
+msgid "Join"
+msgstr "وصل‌شدن"
+
+msgid "Automatic"
+msgstr "خودکار"
+
+msgid "Search"
+msgstr "جستجو"
+
+msgid "No result!"
+msgstr "بی‌نتیجه!"
+
+msgid "No notifications."
+msgstr ""
+
+msgid "would like to add you as a friend."
+msgstr "دوست دارد شما را به عنوان یک بیافزاید."
+
+msgid "would like you to join this chatroom:"
+msgstr ""
+
+msgid "Do you accept?"
+msgstr "قبول می‌کنید؟"
+
+msgid "Yes"
+msgstr "بله"
+
+msgid "No"
+msgstr "خیر"
+
+msgid "would like to get authorization."
+msgstr "دوست دارد که دسترسی بگیرد."
+
+msgid "Do you want to see the friends %s suggests you?"
+msgstr ""
+
+msgid "Submit"
+msgstr "ارائه‌کردن"
+
+msgid "Client"
+msgstr "مشتری"
+
+msgid "System"
+msgstr "سامانه"
+
+msgid "Local time"
+msgstr "زمان محلی"
+
+msgid "Comments"
+msgstr "توضیحات"
+
+msgid "User profile"
+msgstr "پروفایل کاربری"
+
+msgid "See his/her position on the globe"
+msgstr ""
+
+msgid "Confirm"
+msgstr "تأیید"
+
+msgid "anonymous mode"
+msgstr "حالت ناشناس"
+
+msgid "Groups"
+msgstr "گروه‌ها"
+
+msgid "Unclassified"
+msgstr "طبقه‌بندی‌نشده"
+
+msgid "Authorize"
+msgstr "اجازه‌دادن"
+
+msgid "Ask for authorization"
+msgstr "درخواست برای اجازه‌دادن"
+
+msgid "Unblock"
+msgstr "بازکردن"
+
+msgid "Prohibit"
+msgstr "منع‌کردن"
+
+msgid "Block"
+msgstr "بستن"
+
+msgid "Chat"
+msgstr "گفتگو"
+
+msgid "Groupchat"
+msgstr "گروه گفتگو"
+
+msgid "Jappix Mobile"
+msgstr "Jappix همراه"
+
+msgid "Desktop"
+msgstr "میزکار"
+
+msgid "Mobile"
+msgstr "گوشی همراه"
+
+msgid "Please wait..."
+msgstr "لطفاً صبرکنید..."
+
+msgid "Please enable JavaScript"
+msgstr "لطفاً جاوااسکریپت را فعال کنید"
+
+msgid "Your channel"
+msgstr "کانال شما"
+
+msgid "Channel of"
+msgstr "کانال"
+
+msgid "More notices..."
+msgstr "پیغام‌های بیشتر..."
+
+msgid "Attach a file"
+msgstr "متصل‌کردن یک پرونده"
+
+msgid "Send"
+msgstr "ارسال"
+
+msgid "Unattach the file"
+msgstr "جداکردن پرونده"
+
+msgid "An error occured while uploading your file: maybe it is too big (%s maximum) or forbidden!"
+msgstr ""
+
+msgid "Authorization failed"
+msgstr "شکست در اجازه‌گیری"
+
+msgid "Registration failed, please choose a different username"
+msgstr ""
+
+msgid "Service unavailable"
+msgstr "خدمت ناموجود است"
+
+msgid "Internal server error, try later"
+msgstr "ایراد داخلی کارساز. بعداً تلاش کنید"
+
+msgid "Your form has been sent."
+msgstr "فرم شما فرستاده شده‌است."
+
+msgid "Application"
+msgstr "برنامه"
+
+msgid "XMPP links"
+msgstr "پیوند XMPP"
+
+msgid "Open XMPP links with Jappix"
+msgstr ""
+
+msgid "changed the subject to:"
+msgstr ""
+
+msgid "Welcome!"
+msgstr ""
+
+msgid "Friends"
+msgstr ""
+
+msgid "Welcome on Jappix, your own social cloud!"
+msgstr ""
+
+msgid "Before you start using it, you will have to change some settings, search for friends and complete your profile."
+msgstr ""
+
+msgid "Enable notification sounds"
+msgstr ""
+
+msgid "Share your position on the globe"
+msgstr ""
+
+msgid "Offline friends"
+msgstr "دوستان آفلاین"
+
+msgid "Don't hide offline friends"
+msgstr "دوستان آفلاین را مخفی نکن"
+
+msgid "Use this tool to find your friends on the server you are using right now, or add them later."
+msgstr ""
+
+msgid "Great work! Now, you can share Jappix with your friends!"
+msgstr ""
+
+msgid "When you will press the save button, the profile editor will be opened. Happy socializing!"
+msgstr ""
+
+msgid "Share Jappix on %s"
+msgstr ""
+
+msgid "Using Jappix, an open social platform. I am %s!"
+msgstr ""
+
+msgid "Unknown name"
+msgstr "نام ناشناخته"
+
+msgid "Unknown country"
+msgstr "کشور ناشناخته"
+
+msgid "Click to enable"
+msgstr "کلیک برای فعال‌سازی"
+
+msgid "Click to disable"
+msgstr "کلیک برای غیرفعال‌سازی"
+
+msgid "Installation"
+msgstr "نصب"
+
+msgid "Jappix installation"
+msgstr "نصب Jappix"
+
+msgid "Welcome to the Jappix installation!"
+msgstr "به نصب Jappix خوش‌آمدید!"
+
+msgid "This tool will help you fastly install Jappix, the first full-featured XMPP-based social platform, on your server. You don't even need any technical knowledge."
+msgstr ""
+
+msgid "Let's have a look at the installation steps:"
+msgstr ""
+
+msgid "Welcome"
+msgstr "خوش‌آمدید"
+
+msgid "Storage configuration"
+msgstr "تنظیمات حافظه"
+
+msgid "Administrator account"
+msgstr "حساب مدیر"
+
+msgid "Main configuration"
+msgstr "تنظیمات اصلی"
+
+msgid "Hosts configuration"
+msgstr "تنظیمات میزبان"
+
+msgid "Services installation"
+msgstr "نصب خدمات"
+
+msgid "If the current language does not match yours (%1s), you can make Jappix speak %2s it will be saved."
+msgstr ""
+
+msgid "If you want to get some help about the Jappix installation and configuration, you can use our whole documentation, available at:"
+msgstr ""
+
+msgid "It's time to build your own social cloud: just go to the next step!"
+msgstr ""
+
+msgid "Jappix stores persistent data (such as shared files, chat logs, your own music and its configuration) into a single secured storage folder."
+msgstr ""
+
+msgid "Jappix must be able to write in this folder to create its sub-directories. If not, you must set the rights to %1s or change the folder owner to %2s (depending of your configuration)."
+msgstr ""
+
+msgid "The folder is writable, you can continue!"
+msgstr "پوشه قابل ویرایش است. می‌توانید ادامه دهید!"
+
+msgid "Jappix offers you the possibility to manage your configuration, install new addons or search for updates. That's why you must create an administrator account to access the manager."
+msgstr ""
+
+msgid "When Jappix will be installed, just click on the manager link on the home page to access it."
+msgstr ""
+
+msgid "Oops, you missed something or the two passwords do not match!"
+msgstr ""
+
+msgid "Jappix needs that you specify some values to work. Please correct the following inputs (or keep the default values, which are sufficient for most people)."
+msgstr ""
+
+msgid "Note that if you don't specify a value which is compulsory, it will be automatically completed with the default one."
+msgstr ""
+
+msgid "User"
+msgstr "کاربر"
+
+msgid "Service"
+msgstr "خدمت"
+
+msgid "Service name"
+msgstr "نام خدمت"
+
+msgid "Service description"
+msgstr "توضیح خدمت"
+
+msgid "Connection"
+msgstr "اتصال"
+
+msgid "Lock the host"
+msgstr "قفل‌کردن میزبان"
+
+msgid "Anonymous mode"
+msgstr "حالت ناشناس"
+
+msgid "Registration allowed"
+msgstr "ثبت‌نام اجازه‌داده شده‌است"
+
+msgid "Use a proxy"
+msgstr "استفاده از پراکسی"
+
+msgid "Encryption"
+msgstr "رمزنگاری"
+
+msgid "HTTPS storage"
+msgstr "انبارهٔ HTTPS"
+
+msgid "Force HTTPS"
+msgstr "HTTPS اجباری"
+
+msgid "Compression"
+msgstr "فشرده‌سازی"
+
+msgid "This page helps you specify the default hosts Jappix will connect to. You can leave it as it is and continue if you want to use the official service hosts."
+msgstr ""
+
+msgid "Maybe you don't know what a BOSH server is? In fact, this is a relay between a Jappix client and a XMPP server, which is necessary because of technical limitations."
+msgstr ""
+
+msgid "Main host"
+msgstr "میزبان اصلی"
+
+msgid "Groupchat host"
+msgstr "میزبان گفتگوی گروهی"
+
+msgid "Anonymous host"
+msgstr "میزبان ناشناس"
+
+msgid "Directory host"
+msgstr "میزبان پوشه"
+
+msgid "BOSH host"
+msgstr ""
+
+msgid "You can install some extra softwares on your server, to extend your Jappix features. Some others might be modified, because of security restrictions which are set by default."
+msgstr ""
+
+msgid "To perform this, you must be able to access your server's shell and be logged in as root. Remember this is facultative, Jappix will work without these modules, but some of its features will be unavailable."
+msgstr ""
+
+msgid "After you finished the setup, Jappix will generate the cache files. It might be slow, just wait until the application is displayed and do not press any button."
+msgstr ""
+
+msgid "Thanks for using Jappix!"
+msgstr "ممنون برای استفاده از Jappix!"
+
+msgid "Next"
+msgstr "بعدی"
+
+msgid "Finish"
+msgstr "تمام"
+
+msgid "Check again"
+msgstr "بررسی مجدد"
+
+msgid "The folder is not writable, set the right permissions to the %s directory."
+msgstr ""
+
+msgid "%s is installed on your system."
+msgstr ""
+
+msgid "%1s is not installed on your system, you should install %2s."
+msgstr ""
+
+msgid "PHP maximum upload size is sufficient (%s)."
+msgstr "حداکثر اندازهٔ بارگذاری PHP کافی است (%s)."
+
+msgid "PHP maximum upload size is not sufficient (%1s), you should define it to %2s in %3s."
+msgstr ""
+
+msgid "Jappix manager"
+msgstr "مدیریت‌کنندهٔ Jappix"
+
+msgid "Manager access"
+msgstr ""
+
+msgid "Statistics"
+msgstr "آمارها"
+
+msgid "Hosts"
+msgstr "میزبان‌ها"
+
+msgid "Design"
+msgstr "طراحی"
+
+msgid "Repeat"
+msgstr "تکرار"
+
+msgid "All"
+msgstr "همه"
+
+msgid "Horizontal"
+msgstr "افقی"
+
+msgid "Vertical"
+msgstr "عمودی"
+
+msgid "Center"
+msgstr "وسط"
+
+msgid "Left"
+msgstr "چپ"
+
+msgid "Right"
+msgstr "راست"
+
+msgid "Top"
+msgstr "بالا"
+
+msgid "Bottom"
+msgstr "زیر"
+
+msgid "Adapt"
+msgstr "تطابق"
+
+msgid "Color"
+msgstr "رنگ"
+
+msgid "Users"
+msgstr "کاربران"
+
+msgid "Updates"
+msgstr ""
+
+msgid "This is a restricted area: only the authorized users can manage this Jappix node."
+msgstr ""
+
+msgid "Please use the form below to login to the administration panel."
+msgstr ""
+
+msgid "To improve security, sessions are limited in time and when your browser will be closed, you will be logged out."
+msgstr ""
+
+msgid "Credentials"
+msgstr "اختیارات"
+
+msgid "You have been logged out. Goodbye!"
+msgstr "شما خارج شده‌اید. بدرود!"
+
+msgid "Oops, you could not be recognized as a valid administrator. Check your credentials!"
+msgstr ""
+
+msgid "Basic statistics are processed by Jappix about some important things, you can find them below."
+msgstr ""
+
+msgid "Change your Jappix node configuration with this tool."
+msgstr ""
+
+msgid "Change the XMPP hosts that this Jappix node serve with this tool."
+msgstr ""
+
+msgid "All this Jappix node stored files can be managed with this tool: please select a sub-folder and start editing its content!"
+msgstr ""
+
+msgid "Jappix is fully customisable: you can change its design right here."
+msgstr ""
+
+msgid "This is not a valid image, please use PNG, GIF or JPG!"
+msgstr ""
+
+msgid "The image could not be received, would you mind retry?"
+msgstr ""
+
+msgid "Your image was added to the list!"
+msgstr ""
+
+msgid "Changes saved!"
+msgstr "تغییرات ذخیره شد!"
+
+msgid "You can define more than one administrator for this Jappix node. You can also change a password with this tool."
+msgstr ""
+
+msgid "Update your Jappix node with this tool, or check if a new one is available. Informations about the latest version are also displayed (in english)."
+msgstr ""
+
+msgid "Access statistics"
+msgstr ""
+
+msgid "Share statistics"
+msgstr ""
+
+msgid "Other statistics"
+msgstr "سایر آمارها"
+
+msgid "January"
+msgstr "ژوئن"
+
+msgid "February"
+msgstr "فوریه"
+
+msgid "March"
+msgstr "مارس"
+
+msgid "April"
+msgstr "آوریل"
+
+msgid "May"
+msgstr "می"
+
+msgid "June"
+msgstr ""
+
+msgid "July"
+msgstr "جولای"
+
+msgid "August"
+msgstr "آگوست"
+
+msgid "September"
+msgstr "سپتامبر"
+
+msgid "October"
+msgstr "اوکتوبر"
+
+msgid "November"
+msgstr "نوامبر"
+
+msgid "December"
+msgstr "دسامبر"
+
+msgid "Monday"
+msgstr "دوشنبه"
+
+msgid "Tuesday"
+msgstr "سه‌شنبه"
+
+msgid "Wednesday"
+msgstr "چهارشتبع"
+
+msgid "Thursday"
+msgstr "پنج‌شنبه"
+
+msgid "Friday"
+msgstr "جمعه"
+
+msgid "Saturday"
+msgstr "شنبه"
+
+msgid "Sunday"
+msgstr "یک‌شنبه"
+
+msgid "Total"
+msgstr "همه"
+
+msgid "Cache"
+msgstr "میانگیر"
+
+msgid "Logs"
+msgstr "سیاهه‌ها"
+
+msgid "Music"
+msgstr "آهنگ"
+
+msgid "Backgrounds"
+msgstr "پشت‌زمینه‌ها"
+
+msgid "Share"
+msgstr "اشتراک"
+
+msgid "Background"
+msgstr "پشت‌زمینه"
+
+msgid "Notice"
+msgstr "آگهی"
+
+msgid "Your design preferences have been saved!"
+msgstr ""
+
+msgid "Please check your inputs: something is missing!"
+msgstr "لطفاً ورودی‌های خود را بررسی کنید: چیزی گم شده!"
+
+msgid "Change your Jappix node background with this tool. You can either set a custom color or an uploaded image. Let your creativity flow!"
+msgstr ""
+
+msgid "Use default background"
+msgstr "استفاده از پشت‌زمینهٔ پیش‌فرض"
+
+msgid "Use your own image"
+msgstr ""
+
+msgid "Select a background to use and change the display options."
+msgstr ""
+
+msgid "Use your own color"
+msgstr ""
+
+msgid "Type the hexadecimal color value you want to use as a background."
+msgstr ""
+
+msgid "Manage backgrounds"
+msgstr ""
+
+msgid "You can add a new background to the list with this tool. Please send a valid image."
+msgstr ""
+
+msgid "If you want to remove some backgrounds, use the browser below."
+msgstr ""
+
+msgid "Define a homepage notice for all your users, such as a warn, an important message or an advert with this tool."
+msgstr ""
+
+msgid "Simple notice"
+msgstr ""
+
+msgid "This notice only needs simple text to be displayed, but no code is allowed!"
+msgstr ""
+
+msgid "Advanced notice"
+msgstr ""
+
+msgid "You can customize your notice with embedded HTML, CSS and JavaScript, but you need to code the style."
+msgstr ""
+
+msgid "Available updates"
+msgstr ""
+
+msgid "What's new?"
+msgstr ""
+
+msgid "Your storage folders are not writable, please apply the good rights!"
+msgstr ""
+
+msgid "%1s may cause problems to the proxy, please increase %2s value up to %3s!"
+msgstr ""
+
+msgid "You are using a development version of Jappix. Update it through our repository by executing: %s."
+msgstr ""
+
+msgid "A new Jappix version is available! Check what is new and launch the update!"
+msgstr ""
+
+msgid "Your version is out to date. Update it now to %s by clicking here!"
+msgstr ""
+
+msgid "Your version seems to be up to date, but you can check updates manually by clicking here."
+msgstr ""
+
+msgid "Check for updates"
+msgstr "بررسی برای به‌روزرسانی‌ها"
+
+msgid "Update in progress"
+msgstr "به‌روزرسانی در جریان است"
+
+msgid "Jappix has been updated: you are now running the latest version. Have fun!"
+msgstr ""
+
+msgid "The update has failed! Please try again later."
+msgstr ""
+
+msgid "Downloading package..."
+msgstr "بارگیری بسته..."
+
+msgid "Removing current Jappix system files..."
+msgstr ""
+
+msgid "Extracting package..."
+msgstr "بازکردن بسته..."
+
+msgid "Regenerating storage folder tree..."
+msgstr ""
+
+msgid "Jappix is now up to date!"
+msgstr "Jappix الآن به روز است!"
+
+msgid "Aborted: socket error!"
+msgstr ""
+
+msgid "Aborted: buffer error!"
+msgstr ""
+
+msgid "Aborted: everything is not writable!"
+msgstr ""
+
+msgid "Aborted: could not extract the package!"
+msgstr ""
+
+msgid "Visits"
+msgstr "بازدیدها"
+
+msgid "Daily"
+msgstr "روزانه"
+
+msgid "Weekly"
+msgstr "هفته‌ای"
+
+msgid "Monthly"
+msgstr "ماهانه"
+
+msgid "Yearly"
+msgstr "سالانه"
+
+msgid "Size"
+msgstr "اندازه"
+
+msgid "Clean everything"
+msgstr "پاکسازی همه‌چیز"
+
+msgid "Purge cache"
+msgstr "خالی‌کردن میانگیر"
+
+msgid "Purge logs"
+msgstr "خالی‌کردن سیاهه‌ها"
+
+msgid "Purge updates"
+msgstr "خالی‌کردن به‌روزرسانی‌ها"
+
+msgid "The storage folder you wanted to clean is now empty!"
+msgstr ""
+
+msgid "Keep your Jappix node fresh and fast, clean the storage folders regularly!"
+msgstr ""
+
+msgid "Upload your music (Ogg Vorbis, MP3 or WAV) to be able to listen to it in Jappix!"
+msgstr ""
+
+msgid "The file you want to upload must be smaller than %s."
+msgstr ""
+
+msgid "Stay tuned in what your users store on your server and remove undesired content with this tool."
+msgstr ""
+
+msgid "Title"
+msgstr "عنوان"
+
+msgid "Artist"
+msgstr "عنوان"
+
+msgid "Album"
+msgstr "آلبوم"
+
+msgid "File"
+msgstr "پرونده"
+
+msgid "Upload"
+msgstr "بارگذاری"
+
+msgid "The folder is empty."
+msgstr "پوشه خالی است."
+
+msgid "The music could not be received, please retry!"
+msgstr "آهنگ نمی‌تواند گرفته شود. لطفاً مجدداً تلاش کنید!"
+
+msgid "This is not a valid music file, please encode in Ogg Vorbis, MP3 or WAV!"
+msgstr ""
+
+msgid "Your music has been added!"
+msgstr "آهنگ شما اضافه شده‌است!"
+
+msgid "The selected elements have been removed."
+msgstr "عنصر انتخاب شده حذف شد."
+
+msgid "You must select elements to remove!"
+msgstr ""
+
+msgid "Add a new user with this tool, or change a password (type an existing username). Please submit a strong password!"
+msgstr ""
+
+msgid "Manage"
+msgstr "مدیریت"
+
+msgid "List"
+msgstr "فهرست"
+
+msgid "Remove users with this tool. Note that you cannot remove an user if he is the only one remaining."
+msgstr ""
+
+msgid "The user has been added!"
+msgstr "کاربر اضافه شده‌است!"
+
+msgid "The chosen users have been removed."
+msgstr "کاربرهای انتخاب شده حذف شده‌اند."
+
+msgid "You must select one or more users to be removed!"
+msgstr ""
+
+msgid "Yesterday"
+msgstr "دیروز"
+
+msgid "%s days ago"
+msgstr "%s روز پیش"
+
+msgid "User currently active"
+msgstr "کاربر فعال در حال حاضر"
+
+msgid "Last seen: %s"
+msgstr "آخرین دیده شدن: %s"
+
+msgid "Inactive since: %s"
+msgstr "غیرفعال از: %s"
+
+msgid "Your friend seems not to have received your message(s)!"
+msgstr ""
+
+msgid "Static content server"
+msgstr "کارساز محتویات ثابت"
+
+msgid "This is the static content server for %1s, “%2s”."
+msgstr ""
+
+msgid "Suggested friends"
+msgstr "دوستان پیشنهادشده"
+
+msgid "Check all"
+msgstr "انتخاب‌کردن همه"
+
+msgid "Uncheck all"
+msgstr "از انتخاب درآوردن همه"
+
+msgid "Choose"
+msgstr "انتخاب"
+
+msgid "List name"
+msgstr "فهرست نام"
+
+msgid "Allow"
+msgstr "اجازه‌دادن"
+
+msgid "Deny"
+msgstr "ردکردن"
+
+msgid "Group"
+msgstr "گروه"
+
+msgid "Subscription"
+msgstr "اشتراک"
+
+msgid "Both"
+msgstr "هردو"
+
+msgid "From"
+msgstr "از"
+
+msgid "Everybody"
+msgstr "همه"
+
+msgid "Send messages"
+msgstr "پیام‌ها را بفرست"
+
+msgid "Send queries"
+msgstr "پرس‌وجو را بفرست"
+
+msgid "See my status"
+msgstr "وضعیت من را ببین"
+
+msgid "Send his/her status"
+msgstr "وضعیتش را بفرست"
+
+msgid "Everything"
+msgstr "همه‌چیز"
+
+msgid "Item"
+msgstr "قلم"
+
+msgid "Order"
+msgstr "ترتیب"
+
+msgid "Active for this session"
+msgstr "فعال برای این نشست"
+
+msgid "Always active"
+msgstr "همیشه فعال"
+
+msgid "User directory"
+msgstr "پوشهٔ کاربری"
+
+msgid "Search a friend"
+msgstr "جستجوی یک دوست"
+
+msgid "The feature requested is not implemented by the recipient or server and therefore cannot be processed."
+msgstr ""
+
+msgid "This is a repeat from %s"
+msgstr "این یک تکراری از %s است."
+
+msgid "Loading comments..."
+msgstr "بارگذاری توضیحات..."
+
+msgid "Type your comment here..."
+msgstr "توضیح خود را اینجا بنویسید..."
+
+msgid "Could not get the comments!"
+msgstr ""
+
+msgid "Show comments"
+msgstr "نمایش توضیحات"
+
+msgid "Send him/her a message"
+msgstr ""
+
+msgid "Start a chat with him/her"
+msgstr ""
+
+msgid "Media integration"
+msgstr ""
+
+msgid "Comments locked!"
+msgstr ""
+
+msgid "Type something you want to share with your friends..."
+msgstr ""
+
+msgid "changed his/her nickname to %s"
+msgstr "نام مستعارش را به %s تغییر داد"
+
+msgid "commented an item you follow: “%s”."
+msgstr ""
+
+msgid "Hide"
+msgstr "مخفی"
+
+msgid "liked your post: “%s”."
+msgstr ""
+
+msgid "quoted you somewhere: “%s”."
+msgstr ""
+
+msgid "published on your wall: “%s”."
+msgstr ""
+
+msgid "tagged you in a photo (%s)."
+msgstr ""
+
+msgid "tagged you in a video (%s)."
+msgstr ""
+
+msgid "Show"
+msgstr "نمایش"
+
+msgid "Need help? You'd better read our documentation page about how to fill this form!"
+msgstr ""
+
+msgid "Pubsub host"
+msgstr ""
+
+msgid "Jappix is a great social platform, that you can access wherever you are, whenever you want and communicate with whovever you want."
+msgstr ""
+
+msgid "Manager link"
+msgstr "مدیر پیوند"
+
+msgid "User uploads server"
+msgstr "کارساز بارگذاری کاربر"
+
+msgid "This is the user uploads server for %1s, “%2s”."
+msgstr ""
+
+msgid "Logo"
+msgstr ""
+
+msgid "You can set your own service logo to replace the default one. Take care of the size and the main color of each logo!"
+msgstr ""
+
+msgid "Upload each logo with the recommended maximum pixel size."
+msgstr ""
+
+msgid "This is not a valid image, please use the PNG format!"
+msgstr ""
+
+msgid "Your service logo has been successfully changed!"
+msgstr ""
+
+msgid "Your logo format must be PNG. Leave a field empty and the logo will not be changed."
+msgstr ""
+
+msgid "Remove this logo"
+msgstr ""
+
+msgid "View this logo"
+msgstr ""
+
+msgid "Send a file"
+msgstr ""
+
+msgid "Once uploaded, your friend will be prompted to download the file you sent."
+msgstr ""
+
+msgid "Groupchats to join"
+msgstr ""
+
+msgid "Purge sent files"
+msgstr ""
+
+msgid "would like to send you a file: “%s”."
+msgstr ""
+
+msgid "has accepted to received your file: “%s”."
+msgstr ""
+
+msgid "has rejected to receive your file: “%s”."
+msgstr ""
+
+msgid "could not receive your file: “%s”."
+msgstr ""
+
+msgid "has received a file exchange request: “%s”."
+msgstr ""
+
+msgid "Available shortcuts:"
+msgstr ""
+
+msgid "%s removes the chat logs"
+msgstr ""
+
+msgid "%s joins a groupchat"
+msgstr ""
+
+msgid "%s closes the chat"
+msgstr ""
+
+msgid "%s shows the user profile"
+msgstr ""
+
+msgid "%s sends a message to the room"
+msgstr ""
+
+msgid "%s changes your nickname"
+msgstr ""
+
+msgid "%s sends a message to someone in the room"
+msgstr ""
+
+msgid "%s changes the room topic"
+msgstr ""
+
+msgid "%s kicks an user of the room"
+msgstr ""
+
+msgid "%s bans an user of the room"
+msgstr ""
+
+msgid "%s invites someone to join the room"
+msgstr ""
+
+msgid "Social channel, chat and more."
+msgstr ""
+
+msgid "Create your public profile."
+msgstr ""
+
+msgid "A mini-chat for your website."
+msgstr ""
+
+msgid "Get Jappix, get support."
+msgstr ""
+
+msgid "Statistics around Jappix."
+msgstr ""
+
+msgid "Download Jappix for free."
+msgstr ""
+
+msgid "Find a public Jappix node."
+msgstr ""
+
+msgid "Public profile"
+msgstr ""
+
+msgid "Your profile anywhere on the Web."
+msgstr ""
+
+msgid "%s is a Jappix.com service which makes your XMPP profile public. It is easier to share it. No XMPP account is required to view your social channel, your current position and your contact details."
+msgstr ""
+
+msgid "Furthermore, every picture you post in your social channel is added to a beautiful picture timeline. You can now view the pictures you shared year by year."
+msgstr ""
+
+msgid "You can also use your XMPP avatar as a single avatar for every website, blog and forum you use. When you change it on XMPP, the new avatar appears everywhere. What a genious improvement!"
+msgstr ""
+
+msgid "Yay, let's create my public profile!"
+msgstr ""
+
+msgid "Enable my public profile"
+msgstr ""
+
+#~ msgid "Jappix is a non-profit social platform, that you can access wherever you are, whenever you want and communicate with whovever you want."
+#~ msgstr ""
+
+#~ msgid "See"
+#~ msgstr ""
+
+#~ msgid "Use default logo"
+#~ msgstr ""
+
+#~ msgid "Use your own logo"
+#~ msgstr ""
+
+#~ msgid "The recommended image format is PNG. Leave a field empty and the logo will not be changed."
+#~ msgstr ""
diff --git a/jappixmini/jappix/lang/fr/LC_MESSAGES/main.mo b/jappixmini/jappix/lang/fr/LC_MESSAGES/main.mo
new file mode 100644
index 00000000..7716c123
Binary files /dev/null and b/jappixmini/jappix/lang/fr/LC_MESSAGES/main.mo differ
diff --git a/jappixmini/jappix/lang/fr/LC_MESSAGES/main.po b/jappixmini/jappix/lang/fr/LC_MESSAGES/main.po
new file mode 100644
index 00000000..9ae141d3
--- /dev/null
+++ b/jappixmini/jappix/lang/fr/LC_MESSAGES/main.po
@@ -0,0 +1,1870 @@
+# French translations for Jappix package.
+# This file is distributed under the same license as the Jappix package.
+# This file was translated from CodingTeam at <http://codingteam.net/>.
+msgid ""
+msgstr ""
+"Project-Id-Version: Jappix\n"
+"PO-Revision-Date: 2012-01-16 21:26+0100\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"POT-Creation-Date: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+
+msgid "JavaScript is missing in your web browser, so that you will not be able to launch Jappix! Please fix this."
+msgstr "JavaScript est absent dans votre navigateur, vous ne pourrez donc pas lancer Jappix. Corrigez cela."
+
+msgid "An open social network"
+msgstr "Un réseau social libre"
+
+msgid "Jappix has been interrupted by a network issue, a bug or bad login (check that you entered the right credentials), sorry for the inconvenience."
+msgstr "Jappix a été interrompu par un problème réseau, un bug ou de mauvais identifiants (vérifiez-les !). Nous sommes désolés pour ce souci."
+
+msgid "The element list on this server could not be obtained!"
+msgstr "La liste des éléments présents sur ce serveur n'a pas pu être obtenue."
+
+msgid "Your password has been changed, now you can connect to your account with your new login data."
+msgstr "Votre mot de passe a été changé, vous pouvez maintenant vous connecter à votre compte avec vos nouveaux identifiants."
+
+msgid "Your XMPP account has been removed, bye!"
+msgstr "Votre compte XMPP a été effacé, au revoir !"
+
+msgid "You have been logged out of your XMPP account, have a nice day!"
+msgstr "Vous avez été déconnecté avec succès de votre compte XMPP, bonne journée !"
+
+msgid "The room you joined seems not to exist. You should create it!"
+msgstr "Le salon que vous avez rejoint semble ne pas exister. Pourquoi vous ne le créeriez pas ?"
+
+msgid "The groupchat has been removed, now someone else will be able to recreate it."
+msgstr "Le salon a été supprimé avec succès, maintenant quelqu'un d'autre pourra le recréer."
+
+msgid "The user that you want to reach is not present in the room."
+msgstr "L'utilisateur que vous souhaitez joindre n'est actuellement pas présent dans le salon."
+
+msgid "Please enter the group chat address to join."
+msgstr "Veuillez entrer l'adresse du salon à rejoindre."
+
+msgid "Please enter your nickname to join %s."
+msgstr "Veuillez entrer votre pseudonyme pour rejoindre %s."
+
+msgid "This room (%s) is protected with a password."
+msgstr "Ce salon (%s) est protégé par un mot de passe."
+
+msgid "Your browser is out of date!"
+msgstr "Votre navigateur n'est pas à jour !"
+
+msgid "Last %s version is better!"
+msgstr "La dernière version de %s est mieux !"
+
+msgid "Login"
+msgstr "Connexion"
+
+msgid "Register"
+msgstr "Inscription"
+
+msgid "Here we go!"
+msgstr "Allons-y !"
+
+msgid "Server"
+msgstr "Serveur"
+
+msgid "Password"
+msgstr "Mot de passe"
+
+msgid "Remember me"
+msgstr "Se souvenir"
+
+msgid "This tool has been disabled, you cannot use it!"
+msgstr "Cet outil a été désactivé, vous ne pouvez pas l'utiliser !"
+
+msgid "Due to a network issue, you were disconnected. What do you want to do now?"
+msgstr "À cause d'un problème réseau, vous avez été déconnecté. Que voulez-vous faire à présent ? "
+
+msgid "Reconnect"
+msgstr "Reconnexion"
+
+msgid "Messages"
+msgstr "Messages"
+
+msgid "Profile"
+msgstr "Profil"
+
+msgid "Options"
+msgstr "Préférences"
+
+msgid "Disconnect"
+msgstr "Déconnexion"
+
+msgid "Filter"
+msgstr "Filtrer"
+
+msgid "Add a friend"
+msgstr "Ajouter un ami"
+
+msgid "Your groupchats"
+msgstr "Vos salons de discussion"
+
+msgid "Manage your favorite groupchats"
+msgstr "Gérer mes salons favoris"
+
+msgid "More stuff"
+msgstr "Plus de choses"
+
+msgid "Show all friends"
+msgstr "Afficher tous les amis"
+
+msgid "Only show connected friends"
+msgstr "N'afficher que les amis en ligne"
+
+msgid "Message archives"
+msgstr "Archives des messages"
+
+msgid "Date"
+msgstr "Date"
+
+msgid "Please select a friend to view the chat history."
+msgstr "Sélectionnez un ami pour voir l'historique de discussion."
+
+msgid "Nothing found for: %s"
+msgstr "Rien de trouvé pour : %s"
+
+msgid "A short message?"
+msgstr "Un petit message ?"
+
+msgid "How are you?"
+msgstr "Comment allez-vous ?"
+
+msgid "What are you doing?"
+msgstr "Que faites-vous en ce moment ?"
+
+msgid "Join a chat"
+msgstr "Rejoindre une discussion"
+
+msgid "Status"
+msgstr "Statut"
+
+msgid "Available"
+msgstr "Disponible"
+
+msgid "Talkative"
+msgstr "Bavard(e)"
+
+msgid "Away"
+msgstr "Absent(e)"
+
+msgid "Not available"
+msgstr "Indisponible"
+
+msgid "Busy"
+msgstr "Occupé(e)"
+
+msgid "Mood"
+msgstr "Humeur"
+
+msgid "None"
+msgstr "Aucun(e)"
+
+msgid "Crazy"
+msgstr "Cinglé(e)"
+
+msgid "Excited"
+msgstr "Excité(e)"
+
+msgid "Playful"
+msgstr "Enjoué(e)"
+
+msgid "Happy"
+msgstr "Heureux(se)"
+
+msgid "Shocked"
+msgstr "Choqué(e)"
+
+msgid "Hot"
+msgstr "Bouillant(e)"
+
+msgid "Sad"
+msgstr "Triste"
+
+msgid "Amorous"
+msgstr "Amoureux(se)"
+
+msgid "Confident"
+msgstr "Confiant(e)"
+
+msgid "Activity"
+msgstr "Activité"
+
+msgid "Chores"
+msgstr "Corvées"
+
+msgid "Drinking"
+msgstr "Boit"
+
+msgid "Eating"
+msgstr "Mange"
+
+msgid "Exercising"
+msgstr "S'exerçant "
+
+msgid "Grooming"
+msgstr "Toilette"
+
+msgid "Appointment"
+msgstr "Rendez-vous"
+
+msgid "Inactive"
+msgstr "Inactif(ve)"
+
+msgid "Relaxing"
+msgstr "Se relaxe"
+
+msgid "Talking"
+msgstr "Discute"
+
+msgid "Traveling"
+msgstr "En voyage"
+
+msgid "Working"
+msgstr "Travaille"
+
+msgid "View profile"
+msgstr "Voir le profil"
+
+msgid "Repeat this notice"
+msgstr "Répéter cet avis"
+
+msgid "Remove this notice"
+msgstr "Effacer cet avis"
+
+msgid "Your profile"
+msgstr "Votre profil"
+
+msgid "Identity"
+msgstr "Identité"
+
+msgid "Profile image"
+msgstr "Photo de profil"
+
+msgid "Others"
+msgstr "Autres"
+
+msgid "Personal"
+msgstr "Personnel"
+
+msgid "Complete name"
+msgstr "Nom complet"
+
+msgid "Nickname"
+msgstr "Pseudonyme"
+
+msgid "First name"
+msgstr "Prénom"
+
+msgid "Last name"
+msgstr "Nom"
+
+msgid "Date of birth"
+msgstr "Anniversaire"
+
+msgid "Contact"
+msgstr "Coordonnées"
+
+msgid "E-mail"
+msgstr "Courriel"
+
+msgid "Phone"
+msgstr "Téléphone"
+
+msgid "Website"
+msgstr "Site web"
+
+msgid "Current"
+msgstr "Actuel"
+
+msgid "Delete"
+msgstr "Supprimer"
+
+msgid "What a pity! You have no profile image defined in your identity card!"
+msgstr "Comment ça ? Vous n'avez pas de photo de profil définie dans votre carte d'identité !"
+
+msgid "Address"
+msgstr "Adresse"
+
+msgid "Street"
+msgstr "Rue"
+
+msgid "City"
+msgstr "Ville"
+
+msgid "Postal code"
+msgstr "Code postal"
+
+msgid "Country"
+msgstr "Pays"
+
+msgid "Biography"
+msgstr "Biographie"
+
+msgid "Important notice"
+msgstr "Important"
+
+msgid "Be careful of the information you write into your profile, because it could be accessed by everyone (even someone you don't want to)."
+msgstr "Soyez prudent par rapport aux informations que vous inscrivez dans votre profil, étant donné que ceci peut être accessible de tous (même de ceux que vous ne voulez pas)."
+
+msgid "Not everything is private on XMPP; this is one of those things, your public profile (vCard)."
+msgstr "Tout n'est pas privé sur XMPP, entre autres votre profil public."
+
+msgid "It is strongly recommended to upload a profile image (%s maximum), like a picture of yourself, because that makes you easily recognizable by your friends."
+msgstr "Il est fortement recommandé de définir une photo de profil (%s maximum), par exemple une photo de vous ou une image vous représentant. Cela vous permet d'être facilement identifié par vos amis."
+
+msgid "Save"
+msgstr "Enregistrer"
+
+msgid "Cancel"
+msgstr "Annuler"
+
+msgid "Edit options"
+msgstr "Éditer les options"
+
+msgid "Channel"
+msgstr "Canal"
+
+msgid "Commands"
+msgstr "Commandes"
+
+msgid "Sounds"
+msgstr "Sons"
+
+msgid "Privacy"
+msgstr "Vie privée"
+
+msgid "Message archiving"
+msgstr "Archivage des messages"
+
+msgid "Store a history of your chats"
+msgstr "Garder un historique des conversations"
+
+msgid "Geolocation"
+msgstr "Géolocalisation"
+
+msgid "Empty"
+msgstr "Vider"
+
+msgid "Empty channel"
+msgstr "Vider le canal"
+
+msgid "Persistent"
+msgstr "Persistant"
+
+msgid "Maximum notices"
+msgstr "Avis maximum"
+
+msgid "Account"
+msgstr "Compte"
+
+msgid "Change password"
+msgstr "Changer de mot de passe"
+
+msgid "Delete account"
+msgstr "Supprimer le compte"
+
+msgid "Old"
+msgstr "Ancien"
+
+msgid "New (2 times)"
+msgstr "Nouveau (2 fois)"
+
+msgid "Continue"
+msgstr "Continuer"
+
+msgid "To"
+msgstr "À"
+
+msgid "Close"
+msgstr "Fermer"
+
+msgid "unknown"
+msgstr "inconnu(e)"
+
+msgid "Unavailable"
+msgstr "Déconnecté(e)"
+
+msgid "is now"
+msgstr "est maintenant"
+
+msgid "Please wait while your avatar is uploaded..."
+msgstr "Patientez pendant que votre avatar est envoyé..."
+
+msgid "Here it is! A new beautiful profile image!"
+msgstr "Et voilà ! Une nouvelle photo de profil !"
+
+msgid "The image file is not supported or has a bad size."
+msgstr "Le fichier image n'est pas pris en charge ou est trop gros."
+
+msgid "Reply"
+msgstr "Répondre"
+
+msgid "Error"
+msgstr "Erreur"
+
+msgid "Click here to solve the error"
+msgstr "Cliquez ici pour résoudre l'erreur"
+
+msgid "You"
+msgstr "Vous"
+
+msgid "Remove"
+msgstr "Enlever"
+
+msgid "Rename"
+msgstr "Renommer"
+
+msgid "Hi, I am %s, I would like to add you as my friend."
+msgstr "Bonjour, je suis %s, je souhaiterais vous ajouter comme ami."
+
+msgid "Smiley insertion"
+msgstr "Insertion d'émoticône"
+
+msgid "Change style"
+msgstr "Changer l'apparence"
+
+msgid "Text in bold"
+msgstr "Texte en gras"
+
+msgid "Text in italic"
+msgstr "Texte en italique"
+
+msgid "Underlined text"
+msgstr "Texte souligné"
+
+msgid "Save chat"
+msgstr "Enregistrer la discussion"
+
+msgid "Click on the following link to get the chat log, and wait. Then click again to get the file."
+msgstr "Cliquez sur le lien suivant pour obtenir l'historique de la discussion. Cliquez à nouveau pour le récupérer."
+
+msgid "This chat is empty!"
+msgstr "Cette discussion est vide !"
+
+msgid "Generate file!"
+msgstr "Générer le fichier !"
+
+msgid "Download file!"
+msgstr "Télécharger le fichier !"
+
+msgid "Clean current chat"
+msgstr "Nettoyer la discussion courante"
+
+msgid "View chat history"
+msgstr "Voir l'historique de discussion"
+
+msgid "Show user profile"
+msgstr "Afficher le profil de l'utilisateur"
+
+msgid "Add this contact to your friends"
+msgstr "Ajouter ce contact à vos amis"
+
+msgid "Add this groupchat to your favorites"
+msgstr "Ajouter ce salon à vos favoris"
+
+msgid "All tabs"
+msgstr "Tous les onglets"
+
+msgid "Close this tab"
+msgstr "Fermer cet onglet"
+
+msgid "no subject defined for this room."
+msgstr "aucun sujet défini pour ce salon."
+
+msgid "Administration panel for this room"
+msgstr "Panneau d'administration du salon"
+
+msgid "Moderators"
+msgstr "Modérateurs"
+
+msgid "Participants"
+msgstr "Participants"
+
+msgid "Visitors"
+msgstr "Visiteurs"
+
+msgid "Manage favorite rooms"
+msgstr "Gérer les salons favoris"
+
+msgid "Change favorites"
+msgstr "Modifier les favoris"
+
+msgid "Search a room"
+msgstr "Chercher un salon"
+
+msgid "Select a favorite"
+msgstr "Sélectionnez un favori"
+
+msgid "Getting the name..."
+msgstr "Obtention du nom..."
+
+msgid "Gateway"
+msgstr "Passerelle"
+
+msgid "Name"
+msgstr "Nom"
+
+msgid "Room"
+msgstr "Salon"
+
+msgid "Add"
+msgstr "Ajouter"
+
+msgid "Edit"
+msgstr "Modifier"
+
+msgid "Search a room on"
+msgstr "Rechercher un salon sur"
+
+msgid "No room found on this server."
+msgstr "Aucun salon trouvé sur ce serveur."
+
+msgid "Service discovery"
+msgstr "Découverte des services"
+
+msgid "Server to query"
+msgstr "Serveur à interroger"
+
+msgid "Sorry, but the entity didn't return any result!"
+msgstr "Désolé, mais l'entité n'a pas retourné de résultat !"
+
+msgid "Accounts"
+msgstr "Comptes"
+
+msgid "Authentications"
+msgstr "Authentifications"
+
+msgid "Automation"
+msgstr "Automatismes"
+
+msgid "Clients"
+msgstr "Clients"
+
+msgid "Collaboration"
+msgstr "Collaboration"
+
+msgid "Components"
+msgstr "Composants"
+
+msgid "Rooms"
+msgstr "Salons"
+
+msgid "Directories"
+msgstr "Annuaires"
+
+msgid "Gateways"
+msgstr "Passerelles"
+
+msgid "News"
+msgstr "Actualités"
+
+msgid "Hierarchy"
+msgstr "Hiérarchie"
+
+msgid "Proxies"
+msgstr "Proxies"
+
+msgid "Publication/Subscription"
+msgstr "Publication/Abonnement"
+
+msgid "Storage"
+msgstr "Stockage"
+
+msgid "Service offline or broken"
+msgstr "Service hors ligne ou cassé"
+
+msgid "Your inbox"
+msgstr "Votre boîte de réception"
+
+msgid "Available actions"
+msgstr "Actions disponibles"
+
+msgid "Clean"
+msgstr "Vider"
+
+msgid "New"
+msgstr "Nouveau"
+
+msgid "Received"
+msgstr "Reçus"
+
+msgid "Subject"
+msgstr "Sujet"
+
+msgid "Content"
+msgstr "Contenu"
+
+msgid "Send message"
+msgstr "Envoyer le message"
+
+msgid "Your inbox is empty."
+msgstr "Votre boîte de réception est vide."
+
+msgid "MUC administration"
+msgstr "Administration d'un MUC"
+
+msgid "You administrate this room"
+msgstr "Vous administrez ce salon"
+
+msgid "Enter new subject"
+msgstr "Entrez le nouveau sujet"
+
+msgid "Configuration"
+msgstr "Configuration"
+
+msgid "Authorizations"
+msgstr "Autorisations"
+
+msgid "Member list"
+msgstr "Liste des membres"
+
+msgid "Owner list"
+msgstr "Liste des propriétaires"
+
+msgid "Administrator list"
+msgstr "Liste des administrateurs"
+
+msgid "Outcast list"
+msgstr "Liste des bannis"
+
+msgid "Add an input"
+msgstr "Ajouter un champ"
+
+msgid "Destroy this MUC"
+msgstr "Détruire le MUC"
+
+msgid "Yes, let's do it!"
+msgstr "Oui, détruisons-le !"
+
+msgid "Your friend is paying attention to the conversation."
+msgstr "Votre ami prête attention à la conversation."
+
+msgid "Your friend is writing a message..."
+msgstr "Votre ami est en train de composer un message..."
+
+msgid "Your friend stopped writing a message."
+msgstr "Votre ami a arrêté d'écrire un message."
+
+msgid "Your friend is doing something else."
+msgstr "Votre ami fait quelque-chose d'autre."
+
+msgid "Your friend closed the chat."
+msgstr "Votre ami a quitté la conversation."
+
+msgid "Requesting this service..."
+msgstr "Requête en cours..."
+
+msgid "Loading"
+msgstr "En attente"
+
+msgid "joined the chat room"
+msgstr "a rejoint le salon"
+
+msgid "left the chat room"
+msgstr "a quitté le salon"
+
+msgid "no status"
+msgstr "aucun statut"
+
+msgid "has been kicked"
+msgstr "a été éjecté"
+
+msgid "has been banned"
+msgstr "a été banni"
+
+msgid "no reason"
+msgstr "pas de raison"
+
+msgid "Communicate with the entire world!"
+msgstr "Communiquez avec le monde entier !"
+
+msgid "It allows you to get in touch with the millions of users who currently use the XMPP network like you do with Jappix. Join the community and stay free!"
+msgstr "Entrez en contact avec les millions de personnes qui utilisent le réseau XMPP comme vous le faites avec Jappix. Rejoignez-nous et restez libre !"
+
+msgid "Hi there!"
+msgstr "Salut toi !"
+
+msgid "Welcome on %1s, “%2s”."
+msgstr "Bienvenue sur %1s, « %2s »."
+
+msgid "Login to your existing XMPP account or create a new one for free!"
+msgstr "Connectez-vous à votre compte XMPP existant ou créez-en un nouveau gratuitement !"
+
+msgid "Jappix is an open-source project from PostPro, a non-profit organization which provides us a great help."
+msgstr "Jappix est un projet libre de PostPro, une organisation à but non lucratif qui nous aide beaucoup."
+
+msgid "Login to your existing XMPP account. You can also use the %s to join a groupchat."
+msgstr "Connectez-vous à votre compte XMPP existant. Vous pouvez aussi utiliser le %s pour rejoindre un salon."
+
+msgid "Previous"
+msgstr "Précédent"
+
+msgid "General"
+msgstr "Général"
+
+msgid "Advanced"
+msgstr "Avancé"
+
+msgid "Resource"
+msgstr "Ressource"
+
+msgid "Priority"
+msgstr "Priorité"
+
+msgid "Low"
+msgstr "Bas"
+
+msgid "Medium"
+msgstr "Moyen"
+
+msgid "High"
+msgstr "Haut"
+
+msgid "Enter the groupchat you want to join and the nick you want to have. You can also go back to the %s."
+msgstr "Entrez le salon que vous voulez rejoindre ainsi que votre pseudo. Vous pouvez aussi revenir à la %s. "
+
+msgid "login page"
+msgstr "page de connexion"
+
+msgid "Share this link with your friends:"
+msgstr "Partagez ce lien avec vos amis :"
+
+msgid "Register a new XMPP account to join your friends on your own social cloud. That's simple!"
+msgstr "Créez un nouveau compte XMPP pour rejoindre vos amis sur votre propre nuage social. C'est super simple !"
+
+msgid "Required"
+msgstr "Requis"
+
+msgid "You have been registered, here is your XMPP address:"
+msgstr "Vous avez été inscrit, voici votre adresse XMPP :"
+
+msgid "Manager"
+msgstr "Gestionnaire"
+
+msgid "Project"
+msgstr "Projet"
+
+msgid "Encrypted"
+msgstr "Chiffré"
+
+msgid "Unencrypted"
+msgstr "Non chiffré"
+
+msgid "Where are you?"
+msgstr "Où êtes-vous ?"
+
+msgid "What's up with you?"
+msgstr "Quoi de neuf de votre côté ?"
+
+msgid "Fetching the social channel..."
+msgstr "Récupération du canal social..."
+
+msgid "You are synchronized with your network."
+msgstr "Vous êtes synchronisé(e) avec votre réseau."
+
+msgid "Cannot send anything: you can only receive notices!"
+msgstr "Impossible d'envoyer des avis, vous ne pouvez qu'en recevoir !"
+
+msgid "Media viewer"
+msgstr "Visualisateur de médias"
+
+msgid "Browse"
+msgstr "Parcourir"
+
+msgid "Command"
+msgstr "Commande"
+
+msgid "Subscribe"
+msgstr "Souscrire"
+
+msgid "Join"
+msgstr "Rejoindre"
+
+msgid "Automatic"
+msgstr "Automatique"
+
+msgid "Search"
+msgstr "Rechercher"
+
+msgid "No result!"
+msgstr "Aucun résultat !"
+
+msgid "No notifications."
+msgstr "Pas de notifications."
+
+msgid "would like to add you as a friend."
+msgstr "voudrait vous ajouter comme ami."
+
+msgid "would like you to join this chatroom:"
+msgstr "voudrait que vous rejoigniez ce salon :"
+
+msgid "Do you accept?"
+msgstr "Acceptez-vous ?"
+
+msgid "Yes"
+msgstr "Oui"
+
+msgid "No"
+msgstr "Non"
+
+msgid "would like to get authorization."
+msgstr "voudrait obtenir une autorisation."
+
+msgid "Do you want to see the friends %s suggests you?"
+msgstr "Voulez-vous voir les amis que %s vous suggère ?"
+
+msgid "Submit"
+msgstr "Soumettre"
+
+msgid "Client"
+msgstr "Client"
+
+msgid "System"
+msgstr "Système"
+
+msgid "Local time"
+msgstr "Heure locale"
+
+msgid "Comments"
+msgstr "Commentaires"
+
+msgid "User profile"
+msgstr "Profil de l'utilisateur"
+
+msgid "See his/her position on the globe"
+msgstr "Afficher sa position sur le globe"
+
+msgid "Confirm"
+msgstr "Confirmez"
+
+msgid "anonymous mode"
+msgstr "mode anonyme"
+
+msgid "Groups"
+msgstr "Groupes"
+
+msgid "Unclassified"
+msgstr "Non classés"
+
+msgid "Authorize"
+msgstr "Autoriser"
+
+msgid "Ask for authorization"
+msgstr "Demander l'autorisation"
+
+msgid "Unblock"
+msgstr "Débloquer"
+
+msgid "Prohibit"
+msgstr "Interdire"
+
+msgid "Block"
+msgstr "Bloquer"
+
+msgid "Chat"
+msgstr "Discussion"
+
+msgid "Groupchat"
+msgstr "Salon de discussion"
+
+msgid "Jappix Mobile"
+msgstr "Jappix Mobile"
+
+msgid "Desktop"
+msgstr "Bureau"
+
+msgid "Mobile"
+msgstr "Mobile"
+
+msgid "Please wait..."
+msgstr "Patientez..."
+
+msgid "Please enable JavaScript"
+msgstr "Veuillez activer JavaScript"
+
+msgid "Your channel"
+msgstr "Votre canal"
+
+msgid "Channel of"
+msgstr "Canal de"
+
+msgid "More notices..."
+msgstr "Plus d'avis..."
+
+msgid "Attach a file"
+msgstr "Attacher un fichier"
+
+msgid "Send"
+msgstr "Envoyer"
+
+msgid "Unattach the file"
+msgstr "Détacher le fichier"
+
+msgid "An error occured while uploading your file: maybe it is too big (%s maximum) or forbidden!"
+msgstr "Une erreur est survenue lors de l'envoi de votre fichier : il peut être trop gros (%s maximum) ou interdit ! "
+
+msgid "Authorization failed"
+msgstr "Échec de l'autorisation"
+
+msgid "Registration failed, please choose a different username"
+msgstr "Échec de l'inscription, choisissez un pseudo différent"
+
+msgid "Service unavailable"
+msgstr "Service indisponible"
+
+msgid "Internal server error, try later"
+msgstr "Erreur interne du serveur, essayez plus tard"
+
+msgid "Your form has been sent."
+msgstr "Votre formulaire a été soumis."
+
+msgid "Application"
+msgstr "Application"
+
+msgid "XMPP links"
+msgstr "Liens XMPP"
+
+msgid "Open XMPP links with Jappix"
+msgstr "Ouvrir les liens XMPP avec Jappix"
+
+msgid "changed the subject to:"
+msgstr "a changé le sujet en :"
+
+msgid "Welcome!"
+msgstr "Bienvenue !"
+
+msgid "Friends"
+msgstr "Amis"
+
+msgid "Welcome on Jappix, your own social cloud!"
+msgstr "Bienvenue sur Jappix, votre propre nuage social !"
+
+msgid "Before you start using it, you will have to change some settings, search for friends and complete your profile."
+msgstr "Avant de l'utiliser, vous aurez à changer quelques paramètres, rechercher vos amis et compléter votre profil."
+
+msgid "Enable notification sounds"
+msgstr "Activer les sons de notification"
+
+msgid "Share your position on the globe"
+msgstr "Partager votre position sur le globe"
+
+msgid "Offline friends"
+msgstr "Amis hors ligne"
+
+msgid "Don't hide offline friends"
+msgstr "Ne pas masquer les amis hors ligne"
+
+msgid "Use this tool to find your friends on the server you are using right now, or add them later."
+msgstr "Utilisez cet outil pour retrouver vos amis sur le serveur que vous utilisez, ou ajoutez-les plus tard."
+
+msgid "Great work! Now, you can share Jappix with your friends!"
+msgstr "Super boulot ! Maintenant, vous pouvez partager Jappix avec vos amis !"
+
+msgid "When you will press the save button, the profile editor will be opened. Happy socializing!"
+msgstr "Quand vous cliquerez sur le bouton d'enregistrement, l'éditeur de profil sera ouvert. Bonne socialisation !"
+
+msgid "Share Jappix on %s"
+msgstr "Partagez Jappix sur %s"
+
+msgid "Using Jappix, an open social platform. I am %s!"
+msgstr "Utilise Jappix, une plateforme sociale ouverte. Je suis %s !"
+
+msgid "Unknown name"
+msgstr "Nom inconnu"
+
+msgid "Unknown country"
+msgstr "Pays inconnu"
+
+msgid "Click to enable"
+msgstr "Cliquez pour activer"
+
+msgid "Click to disable"
+msgstr "Cliquez pour désactiver"
+
+msgid "Installation"
+msgstr "Installation"
+
+msgid "Jappix installation"
+msgstr "Installation de Jappix"
+
+msgid "Welcome to the Jappix installation!"
+msgstr "Bienvenue dans l'installation de Jappix !"
+
+msgid "This tool will help you fastly install Jappix, the first full-featured XMPP-based social platform, on your server. You don't even need any technical knowledge."
+msgstr "Cet outil vous aidera à installer rapidement Jappix, le premier réseau social complet utilisant XMPP, sur votre serveur. Vous n'avez pas besoin d'avoir de connaissances techniques particulières.."
+
+msgid "Let's have a look at the installation steps:"
+msgstr "Jetons un coup d'œil aux étapes de l'installation :"
+
+msgid "Welcome"
+msgstr "Bienvenue"
+
+msgid "Storage configuration"
+msgstr "Configuration du stockage"
+
+msgid "Administrator account"
+msgstr "Compte administrateur"
+
+msgid "Main configuration"
+msgstr "Configuration principale"
+
+msgid "Hosts configuration"
+msgstr "Configuration des hôtes"
+
+msgid "Services installation"
+msgstr "Installation des services"
+
+msgid "If the current language does not match yours (%1s), you can make Jappix speak %2s it will be saved."
+msgstr "Si la langue courante n'est pas la vôtre (%1s), vous pouvez faire parler Jappix %2s ce sera sauvegardé."
+
+msgid "If you want to get some help about the Jappix installation and configuration, you can use our whole documentation, available at:"
+msgstr "Si vous voulez obtenir de l'aide à propos de l'installation et la configuration de Jappix, vous pouvez utiliser notre documentation, disponible à :"
+
+msgid "It's time to build your own social cloud: just go to the next step!"
+msgstr "Il est temps de créer votre propre nuage social : rendez-vous à l'étape suivante !"
+
+msgid "Jappix stores persistent data (such as shared files, chat logs, your own music and its configuration) into a single secured storage folder."
+msgstr "Jappix stocke les données persistantes (comme les fichiers partagés, les historiques des discussions et sa configuration) dans un dossier de stockage sécurisé."
+
+msgid "Jappix must be able to write in this folder to create its sub-directories. If not, you must set the rights to %1s or change the folder owner to %2s (depending of your configuration)."
+msgstr "Jappix doit pouvoir écrire dans ce dossier pour y créer ses sous-répertoires. S'il ne le peut pas, vous devrez appliquer les droits à %1s ou changer le propriétaire à %2s (dépend de votre configuration)."
+
+msgid "The folder is writable, you can continue!"
+msgstr "Le dossier peut être écrit, vous pouvez continuer !"
+
+msgid "Jappix offers you the possibility to manage your configuration, install new addons or search for updates. That's why you must create an administrator account to access the manager."
+msgstr "Jappix vous offre la possibilité de gérer votre configuration, installer des nouveaux modules et rechercher des mises à jour. C'est pourquoi vous devez créer un compte administrateur pour accéder au gestionnaire."
+
+msgid "When Jappix will be installed, just click on the manager link on the home page to access it."
+msgstr "Quand Jappix sera installé, vous n'aurez qu'à cliquer sur le lien vers le gestionnaire sur la page d'accueil pour y accéder."
+
+msgid "Oops, you missed something or the two passwords do not match!"
+msgstr "Oups, vous avez oublié quelque-chose ou les deux mots de passe ne correspondent pas !"
+
+msgid "Jappix needs that you specify some values to work. Please correct the following inputs (or keep the default values, which are sufficient for most people)."
+msgstr "Jappix a besoin que vous spécifiez quelques valeurs pour qu'il fonctionne. Corrigez les champs suivants (ou conservez les valeurs par défaut, qui sont suffisantes pour la plupart des gens)."
+
+msgid "Note that if you don't specify a value which is compulsory, it will be automatically completed with the default one."
+msgstr "Notez que si vous ne spécifiez pas une valeur obligatoire, elle sera automatiquement complétée par celle par défaut."
+
+msgid "User"
+msgstr "Utilisateur"
+
+msgid "Service"
+msgstr "Service"
+
+msgid "Service name"
+msgstr "Nom du service"
+
+msgid "Service description"
+msgstr "Description du service"
+
+msgid "Connection"
+msgstr "Connexion"
+
+msgid "Lock the host"
+msgstr "Vérrouiller l'hôte"
+
+msgid "Anonymous mode"
+msgstr "Mode anonyme"
+
+msgid "Registration allowed"
+msgstr "Inscription autorisée"
+
+msgid "Use a proxy"
+msgstr "Utiliser un proxy"
+
+msgid "Encryption"
+msgstr "Chiffrement"
+
+msgid "HTTPS storage"
+msgstr "Stockage en HTTPS"
+
+msgid "Force HTTPS"
+msgstr "Forcer le HTTPS"
+
+msgid "Compression"
+msgstr "Compression"
+
+msgid "This page helps you specify the default hosts Jappix will connect to. You can leave it as it is and continue if you want to use the official service hosts."
+msgstr "Cette page vous permet de spécifier les hôtes par défaut auxquels Jappix se connectera. Vous pouvez garder les mêmes valeurs et continuer si vous souhaitez utiliser les hôtes du service officiel."
+
+msgid "Maybe you don't know what a BOSH server is? In fact, this is a relay between a Jappix client and a XMPP server, which is necessary because of technical limitations."
+msgstr "Peut-être que vous ne savez pas ce qu'est un serveur BOSH ? En fait, c'est un relai entre un client Jappix et un serveur XMPP, qui est nécessaire en raison de limitations techniques."
+
+msgid "Main host"
+msgstr "Hôte principal"
+
+msgid "Groupchat host"
+msgstr "Hôte de salons"
+
+msgid "Anonymous host"
+msgstr "Hôte anonyme"
+
+msgid "Directory host"
+msgstr "Hôte d'annuaire"
+
+msgid "BOSH host"
+msgstr "Hôte BOSH"
+
+msgid "You can install some extra softwares on your server, to extend your Jappix features. Some others might be modified, because of security restrictions which are set by default."
+msgstr "Vous pouvez installer quelques logiciels supplémentaires sur votre serveur, pour étendre les fonctionnalités de Jappix. Quelques autres pourraient être modifiés, en raison des restrictions de sécurité qui sont en place par défaut."
+
+msgid "To perform this, you must be able to access your server's shell and be logged in as root. Remember this is facultative, Jappix will work without these modules, but some of its features will be unavailable."
+msgstr "Pour réaliser cela, vous devez pouvoir accéder à la ligne de commande de votre serveur et y être connecté en tant qu'administrateur. Sachez que cela est facultatif, Jappix fonctionnera sans ces modules, mais quelques-unes de ses fonctionnalités seront indisponibles."
+
+msgid "After you finished the setup, Jappix will generate the cache files. It might be slow, just wait until the application is displayed and do not press any button."
+msgstr "Après avoir terminé l'installation, Jappix va générer les fichiers de cache. Cela pourra être lent, attendez que l'application soit affichée et ne pressez aucun bouton."
+
+msgid "Thanks for using Jappix!"
+msgstr "Merci d'utiliser Jappix !"
+
+msgid "Next"
+msgstr "Suivant"
+
+msgid "Finish"
+msgstr "Finir"
+
+msgid "Check again"
+msgstr "Vérifier à nouveau"
+
+msgid "The folder is not writable, set the right permissions to the %s directory."
+msgstr "Le dossier ne peut pas être écrit, appliquez les bonnes permissions au dossier %s."
+
+msgid "%s is installed on your system."
+msgstr "%s est installé sur votre système."
+
+msgid "%1s is not installed on your system, you should install %2s."
+msgstr "%1s n'est pas installé sur votre système, vous devriez installer %2s."
+
+msgid "PHP maximum upload size is sufficient (%s)."
+msgstr "La limite PHP de la taille à l'envoi de fichiers est suffisante (%s)."
+
+msgid "PHP maximum upload size is not sufficient (%1s), you should define it to %2s in %3s."
+msgstr "La limite PHP de la taille à l'envoi de fichiers (%1s) n'est pas suffisante, vous devriez la définir à %2s dans le %3s."
+
+msgid "Jappix manager"
+msgstr "Gestionnaire de Jappix"
+
+msgid "Manager access"
+msgstr "Accès au gestionnaire"
+
+msgid "Statistics"
+msgstr "Statistiques"
+
+msgid "Hosts"
+msgstr "Hôtes"
+
+msgid "Design"
+msgstr "Apparence"
+
+msgid "Repeat"
+msgstr "Répéter"
+
+msgid "All"
+msgstr "Tout"
+
+msgid "Horizontal"
+msgstr "Horizontal"
+
+msgid "Vertical"
+msgstr "Vertical"
+
+msgid "Center"
+msgstr "Centrer"
+
+msgid "Left"
+msgstr "Gauche"
+
+msgid "Right"
+msgstr "Droite"
+
+msgid "Top"
+msgstr "Haut"
+
+msgid "Bottom"
+msgstr "Bas"
+
+msgid "Adapt"
+msgstr "Adapter"
+
+msgid "Color"
+msgstr "Couleur"
+
+msgid "Users"
+msgstr "Utilisateurs"
+
+msgid "Updates"
+msgstr "Mises à jour"
+
+msgid "This is a restricted area: only the authorized users can manage this Jappix node."
+msgstr "Ceci est une zone à accès limité : seules les personnes autorisées peuvent gérer ce nœud Jappix."
+
+msgid "Please use the form below to login to the administration panel."
+msgstr "Utilisez le formulaire ci-dessous pour vous connecter au panneau d'administration."
+
+msgid "To improve security, sessions are limited in time and when your browser will be closed, you will be logged out."
+msgstr "Pour améliorer la sécurité, les sessions sont limitées dans le temps, et quand votre navigateur sera fermé, vous serez déconnecté."
+
+msgid "Credentials"
+msgstr "Identifiants"
+
+msgid "You have been logged out. Goodbye!"
+msgstr "Vous avez été déconnecté. Au revoir !"
+
+msgid "Oops, you could not be recognized as a valid administrator. Check your credentials!"
+msgstr "Oups, vous n'avez pas pû être reconnu comme administrateur valide. Vérifiez vos identifiants !"
+
+msgid "Basic statistics are processed by Jappix about some important things, you can find them below."
+msgstr "Des statistiques basiques sont calculées par Jappix à propos de choses relativement importantes, vous pouvez les trouver ci-dessous."
+
+msgid "Change your Jappix node configuration with this tool."
+msgstr "Modifiez la configuration de votre nœud Jappix avec cet outil."
+
+msgid "Change the XMPP hosts that this Jappix node serve with this tool."
+msgstr "Modifiez les hôtes XMPP que ce nœud Jappix peut servir avec cet outil."
+
+msgid "All this Jappix node stored files can be managed with this tool: please select a sub-folder and start editing its content!"
+msgstr "Tous les fichiers stockés de ce nœud peuvent être gérés avec cet outil : sélectionnez un sous-dossier et commencez à éditer son contenu !"
+
+msgid "Jappix is fully customisable: you can change its design right here."
+msgstr "Jappix est entièrement personnalisable : vous pouvez modifier son apparence ici-même."
+
+msgid "This is not a valid image, please use PNG, GIF or JPG!"
+msgstr "Ce n'est pas une image valide, utilisez du PNG, GIF ou JPG !"
+
+msgid "The image could not be received, would you mind retry?"
+msgstr "L'image n'a pas pû être reçue, pourriez-vous réessayer ?"
+
+msgid "Your image was added to the list!"
+msgstr "Votre image a été ajoutée à la liste !"
+
+msgid "Changes saved!"
+msgstr "Les changements ont été sauvegardés !"
+
+msgid "You can define more than one administrator for this Jappix node. You can also change a password with this tool."
+msgstr "Vous pouvez définir plus d'un administrateur pour ce nœud Jappix. Vous pouvez aussi changer un mot de passe avec cet outil."
+
+msgid "Update your Jappix node with this tool, or check if a new one is available. Informations about the latest version are also displayed (in english)."
+msgstr "Mettez à jour votre nœud Jappix avec cet outil, ou vérifiez si une nouvelle est disponible. Des informations à propos de la dernière version sont aussi affichées (en anglais)."
+
+msgid "Access statistics"
+msgstr "Statistiques des accès"
+
+msgid "Share statistics"
+msgstr "Statistiques des partages"
+
+msgid "Other statistics"
+msgstr "Autres statistiques"
+
+msgid "January"
+msgstr "Janvier"
+
+msgid "February"
+msgstr "Février"
+
+msgid "March"
+msgstr "Mars"
+
+msgid "April"
+msgstr "Avril"
+
+msgid "May"
+msgstr "Mai"
+
+msgid "June"
+msgstr "Juin"
+
+msgid "July"
+msgstr "Juillet"
+
+msgid "August"
+msgstr "Août"
+
+msgid "September"
+msgstr "Septembre"
+
+msgid "October"
+msgstr "Octobre"
+
+msgid "November"
+msgstr "Novembre"
+
+msgid "December"
+msgstr "Décembre"
+
+msgid "Monday"
+msgstr "Lundi"
+
+msgid "Tuesday"
+msgstr "Mardi"
+
+msgid "Wednesday"
+msgstr "Mercredi"
+
+msgid "Thursday"
+msgstr "Jeudi"
+
+msgid "Friday"
+msgstr "Vendredi"
+
+msgid "Saturday"
+msgstr "Samedi"
+
+msgid "Sunday"
+msgstr "Dimanche"
+
+msgid "Total"
+msgstr "Total"
+
+msgid "Cache"
+msgstr "Cache"
+
+msgid "Logs"
+msgstr "Historiques"
+
+msgid "Music"
+msgstr "Musique"
+
+msgid "Backgrounds"
+msgstr "Fonds"
+
+msgid "Share"
+msgstr "Partage"
+
+msgid "Background"
+msgstr "Fond"
+
+msgid "Notice"
+msgstr "Annonce"
+
+msgid "Your design preferences have been saved!"
+msgstr "Vos préférences d'apparence ont été enregistrées !"
+
+msgid "Please check your inputs: something is missing!"
+msgstr "Veuillez vérifier vos champs : quelque-chose manque !"
+
+msgid "Change your Jappix node background with this tool. You can either set a custom color or an uploaded image. Let your creativity flow!"
+msgstr "Changez l'apparence de votre nœud Jappix avec cet outil. Vous pouvez soit définir une couleur personnalisée, soit envoyer une image. Laissez votre créativité s'exprimer !"
+
+msgid "Use default background"
+msgstr "Utiliser le fond par défaut"
+
+msgid "Use your own image"
+msgstr "Utiliser votre propre image"
+
+msgid "Select a background to use and change the display options."
+msgstr "Sélectionnez un fond à utiliser et modifiez les options d'affichage."
+
+msgid "Use your own color"
+msgstr "Utiliser votre propre couleur"
+
+msgid "Type the hexadecimal color value you want to use as a background."
+msgstr "Entrez la valeur hexadécimale de la couleur que vous voulez utiliser comme fond."
+
+msgid "Manage backgrounds"
+msgstr "Gérer les fonds"
+
+msgid "You can add a new background to the list with this tool. Please send a valid image."
+msgstr "Vous pouvez ajouter un nouveau fond à la liste avec cet outil. Veillez à envoyer une image valide."
+
+msgid "If you want to remove some backgrounds, use the browser below."
+msgstr "Si vous voulez enlever des fonds, utilisez le navigateur ci-dessous."
+
+msgid "Define a homepage notice for all your users, such as a warn, an important message or an advert with this tool."
+msgstr "Définissez, avec cet outil, une annonce de page d'accueil pour tous vos utilisateurs, comme un avertissement, un message important ou une publicité."
+
+msgid "Simple notice"
+msgstr "Annonce simple"
+
+msgid "This notice only needs simple text to be displayed, but no code is allowed!"
+msgstr "Cette annonce ne nécessite qu'un texte simple pour être affiché, mais aucun code n'est autorisé !"
+
+msgid "Advanced notice"
+msgstr "Annonce avancée"
+
+msgid "You can customize your notice with embedded HTML, CSS and JavaScript, but you need to code the style."
+msgstr "Vous pouvez personnaliser votre annonce avec du code intégré (HTML, CSS et JS), mais vous devez coder l'apparence."
+
+msgid "Available updates"
+msgstr "Mises à jour disponibles"
+
+msgid "What's new?"
+msgstr "Quoi de nouveau ?"
+
+msgid "Your storage folders are not writable, please apply the good rights!"
+msgstr "Vos dossiers de stockage ne peuvent être écrits, pourriez-vous appliquer les bons droits ?"
+
+msgid "%1s may cause problems to the proxy, please increase %2s value up to %3s!"
+msgstr "%1s pourrait causer des problèmes au proxy, veuillez augmenter la valeur de %2s à %3s !"
+
+msgid "You are using a development version of Jappix. Update it through our repository by executing: %s."
+msgstr "Vous utilisez une version de développement de Jappix. Mettez-la à jour à travers notre dépôt en exécutant : %s. "
+
+msgid "A new Jappix version is available! Check what is new and launch the update!"
+msgstr "Une nouvelle version de Jappix est disponible ! Jetez un coup d'œil à ce qui est nouveau et lancez la mise à jour !"
+
+msgid "Your version is out to date. Update it now to %s by clicking here!"
+msgstr "Votre version n'est pas à jour. Mettez-la à niveau maintenant vers %s en cliquant ici !"
+
+msgid "Your version seems to be up to date, but you can check updates manually by clicking here."
+msgstr "Votre version semble être à jour, mais vous pouvez vérifier les mises à jour manuellement en cliquant ici."
+
+msgid "Check for updates"
+msgstr "Rechercher des mises à jour"
+
+msgid "Update in progress"
+msgstr "Mise à jour en cours"
+
+msgid "Jappix has been updated: you are now running the latest version. Have fun!"
+msgstr "Jappix a été mis à jour : vous utilisez à présent la dernière version. Amusez-vous bien !"
+
+msgid "The update has failed! Please try again later."
+msgstr "La mise à jour a échoué ! Veuillez réessayer plus tard."
+
+msgid "Downloading package..."
+msgstr "Téléchargement du paquet..."
+
+msgid "Removing current Jappix system files..."
+msgstr "Suppression des fichiers systèmes de Jappix..."
+
+msgid "Extracting package..."
+msgstr "Extraction du paquet..."
+
+msgid "Regenerating storage folder tree..."
+msgstr "Regénération de l'arbre de stockage..."
+
+msgid "Jappix is now up to date!"
+msgstr "Jappix est maintenant à jour !"
+
+msgid "Aborted: socket error!"
+msgstr "Avorté : erreur de connexion !"
+
+msgid "Aborted: buffer error!"
+msgstr "Avorté : erreur de tampon !"
+
+msgid "Aborted: everything is not writable!"
+msgstr "Avorté : tout ne peut être écrit !"
+
+msgid "Aborted: could not extract the package!"
+msgstr "Avorté : paquet impossible à extraire !"
+
+msgid "Visits"
+msgstr "Visites"
+
+msgid "Daily"
+msgstr "Quotidien"
+
+msgid "Weekly"
+msgstr "Hebdomadaire"
+
+msgid "Monthly"
+msgstr "Mensuel"
+
+msgid "Yearly"
+msgstr "Annuelle"
+
+msgid "Size"
+msgstr "Taille"
+
+msgid "Clean everything"
+msgstr "Tout nettoyer"
+
+msgid "Purge cache"
+msgstr "Purger le cache"
+
+msgid "Purge logs"
+msgstr "Purger les historiques"
+
+msgid "Purge updates"
+msgstr "Purger les mises à jour"
+
+msgid "The storage folder you wanted to clean is now empty!"
+msgstr "Le dossier de stockage que vous vouliez nettoyer est maintenant vide !"
+
+msgid "Keep your Jappix node fresh and fast, clean the storage folders regularly!"
+msgstr "Gardez votre nœud Jappix frais et rapide, nettoyez les dossiers de stockage régulièrement !"
+
+msgid "Upload your music (Ogg Vorbis, MP3 or WAV) to be able to listen to it in Jappix!"
+msgstr "Envoyez votre musique (Ogg Vorbis, MP3 ou WAV) pour pouvoir l'écouter depuis Jappix !"
+
+msgid "The file you want to upload must be smaller than %s."
+msgstr "Le fichier que vous souhaitez envoyer doit être plus petit que %s."
+
+msgid "Stay tuned in what your users store on your server and remove undesired content with this tool."
+msgstr "Restez informé de ce que vos utilisateurs stockent sur votre serveur, et supprimez le contenu indésirable avec cet outil."
+
+msgid "Title"
+msgstr "Titre"
+
+msgid "Artist"
+msgstr "Artiste"
+
+msgid "Album"
+msgstr "Album"
+
+msgid "File"
+msgstr "Fichier"
+
+msgid "Upload"
+msgstr "Envoyer"
+
+msgid "The folder is empty."
+msgstr "Le dossier est vide."
+
+msgid "The music could not be received, please retry!"
+msgstr "La musique n'a pas pû être reçue, veuillez réessayer !"
+
+msgid "This is not a valid music file, please encode in Ogg Vorbis, MP3 or WAV!"
+msgstr "Ce n'est pas un fichier musical valide, encodez-le en Ogg Vorbis, MP3 ou WAV !"
+
+msgid "Your music has been added!"
+msgstr "Votre musique a été ajoutée !"
+
+msgid "The selected elements have been removed."
+msgstr "Les éléments sélectionnés ont été enlevés."
+
+msgid "You must select elements to remove!"
+msgstr "Vous devez sélectionner des éléments à effacer !"
+
+msgid "Add a new user with this tool, or change a password (type an existing username). Please submit a strong password!"
+msgstr "Ajoutez un nouvel utilisateur avec cet outil, ou changez un mot de passe (entrez un nom d'utilisateur existant). Veillez à utiliser un mot de passe fort !"
+
+msgid "Manage"
+msgstr "Gérer"
+
+msgid "List"
+msgstr "Liste"
+
+msgid "Remove users with this tool. Note that you cannot remove an user if he is the only one remaining."
+msgstr "Supprimez des utilisateurs avec cet outil. Notez que vous ne pouvez pas supprimer un utilisateur s'il est le seul restant."
+
+msgid "The user has been added!"
+msgstr "L'utilisateur a été ajouté !"
+
+msgid "The chosen users have been removed."
+msgstr "Les utilisateurs sélectionnés ont été enlevés."
+
+msgid "You must select one or more users to be removed!"
+msgstr "Vous devez sélectionner un ou plusieurs utilisateurs à enlever !"
+
+msgid "Yesterday"
+msgstr "Hier"
+
+msgid "%s days ago"
+msgstr "Il y a %s jours"
+
+msgid "User currently active"
+msgstr "Utilisateur actuellement actif"
+
+msgid "Last seen: %s"
+msgstr "Dernièrement vu(e) : %s"
+
+msgid "Inactive since: %s"
+msgstr "Inactif depuis : %s"
+
+msgid "Your friend seems not to have received your message(s)!"
+msgstr "Votre ami(e) n'a pas l'air d'avoir reçu(e) votre/vos messages(s) !"
+
+msgid "Static content server"
+msgstr "Serveur de contenu statique"
+
+msgid "This is the static content server for %1s, “%2s”."
+msgstr "Ceci est le serveur de contenu statique pour %1s, « %2s »."
+
+msgid "Suggested friends"
+msgstr "Amis suggérés"
+
+msgid "Check all"
+msgstr "Tout cocher"
+
+msgid "Uncheck all"
+msgstr "Tout décocher"
+
+msgid "Choose"
+msgstr "Choisir"
+
+msgid "List name"
+msgstr "Nom de liste"
+
+msgid "Allow"
+msgstr "Autoriser"
+
+msgid "Deny"
+msgstr "Interdire"
+
+msgid "Group"
+msgstr "Groupe"
+
+msgid "Subscription"
+msgstr "Abonnement"
+
+msgid "Both"
+msgstr "Les deux"
+
+msgid "From"
+msgstr "De"
+
+msgid "Everybody"
+msgstr "Tout le monde"
+
+msgid "Send messages"
+msgstr "Envoyer des messages"
+
+msgid "Send queries"
+msgstr "Envoyer des requêtes"
+
+msgid "See my status"
+msgstr "Voir mon statut"
+
+msgid "Send his/her status"
+msgstr "Envoyer son statut"
+
+msgid "Everything"
+msgstr "Tout"
+
+msgid "Item"
+msgstr "Élément"
+
+msgid "Order"
+msgstr "Ordre"
+
+msgid "Active for this session"
+msgstr "Actif pour cette session"
+
+msgid "Always active"
+msgstr "Toujours actif"
+
+msgid "User directory"
+msgstr "Annuaire des utilisateurs"
+
+msgid "Search a friend"
+msgstr "Chercher un ami"
+
+msgid "The feature requested is not implemented by the recipient or server and therefore cannot be processed."
+msgstr "La fonction demandée n'est pas implémentée par l'entité de destination, et n'a donc pas pu être traitée."
+
+msgid "This is a repeat from %s"
+msgstr "C'est une répétition depuis %s"
+
+msgid "Loading comments..."
+msgstr "Chargement des commentaires..."
+
+msgid "Type your comment here..."
+msgstr "Entrez votre commentaire..."
+
+msgid "Could not get the comments!"
+msgstr "Commentaires non récupérés !"
+
+msgid "Show comments"
+msgstr "Afficher les commentaires"
+
+msgid "Send him/her a message"
+msgstr "Lui envoyer un message"
+
+msgid "Start a chat with him/her"
+msgstr "Commencer une discussion avec lui/elle"
+
+msgid "Media integration"
+msgstr "Intégration des médias"
+
+msgid "Comments locked!"
+msgstr "Commentaires verrouillés !"
+
+msgid "Type something you want to share with your friends..."
+msgstr "Entrez quelque-chose que vous souhaitez partager avec vos amis..."
+
+msgid "changed his/her nickname to %s"
+msgstr "porte %s comme nouveau pseudo"
+
+msgid "commented an item you follow: “%s”."
+msgstr "a commenté un élément que vous suivez : « %s »."
+
+msgid "Hide"
+msgstr "Masquer"
+
+msgid "liked your post: “%s”."
+msgstr "a aimé votre publication : « %s »."
+
+msgid "quoted you somewhere: “%s”."
+msgstr "vous a cité quelque-part : « %s »."
+
+msgid "published on your wall: “%s”."
+msgstr "a publié sur votre mur : « %s »."
+
+msgid "tagged you in a photo (%s)."
+msgstr "vous a marqué dans une photo (%s)."
+
+msgid "tagged you in a video (%s)."
+msgstr "vous a marqué dans une vidéo (%s)."
+
+msgid "Show"
+msgstr "Afficher"
+
+msgid "Need help? You'd better read our documentation page about how to fill this form!"
+msgstr "Besoin d'aide ? Vous feriez mieux de lire notre page de documentation à propos de comment compléter ce formulaire !"
+
+msgid "Pubsub host"
+msgstr "Hôte Pubsub"
+
+msgid "Jappix is a great social platform, that you can access wherever you are, whenever you want and communicate with whovever you want."
+msgstr "Jappix est une plateforme sociale géniale, accessible de n'importe où, n'importe quand, et qui vous permet de communiquer avec qui vous voulez. "
+
+msgid "Manager link"
+msgstr "Lien du gestionnaire"
+
+msgid "User uploads server"
+msgstr "Serveur d'envois des utilisateurs"
+
+msgid "This is the user uploads server for %1s, “%2s”."
+msgstr "Ceci est le serveur d'envois des utilisateurs pour %1s, « %2s »."
+
+msgid "Logo"
+msgstr "Logo"
+
+msgid "You can set your own service logo to replace the default one. Take care of the size and the main color of each logo!"
+msgstr "Vous pouvez appliquez votre propre logo pour votre service et ainsi remplacer celui par défaut. Faites attention à la taille et la couleur dominante de chaque logo !"
+
+msgid "Upload each logo with the recommended maximum pixel size."
+msgstr "Envoyez chaque logo avec la taille maximum en pixel que nous vous recommandons."
+
+msgid "This is not a valid image, please use the PNG format!"
+msgstr "Ce n'est pas une image valide, veuillez utiliser le format PNG !"
+
+msgid "Your service logo has been successfully changed!"
+msgstr "Le logo de votre service a été changé avec succès !"
+
+msgid "Your logo format must be PNG. Leave a field empty and the logo will not be changed."
+msgstr "Le format de votre logo doit être PNG. Laissez un champ vide et le logo correspondant ne sera pas changé."
+
+msgid "Remove this logo"
+msgstr "Supprimer ce logo"
+
+msgid "View this logo"
+msgstr "Visualiser ce logo"
+
+msgid "Send a file"
+msgstr "Envoi d'un fichier"
+
+msgid "Once uploaded, your friend will be prompted to download the file you sent."
+msgstr "Une fois envoyé, votre ami sera invité à télécharger le fichier."
+
+msgid "Groupchats to join"
+msgstr "Salons à rejoindre"
+
+msgid "Purge sent files"
+msgstr "Purger les fichiers envoyés"
+
+msgid "would like to send you a file: “%s”."
+msgstr "voudrait vous envoyer un fichier : « %s »."
+
+msgid "has accepted to received your file: “%s”."
+msgstr "a accepté de recevoir votre fichier : « %s »."
+
+msgid "has rejected to receive your file: “%s”."
+msgstr "a refusé de recevoir votre fichier : « %s »."
+
+msgid "could not receive your file: “%s”."
+msgstr "n'a pas pu recevoir votre fichier : « %s »."
+
+msgid "has received a file exchange request: “%s”."
+msgstr "a reçu une demande d'échange de fichier : « %s »."
+
+msgid "Available shortcuts:"
+msgstr "Raccourcis disponibles :"
+
+msgid "%s removes the chat logs"
+msgstr "%s efface l'historique de la discussion"
+
+msgid "%s joins a groupchat"
+msgstr "%s rejoint un salon"
+
+msgid "%s closes the chat"
+msgstr "%s ferme la discussion"
+
+msgid "%s shows the user profile"
+msgstr "%s affiche le profil de l'utilisateur"
+
+msgid "%s sends a message to the room"
+msgstr "%s envoie un message au salon"
+
+msgid "%s changes your nickname"
+msgstr "%s modifie votre pseudonyme"
+
+msgid "%s sends a message to someone in the room"
+msgstr "%s envoie un message à quelqu'un du salon"
+
+msgid "%s changes the room topic"
+msgstr "%s modifie le sujet du salon"
+
+msgid "%s kicks an user of the room"
+msgstr "%s éjecte un utilisateur du salon"
+
+msgid "%s bans an user of the room"
+msgstr "%s banni un utilisateur du salon"
+
+msgid "%s invites someone to join the room"
+msgstr "%s invite quelqu'un à rejoindre le salon"
+
+msgid "Social channel, chat and more."
+msgstr "Canal social, tchat et plus."
+
+msgid "Create your public profile."
+msgstr "Créez votre profil public."
+
+msgid "A mini-chat for your website."
+msgstr "Un mini-tchat pour votre site."
+
+msgid "Get Jappix, get support."
+msgstr "Obtenez Jappix, recevez de l'aide."
+
+msgid "Statistics around Jappix."
+msgstr "Statistiques sur Jappix."
+
+msgid "Download Jappix for free."
+msgstr "Téléchargez gratuitement Jappix."
+
+msgid "Find a public Jappix node."
+msgstr "Trouvez un nœud Jappix public."
+
+msgid "Public profile"
+msgstr "Profil public"
+
+msgid "Your profile anywhere on the Web."
+msgstr "Votre profil partout sur le Web."
+
+msgid "%s is a Jappix.com service which makes your XMPP profile public. It is easier to share it. No XMPP account is required to view your social channel, your current position and your contact details."
+msgstr "%s est un service de Jappix.com qui rend votre profil XMPP public. Il est plus facile de le partager. Aucun compte XMPP n'est requis pour voir votre canal social, votre position actuelle et vos informations de contact."
+
+msgid "Furthermore, every picture you post in your social channel is added to a beautiful picture timeline. You can now view the pictures you shared year by year."
+msgstr "De plus, chaque photo que vous publiez dans votre canal social est ajoutée à un magnifique journal de vos photos. Vous pouvez à présent voir les photos que vous avez partagées année par année."
+
+msgid "You can also use your XMPP avatar as a single avatar for every website, blog and forum you use. When you change it on XMPP, the new avatar appears everywhere. What a genious improvement!"
+msgstr "Vous pouvez aussi utiliser votre avatar XMPP comme un avatar unique pour tout site, blog et forum que vous utilisez. Quand vous le changez sur XMPP, le nouvel avatar apparaît partout. Quelle innovation géniale !"
+
+msgid "Yay, let's create my public profile!"
+msgstr "Ouais, créons mon profil public !"
+
+msgid "Enable my public profile"
+msgstr "Activer mon profil public"
+
+#~ msgid "Jappix is a non-profit social platform, that you can access wherever you are, whenever you want and communicate with whovever you want."
+#~ msgstr "Jappix est une plateforme sociale à but non lucratif, accessible n'importe où, n'importe quand pour communiquer avec qui vous voulez."
+
+#~ msgid "See"
+#~ msgstr "Voir"
+
+#~ msgid "Use default logo"
+#~ msgstr "Utiliser le logo par défaut"
+
+#~ msgid "Use your own logo"
+#~ msgstr "Utiliser votre propre logo"
+
+#~ msgid "The recommended image format is PNG. Leave a field empty and the logo will not be changed."
+#~ msgstr "Le format d'image recommandé est PNG. Laisser un champ vide ne changera pas le logo correspondant."
diff --git a/jappixmini/jappix/lang/hu/LC_MESSAGES/main.mo b/jappixmini/jappix/lang/hu/LC_MESSAGES/main.mo
new file mode 100644
index 00000000..6523744a
Binary files /dev/null and b/jappixmini/jappix/lang/hu/LC_MESSAGES/main.mo differ
diff --git a/jappixmini/jappix/lang/hu/LC_MESSAGES/main.po b/jappixmini/jappix/lang/hu/LC_MESSAGES/main.po
new file mode 100644
index 00000000..1ab5c959
--- /dev/null
+++ b/jappixmini/jappix/lang/hu/LC_MESSAGES/main.po
@@ -0,0 +1,1870 @@
+# Hungarian translations for Jappix package.
+# This file is distributed under the same license as the Jappix package.
+# This file was translated from CodingTeam at <http://codingteam.net/>.
+msgid ""
+msgstr ""
+"Project-Id-Version: Jappix\n"
+"PO-Revision-Date: 2012-01-16 21:41+0100\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"POT-Creation-Date: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+
+msgid "JavaScript is missing in your web browser, so that you will not be able to launch Jappix! Please fix this."
+msgstr "A JavaScript hiányzik a böngésződből, anélkül nem tudod használni a Jappixot! Kérlek javítsd."
+
+msgid "An open social network"
+msgstr "A nyílt szociális hálózat."
+
+msgid "Jappix has been interrupted by a network issue, a bug or bad login (check that you entered the right credentials), sorry for the inconvenience."
+msgstr "A Jappix hálózati probléma miatt megszakadt, hiba vagy rossz bejelentkezés (ellenőrízd helyesen töltötted-e ki az adatokat). Elnézést a kellemetlenségért!"
+
+msgid "The element list on this server could not be obtained!"
+msgstr "Az elemek listája ezen a szerveren nem elérhető!"
+
+msgid "Your password has been changed, now you can connect to your account with your new login data."
+msgstr "A jelszavad megváltozott. Mostmár be tudsz jelentkezni a fiókodba az új adatokkal."
+
+msgid "Your XMPP account has been removed, bye!"
+msgstr "Az XMPP fiókod törölve, szia!"
+
+msgid "You have been logged out of your XMPP account, have a nice day!"
+msgstr "Sikeresen kijelentkeztél az XMPP fiókodból, további kellemes napot!"
+
+msgid "The room you joined seems not to exist. You should create it!"
+msgstr "A szoba ahova csatlakoztál még nem létezik. Előbb létre kell hoznod!"
+
+msgid "The groupchat has been removed, now someone else will be able to recreate it."
+msgstr "A csoportos beszélgetést törölték, most valaki más létre tudja hozni."
+
+msgid "The user that you want to reach is not present in the room."
+msgstr "A felhasználó akit keresel, nincs a szobában!"
+
+msgid "Please enter the group chat address to join."
+msgstr "Kérlek add meg a csoportos beszélgetés címét a csatlakozáshoz."
+
+msgid "Please enter your nickname to join %s."
+msgstr "Adj meg egy becenevet, hogy belépj a %s szobába."
+
+msgid "This room (%s) is protected with a password."
+msgstr "Ez a szoba (%s) jelszóval védett."
+
+msgid "Your browser is out of date!"
+msgstr "A böngésződ régi, elavult."
+
+msgid "Last %s version is better!"
+msgstr "Az utolsó %s verzió jobb!"
+
+msgid "Login"
+msgstr "Bejelentkezés"
+
+msgid "Register"
+msgstr "Regisztráció"
+
+msgid "Here we go!"
+msgstr "Indulhatunk is!"
+
+msgid "Server"
+msgstr "Szerver"
+
+msgid "Password"
+msgstr "Jelszó"
+
+msgid "Remember me"
+msgstr "Emlékezz rám"
+
+msgid "This tool has been disabled, you cannot use it!"
+msgstr "Ez az eszköz le van tiltva, nem tudod használni!"
+
+msgid "Due to a network issue, you were disconnected. What do you want to do now?"
+msgstr "Hálózati hiba miatt a kapcsolat megszakadt. Most mit szeretnél tenni?"
+
+msgid "Reconnect"
+msgstr "Újrakapcsolódás"
+
+msgid "Messages"
+msgstr "Üzenetek"
+
+msgid "Profile"
+msgstr "Profil"
+
+msgid "Options"
+msgstr "Beállítások"
+
+msgid "Disconnect"
+msgstr "Kijelentkezés"
+
+msgid "Filter"
+msgstr "Szűrő"
+
+msgid "Add a friend"
+msgstr "Barát hozzáadása"
+
+msgid "Your groupchats"
+msgstr "Csoportos beszélgetéseid"
+
+msgid "Manage your favorite groupchats"
+msgstr "A kedvenc csoportos beszélgetéseid menedzselése"
+
+msgid "More stuff"
+msgstr "Több dolog"
+
+msgid "Show all friends"
+msgstr "Minden barát mutatása"
+
+msgid "Only show connected friends"
+msgstr "Csak a csatlakozott barátok mutatása"
+
+msgid "Message archives"
+msgstr "Archivált üzenetek"
+
+msgid "Date"
+msgstr "Dátum"
+
+msgid "Please select a friend to view the chat history."
+msgstr "Kérlek válassz ki egy barátot, hogy lásd a beszélgetési előzményeket"
+
+msgid "Nothing found for: %s"
+msgstr "Nem található: %s"
+
+msgid "A short message?"
+msgstr "Egy rövid üzenet?"
+
+msgid "How are you?"
+msgstr "Hogy vagy?"
+
+msgid "What are you doing?"
+msgstr "Mit csinálsz?"
+
+msgid "Join a chat"
+msgstr "Csatlakozás egy beszélgetéshez"
+
+msgid "Status"
+msgstr "Státusz"
+
+msgid "Available"
+msgstr "Elérhető"
+
+msgid "Talkative"
+msgstr "Beszédes"
+
+msgid "Away"
+msgstr "Távol"
+
+msgid "Not available"
+msgstr "Nem elérhető"
+
+msgid "Busy"
+msgstr "Elfoglalt"
+
+msgid "Mood"
+msgstr "Hangulat"
+
+msgid "None"
+msgstr "Nincs"
+
+msgid "Crazy"
+msgstr "Bolond"
+
+msgid "Excited"
+msgstr "Izgatott"
+
+msgid "Playful"
+msgstr "Játékos"
+
+msgid "Happy"
+msgstr "Boldog"
+
+msgid "Shocked"
+msgstr "Döbbent"
+
+msgid "Hot"
+msgstr "Pimasz"
+
+msgid "Sad"
+msgstr "Szomorú"
+
+msgid "Amorous"
+msgstr "Szerelmes"
+
+msgid "Confident"
+msgstr "Magabiztos"
+
+msgid "Activity"
+msgstr "Tevékenység"
+
+msgid "Chores"
+msgstr "Házimunka"
+
+msgid "Drinking"
+msgstr "Iszik"
+
+msgid "Eating"
+msgstr "Eszik"
+
+msgid "Exercising"
+msgstr "Testedzés"
+
+msgid "Grooming"
+msgstr "Szépségápolás"
+
+msgid "Appointment"
+msgstr "Találkozó"
+
+msgid "Inactive"
+msgstr "Tétlen"
+
+msgid "Relaxing"
+msgstr "Pihen"
+
+msgid "Talking"
+msgstr "Beszélgetés"
+
+msgid "Traveling"
+msgstr "Utazás"
+
+msgid "Working"
+msgstr "Dolgozik"
+
+msgid "View profile"
+msgstr "Profil megtekintése"
+
+msgid "Repeat this notice"
+msgstr "Értesítés megismétlése"
+
+msgid "Remove this notice"
+msgstr "Értesítés eltávolítása"
+
+msgid "Your profile"
+msgstr "A te profilod"
+
+msgid "Identity"
+msgstr "Személyazonosság"
+
+msgid "Profile image"
+msgstr "Profilkép"
+
+msgid "Others"
+msgstr "Mások /Egyebek"
+
+msgid "Personal"
+msgstr "Személyes"
+
+msgid "Complete name"
+msgstr "Teljes név"
+
+msgid "Nickname"
+msgstr "Felhasználónév"
+
+msgid "First name"
+msgstr "Keresztnév"
+
+msgid "Last name"
+msgstr "Vezetéknév"
+
+msgid "Date of birth"
+msgstr "Születési dátum"
+
+msgid "Contact"
+msgstr "Kapcsolat"
+
+msgid "E-mail"
+msgstr "E-mail"
+
+msgid "Phone"
+msgstr "Telefon"
+
+msgid "Website"
+msgstr "Honlap"
+
+msgid "Current"
+msgstr "Jelenlegi"
+
+msgid "Delete"
+msgstr "Töröl"
+
+msgid "What a pity! You have no profile image defined in your identity card!"
+msgstr "Milyen kár! Nincs profilkép társítva a személyi igazolványodhoz."
+
+msgid "Address"
+msgstr "Cím"
+
+msgid "Street"
+msgstr "Utca"
+
+msgid "City"
+msgstr "Város"
+
+msgid "Postal code"
+msgstr "Irányítószám"
+
+msgid "Country"
+msgstr "Ország"
+
+msgid "Biography"
+msgstr "Életrajz"
+
+msgid "Important notice"
+msgstr "Fontos értesítés"
+
+msgid "Be careful of the information you write into your profile, because it could be accessed by everyone (even someone you don't want to)."
+msgstr "Légy óvatos az információkkal amiket megadsz a profilodban, mert bárki hozzáférhet (olyan is akit lehet hogy nem akarsz)."
+
+msgid "Not everything is private on XMPP; this is one of those things, your public profile (vCard)."
+msgstr "Nem minden privát jellegű az XMPP-n, ez is egy ilyen dolog, a te publikus profilod (vCard)."
+
+msgid "It is strongly recommended to upload a profile image (%s maximum), like a picture of yourself, because that makes you easily recognizable by your friends."
+msgstr "Erősen ajánlott, hogy feltölts egy profilképet (%s maximum), mondjuk egy képet rólad, mert így a barátaid könnyebben felismernek. "
+
+msgid "Save"
+msgstr "Mentés"
+
+msgid "Cancel"
+msgstr "Mégse"
+
+msgid "Edit options"
+msgstr "Opciók szerkeztése"
+
+msgid "Channel"
+msgstr "Csatorna"
+
+msgid "Commands"
+msgstr "Parancsok"
+
+msgid "Sounds"
+msgstr "Hangok"
+
+msgid "Privacy"
+msgstr "Adatvédelem"
+
+msgid "Message archiving"
+msgstr "Üzenet archiválása"
+
+msgid "Store a history of your chats"
+msgstr "Korábbi beszélgetések tárolása"
+
+msgid "Geolocation"
+msgstr "Tartózkodási hely"
+
+msgid "Empty"
+msgstr "Üres"
+
+msgid "Empty channel"
+msgstr "Üres csatorna"
+
+msgid "Persistent"
+msgstr "Tartós"
+
+msgid "Maximum notices"
+msgstr "Maximális értesítés"
+
+msgid "Account"
+msgstr "Fiók"
+
+msgid "Change password"
+msgstr "Jelszó módosítása"
+
+msgid "Delete account"
+msgstr "Fiók törlése"
+
+msgid "Old"
+msgstr "Régi"
+
+msgid "New (2 times)"
+msgstr "Új (2-szer)"
+
+msgid "Continue"
+msgstr "Folytatás"
+
+msgid "To"
+msgstr "Címzett"
+
+msgid "Close"
+msgstr "Bezárás"
+
+msgid "unknown"
+msgstr "nem ismert"
+
+msgid "Unavailable"
+msgstr "Nem elérhető"
+
+msgid "is now"
+msgstr "most"
+
+msgid "Please wait while your avatar is uploaded..."
+msgstr "Kérlek várj amíg az avatar képed feltöltődik... "
+
+msgid "Here it is! A new beautiful profile image!"
+msgstr "Kész is! Egy szép új profilkép!"
+
+msgid "The image file is not supported or has a bad size."
+msgstr "Nem támogatott képfájl vagy túl nagy."
+
+msgid "Reply"
+msgstr "Válaszolás"
+
+msgid "Error"
+msgstr "Hiba"
+
+msgid "Click here to solve the error"
+msgstr "Kattints ide a hiba megoldásához"
+
+msgid "You"
+msgstr "Te"
+
+msgid "Remove"
+msgstr "Eltávolítás"
+
+msgid "Rename"
+msgstr "Átnevezés"
+
+msgid "Hi, I am %s, I would like to add you as my friend."
+msgstr "Szia, %s vagyok, és szeretnélek hozzáadni a barátaimhoz."
+
+msgid "Smiley insertion"
+msgstr "Hangulatjel beszúrása"
+
+msgid "Change style"
+msgstr "Stílus megváltoztatása"
+
+msgid "Text in bold"
+msgstr "Félkövér "
+
+msgid "Text in italic"
+msgstr "Dőlt"
+
+msgid "Underlined text"
+msgstr "Aláhúzott"
+
+msgid "Save chat"
+msgstr "Beszélgetés mentése"
+
+msgid "Click on the following link to get the chat log, and wait. Then click again to get the file."
+msgstr "Kattints a következő linkre, hogy megkapd a beszélgetési naplót, majd várj. Utána kattints újra a fájl mentéséhez."
+
+msgid "This chat is empty!"
+msgstr "Ez a beszélgetés üres!"
+
+msgid "Generate file!"
+msgstr "Fájl generálása!"
+
+msgid "Download file!"
+msgstr "Fájl letöltése!"
+
+msgid "Clean current chat"
+msgstr "Aktuális beszélgetés törlése"
+
+msgid "View chat history"
+msgstr "Beszélgetés előzményeinek megnézése"
+
+msgid "Show user profile"
+msgstr "Felhasználói profil megmutatása"
+
+msgid "Add this contact to your friends"
+msgstr "Ezen kapcsolat hozzáadása a barátokhoz"
+
+msgid "Add this groupchat to your favorites"
+msgstr "Csoportos beszélgetés hozzáadása a kedvencekhez"
+
+msgid "All tabs"
+msgstr "Minden lap"
+
+msgid "Close this tab"
+msgstr "Lap bezárása"
+
+msgid "no subject defined for this room."
+msgstr "nincs téma megadva ehhez a szobához."
+
+msgid "Administration panel for this room"
+msgstr "Adminisztrációs panel ehhez a szobához"
+
+msgid "Moderators"
+msgstr "Moderátorok"
+
+msgid "Participants"
+msgstr "Résztvevők"
+
+msgid "Visitors"
+msgstr "Látogatók"
+
+msgid "Manage favorite rooms"
+msgstr "Kedvenc szobák kezelése"
+
+msgid "Change favorites"
+msgstr "Kedvencek megváltoztatása"
+
+msgid "Search a room"
+msgstr "Szoba keresése"
+
+msgid "Select a favorite"
+msgstr "Kedvenc kiválasztása"
+
+msgid "Getting the name..."
+msgstr "Név megszerzése..."
+
+msgid "Gateway"
+msgstr "Átjáró"
+
+msgid "Name"
+msgstr "Név"
+
+msgid "Room"
+msgstr "Szoba"
+
+msgid "Add"
+msgstr "Hozzáad"
+
+msgid "Edit"
+msgstr "Szerkesztés"
+
+msgid "Search a room on"
+msgstr "Szoba keresése a"
+
+msgid "No room found on this server."
+msgstr "Ezen a szerveren nincs ilyen szoba"
+
+msgid "Service discovery"
+msgstr "Szolgáltatás megismerése"
+
+msgid "Server to query"
+msgstr "Szerver lekérdezése"
+
+msgid "Sorry, but the entity didn't return any result!"
+msgstr "Bocs, de lekérdezés nem hozott eredményt!"
+
+msgid "Accounts"
+msgstr "Fiókok"
+
+msgid "Authentications"
+msgstr "Hitelesítések"
+
+msgid "Automation"
+msgstr "Automatikusan"
+
+msgid "Clients"
+msgstr "Kliensek"
+
+msgid "Collaboration"
+msgstr "Együttműködés"
+
+msgid "Components"
+msgstr "Komponensek"
+
+msgid "Rooms"
+msgstr "Szobák"
+
+msgid "Directories"
+msgstr "Könyvtárak"
+
+msgid "Gateways"
+msgstr "Átjárók"
+
+msgid "News"
+msgstr "Hírek"
+
+msgid "Hierarchy"
+msgstr "Hierarchia"
+
+msgid "Proxies"
+msgstr "Proxik"
+
+msgid "Publication/Subscription"
+msgstr "Publikációk/Feliratkozások"
+
+msgid "Storage"
+msgstr "Tároló"
+
+msgid "Service offline or broken"
+msgstr "A szolgáltatás nem elérhető, vagy lezárt"
+
+msgid "Your inbox"
+msgstr "Postaládád"
+
+msgid "Available actions"
+msgstr "Elérhető műveletek"
+
+msgid "Clean"
+msgstr "Tisztít"
+
+msgid "New"
+msgstr "Új"
+
+msgid "Received"
+msgstr "Fogadott"
+
+msgid "Subject"
+msgstr "Tárgy"
+
+msgid "Content"
+msgstr "Tartalom"
+
+msgid "Send message"
+msgstr "Üzenet küldése"
+
+msgid "Your inbox is empty."
+msgstr "A bejövő fiókod üres"
+
+msgid "MUC administration"
+msgstr "MUC adminisztráció"
+
+msgid "You administrate this room"
+msgstr "Te adminisztrálod ezt a szobát"
+
+msgid "Enter new subject"
+msgstr "Írd be a témát"
+
+msgid "Configuration"
+msgstr "Testreszabás"
+
+msgid "Authorizations"
+msgstr "Engedélyek"
+
+msgid "Member list"
+msgstr "Tag lista"
+
+msgid "Owner list"
+msgstr "Tulajdonos lista"
+
+msgid "Administrator list"
+msgstr "Adminisztrátor lista"
+
+msgid "Outcast list"
+msgstr "Letiltottak listája"
+
+msgid "Add an input"
+msgstr "Bemenet hozzáadása"
+
+msgid "Destroy this MUC"
+msgstr "MUC elpusztítása"
+
+msgid "Yes, let's do it!"
+msgstr "Igen, csináljuk!"
+
+msgid "Your friend is paying attention to the conversation."
+msgstr "A barátod figyelemmel kíséri a beszélgetést."
+
+msgid "Your friend is writing a message..."
+msgstr "A barátod épp ír neked…"
+
+msgid "Your friend stopped writing a message."
+msgstr "A barátod abbahagyta az üzenet írását."
+
+msgid "Your friend is doing something else."
+msgstr "A barátod valami mást csinál."
+
+msgid "Your friend closed the chat."
+msgstr "A barátod bezárta a beszélgetést."
+
+msgid "Requesting this service..."
+msgstr "Szolgáltatás kérése..."
+
+msgid "Loading"
+msgstr "Betöltés"
+
+msgid "joined the chat room"
+msgstr "csatlakozás a szobához"
+
+msgid "left the chat room"
+msgstr "a szoba elhagyása"
+
+msgid "no status"
+msgstr "nincs státusz"
+
+msgid "has been kicked"
+msgstr "kirúgva"
+
+msgid "has been banned"
+msgstr "kitiltva"
+
+msgid "no reason"
+msgstr "Nincs ok"
+
+msgid "Communicate with the entire world!"
+msgstr "Kommunikálj az egész világgal!"
+
+msgid "It allows you to get in touch with the millions of users who currently use the XMPP network like you do with Jappix. Join the community and stay free!"
+msgstr "Segít, hogy kapcsolatban maradj emberek millióival akik az XMPP hálózatot használják, mint ahogy te is tudod a Jappix-el. Csatlakozz a közösséghez és maradj szabad!"
+
+msgid "Hi there!"
+msgstr "Szia!"
+
+msgid "Welcome on %1s, “%2s”."
+msgstr "Üdvözöljük %1son, “%2s”."
+
+msgid "Login to your existing XMPP account or create a new one for free!"
+msgstr "Jelentkezz be az XMPP fiókodba, vagy csinálj egy újat ingyen!"
+
+msgid "Jappix is an open-source project from PostPro, a non-profit organization which provides us a great help."
+msgstr "A Jappix egy nyílt-forrású projekt a PostPro-tól, egy non-profit szervezettől ami nagy segítséggel van a számunkra."
+
+msgid "Login to your existing XMPP account. You can also use the %s to join a groupchat."
+msgstr "Jelentkezz be az XMPP fiókodba. Használhatod a %s -t is, hogy csatlakozz egy csoportos beszélgetéshez."
+
+msgid "Previous"
+msgstr "Előző"
+
+msgid "General"
+msgstr "Általános"
+
+msgid "Advanced"
+msgstr "Haladó"
+
+msgid "Resource"
+msgstr "Forrás"
+
+msgid "Priority"
+msgstr "Prioritás"
+
+msgid "Low"
+msgstr "Alacsony"
+
+msgid "Medium"
+msgstr "Közepes"
+
+msgid "High"
+msgstr "Magas"
+
+msgid "Enter the groupchat you want to join and the nick you want to have. You can also go back to the %s."
+msgstr "Add meg a csoportos beszélgetést amihez csatlakozni szeretnél és felhasználó nevet amit szeretnél. Vissza is tudsz menni a %s -hez."
+
+msgid "login page"
+msgstr "bejelentkezés oldal"
+
+msgid "Share this link with your friends:"
+msgstr "Link megosztása a barátaiddal"
+
+msgid "Register a new XMPP account to join your friends on your own social cloud. That's simple!"
+msgstr "Regisztrálj egy új XMPP fiókot, hogy csatlakozz a barátaidhoz a saját szociális felhődben. Ez egyszerű!"
+
+msgid "Required"
+msgstr "Szükséges"
+
+msgid "You have been registered, here is your XMPP address:"
+msgstr "Sikeresen regisztráltál, ez az XMPP címed:"
+
+msgid "Manager"
+msgstr "Menedzser"
+
+msgid "Project"
+msgstr "Projekt"
+
+msgid "Encrypted"
+msgstr "Titkosított"
+
+msgid "Unencrypted"
+msgstr "Titkosítatlan"
+
+msgid "Where are you?"
+msgstr "Hol vagy?"
+
+msgid "What's up with you?"
+msgstr "Mi a helyzet veled?"
+
+msgid "Fetching the social channel..."
+msgstr "Szociális csatorna hozzáadása..."
+
+msgid "You are synchronized with your network."
+msgstr "Szinkronizálva vagy a hálózatoddal."
+
+msgid "Cannot send anything: you can only receive notices!"
+msgstr "Nem lehet küldeni semmit: csak fogadni tudsz!"
+
+msgid "Media viewer"
+msgstr "Média néző"
+
+msgid "Browse"
+msgstr "Tallózás"
+
+msgid "Command"
+msgstr "Parancs"
+
+msgid "Subscribe"
+msgstr "Feliratkozás"
+
+msgid "Join"
+msgstr "Egyesít"
+
+msgid "Automatic"
+msgstr "Automatikus"
+
+msgid "Search"
+msgstr "Keresés"
+
+msgid "No result!"
+msgstr "Nincs találat!"
+
+msgid "No notifications."
+msgstr "Nincs értesítés."
+
+msgid "would like to add you as a friend."
+msgstr "hozzá szeretne téged adni barátként"
+
+msgid "would like you to join this chatroom:"
+msgstr "szeretné hogy csatlakozz ehhez a szobához:"
+
+msgid "Do you accept?"
+msgstr "Elfogadod?"
+
+msgid "Yes"
+msgstr "Igen"
+
+msgid "No"
+msgstr "Nem"
+
+msgid "would like to get authorization."
+msgstr "szeretne engedélyt szeretne kapni."
+
+msgid "Do you want to see the friends %s suggests you?"
+msgstr "Akarod-e látni azokat a barátokat, akiket %s ajáln?"
+
+msgid "Submit"
+msgstr "Küldés"
+
+msgid "Client"
+msgstr "Kliens"
+
+msgid "System"
+msgstr "Rendszer"
+
+msgid "Local time"
+msgstr "Helyi idő"
+
+msgid "Comments"
+msgstr "Hozzászólások"
+
+msgid "User profile"
+msgstr "Felhasználói profil"
+
+msgid "See his/her position on the globe"
+msgstr "Megnézem a pozícióját a földgömbön."
+
+msgid "Confirm"
+msgstr "Megerősítés"
+
+msgid "anonymous mode"
+msgstr "Névtelen mód"
+
+msgid "Groups"
+msgstr "Csoportok"
+
+msgid "Unclassified"
+msgstr "Osztályozatlan"
+
+msgid "Authorize"
+msgstr "Engedélyez"
+
+msgid "Ask for authorization"
+msgstr "Kérés engedélyezésre"
+
+msgid "Unblock"
+msgstr "Felold"
+
+msgid "Prohibit"
+msgstr "Tiltás"
+
+msgid "Block"
+msgstr "Lezár"
+
+msgid "Chat"
+msgstr "Beszélgetés"
+
+msgid "Groupchat"
+msgstr "Csoportos beszélgetés"
+
+msgid "Jappix Mobile"
+msgstr "Jappix Mobil"
+
+msgid "Desktop"
+msgstr "Asztal"
+
+msgid "Mobile"
+msgstr "Mobil"
+
+msgid "Please wait..."
+msgstr "Kérlek várj..."
+
+msgid "Please enable JavaScript"
+msgstr "Kérlek engedélyezd a JavaScript-et"
+
+msgid "Your channel"
+msgstr "A te csatornád"
+
+msgid "Channel of"
+msgstr "Csatornája "
+
+msgid "More notices..."
+msgstr "Mégtöbb értesítés... "
+
+msgid "Attach a file"
+msgstr "Fájl csatolása"
+
+msgid "Send"
+msgstr "Küldés"
+
+msgid "Unattach the file"
+msgstr "Fájlcsatolás törlése"
+
+msgid "An error occured while uploading your file: maybe it is too big (%s maximum) or forbidden!"
+msgstr "Hiba történt a fájl feltöltése közben: talán túl nagy (%s maximum) vagy le van tiltva."
+
+msgid "Authorization failed"
+msgstr "Engedélyezési hiba"
+
+msgid "Registration failed, please choose a different username"
+msgstr "A regisztráció nem sikerült, kérlek válassz másik felhasználónevet."
+
+msgid "Service unavailable"
+msgstr "A szolgáltatás nem elérhető"
+
+msgid "Internal server error, try later"
+msgstr "Belső szerver hiba, kérlek próbáld újra később"
+
+msgid "Your form has been sent."
+msgstr "Az űrlapod elküldve."
+
+msgid "Application"
+msgstr "Alkalmazás"
+
+msgid "XMPP links"
+msgstr "XMPP linkek"
+
+msgid "Open XMPP links with Jappix"
+msgstr "XMPP linkek megnyitása Jappix-el"
+
+msgid "changed the subject to:"
+msgstr "tárgy megváltoztatása erre:"
+
+msgid "Welcome!"
+msgstr "Üdvözöljük!"
+
+msgid "Friends"
+msgstr "Barátok"
+
+msgid "Welcome on Jappix, your own social cloud!"
+msgstr "Üdvözlünk a Jappix-en, a saját szociális felhődben!"
+
+msgid "Before you start using it, you will have to change some settings, search for friends and complete your profile."
+msgstr "Mielőtt elkezdenéd használni, meg kell változtatnod néhány beállítást, keresned kell barátokat és kitöltened a profilodat."
+
+msgid "Enable notification sounds"
+msgstr "Értesítési hangok engedélyezése."
+
+msgid "Share your position on the globe"
+msgstr "Pozícióm megosztása a földgömbön"
+
+msgid "Offline friends"
+msgstr "Kijelentkezett barátok"
+
+msgid "Don't hide offline friends"
+msgstr "Ne rejtse el a kijelentkezett barátokat"
+
+msgid "Use this tool to find your friends on the server you are using right now, or add them later."
+msgstr "Használd ezt az eszközt hogy megtaláld a barátaidat a szerveren amit most használsz, vagy add hozzá őket később."
+
+msgid "Great work! Now, you can share Jappix with your friends!"
+msgstr "Nagyszerű! Most már meg tudod osztani a Jappix-et a barátaiddal!"
+
+msgid "When you will press the save button, the profile editor will be opened. Happy socializing!"
+msgstr "Ha megnyomod a mentés gombot,  meg fog nyílni a profil szerkesztő. Jó szocializálódást!"
+
+msgid "Share Jappix on %s"
+msgstr "A Jappix megosztása a %s -en."
+
+msgid "Using Jappix, an open social platform. I am %s!"
+msgstr "Jappix-et, egy nyílt szociális platformot használok. %s vagyok!"
+
+msgid "Unknown name"
+msgstr "Ismeretlen név"
+
+msgid "Unknown country"
+msgstr "Ismeretlen ország"
+
+msgid "Click to enable"
+msgstr "Kattints az engedélyezéshez."
+
+msgid "Click to disable"
+msgstr "Kattints az elutasításhoz"
+
+msgid "Installation"
+msgstr "Telepítés"
+
+msgid "Jappix installation"
+msgstr "Jappix telepítése"
+
+msgid "Welcome to the Jappix installation!"
+msgstr "Üdvözöljük a Jappix telepítésében!"
+
+msgid "This tool will help you fastly install Jappix, the first full-featured XMPP-based social platform, on your server. You don't even need any technical knowledge."
+msgstr "Ez az eszköz segít gyorsan telepíteni a Jappix-et, az első teljes értékű XMPP alapú szociális platformot a szerveredre. Nincs szükséged semmilyen technikai tudásra."
+
+msgid "Let's have a look at the installation steps:"
+msgstr "Nézzük, mik a telepítés lépései:"
+
+msgid "Welcome"
+msgstr "Üdvözöljük"
+
+msgid "Storage configuration"
+msgstr "Tároló konfigurálása"
+
+msgid "Administrator account"
+msgstr "Adminisztrációs fiók"
+
+msgid "Main configuration"
+msgstr "Fő beállítások"
+
+msgid "Hosts configuration"
+msgstr "Kiszolgáló konfiguráció"
+
+msgid "Services installation"
+msgstr "Szolgáltatás telepítés"
+
+msgid "If the current language does not match yours (%1s), you can make Jappix speak %2s it will be saved."
+msgstr "Ha az aktuális nyelv nem egyezik a tiéddel (%1s), át tudod állítani a Jappix-et hogy %2s beszéljen."
+
+msgid "If you want to get some help about the Jappix installation and configuration, you can use our whole documentation, available at:"
+msgstr "Ha problémád van a Jappix telepítésével és konfigurálásával, megnézheted a dokumentációt ami elérhető itt:"
+
+msgid "It's time to build your own social cloud: just go to the next step!"
+msgstr "Itt az idő létrehozni a saját szociális felhődet, kezd az első lépéssel!"
+
+msgid "Jappix stores persistent data (such as shared files, chat logs, your own music and its configuration) into a single secured storage folder."
+msgstr "A Jappix tárolja az állandó adatokat (mint a megosztott fájlok, beszélgetések naplózásai, saját zenék és konfigurációk), egy egyedi, biztosított mappában."
+
+msgid "Jappix must be able to write in this folder to create its sub-directories. If not, you must set the rights to %1s or change the folder owner to %2s (depending of your configuration)."
+msgstr "A Jappix-nak tudnia kell írni ebbe a mappába, hogy létre tudjon hozni almappákat. Ha nem tud, be kell állítanod az írási jogot %1s vagy megváltoztatni a mappa tulajdonosát %2s -re (a konfigurációdtól függően)."
+
+msgid "The folder is writable, you can continue!"
+msgstr "A mappa írható, már folytathatod!"
+
+msgid "Jappix offers you the possibility to manage your configuration, install new addons or search for updates. That's why you must create an administrator account to access the manager."
+msgstr "Jappix felajánlja a lehetőséget, hogy menedzseld a konfigurációd, telepíts új kiegészítőket, vagy keress frissítéseket. Ezért kell létrehoznod egy adminisztrátori fiókot, hogy hozzáférj ezekhez a beállításokhoz."
+
+msgid "When Jappix will be installed, just click on the manager link on the home page to access it."
+msgstr "Ha telepítetted a Jappix-et, csak kattints a menedzser linkre a főoldalon, hogy hozzáférj."
+
+msgid "Oops, you missed something or the two passwords do not match!"
+msgstr "Oppá, valamit elírtál, vagy a két jelszó nem egyezik!"
+
+msgid "Jappix needs that you specify some values to work. Please correct the following inputs (or keep the default values, which are sufficient for most people)."
+msgstr "A Jappixnak szüksége van pár érték beállítására. Kérlek korrigáld az alábbi bemeneteket (vagy tartsd meg az alapértelmezetteket, amik a legtöbb ember számára ajánlottak)."
+
+msgid "Note that if you don't specify a value which is compulsory, it will be automatically completed with the default one."
+msgstr "Jegyezd meg, hogy ha nem adod meg a kötelező adatokat, akkor automatikusan ki lesznek töltve egy alapértelmezettel."
+
+msgid "User"
+msgstr "Felhasználó"
+
+msgid "Service"
+msgstr "Szolgáltatás"
+
+msgid "Service name"
+msgstr "Szolgáltatás neve"
+
+msgid "Service description"
+msgstr "Szolgáltatás leírása"
+
+msgid "Connection"
+msgstr "Kapcsolat"
+
+msgid "Lock the host"
+msgstr "Gazda lezárása"
+
+msgid "Anonymous mode"
+msgstr "Névtelen mód"
+
+msgid "Registration allowed"
+msgstr "Regisztráció engedélyezve"
+
+msgid "Use a proxy"
+msgstr "Proxy használata"
+
+msgid "Encryption"
+msgstr "Titkosítás"
+
+msgid "HTTPS storage"
+msgstr "HTTPS tároló"
+
+msgid "Force HTTPS"
+msgstr "HTTPS erőltetése"
+
+msgid "Compression"
+msgstr "Tömörítés"
+
+msgid "This page helps you specify the default hosts Jappix will connect to. You can leave it as it is and continue if you want to use the official service hosts."
+msgstr "Ez az oldal segít beállítani, hogy melyik kiszolgálóhoz fog csatlakozni a Jappix.  Így is hagyhatod a beállításokat ha a hivatalos kiszolgálót szeretnéd használni."
+
+msgid "Maybe you don't know what a BOSH server is? In fact, this is a relay between a Jappix client and a XMPP server, which is necessary because of technical limitations."
+msgstr "Nem tudod mi az a BOSH szerver? Ez egy továbbító a Jappix kliens és az XMPP szerver között, ami a technikai korlátok miatt szükséges."
+
+msgid "Main host"
+msgstr "Fő kiszolgáló"
+
+msgid "Groupchat host"
+msgstr "Csoportos beszélgetés kiszolgálója"
+
+msgid "Anonymous host"
+msgstr "Névtelenségi kiszolgáló"
+
+msgid "Directory host"
+msgstr "Címtár kiszolgáló"
+
+msgid "BOSH host"
+msgstr "BOSH kiszolgáló"
+
+msgid "You can install some extra softwares on your server, to extend your Jappix features. Some others might be modified, because of security restrictions which are set by default."
+msgstr "Telepíthetsz néhány extra szoftvert is a szerveredre, hogy kiterjeszd a felhasználói élményt. Néhányat esetleg módosíthatnak a biztonsági korlátozások miatt."
+
+msgid "To perform this, you must be able to access your server's shell and be logged in as root. Remember this is facultative, Jappix will work without these modules, but some of its features will be unavailable."
+msgstr "Hogy végrehajtsd ezt hozzá kell férned a szerver héjához és root-ként kell bejelentkezned. Ne felejtsd hogy ez fakultatív, a Jappix működik ezek nélkül a modulok nélkül, de néhány eleme elérhetetlen lehet."
+
+msgid "After you finished the setup, Jappix will generate the cache files. It might be slow, just wait until the application is displayed and do not press any button."
+msgstr "Telepítés után a Jappix ideiglenes állományokat hoz létre. Ez eltarthat egy ideig, addig ne nyomj semmilyen gombra."
+
+msgid "Thanks for using Jappix!"
+msgstr "Köszönjük, hogy a Jappix-ot használtad!"
+
+msgid "Next"
+msgstr "Következő"
+
+msgid "Finish"
+msgstr "Vége"
+
+msgid "Check again"
+msgstr "Ellenőrzés újra"
+
+msgid "The folder is not writable, set the right permissions to the %s directory."
+msgstr "A mappa nem írható, Állítsd be a jogosultságokat %s mappán."
+
+msgid "%s is installed on your system."
+msgstr "%s telepítve van a rendszereden."
+
+msgid "%1s is not installed on your system, you should install %2s."
+msgstr "%1s nincs telepítve a rendszereden, telepítsd %2s-t."
+
+msgid "PHP maximum upload size is sufficient (%s)."
+msgstr "PHP maximum feltöltési méret kielégítő (%s)."
+
+msgid "PHP maximum upload size is not sufficient (%1s), you should define it to %2s in %3s."
+msgstr "PHP maximum feltöltési méret nem kielégítő (%1s), definiáld %2s és %3s közé."
+
+msgid "Jappix manager"
+msgstr "Jappix menedzser"
+
+msgid "Manager access"
+msgstr "Menedzser hozzáférés"
+
+msgid "Statistics"
+msgstr "Statisztikák"
+
+msgid "Hosts"
+msgstr "Kiszolgálók"
+
+msgid "Design"
+msgstr "Formatervezés"
+
+msgid "Repeat"
+msgstr "Ismétlés"
+
+msgid "All"
+msgstr "Minden"
+
+msgid "Horizontal"
+msgstr "Vízszintes"
+
+msgid "Vertical"
+msgstr "Függőleges"
+
+msgid "Center"
+msgstr "Középre"
+
+msgid "Left"
+msgstr "Balra"
+
+msgid "Right"
+msgstr "Jobbra"
+
+msgid "Top"
+msgstr "Fent"
+
+msgid "Bottom"
+msgstr "Lent"
+
+msgid "Adapt"
+msgstr "Adaptálás"
+
+msgid "Color"
+msgstr "Szín"
+
+msgid "Users"
+msgstr "Felhasználók"
+
+msgid "Updates"
+msgstr "Frissítések"
+
+msgid "This is a restricted area: only the authorized users can manage this Jappix node."
+msgstr "Ez egy korlátozott régió: csak a kijelölt felhasználók tudják menedzselni ezeket a Jappix opciókat."
+
+msgid "Please use the form below to login to the administration panel."
+msgstr "Kérlek használd az alábbi formát hogy bejelentkezz az adminisztrációs panelre."
+
+msgid "To improve security, sessions are limited in time and when your browser will be closed, you will be logged out."
+msgstr "A biztonság érdekében a kapcsolat időben limitált, és ha bezárod a böngésződ, ki leszel jelentkeztetve. "
+
+msgid "Credentials"
+msgstr "Azonosítók"
+
+msgid "You have been logged out. Goodbye!"
+msgstr "Sikeresen kijelentkeztél. Viszlát!"
+
+msgid "Oops, you could not be recognized as a valid administrator. Check your credentials!"
+msgstr "Oppá, nem ismertünk fel, mint érvényes adminisztrátort. Nézd meg az azonosítóid!"
+
+msgid "Basic statistics are processed by Jappix about some important things, you can find them below."
+msgstr "Jappix feldolgozza az alapvető statisztikákat néhány fontos dologról, lejjebb megtalálod őket."
+
+msgid "Change your Jappix node configuration with this tool."
+msgstr "Változtasd meg a Jappix csomóponti konfigurációit ezzel az eszközzel."
+
+msgid "Change the XMPP hosts that this Jappix node serve with this tool."
+msgstr "Változtasd meg az XMPP kiszolgálókat a Jappix csomópont szerveren ezzel az eszközzel."
+
+msgid "All this Jappix node stored files can be managed with this tool: please select a sub-folder and start editing its content!"
+msgstr "Az összes Jappix csomópont által tárolt fájl menedzselhető ezzel az eszközzel: kérlek válassz ki egy almappát és kezdheted szerkeszteni a tartalmát!"
+
+msgid "Jappix is fully customisable: you can change its design right here."
+msgstr "A Jappix teljesen testre szabható: itt meg tudod változtatni a kinézetét."
+
+msgid "This is not a valid image, please use PNG, GIF or JPG!"
+msgstr "Nem érvényes képformátum, kérlek használj PNG, GIF, vagy JPG képet!"
+
+msgid "The image could not be received, would you mind retry?"
+msgstr "A képet nem tudtuk fogadni, szeretnéd megpróbálni újra?"
+
+msgid "Your image was added to the list!"
+msgstr "A képed hozzá lett adva a listához!"
+
+msgid "Changes saved!"
+msgstr "Változtatások elmentve!"
+
+msgid "You can define more than one administrator for this Jappix node. You can also change a password with this tool."
+msgstr "Ehhez a Jappix csomóponthoz több adminisztrátort is tudsz definiálni. Ezzel az eszközzel jelszót is tudsz változtatni."
+
+msgid "Update your Jappix node with this tool, or check if a new one is available. Informations about the latest version are also displayed (in english)."
+msgstr "Frissítsd a Jappix csomópontod ezzel az eszközzel, vagy nézd meg hogy létezik-e egy újabb. Információk fognak megjelenni a legújabb verzióról (angolul)."
+
+msgid "Access statistics"
+msgstr "Elérési statisztikák"
+
+msgid "Share statistics"
+msgstr "Megosztási statisztikák"
+
+msgid "Other statistics"
+msgstr "Egyéb statisztikák"
+
+msgid "January"
+msgstr "Január"
+
+msgid "February"
+msgstr "Február"
+
+msgid "March"
+msgstr "Március"
+
+msgid "April"
+msgstr "Április"
+
+msgid "May"
+msgstr "Május"
+
+msgid "June"
+msgstr "Június"
+
+msgid "July"
+msgstr "Július"
+
+msgid "August"
+msgstr "Augusztus"
+
+msgid "September"
+msgstr "Szeptember"
+
+msgid "October"
+msgstr "Október"
+
+msgid "November"
+msgstr "November"
+
+msgid "December"
+msgstr "December"
+
+msgid "Monday"
+msgstr "Hétfő"
+
+msgid "Tuesday"
+msgstr "Kedd"
+
+msgid "Wednesday"
+msgstr "Szerda"
+
+msgid "Thursday"
+msgstr "Csütörtök"
+
+msgid "Friday"
+msgstr "Péntek"
+
+msgid "Saturday"
+msgstr "Szombat"
+
+msgid "Sunday"
+msgstr "Vasárnap"
+
+msgid "Total"
+msgstr "Összeg"
+
+msgid "Cache"
+msgstr "Gyorsítótár"
+
+msgid "Logs"
+msgstr "Logok"
+
+msgid "Music"
+msgstr "Zene"
+
+msgid "Backgrounds"
+msgstr "Hátterek"
+
+msgid "Share"
+msgstr "Megosztás"
+
+msgid "Background"
+msgstr "Háttér"
+
+msgid "Notice"
+msgstr "Megjegyzés"
+
+msgid "Your design preferences have been saved!"
+msgstr "A kinézeti beállításaid elmentettük."
+
+msgid "Please check your inputs: something is missing!"
+msgstr "Kérlek ellenőrizd a bemeneteket: valami hiányzik!"
+
+msgid "Change your Jappix node background with this tool. You can either set a custom color or an uploaded image. Let your creativity flow!"
+msgstr "Változtasd meg a Jappix háttered ezzel az eszközzel. Választhatsz ezen kívül egy egyedi színt, vagy feltölthetsz egy képet. Engedd szárnyalni a kreativitásod!"
+
+msgid "Use default background"
+msgstr "Alapértelmezett háttér használata"
+
+msgid "Use your own image"
+msgstr "Használd a saját képed"
+
+msgid "Select a background to use and change the display options."
+msgstr "Háttérkép választása, hogy használd és változtasd a kijelzési opciókat. "
+
+msgid "Use your own color"
+msgstr "Használd a saját színed"
+
+msgid "Type the hexadecimal color value you want to use as a background."
+msgstr "Írd be a hexadecimális kódját annak a színnek, amit háttérként szeretnél használni."
+
+msgid "Manage backgrounds"
+msgstr "Háttérképek menedzselése"
+
+msgid "You can add a new background to the list with this tool. Please send a valid image."
+msgstr "Ezzel az eszközzel hozzá tudsz adni egy új háttérképet a listához. Kérlek küldj egy érvényes képet."
+
+msgid "If you want to remove some backgrounds, use the browser below."
+msgstr "Ha el szeretnél távolítani háttérképeket, használd az alábbi böngészőt."
+
+msgid "Define a homepage notice for all your users, such as a warn, an important message or an advert with this tool."
+msgstr "Definiálj az összes felhasználód számára egy kezdőoldal üzenet, mint a figyelmeztetés, fontos üzenet vagy hirdetés, ezzel az eszközzel. "
+
+msgid "Simple notice"
+msgstr "Egyszerű értesítés"
+
+msgid "This notice only needs simple text to be displayed, but no code is allowed!"
+msgstr "Ez az értesítés csak egyszerű szöveget tartalmazhat, tehát kódok nem elérhetőek!"
+
+msgid "Advanced notice"
+msgstr ""
+
+msgid "You can customize your notice with embedded HTML, CSS and JavaScript, but you need to code the style."
+msgstr "HTML, CSS és JavaScript segítségével személyreszabhatod értesítéseidet, de szükséges stíluskódok használata."
+
+msgid "Available updates"
+msgstr "Elérhető frissítések"
+
+msgid "What's new?"
+msgstr "Mi újság?"
+
+msgid "Your storage folders are not writable, please apply the good rights!"
+msgstr "A tárolóid nem írhatóak, kérlek használj másikat!"
+
+msgid "%1s may cause problems to the proxy, please increase %2s value up to %3s!"
+msgstr "%1s talán hibát okoz a proxy kapcsolatban, kérlek emeld meg %2s értékét %3s -re!"
+
+msgid "You are using a development version of Jappix. Update it through our repository by executing: %s."
+msgstr "A Jappix egy fejlesztői kiadását használod. Frissítsd a tárolónkból ennek a végrehajtásával: %s."
+
+msgid "A new Jappix version is available! Check what is new and launch the update!"
+msgstr "Új Jappix kiadás elérhető! Lesd meg az újdonságokat, és futtasd a frissitőt!"
+
+msgid "Your version is out to date. Update it now to %s by clicking here!"
+msgstr "A te Jappixod elavult. Kattints ide, és frissits a %s verzióra!"
+
+msgid "Your version seems to be up to date, but you can check updates manually by clicking here."
+msgstr "Úgy tűnik, hogy jelenlegi verzió a legfrissebb, de ellenőrizheted manuálisan is ide kattintva."
+
+msgid "Check for updates"
+msgstr "Frissítések keresése"
+
+msgid "Update in progress"
+msgstr "Frissítés folyamatban"
+
+msgid "Jappix has been updated: you are now running the latest version. Have fun!"
+msgstr "Jappix frissitve: nálad jeleneg az utolsó kiadás fut. "
+
+msgid "The update has failed! Please try again later."
+msgstr "Sikertelen frissítés! Próbáld meg később."
+
+msgid "Downloading package..."
+msgstr "Csomagok letöltése..."
+
+msgid "Removing current Jappix system files..."
+msgstr "Az aktuális Jappix rendszer fájlok törlése..."
+
+msgid "Extracting package..."
+msgstr "Csomagok kibontása..."
+
+msgid "Regenerating storage folder tree..."
+msgstr "Tároló mappák újra generálása..."
+
+msgid "Jappix is now up to date!"
+msgstr "Jappix most naprakész!"
+
+msgid "Aborted: socket error!"
+msgstr "Megszakítva: foglaltsági hiba!"
+
+msgid "Aborted: buffer error!"
+msgstr "Megszakítva: puffer hiba!"
+
+msgid "Aborted: everything is not writable!"
+msgstr "Megszakítva: nem minden írható!"
+
+msgid "Aborted: could not extract the package!"
+msgstr "Megszakítva: nem lehet kicsomagolni a csomagot!"
+
+msgid "Visits"
+msgstr "Látogatottság"
+
+msgid "Daily"
+msgstr "Naponta"
+
+msgid "Weekly"
+msgstr "Hetente"
+
+msgid "Monthly"
+msgstr "Havonta"
+
+msgid "Yearly"
+msgstr "Évente"
+
+msgid "Size"
+msgstr "Méret"
+
+msgid "Clean everything"
+msgstr "Mindent töröl"
+
+msgid "Purge cache"
+msgstr "Cache tisztítása"
+
+msgid "Purge logs"
+msgstr "Logok tisztítása"
+
+msgid "Purge updates"
+msgstr "Frissítések tisztítása"
+
+msgid "The storage folder you wanted to clean is now empty!"
+msgstr "A tárolóhely, amit üríteni akarsz üres!"
+
+msgid "Keep your Jappix node fresh and fast, clean the storage folders regularly!"
+msgstr "Tartsd frissen a Jappixodat, tisztítsd a tároló mappákat rendszeresen!"
+
+msgid "Upload your music (Ogg Vorbis, MP3 or WAV) to be able to listen to it in Jappix!"
+msgstr "Töltsd fel a zenéid (Ogg Vorbis, MP3 vagy WAV formátumban), hogy tudd őket hallgatni a Jappix-ban is!"
+
+msgid "The file you want to upload must be smaller than %s."
+msgstr "A fájl amit felszeretnél tölteni, kisebbnek kell lennie %s-nál/nél."
+
+msgid "Stay tuned in what your users store on your server and remove undesired content with this tool."
+msgstr "Maradj összhangban azzal amit a felhasználóid tárolnak a szerveren, és töröld a nem kívánt tartalmakat ezzel az eszközzel."
+
+msgid "Title"
+msgstr "Cím"
+
+msgid "Artist"
+msgstr "Előadó"
+
+msgid "Album"
+msgstr "Album"
+
+msgid "File"
+msgstr "Fájl"
+
+msgid "Upload"
+msgstr "Feltöltés"
+
+msgid "The folder is empty."
+msgstr "A mappa üres."
+
+msgid "The music could not be received, please retry!"
+msgstr "A zenét nem tudtuk fogadni, kérlek próbáld újra!"
+
+msgid "This is not a valid music file, please encode in Ogg Vorbis, MP3 or WAV!"
+msgstr "Ez nem egy érvényes zenei fájl formátum, kérlek kódold át Ogg Vorbis, MP3 vagy WAV formátumba!"
+
+msgid "Your music has been added!"
+msgstr "Zene hozzáadva!"
+
+msgid "The selected elements have been removed."
+msgstr "A kiválasztott elemek törölve lettek."
+
+msgid "You must select elements to remove!"
+msgstr "Ahhoz, hogy törölni tudj, ki kell választanod egy elemet!"
+
+msgid "Add a new user with this tool, or change a password (type an existing username). Please submit a strong password!"
+msgstr "Adj meg új felhasználót, vagy változtasd meg a jelszót (ehhez adj meg egy létező felhasználó nevet) ezzel az eszközzel. Kérlek válassz egy erős jelszót!"
+
+msgid "Manage"
+msgstr "Intézés"
+
+msgid "List"
+msgstr "Lista"
+
+msgid "Remove users with this tool. Note that you cannot remove an user if he is the only one remaining."
+msgstr "Felhasználó eltávolítása ezzel az eszközzel. Akkor nem tudsz felhasználót eltávolítani, ha ő maradt az egyetlen."
+
+msgid "The user has been added!"
+msgstr "Felhasználó hozzáadva!"
+
+msgid "The chosen users have been removed."
+msgstr "A kiválaszott felhasználó eltávolítva."
+
+msgid "You must select one or more users to be removed!"
+msgstr "Legalább egy felhasználót ki kell választani ahhoz, hogy törölni lehessen!"
+
+msgid "Yesterday"
+msgstr "Tegnap"
+
+msgid "%s days ago"
+msgstr "%s nappal ezelőtt"
+
+msgid "User currently active"
+msgstr "A felhasználó jelenleg elérhető"
+
+msgid "Last seen: %s"
+msgstr "Utóljára láttad: %s"
+
+msgid "Inactive since: %s"
+msgstr "Inaktív ideje: %s "
+
+msgid "Your friend seems not to have received your message(s)!"
+msgstr "A barátod úgy tűnik nem kapta meg az üzenete(i)det!"
+
+msgid "Static content server"
+msgstr "Statikus tartalom szerver"
+
+msgid "This is the static content server for %1s, “%2s”."
+msgstr "Ez egy statikus tartalom szerver a következőknek: %1a, “%2s”."
+
+msgid "Suggested friends"
+msgstr "Javasolt barátok"
+
+msgid "Check all"
+msgstr "Összeset megjelöl"
+
+msgid "Uncheck all"
+msgstr "Megjelölések visszavonása"
+
+msgid "Choose"
+msgstr "Választás"
+
+msgid "List name"
+msgstr "Nevek listázása"
+
+msgid "Allow"
+msgstr "Elfogad"
+
+msgid "Deny"
+msgstr "Megtagad"
+
+msgid "Group"
+msgstr "Csoport"
+
+msgid "Subscription"
+msgstr "Feliratkozás"
+
+msgid "Both"
+msgstr "Mindkét"
+
+msgid "From"
+msgstr "Feladó"
+
+msgid "Everybody"
+msgstr "Mindenki"
+
+msgid "Send messages"
+msgstr "Üzenetküldés"
+
+msgid "Send queries"
+msgstr "Lekérdezések"
+
+msgid "See my status"
+msgstr "Állapotom"
+
+msgid "Send his/her status"
+msgstr "Az ő státuszának elküldése"
+
+msgid "Everything"
+msgstr "Minden"
+
+msgid "Item"
+msgstr "Elem"
+
+msgid "Order"
+msgstr "Rendez"
+
+msgid "Active for this session"
+msgstr "Aktív erre a szakaszra"
+
+msgid "Always active"
+msgstr "Mindig elérhető"
+
+msgid "User directory"
+msgstr "Felhasználói könyvtár"
+
+msgid "Search a friend"
+msgstr "Egy barát keresése"
+
+msgid "The feature requested is not implemented by the recipient or server and therefore cannot be processed."
+msgstr "A megkövetelt tulajdonságot a fogadó vagy a szerver nem tudja implementálni, ezért ezért művelet nem hajtható végre."
+
+msgid "This is a repeat from %s"
+msgstr "Ez egy ismétlés %s -től"
+
+msgid "Loading comments..."
+msgstr "Hozzászólások betöltése.."
+
+msgid "Type your comment here..."
+msgstr "Hozzászólok..."
+
+msgid "Could not get the comments!"
+msgstr "A kommentek nem tölthetők be"
+
+msgid "Show comments"
+msgstr "Mutasd a hozzászólásokat"
+
+msgid "Send him/her a message"
+msgstr "Küldj neki üzenetet"
+
+msgid "Start a chat with him/her"
+msgstr "Beszélj vele"
+
+msgid "Media integration"
+msgstr "Média integráció"
+
+msgid "Comments locked!"
+msgstr "Hozzászólás lezárva!"
+
+msgid "Type something you want to share with your friends..."
+msgstr "Írj valamit, amit megosztanál a barátaiddal..."
+
+msgid "changed his/her nickname to %s"
+msgstr "megváltoztatta a felhasználónevét %s -re"
+
+msgid "commented an item you follow: “%s”."
+msgstr "Kommentálva egy elem amit követsz: “%s”."
+
+msgid "Hide"
+msgstr "Elrejt"
+
+msgid "liked your post: “%s”."
+msgstr "kedveli a bejegyzésedet: “%s”"
+
+msgid "quoted you somewhere: “%s”."
+msgstr "szavaztak rád valahol: “%s”."
+
+msgid "published on your wall: “%s”."
+msgstr "írt a faladra: “%s”"
+
+msgid "tagged you in a photo (%s)."
+msgstr "megjelöltek egy képen (%s). "
+
+msgid "tagged you in a video (%s)."
+msgstr "megjelöltek egy videón (%s). "
+
+msgid "Show"
+msgstr "Mutat"
+
+msgid "Need help? You'd better read our documentation page about how to fill this form!"
+msgstr "Szükséged van segítségre? A legjobb, ha elolvasod a dokumentációnkat arról, hogyan töltsd ki az űrlapot!"
+
+msgid "Pubsub host"
+msgstr "Pubsub kiszolgáló"
+
+msgid "Jappix is a great social platform, that you can access wherever you are, whenever you want and communicate with whovever you want."
+msgstr "A Jappix egy nagyszerű közösségi felület, amit bárhonnan és bármikor elérhetsz, és bárkivel beszélhetsz."
+
+msgid "Manager link"
+msgstr "Menedzser link"
+
+msgid "User uploads server"
+msgstr "Felhasználói feltöltések szervere"
+
+msgid "This is the user uploads server for %1s, “%2s”."
+msgstr "Ez a következők felhasználói feltöltések szervere: %1s, “%2s”."
+
+msgid "Logo"
+msgstr "Logo"
+
+msgid "You can set your own service logo to replace the default one. Take care of the size and the main color of each logo!"
+msgstr "Be tudod állítani a saját vízjeled az alapértelmezett helyett. Légy óvatos a méretével és a színével kapcsolatban!"
+
+msgid "Upload each logo with the recommended maximum pixel size."
+msgstr "Minden logó föltöltése egy ajánlott maximum mérettel."
+
+msgid "This is not a valid image, please use the PNG format!"
+msgstr "Nem megfelelő képformátum, kérlek PNG-t használj!"
+
+msgid "Your service logo has been successfully changed!"
+msgstr "A vízjeled sikeresen módosítva!"
+
+msgid "Your logo format must be PNG. Leave a field empty and the logo will not be changed."
+msgstr "A logo formátumodnak PNG-nek kell lennie. Hagyj egy mezőt üresen, és a logo nem lesz megváltoztatva."
+
+msgid "Remove this logo"
+msgstr "Logo eltávolítása"
+
+msgid "View this logo"
+msgstr "Logo megtekintése"
+
+msgid "Send a file"
+msgstr "Fájl küldése"
+
+msgid "Once uploaded, your friend will be prompted to download the file you sent."
+msgstr "Amint feltöltötted, a barátaid azonnal le fogják tudni tölteni."
+
+msgid "Groupchats to join"
+msgstr "Csoportos beszélgetéshez csatlakozás"
+
+msgid "Purge sent files"
+msgstr "Elküldött fájlok törlése"
+
+msgid "would like to send you a file: “%s”."
+msgstr "szeretne neked küldeni egy fálj-t : “%s”"
+
+msgid "has accepted to received your file: “%s”."
+msgstr "elfogadta, hogy küldj neki egy fálj-t : “%s”"
+
+msgid "has rejected to receive your file: “%s”."
+msgstr "elutasította a fájl-t: “%s”"
+
+msgid "could not receive your file: “%s”."
+msgstr "nem tudta fogadni a fájl-t: “%s”"
+
+msgid "has received a file exchange request: “%s”."
+msgstr "kapott egy felkérést az alábbi fájl fogadására: “%s”"
+
+msgid "Available shortcuts:"
+msgstr "Elérhető parancsikonok:"
+
+msgid "%s removes the chat logs"
+msgstr "%s eltávolította a beszélgetés előzményeit"
+
+msgid "%s joins a groupchat"
+msgstr "%s csatlakozott a csoportos beszélgetésbe"
+
+msgid "%s closes the chat"
+msgstr "%s bezárta a beszélgetést"
+
+msgid "%s shows the user profile"
+msgstr "%s megmutatta a felhasználói profilját"
+
+msgid "%s sends a message to the room"
+msgstr "%s üzenetet küldött a szobábs"
+
+msgid "%s changes your nickname"
+msgstr "%s megváltoztatta a felhasználói nevedet"
+
+msgid "%s sends a message to someone in the room"
+msgstr "%s üzenetet küldött valakinek a szobában"
+
+msgid "%s changes the room topic"
+msgstr "%s megváltoztatta a szoba témáját"
+
+msgid "%s kicks an user of the room"
+msgstr "%s kidobta az egyik felhasználót a szobából"
+
+msgid "%s bans an user of the room"
+msgstr "%s kitiltotta az egyik felhasználót a szobából"
+
+msgid "%s invites someone to join the room"
+msgstr "%s meghívott valakit a szobába"
+
+msgid "Social channel, chat and more."
+msgstr ""
+
+msgid "Create your public profile."
+msgstr ""
+
+msgid "A mini-chat for your website."
+msgstr ""
+
+msgid "Get Jappix, get support."
+msgstr ""
+
+msgid "Statistics around Jappix."
+msgstr ""
+
+msgid "Download Jappix for free."
+msgstr ""
+
+msgid "Find a public Jappix node."
+msgstr ""
+
+msgid "Public profile"
+msgstr ""
+
+msgid "Your profile anywhere on the Web."
+msgstr ""
+
+msgid "%s is a Jappix.com service which makes your XMPP profile public. It is easier to share it. No XMPP account is required to view your social channel, your current position and your contact details."
+msgstr ""
+
+msgid "Furthermore, every picture you post in your social channel is added to a beautiful picture timeline. You can now view the pictures you shared year by year."
+msgstr ""
+
+msgid "You can also use your XMPP avatar as a single avatar for every website, blog and forum you use. When you change it on XMPP, the new avatar appears everywhere. What a genious improvement!"
+msgstr ""
+
+msgid "Yay, let's create my public profile!"
+msgstr ""
+
+msgid "Enable my public profile"
+msgstr ""
+
+#~ msgid "Jappix is a non-profit social platform, that you can access wherever you are, whenever you want and communicate with whovever you want."
+#~ msgstr ""
+
+#~ msgid "See"
+#~ msgstr ""
+
+#~ msgid "Use default logo"
+#~ msgstr ""
+
+#~ msgid "Use your own logo"
+#~ msgstr ""
+
+#~ msgid "The recommended image format is PNG. Leave a field empty and the logo will not be changed."
+#~ msgstr ""
diff --git a/jappixmini/jappix/lang/id/LC_MESSAGES/main.mo b/jappixmini/jappix/lang/id/LC_MESSAGES/main.mo
new file mode 100644
index 00000000..739a38a4
Binary files /dev/null and b/jappixmini/jappix/lang/id/LC_MESSAGES/main.mo differ
diff --git a/jappixmini/jappix/lang/id/LC_MESSAGES/main.po b/jappixmini/jappix/lang/id/LC_MESSAGES/main.po
new file mode 100644
index 00000000..189a3c94
--- /dev/null
+++ b/jappixmini/jappix/lang/id/LC_MESSAGES/main.po
@@ -0,0 +1,1870 @@
+# Indonesia translations for Jappix package.
+# This file is distributed under the same license as the Jappix package.
+# This file was translated from CodingTeam at <http://codingteam.net/>.
+msgid ""
+msgstr ""
+"Project-Id-Version: Jappix\n"
+"PO-Revision-Date: 2012-01-16 21:26+0100\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"POT-Creation-Date: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+
+msgid "JavaScript is missing in your web browser, so that you will not be able to launch Jappix! Please fix this."
+msgstr "JavaScript telah hilang di browser web anda, sehingga anda tidak akan dapat membuka Jappix! Harap perbaiki hal ini."
+
+msgid "An open social network"
+msgstr "Sebuah jaringan sosial terbuka"
+
+msgid "Jappix has been interrupted by a network issue, a bug or bad login (check that you entered the right credentials), sorry for the inconvenience."
+msgstr "Saat ini Jappix sedang mengalami gangguan jaringan, bug atau login yang salah (periksa lagi data kredensial yang telah anda masukkan), maaf untuk ketidaknyamanan ini."
+
+msgid "The element list on this server could not be obtained!"
+msgstr "Daftar elemen pada server ini tidak dapat diperoleh!"
+
+msgid "Your password has been changed, now you can connect to your account with your new login data."
+msgstr "Kata sandi anda telah dirubah, sekarang anda dapat terhubung ke akun anda dengan data login yang baru."
+
+msgid "Your XMPP account has been removed, bye!"
+msgstr "Akun XMPP anda telah dihapus, selamat tinggal!"
+
+msgid "You have been logged out of your XMPP account, have a nice day!"
+msgstr "Anda telah keluar dari akun XMPP anda, semoga hari anda menyenangkan!"
+
+msgid "The room you joined seems not to exist. You should create it!"
+msgstr "Room yang anda masuki tampaknya tidak tersedia, anda harus membuatnya!"
+
+msgid "The groupchat has been removed, now someone else will be able to recreate it."
+msgstr "GroupChat telah dihapus, sekarang orang lain akan dapat membuatnya kembali."
+
+msgid "The user that you want to reach is not present in the room."
+msgstr "Pengguna yang ingin anda hubungi sedang tidak hadir dalam room."
+
+msgid "Please enter the group chat address to join."
+msgstr "Silahkan masukkan alamat GroupChat untuk bergabung."
+
+msgid "Please enter your nickname to join %s."
+msgstr "Silakan masukkan nama panggilan anda untuk bergabung %s."
+
+msgid "This room (%s) is protected with a password."
+msgstr "Room ini (%s) dilindungi dengan sebuah kata sandi."
+
+msgid "Your browser is out of date!"
+msgstr "Browser anda telah ketinggalan jaman!"
+
+msgid "Last %s version is better!"
+msgstr "Versi %s terakhir lebih baik!"
+
+msgid "Login"
+msgstr "Masuk"
+
+msgid "Register"
+msgstr "Daftar"
+
+msgid "Here we go!"
+msgstr "Kita mulai!"
+
+msgid "Server"
+msgstr "Server"
+
+msgid "Password"
+msgstr "Kata Sandi"
+
+msgid "Remember me"
+msgstr "Ingat saya"
+
+msgid "This tool has been disabled, you cannot use it!"
+msgstr "Alat ini telah dinonaktifkan, anda tidak dapat menggunakannya!"
+
+msgid "Due to a network issue, you were disconnected. What do you want to do now?"
+msgstr "Karena masalah jaringan, anda terputus. Apa yang anda ingin lakukan sekarang?"
+
+msgid "Reconnect"
+msgstr "Hubungkan kembali"
+
+msgid "Messages"
+msgstr "Pesan"
+
+msgid "Profile"
+msgstr "Profil"
+
+msgid "Options"
+msgstr "Pilihan"
+
+msgid "Disconnect"
+msgstr "Memutuskan"
+
+msgid "Filter"
+msgstr "Filter"
+
+msgid "Add a friend"
+msgstr "Tambahkan teman"
+
+msgid "Your groupchats"
+msgstr "Groupchats anda"
+
+msgid "Manage your favorite groupchats"
+msgstr "Kelola groupchats favorit anda"
+
+msgid "More stuff"
+msgstr "Kemampuan lain"
+
+msgid "Show all friends"
+msgstr "Tampilkan semua teman"
+
+msgid "Only show connected friends"
+msgstr "Hanya tampilkan teman-teman yang terhubung"
+
+msgid "Message archives"
+msgstr "Arsip pesan"
+
+msgid "Date"
+msgstr "Tanggal"
+
+msgid "Please select a friend to view the chat history."
+msgstr "Silahkan pilih seorang teman untuk melihat riwayat chatting."
+
+msgid "Nothing found for: %s"
+msgstr "Tidak ada hasil untuk: %s"
+
+msgid "A short message?"
+msgstr "Sebuah pesan singkat?"
+
+msgid "How are you?"
+msgstr "Bagaimana kabar anda?"
+
+msgid "What are you doing?"
+msgstr "Apa yang anda lakukan?"
+
+msgid "Join a chat"
+msgstr "Ikut obrolan"
+
+msgid "Status"
+msgstr "Status"
+
+msgid "Available"
+msgstr "Tersedia"
+
+msgid "Talkative"
+msgstr "Latah"
+
+msgid "Away"
+msgstr "Pergi"
+
+msgid "Not available"
+msgstr "Tidak tersedia"
+
+msgid "Busy"
+msgstr "Sibuk"
+
+msgid "Mood"
+msgstr "Suasana hati"
+
+msgid "None"
+msgstr "Tidak ada"
+
+msgid "Crazy"
+msgstr "Gila"
+
+msgid "Excited"
+msgstr "Gembira"
+
+msgid "Playful"
+msgstr "Playful"
+
+msgid "Happy"
+msgstr "Senang"
+
+msgid "Shocked"
+msgstr "Kaget"
+
+msgid "Hot"
+msgstr "Panas"
+
+msgid "Sad"
+msgstr "Sedih"
+
+msgid "Amorous"
+msgstr "Tunjukkan Cinta Kasih"
+
+msgid "Confident"
+msgstr "Yakin"
+
+msgid "Activity"
+msgstr "Aktivitas"
+
+msgid "Chores"
+msgstr "Tugas"
+
+msgid "Drinking"
+msgstr "Minum"
+
+msgid "Eating"
+msgstr "Makan"
+
+msgid "Exercising"
+msgstr "Berolahraga"
+
+msgid "Grooming"
+msgstr "Dandan"
+
+msgid "Appointment"
+msgstr "Janji"
+
+msgid "Inactive"
+msgstr "Tidak aktif"
+
+msgid "Relaxing"
+msgstr "Bersantai"
+
+msgid "Talking"
+msgstr "Berbicara"
+
+msgid "Traveling"
+msgstr "Perjalanan"
+
+msgid "Working"
+msgstr "Bekerja"
+
+msgid "View profile"
+msgstr "Lihat profil"
+
+msgid "Repeat this notice"
+msgstr "Ulangi pemberitahuan ini"
+
+msgid "Remove this notice"
+msgstr "Hapus pemberitahuan ini"
+
+msgid "Your profile"
+msgstr "Profil anda"
+
+msgid "Identity"
+msgstr "Identitas"
+
+msgid "Profile image"
+msgstr "Gambar profil"
+
+msgid "Others"
+msgstr "Lainnya"
+
+msgid "Personal"
+msgstr "Pribadi"
+
+msgid "Complete name"
+msgstr "Nama lengkap"
+
+msgid "Nickname"
+msgstr "Julukan"
+
+msgid "First name"
+msgstr "Nama awalan"
+
+msgid "Last name"
+msgstr "Nama akhiran"
+
+msgid "Date of birth"
+msgstr "Tanggal lahir"
+
+msgid "Contact"
+msgstr "Kontak"
+
+msgid "E-mail"
+msgstr "E-mail"
+
+msgid "Phone"
+msgstr "Telepon"
+
+msgid "Website"
+msgstr "Situs"
+
+msgid "Current"
+msgstr "Saat ini"
+
+msgid "Delete"
+msgstr "Hapus"
+
+msgid "What a pity! You have no profile image defined in your identity card!"
+msgstr "Sayang sekali! anda tidak memiliki gambar profil untuk mendefinisikan anda di dalam kartu identitas!"
+
+msgid "Address"
+msgstr "Alamat"
+
+msgid "Street"
+msgstr "Jalan"
+
+msgid "City"
+msgstr "Kota"
+
+msgid "Postal code"
+msgstr "Kode pos"
+
+msgid "Country"
+msgstr "Negara"
+
+msgid "Biography"
+msgstr "Biografi"
+
+msgid "Important notice"
+msgstr "Pemberitahuan penting"
+
+msgid "Be careful of the information you write into your profile, because it could be accessed by everyone (even someone you don't want to)."
+msgstr "Hati-hati dengan informasi yang anda tulis ke profil anda, karena bisa diakses oleh setiap orang (bahkan seseorang yang anda tidak inginkan)."
+
+msgid "Not everything is private on XMPP; this is one of those things, your public profile (vCard)."
+msgstr "Tidak semuanya pribadi di XMPP; ini adalah salah satunya, profil publik anda (vCard)."
+
+msgid "It is strongly recommended to upload a profile image (%s maximum), like a picture of yourself, because that makes you easily recognizable by your friends."
+msgstr "Sangat dianjurkan untuk meng-upload gambar profil (maksimum %s), seperti gambar diri, karena itu yang membuat anda mudah dikenali oleh teman-teman anda."
+
+msgid "Save"
+msgstr "Simpan"
+
+msgid "Cancel"
+msgstr "Batal"
+
+msgid "Edit options"
+msgstr "Edit pilihan"
+
+msgid "Channel"
+msgstr "Channel"
+
+msgid "Commands"
+msgstr "Perintah"
+
+msgid "Sounds"
+msgstr "Suara"
+
+msgid "Privacy"
+msgstr "Privasi"
+
+msgid "Message archiving"
+msgstr "Pengarsipan pesan"
+
+msgid "Store a history of your chats"
+msgstr "Menyimpan riwayat chatting anda"
+
+msgid "Geolocation"
+msgstr "Geolokasi"
+
+msgid "Empty"
+msgstr "Kosong"
+
+msgid "Empty channel"
+msgstr "Kosongkan channel"
+
+msgid "Persistent"
+msgstr "Gigih"
+
+msgid "Maximum notices"
+msgstr "Pemberitahuan maksimum"
+
+msgid "Account"
+msgstr "Akun"
+
+msgid "Change password"
+msgstr "Ubah password"
+
+msgid "Delete account"
+msgstr "Hapus akun"
+
+msgid "Old"
+msgstr "Tua"
+
+msgid "New (2 times)"
+msgstr "Baru (2 kali)"
+
+msgid "Continue"
+msgstr "Lanjutkan"
+
+msgid "To"
+msgstr "Ke"
+
+msgid "Close"
+msgstr "Tutup"
+
+msgid "unknown"
+msgstr "Tidak diketahui"
+
+msgid "Unavailable"
+msgstr "Tidak ditempat"
+
+msgid "is now"
+msgstr "sedang"
+
+msgid "Please wait while your avatar is uploaded..."
+msgstr "Harap tunggu sementara avatar anda sedang di proses ..."
+
+msgid "Here it is! A new beautiful profile image!"
+msgstr "Ini dia! Sebuah foto profil baru yang indah!"
+
+msgid "The image file is not supported or has a bad size."
+msgstr "File gambar tidak didukung atau memiliki ukuran yang buruk."
+
+msgid "Reply"
+msgstr "Balas"
+
+msgid "Error"
+msgstr "Kesalahan"
+
+msgid "Click here to solve the error"
+msgstr "Klik di sini untuk memperbaiki kesalahan"
+
+msgid "You"
+msgstr "Anda"
+
+msgid "Remove"
+msgstr "Hapus"
+
+msgid "Rename"
+msgstr "Ubah nama"
+
+msgid "Hi, I am %s, I would like to add you as my friend."
+msgstr "Hi, saya %s, saya ingin menambahkan anda sebagai teman saya."
+
+msgid "Smiley insertion"
+msgstr "Masukkan Smiley"
+
+msgid "Change style"
+msgstr "Mengubah gaya"
+
+msgid "Text in bold"
+msgstr "Teks dalam huruf tebal"
+
+msgid "Text in italic"
+msgstr "Teks dengan huruf miring"
+
+msgid "Underlined text"
+msgstr "Garisbawahi teks"
+
+msgid "Save chat"
+msgstr "Simpan pembicaraan"
+
+msgid "Click on the following link to get the chat log, and wait. Then click again to get the file."
+msgstr "Klik pada link berikut untuk mendapatkan log pembicaraan, tunggu. Lalu klik lagi untuk mendapatkan file."
+
+msgid "This chat is empty!"
+msgstr "Obrolan ini kosong!"
+
+msgid "Generate file!"
+msgstr "Menghasilkan file!"
+
+msgid "Download file!"
+msgstr "Download file!"
+
+msgid "Clean current chat"
+msgstr "Bersihkan obrolan saat ini"
+
+msgid "View chat history"
+msgstr "Lihat riwayat obrolan"
+
+msgid "Show user profile"
+msgstr "Tampilkan profil pengguna"
+
+msgid "Add this contact to your friends"
+msgstr "Tambahkan kontak ini ke teman anda"
+
+msgid "Add this groupchat to your favorites"
+msgstr "Tambahkan groupchat ini ke favorit anda"
+
+msgid "All tabs"
+msgstr "Semua tab"
+
+msgid "Close this tab"
+msgstr "Tutup tab ini"
+
+msgid "no subject defined for this room."
+msgstr "tidak ada subjek yang ditetapkan untuk room ini."
+
+msgid "Administration panel for this room"
+msgstr "Administrasi panel untuk room ini"
+
+msgid "Moderators"
+msgstr "Moderator"
+
+msgid "Participants"
+msgstr "Peserta"
+
+msgid "Visitors"
+msgstr "Pengunjung"
+
+msgid "Manage favorite rooms"
+msgstr "Mengelola room favorit"
+
+msgid "Change favorites"
+msgstr "Ubah favorit"
+
+msgid "Search a room"
+msgstr "Mencari room chat"
+
+msgid "Select a favorite"
+msgstr "Pilih favorit"
+
+msgid "Getting the name..."
+msgstr "Mendapatkan nama..."
+
+msgid "Gateway"
+msgstr "Gateway"
+
+msgid "Name"
+msgstr "Nama"
+
+msgid "Room"
+msgstr "Room"
+
+msgid "Add"
+msgstr "Tambahkan"
+
+msgid "Edit"
+msgstr "Mengedit"
+
+msgid "Search a room on"
+msgstr "Cari kamar di"
+
+msgid "No room found on this server."
+msgstr "Tidak ditemukan room di server ini."
+
+msgid "Service discovery"
+msgstr "Penemuan layanan"
+
+msgid "Server to query"
+msgstr "Server untuk permintaan"
+
+msgid "Sorry, but the entity didn't return any result!"
+msgstr "Maaf, tapi entitas tidak mengembalikan hasil apapun!"
+
+msgid "Accounts"
+msgstr "Akun"
+
+msgid "Authentications"
+msgstr "Otentikasi"
+
+msgid "Automation"
+msgstr "Otomatisasi"
+
+msgid "Clients"
+msgstr "Klien"
+
+msgid "Collaboration"
+msgstr "Kolaborasi"
+
+msgid "Components"
+msgstr "Komponen"
+
+msgid "Rooms"
+msgstr "Kamar"
+
+msgid "Directories"
+msgstr "Direktori"
+
+msgid "Gateways"
+msgstr "Gateway"
+
+msgid "News"
+msgstr "Berita"
+
+msgid "Hierarchy"
+msgstr "Hirarki"
+
+msgid "Proxies"
+msgstr "Proxy"
+
+msgid "Publication/Subscription"
+msgstr "Publikasi / Berlangganan"
+
+msgid "Storage"
+msgstr "Penyimpanan"
+
+msgid "Service offline or broken"
+msgstr "Layanan sedang offline atau rusak"
+
+msgid "Your inbox"
+msgstr "Kotak masuk anda"
+
+msgid "Available actions"
+msgstr "Tersedia tindakan"
+
+msgid "Clean"
+msgstr "Bersih"
+
+msgid "New"
+msgstr "Baru"
+
+msgid "Received"
+msgstr "Diterima"
+
+msgid "Subject"
+msgstr "Subjek"
+
+msgid "Content"
+msgstr "Konten"
+
+msgid "Send message"
+msgstr "Kirim pesan"
+
+msgid "Your inbox is empty."
+msgstr "Kotak masuk kosong."
+
+msgid "MUC administration"
+msgstr "MUC administrasi"
+
+msgid "You administrate this room"
+msgstr "Anda administrate room ini"
+
+msgid "Enter new subject"
+msgstr "Masukkan subjek baru"
+
+msgid "Configuration"
+msgstr "Konfigurasi"
+
+msgid "Authorizations"
+msgstr "Otorisasi"
+
+msgid "Member list"
+msgstr "Daftar anggota"
+
+msgid "Owner list"
+msgstr "Daftar pemilik"
+
+msgid "Administrator list"
+msgstr "Daftar Administrator"
+
+msgid "Outcast list"
+msgstr "Daftar terbuang"
+
+msgid "Add an input"
+msgstr "Tambahkan masukan"
+
+msgid "Destroy this MUC"
+msgstr "Hancurkan MUC ini"
+
+msgid "Yes, let's do it!"
+msgstr "Ya, mari kita melakukannya!"
+
+msgid "Your friend is paying attention to the conversation."
+msgstr "Teman anda sedang memperhatikan percakapan."
+
+msgid "Your friend is writing a message..."
+msgstr "Teman anda sedang menulis pesan ..."
+
+msgid "Your friend stopped writing a message."
+msgstr "Teman anda berhenti menulis pesan."
+
+msgid "Your friend is doing something else."
+msgstr "Teman anda sedang melakukan sesuatu yang lain."
+
+msgid "Your friend closed the chat."
+msgstr "Teman anda menutup obrolan."
+
+msgid "Requesting this service..."
+msgstr "Meminta layanan ini ..."
+
+msgid "Loading"
+msgstr "Pemuatan"
+
+msgid "joined the chat room"
+msgstr "bergabung dengan chat room"
+
+msgid "left the chat room"
+msgstr "meninggalkan chat room"
+
+msgid "no status"
+msgstr "tidak ada status"
+
+msgid "has been kicked"
+msgstr "telah ditendang"
+
+msgid "has been banned"
+msgstr "telah dilarang"
+
+msgid "no reason"
+msgstr "tanpa alasan"
+
+msgid "Communicate with the entire world!"
+msgstr "Berkomunikasi dengan seluruh dunia!"
+
+msgid "It allows you to get in touch with the millions of users who currently use the XMPP network like you do with Jappix. Join the community and stay free!"
+msgstr "Hal ini memungkinkan anda untuk berhubungan dengan jutaan pengguna yang saat ini menggunakan jaringan XMPP seperti yang anda lakukan dengan Jappix. Bergabung dengan komunitas dan tetap bebas!"
+
+msgid "Hi there!"
+msgstr "Halo semua!"
+
+msgid "Welcome on %1s, “%2s”."
+msgstr "Selamat datang di %1s, “%2s”."
+
+msgid "Login to your existing XMPP account or create a new one for free!"
+msgstr "Masuk ke akun XMPP anda atau buat yang baru dengan gratis!"
+
+msgid "Jappix is an open-source project from PostPro, a non-profit organization which provides us a great help."
+msgstr "Jappix adalah sebuah proyek open source dari PostPro, sebuah organisasi non-profit yang memberikan kita bantuan besar."
+
+msgid "Login to your existing XMPP account. You can also use the %s to join a groupchat."
+msgstr "Masuk ke akun XMPP anda. Anda juga dapat menggunakan %s untuk bergabung dengan suatu groupchat."
+
+msgid "Previous"
+msgstr "Sebelumnya"
+
+msgid "General"
+msgstr "Umum"
+
+msgid "Advanced"
+msgstr "Lebih lanjut"
+
+msgid "Resource"
+msgstr "Sumber daya"
+
+msgid "Priority"
+msgstr "Prioritas"
+
+msgid "Low"
+msgstr "Rendah"
+
+msgid "Medium"
+msgstr "Menengah"
+
+msgid "High"
+msgstr "Tinggi"
+
+msgid "Enter the groupchat you want to join and the nick you want to have. You can also go back to the %s."
+msgstr "Masukkan groupchat yang anda ingin bergabung dan nick yang ingin anda miliki. Anda juga dapat kembali ke %s."
+
+msgid "login page"
+msgstr "halaman masuk"
+
+msgid "Share this link with your friends:"
+msgstr "Berbagi link ini dengan teman anda:"
+
+msgid "Register a new XMPP account to join your friends on your own social cloud. That's simple!"
+msgstr "Daftarkan akun XMPP baru untuk bergabung dengan teman-teman anda di atas awan sosial anda sendiri. Sederhana bukan!"
+
+msgid "Required"
+msgstr "Diperlukan"
+
+msgid "You have been registered, here is your XMPP address:"
+msgstr "Anda telah terdaftar, alamat XMPP anda adalah:"
+
+msgid "Manager"
+msgstr "Manajer"
+
+msgid "Project"
+msgstr "Proyek"
+
+msgid "Encrypted"
+msgstr "Terenkripsi"
+
+msgid "Unencrypted"
+msgstr "Tidak terenkripsi"
+
+msgid "Where are you?"
+msgstr "Di mana anda?"
+
+msgid "What's up with you?"
+msgstr "Ada apa dengan anda?"
+
+msgid "Fetching the social channel..."
+msgstr "Mengambil saluran sosial ..."
+
+msgid "You are synchronized with your network."
+msgstr "Anda telah disinkronkan dengan jaringan anda."
+
+msgid "Cannot send anything: you can only receive notices!"
+msgstr "Tidak dapat mengirim apapun: anda hanya dapat menerima pemberitahuan!"
+
+msgid "Media viewer"
+msgstr "Media penampil"
+
+msgid "Browse"
+msgstr "Daftar"
+
+msgid "Command"
+msgstr "Perintah"
+
+msgid "Subscribe"
+msgstr "Berlangganan"
+
+msgid "Join"
+msgstr "Bergabung"
+
+msgid "Automatic"
+msgstr "Otomatis"
+
+msgid "Search"
+msgstr "Pencarian"
+
+msgid "No result!"
+msgstr "Tidak ada hasil!"
+
+msgid "No notifications."
+msgstr "Tidak ada pemberitahuan."
+
+msgid "would like to add you as a friend."
+msgstr "ingin menambahkan anda sebagai teman."
+
+msgid "would like you to join this chatroom:"
+msgstr "ingin anda untuk bergabung dengan chatroom:"
+
+msgid "Do you accept?"
+msgstr "Apakah anda menerima?"
+
+msgid "Yes"
+msgstr "Ya"
+
+msgid "No"
+msgstr "Tidak"
+
+msgid "would like to get authorization."
+msgstr "ingin mendapatkan otorisasi."
+
+msgid "Do you want to see the friends %s suggests you?"
+msgstr "Apakah anda ingin melihat teman-teman %s yang menyarankan anda?"
+
+msgid "Submit"
+msgstr "Menyerahkan"
+
+msgid "Client"
+msgstr "Klien"
+
+msgid "System"
+msgstr "Sistem"
+
+msgid "Local time"
+msgstr "Waktu setempat"
+
+msgid "Comments"
+msgstr "Komentar"
+
+msgid "User profile"
+msgstr "Profil pengguna"
+
+msgid "See his/her position on the globe"
+msgstr "Lihat / nya posisinya di dunia"
+
+msgid "Confirm"
+msgstr "Menegaskan"
+
+msgid "anonymous mode"
+msgstr "modus anonim"
+
+msgid "Groups"
+msgstr "Grup"
+
+msgid "Unclassified"
+msgstr "Unclassified"
+
+msgid "Authorize"
+msgstr "Otorisasi"
+
+msgid "Ask for authorization"
+msgstr "Minta untuk otorisasi"
+
+msgid "Unblock"
+msgstr "Tidak dilarang"
+
+msgid "Prohibit"
+msgstr "Melarang"
+
+msgid "Block"
+msgstr "Dilarang"
+
+msgid "Chat"
+msgstr "Bicara"
+
+msgid "Groupchat"
+msgstr "Groupchat"
+
+msgid "Jappix Mobile"
+msgstr "Jappix Handphone"
+
+msgid "Desktop"
+msgstr "Desktop"
+
+msgid "Mobile"
+msgstr "Ponsel"
+
+msgid "Please wait..."
+msgstr "Silakan tunggu ..."
+
+msgid "Please enable JavaScript"
+msgstr "Silahkan mengaktifkan JavaScript"
+
+msgid "Your channel"
+msgstr "Saluran anda"
+
+msgid "Channel of"
+msgstr "Saluran dari "
+
+msgid "More notices..."
+msgstr "Pemberitahuan yang lain..."
+
+msgid "Attach a file"
+msgstr "Lampirkan file"
+
+msgid "Send"
+msgstr "Kirim"
+
+msgid "Unattach the file"
+msgstr "Unattach file"
+
+msgid "An error occured while uploading your file: maybe it is too big (%s maximum) or forbidden!"
+msgstr "Sebuah kesalahan terjadi ketika mengupload file anda: mungkin itu terlalu besar (maksimum %s) atau dilarang!"
+
+msgid "Authorization failed"
+msgstr "Otorisasi gagal"
+
+msgid "Registration failed, please choose a different username"
+msgstr "Pendaftaran gagal, silakan pilih username yang berbeda"
+
+msgid "Service unavailable"
+msgstr "Layanan tidak tersedia"
+
+msgid "Internal server error, try later"
+msgstr "Server error, coba beberapa saat kemudian"
+
+msgid "Your form has been sent."
+msgstr "Formulir anda telah dikirim."
+
+msgid "Application"
+msgstr "Aplikasi"
+
+msgid "XMPP links"
+msgstr "XMPP link"
+
+msgid "Open XMPP links with Jappix"
+msgstr "Buka XMPP link dengan Jappix"
+
+msgid "changed the subject to:"
+msgstr "mengubah topik menjadi:"
+
+msgid "Welcome!"
+msgstr "Selamat Datang!"
+
+msgid "Friends"
+msgstr "Teman"
+
+msgid "Welcome on Jappix, your own social cloud!"
+msgstr "Selamat datang di Jappix, awan sosial anda sendiri!"
+
+msgid "Before you start using it, you will have to change some settings, search for friends and complete your profile."
+msgstr "Sebelum anda mulai menggunakannya, anda harus mengubah beberapa pengaturan, mencari teman dan melengkapi profil anda."
+
+msgid "Enable notification sounds"
+msgstr "Aktifkan suara pemberitahuan"
+
+msgid "Share your position on the globe"
+msgstr "Berbagi posisi anda di dunia"
+
+msgid "Offline friends"
+msgstr "Teman offline"
+
+msgid "Don't hide offline friends"
+msgstr "Jangan sembunyikan teman offline"
+
+msgid "Use this tool to find your friends on the server you are using right now, or add them later."
+msgstr "Gunakan tool ini untuk menemukan teman-teman anda pada server yang anda gunakan sekarang, atau menambahkan mereka nanti."
+
+msgid "Great work! Now, you can share Jappix with your friends!"
+msgstr "Usaha hebat! Sekarang, anda dapat memberitahukan Jappix ke teman-teman anda!"
+
+msgid "When you will press the save button, the profile editor will be opened. Happy socializing!"
+msgstr "Ketika anda akan menekan tombol simpan, editor profil akan dibuka. Selamat bersosialisasi!"
+
+msgid "Share Jappix on %s"
+msgstr "Berbagi Jappix ke %s"
+
+msgid "Using Jappix, an open social platform. I am %s!"
+msgstr "Menggunakan Jappix, sebuah platform sosial yang terbuka. Saya s!%"
+
+msgid "Unknown name"
+msgstr "Nama tidak diketahui"
+
+msgid "Unknown country"
+msgstr "Negara tidak diketahui"
+
+msgid "Click to enable"
+msgstr "Klik untuk mengaktifkan"
+
+msgid "Click to disable"
+msgstr "Klik untuk menonaktifkan"
+
+msgid "Installation"
+msgstr "Instalasi"
+
+msgid "Jappix installation"
+msgstr "Instalasi Jappix"
+
+msgid "Welcome to the Jappix installation!"
+msgstr "Selamat datang di instalasi Jappix!"
+
+msgid "This tool will help you fastly install Jappix, the first full-featured XMPP-based social platform, on your server. You don't even need any technical knowledge."
+msgstr "Alat ini akan membantu anda secara cepat menginstal Jappix, fitur berbasis XMPP penuh pertama untuk platform sosial, pada server anda. Anda bahkan tidak perlu pengetahuan teknis apapun."
+
+msgid "Let's have a look at the installation steps:"
+msgstr "Mari kita lihat langkah-langkah instalasi:"
+
+msgid "Welcome"
+msgstr "Selamat Datang di"
+
+msgid "Storage configuration"
+msgstr "Konfigurasi penyimpanan"
+
+msgid "Administrator account"
+msgstr "Akun administrator"
+
+msgid "Main configuration"
+msgstr "Konfigurasi utama"
+
+msgid "Hosts configuration"
+msgstr "Host konfigurasi"
+
+msgid "Services installation"
+msgstr "Instalasi layanan"
+
+msgid "If the current language does not match yours (%1s), you can make Jappix speak %2s it will be saved."
+msgstr "Jika bahasa saat ini tidak cocok dengan anda (%1s), anda dapat membuat Jappix berbicara %2s itu akan disimpan."
+
+msgid "If you want to get some help about the Jappix installation and configuration, you can use our whole documentation, available at:"
+msgstr "Jika anda ingin mendapatkan beberapa bantuan tentang instalasi dan konfigurasi Jappix, anda dapat menggunakan seluruh dokumentasi kami, tersedia di:"
+
+msgid "It's time to build your own social cloud: just go to the next step!"
+msgstr "Saatnya untuk membangun 'sosial cloud' anda sendiri: slahkan pergi ke langkah berikutnya!"
+
+msgid "Jappix stores persistent data (such as shared files, chat logs, your own music and its configuration) into a single secured storage folder."
+msgstr "Jappix menyimpan data persisten (seperti shared file, log chatting, musik anda sendiri dan konfigurasi nya) ke dalam folder penyimpanan tunggal yang aman."
+
+msgid "Jappix must be able to write in this folder to create its sub-directories. If not, you must set the rights to %1s or change the folder owner to %2s (depending of your configuration)."
+msgstr "Jappix harus mampu menulis dalam folder ini untuk membuat sub-direktori. Jika tidak, anda harus mengatur hak untuk %1s atau mengubah pemilik folder untuk %2s (tergantung dari konfigurasi anda)."
+
+msgid "The folder is writable, you can continue!"
+msgstr "Folder dapat ditulis, anda dapat melanjutkan!"
+
+msgid "Jappix offers you the possibility to manage your configuration, install new addons or search for updates. That's why you must create an administrator account to access the manager."
+msgstr "Jappix menawarkan kemungkinan untuk mengelola konfigurasi anda, menginstal addon baru atau mencari update. Itulah mengapa anda harus membuat account administrator untuk mengakses manajer."
+
+msgid "When Jappix will be installed, just click on the manager link on the home page to access it."
+msgstr "Ketika Jappix akan diinstal, cukup klik pada link manajer di halaman rumah untuk mengaksesnya."
+
+msgid "Oops, you missed something or the two passwords do not match!"
+msgstr "Ups, anda melewatkan sesuatu atau dua kata sandi tidak cocok!"
+
+msgid "Jappix needs that you specify some values to work. Please correct the following inputs (or keep the default values, which are sufficient for most people)."
+msgstr "Jappix membutuhkan beberapa nilai yang spesifik untuk bekerja. Harap perbaiki masukan sebagai berikut (atau menyimpan nilai-nilai default, yang cukup untuk kebanyakan orang)."
+
+msgid "Note that if you don't specify a value which is compulsory, it will be automatically completed with the default one."
+msgstr "Catatan, jika anda tidak menentukan nilai yang bersifat wajib, maka akan secara otomatis dilengkapi dengan default."
+
+msgid "User"
+msgstr "Pengguna"
+
+msgid "Service"
+msgstr "Layanan"
+
+msgid "Service name"
+msgstr "Nama layanan"
+
+msgid "Service description"
+msgstr "Layanan deskripsi"
+
+msgid "Connection"
+msgstr "Koneksi"
+
+msgid "Lock the host"
+msgstr "Kunci host"
+
+msgid "Anonymous mode"
+msgstr "Modus anonim"
+
+msgid "Registration allowed"
+msgstr "Pendaftaran diperbolehkan"
+
+msgid "Use a proxy"
+msgstr "Gunakan proxy"
+
+msgid "Encryption"
+msgstr "Enkripsi"
+
+msgid "HTTPS storage"
+msgstr "Penyimpanan HTTPS"
+
+msgid "Force HTTPS"
+msgstr "memaksa HTTPS"
+
+msgid "Compression"
+msgstr "Kompresi"
+
+msgid "This page helps you specify the default hosts Jappix will connect to. You can leave it as it is and continue if you want to use the official service hosts."
+msgstr "Halaman ini membantu anda menentukan default host Jappix yang akan terhubung. Anda dapat meninggalkan seperti yang sudah ada dan melanjutkan jika anda ingin menggunakan host layanan resmi."
+
+msgid "Maybe you don't know what a BOSH server is? In fact, this is a relay between a Jappix client and a XMPP server, which is necessary because of technical limitations."
+msgstr "Mungkin anda tidak tahu apa server Bosh adalah? Pada kenyataannya, ini adalah sebuah relay antara klien dan server Jappix XMPP, yang diperlukan karena keterbatasan teknis."
+
+msgid "Main host"
+msgstr "Host Utama"
+
+msgid "Groupchat host"
+msgstr "Host Groupchat"
+
+msgid "Anonymous host"
+msgstr "Host Anonim"
+
+msgid "Directory host"
+msgstr "Host Direktori"
+
+msgid "BOSH host"
+msgstr "Host Bosh"
+
+msgid "You can install some extra softwares on your server, to extend your Jappix features. Some others might be modified, because of security restrictions which are set by default."
+msgstr "Anda dapat menginstal beberapa software tambahan pada server anda, untuk memperpanjang fitur Jappix anda. Beberapa yang lain mungkin diubah, karena pembatasan keamanan yang ditetapkan secara default."
+
+msgid "To perform this, you must be able to access your server's shell and be logged in as root. Remember this is facultative, Jappix will work without these modules, but some of its features will be unavailable."
+msgstr "Untuk melakukan ini, anda harus dapat akses shell server anda dan login sebagai root. Ingat ini adalah fakultatif, Jappix akan bekerja tanpa modul ini, tetapi beberapa dari fitur-fiturnya akan tersedia."
+
+msgid "After you finished the setup, Jappix will generate the cache files. It might be slow, just wait until the application is displayed and do not press any button."
+msgstr "Setelah anda selesai setup, Jappix akan menghasilkan file cache. Mungkin lambat, hanya menunggu sampai aplikasi ditampilkan dan tidak menekan tombol apapun."
+
+msgid "Thanks for using Jappix!"
+msgstr "Terima kasih untuk menggunakan Jappix!"
+
+msgid "Next"
+msgstr "Berikutnya"
+
+msgid "Finish"
+msgstr "Selesai"
+
+msgid "Check again"
+msgstr "Periksa lagi"
+
+msgid "The folder is not writable, set the right permissions to the %s directory."
+msgstr "Folder tidak dapat ditulis, mengatur hak akses yang benar ke direktori %s."
+
+msgid "%s is installed on your system."
+msgstr "%s diinstal pada sistem anda."
+
+msgid "%1s is not installed on your system, you should install %2s."
+msgstr "%1s tidak diinstal pada sistem anda, anda harus menginstal %2s."
+
+msgid "PHP maximum upload size is sufficient (%s)."
+msgstr "PHP ukuran maksimum upload cukup (%s)."
+
+msgid "PHP maximum upload size is not sufficient (%1s), you should define it to %2s in %3s."
+msgstr "PHP ukuran maksimum upload tidak cukup (%1s), anda harus mendefinisikan ke %2s di %3s."
+
+msgid "Jappix manager"
+msgstr "Jappix manajer"
+
+msgid "Manager access"
+msgstr "Manajer akses"
+
+msgid "Statistics"
+msgstr "Statistik"
+
+msgid "Hosts"
+msgstr "Host"
+
+msgid "Design"
+msgstr "Desain"
+
+msgid "Repeat"
+msgstr "Ulangi"
+
+msgid "All"
+msgstr "Semua"
+
+msgid "Horizontal"
+msgstr "Horisontal"
+
+msgid "Vertical"
+msgstr "Vertikal"
+
+msgid "Center"
+msgstr "Pusat"
+
+msgid "Left"
+msgstr "Kiri"
+
+msgid "Right"
+msgstr "Kanan"
+
+msgid "Top"
+msgstr "Atas"
+
+msgid "Bottom"
+msgstr "Bawah"
+
+msgid "Adapt"
+msgstr "Menyesuaikan"
+
+msgid "Color"
+msgstr "Warna"
+
+msgid "Users"
+msgstr "Pengguna"
+
+msgid "Updates"
+msgstr "Update"
+
+msgid "This is a restricted area: only the authorized users can manage this Jappix node."
+msgstr "Ini adalah area terbatas: hanya pengguna yang berwenang dapat mengatur node ini Jappix."
+
+msgid "Please use the form below to login to the administration panel."
+msgstr "Silakan gunakan formulir di bawah untuk login ke panel administrasi."
+
+msgid "To improve security, sessions are limited in time and when your browser will be closed, you will be logged out."
+msgstr "Untuk meningkatkan keamanan, sesi yang terbatas dalam waktu dan saat browser anda akan ditutup, anda akan log out."
+
+msgid "Credentials"
+msgstr "Surat kepercayaan"
+
+msgid "You have been logged out. Goodbye!"
+msgstr "Anda telah keluar. Selamat tinggal!"
+
+msgid "Oops, you could not be recognized as a valid administrator. Check your credentials!"
+msgstr "Ups, anda tidak dapat diakui sebagai administrator yang valid. Periksa kredensial anda!"
+
+msgid "Basic statistics are processed by Jappix about some important things, you can find them below."
+msgstr "Statistik dasar yang diproses oleh Jappix tentang beberapa hal penting, anda dapat menemukan mereka di bawah ini."
+
+msgid "Change your Jappix node configuration with this tool."
+msgstr "Ubah Jappix konfigurasi node dengan alat ini."
+
+msgid "Change the XMPP hosts that this Jappix node serve with this tool."
+msgstr "Mengubah host XMPP bahwa node ini Jappix melayani dengan alat ini."
+
+msgid "All this Jappix node stored files can be managed with this tool: please select a sub-folder and start editing its content!"
+msgstr "Semua file ini disimpan Jappix node dapat dikelola dengan alat ini: silahkan pilih sub-folder dan mulai mengedit isinya!"
+
+msgid "Jappix is fully customisable: you can change its design right here."
+msgstr "Jappix sepenuhnya dapat disesuaikan: anda bisa mengubah desain di sini."
+
+msgid "This is not a valid image, please use PNG, GIF or JPG!"
+msgstr "Ini bukan gambar yang sesuai, tolong gunakan PNG, GIF atau JPG!"
+
+msgid "The image could not be received, would you mind retry?"
+msgstr "Gambar tidak dapat diterima, maukah kau coba lagi?"
+
+msgid "Your image was added to the list!"
+msgstr "Gambar anda telah ditambahkan ke dalam daftar!"
+
+msgid "Changes saved!"
+msgstr "Perubahan disimpan!"
+
+msgid "You can define more than one administrator for this Jappix node. You can also change a password with this tool."
+msgstr "Anda dapat menentukan lebih dari satu administrator untuk node ini Jappix. Anda juga dapat mengubah password dengan alat ini."
+
+msgid "Update your Jappix node with this tool, or check if a new one is available. Informations about the latest version are also displayed (in english)."
+msgstr "Perbarui simpul Jappix anda dengan alat ini, atau periksa jika yang baru tersedia. Informasi tentang versi terbaru juga ditampilkan (dalam bahasa Inggris)."
+
+msgid "Access statistics"
+msgstr "Akses statistik"
+
+msgid "Share statistics"
+msgstr "Berbagi statistik"
+
+msgid "Other statistics"
+msgstr "Lain statistik"
+
+msgid "January"
+msgstr "Januari"
+
+msgid "February"
+msgstr "Februari"
+
+msgid "March"
+msgstr "Maret"
+
+msgid "April"
+msgstr "April"
+
+msgid "May"
+msgstr "Mei"
+
+msgid "June"
+msgstr "Juni"
+
+msgid "July"
+msgstr "Juli"
+
+msgid "August"
+msgstr "Agustus"
+
+msgid "September"
+msgstr "September"
+
+msgid "October"
+msgstr "Oktober"
+
+msgid "November"
+msgstr "November"
+
+msgid "December"
+msgstr "Desember"
+
+msgid "Monday"
+msgstr "Senin"
+
+msgid "Tuesday"
+msgstr "Selasa"
+
+msgid "Wednesday"
+msgstr "Rabu"
+
+msgid "Thursday"
+msgstr "Kamis"
+
+msgid "Friday"
+msgstr "Jumat"
+
+msgid "Saturday"
+msgstr "Sabtu"
+
+msgid "Sunday"
+msgstr "Minggu"
+
+msgid "Total"
+msgstr "Total"
+
+msgid "Cache"
+msgstr "Penutup"
+
+msgid "Logs"
+msgstr "Log"
+
+msgid "Music"
+msgstr "Musik"
+
+msgid "Backgrounds"
+msgstr "Backgrounds"
+
+msgid "Share"
+msgstr "Berbagi"
+
+msgid "Background"
+msgstr "Latar belakang"
+
+msgid "Notice"
+msgstr "Pemberitahuan"
+
+msgid "Your design preferences have been saved!"
+msgstr "Setting gambar anda telah disimpan!"
+
+msgid "Please check your inputs: something is missing!"
+msgstr "Silakan periksa masukan anda: sesuatu yang hilang!"
+
+msgid "Change your Jappix node background with this tool. You can either set a custom color or an uploaded image. Let your creativity flow!"
+msgstr "Ubah latar belakang simpul Jappix dengan alat ini. Anda juga dapat mengatur warna kustom atau foto yang diunggah. Biarkan kreativitas anda mengalir!"
+
+msgid "Use default background"
+msgstr "Gunakan latar belakang standar"
+
+msgid "Use your own image"
+msgstr "Gunakan gambar anda sendiri"
+
+msgid "Select a background to use and change the display options."
+msgstr "Pilih latar belakang untuk menggunakan dan mengubah pilihan tampilan."
+
+msgid "Use your own color"
+msgstr "Gunakan warna sendiri"
+
+msgid "Type the hexadecimal color value you want to use as a background."
+msgstr "Ketik nilai warna heksadesimal yang ingin anda gunakan sebagai latar belakang."
+
+msgid "Manage backgrounds"
+msgstr "Mengelola latar belakang"
+
+msgid "You can add a new background to the list with this tool. Please send a valid image."
+msgstr "Anda dapat menambahkan latar belakang baru ke dalam daftar dengan alat ini. Silakan kirim gambar yang valid."
+
+msgid "If you want to remove some backgrounds, use the browser below."
+msgstr "Jika anda ingin menghapus beberapa latar belakang, gunakan browser di bawah ini."
+
+msgid "Define a homepage notice for all your users, such as a warn, an important message or an advert with this tool."
+msgstr "Tentukan pemberitahuan homepage untuk semua pengguna anda, seperti memperingatkan, pesan penting atau sebuah iklan dengan alat ini."
+
+msgid "Simple notice"
+msgstr "Pemberitahuan Sederhana"
+
+msgid "This notice only needs simple text to be displayed, but no code is allowed!"
+msgstr "Pemberitahuan ini hanya perlu teks sederhana yang akan ditampilkan, tetapi kode tidak diperbolehkan!"
+
+msgid "Advanced notice"
+msgstr "Pemberitahuan Lanjutan"
+
+msgid "You can customize your notice with embedded HTML, CSS and JavaScript, but you need to code the style."
+msgstr "Anda dapat menyesuaikan pemberitahuan anda dengan embedded HTML, CSS dan JavaScript, tetapi anda perlu kode tampilannya."
+
+msgid "Available updates"
+msgstr "Update tersedia"
+
+msgid "What's new?"
+msgstr "Apa yang baru?"
+
+msgid "Your storage folders are not writable, please apply the good rights!"
+msgstr "Folder penyimpanan anda tidak dapat ditulis, silahkan menerapkan hak-hak baik!"
+
+msgid "%1s may cause problems to the proxy, please increase %2s value up to %3s!"
+msgstr "%1s dapat menyebabkan masalah ke proxy, silahkan peningkatan nilai %2s sampai dengan %3s!"
+
+msgid "You are using a development version of Jappix. Update it through our repository by executing: %s."
+msgstr "Anda menggunakan versi pengembangan dari Jappix. Pembaruan melalui repositori kita dengan menjalankan: %s."
+
+msgid "A new Jappix version is available! Check what is new and launch the update!"
+msgstr "Sebuah versi Jappix baru tersedia! Memeriksa apa yang baru dan peluncuran update!"
+
+msgid "Your version is out to date. Update it now to %s by clicking here!"
+msgstr "Versi anda keluar untuk tanggal. Update sekarang untuk %s dengan mengklik di sini!"
+
+msgid "Your version seems to be up to date, but you can check updates manually by clicking here."
+msgstr "Versi anda tampaknya up to date, tetapi anda dapat memeriksa update secara manual dengan mengklik di sini."
+
+msgid "Check for updates"
+msgstr "Periksa pembaruan"
+
+msgid "Update in progress"
+msgstr "Update sedang diproses"
+
+msgid "Jappix has been updated: you are now running the latest version. Have fun!"
+msgstr "Jappix telah diperbarui: anda sekarang menjalankan versi terbaru. Selamat Bersenang-senang!"
+
+msgid "The update has failed! Please try again later."
+msgstr "Update telah gagal! Silakan coba lagi nanti."
+
+msgid "Downloading package..."
+msgstr "Men-download paket ..."
+
+msgid "Removing current Jappix system files..."
+msgstr "Menghapus file saat ini Jappix sistem ..."
+
+msgid "Extracting package..."
+msgstr "Ekstrak paket ..."
+
+msgid "Regenerating storage folder tree..."
+msgstr "Regenerasi penyimpanan folder ..."
+
+msgid "Jappix is now up to date!"
+msgstr "Jappix sekarang terbaru!"
+
+msgid "Aborted: socket error!"
+msgstr "Dibatalkan: kesalahan socket!"
+
+msgid "Aborted: buffer error!"
+msgstr "Dibatalkan: kesalahan penyangga!"
+
+msgid "Aborted: everything is not writable!"
+msgstr "Dibatalkan: semuanya tidak ditulis!"
+
+msgid "Aborted: could not extract the package!"
+msgstr "Dibatalkan: tidak bisa ekstrak paket itu!"
+
+msgid "Visits"
+msgstr "Kunjungan"
+
+msgid "Daily"
+msgstr "Harian"
+
+msgid "Weekly"
+msgstr "Mingguan"
+
+msgid "Monthly"
+msgstr "Bulanan"
+
+msgid "Yearly"
+msgstr "Tahunan"
+
+msgid "Size"
+msgstr "Ukuran"
+
+msgid "Clean everything"
+msgstr "Bersihkan semua"
+
+msgid "Purge cache"
+msgstr "Purge Cache"
+
+msgid "Purge logs"
+msgstr "Purge log"
+
+msgid "Purge updates"
+msgstr "Purge update"
+
+msgid "The storage folder you wanted to clean is now empty!"
+msgstr "Folder penyimpanan yang anda ingin bersihkan sekarang kosong!"
+
+msgid "Keep your Jappix node fresh and fast, clean the storage folders regularly!"
+msgstr "Pertahankan Jappix anda agar selalu segar dan cepat, bersihkan folder penyimpanan secara teratur!"
+
+msgid "Upload your music (Ogg Vorbis, MP3 or WAV) to be able to listen to it in Jappix!"
+msgstr "Upload musik anda (Ogg Vorbis, MP3 atau WAV) untuk dapat didengarkan di Jappix!"
+
+msgid "The file you want to upload must be smaller than %s."
+msgstr "File yang ingin anda upload harus lebih kecil dari %s."
+
+msgid "Stay tuned in what your users store on your server and remove undesired content with this tool."
+msgstr "Tetap setia dalam apa toko pengguna anda pada server anda dan menghapus konten yang tidak diinginkan dengan alat ini."
+
+msgid "Title"
+msgstr "Judul"
+
+msgid "Artist"
+msgstr "Artist"
+
+msgid "Album"
+msgstr "Album"
+
+msgid "File"
+msgstr "File yang"
+
+msgid "Upload"
+msgstr "Upload"
+
+msgid "The folder is empty."
+msgstr "Folder kosong."
+
+msgid "The music could not be received, please retry!"
+msgstr "Musik tidak dapat didengar, silahkan coba lagi"
+
+msgid "This is not a valid music file, please encode in Ogg Vorbis, MP3 or WAV!"
+msgstr "Ini bukan file musik yang valid, silakan mengkodekan dalam Ogg Vorbis, MP3 atau WAV!"
+
+msgid "Your music has been added!"
+msgstr "Lagu anda telah dimasukkan"
+
+msgid "The selected elements have been removed."
+msgstr "Unsur-unsur yang dipilih telah dihapus."
+
+msgid "You must select elements to remove!"
+msgstr "Anda harus memilih elemen untuk menghapus!"
+
+msgid "Add a new user with this tool, or change a password (type an existing username). Please submit a strong password!"
+msgstr "Menambahkan user baru dengan alat ini, atau mengubah password (ketikkan nama pengguna yang sudah ada). Harap kirimkan password yang kuat!"
+
+msgid "Manage"
+msgstr "Mengelola"
+
+msgid "List"
+msgstr "Daftar"
+
+msgid "Remove users with this tool. Note that you cannot remove an user if he is the only one remaining."
+msgstr "Hapus pengguna dengan alat ini. Perhatikan bahwa anda tidak dapat menghapus pengguna jika ia adalah satu-satunya yang tersisa."
+
+msgid "The user has been added!"
+msgstr "Pengguna telah ditambahkan!"
+
+msgid "The chosen users have been removed."
+msgstr "Para pengguna yang dipilih telah dihapus."
+
+msgid "You must select one or more users to be removed!"
+msgstr "Anda harus memilih satu atau lebih pengguna untuk dihapus"
+
+msgid "Yesterday"
+msgstr "Kemarin"
+
+msgid "%s days ago"
+msgstr "%s hari yang lalu"
+
+msgid "User currently active"
+msgstr "Pengguna yang sedang aktif"
+
+msgid "Last seen: %s"
+msgstr "Terakhir dilihat: %s"
+
+msgid "Inactive since: %s"
+msgstr "Tidak aktif sejak: %s"
+
+msgid "Your friend seems not to have received your message(s)!"
+msgstr "Teman anda tampaknya tidak menerima pesan anda (s)!"
+
+msgid "Static content server"
+msgstr "Statis server isi"
+
+msgid "This is the static content server for %1s, “%2s”."
+msgstr "Ini adalah server konten statis untuk %1s, “%2s”."
+
+msgid "Suggested friends"
+msgstr "Sarankan teman"
+
+msgid "Check all"
+msgstr "Periksa semua"
+
+msgid "Uncheck all"
+msgstr "Hapus centang semua"
+
+msgid "Choose"
+msgstr "Pilih"
+
+msgid "List name"
+msgstr "Daftar nama"
+
+msgid "Allow"
+msgstr "Perbolehkan"
+
+msgid "Deny"
+msgstr "Menolak"
+
+msgid "Group"
+msgstr "Kelompok"
+
+msgid "Subscription"
+msgstr "Berlangganan"
+
+msgid "Both"
+msgstr "Keduanya"
+
+msgid "From"
+msgstr "Dari"
+
+msgid "Everybody"
+msgstr "Semua orang"
+
+msgid "Send messages"
+msgstr "Kirim pesan"
+
+msgid "Send queries"
+msgstr "Kirim query"
+
+msgid "See my status"
+msgstr "Lihat status saya"
+
+msgid "Send his/her status"
+msgstr "Kirim statusnya"
+
+msgid "Everything"
+msgstr "Segalanya"
+
+msgid "Item"
+msgstr "Barang"
+
+msgid "Order"
+msgstr "Rangka"
+
+msgid "Active for this session"
+msgstr "Aktif untuk sesi ini"
+
+msgid "Always active"
+msgstr "Selalu aktif"
+
+msgid "User directory"
+msgstr "Direktori user"
+
+msgid "Search a friend"
+msgstr "Cari teman"
+
+msgid "The feature requested is not implemented by the recipient or server and therefore cannot be processed."
+msgstr "Fitur yang diminta tidak dilaksanakan oleh penerima atau server dan karena itu tidak dapat diproses."
+
+msgid "This is a repeat from %s"
+msgstr "Ini adalah pengulangan dari %s"
+
+msgid "Loading comments..."
+msgstr "Memuat komentar..."
+
+msgid "Type your comment here..."
+msgstr "Ketik komentar anda di sini..."
+
+msgid "Could not get the comments!"
+msgstr "Tidak dapat menampilkan komentar!"
+
+msgid "Show comments"
+msgstr "Tampilkan komentar"
+
+msgid "Send him/her a message"
+msgstr "Kirim kan dia pesan"
+
+msgid "Start a chat with him/her"
+msgstr "Mulai obrolan dengan dia"
+
+msgid "Media integration"
+msgstr "Integrasi Media"
+
+msgid "Comments locked!"
+msgstr "Komentar terkunci!"
+
+msgid "Type something you want to share with your friends..."
+msgstr "Ketik sesuatu untuk dibagikan ke teman..."
+
+msgid "changed his/her nickname to %s"
+msgstr "merubah nama panggilannya ke %s"
+
+msgid "commented an item you follow: “%s”."
+msgstr "mengkomentari item yang kamu ikuti: “%s”."
+
+msgid "Hide"
+msgstr "Menyembunyikan"
+
+msgid "liked your post: “%s”."
+msgstr "suka dengan isian anda: “%s”."
+
+msgid "quoted you somewhere: “%s”."
+msgstr "dikutip di suatu tempat: “%s”."
+
+msgid "published on your wall: “%s”."
+msgstr "diterbitkan di dinding: “%s”."
+
+msgid "tagged you in a photo (%s)."
+msgstr "tag anda di photo (%s)"
+
+msgid "tagged you in a video (%s)."
+msgstr "tag anda di video (%s)."
+
+msgid "Show"
+msgstr "Tampilkan"
+
+msgid "Need help? You'd better read our documentation page about how to fill this form!"
+msgstr "Perlu bantuan? Anda sebaiknya membaca halaman dokumentasi kami tentang bagaimana mengisi formulir ini!"
+
+msgid "Pubsub host"
+msgstr "Host Pubsub"
+
+msgid "Jappix is a great social platform, that you can access wherever you are, whenever you want and communicate with whovever you want."
+msgstr "Jappix adalah sebuah platform sosial yang hebat, yang dapat Anda akses di manapun Anda berada, kapan pun Anda inginkan dan berkomunikasi dengan siapapun yang Anda inginkan."
+
+msgid "Manager link"
+msgstr "Link manager"
+
+msgid "User uploads server"
+msgstr "Server upload pengguna"
+
+msgid "This is the user uploads server for %1s, “%2s”."
+msgstr "Ini server upload pengguna untuk %1s, “%2s”."
+
+msgid "Logo"
+msgstr "Logo"
+
+msgid "You can set your own service logo to replace the default one. Take care of the size and the main color of each logo!"
+msgstr "Anda dapat mengatur logo layanan Anda sendiri untuk menggantikan default. Jaga ukuran dan warna utama logo masing-masing!"
+
+msgid "Upload each logo with the recommended maximum pixel size."
+msgstr "Upload masing-masing logo dengan ukuran pixel maksimum yang disarankan."
+
+msgid "This is not a valid image, please use the PNG format!"
+msgstr "Ini bukan gambar yang sesuai, tolong gunakan format PNG!"
+
+msgid "Your service logo has been successfully changed!"
+msgstr "Servis logo anda telah sukses diganti!"
+
+msgid "Your logo format must be PNG. Leave a field empty and the logo will not be changed."
+msgstr "Format logo anda harus PNG. Tinggalkan field kosong dan Logo tidak akan terganti."
+
+msgid "Remove this logo"
+msgstr "Hapus logo ini"
+
+msgid "View this logo"
+msgstr "Lihat logo ini"
+
+msgid "Send a file"
+msgstr "Mengirim file"
+
+msgid "Once uploaded, your friend will be prompted to download the file you sent."
+msgstr "Setelah upload, teman Anda akan diminta untuk men-download file yang Anda kirim."
+
+msgid "Groupchats to join"
+msgstr "Groupchats untuk bergabung"
+
+msgid "Purge sent files"
+msgstr "Purge file terkirim"
+
+msgid "would like to send you a file: “%s”."
+msgstr "ingin mengirimkan file: “%s”."
+
+msgid "has accepted to received your file: “%s”."
+msgstr "telah diterima untuk menerima file anda: “%s”."
+
+msgid "has rejected to receive your file: “%s”."
+msgstr "telah menolak untuk menerima file anda: “%s”."
+
+msgid "could not receive your file: “%s”."
+msgstr "tidak bisa menerima file anda: “%s”."
+
+msgid "has received a file exchange request: “%s”."
+msgstr "telah menerima permintaan pertukaran file: “%s”."
+
+msgid "Available shortcuts:"
+msgstr "Tersedia jalan pintas:"
+
+msgid "%s removes the chat logs"
+msgstr "%s menghapus chat log"
+
+msgid "%s joins a groupchat"
+msgstr "%s bergabung groupchat"
+
+msgid "%s closes the chat"
+msgstr "%s menutup obrolan"
+
+msgid "%s shows the user profile"
+msgstr "%s menunjukkan profil pengguna"
+
+msgid "%s sends a message to the room"
+msgstr "%s mengirim pesan ke room"
+
+msgid "%s changes your nickname"
+msgstr "%s perubahan nama panggilan anda"
+
+msgid "%s sends a message to someone in the room"
+msgstr "%s mengirim pesan kepada seseorang di dalam room"
+
+msgid "%s changes the room topic"
+msgstr "%s merubah topik di room"
+
+msgid "%s kicks an user of the room"
+msgstr "%s tendang pengguna room"
+
+msgid "%s bans an user of the room"
+msgstr "%s melarang pengguna ke room"
+
+msgid "%s invites someone to join the room"
+msgstr "%s mengajak seseorang untuk bergabung dalam room"
+
+msgid "Social channel, chat and more."
+msgstr ""
+
+msgid "Create your public profile."
+msgstr ""
+
+msgid "A mini-chat for your website."
+msgstr ""
+
+msgid "Get Jappix, get support."
+msgstr ""
+
+msgid "Statistics around Jappix."
+msgstr ""
+
+msgid "Download Jappix for free."
+msgstr ""
+
+msgid "Find a public Jappix node."
+msgstr ""
+
+msgid "Public profile"
+msgstr ""
+
+msgid "Your profile anywhere on the Web."
+msgstr ""
+
+msgid "%s is a Jappix.com service which makes your XMPP profile public. It is easier to share it. No XMPP account is required to view your social channel, your current position and your contact details."
+msgstr ""
+
+msgid "Furthermore, every picture you post in your social channel is added to a beautiful picture timeline. You can now view the pictures you shared year by year."
+msgstr ""
+
+msgid "You can also use your XMPP avatar as a single avatar for every website, blog and forum you use. When you change it on XMPP, the new avatar appears everywhere. What a genious improvement!"
+msgstr ""
+
+msgid "Yay, let's create my public profile!"
+msgstr ""
+
+msgid "Enable my public profile"
+msgstr ""
+
+#~ msgid "Jappix is a non-profit social platform, that you can access wherever you are, whenever you want and communicate with whovever you want."
+#~ msgstr ""
+
+#~ msgid "See"
+#~ msgstr ""
+
+#~ msgid "Use default logo"
+#~ msgstr ""
+
+#~ msgid "Use your own logo"
+#~ msgstr ""
+
+#~ msgid "The recommended image format is PNG. Leave a field empty and the logo will not be changed."
+#~ msgstr ""
diff --git a/jappixmini/jappix/lang/it/LC_MESSAGES/main.mo b/jappixmini/jappix/lang/it/LC_MESSAGES/main.mo
new file mode 100644
index 00000000..a5e62f48
Binary files /dev/null and b/jappixmini/jappix/lang/it/LC_MESSAGES/main.mo differ
diff --git a/jappixmini/jappix/lang/it/LC_MESSAGES/main.po b/jappixmini/jappix/lang/it/LC_MESSAGES/main.po
new file mode 100644
index 00000000..a1726a54
--- /dev/null
+++ b/jappixmini/jappix/lang/it/LC_MESSAGES/main.po
@@ -0,0 +1,1870 @@
+# Italian translations for Jappix package.
+# This file is distributed under the same license as the Jappix package.
+# This file was translated from CodingTeam at <http://codingteam.net/>.
+msgid ""
+msgstr ""
+"Project-Id-Version: Jappix\n"
+"PO-Revision-Date: 2012-01-16 21:27+0100\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"POT-Creation-Date: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+
+msgid "JavaScript is missing in your web browser, so that you will not be able to launch Jappix! Please fix this."
+msgstr "Javascript è disattivato nel tuo browser, ed è richiesto per lanciare Jappix correttamente!"
+
+msgid "An open social network"
+msgstr "Un network sociale aperto"
+
+msgid "Jappix has been interrupted by a network issue, a bug or bad login (check that you entered the right credentials), sorry for the inconvenience."
+msgstr "Jappix è stato interrotto da un errore di rete, un bug o un login errato (controlla di aver inserito le credenziali corrette), ci spiace per il disagio."
+
+msgid "The element list on this server could not be obtained!"
+msgstr "Non sono stato in grado di ottenere la lista elementi di questo server!"
+
+msgid "Your password has been changed, now you can connect to your account with your new login data."
+msgstr "La tua password è stata cambiata, puoi accedere con i tuoi nuovi dati di accesso."
+
+msgid "Your XMPP account has been removed, bye!"
+msgstr "Il tuo account XMPP è stato rimosso, arrivederci!"
+
+msgid "You have been logged out of your XMPP account, have a nice day!"
+msgstr "Ti sei disconnesso dal tuo account XMPP, buona giornata!"
+
+msgid "The room you joined seems not to exist. You should create it!"
+msgstr "La room a cui hai scelto di partecipare non esiste, dovresti crearla!"
+
+msgid "The groupchat has been removed, now someone else will be able to recreate it."
+msgstr "La chat di gruppo è stata rimossa, qualcun altro sarà adesso in grado di ricrearla."
+
+msgid "The user that you want to reach is not present in the room."
+msgstr "L'utente che vuoi raggiungere non è presente nella room."
+
+msgid "Please enter the group chat address to join."
+msgstr "Perpiacere inserisci l'indirizzo della chat di gruppo a cui vuoi partecipare."
+
+msgid "Please enter your nickname to join %s."
+msgstr "Perpiacere inserisci il tuo nickname per entrare in %s."
+
+msgid "This room (%s) is protected with a password."
+msgstr "Questa room (%s) è protetta da una password."
+
+msgid "Your browser is out of date!"
+msgstr "Il tuo browser è obsoleto!"
+
+msgid "Last %s version is better!"
+msgstr "L'ultima versione (%s) è stata migliorata!"
+
+msgid "Login"
+msgstr "Accedi"
+
+msgid "Register"
+msgstr "Registrati"
+
+msgid "Here we go!"
+msgstr "Ecco fatto!"
+
+msgid "Server"
+msgstr "Server"
+
+msgid "Password"
+msgstr "Password"
+
+msgid "Remember me"
+msgstr "Ricordami"
+
+msgid "This tool has been disabled, you cannot use it!"
+msgstr "Questo strumento è stato disabilitato, non puoi utilizzarlo!"
+
+msgid "Due to a network issue, you were disconnected. What do you want to do now?"
+msgstr "Per via di un problema di rete, sei stato disconnesso. Cosa vuoi fare adesso?"
+
+msgid "Reconnect"
+msgstr "Riconnetti"
+
+msgid "Messages"
+msgstr "Messaggi"
+
+msgid "Profile"
+msgstr "Profilo"
+
+msgid "Options"
+msgstr "Preferenze"
+
+msgid "Disconnect"
+msgstr "Disconnettiti"
+
+msgid "Filter"
+msgstr "Filtro"
+
+msgid "Add a friend"
+msgstr "Aggiungi un amico o un'amica"
+
+msgid "Your groupchats"
+msgstr "Le tue chat di gruppo"
+
+msgid "Manage your favorite groupchats"
+msgstr "Amministra le tue chat di gruppo preferite"
+
+msgid "More stuff"
+msgstr "Altro"
+
+msgid "Show all friends"
+msgstr "Mostra tutti i tuoi amici"
+
+msgid "Only show connected friends"
+msgstr "Mostra solo gli amici connessi"
+
+msgid "Message archives"
+msgstr "Archivii messaggi"
+
+msgid "Date"
+msgstr "Data"
+
+msgid "Please select a friend to view the chat history."
+msgstr "Selezionare un amico per visualizzare la cronologia della chat"
+
+msgid "Nothing found for: %s"
+msgstr "Nessun risultato per: %s"
+
+msgid "A short message?"
+msgstr "Un piccolo messaggio?"
+
+msgid "How are you?"
+msgstr "Come stai?"
+
+msgid "What are you doing?"
+msgstr "Cosa stai facendo?"
+
+msgid "Join a chat"
+msgstr "Unisciti a una chat"
+
+msgid "Status"
+msgstr "Stato"
+
+msgid "Available"
+msgstr "Disponibile"
+
+msgid "Talkative"
+msgstr "Vuole chiaccherare"
+
+msgid "Away"
+msgstr "Assente"
+
+msgid "Not available"
+msgstr "Indisponibile"
+
+msgid "Busy"
+msgstr "Occupato"
+
+msgid "Mood"
+msgstr "Umore"
+
+msgid "None"
+msgstr "Nessuno"
+
+msgid "Crazy"
+msgstr "Svitato"
+
+msgid "Excited"
+msgstr "Eccitato"
+
+msgid "Playful"
+msgstr "Brioso"
+
+msgid "Happy"
+msgstr "Felice"
+
+msgid "Shocked"
+msgstr "Scioccato"
+
+msgid "Hot"
+msgstr "Ardente"
+
+msgid "Sad"
+msgstr "Triste"
+
+msgid "Amorous"
+msgstr "Amoroso"
+
+msgid "Confident"
+msgstr "Fiducioso"
+
+msgid "Activity"
+msgstr "Attività"
+
+msgid "Chores"
+msgstr "Sta facendo i mestieri..."
+
+msgid "Drinking"
+msgstr "Sta bevendo..."
+
+msgid "Eating"
+msgstr "Sta mangiando..."
+
+msgid "Exercising"
+msgstr "Esercizio"
+
+msgid "Grooming"
+msgstr "Si sta 'spulciando'..."
+
+msgid "Appointment"
+msgstr "Appuntamento"
+
+msgid "Inactive"
+msgstr "Inattivo"
+
+msgid "Relaxing"
+msgstr "Si rilassa"
+
+msgid "Talking"
+msgstr "Discute"
+
+msgid "Traveling"
+msgstr "In viaggio"
+
+msgid "Working"
+msgstr "Lavoro"
+
+msgid "View profile"
+msgstr "Guarda profilo"
+
+msgid "Repeat this notice"
+msgstr "Ripeti questo avviso"
+
+msgid "Remove this notice"
+msgstr "Rimuovi questa nota"
+
+msgid "Your profile"
+msgstr "Il tuo profilo"
+
+msgid "Identity"
+msgstr "Identità"
+
+msgid "Profile image"
+msgstr "Immagine del profilo"
+
+msgid "Others"
+msgstr "Altri"
+
+msgid "Personal"
+msgstr "Personale"
+
+msgid "Complete name"
+msgstr "Nome completo"
+
+msgid "Nickname"
+msgstr "Soprannome"
+
+msgid "First name"
+msgstr "Nome"
+
+msgid "Last name"
+msgstr "Cognome"
+
+msgid "Date of birth"
+msgstr "Data di nascita"
+
+msgid "Contact"
+msgstr "Contattaci"
+
+msgid "E-mail"
+msgstr "E-mail"
+
+msgid "Phone"
+msgstr "Telefono"
+
+msgid "Website"
+msgstr "Sito web"
+
+msgid "Current"
+msgstr "Corrente"
+
+msgid "Delete"
+msgstr "Cancella"
+
+msgid "What a pity! You have no profile image defined in your identity card!"
+msgstr "Che peccato, non hai una immagine definita nel profilo della tua vCard!"
+
+msgid "Address"
+msgstr "Indirizzo"
+
+msgid "Street"
+msgstr "Via"
+
+msgid "City"
+msgstr "Città"
+
+msgid "Postal code"
+msgstr "Numero postale"
+
+msgid "Country"
+msgstr "Nazione"
+
+msgid "Biography"
+msgstr "Biografia"
+
+msgid "Important notice"
+msgstr "Avviso importante"
+
+msgid "Be careful of the information you write into your profile, because it could be accessed by everyone (even someone you don't want to)."
+msgstr "Fai attenzione alle informazione che inserisci nel tuo profilo, perchè potrebbero essere viste da chiunque (anche chi non vuoi)."
+
+msgid "Not everything is private on XMPP; this is one of those things, your public profile (vCard)."
+msgstr "Non tutto è riservato su XMPP; come il tuo profilo pubblico (vCard)."
+
+msgid "It is strongly recommended to upload a profile image (%s maximum), like a picture of yourself, because that makes you easily recognizable by your friends."
+msgstr "Ti incoraggiamo a caricare un'immagine per il tuo profile (%s massimo), come un'immagine di te stesso/a, ti renderà più facilmente riconoscibile dai tuoi amici."
+
+msgid "Save"
+msgstr "Salva"
+
+msgid "Cancel"
+msgstr "Annullare"
+
+msgid "Edit options"
+msgstr "Modifica opzioni"
+
+msgid "Channel"
+msgstr "Canale"
+
+msgid "Commands"
+msgstr "Comandi"
+
+msgid "Sounds"
+msgstr "Suoni"
+
+msgid "Privacy"
+msgstr "Privacy"
+
+msgid "Message archiving"
+msgstr "Archiviazione messaggi"
+
+msgid "Store a history of your chats"
+msgstr "Salva la cronologia delle tue chats"
+
+msgid "Geolocation"
+msgstr "Geolocazione"
+
+msgid "Empty"
+msgstr "Svuota"
+
+msgid "Empty channel"
+msgstr "Svuota canale"
+
+msgid "Persistent"
+msgstr "Persistente"
+
+msgid "Maximum notices"
+msgstr "Notifica di massimo"
+
+msgid "Account"
+msgstr "Account"
+
+msgid "Change password"
+msgstr "Cambia password"
+
+msgid "Delete account"
+msgstr "Cancella account"
+
+msgid "Old"
+msgstr "Vecchio"
+
+msgid "New (2 times)"
+msgstr "Nuovo (2 volte)"
+
+msgid "Continue"
+msgstr "Continua"
+
+msgid "To"
+msgstr "A"
+
+msgid "Close"
+msgstr "Chiuso"
+
+msgid "unknown"
+msgstr "sconosciuto"
+
+msgid "Unavailable"
+msgstr "Non disponibile"
+
+msgid "is now"
+msgstr "è adesso"
+
+msgid "Please wait while your avatar is uploaded..."
+msgstr "Perpiacere attendi mentre carico il tuo avatar..."
+
+msgid "Here it is! A new beautiful profile image!"
+msgstr "Ecco qui, la nuova immagine per il tuo profilo!"
+
+msgid "The image file is not supported or has a bad size."
+msgstr "Questo file immagine è in un formato non supportato o eccede la dimensione massima."
+
+msgid "Reply"
+msgstr "Rispondere"
+
+msgid "Error"
+msgstr "Errore"
+
+msgid "Click here to solve the error"
+msgstr "Clicca qui per risolvere l'errore"
+
+msgid "You"
+msgstr "Tu"
+
+msgid "Remove"
+msgstr "Rimuovi"
+
+msgid "Rename"
+msgstr "Rinomina"
+
+msgid "Hi, I am %s, I would like to add you as my friend."
+msgstr "Ciao, sono %s, vorrei aggiungerti come amico."
+
+msgid "Smiley insertion"
+msgstr "Inserisci un emote"
+
+msgid "Change style"
+msgstr "Cambia stile"
+
+msgid "Text in bold"
+msgstr "Testo in grassetto"
+
+msgid "Text in italic"
+msgstr "Testo in corsivo"
+
+msgid "Underlined text"
+msgstr "Testo sottolineato"
+
+msgid "Save chat"
+msgstr "Salva discussione"
+
+msgid "Click on the following link to get the chat log, and wait. Then click again to get the file."
+msgstr "Clicca al link seguente per ottenere il log della chat, aspetta un attimo e clicca un'altra volta per ottenere il file."
+
+msgid "This chat is empty!"
+msgstr "Questa chat è vuota!"
+
+msgid "Generate file!"
+msgstr "Genera il file!"
+
+msgid "Download file!"
+msgstr "Scarica il file!"
+
+msgid "Clean current chat"
+msgstr "Pulisci la discussione corrente"
+
+msgid "View chat history"
+msgstr "Visualizza la cronologia della chat"
+
+msgid "Show user profile"
+msgstr "Mostra il profilo utente"
+
+msgid "Add this contact to your friends"
+msgstr "Aggiungi questo contatto ad i tuoi amici"
+
+msgid "Add this groupchat to your favorites"
+msgstr "Aggiungi questa chat di gruppo ai tuoi favoriti"
+
+msgid "All tabs"
+msgstr "Tutti i cavalieri"
+
+msgid "Close this tab"
+msgstr "Chiudi questo cavaliere"
+
+msgid "no subject defined for this room."
+msgstr "nessun oggetto definito per questa stanza"
+
+msgid "Administration panel for this room"
+msgstr "Pannello di controllo per questa stanza"
+
+msgid "Moderators"
+msgstr "Moderatori"
+
+msgid "Participants"
+msgstr "Partecipanti"
+
+msgid "Visitors"
+msgstr "Visitatori"
+
+msgid "Manage favorite rooms"
+msgstr "Controlla le tue room preferite"
+
+msgid "Change favorites"
+msgstr "Modifica i preferiti"
+
+msgid "Search a room"
+msgstr "Cerca stanza"
+
+msgid "Select a favorite"
+msgstr "Seleziona favorito"
+
+msgid "Getting the name..."
+msgstr "Sto ottenendo il nome..."
+
+msgid "Gateway"
+msgstr "Transporto"
+
+msgid "Name"
+msgstr "Nome"
+
+msgid "Room"
+msgstr "stanza"
+
+msgid "Add"
+msgstr "Aggiungi"
+
+msgid "Edit"
+msgstr "Modifica"
+
+msgid "Search a room on"
+msgstr "Cerca una stanza in"
+
+msgid "No room found on this server."
+msgstr "Nessuna stanza in questo server"
+
+msgid "Service discovery"
+msgstr "Scoperta servizi"
+
+msgid "Server to query"
+msgstr "Server in cui cercare"
+
+msgid "Sorry, but the entity didn't return any result!"
+msgstr "Ci dispiace, ma l'entità non ha dato nessun risultato!"
+
+msgid "Accounts"
+msgstr "Accounts"
+
+msgid "Authentications"
+msgstr "Autenticazioni"
+
+msgid "Automation"
+msgstr "Automazione"
+
+msgid "Clients"
+msgstr "Clienti"
+
+msgid "Collaboration"
+msgstr "Collaborazione"
+
+msgid "Components"
+msgstr "Componenti"
+
+msgid "Rooms"
+msgstr "Stanze"
+
+msgid "Directories"
+msgstr "Cartelle"
+
+msgid "Gateways"
+msgstr "Gateways"
+
+msgid "News"
+msgstr "News"
+
+msgid "Hierarchy"
+msgstr "Gerarchia"
+
+msgid "Proxies"
+msgstr "i Proxie"
+
+msgid "Publication/Subscription"
+msgstr "Pubblicazioni/Sottoscrizioni"
+
+msgid "Storage"
+msgstr "Spazio"
+
+msgid "Service offline or broken"
+msgstr "Servizio Off.line o Fuori Uso"
+
+msgid "Your inbox"
+msgstr "Messaggi in entrata"
+
+msgid "Available actions"
+msgstr "Azioni disponibili"
+
+msgid "Clean"
+msgstr "Svuota"
+
+msgid "New"
+msgstr "Nuovo"
+
+msgid "Received"
+msgstr "Ricevuti"
+
+msgid "Subject"
+msgstr "Oggetto"
+
+msgid "Content"
+msgstr "Contenuto"
+
+msgid "Send message"
+msgstr "Invia messaggio"
+
+msgid "Your inbox is empty."
+msgstr "Non hai messaggi in entrata."
+
+msgid "MUC administration"
+msgstr "Amministrazione MUC"
+
+msgid "You administrate this room"
+msgstr "Amministra questa stanza"
+
+msgid "Enter new subject"
+msgstr "Inserisci il nuovo topic"
+
+msgid "Configuration"
+msgstr "Configurazione"
+
+msgid "Authorizations"
+msgstr "Autorizzazioni"
+
+msgid "Member list"
+msgstr "Lista utenti"
+
+msgid "Owner list"
+msgstr "Lista gestori"
+
+msgid "Administrator list"
+msgstr "Lista amministratori"
+
+msgid "Outcast list"
+msgstr "Lista dei reietti"
+
+msgid "Add an input"
+msgstr "Aggiungi un input"
+
+msgid "Destroy this MUC"
+msgstr "Distruggi questa MUC"
+
+msgid "Yes, let's do it!"
+msgstr "Si, esegui!"
+
+msgid "Your friend is paying attention to the conversation."
+msgstr "Il tuo amico sta guardando la conversazione."
+
+msgid "Your friend is writing a message..."
+msgstr "Il tuo amico sta scrivendo un messaggio"
+
+msgid "Your friend stopped writing a message."
+msgstr "Il tuo amico ha smesso di scrivere un messaggio"
+
+msgid "Your friend is doing something else."
+msgstr "Il tuo amico sta facendo altro."
+
+msgid "Your friend closed the chat."
+msgstr "Il tuo amico ha chiuso la chat"
+
+msgid "Requesting this service..."
+msgstr "Richiesta del servizio"
+
+msgid "Loading"
+msgstr "Carcamento"
+
+msgid "joined the chat room"
+msgstr "Si è aggiunto alla chat room"
+
+msgid "left the chat room"
+msgstr "ha lasciato la chat room"
+
+msgid "no status"
+msgstr "nessuno status"
+
+msgid "has been kicked"
+msgstr "è stato cacciato"
+
+msgid "has been banned"
+msgstr "è stato escluso"
+
+msgid "no reason"
+msgstr "nessuna ragione"
+
+msgid "Communicate with the entire world!"
+msgstr "Comunica con l'intero mondo"
+
+msgid "It allows you to get in touch with the millions of users who currently use the XMPP network like you do with Jappix. Join the community and stay free!"
+msgstr "Ti permette di entrare in contatto con i milioni di utenti che utilizzano XMPP (Jabber) come fai tu con Jappix. Unisciti a noi."
+
+msgid "Hi there!"
+msgstr "Ciao!"
+
+msgid "Welcome on %1s, “%2s”."
+msgstr "Benvenuti su %1s, “%2s”."
+
+msgid "Login to your existing XMPP account or create a new one for free!"
+msgstr "Accedi al tuo account XMPP esistente oppure creane uno nuovo gratuitamente!"
+
+msgid "Jappix is an open-source project from PostPro, a non-profit organization which provides us a great help."
+msgstr "Jappix è un progetto open-source di PostPro, un'organizzazione senza scopo di lucro che ci è stata molto d'aiuto."
+
+msgid "Login to your existing XMPP account. You can also use the %s to join a groupchat."
+msgstr "Accedi utilizzando il tuo account XMPP. Puoi anche utilizzare %s per accedere una chat di gruppo."
+
+msgid "Previous"
+msgstr "Precedente"
+
+msgid "General"
+msgstr "Generale"
+
+msgid "Advanced"
+msgstr "Avanzato"
+
+msgid "Resource"
+msgstr "Risorsa"
+
+msgid "Priority"
+msgstr "Priorità"
+
+msgid "Low"
+msgstr "Inferiore"
+
+msgid "Medium"
+msgstr "Medio"
+
+msgid "High"
+msgstr "Superiore"
+
+msgid "Enter the groupchat you want to join and the nick you want to have. You can also go back to the %s."
+msgstr "Inserisci la chat di gruppo a cui vuoi unirti ed il nick che vuoi usare. Puoi anche ritornare ad %s."
+
+msgid "login page"
+msgstr "pagina per login"
+
+msgid "Share this link with your friends:"
+msgstr "Condividi questo link con i tuoi amici"
+
+msgid "Register a new XMPP account to join your friends on your own social cloud. That's simple!"
+msgstr "Registra un nuovo account XMPP/Jabber per unirti ad i tuoi amici nel tuo cloud sociale. E' semplice!"
+
+msgid "Required"
+msgstr "Richiesto"
+
+msgid "You have been registered, here is your XMPP address:"
+msgstr "Registrazione completata. Ecco il tuo indirizzo XMPP:"
+
+msgid "Manager"
+msgstr "Amministrazione"
+
+msgid "Project"
+msgstr "Progetto"
+
+msgid "Encrypted"
+msgstr "Criptato"
+
+msgid "Unencrypted"
+msgstr "Non criptato"
+
+msgid "Where are you?"
+msgstr "Dove sei?"
+
+msgid "What's up with you?"
+msgstr "Che passa?"
+
+msgid "Fetching the social channel..."
+msgstr "Sto scaricando il canale sociale..."
+
+msgid "You are synchronized with your network."
+msgstr "Sei sincronizzato con la tua rete."
+
+msgid "Cannot send anything: you can only receive notices!"
+msgstr "Impossibile inviare: puoi solo ricevere gli avvisi!"
+
+msgid "Media viewer"
+msgstr "Visualizzatore di Media"
+
+msgid "Browse"
+msgstr "Sfoglia"
+
+msgid "Command"
+msgstr "Comando"
+
+msgid "Subscribe"
+msgstr "Sottoscrivi"
+
+msgid "Join"
+msgstr "Unisciti"
+
+msgid "Automatic"
+msgstr "Automatico"
+
+msgid "Search"
+msgstr "Cerca"
+
+msgid "No result!"
+msgstr "nessun risultato"
+
+msgid "No notifications."
+msgstr "Niente avvisi."
+
+msgid "would like to add you as a friend."
+msgstr "vorrebbe aggiungerti come amico."
+
+msgid "would like you to join this chatroom:"
+msgstr "vorrebbe che lo raggiungessi in questa chatroom:"
+
+msgid "Do you accept?"
+msgstr "Accetti?"
+
+msgid "Yes"
+msgstr "Si"
+
+msgid "No"
+msgstr "No"
+
+msgid "would like to get authorization."
+msgstr "vorrebbe essere autorizzato ad aggiungerti."
+
+msgid "Do you want to see the friends %s suggests you?"
+msgstr "Vuoi vedere gli amici suggeriti da %s?"
+
+msgid "Submit"
+msgstr "Invia"
+
+msgid "Client"
+msgstr "Cliente"
+
+msgid "System"
+msgstr "Sistema"
+
+msgid "Local time"
+msgstr "Ora Locale"
+
+msgid "Comments"
+msgstr "Commenti"
+
+msgid "User profile"
+msgstr "Profilo utente"
+
+msgid "See his/her position on the globe"
+msgstr "Visualizza la sua posizione nel modo"
+
+msgid "Confirm"
+msgstr "Conferma"
+
+msgid "anonymous mode"
+msgstr "modalità anonima"
+
+msgid "Groups"
+msgstr "Gruppi"
+
+msgid "Unclassified"
+msgstr "Non classificato"
+
+msgid "Authorize"
+msgstr "Autorizza"
+
+msgid "Ask for authorization"
+msgstr "Chiedi l'autorizzazione"
+
+msgid "Unblock"
+msgstr "Sblocca"
+
+msgid "Prohibit"
+msgstr "Proibisci"
+
+msgid "Block"
+msgstr "Blocca"
+
+msgid "Chat"
+msgstr "Chat"
+
+msgid "Groupchat"
+msgstr "Chat di gruppo"
+
+msgid "Jappix Mobile"
+msgstr "Jappix Mobile"
+
+msgid "Desktop"
+msgstr "Desktop"
+
+msgid "Mobile"
+msgstr "Mobile"
+
+msgid "Please wait..."
+msgstr "Attendere..."
+
+msgid "Please enable JavaScript"
+msgstr "Attiva i javascript"
+
+msgid "Your channel"
+msgstr "Il tuo canale"
+
+msgid "Channel of"
+msgstr "Canale di"
+
+msgid "More notices..."
+msgstr "Altre informazioni"
+
+msgid "Attach a file"
+msgstr "Allega un file"
+
+msgid "Send"
+msgstr "Invia"
+
+msgid "Unattach the file"
+msgstr "Rimuovi il file allegato"
+
+msgid "An error occured while uploading your file: maybe it is too big (%s maximum) or forbidden!"
+msgstr "C'è stato un errore durante il caricamento del tuo file: forse è troppo grande (%s al massimo) o non permesso!"
+
+msgid "Authorization failed"
+msgstr "Autorizzazione fallita"
+
+msgid "Registration failed, please choose a different username"
+msgstr "Registrazione fallita, scegli un nuovo nome utente"
+
+msgid "Service unavailable"
+msgstr "Servizio non disponibile"
+
+msgid "Internal server error, try later"
+msgstr "Internal server error, prova più tardi"
+
+msgid "Your form has been sent."
+msgstr "Il tuo modulo è stato inviato."
+
+msgid "Application"
+msgstr "Applicazione"
+
+msgid "XMPP links"
+msgstr "Links XMPP"
+
+msgid "Open XMPP links with Jappix"
+msgstr "Apri i collegamenti XMPP con Jappix"
+
+msgid "changed the subject to:"
+msgstr "Cambia il soggetto a:"
+
+msgid "Welcome!"
+msgstr "Benvenuto!"
+
+msgid "Friends"
+msgstr "Amici"
+
+msgid "Welcome on Jappix, your own social cloud!"
+msgstr "Benvenuto su Jappix, il tuo cloud sociale personale!"
+
+msgid "Before you start using it, you will have to change some settings, search for friends and complete your profile."
+msgstr "Prima di iniziare ad utilizzare Jappix, devi cambiare alcune impostazione, aggiungere nuovi contatti e completare il tuo profilo."
+
+msgid "Enable notification sounds"
+msgstr "Attiva avvisi sonori"
+
+msgid "Share your position on the globe"
+msgstr "Condividi la tua posizione attuale"
+
+msgid "Offline friends"
+msgstr "Amici non in linea"
+
+msgid "Don't hide offline friends"
+msgstr "Non nascondere amici non in linea"
+
+msgid "Use this tool to find your friends on the server you are using right now, or add them later."
+msgstr "Utilizza questa utilità per cercare i tuoi amici sul server che stai utilizzando adesso, o aggiungili dopo."
+
+msgid "Great work! Now, you can share Jappix with your friends!"
+msgstr "Ben fatto! Adesso, puoi condividere Jappix con i tuoi amici!"
+
+msgid "When you will press the save button, the profile editor will be opened. Happy socializing!"
+msgstr "Quando premerai il tasto salva, l'editor del tuo profilo verrà aperto. Buona socializzazione!"
+
+msgid "Share Jappix on %s"
+msgstr "Condividi Jappix on %s"
+
+msgid "Using Jappix, an open social platform. I am %s!"
+msgstr "Using Jappix, an open social platform. I am %s!"
+
+msgid "Unknown name"
+msgstr "Nome sconosciuto"
+
+msgid "Unknown country"
+msgstr "Nazione sconosciuta"
+
+msgid "Click to enable"
+msgstr "Clicca per attivare"
+
+msgid "Click to disable"
+msgstr "Clicca per disattivare"
+
+msgid "Installation"
+msgstr "Installazione"
+
+msgid "Jappix installation"
+msgstr "Installazione Jappix"
+
+msgid "Welcome to the Jappix installation!"
+msgstr "Benvenuti nella installazione di Jappix!"
+
+msgid "This tool will help you fastly install Jappix, the first full-featured XMPP-based social platform, on your server. You don't even need any technical knowledge."
+msgstr "Questo strumento ti aiuterà ad installare velocemente Jappix, il primo platform sociale basato su XMPP, sul tuo server. Non è richiesta alcuna conoscenza tecnica."
+
+msgid "Let's have a look at the installation steps:"
+msgstr "Diamo un occhiata ai passi per l'installazione:"
+
+msgid "Welcome"
+msgstr "Benvenuto"
+
+msgid "Storage configuration"
+msgstr "Configurazione per lo storage dei dati"
+
+msgid "Administrator account"
+msgstr "Account amministrativo"
+
+msgid "Main configuration"
+msgstr "Configurazione principale"
+
+msgid "Hosts configuration"
+msgstr "Configurazione degli hosts"
+
+msgid "Services installation"
+msgstr "Installazione servizi"
+
+msgid "If the current language does not match yours (%1s), you can make Jappix speak %2s it will be saved."
+msgstr "Se la lingua corrente non riflette la tua (%1s), puoi fare in modo che Jappix sia tradotto in %2s e sarà salvato."
+
+msgid "If you want to get some help about the Jappix installation and configuration, you can use our whole documentation, available at:"
+msgstr "Se hai bisogno di aiuto per l'installazione e la configurazione di Jappix, puoi utilizzare la nostra documentazione online disponibile qui: "
+
+msgid "It's time to build your own social cloud: just go to the next step!"
+msgstr "E' tempo di costruire il tuo social cloud: vai al prossimo punto!"
+
+msgid "Jappix stores persistent data (such as shared files, chat logs, your own music and its configuration) into a single secured storage folder."
+msgstr "Jappix salva i dati persistenti (come file condivisi, registri delle conversazioni, la tua musica e la sua configurazione) dentro una singola cartella sicura."
+
+msgid "Jappix must be able to write in this folder to create its sub-directories. If not, you must set the rights to %1s or change the folder owner to %2s (depending of your configuration)."
+msgstr "Jappix deve avere le autorizzazioni adeguate per scrivere in questa cartella per creare le sotto-directory necessarie. Se no, devi modificare le autorizzazioni per %1s o cambiare il suo proprietario a %2s (dipende anche dalla tua configurazione)."
+
+msgid "The folder is writable, you can continue!"
+msgstr "La directory è scrivibile, puoi continuare!"
+
+msgid "Jappix offers you the possibility to manage your configuration, install new addons or search for updates. That's why you must create an administrator account to access the manager."
+msgstr "Jappix ti offre la possibilità controllare la configurazione di Jappix, installare nuove addons e cercare aggiornamenti. Ecco perchè devi creare un account amministrativo per accedere all'Amministrazione."
+
+msgid "When Jappix will be installed, just click on the manager link on the home page to access it."
+msgstr "Quando Jappix sarà installato, semplicemente clicca sul link “Amministrazione” nella home page per accedervi."
+
+msgid "Oops, you missed something or the two passwords do not match!"
+msgstr "Opps, hai dimenticato qualche cosa o le due password non coincidono!"
+
+msgid "Jappix needs that you specify some values to work. Please correct the following inputs (or keep the default values, which are sufficient for most people)."
+msgstr "Jappix necessita l'impostazione di alcuni dati per funzionare correttamente. Perpiacere cambia i dati seguenti (o mantieni le impostazioni di default)."
+
+msgid "Note that if you don't specify a value which is compulsory, it will be automatically completed with the default one."
+msgstr "Nota che se non specifichi una delle impostazioni obbligatorie, sarà automaticamente completata con il valore di default."
+
+msgid "User"
+msgstr "Utente"
+
+msgid "Service"
+msgstr "Servizio"
+
+msgid "Service name"
+msgstr "Nome del servizio"
+
+msgid "Service description"
+msgstr "Descrizione del servizio"
+
+msgid "Connection"
+msgstr "Connessione"
+
+msgid "Lock the host"
+msgstr "Blocca il nome dell'host"
+
+msgid "Anonymous mode"
+msgstr "Modalità anonima"
+
+msgid "Registration allowed"
+msgstr "Registrazione permessa"
+
+msgid "Use a proxy"
+msgstr "Utilizza un proxy"
+
+msgid "Encryption"
+msgstr "Crittografia"
+
+msgid "HTTPS storage"
+msgstr "Usa HTTPS per l'archiviazione"
+
+msgid "Force HTTPS"
+msgstr "Forza HTTPS"
+
+msgid "Compression"
+msgstr "Compressione"
+
+msgid "This page helps you specify the default hosts Jappix will connect to. You can leave it as it is and continue if you want to use the official service hosts."
+msgstr "Questa pagina serve a specificare i server principali a cui Jappix si connette. Puoi lasciarli come sono e continuare se vuoi usare il servizio ufficiale."
+
+msgid "Maybe you don't know what a BOSH server is? In fact, this is a relay between a Jappix client and a XMPP server, which is necessary because of technical limitations."
+msgstr "Forse non sai cos'è un server BOSH? E' un relay tra Jappix è il server XMPP, che è per il momento necessario per limitazioni tecniche."
+
+msgid "Main host"
+msgstr "Host del server"
+
+msgid "Groupchat host"
+msgstr "Host del server MUC"
+
+msgid "Anonymous host"
+msgstr "Host per le connessioni anonime"
+
+msgid "Directory host"
+msgstr "Server per la Directory degli utenti."
+
+msgid "BOSH host"
+msgstr "Server BOSH"
+
+msgid "You can install some extra softwares on your server, to extend your Jappix features. Some others might be modified, because of security restrictions which are set by default."
+msgstr "Puoi installare del software opzionale sul tuo server, per estendere le funzioni di Jappix. Alcune altre potrebbero essere modificate, per via delle restrizioni di sicurezza impostate di default."
+
+msgid "To perform this, you must be able to access your server's shell and be logged in as root. Remember this is facultative, Jappix will work without these modules, but some of its features will be unavailable."
+msgstr "Per completare questa operazione devi essere in grado di accedere al tuo server tramite terminale come root, Ricordati che questo è facoltativo, Jappix funziona anche senza questi moduli, ma alcune delle sue caratteristiche non saranno disponibili."
+
+msgid "After you finished the setup, Jappix will generate the cache files. It might be slow, just wait until the application is displayed and do not press any button."
+msgstr "Dopo che completi il setup, Jappix generà i files di cache. Potrebbe essere un processo abbastanza lento, semplicemente aspetta che l'applicazione sia mostrata senza premere nessun tasto."
+
+msgid "Thanks for using Jappix!"
+msgstr "Grazie per aver scelto Jappix!"
+
+msgid "Next"
+msgstr "Continua"
+
+msgid "Finish"
+msgstr "Completa"
+
+msgid "Check again"
+msgstr "Controlla ancora"
+
+msgid "The folder is not writable, set the right permissions to the %s directory."
+msgstr "La cartella non è scrivibile, imposta le autorizzazioni corrette per %s."
+
+msgid "%s is installed on your system."
+msgstr "%s è installato sul tuo sistema."
+
+msgid "%1s is not installed on your system, you should install %2s."
+msgstr "%1s non è installato sul tuo sistema, dovresti installare %2s."
+
+msgid "PHP maximum upload size is sufficient (%s)."
+msgstr "La dimensione massima degli upload per PHP non è sufficente (%s)."
+
+msgid "PHP maximum upload size is not sufficient (%1s), you should define it to %2s in %3s."
+msgstr "La dimensione massima degli upload per PHP non è sufficente (%s), impostala a %2s in %3s."
+
+msgid "Jappix manager"
+msgstr "Manager di Jappix"
+
+msgid "Manager access"
+msgstr "Access del manager"
+
+msgid "Statistics"
+msgstr "Statistiche"
+
+msgid "Hosts"
+msgstr "Host"
+
+msgid "Design"
+msgstr "Progetto"
+
+msgid "Repeat"
+msgstr "Ripeti"
+
+msgid "All"
+msgstr "Tutti"
+
+msgid "Horizontal"
+msgstr "Orizzontale"
+
+msgid "Vertical"
+msgstr "Verticale"
+
+msgid "Center"
+msgstr "Centro"
+
+msgid "Left"
+msgstr "Sinistra"
+
+msgid "Right"
+msgstr "Destra"
+
+msgid "Top"
+msgstr "In Cima"
+
+msgid "Bottom"
+msgstr "In Fondo"
+
+msgid "Adapt"
+msgstr "Adatta"
+
+msgid "Color"
+msgstr "Colore"
+
+msgid "Users"
+msgstr "Utente"
+
+msgid "Updates"
+msgstr "Aggiornamenti"
+
+msgid "This is a restricted area: only the authorized users can manage this Jappix node."
+msgstr "Questa è una area ristretta: solo gli utenti autorizzati possono gestire questo nodo Jappix"
+
+msgid "Please use the form below to login to the administration panel."
+msgstr "Perpiacere utilizza il modulo qui sotto per accedere al Pannello amministrativo."
+
+msgid "To improve security, sessions are limited in time and when your browser will be closed, you will be logged out."
+msgstr "Per aumentare la sicurezza, le sessioni sono a tempo limitato e quando chiudi il tuo browser, sarai disconnesso."
+
+msgid "Credentials"
+msgstr "Informazioni di accesso"
+
+msgid "You have been logged out. Goodbye!"
+msgstr "Sei stato disconnesso. Arrivederci!"
+
+msgid "Oops, you could not be recognized as a valid administrator. Check your credentials!"
+msgstr "Opps, non sei stato riconusciuto come un amministratore valido. Controlla le tue credenziali!"
+
+msgid "Basic statistics are processed by Jappix about some important things, you can find them below."
+msgstr "Puoi trovare qui sotto, le statistiche base ottenute da Jappix."
+
+msgid "Change your Jappix node configuration with this tool."
+msgstr "Cambia qui la configurazione del tuo nodo Jappix."
+
+msgid "Change the XMPP hosts that this Jappix node serve with this tool."
+msgstr "Cambia qui gli hosts XMPP serviti da questo nodo Jappix."
+
+msgid "All this Jappix node stored files can be managed with this tool: please select a sub-folder and start editing its content!"
+msgstr "Tutti i file salvati di questo nodo Jappix possono essere controllati da questa pagina: perpiacere scegli una sotto-directory ed inizia a modificare il suo contenuto!"
+
+msgid "Jappix is fully customisable: you can change its design right here."
+msgstr "Jappix è completamente personalizzabile: puoi cambiare qui il suo look."
+
+msgid "This is not a valid image, please use PNG, GIF or JPG!"
+msgstr "Il formato di questa immagine non è valido, perpiacere utilizza PNG, GIF oppure JPG!"
+
+msgid "The image could not be received, would you mind retry?"
+msgstr "L'immagine non è stata caricata correttamente, Riprova?"
+
+msgid "Your image was added to the list!"
+msgstr "La tua immagina è stata aggiunta alla lista!"
+
+msgid "Changes saved!"
+msgstr "Modifiche salvate!"
+
+msgid "You can define more than one administrator for this Jappix node. You can also change a password with this tool."
+msgstr "Puoi definire più di un amministratore per questo nodo Jappix e cambiare qui le passwords associate."
+
+msgid "Update your Jappix node with this tool, or check if a new one is available. Informations about the latest version are also displayed (in english)."
+msgstr "Aggiorna qui il tuo nodo Jappix, puoi anche controllare se una nuova versione e disponibile. Le informazioni sulle ultime versioni sono disponibili solo in inglese."
+
+msgid "Access statistics"
+msgstr "Statistiche sugli accessi"
+
+msgid "Share statistics"
+msgstr "Condividi le statistiche"
+
+msgid "Other statistics"
+msgstr "Altre statistiche"
+
+msgid "January"
+msgstr "Gennaio"
+
+msgid "February"
+msgstr "Febbraio"
+
+msgid "March"
+msgstr "Marzo"
+
+msgid "April"
+msgstr "Aprile"
+
+msgid "May"
+msgstr "Maggio"
+
+msgid "June"
+msgstr "Giugno"
+
+msgid "July"
+msgstr "Luglio"
+
+msgid "August"
+msgstr "Agosto"
+
+msgid "September"
+msgstr "Settembre"
+
+msgid "October"
+msgstr "Ottobre"
+
+msgid "November"
+msgstr "Novembre"
+
+msgid "December"
+msgstr "Dicembre"
+
+msgid "Monday"
+msgstr "Lunedì"
+
+msgid "Tuesday"
+msgstr "Martedì"
+
+msgid "Wednesday"
+msgstr "Mercoledì"
+
+msgid "Thursday"
+msgstr "Giovedì"
+
+msgid "Friday"
+msgstr "Venerdì"
+
+msgid "Saturday"
+msgstr "Sabato"
+
+msgid "Sunday"
+msgstr "Domenica"
+
+msgid "Total"
+msgstr "Totali"
+
+msgid "Cache"
+msgstr "Cache"
+
+msgid "Logs"
+msgstr "Registri"
+
+msgid "Music"
+msgstr "Musica"
+
+msgid "Backgrounds"
+msgstr "Sfondi"
+
+msgid "Share"
+msgstr "Condividi"
+
+msgid "Background"
+msgstr "Sfondo"
+
+msgid "Notice"
+msgstr "Avviso"
+
+msgid "Your design preferences have been saved!"
+msgstr "Le tue preferenza per il design sono state salvate!"
+
+msgid "Please check your inputs: something is missing!"
+msgstr "Perpiacere controlla i tuoi dati inseriti: vi sono dei valori mancanti!"
+
+msgid "Change your Jappix node background with this tool. You can either set a custom color or an uploaded image. Let your creativity flow!"
+msgstr "Cambia lo sfondo del tuo nodo Jappix in questa pagina. Puoi scegliere un colore una immagine caricata."
+
+msgid "Use default background"
+msgstr "Utilizza lo sfondo di default"
+
+msgid "Use your own image"
+msgstr "Utilizza una tua immagine"
+
+msgid "Select a background to use and change the display options."
+msgstr "Scegli uno sfondo da utilizzare è cambia le opzioni di display."
+
+msgid "Use your own color"
+msgstr "Utilizza un tuo colore personalizzato"
+
+msgid "Type the hexadecimal color value you want to use as a background."
+msgstr "Inserisci qui il valore esadecimale del colore che vuoi usare come background."
+
+msgid "Manage backgrounds"
+msgstr "Controlla sfondi"
+
+msgid "You can add a new background to the list with this tool. Please send a valid image."
+msgstr "Puoi aggiungere un nuovo background alla lista con questa utilità. Perpiacere invia un'immagine valida."
+
+msgid "If you want to remove some backgrounds, use the browser below."
+msgstr "Se vuoi rimuovere alcuni sfondi, utilizza browser qui sotto."
+
+msgid "Define a homepage notice for all your users, such as a warn, an important message or an advert with this tool."
+msgstr "Imposta un avviso mostrato nella homepage, per tutti i tuoi utenti come un avviso/messaggio importante con questa utilità."
+
+msgid "Simple notice"
+msgstr "Avviso semplice"
+
+msgid "This notice only needs simple text to be displayed, but no code is allowed!"
+msgstr "Questo avviso mostra solo testo semplice, codice HTML non è permesso!"
+
+msgid "Advanced notice"
+msgstr "Avviso avanzato"
+
+msgid "You can customize your notice with embedded HTML, CSS and JavaScript, but you need to code the style."
+msgstr "Puoi personalizzare i tuoi avvisi con HTML, CSS e Javascript incluso, ma è richiesta la conoscenza dei rispettivi linguaggi."
+
+msgid "Available updates"
+msgstr "Aggiornamenti disponibili"
+
+msgid "What's new?"
+msgstr "Cosa c'è di nuovo?"
+
+msgid "Your storage folders are not writable, please apply the good rights!"
+msgstr "Le cartelle per l'archiviazioni non sono scrivibili, perpiacere imposta le autorizzazioni corrette!"
+
+msgid "%1s may cause problems to the proxy, please increase %2s value up to %3s!"
+msgstr "%1s può causare problemi al proxy, perpiacere incrementa il valore %2s a %3s!"
+
+msgid "You are using a development version of Jappix. Update it through our repository by executing: %s."
+msgstr "Stai utilizzando una versione ancora non definitiva di Jappix. La puoi aggiornare tramite il nostro repositorio, eseguendo: %s."
+
+msgid "A new Jappix version is available! Check what is new and launch the update!"
+msgstr "Una nuova versione di Jappix è disponibile! Controlla il registro delle modifica ed avvia l'aggiornamento!"
+
+msgid "Your version is out to date. Update it now to %s by clicking here!"
+msgstr "La tua versione è obsoleta. Aggiornala a %s cliccando qui!"
+
+msgid "Your version seems to be up to date, but you can check updates manually by clicking here."
+msgstr "La tua versione sembra essere aggiornata, ma puoi controllare gli aggiornamenti manualmente cliccando qui."
+
+msgid "Check for updates"
+msgstr "Controlla aggiornamenti"
+
+msgid "Update in progress"
+msgstr "Aggiornamento in corso"
+
+msgid "Jappix has been updated: you are now running the latest version. Have fun!"
+msgstr "Jappix è stato aggiornato: Stai utilizzando l'ultima version. Divertiti!"
+
+msgid "The update has failed! Please try again later."
+msgstr "L'aggiornamento è fallito! Perpiacere, riprova più tardi."
+
+msgid "Downloading package..."
+msgstr "Sto scaricando il pacchetto..."
+
+msgid "Removing current Jappix system files..."
+msgstr "Rimozione dei file di sistema di Jappix..."
+
+msgid "Extracting package..."
+msgstr "Sto estraendo il pacchetto..."
+
+msgid "Regenerating storage folder tree..."
+msgstr "Sto rigenerando l'albero delle cartelle di salvataggio..."
+
+msgid "Jappix is now up to date!"
+msgstr "Jappix è adesso aggiornato!"
+
+msgid "Aborted: socket error!"
+msgstr "Interrotto: errore del socket!"
+
+msgid "Aborted: buffer error!"
+msgstr "Interrotto: errore buffer!"
+
+msgid "Aborted: everything is not writable!"
+msgstr "Interrotto: il percorso non è scrivibile!"
+
+msgid "Aborted: could not extract the package!"
+msgstr "Interrotto: non è stato possibile estrarre il pacchetto!"
+
+msgid "Visits"
+msgstr "Visite"
+
+msgid "Daily"
+msgstr "Giornaliero"
+
+msgid "Weekly"
+msgstr "Settimanale"
+
+msgid "Monthly"
+msgstr "Mensile"
+
+msgid "Yearly"
+msgstr "Annuale"
+
+msgid "Size"
+msgstr "Dimensione"
+
+msgid "Clean everything"
+msgstr "Ripristina tutto"
+
+msgid "Purge cache"
+msgstr "Pulisci la cache"
+
+msgid "Purge logs"
+msgstr "Cancella i registri"
+
+msgid "Purge updates"
+msgstr "Pulisci la cartella degli aggiornamenti"
+
+msgid "The storage folder you wanted to clean is now empty!"
+msgstr "Ho pulito la cartella degli archivi da te indicata!"
+
+msgid "Keep your Jappix node fresh and fast, clean the storage folders regularly!"
+msgstr "La manutenzione di Jappix è importante, tieni pulite le cartelle di archiviazione!"
+
+msgid "Upload your music (Ogg Vorbis, MP3 or WAV) to be able to listen to it in Jappix!"
+msgstr "Carica la tua musica (OGG Vorbis, MP3 o WAV) per sentirla da Jappix!"
+
+msgid "The file you want to upload must be smaller than %s."
+msgstr "Il file che vuoi caricare deve essere più piccolo di %s."
+
+msgid "Stay tuned in what your users store on your server and remove undesired content with this tool."
+msgstr "Puoi controllare qui il contenuto che i tuoi utemti salvano sul server, e rimuore quello indesiderato."
+
+msgid "Title"
+msgstr "Titolo"
+
+msgid "Artist"
+msgstr "Artista"
+
+msgid "Album"
+msgstr "Album"
+
+msgid "File"
+msgstr "File"
+
+msgid "Upload"
+msgstr "Carica"
+
+msgid "The folder is empty."
+msgstr "La cartella è vuota."
+
+msgid "The music could not be received, please retry!"
+msgstr "La musica non è stata caricata correttamente, perpiacere riprova!"
+
+msgid "This is not a valid music file, please encode in Ogg Vorbis, MP3 or WAV!"
+msgstr "Questo non è un file musicale valido, perpiacere codificalo in OGG Vorbis, MP3 oppure WAV!"
+
+msgid "Your music has been added!"
+msgstr "Ho aggiunto la tua musica!"
+
+msgid "The selected elements have been removed."
+msgstr "Gli elementi selezionati sono stati rimossi."
+
+msgid "You must select elements to remove!"
+msgstr "Devi selezionare almeno un elemento da rimuovere."
+
+msgid "Add a new user with this tool, or change a password (type an existing username). Please submit a strong password!"
+msgstr "Aggiungi un nuovo utente con questa utilità oppure cambia la password di uno esistente. Perpiacere utilizza una password sicura."
+
+msgid "Manage"
+msgstr "Amministra"
+
+msgid "List"
+msgstr "Lista"
+
+msgid "Remove users with this tool. Note that you cannot remove an user if he is the only one remaining."
+msgstr "Rimuovi gli utenti amministrativi con questa utilità. Nota che deve essere presente almeno un utente amministrativo."
+
+msgid "The user has been added!"
+msgstr "L'utente è stato aggiunto!"
+
+msgid "The chosen users have been removed."
+msgstr "Gli utenti selezionati sono stati rimossi."
+
+msgid "You must select one or more users to be removed!"
+msgstr "Devi selezionare uno o più utenti da rimuovere!"
+
+msgid "Yesterday"
+msgstr "Ieri"
+
+msgid "%s days ago"
+msgstr "%s giorni fa'"
+
+msgid "User currently active"
+msgstr "Utente correntemente attivo"
+
+msgid "Last seen: %s"
+msgstr "Ultimo accesso: %s"
+
+msgid "Inactive since: %s"
+msgstr "Inattivo da: %s"
+
+msgid "Your friend seems not to have received your message(s)!"
+msgstr "Il tuo contatto sembra non aver ricevuto il tuo o i tuoi messagi!"
+
+msgid "Static content server"
+msgstr "Server per il contenuto statico"
+
+msgid "This is the static content server for %1s, “%2s”."
+msgstr "Questo è il server per il contenuto statico di %1s, “%2s”."
+
+msgid "Suggested friends"
+msgstr "Amici suggeriti"
+
+msgid "Check all"
+msgstr "Seleziona tutte le opzioni"
+
+msgid "Uncheck all"
+msgstr "Deseleziona tutte le opzioni"
+
+msgid "Choose"
+msgstr "Scegli"
+
+msgid "List name"
+msgstr "Nome lista"
+
+msgid "Allow"
+msgstr "Permetti"
+
+msgid "Deny"
+msgstr "Rifiuta"
+
+msgid "Group"
+msgstr "Gruppo"
+
+msgid "Subscription"
+msgstr "Sottoscrizione"
+
+msgid "Both"
+msgstr "Entrambi"
+
+msgid "From"
+msgstr "Da"
+
+msgid "Everybody"
+msgstr "Tutti quanti"
+
+msgid "Send messages"
+msgstr "Invia messaggi"
+
+msgid "Send queries"
+msgstr "Invia richieste"
+
+msgid "See my status"
+msgstr "Vedi il mio stato"
+
+msgid "Send his/her status"
+msgstr "Invia il suo status"
+
+msgid "Everything"
+msgstr "Tutto"
+
+msgid "Item"
+msgstr "Oggetto"
+
+msgid "Order"
+msgstr "Ordina"
+
+msgid "Active for this session"
+msgstr "Attivo per questa sessione"
+
+msgid "Always active"
+msgstr "Sempre attivo"
+
+msgid "User directory"
+msgstr "Cartella utenti"
+
+msgid "Search a friend"
+msgstr "Cerca un amico"
+
+msgid "The feature requested is not implemented by the recipient or server and therefore cannot be processed."
+msgstr "Questa caratteristica non è implementata dal client del recipiente oppure il suo server e quindi non può essere processata."
+
+msgid "This is a repeat from %s"
+msgstr "Questa è una ripetizione da %s"
+
+msgid "Loading comments..."
+msgstr "Sto caricando i commenti..."
+
+msgid "Type your comment here..."
+msgstr "Inserisci qui il tuo commento..."
+
+msgid "Could not get the comments!"
+msgstr "Non ho potuto ottenere nessun commento!"
+
+msgid "Show comments"
+msgstr "Mostra commenti"
+
+msgid "Send him/her a message"
+msgstr "Invia un messaggio a lui/lei"
+
+msgid "Start a chat with him/her"
+msgstr "Inizia una chat con lui/lei"
+
+msgid "Media integration"
+msgstr ""
+
+msgid "Comments locked!"
+msgstr ""
+
+msgid "Type something you want to share with your friends..."
+msgstr ""
+
+msgid "changed his/her nickname to %s"
+msgstr ""
+
+msgid "commented an item you follow: “%s”."
+msgstr ""
+
+msgid "Hide"
+msgstr ""
+
+msgid "liked your post: “%s”."
+msgstr ""
+
+msgid "quoted you somewhere: “%s”."
+msgstr ""
+
+msgid "published on your wall: “%s”."
+msgstr ""
+
+msgid "tagged you in a photo (%s)."
+msgstr ""
+
+msgid "tagged you in a video (%s)."
+msgstr ""
+
+msgid "Show"
+msgstr ""
+
+msgid "Need help? You'd better read our documentation page about how to fill this form!"
+msgstr ""
+
+msgid "Pubsub host"
+msgstr ""
+
+msgid "Jappix is a great social platform, that you can access wherever you are, whenever you want and communicate with whovever you want."
+msgstr ""
+
+msgid "Manager link"
+msgstr ""
+
+msgid "User uploads server"
+msgstr ""
+
+msgid "This is the user uploads server for %1s, “%2s”."
+msgstr ""
+
+msgid "Logo"
+msgstr ""
+
+msgid "You can set your own service logo to replace the default one. Take care of the size and the main color of each logo!"
+msgstr ""
+
+msgid "Upload each logo with the recommended maximum pixel size."
+msgstr ""
+
+msgid "This is not a valid image, please use the PNG format!"
+msgstr ""
+
+msgid "Your service logo has been successfully changed!"
+msgstr ""
+
+msgid "Your logo format must be PNG. Leave a field empty and the logo will not be changed."
+msgstr ""
+
+msgid "Remove this logo"
+msgstr ""
+
+msgid "View this logo"
+msgstr ""
+
+msgid "Send a file"
+msgstr ""
+
+msgid "Once uploaded, your friend will be prompted to download the file you sent."
+msgstr ""
+
+msgid "Groupchats to join"
+msgstr ""
+
+msgid "Purge sent files"
+msgstr ""
+
+msgid "would like to send you a file: “%s”."
+msgstr ""
+
+msgid "has accepted to received your file: “%s”."
+msgstr ""
+
+msgid "has rejected to receive your file: “%s”."
+msgstr ""
+
+msgid "could not receive your file: “%s”."
+msgstr ""
+
+msgid "has received a file exchange request: “%s”."
+msgstr ""
+
+msgid "Available shortcuts:"
+msgstr ""
+
+msgid "%s removes the chat logs"
+msgstr ""
+
+msgid "%s joins a groupchat"
+msgstr ""
+
+msgid "%s closes the chat"
+msgstr ""
+
+msgid "%s shows the user profile"
+msgstr ""
+
+msgid "%s sends a message to the room"
+msgstr ""
+
+msgid "%s changes your nickname"
+msgstr ""
+
+msgid "%s sends a message to someone in the room"
+msgstr ""
+
+msgid "%s changes the room topic"
+msgstr ""
+
+msgid "%s kicks an user of the room"
+msgstr ""
+
+msgid "%s bans an user of the room"
+msgstr ""
+
+msgid "%s invites someone to join the room"
+msgstr ""
+
+msgid "Social channel, chat and more."
+msgstr ""
+
+msgid "Create your public profile."
+msgstr ""
+
+msgid "A mini-chat for your website."
+msgstr ""
+
+msgid "Get Jappix, get support."
+msgstr ""
+
+msgid "Statistics around Jappix."
+msgstr ""
+
+msgid "Download Jappix for free."
+msgstr ""
+
+msgid "Find a public Jappix node."
+msgstr ""
+
+msgid "Public profile"
+msgstr ""
+
+msgid "Your profile anywhere on the Web."
+msgstr ""
+
+msgid "%s is a Jappix.com service which makes your XMPP profile public. It is easier to share it. No XMPP account is required to view your social channel, your current position and your contact details."
+msgstr ""
+
+msgid "Furthermore, every picture you post in your social channel is added to a beautiful picture timeline. You can now view the pictures you shared year by year."
+msgstr ""
+
+msgid "You can also use your XMPP avatar as a single avatar for every website, blog and forum you use. When you change it on XMPP, the new avatar appears everywhere. What a genious improvement!"
+msgstr ""
+
+msgid "Yay, let's create my public profile!"
+msgstr ""
+
+msgid "Enable my public profile"
+msgstr ""
+
+#~ msgid "Jappix is a non-profit social platform, that you can access wherever you are, whenever you want and communicate with whovever you want."
+#~ msgstr "Jappix è un platform sociale no-profit, che puoi accedere duvunque tu sia, qualsiasi volta tu abbia voglia di communicare con qualcuno."
+
+#~ msgid "See"
+#~ msgstr ""
+
+#~ msgid "Use default logo"
+#~ msgstr ""
+
+#~ msgid "Use your own logo"
+#~ msgstr ""
+
+#~ msgid "The recommended image format is PNG. Leave a field empty and the logo will not be changed."
+#~ msgstr ""
diff --git a/jappixmini/jappix/lang/ja/LC_MESSAGES/main.mo b/jappixmini/jappix/lang/ja/LC_MESSAGES/main.mo
new file mode 100644
index 00000000..e09eddcd
Binary files /dev/null and b/jappixmini/jappix/lang/ja/LC_MESSAGES/main.mo differ
diff --git a/jappixmini/jappix/lang/ja/LC_MESSAGES/main.po b/jappixmini/jappix/lang/ja/LC_MESSAGES/main.po
new file mode 100644
index 00000000..b296135f
--- /dev/null
+++ b/jappixmini/jappix/lang/ja/LC_MESSAGES/main.po
@@ -0,0 +1,1870 @@
+# Japanese translations for Jappix package.
+# This file is distributed under the same license as the Jappix package.
+# This file was translated from CodingTeam at <http://codingteam.net/>.
+msgid ""
+msgstr ""
+"Project-Id-Version: Jappix\n"
+"PO-Revision-Date: 2012-01-16 21:25+0100\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"POT-Creation-Date: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+
+msgid "JavaScript is missing in your web browser, so that you will not be able to launch Jappix! Please fix this."
+msgstr "ブラウザの設定でJavaScriptが無効になっている為、Jappixを起動できません! JavaScriptを有効にしてください。"
+
+msgid "An open social network"
+msgstr "オープンソーシャルネットワーク"
+
+msgid "Jappix has been interrupted by a network issue, a bug or bad login (check that you entered the right credentials), sorry for the inconvenience."
+msgstr "Jappixはネットワークの問題により停止しました。バグか不正なログインです（入力した認証情報を確認してください）。ご不便をおかけして申し訳ありません。"
+
+msgid "The element list on this server could not be obtained!"
+msgstr "このサーバのエレメントリストを取得することができませんでした!"
+
+msgid "Your password has been changed, now you can connect to your account with your new login data."
+msgstr "あなたのパスワードは変更されました。今から新しいパスワードでログインできます。"
+
+msgid "Your XMPP account has been removed, bye!"
+msgstr "あなたのXMPPアカウントは正常に削除されました。さようなら!"
+
+msgid "You have been logged out of your XMPP account, have a nice day!"
+msgstr "XMPPアカウントをログアウトしました。良い一日を!"
+
+msgid "The room you joined seems not to exist. You should create it!"
+msgstr "参加するルームが存在しません。作成する必要があります!"
+
+msgid "The groupchat has been removed, now someone else will be able to recreate it."
+msgstr "グループチャットは削除されました、今から誰でも再作成を行うことが出来ます。"
+
+msgid "The user that you want to reach is not present in the room."
+msgstr "ユーザはあなたの望むチャットルームに到着することができませんでした。"
+
+msgid "Please enter the group chat address to join."
+msgstr "参加するグループチャットアドレスを入力してください。"
+
+msgid "Please enter your nickname to join %s."
+msgstr "%s に参加するニックネームを入力してください。"
+
+msgid "This room (%s) is protected with a password."
+msgstr "このチャットルーム (%s) はパスワードで保護されています。"
+
+msgid "Your browser is out of date!"
+msgstr "ブラウザバージョンが古いです!"
+
+msgid "Last %s version is better!"
+msgstr "バージョン %s を推奨します。"
+
+msgid "Login"
+msgstr "ログイン"
+
+msgid "Register"
+msgstr "登録"
+
+msgid "Here we go!"
+msgstr "さあ、はじめよう!"
+
+msgid "Server"
+msgstr "サーバー"
+
+msgid "Password"
+msgstr "パスワード"
+
+msgid "Remember me"
+msgstr "記憶する"
+
+msgid "This tool has been disabled, you cannot use it!"
+msgstr "このツールは無効になっている為、使用することができません!"
+
+msgid "Due to a network issue, you were disconnected. What do you want to do now?"
+msgstr "ネットワークの問題により切断されました。どうしますか?"
+
+msgid "Reconnect"
+msgstr "再接続"
+
+msgid "Messages"
+msgstr "メッセージ"
+
+msgid "Profile"
+msgstr "プロフィール"
+
+msgid "Options"
+msgstr "オプション"
+
+msgid "Disconnect"
+msgstr "切断"
+
+msgid "Filter"
+msgstr "フィルター"
+
+msgid "Add a friend"
+msgstr "友達を追加"
+
+msgid "Your groupchats"
+msgstr "グループチャット"
+
+msgid "Manage your favorite groupchats"
+msgstr "お気に入りのグループチャットを管理"
+
+msgid "More stuff"
+msgstr "もっと多く"
+
+msgid "Show all friends"
+msgstr "全ての友達を見る"
+
+msgid "Only show connected friends"
+msgstr "オンラインの友達のみ表示"
+
+msgid "Message archives"
+msgstr "メッセージアーカイブ"
+
+msgid "Date"
+msgstr "日付"
+
+msgid "Please select a friend to view the chat history."
+msgstr "友達を選択するとチャットの履歴が見れます"
+
+msgid "Nothing found for: %s"
+msgstr "見つかりません: %s"
+
+msgid "A short message?"
+msgstr "短いメッセージですか?"
+
+msgid "How are you?"
+msgstr "ご機嫌いかが?"
+
+msgid "What are you doing?"
+msgstr "なにしてる?"
+
+msgid "Join a chat"
+msgstr "チャットに参加"
+
+msgid "Status"
+msgstr "ステータス"
+
+msgid "Available"
+msgstr "オンライン"
+
+msgid "Talkative"
+msgstr "おしゃべり"
+
+msgid "Away"
+msgstr "離席"
+
+msgid "Not available"
+msgstr "対応不能"
+
+msgid "Busy"
+msgstr "多忙"
+
+msgid "Mood"
+msgstr "ムード"
+
+msgid "None"
+msgstr "なし"
+
+msgid "Crazy"
+msgstr "狂気"
+
+msgid "Excited"
+msgstr "興奮"
+
+msgid "Playful"
+msgstr "冗談半分"
+
+msgid "Happy"
+msgstr "幸福"
+
+msgid "Shocked"
+msgstr "ショック"
+
+msgid "Hot"
+msgstr "元気"
+
+msgid "Sad"
+msgstr "悲しい"
+
+msgid "Amorous"
+msgstr "恋心"
+
+msgid "Confident"
+msgstr "大胆"
+
+msgid "Activity"
+msgstr "アクティビィティ"
+
+msgid "Chores"
+msgstr "雑用"
+
+msgid "Drinking"
+msgstr "飲酒"
+
+msgid "Eating"
+msgstr "食事"
+
+msgid "Exercising"
+msgstr "運動"
+
+msgid "Grooming"
+msgstr "訓練"
+
+msgid "Appointment"
+msgstr "予約"
+
+msgid "Inactive"
+msgstr "無効"
+
+msgid "Relaxing"
+msgstr "リラックス"
+
+msgid "Talking"
+msgstr "会話"
+
+msgid "Traveling"
+msgstr "旅行"
+
+msgid "Working"
+msgstr "仕事"
+
+msgid "View profile"
+msgstr "プロフィールを見る"
+
+msgid "Repeat this notice"
+msgstr "お知らせを繰り返す"
+
+msgid "Remove this notice"
+msgstr "お知らせを削除"
+
+msgid "Your profile"
+msgstr "あなたのプロフィール"
+
+msgid "Identity"
+msgstr "身元"
+
+msgid "Profile image"
+msgstr "プロフィール画像"
+
+msgid "Others"
+msgstr "その他"
+
+msgid "Personal"
+msgstr "個人"
+
+msgid "Complete name"
+msgstr "氏名"
+
+msgid "Nickname"
+msgstr "ニックネーム"
+
+msgid "First name"
+msgstr "名"
+
+msgid "Last name"
+msgstr "姓"
+
+msgid "Date of birth"
+msgstr "誕生日"
+
+msgid "Contact"
+msgstr "連絡先"
+
+msgid "E-mail"
+msgstr "Eメール"
+
+msgid "Phone"
+msgstr "電話"
+
+msgid "Website"
+msgstr "WEBサイト"
+
+msgid "Current"
+msgstr "カレント"
+
+msgid "Delete"
+msgstr "削除"
+
+msgid "What a pity! You have no profile image defined in your identity card!"
+msgstr "残念!あなたの情報カードにイメージが定義されていません"
+
+msgid "Address"
+msgstr "アドレス"
+
+msgid "Street"
+msgstr "番地"
+
+msgid "City"
+msgstr "市町村"
+
+msgid "Postal code"
+msgstr "郵便番号"
+
+msgid "Country"
+msgstr "国"
+
+msgid "Biography"
+msgstr "自己紹介"
+
+msgid "Important notice"
+msgstr "重要なお知らせ"
+
+msgid "Be careful of the information you write into your profile, because it could be accessed by everyone (even someone you don't want to)."
+msgstr "みんながアクセスする為、プロフィール情報を書き込むときは注意してください。(あなたが公開を望まない情報もあります)"
+
+msgid "Not everything is private on XMPP; this is one of those things, your public profile (vCard)."
+msgstr "XMPPはプライベートではありません。パブリックプロファイル(vCard)を選択してください。"
+
+msgid "It is strongly recommended to upload a profile image (%s maximum), like a picture of yourself, because that makes you easily recognizable by your friends."
+msgstr "他のユーザが簡単に識別できるようにプロファイルイメージ(最大 %s)をアップロードする事をお勧めします。"
+
+msgid "Save"
+msgstr "保存"
+
+msgid "Cancel"
+msgstr "キャンセル"
+
+msgid "Edit options"
+msgstr "オプション編集"
+
+msgid "Channel"
+msgstr "チャンネル"
+
+msgid "Commands"
+msgstr "コマンド"
+
+msgid "Sounds"
+msgstr "サウンド"
+
+msgid "Privacy"
+msgstr "プライバシー"
+
+msgid "Message archiving"
+msgstr "メッセージアーカイブ"
+
+msgid "Store a history of your chats"
+msgstr "チャット履歴を保持する"
+
+msgid "Geolocation"
+msgstr "位置情報"
+
+msgid "Empty"
+msgstr "空"
+
+msgid "Empty channel"
+msgstr "空のチャンネル"
+
+msgid "Persistent"
+msgstr "持続"
+
+msgid "Maximum notices"
+msgstr "お知らせの最大数"
+
+msgid "Account"
+msgstr "アカウント"
+
+msgid "Change password"
+msgstr "パスワード変更"
+
+msgid "Delete account"
+msgstr "アカウント削除"
+
+msgid "Old"
+msgstr "古い"
+
+msgid "New (2 times)"
+msgstr "新しい(2回)"
+
+msgid "Continue"
+msgstr "次"
+
+msgid "To"
+msgstr "宛先"
+
+msgid "Close"
+msgstr "閉じる"
+
+msgid "unknown"
+msgstr "不明"
+
+msgid "Unavailable"
+msgstr "使用出来ません"
+
+msgid "is now"
+msgstr "新規"
+
+msgid "Please wait while your avatar is uploaded..."
+msgstr "アバターのアップロードが完了するのを待ってください…"
+
+msgid "Here it is! A new beautiful profile image!"
+msgstr "美しい新規プロファイルイメージはここにあります"
+
+msgid "The image file is not supported or has a bad size."
+msgstr "このイメージはサポートされていないか、サイズが間違っています"
+
+msgid "Reply"
+msgstr "返信"
+
+msgid "Error"
+msgstr "エラー"
+
+msgid "Click here to solve the error"
+msgstr "クリックしてエラーを修正してください"
+
+msgid "You"
+msgstr "あなた"
+
+msgid "Remove"
+msgstr "削除"
+
+msgid "Rename"
+msgstr "名前変更"
+
+msgid "Hi, I am %s, I would like to add you as my friend."
+msgstr "こんにちは、わたしは %s です。あなたを新しい友人に追加したいです。"
+
+msgid "Smiley insertion"
+msgstr "顔文字を挿入"
+
+msgid "Change style"
+msgstr "スタイル変更"
+
+msgid "Text in bold"
+msgstr "太字"
+
+msgid "Text in italic"
+msgstr "イタリック"
+
+msgid "Underlined text"
+msgstr "下線"
+
+msgid "Save chat"
+msgstr "チャットを保存"
+
+msgid "Click on the following link to get the chat log, and wait. Then click again to get the file."
+msgstr "チャット履歴を取得するには以下のリンクをクリックしてしばらく待ちます。次に再度クリックしてファイルを取得します。"
+
+msgid "This chat is empty!"
+msgstr "このチャットは空です"
+
+msgid "Generate file!"
+msgstr "ファイルを生成!"
+
+msgid "Download file!"
+msgstr "ファイルをダウンロード!"
+
+msgid "Clean current chat"
+msgstr "カレントチャットをクリア"
+
+msgid "View chat history"
+msgstr "会話履歴を参照"
+
+msgid "Show user profile"
+msgstr "ユーザープロフィールを表示"
+
+msgid "Add this contact to your friends"
+msgstr "連絡先に友達を追加"
+
+msgid "Add this groupchat to your favorites"
+msgstr "お気に入りにグループチャットを追加"
+
+msgid "All tabs"
+msgstr "全てのタブ"
+
+msgid "Close this tab"
+msgstr "このタブを閉じる"
+
+msgid "no subject defined for this room."
+msgstr "このルームには件名がありません。"
+
+msgid "Administration panel for this room"
+msgstr "この部屋の管理パネル"
+
+msgid "Moderators"
+msgstr "モデレータ"
+
+msgid "Participants"
+msgstr "参加者"
+
+msgid "Visitors"
+msgstr "傍聴者"
+
+msgid "Manage favorite rooms"
+msgstr "お気に入りの部屋の管理"
+
+msgid "Change favorites"
+msgstr "お気に入りの変更"
+
+msgid "Search a room"
+msgstr "ルームを検索"
+
+msgid "Select a favorite"
+msgstr "お気に入りを選択"
+
+msgid "Getting the name..."
+msgstr "名前を取得中"
+
+msgid "Gateway"
+msgstr "ゲートウェイ"
+
+msgid "Name"
+msgstr "名前"
+
+msgid "Room"
+msgstr "ルーム"
+
+msgid "Add"
+msgstr "追加"
+
+msgid "Edit"
+msgstr "編集"
+
+msgid "Search a room on"
+msgstr "ルームを検索: "
+
+msgid "No room found on this server."
+msgstr "このサーバーでルームは見つかりませんでした。"
+
+msgid "Service discovery"
+msgstr "サービスディスカバリ"
+
+msgid "Server to query"
+msgstr "サーバーに問い合わせ"
+
+msgid "Sorry, but the entity didn't return any result!"
+msgstr "ごめんね、エンティティがあらゆる結果を返しませんでした!"
+
+msgid "Accounts"
+msgstr "アカウント"
+
+msgid "Authentications"
+msgstr "認証"
+
+msgid "Automation"
+msgstr "自動化"
+
+msgid "Clients"
+msgstr "クライアント"
+
+msgid "Collaboration"
+msgstr "コラボレーション"
+
+msgid "Components"
+msgstr "コンポーネント"
+
+msgid "Rooms"
+msgstr "ルーム"
+
+msgid "Directories"
+msgstr "ディレクトリ"
+
+msgid "Gateways"
+msgstr "ゲートウェイ"
+
+msgid "News"
+msgstr "ニュース"
+
+msgid "Hierarchy"
+msgstr "階層"
+
+msgid "Proxies"
+msgstr "プロキシ"
+
+msgid "Publication/Subscription"
+msgstr "公開/購読"
+
+msgid "Storage"
+msgstr "ストレージ"
+
+msgid "Service offline or broken"
+msgstr "サービスがオフラインか壊れています"
+
+msgid "Your inbox"
+msgstr "受信箱"
+
+msgid "Available actions"
+msgstr "有効な動作"
+
+msgid "Clean"
+msgstr "消去"
+
+msgid "New"
+msgstr "New"
+
+msgid "Received"
+msgstr "受信"
+
+msgid "Subject"
+msgstr "件名"
+
+msgid "Content"
+msgstr "内容"
+
+msgid "Send message"
+msgstr "メッセージを送信"
+
+msgid "Your inbox is empty."
+msgstr "受信箱は空です。"
+
+msgid "MUC administration"
+msgstr "MUC管理"
+
+msgid "You administrate this room"
+msgstr "あなたはこのルームを管理します"
+
+msgid "Enter new subject"
+msgstr "新しい件名を入力してください"
+
+msgid "Configuration"
+msgstr "設定"
+
+msgid "Authorizations"
+msgstr "許可"
+
+msgid "Member list"
+msgstr "メンバーリスト"
+
+msgid "Owner list"
+msgstr "所有者リスト"
+
+msgid "Administrator list"
+msgstr "管理者リスト"
+
+msgid "Outcast list"
+msgstr "追放者リスト"
+
+msgid "Add an input"
+msgstr "入力を追加"
+
+msgid "Destroy this MUC"
+msgstr "このMUCを解散する"
+
+msgid "Yes, let's do it!"
+msgstr "はい、そうします!"
+
+msgid "Your friend is paying attention to the conversation."
+msgstr "友達は、会話に注意を払っています。"
+
+msgid "Your friend is writing a message..."
+msgstr "友達はメッセージを書いています。"
+
+msgid "Your friend stopped writing a message."
+msgstr "友達はメッセージの書き込みを中断しました。"
+
+msgid "Your friend is doing something else."
+msgstr "友達は何かをしています。"
+
+msgid "Your friend closed the chat."
+msgstr "友達はチャットを閉じました。"
+
+msgid "Requesting this service..."
+msgstr "サービスを要求中..."
+
+msgid "Loading"
+msgstr "読み込み中"
+
+msgid "joined the chat room"
+msgstr "チャットルームに誘う"
+
+msgid "left the chat room"
+msgstr "チャットルームに入室する"
+
+msgid "no status"
+msgstr "ステータスがありません"
+
+msgid "has been kicked"
+msgstr "追い出されました"
+
+msgid "has been banned"
+msgstr "禁止されています"
+
+msgid "no reason"
+msgstr "理由無し"
+
+msgid "Communicate with the entire world!"
+msgstr "全世界とコミュニケーション!"
+
+msgid "It allows you to get in touch with the millions of users who currently use the XMPP network like you do with Jappix. Join the community and stay free!"
+msgstr "ここでは XMPPネットワークを使用する何百万人のユーザーと連絡を取ることが出来ます。コミュニティーへの参加は自由です!"
+
+msgid "Hi there!"
+msgstr "こんにちは!"
+
+msgid "Welcome on %1s, “%2s”."
+msgstr "ようこそ %1s へ、 “%2s”."
+
+msgid "Login to your existing XMPP account or create a new one for free!"
+msgstr "既存のXMPPアカウントでログインを行うか無料でアカウント作成できます!"
+
+msgid "Jappix is an open-source project from PostPro, a non-profit organization which provides us a great help."
+msgstr "JappixはPostProのオープンソースプロジェクトです。私たちは非営利団体なので助けを求めています。"
+
+msgid "Login to your existing XMPP account. You can also use the %s to join a groupchat."
+msgstr "あなたが作成したXMPPアカウントでログインしてください。%s グループチャットに接続することが出来ます。"
+
+msgid "Previous"
+msgstr "戻る"
+
+msgid "General"
+msgstr "一般"
+
+msgid "Advanced"
+msgstr "高度"
+
+msgid "Resource"
+msgstr "リソース"
+
+msgid "Priority"
+msgstr "優先度"
+
+msgid "Low"
+msgstr "低"
+
+msgid "Medium"
+msgstr "中"
+
+msgid "High"
+msgstr "高"
+
+msgid "Enter the groupchat you want to join and the nick you want to have. You can also go back to the %s."
+msgstr "接続したいグループチャットとニックネームを入力してください。%sで戻ることができます。"
+
+msgid "login page"
+msgstr "ログインページ"
+
+msgid "Share this link with your friends:"
+msgstr "次のリンクを友達と共有する:"
+
+msgid "Register a new XMPP account to join your friends on your own social cloud. That's simple!"
+msgstr "あなたの友達が接続するには、ソーシャルクラウドでXMPPアカウントの承認を受ける必要があります。手続きは簡単にできます。"
+
+msgid "Required"
+msgstr "要求"
+
+msgid "You have been registered, here is your XMPP address:"
+msgstr "承認されました。あなたのXMPPアドレスは："
+
+msgid "Manager"
+msgstr "マネージャー"
+
+msgid "Project"
+msgstr "プロジェクト"
+
+msgid "Encrypted"
+msgstr "暗号化済"
+
+msgid "Unencrypted"
+msgstr "暗号化しない"
+
+msgid "Where are you?"
+msgstr "どこにいますか？"
+
+msgid "What's up with you?"
+msgstr "なにしてる?"
+
+msgid "Fetching the social channel..."
+msgstr "ソーシャルチャンネルを取得..."
+
+msgid "You are synchronized with your network."
+msgstr "ネットワークと同期しました。"
+
+msgid "Cannot send anything: you can only receive notices!"
+msgstr "何も送信できません: あなたはお知らせのみ受信できます!"
+
+msgid "Media viewer"
+msgstr "メディアビューア"
+
+msgid "Browse"
+msgstr "ブラウズ"
+
+msgid "Command"
+msgstr "コマンド"
+
+msgid "Subscribe"
+msgstr "購読"
+
+msgid "Join"
+msgstr "参加"
+
+msgid "Automatic"
+msgstr "自動"
+
+msgid "Search"
+msgstr "検索"
+
+msgid "No result!"
+msgstr "結果はありません!"
+
+msgid "No notifications."
+msgstr "非通知"
+
+msgid "would like to add you as a friend."
+msgstr "はあなたを友達に追加したがっています。"
+
+msgid "would like you to join this chatroom:"
+msgstr "はあなたをチャットルームに招待しています:"
+
+msgid "Do you accept?"
+msgstr "許可しますか?"
+
+msgid "Yes"
+msgstr "はい"
+
+msgid "No"
+msgstr "いいえ"
+
+msgid "would like to get authorization."
+msgstr "承認を希望します"
+
+msgid "Do you want to see the friends %s suggests you?"
+msgstr "%s に友達申請をしますか？"
+
+msgid "Submit"
+msgstr "送信"
+
+msgid "Client"
+msgstr "クライアント"
+
+msgid "System"
+msgstr "システム"
+
+msgid "Local time"
+msgstr "ローカル時間"
+
+msgid "Comments"
+msgstr "コメント"
+
+msgid "User profile"
+msgstr "ユーザー情報"
+
+msgid "See his/her position on the globe"
+msgstr "位置を見る"
+
+msgid "Confirm"
+msgstr "確認"
+
+msgid "anonymous mode"
+msgstr "匿名モード"
+
+msgid "Groups"
+msgstr "グループ"
+
+msgid "Unclassified"
+msgstr "秘密ではない"
+
+msgid "Authorize"
+msgstr "承認"
+
+msgid "Ask for authorization"
+msgstr "承認を依頼する。"
+
+msgid "Unblock"
+msgstr "ブロック解除"
+
+msgid "Prohibit"
+msgstr "禁止する"
+
+msgid "Block"
+msgstr "除外"
+
+msgid "Chat"
+msgstr "チャット"
+
+msgid "Groupchat"
+msgstr "グループチャット"
+
+msgid "Jappix Mobile"
+msgstr "Jappixモバイル"
+
+msgid "Desktop"
+msgstr "デスクトップ"
+
+msgid "Mobile"
+msgstr "モバイル"
+
+msgid "Please wait..."
+msgstr "しばらくお待ち下さい..."
+
+msgid "Please enable JavaScript"
+msgstr "JavaScriptを有効にして下さい"
+
+msgid "Your channel"
+msgstr "チャンネル"
+
+msgid "Channel of"
+msgstr "チャンネル: "
+
+msgid "More notices..."
+msgstr "他のお知らせ..."
+
+msgid "Attach a file"
+msgstr "ファイルの添付"
+
+msgid "Send"
+msgstr "送信"
+
+msgid "Unattach the file"
+msgstr "添付ファイルの取り消し"
+
+msgid "An error occured while uploading your file: maybe it is too big (%s maximum) or forbidden!"
+msgstr "ファイルアップロード中にエラーが発生しました：ファイルサイズが大きいかアップロードが禁止されています"
+
+msgid "Authorization failed"
+msgstr "認証失敗"
+
+msgid "Registration failed, please choose a different username"
+msgstr "登録に失敗しました、別のユーザー名を選んでください。"
+
+msgid "Service unavailable"
+msgstr "サービス不能です。"
+
+msgid "Internal server error, try later"
+msgstr "内部サーバーエラー、再度試してください。"
+
+msgid "Your form has been sent."
+msgstr "フォームが送信されました"
+
+msgid "Application"
+msgstr "アプリケーション"
+
+msgid "XMPP links"
+msgstr "XMPPリンク"
+
+msgid "Open XMPP links with Jappix"
+msgstr "JappixでXMPPリンクを開く"
+
+msgid "changed the subject to:"
+msgstr "サブジェクトの変更"
+
+msgid "Welcome!"
+msgstr "ようこそ"
+
+msgid "Friends"
+msgstr "友達"
+
+msgid "Welcome on Jappix, your own social cloud!"
+msgstr "Jappixへようこそ。ここはあなたのソーシャルクラウドです!"
+
+msgid "Before you start using it, you will have to change some settings, search for friends and complete your profile."
+msgstr "使用を開始する前に、いくつかの設定変更、検索およびプロフィールを設定する必要があります。"
+
+msgid "Enable notification sounds"
+msgstr "警告音を有効にする"
+
+msgid "Share your position on the globe"
+msgstr "現在位置を共有する"
+
+msgid "Offline friends"
+msgstr "オフラインの友達"
+
+msgid "Don't hide offline friends"
+msgstr "オフラインの友達を隠す"
+
+msgid "Use this tool to find your friends on the server you are using right now, or add them later."
+msgstr "このツールを使用することでサーバ上の友達の検索したり、追加することが可能になります。"
+
+msgid "Great work! Now, you can share Jappix with your friends!"
+msgstr "よくできました!あなたは友達とJappixで共有できます。"
+
+msgid "When you will press the save button, the profile editor will be opened. Happy socializing!"
+msgstr "セーブボタンを押すとプロファイルエディターが起動します。幸せなお付き合いを！"
+
+msgid "Share Jappix on %s"
+msgstr "%sとJappixを共有しました"
+
+msgid "Using Jappix, an open social platform. I am %s!"
+msgstr "私は%sです。オープンソーシャルプラットフォームJappixを使用しています"
+
+msgid "Unknown name"
+msgstr "不明な名前"
+
+msgid "Unknown country"
+msgstr "不明な国名"
+
+msgid "Click to enable"
+msgstr "enableをクリック"
+
+msgid "Click to disable"
+msgstr "disableをチェック"
+
+msgid "Installation"
+msgstr "インストレーション"
+
+msgid "Jappix installation"
+msgstr "Jappixのインストール"
+
+msgid "Welcome to the Jappix installation!"
+msgstr "Jappixのインストールへようこそ!"
+
+msgid "This tool will help you fastly install Jappix, the first full-featured XMPP-based social platform, on your server. You don't even need any technical knowledge."
+msgstr "このツールはJappixのインストールをサポートします。フル機能のXMPPソーシャルプラットフォームサーバがあれば、技術的な知識は必要ありません"
+
+msgid "Let's have a look at the installation steps:"
+msgstr "インストールのステップ:"
+
+msgid "Welcome"
+msgstr "ようこそ"
+
+msgid "Storage configuration"
+msgstr "ストレージの設定"
+
+msgid "Administrator account"
+msgstr "管理者アカウント"
+
+msgid "Main configuration"
+msgstr "メイン設定"
+
+msgid "Hosts configuration"
+msgstr "ホストの設定"
+
+msgid "Services installation"
+msgstr "サービスのインストール"
+
+msgid "If the current language does not match yours (%1s), you can make Jappix speak %2s it will be saved."
+msgstr "もし現在の言語があなたの環境（%1s）と異なる場合、Jappixスピーク %2s を作成し保存してください。"
+
+msgid "If you want to get some help about the Jappix installation and configuration, you can use our whole documentation, available at:"
+msgstr "Jappixのインストールや設定のヘルプが必要な場合には、全体ドキュメントを利用する事が可能です："
+
+msgid "It's time to build your own social cloud: just go to the next step!"
+msgstr "個人的なソーシャルクラウドを作成するには、次のステップに移動します！"
+
+msgid "Jappix stores persistent data (such as shared files, chat logs, your own music and its configuration) into a single secured storage folder."
+msgstr "Jappixのデータ(共有ファイル、チャットログ、音楽、設定等)は、セキュリティで保護されたフォルダに保存します。"
+
+msgid "Jappix must be able to write in this folder to create its sub-directories. If not, you must set the rights to %1s or change the folder owner to %2s (depending of your configuration)."
+msgstr "サブフォルダを書き込む権限が必要です。%1sに権限を与えるか%2sに権限を与えてください"
+
+msgid "The folder is writable, you can continue!"
+msgstr "フォルダは書き込み可能です。続けてください。"
+
+msgid "Jappix offers you the possibility to manage your configuration, install new addons or search for updates. That's why you must create an administrator account to access the manager."
+msgstr "Jappixは、設定ファイル、新しいプラグイン、アップデートを提供できます。管理者権限でのアクセスが必要です。"
+
+msgid "When Jappix will be installed, just click on the manager link on the home page to access it."
+msgstr "Jappixのインストールが終了しました。マネジャーリンクをクリックしてホームページにアクセスしてください。"
+
+msgid "Oops, you missed something or the two passwords do not match!"
+msgstr "パスワードが一致しません"
+
+msgid "Jappix needs that you specify some values to work. Please correct the following inputs (or keep the default values, which are sufficient for most people)."
+msgstr "Jappixが動作するように設定する必要があります。次の項目を入力してください(通常は規定値で十分です)"
+
+msgid "Note that if you don't specify a value which is compulsory, it will be automatically completed with the default one."
+msgstr "値を入力しない場合には、自動的に規定値が設定されます。"
+
+msgid "User"
+msgstr "ユーザー"
+
+msgid "Service"
+msgstr "サービス"
+
+msgid "Service name"
+msgstr "サービス名"
+
+msgid "Service description"
+msgstr "サービスの説明"
+
+msgid "Connection"
+msgstr "コネクション"
+
+msgid "Lock the host"
+msgstr "ホストがロックされました。"
+
+msgid "Anonymous mode"
+msgstr "匿名モード"
+
+msgid "Registration allowed"
+msgstr "承認許可"
+
+msgid "Use a proxy"
+msgstr "プロキシーを使用する"
+
+msgid "Encryption"
+msgstr "暗号化"
+
+msgid "HTTPS storage"
+msgstr "HTTPSストレージ"
+
+msgid "Force HTTPS"
+msgstr "HTTPSを強制的に使用する"
+
+msgid "Compression"
+msgstr "圧縮"
+
+msgid "This page helps you specify the default hosts Jappix will connect to. You can leave it as it is and continue if you want to use the official service hosts."
+msgstr "このページでJappixが接続するホストが設定できます。オフィシャルサービスの場合はそのまま続行してください。"
+
+msgid "Maybe you don't know what a BOSH server is? In fact, this is a relay between a Jappix client and a XMPP server, which is necessary because of technical limitations."
+msgstr "不明なBOSHサーバです。JappixクライアントとXMPPサーバ間の接続に技術的な制限が必要です。"
+
+msgid "Main host"
+msgstr "メインホスト"
+
+msgid "Groupchat host"
+msgstr "グループチャットホスト"
+
+msgid "Anonymous host"
+msgstr "匿名ホスト"
+
+msgid "Directory host"
+msgstr "ホストの検索"
+
+msgid "BOSH host"
+msgstr "BOSHホスト"
+
+msgid "You can install some extra softwares on your server, to extend your Jappix features. Some others might be modified, because of security restrictions which are set by default."
+msgstr "Jappixを拡張するためにソフトウエアをインストールする事が出来ます。セキュリティの為規定値が変わる場合もあります。"
+
+msgid "To perform this, you must be able to access your server's shell and be logged in as root. Remember this is facultative, Jappix will work without these modules, but some of its features will be unavailable."
+msgstr "実行するにはroot権限でシェルを実行できるユーザでアクセスする必要があります。Jappixのいくつかの機能が制限される場合があります。"
+
+msgid "After you finished the setup, Jappix will generate the cache files. It might be slow, just wait until the application is displayed and do not press any button."
+msgstr "セットアップ完了後キャッシュファイルを作成します。アプリケーションが表示されるまでボタンを押さずにお待ちください。"
+
+msgid "Thanks for using Jappix!"
+msgstr "Jappixをご利用いただきありがとうございます"
+
+msgid "Next"
+msgstr "次"
+
+msgid "Finish"
+msgstr "完了"
+
+msgid "Check again"
+msgstr "もう一度確認して下さい"
+
+msgid "The folder is not writable, set the right permissions to the %s directory."
+msgstr "フォルダーに書き込みができません。%sディレクトリーに書き込み権限を追加してください。"
+
+msgid "%s is installed on your system."
+msgstr "%s は、あなたのシステムにインストールされました"
+
+msgid "%1s is not installed on your system, you should install %2s."
+msgstr "%1s はインストールされてません。%2sをインストールしてください"
+
+msgid "PHP maximum upload size is sufficient (%s)."
+msgstr "PHPの最大アップロードサイズは十分です。"
+
+msgid "PHP maximum upload size is not sufficient (%1s), you should define it to %2s in %3s."
+msgstr "PHPの最大アップロードサイズが不足しています。%3から%2sの間で設定してください。"
+
+msgid "Jappix manager"
+msgstr "Jappixマネージャ"
+
+msgid "Manager access"
+msgstr "マネージャへアクセス"
+
+msgid "Statistics"
+msgstr "統計情報"
+
+msgid "Hosts"
+msgstr "ホスト"
+
+msgid "Design"
+msgstr "デザイン"
+
+msgid "Repeat"
+msgstr "報告"
+
+msgid "All"
+msgstr "全て"
+
+msgid "Horizontal"
+msgstr "水平"
+
+msgid "Vertical"
+msgstr "垂直"
+
+msgid "Center"
+msgstr "中"
+
+msgid "Left"
+msgstr "左"
+
+msgid "Right"
+msgstr "右"
+
+msgid "Top"
+msgstr "上"
+
+msgid "Bottom"
+msgstr "下"
+
+msgid "Adapt"
+msgstr "適用"
+
+msgid "Color"
+msgstr "色"
+
+msgid "Users"
+msgstr "ユーザ"
+
+msgid "Updates"
+msgstr "アップデート"
+
+msgid "This is a restricted area: only the authorized users can manage this Jappix node."
+msgstr "制限された領域:認証されたユーザだけがJappixノードを管理できます。"
+
+msgid "Please use the form below to login to the administration panel."
+msgstr "管理パネルにログインするには、下記のフォームを利用してください。"
+
+msgid "To improve security, sessions are limited in time and when your browser will be closed, you will be logged out."
+msgstr "セキュリティを強化するにはセッションの制限時間を設け、ブラウザ終了時にログアウトします。"
+
+msgid "Credentials"
+msgstr "資格情報"
+
+msgid "You have been logged out. Goodbye!"
+msgstr "あなたはログアウトしています。さようなら!"
+
+msgid "Oops, you could not be recognized as a valid administrator. Check your credentials!"
+msgstr "管理者として認識できませんでした。資格情報を確認してください。"
+
+msgid "Basic statistics are processed by Jappix about some important things, you can find them below."
+msgstr "Jappixで処理された統計情報です。重要な情報を見つけることができます。"
+
+msgid "Change your Jappix node configuration with this tool."
+msgstr "このツールを使用してJappixノードの設定を変更することが出来ます。"
+
+msgid "Change the XMPP hosts that this Jappix node serve with this tool."
+msgstr "Jappixノードが送信するXMPPホストを変更することができます。"
+
+msgid "All this Jappix node stored files can be managed with this tool: please select a sub-folder and start editing its content!"
+msgstr "Jappixノードに保存されているすべてのファイルの管理ができます。サブフォルダを選択して編集を開始！"
+
+msgid "Jappix is fully customisable: you can change its design right here."
+msgstr "Jappixは完全にカスタマイズ可能です。右側でデザインが変更できます。"
+
+msgid "This is not a valid image, please use PNG, GIF or JPG!"
+msgstr "イメージの形式が無効です。PNG,GIF又はJPGを使用してください"
+
+msgid "The image could not be received, would you mind retry?"
+msgstr "イメージを受信できませんでした。再受信しますか？"
+
+msgid "Your image was added to the list!"
+msgstr "イメージをリストに追加しました。"
+
+msgid "Changes saved!"
+msgstr "変更を保存しました。"
+
+msgid "You can define more than one administrator for this Jappix node. You can also change a password with this tool."
+msgstr "一人又は複数のJappixノードの管理者が定義可能です。パスワードを変更する事も可能です。"
+
+msgid "Update your Jappix node with this tool, or check if a new one is available. Informations about the latest version are also displayed (in english)."
+msgstr "Jappixのバージョンをチェックし、ノードをアップデートできます。英語で最新バージョン情報が表示されます。"
+
+msgid "Access statistics"
+msgstr "アクセス統計情報"
+
+msgid "Share statistics"
+msgstr "共有統計情報"
+
+msgid "Other statistics"
+msgstr "その他統計情報"
+
+msgid "January"
+msgstr "1月"
+
+msgid "February"
+msgstr "2月"
+
+msgid "March"
+msgstr "3月"
+
+msgid "April"
+msgstr "4月"
+
+msgid "May"
+msgstr "5月"
+
+msgid "June"
+msgstr "6月"
+
+msgid "July"
+msgstr "7月"
+
+msgid "August"
+msgstr "8月"
+
+msgid "September"
+msgstr "9月"
+
+msgid "October"
+msgstr "10月"
+
+msgid "November"
+msgstr "11月"
+
+msgid "December"
+msgstr "12月"
+
+msgid "Monday"
+msgstr "月曜日"
+
+msgid "Tuesday"
+msgstr "火曜日"
+
+msgid "Wednesday"
+msgstr "水曜日"
+
+msgid "Thursday"
+msgstr "木曜日"
+
+msgid "Friday"
+msgstr "金曜日"
+
+msgid "Saturday"
+msgstr "土曜日"
+
+msgid "Sunday"
+msgstr "日曜日"
+
+msgid "Total"
+msgstr "合計"
+
+msgid "Cache"
+msgstr "キャッシュ"
+
+msgid "Logs"
+msgstr "ログ"
+
+msgid "Music"
+msgstr "音楽"
+
+msgid "Backgrounds"
+msgstr "バックグランド"
+
+msgid "Share"
+msgstr "共有"
+
+msgid "Background"
+msgstr "バックグランド"
+
+msgid "Notice"
+msgstr "お知らせ"
+
+msgid "Your design preferences have been saved!"
+msgstr "デザイン環境設定を保存しました!"
+
+msgid "Please check your inputs: something is missing!"
+msgstr "入力項目を確認してください:何かが不足しています。"
+
+msgid "Change your Jappix node background with this tool. You can either set a custom color or an uploaded image. Let your creativity flow!"
+msgstr "Jappixの背景を好みの色やアップロードしたイメージに変更することができます。あなたの感性に合わせてください！"
+
+msgid "Use default background"
+msgstr "デフォルトでバックグランドを利用する"
+
+msgid "Use your own image"
+msgstr "所有しているイメージを使用する。"
+
+msgid "Select a background to use and change the display options."
+msgstr "バックグランドを選択し、ディスプレイモードを変更してください"
+
+msgid "Use your own color"
+msgstr "独自の色を使用"
+
+msgid "Type the hexadecimal color value you want to use as a background."
+msgstr "背景で使用したい色を16進数で入力してください"
+
+msgid "Manage backgrounds"
+msgstr "背景の管理"
+
+msgid "You can add a new background to the list with this tool. Please send a valid image."
+msgstr "新しい背景を追加する事ができます。有効なイメージをアップロードしてください。"
+
+msgid "If you want to remove some backgrounds, use the browser below."
+msgstr "背景を削除したい場合には、以下のブラウザを使用してください。"
+
+msgid "Define a homepage notice for all your users, such as a warn, an important message or an advert with this tool."
+msgstr "全てのユーザに対しての注意書きや広告が定義できます。"
+
+msgid "Simple notice"
+msgstr "簡単なお知らせ"
+
+msgid "This notice only needs simple text to be displayed, but no code is allowed!"
+msgstr "注意はテキストで表示できます。コードはサポートされていません。"
+
+msgid "Advanced notice"
+msgstr "高度な通知"
+
+msgid "You can customize your notice with embedded HTML, CSS and JavaScript, but you need to code the style."
+msgstr "注意をHTML,CSS、JavaScript形式にカスタマイズできます。コード形式にする必要があります。"
+
+msgid "Available updates"
+msgstr "アップデートが利用できます。"
+
+msgid "What's new?"
+msgstr "What's new?"
+
+msgid "Your storage folders are not writable, please apply the good rights!"
+msgstr "ストレージフォルダに書き込みがせきません。書き込みを許可してください！"
+
+msgid "%1s may cause problems to the proxy, please increase %2s value up to %3s!"
+msgstr "%1s の原因はプロキシーです。%2s に増加するか、最大値 %3s にしてください。"
+
+msgid "You are using a development version of Jappix. Update it through our repository by executing: %s."
+msgstr "開発バージョンのJappixを使用しています。%s を実行してリポジトリを更新してください。"
+
+msgid "A new Jappix version is available! Check what is new and launch the update!"
+msgstr "新しいバージョンのJappixがあります。確認してアップデートしてください。"
+
+msgid "Your version is out to date. Update it now to %s by clicking here!"
+msgstr "期限切れのバージョンです。ここをクリックして%sにバージョンアップしてください。"
+
+msgid "Your version seems to be up to date, but you can check updates manually by clicking here."
+msgstr "バージョンは最新のようです。バージョンを手動でチェックする場合にはクリックしてください。"
+
+msgid "Check for updates"
+msgstr "アップデートをクリックしてください"
+
+msgid "Update in progress"
+msgstr "アップデートが完了しました。"
+
+msgid "Jappix has been updated: you are now running the latest version. Have fun!"
+msgstr "Jappixをアップデートしています:最新バージョンで動作しています。"
+
+msgid "The update has failed! Please try again later."
+msgstr "アップデートに失敗しました!再度試してください。"
+
+msgid "Downloading package..."
+msgstr "パッケージをダウンロード中..."
+
+msgid "Removing current Jappix system files..."
+msgstr "現在のJappixシステムファイルを削除しています。"
+
+msgid "Extracting package..."
+msgstr "パッケージを抽出中..."
+
+msgid "Regenerating storage folder tree..."
+msgstr "ストレージフォルダツリーを再構成中..."
+
+msgid "Jappix is now up to date!"
+msgstr "Jappixをアップデートしました！"
+
+msgid "Aborted: socket error!"
+msgstr "中止:ソケットエラー"
+
+msgid "Aborted: buffer error!"
+msgstr "中止:バッファーエラー"
+
+msgid "Aborted: everything is not writable!"
+msgstr "中止:全て書き込み権がありません。"
+
+msgid "Aborted: could not extract the package!"
+msgstr "中止:パッケージを抽出することができませんでした。"
+
+msgid "Visits"
+msgstr "訪問"
+
+msgid "Daily"
+msgstr "日"
+
+msgid "Weekly"
+msgstr "週"
+
+msgid "Monthly"
+msgstr "月"
+
+msgid "Yearly"
+msgstr "年"
+
+msgid "Size"
+msgstr "サイズ"
+
+msgid "Clean everything"
+msgstr "全てをクリア"
+
+msgid "Purge cache"
+msgstr "キャッシュをパージ"
+
+msgid "Purge logs"
+msgstr "ログをパージ"
+
+msgid "Purge updates"
+msgstr "アップデートをパージ"
+
+msgid "The storage folder you wanted to clean is now empty!"
+msgstr "ストレージフォルダを空にしました!"
+
+msgid "Keep your Jappix node fresh and fast, clean the storage folders regularly!"
+msgstr "Jappixノードの快適さを維持するために、定期的にストレージフォルダをきれいにしてください！"
+
+msgid "Upload your music (Ogg Vorbis, MP3 or WAV) to be able to listen to it in Jappix!"
+msgstr "Jappixに音楽(Ogg Vorbis, MP3 または WAV 形式)をアップロードして聞くことができます！"
+
+msgid "The file you want to upload must be smaller than %s."
+msgstr "アップロードするファイルは%sより小さくする必要があります。"
+
+msgid "Stay tuned in what your users store on your server and remove undesired content with this tool."
+msgstr "ユーザストアの保持期間を調整したり、望ましくないコンテンツを削除できます。"
+
+msgid "Title"
+msgstr "タイトル"
+
+msgid "Artist"
+msgstr "アーティスト"
+
+msgid "Album"
+msgstr "アルバム"
+
+msgid "File"
+msgstr "ファイル"
+
+msgid "Upload"
+msgstr "アップロード"
+
+msgid "The folder is empty."
+msgstr "フォルダは空です。"
+
+msgid "The music could not be received, please retry!"
+msgstr "音楽を受信することができませんでした。再受信してください。"
+
+msgid "This is not a valid music file, please encode in Ogg Vorbis, MP3 or WAV!"
+msgstr "音楽ファイルが有効ではありません。エンコードはOgg Vorbis, MP3又はWAVを使用してください!"
+
+msgid "Your music has been added!"
+msgstr "音楽を追加しました"
+
+msgid "The selected elements have been removed."
+msgstr "選択された要素は削除しました。"
+
+msgid "You must select elements to remove!"
+msgstr "削除する要素を選択する必要があります。"
+
+msgid "Add a new user with this tool, or change a password (type an existing username). Please submit a strong password!"
+msgstr "新しいユーザを追加したりパスワードの変更ができます。複雑なパスワードを設定してください！"
+
+msgid "Manage"
+msgstr "管理"
+
+msgid "List"
+msgstr "リスト"
+
+msgid "Remove users with this tool. Note that you cannot remove an user if he is the only one remaining."
+msgstr "ユーザの削除ができます。但し、登録されているユーザが1人の場合には削除できません。"
+
+msgid "The user has been added!"
+msgstr "ユーザを追加しました。"
+
+msgid "The chosen users have been removed."
+msgstr "選択したユーザを削除しました。"
+
+msgid "You must select one or more users to be removed!"
+msgstr "削除するには1つまたは複数のユーザを選択する必要があります。"
+
+msgid "Yesterday"
+msgstr "昨日"
+
+msgid "%s days ago"
+msgstr "%s 日前"
+
+msgid "User currently active"
+msgstr "ユーザは現在アクティブです。"
+
+msgid "Last seen: %s"
+msgstr "最終確認： %s"
+
+msgid "Inactive since: %s"
+msgstr "%s からアクティブでない"
+
+msgid "Your friend seems not to have received your message(s)!"
+msgstr "友達はメッセージを返信することができません!"
+
+msgid "Static content server"
+msgstr "スタティックコンテンツサーバ"
+
+msgid "This is the static content server for %1s, “%2s”."
+msgstr "“%2s” %1s はスタティックコンテンツサーバです。"
+
+msgid "Suggested friends"
+msgstr "友達の申請"
+
+msgid "Check all"
+msgstr "全てをチェック"
+
+msgid "Uncheck all"
+msgstr "全てのチェックの解除"
+
+msgid "Choose"
+msgstr "選択"
+
+msgid "List name"
+msgstr "苗字"
+
+msgid "Allow"
+msgstr "許可"
+
+msgid "Deny"
+msgstr "不許可"
+
+msgid "Group"
+msgstr "グループ"
+
+msgid "Subscription"
+msgstr "サブスクリプション"
+
+msgid "Both"
+msgstr "両方"
+
+msgid "From"
+msgstr "から"
+
+msgid "Everybody"
+msgstr "みんな"
+
+msgid "Send messages"
+msgstr "メッセージ送信"
+
+msgid "Send queries"
+msgstr "クエリー送信"
+
+msgid "See my status"
+msgstr "自分のステータスを見る"
+
+msgid "Send his/her status"
+msgstr "彼/彼女にステータスを送る"
+
+msgid "Everything"
+msgstr "全部"
+
+msgid "Item"
+msgstr "アイテム"
+
+msgid "Order"
+msgstr "その他"
+
+msgid "Active for this session"
+msgstr "セッションがアクティブになりました"
+
+msgid "Always active"
+msgstr "常にアクティブ"
+
+msgid "User directory"
+msgstr "ユーザーディレクトリ"
+
+msgid "Search a friend"
+msgstr "友達を検索"
+
+msgid "The feature requested is not implemented by the recipient or server and therefore cannot be processed."
+msgstr "要求されたリクエストは、受信者又はサーバに実装されていないため、処理する事ができません"
+
+msgid "This is a repeat from %s"
+msgstr "%sからのレポート"
+
+msgid "Loading comments..."
+msgstr "コメントをロード中…"
+
+msgid "Type your comment here..."
+msgstr "ここにコメントを入力してください…"
+
+msgid "Could not get the comments!"
+msgstr "コメントを取得できませんでした。"
+
+msgid "Show comments"
+msgstr "コメントを見る"
+
+msgid "Send him/her a message"
+msgstr "彼/彼女にメッセージを送る"
+
+msgid "Start a chat with him/her"
+msgstr "彼/彼女とチャットする"
+
+msgid "Media integration"
+msgstr "メディア統合"
+
+msgid "Comments locked!"
+msgstr "コメントがロックされています"
+
+msgid "Type something you want to share with your friends..."
+msgstr "友達と共有したいものを入力…"
+
+msgid "changed his/her nickname to %s"
+msgstr "彼/彼女のニックネームを %s に変更"
+
+msgid "commented an item you follow: “%s”."
+msgstr "“%s”のコメントをフォローする"
+
+msgid "Hide"
+msgstr "隠す"
+
+msgid "liked your post: “%s”."
+msgstr "“%s”にいいねを送信する"
+
+msgid "quoted you somewhere: “%s”."
+msgstr "“%s”を引用する"
+
+msgid "published on your wall: “%s”."
+msgstr "“%s”を公開する。"
+
+msgid "tagged you in a photo (%s)."
+msgstr "写真(%s)にタグを付けました。"
+
+msgid "tagged you in a video (%s)."
+msgstr "映像(%s)にタグを付けました。"
+
+msgid "Show"
+msgstr "見る"
+
+msgid "Need help? You'd better read our documentation page about how to fill this form!"
+msgstr "ヘルプが必要ですか？ドキュメントページをよく読むか、このフォームを入力してください！"
+
+msgid "Pubsub host"
+msgstr "Pubsubホスト"
+
+msgid "Jappix is a great social platform, that you can access wherever you are, whenever you want and communicate with whovever you want."
+msgstr "Jappixは素晴らしいソーシャルプラットフォームです。どこにいてもいつでもアクセスできます。"
+
+msgid "Manager link"
+msgstr "マネージャーリンク"
+
+msgid "User uploads server"
+msgstr "ユーザアップロードサーバ"
+
+msgid "This is the user uploads server for %1s, “%2s”."
+msgstr "“%2s”を%1sサーバにアップロードしました。"
+
+msgid "Logo"
+msgstr "ロゴ"
+
+msgid "You can set your own service logo to replace the default one. Take care of the size and the main color of each logo!"
+msgstr "デフォルトからあなたのサービスロゴに変更する事が出来ます。サイズと色に気をつけて！"
+
+msgid "Upload each logo with the recommended maximum pixel size."
+msgstr "推奨されるピクセルサイズのロゴをアップロードできます"
+
+msgid "This is not a valid image, please use the PNG format!"
+msgstr "有効なイメージではありません。PNGフォーマットを使用してください。"
+
+msgid "Your service logo has been successfully changed!"
+msgstr "サービスロゴを変更しました。"
+
+msgid "Your logo format must be PNG. Leave a field empty and the logo will not be changed."
+msgstr "ロゴフォーマットはPNG形式を使用する必要があります。フィールドが空欄の場合はロゴは変更されません。"
+
+msgid "Remove this logo"
+msgstr "このロゴの削除"
+
+msgid "View this logo"
+msgstr "このロゴを見る"
+
+msgid "Send a file"
+msgstr "ファイル送信"
+
+msgid "Once uploaded, your friend will be prompted to download the file you sent."
+msgstr "アップロードとは、友達が望むダウンロードファイルを送ることです。"
+
+msgid "Groupchats to join"
+msgstr "画像結合"
+
+msgid "Purge sent files"
+msgstr "送信ファイルのパージ"
+
+msgid "would like to send you a file: “%s”."
+msgstr "送信ファイルは“%s”のようになります"
+
+msgid "has accepted to received your file: “%s”."
+msgstr "“%s”ファイルを受信する事を受け入れました。"
+
+msgid "has rejected to receive your file: “%s”."
+msgstr "“%s”ファイルの受け取りを拒否しました。"
+
+msgid "could not receive your file: “%s”."
+msgstr "“%s”ファイルを受け取ることができません。"
+
+msgid "has received a file exchange request: “%s”."
+msgstr "“%s”ファイル交換要求を受信しました。"
+
+msgid "Available shortcuts:"
+msgstr "使用可能なショートカット："
+
+msgid "%s removes the chat logs"
+msgstr "%s はチャットログを削除しました。"
+
+msgid "%s joins a groupchat"
+msgstr "%s はグループチャットに接続しました。"
+
+msgid "%s closes the chat"
+msgstr "%s はチャットをクローズしました。"
+
+msgid "%s shows the user profile"
+msgstr "%s のユーザプロファイルを見る。"
+
+msgid "%s sends a message to the room"
+msgstr "%s は部屋にメッセージを送信する。"
+
+msgid "%s changes your nickname"
+msgstr "%s はニックネームを変更しました。"
+
+msgid "%s sends a message to someone in the room"
+msgstr "%s は部屋の誰かにメッセージを送ります。"
+
+msgid "%s changes the room topic"
+msgstr "%s は部屋のトピックを変更しました。"
+
+msgid "%s kicks an user of the room"
+msgstr "%s を部屋から追い出しました。"
+
+msgid "%s bans an user of the room"
+msgstr "%s の部屋の使用を禁止しました。"
+
+msgid "%s invites someone to join the room"
+msgstr "%s は部屋の出席者を招待しています。"
+
+msgid "Social channel, chat and more."
+msgstr ""
+
+msgid "Create your public profile."
+msgstr ""
+
+msgid "A mini-chat for your website."
+msgstr ""
+
+msgid "Get Jappix, get support."
+msgstr ""
+
+msgid "Statistics around Jappix."
+msgstr ""
+
+msgid "Download Jappix for free."
+msgstr ""
+
+msgid "Find a public Jappix node."
+msgstr ""
+
+msgid "Public profile"
+msgstr ""
+
+msgid "Your profile anywhere on the Web."
+msgstr ""
+
+msgid "%s is a Jappix.com service which makes your XMPP profile public. It is easier to share it. No XMPP account is required to view your social channel, your current position and your contact details."
+msgstr ""
+
+msgid "Furthermore, every picture you post in your social channel is added to a beautiful picture timeline. You can now view the pictures you shared year by year."
+msgstr ""
+
+msgid "You can also use your XMPP avatar as a single avatar for every website, blog and forum you use. When you change it on XMPP, the new avatar appears everywhere. What a genious improvement!"
+msgstr ""
+
+msgid "Yay, let's create my public profile!"
+msgstr ""
+
+msgid "Enable my public profile"
+msgstr ""
+
+#~ msgid "Jappix is a non-profit social platform, that you can access wherever you are, whenever you want and communicate with whovever you want."
+#~ msgstr "Jappixは非営利のソーシャルプラットフォームです。どこにいてもアクセスでき、いつでもコミュニケーションを取ることができます。"
+
+#~ msgid "See"
+#~ msgstr ""
+
+#~ msgid "Use default logo"
+#~ msgstr ""
+
+#~ msgid "Use your own logo"
+#~ msgstr ""
+
+#~ msgid "The recommended image format is PNG. Leave a field empty and the logo will not be changed."
+#~ msgstr ""
diff --git a/jappixmini/jappix/lang/nl/LC_MESSAGES/main.mo b/jappixmini/jappix/lang/nl/LC_MESSAGES/main.mo
new file mode 100644
index 00000000..a0e272c1
Binary files /dev/null and b/jappixmini/jappix/lang/nl/LC_MESSAGES/main.mo differ
diff --git a/jappixmini/jappix/lang/nl/LC_MESSAGES/main.po b/jappixmini/jappix/lang/nl/LC_MESSAGES/main.po
new file mode 100644
index 00000000..9ce3a856
--- /dev/null
+++ b/jappixmini/jappix/lang/nl/LC_MESSAGES/main.po
@@ -0,0 +1,1870 @@
+# Dutch translations for Jappix package.
+# This file is distributed under the same license as the Jappix package.
+# This file was translated from CodingTeam at <http://codingteam.net/>.
+msgid ""
+msgstr ""
+"Project-Id-Version: Jappix\n"
+"PO-Revision-Date: 2012-01-16 21:25+0100\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"POT-Creation-Date: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+
+msgid "JavaScript is missing in your web browser, so that you will not be able to launch Jappix! Please fix this."
+msgstr ""
+
+msgid "An open social network"
+msgstr ""
+
+msgid "Jappix has been interrupted by a network issue, a bug or bad login (check that you entered the right credentials), sorry for the inconvenience."
+msgstr "Jappix is onderbroken door een netwerk probleem, een fout of een slechte login (controleer dat je de juiste gegevens hebt ingegeven), sorry voor het ongemak."
+
+msgid "The element list on this server could not be obtained!"
+msgstr ""
+
+msgid "Your password has been changed, now you can connect to your account with your new login data."
+msgstr "Uw paswoord is gewijzigd, U kan nu aanmelden met de nieuwe gegevens."
+
+msgid "Your XMPP account has been removed, bye!"
+msgstr ""
+
+msgid "You have been logged out of your XMPP account, have a nice day!"
+msgstr ""
+
+msgid "The room you joined seems not to exist. You should create it!"
+msgstr "De kamer die je binnenkwam bestaat nog niet. Je moet ze eerst aanmaken!"
+
+msgid "The groupchat has been removed, now someone else will be able to recreate it."
+msgstr "Het groepsgesprek is verwijderd. Nu kan iemand anders ze opnieuw aanmaken."
+
+msgid "The user that you want to reach is not present in the room."
+msgstr ""
+
+msgid "Please enter the group chat address to join."
+msgstr ""
+
+msgid "Please enter your nickname to join %s."
+msgstr ""
+
+msgid "This room (%s) is protected with a password."
+msgstr ""
+
+msgid "Your browser is out of date!"
+msgstr ""
+
+msgid "Last %s version is better!"
+msgstr ""
+
+msgid "Login"
+msgstr "Log in"
+
+msgid "Register"
+msgstr "Registreer"
+
+msgid "Here we go!"
+msgstr "Hier gaan we dan!"
+
+msgid "Server"
+msgstr "Server"
+
+msgid "Password"
+msgstr "Paswoord"
+
+msgid "Remember me"
+msgstr "Herinner mij"
+
+msgid "This tool has been disabled, you cannot use it!"
+msgstr ""
+
+msgid "Due to a network issue, you were disconnected. What do you want to do now?"
+msgstr ""
+
+msgid "Reconnect"
+msgstr ""
+
+msgid "Messages"
+msgstr "Berichten"
+
+msgid "Profile"
+msgstr "Profiel"
+
+msgid "Options"
+msgstr "Opties"
+
+msgid "Disconnect"
+msgstr "Verbreek de verbinding"
+
+msgid "Filter"
+msgstr ""
+
+msgid "Add a friend"
+msgstr ""
+
+msgid "Your groupchats"
+msgstr ""
+
+msgid "Manage your favorite groupchats"
+msgstr "Beheer je favoriete groepsgesprekken"
+
+msgid "More stuff"
+msgstr ""
+
+msgid "Show all friends"
+msgstr "Toon alle vrienden"
+
+msgid "Only show connected friends"
+msgstr ""
+
+msgid "Message archives"
+msgstr "Berichten archief"
+
+msgid "Date"
+msgstr "Datum"
+
+msgid "Please select a friend to view the chat history."
+msgstr ""
+
+msgid "Nothing found for: %s"
+msgstr ""
+
+msgid "A short message?"
+msgstr "Een kort bericht?"
+
+msgid "How are you?"
+msgstr "Hoe gaat het ermee?"
+
+msgid "What are you doing?"
+msgstr "Wat ben je aan het doen?"
+
+msgid "Join a chat"
+msgstr ""
+
+msgid "Status"
+msgstr ""
+
+msgid "Available"
+msgstr "Beschikbaar"
+
+msgid "Talkative"
+msgstr "Spraakzaam"
+
+msgid "Away"
+msgstr "Weg"
+
+msgid "Not available"
+msgstr "Niet beschikbaar"
+
+msgid "Busy"
+msgstr "Bezig"
+
+msgid "Mood"
+msgstr ""
+
+msgid "None"
+msgstr "Geen"
+
+msgid "Crazy"
+msgstr "Gek"
+
+msgid "Excited"
+msgstr "Opgewonden"
+
+msgid "Playful"
+msgstr "Speels"
+
+msgid "Happy"
+msgstr "Vrolijk"
+
+msgid "Shocked"
+msgstr "Geschokt"
+
+msgid "Hot"
+msgstr "Vurig"
+
+msgid "Sad"
+msgstr "Triest"
+
+msgid "Amorous"
+msgstr "Verliefd"
+
+msgid "Confident"
+msgstr "Zelfverzekerd"
+
+msgid "Activity"
+msgstr ""
+
+msgid "Chores"
+msgstr ""
+
+msgid "Drinking"
+msgstr "Drinken"
+
+msgid "Eating"
+msgstr "Eten"
+
+msgid "Exercising"
+msgstr ""
+
+msgid "Grooming"
+msgstr ""
+
+msgid "Appointment"
+msgstr "Afspraak"
+
+msgid "Inactive"
+msgstr "Inactief"
+
+msgid "Relaxing"
+msgstr "Uitrusten"
+
+msgid "Talking"
+msgstr "Praten"
+
+msgid "Traveling"
+msgstr "Reizen"
+
+msgid "Working"
+msgstr "Werken"
+
+msgid "View profile"
+msgstr ""
+
+msgid "Repeat this notice"
+msgstr "Herhaal deze melding"
+
+msgid "Remove this notice"
+msgstr "Verwijder deze melding"
+
+msgid "Your profile"
+msgstr ""
+
+msgid "Identity"
+msgstr "Identiteit"
+
+msgid "Profile image"
+msgstr ""
+
+msgid "Others"
+msgstr ""
+
+msgid "Personal"
+msgstr ""
+
+msgid "Complete name"
+msgstr "Volledige naam"
+
+msgid "Nickname"
+msgstr ""
+
+msgid "First name"
+msgstr ""
+
+msgid "Last name"
+msgstr ""
+
+msgid "Date of birth"
+msgstr ""
+
+msgid "Contact"
+msgstr "Contact"
+
+msgid "E-mail"
+msgstr "E-mail"
+
+msgid "Phone"
+msgstr ""
+
+msgid "Website"
+msgstr "Website"
+
+msgid "Current"
+msgstr ""
+
+msgid "Delete"
+msgstr "Verwijder"
+
+msgid "What a pity! You have no profile image defined in your identity card!"
+msgstr ""
+
+msgid "Address"
+msgstr ""
+
+msgid "Street"
+msgstr "Straat"
+
+msgid "City"
+msgstr "Stad"
+
+msgid "Postal code"
+msgstr "Postcode"
+
+msgid "Country"
+msgstr "Land"
+
+msgid "Biography"
+msgstr "Biografie"
+
+msgid "Important notice"
+msgstr "Belangrijke mededeling"
+
+msgid "Be careful of the information you write into your profile, because it could be accessed by everyone (even someone you don't want to)."
+msgstr ""
+
+msgid "Not everything is private on XMPP; this is one of those things, your public profile (vCard)."
+msgstr ""
+
+msgid "It is strongly recommended to upload a profile image (%s maximum), like a picture of yourself, because that makes you easily recognizable by your friends."
+msgstr ""
+
+msgid "Save"
+msgstr "Opslaan"
+
+msgid "Cancel"
+msgstr "Annuleren"
+
+msgid "Edit options"
+msgstr ""
+
+msgid "Channel"
+msgstr ""
+
+msgid "Commands"
+msgstr ""
+
+msgid "Sounds"
+msgstr "Geluiden"
+
+msgid "Privacy"
+msgstr "Privacy"
+
+msgid "Message archiving"
+msgstr "Bericht archivering"
+
+msgid "Store a history of your chats"
+msgstr ""
+
+msgid "Geolocation"
+msgstr "Geolocatie"
+
+msgid "Empty"
+msgstr "Leeg"
+
+msgid "Empty channel"
+msgstr ""
+
+msgid "Persistent"
+msgstr "Blijvend"
+
+msgid "Maximum notices"
+msgstr "Maximale meldingen"
+
+msgid "Account"
+msgstr ""
+
+msgid "Change password"
+msgstr ""
+
+msgid "Delete account"
+msgstr ""
+
+msgid "Old"
+msgstr "Oud"
+
+msgid "New (2 times)"
+msgstr "Nieuw (2 keer)"
+
+msgid "Continue"
+msgstr ""
+
+msgid "To"
+msgstr "Naar"
+
+msgid "Close"
+msgstr "Sluiten"
+
+msgid "unknown"
+msgstr "onbekend"
+
+msgid "Unavailable"
+msgstr "Niet beschikbaar"
+
+msgid "is now"
+msgstr ""
+
+msgid "Please wait while your avatar is uploaded..."
+msgstr ""
+
+msgid "Here it is! A new beautiful profile image!"
+msgstr ""
+
+msgid "The image file is not supported or has a bad size."
+msgstr ""
+
+msgid "Reply"
+msgstr "Antwoord"
+
+msgid "Error"
+msgstr "Fout"
+
+msgid "Click here to solve the error"
+msgstr ""
+
+msgid "You"
+msgstr ""
+
+msgid "Remove"
+msgstr "Verwijder"
+
+msgid "Rename"
+msgstr "Hernoem"
+
+msgid "Hi, I am %s, I would like to add you as my friend."
+msgstr ""
+
+msgid "Smiley insertion"
+msgstr "Emoticon invoegen"
+
+msgid "Change style"
+msgstr ""
+
+msgid "Text in bold"
+msgstr "Tekst vetgedrukt"
+
+msgid "Text in italic"
+msgstr "Tekst schuin"
+
+msgid "Underlined text"
+msgstr "Tekst onderstreept"
+
+msgid "Save chat"
+msgstr ""
+
+msgid "Click on the following link to get the chat log, and wait. Then click again to get the file."
+msgstr ""
+
+msgid "This chat is empty!"
+msgstr ""
+
+msgid "Generate file!"
+msgstr ""
+
+msgid "Download file!"
+msgstr ""
+
+msgid "Clean current chat"
+msgstr ""
+
+msgid "View chat history"
+msgstr ""
+
+msgid "Show user profile"
+msgstr ""
+
+msgid "Add this contact to your friends"
+msgstr ""
+
+msgid "Add this groupchat to your favorites"
+msgstr ""
+
+msgid "All tabs"
+msgstr ""
+
+msgid "Close this tab"
+msgstr ""
+
+msgid "no subject defined for this room."
+msgstr "Deze kamer heeft geen onderwerp"
+
+msgid "Administration panel for this room"
+msgstr ""
+
+msgid "Moderators"
+msgstr ""
+
+msgid "Participants"
+msgstr "Deelnemers"
+
+msgid "Visitors"
+msgstr "Bezoekers"
+
+msgid "Manage favorite rooms"
+msgstr ""
+
+msgid "Change favorites"
+msgstr ""
+
+msgid "Search a room"
+msgstr "Zoek een kamer"
+
+msgid "Select a favorite"
+msgstr ""
+
+msgid "Getting the name..."
+msgstr ""
+
+msgid "Gateway"
+msgstr ""
+
+msgid "Name"
+msgstr "Naam"
+
+msgid "Room"
+msgstr "Kamer"
+
+msgid "Add"
+msgstr "Voeg toe"
+
+msgid "Edit"
+msgstr "Wijzig"
+
+msgid "Search a room on"
+msgstr ""
+
+msgid "No room found on this server."
+msgstr "Geen kamer gevonden op deze server"
+
+msgid "Service discovery"
+msgstr ""
+
+msgid "Server to query"
+msgstr ""
+
+msgid "Sorry, but the entity didn't return any result!"
+msgstr ""
+
+msgid "Accounts"
+msgstr ""
+
+msgid "Authentications"
+msgstr ""
+
+msgid "Automation"
+msgstr ""
+
+msgid "Clients"
+msgstr ""
+
+msgid "Collaboration"
+msgstr "Samenwerking"
+
+msgid "Components"
+msgstr ""
+
+msgid "Rooms"
+msgstr "Kamers"
+
+msgid "Directories"
+msgstr ""
+
+msgid "Gateways"
+msgstr ""
+
+msgid "News"
+msgstr "Nieuws"
+
+msgid "Hierarchy"
+msgstr "Hiërarchie"
+
+msgid "Proxies"
+msgstr ""
+
+msgid "Publication/Subscription"
+msgstr ""
+
+msgid "Storage"
+msgstr "Opslag"
+
+msgid "Service offline or broken"
+msgstr ""
+
+msgid "Your inbox"
+msgstr ""
+
+msgid "Available actions"
+msgstr "Beschikabre acties"
+
+msgid "Clean"
+msgstr ""
+
+msgid "New"
+msgstr "Nieuw"
+
+msgid "Received"
+msgstr "Ontvangen"
+
+msgid "Subject"
+msgstr "Onderwerp"
+
+msgid "Content"
+msgstr "Inhoud"
+
+msgid "Send message"
+msgstr ""
+
+msgid "Your inbox is empty."
+msgstr ""
+
+msgid "MUC administration"
+msgstr "MUC beheer"
+
+msgid "You administrate this room"
+msgstr ""
+
+msgid "Enter new subject"
+msgstr ""
+
+msgid "Configuration"
+msgstr "Configuratie"
+
+msgid "Authorizations"
+msgstr ""
+
+msgid "Member list"
+msgstr ""
+
+msgid "Owner list"
+msgstr ""
+
+msgid "Administrator list"
+msgstr ""
+
+msgid "Outcast list"
+msgstr ""
+
+msgid "Add an input"
+msgstr ""
+
+msgid "Destroy this MUC"
+msgstr "Verwijder deze MUC"
+
+msgid "Yes, let's do it!"
+msgstr "Ja, laten we het doen!"
+
+msgid "Your friend is paying attention to the conversation."
+msgstr ""
+
+msgid "Your friend is writing a message..."
+msgstr "Je vriend schrijft een bericht..."
+
+msgid "Your friend stopped writing a message."
+msgstr "Je vriend is gestopt met het schrijven van een bericht."
+
+msgid "Your friend is doing something else."
+msgstr "Je vriend is wat anders aan het doen."
+
+msgid "Your friend closed the chat."
+msgstr ""
+
+msgid "Requesting this service..."
+msgstr ""
+
+msgid "Loading"
+msgstr "Laden"
+
+msgid "joined the chat room"
+msgstr ""
+
+msgid "left the chat room"
+msgstr ""
+
+msgid "no status"
+msgstr ""
+
+msgid "has been kicked"
+msgstr ""
+
+msgid "has been banned"
+msgstr ""
+
+msgid "no reason"
+msgstr ""
+
+msgid "Communicate with the entire world!"
+msgstr ""
+
+msgid "It allows you to get in touch with the millions of users who currently use the XMPP network like you do with Jappix. Join the community and stay free!"
+msgstr ""
+
+msgid "Hi there!"
+msgstr "Hallo!"
+
+msgid "Welcome on %1s, “%2s”."
+msgstr ""
+
+msgid "Login to your existing XMPP account or create a new one for free!"
+msgstr ""
+
+msgid "Jappix is an open-source project from PostPro, a non-profit organization which provides us a great help."
+msgstr ""
+
+msgid "Login to your existing XMPP account. You can also use the %s to join a groupchat."
+msgstr ""
+
+msgid "Previous"
+msgstr "Vorige"
+
+msgid "General"
+msgstr "Algemeen"
+
+msgid "Advanced"
+msgstr "Geavanceerd"
+
+msgid "Resource"
+msgstr ""
+
+msgid "Priority"
+msgstr "Prioriteit"
+
+msgid "Low"
+msgstr "Laag"
+
+msgid "Medium"
+msgstr "Middelmatig"
+
+msgid "High"
+msgstr "Hoog"
+
+msgid "Enter the groupchat you want to join and the nick you want to have. You can also go back to the %s."
+msgstr ""
+
+msgid "login page"
+msgstr "Login pagina"
+
+msgid "Share this link with your friends:"
+msgstr "Deel deze link met je vrienden:"
+
+msgid "Register a new XMPP account to join your friends on your own social cloud. That's simple!"
+msgstr ""
+
+msgid "Required"
+msgstr "Verplicht"
+
+msgid "You have been registered, here is your XMPP address:"
+msgstr "Je bent geregistreerd, hier is je XMPP adres:"
+
+msgid "Manager"
+msgstr "Manager"
+
+msgid "Project"
+msgstr "Project"
+
+msgid "Encrypted"
+msgstr "Versleuteld"
+
+msgid "Unencrypted"
+msgstr ""
+
+msgid "Where are you?"
+msgstr "Waar ben je?"
+
+msgid "What's up with you?"
+msgstr "Hoe gaat het met je?"
+
+msgid "Fetching the social channel..."
+msgstr "Binnenhalen van het kanaal..."
+
+msgid "You are synchronized with your network."
+msgstr "Je bent gesynchroniseerd met het netwerk"
+
+msgid "Cannot send anything: you can only receive notices!"
+msgstr "Kan niets verzenden: je kunt alleen berichten ontvangen!"
+
+msgid "Media viewer"
+msgstr ""
+
+msgid "Browse"
+msgstr "Blader"
+
+msgid "Command"
+msgstr "Commando"
+
+msgid "Subscribe"
+msgstr "Inschrijven"
+
+msgid "Join"
+msgstr "Aanmelden"
+
+msgid "Automatic"
+msgstr "Automatisch"
+
+msgid "Search"
+msgstr "Zoek"
+
+msgid "No result!"
+msgstr "Geen resultaat!"
+
+msgid "No notifications."
+msgstr "Geen meldingen"
+
+msgid "would like to add you as a friend."
+msgstr "zou je graag als vriend toevoegen."
+
+msgid "would like you to join this chatroom:"
+msgstr "wil naar je chatroom komen."
+
+msgid "Do you accept?"
+msgstr "Ben je het ermee eens?"
+
+msgid "Yes"
+msgstr "Ja"
+
+msgid "No"
+msgstr "Nee"
+
+msgid "would like to get authorization."
+msgstr "wil geauthoriseerd worden."
+
+msgid "Do you want to see the friends %s suggests you?"
+msgstr ""
+
+msgid "Submit"
+msgstr "Verzend"
+
+msgid "Client"
+msgstr "Client"
+
+msgid "System"
+msgstr "Systeem"
+
+msgid "Local time"
+msgstr "Lokale tijd"
+
+msgid "Comments"
+msgstr "Commentaar"
+
+msgid "User profile"
+msgstr "Gebruikers profiel"
+
+msgid "See his/her position on the globe"
+msgstr "Bekijk zijn/haar positie op de wereld"
+
+msgid "Confirm"
+msgstr "Bevestig"
+
+msgid "anonymous mode"
+msgstr "anonieme modus"
+
+msgid "Groups"
+msgstr "Groepen"
+
+msgid "Unclassified"
+msgstr "Ongeklassificeerd"
+
+msgid "Authorize"
+msgstr "Autoriseer"
+
+msgid "Ask for authorization"
+msgstr "Vraag om een authorisatie"
+
+msgid "Unblock"
+msgstr ""
+
+msgid "Prohibit"
+msgstr "Toegestaan"
+
+msgid "Block"
+msgstr "Blokkeren"
+
+msgid "Chat"
+msgstr "Gesprek"
+
+msgid "Groupchat"
+msgstr "Groepsgesprek"
+
+msgid "Jappix Mobile"
+msgstr "Jappix Mobiel"
+
+msgid "Desktop"
+msgstr "Desktop"
+
+msgid "Mobile"
+msgstr "Mobiel"
+
+msgid "Please wait..."
+msgstr "Even geduld aub ..."
+
+msgid "Please enable JavaScript"
+msgstr "Activeer Javascript"
+
+msgid "Your channel"
+msgstr "Jouw kanaal"
+
+msgid "Channel of"
+msgstr "Kanaal van"
+
+msgid "More notices..."
+msgstr "Meer mededelingen..."
+
+msgid "Attach a file"
+msgstr "Toevoegen van bestand"
+
+msgid "Send"
+msgstr "Verzenden"
+
+msgid "Unattach the file"
+msgstr ""
+
+msgid "An error occured while uploading your file: maybe it is too big (%s maximum) or forbidden!"
+msgstr ""
+
+msgid "Authorization failed"
+msgstr ""
+
+msgid "Registration failed, please choose a different username"
+msgstr ""
+
+msgid "Service unavailable"
+msgstr ""
+
+msgid "Internal server error, try later"
+msgstr "Interne server fout, probeer het later"
+
+msgid "Your form has been sent."
+msgstr ""
+
+msgid "Application"
+msgstr "Applicatie"
+
+msgid "XMPP links"
+msgstr "XMPP links"
+
+msgid "Open XMPP links with Jappix"
+msgstr "Open XMPP links met Jappix"
+
+msgid "changed the subject to:"
+msgstr ""
+
+msgid "Welcome!"
+msgstr "Welkom!"
+
+msgid "Friends"
+msgstr "Vrienden"
+
+msgid "Welcome on Jappix, your own social cloud!"
+msgstr ""
+
+msgid "Before you start using it, you will have to change some settings, search for friends and complete your profile."
+msgstr ""
+
+msgid "Enable notification sounds"
+msgstr ""
+
+msgid "Share your position on the globe"
+msgstr ""
+
+msgid "Offline friends"
+msgstr ""
+
+msgid "Don't hide offline friends"
+msgstr ""
+
+msgid "Use this tool to find your friends on the server you are using right now, or add them later."
+msgstr ""
+
+msgid "Great work! Now, you can share Jappix with your friends!"
+msgstr ""
+
+msgid "When you will press the save button, the profile editor will be opened. Happy socializing!"
+msgstr ""
+
+msgid "Share Jappix on %s"
+msgstr ""
+
+msgid "Using Jappix, an open social platform. I am %s!"
+msgstr ""
+
+msgid "Unknown name"
+msgstr "Onbekende naam"
+
+msgid "Unknown country"
+msgstr "Onbekend land"
+
+msgid "Click to enable"
+msgstr ""
+
+msgid "Click to disable"
+msgstr ""
+
+msgid "Installation"
+msgstr ""
+
+msgid "Jappix installation"
+msgstr ""
+
+msgid "Welcome to the Jappix installation!"
+msgstr ""
+
+msgid "This tool will help you fastly install Jappix, the first full-featured XMPP-based social platform, on your server. You don't even need any technical knowledge."
+msgstr ""
+
+msgid "Let's have a look at the installation steps:"
+msgstr ""
+
+msgid "Welcome"
+msgstr ""
+
+msgid "Storage configuration"
+msgstr ""
+
+msgid "Administrator account"
+msgstr ""
+
+msgid "Main configuration"
+msgstr ""
+
+msgid "Hosts configuration"
+msgstr ""
+
+msgid "Services installation"
+msgstr ""
+
+msgid "If the current language does not match yours (%1s), you can make Jappix speak %2s it will be saved."
+msgstr ""
+
+msgid "If you want to get some help about the Jappix installation and configuration, you can use our whole documentation, available at:"
+msgstr ""
+
+msgid "It's time to build your own social cloud: just go to the next step!"
+msgstr ""
+
+msgid "Jappix stores persistent data (such as shared files, chat logs, your own music and its configuration) into a single secured storage folder."
+msgstr ""
+
+msgid "Jappix must be able to write in this folder to create its sub-directories. If not, you must set the rights to %1s or change the folder owner to %2s (depending of your configuration)."
+msgstr ""
+
+msgid "The folder is writable, you can continue!"
+msgstr ""
+
+msgid "Jappix offers you the possibility to manage your configuration, install new addons or search for updates. That's why you must create an administrator account to access the manager."
+msgstr ""
+
+msgid "When Jappix will be installed, just click on the manager link on the home page to access it."
+msgstr ""
+
+msgid "Oops, you missed something or the two passwords do not match!"
+msgstr ""
+
+msgid "Jappix needs that you specify some values to work. Please correct the following inputs (or keep the default values, which are sufficient for most people)."
+msgstr ""
+
+msgid "Note that if you don't specify a value which is compulsory, it will be automatically completed with the default one."
+msgstr ""
+
+msgid "User"
+msgstr ""
+
+msgid "Service"
+msgstr ""
+
+msgid "Service name"
+msgstr ""
+
+msgid "Service description"
+msgstr ""
+
+msgid "Connection"
+msgstr ""
+
+msgid "Lock the host"
+msgstr ""
+
+msgid "Anonymous mode"
+msgstr ""
+
+msgid "Registration allowed"
+msgstr ""
+
+msgid "Use a proxy"
+msgstr ""
+
+msgid "Encryption"
+msgstr ""
+
+msgid "HTTPS storage"
+msgstr ""
+
+msgid "Force HTTPS"
+msgstr ""
+
+msgid "Compression"
+msgstr ""
+
+msgid "This page helps you specify the default hosts Jappix will connect to. You can leave it as it is and continue if you want to use the official service hosts."
+msgstr ""
+
+msgid "Maybe you don't know what a BOSH server is? In fact, this is a relay between a Jappix client and a XMPP server, which is necessary because of technical limitations."
+msgstr ""
+
+msgid "Main host"
+msgstr ""
+
+msgid "Groupchat host"
+msgstr ""
+
+msgid "Anonymous host"
+msgstr ""
+
+msgid "Directory host"
+msgstr ""
+
+msgid "BOSH host"
+msgstr ""
+
+msgid "You can install some extra softwares on your server, to extend your Jappix features. Some others might be modified, because of security restrictions which are set by default."
+msgstr ""
+
+msgid "To perform this, you must be able to access your server's shell and be logged in as root. Remember this is facultative, Jappix will work without these modules, but some of its features will be unavailable."
+msgstr ""
+
+msgid "After you finished the setup, Jappix will generate the cache files. It might be slow, just wait until the application is displayed and do not press any button."
+msgstr ""
+
+msgid "Thanks for using Jappix!"
+msgstr ""
+
+msgid "Next"
+msgstr ""
+
+msgid "Finish"
+msgstr ""
+
+msgid "Check again"
+msgstr ""
+
+msgid "The folder is not writable, set the right permissions to the %s directory."
+msgstr ""
+
+msgid "%s is installed on your system."
+msgstr ""
+
+msgid "%1s is not installed on your system, you should install %2s."
+msgstr ""
+
+msgid "PHP maximum upload size is sufficient (%s)."
+msgstr ""
+
+msgid "PHP maximum upload size is not sufficient (%1s), you should define it to %2s in %3s."
+msgstr ""
+
+msgid "Jappix manager"
+msgstr ""
+
+msgid "Manager access"
+msgstr ""
+
+msgid "Statistics"
+msgstr ""
+
+msgid "Hosts"
+msgstr ""
+
+msgid "Design"
+msgstr ""
+
+msgid "Repeat"
+msgstr ""
+
+msgid "All"
+msgstr ""
+
+msgid "Horizontal"
+msgstr ""
+
+msgid "Vertical"
+msgstr ""
+
+msgid "Center"
+msgstr ""
+
+msgid "Left"
+msgstr ""
+
+msgid "Right"
+msgstr ""
+
+msgid "Top"
+msgstr ""
+
+msgid "Bottom"
+msgstr ""
+
+msgid "Adapt"
+msgstr ""
+
+msgid "Color"
+msgstr ""
+
+msgid "Users"
+msgstr ""
+
+msgid "Updates"
+msgstr ""
+
+msgid "This is a restricted area: only the authorized users can manage this Jappix node."
+msgstr ""
+
+msgid "Please use the form below to login to the administration panel."
+msgstr ""
+
+msgid "To improve security, sessions are limited in time and when your browser will be closed, you will be logged out."
+msgstr ""
+
+msgid "Credentials"
+msgstr ""
+
+msgid "You have been logged out. Goodbye!"
+msgstr ""
+
+msgid "Oops, you could not be recognized as a valid administrator. Check your credentials!"
+msgstr ""
+
+msgid "Basic statistics are processed by Jappix about some important things, you can find them below."
+msgstr ""
+
+msgid "Change your Jappix node configuration with this tool."
+msgstr ""
+
+msgid "Change the XMPP hosts that this Jappix node serve with this tool."
+msgstr ""
+
+msgid "All this Jappix node stored files can be managed with this tool: please select a sub-folder and start editing its content!"
+msgstr ""
+
+msgid "Jappix is fully customisable: you can change its design right here."
+msgstr ""
+
+msgid "This is not a valid image, please use PNG, GIF or JPG!"
+msgstr ""
+
+msgid "The image could not be received, would you mind retry?"
+msgstr ""
+
+msgid "Your image was added to the list!"
+msgstr ""
+
+msgid "Changes saved!"
+msgstr ""
+
+msgid "You can define more than one administrator for this Jappix node. You can also change a password with this tool."
+msgstr ""
+
+msgid "Update your Jappix node with this tool, or check if a new one is available. Informations about the latest version are also displayed (in english)."
+msgstr ""
+
+msgid "Access statistics"
+msgstr ""
+
+msgid "Share statistics"
+msgstr ""
+
+msgid "Other statistics"
+msgstr ""
+
+msgid "January"
+msgstr ""
+
+msgid "February"
+msgstr ""
+
+msgid "March"
+msgstr ""
+
+msgid "April"
+msgstr ""
+
+msgid "May"
+msgstr ""
+
+msgid "June"
+msgstr ""
+
+msgid "July"
+msgstr ""
+
+msgid "August"
+msgstr ""
+
+msgid "September"
+msgstr ""
+
+msgid "October"
+msgstr ""
+
+msgid "November"
+msgstr ""
+
+msgid "December"
+msgstr ""
+
+msgid "Monday"
+msgstr ""
+
+msgid "Tuesday"
+msgstr ""
+
+msgid "Wednesday"
+msgstr ""
+
+msgid "Thursday"
+msgstr ""
+
+msgid "Friday"
+msgstr ""
+
+msgid "Saturday"
+msgstr ""
+
+msgid "Sunday"
+msgstr ""
+
+msgid "Total"
+msgstr ""
+
+msgid "Cache"
+msgstr ""
+
+msgid "Logs"
+msgstr ""
+
+msgid "Music"
+msgstr ""
+
+msgid "Backgrounds"
+msgstr ""
+
+msgid "Share"
+msgstr ""
+
+msgid "Background"
+msgstr ""
+
+msgid "Notice"
+msgstr ""
+
+msgid "Your design preferences have been saved!"
+msgstr ""
+
+msgid "Please check your inputs: something is missing!"
+msgstr ""
+
+msgid "Change your Jappix node background with this tool. You can either set a custom color or an uploaded image. Let your creativity flow!"
+msgstr ""
+
+msgid "Use default background"
+msgstr ""
+
+msgid "Use your own image"
+msgstr ""
+
+msgid "Select a background to use and change the display options."
+msgstr ""
+
+msgid "Use your own color"
+msgstr ""
+
+msgid "Type the hexadecimal color value you want to use as a background."
+msgstr ""
+
+msgid "Manage backgrounds"
+msgstr ""
+
+msgid "You can add a new background to the list with this tool. Please send a valid image."
+msgstr ""
+
+msgid "If you want to remove some backgrounds, use the browser below."
+msgstr ""
+
+msgid "Define a homepage notice for all your users, such as a warn, an important message or an advert with this tool."
+msgstr ""
+
+msgid "Simple notice"
+msgstr ""
+
+msgid "This notice only needs simple text to be displayed, but no code is allowed!"
+msgstr ""
+
+msgid "Advanced notice"
+msgstr ""
+
+msgid "You can customize your notice with embedded HTML, CSS and JavaScript, but you need to code the style."
+msgstr ""
+
+msgid "Available updates"
+msgstr ""
+
+msgid "What's new?"
+msgstr ""
+
+msgid "Your storage folders are not writable, please apply the good rights!"
+msgstr ""
+
+msgid "%1s may cause problems to the proxy, please increase %2s value up to %3s!"
+msgstr ""
+
+msgid "You are using a development version of Jappix. Update it through our repository by executing: %s."
+msgstr ""
+
+msgid "A new Jappix version is available! Check what is new and launch the update!"
+msgstr ""
+
+msgid "Your version is out to date. Update it now to %s by clicking here!"
+msgstr ""
+
+msgid "Your version seems to be up to date, but you can check updates manually by clicking here."
+msgstr ""
+
+msgid "Check for updates"
+msgstr ""
+
+msgid "Update in progress"
+msgstr ""
+
+msgid "Jappix has been updated: you are now running the latest version. Have fun!"
+msgstr ""
+
+msgid "The update has failed! Please try again later."
+msgstr ""
+
+msgid "Downloading package..."
+msgstr ""
+
+msgid "Removing current Jappix system files..."
+msgstr ""
+
+msgid "Extracting package..."
+msgstr ""
+
+msgid "Regenerating storage folder tree..."
+msgstr ""
+
+msgid "Jappix is now up to date!"
+msgstr ""
+
+msgid "Aborted: socket error!"
+msgstr ""
+
+msgid "Aborted: buffer error!"
+msgstr ""
+
+msgid "Aborted: everything is not writable!"
+msgstr ""
+
+msgid "Aborted: could not extract the package!"
+msgstr ""
+
+msgid "Visits"
+msgstr ""
+
+msgid "Daily"
+msgstr ""
+
+msgid "Weekly"
+msgstr ""
+
+msgid "Monthly"
+msgstr ""
+
+msgid "Yearly"
+msgstr ""
+
+msgid "Size"
+msgstr ""
+
+msgid "Clean everything"
+msgstr ""
+
+msgid "Purge cache"
+msgstr ""
+
+msgid "Purge logs"
+msgstr ""
+
+msgid "Purge updates"
+msgstr ""
+
+msgid "The storage folder you wanted to clean is now empty!"
+msgstr ""
+
+msgid "Keep your Jappix node fresh and fast, clean the storage folders regularly!"
+msgstr ""
+
+msgid "Upload your music (Ogg Vorbis, MP3 or WAV) to be able to listen to it in Jappix!"
+msgstr ""
+
+msgid "The file you want to upload must be smaller than %s."
+msgstr ""
+
+msgid "Stay tuned in what your users store on your server and remove undesired content with this tool."
+msgstr ""
+
+msgid "Title"
+msgstr ""
+
+msgid "Artist"
+msgstr ""
+
+msgid "Album"
+msgstr ""
+
+msgid "File"
+msgstr ""
+
+msgid "Upload"
+msgstr ""
+
+msgid "The folder is empty."
+msgstr ""
+
+msgid "The music could not be received, please retry!"
+msgstr ""
+
+msgid "This is not a valid music file, please encode in Ogg Vorbis, MP3 or WAV!"
+msgstr ""
+
+msgid "Your music has been added!"
+msgstr ""
+
+msgid "The selected elements have been removed."
+msgstr ""
+
+msgid "You must select elements to remove!"
+msgstr ""
+
+msgid "Add a new user with this tool, or change a password (type an existing username). Please submit a strong password!"
+msgstr ""
+
+msgid "Manage"
+msgstr ""
+
+msgid "List"
+msgstr ""
+
+msgid "Remove users with this tool. Note that you cannot remove an user if he is the only one remaining."
+msgstr ""
+
+msgid "The user has been added!"
+msgstr ""
+
+msgid "The chosen users have been removed."
+msgstr ""
+
+msgid "You must select one or more users to be removed!"
+msgstr ""
+
+msgid "Yesterday"
+msgstr ""
+
+msgid "%s days ago"
+msgstr ""
+
+msgid "User currently active"
+msgstr ""
+
+msgid "Last seen: %s"
+msgstr ""
+
+msgid "Inactive since: %s"
+msgstr ""
+
+msgid "Your friend seems not to have received your message(s)!"
+msgstr ""
+
+msgid "Static content server"
+msgstr ""
+
+msgid "This is the static content server for %1s, “%2s”."
+msgstr ""
+
+msgid "Suggested friends"
+msgstr ""
+
+msgid "Check all"
+msgstr ""
+
+msgid "Uncheck all"
+msgstr ""
+
+msgid "Choose"
+msgstr ""
+
+msgid "List name"
+msgstr ""
+
+msgid "Allow"
+msgstr ""
+
+msgid "Deny"
+msgstr ""
+
+msgid "Group"
+msgstr ""
+
+msgid "Subscription"
+msgstr ""
+
+msgid "Both"
+msgstr ""
+
+msgid "From"
+msgstr ""
+
+msgid "Everybody"
+msgstr ""
+
+msgid "Send messages"
+msgstr ""
+
+msgid "Send queries"
+msgstr ""
+
+msgid "See my status"
+msgstr ""
+
+msgid "Send his/her status"
+msgstr ""
+
+msgid "Everything"
+msgstr ""
+
+msgid "Item"
+msgstr ""
+
+msgid "Order"
+msgstr ""
+
+msgid "Active for this session"
+msgstr ""
+
+msgid "Always active"
+msgstr ""
+
+msgid "User directory"
+msgstr ""
+
+msgid "Search a friend"
+msgstr ""
+
+msgid "The feature requested is not implemented by the recipient or server and therefore cannot be processed."
+msgstr ""
+
+msgid "This is a repeat from %s"
+msgstr ""
+
+msgid "Loading comments..."
+msgstr ""
+
+msgid "Type your comment here..."
+msgstr ""
+
+msgid "Could not get the comments!"
+msgstr ""
+
+msgid "Show comments"
+msgstr ""
+
+msgid "Send him/her a message"
+msgstr ""
+
+msgid "Start a chat with him/her"
+msgstr ""
+
+msgid "Media integration"
+msgstr ""
+
+msgid "Comments locked!"
+msgstr ""
+
+msgid "Type something you want to share with your friends..."
+msgstr ""
+
+msgid "changed his/her nickname to %s"
+msgstr ""
+
+msgid "commented an item you follow: “%s”."
+msgstr ""
+
+msgid "Hide"
+msgstr ""
+
+msgid "liked your post: “%s”."
+msgstr ""
+
+msgid "quoted you somewhere: “%s”."
+msgstr ""
+
+msgid "published on your wall: “%s”."
+msgstr ""
+
+msgid "tagged you in a photo (%s)."
+msgstr ""
+
+msgid "tagged you in a video (%s)."
+msgstr ""
+
+msgid "Show"
+msgstr ""
+
+msgid "Need help? You'd better read our documentation page about how to fill this form!"
+msgstr ""
+
+msgid "Pubsub host"
+msgstr ""
+
+msgid "Jappix is a great social platform, that you can access wherever you are, whenever you want and communicate with whovever you want."
+msgstr ""
+
+msgid "Manager link"
+msgstr ""
+
+msgid "User uploads server"
+msgstr ""
+
+msgid "This is the user uploads server for %1s, “%2s”."
+msgstr ""
+
+msgid "Logo"
+msgstr ""
+
+msgid "You can set your own service logo to replace the default one. Take care of the size and the main color of each logo!"
+msgstr ""
+
+msgid "Upload each logo with the recommended maximum pixel size."
+msgstr ""
+
+msgid "This is not a valid image, please use the PNG format!"
+msgstr ""
+
+msgid "Your service logo has been successfully changed!"
+msgstr ""
+
+msgid "Your logo format must be PNG. Leave a field empty and the logo will not be changed."
+msgstr ""
+
+msgid "Remove this logo"
+msgstr ""
+
+msgid "View this logo"
+msgstr ""
+
+msgid "Send a file"
+msgstr ""
+
+msgid "Once uploaded, your friend will be prompted to download the file you sent."
+msgstr ""
+
+msgid "Groupchats to join"
+msgstr ""
+
+msgid "Purge sent files"
+msgstr ""
+
+msgid "would like to send you a file: “%s”."
+msgstr ""
+
+msgid "has accepted to received your file: “%s”."
+msgstr ""
+
+msgid "has rejected to receive your file: “%s”."
+msgstr ""
+
+msgid "could not receive your file: “%s”."
+msgstr ""
+
+msgid "has received a file exchange request: “%s”."
+msgstr ""
+
+msgid "Available shortcuts:"
+msgstr ""
+
+msgid "%s removes the chat logs"
+msgstr ""
+
+msgid "%s joins a groupchat"
+msgstr ""
+
+msgid "%s closes the chat"
+msgstr ""
+
+msgid "%s shows the user profile"
+msgstr ""
+
+msgid "%s sends a message to the room"
+msgstr ""
+
+msgid "%s changes your nickname"
+msgstr ""
+
+msgid "%s sends a message to someone in the room"
+msgstr ""
+
+msgid "%s changes the room topic"
+msgstr ""
+
+msgid "%s kicks an user of the room"
+msgstr ""
+
+msgid "%s bans an user of the room"
+msgstr ""
+
+msgid "%s invites someone to join the room"
+msgstr ""
+
+msgid "Social channel, chat and more."
+msgstr ""
+
+msgid "Create your public profile."
+msgstr ""
+
+msgid "A mini-chat for your website."
+msgstr ""
+
+msgid "Get Jappix, get support."
+msgstr ""
+
+msgid "Statistics around Jappix."
+msgstr ""
+
+msgid "Download Jappix for free."
+msgstr ""
+
+msgid "Find a public Jappix node."
+msgstr ""
+
+msgid "Public profile"
+msgstr ""
+
+msgid "Your profile anywhere on the Web."
+msgstr ""
+
+msgid "%s is a Jappix.com service which makes your XMPP profile public. It is easier to share it. No XMPP account is required to view your social channel, your current position and your contact details."
+msgstr ""
+
+msgid "Furthermore, every picture you post in your social channel is added to a beautiful picture timeline. You can now view the pictures you shared year by year."
+msgstr ""
+
+msgid "You can also use your XMPP avatar as a single avatar for every website, blog and forum you use. When you change it on XMPP, the new avatar appears everywhere. What a genious improvement!"
+msgstr ""
+
+msgid "Yay, let's create my public profile!"
+msgstr ""
+
+msgid "Enable my public profile"
+msgstr ""
+
+#~ msgid "Jappix is a non-profit social platform, that you can access wherever you are, whenever you want and communicate with whovever you want."
+#~ msgstr ""
+
+#~ msgid "See"
+#~ msgstr ""
+
+#~ msgid "Use default logo"
+#~ msgstr ""
+
+#~ msgid "Use your own logo"
+#~ msgstr ""
+
+#~ msgid "The recommended image format is PNG. Leave a field empty and the logo will not be changed."
+#~ msgstr ""
diff --git a/jappixmini/jappix/lang/oc/LC_MESSAGES/main.mo b/jappixmini/jappix/lang/oc/LC_MESSAGES/main.mo
new file mode 100644
index 00000000..28501c40
Binary files /dev/null and b/jappixmini/jappix/lang/oc/LC_MESSAGES/main.mo differ
diff --git a/jappixmini/jappix/lang/oc/LC_MESSAGES/main.po b/jappixmini/jappix/lang/oc/LC_MESSAGES/main.po
new file mode 100644
index 00000000..f74d4361
--- /dev/null
+++ b/jappixmini/jappix/lang/oc/LC_MESSAGES/main.po
@@ -0,0 +1,1870 @@
+# Occitan translations for Jappix package.
+# This file is distributed under the same license as the Jappix package.
+# This file was translated from CodingTeam at <http://codingteam.net/>.
+msgid ""
+msgstr ""
+"Project-Id-Version: Jappix\n"
+"PO-Revision-Date: 2012-01-16 21:25+0100\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"POT-Creation-Date: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+
+msgid "JavaScript is missing in your web browser, so that you will not be able to launch Jappix! Please fix this."
+msgstr "JavaScript es pas dins vòstre navigator, podretz pas far foncionar Jappix ! Corregís aquò, si vos plai."
+
+msgid "An open social network"
+msgstr "Un malhum sociau dubert"
+
+msgid "Jappix has been interrupted by a network issue, a bug or bad login (check that you entered the right credentials), sorry for the inconvenience."
+msgstr "Jappix es estat arrestat per un problema de malhum, un bug o de meschants identificants (de verificar). Fasetz-nos excusa. "
+
+msgid "The element list on this server could not be obtained!"
+msgstr "La lista daus elements presents sus queu servidor es pas estada obtenguda !"
+
+msgid "Your password has been changed, now you can connect to your account with your new login data."
+msgstr "Vòstre senhau es estat chamnhat, aura vos podetz connectar a vòstre compte emb vòstres noveus identificants.   "
+
+msgid "Your XMPP account has been removed, bye!"
+msgstr "Vòstre compte XMPP es estat esfaçat, au reveire !"
+
+msgid "You have been logged out of your XMPP account, have a nice day!"
+msgstr "Setz estat desconnetat de vòstre compte XMPP, bona jornada !"
+
+msgid "The room you joined seems not to exist. You should create it!"
+msgstr "Lo charrador qu'avetz jongut existís pas. Zo podetz crear !"
+
+msgid "The groupchat has been removed, now someone else will be able to recreate it."
+msgstr "Lo charrador es estat esfaçat, aura quauqu'un mai zo podrà tornar crear."
+
+msgid "The user that you want to reach is not present in the room."
+msgstr "L'utilizaire que voletz júnher es pas present dins lo charrador. "
+
+msgid "Please enter the group chat address to join."
+msgstr "Picatz l'adreça dau charrador de júnher, si vos plai."
+
+msgid "Please enter your nickname to join %s."
+msgstr "Picatz vòstre chafre per júnher %s."
+
+msgid "This room (%s) is protected with a password."
+msgstr "Lo charrador (%s) es protegit per un senhau."
+
+msgid "Your browser is out of date!"
+msgstr "Vòstre navigator es pas a jorn !"
+
+msgid "Last %s version is better!"
+msgstr "La darriera version de %s es melhor !"
+
+msgid "Login"
+msgstr "Dubrir una session"
+
+msgid "Register"
+msgstr "Se marcar"
+
+msgid "Here we go!"
+msgstr "Anem, òc !"
+
+msgid "Server"
+msgstr "Servidor"
+
+msgid "Password"
+msgstr "Senhau"
+
+msgid "Remember me"
+msgstr "Se sovenir de me"
+
+msgid "This tool has been disabled, you cannot use it!"
+msgstr "Queu gatge es estat desactivat, lo podetz pas utilizar !"
+
+msgid "Due to a network issue, you were disconnected. What do you want to do now?"
+msgstr "Per causa d'un problema de malhum, setz estat desconnectat. Que voletz far aura ?"
+
+msgid "Reconnect"
+msgstr "Tornar connectar"
+
+msgid "Messages"
+msgstr "Messatges"
+
+msgid "Profile"
+msgstr "Perfil"
+
+msgid "Options"
+msgstr "Preferéncias"
+
+msgid "Disconnect"
+msgstr "Barrar la session"
+
+msgid "Filter"
+msgstr "Filtrar"
+
+msgid "Add a friend"
+msgstr "Apondre un amic"
+
+msgid "Your groupchats"
+msgstr "Vòstres charradors"
+
+msgid "Manage your favorite groupchats"
+msgstr "Gerir vòstres charradors preferits"
+
+msgid "More stuff"
+msgstr "Mai de chausas"
+
+msgid "Show all friends"
+msgstr "Mostrar tots los amics"
+
+msgid "Only show connected friends"
+msgstr "Mostrar nonmàs los amics en linha"
+
+msgid "Message archives"
+msgstr "Archius de messatges"
+
+msgid "Date"
+msgstr "Data"
+
+msgid "Please select a friend to view the chat history."
+msgstr "Si vos plai, seleccionatz un amic per veire l'istoric de la charrada."
+
+msgid "Nothing found for: %s"
+msgstr "Se trobet pas ren per : %s"
+
+msgid "A short message?"
+msgstr "Un pitit messatge ?"
+
+msgid "How are you?"
+msgstr "Coma quò vai ?"
+
+msgid "What are you doing?"
+msgstr "Que fasetz ?"
+
+msgid "Join a chat"
+msgstr "Júnher una charrada"
+
+msgid "Status"
+msgstr "Estat"
+
+msgid "Available"
+msgstr "Disponible/a"
+
+msgid "Talkative"
+msgstr "Platussaire/a"
+
+msgid "Away"
+msgstr "Absent(a)"
+
+msgid "Not available"
+msgstr "Pas disponible"
+
+msgid "Busy"
+msgstr "Ocupat"
+
+msgid "Mood"
+msgstr "Umor"
+
+msgid "None"
+msgstr "Pas ren"
+
+msgid "Crazy"
+msgstr "Franc fadard(a)"
+
+msgid "Excited"
+msgstr "Excitat/ada"
+
+msgid "Playful"
+msgstr "Joiós/osa"
+
+msgid "Happy"
+msgstr "Aürós/osa"
+
+msgid "Shocked"
+msgstr "Impressionat/ada"
+
+msgid "Hot"
+msgstr "Chaud(a)"
+
+msgid "Sad"
+msgstr "Triste/a"
+
+msgid "Amorous"
+msgstr "Amorós/osa"
+
+msgid "Confident"
+msgstr "Fisançós/osa"
+
+msgid "Activity"
+msgstr "Activitat"
+
+msgid "Chores"
+msgstr "Corvadas"
+
+msgid "Drinking"
+msgstr "Beu"
+
+msgid "Eating"
+msgstr "Minja"
+
+msgid "Exercising"
+msgstr "Entraïnament"
+
+msgid "Grooming"
+msgstr "Se toaleta"
+
+msgid "Appointment"
+msgstr "Rendez-vos"
+
+msgid "Inactive"
+msgstr "Inactiu/iva"
+
+msgid "Relaxing"
+msgstr "Banturla"
+
+msgid "Talking"
+msgstr "Platussa"
+
+msgid "Traveling"
+msgstr "En viatge"
+
+msgid "Working"
+msgstr "Trabalha"
+
+msgid "View profile"
+msgstr "Veire lo perfil"
+
+msgid "Repeat this notice"
+msgstr "Repetir quel avís "
+
+msgid "Remove this notice"
+msgstr "Esfaçar quel avís "
+
+msgid "Your profile"
+msgstr "Vòstre perfil"
+
+msgid "Identity"
+msgstr "Identitat"
+
+msgid "Profile image"
+msgstr "Imatge de perfil"
+
+msgid "Others"
+msgstr "Autres"
+
+msgid "Personal"
+msgstr "Personau"
+
+msgid "Complete name"
+msgstr "Nom complet"
+
+msgid "Nickname"
+msgstr "Chafre"
+
+msgid "First name"
+msgstr "Pitit nom"
+
+msgid "Last name"
+msgstr "Nom"
+
+msgid "Date of birth"
+msgstr "Data de naissença"
+
+msgid "Contact"
+msgstr "Contacte"
+
+msgid "E-mail"
+msgstr "Adreça electronica"
+
+msgid "Phone"
+msgstr "Telefòn"
+
+msgid "Website"
+msgstr "Sit web"
+
+msgid "Current"
+msgstr "Actuau"
+
+msgid "Delete"
+msgstr "Suprimir"
+
+msgid "What a pity! You have no profile image defined in your identity card!"
+msgstr "De que ? Avetz pas d'imatge de perfil definida sus vòstra carta d'identitat !"
+
+msgid "Address"
+msgstr "Adreça"
+
+msgid "Street"
+msgstr "Rua"
+
+msgid "City"
+msgstr "Vila"
+
+msgid "Postal code"
+msgstr "Còdi postau"
+
+msgid "Country"
+msgstr "País"
+
+msgid "Biography"
+msgstr "Biografia"
+
+msgid "Important notice"
+msgstr "Important"
+
+msgid "Be careful of the information you write into your profile, because it could be accessed by everyone (even someone you don't want to)."
+msgstr "Siatz prudents emb las informacions qu'escrivetz sus vòstre perfil. Son accesiblas a tot lo monde quitament a los que voletz pas."
+
+msgid "Not everything is private on XMPP; this is one of those things, your public profile (vCard)."
+msgstr "Tot es pas privat sus XMPP, per exemple vòstre perfil (vCard)."
+
+msgid "It is strongly recommended to upload a profile image (%s maximum), like a picture of yourself, because that makes you easily recognizable by your friends."
+msgstr "Qu'es recomandat de charjar un imatge de perfil (%s maximum), coma una fòto de vosautres, per que vòstres amics vos pueschan conéisser."
+
+msgid "Save"
+msgstr "Sauvar"
+
+msgid "Cancel"
+msgstr ""
+
+msgid "Edit options"
+msgstr "Editar las opcions"
+
+msgid "Channel"
+msgstr "Canau"
+
+msgid "Commands"
+msgstr "Òrdres"
+
+msgid "Sounds"
+msgstr "Sons"
+
+msgid "Privacy"
+msgstr "Vita privada"
+
+msgid "Message archiving"
+msgstr "Archivatge daus messatges"
+
+msgid "Store a history of your chats"
+msgstr "Gardar un istoric de vòstras charradas"
+
+msgid "Geolocation"
+msgstr "Geolocalizacion"
+
+msgid "Empty"
+msgstr "Voidar"
+
+msgid "Empty channel"
+msgstr "Voidar lo canau"
+
+msgid "Persistent"
+msgstr "Persistent"
+
+msgid "Maximum notices"
+msgstr "Maximum d'avís"
+
+msgid "Account"
+msgstr "Compte"
+
+msgid "Change password"
+msgstr "Chamnhar de senhau"
+
+msgid "Delete account"
+msgstr "Suprimir lo compte"
+
+msgid "Old"
+msgstr "Ancian"
+
+msgid "New (2 times)"
+msgstr "Nuòu (2 còps)"
+
+msgid "Continue"
+msgstr "Contunhar"
+
+msgid "To"
+msgstr "A"
+
+msgid "Close"
+msgstr "Barrar"
+
+msgid "unknown"
+msgstr "inconegut/uda"
+
+msgid "Unavailable"
+msgstr "Desconnectat/ada"
+
+msgid "is now"
+msgstr "es aura"
+
+msgid "Please wait while your avatar is uploaded..."
+msgstr "Esperatz dau temps que vòstre avatar se charja..."
+
+msgid "Here it is! A new beautiful profile image!"
+msgstr "Veiquí ! Un brave imatge de perfil tot nuòu !"
+
+msgid "The image file is not supported or has a bad size."
+msgstr ""
+
+msgid "Reply"
+msgstr "Respondre"
+
+msgid "Error"
+msgstr "Error"
+
+msgid "Click here to solve the error"
+msgstr "Clicar aicí per corregir l'error"
+
+msgid "You"
+msgstr "Vosautres/as"
+
+msgid "Remove"
+msgstr ""
+
+msgid "Rename"
+msgstr "Renomenar "
+
+msgid "Hi, I am %s, I would like to add you as my friend."
+msgstr "Adiu ! Sei %s, vos voldriá apondre coma amic."
+
+msgid "Smiley insertion"
+msgstr "Insercion d'emoticòna"
+
+msgid "Change style"
+msgstr "Chamnhar l'aparéncia"
+
+msgid "Text in bold"
+msgstr "Texte en gras"
+
+msgid "Text in italic"
+msgstr "Texte en italic"
+
+msgid "Underlined text"
+msgstr "Texte joslinhat"
+
+msgid "Save chat"
+msgstr "Enregistrar la charrada"
+
+msgid "Click on the following link to get the chat log, and wait. Then click again to get the file."
+msgstr "Clicatz sus lo liam per aver l'istoric de la charrada. Puei tornatz clicar per lo recuperar."
+
+msgid "This chat is empty!"
+msgstr "Quela charrada es voida !"
+
+msgid "Generate file!"
+msgstr "Generar lo fichier !"
+
+msgid "Download file!"
+msgstr "Descharjar lo fichier !"
+
+msgid "Clean current chat"
+msgstr "Netiar la charrada "
+
+msgid "View chat history"
+msgstr "Veire l'istoric de la charrada"
+
+msgid "Show user profile"
+msgstr "Mostrar lo perfil de l'utilizaire"
+
+msgid "Add this contact to your friends"
+msgstr "Apondre queu contacte a vòstres amics"
+
+msgid "Add this groupchat to your favorites"
+msgstr "Apondre queu charrador a vòstres preferits"
+
+msgid "All tabs"
+msgstr "Tots los onglets"
+
+msgid "Close this tab"
+msgstr "Barrar quel onglet"
+
+msgid "no subject defined for this room."
+msgstr "p'un subjècte definit per queu charrador."
+
+msgid "Administration panel for this room"
+msgstr ""
+
+msgid "Moderators"
+msgstr "Moderador(a)s"
+
+msgid "Participants"
+msgstr "Participant(a)s"
+
+msgid "Visitors"
+msgstr "Visitaires/as"
+
+msgid "Manage favorite rooms"
+msgstr "Gerir los charradors preferits"
+
+msgid "Change favorites"
+msgstr "Modificar los preferits"
+
+msgid "Search a room"
+msgstr "Cerchar un charrador"
+
+msgid "Select a favorite"
+msgstr "Seleccionatz un preferit"
+
+msgid "Getting the name..."
+msgstr "Obtencion dau nom..."
+
+msgid "Gateway"
+msgstr "Passarèla"
+
+msgid "Name"
+msgstr "Nom"
+
+msgid "Room"
+msgstr "Charrador"
+
+msgid "Add"
+msgstr "Apondre"
+
+msgid "Edit"
+msgstr "Editar"
+
+msgid "Search a room on"
+msgstr ""
+
+msgid "No room found on this server."
+msgstr ""
+
+msgid "Service discovery"
+msgstr ""
+
+msgid "Server to query"
+msgstr ""
+
+msgid "Sorry, but the entity didn't return any result!"
+msgstr ""
+
+msgid "Accounts"
+msgstr "Comptes"
+
+msgid "Authentications"
+msgstr "Autentificacion   "
+
+msgid "Automation"
+msgstr "Automatizacion"
+
+msgid "Clients"
+msgstr "Clients"
+
+msgid "Collaboration"
+msgstr "Collaboracion"
+
+msgid "Components"
+msgstr "Compausants"
+
+msgid "Rooms"
+msgstr "Charradors"
+
+msgid "Directories"
+msgstr "Repertòris"
+
+msgid "Gateways"
+msgstr "Passarèlas"
+
+msgid "News"
+msgstr "Actualitats"
+
+msgid "Hierarchy"
+msgstr "Ierarchia"
+
+msgid "Proxies"
+msgstr "Proxies"
+
+msgid "Publication/Subscription"
+msgstr ""
+
+msgid "Storage"
+msgstr "Emmagazinatge"
+
+msgid "Service offline or broken"
+msgstr ""
+
+msgid "Your inbox"
+msgstr "Vòstra boitia d'arribada"
+
+msgid "Available actions"
+msgstr ""
+
+msgid "Clean"
+msgstr "Voidar"
+
+msgid "New"
+msgstr "Noveu"
+
+msgid "Received"
+msgstr "Reçaugut"
+
+msgid "Subject"
+msgstr "Subjècte"
+
+msgid "Content"
+msgstr "Contengut"
+
+msgid "Send message"
+msgstr "Enviar lo messatge"
+
+msgid "Your inbox is empty."
+msgstr "Vòstra boitia d'arribada es voida"
+
+msgid "MUC administration"
+msgstr ""
+
+msgid "You administrate this room"
+msgstr ""
+
+msgid "Enter new subject"
+msgstr ""
+
+msgid "Configuration"
+msgstr "Configuracion"
+
+msgid "Authorizations"
+msgstr "Autorizacions"
+
+msgid "Member list"
+msgstr ""
+
+msgid "Owner list"
+msgstr ""
+
+msgid "Administrator list"
+msgstr ""
+
+msgid "Outcast list"
+msgstr ""
+
+msgid "Add an input"
+msgstr ""
+
+msgid "Destroy this MUC"
+msgstr ""
+
+msgid "Yes, let's do it!"
+msgstr ""
+
+msgid "Your friend is paying attention to the conversation."
+msgstr ""
+
+msgid "Your friend is writing a message..."
+msgstr "Vòstre amic es a escriure un messatge..."
+
+msgid "Your friend stopped writing a message."
+msgstr ""
+
+msgid "Your friend is doing something else."
+msgstr ""
+
+msgid "Your friend closed the chat."
+msgstr ""
+
+msgid "Requesting this service..."
+msgstr ""
+
+msgid "Loading"
+msgstr "Charja"
+
+msgid "joined the chat room"
+msgstr ""
+
+msgid "left the chat room"
+msgstr ""
+
+msgid "no status"
+msgstr ""
+
+msgid "has been kicked"
+msgstr ""
+
+msgid "has been banned"
+msgstr ""
+
+msgid "no reason"
+msgstr ""
+
+msgid "Communicate with the entire world!"
+msgstr ""
+
+msgid "It allows you to get in touch with the millions of users who currently use the XMPP network like you do with Jappix. Join the community and stay free!"
+msgstr ""
+
+msgid "Hi there!"
+msgstr "Adiu !"
+
+msgid "Welcome on %1s, “%2s”."
+msgstr "Benvengut/uda sus %1s, “%2s”."
+
+msgid "Login to your existing XMPP account or create a new one for free!"
+msgstr ""
+
+msgid "Jappix is an open-source project from PostPro, a non-profit organization which provides us a great help."
+msgstr ""
+
+msgid "Login to your existing XMPP account. You can also use the %s to join a groupchat."
+msgstr ""
+
+msgid "Previous"
+msgstr "Precedent"
+
+msgid "General"
+msgstr "Generau"
+
+msgid "Advanced"
+msgstr "Avançat"
+
+msgid "Resource"
+msgstr ""
+
+msgid "Priority"
+msgstr "Prioritat"
+
+msgid "Low"
+msgstr "Bassa"
+
+msgid "Medium"
+msgstr "Mejana"
+
+msgid "High"
+msgstr "Nauta"
+
+msgid "Enter the groupchat you want to join and the nick you want to have. You can also go back to the %s."
+msgstr "Picatz lo nom dau charrador que voletz junher e vòstre chafre. Podetz tanben tornar a la %s. "
+
+msgid "login page"
+msgstr ""
+
+msgid "Share this link with your friends:"
+msgstr ""
+
+msgid "Register a new XMPP account to join your friends on your own social cloud. That's simple!"
+msgstr ""
+
+msgid "Required"
+msgstr ""
+
+msgid "You have been registered, here is your XMPP address:"
+msgstr ""
+
+msgid "Manager"
+msgstr ""
+
+msgid "Project"
+msgstr ""
+
+msgid "Encrypted"
+msgstr ""
+
+msgid "Unencrypted"
+msgstr ""
+
+msgid "Where are you?"
+msgstr "Ente setz ?"
+
+msgid "What's up with you?"
+msgstr ""
+
+msgid "Fetching the social channel..."
+msgstr ""
+
+msgid "You are synchronized with your network."
+msgstr ""
+
+msgid "Cannot send anything: you can only receive notices!"
+msgstr ""
+
+msgid "Media viewer"
+msgstr ""
+
+msgid "Browse"
+msgstr ""
+
+msgid "Command"
+msgstr ""
+
+msgid "Subscribe"
+msgstr ""
+
+msgid "Join"
+msgstr ""
+
+msgid "Automatic"
+msgstr ""
+
+msgid "Search"
+msgstr ""
+
+msgid "No result!"
+msgstr ""
+
+msgid "No notifications."
+msgstr ""
+
+msgid "would like to add you as a friend."
+msgstr ""
+
+msgid "would like you to join this chatroom:"
+msgstr ""
+
+msgid "Do you accept?"
+msgstr ""
+
+msgid "Yes"
+msgstr ""
+
+msgid "No"
+msgstr ""
+
+msgid "would like to get authorization."
+msgstr ""
+
+msgid "Do you want to see the friends %s suggests you?"
+msgstr ""
+
+msgid "Submit"
+msgstr ""
+
+msgid "Client"
+msgstr ""
+
+msgid "System"
+msgstr ""
+
+msgid "Local time"
+msgstr ""
+
+msgid "Comments"
+msgstr ""
+
+msgid "User profile"
+msgstr ""
+
+msgid "See his/her position on the globe"
+msgstr ""
+
+msgid "Confirm"
+msgstr ""
+
+msgid "anonymous mode"
+msgstr ""
+
+msgid "Groups"
+msgstr ""
+
+msgid "Unclassified"
+msgstr ""
+
+msgid "Authorize"
+msgstr ""
+
+msgid "Ask for authorization"
+msgstr ""
+
+msgid "Unblock"
+msgstr ""
+
+msgid "Prohibit"
+msgstr ""
+
+msgid "Block"
+msgstr ""
+
+msgid "Chat"
+msgstr ""
+
+msgid "Groupchat"
+msgstr ""
+
+msgid "Jappix Mobile"
+msgstr ""
+
+msgid "Desktop"
+msgstr ""
+
+msgid "Mobile"
+msgstr ""
+
+msgid "Please wait..."
+msgstr ""
+
+msgid "Please enable JavaScript"
+msgstr ""
+
+msgid "Your channel"
+msgstr ""
+
+msgid "Channel of"
+msgstr ""
+
+msgid "More notices..."
+msgstr ""
+
+msgid "Attach a file"
+msgstr ""
+
+msgid "Send"
+msgstr ""
+
+msgid "Unattach the file"
+msgstr ""
+
+msgid "An error occured while uploading your file: maybe it is too big (%s maximum) or forbidden!"
+msgstr ""
+
+msgid "Authorization failed"
+msgstr ""
+
+msgid "Registration failed, please choose a different username"
+msgstr ""
+
+msgid "Service unavailable"
+msgstr ""
+
+msgid "Internal server error, try later"
+msgstr ""
+
+msgid "Your form has been sent."
+msgstr ""
+
+msgid "Application"
+msgstr ""
+
+msgid "XMPP links"
+msgstr ""
+
+msgid "Open XMPP links with Jappix"
+msgstr ""
+
+msgid "changed the subject to:"
+msgstr ""
+
+msgid "Welcome!"
+msgstr ""
+
+msgid "Friends"
+msgstr "Amics"
+
+msgid "Welcome on Jappix, your own social cloud!"
+msgstr ""
+
+msgid "Before you start using it, you will have to change some settings, search for friends and complete your profile."
+msgstr ""
+
+msgid "Enable notification sounds"
+msgstr ""
+
+msgid "Share your position on the globe"
+msgstr ""
+
+msgid "Offline friends"
+msgstr "Amics fòra linha"
+
+msgid "Don't hide offline friends"
+msgstr ""
+
+msgid "Use this tool to find your friends on the server you are using right now, or add them later."
+msgstr ""
+
+msgid "Great work! Now, you can share Jappix with your friends!"
+msgstr ""
+
+msgid "When you will press the save button, the profile editor will be opened. Happy socializing!"
+msgstr ""
+
+msgid "Share Jappix on %s"
+msgstr ""
+
+msgid "Using Jappix, an open social platform. I am %s!"
+msgstr ""
+
+msgid "Unknown name"
+msgstr ""
+
+msgid "Unknown country"
+msgstr ""
+
+msgid "Click to enable"
+msgstr ""
+
+msgid "Click to disable"
+msgstr ""
+
+msgid "Installation"
+msgstr ""
+
+msgid "Jappix installation"
+msgstr ""
+
+msgid "Welcome to the Jappix installation!"
+msgstr ""
+
+msgid "This tool will help you fastly install Jappix, the first full-featured XMPP-based social platform, on your server. You don't even need any technical knowledge."
+msgstr ""
+
+msgid "Let's have a look at the installation steps:"
+msgstr ""
+
+msgid "Welcome"
+msgstr ""
+
+msgid "Storage configuration"
+msgstr ""
+
+msgid "Administrator account"
+msgstr ""
+
+msgid "Main configuration"
+msgstr ""
+
+msgid "Hosts configuration"
+msgstr ""
+
+msgid "Services installation"
+msgstr ""
+
+msgid "If the current language does not match yours (%1s), you can make Jappix speak %2s it will be saved."
+msgstr ""
+
+msgid "If you want to get some help about the Jappix installation and configuration, you can use our whole documentation, available at:"
+msgstr ""
+
+msgid "It's time to build your own social cloud: just go to the next step!"
+msgstr ""
+
+msgid "Jappix stores persistent data (such as shared files, chat logs, your own music and its configuration) into a single secured storage folder."
+msgstr ""
+
+msgid "Jappix must be able to write in this folder to create its sub-directories. If not, you must set the rights to %1s or change the folder owner to %2s (depending of your configuration)."
+msgstr ""
+
+msgid "The folder is writable, you can continue!"
+msgstr ""
+
+msgid "Jappix offers you the possibility to manage your configuration, install new addons or search for updates. That's why you must create an administrator account to access the manager."
+msgstr ""
+
+msgid "When Jappix will be installed, just click on the manager link on the home page to access it."
+msgstr ""
+
+msgid "Oops, you missed something or the two passwords do not match!"
+msgstr ""
+
+msgid "Jappix needs that you specify some values to work. Please correct the following inputs (or keep the default values, which are sufficient for most people)."
+msgstr ""
+
+msgid "Note that if you don't specify a value which is compulsory, it will be automatically completed with the default one."
+msgstr ""
+
+msgid "User"
+msgstr "Utilizaire"
+
+msgid "Service"
+msgstr ""
+
+msgid "Service name"
+msgstr ""
+
+msgid "Service description"
+msgstr ""
+
+msgid "Connection"
+msgstr ""
+
+msgid "Lock the host"
+msgstr ""
+
+msgid "Anonymous mode"
+msgstr ""
+
+msgid "Registration allowed"
+msgstr ""
+
+msgid "Use a proxy"
+msgstr ""
+
+msgid "Encryption"
+msgstr ""
+
+msgid "HTTPS storage"
+msgstr ""
+
+msgid "Force HTTPS"
+msgstr ""
+
+msgid "Compression"
+msgstr ""
+
+msgid "This page helps you specify the default hosts Jappix will connect to. You can leave it as it is and continue if you want to use the official service hosts."
+msgstr ""
+
+msgid "Maybe you don't know what a BOSH server is? In fact, this is a relay between a Jappix client and a XMPP server, which is necessary because of technical limitations."
+msgstr ""
+
+msgid "Main host"
+msgstr ""
+
+msgid "Groupchat host"
+msgstr ""
+
+msgid "Anonymous host"
+msgstr ""
+
+msgid "Directory host"
+msgstr ""
+
+msgid "BOSH host"
+msgstr ""
+
+msgid "You can install some extra softwares on your server, to extend your Jappix features. Some others might be modified, because of security restrictions which are set by default."
+msgstr ""
+
+msgid "To perform this, you must be able to access your server's shell and be logged in as root. Remember this is facultative, Jappix will work without these modules, but some of its features will be unavailable."
+msgstr ""
+
+msgid "After you finished the setup, Jappix will generate the cache files. It might be slow, just wait until the application is displayed and do not press any button."
+msgstr ""
+
+msgid "Thanks for using Jappix!"
+msgstr ""
+
+msgid "Next"
+msgstr ""
+
+msgid "Finish"
+msgstr ""
+
+msgid "Check again"
+msgstr ""
+
+msgid "The folder is not writable, set the right permissions to the %s directory."
+msgstr ""
+
+msgid "%s is installed on your system."
+msgstr ""
+
+msgid "%1s is not installed on your system, you should install %2s."
+msgstr ""
+
+msgid "PHP maximum upload size is sufficient (%s)."
+msgstr ""
+
+msgid "PHP maximum upload size is not sufficient (%1s), you should define it to %2s in %3s."
+msgstr ""
+
+msgid "Jappix manager"
+msgstr ""
+
+msgid "Manager access"
+msgstr ""
+
+msgid "Statistics"
+msgstr ""
+
+msgid "Hosts"
+msgstr ""
+
+msgid "Design"
+msgstr ""
+
+msgid "Repeat"
+msgstr ""
+
+msgid "All"
+msgstr ""
+
+msgid "Horizontal"
+msgstr ""
+
+msgid "Vertical"
+msgstr ""
+
+msgid "Center"
+msgstr ""
+
+msgid "Left"
+msgstr ""
+
+msgid "Right"
+msgstr ""
+
+msgid "Top"
+msgstr ""
+
+msgid "Bottom"
+msgstr ""
+
+msgid "Adapt"
+msgstr ""
+
+msgid "Color"
+msgstr ""
+
+msgid "Users"
+msgstr ""
+
+msgid "Updates"
+msgstr ""
+
+msgid "This is a restricted area: only the authorized users can manage this Jappix node."
+msgstr ""
+
+msgid "Please use the form below to login to the administration panel."
+msgstr ""
+
+msgid "To improve security, sessions are limited in time and when your browser will be closed, you will be logged out."
+msgstr ""
+
+msgid "Credentials"
+msgstr ""
+
+msgid "You have been logged out. Goodbye!"
+msgstr ""
+
+msgid "Oops, you could not be recognized as a valid administrator. Check your credentials!"
+msgstr ""
+
+msgid "Basic statistics are processed by Jappix about some important things, you can find them below."
+msgstr ""
+
+msgid "Change your Jappix node configuration with this tool."
+msgstr ""
+
+msgid "Change the XMPP hosts that this Jappix node serve with this tool."
+msgstr ""
+
+msgid "All this Jappix node stored files can be managed with this tool: please select a sub-folder and start editing its content!"
+msgstr ""
+
+msgid "Jappix is fully customisable: you can change its design right here."
+msgstr ""
+
+msgid "This is not a valid image, please use PNG, GIF or JPG!"
+msgstr ""
+
+msgid "The image could not be received, would you mind retry?"
+msgstr ""
+
+msgid "Your image was added to the list!"
+msgstr ""
+
+msgid "Changes saved!"
+msgstr ""
+
+msgid "You can define more than one administrator for this Jappix node. You can also change a password with this tool."
+msgstr ""
+
+msgid "Update your Jappix node with this tool, or check if a new one is available. Informations about the latest version are also displayed (in english)."
+msgstr ""
+
+msgid "Access statistics"
+msgstr ""
+
+msgid "Share statistics"
+msgstr ""
+
+msgid "Other statistics"
+msgstr ""
+
+msgid "January"
+msgstr "Genier"
+
+msgid "February"
+msgstr "Feurier"
+
+msgid "March"
+msgstr "Març"
+
+msgid "April"
+msgstr "Abriu"
+
+msgid "May"
+msgstr "Mai"
+
+msgid "June"
+msgstr "Junh"
+
+msgid "July"
+msgstr "Julhet"
+
+msgid "August"
+msgstr "Aust"
+
+msgid "September"
+msgstr "Septembre"
+
+msgid "October"
+msgstr "Octòbre"
+
+msgid "November"
+msgstr "Novembre"
+
+msgid "December"
+msgstr "Decembre"
+
+msgid "Monday"
+msgstr "Diluns"
+
+msgid "Tuesday"
+msgstr "Dimars"
+
+msgid "Wednesday"
+msgstr "Dimecres"
+
+msgid "Thursday"
+msgstr "Dijòus"
+
+msgid "Friday"
+msgstr "Divendres"
+
+msgid "Saturday"
+msgstr "Dissabde"
+
+msgid "Sunday"
+msgstr "Diumenc"
+
+msgid "Total"
+msgstr ""
+
+msgid "Cache"
+msgstr ""
+
+msgid "Logs"
+msgstr ""
+
+msgid "Music"
+msgstr "Musica"
+
+msgid "Backgrounds"
+msgstr ""
+
+msgid "Share"
+msgstr ""
+
+msgid "Background"
+msgstr ""
+
+msgid "Notice"
+msgstr ""
+
+msgid "Your design preferences have been saved!"
+msgstr ""
+
+msgid "Please check your inputs: something is missing!"
+msgstr ""
+
+msgid "Change your Jappix node background with this tool. You can either set a custom color or an uploaded image. Let your creativity flow!"
+msgstr ""
+
+msgid "Use default background"
+msgstr ""
+
+msgid "Use your own image"
+msgstr ""
+
+msgid "Select a background to use and change the display options."
+msgstr ""
+
+msgid "Use your own color"
+msgstr ""
+
+msgid "Type the hexadecimal color value you want to use as a background."
+msgstr ""
+
+msgid "Manage backgrounds"
+msgstr ""
+
+msgid "You can add a new background to the list with this tool. Please send a valid image."
+msgstr ""
+
+msgid "If you want to remove some backgrounds, use the browser below."
+msgstr ""
+
+msgid "Define a homepage notice for all your users, such as a warn, an important message or an advert with this tool."
+msgstr ""
+
+msgid "Simple notice"
+msgstr ""
+
+msgid "This notice only needs simple text to be displayed, but no code is allowed!"
+msgstr ""
+
+msgid "Advanced notice"
+msgstr ""
+
+msgid "You can customize your notice with embedded HTML, CSS and JavaScript, but you need to code the style."
+msgstr ""
+
+msgid "Available updates"
+msgstr ""
+
+msgid "What's new?"
+msgstr ""
+
+msgid "Your storage folders are not writable, please apply the good rights!"
+msgstr ""
+
+msgid "%1s may cause problems to the proxy, please increase %2s value up to %3s!"
+msgstr ""
+
+msgid "You are using a development version of Jappix. Update it through our repository by executing: %s."
+msgstr ""
+
+msgid "A new Jappix version is available! Check what is new and launch the update!"
+msgstr ""
+
+msgid "Your version is out to date. Update it now to %s by clicking here!"
+msgstr ""
+
+msgid "Your version seems to be up to date, but you can check updates manually by clicking here."
+msgstr ""
+
+msgid "Check for updates"
+msgstr ""
+
+msgid "Update in progress"
+msgstr ""
+
+msgid "Jappix has been updated: you are now running the latest version. Have fun!"
+msgstr ""
+
+msgid "The update has failed! Please try again later."
+msgstr ""
+
+msgid "Downloading package..."
+msgstr ""
+
+msgid "Removing current Jappix system files..."
+msgstr ""
+
+msgid "Extracting package..."
+msgstr ""
+
+msgid "Regenerating storage folder tree..."
+msgstr ""
+
+msgid "Jappix is now up to date!"
+msgstr ""
+
+msgid "Aborted: socket error!"
+msgstr ""
+
+msgid "Aborted: buffer error!"
+msgstr ""
+
+msgid "Aborted: everything is not writable!"
+msgstr ""
+
+msgid "Aborted: could not extract the package!"
+msgstr ""
+
+msgid "Visits"
+msgstr ""
+
+msgid "Daily"
+msgstr ""
+
+msgid "Weekly"
+msgstr ""
+
+msgid "Monthly"
+msgstr ""
+
+msgid "Yearly"
+msgstr ""
+
+msgid "Size"
+msgstr ""
+
+msgid "Clean everything"
+msgstr ""
+
+msgid "Purge cache"
+msgstr ""
+
+msgid "Purge logs"
+msgstr ""
+
+msgid "Purge updates"
+msgstr ""
+
+msgid "The storage folder you wanted to clean is now empty!"
+msgstr ""
+
+msgid "Keep your Jappix node fresh and fast, clean the storage folders regularly!"
+msgstr ""
+
+msgid "Upload your music (Ogg Vorbis, MP3 or WAV) to be able to listen to it in Jappix!"
+msgstr ""
+
+msgid "The file you want to upload must be smaller than %s."
+msgstr ""
+
+msgid "Stay tuned in what your users store on your server and remove undesired content with this tool."
+msgstr ""
+
+msgid "Title"
+msgstr ""
+
+msgid "Artist"
+msgstr ""
+
+msgid "Album"
+msgstr ""
+
+msgid "File"
+msgstr ""
+
+msgid "Upload"
+msgstr ""
+
+msgid "The folder is empty."
+msgstr ""
+
+msgid "The music could not be received, please retry!"
+msgstr ""
+
+msgid "This is not a valid music file, please encode in Ogg Vorbis, MP3 or WAV!"
+msgstr ""
+
+msgid "Your music has been added!"
+msgstr ""
+
+msgid "The selected elements have been removed."
+msgstr ""
+
+msgid "You must select elements to remove!"
+msgstr ""
+
+msgid "Add a new user with this tool, or change a password (type an existing username). Please submit a strong password!"
+msgstr ""
+
+msgid "Manage"
+msgstr ""
+
+msgid "List"
+msgstr ""
+
+msgid "Remove users with this tool. Note that you cannot remove an user if he is the only one remaining."
+msgstr ""
+
+msgid "The user has been added!"
+msgstr ""
+
+msgid "The chosen users have been removed."
+msgstr ""
+
+msgid "You must select one or more users to be removed!"
+msgstr ""
+
+msgid "Yesterday"
+msgstr ""
+
+msgid "%s days ago"
+msgstr ""
+
+msgid "User currently active"
+msgstr ""
+
+msgid "Last seen: %s"
+msgstr ""
+
+msgid "Inactive since: %s"
+msgstr ""
+
+msgid "Your friend seems not to have received your message(s)!"
+msgstr ""
+
+msgid "Static content server"
+msgstr ""
+
+msgid "This is the static content server for %1s, “%2s”."
+msgstr ""
+
+msgid "Suggested friends"
+msgstr ""
+
+msgid "Check all"
+msgstr ""
+
+msgid "Uncheck all"
+msgstr ""
+
+msgid "Choose"
+msgstr ""
+
+msgid "List name"
+msgstr ""
+
+msgid "Allow"
+msgstr ""
+
+msgid "Deny"
+msgstr ""
+
+msgid "Group"
+msgstr ""
+
+msgid "Subscription"
+msgstr ""
+
+msgid "Both"
+msgstr ""
+
+msgid "From"
+msgstr ""
+
+msgid "Everybody"
+msgstr ""
+
+msgid "Send messages"
+msgstr ""
+
+msgid "Send queries"
+msgstr ""
+
+msgid "See my status"
+msgstr ""
+
+msgid "Send his/her status"
+msgstr ""
+
+msgid "Everything"
+msgstr ""
+
+msgid "Item"
+msgstr ""
+
+msgid "Order"
+msgstr ""
+
+msgid "Active for this session"
+msgstr ""
+
+msgid "Always active"
+msgstr ""
+
+msgid "User directory"
+msgstr ""
+
+msgid "Search a friend"
+msgstr ""
+
+msgid "The feature requested is not implemented by the recipient or server and therefore cannot be processed."
+msgstr ""
+
+msgid "This is a repeat from %s"
+msgstr ""
+
+msgid "Loading comments..."
+msgstr ""
+
+msgid "Type your comment here..."
+msgstr ""
+
+msgid "Could not get the comments!"
+msgstr ""
+
+msgid "Show comments"
+msgstr ""
+
+msgid "Send him/her a message"
+msgstr ""
+
+msgid "Start a chat with him/her"
+msgstr ""
+
+msgid "Media integration"
+msgstr ""
+
+msgid "Comments locked!"
+msgstr ""
+
+msgid "Type something you want to share with your friends..."
+msgstr ""
+
+msgid "changed his/her nickname to %s"
+msgstr ""
+
+msgid "commented an item you follow: “%s”."
+msgstr ""
+
+msgid "Hide"
+msgstr ""
+
+msgid "liked your post: “%s”."
+msgstr ""
+
+msgid "quoted you somewhere: “%s”."
+msgstr ""
+
+msgid "published on your wall: “%s”."
+msgstr ""
+
+msgid "tagged you in a photo (%s)."
+msgstr ""
+
+msgid "tagged you in a video (%s)."
+msgstr ""
+
+msgid "Show"
+msgstr ""
+
+msgid "Need help? You'd better read our documentation page about how to fill this form!"
+msgstr ""
+
+msgid "Pubsub host"
+msgstr ""
+
+msgid "Jappix is a great social platform, that you can access wherever you are, whenever you want and communicate with whovever you want."
+msgstr ""
+
+msgid "Manager link"
+msgstr ""
+
+msgid "User uploads server"
+msgstr ""
+
+msgid "This is the user uploads server for %1s, “%2s”."
+msgstr ""
+
+msgid "Logo"
+msgstr ""
+
+msgid "You can set your own service logo to replace the default one. Take care of the size and the main color of each logo!"
+msgstr ""
+
+msgid "Upload each logo with the recommended maximum pixel size."
+msgstr ""
+
+msgid "This is not a valid image, please use the PNG format!"
+msgstr ""
+
+msgid "Your service logo has been successfully changed!"
+msgstr ""
+
+msgid "Your logo format must be PNG. Leave a field empty and the logo will not be changed."
+msgstr ""
+
+msgid "Remove this logo"
+msgstr ""
+
+msgid "View this logo"
+msgstr ""
+
+msgid "Send a file"
+msgstr ""
+
+msgid "Once uploaded, your friend will be prompted to download the file you sent."
+msgstr ""
+
+msgid "Groupchats to join"
+msgstr ""
+
+msgid "Purge sent files"
+msgstr ""
+
+msgid "would like to send you a file: “%s”."
+msgstr ""
+
+msgid "has accepted to received your file: “%s”."
+msgstr ""
+
+msgid "has rejected to receive your file: “%s”."
+msgstr ""
+
+msgid "could not receive your file: “%s”."
+msgstr ""
+
+msgid "has received a file exchange request: “%s”."
+msgstr ""
+
+msgid "Available shortcuts:"
+msgstr ""
+
+msgid "%s removes the chat logs"
+msgstr ""
+
+msgid "%s joins a groupchat"
+msgstr ""
+
+msgid "%s closes the chat"
+msgstr ""
+
+msgid "%s shows the user profile"
+msgstr ""
+
+msgid "%s sends a message to the room"
+msgstr ""
+
+msgid "%s changes your nickname"
+msgstr ""
+
+msgid "%s sends a message to someone in the room"
+msgstr ""
+
+msgid "%s changes the room topic"
+msgstr ""
+
+msgid "%s kicks an user of the room"
+msgstr ""
+
+msgid "%s bans an user of the room"
+msgstr ""
+
+msgid "%s invites someone to join the room"
+msgstr ""
+
+msgid "Social channel, chat and more."
+msgstr ""
+
+msgid "Create your public profile."
+msgstr ""
+
+msgid "A mini-chat for your website."
+msgstr ""
+
+msgid "Get Jappix, get support."
+msgstr ""
+
+msgid "Statistics around Jappix."
+msgstr ""
+
+msgid "Download Jappix for free."
+msgstr ""
+
+msgid "Find a public Jappix node."
+msgstr ""
+
+msgid "Public profile"
+msgstr ""
+
+msgid "Your profile anywhere on the Web."
+msgstr ""
+
+msgid "%s is a Jappix.com service which makes your XMPP profile public. It is easier to share it. No XMPP account is required to view your social channel, your current position and your contact details."
+msgstr ""
+
+msgid "Furthermore, every picture you post in your social channel is added to a beautiful picture timeline. You can now view the pictures you shared year by year."
+msgstr ""
+
+msgid "You can also use your XMPP avatar as a single avatar for every website, blog and forum you use. When you change it on XMPP, the new avatar appears everywhere. What a genious improvement!"
+msgstr ""
+
+msgid "Yay, let's create my public profile!"
+msgstr ""
+
+msgid "Enable my public profile"
+msgstr ""
+
+#~ msgid "Jappix is a non-profit social platform, that you can access wherever you are, whenever you want and communicate with whovever you want."
+#~ msgstr ""
+
+#~ msgid "See"
+#~ msgstr ""
+
+#~ msgid "Use default logo"
+#~ msgstr ""
+
+#~ msgid "Use your own logo"
+#~ msgstr ""
+
+#~ msgid "The recommended image format is PNG. Leave a field empty and the logo will not be changed."
+#~ msgstr ""
diff --git a/jappixmini/jappix/lang/pl/LC_MESSAGES/main.mo b/jappixmini/jappix/lang/pl/LC_MESSAGES/main.mo
new file mode 100644
index 00000000..8eed3859
Binary files /dev/null and b/jappixmini/jappix/lang/pl/LC_MESSAGES/main.mo differ
diff --git a/jappixmini/jappix/lang/pl/LC_MESSAGES/main.po b/jappixmini/jappix/lang/pl/LC_MESSAGES/main.po
new file mode 100644
index 00000000..f0fa0316
--- /dev/null
+++ b/jappixmini/jappix/lang/pl/LC_MESSAGES/main.po
@@ -0,0 +1,1870 @@
+# Polish translations for Jappix package.
+# This file is distributed under the same license as the Jappix package.
+# This file was translated from CodingTeam at <http://codingteam.net/>.
+msgid ""
+msgstr ""
+"Project-Id-Version: Jappix\n"
+"PO-Revision-Date: 2012-01-16 21:26+0100\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"POT-Creation-Date: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+
+msgid "JavaScript is missing in your web browser, so that you will not be able to launch Jappix! Please fix this."
+msgstr "Obsługa JavaScript jest wyłączona przez co uruchomienie Jappix-a jest niemożliwe! Prosimy o aktywowanie obsługi JavaScript i spróbowanie ponownie."
+
+msgid "An open social network"
+msgstr "Otwarta sieć społecznościowa"
+
+msgid "Jappix has been interrupted by a network issue, a bug or bad login (check that you entered the right credentials), sorry for the inconvenience."
+msgstr "Działanie Jappix zostało przerwane przez problem sieciowy, błąd programu bądź złe dane logowania (sprawdź, czy podałeś prawidłowe dane dostępowe). Za usterkę przepraszamy."
+
+msgid "The element list on this server could not be obtained!"
+msgstr ""
+
+msgid "Your password has been changed, now you can connect to your account with your new login data."
+msgstr "Hasło zostało zmienione. Możesz połączyć się do swojego konta używając nowego hasła."
+
+msgid "Your XMPP account has been removed, bye!"
+msgstr "Twoje konto XMPP zostało usunięte, żegnaj!"
+
+msgid "You have been logged out of your XMPP account, have a nice day!"
+msgstr "Wylogowywanie zakończone pomyślnie, życzymy miłego dnia!"
+
+msgid "The room you joined seems not to exist. You should create it!"
+msgstr "Pokój do którego dołączyłeś nie istnieje. Powinieneś go stworzyć!"
+
+msgid "The groupchat has been removed, now someone else will be able to recreate it."
+msgstr "Pokój rozmów został usunięty, teraz ktoś inny będzie mógł go stworzyć."
+
+msgid "The user that you want to reach is not present in the room."
+msgstr "Użytkownik z którym chciałeś się skontaktować nie jest obecny w pokoju."
+
+msgid "Please enter the group chat address to join."
+msgstr "Wprowadź adres pokoju czatowego aby do niego dołączyć."
+
+msgid "Please enter your nickname to join %s."
+msgstr "Wprowadź swój nick aby dołączyć do %s."
+
+msgid "This room (%s) is protected with a password."
+msgstr "Ten pokój (%s) jest chroniony hasłem."
+
+msgid "Your browser is out of date!"
+msgstr "Twoja przeglądarka jest nieaktualna!"
+
+msgid "Last %s version is better!"
+msgstr "Ostatnia wersja %s jest lepsza!"
+
+msgid "Login"
+msgstr "Login"
+
+msgid "Register"
+msgstr "Rejestracja"
+
+msgid "Here we go!"
+msgstr "Do dzieła!"
+
+msgid "Server"
+msgstr "Serwer"
+
+msgid "Password"
+msgstr "Hasło"
+
+msgid "Remember me"
+msgstr "Zapamiętaj mnie"
+
+msgid "This tool has been disabled, you cannot use it!"
+msgstr "To narzędzie zostało wyłączone, nie możesz z niego skorzystać!"
+
+msgid "Due to a network issue, you were disconnected. What do you want to do now?"
+msgstr "Z powodu błędu sieci połączenie zostało zerwane. Co chcesz teraz zrobić?"
+
+msgid "Reconnect"
+msgstr "Połącz ponownie"
+
+msgid "Messages"
+msgstr "Wiadomości"
+
+msgid "Profile"
+msgstr "Profil"
+
+msgid "Options"
+msgstr "Opcje"
+
+msgid "Disconnect"
+msgstr "Wyloguj"
+
+msgid "Filter"
+msgstr "Filtr"
+
+msgid "Add a friend"
+msgstr "Dodaj znajomego"
+
+msgid "Your groupchats"
+msgstr "Twoje rozmowy grupowe"
+
+msgid "Manage your favorite groupchats"
+msgstr "Zarządzaj ulubionymi pokojami rozmów"
+
+msgid "More stuff"
+msgstr "Więcej"
+
+msgid "Show all friends"
+msgstr "Pokaż wszystkich znajomych"
+
+msgid "Only show connected friends"
+msgstr "Pokazuj tylko połączonych znajomych"
+
+msgid "Message archives"
+msgstr "Archiwum wiadomości"
+
+msgid "Date"
+msgstr "Data"
+
+msgid "Please select a friend to view the chat history."
+msgstr "Wybierz znajomego aby zobaczyć archiwum."
+
+msgid "Nothing found for: %s"
+msgstr "Nic nieznaleziono dla: %s"
+
+msgid "A short message?"
+msgstr "Krótka wiadomość?"
+
+msgid "How are you?"
+msgstr "Jak się masz?"
+
+msgid "What are you doing?"
+msgstr "Co robisz?"
+
+msgid "Join a chat"
+msgstr "Dołącz do rozmowy"
+
+msgid "Status"
+msgstr "Status"
+
+msgid "Available"
+msgstr "Dostępny"
+
+msgid "Talkative"
+msgstr "Chętny do rozmowy"
+
+msgid "Away"
+msgstr "Nieobecny"
+
+msgid "Not available"
+msgstr "Niedostępny"
+
+msgid "Busy"
+msgstr "Zajęty"
+
+msgid "Mood"
+msgstr "Nastrój"
+
+msgid "None"
+msgstr "Żaden"
+
+msgid "Crazy"
+msgstr "Zwariowany"
+
+msgid "Excited"
+msgstr "Podekscytowany"
+
+msgid "Playful"
+msgstr "Rozbawiony"
+
+msgid "Happy"
+msgstr "Wesoły"
+
+msgid "Shocked"
+msgstr "Zszokowany"
+
+msgid "Hot"
+msgstr "Gorący"
+
+msgid "Sad"
+msgstr "Smutny"
+
+msgid "Amorous"
+msgstr "Rozkochany"
+
+msgid "Confident"
+msgstr "Pewny siebie"
+
+msgid "Activity"
+msgstr "Aktywność"
+
+msgid "Chores"
+msgstr "Prace domowe"
+
+msgid "Drinking"
+msgstr "Picie"
+
+msgid "Eating"
+msgstr "Jedzenie"
+
+msgid "Exercising"
+msgstr "Ćwiczenia"
+
+msgid "Grooming"
+msgstr "Higiena"
+
+msgid "Appointment"
+msgstr "Spotkanie"
+
+msgid "Inactive"
+msgstr "Nieaktywne"
+
+msgid "Relaxing"
+msgstr "Relaksowanie"
+
+msgid "Talking"
+msgstr "Rozmowa"
+
+msgid "Traveling"
+msgstr "Podróżowanie"
+
+msgid "Working"
+msgstr "Praca"
+
+msgid "View profile"
+msgstr "Zobacz profil"
+
+msgid "Repeat this notice"
+msgstr "Powtórz tą informację"
+
+msgid "Remove this notice"
+msgstr "Usuń tą informację"
+
+msgid "Your profile"
+msgstr "Twój profil"
+
+msgid "Identity"
+msgstr "Tożsamość"
+
+msgid "Profile image"
+msgstr "Awatar"
+
+msgid "Others"
+msgstr "Inne"
+
+msgid "Personal"
+msgstr "Personalne"
+
+msgid "Complete name"
+msgstr "Imię i nazwisko"
+
+msgid "Nickname"
+msgstr "Pseudonim"
+
+msgid "First name"
+msgstr "Imię"
+
+msgid "Last name"
+msgstr "Nazwisko"
+
+msgid "Date of birth"
+msgstr "Data urodzenia"
+
+msgid "Contact"
+msgstr "Kontakt"
+
+msgid "E-mail"
+msgstr "E-mail"
+
+msgid "Phone"
+msgstr "Telefon"
+
+msgid "Website"
+msgstr "Strona internetowa"
+
+msgid "Current"
+msgstr "Aktualny"
+
+msgid "Delete"
+msgstr "Usuń"
+
+msgid "What a pity! You have no profile image defined in your identity card!"
+msgstr "Jaka szkoda! Nie masz ustawionego awatara!"
+
+msgid "Address"
+msgstr "Adres"
+
+msgid "Street"
+msgstr "Ulica"
+
+msgid "City"
+msgstr "Miejscowość"
+
+msgid "Postal code"
+msgstr "Kod pocztowy"
+
+msgid "Country"
+msgstr "Kraj"
+
+msgid "Biography"
+msgstr "Biografia"
+
+msgid "Important notice"
+msgstr "Ważna uwaga"
+
+msgid "Be careful of the information you write into your profile, because it could be accessed by everyone (even someone you don't want to)."
+msgstr "Uważaj jakie informację wpisujesz w swoim profilu ponieważ każdy może je zobaczyć (nawet ktoś niepożądany)"
+
+msgid "Not everything is private on XMPP; this is one of those things, your public profile (vCard)."
+msgstr "W XMPP nie wszystko jest prywatne; to jedna z takich rzeczy, Twój publiczny profil (vCard)."
+
+msgid "It is strongly recommended to upload a profile image (%s maximum), like a picture of yourself, because that makes you easily recognizable by your friends."
+msgstr "Zaleca się, aby przesłać obrazek profilowy (maksymalnie %s), w formie zdjęcia siebie samego, bo sprawi, że będziesz łatwo rozpoznawalny przez znajomych."
+
+msgid "Save"
+msgstr "Zapisz"
+
+msgid "Cancel"
+msgstr "Anuluj"
+
+msgid "Edit options"
+msgstr "Edytuj opcje"
+
+msgid "Channel"
+msgstr "Kanał"
+
+msgid "Commands"
+msgstr "Komendy"
+
+msgid "Sounds"
+msgstr "Dźwięki"
+
+msgid "Privacy"
+msgstr "Prywatność"
+
+msgid "Message archiving"
+msgstr "Archiwizacja wiadomości"
+
+msgid "Store a history of your chats"
+msgstr "Przechowuj historię rozmów"
+
+msgid "Geolocation"
+msgstr "Geolokalizacja"
+
+msgid "Empty"
+msgstr "Pusty"
+
+msgid "Empty channel"
+msgstr "Pusty kanał"
+
+msgid "Persistent"
+msgstr "Trwałe"
+
+msgid "Maximum notices"
+msgstr "Maksymalnie powiadomień"
+
+msgid "Account"
+msgstr "Konto"
+
+msgid "Change password"
+msgstr "Zmień hasło"
+
+msgid "Delete account"
+msgstr "Usuń konto"
+
+msgid "Old"
+msgstr "Stary"
+
+msgid "New (2 times)"
+msgstr "Nowe (dwa razy)"
+
+msgid "Continue"
+msgstr "Kontynuuj"
+
+msgid "To"
+msgstr "Do"
+
+msgid "Close"
+msgstr "Zamknij"
+
+msgid "unknown"
+msgstr "nieznany"
+
+msgid "Unavailable"
+msgstr "Niedostępny"
+
+msgid "is now"
+msgstr "jest teraz"
+
+msgid "Please wait while your avatar is uploaded..."
+msgstr "Proszę czekać, Twój awatar jest ładowany..."
+
+msgid "Here it is! A new beautiful profile image!"
+msgstr "Oto i on! Piękny awatar!"
+
+msgid "The image file is not supported or has a bad size."
+msgstr "Format obrazka jest niepoprawny lub obrazek ma zły rozmiar."
+
+msgid "Reply"
+msgstr "Odpowiedz"
+
+msgid "Error"
+msgstr "Błąd"
+
+msgid "Click here to solve the error"
+msgstr "Kliknij tutaj aby rozwiązać problem"
+
+msgid "You"
+msgstr "Ty"
+
+msgid "Remove"
+msgstr "Usuń"
+
+msgid "Rename"
+msgstr "Zmień nazwę"
+
+msgid "Hi, I am %s, I would like to add you as my friend."
+msgstr "Cześć, jestem %s, chciałbym abyś dodał mnie do swoich znajomych."
+
+msgid "Smiley insertion"
+msgstr "Wstaw emotikonę"
+
+msgid "Change style"
+msgstr "Zmień styl"
+
+msgid "Text in bold"
+msgstr "Pogrubiony tekst"
+
+msgid "Text in italic"
+msgstr "Pochyły tekst"
+
+msgid "Underlined text"
+msgstr "Podkreślony tekst"
+
+msgid "Save chat"
+msgstr "Zapisz rozmowę"
+
+msgid "Click on the following link to get the chat log, and wait. Then click again to get the file."
+msgstr "Kliknij poniższy link aby utworzyć zapis rozmowy i poczekaj. Później kliknij ponownie aby pobrać plik."
+
+msgid "This chat is empty!"
+msgstr "Ten czat jest pusty!"
+
+msgid "Generate file!"
+msgstr "Wygeneruj plik!"
+
+msgid "Download file!"
+msgstr "Pobierz plik!"
+
+msgid "Clean current chat"
+msgstr "Wyczyść okno rozmowy"
+
+msgid "View chat history"
+msgstr "Zobacz historię rozmów"
+
+msgid "Show user profile"
+msgstr "Pokaż profil użytkownika"
+
+msgid "Add this contact to your friends"
+msgstr "Dodaj kontakt do znajomych"
+
+msgid "Add this groupchat to your favorites"
+msgstr "Dodaj ten pokój do ulubionych"
+
+msgid "All tabs"
+msgstr "Wszystkie zakładki"
+
+msgid "Close this tab"
+msgstr "Zamknij tą zakładkę"
+
+msgid "no subject defined for this room."
+msgstr "nie określono tematu dla tego pokoju."
+
+msgid "Administration panel for this room"
+msgstr "Panel administratora tego pokoju"
+
+msgid "Moderators"
+msgstr "Moderatorzy"
+
+msgid "Participants"
+msgstr "Uczestnicy"
+
+msgid "Visitors"
+msgstr "Odwiedzający"
+
+msgid "Manage favorite rooms"
+msgstr "Zarządzaj ulubionymi pokojami"
+
+msgid "Change favorites"
+msgstr "Zmień ulubione"
+
+msgid "Search a room"
+msgstr "Wyszukaj pokój"
+
+msgid "Select a favorite"
+msgstr "Wybierz ulubiony"
+
+msgid "Getting the name..."
+msgstr "Pobieranie nazwy..."
+
+msgid "Gateway"
+msgstr "Brama"
+
+msgid "Name"
+msgstr "Nazwa"
+
+msgid "Room"
+msgstr "Pokój"
+
+msgid "Add"
+msgstr "Dodaj"
+
+msgid "Edit"
+msgstr "Edytuj"
+
+msgid "Search a room on"
+msgstr "Szukaj pokoju na"
+
+msgid "No room found on this server."
+msgstr "Nie znaleziono pokoju na tym serwerze."
+
+msgid "Service discovery"
+msgstr "Przeglądarka usług"
+
+msgid "Server to query"
+msgstr "Serwer do odpytania"
+
+msgid "Sorry, but the entity didn't return any result!"
+msgstr ""
+
+msgid "Accounts"
+msgstr "Konta"
+
+msgid "Authentications"
+msgstr "Autentykacja"
+
+msgid "Automation"
+msgstr "Automatyzacja"
+
+msgid "Clients"
+msgstr "Klienci"
+
+msgid "Collaboration"
+msgstr "Współpraca"
+
+msgid "Components"
+msgstr "Komponenty"
+
+msgid "Rooms"
+msgstr "Pokoje"
+
+msgid "Directories"
+msgstr "Katalogi"
+
+msgid "Gateways"
+msgstr "Bramki"
+
+msgid "News"
+msgstr "Wiadomości"
+
+msgid "Hierarchy"
+msgstr "Hierarchia"
+
+msgid "Proxies"
+msgstr "Pośrednicy"
+
+msgid "Publication/Subscription"
+msgstr "Publikacje/subskrypcje"
+
+msgid "Storage"
+msgstr "Magazynowanie"
+
+msgid "Service offline or broken"
+msgstr "Usługa niedostępna bądź uszkodzona"
+
+msgid "Your inbox"
+msgstr "Twoja skrzynka odbiorcza"
+
+msgid "Available actions"
+msgstr "Dostępne działania"
+
+msgid "Clean"
+msgstr "Wyczyść"
+
+msgid "New"
+msgstr "Nowy"
+
+msgid "Received"
+msgstr "Odebrane"
+
+msgid "Subject"
+msgstr "Temat"
+
+msgid "Content"
+msgstr "Treść"
+
+msgid "Send message"
+msgstr "Wyślij wiadomość"
+
+msgid "Your inbox is empty."
+msgstr "Twoja skrzynka odbiorcza jest pusta."
+
+msgid "MUC administration"
+msgstr "Administracja MUC"
+
+msgid "You administrate this room"
+msgstr "Administrujesz tym pokojem"
+
+msgid "Enter new subject"
+msgstr "Podaj nowy temat"
+
+msgid "Configuration"
+msgstr "Konfiguracja"
+
+msgid "Authorizations"
+msgstr "Autoryzacja"
+
+msgid "Member list"
+msgstr "Lista członków"
+
+msgid "Owner list"
+msgstr "Lista właścicieli"
+
+msgid "Administrator list"
+msgstr "Lista administratorów"
+
+msgid "Outcast list"
+msgstr "Lista wykluczonych"
+
+msgid "Add an input"
+msgstr "Dodaj wpis"
+
+msgid "Destroy this MUC"
+msgstr "Usuń ten MUC"
+
+msgid "Yes, let's do it!"
+msgstr "Tak, zróbmy to!"
+
+msgid "Your friend is paying attention to the conversation."
+msgstr "Twój znajomy przygląda się rozmowie."
+
+msgid "Your friend is writing a message..."
+msgstr "Twój znajomy pisze wiadomość..."
+
+msgid "Your friend stopped writing a message."
+msgstr "Twój znajomy przestał pisać."
+
+msgid "Your friend is doing something else."
+msgstr "Twój znajomy robi coś innego."
+
+msgid "Your friend closed the chat."
+msgstr "Twój znajomy zamknął rozmowę."
+
+msgid "Requesting this service..."
+msgstr "Żądanie usługi..."
+
+msgid "Loading"
+msgstr "Ładowanie"
+
+msgid "joined the chat room"
+msgstr "dołączył(a) do czatu"
+
+msgid "left the chat room"
+msgstr "opuścił(a) czat"
+
+msgid "no status"
+msgstr "brak statusu"
+
+msgid "has been kicked"
+msgstr "został(a) wyrzucony"
+
+msgid "has been banned"
+msgstr "został(a) zbanowany"
+
+msgid "no reason"
+msgstr "brak powodu"
+
+msgid "Communicate with the entire world!"
+msgstr "Rozmawiaj z całym światem!"
+
+msgid "It allows you to get in touch with the millions of users who currently use the XMPP network like you do with Jappix. Join the community and stay free!"
+msgstr "Pozwala Ci być w kontakcie z milionami użytkowników, którzy używają obecnie sieci XMPP, tak jak Ty obecnie łączysz się doń przez Jappixa. Dołącz do społeczności i stań się wolny!"
+
+msgid "Hi there!"
+msgstr "Cześć wam!"
+
+msgid "Welcome on %1s, “%2s”."
+msgstr "Witamy na %1s, “%2s“."
+
+msgid "Login to your existing XMPP account or create a new one for free!"
+msgstr "Zaloguj się do swojego konta XMPP lub stwórz nowe - za darmo!"
+
+msgid "Jappix is an open-source project from PostPro, a non-profit organization which provides us a great help."
+msgstr "Jappix to projekt open-source od PostPro - organizacja non-profit która służy wspaniałą pomocą."
+
+msgid "Login to your existing XMPP account. You can also use the %s to join a groupchat."
+msgstr "Zaloguj się do twojego istniejącego konta XMPP. Możesz również użyć %s aby dołączyć do pokojów czatowych."
+
+msgid "Previous"
+msgstr "Poprzedni"
+
+msgid "General"
+msgstr "Ogólny"
+
+msgid "Advanced"
+msgstr "Zaawansowane"
+
+msgid "Resource"
+msgstr "Zasób"
+
+msgid "Priority"
+msgstr "Priorytet"
+
+msgid "Low"
+msgstr "Niski"
+
+msgid "Medium"
+msgstr "Średni"
+
+msgid "High"
+msgstr "Wysoki"
+
+msgid "Enter the groupchat you want to join and the nick you want to have. You can also go back to the %s."
+msgstr "Dołącz do dowolnego czatu z nickiem, który chcesz mieć. Możesz też wrócić do %s."
+
+msgid "login page"
+msgstr "strona logowania"
+
+msgid "Share this link with your friends:"
+msgstr "Podziel się linkiem z przyjaciółmi:"
+
+msgid "Register a new XMPP account to join your friends on your own social cloud. That's simple!"
+msgstr "Załóż nowe konto XMPP by dołączyć do twoich przyjaciół w twojej własnej społeczności. To proste!"
+
+msgid "Required"
+msgstr "Wymagane"
+
+msgid "You have been registered, here is your XMPP address:"
+msgstr "Rejestracja przebiegła pomyślnie! Oto Twój adres XMPP:"
+
+msgid "Manager"
+msgstr "Menedżer"
+
+msgid "Project"
+msgstr "Projekt"
+
+msgid "Encrypted"
+msgstr "Szyfrowane"
+
+msgid "Unencrypted"
+msgstr "Nieszyfrowane"
+
+msgid "Where are you?"
+msgstr "Gdzie jesteś?"
+
+msgid "What's up with you?"
+msgstr "Co u Ciebie słychać?"
+
+msgid "Fetching the social channel..."
+msgstr "Pobieranie kanału publicznego..."
+
+msgid "You are synchronized with your network."
+msgstr "Jesteś połączony ze swoją siecią."
+
+msgid "Cannot send anything: you can only receive notices!"
+msgstr "Nie można nic wysłać: możesz jedynie otrzymywać powiadomienia!"
+
+msgid "Media viewer"
+msgstr "Odtwarzacz multimediów"
+
+msgid "Browse"
+msgstr "Przeglądaj"
+
+msgid "Command"
+msgstr "Komenda"
+
+msgid "Subscribe"
+msgstr "Subskrybuj"
+
+msgid "Join"
+msgstr "Dołącz"
+
+msgid "Automatic"
+msgstr "Automatycznie"
+
+msgid "Search"
+msgstr "Szukaj"
+
+msgid "No result!"
+msgstr "Brak wyników!"
+
+msgid "No notifications."
+msgstr "Brak powiadomień."
+
+msgid "would like to add you as a friend."
+msgstr "chciałby dodać Cię jako znajomego."
+
+msgid "would like you to join this chatroom:"
+msgstr "chciałby prosić Cię o dołączenie do tego pokoju: "
+
+msgid "Do you accept?"
+msgstr "Czy się zgadzasz?"
+
+msgid "Yes"
+msgstr "Tak"
+
+msgid "No"
+msgstr "Nie"
+
+msgid "would like to get authorization."
+msgstr "prosi o autoryzację."
+
+msgid "Do you want to see the friends %s suggests you?"
+msgstr ""
+
+msgid "Submit"
+msgstr "Wyślij"
+
+msgid "Client"
+msgstr "Klient"
+
+msgid "System"
+msgstr "System"
+
+msgid "Local time"
+msgstr "Czas lokalny"
+
+msgid "Comments"
+msgstr "Komentarze"
+
+msgid "User profile"
+msgstr "Profil użytkownika"
+
+msgid "See his/her position on the globe"
+msgstr "Zobacz jej/jego położenie geograficzne"
+
+msgid "Confirm"
+msgstr "Potwierdź"
+
+msgid "anonymous mode"
+msgstr "tryb anonimowy"
+
+msgid "Groups"
+msgstr "Grupy"
+
+msgid "Unclassified"
+msgstr "Nieklasyfikowane"
+
+msgid "Authorize"
+msgstr "Autoryzuj"
+
+msgid "Ask for authorization"
+msgstr "Zapytaj o autoryzację"
+
+msgid "Unblock"
+msgstr "Odblokuj"
+
+msgid "Prohibit"
+msgstr "Zabroń"
+
+msgid "Block"
+msgstr "Blokuj"
+
+msgid "Chat"
+msgstr "Rozmowa"
+
+msgid "Groupchat"
+msgstr "Rozmowa grupowa"
+
+msgid "Jappix Mobile"
+msgstr "Jappix Mobile"
+
+msgid "Desktop"
+msgstr "Desktop"
+
+msgid "Mobile"
+msgstr "Mobilny"
+
+msgid "Please wait..."
+msgstr "Proszę czekać..."
+
+msgid "Please enable JavaScript"
+msgstr "Proszę włączyć JavaScript"
+
+msgid "Your channel"
+msgstr "Twój kanał"
+
+msgid "Channel of"
+msgstr "Kanał"
+
+msgid "More notices..."
+msgstr "Więcej powiadomień..."
+
+msgid "Attach a file"
+msgstr "Załącz plik"
+
+msgid "Send"
+msgstr "Wyślij"
+
+msgid "Unattach the file"
+msgstr "Odłącz plik"
+
+msgid "An error occured while uploading your file: maybe it is too big (%s maximum) or forbidden!"
+msgstr "Wystąpił błąd podczas wysyłania pliku: możliwe że jest zbyt duży (maksymalnie %s) bądź zablokowany!"
+
+msgid "Authorization failed"
+msgstr "Autoryzacja nie powiodła się"
+
+msgid "Registration failed, please choose a different username"
+msgstr "Rejestracja nie powiodła się, proszę wybrać inną nazwę użytkownika"
+
+msgid "Service unavailable"
+msgstr "Usługa niedostępna"
+
+msgid "Internal server error, try later"
+msgstr "Wewnętrzny błąd serwera, proszę spróbować później."
+
+msgid "Your form has been sent."
+msgstr "Twój formularz został wysłany."
+
+msgid "Application"
+msgstr "Aplikacja"
+
+msgid "XMPP links"
+msgstr "linki XMPP"
+
+msgid "Open XMPP links with Jappix"
+msgstr "Otwieraj linki XMPP w Jappix"
+
+msgid "changed the subject to:"
+msgstr "zmień temat na:"
+
+msgid "Welcome!"
+msgstr "Witamy!"
+
+msgid "Friends"
+msgstr "Znajomi"
+
+msgid "Welcome on Jappix, your own social cloud!"
+msgstr "Witaj w Jappix-ie, Twojej własnej socjalnej chmurze!"
+
+msgid "Before you start using it, you will have to change some settings, search for friends and complete your profile."
+msgstr "Zanim zaczniesz tego używać, musisz zmienić niektóre ustawienia, znaleźć znajomych i uzupełnić swój profil."
+
+msgid "Enable notification sounds"
+msgstr "Włącz powiadomienia dźwiękowe"
+
+msgid "Share your position on the globe"
+msgstr "Dziel się swoją aktualną pozycją"
+
+msgid "Offline friends"
+msgstr "Rozłączeni znajomi"
+
+msgid "Don't hide offline friends"
+msgstr "Nie ukrywaj rozłączonych znajomych"
+
+msgid "Use this tool to find your friends on the server you are using right now, or add them later."
+msgstr "Użyj tego narzędzia do znalezienia Twoich znajomych na serwerze, którego używasz, lub dodaj ich później."
+
+msgid "Great work! Now, you can share Jappix with your friends!"
+msgstr ""
+
+msgid "When you will press the save button, the profile editor will be opened. Happy socializing!"
+msgstr ""
+
+msgid "Share Jappix on %s"
+msgstr ""
+
+msgid "Using Jappix, an open social platform. I am %s!"
+msgstr ""
+
+msgid "Unknown name"
+msgstr "Nazwa nieznana"
+
+msgid "Unknown country"
+msgstr "Kraj nieznany"
+
+msgid "Click to enable"
+msgstr "Kliknij by włączyć"
+
+msgid "Click to disable"
+msgstr "Kliknij by wyłączyć"
+
+msgid "Installation"
+msgstr "Instalacja"
+
+msgid "Jappix installation"
+msgstr "Instalacja Jappixa"
+
+msgid "Welcome to the Jappix installation!"
+msgstr "Witaj w instalacji Jappix!"
+
+msgid "This tool will help you fastly install Jappix, the first full-featured XMPP-based social platform, on your server. You don't even need any technical knowledge."
+msgstr "To narzędzie pomoże Ci szybko zainstalować Jappix-a, pierwszą platformę społecznościową opartą o protokół XMPP."
+
+msgid "Let's have a look at the installation steps:"
+msgstr "Zobaczmy kroki instalacji:"
+
+msgid "Welcome"
+msgstr "Witamy"
+
+msgid "Storage configuration"
+msgstr "Konfiguracja folderów"
+
+msgid "Administrator account"
+msgstr "Konto administratora"
+
+msgid "Main configuration"
+msgstr "Konfiguracja główna"
+
+msgid "Hosts configuration"
+msgstr "Konfiguracja hostów"
+
+msgid "Services installation"
+msgstr "Instalacja usług"
+
+msgid "If the current language does not match yours (%1s), you can make Jappix speak %2s it will be saved."
+msgstr "Jeśli aktualny język Ci nie pasuję (%1s), możesz zmienić go na %2s."
+
+msgid "If you want to get some help about the Jappix installation and configuration, you can use our whole documentation, available at:"
+msgstr "Jeśli potrzebujesz więcej informacji dotyczących instalacji i konfiguracji Jappixa, możesz użyć dokumentacji dostępnej pod adresem:"
+
+msgid "It's time to build your own social cloud: just go to the next step!"
+msgstr "Już pora zbudować twoją własną socjalną chmórę: przejdź do następnego kroku!"
+
+msgid "Jappix stores persistent data (such as shared files, chat logs, your own music and its configuration) into a single secured storage folder."
+msgstr "Jappix przechowuje stałe dane (takie jak publikowane pliki, archiwa rozmów, pliki dźwiękowe wraz z konfiguracją) w jednym zabezpieczonym folderze."
+
+msgid "Jappix must be able to write in this folder to create its sub-directories. If not, you must set the rights to %1s or change the folder owner to %2s (depending of your configuration)."
+msgstr "Jappix musi mieć możliwość zapisu w tym folderze aby móc stworzyć w nim pod-foldery. Jeśli nie, musisz ustawić prawa na %1s lub zmienić właściciela folderu na %2s (w zależności od konfiguracji)"
+
+msgid "The folder is writable, you can continue!"
+msgstr "Można zapisywać w folderze, możesz kontynuować!"
+
+msgid "Jappix offers you the possibility to manage your configuration, install new addons or search for updates. That's why you must create an administrator account to access the manager."
+msgstr "Jappix oferuje Ci możliwość zarządzania konfiguracją, instalacji nowych addonów lub sprawdzania aktualizacji. To właśnie dlatego musisz stworzyć konto administratora."
+
+msgid "When Jappix will be installed, just click on the manager link on the home page to access it."
+msgstr "Kiedy Jappix będzie już zainstalowany, kliknij w link Menedżer na stronie głównej."
+
+msgid "Oops, you missed something or the two passwords do not match!"
+msgstr "Ups! coś pominięto lub hasła nie pasują do siebie!"
+
+msgid "Jappix needs that you specify some values to work. Please correct the following inputs (or keep the default values, which are sufficient for most people)."
+msgstr "Jappix wymaga wprowadzenia niektórych danych. Proszę poprawić następujące dane (lub pozostaw domyślne wartości, które są wystarczające dla większości ludzi)."
+
+msgid "Note that if you don't specify a value which is compulsory, it will be automatically completed with the default one."
+msgstr "Jeśli nie wypełnisz wymaganego pola, zostanie ono automatycznie wypełnione domyślną wartością."
+
+msgid "User"
+msgstr "Użytkownik"
+
+msgid "Service"
+msgstr "Usługa"
+
+msgid "Service name"
+msgstr "Nazwa usługi"
+
+msgid "Service description"
+msgstr "Opis usługi"
+
+msgid "Connection"
+msgstr "Połączenie"
+
+msgid "Lock the host"
+msgstr "Zablokuj hosta"
+
+msgid "Anonymous mode"
+msgstr "Tryb anonimowy"
+
+msgid "Registration allowed"
+msgstr "Rejestracja włączona"
+
+msgid "Use a proxy"
+msgstr "Użyj serwera proxy"
+
+msgid "Encryption"
+msgstr "Szyfrowanie"
+
+msgid "HTTPS storage"
+msgstr "Magazyn HTTPS"
+
+msgid "Force HTTPS"
+msgstr "Wymuś HTTPS"
+
+msgid "Compression"
+msgstr "Kompresja"
+
+msgid "This page helps you specify the default hosts Jappix will connect to. You can leave it as it is and continue if you want to use the official service hosts."
+msgstr "Ta strona pomoże Ci ustawić domyślne hosty, do których Jappix będzie się łączyć. Możesz zostawić to tak jak jest i kontynuować jeśli chcesz korzystać z oficjalnych hostów."
+
+msgid "Maybe you don't know what a BOSH server is? In fact, this is a relay between a Jappix client and a XMPP server, which is necessary because of technical limitations."
+msgstr "Być może nie wiesz czym jest serwer BOSH? Jest to swoisty most łączący klienta Jappix-a i serwer XMPP. Jest on niezbędny ze względów technicznych."
+
+msgid "Main host"
+msgstr "Host główny"
+
+msgid "Groupchat host"
+msgstr "Host rozmów grupowych"
+
+msgid "Anonymous host"
+msgstr "Host anonimowy"
+
+msgid "Directory host"
+msgstr ""
+
+msgid "BOSH host"
+msgstr "host BOSH"
+
+msgid "You can install some extra softwares on your server, to extend your Jappix features. Some others might be modified, because of security restrictions which are set by default."
+msgstr "Możesz zainstalować dodatkowe oprogramowanie na serwerze, które wzbogaci możliwości Jappix-a. Inne może być zmodyfikowane ze względu na domyślne ustawienia prywatności."
+
+msgid "To perform this, you must be able to access your server's shell and be logged in as root. Remember this is facultative, Jappix will work without these modules, but some of its features will be unavailable."
+msgstr "Aby to wykonać, musisz mieć dostęp do shella na swoim serwerze i być zalogowanym jako root. Pamiętaj, że jest to opcjonalne, Jappix będzie działać bez tych modułów ale niektóre z jego możliwości będą niedostępne."
+
+msgid "After you finished the setup, Jappix will generate the cache files. It might be slow, just wait until the application is displayed and do not press any button."
+msgstr "Po skonfigurowaniu, Jappix wygeneruje pliki cache. Może to długo potrwać, poczekaj aż aplikacja będzie pokazana i nie wciskaj żadnego klawisza."
+
+msgid "Thanks for using Jappix!"
+msgstr "Dziękujemy za używanie Jappix!"
+
+msgid "Next"
+msgstr "Dalej"
+
+msgid "Finish"
+msgstr "Koniec"
+
+msgid "Check again"
+msgstr "Sprawdź ponownie"
+
+msgid "The folder is not writable, set the right permissions to the %s directory."
+msgstr "Folder nie jest zapisywalny, ustaw odpowiednie uprawienia dla folderu %s."
+
+msgid "%s is installed on your system."
+msgstr "%s jest zainstalowane w Twoim systemie."
+
+msgid "%1s is not installed on your system, you should install %2s."
+msgstr "%1s nie jest zainstalowane w Twoim systemie."
+
+msgid "PHP maximum upload size is sufficient (%s)."
+msgstr "Maksymalny rozmiar wysyłanego pliku ustawiony dla PHP jest wystarczający (%s)"
+
+msgid "PHP maximum upload size is not sufficient (%1s), you should define it to %2s in %3s."
+msgstr "Maksymalny rozmiar wysyłanego pliku ustawiony dla PHP jest niewystarczający (%1s), powinieneś ustawić go na %2s w %3s."
+
+msgid "Jappix manager"
+msgstr "Menedżer Jappix"
+
+msgid "Manager access"
+msgstr "Dostęp menadżera"
+
+msgid "Statistics"
+msgstr "Statystyki"
+
+msgid "Hosts"
+msgstr "Hosty"
+
+msgid "Design"
+msgstr "Wygląd"
+
+msgid "Repeat"
+msgstr "Powtarzanie"
+
+msgid "All"
+msgstr "Wszystko"
+
+msgid "Horizontal"
+msgstr "Poziomo"
+
+msgid "Vertical"
+msgstr "Pionowo"
+
+msgid "Center"
+msgstr "Środek"
+
+msgid "Left"
+msgstr "Lewa"
+
+msgid "Right"
+msgstr "Prawa"
+
+msgid "Top"
+msgstr "Góra"
+
+msgid "Bottom"
+msgstr "Dół"
+
+msgid "Adapt"
+msgstr "Przystosuj"
+
+msgid "Color"
+msgstr "Kolor"
+
+msgid "Users"
+msgstr "Użytkownicy"
+
+msgid "Updates"
+msgstr "Akrualizacje"
+
+msgid "This is a restricted area: only the authorized users can manage this Jappix node."
+msgstr "Strefa zamknięta: tylko autoryzowani użytkownicy mogą zarządzać ustawieniami instalacji Jappix-a."
+
+msgid "Please use the form below to login to the administration panel."
+msgstr "Użyj poniższego formularza aby zalogować się do panelu administracyjnego."
+
+msgid "To improve security, sessions are limited in time and when your browser will be closed, you will be logged out."
+msgstr "W celu zwiększenia bezpieczeństwa, sesje są ograniczone czasowo - kiedy wyłączysz przeglądarke, zostaniesz wylogowany."
+
+msgid "Credentials"
+msgstr "Uprawnienia"
+
+msgid "You have been logged out. Goodbye!"
+msgstr "Zostałeś wylogowany. Żegnaj!"
+
+msgid "Oops, you could not be recognized as a valid administrator. Check your credentials!"
+msgstr "Ups. Nie zostałeś rozpoznany jako administrator, Sprawdź swoje uprawnienia!"
+
+msgid "Basic statistics are processed by Jappix about some important things, you can find them below."
+msgstr "Poniżej znajdziesz podstawowe statystyki instalacji Jappix-a."
+
+msgid "Change your Jappix node configuration with this tool."
+msgstr "Za pomocą tego narzędzia możesz zmienić ustawienia instalacji Jappix-a."
+
+msgid "Change the XMPP hosts that this Jappix node serve with this tool."
+msgstr "Zmień hosty XMPP, z którymi ma współpracować ta instalacja Jappix-a."
+
+msgid "All this Jappix node stored files can be managed with this tool: please select a sub-folder and start editing its content!"
+msgstr "Za pomocą tego narzędzia możesz zarządzać wszystkimi zgromadzonymi przez Jappix-a plikami: proszę wybrać pod-folder i rozpocząć edycję zawartości!"
+
+msgid "Jappix is fully customisable: you can change its design right here."
+msgstr "Jappix jest w pełni dostosowywalny: tu możesz zmienić jego wygląd."
+
+msgid "This is not a valid image, please use PNG, GIF or JPG!"
+msgstr "To nie jest poprawny obrazek, proszę użyć PNG, GIF lub JPG!"
+
+msgid "The image could not be received, would you mind retry?"
+msgstr "Obrazek nie został pobrany, czy mógł byś spróbować ponownie?"
+
+msgid "Your image was added to the list!"
+msgstr "Twój obrazek został dodany do listy!"
+
+msgid "Changes saved!"
+msgstr "Zmiany zapisane!"
+
+msgid "You can define more than one administrator for this Jappix node. You can also change a password with this tool."
+msgstr "Możesz ustawić więcej niż jednego administratora dla tej instalacji Jappix-a. Z pomocą tego narzędzia możesz też zmienić hasło."
+
+msgid "Update your Jappix node with this tool, or check if a new one is available. Informations about the latest version are also displayed (in english)."
+msgstr "Za pomocą tego narzędzia możesz zaktualizować swoją instalacje Jappix-a lub sprawdzić, czy dostępne są nowe wersje."
+
+msgid "Access statistics"
+msgstr "Statystyki odwiedzin"
+
+msgid "Share statistics"
+msgstr "Statystyki udostępniania"
+
+msgid "Other statistics"
+msgstr "Inne statystyki"
+
+msgid "January"
+msgstr "Styczeń"
+
+msgid "February"
+msgstr "Luty"
+
+msgid "March"
+msgstr "Marzec"
+
+msgid "April"
+msgstr "Kwiecień"
+
+msgid "May"
+msgstr "Maj"
+
+msgid "June"
+msgstr "Czerwiec"
+
+msgid "July"
+msgstr "Lipiec"
+
+msgid "August"
+msgstr "Sierpień"
+
+msgid "September"
+msgstr "Wrzesień"
+
+msgid "October"
+msgstr "Październik"
+
+msgid "November"
+msgstr "Listopad"
+
+msgid "December"
+msgstr "Grudzień"
+
+msgid "Monday"
+msgstr "Poniedziałek"
+
+msgid "Tuesday"
+msgstr "Wtorek"
+
+msgid "Wednesday"
+msgstr "Środa"
+
+msgid "Thursday"
+msgstr "Czwartek"
+
+msgid "Friday"
+msgstr "Piątek"
+
+msgid "Saturday"
+msgstr "Sobota"
+
+msgid "Sunday"
+msgstr "Niedziela"
+
+msgid "Total"
+msgstr "Łącznie"
+
+msgid "Cache"
+msgstr "Cache"
+
+msgid "Logs"
+msgstr "Logi"
+
+msgid "Music"
+msgstr "Muzyka"
+
+msgid "Backgrounds"
+msgstr "Tła"
+
+msgid "Share"
+msgstr "Podziel się"
+
+msgid "Background"
+msgstr "Tło"
+
+msgid "Notice"
+msgstr "Informacja"
+
+msgid "Your design preferences have been saved!"
+msgstr "Ustawienia wyglądu zostały zapisane!"
+
+msgid "Please check your inputs: something is missing!"
+msgstr "Proszę sprawdzić wprowadzone dane: coś jest nie tak!"
+
+msgid "Change your Jappix node background with this tool. You can either set a custom color or an uploaded image. Let your creativity flow!"
+msgstr "Za pomocą tego narzędznia zmienisz tło w swojej instalacji Jappix-a. Możesz albo ustawić kolor albo wgrać obrazek. "
+
+msgid "Use default background"
+msgstr "Użyj domyślnego tła"
+
+msgid "Use your own image"
+msgstr "Użyj własnego obrazka"
+
+msgid "Select a background to use and change the display options."
+msgstr "Wybierz tło i zmień ustawienia wyświetlania."
+
+msgid "Use your own color"
+msgstr "Użyj własnego koloru."
+
+msgid "Type the hexadecimal color value you want to use as a background."
+msgstr "Podaj wartość hex koloru, który chcesz użyć jako tło."
+
+msgid "Manage backgrounds"
+msgstr "Zarządzaj obrazkami tła"
+
+msgid "You can add a new background to the list with this tool. Please send a valid image."
+msgstr "Za pomocą tego narzędzia możesz dodać nowe tło do listy. Proszę wysłać poprawny obrazek."
+
+msgid "If you want to remove some backgrounds, use the browser below."
+msgstr "Jeśli chcesz usunąć niektóre tła, użyj poniższej przeglądarki."
+
+msgid "Define a homepage notice for all your users, such as a warn, an important message or an advert with this tool."
+msgstr "Ustaw wiadomość powitalną dla wszystkich swoich użytkowników. Np. ostrzeżenie, ważna aktualizacja czy reklama."
+
+msgid "Simple notice"
+msgstr "Zwykłe powiadomienie"
+
+msgid "This notice only needs simple text to be displayed, but no code is allowed!"
+msgstr "To powiadomienie potrzebuje tylko zwykłego tekstu, kod nie jest dozwolony!"
+
+msgid "Advanced notice"
+msgstr "Zaawansowane powiadomienie"
+
+msgid "You can customize your notice with embedded HTML, CSS and JavaScript, but you need to code the style."
+msgstr "Możesz dostosować powiadomienie za pomocą HTML, CSS i JavaScript  ale musisz zakodować wygląd."
+
+msgid "Available updates"
+msgstr "Dostępne aktualizacje"
+
+msgid "What's new?"
+msgstr "Co nowego?"
+
+msgid "Your storage folders are not writable, please apply the good rights!"
+msgstr ""
+
+msgid "%1s may cause problems to the proxy, please increase %2s value up to %3s!"
+msgstr ""
+
+msgid "You are using a development version of Jappix. Update it through our repository by executing: %s."
+msgstr ""
+
+msgid "A new Jappix version is available! Check what is new and launch the update!"
+msgstr "Nowa wersja Jappix-a jest dostępna! Sprawdź co nowego i uruchom aktualizator!"
+
+msgid "Your version is out to date. Update it now to %s by clicking here!"
+msgstr "Twoja wersja jest nieaktualna. Zaktualizuj ją do %s kilkając tu!"
+
+msgid "Your version seems to be up to date, but you can check updates manually by clicking here."
+msgstr "Wygląda na to, że Twoja wersja jest aktualna ale możesz sprawdzić ją ręcznie klikając tutaj."
+
+msgid "Check for updates"
+msgstr "Sprawdź aktualizacje"
+
+msgid "Update in progress"
+msgstr "Aktualizacja w toku."
+
+msgid "Jappix has been updated: you are now running the latest version. Have fun!"
+msgstr "Jappix został zaktualizowany: teraz używasz najnowszej wersji. Miłej zabawy!"
+
+msgid "The update has failed! Please try again later."
+msgstr "Aktualizacja nie powiodła się! Proszę spróbować później."
+
+msgid "Downloading package..."
+msgstr "Ściąganie paczki..."
+
+msgid "Removing current Jappix system files..."
+msgstr "Usuwanie plików systemowych Jappix-a..."
+
+msgid "Extracting package..."
+msgstr "Rozpakowywanie paczki..."
+
+msgid "Regenerating storage folder tree..."
+msgstr "Wygeneruj ponownie drzewo folderu magazynującego..."
+
+msgid "Jappix is now up to date!"
+msgstr "Jappix jest teraz zaktualizowany!"
+
+msgid "Aborted: socket error!"
+msgstr "Przerwano: błąd socket-a!"
+
+msgid "Aborted: buffer error!"
+msgstr "Przerwano: błąd bufora!"
+
+msgid "Aborted: everything is not writable!"
+msgstr "Przerwano: nie wszystko jest zapisywalne!"
+
+msgid "Aborted: could not extract the package!"
+msgstr "Przerwano: nie można rozpakować paczki!"
+
+msgid "Visits"
+msgstr "Wizyty"
+
+msgid "Daily"
+msgstr "Dziennie"
+
+msgid "Weekly"
+msgstr "Tygodniowo"
+
+msgid "Monthly"
+msgstr "Miesięcznie"
+
+msgid "Yearly"
+msgstr "Rocznie"
+
+msgid "Size"
+msgstr "Rozmiar"
+
+msgid "Clean everything"
+msgstr "Wyczyść wszystko"
+
+msgid "Purge cache"
+msgstr "Wyczyść cache"
+
+msgid "Purge logs"
+msgstr "Wyczyść logi"
+
+msgid "Purge updates"
+msgstr "Wyczyść aktualizacje"
+
+msgid "The storage folder you wanted to clean is now empty!"
+msgstr "Folder, który chciano wyczyścić jest teraz pusty!"
+
+msgid "Keep your Jappix node fresh and fast, clean the storage folders regularly!"
+msgstr "Utrzymuj swoją instalację Jappix-a świeżego i szybkiego, czyść foldery foldery 'store' regularnie!"
+
+msgid "Upload your music (Ogg Vorbis, MP3 or WAV) to be able to listen to it in Jappix!"
+msgstr "Wyślij swoją muzykę (Ogg Vorbis, MP3 lub WAV) i słuchaj jej w Jappix-ie!"
+
+msgid "The file you want to upload must be smaller than %s."
+msgstr "Plik, który chcesz wysłać, musi być mniejszy niż %s."
+
+msgid "Stay tuned in what your users store on your server and remove undesired content with this tool."
+msgstr "Bądź na bieżąco z tym, co Twoi użytkownicy przechowują na serwerze i za pomocą tego urządzenia usuwaj niepożądane treści."
+
+msgid "Title"
+msgstr "Tytuł"
+
+msgid "Artist"
+msgstr "Wykonawca"
+
+msgid "Album"
+msgstr "Album"
+
+msgid "File"
+msgstr "Plik"
+
+msgid "Upload"
+msgstr "Upload"
+
+msgid "The folder is empty."
+msgstr "Folder jest pusty,"
+
+msgid "The music could not be received, please retry!"
+msgstr "Muzyka nie została wczytana, proszę spróbować ponownie!"
+
+msgid "This is not a valid music file, please encode in Ogg Vorbis, MP3 or WAV!"
+msgstr "To nie jest poprawny plik muzyczny, proszę wysłać plik Ogg Vorbis, MP3 lub WAV!"
+
+msgid "Your music has been added!"
+msgstr "Twoja muzyja została dodana!"
+
+msgid "The selected elements have been removed."
+msgstr "Zaznaczone elementy zostały usunięte."
+
+msgid "You must select elements to remove!"
+msgstr "Musisz zaznaczyć elementy do usunięcia!"
+
+msgid "Add a new user with this tool, or change a password (type an existing username). Please submit a strong password!"
+msgstr "Za pomocą tego narzędzia dodasz nowego użytkownika lub zmienisz hasło (wpisz istniejącą nazwę użytkownika). Pamiętaj, żeby wybrać mocne hasło!"
+
+msgid "Manage"
+msgstr "Zarządzaj"
+
+msgid "List"
+msgstr "Lista"
+
+msgid "Remove users with this tool. Note that you cannot remove an user if he is the only one remaining."
+msgstr "Za pomocą tego narzędzia usuniesz użytkowników. Pamiętaj, że nie możesz usunąć użytkownika jeśli jest on jedynym pozostałym."
+
+msgid "The user has been added!"
+msgstr "Użytkownik został dodany!"
+
+msgid "The chosen users have been removed."
+msgstr "Wybrani użytkownicy zostali usunięci."
+
+msgid "You must select one or more users to be removed!"
+msgstr "Musisz wybrać jednego lub kilku użytkowników do usunięcia!"
+
+msgid "Yesterday"
+msgstr "Wczoraj"
+
+msgid "%s days ago"
+msgstr "%s dni temu"
+
+msgid "User currently active"
+msgstr "User jest aktualnie aktywny"
+
+msgid "Last seen: %s"
+msgstr "Ostatnio widziany: %s"
+
+msgid "Inactive since: %s"
+msgstr "Nieaktywny od: %s"
+
+msgid "Your friend seems not to have received your message(s)!"
+msgstr ""
+
+msgid "Static content server"
+msgstr ""
+
+msgid "This is the static content server for %1s, “%2s”."
+msgstr ""
+
+msgid "Suggested friends"
+msgstr ""
+
+msgid "Check all"
+msgstr "Zaznacz wszystkie"
+
+msgid "Uncheck all"
+msgstr "Odznacz wszystkie"
+
+msgid "Choose"
+msgstr "Wybierz"
+
+msgid "List name"
+msgstr "Nazwa listy"
+
+msgid "Allow"
+msgstr "Zezwól"
+
+msgid "Deny"
+msgstr "Zabroń"
+
+msgid "Group"
+msgstr ""
+
+msgid "Subscription"
+msgstr ""
+
+msgid "Both"
+msgstr ""
+
+msgid "From"
+msgstr ""
+
+msgid "Everybody"
+msgstr ""
+
+msgid "Send messages"
+msgstr ""
+
+msgid "Send queries"
+msgstr ""
+
+msgid "See my status"
+msgstr ""
+
+msgid "Send his/her status"
+msgstr ""
+
+msgid "Everything"
+msgstr ""
+
+msgid "Item"
+msgstr ""
+
+msgid "Order"
+msgstr ""
+
+msgid "Active for this session"
+msgstr ""
+
+msgid "Always active"
+msgstr ""
+
+msgid "User directory"
+msgstr ""
+
+msgid "Search a friend"
+msgstr ""
+
+msgid "The feature requested is not implemented by the recipient or server and therefore cannot be processed."
+msgstr ""
+
+msgid "This is a repeat from %s"
+msgstr ""
+
+msgid "Loading comments..."
+msgstr ""
+
+msgid "Type your comment here..."
+msgstr ""
+
+msgid "Could not get the comments!"
+msgstr ""
+
+msgid "Show comments"
+msgstr ""
+
+msgid "Send him/her a message"
+msgstr ""
+
+msgid "Start a chat with him/her"
+msgstr ""
+
+msgid "Media integration"
+msgstr ""
+
+msgid "Comments locked!"
+msgstr ""
+
+msgid "Type something you want to share with your friends..."
+msgstr ""
+
+msgid "changed his/her nickname to %s"
+msgstr ""
+
+msgid "commented an item you follow: “%s”."
+msgstr ""
+
+msgid "Hide"
+msgstr ""
+
+msgid "liked your post: “%s”."
+msgstr ""
+
+msgid "quoted you somewhere: “%s”."
+msgstr ""
+
+msgid "published on your wall: “%s”."
+msgstr ""
+
+msgid "tagged you in a photo (%s)."
+msgstr ""
+
+msgid "tagged you in a video (%s)."
+msgstr ""
+
+msgid "Show"
+msgstr ""
+
+msgid "Need help? You'd better read our documentation page about how to fill this form!"
+msgstr ""
+
+msgid "Pubsub host"
+msgstr ""
+
+msgid "Jappix is a great social platform, that you can access wherever you are, whenever you want and communicate with whovever you want."
+msgstr ""
+
+msgid "Manager link"
+msgstr ""
+
+msgid "User uploads server"
+msgstr ""
+
+msgid "This is the user uploads server for %1s, “%2s”."
+msgstr ""
+
+msgid "Logo"
+msgstr ""
+
+msgid "You can set your own service logo to replace the default one. Take care of the size and the main color of each logo!"
+msgstr ""
+
+msgid "Upload each logo with the recommended maximum pixel size."
+msgstr ""
+
+msgid "This is not a valid image, please use the PNG format!"
+msgstr ""
+
+msgid "Your service logo has been successfully changed!"
+msgstr ""
+
+msgid "Your logo format must be PNG. Leave a field empty and the logo will not be changed."
+msgstr ""
+
+msgid "Remove this logo"
+msgstr ""
+
+msgid "View this logo"
+msgstr ""
+
+msgid "Send a file"
+msgstr ""
+
+msgid "Once uploaded, your friend will be prompted to download the file you sent."
+msgstr ""
+
+msgid "Groupchats to join"
+msgstr ""
+
+msgid "Purge sent files"
+msgstr ""
+
+msgid "would like to send you a file: “%s”."
+msgstr ""
+
+msgid "has accepted to received your file: “%s”."
+msgstr ""
+
+msgid "has rejected to receive your file: “%s”."
+msgstr ""
+
+msgid "could not receive your file: “%s”."
+msgstr ""
+
+msgid "has received a file exchange request: “%s”."
+msgstr ""
+
+msgid "Available shortcuts:"
+msgstr ""
+
+msgid "%s removes the chat logs"
+msgstr ""
+
+msgid "%s joins a groupchat"
+msgstr ""
+
+msgid "%s closes the chat"
+msgstr ""
+
+msgid "%s shows the user profile"
+msgstr ""
+
+msgid "%s sends a message to the room"
+msgstr ""
+
+msgid "%s changes your nickname"
+msgstr ""
+
+msgid "%s sends a message to someone in the room"
+msgstr ""
+
+msgid "%s changes the room topic"
+msgstr ""
+
+msgid "%s kicks an user of the room"
+msgstr ""
+
+msgid "%s bans an user of the room"
+msgstr ""
+
+msgid "%s invites someone to join the room"
+msgstr ""
+
+msgid "Social channel, chat and more."
+msgstr ""
+
+msgid "Create your public profile."
+msgstr ""
+
+msgid "A mini-chat for your website."
+msgstr ""
+
+msgid "Get Jappix, get support."
+msgstr ""
+
+msgid "Statistics around Jappix."
+msgstr ""
+
+msgid "Download Jappix for free."
+msgstr ""
+
+msgid "Find a public Jappix node."
+msgstr ""
+
+msgid "Public profile"
+msgstr ""
+
+msgid "Your profile anywhere on the Web."
+msgstr ""
+
+msgid "%s is a Jappix.com service which makes your XMPP profile public. It is easier to share it. No XMPP account is required to view your social channel, your current position and your contact details."
+msgstr ""
+
+msgid "Furthermore, every picture you post in your social channel is added to a beautiful picture timeline. You can now view the pictures you shared year by year."
+msgstr ""
+
+msgid "You can also use your XMPP avatar as a single avatar for every website, blog and forum you use. When you change it on XMPP, the new avatar appears everywhere. What a genious improvement!"
+msgstr ""
+
+msgid "Yay, let's create my public profile!"
+msgstr ""
+
+msgid "Enable my public profile"
+msgstr ""
+
+#~ msgid "Jappix is a non-profit social platform, that you can access wherever you are, whenever you want and communicate with whovever you want."
+#~ msgstr "Jappix jest społecznościową platrofmą non-profit, za pomocą której możesz komunikować się z kim chcesz, kiedy chcesz i skąd chcesz."
+
+#~ msgid "See"
+#~ msgstr ""
+
+#~ msgid "Use default logo"
+#~ msgstr ""
+
+#~ msgid "Use your own logo"
+#~ msgstr ""
+
+#~ msgid "The recommended image format is PNG. Leave a field empty and the logo will not be changed."
+#~ msgstr ""
diff --git a/jappixmini/jappix/lang/pt-BR/LC_MESSAGES/main.mo b/jappixmini/jappix/lang/pt-BR/LC_MESSAGES/main.mo
new file mode 100644
index 00000000..3c4bad6b
Binary files /dev/null and b/jappixmini/jappix/lang/pt-BR/LC_MESSAGES/main.mo differ
diff --git a/jappixmini/jappix/lang/pt-BR/LC_MESSAGES/main.po b/jappixmini/jappix/lang/pt-BR/LC_MESSAGES/main.po
new file mode 100644
index 00000000..3541dda4
--- /dev/null
+++ b/jappixmini/jappix/lang/pt-BR/LC_MESSAGES/main.po
@@ -0,0 +1,1870 @@
+# Brazilian Portuguese translations for Jappix package.
+# This file is distributed under the same license as the Jappix package.
+# This file was translated from CodingTeam at <http://codingteam.net/>.
+msgid ""
+msgstr ""
+"Project-Id-Version: Jappix\n"
+"PO-Revision-Date: 2012-01-16 21:44+0100\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"POT-Creation-Date: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+
+msgid "JavaScript is missing in your web browser, so that you will not be able to launch Jappix! Please fix this."
+msgstr "JavaScript está faltando no seu navegador web, de modo que você não será capaz de lançar Jappix! Corrija isso."
+
+msgid "An open social network"
+msgstr "Uma rede social aberta"
+
+msgid "Jappix has been interrupted by a network issue, a bug or bad login (check that you entered the right credentials), sorry for the inconvenience."
+msgstr "Jappix foi interrompido por um problema de rede, um login errado (verifique se você inseriu as credenciais correta), Desculpe pelo transtorno."
+
+msgid "The element list on this server could not be obtained!"
+msgstr "A lista de elementos sobre esse servidor não pôde ser obtida!"
+
+msgid "Your password has been changed, now you can connect to your account with your new login data."
+msgstr "Sua senha foi mudada, agora você pode se conectar a sua conta com os seus dados de login nova."
+
+msgid "Your XMPP account has been removed, bye!"
+msgstr "Sua conta XMPP foi removida, tchau!"
+
+msgid "You have been logged out of your XMPP account, have a nice day!"
+msgstr "Você foi deslogado da sua conta XMPP,  tenha um bom dia!"
+
+msgid "The room you joined seems not to exist. You should create it!"
+msgstr "A sala em que você entrou parece não existir. Você deve cria-la!"
+
+msgid "The groupchat has been removed, now someone else will be able to recreate it."
+msgstr "O grupo de chat foi removido, agor alguém terá que recria-lo"
+
+msgid "The user that you want to reach is not present in the room."
+msgstr "O usuário com quem quer se comunicar não está presente na sala."
+
+msgid "Please enter the group chat address to join."
+msgstr "Por favor insira o endereço do grupo de chat para entrar."
+
+msgid "Please enter your nickname to join %s."
+msgstr "Por favor, digite um nome para se conectar em"
+
+msgid "This room (%s) is protected with a password."
+msgstr "Esta sala está protegida por uma senha."
+
+msgid "Your browser is out of date!"
+msgstr "Seu navegador esta desatualizado"
+
+msgid "Last %s version is better!"
+msgstr ""
+
+msgid "Login"
+msgstr "Logar"
+
+msgid "Register"
+msgstr "Registrar"
+
+msgid "Here we go!"
+msgstr "E lá vamos nós!"
+
+msgid "Server"
+msgstr "Servidor"
+
+msgid "Password"
+msgstr "Senha"
+
+msgid "Remember me"
+msgstr "Me lembrar"
+
+msgid "This tool has been disabled, you cannot use it!"
+msgstr "Esta ferramenta foi desativada. Você não pode usá-la!"
+
+msgid "Due to a network issue, you were disconnected. What do you want to do now?"
+msgstr "Devido à problemas de rede, você foi desconectado. O que você quer fazer agora?"
+
+msgid "Reconnect"
+msgstr "Reconectar"
+
+msgid "Messages"
+msgstr "Mensagens"
+
+msgid "Profile"
+msgstr "Perfil"
+
+msgid "Options"
+msgstr "Opções"
+
+msgid "Disconnect"
+msgstr "Desconectar"
+
+msgid "Filter"
+msgstr "Filtrar"
+
+msgid "Add a friend"
+msgstr "Adicionar um amigo"
+
+msgid "Your groupchats"
+msgstr "Suas salas"
+
+msgid "Manage your favorite groupchats"
+msgstr "Administrar suas salas favoritas"
+
+msgid "More stuff"
+msgstr "Mais coisas"
+
+msgid "Show all friends"
+msgstr "Mostrar todos os amigos"
+
+msgid "Only show connected friends"
+msgstr "Mostrar apenas os amigos conectados"
+
+msgid "Message archives"
+msgstr "Arquivo de mensagens"
+
+msgid "Date"
+msgstr "Data"
+
+msgid "Please select a friend to view the chat history."
+msgstr "Selecione o amigo que desejar ver o histórico"
+
+msgid "Nothing found for: %s"
+msgstr "Não encontrado para:"
+
+msgid "A short message?"
+msgstr "Uma mensagem curta?"
+
+msgid "How are you?"
+msgstr "Como vai você?"
+
+msgid "What are you doing?"
+msgstr "O que você tem feito?"
+
+msgid "Join a chat"
+msgstr "Entrar na sala"
+
+msgid "Status"
+msgstr "Status"
+
+msgid "Available"
+msgstr "Disponível"
+
+msgid "Talkative"
+msgstr "Em conversa"
+
+msgid "Away"
+msgstr "Ausente"
+
+msgid "Not available"
+msgstr "Não disponível"
+
+msgid "Busy"
+msgstr "Ocupado"
+
+msgid "Mood"
+msgstr "Humor"
+
+msgid "None"
+msgstr "Nada"
+
+msgid "Crazy"
+msgstr "Louco"
+
+msgid "Excited"
+msgstr "Animado"
+
+msgid "Playful"
+msgstr "Brincalhão"
+
+msgid "Happy"
+msgstr "Feliz"
+
+msgid "Shocked"
+msgstr "Chocado"
+
+msgid "Hot"
+msgstr "Quente"
+
+msgid "Sad"
+msgstr "Triste"
+
+msgid "Amorous"
+msgstr "Amoroso"
+
+msgid "Confident"
+msgstr "Confiante"
+
+msgid "Activity"
+msgstr "Atividade"
+
+msgid "Chores"
+msgstr "Tarefas"
+
+msgid "Drinking"
+msgstr "Bebendo"
+
+msgid "Eating"
+msgstr "Comendo"
+
+msgid "Exercising"
+msgstr "Se exercitando"
+
+msgid "Grooming"
+msgstr "Aparência"
+
+msgid "Appointment"
+msgstr "nomeação"
+
+msgid "Inactive"
+msgstr "Inativo"
+
+msgid "Relaxing"
+msgstr "Relaxante"
+
+msgid "Talking"
+msgstr "Falando"
+
+msgid "Traveling"
+msgstr "Viajando"
+
+msgid "Working"
+msgstr "Trabalhando"
+
+msgid "View profile"
+msgstr "Ver Perfil"
+
+msgid "Repeat this notice"
+msgstr "Repetir a notícia"
+
+msgid "Remove this notice"
+msgstr "Remover esta notícia"
+
+msgid "Your profile"
+msgstr "Seu perfil"
+
+msgid "Identity"
+msgstr "Identidade"
+
+msgid "Profile image"
+msgstr "Imagem do perfil"
+
+msgid "Others"
+msgstr "Outros"
+
+msgid "Personal"
+msgstr "Pessoal"
+
+msgid "Complete name"
+msgstr "Nome completo"
+
+msgid "Nickname"
+msgstr "Apelido"
+
+msgid "First name"
+msgstr "Primeiro nome"
+
+msgid "Last name"
+msgstr "Sobrenome"
+
+msgid "Date of birth"
+msgstr "Data de aniversário"
+
+msgid "Contact"
+msgstr "Contato"
+
+msgid "E-mail"
+msgstr "E-mail"
+
+msgid "Phone"
+msgstr "Telefone"
+
+msgid "Website"
+msgstr "Site"
+
+msgid "Current"
+msgstr "Atual"
+
+msgid "Delete"
+msgstr "Deletar"
+
+msgid "What a pity! You have no profile image defined in your identity card!"
+msgstr "Que pena! Você não possui imagem de perfil definida no seu cartão de identidade!"
+
+msgid "Address"
+msgstr "Endereço"
+
+msgid "Street"
+msgstr "Rua"
+
+msgid "City"
+msgstr "Cidade"
+
+msgid "Postal code"
+msgstr "Código Posta"
+
+msgid "Country"
+msgstr "País"
+
+msgid "Biography"
+msgstr "Biografia"
+
+msgid "Important notice"
+msgstr "Aviso importante"
+
+msgid "Be careful of the information you write into your profile, because it could be accessed by everyone (even someone you don't want to)."
+msgstr ""
+
+msgid "Not everything is private on XMPP; this is one of those things, your public profile (vCard)."
+msgstr ""
+
+msgid "It is strongly recommended to upload a profile image (%s maximum), like a picture of yourself, because that makes you easily recognizable by your friends."
+msgstr "É recomendável o envio de uma imagem de perfil (%s máximo), como uma foto sua, isso facilita seu reconhecimento"
+
+msgid "Save"
+msgstr "Salvar"
+
+msgid "Cancel"
+msgstr "Cancelar"
+
+msgid "Edit options"
+msgstr "Editar opções"
+
+msgid "Channel"
+msgstr "Canal"
+
+msgid "Commands"
+msgstr "Comandos"
+
+msgid "Sounds"
+msgstr "sons"
+
+msgid "Privacy"
+msgstr "Privacidade"
+
+msgid "Message archiving"
+msgstr "Arquivo de mensagens"
+
+msgid "Store a history of your chats"
+msgstr "Gravar o histórico das conversas"
+
+msgid "Geolocation"
+msgstr "Localização geográfica"
+
+msgid "Empty"
+msgstr "Vazio"
+
+msgid "Empty channel"
+msgstr "Canal vazio"
+
+msgid "Persistent"
+msgstr "Persistente"
+
+msgid "Maximum notices"
+msgstr "Máximo de avisos"
+
+msgid "Account"
+msgstr "Conta"
+
+msgid "Change password"
+msgstr "Mudar senha"
+
+msgid "Delete account"
+msgstr "Deletar conta"
+
+msgid "Old"
+msgstr "Velho"
+
+msgid "New (2 times)"
+msgstr "Novo (2 vezes)"
+
+msgid "Continue"
+msgstr "Continue"
+
+msgid "To"
+msgstr "Para"
+
+msgid "Close"
+msgstr "Fechar"
+
+msgid "unknown"
+msgstr "desconhecido"
+
+msgid "Unavailable"
+msgstr "Indisponível"
+
+msgid "is now"
+msgstr "É agora"
+
+msgid "Please wait while your avatar is uploaded..."
+msgstr "Por favor aguarde enquanto seu avatar é enviado..."
+
+msgid "Here it is! A new beautiful profile image!"
+msgstr "Aqui está! Uma linda imagem nova de perfil!"
+
+msgid "The image file is not supported or has a bad size."
+msgstr "O arquivo da imagem não é suportado ou o tamanho é inválido."
+
+msgid "Reply"
+msgstr "Responder"
+
+msgid "Error"
+msgstr "Erro"
+
+msgid "Click here to solve the error"
+msgstr "Clique aqui para solucionar o erro"
+
+msgid "You"
+msgstr "Você"
+
+msgid "Remove"
+msgstr "Remover"
+
+msgid "Rename"
+msgstr "Renomear"
+
+msgid "Hi, I am %s, I would like to add you as my friend."
+msgstr "Olá, eu sou %s, eu gostaria de te adicionar como meu amigo."
+
+msgid "Smiley insertion"
+msgstr "Inserir emoticom"
+
+msgid "Change style"
+msgstr "Alterar estilo"
+
+msgid "Text in bold"
+msgstr "Texto em negrito"
+
+msgid "Text in italic"
+msgstr "Texto em itálico"
+
+msgid "Underlined text"
+msgstr "Texto sublinhado"
+
+msgid "Save chat"
+msgstr "Salvar conversa"
+
+msgid "Click on the following link to get the chat log, and wait. Then click again to get the file."
+msgstr "Clique no link a seguir para acessar o log da conversa. Após um tempo, clique novamente para pegar o arquivo."
+
+msgid "This chat is empty!"
+msgstr "Esse chat está vazio!"
+
+msgid "Generate file!"
+msgstr "Gerar arquivo!"
+
+msgid "Download file!"
+msgstr "Ba"
+
+msgid "Clean current chat"
+msgstr "Apagar esta conversa"
+
+msgid "View chat history"
+msgstr "Visualizar histórico da conversa"
+
+msgid "Show user profile"
+msgstr "Mostrar perfil do usuário"
+
+msgid "Add this contact to your friends"
+msgstr "Adicionar este contato aos seus amigos"
+
+msgid "Add this groupchat to your favorites"
+msgstr "Adicionar este grupo de chat aos seus favoritos"
+
+msgid "All tabs"
+msgstr "Todas as abas"
+
+msgid "Close this tab"
+msgstr "Fechar esta aba"
+
+msgid "no subject defined for this room."
+msgstr "nenhum assunto definido para esta sala."
+
+msgid "Administration panel for this room"
+msgstr "Painel de administração desta sala"
+
+msgid "Moderators"
+msgstr "Moderadores"
+
+msgid "Participants"
+msgstr "Participantes"
+
+msgid "Visitors"
+msgstr "Visitantes"
+
+msgid "Manage favorite rooms"
+msgstr "Gerenciar salas favoritas"
+
+msgid "Change favorites"
+msgstr "Alterar favoritos"
+
+msgid "Search a room"
+msgstr "Procurar uma sala"
+
+msgid "Select a favorite"
+msgstr "Selecionar um favorito"
+
+msgid "Getting the name..."
+msgstr "Buscando o nome..."
+
+msgid "Gateway"
+msgstr "Gateway"
+
+msgid "Name"
+msgstr "Nome"
+
+msgid "Room"
+msgstr "Sala"
+
+msgid "Add"
+msgstr "Adicionar"
+
+msgid "Edit"
+msgstr "Editar"
+
+msgid "Search a room on"
+msgstr "Procurar uma sala em"
+
+msgid "No room found on this server."
+msgstr "Nenhuma sala encontrada nesse servidor."
+
+msgid "Service discovery"
+msgstr "Descobrir serviços"
+
+msgid "Server to query"
+msgstr "Servidor para pesquisa"
+
+msgid "Sorry, but the entity didn't return any result!"
+msgstr "Desculpa, mas a entidade não retornou nenhum resultado!"
+
+msgid "Accounts"
+msgstr "Contas"
+
+msgid "Authentications"
+msgstr "Autenticações"
+
+msgid "Automation"
+msgstr "Automatização"
+
+msgid "Clients"
+msgstr "Clientes"
+
+msgid "Collaboration"
+msgstr "Colaboração"
+
+msgid "Components"
+msgstr "Componentes"
+
+msgid "Rooms"
+msgstr "Salas"
+
+msgid "Directories"
+msgstr "Diretórios"
+
+msgid "Gateways"
+msgstr "Gateways"
+
+msgid "News"
+msgstr "Notícias"
+
+msgid "Hierarchy"
+msgstr "Hierarquia"
+
+msgid "Proxies"
+msgstr "Proxies"
+
+msgid "Publication/Subscription"
+msgstr "Publicação/Subscrição"
+
+msgid "Storage"
+msgstr "Armazenamento"
+
+msgid "Service offline or broken"
+msgstr "Serviço offline ou indisponível"
+
+msgid "Your inbox"
+msgstr "Sua caixa de entrada"
+
+msgid "Available actions"
+msgstr "Ações disponíveis"
+
+msgid "Clean"
+msgstr "Limpar"
+
+msgid "New"
+msgstr "Novo"
+
+msgid "Received"
+msgstr "Recebidos"
+
+msgid "Subject"
+msgstr "Assunto"
+
+msgid "Content"
+msgstr "Conteúdo"
+
+msgid "Send message"
+msgstr "Enviar mensagem"
+
+msgid "Your inbox is empty."
+msgstr "Sua caixa de entrada está vazia."
+
+msgid "MUC administration"
+msgstr "Administração MUC"
+
+msgid "You administrate this room"
+msgstr "Você administra esta sala"
+
+msgid "Enter new subject"
+msgstr "Inserir novo assunto"
+
+msgid "Configuration"
+msgstr "Configuração"
+
+msgid "Authorizations"
+msgstr "Autorizações"
+
+msgid "Member list"
+msgstr "Lista de membros"
+
+msgid "Owner list"
+msgstr "Lista de proprietários"
+
+msgid "Administrator list"
+msgstr "Lista de administradores"
+
+msgid "Outcast list"
+msgstr "Lista de banidos"
+
+msgid "Add an input"
+msgstr "Adicionar uma entrada"
+
+msgid "Destroy this MUC"
+msgstr "Destruir esse MUC"
+
+msgid "Yes, let's do it!"
+msgstr "Sim, vamos lá!"
+
+msgid "Your friend is paying attention to the conversation."
+msgstr "Seu amigo está prestando atenção na conversa."
+
+msgid "Your friend is writing a message..."
+msgstr "Seu amigo está digitando uma mensagem..."
+
+msgid "Your friend stopped writing a message."
+msgstr "Seu amigo parou de escrever uma mensagem."
+
+msgid "Your friend is doing something else."
+msgstr "Seu amigo está fazendo outra coisa."
+
+msgid "Your friend closed the chat."
+msgstr "Seu amigo fechou o chat."
+
+msgid "Requesting this service..."
+msgstr "Requisitando esse serviço..."
+
+msgid "Loading"
+msgstr "Carregando"
+
+msgid "joined the chat room"
+msgstr "entrou na sala de chat"
+
+msgid "left the chat room"
+msgstr "saiu da sala de chat"
+
+msgid "no status"
+msgstr "sem status"
+
+msgid "has been kicked"
+msgstr "foi chutado"
+
+msgid "has been banned"
+msgstr "foi banido"
+
+msgid "no reason"
+msgstr "nenhum motivo"
+
+msgid "Communicate with the entire world!"
+msgstr "Comunique-se com o mundo inteiro!"
+
+msgid "It allows you to get in touch with the millions of users who currently use the XMPP network like you do with Jappix. Join the community and stay free!"
+msgstr "Permite que você entre em contato com milhões de usuários que utilizam uma rede XMPP como você faz com o Jappix. Entre na comunidade e fique livre."
+
+msgid "Hi there!"
+msgstr "Olá!"
+
+msgid "Welcome on %1s, “%2s”."
+msgstr ""
+
+msgid "Login to your existing XMPP account or create a new one for free!"
+msgstr "Acesse sua conta XMPP existente ou crie uma nova de graça!"
+
+msgid "Jappix is an open-source project from PostPro, a non-profit organization which provides us a great help."
+msgstr "Jappix é um projeto open-source da PostPro, uma organização sem fins lucrativos que nos oferece uma grande ajuda."
+
+msgid "Login to your existing XMPP account. You can also use the %s to join a groupchat."
+msgstr "Acesse com sua conta XMPP. Você também pode usar o %s para acessar um grupo de chat."
+
+msgid "Previous"
+msgstr "Anterior"
+
+msgid "General"
+msgstr "Geral"
+
+msgid "Advanced"
+msgstr "Avançado"
+
+msgid "Resource"
+msgstr "Recurso"
+
+msgid "Priority"
+msgstr "Prioridade"
+
+msgid "Low"
+msgstr "Baixa"
+
+msgid "Medium"
+msgstr "Média"
+
+msgid "High"
+msgstr "Alta"
+
+msgid "Enter the groupchat you want to join and the nick you want to have. You can also go back to the %s."
+msgstr "Insira o grupo de chat desejado e o seu apelido. Você também pode voltar para o %s."
+
+msgid "login page"
+msgstr "Página de login"
+
+msgid "Share this link with your friends:"
+msgstr "Compartilhe este link com seus amigos:"
+
+msgid "Register a new XMPP account to join your friends on your own social cloud. That's simple!"
+msgstr "Registre uma nova conta XMPP para acessar seus amigos em sua própria rede social. É simples!"
+
+msgid "Required"
+msgstr "Requerido"
+
+msgid "You have been registered, here is your XMPP address:"
+msgstr "Você foi registrado, aqui está seu endereço XMPP:"
+
+msgid "Manager"
+msgstr "Gerenciador"
+
+msgid "Project"
+msgstr "Projeto"
+
+msgid "Encrypted"
+msgstr "Encriptado"
+
+msgid "Unencrypted"
+msgstr "Desencriptado"
+
+msgid "Where are you?"
+msgstr "Onde você está?"
+
+msgid "What's up with you?"
+msgstr "O que você está pensando?"
+
+msgid "Fetching the social channel..."
+msgstr "Buscando o canal social..."
+
+msgid "You are synchronized with your network."
+msgstr "Você está sincronizado com sua rede."
+
+msgid "Cannot send anything: you can only receive notices!"
+msgstr "Não é possível enviar: você só pode receber avisos!"
+
+msgid "Media viewer"
+msgstr "Visualizador de media"
+
+msgid "Browse"
+msgstr "Navegar"
+
+msgid "Command"
+msgstr "Comando"
+
+msgid "Subscribe"
+msgstr "Assinar"
+
+msgid "Join"
+msgstr "Entrar"
+
+msgid "Automatic"
+msgstr "Automático"
+
+msgid "Search"
+msgstr "Procurar"
+
+msgid "No result!"
+msgstr "Nenhum resultado!"
+
+msgid "No notifications."
+msgstr "Nenhuma notificação."
+
+msgid "would like to add you as a friend."
+msgstr "gostaria de te adicionar como amigo."
+
+msgid "would like you to join this chatroom:"
+msgstr "gostaria de entrar nesta sala de chat:"
+
+msgid "Do you accept?"
+msgstr "Você aceita?"
+
+msgid "Yes"
+msgstr "Sim"
+
+msgid "No"
+msgstr "Não"
+
+msgid "would like to get authorization."
+msgstr "gostaria de pegar autorização."
+
+msgid "Do you want to see the friends %s suggests you?"
+msgstr "Gostaria de ver os amigos %s sugerem você?"
+
+msgid "Submit"
+msgstr "Enviar"
+
+msgid "Client"
+msgstr "Cliente"
+
+msgid "System"
+msgstr "Sistema"
+
+msgid "Local time"
+msgstr "Hora local"
+
+msgid "Comments"
+msgstr "Comentários"
+
+msgid "User profile"
+msgstr "Perfil do usuário"
+
+msgid "See his/her position on the globe"
+msgstr "Visualizar a localização dele/dela"
+
+msgid "Confirm"
+msgstr "Confirmar"
+
+msgid "anonymous mode"
+msgstr "Modo anônimo"
+
+msgid "Groups"
+msgstr "Grupos"
+
+msgid "Unclassified"
+msgstr "Não classificado"
+
+msgid "Authorize"
+msgstr "Autorizar"
+
+msgid "Ask for authorization"
+msgstr "Solicitar autorização"
+
+msgid "Unblock"
+msgstr "Desbloquear"
+
+msgid "Prohibit"
+msgstr "Proibir"
+
+msgid "Block"
+msgstr "Bloquear"
+
+msgid "Chat"
+msgstr "Chat"
+
+msgid "Groupchat"
+msgstr "Grupo de chat"
+
+msgid "Jappix Mobile"
+msgstr "Jappix móvel"
+
+msgid "Desktop"
+msgstr "Desktop"
+
+msgid "Mobile"
+msgstr "Mobile"
+
+msgid "Please wait..."
+msgstr "Aguarde..."
+
+msgid "Please enable JavaScript"
+msgstr "Por favor, habilite JavaScript"
+
+msgid "Your channel"
+msgstr "Seu canal"
+
+msgid "Channel of"
+msgstr "Canal de"
+
+msgid "More notices..."
+msgstr "Mais avisos..."
+
+msgid "Attach a file"
+msgstr "Anexar um arquivo"
+
+msgid "Send"
+msgstr "Enviar"
+
+msgid "Unattach the file"
+msgstr "Desanexar o arquivo"
+
+msgid "An error occured while uploading your file: maybe it is too big (%s maximum) or forbidden!"
+msgstr "Um erro ocorreu durante o envio do arquivo: talvez seja grande demais (%s máximo) ou não permitido."
+
+msgid "Authorization failed"
+msgstr "Autorização falhou"
+
+msgid "Registration failed, please choose a different username"
+msgstr "Registro falhou, escolhe um nome de usuário diferente"
+
+msgid "Service unavailable"
+msgstr "Serviço indisponível"
+
+msgid "Internal server error, try later"
+msgstr "Erro interno do servidor, tente mais tarde"
+
+msgid "Your form has been sent."
+msgstr "Seu formulário foi enviado."
+
+msgid "Application"
+msgstr "Aplicação"
+
+msgid "XMPP links"
+msgstr "Links XMPP"
+
+msgid "Open XMPP links with Jappix"
+msgstr "Abrir links XMPP com o Jappix"
+
+msgid "changed the subject to:"
+msgstr "Assunto alterado para:"
+
+msgid "Welcome!"
+msgstr "Bem vindo!"
+
+msgid "Friends"
+msgstr "Amigos"
+
+msgid "Welcome on Jappix, your own social cloud!"
+msgstr "Bem vindo ao Jappix, seu própria rede social!"
+
+msgid "Before you start using it, you will have to change some settings, search for friends and complete your profile."
+msgstr "Antes de começar a utilizar, você terá que alterar algumas configurações, procure por amigos e complete seu perfil."
+
+msgid "Enable notification sounds"
+msgstr "Habilitar som de notificação"
+
+msgid "Share your position on the globe"
+msgstr "Compartilhar sua localização"
+
+msgid "Offline friends"
+msgstr "Amigos offline"
+
+msgid "Don't hide offline friends"
+msgstr "Não esconder amigos offline"
+
+msgid "Use this tool to find your friends on the server you are using right now, or add them later."
+msgstr "Use esta ferramenta para encontrar seus amigos no servidor que você está utilizando, ou adicione-os mais tarde."
+
+msgid "Great work! Now, you can share Jappix with your friends!"
+msgstr "Bom trabalho! Agora você pode compartilhar o Jappix com seus amigos!"
+
+msgid "When you will press the save button, the profile editor will be opened. Happy socializing!"
+msgstr "Quando você apertar o botão de salvar, o editor de perfil será aberto. Boa socialização!"
+
+msgid "Share Jappix on %s"
+msgstr "Compartilhe o Jappix em %s:"
+
+msgid "Using Jappix, an open social platform. I am %s!"
+msgstr "Usando Jappix, uma plataforma social aberta. Eu sou %s!"
+
+msgid "Unknown name"
+msgstr "Nome desconhecido"
+
+msgid "Unknown country"
+msgstr "País desconhecido"
+
+msgid "Click to enable"
+msgstr "Clique para habilitar"
+
+msgid "Click to disable"
+msgstr "Clique para desabilitar"
+
+msgid "Installation"
+msgstr "Instalação"
+
+msgid "Jappix installation"
+msgstr "Instalação do Jappix"
+
+msgid "Welcome to the Jappix installation!"
+msgstr "Bem vindo à instalação do Jappix!"
+
+msgid "This tool will help you fastly install Jappix, the first full-featured XMPP-based social platform, on your server. You don't even need any technical knowledge."
+msgstr "Essa ferramenta ajudará a agilizar a instalação do Jappix. A primeira plataforma social completa em seu servidor. Você nem precisa conhecimento técnico."
+
+msgid "Let's have a look at the installation steps:"
+msgstr "Vamos dar uma olhada nos passos de instalação:"
+
+msgid "Welcome"
+msgstr "Bem vindo"
+
+msgid "Storage configuration"
+msgstr "Configuração de armazenamento"
+
+msgid "Administrator account"
+msgstr "Conta de administrador"
+
+msgid "Main configuration"
+msgstr "Configuração principal"
+
+msgid "Hosts configuration"
+msgstr "Configuração de hosts"
+
+msgid "Services installation"
+msgstr "Instalação de serviços"
+
+msgid "If the current language does not match yours (%1s), you can make Jappix speak %2s it will be saved."
+msgstr "Se o idioma não bate com sua (%1s), você pode fazer o Jappix falar %2s e ficará salvo."
+
+msgid "If you want to get some help about the Jappix installation and configuration, you can use our whole documentation, available at:"
+msgstr "Se você quer alguma ajuda sobre a configuração e instalação do Jappix, você pode usar toda nossa documentação disponível em:"
+
+msgid "It's time to build your own social cloud: just go to the next step!"
+msgstr "É hora de criar sua própria rede social: vá para o próximo passo!"
+
+msgid "Jappix stores persistent data (such as shared files, chat logs, your own music and its configuration) into a single secured storage folder."
+msgstr "Jappix armazena dados constantemente (como arquivos compartilhados, logs de conversa, músicas e de configuração) em uma única pasta segura."
+
+msgid "Jappix must be able to write in this folder to create its sub-directories. If not, you must set the rights to %1s or change the folder owner to %2s (depending of your configuration)."
+msgstr "Jappix precisa permissão para escrita nessa pasta. Se não, você precisa ajustar as permissões para %1s ou alterar o proprietário para %2s (dependendo da sua configuração)."
+
+msgid "The folder is writable, you can continue!"
+msgstr "Esta pasta possui permissão de escrita, pode continuar!"
+
+msgid "Jappix offers you the possibility to manage your configuration, install new addons or search for updates. That's why you must create an administrator account to access the manager."
+msgstr "Jappix oferece a você a possibilidade de gerenciar suas configurações, instalar novos addons ou procurar por atulizações. Por isso você deve criar um usuário de administração para acessar o gerenciador."
+
+msgid "When Jappix will be installed, just click on the manager link on the home page to access it."
+msgstr "Quando o Jappix for instalado, clique no link do gerenciador, em sua página inicial, para acessá-lo."
+
+msgid "Oops, you missed something or the two passwords do not match!"
+msgstr "Oops, você esqueceu algo ou as duas senhas não conferem."
+
+msgid "Jappix needs that you specify some values to work. Please correct the following inputs (or keep the default values, which are sufficient for most people)."
+msgstr "Jappix precisa que você especifique alguns valores para funcionar. Corrija as seguintes entradas (ou mantenha as configurações padrões, o que é suficiente para a maioria das pessoas)."
+
+msgid "Note that if you don't specify a value which is compulsory, it will be automatically completed with the default one."
+msgstr "Note que, se você não especificar um valor obrigatório, ele será automaticamente preenchido com valores padrão."
+
+msgid "User"
+msgstr "Usuário"
+
+msgid "Service"
+msgstr "Serviço"
+
+msgid "Service name"
+msgstr "Nome do serviço"
+
+msgid "Service description"
+msgstr "Descrição do serviço"
+
+msgid "Connection"
+msgstr "Conexão"
+
+msgid "Lock the host"
+msgstr "Veja o endereço"
+
+msgid "Anonymous mode"
+msgstr "Modo anônimo"
+
+msgid "Registration allowed"
+msgstr "Registro permitido"
+
+msgid "Use a proxy"
+msgstr "Usar um proxy"
+
+msgid "Encryption"
+msgstr "Encriptação"
+
+msgid "HTTPS storage"
+msgstr "Armazenamento HTTPS"
+
+msgid "Force HTTPS"
+msgstr "Forçar HTTPS"
+
+msgid "Compression"
+msgstr "Compressão"
+
+msgid "This page helps you specify the default hosts Jappix will connect to. You can leave it as it is and continue if you want to use the official service hosts."
+msgstr "Essa página ajuda você a especificar os endereços no qual o Jappix conectará. Você pode deixa-los assim e continuar caso queira usar os endereços dos serviços oficiais."
+
+msgid "Maybe you don't know what a BOSH server is? In fact, this is a relay between a Jappix client and a XMPP server, which is necessary because of technical limitations."
+msgstr "Talvez você não saiba o que é um servidor BOSH! Na verdade é um transmissor, entre o cliente (Jappix) e um servidor XMPP, necessário devido a limitações técnicas."
+
+msgid "Main host"
+msgstr "Endereço principal"
+
+msgid "Groupchat host"
+msgstr "Endereço dos grupos de chat"
+
+msgid "Anonymous host"
+msgstr "Endereço do modo anônimo"
+
+msgid "Directory host"
+msgstr "Endereço do diretório"
+
+msgid "BOSH host"
+msgstr "Endereço do BOSH"
+
+msgid "You can install some extra softwares on your server, to extend your Jappix features. Some others might be modified, because of security restrictions which are set by default."
+msgstr "Você pode instalar programas extras em seu servidor para estender as funcionalidades do Jappix. Outros podem ser modificados por causa de restrições de segurança definidas por padrão."
+
+msgid "To perform this, you must be able to access your server's shell and be logged in as root. Remember this is facultative, Jappix will work without these modules, but some of its features will be unavailable."
+msgstr "Para executar isso, você precisa ter acesso shell ao servidor e logar como root. Lembre-se, esta opções é facultativa. Jappix funcionará sem esses módulos, mas algumas de suas funções ficarão indisponíveis."
+
+msgid "After you finished the setup, Jappix will generate the cache files. It might be slow, just wait until the application is displayed and do not press any button."
+msgstr "Após terminar a instalação, Jappix vai gerar os arquivos de cache. Isso pode demorar um pouco. Espere até que a aplicação termine."
+
+msgid "Thanks for using Jappix!"
+msgstr "Obrigado por utilizar Jappix!"
+
+msgid "Next"
+msgstr "Próximo"
+
+msgid "Finish"
+msgstr "Terminar"
+
+msgid "Check again"
+msgstr "Checar novamente"
+
+msgid "The folder is not writable, set the right permissions to the %s directory."
+msgstr "A pasta não tem permissão de escrita, aplique as permissões corretas à pasta %s."
+
+msgid "%s is installed on your system."
+msgstr "%s está instalado no seu sistema."
+
+msgid "%1s is not installed on your system, you should install %2s."
+msgstr "%1s não está instalado em seu sistema, você deve instalar %2s."
+
+msgid "PHP maximum upload size is sufficient (%s)."
+msgstr "PHP - maximum_upload_size é suficiente (%s)."
+
+msgid "PHP maximum upload size is not sufficient (%1s), you should define it to %2s in %3s."
+msgstr "PHP - maximum_upload_size não é suficiente (%1s), você deve alterar para %2s em %3s."
+
+msgid "Jappix manager"
+msgstr "Gerenciador do Jappix"
+
+msgid "Manager access"
+msgstr "Acesso ao gerenciador"
+
+msgid "Statistics"
+msgstr "Estatísticas"
+
+msgid "Hosts"
+msgstr "Endereços"
+
+msgid "Design"
+msgstr "Design"
+
+msgid "Repeat"
+msgstr "Repetir"
+
+msgid "All"
+msgstr "Todos"
+
+msgid "Horizontal"
+msgstr "Horizontal"
+
+msgid "Vertical"
+msgstr "Vertical"
+
+msgid "Center"
+msgstr "Centralizado"
+
+msgid "Left"
+msgstr "Esquerda"
+
+msgid "Right"
+msgstr "Direita"
+
+msgid "Top"
+msgstr "Topo"
+
+msgid "Bottom"
+msgstr "Fundo"
+
+msgid "Adapt"
+msgstr "Adaptar"
+
+msgid "Color"
+msgstr "Cor"
+
+msgid "Users"
+msgstr "Usuários"
+
+msgid "Updates"
+msgstr "Atualizações"
+
+msgid "This is a restricted area: only the authorized users can manage this Jappix node."
+msgstr "Esta é uma área restrita: apenas usuários autorizados podem gerenciar este Jappix."
+
+msgid "Please use the form below to login to the administration panel."
+msgstr "Utilize o formulário abaixo para acessar o painel de administração."
+
+msgid "To improve security, sessions are limited in time and when your browser will be closed, you will be logged out."
+msgstr "Para melhorar a segurança, as seções são limitadas em tempo, e, quando seu navegador for fechado, você será desconectado."
+
+msgid "Credentials"
+msgstr "Credenciais"
+
+msgid "You have been logged out. Goodbye!"
+msgstr "Você foi desconectado. Tchau!"
+
+msgid "Oops, you could not be recognized as a valid administrator. Check your credentials!"
+msgstr "Opps, você não foi reconhecido como um administrador válido. Verifique suas credenciais!"
+
+msgid "Basic statistics are processed by Jappix about some important things, you can find them below."
+msgstr "Estatísticas básicas sobre coisas importantes são processadas pelo Jappix, você pode encontra-las abaixo."
+
+msgid "Change your Jappix node configuration with this tool."
+msgstr "Altere as configurações do Jappix com esta ferramenta."
+
+msgid "Change the XMPP hosts that this Jappix node serve with this tool."
+msgstr "Altere os endereços XMPP que este Jappix fornece com esta ferramenta."
+
+msgid "All this Jappix node stored files can be managed with this tool: please select a sub-folder and start editing its content!"
+msgstr "Todos os arquivos armazenados por esse Jappix podem ser gerenciados com esta ferramenta: selecione uma sub-pasta e comece a editar seu conteúdo!"
+
+msgid "Jappix is fully customisable: you can change its design right here."
+msgstr "Jappix é totalmente customizável: você pode alterar seu design bem aqui."
+
+msgid "This is not a valid image, please use PNG, GIF or JPG!"
+msgstr "Esta não é uma imagem válida, use somente PNG, GIF ou JPG!"
+
+msgid "The image could not be received, would you mind retry?"
+msgstr "A imagem não pôde ser recebida, se importa de enviar novamente?"
+
+msgid "Your image was added to the list!"
+msgstr "A sua imagem foi adicionada à lista!"
+
+msgid "Changes saved!"
+msgstr "Alterações salvas!"
+
+msgid "You can define more than one administrator for this Jappix node. You can also change a password with this tool."
+msgstr "Você pode definir mais de um administrador para este Jappix. Você também pode alterar uma senha com essa ferramenta. "
+
+msgid "Update your Jappix node with this tool, or check if a new one is available. Informations about the latest version are also displayed (in english)."
+msgstr "Atualize seu Jappix com essa ferramenta ou cheque se há atualizações. Informações sobre novas versões serão mostradas (em inglês)."
+
+msgid "Access statistics"
+msgstr "Estatísticas de acesso"
+
+msgid "Share statistics"
+msgstr "Estatísticas de compartilhamento"
+
+msgid "Other statistics"
+msgstr "Outras estatísticas"
+
+msgid "January"
+msgstr "Janeiro"
+
+msgid "February"
+msgstr "Fevereiro"
+
+msgid "March"
+msgstr "Março"
+
+msgid "April"
+msgstr "Abril"
+
+msgid "May"
+msgstr "Maio"
+
+msgid "June"
+msgstr "Junho"
+
+msgid "July"
+msgstr "Julho"
+
+msgid "August"
+msgstr "Agosto"
+
+msgid "September"
+msgstr "Setembro"
+
+msgid "October"
+msgstr "Outubro"
+
+msgid "November"
+msgstr "Novembro"
+
+msgid "December"
+msgstr "Dezembro"
+
+msgid "Monday"
+msgstr "Segunda-feira"
+
+msgid "Tuesday"
+msgstr "Terça-feira"
+
+msgid "Wednesday"
+msgstr "Quarta-feira"
+
+msgid "Thursday"
+msgstr "Quinta-feira"
+
+msgid "Friday"
+msgstr "Sexta-feira"
+
+msgid "Saturday"
+msgstr "Sábado"
+
+msgid "Sunday"
+msgstr "Domingo"
+
+msgid "Total"
+msgstr "Total"
+
+msgid "Cache"
+msgstr "Cache"
+
+msgid "Logs"
+msgstr "Logs"
+
+msgid "Music"
+msgstr "Música"
+
+msgid "Backgrounds"
+msgstr "Papéis de parede"
+
+msgid "Share"
+msgstr "Compartilhar"
+
+msgid "Background"
+msgstr "Papel de parede"
+
+msgid "Notice"
+msgstr "Aviso"
+
+msgid "Your design preferences have been saved!"
+msgstr "Suas preferências de design foram salvas!"
+
+msgid "Please check your inputs: something is missing!"
+msgstr "Cheque suas entradas: alguma coisa está faltando!"
+
+msgid "Change your Jappix node background with this tool. You can either set a custom color or an uploaded image. Let your creativity flow!"
+msgstr "Altere o papel de parede do seu Jappix. Você também pode inserir uma cor ou enviar uma imagem. Deixe sua criatividade fluir!"
+
+msgid "Use default background"
+msgstr "Usar papel de parede padrão"
+
+msgid "Use your own image"
+msgstr "Usar sua própria imagem"
+
+msgid "Select a background to use and change the display options."
+msgstr "Selecione um papel de parede e altere as opções de exibição."
+
+msgid "Use your own color"
+msgstr "Usar sua própria cor"
+
+msgid "Type the hexadecimal color value you want to use as a background."
+msgstr "Digite código hexadecimal da cor deseja para usar como papel de parede."
+
+msgid "Manage backgrounds"
+msgstr "Gerenciar papéis de parede"
+
+msgid "You can add a new background to the list with this tool. Please send a valid image."
+msgstr "Você pode adicionar um novo papel de parede para a lista com essa ferramenta. Envie uma imagem válida."
+
+msgid "If you want to remove some backgrounds, use the browser below."
+msgstr "Se você quiser remover alguma imagem, use o navegador abaixo."
+
+msgid "Define a homepage notice for all your users, such as a warn, an important message or an advert with this tool."
+msgstr "Defina um aviso na tela inicial para todos os usuários, como uma mensagem importante ou uma advertência."
+
+msgid "Simple notice"
+msgstr "Aviso simples"
+
+msgid "This notice only needs simple text to be displayed, but no code is allowed!"
+msgstr "Esse aviso precisa apenas de texto simple para aparecer, nenhum código é permitido!"
+
+msgid "Advanced notice"
+msgstr "Aviso avançado"
+
+msgid "You can customize your notice with embedded HTML, CSS and JavaScript, but you need to code the style."
+msgstr "Você pode customizar seu aviso com código HTML, CSS e Javascript."
+
+msgid "Available updates"
+msgstr "Atualizações disponíveis."
+
+msgid "What's new?"
+msgstr "O que há de novo?"
+
+msgid "Your storage folders are not writable, please apply the good rights!"
+msgstr "Suas pastas de armazenamento não estão com permissão de escrita, aplique as permissões!"
+
+msgid "%1s may cause problems to the proxy, please increase %2s value up to %3s!"
+msgstr "%1s pode estar causando problemas com o proxy, aumente o valor de %2s para %3s!"
+
+msgid "You are using a development version of Jappix. Update it through our repository by executing: %s."
+msgstr "Você está utilizando uma versão de desenvolvimento do Jappix. Atualize-a através do nosso repositório executando: %s."
+
+msgid "A new Jappix version is available! Check what is new and launch the update!"
+msgstr "Uma nova atualização do Jappix está disponível! Cheque o que há de novo e execute a atualização!"
+
+msgid "Your version is out to date. Update it now to %s by clicking here!"
+msgstr "Sua versão está desatualizada. Atualiza agora para %s clicando aqui!"
+
+msgid "Your version seems to be up to date, but you can check updates manually by clicking here."
+msgstr "Sua versão parece estar atualizada, mas você pode checar atualizações manualmente clicando aqui."
+
+msgid "Check for updates"
+msgstr "Checar por atualizações"
+
+msgid "Update in progress"
+msgstr "Atualização em progresso"
+
+msgid "Jappix has been updated: you are now running the latest version. Have fun!"
+msgstr "Jappix foi atualizado: você agora está rodando a última versão. Aproveite!"
+
+msgid "The update has failed! Please try again later."
+msgstr "A atualização falhou! Tente novamente depois."
+
+msgid "Downloading package..."
+msgstr "Baixando pacote..."
+
+msgid "Removing current Jappix system files..."
+msgstr "Removendo atuais arquivos de sistema do Jappix..."
+
+msgid "Extracting package..."
+msgstr "Extraindo pacote..."
+
+msgid "Regenerating storage folder tree..."
+msgstr "Regerando árvore de pastas de armazenamento..."
+
+msgid "Jappix is now up to date!"
+msgstr "Jappix agora está atualizado!"
+
+msgid "Aborted: socket error!"
+msgstr "Abortado: erro de soquete!"
+
+msgid "Aborted: buffer error!"
+msgstr "Abortado: erro de buffer!"
+
+msgid "Aborted: everything is not writable!"
+msgstr "Abortado: tudo sem permissão de escrita!"
+
+msgid "Aborted: could not extract the package!"
+msgstr "Abortado: não foi possível extrair o pacote!"
+
+msgid "Visits"
+msgstr "Visitas"
+
+msgid "Daily"
+msgstr "Diariamente"
+
+msgid "Weekly"
+msgstr "Semanalmente"
+
+msgid "Monthly"
+msgstr "Mensalmente"
+
+msgid "Yearly"
+msgstr "Anualmente"
+
+msgid "Size"
+msgstr "Tamanho"
+
+msgid "Clean everything"
+msgstr "Apagar tudo"
+
+msgid "Purge cache"
+msgstr "Eliminar cache"
+
+msgid "Purge logs"
+msgstr "Eliminar logs"
+
+msgid "Purge updates"
+msgstr "Eliminar atualizações"
+
+msgid "The storage folder you wanted to clean is now empty!"
+msgstr "A pasta de armazenamento foi esvaziada!"
+
+msgid "Keep your Jappix node fresh and fast, clean the storage folders regularly!"
+msgstr "Mantenha seu Jappix limpo e rápido, apague as pastas de armazenamento regularmente!"
+
+msgid "Upload your music (Ogg Vorbis, MP3 or WAV) to be able to listen to it in Jappix!"
+msgstr "Envie suas músicas (Ogg Vorbis, MP3 ou WAV) para ouvi-las no Jappix!"
+
+msgid "The file you want to upload must be smaller than %s."
+msgstr "O arquivo que você quer enviar deve ser menor do que %s."
+
+msgid "Stay tuned in what your users store on your server and remove undesired content with this tool."
+msgstr "Fique sabendo o que os seus usuários armazenam em seu servidor e remova os conteúdos indesejados."
+
+msgid "Title"
+msgstr "Título"
+
+msgid "Artist"
+msgstr "Artistas"
+
+msgid "Album"
+msgstr "Álbum"
+
+msgid "File"
+msgstr "Arquivo"
+
+msgid "Upload"
+msgstr "Envio"
+
+msgid "The folder is empty."
+msgstr "A pasta está vazia."
+
+msgid "The music could not be received, please retry!"
+msgstr "A música não pôde ser recebida, tente novamente!"
+
+msgid "This is not a valid music file, please encode in Ogg Vorbis, MP3 or WAV!"
+msgstr "Esse não é um arquivo de música válido, envie apenas Ogg Vorbis, MP3 ou WAV!"
+
+msgid "Your music has been added!"
+msgstr "Sua música foi adicionada!"
+
+msgid "The selected elements have been removed."
+msgstr "Os elementos selecionados foram removidos."
+
+msgid "You must select elements to remove!"
+msgstr "Você precisa selecionar os elementos para remover!"
+
+msgid "Add a new user with this tool, or change a password (type an existing username). Please submit a strong password!"
+msgstr "Adicione um novo usuário ou troque uma senha (digite o nome de um usuário), com esta ferramenta. Envie uma senha difícil!"
+
+msgid "Manage"
+msgstr "Gerenciar"
+
+msgid "List"
+msgstr "Lista"
+
+msgid "Remove users with this tool. Note that you cannot remove an user if he is the only one remaining."
+msgstr "Remova usuários com esta ferramenta. Você não pode remover um usuário caso ele seja o único."
+
+msgid "The user has been added!"
+msgstr "O usuário foi adicionado!"
+
+msgid "The chosen users have been removed."
+msgstr "O usuário selecionado foi removido."
+
+msgid "You must select one or more users to be removed!"
+msgstr "Você precisa selecionar um ou mais usuários para remover!"
+
+msgid "Yesterday"
+msgstr "Ontem"
+
+msgid "%s days ago"
+msgstr "%s dias atrás"
+
+msgid "User currently active"
+msgstr "Usuário ativo"
+
+msgid "Last seen: %s"
+msgstr "Visto em: %s"
+
+msgid "Inactive since: %s"
+msgstr "Inativo desde: %s"
+
+msgid "Your friend seems not to have received your message(s)!"
+msgstr "Seu amigo parece não ter recebido sua(s) mensagem(ns)!"
+
+msgid "Static content server"
+msgstr "Servidor de conteúdo estático"
+
+msgid "This is the static content server for %1s, “%2s”."
+msgstr "Esse é o servidor de conteúdo estático para %1s, “%2s”."
+
+msgid "Suggested friends"
+msgstr "Amigos sugeridos"
+
+msgid "Check all"
+msgstr "Marcar todos"
+
+msgid "Uncheck all"
+msgstr "Desmarcar todos"
+
+msgid "Choose"
+msgstr "Escolher"
+
+msgid "List name"
+msgstr "Nome da lista"
+
+msgid "Allow"
+msgstr "Permitir"
+
+msgid "Deny"
+msgstr "Recusar"
+
+msgid "Group"
+msgstr "Grupo"
+
+msgid "Subscription"
+msgstr "Subscrição"
+
+msgid "Both"
+msgstr "Ambos"
+
+msgid "From"
+msgstr "De"
+
+msgid "Everybody"
+msgstr "Todo mundo"
+
+msgid "Send messages"
+msgstr "Enviar mensagens"
+
+msgid "Send queries"
+msgstr "Enviar consultas"
+
+msgid "See my status"
+msgstr "Ver meu status"
+
+msgid "Send his/her status"
+msgstr "Enviar status dele/dela"
+
+msgid "Everything"
+msgstr "Tudo"
+
+msgid "Item"
+msgstr "Item"
+
+msgid "Order"
+msgstr "Ordem"
+
+msgid "Active for this session"
+msgstr "Ativos nessa sessão"
+
+msgid "Always active"
+msgstr "Sempre ativo"
+
+msgid "User directory"
+msgstr "Diretório de usuário"
+
+msgid "Search a friend"
+msgstr "Procurar um amigo"
+
+msgid "The feature requested is not implemented by the recipient or server and therefore cannot be processed."
+msgstr "A ferramenta solicitada não está implementada pelo servidor e por isso não pode ser processada."
+
+msgid "This is a repeat from %s"
+msgstr "Essa é uma repetição de %s"
+
+msgid "Loading comments..."
+msgstr "Carregando comentários..."
+
+msgid "Type your comment here..."
+msgstr "Escreva seu comentário aqui..."
+
+msgid "Could not get the comments!"
+msgstr "Não foi possível buscar os comentários!"
+
+msgid "Show comments"
+msgstr "Mostrar comentários"
+
+msgid "Send him/her a message"
+msgstr "Envie uma mensagem para ele/ela"
+
+msgid "Start a chat with him/her"
+msgstr "Comece um chat com ele/ela"
+
+msgid "Media integration"
+msgstr "Integração de media"
+
+msgid "Comments locked!"
+msgstr "Comentários bloqueados!"
+
+msgid "Type something you want to share with your friends..."
+msgstr "Escreva algo que você queira compartilhar com seus amigos..."
+
+msgid "changed his/her nickname to %s"
+msgstr "Alterado o apelido dele/dela para %s"
+
+msgid "commented an item you follow: “%s”."
+msgstr "Comentado um ítem que você segue: “%s”."
+
+msgid "Hide"
+msgstr "Esconder"
+
+msgid "liked your post: “%s”."
+msgstr "Gostou do seu post: “%s”."
+
+msgid "quoted you somewhere: “%s”."
+msgstr "Mencionou você em algum lugar: “%s”."
+
+msgid "published on your wall: “%s”."
+msgstr "publicou em seu mural: “%s”."
+
+msgid "tagged you in a photo (%s)."
+msgstr "marcou você numa foto (%s)."
+
+msgid "tagged you in a video (%s)."
+msgstr "marcou você em um vídeo (%s)."
+
+msgid "Show"
+msgstr "Mostrar"
+
+msgid "Need help? You'd better read our documentation page about how to fill this form!"
+msgstr "Precisa de ajuda? É melhor você ler nossa página de documentação sobre como preencher este formulário!"
+
+msgid "Pubsub host"
+msgstr "Endereço Pubsub"
+
+msgid "Jappix is a great social platform, that you can access wherever you are, whenever you want and communicate with whovever you want."
+msgstr "Jappix é uma ótima plataforma social que você pode acessar de onde estiver, quando quiser e comunicar-se com quem quiser."
+
+msgid "Manager link"
+msgstr "Link do gerenciador"
+
+msgid "User uploads server"
+msgstr "Servidor de envio dos usuários"
+
+msgid "This is the user uploads server for %1s, “%2s”."
+msgstr "Esse é o servidor de envio dos usuários para %1s, “%2s”."
+
+msgid "Logo"
+msgstr "Logo"
+
+msgid "You can set your own service logo to replace the default one. Take care of the size and the main color of each logo!"
+msgstr "Você pode definir sua própria logo no lugar da padrão. Tome cuidado com o tamanho e as cores de cada logo!"
+
+msgid "Upload each logo with the recommended maximum pixel size."
+msgstr "Envie cada logo do tamanho de pixels recomendado."
+
+msgid "This is not a valid image, please use the PNG format!"
+msgstr "Esta não é uma imagem válida, envie somente no formato PNG!"
+
+msgid "Your service logo has been successfully changed!"
+msgstr "Sua logo foi alterada com sucesso!"
+
+msgid "Your logo format must be PNG. Leave a field empty and the logo will not be changed."
+msgstr "O formato da sua logo deve ser PNG. Deixe o campo em branco que a logo não será alterada."
+
+msgid "Remove this logo"
+msgstr "Remover essa logo"
+
+msgid "View this logo"
+msgstr "Visualizar essa logo"
+
+msgid "Send a file"
+msgstr "Enviar um arquivo"
+
+msgid "Once uploaded, your friend will be prompted to download the file you sent."
+msgstr "Quando enviado seu amigo será avisado para baixar o arquivo."
+
+msgid "Groupchats to join"
+msgstr "Grupos de chat para entrar"
+
+msgid "Purge sent files"
+msgstr "Eliminar arquivos enviados"
+
+msgid "would like to send you a file: “%s”."
+msgstr "gostaria de te enviar um arquivo: “%s”."
+
+msgid "has accepted to received your file: “%s”."
+msgstr "aceitou receber seu arquivo: “%s”."
+
+msgid "has rejected to receive your file: “%s”."
+msgstr "negou receber seu arquivo: “%s”."
+
+msgid "could not receive your file: “%s”."
+msgstr "não conseguiu receber seu arquivo: “%s”."
+
+msgid "has received a file exchange request: “%s”."
+msgstr "recebeu uma solicitação de troca de arquivos: “%s”."
+
+msgid "Available shortcuts:"
+msgstr "Atalhos disponíveis"
+
+msgid "%s removes the chat logs"
+msgstr "%s remove os logs de chat"
+
+msgid "%s joins a groupchat"
+msgstr "%s entra em um grupo de chat"
+
+msgid "%s closes the chat"
+msgstr "%s fecha o chat"
+
+msgid "%s shows the user profile"
+msgstr "%s mostra o perfil do usuário"
+
+msgid "%s sends a message to the room"
+msgstr "%s envia uma mensagem para a sala"
+
+msgid "%s changes your nickname"
+msgstr "%s altera seu apelido"
+
+msgid "%s sends a message to someone in the room"
+msgstr "%s envia uma mensagem para alguém na sala"
+
+msgid "%s changes the room topic"
+msgstr "%s altera o tópico da sala"
+
+msgid "%s kicks an user of the room"
+msgstr "%s chuta um usuário da sala"
+
+msgid "%s bans an user of the room"
+msgstr "%s bane um usuário da sala"
+
+msgid "%s invites someone to join the room"
+msgstr "%s convida alguém para entrar na sala"
+
+msgid "Social channel, chat and more."
+msgstr ""
+
+msgid "Create your public profile."
+msgstr ""
+
+msgid "A mini-chat for your website."
+msgstr ""
+
+msgid "Get Jappix, get support."
+msgstr ""
+
+msgid "Statistics around Jappix."
+msgstr ""
+
+msgid "Download Jappix for free."
+msgstr ""
+
+msgid "Find a public Jappix node."
+msgstr ""
+
+msgid "Public profile"
+msgstr ""
+
+msgid "Your profile anywhere on the Web."
+msgstr ""
+
+msgid "%s is a Jappix.com service which makes your XMPP profile public. It is easier to share it. No XMPP account is required to view your social channel, your current position and your contact details."
+msgstr ""
+
+msgid "Furthermore, every picture you post in your social channel is added to a beautiful picture timeline. You can now view the pictures you shared year by year."
+msgstr ""
+
+msgid "You can also use your XMPP avatar as a single avatar for every website, blog and forum you use. When you change it on XMPP, the new avatar appears everywhere. What a genious improvement!"
+msgstr ""
+
+msgid "Yay, let's create my public profile!"
+msgstr ""
+
+msgid "Enable my public profile"
+msgstr ""
+
+#~ msgid "Jappix is a non-profit social platform, that you can access wherever you are, whenever you want and communicate with whovever you want."
+#~ msgstr ""
+
+#~ msgid "See"
+#~ msgstr ""
+
+#~ msgid "Use default logo"
+#~ msgstr ""
+
+#~ msgid "Use your own logo"
+#~ msgstr ""
+
+#~ msgid "The recommended image format is PNG. Leave a field empty and the logo will not be changed."
+#~ msgstr ""
diff --git a/jappixmini/jappix/lang/ru/LC_MESSAGES/main.mo b/jappixmini/jappix/lang/ru/LC_MESSAGES/main.mo
new file mode 100644
index 00000000..e28ee042
Binary files /dev/null and b/jappixmini/jappix/lang/ru/LC_MESSAGES/main.mo differ
diff --git a/jappixmini/jappix/lang/ru/LC_MESSAGES/main.po b/jappixmini/jappix/lang/ru/LC_MESSAGES/main.po
new file mode 100644
index 00000000..8ca7f650
--- /dev/null
+++ b/jappixmini/jappix/lang/ru/LC_MESSAGES/main.po
@@ -0,0 +1,1870 @@
+# Russian translations for Jappix package.
+# This file is distributed under the same license as the Jappix package.
+# This file was translated from CodingTeam at <http://codingteam.net/>.
+msgid ""
+msgstr ""
+"Project-Id-Version: Jappix\n"
+"PO-Revision-Date: 2012-01-16 21:47+0100\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"POT-Creation-Date: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+
+msgid "JavaScript is missing in your web browser, so that you will not be able to launch Jappix! Please fix this."
+msgstr "JavaScript отключен в вашем браузере, без него Jappix не может работать!"
+
+msgid "An open social network"
+msgstr "Открытая социальная сеть"
+
+msgid "Jappix has been interrupted by a network issue, a bug or bad login (check that you entered the right credentials), sorry for the inconvenience."
+msgstr "Работа с Jappix прервана из-за проблем со связью, ошибки или неверных регистрационных данных (проверьте имя и пароль), просим прощения за неудобства."
+
+msgid "The element list on this server could not be obtained!"
+msgstr "Невозможно получить спискок содержимого этого сервера."
+
+msgid "Your password has been changed, now you can connect to your account with your new login data."
+msgstr "Пароль изменен. Вы можете войти с новым паролем."
+
+msgid "Your XMPP account has been removed, bye!"
+msgstr "Ваш XMPP аккаунт был удален, до скорой встречи!"
+
+msgid "You have been logged out of your XMPP account, have a nice day!"
+msgstr "Вы покинули свою учетную запись XMPP, удачного дня!"
+
+msgid "The room you joined seems not to exist. You should create it!"
+msgstr "Вы пытаетесь войти в несуществующую комнату. Можно попытаться создать её!"
+
+msgid "The groupchat has been removed, now someone else will be able to recreate it."
+msgstr "Комната была удалена, теперь кто-то другой сможет создать её ещё раз."
+
+msgid "The user that you want to reach is not present in the room."
+msgstr "Нужного вам пользователя здесь нет."
+
+msgid "Please enter the group chat address to join."
+msgstr "Пожалуйста, введите адрес группового чата чтоб присоединиться."
+
+msgid "Please enter your nickname to join %s."
+msgstr "Введите свое прозвище, чтобы присоединиться к %s."
+
+msgid "This room (%s) is protected with a password."
+msgstr "Комната (%s) защищена паролем."
+
+msgid "Your browser is out of date!"
+msgstr "Ваш браузер устарел, пожалуйста обновите!"
+
+msgid "Last %s version is better!"
+msgstr "Свежая версия %s - лучше!"
+
+msgid "Login"
+msgstr "Войти"
+
+msgid "Register"
+msgstr "Регистрация"
+
+msgid "Here we go!"
+msgstr "Поехали!"
+
+msgid "Server"
+msgstr "Сервер"
+
+msgid "Password"
+msgstr "Пароль"
+
+msgid "Remember me"
+msgstr "Запомнить меня"
+
+msgid "This tool has been disabled, you cannot use it!"
+msgstr "Этот инструмент был заблокирован, вы не можете его использовать!"
+
+msgid "Due to a network issue, you were disconnected. What do you want to do now?"
+msgstr "Из-за неполадок в сети вы разъединились. Что теперь хотите сделать?"
+
+msgid "Reconnect"
+msgstr "Переподключение"
+
+msgid "Messages"
+msgstr "Сообщения"
+
+msgid "Profile"
+msgstr "Профиль"
+
+msgid "Options"
+msgstr "Настройки"
+
+msgid "Disconnect"
+msgstr "Выход"
+
+msgid "Filter"
+msgstr "Фильтр"
+
+msgid "Add a friend"
+msgstr "Добавить друга"
+
+msgid "Your groupchats"
+msgstr "Ваша группа"
+
+msgid "Manage your favorite groupchats"
+msgstr "Управлять списком Ваших любимых комнат."
+
+msgid "More stuff"
+msgstr "Дополнительно"
+
+msgid "Show all friends"
+msgstr "Показать всех"
+
+msgid "Only show connected friends"
+msgstr "Показать лишь подключенных"
+
+msgid "Message archives"
+msgstr "Архив сообщений"
+
+msgid "Date"
+msgstr "Дата"
+
+msgid "Please select a friend to view the chat history."
+msgstr "Выберите историю общения с кем хотите увидеть."
+
+msgid "Nothing found for: %s"
+msgstr "Для %s ничего не найдено"
+
+msgid "A short message?"
+msgstr "Статусное сообщение?"
+
+msgid "How are you?"
+msgstr "Как дела?"
+
+msgid "What are you doing?"
+msgstr "Чем вы сейчас заняты?"
+
+msgid "Join a chat"
+msgstr "Поговорить"
+
+msgid "Status"
+msgstr "Состояние"
+
+msgid "Available"
+msgstr "Доступен"
+
+msgid "Talkative"
+msgstr "Готов поболтать"
+
+msgid "Away"
+msgstr "Отошел"
+
+msgid "Not available"
+msgstr "Недоступен"
+
+msgid "Busy"
+msgstr "Занят"
+
+msgid "Mood"
+msgstr "Настроение"
+
+msgid "None"
+msgstr "Ничего"
+
+msgid "Crazy"
+msgstr "Сумасшедший"
+
+msgid "Excited"
+msgstr "Взволнованный"
+
+msgid "Playful"
+msgstr "Игривый"
+
+msgid "Happy"
+msgstr "Счастливый"
+
+msgid "Shocked"
+msgstr "Шокирован"
+
+msgid "Hot"
+msgstr "Страстный"
+
+msgid "Sad"
+msgstr "Грустный"
+
+msgid "Amorous"
+msgstr "Влюблённый"
+
+msgid "Confident"
+msgstr "Самоуверенный"
+
+msgid "Activity"
+msgstr "Деятельность"
+
+msgid "Chores"
+msgstr "Дела домашние"
+
+msgid "Drinking"
+msgstr "Пью"
+
+msgid "Eating"
+msgstr "Кушаю"
+
+msgid "Exercising"
+msgstr "Осуществление"
+
+msgid "Grooming"
+msgstr "Забота"
+
+msgid "Appointment"
+msgstr "Должность"
+
+msgid "Inactive"
+msgstr "Неактивный"
+
+msgid "Relaxing"
+msgstr "Расслабляюсь"
+
+msgid "Talking"
+msgstr "Болтаю"
+
+msgid "Traveling"
+msgstr "Путешествую"
+
+msgid "Working"
+msgstr "Работаю"
+
+msgid "View profile"
+msgstr "Показать профиль"
+
+msgid "Repeat this notice"
+msgstr "Повторить уведомление"
+
+msgid "Remove this notice"
+msgstr "Удалить уведомление"
+
+msgid "Your profile"
+msgstr "Ваш профиль"
+
+msgid "Identity"
+msgstr "Подлинность"
+
+msgid "Profile image"
+msgstr "Аватар"
+
+msgid "Others"
+msgstr "Другие"
+
+msgid "Personal"
+msgstr "Персональные данные"
+
+msgid "Complete name"
+msgstr "Полное имя"
+
+msgid "Nickname"
+msgstr "Псевдоним"
+
+msgid "First name"
+msgstr "Имя"
+
+msgid "Last name"
+msgstr "Фамилия"
+
+msgid "Date of birth"
+msgstr "Дата рождения"
+
+msgid "Contact"
+msgstr "Контакт"
+
+msgid "E-mail"
+msgstr "E-mail"
+
+msgid "Phone"
+msgstr "Телефон"
+
+msgid "Website"
+msgstr "Веб-сайт"
+
+msgid "Current"
+msgstr "Текущий"
+
+msgid "Delete"
+msgstr "Удалить"
+
+msgid "What a pity! You have no profile image defined in your identity card!"
+msgstr "Какая жалость! У вас нет аватара"
+
+msgid "Address"
+msgstr "Адрес"
+
+msgid "Street"
+msgstr "Улица"
+
+msgid "City"
+msgstr "Город"
+
+msgid "Postal code"
+msgstr "Индекс"
+
+msgid "Country"
+msgstr "Страна"
+
+msgid "Biography"
+msgstr "Биография"
+
+msgid "Important notice"
+msgstr "Важное сообщение"
+
+msgid "Be careful of the information you write into your profile, because it could be accessed by everyone (even someone you don't want to)."
+msgstr "Будьте осторожны с информацией которую вы пишете в вашем профиле, потому что это доступно каждому."
+
+msgid "Not everything is private on XMPP; this is one of those things, your public profile (vCard)."
+msgstr "Не вся информация приватна на XMPP, одна из тех вещей - ваш профиль."
+
+msgid "It is strongly recommended to upload a profile image (%s maximum), like a picture of yourself, because that makes you easily recognizable by your friends."
+msgstr ""
+
+msgid "Save"
+msgstr "Сохранить"
+
+msgid "Cancel"
+msgstr "Отмена"
+
+msgid "Edit options"
+msgstr "Редактировать настройки"
+
+msgid "Channel"
+msgstr "Канал"
+
+msgid "Commands"
+msgstr "Комманды"
+
+msgid "Sounds"
+msgstr "Звуки"
+
+msgid "Privacy"
+msgstr "Приватность"
+
+msgid "Message archiving"
+msgstr "Архив сообщений"
+
+msgid "Store a history of your chats"
+msgstr "Сохранять историю разговоров"
+
+msgid "Geolocation"
+msgstr "Местоположение"
+
+msgid "Empty"
+msgstr "Освободить"
+
+msgid "Empty channel"
+msgstr "Пустая конференция"
+
+msgid "Persistent"
+msgstr "Постоянный"
+
+msgid "Maximum notices"
+msgstr "Максимальное число уведомлений"
+
+msgid "Account"
+msgstr "Учетная запись"
+
+msgid "Change password"
+msgstr "Изменить пароль"
+
+msgid "Delete account"
+msgstr "Удалить акаунт"
+
+msgid "Old"
+msgstr "Старый"
+
+msgid "New (2 times)"
+msgstr "Новый"
+
+msgid "Continue"
+msgstr "Продолжить"
+
+msgid "To"
+msgstr "К"
+
+msgid "Close"
+msgstr "Закрыть"
+
+msgid "unknown"
+msgstr "неизвестно"
+
+msgid "Unavailable"
+msgstr "Недоступен"
+
+msgid "is now"
+msgstr "в настоящее время"
+
+msgid "Please wait while your avatar is uploaded..."
+msgstr "Подождите, аватар загружается..."
+
+msgid "Here it is! A new beautiful profile image!"
+msgstr "Вот он! Новый аватар."
+
+msgid "The image file is not supported or has a bad size."
+msgstr "Этот файл не поддерживается или имеет плохой размер."
+
+msgid "Reply"
+msgstr "Ответить"
+
+msgid "Error"
+msgstr "Ошибка"
+
+msgid "Click here to solve the error"
+msgstr "Кликни, чтоб устранить ошибку"
+
+msgid "You"
+msgstr "Ты"
+
+msgid "Remove"
+msgstr "Удалить"
+
+msgid "Rename"
+msgstr "Переименовать"
+
+msgid "Hi, I am %s, I would like to add you as my friend."
+msgstr "Привет, я %s. Хочю добавить тебя в друзья."
+
+msgid "Smiley insertion"
+msgstr "Добавить смайлик"
+
+msgid "Change style"
+msgstr "Изменить стиль"
+
+msgid "Text in bold"
+msgstr "Жирный"
+
+msgid "Text in italic"
+msgstr "Курсив"
+
+msgid "Underlined text"
+msgstr "Подчеркнуто"
+
+msgid "Save chat"
+msgstr "Сохранить беседу"
+
+msgid "Click on the following link to get the chat log, and wait. Then click again to get the file."
+msgstr "Щелкните на следующей ссылке чтобы получить журнал разговора и подождите. Потом опять щелкните для получения файла."
+
+msgid "This chat is empty!"
+msgstr "Этот чат пуст!"
+
+msgid "Generate file!"
+msgstr "Создать файл!"
+
+msgid "Download file!"
+msgstr "Скачать файл!"
+
+msgid "Clean current chat"
+msgstr "Очистить текущий чат"
+
+msgid "View chat history"
+msgstr "Просмотр истории разговора"
+
+msgid "Show user profile"
+msgstr "Показать профиль пользователя"
+
+msgid "Add this contact to your friends"
+msgstr "Добавить этого пользователя в друзья"
+
+msgid "Add this groupchat to your favorites"
+msgstr "Добавить эту конференцию в избранные"
+
+msgid "All tabs"
+msgstr "Все вкладки"
+
+msgid "Close this tab"
+msgstr "Закрить эту вкладку"
+
+msgid "no subject defined for this room."
+msgstr "для данной комнаты тема не была установлена."
+
+msgid "Administration panel for this room"
+msgstr "Панель администрирования для етой комнаты"
+
+msgid "Moderators"
+msgstr "Модераторы"
+
+msgid "Participants"
+msgstr "Участники"
+
+msgid "Visitors"
+msgstr "Посетители"
+
+msgid "Manage favorite rooms"
+msgstr "Управление избранни комнатами"
+
+msgid "Change favorites"
+msgstr "изменить избранние"
+
+msgid "Search a room"
+msgstr "Найти комнату"
+
+msgid "Select a favorite"
+msgstr "Добавить в избраннное"
+
+msgid "Getting the name..."
+msgstr "Получение имени..."
+
+msgid "Gateway"
+msgstr "Маршрутизатор"
+
+msgid "Name"
+msgstr "Имя"
+
+msgid "Room"
+msgstr "Комната"
+
+msgid "Add"
+msgstr "Добавить"
+
+msgid "Edit"
+msgstr "Изменить"
+
+msgid "Search a room on"
+msgstr "Найти комнату на"
+
+msgid "No room found on this server."
+msgstr "Комнат на сервере не найдено."
+
+msgid "Service discovery"
+msgstr "Обзор сервисов"
+
+msgid "Server to query"
+msgstr "Запрос к серверу"
+
+msgid "Sorry, but the entity didn't return any result!"
+msgstr "Сожалею, но объект не ответил на запрос!"
+
+msgid "Accounts"
+msgstr "Учетные записи"
+
+msgid "Authentications"
+msgstr "Аутентификация"
+
+msgid "Automation"
+msgstr "Автоматизация"
+
+msgid "Clients"
+msgstr "Клиенты"
+
+msgid "Collaboration"
+msgstr "Сотрудничество"
+
+msgid "Components"
+msgstr "Компоненты"
+
+msgid "Rooms"
+msgstr "Комнаты"
+
+msgid "Directories"
+msgstr "Директории"
+
+msgid "Gateways"
+msgstr "Шлюзы"
+
+msgid "News"
+msgstr "Новости"
+
+msgid "Hierarchy"
+msgstr "Иерархия"
+
+msgid "Proxies"
+msgstr "Прокси"
+
+msgid "Publication/Subscription"
+msgstr "Публикация/Подписка"
+
+msgid "Storage"
+msgstr "Хранилище"
+
+msgid "Service offline or broken"
+msgstr "Сервис недоступен"
+
+msgid "Your inbox"
+msgstr "Входящие"
+
+msgid "Available actions"
+msgstr "Доступные действия"
+
+msgid "Clean"
+msgstr "Очистить"
+
+msgid "New"
+msgstr "Новый"
+
+msgid "Received"
+msgstr "Принятый"
+
+msgid "Subject"
+msgstr "Тема"
+
+msgid "Content"
+msgstr "Содержимое"
+
+msgid "Send message"
+msgstr "Отправит сообщение"
+
+msgid "Your inbox is empty."
+msgstr "У вас нет сообщений"
+
+msgid "MUC administration"
+msgstr "Администрирование многопользовательской конференции"
+
+msgid "You administrate this room"
+msgstr "Вы администратор этой комнаты"
+
+msgid "Enter new subject"
+msgstr "Введите тему"
+
+msgid "Configuration"
+msgstr "Установки"
+
+msgid "Authorizations"
+msgstr "Авторизация"
+
+msgid "Member list"
+msgstr "Участники"
+
+msgid "Owner list"
+msgstr "Список владельцев"
+
+msgid "Administrator list"
+msgstr "Список администраторов"
+
+msgid "Outcast list"
+msgstr "Отклонённые"
+
+msgid "Add an input"
+msgstr "Добавить вход"
+
+msgid "Destroy this MUC"
+msgstr "Уничтожить эту комнату"
+
+msgid "Yes, let's do it!"
+msgstr "Да, давайте сделаем это!"
+
+msgid "Your friend is paying attention to the conversation."
+msgstr "Ваш друг обращает внимание на беседу."
+
+msgid "Your friend is writing a message..."
+msgstr "Ваш друг пишет сообщение..."
+
+msgid "Your friend stopped writing a message."
+msgstr "Ваш друг прекратил написание сообщения."
+
+msgid "Your friend is doing something else."
+msgstr "Ваш друг делает что-то ещё."
+
+msgid "Your friend closed the chat."
+msgstr "Ваш друг закрыл окно чата."
+
+msgid "Requesting this service..."
+msgstr "Запрос сервиса..."
+
+msgid "Loading"
+msgstr "Загрузка"
+
+msgid "joined the chat room"
+msgstr "присоединится к комнате"
+
+msgid "left the chat room"
+msgstr "покинул комнату"
+
+msgid "no status"
+msgstr "нет статуса"
+
+msgid "has been kicked"
+msgstr "был выставлен"
+
+msgid "has been banned"
+msgstr "был забанен"
+
+msgid "no reason"
+msgstr "нет причины"
+
+msgid "Communicate with the entire world!"
+msgstr "Общайся со всем миром!"
+
+msgid "It allows you to get in touch with the millions of users who currently use the XMPP network like you do with Jappix. Join the community and stay free!"
+msgstr "Это позволит общаться с миллионами пользователей Jappix, как и вы, использующих XMPP. Войди в сообщество и почувствуй свободу!"
+
+msgid "Hi there!"
+msgstr "Приветствуем здесь!"
+
+msgid "Welcome on %1s, “%2s”."
+msgstr "Добро пожаловать в %1s, “%2s”."
+
+msgid "Login to your existing XMPP account or create a new one for free!"
+msgstr "Ввойдите в ваш XMPP аккаунт или создайте новый бесплатно!"
+
+msgid "Jappix is an open-source project from PostPro, a non-profit organization which provides us a great help."
+msgstr "Jappix - это открытый проект от PostPro, некоммерческой организации, обеспечивающей нам отличную поддержу"
+
+msgid "Login to your existing XMPP account. You can also use the %s to join a groupchat."
+msgstr "Ввойдите в ваш XMPP аккаунт. Также можете использовать %s для присоединения к общей беседе."
+
+msgid "Previous"
+msgstr "Предыдущий"
+
+msgid "General"
+msgstr "Основные"
+
+msgid "Advanced"
+msgstr "Дополнительно"
+
+msgid "Resource"
+msgstr "Ресурс"
+
+msgid "Priority"
+msgstr "Приоритет"
+
+msgid "Low"
+msgstr "Низкий"
+
+msgid "Medium"
+msgstr "Средний"
+
+msgid "High"
+msgstr "Высокий"
+
+msgid "Enter the groupchat you want to join and the nick you want to have. You can also go back to the %s."
+msgstr "Введите название конференции и ник. (Вы можете вернуться к %s)."
+
+msgid "login page"
+msgstr "Страница входа"
+
+msgid "Share this link with your friends:"
+msgstr "Поделитесь ссылкой с друзьями:"
+
+msgid "Register a new XMPP account to join your friends on your own social cloud. That's simple!"
+msgstr "Зарегистрируйте новый XMPP-аккаунт чтобы подключиться к сети друзей. Это просто!"
+
+msgid "Required"
+msgstr "Обязательный"
+
+msgid "You have been registered, here is your XMPP address:"
+msgstr "Вы были зарегистрированы, ваш XMPP-адрес:"
+
+msgid "Manager"
+msgstr "Менеджер"
+
+msgid "Project"
+msgstr "Проект"
+
+msgid "Encrypted"
+msgstr "Зашифрованный"
+
+msgid "Unencrypted"
+msgstr ""
+
+msgid "Where are you?"
+msgstr "Где ты?"
+
+msgid "What's up with you?"
+msgstr "Что с тобой?"
+
+msgid "Fetching the social channel..."
+msgstr "Вход в социальный канал..."
+
+msgid "You are synchronized with your network."
+msgstr "Вы синхронизированы с сетью."
+
+msgid "Cannot send anything: you can only receive notices!"
+msgstr "Не может быть отправлено: вы можете только получать уведомления!"
+
+msgid "Media viewer"
+msgstr "Медиа менеджер"
+
+msgid "Browse"
+msgstr "Просмотр"
+
+msgid "Command"
+msgstr "Команда"
+
+msgid "Subscribe"
+msgstr "Подписаться"
+
+msgid "Join"
+msgstr "Войти"
+
+msgid "Automatic"
+msgstr "Автоматически"
+
+msgid "Search"
+msgstr "Поиск"
+
+msgid "No result!"
+msgstr "Нет результата!"
+
+msgid "No notifications."
+msgstr "Нет уведомлений."
+
+msgid "would like to add you as a friend."
+msgstr "добавить себя как друга."
+
+msgid "would like you to join this chatroom:"
+msgstr "хотели бы присоединиться к чату:"
+
+msgid "Do you accept?"
+msgstr "Вы принимаете?"
+
+msgid "Yes"
+msgstr "Да"
+
+msgid "No"
+msgstr "Нет"
+
+msgid "would like to get authorization."
+msgstr "хочет получит авторизацию"
+
+msgid "Do you want to see the friends %s suggests you?"
+msgstr "Хотите ли видеть предложенных вам %s друзей?"
+
+msgid "Submit"
+msgstr "Отправить"
+
+msgid "Client"
+msgstr "Клиент"
+
+msgid "System"
+msgstr "Система"
+
+msgid "Local time"
+msgstr "Местное время"
+
+msgid "Comments"
+msgstr "Комментарии"
+
+msgid "User profile"
+msgstr "Профиль пользователя"
+
+msgid "See his/her position on the globe"
+msgstr "Посмотреть географическое положение"
+
+msgid "Confirm"
+msgstr "Подтвердить"
+
+msgid "anonymous mode"
+msgstr "анонимный режим"
+
+msgid "Groups"
+msgstr "Группы"
+
+msgid "Unclassified"
+msgstr "Неизвестно"
+
+msgid "Authorize"
+msgstr "Авторизовать"
+
+msgid "Ask for authorization"
+msgstr "Запросить подписку"
+
+msgid "Unblock"
+msgstr "Разблокировать"
+
+msgid "Prohibit"
+msgstr "Запретить"
+
+msgid "Block"
+msgstr "Блокировать"
+
+msgid "Chat"
+msgstr "Чат"
+
+msgid "Groupchat"
+msgstr "Чат"
+
+msgid "Jappix Mobile"
+msgstr "Мобильный Jappix"
+
+msgid "Desktop"
+msgstr "Полная версия"
+
+msgid "Mobile"
+msgstr "Мобильный"
+
+msgid "Please wait..."
+msgstr "Пожалуйста, подождите..."
+
+msgid "Please enable JavaScript"
+msgstr "Пожалуйста, включите JavaScript"
+
+msgid "Your channel"
+msgstr "Ваш канал"
+
+msgid "Channel of"
+msgstr "Канал"
+
+msgid "More notices..."
+msgstr "Другие уведомления..."
+
+msgid "Attach a file"
+msgstr "Присоединить файл"
+
+msgid "Send"
+msgstr "Отправить"
+
+msgid "Unattach the file"
+msgstr "Удалить файл"
+
+msgid "An error occured while uploading your file: maybe it is too big (%s maximum) or forbidden!"
+msgstr "При выгрузке вашего файла произошла ошибка: может он слишком велик (%s maximum) или его формат запрещен!"
+
+msgid "Authorization failed"
+msgstr "Ошибка аутентификации"
+
+msgid "Registration failed, please choose a different username"
+msgstr "Ошибка регистрации. Пожалуйста, выберите другое имя пользователя"
+
+msgid "Service unavailable"
+msgstr "Сервис недоступен"
+
+msgid "Internal server error, try later"
+msgstr "Внутренняя ошибка сервера. Попробуйте зайти позже"
+
+msgid "Your form has been sent."
+msgstr "Ваша форма была отправлена."
+
+msgid "Application"
+msgstr "Приложение"
+
+msgid "XMPP links"
+msgstr "XMPP ссылки"
+
+msgid "Open XMPP links with Jappix"
+msgstr "Открывать XMPP ссылки в Jappix"
+
+msgid "changed the subject to:"
+msgstr "изменил тему на:"
+
+msgid "Welcome!"
+msgstr "Добро пожаловать!"
+
+msgid "Friends"
+msgstr "Друзья"
+
+msgid "Welcome on Jappix, your own social cloud!"
+msgstr "Добро пожаловать в Jappix, Вашу социальную сеть!"
+
+msgid "Before you start using it, you will have to change some settings, search for friends and complete your profile."
+msgstr "До начала использования вам надо изменить некоторые установки, найти друзей и заполнить профиль."
+
+msgid "Enable notification sounds"
+msgstr "Включить звуковые уведомления"
+
+msgid "Share your position on the globe"
+msgstr "Поделится своим мемтоположением"
+
+msgid "Offline friends"
+msgstr "Друзья оффлайн"
+
+msgid "Don't hide offline friends"
+msgstr "Не скрывать друзей оффлайн"
+
+msgid "Use this tool to find your friends on the server you are using right now, or add them later."
+msgstr "Используйте это для поиска друзей, или добавьте их позже"
+
+msgid "Great work! Now, you can share Jappix with your friends!"
+msgstr "Прекрасная работа! Итак, можете поделиться Jappix с друзьями!"
+
+msgid "When you will press the save button, the profile editor will be opened. Happy socializing!"
+msgstr "Нажатие на кнопку сохранения открывает редактор профиля. Удачного общения!"
+
+msgid "Share Jappix on %s"
+msgstr "Рассказать про Jappix в %s"
+
+msgid "Using Jappix, an open social platform. I am %s!"
+msgstr "Использую для общения Jabber-сеть Jappix. Я - %s!"
+
+msgid "Unknown name"
+msgstr "Неизвестное имя"
+
+msgid "Unknown country"
+msgstr "Неизвестная страна"
+
+msgid "Click to enable"
+msgstr "Включить"
+
+msgid "Click to disable"
+msgstr "Выключить"
+
+msgid "Installation"
+msgstr "Установка"
+
+msgid "Jappix installation"
+msgstr "Установка Jappix"
+
+msgid "Welcome to the Jappix installation!"
+msgstr "Добро пожаловать в установку Jappix!"
+
+msgid "This tool will help you fastly install Jappix, the first full-featured XMPP-based social platform, on your server. You don't even need any technical knowledge."
+msgstr "Этот мастер поможет вам быстро установить Jappix, первую полноценную социальную платформу на XMPP-протоколе. Для установки не требуется особых технических навыков."
+
+msgid "Let's have a look at the installation steps:"
+msgstr ""
+
+msgid "Welcome"
+msgstr "Добро пожаловать"
+
+msgid "Storage configuration"
+msgstr "Настройка хранилища"
+
+msgid "Administrator account"
+msgstr "Администраторсикий акаунт"
+
+msgid "Main configuration"
+msgstr "Основные настройки"
+
+msgid "Hosts configuration"
+msgstr "Конфигурация хостов"
+
+msgid "Services installation"
+msgstr "Установка сервиса"
+
+msgid "If the current language does not match yours (%1s), you can make Jappix speak %2s it will be saved."
+msgstr "Если текущий язык не совпадает с вашим (%1s), вы можете настроить Jabbix на %2s."
+
+msgid "If you want to get some help about the Jappix installation and configuration, you can use our whole documentation, available at:"
+msgstr "Если хотите получить какую-либо помощь по установке и настройке Jappix, можете использовать полную документацию, доступную на:"
+
+msgid "It's time to build your own social cloud: just go to the next step!"
+msgstr "Пришло время создать свое социальное облако: переходите к следующему шагу!"
+
+msgid "Jappix stores persistent data (such as shared files, chat logs, your own music and its configuration) into a single secured storage folder."
+msgstr "Jappix сохраняет постоянные данные (такие, как общие файлы, логи переписки, вашу музыку и собственные настройки) в единой защищенной папке."
+
+msgid "Jappix must be able to write in this folder to create its sub-directories. If not, you must set the rights to %1s or change the folder owner to %2s (depending of your configuration)."
+msgstr "Jappix должен иметь возможность записывать в эту папку, чтобы создавать в ней под-директории. Вы должны установить права на %1s или сменить владельца папки на %2s (в зависимости от конфигурации)."
+
+msgid "The folder is writable, you can continue!"
+msgstr "Папка доступна для записи, можно продолжать!"
+
+msgid "Jappix offers you the possibility to manage your configuration, install new addons or search for updates. That's why you must create an administrator account to access the manager."
+msgstr "Jabbix позволяет вам управлять конфигурацией, устанавливать новые плагины или проверять обновления. Для доступа к панели управления требуется создать учетную запись администратора."
+
+msgid "When Jappix will be installed, just click on the manager link on the home page to access it."
+msgstr ""
+
+msgid "Oops, you missed something or the two passwords do not match!"
+msgstr "Опа! Вы вы что-то забыли, или два пароля не совпали!"
+
+msgid "Jappix needs that you specify some values to work. Please correct the following inputs (or keep the default values, which are sufficient for most people)."
+msgstr "Jappix требуются некоторые значения для работы. Пожалуйста исправьте следующие строки (или оставьте по умолчанию, они подходят большинству пользователей)"
+
+msgid "Note that if you don't specify a value which is compulsory, it will be automatically completed with the default one."
+msgstr "Примечание: если вы не заполните необходимое значение, оно будет автоматически заполнено значением по умолчанию."
+
+msgid "User"
+msgstr "Пользователь"
+
+msgid "Service"
+msgstr "Сервис"
+
+msgid "Service name"
+msgstr "Имя сервиса"
+
+msgid "Service description"
+msgstr "Описание сервиса"
+
+msgid "Connection"
+msgstr "Сединение"
+
+msgid "Lock the host"
+msgstr "Заблокировать хост"
+
+msgid "Anonymous mode"
+msgstr "Анонимны режим"
+
+msgid "Registration allowed"
+msgstr "Регистрация дозволена"
+
+msgid "Use a proxy"
+msgstr "Использовать proxy"
+
+msgid "Encryption"
+msgstr "Шифрование"
+
+msgid "HTTPS storage"
+msgstr "HTTPS хранилище"
+
+msgid "Force HTTPS"
+msgstr "Принудительно использовать HTTPS"
+
+msgid "Compression"
+msgstr "Сжатие"
+
+msgid "This page helps you specify the default hosts Jappix will connect to. You can leave it as it is and continue if you want to use the official service hosts."
+msgstr "На этой странице можно задать сервер, с которым Jappix будет соединяться по умолчанию. Вы можете оставить его как есть, если хотите использовать официальные серверы."
+
+msgid "Maybe you don't know what a BOSH server is? In fact, this is a relay between a Jappix client and a XMPP server, which is necessary because of technical limitations."
+msgstr "Возможно вы не знаете, что такое BOSH сервер? Фактически это переходник между Jappix-клиентом и XMPP-сервером, необходимый в силу технических ограничений."
+
+msgid "Main host"
+msgstr "Основной хост"
+
+msgid "Groupchat host"
+msgstr "Хост конференций"
+
+msgid "Anonymous host"
+msgstr "Анонимный хост"
+
+msgid "Directory host"
+msgstr "Хост директорий"
+
+msgid "BOSH host"
+msgstr "BOSH хост"
+
+msgid "You can install some extra softwares on your server, to extend your Jappix features. Some others might be modified, because of security restrictions which are set by default."
+msgstr "Вы можете установить дополнительное ПО на вашем сервере для расширения функционала. Некоторые могут быть изменены, из-за ограничений безопасности устанавливаемых по умолчанию. "
+
+msgid "To perform this, you must be able to access your server's shell and be logged in as root. Remember this is facultative, Jappix will work without these modules, but some of its features will be unavailable."
+msgstr "Для этого вам необходимо иметь root-доступ к консоли вашего сервера. Помните - это необязательные модули, Jappix будет работать и без них, но некоторые возможности будут недоступны."
+
+msgid "After you finished the setup, Jappix will generate the cache files. It might be slow, just wait until the application is displayed and do not press any button."
+msgstr "После окончания установки, Jappix сгенерирует файлы кеша. Процесс может занять некоторое время, не нажимайте на кнопки и подождите, пока не отобразится окно приложения."
+
+msgid "Thanks for using Jappix!"
+msgstr "Спасибо за использование Jappix"
+
+msgid "Next"
+msgstr "Следующий"
+
+msgid "Finish"
+msgstr "Готово"
+
+msgid "Check again"
+msgstr "Проверьте снова"
+
+msgid "The folder is not writable, set the right permissions to the %s directory."
+msgstr "Папка защищена от записи, установите права на запись для директории %s."
+
+msgid "%s is installed on your system."
+msgstr "%s установлен на вашей системе."
+
+msgid "%1s is not installed on your system, you should install %2s."
+msgstr "%1s не установлен в вашей системе, вам необходимо установить %2s. "
+
+msgid "PHP maximum upload size is sufficient (%s)."
+msgstr "Максимальный загружаемый файл в PHP %s."
+
+msgid "PHP maximum upload size is not sufficient (%1s), you should define it to %2s in %3s."
+msgstr "Текущего PHP maximum upload size недостаточно (%1s). Вы должны определить допустимый размер на %2s в %3s."
+
+msgid "Jappix manager"
+msgstr "Менеджер Jappix"
+
+msgid "Manager access"
+msgstr "Менеджер доступа"
+
+msgid "Statistics"
+msgstr "Статистика"
+
+msgid "Hosts"
+msgstr "Хосты"
+
+msgid "Design"
+msgstr "Дизайн"
+
+msgid "Repeat"
+msgstr "Повтор"
+
+msgid "All"
+msgstr "Все"
+
+msgid "Horizontal"
+msgstr "Горизонтальный"
+
+msgid "Vertical"
+msgstr "Вертикальный"
+
+msgid "Center"
+msgstr "Середина"
+
+msgid "Left"
+msgstr "Левый"
+
+msgid "Right"
+msgstr "Правый"
+
+msgid "Top"
+msgstr "Верх"
+
+msgid "Bottom"
+msgstr "Низ"
+
+msgid "Adapt"
+msgstr "Принять"
+
+msgid "Color"
+msgstr "Цвет"
+
+msgid "Users"
+msgstr "Пользователи"
+
+msgid "Updates"
+msgstr "Обновления"
+
+msgid "This is a restricted area: only the authorized users can manage this Jappix node."
+msgstr "Запретная область: лишь утвержденные пользователи могут править этот узел Jappix."
+
+msgid "Please use the form below to login to the administration panel."
+msgstr "Используйте нижеприведенную форму для доступа к панели администрирования."
+
+msgid "To improve security, sessions are limited in time and when your browser will be closed, you will be logged out."
+msgstr "В целях безопасности сессия ограничена по времени, и, когда ваш браузер будет закрыт, вы также выйдете из нее."
+
+msgid "Credentials"
+msgstr "Полномочия"
+
+msgid "You have been logged out. Goodbye!"
+msgstr "Вы вышли из системы. До свидания!"
+
+msgid "Oops, you could not be recognized as a valid administrator. Check your credentials!"
+msgstr "Опа! Вы не признаны действующим администратором. Проверьте ваши полномочия!"
+
+msgid "Basic statistics are processed by Jappix about some important things, you can find them below."
+msgstr "Основные статистические данные о важных событиях, обработанные Jappix, вы можете найти ниже."
+
+msgid "Change your Jappix node configuration with this tool."
+msgstr "Измените конфигурацию узла Jappix, этим инструментом."
+
+msgid "Change the XMPP hosts that this Jappix node serve with this tool."
+msgstr "Измените XMPP хосты, обслуживаемые этим Jappix узлом, этим инструментом."
+
+msgid "All this Jappix node stored files can be managed with this tool: please select a sub-folder and start editing its content!"
+msgstr "Всеми хранящимися на этом Jappix узлое файлами, можно управлять с помощью этого инструмента: Пожалуйста, выберите под-директорию и начните редактировать ее содержимое!"
+
+msgid "Jappix is fully customisable: you can change its design right here."
+msgstr "Jappix полностью настраиваемый: вы можете изменить его дизайн прямо здесь."
+
+msgid "This is not a valid image, please use PNG, GIF or JPG!"
+msgstr "Это недопустимый формат изображения, пожалуйста используйте PNG, GIF или JPG!"
+
+msgid "The image could not be received, would you mind retry?"
+msgstr "Изображение не может быть получено. Не хотите попробовать снова?"
+
+msgid "Your image was added to the list!"
+msgstr "Ваш рисунок был добавлен к списку!"
+
+msgid "Changes saved!"
+msgstr "Изменения сохранены!"
+
+msgid "You can define more than one administrator for this Jappix node. You can also change a password with this tool."
+msgstr "Вы можете определить более одного администратора для этого Jappix узла. Также можно сменить пароль, с помощью этого инструмента."
+
+msgid "Update your Jappix node with this tool, or check if a new one is available. Informations about the latest version are also displayed (in english)."
+msgstr "Обновите Jappix узел этим инструментом, или проверьте, не доступен ли новый. Информация о последней версии тоже отображается (на английском)"
+
+msgid "Access statistics"
+msgstr "Доступ к статистике"
+
+msgid "Share statistics"
+msgstr "Поделится статистикой"
+
+msgid "Other statistics"
+msgstr "Другая статистика"
+
+msgid "January"
+msgstr "Январь"
+
+msgid "February"
+msgstr "Февраль"
+
+msgid "March"
+msgstr "Март"
+
+msgid "April"
+msgstr "Апрель"
+
+msgid "May"
+msgstr "Май"
+
+msgid "June"
+msgstr "Июнь"
+
+msgid "July"
+msgstr "Июль"
+
+msgid "August"
+msgstr "Август"
+
+msgid "September"
+msgstr "Сентябрь"
+
+msgid "October"
+msgstr "Октябрь"
+
+msgid "November"
+msgstr "Ноябрь"
+
+msgid "December"
+msgstr "Декабрь"
+
+msgid "Monday"
+msgstr "Понедельник"
+
+msgid "Tuesday"
+msgstr "Вторник"
+
+msgid "Wednesday"
+msgstr "Среда"
+
+msgid "Thursday"
+msgstr "Четверг"
+
+msgid "Friday"
+msgstr "Пятница"
+
+msgid "Saturday"
+msgstr "Суббота"
+
+msgid "Sunday"
+msgstr "Воскресенье"
+
+msgid "Total"
+msgstr "Всего"
+
+msgid "Cache"
+msgstr "Кеш"
+
+msgid "Logs"
+msgstr "История"
+
+msgid "Music"
+msgstr "Музыка"
+
+msgid "Backgrounds"
+msgstr "Фон"
+
+msgid "Share"
+msgstr "Поделиться"
+
+msgid "Background"
+msgstr "Фон"
+
+msgid "Notice"
+msgstr "Уведомление"
+
+msgid "Your design preferences have been saved!"
+msgstr "Ваши настройки дизайна были сохранены!"
+
+msgid "Please check your inputs: something is missing!"
+msgstr "Пожалуйста проверьте ввод: чего-то не хватает!"
+
+msgid "Change your Jappix node background with this tool. You can either set a custom color or an uploaded image. Let your creativity flow!"
+msgstr "Измените фон вашего Jappix узла этим инструментом. Вы можете установить свой цвет или загрузить изображение. Дайте волю фантазии!"
+
+msgid "Use default background"
+msgstr "Использовать фон по умолчанию."
+
+msgid "Use your own image"
+msgstr "Использовать собственную картинку"
+
+msgid "Select a background to use and change the display options."
+msgstr "Выберите фон и смените параметры оторажения."
+
+msgid "Use your own color"
+msgstr "Использовать собственний цвет"
+
+msgid "Type the hexadecimal color value you want to use as a background."
+msgstr "Введите шеснадцатиричное значение цвета, который вы хотите использовать для фона."
+
+msgid "Manage backgrounds"
+msgstr "Управление фоном"
+
+msgid "You can add a new background to the list with this tool. Please send a valid image."
+msgstr "Вы можете добавить новый фон в список, этим инструментом. Пожалуйста, добавьте поддерживаемое изображение."
+
+msgid "If you want to remove some backgrounds, use the browser below."
+msgstr "Если вы хотите удалить фоновые картинки, используйте браузер ниже."
+
+msgid "Define a homepage notice for all your users, such as a warn, an important message or an advert with this tool."
+msgstr "Вы можете установить предупреждения и уведомления на главной странице с помощью этого инструмента."
+
+msgid "Simple notice"
+msgstr "Простое уведомление"
+
+msgid "This notice only needs simple text to be displayed, but no code is allowed!"
+msgstr "Это уведомление должно быть обычным текстом, код не допустим!"
+
+msgid "Advanced notice"
+msgstr "Расширенное уведомление"
+
+msgid "You can customize your notice with embedded HTML, CSS and JavaScript, but you need to code the style."
+msgstr "Вы можете настроить вид уведомления с помощью HTML, CSS и JavaScript, но вам нужно написать стиль."
+
+msgid "Available updates"
+msgstr "Доступные обновления"
+
+msgid "What's new?"
+msgstr "Что нового?"
+
+msgid "Your storage folders are not writable, please apply the good rights!"
+msgstr "Ваши папки хранения защищены от записи. Пожалуйста, установите соответствующие права!"
+
+msgid "%1s may cause problems to the proxy, please increase %2s value up to %3s!"
+msgstr "%1s может вызвать проблемы с proxy, пожалуйста увеличте значение %2s до %3s!"
+
+msgid "You are using a development version of Jappix. Update it through our repository by executing: %s."
+msgstr "Вы используете версию разработчика для Jappix. Обновите ее из нашего репозитория выполнив: %s."
+
+msgid "A new Jappix version is available! Check what is new and launch the update!"
+msgstr "Доступна новая версия Jappix! Проверьте изменения и запустите обновление!"
+
+msgid "Your version is out to date. Update it now to %s by clicking here!"
+msgstr "Ваша версия устарела. Обновите ее до %s, кликнув здесь!"
+
+msgid "Your version seems to be up to date, but you can check updates manually by clicking here."
+msgstr "Вашу версию неплохо бы обновить, но вы можете выбрать обновление собственноручно кликнув здесь."
+
+msgid "Check for updates"
+msgstr "Проверить обновления"
+
+msgid "Update in progress"
+msgstr "Обновление..."
+
+msgid "Jappix has been updated: you are now running the latest version. Have fun!"
+msgstr "Jappix был обновлен: теперь у вас запущена свежайшая версия. Наслаждайтесь!"
+
+msgid "The update has failed! Please try again later."
+msgstr "Ошибка при обновлении! Попробуйте еще раз."
+
+msgid "Downloading package..."
+msgstr "Загрузка пакета..."
+
+msgid "Removing current Jappix system files..."
+msgstr "Удаление текущих системных файлов Jappix..."
+
+msgid "Extracting package..."
+msgstr "Извлечение пакета..."
+
+msgid "Regenerating storage folder tree..."
+msgstr "Восстановление дерева каталога..."
+
+msgid "Jappix is now up to date!"
+msgstr "Jappix обновлен!"
+
+msgid "Aborted: socket error!"
+msgstr "Прервано: ошибка сокета!"
+
+msgid "Aborted: buffer error!"
+msgstr "Прервано: ошибка буфера!"
+
+msgid "Aborted: everything is not writable!"
+msgstr "Прервано: все защищено от записи!"
+
+msgid "Aborted: could not extract the package!"
+msgstr "Прервано: невозможно извлечь пакет!"
+
+msgid "Visits"
+msgstr "Посещения"
+
+msgid "Daily"
+msgstr "Ежедневно"
+
+msgid "Weekly"
+msgstr "Еженедельно"
+
+msgid "Monthly"
+msgstr "Ежемесячно"
+
+msgid "Yearly"
+msgstr "Ежегодно"
+
+msgid "Size"
+msgstr "Размер"
+
+msgid "Clean everything"
+msgstr "Очистить все"
+
+msgid "Purge cache"
+msgstr "Очистить кеш"
+
+msgid "Purge logs"
+msgstr "Очистить историю"
+
+msgid "Purge updates"
+msgstr "Удалить обновления"
+
+msgid "The storage folder you wanted to clean is now empty!"
+msgstr "Папка которую вы хотите очистить, пуста."
+
+msgid "Keep your Jappix node fresh and fast, clean the storage folders regularly!"
+msgstr "Храните свой Jappix узел в чистоте и порядке, регулярно очищайте папки хранения!"
+
+msgid "Upload your music (Ogg Vorbis, MP3 or WAV) to be able to listen to it in Jappix!"
+msgstr "Выгрузите вашу музыку (Ogg Vorbis, MP3 или WAV), чтобы слушать ее в Jappix!"
+
+msgid "The file you want to upload must be smaller than %s."
+msgstr "Файл который вы хотите загрузить должен быть меньше %s."
+
+msgid "Stay tuned in what your users store on your server and remove undesired content with this tool."
+msgstr "Будьте в курсе того, что хранят ваши пользователи на вашем сервере, и удаляйте нежелательный контент этим инструментом."
+
+msgid "Title"
+msgstr "Название"
+
+msgid "Artist"
+msgstr "Артист"
+
+msgid "Album"
+msgstr "Альбом"
+
+msgid "File"
+msgstr "Файл"
+
+msgid "Upload"
+msgstr "Загрузить"
+
+msgid "The folder is empty."
+msgstr "Эта папка пуста."
+
+msgid "The music could not be received, please retry!"
+msgstr "Не удалось получить музыку, пожалуйста попробуйте снова!"
+
+msgid "This is not a valid music file, please encode in Ogg Vorbis, MP3 or WAV!"
+msgstr "Это недопустимый аудио файл, пожалуйста, используйте Ogg Vorbis, MP3 или WAV!"
+
+msgid "Your music has been added!"
+msgstr "Ваша музыка добавлена!"
+
+msgid "The selected elements have been removed."
+msgstr "Выбранный элемент бил удален."
+
+msgid "You must select elements to remove!"
+msgstr "Выберите удаляемые элементы!"
+
+msgid "Add a new user with this tool, or change a password (type an existing username). Please submit a strong password!"
+msgstr "Добавить нового пользователя или изменить пароль (ввести существующее имя). Используйте сложный пароль!"
+
+msgid "Manage"
+msgstr "Управление"
+
+msgid "List"
+msgstr "Список"
+
+msgid "Remove users with this tool. Note that you cannot remove an user if he is the only one remaining."
+msgstr "Вы можете удалять пользователей с помощью этого инструмента. Имейте в виду, что нельзя удалить последнего оставшегося пользователя."
+
+msgid "The user has been added!"
+msgstr "Пользователь добавлен!"
+
+msgid "The chosen users have been removed."
+msgstr "Выбранные польззователи удалены."
+
+msgid "You must select one or more users to be removed!"
+msgstr "Выберите одного или более для удаления!"
+
+msgid "Yesterday"
+msgstr "Вчера"
+
+msgid "%s days ago"
+msgstr "%s дней назад"
+
+msgid "User currently active"
+msgstr "Сейчас активен"
+
+msgid "Last seen: %s"
+msgstr "Последний раз был: %s"
+
+msgid "Inactive since: %s"
+msgstr "Бездействует с %s"
+
+msgid "Your friend seems not to have received your message(s)!"
+msgstr "Похоже ваши друзья не получают сообщений!"
+
+msgid "Static content server"
+msgstr "Сервер статического контента"
+
+msgid "This is the static content server for %1s, “%2s”."
+msgstr "Это сервер статического контента для %1, “%2s”."
+
+msgid "Suggested friends"
+msgstr "Рекомендованые друзья"
+
+msgid "Check all"
+msgstr "Отметить все"
+
+msgid "Uncheck all"
+msgstr "Отменить выбор"
+
+msgid "Choose"
+msgstr "Выберите"
+
+msgid "List name"
+msgstr "Фамилия"
+
+msgid "Allow"
+msgstr "Зазрешить"
+
+msgid "Deny"
+msgstr "Отказать"
+
+msgid "Group"
+msgstr "Группа"
+
+msgid "Subscription"
+msgstr "Подписка"
+
+msgid "Both"
+msgstr "Оба"
+
+msgid "From"
+msgstr "От"
+
+msgid "Everybody"
+msgstr "Все"
+
+msgid "Send messages"
+msgstr "Послать сообщение"
+
+msgid "Send queries"
+msgstr "Послать запрос"
+
+msgid "See my status"
+msgstr "Смотри мой статус"
+
+msgid "Send his/her status"
+msgstr "Отправлять статус"
+
+msgid "Everything"
+msgstr "Все"
+
+msgid "Item"
+msgstr "Предмет"
+
+msgid "Order"
+msgstr "Запрос"
+
+msgid "Active for this session"
+msgstr "Активный на сессию"
+
+msgid "Always active"
+msgstr "Всегда активный"
+
+msgid "User directory"
+msgstr "Каталог пользователя"
+
+msgid "Search a friend"
+msgstr "Поиск друга"
+
+msgid "The feature requested is not implemented by the recipient or server and therefore cannot be processed."
+msgstr "Запрошенная функция не выполнена получателем или сервером, поэтому не может быть обработана."
+
+msgid "This is a repeat from %s"
+msgstr "Это повтор от %s"
+
+msgid "Loading comments..."
+msgstr "Загрузка комментариев..."
+
+msgid "Type your comment here..."
+msgstr "Введите свой комментарий..."
+
+msgid "Could not get the comments!"
+msgstr "Не удалось получить комментарии!"
+
+msgid "Show comments"
+msgstr "Показать комментарии"
+
+msgid "Send him/her a message"
+msgstr "Отправить сообщение"
+
+msgid "Start a chat with him/her"
+msgstr "Начать беседу"
+
+msgid "Media integration"
+msgstr "Медиа-интеграция"
+
+msgid "Comments locked!"
+msgstr "Комментарии заблокированы!"
+
+msgid "Type something you want to share with your friends..."
+msgstr "Напишите то, чем вы хотите поделиться с друзьями..."
+
+msgid "changed his/her nickname to %s"
+msgstr "сменил ник на %s"
+
+msgid "commented an item you follow: “%s”."
+msgstr "прокомментировал сообщение за которым вы следите: “%s”."
+
+msgid "Hide"
+msgstr "Скрыть"
+
+msgid "liked your post: “%s”."
+msgstr "понравилось ваше сообщение: “%s”."
+
+msgid "quoted you somewhere: “%s”."
+msgstr "цитировал вас где-то: “%s”."
+
+msgid "published on your wall: “%s”."
+msgstr "опубликовал на вашей стене: “%s”."
+
+msgid "tagged you in a photo (%s)."
+msgstr "отметил вас на фото (%s)."
+
+msgid "tagged you in a video (%s)."
+msgstr "отметил вас на видео (%s)."
+
+msgid "Show"
+msgstr "Показать"
+
+msgid "Need help? You'd better read our documentation page about how to fill this form!"
+msgstr "Нужна помощь? Вам лучше прочитать страницу документации, о том, как заполнять эту форму!"
+
+msgid "Pubsub host"
+msgstr "Хост Pubsub"
+
+msgid "Jappix is a great social platform, that you can access wherever you are, whenever you want and communicate with whovever you want."
+msgstr "Jappix это великолепная социальная платформа, в которой ты можешь общаться с кем и когда угодно."
+
+msgid "Manager link"
+msgstr "Менеджер ссылок"
+
+msgid "User uploads server"
+msgstr "Сервер загрузок пользователя"
+
+msgid "This is the user uploads server for %1s, “%2s”."
+msgstr "Это сервер пользовательских загрузок для %1s, “%2s”."
+
+msgid "Logo"
+msgstr "Логотип"
+
+msgid "You can set your own service logo to replace the default one. Take care of the size and the main color of each logo!"
+msgstr "Вы можете установить собственный логотип. Уделите внимание размеру и цвету каждого логотипа!"
+
+msgid "Upload each logo with the recommended maximum pixel size."
+msgstr "Выгрузите каждый логотип с рекомендованным максимальным размером в пикселях."
+
+msgid "This is not a valid image, please use the PNG format!"
+msgstr "Неподдерживаемый графический формат, пожалуйста используйте формат PNG!"
+
+msgid "Your service logo has been successfully changed!"
+msgstr "Ваш логотип был успешно заменен!"
+
+msgid "Your logo format must be PNG. Leave a field empty and the logo will not be changed."
+msgstr "Формат логотипа должен быть PNG. Оставьте поле пустым, чтобы не изменять."
+
+msgid "Remove this logo"
+msgstr "Удалить логотип"
+
+msgid "View this logo"
+msgstr "Посмотреть логотип"
+
+msgid "Send a file"
+msgstr "Отправить файл"
+
+msgid "Once uploaded, your friend will be prompted to download the file you sent."
+msgstr "После выгрузки, ваш друг получит запрос на загрузку отправленного вами файла,"
+
+msgid "Groupchats to join"
+msgstr "Конференции для вступления"
+
+msgid "Purge sent files"
+msgstr "Удалить отправленные файлы"
+
+msgid "would like to send you a file: “%s”."
+msgstr "хочет выслать вам файл: “%s”."
+
+msgid "has accepted to received your file: “%s”."
+msgstr "согласился на получение вашего файла: “%s”."
+
+msgid "has rejected to receive your file: “%s”."
+msgstr "отколнил получение вашего файла: “%s”."
+
+msgid "could not receive your file: “%s”."
+msgstr "не может получить ваш файл: “%s”."
+
+msgid "has received a file exchange request: “%s”."
+msgstr "получил запрос на обмен файлами: “%s”."
+
+msgid "Available shortcuts:"
+msgstr "Доступные ярлыки:"
+
+msgid "%s removes the chat logs"
+msgstr "%s удаляет логи чатов"
+
+msgid "%s joins a groupchat"
+msgstr "%s присоединяет к конференции"
+
+msgid "%s closes the chat"
+msgstr "%s закрывает чат"
+
+msgid "%s shows the user profile"
+msgstr "%s отображает профиль пользователя"
+
+msgid "%s sends a message to the room"
+msgstr "%s отправляет сообщение в комнату"
+
+msgid "%s changes your nickname"
+msgstr "%s изменяет ваш ник"
+
+msgid "%s sends a message to someone in the room"
+msgstr "%s отправляет сообщение кому-то из комнаты"
+
+msgid "%s changes the room topic"
+msgstr "%s изменяет тему комнаты"
+
+msgid "%s kicks an user of the room"
+msgstr "%s выставляет пользователя из комнаты"
+
+msgid "%s bans an user of the room"
+msgstr "%s блокирует пользователя в комнате"
+
+msgid "%s invites someone to join the room"
+msgstr "%s приглашает кого-то войти в комнату"
+
+msgid "Social channel, chat and more."
+msgstr ""
+
+msgid "Create your public profile."
+msgstr ""
+
+msgid "A mini-chat for your website."
+msgstr ""
+
+msgid "Get Jappix, get support."
+msgstr ""
+
+msgid "Statistics around Jappix."
+msgstr ""
+
+msgid "Download Jappix for free."
+msgstr ""
+
+msgid "Find a public Jappix node."
+msgstr ""
+
+msgid "Public profile"
+msgstr ""
+
+msgid "Your profile anywhere on the Web."
+msgstr ""
+
+msgid "%s is a Jappix.com service which makes your XMPP profile public. It is easier to share it. No XMPP account is required to view your social channel, your current position and your contact details."
+msgstr ""
+
+msgid "Furthermore, every picture you post in your social channel is added to a beautiful picture timeline. You can now view the pictures you shared year by year."
+msgstr ""
+
+msgid "You can also use your XMPP avatar as a single avatar for every website, blog and forum you use. When you change it on XMPP, the new avatar appears everywhere. What a genious improvement!"
+msgstr ""
+
+msgid "Yay, let's create my public profile!"
+msgstr ""
+
+msgid "Enable my public profile"
+msgstr ""
+
+#~ msgid "Jappix is a non-profit social platform, that you can access wherever you are, whenever you want and communicate with whovever you want."
+#~ msgstr "Jappix это некоммерческая общественная платформа, доступная откуда бы ни было, когда бы ни пожелаете и с кем бы ни решили пообщаться."
+
+#~ msgid "See"
+#~ msgstr ""
+
+#~ msgid "Use default logo"
+#~ msgstr ""
+
+#~ msgid "Use your own logo"
+#~ msgstr ""
+
+#~ msgid "The recommended image format is PNG. Leave a field empty and the logo will not be changed."
+#~ msgstr ""
diff --git a/jappixmini/jappix/lang/sk/LC_MESSAGES/main.mo b/jappixmini/jappix/lang/sk/LC_MESSAGES/main.mo
new file mode 100644
index 00000000..4e12dbf1
Binary files /dev/null and b/jappixmini/jappix/lang/sk/LC_MESSAGES/main.mo differ
diff --git a/jappixmini/jappix/lang/sk/LC_MESSAGES/main.po b/jappixmini/jappix/lang/sk/LC_MESSAGES/main.po
new file mode 100644
index 00000000..846e639b
--- /dev/null
+++ b/jappixmini/jappix/lang/sk/LC_MESSAGES/main.po
@@ -0,0 +1,1870 @@
+# Slovak translations for Jappix package.
+# This file is distributed under the same license as the Jappix package.
+# This file was translated from CodingTeam at <http://codingteam.net/>.
+msgid ""
+msgstr ""
+"Project-Id-Version: Jappix\n"
+"PO-Revision-Date: 2012-01-16 21:26+0100\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"POT-Creation-Date: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+
+msgid "JavaScript is missing in your web browser, so that you will not be able to launch Jappix! Please fix this."
+msgstr "Vo vašom prehliadači chýba JavaScript, takže nebude možné spustiť Jappix! Prosím napravte to."
+
+msgid "An open social network"
+msgstr "Otvorená sociálna sieť"
+
+msgid "Jappix has been interrupted by a network issue, a bug or bad login (check that you entered the right credentials), sorry for the inconvenience."
+msgstr "Jappix bol prerušený problémom so sieťou, chybou alebo nesprávnym prihlásením (skontrolujte či sú zadané údaje správne). Ospravedlňujeme sa za nepríjemnosti."
+
+msgid "The element list on this server could not be obtained!"
+msgstr "Zoznam komponentov na tomto serveri nie je možné získať!"
+
+msgid "Your password has been changed, now you can connect to your account with your new login data."
+msgstr "Vaše heslo bolo zmenené, teraz sa môžete prihlásiť k vášmu účtu s novými prihlasovacími údajmi."
+
+msgid "Your XMPP account has been removed, bye!"
+msgstr "Váš XMPP účet bol zmazaný, dovidenia!"
+
+msgid "You have been logged out of your XMPP account, have a nice day!"
+msgstr "Boli ste odhlásený z vášho XMPP účtu, prajem pekný deň!"
+
+msgid "The room you joined seems not to exist. You should create it!"
+msgstr "Zdá sa, že miestnosť do ktorej ste vstúpili neexistuje, Vytvárate ju!"
+
+msgid "The groupchat has been removed, now someone else will be able to recreate it."
+msgstr "Skupinový rozhovor bol odstránený, teraz ho bude môcť vytvoriť niekto iný."
+
+msgid "The user that you want to reach is not present in the room."
+msgstr "Užívateľ, ktorého chcete zastihnúť sa v tejto miestnosti nenachádza"
+
+msgid "Please enter the group chat address to join."
+msgstr "Prosím, vyplňte adresu skupinového rozhovoru ku ktorému sa chcete pripojiť"
+
+msgid "Please enter your nickname to join %s."
+msgstr "Prosím, vyplňte prezývku pre pripojenie do %s."
+
+msgid "This room (%s) is protected with a password."
+msgstr "Táto miestnosť (%s) je chránená heslom."
+
+msgid "Your browser is out of date!"
+msgstr "Váš prehliadač je zastaralý"
+
+msgid "Last %s version is better!"
+msgstr "Posledná %s verzia je lepšia!"
+
+msgid "Login"
+msgstr "Prihlásenie"
+
+msgid "Register"
+msgstr "Registrácia"
+
+msgid "Here we go!"
+msgstr "Poďme na to!"
+
+msgid "Server"
+msgstr "Server"
+
+msgid "Password"
+msgstr "Heslo"
+
+msgid "Remember me"
+msgstr "Zapamätaj si ma"
+
+msgid "This tool has been disabled, you cannot use it!"
+msgstr "Táto možnosť bola zakázaná, nemôžete ju použiť!"
+
+msgid "Due to a network issue, you were disconnected. What do you want to do now?"
+msgstr "Pre problémy so sieťou ste boli odhlásený, Čo chcete robiť?"
+
+msgid "Reconnect"
+msgstr "Znovu pripojiť"
+
+msgid "Messages"
+msgstr "Správy"
+
+msgid "Profile"
+msgstr "Profil"
+
+msgid "Options"
+msgstr "Možnosti"
+
+msgid "Disconnect"
+msgstr "Odpojiť"
+
+msgid "Filter"
+msgstr "Filter"
+
+msgid "Add a friend"
+msgstr "Pridať priateľa"
+
+msgid "Your groupchats"
+msgstr "Vaše skupinové rozhovory"
+
+msgid "Manage your favorite groupchats"
+msgstr "Spravovať vaše obľúbené skupinové rozhovory"
+
+msgid "More stuff"
+msgstr "Ďalšie možnosti"
+
+msgid "Show all friends"
+msgstr "Zobraziť všetkých priateľov"
+
+msgid "Only show connected friends"
+msgstr "Zobraziť iba pripojených priateľov"
+
+msgid "Message archives"
+msgstr "Archív správ"
+
+msgid "Date"
+msgstr "Dátum"
+
+msgid "Please select a friend to view the chat history."
+msgstr "Vyberte priateľa pre zobrazenie histórie rozhovoru."
+
+msgid "Nothing found for: %s"
+msgstr "Žiaden výsledok pre: %s"
+
+msgid "A short message?"
+msgstr "Krátka správa?"
+
+msgid "How are you?"
+msgstr "Ako sa máš?"
+
+msgid "What are you doing?"
+msgstr "Čo robíš?"
+
+msgid "Join a chat"
+msgstr "Začať rozhovor"
+
+msgid "Status"
+msgstr "Status"
+
+msgid "Available"
+msgstr "Prihlásený"
+
+msgid "Talkative"
+msgstr "Zhovorčivý"
+
+msgid "Away"
+msgstr "Neprítomný"
+
+msgid "Not available"
+msgstr "Neprihlásený"
+
+msgid "Busy"
+msgstr "Zaneprázdnený"
+
+msgid "Mood"
+msgstr "Nálada"
+
+msgid "None"
+msgstr "Nič"
+
+msgid "Crazy"
+msgstr "Bláznivá"
+
+msgid "Excited"
+msgstr "Vzrušenie"
+
+msgid "Playful"
+msgstr "Hravá"
+
+msgid "Happy"
+msgstr "Šťastný"
+
+msgid "Shocked"
+msgstr "Šokovaný"
+
+msgid "Hot"
+msgstr "Nažhavený"
+
+msgid "Sad"
+msgstr "Smutný"
+
+msgid "Amorous"
+msgstr "Zamilovaný"
+
+msgid "Confident"
+msgstr "Dôverčivý"
+
+msgid "Activity"
+msgstr "Aktivita"
+
+msgid "Chores"
+msgstr "Fuška"
+
+msgid "Drinking"
+msgstr "Pije"
+
+msgid "Eating"
+msgstr "Jedenie"
+
+msgid "Exercising"
+msgstr "Vzdelávanie"
+
+msgid "Grooming"
+msgstr "Starostlivosť"
+
+msgid "Appointment"
+msgstr "Stretnutie"
+
+msgid "Inactive"
+msgstr "Neaktívny"
+
+msgid "Relaxing"
+msgstr "Relax"
+
+msgid "Talking"
+msgstr "Rozhovor"
+
+msgid "Traveling"
+msgstr "Cestovanie"
+
+msgid "Working"
+msgstr "Práca"
+
+msgid "View profile"
+msgstr "Zobraziť profil"
+
+msgid "Repeat this notice"
+msgstr "Zopakovať toto upozornenie"
+
+msgid "Remove this notice"
+msgstr "Odstrániť toto upozornenie"
+
+msgid "Your profile"
+msgstr "Váš profil"
+
+msgid "Identity"
+msgstr "Identita"
+
+msgid "Profile image"
+msgstr "Profilová fotka"
+
+msgid "Others"
+msgstr "Iné"
+
+msgid "Personal"
+msgstr "Osobné"
+
+msgid "Complete name"
+msgstr "Celé meno"
+
+msgid "Nickname"
+msgstr "Prezývka"
+
+msgid "First name"
+msgstr "Meno"
+
+msgid "Last name"
+msgstr "Priezvisko"
+
+msgid "Date of birth"
+msgstr "Dátum narodenia"
+
+msgid "Contact"
+msgstr "Kontakt"
+
+msgid "E-mail"
+msgstr "E-mail"
+
+msgid "Phone"
+msgstr "Telefón"
+
+msgid "Website"
+msgstr "Webstránka"
+
+msgid "Current"
+msgstr "Momentálne"
+
+msgid "Delete"
+msgstr "Zmazať"
+
+msgid "What a pity! You have no profile image defined in your identity card!"
+msgstr "Aká škoda! Nemáte nastavenú profilovú fotku vo vašej vizitke!"
+
+msgid "Address"
+msgstr "Adresa"
+
+msgid "Street"
+msgstr "Ulica"
+
+msgid "City"
+msgstr "Mesto"
+
+msgid "Postal code"
+msgstr "PSČ"
+
+msgid "Country"
+msgstr "Krajina"
+
+msgid "Biography"
+msgstr "Biografia"
+
+msgid "Important notice"
+msgstr "Dôležitý oznam"
+
+msgid "Be careful of the information you write into your profile, because it could be accessed by everyone (even someone you don't want to)."
+msgstr "Buďte opatrní, informácie ktoré vyplníte v profile sú prístupné každému (aj niekomu, koho si neželáte)."
+
+msgid "Not everything is private on XMPP; this is one of those things, your public profile (vCard)."
+msgstr "Nie všetko je súkromné v XMPP; toto je jedna z týchto vecí, váš verejný profil (vCard)"
+
+msgid "It is strongly recommended to upload a profile image (%s maximum), like a picture of yourself, because that makes you easily recognizable by your friends."
+msgstr "Odporúčame nahrať profilovku (%s maximum), napríklad vašu fotku, aby vás priatelia ľahšie rozpoznali."
+
+msgid "Save"
+msgstr "Uložiť"
+
+msgid "Cancel"
+msgstr "Zrušiť"
+
+msgid "Edit options"
+msgstr "Upraviť možnosti"
+
+msgid "Channel"
+msgstr "Kanál"
+
+msgid "Commands"
+msgstr "Príkazy"
+
+msgid "Sounds"
+msgstr "Zvuky"
+
+msgid "Privacy"
+msgstr "Súkromie"
+
+msgid "Message archiving"
+msgstr "Archivácia správ"
+
+msgid "Store a history of your chats"
+msgstr "Ukladať históriu vašich rozhovorov"
+
+msgid "Geolocation"
+msgstr "Geolokácia"
+
+msgid "Empty"
+msgstr "Vymazanie"
+
+msgid "Empty channel"
+msgstr "Vymazať kanál"
+
+msgid "Persistent"
+msgstr "Natrvalo"
+
+msgid "Maximum notices"
+msgstr "Maximum upozornení"
+
+msgid "Account"
+msgstr "Účet"
+
+msgid "Change password"
+msgstr "Zmeniť heslo"
+
+msgid "Delete account"
+msgstr "Zmazať účet"
+
+msgid "Old"
+msgstr "Staré"
+
+msgid "New (2 times)"
+msgstr "Nové (2 krát)"
+
+msgid "Continue"
+msgstr "Pokračuj"
+
+msgid "To"
+msgstr "Komu"
+
+msgid "Close"
+msgstr "Zavrieť"
+
+msgid "unknown"
+msgstr "neznáme"
+
+msgid "Unavailable"
+msgstr "Nie je k dispozícii"
+
+msgid "is now"
+msgstr "je teraz"
+
+msgid "Please wait while your avatar is uploaded..."
+msgstr "Prosím počkajte pokiaľ sa nahrá váš avatar.."
+
+msgid "Here it is! A new beautiful profile image!"
+msgstr "Tu je! Nová krásna profilová fotka!"
+
+msgid "The image file is not supported or has a bad size."
+msgstr "Súbor s obrázkom nie je podporovaný alebo má nesprávnu veľkosť"
+
+msgid "Reply"
+msgstr "Odpovedať"
+
+msgid "Error"
+msgstr "Chyba"
+
+msgid "Click here to solve the error"
+msgstr "Kliknite sem pre riešenie problému"
+
+msgid "You"
+msgstr "Ty"
+
+msgid "Remove"
+msgstr "Odstrániť"
+
+msgid "Rename"
+msgstr "Premenovať"
+
+msgid "Hi, I am %s, I would like to add you as my friend."
+msgstr "Ahoj, Ja som %s, chcem si ťa pridať ako priateľa"
+
+msgid "Smiley insertion"
+msgstr "Smajlíci"
+
+msgid "Change style"
+msgstr "Zmeň štýl"
+
+msgid "Text in bold"
+msgstr "Tučné"
+
+msgid "Text in italic"
+msgstr "Italic"
+
+msgid "Underlined text"
+msgstr "Podčiarknuté"
+
+msgid "Save chat"
+msgstr "Uložiť rozhovor"
+
+msgid "Click on the following link to get the chat log, and wait. Then click again to get the file."
+msgstr "Klikni na nasledujúci link pre vytvorenie logu a počkaj. Potom klikni znova pre prevzatie súboru."
+
+msgid "This chat is empty!"
+msgstr "Tento rozhovor je prázdny"
+
+msgid "Generate file!"
+msgstr "Vygeneruj súbor!"
+
+msgid "Download file!"
+msgstr "Stiahni súbor!"
+
+msgid "Clean current chat"
+msgstr "Vyčisti prebiehajúci rozhovor"
+
+msgid "View chat history"
+msgstr "Ukáž históriu rozhovoru"
+
+msgid "Show user profile"
+msgstr "Ukáž používateľov profil"
+
+msgid "Add this contact to your friends"
+msgstr "Pridaj tento kontakt medzi priateľov"
+
+msgid "Add this groupchat to your favorites"
+msgstr "Pridať tento skupinový rozhovor k obľúbeným"
+
+msgid "All tabs"
+msgstr "Všetky karty"
+
+msgid "Close this tab"
+msgstr "Zavrieť túto kartu"
+
+msgid "no subject defined for this room."
+msgstr "Nebol nastavený predmet pre túto miestnosť"
+
+msgid "Administration panel for this room"
+msgstr "Panel administrácie pre túto miestnosť"
+
+msgid "Moderators"
+msgstr "Moderátori"
+
+msgid "Participants"
+msgstr "Členovia"
+
+msgid "Visitors"
+msgstr "Návštevníci"
+
+msgid "Manage favorite rooms"
+msgstr "Spravovať obľúbené skupinové rozhovory"
+
+msgid "Change favorites"
+msgstr "Zmeniť obľúbené"
+
+msgid "Search a room"
+msgstr "Prehľadať miestnosť"
+
+msgid "Select a favorite"
+msgstr "Vyber obľúbené"
+
+msgid "Getting the name..."
+msgstr "Získavam meno..."
+
+msgid "Gateway"
+msgstr "Brána"
+
+msgid "Name"
+msgstr "Meno"
+
+msgid "Room"
+msgstr "Miestnosť"
+
+msgid "Add"
+msgstr "Pridať"
+
+msgid "Edit"
+msgstr "Upraviť"
+
+msgid "Search a room on"
+msgstr "Hľadať miestnosť na"
+
+msgid "No room found on this server."
+msgstr "Žiadna miestnosť sa nenašla na tomto serveri"
+
+msgid "Service discovery"
+msgstr "Vyhľadávanie služieb"
+
+msgid "Server to query"
+msgstr "Server na prehľadanie"
+
+msgid "Sorry, but the entity didn't return any result!"
+msgstr "Ospravedňujeme sa, ale výraz nevrátil žiaden výsledok"
+
+msgid "Accounts"
+msgstr "Účty"
+
+msgid "Authentications"
+msgstr "Autentifikácia"
+
+msgid "Automation"
+msgstr "Automatizácia"
+
+msgid "Clients"
+msgstr "Klienti"
+
+msgid "Collaboration"
+msgstr "Spolupráca"
+
+msgid "Components"
+msgstr "Komponenty"
+
+msgid "Rooms"
+msgstr "Miestnosti"
+
+msgid "Directories"
+msgstr "Adresáre"
+
+msgid "Gateways"
+msgstr "Brány"
+
+msgid "News"
+msgstr "Novinky"
+
+msgid "Hierarchy"
+msgstr "Hierarchia"
+
+msgid "Proxies"
+msgstr "Proxy servery"
+
+msgid "Publication/Subscription"
+msgstr "Publikovanie/Odoberanie"
+
+msgid "Storage"
+msgstr "Úložisko"
+
+msgid "Service offline or broken"
+msgstr "Služba je vypnutá alebo nefunkčná"
+
+msgid "Your inbox"
+msgstr "Vaše prijaté správy"
+
+msgid "Available actions"
+msgstr "Dostupné akcie"
+
+msgid "Clean"
+msgstr "Vyčistiť"
+
+msgid "New"
+msgstr "Nová"
+
+msgid "Received"
+msgstr "Prijaté"
+
+msgid "Subject"
+msgstr "Predmet"
+
+msgid "Content"
+msgstr "Obsah"
+
+msgid "Send message"
+msgstr "Poslať správu"
+
+msgid "Your inbox is empty."
+msgstr "Vaša schránka prijatých správ je prázdna"
+
+msgid "MUC administration"
+msgstr "MUC administrácia"
+
+msgid "You administrate this room"
+msgstr "Spravujete túto miestnosť"
+
+msgid "Enter new subject"
+msgstr "Vložte nový predmet"
+
+msgid "Configuration"
+msgstr "Konfigurácia"
+
+msgid "Authorizations"
+msgstr "Autorizácia"
+
+msgid "Member list"
+msgstr "Zoznam členov"
+
+msgid "Owner list"
+msgstr "Zoznam vlastníkov"
+
+msgid "Administrator list"
+msgstr "Zoznam administrátorov"
+
+msgid "Outcast list"
+msgstr "Zoznam neželaných"
+
+msgid "Add an input"
+msgstr "Pridaj člena"
+
+msgid "Destroy this MUC"
+msgstr "Znič toto MUC"
+
+msgid "Yes, let's do it!"
+msgstr "Áno, do toho!"
+
+msgid "Your friend is paying attention to the conversation."
+msgstr "Váš priateľ sleduje konverzáciu"
+
+msgid "Your friend is writing a message..."
+msgstr "Váš priateľ píše..."
+
+msgid "Your friend stopped writing a message."
+msgstr "Váš priateľ prestal písať."
+
+msgid "Your friend is doing something else."
+msgstr "Váš priateľ robí niečo iné."
+
+msgid "Your friend closed the chat."
+msgstr "Váš priateľ zavrel rozhovor"
+
+msgid "Requesting this service..."
+msgstr "Požaduje túto službu.."
+
+msgid "Loading"
+msgstr "Načítava"
+
+msgid "joined the chat room"
+msgstr "vstúpil do miestnosti"
+
+msgid "left the chat room"
+msgstr "opustil miestnosť"
+
+msgid "no status"
+msgstr "bez statusu"
+
+msgid "has been kicked"
+msgstr "bol vykopnutý"
+
+msgid "has been banned"
+msgstr "bol zabanovaný"
+
+msgid "no reason"
+msgstr "neudaný dôvod"
+
+msgid "Communicate with the entire world!"
+msgstr "Komunikujte s celým svetom!"
+
+msgid "It allows you to get in touch with the millions of users who currently use the XMPP network like you do with Jappix. Join the community and stay free!"
+msgstr "Umožní vám byť v kontakte s miliónmi užívateľov, ktorí práve využívajú XMPP sieť ako vy s Jappix. Pridajte sa ku komunite a zostaňte voľný!"
+
+msgid "Hi there!"
+msgstr "Ahoj!"
+
+msgid "Welcome on %1s, “%2s”."
+msgstr "Vitajte na %1s, “%2s”."
+
+msgid "Login to your existing XMPP account or create a new one for free!"
+msgstr "Prihlás sa do svojho existujúceho XMPP účtu alebo vytvor nový zadarmo!"
+
+msgid "Jappix is an open-source project from PostPro, a non-profit organization which provides us a great help."
+msgstr "Jappix je open-source projekt od PostPro, neziskovej organizácie ktorá nám poskytuje veľkú podporu."
+
+msgid "Login to your existing XMPP account. You can also use the %s to join a groupchat."
+msgstr "Prihlás sa do svojho existujúceho XMPP účtu. Taktiež možeš použiť %s pre pripojenie ku skupinovému rozhovoru"
+
+msgid "Previous"
+msgstr "Predchádzajúce"
+
+msgid "General"
+msgstr "Všeobecné"
+
+msgid "Advanced"
+msgstr "Pokročilé"
+
+msgid "Resource"
+msgstr "Zdroj"
+
+msgid "Priority"
+msgstr "Priorita"
+
+msgid "Low"
+msgstr "Nízka"
+
+msgid "Medium"
+msgstr "Stredná"
+
+msgid "High"
+msgstr "Vysoká"
+
+msgid "Enter the groupchat you want to join and the nick you want to have. You can also go back to the %s."
+msgstr "Zadajte názov skupinového rozhovoru ku ktorému sa chcete pridať a prezývku akú chcete. Alebo sa môžete vrátiť na %s."
+
+msgid "login page"
+msgstr "prihlásenie"
+
+msgid "Share this link with your friends:"
+msgstr "Zdieľaj tento odkaz s priateľmi:"
+
+msgid "Register a new XMPP account to join your friends on your own social cloud. That's simple!"
+msgstr "Zaregistruj nový XMPP účet a spoj sa s priateľmi vo svojej vlastnej socialnej sieti. Je to ednoduché!"
+
+msgid "Required"
+msgstr "Povinné"
+
+msgid "You have been registered, here is your XMPP address:"
+msgstr "Boli ste zaregistrovaný, tu je vaša XMPP adresa:"
+
+msgid "Manager"
+msgstr "Správca"
+
+msgid "Project"
+msgstr "Projekt"
+
+msgid "Encrypted"
+msgstr "Šifrovane"
+
+msgid "Unencrypted"
+msgstr "Nešifrované"
+
+msgid "Where are you?"
+msgstr "Kde ste?"
+
+msgid "What's up with you?"
+msgstr "Čo je s vami?"
+
+msgid "Fetching the social channel..."
+msgstr "Preberanie kanálu..."
+
+msgid "You are synchronized with your network."
+msgstr "Ste synchronizovaný s vašou sieťou"
+
+msgid "Cannot send anything: you can only receive notices!"
+msgstr "Nemôžete nič odoslať: môžete iba príjmať správy!"
+
+msgid "Media viewer"
+msgstr "Prehliadač médii"
+
+msgid "Browse"
+msgstr "Prehľadať"
+
+msgid "Command"
+msgstr "Príkaz"
+
+msgid "Subscribe"
+msgstr "Odoberať"
+
+msgid "Join"
+msgstr "Pridať sa"
+
+msgid "Automatic"
+msgstr "Automaticky"
+
+msgid "Search"
+msgstr "Hľadať"
+
+msgid "No result!"
+msgstr "Žiadne výsledky!"
+
+msgid "No notifications."
+msgstr "Žiadne upozornenia"
+
+msgid "would like to add you as a friend."
+msgstr "si vás chce pridať ako priateľa"
+
+msgid "would like you to join this chatroom:"
+msgstr "chce aby ste vstúpili do miestnosti:"
+
+msgid "Do you accept?"
+msgstr "Súhlasíte?"
+
+msgid "Yes"
+msgstr "Áno"
+
+msgid "No"
+msgstr "Nie"
+
+msgid "would like to get authorization."
+msgstr "žiada o povolenie."
+
+msgid "Do you want to see the friends %s suggests you?"
+msgstr "Chcete vidieť priateľov, ktorých vám %s navrhuje? "
+
+msgid "Submit"
+msgstr "Povoliť"
+
+msgid "Client"
+msgstr "Klient"
+
+msgid "System"
+msgstr "Systém"
+
+msgid "Local time"
+msgstr "Lokálny čas"
+
+msgid "Comments"
+msgstr "Komentáre"
+
+msgid "User profile"
+msgstr "Užívateľov profil"
+
+msgid "See his/her position on the globe"
+msgstr "Zobraz jeho/jej pozíciu na zemeguli"
+
+msgid "Confirm"
+msgstr "Potvrdiť"
+
+msgid "anonymous mode"
+msgstr "anonymný mód"
+
+msgid "Groups"
+msgstr "Skupiny"
+
+msgid "Unclassified"
+msgstr "Nezaradené"
+
+msgid "Authorize"
+msgstr "Povoliť"
+
+msgid "Ask for authorization"
+msgstr "Požiadaj o povolenie"
+
+msgid "Unblock"
+msgstr "Odblokovať"
+
+msgid "Prohibit"
+msgstr "Zakázať"
+
+msgid "Block"
+msgstr "Blokovať"
+
+msgid "Chat"
+msgstr "Rozhovor"
+
+msgid "Groupchat"
+msgstr "Skupinový rozhovor"
+
+msgid "Jappix Mobile"
+msgstr "Jappix Mobile"
+
+msgid "Desktop"
+msgstr "Počítač"
+
+msgid "Mobile"
+msgstr "Mobil"
+
+msgid "Please wait..."
+msgstr "Čakajte prosím..."
+
+msgid "Please enable JavaScript"
+msgstr "Povoľte JavaScript prosím"
+
+msgid "Your channel"
+msgstr "Váš kanál"
+
+msgid "Channel of"
+msgstr "Kanál užívateľa"
+
+msgid "More notices..."
+msgstr "Ďaľšie upozornenia..."
+
+msgid "Attach a file"
+msgstr "Pripojiť súbor"
+
+msgid "Send"
+msgstr "Odoslať"
+
+msgid "Unattach the file"
+msgstr "Odpojiť súbor"
+
+msgid "An error occured while uploading your file: maybe it is too big (%s maximum) or forbidden!"
+msgstr "Stala sa chyba počas nahrávania vášho súboru: možno je príliš veľký ($s maximum) alebo zakázaný!"
+
+msgid "Authorization failed"
+msgstr "Overenie zlyhalo"
+
+msgid "Registration failed, please choose a different username"
+msgstr "Registrácia zlyhala, zvoľte prosím iné užívateľské meno"
+
+msgid "Service unavailable"
+msgstr "Služba je nedostupná"
+
+msgid "Internal server error, try later"
+msgstr "Internal server error, skúste neskôr"
+
+msgid "Your form has been sent."
+msgstr "Váš formulár bol odoslaný"
+
+msgid "Application"
+msgstr "Aplikácia"
+
+msgid "XMPP links"
+msgstr "XMPP odkaz"
+
+msgid "Open XMPP links with Jappix"
+msgstr "Otvoriť XMPP odkazy pomocou Jappix"
+
+msgid "changed the subject to:"
+msgstr "zmenil predmet na"
+
+msgid "Welcome!"
+msgstr "Vitajte!"
+
+msgid "Friends"
+msgstr "Priatelia"
+
+msgid "Welcome on Jappix, your own social cloud!"
+msgstr "Vitajte na Jappix, vašej vlastnej sociálnej sieti!"
+
+msgid "Before you start using it, you will have to change some settings, search for friends and complete your profile."
+msgstr "Skôr než ju začnete používať, mali by ste zmeniť niektoré nastavenia, vyhľadať priateľov a vyplniť svoj profil."
+
+msgid "Enable notification sounds"
+msgstr "Povoliť zvuk upozornení"
+
+msgid "Share your position on the globe"
+msgstr "Zdieľať svoju polohu na zemeguli"
+
+msgid "Offline friends"
+msgstr "Odpojení priatelia"
+
+msgid "Don't hide offline friends"
+msgstr "Neskrývať odpojených priateľov"
+
+msgid "Use this tool to find your friends on the server you are using right now, or add them later."
+msgstr "Použite tento nástroj na vyhľadanie vašich priateľov na serveri, ktorý používate, alebo ich pridajte neskôr."
+
+msgid "Great work! Now, you can share Jappix with your friends!"
+msgstr "Výborne! Teraz môžte zdielať Jappix s priateľmi!"
+
+msgid "When you will press the save button, the profile editor will be opened. Happy socializing!"
+msgstr ""
+
+msgid "Share Jappix on %s"
+msgstr "Zdieľať Jappix na %s"
+
+msgid "Using Jappix, an open social platform. I am %s!"
+msgstr "Používam Jappix, otvorenú socialnu platformu. Ja som %s!"
+
+msgid "Unknown name"
+msgstr "Neznáme meno"
+
+msgid "Unknown country"
+msgstr "Neznáma krajina"
+
+msgid "Click to enable"
+msgstr "Klikni pre zapnutie"
+
+msgid "Click to disable"
+msgstr "Klikni pre vypnutie"
+
+msgid "Installation"
+msgstr "Inštalácia"
+
+msgid "Jappix installation"
+msgstr "Jappix inštalácia"
+
+msgid "Welcome to the Jappix installation!"
+msgstr "Vitajte v Jappix inštalácii"
+
+msgid "This tool will help you fastly install Jappix, the first full-featured XMPP-based social platform, on your server. You don't even need any technical knowledge."
+msgstr "Tento nástroj vám pomôže rýchlo nainštalovať Jappix, prvú plnohodnotnú sociálnu platformu založenú na XMPP, na váš server. Nebudete dokonca potrebovať žiadne technické znalosti.( takmer :) ))"
+
+msgid "Let's have a look at the installation steps:"
+msgstr "Poďme sa pozrieť na inštalačné kroky:"
+
+msgid "Welcome"
+msgstr "Vitajte"
+
+msgid "Storage configuration"
+msgstr "Nastavenie úložiska"
+
+msgid "Administrator account"
+msgstr "Administračný účet"
+
+msgid "Main configuration"
+msgstr "Hlavná konfigurácia"
+
+msgid "Hosts configuration"
+msgstr "Hosts configuration"
+
+msgid "Services installation"
+msgstr "Inštalácia služieb"
+
+msgid "If the current language does not match yours (%1s), you can make Jappix speak %2s it will be saved."
+msgstr "Pokiaľ sa tento jazyk nezhoduje s vašim (%1s), môžete nechať Jappix hovoriť %2s.Voľba bude uložená."
+
+msgid "If you want to get some help about the Jappix installation and configuration, you can use our whole documentation, available at:"
+msgstr "Pokiaľ potrebujete pomoc ohľadom inštalácie a konfigurácie Jappix, môžete použiť dokumentáciu, dostupnú na:"
+
+msgid "It's time to build your own social cloud: just go to the next step!"
+msgstr "Nastal čas vybudovať vašu vlastnú socialnu sieť: stačí prejsť do daľšieho kroku!"
+
+msgid "Jappix stores persistent data (such as shared files, chat logs, your own music and its configuration) into a single secured storage folder."
+msgstr "Jappix ukladá natrvalo dáta (ako sú zdieľané súbory,vaša vlastná hudba a svoju konfiguráciu) do jedinej zabezpečenej zložky"
+
+msgid "Jappix must be able to write in this folder to create its sub-directories. If not, you must set the rights to %1s or change the folder owner to %2s (depending of your configuration)."
+msgstr "Jappix musí mať právo zapisovať v tejto zložke pre vytvorenie svojich podzložiek. Ak nie, musíte nastaviť oprávnenia na %1s alebo zmeniť vlastníka zložky na %2s (závisí od vašej konfigurácie))"
+
+msgid "The folder is writable, you can continue!"
+msgstr "Do zložky je možné zapisovať, môžete pokračovať!"
+
+msgid "Jappix offers you the possibility to manage your configuration, install new addons or search for updates. That's why you must create an administrator account to access the manager."
+msgstr "Jappix vám ponúka možnosť spravovať vaše konfiguráciu, inštalovať nové addony alebo vyhľadať aktualizácie. Preto si musíte vytvoriť administračný účet pre prístup k Správcovi."
+
+msgid "When Jappix will be installed, just click on the manager link on the home page to access it."
+msgstr "Po nainštalovaní Jappix, stačí kliknúť na odkaz Správca na domovskej stránke pre prístup."
+
+msgid "Oops, you missed something or the two passwords do not match!"
+msgstr "Ups, niečo ste prehliadli alebo heslá nesúhlasia!"
+
+msgid "Jappix needs that you specify some values to work. Please correct the following inputs (or keep the default values, which are sufficient for most people)."
+msgstr "Jappix vyžaduje nastavenie niekoľkých hodnôt. Prosím, upravte nasledujúce hodnoty (alebo ponechajte predvolené, ktoré vyhovujú väčšine užívatelov). )"
+
+msgid "Note that if you don't specify a value which is compulsory, it will be automatically completed with the default one."
+msgstr "Ak nenastavíte povinné údaje, budú nastavené na predvolené hodnoty"
+
+msgid "User"
+msgstr "Užívateľ"
+
+msgid "Service"
+msgstr "Služba"
+
+msgid "Service name"
+msgstr "Meno služby"
+
+msgid "Service description"
+msgstr "Popis služby"
+
+msgid "Connection"
+msgstr "Pripojenie"
+
+msgid "Lock the host"
+msgstr "Uzamknúť host"
+
+msgid "Anonymous mode"
+msgstr "Anonymný mód"
+
+msgid "Registration allowed"
+msgstr "Registrácia povolená"
+
+msgid "Use a proxy"
+msgstr "Použiť proxy"
+
+msgid "Encryption"
+msgstr "Šifrovanie"
+
+msgid "HTTPS storage"
+msgstr "HTTPS úložisko"
+
+msgid "Force HTTPS"
+msgstr "Vynútiť HTTPS"
+
+msgid "Compression"
+msgstr "Kompresia"
+
+msgid "This page helps you specify the default hosts Jappix will connect to. You can leave it as it is and continue if you want to use the official service hosts."
+msgstr "Táto stránka vám pomôže nastaviť predvoleného Hostiteľa. Použite predvolené ak chcete využívať oficialnu službu Hostiteľa"
+
+msgid "Maybe you don't know what a BOSH server is? In fact, this is a relay between a Jappix client and a XMPP server, which is necessary because of technical limitations."
+msgstr "BOSH server je v podstate spojenie medzi Jappix klientom a XMPP serverom, ktoré je nevyhnutné z dôvodu technických obmedzení"
+
+msgid "Main host"
+msgstr "Hlavný hostiteľ (Main host)"
+
+msgid "Groupchat host"
+msgstr "Hostiteľ Skupinových rozhovorov (Groupchat host)"
+
+msgid "Anonymous host"
+msgstr "Anonymous host"
+
+msgid "Directory host"
+msgstr "Directory host"
+
+msgid "BOSH host"
+msgstr "BOSH host"
+
+msgid "You can install some extra softwares on your server, to extend your Jappix features. Some others might be modified, because of security restrictions which are set by default."
+msgstr "Môžete nainštalovať doplnky pre rozšírenie funkcionality Jappix. Niektoré môžete dodatočne upraviť, najmä z dôvodu bezpečnostných obmedzení, ktoré sú nastavené ako predvolené."
+
+msgid "To perform this, you must be able to access your server's shell and be logged in as root. Remember this is facultative, Jappix will work without these modules, but some of its features will be unavailable."
+msgstr "Pre vykonanie musíte mať prístup k terminálu serveru a byť prihlásený ako root. Jappix bude pracovať aj bez týchto modulov ale niektoré z funkcii budú nedostupné"
+
+msgid "After you finished the setup, Jappix will generate the cache files. It might be slow, just wait until the application is displayed and do not press any button."
+msgstr "Keď skončíte nastavovanie, Jappix vygeneruje cache súbory. Môže to chvíľu trvať, počkajte pokiaľ sa nezobrazí aplikácia a nestláčajte žiadne tlačidlo."
+
+msgid "Thanks for using Jappix!"
+msgstr "Ďakujeme za používanie Jappix-u!"
+
+msgid "Next"
+msgstr "Ďalej"
+
+msgid "Finish"
+msgstr "Dokončiť"
+
+msgid "Check again"
+msgstr "Opakovať"
+
+msgid "The folder is not writable, set the right permissions to the %s directory."
+msgstr "V zložke sa nedá zapisovať, nastavte práva pre zložku %s."
+
+msgid "%s is installed on your system."
+msgstr "%s je nainštalovaný vo vašom systéme"
+
+msgid "%1s is not installed on your system, you should install %2s."
+msgstr "%1s nie je nainštalovaný vo vašom systéme, nainštalujte %2s."
+
+msgid "PHP maximum upload size is sufficient (%s)."
+msgstr "PHP maximum upload size je dostatočná (%s)"
+
+msgid "PHP maximum upload size is not sufficient (%1s), you should define it to %2s in %3s."
+msgstr "PHP maximum upload size nie je dostatočná (%1s), mali by ste ju nastaviť na%2s v %3s."
+
+msgid "Jappix manager"
+msgstr "Jappix správca"
+
+msgid "Manager access"
+msgstr "Administrácia"
+
+msgid "Statistics"
+msgstr "Štatistika"
+
+msgid "Hosts"
+msgstr "Hosts"
+
+msgid "Design"
+msgstr "Dizajn"
+
+msgid "Repeat"
+msgstr "Opakovať"
+
+msgid "All"
+msgstr "Všetko"
+
+msgid "Horizontal"
+msgstr "Horizontálne"
+
+msgid "Vertical"
+msgstr "Vertikálne"
+
+msgid "Center"
+msgstr "Stred"
+
+msgid "Left"
+msgstr "Vľavo"
+
+msgid "Right"
+msgstr "Vpravo"
+
+msgid "Top"
+msgstr "Hore"
+
+msgid "Bottom"
+msgstr "Dole"
+
+msgid "Adapt"
+msgstr "Prispôsobiť"
+
+msgid "Color"
+msgstr "Farba"
+
+msgid "Users"
+msgstr "Užívatelia"
+
+msgid "Updates"
+msgstr "Aktualizácie"
+
+msgid "This is a restricted area: only the authorized users can manage this Jappix node."
+msgstr "Iba autorizovaní užívatelia môžu spravovať tento Jappix uzol. "
+
+msgid "Please use the form below to login to the administration panel."
+msgstr "Použite nasledujúci formulár pre prihlásenie do Administračnej sekcie."
+
+msgid "To improve security, sessions are limited in time and when your browser will be closed, you will be logged out."
+msgstr "Pre zvýšenie bezpečnosti je prihlásenie časovo obmedzené a po zatvorení prehliadača budete odhlásený."
+
+msgid "Credentials"
+msgstr "Overenie"
+
+msgid "You have been logged out. Goodbye!"
+msgstr "Boli ste odhlásený, Dovidenia!"
+
+msgid "Oops, you could not be recognized as a valid administrator. Check your credentials!"
+msgstr "Ups, neboli ste rozpoznaný ako administrátor. Skontrolujte prihlasovacie údaje!"
+
+msgid "Basic statistics are processed by Jappix about some important things, you can find them below."
+msgstr "Štatistiky aplikácie Jappix"
+
+msgid "Change your Jappix node configuration with this tool."
+msgstr "Zmena konfigurácie uzla Jappix"
+
+msgid "Change the XMPP hosts that this Jappix node serve with this tool."
+msgstr "Zmena nastavení XMPP hostiteľov pre tento Jappix uzol"
+
+msgid "All this Jappix node stored files can be managed with this tool: please select a sub-folder and start editing its content!"
+msgstr "Všetky súbory na tomto Jappix uzle môžete spravovať pomocou tohto nástroja: vyberte podzložku a môžete editovať jej obsah."
+
+msgid "Jappix is fully customisable: you can change its design right here."
+msgstr "Jappix je plne prispôsobiteľný: jeho dizajn môžete zmeniť práve tu."
+
+msgid "This is not a valid image, please use PNG, GIF or JPG!"
+msgstr "Toto nie je platný obrázok, použite PNG,GIF alebo JPG "
+
+msgid "The image could not be received, would you mind retry?"
+msgstr "Obrázok nebol prijatý, prajete si zopakovať?"
+
+msgid "Your image was added to the list!"
+msgstr "Váš obrázok bol pridaný do zoznamu!"
+
+msgid "Changes saved!"
+msgstr "Zmeny uložené!"
+
+msgid "You can define more than one administrator for this Jappix node. You can also change a password with this tool."
+msgstr "Na tomto Jappix uzli môžte definovať viac ako jedného administrátora. Taktiež môžte zmeniť heslo."
+
+msgid "Update your Jappix node with this tool, or check if a new one is available. Informations about the latest version are also displayed (in english)."
+msgstr "Aktualizuj Jappix uzol alebo skontroluj či je dostupná nová verzia. Zobrazia sa informácie o poslednej verzii (v angličtine)"
+
+msgid "Access statistics"
+msgstr "Štatistiky prístupu"
+
+msgid "Share statistics"
+msgstr "Štatistiky zdieľania"
+
+msgid "Other statistics"
+msgstr "Ostatné štatistiky"
+
+msgid "January"
+msgstr "Január"
+
+msgid "February"
+msgstr "Február"
+
+msgid "March"
+msgstr "Marec"
+
+msgid "April"
+msgstr "Apríl"
+
+msgid "May"
+msgstr "Máj"
+
+msgid "June"
+msgstr "Jún"
+
+msgid "July"
+msgstr "Júl"
+
+msgid "August"
+msgstr "August"
+
+msgid "September"
+msgstr "September"
+
+msgid "October"
+msgstr "Október"
+
+msgid "November"
+msgstr "November"
+
+msgid "December"
+msgstr "December"
+
+msgid "Monday"
+msgstr "Pondelok"
+
+msgid "Tuesday"
+msgstr "Utorok"
+
+msgid "Wednesday"
+msgstr "Streda"
+
+msgid "Thursday"
+msgstr "Štvrtok"
+
+msgid "Friday"
+msgstr "Piatok"
+
+msgid "Saturday"
+msgstr "Sobota"
+
+msgid "Sunday"
+msgstr "Nedeľa"
+
+msgid "Total"
+msgstr "Celkom"
+
+msgid "Cache"
+msgstr "Cache"
+
+msgid "Logs"
+msgstr "Logy"
+
+msgid "Music"
+msgstr "Hudba"
+
+msgid "Backgrounds"
+msgstr "Pozadia"
+
+msgid "Share"
+msgstr "Zdieľanie"
+
+msgid "Background"
+msgstr "Pozadie"
+
+msgid "Notice"
+msgstr "Upozornenie"
+
+msgid "Your design preferences have been saved!"
+msgstr "Vaše nastavenie dizajnu bolo uložené"
+
+msgid "Please check your inputs: something is missing!"
+msgstr "Skontrolujte údaje, niečo chýba!"
+
+msgid "Change your Jappix node background with this tool. You can either set a custom color or an uploaded image. Let your creativity flow!"
+msgstr "Zmeňte pozadie vášho JAppix uzla.môžte si zvoliť farbu alebo uložený obrázok.Let your creativity flow!"
+
+msgid "Use default background"
+msgstr "Použit predvolené pozadie"
+
+msgid "Use your own image"
+msgstr "Použiť vlastný obrázok"
+
+msgid "Select a background to use and change the display options."
+msgstr "Vyberte pozadie ktoré bude použité a meňte nastavenia zobrazenia"
+
+msgid "Use your own color"
+msgstr "Použiť vlastnú farbu"
+
+msgid "Type the hexadecimal color value you want to use as a background."
+msgstr "Zadajte hexadecimálnu farbu pre vaše pozadie"
+
+msgid "Manage backgrounds"
+msgstr "Spravovať pozadia"
+
+msgid "You can add a new background to the list with this tool. Please send a valid image."
+msgstr "Pridajte nové pozadie to zoznamu. Pošlite platný obrázok"
+
+msgid "If you want to remove some backgrounds, use the browser below."
+msgstr "Ak chcete odobrať neaké pozadia, použite nasledujúci prehliadač "
+
+msgid "Define a homepage notice for all your users, such as a warn, an important message or an advert with this tool."
+msgstr "Nastavte upozornenie domovskej stránky pre všetkých užívateľov, napríklad varovanie, dôležitý oznam alebo reklamu."
+
+msgid "Simple notice"
+msgstr "Jednoduché upozornenie"
+
+msgid "This notice only needs simple text to be displayed, but no code is allowed!"
+msgstr "Toto oznámenie vyžaduje iba jednoduchý text, a žiaden kód nie je povolený"
+
+msgid "Advanced notice"
+msgstr "Pokročilé oznámenie"
+
+msgid "You can customize your notice with embedded HTML, CSS and JavaScript, but you need to code the style."
+msgstr "Vaše upozornenie môžete upraviť pomocou embedded HTML, CSS a JavaScriptom, ale musíte nakódovať stýl."
+
+msgid "Available updates"
+msgstr "Dostupné aktualizácie"
+
+msgid "What's new?"
+msgstr "Čo je nové?"
+
+msgid "Your storage folders are not writable, please apply the good rights!"
+msgstr "Vaša zložka na ukladanie nemá povolený zápis, upravte oprávnenia"
+
+msgid "%1s may cause problems to the proxy, please increase %2s value up to %3s!"
+msgstr "%1s môže spôsobiť problémy s proxy, zvýšte hodnotu %2s na %3s!"
+
+msgid "You are using a development version of Jappix. Update it through our repository by executing: %s."
+msgstr "Práve používate vývojovú verziu. Aktualizujte ju prostredníctvom nášho repozitáru spustením: %s."
+
+msgid "A new Jappix version is available! Check what is new and launch the update!"
+msgstr "Dostupná nová verzia Jappix! Skontrolujte čo je nové a spustite update!"
+
+msgid "Your version is out to date. Update it now to %s by clicking here!"
+msgstr "Vaša verzia je neaktuálna. Aktualizujte ju na %s kliknutím sem!"
+
+msgid "Your version seems to be up to date, but you can check updates manually by clicking here."
+msgstr "Vaša verzia sa zdá byť aktuálna, ale môžete skontrolovať aktualizácie kliknutím sem."
+
+msgid "Check for updates"
+msgstr "Skontrolovať aktualizácie"
+
+msgid "Update in progress"
+msgstr "Prebieha aktualizácia"
+
+msgid "Jappix has been updated: you are now running the latest version. Have fun!"
+msgstr "Jappix bol aktualizovaný: práve používate najnovšiu verziu. Bavte sa!"
+
+msgid "The update has failed! Please try again later."
+msgstr "Aktualizácia zlyhala! Skúste to neskôr prosím."
+
+msgid "Downloading package..."
+msgstr "Preberanie balíku.."
+
+msgid "Removing current Jappix system files..."
+msgstr "Odstraňovanie súčastných systémových súborov Jappixu.."
+
+msgid "Extracting package..."
+msgstr "Rozbaľovanie balíku..."
+
+msgid "Regenerating storage folder tree..."
+msgstr "Regenerovanie storage folder tree..."
+
+msgid "Jappix is now up to date!"
+msgstr "Jappix je aktualizovaný!"
+
+msgid "Aborted: socket error!"
+msgstr "Prerušené: socket error!"
+
+msgid "Aborted: buffer error!"
+msgstr "Prerušené: buffer error!"
+
+msgid "Aborted: everything is not writable!"
+msgstr "Prerušené: everything is not writable!"
+
+msgid "Aborted: could not extract the package!"
+msgstr "Prerušené: nedá sa rozbaliť balík!"
+
+msgid "Visits"
+msgstr "Návštevnosť"
+
+msgid "Daily"
+msgstr "Denne"
+
+msgid "Weekly"
+msgstr "Týždenne"
+
+msgid "Monthly"
+msgstr "Mesačne"
+
+msgid "Yearly"
+msgstr "Ročne"
+
+msgid "Size"
+msgstr "Veľkosť"
+
+msgid "Clean everything"
+msgstr "Vyčisti všetko"
+
+msgid "Purge cache"
+msgstr "Zbaviť sa cache"
+
+msgid "Purge logs"
+msgstr "Zbaviť sa logov"
+
+msgid "Purge updates"
+msgstr "Zbaviť sa aktualizácii"
+
+msgid "The storage folder you wanted to clean is now empty!"
+msgstr "Odkladací priestor, ktorý ste chceli vyčistiť je teraz prázdny!"
+
+msgid "Keep your Jappix node fresh and fast, clean the storage folders regularly!"
+msgstr "Udržujte váš Jappix uzol čerstvý a rýchly, čistite pravidelne odkladací priestor!"
+
+msgid "Upload your music (Ogg Vorbis, MP3 or WAV) to be able to listen to it in Jappix!"
+msgstr "Nahrajte svoju hudbu (Ogg Vorbis, MP3 alebo WAV) a môžte ju počúvať v Jappixe!"
+
+msgid "The file you want to upload must be smaller than %s."
+msgstr "Súbor, ktorý chcete nahrať musí byť menší ako %s."
+
+msgid "Stay tuned in what your users store on your server and remove undesired content with this tool."
+msgstr "Zostaňte v obraze o tom čo vaši užívatelia ukladajú na váš server a odstráňte neželaný obsah pomocou tohto nástroja"
+
+msgid "Title"
+msgstr "Titul"
+
+msgid "Artist"
+msgstr "Umelec"
+
+msgid "Album"
+msgstr "Album"
+
+msgid "File"
+msgstr "Súbor"
+
+msgid "Upload"
+msgstr "Nahrať"
+
+msgid "The folder is empty."
+msgstr "Zložka je prázdna"
+
+msgid "The music could not be received, please retry!"
+msgstr "Hudbu sa nepodarilo prevziať, prosím skúste znova!"
+
+msgid "This is not a valid music file, please encode in Ogg Vorbis, MP3 or WAV!"
+msgstr "Toto nie je platný hudobný súbor. konvertujte ho na Ogg Vorbis, MP3 alebo WAV!"
+
+msgid "Your music has been added!"
+msgstr "Vaša hudba bola pridaná!"
+
+msgid "The selected elements have been removed."
+msgstr "Vybrané položky budú odstránené."
+
+msgid "You must select elements to remove!"
+msgstr "Musíte vybrať položky na odstránenie!"
+
+msgid "Add a new user with this tool, or change a password (type an existing username). Please submit a strong password!"
+msgstr "Pridaj užívateľa alebo zmeň heslo (zadaj existujuce užívateľské meno). Zvoľte silné heslo!"
+
+msgid "Manage"
+msgstr "Spravovať"
+
+msgid "List"
+msgstr "Zoznam"
+
+msgid "Remove users with this tool. Note that you cannot remove an user if he is the only one remaining."
+msgstr "Odstráň užívateľa, Pamätajte že nemôžete odstrániť užívateľa ak je posledný."
+
+msgid "The user has been added!"
+msgstr "Užívateľ bol pridaný"
+
+msgid "The chosen users have been removed."
+msgstr "Vybraný užívateľ bol odstránený."
+
+msgid "You must select one or more users to be removed!"
+msgstr "Musíte vybrať jedného alebo viacerých užívateľov pre odstránenie!"
+
+msgid "Yesterday"
+msgstr "Včera"
+
+msgid "%s days ago"
+msgstr "Pred %s dňami"
+
+msgid "User currently active"
+msgstr "Užívateľ je aktívny"
+
+msgid "Last seen: %s"
+msgstr "Naposledy videný: %s"
+
+msgid "Inactive since: %s"
+msgstr "Neaktívny od: %s"
+
+msgid "Your friend seems not to have received your message(s)!"
+msgstr "Zdá sa že váš priateľ nedostal nedostal vašu správu(y)!"
+
+msgid "Static content server"
+msgstr "Static content server"
+
+msgid "This is the static content server for %1s, “%2s”."
+msgstr "Toto je statický obsah serveru pre %1s, “%2s”."
+
+msgid "Suggested friends"
+msgstr "Navrhovaní priatelia"
+
+msgid "Check all"
+msgstr "Označit všetko"
+
+msgid "Uncheck all"
+msgstr "Odznačit všetko"
+
+msgid "Choose"
+msgstr "Zvoliť"
+
+msgid "List name"
+msgstr "Meno zoznamu"
+
+msgid "Allow"
+msgstr "Povoliť"
+
+msgid "Deny"
+msgstr "Zamietnuť"
+
+msgid "Group"
+msgstr "Skupina"
+
+msgid "Subscription"
+msgstr "Odoberanie"
+
+msgid "Both"
+msgstr "Obe"
+
+msgid "From"
+msgstr "Od"
+
+msgid "Everybody"
+msgstr "Všetci"
+
+msgid "Send messages"
+msgstr "Poslať správu"
+
+msgid "Send queries"
+msgstr "Send queries"
+
+msgid "See my status"
+msgstr "Zobraziť môj status"
+
+msgid "Send his/her status"
+msgstr "Odoslať jeho-jej status"
+
+msgid "Everything"
+msgstr "Všetko"
+
+msgid "Item"
+msgstr "Položka"
+
+msgid "Order"
+msgstr "Poradie"
+
+msgid "Active for this session"
+msgstr "Aktívny pre toto sedenie"
+
+msgid "Always active"
+msgstr "Vždy aktívny"
+
+msgid "User directory"
+msgstr ""
+
+msgid "Search a friend"
+msgstr "Vyhľadať priateľa"
+
+msgid "The feature requested is not implemented by the recipient or server and therefore cannot be processed."
+msgstr ""
+
+msgid "This is a repeat from %s"
+msgstr ""
+
+msgid "Loading comments..."
+msgstr ""
+
+msgid "Type your comment here..."
+msgstr ""
+
+msgid "Could not get the comments!"
+msgstr ""
+
+msgid "Show comments"
+msgstr ""
+
+msgid "Send him/her a message"
+msgstr ""
+
+msgid "Start a chat with him/her"
+msgstr ""
+
+msgid "Media integration"
+msgstr ""
+
+msgid "Comments locked!"
+msgstr ""
+
+msgid "Type something you want to share with your friends..."
+msgstr ""
+
+msgid "changed his/her nickname to %s"
+msgstr ""
+
+msgid "commented an item you follow: “%s”."
+msgstr ""
+
+msgid "Hide"
+msgstr ""
+
+msgid "liked your post: “%s”."
+msgstr ""
+
+msgid "quoted you somewhere: “%s”."
+msgstr ""
+
+msgid "published on your wall: “%s”."
+msgstr ""
+
+msgid "tagged you in a photo (%s)."
+msgstr ""
+
+msgid "tagged you in a video (%s)."
+msgstr ""
+
+msgid "Show"
+msgstr ""
+
+msgid "Need help? You'd better read our documentation page about how to fill this form!"
+msgstr ""
+
+msgid "Pubsub host"
+msgstr ""
+
+msgid "Jappix is a great social platform, that you can access wherever you are, whenever you want and communicate with whovever you want."
+msgstr ""
+
+msgid "Manager link"
+msgstr ""
+
+msgid "User uploads server"
+msgstr ""
+
+msgid "This is the user uploads server for %1s, “%2s”."
+msgstr ""
+
+msgid "Logo"
+msgstr ""
+
+msgid "You can set your own service logo to replace the default one. Take care of the size and the main color of each logo!"
+msgstr ""
+
+msgid "Upload each logo with the recommended maximum pixel size."
+msgstr ""
+
+msgid "This is not a valid image, please use the PNG format!"
+msgstr ""
+
+msgid "Your service logo has been successfully changed!"
+msgstr ""
+
+msgid "Your logo format must be PNG. Leave a field empty and the logo will not be changed."
+msgstr ""
+
+msgid "Remove this logo"
+msgstr ""
+
+msgid "View this logo"
+msgstr ""
+
+msgid "Send a file"
+msgstr ""
+
+msgid "Once uploaded, your friend will be prompted to download the file you sent."
+msgstr ""
+
+msgid "Groupchats to join"
+msgstr ""
+
+msgid "Purge sent files"
+msgstr ""
+
+msgid "would like to send you a file: “%s”."
+msgstr ""
+
+msgid "has accepted to received your file: “%s”."
+msgstr ""
+
+msgid "has rejected to receive your file: “%s”."
+msgstr ""
+
+msgid "could not receive your file: “%s”."
+msgstr ""
+
+msgid "has received a file exchange request: “%s”."
+msgstr ""
+
+msgid "Available shortcuts:"
+msgstr ""
+
+msgid "%s removes the chat logs"
+msgstr ""
+
+msgid "%s joins a groupchat"
+msgstr ""
+
+msgid "%s closes the chat"
+msgstr ""
+
+msgid "%s shows the user profile"
+msgstr ""
+
+msgid "%s sends a message to the room"
+msgstr ""
+
+msgid "%s changes your nickname"
+msgstr ""
+
+msgid "%s sends a message to someone in the room"
+msgstr ""
+
+msgid "%s changes the room topic"
+msgstr ""
+
+msgid "%s kicks an user of the room"
+msgstr ""
+
+msgid "%s bans an user of the room"
+msgstr ""
+
+msgid "%s invites someone to join the room"
+msgstr ""
+
+msgid "Social channel, chat and more."
+msgstr ""
+
+msgid "Create your public profile."
+msgstr ""
+
+msgid "A mini-chat for your website."
+msgstr ""
+
+msgid "Get Jappix, get support."
+msgstr ""
+
+msgid "Statistics around Jappix."
+msgstr ""
+
+msgid "Download Jappix for free."
+msgstr ""
+
+msgid "Find a public Jappix node."
+msgstr ""
+
+msgid "Public profile"
+msgstr ""
+
+msgid "Your profile anywhere on the Web."
+msgstr ""
+
+msgid "%s is a Jappix.com service which makes your XMPP profile public. It is easier to share it. No XMPP account is required to view your social channel, your current position and your contact details."
+msgstr ""
+
+msgid "Furthermore, every picture you post in your social channel is added to a beautiful picture timeline. You can now view the pictures you shared year by year."
+msgstr ""
+
+msgid "You can also use your XMPP avatar as a single avatar for every website, blog and forum you use. When you change it on XMPP, the new avatar appears everywhere. What a genious improvement!"
+msgstr ""
+
+msgid "Yay, let's create my public profile!"
+msgstr ""
+
+msgid "Enable my public profile"
+msgstr ""
+
+#~ msgid "Jappix is a non-profit social platform, that you can access wherever you are, whenever you want and communicate with whovever you want."
+#~ msgstr "Jappix je nezisková sociálna platforma, ku ktorej máte prístup kdekoľvek, kedykoľvek chcete a s kýmkoľvek chcete komunikovať"
+
+#~ msgid "See"
+#~ msgstr ""
+
+#~ msgid "Use default logo"
+#~ msgstr ""
+
+#~ msgid "Use your own logo"
+#~ msgstr ""
+
+#~ msgid "The recommended image format is PNG. Leave a field empty and the logo will not be changed."
+#~ msgstr ""
diff --git a/jappixmini/jappix/lang/sv/LC_MESSAGES/main.mo b/jappixmini/jappix/lang/sv/LC_MESSAGES/main.mo
new file mode 100644
index 00000000..5d659242
Binary files /dev/null and b/jappixmini/jappix/lang/sv/LC_MESSAGES/main.mo differ
diff --git a/jappixmini/jappix/lang/sv/LC_MESSAGES/main.po b/jappixmini/jappix/lang/sv/LC_MESSAGES/main.po
new file mode 100644
index 00000000..255b86f5
--- /dev/null
+++ b/jappixmini/jappix/lang/sv/LC_MESSAGES/main.po
@@ -0,0 +1,1870 @@
+# Swedish translations for Jappix package.
+# This file is distributed under the same license as the Jappix package.
+# This file was translated from CodingTeam at <http://codingteam.net/>.
+msgid ""
+msgstr ""
+"Project-Id-Version: Jappix\n"
+"PO-Revision-Date: 2012-01-16 21:25+0100\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"POT-Creation-Date: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+
+msgid "JavaScript is missing in your web browser, so that you will not be able to launch Jappix! Please fix this."
+msgstr "Jappix kräver Javascript för att fungera, men det saknas eller är avstängt i din webbläsare."
+
+msgid "An open social network"
+msgstr "Ett öppet socialt nätverk."
+
+msgid "Jappix has been interrupted by a network issue, a bug or bad login (check that you entered the right credentials), sorry for the inconvenience."
+msgstr "Jappix har blivit avbryten av ett nätverksproblem, en bugg eller felaktiga loginuppgifter (se till att du har skrivit rätt uppgifter), Vi ber om ursäkt för besväret."
+
+msgid "The element list on this server could not be obtained!"
+msgstr "Elementlistan på denna server kunde inte hämtas!"
+
+msgid "Your password has been changed, now you can connect to your account with your new login data."
+msgstr "Ditt lösenord har ändrats, du kan nu logga in med det."
+
+msgid "Your XMPP account has been removed, bye!"
+msgstr "Ditt XMPP konto har blivit borttaget. Hejdå!"
+
+msgid "You have been logged out of your XMPP account, have a nice day!"
+msgstr "Du har blivit utloggad från ditt XMPP konto. Ha en bra dag!"
+
+msgid "The room you joined seems not to exist. You should create it!"
+msgstr "Rummet du har gått med i verkar inte existera. Skapa det!"
+
+msgid "The groupchat has been removed, now someone else will be able to recreate it."
+msgstr "Gruppchatten har blivit borttagen. Nu kan någon annan återskapa den."
+
+msgid "The user that you want to reach is not present in the room."
+msgstr "Användaren som du vill nå är inte närvarande i detta rum."
+
+msgid "Please enter the group chat address to join."
+msgstr "Var god skriv in gruppchat adressen du vill gå med i."
+
+msgid "Please enter your nickname to join %s."
+msgstr "Var god skriv in ditt användarnamn för att gå med i %s."
+
+msgid "This room (%s) is protected with a password."
+msgstr "Rummet (%s) är lösenordskyddat."
+
+msgid "Your browser is out of date!"
+msgstr "Din webbläsare är för gammal!"
+
+msgid "Last %s version is better!"
+msgstr "Versionen &s är bättre!"
+
+msgid "Login"
+msgstr "Logga in"
+
+msgid "Register"
+msgstr "Registrera"
+
+msgid "Here we go!"
+msgstr "Sätt igång!"
+
+msgid "Server"
+msgstr "Server"
+
+msgid "Password"
+msgstr "Lösenord"
+
+msgid "Remember me"
+msgstr "Kom ihåg mig"
+
+msgid "This tool has been disabled, you cannot use it!"
+msgstr "Detta verktyg är inaktiverat, du kan inte använda det!"
+
+msgid "Due to a network issue, you were disconnected. What do you want to do now?"
+msgstr "På grund av ett nätverksproblem så har du blivit frånkopplad. Vad vill du göra nu?"
+
+msgid "Reconnect"
+msgstr "Återanslut"
+
+msgid "Messages"
+msgstr "Meddelanden"
+
+msgid "Profile"
+msgstr "Profil"
+
+msgid "Options"
+msgstr "Inställningar"
+
+msgid "Disconnect"
+msgstr "Koppla ner"
+
+msgid "Filter"
+msgstr "Filtrera"
+
+msgid "Add a friend"
+msgstr "Lägg till en vän"
+
+msgid "Your groupchats"
+msgstr "Dina gruppchatter"
+
+msgid "Manage your favorite groupchats"
+msgstr "Hantera dina favorit gruppchatter"
+
+msgid "More stuff"
+msgstr "Fler verktyg"
+
+msgid "Show all friends"
+msgstr "Visa alla vänner"
+
+msgid "Only show connected friends"
+msgstr "Visa bara anslutna vänner"
+
+msgid "Message archives"
+msgstr "Meddelandearkiv"
+
+msgid "Date"
+msgstr "Datum"
+
+msgid "Please select a friend to view the chat history."
+msgstr "Var god välj en vän för att se chathistoriken."
+
+msgid "Nothing found for: %s"
+msgstr "Inget hittades med: %s"
+
+msgid "A short message?"
+msgstr "Kort meddelande?"
+
+msgid "How are you?"
+msgstr "Hur mår du?"
+
+msgid "What are you doing?"
+msgstr "Vad gör du?"
+
+msgid "Join a chat"
+msgstr "Gå med i en chat"
+
+msgid "Status"
+msgstr "Tillstånd"
+
+msgid "Available"
+msgstr "Tillgänglig"
+
+msgid "Talkative"
+msgstr "Pratsam"
+
+msgid "Away"
+msgstr "Borta"
+
+msgid "Not available"
+msgstr "Ej tillgänglig"
+
+msgid "Busy"
+msgstr "Uppagen"
+
+msgid "Mood"
+msgstr "Humör"
+
+msgid "None"
+msgstr "Inget"
+
+msgid "Crazy"
+msgstr "Galen"
+
+msgid "Excited"
+msgstr "Upphetsad"
+
+msgid "Playful"
+msgstr "Lekfull"
+
+msgid "Happy"
+msgstr "Glad"
+
+msgid "Shocked"
+msgstr "Chockad"
+
+msgid "Hot"
+msgstr "Het"
+
+msgid "Sad"
+msgstr "Ledsen"
+
+msgid "Amorous"
+msgstr "Förälskad"
+
+msgid "Confident"
+msgstr "Självsäker"
+
+msgid "Activity"
+msgstr "Aktivitet"
+
+msgid "Chores"
+msgstr "Sysslor"
+
+msgid "Drinking"
+msgstr "Dricker"
+
+msgid "Eating"
+msgstr "Äter"
+
+msgid "Exercising"
+msgstr "Tränar"
+
+msgid "Grooming"
+msgstr "Förbereder"
+
+msgid "Appointment"
+msgstr "På möte"
+
+msgid "Inactive"
+msgstr "Inaktiv"
+
+msgid "Relaxing"
+msgstr "Slappnar av"
+
+msgid "Talking"
+msgstr "Pratar"
+
+msgid "Traveling"
+msgstr "Reser"
+
+msgid "Working"
+msgstr "Jobbar"
+
+msgid "View profile"
+msgstr "Visa profil"
+
+msgid "Repeat this notice"
+msgstr "Repetera notis"
+
+msgid "Remove this notice"
+msgstr "Radera notis"
+
+msgid "Your profile"
+msgstr "Din profil"
+
+msgid "Identity"
+msgstr "Identitet"
+
+msgid "Profile image"
+msgstr "Profilbild"
+
+msgid "Others"
+msgstr "Andra"
+
+msgid "Personal"
+msgstr "Personliga"
+
+msgid "Complete name"
+msgstr "Fullständigt namn"
+
+msgid "Nickname"
+msgstr "Smeknamn"
+
+msgid "First name"
+msgstr "Förnamn"
+
+msgid "Last name"
+msgstr "Efternamn"
+
+msgid "Date of birth"
+msgstr "Födelsedatum"
+
+msgid "Contact"
+msgstr "Kontakt"
+
+msgid "E-mail"
+msgstr "E-post"
+
+msgid "Phone"
+msgstr "Telefon nummer"
+
+msgid "Website"
+msgstr "Hemsida"
+
+msgid "Current"
+msgstr "Nuvarande"
+
+msgid "Delete"
+msgstr "Radera"
+
+msgid "What a pity! You have no profile image defined in your identity card!"
+msgstr "Vad synd! Du har ingen profilbild för ditt identitetskort!"
+
+msgid "Address"
+msgstr "Address"
+
+msgid "Street"
+msgstr "Gata"
+
+msgid "City"
+msgstr "Stad"
+
+msgid "Postal code"
+msgstr "Postnummer"
+
+msgid "Country"
+msgstr "Land"
+
+msgid "Biography"
+msgstr "Biografi"
+
+msgid "Important notice"
+msgstr "Viktigt meddelande"
+
+msgid "Be careful of the information you write into your profile, because it could be accessed by everyone (even someone you don't want to)."
+msgstr "Var försiktig med informationen du skriver in i din profil, det kan läsas av alla (till och med någon du inte vill ska se)."
+
+msgid "Not everything is private on XMPP; this is one of those things, your public profile (vCard)."
+msgstr "Allting är inte privat på XMPP, detta är en av sakerna. Din offentliga profil (vCard)."
+
+msgid "It is strongly recommended to upload a profile image (%s maximum), like a picture of yourself, because that makes you easily recognizable by your friends."
+msgstr "Det är rekommenderat att ladda upp en profilbild (max %s), som en bild på dig själv. Det gör det lätt att identifieras av dina vänner."
+
+msgid "Save"
+msgstr "Spara"
+
+msgid "Cancel"
+msgstr "Avbryt"
+
+msgid "Edit options"
+msgstr "Ändra inställningar"
+
+msgid "Channel"
+msgstr "Kanal"
+
+msgid "Commands"
+msgstr "Kommandon"
+
+msgid "Sounds"
+msgstr "Ljud"
+
+msgid "Privacy"
+msgstr "Integritet"
+
+msgid "Message archiving"
+msgstr "Meddelande arkivering"
+
+msgid "Store a history of your chats"
+msgstr "Spara en historik av dina chatter"
+
+msgid "Geolocation"
+msgstr "Geolocation"
+
+msgid "Empty"
+msgstr "Tom"
+
+msgid "Empty channel"
+msgstr "Tom kanal"
+
+msgid "Persistent"
+msgstr "Beständig"
+
+msgid "Maximum notices"
+msgstr "Maximalt antal notiser"
+
+msgid "Account"
+msgstr "Konto"
+
+msgid "Change password"
+msgstr "Ändra lösenord"
+
+msgid "Delete account"
+msgstr "Ta bort konto"
+
+msgid "Old"
+msgstr "Gammal"
+
+msgid "New (2 times)"
+msgstr "Ny"
+
+msgid "Continue"
+msgstr "Fortsätt"
+
+msgid "To"
+msgstr "Till"
+
+msgid "Close"
+msgstr "Stäng"
+
+msgid "unknown"
+msgstr "okänd"
+
+msgid "Unavailable"
+msgstr "Otillgänglig"
+
+msgid "is now"
+msgstr "är nu"
+
+msgid "Please wait while your avatar is uploaded..."
+msgstr "Var god vänta medans din profilbild uppladdas..."
+
+msgid "Here it is! A new beautiful profile image!"
+msgstr "Där är den! En ny vacker profilbild!"
+
+msgid "The image file is not supported or has a bad size."
+msgstr "Bildfilen stödjs ej eller har en ogiltlig storlek."
+
+msgid "Reply"
+msgstr "Svara"
+
+msgid "Error"
+msgstr "Fel"
+
+msgid "Click here to solve the error"
+msgstr "Klicka här för att lösa problemet"
+
+msgid "You"
+msgstr "Du"
+
+msgid "Remove"
+msgstr "Ta bort"
+
+msgid "Rename"
+msgstr "Byt namn"
+
+msgid "Hi, I am %s, I would like to add you as my friend."
+msgstr "Hej, Jag är %s och jag skulle vilja lägga till dig som min vän."
+
+msgid "Smiley insertion"
+msgstr "Smiley inläggning"
+
+msgid "Change style"
+msgstr "Ändra stil"
+
+msgid "Text in bold"
+msgstr "Bred text"
+
+msgid "Text in italic"
+msgstr "Kursiv text"
+
+msgid "Underlined text"
+msgstr "Understruken text"
+
+msgid "Save chat"
+msgstr "Spara chat"
+
+msgid "Click on the following link to get the chat log, and wait. Then click again to get the file."
+msgstr "Trycka på denna länk för att få chatloggen och vänta. Tryck sedan igen för att få filen."
+
+msgid "This chat is empty!"
+msgstr "Denna chat är tom!"
+
+msgid "Generate file!"
+msgstr "Generera fil!"
+
+msgid "Download file!"
+msgstr "Ladda ner fil!"
+
+msgid "Clean current chat"
+msgstr "Rensa nuvarande chat"
+
+msgid "View chat history"
+msgstr "Visa chathistorik"
+
+msgid "Show user profile"
+msgstr "Visa användarprofil"
+
+msgid "Add this contact to your friends"
+msgstr "Lägg till denna kontakt till dina vänner"
+
+msgid "Add this groupchat to your favorites"
+msgstr "Lägg till denna gruppchat till dina favoriter"
+
+msgid "All tabs"
+msgstr "Alla flikar"
+
+msgid "Close this tab"
+msgstr "Stäng denna flik"
+
+msgid "no subject defined for this room."
+msgstr "inget ämne satt i detta rum."
+
+msgid "Administration panel for this room"
+msgstr "Administrationspanel för detta rum"
+
+msgid "Moderators"
+msgstr "Moderatorer"
+
+msgid "Participants"
+msgstr "Deltagare"
+
+msgid "Visitors"
+msgstr "Besökare"
+
+msgid "Manage favorite rooms"
+msgstr "Hantera favoritrum"
+
+msgid "Change favorites"
+msgstr "Ändra favoriter"
+
+msgid "Search a room"
+msgstr "Sök efter ett rum"
+
+msgid "Select a favorite"
+msgstr "Välj en favorit"
+
+msgid "Getting the name..."
+msgstr "Få tag i namn..."
+
+msgid "Gateway"
+msgstr "Gateway"
+
+msgid "Name"
+msgstr "Namn"
+
+msgid "Room"
+msgstr "Rum"
+
+msgid "Add"
+msgstr "Lägg till"
+
+msgid "Edit"
+msgstr "Ändra"
+
+msgid "Search a room on"
+msgstr "Sök efter ett rum på"
+
+msgid "No room found on this server."
+msgstr "Inget rum hittat på denna server."
+
+msgid "Service discovery"
+msgstr "Tjänst upptäckande"
+
+msgid "Server to query"
+msgstr "Server att ifrågesätta"
+
+msgid "Sorry, but the entity didn't return any result!"
+msgstr "Ursäkta, men föremålet lämnade inga resultat!"
+
+msgid "Accounts"
+msgstr "Konton"
+
+msgid "Authentications"
+msgstr "Autentiseringar"
+
+msgid "Automation"
+msgstr "Automatik"
+
+msgid "Clients"
+msgstr "Klienter"
+
+msgid "Collaboration"
+msgstr "Kollaboration"
+
+msgid "Components"
+msgstr "Komponenter"
+
+msgid "Rooms"
+msgstr "Rum"
+
+msgid "Directories"
+msgstr "Kataloger"
+
+msgid "Gateways"
+msgstr ""
+
+msgid "News"
+msgstr "Nyheter"
+
+msgid "Hierarchy"
+msgstr "Hierarki"
+
+msgid "Proxies"
+msgstr ""
+
+msgid "Publication/Subscription"
+msgstr "Publicering/Prenumeration"
+
+msgid "Storage"
+msgstr "Lagring"
+
+msgid "Service offline or broken"
+msgstr "Tjänsten är ur funktion"
+
+msgid "Your inbox"
+msgstr "Din inkorg"
+
+msgid "Available actions"
+msgstr ""
+
+msgid "Clean"
+msgstr "Rensa"
+
+msgid "New"
+msgstr "Ny"
+
+msgid "Received"
+msgstr "Mottagen"
+
+msgid "Subject"
+msgstr "Ämne"
+
+msgid "Content"
+msgstr "Innehåll"
+
+msgid "Send message"
+msgstr "Skicka meddelande"
+
+msgid "Your inbox is empty."
+msgstr "Din inkorg är tom."
+
+msgid "MUC administration"
+msgstr ""
+
+msgid "You administrate this room"
+msgstr "Du administrerar detta rum"
+
+msgid "Enter new subject"
+msgstr "Ange nytt ämne"
+
+msgid "Configuration"
+msgstr "Inställningar"
+
+msgid "Authorizations"
+msgstr "Tillåtelser"
+
+msgid "Member list"
+msgstr "Medlemslista"
+
+msgid "Owner list"
+msgstr "Ägarlista"
+
+msgid "Administrator list"
+msgstr "Administratörslista"
+
+msgid "Outcast list"
+msgstr "Lista på uteslutna"
+
+msgid "Add an input"
+msgstr ""
+
+msgid "Destroy this MUC"
+msgstr ""
+
+msgid "Yes, let's do it!"
+msgstr "Ja, kör på!"
+
+msgid "Your friend is paying attention to the conversation."
+msgstr ""
+
+msgid "Your friend is writing a message..."
+msgstr "Din vän skriver..."
+
+msgid "Your friend stopped writing a message."
+msgstr "Din vän slutade skriva."
+
+msgid "Your friend is doing something else."
+msgstr ""
+
+msgid "Your friend closed the chat."
+msgstr ""
+
+msgid "Requesting this service..."
+msgstr ""
+
+msgid "Loading"
+msgstr "Startar"
+
+msgid "joined the chat room"
+msgstr "kom in i rummet"
+
+msgid "left the chat room"
+msgstr "lämnade rummet"
+
+msgid "no status"
+msgstr "ingen status"
+
+msgid "has been kicked"
+msgstr "har sparkats ut"
+
+msgid "has been banned"
+msgstr "har utestängts"
+
+msgid "no reason"
+msgstr "ingen anledning"
+
+msgid "Communicate with the entire world!"
+msgstr "Kommunicera med hela världen!"
+
+msgid "It allows you to get in touch with the millions of users who currently use the XMPP network like you do with Jappix. Join the community and stay free!"
+msgstr ""
+
+msgid "Hi there!"
+msgstr "Hej där!"
+
+msgid "Welcome on %1s, “%2s”."
+msgstr "Välkommen till %1s, “%2s”."
+
+msgid "Login to your existing XMPP account or create a new one for free!"
+msgstr ""
+
+msgid "Jappix is an open-source project from PostPro, a non-profit organization which provides us a great help."
+msgstr ""
+
+msgid "Login to your existing XMPP account. You can also use the %s to join a groupchat."
+msgstr ""
+
+msgid "Previous"
+msgstr "Föregående"
+
+msgid "General"
+msgstr "Allmänt"
+
+msgid "Advanced"
+msgstr "Avancerat"
+
+msgid "Resource"
+msgstr "Resurs"
+
+msgid "Priority"
+msgstr "Prioritet"
+
+msgid "Low"
+msgstr "Låg"
+
+msgid "Medium"
+msgstr "Medium"
+
+msgid "High"
+msgstr "Hög"
+
+msgid "Enter the groupchat you want to join and the nick you want to have. You can also go back to the %s."
+msgstr ""
+
+msgid "login page"
+msgstr "inloggningssida"
+
+msgid "Share this link with your friends:"
+msgstr "Skicka denna länk till dina vänner:"
+
+msgid "Register a new XMPP account to join your friends on your own social cloud. That's simple!"
+msgstr ""
+
+msgid "Required"
+msgstr "Obligatorisk"
+
+msgid "You have been registered, here is your XMPP address:"
+msgstr "Du har registrertats. Din XMPP-adress är:"
+
+msgid "Manager"
+msgstr ""
+
+msgid "Project"
+msgstr "Projekt"
+
+msgid "Encrypted"
+msgstr "Krypterad"
+
+msgid "Unencrypted"
+msgstr "Okrypterad"
+
+msgid "Where are you?"
+msgstr "Var är du?"
+
+msgid "What's up with you?"
+msgstr "Hur är läget?"
+
+msgid "Fetching the social channel..."
+msgstr "Hämtar den sociala kanalen..."
+
+msgid "You are synchronized with your network."
+msgstr ""
+
+msgid "Cannot send anything: you can only receive notices!"
+msgstr ""
+
+msgid "Media viewer"
+msgstr "Mediavisare"
+
+msgid "Browse"
+msgstr "Bläddra"
+
+msgid "Command"
+msgstr "Kommando"
+
+msgid "Subscribe"
+msgstr "Prenumerera"
+
+msgid "Join"
+msgstr "Gå med"
+
+msgid "Automatic"
+msgstr "Automatiskt"
+
+msgid "Search"
+msgstr "Sök"
+
+msgid "No result!"
+msgstr "Inget resultat!"
+
+msgid "No notifications."
+msgstr ""
+
+msgid "would like to add you as a friend."
+msgstr "vill lägga til dig som en vän."
+
+msgid "would like you to join this chatroom:"
+msgstr "vill att du går med i detta chattrum:"
+
+msgid "Do you accept?"
+msgstr "Vill du acceptera inbjudan?"
+
+msgid "Yes"
+msgstr "Ja"
+
+msgid "No"
+msgstr "Nej"
+
+msgid "would like to get authorization."
+msgstr "vill få tillåtelse."
+
+msgid "Do you want to see the friends %s suggests you?"
+msgstr ""
+
+msgid "Submit"
+msgstr "Skicka"
+
+msgid "Client"
+msgstr "Klient"
+
+msgid "System"
+msgstr "System"
+
+msgid "Local time"
+msgstr "Lokal tid"
+
+msgid "Comments"
+msgstr "Kommentarer"
+
+msgid "User profile"
+msgstr "Användarprofil"
+
+msgid "See his/her position on the globe"
+msgstr "Se hans/hennes position på jordklotet"
+
+msgid "Confirm"
+msgstr "Bekräfta"
+
+msgid "anonymous mode"
+msgstr "anonymt läge"
+
+msgid "Groups"
+msgstr "Grupper"
+
+msgid "Unclassified"
+msgstr "Oklassificerad"
+
+msgid "Authorize"
+msgstr "Tillåtelse"
+
+msgid "Ask for authorization"
+msgstr "Be om tillåtelse"
+
+msgid "Unblock"
+msgstr "Avblockera"
+
+msgid "Prohibit"
+msgstr "Förhindra"
+
+msgid "Block"
+msgstr "Blockera"
+
+msgid "Chat"
+msgstr "Chatt"
+
+msgid "Groupchat"
+msgstr "Gruppchatt"
+
+msgid "Jappix Mobile"
+msgstr "Jappix Mobilt"
+
+msgid "Desktop"
+msgstr "Skrivbord"
+
+msgid "Mobile"
+msgstr "Mobilt"
+
+msgid "Please wait..."
+msgstr "Var god vänta..."
+
+msgid "Please enable JavaScript"
+msgstr "Vänligen aktivera JavaScript"
+
+msgid "Your channel"
+msgstr "Din kanal"
+
+msgid "Channel of"
+msgstr ""
+
+msgid "More notices..."
+msgstr "Fler notiser..."
+
+msgid "Attach a file"
+msgstr "Bifoga en fil"
+
+msgid "Send"
+msgstr "Skicka"
+
+msgid "Unattach the file"
+msgstr "Ta bort bifogad fil"
+
+msgid "An error occured while uploading your file: maybe it is too big (%s maximum) or forbidden!"
+msgstr "Ett fel uppstod vid uppladdning. Kanske filen är större än %s eller av blockerad av någon anledning."
+
+msgid "Authorization failed"
+msgstr "Tillåtelsekontroll misslyckades"
+
+msgid "Registration failed, please choose a different username"
+msgstr "Registrering misslyckades. Vänligen välj ett annat användarnamn"
+
+msgid "Service unavailable"
+msgstr "Tjänsten ej tillgänglig"
+
+msgid "Internal server error, try later"
+msgstr "Internt serverfel. Försök gärna senare"
+
+msgid "Your form has been sent."
+msgstr "Ditt formulär har skickats."
+
+msgid "Application"
+msgstr ""
+
+msgid "XMPP links"
+msgstr "XMPP-länkar"
+
+msgid "Open XMPP links with Jappix"
+msgstr "Öppna XMPP-länkar med Jappix"
+
+msgid "changed the subject to:"
+msgstr "ändrade ämnet till:"
+
+msgid "Welcome!"
+msgstr "Välkommen!"
+
+msgid "Friends"
+msgstr "Vänner"
+
+msgid "Welcome on Jappix, your own social cloud!"
+msgstr ""
+
+msgid "Before you start using it, you will have to change some settings, search for friends and complete your profile."
+msgstr ""
+
+msgid "Enable notification sounds"
+msgstr "Aktivera ljudeffekter"
+
+msgid "Share your position on the globe"
+msgstr ""
+
+msgid "Offline friends"
+msgstr "Ej inloggade vänner"
+
+msgid "Don't hide offline friends"
+msgstr "Visa även ej inloggade vänner"
+
+msgid "Use this tool to find your friends on the server you are using right now, or add them later."
+msgstr ""
+
+msgid "Great work! Now, you can share Jappix with your friends!"
+msgstr ""
+
+msgid "When you will press the save button, the profile editor will be opened. Happy socializing!"
+msgstr ""
+
+msgid "Share Jappix on %s"
+msgstr ""
+
+msgid "Using Jappix, an open social platform. I am %s!"
+msgstr "Använder Jappix, en öppen social plattform. Jag är %s!"
+
+msgid "Unknown name"
+msgstr "Okänt namn"
+
+msgid "Unknown country"
+msgstr "Okänt land"
+
+msgid "Click to enable"
+msgstr "Klicka för att aktivera"
+
+msgid "Click to disable"
+msgstr "Klicka för att deaktivera"
+
+msgid "Installation"
+msgstr "Installation"
+
+msgid "Jappix installation"
+msgstr "Installera Jappix"
+
+msgid "Welcome to the Jappix installation!"
+msgstr "Välkommen till installationen av Jappix!"
+
+msgid "This tool will help you fastly install Jappix, the first full-featured XMPP-based social platform, on your server. You don't even need any technical knowledge."
+msgstr ""
+
+msgid "Let's have a look at the installation steps:"
+msgstr ""
+
+msgid "Welcome"
+msgstr "Välkommen"
+
+msgid "Storage configuration"
+msgstr "Konfigurera lagring"
+
+msgid "Administrator account"
+msgstr "Administratörskonto"
+
+msgid "Main configuration"
+msgstr ""
+
+msgid "Hosts configuration"
+msgstr "Inställningar för värdar"
+
+msgid "Services installation"
+msgstr "Installation av tjänster"
+
+msgid "If the current language does not match yours (%1s), you can make Jappix speak %2s it will be saved."
+msgstr ""
+
+msgid "If you want to get some help about the Jappix installation and configuration, you can use our whole documentation, available at:"
+msgstr ""
+
+msgid "It's time to build your own social cloud: just go to the next step!"
+msgstr ""
+
+msgid "Jappix stores persistent data (such as shared files, chat logs, your own music and its configuration) into a single secured storage folder."
+msgstr ""
+
+msgid "Jappix must be able to write in this folder to create its sub-directories. If not, you must set the rights to %1s or change the folder owner to %2s (depending of your configuration)."
+msgstr ""
+
+msgid "The folder is writable, you can continue!"
+msgstr "Mappen är skrivbar -- du kan nu fortsätta!"
+
+msgid "Jappix offers you the possibility to manage your configuration, install new addons or search for updates. That's why you must create an administrator account to access the manager."
+msgstr ""
+
+msgid "When Jappix will be installed, just click on the manager link on the home page to access it."
+msgstr ""
+
+msgid "Oops, you missed something or the two passwords do not match!"
+msgstr "Oops, något saknas, eller så matchar inte de två lösenorden!"
+
+msgid "Jappix needs that you specify some values to work. Please correct the following inputs (or keep the default values, which are sufficient for most people)."
+msgstr ""
+
+msgid "Note that if you don't specify a value which is compulsory, it will be automatically completed with the default one."
+msgstr ""
+
+msgid "User"
+msgstr "Användare"
+
+msgid "Service"
+msgstr "Tjänst"
+
+msgid "Service name"
+msgstr "Tjänstnamn"
+
+msgid "Service description"
+msgstr "Tjänstbeskrivning"
+
+msgid "Connection"
+msgstr "Anslutning"
+
+msgid "Lock the host"
+msgstr "Lås värd"
+
+msgid "Anonymous mode"
+msgstr "Anonymt läge"
+
+msgid "Registration allowed"
+msgstr "Registrering tillåten"
+
+msgid "Use a proxy"
+msgstr "Använd en proxy"
+
+msgid "Encryption"
+msgstr "Kryptering"
+
+msgid "HTTPS storage"
+msgstr "Lagring HTTPS"
+
+msgid "Force HTTPS"
+msgstr "Kräv HTTPS"
+
+msgid "Compression"
+msgstr "Komprimering"
+
+msgid "This page helps you specify the default hosts Jappix will connect to. You can leave it as it is and continue if you want to use the official service hosts."
+msgstr ""
+
+msgid "Maybe you don't know what a BOSH server is? In fact, this is a relay between a Jappix client and a XMPP server, which is necessary because of technical limitations."
+msgstr ""
+
+msgid "Main host"
+msgstr "Huvudvärd"
+
+msgid "Groupchat host"
+msgstr "Värd för gruppchatt"
+
+msgid "Anonymous host"
+msgstr "Anonym värd"
+
+msgid "Directory host"
+msgstr "Katalogvärd"
+
+msgid "BOSH host"
+msgstr "BOSH värd"
+
+msgid "You can install some extra softwares on your server, to extend your Jappix features. Some others might be modified, because of security restrictions which are set by default."
+msgstr ""
+
+msgid "To perform this, you must be able to access your server's shell and be logged in as root. Remember this is facultative, Jappix will work without these modules, but some of its features will be unavailable."
+msgstr ""
+
+msgid "After you finished the setup, Jappix will generate the cache files. It might be slow, just wait until the application is displayed and do not press any button."
+msgstr ""
+
+msgid "Thanks for using Jappix!"
+msgstr "Tack för att du använder Jappix!"
+
+msgid "Next"
+msgstr "Nästa"
+
+msgid "Finish"
+msgstr "Slutför"
+
+msgid "Check again"
+msgstr "Kontrollera igen"
+
+msgid "The folder is not writable, set the right permissions to the %s directory."
+msgstr "Mappen är ej skrivbar. Korrigera rättigheterna för mappen %s"
+
+msgid "%s is installed on your system."
+msgstr "%s har installerats på ditt system."
+
+msgid "%1s is not installed on your system, you should install %2s."
+msgstr "%1s har ej installerats på ditt system. Du borde installera %2s."
+
+msgid "PHP maximum upload size is sufficient (%s)."
+msgstr "Maxgränsen för uppladdning via PHP är tillräcklig (%s)."
+
+msgid "PHP maximum upload size is not sufficient (%1s), you should define it to %2s in %3s."
+msgstr "Maxgränsen för uppladdning via PHP är ej tillräcklig (%1s). Du bör ange gränsen till %2s i %3s."
+
+msgid "Jappix manager"
+msgstr ""
+
+msgid "Manager access"
+msgstr ""
+
+msgid "Statistics"
+msgstr "Statistik"
+
+msgid "Hosts"
+msgstr "Värdar"
+
+msgid "Design"
+msgstr "Utseende"
+
+msgid "Repeat"
+msgstr "Repetera"
+
+msgid "All"
+msgstr "Alla"
+
+msgid "Horizontal"
+msgstr "Sidled"
+
+msgid "Vertical"
+msgstr "Höjdled"
+
+msgid "Center"
+msgstr "Mitten"
+
+msgid "Left"
+msgstr "Vänster"
+
+msgid "Right"
+msgstr "Höger"
+
+msgid "Top"
+msgstr "Toppen"
+
+msgid "Bottom"
+msgstr "Botten"
+
+msgid "Adapt"
+msgstr "Anpassa"
+
+msgid "Color"
+msgstr "Färg"
+
+msgid "Users"
+msgstr "Användare"
+
+msgid "Updates"
+msgstr "Uppdateringar"
+
+msgid "This is a restricted area: only the authorized users can manage this Jappix node."
+msgstr ""
+
+msgid "Please use the form below to login to the administration panel."
+msgstr "Vänligen använd formuläret nedan för att logga in på administratörsbilden."
+
+msgid "To improve security, sessions are limited in time and when your browser will be closed, you will be logged out."
+msgstr ""
+
+msgid "Credentials"
+msgstr "Rättigheter"
+
+msgid "You have been logged out. Goodbye!"
+msgstr "Du har nu loggats ut. Hej då!"
+
+msgid "Oops, you could not be recognized as a valid administrator. Check your credentials!"
+msgstr "Oops, du verkar inte ha administratörsrättigheter. Kontrollera dina rättigheter."
+
+msgid "Basic statistics are processed by Jappix about some important things, you can find them below."
+msgstr ""
+
+msgid "Change your Jappix node configuration with this tool."
+msgstr ""
+
+msgid "Change the XMPP hosts that this Jappix node serve with this tool."
+msgstr ""
+
+msgid "All this Jappix node stored files can be managed with this tool: please select a sub-folder and start editing its content!"
+msgstr ""
+
+msgid "Jappix is fully customisable: you can change its design right here."
+msgstr ""
+
+msgid "This is not a valid image, please use PNG, GIF or JPG!"
+msgstr "Ej giltig bild. Vänligen använd enbart bilder i format PNG, GIF eller JPG."
+
+msgid "The image could not be received, would you mind retry?"
+msgstr "Bilden kunde inte tas emot. Det kanske hjälper att försöka igen."
+
+msgid "Your image was added to the list!"
+msgstr "Din bild lades till i listan!"
+
+msgid "Changes saved!"
+msgstr "Ändringar sparade!"
+
+msgid "You can define more than one administrator for this Jappix node. You can also change a password with this tool."
+msgstr ""
+
+msgid "Update your Jappix node with this tool, or check if a new one is available. Informations about the latest version are also displayed (in english)."
+msgstr ""
+
+msgid "Access statistics"
+msgstr ""
+
+msgid "Share statistics"
+msgstr ""
+
+msgid "Other statistics"
+msgstr ""
+
+msgid "January"
+msgstr "Januari"
+
+msgid "February"
+msgstr "Februari"
+
+msgid "March"
+msgstr "Mars"
+
+msgid "April"
+msgstr "April"
+
+msgid "May"
+msgstr "Maj"
+
+msgid "June"
+msgstr "Juni"
+
+msgid "July"
+msgstr "Juli"
+
+msgid "August"
+msgstr "Augusti"
+
+msgid "September"
+msgstr "September"
+
+msgid "October"
+msgstr "Oktober"
+
+msgid "November"
+msgstr "November"
+
+msgid "December"
+msgstr "December"
+
+msgid "Monday"
+msgstr "Måndag"
+
+msgid "Tuesday"
+msgstr "Tisdag"
+
+msgid "Wednesday"
+msgstr "Onsdag"
+
+msgid "Thursday"
+msgstr "Torsdag"
+
+msgid "Friday"
+msgstr "Fredag"
+
+msgid "Saturday"
+msgstr "Lördag"
+
+msgid "Sunday"
+msgstr "Söndag"
+
+msgid "Total"
+msgstr "Totalt"
+
+msgid "Cache"
+msgstr ""
+
+msgid "Logs"
+msgstr ""
+
+msgid "Music"
+msgstr "Musik"
+
+msgid "Backgrounds"
+msgstr "Bakgrunder"
+
+msgid "Share"
+msgstr ""
+
+msgid "Background"
+msgstr "Bakgrund"
+
+msgid "Notice"
+msgstr "Notis"
+
+msgid "Your design preferences have been saved!"
+msgstr "Dina inställningar för utseendet har sparats!"
+
+msgid "Please check your inputs: something is missing!"
+msgstr "Vänligen kontrollera indata -- någonting saknas!"
+
+msgid "Change your Jappix node background with this tool. You can either set a custom color or an uploaded image. Let your creativity flow!"
+msgstr ""
+
+msgid "Use default background"
+msgstr "Använd standardbakgrunden"
+
+msgid "Use your own image"
+msgstr "Använd egen bild"
+
+msgid "Select a background to use and change the display options."
+msgstr "Välj en bakgrund och ändra inställningar för utseendet."
+
+msgid "Use your own color"
+msgstr "Använd egen färg"
+
+msgid "Type the hexadecimal color value you want to use as a background."
+msgstr "Ange det hexadecimala värdet (webbfärgvärdet) för den färg du vill använda som bakgrund."
+
+msgid "Manage backgrounds"
+msgstr "Anpassa bakgrunder"
+
+msgid "You can add a new background to the list with this tool. Please send a valid image."
+msgstr ""
+
+msgid "If you want to remove some backgrounds, use the browser below."
+msgstr ""
+
+msgid "Define a homepage notice for all your users, such as a warn, an important message or an advert with this tool."
+msgstr ""
+
+msgid "Simple notice"
+msgstr ""
+
+msgid "This notice only needs simple text to be displayed, but no code is allowed!"
+msgstr ""
+
+msgid "Advanced notice"
+msgstr ""
+
+msgid "You can customize your notice with embedded HTML, CSS and JavaScript, but you need to code the style."
+msgstr ""
+
+msgid "Available updates"
+msgstr "Tillgängliga uppdateringar"
+
+msgid "What's new?"
+msgstr "Vad är nytt?"
+
+msgid "Your storage folders are not writable, please apply the good rights!"
+msgstr ""
+
+msgid "%1s may cause problems to the proxy, please increase %2s value up to %3s!"
+msgstr ""
+
+msgid "You are using a development version of Jappix. Update it through our repository by executing: %s."
+msgstr "Du använder utvecklingsversionen av Jappix. Den uppdateras genom vårt repo genom att köra: %s."
+
+msgid "A new Jappix version is available! Check what is new and launch the update!"
+msgstr "En ny version av Jappix finns tillgänglig! Kontrollera vad som är nytt och starta uppdateringen."
+
+msgid "Your version is out to date. Update it now to %s by clicking here!"
+msgstr "Din version är gammal. Uppdatera till %s nu genom att klicka här!"
+
+msgid "Your version seems to be up to date, but you can check updates manually by clicking here."
+msgstr "Din version verkar vara aktuell, men du kan kontrollera uppdateringar manuellt genom att klicka här."
+
+msgid "Check for updates"
+msgstr "Sök efter uppdateringar"
+
+msgid "Update in progress"
+msgstr "Uppdaterar"
+
+msgid "Jappix has been updated: you are now running the latest version. Have fun!"
+msgstr "Jappix har uppdaterats. Du använder nu den senaste versionen. Varsågod!"
+
+msgid "The update has failed! Please try again later."
+msgstr "Uppdateringen misslyckades. Vänligen försök igen senare."
+
+msgid "Downloading package..."
+msgstr "Laddar ned.."
+
+msgid "Removing current Jappix system files..."
+msgstr ""
+
+msgid "Extracting package..."
+msgstr ""
+
+msgid "Regenerating storage folder tree..."
+msgstr ""
+
+msgid "Jappix is now up to date!"
+msgstr "Jappix är nu uppdaterad!"
+
+msgid "Aborted: socket error!"
+msgstr ""
+
+msgid "Aborted: buffer error!"
+msgstr ""
+
+msgid "Aborted: everything is not writable!"
+msgstr ""
+
+msgid "Aborted: could not extract the package!"
+msgstr ""
+
+msgid "Visits"
+msgstr "Besök"
+
+msgid "Daily"
+msgstr "Dagligen"
+
+msgid "Weekly"
+msgstr "Veckovis"
+
+msgid "Monthly"
+msgstr "Månatligen"
+
+msgid "Yearly"
+msgstr "Årsvis"
+
+msgid "Size"
+msgstr "Storlek"
+
+msgid "Clean everything"
+msgstr "Rensa allt"
+
+msgid "Purge cache"
+msgstr "Rensa cache"
+
+msgid "Purge logs"
+msgstr "Rensa loggar"
+
+msgid "Purge updates"
+msgstr "Rensa uppdateringar"
+
+msgid "The storage folder you wanted to clean is now empty!"
+msgstr ""
+
+msgid "Keep your Jappix node fresh and fast, clean the storage folders regularly!"
+msgstr ""
+
+msgid "Upload your music (Ogg Vorbis, MP3 or WAV) to be able to listen to it in Jappix!"
+msgstr ""
+
+msgid "The file you want to upload must be smaller than %s."
+msgstr ""
+
+msgid "Stay tuned in what your users store on your server and remove undesired content with this tool."
+msgstr ""
+
+msgid "Title"
+msgstr "Titel"
+
+msgid "Artist"
+msgstr "Artist"
+
+msgid "Album"
+msgstr "Album"
+
+msgid "File"
+msgstr "Fil"
+
+msgid "Upload"
+msgstr "Ladda upp"
+
+msgid "The folder is empty."
+msgstr "Mappen är tom."
+
+msgid "The music could not be received, please retry!"
+msgstr ""
+
+msgid "This is not a valid music file, please encode in Ogg Vorbis, MP3 or WAV!"
+msgstr ""
+
+msgid "Your music has been added!"
+msgstr ""
+
+msgid "The selected elements have been removed."
+msgstr ""
+
+msgid "You must select elements to remove!"
+msgstr ""
+
+msgid "Add a new user with this tool, or change a password (type an existing username). Please submit a strong password!"
+msgstr ""
+
+msgid "Manage"
+msgstr "Hantera"
+
+msgid "List"
+msgstr "Lista"
+
+msgid "Remove users with this tool. Note that you cannot remove an user if he is the only one remaining."
+msgstr ""
+
+msgid "The user has been added!"
+msgstr "Användaren har lagts till!"
+
+msgid "The chosen users have been removed."
+msgstr "De valda användarna har tagits bort."
+
+msgid "You must select one or more users to be removed!"
+msgstr "Välj en eller flera användare som ska tas bort!"
+
+msgid "Yesterday"
+msgstr "Igår"
+
+msgid "%s days ago"
+msgstr "%s dagar sedan"
+
+msgid "User currently active"
+msgstr ""
+
+msgid "Last seen: %s"
+msgstr ""
+
+msgid "Inactive since: %s"
+msgstr ""
+
+msgid "Your friend seems not to have received your message(s)!"
+msgstr ""
+
+msgid "Static content server"
+msgstr ""
+
+msgid "This is the static content server for %1s, “%2s”."
+msgstr ""
+
+msgid "Suggested friends"
+msgstr ""
+
+msgid "Check all"
+msgstr "Markera alla"
+
+msgid "Uncheck all"
+msgstr "Avmarkera alla"
+
+msgid "Choose"
+msgstr "Välj"
+
+msgid "List name"
+msgstr ""
+
+msgid "Allow"
+msgstr "Tillåt"
+
+msgid "Deny"
+msgstr "Förbjud"
+
+msgid "Group"
+msgstr "Grupp"
+
+msgid "Subscription"
+msgstr "Prenumeration"
+
+msgid "Both"
+msgstr "Båda"
+
+msgid "From"
+msgstr "Från"
+
+msgid "Everybody"
+msgstr "Alla"
+
+msgid "Send messages"
+msgstr "Skicka meddelanden"
+
+msgid "Send queries"
+msgstr "Skicka frågor"
+
+msgid "See my status"
+msgstr "Se min status"
+
+msgid "Send his/her status"
+msgstr "Skicka hans/hennes status"
+
+msgid "Everything"
+msgstr "Allt"
+
+msgid "Item"
+msgstr ""
+
+msgid "Order"
+msgstr "Ordning"
+
+msgid "Active for this session"
+msgstr "Aktiv för denna session"
+
+msgid "Always active"
+msgstr "Alltid aktiv"
+
+msgid "User directory"
+msgstr "Deltagarkatalog"
+
+msgid "Search a friend"
+msgstr "Sök en vän"
+
+msgid "The feature requested is not implemented by the recipient or server and therefore cannot be processed."
+msgstr ""
+
+msgid "This is a repeat from %s"
+msgstr ""
+
+msgid "Loading comments..."
+msgstr "Laddar kommentarer..."
+
+msgid "Type your comment here..."
+msgstr "Skriv här..."
+
+msgid "Could not get the comments!"
+msgstr "Kunde ej hämta kommentarer!"
+
+msgid "Show comments"
+msgstr "Visa kommentarer"
+
+msgid "Send him/her a message"
+msgstr "Skicka honom/henne ett meddelande"
+
+msgid "Start a chat with him/her"
+msgstr "Öppna en chatt med honom/henne"
+
+msgid "Media integration"
+msgstr ""
+
+msgid "Comments locked!"
+msgstr ""
+
+msgid "Type something you want to share with your friends..."
+msgstr ""
+
+msgid "changed his/her nickname to %s"
+msgstr ""
+
+msgid "commented an item you follow: “%s”."
+msgstr ""
+
+msgid "Hide"
+msgstr ""
+
+msgid "liked your post: “%s”."
+msgstr ""
+
+msgid "quoted you somewhere: “%s”."
+msgstr ""
+
+msgid "published on your wall: “%s”."
+msgstr ""
+
+msgid "tagged you in a photo (%s)."
+msgstr ""
+
+msgid "tagged you in a video (%s)."
+msgstr ""
+
+msgid "Show"
+msgstr "Visa"
+
+msgid "Need help? You'd better read our documentation page about how to fill this form!"
+msgstr ""
+
+msgid "Pubsub host"
+msgstr "Värd för pubsub"
+
+msgid "Jappix is a great social platform, that you can access wherever you are, whenever you want and communicate with whovever you want."
+msgstr ""
+
+msgid "Manager link"
+msgstr ""
+
+msgid "User uploads server"
+msgstr ""
+
+msgid "This is the user uploads server for %1s, “%2s”."
+msgstr ""
+
+msgid "Logo"
+msgstr "Logotyp"
+
+msgid "You can set your own service logo to replace the default one. Take care of the size and the main color of each logo!"
+msgstr ""
+
+msgid "Upload each logo with the recommended maximum pixel size."
+msgstr ""
+
+msgid "This is not a valid image, please use the PNG format!"
+msgstr "Detta är ej en giltig bild. Vänligen använd bildformatet PNG."
+
+msgid "Your service logo has been successfully changed!"
+msgstr ""
+
+msgid "Your logo format must be PNG. Leave a field empty and the logo will not be changed."
+msgstr "Bildformatet för logotypen måste vara PNG. Om något fält lämnas tomt kommer loggan ej att ändras."
+
+msgid "Remove this logo"
+msgstr "Ta bort denna logotyp."
+
+msgid "View this logo"
+msgstr "Se denna logotyp"
+
+msgid "Send a file"
+msgstr ""
+
+msgid "Once uploaded, your friend will be prompted to download the file you sent."
+msgstr ""
+
+msgid "Groupchats to join"
+msgstr ""
+
+msgid "Purge sent files"
+msgstr ""
+
+msgid "would like to send you a file: “%s”."
+msgstr ""
+
+msgid "has accepted to received your file: “%s”."
+msgstr ""
+
+msgid "has rejected to receive your file: “%s”."
+msgstr ""
+
+msgid "could not receive your file: “%s”."
+msgstr "kunde ej ta emot din fil “%s”."
+
+msgid "has received a file exchange request: “%s”."
+msgstr ""
+
+msgid "Available shortcuts:"
+msgstr "Tillgängliga genvägar:"
+
+msgid "%s removes the chat logs"
+msgstr "%s tar bort chattloggar"
+
+msgid "%s joins a groupchat"
+msgstr "%s går med i en gruppchatt"
+
+msgid "%s closes the chat"
+msgstr "%s stänger chatten"
+
+msgid "%s shows the user profile"
+msgstr "%s visar användarprofil"
+
+msgid "%s sends a message to the room"
+msgstr "%s skickar ett meddelande till (alla i) rummet"
+
+msgid "%s changes your nickname"
+msgstr "%s ändrar ditt chattnamn"
+
+msgid "%s sends a message to someone in the room"
+msgstr "%s skickar ett meddelande till någon i rummet"
+
+msgid "%s changes the room topic"
+msgstr "%s ändrar rummets ämnestext"
+
+msgid "%s kicks an user of the room"
+msgstr "%s sparkar ut en användare från rummet"
+
+msgid "%s bans an user of the room"
+msgstr "%s utesluter en användare från rummet"
+
+msgid "%s invites someone to join the room"
+msgstr "%s bjuder in någon att gå med i rummet"
+
+msgid "Social channel, chat and more."
+msgstr ""
+
+msgid "Create your public profile."
+msgstr ""
+
+msgid "A mini-chat for your website."
+msgstr ""
+
+msgid "Get Jappix, get support."
+msgstr ""
+
+msgid "Statistics around Jappix."
+msgstr ""
+
+msgid "Download Jappix for free."
+msgstr ""
+
+msgid "Find a public Jappix node."
+msgstr ""
+
+msgid "Public profile"
+msgstr ""
+
+msgid "Your profile anywhere on the Web."
+msgstr ""
+
+msgid "%s is a Jappix.com service which makes your XMPP profile public. It is easier to share it. No XMPP account is required to view your social channel, your current position and your contact details."
+msgstr ""
+
+msgid "Furthermore, every picture you post in your social channel is added to a beautiful picture timeline. You can now view the pictures you shared year by year."
+msgstr ""
+
+msgid "You can also use your XMPP avatar as a single avatar for every website, blog and forum you use. When you change it on XMPP, the new avatar appears everywhere. What a genious improvement!"
+msgstr ""
+
+msgid "Yay, let's create my public profile!"
+msgstr ""
+
+msgid "Enable my public profile"
+msgstr ""
+
+#~ msgid "Jappix is a non-profit social platform, that you can access wherever you are, whenever you want and communicate with whovever you want."
+#~ msgstr ""
+
+#~ msgid "See"
+#~ msgstr ""
+
+#~ msgid "Use default logo"
+#~ msgstr ""
+
+#~ msgid "Use your own logo"
+#~ msgstr ""
+
+#~ msgid "The recommended image format is PNG. Leave a field empty and the logo will not be changed."
+#~ msgstr ""
diff --git a/jappixmini/jappix/lang/uk/LC_MESSAGES/main.mo b/jappixmini/jappix/lang/uk/LC_MESSAGES/main.mo
new file mode 100644
index 00000000..78833b7e
Binary files /dev/null and b/jappixmini/jappix/lang/uk/LC_MESSAGES/main.mo differ
diff --git a/jappixmini/jappix/lang/uk/LC_MESSAGES/main.po b/jappixmini/jappix/lang/uk/LC_MESSAGES/main.po
new file mode 100644
index 00000000..79e8f2ba
--- /dev/null
+++ b/jappixmini/jappix/lang/uk/LC_MESSAGES/main.po
@@ -0,0 +1,1870 @@
+# Ukrainian translations for Jappix package.
+# This file is distributed under the same license as the Jappix package.
+# This file was translated from CodingTeam at <http://codingteam.net/>.
+msgid ""
+msgstr ""
+"Project-Id-Version: Jappix\n"
+"PO-Revision-Date: 2012-01-16 21:25+0100\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"POT-Creation-Date: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+
+msgid "JavaScript is missing in your web browser, so that you will not be able to launch Jappix! Please fix this."
+msgstr "У вашому браузері не активовано виконання JavaScript, тому Ви не зможете використовувати Jappix. Будь ласка, активуйте виконання JavaScript."
+
+msgid "An open social network"
+msgstr "Відкрита соціальна мережа"
+
+msgid "Jappix has been interrupted by a network issue, a bug or bad login (check that you entered the right credentials), sorry for the inconvenience."
+msgstr "Робота Jappix була перервана через проблеми зі зв'язком, помилку чи невірні дані користувача (перевірте логін та пароль), просимо вибачення за незручності."
+
+msgid "The element list on this server could not be obtained!"
+msgstr ""
+
+msgid "Your password has been changed, now you can connect to your account with your new login data."
+msgstr "Ваш пароль було змінено, тепер Ви можете увійти, використовуючи новий пароль."
+
+msgid "Your XMPP account has been removed, bye!"
+msgstr "Ваш акаунт було видалено."
+
+msgid "You have been logged out of your XMPP account, have a nice day!"
+msgstr ""
+
+msgid "The room you joined seems not to exist. You should create it!"
+msgstr "Кімнати, до якої ви приєднались, не існує. Ви повинні створити її."
+
+msgid "The groupchat has been removed, now someone else will be able to recreate it."
+msgstr ""
+
+msgid "The user that you want to reach is not present in the room."
+msgstr "Користувач, з яким Ви намагаєтесь зв’язатися, відсутній у кімнаті."
+
+msgid "Please enter the group chat address to join."
+msgstr "Будьласка введіть адресу чату."
+
+msgid "Please enter your nickname to join %s."
+msgstr "Будь ласка, введіть ваш псевдонім щоб приєднатися до %s."
+
+msgid "This room (%s) is protected with a password."
+msgstr "Кімната %s захищена паролем."
+
+msgid "Your browser is out of date!"
+msgstr "Ваш браузер застарів!"
+
+msgid "Last %s version is better!"
+msgstr ""
+
+msgid "Login"
+msgstr "Вхід"
+
+msgid "Register"
+msgstr "Реєстрація"
+
+msgid "Here we go!"
+msgstr "Поїхали!"
+
+msgid "Server"
+msgstr "Сервер"
+
+msgid "Password"
+msgstr "Пароль"
+
+msgid "Remember me"
+msgstr "Запам’ятати мене"
+
+msgid "This tool has been disabled, you cannot use it!"
+msgstr "Цей інструмент був вимкнений, ви не можете використовувати його!"
+
+msgid "Due to a network issue, you were disconnected. What do you want to do now?"
+msgstr "Вас було від’єднано через проблеми з мережею. Що Ви хочете зробити тепер?"
+
+msgid "Reconnect"
+msgstr "Перепідключитись"
+
+msgid "Messages"
+msgstr "Повідомлення"
+
+msgid "Profile"
+msgstr "Профіль"
+
+msgid "Options"
+msgstr "Налаштування"
+
+msgid "Disconnect"
+msgstr "Від’єднатись"
+
+msgid "Filter"
+msgstr "Фільтр"
+
+msgid "Add a friend"
+msgstr "Додати друга"
+
+msgid "Your groupchats"
+msgstr "Ваша конференція"
+
+msgid "Manage your favorite groupchats"
+msgstr "Керування вашими улюбленими конференціями"
+
+msgid "More stuff"
+msgstr "Більше "
+
+msgid "Show all friends"
+msgstr "Показувати всіх друзів"
+
+msgid "Only show connected friends"
+msgstr "Показувати тільки під’єднаних друзів"
+
+msgid "Message archives"
+msgstr "Архів повідомлень"
+
+msgid "Date"
+msgstr "Дата"
+
+msgid "Please select a friend to view the chat history."
+msgstr "Будь ласка, виберіть друга для перегляду історії переписки."
+
+msgid "Nothing found for: %s"
+msgstr "Нічого не знайдено про %s"
+
+msgid "A short message?"
+msgstr "Коротке повідомлення?"
+
+msgid "How are you?"
+msgstr "Як ти?"
+
+msgid "What are you doing?"
+msgstr "Що ти робиш?"
+
+msgid "Join a chat"
+msgstr "Приєднатися до чату"
+
+msgid "Status"
+msgstr "Статус"
+
+msgid "Available"
+msgstr "Доступний"
+
+msgid "Talkative"
+msgstr "Говіркий"
+
+msgid "Away"
+msgstr "Відійшов"
+
+msgid "Not available"
+msgstr "Не доступний"
+
+msgid "Busy"
+msgstr "Зайнятий"
+
+msgid "Mood"
+msgstr "Настрій"
+
+msgid "None"
+msgstr "Нема"
+
+msgid "Crazy"
+msgstr "Божевільний"
+
+msgid "Excited"
+msgstr "Зацікавлений"
+
+msgid "Playful"
+msgstr "Грайливий"
+
+msgid "Happy"
+msgstr "Веселий"
+
+msgid "Shocked"
+msgstr "Шокований"
+
+msgid "Hot"
+msgstr "Гарячий"
+
+msgid "Sad"
+msgstr "Сумний"
+
+msgid "Amorous"
+msgstr "Закоханий"
+
+msgid "Confident"
+msgstr "Впевнений"
+
+msgid "Activity"
+msgstr "Діяльність"
+
+msgid "Chores"
+msgstr "Господарські роботи"
+
+msgid "Drinking"
+msgstr "П'ю"
+
+msgid "Eating"
+msgstr "Їм"
+
+msgid "Exercising"
+msgstr "Виконую вправи"
+
+msgid "Grooming"
+msgstr "Чепурюсь"
+
+msgid "Appointment"
+msgstr ""
+
+msgid "Inactive"
+msgstr "Неактивний"
+
+msgid "Relaxing"
+msgstr "Відпочиваю"
+
+msgid "Talking"
+msgstr "Розмовляю"
+
+msgid "Traveling"
+msgstr "Подорожую"
+
+msgid "Working"
+msgstr "Працюю"
+
+msgid "View profile"
+msgstr "Показати профіль"
+
+msgid "Repeat this notice"
+msgstr "Повторити нагадування"
+
+msgid "Remove this notice"
+msgstr "Видалити нагадування"
+
+msgid "Your profile"
+msgstr "Твій профіль"
+
+msgid "Identity"
+msgstr ""
+
+msgid "Profile image"
+msgstr "Аватар"
+
+msgid "Others"
+msgstr "Інші"
+
+msgid "Personal"
+msgstr "Персональні дані"
+
+msgid "Complete name"
+msgstr "Повне ім'я"
+
+msgid "Nickname"
+msgstr "Псевдонім"
+
+msgid "First name"
+msgstr "Ім'я"
+
+msgid "Last name"
+msgstr "Прізвище"
+
+msgid "Date of birth"
+msgstr "Дата народження"
+
+msgid "Contact"
+msgstr "Контакт"
+
+msgid "E-mail"
+msgstr ""
+
+msgid "Phone"
+msgstr "Телефон"
+
+msgid "Website"
+msgstr "Веб сайт"
+
+msgid "Current"
+msgstr "Поточні"
+
+msgid "Delete"
+msgstr "Видалити"
+
+msgid "What a pity! You have no profile image defined in your identity card!"
+msgstr "Ви не вказали аватар в вашому профілі."
+
+msgid "Address"
+msgstr "Адреса"
+
+msgid "Street"
+msgstr "Вулиця"
+
+msgid "City"
+msgstr "Місто"
+
+msgid "Postal code"
+msgstr "Індекс"
+
+msgid "Country"
+msgstr "Країна"
+
+msgid "Biography"
+msgstr "Біографія"
+
+msgid "Important notice"
+msgstr "Важливі нагадування"
+
+msgid "Be careful of the information you write into your profile, because it could be accessed by everyone (even someone you don't want to)."
+msgstr "Будьте обережні, інформація в вашому профілі доступна всім."
+
+msgid "Not everything is private on XMPP; this is one of those things, your public profile (vCard)."
+msgstr "Не вся інформація приватна в XMPP; Ваш профіль - одна з цих речей."
+
+msgid "It is strongly recommended to upload a profile image (%s maximum), like a picture of yourself, because that makes you easily recognizable by your friends."
+msgstr ""
+
+msgid "Save"
+msgstr "Зберегти"
+
+msgid "Cancel"
+msgstr "Відмінити"
+
+msgid "Edit options"
+msgstr "Редагувати налаштування"
+
+msgid "Channel"
+msgstr "Канал"
+
+msgid "Commands"
+msgstr ""
+
+msgid "Sounds"
+msgstr "Музика"
+
+msgid "Privacy"
+msgstr "Приватність"
+
+msgid "Message archiving"
+msgstr "Архів повідомлень"
+
+msgid "Store a history of your chats"
+msgstr "зберігати історію ваших розмов"
+
+msgid "Geolocation"
+msgstr "Географічне положення"
+
+msgid "Empty"
+msgstr "Порожній"
+
+msgid "Empty channel"
+msgstr "Порожній канал"
+
+msgid "Persistent"
+msgstr "Наполегливий"
+
+msgid "Maximum notices"
+msgstr "Максимальна кількість нагадувань"
+
+msgid "Account"
+msgstr "Акаунт"
+
+msgid "Change password"
+msgstr "Змінити пароль"
+
+msgid "Delete account"
+msgstr "Видалити акаунт"
+
+msgid "Old"
+msgstr "Старий"
+
+msgid "New (2 times)"
+msgstr "Новий (2 рази)"
+
+msgid "Continue"
+msgstr "Продовжити"
+
+msgid "To"
+msgstr "До"
+
+msgid "Close"
+msgstr "Зачинити"
+
+msgid "unknown"
+msgstr "невідомий"
+
+msgid "Unavailable"
+msgstr "Не доступний"
+
+msgid "is now"
+msgstr "В даний час"
+
+msgid "Please wait while your avatar is uploaded..."
+msgstr ""
+
+msgid "Here it is! A new beautiful profile image!"
+msgstr "Ось вонін! Новий красивий аватар!"
+
+msgid "The image file is not supported or has a bad size."
+msgstr "Файл зображення не підтримується, або має неправильний розмір."
+
+msgid "Reply"
+msgstr "Відповісти"
+
+msgid "Error"
+msgstr "Помилка"
+
+msgid "Click here to solve the error"
+msgstr ""
+
+msgid "You"
+msgstr "Ти"
+
+msgid "Remove"
+msgstr "Видалити"
+
+msgid "Rename"
+msgstr "Перейменувати"
+
+msgid "Hi, I am %s, I would like to add you as my friend."
+msgstr "Привіт я %s, хочу додати тебе до списку друзів."
+
+msgid "Smiley insertion"
+msgstr "Вставити смайл"
+
+msgid "Change style"
+msgstr "Змінити стиль"
+
+msgid "Text in bold"
+msgstr "жирний"
+
+msgid "Text in italic"
+msgstr "курсивний"
+
+msgid "Underlined text"
+msgstr "підкреслений"
+
+msgid "Save chat"
+msgstr "Зберегти бесіду"
+
+msgid "Click on the following link to get the chat log, and wait. Then click again to get the file."
+msgstr ""
+
+msgid "This chat is empty!"
+msgstr "Ця бесіда порожня!"
+
+msgid "Generate file!"
+msgstr "Створити файл!"
+
+msgid "Download file!"
+msgstr "Завантажити файл!"
+
+msgid "Clean current chat"
+msgstr "Очистити бесіду"
+
+msgid "View chat history"
+msgstr ""
+
+msgid "Show user profile"
+msgstr "Показати профіль користувача"
+
+msgid "Add this contact to your friends"
+msgstr "Додати цей контакт в друзі"
+
+msgid "Add this groupchat to your favorites"
+msgstr "Додати конференцію в улюблені"
+
+msgid "All tabs"
+msgstr "Всі вкладки"
+
+msgid "Close this tab"
+msgstr "Закрити цю вкладку"
+
+msgid "no subject defined for this room."
+msgstr "Не вказана тема для кімнати."
+
+msgid "Administration panel for this room"
+msgstr "Панель адміністрування для кімнати"
+
+msgid "Moderators"
+msgstr "Модератори"
+
+msgid "Participants"
+msgstr "Учасники"
+
+msgid "Visitors"
+msgstr "Відвідувачі"
+
+msgid "Manage favorite rooms"
+msgstr "Керування улюбленими кімнатами"
+
+msgid "Change favorites"
+msgstr "Змінити улюблені"
+
+msgid "Search a room"
+msgstr "Пошук кімнат"
+
+msgid "Select a favorite"
+msgstr "Оберіть улюблену"
+
+msgid "Getting the name..."
+msgstr "Отримання імені"
+
+msgid "Gateway"
+msgstr "Маршрутизатор"
+
+msgid "Name"
+msgstr "Ім'я"
+
+msgid "Room"
+msgstr "Кімната"
+
+msgid "Add"
+msgstr "Додати"
+
+msgid "Edit"
+msgstr "Редагувати"
+
+msgid "Search a room on"
+msgstr "Пошук кімнати на"
+
+msgid "No room found on this server."
+msgstr "Не знайдено кімнат на цьому сервері."
+
+msgid "Service discovery"
+msgstr "Пошук сервісів"
+
+msgid "Server to query"
+msgstr "запит на сервер"
+
+msgid "Sorry, but the entity didn't return any result!"
+msgstr ""
+
+msgid "Accounts"
+msgstr "Акаунти"
+
+msgid "Authentications"
+msgstr "Автентифікація"
+
+msgid "Automation"
+msgstr "Автоматизація"
+
+msgid "Clients"
+msgstr "Клієнти"
+
+msgid "Collaboration"
+msgstr "Співробітництво"
+
+msgid "Components"
+msgstr "Компоненти"
+
+msgid "Rooms"
+msgstr "Кімнати"
+
+msgid "Directories"
+msgstr "Директорії"
+
+msgid "Gateways"
+msgstr "Маршрутизатори"
+
+msgid "News"
+msgstr "Новини"
+
+msgid "Hierarchy"
+msgstr "Ієрархія"
+
+msgid "Proxies"
+msgstr "Проксі"
+
+msgid "Publication/Subscription"
+msgstr "Публікація / Підписка"
+
+msgid "Storage"
+msgstr ""
+
+msgid "Service offline or broken"
+msgstr "Сервіс не в мережі або зламаний"
+
+msgid "Your inbox"
+msgstr "Вхідні"
+
+msgid "Available actions"
+msgstr "Доступні дії"
+
+msgid "Clean"
+msgstr "Очистити"
+
+msgid "New"
+msgstr "Нові"
+
+msgid "Received"
+msgstr "Отримані"
+
+msgid "Subject"
+msgstr "Тема"
+
+msgid "Content"
+msgstr "Вміст"
+
+msgid "Send message"
+msgstr "Надіслати повідомлення"
+
+msgid "Your inbox is empty."
+msgstr "Немає нових повідомлень"
+
+msgid "MUC administration"
+msgstr ""
+
+msgid "You administrate this room"
+msgstr "Ви адмініструєте цю кімнату"
+
+msgid "Enter new subject"
+msgstr "Введіть нову тему"
+
+msgid "Configuration"
+msgstr "Налаштування"
+
+msgid "Authorizations"
+msgstr "Авторизація"
+
+msgid "Member list"
+msgstr "Список користувачів"
+
+msgid "Owner list"
+msgstr "Список власників"
+
+msgid "Administrator list"
+msgstr "Список адміністраторів"
+
+msgid "Outcast list"
+msgstr ""
+
+msgid "Add an input"
+msgstr ""
+
+msgid "Destroy this MUC"
+msgstr "Знищити конференцію"
+
+msgid "Yes, let's do it!"
+msgstr "Так!"
+
+msgid "Your friend is paying attention to the conversation."
+msgstr "Ваш друг звернув увагу на бесіду."
+
+msgid "Your friend is writing a message..."
+msgstr "Ваш друг пише повідомлення..."
+
+msgid "Your friend stopped writing a message."
+msgstr "Ваш друг припинив писати повідомлення."
+
+msgid "Your friend is doing something else."
+msgstr "Ваш друг робить щось інше."
+
+msgid "Your friend closed the chat."
+msgstr "Ваш друг закрив чат."
+
+msgid "Requesting this service..."
+msgstr "Запит сервісу..."
+
+msgid "Loading"
+msgstr "Завантаження"
+
+msgid "joined the chat room"
+msgstr "увійшов до кімнати"
+
+msgid "left the chat room"
+msgstr "вийшов з кімнати"
+
+msgid "no status"
+msgstr "нема статусу"
+
+msgid "has been kicked"
+msgstr "було виграно"
+
+msgid "has been banned"
+msgstr "було забанено"
+
+msgid "no reason"
+msgstr "нема причини"
+
+msgid "Communicate with the entire world!"
+msgstr ""
+
+msgid "It allows you to get in touch with the millions of users who currently use the XMPP network like you do with Jappix. Join the community and stay free!"
+msgstr ""
+
+msgid "Hi there!"
+msgstr "Привіт!"
+
+msgid "Welcome on %1s, “%2s”."
+msgstr ""
+
+msgid "Login to your existing XMPP account or create a new one for free!"
+msgstr ""
+
+msgid "Jappix is an open-source project from PostPro, a non-profit organization which provides us a great help."
+msgstr ""
+
+msgid "Login to your existing XMPP account. You can also use the %s to join a groupchat."
+msgstr ""
+
+msgid "Previous"
+msgstr "Попередній"
+
+msgid "General"
+msgstr "Основні"
+
+msgid "Advanced"
+msgstr "Розширені"
+
+msgid "Resource"
+msgstr "Ресурс"
+
+msgid "Priority"
+msgstr "Приорітет"
+
+msgid "Low"
+msgstr "Низький"
+
+msgid "Medium"
+msgstr "Середній"
+
+msgid "High"
+msgstr "Високий"
+
+msgid "Enter the groupchat you want to join and the nick you want to have. You can also go back to the %s."
+msgstr ""
+
+msgid "login page"
+msgstr "Сторінка входу"
+
+msgid "Share this link with your friends:"
+msgstr "Поділитись цим посиланням з другом."
+
+msgid "Register a new XMPP account to join your friends on your own social cloud. That's simple!"
+msgstr ""
+
+msgid "Required"
+msgstr "Потребує"
+
+msgid "You have been registered, here is your XMPP address:"
+msgstr ""
+
+msgid "Manager"
+msgstr "Керівник"
+
+msgid "Project"
+msgstr "Проект"
+
+msgid "Encrypted"
+msgstr "Зашифровано"
+
+msgid "Unencrypted"
+msgstr ""
+
+msgid "Where are you?"
+msgstr "Де ти?"
+
+msgid "What's up with you?"
+msgstr "Що з тобою?"
+
+msgid "Fetching the social channel..."
+msgstr "Отримання соціального каналу..."
+
+msgid "You are synchronized with your network."
+msgstr "Ви синхронізовані з вашою мережею."
+
+msgid "Cannot send anything: you can only receive notices!"
+msgstr "Не можна нічого відправити: ви можете тільки приймати повідомлення!"
+
+msgid "Media viewer"
+msgstr ""
+
+msgid "Browse"
+msgstr "Браузер"
+
+msgid "Command"
+msgstr "Команди"
+
+msgid "Subscribe"
+msgstr "Підписка"
+
+msgid "Join"
+msgstr "Приєднатись"
+
+msgid "Automatic"
+msgstr "Автоматично"
+
+msgid "Search"
+msgstr "Пошук"
+
+msgid "No result!"
+msgstr "Нема результатів!"
+
+msgid "No notifications."
+msgstr "Нема нагадувань."
+
+msgid "would like to add you as a friend."
+msgstr "хоче додати вас як друга."
+
+msgid "would like you to join this chatroom:"
+msgstr "Хоче приєднатись до кімнати:"
+
+msgid "Do you accept?"
+msgstr "Ви приймаєте?"
+
+msgid "Yes"
+msgstr "Так"
+
+msgid "No"
+msgstr "Ні"
+
+msgid "would like to get authorization."
+msgstr "хоче отримати авторизацію."
+
+msgid "Do you want to see the friends %s suggests you?"
+msgstr ""
+
+msgid "Submit"
+msgstr "Надіслати"
+
+msgid "Client"
+msgstr "Клієнт"
+
+msgid "System"
+msgstr "Система"
+
+msgid "Local time"
+msgstr "Локальний час"
+
+msgid "Comments"
+msgstr "Коментарі"
+
+msgid "User profile"
+msgstr "Профіль користувача"
+
+msgid "See his/her position on the globe"
+msgstr "Бачити його/її місцезнаходження"
+
+msgid "Confirm"
+msgstr "Підтвердити"
+
+msgid "anonymous mode"
+msgstr "анонімний режим"
+
+msgid "Groups"
+msgstr "Групи"
+
+msgid "Unclassified"
+msgstr "Немає групи"
+
+msgid "Authorize"
+msgstr "Авторизований"
+
+msgid "Ask for authorization"
+msgstr "Надіслати запит авторизації"
+
+msgid "Unblock"
+msgstr ""
+
+msgid "Prohibit"
+msgstr "Заборонити"
+
+msgid "Block"
+msgstr "Заблокувати"
+
+msgid "Chat"
+msgstr "Бесіда"
+
+msgid "Groupchat"
+msgstr "Конференція"
+
+msgid "Jappix Mobile"
+msgstr "мобільний Jappix "
+
+msgid "Desktop"
+msgstr "Повна версія"
+
+msgid "Mobile"
+msgstr "Мобільний"
+
+msgid "Please wait..."
+msgstr "Будь ласка, зачекайте..."
+
+msgid "Please enable JavaScript"
+msgstr "Будь ласка, дозвольте виконання JavaScript"
+
+msgid "Your channel"
+msgstr "Ваш канал"
+
+msgid "Channel of"
+msgstr ""
+
+msgid "More notices..."
+msgstr ""
+
+msgid "Attach a file"
+msgstr "Приєднати файл"
+
+msgid "Send"
+msgstr "Надіслати"
+
+msgid "Unattach the file"
+msgstr "Видалити файл"
+
+msgid "An error occured while uploading your file: maybe it is too big (%s maximum) or forbidden!"
+msgstr ""
+
+msgid "Authorization failed"
+msgstr "Помилка авторизації"
+
+msgid "Registration failed, please choose a different username"
+msgstr ""
+
+msgid "Service unavailable"
+msgstr "Сервіс недоступний"
+
+msgid "Internal server error, try later"
+msgstr ""
+
+msgid "Your form has been sent."
+msgstr ""
+
+msgid "Application"
+msgstr ""
+
+msgid "XMPP links"
+msgstr ""
+
+msgid "Open XMPP links with Jappix"
+msgstr ""
+
+msgid "changed the subject to:"
+msgstr ""
+
+msgid "Welcome!"
+msgstr ""
+
+msgid "Friends"
+msgstr "Друзі"
+
+msgid "Welcome on Jappix, your own social cloud!"
+msgstr ""
+
+msgid "Before you start using it, you will have to change some settings, search for friends and complete your profile."
+msgstr ""
+
+msgid "Enable notification sounds"
+msgstr ""
+
+msgid "Share your position on the globe"
+msgstr ""
+
+msgid "Offline friends"
+msgstr ""
+
+msgid "Don't hide offline friends"
+msgstr ""
+
+msgid "Use this tool to find your friends on the server you are using right now, or add them later."
+msgstr ""
+
+msgid "Great work! Now, you can share Jappix with your friends!"
+msgstr ""
+
+msgid "When you will press the save button, the profile editor will be opened. Happy socializing!"
+msgstr ""
+
+msgid "Share Jappix on %s"
+msgstr ""
+
+msgid "Using Jappix, an open social platform. I am %s!"
+msgstr ""
+
+msgid "Unknown name"
+msgstr ""
+
+msgid "Unknown country"
+msgstr ""
+
+msgid "Click to enable"
+msgstr ""
+
+msgid "Click to disable"
+msgstr ""
+
+msgid "Installation"
+msgstr ""
+
+msgid "Jappix installation"
+msgstr ""
+
+msgid "Welcome to the Jappix installation!"
+msgstr ""
+
+msgid "This tool will help you fastly install Jappix, the first full-featured XMPP-based social platform, on your server. You don't even need any technical knowledge."
+msgstr ""
+
+msgid "Let's have a look at the installation steps:"
+msgstr ""
+
+msgid "Welcome"
+msgstr ""
+
+msgid "Storage configuration"
+msgstr ""
+
+msgid "Administrator account"
+msgstr ""
+
+msgid "Main configuration"
+msgstr ""
+
+msgid "Hosts configuration"
+msgstr ""
+
+msgid "Services installation"
+msgstr ""
+
+msgid "If the current language does not match yours (%1s), you can make Jappix speak %2s it will be saved."
+msgstr ""
+
+msgid "If you want to get some help about the Jappix installation and configuration, you can use our whole documentation, available at:"
+msgstr ""
+
+msgid "It's time to build your own social cloud: just go to the next step!"
+msgstr ""
+
+msgid "Jappix stores persistent data (such as shared files, chat logs, your own music and its configuration) into a single secured storage folder."
+msgstr ""
+
+msgid "Jappix must be able to write in this folder to create its sub-directories. If not, you must set the rights to %1s or change the folder owner to %2s (depending of your configuration)."
+msgstr ""
+
+msgid "The folder is writable, you can continue!"
+msgstr ""
+
+msgid "Jappix offers you the possibility to manage your configuration, install new addons or search for updates. That's why you must create an administrator account to access the manager."
+msgstr ""
+
+msgid "When Jappix will be installed, just click on the manager link on the home page to access it."
+msgstr ""
+
+msgid "Oops, you missed something or the two passwords do not match!"
+msgstr ""
+
+msgid "Jappix needs that you specify some values to work. Please correct the following inputs (or keep the default values, which are sufficient for most people)."
+msgstr ""
+
+msgid "Note that if you don't specify a value which is compulsory, it will be automatically completed with the default one."
+msgstr ""
+
+msgid "User"
+msgstr ""
+
+msgid "Service"
+msgstr ""
+
+msgid "Service name"
+msgstr ""
+
+msgid "Service description"
+msgstr ""
+
+msgid "Connection"
+msgstr ""
+
+msgid "Lock the host"
+msgstr ""
+
+msgid "Anonymous mode"
+msgstr ""
+
+msgid "Registration allowed"
+msgstr ""
+
+msgid "Use a proxy"
+msgstr ""
+
+msgid "Encryption"
+msgstr ""
+
+msgid "HTTPS storage"
+msgstr ""
+
+msgid "Force HTTPS"
+msgstr ""
+
+msgid "Compression"
+msgstr ""
+
+msgid "This page helps you specify the default hosts Jappix will connect to. You can leave it as it is and continue if you want to use the official service hosts."
+msgstr ""
+
+msgid "Maybe you don't know what a BOSH server is? In fact, this is a relay between a Jappix client and a XMPP server, which is necessary because of technical limitations."
+msgstr ""
+
+msgid "Main host"
+msgstr ""
+
+msgid "Groupchat host"
+msgstr ""
+
+msgid "Anonymous host"
+msgstr ""
+
+msgid "Directory host"
+msgstr ""
+
+msgid "BOSH host"
+msgstr ""
+
+msgid "You can install some extra softwares on your server, to extend your Jappix features. Some others might be modified, because of security restrictions which are set by default."
+msgstr ""
+
+msgid "To perform this, you must be able to access your server's shell and be logged in as root. Remember this is facultative, Jappix will work without these modules, but some of its features will be unavailable."
+msgstr ""
+
+msgid "After you finished the setup, Jappix will generate the cache files. It might be slow, just wait until the application is displayed and do not press any button."
+msgstr ""
+
+msgid "Thanks for using Jappix!"
+msgstr ""
+
+msgid "Next"
+msgstr ""
+
+msgid "Finish"
+msgstr ""
+
+msgid "Check again"
+msgstr ""
+
+msgid "The folder is not writable, set the right permissions to the %s directory."
+msgstr ""
+
+msgid "%s is installed on your system."
+msgstr ""
+
+msgid "%1s is not installed on your system, you should install %2s."
+msgstr ""
+
+msgid "PHP maximum upload size is sufficient (%s)."
+msgstr ""
+
+msgid "PHP maximum upload size is not sufficient (%1s), you should define it to %2s in %3s."
+msgstr ""
+
+msgid "Jappix manager"
+msgstr ""
+
+msgid "Manager access"
+msgstr ""
+
+msgid "Statistics"
+msgstr ""
+
+msgid "Hosts"
+msgstr ""
+
+msgid "Design"
+msgstr ""
+
+msgid "Repeat"
+msgstr ""
+
+msgid "All"
+msgstr ""
+
+msgid "Horizontal"
+msgstr ""
+
+msgid "Vertical"
+msgstr ""
+
+msgid "Center"
+msgstr ""
+
+msgid "Left"
+msgstr ""
+
+msgid "Right"
+msgstr ""
+
+msgid "Top"
+msgstr ""
+
+msgid "Bottom"
+msgstr ""
+
+msgid "Adapt"
+msgstr ""
+
+msgid "Color"
+msgstr ""
+
+msgid "Users"
+msgstr ""
+
+msgid "Updates"
+msgstr ""
+
+msgid "This is a restricted area: only the authorized users can manage this Jappix node."
+msgstr ""
+
+msgid "Please use the form below to login to the administration panel."
+msgstr ""
+
+msgid "To improve security, sessions are limited in time and when your browser will be closed, you will be logged out."
+msgstr ""
+
+msgid "Credentials"
+msgstr ""
+
+msgid "You have been logged out. Goodbye!"
+msgstr ""
+
+msgid "Oops, you could not be recognized as a valid administrator. Check your credentials!"
+msgstr ""
+
+msgid "Basic statistics are processed by Jappix about some important things, you can find them below."
+msgstr ""
+
+msgid "Change your Jappix node configuration with this tool."
+msgstr ""
+
+msgid "Change the XMPP hosts that this Jappix node serve with this tool."
+msgstr ""
+
+msgid "All this Jappix node stored files can be managed with this tool: please select a sub-folder and start editing its content!"
+msgstr ""
+
+msgid "Jappix is fully customisable: you can change its design right here."
+msgstr ""
+
+msgid "This is not a valid image, please use PNG, GIF or JPG!"
+msgstr ""
+
+msgid "The image could not be received, would you mind retry?"
+msgstr ""
+
+msgid "Your image was added to the list!"
+msgstr ""
+
+msgid "Changes saved!"
+msgstr ""
+
+msgid "You can define more than one administrator for this Jappix node. You can also change a password with this tool."
+msgstr ""
+
+msgid "Update your Jappix node with this tool, or check if a new one is available. Informations about the latest version are also displayed (in english)."
+msgstr ""
+
+msgid "Access statistics"
+msgstr ""
+
+msgid "Share statistics"
+msgstr ""
+
+msgid "Other statistics"
+msgstr ""
+
+msgid "January"
+msgstr ""
+
+msgid "February"
+msgstr ""
+
+msgid "March"
+msgstr ""
+
+msgid "April"
+msgstr ""
+
+msgid "May"
+msgstr ""
+
+msgid "June"
+msgstr ""
+
+msgid "July"
+msgstr ""
+
+msgid "August"
+msgstr ""
+
+msgid "September"
+msgstr ""
+
+msgid "October"
+msgstr ""
+
+msgid "November"
+msgstr ""
+
+msgid "December"
+msgstr ""
+
+msgid "Monday"
+msgstr ""
+
+msgid "Tuesday"
+msgstr ""
+
+msgid "Wednesday"
+msgstr ""
+
+msgid "Thursday"
+msgstr ""
+
+msgid "Friday"
+msgstr ""
+
+msgid "Saturday"
+msgstr ""
+
+msgid "Sunday"
+msgstr ""
+
+msgid "Total"
+msgstr ""
+
+msgid "Cache"
+msgstr ""
+
+msgid "Logs"
+msgstr ""
+
+msgid "Music"
+msgstr ""
+
+msgid "Backgrounds"
+msgstr ""
+
+msgid "Share"
+msgstr ""
+
+msgid "Background"
+msgstr ""
+
+msgid "Notice"
+msgstr ""
+
+msgid "Your design preferences have been saved!"
+msgstr ""
+
+msgid "Please check your inputs: something is missing!"
+msgstr ""
+
+msgid "Change your Jappix node background with this tool. You can either set a custom color or an uploaded image. Let your creativity flow!"
+msgstr ""
+
+msgid "Use default background"
+msgstr ""
+
+msgid "Use your own image"
+msgstr ""
+
+msgid "Select a background to use and change the display options."
+msgstr ""
+
+msgid "Use your own color"
+msgstr ""
+
+msgid "Type the hexadecimal color value you want to use as a background."
+msgstr ""
+
+msgid "Manage backgrounds"
+msgstr ""
+
+msgid "You can add a new background to the list with this tool. Please send a valid image."
+msgstr ""
+
+msgid "If you want to remove some backgrounds, use the browser below."
+msgstr ""
+
+msgid "Define a homepage notice for all your users, such as a warn, an important message or an advert with this tool."
+msgstr ""
+
+msgid "Simple notice"
+msgstr ""
+
+msgid "This notice only needs simple text to be displayed, but no code is allowed!"
+msgstr ""
+
+msgid "Advanced notice"
+msgstr ""
+
+msgid "You can customize your notice with embedded HTML, CSS and JavaScript, but you need to code the style."
+msgstr ""
+
+msgid "Available updates"
+msgstr ""
+
+msgid "What's new?"
+msgstr ""
+
+msgid "Your storage folders are not writable, please apply the good rights!"
+msgstr ""
+
+msgid "%1s may cause problems to the proxy, please increase %2s value up to %3s!"
+msgstr ""
+
+msgid "You are using a development version of Jappix. Update it through our repository by executing: %s."
+msgstr ""
+
+msgid "A new Jappix version is available! Check what is new and launch the update!"
+msgstr ""
+
+msgid "Your version is out to date. Update it now to %s by clicking here!"
+msgstr ""
+
+msgid "Your version seems to be up to date, but you can check updates manually by clicking here."
+msgstr ""
+
+msgid "Check for updates"
+msgstr ""
+
+msgid "Update in progress"
+msgstr ""
+
+msgid "Jappix has been updated: you are now running the latest version. Have fun!"
+msgstr ""
+
+msgid "The update has failed! Please try again later."
+msgstr ""
+
+msgid "Downloading package..."
+msgstr ""
+
+msgid "Removing current Jappix system files..."
+msgstr ""
+
+msgid "Extracting package..."
+msgstr ""
+
+msgid "Regenerating storage folder tree..."
+msgstr ""
+
+msgid "Jappix is now up to date!"
+msgstr ""
+
+msgid "Aborted: socket error!"
+msgstr ""
+
+msgid "Aborted: buffer error!"
+msgstr ""
+
+msgid "Aborted: everything is not writable!"
+msgstr ""
+
+msgid "Aborted: could not extract the package!"
+msgstr ""
+
+msgid "Visits"
+msgstr ""
+
+msgid "Daily"
+msgstr ""
+
+msgid "Weekly"
+msgstr ""
+
+msgid "Monthly"
+msgstr ""
+
+msgid "Yearly"
+msgstr ""
+
+msgid "Size"
+msgstr ""
+
+msgid "Clean everything"
+msgstr ""
+
+msgid "Purge cache"
+msgstr ""
+
+msgid "Purge logs"
+msgstr ""
+
+msgid "Purge updates"
+msgstr ""
+
+msgid "The storage folder you wanted to clean is now empty!"
+msgstr ""
+
+msgid "Keep your Jappix node fresh and fast, clean the storage folders regularly!"
+msgstr ""
+
+msgid "Upload your music (Ogg Vorbis, MP3 or WAV) to be able to listen to it in Jappix!"
+msgstr ""
+
+msgid "The file you want to upload must be smaller than %s."
+msgstr ""
+
+msgid "Stay tuned in what your users store on your server and remove undesired content with this tool."
+msgstr ""
+
+msgid "Title"
+msgstr ""
+
+msgid "Artist"
+msgstr ""
+
+msgid "Album"
+msgstr ""
+
+msgid "File"
+msgstr ""
+
+msgid "Upload"
+msgstr ""
+
+msgid "The folder is empty."
+msgstr ""
+
+msgid "The music could not be received, please retry!"
+msgstr ""
+
+msgid "This is not a valid music file, please encode in Ogg Vorbis, MP3 or WAV!"
+msgstr ""
+
+msgid "Your music has been added!"
+msgstr ""
+
+msgid "The selected elements have been removed."
+msgstr ""
+
+msgid "You must select elements to remove!"
+msgstr ""
+
+msgid "Add a new user with this tool, or change a password (type an existing username). Please submit a strong password!"
+msgstr ""
+
+msgid "Manage"
+msgstr ""
+
+msgid "List"
+msgstr ""
+
+msgid "Remove users with this tool. Note that you cannot remove an user if he is the only one remaining."
+msgstr ""
+
+msgid "The user has been added!"
+msgstr ""
+
+msgid "The chosen users have been removed."
+msgstr ""
+
+msgid "You must select one or more users to be removed!"
+msgstr ""
+
+msgid "Yesterday"
+msgstr ""
+
+msgid "%s days ago"
+msgstr ""
+
+msgid "User currently active"
+msgstr ""
+
+msgid "Last seen: %s"
+msgstr ""
+
+msgid "Inactive since: %s"
+msgstr ""
+
+msgid "Your friend seems not to have received your message(s)!"
+msgstr ""
+
+msgid "Static content server"
+msgstr ""
+
+msgid "This is the static content server for %1s, “%2s”."
+msgstr ""
+
+msgid "Suggested friends"
+msgstr ""
+
+msgid "Check all"
+msgstr ""
+
+msgid "Uncheck all"
+msgstr ""
+
+msgid "Choose"
+msgstr ""
+
+msgid "List name"
+msgstr ""
+
+msgid "Allow"
+msgstr ""
+
+msgid "Deny"
+msgstr ""
+
+msgid "Group"
+msgstr ""
+
+msgid "Subscription"
+msgstr ""
+
+msgid "Both"
+msgstr ""
+
+msgid "From"
+msgstr ""
+
+msgid "Everybody"
+msgstr ""
+
+msgid "Send messages"
+msgstr ""
+
+msgid "Send queries"
+msgstr ""
+
+msgid "See my status"
+msgstr ""
+
+msgid "Send his/her status"
+msgstr ""
+
+msgid "Everything"
+msgstr ""
+
+msgid "Item"
+msgstr ""
+
+msgid "Order"
+msgstr ""
+
+msgid "Active for this session"
+msgstr ""
+
+msgid "Always active"
+msgstr ""
+
+msgid "User directory"
+msgstr ""
+
+msgid "Search a friend"
+msgstr ""
+
+msgid "The feature requested is not implemented by the recipient or server and therefore cannot be processed."
+msgstr ""
+
+msgid "This is a repeat from %s"
+msgstr ""
+
+msgid "Loading comments..."
+msgstr ""
+
+msgid "Type your comment here..."
+msgstr ""
+
+msgid "Could not get the comments!"
+msgstr ""
+
+msgid "Show comments"
+msgstr ""
+
+msgid "Send him/her a message"
+msgstr ""
+
+msgid "Start a chat with him/her"
+msgstr ""
+
+msgid "Media integration"
+msgstr ""
+
+msgid "Comments locked!"
+msgstr ""
+
+msgid "Type something you want to share with your friends..."
+msgstr ""
+
+msgid "changed his/her nickname to %s"
+msgstr ""
+
+msgid "commented an item you follow: “%s”."
+msgstr ""
+
+msgid "Hide"
+msgstr ""
+
+msgid "liked your post: “%s”."
+msgstr ""
+
+msgid "quoted you somewhere: “%s”."
+msgstr ""
+
+msgid "published on your wall: “%s”."
+msgstr ""
+
+msgid "tagged you in a photo (%s)."
+msgstr ""
+
+msgid "tagged you in a video (%s)."
+msgstr ""
+
+msgid "Show"
+msgstr ""
+
+msgid "Need help? You'd better read our documentation page about how to fill this form!"
+msgstr ""
+
+msgid "Pubsub host"
+msgstr ""
+
+msgid "Jappix is a great social platform, that you can access wherever you are, whenever you want and communicate with whovever you want."
+msgstr ""
+
+msgid "Manager link"
+msgstr ""
+
+msgid "User uploads server"
+msgstr ""
+
+msgid "This is the user uploads server for %1s, “%2s”."
+msgstr ""
+
+msgid "Logo"
+msgstr ""
+
+msgid "You can set your own service logo to replace the default one. Take care of the size and the main color of each logo!"
+msgstr ""
+
+msgid "Upload each logo with the recommended maximum pixel size."
+msgstr ""
+
+msgid "This is not a valid image, please use the PNG format!"
+msgstr ""
+
+msgid "Your service logo has been successfully changed!"
+msgstr ""
+
+msgid "Your logo format must be PNG. Leave a field empty and the logo will not be changed."
+msgstr ""
+
+msgid "Remove this logo"
+msgstr ""
+
+msgid "View this logo"
+msgstr ""
+
+msgid "Send a file"
+msgstr ""
+
+msgid "Once uploaded, your friend will be prompted to download the file you sent."
+msgstr ""
+
+msgid "Groupchats to join"
+msgstr ""
+
+msgid "Purge sent files"
+msgstr ""
+
+msgid "would like to send you a file: “%s”."
+msgstr ""
+
+msgid "has accepted to received your file: “%s”."
+msgstr ""
+
+msgid "has rejected to receive your file: “%s”."
+msgstr ""
+
+msgid "could not receive your file: “%s”."
+msgstr ""
+
+msgid "has received a file exchange request: “%s”."
+msgstr ""
+
+msgid "Available shortcuts:"
+msgstr ""
+
+msgid "%s removes the chat logs"
+msgstr ""
+
+msgid "%s joins a groupchat"
+msgstr ""
+
+msgid "%s closes the chat"
+msgstr ""
+
+msgid "%s shows the user profile"
+msgstr ""
+
+msgid "%s sends a message to the room"
+msgstr ""
+
+msgid "%s changes your nickname"
+msgstr ""
+
+msgid "%s sends a message to someone in the room"
+msgstr ""
+
+msgid "%s changes the room topic"
+msgstr ""
+
+msgid "%s kicks an user of the room"
+msgstr ""
+
+msgid "%s bans an user of the room"
+msgstr ""
+
+msgid "%s invites someone to join the room"
+msgstr ""
+
+msgid "Social channel, chat and more."
+msgstr ""
+
+msgid "Create your public profile."
+msgstr ""
+
+msgid "A mini-chat for your website."
+msgstr ""
+
+msgid "Get Jappix, get support."
+msgstr ""
+
+msgid "Statistics around Jappix."
+msgstr ""
+
+msgid "Download Jappix for free."
+msgstr ""
+
+msgid "Find a public Jappix node."
+msgstr ""
+
+msgid "Public profile"
+msgstr ""
+
+msgid "Your profile anywhere on the Web."
+msgstr ""
+
+msgid "%s is a Jappix.com service which makes your XMPP profile public. It is easier to share it. No XMPP account is required to view your social channel, your current position and your contact details."
+msgstr ""
+
+msgid "Furthermore, every picture you post in your social channel is added to a beautiful picture timeline. You can now view the pictures you shared year by year."
+msgstr ""
+
+msgid "You can also use your XMPP avatar as a single avatar for every website, blog and forum you use. When you change it on XMPP, the new avatar appears everywhere. What a genious improvement!"
+msgstr ""
+
+msgid "Yay, let's create my public profile!"
+msgstr ""
+
+msgid "Enable my public profile"
+msgstr ""
+
+#~ msgid "Jappix is a non-profit social platform, that you can access wherever you are, whenever you want and communicate with whovever you want."
+#~ msgstr ""
+
+#~ msgid "See"
+#~ msgstr ""
+
+#~ msgid "Use default logo"
+#~ msgstr ""
+
+#~ msgid "Use your own logo"
+#~ msgstr ""
+
+#~ msgid "The recommended image format is PNG. Leave a field empty and the logo will not be changed."
+#~ msgstr ""
diff --git a/jappixmini/jappix/lang/zh/LC_MESSAGES/main.mo b/jappixmini/jappix/lang/zh/LC_MESSAGES/main.mo
new file mode 100644
index 00000000..f730fbff
Binary files /dev/null and b/jappixmini/jappix/lang/zh/LC_MESSAGES/main.mo differ
diff --git a/jappixmini/jappix/lang/zh/LC_MESSAGES/main.po b/jappixmini/jappix/lang/zh/LC_MESSAGES/main.po
new file mode 100644
index 00000000..33c1f821
--- /dev/null
+++ b/jappixmini/jappix/lang/zh/LC_MESSAGES/main.po
@@ -0,0 +1,1870 @@
+# Chinese translations for Jappix package.
+# This file is distributed under the same license as the Jappix package.
+# This file was translated from CodingTeam at <http://codingteam.net/>.
+msgid ""
+msgstr ""
+"Project-Id-Version: Jappix\n"
+"PO-Revision-Date: 2012-01-16 21:26+0100\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"POT-Creation-Date: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+
+msgid "JavaScript is missing in your web browser, so that you will not be able to launch Jappix! Please fix this."
+msgstr "在你的網頁瀏覽器找不到 JavaScript，所以你無法啟動 Jappix！請修正。"
+
+msgid "An open social network"
+msgstr "開放社交網路"
+
+msgid "Jappix has been interrupted by a network issue, a bug or bad login (check that you entered the right credentials), sorry for the inconvenience."
+msgstr "Jappix 已經因為網路問題、bug 或登入錯誤（檢查你輸入了正確的身份證明）而被中斷，抱歉造成不便。"
+
+msgid "The element list on this server could not be obtained!"
+msgstr "此伺服器的元素清單無法取得！"
+
+msgid "Your password has been changed, now you can connect to your account with your new login data."
+msgstr "你的密碼已被變更，現在你可以用新的登入資料連到你的帳號。"
+
+msgid "Your XMPP account has been removed, bye!"
+msgstr "你的 XMPP 帳號已被刪除，再見！"
+
+msgid "You have been logged out of your XMPP account, have a nice day!"
+msgstr "你已經登出你的 XMPP 帳號，祝你今天愉快！"
+
+msgid "The room you joined seems not to exist. You should create it!"
+msgstr "你加入的房間似乎不存在。你應該建立它！"
+
+msgid "The groupchat has been removed, now someone else will be able to recreate it."
+msgstr "群組聊天已經被刪除，現在其他人應該可以重新建立它。"
+
+msgid "The user that you want to reach is not present in the room."
+msgstr "你想聯繫的使用者不在房間內。"
+
+msgid "Please enter the group chat address to join."
+msgstr "請輸入要加入的群組聊天地址。"
+
+msgid "Please enter your nickname to join %s."
+msgstr "請輸入要加入 %s 用的暱稱。"
+
+msgid "This room (%s) is protected with a password."
+msgstr "此房間（%s）有密碼保護。"
+
+msgid "Your browser is out of date!"
+msgstr "你的瀏覽器已經過時！"
+
+msgid "Last %s version is better!"
+msgstr "推鑒使用最新版本 %s！"
+
+msgid "Login"
+msgstr "登入"
+
+msgid "Register"
+msgstr "註冊"
+
+msgid "Here we go!"
+msgstr "開始囉！"
+
+msgid "Server"
+msgstr "伺服器"
+
+msgid "Password"
+msgstr "密碼"
+
+msgid "Remember me"
+msgstr "記住我"
+
+msgid "This tool has been disabled, you cannot use it!"
+msgstr "此工具已被停用，你不能使用它！"
+
+msgid "Due to a network issue, you were disconnected. What do you want to do now?"
+msgstr "因為網路問題，你已被斷線。你現在想做什麼？"
+
+msgid "Reconnect"
+msgstr "重新連線"
+
+msgid "Messages"
+msgstr "訊息"
+
+msgid "Profile"
+msgstr "個人資料"
+
+msgid "Options"
+msgstr "選項"
+
+msgid "Disconnect"
+msgstr "斷線"
+
+msgid "Filter"
+msgstr "過濾"
+
+msgid "Add a friend"
+msgstr "新增好友"
+
+msgid "Your groupchats"
+msgstr "你的群組聊天"
+
+msgid "Manage your favorite groupchats"
+msgstr "管理你最愛的群組聊天"
+
+msgid "More stuff"
+msgstr "更多東西"
+
+msgid "Show all friends"
+msgstr "顯示所有好友"
+
+msgid "Only show connected friends"
+msgstr "只顯示已連線的好友"
+
+msgid "Message archives"
+msgstr "訊息存檔"
+
+msgid "Date"
+msgstr "日期"
+
+msgid "Please select a friend to view the chat history."
+msgstr "請選取要檢視聊天記錄的朋友。"
+
+msgid "Nothing found for: %s"
+msgstr "找不到：%s"
+
+msgid "A short message?"
+msgstr "短訊息？"
+
+msgid "How are you?"
+msgstr "你好嗎？"
+
+msgid "What are you doing?"
+msgstr "你在做什麼？"
+
+msgid "Join a chat"
+msgstr "加入聊天"
+
+msgid "Status"
+msgstr "狀態"
+
+msgid "Available"
+msgstr "有空"
+
+msgid "Talkative"
+msgstr "多話"
+
+msgid "Away"
+msgstr "離開"
+
+msgid "Not available"
+msgstr "沒空"
+
+msgid "Busy"
+msgstr "忙碌"
+
+msgid "Mood"
+msgstr "心情"
+
+msgid "None"
+msgstr "無"
+
+msgid "Crazy"
+msgstr "抓狂"
+
+msgid "Excited"
+msgstr "興奮"
+
+msgid "Playful"
+msgstr "快活"
+
+msgid "Happy"
+msgstr "快樂"
+
+msgid "Shocked"
+msgstr "震驚"
+
+msgid "Hot"
+msgstr "激動"
+
+msgid "Sad"
+msgstr "悲傷"
+
+msgid "Amorous"
+msgstr "愛慕"
+
+msgid "Confident"
+msgstr "大膽"
+
+msgid "Activity"
+msgstr "活動"
+
+msgid "Chores"
+msgstr "雜事"
+
+msgid "Drinking"
+msgstr "喝"
+
+msgid "Eating"
+msgstr "吃"
+
+msgid "Exercising"
+msgstr "運動"
+
+msgid "Grooming"
+msgstr "訓練"
+
+msgid "Appointment"
+msgstr "預約"
+
+msgid "Inactive"
+msgstr "無效"
+
+msgid "Relaxing"
+msgstr "放鬆"
+
+msgid "Talking"
+msgstr "對話"
+
+msgid "Traveling"
+msgstr "旅行"
+
+msgid "Working"
+msgstr "工作"
+
+msgid "View profile"
+msgstr "檢視個人資料"
+
+msgid "Repeat this notice"
+msgstr "重覆此通知"
+
+msgid "Remove this notice"
+msgstr "刪除此通知"
+
+msgid "Your profile"
+msgstr "你的個人資料"
+
+msgid "Identity"
+msgstr "身分證明"
+
+msgid "Profile image"
+msgstr "大頭貼"
+
+msgid "Others"
+msgstr "其他"
+
+msgid "Personal"
+msgstr "個人"
+
+msgid "Complete name"
+msgstr "全名"
+
+msgid "Nickname"
+msgstr "暱稱"
+
+msgid "First name"
+msgstr "名"
+
+msgid "Last name"
+msgstr "姓"
+
+msgid "Date of birth"
+msgstr "生日"
+
+msgid "Contact"
+msgstr "連絡人"
+
+msgid "E-mail"
+msgstr "電子郵件"
+
+msgid "Phone"
+msgstr "電話"
+
+msgid "Website"
+msgstr "網站"
+
+msgid "Current"
+msgstr "目前"
+
+msgid "Delete"
+msgstr "刪除"
+
+msgid "What a pity! You have no profile image defined in your identity card!"
+msgstr "可惜！你沒有在你的身份證上設定大頭貼！"
+
+msgid "Address"
+msgstr "地址"
+
+msgid "Street"
+msgstr "街"
+
+msgid "City"
+msgstr "市"
+
+msgid "Postal code"
+msgstr "郵遞區號"
+
+msgid "Country"
+msgstr "國家"
+
+msgid "Biography"
+msgstr "自傳"
+
+msgid "Important notice"
+msgstr "重要通知"
+
+msgid "Be careful of the information you write into your profile, because it could be accessed by everyone (even someone you don't want to)."
+msgstr "小心你寫入個人資料的資訊，因為它可被每個人取得（甚至你不要的人）。"
+
+msgid "Not everything is private on XMPP; this is one of those things, your public profile (vCard)."
+msgstr "在 XMPP 上不是每樣東西是私有的；這是其中一件，你的公開個人資料（vCard）。"
+
+msgid "It is strongly recommended to upload a profile image (%s maximum), like a picture of yourself, because that makes you easily recognizable by your friends."
+msgstr "強烈建議上傳大頭照（最大 %s），像是你自己的相片，因為那會使你的朋友更容易認得你。"
+
+msgid "Save"
+msgstr "儲存"
+
+msgid "Cancel"
+msgstr "取消"
+
+msgid "Edit options"
+msgstr "編輯選項"
+
+msgid "Channel"
+msgstr "頻道"
+
+msgid "Commands"
+msgstr "命令"
+
+msgid "Sounds"
+msgstr "聲音"
+
+msgid "Privacy"
+msgstr "隱私"
+
+msgid "Message archiving"
+msgstr "訊息存檔"
+
+msgid "Store a history of your chats"
+msgstr "儲存你的聊天記錄"
+
+msgid "Geolocation"
+msgstr "地理位置"
+
+msgid "Empty"
+msgstr "空"
+
+msgid "Empty channel"
+msgstr "空的頻道"
+
+msgid "Persistent"
+msgstr "持續"
+
+msgid "Maximum notices"
+msgstr "通知的最大數"
+
+msgid "Account"
+msgstr "帳號"
+
+msgid "Change password"
+msgstr "變更密碼"
+
+msgid "Delete account"
+msgstr "刪除帳號"
+
+msgid "Old"
+msgstr "舊"
+
+msgid "New (2 times)"
+msgstr "新（2 次）"
+
+msgid "Continue"
+msgstr "繼續"
+
+msgid "To"
+msgstr "至"
+
+msgid "Close"
+msgstr "關閉"
+
+msgid "unknown"
+msgstr "不明"
+
+msgid "Unavailable"
+msgstr "無法使用"
+
+msgid "is now"
+msgstr "現在是"
+
+msgid "Please wait while your avatar is uploaded..."
+msgstr "請稍待，avatar 正被載入..."
+
+msgid "Here it is! A new beautiful profile image!"
+msgstr "在此！美麗的新大頭貼！"
+
+msgid "The image file is not supported or has a bad size."
+msgstr "影像檔不被支援或大小錯誤。"
+
+msgid "Reply"
+msgstr "回覆"
+
+msgid "Error"
+msgstr "錯誤"
+
+msgid "Click here to solve the error"
+msgstr "在此點一下以解決錯誤"
+
+msgid "You"
+msgstr "你"
+
+msgid "Remove"
+msgstr "刪除"
+
+msgid "Rename"
+msgstr "更名"
+
+msgid "Hi, I am %s, I would like to add you as my friend."
+msgstr "嗨，我是 %s，我想把你加入為我的好友。"
+
+msgid "Smiley insertion"
+msgstr "挿入微笑符號"
+
+msgid "Change style"
+msgstr "變更風格"
+
+msgid "Text in bold"
+msgstr "粗體字"
+
+msgid "Text in italic"
+msgstr "斜體字"
+
+msgid "Underlined text"
+msgstr "底線字"
+
+msgid "Save chat"
+msgstr "儲存聊天"
+
+msgid "Click on the following link to get the chat log, and wait. Then click again to get the file."
+msgstr "在以下連結點一下以取得聊天記錄，且稍待。然後再點一下取得檔案。"
+
+msgid "This chat is empty!"
+msgstr "此聊天是空的！"
+
+msgid "Generate file!"
+msgstr "產生檔案！"
+
+msgid "Download file!"
+msgstr "下載檔案！"
+
+msgid "Clean current chat"
+msgstr "清除目前的聊天"
+
+msgid "View chat history"
+msgstr "檢視聊天記錄"
+
+msgid "Show user profile"
+msgstr "顯示使用者個人資料"
+
+msgid "Add this contact to your friends"
+msgstr "加入此連絡人至你的好友"
+
+msgid "Add this groupchat to your favorites"
+msgstr "加入此群組聊天至你的最愛"
+
+msgid "All tabs"
+msgstr "全部頁籤"
+
+msgid "Close this tab"
+msgstr "關閉此頁籤"
+
+msgid "no subject defined for this room."
+msgstr "此房間未設定主旨。"
+
+msgid "Administration panel for this room"
+msgstr "此房間的管理面板"
+
+msgid "Moderators"
+msgstr "主持人"
+
+msgid "Participants"
+msgstr "参與者"
+
+msgid "Visitors"
+msgstr "訪客"
+
+msgid "Manage favorite rooms"
+msgstr "管理最愛的房間"
+
+msgid "Change favorites"
+msgstr "變更我的最愛"
+
+msgid "Search a room"
+msgstr "搜尋房間"
+
+msgid "Select a favorite"
+msgstr "選取我的最愛"
+
+msgid "Getting the name..."
+msgstr "正在取得名稱..."
+
+msgid "Gateway"
+msgstr "閘道"
+
+msgid "Name"
+msgstr "名稱"
+
+msgid "Room"
+msgstr "房間"
+
+msgid "Add"
+msgstr "增加"
+
+msgid "Edit"
+msgstr "編輯"
+
+msgid "Search a room on"
+msgstr "搜尋房間於"
+
+msgid "No room found on this server."
+msgstr "在此伺服器上找不到房間。"
+
+msgid "Service discovery"
+msgstr "服務探索"
+
+msgid "Server to query"
+msgstr "查詢的伺服器"
+
+msgid "Sorry, but the entity didn't return any result!"
+msgstr "抱歉，但是那實體未傳回任何結果！"
+
+msgid "Accounts"
+msgstr "帳號"
+
+msgid "Authentications"
+msgstr "授權"
+
+msgid "Automation"
+msgstr "自動"
+
+msgid "Clients"
+msgstr "客戶端"
+
+msgid "Collaboration"
+msgstr "協同"
+
+msgid "Components"
+msgstr "元件"
+
+msgid "Rooms"
+msgstr "房間"
+
+msgid "Directories"
+msgstr "目錄"
+
+msgid "Gateways"
+msgstr "閘道"
+
+msgid "News"
+msgstr "新聞"
+
+msgid "Hierarchy"
+msgstr "階層"
+
+msgid "Proxies"
+msgstr "代理伺服器"
+
+msgid "Publication/Subscription"
+msgstr "公開/訂閱"
+
+msgid "Storage"
+msgstr "儲存空間"
+
+msgid "Service offline or broken"
+msgstr "服務離線或故障"
+
+msgid "Your inbox"
+msgstr "你的收件匣"
+
+msgid "Available actions"
+msgstr "可用的動作"
+
+msgid "Clean"
+msgstr "清除"
+
+msgid "New"
+msgstr "新增"
+
+msgid "Received"
+msgstr "已接收"
+
+msgid "Subject"
+msgstr "主旨"
+
+msgid "Content"
+msgstr "内容"
+
+msgid "Send message"
+msgstr "傳送訊息"
+
+msgid "Your inbox is empty."
+msgstr "你的收件匣是空的。"
+
+msgid "MUC administration"
+msgstr "MUC 管理"
+
+msgid "You administrate this room"
+msgstr "你管理此房間"
+
+msgid "Enter new subject"
+msgstr "輸入新的主旨"
+
+msgid "Configuration"
+msgstr "設定"
+
+msgid "Authorizations"
+msgstr "授權"
+
+msgid "Member list"
+msgstr "會員清單"
+
+msgid "Owner list"
+msgstr "所有者清單"
+
+msgid "Administrator list"
+msgstr "管理員清單"
+
+msgid "Outcast list"
+msgstr "被放逐者清單"
+
+msgid "Add an input"
+msgstr "增加輸入"
+
+msgid "Destroy this MUC"
+msgstr "銷毀此 MUC"
+
+msgid "Yes, let's do it!"
+msgstr "是，做吧！"
+
+msgid "Your friend is paying attention to the conversation."
+msgstr "你的好友正在注意會話。"
+
+msgid "Your friend is writing a message..."
+msgstr "你的好友正在寫訊息..."
+
+msgid "Your friend stopped writing a message."
+msgstr "你的好友停止寫訊息。"
+
+msgid "Your friend is doing something else."
+msgstr "你的好友正在做其他事。"
+
+msgid "Your friend closed the chat."
+msgstr "你的好友關閉了聊天。"
+
+msgid "Requesting this service..."
+msgstr "正在要求此服務..."
+
+msgid "Loading"
+msgstr "載入中"
+
+msgid "joined the chat room"
+msgstr "加入聊天室"
+
+msgid "left the chat room"
+msgstr "離開聊天室"
+
+msgid "no status"
+msgstr "無狀態"
+
+msgid "has been kicked"
+msgstr "已被踢掉"
+
+msgid "has been banned"
+msgstr "已被禁止"
+
+msgid "no reason"
+msgstr "無理由"
+
+msgid "Communicate with the entire world!"
+msgstr "與全世界溝通！"
+
+msgid "It allows you to get in touch with the millions of users who currently use the XMPP network like you do with Jappix. Join the community and stay free!"
+msgstr "它允許你與幾百萬跟你一樣正在利用 Jappix 的使用者聯繫。自由地加入社群吧！"
+
+msgid "Hi there!"
+msgstr "你好！"
+
+msgid "Welcome on %1s, “%2s”."
+msgstr "歡迎來到 %1s，“%2s”。"
+
+msgid "Login to your existing XMPP account or create a new one for free!"
+msgstr "登入你已有的 XMPP 帳號或免費建立新帳號！"
+
+msgid "Jappix is an open-source project from PostPro, a non-profit organization which provides us a great help."
+msgstr "Jappix 是來自 PostPro 的開放原始碼專案，一個提供我們許多幫助的非營利團體。"
+
+msgid "Login to your existing XMPP account. You can also use the %s to join a groupchat."
+msgstr "登入你已有的 XMPP 帳號。你也可以使用 %s 加入群組聊天。"
+
+msgid "Previous"
+msgstr "上一頁"
+
+msgid "General"
+msgstr "一般"
+
+msgid "Advanced"
+msgstr "進階"
+
+msgid "Resource"
+msgstr "資源"
+
+msgid "Priority"
+msgstr "優先權"
+
+msgid "Low"
+msgstr "低"
+
+msgid "Medium"
+msgstr "中"
+
+msgid "High"
+msgstr "高"
+
+msgid "Enter the groupchat you want to join and the nick you want to have. You can also go back to the %s."
+msgstr "輸入你想加入的聊天群組與你想要的暱稱。你也可以回到 %s。"
+
+msgid "login page"
+msgstr "登入頁"
+
+msgid "Share this link with your friends:"
+msgstr "與好友分享此連結："
+
+msgid "Register a new XMPP account to join your friends on your own social cloud. That's simple!"
+msgstr "註冊一個新的 XMPP 帳號以便在你自己的社交雲端上加入你的好友。那是簡單的！"
+
+msgid "Required"
+msgstr "要求"
+
+msgid "You have been registered, here is your XMPP address:"
+msgstr "你已經註冊了，這是你的 XMPP 地址："
+
+msgid "Manager"
+msgstr "管理員"
+
+msgid "Project"
+msgstr "專案"
+
+msgid "Encrypted"
+msgstr "加密"
+
+msgid "Unencrypted"
+msgstr "未加密"
+
+msgid "Where are you?"
+msgstr "你在哪裡？"
+
+msgid "What's up with you?"
+msgstr "你怎麼了？"
+
+msgid "Fetching the social channel..."
+msgstr "取得社交頻道..."
+
+msgid "You are synchronized with your network."
+msgstr "你已與你的網路同步。"
+
+msgid "Cannot send anything: you can only receive notices!"
+msgstr "無法傳送任何東西：你只能接收通知！"
+
+msgid "Media viewer"
+msgstr "媒體播放機"
+
+msgid "Browse"
+msgstr "瀏覽"
+
+msgid "Command"
+msgstr "命令"
+
+msgid "Subscribe"
+msgstr "訂閱"
+
+msgid "Join"
+msgstr "加入"
+
+msgid "Automatic"
+msgstr "自動"
+
+msgid "Search"
+msgstr "搜尋"
+
+msgid "No result!"
+msgstr "無結果！"
+
+msgid "No notifications."
+msgstr "無通知。"
+
+msgid "would like to add you as a friend."
+msgstr "想要加入你為好友。"
+
+msgid "would like you to join this chatroom:"
+msgstr "想要你加入此聊天室："
+
+msgid "Do you accept?"
+msgstr "你接受嗎？"
+
+msgid "Yes"
+msgstr "是"
+
+msgid "No"
+msgstr "否"
+
+msgid "would like to get authorization."
+msgstr "想要得到授權。"
+
+msgid "Do you want to see the friends %s suggests you?"
+msgstr "你要看好友 %s 建議你？"
+
+msgid "Submit"
+msgstr "送信"
+
+msgid "Client"
+msgstr "客戶端"
+
+msgid "System"
+msgstr "系統"
+
+msgid "Local time"
+msgstr "本地時間"
+
+msgid "Comments"
+msgstr "評論"
+
+msgid "User profile"
+msgstr "使用者情報"
+
+msgid "See his/her position on the globe"
+msgstr "看他在地球上的位置"
+
+msgid "Confirm"
+msgstr "確認"
+
+msgid "anonymous mode"
+msgstr "匿名模式"
+
+msgid "Groups"
+msgstr "群組"
+
+msgid "Unclassified"
+msgstr "未分類"
+
+msgid "Authorize"
+msgstr "授權"
+
+msgid "Ask for authorization"
+msgstr "要求授權"
+
+msgid "Unblock"
+msgstr "解除鎖定"
+
+msgid "Prohibit"
+msgstr "禁止"
+
+msgid "Block"
+msgstr "阻擋"
+
+msgid "Chat"
+msgstr "聊天"
+
+msgid "Groupchat"
+msgstr "群組聊天"
+
+msgid "Jappix Mobile"
+msgstr "Jappix 行動"
+
+msgid "Desktop"
+msgstr "桌面"
+
+msgid "Mobile"
+msgstr "行動"
+
+msgid "Please wait..."
+msgstr "請稍待..."
+
+msgid "Please enable JavaScript"
+msgstr "請啟用 JavaScript"
+
+msgid "Your channel"
+msgstr "你的頻道"
+
+msgid "Channel of"
+msgstr "頻道: "
+
+msgid "More notices..."
+msgstr "更多通知..."
+
+msgid "Attach a file"
+msgstr "附加檔案"
+
+msgid "Send"
+msgstr "傳送"
+
+msgid "Unattach the file"
+msgstr "取消附加檔案"
+
+msgid "An error occured while uploading your file: maybe it is too big (%s maximum) or forbidden!"
+msgstr "當上傳你的檔案時發生錯誤：也許它太大（最大 %s）或被禁止！"
+
+msgid "Authorization failed"
+msgstr "授權失敗"
+
+msgid "Registration failed, please choose a different username"
+msgstr "註冊失敗，請挑選另一個使用者名稱"
+
+msgid "Service unavailable"
+msgstr "服務無法使用"
+
+msgid "Internal server error, try later"
+msgstr "内部伺服器錯誤，稍後再試"
+
+msgid "Your form has been sent."
+msgstr "你的表單已被送出。"
+
+msgid "Application"
+msgstr "應用程式"
+
+msgid "XMPP links"
+msgstr "XMPP 連結"
+
+msgid "Open XMPP links with Jappix"
+msgstr "用 Jappix 開啟 XMPP 連結"
+
+msgid "changed the subject to:"
+msgstr "變更主旨為："
+
+msgid "Welcome!"
+msgstr "歡迎！"
+
+msgid "Friends"
+msgstr "好友"
+
+msgid "Welcome on Jappix, your own social cloud!"
+msgstr "歡迎來到 Jappix，你自己的社交雲端！"
+
+msgid "Before you start using it, you will have to change some settings, search for friends and complete your profile."
+msgstr "在你開使使用它之前，你必須變更一些設定，搜尋朋友並完成你的個人資訊。"
+
+msgid "Enable notification sounds"
+msgstr "啟用通知音效"
+
+msgid "Share your position on the globe"
+msgstr "分享你在地球上的位置"
+
+msgid "Offline friends"
+msgstr "離線好友"
+
+msgid "Don't hide offline friends"
+msgstr "不要隱藏離線好友"
+
+msgid "Use this tool to find your friends on the server you are using right now, or add them later."
+msgstr "使用此工具在你正在使用的伺服器上找到你的朋友，或稍後加入他們。"
+
+msgid "Great work! Now, you can share Jappix with your friends!"
+msgstr ""
+
+msgid "When you will press the save button, the profile editor will be opened. Happy socializing!"
+msgstr ""
+
+msgid "Share Jappix on %s"
+msgstr "在 %s 上分享 Jappix"
+
+msgid "Using Jappix, an open social platform. I am %s!"
+msgstr "使用 Jappix，一個開放社交平台。我是 %s！"
+
+msgid "Unknown name"
+msgstr "不明的名稱"
+
+msgid "Unknown country"
+msgstr "不明的國家"
+
+msgid "Click to enable"
+msgstr "點一下以啟用"
+
+msgid "Click to disable"
+msgstr "點一下以停用"
+
+msgid "Installation"
+msgstr "安裝"
+
+msgid "Jappix installation"
+msgstr "Jappix 安裝"
+
+msgid "Welcome to the Jappix installation!"
+msgstr "歡迎來到 Jappix 安裝！"
+
+msgid "This tool will help you fastly install Jappix, the first full-featured XMPP-based social platform, on your server. You don't even need any technical knowledge."
+msgstr "此工具將幫你快速地安裝 Jappix，第一個全功能以 XMPP 為基礎的社交平台。你甚至不需要任何技術知識。"
+
+msgid "Let's have a look at the installation steps:"
+msgstr "讓我們看一下安裝步驟："
+
+msgid "Welcome"
+msgstr "歡迎"
+
+msgid "Storage configuration"
+msgstr "儲存空間設定"
+
+msgid "Administrator account"
+msgstr "管理員帳號"
+
+msgid "Main configuration"
+msgstr "主要設定"
+
+msgid "Hosts configuration"
+msgstr "主機設定"
+
+msgid "Services installation"
+msgstr "服務安裝"
+
+msgid "If the current language does not match yours (%1s), you can make Jappix speak %2s it will be saved."
+msgstr "如果目前的語言與你的不符（%1s），你可以讓 Jappix 說 %2s 它將被儲存。"
+
+msgid "If you want to get some help about the Jappix installation and configuration, you can use our whole documentation, available at:"
+msgstr ""
+
+msgid "It's time to build your own social cloud: just go to the next step!"
+msgstr ""
+
+msgid "Jappix stores persistent data (such as shared files, chat logs, your own music and its configuration) into a single secured storage folder."
+msgstr ""
+
+msgid "Jappix must be able to write in this folder to create its sub-directories. If not, you must set the rights to %1s or change the folder owner to %2s (depending of your configuration)."
+msgstr ""
+
+msgid "The folder is writable, you can continue!"
+msgstr "資料夾可寫入，你可以繼續！"
+
+msgid "Jappix offers you the possibility to manage your configuration, install new addons or search for updates. That's why you must create an administrator account to access the manager."
+msgstr ""
+
+msgid "When Jappix will be installed, just click on the manager link on the home page to access it."
+msgstr "當 Jappix 安裝完成後，只要點一下首頁上的管理員連結就可以進入。"
+
+msgid "Oops, you missed something or the two passwords do not match!"
+msgstr "糟糕，你漏了某些東西或兩個密碼不一致！"
+
+msgid "Jappix needs that you specify some values to work. Please correct the following inputs (or keep the default values, which are sufficient for most people)."
+msgstr "Jappix 需要你指定某些值才能開始工作。請確認下列輸入（或保留預設值，對大多數人來說是足夠的）。"
+
+msgid "Note that if you don't specify a value which is compulsory, it will be automatically completed with the default one."
+msgstr ""
+
+msgid "User"
+msgstr "使用者"
+
+msgid "Service"
+msgstr "服務"
+
+msgid "Service name"
+msgstr "服務名稱"
+
+msgid "Service description"
+msgstr "服務説明"
+
+msgid "Connection"
+msgstr "連線"
+
+msgid "Lock the host"
+msgstr "鎖定主機"
+
+msgid "Anonymous mode"
+msgstr "匿名模式"
+
+msgid "Registration allowed"
+msgstr "允許註冊"
+
+msgid "Use a proxy"
+msgstr "使用代理伺服器"
+
+msgid "Encryption"
+msgstr "加密"
+
+msgid "HTTPS storage"
+msgstr "HTTPS 儲存空間"
+
+msgid "Force HTTPS"
+msgstr "強制使用 HTTPS"
+
+msgid "Compression"
+msgstr "壓縮"
+
+msgid "This page helps you specify the default hosts Jappix will connect to. You can leave it as it is and continue if you want to use the official service hosts."
+msgstr ""
+
+msgid "Maybe you don't know what a BOSH server is? In fact, this is a relay between a Jappix client and a XMPP server, which is necessary because of technical limitations."
+msgstr ""
+
+msgid "Main host"
+msgstr "主要主機"
+
+msgid "Groupchat host"
+msgstr "群組聊天主機"
+
+msgid "Anonymous host"
+msgstr "匿名主機"
+
+msgid "Directory host"
+msgstr "目錄主機"
+
+msgid "BOSH host"
+msgstr "BOSH 主機"
+
+msgid "You can install some extra softwares on your server, to extend your Jappix features. Some others might be modified, because of security restrictions which are set by default."
+msgstr ""
+
+msgid "To perform this, you must be able to access your server's shell and be logged in as root. Remember this is facultative, Jappix will work without these modules, but some of its features will be unavailable."
+msgstr ""
+
+msgid "After you finished the setup, Jappix will generate the cache files. It might be slow, just wait until the application is displayed and do not press any button."
+msgstr "在你完成設定後，Jappix 將產生一些快取檔案。它也許會費時，只能等到應用程式顯示且不要按任何按鈕。"
+
+msgid "Thanks for using Jappix!"
+msgstr "感謝使用 Jappix！"
+
+msgid "Next"
+msgstr "下一頁"
+
+msgid "Finish"
+msgstr "完成"
+
+msgid "Check again"
+msgstr "再檢查"
+
+msgid "The folder is not writable, set the right permissions to the %s directory."
+msgstr "資料夾不可寫入，設定正確權限至 %s 目錄。"
+
+msgid "%s is installed on your system."
+msgstr "%s 已經安裝在你的系統。"
+
+msgid "%1s is not installed on your system, you should install %2s."
+msgstr "%1s 未安裝在你的系統，你需要安裝 %2s。"
+
+msgid "PHP maximum upload size is sufficient (%s)."
+msgstr "PHP 最大上傳已足夠（%s）。"
+
+msgid "PHP maximum upload size is not sufficient (%1s), you should define it to %2s in %3s."
+msgstr "PHP 最大上傳不足夠（%1s），你必須定義它為 %2s 在 %3s 中。"
+
+msgid "Jappix manager"
+msgstr "Jappix 管理員"
+
+msgid "Manager access"
+msgstr "管理員入口"
+
+msgid "Statistics"
+msgstr "統計"
+
+msgid "Hosts"
+msgstr "主機"
+
+msgid "Design"
+msgstr "設計"
+
+msgid "Repeat"
+msgstr "報告"
+
+msgid "All"
+msgstr "全部"
+
+msgid "Horizontal"
+msgstr "水平"
+
+msgid "Vertical"
+msgstr "垂直"
+
+msgid "Center"
+msgstr "中"
+
+msgid "Left"
+msgstr "左"
+
+msgid "Right"
+msgstr "右"
+
+msgid "Top"
+msgstr "上"
+
+msgid "Bottom"
+msgstr "下"
+
+msgid "Adapt"
+msgstr "適用"
+
+msgid "Color"
+msgstr "色彩"
+
+msgid "Users"
+msgstr "使用者"
+
+msgid "Updates"
+msgstr "更新"
+
+msgid "This is a restricted area: only the authorized users can manage this Jappix node."
+msgstr "這是限制區域：只有得到授權的使用者可以管理此 Jappix 節點。"
+
+msgid "Please use the form below to login to the administration panel."
+msgstr "請使用下面的表單登入管理面板。"
+
+msgid "To improve security, sessions are limited in time and when your browser will be closed, you will be logged out."
+msgstr ""
+
+msgid "Credentials"
+msgstr "身份證明"
+
+msgid "You have been logged out. Goodbye!"
+msgstr "你已經被登出。再見！"
+
+msgid "Oops, you could not be recognized as a valid administrator. Check your credentials!"
+msgstr "糟糕，你無法被認為是有效的管理員。檢查你的身份證明！"
+
+msgid "Basic statistics are processed by Jappix about some important things, you can find them below."
+msgstr "基本統計是由 Jappix 處理關於一些重要事物，你可以在下面找到它們。"
+
+msgid "Change your Jappix node configuration with this tool."
+msgstr "利用此工具變更你的 Jappix 節點設定。"
+
+msgid "Change the XMPP hosts that this Jappix node serve with this tool."
+msgstr "利用此工具變更此 Jappix 節點服務的 XMPP 主機。"
+
+msgid "All this Jappix node stored files can be managed with this tool: please select a sub-folder and start editing its content!"
+msgstr "所有此 Jappix 節點儲存的檔案可利用此工具管理：請選取子資料夾且開始編輯它的內容！"
+
+msgid "Jappix is fully customisable: you can change its design right here."
+msgstr "Jappix 可完全自訂：你可以在這邊變更它的設計。"
+
+msgid "This is not a valid image, please use PNG, GIF or JPG!"
+msgstr "這不是有效的影像，請使用 PNG、GIF 或 JPG！"
+
+msgid "The image could not be received, would you mind retry?"
+msgstr "影像無法被收到，你介意重試嗎？"
+
+msgid "Your image was added to the list!"
+msgstr "你的影像已被加入到清單！"
+
+msgid "Changes saved!"
+msgstr "變更已被儲存！"
+
+msgid "You can define more than one administrator for this Jappix node. You can also change a password with this tool."
+msgstr "你可以為此 Jappix 節點定義多位管理員。你也可以利用此工具變更密碼。"
+
+msgid "Update your Jappix node with this tool, or check if a new one is available. Informations about the latest version are also displayed (in english)."
+msgstr "利用此工具更新你的 Jappix 節點，或檢查是否有新的可用。關於最新版本的資訊也會被顯示。"
+
+msgid "Access statistics"
+msgstr "存取統計"
+
+msgid "Share statistics"
+msgstr "分享統計"
+
+msgid "Other statistics"
+msgstr "其他統計"
+
+msgid "January"
+msgstr "1月"
+
+msgid "February"
+msgstr "2月"
+
+msgid "March"
+msgstr "3月"
+
+msgid "April"
+msgstr "4月"
+
+msgid "May"
+msgstr "5月"
+
+msgid "June"
+msgstr "6月"
+
+msgid "July"
+msgstr "7月"
+
+msgid "August"
+msgstr "8月"
+
+msgid "September"
+msgstr "9月"
+
+msgid "October"
+msgstr "10月"
+
+msgid "November"
+msgstr "11月"
+
+msgid "December"
+msgstr "12月"
+
+msgid "Monday"
+msgstr "星期一"
+
+msgid "Tuesday"
+msgstr "星期二"
+
+msgid "Wednesday"
+msgstr "星期三"
+
+msgid "Thursday"
+msgstr "星期四"
+
+msgid "Friday"
+msgstr "星期五"
+
+msgid "Saturday"
+msgstr "星期六"
+
+msgid "Sunday"
+msgstr "星期日"
+
+msgid "Total"
+msgstr "合計"
+
+msgid "Cache"
+msgstr "快取"
+
+msgid "Logs"
+msgstr "記錄"
+
+msgid "Music"
+msgstr "音樂"
+
+msgid "Backgrounds"
+msgstr "背景"
+
+msgid "Share"
+msgstr "分享"
+
+msgid "Background"
+msgstr "背景"
+
+msgid "Notice"
+msgstr "通知"
+
+msgid "Your design preferences have been saved!"
+msgstr "你的設計偏好已被儲存！"
+
+msgid "Please check your inputs: something is missing!"
+msgstr "請檢查你的輸入：漏了某些東西！"
+
+msgid "Change your Jappix node background with this tool. You can either set a custom color or an uploaded image. Let your creativity flow!"
+msgstr "利用此工具變更你的 Jappix 節點背景。你可以設定自訂色彩或上傳的影像。釋出你的創造力！"
+
+msgid "Use default background"
+msgstr "使用預設的背景"
+
+msgid "Use your own image"
+msgstr "使用你自己的影像"
+
+msgid "Select a background to use and change the display options."
+msgstr "選取要使用的背景並變更顯示選項。"
+
+msgid "Use your own color"
+msgstr "使用你自己的顏色"
+
+msgid "Type the hexadecimal color value you want to use as a background."
+msgstr "輸入你要用來當作背景的 16 進位色彩值。"
+
+msgid "Manage backgrounds"
+msgstr "管理背景"
+
+msgid "You can add a new background to the list with this tool. Please send a valid image."
+msgstr ""
+
+msgid "If you want to remove some backgrounds, use the browser below."
+msgstr ""
+
+msgid "Define a homepage notice for all your users, such as a warn, an important message or an advert with this tool."
+msgstr ""
+
+msgid "Simple notice"
+msgstr "簡單通知"
+
+msgid "This notice only needs simple text to be displayed, but no code is allowed!"
+msgstr ""
+
+msgid "Advanced notice"
+msgstr "進階通知"
+
+msgid "You can customize your notice with embedded HTML, CSS and JavaScript, but you need to code the style."
+msgstr ""
+
+msgid "Available updates"
+msgstr "可用的更新"
+
+msgid "What's new?"
+msgstr "有什麼新鮮的？"
+
+msgid "Your storage folders are not writable, please apply the good rights!"
+msgstr "你的儲存空間資料夾無法寫入，請套用正確權限！"
+
+msgid "%1s may cause problems to the proxy, please increase %2s value up to %3s!"
+msgstr ""
+
+msgid "You are using a development version of Jappix. Update it through our repository by executing: %s."
+msgstr "你正在使用開發版本的 Jappix。從我們的存放區更新它請執行：%s。"
+
+msgid "A new Jappix version is available! Check what is new and launch the update!"
+msgstr "有新版本的 Jappix 可用！檢查有什麼新的並啟動更新！"
+
+msgid "Your version is out to date. Update it now to %s by clicking here!"
+msgstr "你的版本已經過時。在此點一下以便立刻更新！"
+
+msgid "Your version seems to be up to date, but you can check updates manually by clicking here."
+msgstr "你的版本似乎是最新的，但是你可以在此點一下以便手動檢查更新。"
+
+msgid "Check for updates"
+msgstr "檢查更新"
+
+msgid "Update in progress"
+msgstr "更新正在進行"
+
+msgid "Jappix has been updated: you are now running the latest version. Have fun!"
+msgstr "Jappix 已更新：你現在使用的是最新版本。祝你玩得愉快！"
+
+msgid "The update has failed! Please try again later."
+msgstr "更新失敗！請稍後重試。"
+
+msgid "Downloading package..."
+msgstr "正在下載套件..."
+
+msgid "Removing current Jappix system files..."
+msgstr "刪除目前的 Jappix 系統檔案..."
+
+msgid "Extracting package..."
+msgstr "正在取出套件..."
+
+msgid "Regenerating storage folder tree..."
+msgstr "重新產生儲存空間資料夾..."
+
+msgid "Jappix is now up to date!"
+msgstr "Jappix 現在是最新的！"
+
+msgid "Aborted: socket error!"
+msgstr "中止：socket 錯誤！"
+
+msgid "Aborted: buffer error!"
+msgstr "中止：緩衝器錯誤！"
+
+msgid "Aborted: everything is not writable!"
+msgstr "中止：全部都無法寫入！"
+
+msgid "Aborted: could not extract the package!"
+msgstr "中止：無法取出套件！"
+
+msgid "Visits"
+msgstr "訪問"
+
+msgid "Daily"
+msgstr "日"
+
+msgid "Weekly"
+msgstr "週"
+
+msgid "Monthly"
+msgstr "月"
+
+msgid "Yearly"
+msgstr "年"
+
+msgid "Size"
+msgstr "大小"
+
+msgid "Clean everything"
+msgstr "全部清除"
+
+msgid "Purge cache"
+msgstr "清除快取"
+
+msgid "Purge logs"
+msgstr "清除記錄"
+
+msgid "Purge updates"
+msgstr "清除更新"
+
+msgid "The storage folder you wanted to clean is now empty!"
+msgstr "你要清除的儲存空間資料夾是空的！"
+
+msgid "Keep your Jappix node fresh and fast, clean the storage folders regularly!"
+msgstr "保持你的 Jappix 節點清新與快速，定期清除儲存空間資料夾！"
+
+msgid "Upload your music (Ogg Vorbis, MP3 or WAV) to be able to listen to it in Jappix!"
+msgstr "上傳你的音樂（Ogg Vorbis、MP3 或 WAV）以便可以在 Jappix 聆聽！"
+
+msgid "The file you want to upload must be smaller than %s."
+msgstr "你要上傳的檔案必須小於 %s。"
+
+msgid "Stay tuned in what your users store on your server and remove undesired content with this tool."
+msgstr ""
+
+msgid "Title"
+msgstr "標題"
+
+msgid "Artist"
+msgstr "藝人"
+
+msgid "Album"
+msgstr "專輯"
+
+msgid "File"
+msgstr "檔案"
+
+msgid "Upload"
+msgstr "上傳"
+
+msgid "The folder is empty."
+msgstr "資料夾是空的。"
+
+msgid "The music could not be received, please retry!"
+msgstr "音樂無法被收到，請重試！"
+
+msgid "This is not a valid music file, please encode in Ogg Vorbis, MP3 or WAV!"
+msgstr "這不是有效的音樂檔案，請用 Ogg Vorbis、MP3 或 WAV 編碼！"
+
+msgid "Your music has been added!"
+msgstr "你的音樂已被加入！"
+
+msgid "The selected elements have been removed."
+msgstr "選取的元素已被刪除。"
+
+msgid "You must select elements to remove!"
+msgstr "你必須選取要刪除的元素！"
+
+msgid "Add a new user with this tool, or change a password (type an existing username). Please submit a strong password!"
+msgstr "利用此工具加入新的使用者，或變更密碼（輸入已存在的使用者名稱）。請輸入安全的密碼！"
+
+msgid "Manage"
+msgstr "管理"
+
+msgid "List"
+msgstr "清單"
+
+msgid "Remove users with this tool. Note that you cannot remove an user if he is the only one remaining."
+msgstr "利用此工具刪除使用者。注意你不能刪除僅存的那一位使用者。"
+
+msgid "The user has been added!"
+msgstr "使用者已被加入！"
+
+msgid "The chosen users have been removed."
+msgstr "選取的使用者已經被刪除。"
+
+msgid "You must select one or more users to be removed!"
+msgstr "你必須選取一或多位使用者以便刪除！"
+
+msgid "Yesterday"
+msgstr "昨日"
+
+msgid "%s days ago"
+msgstr "%s 日前"
+
+msgid "User currently active"
+msgstr "使用者目前活動中"
+
+msgid "Last seen: %s"
+msgstr "上次見到：%s"
+
+msgid "Inactive since: %s"
+msgstr "不活動自：%s"
+
+msgid "Your friend seems not to have received your message(s)!"
+msgstr "你的好友似乎沒收到你的訊息！"
+
+msgid "Static content server"
+msgstr "靜態內容伺服器"
+
+msgid "This is the static content server for %1s, “%2s”."
+msgstr "這是 %1s 用的靜態內容伺服器，“%2s”。"
+
+msgid "Suggested friends"
+msgstr "建議的好友"
+
+msgid "Check all"
+msgstr "全選"
+
+msgid "Uncheck all"
+msgstr "取消全選"
+
+msgid "Choose"
+msgstr "選取"
+
+msgid "List name"
+msgstr ""
+
+msgid "Allow"
+msgstr "允許"
+
+msgid "Deny"
+msgstr "拒絕"
+
+msgid "Group"
+msgstr "群組"
+
+msgid "Subscription"
+msgstr "訂閱"
+
+msgid "Both"
+msgstr ""
+
+msgid "From"
+msgstr ""
+
+msgid "Everybody"
+msgstr "每一位"
+
+msgid "Send messages"
+msgstr "傳送訊息"
+
+msgid "Send queries"
+msgstr "傳送查詢"
+
+msgid "See my status"
+msgstr "看我的狀態"
+
+msgid "Send his/her status"
+msgstr "傳送他的狀態"
+
+msgid "Everything"
+msgstr ""
+
+msgid "Item"
+msgstr "項目"
+
+msgid "Order"
+msgstr ""
+
+msgid "Active for this session"
+msgstr ""
+
+msgid "Always active"
+msgstr ""
+
+msgid "User directory"
+msgstr "使用者目錄"
+
+msgid "Search a friend"
+msgstr "搜尋好友"
+
+msgid "The feature requested is not implemented by the recipient or server and therefore cannot be processed."
+msgstr ""
+
+msgid "This is a repeat from %s"
+msgstr ""
+
+msgid "Loading comments..."
+msgstr "載入評論..."
+
+msgid "Type your comment here..."
+msgstr "在此輸入你的評論..."
+
+msgid "Could not get the comments!"
+msgstr "無法取得評論！"
+
+msgid "Show comments"
+msgstr "顯示評論"
+
+msgid "Send him/her a message"
+msgstr "傳送訊息給他"
+
+msgid "Start a chat with him/her"
+msgstr "開始與他聊天"
+
+msgid "Media integration"
+msgstr ""
+
+msgid "Comments locked!"
+msgstr ""
+
+msgid "Type something you want to share with your friends..."
+msgstr ""
+
+msgid "changed his/her nickname to %s"
+msgstr ""
+
+msgid "commented an item you follow: “%s”."
+msgstr ""
+
+msgid "Hide"
+msgstr ""
+
+msgid "liked your post: “%s”."
+msgstr ""
+
+msgid "quoted you somewhere: “%s”."
+msgstr ""
+
+msgid "published on your wall: “%s”."
+msgstr ""
+
+msgid "tagged you in a photo (%s)."
+msgstr ""
+
+msgid "tagged you in a video (%s)."
+msgstr ""
+
+msgid "Show"
+msgstr ""
+
+msgid "Need help? You'd better read our documentation page about how to fill this form!"
+msgstr ""
+
+msgid "Pubsub host"
+msgstr ""
+
+msgid "Jappix is a great social platform, that you can access wherever you are, whenever you want and communicate with whovever you want."
+msgstr ""
+
+msgid "Manager link"
+msgstr ""
+
+msgid "User uploads server"
+msgstr ""
+
+msgid "This is the user uploads server for %1s, “%2s”."
+msgstr ""
+
+msgid "Logo"
+msgstr ""
+
+msgid "You can set your own service logo to replace the default one. Take care of the size and the main color of each logo!"
+msgstr ""
+
+msgid "Upload each logo with the recommended maximum pixel size."
+msgstr ""
+
+msgid "This is not a valid image, please use the PNG format!"
+msgstr ""
+
+msgid "Your service logo has been successfully changed!"
+msgstr ""
+
+msgid "Your logo format must be PNG. Leave a field empty and the logo will not be changed."
+msgstr ""
+
+msgid "Remove this logo"
+msgstr ""
+
+msgid "View this logo"
+msgstr ""
+
+msgid "Send a file"
+msgstr ""
+
+msgid "Once uploaded, your friend will be prompted to download the file you sent."
+msgstr ""
+
+msgid "Groupchats to join"
+msgstr ""
+
+msgid "Purge sent files"
+msgstr ""
+
+msgid "would like to send you a file: “%s”."
+msgstr ""
+
+msgid "has accepted to received your file: “%s”."
+msgstr ""
+
+msgid "has rejected to receive your file: “%s”."
+msgstr ""
+
+msgid "could not receive your file: “%s”."
+msgstr ""
+
+msgid "has received a file exchange request: “%s”."
+msgstr ""
+
+msgid "Available shortcuts:"
+msgstr ""
+
+msgid "%s removes the chat logs"
+msgstr ""
+
+msgid "%s joins a groupchat"
+msgstr ""
+
+msgid "%s closes the chat"
+msgstr ""
+
+msgid "%s shows the user profile"
+msgstr ""
+
+msgid "%s sends a message to the room"
+msgstr ""
+
+msgid "%s changes your nickname"
+msgstr ""
+
+msgid "%s sends a message to someone in the room"
+msgstr ""
+
+msgid "%s changes the room topic"
+msgstr ""
+
+msgid "%s kicks an user of the room"
+msgstr ""
+
+msgid "%s bans an user of the room"
+msgstr ""
+
+msgid "%s invites someone to join the room"
+msgstr ""
+
+msgid "Social channel, chat and more."
+msgstr ""
+
+msgid "Create your public profile."
+msgstr ""
+
+msgid "A mini-chat for your website."
+msgstr ""
+
+msgid "Get Jappix, get support."
+msgstr ""
+
+msgid "Statistics around Jappix."
+msgstr ""
+
+msgid "Download Jappix for free."
+msgstr ""
+
+msgid "Find a public Jappix node."
+msgstr ""
+
+msgid "Public profile"
+msgstr ""
+
+msgid "Your profile anywhere on the Web."
+msgstr ""
+
+msgid "%s is a Jappix.com service which makes your XMPP profile public. It is easier to share it. No XMPP account is required to view your social channel, your current position and your contact details."
+msgstr ""
+
+msgid "Furthermore, every picture you post in your social channel is added to a beautiful picture timeline. You can now view the pictures you shared year by year."
+msgstr ""
+
+msgid "You can also use your XMPP avatar as a single avatar for every website, blog and forum you use. When you change it on XMPP, the new avatar appears everywhere. What a genious improvement!"
+msgstr ""
+
+msgid "Yay, let's create my public profile!"
+msgstr ""
+
+msgid "Enable my public profile"
+msgstr ""
+
+#~ msgid "Jappix is a non-profit social platform, that you can access wherever you are, whenever you want and communicate with whovever you want."
+#~ msgstr ""
+
+#~ msgid "See"
+#~ msgstr ""
+
+#~ msgid "Use default logo"
+#~ msgstr ""
+
+#~ msgid "Use your own logo"
+#~ msgstr ""
+
+#~ msgid "The recommended image format is PNG. Leave a field empty and the logo will not be changed."
+#~ msgstr ""
diff --git a/jappixmini/jappix/php/avatar-upload.php b/jappixmini/jappix/php/avatar-upload.php
new file mode 100644
index 00000000..73350e15
--- /dev/null
+++ b/jappixmini/jappix/php/avatar-upload.php
@@ -0,0 +1,118 @@
+<?php
+
+/*
+
+Jappix - An open social platform
+This is the avatar upload PHP script for Jappix
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 27/05/11
+
+*/
+
+// PHP base
+define('JAPPIX_BASE', '..');
+
+// Get the needed files
+require_once('./functions.php');
+require_once('./read-main.php');
+require_once('./read-hosts.php');
+
+// Optimize the page rendering
+hideErrors();
+compressThis();
+
+// Not allowed for a special node
+if(isStatic() || isUpload())
+	exit;
+
+// Set a special XML header
+header('Content-Type: text/xml; charset=utf-8');
+
+// No file uploaded?
+if((!isset($_FILES['file']) || empty($_FILES['file'])) || (!isset($_POST['id']) || empty($_POST['id'])))
+	exit(
+'<jappix xmlns=\'jappix:avatar:post\' id=\'0\'>
+	<error>bad-request</error>
+</jappix>'
+	);
+
+// Get the POST vars
+$id = $_POST['id'];
+$tmp_filename = $_FILES['file']['tmp_name'];
+$old_filename = $_FILES['file']['name'];
+
+// Get the file extension
+$ext = getFileExt($old_filename);
+
+// Hash it!
+$filename = md5($old_filename.time()).$ext;
+
+// Define some vars
+$path = JAPPIX_BASE.'/store/avatars/'.$filename;
+
+// Define MIME type
+if($ext == 'jpg')
+	$ext = 'jpeg';
+
+$mime = 'image/'.$ext;
+
+// Unsupported file extension?
+if(!preg_match('/^(jpeg|png|gif)$/i', $ext))
+	exit(
+'<jappix xmlns=\'jappix:avatar:post\' id=\''.$id.'\'>
+	<error>forbidden-type</error>
+</jappix>'
+	);
+
+// File upload error?
+if(!is_uploaded_file($tmp_filename) || !move_uploaded_file($tmp_filename, $path))
+	exit(
+'<jappix xmlns=\'jappix:file:post\' id=\''.$id.'\'>
+	<error>move-error</error>
+</jappix>'
+	);
+
+// Resize the image?
+if(!function_exists('gd_info') || resizeImage($path, $ext, 96, 96)) {
+	try {
+		// Encode the file
+		$binval = base64_encode(file_get_contents($path));
+		
+		// Remove the file
+		unlink($path);
+		
+		exit(
+'<jappix xmlns=\'jappix:file:post\' id=\''.$id.'\'>
+	<type>'.$mime.'</type>
+	<binval>'.$binval.'</binval>
+</jappix>'
+		);
+	}
+	
+	catch(Exception $e) {
+		// Remove the file
+		unlink($path);
+		
+		exit(
+'<jappix xmlns=\'jappix:file:post\' id=\''.$id.'\'>
+	<error>server-error</error>
+</jappix>'
+		);
+	}
+}
+
+// Remove the file
+unlink($path);
+
+// Something went wrong!
+exit(
+'<jappix xmlns=\'jappix:file:post\' id=\''.$id.'\'>
+	<error>service-unavailable</error>
+</jappix>'
+);
+
+?>
diff --git a/jappixmini/jappix/php/bosh.php b/jappixmini/jappix/php/bosh.php
new file mode 100644
index 00000000..4914d063
--- /dev/null
+++ b/jappixmini/jappix/php/bosh.php
@@ -0,0 +1,167 @@
+<?php
+
+/*
+
+Jappix - An open social platform
+This is the PHP BOSH proxy
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 15/01/12
+
+*/
+
+// PHP base
+define('JAPPIX_BASE', '..');
+
+// Get the configuration
+require_once('./functions.php');
+require_once('./read-main.php');
+require_once('./read-hosts.php');
+
+// Optimize the page rendering
+hideErrors();
+compressThis();
+
+// Not allowed?
+if(!BOSHProxy()) {
+	header('Status: 403 Forbidden', true, 403);
+	exit('HTTP/1.1 403 Forbidden');
+}
+
+// OPTIONS method?
+if($_SERVER['REQUEST_METHOD'] == 'OPTIONS') {
+	// CORS headers
+	header('Access-Control-Allow-Origin: *');
+	header('Access-Control-Allow-Methods: GET, POST, OPTIONS');
+	header('Access-Control-Allow-Headers: Content-Type');
+	header('Access-Control-Max-Age: 31536000');
+	
+	exit;
+}
+
+// Read POST content
+$data = file_get_contents('php://input');
+
+// POST method?
+if($data) {
+	// CORS headers
+	header('Access-Control-Allow-Origin: *');
+	header('Access-Control-Allow-Headers: Content-Type');
+	
+	$method = 'POST';
+}
+
+// GET method?
+else if(isset($_GET['data']) && $_GET['data'] && isset($_GET['callback']) && $_GET['callback']) {
+	$method = 'GET';
+	$data = $_GET['data'];
+	$callback = $_GET['callback'];
+}
+
+// Invalid method?
+else {
+	header('Status: 400 Bad Request', true, 400);
+	exit('HTTP/1.1 400 Bad Request');
+}
+
+// HTTP headers
+$headers = array('User-Agent: Jappix (BOSH PHP Proxy)', 'Connection: close', 'Content-Type: text/xml; charset=utf-8', 'Content-Length: '.strlen($data));
+
+// CURL is better if available
+if(function_exists('curl_init'))
+	$use_curl = true;
+else
+	$use_curl = false;
+
+// CURL stream functions
+if($use_curl) {
+	// Initialize CURL
+	$connection = curl_init(HOST_BOSH);
+	
+	// Set the CURL settings
+	curl_setopt($connection, CURLOPT_HEADER, 0);
+	curl_setopt($connection, CURLOPT_POST, 1);
+	curl_setopt($connection, CURLOPT_POSTFIELDS, $data);
+	curl_setopt($connection, CURLOPT_FOLLOWLOCATION, true);
+	curl_setopt($connection, CURLOPT_HTTPHEADER, $headers);
+	curl_setopt($connection, CURLOPT_VERBOSE, 0);
+	curl_setopt($connection, CURLOPT_CONNECTTIMEOUT, 30);
+	curl_setopt($connection, CURLOPT_TIMEOUT, 30);
+	curl_setopt($connection, CURLOPT_SSL_VERIFYHOST, 0);
+	curl_setopt($connection, CURLOPT_SSL_VERIFYPEER, 0);
+	curl_setopt($connection, CURLOPT_RETURNTRANSFER, 1);
+	
+	// Get the CURL output
+	$output = curl_exec($connection);
+}
+
+// Built-in stream functions
+else {
+	// HTTP parameters
+	$parameters = array('http' => array(
+					'method' => 'POST',
+					'content' => $data
+				      )
+		      );
+
+	$parameters['http']['header'] = $headers;
+
+	// Change default timeout
+	ini_set('default_socket_timeout', 30);
+
+	// Create the connection
+	$stream = @stream_context_create($parameters);
+	$connection = @fopen(HOST_BOSH, 'rb', false, $stream);
+
+	// Failed to connect!
+	if($connection == false) {
+		header('Status: 502 Proxy Error', true, 502);
+		exit('HTTP/1.1 502 Proxy Error');
+	}
+
+	// Allow stream blocking to handle incoming BOSH data
+	@stream_set_blocking($connection, true);
+
+	// Get the output content
+	$output = @stream_get_contents($connection);
+}
+
+// Cache headers
+header('Cache-Control: no-cache, must-revalidate');
+header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+
+// POST output
+if($method == 'POST') {
+	// XML header
+	header('Content-Type: text/xml; charset=utf-8');
+	
+	if(!$output)
+		echo('<body xmlns=\'http://jabber.org/protocol/httpbind\' type=\'terminate\'/>');
+	else
+		echo($output);
+}
+
+// GET output
+if($method == 'GET') {
+	// JSON header
+	header('Content-type: application/json');
+	
+	// Encode output to JSON
+	$json_output = json_encode($output);
+	
+	if(($output == false) || ($output == '') || ($json_output == 'null'))
+		echo($callback.'({"reply":"<body xmlns=\'http:\/\/jabber.org\/protocol\/httpbind\' type=\'terminate\'\/>"});');
+	else
+		echo($callback.'({"reply":'.$json_output.'});');
+}
+
+// Close the connection
+if($use_curl)
+	curl_close($connection);
+else
+	@fclose($connection);
+
+?>
diff --git a/jappixmini/jappix/php/desktop.php b/jappixmini/jappix/php/desktop.php
new file mode 100644
index 00000000..ceeb1a39
--- /dev/null
+++ b/jappixmini/jappix/php/desktop.php
@@ -0,0 +1,181 @@
+<?php
+
+/*
+
+Jappix - An open social platform
+This is the Jappix Desktop PHP/HTML code
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 16/01/12
+
+*/
+
+// Someone is trying to hack us?
+if(!defined('JAPPIX_BASE'))
+	exit;
+
+?>
+<!DOCTYPE html>
+<?php htmlTag($locale); ?>
+
+<head>
+	<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+	<title><?php echo htmlspecialchars(SERVICE_NAME); ?> &bull; <?php _e("An open social network"); ?></title>
+	<link rel="shortcut icon" href="./favicon.ico" />
+	
+	<?php echoGetFiles($hash, '', 'css', 'desktop.xml', ''); echo "\n"; ?>
+	<!--[if lt IE 9]><?php echoGetFiles($hash, '', 'css', '', 'ie.css'); ?><![endif]-->
+	
+	<?php echoGetFiles($hash, $locale, 'js', 'desktop.xml', ''); echo "\n";
+	
+	if(anonymousMode()) {
+		echo "\n\t";
+		echoGetFiles($hash, '', 'css', 'anonymous.xml', '');
+		echo "\n\t";
+		echoGetFiles($hash, $locale, 'js', 'anonymous.xml', '');
+		echo "\n";
+	} ?>
+</head>
+
+<body class="body-images">
+
+<?php
+
+// Homepage?
+if(!anonymousMode()) { ?>
+	<!-- BEGIN HOMEPAGE -->
+	<div id="home">
+		<div class="home-images plane"></div>
+		
+		<div class="main">
+			<div class="left">
+				<div class="home-images logo"></div>
+				<p class="upper"><?php _e("Communicate with the entire world!"); ?></p>
+				<p class="secondary"><?php _e("Jappix is a great social platform, that you can access wherever you are, whenever you want and communicate with whovever you want."); ?></p>
+				<p class="secondary"><?php _e("It allows you to get in touch with the millions of users who currently use the XMPP network like you do with Jappix. Join the community and stay free!"); ?></p>
+			</div>
+			
+			<div class="right">
+				<h1 class="top default"><?php _e("Hi there!"); ?></h1>
+				
+				<div class="default homediv">
+					<p><?php printf(T_("Welcome on %1s, “%2s”."), htmlspecialchars(SERVICE_NAME), htmlspecialchars(SERVICE_DESC)); ?></p>
+					
+					<p><?php _e("Login to your existing XMPP account or create a new one for free!"); ?></p>
+					
+					<button class="login buttons-images">
+						<span class="home-images"></span>
+						<span class="text"><?php _e("Login"); ?></span>
+					</button>
+					
+					<button class="register buttons-images">
+						<span class="home-images"></span>
+						<span class="text"><?php _e("Register"); ?></span>
+					</button>
+					
+					<p class="notice"><?php echo str_replace("PostPro", "<a href='http://www.post-pro.fr/'>PostPro</a>", T_("Jappix is an open-source project from PostPro, a non-profit organization which provides us a great help.")); ?></p>
+				</div>
+				
+				<div class="navigation">
+					<?php
+					
+						// Keep get var
+						$keep_get = keepGet('m', false);
+					
+					?>
+					<a class="home-images mobile" href="./?m=mobile<?php echo $keep_get; ?>"><?php _e("Mobile"); ?></a>
+					<?php if(showManagerLink()) { ?>
+					<a class="home-images manager" href="./?m=manager<?php echo $keep_get; ?>"><?php _e("Manager"); ?></a>
+					<?php } ?>
+					<a class="home-images project" href="https://project.jappix.com/"><?php _e("Project"); ?></a>
+					<?php if(sslCheck() && !httpsForce()) echo sslLink(); ?>
+				</div>
+			</div>
+		</div>
+		
+		<div class="home-images corporation">
+			<div class="corp_network">
+				<h2 class="nomargin">Jappix.com</h2>
+				<div class="tabulate">
+					<a href="https://www.jappix.com/">
+						<span class="name">Jappix</span>
+						<span class="desc"><?php _e("Social channel, chat and more."); ?></span>
+					</a>
+					<a href="https://me.jappix.com/">
+						<span class="name">Jappix Me</span>
+						<span class="desc"><?php _e("Create your public profile."); ?></span>
+					</a>
+					<a href="https://mini.jappix.com/">
+						<span class="name">Jappix Mini</span>
+						<span class="desc"><?php _e("A mini-chat for your website."); ?></span>
+					</a>
+					<a href="https://project.jappix.com/">
+						<span class="name">Jappix Project</span>
+						<span class="desc"><?php _e("Get Jappix, get support."); ?></span>
+					</a>
+					<a href="https://stats.jappix.com/">
+						<span class="name">Jappix Stats</span>
+						<span class="desc"><?php _e("Statistics around Jappix."); ?></span>
+					</a>
+				</div>
+				
+				<h2>Jappix.org</h2>
+				<div class="tabulate">
+					<a href="http://jappix.org/">
+						<span class="name">Jappix Download</span>
+						<span class="desc"><?php _e("Download Jappix for free."); ?></span>
+					</a>
+				</div>
+				
+				<h2>Jappix.net</h2>
+				<div class="tabulate">
+					<a href="http://jappix.net/">
+						<span class="name">Jappix Network</span>
+						<span class="desc"><?php _e("Find a public Jappix node."); ?></span>
+					</a>
+				</div>
+			</div>
+		</div>
+		
+		<div class="locale" data-keepget="<?php echo(keepGet('l', false)); ?>">
+			<div class="current">
+				<div class="current_align"><?php echo(getLanguageName($locale)); ?></div>
+			</div>
+		</div>
+		
+		<?php
+		
+			// Add the notice
+			$conf_notice = readNotice();
+			$type_notice = $conf_notice['type'];
+			$text_notice = $conf_notice['notice'];
+			
+			// Simple notice
+			if(($type_notice == 'simple') || ($type_notice == 'advanced')) {
+				// We must encode special HTML characters
+				if($type_notice == 'simple')
+					$text_notice = '<span class="title home-images">'.T_("Notice").'</span><span class="text">'.htmlentities($text_notice).'</span>';
+				
+				// Echo the notice
+				echo('<div class="notice '.$type_notice.'">'.$text_notice.'</div>');
+			}
+		
+		?>
+	</div>
+	<!-- END HOMEPAGE -->
+<?php } ?>
+
+<!-- BEGIN BOARD -->
+<div id="board">
+	<noscript class="one-board info visible"><?php _e("JavaScript is missing in your web browser, so that you will not be able to launch Jappix! Please fix this."); ?></noscript>
+</div>
+<!-- END BOARD -->
+
+</body>
+
+</html>
+
+<!-- Jappix <?php echo $version; ?> - An open social platform -->
diff --git a/jappixmini/jappix/php/download-chat.php b/jappixmini/jappix/php/download-chat.php
new file mode 100644
index 00000000..3f28648e
--- /dev/null
+++ b/jappixmini/jappix/php/download-chat.php
@@ -0,0 +1,53 @@
+<?php
+
+/*
+
+Jappix - An open social platform
+This is the PHP script used to download a chat log
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 27/05/11
+
+*/
+
+// PHP base
+define('JAPPIX_BASE', '..');
+
+// Get the needed files
+require_once('./functions.php');
+require_once('./read-main.php');
+require_once('./read-hosts.php');
+
+// Optimize the page rendering
+hideErrors();
+compressThis();
+
+// Not allowed for a special node
+if(isStatic() || isUpload())
+	exit;
+
+// Send the HTML file to be downloaded
+if(isset($_GET['id']) && !empty($_GET['id']) && isSafe($_GET['id'])) {
+	// We define the variables
+	$filename = $_GET['id'];
+	$content_dir = '../store/logs/';
+	$filepath = $content_dir.$filename.'.html';
+	
+	// We set special headers
+	header("Content-disposition: attachment; filename=\"$filename.html\"");
+	header("Content-Type: application/force-download");
+	header("Content-Transfer-Encoding: text/html\n");
+	header("Content-Length: ".filesize($filepath));
+	header("Pragma: no-cache");
+	header("Cache-Control: must-revalidate, post-check=0, pre-check=0, public");
+	header("Expires: 0");
+	readfile($filepath);
+	
+	// We delete the stored log file
+	unlink($filepath);
+}
+
+?>
diff --git a/jappixmini/jappix/php/drawsvgchart.php b/jappixmini/jappix/php/drawsvgchart.php
new file mode 100644
index 00000000..837f3436
--- /dev/null
+++ b/jappixmini/jappix/php/drawsvgchart.php
@@ -0,0 +1,495 @@
+<?php
+
+//   Extracted from CodingTeam for the Jappix project.
+
+//   This file is a part of CodingTeam. Take a look at <http://codingteam.org>.
+//   Copyright © 2007-2010 Erwan Briand <erwan@codingteam.net>
+//
+//   This program is free software: you can redistribute it and/or modify it
+//   under the terms of the GNU Affero General Public License as published by
+//   the Free Software Foundation, version 3 only.
+//
+//   This program is distributed in the hope that it will be useful, but
+//   WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+//   or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+//   License for more details.
+//
+//   You should have received a copy of the GNU Affero General Public License
+//   along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * @file
+ * This file contains the DrawSVGChart class.
+ */
+
+/**
+ * DrawSVGChart class
+ */
+class DrawSVGChart {
+    private $datas, $legend, $link, $xml_object, $svg,
+            $xml_elements, $evolution;
+    public $has_errors;
+
+    function createChart($datas=array(), $legend=array(), $link,
+                         $evolution=FALSE, $type='others')
+    {
+        $this->has_errors = FALSE;
+        $max = 0;
+
+        // One or two data arrays
+        if (isset($datas[0]) && is_array($datas[0]))
+        {
+            $datas_number = count($datas[0]);
+
+            if ($datas_number >= 1)
+                $max = max($datas[0]);
+            else
+                $this->has_errors = TRUE;
+        }
+        else
+        {
+            $datas_number = count($datas);
+
+            if ($datas_number >= 1)
+                $max = max($datas);
+            else
+                $this->has_errors = TRUE;
+        }
+
+        // Set the width of the chart
+        if ($datas_number * 55 > 400)
+            $width = $datas_number * 55;
+        else
+            $width = 400;
+
+        $height = 250;
+        $this->datas = $datas;
+        $this->legend = $legend;
+        $this->link = $link;
+        $this->evolution = $evolution;
+        $this->type = $type;
+        $this->xml_elements = array();
+
+        // Scale
+        if ($max <= 20)
+        {
+            $scale[4] = 20;
+            $scale[3] = 15;
+            $scale[2] = 10;
+            $scale[1] = 5;
+        }
+        else
+        {
+            $scale[4] = ceil($max / 20) * 20;
+            $scale[3] = $scale[4] * 3/4;
+            $scale[2] = $scale[4] * 2/4;
+            $scale[1] = $scale[4] * 1/4;
+        }
+
+        if ($scale[4] == 0 || $max == 0)
+            $this->has_errors = TRUE;
+
+        if ($this->has_errors)
+            return TRUE;
+
+        $this->xml_object = new DOMDocument('1.0', 'utf-8');
+	
+	// Process the static file host prefix
+	$static_prefix = '.';
+	
+	if(hasStatic())
+		$static_prefix = HOST_STATIC.'/php';
+	
+        // Add the stylesheet
+        $style = $this->xml_object->createProcessingInstruction("xml-stylesheet",
+                 "type='text/css' href='".getFiles(genHash(getVersion()), '', 'css', '', 'stats-svg.css')."'");
+        $this->xml_object->appendChild($style);
+
+        // Create the root SVG element
+        $this->svg = $this->xml_object->createElement('svg');
+        $this->svg->setAttribute('xmlns:svg', 'http://www.w3.org/2000/svg');
+        $this->svg->setAttribute('xmlns', 'http://www.w3.org/2000/svg');
+        $this->svg->setAttribute('xmlns:xlink', 'http://www.w3.org/1999/xlink');
+        $this->svg->setAttribute('version', '1.1');
+        $this->svg->setAttribute('width', $width);
+        $this->svg->setAttribute('height', $height);
+        $this->svg->setAttribute('id', 'svg');
+        $this->xml_object->appendChild($this->svg);
+
+        // Create a definition
+        $this->xml_elements['basic_defs'] = $this->xml_object->createElement('defs');
+        $path = $this->xml_object->createElement('path');
+        $path->setAttribute('id', 'mark');
+        $path->setAttribute('d', 'M 0,234 v 4 ');
+        $path->setAttribute('stroke', '#596171');
+        $path->setAttribute('stroke-width', '2px');
+        $this->xml_elements['basic_defs']->appendChild($path);
+
+        // Create the static background
+        $this->xml_elements['static_background'] = $this->xml_object->createElement('g');
+        $this->xml_elements['static_background']->setAttribute('class', 'static-background');
+
+        // Draw the legend
+        $this->drawLegend();
+
+        // Draw the table
+        $this->drawTable($scale, $width);
+
+        // Draw the chart
+        $this->drawChart($scale, $width);
+    }
+
+    function drawLegend()
+    {
+        $pstart = 3;
+        $tstart = 7;
+
+        foreach ($this->legend as $item)
+        {
+            $val_path = $pstart + 11;
+            $val_text = $tstart + 10;
+
+            // Create the legend line
+            $path = $this->xml_object->createElement('path');
+            $path->setAttribute('d', 'M 40, '.$val_path.' L 55, '.$val_path);
+            $path->setAttribute('id', 'legendline');
+            $path->setAttribute('stroke', $item[0]);
+            $path->setAttribute('stroke-width', '2px');
+
+            // Create the legend text
+            $text = $this->xml_object->createElement('text', $item[1]);
+            $text->setAttribute('x', 57);
+            $text->setAttribute('y', $val_text);
+            $text->setAttribute('text-anchor', 'start');
+            $text->setAttribute('id', 'reftext');
+            $text->setAttribute('fill', $item[0]);
+            $text->setAttribute('font-size', '11px');
+            $text->setAttribute('font-family', "'DejaVu sans', Verdana, sans-serif");
+
+            // Append elemets
+            $this->xml_elements['static_background']->appendChild($path);
+            $this->xml_elements['static_background']->appendChild($text);
+
+            $pstart = $val_path;
+            $tstart = $val_text;
+        }
+    }
+
+    function drawTable($scale, $width)
+    {
+        // Create left scale
+        $top = TRUE;
+        $start = -17;
+
+        foreach ($scale as $level)
+        {
+            $type = $this->type;
+            
+            if(($type == 'share') || ($type == 'others'))
+                $level = formatBytes($level);
+            
+            if ($top)
+                $color = '#CED0D5';
+            else
+                $color = '#EAEAEA';
+
+            $m = $start + 50;
+
+            $path = $this->xml_object->createElement('path');
+            $path->setAttribute('d', 'M 38, '.$m.' L '.$width.', '.$m);
+            $path->setAttribute('stroke', $color);
+            $path->setAttribute('stroke-width', '1px');
+
+            $text = $this->xml_object->createElement('text', $level);
+            $text->setAttribute('x', 34);
+            $text->setAttribute('y', ($m + 3));
+            $text->setAttribute('text-anchor', 'end');
+            $text->setAttribute('class', 'refleft');
+
+            $this->xml_elements['static_background']->appendChild($path);
+            $this->xml_elements['static_background']->appendChild($text);
+
+            $top = FALSE;
+            $start = $m;
+        }
+
+        // Add zero
+        $text = $this->xml_object->createElement('text', 0);
+        $text->setAttribute('x', 34);
+        $text->setAttribute('y', 236);
+        $text->setAttribute('text-anchor', 'end');
+        $text->setAttribute('class', 'refleft');
+
+        $this->xml_elements['static_background']->appendChild($text);
+    }
+
+    function drawChart($scale, $width)
+    {
+        if (isset($this->datas[0]) && is_array($this->datas[0]))
+        {
+            $foreached_datas = $this->datas[0];
+            $onlykeys_datas = array_keys($this->datas[0]);
+            $secondary_datas = array_keys($this->datas[1]);
+        }
+        else
+        {
+            $foreached_datas = $this->datas;
+            $onlykeys_datas = array_keys($this->datas);
+            $secondary_datas = FALSE;
+        }
+
+        // Create graphics data
+        $defs = $this->xml_object->createElement('defs');
+
+        $rect = $this->xml_object->createElement('rect');
+        $rect->setAttribute('id', 'focusbar');
+        $rect->setAttribute('width', 14);
+        $rect->setAttribute('height', 211);
+        $rect->setAttribute('x', -20);
+        $rect->setAttribute('y', 34);
+        $rect->setAttribute('style', 'fill: black; opacity: 0;');
+        $defs->appendChild($rect);
+
+        $path = $this->xml_object->createElement('path');
+        $path->setAttribute('id', 'bubble');
+
+        if ($this->evolution)
+            $path->setAttribute('d', 'M 4.7871575,0.5 L 39.084404,0.5 C 41.459488,0.5 43.371561,2.73 43.371561,5.5 L 43.371561,25.49999 L 43.30,31.05 L 4.7871575,30.49999 C 2.412072,30.49999 0.5,28.26999 0.5,25.49999 L 0.5,5.5 C 0.5,2.73 2.412072,0.5 4.7871575,0.5 z');
+        elseif ($secondary_datas)
+            $path->setAttribute('d', 'M 1,0 v 8 l -6,-10 c -1.5,-2 -1.5,-2 -6,-2 h -36                        c -3,0 -6,-3 -6,-6 v -28 c 0,-3 3,-6 6,-6 h 43 c 3,0 6,3 6,6 z');
+        else
+            $path->setAttribute('d', 'M 4.7871575,0.5 L 39.084404,0.5 C 41.459488,0.5 43.371561,2.73 43.371561,5.5 L 43.371561,25.49999 C 43.371561,27.07677 43.83887,41.00777 42.990767,40.95796 C 42.137828,40.90787 37.97451,30.49999 36.951406,30.49999 L 4.7871575,30.49999 C 2.412072,30.49999 0.5,28.26999 0.5,25.49999 L 0.5,5.5 C 0.5,2.73 2.412072,0.5 4.7871575,0.5 z');
+
+        $path->setAttribute('fill', 'none');
+        $path->setAttribute('fill-opacity', '0.85');
+        $path->setAttribute('pointer-events', 'none');
+        $path->setAttribute('stroke-linejoin', 'round');
+        $path->setAttribute('stroke', 'none');
+        $path->setAttribute('stroke-opacity', '0.8');
+        $path->setAttribute('stroke-width', '1px');
+        $defs->appendChild($path);
+
+        $rect = $this->xml_object->createElement('rect');
+        $rect->setAttribute('id', 'graphicbar');
+        $rect->setAttribute('width', '12');
+        $rect->setAttribute('height', '200');
+        $rect->setAttribute('rx', '2');
+        $rect->setAttribute('ry', '1');
+        $rect->setAttribute('fill', '#6C84C0');
+        $rect->setAttribute('fill-opacity', '0.6');
+        $rect->setAttribute('stroke', '#5276A9');
+        $rect->setAttribute('stroke-width', '1px');
+        $defs->appendChild($rect);
+
+        $rect = $this->xml_object->createElement('rect');
+        $rect->setAttribute('style', 'fill:#8B2323');
+        $rect->setAttribute('id', 'rectpoint');
+        $rect->setAttribute('width', 4);
+        $rect->setAttribute('height', 4);
+        $defs->appendChild($rect);
+
+        $this->xml_elements['chart_defs'] = $defs;
+        $global_g = $this->xml_object->createElement('g');
+
+        // Calc
+        $x_base = 35;
+        $y_base = 20;
+        $start = 18;
+        $element = 0;
+
+        $chart_defs = '';
+        $xprevious = 38;
+        $tprevious = 233;
+
+        foreach ($foreached_datas as $key => $data)
+        {
+            $x = 27 + $x_base;
+            $y = 107 + $y_base;
+
+            $top = 233 - ceil($data / ($scale[4] / 100) * 2);
+
+            if ($top <= 50)
+                $bubble_top = 55;
+            elseif (!$secondary_datas)
+                $bubble_top = ($top - 42);
+            elseif ($secondary_datas)
+                $bubble_top = ($top - 10);
+
+            $type = $this->type;
+
+            if(($type == 'share') || ($type == 'others'))
+                $value = formatBytes($data);
+            else
+                $value = $data;
+            
+            // Create the chart with datas
+            $g = $this->xml_object->createElement('g');
+            $g->setAttribute('transform', 'translate('.$x.')');
+
+            $duse = $this->xml_object->createElement('use');
+            $duse->setAttribute('xlink:href', '#mark');
+            $duse->setAttribute('xmlns:xlink', 'http://www.w3.org/1999/xlink');
+            $g->appendChild($duse);
+
+            $data_g = $this->xml_object->createElement('g');
+            $data_g->setAttribute('class', 'gbar');
+
+            if ($this->link)
+            {
+                $text = $this->xml_object->createElement('text');            
+
+                $link = $this->xml_object->createElement('a', mb_substr(filterSpecialXML($onlykeys_datas[$element]), 0, 7));
+                $link->setAttribute('xlink:href', str_replace('{data}', filterSpecialXML($onlykeys_datas[$element]), $this->link));
+                $link->setAttribute('target', '_main');
+                $text->appendChild($link);
+            }
+            else
+                $text = $this->xml_object->createElement('text', mb_substr(filterSpecialXML($onlykeys_datas[$element]), 0, 7));
+
+            $text->setAttribute('class', 'reftext');
+            $text->setAttribute('y', 248);
+            $text->setAttribute('text-anchor', 'middle');
+
+            $data_g->appendChild($text);
+
+            $uselink = $this->xml_object->createElement('use');
+            $uselink->setAttribute('xlink:href', '#focusbar');
+            $uselink->setAttribute('xmlns:xlink', 'http://www.w3.org/1999/xlink');
+            $data_g->appendChild($uselink);
+
+            if (!$this->evolution)
+            {
+                $rect = $this->xml_object->createElement('rect');
+                $rect->setAttribute('class', 'bluebar');
+                $rect->setAttribute('height', (233 - $top));
+                $rect->setAttribute('width', 13);
+                $rect->setAttribute('x', -6);
+                $rect->setAttribute('y', $top);
+                $rect->setAttribute('fill', $this->legend[0][0]);
+                $rect->setAttribute('fill-opacity', '0.6');
+                $data_g->appendChild($rect);
+            }
+            else
+            {
+                $use = $this->xml_object->createElement('use');
+                $use->setAttribute('xlink:href', '#rectpoint');
+                $use->setAttribute('y', ($top - 1));
+                $use->setAttribute('x', -2);
+                $data_g->appendChild($use);
+
+                if ($x != (35 + 27))
+                    $chart_defs .= 'L '.$x.' '.$top.'  ';
+                else
+                    $chart_defs .= 'M '.$xprevious.' '.$tprevious.' L '.$x.' '.$top.'  ';
+
+                $xprevious = $x;
+                $tprevious = $top;
+            }
+
+            if ($secondary_datas && isset($secondary_datas[$element]))
+            {
+                $datalink = $secondary_datas[$element];
+                $dataval = $this->datas[1][$datalink];
+                $stop = 233 - ceil($dataval / ($scale[4] / 100) * 2);
+
+                $rect = $this->xml_object->createElement('rect');
+                $rect->setAttribute('class', 'redbar');
+                $rect->setAttribute('height', (233 - $stop));
+                $rect->setAttribute('width', 13);
+                $rect->setAttribute('x', -6);
+                $rect->setAttribute('y', $stop);
+                $rect->setAttribute('fill', $this->legend[1][0]);
+                $rect->setAttribute('fill-opacity', '0.7');
+                $data_g->appendChild($rect);
+            }
+
+            if (!$this->evolution)
+            {
+                $path = $this->xml_object->createElement('path');
+                $path->setAttribute('stroke', '#5276A9');
+                $path->setAttribute('stroke-width', '2px');
+                $path->setAttribute('fill', 'none');
+                $path->setAttribute('d', 'M -7,233 v -'.(232 - $top).' c 0,-1 1,-1 1,-1 h 12 c 1,0 2,0 2,1 v '.(232 - $top).' z');
+                $data_g->appendChild($path);
+            }
+
+            $uselink = $this->xml_object->createElement('use');
+            $uselink->setAttribute('xmlns:xlink', 'http://www.w3.org/1999/xlink');
+            $uselink->setAttribute('xlink:href', '#bubble');
+            $uselink->setAttribute('y', $bubble_top);
+
+            if (!$secondary_datas)
+                $uselink->setAttribute('x', -42);
+
+            $data_g->appendChild($uselink);
+
+            $text = $this->xml_object->createElement('text', $value);
+            $text->setAttribute('class', 'bubbletextblue');
+            $text->setAttribute('x', -10);
+
+            if (!$secondary_datas)
+                $text->setAttribute('y', ($bubble_top + 20));
+            else
+                $text->setAttribute('y', ($bubble_top - 27));
+
+            $text->setAttribute('fill', 'none');
+            $data_g->appendChild($text);
+
+            if ($secondary_datas && isset($secondary_datas[$element]))
+            {
+                $text = $this->xml_object->createElement('text', $dataval);
+                $text->setAttribute('class', 'bubbletextred');
+                $text->setAttribute('x', -10);
+                $text->setAttribute('y', ($bubble_top - 11));
+                $text->setAttribute('fill', 'none');
+                $data_g->appendChild($text);
+            }
+
+            $g->appendChild($data_g);
+            $global_g->appendChild($g);
+
+            $x_base = $x_base + 50;
+            $y_base = $y_base + 20;
+            $element ++;            
+        }
+
+        if ($this->evolution)
+        {
+            $path = $this->xml_object->createElement('path');
+            $path->setAttribute('d', $chart_defs);
+            $path->setAttribute('stroke', $this->legend[0][0]);
+            $path->setAttribute('stroke-width', '1px');
+            $path->setAttribute('fill', 'none');
+            $this->xml_elements['evolution_path'] = $path;
+        }
+
+        $this->xml_elements['global_g'] = $global_g;
+
+        $path = $this->xml_object->createElement('path');
+        $path->setAttribute('d', 'M 38,233 h '.$width);
+        $path->setAttribute('stroke', '#2F4F77');
+        $path->setAttribute('stroke-width', '2px');
+        $path->setAttribute('pointer-events', 'none');
+        $this->xml_elements['final_path'] = $path;
+    }
+
+    function has_errors()
+    {
+        return $this->has_errors;
+    }
+
+    function getXMLOutput()
+    {
+        if (isset($this->xml_object))
+        {
+            // Add SVG elements to the DOM object
+            foreach($this->xml_elements as $element)
+                $this->svg->appendChild($element);
+
+            // Return the XML
+            $this->xml_object->formatOutput = true; 
+            return $this->xml_object->saveXML();
+        }
+    }
+}
+?>
diff --git a/jappixmini/jappix/php/file-share.php b/jappixmini/jappix/php/file-share.php
new file mode 100644
index 00000000..39d4eb85
--- /dev/null
+++ b/jappixmini/jappix/php/file-share.php
@@ -0,0 +1,122 @@
+<?php
+
+/*
+
+Jappix - An open social platform
+This is the Jappix microblog file attaching script
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 14/01/12
+
+*/
+
+// PHP base
+define('JAPPIX_BASE', '..');
+
+// Get the needed files
+require_once('./functions.php');
+require_once('./read-main.php');
+require_once('./read-hosts.php');
+
+// Optimize the page rendering
+hideErrors();
+compressThis();
+
+// Not allowed for a special node
+if(isStatic() || isUpload())
+	exit;
+
+// Set a special XML header
+header('Content-Type: text/xml; charset=utf-8');
+
+// Everything is okay
+if((isset($_FILES['file']) && !empty($_FILES['file'])) && (isset($_POST['user']) && !empty($_POST['user'])) && (isset($_POST['location']) && !empty($_POST['location']))) {
+	// Get the user name
+	$user = $_POST['user'];
+	
+	// Get the file name
+	$tmp_filename = $_FILES['file']['tmp_name'];
+	$filename = $_FILES['file']['name'];
+	
+	// Get the location
+	if(HOST_UPLOAD)
+		$location = HOST_UPLOAD;
+	else
+		$location = $_POST['location'];
+	
+	// Get the file new name
+	$ext = getFileExt($filename);
+	$new_name = preg_replace('/(^)(.+)(\.)(.+)($)/i', '$2', $filename);
+	
+	// Define some vars
+	$content_dir = JAPPIX_BASE.'/store/share/'.$user;
+	$security_file = $content_dir.'/index.html';
+	$name = sha1(time().$filename);
+	$path = $content_dir.'/'.$name.'.'.$ext;
+	$thumb_xml = '';
+	
+	// Forbidden file?
+	if(!isSafe($filename) || !isSafe($name.'.'.$ext)) {
+		exit(
+'<jappix xmlns=\'jappix:file:post\'>
+	<error>forbidden-type</error>
+</jappix>'
+		);
+	}
+	
+	// Create the user directory
+	if(!is_dir($content_dir)) {
+		mkdir($content_dir, 0777, true);
+		chmod($content_dir, 0777);
+	}
+	
+	// Create (or re-create) the security file
+	if(!file_exists($security_file))	
+		file_put_contents($security_file, securityHTML());
+	
+	// File upload error?
+	if(!is_uploaded_file($tmp_filename) || !move_uploaded_file($tmp_filename, $path)) {
+		exit(
+'<jappix xmlns=\'jappix:file:post\'>
+	<error>move-error</error>
+</jappix>'
+		);
+	}
+	
+	// Resize and compress if this is a JPEG file
+	if(preg_match('/^(jpg|jpeg|png|gif)$/i', $ext)) {
+		// Resize the image
+		resizeImage($path, $ext, 1024, 1024);
+		
+		// Copy the image
+		$thumb = $content_dir.'/'.$name.'_thumb.'.$ext;
+		copy($path, $thumb);
+		
+		// Create the thumbnail
+		if(resizeImage($thumb, $ext, 140, 105))
+			$thumb_xml = '<thumb>'.htmlspecialchars($location.'store/share/'.$user.'/'.$name.'_thumb.'.$ext).'</thumb>';
+	}
+	
+	// Return the path to the file
+	exit(
+'<jappix xmlns=\'jappix:file:post\'>
+	<href>'.htmlspecialchars($location.'store/share/'.$user.'/'.$name.'.'.$ext).'</href>
+	<title>'.htmlspecialchars($new_name).'</title>
+	<type>'.htmlspecialchars(getFileMIME($path)).'</type>
+	<length>'.htmlspecialchars(filesize($path)).'</length>
+	'.$thumb_xml.'
+</jappix>'
+	);
+}
+
+// Bad request error!
+exit(
+'<jappix xmlns=\'jappix:file:post\'>
+	<error>bad-request</error>
+</jappix>'
+);
+
+?>
diff --git a/jappixmini/jappix/php/form-hosts.php b/jappixmini/jappix/php/form-hosts.php
new file mode 100644
index 00000000..414dd4e8
--- /dev/null
+++ b/jappixmini/jappix/php/form-hosts.php
@@ -0,0 +1,49 @@
+<?php
+
+/*
+
+Jappix - An open social platform
+This is the hosts configuration form (install & manager)
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 11/06/11
+
+*/
+
+// Someone is trying to hack us?
+if(!defined('JAPPIX_BASE'))
+	exit;
+
+?>
+<a class="info smallspace neutral" href="http://codingteam.net/project/jappix/doc/JappixApp#title-3" target="_blank"><?php _e("Need help? You'd better read our documentation page about how to fill this form!"); ?></a>
+
+<fieldset>
+	<legend><?php _e("General"); ?></legend>
+	
+	<label for="host_main"><?php _e("Main host"); ?></label><input id="host_main" type="text" name="host_main" value="<?php echo $host_main; ?>" pattern="[^@/]+" />
+	
+	<label for="host_muc"><?php _e("Groupchat host"); ?></label><input id="host_muc" type="text" name="host_muc" value="<?php echo $host_muc; ?>" pattern="[^@/]+" />
+	
+	<label for="host_pubsub"><?php _e("Pubsub host"); ?></label><input id="host_pubsub" type="text" name="host_pubsub" value="<?php echo $host_pubsub; ?>" pattern="[^@/]+" />
+</fieldset>
+
+<fieldset>
+	<legend><?php _e("Advanced"); ?></legend>
+	
+	<label for="host_anonymous"><?php _e("Anonymous host"); ?></label><input id="host_anonymous" type="text" name="host_anonymous" value="<?php echo $host_anonymous; ?>" pattern="[^@/]+" />
+	
+	<label for="host_vjud"><?php _e("Directory host"); ?></label><input id="host_vjud" type="text" name="host_vjud" value="<?php echo $host_vjud; ?>" pattern="[^@/]+" />
+	
+	<label for="host_bosh"><?php _e("BOSH host"); ?></label><input id="host_bosh" type="text" name="host_bosh" value="<?php echo $host_bosh; ?>" />
+	
+	<input type="hidden" name="host_bosh_main" value="<?php echo $host_bosh_main; ?>" />
+	
+	<input type="hidden" name="host_bosh_mini" value="<?php echo $host_bosh_mini; ?>" />
+	
+	<input type="hidden" name="host_static" value="<?php echo $host_static; ?>" />
+	
+	<input type="hidden" name="host_upload" value="<?php echo $host_upload; ?>" />
+</fieldset>
diff --git a/jappixmini/jappix/php/form-main.php b/jappixmini/jappix/php/form-main.php
new file mode 100644
index 00000000..02a16279
--- /dev/null
+++ b/jappixmini/jappix/php/form-main.php
@@ -0,0 +1,125 @@
+<?php
+
+/*
+
+Jappix - An open social platform
+This is the main configuration form (install & manager)
+
+-------------------------------------------------
+
+License: AGPL
+Authors: Vanaryon, LinkMauve
+Last revision: 26/08/11
+
+*/
+
+// Someone is trying to hack us?
+if(!defined('JAPPIX_BASE'))
+	exit;
+
+// Checks the checkboxes which are set "on"
+$checked = ' checked=""';
+
+// Host locking
+if($lock_host == 'on')
+	$check_lock_host = $checked;
+else
+	$check_lock_host = '';
+
+// Anonymous mode
+if($anonymous_mode == 'on')
+	$check_anonymous_mode = $checked;
+else
+	$check_anonymous_mode = '';
+
+// Registration
+if($registration == 'on')
+	$check_registration = $checked;
+else
+	$check_registration = '';
+
+// BOSH proxy
+if($bosh_proxy == 'on')
+	$check_bosh_proxy = $checked;
+else
+	$check_bosh_proxy = '';
+
+// Manager link
+if($manager_link == 'on')
+	$check_manager_link = $checked;
+else
+	$check_manager_link = '';
+
+// Encryption
+if($encryption == 'on')
+	$check_encryption = $checked;
+else
+	$check_encryption = '';
+
+// HTTPS storage
+if($https_storage == 'on')
+	$check_https_storage = $checked;
+else
+	$check_https_storage = '';
+
+// Force HTTPS
+if($https_force == 'on')
+	$check_https_force = $checked;
+else
+	$check_https_force = '';
+
+// Compression
+if($compression == 'on')
+	$check_compression = $checked;
+else
+	$check_compression = '';
+
+?>
+
+<a class="info smallspace neutral" href="http://codingteam.net/project/jappix/doc/JappixApp#title-2" target="_blank"><?php _e("Need help? You'd better read our documentation page about how to fill this form!"); ?></a>
+
+<fieldset>
+	<legend><?php _e("Service"); ?></legend>
+	
+	<label for="service_name"><?php _e("Service name"); ?></label><input id="service_name" type="text" name="service_name" value="<?php echo $service_name; ?>" maxlength="14" />
+	
+	<label for="service_desc"><?php _e("Service description"); ?></label><input id="service_desc" type="text" name="service_desc" value="<?php echo $service_desc; ?>" maxlength="30" />
+</fieldset>
+
+<fieldset>
+	<legend><?php _e("Connection"); ?></legend>
+	
+	<label for="jappix_resource"><?php _e("Resource"); ?></label><input id="jappix_resource" type="text" name="jappix_resource" value="<?php echo $jappix_resource; ?>" maxlength="1023" />
+	
+	<label for="lock_host"><?php _e("Lock the host"); ?></label><input id="lock_host" type="checkbox" name="lock_host"<?php echo $check_lock_host; ?> />
+	
+	<label for="anonymous_mode"><?php _e("Anonymous mode"); ?></label><input id="anonymous_mode" type="checkbox" name="anonymous_mode"<?php echo $check_anonymous_mode; ?> />
+	
+	<label for="registration"><?php _e("Registration allowed"); ?></label><input id="registration" type="checkbox" name="registration"<?php echo $check_registration; ?> />
+	
+	<label for="bosh_proxy"><?php _e("Use a proxy"); ?></label><input id="bosh_proxy" type="checkbox" name="bosh_proxy"<?php echo $check_bosh_proxy; ?> />
+</fieldset>
+
+<fieldset>
+	<legend><?php _e("Others"); ?></legend>
+	
+	<label for="manager_link"><?php _e("Manager link"); ?></label><input id="manager_link" type="checkbox" name="manager_link"<?php echo $check_manager_link; ?> />
+	
+	<label for="groupchats_join"><?php _e("Groupchats to join"); ?></label><input id="groupchats_join" type="text" name="groupchats_join" value="<?php echo $groupchats_join; ?>" placeholder="postpro@muc.jappix.com, mini@muc.jappix.com" />
+</fieldset>
+
+<fieldset>
+	<legend><?php _e("Advanced"); ?></legend>
+	
+	<label for="encryption"><?php _e("Encryption"); ?></label><input id="encryption" type="checkbox" name="encryption"<?php echo $check_encryption; ?> />
+	
+	<label for="https_storage"><?php _e("HTTPS storage"); ?></label><input id="https_storage" type="checkbox" name="https_storage"<?php echo $check_https_storage; ?> />
+	
+	<label for="https_force"><?php _e("Force HTTPS"); ?></label><input id="https_force" type="checkbox" name="https_force"<?php echo $check_https_force; ?> />
+	
+	<label for="compression"><?php _e("Compression"); ?></label><input id="compression" type="checkbox" name="compression"<?php echo $check_compression; ?> />
+	
+	<input type="hidden" name="multi_files" value="<?php echo $multi_files; ?>" />
+	
+	<input type="hidden" name="developer" value="<?php echo $developer; ?>" />
+</fieldset>
diff --git a/jappixmini/jappix/php/form-users.php b/jappixmini/jappix/php/form-users.php
new file mode 100644
index 00000000..4e313436
--- /dev/null
+++ b/jappixmini/jappix/php/form-users.php
@@ -0,0 +1,30 @@
+<?php
+
+/*
+
+Jappix - An open social platform
+This is the user add form (install & manager)
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 08/05/11
+
+*/
+
+// Someone is trying to hack us?
+if(!defined('JAPPIX_BASE'))
+	exit;
+
+?>
+
+<fieldset>
+	<legend><?php _e("New"); ?></legend>
+	
+	<label for="user_name"><?php _e("User"); ?></label><input id="user_name" class="icon <?php echo($form_parent); ?>-images" type="text" name="user_name" value="<?php echo(htmlspecialchars($user_name)); ?>" maxlength="30" />
+	
+	<label for="user_password"><?php _e("Password"); ?></label><input id="user_password" class="icon <?php echo($form_parent); ?>-images" type="password" name="user_password" maxlength="40" />
+	
+	<label for="user_repassword"><?php _e("Confirm"); ?></label><input id="user_repassword" class="icon <?php echo($form_parent); ?>-images" type="password" name="user_repassword" maxlength="40" />
+</fieldset>
diff --git a/jappixmini/jappix/php/functions-get.php b/jappixmini/jappix/php/functions-get.php
new file mode 100644
index 00000000..9b91e6f1
--- /dev/null
+++ b/jappixmini/jappix/php/functions-get.php
@@ -0,0 +1,280 @@
+<?php
+
+/*
+
+Jappix - An open social platform
+These are the PHP functions for Jappix Get API
+
+-------------------------------------------------
+
+License: AGPL
+Authors: Vanaryon, Mathieui, olivierm
+Last revision: 26/08/11
+
+*/
+
+// The function to get the cached content
+function readCache($hash) {
+	return file_get_contents(JAPPIX_BASE.'/store/cache/'.$hash.'.cache');
+}
+
+// The function to generate a cached file
+function genCache($string, $mode, $cache) {
+	if(!$mode) {
+		$cache_dir = JAPPIX_BASE.'/store/cache';
+		$file_put = $cache_dir.'/'.$cache.'.cache';
+		
+		// Cache not yet wrote
+		if(is_dir($cache_dir) && !file_exists($file_put))
+			file_put_contents($file_put, $string);
+	}
+}
+
+// The function to remove the BOM from a string
+function rmBOM($string) { 
+	if(substr($string, 0, 3) == pack('CCC', 0xef, 0xbb, 0xbf))
+		$string = substr($string, 3);
+	
+	return $string; 
+}
+
+// The function to compress the CSS
+function compressCSS($buffer) {
+	// We remove the comments
+	$buffer = preg_replace('!/\*[^*]*\*+([^/][^*]*\*+)*/!', '', $buffer);
+	
+	// We remove the useless spaces
+	$buffer = str_replace(array("\r\n", "\r", "\n", "\t", '  ', '	 ', '	 '), '', $buffer);
+	
+	// We remove the last useless spaces
+	$buffer = str_replace(array(' { ',' {','{ '), '{', $buffer);
+	$buffer = str_replace(array(' } ',' }','} '), '}', $buffer);
+	$buffer = str_replace(array(' : ',' :',': '), ':', $buffer);
+ 	
+	return $buffer;
+}
+
+// The function to replace classical path to get.php paths
+function setPath($string, $hash, $host, $type, $locale) {
+	// Initialize the static server path
+	$static = '.';
+	
+	// Replace the JS strings
+	if($type == 'js') {
+		// Static host defined
+		if($host && ($host != '.'))
+			$static = $host;
+		
+		// Links to JS (must have a lang parameter)
+		$string = preg_replace('/((\")|(\'))(\.\/)(js)(\/)(\S+)(js)((\")|(\'))/', '$1'.$static.'/php/get.php?h='.$hash.'&l='.$locale.'&t=$5&f=$7$8$9', $string);
+		
+		// Other "normal" links (no lang parameter)
+		$string = preg_replace('/((\")|(\'))(\.\/)(css|img|store|snd)(\/)(\S+)(css|png|jpg|jpeg|gif|bmp|ogg|oga)((\")|(\'))/', '$1'.$static.'/php/get.php?h='.$hash.'&t=$5&f=$7$8$9', $string);
+	}
+	
+	// Replace the CSS strings
+	else if($type == 'css') {
+		// Static host defined
+		if($host && ($host != '.'))
+			$static = $host.'/php';
+		
+		$string = preg_replace('/(\(\.\.\/)(css|js|img|store|snd)(\/)(\S+)(css|js|png|jpg|jpeg|gif|bmp|ogg|oga)(\))/', '('.$static.'/get.php?h='.$hash.'&t=$2&f=$4$5)', $string);
+	}
+	
+	return $string;
+}
+
+// The function to set the good translation to a JS file
+function setTranslation($string) {
+	return preg_replace('/_e\("([^\"\"]+)"\)/e', "'_e(\"'.addslashes(T_gettext(stripslashes('$1'))).'\")'", $string);
+}
+
+// The function to set the good locales
+function setLocales($string, $locale) {
+	// Generate the two JS array list
+	$available_list = availableLocales($locale);
+	$available_id = '';
+	$available_names = '';
+	
+	// Add the values to the arrays
+	foreach($available_list as $current_id => $current_name) {
+		$available_id .= '\''.$current_id.'\', ';
+		$available_names .= '\''.addslashes($current_name).'\', ';
+	}
+	
+	// Remove the last comma
+	$regex = '/(.+), $/';
+	$available_id = preg_replace($regex, '$1', $available_id);
+	$available_names = preg_replace($regex, '$1', $available_names);
+	
+	// Locales array
+	$array = array(
+			'LOCALES_AVAILABLE_ID' => $available_id,
+			'LOCALES_AVAILABLE_NAMES' => $available_names
+		      );
+	
+	// Apply it!
+	foreach($array as $array_key => $array_value)
+		$string = preg_replace('/(var '.$array_key.'(( )?=( )?)new Array\()(\);)/', '$1'.$array_value.'$5', $string);
+	
+	return $string;
+}
+
+// The function to set the good configuration to a JS file
+function setConfiguration($string, $locale, $version, $max_upload) {
+	// Special BOSH URL if BOSH proxy enabled
+	if(BOSHProxy())
+		$bosh_special = staticLocation().'php/bosh.php';
+	else
+		$bosh_special = HOST_BOSH;
+	
+	// Configuration array
+	$array = array(
+		      	// xml:lang
+		      	'XML_LANG'		=> $locale,
+		      	
+		      	// Jappix parameters
+		      	'JAPPIX_STATIC'		=> staticLocation(),
+		      	'JAPPIX_VERSION'	=> $version,
+		      	'JAPPIX_MAX_FILE_SIZE'	=> $max_upload,
+		      	'JAPPIX_MAX_UPLOAD'	=> formatBytes($max_upload),
+		      	
+		      	// Main configuration
+		      	'SERVICE_NAME'		=> SERVICE_NAME,
+		      	'SERVICE_DESC'		=> SERVICE_DESC,
+		      	'JAPPIX_RESOURCE'	=> JAPPIX_RESOURCE,
+		      	'LOCK_HOST'		=> LOCK_HOST,
+		      	'ANONYMOUS'		=> ANONYMOUS,
+		      	'REGISTRATION'		=> REGISTRATION,
+		      	'BOSH_PROXY'		=> BOSH_PROXY,
+		      	'MANAGER_LINK'		=> MANAGER_LINK,
+		      	'GROUPCHATS_JOIN'	=> GROUPCHATS_JOIN,
+		      	'ENCRYPTION'		=> ENCRYPTION,
+		      	'HTTPS_STORAGE'		=> HTTPS_STORAGE,
+		      	'HTTPS_FORCE'		=> HTTPS_FORCE,
+		      	'COMPRESSION'		=> COMPRESSION,
+		      	'MULTI_FILES'		=> MULTI_FILES,
+		      	'DEVELOPER'		=> DEVELOPER,
+		      	
+		      	// Hosts configuration
+		      	'HOST_MAIN'		=> HOST_MAIN,
+		      	'HOST_MUC'		=> HOST_MUC,
+		      	'HOST_PUBSUB'		=> HOST_PUBSUB,
+		      	'HOST_VJUD'		=> HOST_VJUD,
+		      	'HOST_ANONYMOUS'	=> HOST_ANONYMOUS,
+		      	'HOST_BOSH'		=> $bosh_special,
+		      	'HOST_BOSH_MAIN'	=> HOST_BOSH_MAIN,
+		      	'HOST_BOSH_MINI'	=> HOST_BOSH_MINI,
+		      	'HOST_STATIC'		=> HOST_STATIC,
+		      	'HOST_UPLOAD'		=> HOST_UPLOAD
+		      );
+	
+	// Apply it!
+	foreach($array as $array_key => $array_value)
+		$string = preg_replace('/var '.$array_key.'(( )?=( )?)null;/', 'var '.$array_key.'$1\''.addslashes($array_value).'\';', $string);
+	
+	return $string;
+}
+
+// The function to set the logos
+function setLogos($string, $files) {
+	// Jappix Desktop home logo?
+	if(in_array('home.css', $files) && file_exists(JAPPIX_BASE.'/store/logos/desktop_home.png')) {
+		$string .=
+'#home .left .logo {
+	background-image: url(../store/logos/desktop_home.png) !important;
+	background-position: center center !important;
+}';
+	}
+	
+	// Jappix Desktop app logo?
+	if(in_array('tools.css', $files) && file_exists(JAPPIX_BASE.'/store/logos/desktop_app.png')) {
+		$string .=
+'#top-content .tools-logo {
+	background-image: url(../store/logos/desktop_app.png) !important;
+	background-position: center center !important;
+}';
+	}
+	
+	// Jappix Mobile logo?
+	if(in_array('mobile.css', $files) && file_exists(JAPPIX_BASE.'/store/logos/mobile.png')) {
+		$string .=
+'.header div {
+	background-image: url(../store/logos/mobile.png) !important;
+	background-position: center center !important;
+}';
+	}
+	
+	// Jappix Mini logo?
+	if(in_array('mini.css', $files) && file_exists(JAPPIX_BASE.'/store/logos/mini.png')) {
+		$string .=
+'#jappix_mini div.jm_actions a.jm_logo {
+	background-image: url(../store/logos/mini.png) !important;
+	background-position: center center !important;
+}';
+	}	
+	
+	return $string;
+}
+
+// The function to set the background
+function setBackground($string) {
+	// Get the default values
+	$array = defaultBackground();
+	
+	// Read the background configuration
+	$xml = readXML('conf', 'background');
+	
+	if($xml) {
+		$read = new SimpleXMLElement($xml);
+		
+		foreach($read->children() as $child) {
+			// Any value?
+			if($child)
+				$array[$child->getName()] = $child;
+		}
+	}
+	
+	$css = '';
+	
+	// Generate the CSS code
+	switch($array['type']) {
+		// Image
+		case 'image':
+			$css .= 
+	"\n".'	background-image: url(../store/backgrounds/'.urlencode($array['image_file']).');
+	background-repeat: '.$array['image_repeat'].';
+	background-position: '.$array['image_horizontal'].' '.$array['image_vertical'].';
+	background-color: '.$array['image_color'].';'
+			;
+			
+			// Add CSS code to adapt the image?
+			if($array['image_adapt'] == 'on')
+				$css .= 
+	'	background-attachment: fixed;
+	background-size: cover;
+	-moz-background-size: cover;
+	-webkit-background-size: cover;';
+			
+			$css .= "\n";
+			
+			break;
+		
+		// Color
+		case 'color':
+			$css .= "\n".'	background-color: '.$array['color_color'].';'."\n";
+			
+			break;
+		
+		// Default: use the filtering regex
+		default:
+			$css .= '$3';
+			
+			break;
+	}
+	
+	// Apply the replacement!
+	return preg_replace('/(\.body-images( )?\{)([^\{\}]+)(\})/i', '$1'.$css.'$4', $string);
+}
+
+?>
diff --git a/jappixmini/jappix/php/functions-manager.php b/jappixmini/jappix/php/functions-manager.php
new file mode 100644
index 00000000..471fcc2a
--- /dev/null
+++ b/jappixmini/jappix/php/functions-manager.php
@@ -0,0 +1,769 @@
+<?php
+
+/*
+
+Jappix - An open social platform
+These are the PHP functions for Jappix manager
+
+-------------------------------------------------
+
+License: AGPL
+Authors: Vanaryon, Mathieui, olivierm, Vinilox
+Last revision: 15/01/12
+
+*/
+
+// The function to check an user is admin
+function isAdmin($user, $password) {
+	// Read the users.xml file
+	$array = getUsers();
+	
+	// No data?
+	if(empty($array))
+		return false;
+	
+	// Our user is set and valid?
+	if(isset($array[$user]) && ($array[$user] == $password))
+		return true;
+	
+	// Not authorized
+	return false;
+}
+
+// Checks if a file is a valid image
+function isImage($file) {
+	// This is an image
+	if(preg_match('/^(.+)(\.)(png|jpg|jpeg|gif|bmp)$/i', $file))
+		return true;
+	
+	return false;
+}
+
+// Puts a marker on the current opened manager tab
+function currentTab($current, $page) {
+	if($current == $page)
+		echo ' class="tab-active"';
+}
+
+// Checks all the storage folders are writable
+function storageWritable() {
+	// Read the directory content
+	$dir = JAPPIX_BASE.'/store/';
+	$scan = scandir($dir);
+	
+	// Writable marker
+	$writable = true;
+	
+	// Check that each folder is writable
+	foreach($scan as $current) {
+		// Current folder
+		$folder = $dir.$current;
+		
+		// A folder is not writable?
+		if(!preg_match('/^\.(.+)/', $current) && !is_writable($folder)) {
+			// Try to change the folder rights
+			chmod($folder, 0777);
+			
+			// Check it again!
+			if(!is_writable($folder))
+				$writable = false;
+		}
+	}
+	
+	return $writable;
+}
+
+// Removes a given directory (with all sub-elements)
+function removeDir($dir) {
+	// Can't open the dir
+	if(!$dh = @opendir($dir))
+		return;
+	
+	// Loop the current dir to remove its content
+	while(false !== ($obj = readdir($dh))) {
+		// Not a "real" directory
+		if(($obj == '.') || ($obj == '..'))
+			continue;
+		
+		// Not a file, remove this dir
+		if(!@unlink($dir.'/'.$obj))
+			removeDir($dir.'/'.$obj);
+	}
+	
+	// Close the dir and remove it!
+	closedir($dh);
+	@rmdir($dir);
+}
+
+// Copies a given directory (with all sub-elements)
+function copyDir($source, $destination) {
+	// This is a directory
+	if(is_dir($source)) {
+		// Create the target directory
+		@mkdir($destination);
+		$directory = dir($source);
+		
+		// Append the source directory content into the target one
+		while(FALSE !== ($readdirectory = $directory->read())) {
+			if(($readdirectory == '.') || ($readdirectory == '..'))
+				continue;
+			
+			$PathDir = $source.'/'.$readdirectory;
+			
+			// Recursive copy
+			if(is_dir($PathDir)) {
+				copyDir($PathDir, $destination.'/'.$readdirectory);
+				
+				continue;
+			}
+			
+			copy($PathDir, $destination.'/'.$readdirectory);
+		}
+	 	
+	 	// Close the source directory
+		$directory->close();
+	}
+	
+	// This is a file
+	else
+		copy($source, $destination);
+}
+
+// Gets the total size of a directory
+function sizeDir($dir) {
+	$size = 0;
+	
+	foreach(new RecursiveIteratorIterator(new RecursiveDirectoryIterator($dir)) as $file)
+        	$size += $file->getSize();
+	
+	return $size;
+}
+
+// Set the good unity for a size in bytes
+function numericToMonth($id) {
+	$array = array(
+		      	1 => T_("January"),
+		      	2 => T_("February"),
+		      	3 => T_("March"),
+		      	4 => T_("April"),
+		      	5 => T_("May"),
+		      	6 => T_("June"),
+		      	7 => T_("July"),
+		      	8 => T_("August"),
+		      	9 => T_("September"),
+		      	10 => T_("October"),
+		      	11 => T_("November"),
+		      	12 =>T_( "December")
+		      );
+	
+	return $array[$id];
+}
+
+// Extracts the version number with a version ID
+function versionNumber($id) {
+	// First, extract the number string from the [X]
+	$extract = preg_replace('/^(.+)\[(\S+)\]$/', '$2', $id);
+	$dev = false;
+	
+	// Second extract: ~ (when this is a special version, like ~dev)
+	if(strrpos($extract, '~') !== false) {
+		$dev = true;
+		$extract = preg_replace('/^([^~])~(.+)$/', '$1', $extract);
+	}
+	
+	// Convert [X.X.X] into a full number
+	$extract = preg_replace('/[^0-9]/', '', $extract);
+	
+	// Add missing items to [X.X.X]
+	$missing = 3 - strlen($extract.'');
+	if($missing > 0)
+		$extract = $extract.(str_repeat('0', $missing));
+	
+	// Allows updates for dev versions
+	if($dev)
+		$extract = $extract - 1;
+	
+	return intval($extract);
+}
+
+// Checks for new Jappix updates
+function newUpdates($force) {
+	// No need to check if developer mode
+	if(isDeveloper())
+		return false;
+	
+	$cache_path = JAPPIX_BASE.'/store/updates/version.xml';
+	
+	// No cache, obsolete one or refresh forced
+	if(!file_exists($cache_path) || (file_exists($cache_path) && (time() - (filemtime($cache_path)) >= 86400)) || $force) {
+		// Get the content
+		$last_version = read_url('http://codingteam.net/project/jappix/upload/briefcase/version.xml');
+		
+		// Write the content
+		file_put_contents($cache_path, $last_version);
+	}
+	
+	// Read from the cache
+	else
+		$last_version = file_get_contents($cache_path);
+	
+	// Parse the XML
+	$xml = @simplexml_load_string($last_version);
+	
+	// No data?
+	if($xml === FALSE)
+		return false;
+	
+	// Get the version numbers
+	$current_version = getVersion();
+	$last_version = $xml->id;
+	
+	// Check if we have the latest version
+	$current_version = versionNumber($current_version);
+	$last_version = versionNumber($last_version);
+	
+	if($current_version < $last_version)
+		return true;
+	
+	return false;
+}
+
+// Gets the Jappix update informations
+function updateInformations() {
+	// Get the XML file content
+	$data = file_get_contents(JAPPIX_BASE.'/store/updates/version.xml');
+	
+	// Transform the XML content into an array
+	$array = array();
+	
+	// No XML?
+	if(!$data)
+		return $array;
+	
+	$xml = new SimpleXMLElement($data);
+	
+	// Parse the XML to add it to the array
+	foreach($xml->children() as $this_child) {
+		// Get the node name
+		$current_name = $this_child->getName();
+		
+		// Push it to the array, with a basic HTML encoding
+		$array[$current_name] = str_replace('\n', '<br />', $this_child);
+	}
+	
+	// Return this array
+	return $array;
+}
+
+// Processes the Jappix update from an external package
+function processUpdate($url) {
+	// Archive path
+	$name = md5($url).'.zip';
+	$update_dir = $dir_base.'store/updates/';
+	$path = JAPPIX_BASE.'/store/updates/'.$name;
+	$extract_to = $update_dir.'jappix/';
+	$store_tree = JAPPIX_BASE.'/php/store-tree.php';
+	
+	// We must get the archive from the server
+	if(!file_exists($path)) {
+		echo('<p>» '.T_("Downloading package...").'</p>');
+		
+		// Open the packages
+		$local = fopen($path, 'w');
+		$remote = fopen($url, 'r');
+		
+		// Could not open a socket?!
+		if(!$remote) {
+			echo('<p>» '.T_("Aborted: socket error!").'</p>');
+			
+			// Remove the broken local archive
+			unlink($path);
+			
+			return false;
+		}
+		
+		// Read the file
+		while(!feof($remote)) {
+			// Get the buffer
+			$buffer = fread($remote, 1024);
+			
+			// Any error?
+			if($buffer == 'Error.') {
+				echo('<p>» '.T_("Aborted: buffer error!").'</p>');
+				
+				// Remove the broken local archive
+				unlink($path);
+				
+				return false;
+			}
+			
+			// Write the buffer to the file
+			fwrite($local, $buffer);
+			
+			// Flush the current buffer
+			ob_flush();
+			flush();
+   		}
+   		
+   		// Close the files
+   		fclose($local);
+   		fclose($remote);
+	}
+	
+	// Then, we extract the archive
+	echo('<p>» '.T_("Extracting package...").'</p>');
+	
+	try {
+		$zip = new ZipArchive;
+		$zip_open = $zip->open($path);
+		
+		if($zip_open === TRUE) {
+			$zip->extractTo($update_dir);
+			$zip->close();
+		}
+		
+		else {
+			echo('<p>» '.T_("Aborted: could not extract the package!").'</p>');
+			
+			// Remove the broken source folder
+			removeDir($to_remove);
+			
+			return false;
+		}
+	}
+	
+	// PHP does not provide Zip archives support
+	catch(Exception $e) {
+		echo('<p>» '.T_("Aborted: could not extract the package!").'</p>');
+		
+		// Remove the broken source folder
+		removeDir($to_remove);
+		
+		return false;
+	}
+	
+	// Remove the ./store dir from the source directory
+	removeDir($extract_to.'store/');
+	
+	// Then, we remove the Jappix system files
+	echo('<p>» '.T_("Removing current Jappix system files...").'</p>');
+	
+	// Open the general directory
+	$dir_base = JAPPIX_BASE.'/';
+	$scan = scandir($dir_base);
+	
+	// Filter the scan array
+	$scan = array_diff($scan, array('.', '..', '.svn', 'store'));
+	
+	// Check all the files are writable
+	foreach($scan as $scanned) {
+		// Element path
+		$scanned_current = $dir_base.$scanned;
+		
+		// Element not writable
+		if(!is_writable($scanned_current)) {
+			// Try to change the element rights
+			chmod($scanned_current, 0777);
+			
+			// Check it again!
+			if(!is_writable($scanned_current)) {
+				echo('<p>» '.T_("Aborted: everything is not writable!").'</p>');
+				
+				return false;
+			}
+		}
+	}
+	
+   	// Process the files deletion
+   	foreach($scan as $current) {
+   		$to_remove = $dir_base.$current;
+   		
+   		// Remove folders
+		if(is_dir($to_remove))
+			removeDir($to_remove);
+		
+		// Remove files
+		else
+			unlink($to_remove);
+   	}
+	
+	// Move the extracted files to the base
+	copyDir($extract_to, $dir_base);
+	
+	// Remove the source directory
+	removeDir($extract_to);
+	
+	// Regenerates the store tree
+	if(file_exists($store_tree)) {
+		echo('<p>» '.T_("Regenerating storage folder tree...").'</p>');
+		
+		// Call the special regeneration script
+		include($store_tree);
+	}
+	
+	// Remove the version package
+	unlink($path);
+	
+	// The new version is now installed!
+	echo('<p>» '.T_("Jappix is now up to date!").'</p>');
+	
+	return true;
+}
+
+// Returns an array with the biggest share folders
+function shareStats() {
+	// Define some stuffs
+	$path = JAPPIX_BASE.'/store/share/';
+	$array = array();
+	
+	// Open the directory
+	$scan = scandir($path);
+	
+	// Loop the share files
+	foreach($scan as $current) {
+		if(is_dir($path.$current) && !preg_match('/^(\.(.+)?)$/i', $current))
+			array_push($array, $current);
+   	}
+	
+	return $array;
+}
+
+// Returns the largest share folders
+function largestShare($array, $number) {
+	// Define some stuffs
+	$path = JAPPIX_BASE.'/store/share/';
+	$size_array = array();
+	
+	// Push the results in an array
+	foreach($array as $current)
+		$size_array[$current] = sizeDir($path.$current);
+	
+	// Sort this array
+	arsort($size_array);
+	
+	// Select the first biggest values
+	$size_array = array_slice($size_array, 0, $number);
+	
+	return $size_array;
+}
+
+// Returns the others statistics array
+function otherStats() {
+	// Fill the array with the values
+	$others_stats = array(
+			     	T_("Backgrounds") => sizeDir(JAPPIX_BASE.'/store/backgrounds/'),
+			     	T_("Cache") => sizeDir(JAPPIX_BASE.'/store/cache/'),
+			     	T_("Logs") => sizeDir(JAPPIX_BASE.'/store/logs/'),
+			     	T_("Music") => sizeDir(JAPPIX_BASE.'/store/music/'),
+			     	T_("Share") => sizeDir(JAPPIX_BASE.'/store/share/'),
+			     	T_("Send") => sizeDir(JAPPIX_BASE.'/store/send/'),
+			     	T_("Updates") => sizeDir(JAPPIX_BASE.'/store/updates/')
+			     );
+	
+	// Sort this array
+	arsort($others_stats);
+	
+	return $others_stats;
+}
+
+// Gets the array of the visits stats
+function getVisits() {
+	// New array
+	$array = array(
+		      	'total' => 0,
+		      	'daily' => 0,
+		      	'weekly' => 0,
+		      	'monthly' => 0,
+		      	'yearly' => 0
+		      );
+	
+	// Read the data
+	$data = readXML('access', 'total');
+	
+	// Any data?
+	if($data) {
+		// Initialize the visits reading
+		$xml = new SimpleXMLElement($data);
+		
+		// Get the XML values
+		$array['total'] = intval($xml->total);
+		$array['stamp'] = intval($xml->stamp);
+		
+		// Get the age of the stats
+		$age = time() - $array['stamp'];
+		
+		// Generate the time-dependant values
+		$timed = array(
+			      	'daily' => 86400,
+			      	'weekly' => 604800,
+			      	'monthly' => 2678400,
+			      	'yearly' => 31536000
+			      );
+		
+		foreach($timed as $timed_key => $timed_value) {
+			if($age >= $timed_value)
+				$array[$timed_key] = intval($array['total'] / ($age / $timed[$timed_key])).'';
+			else
+				$array[$timed_key] = $array['total'].'';
+		}
+	}
+	
+	return $array;
+}
+
+// Gets the array of the monthly visits
+function getMonthlyVisits() {
+	// New array
+	$array = array();
+	
+	// Read the data
+	$data = readXML('access', 'months');
+	
+	// Get the XML file values
+	if($data) {
+		// Initialize the visits reading
+		$xml = new SimpleXMLElement($data);
+		
+		// Loop the visit elements
+		foreach($xml->children() as $child) {
+			// Get the current month ID
+			$current_id = intval(preg_replace('/month_([0-9]+)/i', '$1', $child->getName()));
+			
+			// Get the current month name
+			$current_name = numericToMonth($current_id);
+			
+			// Push it!
+			$array[$current_name] = intval($child);
+		}
+	}
+	
+	return $array;
+}
+
+// Purges the target folder content
+function purgeFolder($folder) {
+	// Array of the folders to purge
+	$array = array();
+	
+	// We must purge all the folders?
+	if($folder == 'everything')
+		array_push($array, 'cache', 'logs', 'send', 'updates');
+	else
+		array_push($array, $folder);
+	
+	// All right, now we can empty it!
+	foreach($array as $current_folder) {
+		// Scan the current directory
+		$directory = JAPPIX_BASE.'/store/'.$current_folder.'/';
+		$scan = scandir($directory);
+	   	$scan = array_diff($scan, array('.', '..', '.svn', 'index.html'));
+	   	
+	   	// Process the files deletion
+	   	foreach($scan as $current) {
+	   		$remove_this = $directory.$current;
+	   		
+	   		// Remove folders
+			if(is_dir($remove_this))
+				removeDir($remove_this);
+			
+			// Remove files
+			else
+				unlink($remove_this);
+	   	}
+	}
+}
+
+// Returns folder browsing informations
+function browseFolder($folder, $mode) {
+	// Scan the target directory
+	$directory = JAPPIX_BASE.'/store/'.$folder;
+	$scan = scandir($directory);
+	$scan = array_diff($scan, array('.', '..', '.svn', 'index.html'));
+	$keep_get = keepGet('(s|b|k)', false);
+	
+	// Odd/even marker
+	$marker = 'odd';
+	
+	// Not in the root folder: show previous link
+	if(strpos($folder, '/') != false) {
+		// Filter the folder name
+		$previous_folder = substr($folder, 0, strrpos($folder, '/'));
+		
+		echo('<div class="one-browse previous manager-images"><a href="./?b='.$mode.'&s='.urlencode($previous_folder).$keep_get.'">'.T_("Previous").'</a></div>');
+	}
+	
+	// Empty or non-existing directory?
+	if(!count($scan) || !is_dir($directory)) {
+		echo('<div class="one-browse '.$marker.' alert manager-images">'.T_("The folder is empty.").'</div>');
+		
+		return false;
+	}
+	
+	// Echo the browsing HTML code
+	foreach($scan as $current) {
+		// Generate the item path$directory
+		$path = $directory.'/'.$current;
+		$file = $folder.'/'.$current;
+		
+		// Directory?
+		if(is_dir($path)) {
+			$type = 'folder';
+			$href = './?b='.$mode.'&s='.urlencode($file).$keep_get;
+			$target = '';
+		}
+		
+		// File?
+		else {
+			$type = getFileType(getFileExt($path));
+			$href = $path;
+			$target = ' target="_blank"';
+		}
+		
+		echo('<div class="one-browse '.$marker.' '.$type.' manager-images"><a href="'.$href.'"'.$target.'>'.htmlspecialchars($current).'</a><input type="checkbox" name="element_'.md5($file).'" value="'.htmlspecialchars($file).'" /></div>');
+		
+		// Change the marker
+		if($marker == 'odd')
+			$marker = 'even';
+		else
+			$marker = 'odd';
+	}
+	
+	return true;
+}
+
+// Removes selected elements (files/folders)
+function removeElements() {
+	// Initialize the match
+	$elements_removed = false;
+	$elements_remove = array();
+	
+	// Try to get the elements to remove
+	foreach($_POST as $post_key => $post_value) {
+		// Is a safe file?
+		if(preg_match('/^element_(.+)$/i', $post_key) && isSafe($post_value)) {
+			// Update the marker
+			$elements_removed = true;
+			
+			// Get the real path
+			$post_element = JAPPIX_BASE.'/store/'.$post_value;
+			
+			// Remove the current element
+			if(is_dir($post_element))
+				removeDir($post_element);
+			else if(file_exists($post_element))
+				unlink($post_element);
+		}
+	}
+	
+	// Show a notification message
+	if($elements_removed)
+		echo('<p class="info smallspace success">'.T_("The selected elements have been removed.").'</p>');
+	else
+		echo('<p class="info smallspace fail">'.T_("You must select elements to remove!").'</p>');
+}
+
+// Returns users browsing informations
+function browseUsers() {
+	// Get the users
+	$array = getUsers();
+	
+	// Odd/even marker
+	$marker = 'odd';
+	
+	// Echo the browsing HTML code
+	foreach($array as $user => $password) {
+		// Filter the username
+		$user = htmlspecialchars($user);
+		
+		// Output the code
+		echo('<div class="one-browse '.$marker.' user manager-images"><span>'.$user.'</span><input type="checkbox" name="admin_'.md5($user).'" value="'.$user.'" /><div class="clear"></div></div>');
+		
+		// Change the marker
+		if($marker == 'odd')
+			$marker = 'even';
+		else
+			$marker = 'odd';
+	}
+}
+
+// Generates the logo form field
+function logoFormField($id, $name) {
+	if(file_exists(JAPPIX_BASE.'/store/logos/'.$name.'.png'))
+		echo '<span class="logo_links"><a class="remove manager-images" href="./?k='.urlencode($name).keepGet('k', false).'" title="'.T_("Remove this logo").'"></a><a class="view manager-images" href="./store/logos/'.$name.'.png" target="_blank" title="'.T_("View this logo").'"></a></span>';
+	else
+		echo '<input id="logo_own_'.$id.'_location" type="file" name="logo_own_'.$id.'_location" accept="image/*" />';
+	
+	echo "\n";
+}
+
+// Reads the background configuration
+function readBackground() {
+	// Read the background configuration XML
+	$background_data = readXML('conf', 'background');
+	
+	// Get the default values
+	$background_default = defaultBackground();
+	
+	// Stored data array
+	$background_conf = array();
+	
+	// Read the stored values
+	if($background_data) {
+		// Initialize the background configuration XML data
+		$background_xml = new SimpleXMLElement($background_data);
+		
+		// Loop the notice configuration elements
+		foreach($background_xml->children() as $background_child)
+			$background_conf[$background_child->getName()] = $background_child;
+	}
+	
+	// Checks no value is missing in the stored configuration
+	foreach($background_default as $background_name => $background_value) {
+		if(!isset($background_conf[$background_name]) || empty($background_conf[$background_name]))
+			$background_conf[$background_name] = $background_default[$background_name];
+	}
+	
+	return $background_conf;
+}
+
+// Writes the background configuration
+function writeBackground($array) {
+	// Generate the XML data
+	$xml = '';
+	
+	foreach($array as $key => $value)
+		$xml .= "\n".'	<'.$key.'>'.stripslashes(htmlspecialchars($value)).'</'.$key.'>';
+	
+	// Write this data
+	writeXML('conf', 'background', $xml);
+}
+
+// Generates a list of the available background images
+function getBackgrounds() {
+	// Initialize the result array
+	$array = array();
+	
+	// Scan the background directory
+	$scan = scandir(JAPPIX_BASE.'/store/backgrounds/');
+	
+	foreach($scan as $current) {
+		if(isImage($current))
+			array_push($array, $current);
+	}
+	
+	return $array;
+}
+
+// Writes the notice configuration
+function writeNotice($type, $simple) {
+	// Generate the XML data
+	$xml = 
+	'<type>'.$type.'</type>
+	<notice>'.stripslashes(htmlspecialchars($simple)).'</notice>'
+	;
+	
+	// Write this data
+	writeXML('conf', 'notice', $xml);
+}
+
+?>
diff --git a/jappixmini/jappix/php/functions.php b/jappixmini/jappix/php/functions.php
new file mode 100644
index 00000000..af737776
--- /dev/null
+++ b/jappixmini/jappix/php/functions.php
@@ -0,0 +1,1427 @@
+<?php
+
+/*
+
+Jappix - An open social platform
+These are the PHP functions for Jappix
+
+-------------------------------------------------
+
+License: AGPL
+Authors: Vanaryon, LinkMauve, Mathieui, olivierm
+Last revision: 16/01/12
+
+*/
+
+// The function to check if Jappix is already installed
+function isInstalled() {
+	if(!file_exists(JAPPIX_BASE.'/store/conf/installed.xml'))
+		return false;
+	
+	return true;
+}
+
+// The function to check if a static host is defined
+function hasStatic() {
+	if(HOST_STATIC && (HOST_STATIC != '.'))
+		return true;
+	
+	return false;
+}
+
+// The function to check if this is a static server
+function isStatic() {
+	if(hasStatic() && (parse_url(HOST_STATIC, PHP_URL_HOST) == $_SERVER['HTTP_HOST']))
+		return true;
+	
+	return false;
+}
+
+// The function to check if this is an upload server
+function isUpload() {
+	if(HOST_UPLOAD && (parse_url(HOST_UPLOAD, PHP_URL_HOST) == $_SERVER['HTTP_HOST']))
+		return true;
+	
+	return false;
+}
+
+// The function to get the users.xml file hashed name
+function usersConfName() {
+	$conf_dir = JAPPIX_BASE.'/store/conf';
+	
+	// No conf folder?
+	if(!is_dir($conf_dir))
+		return '';
+	
+	// Read the conf folder
+	$conf_scan = scandir($conf_dir.'/');
+	$conf_name = '';
+	
+	// Loop the XML files
+	foreach($conf_scan as $current) {
+		if(preg_match('/(.+)(\.users\.xml)($)/', $current)) {
+			$conf_name = $current;
+			
+			break;
+		}
+   	}
+   	
+   	// Return the users file name
+   	return $conf_name;
+}
+
+// The function to write a XML file
+function writeXML($type, $xmlns, $xml) {
+	// Generate the file path
+	$conf_path = JAPPIX_BASE.'/store/'.$type.'/';
+	$conf_name = $xmlns.'.xml';
+	
+	// Secured stored file?
+	if(($type == 'conf') && ($xmlns == 'users')) {
+		// Get the secured file name
+		$conf_secured = usersConfName();
+		
+		// Does this file exist?
+		if($conf_secured)
+			$conf_name = $conf_secured;
+		else
+			$conf_name = hash('sha256', rand(1, 99999999).time()).'.users.xml';
+	}
+	
+	// Generate the file complete path
+	$conf_file = $conf_path.$conf_name;
+	
+	// Write the installed marker
+	$gen_xml = '<?xml version="1.0" encoding="utf-8" ?>
+<jappix xmlns="jappix:'.$type.':'.$xmlns.'">
+	'.trim($xml).'
+</jappix>';
+	
+	file_put_contents($conf_file, $gen_xml);
+	
+	return true;
+}
+
+// The function to read a XML file
+function readXML($type, $xmlns) {
+	// Generate the file path
+	$conf_path = JAPPIX_BASE.'/store/'.$type.'/';
+	$conf_name = $xmlns.'.xml';
+	
+	// Secured stored file?
+	if(($type == 'conf') && ($xmlns == 'users')) {
+		// Get the secured file name
+		$conf_secured = usersConfName();
+		
+		// Does this file exist?
+		if($conf_secured)
+			$conf_name = $conf_secured;
+	}
+	
+	// Generate the file complete path
+	$conf_file = $conf_path.$conf_name;
+	
+	if(file_exists($conf_file))
+		return file_get_contents($conf_file);
+	
+	return false;
+}
+
+// The function to read remote URLs
+function read_url($url) {
+	// Any cURL?
+	if(function_exists('curl_init')) {
+		$ch = curl_init();
+		curl_setopt($ch, CURLOPT_URL, $url);
+		curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+		curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 30);
+		$data = curl_exec($ch);
+		curl_close($ch);
+	}
+	
+	// Default method
+	else
+		$data = @file_get_contents($url);
+	
+	return $data;
+}
+
+// The function to get the Jappix app. current version
+function getVersion() {
+	$file = file_get_contents(JAPPIX_BASE.'/VERSION');
+	$version = trim($file);
+	
+	return $version;
+}
+
+// The function to detect the user's language
+function checkLanguage() {
+	// If the user defined a language
+	if(isset($_GET['l']) && !empty($_GET['l'])) {
+		// We define some stuffs
+		$defined_lang = strtolower($_GET['l']);
+		$lang_file = JAPPIX_BASE.'/lang/'.$defined_lang.'/LC_MESSAGES/main.mo';
+		
+		if($defined_lang == 'en')
+			$lang_found = true;
+		else
+			$lang_found = file_exists($lang_file);
+		
+		// We check if the asked translation exists
+		if($lang_found) {
+			$lang = $defined_lang;
+			
+			// Write a cookie
+			setcookie('jappix_locale', $lang, (time() + 31536000));
+			
+			return $lang;
+		}
+	}
+	
+	// No language has been defined, but a cookie is stored
+	if(isset($_COOKIE['jappix_locale'])) {
+		$check_cookie = $_COOKIE['jappix_locale'];
+		
+		// The cookie has a value, check this value
+		if($check_cookie && (file_exists(JAPPIX_BASE.'/lang/'.$check_cookie.'/LC_MESSAGES/main.mo') || ($check_cookie == 'en')))
+			return $check_cookie;
+	}
+	
+	// No cookie defined (or an unsupported value), naturally, we check the browser language
+	if(!isset($_SERVER['HTTP_ACCEPT_LANGUAGE']))
+		return 'en';
+	
+	// We get the language of the browser
+	$nav_langs = explode(',', $_SERVER['HTTP_ACCEPT_LANGUAGE']);
+	$check_en = strtolower($nav_langs[0]);
+	
+	// We check if this is not english
+	if($check_en == 'en')
+		return 'en';
+	
+	$order = array();
+	
+	foreach($nav_langs as $entry) {
+		$indice = explode('=', $entry);
+		$lang = strtolower(substr(trim($indice[0]), 0, 2));
+		
+		if(!isset($indice[1]) || !$indice[1])
+			$indice = 1;
+		else
+			$indice = $indice[1];
+		
+		$order[$lang] = $indice;
+	}
+	
+	arsort($order);
+	
+	foreach($order as $nav_lang => $val) {
+		$lang_found = file_exists(JAPPIX_BASE.'/lang/'.$nav_lang.'/LC_MESSAGES/main.mo');
+		
+		if($lang_found)
+			return $nav_lang;
+	}
+	
+	// If Jappix doen't know that language, we include the english translation
+	return 'en';
+}
+
+// The function to convert a ISO language code to its full name
+function getLanguageName($code) {
+	$code = strtolower($code);
+	
+	$known = array(
+		'aa' => 'Afaraf',
+		'ab' => 'Аҧсуа',
+		'ae' => 'Avesta',
+		'af' => 'Afrikaans',
+		'ak' => 'Akan',
+		'am' => 'አማርኛ',
+		'an' => 'Aragonés',
+		'ar' => 'العربية',
+		'as' => 'অসমীয়া',
+		'av' => 'авар мацӀ',
+		'ay' => 'Aymar aru',
+		'az' => 'Azərbaycan dili',
+		'ba' => 'башҡорт теле',
+		'be' => 'Беларуская',
+		'bg' => 'български',
+		'bh' => 'भोजपुरी',
+		'bi' => 'Bislama',
+		'bm' => 'Bamanankan',
+		'bn' => 'বাংলা',
+		'bo' => 'བོད་ཡིག',
+		'br' => 'Brezhoneg',
+		'bs' => 'Bosanski jezik',
+		'ca' => 'Català',
+		'ce' => 'нохчийн мотт',
+		'ch' => 'Chamoru',
+		'co' => 'Corsu',
+		'cr' => 'ᓀᐦᐃᔭᐍᐏᐣ',
+		'cs' => 'Česky',
+		'cu' => 'Словѣньскъ',
+		'cv' => 'чӑваш чӗлхи',
+		'cy' => 'Cymraeg',
+		'da' => 'Dansk',
+		'de' => 'Deutsch',
+		'dv' => 'ދިވެހި',
+		'dz' => 'རྫོང་ཁ',
+		'ee' => 'Ɛʋɛgbɛ',
+		'el' => 'Ελληνικά',
+		'en' => 'English',
+		'eo' => 'Esperanto',
+		'es' => 'Español',
+		'et' => 'Eesti keel',
+		'eu' => 'Euskara',
+		'fa' => 'فارسی',
+		'ff' => 'Fulfulde',
+		'fi' => 'Suomen kieli',
+		'fj' => 'Vosa Vakaviti',
+		'fo' => 'Føroyskt',
+		'fr' => 'Français',
+		'fy' => 'Frysk',
+		'ga' => 'Gaeilge',
+		'gd' => 'Gàidhlig',
+		'gl' => 'Galego',
+		'gn' => 'Avañe\'ẽ',
+		'gu' => 'ગુજરાતી',
+		'gv' => 'Ghaelg',
+		'ha' => 'هَوُسَ',
+		'he' => 'עברית',
+		'hi' => 'हिन्दी',
+		'ho' => 'Hiri Motu',
+		'hr' => 'Hrvatski',
+		'ht' => 'Kreyòl ayisyen',
+		'hu' => 'Magyar',
+		'hy' => 'Հայերեն',
+		'hz' => 'Otjiherero',
+		'ia' => 'Interlingua',
+		'id' => 'Bahasa',
+		'ie' => 'Interlingue',
+		'ig' => 'Igbo',
+		'ii' => 'ꆇꉙ',
+		'ik' => 'Iñupiaq',
+		'io' => 'Ido',
+		'is' => 'Íslenska',
+		'it' => 'Italiano',
+		'iu' => 'ᐃᓄᒃᑎᑐᑦ',
+		'ja' => '日本語',
+		'jv' => 'Basa Jawa',
+		'ka' => 'ქართული',
+		'kg' => 'KiKongo',
+		'ki' => 'Gĩkũyũ',
+		'kj' => 'Kuanyama',
+		'kk' => 'Қазақ тілі',
+		'kl' => 'Kalaallisut',
+		'km' => 'ភាសាខ្មែរ',
+		'kn' => 'ಕನ್ನಡ',
+		'ko' => '한 국어',
+		'kr' => 'Kanuri',
+		'ks' => 'कश्मीरी',
+		'ku' => 'Kurdî',
+		'kv' => 'коми кыв',
+		'kw' => 'Kernewek',
+		'ky' => 'кыргыз тили',
+		'la' => 'Latine',
+		'lb' => 'Lëtzebuergesch',
+		'lg' => 'Luganda',
+		'li' => 'Limburgs',
+		'ln' => 'Lingála',
+		'lo' => 'ພາສາລາວ',
+		'lt' => 'Lietuvių kalba',
+		'lu' => 'cilubà',
+		'lv' => 'Latviešu valoda',
+		'mg' => 'Fiteny malagasy',
+		'mh' => 'Kajin M̧ajeļ',
+		'mi' => 'Te reo Māori',
+		'mk' => 'македонски јазик',
+		'ml' => 'മലയാളം',
+		'mn' => 'Монгол',
+		'mo' => 'лимба молдовеняскэ',
+		'mr' => 'मराठी',
+		'ms' => 'Bahasa Melayu',
+		'mt' => 'Malti',
+		'my' => 'ဗမာစာ',
+		'na' => 'Ekakairũ Naoero',
+		'nb' => 'Norsk bokmål',
+		'nd' => 'isiNdebele',
+		'ne' => 'नेपाली',
+		'ng' => 'Owambo',
+		'nl' => 'Nederlands',
+		'nn' => 'Norsk nynorsk',
+		'no' => 'Norsk',
+		'nr' => 'Ndébélé',
+		'nv' => 'Diné bizaad',
+		'ny' => 'ChiCheŵa',
+		'oc' => 'Occitan',
+		'oj' => 'ᐊᓂᔑᓈᐯᒧᐎᓐ',
+		'om' => 'Afaan Oromoo',
+		'or' => 'ଓଡ଼ିଆ',
+		'os' => 'Ирон æвзаг',
+		'pa' => 'ਪੰਜਾਬੀ',
+		'pi' => 'पािऴ',
+		'pl' => 'Polski',
+		'ps' => 'پښتو',
+		'pt' => 'Português',
+		'pt-br' => 'Brasileiro',
+		'qu' => 'Runa Simi',
+		'rm' => 'Rumantsch grischun',
+		'rn' => 'kiRundi',
+		'ro' => 'Română',
+		'ru' => 'Русский',
+		'rw' => 'Kinyarwanda',
+		'sa' => 'संस्कृतम्',
+		'sc' => 'sardu',
+		'sd' => 'सिन्धी',
+		'se' => 'Davvisámegiella',
+		'sg' => 'Yângâ tî sängö',
+		'sh' => 'Српскохрватски',
+		'si' => 'සිංහල',
+		'sk' => 'Slovenčina',
+		'sl' => 'Slovenščina',
+		'sm' => 'Gagana fa\'a Samoa',
+		'sn' => 'chiShona',
+		'so' => 'Soomaaliga',
+		'sq' => 'Shqip',
+		'sr' => 'српски језик',
+		'ss' => 'SiSwati',
+		'st' => 'seSotho',
+		'su' => 'Basa Sunda',
+		'sv' => 'Svenska',
+		'sw' => 'Kiswahili',
+		'ta' => 'தமிழ்',
+		'te' => 'తెలుగు',
+		'tg' => 'тоҷикӣ',
+		'th' => 'ไทย',
+		'ti' => 'ትግርኛ',
+		'tk' => 'Türkmen',
+		'tl' => 'Tagalog',
+		'tn' => 'seTswana',
+		'to' => 'faka Tonga',
+		'tr' => 'Türkçe',
+		'ts' => 'xiTsonga',
+		'tt' => 'татарча',
+		'tw' => 'Twi',
+		'ty' => 'Reo Mā`ohi',
+		'ug' => 'Uyƣurqə',
+		'uk' => 'українська',
+		'ur' => 'اردو',
+		'uz' => 'O\'zbek',
+		've' => 'tshiVenḓa',
+		'vi' => 'Tiếng Việt',
+		'vo' => 'Volapük',
+		'wa' => 'Walon',
+		'wo' => 'Wollof',
+		'xh' => 'isiXhosa',
+		'yi' => 'ייִדיש',
+		'yo' => 'Yorùbá',
+		'za' => 'Saɯ cueŋƅ',
+		'zh' => '中文',
+		'zu' => 'isiZulu'
+	);
+	
+	if(isset($known[$code]))
+		return $known[$code];
+	
+	return null;
+}
+
+// The function to know if a language is right-to-left
+function isRTL($code) {
+	switch($code) {
+		// RTL language
+		case 'ar':
+		case 'he':
+		case 'dv':
+		case 'ur':
+			$is_rtl = true;
+			
+			break;
+		
+		// LTR language
+		default:
+			$is_rtl = false;
+			
+			break;
+	}
+	
+	return $is_rtl;
+}
+
+// The function to set the good localized <html /> tag
+function htmlTag($locale) {
+	// Initialize the tag
+	$html = '<html xml:lang="'.$locale.'" lang="'.$locale.'" dir="';
+	
+	// Set the good text direction (TODO)
+	/* if(isRTL($locale))
+		$html .= 'rtl';
+	else
+		$html .= 'ltr'; */
+	
+	$html .= 'ltr';
+	
+	// Close the tag
+	$html .= '">';
+	
+	echo($html);
+}
+
+// The function which generates the available locales list
+function availableLocales($active_locale) {
+	// Initialize
+	$scan = scandir(JAPPIX_BASE.'/lang/');
+	$list = array();
+	
+	// Loop the available languages
+	foreach($scan as $current_id) {
+		// Get the current language name
+		$current_name = getLanguageName($current_id);
+		
+		// Not valid?
+		if(($current_id == $active_locale) || ($current_name == null))
+			continue;
+		
+		// Add this to the list
+		$list[$current_id] = $current_name;
+   	}
+   	
+   	return $list;
+}
+
+// The function which generates the language switcher hidden part
+function languageSwitcher($active_locale) {
+	// Initialize
+	$keep_get = keepGet('l', false);
+	$list = availableLocales($active_locale);
+	$html = '';
+	
+	// Generate the HTML code
+	foreach($list as $current_id => $current_name)
+		$html .= '<a href="./?l='.$current_id.$keep_get.'">'.htmlspecialchars($current_name).'</a>, ';
+   	
+   	// Output the HTML code
+   	return $html;
+}
+
+// The function to generate a strong hash
+function genStrongHash($string) {
+	// Initialize
+	$i = 0;
+	
+	// Loop to generate a incredibly strong hash (can be a bit slow)
+	while($i < 10) {
+		$string = hash('sha256', $string);
+		
+		$i++;
+	}
+	
+	return $string;
+}
+
+// The function to generate the version hash
+function genHash($version) {
+	// Get the configuration files path
+	$conf_path = JAPPIX_BASE.'/store/conf/';
+	$conf_main = $conf_path.'main.xml';
+	$conf_hosts = $conf_path.'hosts.xml';
+	$conf_background = $conf_path.'background.xml';
+	$logos_dir = JAPPIX_BASE.'/store/logos/';
+	
+	// Get the hash of the main configuration file
+	if(file_exists($conf_main))
+		$hash_main = md5_file($conf_main);
+	else
+		$hash_main = '0';
+	
+	// Get the hash of the main configuration file
+	if(file_exists($conf_hosts))
+		$hash_hosts = md5_file($conf_hosts);
+	else
+		$hash_hosts = '0';
+	
+	// Get the hash of the background configuration file
+	if(file_exists($conf_background))
+		$hash_background = md5_file($conf_background);
+	else
+		$hash_background = '0';
+	
+	// Get the hash of the logos folder
+	$hash_logos = '';
+	
+	if(is_dir($logos_dir)) {
+		$logos_scan = scandir($logos_dir.'/');
+		
+		foreach($logos_scan as $logos_current) {
+			if(getFileExt($logos_current) == 'png')
+				$hash_logos .= md5_file($logos_dir.$logos_current);
+	   	}
+   	}
+	
+	return md5($version.$hash_main.$hash_hosts.$hash_background.$hash_logos);
+}
+
+// The function to hide the error messages
+function hideErrors() {
+	// Hide errors if not developer
+	if(!isDeveloper()) {
+		ini_set('display_errors', 'off');
+		ini_set('error_reporting', 0);
+	}
+	
+	// Developers need to get error reports!
+	else {
+		ini_set('display_errors', 'on');
+		ini_set('error_reporting', E_ALL);
+	}
+}
+
+// The function to check BOSH proxy is enabled
+function BOSHProxy() {
+	if(BOSH_PROXY == 'on')
+		return true;
+	
+	return false;
+}
+
+// The function to check compression is enabled
+function hasCompression() {
+	if(COMPRESSION != 'off')
+		return true;
+	
+	return false;
+}
+
+// The function to check compression is available with the current client
+function canCompress() {
+	// Compression allowed by admin & browser?
+	if(hasCompression() && (isset($_SERVER['HTTP_ACCEPT_ENCODING']) && substr_count($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip')))
+		return true;
+	
+	return false;
+}
+
+// The function to check whether to show manager link or not
+function showManagerLink() {
+	if(MANAGER_LINK != 'off')
+		return true;
+	
+	return false;
+}
+
+// The function to check HTTPS storage is allowed
+function httpsStorage() {
+	if(HTTPS_STORAGE == 'on')
+		return true;
+	
+	return false;
+}
+
+// The function to check HTTPS storage must be forced
+function httpsForce() {
+	if((HTTPS_FORCE == 'on') && sslCheck())
+		return true;
+	
+	return false;
+}
+
+// The function to check we use HTTPS
+function useHttps() {
+	if(isset($_SERVER['HTTPS']) && ($_SERVER['HTTPS'] == 'on'))
+		return true;
+	
+	return false;
+}
+
+// The function to compress the output pages
+function compressThis() {
+	if(canCompress() && !isDeveloper())
+		ob_start('ob_gzhandler');
+}
+
+// The function to choose one file get with get.php or a liste of resources
+function multiFiles() {
+	if(MULTI_FILES == 'on')
+		return true;
+	
+	return false;
+}
+
+function getFiles($h, $l, $t, $g, $f) {
+	// Define the good path to the Get API
+	if(hasStatic())
+		$path_to = HOST_STATIC.'/';
+	else
+		$path_to = JAPPIX_BASE.'/';
+		
+	if(!multiFiles()) {
+		$values = array();
+		if ($h)
+			$values[] = 'h='.$h;
+		if ($l)
+			$values[] = 'l='.$l;
+		if ($t)
+			$values[] = 't='.$t;
+		if ($g)
+			$values[] = 'g='.$g;
+		if ($f)
+			$values[] = 'f='.$f;
+		
+		return $path_to.'php/get.php?'.implode('&amp;', $values);
+	}
+	
+	if($g && !empty($g) && preg_match('/^(\S+)\.xml$/', $g) && preg_match('/^(css|js)$/', $t) && isSafe($g) && file_exists('xml/'.$g)) {
+		$xml_data = file_get_contents('xml/'.$g);
+		
+		// Any data?
+		if($xml_data) {
+			$xml_read = new SimpleXMLElement($xml_data);
+			$xml_parse = $xml_read->$t;
+			
+			// Files were added to the list before (with file var)?
+			if($f)
+				$f .= '~'.$xml_parse;
+			else
+				$f = $xml_parse;
+		}
+	}
+	
+	// Explode the f string
+	if(strpos($f, '~') != false)
+		$array = explode('~', $f);
+	else
+		$array = array($f);
+	
+	$a = array();
+	foreach($array as $file)
+		$a[] = $path_to.$t.'/'.$file;
+
+	if (count($a) == 1)
+		return $a[0];
+
+	return $a;
+}
+
+function echoGetFiles($h, $l, $t, $g, $f) {
+	if ($t == 'css')
+		$pattern = '<link rel="stylesheet" href="%s" type="text/css" media="all" />';
+	else if ($t == 'js')
+		$pattern = '<script type="text/javascript" src="%s"></script>';
+	
+	$files = getFiles($h, $l, $t, $g, $f);
+
+	if (is_string($files))
+		printf($pattern, $files);
+	else {
+		$c = count($files)-1;
+		for($i=0; $i<=$c; $i++) {
+			if ($i)
+				echo '	';
+			printf($pattern, $files[$i]);
+			if ($i != $c)
+				echo "\n";
+		}
+	}
+}
+
+// The function to check if anonymous mode is authorized
+function anonymousMode() {
+	if(isset($_GET['r']) && !empty($_GET['r']) && HOST_ANONYMOUS && (ANONYMOUS == 'on'))
+		return true;
+	else
+		return false;
+}
+
+// The function to quickly translate a string
+function _e($string) {
+	echo T_gettext($string);
+}
+
+// The function to check the encrypted mode
+function sslCheck() {
+	if(ENCRYPTION == 'on')
+		return true;
+	else
+		return false;
+}
+
+// The function to return the encrypted link
+function sslLink() {
+	// Using HTTPS?
+	if(isset($_SERVER['HTTPS']) && ($_SERVER['HTTPS'] == 'on'))
+		$link = '<a class="home-images unencrypted" href="http://'.$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'].'">'.T_('Unencrypted').'</a>';
+	
+	// Using HTTP?
+	else
+		$link = '<a class="home-images encrypted" href="https://'.$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'].'">'.T_('Encrypted').'</a>';
+	
+	return $link;
+}
+
+// The function to get the Jappix static URL
+function staticURL() {
+	// Check for HTTPS
+	$protocol = isset($_SERVER['HTTPS']) && ($_SERVER['HTTPS'] == 'on') ? 'https' : 'http';
+	
+	// Full URL
+	$url = $protocol.'://'.$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'];
+	
+	return $url;
+}
+
+// The function to get the Jappix location (only from Get API!)
+function staticLocation() {
+	// Filter the URL
+	return preg_replace('/((.+)\/)php\/get\.php(\S)+$/', '$1', staticURL());
+}
+
+// The function to include a translation file
+function includeTranslation($locale, $domain) {
+	T_setlocale(LC_MESSAGES, $locale);
+	T_bindtextdomain($domain, JAPPIX_BASE.'/lang');
+	T_bind_textdomain_codeset($domain, 'UTF-8');
+	T_textdomain($domain);
+}
+
+// The function to check the cache presence
+function hasCache($hash) {
+	if(file_exists(JAPPIX_BASE.'/store/cache/'.$hash.'.cache'))
+		return true;
+	else
+		return false;
+}
+
+// The function to check if developer mode is enabled
+function isDeveloper() {
+	if(DEVELOPER == 'on')
+		return true;
+	else
+		return false;
+}
+
+// The function to get a file extension
+function getFileExt($name) {
+	return strtolower(preg_replace('/^(.+)(\.)([^\.]+)$/i', '$3', $name));
+}
+
+// The function to get a file type
+function getFileType($ext) {
+	switch($ext) {
+		// Images
+		case 'jpg':
+		case 'jpeg':
+		case 'png':
+		case 'bmp':
+		case 'gif':
+		case 'tif':
+		case 'svg':
+		case 'psp':
+		case 'xcf':
+			$file_type = 'image';
+			
+			break;
+		
+		// Videos
+		case 'ogv':
+		case 'mkv':
+		case 'avi':
+		case 'mov':
+		case 'mp4':
+		case 'm4v':
+		case 'wmv':
+		case 'asf':
+		case 'mpg':
+		case 'mpeg':
+		case 'ogm':
+		case 'rmvb':
+		case 'rmv':
+		case 'qt':
+		case 'flv':
+		case 'ram':
+		case '3gp':
+		case 'avc':
+			$file_type = 'video';
+			
+			break;
+		
+		// Sounds
+		case 'oga':
+		case 'ogg':
+		case 'mka':
+		case 'flac':
+		case 'mp3':
+		case 'wav':
+		case 'm4a':
+		case 'wma':
+		case 'rmab':
+		case 'rma':
+		case 'bwf':
+		case 'aiff':
+		case 'caf':
+		case 'cda':
+		case 'atrac':
+		case 'vqf':
+		case 'au':
+		case 'aac':
+		case 'm3u':
+		case 'mid':
+		case 'mp2':
+		case 'snd':
+		case 'voc':
+			$file_type = 'audio';
+			
+			break;
+		
+		// Documents
+		case 'pdf':
+		case 'odt':
+		case 'ott':
+		case 'sxw':
+		case 'stw':
+		case 'ots':
+		case 'sxc':
+		case 'stc':
+		case 'sxi':
+		case 'sti':
+		case 'pot':
+		case 'odp':
+		case 'ods':
+		case 'doc':
+		case 'docx':
+		case 'docm':
+		case 'xls':
+		case 'xlsx':
+		case 'xlsm':
+		case 'xlt':
+		case 'ppt':
+		case 'pptx':
+		case 'pptm':
+		case 'pps':
+		case 'odg':
+		case 'otp':
+		case 'sxd':
+		case 'std':
+		case 'std':
+		case 'rtf':
+		case 'txt':
+		case 'htm':
+		case 'html':
+		case 'shtml':
+		case 'dhtml':
+		case 'mshtml':
+			$file_type = 'document';
+			
+			break;
+		
+		// Packages
+		case 'tgz':
+		case 'gz':
+		case 'tar':
+		case 'ar':
+		case 'cbz':
+		case 'jar':
+		case 'tar.7z':
+		case 'tar.bz2':
+		case 'tar.gz':
+		case 'tar.lzma':
+		case 'tar.xz':
+		case 'zip':
+		case 'xz':
+		case 'rar':
+		case 'bz':
+		case 'deb':
+		case 'rpm':
+		case '7z':
+		case 'ace':
+		case 'cab':
+		case 'arj':
+		case 'msi':
+			$file_type = 'package';
+			
+			break;
+		
+		// Others
+		default:
+			$file_type = 'other';
+			
+			break;
+	}
+	
+	return $file_type;
+}
+
+// The function to get the MIME type of a file
+function getFileMIME($path) {
+	$finfo = finfo_open(FILEINFO_MIME_TYPE);
+	$cmime = finfo_file($finfo, $path);
+	finfo_close($finfo);
+	
+	return $cmime;
+}
+
+// The function to keep the current GET vars
+function keepGet($current, $no_get) {
+	// Get the HTTP GET vars
+	$request = $_SERVER['REQUEST_URI'];
+	
+	if(strrpos($request, '?') === false)
+		$get = '';
+	
+	else {
+		$uri = explode('?', $request);
+		$get = $uri[1];
+	}
+	
+	// Remove the items we don't want here
+	$proper = str_replace('&', '&amp;', $get);
+	$proper = preg_replace('/((^)|(&amp;))(('.$current.'=)([^&]+))/i', '', $proper);
+	
+	// Nothing at the end?
+	if(!$proper)
+		return '';
+	
+	// We have no defined GET var
+	if($no_get) {
+		// Remove the first "&" if it appears
+		if(preg_match('/^(&(amp;)?)/i', $proper))
+			$proper = preg_replace('/^(&(amp;)?)/i', '', $proper);
+		
+		// Add the first "?"
+		$proper = '?'.$proper;
+	}
+	
+	// Add a first "&" if there is no one and no defined GET var
+	else if(!$no_get && (substr($proper, 0, 1) != '&') && (substr($proper, 0, 5) != '&amp;'))
+		$proper = '&amp;'.$proper;
+	
+	return $proper;
+}
+
+// Escapes regex special characters for in-regex usage
+function escapeRegex($string) {
+	return preg_replace('/[-[\]{}()*+?.,\\^$|#]/', '\\$&', $string);
+}
+
+// Generates the security HTML code
+function securityHTML() {
+	return '<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+	<title>Jappix - Forbidden</title>
+</head>
+
+<body>
+	<h1>Forbidden</h1>
+	<h4>This is a private folder</h4>
+</body>
+
+</html>';
+}
+
+// Checks if a relative server path is safe
+function isSafe($path) {
+	// Mhh, someone is about to nasty stuffs (previous folder, or executable scripts)
+	if(preg_match('/\.\.\//', $path) || preg_match('/index\.html?$/', $path) || preg_match('/(\.)((php([0-9]+)?)|(aspx?)|(cgi)|(rb)|(py)|(pl)|(jsp)|(ssjs)|(lasso)|(dna)|(tpl)|(smx)|(cfm))$/i', $path))
+		return false;
+	
+	return true;
+}
+
+// Set the good unity for a size in bytes
+function formatBytes($bytes, $precision = 2) {
+	$units = array('B', 'KB', 'MB', 'GB', 'TB');
+	
+	$bytes = max($bytes, 0);
+	$pow = floor(($bytes ? log($bytes) : 0) / log(1024));
+	$pow = min($pow, count($units) - 1);
+	
+	$bytes /= pow(1024, $pow);
+	
+	return round($bytes, $precision) . ' ' . $units[$pow];
+}
+
+// Converts a human-readable bytes value to a computer one
+function humanToBytes($string) {
+	// Values array
+	$values = array(
+		       	'K' => '000',
+		       	'M' => '000000',
+		       	'G' => '000000000',
+		       	'T' => '000000000000',
+		       	'P' => '000000000000000',
+		       	'E' => '000000000000000000',
+		       	'Z' => '000000000000000000000',
+		       	'Y' => '000000000000000000000000'
+		       );
+	
+	// Filter the string
+	foreach($values as $key => $zero)
+		$string = str_replace($key, $zero, $string);
+	
+	// Converts the string into an integer
+	$string = intval($string);
+	
+	return $string;
+}
+
+// Get the maximum file upload size
+function uploadMaxSize() {
+	// Not allowed to upload files?
+	if(ini_get('file_uploads') != 1)
+		return 0;
+	
+	// Upload maximum file size
+	$upload = humanToBytes(ini_get('upload_max_filesize'));
+	
+	// POST maximum size
+	$post = humanToBytes(ini_get('post_max_size'));
+	
+	// Return the lowest value
+	if($upload <= $post)
+		return $upload;
+	
+	return $post;
+}
+
+// Normalizes special chars
+function normalizeChars($string) {
+	$table = array(
+		'Š'=>'S', 'š'=>'s', 'Đ'=>'Dj', 'đ'=>'dj', 'Ž'=>'Z', 'ž'=>'z', 'Č'=>'C', 'č'=>'c', 'Ć'=>'C', 'ć'=>'c',
+		'À'=>'A', 'Á'=>'A', 'Â'=>'A', 'Ã'=>'A', 'Ä'=>'A', 'Å'=>'A', 'Æ'=>'A', 'Ç'=>'C', 'È'=>'E', 'É'=>'E',
+		'Ê'=>'E', 'Ë'=>'E', 'Ì'=>'I', 'Í'=>'I', 'Î'=>'I', 'Ï'=>'I', 'Ñ'=>'N', 'Ò'=>'O', 'Ó'=>'O', 'Ô'=>'O',
+		'Õ'=>'O', 'Ö'=>'O', 'Ø'=>'O', 'Ù'=>'U', 'Ú'=>'U', 'Û'=>'U', 'Ü'=>'U', 'Ý'=>'Y', 'Þ'=>'B', 'ß'=>'Ss',
+		'à'=>'a', 'á'=>'a', 'â'=>'a', 'ã'=>'a', 'ä'=>'a', 'å'=>'a', 'æ'=>'a', 'ç'=>'c', 'è'=>'e', 'é'=>'e',
+		'ê'=>'e', 'ë'=>'e', 'ì'=>'i', 'í'=>'i', 'î'=>'i', 'ï'=>'i', 'ð'=>'o', 'ñ'=>'n', 'ò'=>'o', 'ó'=>'o',
+		'ô'=>'o', 'õ'=>'o', 'ö'=>'o', 'ø'=>'o', 'ù'=>'u', 'ú'=>'u', 'û'=>'u', 'ý'=>'y', 'ý'=>'y', 'þ'=>'b',
+		'ÿ'=>'y', 'Ŕ'=>'R', 'ŕ'=>'r'
+	);
+	
+	return strtr($string, $table);
+}
+
+// Filters the XML special chars for the SVG drawer
+function filterSpecialXML($string) {
+	// Strange thing: when $string = 'Mises à jour' -> bug! but 'Mise à jour' -> ok!
+	$string = normalizeChars($string);
+	
+	// Encodes with HTML special chars
+	$string = htmlspecialchars($string);
+	
+	return $string;
+}
+
+// Writes the current visit in the total file
+function writeTotalVisit() {
+	// Get the current time stamp
+	$stamp = time();
+	
+	// Initialize the defaults
+	$array = array(
+		      	'total' => 0,
+		      	'stamp' => $stamp
+		      );
+	
+	// Try to read the saved data
+	$total_data = readXML('access', 'total');
+	
+	// Get the XML file values
+	if($total_data) {
+		// Initialize the visits reading
+		$read_xml = new SimpleXMLElement($total_data);
+		
+		// Loop the visit elements
+		foreach($read_xml->children() as $current_child)
+			$array[$current_child->getName()] = intval($current_child);
+	}
+	
+	// Increment the total number of visits
+	$array['total']++;
+	
+	// Generate the new XML data
+	$total_xml = 
+	'<total>'.$array['total'].'</total>
+	<stamp>'.$array['stamp'].'</stamp>'
+	;
+	
+	// Re-write the new values
+	writeXML('access', 'total', $total_xml);
+}
+
+// Writes the current visit in the months file
+function writeMonthsVisit() {
+	// Get the current month
+	$month = intval(date('m'));
+	
+	// Define the stats array
+	$array = array();
+	
+	// January to August period
+	if($month <= 8) {
+		for($i = 1; $i <= 8; $i++)
+			$array['month_'.$i] = 0;
+	}
+	
+	// August to September period
+	else {
+		$i = 8;
+		$j = 1;
+		
+		while($j <= 3) {
+			// Last year months
+			if(($i >= 8) && ($i <= 12))
+				$array['month_'.$i++] = 0;
+			
+			// First year months
+			else
+				$array['month_'.$j++] = 0;
+		}
+	}
+	
+	// Try to read the saved data
+	$months_data = readXML('access', 'months');
+	
+	// Get the XML file values
+	if($months_data) {
+		// Initialize the visits reading
+		$read_xml = new SimpleXMLElement($months_data);
+		
+		// Loop the visit elements
+		foreach($read_xml->children() as $current_child) {
+			$current_month = $current_child->getName();
+			
+			// Parse the current month id
+			$current_id = intval(preg_replace('/month_([0-9]+)/i', '$1', $current_month));
+			
+			// Is this month still valid?
+			if((($month <= 8) && ($current_id <= $month)) || (($month >= 8) && ($current_id >= 8) && ($current_id <= $month)))
+				$array[$current_month] = intval($current_child);
+		}
+	}
+	
+	// Increment the current month value
+	$array['month_'.$month]++;
+	
+	// Generate the new XML data
+	$months_xml = '';
+	
+	foreach($array as $array_key => $array_value)
+		$months_xml .= "\n".'	<'.$array_key.'>'.$array_value.'</'.$array_key.'>';
+	
+	// Re-write the new values
+	writeXML('access', 'months', $months_xml);
+}
+
+// Writes the current visit to the storage file
+function writeVisit() {
+	// Write total visits
+	writeTotalVisit();
+	
+	// Write months visits
+	writeMonthsVisit();
+}
+
+// Returns the default background array
+function defaultBackground() {
+	// Define the default values
+	$background_default = array(
+			      	'type' => 'default',
+			      	'image_file' => '',
+			      	'image_repeat' => 'repeat-x',
+			      	'image_horizontal' => 'center',
+			      	'image_vertical' => 'top',
+			      	'image_adapt' => 'off',
+			      	'image_color' => '#cae1e9',
+			      	'color_color' => '#cae1e9'
+			      );
+	
+	return $background_default;
+}
+
+// Reads the notice configuration
+function readNotice() {
+	// Read the notice configuration XML
+	$notice_data = readXML('conf', 'notice');
+	
+	// Define the default values
+	$notice_default = array(
+			  	'type' => 'none',
+			  	'notice' => ''
+			  );
+	
+	// Stored data array
+	$notice_conf = array();
+	
+	// Read the stored values
+	if($notice_data) {
+		// Initialize the notice configuration XML data
+		$notice_xml = new SimpleXMLElement($notice_data);
+		
+		// Loop the notice configuration elements
+		foreach($notice_xml->children() as $notice_child)
+			$notice_conf[$notice_child->getName()] = utf8_decode($notice_child);
+	}
+	
+	// Checks no value is missing in the stored configuration
+	foreach($notice_default as $notice_name => $notice_value) {
+		if(!isset($notice_conf[$notice_name]) || empty($notice_conf[$notice_name]))
+			$notice_conf[$notice_name] = $notice_default[$notice_name];
+	}
+	
+	return $notice_conf;
+}
+
+// The function to get the admin users
+function getUsers() {
+	// Try to read the XML file
+	$data = readXML('conf', 'users');
+	$array = array();
+	
+	// Any data?
+	if($data) {
+		$read = new SimpleXMLElement($data);
+		
+		// Check the submitted user exists
+		foreach($read->children() as $child) {
+			// Get the node attributes
+			$attributes = $child->attributes();
+			
+			// Push the attributes to the global array (converted into strings)
+			$array[$attributes['name'].''] = $attributes['password'].'';
+		}
+	}
+	
+	return $array;
+}
+
+// Manages users
+function manageUsers($action, $array) {
+	// Try to read the old XML file
+	$users_array = getUsers();
+	
+	// What must we do?
+	switch($action) {
+		// Add some users
+		case 'add':
+			foreach($array as $array_user => $array_password)
+				$users_array[$array_user] = genStrongHash($array_password);
+			
+			break;
+		
+		// Remove some users
+		case 'remove':
+			foreach($array as $array_user) {
+				// Not the last user?
+				if(count($users_array) > 1)
+					unset($users_array[$array_user]);
+			}
+			
+			break;
+	}
+	
+	// Regenerate the XML
+	$users_xml = '';
+	
+	foreach($users_array as $users_name => $users_password)
+		$users_xml .= "\n".'	<user name="'.stripslashes(htmlspecialchars($users_name)).'" password="'.stripslashes($users_password).'" />';
+	
+	// Write the main configuration
+	writeXML('conf', 'users', $users_xml);
+}
+
+// Resize an image with GD
+function resizeImage($path, $ext, $width, $height) {
+	// No GD?
+	if(!function_exists('gd_info'))
+		return false;
+	
+	try {
+		// Initialize GD
+		switch($ext) {
+			case 'png':
+				$img_resize = imagecreatefrompng($path);
+				
+				break;
+			
+			case 'gif':
+				$img_resize = imagecreatefromgif($path);
+				
+				break;
+			
+			default:
+				$img_resize = imagecreatefromjpeg($path);
+		}
+		
+		// Get the image size
+		$img_size = getimagesize($path);
+		$img_width = $img_size[0];
+		$img_height = $img_size[1];
+	
+		// Necessary to change the image width
+		if($img_width > $width && ($img_width > $img_height)) {
+			// Process the new sizes
+			$new_width = $width;
+			$img_process = (($new_width * 100) / $img_width);
+			$new_height = (($img_height * $img_process) / 100);
+		}
+	
+		// Necessary to change the image height
+		else if($img_height > $height && ($img_width < $img_height)) {
+			// Process the new sizes
+			$new_height = $height;
+			$img_process = (($new_height * 100) / $img_height);
+			$new_width = (($img_width * $img_process) / 100);
+		}
+	
+		// Else, just use the old sizes
+		else {
+			$new_width = $img_width;
+			$new_height = $img_height;
+		}
+	
+		// Create the new image
+		$new_img = imagecreatetruecolor($new_width, $new_height);
+		
+		// Must keep alpha pixels?
+		if(($ext == 'png') || ($ext == 'gif')){
+			imagealphablending($new_img, false);
+			imagesavealpha($new_img, true);
+			
+			// Set transparent pixels
+			$transparent = imagecolorallocatealpha($new_img, 255, 255, 255, 127);
+			imagefilledrectangle($new_img, 0, 0, $new_width, $new_height, $transparent);
+		}
+		
+		// Copy the new image
+		imagecopyresampled($new_img, $img_resize, 0, 0, 0, 0, $new_width, $new_height, $img_size[0], $img_size[1]);
+	
+		// Destroy the old data
+		imagedestroy($img_resize);
+		unlink($path);
+	
+		// Write the new image
+		switch($ext) {
+			case 'png':
+				imagepng($new_img, $path);
+				
+				break;
+			
+			case 'gif':
+				imagegif($new_img, $path);
+				
+				break;
+			
+			default:
+				imagejpeg($new_img, $path, 85);
+		}
+		
+		return true;
+	}
+	
+	catch(Exception $e) {
+		return false;
+	}
+}
+
+?>
diff --git a/jappixmini/jappix/php/generate-chat.php b/jappixmini/jappix/php/generate-chat.php
new file mode 100644
index 00000000..19c8e71c
--- /dev/null
+++ b/jappixmini/jappix/php/generate-chat.php
@@ -0,0 +1,235 @@
+<?php
+
+/*
+
+Jappix - An open social platform
+This is the PHP script used to generate a chat log
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 26/08/11
+
+*/
+
+// PHP base
+define('JAPPIX_BASE', '..');
+
+// Get the needed files
+require_once('./functions.php');
+require_once('./read-main.php');
+require_once('./read-hosts.php');
+
+// Optimize the page rendering
+hideErrors();
+compressThis();
+
+// Not allowed for a special node
+if(isStatic() || isUpload())
+	exit;
+
+// Create the HTML file to be downloaded
+if(isset($_POST['content']) && isset($_POST['xid']) && !empty($_POST['xid']) && isset($_POST['nick']) && !empty($_POST['nick']) && isset($_POST['avatar']) && !empty($_POST['avatar']) && isset($_POST['date']) && !empty($_POST['date']) && isset($_POST['type']) && !empty($_POST['type'])) {
+	// Get the POST vars
+	$original = $_POST['content'];
+	$xid = $_POST['xid'];
+	$nick = $_POST['nick'];
+	$avatar = $_POST['avatar'];
+	$date = $_POST['date'];
+	$type = $_POST['type'];
+	
+	// Generate the XID link
+	$xid_link = 'xmpp:'.$xid;
+	
+	if($type == 'groupchat')
+		$xid_link .= '?join';
+	
+	// Generates the avatar code
+	if($avatar != 'none')
+		$avatar = '<div class="avatar-container">'.$avatar.'</div>';
+	else
+		$avatar = '';
+	
+	// Generates an human-readable date
+	$date = explode('T', $date);
+	$date = explode('-', $date[0]);
+	$date = $date[2].'/'.$date[1].'/'.$date[0];
+	
+	// Generate some values
+	$content_dir = '../store/logs/';
+	$filename = 'chat_log-'.md5($xid.time());
+	$filepath = $content_dir.$filename.'.html';
+	
+	// Generate Jappix logo Base64 code
+	$logo = base64_encode(file_get_contents(JAPPIX_BASE.'/img/sprites/logs.png'));
+	
+	// Create the HTML code
+	$new_text_inter = 
+'<!DOCTYPE html>
+<html>	
+
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+	<title>'.$nick.' ('.$xid.')</title>
+	<style type="text/css">
+		* {
+			margin: 0;
+			padding: 0;
+		}
+		
+		body {
+			background-color: #424242;
+			font-family : Verdana, Arial, Helvetica, sans-serif;
+			font-size: 0.8em;
+			text-shadow: 0 0 5px white;
+			color: white;
+			margin: 8px;
+			padding: 8px 12px;
+		}
+		
+		a {
+			color: white;
+		}
+		
+		#head {
+		
+		}
+		
+		#head .avatar-container {
+			text-align: center;
+			float: left;
+			height: 70px;
+			width: 70px;
+			margin-right: 18px;
+		}
+		
+		#head .avatar {
+			max-height: 70px;
+			max-width: 70px;
+		}
+		
+		#head h1 {
+			font-size: 2.2em;
+			margin: 0;
+			text-shadow: 1px 1px 1px black;
+		}
+		
+		#head h3 {
+			font-size: 0.95em;
+			margin: 0;
+		}
+		
+		#head h5 {
+			font-size: 0.9em;
+			margin: 8px 0 16px 0;
+		}
+		
+		#head h3,
+		#head h5 {
+			text-shadow: 0 0 1px black;
+		}
+		
+		#head a.logo {
+			position: absolute;
+			top: 16px;
+			right: 20px;
+		}
+		
+		#content {
+			background-color: #e8f1f3;
+			color: black;
+			padding: 14px 18px;
+			border-radius: 4px;
+			clear: both;
+			-moz-border-radius: 4px;
+			-webkit-border-radius: 4px;
+			box-shadow: 0 0 20px #202020;
+			-moz-box-shadow: 0 0 20px #202020;
+			-webkit-box-shadow: 0 0 20px #202020;
+		}
+		
+		#content a {
+			color: black;
+		}
+		
+		#content .one-group {
+			border-bottom: 1px dotted #d0d0d0;
+			padding-bottom: 8px;
+			margin-bottom: 10px;
+		}
+		
+		#content .one-group b.name {
+			display: block;
+			margin-bottom: 4px;
+		}
+		
+		#content .one-group b.name.me {
+			color: #123a5c;
+		}
+		
+		#content .one-group b.name.him {
+			color: #801e1e;
+		}
+		
+		#content .one-group span.date {
+			float: right;
+			font-size: 0.9em;
+		}
+		
+		#content .user-message {
+			margin-bottom: 3px;
+		}
+		
+		#content .system-message {
+			color: #053805;
+			margin-bottom: 3px;
+			padding-left: 0 !important;
+		}
+		
+		#content .system-message a {
+			color: #053805;
+		}
+		
+		.hidden {
+			display: none !important;
+		}
+	</style>
+</head>
+
+<body>
+	<div id="head">
+		'.$avatar.'
+		
+		<h1>'.$nick.'</h1>
+		<h3><a href="'.$xid_link.'">'.$xid.'</a></h3>
+		<h5>'.$date.'</h5>
+		
+		<a class="logo" href="https://project.jappix.com/" target="_blank">
+			<img src="data:image/png;base64,'.$logo.'" alt="" />
+		</a>
+	</div>
+	
+	<div id="content">
+		'.$original.'
+	</div>
+</body>
+</html>'
+;
+	
+	$new_text = stripslashes($new_text_inter);
+	
+	// Write the code into a file
+	file_put_contents($filepath, $new_text);
+	
+	// Security: remove the file and stop the script if too bit (+6MiB)
+	if(filesize($filepath) > 6000000) {
+		unlink($filepath);
+		exit;
+	}
+	
+	// Return to the user the generated file ID
+	exit($filename);
+}
+
+?>
diff --git a/jappixmini/jappix/php/geolocation.php b/jappixmini/jappix/php/geolocation.php
new file mode 100644
index 00000000..acfdedbc
--- /dev/null
+++ b/jappixmini/jappix/php/geolocation.php
@@ -0,0 +1,43 @@
+<?php
+
+/*
+
+Jappix - An open social platform
+This is the Jappix geolocation script
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 15/01/12
+
+*/
+
+// PHP base
+define('JAPPIX_BASE', '..');
+
+// Get the needed files
+require_once('./functions.php');
+require_once('./read-main.php');
+require_once('./read-hosts.php');
+
+// Optimize the page rendering
+hideErrors();
+compressThis();
+
+// Not allowed for a special node
+if(isStatic() || isUpload())
+	exit;
+
+// If valid data was sent
+if((isset($_GET['latitude']) && !empty($_GET['latitude'])) && (isset($_GET['longitude']) && !empty($_GET['longitude'])) && (isset($_GET['language']) && !empty($_GET['language']))) {
+	// Set a XML header
+	header('Content-Type: text/xml; charset=utf-8');
+	
+	// Get the XML content
+	$xml = read_url('http://maps.googleapis.com/maps/api/geocode/xml?latlng='.urlencode($_GET['latitude']).','.urlencode($_GET['longitude']).'&language='.urlencode($_GET['language']).'&sensor=true');
+	
+	exit($xml);
+}
+
+?>
diff --git a/jappixmini/jappix/php/get-store.php b/jappixmini/jappix/php/get-store.php
new file mode 100644
index 00000000..ce754b18
--- /dev/null
+++ b/jappixmini/jappix/php/get-store.php
@@ -0,0 +1,37 @@
+<?php
+
+/*
+
+Jappix - An open social platform
+This is the store configuration GET handler (manager)
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 26/08/11
+
+*/
+
+// Someone is trying to hack us?
+if(!defined('JAPPIX_BASE'))
+	exit;
+
+// Purge requested
+if(isset($_GET['p']) && preg_match('/^((everything)|(cache)|(logs)|(send)|(updates))$/', $_GET['p'])) {
+	purgeFolder($_GET['p']);
+?>
+	
+	<p class="info smallspace success"><?php _e("The storage folder you wanted to clean is now empty!"); ?></p>
+
+<?php }
+
+// Folder view?
+if(isset($_GET['b']) && isset($_GET['s'])) {
+	if($_GET['b'] == 'share')
+		$share_folder = urldecode($_GET['s']);
+	else if($_GET['b'] == 'music')
+		$music_folder = urldecode($_GET['s']);
+}
+
+?>
diff --git a/jappixmini/jappix/php/get.php b/jappixmini/jappix/php/get.php
new file mode 100644
index 00000000..f5078a72
--- /dev/null
+++ b/jappixmini/jappix/php/get.php
@@ -0,0 +1,340 @@
+<?php
+
+/*
+
+Jappix - An open social platform
+This is the file get script
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 03/12/11
+
+*/
+
+// PHP base
+define('JAPPIX_BASE', '..');
+
+// We get the needed files
+require_once('./functions.php');
+require_once('./functions-get.php');
+require_once('./read-main.php');
+require_once('./read-hosts.php');
+
+// Hide PHP errors
+hideErrors();
+
+// Get some parameters
+$is_developer = isDeveloper();
+$has_compression = hasCompression();
+
+if($is_developer) {
+	header('Expires: Sat, 26 Jul 1997 05:00:00 GMT');
+	header('Cache-Control: no-store, no-cache, must-revalidate');
+	header('Cache-Control: post-check=0, pre-check=0', false);
+	header('Pragma: no-cache');
+}
+
+// Else, we put a far away cache date (1 year)
+else {
+	$expires = 31536000;
+	header('Pragma: public');
+	header('Cache-Control: maxage='.$expires);
+	header('Expires: '.gmdate('D, d M Y H:i:s', (time() + $expires)).' GMT');
+}
+
+// Initialize the vars
+$type = '';
+$file = '';
+
+// Read the type var
+if(isset($_GET['t']) && !empty($_GET['t']) && preg_match('/^(css|js|img|snd|store)$/', $_GET['t']))
+	$type = $_GET['t'];
+
+// Read the files var
+if(isset($_GET['f']) && !empty($_GET['f']) && isSafe($_GET['f']))
+	$file = $_GET['f'];
+
+// Read the group var (only for text files)
+if(isset($_GET['g']) && !empty($_GET['g']) && preg_match('/^(\S+)\.xml$/', $_GET['g']) && preg_match('/^(css|js)$/', $type) && isSafe($_GET['g']) && file_exists('../xml/'.$_GET['g'])) {
+	$xml_data = file_get_contents('../xml/'.$_GET['g']);
+	
+	// Any data?
+	if($xml_data) {
+		$xml_read = new SimpleXMLElement($xml_data);
+		$xml_parse = $xml_read->$type;
+		
+		// Files were added to the list before (with file var)?
+		if($file)
+			$file .= '~'.$xml_parse;
+		else
+			$file = $xml_parse;
+	}
+}
+
+// We check if the data was submitted
+if($file && $type) {
+	// We define some stuffs
+	$dir = '../'.$type.'/';
+	$path = $dir.$file;
+	
+	// Define the real type if this is a "store" file
+	if($type == 'store') {
+		// Extract the file extension
+		switch(getFileExt($file)) {
+			// CSS file
+			case 'css':
+				$type = 'css';
+				
+				break;
+			
+			// JS file
+			case 'js':
+				$type = 'js';
+				
+				break;
+			
+			// Audio file
+			case 'ogg':
+			case 'oga':
+				$type = 'snd';
+				
+				break;
+			
+			// Image file
+			case 'png':
+			case 'jpg':
+			case 'jpeg':
+			case 'gif':
+			case 'bmp':
+				$type = 'img';
+				
+				break;
+		}
+	}
+	
+	// JS and CSS special stuffs
+	if(($type == 'css') || ($type == 'js')) {
+		// Compression var
+		if($has_compression)
+			$cache_encoding = 'deflate';
+		else
+			$cache_encoding = 'plain';
+		
+		// Get the vars
+		$version = getVersion();
+		$hash = genHash($version);
+		$cache_hash = md5($path.$hash.staticLocation()).'_'.$cache_encoding;
+		
+		// Check if the browser supports DEFLATE
+		$deflate_support = false;
+		
+		if(isset($_SERVER['HTTP_ACCEPT_ENCODING']) && substr_count($_SERVER['HTTP_ACCEPT_ENCODING'], 'deflate') && hasCompression() && !$is_developer)
+			$deflate_support = true;
+		
+		// Internationalization
+		if($type == 'js') {
+			if(isset($_GET['l']) && !empty($_GET['l']) && !preg_match('/\.\.\//', $_GET['l']) && is_dir('../lang/'.$_GET['l']))
+				$locale = $_GET['l'];
+			else
+				$locale = 'en';
+		}
+		
+		else
+			$locale = '';
+		
+		// Define the cache lang name
+		if($locale)
+			$cache_lang = $cache_hash.'_'.$locale;
+		else
+			$cache_lang = $cache_hash;
+	}
+	
+	// Explode the file string
+	if(strpos($file, '~') != false)
+		$array = explode('~', $file);
+	else
+		$array = array($file);
+	
+	// Define the reading vars
+	$continue = true;
+	$loop_files = true;
+	
+	// Check the cache exists for text files (avoid the heavy file_exists loop!)
+	if(!$is_developer && (($type == 'css') || ($type == 'js')) && hasCache($cache_lang))
+		$loop_files = false;
+	
+	// Check if the all the file(s) exist(s)
+	if($loop_files) {
+		foreach($array as $current) {
+			// Stop the loop if a file is missing
+			if(!file_exists($dir.$current)) {
+				$continue = false;
+				
+				break;
+			}
+		}
+	}
+	
+	// We can read the file(s)
+	if($continue) {
+		// We get the file MIME type
+		$mime = strtolower(preg_replace('/(^)(.+)(\.)(.+)($)/i', '$4', $file));
+		
+		// We set up a known MIME type (and some other headers)
+		if(($type == 'css') || ($type == 'js')) {
+			// DEFLATE header
+			if($deflate_support)
+				header('Content-Encoding: deflate');
+			
+			// MIME header
+			if($type == 'css')
+				header('Content-Type: text/css; charset=utf-8');
+			else if($type == 'js')
+				header('Content-Type: application/javascript; charset=utf-8');
+		}
+		
+		else if($mime == 'png')
+			header('Content-Type: image/png');
+		else if($mime == 'gif')
+			header('Content-Type: image/gif');
+		else if(($mime == 'jpg') || ($mime == 'jpeg'))
+			header('Content-Type: image/jpeg');
+		else if($mime == 'bmp')
+			header('Content-Type: image/bmp');
+		else if(($mime == 'oga') || ($mime == 'ogg'))
+			header('Content-Type: audio/ogg');
+		
+		// Catch the file MIME type
+		else
+			header('Content-Type: '.getFileMIME($path));
+		
+		// Read the text file(s) (CSS & JS)
+		if(($type == 'css') || ($type == 'js')) {
+			// If there's a cache file, read it
+			if(hasCache($cache_lang) && !$is_developer) {
+				$cache_read = readCache($cache_lang);
+				
+				if($deflate_support || !$has_compression)
+					echo $cache_read;
+				else
+					echo gzinflate($cache_read);
+			}
+			
+			// Else, we generate the cache
+			else {
+				// First try to read the cache reference
+				if(hasCache($cache_hash) && !$is_developer) {
+					// Read the reference
+					$cache_reference = readCache($cache_hash);
+					
+					// Filter the cache reference
+					if($has_compression)
+						$output = gzinflate($cache_reference);
+					else
+						$output = $cache_reference;
+				}
+				
+				// No cache reference, we should generate it
+				else {
+					// Initialize the loop
+					$looped = '';
+					
+					// Add the content of the current file
+					foreach($array as $current)
+						$looped .= rmBOM(file_get_contents($dir.$current))."\n";
+					
+					// Filter the CSS
+					if($type == 'css') {
+						// Apply the CSS logos
+						$looped = setLogos($looped, $array);
+						
+						// Apply the CSS background
+						$looped = setBackground($looped);
+						
+						// Set the Get API paths
+						$looped = setPath($looped, $hash, HOST_STATIC, $type, '');
+					}
+					
+					// Optimize the code rendering
+					if($type == 'css') {
+						// Can minify the CSS
+						if($has_compression && !$is_developer)
+							$output = compressCSS($looped);
+						else
+							$output = $looped;
+					}
+					
+					else {
+						// Can minify the JS (sloooooow!)
+						if($has_compression && !$is_developer) {
+							require_once('./jsmin.php');
+							$output = JSMin::minify($looped);
+						}
+						
+						else
+							$output = $looped;
+					}
+					
+					// Generate the reference cache
+					if($has_compression)
+						$final = gzdeflate($output, 9);
+					else
+						$final = $output;
+					
+					// Write it!
+					genCache($final, $is_developer, $cache_hash);
+				}
+				
+				// Filter the JS
+				if($type == 'js') {
+					// Set the JS locales
+					$output = setLocales($output, $locale);
+					
+					// Set the JS configuration
+					$output = setConfiguration($output, $locale, $version, uploadMaxSize());
+					
+					// Set the Get API paths
+					$output = setPath($output, $hash, HOST_STATIC, $type, $locale);
+					
+					// Translate the JS script
+					require_once('./gettext.php');
+					includeTranslation($locale, 'main');
+					$output = setTranslation($output);
+					
+					// Generate the cache
+					if($has_compression)
+						$final = gzdeflate($output, 9);
+					else
+						$final = $output;
+					
+					// Write it!
+					genCache($final, $is_developer, $cache_lang);
+				}
+				
+				// Output a well-encoded string
+				if($deflate_support || !$has_compression)
+					echo $final;
+				else
+					echo gzinflate($final);
+			}
+		}
+		
+		// Read the binary file (PNG, OGA and others)
+		else
+			readfile($path);
+		
+		exit;
+	}
+	
+	// The file was not found
+	header('Status: 404 Not Found', true, 404);
+	exit('HTTP/1.1 404 Not Found');
+}
+
+// The request is not correct
+header('Status: 400 Bad Request', true, 400);
+exit('HTTP/1.1 400 Bad Request');
+
+?>
diff --git a/jappixmini/jappix/php/gettext.php b/jappixmini/jappix/php/gettext.php
new file mode 100644
index 00000000..f04b77d0
--- /dev/null
+++ b/jappixmini/jappix/php/gettext.php
@@ -0,0 +1,949 @@
+<?php
+
+/*
+   Copyright (c) 2003, 2005, 2006, 2009 Danilo Segan <danilo@kvota.net>.
+
+   This file is part of PHP-gettext.
+
+   PHP-gettext is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   PHP-gettext is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with PHP-gettext; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+*/
+
+/**
+ * MODIFIED FOR THE JAPPIX PROJECT
+ * Last revision: 10/11/10
+ */
+
+  // Simple class to wrap file streams, string streams, etc.
+  // seek is essential, and it should be byte stream
+class StreamReader {
+  // should return a string [FIXME: perhaps return array of bytes?]
+  function read($bytes) {
+    return false;
+  }
+
+  // should return new position
+  function seekto($position) {
+    return false;
+  }
+
+  // returns current position
+  function currentpos() {
+    return false;
+  }
+
+  // returns length of entire stream (limit for seekto()s)
+  function length() {
+    return false;
+  }
+};
+
+class StringReader {
+  var $_pos;
+  var $_str;
+
+  function StringReader($str='') {
+    $this->_str = $str;
+    $this->_pos = 0;
+  }
+
+  function read($bytes) {
+    $data = substr($this->_str, $this->_pos, $bytes);
+    $this->_pos += $bytes;
+    if (strlen($this->_str)<$this->_pos)
+      $this->_pos = strlen($this->_str);
+
+    return $data;
+  }
+
+  function seekto($pos) {
+    $this->_pos = $pos;
+    if (strlen($this->_str)<$this->_pos)
+      $this->_pos = strlen($this->_str);
+    return $this->_pos;
+  }
+
+  function currentpos() {
+    return $this->_pos;
+  }
+
+  function length() {
+    return strlen($this->_str);
+  }
+
+};
+
+
+class FileReader {
+  var $_pos;
+  var $_fd;
+  var $_length;
+
+  function FileReader($filename) {
+    if (file_exists($filename)) {
+
+      $this->_length=filesize($filename);
+      $this->_pos = 0;
+      $this->_fd = fopen($filename,'rb');
+      if (!$this->_fd) {
+        $this->error = 3; // Cannot read file, probably permissions
+        return false;
+      }
+    } else {
+      $this->error = 2; // File doesn't exist
+      return false;
+    }
+  }
+
+  function read($bytes) {
+    if ($bytes) {
+      fseek($this->_fd, $this->_pos);
+
+      // PHP 5.1.1 does not read more than 8192 bytes in one fread()
+      // the discussions at PHP Bugs suggest it's the intended behaviour
+      $data = '';
+      while ($bytes > 0) {
+        $chunk  = fread($this->_fd, $bytes);
+        $data  .= $chunk;
+        $bytes -= strlen($chunk);
+      }
+      $this->_pos = ftell($this->_fd);
+
+      return $data;
+    } else return '';
+  }
+
+  function seekto($pos) {
+    fseek($this->_fd, $pos);
+    $this->_pos = ftell($this->_fd);
+    return $this->_pos;
+  }
+
+  function currentpos() {
+    return $this->_pos;
+  }
+
+  function length() {
+    return $this->_length;
+  }
+
+  function close() {
+    fclose($this->_fd);
+  }
+
+};
+
+// Preloads entire file in memory first, then creates a StringReader
+// over it (it assumes knowledge of StringReader internals)
+class CachedFileReader extends StringReader {
+  function CachedFileReader($filename) {
+    if (file_exists($filename)) {
+
+      $length=filesize($filename);
+      $fd = fopen($filename,'rb');
+
+      if (!$fd) {
+        $this->error = 3; // Cannot read file, probably permissions
+        return false;
+      }
+      $this->_str = fread($fd, $length);
+      fclose($fd);
+
+    } else {
+      $this->error = 2; // File doesn't exist
+      return false;
+    }
+  }
+};
+
+/*
+   Copyright (c) 2003, 2009 Danilo Segan <danilo@kvota.net>.
+   Copyright (c) 2005 Nico Kaiser <nico@siriux.net>
+
+   This file is part of PHP-gettext.
+
+   PHP-gettext is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   PHP-gettext is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with PHP-gettext; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+*/
+
+/**
+ * Provides a simple gettext replacement that works independently from
+ * the system's gettext abilities.
+ * It can read MO files and use them for translating strings.
+ * The files are passed to gettext_reader as a Stream (see streams.php)
+ *
+ * This version has the ability to cache all strings and translations to
+ * speed up the string lookup.
+ * While the cache is enabled by default, it can be switched off with the
+ * second parameter in the constructor (e.g. whenusing very large MO files
+ * that you don't want to keep in memory)
+ */
+class gettext_reader {
+  //public:
+   var $error = 0; // public variable that holds error code (0 if no error)
+
+   //private:
+  var $BYTEORDER = 0;        // 0: low endian, 1: big endian
+  var $STREAM = NULL;
+  var $short_circuit = false;
+  var $enable_cache = false;
+  var $originals = NULL;      // offset of original table
+  var $translations = NULL;    // offset of translation table
+  var $pluralheader = NULL;    // cache header field for plural forms
+  var $total = 0;          // total string count
+  var $table_originals = NULL;  // table for original strings (offsets)
+  var $table_translations = NULL;  // table for translated strings (offsets)
+  var $cache_translations = NULL;  // original -> translation mapping
+
+
+  /* Methods */
+
+
+  /**
+   * Reads a 32bit Integer from the Stream
+   *
+   * @access private
+   * @return Integer from the Stream
+   */
+  function readint() {
+      if ($this->BYTEORDER == 0) {
+        // low endian
+        $input=unpack('V', $this->STREAM->read(4));
+        return array_shift($input);
+      } else {
+        // big endian
+        $input=unpack('N', $this->STREAM->read(4));
+        return array_shift($input);
+      }
+    }
+
+  function read($bytes) {
+    return $this->STREAM->read($bytes);
+  }
+
+  /**
+   * Reads an array of Integers from the Stream
+   *
+   * @param int count How many elements should be read
+   * @return Array of Integers
+   */
+  function readintarray($count) {
+    if ($this->BYTEORDER == 0) {
+        // low endian
+        return unpack('V'.$count, $this->STREAM->read(4 * $count));
+      } else {
+        // big endian
+        return unpack('N'.$count, $this->STREAM->read(4 * $count));
+      }
+  }
+
+  /**
+   * Constructor
+   *
+   * @param object Reader the StreamReader object
+   * @param boolean enable_cache Enable or disable caching of strings (default on)
+   */
+  function gettext_reader($Reader, $enable_cache = true) {
+    // If there isn't a StreamReader, turn on short circuit mode.
+    if (! $Reader || isset($Reader->error) ) {
+      $this->short_circuit = true;
+      return;
+    }
+
+    // Caching can be turned off
+    $this->enable_cache = $enable_cache;
+
+    $MAGIC1 = "\x95\x04\x12\xde";
+    $MAGIC2 = "\xde\x12\x04\x95";
+
+    $this->STREAM = $Reader;
+    $magic = $this->read(4);
+    if ($magic == $MAGIC1) {
+      $this->BYTEORDER = 1;
+    } elseif ($magic == $MAGIC2) {
+      $this->BYTEORDER = 0;
+    } else {
+      $this->error = 1; // not MO file
+      return false;
+    }
+
+    // FIXME: Do we care about revision? We should.
+    $revision = $this->readint();
+
+    $this->total = $this->readint();
+    $this->originals = $this->readint();
+    $this->translations = $this->readint();
+  }
+
+  /**
+   * Loads the translation tables from the MO file into the cache
+   * If caching is enabled, also loads all strings into a cache
+   * to speed up translation lookups
+   * 
+   * @access private
+   */
+  function load_tables() {
+    if (is_array($this->cache_translations) &&
+      is_array($this->table_originals) &&
+      is_array($this->table_translations))
+      return;
+
+    /* get original and translations tables */
+    $this->STREAM->seekto($this->originals);
+    $this->table_originals = $this->readintarray($this->total * 2);
+    $this->STREAM->seekto($this->translations);
+    $this->table_translations = $this->readintarray($this->total * 2);
+
+    if ($this->enable_cache) {
+      $this->cache_translations = array ();
+      /* read all strings in the cache */
+      for ($i = 0; $i < $this->total; $i++) {
+        $this->STREAM->seekto($this->table_originals[$i * 2 + 2]);
+        $original = $this->STREAM->read($this->table_originals[$i * 2 + 1]);
+        $this->STREAM->seekto($this->table_translations[$i * 2 + 2]);
+        $translation = $this->STREAM->read($this->table_translations[$i * 2 + 1]);
+        $this->cache_translations[$original] = $translation;
+      }
+    }
+  }
+
+  /**
+   * Returns a string from the "originals" table
+   *
+   * @access private
+   * @param int num Offset number of original string
+   * @return string Requested string if found, otherwise ''
+   */
+  function get_original_string($num) {
+    $length = $this->table_originals[$num * 2 + 1];
+    $offset = $this->table_originals[$num * 2 + 2];
+    if (! $length)
+      return '';
+    $this->STREAM->seekto($offset);
+    $data = $this->STREAM->read($length);
+    return (string)$data;
+  }
+
+  /**
+   * Returns a string from the "translations" table
+   *
+   * @access private
+   * @param int num Offset number of original string
+   * @return string Requested string if found, otherwise ''
+   */
+  function get_translation_string($num) {
+    $length = $this->table_translations[$num * 2 + 1];
+    $offset = $this->table_translations[$num * 2 + 2];
+    if (! $length)
+      return '';
+    $this->STREAM->seekto($offset);
+    $data = $this->STREAM->read($length);
+    return (string)$data;
+  }
+
+  /**
+   * Binary search for string
+   *
+   * @access private
+   * @param string string
+   * @param int start (internally used in recursive function)
+   * @param int end (internally used in recursive function)
+   * @return int string number (offset in originals table)
+   */
+  function find_string($string, $start = -1, $end = -1) {
+    if (($start == -1) or ($end == -1)) {
+      // find_string is called with only one parameter, set start end end
+      $start = 0;
+      $end = $this->total;
+    }
+    if (abs($start - $end) <= 1) {
+      // We're done, now we either found the string, or it doesn't exist
+      $txt = $this->get_original_string($start);
+      if ($string == $txt)
+        return $start;
+      else
+        return -1;
+    } else if ($start > $end) {
+      // start > end -> turn around and start over
+      return $this->find_string($string, $end, $start);
+    } else {
+      // Divide table in two parts
+      $half = (int)(($start + $end) / 2);
+      $cmp = strcmp($string, $this->get_original_string($half));
+      if ($cmp == 0)
+        // string is exactly in the middle => return it
+        return $half;
+      else if ($cmp < 0)
+        // The string is in the upper half
+        return $this->find_string($string, $start, $half);
+      else
+        // The string is in the lower half
+        return $this->find_string($string, $half, $end);
+    }
+  }
+
+  /**
+   * Translates a string
+   *
+   * @access public
+   * @param string string to be translated
+   * @return string translated string (or original, if not found)
+   */
+  function translate($string) {
+    if ($this->short_circuit)
+      return $string;
+    $this->load_tables();
+
+    if ($this->enable_cache) {
+      // Caching enabled, get translated string from cache
+      if (array_key_exists($string, $this->cache_translations))
+        return $this->cache_translations[$string];
+      else
+        return $string;
+    } else {
+      // Caching not enabled, try to find string
+      $num = $this->find_string($string);
+      if ($num == -1)
+        return $string;
+      else
+        return $this->get_translation_string($num);
+    }
+  }
+
+  /**
+   * Sanitize plural form expression for use in PHP eval call.
+   *
+   * @access private
+   * @return string sanitized plural form expression
+   */
+  function sanitize_plural_expression($expr) {
+    // Get rid of disallowed characters.
+    $expr = preg_replace('@[^a-zA-Z0-9_:;\(\)\?\|\&=!<>+*/\%-]@', '', $expr);
+
+    // Add parenthesis for tertiary '?' operator.
+    $expr .= ';';
+    $res = '';
+    $p = 0;
+    for ($i = 0; $i < strlen($expr); $i++) {
+      $ch = $expr[$i];
+      switch ($ch) {
+      case '?':
+        $res .= ' ? (';
+        $p++;
+        break;
+      case ':':
+        $res .= ') : (';
+        break;
+      case ';':
+        $res .= str_repeat( ')', $p) . ';';
+        $p = 0;
+        break;
+      default:
+        $res .= $ch;
+      }
+    }
+    return $res;
+  }
+
+  /**
+   * Get possible plural forms from MO header
+   *
+   * @access private
+   * @return string plural form header
+   */
+  function get_plural_forms() {
+    // lets assume message number 0 is header
+    // this is true, right?
+    $this->load_tables();
+
+    // cache header field for plural forms
+    if (! is_string($this->pluralheader)) {
+      if ($this->enable_cache) {
+        $header = $this->cache_translations[""];
+      } else {
+        $header = $this->get_translation_string(0);
+      }
+      if (eregi("plural-forms: ([^\n]*)\n", $header, $regs))
+        $expr = $regs[1];
+      else
+        $expr = "nplurals=2; plural=n == 1 ? 0 : 1;";
+
+      $this->pluralheader = $this->sanitize_plural_expression($expr);
+    }
+    return $this->pluralheader;
+  }
+
+  /**
+   * Detects which plural form to take
+   *
+   * @access private
+   * @param n count
+   * @return int array index of the right plural form
+   */
+  function select_string($n) {
+    $string = $this->get_plural_forms();
+    $string = str_replace('nplurals',"\$total",$string);
+    $string = str_replace("n",$n,$string);
+    $string = str_replace('plural',"\$plural",$string);
+
+    $total = 0;
+    $plural = 0;
+
+    eval("$string");
+    if ($plural >= $total) $plural = $total - 1;
+    return $plural;
+  }
+
+  /**
+   * Plural version of gettext
+   *
+   * @access public
+   * @param string single
+   * @param string plural
+   * @param string number
+   * @return translated plural form
+   */
+  function ngettext($single, $plural, $number) {
+    if ($this->short_circuit) {
+      if ($number != 1)
+        return $plural;
+      else
+        return $single;
+    }
+
+    // find out the appropriate form
+    $select = $this->select_string($number);
+
+    // this should contains all strings separated by NULLs
+    $key = $single.chr(0).$plural;
+
+
+    if ($this->enable_cache) {
+      if (! array_key_exists($key, $this->cache_translations)) {
+        return ($number != 1) ? $plural : $single;
+      } else {
+        $result = $this->cache_translations[$key];
+        $list = explode(chr(0), $result);
+        return $list[$select];
+      }
+    } else {
+      $num = $this->find_string($key);
+      if ($num == -1) {
+        return ($number != 1) ? $plural : $single;
+      } else {
+        $result = $this->get_translation_string($num);
+        $list = explode(chr(0), $result);
+        return $list[$select];
+      }
+    }
+  }
+
+}
+
+/*
+   Copyright (c) 2005 Steven Armstrong <sa at c-area dot ch>
+   Copyright (c) 2009 Danilo Segan <danilo@kvota.net>
+
+   Drop in replacement for native gettext.
+
+   This file is part of PHP-gettext.
+
+   PHP-gettext is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   PHP-gettext is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with PHP-gettext; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+*/
+/*
+LC_CTYPE        0
+LC_NUMERIC      1
+LC_TIME         2
+LC_COLLATE      3
+LC_MONETARY     4
+LC_MESSAGES     5
+LC_ALL          6
+*/
+
+
+// LC_MESSAGES is not available if php-gettext is not loaded
+// while the other constants are already available from session extension.
+if (!defined('LC_MESSAGES')) {
+  define('LC_MESSAGES',	5);
+}
+
+// Variables
+
+global $text_domains, $default_domain, $LC_CATEGORIES, $EMULATEGETTEXT, $CURRENTLOCALE;
+$text_domains = array();
+$default_domain = 'messages';
+$LC_CATEGORIES = array('LC_CTYPE', 'LC_NUMERIC', 'LC_TIME', 'LC_COLLATE', 'LC_MONETARY', 'LC_MESSAGES', 'LC_ALL');
+$EMULATEGETTEXT = 0;
+$CURRENTLOCALE = '';
+
+/* Class to hold a single domain included in $text_domains. */
+class domain {
+  var $l10n;
+  var $path;
+  var $codeset;
+}
+
+// Utility functions
+
+/**
+ * Utility function to get a StreamReader for the given text domain.
+ */
+function _get_reader($domain=null, $category=5, $enable_cache=true) {
+    global $text_domains, $default_domain, $LC_CATEGORIES;
+    if (!isset($domain)) $domain = $default_domain;
+    if (!isset($text_domains[$domain]->l10n)) {
+        // get the current locale
+        $locale = _setlocale(LC_MESSAGES, 0);
+        $bound_path = isset($text_domains[$domain]->path) ?
+          $text_domains[$domain]->path : './';
+        $subpath = $LC_CATEGORIES[$category] ."/$domain.mo";
+        /* Figure out all possible locale names and start with the most
+           specific ones.  I.e. for sr_CS.UTF-8@latin, look through all of
+           sr_CS.UTF-8@latin, sr_CS@latin, sr@latin, sr_CS.UTF-8, sr_CS, sr.
+        */
+        $locale_names = array();
+        if (preg_match("/([a-z]{2,3})"            // language code
+                       ."(_([A-Z]{2}))?"          // country code
+                       ."(\.([-A-Za-z0-9_]))?"    // charset
+                       ."(@([-A-Za-z0-9_]+))?/",  // @ modifier
+                       $locale, $matches)) {
+          
+          $lang = '';
+          $country = '';
+          $charset = '';
+          $modifier = '';
+          
+          if(isset($matches[1]))
+             $lang = $matches[1];
+          if(isset($matches[3]))
+             $country = $matches[3];
+          if(isset($matches[5]))
+             $charset = $matches[5];
+          if(isset($matches[7]))
+             $modifier = $matches[7];
+          
+          if ($modifier) {
+            $locale_names = array("${lang}_$country.$charset@$modifier",
+                                  "${lang}_$country@$modifier",
+                                  "$lang@$modifier");
+          }
+          array_push($locale_names,
+                     "${lang}_$country.$charset", "${lang}_$country", "$lang");
+        }
+        array_push($locale_names, $locale);
+
+        $input = null;
+        foreach ($locale_names as $locale) {
+          $full_path = $bound_path . $locale . "/" . $subpath;
+          if (file_exists($full_path)) {
+            $input = new FileReader($full_path);
+            break;
+          }
+        }
+
+        if (!array_key_exists($domain, $text_domains)) {
+          // Initialize an empty domain object.
+          $text_domains[$domain] = new domain();
+        }
+        $text_domains[$domain]->l10n = new gettext_reader($input,
+                                                          $enable_cache);
+    }
+    return $text_domains[$domain]->l10n;
+}
+
+/**
+ * Returns whether we are using our emulated gettext API or PHP built-in one.
+ */
+function locale_emulation() {
+    global $EMULATEGETTEXT;
+    return $EMULATEGETTEXT;
+}
+
+/**
+ * Checks if the current locale is supported on this system.
+ */
+function _check_locale() {
+    global $EMULATEGETTEXT;
+    return !$EMULATEGETTEXT;
+}
+
+/**
+ * Get the codeset for the given domain.
+ */
+function _get_codeset($domain=null) {
+    global $text_domains, $default_domain, $LC_CATEGORIES;
+    if (!isset($domain)) $domain = $default_domain;
+    return (isset($text_domains[$domain]->codeset))? $text_domains[$domain]->codeset : ini_get('mbstring.internal_encoding');
+}
+
+/**
+ * Convert the given string to the encoding set by bind_textdomain_codeset.
+ */
+function _encode($text) {
+    $source_encoding = mb_detect_encoding($text);
+    $target_encoding = _get_codeset();
+    if ($source_encoding != $target_encoding) {
+        return mb_convert_encoding($text, $target_encoding, $source_encoding);
+    }
+    else {
+        return $text;
+    }
+}
+
+
+
+
+// Custom implementation of the standard gettext related functions
+
+/**
+ * Sets a requested locale, if needed emulates it.
+ */
+function _setlocale($category, $locale) {
+    global $CURRENTLOCALE, $EMULATEGETTEXT;
+    if ($locale === 0) { // use === to differentiate between string "0"
+        if ($CURRENTLOCALE != '')
+            return $CURRENTLOCALE;
+        else
+            // obey LANG variable, maybe extend to support all of LC_* vars
+            // even if we tried to read locale without setting it first
+            return _setlocale($category, $CURRENTLOCALE);
+    } else {
+        $ret = 0;
+        if (function_exists('setlocale')) // I don't know if this ever happens ;)
+           $ret = setlocale($category, $locale);
+        if (($ret and $locale == '') or ($ret == $locale)) {
+            $EMULATEGETTEXT = 0;
+            $CURRENTLOCALE = $ret;
+        } else {
+          if ($locale == '') // emulate variable support
+             $CURRENTLOCALE = getenv('LANG');
+        else
+            $CURRENTLOCALE = $locale;
+            $EMULATEGETTEXT = 1;
+        }
+        // Allow locale to be changed on the go for one translation domain.
+        global $text_domains, $default_domain;
+        unset($text_domains[$default_domain]->l10n);
+        return $CURRENTLOCALE;
+    }
+}
+
+/**
+ * Sets the path for a domain.
+ */
+function _bindtextdomain($domain, $path) {
+    global $text_domains;
+    // ensure $path ends with a slash ('/' should work for both, but lets still play nice)
+    if (substr(php_uname(), 0, 7) == "Windows") {
+      if ($path[strlen($path)-1] != '\\' and $path[strlen($path)-1] != '/')
+        $path .= '\\';
+    } else {
+      if ($path[strlen($path)-1] != '/')
+        $path .= '/';
+    }
+    if (!array_key_exists($domain, $text_domains)) {
+      // Initialize an empty domain object.
+      $text_domains[$domain] = new domain();
+    }
+    $text_domains[$domain]->path = $path;
+}
+
+/**
+ * Specify the character encoding in which the messages from the DOMAIN message catalog will be returned.
+ */
+function _bind_textdomain_codeset($domain, $codeset) {
+    global $text_domains;
+    $text_domains[$domain]->codeset = $codeset;
+}
+
+/**
+ * Sets the default domain.
+ */
+function _textdomain($domain) {
+    global $default_domain;
+    $default_domain = $domain;
+}
+
+/**
+ * Lookup a message in the current domain.
+ */
+function _gettext($msgid) {
+    $l10n = _get_reader();
+    //return $l10n->translate($msgid);
+    return _encode($l10n->translate($msgid));
+}
+/**
+ * Alias for gettext.
+ */
+function __($msgid) {
+    return _gettext($msgid);
+}
+/**
+ * Plural version of gettext.
+ */
+function _ngettext($single, $plural, $number) {
+    $l10n = _get_reader();
+    //return $l10n->ngettext($single, $plural, $number);
+    return _encode($l10n->ngettext($single, $plural, $number));
+}
+
+/**
+ * Override the current domain.
+ */
+function _dgettext($domain, $msgid) {
+    $l10n = _get_reader($domain);
+    //return $l10n->translate($msgid);
+    return _encode($l10n->translate($msgid));
+}
+/**
+ * Plural version of dgettext.
+ */
+function _dngettext($domain, $single, $plural, $number) {
+    $l10n = _get_reader($domain);
+    //return $l10n->ngettext($single, $plural, $number);
+    return _encode($l10n->ngettext($single, $plural, $number));
+}
+
+/**
+ * Overrides the domain and category for a single lookup.
+ */
+function _dcgettext($domain, $msgid, $category) {
+    $l10n = _get_reader($domain, $category);
+    //return $l10n->translate($msgid);
+    return _encode($l10n->translate($msgid));
+}
+/**
+ * Plural version of dcgettext.
+ */
+function _dcngettext($domain, $single, $plural, $number, $category) {
+    $l10n = _get_reader($domain, $category);
+    //return $l10n->ngettext($single, $plural, $number);
+    return _encode($l10n->ngettext($single, $plural, $number));
+}
+
+
+
+// Wrappers to use if the standard gettext functions are available, but the current locale is not supported by the system.
+// Use the standard impl if the current locale is supported, use the custom impl otherwise.
+
+function T_setlocale($category, $locale) {
+    return _setlocale($category, $locale);
+}
+
+function T_bindtextdomain($domain, $path) {
+    if (_check_locale()) return bindtextdomain($domain, $path);
+    else return _bindtextdomain($domain, $path);
+}
+function T_bind_textdomain_codeset($domain, $codeset) {
+    // bind_textdomain_codeset is available only in PHP 4.2.0+
+    if (_check_locale() and function_exists('bind_textdomain_codeset')) return bind_textdomain_codeset($domain, $codeset);
+    else return _bind_textdomain_codeset($domain, $codeset);
+}
+function T_textdomain($domain) {
+    if (_check_locale()) return textdomain($domain);
+    else return _textdomain($domain);
+}
+function T_gettext($msgid) {
+    if (_check_locale()) return gettext($msgid);
+    else return _gettext($msgid);
+}
+function T_($msgid) {
+    if (_check_locale()) return _($msgid);
+    return __($msgid);
+}
+function T_ngettext($single, $plural, $number) {
+    if (_check_locale()) return ngettext($single, $plural, $number);
+    else return _ngettext($single, $plural, $number);
+}
+function T_dgettext($domain, $msgid) {
+    if (_check_locale()) return dgettext($domain, $msgid);
+    else return _dgettext($domain, $msgid);
+}
+function T_dngettext($domain, $single, $plural, $number) {
+    if (_check_locale()) return dngettext($domain, $single, $plural, $number);
+    else return _dngettext($domain, $single, $plural, $number);
+}
+function T_dcgettext($domain, $msgid, $category) {
+    if (_check_locale()) return dcgettext($domain, $msgid, $category);
+    else return _dcgettext($domain, $msgid, $category);
+}
+function T_dcngettext($domain, $single, $plural, $number, $category) {
+    if (_check_locale()) return dcngettext($domain, $single, $plural, $number, $category);
+    else return _dcngettext($domain, $single, $plural, $number, $category);
+}
+
+
+
+// Wrappers used as a drop in replacement for the standard gettext functions
+
+if (!function_exists('gettext')) {
+    function bindtextdomain($domain, $path) {
+        return _bindtextdomain($domain, $path);
+    }
+    function bind_textdomain_codeset($domain, $codeset) {
+        return _bind_textdomain_codeset($domain, $codeset);
+    }
+    function textdomain($domain) {
+        return _textdomain($domain);
+    }
+    function gettext($msgid) {
+        return _gettext($msgid);
+    }
+    function _($msgid) {
+        return __($msgid);
+    }
+    function ngettext($single, $plural, $number) {
+        return _ngettext($single, $plural, $number);
+    }
+    function dgettext($domain, $msgid) {
+        return _dgettext($domain, $msgid);
+    }
+    function dngettext($domain, $single, $plural, $number) {
+        return _dngettext($domain, $single, $plural, $number);
+    }
+    function dcgettext($domain, $msgid, $category) {
+        return _dcgettext($domain, $msgid, $category);
+    }
+    function dcngettext($domain, $single, $plural, $number, $category) {
+        return _dcngettext($domain, $single, $plural, $number, $category);
+    }
+}
+
+?>
diff --git a/jappixmini/jappix/php/install.php b/jappixmini/jappix/php/install.php
new file mode 100644
index 00000000..9cce2713
--- /dev/null
+++ b/jappixmini/jappix/php/install.php
@@ -0,0 +1,289 @@
+<?php
+
+/*
+
+Jappix - An open social platform
+This is the Jappix Install PHP/HTML code
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 25/08/11
+
+*/
+
+// Someone is trying to hack us?
+if(!defined('JAPPIX_BASE'))
+	exit;
+
+// Define the configuration folder
+$conf_folder = JAPPIX_BASE.'/store/conf';
+
+// Initialize the step
+$step = 1;
+
+// Initialize some vars
+$form_parent = 'install';
+$user_name = '';
+$user_password = '';
+$valid_user = true;
+
+if(isset($_POST['step']) && !empty($_POST['step'])) {
+	$step = intval($_POST['step']);
+	
+	switch($step) {
+		// Administrator account configuration submitted
+		case 3:
+			include(JAPPIX_BASE.'/php/post-users.php');
+			break;
+		
+		// Main configuration submitted
+		case 4:
+			include(JAPPIX_BASE.'/php/post-main.php');
+			break;
+		
+		// Hosts configuration submitted
+		case 5:
+			include(JAPPIX_BASE.'/php/post-hosts.php');
+			break;
+	}
+}
+
+// Not frozen on the previous step?
+if(!isset($_POST['check']) && (isset($_POST['submit']) || isset($_POST['finish']))) {
+	// Checks the current step is valid
+	if(($step >= 2) && !is_dir($conf_folder))
+		$step = 2;
+	else if(($step >= 3) && !usersConfName())
+		$step = 3;
+	else if(($step >= 4) && !file_exists($conf_folder.'/main.xml'))
+		$step = 4;
+	else if(($step >= 5) && !file_exists($conf_folder.'/hosts.xml'))
+		$step = 5;
+	else
+		$step++;
+}
+
+// These steps are not available
+if(($step > 6) || !is_int($step))
+	$step = 6;
+
+// Get the current step title
+$names = array(
+	T_("Welcome"),
+	T_("Storage configuration"),
+	T_("Administrator account"),
+	T_("Main configuration"),
+	T_("Hosts configuration"),
+	T_("Services installation")
+);
+
+// Continue marker
+$continue = true;
+
+// Form action
+if($step < 6)
+	$form_action = './?m=install'.keepGet('m', false);
+else
+	$form_action = './'.keepGet('m', true);
+
+?>
+<!DOCTYPE html>
+<?php htmlTag($locale); ?>
+
+<head>
+	<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+	<meta name="robots" content="none" />
+	<title><?php _e("Jappix installation"); ?> &bull; <?php echo($names[$step - 1]); ?></title>
+	<link rel="shortcut icon" href="./favicon.ico" />
+	<?php echoGetFiles($hash, '', 'css', 'install.xml', ''); echo "\n"; ?>
+	<!--[if lt IE 9]><?php echoGetFiles($hash, '', 'css', '', 'ie.css'); ?><![endif]-->
+</head>
+
+<body class="body-images">
+	<form id="install" method="post" action="<?php echo $form_action; ?>">
+		<div id="install-top">
+			<div class="logo install-images"><?php _e("Installation"); ?></div>
+			<div class="step"><?php echo $step; ?> <span>/ 6</span></div>
+			<div class="clear"></div>
+			
+			<input type="hidden" name="step" value="<?php echo($step); ?>" />
+		</div>
+		
+		<div id="install-content">
+			<?php
+			
+			// First step: welcome
+			if($step == 1) { ?>
+				<h3 class="start install-images"><?php _e("Welcome to the Jappix installation!"); ?></h3>
+				
+				<p><?php _e("This tool will help you fastly install Jappix, the first full-featured XMPP-based social platform, on your server. You don't even need any technical knowledge."); ?></p>
+				<p><?php _e("Let's have a look at the installation steps:"); ?></p>
+				
+				<ol>
+					<li><?php _e("Welcome"); ?></li>
+					<li><?php _e("Storage configuration"); ?></li>
+					<li><?php _e("Administrator account"); ?></li>
+					<li><?php _e("Main configuration"); ?></li>
+					<li><?php _e("Hosts configuration"); ?></li>
+					<li><?php _e("Services installation"); ?></li>
+				</ol>
+				
+				<p><?php printf(T_("If the current language does not match yours (%1s), you can make Jappix speak %2s it will be saved."), getLanguageName($locale), languageSwitcher($locale)); ?></p>
+				
+				<p><?php _e("If you want to get some help about the Jappix installation and configuration, you can use our whole documentation, available at:"); ?> <a href="http://codingteam.net/project/jappix/doc" target="_blank">http://codingteam.net/project/jappix/doc</a></p>
+				
+				<p><?php _e("It's time to build your own social cloud: just go to the next step!"); ?></p>
+			<?php }
+			
+			// Second step: storage configuration
+			else if($step == 2) { ?>
+				<h3 class="storage install-images"><?php _e("Storage configuration"); ?></h3>
+				
+				<p><?php _e("Jappix stores persistent data (such as shared files, chat logs, your own music and its configuration) into a single secured storage folder."); ?></p>
+				
+				<p><?php printf(T_("Jappix must be able to write in this folder to create its sub-directories. If not, you must set the rights to %1s or change the folder owner to %2s (depending of your configuration)."), '<em>777</em>', '<em>www-data</em>'); ?></p>
+				
+				<?php if(is_writable(JAPPIX_BASE.'/store')) {
+					// Create the store tree
+					include(JAPPIX_BASE.'/php/store-tree.php');
+				?>
+					<p class="info bigspace success"><?php _e("The folder is writable, you can continue!"); ?></p>
+				<?php }
+				
+				else {
+					$continue = false;
+				?>
+					<p class="info bigspace fail"><?php printf(T_("The folder is not writable, set the right permissions to the %s directory."), "<em>./store</em>"); ?></p>
+				<?php } ?>
+			<?php }
+			
+			// Third step: administrator account
+			else if($step == 3) { ?>
+				<h3 class="account  install-images"><?php _e("Administrator account"); ?></h3>
+				
+				<p><?php _e("Jappix offers you the possibility to manage your configuration, install new addons or search for updates. That's why you must create an administrator account to access the manager."); ?></p>
+				
+				<p><?php _e("When Jappix will be installed, just click on the manager link on the home page to access it."); ?></p>
+				
+				<?php
+				
+				// Include the user add form
+				include(JAPPIX_BASE.'/php/form-users.php');
+				
+				if(!$valid_user) { ?>
+					<p class="info bigspace fail"><?php _e("Oops, you missed something or the two passwords do not match!"); ?></p>
+				<?php }
+			}
+			
+			// Fourth step: main configuration
+			else if($step == 4) { ?>
+				<h3 class="main install-images"><?php _e("Main configuration"); ?></h3>
+				
+				<p><?php _e("Jappix needs that you specify some values to work. Please correct the following inputs (or keep the default values, which are sufficient for most people)."); ?></p>
+				
+				<p><?php _e("Note that if you don't specify a value which is compulsory, it will be automatically completed with the default one."); ?></p>
+				
+				<?php
+				
+				// Define the main configuration variables
+				include(JAPPIX_BASE.'/php/vars-main.php');
+				
+				// Are we using developer mode?
+				if(preg_match('/~dev/i', $version))
+					$developer = 'on';
+				
+				// Include the main configuration form
+				include(JAPPIX_BASE.'/php/form-main.php');
+			}
+			
+			// Fifth step: hosts configuration
+			else if($step == 5) { ?>
+				<h3 class="hosts install-images"><?php _e("Hosts configuration"); ?></h3>
+				
+				<p><?php _e("This page helps you specify the default hosts Jappix will connect to. You can leave it as it is and continue if you want to use the official service hosts."); ?></p>
+				
+				<p><?php _e("Maybe you don't know what a BOSH server is? In fact, this is a relay between a Jappix client and a XMPP server, which is necessary because of technical limitations."); ?></p>
+				
+				<p><?php _e("Note that if you don't specify a value which is compulsory, it will be automatically completed with the default one."); ?></p>
+				
+				<?php
+				
+				// Define the hosts configuration variables
+				include(JAPPIX_BASE.'/php/vars-hosts.php');
+				
+				// Include the hosts configuration form
+				include(JAPPIX_BASE.'/php/form-hosts.php');
+			}
+			
+			// Last step: services installation
+			else if($step == 6) { ?>
+				<h3 class="services install-images"><?php _e("Services installation"); ?></h3>
+				
+				<p><?php _e("You can install some extra softwares on your server, to extend your Jappix features. Some others might be modified, because of security restrictions which are set by default."); ?></p>
+				<p><?php _e("To perform this, you must be able to access your server's shell and be logged in as root. Remember this is facultative, Jappix will work without these modules, but some of its features will be unavailable."); ?></p>
+				
+				<?php
+				
+				// Write the installed marker
+				writeXML('conf', 'installed', '<installed>true</installed>');
+				
+				// Checks some services are installed
+				$services_functions = array('gd_info', 'curl_init');
+				$services_names = array('GD', 'cURL');
+				$services_packages = array('php5-gd', 'php5-curl');
+				
+				for($i = 0; $i < count($services_names); $i++) {
+					$service_class = 'info smallspace';
+					
+					// First info?
+					if($i == 0)
+						$service_class .= ' first';
+					
+					// Service installed?
+					if(function_exists($services_functions[$i])) { ?>
+						<p class="<?php echo($service_class) ?> success"><?php printf(T_("%s is installed on your system."), $services_names[$i]); ?></p>
+					<?php }
+					
+					// Missing service!
+					else { ?>
+						<p class="<?php echo($service_class) ?> fail"><?php printf(T_("%1s is not installed on your system, you should install %2s."), $services_names[$i], '<em>'.$services_packages[$i].'</em>'); ?></p>
+					<?php }
+				}
+				
+				// Checks the upload size limit
+				$upload_max = uploadMaxSize();
+				$upload_human = formatBytes($upload_max);
+				
+				if($upload_max >= 7000000) { ?>
+					<p class="info smallspace last success"><?php printf(T_("PHP maximum upload size is sufficient (%s)."), $upload_human); ?></p>
+				<?php }
+				
+				else { ?>
+					<p class="info smallspace last fail"><?php printf(T_("PHP maximum upload size is not sufficient (%1s), you should define it to %2s in %3s."), $upload_human, '8M', '<em>php.ini</em>'); ?></p>
+				<?php } ?>
+				
+				<p><?php _e("After you finished the setup, Jappix will generate the cache files. It might be slow, just wait until the application is displayed and do not press any button."); ?></p>
+				
+				<p><?php _e("Thanks for using Jappix!"); ?></p>
+			<?php } ?>
+		</div>
+		
+		<div id="install-buttons">
+			<?php if($continue && ($step < 6)) { ?>
+				<input type="submit" name="submit" value="<?php _e("Next"); ?> »" />
+			<?php } if($step == 6) { ?>
+				<input type="submit" name="finish" value="<?php _e("Finish"); ?> »" />
+			<?php } if(!$continue) { ?>
+				<input type="submit" name="check" value="<?php _e("Check again"); ?>" />
+			<?php } ?>
+			
+			<div class="clear"></div>
+		</div>
+	</form>
+</body>
+
+</html>
+
+<!-- Jappix Install <?php echo $version; ?> - An open social platform -->
diff --git a/jappixmini/jappix/php/jsmin.php b/jappixmini/jappix/php/jsmin.php
new file mode 100644
index 00000000..5c3f8814
--- /dev/null
+++ b/jappixmini/jappix/php/jsmin.php
@@ -0,0 +1,375 @@
+<?php
+/**
+ * jsmin.php - PHP implementation of Douglas Crockford's JSMin.
+ *
+ * This is pretty much a direct port of jsmin.c to PHP with just a few
+ * PHP-specific performance tweaks. Also, whereas jsmin.c reads from stdin and
+ * outputs to stdout, this library accepts a string as input and returns another
+ * string as output.
+ *
+ * PHP 5 or higher is required.
+ *
+ * Permission is hereby granted to use this version of the library under the
+ * same terms as jsmin.c, which has the following license:
+ *
+ * --
+ * Copyright (c) 2002 Douglas Crockford  (www.crockford.com)
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is furnished to do
+ * so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * The Software shall be used for Good, not Evil.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ * --
+ *
+ * @package JSMin
+ * @author Ryan Grove <ryan@wonko.com>
+ * @copyright 2002 Douglas Crockford <douglas@crockford.com> (jsmin.c)
+ * @copyright 2008 Ryan Grove <ryan@wonko.com> (PHP port)
+ * @license http://opensource.org/licenses/mit-license.php MIT License
+ * @version 1.1.1 (2008-03-02)
+ * @link https://github.com/rgrove/jsmin-php/
+ */
+
+class JSMin {
+  const ORD_LF            = 10;
+  const ORD_SPACE         = 32;
+  const ACTION_KEEP_A     = 1;
+  const ACTION_DELETE_A   = 2;
+  const ACTION_DELETE_A_B = 3;
+
+  protected $a           = '';
+  protected $b           = '';
+  protected $input       = '';
+  protected $inputIndex  = 0;
+  protected $inputLength = 0;
+  protected $lookAhead   = null;
+  protected $output      = '';
+
+  // -- Public Static Methods --------------------------------------------------
+
+  /**
+   * Minify Javascript
+   *
+   * @uses __construct()
+   * @uses min()
+   * @param string $js Javascript to be minified
+   * @return string
+   */
+  public static function minify($js) {
+    $jsmin = new JSMin($js);
+    return $jsmin->min();
+  }
+
+  // -- Public Instance Methods ------------------------------------------------
+
+  /**
+   * Constructor
+   *
+   * @param string $input Javascript to be minified
+   */
+  public function __construct($input) {
+    $this->input       = str_replace("\r\n", "\n", $input);
+    $this->inputLength = strlen($this->input);
+  }
+
+  // -- Protected Instance Methods ---------------------------------------------
+
+  /**
+   * Action -- do something! What to do is determined by the $command argument.
+   *
+   * action treats a string as a single character. Wow!
+   * action recognizes a regular expression if it is preceded by ( or , or =.
+   *
+   * @uses next()
+   * @uses get()
+   * @throws JSMinException If parser errors are found:
+   *         - Unterminated string literal
+   *         - Unterminated regular expression set in regex literal
+   *         - Unterminated regular expression literal
+   * @param int $command One of class constants:
+   *      ACTION_KEEP_A      Output A. Copy B to A. Get the next B.
+   *      ACTION_DELETE_A    Copy B to A. Get the next B. (Delete A).
+   *      ACTION_DELETE_A_B  Get the next B. (Delete B).
+  */
+  protected function action($command) {
+    switch($command) {
+      case self::ACTION_KEEP_A:
+        $this->output .= $this->a;
+
+      case self::ACTION_DELETE_A:
+        $this->a = $this->b;
+
+        if ($this->a === "'" || $this->a === '"') {
+          for (;;) {
+            $this->output .= $this->a;
+            $this->a       = $this->get();
+
+            if ($this->a === $this->b) {
+              break;
+            }
+
+            if (ord($this->a) <= self::ORD_LF) {
+              throw new JSMinException('Unterminated string literal.');
+            }
+
+            if ($this->a === '\\') {
+              $this->output .= $this->a;
+              $this->a       = $this->get();
+            }
+          }
+        }
+
+      case self::ACTION_DELETE_A_B:
+        $this->b = $this->next();
+
+        if ($this->b === '/' && (
+            $this->a === '(' || $this->a === ',' || $this->a === '=' ||
+            $this->a === ':' || $this->a === '[' || $this->a === '!' ||
+            $this->a === '&' || $this->a === '|' || $this->a === '?' ||
+            $this->a === '{' || $this->a === '}' || $this->a === ';' ||
+            $this->a === "\n" )) {
+
+          $this->output .= $this->a . $this->b;
+
+          for (;;) {
+            $this->a = $this->get();
+
+            if ($this->a === '[') {
+              /*
+                inside a regex [...] set, which MAY contain a '/' itself. Example: mootools Form.Validator near line 460:
+                  return Form.Validator.getValidator('IsEmpty').test(element) || (/^(?:[a-z0-9!#$%&'*+/=?^_`{|}~-]\.?){0,63}[a-z0-9!#$%&'*+/=?^_`{|}~-]@(?:(?:[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?\.)*[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?|\[(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\])$/i).test(element.get('value'));
+              */
+              for (;;) {
+                $this->output .= $this->a;
+                $this->a = $this->get();
+
+                if ($this->a === ']') {
+                    break;
+                } elseif ($this->a === '\\') {
+                  $this->output .= $this->a;
+                  $this->a       = $this->get();
+                } elseif (ord($this->a) <= self::ORD_LF) {
+                  throw new JSMinException('Unterminated regular expression set in regex literal.');
+                }
+              }
+            } elseif ($this->a === '/') {
+              break;
+            } elseif ($this->a === '\\') {
+              $this->output .= $this->a;
+              $this->a       = $this->get();
+            } elseif (ord($this->a) <= self::ORD_LF) {
+              throw new JSMinException('Unterminated regular expression literal.');
+            }
+
+            $this->output .= $this->a;
+          }
+
+          $this->b = $this->next();
+        }
+    }
+  }
+
+  /**
+   * Get next char. Convert ctrl char to space.
+   *
+   * @return string|null
+   */
+  protected function get() {
+    $c = $this->lookAhead;
+    $this->lookAhead = null;
+
+    if ($c === null) {
+      if ($this->inputIndex < $this->inputLength) {
+        $c = substr($this->input, $this->inputIndex, 1);
+        $this->inputIndex += 1;
+      } else {
+        $c = null;
+      }
+    }
+
+    if ($c === "\r") {
+      return "\n";
+    }
+
+    if ($c === null || $c === "\n" || ord($c) >= self::ORD_SPACE) {
+      return $c;
+    }
+
+    return ' ';
+  }
+
+  /**
+   * Is $c a letter, digit, underscore, dollar sign, or non-ASCII character.
+   *
+   * @return bool
+   */
+  protected function isAlphaNum($c) {
+    return ord($c) > 126 || $c === '\\' || preg_match('/^[\w\$]$/', $c) === 1;
+  }
+
+  /**
+   * Perform minification, return result
+   *
+   * @uses action()
+   * @uses isAlphaNum()
+   * @return string
+   */
+  protected function min() {
+    $this->a = "\n";
+    $this->action(self::ACTION_DELETE_A_B);
+
+    while ($this->a !== null) {
+      switch ($this->a) {
+        case ' ':
+          if ($this->isAlphaNum($this->b)) {
+            $this->action(self::ACTION_KEEP_A);
+          } else {
+            $this->action(self::ACTION_DELETE_A);
+          }
+          break;
+
+        case "\n":
+          switch ($this->b) {
+            case '{':
+            case '[':
+            case '(':
+            case '+':
+            case '-':
+              $this->action(self::ACTION_KEEP_A);
+              break;
+
+            case ' ':
+              $this->action(self::ACTION_DELETE_A_B);
+              break;
+
+            default:
+              if ($this->isAlphaNum($this->b)) {
+                $this->action(self::ACTION_KEEP_A);
+              }
+              else {
+                $this->action(self::ACTION_DELETE_A);
+              }
+          }
+          break;
+
+        default:
+          switch ($this->b) {
+            case ' ':
+              if ($this->isAlphaNum($this->a)) {
+                $this->action(self::ACTION_KEEP_A);
+                break;
+              }
+
+              $this->action(self::ACTION_DELETE_A_B);
+              break;
+
+            case "\n":
+              switch ($this->a) {
+                case '}':
+                case ']':
+                case ')':
+                case '+':
+                case '-':
+                case '"':
+                case "'":
+                  $this->action(self::ACTION_KEEP_A);
+                  break;
+
+                default:
+                  if ($this->isAlphaNum($this->a)) {
+                    $this->action(self::ACTION_KEEP_A);
+                  }
+                  else {
+                    $this->action(self::ACTION_DELETE_A_B);
+                  }
+              }
+              break;
+
+            default:
+              $this->action(self::ACTION_KEEP_A);
+              break;
+          }
+      }
+    }
+
+    return $this->output;
+  }
+
+  /**
+   * Get the next character, skipping over comments. peek() is used to see
+   *  if a '/' is followed by a '/' or '*'.
+   *
+   * @uses get()
+   * @uses peek()
+   * @throws JSMinException On unterminated comment.
+   * @return string
+   */
+  protected function next() {
+    $c = $this->get();
+
+    if ($c === '/') {
+      switch($this->peek()) {
+        case '/':
+          for (;;) {
+            $c = $this->get();
+
+            if (ord($c) <= self::ORD_LF) {
+              return $c;
+            }
+          }
+
+        case '*':
+          $this->get();
+
+          for (;;) {
+            switch($this->get()) {
+              case '*':
+                if ($this->peek() === '/') {
+                  $this->get();
+                  return ' ';
+                }
+                break;
+
+              case null:
+                throw new JSMinException('Unterminated comment.');
+            }
+          }
+
+        default:
+          return $c;
+      }
+    }
+
+    return $c;
+  }
+
+  /**
+   * Get next char. If is ctrl character, translate to a space or newline.
+   *
+   * @uses get()
+   * @return string|null
+   */
+  protected function peek() {
+    $this->lookAhead = $this->get();
+    return $this->lookAhead;
+  }
+}
+
+// -- Exceptions ---------------------------------------------------------------
+class JSMinException extends Exception {}
+?>
\ No newline at end of file
diff --git a/jappixmini/jappix/php/manager.php b/jappixmini/jappix/php/manager.php
new file mode 100644
index 00000000..a1c683d7
--- /dev/null
+++ b/jappixmini/jappix/php/manager.php
@@ -0,0 +1,839 @@
+<?php
+
+/*
+
+Jappix - An open social platform
+This is the Jappix Manager PHP/HTML code
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 26/08/11
+
+*/
+
+// Someone is trying to hack us?
+if(!defined('JAPPIX_BASE'))
+	exit;
+
+// Get the manager functions
+require_once(JAPPIX_BASE.'/php/functions-manager.php');
+
+// Session manager
+$id = 0;
+$login_fired = false;
+$logout_fired = false;
+$form_parent = 'manager';
+$user_password = '';
+$user_remember = '';
+$user = '';
+$password = '';
+$user_meta = T_("unknown");
+$user_name = '';
+$add_button = false;
+$remove_button = false;
+$save_button = false;
+$check_updates = false;
+
+// Start the session
+session_start();
+
+// Force the updates check?
+if(isset($_GET['p']) && ($_GET['p'] == 'check'))
+	$check_updates = true;
+
+// Login form is sent
+if(isset($_POST['login'])) {
+	// Form sent pointer
+	$login_fired = true;
+	
+	// Extract the user name
+	if(isset($_POST['admin_name']) && !empty($_POST['admin_name']))
+		$user = trim($_POST['admin_name']);
+	
+	if($user && (isset($_POST['admin_password']) && !empty($_POST['admin_password']))) {
+		// Get the password values
+		$password = genStrongHash(trim($_POST['admin_password']));
+		
+		// Write the session
+		$_SESSION['jappix_user'] = $user;
+		$_SESSION['jappix_password'] = $password;
+	}
+}
+
+// Session is set
+else if((isset($_SESSION['jappix_user']) && !empty($_SESSION['jappix_user'])) && (isset($_SESSION['jappix_password']) && !empty($_SESSION['jappix_password']))) {
+	// Form sent pointer
+	$login_fired = true;
+	
+	// Get the session values
+	$user = $_SESSION['jappix_user'];
+	$password = $_SESSION['jappix_password'];
+}
+
+// Validate the current session
+if($login_fired && isAdmin($user, $password))
+	$id = 1;
+
+// Any special page requested (and authorized)?
+if(($id != 0) && isset($_GET['a']) && !empty($_GET['a'])) {
+	// Extract the page name
+	$page_requested = $_GET['a'];
+	
+	switch($page_requested) {
+		// Logout request
+		case 'logout':
+			// Remove the session
+			unset($_SESSION['jappix_user']);
+			unset($_SESSION['jappix_password']);
+			
+			// Set a logout marker
+			$logout_fired = true;
+			
+			// Page ID
+			$id = 0;
+			
+			break;
+		
+		// Configuration request
+		case 'configuration':
+			// Allowed buttons
+			$save_button = true;
+			
+			// Page ID
+			$id = 2;
+			
+			break;
+		
+		// Hosts request
+		case 'hosts':
+			// Allowed buttons
+			$save_button = true;
+			
+			// Page ID
+			$id = 3;
+			
+			break;
+		
+		// Storage request
+		case 'storage':
+			// Allowed buttons
+			$remove_button = true;
+			
+			// Page ID
+			$id = 4;
+			
+			break;
+		
+		// Design request
+		case 'design':
+			// Allowed buttons
+			$save_button = true;
+			$remove_button = true;
+			
+			// Page ID
+			$id = 5;
+			
+			break;
+		
+		// Users request
+		case 'users':
+			// Allowed buttons
+			$add_button = true;
+			$remove_button = true;
+			
+			// Page ID
+			$id = 6;
+			
+			break;
+		
+		// Updates request
+		case 'updates':
+			// Page ID
+			$id = 7;
+			
+			break;
+		
+		// Default page when authorized (statistics)
+		default:
+			// Page ID
+			$id = 1;
+	}
+}
+
+// Page server-readable names
+$identifiers = array(
+	'login',
+	'statistics',
+	'configuration',
+	'hosts',
+	'storage',
+	'design',
+	'users',
+	'updates'
+);
+
+// Page human-readable names
+$names = array(
+	T_("Manager access"),
+	T_("Statistics"),
+	T_("Configuration"),
+	T_("Hosts"),
+	T_("Storage"),
+	T_("Design"),
+	T_("Users"),
+	T_("Updates")
+);
+
+// Any user for the meta?
+if($user && ($id != 0))
+	$user_meta = $user;
+
+// Define current page identifier & name
+$page_identifier = $identifiers[$id];
+$page_name = $names[$id];
+
+// Define the current page form action
+if($id == 0)
+	$form_action = keepGet('(m|a|p|k)', false);
+else
+	$form_action = keepGet('(m|p|k)', false);
+
+?>
+<!DOCTYPE html>
+<?php htmlTag($locale); ?>
+
+<head>
+	<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+	<meta name="robots" content="none" />
+	<title><?php _e("Jappix manager"); ?> &bull; <?php echo($page_name); ?></title>
+	<link rel="shortcut icon" href="./favicon.ico" />
+	<?php echoGetFiles($hash, '', 'css', 'manager.xml', ''); echo "\n"; ?>
+	<!--[if lt IE 9]><?php echoGetFiles($hash, '', 'css', '', 'ie.css'); ?><![endif]-->
+</head>
+
+<body class="body-images">
+	<form id="manager" enctype="multipart/form-data" method="post" action="./?m=manager<?php echo $form_action; ?>">
+		<div id="manager-top">
+			<div class="logo manager-images"><?php _e("Manager"); ?></div>
+			
+			<div class="meta">
+				<span><?php echo(htmlspecialchars($user_meta)); ?></span>
+				
+				<?php if($id != 0) {
+				
+					// Keep get
+					$keep_get = keepGet('(a|p|b|s|k)', false);
+				
+				?>
+					<a class="logout manager-images" href="./?a=logout<?php echo $keep_get; ?>"><?php _e("Disconnect"); ?></a>
+				<?php } ?>
+				
+				<a class="close manager-images" href="./<?php echo keepGet('(m|a|p|b|s|k)', true); ?>"><?php _e("Close"); ?></a>
+			</div>
+			
+			<div class="clear"></div>
+		</div>
+		
+		<?php if($id != 0) { ?>
+			<div id="manager-tabs">
+				<a<?php currentTab('statistics', $page_identifier); ?> href="./?a=statistics<?php echo $keep_get; ?>"><?php _e("Statistics"); ?></a>
+				<a<?php currentTab('configuration', $page_identifier); ?> href="./?a=configuration<?php echo $keep_get; ?>"><?php _e("Configuration"); ?></a>
+				<a<?php currentTab('hosts', $page_identifier); ?> href="./?a=hosts<?php echo $keep_get; ?>"><?php _e("Hosts"); ?></a>
+				<a<?php currentTab('storage', $page_identifier); ?> href="./?a=storage<?php echo $keep_get; ?>"><?php _e("Storage"); ?></a>
+				<a<?php currentTab('design', $page_identifier); ?> href="./?a=design<?php echo $keep_get; ?>"><?php _e("Design"); ?></a>
+				<a<?php currentTab('users', $page_identifier); ?> href="./?a=users<?php echo $keep_get; ?>"><?php _e("Users"); ?></a>
+				<a<?php currentTab('updates', $page_identifier); ?> class="last" href="./?a=updates<?php echo $keep_get; ?>"><?php _e("Updates"); ?></a>
+			</div>
+		<?php } ?>
+		
+		<div id="manager-content">
+			<?php
+			
+			if($id != 0) {
+				if(!storageWritable()) { ?>
+					<p class="info bottomspace fail"><?php _e("Your storage folders are not writable, please apply the good rights!"); ?></p>
+				<?php }
+				
+				if(BOSHProxy() && extension_loaded('suhosin') && (ini_get('suhosin.get.max_value_length') < 1000000)) { ?>
+					<p class="info bottomspace neutral"><?php printf(T_("%1s may cause problems to the proxy, please increase %2s value up to %3s!"), 'Suhosin', '<em>suhosin.get.max_value_length</em>', '1000000'); ?></p>
+				<?php }
+				
+				if(newUpdates($check_updates)) { ?>
+					<a class="info bottomspace neutral" href="./?a=updates<?php echo $keep_get; ?>"><?php _e("A new Jappix version is available! Check what is new and launch the update!"); ?></a>
+				<?php }
+			}
+			
+			// Authorized and statistics page requested
+			if($id == 1) { ?>
+				<h3 class="statistics manager-images"><?php _e("Statistics"); ?></h3>
+				
+				<p><?php _e("Basic statistics are processed by Jappix about some important things, you can find them below."); ?></p>
+				
+				<h4><?php _e("Access statistics"); ?></h4>
+				
+				<?php
+				
+				// Read the visits values
+				$visits = getVisits();
+				
+				?>
+				
+				<ul class="stats">
+					<li class="total"><b><?php _e("Total"); ?></b><span><?php echo $visits['total']; ?></span></li>
+					<li><b><?php _e("Daily"); ?></b><span><?php echo $visits['daily']; ?></span></li>
+					<li><b><?php _e("Weekly"); ?></b><span><?php echo $visits['weekly']; ?></span></li>
+					<li><b><?php _e("Monthly"); ?></b><span><?php echo $visits['monthly']; ?></span></li>
+					<li><b><?php _e("Yearly"); ?></b><span><?php echo $visits['yearly']; ?></span></li>
+				</ul>
+				
+				<object class="stats" type="image/svg+xml" data="./php/stats-svg.php?l=<?php echo $locale; ?>&amp;g=access"></object>
+				
+				<?php
+				
+				// Get the share stats
+				$share_stats = shareStats();
+				
+				// Any share stats to display?
+				if(count($share_stats)) { ?>
+					<h4><?php _e("Share statistics"); ?></h4>
+					
+					<ol class="stats">
+						<?php
+						
+						// Display the users who have the largest share folder
+						$share_users = largestShare($share_stats, 8);
+						
+						foreach($share_users as $current_user => $current_value)
+							echo('<li><b><a href="xmpp:'.$current_user.'">'.$current_user.'</a></b><span>'.formatBytes($current_value).'</span></li>');
+						
+						?>
+					</ol>
+					
+					<object class="stats" type="image/svg+xml" data="./php/stats-svg.php?l=<?php echo $locale; ?>&amp;g=share"></object>
+				<?php } ?>
+				
+				<h4><?php _e("Other statistics"); ?></h4>
+				
+				<ul class="stats">
+					<li class="total"><b><?php _e("Total"); ?></b><span><?php echo formatBytes(sizeDir(JAPPIX_BASE.'/store/')); ?></span></li>
+					
+					<?php
+					
+					// Append the human-readable array values
+					$others_stats = otherStats();
+					
+					foreach($others_stats as $others_name => $others_value)
+						echo('<li><b>'.$others_name.'</b><span>'.formatBytes($others_value).'</span></li>');
+					
+					?>
+				</ul>
+				
+				<object class="stats" type="image/svg+xml" data="./php/stats-svg.php?l=<?php echo $locale; ?>&amp;g=others"></object>
+			<?php }
+			
+			// Authorized and configuration page requested
+			else if($id == 2) { ?>
+				<h3 class="configuration manager-images"><?php _e("Configuration"); ?></h3>
+				
+				<p><?php _e("Change your Jappix node configuration with this tool."); ?></p>
+				
+				<p><?php _e("Note that if you don't specify a value which is compulsory, it will be automatically completed with the default one."); ?></p>
+				
+				<?php
+				
+				// Define the main configuration variables
+				include(JAPPIX_BASE.'/php/vars-main.php');
+				
+				// Read the main configuration POST
+				if(isset($_POST['save'])) {
+					include(JAPPIX_BASE.'/php/post-main.php');
+					
+					// Show a success alert
+					?>
+						<p class="info smallspace success"><?php _e("Changes saved!"); ?></p>
+					<?php
+				}
+				
+				// Include the main configuration form
+				include(JAPPIX_BASE.'/php/form-main.php');
+			}
+			
+			// Authorized and hosts page requested
+			else if($id == 3) { ?>
+				<h3 class="hosts manager-images"><?php _e("Hosts"); ?></h3>
+				
+				<p><?php _e("Change the XMPP hosts that this Jappix node serve with this tool."); ?></p>
+				
+				<p><?php _e("Maybe you don't know what a BOSH server is? In fact, this is a relay between a Jappix client and a XMPP server, which is necessary because of technical limitations."); ?></p>
+				
+				<p><?php _e("Note that if you don't specify a value which is compulsory, it will be automatically completed with the default one."); ?></p>
+				
+				<?php
+				
+				// Define the hosts configuration variables
+				include(JAPPIX_BASE.'/php/vars-hosts.php');
+				
+				// Read the hosts configuration POST
+				if(isset($_POST['save'])) {
+					include(JAPPIX_BASE.'/php/post-hosts.php');
+					
+					// Show a success alert
+					?>
+						<p class="info smallspace success"><?php _e("Changes saved!"); ?></p>
+					<?php
+				}
+				
+				// Include the hosts configuration form
+				include(JAPPIX_BASE.'/php/form-hosts.php');
+			}
+			
+			// Authorized and storage page requested
+			else if($id == 4) { ?>
+				<h3 class="storage manager-images"><?php _e("Storage"); ?></h3>
+				
+				<p><?php _e("All this Jappix node stored files can be managed with this tool: please select a sub-folder and start editing its content!"); ?></p>
+				
+				<?php
+				
+					// Include the store configuration vars
+					include(JAPPIX_BASE.'/php/vars-store.php');
+					
+					// Include the store configuration POST handler
+					include(JAPPIX_BASE.'/php/post-store.php');
+					
+					// Include the store configuration GET handler
+					include(JAPPIX_BASE.'/php/get-store.php');
+					
+				?>
+				
+				<h4><?php _e("Maintenance"); ?></h4>
+				
+				<p><?php _e("Keep your Jappix node fresh and fast, clean the storage folders regularly!"); ?></p>
+				
+				<?php
+				
+					// Keep get
+					$keep_get = keepGet('p', false);
+				
+				?>
+				
+				<ul>
+					<li class="total"><a href="./?p=everything<?php echo $keep_get; ?>"><?php _e("Clean everything"); ?></a></li>
+					<li><a href="./?p=cache<?php echo $keep_get; ?>"><?php _e("Purge cache"); ?></a></li>
+					<li><a href="./?p=logs<?php echo $keep_get; ?>"><?php _e("Purge logs"); ?></a></li>
+					<li><a href="./?p=send<?php echo $keep_get; ?>"><?php _e("Purge sent files"); ?></a></li>
+					<li><a href="./?p=updates<?php echo $keep_get; ?>"><?php _e("Purge updates"); ?></a></li>
+				</ul>
+				
+				<h4><?php _e("Share"); ?></h4>
+				
+				<p><?php _e("Stay tuned in what your users store on your server and remove undesired content with this tool."); ?></p>
+				
+				<fieldset>
+					<legend><?php _e("Browse"); ?></legend>
+					
+					<div class="browse">
+						<?php
+						
+						// List the share files
+						browseFolder($share_folder, 'share');
+						
+						?>
+					</div>
+				</fieldset>
+				
+				<h4><?php _e("Music"); ?></h4>
+				
+				<p><?php _e("Upload your music (Ogg Vorbis, MP3 or WAV) to be able to listen to it in Jappix!"); ?></p>
+				
+				<p><?php printf(T_("The file you want to upload must be smaller than %s."), formatBytes(uploadMaxSize()).''); ?></p>
+				
+				<fieldset>
+					<legend><?php _e("New"); ?></legend>
+					
+					<input type="hidden" name="MAX_FILE_SIZE" value="<?php echo(uploadMaxSize().''); ?>">
+					
+					<label for="music_title"><?php _e("Title"); ?></label><input id="music_title" class="icon manager-images" type="text" name="music_title" value="<?php echo(htmlspecialchars($music_title)); ?>" />
+					
+					<label for="music_artist"><?php _e("Artist"); ?></label><input id="music_artist" class="icon manager-images" type="text" name="music_artist" value="<?php echo(htmlspecialchars($music_artist)); ?>" />
+					
+					<label for="music_album"><?php _e("Album"); ?></label><input id="music_album" class="icon manager-images" type="text" name="music_album" value="<?php echo(htmlspecialchars($music_album)); ?>" />
+					
+					<label for="music_file"><?php _e("File"); ?></label><input id="music_file" type="file" name="music_file" accept="audio/*" />
+					<label for="music_upload"><?php _e("Upload"); ?></label><input id="music_upload" type="submit" name="upload" value="<?php _e("Upload"); ?>" />
+				</fieldset>
+				
+				<fieldset>
+					<legend><?php _e("Browse"); ?></legend>
+					
+					<div class="browse">
+						<?php
+						
+						// List the music files
+						browseFolder($music_folder, 'music');
+						
+						?>
+					</div>
+				</fieldset>
+			<?php }
+			
+			// Authorized and design page requested
+			else if($id == 5) { ?>
+				<h3 class="design manager-images"><?php _e("Design"); ?></h3>
+				
+				<p><?php _e("Jappix is fully customisable: you can change its design right here."); ?></p>
+				
+				<?php
+				
+					// Include the design configuration vars
+					include(JAPPIX_BASE.'/php/vars-design.php');
+					
+					// Include the design configuration POST handler
+					include(JAPPIX_BASE.'/php/post-design.php');
+					
+					// Include the design configuration reader
+					include(JAPPIX_BASE.'/php/read-design.php');
+					
+					// Folder view?
+					if(isset($_GET['b']) && isset($_GET['s']) && ($_GET['b'] == 'backgrounds'))
+						$backgrounds_folder = urldecode($_GET['s']);
+				
+				?>
+				
+				<h4><?php _e("Logo"); ?></h4>
+				
+				<p><?php _e("You can set your own service logo to replace the default one. Take care of the size and the main color of each logo!"); ?></p>
+				
+				<div class="sub">
+					<p><?php _e("Upload each logo with the recommended maximum pixel size."); ?></p>
+					<p><?php _e("Your logo format must be PNG. Leave a field empty and the logo will not be changed."); ?></p>					
+					
+					<label for="logo_own_1_location">Jappix Desktop, <em>311×113</em></label><?php logoFormField('1', 'desktop_home'); ?>
+					<label for="logo_own_2_location">Jappix Desktop, <em>90×25</em></label><?php logoFormField('2', 'desktop_app'); ?>
+					<label for="logo_own_3_location">Jappix Mobile, <em>83×30</em></label><?php logoFormField('3', 'mobile'); ?>
+					<label for="logo_own_4_location">Jappix Mini, <em>81×22</em></label><?php logoFormField('4', 'mini'); ?>
+					
+					<label for="logo_own_upload"><?php _e("Upload"); ?></label><input id="logo_own_upload" type="submit" name="logo_upload" value="<?php _e("Upload"); ?>" />
+					
+					<div class="clear"></div>
+				</div>
+				
+				<h4><?php _e("Background"); ?></h4>
+				
+				<p><?php _e("Change your Jappix node background with this tool. You can either set a custom color or an uploaded image. Let your creativity flow!"); ?></p>
+				
+				<label class="master" for="background_default"><input id="background_default" type="radio" name="background_type" value="default"<?php echo($background_default); ?> /><?php _e("Use default background"); ?></label>
+				
+				<?php if($backgrounds_number) { ?>
+					<label class="master" for="background_image"><input id="background_image" type="radio" name="background_type" value="image"<?php echo($background_image); ?> /><?php _e("Use your own image"); ?></label>
+				
+					<div class="sub">
+						<p><?php _e("Select a background to use and change the display options."); ?></p>
+						
+						<label for="background_image_file"><?php _e("Image"); ?></label><select id="background_image_file" name="background_image_file">
+							<?php
+							
+								// List the background files
+								foreach($backgrounds as $backgrounds_current) {
+									// Check this is the selected background
+									if($backgrounds_current == $background['image_file'])
+										$backgrounds_selected = ' selected=""';
+									else
+										$backgrounds_selected = '';
+									
+									// Encode the current background name
+									$backgrounds_current = htmlspecialchars($backgrounds_current);
+									
+									echo('<option value="'.$backgrounds_current.'"'.$backgrounds_selected.'>'.$backgrounds_current.'</option>');
+								}
+							
+							?>
+						</select>
+						
+						<label for="background_image_repeat"><?php _e("Repeat"); ?></label><select id="background_image_repeat" name="background_image_repeat">
+							<option value="no-repeat"<?php echo($background_image_repeat_no); ?>><?php _e("No"); ?></option>
+							<option value="repeat"<?php echo($background_image_repeat_all); ?>><?php _e("All"); ?></option>
+							<option value="repeat-x"<?php echo($background_image_repeat_x); ?>><?php _e("Horizontal"); ?></option>
+							<option value="repeat-y"<?php echo($background_image_repeat_y); ?>><?php _e("Vertical"); ?></option>
+						</select>
+						
+						<label for="background_image_horizontal"><?php _e("Horizontal"); ?></label><select id="background_image_horizontal" name="background_image_horizontal">
+							<option value="center"<?php echo($background_image_horizontal_center); ?>><?php _e("Center"); ?></option>
+							<option value="left"<?php echo($background_image_horizontal_left); ?>><?php _e("Left"); ?></option>
+							<option value="right"<?php echo($background_image_horizontal_right); ?>><?php _e("Right"); ?></option>
+						</select>
+						
+						<label for="background_image_vertical"><?php _e("Vertical"); ?></label><select id="background_image_vertical" name="background_image_vertical">
+							<option value="center"<?php echo($background_image_vertical_center); ?>><?php _e("Center"); ?></option>
+							<option value="top"<?php echo($background_image_vertical_top); ?>><?php _e("Top"); ?></option>
+							<option value="bottom"<?php echo($background_image_vertical_bottom); ?>><?php _e("Bottom"); ?></option>
+						</select>
+						
+						<label for="background_image_adapt"><?php _e("Adapt"); ?></label><input id="background_image_adapt" type="checkbox" name="background_image_adapt"<?php echo($background_image_adapt); ?> />
+						
+						<label for="background_image_color"><?php _e("Color"); ?></label><input id="background_image_color" class="icon manager-images" type="color" name="background_image_color" value="<?php echo(htmlspecialchars($background['image_color'])); ?>" />
+						
+						<div class="clear"></div>
+					</div>
+				<?php } ?>
+				
+				<label class="master" for="background_color"><input id="background_color" type="radio" name="background_type" value="color"<?php echo($background_color); ?> /><?php _e("Use your own color"); ?></label>
+				
+				<div class="sub">
+					<p><?php _e("Type the hexadecimal color value you want to use as a background."); ?></p>
+					
+					<label for="background_color_color"><?php _e("Color"); ?></label><input id="background_color_color" class="icon manager-images" type="color" name="background_color_color" value="<?php echo(htmlspecialchars($background['color_color'])); ?>" />
+					
+					<div class="clear"></div>
+				</div>
+				
+				<h4><?php _e("Manage backgrounds"); ?></h4>
+				
+				<p><?php _e("You can add a new background to the list with this tool. Please send a valid image."); ?></p>
+				
+				<div class="sub">
+					<p><?php printf(T_("The file you want to upload must be smaller than %s."), formatBytes(uploadMaxSize()).''); ?></p>
+					
+					<input type="hidden" name="MAX_FILE_SIZE" value="<?php echo(uploadMaxSize().''); ?>">
+					
+					<label for="background_image_location"><?php _e("File"); ?></label><input id="background_image_location" type="file" name="background_image_upload" accept="image/*" />
+					<label for="background_image_upload"><?php _e("Upload"); ?></label><input id="background_image_upload" type="submit" name="background_upload" value="<?php _e("Upload"); ?>" />
+					
+					<div class="clear"></div>
+				</div>
+				
+				<p><?php _e("If you want to remove some backgrounds, use the browser below."); ?></p>
+				
+				<fieldset>
+					<legend><?php _e("List"); ?></legend>
+					
+					<div class="browse">
+						<?php
+						
+						// List the background files
+						browseFolder($backgrounds_folder, 'backgrounds');
+						
+						?>
+					</div>
+				</fieldset>
+				
+				<h4><?php _e("Notice"); ?></h4>
+				
+				<p><?php _e("Define a homepage notice for all your users, such as a warn, an important message or an advert with this tool."); ?></p>
+				
+				<label class="master" for="notice_none"><input id="notice_none" type="radio" name="notice_type" value="none"<?php echo($notice_none); ?> /><?php _e("None"); ?></label>
+				
+				<label class="master" for="notice_simple"><input id="notice_simple" type="radio" name="notice_type" value="simple"<?php echo($notice_simple); ?> /><?php _e("Simple notice"); ?></label>
+				
+				<div class="sub">
+					<p><?php _e("This notice only needs simple text to be displayed, but no code is allowed!"); ?></p>
+				</div>
+				
+				<label class="master" for="notice_advanced"><input id="notice_advanced" type="radio" name="notice_type" value="advanced"<?php echo($notice_advanced); ?> /><?php _e("Advanced notice"); ?></label>
+				
+				<div class="sub">
+					<p><?php _e("You can customize your notice with embedded HTML, CSS and JavaScript, but you need to code the style."); ?></p>
+				</div>
+				
+				<div class="clear"></div>
+				
+				<textarea class="notice-text" name="notice_text" rows="8" cols="60"><?php echo(htmlspecialchars($notice_text)); ?></textarea>
+			<?php }
+			
+			// Authorized and users page requested
+			else if($id == 6) { ?>
+				<h3 class="users manager-images"><?php _e("Users"); ?></h3>
+				
+				<p><?php _e("You can define more than one administrator for this Jappix node. You can also change a password with this tool."); ?></p>
+				
+				<?php
+				
+				// Add an user?
+				if(isset($_POST['add'])) {
+					// Include the users POST handler
+					include(JAPPIX_BASE.'/php/post-users.php');
+					
+					if($valid_user) { ?>
+						<p class="info smallspace success"><?php _e("The user has been added!"); ?></p>
+					<?php }
+					
+					else { ?>
+						<p class="info smallspace fail"><?php _e("Oops, you missed something or the two passwords do not match!"); ?></p>
+				<?php }
+				}
+				
+				// Remove an user?
+				else if(isset($_POST['remove'])) {
+					// Initialize the match
+					$users_removed = false;
+					$users_remove = array();
+					
+					// Try to get the users to remove
+					foreach($_POST as $post_key => $post_value) {
+						// Is it an admin user?
+						if(preg_match('/^admin_(.+)$/i', $post_key)) {
+							// Update the marker
+							$users_removed = true;
+							
+							// Push the value to the global array
+							array_push($users_remove, $post_value);
+						}
+					}
+					
+					// Somebody has been removed
+					if($users_removed) {
+					
+						// Remove the users!
+						manageUsers('remove', $users_remove);
+					
+					?>
+						<p class="info smallspace success"><?php _e("The chosen users have been removed."); ?></p>
+					<?php }
+					
+					// Nobody has been removed
+					else { ?>
+						<p class="info smallspace fail"><?php _e("You must select one or more users to be removed!"); ?></p>
+				<?php }
+				} ?>
+				
+				<h4><?php _e("Add"); ?></h4>
+				
+				<p><?php _e("Add a new user with this tool, or change a password (type an existing username). Please submit a strong password!"); ?></p>
+				
+				<?php
+				
+				// Include the user add form
+				include(JAPPIX_BASE.'/php/form-users.php');
+				
+				?>
+				
+				<h4><?php _e("Manage"); ?></h4>
+				
+				<p><?php _e("Remove users with this tool. Note that you cannot remove an user if he is the only one remaining."); ?></p>
+				
+				<fieldset>
+					<legend><?php _e("List"); ?></legend>
+					
+					<div class="browse">
+						<?php
+						
+						// List the users
+						browseUsers();
+						
+						?>
+					</div>
+				</fieldset>
+			<?php }
+			
+			// Authorized and updates page requested
+			else if($id == 7) { ?>
+				<h3 class="updates manager-images"><?php _e("Updates"); ?></h3>
+				
+				<p><?php _e("Update your Jappix node with this tool, or check if a new one is available. Informations about the latest version are also displayed (in english)."); ?></p>
+				
+				<?php
+				
+				// Using developer mode (no need to update)?
+				if(isDeveloper()) { ?>
+					<h4><?php _e("Check for updates"); ?></h4>
+					
+					<p class="info smallspace neutral"><?php printf(T_("You are using a development version of Jappix. Update it through our repository by executing: %s."), '<em>svn up</em>'); ?></p>
+				<?php }
+				
+				// New updates available?
+				else if(newUpdates($check_updates)) {
+					// Get the update informations
+					$update_infos = updateInformations();
+					
+					// We can launch the update!
+					if(isset($_GET['p']) && ($_GET['p'] == 'update')) { ?>
+						<h4><?php _e("Update in progress"); ?></h4>
+						
+						<?php if(processUpdate($update_infos['url'])) { ?>
+							<p class="info smallspace success"><?php _e("Jappix has been updated: you are now running the latest version. Have fun!"); ?></p>
+						<?php } else { ?>
+							<p class="info smallspace fail"><?php _e("The update has failed! Please try again later."); ?></p>
+						<?php }
+					}
+					
+					// We just show a notice
+					else {
+				?>
+						<h4><?php _e("Available updates"); ?></h4>
+						
+						<a class="info smallspace fail" href="./?p=update<?php echo keepGet('(p|b|s)', false); ?>"><?php printf(T_("Your version is out to date. Update it now to %s by clicking here!"), '<em>'.$update_infos['id'].'</em>'); ?></a>
+						
+						<h4><?php _e("What's new?"); ?></h4>
+						
+						<div><?php echo $update_infos['description']; ?></div>
+				<?php }
+				
+				// No new update
+				} else { ?>
+					<h4><?php _e("Check for updates"); ?></h4>
+					
+					<a class="info smallspace success" href="./?p=check<?php echo keepGet('(p|b|s)', false); ?>"><?php _e("Your version seems to be up to date, but you can check updates manually by clicking here."); ?></a>
+				<?php } ?>
+			<?php }
+			
+			// Not authorized, show the login form
+			else { ?>
+				<h3 class="login manager-images"><?php _e("Manager access"); ?></h3>
+				
+				<p><?php _e("This is a restricted area: only the authorized users can manage this Jappix node."); ?></p>
+				<p><?php _e("Please use the form below to login to the administration panel."); ?></p>
+				<p><?php _e("To improve security, sessions are limited in time and when your browser will be closed, you will be logged out."); ?></p>
+				
+				<fieldset>
+					<legend><?php _e("Credentials"); ?></legend>
+					
+					<label for="admin_name"><?php _e("User"); ?></label><input id="admin_name" class="icon manager-images" type="text" name="admin_name" value="<?php echo(htmlspecialchars($user)); ?>" required="" />
+					
+					<label for="admin_password"><?php _e("Password"); ?></label><input id="admin_password" class="icon manager-images" type="password" name="admin_password" required="" />
+				</fieldset>
+				
+				<?php
+				
+				// Disconnected
+				if($logout_fired) { ?>
+					<p class="info bigspace success"><?php _e("You have been logged out. Goodbye!"); ?></p>
+				<?php }
+				
+				// Login error
+				else if($login_fired) { ?>
+					<p class="info bigspace fail"><?php _e("Oops, you could not be recognized as a valid administrator. Check your credentials!"); ?></p>
+				<?php
+				
+					// Remove the session
+					unset($_SESSION['jappix_user']);
+					unset($_SESSION['jappix_password']);
+				
+				}
+			} ?>
+			
+			<div class="clear"></div>
+		</div>
+		
+		<div id="manager-buttons">
+			<?php if($id == 0) { ?>
+				<input type="submit" name="login" value="<?php _e("Here we go!"); ?>" />
+			<?php } else { ?>
+				<?php } if($add_button) { ?>
+					<input type="submit" name="add" value="<?php _e("Add"); ?>" />
+				<?php } if($save_button) { ?>
+					<input type="submit" name="save" value="<?php _e("Save"); ?>" />
+				<?php } if($remove_button) { ?>
+					<input type="submit" name="remove" value="<?php _e("Remove"); ?>" />
+			<?php } ?>
+			
+			<div class="clear"></div>
+		</div>
+		
+	</form>
+</body>
+
+</html>
+
+<!-- Jappix Manager <?php echo $version; ?> - An open social platform -->
diff --git a/jappixmini/jappix/php/mobile-detect.php b/jappixmini/jappix/php/mobile-detect.php
new file mode 100644
index 00000000..5f2b4508
--- /dev/null
+++ b/jappixmini/jappix/php/mobile-detect.php
@@ -0,0 +1,100 @@
+<?php
+
+/**
+ * Mobile Detect
+ *
+ * @license    http://www.opensource.org/licenses/mit-license.php The MIT License
+ * @version    SVN: $Id: Mobile_Detect.php 3 2009-05-21 13:06:28Z vic.stanciu $
+ */
+
+/**
+ * MODIFIED FOR THE JAPPIX PROJECT
+ * Last revision: 20/11/10
+ *
+ * Thanks to LinkMauve for his patch!
+ */
+
+class Mobile_Detect {
+    
+    protected $accept;
+    protected $userAgent;
+    
+    protected $isMobile     = false;
+    protected $isAndroid    = null;
+    protected $isIphone     = null;
+    protected $isBlackberry = null;
+    protected $isOpera      = null;
+    protected $isPalm       = null;
+    protected $isWindows    = null;
+    protected $isGeneric    = null;
+
+    protected $devices = array(
+        "android"       => "android",
+        "blackberry"    => "blackberry",
+        "iphone"        => "(iphone|ipod)",
+        "opera"         => "opera mini",
+        "palm"          => "(avantgo|blazer|elaine|hiptop|palm|plucker|xiino)",
+        "windows"       => "windows ce; (iemobile|ppc|smartphone)",
+        "generic"       => "(kindle|mobile|mmp|midp|o2|pda|pocket|psp|symbian|smartphone|treo|up.browser|up.link|vodafone|wap)"
+    );
+
+
+    public function __construct() {
+        $this->userAgent = $_SERVER['HTTP_USER_AGENT'];
+
+	if (isset($_SERVER['HTTP_ACCEPT']))
+		$this->accept = $_SERVER['HTTP_ACCEPT'];
+	else
+		$this->accept = '';
+
+        if (isset($_SERVER['HTTP_X_WAP_PROFILE'])|| isset($_SERVER['HTTP_PROFILE'])) {
+            $this->isMobile = true;
+        } elseif (strpos($this->accept,'text/vnd.wap.wml') > 0 || strpos($this->accept,'application/vnd.wap.xhtml+xml') > 0) {
+            $this->isMobile = true;
+        } else {
+            foreach ($this->devices as $device => $regexp) {
+                if ($this->isDevice($device)) {
+                    $this->isMobile = true;
+                }
+            }
+        }
+    }
+
+
+    /**
+     * Overloads isAndroid() | isBlackberry() | isOpera() | isPalm() | isWindows() | isGeneric() through isDevice()
+     *
+     * @param string $name
+     * @param array $arguments
+     * @return bool
+     */
+    public function __call($name, $arguments) {
+        $device = substr($name, 2);
+        if ($name == "is" . ucfirst($device)) {
+            return $this->isDevice($device);
+        } else {
+            trigger_error("Method $name not defined", E_USER_ERROR);
+        }
+    }
+
+
+    /**
+     * Returns true if any type of mobile device detected, including special ones
+     * @return bool
+     */
+    public function isMobile() {
+        return $this->isMobile;
+    }
+
+
+    protected function isDevice($device) {
+        $var    = "is" . ucfirst($device);
+        $return = $this->$var === null ? (bool) preg_match("/" . $this->devices[$device] . "/i", $this->userAgent) : $this->$var;
+
+        if ($device != 'generic' && $return == true) {
+            $this->isGeneric = false;
+        }
+
+        return $return;
+    }
+}
diff --git a/jappixmini/jappix/php/mobile.php b/jappixmini/jappix/php/mobile.php
new file mode 100644
index 00000000..1f0f0fe6
--- /dev/null
+++ b/jappixmini/jappix/php/mobile.php
@@ -0,0 +1,73 @@
+<?php
+
+/*
+
+Jappix - An open social platform
+This is the Jappix Mobile PHP/HTML code
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 10/07/11
+
+*/
+
+// Someone is trying to hack us?
+if(!defined('JAPPIX_BASE'))
+	exit;
+
+?>
+
+<!DOCTYPE html>
+<?php htmlTag($locale); ?>
+
+<head>
+	<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+	<meta content="width=device-width; initial-scale=1.0; maximum-scale=1.0; user-scalable=0;" name="viewport">
+	<title><?php _e("Jappix Mobile"); ?></title>
+	<link rel="shortcut icon" href="./favicon.ico" />
+	<?php echoGetFiles($hash, '', 'css', 'mobile.xml', ''); echo "\n"; ?>
+	<?php echoGetFiles($hash, $locale, 'js', 'mobile.xml', ''); echo "\n"; ?>
+</head>
+
+<body>
+	<div id="home">
+		<div class="header">
+			<div class="mobile-images"></div>
+		</div>
+		
+		<noscript>
+			<div class="notification" id="noscript">
+				<?php _e("Please enable JavaScript"); ?>
+			</div>
+		</noscript>
+		
+		<div class="notification" id="error">
+			<?php _e("Error"); ?>
+		</div>
+		
+		<div class="notification" id="info">
+			<?php _e("Please wait..."); ?>
+		</div>
+		
+		<div class="login">
+			<?php _e("Login"); ?>
+			
+			<form action="#" method="post" onsubmit="return doLogin(this);">
+				<input class="xid mobile-images" type="text" name="xid" required="" />
+				<input class="password mobile-images" type="password" id="pwd" name="pwd" required="" />
+				<?php if(REGISTRATION != 'off') { ?>
+				<label><input class="register" type="checkbox" id="reg" name="reg" /><?php _e("Register"); ?></label>
+				<?php } ?>
+				<input type="submit" name="ok" value="<?php _e("Here we go!"); ?>" />
+			</form>
+		</div>
+		
+		<a href="./?m=desktop<?php echo keepGet('m', false); ?>"><?php _e("Desktop"); ?></a>
+	</div>
+</body>
+
+</html>
+
+<!-- Jappix Mobile <?php echo $version; ?> - An open social platform -->
diff --git a/jappixmini/jappix/php/music-search.php b/jappixmini/jappix/php/music-search.php
new file mode 100644
index 00000000..b284972b
--- /dev/null
+++ b/jappixmini/jappix/php/music-search.php
@@ -0,0 +1,103 @@
+<?php
+
+/*
+
+Jappix - An open social platform
+This is the Jappix music search script
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 15/01/12
+
+*/
+
+// PHP base
+define('JAPPIX_BASE', '..');
+
+// Get the needed files
+require_once('./functions.php');
+require_once('./read-main.php');
+require_once('./read-hosts.php');
+
+// Optimize the page rendering
+hideErrors();
+compressThis();
+
+// Not allowed for a special node
+if(isStatic() || isUpload())
+	exit;
+
+// If valid data was sent
+if((isset($_GET['searchquery']) && !empty($_GET['searchquery'])) && (isset($_GET['location']) && !empty($_GET['location']))) {
+	// Set a XML header
+	header('Content-Type: text/xml; charset=utf-8');
+	
+	// Get the values
+	$searchquery = $_GET['searchquery'];
+	$location = $_GET['location'];
+	
+	// Jamendo search?
+	if($location == 'jamendo')
+		exit(read_url('http://api.jamendo.com/get2/name+id+duration+url/track/xml/?searchquery='.urlencode($searchquery).'&order=searchweight_desc'));
+	
+	// Local music search
+	$xml = '<data>';
+	$searchquery = strtolower($searchquery);
+	
+	// Escape the regex special characters
+	$searchquery = escapeRegex($searchquery);
+	
+	// Search in the directory
+	$repertory = '../store/music/';
+	$scan = scandir($repertory);
+	
+	foreach($scan as $current) {
+		// This file match our query!
+		if(is_file($repertory.$current) && $current && preg_match('/(^|\s|\[)('.$searchquery.')(.+)?(\.(og(g|a)|mp3|wav))$/i', strtolower($current))) {
+			// Get the basic informations
+			$title = preg_replace('/^(.+)(\.)(og(g|a)|mp3|wav)$/i', '$1', $current);
+			$url = $location.'store/music/'.$current;
+			$ext = getFileExt($current);
+			$id = md5($url);
+			
+			// Get the MIME type
+			if($ext == 'mp3')
+				$type = 'audio/mpeg';
+			else if($ext == 'wav')
+				$type = 'audio/x-wav';
+			else
+				$type = 'audio/ogg';
+			
+			// Get the advanced informations
+			$locked_title = $title;
+			$artist = '';
+			$source = '';
+			
+			$title_regex = '/^(([^-]+) - )?([^\[]+)( \[(.+))?$/i';
+			$artist_regex = '/^(.+) - (.+)$/i';
+			$source_regex = '/^(.+) \[(.+)\]$/i';
+			
+			if(preg_match($title_regex, $locked_title))
+				$title = preg_replace($title_regex, '$3', $locked_title);
+			
+			if(preg_match($artist_regex, $locked_title))
+				$artist = preg_replace($artist_regex, '$1', $locked_title);
+			
+			if(preg_match($source_regex, $locked_title))
+				$source = preg_replace($source_regex, '$2', $locked_title);
+			
+			// Generate the XML
+			$xml .= '<data><track><name>'.htmlspecialchars($title).'</name><artist>'.htmlspecialchars($artist).'</artist><source>'.htmlspecialchars($source).'</source><id>'.htmlspecialchars($id).'</id><url>'.htmlspecialchars($url).'</url><type>'.$type.'</type></track></data>';
+		}
+   	}
+	
+	// End
+	$xml .= '</data>';
+	
+	// Return the path to the file
+	exit($xml);
+}
+
+?>
diff --git a/jappixmini/jappix/php/post-design.php b/jappixmini/jappix/php/post-design.php
new file mode 100644
index 00000000..030fd685
--- /dev/null
+++ b/jappixmini/jappix/php/post-design.php
@@ -0,0 +1,215 @@
+<?php
+
+/*
+
+Jappix - An open social platform
+This is the design configuration POST handler (manager)
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 25/08/11
+
+*/
+
+// Someone is trying to hack us?
+if(!defined('JAPPIX_BASE'))
+	exit;
+
+// Handle the remove GET
+if(isset($_GET['k']) && !empty($_GET['k'])) {
+	$kill_logo = JAPPIX_BASE.'/store/logos/'.$_GET['k'].'.png';
+	
+	if(isSafe($kill_logo) && file_exists($kill_logo)) {
+		unlink($kill_logo);
+		
+		echo('<p class="info smallspace success">'.T_("The selected elements have been removed.").'</p>');
+	}
+}
+
+// Handle the remove POST
+else if(isset($_POST['remove']))
+	removeElements();
+
+// Handle the logo upload POST
+else if(isset($_POST['logo_upload'])) {
+	// Avoid errors
+	$logos_arr_1_name = $logos_arr_1_tmp = $logos_arr_2_name = $logos_arr_2_tmp = $logos_arr_3_name = $logos_arr_3_tmp = $logos_arr_4_name = $logos_arr_4_tmp = '';
+	
+	if(isset($_FILES['logo_own_1_location'])) {
+		$logos_arr_1_name = $_FILES['logo_own_1_location']['name'];
+		$logos_arr_1_tmp = $_FILES['logo_own_1_location']['tmp_name'];
+	}
+	
+	if(isset($_FILES['logo_own_2_location'])) {
+		$logos_arr_2_name = $_FILES['logo_own_2_location']['name'];
+		$logos_arr_2_tmp = $_FILES['logo_own_2_location']['tmp_name'];
+	}
+	
+	if(isset($_FILES['logo_own_3_location'])) {
+		$logos_arr_3_name = $_FILES['logo_own_3_location']['name'];
+		$logos_arr_3_tmp = $_FILES['logo_own_3_location']['tmp_name'];
+	}
+	
+	if(isset($_FILES['logo_own_4_location'])) {
+		$logos_arr_4_name = $_FILES['logo_own_4_location']['name'];
+		$logos_arr_4_tmp = $_FILES['logo_own_4_location']['tmp_name'];
+	}
+	
+	// File infos array
+	$logos = array(
+		array($logos_arr_1_name, $logos_arr_1_tmp, JAPPIX_BASE.'/store/logos/desktop_home.png'),
+		array($logos_arr_2_name, $logos_arr_2_tmp, JAPPIX_BASE.'/store/logos/desktop_app.png'),
+		array($logos_arr_3_name, $logos_arr_3_tmp, JAPPIX_BASE.'/store/logos/mobile.png'),
+		array($logos_arr_4_name, $logos_arr_4_tmp, JAPPIX_BASE.'/store/logos/mini.png')
+	);
+	
+	// Check for errors
+	$logo_error = false;
+	$logo_not_png = false;
+	$logo_anything = false;
+	
+	foreach($logos as $sub_array) {
+		// Nothing?
+		if(!$sub_array[0] || !$sub_array[1])
+			continue;
+		
+		// Not an image?
+		if(getFileExt($sub_array[0]) != 'png') {
+			$logo_not_png = true;
+			
+			continue;
+		}
+		
+		// Upload error?
+		if(!move_uploaded_file($sub_array[1], $sub_array[2])) {
+			$logo_error = true;
+			
+			continue;
+		}
+		
+		$logo_anything = true;
+	}
+	
+	// Not an image?
+	if($logo_not_png) { ?>
+		<p class="info smallspace fail"><?php _e("This is not a valid image, please use the PNG format!"); ?></p>
+	<?php }
+	
+	// Upload error?
+	else if($logo_error || !$logo_anything) { ?>
+		<p class="info smallspace fail"><?php _e("The image could not be received, would you mind retry?"); ?></p>
+	<?php }
+	
+	// Everything went fine
+	else { ?>
+		<p class="info smallspace success"><?php _e("Your service logo has been successfully changed!"); ?></p>
+	<?php }
+}
+
+// Handle the background upload POST
+else if(isset($_POST['background_upload'])) {
+	// Get the file path
+	$name_background_image = $_FILES['background_image_upload']['name'];
+	$temp_background_image = $_FILES['background_image_upload']['tmp_name'];
+	$path_background_image = JAPPIX_BASE.'/store/backgrounds/'.$name_background_image;
+	
+	// An error occured?
+	if(!isSafe($name_background_image) || $_FILES['background_image_upload']['error'] || !move_uploaded_file($temp_background_image, $path_background_image)) { ?>
+	
+		<p class="info smallspace fail"><?php _e("The image could not be received, would you mind retry?"); ?></p>
+	
+	<?php }
+	
+	// Bad extension?
+	else if(!isImage($name_background_image)) {
+		// Remove the image file
+		if(file_exists($path_background_image))
+			unlink($path_background_image);	
+	?>
+	
+		<p class="info smallspace fail"><?php _e("This is not a valid image, please use PNG, GIF or JPG!"); ?></p>
+	
+	<?php }
+	
+	// The file has been sent
+	else { ?>
+	
+		<p class="info smallspace success"><?php _e("Your image was added to the list!"); ?></p>
+	
+	<?php }
+}
+
+// Handle the save POST
+else if(isset($_POST['save'])) {
+	// Marker
+	$save_marker = true;
+	
+	// Handle it for background
+	$background = array();
+	
+	if(isset($_POST['background_type']))
+		$background['type'] = $_POST['background_type'];
+	
+	if(isset($_POST['background_image_file']))
+		$background['image_file'] = $_POST['background_image_file'];
+
+	if(isset($_POST['background_image_repeat']))
+		$background['image_repeat'] = $_POST['background_image_repeat'];
+	
+	if(isset($_POST['background_image_horizontal']))
+		$background['image_horizontal'] = $_POST['background_image_horizontal'];
+	
+	if(isset($_POST['background_image_vertical']))
+		$background['image_vertical'] = $_POST['background_image_vertical'];
+	
+	if(isset($_POST['background_image_adapt']))
+		$background['image_adapt'] = 'on';
+	
+	if(isset($_POST['background_image_color']))
+		$background['image_color'] = $_POST['background_image_color'];
+	
+	if(isset($_POST['background_color_color']))
+		$background['color_color'] = $_POST['background_color_color'];
+	
+	// Write the configuration file
+	writeBackground($background);
+	
+	// Handle it for notice
+	if(isset($_POST['notice_type']))
+		$notice_type = $_POST['notice_type'];
+	else
+		$notice_type = 'none';
+	
+	$notice_text = '';
+	
+	if(isset($_POST['notice_text']))
+		$notice_text = $_POST['notice_text'];
+	
+	// Check our values
+	if(!$notice_text && ($notice_type != 'none'))
+		$save_marker = false;
+	
+	// All is okay
+	if($save_marker) {
+		// Write the notice configuration
+		writeNotice($notice_type, $notice_text);
+		
+		// Show a success notice
+		?>
+		
+			<p class="info smallspace success"><?php _e("Your design preferences have been saved!"); ?></p>
+		
+		<?php }
+		
+		// Something went wrong
+		else { ?>
+		
+			<p class="info smallspace fail"><?php _e("Please check your inputs: something is missing!"); ?></p>
+		
+		<?php
+	}
+}
+
+?>
diff --git a/jappixmini/jappix/php/post-hosts.php b/jappixmini/jappix/php/post-hosts.php
new file mode 100644
index 00000000..ad1e74fc
--- /dev/null
+++ b/jappixmini/jappix/php/post-hosts.php
@@ -0,0 +1,95 @@
+<?php
+
+/*
+
+Jappix - An open social platform
+This is the hosts configuration POST handler (install & manager)
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 27/05/11
+
+*/
+
+// Someone is trying to hack us?
+if(!defined('JAPPIX_BASE'))
+	exit;
+
+// Main host
+if(isset($_POST['host_main']) && !empty($_POST['host_main']))
+	$host_main = stripslashes(htmlspecialchars($_POST['host_main']));
+else
+	$host_main = stripslashes(htmlspecialchars($hosts_default['main']));
+
+// Groupchat host
+if(isset($_POST['host_muc']) && !empty($_POST['host_muc']))
+	$host_muc = stripslashes(htmlspecialchars($_POST['host_muc']));
+else
+	$host_muc = stripslashes(htmlspecialchars($hosts_default['muc']));
+
+// Pubsub host
+if(isset($_POST['host_pubsub']) && !empty($_POST['host_pubsub']))
+	$host_pubsub = stripslashes(htmlspecialchars($_POST['host_pubsub']));
+else
+	$host_pubsub = stripslashes(htmlspecialchars($hosts_default['pubsub']));
+
+// Directory host
+if(isset($_POST['host_vjud']) && !empty($_POST['host_vjud']))
+	$host_vjud = stripslashes(htmlspecialchars($_POST['host_vjud']));
+else
+	$host_vjud = stripslashes(htmlspecialchars($hosts_default['vjud']));
+
+// Anonymous host
+if(isset($_POST['host_anonymous']) && !empty($_POST['host_anonymous']))
+	$host_anonymous = stripslashes(htmlspecialchars($_POST['host_anonymous']));
+else
+	$host_anonymous = stripslashes(htmlspecialchars($hosts_default['anonymous']));
+
+// BOSH host
+if(isset($_POST['host_bosh']) && !empty($_POST['host_bosh']))
+	$host_bosh = stripslashes(htmlspecialchars($_POST['host_bosh']));
+else
+	$host_bosh = stripslashes(htmlspecialchars($hosts_default['bosh']));
+
+// Main BOSH host
+if(isset($_POST['host_bosh_main']) && !empty($_POST['host_bosh_main']))
+	$host_bosh_main = stripslashes(htmlspecialchars($_POST['host_bosh_main']));
+else
+	$host_bosh_main = stripslashes(htmlspecialchars($hosts_default['bosh_main']));
+
+// Mini BOSH host
+if(isset($_POST['host_bosh_mini']) && !empty($_POST['host_bosh_mini']))
+	$host_bosh_mini = stripslashes(htmlspecialchars($_POST['host_bosh_mini']));
+else
+	$host_bosh_mini = stripslashes(htmlspecialchars($hosts_default['bosh_mini']));
+
+// Static host
+if(isset($_POST['host_static']) && !empty($_POST['host_static']))
+	$host_static = stripslashes(htmlspecialchars($_POST['host_static']));
+else
+	$host_static = stripslashes(htmlspecialchars($hosts_default['static']));
+
+// Upload host
+if(isset($_POST['host_upload']) && !empty($_POST['host_upload']))
+	$host_upload = stripslashes(htmlspecialchars($_POST['host_upload']));
+else
+	$host_upload = stripslashes(htmlspecialchars($hosts_default['upload']));
+
+// Generate the hosts XML content
+$hosts_xml = 
+	'<main>'.$host_main.'</main>
+	<muc>'.$host_muc.'</muc>
+	<pubsub>'.$host_pubsub.'</pubsub>
+	<vjud>'.$host_vjud.'</vjud>
+	<anonymous>'.$host_anonymous.'</anonymous>
+	<bosh>'.$host_bosh.'</bosh>
+	<bosh_main>'.$host_bosh_main.'</bosh_main>
+	<bosh_mini>'.$host_bosh_mini.'</bosh_mini>
+	<static>'.$host_static.'</static>
+	<upload>'.$host_upload.'</upload>'
+;
+
+// Write the main configuration
+writeXML('conf', 'hosts', $hosts_xml);
diff --git a/jappixmini/jappix/php/post-main.php b/jappixmini/jappix/php/post-main.php
new file mode 100644
index 00000000..f3060ddf
--- /dev/null
+++ b/jappixmini/jappix/php/post-main.php
@@ -0,0 +1,130 @@
+<?php
+
+/*
+
+Jappix - An open social platform
+This is the main configuration POST handler (install & manager)
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 26/08/11
+
+*/
+
+// Someone is trying to hack us?
+if(!defined('JAPPIX_BASE'))
+	exit;
+
+// Service name
+if(isset($_POST['service_name']) && !empty($_POST['service_name']))
+	$service_name = stripslashes(htmlspecialchars($_POST['service_name']));
+else
+	$service_name = stripslashes(htmlspecialchars($main_default['name']));
+
+// Service description
+if(isset($_POST['service_desc']) && !empty($_POST['service_desc']))
+	$service_desc = stripslashes(htmlspecialchars($_POST['service_desc']));
+else
+	$service_desc = stripslashes(htmlspecialchars($main_default['desc']));
+
+// Jappix resource
+if(isset($_POST['jappix_resource']) && !empty($_POST['jappix_resource']))
+	$jappix_resource = stripslashes(htmlspecialchars($_POST['jappix_resource']));
+else
+	$jappix_resource = stripslashes(htmlspecialchars($main_default['resource']));
+
+// Lock host
+if(isset($_POST['lock_host']) && !empty($_POST['lock_host']))
+	$lock_host = 'on';
+else
+	$lock_host = 'off';
+
+// Anonymous mode
+if(isset($_POST['anonymous_mode']) && !empty($_POST['anonymous_mode']))
+	$anonymous_mode = 'on';
+else
+	$anonymous_mode = 'off';
+
+// Registration
+if(isset($_POST['registration']) && !empty($_POST['registration']))
+	$registration = 'on';
+else
+	$registration = 'off';
+
+// BOSH proxy
+if(isset($_POST['bosh_proxy']) && !empty($_POST['bosh_proxy']))
+	$bosh_proxy = 'on';
+else
+	$bosh_proxy = 'off';
+
+// Manager link
+if(isset($_POST['manager_link']) && !empty($_POST['manager_link']))
+	$manager_link = 'on';
+else
+	$manager_link = 'off';
+
+// Groupchats to join
+if(isset($_POST['groupchats_join']) && !empty($_POST['groupchats_join']))
+	$groupchats_join = stripslashes(htmlspecialchars(trim($_POST['groupchats_join'])));
+else
+	$groupchats_join = stripslashes(htmlspecialchars($main_default['groupchats_join']));
+
+// Encryption
+if(isset($_POST['encryption']) && !empty($_POST['encryption']))
+	$encryption = 'on';
+else
+	$encryption = 'off';
+
+// HTTPS storage
+if(isset($_POST['https_storage']) && !empty($_POST['https_storage']))
+	$https_storage = 'on';
+else
+	$https_storage = 'off';
+
+// Force HTTPS
+if(isset($_POST['https_force']) && !empty($_POST['https_force']))
+	$https_force = 'on';
+else
+	$https_force = 'off';
+
+// Compression
+if(isset($_POST['compression']) && !empty($_POST['compression']))
+	$compression = 'on';
+else
+	$compression = 'off';
+
+// Multiple resources
+if(isset($_POST['multi_files']) && ($_POST['multi_files'] == 'on'))
+	$multi_files = 'on';
+else
+	$multi_files = 'off';
+
+// Developer mode
+if(isset($_POST['developer']) && ($_POST['developer'] == 'on'))
+	$developer = 'on';
+else
+	$developer = 'off';
+
+// Generate the configuration XML content
+$conf_xml = 
+	'<name>'.$service_name.'</name>
+	<desc>'.$service_desc.'</desc>
+	<resource>'.$jappix_resource.'</resource>
+	<lock>'.$lock_host.'</lock>
+	<anonymous>'.$anonymous_mode.'</anonymous>
+	<registration>'.$registration.'</registration>
+	<bosh_proxy>'.$bosh_proxy.'</bosh_proxy>
+	<manager_link>'.$manager_link.'</manager_link>
+	<groupchats_join>'.$groupchats_join.'</groupchats_join>
+	<encryption>'.$encryption.'</encryption>
+	<https_storage>'.$https_storage.'</https_storage>
+	<https_force>'.$https_force.'</https_force>
+	<compression>'.$compression.'</compression>
+	<multi_files>'.$multi_files.'</multi_files>
+	<developer>'.$developer.'</developer>'
+;
+
+// Write the main configuration
+writeXML('conf', 'main', $conf_xml);
diff --git a/jappixmini/jappix/php/post-store.php b/jappixmini/jappix/php/post-store.php
new file mode 100644
index 00000000..abaee582
--- /dev/null
+++ b/jappixmini/jappix/php/post-store.php
@@ -0,0 +1,100 @@
+<?php
+
+/*
+
+Jappix - An open social platform
+This is the store configuration POST handler (manager)
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 28/12/10
+
+*/
+
+// Someone is trying to hack us?
+if(!defined('JAPPIX_BASE'))
+	exit;
+
+// Music upload?
+if(isset($_POST['upload'])) {
+	// Get the file path
+	$name_music = $_FILES['music_file']['name'];
+	$temp_music = $_FILES['music_file']['tmp_name'];
+	
+	// Any special name submitted?
+	if(isset($_POST['music_title']) && !empty($_POST['music_title'])) {
+		// Add a form var
+		$music_title = $_POST['music_title'];
+		
+		// Get the file extension
+		$ext_music = getFileExt($name_music);
+		
+		// New name
+		$name_music = '';
+		
+		// Add the artist name?
+		if(isset($_POST['music_artist']) && !empty($_POST['music_artist'])) {
+			// Add a form var
+			$music_artist = $_POST['music_artist'];
+			
+			// Add the current POST var to the global string
+			$name_music .= $_POST['music_artist'].' - ';
+		}
+		
+		// Add the music title
+		$name_music .= $_POST['music_title'];
+		
+		// Add the album name?
+		if(isset($_POST['music_album']) && !empty($_POST['music_album'])) {
+			// Add a form var
+			$music_album = $_POST['music_album'];
+			
+			// Add the current POST var to the global string
+			$name_music .= ' ['.$_POST['music_album'].']';
+		}
+		
+		// Add the extension
+		$name_music .= '.'.$ext_music;
+	}
+	
+	// Music path with new name
+	$path_music = JAPPIX_BASE.'/store/music/'.$name_music;
+	
+	// An error occured?
+	if(!isSafe($name_music) || $_FILES['music_file']['error'] || !move_uploaded_file($temp_music, $path_music)) { ?>
+	
+		<p class="info smallspace fail"><?php _e("The music could not be received, please retry!"); ?></p>
+	
+	<?php }
+	
+	// Bad extension?
+	else if(!preg_match('/^(.+)(\.(og(g|a)|mp3|wav))$/i', $name_music)) {
+		// Remove the image file
+		if(file_exists($path_music))
+			unlink($path_music);
+	?>
+	
+		<p class="info smallspace fail"><?php _e("This is not a valid music file, please encode in Ogg Vorbis, MP3 or WAV!"); ?></p>
+	
+	<?php }
+	
+	// The file has been sent
+	else { ?>
+	
+		<p class="info smallspace success"><?php _e("Your music has been added!"); ?></p>
+	
+	<?php
+		// Reset the form vars
+		$music_title = '';
+		$music_artist = '';
+		$music_album = '';
+	}
+}
+
+// File deletion?
+else if(isset($_POST['remove']))
+	removeElements();
+
+?>
diff --git a/jappixmini/jappix/php/post-users.php b/jappixmini/jappix/php/post-users.php
new file mode 100644
index 00000000..d217ff01
--- /dev/null
+++ b/jappixmini/jappix/php/post-users.php
@@ -0,0 +1,48 @@
+<?php
+
+/*
+
+Jappix - An open social platform
+This is the user add POST handler (install & manager)
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 28/12/10
+
+*/
+
+// Someone is trying to hack us?
+if(!defined('JAPPIX_BASE'))
+	exit;
+
+// Marker
+$valid_user = true;
+
+// Administrator name
+if(isset($_POST['user_name']) && !empty($_POST['user_name']))
+	$user_name = trim($_POST['user_name']);
+else
+	$valid_user = false;
+
+// Administrator password (first)
+if(isset($_POST['user_password']) && !empty($_POST['user_password']))
+	$user_password = trim($_POST['user_password']);
+else
+	$valid_user = false;
+
+// Administrator password (second)
+if(isset($_POST['user_repassword']) && ($user_password != $_POST['user_repassword']))
+	$valid_user = false;
+
+// Generate the users XML content
+if($valid_user) {
+	// Add our user
+	manageUsers('add', array($user_name => $user_password));
+	
+	// Reset the user name
+	$user_name = '';
+}
+
+?>
diff --git a/jappixmini/jappix/php/read-design.php b/jappixmini/jappix/php/read-design.php
new file mode 100644
index 00000000..60499a94
--- /dev/null
+++ b/jappixmini/jappix/php/read-design.php
@@ -0,0 +1,125 @@
+<?php
+
+/*
+
+Jappix - An open social platform
+This is the design configuration reader
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 28/12/10
+
+*/
+
+// Someone is trying to hack us?
+if(!defined('JAPPIX_BASE'))
+	exit;
+
+// Get the available backgrounds
+$backgrounds = getBackgrounds();
+$backgrounds_number = count($backgrounds);
+
+// Read the background configuration
+$background = readBackground();
+
+// Backgrounds are missing?
+if(!$backgrounds_number && ($background['type'] == 'image'))
+	$background['type'] = 'default';
+
+switch($background['type']) {
+	// Simple notice input
+	case 'image':
+		$background_image = ' checked=""';
+		$background_default = '';
+		
+		break;
+	
+	// Advanced notice input
+	case 'color':
+		$background_color = ' checked=""';
+		$background_default = '';
+		
+		break;
+}
+
+switch($background['image_repeat']) {
+	// No repeat
+	case 'no-repeat':
+		$background_image_repeat_no = ' selected=""';
+		$background_image_repeat_x = '';
+		
+		break;
+		
+	// Repeat
+	case 'repeat':
+		$background_image_repeat_all = ' selected=""';
+		$background_image_repeat_x = '';
+		
+		break;
+	
+	// Y repeat
+	case 'repeat-y':
+		$background_image_repeat_y = ' selected=""';
+		$background_image_repeat_x = '';
+		
+		break;
+}
+
+switch($background['image_horizontal']) {
+	// Left position
+	case 'left':
+		$background_image_horizontal_left = ' selected=""';
+		$background_image_horizontal_center = '';
+		
+		break;
+	
+	// Right position
+	case 'right':
+		$background_image_horizontal_right = ' selected=""';
+		$background_image_horizontal_center = '';
+		
+		break;
+}
+
+switch($background['image_vertical']) {
+	// Left position
+	case 'top':
+		$background_image_vertical_top = ' selected=""';
+		$background_image_vertical_center = '';
+		
+		break;
+	
+	// Right position
+	case 'bottom':
+		$background_image_vertical_bottom = ' selected=""';
+		$background_image_vertical_center = '';
+		
+		break;
+}
+
+if($background['image_adapt'] == 'on')
+	$background_image_adapt = ' checked=""';
+
+// Read the notice configuration
+$notice_conf = readNotice();
+$notice_text = $notice_conf['notice'];
+
+switch($notice_conf['type']) {
+	// Simple notice input
+	case 'simple':
+		$notice_simple = ' checked=""';
+		$notice_none = '';
+		
+		break;
+	
+	// Advanced notice input
+	case 'advanced':
+		$notice_advanced = ' checked=""';
+		$notice_none = '';
+		
+		break;
+}
+
+?>
diff --git a/jappixmini/jappix/php/read-hosts.php b/jappixmini/jappix/php/read-hosts.php
new file mode 100644
index 00000000..0b406ac7
--- /dev/null
+++ b/jappixmini/jappix/php/read-hosts.php
@@ -0,0 +1,84 @@
+<?php
+
+/*
+
+Jappix - An open social platform
+This is the hosts configuration reader
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 29/05/11
+
+*/
+
+// Someone is trying to hack us?
+if(!defined('JAPPIX_BASE'))
+	exit;
+
+// Get the protocol we use
+if(isset($_SERVER['HTTPS']) && ($_SERVER['HTTPS'] == 'on'))
+	$protocol = 'https';
+else
+	$protocol = 'http';
+
+// Get the HTTP host
+$http_host = 'jappix.com';
+
+if($_SERVER['HTTP_HOST']) {
+	$http_host_split = str_replace('www.', '', $_SERVER['HTTP_HOST']);
+	$http_host_split = preg_replace('/:[0-9]+$/i', '', $http_host_split);
+	
+	if($http_host_split)
+		$http_host = $http_host_split;
+}
+
+// Define the default hosts configuration values
+$hosts_conf = array(
+	      	'main'		=> $http_host,
+	      	'muc'		=> 'muc.'.$http_host,
+	      	'pubsub'	=> 'pubsub.'.$http_host,
+	      	'vjud'		=> 'vjud.'.$http_host,
+	      	'anonymous'	=> 'anonymous.'.$http_host,
+	      	'bosh'		=> 'http://'.$http_host.':5280/http-bind',
+	      	'bosh_main'	=> '',
+	      	'bosh_mini'	=> '',
+	      	'static'	=> '',
+	      	'upload'	=> ''
+	      );
+
+// Define a default values array
+$hosts_default = $hosts_conf;
+
+// Read the hosts configuration file
+$hosts_data = readXML('conf', 'hosts');
+
+// Read the hosts configuration file
+if($hosts_data) {
+	// Initialize the hosts configuration XML data
+	$hosts_xml = new SimpleXMLElement($hosts_data);
+	
+	// Loop the hosts configuration elements
+	foreach($hosts_xml->children() as $hosts_child) {
+		$hosts_value = $hosts_child->getName();
+		
+		// Only push this to the array if it exists
+		if(isset($hosts_conf[$hosts_value]) && $hosts_child)
+			$hosts_conf[$hosts_value] = str_replace('{PROTOCOL}', $protocol, $hosts_child);
+	}
+}
+
+// Finally, define the hosts configuration globals
+define('HOST_MAIN', $hosts_conf['main']);
+define('HOST_MUC', $hosts_conf['muc']);
+define('HOST_PUBSUB', $hosts_conf['pubsub']);
+define('HOST_VJUD', $hosts_conf['vjud']);
+define('HOST_ANONYMOUS', $hosts_conf['anonymous']);
+define('HOST_BOSH', $hosts_conf['bosh']);
+define('HOST_BOSH_MAIN', $hosts_conf['bosh_main']);
+define('HOST_BOSH_MINI', $hosts_conf['bosh_mini']);
+define('HOST_STATIC', $hosts_conf['static']);
+define('HOST_UPLOAD', $hosts_conf['upload']);
+
+?>
diff --git a/jappixmini/jappix/php/read-main.php b/jappixmini/jappix/php/read-main.php
new file mode 100644
index 00000000..4acfa000
--- /dev/null
+++ b/jappixmini/jappix/php/read-main.php
@@ -0,0 +1,77 @@
+<?php
+
+/*
+
+Jappix - An open social platform
+This is the main configuration reader
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 26/08/11
+
+*/
+
+// Someone is trying to hack us?
+if(!defined('JAPPIX_BASE'))
+	exit;
+
+// Define the default main configuration values
+$main_conf = array(
+	     	'name'			=> 'Jappix',
+	     	'desc'			=> 'a free social network',
+	     	'resource'		=> 'Jappix',
+	     	'lock'			=> 'on',
+	     	'anonymous'		=> 'on',
+	     	'registration'		=> 'on',
+	     	'bosh_proxy'		=> 'on',
+	     	'manager_link'		=> 'on',
+	     	'groupchats_join'	=> '',
+	     	'encryption'		=> 'on',
+	     	'https_storage'		=> 'off',
+	     	'https_force'		=> 'off',
+	     	'compression'		=> 'off',
+	     	'multi_files'		=> 'off',
+	     	'developer'		=> 'off'
+	     );
+
+// Define a default values array
+$main_default = $main_conf;
+
+// Read the main configuration file
+$main_data = readXML('conf', 'main');
+
+// Read the main configuration file
+if($main_data) {
+	// Initialize the main configuration XML data
+	$main_xml = new SimpleXMLElement($main_data);
+	
+	// Loop the main configuration elements
+	foreach($main_xml->children() as $main_child) {
+		$main_value = $main_child->getName();
+		
+		// Only push this to the array if it exists
+		if(isset($main_conf[$main_value]) && $main_child)
+			$main_conf[$main_value] = $main_child;
+	}
+}
+
+// Finally, define the main configuration globals
+define('SERVICE_NAME', $main_conf['name']);
+define('SERVICE_DESC', $main_conf['desc']);
+define('JAPPIX_RESOURCE', $main_conf['resource']);
+define('LOCK_HOST', $main_conf['lock']);
+define('ANONYMOUS', $main_conf['anonymous']);
+define('REGISTRATION', $main_conf['registration']);
+define('BOSH_PROXY', $main_conf['bosh_proxy']);
+define('MANAGER_LINK', $main_conf['manager_link']);
+define('GROUPCHATS_JOIN', $main_conf['groupchats_join']);
+define('ENCRYPTION', $main_conf['encryption']);
+define('HTTPS_STORAGE', $main_conf['https_storage']);
+define('HTTPS_FORCE', $main_conf['https_force']);
+define('COMPRESSION', $main_conf['compression']);
+define('MULTI_FILES', $main_conf['multi_files']);
+define('DEVELOPER', $main_conf['developer']);
+
+?>
diff --git a/jappixmini/jappix/php/send.php b/jappixmini/jappix/php/send.php
new file mode 100644
index 00000000..a24e4185
--- /dev/null
+++ b/jappixmini/jappix/php/send.php
@@ -0,0 +1,130 @@
+<?php
+
+/*
+
+Jappix - An open social platform
+This is the Jappix Out of Band file send script
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 14/01/12
+
+*/
+
+// PHP base
+define('JAPPIX_BASE', '..');
+
+// Get the needed files
+require_once('./functions.php');
+require_once('./read-main.php');
+require_once('./read-hosts.php');
+
+// Optimize the page rendering
+hideErrors();
+compressThis();
+
+// Not allowed for a special node
+if(isStatic())
+	exit;
+
+// Action on an existing file
+if(isset($_GET['id']) && !empty($_GET['id'])) {
+	$file_id = $_GET['id'];
+	$file_path = JAPPIX_BASE.'/store/send/'.$file_id;
+	
+	// Get file name
+	if(isset($_GET['name']) && !empty($_GET['name']))
+		$file_name = $_GET['name'];
+	else
+		$file_name = $file_id;
+	
+	// Hack?
+	if(!isSafe($file_id)) {
+		header('Status: 406 Not Acceptable', true, 406);
+		exit('HTTP/1.1 406 Not Acceptable');
+	}
+	
+	// File does not exist
+	if(!file_exists($file_path)) {
+		header('Status: 404 Not Found', true, 404);
+		exit('HTTP/1.1 404 Not Found');
+	}
+	
+	// Remove a file
+	if(isset($_GET['action']) && ($_GET['action'] == 'remove')) {
+		header('Status: 204 No Content', true, 204);
+		unlink($file_path);
+	}
+	
+	// Receive a file
+	header("Content-disposition: attachment; filename=\"$file_name\"");
+	header("Content-Type: application/force-download");
+	header("Content-Length: ".filesize($file_path));
+	header("Pragma: no-cache");
+	header("Cache-Control: must-revalidate, post-check=0, pre-check=0, public");
+	header("Expires: 0");
+	readfile($file_path);
+	unlink($file_path);
+}
+
+// Send a file
+else if((isset($_FILES['file']) && !empty($_FILES['file'])) && (isset($_POST['id']) && !empty($_POST['id'])) && (isset($_POST['location']) && !empty($_POST['location']))) {
+	header('Content-Type: text/xml; charset=utf-8');
+	
+	// Get the file name
+	$tmp_filename = $_FILES['file']['tmp_name'];
+	$filename = $_FILES['file']['name'];
+	
+	// Get the location
+	if(HOST_UPLOAD)
+		$location = HOST_UPLOAD;
+	else
+		$location = $_POST['location'];
+	
+	// Get the file new name
+	$ext = getFileExt($filename);
+	$new_name = preg_replace('/(^)(.+)(\.)(.+)($)/i', '$2', $filename);
+	
+	// Define some vars
+	$name = sha1(time().$filename);
+	$path = JAPPIX_BASE.'/store/send/'.$name.'.'.$ext;
+	
+	// Forbidden file?
+	if(!isSafe($filename) || !isSafe($name.'.'.$ext)) {
+		exit(
+'<jappix xmlns=\'jappix:file:send\'>
+	<error>forbidden-type</error>
+	<id>'.htmlspecialchars($_POST['id']).'</id>
+</jappix>'
+		);
+	}
+	
+	// File upload error?
+	if(!is_uploaded_file($tmp_filename) || !move_uploaded_file($tmp_filename, $path)) {
+		exit(
+'<jappix xmlns=\'jappix:file:send\'>
+	<error>move-error</error>
+	<id>'.htmlspecialchars($_POST['id']).'</id>
+</jappix>'
+		);
+	}
+	
+	// Return the path to the file
+	exit(
+'<jappix xmlns=\'jappix:file:send\'>
+	<url>'.htmlspecialchars($location.'php/send.php?id='.urlencode($name).'.'.urlencode($ext).'&name='.urlencode($filename)).'</url>
+	<desc>'.htmlspecialchars($new_name).'</desc>
+	<id>'.htmlspecialchars($_POST['id']).'</id>
+</jappix>'
+	);
+}
+
+// Error?
+else {
+	header('Status: 400 Bad Request', true, 400);
+	exit('HTTP/1.1 400 Bad Request');
+}
+
+?>
diff --git a/jappixmini/jappix/php/static.php b/jappixmini/jappix/php/static.php
new file mode 100644
index 00000000..857a6a07
--- /dev/null
+++ b/jappixmini/jappix/php/static.php
@@ -0,0 +1,40 @@
+<?php
+
+/*
+
+Jappix - An open social platform
+This is the Jappix Static PHP/HTML code
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 27/05/11
+
+*/
+
+// Someone is trying to hack us?
+if(!defined('JAPPIX_BASE'))
+	exit;
+
+?>
+<!DOCTYPE html>
+<?php htmlTag($locale); ?>
+
+<head>
+	<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+	<title><?php echo htmlspecialchars(SERVICE_NAME); ?> &bull; <?php _e("Static content server"); ?></title>
+	<link rel="shortcut icon" href="./favicon.ico" />
+</head>
+
+<body>
+	<h1><?php echo htmlspecialchars(SERVICE_NAME); ?> - <?php _e("Static content server"); ?></h1>
+	<p><?php printf(T_("This is the static content server for %1s, “%2s”."), htmlspecialchars(SERVICE_NAME), htmlspecialchars(SERVICE_DESC)); ?></p>
+	<?php if(showManagerLink()) { ?>
+	<p><a href="./?m=manager<?php echo keepGet('m', false); ?>"><?php _e("Manager"); ?></a></p>
+	<?php } ?>
+</body>
+
+</html>
+
+<!-- Jappix Static <?php echo $version; ?> - An open social platform -->
diff --git a/jappixmini/jappix/php/stats-svg.php b/jappixmini/jappix/php/stats-svg.php
new file mode 100644
index 00000000..e5c2b625
--- /dev/null
+++ b/jappixmini/jappix/php/stats-svg.php
@@ -0,0 +1,106 @@
+<?php
+
+/*
+
+Jappix - An open social platform
+The SVG loader for Jappix statistics
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 28/12/10
+
+*/
+
+// PHP base
+define('JAPPIX_BASE', '..');
+
+// Get the functions
+require_once('./functions.php');
+require_once('./functions-manager.php');
+
+// Get the configuration
+require_once('./read-main.php');
+require_once('./read-hosts.php');
+
+// Get the libs
+require_once('./drawsvgchart.php');
+require_once('./gettext.php');
+
+// Optimize the page rendering
+hideErrors();
+compressThis();
+
+// Start the session
+session_start();
+
+// Check if the user is authorized
+$is_admin = false;
+
+if((isset($_SESSION['jappix_user']) && !empty($_SESSION['jappix_user'])) && (isset($_SESSION['jappix_password']) && !empty($_SESSION['jappix_password']))) {
+	// Get the session values
+	$user = $_SESSION['jappix_user'];
+	$password = $_SESSION['jappix_password'];
+	
+	// Checks the user is admin
+	$is_admin = isAdmin($user, $password);
+}
+
+// Not admin? Stop the script!
+if(!$is_admin)
+	exit;
+
+// Get the graph type
+if((isset($_GET['g']) && !empty($_GET['g'])))
+	$graph = $_GET['g'];
+else
+	$graph = 'others';
+
+// Get the locale
+if((isset($_GET['l']) && !empty($_GET['l'])))
+	$locale = $_GET['l'];
+else
+	$locale = 'en';
+
+// Include the translations
+includeTranslation($locale, 'main');
+
+$drawsvgchart = new DrawSVGChart;
+
+// Generation vars
+$link = FALSE;
+$evolution = FALSE;
+
+// Access graph?
+if($graph == 'access') {
+	// Values
+	$elements = getMonthlyVisits();
+	$legend = array(array('#5276A9', T_("Visits")));
+	$evolution = TRUE;
+}
+
+// Share graph?
+else if($graph == 'share') {
+	// Values
+	$elements = largestShare(shareStats(), 8);
+	$legend = array(array('#5276A9', T_("Size")));
+}
+
+// Others graph?
+else if($graph == 'others') {
+	// Values
+	$elements = otherStats();
+	$legend = array(array('#5276A9', T_("Size")));
+}
+
+// Generate the chart
+$svgchart = $drawsvgchart->createChart($elements, $legend, $link, $evolution, $graph);
+
+// No error?
+if(!$drawsvgchart->has_errors()) {
+	header('Content-Type: image/svg+xml; charset=utf-8');
+	echo $drawsvgchart->getXMLOutput();
+}
+
+?>
diff --git a/jappixmini/jappix/php/store-tree.php b/jappixmini/jappix/php/store-tree.php
new file mode 100644
index 00000000..2ccc74c9
--- /dev/null
+++ b/jappixmini/jappix/php/store-tree.php
@@ -0,0 +1,51 @@
+<?php
+
+/*
+
+Jappix - An open social platform
+This script (re)generates the store sub-folders (after an update)
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 26/08/11
+
+*/
+
+// Someone is trying to hack us?
+if(!defined('JAPPIX_BASE'))
+	exit;
+
+// Array of the sub-folders to create
+$store_folders = array(
+	'access',
+	'avatars',
+	'backgrounds',
+	'cache',
+	'conf',
+	'logos',
+	'logs',
+	'music',
+	'send',
+	'share',
+	'updates'
+);
+
+// Creates the sub-folders
+for($i = 0; $i < count($store_folders); $i++) {
+	$current = JAPPIX_BASE.'/store/'.$store_folders[$i];
+	
+	// Create the folder itself
+	if(!is_dir($current))
+		mkdir($current, 0777, true);
+	
+	chmod($current, 0777);
+	
+	// Create the security file inside the folder
+	$security_html = securityHTML();
+	
+	file_put_contents($current.'/index.html', $security_html);
+}
+
+?>
diff --git a/jappixmini/jappix/php/upload.php b/jappixmini/jappix/php/upload.php
new file mode 100644
index 00000000..f28c6841
--- /dev/null
+++ b/jappixmini/jappix/php/upload.php
@@ -0,0 +1,40 @@
+<?php
+
+/*
+
+Jappix - An open social platform
+This is the Jappix Static PHP/HTML code
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 27/05/11
+
+*/
+
+// Someone is trying to hack us?
+if(!defined('JAPPIX_BASE'))
+	exit;
+
+?>
+<!DOCTYPE html>
+<?php htmlTag($locale); ?>
+
+<head>
+	<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+	<title><?php echo htmlspecialchars(SERVICE_NAME); ?> &bull; <?php _e("User uploads server"); ?></title>
+	<link rel="shortcut icon" href="./favicon.ico" />
+</head>
+
+<body>
+	<h1><?php echo htmlspecialchars(SERVICE_NAME); ?> - <?php _e("User uploads server"); ?></h1>
+	<p><?php printf(T_("This is the user uploads server for %1s, “%2s”."), htmlspecialchars(SERVICE_NAME), htmlspecialchars(SERVICE_DESC)); ?></p>
+	<?php if(showManagerLink()) { ?>
+	<p><a href="./?m=manager<?php echo keepGet('m', false); ?>"><?php _e("Manager"); ?></a></p>
+	<?php } ?>
+</body>
+
+</html>
+
+<!-- Jappix Upload <?php echo $version; ?> - An open social platform -->
diff --git a/jappixmini/jappix/php/vars-design.php b/jappixmini/jappix/php/vars-design.php
new file mode 100644
index 00000000..4f70d8e5
--- /dev/null
+++ b/jappixmini/jappix/php/vars-design.php
@@ -0,0 +1,49 @@
+<?php
+
+/*
+
+Jappix - An open social platform
+These are the design configuration variables
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 25/08/11
+
+*/
+
+// Someone is trying to hack us?
+if(!defined('JAPPIX_BASE'))
+	exit;
+
+// Define initial logo form values
+$logo_default = ' checked=""';
+$logo_own = '';
+
+// Define initial background form values
+$background_default = ' checked=""';
+$background_image = '';
+$background_color = '';
+$background_image_repeat_no = '';
+$background_image_repeat_all = '';
+$background_image_repeat_x = ' selected=""';
+$background_image_repeat_y = '';
+$background_image_horizontal_center = ' selected=""';
+$background_image_horizontal_left = '';
+$background_image_horizontal_right = '';
+$background_image_vertical_center = ' selected=""';
+$background_image_vertical_top = '';
+$background_image_vertical_bottom = '';
+$background_image_adapt = '';
+
+// Define initial notice form values
+$notice_none = ' checked=""';
+$notice_simple = '';
+$notice_advanced = '';
+$notice_text = '';
+
+// Current background folder
+$backgrounds_folder = 'backgrounds';
+
+?>
diff --git a/jappixmini/jappix/php/vars-hosts.php b/jappixmini/jappix/php/vars-hosts.php
new file mode 100644
index 00000000..3d09fcd5
--- /dev/null
+++ b/jappixmini/jappix/php/vars-hosts.php
@@ -0,0 +1,32 @@
+<?php
+
+/*
+
+Jappix - An open social platform
+These are the hosts configuration variables
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 27/05/11
+
+*/
+
+// Someone is trying to hack us?
+if(!defined('JAPPIX_BASE'))
+	exit;
+
+// Define the vars with the hosts configuration constants
+$host_main = htmlspecialchars(HOST_MAIN);
+$host_muc = htmlspecialchars(HOST_MUC);
+$host_pubsub = htmlspecialchars(HOST_PUBSUB);
+$host_vjud = htmlspecialchars(HOST_VJUD);
+$host_anonymous = htmlspecialchars(HOST_ANONYMOUS);
+$host_bosh = htmlspecialchars(HOST_BOSH);
+$host_bosh_main = htmlspecialchars(HOST_BOSH_MAIN);
+$host_bosh_mini = htmlspecialchars(HOST_BOSH_MINI);
+$host_static = htmlspecialchars(HOST_STATIC);
+$host_upload = htmlspecialchars(HOST_UPLOAD);
+
+?>
diff --git a/jappixmini/jappix/php/vars-main.php b/jappixmini/jappix/php/vars-main.php
new file mode 100644
index 00000000..852eb445
--- /dev/null
+++ b/jappixmini/jappix/php/vars-main.php
@@ -0,0 +1,37 @@
+<?php
+
+/*
+
+Jappix - An open social platform
+These are the main configuration variables
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 26/08/11
+
+*/
+
+// Someone is trying to hack us?
+if(!defined('JAPPIX_BASE'))
+	exit;
+
+// Define the vars with the main configuration constants
+$service_name = htmlspecialchars(SERVICE_NAME);
+$service_desc = htmlspecialchars(SERVICE_DESC);
+$jappix_resource = htmlspecialchars(JAPPIX_RESOURCE);
+$lock_host = htmlspecialchars(LOCK_HOST);
+$anonymous_mode = htmlspecialchars(ANONYMOUS);
+$registration = htmlspecialchars(REGISTRATION);
+$bosh_proxy = htmlspecialchars(BOSH_PROXY);
+$manager_link = htmlspecialchars(MANAGER_LINK);
+$groupchats_join = htmlspecialchars(GROUPCHATS_JOIN);
+$encryption = htmlspecialchars(ENCRYPTION);
+$https_storage = htmlspecialchars(HTTPS_STORAGE);
+$https_force = htmlspecialchars(HTTPS_FORCE);
+$compression = htmlspecialchars(COMPRESSION);
+$multi_files = htmlspecialchars(MULTI_FILES);
+$developer = htmlspecialchars(DEVELOPER);
+
+?>
diff --git a/jappixmini/jappix/php/vars-store.php b/jappixmini/jappix/php/vars-store.php
new file mode 100644
index 00000000..93c62e99
--- /dev/null
+++ b/jappixmini/jappix/php/vars-store.php
@@ -0,0 +1,29 @@
+<?php
+
+/*
+
+Jappix - An open social platform
+These are the store configuration variables
+
+-------------------------------------------------
+
+License: AGPL
+Author: Vanaryon
+Last revision: 28/12/10
+
+*/
+
+// Someone is trying to hack us?
+if(!defined('JAPPIX_BASE'))
+	exit;
+
+// Define the initial music form values
+$music_title = '';
+$music_artist = '';
+$music_album = '';
+
+// Current store folders
+$share_folder = 'share';
+$music_folder = 'music';
+
+?>
diff --git a/jappixmini/jappix/snd/new-chat.oga b/jappixmini/jappix/snd/new-chat.oga
new file mode 100644
index 00000000..8211d24e
Binary files /dev/null and b/jappixmini/jappix/snd/new-chat.oga differ
diff --git a/jappixmini/jappix/snd/notification.oga b/jappixmini/jappix/snd/notification.oga
new file mode 100644
index 00000000..f22b80b2
Binary files /dev/null and b/jappixmini/jappix/snd/notification.oga differ
diff --git a/jappixmini/jappix/snd/receive-message.oga b/jappixmini/jappix/snd/receive-message.oga
new file mode 100644
index 00000000..f8d6c72b
Binary files /dev/null and b/jappixmini/jappix/snd/receive-message.oga differ
diff --git a/jappixmini/jappix/xml/anonymous.xml b/jappixmini/jappix/xml/anonymous.xml
new file mode 100644
index 00000000..59677b7f
--- /dev/null
+++ b/jappixmini/jappix/xml/anonymous.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<jappix xmlns="jappix:file:get">
+	<css>anonymous.css</css>
+	<js>anonymous.js</js>
+</jappix>
diff --git a/jappixmini/jappix/xml/desktop.xml b/jappixmini/jappix/xml/desktop.xml
new file mode 100644
index 00000000..4b83d587
--- /dev/null
+++ b/jappixmini/jappix/xml/desktop.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<jappix xmlns="jappix:file:get">
+	<css>main.css~images.css~board.css~jquery.datepicker.css~home.css~others.css~tools.css~buddylist.css~myinfos.css~pageengine.css~channel.css~pageswitch.css~smileys.css~popup.css~vcard.css~options.css~favorites.css~discovery.css~directory.css~adhoc.css~privacy.css~inbox.css~mucadmin.css~integratebox.css~userinfos.css~search.css~archives.css~welcome.css~me.css~rosterx.css</css>
+	<js>jquery.js~jquery.form.js~jquery.timers.js~jquery.placeholder.js~jquery.textrange.js~jquery.datepicker.js~base64.js~jsjac.js~constants.js~datastore.js~browser-detect.js~home.js~talk.js~popup.js~audio.js~board.js~bubble.js~chat.js~groupchat.js~smileys.js~oob.js~avatar.js~mucadmin.js~connection.js~dataform.js~discovery.js~directory.js~adhoc.js~privacy.js~error.js~name.js~favorites.js~features.js~interface.js~xmpplinks.js~iq.js~message.js~chatstate.js~receipts.js~tooltip.js~filter.js~links.js~inbox.js~microblog.js~music.js~notification.js~httpauth.js~options.js~integratebox.js~pep.js~presence.js~roster.js~storage.js~common.js~utilities.js~date.js~caps.js~vcard.js~userinfos.js~search.js~autocompletion.js~archives.js~welcome.js~me.js~rosterx.js</js>
+</jappix>
diff --git a/jappixmini/jappix/xml/install.xml b/jappixmini/jappix/xml/install.xml
new file mode 100644
index 00000000..f15e3877
--- /dev/null
+++ b/jappixmini/jappix/xml/install.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<jappix xmlns="jappix:file:get">
+	<css>main.css~install.css~images.css</css>
+	<js></js>
+</jappix>
diff --git a/jappixmini/jappix/xml/manager.xml b/jappixmini/jappix/xml/manager.xml
new file mode 100644
index 00000000..05bd5453
--- /dev/null
+++ b/jappixmini/jappix/xml/manager.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<jappix xmlns="jappix:file:get">
+	<css>main.css~manager.css~images.css</css>
+	<js></js>
+</jappix>
diff --git a/jappixmini/jappix/xml/mini.xml b/jappixmini/jappix/xml/mini.xml
new file mode 100644
index 00000000..b4e638eb
--- /dev/null
+++ b/jappixmini/jappix/xml/mini.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<jappix xmlns="jappix:file:get">
+	<css>mini.css</css>
+	<js>jxhr.js~base64.js~jsjac.js~jquery.timers.js~constants.js~datastore.js~browser-detect.js~common.js~date.js~links.js~mini.js</js>
+</jappix>
diff --git a/jappixmini/jappix/xml/mobile.xml b/jappixmini/jappix/xml/mobile.xml
new file mode 100644
index 00000000..49ca66d3
--- /dev/null
+++ b/jappixmini/jappix/xml/mobile.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<jappix xmlns="jappix:file:get">
+	<css>mobile.css~images.css</css>
+	<js>base64.js~jsjac.js~constants.js~browser-detect.js~links.js~mobile.js</js>
+</jappix>
diff --git a/jappixmini/jappixmini.php b/jappixmini/jappixmini.php
new file mode 100644
index 00000000..8f0a1f71
--- /dev/null
+++ b/jappixmini/jappixmini.php
@@ -0,0 +1,705 @@
+<?php
+
+/**
+ * Name: jappixmini
+ * Description: Provides a Facebook-like chat using Jappix Mini
+ * Version: 1.0.1
+ * Author: leberwurscht <leberwurscht@hoegners.de>
+ *
+ */
+//
+// Copyright 2012 "Leberwurscht" <leberwurscht@hoegners.de>
+//
+// This file is dual-licensed under the MIT license (see MIT.txt) and the AGPL license (see jappix/COPYING).
+//
+
+/*
+
+  Problem:
+ * jabber password should not be stored on server
+ * jabber password should not be sent between server and browser as soon as the user is logged in
+ * jabber password should not be reconstructible from communication between server and browser as soon as the user is logged in
+
+  Solution:
+  Only store an encrypted version of the jabber password on the server. The encryption key is only available to the browser
+  and not to the server (at least as soon as the user is logged in). It can be stored using the jappix setDB function.
+
+  This encryption key could be the friendica password, but then this password would be stored in the browser in cleartext.
+  It is better to use a hash of the password.
+  The server should not be able to reconstruct the password, so we can't take the same hash the server stores. But we can
+  use hash("some_prefix"+password). This will however not work with OpenID logins, for this type of login the password must
+  be queried manually.
+
+  Problem:
+  How to discover the jabber addresses of the friendica contacts?
+
+  Solution:
+  Each Friendica site with this addon provides a /jappixmini/ module page. We go through our contacts and retrieve
+  this information every week using a cron hook.
+
+  Problem:
+  We do not want to make the jabber address public.
+
+  Solution:
+  When two friendica users connect using DFRN, the relation gets a DFRN ID and a keypair is generated.
+  Using this keypair, we can provide the jabber address only to contacts:
+
+  Alice:
+  signed_address = openssl_*_encrypt(alice_jabber_address)
+  send signed_address to Bob, who does
+  trusted_address = openssl_*_decrypt(signed_address)
+  save trusted_address
+  encrypted_address = openssl_*_encrypt(bob_jabber_address)
+  reply with encrypted_address to Alice, who does
+  decrypted_address = openssl_*_decrypt(encrypted_address)
+  save decrypted_address
+
+  Interface for this:
+  GET /jappixmini/?role=%s&signed_address=%s&dfrn_id=%s
+
+  Response:
+  json({"status":"ok", "encrypted_address":"%s"})
+
+ */
+
+use Friendica\App;
+use Friendica\Core\Config;
+use Friendica\Core\Hook;
+use Friendica\Core\L10n;
+use Friendica\Core\Logger;
+use Friendica\Core\PConfig;
+use Friendica\Core\Protocol;
+use Friendica\Database\DBA;
+use Friendica\Model\User;
+use Friendica\Util\Network;
+
+function jappixmini_install()
+{
+	Hook::register('addon_settings', 'addon/jappixmini/jappixmini.php', 'jappixmini_settings');
+	Hook::register('addon_settings_post', 'addon/jappixmini/jappixmini.php', 'jappixmini_settings_post');
+
+	Hook::register('page_end', 'addon/jappixmini/jappixmini.php', 'jappixmini_script');
+	Hook::register('authenticate', 'addon/jappixmini/jappixmini.php', 'jappixmini_login');
+
+	Hook::register('cron', 'addon/jappixmini/jappixmini.php', 'jappixmini_cron');
+
+	// Jappix source download as required by AGPL
+	Hook::register('about_hook', 'addon/jappixmini/jappixmini.php', 'jappixmini_download_source');
+
+	// set standard configuration
+	$info_text = Config::get("jappixmini", "infotext");
+	if (!$info_text)
+		Config::set("jappixmini", "infotext", "To get the chat working, you need to know a BOSH host which works with your Jabber account. " .
+			"An example of a BOSH server that works for all accounts is https://bind.jappix.com/, but keep " .
+			"in mind that the BOSH server can read along all chat messages. If you know that your Jabber " .
+			"server also provides an own BOSH server, it is much better to use this one!"
+		);
+
+	$bosh_proxy = Config::get("jappixmini", "bosh_proxy");
+	if ($bosh_proxy === "") {
+		Config::set("jappixmini", "bosh_proxy", "1");
+	}
+
+	// set addon version so that safe updates are possible later
+	$addon_version = Config::get("jappixmini", "version");
+	if ($addon_version === "") {
+		Config::set("jappixmini", "version", "1");
+	}
+}
+
+function jappixmini_uninstall()
+{
+	Hook::unregister('addon_settings', 'addon/jappixmini/jappixmini.php', 'jappixmini_settings');
+	Hook::unregister('addon_settings_post', 'addon/jappixmini/jappixmini.php', 'jappixmini_settings_post');
+
+	Hook::unregister('page_end', 'addon/jappixmini/jappixmini.php', 'jappixmini_script');
+	Hook::unregister('authenticate', 'addon/jappixmini/jappixmini.php', 'jappixmini_login');
+
+	Hook::unregister('cron', 'addon/jappixmini/jappixmini.php', 'jappixmini_cron');
+
+	Hook::unregister('about_hook', 'addon/jappixmini/jappixmini.php', 'jappixmini_download_source');
+}
+
+function jappixmini_addon_admin(App $a, &$o)
+{
+	// display instructions and warnings on addon settings page for admin
+	if (!file_exists("addon/jappixmini.tgz")) {
+		$o .= '<p><strong style="color:#fff;background-color:#f00">The source archive jappixmini.tgz does not exist. This is probably a violation of the Jappix License (AGPL).</strong></p>';
+	}
+
+	// warn if cron job has not yet been executed
+	$cron_run = Config::get("jappixmini", "last_cron_execution");
+	if (!$cron_run) {
+		$o .= "<p><strong>Warning: The cron job has not yet been executed. If this message is still there after some time (usually 10 minutes), this means that autosubscribe and autoaccept will not work.</strong></p>";
+	}
+
+	// bosh proxy
+	$bosh_proxy = intval(Config::get("jappixmini", "bosh_proxy"));
+	$bosh_proxy = intval($bosh_proxy) ? ' checked="checked"' : '';
+	$o .= '<label for="jappixmini-proxy">Activate BOSH proxy</label>';
+	$o .= ' <input id="jappixmini-proxy" type="checkbox" name="jappixmini-proxy" value="1"' . $bosh_proxy . ' /><br />';
+
+	// bosh address
+	$bosh_address = Config::get("jappixmini", "bosh_address");
+	$o .= '<p><label for="jappixmini-address">Adress of the default BOSH proxy. If enabled it overrides the user settings:</label><br />';
+	$o .= '<input id="jappixmini-address" type="text" name="jappixmini-address" value="' . $bosh_address . '" /></p>';
+
+	// default server address
+	$default_server = Config::get("jappixmini", "default_server");
+	$o .= '<p><label for="jappixmini-server">Adress of the default jabber server:</label><br />';
+	$o .= '<input id="jappixmini-server" type="text" name="jappixmini-server" value="' . $default_server . '" /></p>';
+
+	// default user name to friendica nickname
+	$default_user = intval(Config::get("jappixmini", "default_user"));
+	$default_user = intval($default_user) ? ' checked="checked"' : '';
+	$o .= '<label for="jappixmini-user">Set the default username to the nickname:</label>';
+	$o .= ' <input id="jappixmini-user" type="checkbox" name="jappixmini-defaultuser" value="1"' . $default_user . ' /><br />';
+
+	// info text field
+	$info_text = Config::get("jappixmini", "infotext");
+	$o .= '<p><label for="jappixmini-infotext">Info text to help users with configuration (important if you want to provide your own BOSH host!):</label><br />';
+	$o .= '<textarea id="jappixmini-infotext" name="jappixmini-infotext" rows="5" cols="50">' . htmlentities($info_text) . '</textarea></p>';
+
+	// submit button
+	$o .= '<input type="submit" name="jappixmini-admin-settings" value="OK" />';
+}
+
+function jappixmini_addon_admin_post(App $a)
+{
+	// set info text
+	$submit = $_REQUEST['jappixmini-admin-settings'];
+	if ($submit) {
+		$info_text = $_REQUEST['jappixmini-infotext'];
+		$bosh_proxy = intval($_REQUEST['jappixmini-proxy']);
+		$default_user = intval($_REQUEST['jappixmini-defaultuser']);
+		$bosh_address = $_REQUEST['jappixmini-address'];
+		$default_server = $_REQUEST['jappixmini-server'];
+		Config::set("jappixmini", "infotext", $info_text);
+		Config::set("jappixmini", "bosh_proxy", $bosh_proxy);
+		Config::set("jappixmini", "bosh_address", $bosh_address);
+		Config::set("jappixmini", "default_server", $default_server);
+		Config::set("jappixmini", "default_user", $default_user);
+	}
+}
+
+function jappixmini_module()
+{
+
+}
+
+function jappixmini_init()
+{
+	// module page where other Friendica sites can submit Jabber addresses to and also can query Jabber addresses
+	// of local users
+	$dfrn_id = $_REQUEST["dfrn_id"];
+	if (!$dfrn_id) {
+		exit();
+	}
+
+	$role = $_REQUEST["role"];
+	if ($role == "pub") {
+		$r = q("SELECT * FROM `contact` WHERE LENGTH(`pubkey`) AND `dfrn-id`='%s' LIMIT 1", DBA::escape($dfrn_id));
+		if (!count($r)) {
+			exit();
+		}
+
+		$encrypt_func = 'openssl_public_encrypt';
+		$decrypt_func = 'openssl_public_decrypt';
+		$key = $r[0]["pubkey"];
+	} else if ($role == "prv") {
+		$r = q("SELECT * FROM `contact` WHERE LENGTH(`prvkey`) AND `issued-id`='%s' LIMIT 1", DBA::escape($dfrn_id));
+		if (!count($r)) {
+			exit();
+		}
+
+		$encrypt_func = 'openssl_private_encrypt';
+		$decrypt_func = 'openssl_private_decrypt';
+		$key = $r[0]["prvkey"];
+	} else {
+		exit();
+	}
+
+	$uid = $r[0]["uid"];
+
+	// save the Jabber address we received
+	try {
+		$signed_address_hex = $_REQUEST["signed_address"];
+		$signed_address = hex2bin($signed_address_hex);
+
+		$trusted_address = "";
+		$decrypt_func($signed_address, $trusted_address, $key);
+
+		$now = intval(time());
+		PConfig::set($uid, "jappixmini", "id:$dfrn_id", "$now:$trusted_address");
+	} catch (Exception $e) {
+
+	}
+
+	// do not return an address if user deactivated addon
+	$activated = PConfig::get($uid, 'jappixmini', 'activate');
+	if (!$activated) {
+		exit();
+	}
+
+	// return the requested Jabber address
+	try {
+		$username = PConfig::get($uid, 'jappixmini', 'username');
+		$server = PConfig::get($uid, 'jappixmini', 'server');
+		$address = "$username@$server";
+
+		$encrypted_address = "";
+		$encrypt_func($address, $encrypted_address, $key);
+
+		$encrypted_address_hex = bin2hex($encrypted_address);
+
+		$answer = [
+			"status" => "ok",
+			"encrypted_address" => $encrypted_address_hex
+		];
+
+		$answer_json = json_encode($answer);
+		echo $answer_json;
+		exit();
+	} catch (Exception $e) {
+		exit();
+	}
+}
+
+function jappixmini_settings(App $a, &$s)
+{
+	// addon settings for a user
+	$activate = PConfig::get(local_user(), 'jappixmini', 'activate');
+	$activate = intval($activate) ? ' checked="checked"' : '';
+	$dontinsertchat = PConfig::get(local_user(), 'jappixmini', 'dontinsertchat');
+	$insertchat = !(intval($dontinsertchat) ? ' checked="checked"' : '');
+
+	$defaultbosh = Config::get("jappixmini", "bosh_address");
+
+	if ($defaultbosh != "") {
+		PConfig::set(local_user(), 'jappixmini', 'bosh', $defaultbosh);
+	}
+
+	$username = PConfig::get(local_user(), 'jappixmini', 'username');
+	$username = htmlentities($username);
+	$server = PConfig::get(local_user(), 'jappixmini', 'server');
+	$server = htmlentities($server);
+	$bosh = PConfig::get(local_user(), 'jappixmini', 'bosh');
+	$bosh = htmlentities($bosh);
+	$password = PConfig::get(local_user(), 'jappixmini', 'password');
+	$autosubscribe = PConfig::get(local_user(), 'jappixmini', 'autosubscribe');
+	$autosubscribe = intval($autosubscribe) ? ' checked="checked"' : '';
+	$autoapprove = PConfig::get(local_user(), 'jappixmini', 'autoapprove');
+	$autoapprove = intval($autoapprove) ? ' checked="checked"' : '';
+	$encrypt = intval(PConfig::get(local_user(), 'jappixmini', 'encrypt'));
+	$encrypt_checked = $encrypt ? ' checked="checked"' : '';
+	$encrypt_disabled = $encrypt ? '' : ' disabled="disabled"';
+
+	if ($server == "") {
+		$server = Config::get("jappixmini", "default_server");
+	}
+
+	if (($username == "") && Config::get("jappixmini", "default_user")) {
+		$username = $a->user["nickname"];
+	}
+
+	$info_text = Config::get("jappixmini", "infotext");
+	$info_text = htmlentities($info_text);
+	$info_text = str_replace("\n", "<br />", $info_text);
+
+	// count contacts
+	$r = q("SELECT COUNT(1) as `cnt` FROM `pconfig` WHERE `uid`=%d AND `cat`='jappixmini' AND `k` LIKE 'id:%%'", local_user());
+	if (count($r)) {
+		$contact_cnt = $r[0]["cnt"];
+	} else {
+		$contact_cnt = 0;
+	}
+
+	// count jabber addresses
+	$r = q("SELECT COUNT(1) as `cnt` FROM `pconfig` WHERE `uid`=%d AND `cat`='jappixmini' AND `k` LIKE 'id:%%' AND `v` LIKE '%%@%%'", local_user());
+	if (count($r)) {
+		$address_cnt = $r[0]["cnt"];
+	} else {
+		$address_cnt = 0;
+	}
+
+	if (!$activate) {
+		// load scripts if not yet activated so that password can be saved
+		$a->page['htmlhead'] .= '<script type="text/javascript" src="' . $a->getBaseURL() . '/addon/jappixmini/jappix/php/get.php?t=js&amp;g=mini.xml"></script>' . "\r\n";
+		$a->page['htmlhead'] .= '<script type="text/javascript" src="' . $a->getBaseURL() . '/addon/jappixmini/jappix/php/get.php?t=js&amp;f=presence.js~caps.js~name.js~roster.js"></script>' . "\r\n";
+
+		$a->page['htmlhead'] .= '<script type="text/javascript" src="' . $a->getBaseURL() . '/addon/jappixmini/lib.js"></script>' . "\r\n";
+	}
+
+	$s .= '<span id="settings_jappixmini_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_jappixmini_expanded\'); openClose(\'settings_jappixmini_inflated\');">';
+	$s .= '<h3>' . L10n::t('Jappix Mini') . '</h3>';
+	$s .= '</span>';
+	$s .= '<div id="settings_jappixmini_expanded" class="settings-block" style="display: none;">';
+	$s .= '<span class="fakelink" onclick="openClose(\'settings_jappixmini_expanded\'); openClose(\'settings_jappixmini_inflated\');">';
+	$s .= '<h3>' . L10n::t('Jappix Mini') . '</h3>';
+	$s .= '</span>';
+
+	$s .= '<label for="jappixmini-activate">' . L10n::t('Activate addon') . '</label>';
+	$s .= ' <input id="jappixmini-activate" type="checkbox" name="jappixmini-activate" value="1"' . $activate . ' />';
+	$s .= '<br />';
+	$s .= '<label for"jappixmini-dont-insertchat">' . L10n::t('Do <em>not</em> insert the Jappixmini Chat-Widget into the webinterface') . '</label>';
+	$s .= '<input id="jappixmini-dont-insertchat" type="checkbox" name="jappixmini-dont-insertchat" value="1"' . $insertchat . ' />';
+	$s .= '<br />';
+	$s .= '<label for="jappixmini-username">' . L10n::t('Jabber username') . '</label>';
+	$s .= ' <input id="jappixmini-username" type="text" name="jappixmini-username" value="' . $username . '" />';
+	$s .= '<br />';
+	$s .= '<label for="jappixmini-server">' . L10n::t('Jabber server') . '</label>';
+	$s .= ' <input id="jappixmini-server" type="text" name="jappixmini-server" value="' . $server . '" />';
+	$s .= '<br />';
+
+	if ($defaultbosh == "") {
+		$s .= '<label for="jappixmini-bosh">' . L10n::t('Jabber BOSH host') . '</label>';
+		$s .= ' <input id="jappixmini-bosh" type="text" name="jappixmini-bosh" value="' . $bosh . '" />';
+		$s .= '<br />';
+	}
+
+	$s .= '<label for="jappixmini-password">' . L10n::t('Jabber password') . '</label>';
+	$s .= ' <input type="hidden" id="jappixmini-password" name="jappixmini-encrypted-password" value="' . $password . '" />';
+	$s .= ' <input id="jappixmini-clear-password" type="password" value="" onchange="jappixmini_set_password();" />';
+	$s .= '<br />';
+	$onchange = "document.getElementById('jappixmini-friendica-password').disabled = !this.checked;jappixmini_set_password();";
+	$s .= '<label for="jappixmini-encrypt">' . L10n::t('Encrypt Jabber password with Friendica password (recommended)') . '</label>';
+	$s .= ' <input id="jappixmini-encrypt" type="checkbox" name="jappixmini-encrypt" onchange="' . $onchange . '" value="1"' . $encrypt_checked . ' />';
+	$s .= '<br />';
+	$s .= '<label for="jappixmini-friendica-password">' . L10n::t('Friendica password') . '</label>';
+	$s .= ' <input id="jappixmini-friendica-password" name="jappixmini-friendica-password" type="password" onchange="jappixmini_set_password();" value=""' . $encrypt_disabled . ' />';
+	$s .= '<br />';
+	$s .= '<label for="jappixmini-autoapprove">' . L10n::t('Approve subscription requests from Friendica contacts automatically') . '</label>';
+	$s .= ' <input id="jappixmini-autoapprove" type="checkbox" name="jappixmini-autoapprove" value="1"' . $autoapprove . ' />';
+	$s .= '<br />';
+	$s .= '<label for="jappixmini-autosubscribe">' . L10n::t('Subscribe to Friendica contacts automatically') . '</label>';
+	$s .= ' <input id="jappixmini-autosubscribe" type="checkbox" name="jappixmini-autosubscribe" value="1"' . $autosubscribe . ' />';
+	$s .= '<br />';
+	$s .= '<label for="jappixmini-purge">' . L10n::t('Purge internal list of jabber addresses of contacts') . '</label>';
+	$s .= ' <input id="jappixmini-purge" type="checkbox" name="jappixmini-purge" value="1" />';
+	$s .= '<br />';
+	if ($info_text) {
+		$s .= '<br />Configuration help:<p style="margin-left:2em;">' . $info_text . '</p>';
+	}
+	$s .= '<br />Status:<p style="margin-left:2em;">Addon knows ' . $address_cnt . ' Jabber addresses of ' . $contact_cnt . ' Friendica contacts (takes some time, usually 10 minutes, to update).</p>';
+	$s .= '<input type="submit" name="jappixmini-submit" value="' . L10n::t('Save Settings') . '" />';
+	$s .= ' <input type="button" value="' . L10n::t('Add contact') . '" onclick="jappixmini_addon_subscribe();" />';
+
+	$s .= '</div>';
+
+	$a->page['htmlhead'] .= "<script type=\"text/javascript\">
+        function jappixmini_set_password() {
+            encrypt = document.getElementById('jappixmini-encrypt').checked;
+            password = document.getElementById('jappixmini-password');
+            clear_password = document.getElementById('jappixmini-clear-password');
+            if (encrypt) {
+                friendica_password = document.getElementById('jappixmini-friendica-password');
+
+                if (friendica_password) {
+                    jappixmini_addon_set_client_secret(friendica_password.value);
+                    jappixmini_addon_encrypt_password(clear_password.value, function(encrypted_password){
+                        password.value = encrypted_password;
+                    });
+                }
+            }
+            else {
+                password.value = clear_password.value;
+            }
+        }
+
+        jQuery(document).ready(function() {
+            encrypt = document.getElementById('jappixmini-encrypt').checked;
+            password = document.getElementById('jappixmini-password');
+            clear_password = document.getElementById('jappixmini-clear-password');
+            if (encrypt) {
+                jappixmini_addon_decrypt_password(password.value, function(decrypted_password){
+                    clear_password.value = decrypted_password;
+                });
+            }
+            else {
+                clear_password.value = password.value;
+            }
+        });
+    </script>";
+}
+
+function jappixmini_settings_post(App $a, &$b)
+{
+	// save addon settings for a user
+	if (!local_user()) {
+		return;
+	}
+	$uid = local_user();
+
+	if ($_POST['jappixmini-submit']) {
+		$encrypt = intval($b['jappixmini-encrypt']);
+		if ($encrypt) {
+			// check that Jabber password was encrypted with correct Friendica password
+			$friendica_password = trim($b['jappixmini-friendica-password']);
+			if (!User::authenticate((int) $uid, $friendica_password)) {
+				info("Wrong friendica password!");
+				return;
+			}
+		}
+
+		$purge = intval($b['jappixmini-purge']);
+
+		$username = trim($b['jappixmini-username']);
+		$old_username = PConfig::get($uid, 'jappixmini', 'username');
+		if ($username != $old_username) {
+			$purge = 1;
+		}
+
+		$server = trim($b['jappixmini-server']);
+		$old_server = PConfig::get($uid, 'jappixmini', 'server');
+		if ($server != $old_server) {
+			$purge = 1;
+		}
+
+		PConfig::set($uid, 'jappixmini', 'username'      , $username);
+		PConfig::set($uid, 'jappixmini', 'server'        , $server);
+		PConfig::set($uid, 'jappixmini', 'bosh'          , trim($b['jappixmini-bosh']));
+		PConfig::set($uid, 'jappixmini', 'password'      , trim($b['jappixmini-encrypted-password']));
+		PConfig::set($uid, 'jappixmini', 'autosubscribe' , intval($b['jappixmini-autosubscribe']));
+		PConfig::set($uid, 'jappixmini', 'autoapprove'   , intval($b['jappixmini-autoapprove']));
+		PConfig::set($uid, 'jappixmini', 'activate'      , intval($b['jappixmini-activate']));
+		PConfig::set($uid, 'jappixmini', 'dontinsertchat', intval($b['jappixmini-dont-insertchat']));
+		PConfig::set($uid, 'jappixmini', 'encrypt'       , $encrypt);
+		info('Jappix Mini settings saved.');
+
+		if ($purge) {
+			q("DELETE FROM `pconfig` WHERE `uid`=$uid AND `cat`='jappixmini' AND `k` LIKE 'id:%%'");
+			info('List of addresses purged.');
+		}
+	}
+}
+
+function jappixmini_script(App $a)
+{
+	// adds the script to the page header which starts Jappix Mini
+	if (!local_user()) {
+		return;
+	}
+
+	if (($_GET['mode'] ?? '') == 'minimal') {
+		return;
+	}
+
+	$activate = PConfig::get(local_user(), 'jappixmini', 'activate');
+	$dontinsertchat = PConfig::get(local_user(), 'jappixmini', 'dontinsertchat');
+	if (!$activate || $dontinsertchat) {
+		return;
+	}
+
+	$a->page['htmlhead'] .= '<script type="text/javascript" src="' . $a->getBaseURL() . '/addon/jappixmini/jappix/php/get.php?t=js&amp;g=mini.xml"></script>' . "\r\n";
+	$a->page['htmlhead'] .= '<script type="text/javascript" src="' . $a->getBaseURL() . '/addon/jappixmini/jappix/php/get.php?t=js&amp;f=presence.js~caps.js~name.js~roster.js"></script>' . "\r\n";
+
+	$a->page['htmlhead'] .= '<script type="text/javascript" src="' . $a->getBaseURL() . '/addon/jappixmini/lib.js"></script>' . "\r\n";
+
+	$username = PConfig::get(local_user(), 'jappixmini', 'username');
+	$username = str_replace("'", "\\'", $username);
+	$server = PConfig::get(local_user(), 'jappixmini', 'server');
+	$server = str_replace("'", "\\'", $server);
+	$bosh = PConfig::get(local_user(), 'jappixmini', 'bosh');
+	$bosh = str_replace("'", "\\'", $bosh);
+	$encrypt = PConfig::get(local_user(), 'jappixmini', 'encrypt');
+	$encrypt = intval($encrypt);
+	$password = PConfig::get(local_user(), 'jappixmini', 'password');
+	$password = str_replace("'", "\\'", $password);
+
+	$autoapprove = PConfig::get(local_user(), 'jappixmini', 'autoapprove');
+	$autoapprove = intval($autoapprove);
+	$autosubscribe = PConfig::get(local_user(), 'jappixmini', 'autosubscribe');
+	$autosubscribe = intval($autosubscribe);
+
+	// set proxy if necessary
+	$use_proxy = Config::get('jappixmini', 'bosh_proxy');
+	if ($use_proxy) {
+		$proxy = $a->getBaseURL() . '/addon/jappixmini/proxy.php';
+	} else {
+		$proxy = "";
+	}
+
+	// get a list of jabber accounts of the contacts
+	$contacts = [];
+	$uid = local_user();
+	$rows = q("SELECT * FROM `pconfig` WHERE `uid`=$uid AND `cat`='jappixmini' AND `k` LIKE 'id:%%'");
+	foreach ($rows as $row) {
+		$key = $row['k'];
+		$pos = strpos($key, ":");
+		$dfrn_id = substr($key, $pos + 1);
+		$r = q("SELECT `name` FROM `contact` WHERE `uid`=$uid AND (`dfrn-id`='%s' OR `issued-id`='%s')", DBA::escape($dfrn_id), DBA::escape($dfrn_id));
+		if (count($r))
+			$name = $r[0]["name"];
+
+		$value = $row['v'];
+		$pos = strpos($value, ":");
+		$address = substr($value, $pos + 1);
+		if (!$address) {
+			continue;
+		}
+		if (!$name) {
+			$name = $address;
+		}
+
+		$contacts[$address] = $name;
+	}
+	$contacts_json = json_encode($contacts);
+	$contacts_hash = sha1($contacts_json);
+
+	// get nickname
+	$r = q("SELECT `username` FROM `user` WHERE `uid`=$uid");
+	$nickname = json_encode($r[0]["username"]);
+	$groupchats = Config::get('jappixmini', 'groupchats');
+	//if $groupchats has no value jappix_addon_start will produce a syntax error
+	if (empty($groupchats)) {
+		$groupchats = "{}";
+	}
+
+	// add javascript to start Jappix Mini
+	$a->page['htmlhead'] .= "<script type=\"text/javascript\">
+        jQuery(document).ready(function() {
+           jappixmini_addon_start('$server', '$username', '$proxy', '$bosh', $encrypt, '$password', $nickname, $contacts_json, '$contacts_hash', $autoapprove, $autosubscribe, $groupchats);
+        });
+    </script>";
+
+	return;
+}
+
+function jappixmini_login(App $a, &$o)
+{
+	// create client secret on login to be able to encrypt jabber passwords
+	// for setDB and str_sha1, needed by jappixmini_addon_set_client_secret
+	$a->page['htmlhead'] .= '<script type="text/javascript" src="' . $a->getBaseURL() . '/addon/jappixmini/jappix/php/get.php?t=js&amp;f=datastore.js~jsjac.js"></script>' . "\r\n";
+
+	// for jappixmini_addon_set_client_secret
+	$a->page['htmlhead'] .= '<script type="text/javascript" src="' . $a->getBaseURL() . '/addon/jappixmini/lib.js"></script>' . "\r\n";
+
+	// save hash of password
+	$o = str_replace("<form ", "<form onsubmit=\"jappixmini_addon_set_client_secret(this.elements['id_password'].value);return true;\" ", $o);
+}
+
+function jappixmini_cron(App $a, $d)
+{
+	// For autosubscribe/autoapprove, we need to maintain a list of jabber addresses of our contacts.
+	Config::set("jappixmini", "last_cron_execution", $d);
+
+	// go through list of users with jabber enabled
+	$users = q("SELECT `uid` FROM `pconfig` WHERE `cat`='jappixmini' AND (`k`='autosubscribe' OR `k`='autoapprove') AND `v`='1'");
+	Logger::log("jappixmini: Update list of contacts' jabber accounts for " . count($users) . " users.");
+
+	if (!count($users)) {
+		return;
+	}
+
+	foreach ($users as $row) {
+		$uid = $row["uid"];
+
+		// for each user, go through list of contacts
+		$contacts = q("SELECT * FROM `contact` WHERE `uid`=%d AND ((LENGTH(`dfrn-id`) AND LENGTH(`pubkey`)) OR (LENGTH(`issued-id`) AND LENGTH(`prvkey`))) AND `network` = '%s'",
+			intval($uid), DBA::escape(Protocol::DFRN));
+		foreach ($contacts as $contact_row) {
+			$request = $contact_row["request"];
+			if (!$request) {
+				continue;
+			}
+
+			$dfrn_id = $contact_row["dfrn-id"];
+			if ($dfrn_id) {
+				$key = $contact_row["pubkey"];
+				$encrypt_func = 'openssl_public_encrypt';
+				$decrypt_func = 'openssl_public_decrypt';
+				$role = "prv";
+			} else {
+				$dfrn_id = $contact_row["issued-id"];
+				$key = $contact_row["prvkey"];
+				$encrypt_func = 'openssl_private_encrypt';
+				$decrypt_func = 'openssl_private_decrypt';
+				$role = "pub";
+			}
+
+			// check if jabber address already present
+			$present = PConfig::get($uid, "jappixmini", "id:" . $dfrn_id);
+			$now = intval(time());
+			if ($present) {
+				// $present has format "timestamp:jabber_address"
+				$p = strpos($present, ":");
+				$timestamp = intval(substr($present, 0, $p));
+
+				// do not re-retrieve jabber address if last retrieval
+				// is not older than a week
+				if ($now - $timestamp < 3600 * 24 * 7) {
+					continue;
+				}
+			}
+
+			// construct base retrieval address
+			$pos = strpos($request, "/dfrn_request/");
+			if ($pos === false) {
+				continue;
+			}
+
+			$base = substr($request, 0, $pos) . "/jappixmini?role=$role";
+
+			// construct own address
+			$username = PConfig::get($uid, 'jappixmini', 'username');
+			if (!$username) {
+				continue;
+			}
+			$server = PConfig::get($uid, 'jappixmini', 'server');
+			if (!$server) {
+				continue;
+			}
+
+			$address = $username . "@" . $server;
+
+			// sign address
+			$signed_address = "";
+			$encrypt_func($address, $signed_address, $key);
+
+			// construct request url
+			$signed_address_hex = bin2hex($signed_address);
+			$url = $base . "&signed_address=$signed_address_hex&dfrn_id=" . urlencode($dfrn_id);
+
+			try {
+				// send request
+				$answer_json = Network::fetchUrl($url);
+
+				// parse answer
+				$answer = json_decode($answer_json);
+				if (empty($answer->status) || ($answer->status != "ok")) {
+					throw new Exception();
+				}
+
+				$encrypted_address_hex = $answer->encrypted_address;
+				if (!$encrypted_address_hex) {
+					throw new Exception();
+				}
+
+				$encrypted_address = hex2bin($encrypted_address_hex);
+				if (!$encrypted_address) {
+					throw new Exception();
+				}
+
+				// decrypt address
+				$decrypted_address = "";
+				$decrypt_func($encrypted_address, $decrypted_address, $key);
+				if (!$decrypted_address) {
+					throw new Exception();
+				}
+			} catch (Exception $e) {
+				$decrypted_address = "";
+			}
+
+			// save address
+			PConfig::set($uid, "jappixmini", "id:$dfrn_id", "$now:$decrypted_address");
+		}
+	}
+}
+
+function jappixmini_download_source(App $a, &$b)
+{
+	// Jappix Mini source download link on About page
+	$b .= '<h1>Jappix Mini</h1>';
+	$b .= '<p>This site uses the jappixmini addon, which includes Jappix Mini by the <a href="' . $a->getBaseURL() . '/addon/jappixmini/jappix/AUTHORS">Jappix authors</a> and is distributed under the terms of the <a href="' . $a->getBaseURL() . '/addon/jappixmini/jappix/COPYING">GNU Affero General Public License</a>.</p>';
+	$b .= '<p>You can download the <a href="' . $a->getBaseURL() . '/addon/jappixmini.tgz">source code of the addon</a>. The rest of Friendica is distributed under compatible licenses and can be retrieved from <a href="https://github.com/friendica/friendica">https://github.com/friendica/friendica</a> and <a href="https://github.com/friendica/friendica-addons">https://github.com/friendica/friendica-addons</a></p>';
+}
diff --git a/jappixmini/lang/C/messages.po b/jappixmini/lang/C/messages.po
new file mode 100644
index 00000000..0b9f273f
--- /dev/null
+++ b/jappixmini/lang/C/messages.po
@@ -0,0 +1,74 @@
+# ADDON jappixmini
+# Copyright (C) 
+# This file is distributed under the same license as the Friendica jappixmini addon package.
+# 
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: jappixmini.php:266
+msgid "Jappix Mini addon settings"
+msgstr ""
+
+#: jappixmini.php:268
+msgid "Activate addon"
+msgstr ""
+
+#: jappixmini.php:271
+msgid "Do <em>not</em> insert the Jappixmini Chat-Widget into the webinterface"
+msgstr ""
+
+#: jappixmini.php:274
+msgid "Jabber username"
+msgstr ""
+
+#: jappixmini.php:277
+msgid "Jabber server"
+msgstr ""
+
+#: jappixmini.php:281
+msgid "Jabber BOSH host"
+msgstr ""
+
+#: jappixmini.php:285
+msgid "Jabber password"
+msgstr ""
+
+#: jappixmini.php:290
+msgid "Encrypt Jabber password with Friendica password (recommended)"
+msgstr ""
+
+#: jappixmini.php:293
+msgid "Friendica password"
+msgstr ""
+
+#: jappixmini.php:296
+msgid "Approve subscription requests from Friendica contacts automatically"
+msgstr ""
+
+#: jappixmini.php:299
+msgid "Subscribe to Friendica contacts automatically"
+msgstr ""
+
+#: jappixmini.php:302
+msgid "Purge internal list of jabber addresses of contacts"
+msgstr ""
+
+#: jappixmini.php:307
+msgid "Submit"
+msgstr ""
+
+#: jappixmini.php:308
+msgid "Add contact"
+msgstr ""
diff --git a/jappixmini/lang/ca/strings.php b/jappixmini/lang/ca/strings.php
new file mode 100644
index 00000000..0f2924ff
--- /dev/null
+++ b/jappixmini/lang/ca/strings.php
@@ -0,0 +1,16 @@
+<?php
+
+$a->strings["Jappix Mini addon settings"] = "";
+$a->strings["Activate addon"] = "";
+$a->strings["Do <em>not</em> insert the Jappixmini Chat-Widget into the webinterface"] = "";
+$a->strings["Jabber username"] = "";
+$a->strings["Jabber server"] = "";
+$a->strings["Jabber BOSH host"] = "";
+$a->strings["Jabber password"] = "";
+$a->strings["Encrypt Jabber password with Friendica password (recommended)"] = "";
+$a->strings["Friendica password"] = "";
+$a->strings["Approve subscription requests from Friendica contacts automatically"] = "";
+$a->strings["Subscribe to Friendica contacts automatically"] = "";
+$a->strings["Purge internal list of jabber addresses of contacts"] = "";
+$a->strings["Submit"] = "Enviar";
+$a->strings["Add contact"] = "";
diff --git a/jappixmini/lang/cs/messages.po b/jappixmini/lang/cs/messages.po
new file mode 100644
index 00000000..6db4e459
--- /dev/null
+++ b/jappixmini/lang/cs/messages.po
@@ -0,0 +1,79 @@
+# ADDON jappixmini
+# Copyright (C)
+# This file is distributed under the same license as the Friendica jappixmini addon package.
+# 
+# 
+# Translators:
+# Aditoo, 2018
+# Aditoo, 2018
+# michal_s <msupler@gmail.com>, 2014-2015
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2018-09-12 12:50+0000\n"
+"Last-Translator: Aditoo\n"
+"Language-Team: Czech (http://www.transifex.com/Friendica/friendica/language/cs/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
+
+#: jappixmini.php:266
+msgid "Jappix Mini addon settings"
+msgstr "Nastavení rozšíření Jappix Mini"
+
+#: jappixmini.php:268
+msgid "Activate addon"
+msgstr "Aktivovat doplněk"
+
+#: jappixmini.php:271
+msgid ""
+"Do <em>not</em> insert the Jappixmini Chat-Widget into the webinterface"
+msgstr "<em>Nevkládejte</em> Jappixmini Chat-Widget do webového rozhraní"
+
+#: jappixmini.php:274
+msgid "Jabber username"
+msgstr "Uživatelské jméno Jabber"
+
+#: jappixmini.php:277
+msgid "Jabber server"
+msgstr "Jabber server"
+
+#: jappixmini.php:281
+msgid "Jabber BOSH host"
+msgstr "Jabber BOSH host"
+
+#: jappixmini.php:285
+msgid "Jabber password"
+msgstr "Heslo Jabber"
+
+#: jappixmini.php:290
+msgid "Encrypt Jabber password with Friendica password (recommended)"
+msgstr "Zašifrovat heslo Jabber heslem Friendica (doporučeno)"
+
+#: jappixmini.php:293
+msgid "Friendica password"
+msgstr "Heslo Friendica"
+
+#: jappixmini.php:296
+msgid "Approve subscription requests from Friendica contacts automatically"
+msgstr "Automaticky schválit požadavek o odběr od kontaktů Friendica."
+
+#: jappixmini.php:299
+msgid "Subscribe to Friendica contacts automatically"
+msgstr "Automaticky odebírat od kontaktů Friendica."
+
+#: jappixmini.php:302
+msgid "Purge internal list of jabber addresses of contacts"
+msgstr "Očistit interní seznam jabber adres kontaktů"
+
+#: jappixmini.php:307
+msgid "Submit"
+msgstr "Odeslat"
+
+#: jappixmini.php:308
+msgid "Add contact"
+msgstr "Přidat kontakt"
diff --git a/jappixmini/lang/cs/strings.php b/jappixmini/lang/cs/strings.php
new file mode 100644
index 00000000..4fe5d352
--- /dev/null
+++ b/jappixmini/lang/cs/strings.php
@@ -0,0 +1,22 @@
+<?php
+
+if(! function_exists("string_plural_select_cs")) {
+function string_plural_select_cs($n){
+	$n = intval($n);
+	return ($n == 1 && $n % 1 == 0) ? 0 : ($n >= 2 && $n <= 4 && $n % 1 == 0) ? 1: ($n % 1 != 0 ) ? 2 : 3;;
+}}
+;
+$a->strings["Jappix Mini addon settings"] = "Nastavení rozšíření Jappix Mini";
+$a->strings["Activate addon"] = "Aktivovat doplněk";
+$a->strings["Do <em>not</em> insert the Jappixmini Chat-Widget into the webinterface"] = "<em>Nevkládejte</em> Jappixmini Chat-Widget do webového rozhraní";
+$a->strings["Jabber username"] = "Uživatelské jméno Jabber";
+$a->strings["Jabber server"] = "Jabber server";
+$a->strings["Jabber BOSH host"] = "Jabber BOSH host";
+$a->strings["Jabber password"] = "Heslo Jabber";
+$a->strings["Encrypt Jabber password with Friendica password (recommended)"] = "Zašifrovat heslo Jabber heslem Friendica (doporučeno)";
+$a->strings["Friendica password"] = "Heslo Friendica";
+$a->strings["Approve subscription requests from Friendica contacts automatically"] = "Automaticky schválit požadavek o odběr od kontaktů Friendica.";
+$a->strings["Subscribe to Friendica contacts automatically"] = "Automaticky odebírat od kontaktů Friendica.";
+$a->strings["Purge internal list of jabber addresses of contacts"] = "Očistit interní seznam jabber adres kontaktů";
+$a->strings["Submit"] = "Odeslat";
+$a->strings["Add contact"] = "Přidat kontakt";
diff --git a/jappixmini/lang/de/messages.po b/jappixmini/lang/de/messages.po
new file mode 100644
index 00000000..c82d572a
--- /dev/null
+++ b/jappixmini/lang/de/messages.po
@@ -0,0 +1,78 @@
+# ADDON jappixmini
+# Copyright (C)
+# This file is distributed under the same license as the Friendica jappixmini addon package.
+# 
+# 
+# Translators:
+# Abrax <webmaster@a-zwenkau.de>, 2014
+# bavatar <tobias.diekershoff@gmx.net>, 2014-2015
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2015-01-31 21:14+0000\n"
+"Last-Translator: bavatar <tobias.diekershoff@gmx.net>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/friendica/language/de/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: jappixmini.php:266
+msgid "Jappix Mini addon settings"
+msgstr "Jappix Mini Addon Einstellungen"
+
+#: jappixmini.php:268
+msgid "Activate addon"
+msgstr "Addon aktivieren"
+
+#: jappixmini.php:271
+msgid ""
+"Do <em>not</em> insert the Jappixmini Chat-Widget into the webinterface"
+msgstr "Füge das Jappix Mini Chat Widget <em>nicht</em> zum Webinterface hinzu"
+
+#: jappixmini.php:274
+msgid "Jabber username"
+msgstr "Jabber Nutzername"
+
+#: jappixmini.php:277
+msgid "Jabber server"
+msgstr "Jabber Server"
+
+#: jappixmini.php:281
+msgid "Jabber BOSH host"
+msgstr "Jabber BOSH Host"
+
+#: jappixmini.php:285
+msgid "Jabber password"
+msgstr "Jabber Passwort"
+
+#: jappixmini.php:290
+msgid "Encrypt Jabber password with Friendica password (recommended)"
+msgstr "Verschlüssele das Jabber Passwort mit dem Friendica Passwort (empfohlen)"
+
+#: jappixmini.php:293
+msgid "Friendica password"
+msgstr "Friendica Passwort"
+
+#: jappixmini.php:296
+msgid "Approve subscription requests from Friendica contacts automatically"
+msgstr "Kontaktanfragen von Friendica Kontakten automatisch akzeptieren"
+
+#: jappixmini.php:299
+msgid "Subscribe to Friendica contacts automatically"
+msgstr "Automatisch Friendica Kontakten bei Jabber folgen"
+
+#: jappixmini.php:302
+msgid "Purge internal list of jabber addresses of contacts"
+msgstr "Lösche die interne Liste der Jabber Adressen der Kontakte"
+
+#: jappixmini.php:307
+msgid "Submit"
+msgstr "Senden"
+
+#: jappixmini.php:308
+msgid "Add contact"
+msgstr "Kontakt hinzufügen"
diff --git a/jappixmini/lang/de/strings.php b/jappixmini/lang/de/strings.php
new file mode 100644
index 00000000..5982ac1d
--- /dev/null
+++ b/jappixmini/lang/de/strings.php
@@ -0,0 +1,21 @@
+<?php
+
+if(! function_exists("string_plural_select_de")) {
+function string_plural_select_de($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["Jappix Mini addon settings"] = "Jappix Mini Addon Einstellungen";
+$a->strings["Activate addon"] = "Addon aktivieren";
+$a->strings["Do <em>not</em> insert the Jappixmini Chat-Widget into the webinterface"] = "Füge das Jappix Mini Chat Widget <em>nicht</em> zum Webinterface hinzu";
+$a->strings["Jabber username"] = "Jabber Nutzername";
+$a->strings["Jabber server"] = "Jabber Server";
+$a->strings["Jabber BOSH host"] = "Jabber BOSH Host";
+$a->strings["Jabber password"] = "Jabber Passwort";
+$a->strings["Encrypt Jabber password with Friendica password (recommended)"] = "Verschlüssele das Jabber Passwort mit dem Friendica Passwort (empfohlen)";
+$a->strings["Friendica password"] = "Friendica Passwort";
+$a->strings["Approve subscription requests from Friendica contacts automatically"] = "Kontaktanfragen von Friendica Kontakten automatisch akzeptieren";
+$a->strings["Subscribe to Friendica contacts automatically"] = "Automatisch Friendica Kontakten bei Jabber folgen";
+$a->strings["Purge internal list of jabber addresses of contacts"] = "Lösche die interne Liste der Jabber Adressen der Kontakte";
+$a->strings["Submit"] = "Senden";
+$a->strings["Add contact"] = "Kontakt hinzufügen";
diff --git a/jappixmini/lang/eo/strings.php b/jappixmini/lang/eo/strings.php
new file mode 100644
index 00000000..a2118546
--- /dev/null
+++ b/jappixmini/lang/eo/strings.php
@@ -0,0 +1,16 @@
+<?php
+
+$a->strings["Jappix Mini addon settings"] = "";
+$a->strings["Activate addon"] = "";
+$a->strings["Do <em>not</em> insert the Jappixmini Chat-Widget into the webinterface"] = "";
+$a->strings["Jabber username"] = "";
+$a->strings["Jabber server"] = "";
+$a->strings["Jabber BOSH host"] = "";
+$a->strings["Jabber password"] = "";
+$a->strings["Encrypt Jabber password with Friendica password (recommended)"] = "";
+$a->strings["Friendica password"] = "";
+$a->strings["Approve subscription requests from Friendica contacts automatically"] = "";
+$a->strings["Subscribe to Friendica contacts automatically"] = "";
+$a->strings["Purge internal list of jabber addresses of contacts"] = "";
+$a->strings["Submit"] = "Sendi";
+$a->strings["Add contact"] = "";
diff --git a/jappixmini/lang/es/messages.po b/jappixmini/lang/es/messages.po
new file mode 100644
index 00000000..4893c845
--- /dev/null
+++ b/jappixmini/lang/es/messages.po
@@ -0,0 +1,77 @@
+# ADDON jappixmini
+# Copyright (C)
+# This file is distributed under the same license as the Friendica jappixmini addon package.
+# 
+# 
+# Translators:
+# Albert, 2016
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2016-11-17 18:56+0000\n"
+"Last-Translator: Albert\n"
+"Language-Team: Spanish (http://www.transifex.com/Friendica/friendica/language/es/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: jappixmini.php:266
+msgid "Jappix Mini addon settings"
+msgstr "Ajustes del addon de Jappix Mini"
+
+#: jappixmini.php:268
+msgid "Activate addon"
+msgstr "Activar addon"
+
+#: jappixmini.php:271
+msgid ""
+"Do <em>not</em> insert the Jappixmini Chat-Widget into the webinterface"
+msgstr "<em>No</em> insertar el Widget de chat de Jappixmini en la interfaz web"
+
+#: jappixmini.php:274
+msgid "Jabber username"
+msgstr "Usuario de Jabber"
+
+#: jappixmini.php:277
+msgid "Jabber server"
+msgstr "Servidor de Jabber"
+
+#: jappixmini.php:281
+msgid "Jabber BOSH host"
+msgstr "Servidor de Jabber BOSH"
+
+#: jappixmini.php:285
+msgid "Jabber password"
+msgstr "Contraseña de Jabber"
+
+#: jappixmini.php:290
+msgid "Encrypt Jabber password with Friendica password (recommended)"
+msgstr "Encriptar la contraseña de Jabber con la contraseña de Friendica (recomendado)"
+
+#: jappixmini.php:293
+msgid "Friendica password"
+msgstr "Contraseña de Friendica"
+
+#: jappixmini.php:296
+msgid "Approve subscription requests from Friendica contacts automatically"
+msgstr "Aprobar solicitud de suscripción de los contactos de Friendica automáticamente"
+
+#: jappixmini.php:299
+msgid "Subscribe to Friendica contacts automatically"
+msgstr "Siscribirse a los contactos de Friendica automáticamente"
+
+#: jappixmini.php:302
+msgid "Purge internal list of jabber addresses of contacts"
+msgstr "Eliminar la lista interna de direcciones de contactos de jabber"
+
+#: jappixmini.php:307
+msgid "Submit"
+msgstr "Enviar"
+
+#: jappixmini.php:308
+msgid "Add contact"
+msgstr "Añadir contacto"
diff --git a/jappixmini/lang/es/strings.php b/jappixmini/lang/es/strings.php
new file mode 100644
index 00000000..440ccefd
--- /dev/null
+++ b/jappixmini/lang/es/strings.php
@@ -0,0 +1,21 @@
+<?php
+
+if(! function_exists("string_plural_select_es")) {
+function string_plural_select_es($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["Jappix Mini addon settings"] = "Ajustes del addon de Jappix Mini";
+$a->strings["Activate addon"] = "Activar addon";
+$a->strings["Do <em>not</em> insert the Jappixmini Chat-Widget into the webinterface"] = "<em>No</em> insertar el Widget de chat de Jappixmini en la interfaz web";
+$a->strings["Jabber username"] = "Usuario de Jabber";
+$a->strings["Jabber server"] = "Servidor de Jabber";
+$a->strings["Jabber BOSH host"] = "Servidor de Jabber BOSH";
+$a->strings["Jabber password"] = "Contraseña de Jabber";
+$a->strings["Encrypt Jabber password with Friendica password (recommended)"] = "Encriptar la contraseña de Jabber con la contraseña de Friendica (recomendado)";
+$a->strings["Friendica password"] = "Contraseña de Friendica";
+$a->strings["Approve subscription requests from Friendica contacts automatically"] = "Aprobar solicitud de suscripción de los contactos de Friendica automáticamente";
+$a->strings["Subscribe to Friendica contacts automatically"] = "Siscribirse a los contactos de Friendica automáticamente";
+$a->strings["Purge internal list of jabber addresses of contacts"] = "Eliminar la lista interna de direcciones de contactos de jabber";
+$a->strings["Submit"] = "Enviar";
+$a->strings["Add contact"] = "Añadir contacto";
diff --git a/jappixmini/lang/fi-fi/messages.po b/jappixmini/lang/fi-fi/messages.po
new file mode 100644
index 00000000..c1b0cd57
--- /dev/null
+++ b/jappixmini/lang/fi-fi/messages.po
@@ -0,0 +1,78 @@
+# ADDON jappixmini
+# Copyright (C)
+# This file is distributed under the same license as the Friendica jappixmini addon package.
+# 
+# 
+# Translators:
+# Kris, 2018
+# Kris, 2018
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2018-05-12 12:59+0000\n"
+"Last-Translator: Kris\n"
+"Language-Team: Finnish (Finland) (http://www.transifex.com/Friendica/friendica/language/fi_FI/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fi_FI\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: jappixmini.php:266
+msgid "Jappix Mini addon settings"
+msgstr "Jappix Mini -lisäosan asetukset"
+
+#: jappixmini.php:268
+msgid "Activate addon"
+msgstr "Ota lisäosa käyttöön"
+
+#: jappixmini.php:271
+msgid ""
+"Do <em>not</em> insert the Jappixmini Chat-Widget into the webinterface"
+msgstr ""
+
+#: jappixmini.php:274
+msgid "Jabber username"
+msgstr "Jabber -käyttäjätunnus"
+
+#: jappixmini.php:277
+msgid "Jabber server"
+msgstr "Jabber -palvelin"
+
+#: jappixmini.php:281
+msgid "Jabber BOSH host"
+msgstr "Jabber BOSH-palvelin"
+
+#: jappixmini.php:285
+msgid "Jabber password"
+msgstr "Jabber -salasana"
+
+#: jappixmini.php:290
+msgid "Encrypt Jabber password with Friendica password (recommended)"
+msgstr "Salaa Jabber -salasana Friendica -salasanalla (suositeltava)"
+
+#: jappixmini.php:293
+msgid "Friendica password"
+msgstr "Friendica -salasana"
+
+#: jappixmini.php:296
+msgid "Approve subscription requests from Friendica contacts automatically"
+msgstr "Hyväksy automaattisesti tilauspyynnöt Friendica -kontakteilta"
+
+#: jappixmini.php:299
+msgid "Subscribe to Friendica contacts automatically"
+msgstr ""
+
+#: jappixmini.php:302
+msgid "Purge internal list of jabber addresses of contacts"
+msgstr ""
+
+#: jappixmini.php:307
+msgid "Submit"
+msgstr "Lähetä"
+
+#: jappixmini.php:308
+msgid "Add contact"
+msgstr "Lisää kontakti"
diff --git a/jappixmini/lang/fi-fi/strings.php b/jappixmini/lang/fi-fi/strings.php
new file mode 100644
index 00000000..f86fbc3c
--- /dev/null
+++ b/jappixmini/lang/fi-fi/strings.php
@@ -0,0 +1,22 @@
+<?php
+
+if(! function_exists("string_plural_select_fi_fi")) {
+function string_plural_select_fi_fi($n){
+	$n = intval($n);
+	return ($n != 1);;
+}}
+;
+$a->strings["Jappix Mini addon settings"] = "Jappix Mini -lisäosan asetukset";
+$a->strings["Activate addon"] = "Ota lisäosa käyttöön";
+$a->strings["Do <em>not</em> insert the Jappixmini Chat-Widget into the webinterface"] = "";
+$a->strings["Jabber username"] = "Jabber -käyttäjätunnus";
+$a->strings["Jabber server"] = "Jabber -palvelin";
+$a->strings["Jabber BOSH host"] = "Jabber BOSH-palvelin";
+$a->strings["Jabber password"] = "Jabber -salasana";
+$a->strings["Encrypt Jabber password with Friendica password (recommended)"] = "Salaa Jabber -salasana Friendica -salasanalla (suositeltava)";
+$a->strings["Friendica password"] = "Friendica -salasana";
+$a->strings["Approve subscription requests from Friendica contacts automatically"] = "Hyväksy automaattisesti tilauspyynnöt Friendica -kontakteilta";
+$a->strings["Subscribe to Friendica contacts automatically"] = "";
+$a->strings["Purge internal list of jabber addresses of contacts"] = "";
+$a->strings["Submit"] = "Lähetä";
+$a->strings["Add contact"] = "Lisää kontakti";
diff --git a/jappixmini/lang/fr/messages.po b/jappixmini/lang/fr/messages.po
new file mode 100644
index 00000000..98a6f5ce
--- /dev/null
+++ b/jappixmini/lang/fr/messages.po
@@ -0,0 +1,78 @@
+# ADDON jappixmini
+# Copyright (C)
+# This file is distributed under the same license as the Friendica jappixmini addon package.
+# 
+# 
+# Translators:
+# Nicola Spanti <translations@nicola-spanti.info>, 2015
+# StefOfficiel <pichard.stephane@free.fr>, 2015
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2015-08-30 17:13+0000\n"
+"Last-Translator: Nicola Spanti <translations@nicola-spanti.info>\n"
+"Language-Team: French (http://www.transifex.com/Friendica/friendica/language/fr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: jappixmini.php:266
+msgid "Jappix Mini addon settings"
+msgstr "Paramètres de l'addon Jappix Mini"
+
+#: jappixmini.php:268
+msgid "Activate addon"
+msgstr "Activer l'addon"
+
+#: jappixmini.php:271
+msgid ""
+"Do <em>not</em> insert the Jappixmini Chat-Widget into the webinterface"
+msgstr "Ne <em>pas</em> insérer le widget JappixMini dans l'interface web"
+
+#: jappixmini.php:274
+msgid "Jabber username"
+msgstr "Nom d'utilisateur Jabber"
+
+#: jappixmini.php:277
+msgid "Jabber server"
+msgstr "Serveur Jabber"
+
+#: jappixmini.php:281
+msgid "Jabber BOSH host"
+msgstr "Hôte BOSH (proxy) Jabber"
+
+#: jappixmini.php:285
+msgid "Jabber password"
+msgstr "Mot de passe Jabber"
+
+#: jappixmini.php:290
+msgid "Encrypt Jabber password with Friendica password (recommended)"
+msgstr "Chiffrer le mot de passe Jabber avec le mot de passe Friendica (recommandé)"
+
+#: jappixmini.php:293
+msgid "Friendica password"
+msgstr "Mot de passe Friendica"
+
+#: jappixmini.php:296
+msgid "Approve subscription requests from Friendica contacts automatically"
+msgstr "Approuver les contacts Friendica automatiquement"
+
+#: jappixmini.php:299
+msgid "Subscribe to Friendica contacts automatically"
+msgstr "S'inscrire aux contacts Friendica automatiquement"
+
+#: jappixmini.php:302
+msgid "Purge internal list of jabber addresses of contacts"
+msgstr "Purger la liste interne d'adresses Jabber"
+
+#: jappixmini.php:307
+msgid "Submit"
+msgstr "Envoyer"
+
+#: jappixmini.php:308
+msgid "Add contact"
+msgstr "Ajouter un contact"
diff --git a/jappixmini/lang/fr/strings.php b/jappixmini/lang/fr/strings.php
new file mode 100644
index 00000000..35ceca65
--- /dev/null
+++ b/jappixmini/lang/fr/strings.php
@@ -0,0 +1,21 @@
+<?php
+
+if(! function_exists("string_plural_select_fr")) {
+function string_plural_select_fr($n){
+	return ($n > 1);;
+}}
+;
+$a->strings["Jappix Mini addon settings"] = "Paramètres de l'addon Jappix Mini";
+$a->strings["Activate addon"] = "Activer l'addon";
+$a->strings["Do <em>not</em> insert the Jappixmini Chat-Widget into the webinterface"] = "Ne <em>pas</em> insérer le widget JappixMini dans l'interface web";
+$a->strings["Jabber username"] = "Nom d'utilisateur Jabber";
+$a->strings["Jabber server"] = "Serveur Jabber";
+$a->strings["Jabber BOSH host"] = "Hôte BOSH (proxy) Jabber";
+$a->strings["Jabber password"] = "Mot de passe Jabber";
+$a->strings["Encrypt Jabber password with Friendica password (recommended)"] = "Chiffrer le mot de passe Jabber avec le mot de passe Friendica (recommandé)";
+$a->strings["Friendica password"] = "Mot de passe Friendica";
+$a->strings["Approve subscription requests from Friendica contacts automatically"] = "Approuver les contacts Friendica automatiquement";
+$a->strings["Subscribe to Friendica contacts automatically"] = "S'inscrire aux contacts Friendica automatiquement";
+$a->strings["Purge internal list of jabber addresses of contacts"] = "Purger la liste interne d'adresses Jabber";
+$a->strings["Submit"] = "Envoyer";
+$a->strings["Add contact"] = "Ajouter un contact";
diff --git a/jappixmini/lang/is/strings.php b/jappixmini/lang/is/strings.php
new file mode 100644
index 00000000..30e8f43e
--- /dev/null
+++ b/jappixmini/lang/is/strings.php
@@ -0,0 +1,16 @@
+<?php
+
+$a->strings["Jappix Mini addon settings"] = "";
+$a->strings["Activate addon"] = "";
+$a->strings["Do <em>not</em> insert the Jappixmini Chat-Widget into the webinterface"] = "";
+$a->strings["Jabber username"] = "";
+$a->strings["Jabber server"] = "";
+$a->strings["Jabber BOSH host"] = "";
+$a->strings["Jabber password"] = "";
+$a->strings["Encrypt Jabber password with Friendica password (recommended)"] = "";
+$a->strings["Friendica password"] = "";
+$a->strings["Approve subscription requests from Friendica contacts automatically"] = "";
+$a->strings["Subscribe to Friendica contacts automatically"] = "";
+$a->strings["Purge internal list of jabber addresses of contacts"] = "";
+$a->strings["Submit"] = "Senda inn";
+$a->strings["Add contact"] = "";
diff --git a/jappixmini/lang/it/messages.po b/jappixmini/lang/it/messages.po
new file mode 100644
index 00000000..620e1db8
--- /dev/null
+++ b/jappixmini/lang/it/messages.po
@@ -0,0 +1,77 @@
+# ADDON jappixmini
+# Copyright (C)
+# This file is distributed under the same license as the Friendica jappixmini addon package.
+# 
+# 
+# Translators:
+# fabrixxm <fabrix.xm@gmail.com>, 2014-2015
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2017-09-20 06:08+0000\n"
+"Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n"
+"Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: it\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: jappixmini.php:266
+msgid "Jappix Mini addon settings"
+msgstr "Impostazioni plugin Jappix Mini"
+
+#: jappixmini.php:268
+msgid "Activate addon"
+msgstr "Abilita plugin"
+
+#: jappixmini.php:271
+msgid ""
+"Do <em>not</em> insert the Jappixmini Chat-Widget into the webinterface"
+msgstr "Non inserire Jappixmini nell'intrerfaccia web"
+
+#: jappixmini.php:274
+msgid "Jabber username"
+msgstr "Nome utente Jabber"
+
+#: jappixmini.php:277
+msgid "Jabber server"
+msgstr "Server Jabber"
+
+#: jappixmini.php:281
+msgid "Jabber BOSH host"
+msgstr "Server BOSH Jabber"
+
+#: jappixmini.php:285
+msgid "Jabber password"
+msgstr "Password Jabber"
+
+#: jappixmini.php:290
+msgid "Encrypt Jabber password with Friendica password (recommended)"
+msgstr "Cripta la password Jabber con la password di Friendica (consigliato)"
+
+#: jappixmini.php:293
+msgid "Friendica password"
+msgstr "Password Friendica"
+
+#: jappixmini.php:296
+msgid "Approve subscription requests from Friendica contacts automatically"
+msgstr "Approva le richieste di collegamento dai tuoi contatti Friendica automaticamente"
+
+#: jappixmini.php:299
+msgid "Subscribe to Friendica contacts automatically"
+msgstr "Sottoscrivi automaticamente i contatti Friendica"
+
+#: jappixmini.php:302
+msgid "Purge internal list of jabber addresses of contacts"
+msgstr "Pulisci la lista interna degli indirizzi Jabber dei contatti"
+
+#: jappixmini.php:307
+msgid "Submit"
+msgstr "Invia"
+
+#: jappixmini.php:308
+msgid "Add contact"
+msgstr "Aggiungi contatto"
diff --git a/jappixmini/lang/it/strings.php b/jappixmini/lang/it/strings.php
new file mode 100644
index 00000000..51f6b794
--- /dev/null
+++ b/jappixmini/lang/it/strings.php
@@ -0,0 +1,21 @@
+<?php
+
+if(! function_exists("string_plural_select_it")) {
+function string_plural_select_it($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["Jappix Mini addon settings"] = "Impostazioni plugin Jappix Mini";
+$a->strings["Activate addon"] = "Abilita plugin";
+$a->strings["Do <em>not</em> insert the Jappixmini Chat-Widget into the webinterface"] = "Non inserire Jappixmini nell'intrerfaccia web";
+$a->strings["Jabber username"] = "Nome utente Jabber";
+$a->strings["Jabber server"] = "Server Jabber";
+$a->strings["Jabber BOSH host"] = "Server BOSH Jabber";
+$a->strings["Jabber password"] = "Password Jabber";
+$a->strings["Encrypt Jabber password with Friendica password (recommended)"] = "Cripta la password Jabber con la password di Friendica (consigliato)";
+$a->strings["Friendica password"] = "Password Friendica";
+$a->strings["Approve subscription requests from Friendica contacts automatically"] = "Approva le richieste di collegamento dai tuoi contatti Friendica automaticamente";
+$a->strings["Subscribe to Friendica contacts automatically"] = "Sottoscrivi automaticamente i contatti Friendica";
+$a->strings["Purge internal list of jabber addresses of contacts"] = "Pulisci la lista interna degli indirizzi Jabber dei contatti";
+$a->strings["Submit"] = "Invia";
+$a->strings["Add contact"] = "Aggiungi contatto";
diff --git a/jappixmini/lang/nb-no/strings.php b/jappixmini/lang/nb-no/strings.php
new file mode 100644
index 00000000..bced0027
--- /dev/null
+++ b/jappixmini/lang/nb-no/strings.php
@@ -0,0 +1,16 @@
+<?php
+
+$a->strings["Jappix Mini addon settings"] = "";
+$a->strings["Activate addon"] = "";
+$a->strings["Do <em>not</em> insert the Jappixmini Chat-Widget into the webinterface"] = "";
+$a->strings["Jabber username"] = "";
+$a->strings["Jabber server"] = "";
+$a->strings["Jabber BOSH host"] = "";
+$a->strings["Jabber password"] = "";
+$a->strings["Encrypt Jabber password with Friendica password (recommended)"] = "";
+$a->strings["Friendica password"] = "";
+$a->strings["Approve subscription requests from Friendica contacts automatically"] = "";
+$a->strings["Subscribe to Friendica contacts automatically"] = "";
+$a->strings["Purge internal list of jabber addresses of contacts"] = "";
+$a->strings["Submit"] = "Lagre";
+$a->strings["Add contact"] = "";
diff --git a/jappixmini/lang/nl/messages.po b/jappixmini/lang/nl/messages.po
new file mode 100644
index 00000000..592e155b
--- /dev/null
+++ b/jappixmini/lang/nl/messages.po
@@ -0,0 +1,77 @@
+# ADDON jappixmini
+# Copyright (C)
+# This file is distributed under the same license as the Friendica jappixmini addon package.
+# 
+# 
+# Translators:
+# Jeroen De Meerleer <me@jeroened.be>, 2018
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2018-08-24 11:48+0000\n"
+"Last-Translator: Jeroen De Meerleer <me@jeroened.be>\n"
+"Language-Team: Dutch (http://www.transifex.com/Friendica/friendica/language/nl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: jappixmini.php:266
+msgid "Jappix Mini addon settings"
+msgstr "Jappix Mini addon instellingen"
+
+#: jappixmini.php:268
+msgid "Activate addon"
+msgstr "Activatie addon"
+
+#: jappixmini.php:271
+msgid ""
+"Do <em>not</em> insert the Jappixmini Chat-Widget into the webinterface"
+msgstr ""
+
+#: jappixmini.php:274
+msgid "Jabber username"
+msgstr ""
+
+#: jappixmini.php:277
+msgid "Jabber server"
+msgstr ""
+
+#: jappixmini.php:281
+msgid "Jabber BOSH host"
+msgstr ""
+
+#: jappixmini.php:285
+msgid "Jabber password"
+msgstr ""
+
+#: jappixmini.php:290
+msgid "Encrypt Jabber password with Friendica password (recommended)"
+msgstr ""
+
+#: jappixmini.php:293
+msgid "Friendica password"
+msgstr ""
+
+#: jappixmini.php:296
+msgid "Approve subscription requests from Friendica contacts automatically"
+msgstr ""
+
+#: jappixmini.php:299
+msgid "Subscribe to Friendica contacts automatically"
+msgstr ""
+
+#: jappixmini.php:302
+msgid "Purge internal list of jabber addresses of contacts"
+msgstr ""
+
+#: jappixmini.php:307
+msgid "Submit"
+msgstr ""
+
+#: jappixmini.php:308
+msgid "Add contact"
+msgstr ""
diff --git a/jappixmini/lang/nl/strings.php b/jappixmini/lang/nl/strings.php
new file mode 100644
index 00000000..7753199a
--- /dev/null
+++ b/jappixmini/lang/nl/strings.php
@@ -0,0 +1,22 @@
+<?php
+
+if(! function_exists("string_plural_select_nl")) {
+function string_plural_select_nl($n){
+	$n = intval($n);
+	return ($n != 1);;
+}}
+;
+$a->strings["Jappix Mini addon settings"] = "Jappix Mini addon instellingen";
+$a->strings["Activate addon"] = "Activatie addon";
+$a->strings["Do <em>not</em> insert the Jappixmini Chat-Widget into the webinterface"] = "";
+$a->strings["Jabber username"] = "";
+$a->strings["Jabber server"] = "";
+$a->strings["Jabber BOSH host"] = "";
+$a->strings["Jabber password"] = "";
+$a->strings["Encrypt Jabber password with Friendica password (recommended)"] = "";
+$a->strings["Friendica password"] = "";
+$a->strings["Approve subscription requests from Friendica contacts automatically"] = "";
+$a->strings["Subscribe to Friendica contacts automatically"] = "";
+$a->strings["Purge internal list of jabber addresses of contacts"] = "";
+$a->strings["Submit"] = "";
+$a->strings["Add contact"] = "";
diff --git a/jappixmini/lang/pl/messages.po b/jappixmini/lang/pl/messages.po
new file mode 100644
index 00000000..7c7db070
--- /dev/null
+++ b/jappixmini/lang/pl/messages.po
@@ -0,0 +1,77 @@
+# ADDON jappixmini
+# Copyright (C)
+# This file is distributed under the same license as the Friendica jappixmini addon package.
+# 
+# 
+# Translators:
+# Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>, 2018
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2018-08-04 11:37+0000\n"
+"Last-Translator: Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>\n"
+"Language-Team: Polish (http://www.transifex.com/Friendica/friendica/language/pl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pl\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
+
+#: jappixmini.php:266
+msgid "Jappix Mini addon settings"
+msgstr "Ustawienia dodatku Jappix Mini"
+
+#: jappixmini.php:268
+msgid "Activate addon"
+msgstr "Aktywuj dodatek"
+
+#: jappixmini.php:271
+msgid ""
+"Do <em>not</em> insert the Jappixmini Chat-Widget into the webinterface"
+msgstr "<em>Nie</em> wstawiaj widżetu czatu Jappixmini do interfejsu WWW"
+
+#: jappixmini.php:274
+msgid "Jabber username"
+msgstr "Nazwa użytkownika Jabber"
+
+#: jappixmini.php:277
+msgid "Jabber server"
+msgstr "Serwer Jabber"
+
+#: jappixmini.php:281
+msgid "Jabber BOSH host"
+msgstr "Host Jabber BOSH"
+
+#: jappixmini.php:285
+msgid "Jabber password"
+msgstr "Hasło Jabber"
+
+#: jappixmini.php:290
+msgid "Encrypt Jabber password with Friendica password (recommended)"
+msgstr "Szyfrowanie hasła Jabbera za pomocą hasła Friendica (zalecane)"
+
+#: jappixmini.php:293
+msgid "Friendica password"
+msgstr "Hasło Friendica"
+
+#: jappixmini.php:296
+msgid "Approve subscription requests from Friendica contacts automatically"
+msgstr "Subskrybuj automatycznie kontakty z Friendica"
+
+#: jappixmini.php:299
+msgid "Subscribe to Friendica contacts automatically"
+msgstr "Subskrybuj kontakty z Friendica automatycznie"
+
+#: jappixmini.php:302
+msgid "Purge internal list of jabber addresses of contacts"
+msgstr "Usuń wewnętrzną listę adresów Jabber z kontaktów"
+
+#: jappixmini.php:307
+msgid "Submit"
+msgstr "Wyślij"
+
+#: jappixmini.php:308
+msgid "Add contact"
+msgstr "Dodaj kontakt"
diff --git a/jappixmini/lang/pl/strings.php b/jappixmini/lang/pl/strings.php
new file mode 100644
index 00000000..efc4a7c8
--- /dev/null
+++ b/jappixmini/lang/pl/strings.php
@@ -0,0 +1,22 @@
+<?php
+
+if(! function_exists("string_plural_select_pl")) {
+function string_plural_select_pl($n){
+	$n = intval($n);
+	return ($n==1 ? 0 : ($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14) ? 1 : $n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14) ? 2 : 3);;
+}}
+;
+$a->strings["Jappix Mini addon settings"] = "Ustawienia dodatku Jappix Mini";
+$a->strings["Activate addon"] = "Aktywuj dodatek";
+$a->strings["Do <em>not</em> insert the Jappixmini Chat-Widget into the webinterface"] = "<em>Nie</em> wstawiaj widżetu czatu Jappixmini do interfejsu WWW";
+$a->strings["Jabber username"] = "Nazwa użytkownika Jabber";
+$a->strings["Jabber server"] = "Serwer Jabber";
+$a->strings["Jabber BOSH host"] = "Host Jabber BOSH";
+$a->strings["Jabber password"] = "Hasło Jabber";
+$a->strings["Encrypt Jabber password with Friendica password (recommended)"] = "Szyfrowanie hasła Jabbera za pomocą hasła Friendica (zalecane)";
+$a->strings["Friendica password"] = "Hasło Friendica";
+$a->strings["Approve subscription requests from Friendica contacts automatically"] = "Subskrybuj automatycznie kontakty z Friendica";
+$a->strings["Subscribe to Friendica contacts automatically"] = "Subskrybuj kontakty z Friendica automatycznie";
+$a->strings["Purge internal list of jabber addresses of contacts"] = "Usuń wewnętrzną listę adresów Jabber z kontaktów";
+$a->strings["Submit"] = "Wyślij";
+$a->strings["Add contact"] = "Dodaj kontakt";
diff --git a/jappixmini/lang/pt-br/messages.po b/jappixmini/lang/pt-br/messages.po
new file mode 100644
index 00000000..9818ae7e
--- /dev/null
+++ b/jappixmini/lang/pt-br/messages.po
@@ -0,0 +1,77 @@
+# ADDON jappixmini
+# Copyright (C)
+# This file is distributed under the same license as the Friendica jappixmini addon package.
+# 
+# 
+# Translators:
+# Beatriz Vital <vitalb@riseup.net>, 2016
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2016-08-19 20:35+0000\n"
+"Last-Translator: Beatriz Vital <vitalb@riseup.net>\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/Friendica/friendica/language/pt_BR/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pt_BR\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: jappixmini.php:266
+msgid "Jappix Mini addon settings"
+msgstr ""
+
+#: jappixmini.php:268
+msgid "Activate addon"
+msgstr ""
+
+#: jappixmini.php:271
+msgid ""
+"Do <em>not</em> insert the Jappixmini Chat-Widget into the webinterface"
+msgstr ""
+
+#: jappixmini.php:274
+msgid "Jabber username"
+msgstr "Nome de usuário no Jabber"
+
+#: jappixmini.php:277
+msgid "Jabber server"
+msgstr ""
+
+#: jappixmini.php:281
+msgid "Jabber BOSH host"
+msgstr ""
+
+#: jappixmini.php:285
+msgid "Jabber password"
+msgstr "Senha do Jabber"
+
+#: jappixmini.php:290
+msgid "Encrypt Jabber password with Friendica password (recommended)"
+msgstr "Criptografar senha de Jabber com senha do Friendica (recomendado)"
+
+#: jappixmini.php:293
+msgid "Friendica password"
+msgstr "Senha do Friendica"
+
+#: jappixmini.php:296
+msgid "Approve subscription requests from Friendica contacts automatically"
+msgstr ""
+
+#: jappixmini.php:299
+msgid "Subscribe to Friendica contacts automatically"
+msgstr ""
+
+#: jappixmini.php:302
+msgid "Purge internal list of jabber addresses of contacts"
+msgstr ""
+
+#: jappixmini.php:307
+msgid "Submit"
+msgstr "Enviar"
+
+#: jappixmini.php:308
+msgid "Add contact"
+msgstr ""
diff --git a/jappixmini/lang/pt-br/strings.php b/jappixmini/lang/pt-br/strings.php
new file mode 100644
index 00000000..6d5b61bc
--- /dev/null
+++ b/jappixmini/lang/pt-br/strings.php
@@ -0,0 +1,21 @@
+<?php
+
+if(! function_exists("string_plural_select_pt_br")) {
+function string_plural_select_pt_br($n){
+	return ($n > 1);;
+}}
+;
+$a->strings["Jappix Mini addon settings"] = "";
+$a->strings["Activate addon"] = "";
+$a->strings["Do <em>not</em> insert the Jappixmini Chat-Widget into the webinterface"] = "";
+$a->strings["Jabber username"] = "Nome de usuário no Jabber";
+$a->strings["Jabber server"] = "";
+$a->strings["Jabber BOSH host"] = "";
+$a->strings["Jabber password"] = "Senha do Jabber";
+$a->strings["Encrypt Jabber password with Friendica password (recommended)"] = "Criptografar senha de Jabber com senha do Friendica (recomendado)";
+$a->strings["Friendica password"] = "Senha do Friendica";
+$a->strings["Approve subscription requests from Friendica contacts automatically"] = "";
+$a->strings["Subscribe to Friendica contacts automatically"] = "";
+$a->strings["Purge internal list of jabber addresses of contacts"] = "";
+$a->strings["Submit"] = "Enviar";
+$a->strings["Add contact"] = "";
diff --git a/jappixmini/lang/ro/messages.po b/jappixmini/lang/ro/messages.po
new file mode 100644
index 00000000..0ec34810
--- /dev/null
+++ b/jappixmini/lang/ro/messages.po
@@ -0,0 +1,77 @@
+# ADDON jappixmini
+# Copyright (C)
+# This file is distributed under the same license as the Friendica jappixmini addon package.
+# 
+# 
+# Translators:
+# Doru  DEACONU <dumitrudeaconu@yahoo.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2014-11-27 14:18+0000\n"
+"Last-Translator: Doru  DEACONU <dumitrudeaconu@yahoo.com>\n"
+"Language-Team: Romanian (Romania) (http://www.transifex.com/projects/p/friendica/language/ro_RO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ro_RO\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
+
+#: jappixmini.php:266
+msgid "Jappix Mini addon settings"
+msgstr "Configurare addon Mini Jappix"
+
+#: jappixmini.php:268
+msgid "Activate addon"
+msgstr "Activare supliment"
+
+#: jappixmini.php:271
+msgid ""
+"Do <em>not</em> insert the Jappixmini Chat-Widget into the webinterface"
+msgstr "<em>Nu</em> se introduce Jappixmini Chat-Widget în interfața web"
+
+#: jappixmini.php:274
+msgid "Jabber username"
+msgstr "Utilizator Jabber "
+
+#: jappixmini.php:277
+msgid "Jabber server"
+msgstr "Server Jabber "
+
+#: jappixmini.php:281
+msgid "Jabber BOSH host"
+msgstr "Host BOSH Jabber"
+
+#: jappixmini.php:285
+msgid "Jabber password"
+msgstr "Parolă Jabber "
+
+#: jappixmini.php:290
+msgid "Encrypt Jabber password with Friendica password (recommended)"
+msgstr "Criptare parolă Jabber cu parola Friendica (recomandat)"
+
+#: jappixmini.php:293
+msgid "Friendica password"
+msgstr "Parolă Friendica "
+
+#: jappixmini.php:296
+msgid "Approve subscription requests from Friendica contacts automatically"
+msgstr "Aprobare solicitări de subscriere din contactele Friendica, în mod automat"
+
+#: jappixmini.php:299
+msgid "Subscribe to Friendica contacts automatically"
+msgstr "Abonare automată la contactele Friendica"
+
+#: jappixmini.php:302
+msgid "Purge internal list of jabber addresses of contacts"
+msgstr "Curățare listă internă a adreselor de contact jabber"
+
+#: jappixmini.php:307
+msgid "Submit"
+msgstr "Trimite"
+
+#: jappixmini.php:308
+msgid "Add contact"
+msgstr "Adăugare contact"
diff --git a/jappixmini/lang/ro/strings.php b/jappixmini/lang/ro/strings.php
new file mode 100644
index 00000000..d88743cb
--- /dev/null
+++ b/jappixmini/lang/ro/strings.php
@@ -0,0 +1,21 @@
+<?php
+
+if(! function_exists("string_plural_select_ro")) {
+function string_plural_select_ro($n){
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+}}
+;
+$a->strings["Jappix Mini addon settings"] = "Configurare addon Mini Jappix";
+$a->strings["Activate addon"] = "Activare supliment";
+$a->strings["Do <em>not</em> insert the Jappixmini Chat-Widget into the webinterface"] = "<em>Nu</em> se introduce Jappixmini Chat-Widget în interfața web";
+$a->strings["Jabber username"] = "Utilizator Jabber ";
+$a->strings["Jabber server"] = "Server Jabber ";
+$a->strings["Jabber BOSH host"] = "Host BOSH Jabber";
+$a->strings["Jabber password"] = "Parolă Jabber ";
+$a->strings["Encrypt Jabber password with Friendica password (recommended)"] = "Criptare parolă Jabber cu parola Friendica (recomandat)";
+$a->strings["Friendica password"] = "Parolă Friendica ";
+$a->strings["Approve subscription requests from Friendica contacts automatically"] = "Aprobare solicitări de subscriere din contactele Friendica, în mod automat";
+$a->strings["Subscribe to Friendica contacts automatically"] = "Abonare automată la contactele Friendica";
+$a->strings["Purge internal list of jabber addresses of contacts"] = "Curățare listă internă a adreselor de contact jabber";
+$a->strings["Submit"] = "Trimite";
+$a->strings["Add contact"] = "Adăugare contact";
diff --git a/jappixmini/lang/ru/strings.php b/jappixmini/lang/ru/strings.php
new file mode 100644
index 00000000..e4d9c600
--- /dev/null
+++ b/jappixmini/lang/ru/strings.php
@@ -0,0 +1,16 @@
+<?php
+
+$a->strings["Jappix Mini addon settings"] = "";
+$a->strings["Activate addon"] = "";
+$a->strings["Do <em>not</em> insert the Jappixmini Chat-Widget into the webinterface"] = "";
+$a->strings["Jabber username"] = "";
+$a->strings["Jabber server"] = "";
+$a->strings["Jabber BOSH host"] = "";
+$a->strings["Jabber password"] = "";
+$a->strings["Encrypt Jabber password with Friendica password (recommended)"] = "";
+$a->strings["Friendica password"] = "";
+$a->strings["Approve subscription requests from Friendica contacts automatically"] = "";
+$a->strings["Subscribe to Friendica contacts automatically"] = "";
+$a->strings["Purge internal list of jabber addresses of contacts"] = "";
+$a->strings["Submit"] = "Подтвердить";
+$a->strings["Add contact"] = "";
diff --git a/jappixmini/lang/sv/strings.php b/jappixmini/lang/sv/strings.php
new file mode 100644
index 00000000..3ec569a7
--- /dev/null
+++ b/jappixmini/lang/sv/strings.php
@@ -0,0 +1,3 @@
+<?php
+
+$a->strings["Submit"] = "Spara";
diff --git a/jappixmini/lang/zh-cn/strings.php b/jappixmini/lang/zh-cn/strings.php
new file mode 100644
index 00000000..5b0c81fd
--- /dev/null
+++ b/jappixmini/lang/zh-cn/strings.php
@@ -0,0 +1,16 @@
+<?php
+
+$a->strings["Jappix Mini addon settings"] = "Jappix Mini加件设置";
+$a->strings["Activate addon"] = "使加件可用";
+$a->strings["Do <em>not</em> insert the Jappixmini Chat-Widget into the webinterface"] = "<em>别</em>把Jappixmini聊小窗插入网用户界面";
+$a->strings["Jabber username"] = "Jabber用户名";
+$a->strings["Jabber server"] = "Jabber服务器";
+$a->strings["Jabber BOSH host"] = "Jabber BOSH主机";
+$a->strings["Jabber password"] = "Jabber密码";
+$a->strings["Encrypt Jabber password with Friendica password (recommended)"] = "把Jabber密码跟Friendica密码加密（推荐的）";
+$a->strings["Friendica password"] = "Friendica密码";
+$a->strings["Approve subscription requests from Friendica contacts automatically"] = "自动地批准从Friendica熟人的订阅要求";
+$a->strings["Subscribe to Friendica contacts automatically"] = "自动地订阅Friendica熟人";
+$a->strings["Purge internal list of jabber addresses of contacts"] = "把熟人jabber地址从内部单";
+$a->strings["Submit"] = "提交";
+$a->strings["Add contact"] = "加熟人";
diff --git a/jappixmini/lib.js b/jappixmini/lib.js
new file mode 100644
index 00000000..31302732
--- /dev/null
+++ b/jappixmini/lib.js
@@ -0,0 +1,281 @@
+//
+// Copyright 2012 "Leberwurscht" <leberwurscht@hoegners.de>
+//
+// This file is dual-licensed under the MIT license (see MIT.txt) and the AGPL license (see jappix/COPYING).
+//
+
+function jappixmini_addon_xor(str1, str2) {
+    if (str1.length != str2.length) throw "not same length";
+
+    var encoded = "";
+
+    for (var i=0; i<str1.length;i++) {
+        var a = str1.charCodeAt(i);
+        var b = str2.charCodeAt(i);
+        var c = a ^ b;
+
+        encoded += String.fromCharCode(c);
+    }
+
+    return encoded;
+}
+
+function jappixmini_addon_set_client_secret(password) {
+	if (!password) return;
+
+	var salt1 = "h8doCRekWto0njyQohKpdx6BN0UTyC6N";
+	var salt2 = "jdX8OwFC1kWAq3s9uOyAcE8g3UNNO5t3";
+
+	var client_secret1 = str_sha1(salt1+password);
+	var client_secret2 = str_sha1(salt2+password);
+	var client_secret = client_secret1 + client_secret2;
+
+	setPersistent('jappix-mini', 'client-secret', client_secret);
+	console.log("client secret set");
+}
+
+function jappixmini_addon_get_client_secret(callback) {
+	var client_secret = getPersistent('jappix-mini', 'client-secret');
+	if (client_secret===null) {
+		var div = document.getElementById("#jappixmini-password-query-div");
+
+		if (!div) {
+			div = $('<div id="jappixmini-password-query-div" style="position:fixed;padding:1em;background-color:#F00;color:#fff;top:50px;left:650px;">Retype your Friendica password for chatting:<br></div>');
+
+			var input = $('<input type="password" id="jappixmini-password-query-input">')
+			div.append(input);
+
+			var button = $('<input type="button" value="OK" id="jappixmini-password-query-button">');
+			div.append(button);
+
+			$("body").append(div);
+		}
+
+		button.click(function(){
+			var password = $("#jappixmini-password-query-input").val();
+			jappixmini_addon_set_client_secret(password);
+			div.remove();
+
+			var client_secret = getPersistent('jappix-mini', 'client-secret');
+			callback(client_secret);
+		});
+	}
+	else {
+		callback(client_secret);
+	}
+}
+
+function jappixmini_addon_encrypt_password(password, callback) {
+	jappixmini_addon_get_client_secret(function(client_secret){
+		// add \0 to password until it has the same length as secret
+		if (password.length>client_secret.length-1) throw "password too long";
+		while (password.length<client_secret.length) {
+			password += "\0";
+		}
+
+		// xor password with secret
+		var encrypted_password = jappixmini_addon_xor(client_secret, password);
+
+		encrypted_password = encodeURI(encrypted_password)
+		callback(encrypted_password);
+	});
+}
+
+function jappixmini_addon_decrypt_password(encrypted_password, callback) {
+	encrypted_password = decodeURI(encrypted_password);
+
+	jappixmini_addon_get_client_secret(function(client_secret){
+		// xor password with secret
+		var password = jappixmini_addon_xor(client_secret, encrypted_password);
+
+		// remove \0
+		var first_null = password.indexOf("\0")
+		if (first_null==-1) throw "Decrypted password does not contain \\0";
+		password = password.substr(0, first_null);
+
+		callback(password);
+	});
+}
+
+function jappixmini_manage_roster(contacts, contacts_hash, autoapprove, autosubscribe) {
+	// listen for subscriptions
+	con.registerHandler('presence',function(presence){
+		var type = presence.getType();
+		if (type != "subscribe") return;
+
+		var from = fullXID(getStanzaFrom(presence));
+		var xid = bareXID(from);
+		var pstatus = presence.getStatus();
+
+		var approve;
+
+		if (autoapprove && contacts[xid]!==undefined) {
+			// approve known address
+			approve = true;
+			console.log("Approve known Friendica contact "+xid+".");
+		}
+		else if (autoapprove && pstatus && pstatus.indexOf("Friendica")!=-1) {
+			// Unknown address claims to be a Friendica contact.
+			// This is probably because the other side knows our
+			// address, but we do not know the other side yet.
+			// But it's only a matter of time, so wait - do not
+			// approve yet and do not annoy the user by asking.
+			approve = false;
+			console.log("Do not approve unknown Friendica contact "+xid+" - wait instead.");
+		}
+		else {
+			// In all other cases, ask the user.
+			var message = "Accept "+xid+" for chat?";
+			if (pstatus) message += "\n\nStatus:\n"+pstatus;
+			approve = confirm(message);
+
+			// do not ask any more
+			if (!approve) sendSubscribe(xid, "unsubscribed");
+		}
+
+		if (approve) {
+			var name = contacts[xid];
+			if (!name) name = xid;
+
+			acceptSubscribe(xid, name);
+			console.log("Accepted "+xid+" ("+name+") for chat.");
+		}
+	});
+
+	// autosubscribe
+	if (!autosubscribe) return;
+
+	var stored_hash = getPersistent("jappix-mini", "contacts-hash");
+	var contacts_changed = (stored_hash != contacts_hash); // stored_hash gets updated later if everything was successful
+	if (!contacts_changed) return;
+
+	console.log("Start autosubscribe.");
+
+	var get_roster = new JSJaCIQ();
+	get_roster.setType('get');
+	get_roster.setQuery(NS_ROSTER);
+
+	con.send(get_roster, function(iq){
+		var handleXML = iq.getQuery();
+
+		// filter out contacts that are already in the roster
+		$(handleXML).find('item').each(function() {
+                        var node = $(this);
+			var xid = node.attr("jid");
+			var name = node.attr("name");
+			var subscription = node.attr("subscription");
+
+			// ignore accounts that are not in the list
+			if (contacts[xid]===undefined) return;
+
+			// add to Friendica group or change name if necessary
+			var groups = [];
+			var group_missing = false;
+			node.find('group').each(function() {
+				var group_text = $(this).text();
+				if (group_text) groups.push(group_text);
+			});
+			if ($.inArray("Friendica", groups)==-1) {
+				group_missing = true;
+				groups.push("Friendica");
+			}
+
+			if (group_missing || name!=contacts[xid]) {
+				sendRoster(xid, null, contacts[xid], groups);
+				console.log("Added "+xid+" to Friendica group and set name to "+contacts[xid]+".");
+			}
+
+			// authorize if necessary
+			if (subscription=="to") {
+				sendSubscribe(xid, 'subscribed');
+				console.log("Authorized "+xid+" automatically.");
+			}
+
+			// remove from list
+			delete contacts[xid];
+		});
+
+		// go through remaining contacts
+		for (var xid in contacts) {if(!contacts.hasOwnProperty(xid)) continue;
+			// subscribe
+			var presence = new JSJaCPresence();
+			presence.setTo(xid);
+			presence.setType("subscribe");
+
+			// must contain the word "~Friendica" so the other side knows
+			// how to handle this
+			presence.setStatus("I'm "+MINI_NICKNAME+" from ~Friendica.\n[machine-generated message]");
+
+			con.send(presence);
+			console.log("Subscribed to "+xid+" automatically.");
+
+			// add to roster
+			var iq = new JSJaCIQ();
+			iq.setType('set');
+			var iqQuery = iq.setQuery(NS_ROSTER);
+			var item = iqQuery.appendChild(iq.buildNode('item', {'xmlns': NS_ROSTER, 'jid': xid}));
+			item.setAttribute('name', contacts[xid]);
+			item.appendChild(iq.buildNode('group', {'xmlns': NS_ROSTER}, "Friendica"));
+			con.send(iq);
+			console.log("Added "+xid+" ("+contacts[xid]+") to roster.");
+		}
+
+		setPersistent("jappix-mini", "contacts-hash", contacts_hash);
+		console.log("Autosubscribe done.");
+	});
+
+}
+
+function jappixmini_addon_subscribe() {
+        if (!window.con) {
+		alert("Not connected.");
+		return;
+        }
+
+	var xid = prompt("Jabber address");
+	sendSubscribe(xid, "subscribe");
+}
+
+function jappixmini_addon_start(server, username, proxy, bosh, encrypted, password, nickname, contacts, contacts_hash, autoapprove, autosubscribe, groupchats) {
+    var handler = function(password){
+        // check if settings have changed, reinitialize jappix mini if this is the case
+        var settings_identifier = str_sha1(server);
+        settings_identifier += str_sha1(username);
+        settings_identifier += str_sha1(proxy);
+        settings_identifier += str_sha1(bosh);
+        settings_identifier += str_sha1(password);
+        settings_identifier += str_sha1(nickname);
+
+        var saved_identifier = getDB("jappix-mini", "settings-identifier");
+        if (saved_identifier != settings_identifier) {
+            disconnectMini();
+            removeDB('jappix-mini', 'dom');
+            removePersistent("jappix-mini", "contacts-hash");
+        }
+        setDB("jappix-mini", "settings-identifier", settings_identifier);
+
+        // set HOST_BOSH
+        if (proxy)
+            HOST_BOSH = proxy+"?host_bosh="+encodeURI(bosh);
+        else
+            HOST_BOSH = bosh;
+
+        // start jappix mini
+	MINI_GROUPCHATS = groupchats;
+        MINI_NICKNAME = nickname;
+        LOCK_HOST = "off";
+        launchMini(true, false, server, username, password);
+
+        // increase priority over other Jabber clients - does not seem to work?
+        var priority = 101;
+        presenceMini(null,null,priority);
+
+        jappixmini_manage_roster(contacts, contacts_hash, autoapprove, autosubscribe)
+    }
+
+    // decrypt password if necessary
+    if (encrypted)
+        jappixmini_addon_decrypt_password(password, handler);
+    else
+        handler(password);
+}
diff --git a/jappixmini/proxy.php b/jappixmini/proxy.php
new file mode 100644
index 00000000..c4e3a03c
--- /dev/null
+++ b/jappixmini/proxy.php
@@ -0,0 +1,178 @@
+<?php
+
+/*
+
+Jappix - An open social platform
+This is a PHP BOSH proxy
+
+-------------------------------------------------
+
+This file is dual-licensed under the MIT license (see MIT.txt) and the AGPL license (see jappix/COPYING).
+Authors: Vanaryon, Leberwurscht
+
+*/
+
+// PHP base
+define('JAPPIX_BASE', './jappix');
+
+// Get the configuration
+require_once('./jappix/php/functions.php');
+require_once('./jappix/php/read-main.php');
+require_once('./jappix/php/read-hosts.php');
+
+// Optimize the page rendering
+hideErrors();
+compressThis();
+
+// Not allowed?
+if(!BOSHProxy()) {
+	header('Status: 403 Forbidden', true, 403);
+	exit('HTTP/1.1 403 Forbidden');
+}
+
+// custom BOSH host
+$HOST_BOSH = HOST_BOSH;
+if(isset($_GET['host_bosh']) && $_GET['host_bosh']) {
+	$host_bosh = $_GET['host_bosh'];
+	if (substr($host_bosh, 0, 7)==="http://" || substr($host_bosh, 0, 8)==="https://") {
+		$HOST_BOSH = $host_bosh;
+	}
+}
+
+// OPTIONS method?
+if($_SERVER['REQUEST_METHOD'] == 'OPTIONS') {
+	// CORS headers
+	header('Access-Control-Allow-Origin: *');
+	header('Access-Control-Allow-Methods: GET, POST, OPTIONS');
+	header('Access-Control-Allow-Headers: Content-Type');
+	header('Access-Control-Max-Age: 31536000');
+
+	exit;
+}
+
+// Read POST content
+$data = file_get_contents('php://input');
+
+// POST method?
+if($data) {
+	// CORS headers
+	header('Access-Control-Allow-Origin: *');
+	header('Access-Control-Allow-Headers: Content-Type');
+
+	$method = 'POST';
+}
+
+// GET method?
+else if(isset($_GET['data']) && $_GET['data'] && isset($_GET['callback']) && $_GET['callback']) {
+	$method = 'GET';
+	$data = $_GET['data'];
+	$callback = $_GET['callback'];
+}
+
+// Invalid method?
+else {
+	header('Status: 400 Bad Request', true, 400);
+	exit('HTTP/1.1 400 Bad Request');
+}
+
+// HTTP headers
+$headers = ['User-Agent: Jappix (BOSH PHP Proxy)', 'Connection: keep-alive', 'Content-Type: text/xml; charset=utf-8', 'Content-Length: '.strlen($data)];
+
+// CURL is better if available
+if(function_exists('curl_init'))
+	$use_curl = true;
+else
+	$use_curl = false;
+
+// CURL caused problems for me
+$use_curl = false;
+
+// CURL stream functions
+if($use_curl) {
+	// Initialize CURL
+	$connection = curl_init($HOST_BOSH);
+
+	// Set the CURL settings
+	curl_setopt($connection, CURLOPT_HEADER, 0);
+	curl_setopt($connection, CURLOPT_POST, 1);
+	curl_setopt($connection, CURLOPT_POSTFIELDS, $data);
+	curl_setopt($connection, CURLOPT_FOLLOWLOCATION, true);
+	curl_setopt($connection, CURLOPT_HTTPHEADER, $headers);
+	curl_setopt($connection, CURLOPT_VERBOSE, 0);
+	curl_setopt($connection, CURLOPT_CONNECTTIMEOUT, 30);
+	curl_setopt($connection, CURLOPT_TIMEOUT, 30);
+	curl_setopt($connection, CURLOPT_SSL_VERIFYHOST, 0);
+	curl_setopt($connection, CURLOPT_SSL_VERIFYPEER, 0);
+	curl_setopt($connection, CURLOPT_RETURNTRANSFER, 1);
+
+	// Get the CURL output
+	$output = curl_exec($connection);
+}
+
+// Built-in stream functions
+else {
+	// HTTP parameters
+	$parameters = ['http' => [
+					'method' => 'POST',
+					'content' => $data
+				      ]
+		      ];
+
+	$parameters['http']['header'] = $headers;
+
+	// Change default timeout
+	ini_set('default_socket_timeout', 30);
+
+	// Create the connection
+	$stream = @stream_context_create($parameters);
+	$connection = @fopen($HOST_BOSH, 'rb', false, $stream);
+
+	// Failed to connect!
+	if($connection == false) {
+		header('Status: 502 Proxy Error', true, 502);
+		exit('HTTP/1.1 502 Proxy Error');
+	}
+
+	// Allow stream blocking to handle incoming BOSH data
+	@stream_set_blocking($connection, true);
+
+	// Get the output content
+	$output = @stream_get_contents($connection);
+}
+
+// Cache headers
+header('Cache-Control: no-cache, must-revalidate');
+header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+
+// POST output
+if($method == 'POST') {
+	// XML header
+	header('Content-Type: text/xml; charset=utf-8');
+
+	if(!$output)
+		echo('<body xmlns=\'http://jabber.org/protocol/httpbind\' type=\'terminate\'/>');
+	else
+		echo($output);
+}
+
+// GET output
+if($method == 'GET') {
+	// JSON header
+	header('Content-type: application/json');
+
+	// Encode output to JSON
+	$json_output = json_encode($output);
+
+	if(($output == false) || ($output == '') || ($json_output == 'null'))
+		echo($callback.'({"reply":"<body xmlns=\'http:\/\/jabber.org\/protocol\/httpbind\' type=\'terminate\'\/>"});');
+	else
+		echo($callback.'({"reply":'.$json_output.'});');
+}
+
+// Close the connection
+if($use_curl)
+	curl_close($connection);
+else
+	@fclose($connection);
+
+?>
diff --git a/js_upload/file-uploader/client/loading.gif b/js_upload/file-uploader/client/loading.gif
index 20b46bc8..6fba7760 100644
Binary files a/js_upload/file-uploader/client/loading.gif and b/js_upload/file-uploader/client/loading.gif differ
diff --git a/js_upload/file-uploader/server/php.php b/js_upload/file-uploader/server/php.php
index 2248c8f0..915c86c6 100644
--- a/js_upload/file-uploader/server/php.php
+++ b/js_upload/file-uploader/server/php.php
@@ -4,170 +4,155 @@
  * Handle file uploads via XMLHttpRequest
  */
 class qqUploadedFileXhr {
-	/**
-	 * Save the file to the specified path
-	 * @return boolean TRUE on success
-	 */
-	public function save(string $path): bool
-	{
-		$input = fopen('php://input', 'r');
-		$temp = tmpfile();
-		$realSize = stream_copy_to_stream($input, $temp);
-		fclose($input);
-
-		if ($realSize != $this->getSize()) {
-			return false;
-		}
-
-		$target = fopen($path, 'w');
-		fseek($temp, 0, SEEK_SET);
-		stream_copy_to_stream($temp, $target);
-		fclose($target);
-
-		return true;
-	}
-
-	public function getName(): string
-	{
-		return $_GET['qqfile'];
-	}
-
-	public function getSize(): int
-	{
-		if (isset($_SERVER['CONTENT_LENGTH'])) {
-			return (int)$_SERVER['CONTENT_LENGTH'];
-		} else {
-			throw new Exception('Getting content length is not supported.');
-		}
-	}
+    /**
+     * Save the file to the specified path
+     * @return boolean TRUE on success
+     */
+    function save($path) {    
+        $input = fopen("php://input", "r");
+        $temp = tmpfile();
+        $realSize = stream_copy_to_stream($input, $temp);
+        fclose($input);
+        
+        if ($realSize != $this->getSize()){            
+            return false;
+        }
+        
+        $target = fopen($path, "w");        
+        fseek($temp, 0, SEEK_SET);
+        stream_copy_to_stream($temp, $target);
+        fclose($target);
+        
+        return true;
+    }
+    function getName() {
+        return $_GET['qqfile'];
+    }
+    function getSize() {
+        if (isset($_SERVER["CONTENT_LENGTH"])){
+            return (int)$_SERVER["CONTENT_LENGTH"];            
+        } else {
+            throw new Exception('Getting content length is not supported.');
+        }      
+    }   
 }
 
 /**
  * Handle file uploads via regular form post (uses the $_FILES array)
  */
-class qqUploadedFileForm {
-	/**
-	 * Save the file to the specified path
-	 * @return boolean TRUE on success
-	 */
-	public function save(string $path): bool
-	{
-		if(!move_uploaded_file($_FILES['qqfile']['tmp_name'], $path)) {
-			return false;
-		}
-		return true;
-	}
-
-	public function getName(): string
-	{
-		return $_FILES['qqfile']['name'];
-	}
-
-	public function getSize(): int
-	{
-		return $_FILES['qqfile']['size'];
-	}
+class qqUploadedFileForm {  
+    /**
+     * Save the file to the specified path
+     * @return boolean TRUE on success
+     */
+    function save($path) {
+        if(!move_uploaded_file($_FILES['qqfile']['tmp_name'], $path)){
+            return false;
+        }
+        return true;
+    }
+    function getName() {
+        return $_FILES['qqfile']['name'];
+    }
+    function getSize() {
+        return $_FILES['qqfile']['size'];
+    }
 }
 
 class qqFileUploader {
-	private $allowedExtensions = [];
-	private $sizeLimit = 10485760;
-	private $file;
+    private $allowedExtensions = array();
+    private $sizeLimit = 10485760;
+    private $file;
 
-	public function __construct(array $allowedExtensions = [], $sizeLimit = 10485760)
-	{
-		$allowedExtensions = array_map('strtolower', $allowedExtensions);
-			
-		$this->allowedExtensions = $allowedExtensions;
-		$this->sizeLimit = $sizeLimit;
-		
-		$this->checkServerSettings();
+    function __construct(array $allowedExtensions = array(), $sizeLimit = 10485760){        
+        $allowedExtensions = array_map("strtolower", $allowedExtensions);
+            
+        $this->allowedExtensions = $allowedExtensions;        
+        $this->sizeLimit = $sizeLimit;
+        
+        $this->checkServerSettings();       
 
-		if (isset($_GET['qqfile'])) {
-			$this->file = new qqUploadedFileXhr();
-		} elseif (isset($_FILES['qqfile'])) {
-			$this->file = new qqUploadedFileForm();
-		} else {
-			$this->file = false; 
-		}
-	}
+        if (isset($_GET['qqfile'])) {
+            $this->file = new qqUploadedFileXhr();
+        } elseif (isset($_FILES['qqfile'])) {
+            $this->file = new qqUploadedFileForm();
+        } else {
+            $this->file = false; 
+        }
+    }
+    
+    private function checkServerSettings(){        
+        $postSize = $this->toBytes(ini_get('post_max_size'));
+        $uploadSize = $this->toBytes(ini_get('upload_max_filesize'));        
+        
+        if ($postSize < $this->sizeLimit || $uploadSize < $this->sizeLimit){
+            $size = max(1, $this->sizeLimit / 1024 / 1024) . 'M';             
+            die("{'error':'increase post_max_size and upload_max_filesize to $size'}");    
+        }        
+    }
+    
+    private function toBytes($str){
+        $val = trim($str);
+        $last = strtolower($str[strlen($str)-1]);
+        switch($last) {
+            case 'g': $val *= 1024;
+            case 'm': $val *= 1024;
+            case 'k': $val *= 1024;        
+        }
+        return $val;
+    }
+    
+    /**
+     * Returns array('success'=>true) or array('error'=>'error message')
+     */
+    function handleUpload($uploadDirectory, $replaceOldFile = FALSE){
+        if (!is_writable($uploadDirectory)){
+            return array('error' => "Server error. Upload directory isn't writable.");
+        }
+        
+        if (!$this->file){
+            return array('error' => 'No files were uploaded.');
+        }
+        
+        $size = $this->file->getSize();
+        
+        if ($size == 0) {
+            return array('error' => 'File is empty');
+        }
+        
+        if ($size > $this->sizeLimit) {
+            return array('error' => 'File is too large');
+        }
+        
+        $pathinfo = pathinfo($this->file->getName());
+        $filename = $pathinfo['filename'];
+        //$filename = md5(uniqid());
+        $ext = $pathinfo['extension'];
 
-	private function checkServerSettings()
-	{
-		$postSize = $this->toBytes(ini_get('post_max_size'));
-		$uploadSize = $this->toBytes(ini_get('upload_max_filesize'));
-
-		if ($postSize < $this->sizeLimit || $uploadSize < $this->sizeLimit) {
-			$size = max(1, $this->sizeLimit / 1024 / 1024) . 'M';
-			die("{'error':'increase post_max_size and upload_max_filesize to $size'}");
-		}
-	}
-
-	private function toBytes(string $str): int
-	{
-		$val = trim($str);
-		$last = strtolower($str[strlen($str) - 1]);
-
-		switch($last) {
-			case 'g': $val *= 1024;
-			case 'm': $val *= 1024;
-			case 'k': $val *= 1024;
-		}
-
-		return $val;
-	}
-
-	/**
-	 * Returns array('success'=>true) or array('error'=>'error message')
-	 */
-	public function handleUpload(string $uploadDirectory, bool $replaceOldFile = false): array
-	{
-		if (!is_writable($uploadDirectory)) {
-			return ['error' => "Server error. Upload directory isn't writable."];
-		}
-
-		if (!$this->file) {
-			return ['error' => 'No files were uploaded.'];
-		}
-
-		$size = $this->file->getSize();
-
-		if ($size == 0) {
-			return ['error' => 'File is empty'];
-		}
-
-		if ($size > $this->sizeLimit) {
-			return ['error' => 'File is too large'];
-		}
-
-		$pathinfo = pathinfo($this->file->getName());
-		$filename = $pathinfo['filename'];
-		//$filename = md5(uniqid());
-		$ext = $pathinfo['extension'];
-
-		if($this->allowedExtensions && !in_array(strtolower($ext), $this->allowedExtensions)) {
-			$these = implode(', ', $this->allowedExtensions);
-			return ['error' => 'File has an invalid extension, it should be one of '. $these . '.'];
-		}
-
-		if(!$replaceOldFile) {
-			/// don't overwrite previous files that were uploaded
-			while (file_exists($uploadDirectory . $filename . '.' . $ext)) {
-				$filename .= rand(10, 99);
-			}
-		}
-
-		if ($this->file->save($uploadDirectory . $filename . '.' . $ext)) {
-			return ['success' => true];
-		} else {
-			return ['error'=> 'Could not save uploaded file. The upload was cancelled, or server error encountered'];
-		}
-	}
+        if($this->allowedExtensions && !in_array(strtolower($ext), $this->allowedExtensions)){
+            $these = implode(', ', $this->allowedExtensions);
+            return array('error' => 'File has an invalid extension, it should be one of '. $these . '.');
+        }
+        
+        if(!$replaceOldFile){
+            /// don't overwrite previous files that were uploaded
+            while (file_exists($uploadDirectory . $filename . '.' . $ext)) {
+                $filename .= rand(10, 99);
+            }
+        }
+        
+        if ($this->file->save($uploadDirectory . $filename . '.' . $ext)){
+            return array('success'=>true);
+        } else {
+            return array('error'=> 'Could not save uploaded file.' .
+                'The upload was cancelled, or server error encountered');
+        }
+        
+    }    
 }
 
 // list of valid extensions, ex. array("jpeg", "xml", "bmp")
-$allowedExtensions = [];
-
+$allowedExtensions = array();
 // max file size in bytes
 $sizeLimit = 10 * 1024 * 1024;
 
diff --git a/js_upload/file-uploader/tests/sample-files/1imagelonglonglonglonglonglongname.gif b/js_upload/file-uploader/tests/sample-files/1imagelonglonglonglonglonglongname.gif
index 20b46bc8..6fba7760 100644
Binary files a/js_upload/file-uploader/tests/sample-files/1imagelonglonglonglonglonglongname.gif and b/js_upload/file-uploader/tests/sample-files/1imagelonglonglonglonglonglongname.gif differ
diff --git a/js_upload/js_upload.php b/js_upload/js_upload.php
index 089cb7e2..5a6c37c8 100644
--- a/js_upload/js_upload.php
+++ b/js_upload/js_upload.php
@@ -1,120 +1,218 @@
 <?php
 /**
  * Name: JS Uploader
- * Description: JavaScript photo/image uploader. Helpful for uploading multiple files at once. Uses Valum 'qq' Uploader.
- * Version: 1.1
+ * Description: JavaScript photo/image uploader. Uses Valum 'qq' Uploader.
+ * Version: 1.0
  * Author: Chris Case <http://friendika.openmindspace.org/profile/chris_case>
- * Maintainer: Hypolite Petovan <https://friendica.mrpetovan.com/profile/hypolite>
  */
 
-use Friendica\App;
+/**
+ *
+ * JavaScript Photo/Image Uploader
+ *
+ * Uses Valum 'qq' Uploader.
+ * Module Author: Chris Case
+ *
+ */
+
+use Friendica\Core\Config;
 use Friendica\Core\Hook;
+use Friendica\Core\L10n;
 use Friendica\Core\Logger;
-use Friendica\Core\Renderer;
-use Friendica\DI;
-use Friendica\Util\Strings;
 
-global $js_upload_jsonresponse;
-global $js_upload_result;
-
-function js_upload_install()
-{
-	Hook::register('photo_upload_form', __FILE__, 'js_upload_form');
-	Hook::register('photo_post_init', __FILE__, 'js_upload_post_init');
-	Hook::register('photo_post_file', __FILE__, 'js_upload_post_file');
-	Hook::register('photo_post_end', __FILE__, 'js_upload_post_end');
+function js_upload_install() {
+	Hook::register('photo_upload_form', 'addon/js_upload/js_upload.php', 'js_upload_form');
+	Hook::register('photo_post_init',   'addon/js_upload/js_upload.php', 'js_upload_post_init');
+	Hook::register('photo_post_file',   'addon/js_upload/js_upload.php', 'js_upload_post_file');
+	Hook::register('photo_post_end',    'addon/js_upload/js_upload.php', 'js_upload_post_end');
 }
 
-function js_upload_form(array &$b)
-{
+
+function js_upload_uninstall() {
+	Hook::unregister('photo_upload_form', 'addon/js_upload/js_upload.php', 'js_upload_form');
+	Hook::unregister('photo_post_init',   'addon/js_upload/js_upload.php', 'js_upload_post_init');
+	Hook::unregister('photo_post_file',   'addon/js_upload/js_upload.php', 'js_upload_post_file');
+	Hook::unregister('photo_post_end',    'addon/js_upload/js_upload.php', 'js_upload_post_end');
+}
+
+
+function js_upload_form(&$a,&$b) {
+
 	$b['default_upload'] = false;
 
-	DI::page()->registerStylesheet(__DIR__ . '/file-uploader/client/fileuploader.css');
-	DI::page()->registerFooterScript(__DIR__ . '/file-uploader/client/fileuploader.js');
+	$b['addon_text'] .= '<link href="' . $a->getBaseURL() . '/addon/js_upload/file-uploader/client/fileuploader.css" rel="stylesheet" type="text/css">';
+	$b['addon_text'] .= '<script src="' . $a->getBaseURL() . '/addon/js_upload/file-uploader/client/fileuploader.js" type="text/javascript"></script>';
 
-	$tpl = Renderer::getMarkupTemplate('js_upload.tpl', 'addon/js_upload');
-	$b['addon_text'] .= Renderer::replaceMacros($tpl, [
-		'$upload_msg' => DI::l10n()->t('Select files for upload'),
-		'$drop_msg' => DI::l10n()->t('Drop files here to upload'),
-		'$cancel' => DI::l10n()->t('Cancel'),
-		'$failed' => DI::l10n()->t('Failed'),
-		'$post_url' => $b['post_url'],
-		'$maximagesize' => Strings::getBytesFromShorthand(DI::config()->get('system', 'maximagesize')),
-	]);
+	$upload_msg = L10n::t('Select files for upload');
+	$drop_msg = L10n::t('Drop files here to upload');
+	$cancel = L10n::t('Cancel');
+	$failed = L10n::t('Failed');
+
+	$maximagesize = intval(Config::get('system','maximagesize'));
+
+	$b['addon_text'] .= <<< EOT
+
+ <div id="file-uploader-demo1">
+  <noscript>
+   <p>Please enable JavaScript to use file uploader.</p>
+   <!-- or put a simple form for upload here -->
+  </noscript>
+ </div>
+
+<script type="text/javascript">
+var uploader = null;
+function getSelected(opt) {
+			var selected = new Array();
+			var index = 0;
+			for (var intLoop = 0; intLoop < opt.length; intLoop++) {
+				if ((opt[intLoop].selected) ||
+					(opt[intLoop].checked)) {
+					index = selected.length;
+					//selected[index] = new Object;
+					selected[index] = opt[intLoop].value;
+					//selected[index] = intLoop;
+				}
+			}
+			return selected;
+		 }
+function createUploader() {
+	uploader = new qq.FileUploader({
+		element: document.getElementById('file-uploader-demo1'),
+		action: '{$b['post_url']}',
+
+		template: '<div class="qq-uploader">' +
+				'<div class="qq-upload-drop-area"><span>$drop_msg</span></div>' +
+				'<div class="qq-upload-button">$upload_msg</div>' +
+				'<ul class="qq-upload-list"></ul>' +
+			 '</div>',
+
+		// template for one item in file list
+		fileTemplate: '<li>' +
+				'<span class="qq-upload-file"></span>' +
+				'<span class="qq-upload-spinner"></span>' +
+				'<span class="qq-upload-size"></span>' +
+				'<a class="qq-upload-cancel" href="#">$cancel</a>' +
+				'<span class="qq-upload-failed-text">$failed</span>' +
+			'</li>',
+
+		debug: true,
+		sizeLimit: $maximagesize,
+		onSubmit: function(id,filename) {
+			var newalbumElm = document.getElementById('photos-upload-newalbum');
+			var albumElm = document.getElementById('photos-upload-album-select');
+
+			var newalbum = newalbumElm ? newalbumElm.value : "";
+			var album = albumElm ? albumElm.value : "";
+
+			if (typeof acl != "undefined"){
+				uploader.setParams( {
+					newalbum      : newalbum,
+					album         : album,
+					not_visible   : document.getElementById('photos-upload-noshare').checked,
+					group_allow   : acl.allow_gid.join(','),
+					contact_allow : acl.allow_cid.join(','),
+					group_deny    : acl.deny_gid.join(','),
+					contact_deny  : acl.deny_cid.join(',')
+				});
+			} else {
+				uploader.setParams( {
+					newalbum      : newalbum,
+					album         : album,
+					not_visible   : document.getElementById('photos-upload-noshare').checked,
+					group_allow   : getSelected(document.getElementById('group_allow')).join(','),
+					contact_allow : getSelected(document.getElementById('contact_allow')).join(','),
+					group_deny    : getSelected(document.getElementById('group_deny')).join(','),
+					contact_deny  : getSelected(document.getElementById('contact_deny')).join(',')
+				});
+			}
+		}
+	});
 }
 
-function js_upload_post_init(array &$b)
-{
-	global $js_upload_result, $js_upload_jsonresponse;
 
-	// list of valid extensions
-	$allowedExtensions = ['jpeg', 'gif', 'png', 'jpg'];
+// in your app create uploader as soon as the DOM is ready
+// don't wait for the window to load
+window.onload = createUploader;
+
+
+</script>
+
+EOT;
+
+
+}
+
+function js_upload_post_init(&$a,&$b) {
+
+	// list of valid extensions, ex. array("jpeg", "xml", "bmp")
+
+	$allowedExtensions = ["jpeg","gif","png","jpg"];
 
 	// max file size in bytes
-	$sizeLimit = Strings::getBytesFromShorthand(DI::config()->get('system', 'maximagesize'));
+
+	$sizeLimit = Config::get('system','maximagesize'); //6 * 1024 * 1024;
 
 	$uploader = new qqFileUploader($allowedExtensions, $sizeLimit);
 
 	$result = $uploader->handleUpload();
 
-	// to pass data through iframe you will need to encode all html tags
-	$js_upload_jsonresponse = htmlspecialchars(json_encode($result), ENT_NOQUOTES);
 
-	if (isset($result['error'])) {
-		Logger::info('mod/photos.php: photos_post(): error uploading photo: ' . $result['error']);
+	// to pass data through iframe you will need to encode all html tags
+	$a->data['upload_jsonresponse'] =  htmlspecialchars(json_encode($result), ENT_NOQUOTES);
+
+	if(isset($result['error'])) {
+		Logger::log('mod/photos.php: photos_post(): error uploading photo: ' . $result['error'] , Logger::DEBUG);
 		echo json_encode($result);
 		exit();
 	}
 
-	$js_upload_result = $result;
-}
-
-function js_upload_post_file(array &$b)
-{
-	global $js_upload_result;
-
-	$result = $js_upload_result;
-
-	$b['src'] = $result['path'];
-	$b['filename'] = $result['filename'];
-	$b['filesize'] = filesize($b['src']);
+	$a->data['upload_result'] = $result;
 
 }
 
-function js_upload_post_end(int &$b)
-{
-	global $js_upload_jsonresponse;
+function js_upload_post_file(&$a,&$b) {
 
-	Logger::notice('upload_post_end');
-	if (!empty($js_upload_jsonresponse)) {
-		echo $js_upload_jsonresponse;
+	$result = $a->data['upload_result'];
+
+	$b['src']       = $result['path'];
+	$b['filename']  = $result['filename'];
+	$b['filesize']  = filesize($b['src']);
+
+}
+
+
+function js_upload_post_end(&$a,&$b) {
+
+Logger::log('upload_post_end');
+	if(!empty($a->data['upload_jsonresponse'])) {
+		echo $a->data['upload_jsonresponse'];
 		exit();
 	}
+
 }
 
+
 /**
  * Handle file uploads via XMLHttpRequest
  */
-class qqUploadedFileXhr
-{
+class qqUploadedFileXhr {
+
 	private $pathnm = '';
 
 	/**
 	 * Save the file in the temp dir.
-	 *
 	 * @return boolean TRUE on success
 	 */
-	function save()
-	{
-		$input = fopen('php://input', 'r');
+	function save() {
+		$input = fopen("php://input", "r");
 
-		$upload_dir = DI::config()->get('system', 'tempdir');
-		if (!$upload_dir)
+		$upload_dir = Config::get('system','tempdir');
+		if(! $upload_dir)
 			$upload_dir = sys_get_temp_dir();
 
-		$this->pathnm = tempnam($upload_dir, 'frn');
+		$this->pathnm = tempnam($upload_dir,'frn');
 
-		$temp = fopen($this->pathnm, 'w');
+		$temp = fopen($this->pathnm,"w");
 		$realSize = stream_copy_to_stream($input, $temp);
 
 		fclose($input);
@@ -126,20 +224,17 @@ class qqUploadedFileXhr
 		return true;
 	}
 
-	function getPath()
-	{
+	function getPath() {
 		return $this->pathnm;
 	}
 
-	function getName()
-	{
+	function getName() {
 		return $_GET['qqfile'];
 	}
 
-	function getSize()
-	{
-		if (isset($_SERVER['CONTENT_LENGTH'])) {
-			return (int)$_SERVER['CONTENT_LENGTH'];
+	function getSize() {
+		if (isset($_SERVER["CONTENT_LENGTH"])){
+			return (int)$_SERVER["CONTENT_LENGTH"];
 		} else {
 			throw new Exception('Getting content length is not supported.');
 		}
@@ -149,43 +244,39 @@ class qqUploadedFileXhr
 /**
  * Handle file uploads via regular form post (uses the $_FILES array)
  */
-class qqUploadedFileForm
-{
+
+class qqUploadedFileForm {
+
+
 	/**
 	 * Save the file to the specified path
-	 *
 	 * @return boolean TRUE on success
 	 */
-	function save()
-	{
+
+
+	function save() {
 		return true;
 	}
 
-	function getPath()
-	{
+	function getPath() {
 		return $_FILES['qqfile']['tmp_name'];
 	}
 
-	function getName()
-	{
+	function getName() {
 		return $_FILES['qqfile']['name'];
 	}
-
-	function getSize()
-	{
+	function getSize() {
 		return $_FILES['qqfile']['size'];
 	}
 }
 
-class qqFileUploader
-{
+class qqFileUploader {
 	private $allowedExtensions = [];
 	private $sizeLimit = 10485760;
 	private $file;
 
-	function __construct(array $allowedExtensions = [], $sizeLimit = 10485760)
-	{
-		$allowedExtensions = array_map('strtolower', $allowedExtensions);
+	function __construct(array $allowedExtensions = [], $sizeLimit = 10485760){
+		$allowedExtensions = array_map("strtolower", $allowedExtensions);
 
 		$this->allowedExtensions = $allowedExtensions;
 		$this->sizeLimit = $sizeLimit;
@@ -200,31 +291,44 @@ class qqFileUploader
 
 	}
 
+
+	private function toBytes($str){
+		$val = trim($str);
+		$last = strtolower($str[strlen($str)-1]);
+		switch($last) {
+			case 'g': $val *= 1024;
+			case 'm': $val *= 1024;
+			case 'k': $val *= 1024;
+		}
+		return $val;
+	}
+
 	/**
 	 * Returns array('success'=>true) or array('error'=>'error message')
 	 */
-	function handleUpload()
-	{
+	function handleUpload(){
+
 		if (!$this->file) {
-			return ['error' => DI::l10n()->t('No files were uploaded.')];
+			return ['error' => L10n::t('No files were uploaded.')];
 		}
 
 		$size = $this->file->getSize();
 
 		if ($size == 0) {
-			return ['error' => DI::l10n()->t('Uploaded file is empty')];
+			return ['error' => L10n::t('Uploaded file is empty')];
 		}
 
 //		if ($size > $this->sizeLimit) {
 
-//			return array('error' => DI::l10n()->t('Uploaded file is too large'));
+//			return array('error' => L10n::t('Uploaded file is too large'));
 //		}
 
 
-		$maximagesize = Strings::getBytesFromShorthand(DI::config()->get('system', 'maximagesize'));
+		$maximagesize = Config::get('system','maximagesize');
+
+		if(($maximagesize) && ($size > $maximagesize)) {
+			return ['error' => L10n::t('Image exceeds size limit of ') . $maximagesize ];
 
-		if (($maximagesize) && ($size > $maximagesize)) {
-			return ['error' => DI::l10n()->t('Image exceeds size limit of %s', Strings::formatBytes($maximagesize))];
 		}
 
 		$pathinfo = pathinfo($this->file->getName());
@@ -235,22 +339,24 @@ class qqFileUploader
 		}
 		$ext = $pathinfo['extension'] ?? '';
 
-		if ($this->allowedExtensions && !in_array(strtolower($ext), $this->allowedExtensions)) {
-			return ['error' => DI::l10n()->t('File has an invalid extension, it should be one of %s.', implode(', ', $this->allowedExtensions))];
+		if($this->allowedExtensions && !in_array(strtolower($ext), $this->allowedExtensions)){
+			$these = implode(', ', $this->allowedExtensions);
+			return ['error' => L10n::t('File has an invalid extension, it should be one of ') . $these . '.'];
 		}
 
-		if ($this->file->save()) {
+		if ($this->file->save()){
 			return [
-				'success' => true,
-				'path' => $this->file->getPath(),
+				'success'  => true,
+				'path'     => $this->file->getPath(),
 				'filename' => $filename . '.' . $ext
 			];
 		} else {
 			return [
-				'error' => DI::l10n()->t('Upload was cancelled, or server error encountered'),
-				'path' => $this->file->getPath(),
+				'error'    => L10n::t('Upload was cancelled, or server error encountered'),
+				'path'     => $this->file->getPath(),
 				'filename' => $filename . '.' . $ext
 			];
 		}
+
 	}
 }
diff --git a/js_upload/lang/C/messages.po b/js_upload/lang/C/messages.po
index 0d607bd5..e2e08130 100644
--- a/js_upload/lang/C/messages.po
+++ b/js_upload/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-06-03 15:49-0400\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,40 +17,38 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: js_upload.php:37
-msgid "Select files for upload"
+#: js_upload.php:43
+msgid "Upload a file"
 msgstr ""
 
-#: js_upload.php:38
+#: js_upload.php:44
 msgid "Drop files here to upload"
 msgstr ""
 
-#: js_upload.php:39
+#: js_upload.php:45
 msgid "Cancel"
 msgstr ""
 
-#: js_upload.php:40
+#: js_upload.php:46
 msgid "Failed"
 msgstr ""
 
-#: js_upload.php:209
+#: js_upload.php:303
 msgid "No files were uploaded."
 msgstr ""
 
-#: js_upload.php:215
+#: js_upload.php:309
 msgid "Uploaded file is empty"
 msgstr ""
 
-#: js_upload.php:227
-#, php-format
-msgid "Image exceeds size limit of %s"
+#: js_upload.php:321
+msgid "Image exceeds size limit of "
 msgstr ""
 
-#: js_upload.php:239
-#, php-format
-msgid "File has an invalid extension, it should be one of %s."
+#: js_upload.php:332
+msgid "File has an invalid extension, it should be one of "
 msgstr ""
 
-#: js_upload.php:250
+#: js_upload.php:343
 msgid "Upload was cancelled, or server error encountered"
 msgstr ""
diff --git a/js_upload/lang/ar/messages.po b/js_upload/lang/ar/messages.po
deleted file mode 100644
index 05d93583..00000000
--- a/js_upload/lang/ar/messages.po
+++ /dev/null
@@ -1,57 +0,0 @@
-# ADDON js_upload
-# Copyright (C)
-# This file is distributed under the same license as the Friendica js_upload addon package.
-# 
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-23 23:53-0400\n"
-"PO-Revision-Date: 2021-04-26 08:29+0000\n"
-"Last-Translator: Transifex Bot <>\n"
-"Language-Team: Arabic (http://www.transifex.com/Friendica/friendica/language/ar/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ar\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-
-#: js_upload.php:34
-msgid "Select files for upload"
-msgstr ""
-
-#: js_upload.php:35
-msgid "Drop files here to upload"
-msgstr ""
-
-#: js_upload.php:36
-msgid "Cancel"
-msgstr "الغ"
-
-#: js_upload.php:37
-msgid "Failed"
-msgstr ""
-
-#: js_upload.php:215
-msgid "No files were uploaded."
-msgstr ""
-
-#: js_upload.php:221
-msgid "Uploaded file is empty"
-msgstr ""
-
-#: js_upload.php:233
-#, php-format
-msgid "Image exceeds size limit of %s"
-msgstr ""
-
-#: js_upload.php:245
-#, php-format
-msgid "File has an invalid extension, it should be one of %s."
-msgstr ""
-
-#: js_upload.php:256
-msgid "Upload was cancelled, or server error encountered"
-msgstr ""
diff --git a/js_upload/lang/ar/strings.php b/js_upload/lang/ar/strings.php
deleted file mode 100644
index 51287361..00000000
--- a/js_upload/lang/ar/strings.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_ar")) {
-function string_plural_select_ar($n){
-	$n = intval($n);
-	if ($n==0) { return 0; } else if ($n==1) { return 1; } else if ($n==2) { return 2; } else if ($n%100>=3 && $n%100<=10) { return 3; } else if ($n%100>=11 && $n%100<=99) { return 4; } else  { return 5; }
-}}
-$a->strings['Cancel'] = 'الغ';
diff --git a/js_upload/lang/cs/messages.po b/js_upload/lang/cs/messages.po
index 1241523f..731d165c 100644
--- a/js_upload/lang/cs/messages.po
+++ b/js_upload/lang/cs/messages.po
@@ -4,56 +4,53 @@
 # 
 # 
 # Translators:
-# Aditoo, 2018
-# michal_s <msupler@gmail.com>, 2014
+# Michal Šupler <msupler@gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-23 23:53-0400\n"
-"PO-Revision-Date: 2014-06-23 08:46+0000\n"
-"Last-Translator: Aditoo, 2018\n"
-"Language-Team: Czech (http://app.transifex.com/Friendica/friendica/language/cs/)\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2014-07-07 19:13+0000\n"
+"Last-Translator: Michal Šupler <msupler@gmail.com>\n"
+"Language-Team: Czech (http://www.transifex.com/projects/p/friendica/language/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: cs\n"
-"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: js_upload.php:34
-msgid "Select files for upload"
-msgstr ""
+#: js_upload.php:43
+msgid "Upload a file"
+msgstr "Nahrát soubor"
 
-#: js_upload.php:35
+#: js_upload.php:44
 msgid "Drop files here to upload"
-msgstr "Přetáhněte sem soubory k nahrání"
+msgstr "Přeneste sem soubory k nahrání"
 
-#: js_upload.php:36
+#: js_upload.php:45
 msgid "Cancel"
 msgstr "Zrušit"
 
-#: js_upload.php:37
+#: js_upload.php:46
 msgid "Failed"
 msgstr "Neúspěch"
 
-#: js_upload.php:215
+#: js_upload.php:303
 msgid "No files were uploaded."
 msgstr "Žádné soubory nebyly nahrány."
 
-#: js_upload.php:221
+#: js_upload.php:309
 msgid "Uploaded file is empty"
 msgstr "Nahraný soubor je prázdný"
 
-#: js_upload.php:233
-#, php-format
-msgid "Image exceeds size limit of %s"
-msgstr ""
+#: js_upload.php:321
+msgid "Image exceeds size limit of "
+msgstr "Velikost obrázku překračuje limit velikosti"
 
-#: js_upload.php:245
-#, php-format
-msgid "File has an invalid extension, it should be one of %s."
-msgstr ""
+#: js_upload.php:332
+msgid "File has an invalid extension, it should be one of "
+msgstr "Soubor má neplatnou příponu, ta by měla být jednou z"
 
-#: js_upload.php:256
+#: js_upload.php:343
 msgid "Upload was cancelled, or server error encountered"
 msgstr "Nahrávání bylo zrušeno nebo došlo k chybě na serveru"
diff --git a/js_upload/lang/cs/strings.php b/js_upload/lang/cs/strings.php
index 55ec72a2..6cb6b654 100644
--- a/js_upload/lang/cs/strings.php
+++ b/js_upload/lang/cs/strings.php
@@ -2,12 +2,15 @@
 
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
-	$n = intval($n);
-	if (($n == 1 && $n % 1 == 0)) { return 0; } else if (($n >= 2 && $n <= 4 && $n % 1 == 0)) { return 1; } else if (($n % 1 != 0 )) { return 2; } else  { return 3; }
+	return ($n==1) ? 0 : ($n>=2 && $n<=4) ? 1 : 2;;
 }}
-$a->strings['Drop files here to upload'] = 'Přetáhněte sem soubory k nahrání';
-$a->strings['Cancel'] = 'Zrušit';
-$a->strings['Failed'] = 'Neúspěch';
-$a->strings['No files were uploaded.'] = 'Žádné soubory nebyly nahrány.';
-$a->strings['Uploaded file is empty'] = 'Nahraný soubor je prázdný';
-$a->strings['Upload was cancelled, or server error encountered'] = 'Nahrávání bylo zrušeno nebo došlo k chybě na serveru';
+;
+$a->strings["Upload a file"] = "Nahrát soubor";
+$a->strings["Drop files here to upload"] = "Přeneste sem soubory k nahrání";
+$a->strings["Cancel"] = "Zrušit";
+$a->strings["Failed"] = "Neúspěch";
+$a->strings["No files were uploaded."] = "Žádné soubory nebyly nahrány.";
+$a->strings["Uploaded file is empty"] = "Nahraný soubor je prázdný";
+$a->strings["Image exceeds size limit of "] = "Velikost obrázku překračuje limit velikosti";
+$a->strings["File has an invalid extension, it should be one of "] = "Soubor má neplatnou příponu, ta by měla být jednou z";
+$a->strings["Upload was cancelled, or server error encountered"] = "Nahrávání bylo zrušeno nebo došlo k chybě na serveru";
diff --git a/js_upload/lang/da-dk/messages.po b/js_upload/lang/da-dk/messages.po
deleted file mode 100644
index 171e3d44..00000000
--- a/js_upload/lang/da-dk/messages.po
+++ /dev/null
@@ -1,58 +0,0 @@
-# ADDON js_upload
-# Copyright (C)
-# This file is distributed under the same license as the Friendica js_upload addon package.
-# 
-# 
-# Translators:
-# Anton <dev@atjn.dk>, 2022
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-23 23:53-0400\n"
-"PO-Revision-Date: 2014-06-23 08:46+0000\n"
-"Last-Translator: Anton <dev@atjn.dk>, 2022\n"
-"Language-Team: Danish (Denmark) (http://www.transifex.com/Friendica/friendica/language/da_DK/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: da_DK\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: js_upload.php:34
-msgid "Select files for upload"
-msgstr "Vælg filer til upload"
-
-#: js_upload.php:35
-msgid "Drop files here to upload"
-msgstr "Drop filer her til upload"
-
-#: js_upload.php:36
-msgid "Cancel"
-msgstr "Annullér"
-
-#: js_upload.php:37
-msgid "Failed"
-msgstr "Fejlede"
-
-#: js_upload.php:215
-msgid "No files were uploaded."
-msgstr "Ingen filer blev uploadet."
-
-#: js_upload.php:221
-msgid "Uploaded file is empty"
-msgstr "Uploadede fil er tom"
-
-#: js_upload.php:233
-#, php-format
-msgid "Image exceeds size limit of %s"
-msgstr "Billede overskrider størrelsesbegrænsning på %s"
-
-#: js_upload.php:245
-#, php-format
-msgid "File has an invalid extension, it should be one of %s."
-msgstr "Fil har en ugyldig udvidelse, det skal være en af %s."
-
-#: js_upload.php:256
-msgid "Upload was cancelled, or server error encountered"
-msgstr "Upload blev annulleret, eller der skete en fejl på serveren"
diff --git a/js_upload/lang/da-dk/strings.php b/js_upload/lang/da-dk/strings.php
deleted file mode 100644
index c76d4841..00000000
--- a/js_upload/lang/da-dk/strings.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_da_dk")) {
-function string_plural_select_da_dk($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Select files for upload'] = 'Vælg filer til upload';
-$a->strings['Drop files here to upload'] = 'Drop filer her til upload';
-$a->strings['Cancel'] = 'Annullér';
-$a->strings['Failed'] = 'Fejlede';
-$a->strings['No files were uploaded.'] = 'Ingen filer blev uploadet.';
-$a->strings['Uploaded file is empty'] = 'Uploadede fil er tom';
-$a->strings['Image exceeds size limit of %s'] = 'Billede overskrider størrelsesbegrænsning på %s';
-$a->strings['File has an invalid extension, it should be one of %s.'] = 'Fil har en ugyldig udvidelse, det skal være en af %s.';
-$a->strings['Upload was cancelled, or server error encountered'] = 'Upload blev annulleret, eller der skete en fejl på serveren';
diff --git a/js_upload/lang/de/messages.po b/js_upload/lang/de/messages.po
index 010704c5..7cb6de56 100644
--- a/js_upload/lang/de/messages.po
+++ b/js_upload/lang/de/messages.po
@@ -4,57 +4,53 @@
 # 
 # 
 # Translators:
-# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2014
-# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2021
-# Ulf Rompe <transifex.com@rompe.org>, 2019
+# bavatar <tobias.diekershoff@gmx.net>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-23 23:53-0400\n"
-"PO-Revision-Date: 2014-06-23 08:46+0000\n"
-"Last-Translator: Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2021\n"
-"Language-Team: German (http://app.transifex.com/Friendica/friendica/language/de/)\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2014-07-11 06:01+0000\n"
+"Last-Translator: bavatar <tobias.diekershoff@gmx.net>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/friendica/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js_upload.php:34
-msgid "Select files for upload"
-msgstr "Dateien für den Upload auswählen"
+#: js_upload.php:43
+msgid "Upload a file"
+msgstr "Datei hochladen"
 
-#: js_upload.php:35
+#: js_upload.php:44
 msgid "Drop files here to upload"
-msgstr "Ziehe die Dateien hierher, die du hochladen willst"
+msgstr "Ziehe die Dateien hierher die du hochladen willst"
 
-#: js_upload.php:36
+#: js_upload.php:45
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: js_upload.php:37
+#: js_upload.php:46
 msgid "Failed"
 msgstr "Fehlgeschlagen"
 
-#: js_upload.php:215
+#: js_upload.php:303
 msgid "No files were uploaded."
 msgstr "Keine Dateien hochgeladen."
 
-#: js_upload.php:221
+#: js_upload.php:309
 msgid "Uploaded file is empty"
 msgstr "Hochgeladene Datei ist leer"
 
-#: js_upload.php:233
-#, php-format
-msgid "Image exceeds size limit of %s"
-msgstr "Bildgröße überschreitet das Limit von %s"
+#: js_upload.php:321
+msgid "Image exceeds size limit of "
+msgstr "Die Bildgröße übersteigt das Limit von "
 
-#: js_upload.php:245
-#, php-format
-msgid "File has an invalid extension, it should be one of %s."
-msgstr "Die Dateiextension ist nicht erlaubt, sie muss eine der folgenden sein %s."
+#: js_upload.php:332
+msgid "File has an invalid extension, it should be one of "
+msgstr "Die Dateiextension ist nicht erlaubt, sie muss eine der folgenden sein "
 
-#: js_upload.php:256
+#: js_upload.php:343
 msgid "Upload was cancelled, or server error encountered"
 msgstr "Upload abgebrochen oder Serverfehler aufgetreten"
diff --git a/js_upload/lang/de/strings.php b/js_upload/lang/de/strings.php
index 8d8d518b..5a680cb2 100644
--- a/js_upload/lang/de/strings.php
+++ b/js_upload/lang/de/strings.php
@@ -2,15 +2,15 @@
 
 if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Select files for upload'] = 'Dateien für den Upload auswählen';
-$a->strings['Drop files here to upload'] = 'Ziehe die Dateien hierher, die du hochladen willst';
-$a->strings['Cancel'] = 'Abbrechen';
-$a->strings['Failed'] = 'Fehlgeschlagen';
-$a->strings['No files were uploaded.'] = 'Keine Dateien hochgeladen.';
-$a->strings['Uploaded file is empty'] = 'Hochgeladene Datei ist leer';
-$a->strings['Image exceeds size limit of %s'] = 'Bildgröße überschreitet das Limit von %s';
-$a->strings['File has an invalid extension, it should be one of %s.'] = 'Die Dateiextension ist nicht erlaubt, sie muss eine der folgenden sein %s.';
-$a->strings['Upload was cancelled, or server error encountered'] = 'Upload abgebrochen oder Serverfehler aufgetreten';
+;
+$a->strings["Upload a file"] = "Datei hochladen";
+$a->strings["Drop files here to upload"] = "Ziehe die Dateien hierher die du hochladen willst";
+$a->strings["Cancel"] = "Abbrechen";
+$a->strings["Failed"] = "Fehlgeschlagen";
+$a->strings["No files were uploaded."] = "Keine Dateien hochgeladen.";
+$a->strings["Uploaded file is empty"] = "Hochgeladene Datei ist leer";
+$a->strings["Image exceeds size limit of "] = "Die Bildgröße übersteigt das Limit von ";
+$a->strings["File has an invalid extension, it should be one of "] = "Die Dateiextension ist nicht erlaubt, sie muss eine der folgenden sein ";
+$a->strings["Upload was cancelled, or server error encountered"] = "Upload abgebrochen oder Serverfehler aufgetreten";
diff --git a/js_upload/lang/es/messages.po b/js_upload/lang/es/messages.po
index a105d93e..0b737806 100644
--- a/js_upload/lang/es/messages.po
+++ b/js_upload/lang/es/messages.po
@@ -5,55 +5,52 @@
 # 
 # Translators:
 # Albert, 2016
-# Senex Petrovic <javierruizo@hotmail.com>, 2021
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-23 23:53-0400\n"
-"PO-Revision-Date: 2014-06-23 08:46+0000\n"
-"Last-Translator: Senex Petrovic <javierruizo@hotmail.com>, 2021\n"
-"Language-Team: Spanish (http://app.transifex.com/Friendica/friendica/language/es/)\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2016-11-17 18:59+0000\n"
+"Last-Translator: Albert\n"
+"Language-Team: Spanish (http://www.transifex.com/Friendica/friendica/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: es\n"
-"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js_upload.php:34
-msgid "Select files for upload"
-msgstr "Seleciona archivos a subir"
+#: js_upload.php:43
+msgid "Upload a file"
+msgstr "Subir un archivo"
 
-#: js_upload.php:35
+#: js_upload.php:44
 msgid "Drop files here to upload"
 msgstr "Soltar archivos aquí para subir"
 
-#: js_upload.php:36
+#: js_upload.php:45
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: js_upload.php:37
+#: js_upload.php:46
 msgid "Failed"
 msgstr "Fallido"
 
-#: js_upload.php:215
+#: js_upload.php:303
 msgid "No files were uploaded."
 msgstr "No se subió ningún archivo."
 
-#: js_upload.php:221
+#: js_upload.php:309
 msgid "Uploaded file is empty"
 msgstr "El archivo subido está vacío"
 
-#: js_upload.php:233
-#, php-format
-msgid "Image exceeds size limit of %s"
-msgstr ""
+#: js_upload.php:321
+msgid "Image exceeds size limit of "
+msgstr "La imagen excede el tamaño de"
 
-#: js_upload.php:245
-#, php-format
-msgid "File has an invalid extension, it should be one of %s."
-msgstr ""
+#: js_upload.php:332
+msgid "File has an invalid extension, it should be one of "
+msgstr "El archivo tiene una extensión inválida, debería ser una de"
 
-#: js_upload.php:256
+#: js_upload.php:343
 msgid "Upload was cancelled, or server error encountered"
 msgstr "La subida fue cancelada, o el servidor tuvo un error"
diff --git a/js_upload/lang/es/strings.php b/js_upload/lang/es/strings.php
index 4c0dc66b..63168e8c 100644
--- a/js_upload/lang/es/strings.php
+++ b/js_upload/lang/es/strings.php
@@ -2,13 +2,15 @@
 
 if(! function_exists("string_plural_select_es")) {
 function string_plural_select_es($n){
-	$n = intval($n);
-	if ($n == 1) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
+	return ($n != 1);;
 }}
-$a->strings['Select files for upload'] = 'Seleciona archivos a subir';
-$a->strings['Drop files here to upload'] = 'Soltar archivos aquí para subir';
-$a->strings['Cancel'] = 'Cancelar';
-$a->strings['Failed'] = 'Fallido';
-$a->strings['No files were uploaded.'] = 'No se subió ningún archivo.';
-$a->strings['Uploaded file is empty'] = 'El archivo subido está vacío';
-$a->strings['Upload was cancelled, or server error encountered'] = 'La subida fue cancelada, o el servidor tuvo un error';
+;
+$a->strings["Upload a file"] = "Subir un archivo";
+$a->strings["Drop files here to upload"] = "Soltar archivos aquí para subir";
+$a->strings["Cancel"] = "Cancelar";
+$a->strings["Failed"] = "Fallido";
+$a->strings["No files were uploaded."] = "No se subió ningún archivo.";
+$a->strings["Uploaded file is empty"] = "El archivo subido está vacío";
+$a->strings["Image exceeds size limit of "] = "La imagen excede el tamaño de";
+$a->strings["File has an invalid extension, it should be one of "] = "El archivo tiene una extensión inválida, debería ser una de";
+$a->strings["Upload was cancelled, or server error encountered"] = "La subida fue cancelada, o el servidor tuvo un error";
diff --git a/js_upload/lang/fi-fi/strings.php b/js_upload/lang/fi-fi/strings.php
index 62807441..25db34c5 100644
--- a/js_upload/lang/fi-fi/strings.php
+++ b/js_upload/lang/fi-fi/strings.php
@@ -3,13 +3,15 @@
 if(! function_exists("string_plural_select_fi_fi")) {
 function string_plural_select_fi_fi($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Upload a file'] = 'Lähetä tiedosto';
-$a->strings['Cancel'] = 'Peruuta';
-$a->strings['Failed'] = 'Epäonnistui';
-$a->strings['No files were uploaded.'] = 'Tiedostoja ei lähetetty.';
-$a->strings['Uploaded file is empty'] = 'Lähetetty tiedosto on tyhjä';
-$a->strings['Image exceeds size limit of '] = 'Kuva ylittää kokorajoituksen ';
-$a->strings['File has an invalid extension, it should be one of '] = 'Tiedostopääte on virheellinen. Sallitut tiedostopäätteet:';
-$a->strings['Upload was cancelled, or server error encountered'] = 'Lataus peruutettu, tai palvelimessa tapahtui virhe.';
+;
+$a->strings["Upload a file"] = "Lähetä tiedosto";
+$a->strings["Drop files here to upload"] = "";
+$a->strings["Cancel"] = "Peruuta";
+$a->strings["Failed"] = "Epäonnistui";
+$a->strings["No files were uploaded."] = "Tiedostoja ei lähetetty.";
+$a->strings["Uploaded file is empty"] = "Lähetetty tiedosto on tyhjä";
+$a->strings["Image exceeds size limit of "] = "Kuva ylittää kokorajoituksen ";
+$a->strings["File has an invalid extension, it should be one of "] = "Tiedostopääte on virheellinen. Sallitut tiedostopäätteet:";
+$a->strings["Upload was cancelled, or server error encountered"] = "Lataus peruutettu, tai palvelimessa tapahtui virhe.";
diff --git a/js_upload/lang/fr/messages.po b/js_upload/lang/fr/messages.po
deleted file mode 100644
index ec197b3f..00000000
--- a/js_upload/lang/fr/messages.po
+++ /dev/null
@@ -1,62 +0,0 @@
-# ADDON js_upload
-# Copyright (C)
-# This file is distributed under the same license as the Friendica js_upload addon package.
-# 
-# 
-# Translators:
-# bob lebonche <lebonche@tutanota.com>, 2021
-# ButterflyOfFire, 2020
-# Hypolite Petovan <hypolite@mrpetovan.com>, 2022
-# Nicolas Derive, 2022
-# StefOfficiel <pichard.stephane@free.fr>, 2015
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-23 23:53-0400\n"
-"PO-Revision-Date: 2014-06-23 08:46+0000\n"
-"Last-Translator: Nicolas Derive, 2022\n"
-"Language-Team: French (http://www.transifex.com/Friendica/friendica/language/fr/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: fr\n"
-"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
-
-#: js_upload.php:34
-msgid "Select files for upload"
-msgstr "Sélectionner les fichiers à télécharger"
-
-#: js_upload.php:35
-msgid "Drop files here to upload"
-msgstr "Glisser les fichiers ici pour uploader"
-
-#: js_upload.php:36
-msgid "Cancel"
-msgstr "Annuler"
-
-#: js_upload.php:37
-msgid "Failed"
-msgstr "Echec"
-
-#: js_upload.php:215
-msgid "No files were uploaded."
-msgstr "Aucun fichier téléchargé"
-
-#: js_upload.php:221
-msgid "Uploaded file is empty"
-msgstr "Le fichier téléchargé est vide"
-
-#: js_upload.php:233
-#, php-format
-msgid "Image exceeds size limit of %s"
-msgstr "L'image dépasse la taille limite de %s"
-
-#: js_upload.php:245
-#, php-format
-msgid "File has an invalid extension, it should be one of %s."
-msgstr "Le fichier a une extension invalide, elle devrait être parmi celles-ci : %s."
-
-#: js_upload.php:256
-msgid "Upload was cancelled, or server error encountered"
-msgstr "Le téléchargement a été annulé ou le server a rencontré une erreur"
diff --git a/js_upload/lang/fr/strings.php b/js_upload/lang/fr/strings.php
index 57b74bb7..fba7cf36 100644
--- a/js_upload/lang/fr/strings.php
+++ b/js_upload/lang/fr/strings.php
@@ -1,16 +1,11 @@
-<?php
-
-if(! function_exists("string_plural_select_fr")) {
-function string_plural_select_fr($n){
-	$n = intval($n);
-	if (($n == 0 || $n == 1)) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
-}}
-$a->strings['Select files for upload'] = 'Sélectionner les fichiers à télécharger';
-$a->strings['Drop files here to upload'] = 'Glisser les fichiers ici pour uploader';
-$a->strings['Cancel'] = 'Annuler';
-$a->strings['Failed'] = 'Echec';
-$a->strings['No files were uploaded.'] = 'Aucun fichier téléchargé';
-$a->strings['Uploaded file is empty'] = 'Le fichier téléchargé est vide';
-$a->strings['Image exceeds size limit of %s'] = 'L\'image dépasse la taille limite de %s';
-$a->strings['File has an invalid extension, it should be one of %s.'] = 'Le fichier a une extension invalide, elle devrait être parmi celles-ci : %s.';
-$a->strings['Upload was cancelled, or server error encountered'] = 'Le téléchargement a été annulé ou le server a rencontré une erreur';
+<?php
+
+$a->strings["Upload a file"] = "Téléverser un fichier";
+$a->strings["Drop files here to upload"] = "Déposer des fichiers ici pour les téléverser";
+$a->strings["Cancel"] = "Annuler";
+$a->strings["Failed"] = "Échec";
+$a->strings["No files were uploaded."] = "Aucun fichier n'a été téléversé.";
+$a->strings["Uploaded file is empty"] = "Le fichier téléversé est vide";
+$a->strings["Image exceeds size limit of "] = "L'image dépasse la taille maximale de  ";
+$a->strings["File has an invalid extension, it should be one of "] = "Le fichier a une extension invalide, elle devrait être parmi ";
+$a->strings["Upload was cancelled, or server error encountered"] = "Téléversement annulé, ou erreur de serveur";
diff --git a/js_upload/lang/hu/messages.po b/js_upload/lang/hu/messages.po
deleted file mode 100644
index 45b72327..00000000
--- a/js_upload/lang/hu/messages.po
+++ /dev/null
@@ -1,58 +0,0 @@
-# ADDON js_upload
-# Copyright (C)
-# This file is distributed under the same license as the Friendica js_upload addon package.
-# 
-# 
-# Translators:
-# Balázs Úr, 2020-2021
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-23 23:53-0400\n"
-"PO-Revision-Date: 2014-06-23 08:46+0000\n"
-"Last-Translator: Balázs Úr, 2020-2021\n"
-"Language-Team: Hungarian (http://www.transifex.com/Friendica/friendica/language/hu/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: hu\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: js_upload.php:34
-msgid "Select files for upload"
-msgstr "Fájlok kijelölése a feltöltéshez"
-
-#: js_upload.php:35
-msgid "Drop files here to upload"
-msgstr "Húzzon ide fájlokat a feltöltéshez"
-
-#: js_upload.php:36
-msgid "Cancel"
-msgstr "Mégse"
-
-#: js_upload.php:37
-msgid "Failed"
-msgstr "Sikertelen"
-
-#: js_upload.php:215
-msgid "No files were uploaded."
-msgstr "Nem lettek fájlok feltöltve."
-
-#: js_upload.php:221
-msgid "Uploaded file is empty"
-msgstr "A feltöltött fájl üres"
-
-#: js_upload.php:233
-#, php-format
-msgid "Image exceeds size limit of %s"
-msgstr "A kép meghaladja a beállított %s méretkorlátot"
-
-#: js_upload.php:245
-#, php-format
-msgid "File has an invalid extension, it should be one of %s."
-msgstr "A fájl érvénytelen kiterjesztéssel rendelkezik, %s egyikének kell lennie."
-
-#: js_upload.php:256
-msgid "Upload was cancelled, or server error encountered"
-msgstr "A feltöltés meg lett szakítva vagy kiszolgálóhiba történt"
diff --git a/js_upload/lang/hu/strings.php b/js_upload/lang/hu/strings.php
deleted file mode 100644
index d19790e4..00000000
--- a/js_upload/lang/hu/strings.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_hu")) {
-function string_plural_select_hu($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Select files for upload'] = 'Fájlok kijelölése a feltöltéshez';
-$a->strings['Drop files here to upload'] = 'Húzzon ide fájlokat a feltöltéshez';
-$a->strings['Cancel'] = 'Mégse';
-$a->strings['Failed'] = 'Sikertelen';
-$a->strings['No files were uploaded.'] = 'Nem lettek fájlok feltöltve.';
-$a->strings['Uploaded file is empty'] = 'A feltöltött fájl üres';
-$a->strings['Image exceeds size limit of %s'] = 'A kép meghaladja a beállított %s méretkorlátot';
-$a->strings['File has an invalid extension, it should be one of %s.'] = 'A fájl érvénytelen kiterjesztéssel rendelkezik, %s egyikének kell lennie.';
-$a->strings['Upload was cancelled, or server error encountered'] = 'A feltöltés meg lett szakítva vagy kiszolgálóhiba történt';
diff --git a/js_upload/lang/it/messages.po b/js_upload/lang/it/messages.po
index 172ee90d..e529fb54 100644
--- a/js_upload/lang/it/messages.po
+++ b/js_upload/lang/it/messages.po
@@ -5,55 +5,52 @@
 # 
 # Translators:
 # fabrixxm <fabrix.xm@gmail.com>, 2014
-# Sylke Vicious <silkevicious@gmail.com>, 2021
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-23 23:53-0400\n"
-"PO-Revision-Date: 2014-06-23 08:46+0000\n"
-"Last-Translator: Sylke Vicious <silkevicious@gmail.com>, 2021\n"
-"Language-Team: Italian (http://app.transifex.com/Friendica/friendica/language/it/)\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2017-09-20 06:08+0000\n"
+"Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n"
+"Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: it\n"
-"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js_upload.php:34
-msgid "Select files for upload"
-msgstr "Seleziona file per il caricamento"
+#: js_upload.php:43
+msgid "Upload a file"
+msgstr "Carica un file"
 
-#: js_upload.php:35
+#: js_upload.php:44
 msgid "Drop files here to upload"
 msgstr "Trascina un file qui per caricarlo"
 
-#: js_upload.php:36
+#: js_upload.php:45
 msgid "Cancel"
 msgstr "Annulla"
 
-#: js_upload.php:37
+#: js_upload.php:46
 msgid "Failed"
 msgstr "Caricamento fallito"
 
-#: js_upload.php:215
+#: js_upload.php:303
 msgid "No files were uploaded."
 msgstr "Nessun file è stato caricato."
 
-#: js_upload.php:221
+#: js_upload.php:309
 msgid "Uploaded file is empty"
 msgstr "Il file caricato è vuoto"
 
-#: js_upload.php:233
-#, php-format
-msgid "Image exceeds size limit of %s"
-msgstr "La dimensione dell'immagine supera il limite di %s"
+#: js_upload.php:321
+msgid "Image exceeds size limit of "
+msgstr "L'immagine supera il limite di"
 
-#: js_upload.php:245
-#, php-format
-msgid "File has an invalid extension, it should be one of %s."
-msgstr "Il file ha un'estensione non valida, dovrebbe essere una tra %s."
+#: js_upload.php:332
+msgid "File has an invalid extension, it should be one of "
+msgstr "Il file ha un'estensione non valida, dovrebbe essere una tra "
 
-#: js_upload.php:256
+#: js_upload.php:343
 msgid "Upload was cancelled, or server error encountered"
 msgstr "Il caricamento è stato cancellato, o si è verificato un errore sul server"
diff --git a/js_upload/lang/it/strings.php b/js_upload/lang/it/strings.php
index 5c961761..dd51f385 100644
--- a/js_upload/lang/it/strings.php
+++ b/js_upload/lang/it/strings.php
@@ -2,15 +2,15 @@
 
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
-	$n = intval($n);
-	if ($n == 1) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
+	return ($n != 1);;
 }}
-$a->strings['Select files for upload'] = 'Seleziona file per il caricamento';
-$a->strings['Drop files here to upload'] = 'Trascina un file qui per caricarlo';
-$a->strings['Cancel'] = 'Annulla';
-$a->strings['Failed'] = 'Caricamento fallito';
-$a->strings['No files were uploaded.'] = 'Nessun file è stato caricato.';
-$a->strings['Uploaded file is empty'] = 'Il file caricato è vuoto';
-$a->strings['Image exceeds size limit of %s'] = 'La dimensione dell\'immagine supera il limite di %s';
-$a->strings['File has an invalid extension, it should be one of %s.'] = 'Il file ha un\'estensione non valida, dovrebbe essere una tra %s.';
-$a->strings['Upload was cancelled, or server error encountered'] = 'Il caricamento è stato cancellato, o si è verificato un errore sul server';
+;
+$a->strings["Upload a file"] = "Carica un file";
+$a->strings["Drop files here to upload"] = "Trascina un file qui per caricarlo";
+$a->strings["Cancel"] = "Annulla";
+$a->strings["Failed"] = "Caricamento fallito";
+$a->strings["No files were uploaded."] = "Nessun file è stato caricato.";
+$a->strings["Uploaded file is empty"] = "Il file caricato è vuoto";
+$a->strings["Image exceeds size limit of "] = "L'immagine supera il limite di";
+$a->strings["File has an invalid extension, it should be one of "] = "Il file ha un'estensione non valida, dovrebbe essere una tra ";
+$a->strings["Upload was cancelled, or server error encountered"] = "Il caricamento è stato cancellato, o si è verificato un errore sul server";
diff --git a/js_upload/lang/nl/messages.po b/js_upload/lang/nl/messages.po
index 8b3179ff..713ba3a2 100644
--- a/js_upload/lang/nl/messages.po
+++ b/js_upload/lang/nl/messages.po
@@ -5,55 +5,52 @@
 # 
 # Translators:
 # Jeroen De Meerleer <me@jeroened.be>, 2018
-# Ruud Schilders <ruud@schilders.it>, 2020
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-23 23:53-0400\n"
-"PO-Revision-Date: 2014-06-23 08:46+0000\n"
-"Last-Translator: Ruud Schilders <ruud@schilders.it>, 2020\n"
-"Language-Team: Dutch (http://app.transifex.com/Friendica/friendica/language/nl/)\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2018-08-24 11:48+0000\n"
+"Last-Translator: Jeroen De Meerleer <me@jeroened.be>\n"
+"Language-Team: Dutch (http://www.transifex.com/Friendica/friendica/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: js_upload.php:34
-msgid "Select files for upload"
-msgstr ""
+#: js_upload.php:43
+msgid "Upload a file"
+msgstr "Upload een bestand"
 
-#: js_upload.php:35
+#: js_upload.php:44
 msgid "Drop files here to upload"
 msgstr "Sleep uw bestanden hier om ze te uploaden"
 
-#: js_upload.php:36
+#: js_upload.php:45
 msgid "Cancel"
-msgstr "Afbreken"
+msgstr ""
 
-#: js_upload.php:37
+#: js_upload.php:46
 msgid "Failed"
-msgstr "Mislukt"
+msgstr ""
 
-#: js_upload.php:215
+#: js_upload.php:303
 msgid "No files were uploaded."
-msgstr "Er waren geen bestanden geüpload."
+msgstr ""
 
-#: js_upload.php:221
+#: js_upload.php:309
 msgid "Uploaded file is empty"
-msgstr "Het geüploade bestand is leeg"
-
-#: js_upload.php:233
-#, php-format
-msgid "Image exceeds size limit of %s"
 msgstr ""
 
-#: js_upload.php:245
-#, php-format
-msgid "File has an invalid extension, it should be one of %s."
+#: js_upload.php:321
+msgid "Image exceeds size limit of "
 msgstr ""
 
-#: js_upload.php:256
+#: js_upload.php:332
+msgid "File has an invalid extension, it should be one of "
+msgstr ""
+
+#: js_upload.php:343
 msgid "Upload was cancelled, or server error encountered"
 msgstr ""
diff --git a/js_upload/lang/nl/strings.php b/js_upload/lang/nl/strings.php
index 4ba709a4..9289cc40 100644
--- a/js_upload/lang/nl/strings.php
+++ b/js_upload/lang/nl/strings.php
@@ -3,10 +3,15 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Drop files here to upload'] = 'Sleep uw bestanden hier om ze te uploaden';
-$a->strings['Cancel'] = 'Afbreken';
-$a->strings['Failed'] = 'Mislukt';
-$a->strings['No files were uploaded.'] = 'Er waren geen bestanden geüpload.';
-$a->strings['Uploaded file is empty'] = 'Het geüploade bestand is leeg';
+;
+$a->strings["Upload a file"] = "Upload een bestand";
+$a->strings["Drop files here to upload"] = "Sleep uw bestanden hier om ze te uploaden";
+$a->strings["Cancel"] = "";
+$a->strings["Failed"] = "";
+$a->strings["No files were uploaded."] = "";
+$a->strings["Uploaded file is empty"] = "";
+$a->strings["Image exceeds size limit of "] = "";
+$a->strings["File has an invalid extension, it should be one of "] = "";
+$a->strings["Upload was cancelled, or server error encountered"] = "";
diff --git a/js_upload/lang/pl/messages.po b/js_upload/lang/pl/messages.po
index 534b43c2..32aad058 100644
--- a/js_upload/lang/pl/messages.po
+++ b/js_upload/lang/pl/messages.po
@@ -4,15 +4,14 @@
 # 
 # 
 # Translators:
-# Piotr Strębski <strebski@gmail.com>, 2022
-# Waldemar Stoczkowski, 2018
+# Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-23 23:53-0400\n"
-"PO-Revision-Date: 2014-06-23 08:46+0000\n"
-"Last-Translator: Piotr Strębski <strebski@gmail.com>, 2022\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2018-03-30 17:58+0000\n"
+"Last-Translator: Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.com/Friendica/friendica/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,40 +19,38 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
-#: js_upload.php:34
-msgid "Select files for upload"
-msgstr "Wybierz pliki do przesłania"
+#: js_upload.php:43
+msgid "Upload a file"
+msgstr "Prześlij plik"
 
-#: js_upload.php:35
+#: js_upload.php:44
 msgid "Drop files here to upload"
-msgstr "Upuść tutaj pliki do przesłania"
+msgstr "Upuść pliki tutaj, aby przesłać"
 
-#: js_upload.php:36
+#: js_upload.php:45
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: js_upload.php:37
+#: js_upload.php:46
 msgid "Failed"
 msgstr "Nie powiodło się"
 
-#: js_upload.php:215
+#: js_upload.php:303
 msgid "No files were uploaded."
 msgstr "Żadne pliki nie zostały przesłane."
 
-#: js_upload.php:221
+#: js_upload.php:309
 msgid "Uploaded file is empty"
 msgstr "Przesłany plik jest pusty"
 
-#: js_upload.php:233
-#, php-format
-msgid "Image exceeds size limit of %s"
-msgstr "Obraz przekracza limit rozmiaru wynoszący %s"
+#: js_upload.php:321
+msgid "Image exceeds size limit of "
+msgstr "Obraz przekracza limit rozmiaru wynoszący"
 
-#: js_upload.php:245
-#, php-format
-msgid "File has an invalid extension, it should be one of %s."
-msgstr "Plik ma nieprawidłowe rozszerzenie, powinno być jednym z: %s."
+#: js_upload.php:332
+msgid "File has an invalid extension, it should be one of "
+msgstr "Plik ma nieprawidłowe rozszerzenie, powinno być jednym z nich"
 
-#: js_upload.php:256
+#: js_upload.php:343
 msgid "Upload was cancelled, or server error encountered"
 msgstr "Przesyłanie zostało anulowane lub wystąpił błąd serwera"
diff --git a/js_upload/lang/pl/strings.php b/js_upload/lang/pl/strings.php
index 367b4b6b..19140b92 100644
--- a/js_upload/lang/pl/strings.php
+++ b/js_upload/lang/pl/strings.php
@@ -2,15 +2,15 @@
 
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
-	$n = intval($n);
-	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
+	return ($n==1 ? 0 : ($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14) ? 1 : $n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14) ? 2 : 3);;
 }}
-$a->strings['Select files for upload'] = 'Wybierz pliki do przesłania';
-$a->strings['Drop files here to upload'] = 'Upuść tutaj pliki do przesłania';
-$a->strings['Cancel'] = 'Anuluj';
-$a->strings['Failed'] = 'Nie powiodło się';
-$a->strings['No files were uploaded.'] = 'Żadne pliki nie zostały przesłane.';
-$a->strings['Uploaded file is empty'] = 'Przesłany plik jest pusty';
-$a->strings['Image exceeds size limit of %s'] = 'Obraz przekracza limit rozmiaru wynoszący %s';
-$a->strings['File has an invalid extension, it should be one of %s.'] = 'Plik ma nieprawidłowe rozszerzenie, powinno być jednym z: %s.';
-$a->strings['Upload was cancelled, or server error encountered'] = 'Przesyłanie zostało anulowane lub wystąpił błąd serwera';
+;
+$a->strings["Upload a file"] = "Prześlij plik";
+$a->strings["Drop files here to upload"] = "Upuść pliki tutaj, aby przesłać";
+$a->strings["Cancel"] = "Anuluj";
+$a->strings["Failed"] = "Nie powiodło się";
+$a->strings["No files were uploaded."] = "Żadne pliki nie zostały przesłane.";
+$a->strings["Uploaded file is empty"] = "Przesłany plik jest pusty";
+$a->strings["Image exceeds size limit of "] = "Obraz przekracza limit rozmiaru wynoszący";
+$a->strings["File has an invalid extension, it should be one of "] = "Plik ma nieprawidłowe rozszerzenie, powinno być jednym z nich";
+$a->strings["Upload was cancelled, or server error encountered"] = "Przesyłanie zostało anulowane lub wystąpił błąd serwera";
diff --git a/js_upload/lang/ro/strings.php b/js_upload/lang/ro/strings.php
index 5e87a4f9..778210e7 100644
--- a/js_upload/lang/ro/strings.php
+++ b/js_upload/lang/ro/strings.php
@@ -2,15 +2,15 @@
 
 if(! function_exists("string_plural_select_ro")) {
 function string_plural_select_ro($n){
-	$n = intval($n);
-	if ($n==1) { return 0; } else if ((($n%100>19)||(($n%100==0)&&($n!=0)))) { return 2; } else  { return 1; }
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
 }}
-$a->strings['Upload a file'] = 'Încărcați un fișier';
-$a->strings['Drop files here to upload'] = 'Fixați fișierele aici pentru încărcare';
-$a->strings['Cancel'] = 'Anulare';
-$a->strings['Failed'] = 'Eșuat';
-$a->strings['No files were uploaded.'] = 'Nici un fișier nu a fost încărcat.';
-$a->strings['Uploaded file is empty'] = 'Fișierul încărcat este gol';
-$a->strings['Image exceeds size limit of '] = 'Dimensiunea imaginii depășește limita de';
-$a->strings['File has an invalid extension, it should be one of '] = 'Fișierul are o extensie invalidă, acesta trebuie să fie una de tipul';
-$a->strings['Upload was cancelled, or server error encountered'] = 'Încărcarea a fost anulată, sau a apărut o eroare de server';
+;
+$a->strings["Upload a file"] = "Încărcați un fișier";
+$a->strings["Drop files here to upload"] = "Fixați fișierele aici pentru încărcare";
+$a->strings["Cancel"] = "Anulare";
+$a->strings["Failed"] = "Eșuat";
+$a->strings["No files were uploaded."] = "Nici un fișier nu a fost încărcat.";
+$a->strings["Uploaded file is empty"] = "Fișierul încărcat este gol";
+$a->strings["Image exceeds size limit of "] = "Dimensiunea imaginii depășește limita de";
+$a->strings["File has an invalid extension, it should be one of "] = "Fișierul are o extensie invalidă, acesta trebuie să fie una de tipul";
+$a->strings["Upload was cancelled, or server error encountered"] = "Încărcarea a fost anulată, sau a apărut o eroare de server";
diff --git a/js_upload/lang/ru/messages.po b/js_upload/lang/ru/messages.po
deleted file mode 100644
index bb5be3e0..00000000
--- a/js_upload/lang/ru/messages.po
+++ /dev/null
@@ -1,56 +0,0 @@
-# ADDON js_upload
-# Copyright (C)
-# This file is distributed under the same license as the Friendica js_upload addon package.
-# 
-# 
-# Translators:
-# Alexander An <ravnina@gmail.com>, 2020
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-27 05:01-0500\n"
-"PO-Revision-Date: 2020-04-23 13:59+0000\n"
-"Last-Translator: Alexander An <ravnina@gmail.com>\n"
-"Language-Team: Russian (http://www.transifex.com/Friendica/friendica/language/ru/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ru\n"
-"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
-
-#: js_upload.php:43
-msgid "Upload a file"
-msgstr "Загрузить файл"
-
-#: js_upload.php:44
-msgid "Drop files here to upload"
-msgstr "Перетащите сюда файлы для загрузки"
-
-#: js_upload.php:45
-msgid "Cancel"
-msgstr "Отмена"
-
-#: js_upload.php:46
-msgid "Failed"
-msgstr "Ошибка"
-
-#: js_upload.php:303
-msgid "No files were uploaded."
-msgstr "Файлы не были загружены."
-
-#: js_upload.php:309
-msgid "Uploaded file is empty"
-msgstr "Загруженный файл пустой."
-
-#: js_upload.php:321
-msgid "Image exceeds size limit of "
-msgstr "Изображение превышает ограничение в"
-
-#: js_upload.php:332
-msgid "File has an invalid extension, it should be one of "
-msgstr "У файла недопустимое расширение, оно должно быть"
-
-#: js_upload.php:343
-msgid "Upload was cancelled, or server error encountered"
-msgstr "Закачка отменена, либо возникла ошибка на сервере"
diff --git a/js_upload/lang/ru/strings.php b/js_upload/lang/ru/strings.php
index d4fd79ad..b30fa7b5 100644
--- a/js_upload/lang/ru/strings.php
+++ b/js_upload/lang/ru/strings.php
@@ -1,16 +1,11 @@
-<?php
-
-if(! function_exists("string_plural_select_ru")) {
-function string_plural_select_ru($n){
-	$n = intval($n);
-	if ($n%10==1 && $n%100!=11) { return 0; } else if ($n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14)) { return 1; } else if ($n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)) { return 2; } else  { return 3; }
-}}
-$a->strings['Upload a file'] = 'Загрузить файл';
-$a->strings['Drop files here to upload'] = 'Перетащите сюда файлы для загрузки';
-$a->strings['Cancel'] = 'Отмена';
-$a->strings['Failed'] = 'Ошибка';
-$a->strings['No files were uploaded.'] = 'Файлы не были загружены.';
-$a->strings['Uploaded file is empty'] = 'Загруженный файл пустой.';
-$a->strings['Image exceeds size limit of '] = 'Изображение превышает ограничение в';
-$a->strings['File has an invalid extension, it should be one of '] = 'У файла недопустимое расширение, оно должно быть';
-$a->strings['Upload was cancelled, or server error encountered'] = 'Закачка отменена, либо возникла ошибка на сервере';
+<?php
+
+$a->strings["Upload a file"] = "Загрузить файл";
+$a->strings["Drop files here to upload"] = "Перетащите файлы сюда для загрузки";
+$a->strings["Cancel"] = "Отмена";
+$a->strings["Failed"] = "Ошибка";
+$a->strings["No files were uploaded."] = "Нет загруженных файлов.";
+$a->strings["Uploaded file is empty"] = "Загруженный файл пустой";
+$a->strings["Image exceeds size limit of "] = "Размер фото превышает лимит ";
+$a->strings["File has an invalid extension, it should be one of "] = "Файл имеет недопустимое расширение, оно должно быть одним из следующих ";
+$a->strings["Upload was cancelled, or server error encountered"] = "Загрузка была отменена, или произошла ошибка сервера";
diff --git a/js_upload/lang/sv/messages.po b/js_upload/lang/sv/messages.po
deleted file mode 100644
index 39e52d1a..00000000
--- a/js_upload/lang/sv/messages.po
+++ /dev/null
@@ -1,58 +0,0 @@
-# ADDON js_upload
-# Copyright (C)
-# This file is distributed under the same license as the Friendica js_upload addon package.
-# 
-# 
-# Translators:
-# Kristoffer Grundström <lovaren@gmail.com>, 2022
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-23 23:53-0400\n"
-"PO-Revision-Date: 2022-01-16 00:41+0000\n"
-"Last-Translator: Kristoffer Grundström <lovaren@gmail.com>\n"
-"Language-Team: Swedish (http://www.transifex.com/Friendica/friendica/language/sv/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: sv\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: js_upload.php:34
-msgid "Select files for upload"
-msgstr ""
-
-#: js_upload.php:35
-msgid "Drop files here to upload"
-msgstr "Släpp filer här för att ladda upp"
-
-#: js_upload.php:36
-msgid "Cancel"
-msgstr "Avbryt"
-
-#: js_upload.php:37
-msgid "Failed"
-msgstr "Misslyckades"
-
-#: js_upload.php:215
-msgid "No files were uploaded."
-msgstr "Inga filer laddades upp."
-
-#: js_upload.php:221
-msgid "Uploaded file is empty"
-msgstr "Den uppladdade filen är tom"
-
-#: js_upload.php:233
-#, php-format
-msgid "Image exceeds size limit of %s"
-msgstr ""
-
-#: js_upload.php:245
-#, php-format
-msgid "File has an invalid extension, it should be one of %s."
-msgstr ""
-
-#: js_upload.php:256
-msgid "Upload was cancelled, or server error encountered"
-msgstr "Uppladdningen avbröts, eller så uppstod det ett server-fel"
diff --git a/js_upload/lang/sv/strings.php b/js_upload/lang/sv/strings.php
index 58f76539..c8a07875 100644
--- a/js_upload/lang/sv/strings.php
+++ b/js_upload/lang/sv/strings.php
@@ -1,13 +1,11 @@
-<?php
-
-if(! function_exists("string_plural_select_sv")) {
-function string_plural_select_sv($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Drop files here to upload'] = 'Släpp filer här för att ladda upp';
-$a->strings['Cancel'] = 'Avbryt';
-$a->strings['Failed'] = 'Misslyckades';
-$a->strings['No files were uploaded.'] = 'Inga filer laddades upp.';
-$a->strings['Uploaded file is empty'] = 'Den uppladdade filen är tom';
-$a->strings['Upload was cancelled, or server error encountered'] = 'Uppladdningen avbröts, eller så uppstod det ett server-fel';
+<?php
+
+$a->strings["Upload a file"] = "Ladda upp en fil";
+$a->strings["Drop files here to upload"] = "Dra filer som ska laddas upp hit";
+$a->strings["Cancel"] = "Avbryt";
+$a->strings["Failed"] = "Misslyckades";
+$a->strings["No files were uploaded."] = "Inga filer laddades upp.";
+$a->strings["Uploaded file is empty"] = "Den uppladdade filen &auml;r tom";
+$a->strings["Image exceeds size limit of "] = "Bilden &ouml;verskrider den till&aring;tna storleken ";
+$a->strings["File has an invalid extension, it should be one of "] = "Otill&aring;ten filnamns&auml;ndelse, det ska vara ";
+$a->strings["Upload was cancelled, or server error encountered"] = "Serverfel eller avbruten uppladdning";
diff --git a/js_upload/templates/js_upload.tpl b/js_upload/templates/js_upload.tpl
deleted file mode 100644
index b482cd2b..00000000
--- a/js_upload/templates/js_upload.tpl
+++ /dev/null
@@ -1,56 +0,0 @@
-
-<div id="js_upload">
-	<noscript>
-		<p>Please enable JavaScript to use file uploader.</p>
-		<!-- or put a simple form for upload here -->
-	</noscript>
-</div>
-
-<script type="text/javascript">
-	var uploader = null;
-	function createUploader() {
-		uploader = new qq.FileUploader({
-			element: document.getElementById('js_upload'),
-			action: '{{$post_url}}',
-
-			template: '<div class="qq-uploader">' +
-				'<div class="qq-upload-drop-area"><span>{{$drop_msg}}</span></div>' +
-				'<div class="qq-upload-button">{{$upload_msg}}</div>' +
-				'<ul class="qq-upload-list"></ul>' +
-				'</div>',
-
-			// template for one item in file list
-			fileTemplate: '<li>' +
-				'<span class="qq-upload-file"></span>' +
-				'<span class="qq-upload-spinner"></span>' +
-				'<span class="qq-upload-size"></span>' +
-				'<a class="qq-upload-cancel" href="#">{{$cancel}}</a>' +
-				'<span class="qq-upload-failed-text">{{$failed}}</span>' +
-				'</li>',
-
-			debug: true,
-			sizeLimit: {{$maximagesize}},
-			onSubmit: function(id, filename) {
-				let newalbumElm = document.getElementById('photos-upload-newalbum');
-				let albumElm = document.getElementById('photos-upload-album-select');
-
-				let contact_allow = document.querySelector('[name="contact_allow"]:not(:disabled)');
-				let circle_allow  = document.querySelector('[name="circle_allow"]:not(:disabled)');
-				let contact_deny  = document.querySelector('[name="contact_deny"]:not(:disabled)');
-				let circle_deny   = document.querySelector('[name="circle_deny"]:not(:disabled)');
-
-				uploader.setParams({
-					newalbum      : newalbumElm ? newalbumElm.value : '',
-					album         : albumElm ? albumElm.value : '',
-					not_visible   : document.getElementById('photos-upload-noshare').checked,
-					contact_allow : contact_allow ? contact_allow.value : '',
-					circle_allow  : circle_allow  ? circle_allow.value  : '',
-					contact_deny  : contact_deny  ? contact_deny.value  : '',
-					circle_deny   : circle_deny   ? circle_deny.value   : '',
-				});
-			}
-		});
-	}
-
-	window.addEventListener('load', createUploader);
-</script>
diff --git a/keycloakpassword/README.md b/keycloakpassword/README.md
deleted file mode 100644
index 0dc60c68..00000000
--- a/keycloakpassword/README.md
+++ /dev/null
@@ -1,9 +0,0 @@
-Keycloak Password Auth
-======================
-
-Allows for password-based authentication against a Keycloak backend. (Should in
-theory work with any OpenID Connect provider with "direct grant" enabled, but
-it's only been tested against Keycloak.)
-
-Setting up Keycloak for use with this addon is detailed [in this RedHat
-blog entry](https://developers.redhat.com/blog/2020/01/29/api-login-and-jwt-token-generation-using-keycloak#set_up_a_client).
diff --git a/keycloakpassword/keycloakpassword.php b/keycloakpassword/keycloakpassword.php
deleted file mode 100644
index bfff4ea4..00000000
--- a/keycloakpassword/keycloakpassword.php
+++ /dev/null
@@ -1,156 +0,0 @@
-<?php
-/**
- * Name: Keycloak Password Auth
- * Description: Allow password-based authentication via the user's Keycloak credentials.
- * Version: 1.0
- * Author: Ryan <https://verya.pe/profile/ryan>
- */
-
-use Friendica\App;
-use Friendica\Core\Hook;
-use Friendica\Core\Logger;
-use Friendica\Core\Renderer;
-use Friendica\Database\DBA;
-use Friendica\DI;
-use Friendica\Model\User;
-
-function keycloakpassword_install()
-{
-	Hook::register('authenticate', __FILE__, 'keycloakpassword_authenticate');
-}
-
-function keycloakpassword_request($client_id, $secret, $url, $params = [])
-{
-	$ch = curl_init();
-	curl_setopt($ch, CURLOPT_URL, $url);
-	curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-	curl_setopt($ch, CURLOPT_POST, 1);
-	curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query([
-		'client_id' => $client_id,
-		'grant_type' => 'password',
-		'client_secret' => $secret,
-		'scope' => 'openid',
-	] + $params));
-
-	$headers = array();
-	$headers[] = 'Content-Type: application/x-www-form-urlencoded';
-	curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
-	$res = curl_exec($ch);
-
-	if (curl_errno($ch)) {
-		Logger::error(curl_error($ch));
-	}
-	curl_close($ch);
-
-	return $res;
-}
-
-function keycloakpassword_authenticate(array &$b)
-{
-	if (empty($b['password'])) {
-		return;
-	}
-
-	$client_id = DI::config()->get('keycloakpassword', 'client_id', null);
-	$endpoint = DI::config()->get('keycloakpassword', 'endpoint', null);
-	$secret = DI::config()->get('keycloakpassword', 'secret', null);
-
-	if (!$client_id || !$endpoint || !$secret) {
-		return;
-	}
-
-	$condition = [
-		'nickname' => $b['username'],
-		'blocked' => false,
-		'account_expired' => false,
-		'account_removed' => false
-	];
-
-	try {
-		$user = DBA::selectFirst('user', ['uid'], $condition);
-	} catch (Exception $e) {
-		return;
-	}
-
-	$json = keycloakpassword_request(
-		$client_id,
-		$secret,
-		$endpoint . '/token',
-		[
-			'username' => $b['username'],
-			'password' => $b['password']
-		]
-	);
-
-	$res = json_decode($json, true);
-	if (array_key_exists('access_token', $res) && !array_key_exists('error', $res)) {
-		$b['user_record'] = User::getById($user['uid']);
-		$b['authenticated'] = 1;
-
-		// Invalidate the Keycloak session we just created, as we have no use for it.
-		keycloakpassword_request(
-			$client_id,
-			$secret,
-			$endpoint . '/logout',
-			[ 'refresh_token' => res['refresh_token'] ]
-		);
-	}
-}
-
-function keycloakpassword_admin_input($key, $label, $description)
-{
-	return [
-		'$' . $key => [
-			$key,
-			$label,
-			DI::config()->get('keycloakpassword', $key),
-			$description,
-			true, // all the fields are required
-		]
-	];
-}
-
-function keycloakpassword_addon_admin(string &$o)
-{
-	$form =
-		keycloakpassword_admin_input(
-			'client_id',
-			DI::l10n()->t('Client ID'),
-			DI::l10n()->t('The name of the OpenID Connect client you created for this addon in Keycloak.'),
-		) +
-		keycloakpassword_admin_input(
-			'secret',
-			DI::l10n()->t('Client secret'),
-			DI::l10n()->t('The secret assigned to the OpenID Connect client you created for this addon in Keycloak.'),
-		) +
-		keycloakpassword_admin_input(
-			'endpoint',
-			DI::l10n()->t('OpenID Connect endpoint'),
-			DI::l10n()->t(
-				'URL to the Keycloak endpoint for your client. '
-				. '(E.g., https://example.com/auth/realms/some-realm/protocol/openid-connect)'
-			),
-		) +
-		[
-			'$msg' => DI::session()->get('keycloakpassword-msg', false),
-			'$submit'  => DI::l10n()->t('Save Settings'),
-		];
-
-	$t = Renderer::getMarkupTemplate('admin.tpl', 'addon/keycloakpassword/');
-	$o = Renderer::replaceMacros($t, $form);
-}
-
-function keycloakpassword_addon_admin_post()
-{
-	if (!DI::userSession()->getLocalUserId()) {
-		return;
-	}
-
-	$set = function ($key) {
-		$val = (!empty($_POST[$key]) ? trim($_POST[$key]) : '');
-		DI::config()->set('keycloakpassword', $key, $val);
-	};
-	$set('client_id');
-	$set('secret');
-	$set('endpoint');
-}
diff --git a/keycloakpassword/lang/C/messages.po b/keycloakpassword/lang/C/messages.po
deleted file mode 100644
index 0dd6887b..00000000
--- a/keycloakpassword/lang/C/messages.po
+++ /dev/null
@@ -1,51 +0,0 @@
-# ADDON keycloakpassword
-# Copyright (C) 
-# This file is distributed under the same license as the Friendica keycloakpassword addon package.
-# 
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-21 07:56+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: keycloakpassword.php:118
-msgid "Client ID"
-msgstr ""
-
-#: keycloakpassword.php:119
-msgid ""
-"The name of the OpenID Connect client you created for this addon in Keycloak."
-msgstr ""
-
-#: keycloakpassword.php:123
-msgid "Client secret"
-msgstr ""
-
-#: keycloakpassword.php:124
-msgid ""
-"The secret assigned to the OpenID Connect client you created for this addon "
-"in Keycloak."
-msgstr ""
-
-#: keycloakpassword.php:128
-msgid "OpenID Connect endpoint"
-msgstr ""
-
-#: keycloakpassword.php:130
-msgid ""
-"URL to the Keycloak endpoint for your client. (E.g., https://example.com/"
-"auth/realms/some-realm/protocol/openid-connect)"
-msgstr ""
-
-#: keycloakpassword.php:136
-msgid "Save Settings"
-msgstr ""
diff --git a/keycloakpassword/lang/de/messages.po b/keycloakpassword/lang/de/messages.po
deleted file mode 100644
index a5d28060..00000000
--- a/keycloakpassword/lang/de/messages.po
+++ /dev/null
@@ -1,60 +0,0 @@
-# ADDON keycloakpassword
-# Copyright (C)
-# This file is distributed under the same license as the Friendica keycloakpassword addon package.
-# 
-# 
-# Translators:
-# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2021
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-21 07:56+0200\n"
-"PO-Revision-Date: 2021-05-21 12:59+0000\n"
-"Last-Translator: Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2021\n"
-"Language-Team: German (https://www.transifex.com/Friendica/teams/12172/de/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: de\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: keycloakpassword.php:118
-msgid "Client ID"
-msgstr "ID des Clients"
-
-#: keycloakpassword.php:119
-msgid ""
-"The name of the OpenID Connect client you created for this addon in "
-"Keycloak."
-msgstr ""
-"Der Name des OpenID Clients den du für dieses Addon in Keycloak angelegt "
-"hast."
-
-#: keycloakpassword.php:123
-msgid "Client secret"
-msgstr "Client Geheimnis"
-
-#: keycloakpassword.php:124
-msgid ""
-"The secret assigned to the OpenID Connect client you created for this addon "
-"in Keycloak."
-msgstr "Das Geheimnis, das du in Keycloak für den Client hinterlegt hast."
-
-#: keycloakpassword.php:128
-msgid "OpenID Connect endpoint"
-msgstr "OpenID Verbindungsendpunkt"
-
-#: keycloakpassword.php:130
-msgid ""
-"URL to the Keycloak endpoint for your client. (E.g., "
-"https://example.com/auth/realms/some-realm/protocol/openid-connect)"
-msgstr ""
-"Die URL des Keycloak Entpunktes fpr deinen Client (z.B. "
-"https://example.com/auth/realms/some-realm/protocol/openid-connect)"
-
-#: keycloakpassword.php:136
-msgid "Save Settings"
-msgstr "Einstellungen speichern"
diff --git a/keycloakpassword/lang/de/strings.php b/keycloakpassword/lang/de/strings.php
deleted file mode 100644
index 148b9d52..00000000
--- a/keycloakpassword/lang/de/strings.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_de")) {
-function string_plural_select_de($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Client ID'] = 'ID des Clients';
-$a->strings['The name of the OpenID Connect client you created for this addon in Keycloak.'] = 'Der Name des OpenID Clients den du für dieses Addon in Keycloak angelegt hast.';
-$a->strings['Client secret'] = 'Client Geheimnis';
-$a->strings['The secret assigned to the OpenID Connect client you created for this addon in Keycloak.'] = 'Das Geheimnis, das du in Keycloak für den Client hinterlegt hast.';
-$a->strings['OpenID Connect endpoint'] = 'OpenID Verbindungsendpunkt';
-$a->strings['URL to the Keycloak endpoint for your client. (E.g., https://example.com/auth/realms/some-realm/protocol/openid-connect)'] = 'Die URL des Keycloak Entpunktes fpr deinen Client (z.B. https://example.com/auth/realms/some-realm/protocol/openid-connect)';
-$a->strings['Save Settings'] = 'Einstellungen speichern';
diff --git a/keycloakpassword/lang/hu/messages.po b/keycloakpassword/lang/hu/messages.po
deleted file mode 100644
index ad17b633..00000000
--- a/keycloakpassword/lang/hu/messages.po
+++ /dev/null
@@ -1,62 +0,0 @@
-# ADDON keycloakpassword
-# Copyright (C)
-# This file is distributed under the same license as the Friendica keycloakpassword addon package.
-# 
-# 
-# Translators:
-# Balázs Úr, 2021
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-21 07:56+0200\n"
-"PO-Revision-Date: 2021-05-21 12:59+0000\n"
-"Last-Translator: Balázs Úr, 2021\n"
-"Language-Team: Hungarian (https://www.transifex.com/Friendica/teams/12172/hu/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: hu\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: keycloakpassword.php:118
-msgid "Client ID"
-msgstr "Ügyfél-azonosító"
-
-#: keycloakpassword.php:119
-msgid ""
-"The name of the OpenID Connect client you created for this addon in "
-"Keycloak."
-msgstr ""
-"Az OpenID Connect ügyfelének neve, amelyet ehhez a bővítményhez hozott létre"
-" a Keycloak alkalmazásban."
-
-#: keycloakpassword.php:123
-msgid "Client secret"
-msgstr "Ügyféltitok"
-
-#: keycloakpassword.php:124
-msgid ""
-"The secret assigned to the OpenID Connect client you created for this addon "
-"in Keycloak."
-msgstr ""
-"Ahhoz az OpenID Connect ügyfélhez hozzárendelt titok, amelyet ehhez a "
-"bővítményhez hozott létre a Keycloak alkalmazásban."
-
-#: keycloakpassword.php:128
-msgid "OpenID Connect endpoint"
-msgstr "OpenID Connect végpont"
-
-#: keycloakpassword.php:130
-msgid ""
-"URL to the Keycloak endpoint for your client. (E.g., "
-"https://example.com/auth/realms/some-realm/protocol/openid-connect)"
-msgstr ""
-"Az ügyfél URL-e a Keycloak végponthoz (például "
-"https://example.com/auth/realms/some-realm/protocol/openid-connect)."
-
-#: keycloakpassword.php:136
-msgid "Save Settings"
-msgstr "Beállítások mentése"
diff --git a/keycloakpassword/lang/hu/strings.php b/keycloakpassword/lang/hu/strings.php
deleted file mode 100644
index 69a294f5..00000000
--- a/keycloakpassword/lang/hu/strings.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_hu")) {
-function string_plural_select_hu($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Client ID'] = 'Ügyfél-azonosító';
-$a->strings['The name of the OpenID Connect client you created for this addon in Keycloak.'] = 'Az OpenID Connect ügyfelének neve, amelyet ehhez a bővítményhez hozott létre a Keycloak alkalmazásban.';
-$a->strings['Client secret'] = 'Ügyféltitok';
-$a->strings['The secret assigned to the OpenID Connect client you created for this addon in Keycloak.'] = 'Ahhoz az OpenID Connect ügyfélhez hozzárendelt titok, amelyet ehhez a bővítményhez hozott létre a Keycloak alkalmazásban.';
-$a->strings['OpenID Connect endpoint'] = 'OpenID Connect végpont';
-$a->strings['URL to the Keycloak endpoint for your client. (E.g., https://example.com/auth/realms/some-realm/protocol/openid-connect)'] = 'Az ügyfél URL-e a Keycloak végponthoz (például https://example.com/auth/realms/some-realm/protocol/openid-connect).';
-$a->strings['Save Settings'] = 'Beállítások mentése';
diff --git a/keycloakpassword/templates/admin.tpl b/keycloakpassword/templates/admin.tpl
deleted file mode 100755
index 449bf7ec..00000000
--- a/keycloakpassword/templates/admin.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-{{include file="field_input.tpl" field=$client_id}}
-{{include file="field_input.tpl" field=$secret}}
-{{include file="field_input.tpl" field=$endpoint}}
-<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
diff --git a/krynn/krynn.css b/krynn/krynn.css
new file mode 100644
index 00000000..466a3ecd
--- /dev/null
+++ b/krynn/krynn.css
@@ -0,0 +1,14 @@
+
+
+
+#krynn-enable-label {
+	float: left;
+	width: 200px;
+	margin-bottom: 25px;
+}
+
+#krynn-checkbox {
+	float: left;
+}
+
+
diff --git a/krynn/krynn.php b/krynn/krynn.php
index f7e77c26..8f92daf7 100644
--- a/krynn/krynn.php
+++ b/krynn/krynn.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Name: Dragonlance Krynn locales
- * Description: Set a random locale from the Dragonlance Realm of Krynn when posting. Based on the planets friendica addon by Mike Macgirvin and Tony Baldwin
+ * Description: Set a random locale from the Dragonlance Realm of Krynn when posting. Based on the planets frindica addon by Mike Macgirvin and Tony Baldwin
  * Version: 1.0
  * Planets Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
  * Planets Author: Tony Baldwin <https://free-haven.org/profile/tony>
@@ -9,61 +9,85 @@
  *
  *"My body was my sacrifice... for my magic. This damage is permanent." - Raistlin Majere
  */
-
-use Friendica\App;
 use Friendica\Core\Hook;
+use Friendica\Core\L10n;
 use Friendica\Core\Logger;
-use Friendica\Core\Renderer;
-use Friendica\DI;
+use Friendica\Core\PConfig;
+
+function krynn_install() {
 
-function krynn_install()
-{
 	/**
+	 *
 	 * Our demo addon will attach in three places.
 	 * The first is just prior to storing a local post.
+	 *
 	 */
+
 	Hook::register('post_local', 'addon/krynn/krynn.php', 'krynn_post_hook');
 
 	/**
+	 *
 	 * Then we'll attach into the addon settings page, and also the
 	 * settings post hook so that we can create and update
 	 * user preferences.
+	 *
 	 */
+
 	Hook::register('addon_settings', 'addon/krynn/krynn.php', 'krynn_settings');
 	Hook::register('addon_settings_post', 'addon/krynn/krynn.php', 'krynn_settings_post');
 
-	Logger::notice("installed krynn");
+	Logger::log("installed krynn");
 }
 
-function krynn_post_hook(&$item)
-{
+
+function krynn_uninstall() {
+
 	/**
+	 *
+	 * uninstall unregisters any hooks created with register_hook
+	 * during install. It may also delete configuration settings
+	 * and any other cleanup.
+	 *
+	 */
+
+	Hook::unregister('post_local',    'addon/krynn/krynn.php', 'krynn_post_hook');
+	Hook::unregister('addon_settings', 'addon/krynn/krynn.php', 'krynn_settings');
+	Hook::unregister('addon_settings_post', 'addon/krynn/krynn.php', 'krynn_settings_post');
+
+
+	Logger::log("removed krynn");
+}
+
+
+
+function krynn_post_hook($a, &$item) {
+
+	/**
+	 *
 	 * An item was posted on the local system.
 	 * We are going to look for specific items:
 	 *      - A status post by a profile owner
 	 *      - The profile owner must have allowed our addon
+	 *
 	 */
-	if (!DI::userSession()->getLocalUserId()) {
-		/* non-zero if this is a logged in user of this system */
-		return;
-	}
 
-	if (DI::userSession()->getLocalUserId() != $item['uid']) {
-		/* Does this person own the post? */
-		return;
-	}
+	Logger::log('krynn invoked');
 
-	if ($item['parent']) {
-		/* If the item has a parent, this is a comment or something else, not a status post. */
+	if(! local_user())   /* non-zero if this is a logged in user of this system */
+		return;
+
+	if(local_user() != $item['uid'])    /* Does this person own the post? */
+		return;
+
+	if($item['parent'])   /* If the item has a parent, this is a comment or something else, not a status post. */
 		return;
-	}
 
 	/* Retrieve our personal config setting */
-	$active = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'krynn', 'enable');
 
-	if (!$active) {
+	$active = PConfig::get(local_user(), 'krynn', 'enable');
+
+	if(! $active)
 		return;
-	}
 
 	/**
 	 *
@@ -82,45 +106,71 @@ function krynn_post_hook(&$item)
 	return;
 }
 
+
+
+
 /**
+ *
  * Callback from the settings post function.
  * $post contains the $_POST array.
  * We will make sure we've got a valid user account
  * and if so set our configuration setting for this person.
+ *
  */
-function krynn_settings_post($post)
-{
-	if (!DI::userSession()->getLocalUserId()) {
-		return;
-	}
 
-	if ($_POST['krynn-submit']) {
-		DI::pConfig()->set(DI::userSession()->getLocalUserId(),'krynn','enable',intval($_POST['krynn']));
-	}
+function krynn_settings_post($a,$post) {
+	if(! local_user())
+		return;
+	if($_POST['krynn-submit'])
+		PConfig::set(local_user(),'krynn','enable',intval($_POST['krynn']));
 }
 
+
 /**
+ *
  * Called from the addon Setting form.
  * Add our own settings info to the page.
+ *
  */
-function krynn_settings(array &$data)
-{
-	if (!DI::userSession()->getLocalUserId()) {
+
+
+
+function krynn_settings(&$a,&$s) {
+
+	if(! local_user())
 		return;
-	}
 
-	$enabled = DI::pConfig()->get(DI::userSession()->getLocalUserId(),'krynn','enable');
+	/* Add our stylesheet to the page so we can make our settings look nice */
 
-	$t    = Renderer::getMarkupTemplate('settings.tpl', 'addon/krynn/');
-	$html = Renderer::replaceMacros($t, [
-		'$enabled' => ['krynn', DI::l10n()->t('Enable Krynn Addon'), $enabled],
-	]);
+	$a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->getBaseURL() . '/addon/krynn/krynn.css' . '" media="all" />' . "\r\n";
+
+	/* Get the current state of our config variable */
+
+	$enabled = PConfig::get(local_user(),'krynn','enable');
+
+	$checked = (($enabled) ? ' checked="checked" ' : '');
+
+	/* Add some HTML to the existing form */
+
+    $s .= '<span id="settings_krynn_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_krynn_expanded\'); openClose(\'settings_krynn_inflated\');">';
+	$s .= '<h3>' . L10n::t('Krynn') . '</h3>';
+	$s .= '</span>';
+	$s .= '<div id="settings_krynn_expanded" class="settings-block" style="display: none;">';
+	$s .= '<span class="fakelink" onclick="openClose(\'settings_krynn_expanded\'); openClose(\'settings_krynn_inflated\');">';
+	$s .= '<h3>' . L10n::t('Krynn') . '</h3>';
+	$s .= '</span>';
+
+
+    $s .= '<div class="settings-block">';
+	$s .= '<h3>' . L10n::t('Krynn Settings') . '</h3>';
+	$s .= '<div id="krynn-enable-wrapper">';
+	$s .= '<label id="krynn-enable-label" for="krynn-checkbox">' . L10n::t('Enable Krynn Addon') . '</label>';
+	$s .= '<input id="krynn-checkbox" type="checkbox" name="krynn" value="1" ' . $checked . '/>';
+        $s .= '</div><div class="clear"></div></div>';
+	/* provide a submit button */
+
+	$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="krynn-submit" class="settings-submit" value="' . L10n::t('Save Settings') . '" /></div></div>';
 
-	$data = [
-		'addon' => 'krynn',
-		'title' => DI::l10n()->t('Krynn Settings'),
-		'html'  => $html,
-	];
 }
 
 
diff --git a/krynn/lang/C/messages.po b/krynn/lang/C/messages.po
index 266044b1..63255c9f 100644
--- a/krynn/lang/C/messages.po
+++ b/krynn/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:14-0500\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,10 +17,14 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: krynn.php:127
+#: krynn.php:150
+msgid "Krynn Settings"
+msgstr ""
+
+#: krynn.php:152
 msgid "Enable Krynn Addon"
 msgstr ""
 
-#: krynn.php:132
-msgid "Krynn Settings"
+#: krynn.php:158
+msgid "Submit"
 msgstr ""
diff --git a/krynn/lang/ar/messages.po b/krynn/lang/ar/messages.po
deleted file mode 100644
index db051822..00000000
--- a/krynn/lang/ar/messages.po
+++ /dev/null
@@ -1,36 +0,0 @@
-# ADDON krynn
-# Copyright (C)
-# This file is distributed under the same license as the Friendica krynn addon package.
-# 
-# 
-# Translators:
-# Farida Khalaf <faridakhalaf@hotmail.com>, 2021
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2021-02-22 03:12+0000\n"
-"Last-Translator: Farida Khalaf <faridakhalaf@hotmail.com>\n"
-"Language-Team: Arabic (http://www.transifex.com/Friendica/friendica/language/ar/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ar\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-
-#: krynn.php:132 krynn.php:136
-msgid "Krynn"
-msgstr "Krynn"
-
-#: krynn.php:141
-msgid "Krynn Settings"
-msgstr " إعدادات Krynn"
-
-#: krynn.php:143
-msgid "Enable Krynn Addon"
-msgstr "تفعيل ملحق Krynn"
-
-#: krynn.php:148
-msgid "Save Settings"
-msgstr "حفظ الإعدادات"
diff --git a/krynn/lang/ar/strings.php b/krynn/lang/ar/strings.php
deleted file mode 100644
index 0e42275e..00000000
--- a/krynn/lang/ar/strings.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_ar")) {
-function string_plural_select_ar($n){
-	$n = intval($n);
-	if ($n==0) { return 0; } else if ($n==1) { return 1; } else if ($n==2) { return 2; } else if ($n%100>=3 && $n%100<=10) { return 3; } else if ($n%100>=11 && $n%100<=99) { return 4; } else  { return 5; }
-}}
-$a->strings['Krynn'] = 'Krynn';
-$a->strings['Krynn Settings'] = ' إعدادات Krynn';
-$a->strings['Enable Krynn Addon'] = 'تفعيل ملحق Krynn';
-$a->strings['Save Settings'] = 'حفظ الإعدادات';
diff --git a/krynn/lang/cs/strings.php b/krynn/lang/cs/strings.php
index f01363af..4e9d61c3 100644
--- a/krynn/lang/cs/strings.php
+++ b/krynn/lang/cs/strings.php
@@ -3,8 +3,9 @@
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
 	$n = intval($n);
-	if (($n == 1 && $n % 1 == 0)) { return 0; } else if (($n >= 2 && $n <= 4 && $n % 1 == 0)) { return 1; } else if (($n % 1 != 0 )) { return 2; } else  { return 3; }
+	return ($n == 1 && $n % 1 == 0) ? 0 : ($n >= 2 && $n <= 4 && $n % 1 == 0) ? 1: ($n % 1 != 0 ) ? 2 : 3;;
 }}
-$a->strings['Krynn Settings'] = 'Nastavení Krynn';
-$a->strings['Enable Krynn Addon'] = 'Povolit doplněk Krynn';
-$a->strings['Submit'] = 'Odeslat';
+;
+$a->strings["Krynn Settings"] = "Nastavení Krynn";
+$a->strings["Enable Krynn Addon"] = "Povolit doplněk Krynn";
+$a->strings["Submit"] = "Odeslat";
diff --git a/krynn/lang/da-dk/messages.po b/krynn/lang/da-dk/messages.po
deleted file mode 100644
index c5a34f09..00000000
--- a/krynn/lang/da-dk/messages.po
+++ /dev/null
@@ -1,27 +0,0 @@
-# ADDON krynn
-# Copyright (C)
-# This file is distributed under the same license as the Friendica krynn addon package.
-# 
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:14-0500\n"
-"PO-Revision-Date: 2015-07-07 15:14+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Danish (Denmark) (http://www.transifex.com/Friendica/friendica/language/da_DK/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: da_DK\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: krynn.php:127
-msgid "Enable Krynn Addon"
-msgstr ""
-
-#: krynn.php:132
-msgid "Krynn Settings"
-msgstr ""
diff --git a/krynn/lang/da-dk/strings.php b/krynn/lang/da-dk/strings.php
deleted file mode 100644
index 09554750..00000000
--- a/krynn/lang/da-dk/strings.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_da_dk")) {
-function string_plural_select_da_dk($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
diff --git a/krynn/lang/de/messages.po b/krynn/lang/de/messages.po
index 1159354b..7d3e6bbd 100644
--- a/krynn/lang/de/messages.po
+++ b/krynn/lang/de/messages.po
@@ -1,32 +1,33 @@
-# ADDON krynn
+# ADDON Krynn
 # Copyright (C)
-# This file is distributed under the same license as the Friendica krynn addon package.
+# This file is distributed under the same license as the Friendica Krynn addon package.
 # 
 # 
 # Translators:
-# Andreas H., 2014
-# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2014
-# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2015
-# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2018,2021
-# Ulf Rompe <transifex.com@rompe.org>, 2019
+# Abrax <webmaster@a-zwenkau.de>, 2014
+# bavatar <tobias.diekershoff@gmx.net>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:14-0500\n"
-"PO-Revision-Date: 2015-07-07 15:14+0000\n"
-"Last-Translator: Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2018,2021\n"
-"Language-Team: German (http://app.transifex.com/Friendica/friendica/language/de/)\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2014-10-15 12:32+0000\n"
+"Last-Translator: Abrax <webmaster@a-zwenkau.de>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/friendica/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: krynn.php:127
-msgid "Enable Krynn Addon"
-msgstr "Krynn-Addon aktivieren"
-
-#: krynn.php:132
+#: Krynn.php:150
 msgid "Krynn Settings"
-msgstr "Krynn-Einstellungen"
+msgstr "Planeten Einstellungen"
+
+#: Krynn.php:152
+msgid "Enable Krynn Addon"
+msgstr "Planeten-Addon aktivieren"
+
+#: Krynn.php:158
+msgid "Submit"
+msgstr "Senden"
diff --git a/krynn/lang/de/strings.php b/krynn/lang/de/strings.php
index 5fac0aab..d8a54083 100644
--- a/krynn/lang/de/strings.php
+++ b/krynn/lang/de/strings.php
@@ -2,8 +2,9 @@
 
 if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Enable Krynn Addon'] = 'Krynn-Addon aktivieren';
-$a->strings['Krynn Settings'] = 'Krynn-Einstellungen';
+;
+$a->strings["Krynn Settings"] = "Krynn Einstellungen";
+$a->strings["Enable Krynn Addon"] = "Krynn-Addon aktivieren";
+$a->strings["Submit"] = "Senden";
diff --git a/krynn/lang/es/messages.po b/krynn/lang/es/messages.po
index e2289a94..a8690ef1 100644
--- a/krynn/lang/es/messages.po
+++ b/krynn/lang/es/messages.po
@@ -5,14 +5,13 @@
 # 
 # Translators:
 # Albert, 2016
-# Senex Petrovic <javierruizo@hotmail.com>, 2021
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2021-04-01 10:03+0000\n"
-"Last-Translator: Senex Petrovic <javierruizo@hotmail.com>\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2016-11-19 11:42+0000\n"
+"Last-Translator: Albert\n"
 "Language-Team: Spanish (http://www.transifex.com/Friendica/friendica/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,18 +19,14 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: krynn.php:132 krynn.php:136
-msgid "Krynn"
-msgstr "Krynn"
-
-#: krynn.php:141
+#: krynn.php:150
 msgid "Krynn Settings"
 msgstr "Ajustes de Krynn"
 
-#: krynn.php:143
+#: krynn.php:152
 msgid "Enable Krynn Addon"
-msgstr "Habilitar Plugin de Krynn"
+msgstr "Habilitar Addon de Krynn"
 
-#: krynn.php:148
-msgid "Save Settings"
-msgstr "Guardar Ajustes"
+#: krynn.php:158
+msgid "Submit"
+msgstr "Enviar"
diff --git a/krynn/lang/es/strings.php b/krynn/lang/es/strings.php
index 0247775a..6bb39518 100644
--- a/krynn/lang/es/strings.php
+++ b/krynn/lang/es/strings.php
@@ -2,10 +2,9 @@
 
 if(! function_exists("string_plural_select_es")) {
 function string_plural_select_es($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Krynn'] = 'Krynn';
-$a->strings['Krynn Settings'] = 'Ajustes de Krynn';
-$a->strings['Enable Krynn Addon'] = 'Habilitar Plugin de Krynn';
-$a->strings['Save Settings'] = 'Guardar Ajustes';
+;
+$a->strings["Krynn Settings"] = "Ajustes de Krynn";
+$a->strings["Enable Krynn Addon"] = "Habilitar Addon de Krynn";
+$a->strings["Submit"] = "Enviar";
diff --git a/krynn/lang/fi-fi/strings.php b/krynn/lang/fi-fi/strings.php
index 2003dcb0..d6112ffa 100644
--- a/krynn/lang/fi-fi/strings.php
+++ b/krynn/lang/fi-fi/strings.php
@@ -2,9 +2,9 @@
 
 if(! function_exists("string_plural_select_fi_fi")) {
 function string_plural_select_fi_fi($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Krynn Settings'] = 'Krynn -asetukset';
-$a->strings['Enable Krynn Addon'] = 'Ota Krynn -lisäosa käyttöön';
-$a->strings['Submit'] = 'Lähetä';
+;
+$a->strings["Krynn Settings"] = "Krynn -asetukset";
+$a->strings["Enable Krynn Addon"] = "Ota Krynn -lisäosa käyttöön";
+$a->strings["Submit"] = "Lähetä";
diff --git a/krynn/lang/fr/messages.po b/krynn/lang/fr/messages.po
deleted file mode 100644
index a96af8de..00000000
--- a/krynn/lang/fr/messages.po
+++ /dev/null
@@ -1,28 +0,0 @@
-# ADDON krynn
-# Copyright (C)
-# This file is distributed under the same license as the Friendica krynn addon package.
-# 
-# 
-# Translators:
-# bob lebonche <lebonche@tutanota.com>, 2021
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:14-0500\n"
-"PO-Revision-Date: 2015-07-07 15:14+0000\n"
-"Last-Translator: bob lebonche <lebonche@tutanota.com>, 2021\n"
-"Language-Team: French (http://www.transifex.com/Friendica/friendica/language/fr/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: fr\n"
-"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
-
-#: krynn.php:127
-msgid "Enable Krynn Addon"
-msgstr "Activer l'application complémentaire Krynn"
-
-#: krynn.php:132
-msgid "Krynn Settings"
-msgstr "Paramètres de Krynn"
diff --git a/krynn/lang/fr/strings.php b/krynn/lang/fr/strings.php
index 3c3574d0..bcd3430b 100644
--- a/krynn/lang/fr/strings.php
+++ b/krynn/lang/fr/strings.php
@@ -1,9 +1,5 @@
-<?php
-
-if(! function_exists("string_plural_select_fr")) {
-function string_plural_select_fr($n){
-	$n = intval($n);
-	if (($n == 0 || $n == 1)) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
-}}
-$a->strings['Enable Krynn Addon'] = 'Activer l\'application complémentaire Krynn';
-$a->strings['Krynn Settings'] = 'Paramètres de Krynn';
+<?php
+
+$a->strings["Krynn Settings"] = "Réglages des Krynn";
+$a->strings["Enable Krynn Addon"] = "Activer Krynn";
+$a->strings["Submit"] = "Envoyer";
diff --git a/krynn/lang/hu/messages.po b/krynn/lang/hu/messages.po
deleted file mode 100644
index e78e872b..00000000
--- a/krynn/lang/hu/messages.po
+++ /dev/null
@@ -1,28 +0,0 @@
-# ADDON krynn
-# Copyright (C)
-# This file is distributed under the same license as the Friendica krynn addon package.
-# 
-# 
-# Translators:
-# Balázs Úr, 2020-2021
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:14-0500\n"
-"PO-Revision-Date: 2015-07-07 15:14+0000\n"
-"Last-Translator: Balázs Úr, 2020-2021\n"
-"Language-Team: Hungarian (http://www.transifex.com/Friendica/friendica/language/hu/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: hu\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: krynn.php:127
-msgid "Enable Krynn Addon"
-msgstr "Krynn bővítmény engedélyezése"
-
-#: krynn.php:132
-msgid "Krynn Settings"
-msgstr "Krynn beállítások"
diff --git a/krynn/lang/hu/strings.php b/krynn/lang/hu/strings.php
deleted file mode 100644
index bc0d01e6..00000000
--- a/krynn/lang/hu/strings.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_hu")) {
-function string_plural_select_hu($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Enable Krynn Addon'] = 'Krynn bővítmény engedélyezése';
-$a->strings['Krynn Settings'] = 'Krynn beállítások';
diff --git a/krynn/lang/it/messages.po b/krynn/lang/it/messages.po
index d9614ca1..37eacb54 100644
--- a/krynn/lang/it/messages.po
+++ b/krynn/lang/it/messages.po
@@ -5,25 +5,28 @@
 # 
 # Translators:
 # fabrixxm <fabrix.xm@gmail.com>, 2015,2018
-# Sylke Vicious <silkevicious@gmail.com>, 2021
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:14-0500\n"
-"PO-Revision-Date: 2015-07-07 15:14+0000\n"
-"Last-Translator: Sylke Vicious <silkevicious@gmail.com>, 2021\n"
-"Language-Team: Italian (http://app.transifex.com/Friendica/friendica/language/it/)\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2018-03-19 13:22+0000\n"
+"Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n"
+"Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: it\n"
-"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: krynn.php:127
+#: krynn.php:150
+msgid "Krynn Settings"
+msgstr "Impostazioni Krynn"
+
+#: krynn.php:152
 msgid "Enable Krynn Addon"
 msgstr "Abilita componente aggiuntivo Krynn"
 
-#: krynn.php:132
-msgid "Krynn Settings"
-msgstr "Impostazioni Krynn"
+#: krynn.php:158
+msgid "Submit"
+msgstr "Invia"
diff --git a/krynn/lang/it/strings.php b/krynn/lang/it/strings.php
index 727d2877..9c6f59be 100644
--- a/krynn/lang/it/strings.php
+++ b/krynn/lang/it/strings.php
@@ -2,8 +2,9 @@
 
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
-	$n = intval($n);
-	if ($n == 1) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
+	return ($n != 1);;
 }}
-$a->strings['Enable Krynn Addon'] = 'Abilita componente aggiuntivo Krynn';
-$a->strings['Krynn Settings'] = 'Impostazioni Krynn';
+;
+$a->strings["Krynn Settings"] = "Impostazioni Krynn";
+$a->strings["Enable Krynn Addon"] = "Abilita componente aggiuntivo Krynn";
+$a->strings["Submit"] = "Invia";
diff --git a/krynn/lang/nl/strings.php b/krynn/lang/nl/strings.php
index 40cfcb17..bf323800 100644
--- a/krynn/lang/nl/strings.php
+++ b/krynn/lang/nl/strings.php
@@ -3,7 +3,9 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Krynn Settings'] = 'Krynn instellingen';
-$a->strings['Enable Krynn Addon'] = 'Krynn Addon inschakelen';
+;
+$a->strings["Krynn Settings"] = "Krynn instellingen";
+$a->strings["Enable Krynn Addon"] = "Krynn Addon inschakelen";
+$a->strings["Submit"] = "";
diff --git a/krynn/lang/pl/messages.po b/krynn/lang/pl/messages.po
index cffe981b..c1adfcc2 100644
--- a/krynn/lang/pl/messages.po
+++ b/krynn/lang/pl/messages.po
@@ -4,14 +4,14 @@
 # 
 # 
 # Translators:
-# Waldemar Stoczkowski, 2018
+# Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:14-0500\n"
-"PO-Revision-Date: 2015-07-07 15:14+0000\n"
-"Last-Translator: Waldemar Stoczkowski, 2018\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2018-03-31 19:11+0000\n"
+"Last-Translator: Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.com/Friendica/friendica/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,10 +19,14 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
-#: krynn.php:127
+#: krynn.php:150
+msgid "Krynn Settings"
+msgstr "Ustawienia Krynn"
+
+#: krynn.php:152
 msgid "Enable Krynn Addon"
 msgstr "Włącz dodatek Krynn"
 
-#: krynn.php:132
-msgid "Krynn Settings"
-msgstr "Ustawienia Krynn"
+#: krynn.php:158
+msgid "Submit"
+msgstr "Wyślij"
diff --git a/krynn/lang/pl/strings.php b/krynn/lang/pl/strings.php
index 13c5bc1e..26cda588 100644
--- a/krynn/lang/pl/strings.php
+++ b/krynn/lang/pl/strings.php
@@ -2,8 +2,9 @@
 
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
-	$n = intval($n);
-	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
+	return ($n==1 ? 0 : ($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14) ? 1 : $n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14) ? 2 : 3);;
 }}
-$a->strings['Enable Krynn Addon'] = 'Włącz dodatek Krynn';
-$a->strings['Krynn Settings'] = 'Ustawienia Krynn';
+;
+$a->strings["Krynn Settings"] = "Ustawienia Krynn";
+$a->strings["Enable Krynn Addon"] = "Włącz dodatek Krynn";
+$a->strings["Submit"] = "Wyślij";
diff --git a/krynn/lang/ro/strings.php b/krynn/lang/ro/strings.php
index fc70f3c3..f6c6f53d 100644
--- a/krynn/lang/ro/strings.php
+++ b/krynn/lang/ro/strings.php
@@ -2,9 +2,9 @@
 
 if(! function_exists("string_plural_select_ro")) {
 function string_plural_select_ro($n){
-	$n = intval($n);
-	if ($n==1) { return 0; } else if ((($n%100>19)||(($n%100==0)&&($n!=0)))) { return 2; } else  { return 1; }
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
 }}
-$a->strings['Krynn Settings'] = 'Configurări Krynn';
-$a->strings['Enable Krynn Addon'] = 'Activare Modul Krynn';
-$a->strings['Submit'] = 'Trimite';
+;
+$a->strings["Krynn Settings"] = "Configurări Krynn";
+$a->strings["Enable Krynn Addon"] = "Activare Modul Krynn";
+$a->strings["Submit"] = "Trimite";
diff --git a/krynn/lang/sv/messages.po b/krynn/lang/sv/messages.po
deleted file mode 100644
index b03e0835..00000000
--- a/krynn/lang/sv/messages.po
+++ /dev/null
@@ -1,27 +0,0 @@
-# ADDON krynn
-# Copyright (C)
-# This file is distributed under the same license as the Friendica krynn addon package.
-# 
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:14-0500\n"
-"PO-Revision-Date: 2021-12-22 16:22+0000\n"
-"Last-Translator: Transifex Bot <>\n"
-"Language-Team: Swedish (http://www.transifex.com/Friendica/friendica/language/sv/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: sv\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: krynn.php:127
-msgid "Enable Krynn Addon"
-msgstr ""
-
-#: krynn.php:132
-msgid "Krynn Settings"
-msgstr ""
diff --git a/krynn/lang/sv/strings.php b/krynn/lang/sv/strings.php
index 72e9772f..3ec569a7 100644
--- a/krynn/lang/sv/strings.php
+++ b/krynn/lang/sv/strings.php
@@ -1,7 +1,3 @@
-<?php
-
-if(! function_exists("string_plural_select_sv")) {
-function string_plural_select_sv($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
+<?php
+
+$a->strings["Submit"] = "Spara";
diff --git a/krynn/templates/settings.tpl b/krynn/templates/settings.tpl
deleted file mode 100644
index 2f3f4ce7..00000000
--- a/krynn/templates/settings.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{{include file="field_checkbox.tpl" field=$enabled}}
diff --git a/langfilter/lang/C/messages.po b/langfilter/lang/C/messages.po
index e211d38b..717a9374 100644
--- a/langfilter/lang/C/messages.po
+++ b/langfilter/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:15-0500\n"
+"POT-Creation-Date: 2018-04-01 11:11-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,58 +17,62 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: langfilter.php:49
+#: langfilter.php:58
+msgid "Language Filter"
+msgstr ""
+
+#: langfilter.php:59
 msgid ""
-"This addon tries to identify the language posts are written in. If it does "
-"not match any language specified below, posts will be hidden by collapsing "
+"This addon tries to identify the language posts are writen in. If it does "
+"not match any language specifed below, posts will be hidden by collapsing "
 "them."
 msgstr ""
 
-#: langfilter.php:50
+#: langfilter.php:60
 msgid "Use the language filter"
 msgstr ""
 
-#: langfilter.php:51
+#: langfilter.php:61
 msgid "Able to read"
 msgstr ""
 
-#: langfilter.php:51
+#: langfilter.php:61
 msgid ""
-"List of abbreviations (ISO 639-1 codes) for languages you speak, comma "
-"separated. For example \"de,it\"."
+"List of abbreviations (iso2 codes) for languages you speak, comma separated. "
+"For example \"de,it\"."
 msgstr ""
 
-#: langfilter.php:52
+#: langfilter.php:62
 msgid "Minimum confidence in language detection"
 msgstr ""
 
-#: langfilter.php:52
+#: langfilter.php:62
 msgid ""
 "Minimum confidence in language detection being correct, from 0 to 100. Posts "
 "will not be filtered when the confidence of language detection is below this "
 "percent value."
 msgstr ""
 
-#: langfilter.php:53
+#: langfilter.php:63
 msgid "Minimum length of message body"
 msgstr ""
 
-#: langfilter.php:53
+#: langfilter.php:63
 msgid ""
 "Minimum number of characters in message body for filter to be used. Posts "
 "shorter than this will not be filtered. Note: Language detection is "
 "unreliable for short content (<200 characters)."
 msgstr ""
 
-#: langfilter.php:58
-msgid "Language Filter"
-msgstr ""
-
-#: langfilter.php:60
+#: langfilter.php:64
 msgid "Save Settings"
 msgstr ""
 
-#: langfilter.php:193
+#: langfilter.php:105
+msgid "Language Filter Settings saved."
+msgstr ""
+
+#: langfilter.php:182
 #, php-format
 msgid "Filtered language: %s"
 msgstr ""
diff --git a/langfilter/lang/ar/messages.po b/langfilter/lang/ar/messages.po
deleted file mode 100644
index e68e49fb..00000000
--- a/langfilter/lang/ar/messages.po
+++ /dev/null
@@ -1,77 +0,0 @@
-# ADDON langfilter
-# Copyright (C)
-# This file is distributed under the same license as the Friendica langfilter addon package.
-# 
-# 
-# Translators:
-# abidin toumi <abidin24@tutanota.com>, 2021
-# Farida Khalaf <faridakhalaf@hotmail.com>, 2021
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:15-0500\n"
-"PO-Revision-Date: 2015-07-25 08:05+0000\n"
-"Last-Translator: abidin toumi <abidin24@tutanota.com>, 2021\n"
-"Language-Team: Arabic (http://app.transifex.com/Friendica/friendica/language/ar/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ar\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-
-#: langfilter.php:49
-msgid ""
-"This addon tries to identify the language posts are written in. If it does "
-"not match any language specified below, posts will be hidden by collapsing "
-"them."
-msgstr ""
-
-#: langfilter.php:50
-msgid "Use the language filter"
-msgstr "اختيار اللغة"
-
-#: langfilter.php:51
-msgid "Able to read"
-msgstr "  قابل  للقراءة"
-
-#: langfilter.php:51
-msgid ""
-"List of abbreviations (ISO 639-1 codes) for languages you speak, comma "
-"separated. For example \"de,it\"."
-msgstr "قائمة الرموز ( ISO 639-1) للغات ، مفصولة بفواصل. على سبيل المثال \"de، it\""
-
-#: langfilter.php:52
-msgid "Minimum confidence in language detection"
-msgstr "الحد الأدنى من نسبة اكتشاف اللغة"
-
-#: langfilter.php:52
-msgid ""
-"Minimum confidence in language detection being correct, from 0 to 100. Posts"
-" will not be filtered when the confidence of language detection is below "
-"this percent value."
-msgstr "الحد الأدنى من صحة اكتشاف اللغة  ، من 0 إلى 100. لن تتم فلترة المشاركات عندما تكون صحة اكتشاف اللغة أقل من هذه النسبة المئوية."
-
-#: langfilter.php:53
-msgid "Minimum length of message body"
-msgstr "الحد الأدنى لنص الرسالة"
-
-#: langfilter.php:53
-msgid ""
-"Minimum number of characters in message body for filter to be used. Posts "
-"shorter than this will not be filtered. Note: Language detection is "
-"unreliable for short content (<200 characters)."
-msgstr "الحد الأدنى لأحرف نص الرسالة لاستخدام الفلتر. لن يتم فلترة المشاركات الأقصر من هذا. ملاحظة: لا يمكن الاعتماد على اكتشاف اللغة للمحتوى القصير (<200 حرف)."
-
-#: langfilter.php:58
-msgid "Language Filter"
-msgstr "مرشح اللغة"
-
-#: langfilter.php:60
-msgid "Save Settings"
-msgstr "حفظ الإعدادات"
-
-#: langfilter.php:193
-#, php-format
-msgid "Filtered language: %s"
-msgstr "اختيار اللغة: %s"
diff --git a/langfilter/lang/ar/strings.php b/langfilter/lang/ar/strings.php
deleted file mode 100644
index cf8a7632..00000000
--- a/langfilter/lang/ar/strings.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_ar")) {
-function string_plural_select_ar($n){
-	$n = intval($n);
-	if ($n==0) { return 0; } else if ($n==1) { return 1; } else if ($n==2) { return 2; } else if ($n%100>=3 && $n%100<=10) { return 3; } else if ($n%100>=11 && $n%100<=99) { return 4; } else  { return 5; }
-}}
-$a->strings['Use the language filter'] = 'اختيار اللغة';
-$a->strings['Able to read'] = '  قابل  للقراءة';
-$a->strings['List of abbreviations (ISO 639-1 codes) for languages you speak, comma separated. For example "de,it".'] = 'قائمة الرموز ( ISO 639-1) للغات ، مفصولة بفواصل. على سبيل المثال "de، it"';
-$a->strings['Minimum confidence in language detection'] = 'الحد الأدنى من نسبة اكتشاف اللغة';
-$a->strings['Minimum confidence in language detection being correct, from 0 to 100. Posts will not be filtered when the confidence of language detection is below this percent value.'] = 'الحد الأدنى من صحة اكتشاف اللغة  ، من 0 إلى 100. لن تتم فلترة المشاركات عندما تكون صحة اكتشاف اللغة أقل من هذه النسبة المئوية.';
-$a->strings['Minimum length of message body'] = 'الحد الأدنى لنص الرسالة';
-$a->strings['Minimum number of characters in message body for filter to be used. Posts shorter than this will not be filtered. Note: Language detection is unreliable for short content (<200 characters).'] = 'الحد الأدنى لأحرف نص الرسالة لاستخدام الفلتر. لن يتم فلترة المشاركات الأقصر من هذا. ملاحظة: لا يمكن الاعتماد على اكتشاف اللغة للمحتوى القصير (<200 حرف).';
-$a->strings['Language Filter'] = 'مرشح اللغة';
-$a->strings['Save Settings'] = 'حفظ الإعدادات';
-$a->strings['Filtered language: %s'] = 'اختيار اللغة: %s';
diff --git a/langfilter/lang/ca/messages.po b/langfilter/lang/ca/messages.po
index e1aa8d75..6ede38b9 100644
--- a/langfilter/lang/ca/messages.po
+++ b/langfilter/lang/ca/messages.po
@@ -26,8 +26,8 @@ msgstr "Filtre d'Idioma"
 
 #: langfilter.php:59
 msgid ""
-"This addon tries to identify the language posts are written in. If it does "
-"not match any language specified below, posts will be hidden by collapsing "
+"This addon tries to identify the language posts are writen in. If it does "
+"not match any language specifed below, posts will be hidden by collapsing "
 "them."
 msgstr "Aquest complement tracta d’identificar les publicacions d’idioma en què s’escriuen. Si no coincideix amb cap idioma especificat a continuació, les publicacions s’ocultaran en col·lapsar-les."
 
diff --git a/langfilter/lang/ca/strings.php b/langfilter/lang/ca/strings.php
index 174c2c0e..e2bef03e 100644
--- a/langfilter/lang/ca/strings.php
+++ b/langfilter/lang/ca/strings.php
@@ -3,17 +3,18 @@
 if(! function_exists("string_plural_select_ca")) {
 function string_plural_select_ca($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Language Filter'] = 'Filtre d\'Idioma';
-$a->strings['This addon tries to identify the language posts are written in. If it does not match any language specified below, posts will be hidden by collapsing them.'] = 'Aquest complement tracta d’identificar les publicacions d’idioma en què s’escriuen. Si no coincideix amb cap idioma especificat a continuació, les publicacions s’ocultaran en col·lapsar-les.';
-$a->strings['Use the language filter'] = 'Emprar el filtre d\'idioma';
-$a->strings['Able to read'] = 'Capacitat de llegir';
-$a->strings['List of abbreviations (iso2 codes) for languages you speak, comma separated. For example "de,it".'] = 'llista d\'abreviatures (ISO2 codes), separada per comes,  per idiomes que tú parles. Per exemple "ca,es,de,it".';
-$a->strings['Minimum confidence in language detection'] = 'Precissió mínima en la detecció d\'idioma';
-$a->strings['Minimum confidence in language detection being correct, from 0 to 100. Posts will not be filtered when the confidence of language detection is below this percent value.'] = 'Precissió mínima en la detecció d\'idioma per ser correcta, de 0 a 100. Els misssatges no seràn filtrats mentre que la precissió en la detecció d\'idioma estigui per sota d\'aquest valor.';
-$a->strings['Minimum length of message body'] = 'Durada mínima del cos del missatge';
-$a->strings['Minimum number of characters in message body for filter to be used. Posts shorter than this will not be filtered. Note: Language detection is unreliable for short content (<200 characters).'] = 'Nombre mínim de caràcters en el cos de missatges per utilitzar el filtre. Les publicacions inferiors a aquesta no es filtraran. Nota: la detecció del llenguatge no és fiable per a contingut curt (<200 caràcters).';
-$a->strings['Save Settings'] = 'Desa la configuració';
-$a->strings['Language Filter Settings saved.'] = 'S\'ha desat la configuració del filtre d\'idioma';
-$a->strings['Filtered language: %s'] = '%sIdioma filtrat';
+;
+$a->strings["Language Filter"] = "Filtre d'Idioma";
+$a->strings["This addon tries to identify the language posts are writen in. If it does not match any language specifed below, posts will be hidden by collapsing them."] = "Aquest complement tracta d’identificar les publicacions d’idioma en què s’escriuen. Si no coincideix amb cap idioma especificat a continuació, les publicacions s’ocultaran en col·lapsar-les.";
+$a->strings["Use the language filter"] = "Emprar el filtre d'idioma";
+$a->strings["Able to read"] = "Capacitat de llegir";
+$a->strings["List of abbreviations (iso2 codes) for languages you speak, comma separated. For example \"de,it\"."] = "llista d'abreviatures (ISO2 codes), separada per comes,  per idiomes que tú parles. Per exemple \"ca,es,de,it\".";
+$a->strings["Minimum confidence in language detection"] = "Precissió mínima en la detecció d'idioma";
+$a->strings["Minimum confidence in language detection being correct, from 0 to 100. Posts will not be filtered when the confidence of language detection is below this percent value."] = "Precissió mínima en la detecció d'idioma per ser correcta, de 0 a 100. Els misssatges no seràn filtrats mentre que la precissió en la detecció d'idioma estigui per sota d'aquest valor.";
+$a->strings["Minimum length of message body"] = "Durada mínima del cos del missatge";
+$a->strings["Minimum number of characters in message body for filter to be used. Posts shorter than this will not be filtered. Note: Language detection is unreliable for short content (<200 characters)."] = "Nombre mínim de caràcters en el cos de missatges per utilitzar el filtre. Les publicacions inferiors a aquesta no es filtraran. Nota: la detecció del llenguatge no és fiable per a contingut curt (<200 caràcters).";
+$a->strings["Save Settings"] = "Desa la configuració";
+$a->strings["Language Filter Settings saved."] = "S'ha desat la configuració del filtre d'idioma";
+$a->strings["Filtered language: %s"] = "%sIdioma filtrat";
diff --git a/langfilter/lang/cs/messages.po b/langfilter/lang/cs/messages.po
index 8c83cfe5..af344937 100644
--- a/langfilter/lang/cs/messages.po
+++ b/langfilter/lang/cs/messages.po
@@ -26,8 +26,8 @@ msgstr "Jazykový filtr"
 
 #: langfilter.php:59
 msgid ""
-"This addon tries to identify the language posts are written in. If it does "
-"not match any language specified below, posts will be hidden by collapsing "
+"This addon tries to identify the language posts are writen in. If it does "
+"not match any language specifed below, posts will be hidden by collapsing "
 "them."
 msgstr "Tento doplněk zkouší identifikovat jazyk, ve kterém jsou napsány příspěvky. Pokud nelze přiřadit příspěvky k žádnému níže specifikovanému jazyku, příspěvky budou zabaleny."
 
diff --git a/langfilter/lang/cs/strings.php b/langfilter/lang/cs/strings.php
index 468015d8..6f398879 100644
--- a/langfilter/lang/cs/strings.php
+++ b/langfilter/lang/cs/strings.php
@@ -3,17 +3,18 @@
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
 	$n = intval($n);
-	if (($n == 1 && $n % 1 == 0)) { return 0; } else if (($n >= 2 && $n <= 4 && $n % 1 == 0)) { return 1; } else if (($n % 1 != 0 )) { return 2; } else  { return 3; }
+	return ($n == 1 && $n % 1 == 0) ? 0 : ($n >= 2 && $n <= 4 && $n % 1 == 0) ? 1: ($n % 1 != 0 ) ? 2 : 3;;
 }}
-$a->strings['Language Filter'] = 'Jazykový filtr';
-$a->strings['This addon tries to identify the language posts are written in. If it does not match any language specified below, posts will be hidden by collapsing them.'] = 'Tento doplněk zkouší identifikovat jazyk, ve kterém jsou napsány příspěvky. Pokud nelze přiřadit příspěvky k žádnému níže specifikovanému jazyku, příspěvky budou zabaleny.';
-$a->strings['Use the language filter'] = 'Použít jazykový filtr';
-$a->strings['Able to read'] = 'Lze číst';
-$a->strings['List of abbreviations (iso2 codes) for languages you speak, comma separated. For example "de,it".'] = 'Seznam zkratek (kódů ISO 2) pro jazyky, kterými mluvíte, oddělených čárkami. Příklad: "cs,sk".';
-$a->strings['Minimum confidence in language detection'] = 'Minimální jistota v detekci jazyka';
-$a->strings['Minimum confidence in language detection being correct, from 0 to 100. Posts will not be filtered when the confidence of language detection is below this percent value.'] = 'Minimální jistota ve správnost detekce jazyka, od 0 do 100. Pokud jistota v detekci spadne pod tuto úroveň, nebudou příspěvky filtrovány.';
-$a->strings['Minimum length of message body'] = 'Minimální délka těla zprávy';
-$a->strings['Minimum number of characters in message body for filter to be used. Posts shorter than this will not be filtered. Note: Language detection is unreliable for short content (<200 characters).'] = 'Minimální počet znaků v těle zprávy pro použití filtru. Kratší zprávy nebudou filtrovány. Poznámka: Detekce jazyka je nespolehlivá pro krátký obsah (<200 znaků).';
-$a->strings['Save Settings'] = 'Uložit nastavení';
-$a->strings['Language Filter Settings saved.'] = 'Nastavení Language Filter uložena.';
-$a->strings['Filtered language: %s'] = 'Filtrovaný jazyk: %s';
+;
+$a->strings["Language Filter"] = "Jazykový filtr";
+$a->strings["This addon tries to identify the language posts are writen in. If it does not match any language specifed below, posts will be hidden by collapsing them."] = "Tento doplněk zkouší identifikovat jazyk, ve kterém jsou napsány příspěvky. Pokud nelze přiřadit příspěvky k žádnému níže specifikovanému jazyku, příspěvky budou zabaleny.";
+$a->strings["Use the language filter"] = "Použít jazykový filtr";
+$a->strings["Able to read"] = "Lze číst";
+$a->strings["List of abbreviations (iso2 codes) for languages you speak, comma separated. For example \"de,it\"."] = "Seznam zkratek (kódů ISO 2) pro jazyky, kterými mluvíte, oddělených čárkami. Příklad: \"cs,sk\".";
+$a->strings["Minimum confidence in language detection"] = "Minimální jistota v detekci jazyka";
+$a->strings["Minimum confidence in language detection being correct, from 0 to 100. Posts will not be filtered when the confidence of language detection is below this percent value."] = "Minimální jistota ve správnost detekce jazyka, od 0 do 100. Pokud jistota v detekci spadne pod tuto úroveň, nebudou příspěvky filtrovány.";
+$a->strings["Minimum length of message body"] = "Minimální délka těla zprávy";
+$a->strings["Minimum number of characters in message body for filter to be used. Posts shorter than this will not be filtered. Note: Language detection is unreliable for short content (<200 characters)."] = "Minimální počet znaků v těle zprávy pro použití filtru. Kratší zprávy nebudou filtrovány. Poznámka: Detekce jazyka je nespolehlivá pro krátký obsah (<200 znaků).";
+$a->strings["Save Settings"] = "Uložit nastavení";
+$a->strings["Language Filter Settings saved."] = "Nastavení Language Filter uložena.";
+$a->strings["Filtered language: %s"] = "Filtrovaný jazyk: %s";
diff --git a/langfilter/lang/da-dk/messages.po b/langfilter/lang/da-dk/messages.po
deleted file mode 100644
index c7b400f5..00000000
--- a/langfilter/lang/da-dk/messages.po
+++ /dev/null
@@ -1,76 +0,0 @@
-# ADDON langfilter
-# Copyright (C)
-# This file is distributed under the same license as the Friendica langfilter addon package.
-# 
-# 
-# Translators:
-# Anton <dev@atjn.dk>, 2022
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:15-0500\n"
-"PO-Revision-Date: 2015-07-25 08:05+0000\n"
-"Last-Translator: Anton <dev@atjn.dk>, 2022\n"
-"Language-Team: Danish (Denmark) (http://www.transifex.com/Friendica/friendica/language/da_DK/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: da_DK\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: langfilter.php:49
-msgid ""
-"This addon tries to identify the language posts are written in. If it does "
-"not match any language specified below, posts will be hidden by collapsing "
-"them."
-msgstr "Denne tilføjelse forsøger at identificere det sprog som opslag er skrevet i. Hvis opslaget ikke matcher en af sprogene specificeret herunder, bliver opslaget kollapset."
-
-#: langfilter.php:50
-msgid "Use the language filter"
-msgstr "Brug sprogfilteret"
-
-#: langfilter.php:51
-msgid "Able to read"
-msgstr "Kan læse"
-
-#: langfilter.php:51
-msgid ""
-"List of abbreviations (ISO 639-1 codes) for languages you speak, comma "
-"separated. For example \"de,it\"."
-msgstr "Liste af forkortelser (ISO 639-1 koder) for sprog som du taler, kommasepareret. For eksempel \"da,en\" for dansk og engelsk."
-
-#: langfilter.php:52
-msgid "Minimum confidence in language detection"
-msgstr "Minimum konfidens i sprogregistreringen"
-
-#: langfilter.php:52
-msgid ""
-"Minimum confidence in language detection being correct, from 0 to 100. Posts"
-" will not be filtered when the confidence of language detection is below "
-"this percent value."
-msgstr "Minimum konfidens i at det registrerede sprog er korrekt, fra 0 til 100. Opslag bliver ikke filtreret når konfidensen af det registrerede sprog er under denne procentværdi."
-
-#: langfilter.php:53
-msgid "Minimum length of message body"
-msgstr "Minimum længde af beskeden"
-
-#: langfilter.php:53
-msgid ""
-"Minimum number of characters in message body for filter to be used. Posts "
-"shorter than this will not be filtered. Note: Language detection is "
-"unreliable for short content (<200 characters)."
-msgstr "Minimum nummer af tegn i beskeden før filteret bruges. Opslag som er kortere end dette tal vil ikke blive filtreret. Note: Sprogregistreringen er upålidelig for kort indhold (<200 tegn)."
-
-#: langfilter.php:58
-msgid "Language Filter"
-msgstr "Sprogfilter"
-
-#: langfilter.php:60
-msgid "Save Settings"
-msgstr "Gem indstillinger"
-
-#: langfilter.php:193
-#, php-format
-msgid "Filtered language: %s"
-msgstr "Filtreret sprog: %s"
diff --git a/langfilter/lang/da-dk/strings.php b/langfilter/lang/da-dk/strings.php
deleted file mode 100644
index a20b41e3..00000000
--- a/langfilter/lang/da-dk/strings.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_da_dk")) {
-function string_plural_select_da_dk($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['This addon tries to identify the language posts are written in. If it does not match any language specified below, posts will be hidden by collapsing them.'] = 'Denne tilføjelse forsøger at identificere det sprog som opslag er skrevet i. Hvis opslaget ikke matcher en af sprogene specificeret herunder, bliver opslaget kollapset.';
-$a->strings['Use the language filter'] = 'Brug sprogfilteret';
-$a->strings['Able to read'] = 'Kan læse';
-$a->strings['List of abbreviations (ISO 639-1 codes) for languages you speak, comma separated. For example "de,it".'] = 'Liste af forkortelser (ISO 639-1 koder) for sprog som du taler, kommasepareret. For eksempel "da,en" for dansk og engelsk.';
-$a->strings['Minimum confidence in language detection'] = 'Minimum konfidens i sprogregistreringen';
-$a->strings['Minimum confidence in language detection being correct, from 0 to 100. Posts will not be filtered when the confidence of language detection is below this percent value.'] = 'Minimum konfidens i at det registrerede sprog er korrekt, fra 0 til 100. Opslag bliver ikke filtreret når konfidensen af det registrerede sprog er under denne procentværdi.';
-$a->strings['Minimum length of message body'] = 'Minimum længde af beskeden';
-$a->strings['Minimum number of characters in message body for filter to be used. Posts shorter than this will not be filtered. Note: Language detection is unreliable for short content (<200 characters).'] = 'Minimum nummer af tegn i beskeden før filteret bruges. Opslag som er kortere end dette tal vil ikke blive filtreret. Note: Sprogregistreringen er upålidelig for kort indhold (<200 tegn).';
-$a->strings['Language Filter'] = 'Sprogfilter';
-$a->strings['Save Settings'] = 'Gem indstillinger';
-$a->strings['Filtered language: %s'] = 'Filtreret sprog: %s';
diff --git a/langfilter/lang/de/messages.po b/langfilter/lang/de/messages.po
deleted file mode 100644
index 9a9c2b24..00000000
--- a/langfilter/lang/de/messages.po
+++ /dev/null
@@ -1,81 +0,0 @@
-# ADDON langfilter
-# Copyright (C)
-# This file is distributed under the same license as the Friendica langfilter addon package.
-# 
-# 
-# Translators:
-# Andreas H., 2018
-# Copiis Praeesse <copiis@vivaldi.net>, 2018
-# Ralf Thees <ralf@herrthees.de>, 2019
-# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2015
-# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2020-2021
-# Ulf Rompe <transifex.com@rompe.org>, 2019
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:15-0500\n"
-"PO-Revision-Date: 2015-07-25 08:05+0000\n"
-"Last-Translator: Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2020-2021\n"
-"Language-Team: German (http://app.transifex.com/Friendica/friendica/language/de/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: de\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: langfilter.php:49
-msgid ""
-"This addon tries to identify the language posts are written in. If it does "
-"not match any language specified below, posts will be hidden by collapsing "
-"them."
-msgstr "Dieses Addon versucht zu identifizieren, in welcher Sprache Posts geschrieben werden. Wenn sie nicht mit einer der unten angegebenen Sprachen übereinstimmt, werden Posts durch Zusammenklappen verborgen."
-
-#: langfilter.php:50
-msgid "Use the language filter"
-msgstr "Den Sprachfilter verwenden"
-
-#: langfilter.php:51
-msgid "Able to read"
-msgstr "Lesbar"
-
-#: langfilter.php:51
-msgid ""
-"List of abbreviations (ISO 639-1 codes) for languages you speak, comma "
-"separated. For example \"de,it\"."
-msgstr "Mit Komma getrennte Liste von Abkürzungen (ISO 639-1) der von dir gesprochenen Sprachen. Zum Beispiel \"de,it\"."
-
-#: langfilter.php:52
-msgid "Minimum confidence in language detection"
-msgstr "Minimales Vertrauenslevel in die Spracherkennung"
-
-#: langfilter.php:52
-msgid ""
-"Minimum confidence in language detection being correct, from 0 to 100. Posts"
-" will not be filtered when the confidence of language detection is below "
-"this percent value."
-msgstr "Minimales Vertrauen in die Richtigkeit der erkannten Sprache. Wert zwischen 0 und 100. Beiträge mit einem niedrigeren Vertrauenslevel werden nicht gefiltert."
-
-#: langfilter.php:53
-msgid "Minimum length of message body"
-msgstr "Mindestlänge des Nachrichtentexts"
-
-#: langfilter.php:53
-msgid ""
-"Minimum number of characters in message body for filter to be used. Posts "
-"shorter than this will not be filtered. Note: Language detection is "
-"unreliable for short content (<200 characters)."
-msgstr "Mindestanzahl von Zeichen im Nachrichtentext, die vom Filter benutzt werden soll. Kürzere Beiträge werden nicht gefiltert. Hinweis: Die Spracherkennung ist bei kurzen Inhalten (<200 Zeichen) nicht zuverlässig."
-
-#: langfilter.php:58
-msgid "Language Filter"
-msgstr "Sprachfilter"
-
-#: langfilter.php:60
-msgid "Save Settings"
-msgstr "Einstellungen speichern"
-
-#: langfilter.php:193
-#, php-format
-msgid "Filtered language: %s"
-msgstr "Gefilterte Sprache:  %s"
diff --git a/langfilter/lang/de/messagespo.po b/langfilter/lang/de/messagespo.po
index c8fd1eb9..55cd300e 100644
--- a/langfilter/lang/de/messagespo.po
+++ b/langfilter/lang/de/messagespo.po
@@ -8,15 +8,14 @@
 # Copiis Praeesse <richard@zsemberi.de>, 2018
 # Ralf Thees <ralf@herrthees.de>, 2019
 # Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2015
-# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2020-2021
 # Ulf Rompe <transifex.com@rompe.org>, 2019
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2021-10-19 18:08+0000\n"
-"Last-Translator: Tobias Diekershoff <tobias.diekershoff@gmx.net>\n"
+"POT-Creation-Date: 2018-04-01 11:11-0400\n"
+"PO-Revision-Date: 2019-05-20 12:16+0000\n"
+"Last-Translator: Ralf Thees <ralf@herrthees.de>\n"
 "Language-Team: German (http://www.transifex.com/Friendica/friendica/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,58 +23,62 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: langfilter.php:50
+#: langfilter.php:58
 msgid "Language Filter"
 msgstr "Sprachfilter"
 
-#: langfilter.php:51
+#: langfilter.php:59
 msgid ""
-"This addon tries to identify the language posts are written in. If it does "
-"not match any language specified below, posts will be hidden by collapsing "
+"This addon tries to identify the language posts are writen in. If it does "
+"not match any language specifed below, posts will be hidden by collapsing "
 "them."
 msgstr "Dieses Addon versucht zu identifizieren, in welcher Sprache Posts geschrieben werden. Wenn sie nicht mit einer der unten angegebenen Sprachen übereinstimmt, werden Posts durch Zusammenklappen verborgen."
 
-#: langfilter.php:52
+#: langfilter.php:60
 msgid "Use the language filter"
 msgstr "Den Sprachfilter verwenden"
 
-#: langfilter.php:53
+#: langfilter.php:61
 msgid "Able to read"
 msgstr "Lesbar"
 
-#: langfilter.php:53
+#: langfilter.php:61
 msgid ""
-"List of abbreviations (ISO 639-1 codes) for languages you speak, comma "
-"separated. For example \"de,it\"."
-msgstr "Mit Komma getrennte Liste von Abkürzungen (ISO 639-1) der von dir gesprochenen Sprachen. Zum Beispiel \"de,it\"."
+"List of abbreviations (iso2 codes) for languages you speak, comma separated."
+" For example \"de,it\"."
+msgstr "Liste von Abkürzungen (ISO2-Codes) der Sprachen, die du sprichst, getrennt durch Komma. Zum Beispiel: \"de,it\"."
 
-#: langfilter.php:54
+#: langfilter.php:62
 msgid "Minimum confidence in language detection"
 msgstr "Minimales Vertrauenslevel in die Spracherkennung"
 
-#: langfilter.php:54
+#: langfilter.php:62
 msgid ""
 "Minimum confidence in language detection being correct, from 0 to 100. Posts"
 " will not be filtered when the confidence of language detection is below "
 "this percent value."
 msgstr "Minimales Vertrauen in die Richtigkeit der erkannten Sprache. Wert zwischen 0 und 100. Beiträge mit einem niedrigeren Vertrauenslevel werden nicht gefiltert."
 
-#: langfilter.php:55
+#: langfilter.php:63
 msgid "Minimum length of message body"
 msgstr "Mindestlänge des Nachrichtentexts"
 
-#: langfilter.php:55
+#: langfilter.php:63
 msgid ""
 "Minimum number of characters in message body for filter to be used. Posts "
 "shorter than this will not be filtered. Note: Language detection is "
 "unreliable for short content (<200 characters)."
 msgstr "Mindestanzahl von Zeichen im Nachrichtentext, die vom Filter benutzt werden soll. Kürzere Beiträge werden nicht gefiltert. Hinweis: Die Spracherkennung ist bei kurzen Inhalten (<200 Zeichen) nicht zuverlässig."
 
-#: langfilter.php:56
+#: langfilter.php:64
 msgid "Save Settings"
 msgstr "Einstellungen speichern"
 
-#: langfilter.php:187
+#: langfilter.php:105
+msgid "Language Filter Settings saved."
+msgstr "Sprachfilter-Einstellungen gespeichert."
+
+#: langfilter.php:182
 #, php-format
 msgid "Filtered language: %s"
 msgstr "Gefilterte Sprache:  %s"
diff --git a/langfilter/lang/de/strings.php b/langfilter/lang/de/strings.php
index ff5deee1..51cde77d 100644
--- a/langfilter/lang/de/strings.php
+++ b/langfilter/lang/de/strings.php
@@ -3,16 +3,18 @@
 if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['This addon tries to identify the language posts are written in. If it does not match any language specified below, posts will be hidden by collapsing them.'] = 'Dieses Addon versucht zu identifizieren, in welcher Sprache Posts geschrieben werden. Wenn sie nicht mit einer der unten angegebenen Sprachen übereinstimmt, werden Posts durch Zusammenklappen verborgen.';
-$a->strings['Use the language filter'] = 'Den Sprachfilter verwenden';
-$a->strings['Able to read'] = 'Lesbar';
-$a->strings['List of abbreviations (ISO 639-1 codes) for languages you speak, comma separated. For example "de,it".'] = 'Mit Komma getrennte Liste von Abkürzungen (ISO 639-1) der von dir gesprochenen Sprachen. Zum Beispiel "de,it".';
-$a->strings['Minimum confidence in language detection'] = 'Minimales Vertrauenslevel in die Spracherkennung';
-$a->strings['Minimum confidence in language detection being correct, from 0 to 100. Posts will not be filtered when the confidence of language detection is below this percent value.'] = 'Minimales Vertrauen in die Richtigkeit der erkannten Sprache. Wert zwischen 0 und 100. Beiträge mit einem niedrigeren Vertrauenslevel werden nicht gefiltert.';
-$a->strings['Minimum length of message body'] = 'Mindestlänge des Nachrichtentexts';
-$a->strings['Minimum number of characters in message body for filter to be used. Posts shorter than this will not be filtered. Note: Language detection is unreliable for short content (<200 characters).'] = 'Mindestanzahl von Zeichen im Nachrichtentext, die vom Filter benutzt werden soll. Kürzere Beiträge werden nicht gefiltert. Hinweis: Die Spracherkennung ist bei kurzen Inhalten (<200 Zeichen) nicht zuverlässig.';
-$a->strings['Language Filter'] = 'Sprachfilter';
-$a->strings['Save Settings'] = 'Einstellungen speichern';
-$a->strings['Filtered language: %s'] = 'Gefilterte Sprache:  %s';
+;
+$a->strings["Language Filter"] = "Sprachfilter";
+$a->strings["This addon tries to identify the language posts are writen in. If it does not match any language specifed below, posts will be hidden by collapsing them."] = "Dieses Addon versucht zu identifizieren, in welcher Sprache Posts geschrieben werden. Wenn sie nicht mit einer der unten angegebenen Sprachen übereinstimmt, werden Posts durch Zusammenklappen verborgen.";
+$a->strings["Use the language filter"] = "Den Sprachfilter verwenden";
+$a->strings["Able to read"] = "Lesbar";
+$a->strings["List of abbreviations (iso2 codes) for languages you speak, comma separated. For example \"de,it\"."] = "Liste von Abkürzungen (ISO2-Codes) der Sprachen, die du sprichst, getrennt durch Komma. Zum Beispiel: \"de,it\".";
+$a->strings["Minimum confidence in language detection"] = "Minimales Vertrauenslevel in die Spracherkennung";
+$a->strings["Minimum confidence in language detection being correct, from 0 to 100. Posts will not be filtered when the confidence of language detection is below this percent value."] = "Minimales Vertrauen in die Richtigkeit der erkannten Sprache. Wert zwischen 0 und 100. Beiträge mit einem niedrigeren Vertrauenslevel werden nicht gefiltert.";
+$a->strings["Minimum length of message body"] = "Mindestlänge des Nachrichtentexts";
+$a->strings["Minimum number of characters in message body for filter to be used. Posts shorter than this will not be filtered. Note: Language detection is unreliable for short content (<200 characters)."] = "Mindestanzahl von Zeichen im Nachrichtentext, die vom Filter benutzt werden soll. Kürzere Beiträge werden nicht gefiltert. Hinweis: Die Spracherkennung ist bei kurzen Inhalten (<200 Zeichen) nicht zuverlässig.";
+$a->strings["Save Settings"] = "Einstellungen speichern";
+$a->strings["Language Filter Settings saved."] = "Sprachfilter-Einstellungen gespeichert.";
+$a->strings["Filtered language: %s"] = "Gefilterte Sprache:  %s";
diff --git a/langfilter/lang/en-gb/messages.po b/langfilter/lang/en-gb/messages.po
index 41363483..cc9041e6 100644
--- a/langfilter/lang/en-gb/messages.po
+++ b/langfilter/lang/en-gb/messages.po
@@ -25,10 +25,10 @@ msgstr "Language Filter"
 
 #: langfilter.php:59
 msgid ""
-"This addon tries to identify the language posts are written in. If it does "
-"not match any language specified below, posts will be hidden by collapsing "
+"This addon tries to identify the language posts are writen in. If it does "
+"not match any language specifed below, posts will be hidden by collapsing "
 "them."
-msgstr "This addon tries to identify the language that posts are written in. If posts don't match any of the languages specified below, those posts will be hidden by collapsing them."
+msgstr "This addon tries to identify the language that posts are written in. If posts don't match any of the languages specifed below, those posts will be hidden by collapsing them."
 
 #: langfilter.php:60
 msgid "Use the language filter"
diff --git a/langfilter/lang/en-gb/strings.php b/langfilter/lang/en-gb/strings.php
index 35a83207..20eb6d02 100644
--- a/langfilter/lang/en-gb/strings.php
+++ b/langfilter/lang/en-gb/strings.php
@@ -2,18 +2,18 @@
 
 if(! function_exists("string_plural_select_en_gb")) {
 function string_plural_select_en_gb($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Language Filter'] = 'Language Filter';
-$a->strings['This addon tries to identify the language posts are written in. If it does not match any language specified below, posts will be hidden by collapsing them.'] = 'This addon tries to identify the language that posts are written in. If posts don\'t match any of the languages specified below, those posts will be hidden by collapsing them.';
-$a->strings['Use the language filter'] = 'Use the Language Filter';
-$a->strings['Able to read'] = 'Language selection';
-$a->strings['List of abbreviations (iso2 codes) for languages you speak, comma separated. For example "de,it".'] = 'List of abbreviations (ISO two-letter language codes) for languages you wish to view, separated by commas. For example, German and Italian would be "de,it".';
-$a->strings['Minimum confidence in language detection'] = 'Minimum confidence in language detection';
-$a->strings['Minimum confidence in language detection being correct, from 0 to 100. Posts will not be filtered when the confidence of language detection is below this percent value.'] = 'The minimum confidence in language detection being correct, from 0 to 100. Posts will only be filtered if their confidence value is higher than this percentage.';
-$a->strings['Minimum length of message body'] = 'Minimum length of message body';
-$a->strings['Minimum number of characters in message body for filter to be used. Posts shorter than this will not be filtered. Note: Language detection is unreliable for short content (<200 characters).'] = 'The minimum number of characters a message has to contain for it to activate the filter. Posts shorter than this will not be filtered. Please note that language detection is unreliable for short content (for example for posts of less than 200 characters).';
-$a->strings['Save Settings'] = 'Save Settings';
-$a->strings['Language Filter Settings saved.'] = 'Language Filter settings saved.';
-$a->strings['Filtered language: %s'] = 'Filtered language: %s';
+;
+$a->strings["Language Filter"] = "Language Filter";
+$a->strings["This addon tries to identify the language posts are writen in. If it does not match any language specifed below, posts will be hidden by collapsing them."] = "This addon tries to identify the language that posts are written in. If posts don't match any of the languages specifed below, those posts will be hidden by collapsing them.";
+$a->strings["Use the language filter"] = "Use the Language Filter";
+$a->strings["Able to read"] = "Language selection";
+$a->strings["List of abbreviations (iso2 codes) for languages you speak, comma separated. For example \"de,it\"."] = "List of abbreviations (ISO two-letter language codes) for languages you wish to view, separated by commas. For example, German and Italian would be \"de,it\".";
+$a->strings["Minimum confidence in language detection"] = "Minimum confidence in language detection";
+$a->strings["Minimum confidence in language detection being correct, from 0 to 100. Posts will not be filtered when the confidence of language detection is below this percent value."] = "The minimum confidence in language detection being correct, from 0 to 100. Posts will only be filtered if their confidence value is higher than this percentage.";
+$a->strings["Minimum length of message body"] = "Minimum length of message body";
+$a->strings["Minimum number of characters in message body for filter to be used. Posts shorter than this will not be filtered. Note: Language detection is unreliable for short content (<200 characters)."] = "The minimum number of characters a message has to contain for it to activate the filter. Posts shorter than this will not be filtered. Please note that language detection is unreliable for short content (for example for posts of less than 200 characters).";
+$a->strings["Save Settings"] = "Save Settings";
+$a->strings["Language Filter Settings saved."] = "Language Filter settings saved.";
+$a->strings["Filtered language: %s"] = "Filtered language: %s";
diff --git a/langfilter/lang/en-us/messages.po b/langfilter/lang/en-us/messages.po
index bf5d2089..00964e38 100644
--- a/langfilter/lang/en-us/messages.po
+++ b/langfilter/lang/en-us/messages.po
@@ -25,10 +25,10 @@ msgstr "Language Filter"
 
 #: langfilter.php:59
 msgid ""
-"This addon tries to identify the language posts are written in. If it does "
-"not match any language specified below, posts will be hidden by collapsing "
+"This addon tries to identify the language posts are writen in. If it does "
+"not match any language specifed below, posts will be hidden by collapsing "
 "them."
-msgstr "This addon tries to identify the language posts are written in. If it does not match any language specified below, posts will be hidden by collapsing them."
+msgstr "This addon tries to identify the language posts are written in. If it does not match any language specifed below, posts will be hidden by collapsing them."
 
 #: langfilter.php:60
 msgid "Use the language filter"
diff --git a/langfilter/lang/en-us/strings.php b/langfilter/lang/en-us/strings.php
index 524327d7..5f7f7e1d 100644
--- a/langfilter/lang/en-us/strings.php
+++ b/langfilter/lang/en-us/strings.php
@@ -2,18 +2,18 @@
 
 if(! function_exists("string_plural_select_en_us")) {
 function string_plural_select_en_us($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Language Filter'] = 'Language Filter';
-$a->strings['This addon tries to identify the language posts are written in. If it does not match any language specified below, posts will be hidden by collapsing them.'] = 'This addon tries to identify the language posts are written in. If it does not match any language specified below, posts will be hidden by collapsing them.';
-$a->strings['Use the language filter'] = 'Use the language filter';
-$a->strings['Able to read'] = 'Able to read';
-$a->strings['List of abbreviations (iso2 codes) for languages you speak, comma separated. For example "de,it".'] = 'List of abbreviations (iso2 codes) for languages you speak, comma separated. For example "de,it".';
-$a->strings['Minimum confidence in language detection'] = 'Minimum confidence in language detection';
-$a->strings['Minimum confidence in language detection being correct, from 0 to 100. Posts will not be filtered when the confidence of language detection is below this percent value.'] = 'Minimum confidence in language detection being correct, from 0 to 100. Posts will not be filtered when the confidence of language detection is below this percent value.';
-$a->strings['Minimum length of message body'] = 'Minimum length of message body';
-$a->strings['Minimum number of characters in message body for filter to be used. Posts shorter than this will not be filtered. Note: Language detection is unreliable for short content (<200 characters).'] = 'Minimum number of characters in message body for filter to be used. Posts shorter than this will not be filtered. Note: Language detection is unreliable for short content (<200 characters).';
-$a->strings['Save Settings'] = 'Save Settings';
-$a->strings['Language Filter Settings saved.'] = 'Language Filter Settings saved.';
-$a->strings['Filtered language: %s'] = 'Filtered language: %s';
+;
+$a->strings["Language Filter"] = "Language Filter";
+$a->strings["This addon tries to identify the language posts are writen in. If it does not match any language specifed below, posts will be hidden by collapsing them."] = "This addon tries to identify the language posts are written in. If it does not match any language specifed below, posts will be hidden by collapsing them.";
+$a->strings["Use the language filter"] = "Use the language filter";
+$a->strings["Able to read"] = "Able to read";
+$a->strings["List of abbreviations (iso2 codes) for languages you speak, comma separated. For example \"de,it\"."] = "List of abbreviations (iso2 codes) for languages you speak, comma separated. For example \"de,it\".";
+$a->strings["Minimum confidence in language detection"] = "Minimum confidence in language detection";
+$a->strings["Minimum confidence in language detection being correct, from 0 to 100. Posts will not be filtered when the confidence of language detection is below this percent value."] = "Minimum confidence in language detection being correct, from 0 to 100. Posts will not be filtered when the confidence of language detection is below this percent value.";
+$a->strings["Minimum length of message body"] = "Minimum length of message body";
+$a->strings["Minimum number of characters in message body for filter to be used. Posts shorter than this will not be filtered. Note: Language detection is unreliable for short content (<200 characters)."] = "Minimum number of characters in message body for filter to be used. Posts shorter than this will not be filtered. Note: Language detection is unreliable for short content (<200 characters).";
+$a->strings["Save Settings"] = "Save Settings";
+$a->strings["Language Filter Settings saved."] = "Language Filter Settings saved.";
+$a->strings["Filtered language: %s"] = "Filtered language: %s";
diff --git a/langfilter/lang/es/messages.po b/langfilter/lang/es/messages.po
index dced371a..4b1725e8 100644
--- a/langfilter/lang/es/messages.po
+++ b/langfilter/lang/es/messages.po
@@ -6,14 +6,13 @@
 # Translators:
 # Abraham Pérez Hernández <abrahamph@nauta.cu>, 2019
 # Albert, 2016,2018
-# Boris Daniel Martinez Millàn <borisdanielmartinezmillan@gmail.com>, 2021
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2021-02-03 22:42+0000\n"
-"Last-Translator: Boris Daniel Martinez Millàn <borisdanielmartinezmillan@gmail.com>\n"
+"POT-Creation-Date: 2018-04-01 11:11-0400\n"
+"PO-Revision-Date: 2019-01-22 18:31+0000\n"
+"Last-Translator: Abraham Pérez Hernández <abrahamph@nauta.cu>\n"
 "Language-Team: Spanish (http://www.transifex.com/Friendica/friendica/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,58 +20,62 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: langfilter.php:50
+#: langfilter.php:58
 msgid "Language Filter"
 msgstr "Filtro de Idioma"
 
-#: langfilter.php:51
+#: langfilter.php:59
 msgid ""
-"This addon tries to identify the language posts are written in. If it does "
-"not match any language specified below, posts will be hidden by collapsing "
+"This addon tries to identify the language posts are writen in. If it does "
+"not match any language specifed below, posts will be hidden by collapsing "
 "them."
 msgstr "Este complemento intenta identificar en qué idioma se han escrito las publicaciones. Si no coincide con el idioma especificado a continuación, las publicaciones se ocultarán al contraerlas."
 
-#: langfilter.php:52
+#: langfilter.php:60
 msgid "Use the language filter"
 msgstr "Usar el filtro de idioma"
 
-#: langfilter.php:53
+#: langfilter.php:61
 msgid "Able to read"
 msgstr "Capaz de leer"
 
-#: langfilter.php:53
+#: langfilter.php:61
 msgid ""
-"List of abbreviations (ISO 639-1 codes) for languages you speak, comma "
-"separated. For example \"de,it\"."
-msgstr "Lista de abreviaciones (Codigo ISO 639-1) de los lenguajes que hablas, separados por comas.Un ejemplo: \"de,it\"."
+"List of abbreviations (iso2 codes) for languages you speak, comma separated."
+" For example \"de,it\"."
+msgstr "Lista de abreviaciones (códigos iso2) para los idiomas que habla, separadas por comas. Por ejemplo \"de,it\"."
 
-#: langfilter.php:54
+#: langfilter.php:62
 msgid "Minimum confidence in language detection"
 msgstr "Confianza mínima en la detección de idioma"
 
-#: langfilter.php:54
+#: langfilter.php:62
 msgid ""
 "Minimum confidence in language detection being correct, from 0 to 100. Posts"
 " will not be filtered when the confidence of language detection is below "
 "this percent value."
 msgstr "Confianza mínima en que la detección de idioma sea correcta, de 0 a 100. Las entradas no se filtrarán cuando la confianza de la detección del idioma es inferior a su valor de porcentaje."
 
-#: langfilter.php:55
+#: langfilter.php:63
 msgid "Minimum length of message body"
 msgstr "Longitud mínima del cuerpo del mensaje"
 
-#: langfilter.php:55
+#: langfilter.php:63
 msgid ""
 "Minimum number of characters in message body for filter to be used. Posts "
 "shorter than this will not be filtered. Note: Language detection is "
 "unreliable for short content (<200 characters)."
 msgstr "Número mínimo de caracteres en el cuerpo del mensaje para que se use el filtro. Las publicaciones más cortas que esto no serán filtradas. Nota: La detección de idioma no es fiable para contenido corto (<200 caracteres)."
 
-#: langfilter.php:56
+#: langfilter.php:64
 msgid "Save Settings"
 msgstr "Guardar Ajustes"
 
-#: langfilter.php:187
+#: langfilter.php:105
+msgid "Language Filter Settings saved."
+msgstr "Ajustes de Filtro de Idioma guardados."
+
+#: langfilter.php:182
 #, php-format
 msgid "Filtered language: %s"
 msgstr "Idioma filtrado: %s"
diff --git a/langfilter/lang/es/strings.php b/langfilter/lang/es/strings.php
index c3738122..b3ff9333 100644
--- a/langfilter/lang/es/strings.php
+++ b/langfilter/lang/es/strings.php
@@ -3,16 +3,18 @@
 if(! function_exists("string_plural_select_es")) {
 function string_plural_select_es($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Language Filter'] = 'Filtro de Idioma';
-$a->strings['This addon tries to identify the language posts are written in. If it does not match any language specified below, posts will be hidden by collapsing them.'] = 'Este complemento intenta identificar en qué idioma se han escrito las publicaciones. Si no coincide con el idioma especificado a continuación, las publicaciones se ocultarán al contraerlas.';
-$a->strings['Use the language filter'] = 'Usar el filtro de idioma';
-$a->strings['Able to read'] = 'Capaz de leer';
-$a->strings['List of abbreviations (ISO 639-1 codes) for languages you speak, comma separated. For example "de,it".'] = 'Lista de abreviaciones (Codigo ISO 639-1) de los lenguajes que hablas, separados por comas.Un ejemplo: "de,it".';
-$a->strings['Minimum confidence in language detection'] = 'Confianza mínima en la detección de idioma';
-$a->strings['Minimum confidence in language detection being correct, from 0 to 100. Posts will not be filtered when the confidence of language detection is below this percent value.'] = 'Confianza mínima en que la detección de idioma sea correcta, de 0 a 100. Las entradas no se filtrarán cuando la confianza de la detección del idioma es inferior a su valor de porcentaje.';
-$a->strings['Minimum length of message body'] = 'Longitud mínima del cuerpo del mensaje';
-$a->strings['Minimum number of characters in message body for filter to be used. Posts shorter than this will not be filtered. Note: Language detection is unreliable for short content (<200 characters).'] = 'Número mínimo de caracteres en el cuerpo del mensaje para que se use el filtro. Las publicaciones más cortas que esto no serán filtradas. Nota: La detección de idioma no es fiable para contenido corto (<200 caracteres).';
-$a->strings['Save Settings'] = 'Guardar Ajustes';
-$a->strings['Filtered language: %s'] = 'Idioma filtrado: %s';
+;
+$a->strings["Language Filter"] = "Filtro de Idioma";
+$a->strings["This addon tries to identify the language posts are writen in. If it does not match any language specifed below, posts will be hidden by collapsing them."] = "Este complemento intenta identificar en qué idioma se han escrito las publicaciones. Si no coincide con el idioma especificado a continuación, las publicaciones se ocultarán al contraerlas.";
+$a->strings["Use the language filter"] = "Usar el filtro de idioma";
+$a->strings["Able to read"] = "Capaz de leer";
+$a->strings["List of abbreviations (iso2 codes) for languages you speak, comma separated. For example \"de,it\"."] = "Lista de abreviaciones (códigos iso2) para los idiomas que habla, separadas por comas. Por ejemplo \"de,it\".";
+$a->strings["Minimum confidence in language detection"] = "Confianza mínima en la detección de idioma";
+$a->strings["Minimum confidence in language detection being correct, from 0 to 100. Posts will not be filtered when the confidence of language detection is below this percent value."] = "Confianza mínima en que la detección de idioma sea correcta, de 0 a 100. Las entradas no se filtrarán cuando la confianza de la detección del idioma es inferior a su valor de porcentaje.";
+$a->strings["Minimum length of message body"] = "Longitud mínima del cuerpo del mensaje";
+$a->strings["Minimum number of characters in message body for filter to be used. Posts shorter than this will not be filtered. Note: Language detection is unreliable for short content (<200 characters)."] = "Número mínimo de caracteres en el cuerpo del mensaje para que se use el filtro. Las publicaciones más cortas que esto no serán filtradas. Nota: La detección de idioma no es fiable para contenido corto (<200 caracteres).";
+$a->strings["Save Settings"] = "Guardar Ajustes";
+$a->strings["Language Filter Settings saved."] = "Ajustes de Filtro de Idioma guardados.";
+$a->strings["Filtered language: %s"] = "Idioma filtrado: %s";
diff --git a/langfilter/lang/et/messages.po b/langfilter/lang/et/messages.po
index 07ed03ae..acfb3a47 100644
--- a/langfilter/lang/et/messages.po
+++ b/langfilter/lang/et/messages.po
@@ -25,8 +25,8 @@ msgstr "Keelefilter"
 
 #: langfilter.php:59
 msgid ""
-"This addon tries to identify the language posts are written in. If it does "
-"not match any language specified below, posts will be hidden by collapsing "
+"This addon tries to identify the language posts are writen in. If it does "
+"not match any language specifed below, posts will be hidden by collapsing "
 "them."
 msgstr "See lisa üritab määrata keelt milles postitused on kirjutatud. Kui tule, ei sobi ühegi alloleva keelega, siis postitused peidetakse minimeerides nad. "
 
diff --git a/langfilter/lang/et/strings.php b/langfilter/lang/et/strings.php
index 6d585936..e8aa27fa 100644
--- a/langfilter/lang/et/strings.php
+++ b/langfilter/lang/et/strings.php
@@ -3,17 +3,18 @@
 if(! function_exists("string_plural_select_et")) {
 function string_plural_select_et($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Language Filter'] = 'Keelefilter';
-$a->strings['This addon tries to identify the language posts are written in. If it does not match any language specified below, posts will be hidden by collapsing them.'] = 'See lisa üritab määrata keelt milles postitused on kirjutatud. Kui tule, ei sobi ühegi alloleva keelega, siis postitused peidetakse minimeerides nad. ';
-$a->strings['Use the language filter'] = 'Kasuta keelefiltrit';
-$a->strings['Able to read'] = 'Suuteline lugema';
-$a->strings['List of abbreviations (iso2 codes) for languages you speak, comma separated. For example "de,it".'] = 'Nimistu koodidest (iso2 koodid) keelte kohta mida räägite, komaga eraldatult. Näiteks "de, it, et, fi". ';
-$a->strings['Minimum confidence in language detection'] = 'Miinimumkindlus keeletuvastusel';
-$a->strings['Minimum confidence in language detection being correct, from 0 to 100. Posts will not be filtered when the confidence of language detection is below this percent value.'] = 'Miinimumkindlus kontrollil 0-st 100-ni. Postitusi ei filtreerita kui tuvastuskindlus on allpool nimetatud protsendiväärtust. ';
-$a->strings['Minimum length of message body'] = 'Sõnumiteksti miinimumväärtus';
-$a->strings['Minimum number of characters in message body for filter to be used. Posts shorter than this will not be filtered. Note: Language detection is unreliable for short content (<200 characters).'] = 'Miinimumväärtus märkides sõnumitekstis filtri tarbeks. Sellest lühemaid sõnumeid ei filtreerita. Märge: Keeletuvastus on ebausaldusväärne lühisisu puhul (vähem kui 200 märki). ';
-$a->strings['Save Settings'] = 'Salvesta sätted';
-$a->strings['Language Filter Settings saved.'] = 'Keelefiltri sätted salvestatud.';
-$a->strings['Filtered language: %s'] = 'Filtreeritud keel: %s ';
+;
+$a->strings["Language Filter"] = "Keelefilter";
+$a->strings["This addon tries to identify the language posts are writen in. If it does not match any language specifed below, posts will be hidden by collapsing them."] = "See lisa üritab määrata keelt milles postitused on kirjutatud. Kui tule, ei sobi ühegi alloleva keelega, siis postitused peidetakse minimeerides nad. ";
+$a->strings["Use the language filter"] = "Kasuta keelefiltrit";
+$a->strings["Able to read"] = "Suuteline lugema";
+$a->strings["List of abbreviations (iso2 codes) for languages you speak, comma separated. For example \"de,it\"."] = "Nimistu koodidest (iso2 koodid) keelte kohta mida räägite, komaga eraldatult. Näiteks \"de, it, et, fi\". ";
+$a->strings["Minimum confidence in language detection"] = "Miinimumkindlus keeletuvastusel";
+$a->strings["Minimum confidence in language detection being correct, from 0 to 100. Posts will not be filtered when the confidence of language detection is below this percent value."] = "Miinimumkindlus kontrollil 0-st 100-ni. Postitusi ei filtreerita kui tuvastuskindlus on allpool nimetatud protsendiväärtust. ";
+$a->strings["Minimum length of message body"] = "Sõnumiteksti miinimumväärtus";
+$a->strings["Minimum number of characters in message body for filter to be used. Posts shorter than this will not be filtered. Note: Language detection is unreliable for short content (<200 characters)."] = "Miinimumväärtus märkides sõnumitekstis filtri tarbeks. Sellest lühemaid sõnumeid ei filtreerita. Märge: Keeletuvastus on ebausaldusväärne lühisisu puhul (vähem kui 200 märki). ";
+$a->strings["Save Settings"] = "Salvesta sätted";
+$a->strings["Language Filter Settings saved."] = "Keelefiltri sätted salvestatud.";
+$a->strings["Filtered language: %s"] = "Filtreeritud keel: %s ";
diff --git a/langfilter/lang/fi-fi/messages.po b/langfilter/lang/fi-fi/messages.po
index 12997059..cbf17aa2 100644
--- a/langfilter/lang/fi-fi/messages.po
+++ b/langfilter/lang/fi-fi/messages.po
@@ -26,8 +26,8 @@ msgstr "Kielisuodatin"
 
 #: langfilter.php:59
 msgid ""
-"This addon tries to identify the language posts are written in. If it does "
-"not match any language specified below, posts will be hidden by collapsing "
+"This addon tries to identify the language posts are writen in. If it does "
+"not match any language specifed below, posts will be hidden by collapsing "
 "them."
 msgstr ""
 
diff --git a/langfilter/lang/fi-fi/strings.php b/langfilter/lang/fi-fi/strings.php
index 1f7f2240..adfda3a1 100644
--- a/langfilter/lang/fi-fi/strings.php
+++ b/langfilter/lang/fi-fi/strings.php
@@ -2,11 +2,18 @@
 
 if(! function_exists("string_plural_select_fi_fi")) {
 function string_plural_select_fi_fi($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Language Filter'] = 'Kielisuodatin';
-$a->strings['Use the language filter'] = 'Ota kielisuodatin käyttöön';
-$a->strings['Save Settings'] = 'Tallenna asetukset';
-$a->strings['Language Filter Settings saved.'] = 'Kielisuodatinasetukset tallennettu';
-$a->strings['Filtered language: %s'] = 'Suodatettu kieli: %s';
+;
+$a->strings["Language Filter"] = "Kielisuodatin";
+$a->strings["This addon tries to identify the language posts are writen in. If it does not match any language specifed below, posts will be hidden by collapsing them."] = "";
+$a->strings["Use the language filter"] = "Ota kielisuodatin käyttöön";
+$a->strings["Able to read"] = "";
+$a->strings["List of abbreviations (iso2 codes) for languages you speak, comma separated. For example \"de,it\"."] = "";
+$a->strings["Minimum confidence in language detection"] = "";
+$a->strings["Minimum confidence in language detection being correct, from 0 to 100. Posts will not be filtered when the confidence of language detection is below this percent value."] = "";
+$a->strings["Minimum length of message body"] = "";
+$a->strings["Minimum number of characters in message body for filter to be used. Posts shorter than this will not be filtered. Note: Language detection is unreliable for short content (<200 characters)."] = "";
+$a->strings["Save Settings"] = "Tallenna asetukset";
+$a->strings["Language Filter Settings saved."] = "Kielisuodatinasetukset tallennettu";
+$a->strings["Filtered language: %s"] = "Suodatettu kieli: %s";
diff --git a/langfilter/lang/fr/messages.po b/langfilter/lang/fr/messages.po
index 0b4c285a..50d411ec 100644
--- a/langfilter/lang/fr/messages.po
+++ b/langfilter/lang/fr/messages.po
@@ -4,76 +4,78 @@
 # 
 # 
 # Translators:
-# Nicolas Derive, 2022
-# ea1cd8241cb389ffb6f92bc6891eff5d_dc12308 <70dced5587d47e18d88f9298024d96f8_93383>, 2015
+# RyDroid <inactive+RyDroid@transifex.com>, 2015
 # Vincent Vindarel <vindarel@mailz.org>, 2018
-# Wil Tur <wiltur@yargl.com>, 2021
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:15-0500\n"
-"PO-Revision-Date: 2015-07-25 08:05+0000\n"
-"Last-Translator: Nicolas Derive, 2022\n"
+"POT-Creation-Date: 2018-04-01 11:11-0400\n"
+"PO-Revision-Date: 2018-05-14 09:47+0000\n"
+"Last-Translator: Vincent Vindarel <vindarel@mailz.org>\n"
 "Language-Team: French (http://www.transifex.com/Friendica/friendica/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fr\n"
-"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: langfilter.php:49
+#: langfilter.php:58
+msgid "Language Filter"
+msgstr "Filtre de langues"
+
+#: langfilter.php:59
 msgid ""
-"This addon tries to identify the language posts are written in. If it does "
-"not match any language specified below, posts will be hidden by collapsing "
+"This addon tries to identify the language posts are writen in. If it does "
+"not match any language specifed below, posts will be hidden by collapsing "
 "them."
-msgstr "Cette extension tente d'identifier la langue dans laquelle les publications sont écrites. Si elle ne correspond à aucune des langues spécifiées ci-dessous, les publications seront repliées afin d'être cachées."
+msgstr "Cette extension essaie de reconnaître la langue dans laquelle les publications sont écrites. Si elle ne correspond à aucune de la liste donnée plus bas, les publications seront réduites."
 
-#: langfilter.php:50
+#: langfilter.php:60
 msgid "Use the language filter"
 msgstr "Utiliser le filtre de langues"
 
-#: langfilter.php:51
+#: langfilter.php:61
 msgid "Able to read"
 msgstr "Peut lire"
 
-#: langfilter.php:51
+#: langfilter.php:61
 msgid ""
-"List of abbreviations (ISO 639-1 codes) for languages you speak, comma "
-"separated. For example \"de,it\"."
-msgstr "Liste des abréviations (codes ISO 639-1) des langues que vous parlez, séparées par des virgules.\nPar exemple \"de,it\"."
+"List of abbreviations (iso2 codes) for languages you speak, comma separated."
+" For example \"de,it\"."
+msgstr "Liste d'abréviations (codes iso2) pour les langues que vous parlez, séparées par des virgules. Par exemple, \"fr,it\"."
 
-#: langfilter.php:52
+#: langfilter.php:62
 msgid "Minimum confidence in language detection"
 msgstr "Confiance minimale dans la détection de langues"
 
-#: langfilter.php:52
+#: langfilter.php:62
 msgid ""
 "Minimum confidence in language detection being correct, from 0 to 100. Posts"
 " will not be filtered when the confidence of language detection is below "
 "this percent value."
 msgstr "Seuil de confiance minimal pour la détection des langues, de 0 à 100. Une publication ne sera pas filtrée si elle est détectée avec une confiance moindre."
 
-#: langfilter.php:53
+#: langfilter.php:63
 msgid "Minimum length of message body"
 msgstr "Longueur minimale du corps de message."
 
-#: langfilter.php:53
+#: langfilter.php:63
 msgid ""
 "Minimum number of characters in message body for filter to be used. Posts "
 "shorter than this will not be filtered. Note: Language detection is "
 "unreliable for short content (<200 characters)."
 msgstr "Nombre minimal de signes dans le corps de message pour déclencher le filtre. Une publication plus courte ne sera pas filtrée. Remarque: la détection de langue n'est pas fiable pour du contenu court (<200 signes)."
 
-#: langfilter.php:58
-msgid "Language Filter"
-msgstr "Filtre de langues"
-
-#: langfilter.php:60
+#: langfilter.php:64
 msgid "Save Settings"
 msgstr "Sauvegarder les paramètres"
 
-#: langfilter.php:193
+#: langfilter.php:105
+msgid "Language Filter Settings saved."
+msgstr "Paramètres du filtre de langues sauvegardés."
+
+#: langfilter.php:182
 #, php-format
 msgid "Filtered language: %s"
 msgstr "Langues filtrées: %s"
diff --git a/langfilter/lang/fr/strings.php b/langfilter/lang/fr/strings.php
index e26a8d44..c8dc633e 100644
--- a/langfilter/lang/fr/strings.php
+++ b/langfilter/lang/fr/strings.php
@@ -3,17 +3,14 @@
 if(! function_exists("string_plural_select_fr")) {
 function string_plural_select_fr($n){
 	$n = intval($n);
-	if (($n == 0 || $n == 1)) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
+	return ($n > 1);;
 }}
-$a->strings['This addon tries to identify the language posts are written in. If it does not match any language specified below, posts will be hidden by collapsing them.'] = 'Cette extension tente d\'identifier la langue dans laquelle les publications sont écrites. Si elle ne correspond à aucune des langues spécifiées ci-dessous, les publications seront repliées afin d\'être cachées.';
-$a->strings['Use the language filter'] = 'Utiliser le filtre de langues';
-$a->strings['Able to read'] = 'Peut lire';
-$a->strings['List of abbreviations (ISO 639-1 codes) for languages you speak, comma separated. For example "de,it".'] = 'Liste des abréviations (codes ISO 639-1) des langues que vous parlez, séparées par des virgules.
-Par exemple "de,it".';
-$a->strings['Minimum confidence in language detection'] = 'Confiance minimale dans la détection de langues';
-$a->strings['Minimum confidence in language detection being correct, from 0 to 100. Posts will not be filtered when the confidence of language detection is below this percent value.'] = 'Seuil de confiance minimal pour la détection des langues, de 0 à 100. Une publication ne sera pas filtrée si elle est détectée avec une confiance moindre.';
-$a->strings['Minimum length of message body'] = 'Longueur minimale du corps de message.';
-$a->strings['Minimum number of characters in message body for filter to be used. Posts shorter than this will not be filtered. Note: Language detection is unreliable for short content (<200 characters).'] = 'Nombre minimal de signes dans le corps de message pour déclencher le filtre. Une publication plus courte ne sera pas filtrée. Remarque: la détection de langue n\'est pas fiable pour du contenu court (<200 signes).';
-$a->strings['Language Filter'] = 'Filtre de langues';
-$a->strings['Save Settings'] = 'Sauvegarder les paramètres';
-$a->strings['Filtered language: %s'] = 'Langues filtrées: %s';
+;
+$a->strings["Language Filter"] = "Filtre de langues";
+$a->strings["This addon tries to identify the language of a postings. If it does not match any language spoken by you (see below) the posting will be collapsed. Remember detecting the language is not perfect, especially with short postings."] = "";
+$a->strings["Use the language filter"] = "Utiliser le filtre de langues";
+$a->strings["I speak"] = "Je parle";
+$a->strings["List of abbreviations for languages you speak, comma seperated. For excample \"de,it\"."] = "Liste d’abréviation des langues que vous maîtrisez, séparés par des virgules. Par exemple \"en,fr\".";
+$a->strings["Save Settings"] = "Sauvegarder les paramètres";
+$a->strings["Language Filter Settings saved."] = "Paramètres du filtre de langues sauvegardés.";
+$a->strings["unspoken language %s - Click to open/close"] = "Langue %s non parlé - Cliquez pour ouvrir/fermer";
diff --git a/langfilter/lang/hu/messages.po b/langfilter/lang/hu/messages.po
deleted file mode 100644
index b41d8732..00000000
--- a/langfilter/lang/hu/messages.po
+++ /dev/null
@@ -1,76 +0,0 @@
-# ADDON langfilter
-# Copyright (C)
-# This file is distributed under the same license as the Friendica langfilter addon package.
-# 
-# 
-# Translators:
-# Balázs Úr, 2020-2021
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:15-0500\n"
-"PO-Revision-Date: 2015-07-25 08:05+0000\n"
-"Last-Translator: Balázs Úr, 2020-2021\n"
-"Language-Team: Hungarian (http://www.transifex.com/Friendica/friendica/language/hu/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: hu\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: langfilter.php:49
-msgid ""
-"This addon tries to identify the language posts are written in. If it does "
-"not match any language specified below, posts will be hidden by collapsing "
-"them."
-msgstr "Ez a bővítmény megpróbálja azonosítani, hogy a bejegyzéseket milyen nyelven írták. Ha nem egyezik egyetlen lent megadott nyelvvel sem, akkor a bejegyzések rejtettek lesznek azáltal, hogy össze lesznek csukva."
-
-#: langfilter.php:50
-msgid "Use the language filter"
-msgstr "A nyelvszűrő használata"
-
-#: langfilter.php:51
-msgid "Able to read"
-msgstr "Képes olvasni"
-
-#: langfilter.php:51
-msgid ""
-"List of abbreviations (ISO 639-1 codes) for languages you speak, comma "
-"separated. For example \"de,it\"."
-msgstr "Az Ön által beszélt nyelvek rövidítéseinek listája (ISO 639-1 kódok) vesszővel elválasztva. Például „de,it”."
-
-#: langfilter.php:52
-msgid "Minimum confidence in language detection"
-msgstr "Legkisebb megbízhatóság a nyelvfelismerésben"
-
-#: langfilter.php:52
-msgid ""
-"Minimum confidence in language detection being correct, from 0 to 100. Posts"
-" will not be filtered when the confidence of language detection is below "
-"this percent value."
-msgstr "A legkisebb megbízhatóság a helyesnek tűnő nyelvfelismerésben 0-tól 100-ig. A bejegyzések nem lesznek szűrve, ha a nyelvfelismerés megbízhatósága ezen százalékérték alatt van."
-
-#: langfilter.php:53
-msgid "Minimum length of message body"
-msgstr "Üzenettörzs legkisebb hossza"
-
-#: langfilter.php:53
-msgid ""
-"Minimum number of characters in message body for filter to be used. Posts "
-"shorter than this will not be filtered. Note: Language detection is "
-"unreliable for short content (<200 characters)."
-msgstr "Az üzenet törzsében lévő karakterek legkisebb száma a használandó szűrőnél. Az ennél rövidebb bejegyzések nem lesznek szűrve. Megjegyzés: a nyelvfelismerés megbízhatatlan a rövid tartalmaknál (200-nál kevesebb karakternél)."
-
-#: langfilter.php:58
-msgid "Language Filter"
-msgstr "Nyelvszűrő"
-
-#: langfilter.php:60
-msgid "Save Settings"
-msgstr "Beállítások mentése"
-
-#: langfilter.php:193
-#, php-format
-msgid "Filtered language: %s"
-msgstr "Szűrt nyelv: %s"
diff --git a/langfilter/lang/hu/strings.php b/langfilter/lang/hu/strings.php
deleted file mode 100644
index 42e05a74..00000000
--- a/langfilter/lang/hu/strings.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_hu")) {
-function string_plural_select_hu($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['This addon tries to identify the language posts are written in. If it does not match any language specified below, posts will be hidden by collapsing them.'] = 'Ez a bővítmény megpróbálja azonosítani, hogy a bejegyzéseket milyen nyelven írták. Ha nem egyezik egyetlen lent megadott nyelvvel sem, akkor a bejegyzések rejtettek lesznek azáltal, hogy össze lesznek csukva.';
-$a->strings['Use the language filter'] = 'A nyelvszűrő használata';
-$a->strings['Able to read'] = 'Képes olvasni';
-$a->strings['List of abbreviations (ISO 639-1 codes) for languages you speak, comma separated. For example "de,it".'] = 'Az Ön által beszélt nyelvek rövidítéseinek listája (ISO 639-1 kódok) vesszővel elválasztva. Például „de,it”.';
-$a->strings['Minimum confidence in language detection'] = 'Legkisebb megbízhatóság a nyelvfelismerésben';
-$a->strings['Minimum confidence in language detection being correct, from 0 to 100. Posts will not be filtered when the confidence of language detection is below this percent value.'] = 'A legkisebb megbízhatóság a helyesnek tűnő nyelvfelismerésben 0-tól 100-ig. A bejegyzések nem lesznek szűrve, ha a nyelvfelismerés megbízhatósága ezen százalékérték alatt van.';
-$a->strings['Minimum length of message body'] = 'Üzenettörzs legkisebb hossza';
-$a->strings['Minimum number of characters in message body for filter to be used. Posts shorter than this will not be filtered. Note: Language detection is unreliable for short content (<200 characters).'] = 'Az üzenet törzsében lévő karakterek legkisebb száma a használandó szűrőnél. Az ennél rövidebb bejegyzések nem lesznek szűrve. Megjegyzés: a nyelvfelismerés megbízhatatlan a rövid tartalmaknál (200-nál kevesebb karakternél).';
-$a->strings['Language Filter'] = 'Nyelvszűrő';
-$a->strings['Save Settings'] = 'Beállítások mentése';
-$a->strings['Filtered language: %s'] = 'Szűrt nyelv: %s';
diff --git a/langfilter/lang/it/messages.po b/langfilter/lang/it/messages.po
index a1dab65a..0f31d911 100644
--- a/langfilter/lang/it/messages.po
+++ b/langfilter/lang/it/messages.po
@@ -6,74 +6,76 @@
 # Translators:
 # fabrixxm <fabrix.xm@gmail.com>, 2015,2018
 # Sandro Santilli <strk@kbt.io>, 2015
-# SickShark X, 2021
-# Sylke Vicious <silkevicious@gmail.com>, 2020-2021
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:15-0500\n"
-"PO-Revision-Date: 2015-07-25 08:05+0000\n"
-"Last-Translator: SickShark X, 2021\n"
-"Language-Team: Italian (http://app.transifex.com/Friendica/friendica/language/it/)\n"
+"POT-Creation-Date: 2018-04-01 11:11-0400\n"
+"PO-Revision-Date: 2018-05-28 09:01+0000\n"
+"Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n"
+"Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: it\n"
-"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: langfilter.php:49
+#: langfilter.php:58
+msgid "Language Filter"
+msgstr "Filtro Lingua"
+
+#: langfilter.php:59
 msgid ""
-"This addon tries to identify the language posts are written in. If it does "
-"not match any language specified below, posts will be hidden by collapsing "
+"This addon tries to identify the language posts are writen in. If it does "
+"not match any language specifed below, posts will be hidden by collapsing "
 "them."
-msgstr "Questo plug-in prova a identificare la lingua con cui sono stati scritti i posts. Se non corrisponde a nessuna delle lingue specificate qui sotto, i post verranno nascosti."
+msgstr "Questo componente aggiuntivo prova ad identificare la lingua usata in un messaggio. Se questa non corrisponde a una delle lingue specificata qui sotto, il messaggio verrà collassato. "
 
-#: langfilter.php:50
+#: langfilter.php:60
 msgid "Use the language filter"
 msgstr "Usa il filtro lingua"
 
-#: langfilter.php:51
+#: langfilter.php:61
 msgid "Able to read"
 msgstr "In grado di leggere"
 
-#: langfilter.php:51
+#: langfilter.php:61
 msgid ""
-"List of abbreviations (ISO 639-1 codes) for languages you speak, comma "
-"separated. For example \"de,it\"."
-msgstr "Lista di abbreviazioni (codici ISO 639-1) per le lingue che parli, separate da virgola. Per esempio \"it,de\"."
+"List of abbreviations (iso2 codes) for languages you speak, comma separated."
+" For example \"de,it\"."
+msgstr "Lista di abbreviazioni (codici iso2) per le lingue che parli, separate da virgola. Per esempio \"it,de\""
 
-#: langfilter.php:52
+#: langfilter.php:62
 msgid "Minimum confidence in language detection"
 msgstr "Fiducia minima nel rilevamento della lingua"
 
-#: langfilter.php:52
+#: langfilter.php:62
 msgid ""
 "Minimum confidence in language detection being correct, from 0 to 100. Posts"
 " will not be filtered when the confidence of language detection is below "
 "this percent value."
-msgstr "Fiducia minima che il rilevamento della lingua sia corretto, da 0 a 100. I messaggi non saranno filtrati quando la fiducia nel rilevamento della lingua è sotto questo valore percentuale."
+msgstr "Fiducia minima che il rilevamento della lingua sia corretto, da 0 a 100. I post non saranno filtrati quando la fiducia nel rilevamento della lingua è sotto questo valore percentuale."
 
-#: langfilter.php:53
+#: langfilter.php:63
 msgid "Minimum length of message body"
 msgstr "Lunghezza minima del corpo del messaggio"
 
-#: langfilter.php:53
+#: langfilter.php:63
 msgid ""
 "Minimum number of characters in message body for filter to be used. Posts "
 "shorter than this will not be filtered. Note: Language detection is "
 "unreliable for short content (<200 characters)."
 msgstr "Numero di caratteri minimo perché il filtro venga usato. I messaggio più corti non saranno filtrati. Nota: la rilevazione della lingua non è affidabile con messaggi brevi (<200 caratteri)"
 
-#: langfilter.php:58
-msgid "Language Filter"
-msgstr "Filtro Lingua"
-
-#: langfilter.php:60
+#: langfilter.php:64
 msgid "Save Settings"
 msgstr "Salva Impostazioni"
 
-#: langfilter.php:193
+#: langfilter.php:105
+msgid "Language Filter Settings saved."
+msgstr "Impostazioni Filtro Lingua salvate."
+
+#: langfilter.php:182
 #, php-format
 msgid "Filtered language: %s"
 msgstr "Lingua filtrata: %s"
diff --git a/langfilter/lang/it/strings.php b/langfilter/lang/it/strings.php
index 8cae0b57..2d7c282a 100644
--- a/langfilter/lang/it/strings.php
+++ b/langfilter/lang/it/strings.php
@@ -3,16 +3,18 @@
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
 	$n = intval($n);
-	if ($n == 1) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
+	return ($n != 1);;
 }}
-$a->strings['This addon tries to identify the language posts are written in. If it does not match any language specified below, posts will be hidden by collapsing them.'] = 'Questo plug-in prova a identificare la lingua con cui sono stati scritti i posts. Se non corrisponde a nessuna delle lingue specificate qui sotto, i post verranno nascosti.';
-$a->strings['Use the language filter'] = 'Usa il filtro lingua';
-$a->strings['Able to read'] = 'In grado di leggere';
-$a->strings['List of abbreviations (ISO 639-1 codes) for languages you speak, comma separated. For example "de,it".'] = 'Lista di abbreviazioni (codici ISO 639-1) per le lingue che parli, separate da virgola. Per esempio "it,de".';
-$a->strings['Minimum confidence in language detection'] = 'Fiducia minima nel rilevamento della lingua';
-$a->strings['Minimum confidence in language detection being correct, from 0 to 100. Posts will not be filtered when the confidence of language detection is below this percent value.'] = 'Fiducia minima che il rilevamento della lingua sia corretto, da 0 a 100. I messaggi non saranno filtrati quando la fiducia nel rilevamento della lingua è sotto questo valore percentuale.';
-$a->strings['Minimum length of message body'] = 'Lunghezza minima del corpo del messaggio';
-$a->strings['Minimum number of characters in message body for filter to be used. Posts shorter than this will not be filtered. Note: Language detection is unreliable for short content (<200 characters).'] = 'Numero di caratteri minimo perché il filtro venga usato. I messaggio più corti non saranno filtrati. Nota: la rilevazione della lingua non è affidabile con messaggi brevi (<200 caratteri)';
-$a->strings['Language Filter'] = 'Filtro Lingua';
-$a->strings['Save Settings'] = 'Salva Impostazioni';
-$a->strings['Filtered language: %s'] = 'Lingua filtrata: %s';
+;
+$a->strings["Language Filter"] = "Filtro Lingua";
+$a->strings["This addon tries to identify the language posts are writen in. If it does not match any language specifed below, posts will be hidden by collapsing them."] = "Questo componente aggiuntivo prova ad identificare la lingua usata in un messaggio. Se questa non corrisponde a una delle lingue specificata qui sotto, il messaggio verrà collassato. ";
+$a->strings["Use the language filter"] = "Usa il filtro lingua";
+$a->strings["Able to read"] = "In grado di leggere";
+$a->strings["List of abbreviations (iso2 codes) for languages you speak, comma separated. For example \"de,it\"."] = "Lista di abbreviazioni (codici iso2) per le lingue che parli, separate da virgola. Per esempio \"it,de\"";
+$a->strings["Minimum confidence in language detection"] = "Fiducia minima nel rilevamento della lingua";
+$a->strings["Minimum confidence in language detection being correct, from 0 to 100. Posts will not be filtered when the confidence of language detection is below this percent value."] = "Fiducia minima che il rilevamento della lingua sia corretto, da 0 a 100. I post non saranno filtrati quando la fiducia nel rilevamento della lingua è sotto questo valore percentuale.";
+$a->strings["Minimum length of message body"] = "Lunghezza minima del corpo del messaggio";
+$a->strings["Minimum number of characters in message body for filter to be used. Posts shorter than this will not be filtered. Note: Language detection is unreliable for short content (<200 characters)."] = "Numero di caratteri minimo perché il filtro venga usato. I messaggio più corti non saranno filtrati. Nota: la rilevazione della lingua non è affidabile con messaggi brevi (<200 caratteri)";
+$a->strings["Save Settings"] = "Salva Impostazioni";
+$a->strings["Language Filter Settings saved."] = "Impostazioni Filtro Lingua salvate.";
+$a->strings["Filtered language: %s"] = "Lingua filtrata: %s";
diff --git a/langfilter/lang/ja/messages.po b/langfilter/lang/ja/messages.po
deleted file mode 100644
index f52451be..00000000
--- a/langfilter/lang/ja/messages.po
+++ /dev/null
@@ -1,76 +0,0 @@
-# ADDON langfilter
-# Copyright (C)
-# This file is distributed under the same license as the Friendica langfilter addon package.
-# 
-# 
-# Translators:
-# XMPPはいいぞ, 2021
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2021-08-12 08:04+0000\n"
-"Last-Translator: XMPPはいいぞ\n"
-"Language-Team: Japanese (http://www.transifex.com/Friendica/friendica/language/ja/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ja\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-
-#: langfilter.php:50
-msgid "Language Filter"
-msgstr "言語フィルタ"
-
-#: langfilter.php:51
-msgid ""
-"This addon tries to identify the language posts are written in. If it does "
-"not match any language specified below, posts will be hidden by collapsing "
-"them."
-msgstr "このアドオンは、投稿が書かれている言語の特定を試みます。以下に指定されたどの言語にも一致しない場合、投稿は折り畳まれて隠されます。"
-
-#: langfilter.php:52
-msgid "Use the language filter"
-msgstr "言語フィルタを使う"
-
-#: langfilter.php:53
-msgid "Able to read"
-msgstr "読める言語"
-
-#: langfilter.php:53
-msgid ""
-"List of abbreviations (ISO 639-1 codes) for languages you speak, comma "
-"separated. For example \"de,it\"."
-msgstr "あなたが話す言語の略語（ISO 639-1コード）の一覧をカンマで区切ってください。例えば、\"de,it\"。"
-
-#: langfilter.php:54
-msgid "Minimum confidence in language detection"
-msgstr "言語検出の最低信頼度"
-
-#: langfilter.php:54
-msgid ""
-"Minimum confidence in language detection being correct, from 0 to 100. Posts"
-" will not be filtered when the confidence of language detection is below "
-"this percent value."
-msgstr "言語検出が正しいことを示す最小の信頼度を0から100までで指定します。言語検出の信頼度がこの百分率の値以下の場合、投稿はフィルタリングされません。"
-
-#: langfilter.php:55
-msgid "Minimum length of message body"
-msgstr "メッセージ本文の最低の長さ"
-
-#: langfilter.php:55
-msgid ""
-"Minimum number of characters in message body for filter to be used. Posts "
-"shorter than this will not be filtered. Note: Language detection is "
-"unreliable for short content (<200 characters)."
-msgstr "フィルタを使用するためのメッセージ本文の最小文字数。これより短い投稿はフィルタリングされません。注：短いコンテンツ（200文字未満）の場合、言語検出は信頼できません。"
-
-#: langfilter.php:56
-msgid "Save Settings"
-msgstr "設定を保存"
-
-#: langfilter.php:187
-#, php-format
-msgid "Filtered language: %s"
-msgstr ""
diff --git a/langfilter/lang/ja/strings.php b/langfilter/lang/ja/strings.php
deleted file mode 100644
index 7d2a256b..00000000
--- a/langfilter/lang/ja/strings.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_ja")) {
-function string_plural_select_ja($n){
-	$n = intval($n);
-	return intval(0);
-}}
-$a->strings['Language Filter'] = '言語フィルタ';
-$a->strings['This addon tries to identify the language posts are written in. If it does not match any language specified below, posts will be hidden by collapsing them.'] = 'このアドオンは、投稿が書かれている言語の特定を試みます。以下に指定されたどの言語にも一致しない場合、投稿は折り畳まれて隠されます。';
-$a->strings['Use the language filter'] = '言語フィルタを使う';
-$a->strings['Able to read'] = '読める言語';
-$a->strings['List of abbreviations (ISO 639-1 codes) for languages you speak, comma separated. For example "de,it".'] = 'あなたが話す言語の略語（ISO 639-1コード）の一覧をカンマで区切ってください。例えば、"de,it"。';
-$a->strings['Minimum confidence in language detection'] = '言語検出の最低信頼度';
-$a->strings['Minimum confidence in language detection being correct, from 0 to 100. Posts will not be filtered when the confidence of language detection is below this percent value.'] = '言語検出が正しいことを示す最小の信頼度を0から100までで指定します。言語検出の信頼度がこの百分率の値以下の場合、投稿はフィルタリングされません。';
-$a->strings['Minimum length of message body'] = 'メッセージ本文の最低の長さ';
-$a->strings['Minimum number of characters in message body for filter to be used. Posts shorter than this will not be filtered. Note: Language detection is unreliable for short content (<200 characters).'] = 'フィルタを使用するためのメッセージ本文の最小文字数。これより短い投稿はフィルタリングされません。注：短いコンテンツ（200文字未満）の場合、言語検出は信頼できません。';
-$a->strings['Save Settings'] = '設定を保存';
diff --git a/langfilter/lang/nb-no/messages.po b/langfilter/lang/nb-no/messages.po
index 2b251db6..f128fba4 100644
--- a/langfilter/lang/nb-no/messages.po
+++ b/langfilter/lang/nb-no/messages.po
@@ -5,16 +5,14 @@
 # 
 # Translators:
 # Haakon Meland Eriksen <haakon.eriksen@far.no>, 2015
-# 9d7045af8ca83a89b1b4bf48a2c67786_a2524de <552015d9a2e1abe6fabe3394a3652575_905986>, 2020
 # Tino <knirchzwerg@web.de>, 2015
-# Tom Aurlund <info@aurlund.no>, 2021
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2021-04-04 22:18+0000\n"
-"Last-Translator: Tom Aurlund <info@aurlund.no>\n"
+"POT-Creation-Date: 2015-07-24 19:11+0200\n"
+"PO-Revision-Date: 2015-09-17 04:48+0000\n"
+"Last-Translator: Haakon Meland Eriksen <haakon.eriksen@far.no>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/Friendica/friendica/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,58 +20,41 @@ msgstr ""
 "Language: nb_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: langfilter.php:50
+#: langfilter.php:43
 msgid "Language Filter"
 msgstr "Språkfilter"
 
-#: langfilter.php:51
+#: langfilter.php:44
 msgid ""
-"This addon tries to identify the language posts are writen in. If it does "
-"not match any language specifed below, posts will be hidden by collapsing "
-"them."
-msgstr "Dette tillegget forsøker å identifisere hvilket språk poster er skrevet i. Hvis det ikke samsvarer med noen av språkene som er spesifisert nedenfor vil postene bli skjult ved at de blir kollapset."
+"This addon tries to identify the language of a postings. If it does not "
+"match any language spoken by you (see below) the posting will be collapsed. "
+"Remember detecting the language is not perfect, especially with short "
+"postings."
+msgstr "Dette tillegg prøver å identifisere innleggets språk. Hvis det ikke passer til noen språk du snakker (se under) inlegget vil bli skjult. Husk at språkidentifiseringen er ikke perfekt, særlig ved korte innlegg!"
 
-#: langfilter.php:52
+#: langfilter.php:45
 msgid "Use the language filter"
 msgstr "Bruk språkfilter"
 
-#: langfilter.php:53
-msgid "Able to read"
-msgstr "I stand til å lese"
+#: langfilter.php:46
+msgid "I speak"
+msgstr "Jeg kan"
 
-#: langfilter.php:53
+#: langfilter.php:46
 msgid ""
-"List of abbreviations (ISO 639-1 codes) for languages you speak, comma "
-"separated. For example \"de,it\"."
-msgstr "Liste over forkortelser (ISO 639-1 koder) for språk du snakker, kommaseparert. For eksempel \"de,it\""
+"List of abbreviations for languages you speak, comma seperated. For excample"
+" \"de,it\"."
+msgstr "Liste med forkortelser for språk du kan, kommaseparert. For eksempel \"no, en\"."
 
-#: langfilter.php:54
-msgid "Minimum confidence in language detection"
-msgstr "Minimum sikkerhet i språkdeteksjon."
-
-#: langfilter.php:54
-msgid ""
-"Minimum confidence in language detection being correct, from 0 to 100. Posts"
-" will not be filtered when the confidence of language detection is below "
-"this percent value."
-msgstr "Minimum sikkerhet for å gi korrekt språkdeteksjon, fra 0 til 100. Poster vil ikke bli filtrert hvis sikkerheten i språkdeteksjonen er lavere enn denne prosentverdien."
-
-#: langfilter.php:55
-msgid "Minimum length of message body"
-msgstr "MInimumslengde for meldingskropp."
-
-#: langfilter.php:55
-msgid ""
-"Minimum number of characters in message body for filter to be used. Posts "
-"shorter than this will not be filtered. Note: Language detection is "
-"unreliable for short content (<200 characters)."
-msgstr "Minimum antall tegn i meldingskropp for å kunne benytte filter. Poster som er kortere enn dette vil ikke bli filtrert. Bemerk: Språkoppdagelse er upålitelig for kort innhold (< 200 tegn)."
-
-#: langfilter.php:56
+#: langfilter.php:47
 msgid "Save Settings"
 msgstr "Lagre innstillinger"
 
-#: langfilter.php:187
+#: langfilter.php:66
+msgid "Language Filter Settings saved."
+msgstr "Språkfilter-innstillinger er lagret."
+
+#: langfilter.php:105
 #, php-format
-msgid "Filtered language: %s"
-msgstr "Filtrert språk: 1 %s"
+msgid "unspoken language %s - Click to open/close"
+msgstr "Uuttalt språk %s - klikk for å åpne/stenge"
diff --git a/langfilter/lang/nb-no/strings.php b/langfilter/lang/nb-no/strings.php
index 222a597b..995e6899 100644
--- a/langfilter/lang/nb-no/strings.php
+++ b/langfilter/lang/nb-no/strings.php
@@ -2,17 +2,14 @@
 
 if(! function_exists("string_plural_select_nb_no")) {
 function string_plural_select_nb_no($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Language Filter'] = 'Språkfilter';
-$a->strings['This addon tries to identify the language posts are writen in. If it does not match any language specifed below, posts will be hidden by collapsing them.'] = 'Dette tillegget forsøker å identifisere hvilket språk poster er skrevet i. Hvis det ikke samsvarer med noen av språkene som er spesifisert nedenfor vil postene bli skjult ved at de blir kollapset.';
-$a->strings['Use the language filter'] = 'Bruk språkfilter';
-$a->strings['Able to read'] = 'I stand til å lese';
-$a->strings['List of abbreviations (ISO 639-1 codes) for languages you speak, comma separated. For example "de,it".'] = 'Liste over forkortelser (ISO 639-1 koder) for språk du snakker, kommaseparert. For eksempel "de,it"';
-$a->strings['Minimum confidence in language detection'] = 'Minimum sikkerhet i språkdeteksjon.';
-$a->strings['Minimum confidence in language detection being correct, from 0 to 100. Posts will not be filtered when the confidence of language detection is below this percent value.'] = 'Minimum sikkerhet for å gi korrekt språkdeteksjon, fra 0 til 100. Poster vil ikke bli filtrert hvis sikkerheten i språkdeteksjonen er lavere enn denne prosentverdien.';
-$a->strings['Minimum length of message body'] = 'MInimumslengde for meldingskropp.';
-$a->strings['Minimum number of characters in message body for filter to be used. Posts shorter than this will not be filtered. Note: Language detection is unreliable for short content (<200 characters).'] = 'Minimum antall tegn i meldingskropp for å kunne benytte filter. Poster som er kortere enn dette vil ikke bli filtrert. Bemerk: Språkoppdagelse er upålitelig for kort innhold (< 200 tegn).';
-$a->strings['Save Settings'] = 'Lagre innstillinger';
-$a->strings['Filtered language: %s'] = 'Filtrert språk: 1 %s';
+;
+$a->strings["Language Filter"] = "Språkfilter";
+$a->strings["This addon tries to identify the language of a postings. If it does not match any language spoken by you (see below) the posting will be collapsed. Remember detecting the language is not perfect, especially with short postings."] = "Dette tillegg prøver å identifisere innleggets språk. Hvis det ikke passer til noen språk du snakker (se under) inlegget vil bli skjult. Husk at språkidentifiseringen er ikke perfekt, særlig ved korte innlegg!";
+$a->strings["Use the language filter"] = "Bruk språkfilter";
+$a->strings["I speak"] = "Jeg kan";
+$a->strings["List of abbreviations for languages you speak, comma seperated. For excample \"de,it\"."] = "Liste med forkortelser for språk du kan, kommaseparert. For eksempel \"no, en\".";
+$a->strings["Save Settings"] = "Lagre innstillinger";
+$a->strings["Language Filter Settings saved."] = "Språkfilter-innstillinger er lagret.";
+$a->strings["unspoken language %s - Click to open/close"] = "Uuttalt språk %s - klikk for å åpne/stenge";
diff --git a/langfilter/lang/nl/messages.po b/langfilter/lang/nl/messages.po
index af33f15a..fd3600c2 100644
--- a/langfilter/lang/nl/messages.po
+++ b/langfilter/lang/nl/messages.po
@@ -27,8 +27,8 @@ msgstr "Taalfilter"
 
 #: langfilter.php:59
 msgid ""
-"This addon tries to identify the language posts are written in. If it does "
-"not match any language specified below, posts will be hidden by collapsing "
+"This addon tries to identify the language posts are writen in. If it does "
+"not match any language specifed below, posts will be hidden by collapsing "
 "them."
 msgstr "Deze addon probeert de taal van berichten automatisch te bepalen. Als de taal van het bericht niet overeenkomt met een taal die jij spreekt zal het bericht worden verborgen. "
 
diff --git a/langfilter/lang/nl/strings.php b/langfilter/lang/nl/strings.php
index c282162e..97ab88e2 100644
--- a/langfilter/lang/nl/strings.php
+++ b/langfilter/lang/nl/strings.php
@@ -3,17 +3,18 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Language Filter'] = 'Taalfilter';
-$a->strings['This addon tries to identify the language posts are written in. If it does not match any language specified below, posts will be hidden by collapsing them.'] = 'Deze addon probeert de taal van berichten automatisch te bepalen. Als de taal van het bericht niet overeenkomt met een taal die jij spreekt zal het bericht worden verborgen. ';
-$a->strings['Use the language filter'] = 'Gebruik de taalfilter';
-$a->strings['Able to read'] = 'Kan lezen';
-$a->strings['List of abbreviations (iso2 codes) for languages you speak, comma separated. For example "de,it".'] = 'Lijst van afkortingen (ISO2 codes) voor talen die jij spreekt, door komma\'s gescheiden. Bijvoorbeeld "de,it".';
-$a->strings['Minimum confidence in language detection'] = 'Minimum betrouwbaarheid in taaldetectie';
-$a->strings['Minimum confidence in language detection being correct, from 0 to 100. Posts will not be filtered when the confidence of language detection is below this percent value.'] = 'Minimum betrouwbaarheid dat de correcte taal word gedetecteerd, van 0 tot 100. Berichten zullen niet worden gefilterd als de betrouwbaarheid lager is dan dit percentage.';
-$a->strings['Minimum length of message body'] = 'Minimum lengte van de berichttekst';
-$a->strings['Minimum number of characters in message body for filter to be used. Posts shorter than this will not be filtered. Note: Language detection is unreliable for short content (<200 characters).'] = 'Minimum aantal letters en leestekens in de berichttekst nodig voor het filter om te werken. Kortere berichten worden niet gefilterd. NB: Taaldetectie is onbetrouwbaar voor korte berichten (<200 letters en leestekens).';
-$a->strings['Save Settings'] = 'Instellingen opslaan';
-$a->strings['Language Filter Settings saved.'] = 'Taalfilter instellingen opgeslagen';
-$a->strings['Filtered language: %s'] = 'Gefilterde taal: %s';
+;
+$a->strings["Language Filter"] = "Taalfilter";
+$a->strings["This addon tries to identify the language posts are writen in. If it does not match any language specifed below, posts will be hidden by collapsing them."] = "Deze addon probeert de taal van berichten automatisch te bepalen. Als de taal van het bericht niet overeenkomt met een taal die jij spreekt zal het bericht worden verborgen. ";
+$a->strings["Use the language filter"] = "Gebruik de taalfilter";
+$a->strings["Able to read"] = "Kan lezen";
+$a->strings["List of abbreviations (iso2 codes) for languages you speak, comma separated. For example \"de,it\"."] = "Lijst van afkortingen (ISO2 codes) voor talen die jij spreekt, door komma's gescheiden. Bijvoorbeeld \"de,it\".";
+$a->strings["Minimum confidence in language detection"] = "Minimum betrouwbaarheid in taaldetectie";
+$a->strings["Minimum confidence in language detection being correct, from 0 to 100. Posts will not be filtered when the confidence of language detection is below this percent value."] = "Minimum betrouwbaarheid dat de correcte taal word gedetecteerd, van 0 tot 100. Berichten zullen niet worden gefilterd als de betrouwbaarheid lager is dan dit percentage.";
+$a->strings["Minimum length of message body"] = "Minimum lengte van de berichttekst";
+$a->strings["Minimum number of characters in message body for filter to be used. Posts shorter than this will not be filtered. Note: Language detection is unreliable for short content (<200 characters)."] = "Minimum aantal letters en leestekens in de berichttekst nodig voor het filter om te werken. Kortere berichten worden niet gefilterd. NB: Taaldetectie is onbetrouwbaar voor korte berichten (<200 letters en leestekens).";
+$a->strings["Save Settings"] = "Instellingen opslaan";
+$a->strings["Language Filter Settings saved."] = "Taalfilter instellingen opgeslagen";
+$a->strings["Filtered language: %s"] = "Gefilterde taal: %s";
diff --git a/langfilter/lang/pl/messages.po b/langfilter/lang/pl/messages.po
index d7cacf9c..000811b7 100644
--- a/langfilter/lang/pl/messages.po
+++ b/langfilter/lang/pl/messages.po
@@ -4,15 +4,14 @@
 # 
 # 
 # Translators:
-# Piotr Strębski <strebski@gmail.com>, 2022
-# Waldemar Stoczkowski, 2018
+# Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:15-0500\n"
-"PO-Revision-Date: 2015-07-25 08:05+0000\n"
-"Last-Translator: Piotr Strębski <strebski@gmail.com>, 2022\n"
+"POT-Creation-Date: 2018-04-01 11:11-0400\n"
+"PO-Revision-Date: 2018-08-04 11:31+0000\n"
+"Last-Translator: Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.com/Friendica/friendica/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,58 +19,62 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
-#: langfilter.php:49
-msgid ""
-"This addon tries to identify the language posts are written in. If it does "
-"not match any language specified below, posts will be hidden by collapsing "
-"them."
-msgstr "Ten dodatek próbuje zidentyfikować wpisy językowe, które są zapisywane. Jeśli nie pasuje do żadnego z języków określonych poniżej, wpisy będą ukrywane przez ich zwijanie."
+#: langfilter.php:58
+msgid "Language Filter"
+msgstr "Filtr językowy"
 
-#: langfilter.php:50
+#: langfilter.php:59
+msgid ""
+"This addon tries to identify the language posts are writen in. If it does "
+"not match any language specifed below, posts will be hidden by collapsing "
+"them."
+msgstr "Ten dodatek próbuje zidentyfikować posty językowe, które są zapisywane. Jeśli nie pasuje do żadnego z języków określonych poniżej, posty będą ukrywane przez ich zwijanie."
+
+#: langfilter.php:60
 msgid "Use the language filter"
 msgstr "Użyj filtru językowego"
 
-#: langfilter.php:51
+#: langfilter.php:61
 msgid "Able to read"
 msgstr "Może odczytać"
 
-#: langfilter.php:51
+#: langfilter.php:61
 msgid ""
-"List of abbreviations (ISO 639-1 codes) for languages you speak, comma "
-"separated. For example \"de,it\"."
-msgstr "Lista skrótów (kody ISO 639-1) dla języków, które znasz, oddzielonych przecinkami. Na przykład \"pl,de,it\"."
+"List of abbreviations (iso2 codes) for languages you speak, comma separated."
+" For example \"de,it\"."
+msgstr "Lista skrótów (kodów iso2) dla języków, które znasz, oddzielonych przecinkami. Na przykład \"pl,de,it\"."
 
-#: langfilter.php:52
+#: langfilter.php:62
 msgid "Minimum confidence in language detection"
 msgstr "Minimalne zaufanie do wykrywania języka"
 
-#: langfilter.php:52
+#: langfilter.php:62
 msgid ""
 "Minimum confidence in language detection being correct, from 0 to 100. Posts"
 " will not be filtered when the confidence of language detection is below "
 "this percent value."
 msgstr "Minimalne zaufanie do wykrywania języka jest poprawne, od 0 do 100. Wpisy nie będą filtrowane, gdy pewność wykrycia języka jest poniżej tej wartości procentowej."
 
-#: langfilter.php:53
+#: langfilter.php:63
 msgid "Minimum length of message body"
 msgstr "Minimalna długość treści wiadomości"
 
-#: langfilter.php:53
+#: langfilter.php:63
 msgid ""
 "Minimum number of characters in message body for filter to be used. Posts "
 "shorter than this will not be filtered. Note: Language detection is "
 "unreliable for short content (<200 characters)."
 msgstr "Minimalna liczba znaków w treści wiadomości dla używanego filtra. Wpisy krótsze niż te nie będą filtrowane. Uwaga: Wykrywanie języka nie jest wiarygodne dla krótkiej treści (<200 znaków)."
 
-#: langfilter.php:58
-msgid "Language Filter"
-msgstr "Filtr językowy"
-
-#: langfilter.php:60
+#: langfilter.php:64
 msgid "Save Settings"
 msgstr "Zapisz ustawienia"
 
-#: langfilter.php:193
+#: langfilter.php:105
+msgid "Language Filter Settings saved."
+msgstr "Ustawienia filtra języka zostały zapisane."
+
+#: langfilter.php:182
 #, php-format
 msgid "Filtered language: %s"
 msgstr "Język filtrowany: %s"
diff --git a/langfilter/lang/pl/strings.php b/langfilter/lang/pl/strings.php
index 39a44625..37e45659 100644
--- a/langfilter/lang/pl/strings.php
+++ b/langfilter/lang/pl/strings.php
@@ -3,16 +3,18 @@
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
 	$n = intval($n);
-	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
+	return ($n==1 ? 0 : ($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14) ? 1 : $n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14) ? 2 : 3);;
 }}
-$a->strings['This addon tries to identify the language posts are written in. If it does not match any language specified below, posts will be hidden by collapsing them.'] = 'Ten dodatek próbuje zidentyfikować wpisy językowe, które są zapisywane. Jeśli nie pasuje do żadnego z języków określonych poniżej, wpisy będą ukrywane przez ich zwijanie.';
-$a->strings['Use the language filter'] = 'Użyj filtru językowego';
-$a->strings['Able to read'] = 'Może odczytać';
-$a->strings['List of abbreviations (ISO 639-1 codes) for languages you speak, comma separated. For example "de,it".'] = 'Lista skrótów (kody ISO 639-1) dla języków, które znasz, oddzielonych przecinkami. Na przykład "pl,de,it".';
-$a->strings['Minimum confidence in language detection'] = 'Minimalne zaufanie do wykrywania języka';
-$a->strings['Minimum confidence in language detection being correct, from 0 to 100. Posts will not be filtered when the confidence of language detection is below this percent value.'] = 'Minimalne zaufanie do wykrywania języka jest poprawne, od 0 do 100. Wpisy nie będą filtrowane, gdy pewność wykrycia języka jest poniżej tej wartości procentowej.';
-$a->strings['Minimum length of message body'] = 'Minimalna długość treści wiadomości';
-$a->strings['Minimum number of characters in message body for filter to be used. Posts shorter than this will not be filtered. Note: Language detection is unreliable for short content (<200 characters).'] = 'Minimalna liczba znaków w treści wiadomości dla używanego filtra. Wpisy krótsze niż te nie będą filtrowane. Uwaga: Wykrywanie języka nie jest wiarygodne dla krótkiej treści (<200 znaków).';
-$a->strings['Language Filter'] = 'Filtr językowy';
-$a->strings['Save Settings'] = 'Zapisz ustawienia';
-$a->strings['Filtered language: %s'] = 'Język filtrowany: %s';
+;
+$a->strings["Language Filter"] = "Filtr językowy";
+$a->strings["This addon tries to identify the language posts are writen in. If it does not match any language specifed below, posts will be hidden by collapsing them."] = "Ten dodatek próbuje zidentyfikować posty językowe, które są zapisywane. Jeśli nie pasuje do żadnego z języków określonych poniżej, posty będą ukrywane przez ich zwijanie.";
+$a->strings["Use the language filter"] = "Użyj filtru językowego";
+$a->strings["Able to read"] = "Może odczytać";
+$a->strings["List of abbreviations (iso2 codes) for languages you speak, comma separated. For example \"de,it\"."] = "Lista skrótów (kodów iso2) dla języków, które znasz, oddzielonych przecinkami. Na przykład \"pl,de,it\".";
+$a->strings["Minimum confidence in language detection"] = "Minimalne zaufanie do wykrywania języka";
+$a->strings["Minimum confidence in language detection being correct, from 0 to 100. Posts will not be filtered when the confidence of language detection is below this percent value."] = "Minimalne zaufanie do wykrywania języka jest poprawne, od 0 do 100. Wpisy nie będą filtrowane, gdy pewność wykrycia języka jest poniżej tej wartości procentowej.";
+$a->strings["Minimum length of message body"] = "Minimalna długość treści wiadomości";
+$a->strings["Minimum number of characters in message body for filter to be used. Posts shorter than this will not be filtered. Note: Language detection is unreliable for short content (<200 characters)."] = "Minimalna liczba znaków w treści wiadomości dla używanego filtra. Wpisy krótsze niż te nie będą filtrowane. Uwaga: Wykrywanie języka nie jest wiarygodne dla krótkiej treści (<200 znaków).";
+$a->strings["Save Settings"] = "Zapisz ustawienia";
+$a->strings["Language Filter Settings saved."] = "Ustawienia filtra języka zostały zapisane.";
+$a->strings["Filtered language: %s"] = "Język filtrowany: %s";
diff --git a/langfilter/lang/pt-br/messages.po b/langfilter/lang/pt-br/messages.po
index a987976d..46149a53 100644
--- a/langfilter/lang/pt-br/messages.po
+++ b/langfilter/lang/pt-br/messages.po
@@ -25,8 +25,8 @@ msgstr "Filtro de Idiomas"
 
 #: langfilter.php:59
 msgid ""
-"This addon tries to identify the language posts are written in. If it does "
-"not match any language specified below, posts will be hidden by collapsing "
+"This addon tries to identify the language posts are writen in. If it does "
+"not match any language specifed below, posts will be hidden by collapsing "
 "them."
 msgstr "Este complemento tenta identificar a língua em que as publicações são escritas. Uma publicação que não se encaixe em nenhum dos idiomas especificados abaixo será ocultada por colapsamento."
 
diff --git a/langfilter/lang/pt-br/strings.php b/langfilter/lang/pt-br/strings.php
index eb816a5c..bddcc210 100644
--- a/langfilter/lang/pt-br/strings.php
+++ b/langfilter/lang/pt-br/strings.php
@@ -3,17 +3,18 @@
 if(! function_exists("string_plural_select_pt_br")) {
 function string_plural_select_pt_br($n){
 	$n = intval($n);
-	return intval($n > 1);
+	return ($n > 1);;
 }}
-$a->strings['Language Filter'] = 'Filtro de Idiomas';
-$a->strings['This addon tries to identify the language posts are written in. If it does not match any language specified below, posts will be hidden by collapsing them.'] = 'Este complemento tenta identificar a língua em que as publicações são escritas. Uma publicação que não se encaixe em nenhum dos idiomas especificados abaixo será ocultada por colapsamento.';
-$a->strings['Use the language filter'] = 'Usar o filtro de idiomas';
-$a->strings['Able to read'] = 'Falo';
-$a->strings['List of abbreviations (iso2 codes) for languages you speak, comma separated. For example "de,it".'] = 'Lista de abreviações (códigos ISO 2) para as línguas que você fala, separadas por vírgula. Por exemplo, "de,it".';
-$a->strings['Minimum confidence in language detection'] = 'Confiança mínima na detecção do idioma';
-$a->strings['Minimum confidence in language detection being correct, from 0 to 100. Posts will not be filtered when the confidence of language detection is below this percent value.'] = 'Confiança mínima na exatidão da detecção do idioma, de 0 a 100. As publicações não serão filtradas quando a confiança na detecção do idioma estiver abaixo desta porcentagem.';
-$a->strings['Minimum length of message body'] = 'Tamanho mínimo do corpo da mensagem';
-$a->strings['Minimum number of characters in message body for filter to be used. Posts shorter than this will not be filtered. Note: Language detection is unreliable for short content (<200 characters).'] = 'Número mínimo de caracteres no corpo da mensagem para aplicação do filtro. As publicações mais curtas que o estipulado não serão filtradas. Atenção: a detecção de idiomas não é confiável para conteúdos curtos (< 200 caracteres).';
-$a->strings['Save Settings'] = 'Salvar configurações';
-$a->strings['Language Filter Settings saved.'] = 'Configurações do Filtro de Idiomas salvas.';
-$a->strings['Filtered language: %s'] = 'Idioma filtrado: %s';
+;
+$a->strings["Language Filter"] = "Filtro de Idiomas";
+$a->strings["This addon tries to identify the language posts are writen in. If it does not match any language specifed below, posts will be hidden by collapsing them."] = "Este complemento tenta identificar a língua em que as publicações são escritas. Uma publicação que não se encaixe em nenhum dos idiomas especificados abaixo será ocultada por colapsamento.";
+$a->strings["Use the language filter"] = "Usar o filtro de idiomas";
+$a->strings["Able to read"] = "Falo";
+$a->strings["List of abbreviations (iso2 codes) for languages you speak, comma separated. For example \"de,it\"."] = "Lista de abreviações (códigos ISO 2) para as línguas que você fala, separadas por vírgula. Por exemplo, \"de,it\".";
+$a->strings["Minimum confidence in language detection"] = "Confiança mínima na detecção do idioma";
+$a->strings["Minimum confidence in language detection being correct, from 0 to 100. Posts will not be filtered when the confidence of language detection is below this percent value."] = "Confiança mínima na exatidão da detecção do idioma, de 0 a 100. As publicações não serão filtradas quando a confiança na detecção do idioma estiver abaixo desta porcentagem.";
+$a->strings["Minimum length of message body"] = "Tamanho mínimo do corpo da mensagem";
+$a->strings["Minimum number of characters in message body for filter to be used. Posts shorter than this will not be filtered. Note: Language detection is unreliable for short content (<200 characters)."] = "Número mínimo de caracteres no corpo da mensagem para aplicação do filtro. As publicações mais curtas que o estipulado não serão filtradas. Atenção: a detecção de idiomas não é confiável para conteúdos curtos (< 200 caracteres).";
+$a->strings["Save Settings"] = "Salvar configurações";
+$a->strings["Language Filter Settings saved."] = "Configurações do Filtro de Idiomas salvas.";
+$a->strings["Filtered language: %s"] = "Idioma filtrado: %s";
diff --git a/langfilter/lang/ru/messages.po b/langfilter/lang/ru/messages.po
index 45ad7b3d..22a9f9f8 100644
--- a/langfilter/lang/ru/messages.po
+++ b/langfilter/lang/ru/messages.po
@@ -4,74 +4,77 @@
 # 
 # 
 # Translators:
-# Alexander An <ravnina@gmail.com>, 2020,2023
 # Stanislav N. <pztrn@pztrn.name>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:15-0500\n"
-"PO-Revision-Date: 2015-07-25 08:05+0000\n"
-"Last-Translator: Alexander An <ravnina@gmail.com>, 2020,2023\n"
-"Language-Team: Russian (http://app.transifex.com/Friendica/friendica/language/ru/)\n"
+"POT-Creation-Date: 2018-04-01 11:11-0400\n"
+"PO-Revision-Date: 2018-05-24 23:59+0000\n"
+"Last-Translator: Stanislav N. <pztrn@pztrn.name>\n"
+"Language-Team: Russian (http://www.transifex.com/Friendica/friendica/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ru\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
-#: langfilter.php:49
-msgid ""
-"This addon tries to identify the language posts are written in. If it does "
-"not match any language specified below, posts will be hidden by collapsing "
-"them."
-msgstr "Это дополнение пытается идентифицировать язык, на котором сделаны записи. Если язык не соответствует ни одному, указанному ниже, то такие посты будут свёрнуты."
-
-#: langfilter.php:50
-msgid "Use the language filter"
-msgstr "Использовать языковой фильтр"
-
-#: langfilter.php:51
-msgid "Able to read"
-msgstr "Возможность читать"
-
-#: langfilter.php:51
-msgid ""
-"List of abbreviations (ISO 639-1 codes) for languages you speak, comma "
-"separated. For example \"de,it\"."
-msgstr "Список аббревиатур (кодов по ISO 639-1 ) для языков, на которых вы говорите. Например, \"ru,en\"."
-
-#: langfilter.php:52
-msgid "Minimum confidence in language detection"
-msgstr "Минимальная уверенность в определении языка"
-
-#: langfilter.php:52
-msgid ""
-"Minimum confidence in language detection being correct, from 0 to 100. Posts"
-" will not be filtered when the confidence of language detection is below "
-"this percent value."
-msgstr "Минимальная уверенность в правильном определении языка, от 0 до 100. Посты не будут скрыты, если уверенность в правильном определении языка в процентах ниже этого значения."
-
-#: langfilter.php:53
-msgid "Minimum length of message body"
-msgstr "Минимальная длина тела сообщения"
-
-#: langfilter.php:53
-msgid ""
-"Minimum number of characters in message body for filter to be used. Posts "
-"shorter than this will not be filtered. Note: Language detection is "
-"unreliable for short content (<200 characters)."
-msgstr "Минимальное количество знаков в теле сообщения для применения фильтрации. Посты, длина которых меньше указанного значения, не будут отфильтрованы. Обратите внимание, что определение языка работает ненадежно для небольших постов (<200 символов)."
-
 #: langfilter.php:58
 msgid "Language Filter"
 msgstr "Языковой фильтр"
 
+#: langfilter.php:59
+msgid ""
+"This addon tries to identify the language posts are writen in. If it does "
+"not match any language specifed below, posts will be hidden by collapsing "
+"them."
+msgstr "Это дополнение пытается идентифицировать язык, на котором написаны посты. Если язык не соответствует ни одному, указанному ниже, то такие посты будут скрыты."
+
 #: langfilter.php:60
+msgid "Use the language filter"
+msgstr "Использовать языковой фильтр"
+
+#: langfilter.php:61
+msgid "Able to read"
+msgstr "Возможность читать"
+
+#: langfilter.php:61
+msgid ""
+"List of abbreviations (iso2 codes) for languages you speak, comma separated."
+" For example \"de,it\"."
+msgstr "Список аббериватур (кодов по iso2) для языков, на которых вы говорите. Например, \"ru,en\"."
+
+#: langfilter.php:62
+msgid "Minimum confidence in language detection"
+msgstr "Минимальная уверенность в детектировании языка"
+
+#: langfilter.php:62
+msgid ""
+"Minimum confidence in language detection being correct, from 0 to 100. Posts"
+" will not be filtered when the confidence of language detection is below "
+"this percent value."
+msgstr "Минимальная уверенность в правильном детектировании языка, от 0 до 100. Посты не будут скрыты, если уверенность в правильном детектировании языка в процентах ниже этого значения."
+
+#: langfilter.php:63
+msgid "Minimum length of message body"
+msgstr "Минимальная длина тела сообщения"
+
+#: langfilter.php:63
+msgid ""
+"Minimum number of characters in message body for filter to be used. Posts "
+"shorter than this will not be filtered. Note: Language detection is "
+"unreliable for short content (<200 characters)."
+msgstr "Минимальное количество знаков в теле сообщения для применения фильтрации. Посты, длина которых меньше указанного значения, не будут отфильтрованы. Обратите внимание, что детектирование языка работает ненадежно для небольших постов (<200 символов)."
+
+#: langfilter.php:64
 msgid "Save Settings"
 msgstr "Сохранить настройки"
 
-#: langfilter.php:193
+#: langfilter.php:105
+msgid "Language Filter Settings saved."
+msgstr "Настройки фильтрации языков сохранены."
+
+#: langfilter.php:182
 #, php-format
 msgid "Filtered language: %s"
 msgstr "Отфильтрованный язык: %s"
diff --git a/langfilter/lang/ru/strings.php b/langfilter/lang/ru/strings.php
index 1f5619f7..33c34e54 100644
--- a/langfilter/lang/ru/strings.php
+++ b/langfilter/lang/ru/strings.php
@@ -3,16 +3,18 @@
 if(! function_exists("string_plural_select_ru")) {
 function string_plural_select_ru($n){
 	$n = intval($n);
-	if ($n%10==1 && $n%100!=11) { return 0; } else if ($n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14)) { return 1; } else if ($n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)) { return 2; } else  { return 3; }
+	return ($n%10==1 && $n%100!=11 ? 0 : $n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14) ? 1 : $n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)? 2 : 3);;
 }}
-$a->strings['This addon tries to identify the language posts are written in. If it does not match any language specified below, posts will be hidden by collapsing them.'] = 'Это дополнение пытается идентифицировать язык, на котором сделаны записи. Если язык не соответствует ни одному, указанному ниже, то такие посты будут свёрнуты.';
-$a->strings['Use the language filter'] = 'Использовать языковой фильтр';
-$a->strings['Able to read'] = 'Возможность читать';
-$a->strings['List of abbreviations (ISO 639-1 codes) for languages you speak, comma separated. For example "de,it".'] = 'Список аббревиатур (кодов по ISO 639-1 ) для языков, на которых вы говорите. Например, "ru,en".';
-$a->strings['Minimum confidence in language detection'] = 'Минимальная уверенность в определении языка';
-$a->strings['Minimum confidence in language detection being correct, from 0 to 100. Posts will not be filtered when the confidence of language detection is below this percent value.'] = 'Минимальная уверенность в правильном определении языка, от 0 до 100. Посты не будут скрыты, если уверенность в правильном определении языка в процентах ниже этого значения.';
-$a->strings['Minimum length of message body'] = 'Минимальная длина тела сообщения';
-$a->strings['Minimum number of characters in message body for filter to be used. Posts shorter than this will not be filtered. Note: Language detection is unreliable for short content (<200 characters).'] = 'Минимальное количество знаков в теле сообщения для применения фильтрации. Посты, длина которых меньше указанного значения, не будут отфильтрованы. Обратите внимание, что определение языка работает ненадежно для небольших постов (<200 символов).';
-$a->strings['Language Filter'] = 'Языковой фильтр';
-$a->strings['Save Settings'] = 'Сохранить настройки';
-$a->strings['Filtered language: %s'] = 'Отфильтрованный язык: %s';
+;
+$a->strings["Language Filter"] = "Языковой фильтр";
+$a->strings["This addon tries to identify the language posts are writen in. If it does not match any language specifed below, posts will be hidden by collapsing them."] = "Это дополнение пытается идентифицировать язык, на котором написаны посты. Если язык не соответствует ни одному, указанному ниже, то такие посты будут скрыты.";
+$a->strings["Use the language filter"] = "Использовать языковой фильтр";
+$a->strings["Able to read"] = "Возможность читать";
+$a->strings["List of abbreviations (iso2 codes) for languages you speak, comma separated. For example \"de,it\"."] = "Список аббериватур (кодов по iso2) для языков, на которых вы говорите. Например, \"ru,en\".";
+$a->strings["Minimum confidence in language detection"] = "Минимальная уверенность в детектировании языка";
+$a->strings["Minimum confidence in language detection being correct, from 0 to 100. Posts will not be filtered when the confidence of language detection is below this percent value."] = "Минимальная уверенность в правильном детектировании языка, от 0 до 100. Посты не будут скрыты, если уверенность в правильном детектировании языка в процентах ниже этого значения.";
+$a->strings["Minimum length of message body"] = "Минимальная длина тела сообщения";
+$a->strings["Minimum number of characters in message body for filter to be used. Posts shorter than this will not be filtered. Note: Language detection is unreliable for short content (<200 characters)."] = "Минимальное количество знаков в теле сообщения для применения фильтрации. Посты, длина которых меньше указанного значения, не будут отфильтрованы. Обратите внимание, что детектирование языка работает ненадежно для небольших постов (<200 символов).";
+$a->strings["Save Settings"] = "Сохранить настройки";
+$a->strings["Language Filter Settings saved."] = "Настройки фильтрации языков сохранены.";
+$a->strings["Filtered language: %s"] = "Отфильтрованный язык: %s";
diff --git a/langfilter/lang/sv/messages.po b/langfilter/lang/sv/messages.po
index 7a1c4bf6..9ce3a202 100644
--- a/langfilter/lang/sv/messages.po
+++ b/langfilter/lang/sv/messages.po
@@ -5,15 +5,14 @@
 # 
 # Translators:
 # Tim Stahel <transifex@swedneck.xyz>, 2019
-# Bjoessi <torbjorn.andersson@syte.se>, 2019
-# Viktor Nilsson, 2022
+# Torbjörn Andersson <torbjorn.andersson@syte.se>, 2019
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:15-0500\n"
-"PO-Revision-Date: 2015-07-25 08:05+0000\n"
-"Last-Translator: Viktor Nilsson, 2022\n"
+"POT-Creation-Date: 2018-04-01 11:11-0400\n"
+"PO-Revision-Date: 2019-03-21 18:01+0000\n"
+"Last-Translator: Torbjörn Andersson <torbjorn.andersson@syte.se>\n"
 "Language-Team: Swedish (http://www.transifex.com/Friendica/friendica/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,58 +20,62 @@ msgstr ""
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: langfilter.php:49
-msgid ""
-"This addon tries to identify the language posts are written in. If it does "
-"not match any language specified below, posts will be hidden by collapsing "
-"them."
-msgstr "Detta tillägg försöker identifiera vilket språk inlägg är skrivna i. Om det inte matchar ett språk specificerat nedan så göms inlägget genom att kollapsa det."
+#: langfilter.php:58
+msgid "Language Filter"
+msgstr "Språkfilter"
 
-#: langfilter.php:50
+#: langfilter.php:59
+msgid ""
+"This addon tries to identify the language posts are writen in. If it does "
+"not match any language specifed below, posts will be hidden by collapsing "
+"them."
+msgstr "Detta tillägg försöker identifiera vilket språk inlägg är skrivna i. Om det inte matchar ett språk specifierat nedan så göms inlägg genom att kollapsa dem."
+
+#: langfilter.php:60
 msgid "Use the language filter"
 msgstr "Använd språkfiltret"
 
-#: langfilter.php:51
+#: langfilter.php:61
 msgid "Able to read"
 msgstr "Kan läsa"
 
-#: langfilter.php:51
+#: langfilter.php:61
 msgid ""
-"List of abbreviations (ISO 639-1 codes) for languages you speak, comma "
-"separated. For example \"de,it\"."
-msgstr "Lista över förkortningar (ISO 639-1-koder) för språk du använder, separerade med kommatecken. Exempel: \"de, it\"."
+"List of abbreviations (iso2 codes) for languages you speak, comma separated."
+" For example \"de,it\"."
+msgstr "Lista av förkortningar (iso2 koder) för spåk du pratar, separerade av kommatecken. Exempel: \"de, it\"."
 
-#: langfilter.php:52
+#: langfilter.php:62
 msgid "Minimum confidence in language detection"
 msgstr "Minsta förtroende i språkigenkänning"
 
-#: langfilter.php:52
+#: langfilter.php:62
 msgid ""
 "Minimum confidence in language detection being correct, from 0 to 100. Posts"
 " will not be filtered when the confidence of language detection is below "
 "this percent value."
 msgstr "Minsta förtroende i att språkigenkänningen är korrekt, från 0 till 100.\nInlägg filtreras inte när förtroendet i språkigenkänningen är under detta procentvärde."
 
-#: langfilter.php:53
+#: langfilter.php:63
 msgid "Minimum length of message body"
 msgstr "Minsta längd på meddelandetext"
 
-#: langfilter.php:53
+#: langfilter.php:63
 msgid ""
 "Minimum number of characters in message body for filter to be used. Posts "
 "shorter than this will not be filtered. Note: Language detection is "
 "unreliable for short content (<200 characters)."
-msgstr "Minsta antal tecken i meddelandetext för att ett filter ska användas. Inlägg kortare än detta kommer inte att filtreras. Notera: Språkigenkänning är inte tillförlitligt på korta texter (<200 tecken)."
+msgstr "Minsta antal tecken i meddelande text för att ett filter ska användas. Inlägg kortare än detta kommer inte filtreras. Notera: Språkigenkänning är inte tillförlitligt på korta texter (<200 tecken)."
 
-#: langfilter.php:58
-msgid "Language Filter"
-msgstr "Språkfilter"
-
-#: langfilter.php:60
+#: langfilter.php:64
 msgid "Save Settings"
 msgstr "Spara inställningar"
 
-#: langfilter.php:193
+#: langfilter.php:105
+msgid "Language Filter Settings saved."
+msgstr "Inställningar för språkfilter sparade."
+
+#: langfilter.php:182
 #, php-format
 msgid "Filtered language: %s"
 msgstr "Filtrerat språk: %s"
diff --git a/langfilter/lang/sv/strings.php b/langfilter/lang/sv/strings.php
index aba68422..3274e98b 100644
--- a/langfilter/lang/sv/strings.php
+++ b/langfilter/lang/sv/strings.php
@@ -3,17 +3,18 @@
 if(! function_exists("string_plural_select_sv")) {
 function string_plural_select_sv($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['This addon tries to identify the language posts are written in. If it does not match any language specified below, posts will be hidden by collapsing them.'] = 'Detta tillägg försöker identifiera vilket språk inlägg är skrivna i. Om det inte matchar ett språk specificerat nedan så göms inlägget genom att kollapsa det.';
-$a->strings['Use the language filter'] = 'Använd språkfiltret';
-$a->strings['Able to read'] = 'Kan läsa';
-$a->strings['List of abbreviations (ISO 639-1 codes) for languages you speak, comma separated. For example "de,it".'] = 'Lista över förkortningar (ISO 639-1-koder) för språk du använder, separerade med kommatecken. Exempel: "de, it".';
-$a->strings['Minimum confidence in language detection'] = 'Minsta förtroende i språkigenkänning';
-$a->strings['Minimum confidence in language detection being correct, from 0 to 100. Posts will not be filtered when the confidence of language detection is below this percent value.'] = 'Minsta förtroende i att språkigenkänningen är korrekt, från 0 till 100.
-Inlägg filtreras inte när förtroendet i språkigenkänningen är under detta procentvärde.';
-$a->strings['Minimum length of message body'] = 'Minsta längd på meddelandetext';
-$a->strings['Minimum number of characters in message body for filter to be used. Posts shorter than this will not be filtered. Note: Language detection is unreliable for short content (<200 characters).'] = 'Minsta antal tecken i meddelandetext för att ett filter ska användas. Inlägg kortare än detta kommer inte att filtreras. Notera: Språkigenkänning är inte tillförlitligt på korta texter (<200 tecken).';
-$a->strings['Language Filter'] = 'Språkfilter';
-$a->strings['Save Settings'] = 'Spara inställningar';
-$a->strings['Filtered language: %s'] = 'Filtrerat språk: %s';
+;
+$a->strings["Language Filter"] = "Språkfilter";
+$a->strings["This addon tries to identify the language posts are writen in. If it does not match any language specifed below, posts will be hidden by collapsing them."] = "Detta tillägg försöker identifiera vilket språk inlägg är skrivna i. Om det inte matchar ett språk specifierat nedan så göms inlägg genom att kollapsa dem.";
+$a->strings["Use the language filter"] = "Använd språkfiltret";
+$a->strings["Able to read"] = "Kan läsa";
+$a->strings["List of abbreviations (iso2 codes) for languages you speak, comma separated. For example \"de,it\"."] = "Lista av förkortningar (iso2 koder) för spåk du pratar, separerade av kommatecken. Exempel: \"de, it\".";
+$a->strings["Minimum confidence in language detection"] = "Minsta förtroende i språkigenkänning";
+$a->strings["Minimum confidence in language detection being correct, from 0 to 100. Posts will not be filtered when the confidence of language detection is below this percent value."] = "Minsta förtroende i att språkigenkänningen är korrekt, från 0 till 100.\nInlägg filtreras inte när förtroendet i språkigenkänningen är under detta procentvärde.";
+$a->strings["Minimum length of message body"] = "Minsta längd på meddelandetext";
+$a->strings["Minimum number of characters in message body for filter to be used. Posts shorter than this will not be filtered. Note: Language detection is unreliable for short content (<200 characters)."] = "Minsta antal tecken i meddelande text för att ett filter ska användas. Inlägg kortare än detta kommer inte filtreras. Notera: Språkigenkänning är inte tillförlitligt på korta texter (<200 tecken).";
+$a->strings["Save Settings"] = "Spara inställningar";
+$a->strings["Language Filter Settings saved."] = "Inställningar för språkfilter sparade.";
+$a->strings["Filtered language: %s"] = "Filtrerat språk: %s";
diff --git a/langfilter/lang/zh-cn/messages.po b/langfilter/lang/zh-cn/messages.po
index c55a8edb..de4871a3 100644
--- a/langfilter/lang/zh-cn/messages.po
+++ b/langfilter/lang/zh-cn/messages.po
@@ -6,15 +6,14 @@
 # Translators:
 # Asher Pen <asherpen@gmail.com>, 2019
 # 朱陈锬 <tangenters@outlook.com>, 2018
-# gudzpoz <GuDzpoz@live.com>, 2022
 # 朱陈锬 <tangenters@outlook.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:15-0500\n"
-"PO-Revision-Date: 2015-07-25 08:05+0000\n"
-"Last-Translator: gudzpoz <GuDzpoz@live.com>, 2022\n"
+"POT-Creation-Date: 2018-04-01 11:11-0400\n"
+"PO-Revision-Date: 2019-03-25 02:01+0000\n"
+"Last-Translator: Asher Pen <asherpen@gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/Friendica/friendica/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,58 +21,62 @@ msgstr ""
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: langfilter.php:49
-msgid ""
-"This addon tries to identify the language posts are written in. If it does "
-"not match any language specified below, posts will be hidden by collapsing "
-"them."
-msgstr "此插件试图辨别文章的写作语言。如果语言与下面给定的均不符合，则文章会被折叠隐藏起来。"
+#: langfilter.php:58
+msgid "Language Filter"
+msgstr "语言过滤器"
 
-#: langfilter.php:50
+#: langfilter.php:59
+msgid ""
+"This addon tries to identify the language posts are writen in. If it does "
+"not match any language specifed below, posts will be hidden by collapsing "
+"them."
+msgstr "这个插件将尝试识别帖子所用的语言。如果不符合以下列出的语言，帖子将被折叠以隐藏。"
+
+#: langfilter.php:60
 msgid "Use the language filter"
 msgstr "使用语言过滤器"
 
-#: langfilter.php:51
+#: langfilter.php:61
 msgid "Able to read"
 msgstr "想要显示的语言"
 
-#: langfilter.php:51
+#: langfilter.php:61
 msgid ""
-"List of abbreviations (ISO 639-1 codes) for languages you speak, comma "
-"separated. For example \"de,it\"."
-msgstr "语言列表（ISO 639-1 缩写代码），使用英文逗号分隔。例如：“de,it,zh”"
+"List of abbreviations (iso2 codes) for languages you speak, comma separated."
+" For example \"de,it\"."
+msgstr "您使用的语言缩写 (iso2 codes) 列表，逗号分隔。例如 \"zh,en\"。"
 
-#: langfilter.php:52
+#: langfilter.php:62
 msgid "Minimum confidence in language detection"
 msgstr "语言识别阈值"
 
-#: langfilter.php:52
+#: langfilter.php:62
 msgid ""
 "Minimum confidence in language detection being correct, from 0 to 100. Posts"
 " will not be filtered when the confidence of language detection is below "
 "this percent value."
 msgstr "语言识别阈值（0－100）。语言识别结果低于该阈值的帖子将不会被折叠。"
 
-#: langfilter.php:53
+#: langfilter.php:63
 msgid "Minimum length of message body"
 msgstr "语言过滤帖子所需最小字符个数"
 
-#: langfilter.php:53
+#: langfilter.php:63
 msgid ""
 "Minimum number of characters in message body for filter to be used. Posts "
 "shorter than this will not be filtered. Note: Language detection is "
 "unreliable for short content (<200 characters)."
 msgstr "语言过滤帖子所需最小字符个数。低于该数字的帖子将不会被过滤。注意：对于字符个数小于200的帖子，语言检测功能将不够稳定。"
 
-#: langfilter.php:58
-msgid "Language Filter"
-msgstr "语言过滤器"
-
-#: langfilter.php:60
+#: langfilter.php:64
 msgid "Save Settings"
 msgstr "保存设置"
 
-#: langfilter.php:193
+#: langfilter.php:105
+msgid "Language Filter Settings saved."
+msgstr "语言过滤器设置已保存。"
+
+#: langfilter.php:182
 #, php-format
 msgid "Filtered language: %s"
 msgstr "已过滤的语言：%s"
diff --git a/langfilter/lang/zh-cn/strings.php b/langfilter/lang/zh-cn/strings.php
index b66e26b4..bbeedf3e 100644
--- a/langfilter/lang/zh-cn/strings.php
+++ b/langfilter/lang/zh-cn/strings.php
@@ -3,16 +3,18 @@
 if(! function_exists("string_plural_select_zh_cn")) {
 function string_plural_select_zh_cn($n){
 	$n = intval($n);
-	return intval(0);
+	return 0;;
 }}
-$a->strings['This addon tries to identify the language posts are written in. If it does not match any language specified below, posts will be hidden by collapsing them.'] = '此插件试图辨别文章的写作语言。如果语言与下面给定的均不符合，则文章会被折叠隐藏起来。';
-$a->strings['Use the language filter'] = '使用语言过滤器';
-$a->strings['Able to read'] = '想要显示的语言';
-$a->strings['List of abbreviations (ISO 639-1 codes) for languages you speak, comma separated. For example "de,it".'] = '语言列表（ISO 639-1 缩写代码），使用英文逗号分隔。例如：“de,it,zh”';
-$a->strings['Minimum confidence in language detection'] = '语言识别阈值';
-$a->strings['Minimum confidence in language detection being correct, from 0 to 100. Posts will not be filtered when the confidence of language detection is below this percent value.'] = '语言识别阈值（0－100）。语言识别结果低于该阈值的帖子将不会被折叠。';
-$a->strings['Minimum length of message body'] = '语言过滤帖子所需最小字符个数';
-$a->strings['Minimum number of characters in message body for filter to be used. Posts shorter than this will not be filtered. Note: Language detection is unreliable for short content (<200 characters).'] = '语言过滤帖子所需最小字符个数。低于该数字的帖子将不会被过滤。注意：对于字符个数小于200的帖子，语言检测功能将不够稳定。';
-$a->strings['Language Filter'] = '语言过滤器';
-$a->strings['Save Settings'] = '保存设置';
-$a->strings['Filtered language: %s'] = '已过滤的语言：%s';
+;
+$a->strings["Language Filter"] = "语言过滤器";
+$a->strings["This addon tries to identify the language posts are writen in. If it does not match any language specifed below, posts will be hidden by collapsing them."] = "这个插件将尝试识别帖子所用的语言。如果不符合以下列出的语言，帖子将被折叠以隐藏。";
+$a->strings["Use the language filter"] = "使用语言过滤器";
+$a->strings["Able to read"] = "想要显示的语言";
+$a->strings["List of abbreviations (iso2 codes) for languages you speak, comma separated. For example \"de,it\"."] = "您使用的语言缩写 (iso2 codes) 列表，逗号分隔。例如 \"zh,en\"。";
+$a->strings["Minimum confidence in language detection"] = "语言识别阈值";
+$a->strings["Minimum confidence in language detection being correct, from 0 to 100. Posts will not be filtered when the confidence of language detection is below this percent value."] = "语言识别阈值（0－100）。语言识别结果低于该阈值的帖子将不会被折叠。";
+$a->strings["Minimum length of message body"] = "语言过滤帖子所需最小字符个数";
+$a->strings["Minimum number of characters in message body for filter to be used. Posts shorter than this will not be filtered. Note: Language detection is unreliable for short content (<200 characters)."] = "语言过滤帖子所需最小字符个数。低于该数字的帖子将不会被过滤。注意：对于字符个数小于200的帖子，语言检测功能将不够稳定。";
+$a->strings["Save Settings"] = "保存设置";
+$a->strings["Language Filter Settings saved."] = "语言过滤器设置已保存。";
+$a->strings["Filtered language: %s"] = "已过滤的语言：%s";
diff --git a/langfilter/langfilter.php b/langfilter/langfilter.php
index e5efa8fb..95021969 100644
--- a/langfilter/langfilter.php
+++ b/langfilter/langfilter.php
@@ -10,8 +10,9 @@
 use Friendica\App;
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Hook;
+use Friendica\Core\L10n;
+use Friendica\Core\PConfig;
 use Friendica\Core\Renderer;
-use Friendica\DI;
 
 /* Define the hooks we want to use
  * that is, we have settings, we need to save the settings and we want
@@ -25,40 +26,43 @@ function langfilter_install()
 	Hook::register('addon_settings_post', 'addon/langfilter/langfilter.php', 'langfilter_addon_settings_post');
 }
 
+function langfilter_uninstall()
+{
+	Hook::unregister('prepare_body_content_filter', 'addon/langfilter/langfilter.php', 'langfilter_prepare_body_content_filter');
+	Hook::unregister('prepare_body', 'addon/langfilter/langfilter.php', 'langfilter_prepare_body');
+	Hook::unregister('addon_settings', 'addon/langfilter/langfilter.php', 'langfilter_addon_settings');
+	Hook::unregister('addon_settings_post', 'addon/langfilter/langfilter.php', 'langfilter_addon_settings_post');
+}
+
 /* The settings
  * 1st check if somebody logged in is calling
  * 2nd get the current settings
  * 3rd parse a SMARTY3 template, replacing some translateable strings for the form
  */
 
-function langfilter_addon_settings(array &$data)
+function langfilter_addon_settings(App $a, &$s)
 {
-	if (!DI::userSession()->getLocalUserId()) {
+	if (!local_user()) {
 		return;
 	}
 
-	$enabled = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'langfilter', 'enable',
-		!DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'langfilter', 'disable'));
+	$enable_checked = (intval(PConfig::get(local_user(), 'langfilter', 'disable')) ? '' : ' checked="checked" ');
+	$languages      = PConfig::get(local_user(), 'langfilter', 'languages');
+	$minconfidence  = PConfig::get(local_user(), 'langfilter', 'minconfidence') * 100;
+	$minlength      = PConfig::get(local_user(), 'langfilter', 'minlength');
 
-	$languages     = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'langfilter', 'languages');
-	$minconfidence = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'langfilter', 'minconfidence', 0) * 100;
-	$minlength     = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'langfilter', 'minlength', 32);
-
-	$t    = Renderer::getMarkupTemplate('settings.tpl', 'addon/langfilter/');
-	$html = Renderer::replaceMacros($t, [
-		'$intro'         => DI::l10n()->t('This addon tries to identify the language posts are written in. If it does not match any language specified below, posts will be hidden by collapsing them.'),
-		'$enabled'       => ['langfilter_enable', DI::l10n()->t('Use the language filter'), $enabled],
-		'$languages'     => ['langfilter_languages', DI::l10n()->t('Able to read'), $languages, DI::l10n()->t('List of abbreviations (ISO 639-1 codes) for languages you speak, comma separated. For example "de,it".')],
-		'$minconfidence' => ['langfilter_minconfidence', DI::l10n()->t('Minimum confidence in language detection'), $minconfidence, DI::l10n()->t('Minimum confidence in language detection being correct, from 0 to 100. Posts will not be filtered when the confidence of language detection is below this percent value.')],
-		'$minlength'     => ['langfilter_minlength', DI::l10n()->t('Minimum length of message body'), $minlength, DI::l10n()->t('Minimum number of characters in message body for filter to be used. Posts shorter than this will not be filtered. Note: Language detection is unreliable for short content (<200 characters).')],
+	$t = Renderer::getMarkupTemplate("settings.tpl", "addon/langfilter/");
+	$s .= Renderer::replaceMacros($t, [
+		'$title'         => L10n::t("Language Filter"),
+		'$intro'         => L10n::t('This addon tries to identify the language posts are writen in. If it does not match any language specifed below, posts will be hidden by collapsing them.'),
+		'$enabled'       => ['langfilter_enable', L10n::t('Use the language filter'), $enable_checked, ''],
+		'$languages'     => ['langfilter_languages', L10n::t('Able to read'), $languages, L10n::t('List of abbreviations (iso2 codes) for languages you speak, comma separated. For example "de,it".')],
+		'$minconfidence' => ['langfilter_minconfidence', L10n::t('Minimum confidence in language detection'), $minconfidence, L10n::t('Minimum confidence in language detection being correct, from 0 to 100. Posts will not be filtered when the confidence of language detection is below this percent value.')],
+		'$minlength'     => ['langfilter_minlength', L10n::t('Minimum length of message body'), $minlength, L10n::t('Minimum number of characters in message body for filter to be used. Posts shorter than this will not be filtered. Note: Language detection is unreliable for short content (<200 characters).')],
+		'$submit'        => L10n::t('Save Settings'),
 	]);
 
-	$data = [
-		'addon'  => 'langfilter',
-		'title'  => DI::l10n()->t('Language Filter'),
-		'html'   => $html,
-		'submit' => ['langfilter-settings-submit' => DI::l10n()->t('Save Settings')],
-	];
+	return;
 }
 
 /* Save the settings
@@ -67,25 +71,36 @@ function langfilter_addon_settings(array &$data)
  * 3rd save the settings to the DB for later usage
  */
 
-function langfilter_addon_settings_post(array &$b)
+function langfilter_addon_settings_post(App $a, &$b)
 {
-	if (!DI::userSession()->getLocalUserId()) {
+	if (!local_user()) {
 		return;
 	}
 
 	if (!empty($_POST['langfilter-settings-submit'])) {
-		$enable        = intval($_POST['langfilter_enable'] ?? 0);
-		$languages     = trim($_POST['langfilter_languages'] ?? '');
-		$minconfidence = max(0, min(100, intval($_POST['langfilter_minconfidence'] ?? 0))) / 100;
-		$minlength     = intval($_POST['langfilter_minlength'] ?? 32);
-		if ($minlength <= 0) {
+		PConfig::set(local_user(), 'langfilter', 'languages', trim($_POST['langfilter_languages']));
+		$enable = (!empty($_POST['langfilter_enable']) ? intval($_POST['langfilter_enable']) : 0);
+		$disable = 1 - $enable;
+		PConfig::set(local_user(), 'langfilter', 'disable', $disable);
+		$minconfidence = 0 + $_POST['langfilter_minconfidence'];
+		if (!$minconfidence) {
+			$minconfidence = 0;
+		} elseif ($minconfidence < 0) {
+			$minconfidence = 0;
+		} elseif ($minconfidence > 100) {
+			$minconfidence = 100;
+		}
+		PConfig::set(local_user(), 'langfilter', 'minconfidence', $minconfidence / 100.0);
+
+		$minlength = 0 + $_POST['langfilter_minlength'];
+		if (!$minlength) {
+			$minlength = 32;
+		} elseif ($minlength < 0) {
 			$minlength = 32;
 		}
+		PConfig::set(local_user(), 'langfilter', 'minlength', $minlength);
 
-		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'langfilter', 'enable'       , $enable);
-		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'langfilter', 'languages'    , $languages);
-		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'langfilter', 'minconfidence', $minconfidence);
-		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'langfilter', 'minlength'    , $minlength);
+		info(L10n::t('Language Filter Settings saved.') . EOL);
 	}
 }
 
@@ -98,37 +113,29 @@ function langfilter_addon_settings_post(array &$b)
  *     expand it again.
  */
 
-function langfilter_prepare_body_content_filter(&$hook_data)
+function langfilter_prepare_body_content_filter(App $a, &$hook_data)
 {
-	$logged_user = DI::userSession()->getLocalUserId();
+	$logged_user = local_user();
 	if (!$logged_user) {
 		return;
 	}
 
 	// Never filter own messages
 	// TODO: find a better way to extract this
-	$logged_user_profile = DI::baseUrl() . '/profile/' . DI::userSession()->getLocalUserNickname();
+	$logged_user_profile = $a->getBaseURL() . '/profile/' . $a->user['nickname'];
 	if ($logged_user_profile == $hook_data['item']['author-link']) {
 		return;
 	}
 
 	// Don't filter if language filter is disabled
-	if (!DI::pConfig()->get($logged_user, 'langfilter', 'enable',
-		!DI::pConfig()->get($logged_user, 'langfilter', 'disable'))
-	) {
+	if (PConfig::get($logged_user, 'langfilter', 'disable')) {
 		return;
 	}
 
-	$naked_body = strip_tags(
-		$hook_data['item']['rendered-html']
-		??''?: // Equivalent of !empty()
-		BBCode::convertForUriId($hook_data['item']['uri-id'], $hook_data['item']['body'], BBCode::ACTIVITYPUB)
-	);
-
-	$naked_body = preg_replace('#\s+#', ' ', trim($naked_body));
+	$naked_body = BBCode::toPlaintext($hook_data['item']['body'], false);
 
 	// Don't filter if body lenght is below minimum
-	$minlen = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'langfilter', 'minlength', 32);
+	$minlen = PConfig::get(local_user(), 'langfilter', 'minlength', 32);
 	if (!$minlen) {
 		$minlen = 32;
 	}
@@ -137,8 +144,8 @@ function langfilter_prepare_body_content_filter(&$hook_data)
 		return;
 	}
 
-	$read_languages_string = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'langfilter', 'languages');
-	$minconfidence = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'langfilter', 'minconfidence');
+	$read_languages_string = PConfig::get(local_user(), 'langfilter', 'languages');
+	$minconfidence = PConfig::get(local_user(), 'langfilter', 'minconfidence');
 
 	// Don't filter if no spoken languages are configured
 	if (!$read_languages_string) {
@@ -146,8 +153,6 @@ function langfilter_prepare_body_content_filter(&$hook_data)
 	}
 	$read_languages_array = explode(',', $read_languages_string);
 
-	$iso639 = new Matriphe\ISO639\ISO639;
-
 	// Extract the language of the post
 	if (!empty($hook_data['item']['language'])) {
 		$languages = json_decode($hook_data['item']['language'], true);
@@ -163,7 +168,7 @@ function langfilter_prepare_body_content_filter(&$hook_data)
 			return;
 		}
 
-		$lang = $iso639->languageByCode1(substr($iso2, 0, 2));
+		$lang = Text_LanguageDetect_ISO639::code2ToName($iso2);
 	} else {
 		$opts = $hook_data['item']['postopts'];
 		if (!$opts) {
@@ -179,7 +184,7 @@ function langfilter_prepare_body_content_filter(&$hook_data)
 		$lang = $matches[1];
 		$confidence = $matches[2];
 
-		$iso2 = $iso639->code1ByLanguage($lang);
+		$iso2 = Text_LanguageDetect_ISO639::nameToCode2($lang);
 	}
 
 	// Do not filter if language detection confidence is too low
@@ -192,6 +197,6 @@ function langfilter_prepare_body_content_filter(&$hook_data)
 	}
 
 	if (!in_array($iso2, $read_languages_array)) {
-		$hook_data['filter_reasons'][] = DI::l10n()->t('Filtered language: %s', ucfirst($lang));
+		$hook_data['filter_reasons'][] = L10n::t('Filtered language: %s', ucfirst($lang));
 	}
 }
diff --git a/langfilter/templates/settings.tpl b/langfilter/templates/settings.tpl
index 1197e9f2..8e62ef49 100644
--- a/langfilter/templates/settings.tpl
+++ b/langfilter/templates/settings.tpl
@@ -1,5 +1,19 @@
-<p>{{$intro}}</p>
-{{include file="field_checkbox.tpl" field=$enabled}}
-{{include file="field_input.tpl" field=$languages}}
-{{include file="field/range_percent.tpl" field=$minconfidence}}
-{{include file="field_input.tpl" field=$minlength}}
+<span id="settings_langfilter_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose('settings_langfilter_expanded'); openClose('settings_langfilter_inflated');">
+	<h3>{{$title}}</h3>
+</span>
+<div id="settings_langfilter_expanded" class="settings-block" style="display: none;">
+	<span class="fakelink" onclick="openClose('settings_langfilter_expanded'); openClose('settings_langfilter_inflated');">
+		<h3>{{$title}}</h3>
+	</span>
+
+	<div id="langfilter-wrapper">
+		<p>{{$intro}}</p>
+		{{include file="field_checkbox.tpl" field=$enabled}}
+		{{include file="field_input.tpl" field=$languages}}
+		{{include file="field_input.tpl" field=$minconfidence}}
+		{{include file="field_input.tpl" field=$minlength}}
+	</div>
+	<div class="settings-submit-wrapper" >
+		<input type="submit" id="langfilter-settings-submit" name="langfilter-settings-submit" class="settings-submit" value="{{$submit}}" />
+	</div>
+</div>	
diff --git a/ldapauth/README.md b/ldapauth/README.md
index dc0b49c7..f37bb9d5 100644
--- a/ldapauth/README.md
+++ b/ldapauth/README.md
@@ -12,4 +12,38 @@ However, it's possible with an option to automate the creation of a Friendica ba
 Note when using with Windows Active Directory: you may need to set TLS_CACERT in your site
 ldap.conf file to the signing cert for your LDAP server.
 
-The configuration options for this module are described in the `config/ldapauth.config.php` file.
+The configuration options for this module may be set in the `config/addon.config.php` file
+e.g.:
+
+	'ldapauth' => [
+        // ldap hostname server - required
+        'ldap_server' => '',
+
+        // admin dn - optional - only if ldap server dont have anonymous access
+        'ldap_binddn' => '',
+
+        // admin password - optional - only if ldap server dont have anonymous access
+        'ldap_bindpw' => '',
+
+        // dn to search users - required
+        'ldap_searchdn' => '',
+
+        // attribute to find username - required
+        'ldap_userattr' => '',
+
+        // DN of the group whose member can auth on Friendica - optional
+        'ldap_group' => '',
+
+        // To create Friendica account if user exists in ldap
+        // Requires an email and a simple (beautiful) nickname on user ldap object
+        // active account creation - optional - default true
+        'ldap_autocreateaccount' => true,
+
+        // attribute to get email - optional - default : 'mail'
+        'ldap_autocreateaccount_emailattribute' => 'mail',
+
+        // attribute to get nickname - optional - default : 'givenName'
+        'ldap_autocreateaccount_nameattribute' => 'givenName',
+    ],
+
+...etc.
diff --git a/ldapauth/config/ldapauth.config.php b/ldapauth/config/ldapauth.config.php
index 2a79b34c..e89a2b55 100644
--- a/ldapauth/config/ldapauth.config.php
+++ b/ldapauth/config/ldapauth.config.php
@@ -1,7 +1,7 @@
 <?php
 
 // Warning: Don't change this file! It only holds the default config values for this addon.
-// Instead, copy this file to config/ldapauth.config.php in your Friendica directory and set the correct values there
+// Instead overwrite these config values in config/addon.config.php in your Friendica directory
 
 return [
 	'ldapauth' => [
diff --git a/ldapauth/lang/C/messages.po b/ldapauth/lang/C/messages.po
new file mode 100644
index 00000000..e69de29b
diff --git a/ldapauth/ldapauth.php b/ldapauth/ldapauth.php
index 38e2d6a1..269da6e4 100644
--- a/ldapauth/ldapauth.php
+++ b/ldapauth/ldapauth.php
@@ -26,16 +26,39 @@
  * Note when using with Windows Active Directory: you may need to set TLS_CACERT in your site
  * ldap.conf file to the signing cert for your LDAP server.
  *
- * The configuration options for this module are described in the config/ldapauth.config.php file
+ * The configuration options for this module may be set in the config/addon.config.php file
+ * e.g.:
+ *
+ * [ldapauth]
+ * ; ldap hostname server - required
+ * ldap_server = host.example.com
+ * ; dn to search users - required
+ * ldap_searchdn = ou=users,dc=example,dc=com
+ * ; attribute to find username - required
+ * ldap_userattr = uid
+ *
+ * ; admin dn - optional - only if ldap server dont have anonymous access
+ * ldap_binddn = cn=admin,dc=example,dc=com
+ * ; admin password - optional - only if ldap server dont have anonymous access
+ * ldap_bindpw = password
+ *
+ * ; for create Friendica account if user exist in ldap
+ * ;     required an email and a simple (beautiful) nickname on user ldap object
+ * ;   active account creation - optional - default none
+ * ldap_autocreateaccount = true
+ * ;   attribute to get email - optional - default : 'mail'
+ * ldap_autocreateaccount_emailattribute = mail
+ * ;   attribute to get nickname - optional - default : 'givenName'
+ * ldap_autocreateaccount_nameattribute = cn
+ *
+ * ...etc.
  */
 
-use Friendica\App;
+use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
-use Friendica\Database\DBA;
-use Friendica\DI;
 use Friendica\Model\User;
-use Friendica\Core\Config\Util\ConfigFileManager;
+use Friendica\Util\ConfigFileLoader;
 
 function ldapauth_install()
 {
@@ -43,129 +66,144 @@ function ldapauth_install()
 	Hook::register('authenticate', 'addon/ldapauth/ldapauth.php', 'ldapauth_hook_authenticate');
 }
 
-function ldapauth_load_config(ConfigFileManager $loader)
+function ldapauth_uninstall()
 {
-	DI::app()->getConfigCache()->load($loader->loadAddonConfig('ldapauth'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
+	Hook::unregister('load_config',  'addon/ldapauth/ldapauth.php', 'ldapauth_load_config');
+	Hook::unregister('authenticate', 'addon/ldapauth/ldapauth.php', 'ldapauth_hook_authenticate');
 }
 
-function ldapauth_hook_authenticate(array &$b)
+function ldapauth_load_config(\Friendica\App $a, ConfigFileLoader $loader)
 {
-	$user = ldapauth_authenticate($b['username'], $b['password']);
-	if (!empty($user['uid'])) {
-		$b['user_record'] = User::getById($user['uid']);
-		$b['authenticated'] = 1;
+	$a->getConfigCache()->load($loader->loadAddonConfig('ldapauth'));
+}
+
+function ldapauth_hook_authenticate($a, &$b)
+{
+	if (ldapauth_authenticate($b['username'], $b['password'])) {
+		$results = get_existing_account($b['username']);
+		if (!empty($results)) {
+			$b['user_record'] = $results[0];
+			$b['authenticated'] = 1;
+		}
 	}
+	return;
 }
 
 function ldapauth_authenticate($username, $password)
 {
-	$ldap_server   = DI::config()->get('ldapauth', 'ldap_server');
-	$ldap_binddn   = DI::config()->get('ldapauth', 'ldap_binddn');
-	$ldap_bindpw   = DI::config()->get('ldapauth', 'ldap_bindpw');
-	$ldap_searchdn = DI::config()->get('ldapauth', 'ldap_searchdn');
-	$ldap_userattr = DI::config()->get('ldapauth', 'ldap_userattr');
-	$ldap_group    = DI::config()->get('ldapauth', 'ldap_group');
-	$ldap_autocreateaccount = DI::config()->get('ldapauth', 'ldap_autocreateaccount');
-	$ldap_autocreateaccount_emailattribute = DI::config()->get('ldapauth', 'ldap_autocreateaccount_emailattribute');
-	$ldap_autocreateaccount_nameattribute  = DI::config()->get('ldapauth', 'ldap_autocreateaccount_nameattribute');
+	$ldap_server   = Config::get('ldapauth', 'ldap_server');
+	$ldap_binddn   = Config::get('ldapauth', 'ldap_binddn');
+	$ldap_bindpw   = Config::get('ldapauth', 'ldap_bindpw');
+	$ldap_searchdn = Config::get('ldapauth', 'ldap_searchdn');
+	$ldap_userattr = Config::get('ldapauth', 'ldap_userattr');
+	$ldap_group    = Config::get('ldapauth', 'ldap_group');
+	$ldap_autocreateaccount = Config::get('ldapauth', 'ldap_autocreateaccount');
+	$ldap_autocreateaccount_emailattribute = Config::get('ldapauth', 'ldap_autocreateaccount_emailattribute');
+	$ldap_autocreateaccount_nameattribute  = Config::get('ldapauth', 'ldap_autocreateaccount_nameattribute');
 
-	if (!extension_loaded('ldap') || !strlen($ldap_server)) {
-		Logger::error('Addon not configured or missing php-ldap extension', ['extension_loaded' => extension_loaded('ldap'), 'server' => $ldap_server]);
-		return false;
-	}
-
-	if (!strlen($password)) {
-		Logger::error('Empty password disallowed', ['provided_password_length' => strlen($password)]);
+	if (!(strlen($password) && function_exists('ldap_connect') && strlen($ldap_server))) {
+		Logger::log("ldapauth: not configured or missing php-ldap module");
 		return false;
 	}
 
 	$connect = @ldap_connect($ldap_server);
+
 	if ($connect === false) {
-		Logger::warning('Could not connect to LDAP server', ['server' => $ldap_server]);
+		Logger::log("ldapauth: could not connect to $ldap_server");
 		return false;
 	}
 
 	@ldap_set_option($connect, LDAP_OPT_PROTOCOL_VERSION, 3);
 	@ldap_set_option($connect, LDAP_OPT_REFERRALS, 0);
 	if ((@ldap_bind($connect, $ldap_binddn, $ldap_bindpw)) === false) {
-		Logger::warning('Could not bind to LDAP server', ['server' => $ldap_server, 'binddn' => $ldap_binddn, 'errno' => ldap_errno($connect), 'error' => ldap_error($connect)]);
+		Logger::log("ldapauth: could not bind $ldap_server as $ldap_binddn");
 		return false;
 	}
 
 	$res = @ldap_search($connect, $ldap_searchdn, $ldap_userattr . '=' . $username);
+
 	if (!$res) {
-		Logger::notice('LDAP user not found.', ['searchdn' => $ldap_searchdn, 'userattr' => $ldap_userattr, 'username' => $username, 'errno' => ldap_errno($connect), 'error' => ldap_error($connect)]);
+		Logger::log("ldapauth: $ldap_userattr=$username,$ldap_searchdn not found");
 		return false;
 	}
 
 	$id = @ldap_first_entry($connect, $res);
+
 	if (!$id) {
-		Logger::notice('Could not retrieve first LDAP entry.', ['searchdn' => $ldap_searchdn, 'userattr' => $ldap_userattr, 'username' => $username, 'errno' => ldap_errno($connect), 'error' => ldap_error($connect)]);
 		return false;
 	}
 
 	$dn = @ldap_get_dn($connect, $id);
+
 	if (!@ldap_bind($connect, $dn, $password)) {
-		Logger::notice('Could not authenticate LDAP user with provided password', ['errno' => ldap_errno($connect), 'error' => ldap_error($connect)]);
 		return false;
 	}
 
-	if (strlen($ldap_group) && @ldap_compare($connect, $ldap_group, 'member', $dn) !== true) {
-		$errno = @ldap_errno($connect);
-		if ($errno === 32) {
-			Logger::notice('LDAP Access Control Group does not exist', ['errno' => $errno, 'error' => ldap_error($connect)]);
-		} elseif ($errno === 16) {
-			Logger::notice('LDAP membership attribute does not exist in access control group', ['errno' => $errno, 'error' => ldap_error($connect)]);
-		} else {
-			Logger::notice('LDAP user isn\'t part of the authorized group', ['dn' => $dn]);
+	$emailarray = [];
+	$namearray = [];
+	if ($ldap_autocreateaccount == "true") {
+		if (!strlen($ldap_autocreateaccount_emailattribute)) {
+			$ldap_autocreateaccount_emailattribute = "mail";
 		}
+		if (!strlen($ldap_autocreateaccount_nameattribute)) {
+			$ldap_autocreateaccount_nameattribute = "givenName";
+		}
+		$emailarray = @ldap_get_values($connect, $id, $ldap_autocreateaccount_emailattribute);
+		$namearray = @ldap_get_values($connect, $id, $ldap_autocreateaccount_nameattribute);
+	}
 
+	if (!strlen($ldap_group)) {
+		ldap_autocreateaccount($ldap_autocreateaccount, $username, $password, $emailarray[0], $namearray[0]);
+		return true;
+	}
+
+	$r = @ldap_compare($connect, $ldap_group, 'member', $res);
+	if ($r === -1) {
+		$err = @ldap_error($connect);
+		$eno = @ldap_errno($connect);
+		@ldap_close($connect);
+
+		if ($eno === 32) {
+			Logger::log("ldapauth: access control group Does Not Exist");
+			return false;
+		} elseif ($eno === 16) {
+			Logger::log('ldapauth: membership attribute does not exist in access control group');
+			return false;
+		} else {
+			Logger::log('ldapauth: error: ' . $err);
+			return false;
+		}
+	} elseif ($r === false) {
 		@ldap_close($connect);
 		return false;
 	}
 
-	if ($ldap_autocreateaccount == 'true' && !DBA::exists('user', ['nickname' => $username])) {
-		if (!strlen($ldap_autocreateaccount_emailattribute)) {
-			$ldap_autocreateaccount_emailattribute = 'mail';
-		}
-		if (!strlen($ldap_autocreateaccount_nameattribute)) {
-			$ldap_autocreateaccount_nameattribute = 'givenName';
-		}
-		$email_values = @ldap_get_values($connect, $id, $ldap_autocreateaccount_emailattribute);
-		$name_values = @ldap_get_values($connect, $id, $ldap_autocreateaccount_nameattribute);
-
-		return ldap_createaccount($username, $password, $email_values[0] ?? '', $name_values[0] ?? '');
-	}
-
-	try {
-		$authentication = User::getAuthenticationInfo($username);
-		return User::getById($authentication['uid']);
-	} catch (Exception $e) {
-		Logger::notice('LDAP authentication error: ' . $e->getMessage());
-		return false;
-	}
+	ldap_autocreateaccount($ldap_autocreateaccount, $username, $password, $emailarray[0], $namearray[0]);
+	return true;
 }
 
-function ldap_createaccount($username, $password, $email, $name)
+function ldap_autocreateaccount($ldap_autocreateaccount, $username, $password, $email, $name)
 {
-	if (!strlen($email) || !strlen($name)) {
-		Logger::notice('Could not create local user from LDAP data, no email or nickname provided');
-		return false;
-	}
+	if ($ldap_autocreateaccount == "true") {
+		$results = get_existing_account($username);
+		if (empty($results)) {
+			if (strlen($email) > 0 && strlen($name) > 0) {
+				$arr = ['username' => $name, 'nickname' => $username, 'email' => $email, 'password' => $password, 'verified' => 1];
 
-	try {
-		$user = User::create([
-			'username' => $name,
-			'nickname' => $username,
-			'email'    => $email,
-			'password' => $password,
-			'verified' => 1
-		]);
-		Logger::info('Local user created from LDAP data', ['username' => $username, 'name' => $name]);
-		return $user;
-	} catch (Exception $ex) {
-		Logger::error('Could not create local user from LDAP data', ['username' => $username, 'exception' => $ex->getMessage()]);
+				try {
+					User::create($arr);
+					Logger::log("ldapauth: account " . $username . " created");
+				} catch (Exception $ex) {
+					Logger::log("ldapauth: account " . $username . " was not created ! : " . $ex->getMessage());
+				}
+			} else {
+				Logger::log("ldapauth: unable to create account, no email or nickname found");
+			}
+		}
 	}
-
-	return false;
+}
+
+function get_existing_account($username)
+{
+	return q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `blocked` = 0 AND `verified` = 1 LIMIT 1", $username);
 }
diff --git a/leistungsschutzrecht/README.md b/leistungsschutzrecht/README.md
index 18bc9c4f..7026af53 100644
--- a/leistungsschutzrecht/README.md
+++ b/leistungsschutzrecht/README.md
@@ -1,17 +1,16 @@
 Leistungsschutzrecht Addon
 ==========================
 
-Main author: Michael Vogel
+Main author Michael Vogel
 
 This addon handles legal problems with the German link tax, named "Leistungsschutzrecht" by shortening preview texts.
-Additionally, it is possibly to suppress preview pictures completely to avoid any legal problems.
+Additionally it is possibly to suppress preview pictures completely to avoid any legal problems.
 
-## Configuration
+## configuration
 
-If you want to suppress pictures in previews, add this to your global `config/leistungsschutzrecht.config.php`:
+If you want to suppress pictures in previews, add this to your global `config/addon.config.php`:
+
+	'leistungsschutzrecht' => [
+		'suppress_photos' => true,
+	],
 
-	return [
-		'leistungsschutzrecht' => [
-			'suppress_photos' => true,
-		],
-	];
diff --git a/leistungsschutzrecht/leistungsschutzrecht.php b/leistungsschutzrecht/leistungsschutzrecht.php
index f6c65399..5d47bade 100644
--- a/leistungsschutzrecht/leistungsschutzrecht.php
+++ b/leistungsschutzrecht/leistungsschutzrecht.php
@@ -5,67 +5,69 @@
  * Version: 0.1
  * Author: Michael Vogel <https://pirati.ca/profile/heluecht>
  */
-
-use Friendica\App;
+use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
-use Friendica\DI;
+use Friendica\Util\Network;
 
-function leistungsschutzrecht_install()
-{
+function leistungsschutzrecht_install() {
 	Hook::register('cron', 'addon/leistungsschutzrecht/leistungsschutzrecht.php', 'leistungsschutzrecht_cron');
 	Hook::register('getsiteinfo', 'addon/leistungsschutzrecht/leistungsschutzrecht.php', 'leistungsschutzrecht_getsiteinfo');
 	Hook::register('page_info_data', 'addon/leistungsschutzrecht/leistungsschutzrecht.php', 'leistungsschutzrecht_getsiteinfo');
 }
 
-function leistungsschutzrecht_getsiteinfo(array &$siteinfo) {
-	if (!isset($siteinfo['url']) || empty($siteinfo['type'])) {
+
+function leistungsschutzrecht_uninstall() {
+	Hook::unregister('cron', 'addon/leistungsschutzrecht/leistungsschutzrecht.php', 'leistungsschutzrecht_cron');
+	Hook::unregister('getsiteinfo', 'addon/leistungsschutzrecht/leistungsschutzrecht.php', 'leistungsschutzrecht_getsiteinfo');
+	Hook::unregister('page_info_data', 'addon/leistungsschutzrecht/leistungsschutzrecht.php', 'leistungsschutzrecht_getsiteinfo');
+}
+
+function leistungsschutzrecht_getsiteinfo($a, &$siteinfo) {
+	if (!isset($siteinfo["url"]) || empty($siteinfo['type'])) {
 		return;
 	}
 
 	// Avoid any third party pictures, to avoid copyright issues
-	if (!in_array($siteinfo['type'], ['photo', 'video']) && DI::config()->get('leistungsschutzrecht', 'suppress_photos', false)) {
-		unset($siteinfo['image']);
-		unset($siteinfo['images']);
+	if (!in_array($siteinfo['type'], ['photo', 'video']) && Config::get('leistungsschutzrecht', 'suppress_photos', false)) {
+		unset($siteinfo["image"]);
+		unset($siteinfo["images"]);
 	}
 
-	if (!leistungsschutzrecht_is_member_site($siteinfo['url'])) {
+	if (!leistungsschutzrecht_is_member_site($siteinfo["url"])) {
 		return;
 	}
 
-	if (!empty($siteinfo['text'])) {
-		$siteinfo['text'] = leistungsschutzrecht_cuttext($siteinfo['text']);
+	if (!empty($siteinfo["text"])) {
+		$siteinfo["text"] = leistungsschutzrecht_cuttext($siteinfo["text"]);
 	}
 
-	unset($siteinfo['keywords']);
+	unset($siteinfo["keywords"]);
 }
 
-function leistungsschutzrecht_cuttext(string $text): string
-{
-	$text = str_replace(["\r", "\n"], [' ', ' '], $text);
+function leistungsschutzrecht_cuttext($text) {
+	$text = str_replace(["\r", "\n"], [" ", " "], $text);
 
 	do {
 		$oldtext = $text;
-		$text = str_replace('  ', ' ', $text);
+		$text = str_replace("  ", " ", $text);
 	} while ($oldtext != $text);
 
-	$words = explode(' ', $text);
+	$words = explode(" ", $text);
 
-	$text = '';
+	$text = "";
 	$count = 0;
 	$limit = 7;
 
 	foreach ($words as $word) {
-		if ($text != '') {
-			$text .= ' ';
-		}
+		if ($text != "")
+			$text .= " ";
 
 		$text .= $word;
 
 		if (++$count >= $limit) {
-			if (sizeof($words) > $limit) {
-				$text .= ' ...';
-			}
+			if (sizeof($words) > $limit)
+				$text .= " ...";
 
 			break;
 		}
@@ -76,8 +78,8 @@ function leistungsschutzrecht_cuttext(string $text): string
 function leistungsschutzrecht_fetchsites()
 {
 	// This list works - but question is how current it is
-	$url = 'https://leistungsschutzrecht-stoppen.d-64.org/blacklist.txt';
-	$sitelist = DI::httpClient()->fetch($url);
+	$url = "http://leistungsschutzrecht-stoppen.d-64.org/blacklist.txt";
+	$sitelist = Network::fetchUrl($url);
 	$siteurls = explode(',', $sitelist);
 
 	$whitelist = ['tagesschau.de', 'heute.de', 'wdr.de'];
@@ -124,31 +126,27 @@ function leistungsschutzrecht_fetchsites()
 */
 
 	if (sizeof($sites)) {
-		DI::config()->set('leistungsschutzrecht', 'sites',$sites);
+		Config::set('leistungsschutzrecht','sites',$sites);
 	}
 }
 
-function leistungsschutzrecht_is_member_site(string $url): bool
-{
-	$sites = DI::config()->get('leistungsschutzrecht', 'sites');
+function leistungsschutzrecht_is_member_site($url) {
+	$sites = Config::get('leistungsschutzrecht','sites');
 
-	if ($sites == '') {
-		return false;
-	}
+	if ($sites == "")
+		return(false);
 
-	if (sizeof($sites) == 0) {
-		return false;
-	}
+	if (sizeof($sites) == 0)
+		return(false);
 
 	$urldata = parse_url($url);
 
-	if (!isset($urldata['host'])) {
-		return false;
-	}
+	if (!isset($urldata["host"]))
+		return(false);
 
-	$cleanedurlpart = explode('%', $urldata['host']);
+	$cleanedurlpart = explode("%", $urldata["host"]);
 
-	$hostname = explode('.', $cleanedurlpart[0]);
+	$hostname = explode(".", $cleanedurlpart[0]);
 	if (empty($hostname)) {
 		return false;
 	}
@@ -157,22 +155,22 @@ function leistungsschutzrecht_is_member_site(string $url): bool
 		return false;
 	}
 
-	$site = $hostname[sizeof($hostname) - 2] . '.' . $hostname[sizeof($hostname) - 1];
+	$site = $hostname[sizeof($hostname) - 2].".".$hostname[sizeof($hostname) - 1];
 
-	return isset($sites[$site]);
+	return (isset($sites[$site]));
 }
 
-function leistungsschutzrecht_cron($b)
-{
-	$last = DI::keyValue()->get('leistungsschutzrecht_last_poll');
+function leistungsschutzrecht_cron($a,$b) {
+	$last = Config::get('leistungsschutzrecht','last_poll');
 
-	if ($last) {
+	if($last) {
 		$next = $last + 86400;
-		if ($next > time()) {
-			Logger::notice('poll intervall not reached');
+		if($next > time()) {
+			Logger::log('poll intervall not reached');
 			return;
 		}
 	}
 	leistungsschutzrecht_fetchsites();
-	DI::keyValue()->set('leistungsschutzrecht_last_poll', time());
+	Config::set('leistungsschutzrecht','last_poll', time());
 }
+?>
diff --git a/libertree/lang/C/messages.po b/libertree/lang/C/messages.po
index 3162b6a7..ec61f847 100644
--- a/libertree/lang/C/messages.po
+++ b/libertree/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-06-03 15:49-0400\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,26 +17,30 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: libertree.php:39
+#: libertree.php:36
 msgid "Post to libertree"
 msgstr ""
 
-#: libertree.php:59
+#: libertree.php:67
+msgid "libertree Post Settings"
+msgstr ""
+
+#: libertree.php:69
 msgid "Enable Libertree Post Addon"
 msgstr ""
 
-#: libertree.php:60
-msgid "Libertree site URL"
-msgstr ""
-
-#: libertree.php:61
+#: libertree.php:74
 msgid "Libertree API token"
 msgstr ""
 
-#: libertree.php:62
+#: libertree.php:79
+msgid "Libertree site URL"
+msgstr ""
+
+#: libertree.php:84
 msgid "Post to Libertree by default"
 msgstr ""
 
-#: libertree.php:67
-msgid "Libertree Export"
+#: libertree.php:90
+msgid "Submit"
 msgstr ""
diff --git a/libertree/lang/ar/messages.po b/libertree/lang/ar/messages.po
deleted file mode 100644
index f60b55b1..00000000
--- a/libertree/lang/ar/messages.po
+++ /dev/null
@@ -1,48 +0,0 @@
-# ADDON libertree
-# Copyright (C)
-# This file is distributed under the same license as the Friendica libertree addon package.
-# 
-# 
-# Translators:
-# Farida Khalaf <faridakhalaf@hotmail.com>, 2021
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2021-02-21 18:37+0000\n"
-"Last-Translator: Farida Khalaf <faridakhalaf@hotmail.com>\n"
-"Language-Team: Arabic (http://www.transifex.com/Friendica/friendica/language/ar/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ar\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-
-#: libertree.php:37
-msgid "Post to libertree"
-msgstr ""
-
-#: libertree.php:71 libertree.php:75
-msgid "libertree Export"
-msgstr ""
-
-#: libertree.php:79
-msgid "Enable Libertree Post Addon"
-msgstr ""
-
-#: libertree.php:84
-msgid "Libertree API token"
-msgstr ""
-
-#: libertree.php:89
-msgid "Libertree site URL"
-msgstr ""
-
-#: libertree.php:94
-msgid "Post to Libertree by default"
-msgstr ""
-
-#: libertree.php:100
-msgid "Save Settings"
-msgstr "حفظ الإعدادات"
diff --git a/libertree/lang/ar/strings.php b/libertree/lang/ar/strings.php
deleted file mode 100644
index 285ad303..00000000
--- a/libertree/lang/ar/strings.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_ar")) {
-function string_plural_select_ar($n){
-	$n = intval($n);
-	if ($n==0) { return 0; } else if ($n==1) { return 1; } else if ($n==2) { return 2; } else if ($n%100>=3 && $n%100<=10) { return 3; } else if ($n%100>=11 && $n%100<=99) { return 4; } else  { return 5; }
-}}
-$a->strings['Save Settings'] = 'حفظ الإعدادات';
diff --git a/libertree/lang/cs/messages.po b/libertree/lang/cs/messages.po
index 649fef00..b97b17ed 100644
--- a/libertree/lang/cs/messages.po
+++ b/libertree/lang/cs/messages.po
@@ -4,42 +4,45 @@
 # 
 # 
 # Translators:
-# Aditoo, 2018
-# michal_s <msupler@gmail.com>, 2014-2015
+# Michal Šupler <msupler@gmail.com>, 2014-2015
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:17-0500\n"
-"PO-Revision-Date: 2014-06-23 09:44+0000\n"
-"Last-Translator: Aditoo, 2018\n"
-"Language-Team: Czech (http://app.transifex.com/Friendica/friendica/language/cs/)\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2015-02-11 19:39+0000\n"
+"Last-Translator: Michal Šupler <msupler@gmail.com>\n"
+"Language-Team: Czech (http://www.transifex.com/projects/p/friendica/language/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: cs\n"
-"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: libertree.php:39
+#: libertree.php:36
 msgid "Post to libertree"
 msgstr "Poslat na libertree"
 
-#: libertree.php:60
+#: libertree.php:67
+msgid "libertree Post Settings"
+msgstr "libertree nastavení příspěvků"
+
+#: libertree.php:69
 msgid "Enable Libertree Post Addon"
-msgstr "Povolit doplněk Libertree Post"
+msgstr "Povolit Libertree Post rozšíření"
 
-#: libertree.php:61
-msgid "Libertree site URL"
-msgstr "URL adresa Libertree "
-
-#: libertree.php:62
+#: libertree.php:74
 msgid "Libertree API token"
 msgstr "Libertree API token"
 
-#: libertree.php:63
-msgid "Post to Libertree by default"
-msgstr "Ve výchozím stavu posílat na Libertree"
+#: libertree.php:79
+msgid "Libertree site URL"
+msgstr "URL adresa Libertree "
 
-#: libertree.php:68
-msgid "Libertree Export"
-msgstr ""
+#: libertree.php:84
+msgid "Post to Libertree by default"
+msgstr "Defaultně poslat na Libertree"
+
+#: libertree.php:90
+msgid "Submit"
+msgstr "Odeslat"
diff --git a/libertree/lang/cs/strings.php b/libertree/lang/cs/strings.php
index 49a3dd54..57ad0ff1 100644
--- a/libertree/lang/cs/strings.php
+++ b/libertree/lang/cs/strings.php
@@ -2,11 +2,13 @@
 
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
-	$n = intval($n);
-	if (($n == 1 && $n % 1 == 0)) { return 0; } else if (($n >= 2 && $n <= 4 && $n % 1 == 0)) { return 1; } else if (($n % 1 != 0 )) { return 2; } else  { return 3; }
+	return ($n==1) ? 0 : ($n>=2 && $n<=4) ? 1 : 2;;
 }}
-$a->strings['Post to libertree'] = 'Poslat na libertree';
-$a->strings['Enable Libertree Post Addon'] = 'Povolit doplněk Libertree Post';
-$a->strings['Libertree site URL'] = 'URL adresa Libertree ';
-$a->strings['Libertree API token'] = 'Libertree API token';
-$a->strings['Post to Libertree by default'] = 'Ve výchozím stavu posílat na Libertree';
+;
+$a->strings["Post to libertree"] = "Poslat na libertree";
+$a->strings["libertree Post Settings"] = "libertree nastavení příspěvků";
+$a->strings["Enable Libertree Post Addon"] = "Povolit Libertree Post rozšíření";
+$a->strings["Libertree API token"] = "Libertree API token";
+$a->strings["Libertree site URL"] = "URL adresa Libertree ";
+$a->strings["Post to Libertree by default"] = "Defaultně poslat na Libertree";
+$a->strings["Submit"] = "Odeslat";
diff --git a/libertree/lang/da-dk/messages.po b/libertree/lang/da-dk/messages.po
deleted file mode 100644
index a1d415c6..00000000
--- a/libertree/lang/da-dk/messages.po
+++ /dev/null
@@ -1,43 +0,0 @@
-# ADDON libertree
-# Copyright (C)
-# This file is distributed under the same license as the Friendica libertree addon package.
-# 
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:17-0500\n"
-"PO-Revision-Date: 2014-06-23 09:44+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Danish (Denmark) (http://www.transifex.com/Friendica/friendica/language/da_DK/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: da_DK\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: libertree.php:39
-msgid "Post to libertree"
-msgstr ""
-
-#: libertree.php:60
-msgid "Enable Libertree Post Addon"
-msgstr ""
-
-#: libertree.php:61
-msgid "Libertree site URL"
-msgstr ""
-
-#: libertree.php:62
-msgid "Libertree API token"
-msgstr ""
-
-#: libertree.php:63
-msgid "Post to Libertree by default"
-msgstr ""
-
-#: libertree.php:68
-msgid "Libertree Export"
-msgstr ""
diff --git a/libertree/lang/da-dk/strings.php b/libertree/lang/da-dk/strings.php
deleted file mode 100644
index 09554750..00000000
--- a/libertree/lang/da-dk/strings.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_da_dk")) {
-function string_plural_select_da_dk($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
diff --git a/libertree/lang/de/messages.po b/libertree/lang/de/messages.po
index 434b64ab..970d22dd 100644
--- a/libertree/lang/de/messages.po
+++ b/libertree/lang/de/messages.po
@@ -4,44 +4,46 @@
 # 
 # 
 # Translators:
-# Andreas H., 2014
-# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2014
-# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2018,2021-2022
-# Ulf Rompe <transifex.com@rompe.org>, 2019
+# Abrax <webmaster@a-zwenkau.de>, 2014
+# bavatar <tobias.diekershoff@gmx.net>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:17-0500\n"
-"PO-Revision-Date: 2014-06-23 09:44+0000\n"
-"Last-Translator: Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2018,2021-2022\n"
-"Language-Team: German (http://app.transifex.com/Friendica/friendica/language/de/)\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2014-10-15 12:30+0000\n"
+"Last-Translator: Abrax <webmaster@a-zwenkau.de>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/friendica/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: libertree.php:39
+#: libertree.php:36
 msgid "Post to libertree"
 msgstr "bei libertree veröffentlichen"
 
-#: libertree.php:60
+#: libertree.php:67
+msgid "libertree Post Settings"
+msgstr "libertree Post Einstellungen"
+
+#: libertree.php:69
 msgid "Enable Libertree Post Addon"
-msgstr "Libertree-Post-Addon aktivieren"
+msgstr "Libertree Post Addon aktivieren"
 
-#: libertree.php:61
-msgid "Libertree site URL"
-msgstr "Libertree-URL"
-
-#: libertree.php:62
+#: libertree.php:74
 msgid "Libertree API token"
-msgstr "Libertree-API-Token"
+msgstr "Libertree API Token"
 
-#: libertree.php:63
+#: libertree.php:79
+msgid "Libertree site URL"
+msgstr "Libertree URL"
+
+#: libertree.php:84
 msgid "Post to Libertree by default"
 msgstr "Standardmäßig bei libertree veröffentlichen"
 
-#: libertree.php:68
-msgid "Libertree Export"
-msgstr "Libertree Export"
+#: libertree.php:90
+msgid "Submit"
+msgstr "Senden"
diff --git a/libertree/lang/de/strings.php b/libertree/lang/de/strings.php
index f3a8a512..c6867705 100644
--- a/libertree/lang/de/strings.php
+++ b/libertree/lang/de/strings.php
@@ -2,12 +2,13 @@
 
 if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Post to libertree'] = 'bei libertree veröffentlichen';
-$a->strings['Enable Libertree Post Addon'] = 'Libertree-Post-Addon aktivieren';
-$a->strings['Libertree site URL'] = 'Libertree-URL';
-$a->strings['Libertree API token'] = 'Libertree-API-Token';
-$a->strings['Post to Libertree by default'] = 'Standardmäßig bei libertree veröffentlichen';
-$a->strings['Libertree Export'] = 'Libertree Export';
+;
+$a->strings["Post to libertree"] = "bei libertree veröffentlichen";
+$a->strings["libertree Post Settings"] = "libertree Post Einstellungen";
+$a->strings["Enable Libertree Post Addon"] = "Libertree Post Addon aktivieren";
+$a->strings["Libertree API token"] = "Libertree API Token";
+$a->strings["Libertree site URL"] = "Libertree URL";
+$a->strings["Post to Libertree by default"] = "Standardmäßig bei libertree veröffentlichen";
+$a->strings["Submit"] = "Senden";
diff --git a/libertree/lang/es/messages.po b/libertree/lang/es/messages.po
index ca592500..d6005765 100644
--- a/libertree/lang/es/messages.po
+++ b/libertree/lang/es/messages.po
@@ -5,14 +5,13 @@
 # 
 # Translators:
 # Albert, 2016
-# Senex Petrovic <javierruizo@hotmail.com>, 2021
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2021-04-01 10:03+0000\n"
-"Last-Translator: Senex Petrovic <javierruizo@hotmail.com>\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2016-11-17 20:15+0000\n"
+"Last-Translator: Albert\n"
 "Language-Team: Spanish (http://www.transifex.com/Friendica/friendica/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,30 +19,30 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: libertree.php:37
+#: libertree.php:36
 msgid "Post to libertree"
 msgstr "Publicar en Libertree"
 
-#: libertree.php:71 libertree.php:75
-msgid "libertree Export"
-msgstr "libertree Exportar"
+#: libertree.php:67
+msgid "libertree Post Settings"
+msgstr "Ajustes de Publicación de Libertree"
 
-#: libertree.php:79
+#: libertree.php:69
 msgid "Enable Libertree Post Addon"
-msgstr "Habilitar Plugin de publicación de Libertree"
+msgstr "Habilitar Addon de publicación de Libertree"
 
-#: libertree.php:84
+#: libertree.php:74
 msgid "Libertree API token"
 msgstr "Símbolo de API de Libertree"
 
-#: libertree.php:89
+#: libertree.php:79
 msgid "Libertree site URL"
 msgstr "URL de la página de Libertree"
 
-#: libertree.php:94
+#: libertree.php:84
 msgid "Post to Libertree by default"
 msgstr "Publicar en Libertree por defecto"
 
-#: libertree.php:100
-msgid "Save Settings"
-msgstr "Guardar Ajustes"
+#: libertree.php:90
+msgid "Submit"
+msgstr "Enviar"
diff --git a/libertree/lang/es/strings.php b/libertree/lang/es/strings.php
index 8244891a..8a8dbf1f 100644
--- a/libertree/lang/es/strings.php
+++ b/libertree/lang/es/strings.php
@@ -2,13 +2,13 @@
 
 if(! function_exists("string_plural_select_es")) {
 function string_plural_select_es($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Post to libertree'] = 'Publicar en Libertree';
-$a->strings['libertree Export'] = 'libertree Exportar';
-$a->strings['Enable Libertree Post Addon'] = 'Habilitar Plugin de publicación de Libertree';
-$a->strings['Libertree API token'] = 'Símbolo de API de Libertree';
-$a->strings['Libertree site URL'] = 'URL de la página de Libertree';
-$a->strings['Post to Libertree by default'] = 'Publicar en Libertree por defecto';
-$a->strings['Save Settings'] = 'Guardar Ajustes';
+;
+$a->strings["Post to libertree"] = "Publicar en Libertree";
+$a->strings["libertree Post Settings"] = "Ajustes de Publicación de Libertree";
+$a->strings["Enable Libertree Post Addon"] = "Habilitar Addon de publicación de Libertree";
+$a->strings["Libertree API token"] = "Símbolo de API de Libertree";
+$a->strings["Libertree site URL"] = "URL de la página de Libertree";
+$a->strings["Post to Libertree by default"] = "Publicar en Libertree por defecto";
+$a->strings["Submit"] = "Enviar";
diff --git a/libertree/lang/fi-fi/strings.php b/libertree/lang/fi-fi/strings.php
index 07cb5683..b24fde82 100644
--- a/libertree/lang/fi-fi/strings.php
+++ b/libertree/lang/fi-fi/strings.php
@@ -2,12 +2,13 @@
 
 if(! function_exists("string_plural_select_fi_fi")) {
 function string_plural_select_fi_fi($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Post to libertree'] = 'Lähetä Libertreehin';
-$a->strings['libertree Post Settings'] = 'Libertree -viestin asetukset';
-$a->strings['Enable Libertree Post Addon'] = 'Ota Libertree -viestilisäosa käyttöön';
-$a->strings['Libertree site URL'] = 'Libertree -sivuston URL-osoite';
-$a->strings['Post to Libertree by default'] = 'Lähetä Libertreehin oletuksena';
-$a->strings['Submit'] = 'Lähetä';
+;
+$a->strings["Post to libertree"] = "Lähetä Libertreehin";
+$a->strings["libertree Post Settings"] = "Libertree -viestin asetukset";
+$a->strings["Enable Libertree Post Addon"] = "Ota Libertree -viestilisäosa käyttöön";
+$a->strings["Libertree API token"] = "";
+$a->strings["Libertree site URL"] = "Libertree -sivuston URL-osoite";
+$a->strings["Post to Libertree by default"] = "Lähetä Libertreehin oletuksena";
+$a->strings["Submit"] = "Lähetä";
diff --git a/libertree/lang/fr/messages.po b/libertree/lang/fr/messages.po
index 5a1bd9f0..6deb7b4e 100644
--- a/libertree/lang/fr/messages.po
+++ b/libertree/lang/fr/messages.po
@@ -4,43 +4,45 @@
 # 
 # 
 # Translators:
-# bob lebonche <lebonche@tutanota.com>, 2021
-# Hypolite Petovan <hypolite@mrpetovan.com>, 2022
-# ea1cd8241cb389ffb6f92bc6891eff5d_dc12308 <70dced5587d47e18d88f9298024d96f8_93383>, 2015
+# Nicola Spanti <translations@nicola-spanti.info>, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:17-0500\n"
-"PO-Revision-Date: 2014-06-23 09:44+0000\n"
-"Last-Translator: Hypolite Petovan <hypolite@mrpetovan.com>, 2022\n"
-"Language-Team: French (http://www.transifex.com/Friendica/friendica/language/fr/)\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2015-07-27 18:21+0000\n"
+"Last-Translator: Nicola Spanti <translations@nicola-spanti.info>\n"
+"Language-Team: French (http://www.transifex.com/projects/p/friendica/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fr\n"
-"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: libertree.php:39
+#: libertree.php:36
 msgid "Post to libertree"
 msgstr "Publier sur libertree"
 
-#: libertree.php:60
+#: libertree.php:67
+msgid "libertree Post Settings"
+msgstr "Réglages des messages sur libertree"
+
+#: libertree.php:69
 msgid "Enable Libertree Post Addon"
-msgstr "Activer l'extension de publication Libertree"
+msgstr "Activer leaddonde publication sur libertree"
 
-#: libertree.php:61
-msgid "Libertree site URL"
-msgstr "URL du site libertree"
-
-#: libertree.php:62
+#: libertree.php:74
 msgid "Libertree API token"
 msgstr "Clé de l'API libertree"
 
-#: libertree.php:63
+#: libertree.php:79
+msgid "Libertree site URL"
+msgstr "URL du site libertree"
+
+#: libertree.php:84
 msgid "Post to Libertree by default"
 msgstr "Publier sur libertree par défaut"
 
-#: libertree.php:68
-msgid "Libertree Export"
-msgstr "Export Libertree"
+#: libertree.php:90
+msgid "Submit"
+msgstr "Envoyer"
diff --git a/libertree/lang/fr/strings.php b/libertree/lang/fr/strings.php
index d567a8e9..e3e9ff7e 100644
--- a/libertree/lang/fr/strings.php
+++ b/libertree/lang/fr/strings.php
@@ -2,12 +2,13 @@
 
 if(! function_exists("string_plural_select_fr")) {
 function string_plural_select_fr($n){
-	$n = intval($n);
-	if (($n == 0 || $n == 1)) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
+	return ($n > 1);;
 }}
-$a->strings['Post to libertree'] = 'Publier sur libertree';
-$a->strings['Enable Libertree Post Addon'] = 'Activer l\'extension de publication Libertree';
-$a->strings['Libertree site URL'] = 'URL du site libertree';
-$a->strings['Libertree API token'] = 'Clé de l\'API libertree';
-$a->strings['Post to Libertree by default'] = 'Publier sur libertree par défaut';
-$a->strings['Libertree Export'] = 'Export Libertree';
+;
+$a->strings["Post to libertree"] = "Publier sur libertree";
+$a->strings["libertree Post Settings"] = "Réglages des messages sur libertree";
+$a->strings["Enable Libertree Post Addon"] = "Activer leaddonde publication sur libertree";
+$a->strings["Libertree API token"] = "Clé de l'API libertree";
+$a->strings["Libertree site URL"] = "URL du site libertree";
+$a->strings["Post to Libertree by default"] = "Publier sur libertree par défaut";
+$a->strings["Submit"] = "Envoyer";
diff --git a/libertree/lang/hu/messages.po b/libertree/lang/hu/messages.po
deleted file mode 100644
index 83016c6c..00000000
--- a/libertree/lang/hu/messages.po
+++ /dev/null
@@ -1,44 +0,0 @@
-# ADDON libertree
-# Copyright (C)
-# This file is distributed under the same license as the Friendica libertree addon package.
-# 
-# 
-# Translators:
-# Balázs Úr, 2020-2021
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:17-0500\n"
-"PO-Revision-Date: 2014-06-23 09:44+0000\n"
-"Last-Translator: Balázs Úr, 2020-2021\n"
-"Language-Team: Hungarian (http://www.transifex.com/Friendica/friendica/language/hu/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: hu\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: libertree.php:39
-msgid "Post to libertree"
-msgstr "Beküldés a Libertree-re"
-
-#: libertree.php:60
-msgid "Enable Libertree Post Addon"
-msgstr "A Libertree-beküldő bővítmény engedélyezése"
-
-#: libertree.php:61
-msgid "Libertree site URL"
-msgstr "Libertree oldal URL"
-
-#: libertree.php:62
-msgid "Libertree API token"
-msgstr "Libertree API token"
-
-#: libertree.php:63
-msgid "Post to Libertree by default"
-msgstr "Beküldés a Libertree-re alapértelmezetten"
-
-#: libertree.php:68
-msgid "Libertree Export"
-msgstr "Libertree exportálás"
diff --git a/libertree/lang/hu/strings.php b/libertree/lang/hu/strings.php
deleted file mode 100644
index 78f1179c..00000000
--- a/libertree/lang/hu/strings.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_hu")) {
-function string_plural_select_hu($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Post to libertree'] = 'Beküldés a Libertree-re';
-$a->strings['Enable Libertree Post Addon'] = 'A Libertree-beküldő bővítmény engedélyezése';
-$a->strings['Libertree site URL'] = 'Libertree oldal URL';
-$a->strings['Libertree API token'] = 'Libertree API token';
-$a->strings['Post to Libertree by default'] = 'Beküldés a Libertree-re alapértelmezetten';
-$a->strings['Libertree Export'] = 'Libertree exportálás';
diff --git a/libertree/lang/it/messages.po b/libertree/lang/it/messages.po
index 7c3bc1ec..a13219a6 100644
--- a/libertree/lang/it/messages.po
+++ b/libertree/lang/it/messages.po
@@ -5,14 +5,13 @@
 # 
 # Translators:
 # fabrixxm <fabrix.xm@gmail.com>, 2014-2015,2018
-# Sylke Vicious <silkevicious@gmail.com>, 2021
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2021-02-16 12:47+0000\n"
-"Last-Translator: Sylke Vicious <silkevicious@gmail.com>\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2018-03-19 13:22+0000\n"
+"Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,30 +19,30 @@ msgstr ""
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: libertree.php:37
+#: libertree.php:36
 msgid "Post to libertree"
 msgstr "Invia a Libertree"
 
-#: libertree.php:71 libertree.php:75
-msgid "libertree Export"
-msgstr "Esporta libertree"
+#: libertree.php:67
+msgid "libertree Post Settings"
+msgstr "Impostazioni di invio a Libertree"
 
-#: libertree.php:79
+#: libertree.php:69
 msgid "Enable Libertree Post Addon"
 msgstr "Abilita il componente aggiuntivo di invio a Libertree"
 
-#: libertree.php:84
+#: libertree.php:74
 msgid "Libertree API token"
 msgstr "Token API Libertree"
 
-#: libertree.php:89
+#: libertree.php:79
 msgid "Libertree site URL"
 msgstr "Indirizzo sito Libertree"
 
-#: libertree.php:94
+#: libertree.php:84
 msgid "Post to Libertree by default"
 msgstr "Invia sempre a Libertree"
 
-#: libertree.php:100
-msgid "Save Settings"
-msgstr "Salva Impostazioni"
+#: libertree.php:90
+msgid "Submit"
+msgstr "Invia"
diff --git a/libertree/lang/it/strings.php b/libertree/lang/it/strings.php
index 02d26542..91984f9d 100644
--- a/libertree/lang/it/strings.php
+++ b/libertree/lang/it/strings.php
@@ -2,13 +2,13 @@
 
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Post to libertree'] = 'Invia a Libertree';
-$a->strings['libertree Export'] = 'Esporta libertree';
-$a->strings['Enable Libertree Post Addon'] = 'Abilita il componente aggiuntivo di invio a Libertree';
-$a->strings['Libertree API token'] = 'Token API Libertree';
-$a->strings['Libertree site URL'] = 'Indirizzo sito Libertree';
-$a->strings['Post to Libertree by default'] = 'Invia sempre a Libertree';
-$a->strings['Save Settings'] = 'Salva Impostazioni';
+;
+$a->strings["Post to libertree"] = "Invia a Libertree";
+$a->strings["libertree Post Settings"] = "Impostazioni di invio a Libertree";
+$a->strings["Enable Libertree Post Addon"] = "Abilita il componente aggiuntivo di invio a Libertree";
+$a->strings["Libertree API token"] = "Token API Libertree";
+$a->strings["Libertree site URL"] = "Indirizzo sito Libertree";
+$a->strings["Post to Libertree by default"] = "Invia sempre a Libertree";
+$a->strings["Submit"] = "Invia";
diff --git a/libertree/lang/nl/strings.php b/libertree/lang/nl/strings.php
index 320ab713..1b8524f2 100644
--- a/libertree/lang/nl/strings.php
+++ b/libertree/lang/nl/strings.php
@@ -3,9 +3,13 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Post to libertree'] = 'Plaatsen op Libertree';
-$a->strings['libertree Post Settings'] = 'Libertree Post instellingen';
-$a->strings['Enable Libertree Post Addon'] = 'Libertree Post Addon inschakelen';
-$a->strings['Post to Libertree by default'] = 'Plaatsen op Libertree als standaard instellen ';
+;
+$a->strings["Post to libertree"] = "Plaatsen op Libertree";
+$a->strings["libertree Post Settings"] = "Libertree Post instellingen";
+$a->strings["Enable Libertree Post Addon"] = "Libertree Post Addon inschakelen";
+$a->strings["Libertree API token"] = "";
+$a->strings["Libertree site URL"] = "";
+$a->strings["Post to Libertree by default"] = "Plaatsen op Libertree als standaard instellen ";
+$a->strings["Submit"] = "";
diff --git a/libertree/lang/pl/messages.po b/libertree/lang/pl/messages.po
index 1a217c35..a119f691 100644
--- a/libertree/lang/pl/messages.po
+++ b/libertree/lang/pl/messages.po
@@ -4,15 +4,14 @@
 # 
 # 
 # Translators:
-# Piotr Strębski <strebski@gmail.com>, 2022
-# Waldemar Stoczkowski, 2018
+# Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:17-0500\n"
-"PO-Revision-Date: 2014-06-23 09:44+0000\n"
-"Last-Translator: Piotr Strębski <strebski@gmail.com>, 2022\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2018-08-04 11:56+0000\n"
+"Last-Translator: Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.com/Friendica/friendica/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,26 +19,30 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
-#: libertree.php:39
+#: libertree.php:36
 msgid "Post to libertree"
 msgstr "Opublikuj na libertree"
 
-#: libertree.php:60
+#: libertree.php:67
+msgid "libertree Post Settings"
+msgstr "Ustawienia libertree Post"
+
+#: libertree.php:69
 msgid "Enable Libertree Post Addon"
 msgstr "Włącz dodatek Libertree Post"
 
-#: libertree.php:61
-msgid "Libertree site URL"
-msgstr "Adres URL witryny Libertree"
-
-#: libertree.php:62
+#: libertree.php:74
 msgid "Libertree API token"
 msgstr "Token API Libertree"
 
-#: libertree.php:63
+#: libertree.php:79
+msgid "Libertree site URL"
+msgstr "Adres URL witryny Libertree"
+
+#: libertree.php:84
 msgid "Post to Libertree by default"
 msgstr "Wyślij domyślnie do Libertree"
 
-#: libertree.php:68
-msgid "Libertree Export"
-msgstr "Eksport do Libertree"
+#: libertree.php:90
+msgid "Submit"
+msgstr "Wyślij"
diff --git a/libertree/lang/pl/strings.php b/libertree/lang/pl/strings.php
index 5c7d076f..1c535c33 100644
--- a/libertree/lang/pl/strings.php
+++ b/libertree/lang/pl/strings.php
@@ -3,11 +3,13 @@
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
 	$n = intval($n);
-	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
+	return ($n==1 ? 0 : ($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14) ? 1 : $n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14) ? 2 : 3);;
 }}
-$a->strings['Post to libertree'] = 'Opublikuj na libertree';
-$a->strings['Enable Libertree Post Addon'] = 'Włącz dodatek Libertree Post';
-$a->strings['Libertree site URL'] = 'Adres URL witryny Libertree';
-$a->strings['Libertree API token'] = 'Token API Libertree';
-$a->strings['Post to Libertree by default'] = 'Wyślij domyślnie do Libertree';
-$a->strings['Libertree Export'] = 'Eksport do Libertree';
+;
+$a->strings["Post to libertree"] = "Opublikuj na libertree";
+$a->strings["libertree Post Settings"] = "Ustawienia libertree Post";
+$a->strings["Enable Libertree Post Addon"] = "Włącz dodatek Libertree Post";
+$a->strings["Libertree API token"] = "Token API Libertree";
+$a->strings["Libertree site URL"] = "Adres URL witryny Libertree";
+$a->strings["Post to Libertree by default"] = "Wyślij domyślnie do Libertree";
+$a->strings["Submit"] = "Wyślij";
diff --git a/libertree/lang/pt-br/strings.php b/libertree/lang/pt-br/strings.php
index 86193be1..d55aee61 100644
--- a/libertree/lang/pt-br/strings.php
+++ b/libertree/lang/pt-br/strings.php
@@ -2,11 +2,13 @@
 
 if(! function_exists("string_plural_select_pt_br")) {
 function string_plural_select_pt_br($n){
-	$n = intval($n);
-	return intval($n > 1);
+	return ($n > 1);;
 }}
-$a->strings['Post to libertree'] = 'Publicar no Libertree';
-$a->strings['libertree Post Settings'] = 'Configurações de publicação do Libertree';
-$a->strings['Enable Libertree Post Addon'] = 'Habilitar plug-in para publicar no Libertree';
-$a->strings['Post to Libertree by default'] = 'Publicar no Libertree por padrão';
-$a->strings['Submit'] = 'Enviar';
+;
+$a->strings["Post to libertree"] = "Publicar no Libertree";
+$a->strings["libertree Post Settings"] = "Configurações de publicação do Libertree";
+$a->strings["Enable Libertree Post Addon"] = "Habilitar plug-in para publicar no Libertree";
+$a->strings["Libertree API token"] = "";
+$a->strings["Libertree site URL"] = "";
+$a->strings["Post to Libertree by default"] = "Publicar no Libertree por padrão";
+$a->strings["Submit"] = "Enviar";
diff --git a/libertree/lang/ro/strings.php b/libertree/lang/ro/strings.php
index 53240d49..efa612ed 100644
--- a/libertree/lang/ro/strings.php
+++ b/libertree/lang/ro/strings.php
@@ -2,13 +2,13 @@
 
 if(! function_exists("string_plural_select_ro")) {
 function string_plural_select_ro($n){
-	$n = intval($n);
-	if ($n==1) { return 0; } else if ((($n%100>19)||(($n%100==0)&&($n!=0)))) { return 2; } else  { return 1; }
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
 }}
-$a->strings['Post to libertree'] = 'Postați pe libertree';
-$a->strings['libertree Post Settings'] = 'Configurări Postări libertree ';
-$a->strings['Enable Libertree Post Addon'] = 'Activare Modul Postare Libertree';
-$a->strings['Libertree API token'] = 'Token API Libertree';
-$a->strings['Libertree site URL'] = 'URL site Libertree';
-$a->strings['Post to Libertree by default'] = 'Postați implicit pe Libertree';
-$a->strings['Submit'] = 'Trimite';
+;
+$a->strings["Post to libertree"] = "Postați pe libertree";
+$a->strings["libertree Post Settings"] = "Configurări Postări libertree ";
+$a->strings["Enable Libertree Post Addon"] = "Activare Modul Postare Libertree";
+$a->strings["Libertree API token"] = "Token API Libertree";
+$a->strings["Libertree site URL"] = "URL site Libertree";
+$a->strings["Post to Libertree by default"] = "Postați implicit pe Libertree";
+$a->strings["Submit"] = "Trimite";
diff --git a/libertree/lang/ru/messages.po b/libertree/lang/ru/messages.po
deleted file mode 100644
index 52f10f00..00000000
--- a/libertree/lang/ru/messages.po
+++ /dev/null
@@ -1,48 +0,0 @@
-# ADDON libertree
-# Copyright (C)
-# This file is distributed under the same license as the Friendica libertree addon package.
-# 
-# 
-# Translators:
-# Alexander An <ravnina@gmail.com>, 2021
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2021-03-03 17:44+0000\n"
-"Last-Translator: Alexander An <ravnina@gmail.com>\n"
-"Language-Team: Russian (http://www.transifex.com/Friendica/friendica/language/ru/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ru\n"
-"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
-
-#: libertree.php:37
-msgid "Post to libertree"
-msgstr "Отправлять в Libertree"
-
-#: libertree.php:71 libertree.php:75
-msgid "libertree Export"
-msgstr ""
-
-#: libertree.php:79
-msgid "Enable Libertree Post Addon"
-msgstr "Включить отправку в Libertree"
-
-#: libertree.php:84
-msgid "Libertree API token"
-msgstr ""
-
-#: libertree.php:89
-msgid "Libertree site URL"
-msgstr ""
-
-#: libertree.php:94
-msgid "Post to Libertree by default"
-msgstr "Отправлять записи в Libertree по-умолчанию"
-
-#: libertree.php:100
-msgid "Save Settings"
-msgstr ""
diff --git a/libertree/lang/ru/strings.php b/libertree/lang/ru/strings.php
index 0db3f6a2..9d1522a4 100644
--- a/libertree/lang/ru/strings.php
+++ b/libertree/lang/ru/strings.php
@@ -1,10 +1,9 @@
-<?php
-
-if(! function_exists("string_plural_select_ru")) {
-function string_plural_select_ru($n){
-	$n = intval($n);
-	if ($n%10==1 && $n%100!=11) { return 0; } else if ($n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14)) { return 1; } else if ($n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)) { return 2; } else  { return 3; }
-}}
-$a->strings['Post to libertree'] = 'Отправлять в Libertree';
-$a->strings['Enable Libertree Post Addon'] = 'Включить отправку в Libertree';
-$a->strings['Post to Libertree by default'] = 'Отправлять записи в Libertree по-умолчанию';
+<?php
+
+$a->strings["Post to libertree"] = "";
+$a->strings["libertree Post Settings"] = "";
+$a->strings["Enable Libertree Post Addon"] = "";
+$a->strings["Libertree API token"] = "";
+$a->strings["Libertree site URL"] = "";
+$a->strings["Post to Libertree by default"] = "";
+$a->strings["Submit"] = "Подтвердить";
diff --git a/libertree/lang/sv/messages.po b/libertree/lang/sv/messages.po
deleted file mode 100644
index 7a191534..00000000
--- a/libertree/lang/sv/messages.po
+++ /dev/null
@@ -1,43 +0,0 @@
-# ADDON libertree
-# Copyright (C)
-# This file is distributed under the same license as the Friendica libertree addon package.
-# 
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:17-0500\n"
-"PO-Revision-Date: 2021-12-22 15:27+0000\n"
-"Last-Translator: Transifex Bot <>\n"
-"Language-Team: Swedish (http://www.transifex.com/Friendica/friendica/language/sv/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: sv\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: libertree.php:39
-msgid "Post to libertree"
-msgstr ""
-
-#: libertree.php:60
-msgid "Enable Libertree Post Addon"
-msgstr ""
-
-#: libertree.php:61
-msgid "Libertree site URL"
-msgstr ""
-
-#: libertree.php:62
-msgid "Libertree API token"
-msgstr ""
-
-#: libertree.php:63
-msgid "Post to Libertree by default"
-msgstr ""
-
-#: libertree.php:68
-msgid "Libertree Export"
-msgstr ""
diff --git a/libertree/lang/sv/strings.php b/libertree/lang/sv/strings.php
index 72e9772f..3ec569a7 100644
--- a/libertree/lang/sv/strings.php
+++ b/libertree/lang/sv/strings.php
@@ -1,7 +1,3 @@
-<?php
-
-if(! function_exists("string_plural_select_sv")) {
-function string_plural_select_sv($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
+<?php
+
+$a->strings["Submit"] = "Spara";
diff --git a/libertree/lang/zh-cn/strings.php b/libertree/lang/zh-cn/strings.php
index f0c1e97c..212f5146 100644
--- a/libertree/lang/zh-cn/strings.php
+++ b/libertree/lang/zh-cn/strings.php
@@ -3,12 +3,13 @@
 if(! function_exists("string_plural_select_zh_cn")) {
 function string_plural_select_zh_cn($n){
 	$n = intval($n);
-	return intval(0);
+	return 0;;
 }}
-$a->strings['Post to libertree'] = '发布到 libertree';
-$a->strings['libertree Post Settings'] = 'libertree 发布设置';
-$a->strings['Enable Libertree Post Addon'] = '启用 Libertree 发布插件';
-$a->strings['Libertree API token'] = 'Libertree API 令牌';
-$a->strings['Libertree site URL'] = 'Libertree 站点 URL';
-$a->strings['Post to Libertree by default'] = '默认发布到 Libertree';
-$a->strings['Submit'] = '提交';
+;
+$a->strings["Post to libertree"] = "发布到 libertree";
+$a->strings["libertree Post Settings"] = "libertree 发布设置";
+$a->strings["Enable Libertree Post Addon"] = "启用 Libertree 发布插件";
+$a->strings["Libertree API token"] = "Libertree API 令牌";
+$a->strings["Libertree site URL"] = "Libertree 站点 URL";
+$a->strings["Post to Libertree by default"] = "默认发布到 Libertree";
+$a->strings["Submit"] = "提交";
diff --git a/libertree/libertree.css b/libertree/libertree.css
new file mode 100644
index 00000000..1554048b
--- /dev/null
+++ b/libertree/libertree.css
@@ -0,0 +1,16 @@
+
+#libertree-enable-label, #libertree-api_token-label, #libertree-url-label, #libertree-bydefault-label {
+	float: left;
+	width: 200px;
+	margin-top: 10px;
+}
+
+#libertree-checkbox, #libertree-api_token, #libertree-url, #libertree-bydefault {
+	float: left;
+	margin-top: 10px;
+}
+
+#libertree-submit {
+	margin-top: 15px;
+}
+
diff --git a/libertree/libertree.php b/libertree/libertree.php
index f69c0aab..034833e8 100644
--- a/libertree/libertree.php
+++ b/libertree/libertree.php
@@ -9,11 +9,11 @@
 use Friendica\App;
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Hook;
+use Friendica\Core\L10n;
 use Friendica\Core\Logger;
-use Friendica\Core\Renderer;
+use Friendica\Core\PConfig;
 use Friendica\Database\DBA;
-use Friendica\DI;
-use Friendica\Model\Post;
+use Friendica\Util\Network;
 
 function libertree_install()
 {
@@ -25,65 +25,109 @@ function libertree_install()
 	Hook::register('connector_settings_post', 'addon/libertree/libertree.php', 'libertree_settings_post');
 }
 
-function libertree_jot_nets(array &$jotnets_fields)
+function libertree_uninstall()
 {
-	if (!DI::userSession()->getLocalUserId()) {
-		return;
-	}
+	Hook::unregister('hook_fork',        'addon/libertree/libertree.php', 'libertree_hook_fork');
+	Hook::unregister('post_local',       'addon/libertree/libertree.php', 'libertree_post_local');
+	Hook::unregister('notifier_normal',  'addon/libertree/libertree.php', 'libertree_send');
+	Hook::unregister('jot_networks',     'addon/libertree/libertree.php', 'libertree_jot_nets');
+	Hook::unregister('connector_settings',      'addon/libertree/libertree.php', 'libertree_settings');
+	Hook::unregister('connector_settings_post', 'addon/libertree/libertree.php', 'libertree_settings_post');
+}
 
-	if (DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'libertree', 'post')) {
+function libertree_jot_nets(App &$a, array &$jotnets_fields)
+{
+    if(! local_user()) {
+        return;
+    }
+
+	if (PConfig::get(local_user(), 'libertree', 'post')) {
 		$jotnets_fields[] = [
 			'type' => 'checkbox',
 			'field' => [
 				'libertree_enable',
-				DI::l10n()->t('Post to libertree'),
-				DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'libertree', 'post_by_default'),
-			],
+				L10n::t('Post to libertree'),
+				PConfig::get(local_user(), 'libertree', 'post_by_default')
+			]
 		];
 	}
 }
 
-function libertree_settings(array &$data)
-{
-	if (!DI::userSession()->getLocalUserId()) {
-		return;
-	}
 
-	$enabled         = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'libertree', 'post', false);
-	$ltree_api_token = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'libertree', 'libertree_api_token');
-	$ltree_url       = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'libertree', 'libertree_url');
-	$def_enabled     = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'libertree', 'post_by_default');
+function libertree_settings(&$a,&$s) {
 
-	$t    = Renderer::getMarkupTemplate('connector_settings.tpl', 'addon/libertree/');
-	$html = Renderer::replaceMacros($t, [
-		'$enabled'         => ['libertree', DI::l10n()->t('Enable Libertree Post Addon'), $enabled],
-		'$ltree_url'       => ['libertree_url', DI::l10n()->t('Libertree site URL'), $ltree_url],
-		'$ltree_api_token' => ['libertree_api_token', DI::l10n()->t('Libertree API token'), $ltree_api_token],
-		'$bydefault'       => ['ij_bydefault', DI::l10n()->t('Post to Libertree by default'), $def_enabled],
-	]);
+    if(! local_user())
+        return;
+
+    /* Add our stylesheet to the page so we can make our settings look nice */
+
+    $a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->getBaseURL() . '/addon/libertree/libertree.css' . '" media="all" />' . "\r\n";
+
+    /* Get the current state of our config variables */
+
+    $enabled = PConfig::get(local_user(),'libertree','post');
+    $checked = (($enabled) ? ' checked="checked" ' : '');
+    $css = (($enabled) ? '' : '-disabled');
+
+    $def_enabled = PConfig::get(local_user(),'libertree','post_by_default');
+
+    $def_checked = (($def_enabled) ? ' checked="checked" ' : '');
+
+    $ltree_api_token = PConfig::get(local_user(), 'libertree', 'libertree_api_token');
+    $ltree_url = PConfig::get(local_user(), 'libertree', 'libertree_url');
+
+
+    /* Add some HTML to the existing form */
+
+    $s .= '<span id="settings_libertree_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_libertree_expanded\'); openClose(\'settings_libertree_inflated\');">';
+    $s .= '<img class="connector'.$css.'" src="images/libertree.png" /><h3 class="connector">'. L10n::t('libertree Export').'</h3>';
+    $s .= '</span>';
+    $s .= '<div id="settings_libertree_expanded" class="settings-block" style="display: none;">';
+    $s .= '<span class="fakelink" onclick="openClose(\'settings_libertree_expanded\'); openClose(\'settings_libertree_inflated\');">';
+    $s .= '<img class="connector'.$css.'" src="images/libertree.png" /><h3 class="connector">'. L10n::t('libertree Export').'</h3>';
+    $s .= '</span>';
+
+    $s .= '<div id="libertree-enable-wrapper">';
+    $s .= '<label id="libertree-enable-label" for="libertree-checkbox">' . L10n::t('Enable Libertree Post Addon') . '</label>';
+    $s .= '<input id="libertree-checkbox" type="checkbox" name="libertree" value="1" ' . $checked . '/>';
+    $s .= '</div><div class="clear"></div>';
+
+    $s .= '<div id="libertree-api_token-wrapper">';
+    $s .= '<label id="libertree-api_token-label" for="libertree-api_token">' . L10n::t('Libertree API token') . '</label>';
+    $s .= '<input id="libertree-api_token" type="text" name="libertree_api_token" value="' . $ltree_api_token . '" />';
+    $s .= '</div><div class="clear"></div>';
+
+    $s .= '<div id="libertree-url-wrapper">';
+    $s .= '<label id="libertree-url-label" for="libertree-url">' . L10n::t('Libertree site URL') . '</label>';
+    $s .= '<input id="libertree-url" type="text" name="libertree_url" value="' . $ltree_url . '" />';
+    $s .= '</div><div class="clear"></div>';
+
+    $s .= '<div id="libertree-bydefault-wrapper">';
+    $s .= '<label id="libertree-bydefault-label" for="libertree-bydefault">' . L10n::t('Post to Libertree by default') . '</label>';
+    $s .= '<input id="libertree-bydefault" type="checkbox" name="libertree_bydefault" value="1" ' . $def_checked . '/>';
+    $s .= '</div><div class="clear"></div>';
+
+    /* provide a submit button */
+
+    $s .= '<div class="settings-submit-wrapper" ><input type="submit" id="libertree-submit" name="libertree-submit" class="settings-submit" value="' . L10n::t('Save Settings') . '" /></div></div>';
 
-	$data = [
-		'connector' => 'libertree',
-		'title'     => DI::l10n()->t('Libertree Export'),
-		'image'     => 'images/libertree.png',
-		'enabled'   => $enabled,
-		'html'      => $html,
-	];
 }
 
-function libertree_settings_post(array &$b)
-{
-	if (!empty($_POST['libertree-submit'])) {
-		DI::pConfig()->set(DI::userSession()->getLocalUserId(),'libertree','post',intval($_POST['libertree']));
-		DI::pConfig()->set(DI::userSession()->getLocalUserId(),'libertree','post_by_default',intval($_POST['libertree_bydefault']));
-		DI::pConfig()->set(DI::userSession()->getLocalUserId(),'libertree','libertree_api_token',trim($_POST['libertree_api_token']));
-		DI::pConfig()->set(DI::userSession()->getLocalUserId(),'libertree','libertree_url',trim($_POST['libertree_url']));
+
+function libertree_settings_post(&$a,&$b) {
+
+	if(!empty($_POST['libertree-submit'])) {
+
+		PConfig::set(local_user(),'libertree','post',intval($_POST['libertree']));
+		PConfig::set(local_user(),'libertree','post_by_default',intval($_POST['libertree_bydefault']));
+		PConfig::set(local_user(),'libertree','libertree_api_token',trim($_POST['libertree_api_token']));
+		PConfig::set(local_user(),'libertree','libertree_url',trim($_POST['libertree_url']));
 
 	}
 
 }
 
-function libertree_hook_fork(array &$b)
+function libertree_hook_fork(App &$a, array &$b)
 {
 	if ($b['name'] != 'notifier_normal') {
 		return;
@@ -98,8 +142,7 @@ function libertree_hook_fork(array &$b)
 	}
 }
 
-function libertree_post_local(array &$b)
-{
+function libertree_post_local(&$a,&$b) {
 
 	// This can probably be changed to allow editing by pointing to a different API endpoint
 
@@ -107,7 +150,7 @@ function libertree_post_local(array &$b)
 		return;
 	}
 
-	if (!DI::userSession()->getLocalUserId() || (DI::userSession()->getLocalUserId() != $b['uid'])) {
+	if ((! local_user()) || (local_user() != $b['uid'])) {
 		return;
 	}
 
@@ -115,11 +158,11 @@ function libertree_post_local(array &$b)
 		return;
 	}
 
-	$ltree_post   = intval(DI::pConfig()->get(DI::userSession()->getLocalUserId(),'libertree','post'));
+	$ltree_post   = intval(PConfig::get(local_user(),'libertree','post'));
 
 	$ltree_enable = (($ltree_post && !empty($_REQUEST['libertree_enable'])) ? intval($_REQUEST['libertree_enable']) : 0);
 
-	if ($b['api_source'] && intval(DI::pConfig()->get(DI::userSession()->getLocalUserId(),'libertree','post_by_default'))) {
+	if ($b['api_source'] && intval(PConfig::get(local_user(),'libertree','post_by_default'))) {
 		$ltree_enable = 1;
 	}
 
@@ -134,9 +177,12 @@ function libertree_post_local(array &$b)
 	$b['postopts'] .= 'libertree';
 }
 
-function libertree_send(array &$b)
-{
-	Logger::notice('libertree_send: invoked');
+
+
+
+function libertree_send(&$a,&$b) {
+
+	Logger::log('libertree_send: invoked');
 
 	if ($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited'])) {
 		return;
@@ -151,23 +197,33 @@ function libertree_send(array &$b)
 	}
 
 	// Dont't post if the post doesn't belong to us.
-	// This is a check for group postings
+	// This is a check for forum postings
 	$self = DBA::selectFirst('contact', ['id'], ['uid' => $b['uid'], 'self' => true]);
 	if ($b['contact-id'] != $self['id']) {
 		return;
 	}
 
-	$b['body'] = Post\Media::addAttachmentsToBody($b['uri-id'], DI::contentItem()->addSharedPost($b));
-
-	$ltree_api_token = DI::pConfig()->get($b['uid'],'libertree','libertree_api_token');
-	$ltree_url = DI::pConfig()->get($b['uid'],'libertree','libertree_url');
+	$ltree_api_token = PConfig::get($b['uid'],'libertree','libertree_api_token');
+	$ltree_url = PConfig::get($b['uid'],'libertree','libertree_url');
 	$ltree_blog = "$ltree_url/api/v1/posts/create/?token=$ltree_api_token";
-	$ltree_source = DI::baseUrl()->getHost();
+	$ltree_source = $a->getHostName();
 
 	if ($b['app'] != "")
 		$ltree_source .= " (".$b['app'].")";
 
 	if($ltree_url && $ltree_api_token && $ltree_blog && $ltree_source) {
+		$tag_arr = [];
+		$tags = '';
+		$x = preg_match_all('/\#\[(.*?)\](.*?)\[/',$b['tag'],$matches,PREG_SET_ORDER);
+
+		if($x) {
+			foreach($matches as $mtch) {
+				$tag_arr[] = $mtch[2];
+			}
+		}
+		if(count($tag_arr))
+			$tags = implode(',',$tag_arr);
+
 		$title = $b['title'];
 		$body = $b['body'];
 		// Insert a newline before and after a quote
@@ -183,16 +239,15 @@ function libertree_send(array &$b)
 		// remove multiple newlines
 		do {
 			$oldbody = $body;
-			$body = str_replace("\n\n\n", "\n\n", $body);
-		} while ($oldbody != $body);
+                        $body = str_replace("\n\n\n", "\n\n", $body);
+                } while ($oldbody != $body);
 
 		// convert to markdown
 		$body = BBCode::toMarkdown($body, false);
 
 		// Adding the title
-		if (strlen($title)) {
-			$body = '## ' . html_entity_decode($title) . "\n\n" . $body;
-		}
+		if(strlen($title))
+			$body = "## ".html_entity_decode($title)."\n\n".$body;
 
 
 		$params = [
@@ -201,7 +256,7 @@ function libertree_send(array &$b)
 		//	'token' => $ltree_api_token
 		];
 
-		$result = DI::httpClient()->post($ltree_blog, $params)->getBodyString();
-		Logger::notice('libertree: ' . $result);
+		$result = Network::post($ltree_blog, $params)->getBody();
+		Logger::log('libertree: ' . $result);
 	}
 }
diff --git a/libertree/templates/connector_settings.tpl b/libertree/templates/connector_settings.tpl
deleted file mode 100644
index 63aa52fc..00000000
--- a/libertree/templates/connector_settings.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-{{include file="field_checkbox.tpl" field=$enabled}}
-{{include file="field_input.tpl" field=$ltree_url}}
-{{include file="field_input.tpl" field=$ltree_api_token}}
-{{include file="field_checkbox.tpl" field=$bydefault}}
diff --git a/libravatar/README.md b/libravatar/README.md
index 4d5d4c30..bcc0f824 100644
--- a/libravatar/README.md
+++ b/libravatar/README.md
@@ -23,21 +23,18 @@ If no avatar was found for an email Libravatar can create some pseudo-random gen
 See examples at [Libravatar][1].
 
 ## Alternative Configuration
-Open the `config/node.config.php` file and add "libravatar" to the list of activated addons:
+Open the `config/local.config.php` file and add "libravatar" to the list of activated addons:
 
-	'addons' => [
-		...
-		'libravatar' => [
-			admin => true,			
-		],
-	]
+    'system' => [
+        ...
+        'addon' => '...,libravatar'
+        ...
+    ]
 
-You can add one configuration variables for the addon to the `config/libravatar.config.php` file:
+You can add one configuration variables for the addon to the `config/addon.config.php` file:
 
-	return [
-		'libravatar' => [
-			'default_avatar' => 'identicon',
-		],
-	];
+    'libravatar' => [
+        'default_avatar' => 'identicon',
+    ],
 
 [1]: http://wiki.libravatar.org/api/ "See API documentation at Libravatar for more information"
diff --git a/libravatar/Services/Libravatar.php b/libravatar/Services/Libravatar.php
index 18aa5c90..1b6d022e 100644
--- a/libravatar/Services/Libravatar.php
+++ b/libravatar/Services/Libravatar.php
@@ -413,10 +413,10 @@ class Services_Libravatar
 
         // Lets try get us some records based on the choice of subdomain
         // and the domain we had passed in.
-        $srv = @dns_get_record($subdomain . $domain, DNS_SRV);
+        $srv = dns_get_record($subdomain . $domain, DNS_SRV);
 
         // Did we get anything? No?
-        if (empty($srv)) {
+        if (count($srv) == 0) {
             // Then let's try Libravatar.org.
             return $fallback . 'libravatar.org';
         }
@@ -549,8 +549,6 @@ class Services_Libravatar
         case 'monsterid':
         case 'wavatar':
         case 'retro':
-        case 'robohash':
-        case 'pagan':
             break;
         default:
             $valid = filter_var($url, FILTER_VALIDATE_URL);
@@ -667,3 +665,5 @@ class Services_Libravatar
  * c-hanging-comment-ender-p: nil
  * End:
  */
+
+?>
diff --git a/libravatar/config/libravatar.config.php b/libravatar/config/libravatar.config.php
index a59a74ec..7f4f50f6 100644
--- a/libravatar/config/libravatar.config.php
+++ b/libravatar/config/libravatar.config.php
@@ -1,7 +1,7 @@
 <?php
 
 // Warning: Don't change this file! It only holds the default config values for this addon.
-// Instead, copy this file to config/libravatar.config.php in your Friendica directory and set the correct values there
+// Instead overwrite these config values in config/addon.config.php in your Friendica directory
 
 return [
 	'libravatar' => [
diff --git a/libravatar/lang/C/messages.po b/libravatar/lang/C/messages.po
index ebb364c1..f80462e8 100644
--- a/libravatar/lang/C/messages.po
+++ b/libravatar/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,53 +17,66 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: libravatar.php:68
-msgid "generic profile image"
-msgstr ""
-
-#: libravatar.php:69
-msgid "random geometric pattern"
-msgstr ""
-
-#: libravatar.php:70
-msgid "monster face"
-msgstr ""
-
-#: libravatar.php:71
-msgid "computer generated face"
-msgstr ""
-
-#: libravatar.php:72
-msgid "retro arcade style face"
+#: libravatar.php:14
+msgid "Could NOT install Libravatar successfully.<br>It requires PHP >= 5.3"
 msgstr ""
 
 #: libravatar.php:73
-msgid "roboter face"
+msgid "generic profile image"
 msgstr ""
 
 #: libravatar.php:74
-msgid "retro adventure game character"
+msgid "random geometric pattern"
 msgstr ""
 
-#: libravatar.php:78
+#: libravatar.php:75
+msgid "monster face"
+msgstr ""
+
+#: libravatar.php:76
+msgid "computer generated face"
+msgstr ""
+
+#: libravatar.php:77
+msgid "retro arcade style face"
+msgstr ""
+
+#: libravatar.php:82
+msgid "Warning"
+msgstr ""
+
+#: libravatar.php:83
+#, php-format
+msgid "Your PHP version %s is lower than the required PHP >= 5.3."
+msgstr ""
+
+#: libravatar.php:84
+msgid "This addon is not functional on your server."
+msgstr ""
+
+#: libravatar.php:93
 msgid "Information"
 msgstr ""
 
-#: libravatar.php:78
+#: libravatar.php:93
 msgid ""
 "Gravatar addon is installed. Please disable the Gravatar addon.<br>The "
 "Libravatar addon will fall back to Gravatar if nothing was found at "
 "Libravatar."
 msgstr ""
 
-#: libravatar.php:83
-msgid "Save Settings"
+#: libravatar.php:99
+msgid "Submit"
 msgstr ""
 
-#: libravatar.php:84
+#: libravatar.php:100
 msgid "Default avatar image"
 msgstr ""
 
-#: libravatar.php:84
+#: libravatar.php:100
 msgid "Select default avatar image if none was found. See README"
 msgstr ""
+
+#: libravatar.php:112
+msgid "Libravatar settings updated."
+msgstr ""
diff --git a/libravatar/lang/ar/messages.po b/libravatar/lang/ar/messages.po
deleted file mode 100644
index a3c3ea27..00000000
--- a/libravatar/lang/ar/messages.po
+++ /dev/null
@@ -1,71 +0,0 @@
-# ADDON libravatar
-# Copyright (C)
-# This file is distributed under the same license as the Friendica libravatar addon package.
-# 
-# 
-# Translators:
-# Farida Khalaf <faridakhalaf@hotmail.com>, 2021
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2021-02-22 02:35+0000\n"
-"Last-Translator: Farida Khalaf <faridakhalaf@hotmail.com>\n"
-"Language-Team: Arabic (http://www.transifex.com/Friendica/friendica/language/ar/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ar\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-
-#: libravatar.php:68
-msgid "generic profile image"
-msgstr "صورة عامة للملف الشخصي"
-
-#: libravatar.php:69
-msgid "random geometric pattern"
-msgstr "نمط هندسي عشوائي"
-
-#: libravatar.php:70
-msgid "monster face"
-msgstr "وجه الوحش"
-
-#: libravatar.php:71
-msgid "computer generated face"
-msgstr "وجه مولد من  الكمبيوتر"
-
-#: libravatar.php:72
-msgid "retro arcade style face"
-msgstr "نمط الوجه برجعية  الممرات"
-
-#: libravatar.php:73
-msgid "roboter face"
-msgstr "وجه الروبوت"
-
-#: libravatar.php:74
-msgid "retro adventure game character"
-msgstr "رجعية المغامرة لشخصية اللعب "
-
-#: libravatar.php:78
-msgid "Information"
-msgstr "معلومات"
-
-#: libravatar.php:78
-msgid ""
-"Gravatar addon is installed. Please disable the Gravatar addon.<br>The "
-"Libravatar addon will fall back to Gravatar if nothing was found at "
-"Libravatar."
-msgstr "تم تثبيت ملحق الحرافاتار . يرجى تعطيل إضافة ملحق الجرافاتار <br>. ستعود إضافة ليبرافاتار إلى جرافاتار  إذا لم يتم العثور على شيء في ليبرافاتار."
-
-#: libravatar.php:83
-msgid "Save Settings"
-msgstr "حفظ الإعدادات"
-
-#: libravatar.php:84
-msgid "Default avatar image"
-msgstr "الصورة الرمزية الافتراضية"
-
-#: libravatar.php:84
-msgid "Select default avatar image if none was found. See README"
-msgstr "حدد الصورة الرمزية الافتراضية إذا لم يتم العثور على أي منها. انظر الملف التمهيدي"
diff --git a/libravatar/lang/ar/strings.php b/libravatar/lang/ar/strings.php
deleted file mode 100644
index 1af9ec10..00000000
--- a/libravatar/lang/ar/strings.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_ar")) {
-function string_plural_select_ar($n){
-	$n = intval($n);
-	if ($n==0) { return 0; } else if ($n==1) { return 1; } else if ($n==2) { return 2; } else if ($n%100>=3 && $n%100<=10) { return 3; } else if ($n%100>=11 && $n%100<=99) { return 4; } else  { return 5; }
-}}
-$a->strings['generic profile image'] = 'صورة عامة للملف الشخصي';
-$a->strings['random geometric pattern'] = 'نمط هندسي عشوائي';
-$a->strings['monster face'] = 'وجه الوحش';
-$a->strings['computer generated face'] = 'وجه مولد من  الكمبيوتر';
-$a->strings['retro arcade style face'] = 'نمط الوجه برجعية  الممرات';
-$a->strings['roboter face'] = 'وجه الروبوت';
-$a->strings['retro adventure game character'] = 'رجعية المغامرة لشخصية اللعب ';
-$a->strings['Information'] = 'معلومات';
-$a->strings['Gravatar addon is installed. Please disable the Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar.'] = 'تم تثبيت ملحق الحرافاتار . يرجى تعطيل إضافة ملحق الجرافاتار <br>. ستعود إضافة ليبرافاتار إلى جرافاتار  إذا لم يتم العثور على شيء في ليبرافاتار.';
-$a->strings['Save Settings'] = 'حفظ الإعدادات';
-$a->strings['Default avatar image'] = 'الصورة الرمزية الافتراضية';
-$a->strings['Select default avatar image if none was found. See README'] = 'حدد الصورة الرمزية الافتراضية إذا لم يتم العثور على أي منها. انظر الملف التمهيدي';
diff --git a/libravatar/lang/cs/strings.php b/libravatar/lang/cs/strings.php
index 81df9420..9d47c544 100644
--- a/libravatar/lang/cs/strings.php
+++ b/libravatar/lang/cs/strings.php
@@ -3,20 +3,21 @@
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
 	$n = intval($n);
-	if (($n == 1 && $n % 1 == 0)) { return 0; } else if (($n >= 2 && $n <= 4 && $n % 1 == 0)) { return 1; } else if (($n % 1 != 0 )) { return 2; } else  { return 3; }
+	return ($n == 1 && $n % 1 == 0) ? 0 : ($n >= 2 && $n <= 4 && $n % 1 == 0) ? 1: ($n % 1 != 0 ) ? 2 : 3;;
 }}
-$a->strings['Could NOT install Libravatar successfully.<br>It requires PHP >= 5.3'] = 'Libravatar NENÍ možné úspěšně nainstalovat.<br>Vyžaduje PHP >= 5.3';
-$a->strings['generic profile image'] = 'generický profilový obrázek';
-$a->strings['random geometric pattern'] = 'náhodný geometrický vzor';
-$a->strings['monster face'] = 'tvář příšery';
-$a->strings['computer generated face'] = 'počítačově generovaná tvář';
-$a->strings['retro arcade style face'] = 'tvář v retro arkádovém stylu';
-$a->strings['Warning'] = 'Varování';
-$a->strings['Your PHP version %s is lower than the required PHP >= 5.3.'] = 'Vaše verze PHP %s je nižší než požadovaná: PHP >= 5.3.';
-$a->strings['This addon is not functional on your server.'] = 'Tento doplněk není na Vašem serveru funkční.';
-$a->strings['Information'] = 'Informace';
-$a->strings['Gravatar addon is installed. Please disable the Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar.'] = 'Doplněk Gravatar je nainstalován. Prosím zakažte doplněk Gravatar.<br>Doplněk Libravatar se přepne na Gravatar, pokud na Libravataru nebude nic nalezeno.';
-$a->strings['Submit'] = 'Odeslat';
-$a->strings['Default avatar image'] = 'Výchozí avatarový obrázek';
-$a->strings['Select default avatar image if none was found. See README'] = 'Nastavte výchozí avatarový obrázek, pokud není žádný nalezen. Více viz. soubor README.';
-$a->strings['Libravatar settings updated.'] = 'Nastavení Libravatar aktualizováno.';
+;
+$a->strings["Could NOT install Libravatar successfully.<br>It requires PHP >= 5.3"] = "Libravatar NENÍ možné úspěšně nainstalovat.<br>Vyžaduje PHP >= 5.3";
+$a->strings["generic profile image"] = "generický profilový obrázek";
+$a->strings["random geometric pattern"] = "náhodný geometrický vzor";
+$a->strings["monster face"] = "tvář příšery";
+$a->strings["computer generated face"] = "počítačově generovaná tvář";
+$a->strings["retro arcade style face"] = "tvář v retro arkádovém stylu";
+$a->strings["Warning"] = "Varování";
+$a->strings["Your PHP version %s is lower than the required PHP >= 5.3."] = "Vaše verze PHP %s je nižší než požadovaná: PHP >= 5.3.";
+$a->strings["This addon is not functional on your server."] = "Tento doplněk není na Vašem serveru funkční.";
+$a->strings["Information"] = "Informace";
+$a->strings["Gravatar addon is installed. Please disable the Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar."] = "Doplněk Gravatar je nainstalován. Prosím zakažte doplněk Gravatar.<br>Doplněk Libravatar se přepne na Gravatar, pokud na Libravataru nebude nic nalezeno.";
+$a->strings["Submit"] = "Odeslat";
+$a->strings["Default avatar image"] = "Výchozí avatarový obrázek";
+$a->strings["Select default avatar image if none was found. See README"] = "Nastavte výchozí avatarový obrázek, pokud není žádný nalezen. Více viz. soubor README.";
+$a->strings["Libravatar settings updated."] = "Nastavení Libravatar aktualizováno.";
diff --git a/libravatar/lang/da-dk/messages.po b/libravatar/lang/da-dk/messages.po
deleted file mode 100644
index f4bedd6c..00000000
--- a/libravatar/lang/da-dk/messages.po
+++ /dev/null
@@ -1,71 +0,0 @@
-# ADDON libravatar
-# Copyright (C)
-# This file is distributed under the same license as the Friendica libravatar addon package.
-# 
-# 
-# Translators:
-# Anton <dev@atjn.dk>, 2022
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2014-06-23 09:49+0000\n"
-"Last-Translator: Anton <dev@atjn.dk>, 2022\n"
-"Language-Team: Danish (Denmark) (http://www.transifex.com/Friendica/friendica/language/da_DK/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: da_DK\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: libravatar.php:68
-msgid "generic profile image"
-msgstr "generisk profilbillede"
-
-#: libravatar.php:69
-msgid "random geometric pattern"
-msgstr "tilfældigt geometrisk mønster"
-
-#: libravatar.php:70
-msgid "monster face"
-msgstr "monsteransigt"
-
-#: libravatar.php:71
-msgid "computer generated face"
-msgstr "computergenereret ansigt"
-
-#: libravatar.php:72
-msgid "retro arcade style face"
-msgstr "retro-arkade stilet ansigt"
-
-#: libravatar.php:73
-msgid "roboter face"
-msgstr ""
-
-#: libravatar.php:74
-msgid "retro adventure game character"
-msgstr ""
-
-#: libravatar.php:78
-msgid "Information"
-msgstr "Information"
-
-#: libravatar.php:78
-msgid ""
-"Gravatar addon is installed. Please disable the Gravatar addon.<br>The "
-"Libravatar addon will fall back to Gravatar if nothing was found at "
-"Libravatar."
-msgstr ""
-
-#: libravatar.php:83
-msgid "Save Settings"
-msgstr "Gem indstillinger"
-
-#: libravatar.php:84
-msgid "Default avatar image"
-msgstr "Standard avatar-billede"
-
-#: libravatar.php:84
-msgid "Select default avatar image if none was found. See README"
-msgstr ""
diff --git a/libravatar/lang/da-dk/strings.php b/libravatar/lang/da-dk/strings.php
deleted file mode 100644
index 27d2df9f..00000000
--- a/libravatar/lang/da-dk/strings.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_da_dk")) {
-function string_plural_select_da_dk($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['generic profile image'] = 'generisk profilbillede';
-$a->strings['random geometric pattern'] = 'tilfældigt geometrisk mønster';
-$a->strings['monster face'] = 'monsteransigt';
-$a->strings['computer generated face'] = 'computergenereret ansigt';
-$a->strings['retro arcade style face'] = 'retro-arkade stilet ansigt';
-$a->strings['Information'] = 'Information';
-$a->strings['Save Settings'] = 'Gem indstillinger';
-$a->strings['Default avatar image'] = 'Standard avatar-billede';
diff --git a/libravatar/lang/de/messages.po b/libravatar/lang/de/messages.po
index 6c0d7c01..d9a3c782 100644
--- a/libravatar/lang/de/messages.po
+++ b/libravatar/lang/de/messages.po
@@ -4,71 +4,82 @@
 # 
 # 
 # Translators:
-# Andreas H., 2014
-# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2014
-# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2021
-# Ulf Rompe <transifex.com@rompe.org>, 2019
+# Abrax <webmaster@a-zwenkau.de>, 2014
+# bavatar <tobias.diekershoff@gmx.net>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2014-06-23 09:49+0000\n"
-"Last-Translator: Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2021\n"
-"Language-Team: German (http://app.transifex.com/Friendica/friendica/language/de/)\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2014-10-15 12:30+0000\n"
+"Last-Translator: Abrax <webmaster@a-zwenkau.de>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/friendica/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: libravatar.php:68
+#: libravatar.php:14
+msgid "Could NOT install Libravatar successfully.<br>It requires PHP >= 5.3"
+msgstr "Kann Libravatar NICHT erfolgreich installieren.<br>PHP >=5.3 wird benötigt"
+
+#: libravatar.php:73
 msgid "generic profile image"
 msgstr "allgemeines Profilbild"
 
-#: libravatar.php:69
+#: libravatar.php:74
 msgid "random geometric pattern"
-msgstr "zufällig erzeugtes, geometrisches Muster"
+msgstr "zufällig erzeugtes geometrisches Muster"
 
-#: libravatar.php:70
+#: libravatar.php:75
 msgid "monster face"
 msgstr "Monstergesicht"
 
-#: libravatar.php:71
+#: libravatar.php:76
 msgid "computer generated face"
 msgstr "Computergesicht"
 
-#: libravatar.php:72
+#: libravatar.php:77
 msgid "retro arcade style face"
-msgstr "Retro-Arcade-Design-Gesicht"
+msgstr "Retro Arcade Design Gesicht"
 
-#: libravatar.php:73
-msgid "roboter face"
-msgstr "Roboter Gesicht"
+#: libravatar.php:82
+msgid "Warning"
+msgstr "Warnung"
 
-#: libravatar.php:74
-msgid "retro adventure game character"
-msgstr "Retro Abenteuerspiel Charakter"
+#: libravatar.php:83
+#, php-format
+msgid "Your PHP version %s is lower than the required PHP >= 5.3."
+msgstr "Deine PHP Version %s ist niedriger als die benötigte Version PHP >= 5.3."
 
-#: libravatar.php:78
+#: libravatar.php:84
+msgid "This addon is not functional on your server."
+msgstr "Dieses Addon funktioniert auf deinem Server nicht."
+
+#: libravatar.php:93
 msgid "Information"
 msgstr "Information"
 
-#: libravatar.php:78
+#: libravatar.php:93
 msgid ""
 "Gravatar addon is installed. Please disable the Gravatar addon.<br>The "
 "Libravatar addon will fall back to Gravatar if nothing was found at "
 "Libravatar."
-msgstr "Das Gravatar-Addon ist installiert. Bitte schalte das Gravatar-Addon aus.<br>Das Libravatar-Addon nutzt Gravatar, sollte nichts auf Libravatar gefunden werden."
+msgstr "Das Gravatar Addon ist installiert. Bitte schalte das Gravatar Addon aus.<br>Das Libravatar Addon nutzt Gravater, sollte nichts auf Libravatar gefunden werden."
 
-#: libravatar.php:83
-msgid "Save Settings"
-msgstr "Einstellungen Speichern"
+#: libravatar.php:99
+msgid "Submit"
+msgstr "Senden"
 
-#: libravatar.php:84
+#: libravatar.php:100
 msgid "Default avatar image"
-msgstr "Standard-Profilbild "
+msgstr "Standard Profilbild "
 
-#: libravatar.php:84
+#: libravatar.php:100
 msgid "Select default avatar image if none was found. See README"
-msgstr "Das Standard-Avatar-Bild wurde nicht gefunden. Siehe README"
+msgstr "Das Standard Avatar Bild wurde nicht gefunden. Siehe README"
+
+#: libravatar.php:112
+msgid "Libravatar settings updated."
+msgstr "Libravatar Einstellungen sind aktualisiert."
diff --git a/libravatar/lang/de/strings.php b/libravatar/lang/de/strings.php
index 5f8ac024..67ccf8b6 100644
--- a/libravatar/lang/de/strings.php
+++ b/libravatar/lang/de/strings.php
@@ -2,18 +2,21 @@
 
 if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['generic profile image'] = 'allgemeines Profilbild';
-$a->strings['random geometric pattern'] = 'zufällig erzeugtes, geometrisches Muster';
-$a->strings['monster face'] = 'Monstergesicht';
-$a->strings['computer generated face'] = 'Computergesicht';
-$a->strings['retro arcade style face'] = 'Retro-Arcade-Design-Gesicht';
-$a->strings['roboter face'] = 'Roboter Gesicht';
-$a->strings['retro adventure game character'] = 'Retro Abenteuerspiel Charakter';
-$a->strings['Information'] = 'Information';
-$a->strings['Gravatar addon is installed. Please disable the Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar.'] = 'Das Gravatar-Addon ist installiert. Bitte schalte das Gravatar-Addon aus.<br>Das Libravatar-Addon nutzt Gravatar, sollte nichts auf Libravatar gefunden werden.';
-$a->strings['Save Settings'] = 'Einstellungen Speichern';
-$a->strings['Default avatar image'] = 'Standard-Profilbild ';
-$a->strings['Select default avatar image if none was found. See README'] = 'Das Standard-Avatar-Bild wurde nicht gefunden. Siehe README';
+;
+$a->strings["Could NOT install Libravatar successfully.<br>It requires PHP >= 5.3"] = "Kann Libravatar NICHT erfolgreich installieren.<br>PHP >=5.3 wird benötigt";
+$a->strings["generic profile image"] = "allgemeines Profilbild";
+$a->strings["random geometric pattern"] = "zufällig erzeugtes geometrisches Muster";
+$a->strings["monster face"] = "Monstergesicht";
+$a->strings["computer generated face"] = "Computergesicht";
+$a->strings["retro arcade style face"] = "Retro Arcade Design Gesicht";
+$a->strings["Warning"] = "Warnung";
+$a->strings["Your PHP version %s is lower than the required PHP >= 5.3."] = "Deine PHP Version %s ist niedriger als die benötigte Version PHP >= 5.3.";
+$a->strings["This addon is not functional on your server."] = "Dieses Addon funktioniert auf deinem Server nicht.";
+$a->strings["Information"] = "Information";
+$a->strings["Gravatar addon is installed. Please disable the Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar."] = "Das Gravatar Addon ist installiert. Bitte schalte das Gravatar Addon aus.<br>Das Libravatar Addon nutzt Gravater, sollte nichts auf Libravatar gefunden werden.";
+$a->strings["Submit"] = "Senden";
+$a->strings["Default avatar image"] = "Standard Profilbild ";
+$a->strings["Select default avatar image if none was found. See README"] = "Das Standard Avatar Bild wurde nicht gefunden. Siehe README";
+$a->strings["Libravatar settings updated."] = "Libravatar Einstellungen sind aktualisiert.";
diff --git a/libravatar/lang/es/messages.po b/libravatar/lang/es/messages.po
index ecc52ea2..a4dd4a43 100644
--- a/libravatar/lang/es/messages.po
+++ b/libravatar/lang/es/messages.po
@@ -4,15 +4,14 @@
 # 
 # 
 # Translators:
-# Albert, 2016
-# Senex Petrovic <javierruizo@hotmail.com>, 2021
+# Alberto Díaz Tormo <albertodiaztormo@gmail.com>, 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2021-04-01 10:04+0000\n"
-"Last-Translator: Senex Petrovic <javierruizo@hotmail.com>\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2016-10-12 15:10+0000\n"
+"Last-Translator: Alberto Díaz Tormo <albertodiaztormo@gmail.com>\n"
 "Language-Team: Spanish (http://www.transifex.com/Friendica/friendica/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,53 +19,66 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: libravatar.php:68
+#: libravatar.php:14
+msgid "Could NOT install Libravatar successfully.<br>It requires PHP >= 5.3"
+msgstr "Podría NO instalar Libravatar con éxito.<br>Requiere PHP >= 5.3"
+
+#: libravatar.php:73
 msgid "generic profile image"
 msgstr "Imagen de perfil genérica"
 
-#: libravatar.php:69
+#: libravatar.php:74
 msgid "random geometric pattern"
 msgstr "Estampado geométrico aleatorio"
 
-#: libravatar.php:70
+#: libravatar.php:75
 msgid "monster face"
 msgstr "cara de monstruo"
 
-#: libravatar.php:71
+#: libravatar.php:76
 msgid "computer generated face"
 msgstr "Cara generada por ordenador"
 
-#: libravatar.php:72
+#: libravatar.php:77
 msgid "retro arcade style face"
 msgstr "Cara de estilo retro"
 
-#: libravatar.php:73
-msgid "roboter face"
-msgstr "Cara de Robot"
+#: libravatar.php:82
+msgid "Warning"
+msgstr "Advertencia"
 
-#: libravatar.php:74
-msgid "retro adventure game character"
-msgstr "personaje de juego de aventuras retro"
+#: libravatar.php:83
+#, php-format
+msgid "Your PHP version %s is lower than the required PHP >= 5.3."
+msgstr "Su versión PHP %s es inferior a la requerida PHP >= 5.3."
 
-#: libravatar.php:78
+#: libravatar.php:84
+msgid "This addon is not functional on your server."
+msgstr "Este complemento no es funcional en su servidor"
+
+#: libravatar.php:93
 msgid "Information"
 msgstr "Información"
 
-#: libravatar.php:78
+#: libravatar.php:93
 msgid ""
 "Gravatar addon is installed. Please disable the Gravatar addon.<br>The "
 "Libravatar addon will fall back to Gravatar if nothing was found at "
 "Libravatar."
 msgstr "El complemento Gravatar se ha instalado. Por favor desactive el complemento Gravatar. <br>El complemento Libravatar quedará por detrás de Gravatar si no se encuentra nada en Libravatar."
 
-#: libravatar.php:83
-msgid "Save Settings"
-msgstr "Guardar Ajustes"
+#: libravatar.php:99
+msgid "Submit"
+msgstr "Enviar"
 
-#: libravatar.php:84
+#: libravatar.php:100
 msgid "Default avatar image"
 msgstr "Imagen de avatar por defecto"
 
-#: libravatar.php:84
+#: libravatar.php:100
 msgid "Select default avatar image if none was found. See README"
 msgstr "Selecione el avatar por defecto si no se encuentra ninguno. Vea README"
+
+#: libravatar.php:112
+msgid "Libravatar settings updated."
+msgstr "Ajustes de Libravatar actualizados"
diff --git a/libravatar/lang/es/strings.php b/libravatar/lang/es/strings.php
index cf889f60..1ab20cf1 100644
--- a/libravatar/lang/es/strings.php
+++ b/libravatar/lang/es/strings.php
@@ -2,18 +2,21 @@
 
 if(! function_exists("string_plural_select_es")) {
 function string_plural_select_es($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['generic profile image'] = 'Imagen de perfil genérica';
-$a->strings['random geometric pattern'] = 'Estampado geométrico aleatorio';
-$a->strings['monster face'] = 'cara de monstruo';
-$a->strings['computer generated face'] = 'Cara generada por ordenador';
-$a->strings['retro arcade style face'] = 'Cara de estilo retro';
-$a->strings['roboter face'] = 'Cara de Robot';
-$a->strings['retro adventure game character'] = 'personaje de juego de aventuras retro';
-$a->strings['Information'] = 'Información';
-$a->strings['Gravatar addon is installed. Please disable the Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar.'] = 'El complemento Gravatar se ha instalado. Por favor desactive el complemento Gravatar. <br>El complemento Libravatar quedará por detrás de Gravatar si no se encuentra nada en Libravatar.';
-$a->strings['Save Settings'] = 'Guardar Ajustes';
-$a->strings['Default avatar image'] = 'Imagen de avatar por defecto';
-$a->strings['Select default avatar image if none was found. See README'] = 'Selecione el avatar por defecto si no se encuentra ninguno. Vea README';
+;
+$a->strings["Could NOT install Libravatar successfully.<br>It requires PHP >= 5.3"] = "Podría NO instalar Libravatar con éxito.<br>Requiere PHP >= 5.3";
+$a->strings["generic profile image"] = "Imagen de perfil genérica";
+$a->strings["random geometric pattern"] = "Estampado geométrico aleatorio";
+$a->strings["monster face"] = "cara de monstruo";
+$a->strings["computer generated face"] = "Cara generada por ordenador";
+$a->strings["retro arcade style face"] = "Cara de estilo retro";
+$a->strings["Warning"] = "Advertencia";
+$a->strings["Your PHP version %s is lower than the required PHP >= 5.3."] = "Su versión PHP %s es inferior a la requerida PHP >= 5.3.";
+$a->strings["This addon is not functional on your server."] = "Este complemento no es funcional en su servidor";
+$a->strings["Information"] = "Información";
+$a->strings["Gravatar addon is installed. Please disable the Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar."] = "El complemento Gravatar se ha instalado. Por favor desactive el complemento Gravatar. <br>El complemento Libravatar quedará por detrás de Gravatar si no se encuentra nada en Libravatar.";
+$a->strings["Submit"] = "Enviar";
+$a->strings["Default avatar image"] = "Imagen de avatar por defecto";
+$a->strings["Select default avatar image if none was found. See README"] = "Selecione el avatar por defecto si no se encuentra ninguno. Vea README";
+$a->strings["Libravatar settings updated."] = "Ajustes de Libravatar actualizados";
diff --git a/libravatar/lang/fi-fi/strings.php b/libravatar/lang/fi-fi/strings.php
index 8f933579..6be2f23f 100644
--- a/libravatar/lang/fi-fi/strings.php
+++ b/libravatar/lang/fi-fi/strings.php
@@ -3,19 +3,21 @@
 if(! function_exists("string_plural_select_fi_fi")) {
 function string_plural_select_fi_fi($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Could NOT install Libravatar successfully.<br>It requires PHP >= 5.3'] = 'Libravataria ei voitu asentaa.<br>Vaatii PHP-version >=5.3';
-$a->strings['generic profile image'] = 'Yleinen profiilikuva';
-$a->strings['random geometric pattern'] = 'satunnainen geometrinen kuvio';
-$a->strings['monster face'] = 'hirviö';
-$a->strings['computer generated face'] = 'tietokoneella tuotettut kasvot';
-$a->strings['retro arcade style face'] = 'retro-videopeli kasvot';
-$a->strings['Warning'] = 'Varoitus';
-$a->strings['Your PHP version %s is lower than the required PHP >= 5.3.'] = 'PHP-versiosi on %s. Friendica vaatii PHP >= 5.3.';
-$a->strings['This addon is not functional on your server.'] = 'Tämä lisäosa ei toimi palvelimellasi.';
-$a->strings['Information'] = 'Tietoja';
-$a->strings['Submit'] = 'Lähetä';
-$a->strings['Default avatar image'] = 'Avatarin oletuskuva';
-$a->strings['Select default avatar image if none was found. See README'] = 'Valitse oletusavatarikuva jos avatari puuttuu. Katso lisätietoja README:stä.';
-$a->strings['Libravatar settings updated.'] = 'Libravatar -asetukset päivitetty';
+;
+$a->strings["Could NOT install Libravatar successfully.<br>It requires PHP >= 5.3"] = "Libravataria ei voitu asentaa.<br>Vaatii PHP-version >=5.3";
+$a->strings["generic profile image"] = "Yleinen profiilikuva";
+$a->strings["random geometric pattern"] = "satunnainen geometrinen kuvio";
+$a->strings["monster face"] = "hirviö";
+$a->strings["computer generated face"] = "tietokoneella tuotettut kasvot";
+$a->strings["retro arcade style face"] = "retro-videopeli kasvot";
+$a->strings["Warning"] = "Varoitus";
+$a->strings["Your PHP version %s is lower than the required PHP >= 5.3."] = "PHP-versiosi on %s. Friendica vaatii PHP >= 5.3.";
+$a->strings["This addon is not functional on your server."] = "Tämä lisäosa ei toimi palvelimellasi.";
+$a->strings["Information"] = "Tietoja";
+$a->strings["Gravatar addon is installed. Please disable the Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar."] = "";
+$a->strings["Submit"] = "Lähetä";
+$a->strings["Default avatar image"] = "Avatarin oletuskuva";
+$a->strings["Select default avatar image if none was found. See README"] = "Valitse oletusavatarikuva jos avatari puuttuu. Katso lisätietoja README:stä.";
+$a->strings["Libravatar settings updated."] = "Libravatar -asetukset päivitetty";
diff --git a/libravatar/lang/fr/messages.po b/libravatar/lang/fr/messages.po
index e7b7ab2b..84b77c83 100644
--- a/libravatar/lang/fr/messages.po
+++ b/libravatar/lang/fr/messages.po
@@ -4,70 +4,81 @@
 # 
 # 
 # Translators:
-# Hypolite Petovan <hypolite@mrpetovan.com>, 2022
-# Hypolite Petovan <hypolite@mrpetovan.com>, 2016
-# ea1cd8241cb389ffb6f92bc6891eff5d_dc12308 <70dced5587d47e18d88f9298024d96f8_93383>, 2015
+# Nicola Spanti <translations@nicola-spanti.info>, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2014-06-23 09:49+0000\n"
-"Last-Translator: Hypolite Petovan <hypolite@mrpetovan.com>, 2022\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2015-08-30 17:15+0000\n"
+"Last-Translator: Nicola Spanti <translations@nicola-spanti.info>\n"
 "Language-Team: French (http://www.transifex.com/Friendica/friendica/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fr\n"
-"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: libravatar.php:68
+#: libravatar.php:14
+msgid "Could NOT install Libravatar successfully.<br>It requires PHP >= 5.3"
+msgstr ""
+
+#: libravatar.php:73
 msgid "generic profile image"
 msgstr "image de profil générique"
 
-#: libravatar.php:69
+#: libravatar.php:74
 msgid "random geometric pattern"
-msgstr "motif géométrique aléatoire"
+msgstr ""
 
-#: libravatar.php:70
+#: libravatar.php:75
 msgid "monster face"
-msgstr "tête de monstre"
+msgstr ""
 
-#: libravatar.php:71
+#: libravatar.php:76
 msgid "computer generated face"
 msgstr "visage généré par ordinateur"
 
-#: libravatar.php:72
+#: libravatar.php:77
 msgid "retro arcade style face"
-msgstr "tête rétro arcade"
+msgstr ""
 
-#: libravatar.php:73
-msgid "roboter face"
-msgstr "Tête de robot"
+#: libravatar.php:82
+msgid "Warning"
+msgstr "Attention"
 
-#: libravatar.php:74
-msgid "retro adventure game character"
-msgstr "Personnage de jeu d'aventure rétro"
+#: libravatar.php:83
+#, php-format
+msgid "Your PHP version %s is lower than the required PHP >= 5.3."
+msgstr "Votre version de PHP %s est inférieure à la minimum requise (5.3)."
 
-#: libravatar.php:78
+#: libravatar.php:84
+msgid "This addon is not functional on your server."
+msgstr ""
+
+#: libravatar.php:93
 msgid "Information"
 msgstr "Information"
 
-#: libravatar.php:78
+#: libravatar.php:93
 msgid ""
 "Gravatar addon is installed. Please disable the Gravatar addon.<br>The "
 "Libravatar addon will fall back to Gravatar if nothing was found at "
 "Libravatar."
-msgstr "L'extension Gravatar est installée. Veuillez la désactiver. <br>L'extension Libravatar se repose sur Gravatar si l'avatar n'a pas été trouvé sur Libravatar."
+msgstr ""
 
-#: libravatar.php:83
-msgid "Save Settings"
-msgstr "Enregistrer les paramètres"
+#: libravatar.php:99
+msgid "Submit"
+msgstr "Envoyer"
 
-#: libravatar.php:84
+#: libravatar.php:100
 msgid "Default avatar image"
 msgstr "Avatar par défaut"
 
-#: libravatar.php:84
+#: libravatar.php:100
 msgid "Select default avatar image if none was found. See README"
-msgstr "Sélectionnez un avatar par défaut si rien n'a été trouvé. Voir le README"
+msgstr ""
+
+#: libravatar.php:112
+msgid "Libravatar settings updated."
+msgstr "Paramètres de Libravatar mis à jour."
diff --git a/libravatar/lang/fr/strings.php b/libravatar/lang/fr/strings.php
index dd3cbe2c..48f8cf62 100644
--- a/libravatar/lang/fr/strings.php
+++ b/libravatar/lang/fr/strings.php
@@ -2,18 +2,21 @@
 
 if(! function_exists("string_plural_select_fr")) {
 function string_plural_select_fr($n){
-	$n = intval($n);
-	if (($n == 0 || $n == 1)) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
+	return ($n > 1);;
 }}
-$a->strings['generic profile image'] = 'image de profil générique';
-$a->strings['random geometric pattern'] = 'motif géométrique aléatoire';
-$a->strings['monster face'] = 'tête de monstre';
-$a->strings['computer generated face'] = 'visage généré par ordinateur';
-$a->strings['retro arcade style face'] = 'tête rétro arcade';
-$a->strings['roboter face'] = 'Tête de robot';
-$a->strings['retro adventure game character'] = 'Personnage de jeu d\'aventure rétro';
-$a->strings['Information'] = 'Information';
-$a->strings['Gravatar addon is installed. Please disable the Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar.'] = 'L\'extension Gravatar est installée. Veuillez la désactiver. <br>L\'extension Libravatar se repose sur Gravatar si l\'avatar n\'a pas été trouvé sur Libravatar.';
-$a->strings['Save Settings'] = 'Enregistrer les paramètres';
-$a->strings['Default avatar image'] = 'Avatar par défaut';
-$a->strings['Select default avatar image if none was found. See README'] = 'Sélectionnez un avatar par défaut si rien n\'a été trouvé. Voir le README';
+;
+$a->strings["Could NOT install Libravatar successfully.<br>It requires PHP >= 5.3"] = "";
+$a->strings["generic profile image"] = "image de profil générique";
+$a->strings["random geometric pattern"] = "";
+$a->strings["monster face"] = "";
+$a->strings["computer generated face"] = "visage généré par ordinateur";
+$a->strings["retro arcade style face"] = "";
+$a->strings["Warning"] = "Attention";
+$a->strings["Your PHP version %s is lower than the required PHP >= 5.3."] = "Votre version de PHP %s est inférieure à la minimum requise (5.3).";
+$a->strings["This addon is not functional on your server."] = "";
+$a->strings["Information"] = "Information";
+$a->strings["Gravatar addon is installed. Please disable the Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar."] = "";
+$a->strings["Submit"] = "Envoyer";
+$a->strings["Default avatar image"] = "Avatar par défaut";
+$a->strings["Select default avatar image if none was found. See README"] = "";
+$a->strings["Libravatar settings updated."] = "Paramètres de Libravatar mis à jour.";
diff --git a/libravatar/lang/hu/messages.po b/libravatar/lang/hu/messages.po
deleted file mode 100644
index ad437872..00000000
--- a/libravatar/lang/hu/messages.po
+++ /dev/null
@@ -1,71 +0,0 @@
-# ADDON libravatar
-# Copyright (C)
-# This file is distributed under the same license as the Friendica libravatar addon package.
-# 
-# 
-# Translators:
-# Balázs Úr, 2020-2021
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2014-06-23 09:49+0000\n"
-"Last-Translator: Balázs Úr, 2020-2021\n"
-"Language-Team: Hungarian (http://www.transifex.com/Friendica/friendica/language/hu/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: hu\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: libravatar.php:68
-msgid "generic profile image"
-msgstr "Általános profilkép"
-
-#: libravatar.php:69
-msgid "random geometric pattern"
-msgstr "Véletlen geometriai minta"
-
-#: libravatar.php:70
-msgid "monster face"
-msgstr "Szörnyarc"
-
-#: libravatar.php:71
-msgid "computer generated face"
-msgstr "Számítógéppel előállított arc"
-
-#: libravatar.php:72
-msgid "retro arcade style face"
-msgstr "Retró árkádstílusú arc"
-
-#: libravatar.php:73
-msgid "roboter face"
-msgstr "Robotarc"
-
-#: libravatar.php:74
-msgid "retro adventure game character"
-msgstr "Retró kalandjáték-karakter"
-
-#: libravatar.php:78
-msgid "Information"
-msgstr "Információ"
-
-#: libravatar.php:78
-msgid ""
-"Gravatar addon is installed. Please disable the Gravatar addon.<br>The "
-"Libravatar addon will fall back to Gravatar if nothing was found at "
-"Libravatar."
-msgstr "A Gravatar bővítmény telepítve van. Tiltsa le a Gravatar bővítményt.<br>A Libravatar bővítmény vissza fog állni a Gravatarra, ha semmi sem található a Libravatarnál."
-
-#: libravatar.php:83
-msgid "Save Settings"
-msgstr "Beállítások mentése"
-
-#: libravatar.php:84
-msgid "Default avatar image"
-msgstr "Alapértelmezett profilkép"
-
-#: libravatar.php:84
-msgid "Select default avatar image if none was found. See README"
-msgstr "Az alapértelmezett profilkép kiválasztása, ha semmi sem található. Nézze meg a README információkat."
diff --git a/libravatar/lang/hu/strings.php b/libravatar/lang/hu/strings.php
deleted file mode 100644
index 840bf80d..00000000
--- a/libravatar/lang/hu/strings.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_hu")) {
-function string_plural_select_hu($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['generic profile image'] = 'Általános profilkép';
-$a->strings['random geometric pattern'] = 'Véletlen geometriai minta';
-$a->strings['monster face'] = 'Szörnyarc';
-$a->strings['computer generated face'] = 'Számítógéppel előállított arc';
-$a->strings['retro arcade style face'] = 'Retró árkádstílusú arc';
-$a->strings['roboter face'] = 'Robotarc';
-$a->strings['retro adventure game character'] = 'Retró kalandjáték-karakter';
-$a->strings['Information'] = 'Információ';
-$a->strings['Gravatar addon is installed. Please disable the Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar.'] = 'A Gravatar bővítmény telepítve van. Tiltsa le a Gravatar bővítményt.<br>A Libravatar bővítmény vissza fog állni a Gravatarra, ha semmi sem található a Libravatarnál.';
-$a->strings['Save Settings'] = 'Beállítások mentése';
-$a->strings['Default avatar image'] = 'Alapértelmezett profilkép';
-$a->strings['Select default avatar image if none was found. See README'] = 'Az alapértelmezett profilkép kiválasztása, ha semmi sem található. Nézze meg a README információkat.';
diff --git a/libravatar/lang/it/messages.po b/libravatar/lang/it/messages.po
index 931fefb8..6fd10f30 100644
--- a/libravatar/lang/it/messages.po
+++ b/libravatar/lang/it/messages.po
@@ -5,68 +5,80 @@
 # 
 # Translators:
 # fabrixxm <fabrix.xm@gmail.com>, 2014-2015
-# Sylke Vicious <silkevicious@gmail.com>, 2021
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2014-06-23 09:49+0000\n"
-"Last-Translator: Sylke Vicious <silkevicious@gmail.com>, 2021\n"
-"Language-Team: Italian (http://app.transifex.com/Friendica/friendica/language/it/)\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2017-09-20 06:08+0000\n"
+"Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n"
+"Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: it\n"
-"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: libravatar.php:68
+#: libravatar.php:14
+msgid "Could NOT install Libravatar successfully.<br>It requires PHP >= 5.3"
+msgstr "Non è possibile installare Libravatar.<br>Richiede PHP >= 5.3"
+
+#: libravatar.php:73
 msgid "generic profile image"
 msgstr "immagine generica del profilo"
 
-#: libravatar.php:69
+#: libravatar.php:74
 msgid "random geometric pattern"
 msgstr "schema geometrico casuale"
 
-#: libravatar.php:70
+#: libravatar.php:75
 msgid "monster face"
 msgstr "faccia di mostro"
 
-#: libravatar.php:71
+#: libravatar.php:76
 msgid "computer generated face"
 msgstr "faccia generata dal computer"
 
-#: libravatar.php:72
+#: libravatar.php:77
 msgid "retro arcade style face"
 msgstr "faccia stile retro arcade"
 
-#: libravatar.php:73
-msgid "roboter face"
-msgstr "faccia robotica"
+#: libravatar.php:82
+msgid "Warning"
+msgstr "Attenzione"
 
-#: libravatar.php:74
-msgid "retro adventure game character"
-msgstr "personaggio di un gioco di avventura retrò"
+#: libravatar.php:83
+#, php-format
+msgid "Your PHP version %s is lower than the required PHP >= 5.3."
+msgstr "La tua versione %s è minore di quella richiesta PHP >= 5.3."
 
-#: libravatar.php:78
+#: libravatar.php:84
+msgid "This addon is not functional on your server."
+msgstr "Questo addon non è funzionante sul tuo server."
+
+#: libravatar.php:93
 msgid "Information"
 msgstr "Informazione"
 
-#: libravatar.php:78
+#: libravatar.php:93
 msgid ""
 "Gravatar addon is installed. Please disable the Gravatar addon.<br>The "
 "Libravatar addon will fall back to Gravatar if nothing was found at "
 "Libravatar."
-msgstr "Il componente aggiuntivo Gravatar è installato. Disabilita il componente aggiuntivo Gravatar.<br> Il componente aggiuntivo Libravatar si appoggerà a Gravatar se non trova nulla su Libravatar."
+msgstr "L'addon Gravatar è installato. Disabilita l'addon Gravatar.<br>\nL'addon Libravatar si appoggerà a Gravatar se non trova nulla su Libravatar."
 
-#: libravatar.php:83
-msgid "Save Settings"
-msgstr "Salva Impostazioni"
+#: libravatar.php:99
+msgid "Submit"
+msgstr "Invia"
 
-#: libravatar.php:84
+#: libravatar.php:100
 msgid "Default avatar image"
 msgstr "Immagine avatar predefinita"
 
-#: libravatar.php:84
+#: libravatar.php:100
 msgid "Select default avatar image if none was found. See README"
 msgstr "Seleziona l'immagine di default se non viene  trovato niente. Vedi README"
+
+#: libravatar.php:112
+msgid "Libravatar settings updated."
+msgstr "Impostazioni Libravatar aggiornate."
diff --git a/libravatar/lang/it/strings.php b/libravatar/lang/it/strings.php
index 75fa4190..8b462f0a 100644
--- a/libravatar/lang/it/strings.php
+++ b/libravatar/lang/it/strings.php
@@ -2,18 +2,21 @@
 
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
-	$n = intval($n);
-	if ($n == 1) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
+	return ($n != 1);;
 }}
-$a->strings['generic profile image'] = 'immagine generica del profilo';
-$a->strings['random geometric pattern'] = 'schema geometrico casuale';
-$a->strings['monster face'] = 'faccia di mostro';
-$a->strings['computer generated face'] = 'faccia generata dal computer';
-$a->strings['retro arcade style face'] = 'faccia stile retro arcade';
-$a->strings['roboter face'] = 'faccia robotica';
-$a->strings['retro adventure game character'] = 'personaggio di un gioco di avventura retrò';
-$a->strings['Information'] = 'Informazione';
-$a->strings['Gravatar addon is installed. Please disable the Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar.'] = 'Il componente aggiuntivo Gravatar è installato. Disabilita il componente aggiuntivo Gravatar.<br> Il componente aggiuntivo Libravatar si appoggerà a Gravatar se non trova nulla su Libravatar.';
-$a->strings['Save Settings'] = 'Salva Impostazioni';
-$a->strings['Default avatar image'] = 'Immagine avatar predefinita';
-$a->strings['Select default avatar image if none was found. See README'] = 'Seleziona l\'immagine di default se non viene  trovato niente. Vedi README';
+;
+$a->strings["Could NOT install Libravatar successfully.<br>It requires PHP >= 5.3"] = "Non è possibile installare Libravatar.<br>Richiede PHP >= 5.3";
+$a->strings["generic profile image"] = "immagine generica del profilo";
+$a->strings["random geometric pattern"] = "schema geometrico casuale";
+$a->strings["monster face"] = "faccia di mostro";
+$a->strings["computer generated face"] = "faccia generata dal computer";
+$a->strings["retro arcade style face"] = "faccia stile retro arcade";
+$a->strings["Warning"] = "Attenzione";
+$a->strings["Your PHP version %s is lower than the required PHP >= 5.3."] = "La tua versione %s è minore di quella richiesta PHP >= 5.3.";
+$a->strings["This addon is not functional on your server."] = "Questo addon non è funzionante sul tuo server.";
+$a->strings["Information"] = "Informazione";
+$a->strings["Gravatar addon is installed. Please disable the Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar."] = "L'addon Gravatar è installato. Disabilita l'addon Gravatar.<br>\nL'addon Libravatar si appoggerà a Gravatar se non trova nulla su Libravatar.";
+$a->strings["Submit"] = "Invia";
+$a->strings["Default avatar image"] = "Immagine avatar predefinita";
+$a->strings["Select default avatar image if none was found. See README"] = "Seleziona l'immagine di default se non viene  trovato niente. Vedi README";
+$a->strings["Libravatar settings updated."] = "Impostazioni Libravatar aggiornate.";
diff --git a/libravatar/lang/nl/strings.php b/libravatar/lang/nl/strings.php
index 7cccce2c..1cb30e74 100644
--- a/libravatar/lang/nl/strings.php
+++ b/libravatar/lang/nl/strings.php
@@ -3,8 +3,21 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Could NOT install Libravatar successfully.<br>It requires PHP >= 5.3'] = 'Kon Libravater NIET succesvol installeren.<br>PHP 5.3 of meer is vereist';
-$a->strings['generic profile image'] = 'Generieke profiel-foto';
-$a->strings['Libravatar settings updated.'] = 'Libravatar instellingen opgeslagen';
+;
+$a->strings["Could NOT install Libravatar successfully.<br>It requires PHP >= 5.3"] = "Kon Libravater NIET succesvol installeren.<br>PHP 5.3 of meer is vereist";
+$a->strings["generic profile image"] = "Generieke profiel-foto";
+$a->strings["random geometric pattern"] = "";
+$a->strings["monster face"] = "";
+$a->strings["computer generated face"] = "";
+$a->strings["retro arcade style face"] = "";
+$a->strings["Warning"] = "";
+$a->strings["Your PHP version %s is lower than the required PHP >= 5.3."] = "";
+$a->strings["This addon is not functional on your server."] = "";
+$a->strings["Information"] = "";
+$a->strings["Gravatar addon is installed. Please disable the Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar."] = "";
+$a->strings["Submit"] = "";
+$a->strings["Default avatar image"] = "";
+$a->strings["Select default avatar image if none was found. See README"] = "";
+$a->strings["Libravatar settings updated."] = "Libravatar instellingen opgeslagen";
diff --git a/libravatar/lang/pl/messages.po b/libravatar/lang/pl/messages.po
index 1dd94030..2b3a896e 100644
--- a/libravatar/lang/pl/messages.po
+++ b/libravatar/lang/pl/messages.po
@@ -4,15 +4,14 @@
 # 
 # 
 # Translators:
-# Piotr Strębski <strebski@gmail.com>, 2022
-# Waldemar Stoczkowski, 2018
+# Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2014-06-23 09:49+0000\n"
-"Last-Translator: Piotr Strębski <strebski@gmail.com>, 2022\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2018-08-05 15:27+0000\n"
+"Last-Translator: Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.com/Friendica/friendica/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,53 +19,66 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
-#: libravatar.php:68
+#: libravatar.php:14
+msgid "Could NOT install Libravatar successfully.<br>It requires PHP >= 5.3"
+msgstr "Nie można zainstalować dodatku Libravatar. <br>Wymaga PHP> = 5.3"
+
+#: libravatar.php:73
 msgid "generic profile image"
 msgstr "ogólny obraz profilu"
 
-#: libravatar.php:69
+#: libravatar.php:74
 msgid "random geometric pattern"
 msgstr "losowy wzór geometryczny"
 
-#: libravatar.php:70
+#: libravatar.php:75
 msgid "monster face"
 msgstr "twarz potwora"
 
-#: libravatar.php:71
+#: libravatar.php:76
 msgid "computer generated face"
 msgstr "twarz wygenerowana komputerowo"
 
-#: libravatar.php:72
+#: libravatar.php:77
 msgid "retro arcade style face"
 msgstr "twarz w stylu retro arcade"
 
-#: libravatar.php:73
-msgid "roboter face"
-msgstr "twarz robota"
+#: libravatar.php:82
+msgid "Warning"
+msgstr "Ostrzeżenie"
 
-#: libravatar.php:74
-msgid "retro adventure game character"
-msgstr "postać z gry przygodowej w stylu retro"
+#: libravatar.php:83
+#, php-format
+msgid "Your PHP version %s is lower than the required PHP >= 5.3."
+msgstr "Twoja wersja PHP %s jest niższa niż wymagana PHP> = 5.3."
 
-#: libravatar.php:78
+#: libravatar.php:84
+msgid "This addon is not functional on your server."
+msgstr "Ten dodatek nie działa na twoim serwerze."
+
+#: libravatar.php:93
 msgid "Information"
 msgstr "Informacja"
 
-#: libravatar.php:78
+#: libravatar.php:93
 msgid ""
 "Gravatar addon is installed. Please disable the Gravatar addon.<br>The "
 "Libravatar addon will fall back to Gravatar if nothing was found at "
 "Libravatar."
 msgstr "Dodatek Gravatar jest zainstalowany. Wyłącz dodatek Gravatar. Dodatek Libravatar powróci do Gravatar, jeśli w Libravatar nie zostanie znaleziony żaden przedmiot."
 
-#: libravatar.php:83
-msgid "Save Settings"
-msgstr "Zapisz ustawienia"
+#: libravatar.php:99
+msgid "Submit"
+msgstr "Prześlij"
 
-#: libravatar.php:84
+#: libravatar.php:100
 msgid "Default avatar image"
 msgstr "Domyślny obraz awatara"
 
-#: libravatar.php:84
+#: libravatar.php:100
 msgid "Select default avatar image if none was found. See README"
 msgstr "Wybierz domyślny obraz awatara, jeśli nie został znaleziony. Zobacz README"
+
+#: libravatar.php:112
+msgid "Libravatar settings updated."
+msgstr "Zaktualizowano ustawienia Libravatar."
diff --git a/libravatar/lang/pl/strings.php b/libravatar/lang/pl/strings.php
index 0bb16982..4607670f 100644
--- a/libravatar/lang/pl/strings.php
+++ b/libravatar/lang/pl/strings.php
@@ -3,17 +3,21 @@
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
 	$n = intval($n);
-	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
+	return ($n==1 ? 0 : ($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14) ? 1 : $n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14) ? 2 : 3);;
 }}
-$a->strings['generic profile image'] = 'ogólny obraz profilu';
-$a->strings['random geometric pattern'] = 'losowy wzór geometryczny';
-$a->strings['monster face'] = 'twarz potwora';
-$a->strings['computer generated face'] = 'twarz wygenerowana komputerowo';
-$a->strings['retro arcade style face'] = 'twarz w stylu retro arcade';
-$a->strings['roboter face'] = 'twarz robota';
-$a->strings['retro adventure game character'] = 'postać z gry przygodowej w stylu retro';
-$a->strings['Information'] = 'Informacja';
-$a->strings['Gravatar addon is installed. Please disable the Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar.'] = 'Dodatek Gravatar jest zainstalowany. Wyłącz dodatek Gravatar. Dodatek Libravatar powróci do Gravatar, jeśli w Libravatar nie zostanie znaleziony żaden przedmiot.';
-$a->strings['Save Settings'] = 'Zapisz ustawienia';
-$a->strings['Default avatar image'] = 'Domyślny obraz awatara';
-$a->strings['Select default avatar image if none was found. See README'] = 'Wybierz domyślny obraz awatara, jeśli nie został znaleziony. Zobacz README';
+;
+$a->strings["Could NOT install Libravatar successfully.<br>It requires PHP >= 5.3"] = "Nie można zainstalować dodatku Libravatar. <br>Wymaga PHP> = 5.3";
+$a->strings["generic profile image"] = "ogólny obraz profilu";
+$a->strings["random geometric pattern"] = "losowy wzór geometryczny";
+$a->strings["monster face"] = "twarz potwora";
+$a->strings["computer generated face"] = "twarz wygenerowana komputerowo";
+$a->strings["retro arcade style face"] = "twarz w stylu retro arcade";
+$a->strings["Warning"] = "Ostrzeżenie";
+$a->strings["Your PHP version %s is lower than the required PHP >= 5.3."] = "Twoja wersja PHP %s jest niższa niż wymagana PHP> = 5.3.";
+$a->strings["This addon is not functional on your server."] = "Ten dodatek nie działa na twoim serwerze.";
+$a->strings["Information"] = "Informacja";
+$a->strings["Gravatar addon is installed. Please disable the Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar."] = "Dodatek Gravatar jest zainstalowany. Wyłącz dodatek Gravatar. Dodatek Libravatar powróci do Gravatar, jeśli w Libravatar nie zostanie znaleziony żaden przedmiot.";
+$a->strings["Submit"] = "Prześlij";
+$a->strings["Default avatar image"] = "Domyślny obraz awatara";
+$a->strings["Select default avatar image if none was found. See README"] = "Wybierz domyślny obraz awatara, jeśli nie został znaleziony. Zobacz README";
+$a->strings["Libravatar settings updated."] = "Zaktualizowano ustawienia Libravatar.";
diff --git a/libravatar/lang/pt-br/strings.php b/libravatar/lang/pt-br/strings.php
index 3cb9db66..9688c2ae 100644
--- a/libravatar/lang/pt-br/strings.php
+++ b/libravatar/lang/pt-br/strings.php
@@ -2,10 +2,21 @@
 
 if(! function_exists("string_plural_select_pt_br")) {
 function string_plural_select_pt_br($n){
-	$n = intval($n);
-	return intval($n > 1);
+	return ($n > 1);;
 }}
-$a->strings['Could NOT install Libravatar successfully.<br>It requires PHP >= 5.3'] = 'Não foi possível instalar o Libravatar.<br>Ele requer PHP >= 5.3';
-$a->strings['monster face'] = 'careta';
-$a->strings['retro arcade style face'] = 'rosto de personagem de fliperama';
-$a->strings['Submit'] = 'Enviar';
+;
+$a->strings["Could NOT install Libravatar successfully.<br>It requires PHP >= 5.3"] = "Não foi possível instalar o Libravatar.<br>Ele requer PHP >= 5.3";
+$a->strings["generic profile image"] = "";
+$a->strings["random geometric pattern"] = "";
+$a->strings["monster face"] = "careta";
+$a->strings["computer generated face"] = "";
+$a->strings["retro arcade style face"] = "rosto de personagem de fliperama";
+$a->strings["Warning"] = "";
+$a->strings["Your PHP version %s is lower than the required PHP >= 5.3."] = "";
+$a->strings["This addon is not functional on your server."] = "";
+$a->strings["Information"] = "";
+$a->strings["Gravatar addon is installed. Please disable the Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar."] = "";
+$a->strings["Submit"] = "Enviar";
+$a->strings["Default avatar image"] = "";
+$a->strings["Select default avatar image if none was found. See README"] = "";
+$a->strings["Libravatar settings updated."] = "";
diff --git a/libravatar/lang/ro/strings.php b/libravatar/lang/ro/strings.php
index 7ea9ae66..61764cb3 100644
--- a/libravatar/lang/ro/strings.php
+++ b/libravatar/lang/ro/strings.php
@@ -2,21 +2,21 @@
 
 if(! function_exists("string_plural_select_ro")) {
 function string_plural_select_ro($n){
-	$n = intval($n);
-	if ($n==1) { return 0; } else if ((($n%100>19)||(($n%100==0)&&($n!=0)))) { return 2; } else  { return 1; }
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
 }}
-$a->strings['Could NOT install Libravatar successfully.<br>It requires PHP >= 5.3'] = 'NU s-a putut instala Libravatar cu succes.<br>Acesta necesită PHP >= 5.3';
-$a->strings['generic profile image'] = 'imagine generică de profil';
-$a->strings['random geometric pattern'] = 'șablon geometric aleator';
-$a->strings['monster face'] = 'chip monstruos';
-$a->strings['computer generated face'] = 'chip generat de calculator';
-$a->strings['retro arcade style face'] = 'chip în stil jocuri arcade retro';
-$a->strings['Warning'] = 'Atenție';
-$a->strings['Your PHP version %s is lower than the required PHP >= 5.3.'] = 'Versiunea dumneavoastră PHP %s este inferioară celei necesare PHP >= 5.3.';
-$a->strings['This addon is not functional on your server.'] = 'Acest supliment nu este funcțional pe serverul dumneavoastră.';
-$a->strings['Information'] = 'Informaţii';
-$a->strings['Gravatar addon is installed. Please disable the Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar.'] = 'Suplimentul Gravatar este instalat. Vă rugăm să dezactivați suplimentul Gravatar.<br> Suplimentul Libravatar va reveni înapoi la Gravatar, dacă nu s-a găsit nimic în Libravatar.';
-$a->strings['Submit'] = 'Trimite';
-$a->strings['Default avatar image'] = 'Imagine avatar implicită';
-$a->strings['Select default avatar image if none was found. See README'] = 'Selectați imaginea avatar implicită, dacă nici una nu fost găsită. Consultați FIŞIERUL README';
-$a->strings['Libravatar settings updated.'] = 'Configurările Libravatar au fost actualizate.';
+;
+$a->strings["Could NOT install Libravatar successfully.<br>It requires PHP >= 5.3"] = "NU s-a putut instala Libravatar cu succes.<br>Acesta necesită PHP >= 5.3";
+$a->strings["generic profile image"] = "imagine generică de profil";
+$a->strings["random geometric pattern"] = "șablon geometric aleator";
+$a->strings["monster face"] = "chip monstruos";
+$a->strings["computer generated face"] = "chip generat de calculator";
+$a->strings["retro arcade style face"] = "chip în stil jocuri arcade retro";
+$a->strings["Warning"] = "Atenție";
+$a->strings["Your PHP version %s is lower than the required PHP >= 5.3."] = "Versiunea dumneavoastră PHP %s este inferioară celei necesare PHP >= 5.3.";
+$a->strings["This addon is not functional on your server."] = "Acest supliment nu este funcțional pe serverul dumneavoastră.";
+$a->strings["Information"] = "Informaţii";
+$a->strings["Gravatar addon is installed. Please disable the Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar."] = "Suplimentul Gravatar este instalat. Vă rugăm să dezactivați suplimentul Gravatar.<br> Suplimentul Libravatar va reveni înapoi la Gravatar, dacă nu s-a găsit nimic în Libravatar.";
+$a->strings["Submit"] = "Trimite";
+$a->strings["Default avatar image"] = "Imagine avatar implicită";
+$a->strings["Select default avatar image if none was found. See README"] = "Selectați imaginea avatar implicită, dacă nici una nu fost găsită. Consultați FIŞIERUL README";
+$a->strings["Libravatar settings updated."] = "Configurările Libravatar au fost actualizate.";
diff --git a/libravatar/lang/sv/messages.po b/libravatar/lang/sv/messages.po
deleted file mode 100644
index 06a38c0c..00000000
--- a/libravatar/lang/sv/messages.po
+++ /dev/null
@@ -1,71 +0,0 @@
-# ADDON libravatar
-# Copyright (C)
-# This file is distributed under the same license as the Friendica libravatar addon package.
-# 
-# 
-# Translators:
-# Kristoffer Grundström <lovaren@gmail.com>, 2022
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2022-01-16 00:42+0000\n"
-"Last-Translator: Kristoffer Grundström <lovaren@gmail.com>\n"
-"Language-Team: Swedish (http://www.transifex.com/Friendica/friendica/language/sv/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: sv\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: libravatar.php:68
-msgid "generic profile image"
-msgstr "generisk profilbild"
-
-#: libravatar.php:69
-msgid "random geometric pattern"
-msgstr ""
-
-#: libravatar.php:70
-msgid "monster face"
-msgstr "monsteransikte"
-
-#: libravatar.php:71
-msgid "computer generated face"
-msgstr "datorgenererat ansikte"
-
-#: libravatar.php:72
-msgid "retro arcade style face"
-msgstr ""
-
-#: libravatar.php:73
-msgid "roboter face"
-msgstr ""
-
-#: libravatar.php:74
-msgid "retro adventure game character"
-msgstr ""
-
-#: libravatar.php:78
-msgid "Information"
-msgstr "Information"
-
-#: libravatar.php:78
-msgid ""
-"Gravatar addon is installed. Please disable the Gravatar addon.<br>The "
-"Libravatar addon will fall back to Gravatar if nothing was found at "
-"Libravatar."
-msgstr ""
-
-#: libravatar.php:83
-msgid "Save Settings"
-msgstr ""
-
-#: libravatar.php:84
-msgid "Default avatar image"
-msgstr ""
-
-#: libravatar.php:84
-msgid "Select default avatar image if none was found. See README"
-msgstr ""
diff --git a/libravatar/lang/sv/strings.php b/libravatar/lang/sv/strings.php
index 5e2e590c..3ec569a7 100644
--- a/libravatar/lang/sv/strings.php
+++ b/libravatar/lang/sv/strings.php
@@ -1,11 +1,3 @@
-<?php
-
-if(! function_exists("string_plural_select_sv")) {
-function string_plural_select_sv($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['generic profile image'] = 'generisk profilbild';
-$a->strings['monster face'] = 'monsteransikte';
-$a->strings['computer generated face'] = 'datorgenererat ansikte';
-$a->strings['Information'] = 'Information';
+<?php
+
+$a->strings["Submit"] = "Spara";
diff --git a/libravatar/libravatar.php b/libravatar/libravatar.php
index 54594b88..43e67340 100644
--- a/libravatar/libravatar.php
+++ b/libravatar/libravatar.php
@@ -7,12 +7,15 @@
  */
 
 use Friendica\App;
-use Friendica\Core\Addon;
+use Friendica\BaseModule;
+use Friendica\Core\Config;
 use Friendica\Core\Hook;
+use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
-use Friendica\DI;
-use Friendica\Core\Config\Util\ConfigFileManager;
+use Friendica\Database\DBA;
+use Friendica\Util\ConfigFileLoader;
+use Friendica\Util\Strings;
 
 /**
  * Installs the addon hook
@@ -21,29 +24,44 @@ function libravatar_install()
 {
 	Hook::register('load_config',   'addon/libravatar/libravatar.php', 'libravatar_load_config');
 	Hook::register('avatar_lookup', 'addon/libravatar/libravatar.php', 'libravatar_lookup');
-	Logger::notice("registered libravatar in avatar_lookup hook");
+	Logger::log("registered libravatar in avatar_lookup hook");
 }
 
-function libravatar_load_config(ConfigFileManager $loader)
+/**
+ * Removes the addon hook
+ */
+function libravatar_uninstall()
 {
-	DI::app()->getConfigCache()->load($loader->loadAddonConfig('libravatar'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
+	Hook::unregister('load_config',   'addon/libravatar/libravatar.php', 'libravatar_load_config');
+	Hook::unregister('avatar_lookup', 'addon/libravatar/libravatar.php', 'libravatar_lookup');
+	Logger::log("unregistered libravatar in avatar_lookup hook");
+}
+
+function libravatar_load_config(App $a, ConfigFileLoader $loader)
+{
+	$a->getConfigCache()->load($loader->loadAddonConfig('libravatar'));
 }
 
 /**
  * Looks up the avatar at Libravatar and returns the URL.
  *
+ * @param $a array
  * @param &$b array
  */
-function libravatar_lookup(array &$b)
+function libravatar_lookup($a, &$b)
 {
-	$default_avatar = DI::config()->get('libravatar', 'default_avatar');
-	if (empty($default_avatar)) {
+	$default_avatar = Config::get('libravatar', 'default_avatar');
+
+	if (! $default_avatar) {
 		// if not set, look up if there was one from the gravatar addon
-		$default_avatar = DI::config()->get('gravatar', 'default_avatar', 'identicon');
+		$default_avatar = Config::get('gravatar', 'default_avatar');
+		// setting default avatar if nothing configured
+		if (!$default_avatar) {
+			$default_avatar = 'identicon'; // default image will be a random pattern
+		}
 	}
 
 	require_once 'Services/Libravatar.php';
-
 	$libravatar = new Services_Libravatar();
 	$libravatar->setSize($b['size']);
 	$libravatar->setDefault($default_avatar);
@@ -56,38 +74,58 @@ function libravatar_lookup(array &$b)
 /**
  * Display admin settings for this addon
  */
-function libravatar_addon_admin(string &$o)
+function libravatar_addon_admin(&$a, &$o)
 {
-	$t = Renderer::getMarkupTemplate('admin.tpl', 'addon/libravatar');
+	$t = Renderer::getMarkupTemplate("admin.tpl", "addon/libravatar");
 
-	$default_avatar = DI::config()->get('libravatar', 'default_avatar', 'identicon');
+	$default_avatar = Config::get('libravatar', 'default_avatar');
+
+	// set default values for first configuration
+	if (!$default_avatar) {
+		$default_avatar = 'identicon'; // pseudo-random geometric pattern based on email hash
+	}
 
 	// Available options for the select boxes
 	$default_avatars = [
-		'mm' => DI::l10n()->t('generic profile image'),
-		'identicon' => DI::l10n()->t('random geometric pattern'),
-		'monsterid' => DI::l10n()->t('monster face'),
-		'wavatar' => DI::l10n()->t('computer generated face'),
-		'retro' => DI::l10n()->t('retro arcade style face'),
-		'robohash' => DI::l10n()->t('roboter face'),
-		'pagan' => DI::l10n()->t('retro adventure game character'),
+		'mm' => L10n::t('generic profile image'),
+		'identicon' => L10n::t('random geometric pattern'),
+		'monsterid' => L10n::t('monster face'),
+		'wavatar' => L10n::t('computer generated face'),
+		'retro' => L10n::t('retro arcade style face'),
 	];
 
-	if (Addon::isEnabled('gravatar')) {
-		$o = '<h5>' .DI::l10n()->t('Information') .'</h5><p>' .DI::l10n()->t('Gravatar addon is installed. Please disable the Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar.') .'</p><br><br>';
+	// Show warning if PHP version is too old
+	if (! version_compare(PHP_VERSION, '5.3.0', '>=')) {
+		$o = '<h5>' .L10n::t('Warning') .'</h5><p>';
+		$o .= L10n::t('Your PHP version %s is lower than the required PHP >= 5.3.', PHP_VERSION);
+		$o .= '<br>' .L10n::t('This addon is not functional on your server.') .'<p><br>';
+		return;
+	}
+
+	// Libravatar falls back to gravatar, so show warning about gravatar addon if enabled
+	$r = q("SELECT * FROM `addon` WHERE `name` = '%s' and `installed` = 1",
+		DBA::escape('gravatar')
+	);
+	if (count($r)) {
+		$o = '<h5>' .L10n::t('Information') .'</h5><p>' .L10n::t('Gravatar addon is installed. Please disable the Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar.') .'</p><br><br>';
 	}
 
 	// output Libravatar settings
+	$o .= '<input type="hidden" name="form_security_token" value="' . BaseModule::getFormSecurityToken("libravatarsave") .'">';
 	$o .= Renderer::replaceMacros( $t, [
-		'$submit' => DI::l10n()->t('Save Settings'),
-		'$default_avatar' => ['avatar', DI::l10n()->t('Default avatar image'), $default_avatar, DI::l10n()->t('Select default avatar image if none was found. See README'), $default_avatars],
+		'$submit' => L10n::t('Save Settings'),
+		'$default_avatar' => ['avatar', L10n::t('Default avatar image'), $default_avatar, L10n::t('Select default avatar image if none was found. See README'), $default_avatars],
 	]);
 }
 
 /**
  * Save admin settings
  */
-function libravatar_addon_admin_post()
+function libravatar_addon_admin_post(&$a)
 {
-	DI::config()->set('libravatar', 'default_avatar', trim($_POST['avatar'] ?? 'identicon'));
+	BaseModule::checkFormSecurityToken('libravatarrsave');
+
+	$default_avatar = (!empty($_POST['avatar']) ? Strings::escapeTags(trim($_POST['avatar'])) : 'identicon');
+	Config::set('libravatar', 'default_avatar', $default_avatar);
+	info(L10n::t('Libravatar settings updated.') .EOL);
 }
diff --git a/ljpost/lang/C/messages.po b/ljpost/lang/C/messages.po
index 7f5417b7..9baae18e 100644
--- a/ljpost/lang/C/messages.po
+++ b/ljpost/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:17-0500\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,26 +17,30 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ljpost.php:43
+#: ljpost.php:39
 msgid "Post to LiveJournal"
 msgstr ""
 
-#: ljpost.php:63
+#: ljpost.php:70
+msgid "LiveJournal Post Settings"
+msgstr ""
+
+#: ljpost.php:72
 msgid "Enable LiveJournal Post Addon"
 msgstr ""
 
-#: ljpost.php:64
+#: ljpost.php:77
 msgid "LiveJournal username"
 msgstr ""
 
-#: ljpost.php:65
+#: ljpost.php:82
 msgid "LiveJournal password"
 msgstr ""
 
-#: ljpost.php:66
+#: ljpost.php:87
 msgid "Post to LiveJournal by default"
 msgstr ""
 
-#: ljpost.php:71
-msgid "LiveJournal Export"
+#: ljpost.php:93
+msgid "Submit"
 msgstr ""
diff --git a/ljpost/lang/ar/messages.po b/ljpost/lang/ar/messages.po
deleted file mode 100644
index cf56e1d2..00000000
--- a/ljpost/lang/ar/messages.po
+++ /dev/null
@@ -1,48 +0,0 @@
-# ADDON ljpost
-# Copyright (C)
-# This file is distributed under the same license as the Friendica ljpost addon package.
-# 
-# 
-# Translators:
-# Farida Khalaf <faridakhalaf@hotmail.com>, 2021
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2021-02-21 18:37+0000\n"
-"Last-Translator: Farida Khalaf <faridakhalaf@hotmail.com>\n"
-"Language-Team: Arabic (http://www.transifex.com/Friendica/friendica/language/ar/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ar\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-
-#: ljpost.php:39
-msgid "Post to LiveJournal"
-msgstr ""
-
-#: ljpost.php:73
-msgid "LiveJournal Post Settings"
-msgstr ""
-
-#: ljpost.php:75
-msgid "Enable LiveJournal Post Addon"
-msgstr ""
-
-#: ljpost.php:80
-msgid "LiveJournal username"
-msgstr ""
-
-#: ljpost.php:85
-msgid "LiveJournal password"
-msgstr ""
-
-#: ljpost.php:90
-msgid "Post to LiveJournal by default"
-msgstr ""
-
-#: ljpost.php:96
-msgid "Save Settings"
-msgstr "حفظ الإعدادات"
diff --git a/ljpost/lang/ar/strings.php b/ljpost/lang/ar/strings.php
deleted file mode 100644
index 285ad303..00000000
--- a/ljpost/lang/ar/strings.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_ar")) {
-function string_plural_select_ar($n){
-	$n = intval($n);
-	if ($n==0) { return 0; } else if ($n==1) { return 1; } else if ($n==2) { return 2; } else if ($n%100>=3 && $n%100<=10) { return 3; } else if ($n%100>=11 && $n%100<=99) { return 4; } else  { return 5; }
-}}
-$a->strings['Save Settings'] = 'حفظ الإعدادات';
diff --git a/ljpost/lang/cs/messages.po b/ljpost/lang/cs/messages.po
index 1578bf38..74a88433 100644
--- a/ljpost/lang/cs/messages.po
+++ b/ljpost/lang/cs/messages.po
@@ -4,42 +4,45 @@
 # 
 # 
 # Translators:
-# Aditoo, 2018
-# michal_s <msupler@gmail.com>, 2014-2015
+# Michal Šupler <msupler@gmail.com>, 2014-2015
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:17-0500\n"
-"PO-Revision-Date: 2014-06-23 09:51+0000\n"
-"Last-Translator: Aditoo, 2018\n"
-"Language-Team: Czech (http://app.transifex.com/Friendica/friendica/language/cs/)\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2015-02-11 19:38+0000\n"
+"Last-Translator: Michal Šupler <msupler@gmail.com>\n"
+"Language-Team: Czech (http://www.transifex.com/projects/p/friendica/language/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: cs\n"
-"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: ljpost.php:43
+#: ljpost.php:39
 msgid "Post to LiveJournal"
-msgstr "Odeslat na LiveJournal"
+msgstr "Poslat na LiveJournal"
 
-#: ljpost.php:63
+#: ljpost.php:70
+msgid "LiveJournal Post Settings"
+msgstr "Nastavení LiveJournal Post"
+
+#: ljpost.php:72
 msgid "Enable LiveJournal Post Addon"
-msgstr "Povolit doplněk LiveJournal Post"
+msgstr "Povolit LiveJournal Post addon"
 
-#: ljpost.php:64
+#: ljpost.php:77
 msgid "LiveJournal username"
 msgstr "LiveJournal uživatelské jméno"
 
-#: ljpost.php:65
+#: ljpost.php:82
 msgid "LiveJournal password"
 msgstr "LiveJournal heslo"
 
-#: ljpost.php:66
+#: ljpost.php:87
 msgid "Post to LiveJournal by default"
 msgstr "Defaultně umístit na LiveJournal"
 
-#: ljpost.php:71
-msgid "LiveJournal Export"
-msgstr ""
+#: ljpost.php:93
+msgid "Submit"
+msgstr "Odeslat"
diff --git a/ljpost/lang/cs/strings.php b/ljpost/lang/cs/strings.php
index 2430efbd..d2c833d9 100644
--- a/ljpost/lang/cs/strings.php
+++ b/ljpost/lang/cs/strings.php
@@ -2,11 +2,13 @@
 
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
-	$n = intval($n);
-	if (($n == 1 && $n % 1 == 0)) { return 0; } else if (($n >= 2 && $n <= 4 && $n % 1 == 0)) { return 1; } else if (($n % 1 != 0 )) { return 2; } else  { return 3; }
+	return ($n==1) ? 0 : ($n>=2 && $n<=4) ? 1 : 2;;
 }}
-$a->strings['Post to LiveJournal'] = 'Odeslat na LiveJournal';
-$a->strings['Enable LiveJournal Post Addon'] = 'Povolit doplněk LiveJournal Post';
-$a->strings['LiveJournal username'] = 'LiveJournal uživatelské jméno';
-$a->strings['LiveJournal password'] = 'LiveJournal heslo';
-$a->strings['Post to LiveJournal by default'] = 'Defaultně umístit na LiveJournal';
+;
+$a->strings["Post to LiveJournal"] = "Poslat na LiveJournal";
+$a->strings["LiveJournal Post Settings"] = "Nastavení LiveJournal Post";
+$a->strings["Enable LiveJournal Post Addon"] = "Povolit LiveJournal Post addon";
+$a->strings["LiveJournal username"] = "LiveJournal uživatelské jméno";
+$a->strings["LiveJournal password"] = "LiveJournal heslo";
+$a->strings["Post to LiveJournal by default"] = "Defaultně umístit na LiveJournal";
+$a->strings["Submit"] = "Odeslat";
diff --git a/ljpost/lang/da-dk/messages.po b/ljpost/lang/da-dk/messages.po
deleted file mode 100644
index a42b5d31..00000000
--- a/ljpost/lang/da-dk/messages.po
+++ /dev/null
@@ -1,43 +0,0 @@
-# ADDON ljpost
-# Copyright (C)
-# This file is distributed under the same license as the Friendica ljpost addon package.
-# 
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:17-0500\n"
-"PO-Revision-Date: 2014-06-23 09:51+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Danish (Denmark) (http://www.transifex.com/Friendica/friendica/language/da_DK/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: da_DK\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: ljpost.php:43
-msgid "Post to LiveJournal"
-msgstr ""
-
-#: ljpost.php:63
-msgid "Enable LiveJournal Post Addon"
-msgstr ""
-
-#: ljpost.php:64
-msgid "LiveJournal username"
-msgstr ""
-
-#: ljpost.php:65
-msgid "LiveJournal password"
-msgstr ""
-
-#: ljpost.php:66
-msgid "Post to LiveJournal by default"
-msgstr ""
-
-#: ljpost.php:71
-msgid "LiveJournal Export"
-msgstr ""
diff --git a/ljpost/lang/da-dk/strings.php b/ljpost/lang/da-dk/strings.php
deleted file mode 100644
index 09554750..00000000
--- a/ljpost/lang/da-dk/strings.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_da_dk")) {
-function string_plural_select_da_dk($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
diff --git a/ljpost/lang/de/messages.po b/ljpost/lang/de/messages.po
index 7a41438f..4d915c0d 100644
--- a/ljpost/lang/de/messages.po
+++ b/ljpost/lang/de/messages.po
@@ -4,44 +4,46 @@
 # 
 # 
 # Translators:
-# Andreas H., 2014
-# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2014
-# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2018,2021-2022
-# Ulf Rompe <transifex.com@rompe.org>, 2019
+# Abrax <webmaster@a-zwenkau.de>, 2014
+# bavatar <tobias.diekershoff@gmx.net>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:17-0500\n"
-"PO-Revision-Date: 2014-06-23 09:51+0000\n"
-"Last-Translator: Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2018,2021-2022\n"
-"Language-Team: German (http://app.transifex.com/Friendica/friendica/language/de/)\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2014-10-15 12:30+0000\n"
+"Last-Translator: Abrax <webmaster@a-zwenkau.de>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/friendica/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ljpost.php:43
+#: ljpost.php:39
 msgid "Post to LiveJournal"
 msgstr "In LiveJournal veröffentlichen."
 
-#: ljpost.php:63
+#: ljpost.php:70
+msgid "LiveJournal Post Settings"
+msgstr "LiveJournal Veröffentlichungs-Einstellungen"
+
+#: ljpost.php:72
 msgid "Enable LiveJournal Post Addon"
-msgstr "LiveJournal-Post-Addon aktivieren"
+msgstr "LiveJournal Post Addon aktivieren"
 
-#: ljpost.php:64
+#: ljpost.php:77
 msgid "LiveJournal username"
-msgstr "LiveJournal-Benutzername"
+msgstr "LiveJournal Benutzername"
 
-#: ljpost.php:65
+#: ljpost.php:82
 msgid "LiveJournal password"
-msgstr "LiveJournal-Passwort"
+msgstr "LiveJournal Passwort"
 
-#: ljpost.php:66
+#: ljpost.php:87
 msgid "Post to LiveJournal by default"
 msgstr "Standardmäßig bei LiveJournal veröffentlichen"
 
-#: ljpost.php:71
-msgid "LiveJournal Export"
-msgstr "LiveJournal Export"
+#: ljpost.php:93
+msgid "Submit"
+msgstr "Senden"
diff --git a/ljpost/lang/de/strings.php b/ljpost/lang/de/strings.php
index 88c98dd0..e6b9c848 100644
--- a/ljpost/lang/de/strings.php
+++ b/ljpost/lang/de/strings.php
@@ -2,12 +2,13 @@
 
 if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Post to LiveJournal'] = 'In LiveJournal veröffentlichen.';
-$a->strings['Enable LiveJournal Post Addon'] = 'LiveJournal-Post-Addon aktivieren';
-$a->strings['LiveJournal username'] = 'LiveJournal-Benutzername';
-$a->strings['LiveJournal password'] = 'LiveJournal-Passwort';
-$a->strings['Post to LiveJournal by default'] = 'Standardmäßig bei LiveJournal veröffentlichen';
-$a->strings['LiveJournal Export'] = 'LiveJournal Export';
+;
+$a->strings["Post to LiveJournal"] = "In LiveJournal veröffentlichen.";
+$a->strings["LiveJournal Post Settings"] = "LiveJournal Veröffentlichungs-Einstellungen";
+$a->strings["Enable LiveJournal Post Addon"] = "LiveJournal Post Addon aktivieren";
+$a->strings["LiveJournal username"] = "LiveJournal Benutzername";
+$a->strings["LiveJournal password"] = "LiveJournal Passwort";
+$a->strings["Post to LiveJournal by default"] = "Standardmäßig bei LiveJournal veröffentlichen";
+$a->strings["Submit"] = "Senden";
diff --git a/ljpost/lang/es/messages.po b/ljpost/lang/es/messages.po
index 309a22e1..f94e20bb 100644
--- a/ljpost/lang/es/messages.po
+++ b/ljpost/lang/es/messages.po
@@ -5,14 +5,13 @@
 # 
 # Translators:
 # Albert, 2016
-# Senex Petrovic <javierruizo@hotmail.com>, 2021
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2021-04-01 10:05+0000\n"
-"Last-Translator: Senex Petrovic <javierruizo@hotmail.com>\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2016-11-17 20:17+0000\n"
+"Last-Translator: Albert\n"
 "Language-Team: Spanish (http://www.transifex.com/Friendica/friendica/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,26 +23,26 @@ msgstr ""
 msgid "Post to LiveJournal"
 msgstr "Publicar en LiveJournal"
 
-#: ljpost.php:73
+#: ljpost.php:70
 msgid "LiveJournal Post Settings"
 msgstr "Ajustes de publicación de LiveJournal"
 
-#: ljpost.php:75
+#: ljpost.php:72
 msgid "Enable LiveJournal Post Addon"
-msgstr "Habilitar el Plugin de LiveJournal"
+msgstr "Habilitar Addon de publicción de LiveJournal"
 
-#: ljpost.php:80
+#: ljpost.php:77
 msgid "LiveJournal username"
 msgstr "Nombre de usuario de LiveJournal"
 
-#: ljpost.php:85
+#: ljpost.php:82
 msgid "LiveJournal password"
 msgstr "Contraseña de LiveJournal"
 
-#: ljpost.php:90
+#: ljpost.php:87
 msgid "Post to LiveJournal by default"
 msgstr "Publicar en LiveJournal por defecto"
 
-#: ljpost.php:96
-msgid "Save Settings"
-msgstr "Guardar ajustes"
+#: ljpost.php:93
+msgid "Submit"
+msgstr "Enviar"
diff --git a/ljpost/lang/es/strings.php b/ljpost/lang/es/strings.php
index b9c70cc3..10092765 100644
--- a/ljpost/lang/es/strings.php
+++ b/ljpost/lang/es/strings.php
@@ -2,13 +2,13 @@
 
 if(! function_exists("string_plural_select_es")) {
 function string_plural_select_es($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Post to LiveJournal'] = 'Publicar en LiveJournal';
-$a->strings['LiveJournal Post Settings'] = 'Ajustes de publicación de LiveJournal';
-$a->strings['Enable LiveJournal Post Addon'] = 'Habilitar el Plugin de LiveJournal';
-$a->strings['LiveJournal username'] = 'Nombre de usuario de LiveJournal';
-$a->strings['LiveJournal password'] = 'Contraseña de LiveJournal';
-$a->strings['Post to LiveJournal by default'] = 'Publicar en LiveJournal por defecto';
-$a->strings['Save Settings'] = 'Guardar ajustes';
+;
+$a->strings["Post to LiveJournal"] = "Publicar en LiveJournal";
+$a->strings["LiveJournal Post Settings"] = "Ajustes de publicación de LiveJournal";
+$a->strings["Enable LiveJournal Post Addon"] = "Habilitar Addon de publicción de LiveJournal";
+$a->strings["LiveJournal username"] = "Nombre de usuario de LiveJournal";
+$a->strings["LiveJournal password"] = "Contraseña de LiveJournal";
+$a->strings["Post to LiveJournal by default"] = "Publicar en LiveJournal por defecto";
+$a->strings["Submit"] = "Enviar";
diff --git a/ljpost/lang/fi-fi/strings.php b/ljpost/lang/fi-fi/strings.php
index 77bb0da2..e03e6ba3 100644
--- a/ljpost/lang/fi-fi/strings.php
+++ b/ljpost/lang/fi-fi/strings.php
@@ -2,13 +2,13 @@
 
 if(! function_exists("string_plural_select_fi_fi")) {
 function string_plural_select_fi_fi($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Post to LiveJournal'] = 'Lähetä LiveJournaliin';
-$a->strings['LiveJournal Post Settings'] = 'LiveJournal -viestin asetukset';
-$a->strings['Enable LiveJournal Post Addon'] = 'Ota LiveJournal -viestilisäosa käyttöön';
-$a->strings['LiveJournal username'] = 'Live Journal -käyttäjätunnus';
-$a->strings['LiveJournal password'] = 'LiveJournal -salasana';
-$a->strings['Post to LiveJournal by default'] = 'Lähetä LiveJournaliin oletuksena';
-$a->strings['Submit'] = 'Lähetä';
+;
+$a->strings["Post to LiveJournal"] = "Lähetä LiveJournaliin";
+$a->strings["LiveJournal Post Settings"] = "LiveJournal -viestin asetukset";
+$a->strings["Enable LiveJournal Post Addon"] = "Ota LiveJournal -viestilisäosa käyttöön";
+$a->strings["LiveJournal username"] = "Live Journal -käyttäjätunnus";
+$a->strings["LiveJournal password"] = "LiveJournal -salasana";
+$a->strings["Post to LiveJournal by default"] = "Lähetä LiveJournaliin oletuksena";
+$a->strings["Submit"] = "Lähetä";
diff --git a/ljpost/lang/fr/messages.po b/ljpost/lang/fr/messages.po
deleted file mode 100644
index 21208bc4..00000000
--- a/ljpost/lang/fr/messages.po
+++ /dev/null
@@ -1,45 +0,0 @@
-# ADDON ljpost
-# Copyright (C)
-# This file is distributed under the same license as the Friendica ljpost addon package.
-# 
-# 
-# Translators:
-# Hypolite Petovan <hypolite@mrpetovan.com>, 2022
-# Hypolite Petovan <hypolite@mrpetovan.com>, 2016
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:17-0500\n"
-"PO-Revision-Date: 2014-06-23 09:51+0000\n"
-"Last-Translator: Hypolite Petovan <hypolite@mrpetovan.com>, 2022\n"
-"Language-Team: French (http://www.transifex.com/Friendica/friendica/language/fr/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: fr\n"
-"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
-
-#: ljpost.php:43
-msgid "Post to LiveJournal"
-msgstr "Publier sur LiveJournal"
-
-#: ljpost.php:63
-msgid "Enable LiveJournal Post Addon"
-msgstr "Activer l'extension LiveJournal"
-
-#: ljpost.php:64
-msgid "LiveJournal username"
-msgstr "Nom d'utilisateur LiveJournal"
-
-#: ljpost.php:65
-msgid "LiveJournal password"
-msgstr "Mot de passe LiveJournal"
-
-#: ljpost.php:66
-msgid "Post to LiveJournal by default"
-msgstr "Publier sur LiveJournal par défaut"
-
-#: ljpost.php:71
-msgid "LiveJournal Export"
-msgstr "Export LiveJournal"
diff --git a/ljpost/lang/fr/strings.php b/ljpost/lang/fr/strings.php
index 0c4ef28c..85407d57 100644
--- a/ljpost/lang/fr/strings.php
+++ b/ljpost/lang/fr/strings.php
@@ -1,13 +1,9 @@
-<?php
-
-if(! function_exists("string_plural_select_fr")) {
-function string_plural_select_fr($n){
-	$n = intval($n);
-	if (($n == 0 || $n == 1)) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
-}}
-$a->strings['Post to LiveJournal'] = 'Publier sur LiveJournal';
-$a->strings['Enable LiveJournal Post Addon'] = 'Activer l\'extension LiveJournal';
-$a->strings['LiveJournal username'] = 'Nom d\'utilisateur LiveJournal';
-$a->strings['LiveJournal password'] = 'Mot de passe LiveJournal';
-$a->strings['Post to LiveJournal by default'] = 'Publier sur LiveJournal par défaut';
-$a->strings['LiveJournal Export'] = 'Export LiveJournal';
+<?php
+
+$a->strings["Post to LiveJournal"] = "Poster vers LiveJournal";
+$a->strings["LiveJournal Post Settings"] = "Réglages LiveJournal";
+$a->strings["Enable LiveJournal Post Addon"] = "Activer \"Poster vers LiveJournal\"";
+$a->strings["LiveJournal username"] = "Nom d'utilisateur LiveJournal";
+$a->strings["LiveJournal password"] = "Mot de passe";
+$a->strings["Post to LiveJournal by default"] = "Poster vers LiveJournal par défaut";
+$a->strings["Submit"] = "Envoyer";
diff --git a/ljpost/lang/hu/messages.po b/ljpost/lang/hu/messages.po
deleted file mode 100644
index ccc13e03..00000000
--- a/ljpost/lang/hu/messages.po
+++ /dev/null
@@ -1,44 +0,0 @@
-# ADDON ljpost
-# Copyright (C)
-# This file is distributed under the same license as the Friendica ljpost addon package.
-# 
-# 
-# Translators:
-# Balázs Úr, 2020-2021
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:17-0500\n"
-"PO-Revision-Date: 2014-06-23 09:51+0000\n"
-"Last-Translator: Balázs Úr, 2020-2021\n"
-"Language-Team: Hungarian (http://www.transifex.com/Friendica/friendica/language/hu/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: hu\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: ljpost.php:43
-msgid "Post to LiveJournal"
-msgstr "Beküldés a LiveJournalra"
-
-#: ljpost.php:63
-msgid "Enable LiveJournal Post Addon"
-msgstr "A LiveJournal-beküldő bővítmény engedélyezése"
-
-#: ljpost.php:64
-msgid "LiveJournal username"
-msgstr "LiveJournal felhasználónév"
-
-#: ljpost.php:65
-msgid "LiveJournal password"
-msgstr "LiveJournal jelszó"
-
-#: ljpost.php:66
-msgid "Post to LiveJournal by default"
-msgstr "Beküldés a LiveJournalra alapértelmezetten"
-
-#: ljpost.php:71
-msgid "LiveJournal Export"
-msgstr "LiveJournal exportálás"
diff --git a/ljpost/lang/hu/strings.php b/ljpost/lang/hu/strings.php
deleted file mode 100644
index 2455c43b..00000000
--- a/ljpost/lang/hu/strings.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_hu")) {
-function string_plural_select_hu($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Post to LiveJournal'] = 'Beküldés a LiveJournalra';
-$a->strings['Enable LiveJournal Post Addon'] = 'A LiveJournal-beküldő bővítmény engedélyezése';
-$a->strings['LiveJournal username'] = 'LiveJournal felhasználónév';
-$a->strings['LiveJournal password'] = 'LiveJournal jelszó';
-$a->strings['Post to LiveJournal by default'] = 'Beküldés a LiveJournalra alapértelmezetten';
-$a->strings['LiveJournal Export'] = 'LiveJournal exportálás';
diff --git a/ljpost/lang/it/messages.po b/ljpost/lang/it/messages.po
index f24ca580..b7e70700 100644
--- a/ljpost/lang/it/messages.po
+++ b/ljpost/lang/it/messages.po
@@ -5,41 +5,44 @@
 # 
 # Translators:
 # fabrixxm <fabrix.xm@gmail.com>, 2014-2015,2018
-# Sylke Vicious <silkevicious@gmail.com>, 2021,2023
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:17-0500\n"
-"PO-Revision-Date: 2014-06-23 09:51+0000\n"
-"Last-Translator: Sylke Vicious <silkevicious@gmail.com>, 2021,2023\n"
-"Language-Team: Italian (http://app.transifex.com/Friendica/friendica/language/it/)\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2018-03-19 13:23+0000\n"
+"Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n"
+"Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: it\n"
-"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ljpost.php:43
+#: ljpost.php:39
 msgid "Post to LiveJournal"
 msgstr "Invia a LiveJournal"
 
-#: ljpost.php:63
+#: ljpost.php:70
+msgid "LiveJournal Post Settings"
+msgstr "Impostazioni invio a LiveJournal"
+
+#: ljpost.php:72
 msgid "Enable LiveJournal Post Addon"
 msgstr "Abilita il componente aggiuntivo di invio a LiveJournal"
 
-#: ljpost.php:64
+#: ljpost.php:77
 msgid "LiveJournal username"
 msgstr "Nome utente LiveJournal"
 
-#: ljpost.php:65
+#: ljpost.php:82
 msgid "LiveJournal password"
 msgstr "Password LiveJournal"
 
-#: ljpost.php:66
+#: ljpost.php:87
 msgid "Post to LiveJournal by default"
 msgstr "Invia sempre a LiveJournal"
 
-#: ljpost.php:71
-msgid "LiveJournal Export"
-msgstr "Esporta LiveJournal"
+#: ljpost.php:93
+msgid "Submit"
+msgstr "Invia"
diff --git a/ljpost/lang/it/strings.php b/ljpost/lang/it/strings.php
index 3f857ed8..54f5fac5 100644
--- a/ljpost/lang/it/strings.php
+++ b/ljpost/lang/it/strings.php
@@ -2,12 +2,13 @@
 
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
-	$n = intval($n);
-	if ($n == 1) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
+	return ($n != 1);;
 }}
-$a->strings['Post to LiveJournal'] = 'Invia a LiveJournal';
-$a->strings['Enable LiveJournal Post Addon'] = 'Abilita il componente aggiuntivo di invio a LiveJournal';
-$a->strings['LiveJournal username'] = 'Nome utente LiveJournal';
-$a->strings['LiveJournal password'] = 'Password LiveJournal';
-$a->strings['Post to LiveJournal by default'] = 'Invia sempre a LiveJournal';
-$a->strings['LiveJournal Export'] = 'Esporta LiveJournal';
+;
+$a->strings["Post to LiveJournal"] = "Invia a LiveJournal";
+$a->strings["LiveJournal Post Settings"] = "Impostazioni invio a LiveJournal";
+$a->strings["Enable LiveJournal Post Addon"] = "Abilita il componente aggiuntivo di invio a LiveJournal";
+$a->strings["LiveJournal username"] = "Nome utente LiveJournal";
+$a->strings["LiveJournal password"] = "Password LiveJournal";
+$a->strings["Post to LiveJournal by default"] = "Invia sempre a LiveJournal";
+$a->strings["Submit"] = "Invia";
diff --git a/ljpost/lang/nl/strings.php b/ljpost/lang/nl/strings.php
index 55f54640..d9ed2360 100644
--- a/ljpost/lang/nl/strings.php
+++ b/ljpost/lang/nl/strings.php
@@ -3,9 +3,13 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Post to LiveJournal'] = 'Plaatsen op LiveJournal';
-$a->strings['LiveJournal Post Settings'] = 'LiveJournal Post instellingen';
-$a->strings['Enable LiveJournal Post Addon'] = 'LiveJournal Post inschakelen';
-$a->strings['Post to LiveJournal by default'] = 'Plaatsen op Livejournal als standaard instellen ';
+;
+$a->strings["Post to LiveJournal"] = "Plaatsen op LiveJournal";
+$a->strings["LiveJournal Post Settings"] = "LiveJournal Post instellingen";
+$a->strings["Enable LiveJournal Post Addon"] = "LiveJournal Post inschakelen";
+$a->strings["LiveJournal username"] = "";
+$a->strings["LiveJournal password"] = "";
+$a->strings["Post to LiveJournal by default"] = "Plaatsen op Livejournal als standaard instellen ";
+$a->strings["Submit"] = "";
diff --git a/ljpost/lang/pl/messages.po b/ljpost/lang/pl/messages.po
index addd3fc3..36d225bf 100644
--- a/ljpost/lang/pl/messages.po
+++ b/ljpost/lang/pl/messages.po
@@ -1,18 +1,17 @@
-# ADDON ljpost
+# ADDON ijpost
 # Copyright (C)
-# This file is distributed under the same license as the Friendica ljpost addon package.
+# This file is distributed under the same license as the Friendica ijpost addon package.
 # 
 # 
 # Translators:
-# Piotr Strębski <strebski@gmail.com>, 2022
-# Waldemar Stoczkowski, 2018
+# Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:17-0500\n"
-"PO-Revision-Date: 2014-06-23 09:51+0000\n"
-"Last-Translator: Piotr Strębski <strebski@gmail.com>, 2022\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2018-08-04 10:48+0000\n"
+"Last-Translator: Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.com/Friendica/friendica/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,26 +19,30 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
-#: ljpost.php:43
-msgid "Post to LiveJournal"
-msgstr "Opublikuj w LiveJournal"
+#: ijpost.php:39
+msgid "Post to Insanejournal"
+msgstr "Opublikuj w Insanejournal"
 
-#: ljpost.php:63
-msgid "Enable LiveJournal Post Addon"
-msgstr "Włącz dodatek LiveJournal"
+#: ijpost.php:70
+msgid "InsaneJournal Post Settings"
+msgstr "Ustawienia InsaneJournal Post"
 
-#: ljpost.php:64
-msgid "LiveJournal username"
-msgstr "Nazwa użytkownika LiveJournal"
+#: ijpost.php:72
+msgid "Enable InsaneJournal Post Addon"
+msgstr "Włącz dodatek InsaneJournal"
 
-#: ljpost.php:65
-msgid "LiveJournal password"
-msgstr "Hasło LiveJournal"
+#: ijpost.php:77
+msgid "InsaneJournal username"
+msgstr "nazwa użytkownika InsaneJournal"
 
-#: ljpost.php:66
-msgid "Post to LiveJournal by default"
-msgstr "Opublikuj domyślnie w LiveJournal"
+#: ijpost.php:82
+msgid "InsaneJournal password"
+msgstr "Hasło InsaneJournal"
 
-#: ljpost.php:71
-msgid "LiveJournal Export"
-msgstr "Eksport do LiveJournal"
+#: ijpost.php:87
+msgid "Post to InsaneJournal by default"
+msgstr "Wyślij domyślnie do InsaneJournal"
+
+#: ijpost.php:93
+msgid "Submit"
+msgstr "Wyślij"
diff --git a/ljpost/lang/pl/strings.php b/ljpost/lang/pl/strings.php
index 9540c2c2..85c6e3a1 100644
--- a/ljpost/lang/pl/strings.php
+++ b/ljpost/lang/pl/strings.php
@@ -3,11 +3,13 @@
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
 	$n = intval($n);
-	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
+	return ($n==1 ? 0 : ($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14) ? 1 : $n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14) ? 2 : 3);;
 }}
-$a->strings['Post to LiveJournal'] = 'Opublikuj w LiveJournal';
-$a->strings['Enable LiveJournal Post Addon'] = 'Włącz dodatek LiveJournal';
-$a->strings['LiveJournal username'] = 'Nazwa użytkownika LiveJournal';
-$a->strings['LiveJournal password'] = 'Hasło LiveJournal';
-$a->strings['Post to LiveJournal by default'] = 'Opublikuj domyślnie w LiveJournal';
-$a->strings['LiveJournal Export'] = 'Eksport do LiveJournal';
+;
+$a->strings["Post to Insanejournal"] = "Opublikuj w Insanejournal";
+$a->strings["InsaneJournal Post Settings"] = "Ustawienia InsaneJournal Post";
+$a->strings["Enable InsaneJournal Post Addon"] = "Włącz dodatek InsaneJournal";
+$a->strings["InsaneJournal username"] = "nazwa użytkownika InsaneJournal";
+$a->strings["InsaneJournal password"] = "Hasło InsaneJournal";
+$a->strings["Post to InsaneJournal by default"] = "Wyślij domyślnie do InsaneJournal";
+$a->strings["Submit"] = "Wyślij";
diff --git a/ljpost/lang/pt-br/strings.php b/ljpost/lang/pt-br/strings.php
index e6fabf71..ddc091a4 100644
--- a/ljpost/lang/pt-br/strings.php
+++ b/ljpost/lang/pt-br/strings.php
@@ -2,13 +2,13 @@
 
 if(! function_exists("string_plural_select_pt_br")) {
 function string_plural_select_pt_br($n){
-	$n = intval($n);
-	return intval($n > 1);
+	return ($n > 1);;
 }}
-$a->strings['Post to LiveJournal'] = 'Publicar no LiveJournal';
-$a->strings['LiveJournal Post Settings'] = 'Configurações de publicação no LiveJournal';
-$a->strings['Enable LiveJournal Post Addon'] = 'Habilitar plug-in para publicar no LiveJournal';
-$a->strings['LiveJournal username'] = 'Nome de usuário no LiveJournal';
-$a->strings['LiveJournal password'] = 'Senha do LiveJournal';
-$a->strings['Post to LiveJournal by default'] = 'Publicar no LiveJournal por padrão';
-$a->strings['Submit'] = 'Enviar';
+;
+$a->strings["Post to LiveJournal"] = "Publicar no LiveJournal";
+$a->strings["LiveJournal Post Settings"] = "Configurações de publicação no LiveJournal";
+$a->strings["Enable LiveJournal Post Addon"] = "Habilitar plug-in para publicar no LiveJournal";
+$a->strings["LiveJournal username"] = "Nome de usuário no LiveJournal";
+$a->strings["LiveJournal password"] = "Senha do LiveJournal";
+$a->strings["Post to LiveJournal by default"] = "Publicar no LiveJournal por padrão";
+$a->strings["Submit"] = "Enviar";
diff --git a/ljpost/lang/ro/strings.php b/ljpost/lang/ro/strings.php
index 510a425a..b65c7754 100644
--- a/ljpost/lang/ro/strings.php
+++ b/ljpost/lang/ro/strings.php
@@ -2,13 +2,13 @@
 
 if(! function_exists("string_plural_select_ro")) {
 function string_plural_select_ro($n){
-	$n = intval($n);
-	if ($n==1) { return 0; } else if ((($n%100>19)||(($n%100==0)&&($n!=0)))) { return 2; } else  { return 1; }
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
 }}
-$a->strings['Post to LiveJournal'] = 'Postați pe LiveJournal';
-$a->strings['LiveJournal Post Settings'] = 'Configurări Postări LiveJournal';
-$a->strings['Enable LiveJournal Post Addon'] = 'Activare Modul Postare LiveJournal';
-$a->strings['LiveJournal username'] = 'Utilizator LiveJournal';
-$a->strings['LiveJournal password'] = 'Parolă LiveJournal ';
-$a->strings['Post to LiveJournal by default'] = 'Postați implicit pe LiveJournal';
-$a->strings['Submit'] = 'Trimite';
+;
+$a->strings["Post to LiveJournal"] = "Postați pe LiveJournal";
+$a->strings["LiveJournal Post Settings"] = "Configurări Postări LiveJournal";
+$a->strings["Enable LiveJournal Post Addon"] = "Activare Modul Postare LiveJournal";
+$a->strings["LiveJournal username"] = "Utilizator LiveJournal";
+$a->strings["LiveJournal password"] = "Parolă LiveJournal ";
+$a->strings["Post to LiveJournal by default"] = "Postați implicit pe LiveJournal";
+$a->strings["Submit"] = "Trimite";
diff --git a/ljpost/lang/ru/messages.po b/ljpost/lang/ru/messages.po
deleted file mode 100644
index 4f0f65c9..00000000
--- a/ljpost/lang/ru/messages.po
+++ /dev/null
@@ -1,48 +0,0 @@
-# ADDON ljpost
-# Copyright (C)
-# This file is distributed under the same license as the Friendica ljpost addon package.
-# 
-# 
-# Translators:
-# Alexander An <ravnina@gmail.com>, 2021
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2021-03-03 17:45+0000\n"
-"Last-Translator: Alexander An <ravnina@gmail.com>\n"
-"Language-Team: Russian (http://www.transifex.com/Friendica/friendica/language/ru/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ru\n"
-"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
-
-#: ljpost.php:39
-msgid "Post to LiveJournal"
-msgstr "Отправить в LiveJournal"
-
-#: ljpost.php:73
-msgid "LiveJournal Post Settings"
-msgstr "Настройки отправки в LiveJournal"
-
-#: ljpost.php:75
-msgid "Enable LiveJournal Post Addon"
-msgstr "Включить отправку в LiveJournal"
-
-#: ljpost.php:80
-msgid "LiveJournal username"
-msgstr "Имя пользователя LiveJournal"
-
-#: ljpost.php:85
-msgid "LiveJournal password"
-msgstr "Пароль в LiveJournal"
-
-#: ljpost.php:90
-msgid "Post to LiveJournal by default"
-msgstr "Отправлять записи в LiveJournal по-умолчанию"
-
-#: ljpost.php:96
-msgid "Save Settings"
-msgstr "Сохранить настройки"
diff --git a/ljpost/lang/ru/strings.php b/ljpost/lang/ru/strings.php
index 1654f62b..89a241cd 100644
--- a/ljpost/lang/ru/strings.php
+++ b/ljpost/lang/ru/strings.php
@@ -1,14 +1,9 @@
-<?php
-
-if(! function_exists("string_plural_select_ru")) {
-function string_plural_select_ru($n){
-	$n = intval($n);
-	if ($n%10==1 && $n%100!=11) { return 0; } else if ($n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14)) { return 1; } else if ($n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)) { return 2; } else  { return 3; }
-}}
-$a->strings['Post to LiveJournal'] = 'Отправить в LiveJournal';
-$a->strings['LiveJournal Post Settings'] = 'Настройки отправки в LiveJournal';
-$a->strings['Enable LiveJournal Post Addon'] = 'Включить отправку в LiveJournal';
-$a->strings['LiveJournal username'] = 'Имя пользователя LiveJournal';
-$a->strings['LiveJournal password'] = 'Пароль в LiveJournal';
-$a->strings['Post to LiveJournal by default'] = 'Отправлять записи в LiveJournal по-умолчанию';
-$a->strings['Save Settings'] = 'Сохранить настройки';
+<?php
+
+$a->strings["Post to LiveJournal"] = "";
+$a->strings["LiveJournal Post Settings"] = "";
+$a->strings["Enable LiveJournal Post Addon"] = "Включить LiveJournal  плагин сообщений";
+$a->strings["LiveJournal username"] = "";
+$a->strings["LiveJournal password"] = "";
+$a->strings["Post to LiveJournal by default"] = "";
+$a->strings["Submit"] = "Подтвердить";
diff --git a/ljpost/lang/sv/messages.po b/ljpost/lang/sv/messages.po
deleted file mode 100644
index 21e1eeb7..00000000
--- a/ljpost/lang/sv/messages.po
+++ /dev/null
@@ -1,44 +0,0 @@
-# ADDON ljpost
-# Copyright (C)
-# This file is distributed under the same license as the Friendica ljpost addon package.
-# 
-# 
-# Translators:
-# Kristoffer Grundström <lovaren@gmail.com>, 2022
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:17-0500\n"
-"PO-Revision-Date: 2022-01-16 00:43+0000\n"
-"Last-Translator: Kristoffer Grundström <lovaren@gmail.com>\n"
-"Language-Team: Swedish (http://www.transifex.com/Friendica/friendica/language/sv/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: sv\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: ljpost.php:43
-msgid "Post to LiveJournal"
-msgstr ""
-
-#: ljpost.php:63
-msgid "Enable LiveJournal Post Addon"
-msgstr ""
-
-#: ljpost.php:64
-msgid "LiveJournal username"
-msgstr "Användarnamn för LiveJournal"
-
-#: ljpost.php:65
-msgid "LiveJournal password"
-msgstr "Lösenord för LiveJournal"
-
-#: ljpost.php:66
-msgid "Post to LiveJournal by default"
-msgstr ""
-
-#: ljpost.php:71
-msgid "LiveJournal Export"
-msgstr ""
diff --git a/ljpost/lang/sv/strings.php b/ljpost/lang/sv/strings.php
index b8b84b75..3ec569a7 100644
--- a/ljpost/lang/sv/strings.php
+++ b/ljpost/lang/sv/strings.php
@@ -1,9 +1,3 @@
-<?php
-
-if(! function_exists("string_plural_select_sv")) {
-function string_plural_select_sv($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['LiveJournal username'] = 'Användarnamn för LiveJournal';
-$a->strings['LiveJournal password'] = 'Lösenord för LiveJournal';
+<?php
+
+$a->strings["Submit"] = "Spara";
diff --git a/ljpost/livejournal.png b/ljpost/livejournal.png
deleted file mode 100644
index aab2a071..00000000
Binary files a/ljpost/livejournal.png and /dev/null differ
diff --git a/ljpost/ljpost.php b/ljpost/ljpost.php
index fac44767..8bc33fc7 100644
--- a/ljpost/ljpost.php
+++ b/ljpost/ljpost.php
@@ -8,153 +8,188 @@
  * Author: Cat Gray <https://free-haven.org/profile/catness>
  */
 
-use Friendica\App;
 use Friendica\Content\Text\BBCode;
 use Friendica\Core\Hook;
+use Friendica\Core\L10n;
 use Friendica\Core\Logger;
-use Friendica\Core\Renderer;
-use Friendica\DI;
-use Friendica\Model\Post;
-use Friendica\Model\Tag;
-use Friendica\Model\User;
+use Friendica\Core\PConfig;
 use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Network;
 use Friendica\Util\XML;
 
-function ljpost_install()
-{
-	Hook::register('post_local',   'addon/ljpost/ljpost.php', 'ljpost_post_local');
-	Hook::register('notifier_normal',  'addon/ljpost/ljpost.php', 'ljpost_send');
-	Hook::register('jot_networks', 'addon/ljpost/ljpost.php', 'ljpost_jot_nets');
-	Hook::register('connector_settings',  'addon/ljpost/ljpost.php', 'ljpost_settings');
-	Hook::register('connector_settings_post', 'addon/ljpost/ljpost.php', 'ljpost_settings_post');
+function ljpost_install() {
+    Hook::register('post_local',           'addon/ljpost/ljpost.php', 'ljpost_post_local');
+    Hook::register('notifier_normal',      'addon/ljpost/ljpost.php', 'ljpost_send');
+    Hook::register('jot_networks',         'addon/ljpost/ljpost.php', 'ljpost_jot_nets');
+    Hook::register('connector_settings',      'addon/ljpost/ljpost.php', 'ljpost_settings');
+    Hook::register('connector_settings_post', 'addon/ljpost/ljpost.php', 'ljpost_settings_post');
+
+}
+function ljpost_uninstall() {
+    Hook::unregister('post_local',       'addon/ljpost/ljpost.php', 'ljpost_post_local');
+    Hook::unregister('notifier_normal',  'addon/ljpost/ljpost.php', 'ljpost_send');
+    Hook::unregister('jot_networks',     'addon/ljpost/ljpost.php', 'ljpost_jot_nets');
+    Hook::unregister('connector_settings',      'addon/ljpost/ljpost.php', 'ljpost_settings');
+    Hook::unregister('connector_settings_post', 'addon/ljpost/ljpost.php', 'ljpost_settings_post');
+
 }
 
-function ljpost_jot_nets(array &$jotnets_fields)
-{
-	if (!DI::userSession()->getLocalUserId()) {
-		return;
-	}
 
-	if (DI::pConfig()->get(DI::userSession()->getLocalUserId(),'ljpost','post')) {
-		$jotnets_fields[] = [
-			'type' => 'checkbox',
-			'field' => [
-				'ljpost_enable',
-				DI::l10n()->t('Post to LiveJournal'),
-				DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'ljpost', 'post_by_default'),
-			],
-		];
-	}
+function ljpost_jot_nets(\Friendica\App &$a, array &$jotnets_fields)
+{
+    if(! local_user()) {
+        return;
+    }
+
+    if (PConfig::get(local_user(),'ljpost','post')) {
+	    $jotnets_fields[] = [
+		    'type' => 'checkbox',
+		    'field' => [
+			    'ljpost_enable',
+			    L10n::t('Post to LiveJournal'),
+			    PConfig::get(local_user(),'ljpost','post_by_default')
+		    ]
+	    ];
+    }
 }
 
-function ljpost_settings(array &$data)
-{
-	if (!DI::userSession()->getLocalUserId()) {
-		return;
-	}
 
-	$enabled     = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'ljpost', 'post', false);
-	$ij_username = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'ljpost', 'ij_username');
-	$def_enabled = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'ljpost', 'post_by_default');
+function ljpost_settings(&$a,&$s) {
 
-	$t= Renderer::getMarkupTemplate('connector_settings.tpl', 'addon/ljpost/');
-	$html = Renderer::replaceMacros($t, [
-		'$enabled'   => ['ljpost', DI::l10n()->t('Enable LiveJournal Post Addon'), $enabled],
-		'$username'  => ['ij_username', DI::l10n()->t('LiveJournal username'), $ij_username],
-		'$password'  => ['ij_password', DI::l10n()->t('LiveJournal password')],
-		'$bydefault' => ['ij_bydefault', DI::l10n()->t('Post to LiveJournal by default'), $def_enabled],
-	]);
+    if(! local_user())
+        return;
+
+    /* Add our stylesheet to the page so we can make our settings look nice */
+
+    $a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->getBaseURL() . '/addon/ljpost/ljpost.css' . '" media="all" />' . "\r\n";
+
+    /* Get the current state of our config variables */
+
+    $enabled = PConfig::get(local_user(),'ljpost','post');
+
+    $checked = (($enabled) ? ' checked="checked" ' : '');
+
+    $def_enabled = PConfig::get(local_user(),'ljpost','post_by_default');
+
+    $def_checked = (($def_enabled) ? ' checked="checked" ' : '');
+
+	$lj_username = PConfig::get(local_user(), 'ljpost', 'lj_username');
+	$lj_password = PConfig::get(local_user(), 'ljpost', 'lj_password');
+
+
+    /* Add some HTML to the existing form */
+
+    $s .= '<div class="settings-block">';
+    $s .= '<h3>' . L10n::t('LiveJournal Post Settings') . '</h3>';
+    $s .= '<div id="ljpost-enable-wrapper">';
+    $s .= '<label id="ljpost-enable-label" for="ljpost-checkbox">' . L10n::t('Enable LiveJournal Post Addon') . '</label>';
+    $s .= '<input id="ljpost-checkbox" type="checkbox" name="ljpost" value="1" ' . $checked . '/>';
+    $s .= '</div><div class="clear"></div>';
+
+    $s .= '<div id="ljpost-username-wrapper">';
+    $s .= '<label id="ljpost-username-label" for="ljpost-username">' . L10n::t('LiveJournal username') . '</label>';
+    $s .= '<input id="ljpost-username" type="text" name="lj_username" value="' . $lj_username . '" />';
+    $s .= '</div><div class="clear"></div>';
+
+    $s .= '<div id="ljpost-password-wrapper">';
+    $s .= '<label id="ljpost-password-label" for="ljpost-password">' . L10n::t('LiveJournal password') . '</label>';
+    $s .= '<input id="ljpost-password" type="password" name="lj_password" value="' . $lj_password . '" />';
+    $s .= '</div><div class="clear"></div>';
+
+    $s .= '<div id="ljpost-bydefault-wrapper">';
+    $s .= '<label id="ljpost-bydefault-label" for="ljpost-bydefault">' . L10n::t('Post to LiveJournal by default') . '</label>';
+    $s .= '<input id="ljpost-bydefault" type="checkbox" name="lj_bydefault" value="1" ' . $def_checked . '/>';
+    $s .= '</div><div class="clear"></div>';
+
+    /* provide a submit button */
+
+    $s .= '<div class="settings-submit-wrapper" ><input type="submit" id="ljpost-submit" name="ljpost-submit" class="settings-submit" value="' . L10n::t('Save Settings') . '" /></div></div>';
 
-	$data = [
-		'connector' => 'ljpost',
-		'title' => DI::l10n()->t('LiveJournal Export'),
-		'image' => 'addon/ljpost/livejournal.png',
-		'enabled'   => $enabled,
-		'html'  => $html,
-	];
 }
 
-function ljpost_settings_post(array &$b)
-{
-	if (!empty($_POST['ljpost-submit'])) {
-		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'ljpost', 'post', intval($_POST['ljpost']));
-		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'ljpost', 'post_by_default', intval($_POST['lj_bydefault']));
-		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'ljpost', 'lj_username', trim($_POST['lj_username']));
-		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'ljpost', 'lj_password', trim($_POST['lj_password']));
+
+function ljpost_settings_post(&$a,&$b) {
+
+	if(!empty($_POST['ljpost-submit'])) {
+
+		PConfig::set(local_user(),'ljpost','post',intval($_POST['ljpost']));
+		PConfig::set(local_user(),'ljpost','post_by_default',intval($_POST['lj_bydefault']));
+		PConfig::set(local_user(),'ljpost','lj_username',trim($_POST['lj_username']));
+		PConfig::set(local_user(),'ljpost','lj_password',trim($_POST['lj_password']));
+
 	}
+
 }
 
-function ljpost_post_local(array &$b)
-{
+function ljpost_post_local(&$a,&$b) {
+
 	// This can probably be changed to allow editing by pointing to a different API endpoint
-	if ($b['edit']) {
-		return;
-	}
 
-	if (!DI::userSession()->getLocalUserId() || (DI::userSession()->getLocalUserId() != $b['uid'])) {
+	if($b['edit'])
 		return;
-	}
 
-	if ($b['private'] || $b['parent']) {
+	if((! local_user()) || (local_user() != $b['uid']))
 		return;
-	}
 
-	$lj_post   = intval(DI::pConfig()->get(DI::userSession()->getLocalUserId(),'ljpost','post'));
+	if($b['private'] || $b['parent'])
+		return;
+
+    $lj_post   = intval(PConfig::get(local_user(),'ljpost','post'));
+
 	$lj_enable = (($lj_post && !empty($_REQUEST['ljpost_enable'])) ? intval($_REQUEST['ljpost_enable']) : 0);
 
-	if ($b['api_source'] && intval(DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'ljpost', 'post_by_default'))) {
+	if($b['api_source'] && intval(PConfig::get(local_user(),'ljpost','post_by_default')))
 		$lj_enable = 1;
-	}
 
-	if (!$lj_enable) {
-		return;
-	}
+    if(! $lj_enable)
+       return;
 
-	if (strlen($b['postopts'])) {
-		$b['postopts'] .= ',';
-	}
-	$b['postopts'] .= 'ljpost';
+    if(strlen($b['postopts']))
+       $b['postopts'] .= ',';
+     $b['postopts'] .= 'ljpost';
 }
 
-function ljpost_send(array &$b)
-{
-	if ($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited'])) {
-		return;
-	}
 
-	if (!strstr($b['postopts'],'ljpost')) {
-		return;
-	}
 
-	if ($b['parent'] != $b['id']) {
-		return;
-	}
 
-	$b['body'] = Post\Media::addAttachmentsToBody($b['uri-id'], DI::contentItem()->addSharedPost($b));
+function ljpost_send(&$a,&$b) {
+
+    if($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited']))
+        return;
+
+    if(! strstr($b['postopts'],'ljpost'))
+        return;
+
+    if($b['parent'] != $b['id'])
+        return;
 
 	// LiveJournal post in the LJ user's timezone.
 	// Hopefully the person's Friendica account
 	// will be set to the same thing.
 
-	$user = User::getById($b['uid']);
-	$tz = $user['timezone'] ?: 'UTC';
+	$tz = 'UTC';
 
-	$lj_username = XML::escape(DI::pConfig()->get($b['uid'],'ljpost','lj_username'));
-	$lj_password = XML::escape(DI::pConfig()->get($b['uid'],'ljpost','lj_password'));
-	$lj_journal = XML::escape(DI::pConfig()->get($b['uid'],'ljpost','lj_journal'));
+	$x = q("select timezone from user where uid = %d limit 1",
+		intval($b['uid'])
+	);
+	if($x && strlen($x[0]['timezone']))
+		$tz = $x[0]['timezone'];
+
+	$lj_username = XML::escape(PConfig::get($b['uid'],'ljpost','lj_username'));
+	$lj_password = XML::escape(PConfig::get($b['uid'],'ljpost','lj_password'));
+	$lj_journal = XML::escape(PConfig::get($b['uid'],'ljpost','lj_journal'));
 //	if(! $lj_journal)
 //		$lj_journal = $lj_username;
 
-	$lj_blog = XML::escape(DI::pConfig()->get($b['uid'],'ljpost','lj_blog'));
-	if (!strlen($lj_blog)) {
+	$lj_blog = XML::escape(PConfig::get($b['uid'],'ljpost','lj_blog'));
+	if(! strlen($lj_blog))
 		$lj_blog = XML::escape('http://www.livejournal.com/interface/xmlrpc');
-	}
 
-	if ($lj_username && $lj_password && $lj_blog) {
+	if($lj_username && $lj_password && $lj_blog) {
 		$title = XML::escape($b['title']);
-		$post = BBCode::convertForUriId($b['uri-id'], $b['body'], BBCode::CONNECTORS);
+		$post = BBCode::convert($b['body']);
 		$post = XML::escape($post);
-		$tags = Tag::getCSVByURIId($b['uri-id'], [Tag::HASHTAG]);
+		$tags = ljpost_get_tags($b['tag']);
 
 		$date = DateTimeFormat::convert($b['created'], $tz);
 		$year = intval(substr($date,0,4));
@@ -166,50 +201,55 @@ function ljpost_send(array &$b)
 		$xml = <<< EOT
 <?xml version="1.0" encoding="utf-8"?>
 <methodCall>
-<methodName>LJ.XMLRPC.postevent</methodName>
-	<params>
-		<param>
+  <methodName>LJ.XMLRPC.postevent</methodName>
+  <params>
+    <param><value>
+        <struct>
+        <member><name>username</name><value><string>$lj_username</string></value></member>
+        <member><name>password</name><value><string>$lj_password</string></value></member>
+        <member><name>event</name><value><string>$post</string></value></member>
+        <member><name>subject</name><value><string>$title</string></value></member>
+        <member><name>lineendings</name><value><string>unix</string></value></member>
+        <member><name>year</name><value><int>$year</int></value></member>
+        <member><name>mon</name><value><int>$mon</int></value></member>
+        <member><name>day</name><value><int>$day</int></value></member>
+        <member><name>hour</name><value><int>$hour</int></value></member>
+        <member><name>min</name><value><int>$min</int></value></member>
+		<member><name>usejournal</name><value><string>$lj_username</string></value></member>
+		<member>
+			<name>props</name>
 			<value>
 				<struct>
-					<member><name>username</name><value><string>$lj_username</string></value></member>
-					<member><name>password</name><value><string>$lj_password</string></value></member>
-					<member><name>event</name><value><string>$post</string></value></member>
-					<member><name>subject</name><value><string>$title</string></value></member>
-					<member><name>lineendings</name><value><string>unix</string></value></member>
-					<member><name>year</name><value><int>$year</int></value></member>
-					<member><name>mon</name><value><int>$mon</int></value></member>
-					<member><name>day</name><value><int>$day</int></value></member>
-					<member><name>hour</name><value><int>$hour</int></value></member>
-					<member><name>min</name><value><int>$min</int></value></member>
-					<member><name>usejournal</name><value><string>$lj_username</string></value></member>
 					<member>
-						<name>props</name>
-						<value>
-							<struct>
-								<member>
-									<name>useragent</name>
-									<value><string>Friendica</string></value>
-								</member>
-								<member>
-									<name>taglist</name>
-									<value><string>$tags</string></value>
-								</member>
-							</struct>
-						</value>
+						<name>useragent</name>
+						<value><string>Friendica</string></value>
+					</member>
+					<member>
+						<name>taglist</name>
+						<value><string>$tags</string></value>
 					</member>
 				</struct>
 			</value>
-		</param>
-	</params>
+		</member>
+        </struct>
+    </value></param>
+  </params>
 </methodCall>
+
 EOT;
 
-		Logger::debug('ljpost: data: ' . $xml);
+		Logger::log('ljpost: data: ' . $xml, Logger::DATA);
 
 		if ($lj_blog !== 'test') {
-			$x = DI::httpClient()->post($lj_blog, $xml, ['Content-Type' => 'text/xml'])->getBodyString();
+			$x = Network::post($lj_blog, $xml, ["Content-Type: text/xml"])->getBody();
 		}
-
-		Logger::info('posted to livejournal: ' . ($x) ? $x : '');
+		Logger::log('posted to livejournal: ' . ($x) ? $x : '', Logger::DEBUG);
 	}
 }
+
+function ljpost_get_tags($post)
+{
+	preg_match_all("/\]([^\[#]+)\[/",$post,$matches);
+	$tags = implode(', ',$matches[1]);
+	return $tags;
+}
diff --git a/ljpost/templates/connector_settings.tpl b/ljpost/templates/connector_settings.tpl
deleted file mode 100644
index 0abcd24e..00000000
--- a/ljpost/templates/connector_settings.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-{{include file="field_checkbox.tpl" field=$enabled}}
-{{include file="field_input.tpl" field=$username}}
-{{include file="field_password.tpl" field=$password}}
-{{include file="field_checkbox.tpl" field=$bydefault}}
diff --git a/mahjongg/lang/C/messages.po b/mahjongg/lang/C/messages.po
new file mode 100644
index 00000000..e69de29b
diff --git a/mahjongg/mahjongg.php b/mahjongg/mahjongg.php
new file mode 100644
index 00000000..d9772037
--- /dev/null
+++ b/mahjongg/mahjongg.php
@@ -0,0 +1,42 @@
+<?php
+
+/**
+ * Name: Mah Jongg
+ * Description: Ancient Chinese puzzle game that never gets old.
+ * Version: 1.0
+ * Author: Holger Froese
+ */
+use Friendica\Core\Hook;
+
+function mahjongg_install() {
+    Hook::register('app_menu', 'addon/mahjongg/mahjongg.php', 'mahjongg_app_menu');
+}
+
+function mahjongg_uninstall() {
+    Hook::unregister('app_menu', 'addon/mahjongg/mahjongg.php', 'mahjongg_app_menu');
+
+}
+
+function mahjongg_app_menu($a,&$b) {
+    $b['app_menu'][] = '<div class="app-title"><a href="mahjongg">Mahjongg</a></div>';
+}
+
+
+function mahjongg_module() {}
+
+function mahjongg_content(&$a) {
+
+$baseurl = $a->getBaseURL() . '/addon/mahjongg';
+
+$o .= <<< EOT
+<br><br>
+<p align="left">
+<embed src="addon/mahjongg/mahjongg.swf" quality="high" bgcolor="#FFFFFF" width="800" height="600" name="mahjongg" align="middle" type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/go/getflashplayer" />
+<br><br>
+<b>Simply locate the matching tiles and find a way to clear them from the board as quickly as possible.
+A timer at the top of the screen keeps track of how you are doing.</b><br>
+</p>
+EOT;
+
+return $o;
+}
diff --git a/mahjongg/mahjongg.swf b/mahjongg/mahjongg.swf
new file mode 100644
index 00000000..79f8c9e3
Binary files /dev/null and b/mahjongg/mahjongg.swf differ
diff --git a/mailstream/lang/C/messages.po b/mailstream/lang/C/messages.po
index 666181b8..80344780 100644
--- a/mailstream/lang/C/messages.po
+++ b/mailstream/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:15-0500\n"
+"POT-Creation-Date: 2018-03-11 19:13+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -25,76 +25,72 @@ msgstr ""
 msgid "Email address that stream items will appear to be from."
 msgstr ""
 
-#: mailstream.php:82
+#: mailstream.php:82 mailstream.php:380
 msgid "Save Settings"
 msgstr ""
 
-#: mailstream.php:311
+#: mailstream.php:223
 msgid "Re:"
 msgstr ""
 
-#: mailstream.php:324 mailstream.php:327
+#: mailstream.php:231
 msgid "Friendica post"
 msgstr ""
 
-#: mailstream.php:330
+#: mailstream.php:234
 msgid "Diaspora post"
 msgstr ""
 
-#: mailstream.php:340
+#: mailstream.php:244
 msgid "Feed item"
 msgstr ""
 
-#: mailstream.php:343
+#: mailstream.php:247
 msgid "Email"
 msgstr ""
 
-#: mailstream.php:345
+#: mailstream.php:249
 msgid "Friendica Item"
 msgstr ""
 
-#: mailstream.php:419
+#: mailstream.php:293
 msgid "Upstream"
 msgstr ""
 
-#: mailstream.php:420
-msgid "URI"
-msgstr ""
-
-#: mailstream.php:421
+#: mailstream.php:294
 msgid "Local"
 msgstr ""
 
-#: mailstream.php:499
+#: mailstream.php:362
 msgid "Enabled"
 msgstr ""
 
-#: mailstream.php:504
+#: mailstream.php:366
 msgid "Email Address"
 msgstr ""
 
-#: mailstream.php:506
+#: mailstream.php:368
 msgid "Leave blank to use your account email address"
 msgstr ""
 
-#: mailstream.php:510
+#: mailstream.php:371
 msgid "Exclude Likes"
 msgstr ""
 
-#: mailstream.php:512
+#: mailstream.php:373
 msgid "Check this to omit mailing \"Like\" notifications"
 msgstr ""
 
-#: mailstream.php:516
+#: mailstream.php:376
 msgid "Attach Images"
 msgstr ""
 
-#: mailstream.php:518
+#: mailstream.php:378
 msgid ""
 "Download images in posts and attach them to the email.  Useful for reading "
 "email while offline."
 msgstr ""
 
-#: mailstream.php:525
+#: mailstream.php:379
 msgid "Mail Stream Settings"
 msgstr ""
diff --git a/mailstream/lang/ar/messages.po b/mailstream/lang/ar/messages.po
deleted file mode 100644
index 31816d54..00000000
--- a/mailstream/lang/ar/messages.po
+++ /dev/null
@@ -1,99 +0,0 @@
-# ADDON mailstream
-# Copyright (C)
-# This file is distributed under the same license as the Friendica mailstream addon package.
-# 
-# 
-# Translators:
-# ButterflyOfFire, 2022
-# Farida Khalaf <faridakhalaf@hotmail.com>, 2021
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:15-0500\n"
-"PO-Revision-Date: 2014-06-23 09:54+0000\n"
-"Last-Translator: ButterflyOfFire, 2022\n"
-"Language-Team: Arabic (http://www.transifex.com/Friendica/friendica/language/ar/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ar\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-
-#: mailstream.php:77
-msgid "From Address"
-msgstr ""
-
-#: mailstream.php:79
-msgid "Email address that stream items will appear to be from."
-msgstr ""
-
-#: mailstream.php:82
-msgid "Save Settings"
-msgstr "حفظ الإعدادات"
-
-#: mailstream.php:301
-msgid "Re:"
-msgstr ""
-
-#: mailstream.php:314 mailstream.php:317
-msgid "Friendica post"
-msgstr ""
-
-#: mailstream.php:320
-msgid "Diaspora post"
-msgstr ""
-
-#: mailstream.php:330
-msgid "Feed item"
-msgstr ""
-
-#: mailstream.php:333
-msgid "Email"
-msgstr "البريد الإلكتروني"
-
-#: mailstream.php:335
-msgid "Friendica Item"
-msgstr ""
-
-#: mailstream.php:404
-msgid "Upstream"
-msgstr ""
-
-#: mailstream.php:405
-msgid "Local"
-msgstr ""
-
-#: mailstream.php:481
-msgid "Enabled"
-msgstr "مفعل"
-
-#: mailstream.php:486
-msgid "Email Address"
-msgstr "البريد الالكتروني"
-
-#: mailstream.php:488
-msgid "Leave blank to use your account email address"
-msgstr ""
-
-#: mailstream.php:492
-msgid "Exclude Likes"
-msgstr ""
-
-#: mailstream.php:494
-msgid "Check this to omit mailing \"Like\" notifications"
-msgstr ""
-
-#: mailstream.php:498
-msgid "Attach Images"
-msgstr ""
-
-#: mailstream.php:500
-msgid ""
-"Download images in posts and attach them to the email.  Useful for reading "
-"email while offline."
-msgstr ""
-
-#: mailstream.php:507
-msgid "Mail Stream Settings"
-msgstr ""
diff --git a/mailstream/lang/ar/strings.php b/mailstream/lang/ar/strings.php
deleted file mode 100644
index 81248593..00000000
--- a/mailstream/lang/ar/strings.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_ar")) {
-function string_plural_select_ar($n){
-	$n = intval($n);
-	if ($n==0) { return 0; } else if ($n==1) { return 1; } else if ($n==2) { return 2; } else if ($n%100>=3 && $n%100<=10) { return 3; } else if ($n%100>=11 && $n%100<=99) { return 4; } else  { return 5; }
-}}
-$a->strings['Save Settings'] = 'حفظ الإعدادات';
-$a->strings['Email'] = 'البريد الإلكتروني';
-$a->strings['Enabled'] = 'مفعل';
-$a->strings['Email Address'] = 'البريد الالكتروني';
diff --git a/mailstream/lang/cs/strings.php b/mailstream/lang/cs/strings.php
index 5e5aafb1..fd36cca4 100644
--- a/mailstream/lang/cs/strings.php
+++ b/mailstream/lang/cs/strings.php
@@ -2,21 +2,21 @@
 
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
-	$n = intval($n);
-	if (($n==1)) { return 0; } else if (($n>=2 && $n<=4)) { return 1; } else  { return 2; }
+	return ($n==1) ? 0 : ($n>=2 && $n<=4) ? 1 : 2;;
 }}
-$a->strings['From Address'] = 'Adresa odesílatele';
-$a->strings['Email address that stream items will appear to be from.'] = 'Adresa, která vysílá položky, se objeví jako odesílatel.';
-$a->strings['Save Settings'] = 'Uložit Nastavení';
-$a->strings['Re:'] = 'Re:';
-$a->strings['Friendica post'] = 'Friendica příspěvky';
-$a->strings['Diaspora post'] = 'Diaspora příspvěvky';
-$a->strings['Feed item'] = 'Zdrojová položka';
-$a->strings['Email'] = 'E-mail';
-$a->strings['Friendica Item'] = 'Friendica položka';
-$a->strings['Upstream'] = 'Upstream';
-$a->strings['Local'] = 'Lokální';
-$a->strings['Email Address'] = 'E-mailová adresa';
-$a->strings['Leave blank to use your account email address'] = 'Ponechte prázdné pro použití vaší e-mailové adresy';
-$a->strings['Enabled'] = 'Povoleno';
-$a->strings['Mail Stream Settings'] = 'Mail Stream nastavení';
+;
+$a->strings["From Address"] = "Adresa odesílatele";
+$a->strings["Email address that stream items will appear to be from."] = "Adresa, která vysílá položky, se objeví jako odesílatel.";
+$a->strings["Save Settings"] = "Uložit Nastavení";
+$a->strings["Re:"] = "Re:";
+$a->strings["Friendica post"] = "Friendica příspěvky";
+$a->strings["Diaspora post"] = "Diaspora příspvěvky";
+$a->strings["Feed item"] = "Zdrojová položka";
+$a->strings["Email"] = "E-mail";
+$a->strings["Friendica Item"] = "Friendica položka";
+$a->strings["Upstream"] = "Upstream";
+$a->strings["Local"] = "Lokální";
+$a->strings["Email Address"] = "E-mailová adresa";
+$a->strings["Leave blank to use your account email address"] = "Ponechte prázdné pro použití vaší e-mailové adresy";
+$a->strings["Enabled"] = "Povoleno";
+$a->strings["Mail Stream Settings"] = "Mail Stream nastavení";
diff --git a/mailstream/lang/da-dk/messages.po b/mailstream/lang/da-dk/messages.po
deleted file mode 100644
index 96e48064..00000000
--- a/mailstream/lang/da-dk/messages.po
+++ /dev/null
@@ -1,97 +0,0 @@
-# ADDON mailstream
-# Copyright (C)
-# This file is distributed under the same license as the Friendica mailstream addon package.
-# 
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:15-0500\n"
-"PO-Revision-Date: 2014-06-23 09:54+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Danish (Denmark) (http://www.transifex.com/Friendica/friendica/language/da_DK/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: da_DK\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: mailstream.php:77
-msgid "From Address"
-msgstr ""
-
-#: mailstream.php:79
-msgid "Email address that stream items will appear to be from."
-msgstr ""
-
-#: mailstream.php:82
-msgid "Save Settings"
-msgstr ""
-
-#: mailstream.php:301
-msgid "Re:"
-msgstr ""
-
-#: mailstream.php:314 mailstream.php:317
-msgid "Friendica post"
-msgstr ""
-
-#: mailstream.php:320
-msgid "Diaspora post"
-msgstr ""
-
-#: mailstream.php:330
-msgid "Feed item"
-msgstr ""
-
-#: mailstream.php:333
-msgid "Email"
-msgstr ""
-
-#: mailstream.php:335
-msgid "Friendica Item"
-msgstr ""
-
-#: mailstream.php:404
-msgid "Upstream"
-msgstr ""
-
-#: mailstream.php:405
-msgid "Local"
-msgstr ""
-
-#: mailstream.php:481
-msgid "Enabled"
-msgstr ""
-
-#: mailstream.php:486
-msgid "Email Address"
-msgstr ""
-
-#: mailstream.php:488
-msgid "Leave blank to use your account email address"
-msgstr ""
-
-#: mailstream.php:492
-msgid "Exclude Likes"
-msgstr ""
-
-#: mailstream.php:494
-msgid "Check this to omit mailing \"Like\" notifications"
-msgstr ""
-
-#: mailstream.php:498
-msgid "Attach Images"
-msgstr ""
-
-#: mailstream.php:500
-msgid ""
-"Download images in posts and attach them to the email.  Useful for reading "
-"email while offline."
-msgstr ""
-
-#: mailstream.php:507
-msgid "Mail Stream Settings"
-msgstr ""
diff --git a/mailstream/lang/da-dk/strings.php b/mailstream/lang/da-dk/strings.php
deleted file mode 100644
index 09554750..00000000
--- a/mailstream/lang/da-dk/strings.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_da_dk")) {
-function string_plural_select_da_dk($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
diff --git a/mailstream/lang/de/strings.php b/mailstream/lang/de/strings.php
index 80f9a7a2..3f946a48 100644
--- a/mailstream/lang/de/strings.php
+++ b/mailstream/lang/de/strings.php
@@ -3,24 +3,25 @@
 if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['From Address'] = 'Absender';
-$a->strings['Email address that stream items will appear to be from.'] = 'E-Mail-Adresse, die in hochgeladenen Artikeln erscheint.';
-$a->strings['Save Settings'] = 'Einstellungen speichern';
-$a->strings['Re:'] = 'Re:';
-$a->strings['Friendica post'] = 'Friendica-Veröffentlichung';
-$a->strings['Diaspora post'] = 'Diaspora-Veröffentlichung';
-$a->strings['Feed item'] = 'Artikel-Feed';
-$a->strings['Email'] = 'E-Mail';
-$a->strings['Friendica Item'] = 'Friendica-Artikel';
-$a->strings['Upstream'] = 'Upstream';
-$a->strings['Local'] = 'Lokal';
-$a->strings['Enabled'] = 'eingeschaltet';
-$a->strings['Email Address'] = 'E-Mail-Adresse';
-$a->strings['Leave blank to use your account email address'] = 'Leer lassen für deine Konto-E-Mail-Addresse';
-$a->strings['Exclude Likes'] = 'Likes ignorieren';
-$a->strings['Check this to omit mailing "Like" notifications'] = 'Diese Option verhindert das Versenden von "Like"-Benachrichtigungen per E-Mail.';
-$a->strings['Attach Images'] = 'Bilder anhängen';
-$a->strings['Download images in posts and attach them to the email.  Useful for reading email while offline.'] = 'Sollen Bilder, die im Beitrag eingebettet sind, als Dateianhang in den E-Mails verschickt werden?';
-$a->strings['Mail Stream Settings'] = 'Mail-Nachrichten-Einstellungen';
+;
+$a->strings["From Address"] = "Absender";
+$a->strings["Email address that stream items will appear to be from."] = "E-Mail-Adresse, die in hochgeladenen Artikeln erscheint.";
+$a->strings["Save Settings"] = "Einstellungen speichern";
+$a->strings["Re:"] = "Re:";
+$a->strings["Friendica post"] = "Friendica-Veröffentlichung";
+$a->strings["Diaspora post"] = "Diaspora-Veröffentlichung";
+$a->strings["Feed item"] = "Artikel-Feed";
+$a->strings["Email"] = "E-Mail";
+$a->strings["Friendica Item"] = "Friendica-Artikel";
+$a->strings["Upstream"] = "Upstream";
+$a->strings["Local"] = "Lokal";
+$a->strings["Enabled"] = "eingeschaltet";
+$a->strings["Email Address"] = "E-Mail-Adresse";
+$a->strings["Leave blank to use your account email address"] = "Leer lassen für deine Konto-E-Mail-Addresse";
+$a->strings["Exclude Likes"] = "Likes ignorieren";
+$a->strings["Check this to omit mailing \"Like\" notifications"] = "Diese Option verhindert das Versenden von \"Like\"-Benachrichtigungen per E-Mail.";
+$a->strings["Attach Images"] = "Bilder anhängen";
+$a->strings["Download images in posts and attach them to the email.  Useful for reading email while offline."] = "Sollen Bilder, die im Beitrag eingebettet sind, als Dateianhang in den E-Mails verschickt werden?";
+$a->strings["Mail Stream Settings"] = "Mail-Nachrichten-Einstellungen";
diff --git a/mailstream/lang/en-gb/strings.php b/mailstream/lang/en-gb/strings.php
index a978ba11..b42a42a1 100644
--- a/mailstream/lang/en-gb/strings.php
+++ b/mailstream/lang/en-gb/strings.php
@@ -2,25 +2,25 @@
 
 if(! function_exists("string_plural_select_en_gb")) {
 function string_plural_select_en_gb($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['From Address'] = 'From address';
-$a->strings['Email address that stream items will appear to be from.'] = 'Email address that stream items will appear to be from.';
-$a->strings['Save Settings'] = 'Save settings';
-$a->strings['Re:'] = 'Re:';
-$a->strings['Friendica post'] = 'Friendica post';
-$a->strings['Diaspora post'] = 'Diaspora post';
-$a->strings['Feed item'] = 'Feed item';
-$a->strings['Email'] = 'Email';
-$a->strings['Friendica Item'] = 'Friendica Item';
-$a->strings['Upstream'] = 'Upstream';
-$a->strings['Local'] = 'Local';
-$a->strings['Enabled'] = 'Enabled';
-$a->strings['Email Address'] = 'Email address';
-$a->strings['Leave blank to use your account email address'] = 'Leave blank if you want to use your account email address';
-$a->strings['Exclude Likes'] = 'Exclude likes';
-$a->strings['Check this to omit mailing "Like" notifications'] = 'Tick this to omit mailing "Like" notifications';
-$a->strings['Attach Images'] = 'Attach images';
-$a->strings['Download images in posts and attach them to the email.  Useful for reading email while offline.'] = 'Download images in posts and attach them to the email. Useful for reading email while offline.';
-$a->strings['Mail Stream Settings'] = 'Mail Stream settings';
+;
+$a->strings["From Address"] = "From address";
+$a->strings["Email address that stream items will appear to be from."] = "Email address that stream items will appear to be from.";
+$a->strings["Save Settings"] = "Save settings";
+$a->strings["Re:"] = "Re:";
+$a->strings["Friendica post"] = "Friendica post";
+$a->strings["Diaspora post"] = "Diaspora post";
+$a->strings["Feed item"] = "Feed item";
+$a->strings["Email"] = "Email";
+$a->strings["Friendica Item"] = "Friendica Item";
+$a->strings["Upstream"] = "Upstream";
+$a->strings["Local"] = "Local";
+$a->strings["Enabled"] = "Enabled";
+$a->strings["Email Address"] = "Email address";
+$a->strings["Leave blank to use your account email address"] = "Leave blank if you want to use your account email address";
+$a->strings["Exclude Likes"] = "Exclude likes";
+$a->strings["Check this to omit mailing \"Like\" notifications"] = "Tick this to omit mailing \"Like\" notifications";
+$a->strings["Attach Images"] = "Attach images";
+$a->strings["Download images in posts and attach them to the email.  Useful for reading email while offline."] = "Download images in posts and attach them to the email. Useful for reading email while offline.";
+$a->strings["Mail Stream Settings"] = "Mail Stream settings";
diff --git a/mailstream/lang/es/messages.po b/mailstream/lang/es/messages.po
index 59a82c78..dd002403 100644
--- a/mailstream/lang/es/messages.po
+++ b/mailstream/lang/es/messages.po
@@ -5,14 +5,13 @@
 # 
 # Translators:
 # Albert, 2016
-# Senex Petrovic <javierruizo@hotmail.com>, 2021
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2021-04-06 01:45+0000\n"
-"Last-Translator: Senex Petrovic <javierruizo@hotmail.com>\n"
+"POT-Creation-Date: 2014-06-23 14:45+0200\n"
+"PO-Revision-Date: 2016-11-17 20:21+0000\n"
+"Last-Translator: Albert\n"
 "Language-Team: Spanish (http://www.transifex.com/Friendica/friendica/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,80 +19,62 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: mailstream.php:66
+#: mailstream.php:55
 msgid "From Address"
 msgstr "Desde Dirección"
 
-#: mailstream.php:68
+#: mailstream.php:57
 msgid "Email address that stream items will appear to be from."
 msgstr "Aparecerá de dónde viene la dirección de email que transmite artículos"
 
-#: mailstream.php:71 mailstream.php:382
+#: mailstream.php:60 mailstream.php:282
 msgid "Save Settings"
 msgstr "Guardar ajustes"
 
-#: mailstream.php:225
+#: mailstream.php:165
 msgid "Re:"
 msgstr "Re:"
 
-#: mailstream.php:233
+#: mailstream.php:173
 msgid "Friendica post"
 msgstr "Entrada de Friendica"
 
-#: mailstream.php:236
+#: mailstream.php:176
 msgid "Diaspora post"
 msgstr "Entrada de Diaspora"
 
-#: mailstream.php:246
+#: mailstream.php:183
 msgid "Feed item"
 msgstr "Surtir artículo"
 
-#: mailstream.php:249
+#: mailstream.php:186
 msgid "Email"
 msgstr "Email"
 
-#: mailstream.php:251
+#: mailstream.php:188
 msgid "Friendica Item"
 msgstr "Artículo de Friendica"
 
-#: mailstream.php:296
+#: mailstream.php:229
 msgid "Upstream"
 msgstr "Contracorriente"
 
-#: mailstream.php:297
+#: mailstream.php:230
 msgid "Local"
 msgstr "Local"
 
-#: mailstream.php:364
-msgid "Enabled"
-msgstr "Habilitado"
-
-#: mailstream.php:368
+#: mailstream.php:274
 msgid "Email Address"
 msgstr "Dirección de email"
 
-#: mailstream.php:370
+#: mailstream.php:276
 msgid "Leave blank to use your account email address"
 msgstr "Dejar en blanco para usar su cuenta de dirección de email"
 
-#: mailstream.php:373
-msgid "Exclude Likes"
-msgstr "Excluir me gusta"
+#: mailstream.php:279
+msgid "Enabled"
+msgstr "Habilitado"
 
-#: mailstream.php:375
-msgid "Check this to omit mailing \"Like\" notifications"
-msgstr "Selecciona para omitir enviar \"me gusta\" por correo"
-
-#: mailstream.php:378
-msgid "Attach Images"
-msgstr "Agregar imágenes"
-
-#: mailstream.php:380
-msgid ""
-"Download images in posts and attach them to the email.  Useful for reading "
-"email while offline."
-msgstr "Descargar imágenes en publicaciones y adjúntarlas al correo electrónico. Útil para leer correos electrónicos sin conexión."
-
-#: mailstream.php:381
+#: mailstream.php:281
 msgid "Mail Stream Settings"
 msgstr "Ajustes de transmisión de Mail"
diff --git a/mailstream/lang/es/strings.php b/mailstream/lang/es/strings.php
index c676ecc0..8a2a4faf 100644
--- a/mailstream/lang/es/strings.php
+++ b/mailstream/lang/es/strings.php
@@ -2,25 +2,21 @@
 
 if(! function_exists("string_plural_select_es")) {
 function string_plural_select_es($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['From Address'] = 'Desde Dirección';
-$a->strings['Email address that stream items will appear to be from.'] = 'Aparecerá de dónde viene la dirección de email que transmite artículos';
-$a->strings['Save Settings'] = 'Guardar ajustes';
-$a->strings['Re:'] = 'Re:';
-$a->strings['Friendica post'] = 'Entrada de Friendica';
-$a->strings['Diaspora post'] = 'Entrada de Diaspora';
-$a->strings['Feed item'] = 'Surtir artículo';
-$a->strings['Email'] = 'Email';
-$a->strings['Friendica Item'] = 'Artículo de Friendica';
-$a->strings['Upstream'] = 'Contracorriente';
-$a->strings['Local'] = 'Local';
-$a->strings['Enabled'] = 'Habilitado';
-$a->strings['Email Address'] = 'Dirección de email';
-$a->strings['Leave blank to use your account email address'] = 'Dejar en blanco para usar su cuenta de dirección de email';
-$a->strings['Exclude Likes'] = 'Excluir me gusta';
-$a->strings['Check this to omit mailing "Like" notifications'] = 'Selecciona para omitir enviar "me gusta" por correo';
-$a->strings['Attach Images'] = 'Agregar imágenes';
-$a->strings['Download images in posts and attach them to the email.  Useful for reading email while offline.'] = 'Descargar imágenes en publicaciones y adjúntarlas al correo electrónico. Útil para leer correos electrónicos sin conexión.';
-$a->strings['Mail Stream Settings'] = 'Ajustes de transmisión de Mail';
+;
+$a->strings["From Address"] = "Desde Dirección";
+$a->strings["Email address that stream items will appear to be from."] = "Aparecerá de dónde viene la dirección de email que transmite artículos";
+$a->strings["Save Settings"] = "Guardar ajustes";
+$a->strings["Re:"] = "Re:";
+$a->strings["Friendica post"] = "Entrada de Friendica";
+$a->strings["Diaspora post"] = "Entrada de Diaspora";
+$a->strings["Feed item"] = "Surtir artículo";
+$a->strings["Email"] = "Email";
+$a->strings["Friendica Item"] = "Artículo de Friendica";
+$a->strings["Upstream"] = "Contracorriente";
+$a->strings["Local"] = "Local";
+$a->strings["Email Address"] = "Dirección de email";
+$a->strings["Leave blank to use your account email address"] = "Dejar en blanco para usar su cuenta de dirección de email";
+$a->strings["Enabled"] = "Habilitado";
+$a->strings["Mail Stream Settings"] = "Ajustes de transmisión de Mail";
diff --git a/mailstream/lang/fi-fi/strings.php b/mailstream/lang/fi-fi/strings.php
index 150f23da..641fd3d4 100644
--- a/mailstream/lang/fi-fi/strings.php
+++ b/mailstream/lang/fi-fi/strings.php
@@ -2,18 +2,25 @@
 
 if(! function_exists("string_plural_select_fi_fi")) {
 function string_plural_select_fi_fi($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['From Address'] = 'Lähettäjä';
-$a->strings['Save Settings'] = 'Tallenna asetukset';
-$a->strings['Re:'] = 'Koskien';
-$a->strings['Friendica post'] = 'Friendica -julkaisu';
-$a->strings['Diaspora post'] = 'Diaspora -julkaisu';
-$a->strings['Email'] = 'Sähköposti';
-$a->strings['Friendica Item'] = 'Friendica -kohde';
-$a->strings['Local'] = 'Paikallinen';
-$a->strings['Enabled'] = 'Käytössä';
-$a->strings['Email Address'] = 'Sähköpostiosoite';
-$a->strings['Attach Images'] = 'Liitä kuvia';
-$a->strings['Mail Stream Settings'] = 'Mail Stream -asetukset';
+;
+$a->strings["From Address"] = "Lähettäjä";
+$a->strings["Email address that stream items will appear to be from."] = "";
+$a->strings["Save Settings"] = "Tallenna asetukset";
+$a->strings["Re:"] = "Koskien";
+$a->strings["Friendica post"] = "Friendica -julkaisu";
+$a->strings["Diaspora post"] = "Diaspora -julkaisu";
+$a->strings["Feed item"] = "";
+$a->strings["Email"] = "Sähköposti";
+$a->strings["Friendica Item"] = "Friendica -kohde";
+$a->strings["Upstream"] = "";
+$a->strings["Local"] = "Paikallinen";
+$a->strings["Enabled"] = "Käytössä";
+$a->strings["Email Address"] = "Sähköpostiosoite";
+$a->strings["Leave blank to use your account email address"] = "";
+$a->strings["Exclude Likes"] = "";
+$a->strings["Check this to omit mailing \"Like\" notifications"] = "";
+$a->strings["Attach Images"] = "Liitä kuvia";
+$a->strings["Download images in posts and attach them to the email.  Useful for reading email while offline."] = "";
+$a->strings["Mail Stream Settings"] = "Mail Stream -asetukset";
diff --git a/mailstream/lang/fr/messages.po b/mailstream/lang/fr/messages.po
index 043181c5..4a82f290 100644
--- a/mailstream/lang/fr/messages.po
+++ b/mailstream/lang/fr/messages.po
@@ -4,102 +4,78 @@
 # 
 # 
 # Translators:
-# Florent C., 2023
-# Nicolas Derive, 2022
-# ea1cd8241cb389ffb6f92bc6891eff5d_dc12308 <70dced5587d47e18d88f9298024d96f8_93383>, 2015
+# Nicola Spanti <translations@nicola-spanti.info>, 2015
 # StefOfficiel <pichard.stephane@free.fr>, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:15-0500\n"
-"PO-Revision-Date: 2014-06-23 09:54+0000\n"
-"Last-Translator: Florent C., 2023\n"
-"Language-Team: French (http://app.transifex.com/Friendica/friendica/language/fr/)\n"
+"POT-Creation-Date: 2014-06-23 14:45+0200\n"
+"PO-Revision-Date: 2015-07-27 18:23+0000\n"
+"Last-Translator: Nicola Spanti <translations@nicola-spanti.info>\n"
+"Language-Team: French (http://www.transifex.com/projects/p/friendica/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fr\n"
-"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: mailstream.php:77
+#: mailstream.php:55
 msgid "From Address"
 msgstr "Depuis l'adresse"
 
-#: mailstream.php:79
+#: mailstream.php:57
 msgid "Email address that stream items will appear to be from."
-msgstr "Adresse de courriel de laquelle les éléments du flux sembleront provenir."
+msgstr ""
 
-#: mailstream.php:82
+#: mailstream.php:60 mailstream.php:282
 msgid "Save Settings"
 msgstr "Sauvegarder les paramètres"
 
-#: mailstream.php:311
+#: mailstream.php:165
 msgid "Re:"
 msgstr "Re :"
 
-#: mailstream.php:324 mailstream.php:327
+#: mailstream.php:173
 msgid "Friendica post"
 msgstr "Message Friendica"
 
-#: mailstream.php:330
+#: mailstream.php:176
 msgid "Diaspora post"
 msgstr "Message Diaspora"
 
-#: mailstream.php:340
+#: mailstream.php:183
 msgid "Feed item"
-msgstr "Élément du flux"
+msgstr ""
 
-#: mailstream.php:343
+#: mailstream.php:186
 msgid "Email"
 msgstr "Courriel"
 
-#: mailstream.php:345
+#: mailstream.php:188
 msgid "Friendica Item"
 msgstr "Élément de Friendica"
 
-#: mailstream.php:419
+#: mailstream.php:229
 msgid "Upstream"
-msgstr "En amont"
+msgstr ""
 
-#: mailstream.php:420
-msgid "URI"
-msgstr "URI"
-
-#: mailstream.php:421
+#: mailstream.php:230
 msgid "Local"
 msgstr "Local"
 
-#: mailstream.php:499
-msgid "Enabled"
-msgstr "Activer"
-
-#: mailstream.php:504
+#: mailstream.php:274
 msgid "Email Address"
 msgstr "Adresse de courriel"
 
-#: mailstream.php:506
+#: mailstream.php:276
 msgid "Leave blank to use your account email address"
-msgstr "Laissez vide pour utiliser l'adresse de courriel de votre compte"
+msgstr ""
 
-#: mailstream.php:510
-msgid "Exclude Likes"
-msgstr "Exclure les \"j'aime\""
+#: mailstream.php:279
+msgid "Enabled"
+msgstr "Activer"
 
-#: mailstream.php:512
-msgid "Check this to omit mailing \"Like\" notifications"
-msgstr "Cochez ceci pour éviter d'envoyer les notifications des \"J'aime\""
-
-#: mailstream.php:516
-msgid "Attach Images"
-msgstr "Attacher les images"
-
-#: mailstream.php:518
-msgid ""
-"Download images in posts and attach them to the email.  Useful for reading "
-"email while offline."
-msgstr "Télécharger les images des messages et les attacher au courriel. Utile pour les les courriels hors-ligne."
-
-#: mailstream.php:525
+#: mailstream.php:281
 msgid "Mail Stream Settings"
 msgstr "Paramètres de Mail Stream"
diff --git a/mailstream/lang/fr/strings.php b/mailstream/lang/fr/strings.php
index a21d80b8..13892f61 100644
--- a/mailstream/lang/fr/strings.php
+++ b/mailstream/lang/fr/strings.php
@@ -2,26 +2,21 @@
 
 if(! function_exists("string_plural_select_fr")) {
 function string_plural_select_fr($n){
-	$n = intval($n);
-	if (($n == 0 || $n == 1)) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
+	return ($n > 1);;
 }}
-$a->strings['From Address'] = 'Depuis l\'adresse';
-$a->strings['Email address that stream items will appear to be from.'] = 'Adresse de courriel de laquelle les éléments du flux sembleront provenir.';
-$a->strings['Save Settings'] = 'Sauvegarder les paramètres';
-$a->strings['Re:'] = 'Re :';
-$a->strings['Friendica post'] = 'Message Friendica';
-$a->strings['Diaspora post'] = 'Message Diaspora';
-$a->strings['Feed item'] = 'Élément du flux';
-$a->strings['Email'] = 'Courriel';
-$a->strings['Friendica Item'] = 'Élément de Friendica';
-$a->strings['Upstream'] = 'En amont';
-$a->strings['URI'] = 'URI';
-$a->strings['Local'] = 'Local';
-$a->strings['Enabled'] = 'Activer';
-$a->strings['Email Address'] = 'Adresse de courriel';
-$a->strings['Leave blank to use your account email address'] = 'Laissez vide pour utiliser l\'adresse de courriel de votre compte';
-$a->strings['Exclude Likes'] = 'Exclure les "j\'aime"';
-$a->strings['Check this to omit mailing "Like" notifications'] = 'Cochez ceci pour éviter d\'envoyer les notifications des "J\'aime"';
-$a->strings['Attach Images'] = 'Attacher les images';
-$a->strings['Download images in posts and attach them to the email.  Useful for reading email while offline.'] = 'Télécharger les images des messages et les attacher au courriel. Utile pour les les courriels hors-ligne.';
-$a->strings['Mail Stream Settings'] = 'Paramètres de Mail Stream';
+;
+$a->strings["From Address"] = "Depuis l'adresse";
+$a->strings["Email address that stream items will appear to be from."] = "";
+$a->strings["Save Settings"] = "Sauvegarder les paramètres";
+$a->strings["Re:"] = "Re :";
+$a->strings["Friendica post"] = "Message Friendica";
+$a->strings["Diaspora post"] = "Message Diaspora";
+$a->strings["Feed item"] = "";
+$a->strings["Email"] = "Courriel";
+$a->strings["Friendica Item"] = "Élément de Friendica";
+$a->strings["Upstream"] = "";
+$a->strings["Local"] = "Local";
+$a->strings["Email Address"] = "Adresse de courriel";
+$a->strings["Leave blank to use your account email address"] = "";
+$a->strings["Enabled"] = "Activer";
+$a->strings["Mail Stream Settings"] = "Paramètres de Mail Stream";
diff --git a/mailstream/lang/hu/messages.po b/mailstream/lang/hu/messages.po
deleted file mode 100644
index 66d09299..00000000
--- a/mailstream/lang/hu/messages.po
+++ /dev/null
@@ -1,102 +0,0 @@
-# ADDON mailstream
-# Copyright (C)
-# This file is distributed under the same license as the Friendica mailstream addon package.
-# 
-# 
-# Translators:
-# Balázs Úr, 2020-2021,2023
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:15-0500\n"
-"PO-Revision-Date: 2014-06-23 09:54+0000\n"
-"Last-Translator: Balázs Úr, 2020-2021,2023\n"
-"Language-Team: Hungarian (http://app.transifex.com/Friendica/friendica/language/hu/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: hu\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: mailstream.php:77
-msgid "From Address"
-msgstr "Feladócím"
-
-#: mailstream.php:79
-msgid "Email address that stream items will appear to be from."
-msgstr "E-mail-cím, ahonnan úgy tűnik, hogy a folyam elemei származnak."
-
-#: mailstream.php:82
-msgid "Save Settings"
-msgstr "Beállítások mentése"
-
-#: mailstream.php:311
-msgid "Re:"
-msgstr "Vá:"
-
-#: mailstream.php:324 mailstream.php:327
-msgid "Friendica post"
-msgstr "Friendica-bejegyzés"
-
-#: mailstream.php:330
-msgid "Diaspora post"
-msgstr "Diaspora-bejegyzés"
-
-#: mailstream.php:340
-msgid "Feed item"
-msgstr "Hírforráselem"
-
-#: mailstream.php:343
-msgid "Email"
-msgstr "E-mail"
-
-#: mailstream.php:345
-msgid "Friendica Item"
-msgstr "Friendica-elem"
-
-#: mailstream.php:419
-msgid "Upstream"
-msgstr "Távoli"
-
-#: mailstream.php:420
-msgid "URI"
-msgstr "URI"
-
-#: mailstream.php:421
-msgid "Local"
-msgstr "Helyi"
-
-#: mailstream.php:499
-msgid "Enabled"
-msgstr "Engedélyezve"
-
-#: mailstream.php:504
-msgid "Email Address"
-msgstr "E-mail-cím"
-
-#: mailstream.php:506
-msgid "Leave blank to use your account email address"
-msgstr "Hagyja üresen a fiókja e-mail-címének használatához"
-
-#: mailstream.php:510
-msgid "Exclude Likes"
-msgstr "Kedvelések kizárása"
-
-#: mailstream.php:512
-msgid "Check this to omit mailing \"Like\" notifications"
-msgstr "Jelölje be ezt a „Tetszik” értesítések elküldésének kihagyásához"
-
-#: mailstream.php:516
-msgid "Attach Images"
-msgstr "Képek csatolása"
-
-#: mailstream.php:518
-msgid ""
-"Download images in posts and attach them to the email.  Useful for reading "
-"email while offline."
-msgstr "Képek letöltése a bejegyzésekből és csatolás az e-mailhez. Hasznos az e-mailek kapcsolat nélküli olvasásakor."
-
-#: mailstream.php:525
-msgid "Mail Stream Settings"
-msgstr "Levelezőfolyam beállításai"
diff --git a/mailstream/lang/hu/strings.php b/mailstream/lang/hu/strings.php
deleted file mode 100644
index 5b1e5a51..00000000
--- a/mailstream/lang/hu/strings.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_hu")) {
-function string_plural_select_hu($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['From Address'] = 'Feladócím';
-$a->strings['Email address that stream items will appear to be from.'] = 'E-mail-cím, ahonnan úgy tűnik, hogy a folyam elemei származnak.';
-$a->strings['Save Settings'] = 'Beállítások mentése';
-$a->strings['Re:'] = 'Vá:';
-$a->strings['Friendica post'] = 'Friendica-bejegyzés';
-$a->strings['Diaspora post'] = 'Diaspora-bejegyzés';
-$a->strings['Feed item'] = 'Hírforráselem';
-$a->strings['Email'] = 'E-mail';
-$a->strings['Friendica Item'] = 'Friendica-elem';
-$a->strings['Upstream'] = 'Távoli';
-$a->strings['URI'] = 'URI';
-$a->strings['Local'] = 'Helyi';
-$a->strings['Enabled'] = 'Engedélyezve';
-$a->strings['Email Address'] = 'E-mail-cím';
-$a->strings['Leave blank to use your account email address'] = 'Hagyja üresen a fiókja e-mail-címének használatához';
-$a->strings['Exclude Likes'] = 'Kedvelések kizárása';
-$a->strings['Check this to omit mailing "Like" notifications'] = 'Jelölje be ezt a „Tetszik” értesítések elküldésének kihagyásához';
-$a->strings['Attach Images'] = 'Képek csatolása';
-$a->strings['Download images in posts and attach them to the email.  Useful for reading email while offline.'] = 'Képek letöltése a bejegyzésekből és csatolás az e-mailhez. Hasznos az e-mailek kapcsolat nélküli olvasásakor.';
-$a->strings['Mail Stream Settings'] = 'Levelezőfolyam beállításai';
diff --git a/mailstream/lang/it/messages.po b/mailstream/lang/it/messages.po
index 7f87793f..2d05f120 100644
--- a/mailstream/lang/it/messages.po
+++ b/mailstream/lang/it/messages.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
+"POT-Creation-Date: 2018-03-11 19:13+0100\n"
 "PO-Revision-Date: 2018-03-19 13:12+0000\n"
 "Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n"
@@ -19,80 +19,80 @@ msgstr ""
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: mailstream.php:66
+#: mailstream.php:77
 msgid "From Address"
 msgstr "Indirizzo di invio"
 
-#: mailstream.php:68
+#: mailstream.php:79
 msgid "Email address that stream items will appear to be from."
 msgstr "Indirizzo email da cui i messaggi appariranno inviati"
 
-#: mailstream.php:71 mailstream.php:382
+#: mailstream.php:82 mailstream.php:380
 msgid "Save Settings"
 msgstr "Salva Impostazioni"
 
-#: mailstream.php:225
+#: mailstream.php:223
 msgid "Re:"
 msgstr "R:"
 
-#: mailstream.php:233
+#: mailstream.php:231
 msgid "Friendica post"
 msgstr "Messaggio Friendica"
 
-#: mailstream.php:236
+#: mailstream.php:234
 msgid "Diaspora post"
 msgstr "Messaggio Diaspora"
 
-#: mailstream.php:246
+#: mailstream.php:244
 msgid "Feed item"
 msgstr "Elemento da feed"
 
-#: mailstream.php:249
+#: mailstream.php:247
 msgid "Email"
 msgstr "Email"
 
-#: mailstream.php:251
+#: mailstream.php:249
 msgid "Friendica Item"
 msgstr "Elemento da Friendica"
 
-#: mailstream.php:296
+#: mailstream.php:293
 msgid "Upstream"
 msgstr "Upstream"
 
-#: mailstream.php:297
+#: mailstream.php:294
 msgid "Local"
 msgstr "Locale"
 
-#: mailstream.php:364
+#: mailstream.php:362
 msgid "Enabled"
 msgstr "Abilitato"
 
-#: mailstream.php:368
+#: mailstream.php:366
 msgid "Email Address"
 msgstr "Indirizzo Email"
 
-#: mailstream.php:370
+#: mailstream.php:368
 msgid "Leave blank to use your account email address"
 msgstr "Lascia in bianco per usare l'indirizzo email del tuo account"
 
-#: mailstream.php:373
+#: mailstream.php:371
 msgid "Exclude Likes"
 msgstr "Escludi \"Mi Piace\""
 
-#: mailstream.php:375
+#: mailstream.php:373
 msgid "Check this to omit mailing \"Like\" notifications"
 msgstr "Seleziona per evitare di inviare notifiche per \"Mi Piace\""
 
-#: mailstream.php:378
+#: mailstream.php:376
 msgid "Attach Images"
 msgstr "Allega Immagini"
 
-#: mailstream.php:380
+#: mailstream.php:378
 msgid ""
 "Download images in posts and attach them to the email.  Useful for reading "
 "email while offline."
 msgstr "Scarica le immagini nei messaggi e le allega alle email. Utile per leggere le email mentre si è offline."
 
-#: mailstream.php:381
+#: mailstream.php:379
 msgid "Mail Stream Settings"
 msgstr "Impostazioni Mail Stream"
diff --git a/mailstream/lang/it/strings.php b/mailstream/lang/it/strings.php
index 3abb9ae7..a6a48287 100644
--- a/mailstream/lang/it/strings.php
+++ b/mailstream/lang/it/strings.php
@@ -2,25 +2,25 @@
 
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['From Address'] = 'Indirizzo di invio';
-$a->strings['Email address that stream items will appear to be from.'] = 'Indirizzo email da cui i messaggi appariranno inviati';
-$a->strings['Save Settings'] = 'Salva Impostazioni';
-$a->strings['Re:'] = 'R:';
-$a->strings['Friendica post'] = 'Messaggio Friendica';
-$a->strings['Diaspora post'] = 'Messaggio Diaspora';
-$a->strings['Feed item'] = 'Elemento da feed';
-$a->strings['Email'] = 'Email';
-$a->strings['Friendica Item'] = 'Elemento da Friendica';
-$a->strings['Upstream'] = 'Upstream';
-$a->strings['Local'] = 'Locale';
-$a->strings['Enabled'] = 'Abilitato';
-$a->strings['Email Address'] = 'Indirizzo Email';
-$a->strings['Leave blank to use your account email address'] = 'Lascia in bianco per usare l\'indirizzo email del tuo account';
-$a->strings['Exclude Likes'] = 'Escludi "Mi Piace"';
-$a->strings['Check this to omit mailing "Like" notifications'] = 'Seleziona per evitare di inviare notifiche per "Mi Piace"';
-$a->strings['Attach Images'] = 'Allega Immagini';
-$a->strings['Download images in posts and attach them to the email.  Useful for reading email while offline.'] = 'Scarica le immagini nei messaggi e le allega alle email. Utile per leggere le email mentre si è offline.';
-$a->strings['Mail Stream Settings'] = 'Impostazioni Mail Stream';
+;
+$a->strings["From Address"] = "Indirizzo di invio";
+$a->strings["Email address that stream items will appear to be from."] = "Indirizzo email da cui i messaggi appariranno inviati";
+$a->strings["Save Settings"] = "Salva Impostazioni";
+$a->strings["Re:"] = "R:";
+$a->strings["Friendica post"] = "Messaggio Friendica";
+$a->strings["Diaspora post"] = "Messaggio Diaspora";
+$a->strings["Feed item"] = "Elemento da feed";
+$a->strings["Email"] = "Email";
+$a->strings["Friendica Item"] = "Elemento da Friendica";
+$a->strings["Upstream"] = "Upstream";
+$a->strings["Local"] = "Locale";
+$a->strings["Enabled"] = "Abilitato";
+$a->strings["Email Address"] = "Indirizzo Email";
+$a->strings["Leave blank to use your account email address"] = "Lascia in bianco per usare l'indirizzo email del tuo account";
+$a->strings["Exclude Likes"] = "Escludi \"Mi Piace\"";
+$a->strings["Check this to omit mailing \"Like\" notifications"] = "Seleziona per evitare di inviare notifiche per \"Mi Piace\"";
+$a->strings["Attach Images"] = "Allega Immagini";
+$a->strings["Download images in posts and attach them to the email.  Useful for reading email while offline."] = "Scarica le immagini nei messaggi e le allega alle email. Utile per leggere le email mentre si è offline.";
+$a->strings["Mail Stream Settings"] = "Impostazioni Mail Stream";
diff --git a/mailstream/lang/nl/strings.php b/mailstream/lang/nl/strings.php
index 8870ca6c..2a675073 100644
--- a/mailstream/lang/nl/strings.php
+++ b/mailstream/lang/nl/strings.php
@@ -3,9 +3,25 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['From Address'] = 'Van Adres';
-$a->strings['Email address that stream items will appear to be from.'] = 'E-mail adres waarvan stream items komen ';
-$a->strings['Save Settings'] = 'Instellingen opslaan';
-$a->strings['Enabled'] = 'Ingeschakeld';
+;
+$a->strings["From Address"] = "Van Adres";
+$a->strings["Email address that stream items will appear to be from."] = "E-mail adres waarvan stream items komen ";
+$a->strings["Save Settings"] = "Instellingen opslaan";
+$a->strings["Re:"] = "";
+$a->strings["Friendica post"] = "";
+$a->strings["Diaspora post"] = "";
+$a->strings["Feed item"] = "";
+$a->strings["Email"] = "";
+$a->strings["Friendica Item"] = "";
+$a->strings["Upstream"] = "";
+$a->strings["Local"] = "";
+$a->strings["Enabled"] = "Ingeschakeld";
+$a->strings["Email Address"] = "";
+$a->strings["Leave blank to use your account email address"] = "";
+$a->strings["Exclude Likes"] = "";
+$a->strings["Check this to omit mailing \"Like\" notifications"] = "";
+$a->strings["Attach Images"] = "";
+$a->strings["Download images in posts and attach them to the email.  Useful for reading email while offline."] = "";
+$a->strings["Mail Stream Settings"] = "";
diff --git a/mailstream/lang/pl/messages.po b/mailstream/lang/pl/messages.po
index 9fb4aee0..25cd1776 100644
--- a/mailstream/lang/pl/messages.po
+++ b/mailstream/lang/pl/messages.po
@@ -4,14 +4,14 @@
 # 
 # 
 # Translators:
-# Waldemar Stoczkowski, 2018
+# Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:15-0500\n"
-"PO-Revision-Date: 2014-06-23 09:54+0000\n"
-"Last-Translator: Waldemar Stoczkowski, 2018\n"
+"POT-Creation-Date: 2018-03-11 19:13+0100\n"
+"PO-Revision-Date: 2018-04-01 14:39+0000\n"
+"Last-Translator: Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.com/Friendica/friendica/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -27,72 +27,72 @@ msgstr "Z adresu"
 msgid "Email address that stream items will appear to be from."
 msgstr "Adres e-mail, z którego będą przesyłane strumienie pochodzące z."
 
-#: mailstream.php:82
+#: mailstream.php:82 mailstream.php:380
 msgid "Save Settings"
 msgstr "Zapisz ustawienia"
 
-#: mailstream.php:301
+#: mailstream.php:223
 msgid "Re:"
 msgstr "Re:"
 
-#: mailstream.php:314 mailstream.php:317
+#: mailstream.php:231
 msgid "Friendica post"
 msgstr "Friendica post"
 
-#: mailstream.php:320
+#: mailstream.php:234
 msgid "Diaspora post"
 msgstr "Post Diaspora"
 
-#: mailstream.php:330
+#: mailstream.php:244
 msgid "Feed item"
 msgstr "Element kanału"
 
-#: mailstream.php:333
+#: mailstream.php:247
 msgid "Email"
 msgstr "E-mail"
 
-#: mailstream.php:335
+#: mailstream.php:249
 msgid "Friendica Item"
 msgstr "Pozycja Friendica"
 
-#: mailstream.php:404
+#: mailstream.php:293
 msgid "Upstream"
 msgstr "Nadrzędny"
 
-#: mailstream.php:405
+#: mailstream.php:294
 msgid "Local"
 msgstr "Lokalny"
 
-#: mailstream.php:481
+#: mailstream.php:362
 msgid "Enabled"
 msgstr "Włączone"
 
-#: mailstream.php:486
+#: mailstream.php:366
 msgid "Email Address"
 msgstr "Adres e-mail"
 
-#: mailstream.php:488
+#: mailstream.php:368
 msgid "Leave blank to use your account email address"
-msgstr "Aby użyć adresu e-mail swojego konta pozostaw pole puste"
+msgstr "Pozostaw puste, aby użyć adresu e-mail swojego konta"
 
-#: mailstream.php:492
+#: mailstream.php:371
 msgid "Exclude Likes"
-msgstr "Wyłącz polubienia"
+msgstr "Wykluczanie polubień"
 
-#: mailstream.php:494
+#: mailstream.php:373
 msgid "Check this to omit mailing \"Like\" notifications"
 msgstr "Zaznacz to pole, aby pominąć wysyłanie powiadomień typu \"Lubię to\""
 
-#: mailstream.php:498
+#: mailstream.php:376
 msgid "Attach Images"
 msgstr "Dołącz zdjęcia"
 
-#: mailstream.php:500
+#: mailstream.php:378
 msgid ""
 "Download images in posts and attach them to the email.  Useful for reading "
 "email while offline."
-msgstr "Pobierz zdjęcia w postach i dołącz je do wiadomości e-mail. Przydatne do czytania wiadomości e-mail w trybie offline."
+msgstr "Pobierz zdjęcia w postach i dołącz je do wiadomości e-mail. Przydatny do czytania wiadomości e-mail w trybie offline."
 
-#: mailstream.php:507
+#: mailstream.php:379
 msgid "Mail Stream Settings"
 msgstr "Ustawienia strumienia poczty"
diff --git a/mailstream/lang/pl/strings.php b/mailstream/lang/pl/strings.php
index d4a2932f..88b0006e 100644
--- a/mailstream/lang/pl/strings.php
+++ b/mailstream/lang/pl/strings.php
@@ -2,25 +2,25 @@
 
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
-	$n = intval($n);
-	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
+	return ($n==1 ? 0 : ($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14) ? 1 : $n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14) ? 2 : 3);;
 }}
-$a->strings['From Address'] = 'Z adresu';
-$a->strings['Email address that stream items will appear to be from.'] = 'Adres e-mail, z którego będą przesyłane strumienie pochodzące z.';
-$a->strings['Save Settings'] = 'Zapisz ustawienia';
-$a->strings['Re:'] = 'Re:';
-$a->strings['Friendica post'] = 'Friendica post';
-$a->strings['Diaspora post'] = 'Post Diaspora';
-$a->strings['Feed item'] = 'Element kanału';
-$a->strings['Email'] = 'E-mail';
-$a->strings['Friendica Item'] = 'Pozycja Friendica';
-$a->strings['Upstream'] = 'Nadrzędny';
-$a->strings['Local'] = 'Lokalny';
-$a->strings['Enabled'] = 'Włączone';
-$a->strings['Email Address'] = 'Adres e-mail';
-$a->strings['Leave blank to use your account email address'] = 'Aby użyć adresu e-mail swojego konta pozostaw pole puste';
-$a->strings['Exclude Likes'] = 'Wyłącz polubienia';
-$a->strings['Check this to omit mailing "Like" notifications'] = 'Zaznacz to pole, aby pominąć wysyłanie powiadomień typu "Lubię to"';
-$a->strings['Attach Images'] = 'Dołącz zdjęcia';
-$a->strings['Download images in posts and attach them to the email.  Useful for reading email while offline.'] = 'Pobierz zdjęcia w postach i dołącz je do wiadomości e-mail. Przydatne do czytania wiadomości e-mail w trybie offline.';
-$a->strings['Mail Stream Settings'] = 'Ustawienia strumienia poczty';
+;
+$a->strings["From Address"] = "Z adresu";
+$a->strings["Email address that stream items will appear to be from."] = "Adres e-mail, z którego będą przesyłane strumienie pochodzące z.";
+$a->strings["Save Settings"] = "Zapisz ustawienia";
+$a->strings["Re:"] = "Re:";
+$a->strings["Friendica post"] = "Friendica post";
+$a->strings["Diaspora post"] = "Post Diaspora";
+$a->strings["Feed item"] = "Element kanału";
+$a->strings["Email"] = "E-mail";
+$a->strings["Friendica Item"] = "Pozycja Friendica";
+$a->strings["Upstream"] = "Nadrzędny";
+$a->strings["Local"] = "Lokalny";
+$a->strings["Enabled"] = "Włączone";
+$a->strings["Email Address"] = "Adres e-mail";
+$a->strings["Leave blank to use your account email address"] = "Pozostaw puste, aby użyć adresu e-mail swojego konta";
+$a->strings["Exclude Likes"] = "Wykluczanie polubień";
+$a->strings["Check this to omit mailing \"Like\" notifications"] = "Zaznacz to pole, aby pominąć wysyłanie powiadomień typu \"Lubię to\"";
+$a->strings["Attach Images"] = "Dołącz zdjęcia";
+$a->strings["Download images in posts and attach them to the email.  Useful for reading email while offline."] = "Pobierz zdjęcia w postach i dołącz je do wiadomości e-mail. Przydatny do czytania wiadomości e-mail w trybie offline.";
+$a->strings["Mail Stream Settings"] = "Ustawienia strumienia poczty";
diff --git a/mailstream/lang/ro/strings.php b/mailstream/lang/ro/strings.php
index 622a9cfe..6a02d65f 100644
--- a/mailstream/lang/ro/strings.php
+++ b/mailstream/lang/ro/strings.php
@@ -2,21 +2,21 @@
 
 if(! function_exists("string_plural_select_ro")) {
 function string_plural_select_ro($n){
-	$n = intval($n);
-	if ($n==1) { return 0; } else if ((($n%100>19)||(($n%100==0)&&($n!=0)))) { return 2; } else  { return 1; }
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
 }}
-$a->strings['From Address'] = 'Adresa sursă';
-$a->strings['Email address that stream items will appear to be from.'] = 'Adresa de e-mail folosită ca și sursă pentru elemente fluxate.';
-$a->strings['Save Settings'] = 'Salvare Configurări';
-$a->strings['Re:'] = 'Re:';
-$a->strings['Friendica post'] = 'Postare Friendica ';
-$a->strings['Diaspora post'] = 'Postare Diaspora';
-$a->strings['Feed item'] = 'Element de flux';
-$a->strings['Email'] = 'Email';
-$a->strings['Friendica Item'] = 'Element Friendica';
-$a->strings['Upstream'] = 'Fluxare inversă';
-$a->strings['Local'] = 'Local';
-$a->strings['Email Address'] = 'Adresă de Email';
-$a->strings['Leave blank to use your account email address'] = 'Lăsați necompletat pentru a utiliza adresa de e-mail a contul dvs .';
-$a->strings['Enabled'] = 'Activat';
-$a->strings['Mail Stream Settings'] = 'Configurări Flux Mail';
+;
+$a->strings["From Address"] = "Adresa sursă";
+$a->strings["Email address that stream items will appear to be from."] = "Adresa de e-mail folosită ca și sursă pentru elemente fluxate.";
+$a->strings["Save Settings"] = "Salvare Configurări";
+$a->strings["Re:"] = "Re:";
+$a->strings["Friendica post"] = "Postare Friendica ";
+$a->strings["Diaspora post"] = "Postare Diaspora";
+$a->strings["Feed item"] = "Element de flux";
+$a->strings["Email"] = "Email";
+$a->strings["Friendica Item"] = "Element Friendica";
+$a->strings["Upstream"] = "Fluxare inversă";
+$a->strings["Local"] = "Local";
+$a->strings["Email Address"] = "Adresă de Email";
+$a->strings["Leave blank to use your account email address"] = "Lăsați necompletat pentru a utiliza adresa de e-mail a contul dvs .";
+$a->strings["Enabled"] = "Activat";
+$a->strings["Mail Stream Settings"] = "Configurări Flux Mail";
diff --git a/mailstream/lang/sv/messages.po b/mailstream/lang/sv/messages.po
deleted file mode 100644
index 75f6e24a..00000000
--- a/mailstream/lang/sv/messages.po
+++ /dev/null
@@ -1,98 +0,0 @@
-# ADDON mailstream
-# Copyright (C)
-# This file is distributed under the same license as the Friendica mailstream addon package.
-# 
-# 
-# Translators:
-# Kristoffer Grundström <lovaren@gmail.com>, 2022
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:15-0500\n"
-"PO-Revision-Date: 2022-01-16 00:44+0000\n"
-"Last-Translator: Kristoffer Grundström <lovaren@gmail.com>\n"
-"Language-Team: Swedish (http://www.transifex.com/Friendica/friendica/language/sv/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: sv\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: mailstream.php:77
-msgid "From Address"
-msgstr "Från adress"
-
-#: mailstream.php:79
-msgid "Email address that stream items will appear to be from."
-msgstr ""
-
-#: mailstream.php:82
-msgid "Save Settings"
-msgstr "Spara inställningar"
-
-#: mailstream.php:301
-msgid "Re:"
-msgstr "Re:"
-
-#: mailstream.php:314 mailstream.php:317
-msgid "Friendica post"
-msgstr "Friendica-inlägg"
-
-#: mailstream.php:320
-msgid "Diaspora post"
-msgstr "Diaspora-inlägg"
-
-#: mailstream.php:330
-msgid "Feed item"
-msgstr ""
-
-#: mailstream.php:333
-msgid "Email"
-msgstr "E-post"
-
-#: mailstream.php:335
-msgid "Friendica Item"
-msgstr "Friendica-objekt"
-
-#: mailstream.php:404
-msgid "Upstream"
-msgstr "Uppströms"
-
-#: mailstream.php:405
-msgid "Local"
-msgstr "Lokal"
-
-#: mailstream.php:481
-msgid "Enabled"
-msgstr "Aktiverad"
-
-#: mailstream.php:486
-msgid "Email Address"
-msgstr "E-postadress"
-
-#: mailstream.php:488
-msgid "Leave blank to use your account email address"
-msgstr "Lämna tom för att använda ditt kontos e-postadress"
-
-#: mailstream.php:492
-msgid "Exclude Likes"
-msgstr ""
-
-#: mailstream.php:494
-msgid "Check this to omit mailing \"Like\" notifications"
-msgstr ""
-
-#: mailstream.php:498
-msgid "Attach Images"
-msgstr ""
-
-#: mailstream.php:500
-msgid ""
-"Download images in posts and attach them to the email.  Useful for reading "
-"email while offline."
-msgstr ""
-
-#: mailstream.php:507
-msgid "Mail Stream Settings"
-msgstr ""
diff --git a/mailstream/lang/sv/strings.php b/mailstream/lang/sv/strings.php
deleted file mode 100644
index 6e0503c2..00000000
--- a/mailstream/lang/sv/strings.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_sv")) {
-function string_plural_select_sv($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['From Address'] = 'Från adress';
-$a->strings['Save Settings'] = 'Spara inställningar';
-$a->strings['Re:'] = 'Re:';
-$a->strings['Friendica post'] = 'Friendica-inlägg';
-$a->strings['Diaspora post'] = 'Diaspora-inlägg';
-$a->strings['Email'] = 'E-post';
-$a->strings['Friendica Item'] = 'Friendica-objekt';
-$a->strings['Upstream'] = 'Uppströms';
-$a->strings['Local'] = 'Lokal';
-$a->strings['Enabled'] = 'Aktiverad';
-$a->strings['Email Address'] = 'E-postadress';
-$a->strings['Leave blank to use your account email address'] = 'Lämna tom för att använda ditt kontos e-postadress';
diff --git a/mailstream/mailstream.php b/mailstream/mailstream.php
index b513cf36..d6d880f1 100644
--- a/mailstream/mailstream.php
+++ b/mailstream/mailstream.php
@@ -2,150 +2,108 @@
 /**
  * Name: Mail Stream
  * Description: Mail all items coming into your network feed to an email address
- * Version: 2.0
+ * Version: 1.1
  * Author: Matthew Exon <http://mat.exon.name>
  */
 
-use Friendica\App;
 use Friendica\Content\Text\BBCode;
+use Friendica\Core\Config;
 use Friendica\Core\Hook;
+use Friendica\Core\L10n;
 use Friendica\Core\Logger;
+use Friendica\Core\PConfig;
 use Friendica\Core\Renderer;
-use Friendica\Core\System;
-use Friendica\Core\Worker;
 use Friendica\Database\DBA;
-use Friendica\DI;
-use Friendica\Model\Contact;
-use Friendica\Model\Item;
-use Friendica\Model\Post;
-use Friendica\Model\User;
-use Friendica\Network\HTTPClient\Client\HttpClientAccept;
 use Friendica\Protocol\Activity;
-use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Network;
+use Friendica\Model\Item;
 
-/**
- * Sets up the addon hooks and the database table
- */
-function mailstream_install()
-{
+function mailstream_install() {
 	Hook::register('addon_settings', 'addon/mailstream/mailstream.php', 'mailstream_addon_settings');
 	Hook::register('addon_settings_post', 'addon/mailstream/mailstream.php', 'mailstream_addon_settings_post');
 	Hook::register('post_local_end', 'addon/mailstream/mailstream.php', 'mailstream_post_hook');
 	Hook::register('post_remote_end', 'addon/mailstream/mailstream.php', 'mailstream_post_hook');
-	Hook::register('mailstream_send_hook', 'addon/mailstream/mailstream.php', 'mailstream_send_hook');
+	Hook::register('cron', 'addon/mailstream/mailstream.php', 'mailstream_cron');
 
-	Logger::info("mailstream: installed");
-}
+	if (Config::get('mailstream', 'dbversion') == '0.1') {
+		q('ALTER TABLE `mailstream_item` DROP INDEX `uid`');
+		q('ALTER TABLE `mailstream_item` DROP INDEX `contact-id`');
+		q('ALTER TABLE `mailstream_item` DROP INDEX `plink`');
+		q('ALTER TABLE `mailstream_item` CHANGE `plink` `uri` char(255) NOT NULL');
+		Config::set('mailstream', 'dbversion', '0.2');
+	}
+	if (Config::get('mailstream', 'dbversion') == '0.2') {
+		q('DELETE FROM `pconfig` WHERE `cat` = "mailstream" AND `k` = "delay"');
+		Config::set('mailstream', 'dbversion', '0.3');
+	}
+	if (Config::get('mailstream', 'dbversion') == '0.3') {
+		q('ALTER TABLE `mailstream_item` CHANGE `created` `created` timestamp NOT NULL DEFAULT now()');
+		q('ALTER TABLE `mailstream_item` CHANGE `completed` `completed` timestamp NULL DEFAULT NULL');
+		Config::set('mailstream', 'dbversion', '0.4');
+	}
+	if (Config::get('mailstream', 'dbversion') == '0.4') {
+		q('ALTER TABLE `mailstream_item` CONVERT TO CHARACTER SET utf8 COLLATE utf8_bin');
+		Config::set('mailstream', 'dbversion', '0.5');
+	}
+	if (Config::get('mailstream', 'dbversion') == '0.5') {
+		Config::set('mailstream', 'dbversion', '1.0');
+	}
 
-/**
- * Enforces that mailstream_install has set up the current version
- */
-function mailstream_check_version()
-{
-	if (!is_null(DI::config()->get('mailstream', 'dbversion'))) {
-		DI::config()->delete('mailstream', 'dbversion');
-		Logger::info("mailstream_check_version: old version detected, reinstalling");
-		mailstream_install();
-		Hook::loadHooks();
-		Hook::add(
-			'mailstream_convert_table_entries',
-			'addon/mailstream/mailstream.php',
-			'mailstream_convert_table_entries'
-		);
-		Hook::fork(Worker::PRIORITY_LOW, 'mailstream_convert_table_entries');
+	if (Config::get('retriever', 'dbversion') != '1.0') {
+		$schema = file_get_contents(dirname(__file__).'/database.sql');
+		$arr = explode(';', $schema);
+		foreach ($arr as $a) {
+			$r = q($a);
+		}
+		Config::set('mailstream', 'dbversion', '1.0');
 	}
 }
 
-/**
- * This is a statement rather than an actual function definition. The simple
- * existence of this method is checked to figure out if the addon offers a
- * module.
- */
+function mailstream_uninstall() {
+	Hook::unregister('addon_settings', 'addon/mailstream/mailstream.php', 'mailstream_addon_settings');
+	Hook::unregister('addon_settings_post', 'addon/mailstream/mailstream.php', 'mailstream_addon_settings_post');
+	Hook::unregister('post_local', 'addon/mailstream/mailstream.php', 'mailstream_post_local_hook');
+	Hook::unregister('post_remote', 'addon/mailstream/mailstream.php', 'mailstream_post_remote_hook');
+	Hook::unregister('post_local_end', 'addon/mailstream/mailstream.php', 'mailstream_post_local_hook');
+	Hook::unregister('post_remote_end', 'addon/mailstream/mailstream.php', 'mailstream_post_remote_hook');
+	Hook::unregister('post_local_end', 'addon/mailstream/mailstream.php', 'mailstream_post_hook');
+	Hook::unregister('post_remote_end', 'addon/mailstream/mailstream.php', 'mailstream_post_hook');
+	Hook::unregister('cron', 'addon/mailstream/mailstream.php', 'mailstream_cron');
+	Hook::unregister('incoming_mail', 'addon/mailstream/mailstream.php', 'mailstream_incoming_mail');
+}
+
 function mailstream_module() {}
 
-/**
- * Adds an item in "addon features" in the admin menu of the site
- *
- * @param string        $o HTML form data
- */
-function mailstream_addon_admin(string &$o)
-{
-	$frommail = DI::config()->get('mailstream', 'frommail');
+function mailstream_addon_admin(&$a,&$o) {
+	$frommail = Config::get('mailstream', 'frommail');
 	$template = Renderer::getMarkupTemplate('admin.tpl', 'addon/mailstream/');
 	$config = ['frommail',
-		DI::l10n()->t('From Address'),
-		$frommail,
-		DI::l10n()->t('Email address that stream items will appear to be from.')];
+			L10n::t('From Address'),
+			$frommail,
+			L10n::t('Email address that stream items will appear to be from.')];
 	$o .= Renderer::replaceMacros($template, [
-		'$frommail' => $config,
-		'$submit' => DI::l10n()->t('Save Settings')
-	]);
+				 '$frommail' => $config,
+				 '$submit' => L10n::t('Save Settings')]);
 }
 
-/**
- * Process input from the "addon features" part of the admin menu
- */
-function mailstream_addon_admin_post()
-{
+function mailstream_addon_admin_post ($a) {
 	if (!empty($_POST['frommail'])) {
-		DI::config()->set('mailstream', 'frommail', $_POST['frommail']);
+		Config::set('mailstream', 'frommail', $_POST['frommail']);
 	}
 }
 
-/**
- * Creates a message ID for a post URI in accordance with RFC 1036
- * See also http://www.jwz.org/doc/mid.html
- *
- * @param string $uri the URI to be converted to a message ID
- *
- * @return string the created message ID
- */
-function mailstream_generate_id(string $uri): string
-{
-	$host = DI::baseUrl()->getHost();
+function mailstream_generate_id($a, $uri) {
+	// http://www.jwz.org/doc/mid.html
+	$host = $a->getHostName();
 	$resource = hash('md5', $uri);
 	$message_id = "<" . $resource . "@" . $host . ">";
 	Logger::debug('mailstream: Generated message ID ' . $message_id . ' for URI ' . $uri);
 	return $message_id;
 }
 
-function mailstream_send_hook(array $data)
-{
-	$criteria = array('uid' => $data['uid'], 'contact-id' => $data['contact-id'], 'uri' => $data['uri']);
-	$item = Post::selectFirst([], $criteria);
-	if (empty($item)) {
-		Logger::error('mailstream_send_hook could not find item');
-		return;
-	}
-
-	$user = User::getById($item['uid']);
-	if (empty($user)) {
-			Logger::error('mailstream_send_hook could not fund user', ['uid' => $item['uid']]);
-		return;
-	}
-
-	if (!mailstream_send($data['message_id'], $item, $user)) {
-		Logger::debug('mailstream_send_hook send failed, will retry', $data);
-		if (!Worker::defer()) {
-			Logger::error('mailstream_send_hook failed and could not defer', $data);
-		}
-	}
-}
-
-/**
- * Called when either a local or remote post is created.  If
- * mailstream is enabled and the necessary data is available, forks a
- * workerqueue item to send the email.
- *
- * @param array     $item content of the item (may or may not already be stored in the item table)
- * @return void
- */
-function mailstream_post_hook(array &$item)
-{
-	mailstream_check_version();
-
-	if (!DI::pConfig()->get($item['uid'], 'mailstream', 'enabled')) {
-		Logger::debug('mailstream: not enabled.', ['item' => $item['id'], ' uid ' => $item['uid']]);
+function mailstream_post_hook(&$a, &$item) {
+	if (!PConfig::get($item['uid'], 'mailstream', 'enabled')) {
+		Logger::debug('mailstream: not enabled for item ' . $item['id']);
 		return;
 	}
 	if (!$item['uid']) {
@@ -160,73 +118,63 @@ function mailstream_post_hook(array &$item)
 		Logger::debug('mailstream: no uri for item ' . $item['id']);
 		return;
 	}
-	if ($item['verb'] == Activity::ANNOUNCE) {
-		Logger::debug('mailstream: announce item ', ['item' => $item['id']]);
+	if (!$item['plink']) {
+		Logger::debug('mailstream: no plink for item ' . $item['id']);
 		return;
 	}
-	if (DI::pConfig()->get($item['uid'], 'mailstream', 'nolikes')) {
+	if (PConfig::get($item['uid'], 'mailstream', 'nolikes')) {
 		if ($item['verb'] == Activity::LIKE) {
 			Logger::debug('mailstream: like item ' . $item['id']);
 			return;
 		}
-		if ($item['verb'] == Activity::DISLIKE) {
-			Logger::debug('mailstream: dislike item ' . $item['id']);
-			return;
-		}
 	}
 
-	$message_id = mailstream_generate_id($item['uri']);
-
-	$send_hook_data = [
-		'uid' => $item['uid'],
-		'contact-id' => $item['contact-id'],
-		'uri' => $item['uri'],
-		'message_id' => $message_id,
-		'tries' => 0,
-	];
-	Hook::fork(Worker::PRIORITY_LOW, 'mailstream_send_hook', $send_hook_data);
-}
-
-/**
- * If the user has configured attaching images to emails as
- * attachments, this function searches the post for such images,
- * retrieves the image, and inserts the data and metadata into the
- * supplied array
- *
- * @param array         $item        content of the item
- * @param array         $attachments contains an array element for each attachment to add to the email
- *
- * @return array new value of the attachments table (results are also stored in the reference parameter)
- */
-function mailstream_do_images(array &$item, array &$attachments)
-{
-	if (!DI::pConfig()->get($item['uid'], 'mailstream', 'attachimg')) {
+	$message_id = mailstream_generate_id($a, $item['uri']);
+	q("INSERT INTO `mailstream_item` (`uid`, `contact-id`, `uri`, `message-id`) " .
+		"VALUES (%d, '%s', '%s', '%s')", intval($item['uid']),
+		intval($item['contact-id']), DBA::escape($item['uri']), DBA::escape($message_id));
+	$r = q('SELECT * FROM `mailstream_item` WHERE `uid` = %d AND `contact-id` = %d AND `uri` = "%s"', intval($item['uid']), intval($item['contact-id']), DBA::escape($item['uri']));
+	if (count($r) != 1) {
+		Logger::info('mailstream_post_remote_hook: Unexpected number of items returned from mailstream_item');
 		return;
 	}
+	$ms_item = $r[0];
+	Logger::debug('mailstream_post_remote_hook: created mailstream_item ' . $ms_item['id'] . ' for item ' . $item['uri'] . ' ' . $item['uid'] . ' ' . $item['contact-id']);
+	$user = mailstream_get_user($item['uid']);
+	if (!$user) {
+		Logger::info('mailstream_post_remote_hook: no user ' . $item['uid']);
+		return;
+	}
+	mailstream_send($a, $ms_item['message-id'], $item, $user);
+}
 
+function mailstream_get_user($uid) {
+	$r = q('SELECT * FROM `user` WHERE `uid` = %d', intval($uid));
+	if (count($r) != 1) {
+		Logger::info('mailstream_post_remote_hook: Unexpected number of users returned');
+		return;
+	}
+	return $r[0];
+}
+
+function mailstream_do_images($a, &$item, &$attachments) {
+	if (!PConfig::get($item['uid'], 'mailstream', 'attachimg')) {
+		return;
+	}
 	$attachments = [];
-
 	preg_match_all("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", $item["body"], $matches1);
 	preg_match_all("/\[img\](.*?)\[\/img\]/ism", $item["body"], $matches2);
 	preg_match_all("/\[img\=([^\]]*)\]([^[]*)\[\/img\]/ism", $item["body"], $matches3);
-
 	foreach (array_merge($matches1[3], $matches2[1], $matches3[1]) as $url) {
 		$components = parse_url($url);
-
 		if (!$components) {
 			continue;
 		}
-
-		$cookiejar = tempnam(System::getTempPath(), 'cookiejar-mailstream-');
-		try {
-			$curlResult = DI::httpClient()->fetchFull($url, HttpClientAccept::DEFAULT, 0, $cookiejar);
-		} catch (InvalidArgumentException $e) {
-			Logger::error('mailstream_do_images exception fetching url', ['url' => $url, 'item_id' => $item['id']]);
-			continue;
-		}
+		$cookiejar = tempnam(get_temppath(), 'cookiejar-mailstream-');
+		$curlResult = Network::fetchUrlFull($url, true, 0, '', $cookiejar);
 		$attachments[$url] = [
-			'data' => $curlResult->getBodyString(),
-			'guid' => hash('crc32', $url),
+			'data' => $curlResult->getBody(),
+			'guid' => hash("crc32", $url),
 			'filename' => basename($components['path']),
 			'type' => $curlResult->getContentType()
 		];
@@ -236,21 +184,13 @@ function mailstream_do_images(array &$item, array &$attachments)
 			continue;
 		}
 	}
-
 	return $attachments;
 }
 
-/**
- * Creates a sender to use in the email, either from the contact or the author of the item, or both
- *
- * @param array $item content of the item
- *
- * @return string sender suitable for use in the email
- */
-function mailstream_sender(array $item): string
-{
-	$contact = Contact::getById($item['contact-id']);
-	if (DBA::isResult($contact)) {
+function mailstream_sender($item) {
+	$r = q('SELECT * FROM `contact` WHERE `id` = %d', $item['contact-id']);
+	if (DBA::isResult($r)) {
+		$contact = $r[0];
 		if ($contact['name'] != $item['author-name']) {
 			return $contact['name'] . ' - ' . $item['author-name'];
 		}
@@ -258,17 +198,8 @@ function mailstream_sender(array $item): string
 	return $item['author-name'];
 }
 
-/**
- * Converts a bbcode-encoded subject line into a plaintext version suitable for the subject line of an email
- *
- * @param string $subject bbcode-encoded subject line
- * @param int    $uri_id
- *
- * @return string plaintext subject line
- */
-function mailstream_decode_subject(string $subject, int $uri_id): string
-{
-	$html = BBCode::convertForUriId($uri_id, $subject);
+function mailstream_decode_subject($subject) {
+	$html = BBCode::convert($subject);
 	if (!$html) {
 		return $subject;
 	}
@@ -280,9 +211,7 @@ function mailstream_decode_subject(string $subject, int $uri_id): string
 	if (!$noentity) {
 		return $notags;
 	}
-	$nocodes = preg_replace_callback("/(&#[0-9]+;)/", function ($m) {
-		return mb_convert_encoding($m[1], 'UTF-8', 'HTML-ENTITIES');
-	}, $noentity);
+	$nocodes = preg_replace_callback("/(&#[0-9]+;)/", function($m) { return mb_convert_encoding($m[1], "UTF-8", "HTML-ENTITIES"); }, $noentity);
 	if (!$nocodes) {
 		return $noentity;
 	}
@@ -293,22 +222,14 @@ function mailstream_decode_subject(string $subject, int $uri_id): string
 	return $trimmed;
 }
 
-/**
- * Creates a subject line to use in the email
- *
- * @param array $item content of the item
- *
- * @return string subject line suitable for use in the email
- */
-function mailstream_subject(array $item): string
-{
+function mailstream_subject($item) {
 	if ($item['title']) {
-		return mailstream_decode_subject($item['title'], $item['uri-id']);
+		return mailstream_decode_subject($item['title']);
 	}
 	$parent = $item['thr-parent'];
 	// Don't look more than 100 levels deep for a subject, in case of loops
 	for ($i = 0; ($i < 100) && $parent; $i++) {
-		$parent_item = Post::selectFirst(['thr-parent', 'title'], ['uri' => $parent]);
+		$parent_item = Item::selectFirst(['thr-parent', 'title'], ['uri' => $parent]);
 		if (!DBA::isResult($parent_item)) {
 			break;
 		}
@@ -316,84 +237,55 @@ function mailstream_subject(array $item): string
 			break;
 		}
 		if ($parent_item['title']) {
-			return DI::l10n()->t('Re:') . ' ' . mailstream_decode_subject($parent_item['title'], $item['uri-id']);
+			return L10n::t('Re:') . ' ' . mailstream_decode_subject($parent_item['title']);
 		}
 		$parent = $parent_item['thr-parent'];
 	}
-	$contact = Contact::selectFirst([], ['id' => $item['contact-id'], 'uid' => $item['uid']]);
-	if (!DBA::isResult($contact)) {
-		Logger::error(
-			'mailstream_subject no contact for item',
-			['id' => $item['id'],
-				'plink' => $item['plink'],
-				'contact id' => $item['contact-id'],
-			'uid' => $item['uid']]
-		);
-		return DI::l10n()->t("Friendica post");
-	}
+	$r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d",
+		intval($item['contact-id']), intval($item['uid']));
+	$contact = $r[0];
 	if ($contact['network'] === 'dfrn') {
-		return DI::l10n()->t("Friendica post");
+		return L10n::t("Friendica post");
 	}
 	if ($contact['network'] === 'dspr') {
-		return DI::l10n()->t("Diaspora post");
+		return L10n::t("Diaspora post");
 	}
 	if ($contact['network'] === 'face') {
-		$text = mailstream_decode_subject($item['body'], $item['uri-id']);
+		$text = mailstream_decode_subject($item['body']);
 		// For some reason these do show up in Facebook
 		$text = preg_replace('/\xA0$/', '', $text);
 		$subject = (strlen($text) > 150) ? (substr($text, 0, 140) . '...') : $text;
 		return preg_replace('/\\s+/', ' ', $subject);
 	}
 	if ($contact['network'] === 'feed') {
-		return DI::l10n()->t("Feed item");
+		return L10n::t("Feed item");
 	}
 	if ($contact['network'] === 'mail') {
-		return DI::l10n()->t("Email");
+		return L10n::t("Email");
 	}
-	return DI::l10n()->t("Friendica Item");
+	return L10n::t("Friendica Item");
 }
 
-/**
- * Sends a message using PHPMailer
- *
- * @param string $message_id ID of the message (RFC 1036)
- * @param array  $item       content of the item
- * @param array  $user       results from the user table
- *
- * @return bool True if this message has been completed.  False if it should be retried.
- */
-function mailstream_send(string $message_id, array $item, array $user): bool
-{
-	if (!is_array($item)) {
-		Logger::error('mailstream_send item is empty', ['message_id' => $message_id]);
-		return false;
-	}
-
+function mailstream_send(\Friendica\App $a, $message_id, $item, $user) {
 	if (!$item['visible']) {
-		Logger::debug('mailstream_send item not yet visible', ['item uri' => $item['uri']]);
-		return false;
+		return;
 	}
 	if (!$message_id) {
-		Logger::error('mailstream_send no message ID supplied', ['item uri' => $item['uri'],
-				'user email' => $user['email']]);
-		return true;
+		return;
 	}
-
-	require_once (dirname(__file__) . '/phpmailer/class.phpmailer.php');
-
-	$item['body'] = Post\Media::addAttachmentsToBody($item['uri-id'], $item['body']);
+	require_once(dirname(__file__).'/phpmailer/class.phpmailer.php');
 
 	$attachments = [];
-	mailstream_do_images($item, $attachments);
-	$frommail = DI::config()->get('mailstream', 'frommail');
-	if ($frommail == '') {
+	mailstream_do_images($a, $item, $attachments);
+	$frommail = Config::get('mailstream', 'frommail');
+	if ($frommail == "") {
 		$frommail = 'friendica@localhost.local';
 	}
-	$address = DI::pConfig()->get($item['uid'], 'mailstream', 'address');
+	$address = PConfig::get($item['uid'], 'mailstream', 'address');
 	if (!$address) {
 		$address = $user['email'];
 	}
-	$mail = new PHPmailer();
+	$mail = new PHPmailer;
 	try {
 		$mail->XMailer = 'Friendica Mailstream Addon';
 		$mail->SetFrom($frommail, mailstream_sender($item));
@@ -401,167 +293,141 @@ function mailstream_send(string $message_id, array $item, array $user): bool
 		$mail->MessageID = $message_id;
 		$mail->Subject = mailstream_subject($item);
 		if ($item['thr-parent'] != $item['uri']) {
-			$mail->addCustomHeader('In-Reply-To: ' . mailstream_generate_id($item['thr-parent']));
+			$mail->addCustomHeader('In-Reply-To: ' . mailstream_generate_id($a, $item['thr-parent']));
 		}
 		$mail->addCustomHeader('X-Friendica-Mailstream-URI: ' . $item['uri']);
-		if ($item['plink']) {
-			$mail->addCustomHeader('X-Friendica-Mailstream-Plink: ' . $item['plink']);
-		}
+		$mail->addCustomHeader('X-Friendica-Mailstream-Plink: ' . $item['plink']);
 		$encoding = 'base64';
 		foreach ($attachments as $url => $image) {
-			$mail->AddStringEmbeddedImage(
-				$image['data'],
-				$image['guid'],
-				$image['filename'],
-				$encoding,
-				$image['type']
-			);
+			$mail->AddStringEmbeddedImage($image['data'], $image['guid'], $image['filename'], $encoding, $image['type']);
 		}
 		$mail->IsHTML(true);
 		$mail->CharSet = 'utf-8';
 		$template = Renderer::getMarkupTemplate('mail.tpl', 'addon/mailstream/');
 		$mail->AltBody = BBCode::toPlaintext($item['body']);
-		$item['body'] = BBCode::convertForUriId($item['uri-id'], $item['body'], BBCode::CONNECTORS);
-		$item['url'] = DI::baseUrl() . '/display/' . $item['guid'];
+		$item['body'] = BBCode::convert($item['body']);
+		$item['url'] = $a->getBaseURL() . '/display/' . $item['guid'];
 		$mail->Body = Renderer::replaceMacros($template, [
-						 '$upstream' => DI::l10n()->t('Upstream'),
-						 '$uri' => DI::l10n()->t('URI'),
-						 '$local' => DI::l10n()->t('Local'),
+						 '$upstream' => L10n::t('Upstream'),
+						 '$local' => L10n::t('Local'),
 						 '$item' => $item]);
-		$mail->Body = mailstream_html_wrap($mail->Body);
+		mailstream_html_wrap($mail->Body);
 		if (!$mail->Send()) {
 			throw new Exception($mail->ErrorInfo);
 		}
-		Logger::debug('mailstream_send sent message', ['message ID' => $mail->MessageID,
-				'subject' => $mail->Subject,
-				'address' => $address]);
+		Logger::debug('mailstream_send sent message ' . $mail->MessageID . ' ' . $mail->Subject);
 	} catch (phpmailerException $e) {
 		Logger::debug('mailstream_send PHPMailer exception sending message ' . $message_id . ': ' . $e->errorMessage());
 	} catch (Exception $e) {
 		Logger::debug('mailstream_send exception sending message ' . $message_id . ': ' . $e->getMessage());
 	}
-
-	return true;
+	// In case of failure, still set the item to completed.  Otherwise
+	// we'll just try to send it over and over again and it'll fail
+	// every time.
+	q('UPDATE `mailstream_item` SET `completed` = now() WHERE `message-id` = "%s"', DBA::escape($message_id));
 }
 
 /**
  * Email tends to break if you send excessively long lines.  To make
  * bbcode's output suitable for transmission, we try to break things
  * up so that lines are about 200 characters.
- *
- * @param string $text text to word wrap
- * @return string wrapped text
  */
-function mailstream_html_wrap(string &$text)
+function mailstream_html_wrap(&$text)
 {
 	$lines = str_split($text, 200);
 	for ($i = 0; $i < count($lines); $i++) {
 		$lines[$i] = preg_replace('/ /', "\n", $lines[$i], 1);
 	}
 	$text = implode($lines);
-	return $text;
 }
 
-/**
- * Convert v1 mailstream table entries to v2 workerqueue items
- */
-function mailstream_convert_table_entries()
-{
-	$ms_item_ids = DBA::selectToArray('mailstream_item', [], ['message-id', 'uri', 'uid', 'contact-id'], ["`mailstream_item`.`completed` IS NULL"]);
-	Logger::debug('mailstream_convert_table_entries processing ' . count($ms_item_ids) . ' items');
+function mailstream_cron($a, $b) {
+	// Only process items older than an hour in cron.  This is because
+	// we want to give mailstream_post_remote_hook a fair chance to
+	// send the email itself before cron jumps in.  Only if
+	// mailstream_post_remote_hook fails for some reason will this get
+	// used, and in that case it's worth holding off a bit anyway.
+	$ms_item_ids = q("SELECT `mailstream_item`.`message-id`, `mailstream_item`.`uri`, `item`.`id` FROM `mailstream_item` JOIN `item` ON (`mailstream_item`.`uid` = `item`.`uid` AND `mailstream_item`.`uri` = `item`.`uri` AND `mailstream_item`.`contact-id` = `item`.`contact-id`) WHERE `mailstream_item`.`completed` IS NULL AND `mailstream_item`.`created` < DATE_SUB(NOW(), INTERVAL 1 HOUR) AND `item`.`visible` = 1 ORDER BY `mailstream_item`.`created` LIMIT 100");
+	Logger::debug('mailstream_cron processing ' . count($ms_item_ids) . ' items');
 	foreach ($ms_item_ids as $ms_item_id) {
-		$send_hook_data = array('uid' => $ms_item_id['uid'],
-					'contact-id' => $ms_item_id['contact-id'],
-					'uri' => $ms_item_id['uri'],
-					'message_id' => $ms_item_id['message-id'],
-					'tries' => 0);
 		if (!$ms_item_id['message-id'] || !strlen($ms_item_id['message-id'])) {
-			Logger::info('mailstream_convert_table_entries: item has no message-id.', ['item' => $ms_item_id['id'], 'uri' => $ms_item_id['uri']]);
-							continue;
+			Logger::info('mailstream_cron: Item ' . $ms_item_id['id'] . ' URI ' . $ms_item_id['uri'] . ' has no message-id');
+		}
+		$item = Item::selectFirst([], ['id' => $ms_item_id['id']]);
+		$users = q("SELECT * FROM `user` WHERE `uid` = %d", intval($item['uid']));
+		$user = $users[0];
+		if ($user && $item) {
+			mailstream_send($a, $ms_item_id['message-id'], $item, $user);
+		}
+		else {
+			Logger::info('mailstream_cron: Unable to find item ' . $ms_item_id['id']);
+			q("UPDATE `mailstream_item` SET `completed` = now() WHERE `message-id` = %d", intval($ms_item['message-id']));
 		}
-		Logger::info('mailstream_convert_table_entries: convert item to workerqueue', $send_hook_data);
-		Hook::fork(Worker::PRIORITY_LOW, 'mailstream_send_hook', $send_hook_data);
 	}
-	DBA::e('DROP TABLE `mailstream_item`');
+	mailstream_tidy();
 }
 
-/**
- * Form for configuring mailstream features for a user
- *
- * @param array $data Hook data array
- * @throws \Friendica\Network\HTTPException\ServiceUnavailableException
- */
-function mailstream_addon_settings(array &$data)
-{
-	$enabled   = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'mailstream', 'enabled');
-	$address   = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'mailstream', 'address');
-	$nolikes   = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'mailstream', 'nolikes');
-	$attachimg = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'mailstream', 'attachimg');
-
-	$template  = Renderer::getMarkupTemplate('settings.tpl', 'addon/mailstream/');
-	$html      = Renderer::replaceMacros($template, [
-		'$enabled'   => [
-			'mailstream_enabled',
-			DI::l10n()->t('Enabled'),
-			$enabled
-		],
-		'$address'   => [
-			'mailstream_address',
-			DI::l10n()->t('Email Address'),
-			$address,
-			DI::l10n()->t('Leave blank to use your account email address')
-		],
-		'$nolikes'   => [
-			'mailstream_nolikes',
-			DI::l10n()->t('Exclude Likes'),
-			$nolikes,
-			DI::l10n()->t('Check this to omit mailing "Like" notifications')
-		],
-		'$attachimg' => [
-			'mailstream_attachimg',
-			DI::l10n()->t('Attach Images'),
-			$attachimg,
-			DI::l10n()->t('Download images in posts and attach them to the email.  ' .
-				'Useful for reading email while offline.')
-		],
-	]);
-
-	$data = [
-		'addon' => 'mailstream',
-		'title' => DI::l10n()->t('Mail Stream Settings'),
-		'html'  => $html,
-	];
+function mailstream_addon_settings(&$a,&$s) {
+	$enabled = PConfig::get(local_user(), 'mailstream', 'enabled');
+	$address = PConfig::get(local_user(), 'mailstream', 'address');
+	$nolikes = PConfig::get(local_user(), 'mailstream', 'nolikes');
+	$attachimg= PConfig::get(local_user(), 'mailstream', 'attachimg');
+	$template = Renderer::getMarkupTemplate('settings.tpl', 'addon/mailstream/');
+	$s .= Renderer::replaceMacros($template, [
+				 '$enabled' => [
+					'mailstream_enabled',
+					L10n::t('Enabled'),
+					$enabled],
+				 '$address' => [
+					'mailstream_address',
+					L10n::t('Email Address'),
+					$address,
+					L10n::t("Leave blank to use your account email address")],
+				 '$nolikes' => [
+					'mailstream_nolikes',
+					L10n::t('Exclude Likes'),
+					$nolikes,
+					L10n::t("Check this to omit mailing \"Like\" notifications")],
+				 '$attachimg' => [
+					'mailstream_attachimg',
+					L10n::t('Attach Images'),
+					$attachimg,
+					L10n::t("Download images in posts and attach them to the email.  Useful for reading email while offline.")],
+				 '$title' => L10n::t('Mail Stream Settings'),
+				 '$submit' => L10n::t('Save Settings')]);
 }
 
-/**
- * Process data submitted to user's mailstream features form
- * @param array          $post POST data
- * @return void
- */
-function mailstream_addon_settings_post(array $post)
-{
-	if (!DI::userSession()->getLocalUserId() || empty($post['mailstream-submit'])) {
-		return;
+function mailstream_addon_settings_post($a,$post) {
+	if ($_POST['mailstream_address'] != "") {
+		PConfig::set(local_user(), 'mailstream', 'address', $_POST['mailstream_address']);
 	}
-
-	if ($post['mailstream_address'] != "") {
-		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'mailstream', 'address', $post['mailstream_address']);
-	} else {
-		DI::pConfig()->delete(DI::userSession()->getLocalUserId(), 'mailstream', 'address');
+	else {
+		PConfig::delete(local_user(), 'mailstream', 'address');
 	}
-	if ($post['mailstream_nolikes']) {
-		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'mailstream', 'nolikes', $post['mailstream_enabled']);
-	} else {
-		DI::pConfig()->delete(DI::userSession()->getLocalUserId(), 'mailstream', 'nolikes');
+	if ($_POST['mailstream_nolikes']) {
+		PConfig::set(local_user(), 'mailstream', 'nolikes', $_POST['mailstream_enabled']);
 	}
-	if ($post['mailstream_enabled']) {
-		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'mailstream', 'enabled', $post['mailstream_enabled']);
-	} else {
-		DI::pConfig()->delete(DI::userSession()->getLocalUserId(), 'mailstream', 'enabled');
+	else {
+		PConfig::delete(local_user(), 'mailstream', 'nolikes');
 	}
-	if ($post['mailstream_attachimg']) {
-		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'mailstream', 'attachimg', $post['mailstream_attachimg']);
-	} else {
-		DI::pConfig()->delete(DI::userSession()->getLocalUserId(), 'mailstream', 'attachimg');
+	if ($_POST['mailstream_enabled']) {
+		PConfig::set(local_user(), 'mailstream', 'enabled', $_POST['mailstream_enabled']);
+	}
+	else {
+		PConfig::delete(local_user(), 'mailstream', 'enabled');
+	}
+	if ($_POST['mailstream_attachimg']) {
+		PConfig::set(local_user(), 'mailstream', 'attachimg', $_POST['mailstream_attachimg']);
+	}
+	else {
+		PConfig::delete(local_user(), 'mailstream', 'attachimg');
 	}
 }
+
+function mailstream_tidy() {
+	$r = q("SELECT id FROM mailstream_item WHERE completed IS NOT NULL AND completed < DATE_SUB(NOW(), INTERVAL 1 YEAR)");
+	foreach ($r as $rr) {
+		q('DELETE FROM mailstream_item WHERE id = %d', intval($rr['id']));
+	}
+	Logger::debug('mailstream_tidy: deleted ' . count($r) . ' old items');
+}
diff --git a/mailstream/phpmailer/class.phpmailer.php b/mailstream/phpmailer/class.phpmailer.php
index ab7fe030..46ff4360 100644
--- a/mailstream/phpmailer/class.phpmailer.php
+++ b/mailstream/phpmailer/class.phpmailer.php
@@ -17,8 +17,6 @@
  * FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-use Friendica\Core\System;
-
 /**
  * PHPMailer - PHP email creation and transport class.
  * @package PHPMailer
@@ -2352,11 +2350,11 @@ class PHPMailer
                     throw new phpmailerException($this->lang('extension_missing') . 'openssl');
                 }
                 // @TODO would be nice to use php://temp streams here, but need to wrap for PHP < 5.1
-                $file = tempnam(System::getTempPath(), 'mail');
+                $file = tempnam(get_temppath(), 'mail');
                 if (false === file_put_contents($file, $body)) {
                     throw new phpmailerException($this->lang('signing') . ' Could not write temp file');
                 }
-                $signed = tempnam(System::getTempPath(), 'signed');
+                $signed = tempnam(get_temppath(), 'signed');
                 //Workaround for PHP bug https://bugs.php.net/bug.php?id=69197
                 if (empty($this->sign_extracerts_file)) {
                     $sign = @openssl_pkcs7_sign(
diff --git a/mailstream/templates/mail.tpl b/mailstream/templates/mail.tpl
index 8015b45f..526ca4ef 100644
--- a/mailstream/templates/mail.tpl
+++ b/mailstream/templates/mail.tpl
@@ -6,6 +6,5 @@
 <div class="mailstream-item-body">{{$item.body nofilter}}</div>
 {{if $item.plink}}
 <div>{{$upstream}}: <a class="mailstream-item-plink" href="{{$item.plink}}">{{$item.plink}}</a><div>
-<div>{{$uri}}: <a class="mailstream-item-uri" href="{{$item.uri}}">{{$item.uri}}</a><div>
 <div>{{$local}}: <a class="mailstream-item-url" href="{{$item.url}}">{{$item.url}}</a></div>
 {{/if}}
diff --git a/mailstream/templates/settings.tpl b/mailstream/templates/settings.tpl
index 6e5d1729..599837ba 100644
--- a/mailstream/templates/settings.tpl
+++ b/mailstream/templates/settings.tpl
@@ -1,4 +1,13 @@
+<span id="settings_mailstream_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose('settings_mailstream_expanded'); openClose('settings_mailstream_inflated');">
+	<h3>{{$title}}</h3>
+</span>
+<div id="settings_mailstream_expanded" class="settings-block" style="display: none;">
+	<span class="fakelink" onclick="openClose('settings_mailstream_expanded'); openClose('settings_mailstream_inflated');">
+		<h3>{{$title}}</h3>
+	</span>
 {{include file="field_checkbox.tpl" field=$enabled}}
 {{include file="field_input.tpl" field=$address}}
 {{include file="field_checkbox.tpl" field=$nolikes}}
 {{include file="field_checkbox.tpl" field=$attachimg}}
+  <input type="submit" value="{{$submit}}">
+</div>
diff --git a/markdown/README b/markdown/README
deleted file mode 100644
index da3cd53d..00000000
--- a/markdown/README
+++ /dev/null
@@ -1,5 +0,0 @@
-Markdown
-========
-
-The Markdown addon parses user input for new items and comments via the Markdown parser.
-This enables users to use the Markdown syntax additionally to the BBCode syntax.
diff --git a/markdown/lang/C/messages.po b/markdown/lang/C/messages.po
deleted file mode 100644
index 33175204..00000000
--- a/markdown/lang/C/messages.po
+++ /dev/null
@@ -1,30 +0,0 @@
-# ADDON markdown
-# Copyright (C) 
-# This file is distributed under the same license as the Friendica markdown addon package.
-# 
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:15-0500\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: markdown.php:30
-msgid "Enable Markdown parsing"
-msgstr ""
-
-#: markdown.php:30
-msgid "If enabled, adds Markdown support to the Compose Post form."
-msgstr ""
-
-#: markdown.php:35
-msgid "Markdown Settings"
-msgstr ""
diff --git a/markdown/lang/cs/messages.po b/markdown/lang/cs/messages.po
deleted file mode 100644
index 37992761..00000000
--- a/markdown/lang/cs/messages.po
+++ /dev/null
@@ -1,39 +0,0 @@
-# ADDON markdown
-# Copyright (C)
-# This file is distributed under the same license as the Friendica markdown addon package.
-# 
-# 
-# Translators:
-# Aditoo, 2019
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-12-26 10:04+0000\n"
-"PO-Revision-Date: 2019-12-27 06:41+0000\n"
-"Last-Translator: Aditoo, 2019\n"
-"Language-Team: Czech (https://www.transifex.com/Friendica/teams/12172/cs/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: cs\n"
-"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
-
-#: markdown.php:32
-msgid "Markdown"
-msgstr "Markdown"
-
-#: markdown.php:33
-msgid "Enable Markdown parsing"
-msgstr ""
-
-#: markdown.php:33
-msgid ""
-"If enabled, self created items will additionally be parsed via Markdown."
-msgstr ""
-
-#: markdown.php:34
-msgid "Save Settings"
-msgstr "Uložit nastavení"
diff --git a/markdown/lang/cs/strings.php b/markdown/lang/cs/strings.php
deleted file mode 100644
index cfa1a1c5..00000000
--- a/markdown/lang/cs/strings.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_cs")) {
-function string_plural_select_cs($n){
-	$n = intval($n);
-	if (($n == 1 && $n % 1 == 0)) { return 0; } else if (($n >= 2 && $n <= 4 && $n % 1 == 0)) { return 1; } else if (($n % 1 != 0 )) { return 2; } else  { return 3; }
-}}
-$a->strings['Markdown'] = 'Markdown';
-$a->strings['Save Settings'] = 'Uložit nastavení';
diff --git a/markdown/lang/de/messages.po b/markdown/lang/de/messages.po
deleted file mode 100644
index 0c2715d5..00000000
--- a/markdown/lang/de/messages.po
+++ /dev/null
@@ -1,41 +0,0 @@
-# ADDON markdown
-# Copyright (C)
-# This file is distributed under the same license as the Friendica markdown addon package.
-# 
-# 
-# Translators:
-# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2019
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2019-12-27 06:41+0000\n"
-"Last-Translator: Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2019\n"
-"Language-Team: German (https://www.transifex.com/Friendica/teams/12172/de/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: de\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: markdown.php:30
-msgid "Markdown"
-msgstr "Markdown"
-
-#: markdown.php:31
-msgid "Enable Markdown parsing"
-msgstr "Verwende Markdown Formatierung"
-
-#: markdown.php:31
-msgid ""
-"If enabled, self created items will additionally be parsed via Markdown."
-msgstr ""
-"Wenn diese Option aktiviert ist, werden alle deine neu erstellten Beiträge "
-"beim Senden zusätzlich zu BBCode auch Markdown Formatierungen angewandt."
-
-#: markdown.php:32
-msgid "Save Settings"
-msgstr "Einstellungen speichern"
diff --git a/markdown/lang/de/strings.php b/markdown/lang/de/strings.php
deleted file mode 100644
index f9684b6b..00000000
--- a/markdown/lang/de/strings.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_de")) {
-function string_plural_select_de($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Markdown'] = 'Markdown';
-$a->strings['Enable Markdown parsing'] = 'Verwende Markdown Formatierung';
-$a->strings['If enabled, self created items will additionally be parsed via Markdown.'] = 'Wenn diese Option aktiviert ist, werden alle deine neu erstellten Beiträge beim Senden zusätzlich zu BBCode auch Markdown Formatierungen angewandt.';
-$a->strings['Save Settings'] = 'Einstellungen speichern';
diff --git a/markdown/lang/en-gb/messages.po b/markdown/lang/en-gb/messages.po
deleted file mode 100644
index c55f509e..00000000
--- a/markdown/lang/en-gb/messages.po
+++ /dev/null
@@ -1,40 +0,0 @@
-# ADDON markdown
-# Copyright (C)
-# This file is distributed under the same license as the Friendica markdown addon package.
-# 
-# 
-# Translators:
-# Andy H3 <andy@hubup.pro>, 2020
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-12-26 10:04+0000\n"
-"PO-Revision-Date: 2019-12-27 06:41+0000\n"
-"Last-Translator: Andy H3 <andy@hubup.pro>, 2020\n"
-"Language-Team: English (United Kingdom) (https://www.transifex.com/Friendica/teams/12172/en_GB/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: en_GB\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: markdown.php:32
-msgid "Markdown"
-msgstr "Markdown"
-
-#: markdown.php:33
-msgid "Enable Markdown parsing"
-msgstr "Enable Markdown parsing"
-
-#: markdown.php:33
-msgid ""
-"If enabled, self created items will additionally be parsed via Markdown."
-msgstr ""
-"If enabled, self created items will additionally be parsed via Markdown."
-
-#: markdown.php:34
-msgid "Save Settings"
-msgstr "Save Settings"
diff --git a/markdown/lang/en-gb/strings.php b/markdown/lang/en-gb/strings.php
deleted file mode 100644
index 9c1e502d..00000000
--- a/markdown/lang/en-gb/strings.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_en_gb")) {
-function string_plural_select_en_gb($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Markdown'] = 'Markdown';
-$a->strings['Enable Markdown parsing'] = 'Enable Markdown parsing';
-$a->strings['If enabled, self created items will additionally be parsed via Markdown.'] = 'If enabled, self created items will additionally be parsed via Markdown.';
-$a->strings['Save Settings'] = 'Save Settings';
diff --git a/markdown/lang/es/messages.po b/markdown/lang/es/messages.po
deleted file mode 100644
index ebbf71e0..00000000
--- a/markdown/lang/es/messages.po
+++ /dev/null
@@ -1,41 +0,0 @@
-# ADDON markdown
-# Copyright (C)
-# This file is distributed under the same license as the Friendica markdown addon package.
-# 
-# 
-# Translators:
-# Senex Petrovic <javierruizo@hotmail.com>, 2021
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2019-12-27 06:41+0000\n"
-"Last-Translator: Senex Petrovic <javierruizo@hotmail.com>, 2021\n"
-"Language-Team: Spanish (https://www.transifex.com/Friendica/teams/12172/es/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: es\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: markdown.php:30
-msgid "Markdown"
-msgstr "Markdown"
-
-#: markdown.php:31
-msgid "Enable Markdown parsing"
-msgstr "Habilitar el análisis de Markdown"
-
-#: markdown.php:31
-msgid ""
-"If enabled, self created items will additionally be parsed via Markdown."
-msgstr ""
-"Si está habilitado, los elementos creados por usted mismo también se "
-"analizarán a través de Markdown."
-
-#: markdown.php:32
-msgid "Save Settings"
-msgstr "Guardar ajustes"
diff --git a/markdown/lang/es/strings.php b/markdown/lang/es/strings.php
deleted file mode 100644
index 7ccd0018..00000000
--- a/markdown/lang/es/strings.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_es")) {
-function string_plural_select_es($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Markdown'] = 'Markdown';
-$a->strings['Enable Markdown parsing'] = 'Habilitar el análisis de Markdown';
-$a->strings['If enabled, self created items will additionally be parsed via Markdown.'] = 'Si está habilitado, los elementos creados por usted mismo también se analizarán a través de Markdown.';
-$a->strings['Save Settings'] = 'Guardar ajustes';
diff --git a/markdown/lang/fr/messages.po b/markdown/lang/fr/messages.po
deleted file mode 100644
index 6f42f197..00000000
--- a/markdown/lang/fr/messages.po
+++ /dev/null
@@ -1,36 +0,0 @@
-# ADDON markdown
-# Copyright (C)
-# This file is distributed under the same license as the Friendica markdown addon package.
-# 
-# 
-# Translators:
-# Nicolas Derive, 2022
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:15-0500\n"
-"PO-Revision-Date: 2019-12-27 06:41+0000\n"
-"Last-Translator: Nicolas Derive, 2022\n"
-"Language-Team: French (https://www.transifex.com/Friendica/teams/12172/fr/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: fr\n"
-"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
-
-#: markdown.php:30
-msgid "Enable Markdown parsing"
-msgstr "Activer l'interprétation Markdown"
-
-#: markdown.php:30
-msgid "If enabled, adds Markdown support to the Compose Post form."
-msgstr ""
-"Si activé, ajoute le support de Markdown au formulaire de création d'une "
-"publication."
-
-#: markdown.php:35
-msgid "Markdown Settings"
-msgstr "Paramètres de Markdown"
diff --git a/markdown/lang/fr/strings.php b/markdown/lang/fr/strings.php
deleted file mode 100644
index a5d2cdb2..00000000
--- a/markdown/lang/fr/strings.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_fr")) {
-function string_plural_select_fr($n){
-	$n = intval($n);
-	if (($n == 0 || $n == 1)) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
-}}
-$a->strings['Enable Markdown parsing'] = 'Activer l\'interprétation Markdown';
-$a->strings['If enabled, adds Markdown support to the Compose Post form.'] = 'Si activé, ajoute le support de Markdown au formulaire de création d\'une publication.';
-$a->strings['Markdown Settings'] = 'Paramètres de Markdown';
diff --git a/markdown/lang/gd/messages.po b/markdown/lang/gd/messages.po
deleted file mode 100644
index 4bc70e06..00000000
--- a/markdown/lang/gd/messages.po
+++ /dev/null
@@ -1,35 +0,0 @@
-# ADDON markdown
-# Copyright (C)
-# This file is distributed under the same license as the Friendica markdown addon package.
-# 
-# 
-# Translators:
-# GunChleoc, 2022
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:15-0500\n"
-"PO-Revision-Date: 2019-12-27 06:41+0000\n"
-"Last-Translator: GunChleoc, 2022\n"
-"Language-Team: Gaelic, Scottish (https://www.transifex.com/Friendica/teams/12172/gd/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: gd\n"
-"Plural-Forms: nplurals=4; plural=(n==1 || n==11) ? 0 : (n==2 || n==12) ? 1 : (n > 2 && n < 20) ? 2 : 3;\n"
-
-#: markdown.php:30
-msgid "Enable Markdown parsing"
-msgstr "Cuir parsadh Markdown an comas"
-
-#: markdown.php:30
-msgid "If enabled, adds Markdown support to the Compose Post form."
-msgstr ""
-"Ma tha seo an comas, cuiridh e taic ri Markdown ri foirm sgrìobhadh puist."
-
-#: markdown.php:35
-msgid "Markdown Settings"
-msgstr "Roghainnean Markdown"
diff --git a/markdown/lang/gd/strings.php b/markdown/lang/gd/strings.php
deleted file mode 100644
index dc40c254..00000000
--- a/markdown/lang/gd/strings.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_gd")) {
-function string_plural_select_gd($n){
-	$n = intval($n);
-	if (($n==1 || $n==11)) { return 0; } else if (($n==2 || $n==12)) { return 1; } else if (($n > 2 && $n < 20)) { return 2; } else  { return 3; }
-}}
-$a->strings['Enable Markdown parsing'] = 'Cuir parsadh Markdown an comas';
-$a->strings['If enabled, adds Markdown support to the Compose Post form.'] = 'Ma tha seo an comas, cuiridh e taic ri Markdown ri foirm sgrìobhadh puist.';
-$a->strings['Markdown Settings'] = 'Roghainnean Markdown';
diff --git a/markdown/lang/hu/messages.po b/markdown/lang/hu/messages.po
deleted file mode 100644
index f5147e01..00000000
--- a/markdown/lang/hu/messages.po
+++ /dev/null
@@ -1,41 +0,0 @@
-# ADDON markdown
-# Copyright (C)
-# This file is distributed under the same license as the Friendica markdown addon package.
-# 
-# 
-# Translators:
-# Balázs Úr, 2021
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2019-12-27 06:41+0000\n"
-"Last-Translator: Balázs Úr, 2021\n"
-"Language-Team: Hungarian (https://www.transifex.com/Friendica/teams/12172/hu/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: hu\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: markdown.php:30
-msgid "Markdown"
-msgstr "Markdown"
-
-#: markdown.php:31
-msgid "Enable Markdown parsing"
-msgstr "Markdown-feldolgozás engedélyezése"
-
-#: markdown.php:31
-msgid ""
-"If enabled, self created items will additionally be parsed via Markdown."
-msgstr ""
-"Ha engedélyezve van, akkor az önmagukat létrehozó elemek is fel lesznek "
-"dolgozva Markdown használatával."
-
-#: markdown.php:32
-msgid "Save Settings"
-msgstr "Beállítások mentése"
diff --git a/markdown/lang/hu/strings.php b/markdown/lang/hu/strings.php
deleted file mode 100644
index 556879ae..00000000
--- a/markdown/lang/hu/strings.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_hu")) {
-function string_plural_select_hu($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Markdown'] = 'Markdown';
-$a->strings['Enable Markdown parsing'] = 'Markdown-feldolgozás engedélyezése';
-$a->strings['If enabled, self created items will additionally be parsed via Markdown.'] = 'Ha engedélyezve van, akkor az önmagukat létrehozó elemek is fel lesznek dolgozva Markdown használatával.';
-$a->strings['Save Settings'] = 'Beállítások mentése';
diff --git a/markdown/lang/it/messages.po b/markdown/lang/it/messages.po
deleted file mode 100644
index e5846130..00000000
--- a/markdown/lang/it/messages.po
+++ /dev/null
@@ -1,39 +0,0 @@
-# ADDON markdown
-# Copyright (C)
-# This file is distributed under the same license as the Friendica markdown addon package.
-# 
-# 
-# Translators:
-# Sylke Vicious <silkevicious@gmail.com>, 2020
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-12-26 10:04+0000\n"
-"PO-Revision-Date: 2019-12-27 06:41+0000\n"
-"Last-Translator: Sylke Vicious <silkevicious@gmail.com>, 2020\n"
-"Language-Team: Italian (https://www.transifex.com/Friendica/teams/12172/it/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: it\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: markdown.php:32
-msgid "Markdown"
-msgstr "Markdown"
-
-#: markdown.php:33
-msgid "Enable Markdown parsing"
-msgstr "Abilita analisi Markdown"
-
-#: markdown.php:33
-msgid ""
-"If enabled, self created items will additionally be parsed via Markdown."
-msgstr "Se abilitato, gli elementi creati saranno analizzati via Markdown."
-
-#: markdown.php:34
-msgid "Save Settings"
-msgstr "Salva Impostazioni"
diff --git a/markdown/lang/it/strings.php b/markdown/lang/it/strings.php
deleted file mode 100644
index dc76ab82..00000000
--- a/markdown/lang/it/strings.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_it")) {
-function string_plural_select_it($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Markdown'] = 'Markdown';
-$a->strings['Enable Markdown parsing'] = 'Abilita analisi Markdown';
-$a->strings['If enabled, self created items will additionally be parsed via Markdown.'] = 'Se abilitato, gli elementi creati saranno analizzati via Markdown.';
-$a->strings['Save Settings'] = 'Salva Impostazioni';
diff --git a/markdown/lang/pl/messages.po b/markdown/lang/pl/messages.po
deleted file mode 100644
index 1237d7fc..00000000
--- a/markdown/lang/pl/messages.po
+++ /dev/null
@@ -1,41 +0,0 @@
-# ADDON markdown
-# Copyright (C)
-# This file is distributed under the same license as the Friendica markdown addon package.
-# 
-# 
-# Translators:
-# Waldemar Stoczkowski, 2019
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-12-26 10:04+0000\n"
-"PO-Revision-Date: 2019-12-27 06:41+0000\n"
-"Last-Translator: Waldemar Stoczkowski, 2019\n"
-"Language-Team: Polish (https://www.transifex.com/Friendica/teams/12172/pl/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: pl\n"
-"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
-
-#: markdown.php:32
-msgid "Markdown"
-msgstr "Markdown"
-
-#: markdown.php:33
-msgid "Enable Markdown parsing"
-msgstr "Włącz analizę Markdown"
-
-#: markdown.php:33
-msgid ""
-"If enabled, self created items will additionally be parsed via Markdown."
-msgstr ""
-"Jeśli ta opcja jest włączona, utworzone przez ciebie elementy zostaną "
-"dodatkowo przeanalizowane poprzez Markdown."
-
-#: markdown.php:34
-msgid "Save Settings"
-msgstr "Zapisz Ustawienia"
diff --git a/markdown/lang/pl/strings.php b/markdown/lang/pl/strings.php
deleted file mode 100644
index eace24ae..00000000
--- a/markdown/lang/pl/strings.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_pl")) {
-function string_plural_select_pl($n){
-	$n = intval($n);
-	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
-}}
-$a->strings['Markdown'] = 'Markdown';
-$a->strings['Enable Markdown parsing'] = 'Włącz analizę Markdown';
-$a->strings['If enabled, self created items will additionally be parsed via Markdown.'] = 'Jeśli ta opcja jest włączona, utworzone przez ciebie elementy zostaną dodatkowo przeanalizowane poprzez Markdown.';
-$a->strings['Save Settings'] = 'Zapisz Ustawienia';
diff --git a/markdown/lang/ru/messages.po b/markdown/lang/ru/messages.po
deleted file mode 100644
index 17d243b6..00000000
--- a/markdown/lang/ru/messages.po
+++ /dev/null
@@ -1,41 +0,0 @@
-# ADDON markdown
-# Copyright (C)
-# This file is distributed under the same license as the Friendica markdown addon package.
-# 
-# 
-# Translators:
-# Alexander An <ravnina@gmail.com>, 2020
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-12-26 10:04+0000\n"
-"PO-Revision-Date: 2019-12-27 06:41+0000\n"
-"Last-Translator: Alexander An <ravnina@gmail.com>, 2020\n"
-"Language-Team: Russian (https://www.transifex.com/Friendica/teams/12172/ru/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ru\n"
-"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
-
-#: markdown.php:32
-msgid "Markdown"
-msgstr "Markdown"
-
-#: markdown.php:33
-msgid "Enable Markdown parsing"
-msgstr "Включить форматирование Markdown"
-
-#: markdown.php:33
-msgid ""
-"If enabled, self created items will additionally be parsed via Markdown."
-msgstr ""
-"Если включено, то созданные вами записи будут дополнительно форматироваться "
-"в соответствии с разметкой Markdown."
-
-#: markdown.php:34
-msgid "Save Settings"
-msgstr "Сохранить настройки"
diff --git a/markdown/lang/ru/strings.php b/markdown/lang/ru/strings.php
deleted file mode 100644
index 047e0636..00000000
--- a/markdown/lang/ru/strings.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_ru")) {
-function string_plural_select_ru($n){
-	$n = intval($n);
-	if ($n%10==1 && $n%100!=11) { return 0; } else if ($n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14)) { return 1; } else if ($n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)) { return 2; } else  { return 3; }
-}}
-$a->strings['Markdown'] = 'Markdown';
-$a->strings['Enable Markdown parsing'] = 'Включить форматирование Markdown';
-$a->strings['If enabled, self created items will additionally be parsed via Markdown.'] = 'Если включено, то созданные вами записи будут дополнительно форматироваться в соответствии с разметкой Markdown.';
-$a->strings['Save Settings'] = 'Сохранить настройки';
diff --git a/markdown/markdown.php b/markdown/markdown.php
deleted file mode 100644
index 6f459244..00000000
--- a/markdown/markdown.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-/**
- * Name: Markdown
- * Description: Parse Markdown code when creating new items
- * Version: 0.1
- * Author: Michael Vogel <https://pirati.ca/profile/heluecht>
- */
-use Friendica\App;
-use Friendica\Core\Hook;
-use Friendica\Content\Text\Markdown;
-use Friendica\Core\Renderer;
-use Friendica\DI;
-
-function markdown_install() {
-	Hook::register('post_local_start',      __FILE__, 'markdown_post_local_start');
-	Hook::register('addon_settings',        __FILE__, 'markdown_addon_settings');
-	Hook::register('addon_settings_post',   __FILE__, 'markdown_addon_settings_post');
-}
-
-function markdown_addon_settings(array &$data)
-{
-	if (!DI::userSession()->getLocalUserId()) {
-		return;
-	}
-
-	$enabled = intval(DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'markdown', 'enabled'));
-
-	$t    = Renderer::getMarkupTemplate('settings.tpl', 'addon/markdown/');
-	$html = Renderer::replaceMacros($t, [
-		'$enabled' => ['enabled', DI::l10n()->t('Enable Markdown parsing'), $enabled, DI::l10n()->t('If enabled, adds Markdown support to the Compose Post form.')],
-	]);
-
-	$data = [
-		'addon' => 'markdown',
-		'title' => DI::l10n()->t('Markdown Settings'),
-		'html'  => $html,
-	];
-}
-
-function markdown_addon_settings_post(array &$b)
-{
-	if (!DI::userSession()->getLocalUserId() || empty($_POST['markdown-submit'])) {
-		return;
-	}
-
-	DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'markdown', 'enabled', intval($_POST['enabled']));
-}
-
-function markdown_post_local_start(&$request) {
-	if (empty($request['body']) || !DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'markdown', 'enabled')) {
-		return;
-	}
-
-	// Escape elements that shouldn't be parsed
-	$request['body'] = \Friendica\Content\Text\BBCode::performWithEscapedTags(
-		$request['body'],
-		['code', 'noparse', 'nobb', 'pre', 'share', 'url', 'img', 'bookmark',
-			'audio', 'video', 'youtube', 'vimeo', 'attachment', 'iframe', 'map', 'mail'],
-		function ($body) {
-			// Escape mentions which username can contain Markdown-like characters
-			// See https://github.com/friendica/friendica/issues/9486
-			return \Friendica\Util\Strings::performWithEscapedBlocks($body, '/[@!][^@\s]+@[^\s]+\w/', function ($text) {
-				// Markdown accepts literal HTML but we do not in post body, so we need to escape left chevrons
-				// (right chevrons are used for quoting in Markdown)
-				// See https://github.com/friendica/friendica/issues/10634
-				$text = strtr($text, ['<' => '&lt;']);
-				$text = str_replace('[*]', '[li]', $text);
-
-				return Markdown::toBBCode($text);
-			});
-		}
-	);
-}
diff --git a/markdown/templates/settings.tpl b/markdown/templates/settings.tpl
deleted file mode 100644
index 2f3f4ce7..00000000
--- a/markdown/templates/settings.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{{include file="field_checkbox.tpl" field=$enabled}}
diff --git a/mastodoncustomemojis/mastodoncustomemojis.php b/mastodoncustomemojis/mastodoncustomemojis.php
index f67054a1..c7e9df60 100644
--- a/mastodoncustomemojis/mastodoncustomemojis.php
+++ b/mastodoncustomemojis/mastodoncustomemojis.php
@@ -11,10 +11,11 @@
 
 use Friendica\App;
 use Friendica\Content\Smilies;
-use Friendica\Core\Cache\Enum\Duration;
+use Friendica\Core\Cache;
+use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\Protocol;
-use Friendica\DI;
+use Friendica\Util\Network;
 use Friendica\Util\Proxy as ProxyUtils;
 
 function mastodoncustomemojis_install()
@@ -27,9 +28,19 @@ function mastodoncustomemojis_install()
 	Hook::register('contacts_mod_init',  __FILE__, 'mastodoncustomemojis_css_hook');
 }
 
-function mastodoncustomemojis_css_hook()
+function mastodoncustomemojis_uninstall()
 {
-	DI::page()['htmlhead'] .= <<<HTML
+	Hook::unregister('put_item_in_cache',  __FILE__, 'mastodoncustomemojis_put_item_in_cache');
+	Hook::unregister('network_mod_init',   __FILE__, 'mastodoncustomemojis_css_hook');
+	Hook::unregister('display_mod_init',   __FILE__, 'mastodoncustomemojis_css_hook');
+	Hook::unregister('search_mod_init',    __FILE__, 'mastodoncustomemojis_css_hook');
+	Hook::unregister('community_mod_init', __FILE__, 'mastodoncustomemojis_css_hook');
+	Hook::unregister('contacts_mod_init',  __FILE__, 'mastodoncustomemojis_css_hook');
+}
+
+function mastodoncustomemojis_css_hook(App $a)
+{
+	$a->page['htmlhead'] .= <<<HTML
 <!-- Style added by mastodoncustomemojis -->
 <style type="text/css">
 	.emoji.mastodon {
@@ -42,7 +53,7 @@ function mastodoncustomemojis_css_hook()
 HTML;
 }
 
-function mastodoncustomemojis_put_item_in_cache(array &$hook_data)
+function mastodoncustomemojis_put_item_in_cache(App $a, array &$hook_data)
 {
 	// Mastodon uses OStatus and ActivityPub, skipping other network protocols
 	if (empty($hook_data['item']['author-link']) || !in_array($hook_data['item']['network'], [Protocol::OSTATUS, Protocol::ACTIVITYPUB])) {
@@ -62,12 +73,12 @@ function mastodoncustomemojis_get_custom_emojis_for_author($author_link)
 
 	$cache_key = 'mastodoncustomemojis:' . $api_base_url;
 
-	$return = DI::cache()->get($cache_key);
+	$return = Cache::get($cache_key);
 
-	if (empty($return) || DI::config()->get('system', 'ignore_cache')) {
+	if (empty($return) || Config::get('system', 'ignore_cache')) {
 		$return = mastodoncustomemojis_fetch_custom_emojis_for_url($api_base_url);
 
-		DI::cache()->set($cache_key, $return, empty($return['texts']) ? Duration::QUARTER_HOUR : Duration::HOUR);
+		Cache::set($cache_key, $return, empty($return['texts']) ? Cache::QUARTER_HOUR : Cache::HOUR);
 	}
 
 	return $return;
@@ -79,10 +90,10 @@ function mastodoncustomemojis_fetch_custom_emojis_for_url($api_base_url)
 
 	$api_url = $api_base_url . '/api/v1/custom_emojis';
 
-	$fetchResult = DI::httpClient()->fetchFull($api_url);
+	$fetchResult = Network::fetchUrlFull($api_url);
 
 	if ($fetchResult->isSuccess()) {
-		$emojis_array = json_decode($fetchResult->getBodyString(), true);
+		$emojis_array = json_decode($fetchResult->getBody(), true);
 
 		if (is_array($emojis_array) && count($emojis_array)) {
 			foreach ($emojis_array as $emoji) {
diff --git a/mathjax/README.md b/mathjax/README.md
index d67805e8..f5a0388f 100644
--- a/mathjax/README.md
+++ b/mathjax/README.md
@@ -21,22 +21,19 @@ In case you want to use the CDN you can try the following URL as a quick start
 	http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS_HTML
 
 In case you don't want or can use the admin panel of Friendica you can activate
-the addon by adding _mathjax_ to the list in your `config/node.config.php` file
+the addon by adding _mathjax_ to the list in your `config/local.config.php` file
 
-	'addons' => [
-		...
-		'mathjax' => [
-			admin => true,			
-		],
-	]
+    'system' => [
+        ...
+        'addon' => '...,mathjax'
+        ...
+    ]
 
-and then providing the base URL after that in the `config/mathjax.config.php` file
+and then providing the base URL after that in the `config/addon.config.php` file
 
-	return [
-		'mathjax' => [
-			'baseurl' => '[the URL to your MathJax installation]',
-		],
-	];
+	'mathjax' => [
+		'baseurl' => '[the URL to your MathJax installation]',
+	],
 
 Usage
 =====
diff --git a/mathjax/lang/C/messages.po b/mathjax/lang/C/messages.po
index 7063a192..59a5b574 100644
--- a/mathjax/lang/C/messages.po
+++ b/mathjax/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:15-0500\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,13 +17,35 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: mathjax.php:42
+#: mathjax.php:36
+msgid "Settings"
+msgstr ""
+
+#: mathjax.php:37
 msgid ""
 "The MathJax addon renders mathematical formulae written using the LaTeX "
 "syntax surrounded by the usual $$ or an eqnarray block in the postings of "
 "your wall,network tab and private mail."
 msgstr ""
 
-#: mathjax.php:43
+#: mathjax.php:38
 msgid "Use the MathJax renderer"
 msgstr ""
+
+#: mathjax.php:42
+msgid "Submit"
+msgstr ""
+
+#: mathjax.php:66
+msgid "Settings updated."
+msgstr ""
+
+#: mathjax.php:75
+msgid "MathJax Base URL"
+msgstr ""
+
+#: mathjax.php:75
+msgid ""
+"The URL for the javascript file that should be included to use MathJax. Can "
+"be either the MathJax CDN or another installation of MathJax."
+msgstr ""
diff --git a/mathjax/lang/ar/messages.po b/mathjax/lang/ar/messages.po
deleted file mode 100644
index 1675525a..00000000
--- a/mathjax/lang/ar/messages.po
+++ /dev/null
@@ -1,35 +0,0 @@
-# ADDON mathjax
-# Copyright (C)
-# This file is distributed under the same license as the Friendica mathjax addon package.
-# 
-# 
-# Translators:
-# Farida Khalaf <faridakhalaf@hotmail.com>, 2021
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2021-02-22 02:37+0000\n"
-"Last-Translator: Farida Khalaf <faridakhalaf@hotmail.com>\n"
-"Language-Team: Arabic (http://www.transifex.com/Friendica/friendica/language/ar/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ar\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-
-#: mathjax.php:43
-msgid ""
-"The MathJax addon renders mathematical formulae written using the LaTeX "
-"syntax surrounded by the usual $$ or an eqnarray block in the postings of "
-"your wall,network tab and private mail."
-msgstr "يعرض ملحق MathJax الصيغ الرياضية المكتوبة باستخدام صيغة LaTeX محاطة بمجموعة $$ أو eqnarray المعتادة في منشورات الحائط وعلامة تبويب الشبكة والبريد الخاص."
-
-#: mathjax.php:44
-msgid "Use the MathJax renderer"
-msgstr "استخدم عارض  MathJax"
-
-#: mathjax.php:45
-msgid "Save Settings"
-msgstr "حفظ الإعدادات"
diff --git a/mathjax/lang/ar/strings.php b/mathjax/lang/ar/strings.php
deleted file mode 100644
index dee257d6..00000000
--- a/mathjax/lang/ar/strings.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_ar")) {
-function string_plural_select_ar($n){
-	$n = intval($n);
-	if ($n==0) { return 0; } else if ($n==1) { return 1; } else if ($n==2) { return 2; } else if ($n%100>=3 && $n%100<=10) { return 3; } else if ($n%100>=11 && $n%100<=99) { return 4; } else  { return 5; }
-}}
-$a->strings['The MathJax addon renders mathematical formulae written using the LaTeX syntax surrounded by the usual $$ or an eqnarray block in the postings of your wall,network tab and private mail.'] = 'يعرض ملحق MathJax الصيغ الرياضية المكتوبة باستخدام صيغة LaTeX محاطة بمجموعة $$ أو eqnarray المعتادة في منشورات الحائط وعلامة تبويب الشبكة والبريد الخاص.';
-$a->strings['Use the MathJax renderer'] = 'استخدم عارض  MathJax';
-$a->strings['Save Settings'] = 'حفظ الإعدادات';
diff --git a/mathjax/lang/cs/messages.po b/mathjax/lang/cs/messages.po
index ae2968be..66d201f6 100644
--- a/mathjax/lang/cs/messages.po
+++ b/mathjax/lang/cs/messages.po
@@ -4,29 +4,50 @@
 # 
 # 
 # Translators:
-# Aditoo, 2018
-# michal_s <msupler@gmail.com>, 2014-2015
+# Michal Šupler <msupler@gmail.com>, 2014-2015
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:15-0500\n"
-"PO-Revision-Date: 2014-06-23 09:55+0000\n"
-"Last-Translator: Aditoo, 2018\n"
-"Language-Team: Czech (http://app.transifex.com/Friendica/friendica/language/cs/)\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2015-02-11 19:38+0000\n"
+"Last-Translator: Michal Šupler <msupler@gmail.com>\n"
+"Language-Team: Czech (http://www.transifex.com/projects/p/friendica/language/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: cs\n"
-"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: mathjax.php:42
+#: mathjax.php:36
+msgid "Settings"
+msgstr "Nastavení"
+
+#: mathjax.php:37
 msgid ""
 "The MathJax addon renders mathematical formulae written using the LaTeX "
 "syntax surrounded by the usual $$ or an eqnarray block in the postings of "
 "your wall,network tab and private mail."
-msgstr "Doplněk MathJax vykresluje matematické vzorce zapsané s použitím syntaxe LaTeX označené obvyklými znaky $$, nebo blok \"eqnarray\"  v příspěvcích na Vaší zdi, záložce Síť a soukromých zprávách."
+msgstr "Rozšíření MathJax vykresluje matematické vzorce zapsané s použitím syntaxe LaTeX označené obvyklými znaky $$ nebo v bloku \"eqnarray\"  v příspěvcích na vaší zdi, záložce síť a soukromých zprávách."
 
-#: mathjax.php:43
+#: mathjax.php:38
 msgid "Use the MathJax renderer"
-msgstr "Použít vykreslování MathJax"
+msgstr "Použít Mathjax vykreslování"
+
+#: mathjax.php:42
+msgid "Submit"
+msgstr "Odeslat"
+
+#: mathjax.php:66
+msgid "Settings updated."
+msgstr "Nastavení aktualizováno."
+
+#: mathjax.php:75
+msgid "MathJax Base URL"
+msgstr "Základní MathJax adresa URL"
+
+#: mathjax.php:75
+msgid ""
+"The URL for the javascript file that should be included to use MathJax. Can "
+"be either the MathJax CDN or another installation of MathJax."
+msgstr "URL adresa na javascriptový soubor, který musí být obsažen pro použití MathJax. Může to být MathJax CDN nebo or jiná instalace MathJax."
diff --git a/mathjax/lang/cs/strings.php b/mathjax/lang/cs/strings.php
index f73b931a..e2d95b45 100644
--- a/mathjax/lang/cs/strings.php
+++ b/mathjax/lang/cs/strings.php
@@ -2,8 +2,13 @@
 
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
-	$n = intval($n);
-	if (($n == 1 && $n % 1 == 0)) { return 0; } else if (($n >= 2 && $n <= 4 && $n % 1 == 0)) { return 1; } else if (($n % 1 != 0 )) { return 2; } else  { return 3; }
+	return ($n==1) ? 0 : ($n>=2 && $n<=4) ? 1 : 2;;
 }}
-$a->strings['The MathJax addon renders mathematical formulae written using the LaTeX syntax surrounded by the usual $$ or an eqnarray block in the postings of your wall,network tab and private mail.'] = 'Doplněk MathJax vykresluje matematické vzorce zapsané s použitím syntaxe LaTeX označené obvyklými znaky $$, nebo blok "eqnarray"  v příspěvcích na Vaší zdi, záložce Síť a soukromých zprávách.';
-$a->strings['Use the MathJax renderer'] = 'Použít vykreslování MathJax';
+;
+$a->strings["Settings"] = "Nastavení";
+$a->strings["The MathJax addon renders mathematical formulae written using the LaTeX syntax surrounded by the usual $$ or an eqnarray block in the postings of your wall,network tab and private mail."] = "Rozšíření MathJax vykresluje matematické vzorce zapsané s použitím syntaxe LaTeX označené obvyklými znaky $$ nebo v bloku \"eqnarray\"  v příspěvcích na vaší zdi, záložce síť a soukromých zprávách.";
+$a->strings["Use the MathJax renderer"] = "Použít Mathjax vykreslování";
+$a->strings["Submit"] = "Odeslat";
+$a->strings["Settings updated."] = "Nastavení aktualizováno.";
+$a->strings["MathJax Base URL"] = "Základní MathJax adresa URL";
+$a->strings["The URL for the javascript file that should be included to use MathJax. Can be either the MathJax CDN or another installation of MathJax."] = "URL adresa na javascriptový soubor, který musí být obsažen pro použití MathJax. Může to být MathJax CDN nebo or jiná instalace MathJax.";
diff --git a/mathjax/lang/da-dk/messages.po b/mathjax/lang/da-dk/messages.po
deleted file mode 100644
index c74f38b9..00000000
--- a/mathjax/lang/da-dk/messages.po
+++ /dev/null
@@ -1,31 +0,0 @@
-# ADDON mathjax
-# Copyright (C)
-# This file is distributed under the same license as the Friendica mathjax addon package.
-# 
-# 
-# Translators:
-# Anton <dev@atjn.dk>, 2022
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:15-0500\n"
-"PO-Revision-Date: 2014-06-23 09:55+0000\n"
-"Last-Translator: Anton <dev@atjn.dk>, 2022\n"
-"Language-Team: Danish (Denmark) (http://www.transifex.com/Friendica/friendica/language/da_DK/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: da_DK\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: mathjax.php:42
-msgid ""
-"The MathJax addon renders mathematical formulae written using the LaTeX "
-"syntax surrounded by the usual $$ or an eqnarray block in the postings of "
-"your wall,network tab and private mail."
-msgstr "MathJax tilføjelsen kan vise matematiske formler som er skrevet i LaTeX syntaksen, omringet af det sædvanlige $$ eller en eqnarray blok i opslagene på din væg, netværksfane eller private mail."
-
-#: mathjax.php:43
-msgid "Use the MathJax renderer"
-msgstr "Brug MathJax renderen"
diff --git a/mathjax/lang/da-dk/strings.php b/mathjax/lang/da-dk/strings.php
deleted file mode 100644
index 5c37ee14..00000000
--- a/mathjax/lang/da-dk/strings.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_da_dk")) {
-function string_plural_select_da_dk($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['The MathJax addon renders mathematical formulae written using the LaTeX syntax surrounded by the usual $$ or an eqnarray block in the postings of your wall,network tab and private mail.'] = 'MathJax tilføjelsen kan vise matematiske formler som er skrevet i LaTeX syntaksen, omringet af det sædvanlige $$ eller en eqnarray blok i opslagene på din væg, netværksfane eller private mail.';
-$a->strings['Use the MathJax renderer'] = 'Brug MathJax renderen';
diff --git a/mathjax/lang/de/messages.po b/mathjax/lang/de/messages.po
index e60d9676..675a853b 100644
--- a/mathjax/lang/de/messages.po
+++ b/mathjax/lang/de/messages.po
@@ -4,31 +4,51 @@
 # 
 # 
 # Translators:
-# Andreas H., 2014
-# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2014
-# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2021
-# Ulf Rompe <transifex.com@rompe.org>, 2019
+# Abrax <webmaster@a-zwenkau.de>, 2014
+# bavatar <tobias.diekershoff@gmx.net>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:15-0500\n"
-"PO-Revision-Date: 2014-06-23 09:55+0000\n"
-"Last-Translator: Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2021\n"
-"Language-Team: German (http://app.transifex.com/Friendica/friendica/language/de/)\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2014-10-15 12:30+0000\n"
+"Last-Translator: Abrax <webmaster@a-zwenkau.de>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/friendica/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: mathjax.php:42
+#: mathjax.php:36
+msgid "Settings"
+msgstr "Einstellungen"
+
+#: mathjax.php:37
 msgid ""
 "The MathJax addon renders mathematical formulae written using the LaTeX "
 "syntax surrounded by the usual $$ or an eqnarray block in the postings of "
 "your wall,network tab and private mail."
-msgstr "Mit dem MathJax Addon können mathematische Formeln, die mit LaTeX geschrieben wurden, dargestellt werden. Die Formel wird mit den üblichen $$ oder einem eqnarray-Block gekennzeichnet. Formeln werden in allen Beiträgen auf deiner Pinnwand, dem Netzwerk-Stream sowie privaten Nachrichten dargestellt."
+msgstr "Mit dem MathJax Addon können mathematische Formeln, die mit LaTeX geschrieben wurden, dargestellt werden. Die Formel wird mit den üblichen $$ oder einem eqnarray Block gekennzeichnet. Formeln werden in allen Beiträgen auf deiner Pinnwand, dem Netzwerkstream sowie privaten Nachrichten gerendert."
 
-#: mathjax.php:43
+#: mathjax.php:38
 msgid "Use the MathJax renderer"
 msgstr "MathJax verwenden"
+
+#: mathjax.php:42
+msgid "Submit"
+msgstr "Senden"
+
+#: mathjax.php:66
+msgid "Settings updated."
+msgstr "Einstellungen aktualisiert."
+
+#: mathjax.php:75
+msgid "MathJax Base URL"
+msgstr "MathJax Basis-URL"
+
+#: mathjax.php:75
+msgid ""
+"The URL for the javascript file that should be included to use MathJax. Can "
+"be either the MathJax CDN or another installation of MathJax."
+msgstr "Die URL der MathJax Javascript-Datei, die verwendet werden soll. Diese kann entweder aus der MathJax CDN oder einer anderen Quelle stammen."
diff --git a/mathjax/lang/de/strings.php b/mathjax/lang/de/strings.php
index ecb861ac..a1ac6f45 100644
--- a/mathjax/lang/de/strings.php
+++ b/mathjax/lang/de/strings.php
@@ -2,8 +2,13 @@
 
 if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['The MathJax addon renders mathematical formulae written using the LaTeX syntax surrounded by the usual $$ or an eqnarray block in the postings of your wall,network tab and private mail.'] = 'Mit dem MathJax Addon können mathematische Formeln, die mit LaTeX geschrieben wurden, dargestellt werden. Die Formel wird mit den üblichen $$ oder einem eqnarray-Block gekennzeichnet. Formeln werden in allen Beiträgen auf deiner Pinnwand, dem Netzwerk-Stream sowie privaten Nachrichten dargestellt.';
-$a->strings['Use the MathJax renderer'] = 'MathJax verwenden';
+;
+$a->strings["Settings"] = "Einstellungen";
+$a->strings["The MathJax addon renders mathematical formulae written using the LaTeX syntax surrounded by the usual $$ or an eqnarray block in the postings of your wall,network tab and private mail."] = "Mit dem MathJax Addon können mathematische Formeln, die mit LaTeX geschrieben wurden, dargestellt werden. Die Formel wird mit den üblichen $$ oder einem eqnarray Block gekennzeichnet. Formeln werden in allen Beiträgen auf deiner Pinnwand, dem Netzwerkstream sowie privaten Nachrichten gerendert.";
+$a->strings["Use the MathJax renderer"] = "MathJax verwenden";
+$a->strings["Submit"] = "Senden";
+$a->strings["Settings updated."] = "Einstellungen aktualisiert.";
+$a->strings["MathJax Base URL"] = "MathJax Basis-URL";
+$a->strings["The URL for the javascript file that should be included to use MathJax. Can be either the MathJax CDN or another installation of MathJax."] = "Die URL der MathJax Javascript-Datei, die verwendet werden soll. Diese kann entweder aus der MathJax CDN oder einer anderen Quelle stammen.";
diff --git a/mathjax/lang/es/messages.po b/mathjax/lang/es/messages.po
index 3af38224..3b2a284b 100644
--- a/mathjax/lang/es/messages.po
+++ b/mathjax/lang/es/messages.po
@@ -5,14 +5,13 @@
 # 
 # Translators:
 # Albert, 2016
-# Senex Petrovic <javierruizo@hotmail.com>, 2021
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2021-04-06 01:11+0000\n"
-"Last-Translator: Senex Petrovic <javierruizo@hotmail.com>\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2016-11-17 22:06+0000\n"
+"Last-Translator: Albert\n"
 "Language-Team: Spanish (http://www.transifex.com/Friendica/friendica/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,17 +19,35 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: mathjax.php:43
+#: mathjax.php:36
+msgid "Settings"
+msgstr "Ajustes"
+
+#: mathjax.php:37
 msgid ""
 "The MathJax addon renders mathematical formulae written using the LaTeX "
 "syntax surrounded by the usual $$ or an eqnarray block in the postings of "
 "your wall,network tab and private mail."
 msgstr "El addon MathJax renderiza las fórmulas matemáticos escritas usando la sintaxis LaTeX rodeada por el usual $$ o un bloque eqnarray en las publicaciones de su muro, etiqueta de red y mail privado."
 
-#: mathjax.php:44
+#: mathjax.php:38
 msgid "Use the MathJax renderer"
 msgstr "Usar el renderizador MathJax"
 
-#: mathjax.php:45
-msgid "Save Settings"
-msgstr "Guardar ajustes"
+#: mathjax.php:42
+msgid "Submit"
+msgstr "Enviar"
+
+#: mathjax.php:66
+msgid "Settings updated."
+msgstr "Ajustes actualizados."
+
+#: mathjax.php:75
+msgid "MathJax Base URL"
+msgstr "URL Base de MathJax"
+
+#: mathjax.php:75
+msgid ""
+"The URL for the javascript file that should be included to use MathJax. Can "
+"be either the MathJax CDN or another installation of MathJax."
+msgstr "La URL para el archivo javascript que debería ser incluído para usar MathJax. Puede ser el CDN de MathJax u otra instalación de MathJax."
diff --git a/mathjax/lang/es/strings.php b/mathjax/lang/es/strings.php
index 322d610f..c2edd566 100644
--- a/mathjax/lang/es/strings.php
+++ b/mathjax/lang/es/strings.php
@@ -2,9 +2,13 @@
 
 if(! function_exists("string_plural_select_es")) {
 function string_plural_select_es($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['The MathJax addon renders mathematical formulae written using the LaTeX syntax surrounded by the usual $$ or an eqnarray block in the postings of your wall,network tab and private mail.'] = 'El addon MathJax renderiza las fórmulas matemáticos escritas usando la sintaxis LaTeX rodeada por el usual $$ o un bloque eqnarray en las publicaciones de su muro, etiqueta de red y mail privado.';
-$a->strings['Use the MathJax renderer'] = 'Usar el renderizador MathJax';
-$a->strings['Save Settings'] = 'Guardar ajustes';
+;
+$a->strings["Settings"] = "Ajustes";
+$a->strings["The MathJax addon renders mathematical formulae written using the LaTeX syntax surrounded by the usual $$ or an eqnarray block in the postings of your wall,network tab and private mail."] = "El addon MathJax renderiza las fórmulas matemáticos escritas usando la sintaxis LaTeX rodeada por el usual $$ o un bloque eqnarray en las publicaciones de su muro, etiqueta de red y mail privado.";
+$a->strings["Use the MathJax renderer"] = "Usar el renderizador MathJax";
+$a->strings["Submit"] = "Enviar";
+$a->strings["Settings updated."] = "Ajustes actualizados.";
+$a->strings["MathJax Base URL"] = "URL Base de MathJax";
+$a->strings["The URL for the javascript file that should be included to use MathJax. Can be either the MathJax CDN or another installation of MathJax."] = "La URL para el archivo javascript que debería ser incluído para usar MathJax. Puede ser el CDN de MathJax u otra instalación de MathJax.";
diff --git a/mathjax/lang/fi-fi/strings.php b/mathjax/lang/fi-fi/strings.php
index 486a7eb9..4a4759b6 100644
--- a/mathjax/lang/fi-fi/strings.php
+++ b/mathjax/lang/fi-fi/strings.php
@@ -2,9 +2,13 @@
 
 if(! function_exists("string_plural_select_fi_fi")) {
 function string_plural_select_fi_fi($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Settings'] = 'Asetukset';
-$a->strings['Submit'] = 'Lähetä';
-$a->strings['Settings updated.'] = 'Asetukset päivitetty.';
+;
+$a->strings["Settings"] = "Asetukset";
+$a->strings["The MathJax addon renders mathematical formulae written using the LaTeX syntax surrounded by the usual $$ or an eqnarray block in the postings of your wall,network tab and private mail."] = "";
+$a->strings["Use the MathJax renderer"] = "";
+$a->strings["Submit"] = "Lähetä";
+$a->strings["Settings updated."] = "Asetukset päivitetty.";
+$a->strings["MathJax Base URL"] = "";
+$a->strings["The URL for the javascript file that should be included to use MathJax. Can be either the MathJax CDN or another installation of MathJax."] = "";
diff --git a/mathjax/lang/fr/messages.po b/mathjax/lang/fr/messages.po
deleted file mode 100644
index 22ec45ee..00000000
--- a/mathjax/lang/fr/messages.po
+++ /dev/null
@@ -1,32 +0,0 @@
-# ADDON mathjax
-# Copyright (C)
-# This file is distributed under the same license as the Friendica mathjax addon package.
-# 
-# 
-# Translators:
-# Hypolite Petovan <hypolite@mrpetovan.com>, 2022
-# StefOfficiel <pichard.stephane@free.fr>, 2015
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:15-0500\n"
-"PO-Revision-Date: 2014-06-23 09:55+0000\n"
-"Last-Translator: Hypolite Petovan <hypolite@mrpetovan.com>, 2022\n"
-"Language-Team: French (http://www.transifex.com/Friendica/friendica/language/fr/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: fr\n"
-"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
-
-#: mathjax.php:42
-msgid ""
-"The MathJax addon renders mathematical formulae written using the LaTeX "
-"syntax surrounded by the usual $$ or an eqnarray block in the postings of "
-"your wall,network tab and private mail."
-msgstr "L'extension MathJax formate des formules mathématiques en LaTeX entourées des classiques $$ ou un bloc eqnarray dans les publications de votre mur, votre timeline et vos messages privés."
-
-#: mathjax.php:43
-msgid "Use the MathJax renderer"
-msgstr "Utiliser le rendu MathJax"
diff --git a/mathjax/lang/fr/strings.php b/mathjax/lang/fr/strings.php
index 7a753827..1057a617 100644
--- a/mathjax/lang/fr/strings.php
+++ b/mathjax/lang/fr/strings.php
@@ -1,9 +1,9 @@
-<?php
-
-if(! function_exists("string_plural_select_fr")) {
-function string_plural_select_fr($n){
-	$n = intval($n);
-	if (($n == 0 || $n == 1)) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
-}}
-$a->strings['The MathJax addon renders mathematical formulae written using the LaTeX syntax surrounded by the usual $$ or an eqnarray block in the postings of your wall,network tab and private mail.'] = 'L\'extension MathJax formate des formules mathématiques en LaTeX entourées des classiques $$ ou un bloc eqnarray dans les publications de votre mur, votre timeline et vos messages privés.';
-$a->strings['Use the MathJax renderer'] = 'Utiliser le rendu MathJax';
+<?php
+
+$a->strings["Settings"] = "Réglages";
+$a->strings["The MathJax addon renders mathematical formulae written using the LaTeX syntax surrounded by the usual $$ or an eqnarray block in the postings of your wall,network tab and private mail."] = "L'extension MathJax affiche les formules mathématiques écrites suivant la syntaxe LaTeX lorsqu'elles sont encadrés par les $$ habituels, ou dans un un bloc eqnarray. Ceci sur le mur, le Réseau et dans les messages privés.";
+$a->strings["Use the MathJax renderer"] = "Utiliser le rendu MathJax";
+$a->strings["Submit"] = "Envoyer";
+$a->strings["Settings updated."] = "Réglages mis à jour.";
+$a->strings["MathJax Base URL"] = "URL de base de MathJax";
+$a->strings["The URL for the javascript file that should be included to use MathJax. Can be either the MathJax CDN or another installation of MathJax."] = "L'URL du fichier Javascript qui doit être inclus pour utiliser MathJax. Ce peut être celle du CDN MathJax, ou bien de toute autre installation de MathJax.";
diff --git a/mathjax/lang/hu/messages.po b/mathjax/lang/hu/messages.po
deleted file mode 100644
index ad610b62..00000000
--- a/mathjax/lang/hu/messages.po
+++ /dev/null
@@ -1,31 +0,0 @@
-# ADDON mathjax
-# Copyright (C)
-# This file is distributed under the same license as the Friendica mathjax addon package.
-# 
-# 
-# Translators:
-# Balázs Úr, 2020-2021
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:15-0500\n"
-"PO-Revision-Date: 2014-06-23 09:55+0000\n"
-"Last-Translator: Balázs Úr, 2020-2021\n"
-"Language-Team: Hungarian (http://www.transifex.com/Friendica/friendica/language/hu/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: hu\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: mathjax.php:42
-msgid ""
-"The MathJax addon renders mathematical formulae written using the LaTeX "
-"syntax surrounded by the usual $$ or an eqnarray block in the postings of "
-"your wall,network tab and private mail."
-msgstr "A MathJax bővítmény a LaTeX szintaxis használatával írt matematikai képleteket jelenít meg, amelyeket a szokásos $$ vagy egy eqnarray blokk vesz körül a falán lévő bejegyzésekben, a hálózat lapon és a személyes levelekben."
-
-#: mathjax.php:43
-msgid "Use the MathJax renderer"
-msgstr "A MathJax megjelenítő használata"
diff --git a/mathjax/lang/hu/strings.php b/mathjax/lang/hu/strings.php
deleted file mode 100644
index 602a1717..00000000
--- a/mathjax/lang/hu/strings.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_hu")) {
-function string_plural_select_hu($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['The MathJax addon renders mathematical formulae written using the LaTeX syntax surrounded by the usual $$ or an eqnarray block in the postings of your wall,network tab and private mail.'] = 'A MathJax bővítmény a LaTeX szintaxis használatával írt matematikai képleteket jelenít meg, amelyeket a szokásos $$ vagy egy eqnarray blokk vesz körül a falán lévő bejegyzésekben, a hálózat lapon és a személyes levelekben.';
-$a->strings['Use the MathJax renderer'] = 'A MathJax megjelenítő használata';
diff --git a/mathjax/lang/it/messages.po b/mathjax/lang/it/messages.po
index 9aa6154f..f44812c3 100644
--- a/mathjax/lang/it/messages.po
+++ b/mathjax/lang/it/messages.po
@@ -5,28 +5,49 @@
 # 
 # Translators:
 # fabrixxm <fabrix.xm@gmail.com>, 2014-2015
-# Sylke Vicious <silkevicious@gmail.com>, 2021
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:15-0500\n"
-"PO-Revision-Date: 2014-06-23 09:55+0000\n"
-"Last-Translator: Sylke Vicious <silkevicious@gmail.com>, 2021\n"
-"Language-Team: Italian (http://app.transifex.com/Friendica/friendica/language/it/)\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2015-08-31 10:19+0000\n"
+"Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n"
+"Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: it\n"
-"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: mathjax.php:42
+#: mathjax.php:36
+msgid "Settings"
+msgstr "Impostazioni"
+
+#: mathjax.php:37
 msgid ""
 "The MathJax addon renders mathematical formulae written using the LaTeX "
 "syntax surrounded by the usual $$ or an eqnarray block in the postings of "
 "your wall,network tab and private mail."
-msgstr "Il plugin \"MatJax\" renderizza formule matematiche scritta usando la sintassi LaTeX circondate dalle usuali $$ o un blocco eqnarray nei messaggi della tua bacheca, pagina Rete e messaggi privati."
+msgstr "Iladdon\"MatJax\" renderizza formule matematiche scritta usando la sintassi LaTeX circondate dalle usuali $$ o un blocco eqnarray nei messaggi della tua bacheca, pagina Rete e messaggi privati."
 
-#: mathjax.php:43
+#: mathjax.php:38
 msgid "Use the MathJax renderer"
 msgstr "Usa il render MathJax"
+
+#: mathjax.php:42
+msgid "Submit"
+msgstr "Invia"
+
+#: mathjax.php:66
+msgid "Settings updated."
+msgstr "Impostazioni aggiornate."
+
+#: mathjax.php:75
+msgid "MathJax Base URL"
+msgstr "Indirizzo di base di MathJax"
+
+#: mathjax.php:75
+msgid ""
+"The URL for the javascript file that should be included to use MathJax. Can "
+"be either the MathJax CDN or another installation of MathJax."
+msgstr "L'indirizzo per il file javascript che deve essere incluso per usare MathJax. Può essere sul CDN di MathJax o in un'altra installazione di MathJax."
diff --git a/mathjax/lang/it/strings.php b/mathjax/lang/it/strings.php
index f5580a39..17439338 100644
--- a/mathjax/lang/it/strings.php
+++ b/mathjax/lang/it/strings.php
@@ -2,8 +2,13 @@
 
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
-	$n = intval($n);
-	if ($n == 1) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
+	return ($n != 1);;
 }}
-$a->strings['The MathJax addon renders mathematical formulae written using the LaTeX syntax surrounded by the usual $$ or an eqnarray block in the postings of your wall,network tab and private mail.'] = 'Il plugin "MatJax" renderizza formule matematiche scritta usando la sintassi LaTeX circondate dalle usuali $$ o un blocco eqnarray nei messaggi della tua bacheca, pagina Rete e messaggi privati.';
-$a->strings['Use the MathJax renderer'] = 'Usa il render MathJax';
+;
+$a->strings["Settings"] = "Impostazioni";
+$a->strings["The MathJax addon renders mathematical formulae written using the LaTeX syntax surrounded by the usual $$ or an eqnarray block in the postings of your wall,network tab and private mail."] = "Iladdon\"MatJax\" renderizza formule matematiche scritta usando la sintassi LaTeX circondate dalle usuali $$ o un blocco eqnarray nei messaggi della tua bacheca, pagina Rete e messaggi privati.";
+$a->strings["Use the MathJax renderer"] = "Usa il render MathJax";
+$a->strings["Submit"] = "Invia";
+$a->strings["Settings updated."] = "Impostazioni aggiornate.";
+$a->strings["MathJax Base URL"] = "Indirizzo di base di MathJax";
+$a->strings["The URL for the javascript file that should be included to use MathJax. Can be either the MathJax CDN or another installation of MathJax."] = "L'indirizzo per il file javascript che deve essere incluso per usare MathJax. Può essere sul CDN di MathJax o in un'altra installazione di MathJax.";
diff --git a/mathjax/lang/nl/strings.php b/mathjax/lang/nl/strings.php
index 82dea964..b7506ec8 100644
--- a/mathjax/lang/nl/strings.php
+++ b/mathjax/lang/nl/strings.php
@@ -3,12 +3,13 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Settings'] = 'Instellingen';
-$a->strings['The MathJax addon renders mathematical formulae written using the LaTeX syntax surrounded by the usual $$ or an eqnarray block in the postings of your wall,network tab and private mail.'] = 'De MathJax addon zorgt voor de opmaak van wiskundige formules die geschreven zijn met de LaTeX syntax, omgeven door de gebruikelijke $$ of een eqnarray blok in de berichten op je tijdlijn, netwerk tab en privé mail.';
-$a->strings['Use the MathJax renderer'] = 'Gebruik de MathJax opmaak';
-$a->strings['Submit'] = 'Toepassen';
-$a->strings['Settings updated.'] = 'Instellingen aangepast.';
-$a->strings['MathJax Base URL'] = 'MathJax Basis URL';
-$a->strings['The URL for the javascript file that should be included to use MathJax. Can be either the MathJax CDN or another installation of MathJax.'] = 'De URL voor het javascript bestand nodig is om MathJax te gebruiken. Dit kan ofwel de MathJax CDN zijn of een andere installatie van MathJax.';
+;
+$a->strings["Settings"] = "Instellingen";
+$a->strings["The MathJax addon renders mathematical formulae written using the LaTeX syntax surrounded by the usual $$ or an eqnarray block in the postings of your wall,network tab and private mail."] = "De MathJax addon zorgt voor de opmaak van wiskundige formules die geschreven zijn met de LaTeX syntax, omgeven door de gebruikelijke $$ of een eqnarray blok in de berichten op je tijdlijn, netwerk tab en privé mail.";
+$a->strings["Use the MathJax renderer"] = "Gebruik de MathJax opmaak";
+$a->strings["Submit"] = "Toepassen";
+$a->strings["Settings updated."] = "Instellingen aangepast.";
+$a->strings["MathJax Base URL"] = "MathJax Basis URL";
+$a->strings["The URL for the javascript file that should be included to use MathJax. Can be either the MathJax CDN or another installation of MathJax."] = "De URL voor het javascript bestand nodig is om MathJax te gebruiken. Dit kan ofwel de MathJax CDN zijn of een andere installatie van MathJax.";
diff --git a/mathjax/lang/pl/messages.po b/mathjax/lang/pl/messages.po
index 91249afb..63c56a11 100644
--- a/mathjax/lang/pl/messages.po
+++ b/mathjax/lang/pl/messages.po
@@ -4,14 +4,14 @@
 # 
 # 
 # Translators:
-# Waldemar Stoczkowski, 2018
+# Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:15-0500\n"
-"PO-Revision-Date: 2014-06-23 09:55+0000\n"
-"Last-Translator: Waldemar Stoczkowski, 2018\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2018-04-01 14:40+0000\n"
+"Last-Translator: Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.com/Friendica/friendica/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,13 +19,35 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
-#: mathjax.php:42
+#: mathjax.php:36
+msgid "Settings"
+msgstr "Ustawienia"
+
+#: mathjax.php:37
 msgid ""
 "The MathJax addon renders mathematical formulae written using the LaTeX "
 "syntax surrounded by the usual $$ or an eqnarray block in the postings of "
 "your wall,network tab and private mail."
 msgstr "Dodatek MathJax renderuje formuły matematyczne napisane przy użyciu składni LaTeX otoczonej zwykłym blokiem $$ lub eqnarray w wiadomościach na ścianie, karcie sieciowej i prywatnej korespondencji."
 
-#: mathjax.php:43
+#: mathjax.php:38
 msgid "Use the MathJax renderer"
 msgstr "Użyj renderer MathJax"
+
+#: mathjax.php:42
+msgid "Submit"
+msgstr "Wyślij"
+
+#: mathjax.php:66
+msgid "Settings updated."
+msgstr "Ustawienia zaktualizowane."
+
+#: mathjax.php:75
+msgid "MathJax Base URL"
+msgstr "Podstawowy adres URL MathJax"
+
+#: mathjax.php:75
+msgid ""
+"The URL for the javascript file that should be included to use MathJax. Can "
+"be either the MathJax CDN or another installation of MathJax."
+msgstr "Adres URL pliku javascript, który powinien być dołączony do korzystania z MathJax. Może to być MathJax CDN lub inna instalacja MathJax."
diff --git a/mathjax/lang/pl/strings.php b/mathjax/lang/pl/strings.php
index 512525c0..e41e98c0 100644
--- a/mathjax/lang/pl/strings.php
+++ b/mathjax/lang/pl/strings.php
@@ -2,8 +2,13 @@
 
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
-	$n = intval($n);
-	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
+	return ($n==1 ? 0 : ($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14) ? 1 : $n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14) ? 2 : 3);;
 }}
-$a->strings['The MathJax addon renders mathematical formulae written using the LaTeX syntax surrounded by the usual $$ or an eqnarray block in the postings of your wall,network tab and private mail.'] = 'Dodatek MathJax renderuje formuły matematyczne napisane przy użyciu składni LaTeX otoczonej zwykłym blokiem $$ lub eqnarray w wiadomościach na ścianie, karcie sieciowej i prywatnej korespondencji.';
-$a->strings['Use the MathJax renderer'] = 'Użyj renderer MathJax';
+;
+$a->strings["Settings"] = "Ustawienia";
+$a->strings["The MathJax addon renders mathematical formulae written using the LaTeX syntax surrounded by the usual $$ or an eqnarray block in the postings of your wall,network tab and private mail."] = "Dodatek MathJax renderuje formuły matematyczne napisane przy użyciu składni LaTeX otoczonej zwykłym blokiem $$ lub eqnarray w wiadomościach na ścianie, karcie sieciowej i prywatnej korespondencji.";
+$a->strings["Use the MathJax renderer"] = "Użyj renderer MathJax";
+$a->strings["Submit"] = "Wyślij";
+$a->strings["Settings updated."] = "Ustawienia zaktualizowane.";
+$a->strings["MathJax Base URL"] = "Podstawowy adres URL MathJax";
+$a->strings["The URL for the javascript file that should be included to use MathJax. Can be either the MathJax CDN or another installation of MathJax."] = "Adres URL pliku javascript, który powinien być dołączony do korzystania z MathJax. Może to być MathJax CDN lub inna instalacja MathJax.";
diff --git a/mathjax/lang/ro/strings.php b/mathjax/lang/ro/strings.php
index 688dd7b6..98b38cf0 100644
--- a/mathjax/lang/ro/strings.php
+++ b/mathjax/lang/ro/strings.php
@@ -2,13 +2,13 @@
 
 if(! function_exists("string_plural_select_ro")) {
 function string_plural_select_ro($n){
-	$n = intval($n);
-	if ($n==1) { return 0; } else if ((($n%100>19)||(($n%100==0)&&($n!=0)))) { return 2; } else  { return 1; }
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
 }}
-$a->strings['Settings'] = 'Configurări';
-$a->strings['The MathJax addon renders mathematical formulae written using the LaTeX syntax surrounded by the usual $$ or an eqnarray block in the postings of your wall,network tab and private mail.'] = 'Suplimentul MathJax procesează formule matematice scrise folosind sintaxa LaTeX încapsulată de obicei prin semnul $$ sau într-un bloc eqnarray, în postările de perete, fila de rețea și şi poșta privată.';
-$a->strings['Use the MathJax renderer'] = 'Utilizare funcția renderer MathJax';
-$a->strings['Submit'] = 'Trimite';
-$a->strings['Settings updated.'] = 'Configurări actualizate.';
-$a->strings['MathJax Base URL'] = 'Adresa URL de Bază MathJax';
-$a->strings['The URL for the javascript file that should be included to use MathJax. Can be either the MathJax CDN or another installation of MathJax.'] = 'Adresa URL pentru fișierul de javascript care ar trebui să fie inclus pentru a putea utiliza MathJax. Pot fi, fie CDN MathJax sau o altă instalare de MathJax.';
+;
+$a->strings["Settings"] = "Configurări";
+$a->strings["The MathJax addon renders mathematical formulae written using the LaTeX syntax surrounded by the usual $$ or an eqnarray block in the postings of your wall,network tab and private mail."] = "Suplimentul MathJax procesează formule matematice scrise folosind sintaxa LaTeX încapsulată de obicei prin semnul $$ sau într-un bloc eqnarray, în postările de perete, fila de rețea și şi poșta privată.";
+$a->strings["Use the MathJax renderer"] = "Utilizare funcția renderer MathJax";
+$a->strings["Submit"] = "Trimite";
+$a->strings["Settings updated."] = "Configurări actualizate.";
+$a->strings["MathJax Base URL"] = "Adresa URL de Bază MathJax";
+$a->strings["The URL for the javascript file that should be included to use MathJax. Can be either the MathJax CDN or another installation of MathJax."] = "Adresa URL pentru fișierul de javascript care ar trebui să fie inclus pentru a putea utiliza MathJax. Pot fi, fie CDN MathJax sau o altă instalare de MathJax.";
diff --git a/mathjax/lang/sv/messages.po b/mathjax/lang/sv/messages.po
deleted file mode 100644
index 8180d9ba..00000000
--- a/mathjax/lang/sv/messages.po
+++ /dev/null
@@ -1,32 +0,0 @@
-# ADDON mathjax
-# Copyright (C)
-# This file is distributed under the same license as the Friendica mathjax addon package.
-# 
-# 
-# Translators:
-# Hypolite Petovan <hypolite@mrpetovan.com>, 2019
-# Kristoffer Grundström <lovaren@gmail.com>, 2022
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:15-0500\n"
-"PO-Revision-Date: 2022-01-16 00:45+0000\n"
-"Last-Translator: Kristoffer Grundström <lovaren@gmail.com>\n"
-"Language-Team: Swedish (http://www.transifex.com/Friendica/friendica/language/sv/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: sv\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: mathjax.php:42
-msgid ""
-"The MathJax addon renders mathematical formulae written using the LaTeX "
-"syntax surrounded by the usual $$ or an eqnarray block in the postings of "
-"your wall,network tab and private mail."
-msgstr ""
-
-#: mathjax.php:43
-msgid "Use the MathJax renderer"
-msgstr "Använd renderaren MathJax"
diff --git a/mathjax/lang/sv/strings.php b/mathjax/lang/sv/strings.php
index f92d3125..18cbdda8 100644
--- a/mathjax/lang/sv/strings.php
+++ b/mathjax/lang/sv/strings.php
@@ -1,8 +1,5 @@
-<?php
-
-if(! function_exists("string_plural_select_sv")) {
-function string_plural_select_sv($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Use the MathJax renderer'] = 'Använd renderaren MathJax';
+<?php
+
+$a->strings["Settings"] = "Inst&auml;llningar";
+$a->strings["Submit"] = "Spara";
+$a->strings["Settings updated."] = "Inst&auml;llningarna har uppdaterats.";
diff --git a/mathjax/lang/zh-cn/strings.php b/mathjax/lang/zh-cn/strings.php
index 1d0b1055..05103a5d 100644
--- a/mathjax/lang/zh-cn/strings.php
+++ b/mathjax/lang/zh-cn/strings.php
@@ -2,10 +2,13 @@
 
 if(! function_exists("string_plural_select_zh_cn")) {
 function string_plural_select_zh_cn($n){
-	$n = intval($n);
-	return intval(0);
+	return 0;;
 }}
-$a->strings['Settings'] = '设置';
-$a->strings['Use the MathJax renderer'] = '使用 MathJax 渲染';
-$a->strings['Submit'] = '提交';
-$a->strings['Settings updated.'] = '设置已更新';
+;
+$a->strings["Settings"] = "设置";
+$a->strings["The MathJax addon renders mathematical formulae written using the LaTeX syntax surrounded by the usual $$ or an eqnarray block in the postings of your wall,network tab and private mail."] = "";
+$a->strings["Use the MathJax renderer"] = "使用 MathJax 渲染";
+$a->strings["Submit"] = "提交";
+$a->strings["Settings updated."] = "设置已更新";
+$a->strings["MathJax Base URL"] = "";
+$a->strings["The URL for the javascript file that should be included to use MathJax. Can be either the MathJax CDN or another installation of MathJax."] = "";
diff --git a/mathjax/mathjax.php b/mathjax/mathjax.php
index d0046cf7..6e80d68f 100644
--- a/mathjax/mathjax.php
+++ b/mathjax/mathjax.php
@@ -10,8 +10,9 @@
 
 use Friendica\App;
 use Friendica\Core\Hook;
+use Friendica\Core\L10n;
+use Friendica\Core\PConfig;
 use Friendica\Core\Renderer;
-use Friendica\DI;
 
 function mathjax_install()
 {
@@ -20,42 +21,50 @@ function mathjax_install()
 	Hook::register('addon_settings_post', __FILE__, 'mathjax_settings_post');
 }
 
-function mathjax_settings_post()
+function mathjax_uninstall()
 {
-	if (!DI::userSession()->getLocalUserId() || empty($_POST['mathjax-submit'])) {
-		return;
-	}
+	Hook::unregister('footer'             , __FILE__, 'mathjax_footer');
+	Hook::unregister('addon_settings'     , __FILE__, 'mathjax_settings');
+	Hook::unregister('addon_settings_post', __FILE__, 'mathjax_settings_post');
 
-	DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'mathjax', 'use', intval($_POST['mathjax_use']));
+	// Legacy hooks
+	Hook::unregister('load_config'        , __FILE__, 'mathjax_load_config');
+	Hook::unregister('page_header'        , __FILE__, 'mathjax_page_header');
+	Hook::unregister('template_vars'      , __FILE__, 'mathjax_template_vars');
 }
 
-function mathjax_settings(array &$data)
+function mathjax_settings_post($a)
 {
-	if (!DI::userSession()->getLocalUserId()) {
+	if (!local_user() || empty($_POST['mathjax-submit'])) {
 		return;
 	}
 
-	$use = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'mathjax', 'use', false);
+	PConfig::set(local_user(), 'mathjax', 'use', intval($_POST['mathjax_use']));
+}
 
-	$tpl = Renderer::getMarkupTemplate('settings.tpl', 'addon/mathjax');
-	$html = Renderer::replaceMacros($tpl, [
-		'$description'  => DI::l10n()->t('The MathJax addon renders mathematical formulae written using the LaTeX syntax surrounded by the usual $$ or an eqnarray block in the postings of your wall,network tab and private mail.'),
-		'$mathjax_use'  => ['mathjax_use', DI::l10n()->t('Use the MathJax renderer'), $use, ''],
+function mathjax_settings(App $a, &$s)
+{
+	if (!local_user()) {
+		return;
+	}
+
+	$use = PConfig::get(local_user(), 'mathjax', 'use', false);
+
+	$tpl = Renderer::getMarkupTemplate('settings.tpl', __DIR__);
+	$s .= Renderer::replaceMacros($tpl, [
+		'$title'        => 'MathJax',
+		'$description'  => L10n::t('The MathJax addon renders mathematical formulae written using the LaTeX syntax surrounded by the usual $$ or an eqnarray block in the postings of your wall,network tab and private mail.'),
+		'$mathjax_use'  => ['mathjax_use', L10n::t('Use the MathJax renderer'), $use, ''],
+		'$savesettings' => L10n::t('Save Settings'),
 	]);
-
-	$data = [
-		'addon' => 'mathjax',
-		'title' => 'MathJax',
-		'html'  => $html,
-	];
 }
 
-function mathjax_footer(string &$body)
+function mathjax_footer(App $a, &$b)
 {
 	//  if the visitor of the page is not a local_user, use MathJax
 	//  otherwise check the users settings.
-	if (!DI::userSession()->getLocalUserId() || DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'mathjax', 'use', false)) {
-		DI::page()->registerFooterScript(__DIR__ . '/asset/MathJax.js?config=TeX-MML-AM_CHTML');
-		DI::page()->registerFooterScript(__DIR__ . '/mathjax.js');
+	if (!local_user() || PConfig::get(local_user(), 'mathjax', 'use', false)) {
+		$a->registerFooterScript(__DIR__ . '/asset/MathJax.js?config=TeX-MML-AM_CHTML');
+		$a->registerFooterScript(__DIR__ . '/mathjax.js');
 	}
 }
diff --git a/mathjax/templates/settings.tpl b/mathjax/templates/settings.tpl
index 0966595f..e26e5a2b 100644
--- a/mathjax/templates/settings.tpl
+++ b/mathjax/templates/settings.tpl
@@ -1,2 +1,16 @@
-<p>{{$description}}</p>
-{{include file="field_checkbox.tpl" field=$mathjax_use}}
+
+<span id="settings_mathjax_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose('settings_mathjax_expanded'); openClose('settings_mathjax_inflated');">
+	<h3>{{$title}}</h3>
+</span>
+<div id="settings_mathjax_expanded" class="settings-block" style="display: none;">
+	<span class="fakelink" onclick="openClose('settings_mathjax_expanded'); openClose('settings_mathjax_inflated');">
+		<h3>{{$title}}</h3>
+	</span>
+	<p>{{$description nofilter}}</p>
+	{{include file="field_checkbox.tpl" field=$mathjax_use}}
+	<div class="clear"></div>
+
+	<div class="settings-submit-wrapper">
+		<button type="submit" id="mathjax-submit" name="mathjax-submit" class="settings-submit" value="1">{{$savesettings}}</button>
+	</div>
+</div>
\ No newline at end of file
diff --git a/membersince/lang/C/messages.po b/membersince/lang/C/messages.po
index 031f2ed9..fc125bc5 100644
--- a/membersince/lang/C/messages.po
+++ b/membersince/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,6 +17,6 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: membersince.php:37 membersince.php:52
+#: membersince.php:18
 msgid "Member since:"
 msgstr ""
diff --git a/membersince/membersince.php b/membersince/membersince.php
index f8128eb7..32edac27 100644
--- a/membersince/membersince.php
+++ b/membersince/membersince.php
@@ -7,9 +7,8 @@
  * Status: Unsupported
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
-use Friendica\DI;
+use Friendica\Core\L10n;
 use Friendica\Util\DateTimeFormat;
 
 function membersince_install()
@@ -17,9 +16,14 @@ function membersince_install()
 	Hook::register('profile_advanced', 'addon/membersince/membersince.php', 'membersince_display');
 }
 
-function membersince_display(array &$b)
+function membersince_uninstall()
 {
-	if (DI::app()->getCurrentTheme() == 'frio') {
+	Hook::unregister('profile_advanced', 'addon/membersince/membersince.php', 'membersince_display');
+}
+
+function membersince_display(Friendica\App $a, &$b)
+{
+	if ($a->getCurrentTheme() == 'frio') {
 		// Works in Frio.
 		$doc = new DOMDocument();
 		$doc->loadHTML(mb_convert_encoding($b, 'HTML-ENTITIES', 'UTF-8'));
@@ -35,11 +39,11 @@ function membersince_display(array &$b)
 		$hr->setAttribute('class','profile-separator');
 
 		// The label div.
-		$label = $doc->createElement('div', DI::l10n()->t('Member since:'));
+		$label = $doc->createElement('div', L10n::t('Member since:'));
 		$label->setAttribute('class', 'col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted');
 
 		// The div for the register date of the profile owner.
-		$entry = $doc->createElement('div', DateTimeFormat::local(DI::app()->profile['register_date']));
+		$entry = $doc->createElement('div', DateTimeFormat::local($a->profile['register_date']));
 		$entry->setAttribute('class', 'col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry');
 
 		$div->appendChild($hr);
@@ -50,6 +54,6 @@ function membersince_display(array &$b)
 		$b = $doc->saveHTML();
 	} else {
 		// Works in Vier.
-		$b = preg_replace('/<\/dl>/', "</dl>\n\n\n<dl id=\"aprofile-membersince\" class=\"aprofile\">\n<dt>" . DI::l10n()->t('Member since:') . "</dt>\n<dd>" . DateTimeFormat::local(DI::app()->profile['register_date']) . "</dd>\n</dl>", $b, 1);
+		$b = preg_replace('/<\/dl>/', "</dl>\n\n\n<dl id=\"aprofile-membersince\" class=\"aprofile\">\n<dt>" . L10n::t('Member since:') . "</dt>\n<dd>" . DateTimeFormat::local($a->profile['register_date']) . "</dd>\n</dl>", $b, 1);
 	}
 }
diff --git a/monolog/composer.json b/monolog/composer.json
deleted file mode 100644
index 9cf42dbe..00000000
--- a/monolog/composer.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "name": "friendica-addons/monolog",
-    "description": "Monolog can send your logs to files, sockets, inboxes, database, etc..",
-    "type": "friendica-addon",
-    "authors": [
-        {
-            "name": "Philipp Holzer",
-            "email": "admin@philipp.info",
-            "homepage": "https://blog.philipp.info",
-            "role": "Developer"
-        }
-    ],
-    "require": {
-        "php": ">=7.3",
-        "monolog/monolog": "^2.9"
-    },
-    "license": "3-clause BSD license",
-    "config": {
-        "platform": {
-            "php": "7.4"
-        },
-        "optimize-autoloader": true,
-        "autoloader-suffix": "MonologAddon",
-        "preferred-install": "dist"
-    }
-}
diff --git a/monolog/composer.lock b/monolog/composer.lock
deleted file mode 100644
index 5d1da32f..00000000
--- a/monolog/composer.lock
+++ /dev/null
@@ -1,169 +0,0 @@
-{
-    "_readme": [
-        "This file locks the dependencies of your project to a known state",
-        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
-        "This file is @generated automatically"
-    ],
-    "content-hash": "037f2db47e77c9af2960dde65ebafa8d",
-    "packages": [
-        {
-            "name": "monolog/monolog",
-            "version": "2.9.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/Seldaek/monolog.git",
-                "reference": "437cb3628f4cf6042cc10ae97fc2b8472e48ca1f"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/437cb3628f4cf6042cc10ae97fc2b8472e48ca1f",
-                "reference": "437cb3628f4cf6042cc10ae97fc2b8472e48ca1f",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.2",
-                "psr/log": "^1.0.1 || ^2.0 || ^3.0"
-            },
-            "provide": {
-                "psr/log-implementation": "1.0.0 || 2.0.0 || 3.0.0"
-            },
-            "require-dev": {
-                "aws/aws-sdk-php": "^2.4.9 || ^3.0",
-                "doctrine/couchdb": "~1.0@dev",
-                "elasticsearch/elasticsearch": "^7 || ^8",
-                "ext-json": "*",
-                "graylog2/gelf-php": "^1.4.2 || ^2@dev",
-                "guzzlehttp/guzzle": "^7.4",
-                "guzzlehttp/psr7": "^2.2",
-                "mongodb/mongodb": "^1.8",
-                "php-amqplib/php-amqplib": "~2.4 || ^3",
-                "phpspec/prophecy": "^1.15",
-                "phpstan/phpstan": "^0.12.91",
-                "phpunit/phpunit": "^8.5.14",
-                "predis/predis": "^1.1 || ^2.0",
-                "rollbar/rollbar": "^1.3 || ^2 || ^3",
-                "ruflin/elastica": "^7",
-                "swiftmailer/swiftmailer": "^5.3|^6.0",
-                "symfony/mailer": "^5.4 || ^6",
-                "symfony/mime": "^5.4 || ^6"
-            },
-            "suggest": {
-                "aws/aws-sdk-php": "Allow sending log messages to AWS services like DynamoDB",
-                "doctrine/couchdb": "Allow sending log messages to a CouchDB server",
-                "elasticsearch/elasticsearch": "Allow sending log messages to an Elasticsearch server via official client",
-                "ext-amqp": "Allow sending log messages to an AMQP server (1.0+ required)",
-                "ext-curl": "Required to send log messages using the IFTTTHandler, the LogglyHandler, the SendGridHandler, the SlackWebhookHandler or the TelegramBotHandler",
-                "ext-mbstring": "Allow to work properly with unicode symbols",
-                "ext-mongodb": "Allow sending log messages to a MongoDB server (via driver)",
-                "ext-openssl": "Required to send log messages using SSL",
-                "ext-sockets": "Allow sending log messages to a Syslog server (via UDP driver)",
-                "graylog2/gelf-php": "Allow sending log messages to a GrayLog2 server",
-                "mongodb/mongodb": "Allow sending log messages to a MongoDB server (via library)",
-                "php-amqplib/php-amqplib": "Allow sending log messages to an AMQP server using php-amqplib",
-                "rollbar/rollbar": "Allow sending log messages to Rollbar",
-                "ruflin/elastica": "Allow sending log messages to an Elastic Search server"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-main": "2.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Monolog\\": "src/Monolog"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Jordi Boggiano",
-                    "email": "j.boggiano@seld.be",
-                    "homepage": "https://seld.be"
-                }
-            ],
-            "description": "Sends your logs to files, sockets, inboxes, databases and various web services",
-            "homepage": "https://github.com/Seldaek/monolog",
-            "keywords": [
-                "log",
-                "logging",
-                "psr-3"
-            ],
-            "funding": [
-                {
-                    "url": "https://github.com/Seldaek",
-                    "type": "github"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/monolog/monolog",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2023-10-27T15:25:26+00:00"
-        },
-        {
-            "name": "psr/log",
-            "version": "1.1.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/php-fig/log.git",
-                "reference": "d49695b909c3b7628b6289db5479a1c204601f11"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/log/zipball/d49695b909c3b7628b6289db5479a1c204601f11",
-                "reference": "d49695b909c3b7628b6289db5479a1c204601f11",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.1.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Psr\\Log\\": "Psr/Log/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "PHP-FIG",
-                    "homepage": "https://www.php-fig.org/"
-                }
-            ],
-            "description": "Common interface for logging libraries",
-            "homepage": "https://github.com/php-fig/log",
-            "keywords": [
-                "log",
-                "psr",
-                "psr-3"
-            ],
-            "time": "2021-05-03T11:20:27+00:00"
-        }
-    ],
-    "packages-dev": [],
-    "aliases": [],
-    "minimum-stability": "stable",
-    "stability-flags": [],
-    "prefer-stable": false,
-    "prefer-lowest": false,
-    "platform": {
-        "php": ">=7.3"
-    },
-    "platform-dev": [],
-    "platform-overrides": {
-        "php": "7.4"
-    },
-    "plugin-api-version": "1.1.0"
-}
diff --git a/monolog/monolog.php b/monolog/monolog.php
deleted file mode 100644
index b13efff9..00000000
--- a/monolog/monolog.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-/*
- * Name: Monolog
- * Description: A Logging framework with lots of additions (see [Monolog](https://github.com/Seldaek/monolog/)). There are just Friendica additions inside the src directory
- * Version: 1.0
- * Author: Philipp Holzer
- */
diff --git a/monolog/src/Factory/Monolog.php b/monolog/src/Factory/Monolog.php
deleted file mode 100644
index c5c69824..00000000
--- a/monolog/src/Factory/Monolog.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-
-namespace Friendica\Addon\monolog\src\Factory;
-
-use Friendica\Addon\monolog\src\Monolog\IntrospectionProcessor;
-use Friendica\Core\Config\Capability\IManageConfigValues;
-use Friendica\Core\Logger\Factory\AbstractLoggerTypeFactory;
-use Monolog\Formatter\LineFormatter;
-use Monolog\Handler\StreamHandler;
-use Monolog\Logger;
-use Monolog\Processor\ProcessIdProcessor;
-use Monolog\Processor\PsrLogMessageProcessor;
-use Monolog\Processor\UidProcessor;
-use Psr\Log\LoggerInterface;
-use Psr\Log\LogLevel;
-
-require_once __DIR__ . '/../../vendor/autoload.php';
-
-class Monolog extends AbstractLoggerTypeFactory
-{
-	public function create(IManageConfigValues $config, string $loglevel = null): LoggerInterface
-	{
-		$loggerTimeZone = new \DateTimeZone('UTC');
-
-		$logger = new Logger($this->channel);
-		$logger->setTimezone($loggerTimeZone);
-		$logger->pushProcessor(new PsrLogMessageProcessor());
-		$logger->pushProcessor(new ProcessIdProcessor());
-		$logger->pushProcessor(new UidProcessor());
-		$logger->pushProcessor(new IntrospectionProcessor($this->introspection, LogLevel::DEBUG));
-
-		$logfile = $config->get('system', 'logfile');
-
-		// just add a stream in case it's either writable or not file
-		if (is_writable($logfile)) {
-			$loglevel = $loglevel ?? static::mapLegacyConfigDebugLevel($config->get('system', 'loglevel'));
-			$loglevel = Logger::toMonologLevel($loglevel);
-
-			// fallback to notice if an invalid loglevel is set
-			if (!is_int($loglevel)) {
-				$loglevel = LogLevel::NOTICE;
-			}
-
-			$fileHandler = new StreamHandler($logfile, $loglevel);
-
-			$formatter = new LineFormatter("%datetime% %channel% [%level_name%]: %message% %context% %extra%\n");
-			$fileHandler->setFormatter($formatter);
-
-			$logger->pushHandler($fileHandler);
-		}
-
-		return $logger;
-	}
-}
diff --git a/monolog/src/Monolog/DevelopHandler.php b/monolog/src/Monolog/DevelopHandler.php
deleted file mode 100644
index 735ebac7..00000000
--- a/monolog/src/Monolog/DevelopHandler.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-/**
- * @copyright Copyright (C) 2010-2023, the Friendica project
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- *
- */
-
-namespace Friendica\Addon\monolog\src\Monolog;
-
-use Friendica\App\Request;
-use Monolog\Handler;
-use Monolog\Logger;
-
-/**
- * Simple handler for Friendica developers to use for deeper logging
- *
- * If you want to debug only interactions from your IP or the IP of a remote server for federation debug,
- * you'll use Logger::develop() for the duration of your work, and you clean it up when you're done before submitting your PR.
- */
-class DevelopHandler extends Handler\AbstractHandler
-{
-	/**
-	 * @var string The IP of the developer who wants to debug
-	 */
-	private $developerIp;
-
-	/**
-	 * @var string The IP of the current request
-	 */
-	private $remoteAddress;
-
-	/**
-	 * @param Request $request     The current http request
-	 * @param string  $developerIp The IP of the developer who wants to debug
-	 * @param int     $level       The minimum logging level at which this handler will be triggered
-	 * @param bool    $bubble      Whether the messages that are handled can bubble up the stack or not
-	 */
-	public function __construct(Request $request, $developerIp, int $level = Logger::DEBUG, bool $bubble = true)
-	{
-		parent::__construct($level, $bubble);
-
-		$this->developerIp   = $developerIp;
-		$this->remoteAddress = $request->getRemoteAddress();
-	}
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function handle(array $record): bool
-	{
-		if (!$this->isHandling($record)) {
-			return false;
-		}
-
-		/// Just in case the remote IP is the same as the developer IP log the output
-		if (!is_null($this->developerIp) && $this->remoteAddress != $this->developerIp) {
-			return false;
-		}
-
-		return false === $this->bubble;
-	}
-}
diff --git a/monolog/src/Monolog/IntrospectionProcessor.php b/monolog/src/Monolog/IntrospectionProcessor.php
deleted file mode 100644
index 2df0e21a..00000000
--- a/monolog/src/Monolog/IntrospectionProcessor.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-/**
- * @copyright Copyright (C) 2010-2023, the Friendica project
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- *
- */
-
-namespace Friendica\Addon\monolog\src\Monolog;
-
-use Friendica\Core\Logger\Util\Introspection;
-use Monolog\Logger;
-use Monolog\Processor\ProcessorInterface;
-
-/**
- * Injects line/file//function where the log message came from
- */
-class IntrospectionProcessor implements ProcessorInterface
-{
-	private $level;
-
-	private $introspection;
-
-	/**
-	 * @param Introspection $introspection Holds the Introspection of the current call
-	 * @param string|int    $level         The minimum logging level at which this Processor will be triggered
-	 */
-	public function __construct(Introspection $introspection, $level = Logger::DEBUG)
-	{
-		$this->level = Logger::toMonologLevel($level);
-		$introspection->addClasses(['Monolog\\', static::class]);
-		$this->introspection = $introspection;
-	}
-
-	public function __invoke(array $record): array
-	{
-		// return if the level is not high enough
-		if ($record['level'] < $this->level) {
-			return $record;
-		}
-		// we should have the call source now
-		$record['extra'] = array_merge(
-			$record['extra'],
-			$this->introspection->getRecord()
-		);
-
-		return $record;
-	}
-}
diff --git a/monolog/static/dependencies.config.php b/monolog/static/dependencies.config.php
deleted file mode 100644
index e3066594..00000000
--- a/monolog/static/dependencies.config.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-/**
- * @copyright Copyright (C) 2010-2023, the Friendica project
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- *
- */
-
-return [
-	\Monolog\Logger::class => [
-		'instanceOf' => \Friendica\Addon\monolog\src\Factory\Monolog::class,
-		'call' => [
-			['create', [], \Dice\Dice::CHAIN_CALL],
-		],
-	],
-];
diff --git a/monolog/static/strategies.config.php b/monolog/static/strategies.config.php
deleted file mode 100644
index 87153839..00000000
--- a/monolog/static/strategies.config.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-/**
- * @copyright Copyright (C) 2010-2023, the Friendica project
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- *
- */
-
-return [
-	\Psr\Log\LoggerInterface::class => [
-		\Monolog\Logger::class => ['monolog'],
-	],
-];
diff --git a/monolog/vendor/autoload.php b/monolog/vendor/autoload.php
deleted file mode 100644
index 6141df81..00000000
--- a/monolog/vendor/autoload.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-// autoload.php @generated by Composer
-
-require_once __DIR__ . '/composer/autoload_real.php';
-
-return ComposerAutoloaderInitMonologAddon::getLoader();
diff --git a/monolog/vendor/composer/ClassLoader.php b/monolog/vendor/composer/ClassLoader.php
deleted file mode 100644
index 03b9bb9c..00000000
--- a/monolog/vendor/composer/ClassLoader.php
+++ /dev/null
@@ -1,445 +0,0 @@
-<?php
-
-/*
- * This file is part of Composer.
- *
- * (c) Nils Adermann <naderman@naderman.de>
- *     Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Composer\Autoload;
-
-/**
- * ClassLoader implements a PSR-0, PSR-4 and classmap class loader.
- *
- *     $loader = new \Composer\Autoload\ClassLoader();
- *
- *     // register classes with namespaces
- *     $loader->add('Symfony\Component', __DIR__.'/component');
- *     $loader->add('Symfony',           __DIR__.'/framework');
- *
- *     // activate the autoloader
- *     $loader->register();
- *
- *     // to enable searching the include path (eg. for PEAR packages)
- *     $loader->setUseIncludePath(true);
- *
- * In this example, if you try to use a class in the Symfony\Component
- * namespace or one of its children (Symfony\Component\Console for instance),
- * the autoloader will first look for the class under the component/
- * directory, and it will then fallback to the framework/ directory if not
- * found before giving up.
- *
- * This class is loosely based on the Symfony UniversalClassLoader.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- * @author Jordi Boggiano <j.boggiano@seld.be>
- * @see    http://www.php-fig.org/psr/psr-0/
- * @see    http://www.php-fig.org/psr/psr-4/
- */
-class ClassLoader
-{
-    // PSR-4
-    private $prefixLengthsPsr4 = array();
-    private $prefixDirsPsr4 = array();
-    private $fallbackDirsPsr4 = array();
-
-    // PSR-0
-    private $prefixesPsr0 = array();
-    private $fallbackDirsPsr0 = array();
-
-    private $useIncludePath = false;
-    private $classMap = array();
-    private $classMapAuthoritative = false;
-    private $missingClasses = array();
-    private $apcuPrefix;
-
-    public function getPrefixes()
-    {
-        if (!empty($this->prefixesPsr0)) {
-            return call_user_func_array('array_merge', array_values($this->prefixesPsr0));
-        }
-
-        return array();
-    }
-
-    public function getPrefixesPsr4()
-    {
-        return $this->prefixDirsPsr4;
-    }
-
-    public function getFallbackDirs()
-    {
-        return $this->fallbackDirsPsr0;
-    }
-
-    public function getFallbackDirsPsr4()
-    {
-        return $this->fallbackDirsPsr4;
-    }
-
-    public function getClassMap()
-    {
-        return $this->classMap;
-    }
-
-    /**
-     * @param array $classMap Class to filename map
-     */
-    public function addClassMap(array $classMap)
-    {
-        if ($this->classMap) {
-            $this->classMap = array_merge($this->classMap, $classMap);
-        } else {
-            $this->classMap = $classMap;
-        }
-    }
-
-    /**
-     * Registers a set of PSR-0 directories for a given prefix, either
-     * appending or prepending to the ones previously set for this prefix.
-     *
-     * @param string       $prefix  The prefix
-     * @param array|string $paths   The PSR-0 root directories
-     * @param bool         $prepend Whether to prepend the directories
-     */
-    public function add($prefix, $paths, $prepend = false)
-    {
-        if (!$prefix) {
-            if ($prepend) {
-                $this->fallbackDirsPsr0 = array_merge(
-                    (array) $paths,
-                    $this->fallbackDirsPsr0
-                );
-            } else {
-                $this->fallbackDirsPsr0 = array_merge(
-                    $this->fallbackDirsPsr0,
-                    (array) $paths
-                );
-            }
-
-            return;
-        }
-
-        $first = $prefix[0];
-        if (!isset($this->prefixesPsr0[$first][$prefix])) {
-            $this->prefixesPsr0[$first][$prefix] = (array) $paths;
-
-            return;
-        }
-        if ($prepend) {
-            $this->prefixesPsr0[$first][$prefix] = array_merge(
-                (array) $paths,
-                $this->prefixesPsr0[$first][$prefix]
-            );
-        } else {
-            $this->prefixesPsr0[$first][$prefix] = array_merge(
-                $this->prefixesPsr0[$first][$prefix],
-                (array) $paths
-            );
-        }
-    }
-
-    /**
-     * Registers a set of PSR-4 directories for a given namespace, either
-     * appending or prepending to the ones previously set for this namespace.
-     *
-     * @param string       $prefix  The prefix/namespace, with trailing '\\'
-     * @param array|string $paths   The PSR-4 base directories
-     * @param bool         $prepend Whether to prepend the directories
-     *
-     * @throws \InvalidArgumentException
-     */
-    public function addPsr4($prefix, $paths, $prepend = false)
-    {
-        if (!$prefix) {
-            // Register directories for the root namespace.
-            if ($prepend) {
-                $this->fallbackDirsPsr4 = array_merge(
-                    (array) $paths,
-                    $this->fallbackDirsPsr4
-                );
-            } else {
-                $this->fallbackDirsPsr4 = array_merge(
-                    $this->fallbackDirsPsr4,
-                    (array) $paths
-                );
-            }
-        } elseif (!isset($this->prefixDirsPsr4[$prefix])) {
-            // Register directories for a new namespace.
-            $length = strlen($prefix);
-            if ('\\' !== $prefix[$length - 1]) {
-                throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
-            }
-            $this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length;
-            $this->prefixDirsPsr4[$prefix] = (array) $paths;
-        } elseif ($prepend) {
-            // Prepend directories for an already registered namespace.
-            $this->prefixDirsPsr4[$prefix] = array_merge(
-                (array) $paths,
-                $this->prefixDirsPsr4[$prefix]
-            );
-        } else {
-            // Append directories for an already registered namespace.
-            $this->prefixDirsPsr4[$prefix] = array_merge(
-                $this->prefixDirsPsr4[$prefix],
-                (array) $paths
-            );
-        }
-    }
-
-    /**
-     * Registers a set of PSR-0 directories for a given prefix,
-     * replacing any others previously set for this prefix.
-     *
-     * @param string       $prefix The prefix
-     * @param array|string $paths  The PSR-0 base directories
-     */
-    public function set($prefix, $paths)
-    {
-        if (!$prefix) {
-            $this->fallbackDirsPsr0 = (array) $paths;
-        } else {
-            $this->prefixesPsr0[$prefix[0]][$prefix] = (array) $paths;
-        }
-    }
-
-    /**
-     * Registers a set of PSR-4 directories for a given namespace,
-     * replacing any others previously set for this namespace.
-     *
-     * @param string       $prefix The prefix/namespace, with trailing '\\'
-     * @param array|string $paths  The PSR-4 base directories
-     *
-     * @throws \InvalidArgumentException
-     */
-    public function setPsr4($prefix, $paths)
-    {
-        if (!$prefix) {
-            $this->fallbackDirsPsr4 = (array) $paths;
-        } else {
-            $length = strlen($prefix);
-            if ('\\' !== $prefix[$length - 1]) {
-                throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
-            }
-            $this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length;
-            $this->prefixDirsPsr4[$prefix] = (array) $paths;
-        }
-    }
-
-    /**
-     * Turns on searching the include path for class files.
-     *
-     * @param bool $useIncludePath
-     */
-    public function setUseIncludePath($useIncludePath)
-    {
-        $this->useIncludePath = $useIncludePath;
-    }
-
-    /**
-     * Can be used to check if the autoloader uses the include path to check
-     * for classes.
-     *
-     * @return bool
-     */
-    public function getUseIncludePath()
-    {
-        return $this->useIncludePath;
-    }
-
-    /**
-     * Turns off searching the prefix and fallback directories for classes
-     * that have not been registered with the class map.
-     *
-     * @param bool $classMapAuthoritative
-     */
-    public function setClassMapAuthoritative($classMapAuthoritative)
-    {
-        $this->classMapAuthoritative = $classMapAuthoritative;
-    }
-
-    /**
-     * Should class lookup fail if not found in the current class map?
-     *
-     * @return bool
-     */
-    public function isClassMapAuthoritative()
-    {
-        return $this->classMapAuthoritative;
-    }
-
-    /**
-     * APCu prefix to use to cache found/not-found classes, if the extension is enabled.
-     *
-     * @param string|null $apcuPrefix
-     */
-    public function setApcuPrefix($apcuPrefix)
-    {
-        $this->apcuPrefix = function_exists('apcu_fetch') && filter_var(ini_get('apc.enabled'), FILTER_VALIDATE_BOOLEAN) ? $apcuPrefix : null;
-    }
-
-    /**
-     * The APCu prefix in use, or null if APCu caching is not enabled.
-     *
-     * @return string|null
-     */
-    public function getApcuPrefix()
-    {
-        return $this->apcuPrefix;
-    }
-
-    /**
-     * Registers this instance as an autoloader.
-     *
-     * @param bool $prepend Whether to prepend the autoloader or not
-     */
-    public function register($prepend = false)
-    {
-        spl_autoload_register(array($this, 'loadClass'), true, $prepend);
-    }
-
-    /**
-     * Unregisters this instance as an autoloader.
-     */
-    public function unregister()
-    {
-        spl_autoload_unregister(array($this, 'loadClass'));
-    }
-
-    /**
-     * Loads the given class or interface.
-     *
-     * @param  string    $class The name of the class
-     * @return bool|null True if loaded, null otherwise
-     */
-    public function loadClass($class)
-    {
-        if ($file = $this->findFile($class)) {
-            includeFile($file);
-
-            return true;
-        }
-    }
-
-    /**
-     * Finds the path to the file where the class is defined.
-     *
-     * @param string $class The name of the class
-     *
-     * @return string|false The path if found, false otherwise
-     */
-    public function findFile($class)
-    {
-        // class map lookup
-        if (isset($this->classMap[$class])) {
-            return $this->classMap[$class];
-        }
-        if ($this->classMapAuthoritative || isset($this->missingClasses[$class])) {
-            return false;
-        }
-        if (null !== $this->apcuPrefix) {
-            $file = apcu_fetch($this->apcuPrefix.$class, $hit);
-            if ($hit) {
-                return $file;
-            }
-        }
-
-        $file = $this->findFileWithExtension($class, '.php');
-
-        // Search for Hack files if we are running on HHVM
-        if (false === $file && defined('HHVM_VERSION')) {
-            $file = $this->findFileWithExtension($class, '.hh');
-        }
-
-        if (null !== $this->apcuPrefix) {
-            apcu_add($this->apcuPrefix.$class, $file);
-        }
-
-        if (false === $file) {
-            // Remember that this class does not exist.
-            $this->missingClasses[$class] = true;
-        }
-
-        return $file;
-    }
-
-    private function findFileWithExtension($class, $ext)
-    {
-        // PSR-4 lookup
-        $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR) . $ext;
-
-        $first = $class[0];
-        if (isset($this->prefixLengthsPsr4[$first])) {
-            $subPath = $class;
-            while (false !== $lastPos = strrpos($subPath, '\\')) {
-                $subPath = substr($subPath, 0, $lastPos);
-                $search = $subPath . '\\';
-                if (isset($this->prefixDirsPsr4[$search])) {
-                    $pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1);
-                    foreach ($this->prefixDirsPsr4[$search] as $dir) {
-                        if (file_exists($file = $dir . $pathEnd)) {
-                            return $file;
-                        }
-                    }
-                }
-            }
-        }
-
-        // PSR-4 fallback dirs
-        foreach ($this->fallbackDirsPsr4 as $dir) {
-            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4)) {
-                return $file;
-            }
-        }
-
-        // PSR-0 lookup
-        if (false !== $pos = strrpos($class, '\\')) {
-            // namespaced class name
-            $logicalPathPsr0 = substr($logicalPathPsr4, 0, $pos + 1)
-                . strtr(substr($logicalPathPsr4, $pos + 1), '_', DIRECTORY_SEPARATOR);
-        } else {
-            // PEAR-like class name
-            $logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR) . $ext;
-        }
-
-        if (isset($this->prefixesPsr0[$first])) {
-            foreach ($this->prefixesPsr0[$first] as $prefix => $dirs) {
-                if (0 === strpos($class, $prefix)) {
-                    foreach ($dirs as $dir) {
-                        if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
-                            return $file;
-                        }
-                    }
-                }
-            }
-        }
-
-        // PSR-0 fallback dirs
-        foreach ($this->fallbackDirsPsr0 as $dir) {
-            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
-                return $file;
-            }
-        }
-
-        // PSR-0 include paths.
-        if ($this->useIncludePath && $file = stream_resolve_include_path($logicalPathPsr0)) {
-            return $file;
-        }
-
-        return false;
-    }
-}
-
-/**
- * Scope isolated include.
- *
- * Prevents access to $this/self from included files.
- */
-function includeFile($file)
-{
-    include $file;
-}
diff --git a/monolog/vendor/composer/autoload_classmap.php b/monolog/vendor/composer/autoload_classmap.php
deleted file mode 100644
index c12d7340..00000000
--- a/monolog/vendor/composer/autoload_classmap.php
+++ /dev/null
@@ -1,124 +0,0 @@
-<?php
-
-// autoload_classmap.php @generated by Composer
-
-$vendorDir = dirname(dirname(__FILE__));
-$baseDir = dirname($vendorDir);
-
-return array(
-    'Monolog\\Attribute\\AsMonologProcessor' => $vendorDir . '/monolog/monolog/src/Monolog/Attribute/AsMonologProcessor.php',
-    'Monolog\\DateTimeImmutable' => $vendorDir . '/monolog/monolog/src/Monolog/DateTimeImmutable.php',
-    'Monolog\\ErrorHandler' => $vendorDir . '/monolog/monolog/src/Monolog/ErrorHandler.php',
-    'Monolog\\Formatter\\ChromePHPFormatter' => $vendorDir . '/monolog/monolog/src/Monolog/Formatter/ChromePHPFormatter.php',
-    'Monolog\\Formatter\\ElasticaFormatter' => $vendorDir . '/monolog/monolog/src/Monolog/Formatter/ElasticaFormatter.php',
-    'Monolog\\Formatter\\ElasticsearchFormatter' => $vendorDir . '/monolog/monolog/src/Monolog/Formatter/ElasticsearchFormatter.php',
-    'Monolog\\Formatter\\FlowdockFormatter' => $vendorDir . '/monolog/monolog/src/Monolog/Formatter/FlowdockFormatter.php',
-    'Monolog\\Formatter\\FluentdFormatter' => $vendorDir . '/monolog/monolog/src/Monolog/Formatter/FluentdFormatter.php',
-    'Monolog\\Formatter\\FormatterInterface' => $vendorDir . '/monolog/monolog/src/Monolog/Formatter/FormatterInterface.php',
-    'Monolog\\Formatter\\GelfMessageFormatter' => $vendorDir . '/monolog/monolog/src/Monolog/Formatter/GelfMessageFormatter.php',
-    'Monolog\\Formatter\\GoogleCloudLoggingFormatter' => $vendorDir . '/monolog/monolog/src/Monolog/Formatter/GoogleCloudLoggingFormatter.php',
-    'Monolog\\Formatter\\HtmlFormatter' => $vendorDir . '/monolog/monolog/src/Monolog/Formatter/HtmlFormatter.php',
-    'Monolog\\Formatter\\JsonFormatter' => $vendorDir . '/monolog/monolog/src/Monolog/Formatter/JsonFormatter.php',
-    'Monolog\\Formatter\\LineFormatter' => $vendorDir . '/monolog/monolog/src/Monolog/Formatter/LineFormatter.php',
-    'Monolog\\Formatter\\LogglyFormatter' => $vendorDir . '/monolog/monolog/src/Monolog/Formatter/LogglyFormatter.php',
-    'Monolog\\Formatter\\LogmaticFormatter' => $vendorDir . '/monolog/monolog/src/Monolog/Formatter/LogmaticFormatter.php',
-    'Monolog\\Formatter\\LogstashFormatter' => $vendorDir . '/monolog/monolog/src/Monolog/Formatter/LogstashFormatter.php',
-    'Monolog\\Formatter\\MongoDBFormatter' => $vendorDir . '/monolog/monolog/src/Monolog/Formatter/MongoDBFormatter.php',
-    'Monolog\\Formatter\\NormalizerFormatter' => $vendorDir . '/monolog/monolog/src/Monolog/Formatter/NormalizerFormatter.php',
-    'Monolog\\Formatter\\ScalarFormatter' => $vendorDir . '/monolog/monolog/src/Monolog/Formatter/ScalarFormatter.php',
-    'Monolog\\Formatter\\WildfireFormatter' => $vendorDir . '/monolog/monolog/src/Monolog/Formatter/WildfireFormatter.php',
-    'Monolog\\Handler\\AbstractHandler' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/AbstractHandler.php',
-    'Monolog\\Handler\\AbstractProcessingHandler' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/AbstractProcessingHandler.php',
-    'Monolog\\Handler\\AbstractSyslogHandler' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/AbstractSyslogHandler.php',
-    'Monolog\\Handler\\AmqpHandler' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/AmqpHandler.php',
-    'Monolog\\Handler\\BrowserConsoleHandler' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/BrowserConsoleHandler.php',
-    'Monolog\\Handler\\BufferHandler' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/BufferHandler.php',
-    'Monolog\\Handler\\ChromePHPHandler' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/ChromePHPHandler.php',
-    'Monolog\\Handler\\CouchDBHandler' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/CouchDBHandler.php',
-    'Monolog\\Handler\\CubeHandler' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/CubeHandler.php',
-    'Monolog\\Handler\\Curl\\Util' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/Curl/Util.php',
-    'Monolog\\Handler\\DeduplicationHandler' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/DeduplicationHandler.php',
-    'Monolog\\Handler\\DoctrineCouchDBHandler' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/DoctrineCouchDBHandler.php',
-    'Monolog\\Handler\\DynamoDbHandler' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/DynamoDbHandler.php',
-    'Monolog\\Handler\\ElasticaHandler' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/ElasticaHandler.php',
-    'Monolog\\Handler\\ElasticsearchHandler' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/ElasticsearchHandler.php',
-    'Monolog\\Handler\\ErrorLogHandler' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/ErrorLogHandler.php',
-    'Monolog\\Handler\\FallbackGroupHandler' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/FallbackGroupHandler.php',
-    'Monolog\\Handler\\FilterHandler' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/FilterHandler.php',
-    'Monolog\\Handler\\FingersCrossedHandler' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/FingersCrossedHandler.php',
-    'Monolog\\Handler\\FingersCrossed\\ActivationStrategyInterface' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/FingersCrossed/ActivationStrategyInterface.php',
-    'Monolog\\Handler\\FingersCrossed\\ChannelLevelActivationStrategy' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/FingersCrossed/ChannelLevelActivationStrategy.php',
-    'Monolog\\Handler\\FingersCrossed\\ErrorLevelActivationStrategy' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/FingersCrossed/ErrorLevelActivationStrategy.php',
-    'Monolog\\Handler\\FirePHPHandler' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/FirePHPHandler.php',
-    'Monolog\\Handler\\FleepHookHandler' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/FleepHookHandler.php',
-    'Monolog\\Handler\\FlowdockHandler' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/FlowdockHandler.php',
-    'Monolog\\Handler\\FormattableHandlerInterface' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/FormattableHandlerInterface.php',
-    'Monolog\\Handler\\FormattableHandlerTrait' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/FormattableHandlerTrait.php',
-    'Monolog\\Handler\\GelfHandler' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/GelfHandler.php',
-    'Monolog\\Handler\\GroupHandler' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/GroupHandler.php',
-    'Monolog\\Handler\\Handler' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/Handler.php',
-    'Monolog\\Handler\\HandlerInterface' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/HandlerInterface.php',
-    'Monolog\\Handler\\HandlerWrapper' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/HandlerWrapper.php',
-    'Monolog\\Handler\\IFTTTHandler' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/IFTTTHandler.php',
-    'Monolog\\Handler\\InsightOpsHandler' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/InsightOpsHandler.php',
-    'Monolog\\Handler\\LogEntriesHandler' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/LogEntriesHandler.php',
-    'Monolog\\Handler\\LogglyHandler' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/LogglyHandler.php',
-    'Monolog\\Handler\\LogmaticHandler' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/LogmaticHandler.php',
-    'Monolog\\Handler\\MailHandler' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/MailHandler.php',
-    'Monolog\\Handler\\MandrillHandler' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/MandrillHandler.php',
-    'Monolog\\Handler\\MissingExtensionException' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/MissingExtensionException.php',
-    'Monolog\\Handler\\MongoDBHandler' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/MongoDBHandler.php',
-    'Monolog\\Handler\\NativeMailerHandler' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/NativeMailerHandler.php',
-    'Monolog\\Handler\\NewRelicHandler' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/NewRelicHandler.php',
-    'Monolog\\Handler\\NoopHandler' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/NoopHandler.php',
-    'Monolog\\Handler\\NullHandler' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/NullHandler.php',
-    'Monolog\\Handler\\OverflowHandler' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/OverflowHandler.php',
-    'Monolog\\Handler\\PHPConsoleHandler' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/PHPConsoleHandler.php',
-    'Monolog\\Handler\\ProcessHandler' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/ProcessHandler.php',
-    'Monolog\\Handler\\ProcessableHandlerInterface' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/ProcessableHandlerInterface.php',
-    'Monolog\\Handler\\ProcessableHandlerTrait' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/ProcessableHandlerTrait.php',
-    'Monolog\\Handler\\PsrHandler' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/PsrHandler.php',
-    'Monolog\\Handler\\PushoverHandler' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/PushoverHandler.php',
-    'Monolog\\Handler\\RedisHandler' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/RedisHandler.php',
-    'Monolog\\Handler\\RedisPubSubHandler' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/RedisPubSubHandler.php',
-    'Monolog\\Handler\\RollbarHandler' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/RollbarHandler.php',
-    'Monolog\\Handler\\RotatingFileHandler' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/RotatingFileHandler.php',
-    'Monolog\\Handler\\SamplingHandler' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/SamplingHandler.php',
-    'Monolog\\Handler\\SendGridHandler' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/SendGridHandler.php',
-    'Monolog\\Handler\\SlackHandler' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/SlackHandler.php',
-    'Monolog\\Handler\\SlackWebhookHandler' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/SlackWebhookHandler.php',
-    'Monolog\\Handler\\Slack\\SlackRecord' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/Slack/SlackRecord.php',
-    'Monolog\\Handler\\SocketHandler' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/SocketHandler.php',
-    'Monolog\\Handler\\SqsHandler' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/SqsHandler.php',
-    'Monolog\\Handler\\StreamHandler' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/StreamHandler.php',
-    'Monolog\\Handler\\SwiftMailerHandler' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/SwiftMailerHandler.php',
-    'Monolog\\Handler\\SymfonyMailerHandler' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/SymfonyMailerHandler.php',
-    'Monolog\\Handler\\SyslogHandler' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/SyslogHandler.php',
-    'Monolog\\Handler\\SyslogUdpHandler' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/SyslogUdpHandler.php',
-    'Monolog\\Handler\\SyslogUdp\\UdpSocket' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/SyslogUdp/UdpSocket.php',
-    'Monolog\\Handler\\TelegramBotHandler' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/TelegramBotHandler.php',
-    'Monolog\\Handler\\TestHandler' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/TestHandler.php',
-    'Monolog\\Handler\\WebRequestRecognizerTrait' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/WebRequestRecognizerTrait.php',
-    'Monolog\\Handler\\WhatFailureGroupHandler' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/WhatFailureGroupHandler.php',
-    'Monolog\\Handler\\ZendMonitorHandler' => $vendorDir . '/monolog/monolog/src/Monolog/Handler/ZendMonitorHandler.php',
-    'Monolog\\LogRecord' => $vendorDir . '/monolog/monolog/src/Monolog/LogRecord.php',
-    'Monolog\\Logger' => $vendorDir . '/monolog/monolog/src/Monolog/Logger.php',
-    'Monolog\\Processor\\GitProcessor' => $vendorDir . '/monolog/monolog/src/Monolog/Processor/GitProcessor.php',
-    'Monolog\\Processor\\HostnameProcessor' => $vendorDir . '/monolog/monolog/src/Monolog/Processor/HostnameProcessor.php',
-    'Monolog\\Processor\\IntrospectionProcessor' => $vendorDir . '/monolog/monolog/src/Monolog/Processor/IntrospectionProcessor.php',
-    'Monolog\\Processor\\MemoryPeakUsageProcessor' => $vendorDir . '/monolog/monolog/src/Monolog/Processor/MemoryPeakUsageProcessor.php',
-    'Monolog\\Processor\\MemoryProcessor' => $vendorDir . '/monolog/monolog/src/Monolog/Processor/MemoryProcessor.php',
-    'Monolog\\Processor\\MemoryUsageProcessor' => $vendorDir . '/monolog/monolog/src/Monolog/Processor/MemoryUsageProcessor.php',
-    'Monolog\\Processor\\MercurialProcessor' => $vendorDir . '/monolog/monolog/src/Monolog/Processor/MercurialProcessor.php',
-    'Monolog\\Processor\\ProcessIdProcessor' => $vendorDir . '/monolog/monolog/src/Monolog/Processor/ProcessIdProcessor.php',
-    'Monolog\\Processor\\ProcessorInterface' => $vendorDir . '/monolog/monolog/src/Monolog/Processor/ProcessorInterface.php',
-    'Monolog\\Processor\\PsrLogMessageProcessor' => $vendorDir . '/monolog/monolog/src/Monolog/Processor/PsrLogMessageProcessor.php',
-    'Monolog\\Processor\\TagProcessor' => $vendorDir . '/monolog/monolog/src/Monolog/Processor/TagProcessor.php',
-    'Monolog\\Processor\\UidProcessor' => $vendorDir . '/monolog/monolog/src/Monolog/Processor/UidProcessor.php',
-    'Monolog\\Processor\\WebProcessor' => $vendorDir . '/monolog/monolog/src/Monolog/Processor/WebProcessor.php',
-    'Monolog\\Registry' => $vendorDir . '/monolog/monolog/src/Monolog/Registry.php',
-    'Monolog\\ResettableInterface' => $vendorDir . '/monolog/monolog/src/Monolog/ResettableInterface.php',
-    'Monolog\\SignalHandler' => $vendorDir . '/monolog/monolog/src/Monolog/SignalHandler.php',
-    'Monolog\\Test\\TestCase' => $vendorDir . '/monolog/monolog/src/Monolog/Test/TestCase.php',
-    'Monolog\\Utils' => $vendorDir . '/monolog/monolog/src/Monolog/Utils.php',
-);
diff --git a/monolog/vendor/composer/autoload_psr4.php b/monolog/vendor/composer/autoload_psr4.php
deleted file mode 100644
index 9cb5b63d..00000000
--- a/monolog/vendor/composer/autoload_psr4.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-// autoload_psr4.php @generated by Composer
-
-$vendorDir = dirname(dirname(__FILE__));
-$baseDir = dirname($vendorDir);
-
-return array(
-    'Psr\\Log\\' => array($vendorDir . '/psr/log/Psr/Log'),
-    'Monolog\\' => array($vendorDir . '/monolog/monolog/src/Monolog'),
-);
diff --git a/monolog/vendor/composer/autoload_real.php b/monolog/vendor/composer/autoload_real.php
deleted file mode 100644
index 27d62063..00000000
--- a/monolog/vendor/composer/autoload_real.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-
-// autoload_real.php @generated by Composer
-
-class ComposerAutoloaderInitMonologAddon
-{
-    private static $loader;
-
-    public static function loadClassLoader($class)
-    {
-        if ('Composer\Autoload\ClassLoader' === $class) {
-            require __DIR__ . '/ClassLoader.php';
-        }
-    }
-
-    /**
-     * @return \Composer\Autoload\ClassLoader
-     */
-    public static function getLoader()
-    {
-        if (null !== self::$loader) {
-            return self::$loader;
-        }
-
-        spl_autoload_register(array('ComposerAutoloaderInitMonologAddon', 'loadClassLoader'), true, true);
-        self::$loader = $loader = new \Composer\Autoload\ClassLoader();
-        spl_autoload_unregister(array('ComposerAutoloaderInitMonologAddon', 'loadClassLoader'));
-
-        $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
-        if ($useStaticLoader) {
-            require_once __DIR__ . '/autoload_static.php';
-
-            call_user_func(\Composer\Autoload\ComposerStaticInitMonologAddon::getInitializer($loader));
-        } else {
-            $map = require __DIR__ . '/autoload_namespaces.php';
-            foreach ($map as $namespace => $path) {
-                $loader->set($namespace, $path);
-            }
-
-            $map = require __DIR__ . '/autoload_psr4.php';
-            foreach ($map as $namespace => $path) {
-                $loader->setPsr4($namespace, $path);
-            }
-
-            $classMap = require __DIR__ . '/autoload_classmap.php';
-            if ($classMap) {
-                $loader->addClassMap($classMap);
-            }
-        }
-
-        $loader->register(true);
-
-        return $loader;
-    }
-}
diff --git a/monolog/vendor/composer/autoload_static.php b/monolog/vendor/composer/autoload_static.php
deleted file mode 100644
index a44984ec..00000000
--- a/monolog/vendor/composer/autoload_static.php
+++ /dev/null
@@ -1,158 +0,0 @@
-<?php
-
-// autoload_static.php @generated by Composer
-
-namespace Composer\Autoload;
-
-class ComposerStaticInitMonologAddon
-{
-    public static $prefixLengthsPsr4 = array (
-        'P' => 
-        array (
-            'Psr\\Log\\' => 8,
-        ),
-        'M' => 
-        array (
-            'Monolog\\' => 8,
-        ),
-    );
-
-    public static $prefixDirsPsr4 = array (
-        'Psr\\Log\\' => 
-        array (
-            0 => __DIR__ . '/..' . '/psr/log/Psr/Log',
-        ),
-        'Monolog\\' => 
-        array (
-            0 => __DIR__ . '/..' . '/monolog/monolog/src/Monolog',
-        ),
-    );
-
-    public static $classMap = array (
-        'Monolog\\Attribute\\AsMonologProcessor' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Attribute/AsMonologProcessor.php',
-        'Monolog\\DateTimeImmutable' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/DateTimeImmutable.php',
-        'Monolog\\ErrorHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/ErrorHandler.php',
-        'Monolog\\Formatter\\ChromePHPFormatter' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Formatter/ChromePHPFormatter.php',
-        'Monolog\\Formatter\\ElasticaFormatter' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Formatter/ElasticaFormatter.php',
-        'Monolog\\Formatter\\ElasticsearchFormatter' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Formatter/ElasticsearchFormatter.php',
-        'Monolog\\Formatter\\FlowdockFormatter' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Formatter/FlowdockFormatter.php',
-        'Monolog\\Formatter\\FluentdFormatter' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Formatter/FluentdFormatter.php',
-        'Monolog\\Formatter\\FormatterInterface' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Formatter/FormatterInterface.php',
-        'Monolog\\Formatter\\GelfMessageFormatter' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Formatter/GelfMessageFormatter.php',
-        'Monolog\\Formatter\\GoogleCloudLoggingFormatter' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Formatter/GoogleCloudLoggingFormatter.php',
-        'Monolog\\Formatter\\HtmlFormatter' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Formatter/HtmlFormatter.php',
-        'Monolog\\Formatter\\JsonFormatter' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Formatter/JsonFormatter.php',
-        'Monolog\\Formatter\\LineFormatter' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Formatter/LineFormatter.php',
-        'Monolog\\Formatter\\LogglyFormatter' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Formatter/LogglyFormatter.php',
-        'Monolog\\Formatter\\LogmaticFormatter' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Formatter/LogmaticFormatter.php',
-        'Monolog\\Formatter\\LogstashFormatter' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Formatter/LogstashFormatter.php',
-        'Monolog\\Formatter\\MongoDBFormatter' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Formatter/MongoDBFormatter.php',
-        'Monolog\\Formatter\\NormalizerFormatter' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Formatter/NormalizerFormatter.php',
-        'Monolog\\Formatter\\ScalarFormatter' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Formatter/ScalarFormatter.php',
-        'Monolog\\Formatter\\WildfireFormatter' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Formatter/WildfireFormatter.php',
-        'Monolog\\Handler\\AbstractHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/AbstractHandler.php',
-        'Monolog\\Handler\\AbstractProcessingHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/AbstractProcessingHandler.php',
-        'Monolog\\Handler\\AbstractSyslogHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/AbstractSyslogHandler.php',
-        'Monolog\\Handler\\AmqpHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/AmqpHandler.php',
-        'Monolog\\Handler\\BrowserConsoleHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/BrowserConsoleHandler.php',
-        'Monolog\\Handler\\BufferHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/BufferHandler.php',
-        'Monolog\\Handler\\ChromePHPHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/ChromePHPHandler.php',
-        'Monolog\\Handler\\CouchDBHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/CouchDBHandler.php',
-        'Monolog\\Handler\\CubeHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/CubeHandler.php',
-        'Monolog\\Handler\\Curl\\Util' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/Curl/Util.php',
-        'Monolog\\Handler\\DeduplicationHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/DeduplicationHandler.php',
-        'Monolog\\Handler\\DoctrineCouchDBHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/DoctrineCouchDBHandler.php',
-        'Monolog\\Handler\\DynamoDbHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/DynamoDbHandler.php',
-        'Monolog\\Handler\\ElasticaHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/ElasticaHandler.php',
-        'Monolog\\Handler\\ElasticsearchHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/ElasticsearchHandler.php',
-        'Monolog\\Handler\\ErrorLogHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/ErrorLogHandler.php',
-        'Monolog\\Handler\\FallbackGroupHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/FallbackGroupHandler.php',
-        'Monolog\\Handler\\FilterHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/FilterHandler.php',
-        'Monolog\\Handler\\FingersCrossedHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/FingersCrossedHandler.php',
-        'Monolog\\Handler\\FingersCrossed\\ActivationStrategyInterface' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/FingersCrossed/ActivationStrategyInterface.php',
-        'Monolog\\Handler\\FingersCrossed\\ChannelLevelActivationStrategy' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/FingersCrossed/ChannelLevelActivationStrategy.php',
-        'Monolog\\Handler\\FingersCrossed\\ErrorLevelActivationStrategy' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/FingersCrossed/ErrorLevelActivationStrategy.php',
-        'Monolog\\Handler\\FirePHPHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/FirePHPHandler.php',
-        'Monolog\\Handler\\FleepHookHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/FleepHookHandler.php',
-        'Monolog\\Handler\\FlowdockHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/FlowdockHandler.php',
-        'Monolog\\Handler\\FormattableHandlerInterface' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/FormattableHandlerInterface.php',
-        'Monolog\\Handler\\FormattableHandlerTrait' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/FormattableHandlerTrait.php',
-        'Monolog\\Handler\\GelfHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/GelfHandler.php',
-        'Monolog\\Handler\\GroupHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/GroupHandler.php',
-        'Monolog\\Handler\\Handler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/Handler.php',
-        'Monolog\\Handler\\HandlerInterface' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/HandlerInterface.php',
-        'Monolog\\Handler\\HandlerWrapper' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/HandlerWrapper.php',
-        'Monolog\\Handler\\IFTTTHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/IFTTTHandler.php',
-        'Monolog\\Handler\\InsightOpsHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/InsightOpsHandler.php',
-        'Monolog\\Handler\\LogEntriesHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/LogEntriesHandler.php',
-        'Monolog\\Handler\\LogglyHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/LogglyHandler.php',
-        'Monolog\\Handler\\LogmaticHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/LogmaticHandler.php',
-        'Monolog\\Handler\\MailHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/MailHandler.php',
-        'Monolog\\Handler\\MandrillHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/MandrillHandler.php',
-        'Monolog\\Handler\\MissingExtensionException' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/MissingExtensionException.php',
-        'Monolog\\Handler\\MongoDBHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/MongoDBHandler.php',
-        'Monolog\\Handler\\NativeMailerHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/NativeMailerHandler.php',
-        'Monolog\\Handler\\NewRelicHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/NewRelicHandler.php',
-        'Monolog\\Handler\\NoopHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/NoopHandler.php',
-        'Monolog\\Handler\\NullHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/NullHandler.php',
-        'Monolog\\Handler\\OverflowHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/OverflowHandler.php',
-        'Monolog\\Handler\\PHPConsoleHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/PHPConsoleHandler.php',
-        'Monolog\\Handler\\ProcessHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/ProcessHandler.php',
-        'Monolog\\Handler\\ProcessableHandlerInterface' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/ProcessableHandlerInterface.php',
-        'Monolog\\Handler\\ProcessableHandlerTrait' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/ProcessableHandlerTrait.php',
-        'Monolog\\Handler\\PsrHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/PsrHandler.php',
-        'Monolog\\Handler\\PushoverHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/PushoverHandler.php',
-        'Monolog\\Handler\\RedisHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/RedisHandler.php',
-        'Monolog\\Handler\\RedisPubSubHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/RedisPubSubHandler.php',
-        'Monolog\\Handler\\RollbarHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/RollbarHandler.php',
-        'Monolog\\Handler\\RotatingFileHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/RotatingFileHandler.php',
-        'Monolog\\Handler\\SamplingHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/SamplingHandler.php',
-        'Monolog\\Handler\\SendGridHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/SendGridHandler.php',
-        'Monolog\\Handler\\SlackHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/SlackHandler.php',
-        'Monolog\\Handler\\SlackWebhookHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/SlackWebhookHandler.php',
-        'Monolog\\Handler\\Slack\\SlackRecord' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/Slack/SlackRecord.php',
-        'Monolog\\Handler\\SocketHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/SocketHandler.php',
-        'Monolog\\Handler\\SqsHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/SqsHandler.php',
-        'Monolog\\Handler\\StreamHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/StreamHandler.php',
-        'Monolog\\Handler\\SwiftMailerHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/SwiftMailerHandler.php',
-        'Monolog\\Handler\\SymfonyMailerHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/SymfonyMailerHandler.php',
-        'Monolog\\Handler\\SyslogHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/SyslogHandler.php',
-        'Monolog\\Handler\\SyslogUdpHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/SyslogUdpHandler.php',
-        'Monolog\\Handler\\SyslogUdp\\UdpSocket' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/SyslogUdp/UdpSocket.php',
-        'Monolog\\Handler\\TelegramBotHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/TelegramBotHandler.php',
-        'Monolog\\Handler\\TestHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/TestHandler.php',
-        'Monolog\\Handler\\WebRequestRecognizerTrait' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/WebRequestRecognizerTrait.php',
-        'Monolog\\Handler\\WhatFailureGroupHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/WhatFailureGroupHandler.php',
-        'Monolog\\Handler\\ZendMonitorHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Handler/ZendMonitorHandler.php',
-        'Monolog\\LogRecord' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/LogRecord.php',
-        'Monolog\\Logger' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Logger.php',
-        'Monolog\\Processor\\GitProcessor' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Processor/GitProcessor.php',
-        'Monolog\\Processor\\HostnameProcessor' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Processor/HostnameProcessor.php',
-        'Monolog\\Processor\\IntrospectionProcessor' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Processor/IntrospectionProcessor.php',
-        'Monolog\\Processor\\MemoryPeakUsageProcessor' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Processor/MemoryPeakUsageProcessor.php',
-        'Monolog\\Processor\\MemoryProcessor' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Processor/MemoryProcessor.php',
-        'Monolog\\Processor\\MemoryUsageProcessor' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Processor/MemoryUsageProcessor.php',
-        'Monolog\\Processor\\MercurialProcessor' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Processor/MercurialProcessor.php',
-        'Monolog\\Processor\\ProcessIdProcessor' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Processor/ProcessIdProcessor.php',
-        'Monolog\\Processor\\ProcessorInterface' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Processor/ProcessorInterface.php',
-        'Monolog\\Processor\\PsrLogMessageProcessor' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Processor/PsrLogMessageProcessor.php',
-        'Monolog\\Processor\\TagProcessor' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Processor/TagProcessor.php',
-        'Monolog\\Processor\\UidProcessor' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Processor/UidProcessor.php',
-        'Monolog\\Processor\\WebProcessor' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Processor/WebProcessor.php',
-        'Monolog\\Registry' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Registry.php',
-        'Monolog\\ResettableInterface' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/ResettableInterface.php',
-        'Monolog\\SignalHandler' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/SignalHandler.php',
-        'Monolog\\Test\\TestCase' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Test/TestCase.php',
-        'Monolog\\Utils' => __DIR__ . '/..' . '/monolog/monolog/src/Monolog/Utils.php',
-    );
-
-    public static function getInitializer(ClassLoader $loader)
-    {
-        return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInitMonologAddon::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInitMonologAddon::$prefixDirsPsr4;
-            $loader->classMap = ComposerStaticInitMonologAddon::$classMap;
-
-        }, null, ClassLoader::class);
-    }
-}
diff --git a/monolog/vendor/composer/installed.json b/monolog/vendor/composer/installed.json
deleted file mode 100644
index 2b129417..00000000
--- a/monolog/vendor/composer/installed.json
+++ /dev/null
@@ -1,151 +0,0 @@
-[
-    {
-        "name": "monolog/monolog",
-        "version": "2.9.2",
-        "version_normalized": "2.9.2.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/Seldaek/monolog.git",
-            "reference": "437cb3628f4cf6042cc10ae97fc2b8472e48ca1f"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/Seldaek/monolog/zipball/437cb3628f4cf6042cc10ae97fc2b8472e48ca1f",
-            "reference": "437cb3628f4cf6042cc10ae97fc2b8472e48ca1f",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=7.2",
-            "psr/log": "^1.0.1 || ^2.0 || ^3.0"
-        },
-        "provide": {
-            "psr/log-implementation": "1.0.0 || 2.0.0 || 3.0.0"
-        },
-        "require-dev": {
-            "aws/aws-sdk-php": "^2.4.9 || ^3.0",
-            "doctrine/couchdb": "~1.0@dev",
-            "elasticsearch/elasticsearch": "^7 || ^8",
-            "ext-json": "*",
-            "graylog2/gelf-php": "^1.4.2 || ^2@dev",
-            "guzzlehttp/guzzle": "^7.4",
-            "guzzlehttp/psr7": "^2.2",
-            "mongodb/mongodb": "^1.8",
-            "php-amqplib/php-amqplib": "~2.4 || ^3",
-            "phpspec/prophecy": "^1.15",
-            "phpstan/phpstan": "^0.12.91",
-            "phpunit/phpunit": "^8.5.14",
-            "predis/predis": "^1.1 || ^2.0",
-            "rollbar/rollbar": "^1.3 || ^2 || ^3",
-            "ruflin/elastica": "^7",
-            "swiftmailer/swiftmailer": "^5.3|^6.0",
-            "symfony/mailer": "^5.4 || ^6",
-            "symfony/mime": "^5.4 || ^6"
-        },
-        "suggest": {
-            "aws/aws-sdk-php": "Allow sending log messages to AWS services like DynamoDB",
-            "doctrine/couchdb": "Allow sending log messages to a CouchDB server",
-            "elasticsearch/elasticsearch": "Allow sending log messages to an Elasticsearch server via official client",
-            "ext-amqp": "Allow sending log messages to an AMQP server (1.0+ required)",
-            "ext-curl": "Required to send log messages using the IFTTTHandler, the LogglyHandler, the SendGridHandler, the SlackWebhookHandler or the TelegramBotHandler",
-            "ext-mbstring": "Allow to work properly with unicode symbols",
-            "ext-mongodb": "Allow sending log messages to a MongoDB server (via driver)",
-            "ext-openssl": "Required to send log messages using SSL",
-            "ext-sockets": "Allow sending log messages to a Syslog server (via UDP driver)",
-            "graylog2/gelf-php": "Allow sending log messages to a GrayLog2 server",
-            "mongodb/mongodb": "Allow sending log messages to a MongoDB server (via library)",
-            "php-amqplib/php-amqplib": "Allow sending log messages to an AMQP server using php-amqplib",
-            "rollbar/rollbar": "Allow sending log messages to Rollbar",
-            "ruflin/elastica": "Allow sending log messages to an Elastic Search server"
-        },
-        "time": "2023-10-27T15:25:26+00:00",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-main": "2.x-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Monolog\\": "src/Monolog"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Jordi Boggiano",
-                "email": "j.boggiano@seld.be",
-                "homepage": "https://seld.be"
-            }
-        ],
-        "description": "Sends your logs to files, sockets, inboxes, databases and various web services",
-        "homepage": "https://github.com/Seldaek/monolog",
-        "keywords": [
-            "log",
-            "logging",
-            "psr-3"
-        ],
-        "funding": [
-            {
-                "url": "https://github.com/Seldaek",
-                "type": "github"
-            },
-            {
-                "url": "https://tidelift.com/funding/github/packagist/monolog/monolog",
-                "type": "tidelift"
-            }
-        ]
-    },
-    {
-        "name": "psr/log",
-        "version": "1.1.4",
-        "version_normalized": "1.1.4.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/php-fig/log.git",
-            "reference": "d49695b909c3b7628b6289db5479a1c204601f11"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/php-fig/log/zipball/d49695b909c3b7628b6289db5479a1c204601f11",
-            "reference": "d49695b909c3b7628b6289db5479a1c204601f11",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=5.3.0"
-        },
-        "time": "2021-05-03T11:20:27+00:00",
-        "type": "library",
-        "extra": {
-            "branch-alias": {
-                "dev-master": "1.1.x-dev"
-            }
-        },
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "Psr\\Log\\": "Psr/Log/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "PHP-FIG",
-                "homepage": "https://www.php-fig.org/"
-            }
-        ],
-        "description": "Common interface for logging libraries",
-        "homepage": "https://github.com/php-fig/log",
-        "keywords": [
-            "log",
-            "psr",
-            "psr-3"
-        ]
-    }
-]
diff --git a/monolog/vendor/monolog/monolog/CHANGELOG.md b/monolog/vendor/monolog/monolog/CHANGELOG.md
deleted file mode 100644
index aca1bdd0..00000000
--- a/monolog/vendor/monolog/monolog/CHANGELOG.md
+++ /dev/null
@@ -1,629 +0,0 @@
-### 2.9.2 (2023-10-27)
-
-  * Fixed display_errors parsing in ErrorHandler which did not support string values (#1804)
-  * Fixed bug where the previous error handler would not be restored in some cases where StreamHandler fails (#1815)
-  * Fixed normalization error when normalizing incomplete classes (#1833)
-
-### 2.9.1 (2023-02-06)
-
-  * Fixed Logger not being serializable anymore (#1792)
-
-### 2.9.0 (2023-02-05)
-
-  * Deprecated FlowdockHandler & Formatter as the flowdock service was shutdown (#1748)
-  * Added support for enum context values in PsrLogMessageProcessor (#1773)
-  * Added graylog2/gelf-php 2.x support (#1747)
-  * Improved `BrowserConsoleHandler` logging to use more appropriate methods than just console.log in the browser (#1739)
-  * Fixed `WhatFailureGroupHandler` not catching errors happening inside `close()` (#1791)
-  * Fixed datetime field in `GoogleCloudLoggingFormatter` (#1758)
-  * Fixed infinite loop detection within Fibers (#1753)
-  * Fixed `AmqpHandler->setExtraAttributes` not working with buffering handler wrappers (#1781)
-
-### 2.8.0 (2022-07-24)
-
-  * Deprecated `CubeHandler` and `PHPConsoleHandler` as both projects are abandoned and those should not be used anymore (#1734)
-  * Added RFC 5424 level (`7` to `0`) support to `Logger::log` and `Logger::addRecord` to increase interoperability (#1723)
-  * Added support for `__toString` for objects which are not json serializable in `JsonFormatter` (#1733)
-  * Added `GoogleCloudLoggingFormatter` (#1719)
-  * Added support for Predis 2.x (#1732)
-  * Added `AmqpHandler->setExtraAttributes` to allow configuring attributes when using an AMQPExchange (#1724)
-  * Fixed serialization/unserialization of handlers to make sure private properties are included (#1727)
-  * Fixed allowInlineLineBreaks in LineFormatter causing issues with windows paths containing `\n` or `\r` sequences (#1720)
-  * Fixed max normalization depth not being taken into account when formatting exceptions with a deep chain of previous exceptions (#1726)
-  * Fixed PHP 8.2 deprecation warnings (#1722)
-  * Fixed rare race condition or filesystem issue where StreamHandler is unable to create the directory the log should go into yet it exists already (#1678)
-
-### 2.7.0 (2022-06-09)
-
-  * Added `$datetime` parameter to `Logger::addRecord` as low level API to allow logging into the past or future (#1682)
-  * Added `Logger::useLoggingLoopDetection` to allow disabling cyclic logging detection in concurrent frameworks (#1681)
-  * Fixed handling of fatal errors if callPrevious is disabled in ErrorHandler (#1670)
-  * Marked the reusable `Monolog\Test\TestCase` class as `@internal` to make sure PHPStorm does not show it above PHPUnit, you may still use it to test your own handlers/etc though (#1677)
-  * Fixed RotatingFileHandler issue when the date format contained slashes (#1671)
-
-### 2.6.0 (2022-05-10)
-
-  * Deprecated `SwiftMailerHandler`, use `SymfonyMailerHandler` instead
-  * Added `SymfonyMailerHandler` (#1663)
-  * Added ElasticSearch 8.x support to the ElasticsearchHandler (#1662)
-  * Added a way to filter/modify stack traces in LineFormatter (#1665)
-  * Fixed UdpSocket not being able to reopen/reconnect after close()
-  * Fixed infinite loops if a Handler is triggering logging while handling log records
-
-### 2.5.0 (2022-04-08)
-
-  * Added `callType` to IntrospectionProcessor (#1612)
-  * Fixed AsMonologProcessor syntax to be compatible with PHP 7.2 (#1651)
-
-### 2.4.0 (2022-03-14)
-
-  * Added [`Monolog\LogRecord`](src/Monolog/LogRecord.php) interface that can be used to type-hint records like `array|\Monolog\LogRecord $record` to be forward compatible with the upcoming Monolog 3 changes
-  * Added `includeStacktraces` constructor params to LineFormatter & JsonFormatter (#1603)
-  * Added `persistent`, `timeout`, `writingTimeout`, `connectionTimeout`, `chunkSize` constructor params to SocketHandler and derivatives (#1600)
-  * Added `AsMonologProcessor` PHP attribute which can help autowiring / autoconfiguration of processors if frameworks / integrations decide to make use of it. This is useless when used purely with Monolog (#1637)
-  * Added support for keeping native BSON types as is in MongoDBFormatter (#1620)
-  * Added support for a `user_agent` key in WebProcessor, disabled by default but you can use it by configuring the $extraFields you want (#1613)
-  * Added support for username/userIcon in SlackWebhookHandler (#1617)
-  * Added extension points to BrowserConsoleHandler (#1593)
-  * Added record message/context/extra info to exceptions thrown when a StreamHandler cannot open its stream to avoid completely losing the data logged (#1630)
-  * Fixed error handler signature to accept a null $context which happens with internal PHP errors (#1614)
-  * Fixed a few setter methods not returning `self` (#1609)
-  * Fixed handling of records going over the max Telegram message length (#1616)
-
-### 2.3.5 (2021-10-01)
-
-  * Fixed regression in StreamHandler since 2.3.3 on systems with the memory_limit set to >=20GB (#1592)
-
-### 2.3.4 (2021-09-15)
-
-  * Fixed support for psr/log 3.x (#1589)
-
-### 2.3.3 (2021-09-14)
-
-  * Fixed memory usage when using StreamHandler and calling stream_get_contents on the resource you passed to it (#1578, #1577)
-  * Fixed support for psr/log 2.x (#1587)
-  * Fixed some type annotations
-
-### 2.3.2 (2021-07-23)
-
-  * Fixed compatibility with PHP 7.2 - 7.4 when experiencing PCRE errors (#1568)
-
-### 2.3.1 (2021-07-14)
-
-  * Fixed Utils::getClass handling of anonymous classes not being fully compatible with PHP 8 (#1563)
-  * Fixed some `@inheritDoc` annotations having the wrong case
-
-### 2.3.0 (2021-07-05)
-
-  * Added a ton of PHPStan type annotations as well as type aliases on Monolog\Logger for Record, Level and LevelName that you can import (#1557)
-  * Added ability to customize date format when using JsonFormatter (#1561)
-  * Fixed FilterHandler not calling reset on its internal handler when reset() is called on it (#1531)
-  * Fixed SyslogUdpHandler not setting the timezone correctly on DateTimeImmutable instances (#1540)
-  * Fixed StreamHandler thread safety - chunk size set to 2GB now to avoid interlacing when doing concurrent writes (#1553)
-
-### 2.2.0 (2020-12-14)
-
-  * Added JSON_PARTIAL_OUTPUT_ON_ERROR to default json encoding flags, to avoid dropping entire context data or even records due to an invalid subset of it somewhere
-  * Added setDateFormat to NormalizerFormatter (and Line/Json formatters by extension) to allow changing this after object creation
-  * Added RedisPubSubHandler to log records to a Redis channel using PUBLISH
-  * Added support for Elastica 7, and deprecated the $type argument of ElasticaFormatter which is not in use anymore as of Elastica 7
-  * Added support for millisecond write timeouts in SocketHandler, you can now pass floats to setWritingTimeout, e.g. 0.2 is 200ms
-  * Added support for unix sockets in SyslogUdpHandler (set $port to 0 to make the $host a unix socket)
-  * Added handleBatch support for TelegramBotHandler
-  * Added RFC5424e extended date format including milliseconds to SyslogUdpHandler
-  * Added support for configuring handlers with numeric level values in strings (coming from e.g. env vars)
-  * Fixed Wildfire/FirePHP/ChromePHP handling of unicode characters
-  * Fixed PHP 8 issues in SyslogUdpHandler
-  * Fixed internal type error when mbstring is missing
-
-### 2.1.1 (2020-07-23)
-
-  * Fixed removing of json encoding options
-  * Fixed type hint of $level not accepting strings in SendGridHandler and OverflowHandler
-  * Fixed SwiftMailerHandler not accepting email templates with an empty subject
-  * Fixed array access on null in RavenHandler
-  * Fixed unique_id in WebProcessor not being disableable
-
-### 2.1.0 (2020-05-22)
-
-  * Added `JSON_INVALID_UTF8_SUBSTITUTE` to default json flags, so that invalid UTF8 characters now get converted to [�](https://en.wikipedia.org/wiki/Specials_(Unicode_block)#Replacement_character) instead of being converted from ISO-8859-15 to UTF8 as it was before, which was hardly a comprehensive solution
-  * Added `$ignoreEmptyContextAndExtra` option to JsonFormatter to skip empty context/extra entirely from the output
-  * Added `$parseMode`, `$disableWebPagePreview` and `$disableNotification` options to TelegramBotHandler
-  * Added tentative support for PHP 8
-  * NormalizerFormatter::addJsonEncodeOption and removeJsonEncodeOption are now public to allow modifying default json flags
-  * Fixed GitProcessor type error when there is no git repo present
-  * Fixed normalization of SoapFault objects containing deeply nested objects as "detail"
-  * Fixed support for relative paths in RotatingFileHandler
-
-### 2.0.2 (2019-12-20)
-
-  * Fixed ElasticsearchHandler swallowing exceptions details when failing to index log records
-  * Fixed normalization of SoapFault objects containing non-strings as "detail" in LineFormatter
-  * Fixed formatting of resources in JsonFormatter
-  * Fixed RedisHandler failing to use MULTI properly when passed a proxied Redis instance (e.g. in Symfony with lazy services)
-  * Fixed FilterHandler triggering a notice when handleBatch was filtering all records passed to it
-  * Fixed Turkish locale messing up the conversion of level names to their constant values
-
-### 2.0.1 (2019-11-13)
-
-  * Fixed normalization of Traversables to avoid traversing them as not all of them are rewindable
-  * Fixed setFormatter/getFormatter to forward to the nested handler in FilterHandler, FingersCrossedHandler, BufferHandler, OverflowHandler and SamplingHandler
-  * Fixed BrowserConsoleHandler formatting when using multiple styles
-  * Fixed normalization of exception codes to be always integers even for PDOException which have them as numeric strings
-  * Fixed normalization of SoapFault objects containing non-strings as "detail"
-  * Fixed json encoding across all handlers to always attempt recovery of non-UTF-8 strings instead of failing the whole encoding
-  * Fixed ChromePHPHandler to avoid sending more data than latest Chrome versions allow in headers (4KB down from 256KB).
-  * Fixed type error in BrowserConsoleHandler when the context array of log records was not associative.
-
-### 2.0.0 (2019-08-30)
-
-  * BC Break: This is a major release, see [UPGRADE.md](UPGRADE.md) for details if you are coming from a 1.x release
-  * BC Break: Logger methods log/debug/info/notice/warning/error/critical/alert/emergency now have explicit void return types
-  * Added FallbackGroupHandler which works like the WhatFailureGroupHandler but stops dispatching log records as soon as one handler accepted it
-  * Fixed support for UTF-8 when cutting strings to avoid cutting a multibyte-character in half
-  * Fixed normalizers handling of exception backtraces to avoid serializing arguments in some cases
-  * Fixed date timezone handling in SyslogUdpHandler
-
-### 2.0.0-beta2 (2019-07-06)
-
-  * BC Break: This is a major release, see [UPGRADE.md](UPGRADE.md) for details if you are coming from a 1.x release
-  * BC Break: PHP 7.2 is now the minimum required PHP version.
-  * BC Break: Removed SlackbotHandler, RavenHandler and HipChatHandler, see [UPGRADE.md](UPGRADE.md) for details
-  * Added OverflowHandler which will only flush log records to its nested handler when reaching a certain amount of logs (i.e. only pass through when things go really bad)
-  * Added TelegramBotHandler to log records to a [Telegram](https://core.telegram.org/bots/api) bot account
-  * Added support for JsonSerializable when normalizing exceptions
-  * Added support for RFC3164 (outdated BSD syslog protocol) to SyslogUdpHandler
-  * Added SoapFault details to formatted exceptions
-  * Fixed DeduplicationHandler silently failing to start when file could not be opened
-  * Fixed issue in GroupHandler and WhatFailureGroupHandler where setting multiple processors would duplicate records
-  * Fixed GelfFormatter losing some data when one attachment was too long
-  * Fixed issue in SignalHandler restarting syscalls functionality
-  * Improved performance of LogglyHandler when sending multiple logs in a single request
-
-### 2.0.0-beta1 (2018-12-08)
-
-  * BC Break: This is a major release, see [UPGRADE.md](UPGRADE.md) for details if you are coming from a 1.x release
-  * BC Break: PHP 7.1 is now the minimum required PHP version.
-  * BC Break: Quite a few interface changes, only relevant if you implemented your own handlers/processors/formatters
-  * BC Break: Removed non-PSR-3 methods to add records, all the `add*` (e.g. `addWarning`) methods as well as `emerg`, `crit`, `err` and `warn`
-  * BC Break: The record timezone is now set per Logger instance and not statically anymore
-  * BC Break: There is no more default handler configured on empty Logger instances
-  * BC Break: ElasticSearchHandler renamed to ElasticaHandler
-  * BC Break: Various handler-specific breaks, see [UPGRADE.md](UPGRADE.md) for details
-  * Added scalar type hints and return hints in all the places it was possible. Switched strict_types on for more reliability.
-  * Added DateTimeImmutable support, all record datetime are now immutable, and will toString/json serialize with the correct date format, including microseconds (unless disabled)
-  * Added timezone and microseconds to the default date format
-  * Added SendGridHandler to use the SendGrid API to send emails
-  * Added LogmaticHandler to use the Logmatic.io API to store log records
-  * Added SqsHandler to send log records to an AWS SQS queue
-  * Added ElasticsearchHandler to send records via the official ES library. Elastica users should now use ElasticaHandler instead of ElasticSearchHandler
-  * Added NoopHandler which is similar to the NullHandle but does not prevent the bubbling of log records to handlers further down the configuration, useful for temporarily disabling a handler in configuration files
-  * Added ProcessHandler to write log output to the STDIN of a given process
-  * Added HostnameProcessor that adds the machine's hostname to log records
-  * Added a `$dateFormat` option to the PsrLogMessageProcessor which lets you format DateTime instances nicely
-  * Added support for the PHP 7.x `mongodb` extension in the MongoDBHandler
-  * Fixed many minor issues in various handlers, and probably added a few regressions too
-
-### 1.26.1 (2021-05-28)
-
-  * Fixed PHP 8.1 deprecation warning
-
-### 1.26.0 (2020-12-14)
-
-  * Added $dateFormat and $removeUsedContextFields arguments to PsrLogMessageProcessor (backport from 2.x)
-
-### 1.25.5 (2020-07-23)
-
-  * Fixed array access on null in RavenHandler
-  * Fixed unique_id in WebProcessor not being disableable
-
-### 1.25.4 (2020-05-22)
-
-  * Fixed GitProcessor type error when there is no git repo present
-  * Fixed normalization of SoapFault objects containing deeply nested objects as "detail"
-  * Fixed support for relative paths in RotatingFileHandler
-
-### 1.25.3 (2019-12-20)
-
-  * Fixed formatting of resources in JsonFormatter
-  * Fixed RedisHandler failing to use MULTI properly when passed a proxied Redis instance (e.g. in Symfony with lazy services)
-  * Fixed FilterHandler triggering a notice when handleBatch was filtering all records passed to it
-  * Fixed Turkish locale messing up the conversion of level names to their constant values
-
-### 1.25.2 (2019-11-13)
-
-  * Fixed normalization of Traversables to avoid traversing them as not all of them are rewindable
-  * Fixed setFormatter/getFormatter to forward to the nested handler in FilterHandler, FingersCrossedHandler, BufferHandler and SamplingHandler
-  * Fixed BrowserConsoleHandler formatting when using multiple styles
-  * Fixed normalization of exception codes to be always integers even for PDOException which have them as numeric strings
-  * Fixed normalization of SoapFault objects containing non-strings as "detail"
-  * Fixed json encoding across all handlers to always attempt recovery of non-UTF-8 strings instead of failing the whole encoding
-
-### 1.25.1 (2019-09-06)
-
-  * Fixed forward-compatible interfaces to be compatible with Monolog 1.x too.
-
-### 1.25.0 (2019-09-06)
-
-  * Deprecated SlackbotHandler, use SlackWebhookHandler or SlackHandler instead
-  * Deprecated RavenHandler, use sentry/sentry 2.x and their Sentry\Monolog\Handler instead
-  * Deprecated HipChatHandler, migrate to Slack and use SlackWebhookHandler or SlackHandler instead
-  * Added forward-compatible interfaces and traits FormattableHandlerInterface, FormattableHandlerTrait, ProcessableHandlerInterface, ProcessableHandlerTrait. If you use modern PHP and want to make code compatible with Monolog 1 and 2 this can help. You will have to require at least Monolog 1.25 though.
-  * Added support for RFC3164 (outdated BSD syslog protocol) to SyslogUdpHandler
-  * Fixed issue in GroupHandler and WhatFailureGroupHandler where setting multiple processors would duplicate records
-  * Fixed issue in SignalHandler restarting syscalls functionality
-  * Fixed normalizers handling of exception backtraces to avoid serializing arguments in some cases
-  * Fixed ZendMonitorHandler to work with the latest Zend Server versions
-  * Fixed ChromePHPHandler to avoid sending more data than latest Chrome versions allow in headers (4KB down from 256KB).
-
-### 1.24.0 (2018-11-05)
-
-  * BC Notice: If you are extending any of the Monolog's Formatters' `normalize` method, make sure you add the new `$depth = 0` argument to your function signature to avoid strict PHP warnings.
-  * Added a `ResettableInterface` in order to reset/reset/clear/flush handlers and processors
-  * Added a `ProcessorInterface` as an optional way to label a class as being a processor (mostly useful for autowiring dependency containers)
-  * Added a way to log signals being received using Monolog\SignalHandler
-  * Added ability to customize error handling at the Logger level using Logger::setExceptionHandler
-  * Added InsightOpsHandler to migrate users of the LogEntriesHandler
-  * Added protection to NormalizerFormatter against circular and very deep structures, it now stops normalizing at a depth of 9
-  * Added capture of stack traces to ErrorHandler when logging PHP errors
-  * Added RavenHandler support for a `contexts` context or extra key to forward that to Sentry's contexts
-  * Added forwarding of context info to FluentdFormatter
-  * Added SocketHandler::setChunkSize to override the default chunk size in case you must send large log lines to rsyslog for example
-  * Added ability to extend/override BrowserConsoleHandler
-  * Added SlackWebhookHandler::getWebhookUrl and SlackHandler::getToken to enable class extensibility
-  * Added SwiftMailerHandler::getSubjectFormatter to enable class extensibility
-  * Dropped official support for HHVM in test builds
-  * Fixed normalization of exception traces when call_user_func is used to avoid serializing objects and the data they contain
-  * Fixed naming of fields in Slack handler, all field names are now capitalized in all cases
-  * Fixed HipChatHandler bug where slack dropped messages randomly
-  * Fixed normalization of objects in Slack handlers
-  * Fixed support for PHP7's Throwable in NewRelicHandler
-  * Fixed race bug when StreamHandler sometimes incorrectly reported it failed to create a directory
-  * Fixed table row styling issues in HtmlFormatter
-  * Fixed RavenHandler dropping the message when logging exception
-  * Fixed WhatFailureGroupHandler skipping processors when using handleBatch
-    and implement it where possible
-  * Fixed display of anonymous class names
-
-### 1.23.0 (2017-06-19)
-
-  * Improved SyslogUdpHandler's support for RFC5424 and added optional `$ident` argument
-  * Fixed GelfHandler truncation to be per field and not per message
-  * Fixed compatibility issue with PHP <5.3.6
-  * Fixed support for headless Chrome in ChromePHPHandler
-  * Fixed support for latest Aws SDK in DynamoDbHandler
-  * Fixed support for SwiftMailer 6.0+ in SwiftMailerHandler
-
-### 1.22.1 (2017-03-13)
-
-  * Fixed lots of minor issues in the new Slack integrations
-  * Fixed support for allowInlineLineBreaks in LineFormatter when formatting exception backtraces
-
-### 1.22.0 (2016-11-26)
-
-  * Added SlackbotHandler and SlackWebhookHandler to set up Slack integration more easily
-  * Added MercurialProcessor to add mercurial revision and branch names to log records
-  * Added support for AWS SDK v3 in DynamoDbHandler
-  * Fixed fatal errors occurring when normalizing generators that have been fully consumed
-  * Fixed RollbarHandler to include a level (rollbar level), monolog_level (original name), channel and datetime (unix)
-  * Fixed RollbarHandler not flushing records automatically, calling close() explicitly is not necessary anymore
-  * Fixed SyslogUdpHandler to avoid sending empty frames
-  * Fixed a few PHP 7.0 and 7.1 compatibility issues
-
-### 1.21.0 (2016-07-29)
-
-  * Break: Reverted the addition of $context when the ErrorHandler handles regular php errors from 1.20.0 as it was causing issues
-  * Added support for more formats in RotatingFileHandler::setFilenameFormat as long as they have Y, m and d in order
-  * Added ability to format the main line of text the SlackHandler sends by explicitly setting a formatter on the handler
-  * Added information about SoapFault instances in NormalizerFormatter
-  * Added $handleOnlyReportedErrors option on ErrorHandler::registerErrorHandler (default true) to allow logging of all errors no matter the error_reporting level
-
-### 1.20.0 (2016-07-02)
-
-  * Added FingersCrossedHandler::activate() to manually trigger the handler regardless of the activation policy
-  * Added StreamHandler::getUrl to retrieve the stream's URL
-  * Added ability to override addRow/addTitle in HtmlFormatter
-  * Added the $context to context information when the ErrorHandler handles a regular php error
-  * Deprecated RotatingFileHandler::setFilenameFormat to only support 3 formats: Y, Y-m and Y-m-d
-  * Fixed WhatFailureGroupHandler to work with PHP7 throwables
-  * Fixed a few minor bugs
-
-### 1.19.0 (2016-04-12)
-
-  * Break: StreamHandler will not close streams automatically that it does not own. If you pass in a stream (not a path/url), then it will not close it for you. You can retrieve those using getStream() if needed
-  * Added DeduplicationHandler to remove duplicate records from notifications across multiple requests, useful for email or other notifications on errors
-  * Added ability to use `%message%` and other LineFormatter replacements in the subject line of emails sent with NativeMailHandler and SwiftMailerHandler
-  * Fixed HipChatHandler handling of long messages
-
-### 1.18.2 (2016-04-02)
-
-  * Fixed ElasticaFormatter to use more precise dates
-  * Fixed GelfMessageFormatter sending too long messages
-
-### 1.18.1 (2016-03-13)
-
-  * Fixed SlackHandler bug where slack dropped messages randomly
-  * Fixed RedisHandler issue when using with the PHPRedis extension
-  * Fixed AmqpHandler content-type being incorrectly set when using with the AMQP extension
-  * Fixed BrowserConsoleHandler regression
-
-### 1.18.0 (2016-03-01)
-
-  * Added optional reduction of timestamp precision via `Logger->useMicrosecondTimestamps(false)`, disabling it gets you a bit of performance boost but reduces the precision to the second instead of microsecond
-  * Added possibility to skip some extra stack frames in IntrospectionProcessor if you have some library wrapping Monolog that is always adding frames
-  * Added `Logger->withName` to clone a logger (keeping all handlers) with a new name
-  * Added FluentdFormatter for the Fluentd unix socket protocol
-  * Added HandlerWrapper base class to ease the creation of handler wrappers, just extend it and override as needed
-  * Added support for replacing context sub-keys using `%context.*%` in LineFormatter
-  * Added support for `payload` context value in RollbarHandler
-  * Added setRelease to RavenHandler to describe the application version, sent with every log
-  * Added support for `fingerprint` context value in RavenHandler
-  * Fixed JSON encoding errors that would gobble up the whole log record, we now handle those more gracefully by dropping chars as needed
-  * Fixed write timeouts in SocketHandler and derivatives, set to 10sec by default, lower it with `setWritingTimeout()`
-  * Fixed PHP7 compatibility with regard to Exception/Throwable handling in a few places
-
-### 1.17.2 (2015-10-14)
-
-  * Fixed ErrorHandler compatibility with non-Monolog PSR-3 loggers
-  * Fixed SlackHandler handling to use slack functionalities better
-  * Fixed SwiftMailerHandler bug when sending multiple emails they all had the same id
-  * Fixed 5.3 compatibility regression
-
-### 1.17.1 (2015-08-31)
-
-  * Fixed RollbarHandler triggering PHP notices
-
-### 1.17.0 (2015-08-30)
-
-  * Added support for `checksum` and `release` context/extra values in RavenHandler
-  * Added better support for exceptions in RollbarHandler
-  * Added UidProcessor::getUid
-  * Added support for showing the resource type in NormalizedFormatter
-  * Fixed IntrospectionProcessor triggering PHP notices
-
-### 1.16.0 (2015-08-09)
-
-  * Added IFTTTHandler to notify ifttt.com triggers
-  * Added Logger::setHandlers() to allow setting/replacing all handlers
-  * Added $capSize in RedisHandler to cap the log size
-  * Fixed StreamHandler creation of directory to only trigger when the first log write happens
-  * Fixed bug in the handling of curl failures
-  * Fixed duplicate logging of fatal errors when both error and fatal error handlers are registered in monolog's ErrorHandler
-  * Fixed missing fatal errors records with handlers that need to be closed to flush log records
-  * Fixed TagProcessor::addTags support for associative arrays
-
-### 1.15.0 (2015-07-12)
-
-  * Added addTags and setTags methods to change a TagProcessor
-  * Added automatic creation of directories if they are missing for a StreamHandler to open a log file
-  * Added retry functionality to Loggly, Cube and Mandrill handlers so they retry up to 5 times in case of network failure
-  * Fixed process exit code being incorrectly reset to 0 if ErrorHandler::registerExceptionHandler was used
-  * Fixed HTML/JS escaping in BrowserConsoleHandler
-  * Fixed JSON encoding errors being silently suppressed (PHP 5.5+ only)
-
-### 1.14.0 (2015-06-19)
-
-  * Added PHPConsoleHandler to send record to Chrome's PHP Console extension and library
-  * Added support for objects implementing __toString in the NormalizerFormatter
-  * Added support for HipChat's v2 API in HipChatHandler
-  * Added Logger::setTimezone() to initialize the timezone monolog should use in case date.timezone isn't correct for your app
-  * Added an option to send formatted message instead of the raw record on PushoverHandler via ->useFormattedMessage(true)
-  * Fixed curl errors being silently suppressed
-
-### 1.13.1 (2015-03-09)
-
-  * Fixed regression in HipChat requiring a new token to be created
-
-### 1.13.0 (2015-03-05)
-
-  * Added Registry::hasLogger to check for the presence of a logger instance
-  * Added context.user support to RavenHandler
-  * Added HipChat API v2 support in the HipChatHandler
-  * Added NativeMailerHandler::addParameter to pass params to the mail() process
-  * Added context data to SlackHandler when $includeContextAndExtra is true
-  * Added ability to customize the Swift_Message per-email in SwiftMailerHandler
-  * Fixed SwiftMailerHandler to lazily create message instances if a callback is provided
-  * Fixed serialization of INF and NaN values in Normalizer and LineFormatter
-
-### 1.12.0 (2014-12-29)
-
-  * Break: HandlerInterface::isHandling now receives a partial record containing only a level key. This was always the intent and does not break any Monolog handler but is strictly speaking a BC break and you should check if you relied on any other field in your own handlers.
-  * Added PsrHandler to forward records to another PSR-3 logger
-  * Added SamplingHandler to wrap around a handler and include only every Nth record
-  * Added MongoDBFormatter to support better storage with MongoDBHandler (it must be enabled manually for now)
-  * Added exception codes in the output of most formatters
-  * Added LineFormatter::includeStacktraces to enable exception stack traces in logs (uses more than one line)
-  * Added $useShortAttachment to SlackHandler to minify attachment size and $includeExtra to append extra data
-  * Added $host to HipChatHandler for users of private instances
-  * Added $transactionName to NewRelicHandler and support for a transaction_name context value
-  * Fixed MandrillHandler to avoid outputting API call responses
-  * Fixed some non-standard behaviors in SyslogUdpHandler
-
-### 1.11.0 (2014-09-30)
-
-  * Break: The NewRelicHandler extra and context data are now prefixed with extra_ and context_ to avoid clashes. Watch out if you have scripts reading those from the API and rely on names
-  * Added WhatFailureGroupHandler to suppress any exception coming from the wrapped handlers and avoid chain failures if a logging service fails
-  * Added MandrillHandler to send emails via the Mandrillapp.com API
-  * Added SlackHandler to log records to a Slack.com account
-  * Added FleepHookHandler to log records to a Fleep.io account
-  * Added LogglyHandler::addTag to allow adding tags to an existing handler
-  * Added $ignoreEmptyContextAndExtra to LineFormatter to avoid empty [] at the end
-  * Added $useLocking to StreamHandler and RotatingFileHandler to enable flock() while writing
-  * Added support for PhpAmqpLib in the AmqpHandler
-  * Added FingersCrossedHandler::clear and BufferHandler::clear to reset them between batches in long running jobs
-  * Added support for adding extra fields from $_SERVER in the WebProcessor
-  * Fixed support for non-string values in PrsLogMessageProcessor
-  * Fixed SwiftMailer messages being sent with the wrong date in long running scripts
-  * Fixed minor PHP 5.6 compatibility issues
-  * Fixed BufferHandler::close being called twice
-
-### 1.10.0 (2014-06-04)
-
-  * Added Logger::getHandlers() and Logger::getProcessors() methods
-  * Added $passthruLevel argument to FingersCrossedHandler to let it always pass some records through even if the trigger level is not reached
-  * Added support for extra data in NewRelicHandler
-  * Added $expandNewlines flag to the ErrorLogHandler to create multiple log entries when a message has multiple lines
-
-### 1.9.1 (2014-04-24)
-
-  * Fixed regression in RotatingFileHandler file permissions
-  * Fixed initialization of the BufferHandler to make sure it gets flushed after receiving records
-  * Fixed ChromePHPHandler and FirePHPHandler's activation strategies to be more conservative
-
-### 1.9.0 (2014-04-20)
-
-  * Added LogEntriesHandler to send logs to a LogEntries account
-  * Added $filePermissions to tweak file mode on StreamHandler and RotatingFileHandler
-  * Added $useFormatting flag to MemoryProcessor to make it send raw data in bytes
-  * Added support for table formatting in FirePHPHandler via the table context key
-  * Added a TagProcessor to add tags to records, and support for tags in RavenHandler
-  * Added $appendNewline flag to the JsonFormatter to enable using it when logging to files
-  * Added sound support to the PushoverHandler
-  * Fixed multi-threading support in StreamHandler
-  * Fixed empty headers issue when ChromePHPHandler received no records
-  * Fixed default format of the ErrorLogHandler
-
-### 1.8.0 (2014-03-23)
-
-  * Break: the LineFormatter now strips newlines by default because this was a bug, set $allowInlineLineBreaks to true if you need them
-  * Added BrowserConsoleHandler to send logs to any browser's console via console.log() injection in the output
-  * Added FilterHandler to filter records and only allow those of a given list of levels through to the wrapped handler
-  * Added FlowdockHandler to send logs to a Flowdock account
-  * Added RollbarHandler to send logs to a Rollbar account
-  * Added HtmlFormatter to send prettier log emails with colors for each log level
-  * Added GitProcessor to add the current branch/commit to extra record data
-  * Added a Monolog\Registry class to allow easier global access to pre-configured loggers
-  * Added support for the new official graylog2/gelf-php lib for GelfHandler, upgrade if you can by replacing the mlehner/gelf-php requirement
-  * Added support for HHVM
-  * Added support for Loggly batch uploads
-  * Added support for tweaking the content type and encoding in NativeMailerHandler
-  * Added $skipClassesPartials to tweak the ignored classes in the IntrospectionProcessor
-  * Fixed batch request support in GelfHandler
-
-### 1.7.0 (2013-11-14)
-
-  * Added ElasticSearchHandler to send logs to an Elastic Search server
-  * Added DynamoDbHandler and ScalarFormatter to send logs to Amazon's Dynamo DB
-  * Added SyslogUdpHandler to send logs to a remote syslogd server
-  * Added LogglyHandler to send logs to a Loggly account
-  * Added $level to IntrospectionProcessor so it only adds backtraces when needed
-  * Added $version to LogstashFormatter to allow using the new v1 Logstash format
-  * Added $appName to NewRelicHandler
-  * Added configuration of Pushover notification retries/expiry
-  * Added $maxColumnWidth to NativeMailerHandler to change the 70 chars default
-  * Added chainability to most setters for all handlers
-  * Fixed RavenHandler batch processing so it takes the message from the record with highest priority
-  * Fixed HipChatHandler batch processing so it sends all messages at once
-  * Fixed issues with eAccelerator
-  * Fixed and improved many small things
-
-### 1.6.0 (2013-07-29)
-
-  * Added HipChatHandler to send logs to a HipChat chat room
-  * Added ErrorLogHandler to send logs to PHP's error_log function
-  * Added NewRelicHandler to send logs to NewRelic's service
-  * Added Monolog\ErrorHandler helper class to register a Logger as exception/error/fatal handler
-  * Added ChannelLevelActivationStrategy for the FingersCrossedHandler to customize levels by channel
-  * Added stack traces output when normalizing exceptions (json output & co)
-  * Added Monolog\Logger::API constant (currently 1)
-  * Added support for ChromePHP's v4.0 extension
-  * Added support for message priorities in PushoverHandler, see $highPriorityLevel and $emergencyLevel
-  * Added support for sending messages to multiple users at once with the PushoverHandler
-  * Fixed RavenHandler's support for batch sending of messages (when behind a Buffer or FingersCrossedHandler)
-  * Fixed normalization of Traversables with very large data sets, only the first 1000 items are shown now
-  * Fixed issue in RotatingFileHandler when an open_basedir restriction is active
-  * Fixed minor issues in RavenHandler and bumped the API to Raven 0.5.0
-  * Fixed SyslogHandler issue when many were used concurrently with different facilities
-
-### 1.5.0 (2013-04-23)
-
-  * Added ProcessIdProcessor to inject the PID in log records
-  * Added UidProcessor to inject a unique identifier to all log records of one request/run
-  * Added support for previous exceptions in the LineFormatter exception serialization
-  * Added Monolog\Logger::getLevels() to get all available levels
-  * Fixed ChromePHPHandler so it avoids sending headers larger than Chrome can handle
-
-### 1.4.1 (2013-04-01)
-
-  * Fixed exception formatting in the LineFormatter to be more minimalistic
-  * Fixed RavenHandler's handling of context/extra data, requires Raven client >0.1.0
-  * Fixed log rotation in RotatingFileHandler to work with long running scripts spanning multiple days
-  * Fixed WebProcessor array access so it checks for data presence
-  * Fixed Buffer, Group and FingersCrossed handlers to make use of their processors
-
-### 1.4.0 (2013-02-13)
-
-  * Added RedisHandler to log to Redis via the Predis library or the phpredis extension
-  * Added ZendMonitorHandler to log to the Zend Server monitor
-  * Added the possibility to pass arrays of handlers and processors directly in the Logger constructor
-  * Added `$useSSL` option to the PushoverHandler which is enabled by default
-  * Fixed ChromePHPHandler and FirePHPHandler issue when multiple instances are used simultaneously
-  * Fixed header injection capability in the NativeMailHandler
-
-### 1.3.1 (2013-01-11)
-
-  * Fixed LogstashFormatter to be usable with stream handlers
-  * Fixed GelfMessageFormatter levels on Windows
-
-### 1.3.0 (2013-01-08)
-
-  * Added PSR-3 compliance, the `Monolog\Logger` class is now an instance of `Psr\Log\LoggerInterface`
-  * Added PsrLogMessageProcessor that you can selectively enable for full PSR-3 compliance
-  * Added LogstashFormatter (combine with SocketHandler or StreamHandler to send logs to Logstash)
-  * Added PushoverHandler to send mobile notifications
-  * Added CouchDBHandler and DoctrineCouchDBHandler
-  * Added RavenHandler to send data to Sentry servers
-  * Added support for the new MongoClient class in MongoDBHandler
-  * Added microsecond precision to log records' timestamps
-  * Added `$flushOnOverflow` param to BufferHandler to flush by batches instead of losing
-    the oldest entries
-  * Fixed normalization of objects with cyclic references
-
-### 1.2.1 (2012-08-29)
-
-  * Added new $logopts arg to SyslogHandler to provide custom openlog options
-  * Fixed fatal error in SyslogHandler
-
-### 1.2.0 (2012-08-18)
-
-  * Added AmqpHandler (for use with AMQP servers)
-  * Added CubeHandler
-  * Added NativeMailerHandler::addHeader() to send custom headers in mails
-  * Added the possibility to specify more than one recipient in NativeMailerHandler
-  * Added the possibility to specify float timeouts in SocketHandler
-  * Added NOTICE and EMERGENCY levels to conform with RFC 5424
-  * Fixed the log records to use the php default timezone instead of UTC
-  * Fixed BufferHandler not being flushed properly on PHP fatal errors
-  * Fixed normalization of exotic resource types
-  * Fixed the default format of the SyslogHandler to avoid duplicating datetimes in syslog
-
-### 1.1.0 (2012-04-23)
-
-  * Added Monolog\Logger::isHandling() to check if a handler will
-    handle the given log level
-  * Added ChromePHPHandler
-  * Added MongoDBHandler
-  * Added GelfHandler (for use with Graylog2 servers)
-  * Added SocketHandler (for use with syslog-ng for example)
-  * Added NormalizerFormatter
-  * Added the possibility to change the activation strategy of the FingersCrossedHandler
-  * Added possibility to show microseconds in logs
-  * Added `server` and `referer` to WebProcessor output
-
-### 1.0.2 (2011-10-24)
-
-  * Fixed bug in IE with large response headers and FirePHPHandler
-
-### 1.0.1 (2011-08-25)
-
-  * Added MemoryPeakUsageProcessor and MemoryUsageProcessor
-  * Added Monolog\Logger::getName() to get a logger's channel name
-
-### 1.0.0 (2011-07-06)
-
-  * Added IntrospectionProcessor to get info from where the logger was called
-  * Fixed WebProcessor in CLI
-
-### 1.0.0-RC1 (2011-07-01)
-
-  * Initial release
diff --git a/monolog/vendor/monolog/monolog/LICENSE b/monolog/vendor/monolog/monolog/LICENSE
deleted file mode 100644
index aa2a0426..00000000
--- a/monolog/vendor/monolog/monolog/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2011-2020 Jordi Boggiano
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is furnished
-to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
diff --git a/monolog/vendor/monolog/monolog/README.md b/monolog/vendor/monolog/monolog/README.md
deleted file mode 100644
index bfcae0c0..00000000
--- a/monolog/vendor/monolog/monolog/README.md
+++ /dev/null
@@ -1,112 +0,0 @@
-# Monolog - Logging for PHP [![Continuous Integration](https://github.com/Seldaek/monolog/workflows/Continuous%20Integration/badge.svg?branch=main)](https://github.com/Seldaek/monolog/actions)
-
-[![Total Downloads](https://img.shields.io/packagist/dt/monolog/monolog.svg)](https://packagist.org/packages/monolog/monolog)
-[![Latest Stable Version](https://img.shields.io/packagist/v/monolog/monolog.svg)](https://packagist.org/packages/monolog/monolog)
-
-
-Monolog sends your logs to files, sockets, inboxes, databases and various
-web services. See the complete list of handlers below. Special handlers
-allow you to build advanced logging strategies.
-
-This library implements the [PSR-3](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-3-logger-interface.md)
-interface that you can type-hint against in your own libraries to keep
-a maximum of interoperability. You can also use it in your applications to
-make sure you can always use another compatible logger at a later time.
-As of 1.11.0 Monolog public APIs will also accept PSR-3 log levels.
-Internally Monolog still uses its own level scheme since it predates PSR-3.
-
-## Installation
-
-Install the latest version with
-
-```bash
-$ composer require monolog/monolog
-```
-
-## Basic Usage
-
-```php
-<?php
-
-use Monolog\Logger;
-use Monolog\Handler\StreamHandler;
-
-// create a log channel
-$log = new Logger('name');
-$log->pushHandler(new StreamHandler('path/to/your.log', Logger::WARNING));
-
-// add records to the log
-$log->warning('Foo');
-$log->error('Bar');
-```
-
-## Documentation
-
-- [Usage Instructions](doc/01-usage.md)
-- [Handlers, Formatters and Processors](doc/02-handlers-formatters-processors.md)
-- [Utility Classes](doc/03-utilities.md)
-- [Extending Monolog](doc/04-extending.md)
-- [Log Record Structure](doc/message-structure.md)
-
-## Support Monolog Financially
-
-Get supported Monolog and help fund the project with the [Tidelift Subscription](https://tidelift.com/subscription/pkg/packagist-monolog-monolog?utm_source=packagist-monolog-monolog&utm_medium=referral&utm_campaign=enterprise) or via [GitHub sponsorship](https://github.com/sponsors/Seldaek). 
-
-Tidelift delivers commercial support and maintenance for the open source dependencies you use to build your applications. Save time, reduce risk, and improve code health, while paying the maintainers of the exact dependencies you use.
-
-## Third Party Packages
-
-Third party handlers, formatters and processors are
-[listed in the wiki](https://github.com/Seldaek/monolog/wiki/Third-Party-Packages). You
-can also add your own there if you publish one.
-
-## About
-
-### Requirements
-
-- Monolog `^2.0` works with PHP 7.2 or above, use Monolog `^1.25` for PHP 5.3+ support.
-
-### Support
-
-Monolog 1.x support is somewhat limited at this point and only important fixes will be done. You should migrate to Monolog 2 where possible to benefit from all the latest features and fixes.
-
-### Submitting bugs and feature requests
-
-Bugs and feature request are tracked on [GitHub](https://github.com/Seldaek/monolog/issues)
-
-### Framework Integrations
-
-- Frameworks and libraries using [PSR-3](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-3-logger-interface.md)
-  can be used very easily with Monolog since it implements the interface.
-- [Symfony](http://symfony.com) comes out of the box with Monolog.
-- [Laravel](http://laravel.com/) comes out of the box with Monolog.
-- [Lumen](http://lumen.laravel.com/) comes out of the box with Monolog.
-- [PPI](https://github.com/ppi/framework) comes out of the box with Monolog.
-- [CakePHP](http://cakephp.org/) is usable with Monolog via the [cakephp-monolog](https://github.com/jadb/cakephp-monolog) plugin.
-- [Slim](http://www.slimframework.com/) is usable with Monolog via the [Slim-Monolog](https://github.com/Flynsarmy/Slim-Monolog) log writer.
-- [XOOPS 2.6](http://xoops.org/) comes out of the box with Monolog.
-- [Aura.Web_Project](https://github.com/auraphp/Aura.Web_Project) comes out of the box with Monolog.
-- [Nette Framework](http://nette.org/en/) is usable with Monolog via the [contributte/monolog](https://github.com/contributte/monolog) or [orisai/nette-monolog](https://github.com/orisai/nette-monolog) extensions.
-- [Proton Micro Framework](https://github.com/alexbilbie/Proton) comes out of the box with Monolog.
-- [FuelPHP](http://fuelphp.com/) comes out of the box with Monolog.
-- [Equip Framework](https://github.com/equip/framework) comes out of the box with Monolog.
-- [Yii 2](http://www.yiiframework.com/) is usable with Monolog via the [yii2-monolog](https://github.com/merorafael/yii2-monolog) or [yii2-psr-log-target](https://github.com/samdark/yii2-psr-log-target) plugins.
-- [Hawkbit Micro Framework](https://github.com/HawkBitPhp/hawkbit) comes out of the box with Monolog.
-- [SilverStripe 4](https://www.silverstripe.org/) comes out of the box with Monolog.
-- [Drupal](https://www.drupal.org/) is usable with Monolog via the [monolog](https://www.drupal.org/project/monolog) module.
-- [Aimeos ecommerce framework](https://aimeos.org/) is usable with Monolog via the [ai-monolog](https://github.com/aimeos/ai-monolog) extension.
-- [Magento](https://magento.com/) comes out of the box with Monolog.
-
-### Author
-
-Jordi Boggiano - <j.boggiano@seld.be> - <http://twitter.com/seldaek><br />
-See also the list of [contributors](https://github.com/Seldaek/monolog/contributors) who participated in this project.
-
-### License
-
-Monolog is licensed under the MIT License - see the [LICENSE](LICENSE) file for details
-
-### Acknowledgements
-
-This library is heavily inspired by Python's [Logbook](https://logbook.readthedocs.io/en/stable/)
-library, although most concepts have been adjusted to fit to the PHP world.
diff --git a/monolog/vendor/monolog/monolog/UPGRADE.md b/monolog/vendor/monolog/monolog/UPGRADE.md
deleted file mode 100644
index 84e15e6b..00000000
--- a/monolog/vendor/monolog/monolog/UPGRADE.md
+++ /dev/null
@@ -1,72 +0,0 @@
-### 2.0.0
-
-- `Monolog\Logger::API` can be used to distinguish between a Monolog `1` and `2`
-  install of Monolog when writing integration code.
-
-- Removed non-PSR-3 methods to add records, all the `add*` (e.g. `addWarning`)
-  methods as well as `emerg`, `crit`, `err` and `warn`.
-
-- DateTime are now formatted with a timezone and microseconds (unless disabled).
-  Various formatters and log output might be affected, which may mess with log parsing
-  in some cases.
-
-- The `datetime` in every record array is now a DateTimeImmutable, not that you
-  should have been modifying these anyway.
-
-- The timezone is now set per Logger instance and not statically, either
-  via ->setTimezone or passed in the constructor. Calls to Logger::setTimezone
-  should be converted.
-
-- `HandlerInterface` has been split off and two new interfaces now exist for
-  more granular controls: `ProcessableHandlerInterface` and
-  `FormattableHandlerInterface`. Handlers not extending `AbstractHandler`
-  should make sure to implement the relevant interfaces.
-
-- `HandlerInterface` now requires the `close` method to be implemented. This
-  only impacts you if you implement the interface yourself, but you can extend
-  the new `Monolog\Handler\Handler` base class too.
-
-- There is no more default handler configured on empty Logger instances, if
-  you were relying on that you will not get any output anymore, make sure to
-  configure the handler you need.
-
-#### LogglyFormatter
-
-- The records' `datetime` is not sent anymore. Only `timestamp` is sent to Loggly.
-
-#### AmqpHandler
-
-- Log levels are not shortened to 4 characters anymore. e.g. a warning record
-  will be sent using the `warning.channel` routing key instead of `warn.channel`
-  as in 1.x.
-- The exchange name does not default to 'log' anymore, and it is completely ignored
-  now for the AMQP extension users. Only PHPAmqpLib uses it if provided.
-
-#### RotatingFileHandler
-
-- The file name format must now contain `{date}` and the date format must be set
-  to one of the predefined FILE_PER_* constants to avoid issues with file rotation.
-  See `setFilenameFormat`.
-
-#### LogstashFormatter
-
-- Removed Logstash V0 support
-- Context/extra prefix has been removed in favor of letting users configure the exact key being sent
-- Context/extra data are now sent as an object instead of single keys
-
-#### HipChatHandler
-
-- Removed deprecated HipChat handler, migrate to Slack and use SlackWebhookHandler or SlackHandler instead
-
-#### SlackbotHandler
-
-- Removed deprecated SlackbotHandler handler, use SlackWebhookHandler or SlackHandler instead
-
-#### RavenHandler
-
-- Removed deprecated RavenHandler handler, use sentry/sentry 2.x and their Sentry\Monolog\Handler instead
-
-#### ElasticSearchHandler
-
-- As support for the official Elasticsearch library was added, the former ElasticSearchHandler has been
-  renamed to ElasticaHandler and the new one added as ElasticsearchHandler.
diff --git a/monolog/vendor/monolog/monolog/composer.json b/monolog/vendor/monolog/monolog/composer.json
deleted file mode 100644
index b9437d6d..00000000
--- a/monolog/vendor/monolog/monolog/composer.json
+++ /dev/null
@@ -1,81 +0,0 @@
-{
-    "name": "monolog/monolog",
-    "description": "Sends your logs to files, sockets, inboxes, databases and various web services",
-    "keywords": ["log", "logging", "psr-3"],
-    "homepage": "https://github.com/Seldaek/monolog",
-    "type": "library",
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "Jordi Boggiano",
-            "email": "j.boggiano@seld.be",
-            "homepage": "https://seld.be"
-        }
-    ],
-    "require": {
-        "php": ">=7.2",
-        "psr/log": "^1.0.1 || ^2.0 || ^3.0"
-    },
-    "require-dev": {
-        "ext-json": "*",
-        "aws/aws-sdk-php": "^2.4.9 || ^3.0",
-        "doctrine/couchdb": "~1.0@dev",
-        "elasticsearch/elasticsearch": "^7 || ^8",
-        "graylog2/gelf-php": "^1.4.2 || ^2@dev",
-        "guzzlehttp/guzzle": "^7.4",
-        "guzzlehttp/psr7": "^2.2",
-        "mongodb/mongodb": "^1.8",
-        "php-amqplib/php-amqplib": "~2.4 || ^3",
-        "phpspec/prophecy": "^1.15",
-        "phpstan/phpstan": "^0.12.91",
-        "phpunit/phpunit": "^8.5.14",
-        "predis/predis": "^1.1 || ^2.0",
-        "rollbar/rollbar": "^1.3 || ^2 || ^3",
-        "ruflin/elastica": "^7",
-        "swiftmailer/swiftmailer": "^5.3|^6.0",
-        "symfony/mailer": "^5.4 || ^6",
-        "symfony/mime": "^5.4 || ^6"
-    },
-    "suggest": {
-        "graylog2/gelf-php": "Allow sending log messages to a GrayLog2 server",
-        "doctrine/couchdb": "Allow sending log messages to a CouchDB server",
-        "ruflin/elastica": "Allow sending log messages to an Elastic Search server",
-        "elasticsearch/elasticsearch": "Allow sending log messages to an Elasticsearch server via official client",
-        "php-amqplib/php-amqplib": "Allow sending log messages to an AMQP server using php-amqplib",
-        "ext-amqp": "Allow sending log messages to an AMQP server (1.0+ required)",
-        "ext-mongodb": "Allow sending log messages to a MongoDB server (via driver)",
-        "mongodb/mongodb": "Allow sending log messages to a MongoDB server (via library)",
-        "aws/aws-sdk-php": "Allow sending log messages to AWS services like DynamoDB",
-        "rollbar/rollbar": "Allow sending log messages to Rollbar",
-        "ext-mbstring": "Allow to work properly with unicode symbols",
-        "ext-sockets": "Allow sending log messages to a Syslog server (via UDP driver)",
-        "ext-curl": "Required to send log messages using the IFTTTHandler, the LogglyHandler, the SendGridHandler, the SlackWebhookHandler or the TelegramBotHandler",
-        "ext-openssl": "Required to send log messages using SSL"
-    },
-    "autoload": {
-        "psr-4": {"Monolog\\": "src/Monolog"}
-    },
-    "autoload-dev": {
-        "psr-4": {"Monolog\\": "tests/Monolog"}
-    },
-    "provide": {
-        "psr/log-implementation": "1.0.0 || 2.0.0 || 3.0.0"
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-main": "2.x-dev"
-        }
-    },
-    "scripts": {
-        "test": "@php vendor/bin/phpunit",
-        "phpstan": "@php vendor/bin/phpstan analyse"
-    },
-    "config": {
-        "lock": false,
-        "sort-packages": true,
-        "platform-check": false,
-        "allow-plugins": {
-            "composer/package-versions-deprecated": true
-        }
-    }
-}
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/Attribute/AsMonologProcessor.php b/monolog/vendor/monolog/monolog/src/Monolog/Attribute/AsMonologProcessor.php
deleted file mode 100644
index 188bbb0d..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/Attribute/AsMonologProcessor.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Attribute;
-
-/**
- * A reusable attribute to help configure a class or a method as a processor.
- * 
- * Using it offers no guarantee: it needs to be leveraged by a Monolog third-party consumer.
- * 
- * Using it with the Monolog library only has no effect at all: processors should still be turned into a callable if
- * needed and manually pushed to the loggers and to the processable handlers.
- */
-#[\Attribute(\Attribute::TARGET_CLASS | \Attribute::TARGET_METHOD | \Attribute::IS_REPEATABLE)]
-class AsMonologProcessor
-{
-    /** @var string|null */
-    public $channel = null;
-    /** @var string|null */
-    public $handler = null;
-    /** @var string|null */
-    public $method = null;
-    
-    /**
-     * @param string|null $channel  The logging channel the processor should be pushed to.
-     * @param string|null $handler  The handler the processor should be pushed to.
-     * @param string|null $method   The method that processes the records (if the attribute is used at the class level).
-     */
-    public function __construct(
-        ?string $channel = null,
-        ?string $handler = null,
-        ?string $method = null
-    ) {
-        $this->channel = $channel;
-        $this->handler = $handler;
-        $this->method = $method;
-    }
-} 
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/DateTimeImmutable.php b/monolog/vendor/monolog/monolog/src/Monolog/DateTimeImmutable.php
deleted file mode 100644
index 6a1ba9b2..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/DateTimeImmutable.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog;
-
-use DateTimeZone;
-
-/**
- * Overrides default json encoding of date time objects
- *
- * @author Menno Holtkamp
- * @author Jordi Boggiano <j.boggiano@seld.be>
- */
-class DateTimeImmutable extends \DateTimeImmutable implements \JsonSerializable
-{
-    /**
-     * @var bool
-     */
-    private $useMicroseconds;
-
-    public function __construct(bool $useMicroseconds, ?DateTimeZone $timezone = null)
-    {
-        $this->useMicroseconds = $useMicroseconds;
-
-        parent::__construct('now', $timezone);
-    }
-
-    public function jsonSerialize(): string
-    {
-        if ($this->useMicroseconds) {
-            return $this->format('Y-m-d\TH:i:s.uP');
-        }
-
-        return $this->format('Y-m-d\TH:i:sP');
-    }
-
-    public function __toString(): string
-    {
-        return $this->jsonSerialize();
-    }
-}
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/ErrorHandler.php b/monolog/vendor/monolog/monolog/src/Monolog/ErrorHandler.php
deleted file mode 100644
index 1406d34e..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/ErrorHandler.php
+++ /dev/null
@@ -1,307 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog;
-
-use Psr\Log\LoggerInterface;
-use Psr\Log\LogLevel;
-
-/**
- * Monolog error handler
- *
- * A facility to enable logging of runtime errors, exceptions and fatal errors.
- *
- * Quick setup: <code>ErrorHandler::register($logger);</code>
- *
- * @author Jordi Boggiano <j.boggiano@seld.be>
- */
-class ErrorHandler
-{
-    /** @var LoggerInterface */
-    private $logger;
-
-    /** @var ?callable */
-    private $previousExceptionHandler = null;
-    /** @var array<class-string, LogLevel::*> an array of class name to LogLevel::* constant mapping */
-    private $uncaughtExceptionLevelMap = [];
-
-    /** @var callable|true|null */
-    private $previousErrorHandler = null;
-    /** @var array<int, LogLevel::*> an array of E_* constant to LogLevel::* constant mapping */
-    private $errorLevelMap = [];
-    /** @var bool */
-    private $handleOnlyReportedErrors = true;
-
-    /** @var bool */
-    private $hasFatalErrorHandler = false;
-    /** @var LogLevel::* */
-    private $fatalLevel = LogLevel::ALERT;
-    /** @var ?string */
-    private $reservedMemory = null;
-    /** @var ?array{type: int, message: string, file: string, line: int, trace: mixed} */
-    private $lastFatalData = null;
-    /** @var int[] */
-    private static $fatalErrors = [E_ERROR, E_PARSE, E_CORE_ERROR, E_COMPILE_ERROR, E_USER_ERROR];
-
-    public function __construct(LoggerInterface $logger)
-    {
-        $this->logger = $logger;
-    }
-
-    /**
-     * Registers a new ErrorHandler for a given Logger
-     *
-     * By default it will handle errors, exceptions and fatal errors
-     *
-     * @param  LoggerInterface                        $logger
-     * @param  array<int, LogLevel::*>|false          $errorLevelMap     an array of E_* constant to LogLevel::* constant mapping, or false to disable error handling
-     * @param  array<class-string, LogLevel::*>|false $exceptionLevelMap an array of class name to LogLevel::* constant mapping, or false to disable exception handling
-     * @param  LogLevel::*|null|false                 $fatalLevel        a LogLevel::* constant, null to use the default LogLevel::ALERT or false to disable fatal error handling
-     * @return ErrorHandler
-     */
-    public static function register(LoggerInterface $logger, $errorLevelMap = [], $exceptionLevelMap = [], $fatalLevel = null): self
-    {
-        /** @phpstan-ignore-next-line */
-        $handler = new static($logger);
-        if ($errorLevelMap !== false) {
-            $handler->registerErrorHandler($errorLevelMap);
-        }
-        if ($exceptionLevelMap !== false) {
-            $handler->registerExceptionHandler($exceptionLevelMap);
-        }
-        if ($fatalLevel !== false) {
-            $handler->registerFatalHandler($fatalLevel);
-        }
-
-        return $handler;
-    }
-
-    /**
-     * @param  array<class-string, LogLevel::*> $levelMap an array of class name to LogLevel::* constant mapping
-     * @return $this
-     */
-    public function registerExceptionHandler(array $levelMap = [], bool $callPrevious = true): self
-    {
-        $prev = set_exception_handler(function (\Throwable $e): void {
-            $this->handleException($e);
-        });
-        $this->uncaughtExceptionLevelMap = $levelMap;
-        foreach ($this->defaultExceptionLevelMap() as $class => $level) {
-            if (!isset($this->uncaughtExceptionLevelMap[$class])) {
-                $this->uncaughtExceptionLevelMap[$class] = $level;
-            }
-        }
-        if ($callPrevious && $prev) {
-            $this->previousExceptionHandler = $prev;
-        }
-
-        return $this;
-    }
-
-    /**
-     * @param  array<int, LogLevel::*> $levelMap an array of E_* constant to LogLevel::* constant mapping
-     * @return $this
-     */
-    public function registerErrorHandler(array $levelMap = [], bool $callPrevious = true, int $errorTypes = -1, bool $handleOnlyReportedErrors = true): self
-    {
-        $prev = set_error_handler([$this, 'handleError'], $errorTypes);
-        $this->errorLevelMap = array_replace($this->defaultErrorLevelMap(), $levelMap);
-        if ($callPrevious) {
-            $this->previousErrorHandler = $prev ?: true;
-        } else {
-            $this->previousErrorHandler = null;
-        }
-
-        $this->handleOnlyReportedErrors = $handleOnlyReportedErrors;
-
-        return $this;
-    }
-
-    /**
-     * @param LogLevel::*|null $level              a LogLevel::* constant, null to use the default LogLevel::ALERT
-     * @param int              $reservedMemorySize Amount of KBs to reserve in memory so that it can be freed when handling fatal errors giving Monolog some room in memory to get its job done
-     */
-    public function registerFatalHandler($level = null, int $reservedMemorySize = 20): self
-    {
-        register_shutdown_function([$this, 'handleFatalError']);
-
-        $this->reservedMemory = str_repeat(' ', 1024 * $reservedMemorySize);
-        $this->fatalLevel = null === $level ? LogLevel::ALERT : $level;
-        $this->hasFatalErrorHandler = true;
-
-        return $this;
-    }
-
-    /**
-     * @return array<class-string, LogLevel::*>
-     */
-    protected function defaultExceptionLevelMap(): array
-    {
-        return [
-            'ParseError' => LogLevel::CRITICAL,
-            'Throwable' => LogLevel::ERROR,
-        ];
-    }
-
-    /**
-     * @return array<int, LogLevel::*>
-     */
-    protected function defaultErrorLevelMap(): array
-    {
-        return [
-            E_ERROR             => LogLevel::CRITICAL,
-            E_WARNING           => LogLevel::WARNING,
-            E_PARSE             => LogLevel::ALERT,
-            E_NOTICE            => LogLevel::NOTICE,
-            E_CORE_ERROR        => LogLevel::CRITICAL,
-            E_CORE_WARNING      => LogLevel::WARNING,
-            E_COMPILE_ERROR     => LogLevel::ALERT,
-            E_COMPILE_WARNING   => LogLevel::WARNING,
-            E_USER_ERROR        => LogLevel::ERROR,
-            E_USER_WARNING      => LogLevel::WARNING,
-            E_USER_NOTICE       => LogLevel::NOTICE,
-            E_STRICT            => LogLevel::NOTICE,
-            E_RECOVERABLE_ERROR => LogLevel::ERROR,
-            E_DEPRECATED        => LogLevel::NOTICE,
-            E_USER_DEPRECATED   => LogLevel::NOTICE,
-        ];
-    }
-
-    /**
-     * @phpstan-return never
-     */
-    private function handleException(\Throwable $e): void
-    {
-        $level = LogLevel::ERROR;
-        foreach ($this->uncaughtExceptionLevelMap as $class => $candidate) {
-            if ($e instanceof $class) {
-                $level = $candidate;
-                break;
-            }
-        }
-
-        $this->logger->log(
-            $level,
-            sprintf('Uncaught Exception %s: "%s" at %s line %s', Utils::getClass($e), $e->getMessage(), $e->getFile(), $e->getLine()),
-            ['exception' => $e]
-        );
-
-        if ($this->previousExceptionHandler) {
-            ($this->previousExceptionHandler)($e);
-        }
-
-        if (!headers_sent() && in_array(strtolower((string) ini_get('display_errors')), ['0', '', 'false', 'off', 'none', 'no'], true)) {
-            http_response_code(500);
-        }
-
-        exit(255);
-    }
-
-    /**
-     * @private
-     *
-     * @param mixed[] $context
-     */
-    public function handleError(int $code, string $message, string $file = '', int $line = 0, ?array $context = []): bool
-    {
-        if ($this->handleOnlyReportedErrors && !(error_reporting() & $code)) {
-            return false;
-        }
-
-        // fatal error codes are ignored if a fatal error handler is present as well to avoid duplicate log entries
-        if (!$this->hasFatalErrorHandler || !in_array($code, self::$fatalErrors, true)) {
-            $level = $this->errorLevelMap[$code] ?? LogLevel::CRITICAL;
-            $this->logger->log($level, self::codeToString($code).': '.$message, ['code' => $code, 'message' => $message, 'file' => $file, 'line' => $line]);
-        } else {
-            $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
-            array_shift($trace); // Exclude handleError from trace
-            $this->lastFatalData = ['type' => $code, 'message' => $message, 'file' => $file, 'line' => $line, 'trace' => $trace];
-        }
-
-        if ($this->previousErrorHandler === true) {
-            return false;
-        } elseif ($this->previousErrorHandler) {
-            return (bool) ($this->previousErrorHandler)($code, $message, $file, $line, $context);
-        }
-
-        return true;
-    }
-
-    /**
-     * @private
-     */
-    public function handleFatalError(): void
-    {
-        $this->reservedMemory = '';
-
-        if (is_array($this->lastFatalData)) {
-            $lastError = $this->lastFatalData;
-        } else {
-            $lastError = error_get_last();
-        }
-
-        if ($lastError && in_array($lastError['type'], self::$fatalErrors, true)) {
-            $trace = $lastError['trace'] ?? null;
-            $this->logger->log(
-                $this->fatalLevel,
-                'Fatal Error ('.self::codeToString($lastError['type']).'): '.$lastError['message'],
-                ['code' => $lastError['type'], 'message' => $lastError['message'], 'file' => $lastError['file'], 'line' => $lastError['line'], 'trace' => $trace]
-            );
-
-            if ($this->logger instanceof Logger) {
-                foreach ($this->logger->getHandlers() as $handler) {
-                    $handler->close();
-                }
-            }
-        }
-    }
-
-    /**
-     * @param int $code
-     */
-    private static function codeToString($code): string
-    {
-        switch ($code) {
-            case E_ERROR:
-                return 'E_ERROR';
-            case E_WARNING:
-                return 'E_WARNING';
-            case E_PARSE:
-                return 'E_PARSE';
-            case E_NOTICE:
-                return 'E_NOTICE';
-            case E_CORE_ERROR:
-                return 'E_CORE_ERROR';
-            case E_CORE_WARNING:
-                return 'E_CORE_WARNING';
-            case E_COMPILE_ERROR:
-                return 'E_COMPILE_ERROR';
-            case E_COMPILE_WARNING:
-                return 'E_COMPILE_WARNING';
-            case E_USER_ERROR:
-                return 'E_USER_ERROR';
-            case E_USER_WARNING:
-                return 'E_USER_WARNING';
-            case E_USER_NOTICE:
-                return 'E_USER_NOTICE';
-            case E_STRICT:
-                return 'E_STRICT';
-            case E_RECOVERABLE_ERROR:
-                return 'E_RECOVERABLE_ERROR';
-            case E_DEPRECATED:
-                return 'E_DEPRECATED';
-            case E_USER_DEPRECATED:
-                return 'E_USER_DEPRECATED';
-        }
-
-        return 'Unknown PHP error';
-    }
-}
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/Formatter/ChromePHPFormatter.php b/monolog/vendor/monolog/monolog/src/Monolog/Formatter/ChromePHPFormatter.php
deleted file mode 100644
index aa1884b9..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/Formatter/ChromePHPFormatter.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Formatter;
-
-use Monolog\Logger;
-
-/**
- * Formats a log message according to the ChromePHP array format
- *
- * @author Christophe Coevoet <stof@notk.org>
- */
-class ChromePHPFormatter implements FormatterInterface
-{
-    /**
-     * Translates Monolog log levels to Wildfire levels.
-     *
-     * @var array<int, 'log'|'info'|'warn'|'error'>
-     */
-    private $logLevels = [
-        Logger::DEBUG     => 'log',
-        Logger::INFO      => 'info',
-        Logger::NOTICE    => 'info',
-        Logger::WARNING   => 'warn',
-        Logger::ERROR     => 'error',
-        Logger::CRITICAL  => 'error',
-        Logger::ALERT     => 'error',
-        Logger::EMERGENCY => 'error',
-    ];
-
-    /**
-     * {@inheritDoc}
-     */
-    public function format(array $record)
-    {
-        // Retrieve the line and file if set and remove them from the formatted extra
-        $backtrace = 'unknown';
-        if (isset($record['extra']['file'], $record['extra']['line'])) {
-            $backtrace = $record['extra']['file'].' : '.$record['extra']['line'];
-            unset($record['extra']['file'], $record['extra']['line']);
-        }
-
-        $message = ['message' => $record['message']];
-        if ($record['context']) {
-            $message['context'] = $record['context'];
-        }
-        if ($record['extra']) {
-            $message['extra'] = $record['extra'];
-        }
-        if (count($message) === 1) {
-            $message = reset($message);
-        }
-
-        return [
-            $record['channel'],
-            $message,
-            $backtrace,
-            $this->logLevels[$record['level']],
-        ];
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function formatBatch(array $records)
-    {
-        $formatted = [];
-
-        foreach ($records as $record) {
-            $formatted[] = $this->format($record);
-        }
-
-        return $formatted;
-    }
-}
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/Formatter/ElasticaFormatter.php b/monolog/vendor/monolog/monolog/src/Monolog/Formatter/ElasticaFormatter.php
deleted file mode 100644
index 6c8a9ab5..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/Formatter/ElasticaFormatter.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Formatter;
-
-use Elastica\Document;
-
-/**
- * Format a log message into an Elastica Document
- *
- * @author Jelle Vink <jelle.vink@gmail.com>
- *
- * @phpstan-import-type Record from \Monolog\Logger
- */
-class ElasticaFormatter extends NormalizerFormatter
-{
-    /**
-     * @var string Elastic search index name
-     */
-    protected $index;
-
-    /**
-     * @var ?string Elastic search document type
-     */
-    protected $type;
-
-    /**
-     * @param string  $index Elastic Search index name
-     * @param ?string $type  Elastic Search document type, deprecated as of Elastica 7
-     */
-    public function __construct(string $index, ?string $type)
-    {
-        // elasticsearch requires a ISO 8601 format date with optional millisecond precision.
-        parent::__construct('Y-m-d\TH:i:s.uP');
-
-        $this->index = $index;
-        $this->type = $type;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function format(array $record)
-    {
-        $record = parent::format($record);
-
-        return $this->getDocument($record);
-    }
-
-    public function getIndex(): string
-    {
-        return $this->index;
-    }
-
-    /**
-     * @deprecated since Elastica 7 type has no effect
-     */
-    public function getType(): string
-    {
-        /** @phpstan-ignore-next-line */
-        return $this->type;
-    }
-
-    /**
-     * Convert a log message into an Elastica Document
-     *
-     * @phpstan-param Record $record
-     */
-    protected function getDocument(array $record): Document
-    {
-        $document = new Document();
-        $document->setData($record);
-        if (method_exists($document, 'setType')) {
-            /** @phpstan-ignore-next-line */
-            $document->setType($this->type);
-        }
-        $document->setIndex($this->index);
-
-        return $document;
-    }
-}
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/Formatter/ElasticsearchFormatter.php b/monolog/vendor/monolog/monolog/src/Monolog/Formatter/ElasticsearchFormatter.php
deleted file mode 100644
index b792b819..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/Formatter/ElasticsearchFormatter.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Formatter;
-
-use DateTimeInterface;
-
-/**
- * Format a log message into an Elasticsearch record
- *
- * @author Avtandil Kikabidze <akalongman@gmail.com>
- */
-class ElasticsearchFormatter extends NormalizerFormatter
-{
-    /**
-     * @var string Elasticsearch index name
-     */
-    protected $index;
-
-    /**
-     * @var string Elasticsearch record type
-     */
-    protected $type;
-
-    /**
-     * @param string $index Elasticsearch index name
-     * @param string $type  Elasticsearch record type
-     */
-    public function __construct(string $index, string $type)
-    {
-        // Elasticsearch requires an ISO 8601 format date with optional millisecond precision.
-        parent::__construct(DateTimeInterface::ISO8601);
-
-        $this->index = $index;
-        $this->type = $type;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function format(array $record)
-    {
-        $record = parent::format($record);
-
-        return $this->getDocument($record);
-    }
-
-    /**
-     * Getter index
-     *
-     * @return string
-     */
-    public function getIndex(): string
-    {
-        return $this->index;
-    }
-
-    /**
-     * Getter type
-     *
-     * @return string
-     */
-    public function getType(): string
-    {
-        return $this->type;
-    }
-
-    /**
-     * Convert a log message into an Elasticsearch record
-     *
-     * @param  mixed[] $record Log message
-     * @return mixed[]
-     */
-    protected function getDocument(array $record): array
-    {
-        $record['_index'] = $this->index;
-        $record['_type'] = $this->type;
-
-        return $record;
-    }
-}
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/Formatter/FlowdockFormatter.php b/monolog/vendor/monolog/monolog/src/Monolog/Formatter/FlowdockFormatter.php
deleted file mode 100644
index 867ae586..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/Formatter/FlowdockFormatter.php
+++ /dev/null
@@ -1,112 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Formatter;
-
-/**
- * formats the record to be used in the FlowdockHandler
- *
- * @author Dominik Liebler <liebler.dominik@gmail.com>
- * @deprecated Since 2.9.0 and 3.3.0, Flowdock was shutdown we will thus drop this handler in Monolog 4
- */
-class FlowdockFormatter implements FormatterInterface
-{
-    /**
-     * @var string
-     */
-    private $source;
-
-    /**
-     * @var string
-     */
-    private $sourceEmail;
-
-    public function __construct(string $source, string $sourceEmail)
-    {
-        $this->source = $source;
-        $this->sourceEmail = $sourceEmail;
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * @return mixed[]
-     */
-    public function format(array $record): array
-    {
-        $tags = [
-            '#logs',
-            '#' . strtolower($record['level_name']),
-            '#' . $record['channel'],
-        ];
-
-        foreach ($record['extra'] as $value) {
-            $tags[] = '#' . $value;
-        }
-
-        $subject = sprintf(
-            'in %s: %s - %s',
-            $this->source,
-            $record['level_name'],
-            $this->getShortMessage($record['message'])
-        );
-
-        $record['flowdock'] = [
-            'source' => $this->source,
-            'from_address' => $this->sourceEmail,
-            'subject' => $subject,
-            'content' => $record['message'],
-            'tags' => $tags,
-            'project' => $this->source,
-        ];
-
-        return $record;
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * @return mixed[][]
-     */
-    public function formatBatch(array $records): array
-    {
-        $formatted = [];
-
-        foreach ($records as $record) {
-            $formatted[] = $this->format($record);
-        }
-
-        return $formatted;
-    }
-
-    public function getShortMessage(string $message): string
-    {
-        static $hasMbString;
-
-        if (null === $hasMbString) {
-            $hasMbString = function_exists('mb_strlen');
-        }
-
-        $maxLength = 45;
-
-        if ($hasMbString) {
-            if (mb_strlen($message, 'UTF-8') > $maxLength) {
-                $message = mb_substr($message, 0, $maxLength - 4, 'UTF-8') . ' ...';
-            }
-        } else {
-            if (strlen($message) > $maxLength) {
-                $message = substr($message, 0, $maxLength - 4) . ' ...';
-            }
-        }
-
-        return $message;
-    }
-}
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/Formatter/FluentdFormatter.php b/monolog/vendor/monolog/monolog/src/Monolog/Formatter/FluentdFormatter.php
deleted file mode 100644
index 29b14d30..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/Formatter/FluentdFormatter.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Formatter;
-
-use Monolog\Utils;
-
-/**
- * Class FluentdFormatter
- *
- * Serializes a log message to Fluentd unix socket protocol
- *
- * Fluentd config:
- *
- * <source>
- *  type unix
- *  path /var/run/td-agent/td-agent.sock
- * </source>
- *
- * Monolog setup:
- *
- * $logger = new Monolog\Logger('fluent.tag');
- * $fluentHandler = new Monolog\Handler\SocketHandler('unix:///var/run/td-agent/td-agent.sock');
- * $fluentHandler->setFormatter(new Monolog\Formatter\FluentdFormatter());
- * $logger->pushHandler($fluentHandler);
- *
- * @author Andrius Putna <fordnox@gmail.com>
- */
-class FluentdFormatter implements FormatterInterface
-{
-    /**
-     * @var bool $levelTag should message level be a part of the fluentd tag
-     */
-    protected $levelTag = false;
-
-    public function __construct(bool $levelTag = false)
-    {
-        if (!function_exists('json_encode')) {
-            throw new \RuntimeException('PHP\'s json extension is required to use Monolog\'s FluentdUnixFormatter');
-        }
-
-        $this->levelTag = $levelTag;
-    }
-
-    public function isUsingLevelsInTag(): bool
-    {
-        return $this->levelTag;
-    }
-
-    public function format(array $record): string
-    {
-        $tag = $record['channel'];
-        if ($this->levelTag) {
-            $tag .= '.' . strtolower($record['level_name']);
-        }
-
-        $message = [
-            'message' => $record['message'],
-            'context' => $record['context'],
-            'extra' => $record['extra'],
-        ];
-
-        if (!$this->levelTag) {
-            $message['level'] = $record['level'];
-            $message['level_name'] = $record['level_name'];
-        }
-
-        return Utils::jsonEncode([$tag, $record['datetime']->getTimestamp(), $message]);
-    }
-
-    public function formatBatch(array $records): string
-    {
-        $message = '';
-        foreach ($records as $record) {
-            $message .= $this->format($record);
-        }
-
-        return $message;
-    }
-}
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/Formatter/FormatterInterface.php b/monolog/vendor/monolog/monolog/src/Monolog/Formatter/FormatterInterface.php
deleted file mode 100644
index 19617ec5..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/Formatter/FormatterInterface.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Formatter;
-
-/**
- * Interface for formatters
- *
- * @author Jordi Boggiano <j.boggiano@seld.be>
- *
- * @phpstan-import-type Record from \Monolog\Logger
- */
-interface FormatterInterface
-{
-    /**
-     * Formats a log record.
-     *
-     * @param  array $record A record to format
-     * @return mixed The formatted record
-     *
-     * @phpstan-param Record $record
-     */
-    public function format(array $record);
-
-    /**
-     * Formats a set of log records.
-     *
-     * @param  array $records A set of records to format
-     * @return mixed The formatted set of records
-     *
-     * @phpstan-param Record[] $records
-     */
-    public function formatBatch(array $records);
-}
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/Formatter/GelfMessageFormatter.php b/monolog/vendor/monolog/monolog/src/Monolog/Formatter/GelfMessageFormatter.php
deleted file mode 100644
index 3b3e1e7f..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/Formatter/GelfMessageFormatter.php
+++ /dev/null
@@ -1,175 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Formatter;
-
-use Monolog\Logger;
-use Gelf\Message;
-use Monolog\Utils;
-
-/**
- * Serializes a log message to GELF
- * @see http://docs.graylog.org/en/latest/pages/gelf.html
- *
- * @author Matt Lehner <mlehner@gmail.com>
- *
- * @phpstan-import-type Level from \Monolog\Logger
- */
-class GelfMessageFormatter extends NormalizerFormatter
-{
-    protected const DEFAULT_MAX_LENGTH = 32766;
-
-    /**
-     * @var string the name of the system for the Gelf log message
-     */
-    protected $systemName;
-
-    /**
-     * @var string a prefix for 'extra' fields from the Monolog record (optional)
-     */
-    protected $extraPrefix;
-
-    /**
-     * @var string a prefix for 'context' fields from the Monolog record (optional)
-     */
-    protected $contextPrefix;
-
-    /**
-     * @var int max length per field
-     */
-    protected $maxLength;
-
-    /**
-     * @var int
-     */
-    private $gelfVersion = 2;
-
-    /**
-     * Translates Monolog log levels to Graylog2 log priorities.
-     *
-     * @var array<int, int>
-     *
-     * @phpstan-var array<Level, int>
-     */
-    private $logLevels = [
-        Logger::DEBUG     => 7,
-        Logger::INFO      => 6,
-        Logger::NOTICE    => 5,
-        Logger::WARNING   => 4,
-        Logger::ERROR     => 3,
-        Logger::CRITICAL  => 2,
-        Logger::ALERT     => 1,
-        Logger::EMERGENCY => 0,
-    ];
-
-    public function __construct(?string $systemName = null, ?string $extraPrefix = null, string $contextPrefix = 'ctxt_', ?int $maxLength = null)
-    {
-        if (!class_exists(Message::class)) {
-            throw new \RuntimeException('Composer package graylog2/gelf-php is required to use Monolog\'s GelfMessageFormatter');
-        }
-
-        parent::__construct('U.u');
-
-        $this->systemName = (is_null($systemName) || $systemName === '') ? (string) gethostname() : $systemName;
-
-        $this->extraPrefix = is_null($extraPrefix) ? '' : $extraPrefix;
-        $this->contextPrefix = $contextPrefix;
-        $this->maxLength = is_null($maxLength) ? self::DEFAULT_MAX_LENGTH : $maxLength;
-
-        if (method_exists(Message::class, 'setFacility')) {
-            $this->gelfVersion = 1;
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function format(array $record): Message
-    {
-        $context = $extra = [];
-        if (isset($record['context'])) {
-            /** @var mixed[] $context */
-            $context = parent::normalize($record['context']);
-        }
-        if (isset($record['extra'])) {
-            /** @var mixed[] $extra */
-            $extra = parent::normalize($record['extra']);
-        }
-
-        if (!isset($record['datetime'], $record['message'], $record['level'])) {
-            throw new \InvalidArgumentException('The record should at least contain datetime, message and level keys, '.var_export($record, true).' given');
-        }
-
-        $message = new Message();
-        $message
-            ->setTimestamp($record['datetime'])
-            ->setShortMessage((string) $record['message'])
-            ->setHost($this->systemName)
-            ->setLevel($this->logLevels[$record['level']]);
-
-        // message length + system name length + 200 for padding / metadata
-        $len = 200 + strlen((string) $record['message']) + strlen($this->systemName);
-
-        if ($len > $this->maxLength) {
-            $message->setShortMessage(Utils::substr($record['message'], 0, $this->maxLength));
-        }
-
-        if ($this->gelfVersion === 1) {
-            if (isset($record['channel'])) {
-                $message->setFacility($record['channel']);
-            }
-            if (isset($extra['line'])) {
-                $message->setLine($extra['line']);
-                unset($extra['line']);
-            }
-            if (isset($extra['file'])) {
-                $message->setFile($extra['file']);
-                unset($extra['file']);
-            }
-        } else {
-            $message->setAdditional('facility', $record['channel']);
-        }
-
-        foreach ($extra as $key => $val) {
-            $val = is_scalar($val) || null === $val ? $val : $this->toJson($val);
-            $len = strlen($this->extraPrefix . $key . $val);
-            if ($len > $this->maxLength) {
-                $message->setAdditional($this->extraPrefix . $key, Utils::substr((string) $val, 0, $this->maxLength));
-
-                continue;
-            }
-            $message->setAdditional($this->extraPrefix . $key, $val);
-        }
-
-        foreach ($context as $key => $val) {
-            $val = is_scalar($val) || null === $val ? $val : $this->toJson($val);
-            $len = strlen($this->contextPrefix . $key . $val);
-            if ($len > $this->maxLength) {
-                $message->setAdditional($this->contextPrefix . $key, Utils::substr((string) $val, 0, $this->maxLength));
-
-                continue;
-            }
-            $message->setAdditional($this->contextPrefix . $key, $val);
-        }
-
-        if ($this->gelfVersion === 1) {
-            /** @phpstan-ignore-next-line */
-            if (null === $message->getFile() && isset($context['exception']['file'])) {
-                if (preg_match("/^(.+):([0-9]+)$/", $context['exception']['file'], $matches)) {
-                    $message->setFile($matches[1]);
-                    $message->setLine($matches[2]);
-                }
-            }
-        }
-
-        return $message;
-    }
-}
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/Formatter/GoogleCloudLoggingFormatter.php b/monolog/vendor/monolog/monolog/src/Monolog/Formatter/GoogleCloudLoggingFormatter.php
deleted file mode 100644
index ca52ebf4..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/Formatter/GoogleCloudLoggingFormatter.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Formatter;
-
-use DateTimeInterface;
-use Monolog\LogRecord;
-
-/**
- * Encodes message information into JSON in a format compatible with Cloud logging.
- *
- * @see https://cloud.google.com/logging/docs/structured-logging
- * @see https://cloud.google.com/logging/docs/reference/v2/rest/v2/LogEntry
- *
- * @author Luís Cobucci <lcobucci@gmail.com>
- */
-final class GoogleCloudLoggingFormatter extends JsonFormatter
-{
-    /** {@inheritdoc} **/
-    public function format(array $record): string
-    {
-        // Re-key level for GCP logging
-        $record['severity'] = $record['level_name'];
-        $record['time'] = $record['datetime']->format(DateTimeInterface::RFC3339_EXTENDED);
-
-        // Remove keys that are not used by GCP
-        unset($record['level'], $record['level_name'], $record['datetime']);
-
-        return parent::format($record);
-    }
-}
-
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/Formatter/HtmlFormatter.php b/monolog/vendor/monolog/monolog/src/Monolog/Formatter/HtmlFormatter.php
deleted file mode 100644
index 10a4311c..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/Formatter/HtmlFormatter.php
+++ /dev/null
@@ -1,142 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Formatter;
-
-use Monolog\Logger;
-use Monolog\Utils;
-
-/**
- * Formats incoming records into an HTML table
- *
- * This is especially useful for html email logging
- *
- * @author Tiago Brito <tlfbrito@gmail.com>
- */
-class HtmlFormatter extends NormalizerFormatter
-{
-    /**
-     * Translates Monolog log levels to html color priorities.
-     *
-     * @var array<int, string>
-     */
-    protected $logLevels = [
-        Logger::DEBUG     => '#CCCCCC',
-        Logger::INFO      => '#28A745',
-        Logger::NOTICE    => '#17A2B8',
-        Logger::WARNING   => '#FFC107',
-        Logger::ERROR     => '#FD7E14',
-        Logger::CRITICAL  => '#DC3545',
-        Logger::ALERT     => '#821722',
-        Logger::EMERGENCY => '#000000',
-    ];
-
-    /**
-     * @param string|null $dateFormat The format of the timestamp: one supported by DateTime::format
-     */
-    public function __construct(?string $dateFormat = null)
-    {
-        parent::__construct($dateFormat);
-    }
-
-    /**
-     * Creates an HTML table row
-     *
-     * @param string $th       Row header content
-     * @param string $td       Row standard cell content
-     * @param bool   $escapeTd false if td content must not be html escaped
-     */
-    protected function addRow(string $th, string $td = ' ', bool $escapeTd = true): string
-    {
-        $th = htmlspecialchars($th, ENT_NOQUOTES, 'UTF-8');
-        if ($escapeTd) {
-            $td = '<pre>'.htmlspecialchars($td, ENT_NOQUOTES, 'UTF-8').'</pre>';
-        }
-
-        return "<tr style=\"padding: 4px;text-align: left;\">\n<th style=\"vertical-align: top;background: #ccc;color: #000\" width=\"100\">$th:</th>\n<td style=\"padding: 4px;text-align: left;vertical-align: top;background: #eee;color: #000\">".$td."</td>\n</tr>";
-    }
-
-    /**
-     * Create a HTML h1 tag
-     *
-     * @param  string $title Text to be in the h1
-     * @param  int    $level Error level
-     * @return string
-     */
-    protected function addTitle(string $title, int $level): string
-    {
-        $title = htmlspecialchars($title, ENT_NOQUOTES, 'UTF-8');
-
-        return '<h1 style="background: '.$this->logLevels[$level].';color: #ffffff;padding: 5px;" class="monolog-output">'.$title.'</h1>';
-    }
-
-    /**
-     * Formats a log record.
-     *
-     * @return string The formatted record
-     */
-    public function format(array $record): string
-    {
-        $output = $this->addTitle($record['level_name'], $record['level']);
-        $output .= '<table cellspacing="1" width="100%" class="monolog-output">';
-
-        $output .= $this->addRow('Message', (string) $record['message']);
-        $output .= $this->addRow('Time', $this->formatDate($record['datetime']));
-        $output .= $this->addRow('Channel', $record['channel']);
-        if ($record['context']) {
-            $embeddedTable = '<table cellspacing="1" width="100%">';
-            foreach ($record['context'] as $key => $value) {
-                $embeddedTable .= $this->addRow((string) $key, $this->convertToString($value));
-            }
-            $embeddedTable .= '</table>';
-            $output .= $this->addRow('Context', $embeddedTable, false);
-        }
-        if ($record['extra']) {
-            $embeddedTable = '<table cellspacing="1" width="100%">';
-            foreach ($record['extra'] as $key => $value) {
-                $embeddedTable .= $this->addRow((string) $key, $this->convertToString($value));
-            }
-            $embeddedTable .= '</table>';
-            $output .= $this->addRow('Extra', $embeddedTable, false);
-        }
-
-        return $output.'</table>';
-    }
-
-    /**
-     * Formats a set of log records.
-     *
-     * @return string The formatted set of records
-     */
-    public function formatBatch(array $records): string
-    {
-        $message = '';
-        foreach ($records as $record) {
-            $message .= $this->format($record);
-        }
-
-        return $message;
-    }
-
-    /**
-     * @param mixed $data
-     */
-    protected function convertToString($data): string
-    {
-        if (null === $data || is_scalar($data)) {
-            return (string) $data;
-        }
-
-        $data = $this->normalize($data);
-
-        return Utils::jsonEncode($data, JSON_PRETTY_PRINT | Utils::DEFAULT_JSON_FLAGS, true);
-    }
-}
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/Formatter/JsonFormatter.php b/monolog/vendor/monolog/monolog/src/Monolog/Formatter/JsonFormatter.php
deleted file mode 100644
index b737d82e..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/Formatter/JsonFormatter.php
+++ /dev/null
@@ -1,224 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Formatter;
-
-use Throwable;
-
-/**
- * Encodes whatever record data is passed to it as json
- *
- * This can be useful to log to databases or remote APIs
- *
- * @author Jordi Boggiano <j.boggiano@seld.be>
- *
- * @phpstan-import-type Record from \Monolog\Logger
- */
-class JsonFormatter extends NormalizerFormatter
-{
-    public const BATCH_MODE_JSON = 1;
-    public const BATCH_MODE_NEWLINES = 2;
-
-    /** @var self::BATCH_MODE_* */
-    protected $batchMode;
-    /** @var bool */
-    protected $appendNewline;
-    /** @var bool */
-    protected $ignoreEmptyContextAndExtra;
-    /** @var bool */
-    protected $includeStacktraces = false;
-
-    /**
-     * @param self::BATCH_MODE_* $batchMode
-     */
-    public function __construct(int $batchMode = self::BATCH_MODE_JSON, bool $appendNewline = true, bool $ignoreEmptyContextAndExtra = false, bool $includeStacktraces = false)
-    {
-        $this->batchMode = $batchMode;
-        $this->appendNewline = $appendNewline;
-        $this->ignoreEmptyContextAndExtra = $ignoreEmptyContextAndExtra;
-        $this->includeStacktraces = $includeStacktraces;
-
-        parent::__construct();
-    }
-
-    /**
-     * The batch mode option configures the formatting style for
-     * multiple records. By default, multiple records will be
-     * formatted as a JSON-encoded array. However, for
-     * compatibility with some API endpoints, alternative styles
-     * are available.
-     */
-    public function getBatchMode(): int
-    {
-        return $this->batchMode;
-    }
-
-    /**
-     * True if newlines are appended to every formatted record
-     */
-    public function isAppendingNewlines(): bool
-    {
-        return $this->appendNewline;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function format(array $record): string
-    {
-        $normalized = $this->normalize($record);
-
-        if (isset($normalized['context']) && $normalized['context'] === []) {
-            if ($this->ignoreEmptyContextAndExtra) {
-                unset($normalized['context']);
-            } else {
-                $normalized['context'] = new \stdClass;
-            }
-        }
-        if (isset($normalized['extra']) && $normalized['extra'] === []) {
-            if ($this->ignoreEmptyContextAndExtra) {
-                unset($normalized['extra']);
-            } else {
-                $normalized['extra'] = new \stdClass;
-            }
-        }
-
-        return $this->toJson($normalized, true) . ($this->appendNewline ? "\n" : '');
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function formatBatch(array $records): string
-    {
-        switch ($this->batchMode) {
-            case static::BATCH_MODE_NEWLINES:
-                return $this->formatBatchNewlines($records);
-
-            case static::BATCH_MODE_JSON:
-            default:
-                return $this->formatBatchJson($records);
-        }
-    }
-
-    /**
-     * @return self
-     */
-    public function includeStacktraces(bool $include = true): self
-    {
-        $this->includeStacktraces = $include;
-
-        return $this;
-    }
-
-    /**
-     * Return a JSON-encoded array of records.
-     *
-     * @phpstan-param Record[] $records
-     */
-    protected function formatBatchJson(array $records): string
-    {
-        return $this->toJson($this->normalize($records), true);
-    }
-
-    /**
-     * Use new lines to separate records instead of a
-     * JSON-encoded array.
-     *
-     * @phpstan-param Record[] $records
-     */
-    protected function formatBatchNewlines(array $records): string
-    {
-        $instance = $this;
-
-        $oldNewline = $this->appendNewline;
-        $this->appendNewline = false;
-        array_walk($records, function (&$value, $key) use ($instance) {
-            $value = $instance->format($value);
-        });
-        $this->appendNewline = $oldNewline;
-
-        return implode("\n", $records);
-    }
-
-    /**
-     * Normalizes given $data.
-     *
-     * @param mixed $data
-     *
-     * @return mixed
-     */
-    protected function normalize($data, int $depth = 0)
-    {
-        if ($depth > $this->maxNormalizeDepth) {
-            return 'Over '.$this->maxNormalizeDepth.' levels deep, aborting normalization';
-        }
-
-        if (is_array($data)) {
-            $normalized = [];
-
-            $count = 1;
-            foreach ($data as $key => $value) {
-                if ($count++ > $this->maxNormalizeItemCount) {
-                    $normalized['...'] = 'Over '.$this->maxNormalizeItemCount.' items ('.count($data).' total), aborting normalization';
-                    break;
-                }
-
-                $normalized[$key] = $this->normalize($value, $depth + 1);
-            }
-
-            return $normalized;
-        }
-
-        if (is_object($data)) {
-            if ($data instanceof \DateTimeInterface) {
-                return $this->formatDate($data);
-            }
-
-            if ($data instanceof Throwable) {
-                return $this->normalizeException($data, $depth);
-            }
-
-            // if the object has specific json serializability we want to make sure we skip the __toString treatment below
-            if ($data instanceof \JsonSerializable) {
-                return $data;
-            }
-
-            if (method_exists($data, '__toString')) {
-                return $data->__toString();
-            }
-
-            return $data;
-        }
-
-        if (is_resource($data)) {
-            return parent::normalize($data);
-        }
-
-        return $data;
-    }
-
-    /**
-     * Normalizes given exception with or without its own stack trace based on
-     * `includeStacktraces` property.
-     *
-     * {@inheritDoc}
-     */
-    protected function normalizeException(Throwable $e, int $depth = 0): array
-    {
-        $data = parent::normalizeException($e, $depth);
-        if (!$this->includeStacktraces) {
-            unset($data['trace']);
-        }
-
-        return $data;
-    }
-}
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/Formatter/LineFormatter.php b/monolog/vendor/monolog/monolog/src/Monolog/Formatter/LineFormatter.php
deleted file mode 100644
index e6e78983..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/Formatter/LineFormatter.php
+++ /dev/null
@@ -1,246 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Formatter;
-
-use Monolog\Utils;
-
-/**
- * Formats incoming records into a one-line string
- *
- * This is especially useful for logging to files
- *
- * @author Jordi Boggiano <j.boggiano@seld.be>
- * @author Christophe Coevoet <stof@notk.org>
- */
-class LineFormatter extends NormalizerFormatter
-{
-    public const SIMPLE_FORMAT = "[%datetime%] %channel%.%level_name%: %message% %context% %extra%\n";
-
-    /** @var string */
-    protected $format;
-    /** @var bool */
-    protected $allowInlineLineBreaks;
-    /** @var bool */
-    protected $ignoreEmptyContextAndExtra;
-    /** @var bool */
-    protected $includeStacktraces;
-    /** @var ?callable */
-    protected $stacktracesParser;
-
-    /**
-     * @param string|null $format                     The format of the message
-     * @param string|null $dateFormat                 The format of the timestamp: one supported by DateTime::format
-     * @param bool        $allowInlineLineBreaks      Whether to allow inline line breaks in log entries
-     * @param bool        $ignoreEmptyContextAndExtra
-     */
-    public function __construct(?string $format = null, ?string $dateFormat = null, bool $allowInlineLineBreaks = false, bool $ignoreEmptyContextAndExtra = false, bool $includeStacktraces = false)
-    {
-        $this->format = $format === null ? static::SIMPLE_FORMAT : $format;
-        $this->allowInlineLineBreaks = $allowInlineLineBreaks;
-        $this->ignoreEmptyContextAndExtra = $ignoreEmptyContextAndExtra;
-        $this->includeStacktraces($includeStacktraces);
-        parent::__construct($dateFormat);
-    }
-
-    public function includeStacktraces(bool $include = true, ?callable $parser = null): self
-    {
-        $this->includeStacktraces = $include;
-        if ($this->includeStacktraces) {
-            $this->allowInlineLineBreaks = true;
-            $this->stacktracesParser = $parser;
-        }
-
-        return $this;
-    }
-
-    public function allowInlineLineBreaks(bool $allow = true): self
-    {
-        $this->allowInlineLineBreaks = $allow;
-
-        return $this;
-    }
-
-    public function ignoreEmptyContextAndExtra(bool $ignore = true): self
-    {
-        $this->ignoreEmptyContextAndExtra = $ignore;
-
-        return $this;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function format(array $record): string
-    {
-        $vars = parent::format($record);
-
-        $output = $this->format;
-
-        foreach ($vars['extra'] as $var => $val) {
-            if (false !== strpos($output, '%extra.'.$var.'%')) {
-                $output = str_replace('%extra.'.$var.'%', $this->stringify($val), $output);
-                unset($vars['extra'][$var]);
-            }
-        }
-
-        foreach ($vars['context'] as $var => $val) {
-            if (false !== strpos($output, '%context.'.$var.'%')) {
-                $output = str_replace('%context.'.$var.'%', $this->stringify($val), $output);
-                unset($vars['context'][$var]);
-            }
-        }
-
-        if ($this->ignoreEmptyContextAndExtra) {
-            if (empty($vars['context'])) {
-                unset($vars['context']);
-                $output = str_replace('%context%', '', $output);
-            }
-
-            if (empty($vars['extra'])) {
-                unset($vars['extra']);
-                $output = str_replace('%extra%', '', $output);
-            }
-        }
-
-        foreach ($vars as $var => $val) {
-            if (false !== strpos($output, '%'.$var.'%')) {
-                $output = str_replace('%'.$var.'%', $this->stringify($val), $output);
-            }
-        }
-
-        // remove leftover %extra.xxx% and %context.xxx% if any
-        if (false !== strpos($output, '%')) {
-            $output = preg_replace('/%(?:extra|context)\..+?%/', '', $output);
-            if (null === $output) {
-                $pcreErrorCode = preg_last_error();
-                throw new \RuntimeException('Failed to run preg_replace: ' . $pcreErrorCode . ' / ' . Utils::pcreLastErrorMessage($pcreErrorCode));
-            }
-        }
-
-        return $output;
-    }
-
-    public function formatBatch(array $records): string
-    {
-        $message = '';
-        foreach ($records as $record) {
-            $message .= $this->format($record);
-        }
-
-        return $message;
-    }
-
-    /**
-     * @param mixed $value
-     */
-    public function stringify($value): string
-    {
-        return $this->replaceNewlines($this->convertToString($value));
-    }
-
-    protected function normalizeException(\Throwable $e, int $depth = 0): string
-    {
-        $str = $this->formatException($e);
-
-        if ($previous = $e->getPrevious()) {
-            do {
-                $depth++;
-                if ($depth > $this->maxNormalizeDepth) {
-                    $str .= "\n[previous exception] Over " . $this->maxNormalizeDepth . ' levels deep, aborting normalization';
-                    break;
-                }
-
-                $str .= "\n[previous exception] " . $this->formatException($previous);
-            } while ($previous = $previous->getPrevious());
-        }
-
-        return $str;
-    }
-
-    /**
-     * @param mixed $data
-     */
-    protected function convertToString($data): string
-    {
-        if (null === $data || is_bool($data)) {
-            return var_export($data, true);
-        }
-
-        if (is_scalar($data)) {
-            return (string) $data;
-        }
-
-        return $this->toJson($data, true);
-    }
-
-    protected function replaceNewlines(string $str): string
-    {
-        if ($this->allowInlineLineBreaks) {
-            if (0 === strpos($str, '{')) {
-                $str = preg_replace('/(?<!\\\\)\\\\[rn]/', "\n", $str);
-                if (null === $str) {
-                    $pcreErrorCode = preg_last_error();
-                    throw new \RuntimeException('Failed to run preg_replace: ' . $pcreErrorCode . ' / ' . Utils::pcreLastErrorMessage($pcreErrorCode));
-                }
-            }
-
-            return $str;
-        }
-
-        return str_replace(["\r\n", "\r", "\n"], ' ', $str);
-    }
-
-    private function formatException(\Throwable $e): string
-    {
-        $str = '[object] (' . Utils::getClass($e) . '(code: ' . $e->getCode();
-        if ($e instanceof \SoapFault) {
-            if (isset($e->faultcode)) {
-                $str .= ' faultcode: ' . $e->faultcode;
-            }
-
-            if (isset($e->faultactor)) {
-                $str .= ' faultactor: ' . $e->faultactor;
-            }
-
-            if (isset($e->detail)) {
-                if (is_string($e->detail)) {
-                    $str .= ' detail: ' . $e->detail;
-                } elseif (is_object($e->detail) || is_array($e->detail)) {
-                    $str .= ' detail: ' . $this->toJson($e->detail, true);
-                }
-            }
-        }
-        $str .= '): ' . $e->getMessage() . ' at ' . $e->getFile() . ':' . $e->getLine() . ')';
-
-        if ($this->includeStacktraces) {
-            $str .= $this->stacktracesParser($e);
-        }
-
-        return $str;
-    }
-
-    private function stacktracesParser(\Throwable $e): string
-    {
-        $trace = $e->getTraceAsString();
-
-        if ($this->stacktracesParser) {
-            $trace = $this->stacktracesParserCustom($trace);
-        }
-
-        return "\n[stacktrace]\n" . $trace . "\n";
-    }
-
-    private function stacktracesParserCustom(string $trace): string
-    {
-        return implode("\n", array_filter(array_map($this->stacktracesParser, explode("\n", $trace))));
-    }
-}
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/Formatter/LogglyFormatter.php b/monolog/vendor/monolog/monolog/src/Monolog/Formatter/LogglyFormatter.php
deleted file mode 100644
index 29841aa3..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/Formatter/LogglyFormatter.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Formatter;
-
-/**
- * Encodes message information into JSON in a format compatible with Loggly.
- *
- * @author Adam Pancutt <adam@pancutt.com>
- */
-class LogglyFormatter extends JsonFormatter
-{
-    /**
-     * Overrides the default batch mode to new lines for compatibility with the
-     * Loggly bulk API.
-     */
-    public function __construct(int $batchMode = self::BATCH_MODE_NEWLINES, bool $appendNewline = false)
-    {
-        parent::__construct($batchMode, $appendNewline);
-    }
-
-    /**
-     * Appends the 'timestamp' parameter for indexing by Loggly.
-     *
-     * @see https://www.loggly.com/docs/automated-parsing/#json
-     * @see \Monolog\Formatter\JsonFormatter::format()
-     */
-    public function format(array $record): string
-    {
-        if (isset($record["datetime"]) && ($record["datetime"] instanceof \DateTimeInterface)) {
-            $record["timestamp"] = $record["datetime"]->format("Y-m-d\TH:i:s.uO");
-            unset($record["datetime"]);
-        }
-
-        return parent::format($record);
-    }
-}
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/Formatter/LogmaticFormatter.php b/monolog/vendor/monolog/monolog/src/Monolog/Formatter/LogmaticFormatter.php
deleted file mode 100644
index b0451aba..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/Formatter/LogmaticFormatter.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Formatter;
-
-/**
- * Encodes message information into JSON in a format compatible with Logmatic.
- *
- * @author Julien Breux <julien.breux@gmail.com>
- */
-class LogmaticFormatter extends JsonFormatter
-{
-    protected const MARKERS = ["sourcecode", "php"];
-
-    /**
-     * @var string
-     */
-    protected $hostname = '';
-
-    /**
-     * @var string
-     */
-    protected $appname = '';
-
-    public function setHostname(string $hostname): self
-    {
-        $this->hostname = $hostname;
-
-        return $this;
-    }
-
-    public function setAppname(string $appname): self
-    {
-        $this->appname = $appname;
-
-        return $this;
-    }
-
-    /**
-     * Appends the 'hostname' and 'appname' parameter for indexing by Logmatic.
-     *
-     * @see http://doc.logmatic.io/docs/basics-to-send-data
-     * @see \Monolog\Formatter\JsonFormatter::format()
-     */
-    public function format(array $record): string
-    {
-        if (!empty($this->hostname)) {
-            $record["hostname"] = $this->hostname;
-        }
-        if (!empty($this->appname)) {
-            $record["appname"] = $this->appname;
-        }
-
-        $record["@marker"] = static::MARKERS;
-
-        return parent::format($record);
-    }
-}
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/Formatter/LogstashFormatter.php b/monolog/vendor/monolog/monolog/src/Monolog/Formatter/LogstashFormatter.php
deleted file mode 100644
index f8de0d33..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/Formatter/LogstashFormatter.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Formatter;
-
-/**
- * Serializes a log message to Logstash Event Format
- *
- * @see https://www.elastic.co/products/logstash
- * @see https://github.com/elastic/logstash/blob/master/logstash-core/src/main/java/org/logstash/Event.java
- *
- * @author Tim Mower <timothy.mower@gmail.com>
- */
-class LogstashFormatter extends NormalizerFormatter
-{
-    /**
-     * @var string the name of the system for the Logstash log message, used to fill the @source field
-     */
-    protected $systemName;
-
-    /**
-     * @var string an application name for the Logstash log message, used to fill the @type field
-     */
-    protected $applicationName;
-
-    /**
-     * @var string the key for 'extra' fields from the Monolog record
-     */
-    protected $extraKey;
-
-    /**
-     * @var string the key for 'context' fields from the Monolog record
-     */
-    protected $contextKey;
-
-    /**
-     * @param string      $applicationName The application that sends the data, used as the "type" field of logstash
-     * @param string|null $systemName      The system/machine name, used as the "source" field of logstash, defaults to the hostname of the machine
-     * @param string      $extraKey        The key for extra keys inside logstash "fields", defaults to extra
-     * @param string      $contextKey      The key for context keys inside logstash "fields", defaults to context
-     */
-    public function __construct(string $applicationName, ?string $systemName = null, string $extraKey = 'extra', string $contextKey = 'context')
-    {
-        // logstash requires a ISO 8601 format date with optional millisecond precision.
-        parent::__construct('Y-m-d\TH:i:s.uP');
-
-        $this->systemName = $systemName === null ? (string) gethostname() : $systemName;
-        $this->applicationName = $applicationName;
-        $this->extraKey = $extraKey;
-        $this->contextKey = $contextKey;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function format(array $record): string
-    {
-        $record = parent::format($record);
-
-        if (empty($record['datetime'])) {
-            $record['datetime'] = gmdate('c');
-        }
-        $message = [
-            '@timestamp' => $record['datetime'],
-            '@version' => 1,
-            'host' => $this->systemName,
-        ];
-        if (isset($record['message'])) {
-            $message['message'] = $record['message'];
-        }
-        if (isset($record['channel'])) {
-            $message['type'] = $record['channel'];
-            $message['channel'] = $record['channel'];
-        }
-        if (isset($record['level_name'])) {
-            $message['level'] = $record['level_name'];
-        }
-        if (isset($record['level'])) {
-            $message['monolog_level'] = $record['level'];
-        }
-        if ($this->applicationName) {
-            $message['type'] = $this->applicationName;
-        }
-        if (!empty($record['extra'])) {
-            $message[$this->extraKey] = $record['extra'];
-        }
-        if (!empty($record['context'])) {
-            $message[$this->contextKey] = $record['context'];
-        }
-
-        return $this->toJson($message) . "\n";
-    }
-}
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/Formatter/MongoDBFormatter.php b/monolog/vendor/monolog/monolog/src/Monolog/Formatter/MongoDBFormatter.php
deleted file mode 100644
index fca69a89..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/Formatter/MongoDBFormatter.php
+++ /dev/null
@@ -1,162 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Formatter;
-
-use MongoDB\BSON\Type;
-use MongoDB\BSON\UTCDateTime;
-use Monolog\Utils;
-
-/**
- * Formats a record for use with the MongoDBHandler.
- *
- * @author Florian Plattner <me@florianplattner.de>
- */
-class MongoDBFormatter implements FormatterInterface
-{
-    /** @var bool */
-    private $exceptionTraceAsString;
-    /** @var int */
-    private $maxNestingLevel;
-    /** @var bool */
-    private $isLegacyMongoExt;
-
-    /**
-     * @param int  $maxNestingLevel        0 means infinite nesting, the $record itself is level 1, $record['context'] is 2
-     * @param bool $exceptionTraceAsString set to false to log exception traces as a sub documents instead of strings
-     */
-    public function __construct(int $maxNestingLevel = 3, bool $exceptionTraceAsString = true)
-    {
-        $this->maxNestingLevel = max($maxNestingLevel, 0);
-        $this->exceptionTraceAsString = $exceptionTraceAsString;
-
-        $this->isLegacyMongoExt = extension_loaded('mongodb') && version_compare((string) phpversion('mongodb'), '1.1.9', '<=');
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * @return mixed[]
-     */
-    public function format(array $record): array
-    {
-        /** @var mixed[] $res */
-        $res = $this->formatArray($record);
-
-        return $res;
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * @return array<mixed[]>
-     */
-    public function formatBatch(array $records): array
-    {
-        $formatted = [];
-        foreach ($records as $key => $record) {
-            $formatted[$key] = $this->format($record);
-        }
-
-        return $formatted;
-    }
-
-    /**
-     * @param  mixed[]        $array
-     * @return mixed[]|string Array except when max nesting level is reached then a string "[...]"
-     */
-    protected function formatArray(array $array, int $nestingLevel = 0)
-    {
-        if ($this->maxNestingLevel > 0 && $nestingLevel > $this->maxNestingLevel) {
-            return '[...]';
-        }
-
-        foreach ($array as $name => $value) {
-            if ($value instanceof \DateTimeInterface) {
-                $array[$name] = $this->formatDate($value, $nestingLevel + 1);
-            } elseif ($value instanceof \Throwable) {
-                $array[$name] = $this->formatException($value, $nestingLevel + 1);
-            } elseif (is_array($value)) {
-                $array[$name] = $this->formatArray($value, $nestingLevel + 1);
-            } elseif (is_object($value) && !$value instanceof Type) {
-                $array[$name] = $this->formatObject($value, $nestingLevel + 1);
-            }
-        }
-
-        return $array;
-    }
-
-    /**
-     * @param  mixed          $value
-     * @return mixed[]|string
-     */
-    protected function formatObject($value, int $nestingLevel)
-    {
-        $objectVars = get_object_vars($value);
-        $objectVars['class'] = Utils::getClass($value);
-
-        return $this->formatArray($objectVars, $nestingLevel);
-    }
-
-    /**
-     * @return mixed[]|string
-     */
-    protected function formatException(\Throwable $exception, int $nestingLevel)
-    {
-        $formattedException = [
-            'class' => Utils::getClass($exception),
-            'message' => $exception->getMessage(),
-            'code' => (int) $exception->getCode(),
-            'file' => $exception->getFile() . ':' . $exception->getLine(),
-        ];
-
-        if ($this->exceptionTraceAsString === true) {
-            $formattedException['trace'] = $exception->getTraceAsString();
-        } else {
-            $formattedException['trace'] = $exception->getTrace();
-        }
-
-        return $this->formatArray($formattedException, $nestingLevel);
-    }
-
-    protected function formatDate(\DateTimeInterface $value, int $nestingLevel): UTCDateTime
-    {
-        if ($this->isLegacyMongoExt) {
-            return $this->legacyGetMongoDbDateTime($value);
-        }
-
-        return $this->getMongoDbDateTime($value);
-    }
-
-    private function getMongoDbDateTime(\DateTimeInterface $value): UTCDateTime
-    {
-        return new UTCDateTime((int) floor(((float) $value->format('U.u')) * 1000));
-    }
-
-    /**
-     * This is needed to support MongoDB Driver v1.19 and below
-     *
-     * See https://github.com/mongodb/mongo-php-driver/issues/426
-     *
-     * It can probably be removed in 2.1 or later once MongoDB's 1.2 is released and widely adopted
-     */
-    private function legacyGetMongoDbDateTime(\DateTimeInterface $value): UTCDateTime
-    {
-        $milliseconds = floor(((float) $value->format('U.u')) * 1000);
-
-        $milliseconds = (PHP_INT_SIZE == 8) //64-bit OS?
-            ? (int) $milliseconds
-            : (string) $milliseconds;
-
-        // @phpstan-ignore-next-line
-        return new UTCDateTime($milliseconds);
-    }
-}
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/Formatter/NormalizerFormatter.php b/monolog/vendor/monolog/monolog/src/Monolog/Formatter/NormalizerFormatter.php
deleted file mode 100644
index f926a842..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/Formatter/NormalizerFormatter.php
+++ /dev/null
@@ -1,290 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Formatter;
-
-use Monolog\DateTimeImmutable;
-use Monolog\Utils;
-use Throwable;
-
-/**
- * Normalizes incoming records to remove objects/resources so it's easier to dump to various targets
- *
- * @author Jordi Boggiano <j.boggiano@seld.be>
- */
-class NormalizerFormatter implements FormatterInterface
-{
-    public const SIMPLE_DATE = "Y-m-d\TH:i:sP";
-
-    /** @var string */
-    protected $dateFormat;
-    /** @var int */
-    protected $maxNormalizeDepth = 9;
-    /** @var int */
-    protected $maxNormalizeItemCount = 1000;
-
-    /** @var int */
-    private $jsonEncodeOptions = Utils::DEFAULT_JSON_FLAGS;
-
-    /**
-     * @param string|null $dateFormat The format of the timestamp: one supported by DateTime::format
-     */
-    public function __construct(?string $dateFormat = null)
-    {
-        $this->dateFormat = null === $dateFormat ? static::SIMPLE_DATE : $dateFormat;
-        if (!function_exists('json_encode')) {
-            throw new \RuntimeException('PHP\'s json extension is required to use Monolog\'s NormalizerFormatter');
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * @param mixed[] $record
-     */
-    public function format(array $record)
-    {
-        return $this->normalize($record);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function formatBatch(array $records)
-    {
-        foreach ($records as $key => $record) {
-            $records[$key] = $this->format($record);
-        }
-
-        return $records;
-    }
-
-    public function getDateFormat(): string
-    {
-        return $this->dateFormat;
-    }
-
-    public function setDateFormat(string $dateFormat): self
-    {
-        $this->dateFormat = $dateFormat;
-
-        return $this;
-    }
-
-    /**
-     * The maximum number of normalization levels to go through
-     */
-    public function getMaxNormalizeDepth(): int
-    {
-        return $this->maxNormalizeDepth;
-    }
-
-    public function setMaxNormalizeDepth(int $maxNormalizeDepth): self
-    {
-        $this->maxNormalizeDepth = $maxNormalizeDepth;
-
-        return $this;
-    }
-
-    /**
-     * The maximum number of items to normalize per level
-     */
-    public function getMaxNormalizeItemCount(): int
-    {
-        return $this->maxNormalizeItemCount;
-    }
-
-    public function setMaxNormalizeItemCount(int $maxNormalizeItemCount): self
-    {
-        $this->maxNormalizeItemCount = $maxNormalizeItemCount;
-
-        return $this;
-    }
-
-    /**
-     * Enables `json_encode` pretty print.
-     */
-    public function setJsonPrettyPrint(bool $enable): self
-    {
-        if ($enable) {
-            $this->jsonEncodeOptions |= JSON_PRETTY_PRINT;
-        } else {
-            $this->jsonEncodeOptions &= ~JSON_PRETTY_PRINT;
-        }
-
-        return $this;
-    }
-
-    /**
-     * @param  mixed                $data
-     * @return null|scalar|array<array|scalar|null>
-     */
-    protected function normalize($data, int $depth = 0)
-    {
-        if ($depth > $this->maxNormalizeDepth) {
-            return 'Over ' . $this->maxNormalizeDepth . ' levels deep, aborting normalization';
-        }
-
-        if (null === $data || is_scalar($data)) {
-            if (is_float($data)) {
-                if (is_infinite($data)) {
-                    return ($data > 0 ? '' : '-') . 'INF';
-                }
-                if (is_nan($data)) {
-                    return 'NaN';
-                }
-            }
-
-            return $data;
-        }
-
-        if (is_array($data)) {
-            $normalized = [];
-
-            $count = 1;
-            foreach ($data as $key => $value) {
-                if ($count++ > $this->maxNormalizeItemCount) {
-                    $normalized['...'] = 'Over ' . $this->maxNormalizeItemCount . ' items ('.count($data).' total), aborting normalization';
-                    break;
-                }
-
-                $normalized[$key] = $this->normalize($value, $depth + 1);
-            }
-
-            return $normalized;
-        }
-
-        if ($data instanceof \DateTimeInterface) {
-            return $this->formatDate($data);
-        }
-
-        if (is_object($data)) {
-            if ($data instanceof Throwable) {
-                return $this->normalizeException($data, $depth);
-            }
-
-            if ($data instanceof \JsonSerializable) {
-                /** @var null|scalar|array<array|scalar|null> $value */
-                $value = $data->jsonSerialize();
-            } elseif (\get_class($data) === '__PHP_Incomplete_Class') {
-                $accessor = new \ArrayObject($data);
-                $value = (string) $accessor['__PHP_Incomplete_Class_Name'];
-            } elseif (method_exists($data, '__toString')) {
-                /** @var string $value */
-                $value = $data->__toString();
-            } else {
-                // the rest is normalized by json encoding and decoding it
-                /** @var null|scalar|array<array|scalar|null> $value */
-                $value = json_decode($this->toJson($data, true), true);
-            }
-
-            return [Utils::getClass($data) => $value];
-        }
-
-        if (is_resource($data)) {
-            return sprintf('[resource(%s)]', get_resource_type($data));
-        }
-
-        return '[unknown('.gettype($data).')]';
-    }
-
-    /**
-     * @return mixed[]
-     */
-    protected function normalizeException(Throwable $e, int $depth = 0)
-    {
-        if ($depth > $this->maxNormalizeDepth) {
-            return ['Over ' . $this->maxNormalizeDepth . ' levels deep, aborting normalization'];
-        }
-
-        if ($e instanceof \JsonSerializable) {
-            return (array) $e->jsonSerialize();
-        }
-
-        $data = [
-            'class' => Utils::getClass($e),
-            'message' => $e->getMessage(),
-            'code' => (int) $e->getCode(),
-            'file' => $e->getFile().':'.$e->getLine(),
-        ];
-
-        if ($e instanceof \SoapFault) {
-            if (isset($e->faultcode)) {
-                $data['faultcode'] = $e->faultcode;
-            }
-
-            if (isset($e->faultactor)) {
-                $data['faultactor'] = $e->faultactor;
-            }
-
-            if (isset($e->detail)) {
-                if (is_string($e->detail)) {
-                    $data['detail'] = $e->detail;
-                } elseif (is_object($e->detail) || is_array($e->detail)) {
-                    $data['detail'] = $this->toJson($e->detail, true);
-                }
-            }
-        }
-
-        $trace = $e->getTrace();
-        foreach ($trace as $frame) {
-            if (isset($frame['file'])) {
-                $data['trace'][] = $frame['file'].':'.$frame['line'];
-            }
-        }
-
-        if ($previous = $e->getPrevious()) {
-            $data['previous'] = $this->normalizeException($previous, $depth + 1);
-        }
-
-        return $data;
-    }
-
-    /**
-     * Return the JSON representation of a value
-     *
-     * @param  mixed             $data
-     * @throws \RuntimeException if encoding fails and errors are not ignored
-     * @return string            if encoding fails and ignoreErrors is true 'null' is returned
-     */
-    protected function toJson($data, bool $ignoreErrors = false): string
-    {
-        return Utils::jsonEncode($data, $this->jsonEncodeOptions, $ignoreErrors);
-    }
-
-    /**
-     * @return string
-     */
-    protected function formatDate(\DateTimeInterface $date)
-    {
-        // in case the date format isn't custom then we defer to the custom DateTimeImmutable
-        // formatting logic, which will pick the right format based on whether useMicroseconds is on
-        if ($this->dateFormat === self::SIMPLE_DATE && $date instanceof DateTimeImmutable) {
-            return (string) $date;
-        }
-
-        return $date->format($this->dateFormat);
-    }
-
-    public function addJsonEncodeOption(int $option): self
-    {
-        $this->jsonEncodeOptions |= $option;
-
-        return $this;
-    }
-
-    public function removeJsonEncodeOption(int $option): self
-    {
-        $this->jsonEncodeOptions &= ~$option;
-
-        return $this;
-    }
-}
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/Formatter/ScalarFormatter.php b/monolog/vendor/monolog/monolog/src/Monolog/Formatter/ScalarFormatter.php
deleted file mode 100644
index 187bc550..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/Formatter/ScalarFormatter.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Formatter;
-
-/**
- * Formats data into an associative array of scalar values.
- * Objects and arrays will be JSON encoded.
- *
- * @author Andrew Lawson <adlawson@gmail.com>
- */
-class ScalarFormatter extends NormalizerFormatter
-{
-    /**
-     * {@inheritDoc}
-     *
-     * @phpstan-return array<string, scalar|null> $record
-     */
-    public function format(array $record): array
-    {
-        $result = [];
-        foreach ($record as $key => $value) {
-            $result[$key] = $this->normalizeValue($value);
-        }
-
-        return $result;
-    }
-
-    /**
-     * @param  mixed                      $value
-     * @return scalar|null
-     */
-    protected function normalizeValue($value)
-    {
-        $normalized = $this->normalize($value);
-
-        if (is_array($normalized)) {
-            return $this->toJson($normalized, true);
-        }
-
-        return $normalized;
-    }
-}
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/Formatter/WildfireFormatter.php b/monolog/vendor/monolog/monolog/src/Monolog/Formatter/WildfireFormatter.php
deleted file mode 100644
index 6539b347..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/Formatter/WildfireFormatter.php
+++ /dev/null
@@ -1,139 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Formatter;
-
-use Monolog\Logger;
-
-/**
- * Serializes a log message according to Wildfire's header requirements
- *
- * @author Eric Clemmons (@ericclemmons) <eric@uxdriven.com>
- * @author Christophe Coevoet <stof@notk.org>
- * @author Kirill chEbba Chebunin <iam@chebba.org>
- *
- * @phpstan-import-type Level from \Monolog\Logger
- */
-class WildfireFormatter extends NormalizerFormatter
-{
-    /**
-     * Translates Monolog log levels to Wildfire levels.
-     *
-     * @var array<Level, string>
-     */
-    private $logLevels = [
-        Logger::DEBUG     => 'LOG',
-        Logger::INFO      => 'INFO',
-        Logger::NOTICE    => 'INFO',
-        Logger::WARNING   => 'WARN',
-        Logger::ERROR     => 'ERROR',
-        Logger::CRITICAL  => 'ERROR',
-        Logger::ALERT     => 'ERROR',
-        Logger::EMERGENCY => 'ERROR',
-    ];
-
-    /**
-     * @param string|null $dateFormat The format of the timestamp: one supported by DateTime::format
-     */
-    public function __construct(?string $dateFormat = null)
-    {
-        parent::__construct($dateFormat);
-
-        // http headers do not like non-ISO-8559-1 characters
-        $this->removeJsonEncodeOption(JSON_UNESCAPED_UNICODE);
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * @return string
-     */
-    public function format(array $record): string
-    {
-        // Retrieve the line and file if set and remove them from the formatted extra
-        $file = $line = '';
-        if (isset($record['extra']['file'])) {
-            $file = $record['extra']['file'];
-            unset($record['extra']['file']);
-        }
-        if (isset($record['extra']['line'])) {
-            $line = $record['extra']['line'];
-            unset($record['extra']['line']);
-        }
-
-        /** @var mixed[] $record */
-        $record = $this->normalize($record);
-        $message = ['message' => $record['message']];
-        $handleError = false;
-        if ($record['context']) {
-            $message['context'] = $record['context'];
-            $handleError = true;
-        }
-        if ($record['extra']) {
-            $message['extra'] = $record['extra'];
-            $handleError = true;
-        }
-        if (count($message) === 1) {
-            $message = reset($message);
-        }
-
-        if (isset($record['context']['table'])) {
-            $type  = 'TABLE';
-            $label = $record['channel'] .': '. $record['message'];
-            $message = $record['context']['table'];
-        } else {
-            $type  = $this->logLevels[$record['level']];
-            $label = $record['channel'];
-        }
-
-        // Create JSON object describing the appearance of the message in the console
-        $json = $this->toJson([
-            [
-                'Type'  => $type,
-                'File'  => $file,
-                'Line'  => $line,
-                'Label' => $label,
-            ],
-            $message,
-        ], $handleError);
-
-        // The message itself is a serialization of the above JSON object + it's length
-        return sprintf(
-            '%d|%s|',
-            strlen($json),
-            $json
-        );
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * @phpstan-return never
-     */
-    public function formatBatch(array $records)
-    {
-        throw new \BadMethodCallException('Batch formatting does not make sense for the WildfireFormatter');
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * @return null|scalar|array<array|scalar|null>|object
-     */
-    protected function normalize($data, int $depth = 0)
-    {
-        if (is_object($data) && !$data instanceof \DateTimeInterface) {
-            return $data;
-        }
-
-        return parent::normalize($data, $depth);
-    }
-}
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/Handler/AbstractHandler.php b/monolog/vendor/monolog/monolog/src/Monolog/Handler/AbstractHandler.php
deleted file mode 100644
index a5cdaa71..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/Handler/AbstractHandler.php
+++ /dev/null
@@ -1,112 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\Logger;
-use Monolog\ResettableInterface;
-use Psr\Log\LogLevel;
-
-/**
- * Base Handler class providing basic level/bubble support
- *
- * @author Jordi Boggiano <j.boggiano@seld.be>
- *
- * @phpstan-import-type Level from \Monolog\Logger
- * @phpstan-import-type LevelName from \Monolog\Logger
- */
-abstract class AbstractHandler extends Handler implements ResettableInterface
-{
-    /**
-     * @var int
-     * @phpstan-var Level
-     */
-    protected $level = Logger::DEBUG;
-    /** @var bool */
-    protected $bubble = true;
-
-    /**
-     * @param int|string $level  The minimum logging level at which this handler will be triggered
-     * @param bool       $bubble Whether the messages that are handled can bubble up the stack or not
-     *
-     * @phpstan-param Level|LevelName|LogLevel::* $level
-     */
-    public function __construct($level = Logger::DEBUG, bool $bubble = true)
-    {
-        $this->setLevel($level);
-        $this->bubble = $bubble;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function isHandling(array $record): bool
-    {
-        return $record['level'] >= $this->level;
-    }
-
-    /**
-     * Sets minimum logging level at which this handler will be triggered.
-     *
-     * @param  Level|LevelName|LogLevel::* $level Level or level name
-     * @return self
-     */
-    public function setLevel($level): self
-    {
-        $this->level = Logger::toMonologLevel($level);
-
-        return $this;
-    }
-
-    /**
-     * Gets minimum logging level at which this handler will be triggered.
-     *
-     * @return int
-     *
-     * @phpstan-return Level
-     */
-    public function getLevel(): int
-    {
-        return $this->level;
-    }
-
-    /**
-     * Sets the bubbling behavior.
-     *
-     * @param  bool $bubble true means that this handler allows bubbling.
-     *                      false means that bubbling is not permitted.
-     * @return self
-     */
-    public function setBubble(bool $bubble): self
-    {
-        $this->bubble = $bubble;
-
-        return $this;
-    }
-
-    /**
-     * Gets the bubbling behavior.
-     *
-     * @return bool true means that this handler allows bubbling.
-     *              false means that bubbling is not permitted.
-     */
-    public function getBubble(): bool
-    {
-        return $this->bubble;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function reset()
-    {
-    }
-}
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/Handler/AbstractProcessingHandler.php b/monolog/vendor/monolog/monolog/src/Monolog/Handler/AbstractProcessingHandler.php
deleted file mode 100644
index 77e533fc..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/Handler/AbstractProcessingHandler.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-/**
- * Base Handler class providing the Handler structure, including processors and formatters
- *
- * Classes extending it should (in most cases) only implement write($record)
- *
- * @author Jordi Boggiano <j.boggiano@seld.be>
- * @author Christophe Coevoet <stof@notk.org>
- *
- * @phpstan-import-type LevelName from \Monolog\Logger
- * @phpstan-import-type Level from \Monolog\Logger
- * @phpstan-import-type Record from \Monolog\Logger
- * @phpstan-type FormattedRecord array{message: string, context: mixed[], level: Level, level_name: LevelName, channel: string, datetime: \DateTimeImmutable, extra: mixed[], formatted: mixed}
- */
-abstract class AbstractProcessingHandler extends AbstractHandler implements ProcessableHandlerInterface, FormattableHandlerInterface
-{
-    use ProcessableHandlerTrait;
-    use FormattableHandlerTrait;
-
-    /**
-     * {@inheritDoc}
-     */
-    public function handle(array $record): bool
-    {
-        if (!$this->isHandling($record)) {
-            return false;
-        }
-
-        if ($this->processors) {
-            /** @var Record $record */
-            $record = $this->processRecord($record);
-        }
-
-        $record['formatted'] = $this->getFormatter()->format($record);
-
-        $this->write($record);
-
-        return false === $this->bubble;
-    }
-
-    /**
-     * Writes the record down to the log of the implementing handler
-     *
-     * @phpstan-param FormattedRecord $record
-     */
-    abstract protected function write(array $record): void;
-
-    /**
-     * @return void
-     */
-    public function reset()
-    {
-        parent::reset();
-
-        $this->resetProcessors();
-    }
-}
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/Handler/AbstractSyslogHandler.php b/monolog/vendor/monolog/monolog/src/Monolog/Handler/AbstractSyslogHandler.php
deleted file mode 100644
index 5e5ad1c1..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/Handler/AbstractSyslogHandler.php
+++ /dev/null
@@ -1,106 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\Logger;
-use Monolog\Formatter\FormatterInterface;
-use Monolog\Formatter\LineFormatter;
-
-/**
- * Common syslog functionality
- *
- * @phpstan-import-type Level from \Monolog\Logger
- */
-abstract class AbstractSyslogHandler extends AbstractProcessingHandler
-{
-    /** @var int */
-    protected $facility;
-
-    /**
-     * Translates Monolog log levels to syslog log priorities.
-     * @var array
-     * @phpstan-var array<Level, int>
-     */
-    protected $logLevels = [
-        Logger::DEBUG     => LOG_DEBUG,
-        Logger::INFO      => LOG_INFO,
-        Logger::NOTICE    => LOG_NOTICE,
-        Logger::WARNING   => LOG_WARNING,
-        Logger::ERROR     => LOG_ERR,
-        Logger::CRITICAL  => LOG_CRIT,
-        Logger::ALERT     => LOG_ALERT,
-        Logger::EMERGENCY => LOG_EMERG,
-    ];
-
-    /**
-     * List of valid log facility names.
-     * @var array<string, int>
-     */
-    protected $facilities = [
-        'auth'     => LOG_AUTH,
-        'authpriv' => LOG_AUTHPRIV,
-        'cron'     => LOG_CRON,
-        'daemon'   => LOG_DAEMON,
-        'kern'     => LOG_KERN,
-        'lpr'      => LOG_LPR,
-        'mail'     => LOG_MAIL,
-        'news'     => LOG_NEWS,
-        'syslog'   => LOG_SYSLOG,
-        'user'     => LOG_USER,
-        'uucp'     => LOG_UUCP,
-    ];
-
-    /**
-     * @param string|int $facility Either one of the names of the keys in $this->facilities, or a LOG_* facility constant
-     */
-    public function __construct($facility = LOG_USER, $level = Logger::DEBUG, bool $bubble = true)
-    {
-        parent::__construct($level, $bubble);
-
-        if (!defined('PHP_WINDOWS_VERSION_BUILD')) {
-            $this->facilities['local0'] = LOG_LOCAL0;
-            $this->facilities['local1'] = LOG_LOCAL1;
-            $this->facilities['local2'] = LOG_LOCAL2;
-            $this->facilities['local3'] = LOG_LOCAL3;
-            $this->facilities['local4'] = LOG_LOCAL4;
-            $this->facilities['local5'] = LOG_LOCAL5;
-            $this->facilities['local6'] = LOG_LOCAL6;
-            $this->facilities['local7'] = LOG_LOCAL7;
-        } else {
-            $this->facilities['local0'] = 128; // LOG_LOCAL0
-            $this->facilities['local1'] = 136; // LOG_LOCAL1
-            $this->facilities['local2'] = 144; // LOG_LOCAL2
-            $this->facilities['local3'] = 152; // LOG_LOCAL3
-            $this->facilities['local4'] = 160; // LOG_LOCAL4
-            $this->facilities['local5'] = 168; // LOG_LOCAL5
-            $this->facilities['local6'] = 176; // LOG_LOCAL6
-            $this->facilities['local7'] = 184; // LOG_LOCAL7
-        }
-
-        // convert textual description of facility to syslog constant
-        if (is_string($facility) && array_key_exists(strtolower($facility), $this->facilities)) {
-            $facility = $this->facilities[strtolower($facility)];
-        } elseif (!in_array($facility, array_values($this->facilities), true)) {
-            throw new \UnexpectedValueException('Unknown facility value "'.$facility.'" given');
-        }
-
-        $this->facility = $facility;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function getDefaultFormatter(): FormatterInterface
-    {
-        return new LineFormatter('%channel%.%level_name%: %message% %context% %extra%');
-    }
-}
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/Handler/AmqpHandler.php b/monolog/vendor/monolog/monolog/src/Monolog/Handler/AmqpHandler.php
deleted file mode 100644
index 994872ce..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/Handler/AmqpHandler.php
+++ /dev/null
@@ -1,171 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\Logger;
-use Monolog\Formatter\FormatterInterface;
-use Monolog\Formatter\JsonFormatter;
-use PhpAmqpLib\Message\AMQPMessage;
-use PhpAmqpLib\Channel\AMQPChannel;
-use AMQPExchange;
-
-/**
- * @phpstan-import-type Record from \Monolog\Logger
- */
-class AmqpHandler extends AbstractProcessingHandler
-{
-    /**
-     * @var AMQPExchange|AMQPChannel $exchange
-     */
-    protected $exchange;
-    /** @var array<string, mixed> */
-    private $extraAttributes = [];
-
-    /**
-     * @return array<string, mixed>
-     */
-    public function getExtraAttributes(): array
-    {
-        return $this->extraAttributes;
-    }
-
-    /**
-     * Configure extra attributes to pass to the AMQPExchange (if you are using the amqp extension)
-     *
-     * @param array<string, mixed> $extraAttributes  One of content_type, content_encoding,
-     *                                               message_id, user_id, app_id, delivery_mode,
-     *                                               priority, timestamp, expiration, type
-     *                                               or reply_to, headers.
-     * @return AmqpHandler
-     */
-    public function setExtraAttributes(array $extraAttributes): self
-    {
-        $this->extraAttributes = $extraAttributes;
-        return $this;
-    }
-
-    /**
-     * @var string
-     */
-    protected $exchangeName;
-
-    /**
-     * @param AMQPExchange|AMQPChannel $exchange     AMQPExchange (php AMQP ext) or PHP AMQP lib channel, ready for use
-     * @param string|null              $exchangeName Optional exchange name, for AMQPChannel (PhpAmqpLib) only
-     */
-    public function __construct($exchange, ?string $exchangeName = null, $level = Logger::DEBUG, bool $bubble = true)
-    {
-        if ($exchange instanceof AMQPChannel) {
-            $this->exchangeName = (string) $exchangeName;
-        } elseif (!$exchange instanceof AMQPExchange) {
-            throw new \InvalidArgumentException('PhpAmqpLib\Channel\AMQPChannel or AMQPExchange instance required');
-        } elseif ($exchangeName) {
-            @trigger_error('The $exchangeName parameter can only be passed when using PhpAmqpLib, if using an AMQPExchange instance configure it beforehand', E_USER_DEPRECATED);
-        }
-        $this->exchange = $exchange;
-
-        parent::__construct($level, $bubble);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function write(array $record): void
-    {
-        $data = $record["formatted"];
-        $routingKey = $this->getRoutingKey($record);
-
-        if ($this->exchange instanceof AMQPExchange) {
-            $attributes = [
-                'delivery_mode' => 2,
-                'content_type'  => 'application/json',
-            ];
-            if ($this->extraAttributes) {
-                $attributes = array_merge($attributes, $this->extraAttributes);
-            }
-            $this->exchange->publish(
-                $data,
-                $routingKey,
-                0,
-                $attributes
-            );
-        } else {
-            $this->exchange->basic_publish(
-                $this->createAmqpMessage($data),
-                $this->exchangeName,
-                $routingKey
-            );
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function handleBatch(array $records): void
-    {
-        if ($this->exchange instanceof AMQPExchange) {
-            parent::handleBatch($records);
-
-            return;
-        }
-
-        foreach ($records as $record) {
-            if (!$this->isHandling($record)) {
-                continue;
-            }
-
-            /** @var Record $record */
-            $record = $this->processRecord($record);
-            $data = $this->getFormatter()->format($record);
-
-            $this->exchange->batch_basic_publish(
-                $this->createAmqpMessage($data),
-                $this->exchangeName,
-                $this->getRoutingKey($record)
-            );
-        }
-
-        $this->exchange->publish_batch();
-    }
-
-    /**
-     * Gets the routing key for the AMQP exchange
-     *
-     * @phpstan-param Record $record
-     */
-    protected function getRoutingKey(array $record): string
-    {
-        $routingKey = sprintf('%s.%s', $record['level_name'], $record['channel']);
-
-        return strtolower($routingKey);
-    }
-
-    private function createAmqpMessage(string $data): AMQPMessage
-    {
-        $attributes = [
-            'delivery_mode' => 2,
-            'content_type' => 'application/json',
-        ];
-        if ($this->extraAttributes) {
-            $attributes = array_merge($attributes, $this->extraAttributes);
-        }
-        return new AMQPMessage($data, $attributes);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function getDefaultFormatter(): FormatterInterface
-    {
-        return new JsonFormatter(JsonFormatter::BATCH_MODE_JSON, false);
-    }
-}
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/Handler/BrowserConsoleHandler.php b/monolog/vendor/monolog/monolog/src/Monolog/Handler/BrowserConsoleHandler.php
deleted file mode 100644
index 95bbfed4..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/Handler/BrowserConsoleHandler.php
+++ /dev/null
@@ -1,308 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\Formatter\FormatterInterface;
-use Monolog\Formatter\LineFormatter;
-use Monolog\Utils;
-use Monolog\Logger;
-
-use function count;
-use function headers_list;
-use function stripos;
-use function trigger_error;
-
-use const E_USER_DEPRECATED;
-
-/**
- * Handler sending logs to browser's javascript console with no browser extension required
- *
- * @author Olivier Poitrey <rs@dailymotion.com>
- *
- * @phpstan-import-type FormattedRecord from AbstractProcessingHandler
- */
-class BrowserConsoleHandler extends AbstractProcessingHandler
-{
-    /** @var bool */
-    protected static $initialized = false;
-    /** @var FormattedRecord[] */
-    protected static $records = [];
-
-    protected const FORMAT_HTML = 'html';
-    protected const FORMAT_JS = 'js';
-    protected const FORMAT_UNKNOWN = 'unknown';
-
-    /**
-     * {@inheritDoc}
-     *
-     * Formatted output may contain some formatting markers to be transferred to `console.log` using the %c format.
-     *
-     * Example of formatted string:
-     *
-     *     You can do [[blue text]]{color: blue} or [[green background]]{background-color: green; color: white}
-     */
-    protected function getDefaultFormatter(): FormatterInterface
-    {
-        return new LineFormatter('[[%channel%]]{macro: autolabel} [[%level_name%]]{font-weight: bold} %message%');
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function write(array $record): void
-    {
-        // Accumulate records
-        static::$records[] = $record;
-
-        // Register shutdown handler if not already done
-        if (!static::$initialized) {
-            static::$initialized = true;
-            $this->registerShutdownFunction();
-        }
-    }
-
-    /**
-     * Convert records to javascript console commands and send it to the browser.
-     * This method is automatically called on PHP shutdown if output is HTML or Javascript.
-     */
-    public static function send(): void
-    {
-        $format = static::getResponseFormat();
-        if ($format === self::FORMAT_UNKNOWN) {
-            return;
-        }
-
-        if (count(static::$records)) {
-            if ($format === self::FORMAT_HTML) {
-                static::writeOutput('<script>' . static::generateScript() . '</script>');
-            } elseif ($format === self::FORMAT_JS) {
-                static::writeOutput(static::generateScript());
-            }
-            static::resetStatic();
-        }
-    }
-
-    public function close(): void
-    {
-        self::resetStatic();
-    }
-
-    public function reset()
-    {
-        parent::reset();
-
-        self::resetStatic();
-    }
-
-    /**
-     * Forget all logged records
-     */
-    public static function resetStatic(): void
-    {
-        static::$records = [];
-    }
-
-    /**
-     * Wrapper for register_shutdown_function to allow overriding
-     */
-    protected function registerShutdownFunction(): void
-    {
-        if (PHP_SAPI !== 'cli') {
-            register_shutdown_function(['Monolog\Handler\BrowserConsoleHandler', 'send']);
-        }
-    }
-
-    /**
-     * Wrapper for echo to allow overriding
-     */
-    protected static function writeOutput(string $str): void
-    {
-        echo $str;
-    }
-
-    /**
-     * Checks the format of the response
-     *
-     * If Content-Type is set to application/javascript or text/javascript -> js
-     * If Content-Type is set to text/html, or is unset -> html
-     * If Content-Type is anything else -> unknown
-     *
-     * @return string One of 'js', 'html' or 'unknown'
-     * @phpstan-return self::FORMAT_*
-     */
-    protected static function getResponseFormat(): string
-    {
-        // Check content type
-        foreach (headers_list() as $header) {
-            if (stripos($header, 'content-type:') === 0) {
-                return static::getResponseFormatFromContentType($header);
-            }
-        }
-
-        return self::FORMAT_HTML;
-    }
-
-    /**
-     * @return string One of 'js', 'html' or 'unknown'
-     * @phpstan-return self::FORMAT_*
-     */
-    protected static function getResponseFormatFromContentType(string $contentType): string
-    {
-        // This handler only works with HTML and javascript outputs
-        // text/javascript is obsolete in favour of application/javascript, but still used
-        if (stripos($contentType, 'application/javascript') !== false || stripos($contentType, 'text/javascript') !== false) {
-            return self::FORMAT_JS;
-        }
-
-        if (stripos($contentType, 'text/html') !== false) {
-            return self::FORMAT_HTML;
-        }
-
-        return self::FORMAT_UNKNOWN;
-    }
-
-    private static function generateScript(): string
-    {
-        $script = [];
-        foreach (static::$records as $record) {
-            $context = static::dump('Context', $record['context']);
-            $extra = static::dump('Extra', $record['extra']);
-
-            if (empty($context) && empty($extra)) {
-                $script[] = static::call_array(static::getConsoleMethodForLevel($record['level']), static::handleStyles($record['formatted']));
-            } else {
-                $script = array_merge(
-                    $script,
-                    [static::call_array('groupCollapsed', static::handleStyles($record['formatted']))],
-                    $context,
-                    $extra,
-                    [static::call('groupEnd')]
-                );
-            }
-        }
-
-        return "(function (c) {if (c && c.groupCollapsed) {\n" . implode("\n", $script) . "\n}})(console);";
-    }
-
-    private static function getConsoleMethodForLevel(int $level): string
-    {
-        return [
-            Logger::DEBUG => 'debug',
-            Logger::INFO => 'info',
-            Logger::NOTICE => 'info',
-            Logger::WARNING => 'warn',
-            Logger::ERROR => 'error',
-            Logger::CRITICAL => 'error',
-            Logger::ALERT => 'error',
-            Logger::EMERGENCY => 'error',
-        ][$level] ?? 'log';
-    }
-
-    /**
-     * @return string[]
-     */
-    private static function handleStyles(string $formatted): array
-    {
-        $args = [];
-        $format = '%c' . $formatted;
-        preg_match_all('/\[\[(.*?)\]\]\{([^}]*)\}/s', $format, $matches, PREG_OFFSET_CAPTURE | PREG_SET_ORDER);
-
-        foreach (array_reverse($matches) as $match) {
-            $args[] = '"font-weight: normal"';
-            $args[] = static::quote(static::handleCustomStyles($match[2][0], $match[1][0]));
-
-            $pos = $match[0][1];
-            $format = Utils::substr($format, 0, $pos) . '%c' . $match[1][0] . '%c' . Utils::substr($format, $pos + strlen($match[0][0]));
-        }
-
-        $args[] = static::quote('font-weight: normal');
-        $args[] = static::quote($format);
-
-        return array_reverse($args);
-    }
-
-    private static function handleCustomStyles(string $style, string $string): string
-    {
-        static $colors = ['blue', 'green', 'red', 'magenta', 'orange', 'black', 'grey'];
-        static $labels = [];
-
-        $style = preg_replace_callback('/macro\s*:(.*?)(?:;|$)/', function (array $m) use ($string, &$colors, &$labels) {
-            if (trim($m[1]) === 'autolabel') {
-                // Format the string as a label with consistent auto assigned background color
-                if (!isset($labels[$string])) {
-                    $labels[$string] = $colors[count($labels) % count($colors)];
-                }
-                $color = $labels[$string];
-
-                return "background-color: $color; color: white; border-radius: 3px; padding: 0 2px 0 2px";
-            }
-
-            return $m[1];
-        }, $style);
-
-        if (null === $style) {
-            $pcreErrorCode = preg_last_error();
-            throw new \RuntimeException('Failed to run preg_replace_callback: ' . $pcreErrorCode . ' / ' . Utils::pcreLastErrorMessage($pcreErrorCode));
-        }
-
-        return $style;
-    }
-
-    /**
-     * @param  mixed[] $dict
-     * @return mixed[]
-     */
-    private static function dump(string $title, array $dict): array
-    {
-        $script = [];
-        $dict = array_filter($dict);
-        if (empty($dict)) {
-            return $script;
-        }
-        $script[] = static::call('log', static::quote('%c%s'), static::quote('font-weight: bold'), static::quote($title));
-        foreach ($dict as $key => $value) {
-            $value = json_encode($value);
-            if (empty($value)) {
-                $value = static::quote('');
-            }
-            $script[] = static::call('log', static::quote('%s: %o'), static::quote((string) $key), $value);
-        }
-
-        return $script;
-    }
-
-    private static function quote(string $arg): string
-    {
-        return '"' . addcslashes($arg, "\"\n\\") . '"';
-    }
-
-    /**
-     * @param mixed $args
-     */
-    private static function call(...$args): string
-    {
-        $method = array_shift($args);
-        if (!is_string($method)) {
-            throw new \UnexpectedValueException('Expected the first arg to be a string, got: '.var_export($method, true));
-        }
-
-        return static::call_array($method, $args);
-    }
-
-    /**
-     * @param mixed[] $args
-     */
-    private static function call_array(string $method, array $args): string
-    {
-        return 'c.' . $method . '(' . implode(', ', $args) . ');';
-    }
-}
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/Handler/BufferHandler.php b/monolog/vendor/monolog/monolog/src/Monolog/Handler/BufferHandler.php
deleted file mode 100644
index fcce5d63..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/Handler/BufferHandler.php
+++ /dev/null
@@ -1,167 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\Logger;
-use Monolog\ResettableInterface;
-use Monolog\Formatter\FormatterInterface;
-
-/**
- * Buffers all records until closing the handler and then pass them as batch.
- *
- * This is useful for a MailHandler to send only one mail per request instead of
- * sending one per log message.
- *
- * @author Christophe Coevoet <stof@notk.org>
- *
- * @phpstan-import-type Record from \Monolog\Logger
- */
-class BufferHandler extends AbstractHandler implements ProcessableHandlerInterface, FormattableHandlerInterface
-{
-    use ProcessableHandlerTrait;
-
-    /** @var HandlerInterface */
-    protected $handler;
-    /** @var int */
-    protected $bufferSize = 0;
-    /** @var int */
-    protected $bufferLimit;
-    /** @var bool */
-    protected $flushOnOverflow;
-    /** @var Record[] */
-    protected $buffer = [];
-    /** @var bool */
-    protected $initialized = false;
-
-    /**
-     * @param HandlerInterface $handler         Handler.
-     * @param int              $bufferLimit     How many entries should be buffered at most, beyond that the oldest items are removed from the buffer.
-     * @param bool             $flushOnOverflow If true, the buffer is flushed when the max size has been reached, by default oldest entries are discarded
-     */
-    public function __construct(HandlerInterface $handler, int $bufferLimit = 0, $level = Logger::DEBUG, bool $bubble = true, bool $flushOnOverflow = false)
-    {
-        parent::__construct($level, $bubble);
-        $this->handler = $handler;
-        $this->bufferLimit = $bufferLimit;
-        $this->flushOnOverflow = $flushOnOverflow;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function handle(array $record): bool
-    {
-        if ($record['level'] < $this->level) {
-            return false;
-        }
-
-        if (!$this->initialized) {
-            // __destructor() doesn't get called on Fatal errors
-            register_shutdown_function([$this, 'close']);
-            $this->initialized = true;
-        }
-
-        if ($this->bufferLimit > 0 && $this->bufferSize === $this->bufferLimit) {
-            if ($this->flushOnOverflow) {
-                $this->flush();
-            } else {
-                array_shift($this->buffer);
-                $this->bufferSize--;
-            }
-        }
-
-        if ($this->processors) {
-            /** @var Record $record */
-            $record = $this->processRecord($record);
-        }
-
-        $this->buffer[] = $record;
-        $this->bufferSize++;
-
-        return false === $this->bubble;
-    }
-
-    public function flush(): void
-    {
-        if ($this->bufferSize === 0) {
-            return;
-        }
-
-        $this->handler->handleBatch($this->buffer);
-        $this->clear();
-    }
-
-    public function __destruct()
-    {
-        // suppress the parent behavior since we already have register_shutdown_function()
-        // to call close(), and the reference contained there will prevent this from being
-        // GC'd until the end of the request
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function close(): void
-    {
-        $this->flush();
-
-        $this->handler->close();
-    }
-
-    /**
-     * Clears the buffer without flushing any messages down to the wrapped handler.
-     */
-    public function clear(): void
-    {
-        $this->bufferSize = 0;
-        $this->buffer = [];
-    }
-
-    public function reset()
-    {
-        $this->flush();
-
-        parent::reset();
-
-        $this->resetProcessors();
-
-        if ($this->handler instanceof ResettableInterface) {
-            $this->handler->reset();
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function setFormatter(FormatterInterface $formatter): HandlerInterface
-    {
-        if ($this->handler instanceof FormattableHandlerInterface) {
-            $this->handler->setFormatter($formatter);
-
-            return $this;
-        }
-
-        throw new \UnexpectedValueException('The nested handler of type '.get_class($this->handler).' does not support formatters.');
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getFormatter(): FormatterInterface
-    {
-        if ($this->handler instanceof FormattableHandlerInterface) {
-            return $this->handler->getFormatter();
-        }
-
-        throw new \UnexpectedValueException('The nested handler of type '.get_class($this->handler).' does not support formatters.');
-    }
-}
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/Handler/ChromePHPHandler.php b/monolog/vendor/monolog/monolog/src/Monolog/Handler/ChromePHPHandler.php
deleted file mode 100644
index 234ecf61..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/Handler/ChromePHPHandler.php
+++ /dev/null
@@ -1,196 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\Formatter\ChromePHPFormatter;
-use Monolog\Formatter\FormatterInterface;
-use Monolog\Logger;
-use Monolog\Utils;
-
-/**
- * Handler sending logs to the ChromePHP extension (http://www.chromephp.com/)
- *
- * This also works out of the box with Firefox 43+
- *
- * @author Christophe Coevoet <stof@notk.org>
- *
- * @phpstan-import-type Record from \Monolog\Logger
- */
-class ChromePHPHandler extends AbstractProcessingHandler
-{
-    use WebRequestRecognizerTrait;
-
-    /**
-     * Version of the extension
-     */
-    protected const VERSION = '4.0';
-
-    /**
-     * Header name
-     */
-    protected const HEADER_NAME = 'X-ChromeLogger-Data';
-
-    /**
-     * Regular expression to detect supported browsers (matches any Chrome, or Firefox 43+)
-     */
-    protected const USER_AGENT_REGEX = '{\b(?:Chrome/\d+(?:\.\d+)*|HeadlessChrome|Firefox/(?:4[3-9]|[5-9]\d|\d{3,})(?:\.\d)*)\b}';
-
-    /** @var bool */
-    protected static $initialized = false;
-
-    /**
-     * Tracks whether we sent too much data
-     *
-     * Chrome limits the headers to 4KB, so when we sent 3KB we stop sending
-     *
-     * @var bool
-     */
-    protected static $overflowed = false;
-
-    /** @var mixed[] */
-    protected static $json = [
-        'version' => self::VERSION,
-        'columns' => ['label', 'log', 'backtrace', 'type'],
-        'rows' => [],
-    ];
-
-    /** @var bool */
-    protected static $sendHeaders = true;
-
-    public function __construct($level = Logger::DEBUG, bool $bubble = true)
-    {
-        parent::__construct($level, $bubble);
-        if (!function_exists('json_encode')) {
-            throw new \RuntimeException('PHP\'s json extension is required to use Monolog\'s ChromePHPHandler');
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function handleBatch(array $records): void
-    {
-        if (!$this->isWebRequest()) {
-            return;
-        }
-
-        $messages = [];
-
-        foreach ($records as $record) {
-            if ($record['level'] < $this->level) {
-                continue;
-            }
-            /** @var Record $message */
-            $message = $this->processRecord($record);
-            $messages[] = $message;
-        }
-
-        if (!empty($messages)) {
-            $messages = $this->getFormatter()->formatBatch($messages);
-            self::$json['rows'] = array_merge(self::$json['rows'], $messages);
-            $this->send();
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function getDefaultFormatter(): FormatterInterface
-    {
-        return new ChromePHPFormatter();
-    }
-
-    /**
-     * Creates & sends header for a record
-     *
-     * @see sendHeader()
-     * @see send()
-     */
-    protected function write(array $record): void
-    {
-        if (!$this->isWebRequest()) {
-            return;
-        }
-
-        self::$json['rows'][] = $record['formatted'];
-
-        $this->send();
-    }
-
-    /**
-     * Sends the log header
-     *
-     * @see sendHeader()
-     */
-    protected function send(): void
-    {
-        if (self::$overflowed || !self::$sendHeaders) {
-            return;
-        }
-
-        if (!self::$initialized) {
-            self::$initialized = true;
-
-            self::$sendHeaders = $this->headersAccepted();
-            if (!self::$sendHeaders) {
-                return;
-            }
-
-            self::$json['request_uri'] = $_SERVER['REQUEST_URI'] ?? '';
-        }
-
-        $json = Utils::jsonEncode(self::$json, Utils::DEFAULT_JSON_FLAGS & ~JSON_UNESCAPED_UNICODE, true);
-        $data = base64_encode($json);
-        if (strlen($data) > 3 * 1024) {
-            self::$overflowed = true;
-
-            $record = [
-                'message' => 'Incomplete logs, chrome header size limit reached',
-                'context' => [],
-                'level' => Logger::WARNING,
-                'level_name' => Logger::getLevelName(Logger::WARNING),
-                'channel' => 'monolog',
-                'datetime' => new \DateTimeImmutable(),
-                'extra' => [],
-            ];
-            self::$json['rows'][count(self::$json['rows']) - 1] = $this->getFormatter()->format($record);
-            $json = Utils::jsonEncode(self::$json, Utils::DEFAULT_JSON_FLAGS & ~JSON_UNESCAPED_UNICODE, true);
-            $data = base64_encode($json);
-        }
-
-        if (trim($data) !== '') {
-            $this->sendHeader(static::HEADER_NAME, $data);
-        }
-    }
-
-    /**
-     * Send header string to the client
-     */
-    protected function sendHeader(string $header, string $content): void
-    {
-        if (!headers_sent() && self::$sendHeaders) {
-            header(sprintf('%s: %s', $header, $content));
-        }
-    }
-
-    /**
-     * Verifies if the headers are accepted by the current user agent
-     */
-    protected function headersAccepted(): bool
-    {
-        if (empty($_SERVER['HTTP_USER_AGENT'])) {
-            return false;
-        }
-
-        return preg_match(static::USER_AGENT_REGEX, $_SERVER['HTTP_USER_AGENT']) === 1;
-    }
-}
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/Handler/CouchDBHandler.php b/monolog/vendor/monolog/monolog/src/Monolog/Handler/CouchDBHandler.php
deleted file mode 100644
index 52657613..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/Handler/CouchDBHandler.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\Formatter\FormatterInterface;
-use Monolog\Formatter\JsonFormatter;
-use Monolog\Logger;
-
-/**
- * CouchDB handler
- *
- * @author Markus Bachmann <markus.bachmann@bachi.biz>
- */
-class CouchDBHandler extends AbstractProcessingHandler
-{
-    /** @var mixed[] */
-    private $options;
-
-    /**
-     * @param mixed[] $options
-     */
-    public function __construct(array $options = [], $level = Logger::DEBUG, bool $bubble = true)
-    {
-        $this->options = array_merge([
-            'host'     => 'localhost',
-            'port'     => 5984,
-            'dbname'   => 'logger',
-            'username' => null,
-            'password' => null,
-        ], $options);
-
-        parent::__construct($level, $bubble);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function write(array $record): void
-    {
-        $basicAuth = null;
-        if ($this->options['username']) {
-            $basicAuth = sprintf('%s:%s@', $this->options['username'], $this->options['password']);
-        }
-
-        $url = 'http://'.$basicAuth.$this->options['host'].':'.$this->options['port'].'/'.$this->options['dbname'];
-        $context = stream_context_create([
-            'http' => [
-                'method'        => 'POST',
-                'content'       => $record['formatted'],
-                'ignore_errors' => true,
-                'max_redirects' => 0,
-                'header'        => 'Content-type: application/json',
-            ],
-        ]);
-
-        if (false === @file_get_contents($url, false, $context)) {
-            throw new \RuntimeException(sprintf('Could not connect to %s', $url));
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function getDefaultFormatter(): FormatterInterface
-    {
-        return new JsonFormatter(JsonFormatter::BATCH_MODE_JSON, false);
-    }
-}
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/Handler/CubeHandler.php b/monolog/vendor/monolog/monolog/src/Monolog/Handler/CubeHandler.php
deleted file mode 100644
index 3535a4fc..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/Handler/CubeHandler.php
+++ /dev/null
@@ -1,167 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\Logger;
-use Monolog\Utils;
-
-/**
- * Logs to Cube.
- *
- * @link https://github.com/square/cube/wiki
- * @author Wan Chen <kami@kamisama.me>
- * @deprecated Since 2.8.0 and 3.2.0, Cube appears abandoned and thus we will drop this handler in Monolog 4
- */
-class CubeHandler extends AbstractProcessingHandler
-{
-    /** @var resource|\Socket|null */
-    private $udpConnection = null;
-    /** @var resource|\CurlHandle|null */
-    private $httpConnection = null;
-    /** @var string */
-    private $scheme;
-    /** @var string */
-    private $host;
-    /** @var int */
-    private $port;
-    /** @var string[] */
-    private $acceptedSchemes = ['http', 'udp'];
-
-    /**
-     * Create a Cube handler
-     *
-     * @throws \UnexpectedValueException when given url is not a valid url.
-     *                                   A valid url must consist of three parts : protocol://host:port
-     *                                   Only valid protocols used by Cube are http and udp
-     */
-    public function __construct(string $url, $level = Logger::DEBUG, bool $bubble = true)
-    {
-        $urlInfo = parse_url($url);
-
-        if ($urlInfo === false || !isset($urlInfo['scheme'], $urlInfo['host'], $urlInfo['port'])) {
-            throw new \UnexpectedValueException('URL "'.$url.'" is not valid');
-        }
-
-        if (!in_array($urlInfo['scheme'], $this->acceptedSchemes)) {
-            throw new \UnexpectedValueException(
-                'Invalid protocol (' . $urlInfo['scheme']  . ').'
-                . ' Valid options are ' . implode(', ', $this->acceptedSchemes)
-            );
-        }
-
-        $this->scheme = $urlInfo['scheme'];
-        $this->host = $urlInfo['host'];
-        $this->port = (int) $urlInfo['port'];
-
-        parent::__construct($level, $bubble);
-    }
-
-    /**
-     * Establish a connection to an UDP socket
-     *
-     * @throws \LogicException           when unable to connect to the socket
-     * @throws MissingExtensionException when there is no socket extension
-     */
-    protected function connectUdp(): void
-    {
-        if (!extension_loaded('sockets')) {
-            throw new MissingExtensionException('The sockets extension is required to use udp URLs with the CubeHandler');
-        }
-
-        $udpConnection = socket_create(AF_INET, SOCK_DGRAM, 0);
-        if (false === $udpConnection) {
-            throw new \LogicException('Unable to create a socket');
-        }
-
-        $this->udpConnection = $udpConnection;
-        if (!socket_connect($this->udpConnection, $this->host, $this->port)) {
-            throw new \LogicException('Unable to connect to the socket at ' . $this->host . ':' . $this->port);
-        }
-    }
-
-    /**
-     * Establish a connection to an http server
-     *
-     * @throws \LogicException           when unable to connect to the socket
-     * @throws MissingExtensionException when no curl extension
-     */
-    protected function connectHttp(): void
-    {
-        if (!extension_loaded('curl')) {
-            throw new MissingExtensionException('The curl extension is required to use http URLs with the CubeHandler');
-        }
-
-        $httpConnection = curl_init('http://'.$this->host.':'.$this->port.'/1.0/event/put');
-        if (false === $httpConnection) {
-            throw new \LogicException('Unable to connect to ' . $this->host . ':' . $this->port);
-        }
-
-        $this->httpConnection = $httpConnection;
-        curl_setopt($this->httpConnection, CURLOPT_CUSTOMREQUEST, "POST");
-        curl_setopt($this->httpConnection, CURLOPT_RETURNTRANSFER, true);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function write(array $record): void
-    {
-        $date = $record['datetime'];
-
-        $data = ['time' => $date->format('Y-m-d\TH:i:s.uO')];
-        unset($record['datetime']);
-
-        if (isset($record['context']['type'])) {
-            $data['type'] = $record['context']['type'];
-            unset($record['context']['type']);
-        } else {
-            $data['type'] = $record['channel'];
-        }
-
-        $data['data'] = $record['context'];
-        $data['data']['level'] = $record['level'];
-
-        if ($this->scheme === 'http') {
-            $this->writeHttp(Utils::jsonEncode($data));
-        } else {
-            $this->writeUdp(Utils::jsonEncode($data));
-        }
-    }
-
-    private function writeUdp(string $data): void
-    {
-        if (!$this->udpConnection) {
-            $this->connectUdp();
-        }
-
-        socket_send($this->udpConnection, $data, strlen($data), 0);
-    }
-
-    private function writeHttp(string $data): void
-    {
-        if (!$this->httpConnection) {
-            $this->connectHttp();
-        }
-
-        if (null === $this->httpConnection) {
-            throw new \LogicException('No connection could be established');
-        }
-
-        curl_setopt($this->httpConnection, CURLOPT_POSTFIELDS, '['.$data.']');
-        curl_setopt($this->httpConnection, CURLOPT_HTTPHEADER, [
-            'Content-Type: application/json',
-            'Content-Length: ' . strlen('['.$data.']'),
-        ]);
-
-        Curl\Util::execute($this->httpConnection, 5, false);
-    }
-}
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/Handler/Curl/Util.php b/monolog/vendor/monolog/monolog/src/Monolog/Handler/Curl/Util.php
deleted file mode 100644
index 7213e8ee..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/Handler/Curl/Util.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler\Curl;
-
-use CurlHandle;
-
-/**
- * This class is marked as internal and it is not under the BC promise of the package.
- *
- * @internal
- */
-final class Util
-{
-    /** @var array<int> */
-    private static $retriableErrorCodes = [
-        CURLE_COULDNT_RESOLVE_HOST,
-        CURLE_COULDNT_CONNECT,
-        CURLE_HTTP_NOT_FOUND,
-        CURLE_READ_ERROR,
-        CURLE_OPERATION_TIMEOUTED,
-        CURLE_HTTP_POST_ERROR,
-        CURLE_SSL_CONNECT_ERROR,
-    ];
-
-    /**
-     * Executes a CURL request with optional retries and exception on failure
-     *
-     * @param  resource|CurlHandle $ch             curl handler
-     * @param  int                 $retries
-     * @param  bool                $closeAfterDone
-     * @return bool|string         @see curl_exec
-     */
-    public static function execute($ch, int $retries = 5, bool $closeAfterDone = true)
-    {
-        while ($retries--) {
-            $curlResponse = curl_exec($ch);
-            if ($curlResponse === false) {
-                $curlErrno = curl_errno($ch);
-
-                if (false === in_array($curlErrno, self::$retriableErrorCodes, true) || !$retries) {
-                    $curlError = curl_error($ch);
-
-                    if ($closeAfterDone) {
-                        curl_close($ch);
-                    }
-
-                    throw new \RuntimeException(sprintf('Curl error (code %d): %s', $curlErrno, $curlError));
-                }
-
-                continue;
-            }
-
-            if ($closeAfterDone) {
-                curl_close($ch);
-            }
-
-            return $curlResponse;
-        }
-
-        return false;
-    }
-}
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/Handler/DeduplicationHandler.php b/monolog/vendor/monolog/monolog/src/Monolog/Handler/DeduplicationHandler.php
deleted file mode 100644
index 9b85ae7e..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/Handler/DeduplicationHandler.php
+++ /dev/null
@@ -1,186 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\Logger;
-use Psr\Log\LogLevel;
-
-/**
- * Simple handler wrapper that deduplicates log records across multiple requests
- *
- * It also includes the BufferHandler functionality and will buffer
- * all messages until the end of the request or flush() is called.
- *
- * This works by storing all log records' messages above $deduplicationLevel
- * to the file specified by $deduplicationStore. When further logs come in at the end of the
- * request (or when flush() is called), all those above $deduplicationLevel are checked
- * against the existing stored logs. If they match and the timestamps in the stored log is
- * not older than $time seconds, the new log record is discarded. If no log record is new, the
- * whole data set is discarded.
- *
- * This is mainly useful in combination with Mail handlers or things like Slack or HipChat handlers
- * that send messages to people, to avoid spamming with the same message over and over in case of
- * a major component failure like a database server being down which makes all requests fail in the
- * same way.
- *
- * @author Jordi Boggiano <j.boggiano@seld.be>
- *
- * @phpstan-import-type Record from \Monolog\Logger
- * @phpstan-import-type LevelName from \Monolog\Logger
- * @phpstan-import-type Level from \Monolog\Logger
- */
-class DeduplicationHandler extends BufferHandler
-{
-    /**
-     * @var string
-     */
-    protected $deduplicationStore;
-
-    /**
-     * @var Level
-     */
-    protected $deduplicationLevel;
-
-    /**
-     * @var int
-     */
-    protected $time;
-
-    /**
-     * @var bool
-     */
-    private $gc = false;
-
-    /**
-     * @param HandlerInterface $handler            Handler.
-     * @param string           $deduplicationStore The file/path where the deduplication log should be kept
-     * @param string|int       $deduplicationLevel The minimum logging level for log records to be looked at for deduplication purposes
-     * @param int              $time               The period (in seconds) during which duplicate entries should be suppressed after a given log is sent through
-     * @param bool             $bubble             Whether the messages that are handled can bubble up the stack or not
-     *
-     * @phpstan-param Level|LevelName|LogLevel::* $deduplicationLevel
-     */
-    public function __construct(HandlerInterface $handler, ?string $deduplicationStore = null, $deduplicationLevel = Logger::ERROR, int $time = 60, bool $bubble = true)
-    {
-        parent::__construct($handler, 0, Logger::DEBUG, $bubble, false);
-
-        $this->deduplicationStore = $deduplicationStore === null ? sys_get_temp_dir() . '/monolog-dedup-' . substr(md5(__FILE__), 0, 20) .'.log' : $deduplicationStore;
-        $this->deduplicationLevel = Logger::toMonologLevel($deduplicationLevel);
-        $this->time = $time;
-    }
-
-    public function flush(): void
-    {
-        if ($this->bufferSize === 0) {
-            return;
-        }
-
-        $passthru = null;
-
-        foreach ($this->buffer as $record) {
-            if ($record['level'] >= $this->deduplicationLevel) {
-                $passthru = $passthru || !$this->isDuplicate($record);
-                if ($passthru) {
-                    $this->appendRecord($record);
-                }
-            }
-        }
-
-        // default of null is valid as well as if no record matches duplicationLevel we just pass through
-        if ($passthru === true || $passthru === null) {
-            $this->handler->handleBatch($this->buffer);
-        }
-
-        $this->clear();
-
-        if ($this->gc) {
-            $this->collectLogs();
-        }
-    }
-
-    /**
-     * @phpstan-param Record $record
-     */
-    private function isDuplicate(array $record): bool
-    {
-        if (!file_exists($this->deduplicationStore)) {
-            return false;
-        }
-
-        $store = file($this->deduplicationStore, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
-        if (!is_array($store)) {
-            return false;
-        }
-
-        $yesterday = time() - 86400;
-        $timestampValidity = $record['datetime']->getTimestamp() - $this->time;
-        $expectedMessage = preg_replace('{[\r\n].*}', '', $record['message']);
-
-        for ($i = count($store) - 1; $i >= 0; $i--) {
-            list($timestamp, $level, $message) = explode(':', $store[$i], 3);
-
-            if ($level === $record['level_name'] && $message === $expectedMessage && $timestamp > $timestampValidity) {
-                return true;
-            }
-
-            if ($timestamp < $yesterday) {
-                $this->gc = true;
-            }
-        }
-
-        return false;
-    }
-
-    private function collectLogs(): void
-    {
-        if (!file_exists($this->deduplicationStore)) {
-            return;
-        }
-
-        $handle = fopen($this->deduplicationStore, 'rw+');
-
-        if (!$handle) {
-            throw new \RuntimeException('Failed to open file for reading and writing: ' . $this->deduplicationStore);
-        }
-
-        flock($handle, LOCK_EX);
-        $validLogs = [];
-
-        $timestampValidity = time() - $this->time;
-
-        while (!feof($handle)) {
-            $log = fgets($handle);
-            if ($log && substr($log, 0, 10) >= $timestampValidity) {
-                $validLogs[] = $log;
-            }
-        }
-
-        ftruncate($handle, 0);
-        rewind($handle);
-        foreach ($validLogs as $log) {
-            fwrite($handle, $log);
-        }
-
-        flock($handle, LOCK_UN);
-        fclose($handle);
-
-        $this->gc = false;
-    }
-
-    /**
-     * @phpstan-param Record $record
-     */
-    private function appendRecord(array $record): void
-    {
-        file_put_contents($this->deduplicationStore, $record['datetime']->getTimestamp() . ':' . $record['level_name'] . ':' . preg_replace('{[\r\n].*}', '', $record['message']) . "\n", FILE_APPEND);
-    }
-}
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/Handler/DoctrineCouchDBHandler.php b/monolog/vendor/monolog/monolog/src/Monolog/Handler/DoctrineCouchDBHandler.php
deleted file mode 100644
index ebd52c3a..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/Handler/DoctrineCouchDBHandler.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\Logger;
-use Monolog\Formatter\NormalizerFormatter;
-use Monolog\Formatter\FormatterInterface;
-use Doctrine\CouchDB\CouchDBClient;
-
-/**
- * CouchDB handler for Doctrine CouchDB ODM
- *
- * @author Markus Bachmann <markus.bachmann@bachi.biz>
- */
-class DoctrineCouchDBHandler extends AbstractProcessingHandler
-{
-    /** @var CouchDBClient */
-    private $client;
-
-    public function __construct(CouchDBClient $client, $level = Logger::DEBUG, bool $bubble = true)
-    {
-        $this->client = $client;
-        parent::__construct($level, $bubble);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function write(array $record): void
-    {
-        $this->client->postDocument($record['formatted']);
-    }
-
-    protected function getDefaultFormatter(): FormatterInterface
-    {
-        return new NormalizerFormatter;
-    }
-}
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/Handler/DynamoDbHandler.php b/monolog/vendor/monolog/monolog/src/Monolog/Handler/DynamoDbHandler.php
deleted file mode 100644
index 21840bf6..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/Handler/DynamoDbHandler.php
+++ /dev/null
@@ -1,104 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Aws\Sdk;
-use Aws\DynamoDb\DynamoDbClient;
-use Monolog\Formatter\FormatterInterface;
-use Aws\DynamoDb\Marshaler;
-use Monolog\Formatter\ScalarFormatter;
-use Monolog\Logger;
-
-/**
- * Amazon DynamoDB handler (http://aws.amazon.com/dynamodb/)
- *
- * @link https://github.com/aws/aws-sdk-php/
- * @author Andrew Lawson <adlawson@gmail.com>
- */
-class DynamoDbHandler extends AbstractProcessingHandler
-{
-    public const DATE_FORMAT = 'Y-m-d\TH:i:s.uO';
-
-    /**
-     * @var DynamoDbClient
-     */
-    protected $client;
-
-    /**
-     * @var string
-     */
-    protected $table;
-
-    /**
-     * @var int
-     */
-    protected $version;
-
-    /**
-     * @var Marshaler
-     */
-    protected $marshaler;
-
-    public function __construct(DynamoDbClient $client, string $table, $level = Logger::DEBUG, bool $bubble = true)
-    {
-        /** @phpstan-ignore-next-line */
-        if (defined('Aws\Sdk::VERSION') && version_compare(Sdk::VERSION, '3.0', '>=')) {
-            $this->version = 3;
-            $this->marshaler = new Marshaler;
-        } else {
-            $this->version = 2;
-        }
-
-        $this->client = $client;
-        $this->table = $table;
-
-        parent::__construct($level, $bubble);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function write(array $record): void
-    {
-        $filtered = $this->filterEmptyFields($record['formatted']);
-        if ($this->version === 3) {
-            $formatted = $this->marshaler->marshalItem($filtered);
-        } else {
-            /** @phpstan-ignore-next-line */
-            $formatted = $this->client->formatAttributes($filtered);
-        }
-
-        $this->client->putItem([
-            'TableName' => $this->table,
-            'Item' => $formatted,
-        ]);
-    }
-
-    /**
-     * @param  mixed[] $record
-     * @return mixed[]
-     */
-    protected function filterEmptyFields(array $record): array
-    {
-        return array_filter($record, function ($value) {
-            return !empty($value) || false === $value || 0 === $value;
-        });
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function getDefaultFormatter(): FormatterInterface
-    {
-        return new ScalarFormatter(self::DATE_FORMAT);
-    }
-}
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/Handler/ElasticaHandler.php b/monolog/vendor/monolog/monolog/src/Monolog/Handler/ElasticaHandler.php
deleted file mode 100644
index fc92ca42..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/Handler/ElasticaHandler.php
+++ /dev/null
@@ -1,129 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Elastica\Document;
-use Monolog\Formatter\FormatterInterface;
-use Monolog\Formatter\ElasticaFormatter;
-use Monolog\Logger;
-use Elastica\Client;
-use Elastica\Exception\ExceptionInterface;
-
-/**
- * Elastic Search handler
- *
- * Usage example:
- *
- *    $client = new \Elastica\Client();
- *    $options = array(
- *        'index' => 'elastic_index_name',
- *        'type' => 'elastic_doc_type', Types have been removed in Elastica 7
- *    );
- *    $handler = new ElasticaHandler($client, $options);
- *    $log = new Logger('application');
- *    $log->pushHandler($handler);
- *
- * @author Jelle Vink <jelle.vink@gmail.com>
- */
-class ElasticaHandler extends AbstractProcessingHandler
-{
-    /**
-     * @var Client
-     */
-    protected $client;
-
-    /**
-     * @var mixed[] Handler config options
-     */
-    protected $options = [];
-
-    /**
-     * @param Client  $client  Elastica Client object
-     * @param mixed[] $options Handler configuration
-     */
-    public function __construct(Client $client, array $options = [], $level = Logger::DEBUG, bool $bubble = true)
-    {
-        parent::__construct($level, $bubble);
-        $this->client = $client;
-        $this->options = array_merge(
-            [
-                'index'          => 'monolog',      // Elastic index name
-                'type'           => 'record',       // Elastic document type
-                'ignore_error'   => false,          // Suppress Elastica exceptions
-            ],
-            $options
-        );
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function write(array $record): void
-    {
-        $this->bulkSend([$record['formatted']]);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function setFormatter(FormatterInterface $formatter): HandlerInterface
-    {
-        if ($formatter instanceof ElasticaFormatter) {
-            return parent::setFormatter($formatter);
-        }
-
-        throw new \InvalidArgumentException('ElasticaHandler is only compatible with ElasticaFormatter');
-    }
-
-    /**
-     * @return mixed[]
-     */
-    public function getOptions(): array
-    {
-        return $this->options;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function getDefaultFormatter(): FormatterInterface
-    {
-        return new ElasticaFormatter($this->options['index'], $this->options['type']);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function handleBatch(array $records): void
-    {
-        $documents = $this->getFormatter()->formatBatch($records);
-        $this->bulkSend($documents);
-    }
-
-    /**
-     * Use Elasticsearch bulk API to send list of documents
-     *
-     * @param Document[] $documents
-     *
-     * @throws \RuntimeException
-     */
-    protected function bulkSend(array $documents): void
-    {
-        try {
-            $this->client->addDocuments($documents);
-        } catch (ExceptionInterface $e) {
-            if (!$this->options['ignore_error']) {
-                throw new \RuntimeException("Error sending messages to Elasticsearch", 0, $e);
-            }
-        }
-    }
-}
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/Handler/ElasticsearchHandler.php b/monolog/vendor/monolog/monolog/src/Monolog/Handler/ElasticsearchHandler.php
deleted file mode 100644
index e88375c0..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/Handler/ElasticsearchHandler.php
+++ /dev/null
@@ -1,218 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Elastic\Elasticsearch\Response\Elasticsearch;
-use Throwable;
-use RuntimeException;
-use Monolog\Logger;
-use Monolog\Formatter\FormatterInterface;
-use Monolog\Formatter\ElasticsearchFormatter;
-use InvalidArgumentException;
-use Elasticsearch\Common\Exceptions\RuntimeException as ElasticsearchRuntimeException;
-use Elasticsearch\Client;
-use Elastic\Elasticsearch\Exception\InvalidArgumentException as ElasticInvalidArgumentException;
-use Elastic\Elasticsearch\Client as Client8;
-
-/**
- * Elasticsearch handler
- *
- * @link https://www.elastic.co/guide/en/elasticsearch/client/php-api/current/index.html
- *
- * Simple usage example:
- *
- *    $client = \Elasticsearch\ClientBuilder::create()
- *        ->setHosts($hosts)
- *        ->build();
- *
- *    $options = array(
- *        'index' => 'elastic_index_name',
- *        'type'  => 'elastic_doc_type',
- *    );
- *    $handler = new ElasticsearchHandler($client, $options);
- *    $log = new Logger('application');
- *    $log->pushHandler($handler);
- *
- * @author Avtandil Kikabidze <akalongman@gmail.com>
- */
-class ElasticsearchHandler extends AbstractProcessingHandler
-{
-    /**
-     * @var Client|Client8
-     */
-    protected $client;
-
-    /**
-     * @var mixed[] Handler config options
-     */
-    protected $options = [];
-
-    /**
-     * @var bool
-     */
-    private $needsType;
-
-    /**
-     * @param Client|Client8 $client  Elasticsearch Client object
-     * @param mixed[]        $options Handler configuration
-     */
-    public function __construct($client, array $options = [], $level = Logger::DEBUG, bool $bubble = true)
-    {
-        if (!$client instanceof Client && !$client instanceof Client8) {
-            throw new \TypeError('Elasticsearch\Client or Elastic\Elasticsearch\Client instance required');
-        }
-
-        parent::__construct($level, $bubble);
-        $this->client = $client;
-        $this->options = array_merge(
-            [
-                'index'        => 'monolog', // Elastic index name
-                'type'         => '_doc',    // Elastic document type
-                'ignore_error' => false,     // Suppress Elasticsearch exceptions
-            ],
-            $options
-        );
-
-        if ($client instanceof Client8 || $client::VERSION[0] === '7') {
-            $this->needsType = false;
-            // force the type to _doc for ES8/ES7
-            $this->options['type'] = '_doc';
-        } else {
-            $this->needsType = true;
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function write(array $record): void
-    {
-        $this->bulkSend([$record['formatted']]);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function setFormatter(FormatterInterface $formatter): HandlerInterface
-    {
-        if ($formatter instanceof ElasticsearchFormatter) {
-            return parent::setFormatter($formatter);
-        }
-
-        throw new InvalidArgumentException('ElasticsearchHandler is only compatible with ElasticsearchFormatter');
-    }
-
-    /**
-     * Getter options
-     *
-     * @return mixed[]
-     */
-    public function getOptions(): array
-    {
-        return $this->options;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function getDefaultFormatter(): FormatterInterface
-    {
-        return new ElasticsearchFormatter($this->options['index'], $this->options['type']);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function handleBatch(array $records): void
-    {
-        $documents = $this->getFormatter()->formatBatch($records);
-        $this->bulkSend($documents);
-    }
-
-    /**
-     * Use Elasticsearch bulk API to send list of documents
-     *
-     * @param  array[]           $records Records + _index/_type keys
-     * @throws \RuntimeException
-     */
-    protected function bulkSend(array $records): void
-    {
-        try {
-            $params = [
-                'body' => [],
-            ];
-
-            foreach ($records as $record) {
-                $params['body'][] = [
-                    'index' => $this->needsType ? [
-                        '_index' => $record['_index'],
-                        '_type'  => $record['_type'],
-                    ] : [
-                        '_index' => $record['_index'],
-                    ],
-                ];
-                unset($record['_index'], $record['_type']);
-
-                $params['body'][] = $record;
-            }
-
-            /** @var Elasticsearch */
-            $responses = $this->client->bulk($params);
-
-            if ($responses['errors'] === true) {
-                throw $this->createExceptionFromResponses($responses);
-            }
-        } catch (Throwable $e) {
-            if (! $this->options['ignore_error']) {
-                throw new RuntimeException('Error sending messages to Elasticsearch', 0, $e);
-            }
-        }
-    }
-
-    /**
-     * Creates elasticsearch exception from responses array
-     *
-     * Only the first error is converted into an exception.
-     *
-     * @param mixed[]|Elasticsearch $responses returned by $this->client->bulk()
-     */
-    protected function createExceptionFromResponses($responses): Throwable
-    {
-        foreach ($responses['items'] ?? [] as $item) {
-            if (isset($item['index']['error'])) {
-                return $this->createExceptionFromError($item['index']['error']);
-            }
-        }
-
-        if (class_exists(ElasticInvalidArgumentException::class)) {
-            return new ElasticInvalidArgumentException('Elasticsearch failed to index one or more records.');
-        }
-
-        return new ElasticsearchRuntimeException('Elasticsearch failed to index one or more records.');
-    }
-
-    /**
-     * Creates elasticsearch exception from error array
-     *
-     * @param mixed[] $error
-     */
-    protected function createExceptionFromError(array $error): Throwable
-    {
-        $previous = isset($error['caused_by']) ? $this->createExceptionFromError($error['caused_by']) : null;
-
-        if (class_exists(ElasticInvalidArgumentException::class)) {
-            return new ElasticInvalidArgumentException($error['type'] . ': ' . $error['reason'], 0, $previous);
-        }
-
-        return new ElasticsearchRuntimeException($error['type'] . ': ' . $error['reason'], 0, $previous);
-    }
-}
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/Handler/ErrorLogHandler.php b/monolog/vendor/monolog/monolog/src/Monolog/Handler/ErrorLogHandler.php
deleted file mode 100644
index f2e22036..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/Handler/ErrorLogHandler.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\Formatter\LineFormatter;
-use Monolog\Formatter\FormatterInterface;
-use Monolog\Logger;
-use Monolog\Utils;
-
-/**
- * Stores to PHP error_log() handler.
- *
- * @author Elan Ruusamäe <glen@delfi.ee>
- */
-class ErrorLogHandler extends AbstractProcessingHandler
-{
-    public const OPERATING_SYSTEM = 0;
-    public const SAPI = 4;
-
-    /** @var int */
-    protected $messageType;
-    /** @var bool */
-    protected $expandNewlines;
-
-    /**
-     * @param int  $messageType    Says where the error should go.
-     * @param bool $expandNewlines If set to true, newlines in the message will be expanded to be take multiple log entries
-     */
-    public function __construct(int $messageType = self::OPERATING_SYSTEM, $level = Logger::DEBUG, bool $bubble = true, bool $expandNewlines = false)
-    {
-        parent::__construct($level, $bubble);
-
-        if (false === in_array($messageType, self::getAvailableTypes(), true)) {
-            $message = sprintf('The given message type "%s" is not supported', print_r($messageType, true));
-
-            throw new \InvalidArgumentException($message);
-        }
-
-        $this->messageType = $messageType;
-        $this->expandNewlines = $expandNewlines;
-    }
-
-    /**
-     * @return int[] With all available types
-     */
-    public static function getAvailableTypes(): array
-    {
-        return [
-            self::OPERATING_SYSTEM,
-            self::SAPI,
-        ];
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function getDefaultFormatter(): FormatterInterface
-    {
-        return new LineFormatter('[%datetime%] %channel%.%level_name%: %message% %context% %extra%');
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function write(array $record): void
-    {
-        if (!$this->expandNewlines) {
-            error_log((string) $record['formatted'], $this->messageType);
-
-            return;
-        }
-
-        $lines = preg_split('{[\r\n]+}', (string) $record['formatted']);
-        if ($lines === false) {
-            $pcreErrorCode = preg_last_error();
-            throw new \RuntimeException('Failed to preg_split formatted string: ' . $pcreErrorCode . ' / '. Utils::pcreLastErrorMessage($pcreErrorCode));
-        }
-        foreach ($lines as $line) {
-            error_log($line, $this->messageType);
-        }
-    }
-}
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/Handler/FallbackGroupHandler.php b/monolog/vendor/monolog/monolog/src/Monolog/Handler/FallbackGroupHandler.php
deleted file mode 100644
index d4e234ce..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/Handler/FallbackGroupHandler.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Throwable;
-
-/**
- * Forwards records to at most one handler
- *
- * If a handler fails, the exception is suppressed and the record is forwarded to the next handler.
- *
- * As soon as one handler handles a record successfully, the handling stops there.
- *
- * @phpstan-import-type Record from \Monolog\Logger
- */
-class FallbackGroupHandler extends GroupHandler
-{
-    /**
-     * {@inheritDoc}
-     */
-    public function handle(array $record): bool
-    {
-        if ($this->processors) {
-            /** @var Record $record */
-            $record = $this->processRecord($record);
-        }
-        foreach ($this->handlers as $handler) {
-            try {
-                $handler->handle($record);
-                break;
-            } catch (Throwable $e) {
-                // What throwable?
-            }
-        }
-
-        return false === $this->bubble;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function handleBatch(array $records): void
-    {
-        if ($this->processors) {
-            $processed = [];
-            foreach ($records as $record) {
-                $processed[] = $this->processRecord($record);
-            }
-            /** @var Record[] $records */
-            $records = $processed;
-        }
-
-        foreach ($this->handlers as $handler) {
-            try {
-                $handler->handleBatch($records);
-                break;
-            } catch (Throwable $e) {
-                // What throwable?
-            }
-        }
-    }
-}
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/Handler/FilterHandler.php b/monolog/vendor/monolog/monolog/src/Monolog/Handler/FilterHandler.php
deleted file mode 100644
index 718f17ef..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/Handler/FilterHandler.php
+++ /dev/null
@@ -1,212 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\Logger;
-use Monolog\ResettableInterface;
-use Monolog\Formatter\FormatterInterface;
-use Psr\Log\LogLevel;
-
-/**
- * Simple handler wrapper that filters records based on a list of levels
- *
- * It can be configured with an exact list of levels to allow, or a min/max level.
- *
- * @author Hennadiy Verkh
- * @author Jordi Boggiano <j.boggiano@seld.be>
- *
- * @phpstan-import-type Record from \Monolog\Logger
- * @phpstan-import-type Level from \Monolog\Logger
- * @phpstan-import-type LevelName from \Monolog\Logger
- */
-class FilterHandler extends Handler implements ProcessableHandlerInterface, ResettableInterface, FormattableHandlerInterface
-{
-    use ProcessableHandlerTrait;
-
-    /**
-     * Handler or factory callable($record, $this)
-     *
-     * @var callable|HandlerInterface
-     * @phpstan-var callable(?Record, HandlerInterface): HandlerInterface|HandlerInterface
-     */
-    protected $handler;
-
-    /**
-     * Minimum level for logs that are passed to handler
-     *
-     * @var int[]
-     * @phpstan-var array<Level, int>
-     */
-    protected $acceptedLevels;
-
-    /**
-     * Whether the messages that are handled can bubble up the stack or not
-     *
-     * @var bool
-     */
-    protected $bubble;
-
-    /**
-     * @psalm-param HandlerInterface|callable(?Record, HandlerInterface): HandlerInterface $handler
-     *
-     * @param callable|HandlerInterface $handler        Handler or factory callable($record|null, $filterHandler).
-     * @param int|array                 $minLevelOrList A list of levels to accept or a minimum level if maxLevel is provided
-     * @param int|string                $maxLevel       Maximum level to accept, only used if $minLevelOrList is not an array
-     * @param bool                      $bubble         Whether the messages that are handled can bubble up the stack or not
-     *
-     * @phpstan-param Level|LevelName|LogLevel::*|array<Level|LevelName|LogLevel::*> $minLevelOrList
-     * @phpstan-param Level|LevelName|LogLevel::* $maxLevel
-     */
-    public function __construct($handler, $minLevelOrList = Logger::DEBUG, $maxLevel = Logger::EMERGENCY, bool $bubble = true)
-    {
-        $this->handler  = $handler;
-        $this->bubble   = $bubble;
-        $this->setAcceptedLevels($minLevelOrList, $maxLevel);
-
-        if (!$this->handler instanceof HandlerInterface && !is_callable($this->handler)) {
-            throw new \RuntimeException("The given handler (".json_encode($this->handler).") is not a callable nor a Monolog\Handler\HandlerInterface object");
-        }
-    }
-
-    /**
-     * @phpstan-return array<int, Level>
-     */
-    public function getAcceptedLevels(): array
-    {
-        return array_flip($this->acceptedLevels);
-    }
-
-    /**
-     * @param int|string|array $minLevelOrList A list of levels to accept or a minimum level or level name if maxLevel is provided
-     * @param int|string       $maxLevel       Maximum level or level name to accept, only used if $minLevelOrList is not an array
-     *
-     * @phpstan-param Level|LevelName|LogLevel::*|array<Level|LevelName|LogLevel::*> $minLevelOrList
-     * @phpstan-param Level|LevelName|LogLevel::*                                    $maxLevel
-     */
-    public function setAcceptedLevels($minLevelOrList = Logger::DEBUG, $maxLevel = Logger::EMERGENCY): self
-    {
-        if (is_array($minLevelOrList)) {
-            $acceptedLevels = array_map('Monolog\Logger::toMonologLevel', $minLevelOrList);
-        } else {
-            $minLevelOrList = Logger::toMonologLevel($minLevelOrList);
-            $maxLevel = Logger::toMonologLevel($maxLevel);
-            $acceptedLevels = array_values(array_filter(Logger::getLevels(), function ($level) use ($minLevelOrList, $maxLevel) {
-                return $level >= $minLevelOrList && $level <= $maxLevel;
-            }));
-        }
-        $this->acceptedLevels = array_flip($acceptedLevels);
-
-        return $this;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function isHandling(array $record): bool
-    {
-        return isset($this->acceptedLevels[$record['level']]);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function handle(array $record): bool
-    {
-        if (!$this->isHandling($record)) {
-            return false;
-        }
-
-        if ($this->processors) {
-            /** @var Record $record */
-            $record = $this->processRecord($record);
-        }
-
-        $this->getHandler($record)->handle($record);
-
-        return false === $this->bubble;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function handleBatch(array $records): void
-    {
-        $filtered = [];
-        foreach ($records as $record) {
-            if ($this->isHandling($record)) {
-                $filtered[] = $record;
-            }
-        }
-
-        if (count($filtered) > 0) {
-            $this->getHandler($filtered[count($filtered) - 1])->handleBatch($filtered);
-        }
-    }
-
-    /**
-     * Return the nested handler
-     *
-     * If the handler was provided as a factory callable, this will trigger the handler's instantiation.
-     *
-     * @return HandlerInterface
-     *
-     * @phpstan-param Record $record
-     */
-    public function getHandler(array $record = null)
-    {
-        if (!$this->handler instanceof HandlerInterface) {
-            $this->handler = ($this->handler)($record, $this);
-            if (!$this->handler instanceof HandlerInterface) {
-                throw new \RuntimeException("The factory callable should return a HandlerInterface");
-            }
-        }
-
-        return $this->handler;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function setFormatter(FormatterInterface $formatter): HandlerInterface
-    {
-        $handler = $this->getHandler();
-        if ($handler instanceof FormattableHandlerInterface) {
-            $handler->setFormatter($formatter);
-
-            return $this;
-        }
-
-        throw new \UnexpectedValueException('The nested handler of type '.get_class($handler).' does not support formatters.');
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getFormatter(): FormatterInterface
-    {
-        $handler = $this->getHandler();
-        if ($handler instanceof FormattableHandlerInterface) {
-            return $handler->getFormatter();
-        }
-
-        throw new \UnexpectedValueException('The nested handler of type '.get_class($handler).' does not support formatters.');
-    }
-
-    public function reset()
-    {
-        $this->resetProcessors();
-
-        if ($this->getHandler() instanceof ResettableInterface) {
-            $this->getHandler()->reset();
-        }
-    }
-}
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/Handler/FingersCrossed/ActivationStrategyInterface.php b/monolog/vendor/monolog/monolog/src/Monolog/Handler/FingersCrossed/ActivationStrategyInterface.php
deleted file mode 100644
index 0aa5607b..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/Handler/FingersCrossed/ActivationStrategyInterface.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler\FingersCrossed;
-
-/**
- * Interface for activation strategies for the FingersCrossedHandler.
- *
- * @author Johannes M. Schmitt <schmittjoh@gmail.com>
- *
- * @phpstan-import-type Record from \Monolog\Logger
- */
-interface ActivationStrategyInterface
-{
-    /**
-     * Returns whether the given record activates the handler.
-     *
-     * @phpstan-param Record $record
-     */
-    public function isHandlerActivated(array $record): bool;
-}
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/Handler/FingersCrossed/ChannelLevelActivationStrategy.php b/monolog/vendor/monolog/monolog/src/Monolog/Handler/FingersCrossed/ChannelLevelActivationStrategy.php
deleted file mode 100644
index 7b9abb58..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/Handler/FingersCrossed/ChannelLevelActivationStrategy.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler\FingersCrossed;
-
-use Monolog\Logger;
-use Psr\Log\LogLevel;
-
-/**
- * Channel and Error level based monolog activation strategy. Allows to trigger activation
- * based on level per channel. e.g. trigger activation on level 'ERROR' by default, except
- * for records of the 'sql' channel; those should trigger activation on level 'WARN'.
- *
- * Example:
- *
- * <code>
- *   $activationStrategy = new ChannelLevelActivationStrategy(
- *       Logger::CRITICAL,
- *       array(
- *           'request' => Logger::ALERT,
- *           'sensitive' => Logger::ERROR,
- *       )
- *   );
- *   $handler = new FingersCrossedHandler(new StreamHandler('php://stderr'), $activationStrategy);
- * </code>
- *
- * @author Mike Meessen <netmikey@gmail.com>
- *
- * @phpstan-import-type Record from \Monolog\Logger
- * @phpstan-import-type Level from \Monolog\Logger
- * @phpstan-import-type LevelName from \Monolog\Logger
- */
-class ChannelLevelActivationStrategy implements ActivationStrategyInterface
-{
-    /**
-     * @var Level
-     */
-    private $defaultActionLevel;
-
-    /**
-     * @var array<string, Level>
-     */
-    private $channelToActionLevel;
-
-    /**
-     * @param int|string         $defaultActionLevel   The default action level to be used if the record's category doesn't match any
-     * @param array<string, int> $channelToActionLevel An array that maps channel names to action levels.
-     *
-     * @phpstan-param array<string, Level>        $channelToActionLevel
-     * @phpstan-param Level|LevelName|LogLevel::* $defaultActionLevel
-     */
-    public function __construct($defaultActionLevel, array $channelToActionLevel = [])
-    {
-        $this->defaultActionLevel = Logger::toMonologLevel($defaultActionLevel);
-        $this->channelToActionLevel = array_map('Monolog\Logger::toMonologLevel', $channelToActionLevel);
-    }
-
-    /**
-     * @phpstan-param Record $record
-     */
-    public function isHandlerActivated(array $record): bool
-    {
-        if (isset($this->channelToActionLevel[$record['channel']])) {
-            return $record['level'] >= $this->channelToActionLevel[$record['channel']];
-        }
-
-        return $record['level'] >= $this->defaultActionLevel;
-    }
-}
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/Handler/FingersCrossed/ErrorLevelActivationStrategy.php b/monolog/vendor/monolog/monolog/src/Monolog/Handler/FingersCrossed/ErrorLevelActivationStrategy.php
deleted file mode 100644
index 5ec88eab..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/Handler/FingersCrossed/ErrorLevelActivationStrategy.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler\FingersCrossed;
-
-use Monolog\Logger;
-use Psr\Log\LogLevel;
-
-/**
- * Error level based activation strategy.
- *
- * @author Johannes M. Schmitt <schmittjoh@gmail.com>
- *
- * @phpstan-import-type Level from \Monolog\Logger
- * @phpstan-import-type LevelName from \Monolog\Logger
- */
-class ErrorLevelActivationStrategy implements ActivationStrategyInterface
-{
-    /**
-     * @var Level
-     */
-    private $actionLevel;
-
-    /**
-     * @param int|string $actionLevel Level or name or value
-     *
-     * @phpstan-param Level|LevelName|LogLevel::* $actionLevel
-     */
-    public function __construct($actionLevel)
-    {
-        $this->actionLevel = Logger::toMonologLevel($actionLevel);
-    }
-
-    public function isHandlerActivated(array $record): bool
-    {
-        return $record['level'] >= $this->actionLevel;
-    }
-}
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/Handler/FingersCrossedHandler.php b/monolog/vendor/monolog/monolog/src/Monolog/Handler/FingersCrossedHandler.php
deleted file mode 100644
index 0627b445..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/Handler/FingersCrossedHandler.php
+++ /dev/null
@@ -1,252 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\Handler\FingersCrossed\ErrorLevelActivationStrategy;
-use Monolog\Handler\FingersCrossed\ActivationStrategyInterface;
-use Monolog\Logger;
-use Monolog\ResettableInterface;
-use Monolog\Formatter\FormatterInterface;
-use Psr\Log\LogLevel;
-
-/**
- * Buffers all records until a certain level is reached
- *
- * The advantage of this approach is that you don't get any clutter in your log files.
- * Only requests which actually trigger an error (or whatever your actionLevel is) will be
- * in the logs, but they will contain all records, not only those above the level threshold.
- *
- * You can then have a passthruLevel as well which means that at the end of the request,
- * even if it did not get activated, it will still send through log records of e.g. at least a
- * warning level.
- *
- * You can find the various activation strategies in the
- * Monolog\Handler\FingersCrossed\ namespace.
- *
- * @author Jordi Boggiano <j.boggiano@seld.be>
- *
- * @phpstan-import-type Record from \Monolog\Logger
- * @phpstan-import-type Level from \Monolog\Logger
- * @phpstan-import-type LevelName from \Monolog\Logger
- */
-class FingersCrossedHandler extends Handler implements ProcessableHandlerInterface, ResettableInterface, FormattableHandlerInterface
-{
-    use ProcessableHandlerTrait;
-
-    /**
-     * @var callable|HandlerInterface
-     * @phpstan-var callable(?Record, HandlerInterface): HandlerInterface|HandlerInterface
-     */
-    protected $handler;
-    /** @var ActivationStrategyInterface */
-    protected $activationStrategy;
-    /** @var bool */
-    protected $buffering = true;
-    /** @var int */
-    protected $bufferSize;
-    /** @var Record[] */
-    protected $buffer = [];
-    /** @var bool */
-    protected $stopBuffering;
-    /**
-     * @var ?int
-     * @phpstan-var ?Level
-     */
-    protected $passthruLevel;
-    /** @var bool */
-    protected $bubble;
-
-    /**
-     * @psalm-param HandlerInterface|callable(?Record, HandlerInterface): HandlerInterface $handler
-     *
-     * @param callable|HandlerInterface              $handler            Handler or factory callable($record|null, $fingersCrossedHandler).
-     * @param int|string|ActivationStrategyInterface $activationStrategy Strategy which determines when this handler takes action, or a level name/value at which the handler is activated
-     * @param int                                    $bufferSize         How many entries should be buffered at most, beyond that the oldest items are removed from the buffer.
-     * @param bool                                   $bubble             Whether the messages that are handled can bubble up the stack or not
-     * @param bool                                   $stopBuffering      Whether the handler should stop buffering after being triggered (default true)
-     * @param int|string                             $passthruLevel      Minimum level to always flush to handler on close, even if strategy not triggered
-     *
-     * @phpstan-param Level|LevelName|LogLevel::* $passthruLevel
-     * @phpstan-param Level|LevelName|LogLevel::*|ActivationStrategyInterface $activationStrategy
-     */
-    public function __construct($handler, $activationStrategy = null, int $bufferSize = 0, bool $bubble = true, bool $stopBuffering = true, $passthruLevel = null)
-    {
-        if (null === $activationStrategy) {
-            $activationStrategy = new ErrorLevelActivationStrategy(Logger::WARNING);
-        }
-
-        // convert simple int activationStrategy to an object
-        if (!$activationStrategy instanceof ActivationStrategyInterface) {
-            $activationStrategy = new ErrorLevelActivationStrategy($activationStrategy);
-        }
-
-        $this->handler = $handler;
-        $this->activationStrategy = $activationStrategy;
-        $this->bufferSize = $bufferSize;
-        $this->bubble = $bubble;
-        $this->stopBuffering = $stopBuffering;
-
-        if ($passthruLevel !== null) {
-            $this->passthruLevel = Logger::toMonologLevel($passthruLevel);
-        }
-
-        if (!$this->handler instanceof HandlerInterface && !is_callable($this->handler)) {
-            throw new \RuntimeException("The given handler (".json_encode($this->handler).") is not a callable nor a Monolog\Handler\HandlerInterface object");
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function isHandling(array $record): bool
-    {
-        return true;
-    }
-
-    /**
-     * Manually activate this logger regardless of the activation strategy
-     */
-    public function activate(): void
-    {
-        if ($this->stopBuffering) {
-            $this->buffering = false;
-        }
-
-        $this->getHandler(end($this->buffer) ?: null)->handleBatch($this->buffer);
-        $this->buffer = [];
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function handle(array $record): bool
-    {
-        if ($this->processors) {
-            /** @var Record $record */
-            $record = $this->processRecord($record);
-        }
-
-        if ($this->buffering) {
-            $this->buffer[] = $record;
-            if ($this->bufferSize > 0 && count($this->buffer) > $this->bufferSize) {
-                array_shift($this->buffer);
-            }
-            if ($this->activationStrategy->isHandlerActivated($record)) {
-                $this->activate();
-            }
-        } else {
-            $this->getHandler($record)->handle($record);
-        }
-
-        return false === $this->bubble;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function close(): void
-    {
-        $this->flushBuffer();
-
-        $this->getHandler()->close();
-    }
-
-    public function reset()
-    {
-        $this->flushBuffer();
-
-        $this->resetProcessors();
-
-        if ($this->getHandler() instanceof ResettableInterface) {
-            $this->getHandler()->reset();
-        }
-    }
-
-    /**
-     * Clears the buffer without flushing any messages down to the wrapped handler.
-     *
-     * It also resets the handler to its initial buffering state.
-     */
-    public function clear(): void
-    {
-        $this->buffer = [];
-        $this->reset();
-    }
-
-    /**
-     * Resets the state of the handler. Stops forwarding records to the wrapped handler.
-     */
-    private function flushBuffer(): void
-    {
-        if (null !== $this->passthruLevel) {
-            $level = $this->passthruLevel;
-            $this->buffer = array_filter($this->buffer, function ($record) use ($level) {
-                return $record['level'] >= $level;
-            });
-            if (count($this->buffer) > 0) {
-                $this->getHandler(end($this->buffer))->handleBatch($this->buffer);
-            }
-        }
-
-        $this->buffer = [];
-        $this->buffering = true;
-    }
-
-    /**
-     * Return the nested handler
-     *
-     * If the handler was provided as a factory callable, this will trigger the handler's instantiation.
-     *
-     * @return HandlerInterface
-     *
-     * @phpstan-param Record $record
-     */
-    public function getHandler(array $record = null)
-    {
-        if (!$this->handler instanceof HandlerInterface) {
-            $this->handler = ($this->handler)($record, $this);
-            if (!$this->handler instanceof HandlerInterface) {
-                throw new \RuntimeException("The factory callable should return a HandlerInterface");
-            }
-        }
-
-        return $this->handler;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function setFormatter(FormatterInterface $formatter): HandlerInterface
-    {
-        $handler = $this->getHandler();
-        if ($handler instanceof FormattableHandlerInterface) {
-            $handler->setFormatter($formatter);
-
-            return $this;
-        }
-
-        throw new \UnexpectedValueException('The nested handler of type '.get_class($handler).' does not support formatters.');
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getFormatter(): FormatterInterface
-    {
-        $handler = $this->getHandler();
-        if ($handler instanceof FormattableHandlerInterface) {
-            return $handler->getFormatter();
-        }
-
-        throw new \UnexpectedValueException('The nested handler of type '.get_class($handler).' does not support formatters.');
-    }
-}
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/Handler/FirePHPHandler.php b/monolog/vendor/monolog/monolog/src/Monolog/Handler/FirePHPHandler.php
deleted file mode 100644
index 72718de6..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/Handler/FirePHPHandler.php
+++ /dev/null
@@ -1,180 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\Formatter\WildfireFormatter;
-use Monolog\Formatter\FormatterInterface;
-
-/**
- * Simple FirePHP Handler (http://www.firephp.org/), which uses the Wildfire protocol.
- *
- * @author Eric Clemmons (@ericclemmons) <eric@uxdriven.com>
- *
- * @phpstan-import-type FormattedRecord from AbstractProcessingHandler
- */
-class FirePHPHandler extends AbstractProcessingHandler
-{
-    use WebRequestRecognizerTrait;
-
-    /**
-     * WildFire JSON header message format
-     */
-    protected const PROTOCOL_URI = 'http://meta.wildfirehq.org/Protocol/JsonStream/0.2';
-
-    /**
-     * FirePHP structure for parsing messages & their presentation
-     */
-    protected const STRUCTURE_URI = 'http://meta.firephp.org/Wildfire/Structure/FirePHP/FirebugConsole/0.1';
-
-    /**
-     * Must reference a "known" plugin, otherwise headers won't display in FirePHP
-     */
-    protected const PLUGIN_URI = 'http://meta.firephp.org/Wildfire/Plugin/FirePHP/Library-FirePHPCore/0.3';
-
-    /**
-     * Header prefix for Wildfire to recognize & parse headers
-     */
-    protected const HEADER_PREFIX = 'X-Wf';
-
-    /**
-     * Whether or not Wildfire vendor-specific headers have been generated & sent yet
-     * @var bool
-     */
-    protected static $initialized = false;
-
-    /**
-     * Shared static message index between potentially multiple handlers
-     * @var int
-     */
-    protected static $messageIndex = 1;
-
-    /** @var bool */
-    protected static $sendHeaders = true;
-
-    /**
-     * Base header creation function used by init headers & record headers
-     *
-     * @param array<int|string> $meta    Wildfire Plugin, Protocol & Structure Indexes
-     * @param string            $message Log message
-     *
-     * @return array<string, string> Complete header string ready for the client as key and message as value
-     *
-     * @phpstan-return non-empty-array<string, string>
-     */
-    protected function createHeader(array $meta, string $message): array
-    {
-        $header = sprintf('%s-%s', static::HEADER_PREFIX, join('-', $meta));
-
-        return [$header => $message];
-    }
-
-    /**
-     * Creates message header from record
-     *
-     * @return array<string, string>
-     *
-     * @phpstan-return non-empty-array<string, string>
-     *
-     * @see createHeader()
-     *
-     * @phpstan-param FormattedRecord $record
-     */
-    protected function createRecordHeader(array $record): array
-    {
-        // Wildfire is extensible to support multiple protocols & plugins in a single request,
-        // but we're not taking advantage of that (yet), so we're using "1" for simplicity's sake.
-        return $this->createHeader(
-            [1, 1, 1, self::$messageIndex++],
-            $record['formatted']
-        );
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function getDefaultFormatter(): FormatterInterface
-    {
-        return new WildfireFormatter();
-    }
-
-    /**
-     * Wildfire initialization headers to enable message parsing
-     *
-     * @see createHeader()
-     * @see sendHeader()
-     *
-     * @return array<string, string>
-     */
-    protected function getInitHeaders(): array
-    {
-        // Initial payload consists of required headers for Wildfire
-        return array_merge(
-            $this->createHeader(['Protocol', 1], static::PROTOCOL_URI),
-            $this->createHeader([1, 'Structure', 1], static::STRUCTURE_URI),
-            $this->createHeader([1, 'Plugin', 1], static::PLUGIN_URI)
-        );
-    }
-
-    /**
-     * Send header string to the client
-     */
-    protected function sendHeader(string $header, string $content): void
-    {
-        if (!headers_sent() && self::$sendHeaders) {
-            header(sprintf('%s: %s', $header, $content));
-        }
-    }
-
-    /**
-     * Creates & sends header for a record, ensuring init headers have been sent prior
-     *
-     * @see sendHeader()
-     * @see sendInitHeaders()
-     */
-    protected function write(array $record): void
-    {
-        if (!self::$sendHeaders || !$this->isWebRequest()) {
-            return;
-        }
-
-        // WildFire-specific headers must be sent prior to any messages
-        if (!self::$initialized) {
-            self::$initialized = true;
-
-            self::$sendHeaders = $this->headersAccepted();
-            if (!self::$sendHeaders) {
-                return;
-            }
-
-            foreach ($this->getInitHeaders() as $header => $content) {
-                $this->sendHeader($header, $content);
-            }
-        }
-
-        $header = $this->createRecordHeader($record);
-        if (trim(current($header)) !== '') {
-            $this->sendHeader(key($header), current($header));
-        }
-    }
-
-    /**
-     * Verifies if the headers are accepted by the current user agent
-     */
-    protected function headersAccepted(): bool
-    {
-        if (!empty($_SERVER['HTTP_USER_AGENT']) && preg_match('{\bFirePHP/\d+\.\d+\b}', $_SERVER['HTTP_USER_AGENT'])) {
-            return true;
-        }
-
-        return isset($_SERVER['HTTP_X_FIREPHP_VERSION']);
-    }
-}
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/Handler/FleepHookHandler.php b/monolog/vendor/monolog/monolog/src/Monolog/Handler/FleepHookHandler.php
deleted file mode 100644
index 85c95b9d..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/Handler/FleepHookHandler.php
+++ /dev/null
@@ -1,135 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\Formatter\FormatterInterface;
-use Monolog\Formatter\LineFormatter;
-use Monolog\Logger;
-
-/**
- * Sends logs to Fleep.io using Webhook integrations
- *
- * You'll need a Fleep.io account to use this handler.
- *
- * @see https://fleep.io/integrations/webhooks/ Fleep Webhooks Documentation
- * @author Ando Roots <ando@sqroot.eu>
- *
- * @phpstan-import-type FormattedRecord from AbstractProcessingHandler
- */
-class FleepHookHandler extends SocketHandler
-{
-    protected const FLEEP_HOST = 'fleep.io';
-
-    protected const FLEEP_HOOK_URI = '/hook/';
-
-    /**
-     * @var string Webhook token (specifies the conversation where logs are sent)
-     */
-    protected $token;
-
-    /**
-     * Construct a new Fleep.io Handler.
-     *
-     * For instructions on how to create a new web hook in your conversations
-     * see https://fleep.io/integrations/webhooks/
-     *
-     * @param  string                    $token  Webhook token
-     * @throws MissingExtensionException
-     */
-    public function __construct(
-        string $token,
-        $level = Logger::DEBUG,
-        bool $bubble = true,
-        bool $persistent = false,
-        float $timeout = 0.0,
-        float $writingTimeout = 10.0,
-        ?float $connectionTimeout = null,
-        ?int $chunkSize = null
-    ) {
-        if (!extension_loaded('openssl')) {
-            throw new MissingExtensionException('The OpenSSL PHP extension is required to use the FleepHookHandler');
-        }
-
-        $this->token = $token;
-
-        $connectionString = 'ssl://' . static::FLEEP_HOST . ':443';
-        parent::__construct(
-            $connectionString,
-            $level,
-            $bubble,
-            $persistent,
-            $timeout,
-            $writingTimeout,
-            $connectionTimeout,
-            $chunkSize
-        );
-    }
-
-    /**
-     * Returns the default formatter to use with this handler
-     *
-     * Overloaded to remove empty context and extra arrays from the end of the log message.
-     *
-     * @return LineFormatter
-     */
-    protected function getDefaultFormatter(): FormatterInterface
-    {
-        return new LineFormatter(null, null, true, true);
-    }
-
-    /**
-     * Handles a log record
-     */
-    public function write(array $record): void
-    {
-        parent::write($record);
-        $this->closeSocket();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function generateDataStream(array $record): string
-    {
-        $content = $this->buildContent($record);
-
-        return $this->buildHeader($content) . $content;
-    }
-
-    /**
-     * Builds the header of the API Call
-     */
-    private function buildHeader(string $content): string
-    {
-        $header = "POST " . static::FLEEP_HOOK_URI . $this->token . " HTTP/1.1\r\n";
-        $header .= "Host: " . static::FLEEP_HOST . "\r\n";
-        $header .= "Content-Type: application/x-www-form-urlencoded\r\n";
-        $header .= "Content-Length: " . strlen($content) . "\r\n";
-        $header .= "\r\n";
-
-        return $header;
-    }
-
-    /**
-     * Builds the body of API call
-     *
-     * @phpstan-param FormattedRecord $record
-     */
-    private function buildContent(array $record): string
-    {
-        $dataArray = [
-            'message' => $record['formatted'],
-        ];
-
-        return http_build_query($dataArray);
-    }
-}
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/Handler/FlowdockHandler.php b/monolog/vendor/monolog/monolog/src/Monolog/Handler/FlowdockHandler.php
deleted file mode 100644
index 5715d580..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/Handler/FlowdockHandler.php
+++ /dev/null
@@ -1,133 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\Logger;
-use Monolog\Utils;
-use Monolog\Formatter\FlowdockFormatter;
-use Monolog\Formatter\FormatterInterface;
-
-/**
- * Sends notifications through the Flowdock push API
- *
- * This must be configured with a FlowdockFormatter instance via setFormatter()
- *
- * Notes:
- * API token - Flowdock API token
- *
- * @author Dominik Liebler <liebler.dominik@gmail.com>
- * @see https://www.flowdock.com/api/push
- *
- * @phpstan-import-type FormattedRecord from AbstractProcessingHandler
- * @deprecated Since 2.9.0 and 3.3.0, Flowdock was shutdown we will thus drop this handler in Monolog 4
- */
-class FlowdockHandler extends SocketHandler
-{
-    /**
-     * @var string
-     */
-    protected $apiToken;
-
-    /**
-     * @throws MissingExtensionException if OpenSSL is missing
-     */
-    public function __construct(
-        string $apiToken,
-        $level = Logger::DEBUG,
-        bool $bubble = true,
-        bool $persistent = false,
-        float $timeout = 0.0,
-        float $writingTimeout = 10.0,
-        ?float $connectionTimeout = null,
-        ?int $chunkSize = null
-    ) {
-        if (!extension_loaded('openssl')) {
-            throw new MissingExtensionException('The OpenSSL PHP extension is required to use the FlowdockHandler');
-        }
-
-        parent::__construct(
-            'ssl://api.flowdock.com:443',
-            $level,
-            $bubble,
-            $persistent,
-            $timeout,
-            $writingTimeout,
-            $connectionTimeout,
-            $chunkSize
-        );
-        $this->apiToken = $apiToken;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function setFormatter(FormatterInterface $formatter): HandlerInterface
-    {
-        if (!$formatter instanceof FlowdockFormatter) {
-            throw new \InvalidArgumentException('The FlowdockHandler requires an instance of Monolog\Formatter\FlowdockFormatter to function correctly');
-        }
-
-        return parent::setFormatter($formatter);
-    }
-
-    /**
-     * Gets the default formatter.
-     */
-    protected function getDefaultFormatter(): FormatterInterface
-    {
-        throw new \InvalidArgumentException('The FlowdockHandler must be configured (via setFormatter) with an instance of Monolog\Formatter\FlowdockFormatter to function correctly');
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function write(array $record): void
-    {
-        parent::write($record);
-
-        $this->closeSocket();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function generateDataStream(array $record): string
-    {
-        $content = $this->buildContent($record);
-
-        return $this->buildHeader($content) . $content;
-    }
-
-    /**
-     * Builds the body of API call
-     *
-     * @phpstan-param FormattedRecord $record
-     */
-    private function buildContent(array $record): string
-    {
-        return Utils::jsonEncode($record['formatted']['flowdock']);
-    }
-
-    /**
-     * Builds the header of the API Call
-     */
-    private function buildHeader(string $content): string
-    {
-        $header = "POST /v1/messages/team_inbox/" . $this->apiToken . " HTTP/1.1\r\n";
-        $header .= "Host: api.flowdock.com\r\n";
-        $header .= "Content-Type: application/json\r\n";
-        $header .= "Content-Length: " . strlen($content) . "\r\n";
-        $header .= "\r\n";
-
-        return $header;
-    }
-}
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/Handler/FormattableHandlerInterface.php b/monolog/vendor/monolog/monolog/src/Monolog/Handler/FormattableHandlerInterface.php
deleted file mode 100644
index fc1693cd..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/Handler/FormattableHandlerInterface.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\Formatter\FormatterInterface;
-
-/**
- * Interface to describe loggers that have a formatter
- *
- * @author Jordi Boggiano <j.boggiano@seld.be>
- */
-interface FormattableHandlerInterface
-{
-    /**
-     * Sets the formatter.
-     *
-     * @param  FormatterInterface $formatter
-     * @return HandlerInterface   self
-     */
-    public function setFormatter(FormatterInterface $formatter): HandlerInterface;
-
-    /**
-     * Gets the formatter.
-     *
-     * @return FormatterInterface
-     */
-    public function getFormatter(): FormatterInterface;
-}
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/Handler/FormattableHandlerTrait.php b/monolog/vendor/monolog/monolog/src/Monolog/Handler/FormattableHandlerTrait.php
deleted file mode 100644
index b60bdce0..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/Handler/FormattableHandlerTrait.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\Formatter\FormatterInterface;
-use Monolog\Formatter\LineFormatter;
-
-/**
- * Helper trait for implementing FormattableInterface
- *
- * @author Jordi Boggiano <j.boggiano@seld.be>
- */
-trait FormattableHandlerTrait
-{
-    /**
-     * @var ?FormatterInterface
-     */
-    protected $formatter;
-
-    /**
-     * {@inheritDoc}
-     */
-    public function setFormatter(FormatterInterface $formatter): HandlerInterface
-    {
-        $this->formatter = $formatter;
-
-        return $this;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getFormatter(): FormatterInterface
-    {
-        if (!$this->formatter) {
-            $this->formatter = $this->getDefaultFormatter();
-        }
-
-        return $this->formatter;
-    }
-
-    /**
-     * Gets the default formatter.
-     *
-     * Overwrite this if the LineFormatter is not a good default for your handler.
-     */
-    protected function getDefaultFormatter(): FormatterInterface
-    {
-        return new LineFormatter();
-    }
-}
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/Handler/GelfHandler.php b/monolog/vendor/monolog/monolog/src/Monolog/Handler/GelfHandler.php
deleted file mode 100644
index 4ff26c4c..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/Handler/GelfHandler.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Gelf\PublisherInterface;
-use Monolog\Logger;
-use Monolog\Formatter\GelfMessageFormatter;
-use Monolog\Formatter\FormatterInterface;
-
-/**
- * Handler to send messages to a Graylog2 (http://www.graylog2.org) server
- *
- * @author Matt Lehner <mlehner@gmail.com>
- * @author Benjamin Zikarsky <benjamin@zikarsky.de>
- */
-class GelfHandler extends AbstractProcessingHandler
-{
-    /**
-     * @var PublisherInterface the publisher object that sends the message to the server
-     */
-    protected $publisher;
-
-    /**
-     * @param PublisherInterface $publisher a gelf publisher object
-     */
-    public function __construct(PublisherInterface $publisher, $level = Logger::DEBUG, bool $bubble = true)
-    {
-        parent::__construct($level, $bubble);
-
-        $this->publisher = $publisher;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function write(array $record): void
-    {
-        $this->publisher->publish($record['formatted']);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function getDefaultFormatter(): FormatterInterface
-    {
-        return new GelfMessageFormatter();
-    }
-}
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/Handler/GroupHandler.php b/monolog/vendor/monolog/monolog/src/Monolog/Handler/GroupHandler.php
deleted file mode 100644
index 3c9dc4b3..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/Handler/GroupHandler.php
+++ /dev/null
@@ -1,132 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\Formatter\FormatterInterface;
-use Monolog\ResettableInterface;
-
-/**
- * Forwards records to multiple handlers
- *
- * @author Lenar Lõhmus <lenar@city.ee>
- *
- * @phpstan-import-type Record from \Monolog\Logger
- */
-class GroupHandler extends Handler implements ProcessableHandlerInterface, ResettableInterface
-{
-    use ProcessableHandlerTrait;
-
-    /** @var HandlerInterface[] */
-    protected $handlers;
-    /** @var bool */
-    protected $bubble;
-
-    /**
-     * @param HandlerInterface[] $handlers Array of Handlers.
-     * @param bool               $bubble   Whether the messages that are handled can bubble up the stack or not
-     */
-    public function __construct(array $handlers, bool $bubble = true)
-    {
-        foreach ($handlers as $handler) {
-            if (!$handler instanceof HandlerInterface) {
-                throw new \InvalidArgumentException('The first argument of the GroupHandler must be an array of HandlerInterface instances.');
-            }
-        }
-
-        $this->handlers = $handlers;
-        $this->bubble = $bubble;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function isHandling(array $record): bool
-    {
-        foreach ($this->handlers as $handler) {
-            if ($handler->isHandling($record)) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function handle(array $record): bool
-    {
-        if ($this->processors) {
-            /** @var Record $record */
-            $record = $this->processRecord($record);
-        }
-
-        foreach ($this->handlers as $handler) {
-            $handler->handle($record);
-        }
-
-        return false === $this->bubble;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function handleBatch(array $records): void
-    {
-        if ($this->processors) {
-            $processed = [];
-            foreach ($records as $record) {
-                $processed[] = $this->processRecord($record);
-            }
-            /** @var Record[] $records */
-            $records = $processed;
-        }
-
-        foreach ($this->handlers as $handler) {
-            $handler->handleBatch($records);
-        }
-    }
-
-    public function reset()
-    {
-        $this->resetProcessors();
-
-        foreach ($this->handlers as $handler) {
-            if ($handler instanceof ResettableInterface) {
-                $handler->reset();
-            }
-        }
-    }
-
-    public function close(): void
-    {
-        parent::close();
-
-        foreach ($this->handlers as $handler) {
-            $handler->close();
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function setFormatter(FormatterInterface $formatter): HandlerInterface
-    {
-        foreach ($this->handlers as $handler) {
-            if ($handler instanceof FormattableHandlerInterface) {
-                $handler->setFormatter($formatter);
-            }
-        }
-
-        return $this;
-    }
-}
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/Handler/Handler.php b/monolog/vendor/monolog/monolog/src/Monolog/Handler/Handler.php
deleted file mode 100644
index 34b4935d..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/Handler/Handler.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-/**
- * Base Handler class providing basic close() support as well as handleBatch
- *
- * @author Jordi Boggiano <j.boggiano@seld.be>
- */
-abstract class Handler implements HandlerInterface
-{
-    /**
-     * {@inheritDoc}
-     */
-    public function handleBatch(array $records): void
-    {
-        foreach ($records as $record) {
-            $this->handle($record);
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function close(): void
-    {
-    }
-
-    public function __destruct()
-    {
-        try {
-            $this->close();
-        } catch (\Throwable $e) {
-            // do nothing
-        }
-    }
-
-    public function __sleep()
-    {
-        $this->close();
-
-        $reflClass = new \ReflectionClass($this);
-
-        $keys = [];
-        foreach ($reflClass->getProperties() as $reflProp) {
-            if (!$reflProp->isStatic()) {
-                $keys[] = $reflProp->getName();
-            }
-        }
-
-        return $keys;
-    }
-}
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/Handler/HandlerInterface.php b/monolog/vendor/monolog/monolog/src/Monolog/Handler/HandlerInterface.php
deleted file mode 100644
index affcc51f..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/Handler/HandlerInterface.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-/**
- * Interface that all Monolog Handlers must implement
- *
- * @author Jordi Boggiano <j.boggiano@seld.be>
- *
- * @phpstan-import-type Record from \Monolog\Logger
- * @phpstan-import-type Level from \Monolog\Logger
- */
-interface HandlerInterface
-{
-    /**
-     * Checks whether the given record will be handled by this handler.
-     *
-     * This is mostly done for performance reasons, to avoid calling processors for nothing.
-     *
-     * Handlers should still check the record levels within handle(), returning false in isHandling()
-     * is no guarantee that handle() will not be called, and isHandling() might not be called
-     * for a given record.
-     *
-     * @param array $record Partial log record containing only a level key
-     *
-     * @return bool
-     *
-     * @phpstan-param array{level: Level} $record
-     */
-    public function isHandling(array $record): bool;
-
-    /**
-     * Handles a record.
-     *
-     * All records may be passed to this method, and the handler should discard
-     * those that it does not want to handle.
-     *
-     * The return value of this function controls the bubbling process of the handler stack.
-     * Unless the bubbling is interrupted (by returning true), the Logger class will keep on
-     * calling further handlers in the stack with a given log record.
-     *
-     * @param  array $record The record to handle
-     * @return bool  true means that this handler handled the record, and that bubbling is not permitted.
-     *                      false means the record was either not processed or that this handler allows bubbling.
-     *
-     * @phpstan-param Record $record
-     */
-    public function handle(array $record): bool;
-
-    /**
-     * Handles a set of records at once.
-     *
-     * @param array $records The records to handle (an array of record arrays)
-     *
-     * @phpstan-param Record[] $records
-     */
-    public function handleBatch(array $records): void;
-
-    /**
-     * Closes the handler.
-     *
-     * Ends a log cycle and frees all resources used by the handler.
-     *
-     * Closing a Handler means flushing all buffers and freeing any open resources/handles.
-     *
-     * Implementations have to be idempotent (i.e. it should be possible to call close several times without breakage)
-     * and ideally handlers should be able to reopen themselves on handle() after they have been closed.
-     *
-     * This is useful at the end of a request and will be called automatically when the object
-     * is destroyed if you extend Monolog\Handler\Handler.
-     *
-     * If you are thinking of calling this method yourself, most likely you should be
-     * calling ResettableInterface::reset instead. Have a look.
-     */
-    public function close(): void;
-}
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/Handler/HandlerWrapper.php b/monolog/vendor/monolog/monolog/src/Monolog/Handler/HandlerWrapper.php
deleted file mode 100644
index d4351b9f..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/Handler/HandlerWrapper.php
+++ /dev/null
@@ -1,136 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\ResettableInterface;
-use Monolog\Formatter\FormatterInterface;
-
-/**
- * This simple wrapper class can be used to extend handlers functionality.
- *
- * Example: A custom filtering that can be applied to any handler.
- *
- * Inherit from this class and override handle() like this:
- *
- *   public function handle(array $record)
- *   {
- *        if ($record meets certain conditions) {
- *            return false;
- *        }
- *        return $this->handler->handle($record);
- *   }
- *
- * @author Alexey Karapetov <alexey@karapetov.com>
- */
-class HandlerWrapper implements HandlerInterface, ProcessableHandlerInterface, FormattableHandlerInterface, ResettableInterface
-{
-    /**
-     * @var HandlerInterface
-     */
-    protected $handler;
-
-    public function __construct(HandlerInterface $handler)
-    {
-        $this->handler = $handler;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function isHandling(array $record): bool
-    {
-        return $this->handler->isHandling($record);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function handle(array $record): bool
-    {
-        return $this->handler->handle($record);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function handleBatch(array $records): void
-    {
-        $this->handler->handleBatch($records);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function close(): void
-    {
-        $this->handler->close();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function pushProcessor(callable $callback): HandlerInterface
-    {
-        if ($this->handler instanceof ProcessableHandlerInterface) {
-            $this->handler->pushProcessor($callback);
-
-            return $this;
-        }
-
-        throw new \LogicException('The wrapped handler does not implement ' . ProcessableHandlerInterface::class);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function popProcessor(): callable
-    {
-        if ($this->handler instanceof ProcessableHandlerInterface) {
-            return $this->handler->popProcessor();
-        }
-
-        throw new \LogicException('The wrapped handler does not implement ' . ProcessableHandlerInterface::class);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function setFormatter(FormatterInterface $formatter): HandlerInterface
-    {
-        if ($this->handler instanceof FormattableHandlerInterface) {
-            $this->handler->setFormatter($formatter);
-
-            return $this;
-        }
-
-        throw new \LogicException('The wrapped handler does not implement ' . FormattableHandlerInterface::class);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getFormatter(): FormatterInterface
-    {
-        if ($this->handler instanceof FormattableHandlerInterface) {
-            return $this->handler->getFormatter();
-        }
-
-        throw new \LogicException('The wrapped handler does not implement ' . FormattableHandlerInterface::class);
-    }
-
-    public function reset()
-    {
-        if ($this->handler instanceof ResettableInterface) {
-            $this->handler->reset();
-        }
-    }
-}
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/Handler/IFTTTHandler.php b/monolog/vendor/monolog/monolog/src/Monolog/Handler/IFTTTHandler.php
deleted file mode 100644
index 000ccea4..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/Handler/IFTTTHandler.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\Logger;
-use Monolog\Utils;
-
-/**
- * IFTTTHandler uses cURL to trigger IFTTT Maker actions
- *
- * Register a secret key and trigger/event name at https://ifttt.com/maker
- *
- * value1 will be the channel from monolog's Logger constructor,
- * value2 will be the level name (ERROR, WARNING, ..)
- * value3 will be the log record's message
- *
- * @author Nehal Patel <nehal@nehalpatel.me>
- */
-class IFTTTHandler extends AbstractProcessingHandler
-{
-    /** @var string */
-    private $eventName;
-    /** @var string */
-    private $secretKey;
-
-    /**
-     * @param string $eventName The name of the IFTTT Maker event that should be triggered
-     * @param string $secretKey A valid IFTTT secret key
-     */
-    public function __construct(string $eventName, string $secretKey, $level = Logger::ERROR, bool $bubble = true)
-    {
-        if (!extension_loaded('curl')) {
-            throw new MissingExtensionException('The curl extension is needed to use the IFTTTHandler');
-        }
-
-        $this->eventName = $eventName;
-        $this->secretKey = $secretKey;
-
-        parent::__construct($level, $bubble);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function write(array $record): void
-    {
-        $postData = [
-            "value1" => $record["channel"],
-            "value2" => $record["level_name"],
-            "value3" => $record["message"],
-        ];
-        $postString = Utils::jsonEncode($postData);
-
-        $ch = curl_init();
-        curl_setopt($ch, CURLOPT_URL, "https://maker.ifttt.com/trigger/" . $this->eventName . "/with/key/" . $this->secretKey);
-        curl_setopt($ch, CURLOPT_POST, true);
-        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-        curl_setopt($ch, CURLOPT_POSTFIELDS, $postString);
-        curl_setopt($ch, CURLOPT_HTTPHEADER, [
-            "Content-Type: application/json",
-        ]);
-
-        Curl\Util::execute($ch);
-    }
-}
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/Handler/InsightOpsHandler.php b/monolog/vendor/monolog/monolog/src/Monolog/Handler/InsightOpsHandler.php
deleted file mode 100644
index 71f64a26..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/Handler/InsightOpsHandler.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\Logger;
-
-/**
- * Inspired on LogEntriesHandler.
- *
- * @author Robert Kaufmann III <rok3@rok3.me>
- * @author Gabriel Machado <gabriel.ms1@hotmail.com>
- */
-class InsightOpsHandler extends SocketHandler
-{
-    /**
-     * @var string
-     */
-    protected $logToken;
-
-    /**
-     * @param string     $token  Log token supplied by InsightOps
-     * @param string     $region Region where InsightOps account is hosted. Could be 'us' or 'eu'.
-     * @param bool       $useSSL Whether or not SSL encryption should be used
-     *
-     * @throws MissingExtensionException If SSL encryption is set to true and OpenSSL is missing
-     */
-    public function __construct(
-        string $token,
-        string $region = 'us',
-        bool $useSSL = true,
-        $level = Logger::DEBUG,
-        bool $bubble = true,
-        bool $persistent = false,
-        float $timeout = 0.0,
-        float $writingTimeout = 10.0,
-        ?float $connectionTimeout = null,
-        ?int $chunkSize = null
-    ) {
-        if ($useSSL && !extension_loaded('openssl')) {
-            throw new MissingExtensionException('The OpenSSL PHP plugin is required to use SSL encrypted connection for InsightOpsHandler');
-        }
-
-        $endpoint = $useSSL
-            ? 'ssl://' . $region . '.data.logs.insight.rapid7.com:443'
-            : $region . '.data.logs.insight.rapid7.com:80';
-
-        parent::__construct(
-            $endpoint,
-            $level,
-            $bubble,
-            $persistent,
-            $timeout,
-            $writingTimeout,
-            $connectionTimeout,
-            $chunkSize
-        );
-        $this->logToken = $token;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function generateDataStream(array $record): string
-    {
-        return $this->logToken . ' ' . $record['formatted'];
-    }
-}
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/Handler/LogEntriesHandler.php b/monolog/vendor/monolog/monolog/src/Monolog/Handler/LogEntriesHandler.php
deleted file mode 100644
index 25fcd159..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/Handler/LogEntriesHandler.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\Logger;
-
-/**
- * @author Robert Kaufmann III <rok3@rok3.me>
- */
-class LogEntriesHandler extends SocketHandler
-{
-    /**
-     * @var string
-     */
-    protected $logToken;
-
-    /**
-     * @param string     $token  Log token supplied by LogEntries
-     * @param bool       $useSSL Whether or not SSL encryption should be used.
-     * @param string     $host   Custom hostname to send the data to if needed
-     *
-     * @throws MissingExtensionException If SSL encryption is set to true and OpenSSL is missing
-     */
-    public function __construct(
-        string $token,
-        bool $useSSL = true,
-        $level = Logger::DEBUG,
-        bool $bubble = true,
-        string $host = 'data.logentries.com',
-        bool $persistent = false,
-        float $timeout = 0.0,
-        float $writingTimeout = 10.0,
-        ?float $connectionTimeout = null,
-        ?int $chunkSize = null
-    ) {
-        if ($useSSL && !extension_loaded('openssl')) {
-            throw new MissingExtensionException('The OpenSSL PHP plugin is required to use SSL encrypted connection for LogEntriesHandler');
-        }
-
-        $endpoint = $useSSL ? 'ssl://' . $host . ':443' : $host . ':80';
-        parent::__construct(
-            $endpoint,
-            $level,
-            $bubble,
-            $persistent,
-            $timeout,
-            $writingTimeout,
-            $connectionTimeout,
-            $chunkSize
-        );
-        $this->logToken = $token;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function generateDataStream(array $record): string
-    {
-        return $this->logToken . ' ' . $record['formatted'];
-    }
-}
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/Handler/LogglyHandler.php b/monolog/vendor/monolog/monolog/src/Monolog/Handler/LogglyHandler.php
deleted file mode 100644
index 6d13db37..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/Handler/LogglyHandler.php
+++ /dev/null
@@ -1,160 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\Logger;
-use Monolog\Formatter\FormatterInterface;
-use Monolog\Formatter\LogglyFormatter;
-use function array_key_exists;
-use CurlHandle;
-
-/**
- * Sends errors to Loggly.
- *
- * @author Przemek Sobstel <przemek@sobstel.org>
- * @author Adam Pancutt <adam@pancutt.com>
- * @author Gregory Barchard <gregory@barchard.net>
- */
-class LogglyHandler extends AbstractProcessingHandler
-{
-    protected const HOST = 'logs-01.loggly.com';
-    protected const ENDPOINT_SINGLE = 'inputs';
-    protected const ENDPOINT_BATCH = 'bulk';
-
-    /**
-     * Caches the curl handlers for every given endpoint.
-     *
-     * @var resource[]|CurlHandle[]
-     */
-    protected $curlHandlers = [];
-
-    /** @var string */
-    protected $token;
-
-    /** @var string[] */
-    protected $tag = [];
-
-    /**
-     * @param string $token API token supplied by Loggly
-     *
-     * @throws MissingExtensionException If the curl extension is missing
-     */
-    public function __construct(string $token, $level = Logger::DEBUG, bool $bubble = true)
-    {
-        if (!extension_loaded('curl')) {
-            throw new MissingExtensionException('The curl extension is needed to use the LogglyHandler');
-        }
-
-        $this->token = $token;
-
-        parent::__construct($level, $bubble);
-    }
-
-    /**
-     * Loads and returns the shared curl handler for the given endpoint.
-     *
-     * @param string $endpoint
-     *
-     * @return resource|CurlHandle
-     */
-    protected function getCurlHandler(string $endpoint)
-    {
-        if (!array_key_exists($endpoint, $this->curlHandlers)) {
-            $this->curlHandlers[$endpoint] = $this->loadCurlHandle($endpoint);
-        }
-
-        return $this->curlHandlers[$endpoint];
-    }
-
-    /**
-     * Starts a fresh curl session for the given endpoint and returns its handler.
-     *
-     * @param string $endpoint
-     *
-     * @return resource|CurlHandle
-     */
-    private function loadCurlHandle(string $endpoint)
-    {
-        $url = sprintf("https://%s/%s/%s/", static::HOST, $endpoint, $this->token);
-
-        $ch = curl_init();
-
-        curl_setopt($ch, CURLOPT_URL, $url);
-        curl_setopt($ch, CURLOPT_POST, true);
-        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-
-        return $ch;
-    }
-
-    /**
-     * @param string[]|string $tag
-     */
-    public function setTag($tag): self
-    {
-        $tag = !empty($tag) ? $tag : [];
-        $this->tag = is_array($tag) ? $tag : [$tag];
-
-        return $this;
-    }
-
-    /**
-     * @param string[]|string $tag
-     */
-    public function addTag($tag): self
-    {
-        if (!empty($tag)) {
-            $tag = is_array($tag) ? $tag : [$tag];
-            $this->tag = array_unique(array_merge($this->tag, $tag));
-        }
-
-        return $this;
-    }
-
-    protected function write(array $record): void
-    {
-        $this->send($record["formatted"], static::ENDPOINT_SINGLE);
-    }
-
-    public function handleBatch(array $records): void
-    {
-        $level = $this->level;
-
-        $records = array_filter($records, function ($record) use ($level) {
-            return ($record['level'] >= $level);
-        });
-
-        if ($records) {
-            $this->send($this->getFormatter()->formatBatch($records), static::ENDPOINT_BATCH);
-        }
-    }
-
-    protected function send(string $data, string $endpoint): void
-    {
-        $ch = $this->getCurlHandler($endpoint);
-
-        $headers = ['Content-Type: application/json'];
-
-        if (!empty($this->tag)) {
-            $headers[] = 'X-LOGGLY-TAG: '.implode(',', $this->tag);
-        }
-
-        curl_setopt($ch, CURLOPT_POSTFIELDS, $data);
-        curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
-
-        Curl\Util::execute($ch, 5, false);
-    }
-
-    protected function getDefaultFormatter(): FormatterInterface
-    {
-        return new LogglyFormatter();
-    }
-}
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/Handler/LogmaticHandler.php b/monolog/vendor/monolog/monolog/src/Monolog/Handler/LogmaticHandler.php
deleted file mode 100644
index 859a4690..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/Handler/LogmaticHandler.php
+++ /dev/null
@@ -1,106 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\Logger;
-use Monolog\Formatter\FormatterInterface;
-use Monolog\Formatter\LogmaticFormatter;
-
-/**
- * @author Julien Breux <julien.breux@gmail.com>
- */
-class LogmaticHandler extends SocketHandler
-{
-    /**
-     * @var string
-     */
-    private $logToken;
-
-    /**
-     * @var string
-     */
-    private $hostname;
-
-    /**
-     * @var string
-     */
-    private $appname;
-
-    /**
-     * @param string     $token    Log token supplied by Logmatic.
-     * @param string     $hostname Host name supplied by Logmatic.
-     * @param string     $appname  Application name supplied by Logmatic.
-     * @param bool       $useSSL   Whether or not SSL encryption should be used.
-     *
-     * @throws MissingExtensionException If SSL encryption is set to true and OpenSSL is missing
-     */
-    public function __construct(
-        string $token,
-        string $hostname = '',
-        string $appname = '',
-        bool $useSSL = true,
-        $level = Logger::DEBUG,
-        bool $bubble = true,
-        bool $persistent = false,
-        float $timeout = 0.0,
-        float $writingTimeout = 10.0,
-        ?float $connectionTimeout = null,
-        ?int $chunkSize = null
-    ) {
-        if ($useSSL && !extension_loaded('openssl')) {
-            throw new MissingExtensionException('The OpenSSL PHP extension is required to use SSL encrypted connection for LogmaticHandler');
-        }
-
-        $endpoint = $useSSL ? 'ssl://api.logmatic.io:10515' : 'api.logmatic.io:10514';
-        $endpoint .= '/v1/';
-
-        parent::__construct(
-            $endpoint,
-            $level,
-            $bubble,
-            $persistent,
-            $timeout,
-            $writingTimeout,
-            $connectionTimeout,
-            $chunkSize
-        );
-
-        $this->logToken = $token;
-        $this->hostname = $hostname;
-        $this->appname  = $appname;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function generateDataStream(array $record): string
-    {
-        return $this->logToken . ' ' . $record['formatted'];
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function getDefaultFormatter(): FormatterInterface
-    {
-        $formatter = new LogmaticFormatter();
-
-        if (!empty($this->hostname)) {
-            $formatter->setHostname($this->hostname);
-        }
-        if (!empty($this->appname)) {
-            $formatter->setAppname($this->appname);
-        }
-
-        return $formatter;
-    }
-}
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/Handler/MailHandler.php b/monolog/vendor/monolog/monolog/src/Monolog/Handler/MailHandler.php
deleted file mode 100644
index 97f34320..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/Handler/MailHandler.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\Formatter\FormatterInterface;
-use Monolog\Formatter\HtmlFormatter;
-
-/**
- * Base class for all mail handlers
- *
- * @author Gyula Sallai
- *
- * @phpstan-import-type Record from \Monolog\Logger
- */
-abstract class MailHandler extends AbstractProcessingHandler
-{
-    /**
-     * {@inheritDoc}
-     */
-    public function handleBatch(array $records): void
-    {
-        $messages = [];
-
-        foreach ($records as $record) {
-            if ($record['level'] < $this->level) {
-                continue;
-            }
-            /** @var Record $message */
-            $message = $this->processRecord($record);
-            $messages[] = $message;
-        }
-
-        if (!empty($messages)) {
-            $this->send((string) $this->getFormatter()->formatBatch($messages), $messages);
-        }
-    }
-
-    /**
-     * Send a mail with the given content
-     *
-     * @param string $content formatted email body to be sent
-     * @param array  $records the array of log records that formed this content
-     *
-     * @phpstan-param Record[] $records
-     */
-    abstract protected function send(string $content, array $records): void;
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function write(array $record): void
-    {
-        $this->send((string) $record['formatted'], [$record]);
-    }
-
-    /**
-     * @phpstan-param non-empty-array<Record> $records
-     * @phpstan-return Record
-     */
-    protected function getHighestRecord(array $records): array
-    {
-        $highestRecord = null;
-        foreach ($records as $record) {
-            if ($highestRecord === null || $highestRecord['level'] < $record['level']) {
-                $highestRecord = $record;
-            }
-        }
-
-        return $highestRecord;
-    }
-
-    protected function isHtmlBody(string $body): bool
-    {
-        return ($body[0] ?? null) === '<';
-    }
-
-    /**
-     * Gets the default formatter.
-     *
-     * @return FormatterInterface
-     */
-    protected function getDefaultFormatter(): FormatterInterface
-    {
-        return new HtmlFormatter();
-    }
-}
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/Handler/MandrillHandler.php b/monolog/vendor/monolog/monolog/src/Monolog/Handler/MandrillHandler.php
deleted file mode 100644
index 3003500e..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/Handler/MandrillHandler.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\Logger;
-use Swift;
-use Swift_Message;
-
-/**
- * MandrillHandler uses cURL to send the emails to the Mandrill API
- *
- * @author Adam Nicholson <adamnicholson10@gmail.com>
- */
-class MandrillHandler extends MailHandler
-{
-    /** @var Swift_Message */
-    protected $message;
-    /** @var string */
-    protected $apiKey;
-
-    /**
-     * @psalm-param Swift_Message|callable(): Swift_Message $message
-     *
-     * @param string                 $apiKey  A valid Mandrill API key
-     * @param callable|Swift_Message $message An example message for real messages, only the body will be replaced
-     */
-    public function __construct(string $apiKey, $message, $level = Logger::ERROR, bool $bubble = true)
-    {
-        parent::__construct($level, $bubble);
-
-        if (!$message instanceof Swift_Message && is_callable($message)) {
-            $message = $message();
-        }
-        if (!$message instanceof Swift_Message) {
-            throw new \InvalidArgumentException('You must provide either a Swift_Message instance or a callable returning it');
-        }
-        $this->message = $message;
-        $this->apiKey = $apiKey;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function send(string $content, array $records): void
-    {
-        $mime = 'text/plain';
-        if ($this->isHtmlBody($content)) {
-            $mime = 'text/html';
-        }
-
-        $message = clone $this->message;
-        $message->setBody($content, $mime);
-        /** @phpstan-ignore-next-line */
-        if (version_compare(Swift::VERSION, '6.0.0', '>=')) {
-            $message->setDate(new \DateTimeImmutable());
-        } else {
-            /** @phpstan-ignore-next-line */
-            $message->setDate(time());
-        }
-
-        $ch = curl_init();
-
-        curl_setopt($ch, CURLOPT_URL, 'https://mandrillapp.com/api/1.0/messages/send-raw.json');
-        curl_setopt($ch, CURLOPT_POST, 1);
-        curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-        curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query([
-            'key' => $this->apiKey,
-            'raw_message' => (string) $message,
-            'async' => false,
-        ]));
-
-        Curl\Util::execute($ch);
-    }
-}
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/Handler/MissingExtensionException.php b/monolog/vendor/monolog/monolog/src/Monolog/Handler/MissingExtensionException.php
deleted file mode 100644
index 3965aeea..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/Handler/MissingExtensionException.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-/**
- * Exception can be thrown if an extension for a handler is missing
- *
- * @author Christian Bergau <cbergau86@gmail.com>
- */
-class MissingExtensionException extends \Exception
-{
-}
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/Handler/MongoDBHandler.php b/monolog/vendor/monolog/monolog/src/Monolog/Handler/MongoDBHandler.php
deleted file mode 100644
index 30630911..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/Handler/MongoDBHandler.php
+++ /dev/null
@@ -1,86 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use MongoDB\Driver\BulkWrite;
-use MongoDB\Driver\Manager;
-use MongoDB\Client;
-use Monolog\Logger;
-use Monolog\Formatter\FormatterInterface;
-use Monolog\Formatter\MongoDBFormatter;
-
-/**
- * Logs to a MongoDB database.
- *
- * Usage example:
- *
- *   $log = new \Monolog\Logger('application');
- *   $client = new \MongoDB\Client('mongodb://localhost:27017');
- *   $mongodb = new \Monolog\Handler\MongoDBHandler($client, 'logs', 'prod');
- *   $log->pushHandler($mongodb);
- *
- * The above examples uses the MongoDB PHP library's client class; however, the
- * MongoDB\Driver\Manager class from ext-mongodb is also supported.
- */
-class MongoDBHandler extends AbstractProcessingHandler
-{
-    /** @var \MongoDB\Collection */
-    private $collection;
-    /** @var Client|Manager */
-    private $manager;
-    /** @var string */
-    private $namespace;
-
-    /**
-     * Constructor.
-     *
-     * @param Client|Manager $mongodb    MongoDB library or driver client
-     * @param string         $database   Database name
-     * @param string         $collection Collection name
-     */
-    public function __construct($mongodb, string $database, string $collection, $level = Logger::DEBUG, bool $bubble = true)
-    {
-        if (!($mongodb instanceof Client || $mongodb instanceof Manager)) {
-            throw new \InvalidArgumentException('MongoDB\Client or MongoDB\Driver\Manager instance required');
-        }
-
-        if ($mongodb instanceof Client) {
-            $this->collection = $mongodb->selectCollection($database, $collection);
-        } else {
-            $this->manager = $mongodb;
-            $this->namespace = $database . '.' . $collection;
-        }
-
-        parent::__construct($level, $bubble);
-    }
-
-    protected function write(array $record): void
-    {
-        if (isset($this->collection)) {
-            $this->collection->insertOne($record['formatted']);
-        }
-
-        if (isset($this->manager, $this->namespace)) {
-            $bulk = new BulkWrite;
-            $bulk->insert($record["formatted"]);
-            $this->manager->executeBulkWrite($this->namespace, $bulk);
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function getDefaultFormatter(): FormatterInterface
-    {
-        return new MongoDBFormatter;
-    }
-}
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/Handler/NativeMailerHandler.php b/monolog/vendor/monolog/monolog/src/Monolog/Handler/NativeMailerHandler.php
deleted file mode 100644
index 0c0a3bdb..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/Handler/NativeMailerHandler.php
+++ /dev/null
@@ -1,174 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\Logger;
-use Monolog\Formatter\LineFormatter;
-
-/**
- * NativeMailerHandler uses the mail() function to send the emails
- *
- * @author Christophe Coevoet <stof@notk.org>
- * @author Mark Garrett <mark@moderndeveloperllc.com>
- */
-class NativeMailerHandler extends MailHandler
-{
-    /**
-     * The email addresses to which the message will be sent
-     * @var string[]
-     */
-    protected $to;
-
-    /**
-     * The subject of the email
-     * @var string
-     */
-    protected $subject;
-
-    /**
-     * Optional headers for the message
-     * @var string[]
-     */
-    protected $headers = [];
-
-    /**
-     * Optional parameters for the message
-     * @var string[]
-     */
-    protected $parameters = [];
-
-    /**
-     * The wordwrap length for the message
-     * @var int
-     */
-    protected $maxColumnWidth;
-
-    /**
-     * The Content-type for the message
-     * @var string|null
-     */
-    protected $contentType;
-
-    /**
-     * The encoding for the message
-     * @var string
-     */
-    protected $encoding = 'utf-8';
-
-    /**
-     * @param string|string[] $to             The receiver of the mail
-     * @param string          $subject        The subject of the mail
-     * @param string          $from           The sender of the mail
-     * @param int             $maxColumnWidth The maximum column width that the message lines will have
-     */
-    public function __construct($to, string $subject, string $from, $level = Logger::ERROR, bool $bubble = true, int $maxColumnWidth = 70)
-    {
-        parent::__construct($level, $bubble);
-        $this->to = (array) $to;
-        $this->subject = $subject;
-        $this->addHeader(sprintf('From: %s', $from));
-        $this->maxColumnWidth = $maxColumnWidth;
-    }
-
-    /**
-     * Add headers to the message
-     *
-     * @param string|string[] $headers Custom added headers
-     */
-    public function addHeader($headers): self
-    {
-        foreach ((array) $headers as $header) {
-            if (strpos($header, "\n") !== false || strpos($header, "\r") !== false) {
-                throw new \InvalidArgumentException('Headers can not contain newline characters for security reasons');
-            }
-            $this->headers[] = $header;
-        }
-
-        return $this;
-    }
-
-    /**
-     * Add parameters to the message
-     *
-     * @param string|string[] $parameters Custom added parameters
-     */
-    public function addParameter($parameters): self
-    {
-        $this->parameters = array_merge($this->parameters, (array) $parameters);
-
-        return $this;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function send(string $content, array $records): void
-    {
-        $contentType = $this->getContentType() ?: ($this->isHtmlBody($content) ? 'text/html' : 'text/plain');
-
-        if ($contentType !== 'text/html') {
-            $content = wordwrap($content, $this->maxColumnWidth);
-        }
-
-        $headers = ltrim(implode("\r\n", $this->headers) . "\r\n", "\r\n");
-        $headers .= 'Content-type: ' . $contentType . '; charset=' . $this->getEncoding() . "\r\n";
-        if ($contentType === 'text/html' && false === strpos($headers, 'MIME-Version:')) {
-            $headers .= 'MIME-Version: 1.0' . "\r\n";
-        }
-
-        $subject = $this->subject;
-        if ($records) {
-            $subjectFormatter = new LineFormatter($this->subject);
-            $subject = $subjectFormatter->format($this->getHighestRecord($records));
-        }
-
-        $parameters = implode(' ', $this->parameters);
-        foreach ($this->to as $to) {
-            mail($to, $subject, $content, $headers, $parameters);
-        }
-    }
-
-    public function getContentType(): ?string
-    {
-        return $this->contentType;
-    }
-
-    public function getEncoding(): string
-    {
-        return $this->encoding;
-    }
-
-    /**
-     * @param string $contentType The content type of the email - Defaults to text/plain. Use text/html for HTML messages.
-     */
-    public function setContentType(string $contentType): self
-    {
-        if (strpos($contentType, "\n") !== false || strpos($contentType, "\r") !== false) {
-            throw new \InvalidArgumentException('The content type can not contain newline characters to prevent email header injection');
-        }
-
-        $this->contentType = $contentType;
-
-        return $this;
-    }
-
-    public function setEncoding(string $encoding): self
-    {
-        if (strpos($encoding, "\n") !== false || strpos($encoding, "\r") !== false) {
-            throw new \InvalidArgumentException('The encoding can not contain newline characters to prevent email header injection');
-        }
-
-        $this->encoding = $encoding;
-
-        return $this;
-    }
-}
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/Handler/NewRelicHandler.php b/monolog/vendor/monolog/monolog/src/Monolog/Handler/NewRelicHandler.php
deleted file mode 100644
index 114d749e..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/Handler/NewRelicHandler.php
+++ /dev/null
@@ -1,199 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\Logger;
-use Monolog\Utils;
-use Monolog\Formatter\NormalizerFormatter;
-use Monolog\Formatter\FormatterInterface;
-
-/**
- * Class to record a log on a NewRelic application.
- * Enabling New Relic High Security mode may prevent capture of useful information.
- *
- * This handler requires a NormalizerFormatter to function and expects an array in $record['formatted']
- *
- * @see https://docs.newrelic.com/docs/agents/php-agent
- * @see https://docs.newrelic.com/docs/accounts-partnerships/accounts/security/high-security
- */
-class NewRelicHandler extends AbstractProcessingHandler
-{
-    /**
-     * Name of the New Relic application that will receive logs from this handler.
-     *
-     * @var ?string
-     */
-    protected $appName;
-
-    /**
-     * Name of the current transaction
-     *
-     * @var ?string
-     */
-    protected $transactionName;
-
-    /**
-     * Some context and extra data is passed into the handler as arrays of values. Do we send them as is
-     * (useful if we are using the API), or explode them for display on the NewRelic RPM website?
-     *
-     * @var bool
-     */
-    protected $explodeArrays;
-
-    /**
-     * {@inheritDoc}
-     *
-     * @param string|null $appName
-     * @param bool        $explodeArrays
-     * @param string|null $transactionName
-     */
-    public function __construct(
-        $level = Logger::ERROR,
-        bool $bubble = true,
-        ?string $appName = null,
-        bool $explodeArrays = false,
-        ?string $transactionName = null
-    ) {
-        parent::__construct($level, $bubble);
-
-        $this->appName       = $appName;
-        $this->explodeArrays = $explodeArrays;
-        $this->transactionName = $transactionName;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function write(array $record): void
-    {
-        if (!$this->isNewRelicEnabled()) {
-            throw new MissingExtensionException('The newrelic PHP extension is required to use the NewRelicHandler');
-        }
-
-        if ($appName = $this->getAppName($record['context'])) {
-            $this->setNewRelicAppName($appName);
-        }
-
-        if ($transactionName = $this->getTransactionName($record['context'])) {
-            $this->setNewRelicTransactionName($transactionName);
-            unset($record['formatted']['context']['transaction_name']);
-        }
-
-        if (isset($record['context']['exception']) && $record['context']['exception'] instanceof \Throwable) {
-            newrelic_notice_error($record['message'], $record['context']['exception']);
-            unset($record['formatted']['context']['exception']);
-        } else {
-            newrelic_notice_error($record['message']);
-        }
-
-        if (isset($record['formatted']['context']) && is_array($record['formatted']['context'])) {
-            foreach ($record['formatted']['context'] as $key => $parameter) {
-                if (is_array($parameter) && $this->explodeArrays) {
-                    foreach ($parameter as $paramKey => $paramValue) {
-                        $this->setNewRelicParameter('context_' . $key . '_' . $paramKey, $paramValue);
-                    }
-                } else {
-                    $this->setNewRelicParameter('context_' . $key, $parameter);
-                }
-            }
-        }
-
-        if (isset($record['formatted']['extra']) && is_array($record['formatted']['extra'])) {
-            foreach ($record['formatted']['extra'] as $key => $parameter) {
-                if (is_array($parameter) && $this->explodeArrays) {
-                    foreach ($parameter as $paramKey => $paramValue) {
-                        $this->setNewRelicParameter('extra_' . $key . '_' . $paramKey, $paramValue);
-                    }
-                } else {
-                    $this->setNewRelicParameter('extra_' . $key, $parameter);
-                }
-            }
-        }
-    }
-
-    /**
-     * Checks whether the NewRelic extension is enabled in the system.
-     *
-     * @return bool
-     */
-    protected function isNewRelicEnabled(): bool
-    {
-        return extension_loaded('newrelic');
-    }
-
-    /**
-     * Returns the appname where this log should be sent. Each log can override the default appname, set in this
-     * handler's constructor, by providing the appname in it's context.
-     *
-     * @param mixed[] $context
-     */
-    protected function getAppName(array $context): ?string
-    {
-        if (isset($context['appname'])) {
-            return $context['appname'];
-        }
-
-        return $this->appName;
-    }
-
-    /**
-     * Returns the name of the current transaction. Each log can override the default transaction name, set in this
-     * handler's constructor, by providing the transaction_name in it's context
-     *
-     * @param mixed[] $context
-     */
-    protected function getTransactionName(array $context): ?string
-    {
-        if (isset($context['transaction_name'])) {
-            return $context['transaction_name'];
-        }
-
-        return $this->transactionName;
-    }
-
-    /**
-     * Sets the NewRelic application that should receive this log.
-     */
-    protected function setNewRelicAppName(string $appName): void
-    {
-        newrelic_set_appname($appName);
-    }
-
-    /**
-     * Overwrites the name of the current transaction
-     */
-    protected function setNewRelicTransactionName(string $transactionName): void
-    {
-        newrelic_name_transaction($transactionName);
-    }
-
-    /**
-     * @param string $key
-     * @param mixed  $value
-     */
-    protected function setNewRelicParameter(string $key, $value): void
-    {
-        if (null === $value || is_scalar($value)) {
-            newrelic_add_custom_parameter($key, $value);
-        } else {
-            newrelic_add_custom_parameter($key, Utils::jsonEncode($value, null, true));
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function getDefaultFormatter(): FormatterInterface
-    {
-        return new NormalizerFormatter();
-    }
-}
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/Handler/NoopHandler.php b/monolog/vendor/monolog/monolog/src/Monolog/Handler/NoopHandler.php
deleted file mode 100644
index 1ddf0beb..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/Handler/NoopHandler.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-/**
- * No-op
- *
- * This handler handles anything, but does nothing, and does not stop bubbling to the rest of the stack.
- * This can be used for testing, or to disable a handler when overriding a configuration without
- * influencing the rest of the stack.
- *
- * @author Roel Harbers <roelharbers@gmail.com>
- */
-class NoopHandler extends Handler
-{
-    /**
-     * {@inheritDoc}
-     */
-    public function isHandling(array $record): bool
-    {
-        return true;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function handle(array $record): bool
-    {
-        return false;
-    }
-}
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/Handler/NullHandler.php b/monolog/vendor/monolog/monolog/src/Monolog/Handler/NullHandler.php
deleted file mode 100644
index e75ee0c6..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/Handler/NullHandler.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\Logger;
-use Psr\Log\LogLevel;
-
-/**
- * Blackhole
- *
- * Any record it can handle will be thrown away. This can be used
- * to put on top of an existing stack to override it temporarily.
- *
- * @author Jordi Boggiano <j.boggiano@seld.be>
- *
- * @phpstan-import-type Level from \Monolog\Logger
- * @phpstan-import-type LevelName from \Monolog\Logger
- */
-class NullHandler extends Handler
-{
-    /**
-     * @var int
-     */
-    private $level;
-
-    /**
-     * @param string|int $level The minimum logging level at which this handler will be triggered
-     *
-     * @phpstan-param Level|LevelName|LogLevel::* $level
-     */
-    public function __construct($level = Logger::DEBUG)
-    {
-        $this->level = Logger::toMonologLevel($level);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function isHandling(array $record): bool
-    {
-        return $record['level'] >= $this->level;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function handle(array $record): bool
-    {
-        return $record['level'] >= $this->level;
-    }
-}
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/Handler/OverflowHandler.php b/monolog/vendor/monolog/monolog/src/Monolog/Handler/OverflowHandler.php
deleted file mode 100644
index 22068c9a..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/Handler/OverflowHandler.php
+++ /dev/null
@@ -1,149 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\Logger;
-use Monolog\Formatter\FormatterInterface;
-
-/**
- * Handler to only pass log messages when a certain threshold of number of messages is reached.
- *
- * This can be useful in cases of processing a batch of data, but you're for example only interested
- * in case it fails catastrophically instead of a warning for 1 or 2 events. Worse things can happen, right?
- *
- * Usage example:
- *
- * ```
- *   $log = new Logger('application');
- *   $handler = new SomeHandler(...)
- *
- *   // Pass all warnings to the handler when more than 10 & all error messages when more then 5
- *   $overflow = new OverflowHandler($handler, [Logger::WARNING => 10, Logger::ERROR => 5]);
- *
- *   $log->pushHandler($overflow);
- *```
- *
- * @author Kris Buist <krisbuist@gmail.com>
- */
-class OverflowHandler extends AbstractHandler implements FormattableHandlerInterface
-{
-    /** @var HandlerInterface */
-    private $handler;
-
-    /** @var int[] */
-    private $thresholdMap = [
-        Logger::DEBUG => 0,
-        Logger::INFO => 0,
-        Logger::NOTICE => 0,
-        Logger::WARNING => 0,
-        Logger::ERROR => 0,
-        Logger::CRITICAL => 0,
-        Logger::ALERT => 0,
-        Logger::EMERGENCY => 0,
-    ];
-
-    /**
-     * Buffer of all messages passed to the handler before the threshold was reached
-     *
-     * @var mixed[][]
-     */
-    private $buffer = [];
-
-    /**
-     * @param HandlerInterface $handler
-     * @param int[]            $thresholdMap Dictionary of logger level => threshold
-     */
-    public function __construct(
-        HandlerInterface $handler,
-        array $thresholdMap = [],
-        $level = Logger::DEBUG,
-        bool $bubble = true
-    ) {
-        $this->handler = $handler;
-        foreach ($thresholdMap as $thresholdLevel => $threshold) {
-            $this->thresholdMap[$thresholdLevel] = $threshold;
-        }
-        parent::__construct($level, $bubble);
-    }
-
-    /**
-     * Handles a record.
-     *
-     * All records may be passed to this method, and the handler should discard
-     * those that it does not want to handle.
-     *
-     * The return value of this function controls the bubbling process of the handler stack.
-     * Unless the bubbling is interrupted (by returning true), the Logger class will keep on
-     * calling further handlers in the stack with a given log record.
-     *
-     * {@inheritDoc}
-     */
-    public function handle(array $record): bool
-    {
-        if ($record['level'] < $this->level) {
-            return false;
-        }
-
-        $level = $record['level'];
-
-        if (!isset($this->thresholdMap[$level])) {
-            $this->thresholdMap[$level] = 0;
-        }
-
-        if ($this->thresholdMap[$level] > 0) {
-            // The overflow threshold is not yet reached, so we're buffering the record and lowering the threshold by 1
-            $this->thresholdMap[$level]--;
-            $this->buffer[$level][] = $record;
-
-            return false === $this->bubble;
-        }
-
-        if ($this->thresholdMap[$level] == 0) {
-            // This current message is breaking the threshold. Flush the buffer and continue handling the current record
-            foreach ($this->buffer[$level] ?? [] as $buffered) {
-                $this->handler->handle($buffered);
-            }
-            $this->thresholdMap[$level]--;
-            unset($this->buffer[$level]);
-        }
-
-        $this->handler->handle($record);
-
-        return false === $this->bubble;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function setFormatter(FormatterInterface $formatter): HandlerInterface
-    {
-        if ($this->handler instanceof FormattableHandlerInterface) {
-            $this->handler->setFormatter($formatter);
-
-            return $this;
-        }
-
-        throw new \UnexpectedValueException('The nested handler of type '.get_class($this->handler).' does not support formatters.');
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getFormatter(): FormatterInterface
-    {
-        if ($this->handler instanceof FormattableHandlerInterface) {
-            return $this->handler->getFormatter();
-        }
-
-        throw new \UnexpectedValueException('The nested handler of type '.get_class($this->handler).' does not support formatters.');
-    }
-}
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/Handler/PHPConsoleHandler.php b/monolog/vendor/monolog/monolog/src/Monolog/Handler/PHPConsoleHandler.php
deleted file mode 100644
index 23a1d117..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/Handler/PHPConsoleHandler.php
+++ /dev/null
@@ -1,263 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\Formatter\LineFormatter;
-use Monolog\Formatter\FormatterInterface;
-use Monolog\Logger;
-use Monolog\Utils;
-use PhpConsole\Connector;
-use PhpConsole\Handler as VendorPhpConsoleHandler;
-use PhpConsole\Helper;
-
-/**
- * Monolog handler for Google Chrome extension "PHP Console"
- *
- * Display PHP error/debug log messages in Google Chrome console and notification popups, executes PHP code remotely
- *
- * Usage:
- * 1. Install Google Chrome extension [now dead and removed from the chrome store]
- * 2. See overview https://github.com/barbushin/php-console#overview
- * 3. Install PHP Console library https://github.com/barbushin/php-console#installation
- * 4. Example (result will looks like http://i.hizliresim.com/vg3Pz4.png)
- *
- *      $logger = new \Monolog\Logger('all', array(new \Monolog\Handler\PHPConsoleHandler()));
- *      \Monolog\ErrorHandler::register($logger);
- *      echo $undefinedVar;
- *      $logger->debug('SELECT * FROM users', array('db', 'time' => 0.012));
- *      PC::debug($_SERVER); // PHP Console debugger for any type of vars
- *
- * @author Sergey Barbushin https://www.linkedin.com/in/barbushin
- *
- * @phpstan-import-type Record from \Monolog\Logger
- * @deprecated Since 2.8.0 and 3.2.0, PHPConsole is abandoned and thus we will drop this handler in Monolog 4
- */
-class PHPConsoleHandler extends AbstractProcessingHandler
-{
-    /** @var array<string, mixed> */
-    private $options = [
-        'enabled' => true, // bool Is PHP Console server enabled
-        'classesPartialsTraceIgnore' => ['Monolog\\'], // array Hide calls of classes started with...
-        'debugTagsKeysInContext' => [0, 'tag'], // bool Is PHP Console server enabled
-        'useOwnErrorsHandler' => false, // bool Enable errors handling
-        'useOwnExceptionsHandler' => false, // bool Enable exceptions handling
-        'sourcesBasePath' => null, // string Base path of all project sources to strip in errors source paths
-        'registerHelper' => true, // bool Register PhpConsole\Helper that allows short debug calls like PC::debug($var, 'ta.g.s')
-        'serverEncoding' => null, // string|null Server internal encoding
-        'headersLimit' => null, // int|null Set headers size limit for your web-server
-        'password' => null, // string|null Protect PHP Console connection by password
-        'enableSslOnlyMode' => false, // bool Force connection by SSL for clients with PHP Console installed
-        'ipMasks' => [], // array Set IP masks of clients that will be allowed to connect to PHP Console: array('192.168.*.*', '127.0.0.1')
-        'enableEvalListener' => false, // bool Enable eval request to be handled by eval dispatcher(if enabled, 'password' option is also required)
-        'dumperDetectCallbacks' => false, // bool Convert callback items in dumper vars to (callback SomeClass::someMethod) strings
-        'dumperLevelLimit' => 5, // int Maximum dumped vars array or object nested dump level
-        'dumperItemsCountLimit' => 100, // int Maximum dumped var same level array items or object properties number
-        'dumperItemSizeLimit' => 5000, // int Maximum length of any string or dumped array item
-        'dumperDumpSizeLimit' => 500000, // int Maximum approximate size of dumped vars result formatted in JSON
-        'detectDumpTraceAndSource' => false, // bool Autodetect and append trace data to debug
-        'dataStorage' => null, // \PhpConsole\Storage|null Fixes problem with custom $_SESSION handler(see http://goo.gl/Ne8juJ)
-    ];
-
-    /** @var Connector */
-    private $connector;
-
-    /**
-     * @param  array<string, mixed> $options   See \Monolog\Handler\PHPConsoleHandler::$options for more details
-     * @param  Connector|null       $connector Instance of \PhpConsole\Connector class (optional)
-     * @throws \RuntimeException
-     */
-    public function __construct(array $options = [], ?Connector $connector = null, $level = Logger::DEBUG, bool $bubble = true)
-    {
-        if (!class_exists('PhpConsole\Connector')) {
-            throw new \RuntimeException('PHP Console library not found. See https://github.com/barbushin/php-console#installation');
-        }
-        parent::__construct($level, $bubble);
-        $this->options = $this->initOptions($options);
-        $this->connector = $this->initConnector($connector);
-    }
-
-    /**
-     * @param array<string, mixed> $options
-     *
-     * @return array<string, mixed>
-     */
-    private function initOptions(array $options): array
-    {
-        $wrongOptions = array_diff(array_keys($options), array_keys($this->options));
-        if ($wrongOptions) {
-            throw new \RuntimeException('Unknown options: ' . implode(', ', $wrongOptions));
-        }
-
-        return array_replace($this->options, $options);
-    }
-
-    private function initConnector(?Connector $connector = null): Connector
-    {
-        if (!$connector) {
-            if ($this->options['dataStorage']) {
-                Connector::setPostponeStorage($this->options['dataStorage']);
-            }
-            $connector = Connector::getInstance();
-        }
-
-        if ($this->options['registerHelper'] && !Helper::isRegistered()) {
-            Helper::register();
-        }
-
-        if ($this->options['enabled'] && $connector->isActiveClient()) {
-            if ($this->options['useOwnErrorsHandler'] || $this->options['useOwnExceptionsHandler']) {
-                $handler = VendorPhpConsoleHandler::getInstance();
-                $handler->setHandleErrors($this->options['useOwnErrorsHandler']);
-                $handler->setHandleExceptions($this->options['useOwnExceptionsHandler']);
-                $handler->start();
-            }
-            if ($this->options['sourcesBasePath']) {
-                $connector->setSourcesBasePath($this->options['sourcesBasePath']);
-            }
-            if ($this->options['serverEncoding']) {
-                $connector->setServerEncoding($this->options['serverEncoding']);
-            }
-            if ($this->options['password']) {
-                $connector->setPassword($this->options['password']);
-            }
-            if ($this->options['enableSslOnlyMode']) {
-                $connector->enableSslOnlyMode();
-            }
-            if ($this->options['ipMasks']) {
-                $connector->setAllowedIpMasks($this->options['ipMasks']);
-            }
-            if ($this->options['headersLimit']) {
-                $connector->setHeadersLimit($this->options['headersLimit']);
-            }
-            if ($this->options['detectDumpTraceAndSource']) {
-                $connector->getDebugDispatcher()->detectTraceAndSource = true;
-            }
-            $dumper = $connector->getDumper();
-            $dumper->levelLimit = $this->options['dumperLevelLimit'];
-            $dumper->itemsCountLimit = $this->options['dumperItemsCountLimit'];
-            $dumper->itemSizeLimit = $this->options['dumperItemSizeLimit'];
-            $dumper->dumpSizeLimit = $this->options['dumperDumpSizeLimit'];
-            $dumper->detectCallbacks = $this->options['dumperDetectCallbacks'];
-            if ($this->options['enableEvalListener']) {
-                $connector->startEvalRequestsListener();
-            }
-        }
-
-        return $connector;
-    }
-
-    public function getConnector(): Connector
-    {
-        return $this->connector;
-    }
-
-    /**
-     * @return array<string, mixed>
-     */
-    public function getOptions(): array
-    {
-        return $this->options;
-    }
-
-    public function handle(array $record): bool
-    {
-        if ($this->options['enabled'] && $this->connector->isActiveClient()) {
-            return parent::handle($record);
-        }
-
-        return !$this->bubble;
-    }
-
-    /**
-     * Writes the record down to the log of the implementing handler
-     */
-    protected function write(array $record): void
-    {
-        if ($record['level'] < Logger::NOTICE) {
-            $this->handleDebugRecord($record);
-        } elseif (isset($record['context']['exception']) && $record['context']['exception'] instanceof \Throwable) {
-            $this->handleExceptionRecord($record);
-        } else {
-            $this->handleErrorRecord($record);
-        }
-    }
-
-    /**
-     * @phpstan-param Record $record
-     */
-    private function handleDebugRecord(array $record): void
-    {
-        $tags = $this->getRecordTags($record);
-        $message = $record['message'];
-        if ($record['context']) {
-            $message .= ' ' . Utils::jsonEncode($this->connector->getDumper()->dump(array_filter($record['context'])), null, true);
-        }
-        $this->connector->getDebugDispatcher()->dispatchDebug($message, $tags, $this->options['classesPartialsTraceIgnore']);
-    }
-
-    /**
-     * @phpstan-param Record $record
-     */
-    private function handleExceptionRecord(array $record): void
-    {
-        $this->connector->getErrorsDispatcher()->dispatchException($record['context']['exception']);
-    }
-
-    /**
-     * @phpstan-param Record $record
-     */
-    private function handleErrorRecord(array $record): void
-    {
-        $context = $record['context'];
-
-        $this->connector->getErrorsDispatcher()->dispatchError(
-            $context['code'] ?? null,
-            $context['message'] ?? $record['message'],
-            $context['file'] ?? null,
-            $context['line'] ?? null,
-            $this->options['classesPartialsTraceIgnore']
-        );
-    }
-
-    /**
-     * @phpstan-param Record $record
-     * @return string
-     */
-    private function getRecordTags(array &$record)
-    {
-        $tags = null;
-        if (!empty($record['context'])) {
-            $context = & $record['context'];
-            foreach ($this->options['debugTagsKeysInContext'] as $key) {
-                if (!empty($context[$key])) {
-                    $tags = $context[$key];
-                    if ($key === 0) {
-                        array_shift($context);
-                    } else {
-                        unset($context[$key]);
-                    }
-                    break;
-                }
-            }
-        }
-
-        return $tags ?: strtolower($record['level_name']);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function getDefaultFormatter(): FormatterInterface
-    {
-        return new LineFormatter('%message%');
-    }
-}
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/Handler/ProcessHandler.php b/monolog/vendor/monolog/monolog/src/Monolog/Handler/ProcessHandler.php
deleted file mode 100644
index 8a8cf1be..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/Handler/ProcessHandler.php
+++ /dev/null
@@ -1,191 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\Logger;
-
-/**
- * Stores to STDIN of any process, specified by a command.
- *
- * Usage example:
- * <pre>
- * $log = new Logger('myLogger');
- * $log->pushHandler(new ProcessHandler('/usr/bin/php /var/www/monolog/someScript.php'));
- * </pre>
- *
- * @author Kolja Zuelsdorf <koljaz@web.de>
- */
-class ProcessHandler extends AbstractProcessingHandler
-{
-    /**
-     * Holds the process to receive data on its STDIN.
-     *
-     * @var resource|bool|null
-     */
-    private $process;
-
-    /**
-     * @var string
-     */
-    private $command;
-
-    /**
-     * @var string|null
-     */
-    private $cwd;
-
-    /**
-     * @var resource[]
-     */
-    private $pipes = [];
-
-    /**
-     * @var array<int, string[]>
-     */
-    protected const DESCRIPTOR_SPEC = [
-        0 => ['pipe', 'r'],  // STDIN is a pipe that the child will read from
-        1 => ['pipe', 'w'],  // STDOUT is a pipe that the child will write to
-        2 => ['pipe', 'w'],  // STDERR is a pipe to catch the any errors
-    ];
-
-    /**
-     * @param  string                    $command Command for the process to start. Absolute paths are recommended,
-     *                                            especially if you do not use the $cwd parameter.
-     * @param  string|null               $cwd     "Current working directory" (CWD) for the process to be executed in.
-     * @throws \InvalidArgumentException
-     */
-    public function __construct(string $command, $level = Logger::DEBUG, bool $bubble = true, ?string $cwd = null)
-    {
-        if ($command === '') {
-            throw new \InvalidArgumentException('The command argument must be a non-empty string.');
-        }
-        if ($cwd === '') {
-            throw new \InvalidArgumentException('The optional CWD argument must be a non-empty string or null.');
-        }
-
-        parent::__construct($level, $bubble);
-
-        $this->command = $command;
-        $this->cwd = $cwd;
-    }
-
-    /**
-     * Writes the record down to the log of the implementing handler
-     *
-     * @throws \UnexpectedValueException
-     */
-    protected function write(array $record): void
-    {
-        $this->ensureProcessIsStarted();
-
-        $this->writeProcessInput($record['formatted']);
-
-        $errors = $this->readProcessErrors();
-        if (empty($errors) === false) {
-            throw new \UnexpectedValueException(sprintf('Errors while writing to process: %s', $errors));
-        }
-    }
-
-    /**
-     * Makes sure that the process is actually started, and if not, starts it,
-     * assigns the stream pipes, and handles startup errors, if any.
-     */
-    private function ensureProcessIsStarted(): void
-    {
-        if (is_resource($this->process) === false) {
-            $this->startProcess();
-
-            $this->handleStartupErrors();
-        }
-    }
-
-    /**
-     * Starts the actual process and sets all streams to non-blocking.
-     */
-    private function startProcess(): void
-    {
-        $this->process = proc_open($this->command, static::DESCRIPTOR_SPEC, $this->pipes, $this->cwd);
-
-        foreach ($this->pipes as $pipe) {
-            stream_set_blocking($pipe, false);
-        }
-    }
-
-    /**
-     * Selects the STDERR stream, handles upcoming startup errors, and throws an exception, if any.
-     *
-     * @throws \UnexpectedValueException
-     */
-    private function handleStartupErrors(): void
-    {
-        $selected = $this->selectErrorStream();
-        if (false === $selected) {
-            throw new \UnexpectedValueException('Something went wrong while selecting a stream.');
-        }
-
-        $errors = $this->readProcessErrors();
-
-        if (is_resource($this->process) === false || empty($errors) === false) {
-            throw new \UnexpectedValueException(
-                sprintf('The process "%s" could not be opened: ' . $errors, $this->command)
-            );
-        }
-    }
-
-    /**
-     * Selects the STDERR stream.
-     *
-     * @return int|bool
-     */
-    protected function selectErrorStream()
-    {
-        $empty = [];
-        $errorPipes = [$this->pipes[2]];
-
-        return stream_select($errorPipes, $empty, $empty, 1);
-    }
-
-    /**
-     * Reads the errors of the process, if there are any.
-     *
-     * @codeCoverageIgnore
-     * @return string Empty string if there are no errors.
-     */
-    protected function readProcessErrors(): string
-    {
-        return (string) stream_get_contents($this->pipes[2]);
-    }
-
-    /**
-     * Writes to the input stream of the opened process.
-     *
-     * @codeCoverageIgnore
-     */
-    protected function writeProcessInput(string $string): void
-    {
-        fwrite($this->pipes[0], $string);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function close(): void
-    {
-        if (is_resource($this->process)) {
-            foreach ($this->pipes as $pipe) {
-                fclose($pipe);
-            }
-            proc_close($this->process);
-            $this->process = null;
-        }
-    }
-}
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/Handler/ProcessableHandlerInterface.php b/monolog/vendor/monolog/monolog/src/Monolog/Handler/ProcessableHandlerInterface.php
deleted file mode 100644
index 3adec7a4..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/Handler/ProcessableHandlerInterface.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\Processor\ProcessorInterface;
-
-/**
- * Interface to describe loggers that have processors
- *
- * @author Jordi Boggiano <j.boggiano@seld.be>
- *
- * @phpstan-import-type Record from \Monolog\Logger
- */
-interface ProcessableHandlerInterface
-{
-    /**
-     * Adds a processor in the stack.
-     *
-     * @psalm-param ProcessorInterface|callable(Record): Record $callback
-     *
-     * @param  ProcessorInterface|callable $callback
-     * @return HandlerInterface            self
-     */
-    public function pushProcessor(callable $callback): HandlerInterface;
-
-    /**
-     * Removes the processor on top of the stack and returns it.
-     *
-     * @psalm-return ProcessorInterface|callable(Record): Record $callback
-     *
-     * @throws \LogicException             In case the processor stack is empty
-     * @return callable|ProcessorInterface
-     */
-    public function popProcessor(): callable;
-}
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/Handler/ProcessableHandlerTrait.php b/monolog/vendor/monolog/monolog/src/Monolog/Handler/ProcessableHandlerTrait.php
deleted file mode 100644
index 9ef6e301..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/Handler/ProcessableHandlerTrait.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\ResettableInterface;
-use Monolog\Processor\ProcessorInterface;
-
-/**
- * Helper trait for implementing ProcessableInterface
- *
- * @author Jordi Boggiano <j.boggiano@seld.be>
- *
- * @phpstan-import-type Record from \Monolog\Logger
- */
-trait ProcessableHandlerTrait
-{
-    /**
-     * @var callable[]
-     * @phpstan-var array<ProcessorInterface|callable(Record): Record>
-     */
-    protected $processors = [];
-
-    /**
-     * {@inheritDoc}
-     */
-    public function pushProcessor(callable $callback): HandlerInterface
-    {
-        array_unshift($this->processors, $callback);
-
-        return $this;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function popProcessor(): callable
-    {
-        if (!$this->processors) {
-            throw new \LogicException('You tried to pop from an empty processor stack.');
-        }
-
-        return array_shift($this->processors);
-    }
-
-    /**
-     * Processes a record.
-     *
-     * @phpstan-param  Record $record
-     * @phpstan-return Record
-     */
-    protected function processRecord(array $record): array
-    {
-        foreach ($this->processors as $processor) {
-            $record = $processor($record);
-        }
-
-        return $record;
-    }
-
-    protected function resetProcessors(): void
-    {
-        foreach ($this->processors as $processor) {
-            if ($processor instanceof ResettableInterface) {
-                $processor->reset();
-            }
-        }
-    }
-}
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/Handler/PsrHandler.php b/monolog/vendor/monolog/monolog/src/Monolog/Handler/PsrHandler.php
deleted file mode 100644
index 36e19ccc..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/Handler/PsrHandler.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\Logger;
-use Psr\Log\LoggerInterface;
-use Monolog\Formatter\FormatterInterface;
-
-/**
- * Proxies log messages to an existing PSR-3 compliant logger.
- *
- * If a formatter is configured, the formatter's output MUST be a string and the
- * formatted message will be fed to the wrapped PSR logger instead of the original
- * log record's message.
- *
- * @author Michael Moussa <michael.moussa@gmail.com>
- */
-class PsrHandler extends AbstractHandler implements FormattableHandlerInterface
-{
-    /**
-     * PSR-3 compliant logger
-     *
-     * @var LoggerInterface
-     */
-    protected $logger;
-
-    /**
-     * @var FormatterInterface|null
-     */
-    protected $formatter;
-
-    /**
-     * @param LoggerInterface $logger The underlying PSR-3 compliant logger to which messages will be proxied
-     */
-    public function __construct(LoggerInterface $logger, $level = Logger::DEBUG, bool $bubble = true)
-    {
-        parent::__construct($level, $bubble);
-
-        $this->logger = $logger;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function handle(array $record): bool
-    {
-        if (!$this->isHandling($record)) {
-            return false;
-        }
-
-        if ($this->formatter) {
-            $formatted = $this->formatter->format($record);
-            $this->logger->log(strtolower($record['level_name']), (string) $formatted, $record['context']);
-        } else {
-            $this->logger->log(strtolower($record['level_name']), $record['message'], $record['context']);
-        }
-
-        return false === $this->bubble;
-    }
-
-    /**
-     * Sets the formatter.
-     *
-     * @param FormatterInterface $formatter
-     */
-    public function setFormatter(FormatterInterface $formatter): HandlerInterface
-    {
-        $this->formatter = $formatter;
-
-        return $this;
-    }
-
-    /**
-     * Gets the formatter.
-     *
-     * @return FormatterInterface
-     */
-    public function getFormatter(): FormatterInterface
-    {
-        if (!$this->formatter) {
-            throw new \LogicException('No formatter has been set and this handler does not have a default formatter');
-        }
-
-        return $this->formatter;
-    }
-}
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/Handler/PushoverHandler.php b/monolog/vendor/monolog/monolog/src/Monolog/Handler/PushoverHandler.php
deleted file mode 100644
index fed2303d..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/Handler/PushoverHandler.php
+++ /dev/null
@@ -1,246 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\Logger;
-use Monolog\Utils;
-use Psr\Log\LogLevel;
-
-/**
- * Sends notifications through the pushover api to mobile phones
- *
- * @author Sebastian Göttschkes <sebastian.goettschkes@googlemail.com>
- * @see    https://www.pushover.net/api
- *
- * @phpstan-import-type FormattedRecord from AbstractProcessingHandler
- * @phpstan-import-type Level from \Monolog\Logger
- * @phpstan-import-type LevelName from \Monolog\Logger
- */
-class PushoverHandler extends SocketHandler
-{
-    /** @var string */
-    private $token;
-    /** @var array<int|string> */
-    private $users;
-    /** @var string */
-    private $title;
-    /** @var string|int|null */
-    private $user = null;
-    /** @var int */
-    private $retry;
-    /** @var int */
-    private $expire;
-
-    /** @var int */
-    private $highPriorityLevel;
-    /** @var int */
-    private $emergencyLevel;
-    /** @var bool */
-    private $useFormattedMessage = false;
-
-    /**
-     * All parameters that can be sent to Pushover
-     * @see https://pushover.net/api
-     * @var array<string, bool>
-     */
-    private $parameterNames = [
-        'token' => true,
-        'user' => true,
-        'message' => true,
-        'device' => true,
-        'title' => true,
-        'url' => true,
-        'url_title' => true,
-        'priority' => true,
-        'timestamp' => true,
-        'sound' => true,
-        'retry' => true,
-        'expire' => true,
-        'callback' => true,
-    ];
-
-    /**
-     * Sounds the api supports by default
-     * @see https://pushover.net/api#sounds
-     * @var string[]
-     */
-    private $sounds = [
-        'pushover', 'bike', 'bugle', 'cashregister', 'classical', 'cosmic', 'falling', 'gamelan', 'incoming',
-        'intermission', 'magic', 'mechanical', 'pianobar', 'siren', 'spacealarm', 'tugboat', 'alien', 'climb',
-        'persistent', 'echo', 'updown', 'none',
-    ];
-
-    /**
-     * @param string       $token             Pushover api token
-     * @param string|array $users             Pushover user id or array of ids the message will be sent to
-     * @param string|null  $title             Title sent to the Pushover API
-     * @param bool         $useSSL            Whether to connect via SSL. Required when pushing messages to users that are not
-     *                                        the pushover.net app owner. OpenSSL is required for this option.
-     * @param string|int   $highPriorityLevel The minimum logging level at which this handler will start
-     *                                        sending "high priority" requests to the Pushover API
-     * @param string|int   $emergencyLevel    The minimum logging level at which this handler will start
-     *                                        sending "emergency" requests to the Pushover API
-     * @param int          $retry             The retry parameter specifies how often (in seconds) the Pushover servers will
-     *                                        send the same notification to the user.
-     * @param int          $expire            The expire parameter specifies how many seconds your notification will continue
-     *                                        to be retried for (every retry seconds).
-     *
-     * @phpstan-param string|array<int|string>    $users
-     * @phpstan-param Level|LevelName|LogLevel::* $highPriorityLevel
-     * @phpstan-param Level|LevelName|LogLevel::* $emergencyLevel
-     */
-    public function __construct(
-        string $token,
-        $users,
-        ?string $title = null,
-        $level = Logger::CRITICAL,
-        bool $bubble = true,
-        bool $useSSL = true,
-        $highPriorityLevel = Logger::CRITICAL,
-        $emergencyLevel = Logger::EMERGENCY,
-        int $retry = 30,
-        int $expire = 25200,
-        bool $persistent = false,
-        float $timeout = 0.0,
-        float $writingTimeout = 10.0,
-        ?float $connectionTimeout = null,
-        ?int $chunkSize = null
-    ) {
-        $connectionString = $useSSL ? 'ssl://api.pushover.net:443' : 'api.pushover.net:80';
-        parent::__construct(
-            $connectionString,
-            $level,
-            $bubble,
-            $persistent,
-            $timeout,
-            $writingTimeout,
-            $connectionTimeout,
-            $chunkSize
-        );
-
-        $this->token = $token;
-        $this->users = (array) $users;
-        $this->title = $title ?: (string) gethostname();
-        $this->highPriorityLevel = Logger::toMonologLevel($highPriorityLevel);
-        $this->emergencyLevel = Logger::toMonologLevel($emergencyLevel);
-        $this->retry = $retry;
-        $this->expire = $expire;
-    }
-
-    protected function generateDataStream(array $record): string
-    {
-        $content = $this->buildContent($record);
-
-        return $this->buildHeader($content) . $content;
-    }
-
-    /**
-     * @phpstan-param FormattedRecord $record
-     */
-    private function buildContent(array $record): string
-    {
-        // Pushover has a limit of 512 characters on title and message combined.
-        $maxMessageLength = 512 - strlen($this->title);
-
-        $message = ($this->useFormattedMessage) ? $record['formatted'] : $record['message'];
-        $message = Utils::substr($message, 0, $maxMessageLength);
-
-        $timestamp = $record['datetime']->getTimestamp();
-
-        $dataArray = [
-            'token' => $this->token,
-            'user' => $this->user,
-            'message' => $message,
-            'title' => $this->title,
-            'timestamp' => $timestamp,
-        ];
-
-        if (isset($record['level']) && $record['level'] >= $this->emergencyLevel) {
-            $dataArray['priority'] = 2;
-            $dataArray['retry'] = $this->retry;
-            $dataArray['expire'] = $this->expire;
-        } elseif (isset($record['level']) && $record['level'] >= $this->highPriorityLevel) {
-            $dataArray['priority'] = 1;
-        }
-
-        // First determine the available parameters
-        $context = array_intersect_key($record['context'], $this->parameterNames);
-        $extra = array_intersect_key($record['extra'], $this->parameterNames);
-
-        // Least important info should be merged with subsequent info
-        $dataArray = array_merge($extra, $context, $dataArray);
-
-        // Only pass sounds that are supported by the API
-        if (isset($dataArray['sound']) && !in_array($dataArray['sound'], $this->sounds)) {
-            unset($dataArray['sound']);
-        }
-
-        return http_build_query($dataArray);
-    }
-
-    private function buildHeader(string $content): string
-    {
-        $header = "POST /1/messages.json HTTP/1.1\r\n";
-        $header .= "Host: api.pushover.net\r\n";
-        $header .= "Content-Type: application/x-www-form-urlencoded\r\n";
-        $header .= "Content-Length: " . strlen($content) . "\r\n";
-        $header .= "\r\n";
-
-        return $header;
-    }
-
-    protected function write(array $record): void
-    {
-        foreach ($this->users as $user) {
-            $this->user = $user;
-
-            parent::write($record);
-            $this->closeSocket();
-        }
-
-        $this->user = null;
-    }
-
-    /**
-     * @param int|string $value
-     *
-     * @phpstan-param Level|LevelName|LogLevel::* $value
-     */
-    public function setHighPriorityLevel($value): self
-    {
-        $this->highPriorityLevel = Logger::toMonologLevel($value);
-
-        return $this;
-    }
-
-    /**
-     * @param int|string $value
-     *
-     * @phpstan-param Level|LevelName|LogLevel::* $value
-     */
-    public function setEmergencyLevel($value): self
-    {
-        $this->emergencyLevel = Logger::toMonologLevel($value);
-
-        return $this;
-    }
-
-    /**
-     * Use the formatted message?
-     */
-    public function useFormattedMessage(bool $value): self
-    {
-        $this->useFormattedMessage = $value;
-
-        return $this;
-    }
-}
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/Handler/RedisHandler.php b/monolog/vendor/monolog/monolog/src/Monolog/Handler/RedisHandler.php
deleted file mode 100644
index 91d16eaf..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/Handler/RedisHandler.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\Formatter\LineFormatter;
-use Monolog\Formatter\FormatterInterface;
-use Monolog\Logger;
-
-/**
- * Logs to a Redis key using rpush
- *
- * usage example:
- *
- *   $log = new Logger('application');
- *   $redis = new RedisHandler(new Predis\Client("tcp://localhost:6379"), "logs", "prod");
- *   $log->pushHandler($redis);
- *
- * @author Thomas Tourlourat <thomas@tourlourat.com>
- *
- * @phpstan-import-type FormattedRecord from AbstractProcessingHandler
- */
-class RedisHandler extends AbstractProcessingHandler
-{
-    /** @var \Predis\Client<\Predis\Client>|\Redis */
-    private $redisClient;
-    /** @var string */
-    private $redisKey;
-    /** @var int */
-    protected $capSize;
-
-    /**
-     * @param \Predis\Client<\Predis\Client>|\Redis $redis   The redis instance
-     * @param string                $key     The key name to push records to
-     * @param int                   $capSize Number of entries to limit list size to, 0 = unlimited
-     */
-    public function __construct($redis, string $key, $level = Logger::DEBUG, bool $bubble = true, int $capSize = 0)
-    {
-        if (!(($redis instanceof \Predis\Client) || ($redis instanceof \Redis))) {
-            throw new \InvalidArgumentException('Predis\Client or Redis instance required');
-        }
-
-        $this->redisClient = $redis;
-        $this->redisKey = $key;
-        $this->capSize = $capSize;
-
-        parent::__construct($level, $bubble);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function write(array $record): void
-    {
-        if ($this->capSize) {
-            $this->writeCapped($record);
-        } else {
-            $this->redisClient->rpush($this->redisKey, $record["formatted"]);
-        }
-    }
-
-    /**
-     * Write and cap the collection
-     * Writes the record to the redis list and caps its
-     *
-     * @phpstan-param FormattedRecord $record
-     */
-    protected function writeCapped(array $record): void
-    {
-        if ($this->redisClient instanceof \Redis) {
-            $mode = defined('\Redis::MULTI') ? \Redis::MULTI : 1;
-            $this->redisClient->multi($mode)
-                ->rpush($this->redisKey, $record["formatted"])
-                ->ltrim($this->redisKey, -$this->capSize, -1)
-                ->exec();
-        } else {
-            $redisKey = $this->redisKey;
-            $capSize = $this->capSize;
-            $this->redisClient->transaction(function ($tx) use ($record, $redisKey, $capSize) {
-                $tx->rpush($redisKey, $record["formatted"]);
-                $tx->ltrim($redisKey, -$capSize, -1);
-            });
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function getDefaultFormatter(): FormatterInterface
-    {
-        return new LineFormatter();
-    }
-}
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/Handler/RedisPubSubHandler.php b/monolog/vendor/monolog/monolog/src/Monolog/Handler/RedisPubSubHandler.php
deleted file mode 100644
index 7789309c..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/Handler/RedisPubSubHandler.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\Formatter\LineFormatter;
-use Monolog\Formatter\FormatterInterface;
-use Monolog\Logger;
-
-/**
- * Sends the message to a Redis Pub/Sub channel using PUBLISH
- *
- * usage example:
- *
- *   $log = new Logger('application');
- *   $redis = new RedisPubSubHandler(new Predis\Client("tcp://localhost:6379"), "logs", Logger::WARNING);
- *   $log->pushHandler($redis);
- *
- * @author Gaëtan Faugère <gaetan@fauge.re>
- */
-class RedisPubSubHandler extends AbstractProcessingHandler
-{
-    /** @var \Predis\Client<\Predis\Client>|\Redis */
-    private $redisClient;
-    /** @var string */
-    private $channelKey;
-
-    /**
-     * @param \Predis\Client<\Predis\Client>|\Redis $redis The redis instance
-     * @param string                $key   The channel key to publish records to
-     */
-    public function __construct($redis, string $key, $level = Logger::DEBUG, bool $bubble = true)
-    {
-        if (!(($redis instanceof \Predis\Client) || ($redis instanceof \Redis))) {
-            throw new \InvalidArgumentException('Predis\Client or Redis instance required');
-        }
-
-        $this->redisClient = $redis;
-        $this->channelKey = $key;
-
-        parent::__construct($level, $bubble);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function write(array $record): void
-    {
-        $this->redisClient->publish($this->channelKey, $record["formatted"]);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function getDefaultFormatter(): FormatterInterface
-    {
-        return new LineFormatter();
-    }
-}
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/Handler/RollbarHandler.php b/monolog/vendor/monolog/monolog/src/Monolog/Handler/RollbarHandler.php
deleted file mode 100644
index adcc9395..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/Handler/RollbarHandler.php
+++ /dev/null
@@ -1,131 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Rollbar\RollbarLogger;
-use Throwable;
-use Monolog\Logger;
-
-/**
- * Sends errors to Rollbar
- *
- * If the context data contains a `payload` key, that is used as an array
- * of payload options to RollbarLogger's log method.
- *
- * Rollbar's context info will contain the context + extra keys from the log record
- * merged, and then on top of that a few keys:
- *
- *  - level (rollbar level name)
- *  - monolog_level (monolog level name, raw level, as rollbar only has 5 but monolog 8)
- *  - channel
- *  - datetime (unix timestamp)
- *
- * @author Paul Statezny <paulstatezny@gmail.com>
- */
-class RollbarHandler extends AbstractProcessingHandler
-{
-    /**
-     * @var RollbarLogger
-     */
-    protected $rollbarLogger;
-
-    /** @var string[] */
-    protected $levelMap = [
-        Logger::DEBUG     => 'debug',
-        Logger::INFO      => 'info',
-        Logger::NOTICE    => 'info',
-        Logger::WARNING   => 'warning',
-        Logger::ERROR     => 'error',
-        Logger::CRITICAL  => 'critical',
-        Logger::ALERT     => 'critical',
-        Logger::EMERGENCY => 'critical',
-    ];
-
-    /**
-     * Records whether any log records have been added since the last flush of the rollbar notifier
-     *
-     * @var bool
-     */
-    private $hasRecords = false;
-
-    /** @var bool */
-    protected $initialized = false;
-
-    /**
-     * @param RollbarLogger $rollbarLogger RollbarLogger object constructed with valid token
-     */
-    public function __construct(RollbarLogger $rollbarLogger, $level = Logger::ERROR, bool $bubble = true)
-    {
-        $this->rollbarLogger = $rollbarLogger;
-
-        parent::__construct($level, $bubble);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function write(array $record): void
-    {
-        if (!$this->initialized) {
-            // __destructor() doesn't get called on Fatal errors
-            register_shutdown_function(array($this, 'close'));
-            $this->initialized = true;
-        }
-
-        $context = $record['context'];
-        $context = array_merge($context, $record['extra'], [
-            'level' => $this->levelMap[$record['level']],
-            'monolog_level' => $record['level_name'],
-            'channel' => $record['channel'],
-            'datetime' => $record['datetime']->format('U'),
-        ]);
-
-        if (isset($context['exception']) && $context['exception'] instanceof Throwable) {
-            $exception = $context['exception'];
-            unset($context['exception']);
-            $toLog = $exception;
-        } else {
-            $toLog = $record['message'];
-        }
-
-        // @phpstan-ignore-next-line
-        $this->rollbarLogger->log($context['level'], $toLog, $context);
-
-        $this->hasRecords = true;
-    }
-
-    public function flush(): void
-    {
-        if ($this->hasRecords) {
-            $this->rollbarLogger->flush();
-            $this->hasRecords = false;
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function close(): void
-    {
-        $this->flush();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function reset()
-    {
-        $this->flush();
-
-        parent::reset();
-    }
-}
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/Handler/RotatingFileHandler.php b/monolog/vendor/monolog/monolog/src/Monolog/Handler/RotatingFileHandler.php
deleted file mode 100644
index 17745d22..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/Handler/RotatingFileHandler.php
+++ /dev/null
@@ -1,207 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use InvalidArgumentException;
-use Monolog\Logger;
-use Monolog\Utils;
-
-/**
- * Stores logs to files that are rotated every day and a limited number of files are kept.
- *
- * This rotation is only intended to be used as a workaround. Using logrotate to
- * handle the rotation is strongly encouraged when you can use it.
- *
- * @author Christophe Coevoet <stof@notk.org>
- * @author Jordi Boggiano <j.boggiano@seld.be>
- */
-class RotatingFileHandler extends StreamHandler
-{
-    public const FILE_PER_DAY = 'Y-m-d';
-    public const FILE_PER_MONTH = 'Y-m';
-    public const FILE_PER_YEAR = 'Y';
-
-    /** @var string */
-    protected $filename;
-    /** @var int */
-    protected $maxFiles;
-    /** @var bool */
-    protected $mustRotate;
-    /** @var \DateTimeImmutable */
-    protected $nextRotation;
-    /** @var string */
-    protected $filenameFormat;
-    /** @var string */
-    protected $dateFormat;
-
-    /**
-     * @param string     $filename
-     * @param int        $maxFiles       The maximal amount of files to keep (0 means unlimited)
-     * @param int|null   $filePermission Optional file permissions (default (0644) are only for owner read/write)
-     * @param bool       $useLocking     Try to lock log file before doing any writes
-     */
-    public function __construct(string $filename, int $maxFiles = 0, $level = Logger::DEBUG, bool $bubble = true, ?int $filePermission = null, bool $useLocking = false)
-    {
-        $this->filename = Utils::canonicalizePath($filename);
-        $this->maxFiles = $maxFiles;
-        $this->nextRotation = new \DateTimeImmutable('tomorrow');
-        $this->filenameFormat = '{filename}-{date}';
-        $this->dateFormat = static::FILE_PER_DAY;
-
-        parent::__construct($this->getTimedFilename(), $level, $bubble, $filePermission, $useLocking);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function close(): void
-    {
-        parent::close();
-
-        if (true === $this->mustRotate) {
-            $this->rotate();
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function reset()
-    {
-        parent::reset();
-
-        if (true === $this->mustRotate) {
-            $this->rotate();
-        }
-    }
-
-    public function setFilenameFormat(string $filenameFormat, string $dateFormat): self
-    {
-        if (!preg_match('{^[Yy](([/_.-]?m)([/_.-]?d)?)?$}', $dateFormat)) {
-            throw new InvalidArgumentException(
-                'Invalid date format - format must be one of '.
-                'RotatingFileHandler::FILE_PER_DAY ("Y-m-d"), RotatingFileHandler::FILE_PER_MONTH ("Y-m") '.
-                'or RotatingFileHandler::FILE_PER_YEAR ("Y"), or you can set one of the '.
-                'date formats using slashes, underscores and/or dots instead of dashes.'
-            );
-        }
-        if (substr_count($filenameFormat, '{date}') === 0) {
-            throw new InvalidArgumentException(
-                'Invalid filename format - format must contain at least `{date}`, because otherwise rotating is impossible.'
-            );
-        }
-        $this->filenameFormat = $filenameFormat;
-        $this->dateFormat = $dateFormat;
-        $this->url = $this->getTimedFilename();
-        $this->close();
-
-        return $this;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function write(array $record): void
-    {
-        // on the first record written, if the log is new, we should rotate (once per day)
-        if (null === $this->mustRotate) {
-            $this->mustRotate = null === $this->url || !file_exists($this->url);
-        }
-
-        if ($this->nextRotation <= $record['datetime']) {
-            $this->mustRotate = true;
-            $this->close();
-        }
-
-        parent::write($record);
-    }
-
-    /**
-     * Rotates the files.
-     */
-    protected function rotate(): void
-    {
-        // update filename
-        $this->url = $this->getTimedFilename();
-        $this->nextRotation = new \DateTimeImmutable('tomorrow');
-
-        // skip GC of old logs if files are unlimited
-        if (0 === $this->maxFiles) {
-            return;
-        }
-
-        $logFiles = glob($this->getGlobPattern());
-        if (false === $logFiles) {
-            // failed to glob
-            return;
-        }
-
-        if ($this->maxFiles >= count($logFiles)) {
-            // no files to remove
-            return;
-        }
-
-        // Sorting the files by name to remove the older ones
-        usort($logFiles, function ($a, $b) {
-            return strcmp($b, $a);
-        });
-
-        foreach (array_slice($logFiles, $this->maxFiles) as $file) {
-            if (is_writable($file)) {
-                // suppress errors here as unlink() might fail if two processes
-                // are cleaning up/rotating at the same time
-                set_error_handler(function (int $errno, string $errstr, string $errfile, int $errline): bool {
-                    return false;
-                });
-                unlink($file);
-                restore_error_handler();
-            }
-        }
-
-        $this->mustRotate = false;
-    }
-
-    protected function getTimedFilename(): string
-    {
-        $fileInfo = pathinfo($this->filename);
-        $timedFilename = str_replace(
-            ['{filename}', '{date}'],
-            [$fileInfo['filename'], date($this->dateFormat)],
-            $fileInfo['dirname'] . '/' . $this->filenameFormat
-        );
-
-        if (isset($fileInfo['extension'])) {
-            $timedFilename .= '.'.$fileInfo['extension'];
-        }
-
-        return $timedFilename;
-    }
-
-    protected function getGlobPattern(): string
-    {
-        $fileInfo = pathinfo($this->filename);
-        $glob = str_replace(
-            ['{filename}', '{date}'],
-            [$fileInfo['filename'], str_replace(
-                ['Y', 'y', 'm', 'd'],
-                ['[0-9][0-9][0-9][0-9]', '[0-9][0-9]', '[0-9][0-9]', '[0-9][0-9]'],
-                $this->dateFormat)
-            ],
-            $fileInfo['dirname'] . '/' . $this->filenameFormat
-        );
-        if (isset($fileInfo['extension'])) {
-            $glob .= '.'.$fileInfo['extension'];
-        }
-
-        return $glob;
-    }
-}
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/Handler/SamplingHandler.php b/monolog/vendor/monolog/monolog/src/Monolog/Handler/SamplingHandler.php
deleted file mode 100644
index c128a32d..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/Handler/SamplingHandler.php
+++ /dev/null
@@ -1,132 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\Formatter\FormatterInterface;
-
-/**
- * Sampling handler
- *
- * A sampled event stream can be useful for logging high frequency events in
- * a production environment where you only need an idea of what is happening
- * and are not concerned with capturing every occurrence. Since the decision to
- * handle or not handle a particular event is determined randomly, the
- * resulting sampled log is not guaranteed to contain 1/N of the events that
- * occurred in the application, but based on the Law of large numbers, it will
- * tend to be close to this ratio with a large number of attempts.
- *
- * @author Bryan Davis <bd808@wikimedia.org>
- * @author Kunal Mehta <legoktm@gmail.com>
- *
- * @phpstan-import-type Record from \Monolog\Logger
- * @phpstan-import-type Level from \Monolog\Logger
- */
-class SamplingHandler extends AbstractHandler implements ProcessableHandlerInterface, FormattableHandlerInterface
-{
-    use ProcessableHandlerTrait;
-
-    /**
-     * @var HandlerInterface|callable
-     * @phpstan-var HandlerInterface|callable(Record|array{level: Level}|null, HandlerInterface): HandlerInterface
-     */
-    protected $handler;
-
-    /**
-     * @var int $factor
-     */
-    protected $factor;
-
-    /**
-     * @psalm-param HandlerInterface|callable(Record|array{level: Level}|null, HandlerInterface): HandlerInterface $handler
-     *
-     * @param callable|HandlerInterface $handler Handler or factory callable($record|null, $samplingHandler).
-     * @param int                       $factor  Sample factor (e.g. 10 means every ~10th record is sampled)
-     */
-    public function __construct($handler, int $factor)
-    {
-        parent::__construct();
-        $this->handler = $handler;
-        $this->factor = $factor;
-
-        if (!$this->handler instanceof HandlerInterface && !is_callable($this->handler)) {
-            throw new \RuntimeException("The given handler (".json_encode($this->handler).") is not a callable nor a Monolog\Handler\HandlerInterface object");
-        }
-    }
-
-    public function isHandling(array $record): bool
-    {
-        return $this->getHandler($record)->isHandling($record);
-    }
-
-    public function handle(array $record): bool
-    {
-        if ($this->isHandling($record) && mt_rand(1, $this->factor) === 1) {
-            if ($this->processors) {
-                /** @var Record $record */
-                $record = $this->processRecord($record);
-            }
-
-            $this->getHandler($record)->handle($record);
-        }
-
-        return false === $this->bubble;
-    }
-
-    /**
-     * Return the nested handler
-     *
-     * If the handler was provided as a factory callable, this will trigger the handler's instantiation.
-     *
-     * @phpstan-param Record|array{level: Level}|null $record
-     *
-     * @return HandlerInterface
-     */
-    public function getHandler(array $record = null)
-    {
-        if (!$this->handler instanceof HandlerInterface) {
-            $this->handler = ($this->handler)($record, $this);
-            if (!$this->handler instanceof HandlerInterface) {
-                throw new \RuntimeException("The factory callable should return a HandlerInterface");
-            }
-        }
-
-        return $this->handler;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function setFormatter(FormatterInterface $formatter): HandlerInterface
-    {
-        $handler = $this->getHandler();
-        if ($handler instanceof FormattableHandlerInterface) {
-            $handler->setFormatter($formatter);
-
-            return $this;
-        }
-
-        throw new \UnexpectedValueException('The nested handler of type '.get_class($handler).' does not support formatters.');
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getFormatter(): FormatterInterface
-    {
-        $handler = $this->getHandler();
-        if ($handler instanceof FormattableHandlerInterface) {
-            return $handler->getFormatter();
-        }
-
-        throw new \UnexpectedValueException('The nested handler of type '.get_class($handler).' does not support formatters.');
-    }
-}
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/Handler/SendGridHandler.php b/monolog/vendor/monolog/monolog/src/Monolog/Handler/SendGridHandler.php
deleted file mode 100644
index 1280ee70..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/Handler/SendGridHandler.php
+++ /dev/null
@@ -1,102 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\Logger;
-
-/**
- * SendGridrHandler uses the SendGrid API v2 function to send Log emails, more information in https://sendgrid.com/docs/API_Reference/Web_API/mail.html
- *
- * @author Ricardo Fontanelli <ricardo.fontanelli@hotmail.com>
- */
-class SendGridHandler extends MailHandler
-{
-    /**
-     * The SendGrid API User
-     * @var string
-     */
-    protected $apiUser;
-
-    /**
-     * The SendGrid API Key
-     * @var string
-     */
-    protected $apiKey;
-
-    /**
-     * The email addresses to which the message will be sent
-     * @var string
-     */
-    protected $from;
-
-    /**
-     * The email addresses to which the message will be sent
-     * @var string[]
-     */
-    protected $to;
-
-    /**
-     * The subject of the email
-     * @var string
-     */
-    protected $subject;
-
-    /**
-     * @param string          $apiUser The SendGrid API User
-     * @param string          $apiKey  The SendGrid API Key
-     * @param string          $from    The sender of the email
-     * @param string|string[] $to      The recipients of the email
-     * @param string          $subject The subject of the mail
-     */
-    public function __construct(string $apiUser, string $apiKey, string $from, $to, string $subject, $level = Logger::ERROR, bool $bubble = true)
-    {
-        if (!extension_loaded('curl')) {
-            throw new MissingExtensionException('The curl extension is needed to use the SendGridHandler');
-        }
-
-        parent::__construct($level, $bubble);
-        $this->apiUser = $apiUser;
-        $this->apiKey = $apiKey;
-        $this->from = $from;
-        $this->to = (array) $to;
-        $this->subject = $subject;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function send(string $content, array $records): void
-    {
-        $message = [];
-        $message['api_user'] = $this->apiUser;
-        $message['api_key'] = $this->apiKey;
-        $message['from'] = $this->from;
-        foreach ($this->to as $recipient) {
-            $message['to[]'] = $recipient;
-        }
-        $message['subject'] = $this->subject;
-        $message['date'] = date('r');
-
-        if ($this->isHtmlBody($content)) {
-            $message['html'] = $content;
-        } else {
-            $message['text'] = $content;
-        }
-
-        $ch = curl_init();
-        curl_setopt($ch, CURLOPT_URL, 'https://api.sendgrid.com/api/mail.send.json');
-        curl_setopt($ch, CURLOPT_POST, 1);
-        curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-        curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query($message));
-        Curl\Util::execute($ch, 2);
-    }
-}
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/Handler/Slack/SlackRecord.php b/monolog/vendor/monolog/monolog/src/Monolog/Handler/Slack/SlackRecord.php
deleted file mode 100644
index 71a41094..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/Handler/Slack/SlackRecord.php
+++ /dev/null
@@ -1,387 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler\Slack;
-
-use Monolog\Logger;
-use Monolog\Utils;
-use Monolog\Formatter\NormalizerFormatter;
-use Monolog\Formatter\FormatterInterface;
-
-/**
- * Slack record utility helping to log to Slack webhooks or API.
- *
- * @author Greg Kedzierski <greg@gregkedzierski.com>
- * @author Haralan Dobrev <hkdobrev@gmail.com>
- * @see    https://api.slack.com/incoming-webhooks
- * @see    https://api.slack.com/docs/message-attachments
- *
- * @phpstan-import-type FormattedRecord from \Monolog\Handler\AbstractProcessingHandler
- * @phpstan-import-type Record from \Monolog\Logger
- */
-class SlackRecord
-{
-    public const COLOR_DANGER = 'danger';
-
-    public const COLOR_WARNING = 'warning';
-
-    public const COLOR_GOOD = 'good';
-
-    public const COLOR_DEFAULT = '#e3e4e6';
-
-    /**
-     * Slack channel (encoded ID or name)
-     * @var string|null
-     */
-    private $channel;
-
-    /**
-     * Name of a bot
-     * @var string|null
-     */
-    private $username;
-
-    /**
-     * User icon e.g. 'ghost', 'http://example.com/user.png'
-     * @var string|null
-     */
-    private $userIcon;
-
-    /**
-     * Whether the message should be added to Slack as attachment (plain text otherwise)
-     * @var bool
-     */
-    private $useAttachment;
-
-    /**
-     * Whether the the context/extra messages added to Slack as attachments are in a short style
-     * @var bool
-     */
-    private $useShortAttachment;
-
-    /**
-     * Whether the attachment should include context and extra data
-     * @var bool
-     */
-    private $includeContextAndExtra;
-
-    /**
-     * Dot separated list of fields to exclude from slack message. E.g. ['context.field1', 'extra.field2']
-     * @var string[]
-     */
-    private $excludeFields;
-
-    /**
-     * @var ?FormatterInterface
-     */
-    private $formatter;
-
-    /**
-     * @var NormalizerFormatter
-     */
-    private $normalizerFormatter;
-
-    /**
-     * @param string[] $excludeFields
-     */
-    public function __construct(
-        ?string $channel = null,
-        ?string $username = null,
-        bool $useAttachment = true,
-        ?string $userIcon = null,
-        bool $useShortAttachment = false,
-        bool $includeContextAndExtra = false,
-        array $excludeFields = array(),
-        FormatterInterface $formatter = null
-    ) {
-        $this
-            ->setChannel($channel)
-            ->setUsername($username)
-            ->useAttachment($useAttachment)
-            ->setUserIcon($userIcon)
-            ->useShortAttachment($useShortAttachment)
-            ->includeContextAndExtra($includeContextAndExtra)
-            ->excludeFields($excludeFields)
-            ->setFormatter($formatter);
-
-        if ($this->includeContextAndExtra) {
-            $this->normalizerFormatter = new NormalizerFormatter();
-        }
-    }
-
-    /**
-     * Returns required data in format that Slack
-     * is expecting.
-     *
-     * @phpstan-param FormattedRecord $record
-     * @phpstan-return mixed[]
-     */
-    public function getSlackData(array $record): array
-    {
-        $dataArray = array();
-        $record = $this->removeExcludedFields($record);
-
-        if ($this->username) {
-            $dataArray['username'] = $this->username;
-        }
-
-        if ($this->channel) {
-            $dataArray['channel'] = $this->channel;
-        }
-
-        if ($this->formatter && !$this->useAttachment) {
-            /** @phpstan-ignore-next-line */
-            $message = $this->formatter->format($record);
-        } else {
-            $message = $record['message'];
-        }
-
-        if ($this->useAttachment) {
-            $attachment = array(
-                'fallback'    => $message,
-                'text'        => $message,
-                'color'       => $this->getAttachmentColor($record['level']),
-                'fields'      => array(),
-                'mrkdwn_in'   => array('fields'),
-                'ts'          => $record['datetime']->getTimestamp(),
-                'footer'      => $this->username,
-                'footer_icon' => $this->userIcon,
-            );
-
-            if ($this->useShortAttachment) {
-                $attachment['title'] = $record['level_name'];
-            } else {
-                $attachment['title'] = 'Message';
-                $attachment['fields'][] = $this->generateAttachmentField('Level', $record['level_name']);
-            }
-
-            if ($this->includeContextAndExtra) {
-                foreach (array('extra', 'context') as $key) {
-                    if (empty($record[$key])) {
-                        continue;
-                    }
-
-                    if ($this->useShortAttachment) {
-                        $attachment['fields'][] = $this->generateAttachmentField(
-                            (string) $key,
-                            $record[$key]
-                        );
-                    } else {
-                        // Add all extra fields as individual fields in attachment
-                        $attachment['fields'] = array_merge(
-                            $attachment['fields'],
-                            $this->generateAttachmentFields($record[$key])
-                        );
-                    }
-                }
-            }
-
-            $dataArray['attachments'] = array($attachment);
-        } else {
-            $dataArray['text'] = $message;
-        }
-
-        if ($this->userIcon) {
-            if (filter_var($this->userIcon, FILTER_VALIDATE_URL)) {
-                $dataArray['icon_url'] = $this->userIcon;
-            } else {
-                $dataArray['icon_emoji'] = ":{$this->userIcon}:";
-            }
-        }
-
-        return $dataArray;
-    }
-
-    /**
-     * Returns a Slack message attachment color associated with
-     * provided level.
-     */
-    public function getAttachmentColor(int $level): string
-    {
-        switch (true) {
-            case $level >= Logger::ERROR:
-                return static::COLOR_DANGER;
-            case $level >= Logger::WARNING:
-                return static::COLOR_WARNING;
-            case $level >= Logger::INFO:
-                return static::COLOR_GOOD;
-            default:
-                return static::COLOR_DEFAULT;
-        }
-    }
-
-    /**
-     * Stringifies an array of key/value pairs to be used in attachment fields
-     *
-     * @param mixed[] $fields
-     */
-    public function stringify(array $fields): string
-    {
-        /** @var Record $fields */
-        $normalized = $this->normalizerFormatter->format($fields);
-
-        $hasSecondDimension = count(array_filter($normalized, 'is_array'));
-        $hasNonNumericKeys = !count(array_filter(array_keys($normalized), 'is_numeric'));
-
-        return $hasSecondDimension || $hasNonNumericKeys
-            ? Utils::jsonEncode($normalized, JSON_PRETTY_PRINT|Utils::DEFAULT_JSON_FLAGS)
-            : Utils::jsonEncode($normalized, Utils::DEFAULT_JSON_FLAGS);
-    }
-
-    /**
-     * Channel used by the bot when posting
-     *
-     * @param ?string $channel
-     *
-     * @return static
-     */
-    public function setChannel(?string $channel = null): self
-    {
-        $this->channel = $channel;
-
-        return $this;
-    }
-
-    /**
-     * Username used by the bot when posting
-     *
-     * @param ?string $username
-     *
-     * @return static
-     */
-    public function setUsername(?string $username = null): self
-    {
-        $this->username = $username;
-
-        return $this;
-    }
-
-    public function useAttachment(bool $useAttachment = true): self
-    {
-        $this->useAttachment = $useAttachment;
-
-        return $this;
-    }
-
-    public function setUserIcon(?string $userIcon = null): self
-    {
-        $this->userIcon = $userIcon;
-
-        if (\is_string($userIcon)) {
-            $this->userIcon = trim($userIcon, ':');
-        }
-
-        return $this;
-    }
-
-    public function useShortAttachment(bool $useShortAttachment = false): self
-    {
-        $this->useShortAttachment = $useShortAttachment;
-
-        return $this;
-    }
-
-    public function includeContextAndExtra(bool $includeContextAndExtra = false): self
-    {
-        $this->includeContextAndExtra = $includeContextAndExtra;
-
-        if ($this->includeContextAndExtra) {
-            $this->normalizerFormatter = new NormalizerFormatter();
-        }
-
-        return $this;
-    }
-
-    /**
-     * @param string[] $excludeFields
-     */
-    public function excludeFields(array $excludeFields = []): self
-    {
-        $this->excludeFields = $excludeFields;
-
-        return $this;
-    }
-
-    public function setFormatter(?FormatterInterface $formatter = null): self
-    {
-        $this->formatter = $formatter;
-
-        return $this;
-    }
-
-    /**
-     * Generates attachment field
-     *
-     * @param string|mixed[] $value
-     *
-     * @return array{title: string, value: string, short: false}
-     */
-    private function generateAttachmentField(string $title, $value): array
-    {
-        $value = is_array($value)
-            ? sprintf('```%s```', substr($this->stringify($value), 0, 1990))
-            : $value;
-
-        return array(
-            'title' => ucfirst($title),
-            'value' => $value,
-            'short' => false,
-        );
-    }
-
-    /**
-     * Generates a collection of attachment fields from array
-     *
-     * @param mixed[] $data
-     *
-     * @return array<array{title: string, value: string, short: false}>
-     */
-    private function generateAttachmentFields(array $data): array
-    {
-        /** @var Record $data */
-        $normalized = $this->normalizerFormatter->format($data);
-
-        $fields = array();
-        foreach ($normalized as $key => $value) {
-            $fields[] = $this->generateAttachmentField((string) $key, $value);
-        }
-
-        return $fields;
-    }
-
-    /**
-     * Get a copy of record with fields excluded according to $this->excludeFields
-     *
-     * @phpstan-param FormattedRecord $record
-     *
-     * @return mixed[]
-     */
-    private function removeExcludedFields(array $record): array
-    {
-        foreach ($this->excludeFields as $field) {
-            $keys = explode('.', $field);
-            $node = &$record;
-            $lastKey = end($keys);
-            foreach ($keys as $key) {
-                if (!isset($node[$key])) {
-                    break;
-                }
-                if ($lastKey === $key) {
-                    unset($node[$key]);
-                    break;
-                }
-                $node = &$node[$key];
-            }
-        }
-
-        return $record;
-    }
-}
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/Handler/SlackHandler.php b/monolog/vendor/monolog/monolog/src/Monolog/Handler/SlackHandler.php
deleted file mode 100644
index a648513e..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/Handler/SlackHandler.php
+++ /dev/null
@@ -1,256 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\Formatter\FormatterInterface;
-use Monolog\Logger;
-use Monolog\Utils;
-use Monolog\Handler\Slack\SlackRecord;
-
-/**
- * Sends notifications through Slack API
- *
- * @author Greg Kedzierski <greg@gregkedzierski.com>
- * @see    https://api.slack.com/
- *
- * @phpstan-import-type FormattedRecord from AbstractProcessingHandler
- */
-class SlackHandler extends SocketHandler
-{
-    /**
-     * Slack API token
-     * @var string
-     */
-    private $token;
-
-    /**
-     * Instance of the SlackRecord util class preparing data for Slack API.
-     * @var SlackRecord
-     */
-    private $slackRecord;
-
-    /**
-     * @param  string                    $token                  Slack API token
-     * @param  string                    $channel                Slack channel (encoded ID or name)
-     * @param  string|null               $username               Name of a bot
-     * @param  bool                      $useAttachment          Whether the message should be added to Slack as attachment (plain text otherwise)
-     * @param  string|null               $iconEmoji              The emoji name to use (or null)
-     * @param  bool                      $useShortAttachment     Whether the context/extra messages added to Slack as attachments are in a short style
-     * @param  bool                      $includeContextAndExtra Whether the attachment should include context and extra data
-     * @param  string[]                  $excludeFields          Dot separated list of fields to exclude from slack message. E.g. ['context.field1', 'extra.field2']
-     * @throws MissingExtensionException If no OpenSSL PHP extension configured
-     */
-    public function __construct(
-        string $token,
-        string $channel,
-        ?string $username = null,
-        bool $useAttachment = true,
-        ?string $iconEmoji = null,
-        $level = Logger::CRITICAL,
-        bool $bubble = true,
-        bool $useShortAttachment = false,
-        bool $includeContextAndExtra = false,
-        array $excludeFields = array(),
-        bool $persistent = false,
-        float $timeout = 0.0,
-        float $writingTimeout = 10.0,
-        ?float $connectionTimeout = null,
-        ?int $chunkSize = null
-    ) {
-        if (!extension_loaded('openssl')) {
-            throw new MissingExtensionException('The OpenSSL PHP extension is required to use the SlackHandler');
-        }
-
-        parent::__construct(
-            'ssl://slack.com:443',
-            $level,
-            $bubble,
-            $persistent,
-            $timeout,
-            $writingTimeout,
-            $connectionTimeout,
-            $chunkSize
-        );
-
-        $this->slackRecord = new SlackRecord(
-            $channel,
-            $username,
-            $useAttachment,
-            $iconEmoji,
-            $useShortAttachment,
-            $includeContextAndExtra,
-            $excludeFields
-        );
-
-        $this->token = $token;
-    }
-
-    public function getSlackRecord(): SlackRecord
-    {
-        return $this->slackRecord;
-    }
-
-    public function getToken(): string
-    {
-        return $this->token;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function generateDataStream(array $record): string
-    {
-        $content = $this->buildContent($record);
-
-        return $this->buildHeader($content) . $content;
-    }
-
-    /**
-     * Builds the body of API call
-     *
-     * @phpstan-param FormattedRecord $record
-     */
-    private function buildContent(array $record): string
-    {
-        $dataArray = $this->prepareContentData($record);
-
-        return http_build_query($dataArray);
-    }
-
-    /**
-     * @phpstan-param FormattedRecord $record
-     * @return string[]
-     */
-    protected function prepareContentData(array $record): array
-    {
-        $dataArray = $this->slackRecord->getSlackData($record);
-        $dataArray['token'] = $this->token;
-
-        if (!empty($dataArray['attachments'])) {
-            $dataArray['attachments'] = Utils::jsonEncode($dataArray['attachments']);
-        }
-
-        return $dataArray;
-    }
-
-    /**
-     * Builds the header of the API Call
-     */
-    private function buildHeader(string $content): string
-    {
-        $header = "POST /api/chat.postMessage HTTP/1.1\r\n";
-        $header .= "Host: slack.com\r\n";
-        $header .= "Content-Type: application/x-www-form-urlencoded\r\n";
-        $header .= "Content-Length: " . strlen($content) . "\r\n";
-        $header .= "\r\n";
-
-        return $header;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function write(array $record): void
-    {
-        parent::write($record);
-        $this->finalizeWrite();
-    }
-
-    /**
-     * Finalizes the request by reading some bytes and then closing the socket
-     *
-     * If we do not read some but close the socket too early, slack sometimes
-     * drops the request entirely.
-     */
-    protected function finalizeWrite(): void
-    {
-        $res = $this->getResource();
-        if (is_resource($res)) {
-            @fread($res, 2048);
-        }
-        $this->closeSocket();
-    }
-
-    public function setFormatter(FormatterInterface $formatter): HandlerInterface
-    {
-        parent::setFormatter($formatter);
-        $this->slackRecord->setFormatter($formatter);
-
-        return $this;
-    }
-
-    public function getFormatter(): FormatterInterface
-    {
-        $formatter = parent::getFormatter();
-        $this->slackRecord->setFormatter($formatter);
-
-        return $formatter;
-    }
-
-    /**
-     * Channel used by the bot when posting
-     */
-    public function setChannel(string $channel): self
-    {
-        $this->slackRecord->setChannel($channel);
-
-        return $this;
-    }
-
-    /**
-     * Username used by the bot when posting
-     */
-    public function setUsername(string $username): self
-    {
-        $this->slackRecord->setUsername($username);
-
-        return $this;
-    }
-
-    public function useAttachment(bool $useAttachment): self
-    {
-        $this->slackRecord->useAttachment($useAttachment);
-
-        return $this;
-    }
-
-    public function setIconEmoji(string $iconEmoji): self
-    {
-        $this->slackRecord->setUserIcon($iconEmoji);
-
-        return $this;
-    }
-
-    public function useShortAttachment(bool $useShortAttachment): self
-    {
-        $this->slackRecord->useShortAttachment($useShortAttachment);
-
-        return $this;
-    }
-
-    public function includeContextAndExtra(bool $includeContextAndExtra): self
-    {
-        $this->slackRecord->includeContextAndExtra($includeContextAndExtra);
-
-        return $this;
-    }
-
-    /**
-     * @param string[] $excludeFields
-     */
-    public function excludeFields(array $excludeFields): self
-    {
-        $this->slackRecord->excludeFields($excludeFields);
-
-        return $this;
-    }
-}
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/Handler/SlackWebhookHandler.php b/monolog/vendor/monolog/monolog/src/Monolog/Handler/SlackWebhookHandler.php
deleted file mode 100644
index 8ae3c788..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/Handler/SlackWebhookHandler.php
+++ /dev/null
@@ -1,130 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\Formatter\FormatterInterface;
-use Monolog\Logger;
-use Monolog\Utils;
-use Monolog\Handler\Slack\SlackRecord;
-
-/**
- * Sends notifications through Slack Webhooks
- *
- * @author Haralan Dobrev <hkdobrev@gmail.com>
- * @see    https://api.slack.com/incoming-webhooks
- */
-class SlackWebhookHandler extends AbstractProcessingHandler
-{
-    /**
-     * Slack Webhook token
-     * @var string
-     */
-    private $webhookUrl;
-
-    /**
-     * Instance of the SlackRecord util class preparing data for Slack API.
-     * @var SlackRecord
-     */
-    private $slackRecord;
-
-    /**
-     * @param string      $webhookUrl             Slack Webhook URL
-     * @param string|null $channel                Slack channel (encoded ID or name)
-     * @param string|null $username               Name of a bot
-     * @param bool        $useAttachment          Whether the message should be added to Slack as attachment (plain text otherwise)
-     * @param string|null $iconEmoji              The emoji name to use (or null)
-     * @param bool        $useShortAttachment     Whether the the context/extra messages added to Slack as attachments are in a short style
-     * @param bool        $includeContextAndExtra Whether the attachment should include context and extra data
-     * @param string[]    $excludeFields          Dot separated list of fields to exclude from slack message. E.g. ['context.field1', 'extra.field2']
-     */
-    public function __construct(
-        string $webhookUrl,
-        ?string $channel = null,
-        ?string $username = null,
-        bool $useAttachment = true,
-        ?string $iconEmoji = null,
-        bool $useShortAttachment = false,
-        bool $includeContextAndExtra = false,
-        $level = Logger::CRITICAL,
-        bool $bubble = true,
-        array $excludeFields = array()
-    ) {
-        if (!extension_loaded('curl')) {
-            throw new MissingExtensionException('The curl extension is needed to use the SlackWebhookHandler');
-        }
-
-        parent::__construct($level, $bubble);
-
-        $this->webhookUrl = $webhookUrl;
-
-        $this->slackRecord = new SlackRecord(
-            $channel,
-            $username,
-            $useAttachment,
-            $iconEmoji,
-            $useShortAttachment,
-            $includeContextAndExtra,
-            $excludeFields
-        );
-    }
-
-    public function getSlackRecord(): SlackRecord
-    {
-        return $this->slackRecord;
-    }
-
-    public function getWebhookUrl(): string
-    {
-        return $this->webhookUrl;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function write(array $record): void
-    {
-        $postData = $this->slackRecord->getSlackData($record);
-        $postString = Utils::jsonEncode($postData);
-
-        $ch = curl_init();
-        $options = array(
-            CURLOPT_URL => $this->webhookUrl,
-            CURLOPT_POST => true,
-            CURLOPT_RETURNTRANSFER => true,
-            CURLOPT_HTTPHEADER => array('Content-type: application/json'),
-            CURLOPT_POSTFIELDS => $postString,
-        );
-        if (defined('CURLOPT_SAFE_UPLOAD')) {
-            $options[CURLOPT_SAFE_UPLOAD] = true;
-        }
-
-        curl_setopt_array($ch, $options);
-
-        Curl\Util::execute($ch);
-    }
-
-    public function setFormatter(FormatterInterface $formatter): HandlerInterface
-    {
-        parent::setFormatter($formatter);
-        $this->slackRecord->setFormatter($formatter);
-
-        return $this;
-    }
-
-    public function getFormatter(): FormatterInterface
-    {
-        $formatter = parent::getFormatter();
-        $this->slackRecord->setFormatter($formatter);
-
-        return $formatter;
-    }
-}
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/Handler/SocketHandler.php b/monolog/vendor/monolog/monolog/src/Monolog/Handler/SocketHandler.php
deleted file mode 100644
index 21701afa..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/Handler/SocketHandler.php
+++ /dev/null
@@ -1,448 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\Logger;
-
-/**
- * Stores to any socket - uses fsockopen() or pfsockopen().
- *
- * @author Pablo de Leon Belloc <pablolb@gmail.com>
- * @see    http://php.net/manual/en/function.fsockopen.php
- *
- * @phpstan-import-type Record from \Monolog\Logger
- * @phpstan-import-type FormattedRecord from AbstractProcessingHandler
- */
-class SocketHandler extends AbstractProcessingHandler
-{
-    /** @var string */
-    private $connectionString;
-    /** @var float */
-    private $connectionTimeout;
-    /** @var resource|null */
-    private $resource;
-    /** @var float */
-    private $timeout;
-    /** @var float */
-    private $writingTimeout;
-    /** @var ?int */
-    private $lastSentBytes = null;
-    /** @var ?int */
-    private $chunkSize;
-    /** @var bool */
-    private $persistent;
-    /** @var ?int */
-    private $errno = null;
-    /** @var ?string */
-    private $errstr = null;
-    /** @var ?float */
-    private $lastWritingAt = null;
-
-    /**
-     * @param string     $connectionString  Socket connection string
-     * @param bool       $persistent        Flag to enable/disable persistent connections
-     * @param float      $timeout           Socket timeout to wait until the request is being aborted
-     * @param float      $writingTimeout    Socket timeout to wait until the request should've been sent/written
-     * @param float|null $connectionTimeout Socket connect timeout to wait until the connection should've been
-     *                                      established
-     * @param int|null   $chunkSize         Sets the chunk size. Only has effect during connection in the writing cycle
-     *
-     * @throws \InvalidArgumentException    If an invalid timeout value (less than 0) is passed.
-     */
-    public function __construct(
-        string $connectionString,
-        $level = Logger::DEBUG,
-        bool $bubble = true,
-        bool $persistent = false,
-        float $timeout = 0.0,
-        float $writingTimeout = 10.0,
-        ?float $connectionTimeout = null,
-        ?int $chunkSize = null
-    ) {
-        parent::__construct($level, $bubble);
-        $this->connectionString = $connectionString;
-
-        if ($connectionTimeout !== null) {
-            $this->validateTimeout($connectionTimeout);
-        }
-
-        $this->connectionTimeout = $connectionTimeout ?? (float) ini_get('default_socket_timeout');
-        $this->persistent = $persistent;
-        $this->validateTimeout($timeout);
-        $this->timeout = $timeout;
-        $this->validateTimeout($writingTimeout);
-        $this->writingTimeout = $writingTimeout;
-        $this->chunkSize = $chunkSize;
-    }
-
-    /**
-     * Connect (if necessary) and write to the socket
-     *
-     * {@inheritDoc}
-     *
-     * @throws \UnexpectedValueException
-     * @throws \RuntimeException
-     */
-    protected function write(array $record): void
-    {
-        $this->connectIfNotConnected();
-        $data = $this->generateDataStream($record);
-        $this->writeToSocket($data);
-    }
-
-    /**
-     * We will not close a PersistentSocket instance so it can be reused in other requests.
-     */
-    public function close(): void
-    {
-        if (!$this->isPersistent()) {
-            $this->closeSocket();
-        }
-    }
-
-    /**
-     * Close socket, if open
-     */
-    public function closeSocket(): void
-    {
-        if (is_resource($this->resource)) {
-            fclose($this->resource);
-            $this->resource = null;
-        }
-    }
-
-    /**
-     * Set socket connection to be persistent. It only has effect before the connection is initiated.
-     */
-    public function setPersistent(bool $persistent): self
-    {
-        $this->persistent = $persistent;
-
-        return $this;
-    }
-
-    /**
-     * Set connection timeout.  Only has effect before we connect.
-     *
-     * @see http://php.net/manual/en/function.fsockopen.php
-     */
-    public function setConnectionTimeout(float $seconds): self
-    {
-        $this->validateTimeout($seconds);
-        $this->connectionTimeout = $seconds;
-
-        return $this;
-    }
-
-    /**
-     * Set write timeout. Only has effect before we connect.
-     *
-     * @see http://php.net/manual/en/function.stream-set-timeout.php
-     */
-    public function setTimeout(float $seconds): self
-    {
-        $this->validateTimeout($seconds);
-        $this->timeout = $seconds;
-
-        return $this;
-    }
-
-    /**
-     * Set writing timeout. Only has effect during connection in the writing cycle.
-     *
-     * @param float $seconds 0 for no timeout
-     */
-    public function setWritingTimeout(float $seconds): self
-    {
-        $this->validateTimeout($seconds);
-        $this->writingTimeout = $seconds;
-
-        return $this;
-    }
-
-    /**
-     * Set chunk size. Only has effect during connection in the writing cycle.
-     */
-    public function setChunkSize(int $bytes): self
-    {
-        $this->chunkSize = $bytes;
-
-        return $this;
-    }
-
-    /**
-     * Get current connection string
-     */
-    public function getConnectionString(): string
-    {
-        return $this->connectionString;
-    }
-
-    /**
-     * Get persistent setting
-     */
-    public function isPersistent(): bool
-    {
-        return $this->persistent;
-    }
-
-    /**
-     * Get current connection timeout setting
-     */
-    public function getConnectionTimeout(): float
-    {
-        return $this->connectionTimeout;
-    }
-
-    /**
-     * Get current in-transfer timeout
-     */
-    public function getTimeout(): float
-    {
-        return $this->timeout;
-    }
-
-    /**
-     * Get current local writing timeout
-     *
-     * @return float
-     */
-    public function getWritingTimeout(): float
-    {
-        return $this->writingTimeout;
-    }
-
-    /**
-     * Get current chunk size
-     */
-    public function getChunkSize(): ?int
-    {
-        return $this->chunkSize;
-    }
-
-    /**
-     * Check to see if the socket is currently available.
-     *
-     * UDP might appear to be connected but might fail when writing.  See http://php.net/fsockopen for details.
-     */
-    public function isConnected(): bool
-    {
-        return is_resource($this->resource)
-            && !feof($this->resource);  // on TCP - other party can close connection.
-    }
-
-    /**
-     * Wrapper to allow mocking
-     *
-     * @return resource|false
-     */
-    protected function pfsockopen()
-    {
-        return @pfsockopen($this->connectionString, -1, $this->errno, $this->errstr, $this->connectionTimeout);
-    }
-
-    /**
-     * Wrapper to allow mocking
-     *
-     * @return resource|false
-     */
-    protected function fsockopen()
-    {
-        return @fsockopen($this->connectionString, -1, $this->errno, $this->errstr, $this->connectionTimeout);
-    }
-
-    /**
-     * Wrapper to allow mocking
-     *
-     * @see http://php.net/manual/en/function.stream-set-timeout.php
-     *
-     * @return bool
-     */
-    protected function streamSetTimeout()
-    {
-        $seconds = floor($this->timeout);
-        $microseconds = round(($this->timeout - $seconds) * 1e6);
-
-        if (!is_resource($this->resource)) {
-            throw new \LogicException('streamSetTimeout called but $this->resource is not a resource');
-        }
-
-        return stream_set_timeout($this->resource, (int) $seconds, (int) $microseconds);
-    }
-
-    /**
-     * Wrapper to allow mocking
-     *
-     * @see http://php.net/manual/en/function.stream-set-chunk-size.php
-     *
-     * @return int|bool
-     */
-    protected function streamSetChunkSize()
-    {
-        if (!is_resource($this->resource)) {
-            throw new \LogicException('streamSetChunkSize called but $this->resource is not a resource');
-        }
-
-        if (null === $this->chunkSize) {
-            throw new \LogicException('streamSetChunkSize called but $this->chunkSize is not set');
-        }
-
-        return stream_set_chunk_size($this->resource, $this->chunkSize);
-    }
-
-    /**
-     * Wrapper to allow mocking
-     *
-     * @return int|bool
-     */
-    protected function fwrite(string $data)
-    {
-        if (!is_resource($this->resource)) {
-            throw new \LogicException('fwrite called but $this->resource is not a resource');
-        }
-
-        return @fwrite($this->resource, $data);
-    }
-
-    /**
-     * Wrapper to allow mocking
-     *
-     * @return mixed[]|bool
-     */
-    protected function streamGetMetadata()
-    {
-        if (!is_resource($this->resource)) {
-            throw new \LogicException('streamGetMetadata called but $this->resource is not a resource');
-        }
-
-        return stream_get_meta_data($this->resource);
-    }
-
-    private function validateTimeout(float $value): void
-    {
-        if ($value < 0) {
-            throw new \InvalidArgumentException("Timeout must be 0 or a positive float (got $value)");
-        }
-    }
-
-    private function connectIfNotConnected(): void
-    {
-        if ($this->isConnected()) {
-            return;
-        }
-        $this->connect();
-    }
-
-    /**
-     * @phpstan-param FormattedRecord $record
-     */
-    protected function generateDataStream(array $record): string
-    {
-        return (string) $record['formatted'];
-    }
-
-    /**
-     * @return resource|null
-     */
-    protected function getResource()
-    {
-        return $this->resource;
-    }
-
-    private function connect(): void
-    {
-        $this->createSocketResource();
-        $this->setSocketTimeout();
-        $this->setStreamChunkSize();
-    }
-
-    private function createSocketResource(): void
-    {
-        if ($this->isPersistent()) {
-            $resource = $this->pfsockopen();
-        } else {
-            $resource = $this->fsockopen();
-        }
-        if (is_bool($resource)) {
-            throw new \UnexpectedValueException("Failed connecting to $this->connectionString ($this->errno: $this->errstr)");
-        }
-        $this->resource = $resource;
-    }
-
-    private function setSocketTimeout(): void
-    {
-        if (!$this->streamSetTimeout()) {
-            throw new \UnexpectedValueException("Failed setting timeout with stream_set_timeout()");
-        }
-    }
-
-    private function setStreamChunkSize(): void
-    {
-        if ($this->chunkSize && !$this->streamSetChunkSize()) {
-            throw new \UnexpectedValueException("Failed setting chunk size with stream_set_chunk_size()");
-        }
-    }
-
-    private function writeToSocket(string $data): void
-    {
-        $length = strlen($data);
-        $sent = 0;
-        $this->lastSentBytes = $sent;
-        while ($this->isConnected() && $sent < $length) {
-            if (0 == $sent) {
-                $chunk = $this->fwrite($data);
-            } else {
-                $chunk = $this->fwrite(substr($data, $sent));
-            }
-            if ($chunk === false) {
-                throw new \RuntimeException("Could not write to socket");
-            }
-            $sent += $chunk;
-            $socketInfo = $this->streamGetMetadata();
-            if (is_array($socketInfo) && $socketInfo['timed_out']) {
-                throw new \RuntimeException("Write timed-out");
-            }
-
-            if ($this->writingIsTimedOut($sent)) {
-                throw new \RuntimeException("Write timed-out, no data sent for `{$this->writingTimeout}` seconds, probably we got disconnected (sent $sent of $length)");
-            }
-        }
-        if (!$this->isConnected() && $sent < $length) {
-            throw new \RuntimeException("End-of-file reached, probably we got disconnected (sent $sent of $length)");
-        }
-    }
-
-    private function writingIsTimedOut(int $sent): bool
-    {
-        // convert to ms
-        if (0.0 == $this->writingTimeout) {
-            return false;
-        }
-
-        if ($sent !== $this->lastSentBytes) {
-            $this->lastWritingAt = microtime(true);
-            $this->lastSentBytes = $sent;
-
-            return false;
-        } else {
-            usleep(100);
-        }
-
-        if ((microtime(true) - $this->lastWritingAt) >= $this->writingTimeout) {
-            $this->closeSocket();
-
-            return true;
-        }
-
-        return false;
-    }
-}
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/Handler/SqsHandler.php b/monolog/vendor/monolog/monolog/src/Monolog/Handler/SqsHandler.php
deleted file mode 100644
index dcf282b4..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/Handler/SqsHandler.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Aws\Sqs\SqsClient;
-use Monolog\Logger;
-use Monolog\Utils;
-
-/**
- * Writes to any sqs queue.
- *
- * @author Martijn van Calker <git@amvc.nl>
- */
-class SqsHandler extends AbstractProcessingHandler
-{
-    /** 256 KB in bytes - maximum message size in SQS */
-    protected const MAX_MESSAGE_SIZE = 262144;
-    /** 100 KB in bytes - head message size for new error log */
-    protected const HEAD_MESSAGE_SIZE = 102400;
-
-    /** @var SqsClient */
-    private $client;
-    /** @var string */
-    private $queueUrl;
-
-    public function __construct(SqsClient $sqsClient, string $queueUrl, $level = Logger::DEBUG, bool $bubble = true)
-    {
-        parent::__construct($level, $bubble);
-
-        $this->client = $sqsClient;
-        $this->queueUrl = $queueUrl;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function write(array $record): void
-    {
-        if (!isset($record['formatted']) || 'string' !== gettype($record['formatted'])) {
-            throw new \InvalidArgumentException('SqsHandler accepts only formatted records as a string' . Utils::getRecordMessageForException($record));
-        }
-
-        $messageBody = $record['formatted'];
-        if (strlen($messageBody) >= static::MAX_MESSAGE_SIZE) {
-            $messageBody = Utils::substr($messageBody, 0, static::HEAD_MESSAGE_SIZE);
-        }
-
-        $this->client->sendMessage([
-            'QueueUrl' => $this->queueUrl,
-            'MessageBody' => $messageBody,
-        ]);
-    }
-}
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/Handler/StreamHandler.php b/monolog/vendor/monolog/monolog/src/Monolog/Handler/StreamHandler.php
deleted file mode 100644
index 82c048e1..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/Handler/StreamHandler.php
+++ /dev/null
@@ -1,224 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\Logger;
-use Monolog\Utils;
-
-/**
- * Stores to any stream resource
- *
- * Can be used to store into php://stderr, remote and local files, etc.
- *
- * @author Jordi Boggiano <j.boggiano@seld.be>
- *
- * @phpstan-import-type FormattedRecord from AbstractProcessingHandler
- */
-class StreamHandler extends AbstractProcessingHandler
-{
-    /** @const int */
-    protected const MAX_CHUNK_SIZE = 2147483647;
-    /** @const int 10MB */
-    protected const DEFAULT_CHUNK_SIZE = 10 * 1024 * 1024;
-    /** @var int */
-    protected $streamChunkSize;
-    /** @var resource|null */
-    protected $stream;
-    /** @var ?string */
-    protected $url = null;
-    /** @var ?string */
-    private $errorMessage = null;
-    /** @var ?int */
-    protected $filePermission;
-    /** @var bool */
-    protected $useLocking;
-    /** @var true|null */
-    private $dirCreated = null;
-
-    /**
-     * @param resource|string $stream         If a missing path can't be created, an UnexpectedValueException will be thrown on first write
-     * @param int|null        $filePermission Optional file permissions (default (0644) are only for owner read/write)
-     * @param bool            $useLocking     Try to lock log file before doing any writes
-     *
-     * @throws \InvalidArgumentException If stream is not a resource or string
-     */
-    public function __construct($stream, $level = Logger::DEBUG, bool $bubble = true, ?int $filePermission = null, bool $useLocking = false)
-    {
-        parent::__construct($level, $bubble);
-
-        if (($phpMemoryLimit = Utils::expandIniShorthandBytes(ini_get('memory_limit'))) !== false) {
-            if ($phpMemoryLimit > 0) {
-                // use max 10% of allowed memory for the chunk size, and at least 100KB
-                $this->streamChunkSize = min(static::MAX_CHUNK_SIZE, max((int) ($phpMemoryLimit / 10), 100 * 1024));
-            } else {
-                // memory is unlimited, set to the default 10MB
-                $this->streamChunkSize = static::DEFAULT_CHUNK_SIZE;
-            }
-        } else {
-            // no memory limit information, set to the default 10MB
-            $this->streamChunkSize = static::DEFAULT_CHUNK_SIZE;
-        }
-
-        if (is_resource($stream)) {
-            $this->stream = $stream;
-
-            stream_set_chunk_size($this->stream, $this->streamChunkSize);
-        } elseif (is_string($stream)) {
-            $this->url = Utils::canonicalizePath($stream);
-        } else {
-            throw new \InvalidArgumentException('A stream must either be a resource or a string.');
-        }
-
-        $this->filePermission = $filePermission;
-        $this->useLocking = $useLocking;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function close(): void
-    {
-        if ($this->url && is_resource($this->stream)) {
-            fclose($this->stream);
-        }
-        $this->stream = null;
-        $this->dirCreated = null;
-    }
-
-    /**
-     * Return the currently active stream if it is open
-     *
-     * @return resource|null
-     */
-    public function getStream()
-    {
-        return $this->stream;
-    }
-
-    /**
-     * Return the stream URL if it was configured with a URL and not an active resource
-     *
-     * @return string|null
-     */
-    public function getUrl(): ?string
-    {
-        return $this->url;
-    }
-
-    /**
-     * @return int
-     */
-    public function getStreamChunkSize(): int
-    {
-        return $this->streamChunkSize;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function write(array $record): void
-    {
-        if (!is_resource($this->stream)) {
-            $url = $this->url;
-            if (null === $url || '' === $url) {
-                throw new \LogicException('Missing stream url, the stream can not be opened. This may be caused by a premature call to close().' . Utils::getRecordMessageForException($record));
-            }
-            $this->createDir($url);
-            $this->errorMessage = null;
-            set_error_handler([$this, 'customErrorHandler']);
-            try {
-                $stream = fopen($url, 'a');
-                if ($this->filePermission !== null) {
-                    @chmod($url, $this->filePermission);
-                }
-            } finally {
-                restore_error_handler();
-            }
-            if (!is_resource($stream)) {
-                $this->stream = null;
-
-                throw new \UnexpectedValueException(sprintf('The stream or file "%s" could not be opened in append mode: '.$this->errorMessage, $url) . Utils::getRecordMessageForException($record));
-            }
-            stream_set_chunk_size($stream, $this->streamChunkSize);
-            $this->stream = $stream;
-        }
-
-        $stream = $this->stream;
-        if (!is_resource($stream)) {
-            throw new \LogicException('No stream was opened yet' . Utils::getRecordMessageForException($record));
-        }
-
-        if ($this->useLocking) {
-            // ignoring errors here, there's not much we can do about them
-            flock($stream, LOCK_EX);
-        }
-
-        $this->streamWrite($stream, $record);
-
-        if ($this->useLocking) {
-            flock($stream, LOCK_UN);
-        }
-    }
-
-    /**
-     * Write to stream
-     * @param resource $stream
-     * @param array    $record
-     *
-     * @phpstan-param FormattedRecord $record
-     */
-    protected function streamWrite($stream, array $record): void
-    {
-        fwrite($stream, (string) $record['formatted']);
-    }
-
-    private function customErrorHandler(int $code, string $msg): bool
-    {
-        $this->errorMessage = preg_replace('{^(fopen|mkdir)\(.*?\): }', '', $msg);
-
-        return true;
-    }
-
-    private function getDirFromStream(string $stream): ?string
-    {
-        $pos = strpos($stream, '://');
-        if ($pos === false) {
-            return dirname($stream);
-        }
-
-        if ('file://' === substr($stream, 0, 7)) {
-            return dirname(substr($stream, 7));
-        }
-
-        return null;
-    }
-
-    private function createDir(string $url): void
-    {
-        // Do not try to create dir if it has already been tried.
-        if ($this->dirCreated) {
-            return;
-        }
-
-        $dir = $this->getDirFromStream($url);
-        if (null !== $dir && !is_dir($dir)) {
-            $this->errorMessage = null;
-            set_error_handler([$this, 'customErrorHandler']);
-            $status = mkdir($dir, 0777, true);
-            restore_error_handler();
-            if (false === $status && !is_dir($dir) && strpos((string) $this->errorMessage, 'File exists') === false) {
-                throw new \UnexpectedValueException(sprintf('There is no existing directory at "%s" and it could not be created: '.$this->errorMessage, $dir));
-            }
-        }
-        $this->dirCreated = true;
-    }
-}
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/Handler/SwiftMailerHandler.php b/monolog/vendor/monolog/monolog/src/Monolog/Handler/SwiftMailerHandler.php
deleted file mode 100644
index fae92514..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/Handler/SwiftMailerHandler.php
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\Logger;
-use Monolog\Utils;
-use Monolog\Formatter\FormatterInterface;
-use Monolog\Formatter\LineFormatter;
-use Swift_Message;
-use Swift;
-
-/**
- * SwiftMailerHandler uses Swift_Mailer to send the emails
- *
- * @author Gyula Sallai
- *
- * @phpstan-import-type Record from \Monolog\Logger
- * @deprecated Since Monolog 2.6. Use SymfonyMailerHandler instead.
- */
-class SwiftMailerHandler extends MailHandler
-{
-    /** @var \Swift_Mailer */
-    protected $mailer;
-    /** @var Swift_Message|callable(string, Record[]): Swift_Message */
-    private $messageTemplate;
-
-    /**
-     * @psalm-param Swift_Message|callable(string, Record[]): Swift_Message $message
-     *
-     * @param \Swift_Mailer          $mailer  The mailer to use
-     * @param callable|Swift_Message $message An example message for real messages, only the body will be replaced
-     */
-    public function __construct(\Swift_Mailer $mailer, $message, $level = Logger::ERROR, bool $bubble = true)
-    {
-        parent::__construct($level, $bubble);
-
-        @trigger_error('The SwiftMailerHandler is deprecated since Monolog 2.6. Use SymfonyMailerHandler instead.', E_USER_DEPRECATED);
-
-        $this->mailer = $mailer;
-        $this->messageTemplate = $message;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function send(string $content, array $records): void
-    {
-        $this->mailer->send($this->buildMessage($content, $records));
-    }
-
-    /**
-     * Gets the formatter for the Swift_Message subject.
-     *
-     * @param string|null $format The format of the subject
-     */
-    protected function getSubjectFormatter(?string $format): FormatterInterface
-    {
-        return new LineFormatter($format);
-    }
-
-    /**
-     * Creates instance of Swift_Message to be sent
-     *
-     * @param  string        $content formatted email body to be sent
-     * @param  array         $records Log records that formed the content
-     * @return Swift_Message
-     *
-     * @phpstan-param Record[] $records
-     */
-    protected function buildMessage(string $content, array $records): Swift_Message
-    {
-        $message = null;
-        if ($this->messageTemplate instanceof Swift_Message) {
-            $message = clone $this->messageTemplate;
-            $message->generateId();
-        } elseif (is_callable($this->messageTemplate)) {
-            $message = ($this->messageTemplate)($content, $records);
-        }
-
-        if (!$message instanceof Swift_Message) {
-            $record = reset($records);
-            throw new \InvalidArgumentException('Could not resolve message as instance of Swift_Message or a callable returning it' . ($record ? Utils::getRecordMessageForException($record) : ''));
-        }
-
-        if ($records) {
-            $subjectFormatter = $this->getSubjectFormatter($message->getSubject());
-            $message->setSubject($subjectFormatter->format($this->getHighestRecord($records)));
-        }
-
-        $mime = 'text/plain';
-        if ($this->isHtmlBody($content)) {
-            $mime = 'text/html';
-        }
-
-        $message->setBody($content, $mime);
-        /** @phpstan-ignore-next-line */
-        if (version_compare(Swift::VERSION, '6.0.0', '>=')) {
-            $message->setDate(new \DateTimeImmutable());
-        } else {
-            /** @phpstan-ignore-next-line */
-            $message->setDate(time());
-        }
-
-        return $message;
-    }
-}
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/Handler/SymfonyMailerHandler.php b/monolog/vendor/monolog/monolog/src/Monolog/Handler/SymfonyMailerHandler.php
deleted file mode 100644
index 130e6f1f..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/Handler/SymfonyMailerHandler.php
+++ /dev/null
@@ -1,111 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\Logger;
-use Monolog\Utils;
-use Monolog\Formatter\FormatterInterface;
-use Monolog\Formatter\LineFormatter;
-use Symfony\Component\Mailer\MailerInterface;
-use Symfony\Component\Mailer\Transport\TransportInterface;
-use Symfony\Component\Mime\Email;
-
-/**
- * SymfonyMailerHandler uses Symfony's Mailer component to send the emails
- *
- * @author Jordi Boggiano <j.boggiano@seld.be>
- *
- * @phpstan-import-type Record from \Monolog\Logger
- */
-class SymfonyMailerHandler extends MailHandler
-{
-    /** @var MailerInterface|TransportInterface */
-    protected $mailer;
-    /** @var Email|callable(string, Record[]): Email */
-    private $emailTemplate;
-
-    /**
-     * @psalm-param Email|callable(string, Record[]): Email $email
-     *
-     * @param MailerInterface|TransportInterface $mailer The mailer to use
-     * @param callable|Email                     $email  An email template, the subject/body will be replaced
-     */
-    public function __construct($mailer, $email, $level = Logger::ERROR, bool $bubble = true)
-    {
-        parent::__construct($level, $bubble);
-
-        $this->mailer = $mailer;
-        $this->emailTemplate = $email;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function send(string $content, array $records): void
-    {
-        $this->mailer->send($this->buildMessage($content, $records));
-    }
-
-    /**
-     * Gets the formatter for the Swift_Message subject.
-     *
-     * @param string|null $format The format of the subject
-     */
-    protected function getSubjectFormatter(?string $format): FormatterInterface
-    {
-        return new LineFormatter($format);
-    }
-
-    /**
-     * Creates instance of Email to be sent
-     *
-     * @param  string        $content formatted email body to be sent
-     * @param  array         $records Log records that formed the content
-     *
-     * @phpstan-param Record[] $records
-     */
-    protected function buildMessage(string $content, array $records): Email
-    {
-        $message = null;
-        if ($this->emailTemplate instanceof Email) {
-            $message = clone $this->emailTemplate;
-        } elseif (is_callable($this->emailTemplate)) {
-            $message = ($this->emailTemplate)($content, $records);
-        }
-
-        if (!$message instanceof Email) {
-            $record = reset($records);
-            throw new \InvalidArgumentException('Could not resolve message as instance of Email or a callable returning it' . ($record ? Utils::getRecordMessageForException($record) : ''));
-        }
-
-        if ($records) {
-            $subjectFormatter = $this->getSubjectFormatter($message->getSubject());
-            $message->subject($subjectFormatter->format($this->getHighestRecord($records)));
-        }
-
-        if ($this->isHtmlBody($content)) {
-            if (null !== ($charset = $message->getHtmlCharset())) {
-                $message->html($content, $charset);
-            } else {
-                $message->html($content);
-            }
-        } else {
-            if (null !== ($charset = $message->getTextCharset())) {
-                $message->text($content, $charset);
-            } else {
-                $message->text($content);
-            }
-        }
-
-        return $message->date(new \DateTimeImmutable());
-    }
-}
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/Handler/SyslogHandler.php b/monolog/vendor/monolog/monolog/src/Monolog/Handler/SyslogHandler.php
deleted file mode 100644
index 1d543b7e..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/Handler/SyslogHandler.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\Logger;
-use Monolog\Utils;
-
-/**
- * Logs to syslog service.
- *
- * usage example:
- *
- *   $log = new Logger('application');
- *   $syslog = new SyslogHandler('myfacility', 'local6');
- *   $formatter = new LineFormatter("%channel%.%level_name%: %message% %extra%");
- *   $syslog->setFormatter($formatter);
- *   $log->pushHandler($syslog);
- *
- * @author Sven Paulus <sven@karlsruhe.org>
- */
-class SyslogHandler extends AbstractSyslogHandler
-{
-    /** @var string */
-    protected $ident;
-    /** @var int */
-    protected $logopts;
-
-    /**
-     * @param string     $ident
-     * @param string|int $facility Either one of the names of the keys in $this->facilities, or a LOG_* facility constant
-     * @param int        $logopts  Option flags for the openlog() call, defaults to LOG_PID
-     */
-    public function __construct(string $ident, $facility = LOG_USER, $level = Logger::DEBUG, bool $bubble = true, int $logopts = LOG_PID)
-    {
-        parent::__construct($facility, $level, $bubble);
-
-        $this->ident = $ident;
-        $this->logopts = $logopts;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function close(): void
-    {
-        closelog();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function write(array $record): void
-    {
-        if (!openlog($this->ident, $this->logopts, $this->facility)) {
-            throw new \LogicException('Can\'t open syslog for ident "'.$this->ident.'" and facility "'.$this->facility.'"' . Utils::getRecordMessageForException($record));
-        }
-        syslog($this->logLevels[$record['level']], (string) $record['formatted']);
-    }
-}
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/Handler/SyslogUdp/UdpSocket.php b/monolog/vendor/monolog/monolog/src/Monolog/Handler/SyslogUdp/UdpSocket.php
deleted file mode 100644
index dbd8ef69..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/Handler/SyslogUdp/UdpSocket.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler\SyslogUdp;
-
-use Monolog\Utils;
-use Socket;
-
-class UdpSocket
-{
-    protected const DATAGRAM_MAX_LENGTH = 65023;
-
-    /** @var string */
-    protected $ip;
-    /** @var int */
-    protected $port;
-    /** @var resource|Socket|null */
-    protected $socket = null;
-
-    public function __construct(string $ip, int $port = 514)
-    {
-        $this->ip = $ip;
-        $this->port = $port;
-    }
-
-    /**
-     * @param  string $line
-     * @param  string $header
-     * @return void
-     */
-    public function write($line, $header = "")
-    {
-        $this->send($this->assembleMessage($line, $header));
-    }
-
-    public function close(): void
-    {
-        if (is_resource($this->socket) || $this->socket instanceof Socket) {
-            socket_close($this->socket);
-            $this->socket = null;
-        }
-    }
-
-    /**
-     * @return resource|Socket
-     */
-    protected function getSocket()
-    {
-        if (null !== $this->socket) {
-            return $this->socket;
-        }
-
-        $domain = AF_INET;
-        $protocol = SOL_UDP;
-        // Check if we are using unix sockets.
-        if ($this->port === 0) {
-            $domain = AF_UNIX;
-            $protocol = IPPROTO_IP;
-        }
-
-        $this->socket = socket_create($domain, SOCK_DGRAM, $protocol) ?: null;
-        if (null === $this->socket) {
-            throw new \RuntimeException('The UdpSocket to '.$this->ip.':'.$this->port.' could not be opened via socket_create');
-        }
-
-        return $this->socket;
-    }
-
-    protected function send(string $chunk): void
-    {
-        socket_sendto($this->getSocket(), $chunk, strlen($chunk), $flags = 0, $this->ip, $this->port);
-    }
-
-    protected function assembleMessage(string $line, string $header): string
-    {
-        $chunkSize = static::DATAGRAM_MAX_LENGTH - strlen($header);
-
-        return $header . Utils::substr($line, 0, $chunkSize);
-    }
-}
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/Handler/SyslogUdpHandler.php b/monolog/vendor/monolog/monolog/src/Monolog/Handler/SyslogUdpHandler.php
deleted file mode 100644
index deaa19f8..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/Handler/SyslogUdpHandler.php
+++ /dev/null
@@ -1,150 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use DateTimeInterface;
-use Monolog\Logger;
-use Monolog\Handler\SyslogUdp\UdpSocket;
-use Monolog\Utils;
-
-/**
- * A Handler for logging to a remote syslogd server.
- *
- * @author Jesper Skovgaard Nielsen <nulpunkt@gmail.com>
- * @author Dominik Kukacka <dominik.kukacka@gmail.com>
- */
-class SyslogUdpHandler extends AbstractSyslogHandler
-{
-    const RFC3164 = 0;
-    const RFC5424 = 1;
-    const RFC5424e = 2;
-
-    /** @var array<self::RFC*, string> */
-    private $dateFormats = array(
-        self::RFC3164 => 'M d H:i:s',
-        self::RFC5424 => \DateTime::RFC3339,
-        self::RFC5424e => \DateTime::RFC3339_EXTENDED,
-    );
-
-    /** @var UdpSocket */
-    protected $socket;
-    /** @var string */
-    protected $ident;
-    /** @var self::RFC* */
-    protected $rfc;
-
-    /**
-     * @param string     $host     Either IP/hostname or a path to a unix socket (port must be 0 then)
-     * @param int        $port     Port number, or 0 if $host is a unix socket
-     * @param string|int $facility Either one of the names of the keys in $this->facilities, or a LOG_* facility constant
-     * @param bool       $bubble   Whether the messages that are handled can bubble up the stack or not
-     * @param string     $ident    Program name or tag for each log message.
-     * @param int        $rfc      RFC to format the message for.
-     * @throws MissingExtensionException
-     *
-     * @phpstan-param self::RFC* $rfc
-     */
-    public function __construct(string $host, int $port = 514, $facility = LOG_USER, $level = Logger::DEBUG, bool $bubble = true, string $ident = 'php', int $rfc = self::RFC5424)
-    {
-        if (!extension_loaded('sockets')) {
-            throw new MissingExtensionException('The sockets extension is required to use the SyslogUdpHandler');
-        }
-
-        parent::__construct($facility, $level, $bubble);
-
-        $this->ident = $ident;
-        $this->rfc = $rfc;
-
-        $this->socket = new UdpSocket($host, $port);
-    }
-
-    protected function write(array $record): void
-    {
-        $lines = $this->splitMessageIntoLines($record['formatted']);
-
-        $header = $this->makeCommonSyslogHeader($this->logLevels[$record['level']], $record['datetime']);
-
-        foreach ($lines as $line) {
-            $this->socket->write($line, $header);
-        }
-    }
-
-    public function close(): void
-    {
-        $this->socket->close();
-    }
-
-    /**
-     * @param  string|string[] $message
-     * @return string[]
-     */
-    private function splitMessageIntoLines($message): array
-    {
-        if (is_array($message)) {
-            $message = implode("\n", $message);
-        }
-
-        $lines = preg_split('/$\R?^/m', (string) $message, -1, PREG_SPLIT_NO_EMPTY);
-        if (false === $lines) {
-            $pcreErrorCode = preg_last_error();
-            throw new \RuntimeException('Could not preg_split: ' . $pcreErrorCode . ' / ' . Utils::pcreLastErrorMessage($pcreErrorCode));
-        }
-
-        return $lines;
-    }
-
-    /**
-     * Make common syslog header (see rfc5424 or rfc3164)
-     */
-    protected function makeCommonSyslogHeader(int $severity, DateTimeInterface $datetime): string
-    {
-        $priority = $severity + $this->facility;
-
-        if (!$pid = getmypid()) {
-            $pid = '-';
-        }
-
-        if (!$hostname = gethostname()) {
-            $hostname = '-';
-        }
-
-        if ($this->rfc === self::RFC3164) {
-            // see https://github.com/phpstan/phpstan/issues/5348
-            // @phpstan-ignore-next-line
-            $dateNew = $datetime->setTimezone(new \DateTimeZone('UTC'));
-            $date = $dateNew->format($this->dateFormats[$this->rfc]);
-
-            return "<$priority>" .
-                $date . " " .
-                $hostname . " " .
-                $this->ident . "[" . $pid . "]: ";
-        }
-
-        $date = $datetime->format($this->dateFormats[$this->rfc]);
-
-        return "<$priority>1 " .
-            $date . " " .
-            $hostname . " " .
-            $this->ident . " " .
-            $pid . " - - ";
-    }
-
-    /**
-     * Inject your own socket, mainly used for testing
-     */
-    public function setSocket(UdpSocket $socket): self
-    {
-        $this->socket = $socket;
-
-        return $this;
-    }
-}
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/Handler/TelegramBotHandler.php b/monolog/vendor/monolog/monolog/src/Monolog/Handler/TelegramBotHandler.php
deleted file mode 100644
index 8912eba5..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/Handler/TelegramBotHandler.php
+++ /dev/null
@@ -1,274 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use RuntimeException;
-use Monolog\Logger;
-use Monolog\Utils;
-
-/**
- * Handler send logs to Telegram using Telegram Bot API.
- *
- * How to use:
- *  1) Create telegram bot with https://telegram.me/BotFather
- *  2) Create a telegram channel where logs will be recorded.
- *  3) Add created bot from step 1 to the created channel from step 2.
- *
- * Use telegram bot API key from step 1 and channel name with '@' prefix from step 2 to create instance of TelegramBotHandler
- *
- * @link https://core.telegram.org/bots/api
- *
- * @author Mazur Alexandr <alexandrmazur96@gmail.com>
- *
- * @phpstan-import-type Record from \Monolog\Logger
- */
-class TelegramBotHandler extends AbstractProcessingHandler
-{
-    private const BOT_API = 'https://api.telegram.org/bot';
-
-    /**
-     * The available values of parseMode according to the Telegram api documentation
-     */
-    private const AVAILABLE_PARSE_MODES = [
-        'HTML',
-        'MarkdownV2',
-        'Markdown', // legacy mode without underline and strikethrough, use MarkdownV2 instead
-    ];
-
-    /**
-     * The maximum number of characters allowed in a message according to the Telegram api documentation
-     */
-    private const MAX_MESSAGE_LENGTH = 4096;
-
-    /**
-     * Telegram bot access token provided by BotFather.
-     * Create telegram bot with https://telegram.me/BotFather and use access token from it.
-     * @var string
-     */
-    private $apiKey;
-
-    /**
-     * Telegram channel name.
-     * Since to start with '@' symbol as prefix.
-     * @var string
-     */
-    private $channel;
-
-    /**
-     * The kind of formatting that is used for the message.
-     * See available options at https://core.telegram.org/bots/api#formatting-options
-     * or in AVAILABLE_PARSE_MODES
-     * @var ?string
-     */
-    private $parseMode;
-
-    /**
-     * Disables link previews for links in the message.
-     * @var ?bool
-     */
-    private $disableWebPagePreview;
-
-    /**
-     * Sends the message silently. Users will receive a notification with no sound.
-     * @var ?bool
-     */
-    private $disableNotification;
-
-    /**
-     * True - split a message longer than MAX_MESSAGE_LENGTH into parts and send in multiple messages.
-     * False - truncates a message that is too long.
-     * @var bool
-     */
-    private $splitLongMessages;
-
-    /**
-     * Adds 1-second delay between sending a split message (according to Telegram API to avoid 429 Too Many Requests).
-     * @var bool
-     */
-    private $delayBetweenMessages;
-
-    /**
-     * @param string $apiKey Telegram bot access token provided by BotFather
-     * @param string $channel Telegram channel name
-     * @param bool $splitLongMessages Split a message longer than MAX_MESSAGE_LENGTH into parts and send in multiple messages
-     * @param bool $delayBetweenMessages Adds delay between sending a split message according to Telegram API
-     * @throws MissingExtensionException
-     */
-    public function __construct(
-        string $apiKey,
-        string $channel,
-               $level = Logger::DEBUG,
-        bool   $bubble = true,
-        string $parseMode = null,
-        bool   $disableWebPagePreview = null,
-        bool   $disableNotification = null,
-        bool   $splitLongMessages = false,
-        bool   $delayBetweenMessages = false
-    )
-    {
-        if (!extension_loaded('curl')) {
-            throw new MissingExtensionException('The curl extension is needed to use the TelegramBotHandler');
-        }
-
-        parent::__construct($level, $bubble);
-
-        $this->apiKey = $apiKey;
-        $this->channel = $channel;
-        $this->setParseMode($parseMode);
-        $this->disableWebPagePreview($disableWebPagePreview);
-        $this->disableNotification($disableNotification);
-        $this->splitLongMessages($splitLongMessages);
-        $this->delayBetweenMessages($delayBetweenMessages);
-    }
-
-    public function setParseMode(string $parseMode = null): self
-    {
-        if ($parseMode !== null && !in_array($parseMode, self::AVAILABLE_PARSE_MODES)) {
-            throw new \InvalidArgumentException('Unknown parseMode, use one of these: ' . implode(', ', self::AVAILABLE_PARSE_MODES) . '.');
-        }
-
-        $this->parseMode = $parseMode;
-
-        return $this;
-    }
-
-    public function disableWebPagePreview(bool $disableWebPagePreview = null): self
-    {
-        $this->disableWebPagePreview = $disableWebPagePreview;
-
-        return $this;
-    }
-
-    public function disableNotification(bool $disableNotification = null): self
-    {
-        $this->disableNotification = $disableNotification;
-
-        return $this;
-    }
-
-    /**
-     * True - split a message longer than MAX_MESSAGE_LENGTH into parts and send in multiple messages.
-     * False - truncates a message that is too long.
-     * @param bool $splitLongMessages
-     * @return $this
-     */
-    public function splitLongMessages(bool $splitLongMessages = false): self
-    {
-        $this->splitLongMessages = $splitLongMessages;
-
-        return $this;
-    }
-
-    /**
-     * Adds 1-second delay between sending a split message (according to Telegram API to avoid 429 Too Many Requests).
-     * @param bool $delayBetweenMessages
-     * @return $this
-     */
-    public function delayBetweenMessages(bool $delayBetweenMessages = false): self
-    {
-        $this->delayBetweenMessages = $delayBetweenMessages;
-
-        return $this;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function handleBatch(array $records): void
-    {
-        /** @var Record[] $messages */
-        $messages = [];
-
-        foreach ($records as $record) {
-            if (!$this->isHandling($record)) {
-                continue;
-            }
-
-            if ($this->processors) {
-                /** @var Record $record */
-                $record = $this->processRecord($record);
-            }
-
-            $messages[] = $record;
-        }
-
-        if (!empty($messages)) {
-            $this->send((string)$this->getFormatter()->formatBatch($messages));
-        }
-    }
-
-    /**
-     * @inheritDoc
-     */
-    protected function write(array $record): void
-    {
-        $this->send($record['formatted']);
-    }
-
-    /**
-     * Send request to @link https://api.telegram.org/bot on SendMessage action.
-     * @param string $message
-     */
-    protected function send(string $message): void
-    {
-        $messages = $this->handleMessageLength($message);
-
-        foreach ($messages as $key => $msg) {
-            if ($this->delayBetweenMessages && $key > 0) {
-                sleep(1);
-            }
-
-            $this->sendCurl($msg);
-        }
-    }
-
-    protected function sendCurl(string $message): void
-    {
-        $ch = curl_init();
-        $url = self::BOT_API . $this->apiKey . '/SendMessage';
-        curl_setopt($ch, CURLOPT_URL, $url);
-        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-        curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, true);
-        curl_setopt($ch, CURLOPT_POSTFIELDS, http_build_query([
-            'text' => $message,
-            'chat_id' => $this->channel,
-            'parse_mode' => $this->parseMode,
-            'disable_web_page_preview' => $this->disableWebPagePreview,
-            'disable_notification' => $this->disableNotification,
-        ]));
-
-        $result = Curl\Util::execute($ch);
-        if (!is_string($result)) {
-            throw new RuntimeException('Telegram API error. Description: No response');
-        }
-        $result = json_decode($result, true);
-
-        if ($result['ok'] === false) {
-            throw new RuntimeException('Telegram API error. Description: ' . $result['description']);
-        }
-    }
-
-    /**
-     * Handle a message that is too long: truncates or splits into several
-     * @param string $message
-     * @return string[]
-     */
-    private function handleMessageLength(string $message): array
-    {
-        $truncatedMarker = ' (...truncated)';
-        if (!$this->splitLongMessages && strlen($message) > self::MAX_MESSAGE_LENGTH) {
-            return [Utils::substr($message, 0, self::MAX_MESSAGE_LENGTH - strlen($truncatedMarker)) . $truncatedMarker];
-        }
-
-        return str_split($message, self::MAX_MESSAGE_LENGTH);
-    }
-}
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/Handler/TestHandler.php b/monolog/vendor/monolog/monolog/src/Monolog/Handler/TestHandler.php
deleted file mode 100644
index 0986da27..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/Handler/TestHandler.php
+++ /dev/null
@@ -1,231 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\Logger;
-use Psr\Log\LogLevel;
-
-/**
- * Used for testing purposes.
- *
- * It records all records and gives you access to them for verification.
- *
- * @author Jordi Boggiano <j.boggiano@seld.be>
- *
- * @method bool hasEmergency($record)
- * @method bool hasAlert($record)
- * @method bool hasCritical($record)
- * @method bool hasError($record)
- * @method bool hasWarning($record)
- * @method bool hasNotice($record)
- * @method bool hasInfo($record)
- * @method bool hasDebug($record)
- *
- * @method bool hasEmergencyRecords()
- * @method bool hasAlertRecords()
- * @method bool hasCriticalRecords()
- * @method bool hasErrorRecords()
- * @method bool hasWarningRecords()
- * @method bool hasNoticeRecords()
- * @method bool hasInfoRecords()
- * @method bool hasDebugRecords()
- *
- * @method bool hasEmergencyThatContains($message)
- * @method bool hasAlertThatContains($message)
- * @method bool hasCriticalThatContains($message)
- * @method bool hasErrorThatContains($message)
- * @method bool hasWarningThatContains($message)
- * @method bool hasNoticeThatContains($message)
- * @method bool hasInfoThatContains($message)
- * @method bool hasDebugThatContains($message)
- *
- * @method bool hasEmergencyThatMatches($message)
- * @method bool hasAlertThatMatches($message)
- * @method bool hasCriticalThatMatches($message)
- * @method bool hasErrorThatMatches($message)
- * @method bool hasWarningThatMatches($message)
- * @method bool hasNoticeThatMatches($message)
- * @method bool hasInfoThatMatches($message)
- * @method bool hasDebugThatMatches($message)
- *
- * @method bool hasEmergencyThatPasses($message)
- * @method bool hasAlertThatPasses($message)
- * @method bool hasCriticalThatPasses($message)
- * @method bool hasErrorThatPasses($message)
- * @method bool hasWarningThatPasses($message)
- * @method bool hasNoticeThatPasses($message)
- * @method bool hasInfoThatPasses($message)
- * @method bool hasDebugThatPasses($message)
- *
- * @phpstan-import-type Record from \Monolog\Logger
- * @phpstan-import-type Level from \Monolog\Logger
- * @phpstan-import-type LevelName from \Monolog\Logger
- */
-class TestHandler extends AbstractProcessingHandler
-{
-    /** @var Record[] */
-    protected $records = [];
-    /** @var array<Level, Record[]> */
-    protected $recordsByLevel = [];
-    /** @var bool */
-    private $skipReset = false;
-
-    /**
-     * @return array
-     *
-     * @phpstan-return Record[]
-     */
-    public function getRecords()
-    {
-        return $this->records;
-    }
-
-    /**
-     * @return void
-     */
-    public function clear()
-    {
-        $this->records = [];
-        $this->recordsByLevel = [];
-    }
-
-    /**
-     * @return void
-     */
-    public function reset()
-    {
-        if (!$this->skipReset) {
-            $this->clear();
-        }
-    }
-
-    /**
-     * @return void
-     */
-    public function setSkipReset(bool $skipReset)
-    {
-        $this->skipReset = $skipReset;
-    }
-
-    /**
-     * @param string|int $level Logging level value or name
-     *
-     * @phpstan-param Level|LevelName|LogLevel::* $level
-     */
-    public function hasRecords($level): bool
-    {
-        return isset($this->recordsByLevel[Logger::toMonologLevel($level)]);
-    }
-
-    /**
-     * @param string|array $record Either a message string or an array containing message and optionally context keys that will be checked against all records
-     * @param string|int   $level  Logging level value or name
-     *
-     * @phpstan-param array{message: string, context?: mixed[]}|string $record
-     * @phpstan-param Level|LevelName|LogLevel::*                      $level
-     */
-    public function hasRecord($record, $level): bool
-    {
-        if (is_string($record)) {
-            $record = array('message' => $record);
-        }
-
-        return $this->hasRecordThatPasses(function ($rec) use ($record) {
-            if ($rec['message'] !== $record['message']) {
-                return false;
-            }
-            if (isset($record['context']) && $rec['context'] !== $record['context']) {
-                return false;
-            }
-
-            return true;
-        }, $level);
-    }
-
-    /**
-     * @param string|int $level Logging level value or name
-     *
-     * @phpstan-param Level|LevelName|LogLevel::* $level
-     */
-    public function hasRecordThatContains(string $message, $level): bool
-    {
-        return $this->hasRecordThatPasses(function ($rec) use ($message) {
-            return strpos($rec['message'], $message) !== false;
-        }, $level);
-    }
-
-    /**
-     * @param string|int $level Logging level value or name
-     *
-     * @phpstan-param Level|LevelName|LogLevel::* $level
-     */
-    public function hasRecordThatMatches(string $regex, $level): bool
-    {
-        return $this->hasRecordThatPasses(function (array $rec) use ($regex): bool {
-            return preg_match($regex, $rec['message']) > 0;
-        }, $level);
-    }
-
-    /**
-     * @param  string|int $level Logging level value or name
-     * @return bool
-     *
-     * @psalm-param callable(Record, int): mixed $predicate
-     * @phpstan-param Level|LevelName|LogLevel::* $level
-     */
-    public function hasRecordThatPasses(callable $predicate, $level)
-    {
-        $level = Logger::toMonologLevel($level);
-
-        if (!isset($this->recordsByLevel[$level])) {
-            return false;
-        }
-
-        foreach ($this->recordsByLevel[$level] as $i => $rec) {
-            if ($predicate($rec, $i)) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function write(array $record): void
-    {
-        $this->recordsByLevel[$record['level']][] = $record;
-        $this->records[] = $record;
-    }
-
-    /**
-     * @param  string  $method
-     * @param  mixed[] $args
-     * @return bool
-     */
-    public function __call($method, $args)
-    {
-        if (preg_match('/(.*)(Debug|Info|Notice|Warning|Error|Critical|Alert|Emergency)(.*)/', $method, $matches) > 0) {
-            $genericMethod = $matches[1] . ('Records' !== $matches[3] ? 'Record' : '') . $matches[3];
-            $level = constant('Monolog\Logger::' . strtoupper($matches[2]));
-            $callback = [$this, $genericMethod];
-            if (is_callable($callback)) {
-                $args[] = $level;
-
-                return call_user_func_array($callback, $args);
-            }
-        }
-
-        throw new \BadMethodCallException('Call to undefined method ' . get_class($this) . '::' . $method . '()');
-    }
-}
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/Handler/WebRequestRecognizerTrait.php b/monolog/vendor/monolog/monolog/src/Monolog/Handler/WebRequestRecognizerTrait.php
deleted file mode 100644
index c8183528..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/Handler/WebRequestRecognizerTrait.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-trait WebRequestRecognizerTrait
-{
-    /**
-     * Checks if PHP's serving a web request
-     * @return bool
-     */
-    protected function isWebRequest(): bool
-    {
-        return 'cli' !== \PHP_SAPI && 'phpdbg' !== \PHP_SAPI;
-    }
-}
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/Handler/WhatFailureGroupHandler.php b/monolog/vendor/monolog/monolog/src/Monolog/Handler/WhatFailureGroupHandler.php
deleted file mode 100644
index b6d3d3b1..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/Handler/WhatFailureGroupHandler.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-/**
- * Forwards records to multiple handlers suppressing failures of each handler
- * and continuing through to give every handler a chance to succeed.
- *
- * @author Craig D'Amelio <craig@damelio.ca>
- *
- * @phpstan-import-type Record from \Monolog\Logger
- */
-class WhatFailureGroupHandler extends GroupHandler
-{
-    /**
-     * {@inheritDoc}
-     */
-    public function handle(array $record): bool
-    {
-        if ($this->processors) {
-            /** @var Record $record */
-            $record = $this->processRecord($record);
-        }
-
-        foreach ($this->handlers as $handler) {
-            try {
-                $handler->handle($record);
-            } catch (\Throwable $e) {
-                // What failure?
-            }
-        }
-
-        return false === $this->bubble;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function handleBatch(array $records): void
-    {
-        if ($this->processors) {
-            $processed = array();
-            foreach ($records as $record) {
-                $processed[] = $this->processRecord($record);
-            }
-            /** @var Record[] $records */
-            $records = $processed;
-        }
-
-        foreach ($this->handlers as $handler) {
-            try {
-                $handler->handleBatch($records);
-            } catch (\Throwable $e) {
-                // What failure?
-            }
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function close(): void
-    {
-        foreach ($this->handlers as $handler) {
-            try {
-                $handler->close();
-            } catch (\Throwable $e) {
-                // What failure?
-            }
-        }
-    }
-}
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/Handler/ZendMonitorHandler.php b/monolog/vendor/monolog/monolog/src/Monolog/Handler/ZendMonitorHandler.php
deleted file mode 100644
index ddd46d8c..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/Handler/ZendMonitorHandler.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Handler;
-
-use Monolog\Formatter\FormatterInterface;
-use Monolog\Formatter\NormalizerFormatter;
-use Monolog\Logger;
-
-/**
- * Handler sending logs to Zend Monitor
- *
- * @author  Christian Bergau <cbergau86@gmail.com>
- * @author  Jason Davis <happydude@jasondavis.net>
- *
- * @phpstan-import-type FormattedRecord from AbstractProcessingHandler
- */
-class ZendMonitorHandler extends AbstractProcessingHandler
-{
-    /**
-     * Monolog level / ZendMonitor Custom Event priority map
-     *
-     * @var array<int, int>
-     */
-    protected $levelMap = [];
-
-    /**
-     * @throws MissingExtensionException
-     */
-    public function __construct($level = Logger::DEBUG, bool $bubble = true)
-    {
-        if (!function_exists('zend_monitor_custom_event')) {
-            throw new MissingExtensionException(
-                'You must have Zend Server installed with Zend Monitor enabled in order to use this handler'
-            );
-        }
-        //zend monitor constants are not defined if zend monitor is not enabled.
-        $this->levelMap = [
-            Logger::DEBUG     => \ZEND_MONITOR_EVENT_SEVERITY_INFO,
-            Logger::INFO      => \ZEND_MONITOR_EVENT_SEVERITY_INFO,
-            Logger::NOTICE    => \ZEND_MONITOR_EVENT_SEVERITY_INFO,
-            Logger::WARNING   => \ZEND_MONITOR_EVENT_SEVERITY_WARNING,
-            Logger::ERROR     => \ZEND_MONITOR_EVENT_SEVERITY_ERROR,
-            Logger::CRITICAL  => \ZEND_MONITOR_EVENT_SEVERITY_ERROR,
-            Logger::ALERT     => \ZEND_MONITOR_EVENT_SEVERITY_ERROR,
-            Logger::EMERGENCY => \ZEND_MONITOR_EVENT_SEVERITY_ERROR,
-        ];
-        parent::__construct($level, $bubble);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    protected function write(array $record): void
-    {
-        $this->writeZendMonitorCustomEvent(
-            Logger::getLevelName($record['level']),
-            $record['message'],
-            $record['formatted'],
-            $this->levelMap[$record['level']]
-        );
-    }
-
-    /**
-     * Write to Zend Monitor Events
-     * @param string $type      Text displayed in "Class Name (custom)" field
-     * @param string $message   Text displayed in "Error String"
-     * @param array  $formatted Displayed in Custom Variables tab
-     * @param int    $severity  Set the event severity level (-1,0,1)
-     *
-     * @phpstan-param FormattedRecord $formatted
-     */
-    protected function writeZendMonitorCustomEvent(string $type, string $message, array $formatted, int $severity): void
-    {
-        zend_monitor_custom_event($type, $message, $formatted, $severity);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function getDefaultFormatter(): FormatterInterface
-    {
-        return new NormalizerFormatter();
-    }
-
-    /**
-     * @return array<int, int>
-     */
-    public function getLevelMap(): array
-    {
-        return $this->levelMap;
-    }
-}
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/LogRecord.php b/monolog/vendor/monolog/monolog/src/Monolog/LogRecord.php
deleted file mode 100644
index 702807d7..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/LogRecord.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog;
-
-use ArrayAccess;
-
-/**
- * Monolog log record interface for forward compatibility with Monolog 3.0
- *
- * This is just present in Monolog 2.4+ to allow interoperable code to be written against
- * both versions by type-hinting arguments as `array|\Monolog\LogRecord $record`
- *
- * Do not rely on this interface for other purposes, and do not implement it.
- *
- * @author Jordi Boggiano <j.boggiano@seld.be>
- * @template-extends \ArrayAccess<'message'|'level'|'context'|'level_name'|'channel'|'datetime'|'extra'|'formatted', mixed>
- * @phpstan-import-type Record from Logger
- */
-interface LogRecord extends \ArrayAccess
-{
-    /**
-     * @phpstan-return Record
-     */
-    public function toArray(): array;
-}
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/Logger.php b/monolog/vendor/monolog/monolog/src/Monolog/Logger.php
deleted file mode 100644
index 84a2f551..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/Logger.php
+++ /dev/null
@@ -1,761 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog;
-
-use DateTimeZone;
-use Monolog\Handler\HandlerInterface;
-use Psr\Log\LoggerInterface;
-use Psr\Log\InvalidArgumentException;
-use Psr\Log\LogLevel;
-use Throwable;
-use Stringable;
-
-/**
- * Monolog log channel
- *
- * It contains a stack of Handlers and a stack of Processors,
- * and uses them to store records that are added to it.
- *
- * @author Jordi Boggiano <j.boggiano@seld.be>
- *
- * @phpstan-type Level Logger::DEBUG|Logger::INFO|Logger::NOTICE|Logger::WARNING|Logger::ERROR|Logger::CRITICAL|Logger::ALERT|Logger::EMERGENCY
- * @phpstan-type LevelName 'DEBUG'|'INFO'|'NOTICE'|'WARNING'|'ERROR'|'CRITICAL'|'ALERT'|'EMERGENCY'
- * @phpstan-type Record array{message: string, context: mixed[], level: Level, level_name: LevelName, channel: string, datetime: \DateTimeImmutable, extra: mixed[]}
- */
-class Logger implements LoggerInterface, ResettableInterface
-{
-    /**
-     * Detailed debug information
-     */
-    public const DEBUG = 100;
-
-    /**
-     * Interesting events
-     *
-     * Examples: User logs in, SQL logs.
-     */
-    public const INFO = 200;
-
-    /**
-     * Uncommon events
-     */
-    public const NOTICE = 250;
-
-    /**
-     * Exceptional occurrences that are not errors
-     *
-     * Examples: Use of deprecated APIs, poor use of an API,
-     * undesirable things that are not necessarily wrong.
-     */
-    public const WARNING = 300;
-
-    /**
-     * Runtime errors
-     */
-    public const ERROR = 400;
-
-    /**
-     * Critical conditions
-     *
-     * Example: Application component unavailable, unexpected exception.
-     */
-    public const CRITICAL = 500;
-
-    /**
-     * Action must be taken immediately
-     *
-     * Example: Entire website down, database unavailable, etc.
-     * This should trigger the SMS alerts and wake you up.
-     */
-    public const ALERT = 550;
-
-    /**
-     * Urgent alert.
-     */
-    public const EMERGENCY = 600;
-
-    /**
-     * Monolog API version
-     *
-     * This is only bumped when API breaks are done and should
-     * follow the major version of the library
-     *
-     * @var int
-     */
-    public const API = 2;
-
-    /**
-     * This is a static variable and not a constant to serve as an extension point for custom levels
-     *
-     * @var array<int, string> $levels Logging levels with the levels as key
-     *
-     * @phpstan-var array<Level, LevelName> $levels Logging levels with the levels as key
-     */
-    protected static $levels = [
-        self::DEBUG     => 'DEBUG',
-        self::INFO      => 'INFO',
-        self::NOTICE    => 'NOTICE',
-        self::WARNING   => 'WARNING',
-        self::ERROR     => 'ERROR',
-        self::CRITICAL  => 'CRITICAL',
-        self::ALERT     => 'ALERT',
-        self::EMERGENCY => 'EMERGENCY',
-    ];
-
-    /**
-     * Mapping between levels numbers defined in RFC 5424 and Monolog ones
-     *
-     * @phpstan-var array<int, Level> $rfc_5424_levels
-     */
-    private const RFC_5424_LEVELS = [
-        7 => self::DEBUG,
-        6 => self::INFO,
-        5 => self::NOTICE,
-        4 => self::WARNING,
-        3 => self::ERROR,
-        2 => self::CRITICAL,
-        1 => self::ALERT,
-        0 => self::EMERGENCY,
-    ];
-
-    /**
-     * @var string
-     */
-    protected $name;
-
-    /**
-     * The handler stack
-     *
-     * @var HandlerInterface[]
-     */
-    protected $handlers;
-
-    /**
-     * Processors that will process all log records
-     *
-     * To process records of a single handler instead, add the processor on that specific handler
-     *
-     * @var callable[]
-     */
-    protected $processors;
-
-    /**
-     * @var bool
-     */
-    protected $microsecondTimestamps = true;
-
-    /**
-     * @var DateTimeZone
-     */
-    protected $timezone;
-
-    /**
-     * @var callable|null
-     */
-    protected $exceptionHandler;
-
-    /**
-     * @var int Keeps track of depth to prevent infinite logging loops
-     */
-    private $logDepth = 0;
-
-    /**
-     * @var \WeakMap<\Fiber, int>|null Keeps track of depth inside fibers to prevent infinite logging loops
-     */
-    private $fiberLogDepth;
-
-    /**
-     * @var bool Whether to detect infinite logging loops
-     *
-     * This can be disabled via {@see useLoggingLoopDetection} if you have async handlers that do not play well with this
-     */
-    private $detectCycles = true;
-
-    /**
-     * @psalm-param array<callable(array): array> $processors
-     *
-     * @param string             $name       The logging channel, a simple descriptive name that is attached to all log records
-     * @param HandlerInterface[] $handlers   Optional stack of handlers, the first one in the array is called first, etc.
-     * @param callable[]         $processors Optional array of processors
-     * @param DateTimeZone|null  $timezone   Optional timezone, if not provided date_default_timezone_get() will be used
-     */
-    public function __construct(string $name, array $handlers = [], array $processors = [], ?DateTimeZone $timezone = null)
-    {
-        $this->name = $name;
-        $this->setHandlers($handlers);
-        $this->processors = $processors;
-        $this->timezone = $timezone ?: new DateTimeZone(date_default_timezone_get() ?: 'UTC');
-
-        if (\PHP_VERSION_ID >= 80100) {
-            // Local variable for phpstan, see https://github.com/phpstan/phpstan/issues/6732#issuecomment-1111118412
-            /** @var \WeakMap<\Fiber, int> $fiberLogDepth */
-            $fiberLogDepth = new \WeakMap();
-            $this->fiberLogDepth = $fiberLogDepth;
-        }
-    }
-
-    public function getName(): string
-    {
-        return $this->name;
-    }
-
-    /**
-     * Return a new cloned instance with the name changed
-     */
-    public function withName(string $name): self
-    {
-        $new = clone $this;
-        $new->name = $name;
-
-        return $new;
-    }
-
-    /**
-     * Pushes a handler on to the stack.
-     */
-    public function pushHandler(HandlerInterface $handler): self
-    {
-        array_unshift($this->handlers, $handler);
-
-        return $this;
-    }
-
-    /**
-     * Pops a handler from the stack
-     *
-     * @throws \LogicException If empty handler stack
-     */
-    public function popHandler(): HandlerInterface
-    {
-        if (!$this->handlers) {
-            throw new \LogicException('You tried to pop from an empty handler stack.');
-        }
-
-        return array_shift($this->handlers);
-    }
-
-    /**
-     * Set handlers, replacing all existing ones.
-     *
-     * If a map is passed, keys will be ignored.
-     *
-     * @param HandlerInterface[] $handlers
-     */
-    public function setHandlers(array $handlers): self
-    {
-        $this->handlers = [];
-        foreach (array_reverse($handlers) as $handler) {
-            $this->pushHandler($handler);
-        }
-
-        return $this;
-    }
-
-    /**
-     * @return HandlerInterface[]
-     */
-    public function getHandlers(): array
-    {
-        return $this->handlers;
-    }
-
-    /**
-     * Adds a processor on to the stack.
-     */
-    public function pushProcessor(callable $callback): self
-    {
-        array_unshift($this->processors, $callback);
-
-        return $this;
-    }
-
-    /**
-     * Removes the processor on top of the stack and returns it.
-     *
-     * @throws \LogicException If empty processor stack
-     * @return callable
-     */
-    public function popProcessor(): callable
-    {
-        if (!$this->processors) {
-            throw new \LogicException('You tried to pop from an empty processor stack.');
-        }
-
-        return array_shift($this->processors);
-    }
-
-    /**
-     * @return callable[]
-     */
-    public function getProcessors(): array
-    {
-        return $this->processors;
-    }
-
-    /**
-     * Control the use of microsecond resolution timestamps in the 'datetime'
-     * member of new records.
-     *
-     * As of PHP7.1 microseconds are always included by the engine, so
-     * there is no performance penalty and Monolog 2 enabled microseconds
-     * by default. This function lets you disable them though in case you want
-     * to suppress microseconds from the output.
-     *
-     * @param bool $micro True to use microtime() to create timestamps
-     */
-    public function useMicrosecondTimestamps(bool $micro): self
-    {
-        $this->microsecondTimestamps = $micro;
-
-        return $this;
-    }
-
-    public function useLoggingLoopDetection(bool $detectCycles): self
-    {
-        $this->detectCycles = $detectCycles;
-
-        return $this;
-    }
-
-    /**
-     * Adds a log record.
-     *
-     * @param  int               $level    The logging level (a Monolog or RFC 5424 level)
-     * @param  string            $message  The log message
-     * @param  mixed[]           $context  The log context
-     * @param  DateTimeImmutable $datetime Optional log date to log into the past or future
-     * @return bool              Whether the record has been processed
-     *
-     * @phpstan-param Level $level
-     */
-    public function addRecord(int $level, string $message, array $context = [], DateTimeImmutable $datetime = null): bool
-    {
-        if (isset(self::RFC_5424_LEVELS[$level])) {
-            $level = self::RFC_5424_LEVELS[$level];
-        }
-
-        if ($this->detectCycles) {
-            if (\PHP_VERSION_ID >= 80100 && $fiber = \Fiber::getCurrent()) {
-                $this->fiberLogDepth[$fiber] = $this->fiberLogDepth[$fiber] ?? 0;
-                $logDepth = ++$this->fiberLogDepth[$fiber];
-            } else {
-                $logDepth = ++$this->logDepth;
-            }
-        } else {
-            $logDepth = 0;
-        }
-
-        if ($logDepth === 3) {
-            $this->warning('A possible infinite logging loop was detected and aborted. It appears some of your handler code is triggering logging, see the previous log record for a hint as to what may be the cause.');
-            return false;
-        } elseif ($logDepth >= 5) { // log depth 4 is let through, so we can log the warning above
-            return false;
-        }
-
-        try {
-            $record = null;
-
-            foreach ($this->handlers as $handler) {
-                if (null === $record) {
-                    // skip creating the record as long as no handler is going to handle it
-                    if (!$handler->isHandling(['level' => $level])) {
-                        continue;
-                    }
-
-                    $levelName = static::getLevelName($level);
-
-                    $record = [
-                        'message' => $message,
-                        'context' => $context,
-                        'level' => $level,
-                        'level_name' => $levelName,
-                        'channel' => $this->name,
-                        'datetime' => $datetime ?? new DateTimeImmutable($this->microsecondTimestamps, $this->timezone),
-                        'extra' => [],
-                    ];
-
-                    try {
-                        foreach ($this->processors as $processor) {
-                            $record = $processor($record);
-                        }
-                    } catch (Throwable $e) {
-                        $this->handleException($e, $record);
-
-                        return true;
-                    }
-                }
-
-                // once the record exists, send it to all handlers as long as the bubbling chain is not interrupted
-                try {
-                    if (true === $handler->handle($record)) {
-                        break;
-                    }
-                } catch (Throwable $e) {
-                    $this->handleException($e, $record);
-
-                    return true;
-                }
-            }
-        } finally {
-            if ($this->detectCycles) {
-                if (isset($fiber)) {
-                    $this->fiberLogDepth[$fiber]--;
-                } else {
-                    $this->logDepth--;
-                }
-            }
-        }
-
-        return null !== $record;
-    }
-
-    /**
-     * Ends a log cycle and frees all resources used by handlers.
-     *
-     * Closing a Handler means flushing all buffers and freeing any open resources/handles.
-     * Handlers that have been closed should be able to accept log records again and re-open
-     * themselves on demand, but this may not always be possible depending on implementation.
-     *
-     * This is useful at the end of a request and will be called automatically on every handler
-     * when they get destructed.
-     */
-    public function close(): void
-    {
-        foreach ($this->handlers as $handler) {
-            $handler->close();
-        }
-    }
-
-    /**
-     * Ends a log cycle and resets all handlers and processors to their initial state.
-     *
-     * Resetting a Handler or a Processor means flushing/cleaning all buffers, resetting internal
-     * state, and getting it back to a state in which it can receive log records again.
-     *
-     * This is useful in case you want to avoid logs leaking between two requests or jobs when you
-     * have a long running process like a worker or an application server serving multiple requests
-     * in one process.
-     */
-    public function reset(): void
-    {
-        foreach ($this->handlers as $handler) {
-            if ($handler instanceof ResettableInterface) {
-                $handler->reset();
-            }
-        }
-
-        foreach ($this->processors as $processor) {
-            if ($processor instanceof ResettableInterface) {
-                $processor->reset();
-            }
-        }
-    }
-
-    /**
-     * Gets all supported logging levels.
-     *
-     * @return array<string, int> Assoc array with human-readable level names => level codes.
-     * @phpstan-return array<LevelName, Level>
-     */
-    public static function getLevels(): array
-    {
-        return array_flip(static::$levels);
-    }
-
-    /**
-     * Gets the name of the logging level.
-     *
-     * @throws \Psr\Log\InvalidArgumentException If level is not defined
-     *
-     * @phpstan-param  Level     $level
-     * @phpstan-return LevelName
-     */
-    public static function getLevelName(int $level): string
-    {
-        if (!isset(static::$levels[$level])) {
-            throw new InvalidArgumentException('Level "'.$level.'" is not defined, use one of: '.implode(', ', array_keys(static::$levels)));
-        }
-
-        return static::$levels[$level];
-    }
-
-    /**
-     * Converts PSR-3 levels to Monolog ones if necessary
-     *
-     * @param  string|int                        $level Level number (monolog) or name (PSR-3)
-     * @throws \Psr\Log\InvalidArgumentException If level is not defined
-     *
-     * @phpstan-param  Level|LevelName|LogLevel::* $level
-     * @phpstan-return Level
-     */
-    public static function toMonologLevel($level): int
-    {
-        if (is_string($level)) {
-            if (is_numeric($level)) {
-                /** @phpstan-ignore-next-line */
-                return intval($level);
-            }
-
-            // Contains chars of all log levels and avoids using strtoupper() which may have
-            // strange results depending on locale (for example, "i" will become "İ" in Turkish locale)
-            $upper = strtr($level, 'abcdefgilmnortuwy', 'ABCDEFGILMNORTUWY');
-            if (defined(__CLASS__.'::'.$upper)) {
-                return constant(__CLASS__ . '::' . $upper);
-            }
-
-            throw new InvalidArgumentException('Level "'.$level.'" is not defined, use one of: '.implode(', ', array_keys(static::$levels) + static::$levels));
-        }
-
-        if (!is_int($level)) {
-            throw new InvalidArgumentException('Level "'.var_export($level, true).'" is not defined, use one of: '.implode(', ', array_keys(static::$levels) + static::$levels));
-        }
-
-        return $level;
-    }
-
-    /**
-     * Checks whether the Logger has a handler that listens on the given level
-     *
-     * @phpstan-param Level $level
-     */
-    public function isHandling(int $level): bool
-    {
-        $record = [
-            'level' => $level,
-        ];
-
-        foreach ($this->handlers as $handler) {
-            if ($handler->isHandling($record)) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Set a custom exception handler that will be called if adding a new record fails
-     *
-     * The callable will receive an exception object and the record that failed to be logged
-     */
-    public function setExceptionHandler(?callable $callback): self
-    {
-        $this->exceptionHandler = $callback;
-
-        return $this;
-    }
-
-    public function getExceptionHandler(): ?callable
-    {
-        return $this->exceptionHandler;
-    }
-
-    /**
-     * Adds a log record at an arbitrary level.
-     *
-     * This method allows for compatibility with common interfaces.
-     *
-     * @param mixed             $level   The log level (a Monolog, PSR-3 or RFC 5424 level)
-     * @param string|Stringable $message The log message
-     * @param mixed[]           $context The log context
-     *
-     * @phpstan-param Level|LevelName|LogLevel::* $level
-     */
-    public function log($level, $message, array $context = []): void
-    {
-        if (!is_int($level) && !is_string($level)) {
-            throw new \InvalidArgumentException('$level is expected to be a string or int');
-        }
-
-        if (isset(self::RFC_5424_LEVELS[$level])) {
-            $level = self::RFC_5424_LEVELS[$level];
-        }
-
-        $level = static::toMonologLevel($level);
-
-        $this->addRecord($level, (string) $message, $context);
-    }
-
-    /**
-     * Adds a log record at the DEBUG level.
-     *
-     * This method allows for compatibility with common interfaces.
-     *
-     * @param string|Stringable $message The log message
-     * @param mixed[]           $context The log context
-     */
-    public function debug($message, array $context = []): void
-    {
-        $this->addRecord(static::DEBUG, (string) $message, $context);
-    }
-
-    /**
-     * Adds a log record at the INFO level.
-     *
-     * This method allows for compatibility with common interfaces.
-     *
-     * @param string|Stringable $message The log message
-     * @param mixed[]           $context The log context
-     */
-    public function info($message, array $context = []): void
-    {
-        $this->addRecord(static::INFO, (string) $message, $context);
-    }
-
-    /**
-     * Adds a log record at the NOTICE level.
-     *
-     * This method allows for compatibility with common interfaces.
-     *
-     * @param string|Stringable $message The log message
-     * @param mixed[]           $context The log context
-     */
-    public function notice($message, array $context = []): void
-    {
-        $this->addRecord(static::NOTICE, (string) $message, $context);
-    }
-
-    /**
-     * Adds a log record at the WARNING level.
-     *
-     * This method allows for compatibility with common interfaces.
-     *
-     * @param string|Stringable $message The log message
-     * @param mixed[]           $context The log context
-     */
-    public function warning($message, array $context = []): void
-    {
-        $this->addRecord(static::WARNING, (string) $message, $context);
-    }
-
-    /**
-     * Adds a log record at the ERROR level.
-     *
-     * This method allows for compatibility with common interfaces.
-     *
-     * @param string|Stringable $message The log message
-     * @param mixed[]           $context The log context
-     */
-    public function error($message, array $context = []): void
-    {
-        $this->addRecord(static::ERROR, (string) $message, $context);
-    }
-
-    /**
-     * Adds a log record at the CRITICAL level.
-     *
-     * This method allows for compatibility with common interfaces.
-     *
-     * @param string|Stringable $message The log message
-     * @param mixed[]           $context The log context
-     */
-    public function critical($message, array $context = []): void
-    {
-        $this->addRecord(static::CRITICAL, (string) $message, $context);
-    }
-
-    /**
-     * Adds a log record at the ALERT level.
-     *
-     * This method allows for compatibility with common interfaces.
-     *
-     * @param string|Stringable $message The log message
-     * @param mixed[]           $context The log context
-     */
-    public function alert($message, array $context = []): void
-    {
-        $this->addRecord(static::ALERT, (string) $message, $context);
-    }
-
-    /**
-     * Adds a log record at the EMERGENCY level.
-     *
-     * This method allows for compatibility with common interfaces.
-     *
-     * @param string|Stringable $message The log message
-     * @param mixed[]           $context The log context
-     */
-    public function emergency($message, array $context = []): void
-    {
-        $this->addRecord(static::EMERGENCY, (string) $message, $context);
-    }
-
-    /**
-     * Sets the timezone to be used for the timestamp of log records.
-     */
-    public function setTimezone(DateTimeZone $tz): self
-    {
-        $this->timezone = $tz;
-
-        return $this;
-    }
-
-    /**
-     * Returns the timezone to be used for the timestamp of log records.
-     */
-    public function getTimezone(): DateTimeZone
-    {
-        return $this->timezone;
-    }
-
-    /**
-     * Delegates exception management to the custom exception handler,
-     * or throws the exception if no custom handler is set.
-     *
-     * @param array $record
-     * @phpstan-param Record $record
-     */
-    protected function handleException(Throwable $e, array $record): void
-    {
-        if (!$this->exceptionHandler) {
-            throw $e;
-        }
-
-        ($this->exceptionHandler)($e, $record);
-    }
-
-    /**
-     * @return array<string, mixed>
-     */
-    public function __serialize(): array
-    {
-        return [
-            'name' => $this->name,
-            'handlers' => $this->handlers,
-            'processors' => $this->processors,
-            'microsecondTimestamps' => $this->microsecondTimestamps,
-            'timezone' => $this->timezone,
-            'exceptionHandler' => $this->exceptionHandler,
-            'logDepth' => $this->logDepth,
-            'detectCycles' => $this->detectCycles,
-        ];
-    }
-
-    /**
-     * @param array<string, mixed> $data
-     */
-    public function __unserialize(array $data): void
-    {
-        foreach (['name', 'handlers', 'processors', 'microsecondTimestamps', 'timezone', 'exceptionHandler', 'logDepth', 'detectCycles'] as $property) {
-            if (isset($data[$property])) {
-                $this->$property = $data[$property];
-            }
-        }
-
-        if (\PHP_VERSION_ID >= 80100) {
-            // Local variable for phpstan, see https://github.com/phpstan/phpstan/issues/6732#issuecomment-1111118412
-            /** @var \WeakMap<\Fiber, int> $fiberLogDepth */
-            $fiberLogDepth = new \WeakMap();
-            $this->fiberLogDepth = $fiberLogDepth;
-        }
-    }
-}
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/Processor/GitProcessor.php b/monolog/vendor/monolog/monolog/src/Monolog/Processor/GitProcessor.php
deleted file mode 100644
index 8166bdca..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/Processor/GitProcessor.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Processor;
-
-use Monolog\Logger;
-use Psr\Log\LogLevel;
-
-/**
- * Injects Git branch and Git commit SHA in all records
- *
- * @author Nick Otter
- * @author Jordi Boggiano <j.boggiano@seld.be>
- *
- * @phpstan-import-type Level from \Monolog\Logger
- * @phpstan-import-type LevelName from \Monolog\Logger
- */
-class GitProcessor implements ProcessorInterface
-{
-    /** @var int */
-    private $level;
-    /** @var array{branch: string, commit: string}|array<never>|null */
-    private static $cache = null;
-
-    /**
-     * @param string|int $level The minimum logging level at which this Processor will be triggered
-     *
-     * @phpstan-param Level|LevelName|LogLevel::* $level
-     */
-    public function __construct($level = Logger::DEBUG)
-    {
-        $this->level = Logger::toMonologLevel($level);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function __invoke(array $record): array
-    {
-        // return if the level is not high enough
-        if ($record['level'] < $this->level) {
-            return $record;
-        }
-
-        $record['extra']['git'] = self::getGitInfo();
-
-        return $record;
-    }
-
-    /**
-     * @return array{branch: string, commit: string}|array<never>
-     */
-    private static function getGitInfo(): array
-    {
-        if (self::$cache) {
-            return self::$cache;
-        }
-
-        $branches = `git branch -v --no-abbrev`;
-        if ($branches && preg_match('{^\* (.+?)\s+([a-f0-9]{40})(?:\s|$)}m', $branches, $matches)) {
-            return self::$cache = [
-                'branch' => $matches[1],
-                'commit' => $matches[2],
-            ];
-        }
-
-        return self::$cache = [];
-    }
-}
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/Processor/HostnameProcessor.php b/monolog/vendor/monolog/monolog/src/Monolog/Processor/HostnameProcessor.php
deleted file mode 100644
index 91fda7d6..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/Processor/HostnameProcessor.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Processor;
-
-/**
- * Injects value of gethostname in all records
- */
-class HostnameProcessor implements ProcessorInterface
-{
-    /** @var string */
-    private static $host;
-
-    public function __construct()
-    {
-        self::$host = (string) gethostname();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function __invoke(array $record): array
-    {
-        $record['extra']['hostname'] = self::$host;
-
-        return $record;
-    }
-}
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/Processor/IntrospectionProcessor.php b/monolog/vendor/monolog/monolog/src/Monolog/Processor/IntrospectionProcessor.php
deleted file mode 100644
index a32e76b2..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/Processor/IntrospectionProcessor.php
+++ /dev/null
@@ -1,123 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Processor;
-
-use Monolog\Logger;
-use Psr\Log\LogLevel;
-
-/**
- * Injects line/file:class/function where the log message came from
- *
- * Warning: This only works if the handler processes the logs directly.
- * If you put the processor on a handler that is behind a FingersCrossedHandler
- * for example, the processor will only be called once the trigger level is reached,
- * and all the log records will have the same file/line/.. data from the call that
- * triggered the FingersCrossedHandler.
- *
- * @author Jordi Boggiano <j.boggiano@seld.be>
- *
- * @phpstan-import-type Level from \Monolog\Logger
- * @phpstan-import-type LevelName from \Monolog\Logger
- */
-class IntrospectionProcessor implements ProcessorInterface
-{
-    /** @var int */
-    private $level;
-    /** @var string[] */
-    private $skipClassesPartials;
-    /** @var int */
-    private $skipStackFramesCount;
-    /** @var string[] */
-    private $skipFunctions = [
-        'call_user_func',
-        'call_user_func_array',
-    ];
-
-    /**
-     * @param string|int $level               The minimum logging level at which this Processor will be triggered
-     * @param string[]   $skipClassesPartials
-     *
-     * @phpstan-param Level|LevelName|LogLevel::* $level
-     */
-    public function __construct($level = Logger::DEBUG, array $skipClassesPartials = [], int $skipStackFramesCount = 0)
-    {
-        $this->level = Logger::toMonologLevel($level);
-        $this->skipClassesPartials = array_merge(['Monolog\\'], $skipClassesPartials);
-        $this->skipStackFramesCount = $skipStackFramesCount;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function __invoke(array $record): array
-    {
-        // return if the level is not high enough
-        if ($record['level'] < $this->level) {
-            return $record;
-        }
-
-        $trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
-
-        // skip first since it's always the current method
-        array_shift($trace);
-        // the call_user_func call is also skipped
-        array_shift($trace);
-
-        $i = 0;
-
-        while ($this->isTraceClassOrSkippedFunction($trace, $i)) {
-            if (isset($trace[$i]['class'])) {
-                foreach ($this->skipClassesPartials as $part) {
-                    if (strpos($trace[$i]['class'], $part) !== false) {
-                        $i++;
-
-                        continue 2;
-                    }
-                }
-            } elseif (in_array($trace[$i]['function'], $this->skipFunctions)) {
-                $i++;
-
-                continue;
-            }
-
-            break;
-        }
-
-        $i += $this->skipStackFramesCount;
-
-        // we should have the call source now
-        $record['extra'] = array_merge(
-            $record['extra'],
-            [
-                'file'      => isset($trace[$i - 1]['file']) ? $trace[$i - 1]['file'] : null,
-                'line'      => isset($trace[$i - 1]['line']) ? $trace[$i - 1]['line'] : null,
-                'class'     => isset($trace[$i]['class']) ? $trace[$i]['class'] : null,
-                'callType'  => isset($trace[$i]['type']) ? $trace[$i]['type'] : null,
-                'function'  => isset($trace[$i]['function']) ? $trace[$i]['function'] : null,
-            ]
-        );
-
-        return $record;
-    }
-
-    /**
-     * @param array[] $trace
-     */
-    private function isTraceClassOrSkippedFunction(array $trace, int $index): bool
-    {
-        if (!isset($trace[$index])) {
-            return false;
-        }
-
-        return isset($trace[$index]['class']) || in_array($trace[$index]['function'], $this->skipFunctions);
-    }
-}
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/Processor/MemoryPeakUsageProcessor.php b/monolog/vendor/monolog/monolog/src/Monolog/Processor/MemoryPeakUsageProcessor.php
deleted file mode 100644
index 37c756fc..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/Processor/MemoryPeakUsageProcessor.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Processor;
-
-/**
- * Injects memory_get_peak_usage in all records
- *
- * @see Monolog\Processor\MemoryProcessor::__construct() for options
- * @author Rob Jensen
- */
-class MemoryPeakUsageProcessor extends MemoryProcessor
-{
-    /**
-     * {@inheritDoc}
-     */
-    public function __invoke(array $record): array
-    {
-        $usage = memory_get_peak_usage($this->realUsage);
-
-        if ($this->useFormatting) {
-            $usage = $this->formatBytes($usage);
-        }
-
-        $record['extra']['memory_peak_usage'] = $usage;
-
-        return $record;
-    }
-}
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/Processor/MemoryProcessor.php b/monolog/vendor/monolog/monolog/src/Monolog/Processor/MemoryProcessor.php
deleted file mode 100644
index 227deb7c..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/Processor/MemoryProcessor.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Processor;
-
-/**
- * Some methods that are common for all memory processors
- *
- * @author Rob Jensen
- */
-abstract class MemoryProcessor implements ProcessorInterface
-{
-    /**
-     * @var bool If true, get the real size of memory allocated from system. Else, only the memory used by emalloc() is reported.
-     */
-    protected $realUsage;
-
-    /**
-     * @var bool If true, then format memory size to human readable string (MB, KB, B depending on size)
-     */
-    protected $useFormatting;
-
-    /**
-     * @param bool $realUsage     Set this to true to get the real size of memory allocated from system.
-     * @param bool $useFormatting If true, then format memory size to human readable string (MB, KB, B depending on size)
-     */
-    public function __construct(bool $realUsage = true, bool $useFormatting = true)
-    {
-        $this->realUsage = $realUsage;
-        $this->useFormatting = $useFormatting;
-    }
-
-    /**
-     * Formats bytes into a human readable string if $this->useFormatting is true, otherwise return $bytes as is
-     *
-     * @param  int        $bytes
-     * @return string|int Formatted string if $this->useFormatting is true, otherwise return $bytes as int
-     */
-    protected function formatBytes(int $bytes)
-    {
-        if (!$this->useFormatting) {
-            return $bytes;
-        }
-
-        if ($bytes > 1024 * 1024) {
-            return round($bytes / 1024 / 1024, 2).' MB';
-        } elseif ($bytes > 1024) {
-            return round($bytes / 1024, 2).' KB';
-        }
-
-        return $bytes . ' B';
-    }
-}
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/Processor/MemoryUsageProcessor.php b/monolog/vendor/monolog/monolog/src/Monolog/Processor/MemoryUsageProcessor.php
deleted file mode 100644
index e141921e..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/Processor/MemoryUsageProcessor.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Processor;
-
-/**
- * Injects memory_get_usage in all records
- *
- * @see Monolog\Processor\MemoryProcessor::__construct() for options
- * @author Rob Jensen
- */
-class MemoryUsageProcessor extends MemoryProcessor
-{
-    /**
-     * {@inheritDoc}
-     */
-    public function __invoke(array $record): array
-    {
-        $usage = memory_get_usage($this->realUsage);
-
-        if ($this->useFormatting) {
-            $usage = $this->formatBytes($usage);
-        }
-
-        $record['extra']['memory_usage'] = $usage;
-
-        return $record;
-    }
-}
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/Processor/MercurialProcessor.php b/monolog/vendor/monolog/monolog/src/Monolog/Processor/MercurialProcessor.php
deleted file mode 100644
index d4a628f5..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/Processor/MercurialProcessor.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Processor;
-
-use Monolog\Logger;
-use Psr\Log\LogLevel;
-
-/**
- * Injects Hg branch and Hg revision number in all records
- *
- * @author Jonathan A. Schweder <jonathanschweder@gmail.com>
- *
- * @phpstan-import-type LevelName from \Monolog\Logger
- * @phpstan-import-type Level from \Monolog\Logger
- */
-class MercurialProcessor implements ProcessorInterface
-{
-    /** @var Level */
-    private $level;
-    /** @var array{branch: string, revision: string}|array<never>|null */
-    private static $cache = null;
-
-    /**
-     * @param int|string $level The minimum logging level at which this Processor will be triggered
-     *
-     * @phpstan-param Level|LevelName|LogLevel::* $level
-     */
-    public function __construct($level = Logger::DEBUG)
-    {
-        $this->level = Logger::toMonologLevel($level);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function __invoke(array $record): array
-    {
-        // return if the level is not high enough
-        if ($record['level'] < $this->level) {
-            return $record;
-        }
-
-        $record['extra']['hg'] = self::getMercurialInfo();
-
-        return $record;
-    }
-
-    /**
-     * @return array{branch: string, revision: string}|array<never>
-     */
-    private static function getMercurialInfo(): array
-    {
-        if (self::$cache) {
-            return self::$cache;
-        }
-
-        $result = explode(' ', trim(`hg id -nb`));
-
-        if (count($result) >= 3) {
-            return self::$cache = [
-                'branch' => $result[1],
-                'revision' => $result[2],
-            ];
-        }
-
-        return self::$cache = [];
-    }
-}
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/Processor/ProcessIdProcessor.php b/monolog/vendor/monolog/monolog/src/Monolog/Processor/ProcessIdProcessor.php
deleted file mode 100644
index 3b939a95..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/Processor/ProcessIdProcessor.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Processor;
-
-/**
- * Adds value of getmypid into records
- *
- * @author Andreas Hörnicke
- */
-class ProcessIdProcessor implements ProcessorInterface
-{
-    /**
-     * {@inheritDoc}
-     */
-    public function __invoke(array $record): array
-    {
-        $record['extra']['process_id'] = getmypid();
-
-        return $record;
-    }
-}
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/Processor/ProcessorInterface.php b/monolog/vendor/monolog/monolog/src/Monolog/Processor/ProcessorInterface.php
deleted file mode 100644
index 5defb7eb..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/Processor/ProcessorInterface.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Processor;
-
-/**
- * An optional interface to allow labelling Monolog processors.
- *
- * @author Nicolas Grekas <p@tchwork.com>
- *
- * @phpstan-import-type Record from \Monolog\Logger
- */
-interface ProcessorInterface
-{
-    /**
-     * @return array The processed record
-     *
-     * @phpstan-param  Record $record
-     * @phpstan-return Record
-     */
-    public function __invoke(array $record);
-}
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/Processor/PsrLogMessageProcessor.php b/monolog/vendor/monolog/monolog/src/Monolog/Processor/PsrLogMessageProcessor.php
deleted file mode 100644
index e7c12176..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/Processor/PsrLogMessageProcessor.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Processor;
-
-use Monolog\Utils;
-
-/**
- * Processes a record's message according to PSR-3 rules
- *
- * It replaces {foo} with the value from $context['foo']
- *
- * @author Jordi Boggiano <j.boggiano@seld.be>
- */
-class PsrLogMessageProcessor implements ProcessorInterface
-{
-    public const SIMPLE_DATE = "Y-m-d\TH:i:s.uP";
-
-    /** @var string|null */
-    private $dateFormat;
-
-    /** @var bool */
-    private $removeUsedContextFields;
-
-    /**
-     * @param string|null $dateFormat              The format of the timestamp: one supported by DateTime::format
-     * @param bool        $removeUsedContextFields If set to true the fields interpolated into message gets unset
-     */
-    public function __construct(?string $dateFormat = null, bool $removeUsedContextFields = false)
-    {
-        $this->dateFormat = $dateFormat;
-        $this->removeUsedContextFields = $removeUsedContextFields;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function __invoke(array $record): array
-    {
-        if (false === strpos($record['message'], '{')) {
-            return $record;
-        }
-
-        $replacements = [];
-        foreach ($record['context'] as $key => $val) {
-            $placeholder = '{' . $key . '}';
-            if (strpos($record['message'], $placeholder) === false) {
-                continue;
-            }
-
-            if (is_null($val) || is_scalar($val) || (is_object($val) && method_exists($val, "__toString"))) {
-                $replacements[$placeholder] = $val;
-            } elseif ($val instanceof \DateTimeInterface) {
-                if (!$this->dateFormat && $val instanceof \Monolog\DateTimeImmutable) {
-                    // handle monolog dates using __toString if no specific dateFormat was asked for
-                    // so that it follows the useMicroseconds flag
-                    $replacements[$placeholder] = (string) $val;
-                } else {
-                    $replacements[$placeholder] = $val->format($this->dateFormat ?: static::SIMPLE_DATE);
-                }
-            } elseif ($val instanceof \UnitEnum) {
-                $replacements[$placeholder] = $val instanceof \BackedEnum ? $val->value : $val->name;
-            } elseif (is_object($val)) {
-                $replacements[$placeholder] = '[object '.Utils::getClass($val).']';
-            } elseif (is_array($val)) {
-                $replacements[$placeholder] = 'array'.Utils::jsonEncode($val, null, true);
-            } else {
-                $replacements[$placeholder] = '['.gettype($val).']';
-            }
-
-            if ($this->removeUsedContextFields) {
-                unset($record['context'][$key]);
-            }
-        }
-
-        $record['message'] = strtr($record['message'], $replacements);
-
-        return $record;
-    }
-}
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/Processor/TagProcessor.php b/monolog/vendor/monolog/monolog/src/Monolog/Processor/TagProcessor.php
deleted file mode 100644
index 80f18747..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/Processor/TagProcessor.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Processor;
-
-/**
- * Adds a tags array into record
- *
- * @author Martijn Riemers
- */
-class TagProcessor implements ProcessorInterface
-{
-    /** @var string[] */
-    private $tags;
-
-    /**
-     * @param string[] $tags
-     */
-    public function __construct(array $tags = [])
-    {
-        $this->setTags($tags);
-    }
-
-    /**
-     * @param string[] $tags
-     */
-    public function addTags(array $tags = []): self
-    {
-        $this->tags = array_merge($this->tags, $tags);
-
-        return $this;
-    }
-
-    /**
-     * @param string[] $tags
-     */
-    public function setTags(array $tags = []): self
-    {
-        $this->tags = $tags;
-
-        return $this;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function __invoke(array $record): array
-    {
-        $record['extra']['tags'] = $this->tags;
-
-        return $record;
-    }
-}
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/Processor/UidProcessor.php b/monolog/vendor/monolog/monolog/src/Monolog/Processor/UidProcessor.php
deleted file mode 100644
index a27b74db..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/Processor/UidProcessor.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Processor;
-
-use Monolog\ResettableInterface;
-
-/**
- * Adds a unique identifier into records
- *
- * @author Simon Mönch <sm@webfactory.de>
- */
-class UidProcessor implements ProcessorInterface, ResettableInterface
-{
-    /** @var string */
-    private $uid;
-
-    public function __construct(int $length = 7)
-    {
-        if ($length > 32 || $length < 1) {
-            throw new \InvalidArgumentException('The uid length must be an integer between 1 and 32');
-        }
-
-        $this->uid = $this->generateUid($length);
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function __invoke(array $record): array
-    {
-        $record['extra']['uid'] = $this->uid;
-
-        return $record;
-    }
-
-    public function getUid(): string
-    {
-        return $this->uid;
-    }
-
-    public function reset()
-    {
-        $this->uid = $this->generateUid(strlen($this->uid));
-    }
-
-    private function generateUid(int $length): string
-    {
-        return substr(bin2hex(random_bytes((int) ceil($length / 2))), 0, $length);
-    }
-}
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/Processor/WebProcessor.php b/monolog/vendor/monolog/monolog/src/Monolog/Processor/WebProcessor.php
deleted file mode 100644
index 51850e17..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/Processor/WebProcessor.php
+++ /dev/null
@@ -1,111 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Processor;
-
-/**
- * Injects url/method and remote IP of the current web request in all records
- *
- * @author Jordi Boggiano <j.boggiano@seld.be>
- */
-class WebProcessor implements ProcessorInterface
-{
-    /**
-     * @var array<string, mixed>|\ArrayAccess<string, mixed>
-     */
-    protected $serverData;
-
-    /**
-     * Default fields
-     *
-     * Array is structured as [key in record.extra => key in $serverData]
-     *
-     * @var array<string, string>
-     */
-    protected $extraFields = [
-        'url'         => 'REQUEST_URI',
-        'ip'          => 'REMOTE_ADDR',
-        'http_method' => 'REQUEST_METHOD',
-        'server'      => 'SERVER_NAME',
-        'referrer'    => 'HTTP_REFERER',
-        'user_agent'  => 'HTTP_USER_AGENT',
-    ];
-
-    /**
-     * @param array<string, mixed>|\ArrayAccess<string, mixed>|null $serverData  Array or object w/ ArrayAccess that provides access to the $_SERVER data
-     * @param array<string, string>|array<string>|null              $extraFields Field names and the related key inside $serverData to be added (or just a list of field names to use the default configured $serverData mapping). If not provided it defaults to: [url, ip, http_method, server, referrer] + unique_id if present in server data
-     */
-    public function __construct($serverData = null, array $extraFields = null)
-    {
-        if (null === $serverData) {
-            $this->serverData = &$_SERVER;
-        } elseif (is_array($serverData) || $serverData instanceof \ArrayAccess) {
-            $this->serverData = $serverData;
-        } else {
-            throw new \UnexpectedValueException('$serverData must be an array or object implementing ArrayAccess.');
-        }
-
-        $defaultEnabled = ['url', 'ip', 'http_method', 'server', 'referrer'];
-        if (isset($this->serverData['UNIQUE_ID'])) {
-            $this->extraFields['unique_id'] = 'UNIQUE_ID';
-            $defaultEnabled[] = 'unique_id';
-        }
-
-        if (null === $extraFields) {
-            $extraFields = $defaultEnabled;
-        }
-        if (isset($extraFields[0])) {
-            foreach (array_keys($this->extraFields) as $fieldName) {
-                if (!in_array($fieldName, $extraFields)) {
-                    unset($this->extraFields[$fieldName]);
-                }
-            }
-        } else {
-            $this->extraFields = $extraFields;
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    public function __invoke(array $record): array
-    {
-        // skip processing if for some reason request data
-        // is not present (CLI or wonky SAPIs)
-        if (!isset($this->serverData['REQUEST_URI'])) {
-            return $record;
-        }
-
-        $record['extra'] = $this->appendExtraFields($record['extra']);
-
-        return $record;
-    }
-
-    public function addExtraField(string $extraName, string $serverName): self
-    {
-        $this->extraFields[$extraName] = $serverName;
-
-        return $this;
-    }
-
-    /**
-     * @param  mixed[] $extra
-     * @return mixed[]
-     */
-    private function appendExtraFields(array $extra): array
-    {
-        foreach ($this->extraFields as $extraName => $serverName) {
-            $extra[$extraName] = $this->serverData[$serverName] ?? null;
-        }
-
-        return $extra;
-    }
-}
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/Registry.php b/monolog/vendor/monolog/monolog/src/Monolog/Registry.php
deleted file mode 100644
index ae94ae6c..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/Registry.php
+++ /dev/null
@@ -1,134 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog;
-
-use InvalidArgumentException;
-
-/**
- * Monolog log registry
- *
- * Allows to get `Logger` instances in the global scope
- * via static method calls on this class.
- *
- * <code>
- * $application = new Monolog\Logger('application');
- * $api = new Monolog\Logger('api');
- *
- * Monolog\Registry::addLogger($application);
- * Monolog\Registry::addLogger($api);
- *
- * function testLogger()
- * {
- *     Monolog\Registry::api()->error('Sent to $api Logger instance');
- *     Monolog\Registry::application()->error('Sent to $application Logger instance');
- * }
- * </code>
- *
- * @author Tomas Tatarko <tomas@tatarko.sk>
- */
-class Registry
-{
-    /**
-     * List of all loggers in the registry (by named indexes)
-     *
-     * @var Logger[]
-     */
-    private static $loggers = [];
-
-    /**
-     * Adds new logging channel to the registry
-     *
-     * @param  Logger                    $logger    Instance of the logging channel
-     * @param  string|null               $name      Name of the logging channel ($logger->getName() by default)
-     * @param  bool                      $overwrite Overwrite instance in the registry if the given name already exists?
-     * @throws \InvalidArgumentException If $overwrite set to false and named Logger instance already exists
-     * @return void
-     */
-    public static function addLogger(Logger $logger, ?string $name = null, bool $overwrite = false)
-    {
-        $name = $name ?: $logger->getName();
-
-        if (isset(self::$loggers[$name]) && !$overwrite) {
-            throw new InvalidArgumentException('Logger with the given name already exists');
-        }
-
-        self::$loggers[$name] = $logger;
-    }
-
-    /**
-     * Checks if such logging channel exists by name or instance
-     *
-     * @param string|Logger $logger Name or logger instance
-     */
-    public static function hasLogger($logger): bool
-    {
-        if ($logger instanceof Logger) {
-            $index = array_search($logger, self::$loggers, true);
-
-            return false !== $index;
-        }
-
-        return isset(self::$loggers[$logger]);
-    }
-
-    /**
-     * Removes instance from registry by name or instance
-     *
-     * @param string|Logger $logger Name or logger instance
-     */
-    public static function removeLogger($logger): void
-    {
-        if ($logger instanceof Logger) {
-            if (false !== ($idx = array_search($logger, self::$loggers, true))) {
-                unset(self::$loggers[$idx]);
-            }
-        } else {
-            unset(self::$loggers[$logger]);
-        }
-    }
-
-    /**
-     * Clears the registry
-     */
-    public static function clear(): void
-    {
-        self::$loggers = [];
-    }
-
-    /**
-     * Gets Logger instance from the registry
-     *
-     * @param  string                    $name Name of the requested Logger instance
-     * @throws \InvalidArgumentException If named Logger instance is not in the registry
-     */
-    public static function getInstance($name): Logger
-    {
-        if (!isset(self::$loggers[$name])) {
-            throw new InvalidArgumentException(sprintf('Requested "%s" logger instance is not in the registry', $name));
-        }
-
-        return self::$loggers[$name];
-    }
-
-    /**
-     * Gets Logger instance from the registry via static method call
-     *
-     * @param  string                    $name      Name of the requested Logger instance
-     * @param  mixed[]                   $arguments Arguments passed to static method call
-     * @throws \InvalidArgumentException If named Logger instance is not in the registry
-     * @return Logger                    Requested instance of Logger
-     */
-    public static function __callStatic($name, $arguments)
-    {
-        return self::getInstance($name);
-    }
-}
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/ResettableInterface.php b/monolog/vendor/monolog/monolog/src/Monolog/ResettableInterface.php
deleted file mode 100644
index 2c5fd785..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/ResettableInterface.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog;
-
-/**
- * Handler or Processor implementing this interface will be reset when Logger::reset() is called.
- *
- * Resetting ends a log cycle gets them back to their initial state.
- *
- * Resetting a Handler or a Processor means flushing/cleaning all buffers, resetting internal
- * state, and getting it back to a state in which it can receive log records again.
- *
- * This is useful in case you want to avoid logs leaking between two requests or jobs when you
- * have a long running process like a worker or an application server serving multiple requests
- * in one process.
- *
- * @author Grégoire Pineau <lyrixx@lyrixx.info>
- */
-interface ResettableInterface
-{
-    /**
-     * @return void
-     */
-    public function reset();
-}
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/SignalHandler.php b/monolog/vendor/monolog/monolog/src/Monolog/SignalHandler.php
deleted file mode 100644
index d730eea3..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/SignalHandler.php
+++ /dev/null
@@ -1,120 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog;
-
-use Psr\Log\LoggerInterface;
-use Psr\Log\LogLevel;
-use ReflectionExtension;
-
-/**
- * Monolog POSIX signal handler
- *
- * @author Robert Gust-Bardon <robert@gust-bardon.org>
- *
- * @phpstan-import-type Level from \Monolog\Logger
- * @phpstan-import-type LevelName from \Monolog\Logger
- */
-class SignalHandler
-{
-    /** @var LoggerInterface */
-    private $logger;
-
-    /** @var array<int, callable|string|int> SIG_DFL, SIG_IGN or previous callable */
-    private $previousSignalHandler = [];
-    /** @var array<int, int> */
-    private $signalLevelMap = [];
-    /** @var array<int, bool> */
-    private $signalRestartSyscalls = [];
-
-    public function __construct(LoggerInterface $logger)
-    {
-        $this->logger = $logger;
-    }
-
-    /**
-     * @param  int|string $level           Level or level name
-     * @param  bool       $callPrevious
-     * @param  bool       $restartSyscalls
-     * @param  bool|null  $async
-     * @return $this
-     *
-     * @phpstan-param Level|LevelName|LogLevel::* $level
-     */
-    public function registerSignalHandler(int $signo, $level = LogLevel::CRITICAL, bool $callPrevious = true, bool $restartSyscalls = true, ?bool $async = true): self
-    {
-        if (!extension_loaded('pcntl') || !function_exists('pcntl_signal')) {
-            return $this;
-        }
-
-        $level = Logger::toMonologLevel($level);
-
-        if ($callPrevious) {
-            $handler = pcntl_signal_get_handler($signo);
-            $this->previousSignalHandler[$signo] = $handler;
-        } else {
-            unset($this->previousSignalHandler[$signo]);
-        }
-        $this->signalLevelMap[$signo] = $level;
-        $this->signalRestartSyscalls[$signo] = $restartSyscalls;
-
-        if ($async !== null) {
-            pcntl_async_signals($async);
-        }
-
-        pcntl_signal($signo, [$this, 'handleSignal'], $restartSyscalls);
-
-        return $this;
-    }
-
-    /**
-     * @param mixed $siginfo
-     */
-    public function handleSignal(int $signo, $siginfo = null): void
-    {
-        static $signals = [];
-
-        if (!$signals && extension_loaded('pcntl')) {
-            $pcntl = new ReflectionExtension('pcntl');
-            // HHVM 3.24.2 returns an empty array.
-            foreach ($pcntl->getConstants() ?: get_defined_constants(true)['Core'] as $name => $value) {
-                if (substr($name, 0, 3) === 'SIG' && $name[3] !== '_' && is_int($value)) {
-                    $signals[$value] = $name;
-                }
-            }
-        }
-
-        $level = $this->signalLevelMap[$signo] ?? LogLevel::CRITICAL;
-        $signal = $signals[$signo] ?? $signo;
-        $context = $siginfo ?? [];
-        $this->logger->log($level, sprintf('Program received signal %s', $signal), $context);
-
-        if (!isset($this->previousSignalHandler[$signo])) {
-            return;
-        }
-
-        if ($this->previousSignalHandler[$signo] === SIG_DFL) {
-            if (extension_loaded('pcntl') && function_exists('pcntl_signal') && function_exists('pcntl_sigprocmask') && function_exists('pcntl_signal_dispatch')
-                && extension_loaded('posix') && function_exists('posix_getpid') && function_exists('posix_kill')
-            ) {
-                $restartSyscalls = $this->signalRestartSyscalls[$signo] ?? true;
-                pcntl_signal($signo, SIG_DFL, $restartSyscalls);
-                pcntl_sigprocmask(SIG_UNBLOCK, [$signo], $oldset);
-                posix_kill(posix_getpid(), $signo);
-                pcntl_signal_dispatch();
-                pcntl_sigprocmask(SIG_SETMASK, $oldset);
-                pcntl_signal($signo, [$this, 'handleSignal'], $restartSyscalls);
-            }
-        } elseif (is_callable($this->previousSignalHandler[$signo])) {
-            $this->previousSignalHandler[$signo]($signo, $siginfo);
-        }
-    }
-}
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/Test/TestCase.php b/monolog/vendor/monolog/monolog/src/Monolog/Test/TestCase.php
deleted file mode 100644
index bc0b425e..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/Test/TestCase.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog\Test;
-
-use Monolog\Logger;
-use Monolog\DateTimeImmutable;
-use Monolog\Formatter\FormatterInterface;
-
-/**
- * Lets you easily generate log records and a dummy formatter for testing purposes
- *
- * @author Jordi Boggiano <j.boggiano@seld.be>
- *
- * @phpstan-import-type Record from \Monolog\Logger
- * @phpstan-import-type Level from \Monolog\Logger
- *
- * @internal feel free to reuse this to test your own handlers, this is marked internal to avoid issues with PHPStorm https://github.com/Seldaek/monolog/issues/1677
- */
-class TestCase extends \PHPUnit\Framework\TestCase
-{
-    public function tearDown(): void
-    {
-        parent::tearDown();
-
-        if (isset($this->handler)) {
-            unset($this->handler);
-        }
-    }
-
-    /**
-     * @param mixed[] $context
-     *
-     * @return array Record
-     *
-     * @phpstan-param  Level $level
-     * @phpstan-return Record
-     */
-    protected function getRecord(int $level = Logger::WARNING, string $message = 'test', array $context = []): array
-    {
-        return [
-            'message' => (string) $message,
-            'context' => $context,
-            'level' => $level,
-            'level_name' => Logger::getLevelName($level),
-            'channel' => 'test',
-            'datetime' => new DateTimeImmutable(true),
-            'extra' => [],
-        ];
-    }
-
-    /**
-     * @phpstan-return Record[]
-     */
-    protected function getMultipleRecords(): array
-    {
-        return [
-            $this->getRecord(Logger::DEBUG, 'debug message 1'),
-            $this->getRecord(Logger::DEBUG, 'debug message 2'),
-            $this->getRecord(Logger::INFO, 'information'),
-            $this->getRecord(Logger::WARNING, 'warning'),
-            $this->getRecord(Logger::ERROR, 'error'),
-        ];
-    }
-
-    protected function getIdentityFormatter(): FormatterInterface
-    {
-        $formatter = $this->createMock(FormatterInterface::class);
-        $formatter->expects($this->any())
-            ->method('format')
-            ->will($this->returnCallback(function ($record) {
-                return $record['message'];
-            }));
-
-        return $formatter;
-    }
-}
diff --git a/monolog/vendor/monolog/monolog/src/Monolog/Utils.php b/monolog/vendor/monolog/monolog/src/Monolog/Utils.php
deleted file mode 100644
index 360c4219..00000000
--- a/monolog/vendor/monolog/monolog/src/Monolog/Utils.php
+++ /dev/null
@@ -1,284 +0,0 @@
-<?php declare(strict_types=1);
-
-/*
- * This file is part of the Monolog package.
- *
- * (c) Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Monolog;
-
-final class Utils
-{
-    const DEFAULT_JSON_FLAGS = JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE | JSON_PRESERVE_ZERO_FRACTION | JSON_INVALID_UTF8_SUBSTITUTE | JSON_PARTIAL_OUTPUT_ON_ERROR;
-
-    public static function getClass(object $object): string
-    {
-        $class = \get_class($object);
-
-        if (false === ($pos = \strpos($class, "@anonymous\0"))) {
-            return $class;
-        }
-
-        if (false === ($parent = \get_parent_class($class))) {
-            return \substr($class, 0, $pos + 10);
-        }
-
-        return $parent . '@anonymous';
-    }
-
-    public static function substr(string $string, int $start, ?int $length = null): string
-    {
-        if (extension_loaded('mbstring')) {
-            return mb_strcut($string, $start, $length);
-        }
-
-        return substr($string, $start, (null === $length) ? strlen($string) : $length);
-    }
-
-    /**
-     * Makes sure if a relative path is passed in it is turned into an absolute path
-     *
-     * @param string $streamUrl stream URL or path without protocol
-     */
-    public static function canonicalizePath(string $streamUrl): string
-    {
-        $prefix = '';
-        if ('file://' === substr($streamUrl, 0, 7)) {
-            $streamUrl = substr($streamUrl, 7);
-            $prefix = 'file://';
-        }
-
-        // other type of stream, not supported
-        if (false !== strpos($streamUrl, '://')) {
-            return $streamUrl;
-        }
-
-        // already absolute
-        if (substr($streamUrl, 0, 1) === '/' || substr($streamUrl, 1, 1) === ':' || substr($streamUrl, 0, 2) === '\\\\') {
-            return $prefix.$streamUrl;
-        }
-
-        $streamUrl = getcwd() . '/' . $streamUrl;
-
-        return $prefix.$streamUrl;
-    }
-
-    /**
-     * Return the JSON representation of a value
-     *
-     * @param  mixed             $data
-     * @param  int               $encodeFlags  flags to pass to json encode, defaults to DEFAULT_JSON_FLAGS
-     * @param  bool              $ignoreErrors whether to ignore encoding errors or to throw on error, when ignored and the encoding fails, "null" is returned which is valid json for null
-     * @throws \RuntimeException if encoding fails and errors are not ignored
-     * @return string            when errors are ignored and the encoding fails, "null" is returned which is valid json for null
-     */
-    public static function jsonEncode($data, ?int $encodeFlags = null, bool $ignoreErrors = false): string
-    {
-        if (null === $encodeFlags) {
-            $encodeFlags = self::DEFAULT_JSON_FLAGS;
-        }
-
-        if ($ignoreErrors) {
-            $json = @json_encode($data, $encodeFlags);
-            if (false === $json) {
-                return 'null';
-            }
-
-            return $json;
-        }
-
-        $json = json_encode($data, $encodeFlags);
-        if (false === $json) {
-            $json = self::handleJsonError(json_last_error(), $data);
-        }
-
-        return $json;
-    }
-
-    /**
-     * Handle a json_encode failure.
-     *
-     * If the failure is due to invalid string encoding, try to clean the
-     * input and encode again. If the second encoding attempt fails, the
-     * initial error is not encoding related or the input can't be cleaned then
-     * raise a descriptive exception.
-     *
-     * @param  int               $code        return code of json_last_error function
-     * @param  mixed             $data        data that was meant to be encoded
-     * @param  int               $encodeFlags flags to pass to json encode, defaults to JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE | JSON_PRESERVE_ZERO_FRACTION
-     * @throws \RuntimeException if failure can't be corrected
-     * @return string            JSON encoded data after error correction
-     */
-    public static function handleJsonError(int $code, $data, ?int $encodeFlags = null): string
-    {
-        if ($code !== JSON_ERROR_UTF8) {
-            self::throwEncodeError($code, $data);
-        }
-
-        if (is_string($data)) {
-            self::detectAndCleanUtf8($data);
-        } elseif (is_array($data)) {
-            array_walk_recursive($data, array('Monolog\Utils', 'detectAndCleanUtf8'));
-        } else {
-            self::throwEncodeError($code, $data);
-        }
-
-        if (null === $encodeFlags) {
-            $encodeFlags = self::DEFAULT_JSON_FLAGS;
-        }
-
-        $json = json_encode($data, $encodeFlags);
-
-        if ($json === false) {
-            self::throwEncodeError(json_last_error(), $data);
-        }
-
-        return $json;
-    }
-
-    /**
-     * @internal
-     */
-    public static function pcreLastErrorMessage(int $code): string
-    {
-        if (PHP_VERSION_ID >= 80000) {
-            return preg_last_error_msg();
-        }
-
-        $constants = (get_defined_constants(true))['pcre'];
-        $constants = array_filter($constants, function ($key) {
-            return substr($key, -6) == '_ERROR';
-        }, ARRAY_FILTER_USE_KEY);
-
-        $constants = array_flip($constants);
-
-        return $constants[$code] ?? 'UNDEFINED_ERROR';
-    }
-
-    /**
-     * Throws an exception according to a given code with a customized message
-     *
-     * @param  int               $code return code of json_last_error function
-     * @param  mixed             $data data that was meant to be encoded
-     * @throws \RuntimeException
-     *
-     * @return never
-     */
-    private static function throwEncodeError(int $code, $data): void
-    {
-        switch ($code) {
-            case JSON_ERROR_DEPTH:
-                $msg = 'Maximum stack depth exceeded';
-                break;
-            case JSON_ERROR_STATE_MISMATCH:
-                $msg = 'Underflow or the modes mismatch';
-                break;
-            case JSON_ERROR_CTRL_CHAR:
-                $msg = 'Unexpected control character found';
-                break;
-            case JSON_ERROR_UTF8:
-                $msg = 'Malformed UTF-8 characters, possibly incorrectly encoded';
-                break;
-            default:
-                $msg = 'Unknown error';
-        }
-
-        throw new \RuntimeException('JSON encoding failed: '.$msg.'. Encoding: '.var_export($data, true));
-    }
-
-    /**
-     * Detect invalid UTF-8 string characters and convert to valid UTF-8.
-     *
-     * Valid UTF-8 input will be left unmodified, but strings containing
-     * invalid UTF-8 codepoints will be reencoded as UTF-8 with an assumed
-     * original encoding of ISO-8859-15. This conversion may result in
-     * incorrect output if the actual encoding was not ISO-8859-15, but it
-     * will be clean UTF-8 output and will not rely on expensive and fragile
-     * detection algorithms.
-     *
-     * Function converts the input in place in the passed variable so that it
-     * can be used as a callback for array_walk_recursive.
-     *
-     * @param mixed $data Input to check and convert if needed, passed by ref
-     */
-    private static function detectAndCleanUtf8(&$data): void
-    {
-        if (is_string($data) && !preg_match('//u', $data)) {
-            $data = preg_replace_callback(
-                '/[\x80-\xFF]+/',
-                function ($m) {
-                    return function_exists('mb_convert_encoding') ? mb_convert_encoding($m[0], 'UTF-8', 'ISO-8859-1') : utf8_encode($m[0]);
-                },
-                $data
-            );
-            if (!is_string($data)) {
-                $pcreErrorCode = preg_last_error();
-                throw new \RuntimeException('Failed to preg_replace_callback: ' . $pcreErrorCode . ' / ' . self::pcreLastErrorMessage($pcreErrorCode));
-            }
-            $data = str_replace(
-                ['¤', '¦', '¨', '´', '¸', '¼', '½', '¾'],
-                ['€', 'Š', 'š', 'Ž', 'ž', 'Œ', 'œ', 'Ÿ'],
-                $data
-            );
-        }
-    }
-
-    /**
-     * Converts a string with a valid 'memory_limit' format, to bytes.
-     *
-     * @param string|false $val
-     * @return int|false Returns an integer representing bytes. Returns FALSE in case of error.
-     */
-    public static function expandIniShorthandBytes($val)
-    {
-        if (!is_string($val)) {
-            return false;
-        }
-
-        // support -1
-        if ((int) $val < 0) {
-            return (int) $val;
-        }
-
-        if (!preg_match('/^\s*(?<val>\d+)(?:\.\d+)?\s*(?<unit>[gmk]?)\s*$/i', $val, $match)) {
-            return false;
-        }
-
-        $val = (int) $match['val'];
-        switch (strtolower($match['unit'] ?? '')) {
-            case 'g':
-                $val *= 1024;
-            case 'm':
-                $val *= 1024;
-            case 'k':
-                $val *= 1024;
-        }
-
-        return $val;
-    }
-
-    /**
-     * @param array<mixed> $record
-     */
-    public static function getRecordMessageForException(array $record): string
-    {
-        $context = '';
-        $extra = '';
-        try {
-            if ($record['context']) {
-                $context = "\nContext: " . json_encode($record['context']);
-            }
-            if ($record['extra']) {
-                $extra = "\nExtra: " . json_encode($record['extra']);
-            }
-        } catch (\Throwable $e) {
-            // noop
-        }
-
-        return "\nThe exception occurred while attempting to log: " . $record['message'] . $context . $extra;
-    }
-}
diff --git a/monolog/vendor/psr/log/LICENSE b/monolog/vendor/psr/log/LICENSE
deleted file mode 100644
index 474c952b..00000000
--- a/monolog/vendor/psr/log/LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2012 PHP Framework Interoperability Group
-
-Permission is hereby granted, free of charge, to any person obtaining a copy 
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights 
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell 
-copies of the Software, and to permit persons to whom the Software is 
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in 
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
diff --git a/monolog/vendor/psr/log/README.md b/monolog/vendor/psr/log/README.md
deleted file mode 100644
index a9f20c43..00000000
--- a/monolog/vendor/psr/log/README.md
+++ /dev/null
@@ -1,58 +0,0 @@
-PSR Log
-=======
-
-This repository holds all interfaces/classes/traits related to
-[PSR-3](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-3-logger-interface.md).
-
-Note that this is not a logger of its own. It is merely an interface that
-describes a logger. See the specification for more details.
-
-Installation
-------------
-
-```bash
-composer require psr/log
-```
-
-Usage
------
-
-If you need a logger, you can use the interface like this:
-
-```php
-<?php
-
-use Psr\Log\LoggerInterface;
-
-class Foo
-{
-    private $logger;
-
-    public function __construct(LoggerInterface $logger = null)
-    {
-        $this->logger = $logger;
-    }
-
-    public function doSomething()
-    {
-        if ($this->logger) {
-            $this->logger->info('Doing work');
-        }
-           
-        try {
-            $this->doSomethingElse();
-        } catch (Exception $exception) {
-            $this->logger->error('Oh no!', array('exception' => $exception));
-        }
-
-        // do something useful
-    }
-}
-```
-
-You can then pick one of the implementations of the interface to get a logger.
-
-If you want to implement the interface, you can require this package and
-implement `Psr\Log\LoggerInterface` in your code. Please read the
-[specification text](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-3-logger-interface.md)
-for details.
diff --git a/monolog/vendor/psr/log/composer.json b/monolog/vendor/psr/log/composer.json
deleted file mode 100644
index ca056953..00000000
--- a/monolog/vendor/psr/log/composer.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "name": "psr/log",
-    "description": "Common interface for logging libraries",
-    "keywords": ["psr", "psr-3", "log"],
-    "homepage": "https://github.com/php-fig/log",
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "PHP-FIG",
-            "homepage": "https://www.php-fig.org/"
-        }
-    ],
-    "require": {
-        "php": ">=5.3.0"
-    },
-    "autoload": {
-        "psr-4": {
-            "Psr\\Log\\": "Psr/Log/"
-        }
-    },
-    "extra": {
-        "branch-alias": {
-            "dev-master": "1.1.x-dev"
-        }
-    }
-}
diff --git a/morechoice/lang/C/messages.po b/morechoice/lang/C/messages.po
new file mode 100644
index 00000000..ac0af561
--- /dev/null
+++ b/morechoice/lang/C/messages.po
@@ -0,0 +1,338 @@
+# ADDON morechoice
+# Copyright (C) 
+# This file is distributed under the same license as the Friendica morechoice addon package.
+# 
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-08-07 15:04+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: morechoice.php:34
+msgid "Androgyne"
+msgstr ""
+
+#: morechoice.php:35
+msgid "Bear"
+msgstr ""
+
+#: morechoice.php:36
+msgid "Bigender"
+msgstr ""
+
+#: morechoice.php:37
+msgid "Cross dresser"
+msgstr ""
+
+#: morechoice.php:38
+msgid "Drag queen"
+msgstr ""
+
+#: morechoice.php:39
+msgid "Eunuch"
+msgstr ""
+
+#: morechoice.php:40
+msgid "Faux queen"
+msgstr ""
+
+#: morechoice.php:41
+msgid "Gender fluid"
+msgstr ""
+
+#: morechoice.php:42
+msgid "Kathoey"
+msgstr ""
+
+#: morechoice.php:43
+msgid "Lady"
+msgstr ""
+
+#: morechoice.php:44
+msgid "Lipstick lesbian"
+msgstr ""
+
+#: morechoice.php:45
+msgid "Metrosexual"
+msgstr ""
+
+#: morechoice.php:46
+msgid "Monk"
+msgstr ""
+
+#: morechoice.php:47
+msgid "Nun"
+msgstr ""
+
+#: morechoice.php:48
+msgid "Soft butch"
+msgstr ""
+
+#: morechoice.php:49
+msgid "Stone femme"
+msgstr ""
+
+#: morechoice.php:50
+msgid "Tomboy"
+msgstr ""
+
+#: morechoice.php:51
+msgid "Transman"
+msgstr ""
+
+#: morechoice.php:52
+msgid "Transwoman"
+msgstr ""
+
+#: morechoice.php:53
+msgid "Transvesti"
+msgstr ""
+
+#: morechoice.php:54
+msgid "Trigender"
+msgstr ""
+
+#: morechoice.php:55
+msgid "Can't remember"
+msgstr ""
+
+#: morechoice.php:56
+msgid "Hard to tell these days"
+msgstr ""
+
+#: morechoice.php:60
+msgid "Girls with big tits"
+msgstr ""
+
+#: morechoice.php:61
+msgid "Millionaires"
+msgstr ""
+
+#: morechoice.php:62
+msgid "Guys with big schlongs"
+msgstr ""
+
+#: morechoice.php:63
+msgid "Easy women"
+msgstr ""
+
+#: morechoice.php:64
+msgid "People with impaired mobility"
+msgstr ""
+
+#: morechoice.php:65
+msgid "Amputees"
+msgstr ""
+
+#: morechoice.php:66
+msgid "Statues, mannequins and immobility"
+msgstr ""
+
+#: morechoice.php:67
+msgid "Pain"
+msgstr ""
+
+#: morechoice.php:68
+msgid "Trans men"
+msgstr ""
+
+#: morechoice.php:69
+msgid "Older women"
+msgstr ""
+
+#: morechoice.php:70
+msgid "Asphyxiation"
+msgstr ""
+
+#: morechoice.php:71
+msgid "In public"
+msgstr ""
+
+#: morechoice.php:72
+msgid "In danger"
+msgstr ""
+
+#: morechoice.php:73
+msgid "Pretending to be male"
+msgstr ""
+
+#: morechoice.php:74
+msgid "Pretending to be female"
+msgstr ""
+
+#: morechoice.php:75
+msgid "Breats"
+msgstr ""
+
+#: morechoice.php:76
+msgid "Scat"
+msgstr ""
+
+#: morechoice.php:77
+msgid "Crying"
+msgstr ""
+
+#: morechoice.php:78
+msgid "Nappies/Diapers"
+msgstr ""
+
+#: morechoice.php:79
+msgid "Trees"
+msgstr ""
+
+#: morechoice.php:80
+msgid "Vomit"
+msgstr ""
+
+#: morechoice.php:81
+msgid "Murder"
+msgstr ""
+
+#: morechoice.php:82
+msgid "Fat people"
+msgstr ""
+
+#: morechoice.php:83
+msgid "Feet"
+msgstr ""
+
+#: morechoice.php:84
+msgid "Covered in insects"
+msgstr ""
+
+#: morechoice.php:85
+msgid "Turning a human being into furniture"
+msgstr ""
+
+#: morechoice.php:86
+msgid "Elderly people"
+msgstr ""
+
+#: morechoice.php:87
+msgid "Transgender people"
+msgstr ""
+
+#: morechoice.php:88
+msgid "Criminals"
+msgstr ""
+
+#: morechoice.php:89
+msgid "Stealing"
+msgstr ""
+
+#: morechoice.php:90
+msgid "Breast milk"
+msgstr ""
+
+#: morechoice.php:91
+msgid "Immersing genitals in liquids"
+msgstr ""
+
+#: morechoice.php:92
+msgid "Giants"
+msgstr ""
+
+#: morechoice.php:93
+msgid "Masochism"
+msgstr ""
+
+#: morechoice.php:94
+msgid "Cars"
+msgstr ""
+
+#: morechoice.php:95
+msgid "Menstruation"
+msgstr ""
+
+#: morechoice.php:96
+msgid "Mucus"
+msgstr ""
+
+#: morechoice.php:97
+msgid "Obscene language"
+msgstr ""
+
+#: morechoice.php:98
+msgid "Noses"
+msgstr ""
+
+#: morechoice.php:99
+msgid "Navels"
+msgstr ""
+
+#: morechoice.php:100
+msgid "Corpses"
+msgstr ""
+
+#: morechoice.php:101
+msgid "Smells"
+msgstr ""
+
+#: morechoice.php:102
+msgid "Buttocks"
+msgstr ""
+
+#: morechoice.php:103
+msgid "Nonliving objects"
+msgstr ""
+
+#: morechoice.php:104
+msgid "Sleeping people"
+msgstr ""
+
+#: morechoice.php:105
+msgid "Urination"
+msgstr ""
+
+#: morechoice.php:106
+msgid "Eating people"
+msgstr ""
+
+#: morechoice.php:107
+msgid "Being eaten"
+msgstr ""
+
+#: morechoice.php:108
+msgid "Animals"
+msgstr ""
+
+#: morechoice.php:109
+msgid "I'd rather just have some chocolate"
+msgstr ""
+
+#: morechoice.php:113
+msgid "Married to my job"
+msgstr ""
+
+#: morechoice.php:114
+msgid "Polygamist"
+msgstr ""
+
+#: morechoice.php:115
+msgid "Half married"
+msgstr ""
+
+#: morechoice.php:116
+msgid "Living in the past"
+msgstr ""
+
+#: morechoice.php:117
+msgid "Pretending to be over my ex"
+msgstr ""
+
+#: morechoice.php:118
+msgid "Hurt in the past"
+msgstr ""
+
+#: morechoice.php:119
+msgid "Wallowing in self-pity"
+msgstr ""
diff --git a/morechoice/lang/cs/messages.po b/morechoice/lang/cs/messages.po
new file mode 100644
index 00000000..a89b96ac
--- /dev/null
+++ b/morechoice/lang/cs/messages.po
@@ -0,0 +1,339 @@
+# ADDON morechoice
+# Copyright (C)
+# This file is distributed under the same license as the Friendica morechoice addon package.
+# 
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-08-07 15:04+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Aditoo, 2018\n"
+"Language-Team: Czech (https://www.transifex.com/Friendica/teams/12172/cs/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
+
+#: morechoice.php:34
+msgid "Androgyne"
+msgstr "Androgyn"
+
+#: morechoice.php:35
+msgid "Bear"
+msgstr "Medvěd"
+
+#: morechoice.php:36
+msgid "Bigender"
+msgstr "Bigender"
+
+#: morechoice.php:37
+msgid "Cross dresser"
+msgstr "Crossdresser"
+
+#: morechoice.php:38
+msgid "Drag queen"
+msgstr ""
+
+#: morechoice.php:39
+msgid "Eunuch"
+msgstr "Eunuch"
+
+#: morechoice.php:40
+msgid "Faux queen"
+msgstr ""
+
+#: morechoice.php:41
+msgid "Gender fluid"
+msgstr ""
+
+#: morechoice.php:42
+msgid "Kathoey"
+msgstr ""
+
+#: morechoice.php:43
+msgid "Lady"
+msgstr "Dáma"
+
+#: morechoice.php:44
+msgid "Lipstick lesbian"
+msgstr ""
+
+#: morechoice.php:45
+msgid "Metrosexual"
+msgstr "Metrosexuál"
+
+#: morechoice.php:46
+msgid "Monk"
+msgstr "Mnich"
+
+#: morechoice.php:47
+msgid "Nun"
+msgstr "Jeptiška"
+
+#: morechoice.php:48
+msgid "Soft butch"
+msgstr ""
+
+#: morechoice.php:49
+msgid "Stone femme"
+msgstr ""
+
+#: morechoice.php:50
+msgid "Tomboy"
+msgstr ""
+
+#: morechoice.php:51
+msgid "Transman"
+msgstr "Transmuž"
+
+#: morechoice.php:52
+msgid "Transwoman"
+msgstr "Transžena"
+
+#: morechoice.php:53
+msgid "Transvesti"
+msgstr "Transvestita"
+
+#: morechoice.php:54
+msgid "Trigender"
+msgstr ""
+
+#: morechoice.php:55
+msgid "Can't remember"
+msgstr "Nepamatuju si"
+
+#: morechoice.php:56
+msgid "Hard to tell these days"
+msgstr "Těžké říct touhle dobou"
+
+#: morechoice.php:60
+msgid "Girls with big tits"
+msgstr "Holky s velkýma kozama"
+
+#: morechoice.php:61
+msgid "Millionaires"
+msgstr "Milionáři"
+
+#: morechoice.php:62
+msgid "Guys with big schlongs"
+msgstr "Chlapi s velkýma ptákama"
+
+#: morechoice.php:63
+msgid "Easy women"
+msgstr "Lehké ženy"
+
+#: morechoice.php:64
+msgid "People with impaired mobility"
+msgstr "Lidé s pohybovým postižením"
+
+#: morechoice.php:65
+msgid "Amputees"
+msgstr "Amputovaní"
+
+#: morechoice.php:66
+msgid "Statues, mannequins and immobility"
+msgstr "Sochy, figuríny a nepohyblivost"
+
+#: morechoice.php:67
+msgid "Pain"
+msgstr "Bolest"
+
+#: morechoice.php:68
+msgid "Trans men"
+msgstr "Transmuži"
+
+#: morechoice.php:69
+msgid "Older women"
+msgstr "Starší ženy"
+
+#: morechoice.php:70
+msgid "Asphyxiation"
+msgstr ""
+
+#: morechoice.php:71
+msgid "In public"
+msgstr "Na veřejnosti"
+
+#: morechoice.php:72
+msgid "In danger"
+msgstr "V nebezpečí"
+
+#: morechoice.php:73
+msgid "Pretending to be male"
+msgstr "Předstírají, že jsou muži"
+
+#: morechoice.php:74
+msgid "Pretending to be female"
+msgstr "Předstírají, že jsou ženy"
+
+#: morechoice.php:75
+msgid "Breats"
+msgstr ""
+
+#: morechoice.php:76
+msgid "Scat"
+msgstr ""
+
+#: morechoice.php:77
+msgid "Crying"
+msgstr "Pláčí"
+
+#: morechoice.php:78
+msgid "Nappies/Diapers"
+msgstr "Plenky"
+
+#: morechoice.php:79
+msgid "Trees"
+msgstr "Stromy"
+
+#: morechoice.php:80
+msgid "Vomit"
+msgstr "Zvracení"
+
+#: morechoice.php:81
+msgid "Murder"
+msgstr "Vražda"
+
+#: morechoice.php:82
+msgid "Fat people"
+msgstr "Tlustí lidé"
+
+#: morechoice.php:83
+msgid "Feet"
+msgstr "Nohy"
+
+#: morechoice.php:84
+msgid "Covered in insects"
+msgstr "Pokryti hmyzem"
+
+#: morechoice.php:85
+msgid "Turning a human being into furniture"
+msgstr "Mění lidské bytosti v nábytek"
+
+#: morechoice.php:86
+msgid "Elderly people"
+msgstr "Postarší lidé"
+
+#: morechoice.php:87
+msgid "Transgender people"
+msgstr "Transgenderoví lidé"
+
+#: morechoice.php:88
+msgid "Criminals"
+msgstr "Zločinci"
+
+#: morechoice.php:89
+msgid "Stealing"
+msgstr "Kradou"
+
+#: morechoice.php:90
+msgid "Breast milk"
+msgstr ""
+
+#: morechoice.php:91
+msgid "Immersing genitals in liquids"
+msgstr ""
+
+#: morechoice.php:92
+msgid "Giants"
+msgstr "Obři"
+
+#: morechoice.php:93
+msgid "Masochism"
+msgstr "Masochismus"
+
+#: morechoice.php:94
+msgid "Cars"
+msgstr "Auto"
+
+#: morechoice.php:95
+msgid "Menstruation"
+msgstr "Menstruace"
+
+#: morechoice.php:96
+msgid "Mucus"
+msgstr ""
+
+#: morechoice.php:97
+msgid "Obscene language"
+msgstr "Sprostý jazyk"
+
+#: morechoice.php:98
+msgid "Noses"
+msgstr "Nosy"
+
+#: morechoice.php:99
+msgid "Navels"
+msgstr "Pupky"
+
+#: morechoice.php:100
+msgid "Corpses"
+msgstr "Mrtvoly"
+
+#: morechoice.php:101
+msgid "Smells"
+msgstr "Pachy"
+
+#: morechoice.php:102
+msgid "Buttocks"
+msgstr ""
+
+#: morechoice.php:103
+msgid "Nonliving objects"
+msgstr "Neživoucí předměty"
+
+#: morechoice.php:104
+msgid "Sleeping people"
+msgstr "Spící lidé"
+
+#: morechoice.php:105
+msgid "Urination"
+msgstr "Močení"
+
+#: morechoice.php:106
+msgid "Eating people"
+msgstr "Žerou lidi"
+
+#: morechoice.php:107
+msgid "Being eaten"
+msgstr ""
+
+#: morechoice.php:108
+msgid "Animals"
+msgstr "Zvířata"
+
+#: morechoice.php:109
+msgid "I'd rather just have some chocolate"
+msgstr "Radši bych si prostě dal čokoládu"
+
+#: morechoice.php:113
+msgid "Married to my job"
+msgstr ""
+
+#: morechoice.php:114
+msgid "Polygamist"
+msgstr "Polygamist(k)a"
+
+#: morechoice.php:115
+msgid "Half married"
+msgstr "Napůl ženatý/vdaná"
+
+#: morechoice.php:116
+msgid "Living in the past"
+msgstr "Žiju v minulosti"
+
+#: morechoice.php:117
+msgid "Pretending to be over my ex"
+msgstr ""
+
+#: morechoice.php:118
+msgid "Hurt in the past"
+msgstr "Ublížen v minulosti"
+
+#: morechoice.php:119
+msgid "Wallowing in self-pity"
+msgstr ""
diff --git a/morechoice/lang/cs/strings.php b/morechoice/lang/cs/strings.php
new file mode 100644
index 00000000..55bcbd4d
--- /dev/null
+++ b/morechoice/lang/cs/strings.php
@@ -0,0 +1,88 @@
+<?php
+
+if(! function_exists("string_plural_select_cs")) {
+function string_plural_select_cs($n){
+	$n = intval($n);
+	return ($n == 1 && $n % 1 == 0) ? 0 : ($n >= 2 && $n <= 4 && $n % 1 == 0) ? 1: ($n % 1 != 0 ) ? 2 : 3;;
+}}
+;
+$a->strings["Androgyne"] = "Androgyn";
+$a->strings["Bear"] = "Medvěd";
+$a->strings["Bigender"] = "Bigender";
+$a->strings["Cross dresser"] = "Crossdresser";
+$a->strings["Drag queen"] = "";
+$a->strings["Eunuch"] = "Eunuch";
+$a->strings["Faux queen"] = "";
+$a->strings["Gender fluid"] = "";
+$a->strings["Kathoey"] = "";
+$a->strings["Lady"] = "Dáma";
+$a->strings["Lipstick lesbian"] = "";
+$a->strings["Metrosexual"] = "Metrosexuál";
+$a->strings["Monk"] = "Mnich";
+$a->strings["Nun"] = "Jeptiška";
+$a->strings["Soft butch"] = "";
+$a->strings["Stone femme"] = "";
+$a->strings["Tomboy"] = "";
+$a->strings["Transman"] = "Transmuž";
+$a->strings["Transwoman"] = "Transžena";
+$a->strings["Transvesti"] = "Transvestita";
+$a->strings["Trigender"] = "";
+$a->strings["Can't remember"] = "Nepamatuju si";
+$a->strings["Hard to tell these days"] = "Těžké říct touhle dobou";
+$a->strings["Girls with big tits"] = "Holky s velkýma kozama";
+$a->strings["Millionaires"] = "Milionáři";
+$a->strings["Guys with big schlongs"] = "Chlapi s velkýma ptákama";
+$a->strings["Easy women"] = "Lehké ženy";
+$a->strings["People with impaired mobility"] = "Lidé s pohybovým postižením";
+$a->strings["Amputees"] = "Amputovaní";
+$a->strings["Statues, mannequins and immobility"] = "Sochy, figuríny a nepohyblivost";
+$a->strings["Pain"] = "Bolest";
+$a->strings["Trans men"] = "Transmuži";
+$a->strings["Older women"] = "Starší ženy";
+$a->strings["Asphyxiation"] = "";
+$a->strings["In public"] = "Na veřejnosti";
+$a->strings["In danger"] = "V nebezpečí";
+$a->strings["Pretending to be male"] = "Předstírají, že jsou muži";
+$a->strings["Pretending to be female"] = "Předstírají, že jsou ženy";
+$a->strings["Breats"] = "";
+$a->strings["Scat"] = "";
+$a->strings["Crying"] = "Pláčí";
+$a->strings["Nappies/Diapers"] = "Plenky";
+$a->strings["Trees"] = "Stromy";
+$a->strings["Vomit"] = "Zvracení";
+$a->strings["Murder"] = "Vražda";
+$a->strings["Fat people"] = "Tlustí lidé";
+$a->strings["Feet"] = "Nohy";
+$a->strings["Covered in insects"] = "Pokryti hmyzem";
+$a->strings["Turning a human being into furniture"] = "Mění lidské bytosti v nábytek";
+$a->strings["Elderly people"] = "Postarší lidé";
+$a->strings["Transgender people"] = "Transgenderoví lidé";
+$a->strings["Criminals"] = "Zločinci";
+$a->strings["Stealing"] = "Kradou";
+$a->strings["Breast milk"] = "";
+$a->strings["Immersing genitals in liquids"] = "";
+$a->strings["Giants"] = "Obři";
+$a->strings["Masochism"] = "Masochismus";
+$a->strings["Cars"] = "Auto";
+$a->strings["Menstruation"] = "Menstruace";
+$a->strings["Mucus"] = "";
+$a->strings["Obscene language"] = "Sprostý jazyk";
+$a->strings["Noses"] = "Nosy";
+$a->strings["Navels"] = "Pupky";
+$a->strings["Corpses"] = "Mrtvoly";
+$a->strings["Smells"] = "Pachy";
+$a->strings["Buttocks"] = "";
+$a->strings["Nonliving objects"] = "Neživoucí předměty";
+$a->strings["Sleeping people"] = "Spící lidé";
+$a->strings["Urination"] = "Močení";
+$a->strings["Eating people"] = "Žerou lidi";
+$a->strings["Being eaten"] = "";
+$a->strings["Animals"] = "Zvířata";
+$a->strings["I'd rather just have some chocolate"] = "Radši bych si prostě dal čokoládu";
+$a->strings["Married to my job"] = "";
+$a->strings["Polygamist"] = "Polygamist(k)a";
+$a->strings["Half married"] = "Napůl ženatý/vdaná";
+$a->strings["Living in the past"] = "Žiju v minulosti";
+$a->strings["Pretending to be over my ex"] = "";
+$a->strings["Hurt in the past"] = "Ublížen v minulosti";
+$a->strings["Wallowing in self-pity"] = "";
diff --git a/morechoice/lang/de/messages.po b/morechoice/lang/de/messages.po
new file mode 100644
index 00000000..85a4457a
--- /dev/null
+++ b/morechoice/lang/de/messages.po
@@ -0,0 +1,344 @@
+# ADDON morechoice
+# Copyright (C)
+# This file is distributed under the same license as the Friendica morechoice addon package.
+# 
+# 
+# Translators:
+# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2018
+# Vinzenz Vietzke <vinz@vinzv.de>, 2018
+# Copiis Praeesse <richard@zsemberi.de>, 2019
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-08-07 15:04+0200\n"
+"PO-Revision-Date: 2018-08-07 18:18+0000\n"
+"Last-Translator: Copiis Praeesse <richard@zsemberi.de>, 2019\n"
+"Language-Team: German (https://www.transifex.com/Friendica/teams/12172/de/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: morechoice.php:34
+msgid "Androgyne"
+msgstr "Androgyn"
+
+#: morechoice.php:35
+msgid "Bear"
+msgstr "Bär"
+
+#: morechoice.php:36
+msgid "Bigender"
+msgstr "Bigender"
+
+#: morechoice.php:37
+msgid "Cross dresser"
+msgstr "Cross Dresser"
+
+#: morechoice.php:38
+msgid "Drag queen"
+msgstr "Drag Queen"
+
+#: morechoice.php:39
+msgid "Eunuch"
+msgstr "Eunuch"
+
+#: morechoice.php:40
+msgid "Faux queen"
+msgstr "Faux Queen"
+
+#: morechoice.php:41
+msgid "Gender fluid"
+msgstr "Gender fluid"
+
+#: morechoice.php:42
+msgid "Kathoey"
+msgstr "Kathoey"
+
+#: morechoice.php:43
+msgid "Lady"
+msgstr "Lady"
+
+#: morechoice.php:44
+msgid "Lipstick lesbian"
+msgstr "Lippenstift Lesbe"
+
+#: morechoice.php:45
+msgid "Metrosexual"
+msgstr "Metrosexuell"
+
+#: morechoice.php:46
+msgid "Monk"
+msgstr "Mönch"
+
+#: morechoice.php:47
+msgid "Nun"
+msgstr "Nonne"
+
+#: morechoice.php:48
+msgid "Soft butch"
+msgstr "zarter Butch"
+
+#: morechoice.php:49
+msgid "Stone femme"
+msgstr "steinerne Femme"
+
+#: morechoice.php:50
+msgid "Tomboy"
+msgstr "Tomboy"
+
+#: morechoice.php:51
+msgid "Transman"
+msgstr "Transmann"
+
+#: morechoice.php:52
+msgid "Transwoman"
+msgstr "Transfrau"
+
+#: morechoice.php:53
+msgid "Transvesti"
+msgstr "Transvestit"
+
+#: morechoice.php:54
+msgid "Trigender"
+msgstr "Trigender"
+
+#: morechoice.php:55
+msgid "Can't remember"
+msgstr "Kann mich nicht erinnern"
+
+#: morechoice.php:56
+msgid "Hard to tell these days"
+msgstr "Schwer zu sagen dieser Tage"
+
+#: morechoice.php:60
+msgid "Girls with big tits"
+msgstr "Mädels mit großen Brüsten"
+
+#: morechoice.php:61
+msgid "Millionaires"
+msgstr "Millionäre"
+
+#: morechoice.php:62
+msgid "Guys with big schlongs"
+msgstr "Typen mit großen Schwänzen"
+
+#: morechoice.php:63
+msgid "Easy women"
+msgstr "Leichte Frauen"
+
+#: morechoice.php:64
+msgid "People with impaired mobility"
+msgstr "Menschen mit eingeschränkter Mobilität"
+
+#: morechoice.php:65
+msgid "Amputees"
+msgstr "Amputierte"
+
+#: morechoice.php:66
+msgid "Statues, mannequins and immobility"
+msgstr "Statuen, Schaufensterpuppen und Unbeweglichkeit"
+
+#: morechoice.php:67
+msgid "Pain"
+msgstr "Schmerzen"
+
+#: morechoice.php:68
+msgid "Trans men"
+msgstr "Trans Männer"
+
+#: morechoice.php:69
+msgid "Older women"
+msgstr "Andere Frauen"
+
+#: morechoice.php:70
+msgid "Asphyxiation"
+msgstr "Asphyxiation"
+
+#: morechoice.php:71
+msgid "In public"
+msgstr "In der Öffentlichkeit"
+
+#: morechoice.php:72
+msgid "In danger"
+msgstr "In Gefahr"
+
+#: morechoice.php:73
+msgid "Pretending to be male"
+msgstr "Gebe vor männlich zu sein"
+
+#: morechoice.php:74
+msgid "Pretending to be female"
+msgstr "Gebe vor weiblich zu sein"
+
+#: morechoice.php:75
+msgid "Breats"
+msgstr "Brüste"
+
+#: morechoice.php:76
+msgid "Scat"
+msgstr "Kot"
+
+#: morechoice.php:77
+msgid "Crying"
+msgstr "Heulen"
+
+#: morechoice.php:78
+msgid "Nappies/Diapers"
+msgstr "Windeln"
+
+#: morechoice.php:79
+msgid "Trees"
+msgstr "Bäume"
+
+#: morechoice.php:80
+msgid "Vomit"
+msgstr "Kotzen"
+
+#: morechoice.php:81
+msgid "Murder"
+msgstr "Mörder"
+
+#: morechoice.php:82
+msgid "Fat people"
+msgstr "Fettleibige"
+
+#: morechoice.php:83
+msgid "Feet"
+msgstr "Füße"
+
+#: morechoice.php:84
+msgid "Covered in insects"
+msgstr "Mit Insekten bedeckt sein"
+
+#: morechoice.php:85
+msgid "Turning a human being into furniture"
+msgstr "Menschen in Möbel verwandeln"
+
+#: morechoice.php:86
+msgid "Elderly people"
+msgstr "Ältere Personen"
+
+#: morechoice.php:87
+msgid "Transgender people"
+msgstr "Transgender Personen"
+
+#: morechoice.php:88
+msgid "Criminals"
+msgstr "Kriminelle"
+
+#: morechoice.php:89
+msgid "Stealing"
+msgstr "Stehlen"
+
+#: morechoice.php:90
+msgid "Breast milk"
+msgstr "Muttermilch"
+
+#: morechoice.php:91
+msgid "Immersing genitals in liquids"
+msgstr "Eintauchen von Genitalien in Flüssigkeiten"
+
+#: morechoice.php:92
+msgid "Giants"
+msgstr "Riesen"
+
+#: morechoice.php:93
+msgid "Masochism"
+msgstr "Masochismus"
+
+#: morechoice.php:94
+msgid "Cars"
+msgstr "Autos"
+
+#: morechoice.php:95
+msgid "Menstruation"
+msgstr "Menstruation"
+
+#: morechoice.php:96
+msgid "Mucus"
+msgstr "Schleim"
+
+#: morechoice.php:97
+msgid "Obscene language"
+msgstr "Obszöne Sprache"
+
+#: morechoice.php:98
+msgid "Noses"
+msgstr "Nasen"
+
+#: morechoice.php:99
+msgid "Navels"
+msgstr "Bauchnabel"
+
+#: morechoice.php:100
+msgid "Corpses"
+msgstr "Leichen"
+
+#: morechoice.php:101
+msgid "Smells"
+msgstr "Gerüche"
+
+#: morechoice.php:102
+msgid "Buttocks"
+msgstr "Hintern"
+
+#: morechoice.php:103
+msgid "Nonliving objects"
+msgstr "Leblose Objekte"
+
+#: morechoice.php:104
+msgid "Sleeping people"
+msgstr "Schlafende Personen"
+
+#: morechoice.php:105
+msgid "Urination"
+msgstr "Urinieren"
+
+#: morechoice.php:106
+msgid "Eating people"
+msgstr "Essende Menschen"
+
+#: morechoice.php:107
+msgid "Being eaten"
+msgstr "Verspeist zu werden"
+
+#: morechoice.php:108
+msgid "Animals"
+msgstr "Tiere"
+
+#: morechoice.php:109
+msgid "I'd rather just have some chocolate"
+msgstr "Ich bevorzuge eine Tafel Schokolade"
+
+#: morechoice.php:113
+msgid "Married to my job"
+msgstr "Mit meinem Job verheiratet"
+
+#: morechoice.php:114
+msgid "Polygamist"
+msgstr "Polygamist"
+
+#: morechoice.php:115
+msgid "Half married"
+msgstr "halb verheiratet"
+
+#: morechoice.php:116
+msgid "Living in the past"
+msgstr "In der Vergangenheit lebend"
+
+#: morechoice.php:117
+msgid "Pretending to be over my ex"
+msgstr "Ich tue so, als wäre ich über meine(n) Ex hinweg"
+
+#: morechoice.php:118
+msgid "Hurt in the past"
+msgstr "Früher einmal verletzt"
+
+#: morechoice.php:119
+msgid "Wallowing in self-pity"
+msgstr "In Selbstmitleid wälzend"
diff --git a/morechoice/lang/de/strings.php b/morechoice/lang/de/strings.php
new file mode 100644
index 00000000..cf64f1f9
--- /dev/null
+++ b/morechoice/lang/de/strings.php
@@ -0,0 +1,88 @@
+<?php
+
+if(! function_exists("string_plural_select_de")) {
+function string_plural_select_de($n){
+	$n = intval($n);
+	return ($n != 1);;
+}}
+;
+$a->strings["Androgyne"] = "Androgyn";
+$a->strings["Bear"] = "Bär";
+$a->strings["Bigender"] = "Bigender";
+$a->strings["Cross dresser"] = "Cross Dresser";
+$a->strings["Drag queen"] = "Drag Queen";
+$a->strings["Eunuch"] = "Eunuch";
+$a->strings["Faux queen"] = "Faux Queen";
+$a->strings["Gender fluid"] = "Gender fluid";
+$a->strings["Kathoey"] = "Kathoey";
+$a->strings["Lady"] = "Lady";
+$a->strings["Lipstick lesbian"] = "Lippenstift Lesbe";
+$a->strings["Metrosexual"] = "Metrosexuell";
+$a->strings["Monk"] = "Mönch";
+$a->strings["Nun"] = "Nonne";
+$a->strings["Soft butch"] = "zarter Butch";
+$a->strings["Stone femme"] = "steinerne Femme";
+$a->strings["Tomboy"] = "Tomboy";
+$a->strings["Transman"] = "Transmann";
+$a->strings["Transwoman"] = "Transfrau";
+$a->strings["Transvesti"] = "Transvestit";
+$a->strings["Trigender"] = "Trigender";
+$a->strings["Can't remember"] = "Kann mich nicht erinnern";
+$a->strings["Hard to tell these days"] = "Schwer zu sagen dieser Tage";
+$a->strings["Girls with big tits"] = "Mädels mit großen Brüsten";
+$a->strings["Millionaires"] = "Millionäre";
+$a->strings["Guys with big schlongs"] = "Typen mit großen Schwänzen";
+$a->strings["Easy women"] = "Leichte Frauen";
+$a->strings["People with impaired mobility"] = "Menschen mit eingeschränkter Mobilität";
+$a->strings["Amputees"] = "Amputierte";
+$a->strings["Statues, mannequins and immobility"] = "Statuen, Schaufensterpuppen und Unbeweglichkeit";
+$a->strings["Pain"] = "Schmerzen";
+$a->strings["Trans men"] = "Trans Männer";
+$a->strings["Older women"] = "Andere Frauen";
+$a->strings["Asphyxiation"] = "Asphyxiation";
+$a->strings["In public"] = "In der Öffentlichkeit";
+$a->strings["In danger"] = "In Gefahr";
+$a->strings["Pretending to be male"] = "Gebe vor männlich zu sein";
+$a->strings["Pretending to be female"] = "Gebe vor weiblich zu sein";
+$a->strings["Breats"] = "Brüste";
+$a->strings["Scat"] = "Kot";
+$a->strings["Crying"] = "Heulen";
+$a->strings["Nappies/Diapers"] = "Windeln";
+$a->strings["Trees"] = "Bäume";
+$a->strings["Vomit"] = "Kotzen";
+$a->strings["Murder"] = "Mörder";
+$a->strings["Fat people"] = "Fettleibige";
+$a->strings["Feet"] = "Füße";
+$a->strings["Covered in insects"] = "Mit Insekten bedeckt sein";
+$a->strings["Turning a human being into furniture"] = "Menschen in Möbel verwandeln";
+$a->strings["Elderly people"] = "Ältere Personen";
+$a->strings["Transgender people"] = "Transgender Personen";
+$a->strings["Criminals"] = "Kriminelle";
+$a->strings["Stealing"] = "Stehlen";
+$a->strings["Breast milk"] = "Muttermilch";
+$a->strings["Immersing genitals in liquids"] = "Eintauchen von Genitalien in Flüssigkeiten";
+$a->strings["Giants"] = "Riesen";
+$a->strings["Masochism"] = "Masochismus";
+$a->strings["Cars"] = "Autos";
+$a->strings["Menstruation"] = "Menstruation";
+$a->strings["Mucus"] = "Schleim";
+$a->strings["Obscene language"] = "Obszöne Sprache";
+$a->strings["Noses"] = "Nasen";
+$a->strings["Navels"] = "Bauchnabel";
+$a->strings["Corpses"] = "Leichen";
+$a->strings["Smells"] = "Gerüche";
+$a->strings["Buttocks"] = "Hintern";
+$a->strings["Nonliving objects"] = "Leblose Objekte";
+$a->strings["Sleeping people"] = "Schlafende Personen";
+$a->strings["Urination"] = "Urinieren";
+$a->strings["Eating people"] = "Essende Menschen";
+$a->strings["Being eaten"] = "Verspeist zu werden";
+$a->strings["Animals"] = "Tiere";
+$a->strings["I'd rather just have some chocolate"] = "Ich bevorzuge eine Tafel Schokolade";
+$a->strings["Married to my job"] = "Mit meinem Job verheiratet";
+$a->strings["Polygamist"] = "Polygamist";
+$a->strings["Half married"] = "halb verheiratet";
+$a->strings["Living in the past"] = "In der Vergangenheit lebend";
+$a->strings["Pretending to be over my ex"] = "Ich tue so, als wäre ich über meine(n) Ex hinweg";
+$a->strings["Hurt in the past"] = "Früher einmal verletzt";
+$a->strings["Wallowing in self-pity"] = "In Selbstmitleid wälzend";
diff --git a/morechoice/lang/en-gb/messages.po b/morechoice/lang/en-gb/messages.po
new file mode 100644
index 00000000..5e47ec37
--- /dev/null
+++ b/morechoice/lang/en-gb/messages.po
@@ -0,0 +1,342 @@
+# ADDON morechoice
+# Copyright (C)
+# This file is distributed under the same license as the Friendica morechoice addon package.
+# 
+# 
+# Translators:
+# Andy H3 <andy@hubup.pro>, 2019
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-08-07 15:04+0200\n"
+"PO-Revision-Date: 2018-08-07 18:18+0000\n"
+"Last-Translator: Andy H3 <andy@hubup.pro>, 2019\n"
+"Language-Team: English (United Kingdom) (https://www.transifex.com/Friendica/teams/12172/en_GB/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en_GB\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: morechoice.php:34
+msgid "Androgyne"
+msgstr "Androgyne"
+
+#: morechoice.php:35
+msgid "Bear"
+msgstr "Bear"
+
+#: morechoice.php:36
+msgid "Bigender"
+msgstr "Bi-gender"
+
+#: morechoice.php:37
+msgid "Cross dresser"
+msgstr "Cross dresser"
+
+#: morechoice.php:38
+msgid "Drag queen"
+msgstr "Drag queen"
+
+#: morechoice.php:39
+msgid "Eunuch"
+msgstr "Eunuch"
+
+#: morechoice.php:40
+msgid "Faux queen"
+msgstr "Faux queen"
+
+#: morechoice.php:41
+msgid "Gender fluid"
+msgstr "Gender-fluid"
+
+#: morechoice.php:42
+msgid "Kathoey"
+msgstr "Kathoey"
+
+#: morechoice.php:43
+msgid "Lady"
+msgstr "Lady"
+
+#: morechoice.php:44
+msgid "Lipstick lesbian"
+msgstr "Lipstick lesbian"
+
+#: morechoice.php:45
+msgid "Metrosexual"
+msgstr "Metrosexual"
+
+#: morechoice.php:46
+msgid "Monk"
+msgstr "Monk"
+
+#: morechoice.php:47
+msgid "Nun"
+msgstr "Nun"
+
+#: morechoice.php:48
+msgid "Soft butch"
+msgstr "Soft butch"
+
+#: morechoice.php:49
+msgid "Stone femme"
+msgstr "Stone femme"
+
+#: morechoice.php:50
+msgid "Tomboy"
+msgstr "Tomboy"
+
+#: morechoice.php:51
+msgid "Transman"
+msgstr "Transman"
+
+#: morechoice.php:52
+msgid "Transwoman"
+msgstr "Transwoman"
+
+#: morechoice.php:53
+msgid "Transvesti"
+msgstr "Transvestite"
+
+#: morechoice.php:54
+msgid "Trigender"
+msgstr "Tri-gendered "
+
+#: morechoice.php:55
+msgid "Can't remember"
+msgstr "Can't remember"
+
+#: morechoice.php:56
+msgid "Hard to tell these days"
+msgstr "Hard to tell these days"
+
+#: morechoice.php:60
+msgid "Girls with big tits"
+msgstr "Girls with big tits"
+
+#: morechoice.php:61
+msgid "Millionaires"
+msgstr "Millionaires"
+
+#: morechoice.php:62
+msgid "Guys with big schlongs"
+msgstr "Guys with big schlongs"
+
+#: morechoice.php:63
+msgid "Easy women"
+msgstr "Easy women"
+
+#: morechoice.php:64
+msgid "People with impaired mobility"
+msgstr "People with impaired mobility"
+
+#: morechoice.php:65
+msgid "Amputees"
+msgstr "Amputees"
+
+#: morechoice.php:66
+msgid "Statues, mannequins and immobility"
+msgstr "Statues, mannequins and immobility"
+
+#: morechoice.php:67
+msgid "Pain"
+msgstr "Pain"
+
+#: morechoice.php:68
+msgid "Trans men"
+msgstr "Transmen"
+
+#: morechoice.php:69
+msgid "Older women"
+msgstr "Older women"
+
+#: morechoice.php:70
+msgid "Asphyxiation"
+msgstr "Asphyxiation"
+
+#: morechoice.php:71
+msgid "In public"
+msgstr "In public"
+
+#: morechoice.php:72
+msgid "In danger"
+msgstr "In danger"
+
+#: morechoice.php:73
+msgid "Pretending to be male"
+msgstr "Pretending to be male"
+
+#: morechoice.php:74
+msgid "Pretending to be female"
+msgstr "Pretending to be female"
+
+#: morechoice.php:75
+msgid "Breats"
+msgstr "Brats"
+
+#: morechoice.php:76
+msgid "Scat"
+msgstr "Scat"
+
+#: morechoice.php:77
+msgid "Crying"
+msgstr "Crying"
+
+#: morechoice.php:78
+msgid "Nappies/Diapers"
+msgstr "Nappies"
+
+#: morechoice.php:79
+msgid "Trees"
+msgstr "Trees"
+
+#: morechoice.php:80
+msgid "Vomit"
+msgstr "Vomit"
+
+#: morechoice.php:81
+msgid "Murder"
+msgstr "Murder"
+
+#: morechoice.php:82
+msgid "Fat people"
+msgstr "Fat people"
+
+#: morechoice.php:83
+msgid "Feet"
+msgstr "Feet"
+
+#: morechoice.php:84
+msgid "Covered in insects"
+msgstr "Covered in insects"
+
+#: morechoice.php:85
+msgid "Turning a human being into furniture"
+msgstr "Turning humans into furniture"
+
+#: morechoice.php:86
+msgid "Elderly people"
+msgstr "Elderly people"
+
+#: morechoice.php:87
+msgid "Transgender people"
+msgstr "Transgender people"
+
+#: morechoice.php:88
+msgid "Criminals"
+msgstr "Criminals"
+
+#: morechoice.php:89
+msgid "Stealing"
+msgstr "Stealing"
+
+#: morechoice.php:90
+msgid "Breast milk"
+msgstr "Breast milk"
+
+#: morechoice.php:91
+msgid "Immersing genitals in liquids"
+msgstr "Immersing genitals in liquids"
+
+#: morechoice.php:92
+msgid "Giants"
+msgstr "Giants"
+
+#: morechoice.php:93
+msgid "Masochism"
+msgstr "Masochism"
+
+#: morechoice.php:94
+msgid "Cars"
+msgstr "Cars"
+
+#: morechoice.php:95
+msgid "Menstruation"
+msgstr "Menstruation"
+
+#: morechoice.php:96
+msgid "Mucus"
+msgstr "Mucus"
+
+#: morechoice.php:97
+msgid "Obscene language"
+msgstr "Obscene language"
+
+#: morechoice.php:98
+msgid "Noses"
+msgstr "Noses"
+
+#: morechoice.php:99
+msgid "Navels"
+msgstr "Navels"
+
+#: morechoice.php:100
+msgid "Corpses"
+msgstr "Corpses"
+
+#: morechoice.php:101
+msgid "Smells"
+msgstr "Smells"
+
+#: morechoice.php:102
+msgid "Buttocks"
+msgstr "Buttocks"
+
+#: morechoice.php:103
+msgid "Nonliving objects"
+msgstr "Nonliving objects"
+
+#: morechoice.php:104
+msgid "Sleeping people"
+msgstr "Sleeping people"
+
+#: morechoice.php:105
+msgid "Urination"
+msgstr "Urination"
+
+#: morechoice.php:106
+msgid "Eating people"
+msgstr "Eating people"
+
+#: morechoice.php:107
+msgid "Being eaten"
+msgstr "Being eaten"
+
+#: morechoice.php:108
+msgid "Animals"
+msgstr "Animals"
+
+#: morechoice.php:109
+msgid "I'd rather just have some chocolate"
+msgstr "I'd rather just have some chocolate"
+
+#: morechoice.php:113
+msgid "Married to my job"
+msgstr "Married to my job"
+
+#: morechoice.php:114
+msgid "Polygamist"
+msgstr "Polygamist"
+
+#: morechoice.php:115
+msgid "Half married"
+msgstr "Half married"
+
+#: morechoice.php:116
+msgid "Living in the past"
+msgstr "Living in the past"
+
+#: morechoice.php:117
+msgid "Pretending to be over my ex"
+msgstr "Pretending to be over my ex"
+
+#: morechoice.php:118
+msgid "Hurt in the past"
+msgstr "Hurt in the past"
+
+#: morechoice.php:119
+msgid "Wallowing in self-pity"
+msgstr "Wallowing in self-pity"
diff --git a/morechoice/lang/en-gb/strings.php b/morechoice/lang/en-gb/strings.php
new file mode 100644
index 00000000..18b50b60
--- /dev/null
+++ b/morechoice/lang/en-gb/strings.php
@@ -0,0 +1,88 @@
+<?php
+
+if(! function_exists("string_plural_select_en_gb")) {
+function string_plural_select_en_gb($n){
+	$n = intval($n);
+	return ($n != 1);;
+}}
+;
+$a->strings["Androgyne"] = "Androgyne";
+$a->strings["Bear"] = "Bear";
+$a->strings["Bigender"] = "Bi-gender";
+$a->strings["Cross dresser"] = "Cross dresser";
+$a->strings["Drag queen"] = "Drag queen";
+$a->strings["Eunuch"] = "Eunuch";
+$a->strings["Faux queen"] = "Faux queen";
+$a->strings["Gender fluid"] = "Gender-fluid";
+$a->strings["Kathoey"] = "Kathoey";
+$a->strings["Lady"] = "Lady";
+$a->strings["Lipstick lesbian"] = "Lipstick lesbian";
+$a->strings["Metrosexual"] = "Metrosexual";
+$a->strings["Monk"] = "Monk";
+$a->strings["Nun"] = "Nun";
+$a->strings["Soft butch"] = "Soft butch";
+$a->strings["Stone femme"] = "Stone femme";
+$a->strings["Tomboy"] = "Tomboy";
+$a->strings["Transman"] = "Transman";
+$a->strings["Transwoman"] = "Transwoman";
+$a->strings["Transvesti"] = "Transvestite";
+$a->strings["Trigender"] = "Tri-gendered ";
+$a->strings["Can't remember"] = "Can't remember";
+$a->strings["Hard to tell these days"] = "Hard to tell these days";
+$a->strings["Girls with big tits"] = "Girls with big tits";
+$a->strings["Millionaires"] = "Millionaires";
+$a->strings["Guys with big schlongs"] = "Guys with big schlongs";
+$a->strings["Easy women"] = "Easy women";
+$a->strings["People with impaired mobility"] = "People with impaired mobility";
+$a->strings["Amputees"] = "Amputees";
+$a->strings["Statues, mannequins and immobility"] = "Statues, mannequins and immobility";
+$a->strings["Pain"] = "Pain";
+$a->strings["Trans men"] = "Transmen";
+$a->strings["Older women"] = "Older women";
+$a->strings["Asphyxiation"] = "Asphyxiation";
+$a->strings["In public"] = "In public";
+$a->strings["In danger"] = "In danger";
+$a->strings["Pretending to be male"] = "Pretending to be male";
+$a->strings["Pretending to be female"] = "Pretending to be female";
+$a->strings["Breats"] = "Brats";
+$a->strings["Scat"] = "Scat";
+$a->strings["Crying"] = "Crying";
+$a->strings["Nappies/Diapers"] = "Nappies";
+$a->strings["Trees"] = "Trees";
+$a->strings["Vomit"] = "Vomit";
+$a->strings["Murder"] = "Murder";
+$a->strings["Fat people"] = "Fat people";
+$a->strings["Feet"] = "Feet";
+$a->strings["Covered in insects"] = "Covered in insects";
+$a->strings["Turning a human being into furniture"] = "Turning humans into furniture";
+$a->strings["Elderly people"] = "Elderly people";
+$a->strings["Transgender people"] = "Transgender people";
+$a->strings["Criminals"] = "Criminals";
+$a->strings["Stealing"] = "Stealing";
+$a->strings["Breast milk"] = "Breast milk";
+$a->strings["Immersing genitals in liquids"] = "Immersing genitals in liquids";
+$a->strings["Giants"] = "Giants";
+$a->strings["Masochism"] = "Masochism";
+$a->strings["Cars"] = "Cars";
+$a->strings["Menstruation"] = "Menstruation";
+$a->strings["Mucus"] = "Mucus";
+$a->strings["Obscene language"] = "Obscene language";
+$a->strings["Noses"] = "Noses";
+$a->strings["Navels"] = "Navels";
+$a->strings["Corpses"] = "Corpses";
+$a->strings["Smells"] = "Smells";
+$a->strings["Buttocks"] = "Buttocks";
+$a->strings["Nonliving objects"] = "Nonliving objects";
+$a->strings["Sleeping people"] = "Sleeping people";
+$a->strings["Urination"] = "Urination";
+$a->strings["Eating people"] = "Eating people";
+$a->strings["Being eaten"] = "Being eaten";
+$a->strings["Animals"] = "Animals";
+$a->strings["I'd rather just have some chocolate"] = "I'd rather just have some chocolate";
+$a->strings["Married to my job"] = "Married to my job";
+$a->strings["Polygamist"] = "Polygamist";
+$a->strings["Half married"] = "Half married";
+$a->strings["Living in the past"] = "Living in the past";
+$a->strings["Pretending to be over my ex"] = "Pretending to be over my ex";
+$a->strings["Hurt in the past"] = "Hurt in the past";
+$a->strings["Wallowing in self-pity"] = "Wallowing in self-pity";
diff --git a/morechoice/lang/fr/messages.po b/morechoice/lang/fr/messages.po
new file mode 100644
index 00000000..31ee975e
--- /dev/null
+++ b/morechoice/lang/fr/messages.po
@@ -0,0 +1,342 @@
+# ADDON morechoice
+# Copyright (C)
+# This file is distributed under the same license as the Friendica morechoice addon package.
+# 
+# 
+# Translators:
+# Marie Olive <lacellule101@gmail.com>, 2018
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-08-07 15:04+0200\n"
+"PO-Revision-Date: 2018-08-07 18:18+0000\n"
+"Last-Translator: Marie Olive <lacellule101@gmail.com>, 2018\n"
+"Language-Team: French (https://www.transifex.com/Friendica/teams/12172/fr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: morechoice.php:34
+msgid "Androgyne"
+msgstr "Androgyne"
+
+#: morechoice.php:35
+msgid "Bear"
+msgstr "Ours"
+
+#: morechoice.php:36
+msgid "Bigender"
+msgstr "Bigenre"
+
+#: morechoice.php:37
+msgid "Cross dresser"
+msgstr ""
+
+#: morechoice.php:38
+msgid "Drag queen"
+msgstr "drag queen"
+
+#: morechoice.php:39
+msgid "Eunuch"
+msgstr "eunuque"
+
+#: morechoice.php:40
+msgid "Faux queen"
+msgstr ""
+
+#: morechoice.php:41
+msgid "Gender fluid"
+msgstr "genre fluide"
+
+#: morechoice.php:42
+msgid "Kathoey"
+msgstr ""
+
+#: morechoice.php:43
+msgid "Lady"
+msgstr ""
+
+#: morechoice.php:44
+msgid "Lipstick lesbian"
+msgstr ""
+
+#: morechoice.php:45
+msgid "Metrosexual"
+msgstr "métrosexuel"
+
+#: morechoice.php:46
+msgid "Monk"
+msgstr "moine"
+
+#: morechoice.php:47
+msgid "Nun"
+msgstr "religieuse"
+
+#: morechoice.php:48
+msgid "Soft butch"
+msgstr ""
+
+#: morechoice.php:49
+msgid "Stone femme"
+msgstr ""
+
+#: morechoice.php:50
+msgid "Tomboy"
+msgstr ""
+
+#: morechoice.php:51
+msgid "Transman"
+msgstr "homme trans"
+
+#: morechoice.php:52
+msgid "Transwoman"
+msgstr "femme trans"
+
+#: morechoice.php:53
+msgid "Transvesti"
+msgstr "travesti"
+
+#: morechoice.php:54
+msgid "Trigender"
+msgstr "trigenre"
+
+#: morechoice.php:55
+msgid "Can't remember"
+msgstr "Ne se rappelle pas"
+
+#: morechoice.php:56
+msgid "Hard to tell these days"
+msgstr "Difficile à dire en ce moment"
+
+#: morechoice.php:60
+msgid "Girls with big tits"
+msgstr "Filles à gros seins"
+
+#: morechoice.php:61
+msgid "Millionaires"
+msgstr "Millionnaires"
+
+#: morechoice.php:62
+msgid "Guys with big schlongs"
+msgstr ""
+
+#: morechoice.php:63
+msgid "Easy women"
+msgstr "Femmes faciles"
+
+#: morechoice.php:64
+msgid "People with impaired mobility"
+msgstr "Personnes à mobilité réduite"
+
+#: morechoice.php:65
+msgid "Amputees"
+msgstr "Amputés"
+
+#: morechoice.php:66
+msgid "Statues, mannequins and immobility"
+msgstr ""
+
+#: morechoice.php:67
+msgid "Pain"
+msgstr "Douleur"
+
+#: morechoice.php:68
+msgid "Trans men"
+msgstr "Hommes trans"
+
+#: morechoice.php:69
+msgid "Older women"
+msgstr ""
+
+#: morechoice.php:70
+msgid "Asphyxiation"
+msgstr ""
+
+#: morechoice.php:71
+msgid "In public"
+msgstr ""
+
+#: morechoice.php:72
+msgid "In danger"
+msgstr ""
+
+#: morechoice.php:73
+msgid "Pretending to be male"
+msgstr ""
+
+#: morechoice.php:74
+msgid "Pretending to be female"
+msgstr ""
+
+#: morechoice.php:75
+msgid "Breats"
+msgstr ""
+
+#: morechoice.php:76
+msgid "Scat"
+msgstr ""
+
+#: morechoice.php:77
+msgid "Crying"
+msgstr ""
+
+#: morechoice.php:78
+msgid "Nappies/Diapers"
+msgstr ""
+
+#: morechoice.php:79
+msgid "Trees"
+msgstr ""
+
+#: morechoice.php:80
+msgid "Vomit"
+msgstr ""
+
+#: morechoice.php:81
+msgid "Murder"
+msgstr ""
+
+#: morechoice.php:82
+msgid "Fat people"
+msgstr ""
+
+#: morechoice.php:83
+msgid "Feet"
+msgstr ""
+
+#: morechoice.php:84
+msgid "Covered in insects"
+msgstr ""
+
+#: morechoice.php:85
+msgid "Turning a human being into furniture"
+msgstr ""
+
+#: morechoice.php:86
+msgid "Elderly people"
+msgstr ""
+
+#: morechoice.php:87
+msgid "Transgender people"
+msgstr ""
+
+#: morechoice.php:88
+msgid "Criminals"
+msgstr ""
+
+#: morechoice.php:89
+msgid "Stealing"
+msgstr ""
+
+#: morechoice.php:90
+msgid "Breast milk"
+msgstr ""
+
+#: morechoice.php:91
+msgid "Immersing genitals in liquids"
+msgstr ""
+
+#: morechoice.php:92
+msgid "Giants"
+msgstr ""
+
+#: morechoice.php:93
+msgid "Masochism"
+msgstr ""
+
+#: morechoice.php:94
+msgid "Cars"
+msgstr ""
+
+#: morechoice.php:95
+msgid "Menstruation"
+msgstr ""
+
+#: morechoice.php:96
+msgid "Mucus"
+msgstr ""
+
+#: morechoice.php:97
+msgid "Obscene language"
+msgstr ""
+
+#: morechoice.php:98
+msgid "Noses"
+msgstr ""
+
+#: morechoice.php:99
+msgid "Navels"
+msgstr ""
+
+#: morechoice.php:100
+msgid "Corpses"
+msgstr ""
+
+#: morechoice.php:101
+msgid "Smells"
+msgstr ""
+
+#: morechoice.php:102
+msgid "Buttocks"
+msgstr ""
+
+#: morechoice.php:103
+msgid "Nonliving objects"
+msgstr ""
+
+#: morechoice.php:104
+msgid "Sleeping people"
+msgstr ""
+
+#: morechoice.php:105
+msgid "Urination"
+msgstr ""
+
+#: morechoice.php:106
+msgid "Eating people"
+msgstr ""
+
+#: morechoice.php:107
+msgid "Being eaten"
+msgstr ""
+
+#: morechoice.php:108
+msgid "Animals"
+msgstr ""
+
+#: morechoice.php:109
+msgid "I'd rather just have some chocolate"
+msgstr ""
+
+#: morechoice.php:113
+msgid "Married to my job"
+msgstr ""
+
+#: morechoice.php:114
+msgid "Polygamist"
+msgstr ""
+
+#: morechoice.php:115
+msgid "Half married"
+msgstr ""
+
+#: morechoice.php:116
+msgid "Living in the past"
+msgstr ""
+
+#: morechoice.php:117
+msgid "Pretending to be over my ex"
+msgstr ""
+
+#: morechoice.php:118
+msgid "Hurt in the past"
+msgstr ""
+
+#: morechoice.php:119
+msgid "Wallowing in self-pity"
+msgstr ""
diff --git a/morechoice/lang/fr/strings.php b/morechoice/lang/fr/strings.php
new file mode 100644
index 00000000..7d57e3be
--- /dev/null
+++ b/morechoice/lang/fr/strings.php
@@ -0,0 +1,88 @@
+<?php
+
+if(! function_exists("string_plural_select_fr")) {
+function string_plural_select_fr($n){
+	$n = intval($n);
+	return ($n > 1);;
+}}
+;
+$a->strings["Androgyne"] = "Androgyne";
+$a->strings["Bear"] = "Ours";
+$a->strings["Bigender"] = "Bigenre";
+$a->strings["Cross dresser"] = "";
+$a->strings["Drag queen"] = "drag queen";
+$a->strings["Eunuch"] = "eunuque";
+$a->strings["Faux queen"] = "";
+$a->strings["Gender fluid"] = "genre fluide";
+$a->strings["Kathoey"] = "";
+$a->strings["Lady"] = "";
+$a->strings["Lipstick lesbian"] = "";
+$a->strings["Metrosexual"] = "métrosexuel";
+$a->strings["Monk"] = "moine";
+$a->strings["Nun"] = "religieuse";
+$a->strings["Soft butch"] = "";
+$a->strings["Stone femme"] = "";
+$a->strings["Tomboy"] = "";
+$a->strings["Transman"] = "homme trans";
+$a->strings["Transwoman"] = "femme trans";
+$a->strings["Transvesti"] = "travesti";
+$a->strings["Trigender"] = "trigenre";
+$a->strings["Can't remember"] = "Ne se rappelle pas";
+$a->strings["Hard to tell these days"] = "Difficile à dire en ce moment";
+$a->strings["Girls with big tits"] = "Filles à gros seins";
+$a->strings["Millionaires"] = "Millionnaires";
+$a->strings["Guys with big schlongs"] = "";
+$a->strings["Easy women"] = "Femmes faciles";
+$a->strings["People with impaired mobility"] = "Personnes à mobilité réduite";
+$a->strings["Amputees"] = "Amputés";
+$a->strings["Statues, mannequins and immobility"] = "";
+$a->strings["Pain"] = "Douleur";
+$a->strings["Trans men"] = "Hommes trans";
+$a->strings["Older women"] = "";
+$a->strings["Asphyxiation"] = "";
+$a->strings["In public"] = "";
+$a->strings["In danger"] = "";
+$a->strings["Pretending to be male"] = "";
+$a->strings["Pretending to be female"] = "";
+$a->strings["Breats"] = "";
+$a->strings["Scat"] = "";
+$a->strings["Crying"] = "";
+$a->strings["Nappies/Diapers"] = "";
+$a->strings["Trees"] = "";
+$a->strings["Vomit"] = "";
+$a->strings["Murder"] = "";
+$a->strings["Fat people"] = "";
+$a->strings["Feet"] = "";
+$a->strings["Covered in insects"] = "";
+$a->strings["Turning a human being into furniture"] = "";
+$a->strings["Elderly people"] = "";
+$a->strings["Transgender people"] = "";
+$a->strings["Criminals"] = "";
+$a->strings["Stealing"] = "";
+$a->strings["Breast milk"] = "";
+$a->strings["Immersing genitals in liquids"] = "";
+$a->strings["Giants"] = "";
+$a->strings["Masochism"] = "";
+$a->strings["Cars"] = "";
+$a->strings["Menstruation"] = "";
+$a->strings["Mucus"] = "";
+$a->strings["Obscene language"] = "";
+$a->strings["Noses"] = "";
+$a->strings["Navels"] = "";
+$a->strings["Corpses"] = "";
+$a->strings["Smells"] = "";
+$a->strings["Buttocks"] = "";
+$a->strings["Nonliving objects"] = "";
+$a->strings["Sleeping people"] = "";
+$a->strings["Urination"] = "";
+$a->strings["Eating people"] = "";
+$a->strings["Being eaten"] = "";
+$a->strings["Animals"] = "";
+$a->strings["I'd rather just have some chocolate"] = "";
+$a->strings["Married to my job"] = "";
+$a->strings["Polygamist"] = "";
+$a->strings["Half married"] = "";
+$a->strings["Living in the past"] = "";
+$a->strings["Pretending to be over my ex"] = "";
+$a->strings["Hurt in the past"] = "";
+$a->strings["Wallowing in self-pity"] = "";
diff --git a/morechoice/lang/it/messages.po b/morechoice/lang/it/messages.po
new file mode 100644
index 00000000..4560332f
--- /dev/null
+++ b/morechoice/lang/it/messages.po
@@ -0,0 +1,342 @@
+# ADDON morechoice
+# Copyright (C)
+# This file is distributed under the same license as the Friendica morechoice addon package.
+# 
+# 
+# Translators:
+# fabrixxm <fabrix.xm@gmail.com>, 2019
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-08-07 15:04+0200\n"
+"PO-Revision-Date: 2018-08-07 18:18+0000\n"
+"Last-Translator: fabrixxm <fabrix.xm@gmail.com>, 2019\n"
+"Language-Team: Italian (https://www.transifex.com/Friendica/teams/12172/it/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: it\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: morechoice.php:34
+msgid "Androgyne"
+msgstr "Androgino"
+
+#: morechoice.php:35
+msgid "Bear"
+msgstr "Orso"
+
+#: morechoice.php:36
+msgid "Bigender"
+msgstr "Bigender"
+
+#: morechoice.php:37
+msgid "Cross dresser"
+msgstr "Travestito"
+
+#: morechoice.php:38
+msgid "Drag queen"
+msgstr "Drag queen"
+
+#: morechoice.php:39
+msgid "Eunuch"
+msgstr "Eunico"
+
+#: morechoice.php:40
+msgid "Faux queen"
+msgstr "Faux queen"
+
+#: morechoice.php:41
+msgid "Gender fluid"
+msgstr "Gender fluid"
+
+#: morechoice.php:42
+msgid "Kathoey"
+msgstr "Kathoey"
+
+#: morechoice.php:43
+msgid "Lady"
+msgstr "Signora"
+
+#: morechoice.php:44
+msgid "Lipstick lesbian"
+msgstr "Lesbica Lipstick"
+
+#: morechoice.php:45
+msgid "Metrosexual"
+msgstr "Metrosessuale"
+
+#: morechoice.php:46
+msgid "Monk"
+msgstr "Monaco"
+
+#: morechoice.php:47
+msgid "Nun"
+msgstr "Suora"
+
+#: morechoice.php:48
+msgid "Soft butch"
+msgstr "Soft butch"
+
+#: morechoice.php:49
+msgid "Stone femme"
+msgstr "Stone femme"
+
+#: morechoice.php:50
+msgid "Tomboy"
+msgstr "Maschiaccio"
+
+#: morechoice.php:51
+msgid "Transman"
+msgstr "Uomo trans"
+
+#: morechoice.php:52
+msgid "Transwoman"
+msgstr "Donna trans"
+
+#: morechoice.php:53
+msgid "Transvesti"
+msgstr "Travestito"
+
+#: morechoice.php:54
+msgid "Trigender"
+msgstr "Trigenere"
+
+#: morechoice.php:55
+msgid "Can't remember"
+msgstr "Non ricordo"
+
+#: morechoice.php:56
+msgid "Hard to tell these days"
+msgstr "Difficile a dire di questi tempi"
+
+#: morechoice.php:60
+msgid "Girls with big tits"
+msgstr "Ragazze con le tette grosse"
+
+#: morechoice.php:61
+msgid "Millionaires"
+msgstr "Milionari"
+
+#: morechoice.php:62
+msgid "Guys with big schlongs"
+msgstr "Ragazzi con grossi salsicciotti"
+
+#: morechoice.php:63
+msgid "Easy women"
+msgstr "Donne facili"
+
+#: morechoice.php:64
+msgid "People with impaired mobility"
+msgstr "Persone con disabilità motorie"
+
+#: morechoice.php:65
+msgid "Amputees"
+msgstr "Amputati"
+
+#: morechoice.php:66
+msgid "Statues, mannequins and immobility"
+msgstr "Statue, manichini e immobilità"
+
+#: morechoice.php:67
+msgid "Pain"
+msgstr "Dolore"
+
+#: morechoice.php:68
+msgid "Trans men"
+msgstr "Uomini trans"
+
+#: morechoice.php:69
+msgid "Older women"
+msgstr "Donne anziane"
+
+#: morechoice.php:70
+msgid "Asphyxiation"
+msgstr "Asfissia"
+
+#: morechoice.php:71
+msgid "In public"
+msgstr "In pubblico"
+
+#: morechoice.php:72
+msgid "In danger"
+msgstr "In pericolo"
+
+#: morechoice.php:73
+msgid "Pretending to be male"
+msgstr "Fare finta di essere un uomo"
+
+#: morechoice.php:74
+msgid "Pretending to be female"
+msgstr "Fare finta di essere una donna"
+
+#: morechoice.php:75
+msgid "Breats"
+msgstr "Seni"
+
+#: morechoice.php:76
+msgid "Scat"
+msgstr "Scat"
+
+#: morechoice.php:77
+msgid "Crying"
+msgstr "Pianto"
+
+#: morechoice.php:78
+msgid "Nappies/Diapers"
+msgstr "Pannolini"
+
+#: morechoice.php:79
+msgid "Trees"
+msgstr "Alberi"
+
+#: morechoice.php:80
+msgid "Vomit"
+msgstr "Vomito"
+
+#: morechoice.php:81
+msgid "Murder"
+msgstr "Omicidio"
+
+#: morechoice.php:82
+msgid "Fat people"
+msgstr "Persone grasse"
+
+#: morechoice.php:83
+msgid "Feet"
+msgstr "Piedi"
+
+#: morechoice.php:84
+msgid "Covered in insects"
+msgstr "Ricoperto di insetti"
+
+#: morechoice.php:85
+msgid "Turning a human being into furniture"
+msgstr "Trasformare un essere umano in arredamento"
+
+#: morechoice.php:86
+msgid "Elderly people"
+msgstr "Persone anziane"
+
+#: morechoice.php:87
+msgid "Transgender people"
+msgstr "Perone transgender"
+
+#: morechoice.php:88
+msgid "Criminals"
+msgstr "Criminali"
+
+#: morechoice.php:89
+msgid "Stealing"
+msgstr "Rubare"
+
+#: morechoice.php:90
+msgid "Breast milk"
+msgstr "Latte materno"
+
+#: morechoice.php:91
+msgid "Immersing genitals in liquids"
+msgstr "Immergere i genitali in liquidi"
+
+#: morechoice.php:92
+msgid "Giants"
+msgstr "Giganti"
+
+#: morechoice.php:93
+msgid "Masochism"
+msgstr "Masochismo"
+
+#: morechoice.php:94
+msgid "Cars"
+msgstr "Macchine"
+
+#: morechoice.php:95
+msgid "Menstruation"
+msgstr "Mestruazioni"
+
+#: morechoice.php:96
+msgid "Mucus"
+msgstr "Muco"
+
+#: morechoice.php:97
+msgid "Obscene language"
+msgstr "Linguaggio osceno"
+
+#: morechoice.php:98
+msgid "Noses"
+msgstr "Nasi"
+
+#: morechoice.php:99
+msgid "Navels"
+msgstr "Ombelichi"
+
+#: morechoice.php:100
+msgid "Corpses"
+msgstr "Cadaveri"
+
+#: morechoice.php:101
+msgid "Smells"
+msgstr "Odori"
+
+#: morechoice.php:102
+msgid "Buttocks"
+msgstr "Natiche"
+
+#: morechoice.php:103
+msgid "Nonliving objects"
+msgstr "Oggetti inanimati"
+
+#: morechoice.php:104
+msgid "Sleeping people"
+msgstr "Persone addormentate"
+
+#: morechoice.php:105
+msgid "Urination"
+msgstr "Minzione"
+
+#: morechoice.php:106
+msgid "Eating people"
+msgstr "Mangiare persone"
+
+#: morechoice.php:107
+msgid "Being eaten"
+msgstr "Essere mangiato"
+
+#: morechoice.php:108
+msgid "Animals"
+msgstr "Animali"
+
+#: morechoice.php:109
+msgid "I'd rather just have some chocolate"
+msgstr "Preferisco del cioccolato"
+
+#: morechoice.php:113
+msgid "Married to my job"
+msgstr "Sposato al mio lavoro"
+
+#: morechoice.php:114
+msgid "Polygamist"
+msgstr "Poligamo"
+
+#: morechoice.php:115
+msgid "Half married"
+msgstr "Mezzo sposato"
+
+#: morechoice.php:116
+msgid "Living in the past"
+msgstr "Vivere nel passato"
+
+#: morechoice.php:117
+msgid "Pretending to be over my ex"
+msgstr "Fingere di non provare più nulla per l'ex"
+
+#: morechoice.php:118
+msgid "Hurt in the past"
+msgstr "Ferito in passato"
+
+#: morechoice.php:119
+msgid "Wallowing in self-pity"
+msgstr "Crogiolarsi nell'autocommiserazione"
diff --git a/morechoice/lang/it/strings.php b/morechoice/lang/it/strings.php
new file mode 100644
index 00000000..470ade1f
--- /dev/null
+++ b/morechoice/lang/it/strings.php
@@ -0,0 +1,88 @@
+<?php
+
+if(! function_exists("string_plural_select_it")) {
+function string_plural_select_it($n){
+	$n = intval($n);
+	return ($n != 1);;
+}}
+;
+$a->strings["Androgyne"] = "Androgino";
+$a->strings["Bear"] = "Orso";
+$a->strings["Bigender"] = "Bigender";
+$a->strings["Cross dresser"] = "Travestito";
+$a->strings["Drag queen"] = "Drag queen";
+$a->strings["Eunuch"] = "Eunico";
+$a->strings["Faux queen"] = "Faux queen";
+$a->strings["Gender fluid"] = "Gender fluid";
+$a->strings["Kathoey"] = "Kathoey";
+$a->strings["Lady"] = "Signora";
+$a->strings["Lipstick lesbian"] = "Lesbica Lipstick";
+$a->strings["Metrosexual"] = "Metrosessuale";
+$a->strings["Monk"] = "Monaco";
+$a->strings["Nun"] = "Suora";
+$a->strings["Soft butch"] = "Soft butch";
+$a->strings["Stone femme"] = "Stone femme";
+$a->strings["Tomboy"] = "Maschiaccio";
+$a->strings["Transman"] = "Uomo trans";
+$a->strings["Transwoman"] = "Donna trans";
+$a->strings["Transvesti"] = "Travestito";
+$a->strings["Trigender"] = "Trigenere";
+$a->strings["Can't remember"] = "Non ricordo";
+$a->strings["Hard to tell these days"] = "Difficile a dire di questi tempi";
+$a->strings["Girls with big tits"] = "Ragazze con le tette grosse";
+$a->strings["Millionaires"] = "Milionari";
+$a->strings["Guys with big schlongs"] = "Ragazzi con grossi salsicciotti";
+$a->strings["Easy women"] = "Donne facili";
+$a->strings["People with impaired mobility"] = "Persone con disabilità motorie";
+$a->strings["Amputees"] = "Amputati";
+$a->strings["Statues, mannequins and immobility"] = "Statue, manichini e immobilità";
+$a->strings["Pain"] = "Dolore";
+$a->strings["Trans men"] = "Uomini trans";
+$a->strings["Older women"] = "Donne anziane";
+$a->strings["Asphyxiation"] = "Asfissia";
+$a->strings["In public"] = "In pubblico";
+$a->strings["In danger"] = "In pericolo";
+$a->strings["Pretending to be male"] = "Fare finta di essere un uomo";
+$a->strings["Pretending to be female"] = "Fare finta di essere una donna";
+$a->strings["Breats"] = "Seni";
+$a->strings["Scat"] = "Scat";
+$a->strings["Crying"] = "Pianto";
+$a->strings["Nappies/Diapers"] = "Pannolini";
+$a->strings["Trees"] = "Alberi";
+$a->strings["Vomit"] = "Vomito";
+$a->strings["Murder"] = "Omicidio";
+$a->strings["Fat people"] = "Persone grasse";
+$a->strings["Feet"] = "Piedi";
+$a->strings["Covered in insects"] = "Ricoperto di insetti";
+$a->strings["Turning a human being into furniture"] = "Trasformare un essere umano in arredamento";
+$a->strings["Elderly people"] = "Persone anziane";
+$a->strings["Transgender people"] = "Perone transgender";
+$a->strings["Criminals"] = "Criminali";
+$a->strings["Stealing"] = "Rubare";
+$a->strings["Breast milk"] = "Latte materno";
+$a->strings["Immersing genitals in liquids"] = "Immergere i genitali in liquidi";
+$a->strings["Giants"] = "Giganti";
+$a->strings["Masochism"] = "Masochismo";
+$a->strings["Cars"] = "Macchine";
+$a->strings["Menstruation"] = "Mestruazioni";
+$a->strings["Mucus"] = "Muco";
+$a->strings["Obscene language"] = "Linguaggio osceno";
+$a->strings["Noses"] = "Nasi";
+$a->strings["Navels"] = "Ombelichi";
+$a->strings["Corpses"] = "Cadaveri";
+$a->strings["Smells"] = "Odori";
+$a->strings["Buttocks"] = "Natiche";
+$a->strings["Nonliving objects"] = "Oggetti inanimati";
+$a->strings["Sleeping people"] = "Persone addormentate";
+$a->strings["Urination"] = "Minzione";
+$a->strings["Eating people"] = "Mangiare persone";
+$a->strings["Being eaten"] = "Essere mangiato";
+$a->strings["Animals"] = "Animali";
+$a->strings["I'd rather just have some chocolate"] = "Preferisco del cioccolato";
+$a->strings["Married to my job"] = "Sposato al mio lavoro";
+$a->strings["Polygamist"] = "Poligamo";
+$a->strings["Half married"] = "Mezzo sposato";
+$a->strings["Living in the past"] = "Vivere nel passato";
+$a->strings["Pretending to be over my ex"] = "Fingere di non provare più nulla per l'ex";
+$a->strings["Hurt in the past"] = "Ferito in passato";
+$a->strings["Wallowing in self-pity"] = "Crogiolarsi nell'autocommiserazione";
diff --git a/morechoice/lang/nl/messages.po b/morechoice/lang/nl/messages.po
new file mode 100644
index 00000000..f35357e1
--- /dev/null
+++ b/morechoice/lang/nl/messages.po
@@ -0,0 +1,339 @@
+# ADDON morechoice
+# Copyright (C)
+# This file is distributed under the same license as the Friendica morechoice addon package.
+# 
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-08-07 15:04+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Jeroen De Meerleer <me@jeroened.be>, 2018\n"
+"Language-Team: Dutch (https://www.transifex.com/Friendica/teams/12172/nl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: morechoice.php:34
+msgid "Androgyne"
+msgstr "Dubbel geslacht"
+
+#: morechoice.php:35
+msgid "Bear"
+msgstr "Beer"
+
+#: morechoice.php:36
+msgid "Bigender"
+msgstr "Dubbel"
+
+#: morechoice.php:37
+msgid "Cross dresser"
+msgstr "Gekleed als het ander"
+
+#: morechoice.php:38
+msgid "Drag queen"
+msgstr "Travestiet"
+
+#: morechoice.php:39
+msgid "Eunuch"
+msgstr "Castraat"
+
+#: morechoice.php:40
+msgid "Faux queen"
+msgstr "Fout"
+
+#: morechoice.php:41
+msgid "Gender fluid"
+msgstr ""
+
+#: morechoice.php:42
+msgid "Kathoey"
+msgstr "Tussen man en vrouw"
+
+#: morechoice.php:43
+msgid "Lady"
+msgstr "Trotse vrouw"
+
+#: morechoice.php:44
+msgid "Lipstick lesbian"
+msgstr "Lesbienne-vrouw"
+
+#: morechoice.php:45
+msgid "Metrosexual"
+msgstr "Metrosexueel"
+
+#: morechoice.php:46
+msgid "Monk"
+msgstr "Monnik"
+
+#: morechoice.php:47
+msgid "Nun"
+msgstr "Non"
+
+#: morechoice.php:48
+msgid "Soft butch"
+msgstr "Lesbienne-man"
+
+#: morechoice.php:49
+msgid "Stone femme"
+msgstr "Butch en femme"
+
+#: morechoice.php:50
+msgid "Tomboy"
+msgstr "Tomboy"
+
+#: morechoice.php:51
+msgid "Transman"
+msgstr "Transman"
+
+#: morechoice.php:52
+msgid "Transwoman"
+msgstr "Transvrouw"
+
+#: morechoice.php:53
+msgid "Transvesti"
+msgstr ""
+
+#: morechoice.php:54
+msgid "Trigender"
+msgstr "Drieslacht"
+
+#: morechoice.php:55
+msgid "Can't remember"
+msgstr "Kan ik mij niet meer herinneren"
+
+#: morechoice.php:56
+msgid "Hard to tell these days"
+msgstr "Moeilijk te zeggen vandaag"
+
+#: morechoice.php:60
+msgid "Girls with big tits"
+msgstr "Meisjes met grote tetten"
+
+#: morechoice.php:61
+msgid "Millionaires"
+msgstr "Veel geld"
+
+#: morechoice.php:62
+msgid "Guys with big schlongs"
+msgstr "Groot geschapen"
+
+#: morechoice.php:63
+msgid "Easy women"
+msgstr "Gemakkelijke vrouwen"
+
+#: morechoice.php:64
+msgid "People with impaired mobility"
+msgstr "Mensen met beperkte mobiliteit"
+
+#: morechoice.php:65
+msgid "Amputees"
+msgstr "Geamputeerden"
+
+#: morechoice.php:66
+msgid "Statues, mannequins and immobility"
+msgstr "Standbeelden"
+
+#: morechoice.php:67
+msgid "Pain"
+msgstr "Pijn"
+
+#: morechoice.php:68
+msgid "Trans men"
+msgstr "Transmannen"
+
+#: morechoice.php:69
+msgid "Older women"
+msgstr "Oude vrouwen"
+
+#: morechoice.php:70
+msgid "Asphyxiation"
+msgstr "Verstikking"
+
+#: morechoice.php:71
+msgid "In public"
+msgstr "Publiek"
+
+#: morechoice.php:72
+msgid "In danger"
+msgstr "In gevaar"
+
+#: morechoice.php:73
+msgid "Pretending to be male"
+msgstr "Net zoals mannen"
+
+#: morechoice.php:74
+msgid "Pretending to be female"
+msgstr "Net als vrouwen"
+
+#: morechoice.php:75
+msgid "Breats"
+msgstr "Sletten"
+
+#: morechoice.php:76
+msgid "Scat"
+msgstr "Schoften"
+
+#: morechoice.php:77
+msgid "Crying"
+msgstr "Huilen"
+
+#: morechoice.php:78
+msgid "Nappies/Diapers"
+msgstr "Luiers"
+
+#: morechoice.php:79
+msgid "Trees"
+msgstr "Bomen"
+
+#: morechoice.php:80
+msgid "Vomit"
+msgstr "Braken"
+
+#: morechoice.php:81
+msgid "Murder"
+msgstr "Moord"
+
+#: morechoice.php:82
+msgid "Fat people"
+msgstr "Dikke mensen"
+
+#: morechoice.php:83
+msgid "Feet"
+msgstr "Voeten"
+
+#: morechoice.php:84
+msgid "Covered in insects"
+msgstr "Omhuld in insecten"
+
+#: morechoice.php:85
+msgid "Turning a human being into furniture"
+msgstr "Mensen veranderen in meubilair"
+
+#: morechoice.php:86
+msgid "Elderly people"
+msgstr "Oudere mensen"
+
+#: morechoice.php:87
+msgid "Transgender people"
+msgstr "Transgenders"
+
+#: morechoice.php:88
+msgid "Criminals"
+msgstr "Misdadigers"
+
+#: morechoice.php:89
+msgid "Stealing"
+msgstr "Stelen"
+
+#: morechoice.php:90
+msgid "Breast milk"
+msgstr "Moedermelk"
+
+#: morechoice.php:91
+msgid "Immersing genitals in liquids"
+msgstr "Vloeistofpenetratie"
+
+#: morechoice.php:92
+msgid "Giants"
+msgstr "Reuzen"
+
+#: morechoice.php:93
+msgid "Masochism"
+msgstr "Zelfpijniging"
+
+#: morechoice.php:94
+msgid "Cars"
+msgstr "Auto's"
+
+#: morechoice.php:95
+msgid "Menstruation"
+msgstr "Menstruatie"
+
+#: morechoice.php:96
+msgid "Mucus"
+msgstr "Slijm"
+
+#: morechoice.php:97
+msgid "Obscene language"
+msgstr "Grove taal"
+
+#: morechoice.php:98
+msgid "Noses"
+msgstr "Neuzen"
+
+#: morechoice.php:99
+msgid "Navels"
+msgstr "Navels"
+
+#: morechoice.php:100
+msgid "Corpses"
+msgstr "Lijken"
+
+#: morechoice.php:101
+msgid "Smells"
+msgstr "Geurtjes"
+
+#: morechoice.php:102
+msgid "Buttocks"
+msgstr "Konten"
+
+#: morechoice.php:103
+msgid "Nonliving objects"
+msgstr "Niet-levende objecten"
+
+#: morechoice.php:104
+msgid "Sleeping people"
+msgstr "Slapende mensen"
+
+#: morechoice.php:105
+msgid "Urination"
+msgstr "Plasseks"
+
+#: morechoice.php:106
+msgid "Eating people"
+msgstr "Eten"
+
+#: morechoice.php:107
+msgid "Being eaten"
+msgstr "Gegeten worden"
+
+#: morechoice.php:108
+msgid "Animals"
+msgstr "Dieren"
+
+#: morechoice.php:109
+msgid "I'd rather just have some chocolate"
+msgstr "Geef mij gewoon wat chocolade"
+
+#: morechoice.php:113
+msgid "Married to my job"
+msgstr "Getrouwd met m'n job"
+
+#: morechoice.php:114
+msgid "Polygamist"
+msgstr "Polygamist"
+
+#: morechoice.php:115
+msgid "Half married"
+msgstr "Half getrouwd"
+
+#: morechoice.php:116
+msgid "Living in the past"
+msgstr "Leef in het verleden"
+
+#: morechoice.php:117
+msgid "Pretending to be over my ex"
+msgstr "Doen alsof ik m'n ex ben vergeten"
+
+#: morechoice.php:118
+msgid "Hurt in the past"
+msgstr "Gekwest in het verleden"
+
+#: morechoice.php:119
+msgid "Wallowing in self-pity"
+msgstr "Terugtrekken in zelfmedelijden"
diff --git a/morechoice/lang/nl/strings.php b/morechoice/lang/nl/strings.php
new file mode 100644
index 00000000..fd9e160f
--- /dev/null
+++ b/morechoice/lang/nl/strings.php
@@ -0,0 +1,88 @@
+<?php
+
+if(! function_exists("string_plural_select_nl")) {
+function string_plural_select_nl($n){
+	$n = intval($n);
+	return ($n != 1);;
+}}
+;
+$a->strings["Androgyne"] = "Dubbel geslacht";
+$a->strings["Bear"] = "Beer";
+$a->strings["Bigender"] = "Dubbel";
+$a->strings["Cross dresser"] = "Gekleed als het ander";
+$a->strings["Drag queen"] = "Travestiet";
+$a->strings["Eunuch"] = "Castraat";
+$a->strings["Faux queen"] = "Fout";
+$a->strings["Gender fluid"] = "";
+$a->strings["Kathoey"] = "Tussen man en vrouw";
+$a->strings["Lady"] = "Trotse vrouw";
+$a->strings["Lipstick lesbian"] = "Lesbienne-vrouw";
+$a->strings["Metrosexual"] = "Metrosexueel";
+$a->strings["Monk"] = "Monnik";
+$a->strings["Nun"] = "Non";
+$a->strings["Soft butch"] = "Lesbienne-man";
+$a->strings["Stone femme"] = "Butch en femme";
+$a->strings["Tomboy"] = "Tomboy";
+$a->strings["Transman"] = "Transman";
+$a->strings["Transwoman"] = "Transvrouw";
+$a->strings["Transvesti"] = "";
+$a->strings["Trigender"] = "Drieslacht";
+$a->strings["Can't remember"] = "Kan ik mij niet meer herinneren";
+$a->strings["Hard to tell these days"] = "Moeilijk te zeggen vandaag";
+$a->strings["Girls with big tits"] = "Meisjes met grote tetten";
+$a->strings["Millionaires"] = "Veel geld";
+$a->strings["Guys with big schlongs"] = "Groot geschapen";
+$a->strings["Easy women"] = "Gemakkelijke vrouwen";
+$a->strings["People with impaired mobility"] = "Mensen met beperkte mobiliteit";
+$a->strings["Amputees"] = "Geamputeerden";
+$a->strings["Statues, mannequins and immobility"] = "Standbeelden";
+$a->strings["Pain"] = "Pijn";
+$a->strings["Trans men"] = "Transmannen";
+$a->strings["Older women"] = "Oude vrouwen";
+$a->strings["Asphyxiation"] = "Verstikking";
+$a->strings["In public"] = "Publiek";
+$a->strings["In danger"] = "In gevaar";
+$a->strings["Pretending to be male"] = "Net zoals mannen";
+$a->strings["Pretending to be female"] = "Net als vrouwen";
+$a->strings["Breats"] = "Sletten";
+$a->strings["Scat"] = "Schoften";
+$a->strings["Crying"] = "Huilen";
+$a->strings["Nappies/Diapers"] = "Luiers";
+$a->strings["Trees"] = "Bomen";
+$a->strings["Vomit"] = "Braken";
+$a->strings["Murder"] = "Moord";
+$a->strings["Fat people"] = "Dikke mensen";
+$a->strings["Feet"] = "Voeten";
+$a->strings["Covered in insects"] = "Omhuld in insecten";
+$a->strings["Turning a human being into furniture"] = "Mensen veranderen in meubilair";
+$a->strings["Elderly people"] = "Oudere mensen";
+$a->strings["Transgender people"] = "Transgenders";
+$a->strings["Criminals"] = "Misdadigers";
+$a->strings["Stealing"] = "Stelen";
+$a->strings["Breast milk"] = "Moedermelk";
+$a->strings["Immersing genitals in liquids"] = "Vloeistofpenetratie";
+$a->strings["Giants"] = "Reuzen";
+$a->strings["Masochism"] = "Zelfpijniging";
+$a->strings["Cars"] = "Auto's";
+$a->strings["Menstruation"] = "Menstruatie";
+$a->strings["Mucus"] = "Slijm";
+$a->strings["Obscene language"] = "Grove taal";
+$a->strings["Noses"] = "Neuzen";
+$a->strings["Navels"] = "Navels";
+$a->strings["Corpses"] = "Lijken";
+$a->strings["Smells"] = "Geurtjes";
+$a->strings["Buttocks"] = "Konten";
+$a->strings["Nonliving objects"] = "Niet-levende objecten";
+$a->strings["Sleeping people"] = "Slapende mensen";
+$a->strings["Urination"] = "Plasseks";
+$a->strings["Eating people"] = "Eten";
+$a->strings["Being eaten"] = "Gegeten worden";
+$a->strings["Animals"] = "Dieren";
+$a->strings["I'd rather just have some chocolate"] = "Geef mij gewoon wat chocolade";
+$a->strings["Married to my job"] = "Getrouwd met m'n job";
+$a->strings["Polygamist"] = "Polygamist";
+$a->strings["Half married"] = "Half getrouwd";
+$a->strings["Living in the past"] = "Leef in het verleden";
+$a->strings["Pretending to be over my ex"] = "Doen alsof ik m'n ex ben vergeten";
+$a->strings["Hurt in the past"] = "Gekwest in het verleden";
+$a->strings["Wallowing in self-pity"] = "Terugtrekken in zelfmedelijden";
diff --git a/morechoice/lang/pl/messages.po b/morechoice/lang/pl/messages.po
new file mode 100644
index 00000000..f0a39e7a
--- /dev/null
+++ b/morechoice/lang/pl/messages.po
@@ -0,0 +1,339 @@
+# ADDON morechoice
+# Copyright (C)
+# This file is distributed under the same license as the Friendica morechoice addon package.
+# 
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-08-07 15:04+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>, 2018\n"
+"Language-Team: Polish (https://www.transifex.com/Friendica/teams/12172/pl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pl\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
+
+#: morechoice.php:34
+msgid "Androgyne"
+msgstr "Androgyniczny"
+
+#: morechoice.php:35
+msgid "Bear"
+msgstr "Urodzić"
+
+#: morechoice.php:36
+msgid "Bigender"
+msgstr "Większy"
+
+#: morechoice.php:37
+msgid "Cross dresser"
+msgstr "Transwestyta"
+
+#: morechoice.php:38
+msgid "Drag queen"
+msgstr "Transwestyta"
+
+#: morechoice.php:39
+msgid "Eunuch"
+msgstr "Kastrat"
+
+#: morechoice.php:40
+msgid "Faux queen"
+msgstr "Fałszywa dama"
+
+#: morechoice.php:41
+msgid "Gender fluid"
+msgstr "Płyn płciowy"
+
+#: morechoice.php:42
+msgid "Kathoey"
+msgstr "Kathoey"
+
+#: morechoice.php:43
+msgid "Lady"
+msgstr "Pani"
+
+#: morechoice.php:44
+msgid "Lipstick lesbian"
+msgstr "Szminka lesbijek"
+
+#: morechoice.php:45
+msgid "Metrosexual"
+msgstr "Metroseksualny"
+
+#: morechoice.php:46
+msgid "Monk"
+msgstr "Mnich"
+
+#: morechoice.php:47
+msgid "Nun"
+msgstr "Obecnie"
+
+#: morechoice.php:48
+msgid "Soft butch"
+msgstr "Miękka lesbijka"
+
+#: morechoice.php:49
+msgid "Stone femme"
+msgstr "Kamienna kobieta"
+
+#: morechoice.php:50
+msgid "Tomboy"
+msgstr "Lesbijka"
+
+#: morechoice.php:51
+msgid "Transman"
+msgstr "Męszczyzna Transseklualny"
+
+#: morechoice.php:52
+msgid "Transwoman"
+msgstr "Kobieta Transseklualna"
+
+#: morechoice.php:53
+msgid "Transvesti"
+msgstr "Transwestyta"
+
+#: morechoice.php:54
+msgid "Trigender"
+msgstr "Trójpłciowość"
+
+#: morechoice.php:55
+msgid "Can't remember"
+msgstr "Nie pamiętam"
+
+#: morechoice.php:56
+msgid "Hard to tell these days"
+msgstr "Trudno powiedzieć w te dni"
+
+#: morechoice.php:60
+msgid "Girls with big tits"
+msgstr "Dziewczyny z dużymi piersiami"
+
+#: morechoice.php:61
+msgid "Millionaires"
+msgstr "Milionerzy"
+
+#: morechoice.php:62
+msgid "Guys with big schlongs"
+msgstr "Faceci z dużymi penisami"
+
+#: morechoice.php:63
+msgid "Easy women"
+msgstr "Łatwe kobiety"
+
+#: morechoice.php:64
+msgid "People with impaired mobility"
+msgstr "Osoby z upośledzeniem ruchowym"
+
+#: morechoice.php:65
+msgid "Amputees"
+msgstr "Po amputacji"
+
+#: morechoice.php:66
+msgid "Statues, mannequins and immobility"
+msgstr "Posągi, manekiny i nieruchomość"
+
+#: morechoice.php:67
+msgid "Pain"
+msgstr "Ból"
+
+#: morechoice.php:68
+msgid "Trans men"
+msgstr "Transseklualny męszczyzna"
+
+#: morechoice.php:69
+msgid "Older women"
+msgstr "Starsze kobiety"
+
+#: morechoice.php:70
+msgid "Asphyxiation"
+msgstr "Uduszenie się"
+
+#: morechoice.php:71
+msgid "In public"
+msgstr "Publicznie"
+
+#: morechoice.php:72
+msgid "In danger"
+msgstr "W niebezpieczeństwie"
+
+#: morechoice.php:73
+msgid "Pretending to be male"
+msgstr "Udawanie mężczyzny"
+
+#: morechoice.php:74
+msgid "Pretending to be female"
+msgstr "Udając płeć żeńską"
+
+#: morechoice.php:75
+msgid "Breats"
+msgstr "Biust"
+
+#: morechoice.php:76
+msgid "Scat"
+msgstr "Zwiać"
+
+#: morechoice.php:77
+msgid "Crying"
+msgstr "Płacz"
+
+#: morechoice.php:78
+msgid "Nappies/Diapers"
+msgstr "Pieluchy/pampersy"
+
+#: morechoice.php:79
+msgid "Trees"
+msgstr "Drzewo"
+
+#: morechoice.php:80
+msgid "Vomit"
+msgstr "Zwymiotować"
+
+#: morechoice.php:81
+msgid "Murder"
+msgstr "Morderstwo"
+
+#: morechoice.php:82
+msgid "Fat people"
+msgstr "Otyli przyjaciele"
+
+#: morechoice.php:83
+msgid "Feet"
+msgstr "Stopy"
+
+#: morechoice.php:84
+msgid "Covered in insects"
+msgstr "Pokryty owadami"
+
+#: morechoice.php:85
+msgid "Turning a human being into furniture"
+msgstr "Przekształcając człowieka meble"
+
+#: morechoice.php:86
+msgid "Elderly people"
+msgstr "Osób w podeszłym wieku"
+
+#: morechoice.php:87
+msgid "Transgender people"
+msgstr "Osoby transpłciowe"
+
+#: morechoice.php:88
+msgid "Criminals"
+msgstr "Przestępca"
+
+#: morechoice.php:89
+msgid "Stealing"
+msgstr "Kradzież"
+
+#: morechoice.php:90
+msgid "Breast milk"
+msgstr "Mleko matki"
+
+#: morechoice.php:91
+msgid "Immersing genitals in liquids"
+msgstr "Zanurzenie narządów płciowych w cieczach"
+
+#: morechoice.php:92
+msgid "Giants"
+msgstr "Giganci"
+
+#: morechoice.php:93
+msgid "Masochism"
+msgstr "Masochizm"
+
+#: morechoice.php:94
+msgid "Cars"
+msgstr "Samochody"
+
+#: morechoice.php:95
+msgid "Menstruation"
+msgstr "Miesiączka"
+
+#: morechoice.php:96
+msgid "Mucus"
+msgstr "Wydzielina"
+
+#: morechoice.php:97
+msgid "Obscene language"
+msgstr "Nieprzyzwoity język"
+
+#: morechoice.php:98
+msgid "Noses"
+msgstr "Nosy"
+
+#: morechoice.php:99
+msgid "Navels"
+msgstr "Pępki"
+
+#: morechoice.php:100
+msgid "Corpses"
+msgstr "Zwłoki"
+
+#: morechoice.php:101
+msgid "Smells"
+msgstr "Odór"
+
+#: morechoice.php:102
+msgid "Buttocks"
+msgstr "Tyłek"
+
+#: morechoice.php:103
+msgid "Nonliving objects"
+msgstr "Nieżyjący obiekt"
+
+#: morechoice.php:104
+msgid "Sleeping people"
+msgstr "Śpiący ludzie"
+
+#: morechoice.php:105
+msgid "Urination"
+msgstr "Oddawanie moczu"
+
+#: morechoice.php:106
+msgid "Eating people"
+msgstr "Pożywienie dla ludzi"
+
+#: morechoice.php:107
+msgid "Being eaten"
+msgstr "Bycie zjedzonym"
+
+#: morechoice.php:108
+msgid "Animals"
+msgstr "Zwierzęta"
+
+#: morechoice.php:109
+msgid "I'd rather just have some chocolate"
+msgstr "Wolałbym tylko trochę czekolady"
+
+#: morechoice.php:113
+msgid "Married to my job"
+msgstr "Żonaty z moją pracą"
+
+#: morechoice.php:114
+msgid "Polygamist"
+msgstr "Poligamista"
+
+#: morechoice.php:115
+msgid "Half married"
+msgstr "Pół żonaty"
+
+#: morechoice.php:116
+msgid "Living in the past"
+msgstr "Życie w przeszłości"
+
+#: morechoice.php:117
+msgid "Pretending to be over my ex"
+msgstr "Udawanie, że jestem ponad moim byłym"
+
+#: morechoice.php:118
+msgid "Hurt in the past"
+msgstr "Boli w przeszłości"
+
+#: morechoice.php:119
+msgid "Wallowing in self-pity"
+msgstr "Miauczenie w użalaniu się nad sobą"
diff --git a/morechoice/lang/pl/strings.php b/morechoice/lang/pl/strings.php
new file mode 100644
index 00000000..1c6eeb81
--- /dev/null
+++ b/morechoice/lang/pl/strings.php
@@ -0,0 +1,88 @@
+<?php
+
+if(! function_exists("string_plural_select_pl")) {
+function string_plural_select_pl($n){
+	$n = intval($n);
+	return ($n==1 ? 0 : ($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14) ? 1 : $n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14) ? 2 : 3);;
+}}
+;
+$a->strings["Androgyne"] = "Androgyniczny";
+$a->strings["Bear"] = "Urodzić";
+$a->strings["Bigender"] = "Większy";
+$a->strings["Cross dresser"] = "Transwestyta";
+$a->strings["Drag queen"] = "Transwestyta";
+$a->strings["Eunuch"] = "Kastrat";
+$a->strings["Faux queen"] = "Fałszywa dama";
+$a->strings["Gender fluid"] = "Płyn płciowy";
+$a->strings["Kathoey"] = "Kathoey";
+$a->strings["Lady"] = "Pani";
+$a->strings["Lipstick lesbian"] = "Szminka lesbijek";
+$a->strings["Metrosexual"] = "Metroseksualny";
+$a->strings["Monk"] = "Mnich";
+$a->strings["Nun"] = "Obecnie";
+$a->strings["Soft butch"] = "Miękka lesbijka";
+$a->strings["Stone femme"] = "Kamienna kobieta";
+$a->strings["Tomboy"] = "Lesbijka";
+$a->strings["Transman"] = "Męszczyzna Transseklualny";
+$a->strings["Transwoman"] = "Kobieta Transseklualna";
+$a->strings["Transvesti"] = "Transwestyta";
+$a->strings["Trigender"] = "Trójpłciowość";
+$a->strings["Can't remember"] = "Nie pamiętam";
+$a->strings["Hard to tell these days"] = "Trudno powiedzieć w te dni";
+$a->strings["Girls with big tits"] = "Dziewczyny z dużymi piersiami";
+$a->strings["Millionaires"] = "Milionerzy";
+$a->strings["Guys with big schlongs"] = "Faceci z dużymi penisami";
+$a->strings["Easy women"] = "Łatwe kobiety";
+$a->strings["People with impaired mobility"] = "Osoby z upośledzeniem ruchowym";
+$a->strings["Amputees"] = "Po amputacji";
+$a->strings["Statues, mannequins and immobility"] = "Posągi, manekiny i nieruchomość";
+$a->strings["Pain"] = "Ból";
+$a->strings["Trans men"] = "Transseklualny męszczyzna";
+$a->strings["Older women"] = "Starsze kobiety";
+$a->strings["Asphyxiation"] = "Uduszenie się";
+$a->strings["In public"] = "Publicznie";
+$a->strings["In danger"] = "W niebezpieczeństwie";
+$a->strings["Pretending to be male"] = "Udawanie mężczyzny";
+$a->strings["Pretending to be female"] = "Udając płeć żeńską";
+$a->strings["Breats"] = "Biust";
+$a->strings["Scat"] = "Zwiać";
+$a->strings["Crying"] = "Płacz";
+$a->strings["Nappies/Diapers"] = "Pieluchy/pampersy";
+$a->strings["Trees"] = "Drzewo";
+$a->strings["Vomit"] = "Zwymiotować";
+$a->strings["Murder"] = "Morderstwo";
+$a->strings["Fat people"] = "Otyli przyjaciele";
+$a->strings["Feet"] = "Stopy";
+$a->strings["Covered in insects"] = "Pokryty owadami";
+$a->strings["Turning a human being into furniture"] = "Przekształcając człowieka meble";
+$a->strings["Elderly people"] = "Osób w podeszłym wieku";
+$a->strings["Transgender people"] = "Osoby transpłciowe";
+$a->strings["Criminals"] = "Przestępca";
+$a->strings["Stealing"] = "Kradzież";
+$a->strings["Breast milk"] = "Mleko matki";
+$a->strings["Immersing genitals in liquids"] = "Zanurzenie narządów płciowych w cieczach";
+$a->strings["Giants"] = "Giganci";
+$a->strings["Masochism"] = "Masochizm";
+$a->strings["Cars"] = "Samochody";
+$a->strings["Menstruation"] = "Miesiączka";
+$a->strings["Mucus"] = "Wydzielina";
+$a->strings["Obscene language"] = "Nieprzyzwoity język";
+$a->strings["Noses"] = "Nosy";
+$a->strings["Navels"] = "Pępki";
+$a->strings["Corpses"] = "Zwłoki";
+$a->strings["Smells"] = "Odór";
+$a->strings["Buttocks"] = "Tyłek";
+$a->strings["Nonliving objects"] = "Nieżyjący obiekt";
+$a->strings["Sleeping people"] = "Śpiący ludzie";
+$a->strings["Urination"] = "Oddawanie moczu";
+$a->strings["Eating people"] = "Pożywienie dla ludzi";
+$a->strings["Being eaten"] = "Bycie zjedzonym";
+$a->strings["Animals"] = "Zwierzęta";
+$a->strings["I'd rather just have some chocolate"] = "Wolałbym tylko trochę czekolady";
+$a->strings["Married to my job"] = "Żonaty z moją pracą";
+$a->strings["Polygamist"] = "Poligamista";
+$a->strings["Half married"] = "Pół żonaty";
+$a->strings["Living in the past"] = "Życie w przeszłości";
+$a->strings["Pretending to be over my ex"] = "Udawanie, że jestem ponad moim byłym";
+$a->strings["Hurt in the past"] = "Boli w przeszłości";
+$a->strings["Wallowing in self-pity"] = "Miauczenie w użalaniu się nad sobą";
diff --git a/morechoice/morechoice.php b/morechoice/morechoice.php
index fe726d27..dea8be15 100644
--- a/morechoice/morechoice.php
+++ b/morechoice/morechoice.php
@@ -5,12 +5,11 @@
  * Version: 1.0
  * Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
  *    - who takes no responsibility for any additional content which may appear herein
- * Status: Deprecated
+ *
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
-use Friendica\DI;
+use Friendica\Core\L10n;
 
 function morechoice_install() {
 
@@ -19,91 +18,103 @@ function morechoice_install() {
 	Hook::register('marital_selector', 'addon/morechoice/morechoice.php', 'morechoice_marital_selector');
 }
 
-function morechoice_gender_selector(array &$b) {
-	$b['Androgyne'] = DI::l10n()->t('Androgyne');
-	$b['Bear'] = DI::l10n()->t('Bear');
-	$b['Bigender'] = DI::l10n()->t('Bigender');
-	$b['Cross dresser'] = DI::l10n()->t('Cross dresser');
-	$b['Drag queen'] = DI::l10n()->t('Drag queen');
-	$b['Eunuch'] = DI::l10n()->t('Eunuch');
-	$b['Faux queen'] = DI::l10n()->t('Faux queen');
-	$b['Gender fluid'] = DI::l10n()->t('Gender fluid');
-	$b['Kathoey'] = DI::l10n()->t('Kathoey');
-	$b['Lady'] = DI::l10n()->t('Lady');
-	$b['Lipstick lesbian'] = DI::l10n()->t('Lipstick lesbian');
-	$b['Metrosexual'] = DI::l10n()->t('Metrosexual');
-	$b['Monk'] = DI::l10n()->t('Monk');
-	$b['Nun'] = DI::l10n()->t('Nun');
-	$b['Soft butch'] = DI::l10n()->t('Soft butch');
-	$b['Stone femme'] = DI::l10n()->t('Stone femme');
-	$b['Tomboy'] = DI::l10n()->t('Tomboy');
-	$b['Transman'] = DI::l10n()->t('Transman');
-	$b['Transwoman'] = DI::l10n()->t('Transwoman');
-	$b['Transvesti'] = DI::l10n()->t('Transvesti');
-	$b['Trigender'] = DI::l10n()->t('Trigender');
-	$b['Can\'t remember'] = DI::l10n()->t('Can\'t remember');
-	$b['Hard to tell these days'] = DI::l10n()->t('Hard to tell these days');
+
+function morechoice_uninstall() {
+
+	Hook::unregister('gender_selector', 'addon/morechoice/morechoice.php', 'morechoice_gender_selector');
+	Hook::unregister('sexpref_selector', 'addon/morechoice/morechoice.php', 'morechoice_sexpref_selector');
+	Hook::unregister('marital_selector', 'addon/morechoice/morechoice.php', 'morechoice_marital_selector');
+
+// We need to leave this here for a while, because we now have a situation where people can end up with an orphaned hook.
+	Hook::unregister('poke_verbs', 'addon/morechoice/morechoice.php', 'morechoice_poke_verbs');
+
 }
 
-function morechoice_sexpref_selector(array &$b) {
-	$b['Girls with big tits'] = DI::l10n()->t('Girls with big tits');
-	$b['Millionaires'] = DI::l10n()->t('Millionaires');
-	$b['Guys with big schlongs'] = DI::l10n()->t('Guys with big schlongs');
-	$b['Easy women'] = DI::l10n()->t('Easy women');
-	$b['People with impaired mobility'] = DI::l10n()->t('People with impaired mobility');
-	$b['Amputees'] = DI::l10n()->t('Amputees');
-	$b['Statues, mannequins and immobility'] = DI::l10n()->t('Statues, mannequins and immobility');
-	$b['Pain'] = DI::l10n()->t('Pain');
-	$b['Trans men'] = DI::l10n()->t('Trans men');
-	$b['Older women'] = DI::l10n()->t('Older women');
-	$b['Asphyxiation'] = DI::l10n()->t('Asphyxiation');
-	$b['In public'] = DI::l10n()->t('In public');
-	$b['In danger'] = DI::l10n()->t('In danger');
-	$b['Pretending to be male'] = DI::l10n()->t('Pretending to be male');
-	$b['Pretending to be female'] = DI::l10n()->t('Pretending to be female');
-	$b['Breats'] = DI::l10n()->t('Breats');
-	$b['Scat'] = DI::l10n()->t('Scat');
-	$b['Crying'] = DI::l10n()->t('Crying');
-	$b['Nappies/Diapers'] = DI::l10n()->t('Nappies/Diapers');
-	$b['Trees'] = DI::l10n()->t('Trees');
-	$b['Vomit'] = DI::l10n()->t('Vomit');
-	$b['Murder'] = DI::l10n()->t('Murder');
-	$b['Fat people'] = DI::l10n()->t('Fat people');
-	$b['Feet'] = DI::l10n()->t('Feet');
-	$b['Covered in insects'] = DI::l10n()->t('Covered in insects');
-	$b['Turning a human being into furniture'] = DI::l10n()->t('Turning a human being into furniture');
-	$b['Elderly people'] = DI::l10n()->t('Elderly people');
-	$b['Transgender people'] = DI::l10n()->t('Transgender people');
-	$b['Criminals'] = DI::l10n()->t('Criminals');
-	$b['Stealing'] = DI::l10n()->t('Stealing');
-	$b['Breast milk'] = DI::l10n()->t('Breast milk');
-	$b['Immersing genitals in liquids'] = DI::l10n()->t('Immersing genitals in liquids');
-	$b['Giants'] = DI::l10n()->t('Giants');
-	$b['Masochism'] = DI::l10n()->t('Masochism');
-	$b['Cars'] = DI::l10n()->t('Cars');
-	$b['Menstruation'] = DI::l10n()->t('Menstruation');
-	$b['Mucus'] = DI::l10n()->t('Mucus');
-	$b['Obscene language'] = DI::l10n()->t('Obscene language');
-	$b['Noses'] = DI::l10n()->t('Noses');
-	$b['Navels'] = DI::l10n()->t('Navels');
-	$b['Corpses'] = DI::l10n()->t('Corpses');
-	$b['Smells'] = DI::l10n()->t('Smells');
-	$b['Buttocks'] = DI::l10n()->t('Buttocks');
-	$b['Nonliving objects'] = DI::l10n()->t('Nonliving objects');
-	$b['Sleeping people'] = DI::l10n()->t('Sleeping people');
-	$b['Urination'] = DI::l10n()->t('Urination');
-	$b['Eating people'] = DI::l10n()->t('Eating people');
-	$b['Being eaten'] = DI::l10n()->t('Being eaten');
-	$b['Animals'] = DI::l10n()->t('Animals');
-	$b['I\'d rather just have some chocolate'] = DI::l10n()->t('I\'d rather just have some chocolate');
+function morechoice_gender_selector($a,&$b) {
+	$b['Androgyne'] = L10n::t('Androgyne');
+	$b['Bear'] = L10n::t('Bear');
+	$b['Bigender'] = L10n::t('Bigender');
+	$b['Cross dresser'] = L10n::t('Cross dresser');
+	$b['Drag queen'] = L10n::t('Drag queen');
+	$b['Eunuch'] = L10n::t('Eunuch');
+	$b['Faux queen'] = L10n::t('Faux queen');
+	$b['Gender fluid'] = L10n::t('Gender fluid');
+	$b['Kathoey'] = L10n::t('Kathoey');
+	$b['Lady'] = L10n::t('Lady');
+	$b['Lipstick lesbian'] = L10n::t('Lipstick lesbian');
+	$b['Metrosexual'] = L10n::t('Metrosexual');
+	$b['Monk'] = L10n::t('Monk');
+	$b['Nun'] = L10n::t('Nun');
+	$b['Soft butch'] = L10n::t('Soft butch');
+	$b['Stone femme'] = L10n::t('Stone femme');
+	$b['Tomboy'] = L10n::t('Tomboy');
+	$b['Transman'] = L10n::t('Transman');
+	$b['Transwoman'] = L10n::t('Transwoman');
+	$b['Transvesti'] = L10n::t('Transvesti');
+	$b['Trigender'] = L10n::t('Trigender');
+	$b['Can\'t remember'] = L10n::t('Can\'t remember');
+	$b['Hard to tell these days'] = L10n::t('Hard to tell these days');
 }
 
-function morechoice_marital_selector(array &$b) {
-	$b['Married to my job'] = DI::l10n()->t('Married to my job');
-	$b['Polygamist'] = DI::l10n()->t('Polygamist');
-	$b['Half married'] = DI::l10n()->t('Half married');
-	$b['Living in the past'] = DI::l10n()->t('Living in the past');
-	$b['Pretending to be over my ex'] = DI::l10n()->t('Pretending to be over my ex');
-	$b['Hurt in the past'] = DI::l10n()->t('Hurt in the past');
-	$b['Wallowing in self-pity'] = DI::l10n()->t('Wallowing in self-pity');
+function morechoice_sexpref_selector($a,&$b) {
+	$b['Girls with big tits'] = L10n::t('Girls with big tits');
+	$b['Millionaires'] = L10n::t('Millionaires');
+	$b['Guys with big schlongs'] = L10n::t('Guys with big schlongs');
+	$b['Easy women'] = L10n::t('Easy women');
+	$b['People with impaired mobility'] = L10n::t('People with impaired mobility');
+	$b['Amputees'] = L10n::t('Amputees');
+	$b['Statues, mannequins and immobility'] = L10n::t('Statues, mannequins and immobility');
+	$b['Pain'] = L10n::t('Pain');
+	$b['Trans men'] = L10n::t('Trans men');
+	$b['Older women'] = L10n::t('Older women');
+	$b['Asphyxiation'] = L10n::t('Asphyxiation');
+	$b['In public'] = L10n::t('In public');
+	$b['In danger'] = L10n::t('In danger');
+	$b['Pretending to be male'] = L10n::t('Pretending to be male');
+	$b['Pretending to be female'] = L10n::t('Pretending to be female');
+	$b['Breats'] = L10n::t('Breats');
+	$b['Scat'] = L10n::t('Scat');
+	$b['Crying'] = L10n::t('Crying');
+	$b['Nappies/Diapers'] = L10n::t('Nappies/Diapers');
+	$b['Trees'] = L10n::t('Trees');
+	$b['Vomit'] = L10n::t('Vomit');
+	$b['Murder'] = L10n::t('Murder');
+	$b['Fat people'] = L10n::t('Fat people');
+	$b['Feet'] = L10n::t('Feet');
+	$b['Covered in insects'] = L10n::t('Covered in insects');
+	$b['Turning a human being into furniture'] = L10n::t('Turning a human being into furniture');
+	$b['Elderly people'] = L10n::t('Elderly people');
+	$b['Transgender people'] = L10n::t('Transgender people');
+	$b['Criminals'] = L10n::t('Criminals');
+	$b['Stealing'] = L10n::t('Stealing');
+	$b['Breast milk'] = L10n::t('Breast milk');
+	$b['Immersing genitals in liquids'] = L10n::t('Immersing genitals in liquids');
+	$b['Giants'] = L10n::t('Giants');
+	$b['Masochism'] = L10n::t('Masochism');
+	$b['Cars'] = L10n::t('Cars');
+	$b['Menstruation'] = L10n::t('Menstruation');
+	$b['Mucus'] = L10n::t('Mucus');
+	$b['Obscene language'] = L10n::t('Obscene language');
+	$b['Noses'] = L10n::t('Noses');
+	$b['Navels'] = L10n::t('Navels');
+	$b['Corpses'] = L10n::t('Corpses');
+	$b['Smells'] = L10n::t('Smells');
+	$b['Buttocks'] = L10n::t('Buttocks');
+	$b['Nonliving objects'] = L10n::t('Nonliving objects');
+	$b['Sleeping people'] = L10n::t('Sleeping people');
+	$b['Urination'] = L10n::t('Urination');
+	$b['Eating people'] = L10n::t('Eating people');
+	$b['Being eaten'] = L10n::t('Being eaten');
+	$b['Animals'] = L10n::t('Animals');
+	$b['I\'d rather just have some chocolate'] = L10n::t('I\'d rather just have some chocolate');
+}
+
+function morechoice_marital_selector($a,&$b) {
+	$b['Married to my job'] = L10n::t('Married to my job');
+	$b['Polygamist'] = L10n::t('Polygamist');
+	$b['Half married'] = L10n::t('Half married');
+	$b['Living in the past'] = L10n::t('Living in the past');
+	$b['Pretending to be over my ex'] = L10n::t('Pretending to be over my ex');
+	$b['Hurt in the past'] = L10n::t('Hurt in the past');
+	$b['Wallowing in self-pity'] = L10n::t('Wallowing in self-pity');
 }
diff --git a/morepokes/lang/C/messages.po b/morepokes/lang/C/messages.po
new file mode 100644
index 00000000..950ce98d
--- /dev/null
+++ b/morepokes/lang/C/messages.po
@@ -0,0 +1,164 @@
+# ADDON morepokes
+# Copyright (C) 
+# This file is distributed under the same license as the Friendica morepokes addon package.
+# 
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: morepokes.php:19
+msgid "bitchslap"
+msgstr ""
+
+#: morepokes.php:19
+msgid "bitchslapped"
+msgstr ""
+
+#: morepokes.php:20
+msgid "shag"
+msgstr ""
+
+#: morepokes.php:20
+msgid "shagged"
+msgstr ""
+
+#: morepokes.php:21
+msgid "do something obscenely biological to"
+msgstr ""
+
+#: morepokes.php:21
+msgid "did something obscenely biological to"
+msgstr ""
+
+#: morepokes.php:22
+msgid "point out the poke feature to"
+msgstr ""
+
+#: morepokes.php:22
+msgid "pointed out the poke feature to"
+msgstr ""
+
+#: morepokes.php:23
+msgid "declare undying love for"
+msgstr ""
+
+#: morepokes.php:23
+msgid "declared undying love for"
+msgstr ""
+
+#: morepokes.php:24
+msgid "patent"
+msgstr ""
+
+#: morepokes.php:24
+msgid "patented"
+msgstr ""
+
+#: morepokes.php:25
+msgid "stroke beard"
+msgstr ""
+
+#: morepokes.php:25
+msgid "stroked their beard at"
+msgstr ""
+
+#: morepokes.php:26
+msgid ""
+"bemoan the declining standards of modern secondary and tertiary education to"
+msgstr ""
+
+#: morepokes.php:26
+msgid ""
+"bemoans the declining standards of modern secondary and tertiary education to"
+msgstr ""
+
+#: morepokes.php:27
+msgid "hug"
+msgstr ""
+
+#: morepokes.php:27
+msgid "hugged"
+msgstr ""
+
+#: morepokes.php:28
+msgid "kiss"
+msgstr ""
+
+#: morepokes.php:28
+msgid "kissed"
+msgstr ""
+
+#: morepokes.php:29
+msgid "raise eyebrows at"
+msgstr ""
+
+#: morepokes.php:29
+msgid "raised their eyebrows at"
+msgstr ""
+
+#: morepokes.php:30
+msgid "insult"
+msgstr ""
+
+#: morepokes.php:30
+msgid "insulted"
+msgstr ""
+
+#: morepokes.php:31
+msgid "praise"
+msgstr ""
+
+#: morepokes.php:31
+msgid "praised"
+msgstr ""
+
+#: morepokes.php:32
+msgid "be dubious of"
+msgstr ""
+
+#: morepokes.php:32
+msgid "was dubious of"
+msgstr ""
+
+#: morepokes.php:33
+msgid "eat"
+msgstr ""
+
+#: morepokes.php:33
+msgid "ate"
+msgstr ""
+
+#: morepokes.php:34
+msgid "giggle and fawn at"
+msgstr ""
+
+#: morepokes.php:34
+msgid "giggled and fawned at"
+msgstr ""
+
+#: morepokes.php:35
+msgid "doubt"
+msgstr ""
+
+#: morepokes.php:35
+msgid "doubted"
+msgstr ""
+
+#: morepokes.php:36
+msgid "glare"
+msgstr ""
+
+#: morepokes.php:36
+msgid "glared at"
+msgstr ""
diff --git a/morepokes/lang/ca/strings.php b/morepokes/lang/ca/strings.php
new file mode 100644
index 00000000..81afa8a6
--- /dev/null
+++ b/morepokes/lang/ca/strings.php
@@ -0,0 +1,38 @@
+<?php
+
+$a->strings["bitchslap"] = "bufetada";
+$a->strings["bitchslapped"] = "bufetejat";
+$a->strings["shag"] = "fotut";
+$a->strings["shagged"] = "fotre";
+$a->strings["do something obscenely biological to"] = "";
+$a->strings["did something obscenely biological to"] = "";
+$a->strings["point out the poke feature to"] = "";
+$a->strings["pointed out the poke feature to"] = "";
+$a->strings["declare undying love for"] = "declara amor inmortal a";
+$a->strings["declared undying love for"] = "declarat amor inmortal a";
+$a->strings["patent"] = "patent";
+$a->strings["patented"] = "patentat";
+$a->strings["stroke beard"] = "";
+$a->strings["stroked their beard at"] = "";
+$a->strings["bemoan the declining standards of modern secondary and tertiary education to"] = "";
+$a->strings["bemoans the declining standards of modern secondary and tertiary education to"] = "";
+$a->strings["hug"] = "";
+$a->strings["hugged"] = "";
+$a->strings["kiss"] = "petó";
+$a->strings["kissed"] = "besat";
+$a->strings["raise eyebrows at"] = "sorprès";
+$a->strings["raised their eyebrows at"] = "es van sorprendre";
+$a->strings["insult"] = "insult";
+$a->strings["insulted"] = "insultat";
+$a->strings["praise"] = "";
+$a->strings["praised"] = "";
+$a->strings["be dubious of"] = "";
+$a->strings["was dubious of"] = "";
+$a->strings["eat"] = "menja";
+$a->strings["ate"] = "menjà";
+$a->strings["giggle and fawn at"] = "";
+$a->strings["giggled and fawned at"] = "";
+$a->strings["doubt"] = "dubte";
+$a->strings["doubted"] = "dubitat";
+$a->strings["glare"] = "";
+$a->strings["glared at"] = "";
diff --git a/morepokes/lang/cs/messages.po b/morepokes/lang/cs/messages.po
new file mode 100644
index 00000000..b5dd60b9
--- /dev/null
+++ b/morepokes/lang/cs/messages.po
@@ -0,0 +1,168 @@
+# ADDON morepokes
+# Copyright (C)
+# This file is distributed under the same license as the Friendica morepokes addon package.
+# 
+# 
+# Translators:
+# Aditoo, 2018
+# michal_s <msupler@gmail.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2018-07-06 18:55+0000\n"
+"Last-Translator: Aditoo\n"
+"Language-Team: Czech (http://www.transifex.com/Friendica/friendica/language/cs/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
+
+#: morepokes.php:19
+msgid "bitchslap"
+msgstr "dát facku"
+
+#: morepokes.php:19
+msgid "bitchslapped"
+msgstr "dal/a facku"
+
+#: morepokes.php:20
+msgid "shag"
+msgstr "pomilovat"
+
+#: morepokes.php:20
+msgid "shagged"
+msgstr "pomiloval/a"
+
+#: morepokes.php:21
+msgid "do something obscenely biological to"
+msgstr "udělat příjemci něco obscéně biologického"
+
+#: morepokes.php:21
+msgid "did something obscenely biological to"
+msgstr "udělal/a něco obscéně biologického"
+
+#: morepokes.php:22
+msgid "point out the poke feature to"
+msgstr "upozornit na funkci šťouchnutí"
+
+#: morepokes.php:22
+msgid "pointed out the poke feature to"
+msgstr "upozornil/a na funkci šťouchnutí"
+
+#: morepokes.php:23
+msgid "declare undying love for"
+msgstr "vyjadřit nehynoucí lásku"
+
+#: morepokes.php:23
+msgid "declared undying love for"
+msgstr "vyjadřil/a nehynoucí lásku k uživateli"
+
+#: morepokes.php:24
+msgid "patent"
+msgstr "patentovat"
+
+#: morepokes.php:24
+msgid "patented"
+msgstr "patentoval/a uživatele"
+
+#: morepokes.php:25
+msgid "stroke beard"
+msgstr "pohladit plnovous"
+
+#: morepokes.php:25
+msgid "stroked their beard at"
+msgstr "pohladil/a plnovous"
+
+#: morepokes.php:26
+msgid ""
+"bemoan the declining standards of modern secondary and tertiary education to"
+msgstr "stěžovat si příjemci na klesající úroveň moderního sekundárního a terciárního vzdělávání"
+
+#: morepokes.php:26
+msgid ""
+"bemoans the declining standards of modern secondary and tertiary education "
+"to"
+msgstr "si stěžuje na klesající úroveň moderního sekundárního a terciárního vzdělávání"
+
+#: morepokes.php:27
+msgid "hug"
+msgstr "obejmout"
+
+#: morepokes.php:27
+msgid "hugged"
+msgstr "obejmul/a"
+
+#: morepokes.php:28
+msgid "kiss"
+msgstr "políbit"
+
+#: morepokes.php:28
+msgid "kissed"
+msgstr "políbil/a"
+
+#: morepokes.php:29
+msgid "raise eyebrows at"
+msgstr "zvednout obočí na"
+
+#: morepokes.php:29
+msgid "raised their eyebrows at"
+msgstr "zvedl/a obočí na"
+
+#: morepokes.php:30
+msgid "insult"
+msgstr "urazit"
+
+#: morepokes.php:30
+msgid "insulted"
+msgstr "urazil/a"
+
+#: morepokes.php:31
+msgid "praise"
+msgstr "pochválit"
+
+#: morepokes.php:31
+msgid "praised"
+msgstr "pochválil/a"
+
+#: morepokes.php:32
+msgid "be dubious of"
+msgstr "mít pochyby o"
+
+#: morepokes.php:32
+msgid "was dubious of"
+msgstr "měl/a pochyby o"
+
+#: morepokes.php:33
+msgid "eat"
+msgstr "sníst"
+
+#: morepokes.php:33
+msgid "ate"
+msgstr "snědl/a"
+
+#: morepokes.php:34
+msgid "giggle and fawn at"
+msgstr "hihňat se na"
+
+#: morepokes.php:34
+msgid "giggled and fawned at"
+msgstr "se hihňal/a na"
+
+#: morepokes.php:35
+msgid "doubt"
+msgstr "pochybovat"
+
+#: morepokes.php:35
+msgid "doubted"
+msgstr "zapochyboval/a o"
+
+#: morepokes.php:36
+msgid "glare"
+msgstr "zabodávát pohledem"
+
+#: morepokes.php:36
+msgid "glared at"
+msgstr "zabodával/a pohledem "
diff --git a/morepokes/lang/cs/strings.php b/morepokes/lang/cs/strings.php
new file mode 100644
index 00000000..86114ca6
--- /dev/null
+++ b/morepokes/lang/cs/strings.php
@@ -0,0 +1,44 @@
+<?php
+
+if(! function_exists("string_plural_select_cs")) {
+function string_plural_select_cs($n){
+	$n = intval($n);
+	return ($n == 1 && $n % 1 == 0) ? 0 : ($n >= 2 && $n <= 4 && $n % 1 == 0) ? 1: ($n % 1 != 0 ) ? 2 : 3;;
+}}
+;
+$a->strings["bitchslap"] = "dát facku";
+$a->strings["bitchslapped"] = "dal/a facku";
+$a->strings["shag"] = "pomilovat";
+$a->strings["shagged"] = "pomiloval/a";
+$a->strings["do something obscenely biological to"] = "udělat příjemci něco obscéně biologického";
+$a->strings["did something obscenely biological to"] = "udělal/a něco obscéně biologického";
+$a->strings["point out the poke feature to"] = "upozornit na funkci šťouchnutí";
+$a->strings["pointed out the poke feature to"] = "upozornil/a na funkci šťouchnutí";
+$a->strings["declare undying love for"] = "vyjadřit nehynoucí lásku";
+$a->strings["declared undying love for"] = "vyjadřil/a nehynoucí lásku k uživateli";
+$a->strings["patent"] = "patentovat";
+$a->strings["patented"] = "patentoval/a uživatele";
+$a->strings["stroke beard"] = "pohladit plnovous";
+$a->strings["stroked their beard at"] = "pohladil/a plnovous";
+$a->strings["bemoan the declining standards of modern secondary and tertiary education to"] = "stěžovat si příjemci na klesající úroveň moderního sekundárního a terciárního vzdělávání";
+$a->strings["bemoans the declining standards of modern secondary and tertiary education to"] = "si stěžuje na klesající úroveň moderního sekundárního a terciárního vzdělávání";
+$a->strings["hug"] = "obejmout";
+$a->strings["hugged"] = "obejmul/a";
+$a->strings["kiss"] = "políbit";
+$a->strings["kissed"] = "políbil/a";
+$a->strings["raise eyebrows at"] = "zvednout obočí na";
+$a->strings["raised their eyebrows at"] = "zvedl/a obočí na";
+$a->strings["insult"] = "urazit";
+$a->strings["insulted"] = "urazil/a";
+$a->strings["praise"] = "pochválit";
+$a->strings["praised"] = "pochválil/a";
+$a->strings["be dubious of"] = "mít pochyby o";
+$a->strings["was dubious of"] = "měl/a pochyby o";
+$a->strings["eat"] = "sníst";
+$a->strings["ate"] = "snědl/a";
+$a->strings["giggle and fawn at"] = "hihňat se na";
+$a->strings["giggled and fawned at"] = "se hihňal/a na";
+$a->strings["doubt"] = "pochybovat";
+$a->strings["doubted"] = "zapochyboval/a o";
+$a->strings["glare"] = "zabodávát pohledem";
+$a->strings["glared at"] = "zabodával/a pohledem ";
diff --git a/morepokes/lang/de/messages.po b/morepokes/lang/de/messages.po
new file mode 100644
index 00000000..10f13537
--- /dev/null
+++ b/morepokes/lang/de/messages.po
@@ -0,0 +1,167 @@
+# ADDON morepokes
+# Copyright (C)
+# This file is distributed under the same license as the Friendica morepokes addon package.
+# 
+# 
+# Translators:
+# bavatar <tobias.diekershoff@gmx.net>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2014-10-14 07:57+0000\n"
+"Last-Translator: bavatar <tobias.diekershoff@gmx.net>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/friendica/language/de/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: morepokes.php:19
+msgid "bitchslap"
+msgstr "ohrfeigen"
+
+#: morepokes.php:19
+msgid "bitchslapped"
+msgstr "ohrfeigte"
+
+#: morepokes.php:20
+msgid "shag"
+msgstr "poppen"
+
+#: morepokes.php:20
+msgid "shagged"
+msgstr "poppte"
+
+#: morepokes.php:21
+msgid "do something obscenely biological to"
+msgstr "mit ihm/ihr etwas obszönes Körperliches machen"
+
+#: morepokes.php:21
+msgid "did something obscenely biological to"
+msgstr "machte etwas obszönes Körperliches mit"
+
+#: morepokes.php:22
+msgid "point out the poke feature to"
+msgstr "zeigte die neue Anstups-Funktion"
+
+#: morepokes.php:22
+msgid "pointed out the poke feature to"
+msgstr "zeigte die neue Anstups-Funktion"
+
+#: morepokes.php:23
+msgid "declare undying love for"
+msgstr "unterbliche Liebe verkünden"
+
+#: morepokes.php:23
+msgid "declared undying love for"
+msgstr "verkündete unsterbliche Liebe für"
+
+#: morepokes.php:24
+msgid "patent"
+msgstr "patentieren"
+
+#: morepokes.php:24
+msgid "patented"
+msgstr "patentierte"
+
+#: morepokes.php:25
+msgid "stroke beard"
+msgstr "sich den Bart kratzen"
+
+#: morepokes.php:25
+msgid "stroked their beard at"
+msgstr "kratzte sich den Bart in Richtung"
+
+#: morepokes.php:26
+msgid ""
+"bemoan the declining standards of modern secondary and tertiary education to"
+msgstr "sich über die sinkenden Standards der Schul- und Hochschulbildung beklagen"
+
+#: morepokes.php:26
+msgid ""
+"bemoans the declining standards of modern secondary and tertiary education "
+"to"
+msgstr "beklagte sich über die sinkenden Standards der Schul- und Hochschulbildung bei"
+
+#: morepokes.php:27
+msgid "hug"
+msgstr "umarmen"
+
+#: morepokes.php:27
+msgid "hugged"
+msgstr "umarmte"
+
+#: morepokes.php:28
+msgid "kiss"
+msgstr "küssen"
+
+#: morepokes.php:28
+msgid "kissed"
+msgstr "küsste"
+
+#: morepokes.php:29
+msgid "raise eyebrows at"
+msgstr "Augenbrauen hochziehen"
+
+#: morepokes.php:29
+msgid "raised their eyebrows at"
+msgstr "zog die Augenbrauen hoch in Richtung"
+
+#: morepokes.php:30
+msgid "insult"
+msgstr "beleidigen"
+
+#: morepokes.php:30
+msgid "insulted"
+msgstr "beleidigte"
+
+#: morepokes.php:31
+msgid "praise"
+msgstr "preisen"
+
+#: morepokes.php:31
+msgid "praised"
+msgstr "pries"
+
+#: morepokes.php:32
+msgid "be dubious of"
+msgstr "ungewiss sein"
+
+#: morepokes.php:32
+msgid "was dubious of"
+msgstr "war ungewiss über"
+
+#: morepokes.php:33
+msgid "eat"
+msgstr "essen"
+
+#: morepokes.php:33
+msgid "ate"
+msgstr "aß"
+
+#: morepokes.php:34
+msgid "giggle and fawn at"
+msgstr "kichern und einschleimen"
+
+#: morepokes.php:34
+msgid "giggled and fawned at"
+msgstr "kicherte und schleimte sich ein bei"
+
+#: morepokes.php:35
+msgid "doubt"
+msgstr "bezweifeln"
+
+#: morepokes.php:35
+msgid "doubted"
+msgstr "bezweifelte"
+
+#: morepokes.php:36
+msgid "glare"
+msgstr "zornig anstarren"
+
+#: morepokes.php:36
+msgid "glared at"
+msgstr "starrte zornig auf"
diff --git a/morepokes/lang/de/strings.php b/morepokes/lang/de/strings.php
new file mode 100644
index 00000000..1aa17032
--- /dev/null
+++ b/morepokes/lang/de/strings.php
@@ -0,0 +1,43 @@
+<?php
+
+if(! function_exists("string_plural_select_de")) {
+function string_plural_select_de($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["bitchslap"] = "ohrfeigen";
+$a->strings["bitchslapped"] = "ohrfeigte";
+$a->strings["shag"] = "poppen";
+$a->strings["shagged"] = "poppte";
+$a->strings["do something obscenely biological to"] = "mit ihm/ihr etwas obszönes Körperliches machen";
+$a->strings["did something obscenely biological to"] = "machte etwas obszönes Körperliches mit";
+$a->strings["point out the poke feature to"] = "zeigte die neue Anstups-Funktion";
+$a->strings["pointed out the poke feature to"] = "zeigte die neue Anstups-Funktion";
+$a->strings["declare undying love for"] = "unterbliche Liebe verkünden";
+$a->strings["declared undying love for"] = "verkündete unsterbliche Liebe für";
+$a->strings["patent"] = "patentieren";
+$a->strings["patented"] = "patentierte";
+$a->strings["stroke beard"] = "sich den Bart kratzen";
+$a->strings["stroked their beard at"] = "kratzte sich den Bart in Richtung";
+$a->strings["bemoan the declining standards of modern secondary and tertiary education to"] = "sich über die sinkenden Standards der Schul- und Hochschulbildung beklagen";
+$a->strings["bemoans the declining standards of modern secondary and tertiary education to"] = "beklagte sich über die sinkenden Standards der Schul- und Hochschulbildung bei";
+$a->strings["hug"] = "umarmen";
+$a->strings["hugged"] = "umarmte";
+$a->strings["kiss"] = "küssen";
+$a->strings["kissed"] = "küsste";
+$a->strings["raise eyebrows at"] = "Augenbrauen hochziehen";
+$a->strings["raised their eyebrows at"] = "zog die Augenbrauen hoch in Richtung";
+$a->strings["insult"] = "beleidigen";
+$a->strings["insulted"] = "beleidigte";
+$a->strings["praise"] = "preisen";
+$a->strings["praised"] = "pries";
+$a->strings["be dubious of"] = "ungewiss sein";
+$a->strings["was dubious of"] = "war ungewiss über";
+$a->strings["eat"] = "essen";
+$a->strings["ate"] = "aß";
+$a->strings["giggle and fawn at"] = "kichern und einschleimen";
+$a->strings["giggled and fawned at"] = "kicherte und schleimte sich ein bei";
+$a->strings["doubt"] = "bezweifeln";
+$a->strings["doubted"] = "bezweifelte";
+$a->strings["glare"] = "zornig anstarren";
+$a->strings["glared at"] = "starrte zornig auf";
diff --git a/morepokes/lang/eo/strings.php b/morepokes/lang/eo/strings.php
new file mode 100644
index 00000000..139fa59f
--- /dev/null
+++ b/morepokes/lang/eo/strings.php
@@ -0,0 +1,38 @@
+<?php
+
+$a->strings["bitchslap"] = "";
+$a->strings["bitchslapped"] = "";
+$a->strings["shag"] = "";
+$a->strings["shagged"] = "";
+$a->strings["do something obscenely biological to"] = "";
+$a->strings["did something obscenely biological to"] = "";
+$a->strings["point out the poke feature to"] = "";
+$a->strings["pointed out the poke feature to"] = "";
+$a->strings["declare undying love for"] = "";
+$a->strings["declared undying love for"] = "";
+$a->strings["patent"] = "";
+$a->strings["patented"] = "";
+$a->strings["stroke beard"] = "";
+$a->strings["stroked their beard at"] = "";
+$a->strings["bemoan the declining standards of modern secondary and tertiary education to"] = "";
+$a->strings["bemoans the declining standards of modern secondary and tertiary education to"] = "";
+$a->strings["hug"] = "";
+$a->strings["hugged"] = "";
+$a->strings["kiss"] = "";
+$a->strings["kissed"] = "";
+$a->strings["raise eyebrows at"] = "";
+$a->strings["raised their eyebrows at"] = "";
+$a->strings["insult"] = "";
+$a->strings["insulted"] = "";
+$a->strings["praise"] = "";
+$a->strings["praised"] = "";
+$a->strings["be dubious of"] = "";
+$a->strings["was dubious of"] = "";
+$a->strings["eat"] = "";
+$a->strings["ate"] = "";
+$a->strings["giggle and fawn at"] = "";
+$a->strings["giggled and fawned at"] = "";
+$a->strings["doubt"] = "";
+$a->strings["doubted"] = "";
+$a->strings["glare"] = "";
+$a->strings["glared at"] = "";
diff --git a/morepokes/lang/es/messages.po b/morepokes/lang/es/messages.po
new file mode 100644
index 00000000..c094b126
--- /dev/null
+++ b/morepokes/lang/es/messages.po
@@ -0,0 +1,167 @@
+# ADDON morepokes
+# Copyright (C)
+# This file is distributed under the same license as the Friendica morepokes addon package.
+# 
+# 
+# Translators:
+# Albert, 2016
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2016-11-17 20:38+0000\n"
+"Last-Translator: Albert\n"
+"Language-Team: Spanish (http://www.transifex.com/Friendica/friendica/language/es/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: morepokes.php:19
+msgid "bitchslap"
+msgstr "bofetada"
+
+#: morepokes.php:19
+msgid "bitchslapped"
+msgstr "abofeteó"
+
+#: morepokes.php:20
+msgid "shag"
+msgstr "atrapar"
+
+#: morepokes.php:20
+msgid "shagged"
+msgstr "atrapó"
+
+#: morepokes.php:21
+msgid "do something obscenely biological to"
+msgstr "hacer algo obscenamente biológico a"
+
+#: morepokes.php:21
+msgid "did something obscenely biological to"
+msgstr "hizo algo obscenamente biológico a"
+
+#: morepokes.php:22
+msgid "point out the poke feature to"
+msgstr "señalar la presentación de empuje a"
+
+#: morepokes.php:22
+msgid "pointed out the poke feature to"
+msgstr "señaló la presentación de empuje a"
+
+#: morepokes.php:23
+msgid "declare undying love for"
+msgstr "declarar amor eterno a"
+
+#: morepokes.php:23
+msgid "declared undying love for"
+msgstr "declaró amor eterno a"
+
+#: morepokes.php:24
+msgid "patent"
+msgstr "padres"
+
+#: morepokes.php:24
+msgid "patented"
+msgstr "emparentado"
+
+#: morepokes.php:25
+msgid "stroke beard"
+msgstr "acariciar barba"
+
+#: morepokes.php:25
+msgid "stroked their beard at"
+msgstr "acarició la barba a"
+
+#: morepokes.php:26
+msgid ""
+"bemoan the declining standards of modern secondary and tertiary education to"
+msgstr "lamentar los estándares en declive de la educación secundaria y terciaria modernas a"
+
+#: morepokes.php:26
+msgid ""
+"bemoans the declining standards of modern secondary and tertiary education "
+"to"
+msgstr "lamenta los estándares en declive de la educación secundaria y terciaria modernas a"
+
+#: morepokes.php:27
+msgid "hug"
+msgstr "abrazar"
+
+#: morepokes.php:27
+msgid "hugged"
+msgstr "abrazó"
+
+#: morepokes.php:28
+msgid "kiss"
+msgstr "beso"
+
+#: morepokes.php:28
+msgid "kissed"
+msgstr "besó"
+
+#: morepokes.php:29
+msgid "raise eyebrows at"
+msgstr "levantar cejas a"
+
+#: morepokes.php:29
+msgid "raised their eyebrows at"
+msgstr "le levantó las cejas a"
+
+#: morepokes.php:30
+msgid "insult"
+msgstr "insultar"
+
+#: morepokes.php:30
+msgid "insulted"
+msgstr "insultado"
+
+#: morepokes.php:31
+msgid "praise"
+msgstr "elogiar"
+
+#: morepokes.php:31
+msgid "praised"
+msgstr "elogiado"
+
+#: morepokes.php:32
+msgid "be dubious of"
+msgstr "dudar de"
+
+#: morepokes.php:32
+msgid "was dubious of"
+msgstr "dudó de"
+
+#: morepokes.php:33
+msgid "eat"
+msgstr "comer"
+
+#: morepokes.php:33
+msgid "ate"
+msgstr "comido"
+
+#: morepokes.php:34
+msgid "giggle and fawn at"
+msgstr "risita y adular a"
+
+#: morepokes.php:34
+msgid "giggled and fawned at"
+msgstr "rió y aduló a"
+
+#: morepokes.php:35
+msgid "doubt"
+msgstr "dudar"
+
+#: morepokes.php:35
+msgid "doubted"
+msgstr "dudó"
+
+#: morepokes.php:36
+msgid "glare"
+msgstr "mirar con furia"
+
+#: morepokes.php:36
+msgid "glared at"
+msgstr "miró con furia a"
diff --git a/morepokes/lang/es/strings.php b/morepokes/lang/es/strings.php
new file mode 100644
index 00000000..345427f6
--- /dev/null
+++ b/morepokes/lang/es/strings.php
@@ -0,0 +1,43 @@
+<?php
+
+if(! function_exists("string_plural_select_es")) {
+function string_plural_select_es($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["bitchslap"] = "bofetada";
+$a->strings["bitchslapped"] = "abofeteó";
+$a->strings["shag"] = "atrapar";
+$a->strings["shagged"] = "atrapó";
+$a->strings["do something obscenely biological to"] = "hacer algo obscenamente biológico a";
+$a->strings["did something obscenely biological to"] = "hizo algo obscenamente biológico a";
+$a->strings["point out the poke feature to"] = "señalar la presentación de empuje a";
+$a->strings["pointed out the poke feature to"] = "señaló la presentación de empuje a";
+$a->strings["declare undying love for"] = "declarar amor eterno a";
+$a->strings["declared undying love for"] = "declaró amor eterno a";
+$a->strings["patent"] = "padres";
+$a->strings["patented"] = "emparentado";
+$a->strings["stroke beard"] = "acariciar barba";
+$a->strings["stroked their beard at"] = "acarició la barba a";
+$a->strings["bemoan the declining standards of modern secondary and tertiary education to"] = "lamentar los estándares en declive de la educación secundaria y terciaria modernas a";
+$a->strings["bemoans the declining standards of modern secondary and tertiary education to"] = "lamenta los estándares en declive de la educación secundaria y terciaria modernas a";
+$a->strings["hug"] = "abrazar";
+$a->strings["hugged"] = "abrazó";
+$a->strings["kiss"] = "beso";
+$a->strings["kissed"] = "besó";
+$a->strings["raise eyebrows at"] = "levantar cejas a";
+$a->strings["raised their eyebrows at"] = "le levantó las cejas a";
+$a->strings["insult"] = "insultar";
+$a->strings["insulted"] = "insultado";
+$a->strings["praise"] = "elogiar";
+$a->strings["praised"] = "elogiado";
+$a->strings["be dubious of"] = "dudar de";
+$a->strings["was dubious of"] = "dudó de";
+$a->strings["eat"] = "comer";
+$a->strings["ate"] = "comido";
+$a->strings["giggle and fawn at"] = "risita y adular a";
+$a->strings["giggled and fawned at"] = "rió y aduló a";
+$a->strings["doubt"] = "dudar";
+$a->strings["doubted"] = "dudó";
+$a->strings["glare"] = "mirar con furia";
+$a->strings["glared at"] = "miró con furia a";
diff --git a/morepokes/lang/fi-fi/messages.po b/morepokes/lang/fi-fi/messages.po
new file mode 100644
index 00000000..84092892
--- /dev/null
+++ b/morepokes/lang/fi-fi/messages.po
@@ -0,0 +1,167 @@
+# ADDON morepokes
+# Copyright (C)
+# This file is distributed under the same license as the Friendica morepokes addon package.
+# 
+# 
+# Translators:
+# Kris, 2018
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2018-04-17 22:25+0000\n"
+"Last-Translator: Kris\n"
+"Language-Team: Finnish (Finland) (http://www.transifex.com/Friendica/friendica/language/fi_FI/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fi_FI\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: morepokes.php:19
+msgid "bitchslap"
+msgstr ""
+
+#: morepokes.php:19
+msgid "bitchslapped"
+msgstr ""
+
+#: morepokes.php:20
+msgid "shag"
+msgstr "pane"
+
+#: morepokes.php:20
+msgid "shagged"
+msgstr "pani"
+
+#: morepokes.php:21
+msgid "do something obscenely biological to"
+msgstr ""
+
+#: morepokes.php:21
+msgid "did something obscenely biological to"
+msgstr ""
+
+#: morepokes.php:22
+msgid "point out the poke feature to"
+msgstr ""
+
+#: morepokes.php:22
+msgid "pointed out the poke feature to"
+msgstr ""
+
+#: morepokes.php:23
+msgid "declare undying love for"
+msgstr ""
+
+#: morepokes.php:23
+msgid "declared undying love for"
+msgstr ""
+
+#: morepokes.php:24
+msgid "patent"
+msgstr "patentoi"
+
+#: morepokes.php:24
+msgid "patented"
+msgstr "patentoi"
+
+#: morepokes.php:25
+msgid "stroke beard"
+msgstr "silitä partaa"
+
+#: morepokes.php:25
+msgid "stroked their beard at"
+msgstr "silitti partaa"
+
+#: morepokes.php:26
+msgid ""
+"bemoan the declining standards of modern secondary and tertiary education to"
+msgstr ""
+
+#: morepokes.php:26
+msgid ""
+"bemoans the declining standards of modern secondary and tertiary education "
+"to"
+msgstr ""
+
+#: morepokes.php:27
+msgid "hug"
+msgstr "halaa"
+
+#: morepokes.php:27
+msgid "hugged"
+msgstr "halasi"
+
+#: morepokes.php:28
+msgid "kiss"
+msgstr "suutele"
+
+#: morepokes.php:28
+msgid "kissed"
+msgstr "pussasi"
+
+#: morepokes.php:29
+msgid "raise eyebrows at"
+msgstr ""
+
+#: morepokes.php:29
+msgid "raised their eyebrows at"
+msgstr ""
+
+#: morepokes.php:30
+msgid "insult"
+msgstr "loukkaa"
+
+#: morepokes.php:30
+msgid "insulted"
+msgstr "loukkasi"
+
+#: morepokes.php:31
+msgid "praise"
+msgstr "kehu"
+
+#: morepokes.php:31
+msgid "praised"
+msgstr "kehui"
+
+#: morepokes.php:32
+msgid "be dubious of"
+msgstr "epäile"
+
+#: morepokes.php:32
+msgid "was dubious of"
+msgstr "epäili"
+
+#: morepokes.php:33
+msgid "eat"
+msgstr "syö"
+
+#: morepokes.php:33
+msgid "ate"
+msgstr "söi"
+
+#: morepokes.php:34
+msgid "giggle and fawn at"
+msgstr ""
+
+#: morepokes.php:34
+msgid "giggled and fawned at"
+msgstr ""
+
+#: morepokes.php:35
+msgid "doubt"
+msgstr "epäile"
+
+#: morepokes.php:35
+msgid "doubted"
+msgstr "epäili"
+
+#: morepokes.php:36
+msgid "glare"
+msgstr "mulkoile"
+
+#: morepokes.php:36
+msgid "glared at"
+msgstr "mulkoili"
diff --git a/morepokes/lang/fi-fi/strings.php b/morepokes/lang/fi-fi/strings.php
new file mode 100644
index 00000000..8ba1a443
--- /dev/null
+++ b/morepokes/lang/fi-fi/strings.php
@@ -0,0 +1,43 @@
+<?php
+
+if(! function_exists("string_plural_select_fi_fi")) {
+function string_plural_select_fi_fi($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["bitchslap"] = "";
+$a->strings["bitchslapped"] = "";
+$a->strings["shag"] = "pane";
+$a->strings["shagged"] = "pani";
+$a->strings["do something obscenely biological to"] = "";
+$a->strings["did something obscenely biological to"] = "";
+$a->strings["point out the poke feature to"] = "";
+$a->strings["pointed out the poke feature to"] = "";
+$a->strings["declare undying love for"] = "";
+$a->strings["declared undying love for"] = "";
+$a->strings["patent"] = "patentoi";
+$a->strings["patented"] = "patentoi";
+$a->strings["stroke beard"] = "silitä partaa";
+$a->strings["stroked their beard at"] = "silitti partaa";
+$a->strings["bemoan the declining standards of modern secondary and tertiary education to"] = "";
+$a->strings["bemoans the declining standards of modern secondary and tertiary education to"] = "";
+$a->strings["hug"] = "halaa";
+$a->strings["hugged"] = "halasi";
+$a->strings["kiss"] = "suutele";
+$a->strings["kissed"] = "pussasi";
+$a->strings["raise eyebrows at"] = "";
+$a->strings["raised their eyebrows at"] = "";
+$a->strings["insult"] = "loukkaa";
+$a->strings["insulted"] = "loukkasi";
+$a->strings["praise"] = "kehu";
+$a->strings["praised"] = "kehui";
+$a->strings["be dubious of"] = "epäile";
+$a->strings["was dubious of"] = "epäili";
+$a->strings["eat"] = "syö";
+$a->strings["ate"] = "söi";
+$a->strings["giggle and fawn at"] = "";
+$a->strings["giggled and fawned at"] = "";
+$a->strings["doubt"] = "epäile";
+$a->strings["doubted"] = "epäili";
+$a->strings["glare"] = "mulkoile";
+$a->strings["glared at"] = "mulkoili";
diff --git a/morepokes/lang/fr/strings.php b/morepokes/lang/fr/strings.php
new file mode 100644
index 00000000..30161647
--- /dev/null
+++ b/morepokes/lang/fr/strings.php
@@ -0,0 +1,38 @@
+<?php
+
+$a->strings["bitchslap"] = "faire un coup de pute";
+$a->strings["bitchslapped"] = "a fait un coup de pute à";
+$a->strings["shag"] = "niquer";
+$a->strings["shagged"] = "a niqué";
+$a->strings["do something obscenely biological to"] = "";
+$a->strings["did something obscenely biological to"] = "";
+$a->strings["point out the poke feature to"] = "indiquer les sollicitations";
+$a->strings["pointed out the poke feature to"] = "a indiqué les sollicitations à";
+$a->strings["declare undying love for"] = "déclarer sa flamme";
+$a->strings["declared undying love for"] = "a déclaré sa flamme à";
+$a->strings["patent"] = "faire breveter";
+$a->strings["patented"] = "a fait breveter";
+$a->strings["stroke beard"] = "frotter sa barbe";
+$a->strings["stroked their beard at"] = "a frotté sa barbe sur";
+$a->strings["bemoan the declining standards of modern secondary and tertiary education to"] = "se lamenter sur les valeurs qui se perdent";
+$a->strings["bemoans the declining standards of modern secondary and tertiary education to"] = "s'est lamenté du lent déclin des valeurs auprès de";
+$a->strings["hug"] = "faire un calin";
+$a->strings["hugged"] = "a fait un câlin à";
+$a->strings["kiss"] = "embrasser";
+$a->strings["kissed"] = "a embrassé";
+$a->strings["raise eyebrows at"] = "hausser le sourcil";
+$a->strings["raised their eyebrows at"] = "a haussé le sourcil à ";
+$a->strings["insult"] = "insulter";
+$a->strings["insulted"] = "a insulté";
+$a->strings["praise"] = "louer";
+$a->strings["praised"] = "a loué";
+$a->strings["be dubious of"] = "trouver douteux";
+$a->strings["was dubious of"] = "a trouvé douteux ";
+$a->strings["eat"] = "manger";
+$a->strings["ate"] = "a mangé ";
+$a->strings["giggle and fawn at"] = "se payer la tête";
+$a->strings["giggled and fawned at"] = "s'est payé la tête de";
+$a->strings["doubt"] = "mettre en doute";
+$a->strings["doubted"] = "a mis en doute ";
+$a->strings["glare"] = "fixer";
+$a->strings["glared at"] = "a fixé";
diff --git a/morepokes/lang/is/strings.php b/morepokes/lang/is/strings.php
new file mode 100644
index 00000000..139fa59f
--- /dev/null
+++ b/morepokes/lang/is/strings.php
@@ -0,0 +1,38 @@
+<?php
+
+$a->strings["bitchslap"] = "";
+$a->strings["bitchslapped"] = "";
+$a->strings["shag"] = "";
+$a->strings["shagged"] = "";
+$a->strings["do something obscenely biological to"] = "";
+$a->strings["did something obscenely biological to"] = "";
+$a->strings["point out the poke feature to"] = "";
+$a->strings["pointed out the poke feature to"] = "";
+$a->strings["declare undying love for"] = "";
+$a->strings["declared undying love for"] = "";
+$a->strings["patent"] = "";
+$a->strings["patented"] = "";
+$a->strings["stroke beard"] = "";
+$a->strings["stroked their beard at"] = "";
+$a->strings["bemoan the declining standards of modern secondary and tertiary education to"] = "";
+$a->strings["bemoans the declining standards of modern secondary and tertiary education to"] = "";
+$a->strings["hug"] = "";
+$a->strings["hugged"] = "";
+$a->strings["kiss"] = "";
+$a->strings["kissed"] = "";
+$a->strings["raise eyebrows at"] = "";
+$a->strings["raised their eyebrows at"] = "";
+$a->strings["insult"] = "";
+$a->strings["insulted"] = "";
+$a->strings["praise"] = "";
+$a->strings["praised"] = "";
+$a->strings["be dubious of"] = "";
+$a->strings["was dubious of"] = "";
+$a->strings["eat"] = "";
+$a->strings["ate"] = "";
+$a->strings["giggle and fawn at"] = "";
+$a->strings["giggled and fawned at"] = "";
+$a->strings["doubt"] = "";
+$a->strings["doubted"] = "";
+$a->strings["glare"] = "";
+$a->strings["glared at"] = "";
diff --git a/morepokes/lang/it/messages.po b/morepokes/lang/it/messages.po
new file mode 100644
index 00000000..feb64b4a
--- /dev/null
+++ b/morepokes/lang/it/messages.po
@@ -0,0 +1,167 @@
+# ADDON morepokes
+# Copyright (C)
+# This file is distributed under the same license as the Friendica morepokes addon package.
+# 
+# 
+# Translators:
+# fabrixxm <fabrix.xm@gmail.com>, 2014-2015
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2017-09-20 06:08+0000\n"
+"Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n"
+"Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: it\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: morepokes.php:19
+msgid "bitchslap"
+msgstr "schiaffeggia"
+
+#: morepokes.php:19
+msgid "bitchslapped"
+msgstr "ha schiaffeggiato"
+
+#: morepokes.php:20
+msgid "shag"
+msgstr "scopa"
+
+#: morepokes.php:20
+msgid "shagged"
+msgstr "ha scopato"
+
+#: morepokes.php:21
+msgid "do something obscenely biological to"
+msgstr "fa qualcosa di biologicamente osceno a"
+
+#: morepokes.php:21
+msgid "did something obscenely biological to"
+msgstr "ha fatto qualcosa di biologicamente osceno a"
+
+#: morepokes.php:22
+msgid "point out the poke feature to"
+msgstr "fa vedere la funzione \"stuzzica\" a"
+
+#: morepokes.php:22
+msgid "pointed out the poke feature to"
+msgstr "ha fatto vedere la funzione \"stuzzica\" a"
+
+#: morepokes.php:23
+msgid "declare undying love for"
+msgstr "dichiara eterno amore per"
+
+#: morepokes.php:23
+msgid "declared undying love for"
+msgstr "ha dichiarato eterno amore per"
+
+#: morepokes.php:24
+msgid "patent"
+msgstr "brevetta"
+
+#: morepokes.php:24
+msgid "patented"
+msgstr "ha brevettato"
+
+#: morepokes.php:25
+msgid "stroke beard"
+msgstr "tirare la barba"
+
+#: morepokes.php:25
+msgid "stroked their beard at"
+msgstr "ha tirato la barba di"
+
+#: morepokes.php:26
+msgid ""
+"bemoan the declining standards of modern secondary and tertiary education to"
+msgstr "lamentati del declino degli standard della moderna istruzione secondaria e terziaria con"
+
+#: morepokes.php:26
+msgid ""
+"bemoans the declining standards of modern secondary and tertiary education "
+"to"
+msgstr "si è lamentato del declino degli standard della moderna istruzione secondaria e terziaria con"
+
+#: morepokes.php:27
+msgid "hug"
+msgstr "abbraccia"
+
+#: morepokes.php:27
+msgid "hugged"
+msgstr "ha abbracciato"
+
+#: morepokes.php:28
+msgid "kiss"
+msgstr "bacia"
+
+#: morepokes.php:28
+msgid "kissed"
+msgstr "ha baciato"
+
+#: morepokes.php:29
+msgid "raise eyebrows at"
+msgstr "solleva un sopracciglio verso"
+
+#: morepokes.php:29
+msgid "raised their eyebrows at"
+msgstr "ha sollevato un sopracciglio verso"
+
+#: morepokes.php:30
+msgid "insult"
+msgstr "insulta"
+
+#: morepokes.php:30
+msgid "insulted"
+msgstr "ha insultato"
+
+#: morepokes.php:31
+msgid "praise"
+msgstr "prega"
+
+#: morepokes.php:31
+msgid "praised"
+msgstr "ha pregato"
+
+#: morepokes.php:32
+msgid "be dubious of"
+msgstr "dubita di"
+
+#: morepokes.php:32
+msgid "was dubious of"
+msgstr "ha dubitato di"
+
+#: morepokes.php:33
+msgid "eat"
+msgstr "mangia"
+
+#: morepokes.php:33
+msgid "ate"
+msgstr "ha mangiato"
+
+#: morepokes.php:34
+msgid "giggle and fawn at"
+msgstr "sorridi e adula"
+
+#: morepokes.php:34
+msgid "giggled and fawned at"
+msgstr "ha sorriso e adulato"
+
+#: morepokes.php:35
+msgid "doubt"
+msgstr "dubita"
+
+#: morepokes.php:35
+msgid "doubted"
+msgstr "dubitato"
+
+#: morepokes.php:36
+msgid "glare"
+msgstr "guarda con aria feroce"
+
+#: morepokes.php:36
+msgid "glared at"
+msgstr "ha guardato con aria feroce"
diff --git a/morepokes/lang/it/strings.php b/morepokes/lang/it/strings.php
new file mode 100644
index 00000000..0ba63a0a
--- /dev/null
+++ b/morepokes/lang/it/strings.php
@@ -0,0 +1,43 @@
+<?php
+
+if(! function_exists("string_plural_select_it")) {
+function string_plural_select_it($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["bitchslap"] = "schiaffeggia";
+$a->strings["bitchslapped"] = "ha schiaffeggiato";
+$a->strings["shag"] = "scopa";
+$a->strings["shagged"] = "ha scopato";
+$a->strings["do something obscenely biological to"] = "fa qualcosa di biologicamente osceno a";
+$a->strings["did something obscenely biological to"] = "ha fatto qualcosa di biologicamente osceno a";
+$a->strings["point out the poke feature to"] = "fa vedere la funzione \"stuzzica\" a";
+$a->strings["pointed out the poke feature to"] = "ha fatto vedere la funzione \"stuzzica\" a";
+$a->strings["declare undying love for"] = "dichiara eterno amore per";
+$a->strings["declared undying love for"] = "ha dichiarato eterno amore per";
+$a->strings["patent"] = "brevetta";
+$a->strings["patented"] = "ha brevettato";
+$a->strings["stroke beard"] = "tirare la barba";
+$a->strings["stroked their beard at"] = "ha tirato la barba di";
+$a->strings["bemoan the declining standards of modern secondary and tertiary education to"] = "lamentati del declino degli standard della moderna istruzione secondaria e terziaria con";
+$a->strings["bemoans the declining standards of modern secondary and tertiary education to"] = "si è lamentato del declino degli standard della moderna istruzione secondaria e terziaria con";
+$a->strings["hug"] = "abbraccia";
+$a->strings["hugged"] = "ha abbracciato";
+$a->strings["kiss"] = "bacia";
+$a->strings["kissed"] = "ha baciato";
+$a->strings["raise eyebrows at"] = "solleva un sopracciglio verso";
+$a->strings["raised their eyebrows at"] = "ha sollevato un sopracciglio verso";
+$a->strings["insult"] = "insulta";
+$a->strings["insulted"] = "ha insultato";
+$a->strings["praise"] = "prega";
+$a->strings["praised"] = "ha pregato";
+$a->strings["be dubious of"] = "dubita di";
+$a->strings["was dubious of"] = "ha dubitato di";
+$a->strings["eat"] = "mangia";
+$a->strings["ate"] = "ha mangiato";
+$a->strings["giggle and fawn at"] = "sorridi e adula";
+$a->strings["giggled and fawned at"] = "ha sorriso e adulato";
+$a->strings["doubt"] = "dubita";
+$a->strings["doubted"] = "dubitato";
+$a->strings["glare"] = "guarda con aria feroce";
+$a->strings["glared at"] = "ha guardato con aria feroce";
diff --git a/morepokes/lang/nb-no/strings.php b/morepokes/lang/nb-no/strings.php
new file mode 100644
index 00000000..139fa59f
--- /dev/null
+++ b/morepokes/lang/nb-no/strings.php
@@ -0,0 +1,38 @@
+<?php
+
+$a->strings["bitchslap"] = "";
+$a->strings["bitchslapped"] = "";
+$a->strings["shag"] = "";
+$a->strings["shagged"] = "";
+$a->strings["do something obscenely biological to"] = "";
+$a->strings["did something obscenely biological to"] = "";
+$a->strings["point out the poke feature to"] = "";
+$a->strings["pointed out the poke feature to"] = "";
+$a->strings["declare undying love for"] = "";
+$a->strings["declared undying love for"] = "";
+$a->strings["patent"] = "";
+$a->strings["patented"] = "";
+$a->strings["stroke beard"] = "";
+$a->strings["stroked their beard at"] = "";
+$a->strings["bemoan the declining standards of modern secondary and tertiary education to"] = "";
+$a->strings["bemoans the declining standards of modern secondary and tertiary education to"] = "";
+$a->strings["hug"] = "";
+$a->strings["hugged"] = "";
+$a->strings["kiss"] = "";
+$a->strings["kissed"] = "";
+$a->strings["raise eyebrows at"] = "";
+$a->strings["raised their eyebrows at"] = "";
+$a->strings["insult"] = "";
+$a->strings["insulted"] = "";
+$a->strings["praise"] = "";
+$a->strings["praised"] = "";
+$a->strings["be dubious of"] = "";
+$a->strings["was dubious of"] = "";
+$a->strings["eat"] = "";
+$a->strings["ate"] = "";
+$a->strings["giggle and fawn at"] = "";
+$a->strings["giggled and fawned at"] = "";
+$a->strings["doubt"] = "";
+$a->strings["doubted"] = "";
+$a->strings["glare"] = "";
+$a->strings["glared at"] = "";
diff --git a/morepokes/lang/nl/messages.po b/morepokes/lang/nl/messages.po
new file mode 100644
index 00000000..f1a9d546
--- /dev/null
+++ b/morepokes/lang/nl/messages.po
@@ -0,0 +1,167 @@
+# ADDON morepokes
+# Copyright (C)
+# This file is distributed under the same license as the Friendica morepokes addon package.
+# 
+# 
+# Translators:
+# Jeroen De Meerleer <me@jeroened.be>, 2018
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2018-08-23 12:16+0000\n"
+"Last-Translator: Jeroen De Meerleer <me@jeroened.be>\n"
+"Language-Team: Dutch (http://www.transifex.com/Friendica/friendica/language/nl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: morepokes.php:19
+msgid "bitchslap"
+msgstr "Kaakslag"
+
+#: morepokes.php:19
+msgid "bitchslapped"
+msgstr "Sloeg op de kaak"
+
+#: morepokes.php:20
+msgid "shag"
+msgstr "Liefde bedrijven"
+
+#: morepokes.php:20
+msgid "shagged"
+msgstr "De liefde bedreven"
+
+#: morepokes.php:21
+msgid "do something obscenely biological to"
+msgstr "Doe iets biologisch obsceen"
+
+#: morepokes.php:21
+msgid "did something obscenely biological to"
+msgstr "Heeft iets biologisch obsceen gedaan"
+
+#: morepokes.php:22
+msgid "point out the poke feature to"
+msgstr "De functie porren uitleggen"
+
+#: morepokes.php:22
+msgid "pointed out the poke feature to"
+msgstr "Legde de functie porren uit aan"
+
+#: morepokes.php:23
+msgid "declare undying love for"
+msgstr "Eeuwige liefde verklaren"
+
+#: morepokes.php:23
+msgid "declared undying love for"
+msgstr "Verklaarde eeuwige liefde"
+
+#: morepokes.php:24
+msgid "patent"
+msgstr "Patenteren"
+
+#: morepokes.php:24
+msgid "patented"
+msgstr "Patenteerde"
+
+#: morepokes.php:25
+msgid "stroke beard"
+msgstr "Baard strijken"
+
+#: morepokes.php:25
+msgid "stroked their beard at"
+msgstr "Streek zijn baard naar"
+
+#: morepokes.php:26
+msgid ""
+"bemoan the declining standards of modern secondary and tertiary education to"
+msgstr "De dalende normen van het moderne secundaire en tertiaire onderwijs betreuren aan"
+
+#: morepokes.php:26
+msgid ""
+"bemoans the declining standards of modern secondary and tertiary education "
+"to"
+msgstr "betreurt de dalende normen van het moderne secundaire en tertiaire onderwijs aan"
+
+#: morepokes.php:27
+msgid "hug"
+msgstr "knuffel"
+
+#: morepokes.php:27
+msgid "hugged"
+msgstr "knuffelde"
+
+#: morepokes.php:28
+msgid "kiss"
+msgstr "kus"
+
+#: morepokes.php:28
+msgid "kissed"
+msgstr "kuste"
+
+#: morepokes.php:29
+msgid "raise eyebrows at"
+msgstr "Fronsen"
+
+#: morepokes.php:29
+msgid "raised their eyebrows at"
+msgstr "Fronsde naar"
+
+#: morepokes.php:30
+msgid "insult"
+msgstr "Beledigen"
+
+#: morepokes.php:30
+msgid "insulted"
+msgstr "Beledigde"
+
+#: morepokes.php:31
+msgid "praise"
+msgstr "Loven"
+
+#: morepokes.php:31
+msgid "praised"
+msgstr "Loofde"
+
+#: morepokes.php:32
+msgid "be dubious of"
+msgstr "Verdachten"
+
+#: morepokes.php:32
+msgid "was dubious of"
+msgstr "Verdachtte"
+
+#: morepokes.php:33
+msgid "eat"
+msgstr "Opeten"
+
+#: morepokes.php:33
+msgid "ate"
+msgstr "Eete op"
+
+#: morepokes.php:34
+msgid "giggle and fawn at"
+msgstr "Giechelen"
+
+#: morepokes.php:34
+msgid "giggled and fawned at"
+msgstr "Giechelde naar"
+
+#: morepokes.php:35
+msgid "doubt"
+msgstr "Twijfelen"
+
+#: morepokes.php:35
+msgid "doubted"
+msgstr "Twijfelde over"
+
+#: morepokes.php:36
+msgid "glare"
+msgstr "Schitteren"
+
+#: morepokes.php:36
+msgid "glared at"
+msgstr "Schitterde naar"
diff --git a/morepokes/lang/nl/strings.php b/morepokes/lang/nl/strings.php
new file mode 100644
index 00000000..55c582cb
--- /dev/null
+++ b/morepokes/lang/nl/strings.php
@@ -0,0 +1,44 @@
+<?php
+
+if(! function_exists("string_plural_select_nl")) {
+function string_plural_select_nl($n){
+	$n = intval($n);
+	return ($n != 1);;
+}}
+;
+$a->strings["bitchslap"] = "Kaakslag";
+$a->strings["bitchslapped"] = "Sloeg op de kaak";
+$a->strings["shag"] = "Liefde bedrijven";
+$a->strings["shagged"] = "De liefde bedreven";
+$a->strings["do something obscenely biological to"] = "Doe iets biologisch obsceen";
+$a->strings["did something obscenely biological to"] = "Heeft iets biologisch obsceen gedaan";
+$a->strings["point out the poke feature to"] = "De functie porren uitleggen";
+$a->strings["pointed out the poke feature to"] = "Legde de functie porren uit aan";
+$a->strings["declare undying love for"] = "Eeuwige liefde verklaren";
+$a->strings["declared undying love for"] = "Verklaarde eeuwige liefde";
+$a->strings["patent"] = "Patenteren";
+$a->strings["patented"] = "Patenteerde";
+$a->strings["stroke beard"] = "Baard strijken";
+$a->strings["stroked their beard at"] = "Streek zijn baard naar";
+$a->strings["bemoan the declining standards of modern secondary and tertiary education to"] = "De dalende normen van het moderne secundaire en tertiaire onderwijs betreuren aan";
+$a->strings["bemoans the declining standards of modern secondary and tertiary education to"] = "betreurt de dalende normen van het moderne secundaire en tertiaire onderwijs aan";
+$a->strings["hug"] = "knuffel";
+$a->strings["hugged"] = "knuffelde";
+$a->strings["kiss"] = "kus";
+$a->strings["kissed"] = "kuste";
+$a->strings["raise eyebrows at"] = "Fronsen";
+$a->strings["raised their eyebrows at"] = "Fronsde naar";
+$a->strings["insult"] = "Beledigen";
+$a->strings["insulted"] = "Beledigde";
+$a->strings["praise"] = "Loven";
+$a->strings["praised"] = "Loofde";
+$a->strings["be dubious of"] = "Verdachten";
+$a->strings["was dubious of"] = "Verdachtte";
+$a->strings["eat"] = "Opeten";
+$a->strings["ate"] = "Eete op";
+$a->strings["giggle and fawn at"] = "Giechelen";
+$a->strings["giggled and fawned at"] = "Giechelde naar";
+$a->strings["doubt"] = "Twijfelen";
+$a->strings["doubted"] = "Twijfelde over";
+$a->strings["glare"] = "Schitteren";
+$a->strings["glared at"] = "Schitterde naar";
diff --git a/morepokes/lang/pl/messages.po b/morepokes/lang/pl/messages.po
new file mode 100644
index 00000000..f00a63e9
--- /dev/null
+++ b/morepokes/lang/pl/messages.po
@@ -0,0 +1,167 @@
+# ADDON morepokes
+# Copyright (C)
+# This file is distributed under the same license as the Friendica morepokes addon package.
+# 
+# 
+# Translators:
+# Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>, 2018
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2018-08-05 15:36+0000\n"
+"Last-Translator: Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>\n"
+"Language-Team: Polish (http://www.transifex.com/Friendica/friendica/language/pl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pl\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
+
+#: morepokes.php:19
+msgid "bitchslap"
+msgstr "spoliczkować"
+
+#: morepokes.php:19
+msgid "bitchslapped"
+msgstr "spoliczkowanie"
+
+#: morepokes.php:20
+msgid "shag"
+msgstr "wścieka się"
+
+#: morepokes.php:20
+msgid "shagged"
+msgstr "wściekły"
+
+#: morepokes.php:21
+msgid "do something obscenely biological to"
+msgstr "zrobić coś nieprzyzwoicie biologicznego"
+
+#: morepokes.php:21
+msgid "did something obscenely biological to"
+msgstr "zrobił coś nieprzyzwoicie biologicznego"
+
+#: morepokes.php:22
+msgid "point out the poke feature to"
+msgstr "wskaż funkcję szturchnąć"
+
+#: morepokes.php:22
+msgid "pointed out the poke feature to"
+msgstr "wskaż na funkcję zaczepić do"
+
+#: morepokes.php:23
+msgid "declare undying love for"
+msgstr "wyznaję dozgonną miłość do"
+
+#: morepokes.php:23
+msgid "declared undying love for"
+msgstr "deklaruję dozgonną miłość dla"
+
+#: morepokes.php:24
+msgid "patent"
+msgstr "patent"
+
+#: morepokes.php:24
+msgid "patented"
+msgstr "opatentowane"
+
+#: morepokes.php:25
+msgid "stroke beard"
+msgstr "pogłaskać brodę"
+
+#: morepokes.php:25
+msgid "stroked their beard at"
+msgstr "pogłaskał ich brody o"
+
+#: morepokes.php:26
+msgid ""
+"bemoan the declining standards of modern secondary and tertiary education to"
+msgstr "opłakują upadające standardy nowoczesnej szkoły średniej i wyższej"
+
+#: morepokes.php:26
+msgid ""
+"bemoans the declining standards of modern secondary and tertiary education "
+"to"
+msgstr "żałuje upadających standardów nowoczesnej edukacji na poziomie średnim i wyższym"
+
+#: morepokes.php:27
+msgid "hug"
+msgstr "objął"
+
+#: morepokes.php:27
+msgid "hugged"
+msgstr "objąć"
+
+#: morepokes.php:28
+msgid "kiss"
+msgstr "całus"
+
+#: morepokes.php:28
+msgid "kissed"
+msgstr "ucałować"
+
+#: morepokes.php:29
+msgid "raise eyebrows at"
+msgstr "podnieś brwi"
+
+#: morepokes.php:29
+msgid "raised their eyebrows at"
+msgstr "podnieśli brwi"
+
+#: morepokes.php:30
+msgid "insult"
+msgstr "obraza"
+
+#: morepokes.php:30
+msgid "insulted"
+msgstr "znieważony"
+
+#: morepokes.php:31
+msgid "praise"
+msgstr "pochwała"
+
+#: morepokes.php:31
+msgid "praised"
+msgstr "pochwalić"
+
+#: morepokes.php:32
+msgid "be dubious of"
+msgstr "jest wątpliwe"
+
+#: morepokes.php:32
+msgid "was dubious of"
+msgstr "było wątpliwe"
+
+#: morepokes.php:33
+msgid "eat"
+msgstr "jeść"
+
+#: morepokes.php:33
+msgid "ate"
+msgstr "jadł"
+
+#: morepokes.php:34
+msgid "giggle and fawn at"
+msgstr "chichotać i płakać"
+
+#: morepokes.php:34
+msgid "giggled and fawned at"
+msgstr "roześmiał się przymilająco"
+
+#: morepokes.php:35
+msgid "doubt"
+msgstr "wątpi"
+
+#: morepokes.php:35
+msgid "doubted"
+msgstr "powątpiewa"
+
+#: morepokes.php:36
+msgid "glare"
+msgstr "blask"
+
+#: morepokes.php:36
+msgid "glared at"
+msgstr "spojrzał na"
diff --git a/morepokes/lang/pl/strings.php b/morepokes/lang/pl/strings.php
new file mode 100644
index 00000000..0edb6560
--- /dev/null
+++ b/morepokes/lang/pl/strings.php
@@ -0,0 +1,44 @@
+<?php
+
+if(! function_exists("string_plural_select_pl")) {
+function string_plural_select_pl($n){
+	$n = intval($n);
+	return ($n==1 ? 0 : ($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14) ? 1 : $n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14) ? 2 : 3);;
+}}
+;
+$a->strings["bitchslap"] = "spoliczkować";
+$a->strings["bitchslapped"] = "spoliczkowanie";
+$a->strings["shag"] = "wścieka się";
+$a->strings["shagged"] = "wściekły";
+$a->strings["do something obscenely biological to"] = "zrobić coś nieprzyzwoicie biologicznego";
+$a->strings["did something obscenely biological to"] = "zrobił coś nieprzyzwoicie biologicznego";
+$a->strings["point out the poke feature to"] = "wskaż funkcję szturchnąć";
+$a->strings["pointed out the poke feature to"] = "wskaż na funkcję zaczepić do";
+$a->strings["declare undying love for"] = "wyznaję dozgonną miłość do";
+$a->strings["declared undying love for"] = "deklaruję dozgonną miłość dla";
+$a->strings["patent"] = "patent";
+$a->strings["patented"] = "opatentowane";
+$a->strings["stroke beard"] = "pogłaskać brodę";
+$a->strings["stroked their beard at"] = "pogłaskał ich brody o";
+$a->strings["bemoan the declining standards of modern secondary and tertiary education to"] = "opłakują upadające standardy nowoczesnej szkoły średniej i wyższej";
+$a->strings["bemoans the declining standards of modern secondary and tertiary education to"] = "żałuje upadających standardów nowoczesnej edukacji na poziomie średnim i wyższym";
+$a->strings["hug"] = "objął";
+$a->strings["hugged"] = "objąć";
+$a->strings["kiss"] = "całus";
+$a->strings["kissed"] = "ucałować";
+$a->strings["raise eyebrows at"] = "podnieś brwi";
+$a->strings["raised their eyebrows at"] = "podnieśli brwi";
+$a->strings["insult"] = "obraza";
+$a->strings["insulted"] = "znieważony";
+$a->strings["praise"] = "pochwała";
+$a->strings["praised"] = "pochwalić";
+$a->strings["be dubious of"] = "jest wątpliwe";
+$a->strings["was dubious of"] = "było wątpliwe";
+$a->strings["eat"] = "jeść";
+$a->strings["ate"] = "jadł";
+$a->strings["giggle and fawn at"] = "chichotać i płakać";
+$a->strings["giggled and fawned at"] = "roześmiał się przymilająco";
+$a->strings["doubt"] = "wątpi";
+$a->strings["doubted"] = "powątpiewa";
+$a->strings["glare"] = "blask";
+$a->strings["glared at"] = "spojrzał na";
diff --git a/morepokes/lang/pt-br/strings.php b/morepokes/lang/pt-br/strings.php
new file mode 100644
index 00000000..0e4f8407
--- /dev/null
+++ b/morepokes/lang/pt-br/strings.php
@@ -0,0 +1,38 @@
+<?php
+
+$a->strings["bitchslap"] = "";
+$a->strings["bitchslapped"] = "";
+$a->strings["shag"] = "";
+$a->strings["shagged"] = "";
+$a->strings["do something obscenely biological to"] = "";
+$a->strings["did something obscenely biological to"] = "";
+$a->strings["point out the poke feature to"] = "";
+$a->strings["pointed out the poke feature to"] = "";
+$a->strings["declare undying love for"] = "";
+$a->strings["declared undying love for"] = "";
+$a->strings["patent"] = "";
+$a->strings["patented"] = "";
+$a->strings["stroke beard"] = "";
+$a->strings["stroked their beard at"] = "";
+$a->strings["bemoan the declining standards of modern secondary and tertiary education to"] = "";
+$a->strings["bemoans the declining standards of modern secondary and tertiary education to"] = "";
+$a->strings["hug"] = "abraço";
+$a->strings["hugged"] = "";
+$a->strings["kiss"] = "beijo";
+$a->strings["kissed"] = "";
+$a->strings["raise eyebrows at"] = "";
+$a->strings["raised their eyebrows at"] = "";
+$a->strings["insult"] = "insultar";
+$a->strings["insulted"] = "";
+$a->strings["praise"] = "";
+$a->strings["praised"] = "";
+$a->strings["be dubious of"] = "";
+$a->strings["was dubious of"] = "";
+$a->strings["eat"] = "comer";
+$a->strings["ate"] = "";
+$a->strings["giggle and fawn at"] = "";
+$a->strings["giggled and fawned at"] = "";
+$a->strings["doubt"] = "";
+$a->strings["doubted"] = "";
+$a->strings["glare"] = "";
+$a->strings["glared at"] = "";
diff --git a/morepokes/lang/ro/messages.po b/morepokes/lang/ro/messages.po
new file mode 100644
index 00000000..50e9ad85
--- /dev/null
+++ b/morepokes/lang/ro/messages.po
@@ -0,0 +1,167 @@
+# ADDON morepokes
+# Copyright (C)
+# This file is distributed under the same license as the Friendica morepokes addon package.
+# 
+# 
+# Translators:
+# Arian - Cazare Muncitori <arianserv@gmail.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2014-08-15 08:16+0000\n"
+"Last-Translator: Arian - Cazare Muncitori <arianserv@gmail.com>\n"
+"Language-Team: Romanian (Romania) (http://www.transifex.com/projects/p/friendica/language/ro_RO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ro_RO\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
+
+#: morepokes.php:19
+msgid "bitchslap"
+msgstr "palmuire-javră"
+
+#: morepokes.php:19
+msgid "bitchslapped"
+msgstr "javră-pălmuită"
+
+#: morepokes.php:20
+msgid "shag"
+msgstr "pune-o"
+
+#: morepokes.php:20
+msgid "shagged"
+msgstr "a pus-o"
+
+#: morepokes.php:21
+msgid "do something obscenely biological to"
+msgstr "fă-i ceva biologic obscen lui"
+
+#: morepokes.php:21
+msgid "did something obscenely biological to"
+msgstr "i s-a făcut ceva biologic obscen lui"
+
+#: morepokes.php:22
+msgid "point out the poke feature to"
+msgstr "arată caracteristica de abordare lui"
+
+#: morepokes.php:22
+msgid "pointed out the poke feature to"
+msgstr "caracteristică de abordare arătată lui"
+
+#: morepokes.php:23
+msgid "declare undying love for"
+msgstr "declară dragoste veșnică pentru"
+
+#: morepokes.php:23
+msgid "declared undying love for"
+msgstr "dragoste veșnică declarată lui"
+
+#: morepokes.php:24
+msgid "patent"
+msgstr "brevet"
+
+#: morepokes.php:24
+msgid "patented"
+msgstr "brevetat"
+
+#: morepokes.php:25
+msgid "stroke beard"
+msgstr "lovire în barbă"
+
+#: morepokes.php:25
+msgid "stroked their beard at"
+msgstr "loviți în barbă la"
+
+#: morepokes.php:26
+msgid ""
+"bemoan the declining standards of modern secondary and tertiary education to"
+msgstr "deplângerea standardelor decăzute ale educației moderne secundare și terțiare pentru"
+
+#: morepokes.php:26
+msgid ""
+"bemoans the declining standards of modern secondary and tertiary education "
+"to"
+msgstr "deplânge standardele decăzute ale educației moderne secundare și terțiare pentru"
+
+#: morepokes.php:27
+msgid "hug"
+msgstr "îmbrățișare"
+
+#: morepokes.php:27
+msgid "hugged"
+msgstr "îmbrățișat(ă)"
+
+#: morepokes.php:28
+msgid "kiss"
+msgstr "sărut"
+
+#: morepokes.php:28
+msgid "kissed"
+msgstr "sărutat(ă)"
+
+#: morepokes.php:29
+msgid "raise eyebrows at"
+msgstr "ridică sprâncenele către"
+
+#: morepokes.php:29
+msgid "raised their eyebrows at"
+msgstr "a ridicat sprâncenele către"
+
+#: morepokes.php:30
+msgid "insult"
+msgstr "insultă"
+
+#: morepokes.php:30
+msgid "insulted"
+msgstr "insultat(ă)"
+
+#: morepokes.php:31
+msgid "praise"
+msgstr "laudă"
+
+#: morepokes.php:31
+msgid "praised"
+msgstr "lăudat(ă)"
+
+#: morepokes.php:32
+msgid "be dubious of"
+msgstr "arată-ți sceptitudinea față de"
+
+#: morepokes.php:32
+msgid "was dubious of"
+msgstr "a fost catalogat(ă) ca ciudat(ă) de către"
+
+#: morepokes.php:33
+msgid "eat"
+msgstr "devorează"
+
+#: morepokes.php:33
+msgid "ate"
+msgstr "devorat(ă)"
+
+#: morepokes.php:34
+msgid "giggle and fawn at"
+msgstr "chicotește și lingușește-l pe"
+
+#: morepokes.php:34
+msgid "giggled and fawned at"
+msgstr "a fost chicotit(ă) și lingușit(ă) de către"
+
+#: morepokes.php:35
+msgid "doubt"
+msgstr "îndoială"
+
+#: morepokes.php:35
+msgid "doubted"
+msgstr "nu a prezentat încredere"
+
+#: morepokes.php:36
+msgid "glare"
+msgstr "fixează cu privirea"
+
+#: morepokes.php:36
+msgid "glared at"
+msgstr "luat(ă) în colimator"
diff --git a/morepokes/lang/ro/strings.php b/morepokes/lang/ro/strings.php
new file mode 100644
index 00000000..3af70529
--- /dev/null
+++ b/morepokes/lang/ro/strings.php
@@ -0,0 +1,43 @@
+<?php
+
+if(! function_exists("string_plural_select_ro")) {
+function string_plural_select_ro($n){
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+}}
+;
+$a->strings["bitchslap"] = "palmuire-javră";
+$a->strings["bitchslapped"] = "javră-pălmuită";
+$a->strings["shag"] = "pune-o";
+$a->strings["shagged"] = "a pus-o";
+$a->strings["do something obscenely biological to"] = "fă-i ceva biologic obscen lui";
+$a->strings["did something obscenely biological to"] = "i s-a făcut ceva biologic obscen lui";
+$a->strings["point out the poke feature to"] = "arată caracteristica de abordare lui";
+$a->strings["pointed out the poke feature to"] = "caracteristică de abordare arătată lui";
+$a->strings["declare undying love for"] = "declară dragoste veșnică pentru";
+$a->strings["declared undying love for"] = "dragoste veșnică declarată lui";
+$a->strings["patent"] = "brevet";
+$a->strings["patented"] = "brevetat";
+$a->strings["stroke beard"] = "lovire în barbă";
+$a->strings["stroked their beard at"] = "loviți în barbă la";
+$a->strings["bemoan the declining standards of modern secondary and tertiary education to"] = "deplângerea standardelor decăzute ale educației moderne secundare și terțiare pentru";
+$a->strings["bemoans the declining standards of modern secondary and tertiary education to"] = "deplânge standardele decăzute ale educației moderne secundare și terțiare pentru";
+$a->strings["hug"] = "îmbrățișare";
+$a->strings["hugged"] = "îmbrățișat(ă)";
+$a->strings["kiss"] = "sărut";
+$a->strings["kissed"] = "sărutat(ă)";
+$a->strings["raise eyebrows at"] = "ridică sprâncenele către";
+$a->strings["raised their eyebrows at"] = "a ridicat sprâncenele către";
+$a->strings["insult"] = "insultă";
+$a->strings["insulted"] = "insultat(ă)";
+$a->strings["praise"] = "laudă";
+$a->strings["praised"] = "lăudat(ă)";
+$a->strings["be dubious of"] = "arată-ți sceptitudinea față de";
+$a->strings["was dubious of"] = "a fost catalogat(ă) ca ciudat(ă) de către";
+$a->strings["eat"] = "devorează";
+$a->strings["ate"] = "devorat(ă)";
+$a->strings["giggle and fawn at"] = "chicotește și lingușește-l pe";
+$a->strings["giggled and fawned at"] = "a fost chicotit(ă) și lingușit(ă) de către";
+$a->strings["doubt"] = "îndoială";
+$a->strings["doubted"] = "nu a prezentat încredere";
+$a->strings["glare"] = "fixează cu privirea";
+$a->strings["glared at"] = "luat(ă) în colimator";
diff --git a/morepokes/lang/ru/strings.php b/morepokes/lang/ru/strings.php
new file mode 100644
index 00000000..139fa59f
--- /dev/null
+++ b/morepokes/lang/ru/strings.php
@@ -0,0 +1,38 @@
+<?php
+
+$a->strings["bitchslap"] = "";
+$a->strings["bitchslapped"] = "";
+$a->strings["shag"] = "";
+$a->strings["shagged"] = "";
+$a->strings["do something obscenely biological to"] = "";
+$a->strings["did something obscenely biological to"] = "";
+$a->strings["point out the poke feature to"] = "";
+$a->strings["pointed out the poke feature to"] = "";
+$a->strings["declare undying love for"] = "";
+$a->strings["declared undying love for"] = "";
+$a->strings["patent"] = "";
+$a->strings["patented"] = "";
+$a->strings["stroke beard"] = "";
+$a->strings["stroked their beard at"] = "";
+$a->strings["bemoan the declining standards of modern secondary and tertiary education to"] = "";
+$a->strings["bemoans the declining standards of modern secondary and tertiary education to"] = "";
+$a->strings["hug"] = "";
+$a->strings["hugged"] = "";
+$a->strings["kiss"] = "";
+$a->strings["kissed"] = "";
+$a->strings["raise eyebrows at"] = "";
+$a->strings["raised their eyebrows at"] = "";
+$a->strings["insult"] = "";
+$a->strings["insulted"] = "";
+$a->strings["praise"] = "";
+$a->strings["praised"] = "";
+$a->strings["be dubious of"] = "";
+$a->strings["was dubious of"] = "";
+$a->strings["eat"] = "";
+$a->strings["ate"] = "";
+$a->strings["giggle and fawn at"] = "";
+$a->strings["giggled and fawned at"] = "";
+$a->strings["doubt"] = "";
+$a->strings["doubted"] = "";
+$a->strings["glare"] = "";
+$a->strings["glared at"] = "";
diff --git a/morepokes/lang/sv/strings.php b/morepokes/lang/sv/strings.php
new file mode 100644
index 00000000..ab4fa67a
--- /dev/null
+++ b/morepokes/lang/sv/strings.php
@@ -0,0 +1,2 @@
+<?php
+
diff --git a/morepokes/lang/zh-cn/strings.php b/morepokes/lang/zh-cn/strings.php
new file mode 100644
index 00000000..fef2ed9f
--- /dev/null
+++ b/morepokes/lang/zh-cn/strings.php
@@ -0,0 +1,38 @@
+<?php
+
+$a->strings["bitchslap"] = "恶毒掌击";
+$a->strings["bitchslapped"] = "恶毒掌击了";
+$a->strings["shag"] = "肏";
+$a->strings["shagged"] = "肏了";
+$a->strings["do something obscenely biological to"] = "做什么淫秽生物的于";
+$a->strings["did something obscenely biological to"] = "做了什么淫秽生物的于";
+$a->strings["point out the poke feature to"] = "把戳特点指给";
+$a->strings["pointed out the poke feature to"] = "把了戳特点指给";
+$a->strings["declare undying love for"] = "表明永远的爱情为";
+$a->strings["declared undying love for"] = "表明了永远的爱情为";
+$a->strings["patent"] = "专利";
+$a->strings["patented"] = "专利了";
+$a->strings["stroke beard"] = "摸胡子";
+$a->strings["stroked their beard at"] = "摸胡子了";
+$a->strings["bemoan the declining standards of modern secondary and tertiary education to"] = "哀叹现代的二三等教育规格的衰退给";
+$a->strings["bemoans the declining standards of modern secondary and tertiary education to"] = "哀叹现代的二三等教育规格的衰退给";
+$a->strings["hug"] = "拥抱";
+$a->strings["hugged"] = "拥抱了";
+$a->strings["kiss"] = "亲吻";
+$a->strings["kissed"] = "亲吻了";
+$a->strings["raise eyebrows at"] = "举起眉毛于";
+$a->strings["raised their eyebrows at"] = "举起了眉毛于";
+$a->strings["insult"] = "侮辱";
+$a->strings["insulted"] = "侮辱";
+$a->strings["praise"] = "赞扬";
+$a->strings["praised"] = "赞扬了";
+$a->strings["be dubious of"] = "怀疑";
+$a->strings["was dubious of"] = "怀疑了";
+$a->strings["eat"] = "吃";
+$a->strings["ate"] = "吃了";
+$a->strings["giggle and fawn at"] = "咯咯地笑和巴结为";
+$a->strings["giggled and fawned at"] = "咯咯地笑和巴结为了";
+$a->strings["doubt"] = "怀疑";
+$a->strings["doubted"] = "怀疑了";
+$a->strings["glare"] = "瞪";
+$a->strings["glared at"] = "瞪了";
diff --git a/morepokes/morepokes.php b/morepokes/morepokes.php
index abe59a6e..32c9c03f 100644
--- a/morepokes/morepokes.php
+++ b/morepokes/morepokes.php
@@ -6,34 +6,37 @@
  * Author: Thomas Willingham <https://kakste.com/profile/beardyunixer>
  *
  */
-
-use Friendica\App;
 use Friendica\Core\Hook;
-use Friendica\DI;
+use Friendica\Core\L10n;
 
 function morepokes_install()
 {
 	  Hook::register('poke_verbs', 'addon/morepokes/morepokes.php', 'morepokes_poke_verbs');
 }
 
-function morepokes_poke_verbs(array &$b)
+function morepokes_uninstall()
 {
-	$b['bitchslap'] = ['bitchslapped', DI::l10n()->t('bitchslap'), DI::l10n()->t('bitchslapped')];
-	$b['shag'] = ['shag', DI::l10n()->t('shag'), DI::l10n()->t('shagged')];
-	$b['somethingobscenelybiological'] = ['something obscenely biological', DI::l10n()->t('do something obscenely biological to'), DI::l10n()->t('did something obscenely biological to')];
-	$b['newpokefeature'] = ['pointed out the poke feature to', DI::l10n()->t('point out the poke feature to'), DI::l10n()->t('pointed out the poke feature to')];
-	$b['declareundyinglove'] = ['declared undying love for', DI::l10n()->t('declare undying love for'), DI::l10n()->t('declared undying love for')];
-	$b['patent'] = ['patented', DI::l10n()->t('patent'), DI::l10n()->t('patented')];
-	$b['strokebeard'] = ['stroked their beard at', DI::l10n()->t('stroke beard'), DI::l10n()->t('stroked their beard at')];
-	$b['bemoan'] = ['bemoaned the declining standards of modern secondary and tertiary education to', DI::l10n()->t('bemoan the declining standards of modern secondary and tertiary education to'), DI::l10n()->t('bemoans the declining standards of modern secondary and tertiary education to')];
-	$b['hugs'] = ['hugged', DI::l10n()->t('hug'), DI::l10n()->t('hugged')];
-	$b['kiss'] = ['kissed', DI::l10n()->t('kiss'), DI::l10n()->t('kissed')];
-	$b['raiseeyebrows'] = ['raised their eyebrows at', DI::l10n()->t('raise eyebrows at'), DI::l10n()->t('raised their eyebrows at')];
-	$b['insult'] = ['insulted', DI::l10n()->t('insult'), DI::l10n()->t('insulted')];
-	$b['praise'] = ['praised', DI::l10n()->t('praise'), DI::l10n()->t('praised')];
-	$b['bedubiousof'] = ['was dubious of', DI::l10n()->t('be dubious of'), DI::l10n()->t('was dubious of')];
-	$b['eat'] = ['ate', DI::l10n()->t('eat'), DI::l10n()->t('ate')];
-	$b['giggleandfawn'] = ['giggled and fawned at', DI::l10n()->t('giggle and fawn at'), DI::l10n()->t('giggled and fawned at')];
-	$b['doubt'] = ['doubted', DI::l10n()->t('doubt'), DI::l10n()->t('doubted')];
-	$b['glare'] = ['glared at', DI::l10n()->t('glare'), DI::l10n()->t('glared at')];
+	  Hook::unregister('poke_verbs', 'addon/morepokes/morepokes.php', 'morepokes_poke_verbs');
+}
+
+function morepokes_poke_verbs($a, &$b)
+{
+	$b['bitchslap'] = ['bitchslapped', L10n::t('bitchslap'), L10n::t('bitchslapped')];
+	$b['shag'] = ['shag', L10n::t('shag'), L10n::t('shagged')];
+	$b['somethingobscenelybiological'] = ['something obscenely biological', L10n::t('do something obscenely biological to'), L10n::t('did something obscenely biological to')];
+	$b['newpokefeature'] = ['pointed out the poke feature to', L10n::t('point out the poke feature to'), L10n::t('pointed out the poke feature to')];
+	$b['declareundyinglove'] = ['declared undying love for', L10n::t('declare undying love for'), L10n::t('declared undying love for')];
+	$b['patent'] = ['patented', L10n::t('patent'), L10n::t('patented')];
+	$b['strokebeard'] = ['stroked their beard at', L10n::t('stroke beard'), L10n::t('stroked their beard at')];
+	$b['bemoan'] = ['bemoaned the declining standards of modern secondary and tertiary education to', L10n::t('bemoan the declining standards of modern secondary and tertiary education to'), L10n::t('bemoans the declining standards of modern secondary and tertiary education to')];
+	$b['hugs'] = ['hugged', L10n::t('hug'), L10n::t('hugged')];
+	$b['kiss'] = ['kissed', L10n::t('kiss'), L10n::t('kissed')];
+	$b['raiseeyebrows'] = ['raised their eyebrows at', L10n::t('raise eyebrows at'), L10n::t('raised their eyebrows at')];
+	$b['insult'] = ['insulted', L10n::t('insult'), L10n::t('insulted')];
+	$b['praise'] = ['praised', L10n::t('praise'), L10n::t('praised')];
+	$b['bedubiousof'] = ['was dubious of', L10n::t('be dubious of'), L10n::t('was dubious of')];
+	$b['eat'] = ['ate', L10n::t('eat'), L10n::t('ate')];
+	$b['giggleandfawn'] = ['giggled and fawned at', L10n::t('giggle and fawn at'), L10n::t('giggled and fawned at')];
+	$b['doubt'] = ['doubted', L10n::t('doubt'), L10n::t('doubted')];
+	$b['glare'] = ['glared at', L10n::t('glare'), L10n::t('glared at')];
 }
diff --git a/namethingy/lang/C/messages.po b/namethingy/lang/C/messages.po
new file mode 100644
index 00000000..e69de29b
diff --git a/namethingy/namethingy.php b/namethingy/namethingy.php
new file mode 100644
index 00000000..cb330981
--- /dev/null
+++ b/namethingy/namethingy.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ *
+ * Name: NameThingy
+ * Description: The Ultimate Random Name Generator
+ * Version: 1.0
+ * Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
+ * Status: Unsupported
+ */
+use Friendica\Core\Hook;
+
+function namethingy_install() {
+    Hook::register('app_menu', 'addon/namethingy/namethingy.php', 'namethingy_app_menu');
+}
+
+function namethingy_uninstall() {
+    Hook::unregister('app_menu', 'addon/namethingy/namethingy.php', 'namethingy_app_menu');
+
+}
+
+function namethingy_app_menu($a,&$b) {
+    $b['app_menu'][] = '<div class="app-title"><a href="namethingy">NameThingy</a></div>';
+}
+
+
+function namethingy_module() {}
+
+function namethingy_content(&$a) {
+
+$baseurl = $a->getBaseURL() . '/addon/namethingy';
+
+$o .= <<< EOT
+<iframe src="http://namethingy.com" width="900" height="700" />
+EOT;
+
+return $o;
+}
diff --git a/newmemberwidget/README.md b/newmemberwidget/README.md
index e467708e..c165ae0d 100644
--- a/newmemberwidget/README.md
+++ b/newmemberwidget/README.md
@@ -5,13 +5,13 @@ With this addon you can enable a widget for the sidebar of the network tab,
 which will be displayed for new members. It contains a linkt to friendicas
 introduction pages at /newmember and optionally
 
- * a link to the global support group
- * a link to an eventually existing local support group
+ * a link to the global support forum
+ * a link to an eventually existing local support forum
  * a welcome message you might want to send to your new members.
 
 There is no extra styling added for this added, so it should work with any
-theme you have selected, or your user selects. However, it wasn't tested
-with frio nor vier.
+theme you have selected, or your user selects. But it was only tested with
+duepuntozero,quattro and clean.
 
 Testing it
 ----------
diff --git a/newmemberwidget/lang/C/messages.po b/newmemberwidget/lang/C/messages.po
index 0dc91e13..d69b29e3 100644
--- a/newmemberwidget/lang/C/messages.po
+++ b/newmemberwidget/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-06-03 15:50-0400\n"
+"POT-Creation-Date: 2014-06-01 14:12+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,57 +17,57 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: newmemberwidget.php:29
+#: newmemberwidget.php:21
 msgid "New Member"
 msgstr ""
 
-#: newmemberwidget.php:30
+#: newmemberwidget.php:22
 msgid "Tips for New Members"
 msgstr ""
 
-#: newmemberwidget.php:33
-msgid "Global Support Group"
+#: newmemberwidget.php:24
+msgid "Global Support Forum"
 msgstr ""
 
-#: newmemberwidget.php:37
-msgid "Local Support Group"
+#: newmemberwidget.php:26
+msgid "Local Support Forum"
 msgstr ""
 
-#: newmemberwidget.php:62
+#: newmemberwidget.php:49
 msgid "Save Settings"
 msgstr ""
 
-#: newmemberwidget.php:63
+#: newmemberwidget.php:50
 msgid "Message"
 msgstr ""
 
-#: newmemberwidget.php:63
+#: newmemberwidget.php:50
 msgid "Your message for new members. You can use bbcode here."
 msgstr ""
 
-#: newmemberwidget.php:64
-msgid "Add a link to global support group"
+#: newmemberwidget.php:51
+msgid "Add a link to global support forum"
 msgstr ""
 
-#: newmemberwidget.php:64
-msgid "Should a link to the global support group be displayed?"
+#: newmemberwidget.php:51
+msgid "Should a link to the global support forum be displayed?"
 msgstr ""
 
-#: newmemberwidget.php:65
-msgid "Add a link to the local support group"
+#: newmemberwidget.php:52
+msgid "Add a link to the local support forum"
 msgstr ""
 
-#: newmemberwidget.php:65
+#: newmemberwidget.php:52
 msgid ""
-"If you have a local support group and want to have a link displayed in the "
+"If you have a local support forum and wand to have a link displayed in the "
 "widget, check this box."
 msgstr ""
 
-#: newmemberwidget.php:66
+#: newmemberwidget.php:53
 msgid "Name of the local support group"
 msgstr ""
 
-#: newmemberwidget.php:66
+#: newmemberwidget.php:53
 msgid ""
 "If you checked the above, specify the <em>nickname</em> of the local support "
 "group here (i.e. helpers)"
diff --git a/newmemberwidget/lang/ar/messages.po b/newmemberwidget/lang/ar/messages.po
deleted file mode 100644
index 23320d68..00000000
--- a/newmemberwidget/lang/ar/messages.po
+++ /dev/null
@@ -1,76 +0,0 @@
-# ADDON newmemberwidget
-# Copyright (C)
-# This file is distributed under the same license as the Friendica newmemberwidget addon package.
-# 
-# 
-# Translators:
-# Farida Khalaf <faridakhalaf@hotmail.com>, 2021
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2021-02-21 18:40+0000\n"
-"Last-Translator: Farida Khalaf <faridakhalaf@hotmail.com>\n"
-"Language-Team: Arabic (http://www.transifex.com/Friendica/friendica/language/ar/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ar\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-
-#: newmemberwidget.php:29
-msgid "New Member"
-msgstr ""
-
-#: newmemberwidget.php:30
-msgid "Tips for New Members"
-msgstr ""
-
-#: newmemberwidget.php:33
-msgid "Global Support Forum"
-msgstr ""
-
-#: newmemberwidget.php:37
-msgid "Local Support Forum"
-msgstr ""
-
-#: newmemberwidget.php:65
-msgid "Save Settings"
-msgstr "حفظ الإعدادات"
-
-#: newmemberwidget.php:66
-msgid "Message"
-msgstr "رسالة"
-
-#: newmemberwidget.php:66
-msgid "Your message for new members. You can use bbcode here."
-msgstr ""
-
-#: newmemberwidget.php:67
-msgid "Add a link to global support forum"
-msgstr ""
-
-#: newmemberwidget.php:67
-msgid "Should a link to the global support forum be displayed?"
-msgstr ""
-
-#: newmemberwidget.php:68
-msgid "Add a link to the local support forum"
-msgstr ""
-
-#: newmemberwidget.php:68
-msgid ""
-"If you have a local support forum and want to have a link displayed in the "
-"widget, check this box."
-msgstr ""
-
-#: newmemberwidget.php:69
-msgid "Name of the local support group"
-msgstr ""
-
-#: newmemberwidget.php:69
-msgid ""
-"If you checked the above, specify the <em>nickname</em> of the local support"
-" group here (i.e. helpers)"
-msgstr ""
diff --git a/newmemberwidget/lang/ar/strings.php b/newmemberwidget/lang/ar/strings.php
deleted file mode 100644
index 50b19101..00000000
--- a/newmemberwidget/lang/ar/strings.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_ar")) {
-function string_plural_select_ar($n){
-	$n = intval($n);
-	if ($n==0) { return 0; } else if ($n==1) { return 1; } else if ($n==2) { return 2; } else if ($n%100>=3 && $n%100<=10) { return 3; } else if ($n%100>=11 && $n%100<=99) { return 4; } else  { return 5; }
-}}
-$a->strings['Save Settings'] = 'حفظ الإعدادات';
-$a->strings['Message'] = 'رسالة';
diff --git a/newmemberwidget/lang/cs/messages.po b/newmemberwidget/lang/cs/messages.po
index 387144ab..c774e302 100644
--- a/newmemberwidget/lang/cs/messages.po
+++ b/newmemberwidget/lang/cs/messages.po
@@ -4,74 +4,73 @@
 # 
 # 
 # Translators:
-# Aditoo, 2018
-# michal_s <msupler@gmail.com>, 2014
+# Michal Šupler <msupler@gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-06-03 15:50-0400\n"
-"PO-Revision-Date: 2014-06-23 10:26+0000\n"
-"Last-Translator: Aditoo, 2018\n"
-"Language-Team: Czech (http://app.transifex.com/Friendica/friendica/language/cs/)\n"
+"POT-Creation-Date: 2014-06-01 14:12+0200\n"
+"PO-Revision-Date: 2014-07-07 19:25+0000\n"
+"Last-Translator: Michal Šupler <msupler@gmail.com>\n"
+"Language-Team: Czech (http://www.transifex.com/projects/p/friendica/language/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: cs\n"
-"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: newmemberwidget.php:29
+#: newmemberwidget.php:21
 msgid "New Member"
 msgstr "Nový člen"
 
-#: newmemberwidget.php:30
+#: newmemberwidget.php:22
 msgid "Tips for New Members"
 msgstr "Tipy pro nové členy"
 
-#: newmemberwidget.php:33
-msgid "Global Support Group"
-msgstr ""
+#: newmemberwidget.php:24
+msgid "Global Support Forum"
+msgstr "Globální fórum podpory"
 
-#: newmemberwidget.php:37
-msgid "Local Support Group"
-msgstr ""
+#: newmemberwidget.php:26
+msgid "Local Support Forum"
+msgstr "Lokální fórum podpory"
 
-#: newmemberwidget.php:62
+#: newmemberwidget.php:49
 msgid "Save Settings"
-msgstr "Uložit nastavení"
+msgstr "Uložit Nastavení"
 
-#: newmemberwidget.php:63
+#: newmemberwidget.php:50
 msgid "Message"
 msgstr "Zpráva"
 
-#: newmemberwidget.php:63
+#: newmemberwidget.php:50
 msgid "Your message for new members. You can use bbcode here."
 msgstr "Vaše zpráva pro nové členy. Zde můžete použít BBCode."
 
-#: newmemberwidget.php:64
-msgid "Add a link to global support group"
-msgstr ""
+#: newmemberwidget.php:51
+msgid "Add a link to global support forum"
+msgstr "Přidejte odkaz na globální fórum podpory"
 
-#: newmemberwidget.php:64
-msgid "Should a link to the global support group be displayed?"
-msgstr ""
+#: newmemberwidget.php:51
+msgid "Should a link to the global support forum be displayed?"
+msgstr "Má být odkaz na globální fórum podpory zobrazen?"
 
-#: newmemberwidget.php:65
-msgid "Add a link to the local support group"
-msgstr ""
+#: newmemberwidget.php:52
+msgid "Add a link to the local support forum"
+msgstr "Přidejte odkaz na lokální fórum podpory"
 
-#: newmemberwidget.php:65
+#: newmemberwidget.php:52
 msgid ""
-"If you have a local support group and want to have a link displayed in the "
+"If you have a local support forum and wand to have a link displayed in the "
 "widget, check this box."
-msgstr ""
+msgstr "Pokud máte lokální fórum podpory a chcete mít zobrazen jeho odkaz, zvolte tuto volbu."
 
-#: newmemberwidget.php:66
+#: newmemberwidget.php:53
 msgid "Name of the local support group"
-msgstr "Název místního fóra podpory"
+msgstr "Název lokálního fóra podpory"
 
-#: newmemberwidget.php:66
+#: newmemberwidget.php:53
 msgid ""
 "If you checked the above, specify the <em>nickname</em> of the local support"
 " group here (i.e. helpers)"
-msgstr "Pokud jste zaškrtl/a výše uvedenou možnost, specifikujte zde <em>přezdívku</em> místní skupiny podpory (např. pomocnici)"
+msgstr "Pokud jste výše uvedené zaškrtli, specifikujte zde <em>přezdívku</em> lokální podpůrné skupiny (např. pomahači)"
diff --git a/newmemberwidget/lang/cs/strings.php b/newmemberwidget/lang/cs/strings.php
index 2f150466..30fed02c 100644
--- a/newmemberwidget/lang/cs/strings.php
+++ b/newmemberwidget/lang/cs/strings.php
@@ -2,13 +2,19 @@
 
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
-	$n = intval($n);
-	if (($n == 1 && $n % 1 == 0)) { return 0; } else if (($n >= 2 && $n <= 4 && $n % 1 == 0)) { return 1; } else if (($n % 1 != 0 )) { return 2; } else  { return 3; }
+	return ($n==1) ? 0 : ($n>=2 && $n<=4) ? 1 : 2;;
 }}
-$a->strings['New Member'] = 'Nový člen';
-$a->strings['Tips for New Members'] = 'Tipy pro nové členy';
-$a->strings['Save Settings'] = 'Uložit nastavení';
-$a->strings['Message'] = 'Zpráva';
-$a->strings['Your message for new members. You can use bbcode here.'] = 'Vaše zpráva pro nové členy. Zde můžete použít BBCode.';
-$a->strings['Name of the local support group'] = 'Název místního fóra podpory';
-$a->strings['If you checked the above, specify the <em>nickname</em> of the local support group here (i.e. helpers)'] = 'Pokud jste zaškrtl/a výše uvedenou možnost, specifikujte zde <em>přezdívku</em> místní skupiny podpory (např. pomocnici)';
+;
+$a->strings["New Member"] = "Nový člen";
+$a->strings["Tips for New Members"] = "Tipy pro nové členy";
+$a->strings["Global Support Forum"] = "Globální fórum podpory";
+$a->strings["Local Support Forum"] = "Lokální fórum podpory";
+$a->strings["Save Settings"] = "Uložit Nastavení";
+$a->strings["Message"] = "Zpráva";
+$a->strings["Your message for new members. You can use bbcode here."] = "Vaše zpráva pro nové členy. Zde můžete použít BBCode.";
+$a->strings["Add a link to global support forum"] = "Přidejte odkaz na globální fórum podpory";
+$a->strings["Should a link to the global support forum be displayed?"] = "Má být odkaz na globální fórum podpory zobrazen?";
+$a->strings["Add a link to the local support forum"] = "Přidejte odkaz na lokální fórum podpory";
+$a->strings["If you have a local support forum and wand to have a link displayed in the widget, check this box."] = "Pokud máte lokální fórum podpory a chcete mít zobrazen jeho odkaz, zvolte tuto volbu.";
+$a->strings["Name of the local support group"] = "Název lokálního fóra podpory";
+$a->strings["If you checked the above, specify the <em>nickname</em> of the local support group here (i.e. helpers)"] = "Pokud jste výše uvedené zaškrtli, specifikujte zde <em>přezdívku</em> lokální podpůrné skupiny (např. pomahači)";
diff --git a/newmemberwidget/lang/da-dk/messages.po b/newmemberwidget/lang/da-dk/messages.po
deleted file mode 100644
index 24aaade9..00000000
--- a/newmemberwidget/lang/da-dk/messages.po
+++ /dev/null
@@ -1,76 +0,0 @@
-# ADDON newmemberwidget
-# Copyright (C)
-# This file is distributed under the same license as the Friendica newmemberwidget addon package.
-# 
-# 
-# Translators:
-# Anton <dev@atjn.dk>, 2022
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2014-06-23 10:26+0000\n"
-"Last-Translator: Anton <dev@atjn.dk>, 2022\n"
-"Language-Team: Danish (Denmark) (http://www.transifex.com/Friendica/friendica/language/da_DK/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: da_DK\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: newmemberwidget.php:29
-msgid "New Member"
-msgstr "Nyt medlem"
-
-#: newmemberwidget.php:30
-msgid "Tips for New Members"
-msgstr "Tips til nye medlemmer"
-
-#: newmemberwidget.php:33
-msgid "Global Support Forum"
-msgstr "Globalt supportforum"
-
-#: newmemberwidget.php:37
-msgid "Local Support Forum"
-msgstr "Lokalt supportforum"
-
-#: newmemberwidget.php:65
-msgid "Save Settings"
-msgstr "Gem indstillinger"
-
-#: newmemberwidget.php:66
-msgid "Message"
-msgstr "Besked"
-
-#: newmemberwidget.php:66
-msgid "Your message for new members. You can use bbcode here."
-msgstr "Din besked til nye medlemmer. Du kan bruge BBCode her."
-
-#: newmemberwidget.php:67
-msgid "Add a link to global support forum"
-msgstr "Tilføj et link til det globale supportforum"
-
-#: newmemberwidget.php:67
-msgid "Should a link to the global support forum be displayed?"
-msgstr "Skal et link til det globale supportforum vises?"
-
-#: newmemberwidget.php:68
-msgid "Add a link to the local support forum"
-msgstr "Tilføj et link til det lokale supportforum"
-
-#: newmemberwidget.php:68
-msgid ""
-"If you have a local support forum and want to have a link displayed in the "
-"widget, check this box."
-msgstr "Hvis du har et lokalt supportforum og gerne vil have et link vist i widgeten, så afkryds denne boks."
-
-#: newmemberwidget.php:69
-msgid "Name of the local support group"
-msgstr "Navn på det lokale supportforum"
-
-#: newmemberwidget.php:69
-msgid ""
-"If you checked the above, specify the <em>nickname</em> of the local support"
-" group here (i.e. helpers)"
-msgstr "Hvis du afkrydsede det ovenover, så definer et <em>kaldenavn</em> for den lokale supportgruppe her (fx hjælpere)"
diff --git a/newmemberwidget/lang/da-dk/strings.php b/newmemberwidget/lang/da-dk/strings.php
deleted file mode 100644
index 667b7f70..00000000
--- a/newmemberwidget/lang/da-dk/strings.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_da_dk")) {
-function string_plural_select_da_dk($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['New Member'] = 'Nyt medlem';
-$a->strings['Tips for New Members'] = 'Tips til nye medlemmer';
-$a->strings['Global Support Forum'] = 'Globalt supportforum';
-$a->strings['Local Support Forum'] = 'Lokalt supportforum';
-$a->strings['Save Settings'] = 'Gem indstillinger';
-$a->strings['Message'] = 'Besked';
-$a->strings['Your message for new members. You can use bbcode here.'] = 'Din besked til nye medlemmer. Du kan bruge BBCode her.';
-$a->strings['Add a link to global support forum'] = 'Tilføj et link til det globale supportforum';
-$a->strings['Should a link to the global support forum be displayed?'] = 'Skal et link til det globale supportforum vises?';
-$a->strings['Add a link to the local support forum'] = 'Tilføj et link til det lokale supportforum';
-$a->strings['If you have a local support forum and want to have a link displayed in the widget, check this box.'] = 'Hvis du har et lokalt supportforum og gerne vil have et link vist i widgeten, så afkryds denne boks.';
-$a->strings['Name of the local support group'] = 'Navn på det lokale supportforum';
-$a->strings['If you checked the above, specify the <em>nickname</em> of the local support group here (i.e. helpers)'] = 'Hvis du afkrydsede det ovenover, så definer et <em>kaldenavn</em> for den lokale supportgruppe her (fx hjælpere)';
diff --git a/newmemberwidget/lang/de/messages.po b/newmemberwidget/lang/de/messages.po
index 87289e3e..46245073 100644
--- a/newmemberwidget/lang/de/messages.po
+++ b/newmemberwidget/lang/de/messages.po
@@ -4,74 +4,71 @@
 # 
 # 
 # Translators:
-# Raroun, 2023
-# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2021
-# Ulf Rompe <transifex.com@rompe.org>, 2019
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-06-03 15:50-0400\n"
-"PO-Revision-Date: 2014-06-23 10:26+0000\n"
-"Last-Translator: Raroun, 2023\n"
-"Language-Team: German (http://app.transifex.com/Friendica/friendica/language/de/)\n"
+"POT-Creation-Date: 2014-06-01 14:12+0200\n"
+"PO-Revision-Date: 2014-06-23 10:27+0000\n"
+"Last-Translator: bavatar <tobias.diekershoff@gmx.net>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/friendica/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: newmemberwidget.php:29
+#: newmemberwidget.php:21
 msgid "New Member"
 msgstr "Neue Nutzer"
 
-#: newmemberwidget.php:30
+#: newmemberwidget.php:22
 msgid "Tips for New Members"
 msgstr "Tipps für neue Nutzer"
 
-#: newmemberwidget.php:33
-msgid "Global Support Group"
-msgstr "Globale Support-Gruppe"
+#: newmemberwidget.php:24
+msgid "Global Support Forum"
+msgstr "Globales Forum für Hilfsanfragen"
 
-#: newmemberwidget.php:37
-msgid "Local Support Group"
-msgstr "Lokale Support-Gruppe"
+#: newmemberwidget.php:26
+msgid "Local Support Forum"
+msgstr "Lokales Forum für Hilfsanfragen"
 
-#: newmemberwidget.php:62
+#: newmemberwidget.php:49
 msgid "Save Settings"
-msgstr "Einstellungen speichern"
+msgstr "Einstellungen Speichern"
 
-#: newmemberwidget.php:63
+#: newmemberwidget.php:50
 msgid "Message"
 msgstr "Nachricht"
 
-#: newmemberwidget.php:63
+#: newmemberwidget.php:50
 msgid "Your message for new members. You can use bbcode here."
 msgstr "Deine Nachricht für neue Nutzer. BBCode kann verwendet werden."
 
-#: newmemberwidget.php:64
-msgid "Add a link to global support group"
-msgstr "Fügen Sie einen Link der globalen Support-Gruppe hinzu"
+#: newmemberwidget.php:51
+msgid "Add a link to global support forum"
+msgstr "Link zum globalen Support Forum anzeigen"
 
-#: newmemberwidget.php:64
-msgid "Should a link to the global support group be displayed?"
-msgstr "Soll ein Link zur globalen Support-Gruppe angezeigt werden?"
+#: newmemberwidget.php:51
+msgid "Should a link to the global support forum be displayed?"
+msgstr "Soll ein Link zum globalen Support Forum angezeigt werden?"
 
-#: newmemberwidget.php:65
-msgid "Add a link to the local support group"
-msgstr "Fügen Sie einen Link der lokalen Support-Gruppe hinzu"
+#: newmemberwidget.php:52
+msgid "Add a link to the local support forum"
+msgstr "Link zum lokalen Support Forum anzeigen"
 
-#: newmemberwidget.php:65
+#: newmemberwidget.php:52
 msgid ""
-"If you have a local support group and want to have a link displayed in the "
+"If you have a local support forum and wand to have a link displayed in the "
 "widget, check this box."
-msgstr "Wenn Sie eine lokale Support-Gruppe haben und einen Link im Widget anzeigen lassen möchten, markieren Sie dieses Feld."
+msgstr "Wenn du ein lokales Support Forum eingerichtet hast und Link darauf angezeigt werden soll, hier klicken"
 
-#: newmemberwidget.php:66
+#: newmemberwidget.php:53
 msgid "Name of the local support group"
-msgstr "Name des lokalen Support-Forums"
+msgstr "Name des lokalen Support Forums"
 
-#: newmemberwidget.php:66
+#: newmemberwidget.php:53
 msgid ""
 "If you checked the above, specify the <em>nickname</em> of the local support"
 " group here (i.e. helpers)"
diff --git a/newmemberwidget/lang/de/strings.php b/newmemberwidget/lang/de/strings.php
index aa3e0f88..77f5ad62 100644
--- a/newmemberwidget/lang/de/strings.php
+++ b/newmemberwidget/lang/de/strings.php
@@ -2,19 +2,19 @@
 
 if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['New Member'] = 'Neue Nutzer';
-$a->strings['Tips for New Members'] = 'Tipps für neue Nutzer';
-$a->strings['Global Support Group'] = 'Globale Support-Gruppe';
-$a->strings['Local Support Group'] = 'Lokale Support-Gruppe';
-$a->strings['Save Settings'] = 'Einstellungen speichern';
-$a->strings['Message'] = 'Nachricht';
-$a->strings['Your message for new members. You can use bbcode here.'] = 'Deine Nachricht für neue Nutzer. BBCode kann verwendet werden.';
-$a->strings['Add a link to global support group'] = 'Fügen Sie einen Link der globalen Support-Gruppe hinzu';
-$a->strings['Should a link to the global support group be displayed?'] = 'Soll ein Link zur globalen Support-Gruppe angezeigt werden?';
-$a->strings['Add a link to the local support group'] = 'Fügen Sie einen Link der lokalen Support-Gruppe hinzu';
-$a->strings['If you have a local support group and want to have a link displayed in the widget, check this box.'] = 'Wenn Sie eine lokale Support-Gruppe haben und einen Link im Widget anzeigen lassen möchten, markieren Sie dieses Feld.';
-$a->strings['Name of the local support group'] = 'Name des lokalen Support-Forums';
-$a->strings['If you checked the above, specify the <em>nickname</em> of the local support group here (i.e. helpers)'] = 'Wenn der Link angezeigt werden soll, dann trage hier den <em>Spitznamen</em> des Forums ein (z.B. helpers)';
+;
+$a->strings["New Member"] = "Neue Nutzer";
+$a->strings["Tips for New Members"] = "Tipps für neue Nutzer";
+$a->strings["Global Support Forum"] = "Globales Forum für Hilfsanfragen";
+$a->strings["Local Support Forum"] = "Lokales Forum für Hilfsanfragen";
+$a->strings["Save Settings"] = "Einstellungen Speichern";
+$a->strings["Message"] = "Nachricht";
+$a->strings["Your message for new members. You can use bbcode here."] = "Deine Nachricht für neue Nutzer. BBCode kann verwendet werden.";
+$a->strings["Add a link to global support forum"] = "Link zum globalen Support Forum anzeigen";
+$a->strings["Should a link to the global support forum be displayed?"] = "Soll ein Link zum globalen Support Forum angezeigt werden?";
+$a->strings["Add a link to the local support forum"] = "Link zum lokalen Support Forum anzeigen";
+$a->strings["If you have a local support forum and wand to have a link displayed in the widget, check this box."] = "Wenn du ein lokales Support Forum eingerichtet hast und Link darauf angezeigt werden soll, hier klicken";
+$a->strings["Name of the local support group"] = "Name des lokalen Support Forums";
+$a->strings["If you checked the above, specify the <em>nickname</em> of the local support group here (i.e. helpers)"] = "Wenn der Link angezeigt werden soll, dann trage hier den <em>Spitznamen</em> des Forums ein (z.B. helpers)";
diff --git a/newmemberwidget/lang/es/messages.po b/newmemberwidget/lang/es/messages.po
index b731a041..e46b6f47 100644
--- a/newmemberwidget/lang/es/messages.po
+++ b/newmemberwidget/lang/es/messages.po
@@ -5,72 +5,71 @@
 # 
 # Translators:
 # Albert, 2016
-# Senex Petrovic <javierruizo@hotmail.com>, 2021
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-06-03 15:50-0400\n"
-"PO-Revision-Date: 2014-06-23 10:26+0000\n"
-"Last-Translator: Senex Petrovic <javierruizo@hotmail.com>, 2021\n"
-"Language-Team: Spanish (http://app.transifex.com/Friendica/friendica/language/es/)\n"
+"POT-Creation-Date: 2014-06-01 14:12+0200\n"
+"PO-Revision-Date: 2016-11-17 20:43+0000\n"
+"Last-Translator: Albert\n"
+"Language-Team: Spanish (http://www.transifex.com/Friendica/friendica/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: es\n"
-"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: newmemberwidget.php:29
+#: newmemberwidget.php:21
 msgid "New Member"
 msgstr "Nuevo Miembro"
 
-#: newmemberwidget.php:30
+#: newmemberwidget.php:22
 msgid "Tips for New Members"
 msgstr "Consejos para Nuevos Miembros"
 
-#: newmemberwidget.php:33
-msgid "Global Support Group"
-msgstr ""
+#: newmemberwidget.php:24
+msgid "Global Support Forum"
+msgstr "Foro de Soporte Global"
 
-#: newmemberwidget.php:37
-msgid "Local Support Group"
-msgstr ""
+#: newmemberwidget.php:26
+msgid "Local Support Forum"
+msgstr "Foro de Soporte Local"
 
-#: newmemberwidget.php:62
+#: newmemberwidget.php:49
 msgid "Save Settings"
 msgstr "Guardar Ajustes"
 
-#: newmemberwidget.php:63
+#: newmemberwidget.php:50
 msgid "Message"
 msgstr "Mensaje"
 
-#: newmemberwidget.php:63
+#: newmemberwidget.php:50
 msgid "Your message for new members. You can use bbcode here."
 msgstr "Su mensaje para los nuevos miembros. Puede usar bbcode aquí"
 
-#: newmemberwidget.php:64
-msgid "Add a link to global support group"
-msgstr ""
+#: newmemberwidget.php:51
+msgid "Add a link to global support forum"
+msgstr "Añadir un enlace al foro de soporte global"
 
-#: newmemberwidget.php:64
-msgid "Should a link to the global support group be displayed?"
-msgstr ""
+#: newmemberwidget.php:51
+msgid "Should a link to the global support forum be displayed?"
+msgstr "¿Debería mostrarse un enlace al foro de soporte global?"
 
-#: newmemberwidget.php:65
-msgid "Add a link to the local support group"
-msgstr ""
+#: newmemberwidget.php:52
+msgid "Add a link to the local support forum"
+msgstr "Añadir un enlace al foro de soporte local"
 
-#: newmemberwidget.php:65
+#: newmemberwidget.php:52
 msgid ""
-"If you have a local support group and want to have a link displayed in the "
+"If you have a local support forum and wand to have a link displayed in the "
 "widget, check this box."
-msgstr ""
+msgstr "Si tiene un foro de soporte local y quiere que se muestre un enlace en el widget, chequee esta casilla."
 
-#: newmemberwidget.php:66
+#: newmemberwidget.php:53
 msgid "Name of the local support group"
 msgstr "Nombre del grupo de soporte local"
 
-#: newmemberwidget.php:66
+#: newmemberwidget.php:53
 msgid ""
 "If you checked the above, specify the <em>nickname</em> of the local support"
 " group here (i.e. helpers)"
diff --git a/newmemberwidget/lang/es/strings.php b/newmemberwidget/lang/es/strings.php
index 8798813a..de5df04f 100644
--- a/newmemberwidget/lang/es/strings.php
+++ b/newmemberwidget/lang/es/strings.php
@@ -2,13 +2,19 @@
 
 if(! function_exists("string_plural_select_es")) {
 function string_plural_select_es($n){
-	$n = intval($n);
-	if ($n == 1) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
+	return ($n != 1);;
 }}
-$a->strings['New Member'] = 'Nuevo Miembro';
-$a->strings['Tips for New Members'] = 'Consejos para Nuevos Miembros';
-$a->strings['Save Settings'] = 'Guardar Ajustes';
-$a->strings['Message'] = 'Mensaje';
-$a->strings['Your message for new members. You can use bbcode here.'] = 'Su mensaje para los nuevos miembros. Puede usar bbcode aquí';
-$a->strings['Name of the local support group'] = 'Nombre del grupo de soporte local';
-$a->strings['If you checked the above, specify the <em>nickname</em> of the local support group here (i.e. helpers)'] = 'Si chequeó arriba, especifique el <em>apodo</em> del grupo de soporte local aquí (asistentes)';
+;
+$a->strings["New Member"] = "Nuevo Miembro";
+$a->strings["Tips for New Members"] = "Consejos para Nuevos Miembros";
+$a->strings["Global Support Forum"] = "Foro de Soporte Global";
+$a->strings["Local Support Forum"] = "Foro de Soporte Local";
+$a->strings["Save Settings"] = "Guardar Ajustes";
+$a->strings["Message"] = "Mensaje";
+$a->strings["Your message for new members. You can use bbcode here."] = "Su mensaje para los nuevos miembros. Puede usar bbcode aquí";
+$a->strings["Add a link to global support forum"] = "Añadir un enlace al foro de soporte global";
+$a->strings["Should a link to the global support forum be displayed?"] = "¿Debería mostrarse un enlace al foro de soporte global?";
+$a->strings["Add a link to the local support forum"] = "Añadir un enlace al foro de soporte local";
+$a->strings["If you have a local support forum and wand to have a link displayed in the widget, check this box."] = "Si tiene un foro de soporte local y quiere que se muestre un enlace en el widget, chequee esta casilla.";
+$a->strings["Name of the local support group"] = "Nombre del grupo de soporte local";
+$a->strings["If you checked the above, specify the <em>nickname</em> of the local support group here (i.e. helpers)"] = "Si chequeó arriba, especifique el <em>apodo</em> del grupo de soporte local aquí (asistentes)";
diff --git a/newmemberwidget/lang/et/messages.po b/newmemberwidget/lang/et/messages.po
index 6f52dff8..969efad9 100644
--- a/newmemberwidget/lang/et/messages.po
+++ b/newmemberwidget/lang/et/messages.po
@@ -9,67 +9,67 @@ msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-06-03 15:50-0400\n"
-"PO-Revision-Date: 2014-06-23 10:26+0000\n"
-"Last-Translator: Rain Hawk, 2019\n"
-"Language-Team: Estonian (http://app.transifex.com/Friendica/friendica/language/et/)\n"
+"POT-Creation-Date: 2014-06-01 14:12+0200\n"
+"PO-Revision-Date: 2019-04-16 05:07+0000\n"
+"Last-Translator: Rain Hawk\n"
+"Language-Team: Estonian (http://www.transifex.com/Friendica/friendica/language/et/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: et\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: newmemberwidget.php:29
+#: newmemberwidget.php:21
 msgid "New Member"
 msgstr "Uus liige"
 
-#: newmemberwidget.php:30
+#: newmemberwidget.php:22
 msgid "Tips for New Members"
 msgstr "Nippe uutele liikmetele"
 
-#: newmemberwidget.php:33
-msgid "Global Support Group"
-msgstr ""
+#: newmemberwidget.php:24
+msgid "Global Support Forum"
+msgstr "Globaalne tugifoorum"
 
-#: newmemberwidget.php:37
-msgid "Local Support Group"
-msgstr ""
+#: newmemberwidget.php:26
+msgid "Local Support Forum"
+msgstr "Lokaalne tugifoorum"
 
-#: newmemberwidget.php:62
+#: newmemberwidget.php:49
 msgid "Save Settings"
 msgstr "Salvesta sätted"
 
-#: newmemberwidget.php:63
+#: newmemberwidget.php:50
 msgid "Message"
 msgstr "Sõnum"
 
-#: newmemberwidget.php:63
+#: newmemberwidget.php:50
 msgid "Your message for new members. You can use bbcode here."
 msgstr ""
 
-#: newmemberwidget.php:64
-msgid "Add a link to global support group"
+#: newmemberwidget.php:51
+msgid "Add a link to global support forum"
 msgstr ""
 
-#: newmemberwidget.php:64
-msgid "Should a link to the global support group be displayed?"
+#: newmemberwidget.php:51
+msgid "Should a link to the global support forum be displayed?"
 msgstr ""
 
-#: newmemberwidget.php:65
-msgid "Add a link to the local support group"
+#: newmemberwidget.php:52
+msgid "Add a link to the local support forum"
 msgstr ""
 
-#: newmemberwidget.php:65
+#: newmemberwidget.php:52
 msgid ""
-"If you have a local support group and want to have a link displayed in the "
+"If you have a local support forum and wand to have a link displayed in the "
 "widget, check this box."
 msgstr ""
 
-#: newmemberwidget.php:66
+#: newmemberwidget.php:53
 msgid "Name of the local support group"
 msgstr ""
 
-#: newmemberwidget.php:66
+#: newmemberwidget.php:53
 msgid ""
 "If you checked the above, specify the <em>nickname</em> of the local support"
 " group here (i.e. helpers)"
diff --git a/newmemberwidget/lang/et/strings.php b/newmemberwidget/lang/et/strings.php
index e4465d99..e0563766 100644
--- a/newmemberwidget/lang/et/strings.php
+++ b/newmemberwidget/lang/et/strings.php
@@ -3,9 +3,19 @@
 if(! function_exists("string_plural_select_et")) {
 function string_plural_select_et($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['New Member'] = 'Uus liige';
-$a->strings['Tips for New Members'] = 'Nippe uutele liikmetele';
-$a->strings['Save Settings'] = 'Salvesta sätted';
-$a->strings['Message'] = 'Sõnum';
+;
+$a->strings["New Member"] = "Uus liige";
+$a->strings["Tips for New Members"] = "Nippe uutele liikmetele";
+$a->strings["Global Support Forum"] = "Globaalne tugifoorum";
+$a->strings["Local Support Forum"] = "Lokaalne tugifoorum";
+$a->strings["Save Settings"] = "Salvesta sätted";
+$a->strings["Message"] = "Sõnum";
+$a->strings["Your message for new members. You can use bbcode here."] = "";
+$a->strings["Add a link to global support forum"] = "";
+$a->strings["Should a link to the global support forum be displayed?"] = "";
+$a->strings["Add a link to the local support forum"] = "";
+$a->strings["If you have a local support forum and wand to have a link displayed in the widget, check this box."] = "";
+$a->strings["Name of the local support group"] = "";
+$a->strings["If you checked the above, specify the <em>nickname</em> of the local support group here (i.e. helpers)"] = "";
diff --git a/newmemberwidget/lang/fi-fi/strings.php b/newmemberwidget/lang/fi-fi/strings.php
index 0282704e..02e8ce30 100644
--- a/newmemberwidget/lang/fi-fi/strings.php
+++ b/newmemberwidget/lang/fi-fi/strings.php
@@ -2,15 +2,19 @@
 
 if(! function_exists("string_plural_select_fi_fi")) {
 function string_plural_select_fi_fi($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['New Member'] = 'Uusi jäsen';
-$a->strings['Tips for New Members'] = 'Vinkkejä uusille käyttäjille';
-$a->strings['Global Support Forum'] = 'Maailmanlaajuinen tukifoorumi';
-$a->strings['Local Support Forum'] = 'Paikallinen tukifoorumi';
-$a->strings['Save Settings'] = 'Tallenna asetukset';
-$a->strings['Message'] = 'Viesti';
-$a->strings['Add a link to global support forum'] = 'Lisää linkki maailmanlaajuiseen tukifoorumiin';
-$a->strings['Add a link to the local support forum'] = 'Lisää linkki paikalliseen tukifoorumiin';
-$a->strings['Name of the local support group'] = 'Paikallisen tukifoorumin nimi';
+;
+$a->strings["New Member"] = "Uusi jäsen";
+$a->strings["Tips for New Members"] = "Vinkkejä uusille käyttäjille";
+$a->strings["Global Support Forum"] = "Maailmanlaajuinen tukifoorumi";
+$a->strings["Local Support Forum"] = "Paikallinen tukifoorumi";
+$a->strings["Save Settings"] = "Tallenna asetukset";
+$a->strings["Message"] = "Viesti";
+$a->strings["Your message for new members. You can use bbcode here."] = "";
+$a->strings["Add a link to global support forum"] = "Lisää linkki maailmanlaajuiseen tukifoorumiin";
+$a->strings["Should a link to the global support forum be displayed?"] = "";
+$a->strings["Add a link to the local support forum"] = "Lisää linkki paikalliseen tukifoorumiin";
+$a->strings["If you have a local support forum and wand to have a link displayed in the widget, check this box."] = "";
+$a->strings["Name of the local support group"] = "Paikallisen tukifoorumin nimi";
+$a->strings["If you checked the above, specify the <em>nickname</em> of the local support group here (i.e. helpers)"] = "";
diff --git a/newmemberwidget/lang/fr/messages.po b/newmemberwidget/lang/fr/messages.po
deleted file mode 100644
index 3e1f2505..00000000
--- a/newmemberwidget/lang/fr/messages.po
+++ /dev/null
@@ -1,79 +0,0 @@
-# ADDON newmemberwidget
-# Copyright (C)
-# This file is distributed under the same license as the Friendica newmemberwidget addon package.
-# 
-# 
-# Translators:
-# Florent C., 2023
-# Hypolite Petovan <hypolite@mrpetovan.com>, 2022
-# Nicolas Derive, 2022
-# StefOfficiel <pichard.stephane@free.fr>, 2015
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-06-03 15:50-0400\n"
-"PO-Revision-Date: 2014-06-23 10:26+0000\n"
-"Last-Translator: Florent C., 2023\n"
-"Language-Team: French (http://app.transifex.com/Friendica/friendica/language/fr/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: fr\n"
-"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
-
-#: newmemberwidget.php:29
-msgid "New Member"
-msgstr "Nouveau Membre"
-
-#: newmemberwidget.php:30
-msgid "Tips for New Members"
-msgstr "Conseils aux nouveaux venus"
-
-#: newmemberwidget.php:33
-msgid "Global Support Group"
-msgstr "Groupe de support global"
-
-#: newmemberwidget.php:37
-msgid "Local Support Group"
-msgstr "Groupe de support local"
-
-#: newmemberwidget.php:62
-msgid "Save Settings"
-msgstr "Enregistrer les paramètres"
-
-#: newmemberwidget.php:63
-msgid "Message"
-msgstr "Message"
-
-#: newmemberwidget.php:63
-msgid "Your message for new members. You can use bbcode here."
-msgstr "Votre messages aux nouveaux venus. Vous pouvez utiliser des BBCodes."
-
-#: newmemberwidget.php:64
-msgid "Add a link to global support group"
-msgstr "Ajouter un lien vers le groupe de support global"
-
-#: newmemberwidget.php:64
-msgid "Should a link to the global support group be displayed?"
-msgstr "Montrer un lien vers le groupe de support global ?"
-
-#: newmemberwidget.php:65
-msgid "Add a link to the local support group"
-msgstr "Ajouter un lien vers le groupe de support local"
-
-#: newmemberwidget.php:65
-msgid ""
-"If you have a local support group and want to have a link displayed in the "
-"widget, check this box."
-msgstr "Si vous avez un groupe de support local et désirez avoir un lien affiché dans l'appliquette/widget, cochez cette case."
-
-#: newmemberwidget.php:66
-msgid "Name of the local support group"
-msgstr "Nom du groupe de support local"
-
-#: newmemberwidget.php:66
-msgid ""
-"If you checked the above, specify the <em>nickname</em> of the local support"
-" group here (i.e. helpers)"
-msgstr "Si vous avez coché la case ci-dessus, spécifiez le <em>nom d'utilisateur</em> du groupe de support local (par ex. \"helpers\")"
diff --git a/newmemberwidget/lang/fr/strings.php b/newmemberwidget/lang/fr/strings.php
deleted file mode 100644
index cc437f89..00000000
--- a/newmemberwidget/lang/fr/strings.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_fr")) {
-function string_plural_select_fr($n){
-	$n = intval($n);
-	if (($n == 0 || $n == 1)) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
-}}
-$a->strings['New Member'] = 'Nouveau Membre';
-$a->strings['Tips for New Members'] = 'Conseils aux nouveaux venus';
-$a->strings['Global Support Group'] = 'Groupe de support global';
-$a->strings['Local Support Group'] = 'Groupe de support local';
-$a->strings['Save Settings'] = 'Enregistrer les paramètres';
-$a->strings['Message'] = 'Message';
-$a->strings['Your message for new members. You can use bbcode here.'] = 'Votre messages aux nouveaux venus. Vous pouvez utiliser des BBCodes.';
-$a->strings['Add a link to global support group'] = 'Ajouter un lien vers le groupe de support global';
-$a->strings['Should a link to the global support group be displayed?'] = 'Montrer un lien vers le groupe de support global ?';
-$a->strings['Add a link to the local support group'] = 'Ajouter un lien vers le groupe de support local';
-$a->strings['If you have a local support group and want to have a link displayed in the widget, check this box.'] = 'Si vous avez un groupe de support local et désirez avoir un lien affiché dans l\'appliquette/widget, cochez cette case.';
-$a->strings['Name of the local support group'] = 'Nom du groupe de support local';
-$a->strings['If you checked the above, specify the <em>nickname</em> of the local support group here (i.e. helpers)'] = 'Si vous avez coché la case ci-dessus, spécifiez le <em>nom d\'utilisateur</em> du groupe de support local (par ex. "helpers")';
diff --git a/newmemberwidget/lang/hu/messages.po b/newmemberwidget/lang/hu/messages.po
deleted file mode 100644
index f3babd21..00000000
--- a/newmemberwidget/lang/hu/messages.po
+++ /dev/null
@@ -1,76 +0,0 @@
-# ADDON newmemberwidget
-# Copyright (C)
-# This file is distributed under the same license as the Friendica newmemberwidget addon package.
-# 
-# 
-# Translators:
-# Balázs Úr, 2020-2021,2023
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-06-03 15:50-0400\n"
-"PO-Revision-Date: 2014-06-23 10:26+0000\n"
-"Last-Translator: Balázs Úr, 2020-2021,2023\n"
-"Language-Team: Hungarian (http://app.transifex.com/Friendica/friendica/language/hu/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: hu\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: newmemberwidget.php:29
-msgid "New Member"
-msgstr "Új tag"
-
-#: newmemberwidget.php:30
-msgid "Tips for New Members"
-msgstr "Tippek új tagoknak"
-
-#: newmemberwidget.php:33
-msgid "Global Support Group"
-msgstr "Globális támogatási csoport"
-
-#: newmemberwidget.php:37
-msgid "Local Support Group"
-msgstr "Helyi támogatási csoport"
-
-#: newmemberwidget.php:62
-msgid "Save Settings"
-msgstr "Beállítások mentése"
-
-#: newmemberwidget.php:63
-msgid "Message"
-msgstr "Üzenet"
-
-#: newmemberwidget.php:63
-msgid "Your message for new members. You can use bbcode here."
-msgstr "Az Ön üzenete az új tagoknak. Itt használhat BBCode-ot."
-
-#: newmemberwidget.php:64
-msgid "Add a link to global support group"
-msgstr "A globális támogatási csoportra mutató hivatkozás hozzáadása"
-
-#: newmemberwidget.php:64
-msgid "Should a link to the global support group be displayed?"
-msgstr "Meg kell jeleníteni a globális támogatási csoportra mutató hivatkozást?"
-
-#: newmemberwidget.php:65
-msgid "Add a link to the local support group"
-msgstr "A helyi támogatási csoportra mutató hivatkozás hozzáadása"
-
-#: newmemberwidget.php:65
-msgid ""
-"If you have a local support group and want to have a link displayed in the "
-"widget, check this box."
-msgstr "Ha van helyi támogatási csoportja és meg szeretne jeleníteni egy hivatkozást a felületi elemben, akkor jelölje be ezt a négyzetet."
-
-#: newmemberwidget.php:66
-msgid "Name of the local support group"
-msgstr "A helyi támogató csoport neve"
-
-#: newmemberwidget.php:66
-msgid ""
-"If you checked the above, specify the <em>nickname</em> of the local support"
-" group here (i.e. helpers)"
-msgstr "Ha bejelölte a fentit, akkor itt adja meg a helyi támogató csoport <em>becenevét</em> (például segítők)"
diff --git a/newmemberwidget/lang/hu/strings.php b/newmemberwidget/lang/hu/strings.php
deleted file mode 100644
index 2f0066cd..00000000
--- a/newmemberwidget/lang/hu/strings.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_hu")) {
-function string_plural_select_hu($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['New Member'] = 'Új tag';
-$a->strings['Tips for New Members'] = 'Tippek új tagoknak';
-$a->strings['Global Support Group'] = 'Globális támogatási csoport';
-$a->strings['Local Support Group'] = 'Helyi támogatási csoport';
-$a->strings['Save Settings'] = 'Beállítások mentése';
-$a->strings['Message'] = 'Üzenet';
-$a->strings['Your message for new members. You can use bbcode here.'] = 'Az Ön üzenete az új tagoknak. Itt használhat BBCode-ot.';
-$a->strings['Add a link to global support group'] = 'A globális támogatási csoportra mutató hivatkozás hozzáadása';
-$a->strings['Should a link to the global support group be displayed?'] = 'Meg kell jeleníteni a globális támogatási csoportra mutató hivatkozást?';
-$a->strings['Add a link to the local support group'] = 'A helyi támogatási csoportra mutató hivatkozás hozzáadása';
-$a->strings['If you have a local support group and want to have a link displayed in the widget, check this box.'] = 'Ha van helyi támogatási csoportja és meg szeretne jeleníteni egy hivatkozást a felületi elemben, akkor jelölje be ezt a négyzetet.';
-$a->strings['Name of the local support group'] = 'A helyi támogató csoport neve';
-$a->strings['If you checked the above, specify the <em>nickname</em> of the local support group here (i.e. helpers)'] = 'Ha bejelölte a fentit, akkor itt adja meg a helyi támogató csoport <em>becenevét</em> (például segítők)';
diff --git a/newmemberwidget/lang/it/messages.po b/newmemberwidget/lang/it/messages.po
index 91d5c03e..b62a779b 100644
--- a/newmemberwidget/lang/it/messages.po
+++ b/newmemberwidget/lang/it/messages.po
@@ -5,72 +5,71 @@
 # 
 # Translators:
 # fabrixxm <fabrix.xm@gmail.com>, 2014
-# Sylke Vicious <silkevicious@gmail.com>, 2020-2021
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-06-03 15:50-0400\n"
-"PO-Revision-Date: 2014-06-23 10:26+0000\n"
-"Last-Translator: Sylke Vicious <silkevicious@gmail.com>, 2020-2021\n"
-"Language-Team: Italian (http://app.transifex.com/Friendica/friendica/language/it/)\n"
+"POT-Creation-Date: 2014-06-01 14:12+0200\n"
+"PO-Revision-Date: 2017-09-20 06:08+0000\n"
+"Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n"
+"Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: it\n"
-"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: newmemberwidget.php:29
+#: newmemberwidget.php:21
 msgid "New Member"
 msgstr "Nuovi Utenti"
 
-#: newmemberwidget.php:30
+#: newmemberwidget.php:22
 msgid "Tips for New Members"
 msgstr "Consigli per i Nuovi Utenti"
 
-#: newmemberwidget.php:33
-msgid "Global Support Group"
-msgstr ""
+#: newmemberwidget.php:24
+msgid "Global Support Forum"
+msgstr "Forum Globale di Supporto"
 
-#: newmemberwidget.php:37
-msgid "Local Support Group"
-msgstr ""
+#: newmemberwidget.php:26
+msgid "Local Support Forum"
+msgstr "Forum Locale di Supporto"
 
-#: newmemberwidget.php:62
+#: newmemberwidget.php:49
 msgid "Save Settings"
 msgstr "Salva Impostazioni"
 
-#: newmemberwidget.php:63
+#: newmemberwidget.php:50
 msgid "Message"
 msgstr "Messaggio"
 
-#: newmemberwidget.php:63
+#: newmemberwidget.php:50
 msgid "Your message for new members. You can use bbcode here."
 msgstr "Il tuo messaggio per i nuovi utenti. Puoi usare BBCode"
 
-#: newmemberwidget.php:64
-msgid "Add a link to global support group"
-msgstr ""
+#: newmemberwidget.php:51
+msgid "Add a link to global support forum"
+msgstr "Aggiunge un link al forum di supporto globale"
 
-#: newmemberwidget.php:64
-msgid "Should a link to the global support group be displayed?"
-msgstr ""
+#: newmemberwidget.php:51
+msgid "Should a link to the global support forum be displayed?"
+msgstr "Mostrare il link al forum di supporto globale?"
 
-#: newmemberwidget.php:65
-msgid "Add a link to the local support group"
-msgstr ""
+#: newmemberwidget.php:52
+msgid "Add a link to the local support forum"
+msgstr "Aggiunge un link al forum di supporto locale"
 
-#: newmemberwidget.php:65
+#: newmemberwidget.php:52
 msgid ""
-"If you have a local support group and want to have a link displayed in the "
+"If you have a local support forum and wand to have a link displayed in the "
 "widget, check this box."
-msgstr ""
+msgstr "Se hai un forum di supporto locale e vuoi che sia mostrato il link nel widget, seleziona questo box."
 
-#: newmemberwidget.php:66
+#: newmemberwidget.php:53
 msgid "Name of the local support group"
 msgstr "Nome del gruppo locale di supporto"
 
-#: newmemberwidget.php:66
+#: newmemberwidget.php:53
 msgid ""
 "If you checked the above, specify the <em>nickname</em> of the local support"
 " group here (i.e. helpers)"
diff --git a/newmemberwidget/lang/it/strings.php b/newmemberwidget/lang/it/strings.php
index 56798c2a..a9a08904 100644
--- a/newmemberwidget/lang/it/strings.php
+++ b/newmemberwidget/lang/it/strings.php
@@ -2,13 +2,19 @@
 
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
-	$n = intval($n);
-	if ($n == 1) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
+	return ($n != 1);;
 }}
-$a->strings['New Member'] = 'Nuovi Utenti';
-$a->strings['Tips for New Members'] = 'Consigli per i Nuovi Utenti';
-$a->strings['Save Settings'] = 'Salva Impostazioni';
-$a->strings['Message'] = 'Messaggio';
-$a->strings['Your message for new members. You can use bbcode here.'] = 'Il tuo messaggio per i nuovi utenti. Puoi usare BBCode';
-$a->strings['Name of the local support group'] = 'Nome del gruppo locale di supporto';
-$a->strings['If you checked the above, specify the <em>nickname</em> of the local support group here (i.e. helpers)'] = 'Se hai selezionato il box sopra, specifica qui il <em>nome utente</em> del gruppo locale di supporto (e.s. \'supporto\')';
+;
+$a->strings["New Member"] = "Nuovi Utenti";
+$a->strings["Tips for New Members"] = "Consigli per i Nuovi Utenti";
+$a->strings["Global Support Forum"] = "Forum Globale di Supporto";
+$a->strings["Local Support Forum"] = "Forum Locale di Supporto";
+$a->strings["Save Settings"] = "Salva Impostazioni";
+$a->strings["Message"] = "Messaggio";
+$a->strings["Your message for new members. You can use bbcode here."] = "Il tuo messaggio per i nuovi utenti. Puoi usare BBCode";
+$a->strings["Add a link to global support forum"] = "Aggiunge un link al forum di supporto globale";
+$a->strings["Should a link to the global support forum be displayed?"] = "Mostrare il link al forum di supporto globale?";
+$a->strings["Add a link to the local support forum"] = "Aggiunge un link al forum di supporto locale";
+$a->strings["If you have a local support forum and wand to have a link displayed in the widget, check this box."] = "Se hai un forum di supporto locale e vuoi che sia mostrato il link nel widget, seleziona questo box.";
+$a->strings["Name of the local support group"] = "Nome del gruppo locale di supporto";
+$a->strings["If you checked the above, specify the <em>nickname</em> of the local support group here (i.e. helpers)"] = "Se hai selezionato il box sopra, specifica qui il <em>nome utente</em> del gruppo locale di supporto (e.s. 'supporto')";
diff --git a/newmemberwidget/lang/nl/messages.po b/newmemberwidget/lang/nl/messages.po
index 232ae370..a1ce7269 100644
--- a/newmemberwidget/lang/nl/messages.po
+++ b/newmemberwidget/lang/nl/messages.po
@@ -4,73 +4,72 @@
 # 
 # 
 # Translators:
-# a a <tgceph@gmail.com>, 2019
 # Jeroen De Meerleer <me@jeroened.be>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2014-06-23 10:26+0000\n"
-"Last-Translator: a a <tgceph@gmail.com>, 2019\n"
-"Language-Team: Dutch (http://app.transifex.com/Friendica/friendica/language/nl/)\n"
+"POT-Creation-Date: 2014-06-01 14:12+0200\n"
+"PO-Revision-Date: 2018-08-24 13:40+0000\n"
+"Last-Translator: Jeroen De Meerleer <me@jeroened.be>\n"
+"Language-Team: Dutch (http://www.transifex.com/Friendica/friendica/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: newmemberwidget.php:29
+#: newmemberwidget.php:21
 msgid "New Member"
 msgstr "Nieuw lid"
 
-#: newmemberwidget.php:30
+#: newmemberwidget.php:22
 msgid "Tips for New Members"
 msgstr "Tips voor nieuwe leden"
 
-#: newmemberwidget.php:33
+#: newmemberwidget.php:24
 msgid "Global Support Forum"
 msgstr ""
 
-#: newmemberwidget.php:37
+#: newmemberwidget.php:26
 msgid "Local Support Forum"
 msgstr ""
 
-#: newmemberwidget.php:65
+#: newmemberwidget.php:49
 msgid "Save Settings"
 msgstr "Instellingen opslaan"
 
-#: newmemberwidget.php:66
+#: newmemberwidget.php:50
 msgid "Message"
-msgstr "Bericht"
+msgstr ""
 
-#: newmemberwidget.php:66
+#: newmemberwidget.php:50
 msgid "Your message for new members. You can use bbcode here."
-msgstr "Uw bericht aan nieuwe leden. U kunt hier bbcode gebruiken."
+msgstr ""
 
-#: newmemberwidget.php:67
+#: newmemberwidget.php:51
 msgid "Add a link to global support forum"
 msgstr ""
 
-#: newmemberwidget.php:67
+#: newmemberwidget.php:51
 msgid "Should a link to the global support forum be displayed?"
 msgstr ""
 
-#: newmemberwidget.php:68
+#: newmemberwidget.php:52
 msgid "Add a link to the local support forum"
 msgstr ""
 
-#: newmemberwidget.php:68
+#: newmemberwidget.php:52
 msgid ""
-"If you have a local support forum and want to have a link displayed in the "
+"If you have a local support forum and wand to have a link displayed in the "
 "widget, check this box."
 msgstr ""
 
-#: newmemberwidget.php:69
+#: newmemberwidget.php:53
 msgid "Name of the local support group"
 msgstr ""
 
-#: newmemberwidget.php:69
+#: newmemberwidget.php:53
 msgid ""
 "If you checked the above, specify the <em>nickname</em> of the local support"
 " group here (i.e. helpers)"
diff --git a/newmemberwidget/lang/nl/strings.php b/newmemberwidget/lang/nl/strings.php
index e81e7fcd..90e69ce3 100644
--- a/newmemberwidget/lang/nl/strings.php
+++ b/newmemberwidget/lang/nl/strings.php
@@ -3,10 +3,19 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['New Member'] = 'Nieuw lid';
-$a->strings['Tips for New Members'] = 'Tips voor nieuwe leden';
-$a->strings['Save Settings'] = 'Instellingen opslaan';
-$a->strings['Message'] = 'Bericht';
-$a->strings['Your message for new members. You can use bbcode here.'] = 'Uw bericht aan nieuwe leden. U kunt hier bbcode gebruiken.';
+;
+$a->strings["New Member"] = "Nieuw lid";
+$a->strings["Tips for New Members"] = "Tips voor nieuwe leden";
+$a->strings["Global Support Forum"] = "";
+$a->strings["Local Support Forum"] = "";
+$a->strings["Save Settings"] = "Instellingen opslaan";
+$a->strings["Message"] = "";
+$a->strings["Your message for new members. You can use bbcode here."] = "";
+$a->strings["Add a link to global support forum"] = "";
+$a->strings["Should a link to the global support forum be displayed?"] = "";
+$a->strings["Add a link to the local support forum"] = "";
+$a->strings["If you have a local support forum and wand to have a link displayed in the widget, check this box."] = "";
+$a->strings["Name of the local support group"] = "";
+$a->strings["If you checked the above, specify the <em>nickname</em> of the local support group here (i.e. helpers)"] = "";
diff --git a/newmemberwidget/lang/pl/messages.po b/newmemberwidget/lang/pl/messages.po
index 90dda1ff..8d9f6fbe 100644
--- a/newmemberwidget/lang/pl/messages.po
+++ b/newmemberwidget/lang/pl/messages.po
@@ -4,73 +4,72 @@
 # 
 # 
 # Translators:
-# Piotr Strębski <strebski@gmail.com>, 2022
-# Waldemar Stoczkowski, 2018
+# Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-06-03 15:50-0400\n"
-"PO-Revision-Date: 2014-06-23 10:26+0000\n"
-"Last-Translator: Piotr Strębski <strebski@gmail.com>, 2022\n"
-"Language-Team: Polish (http://app.transifex.com/Friendica/friendica/language/pl/)\n"
+"POT-Creation-Date: 2014-06-01 14:12+0200\n"
+"PO-Revision-Date: 2018-03-31 20:24+0000\n"
+"Last-Translator: Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>\n"
+"Language-Team: Polish (http://www.transifex.com/Friendica/friendica/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pl\n"
 "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
-#: newmemberwidget.php:29
+#: newmemberwidget.php:21
 msgid "New Member"
-msgstr "Nowy użytkownik"
+msgstr "Nowy Użytkownik"
 
-#: newmemberwidget.php:30
+#: newmemberwidget.php:22
 msgid "Tips for New Members"
-msgstr "Wskazówki dla nowych użytkowników"
+msgstr "Wskazówki dla nowych członków"
 
-#: newmemberwidget.php:33
-msgid "Global Support Group"
-msgstr ""
+#: newmemberwidget.php:24
+msgid "Global Support Forum"
+msgstr "Globalne forum pomocy technicznej"
 
-#: newmemberwidget.php:37
-msgid "Local Support Group"
-msgstr ""
+#: newmemberwidget.php:26
+msgid "Local Support Forum"
+msgstr "Lokalne Forum Wsparcia"
 
-#: newmemberwidget.php:62
+#: newmemberwidget.php:49
 msgid "Save Settings"
 msgstr "Zapisz ustawienia"
 
-#: newmemberwidget.php:63
+#: newmemberwidget.php:50
 msgid "Message"
 msgstr "Wiadomość"
 
-#: newmemberwidget.php:63
+#: newmemberwidget.php:50
 msgid "Your message for new members. You can use bbcode here."
-msgstr "Twoja wiadomość dla nowych członków. Możesz tutaj użyć bbcode."
+msgstr "Twoja wiadomość dla nowych członków. Możesz użyć bbcode tutaj."
 
-#: newmemberwidget.php:64
-msgid "Add a link to global support group"
-msgstr ""
+#: newmemberwidget.php:51
+msgid "Add a link to global support forum"
+msgstr "Dodaj link do globalnego forum pomocy technicznej"
 
-#: newmemberwidget.php:64
-msgid "Should a link to the global support group be displayed?"
-msgstr ""
+#: newmemberwidget.php:51
+msgid "Should a link to the global support forum be displayed?"
+msgstr "Czy powinien być wyświetlany link do globalnego forum pomocy technicznej?"
 
-#: newmemberwidget.php:65
-msgid "Add a link to the local support group"
-msgstr ""
+#: newmemberwidget.php:52
+msgid "Add a link to the local support forum"
+msgstr "Dodaj link do lokalnego forum pomocy technicznej"
 
-#: newmemberwidget.php:65
+#: newmemberwidget.php:52
 msgid ""
-"If you have a local support group and want to have a link displayed in the "
+"If you have a local support forum and wand to have a link displayed in the "
 "widget, check this box."
-msgstr ""
+msgstr "Jeżeli masz lokalne wsparcie forum i różdżki, aby mieć łącze wyświetlane w widżecie, zaznacz to pole wyboru."
 
-#: newmemberwidget.php:66
+#: newmemberwidget.php:53
 msgid "Name of the local support group"
 msgstr "Nazwa grupy lokalnej pomocy technicznej"
 
-#: newmemberwidget.php:66
+#: newmemberwidget.php:53
 msgid ""
 "If you checked the above, specify the <em>nickname</em> of the local support"
 " group here (i.e. helpers)"
diff --git a/newmemberwidget/lang/pl/strings.php b/newmemberwidget/lang/pl/strings.php
index 22a9e9a9..a58f34ef 100644
--- a/newmemberwidget/lang/pl/strings.php
+++ b/newmemberwidget/lang/pl/strings.php
@@ -2,13 +2,19 @@
 
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
-	$n = intval($n);
-	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
+	return ($n==1 ? 0 : ($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14) ? 1 : $n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14) ? 2 : 3);;
 }}
-$a->strings['New Member'] = 'Nowy użytkownik';
-$a->strings['Tips for New Members'] = 'Wskazówki dla nowych użytkowników';
-$a->strings['Save Settings'] = 'Zapisz ustawienia';
-$a->strings['Message'] = 'Wiadomość';
-$a->strings['Your message for new members. You can use bbcode here.'] = 'Twoja wiadomość dla nowych członków. Możesz tutaj użyć bbcode.';
-$a->strings['Name of the local support group'] = 'Nazwa grupy lokalnej pomocy technicznej';
-$a->strings['If you checked the above, specify the <em>nickname</em> of the local support group here (i.e. helpers)'] = 'Jeśli zaznaczyłeś powyższe, określ tutaj pseudonim lokalnej grupy wsparcia (np. Pomocnicy)';
+;
+$a->strings["New Member"] = "Nowy Użytkownik";
+$a->strings["Tips for New Members"] = "Wskazówki dla nowych członków";
+$a->strings["Global Support Forum"] = "Globalne forum pomocy technicznej";
+$a->strings["Local Support Forum"] = "Lokalne Forum Wsparcia";
+$a->strings["Save Settings"] = "Zapisz ustawienia";
+$a->strings["Message"] = "Wiadomość";
+$a->strings["Your message for new members. You can use bbcode here."] = "Twoja wiadomość dla nowych członków. Możesz użyć bbcode tutaj.";
+$a->strings["Add a link to global support forum"] = "Dodaj link do globalnego forum pomocy technicznej";
+$a->strings["Should a link to the global support forum be displayed?"] = "Czy powinien być wyświetlany link do globalnego forum pomocy technicznej?";
+$a->strings["Add a link to the local support forum"] = "Dodaj link do lokalnego forum pomocy technicznej";
+$a->strings["If you have a local support forum and wand to have a link displayed in the widget, check this box."] = "Jeżeli masz lokalne wsparcie forum i różdżki, aby mieć łącze wyświetlane w widżecie, zaznacz to pole wyboru.";
+$a->strings["Name of the local support group"] = "Nazwa grupy lokalnej pomocy technicznej";
+$a->strings["If you checked the above, specify the <em>nickname</em> of the local support group here (i.e. helpers)"] = "Jeśli zaznaczyłeś powyższe, określ tutaj pseudonim lokalnej grupy wsparcia (np. Pomocnicy)";
diff --git a/newmemberwidget/lang/pt-br/strings.php b/newmemberwidget/lang/pt-br/strings.php
index 021f977d..a6fb624c 100644
--- a/newmemberwidget/lang/pt-br/strings.php
+++ b/newmemberwidget/lang/pt-br/strings.php
@@ -2,19 +2,19 @@
 
 if(! function_exists("string_plural_select_pt_br")) {
 function string_plural_select_pt_br($n){
-	$n = intval($n);
-	return intval($n > 1);
+	return ($n > 1);;
 }}
-$a->strings['New Member'] = 'Novo Membro';
-$a->strings['Tips for New Members'] = 'Dicas para Novos Membros';
-$a->strings['Global Support Forum'] = 'Fórum de suporte global';
-$a->strings['Local Support Forum'] = 'Fórum de suporte local';
-$a->strings['Save Settings'] = 'Salva configurações';
-$a->strings['Message'] = 'Mensagem';
-$a->strings['Your message for new members. You can use bbcode here.'] = 'Sua mensagem para novos membros. Você pode usar bbcode aqui.';
-$a->strings['Add a link to global support forum'] = 'Adicione um link para o fórum de suporte global';
-$a->strings['Should a link to the global support forum be displayed?'] = 'Um link para o fórum de suporte global deve ser mostrado?';
-$a->strings['Add a link to the local support forum'] = 'Adicione um link para o fórum de suporte local';
-$a->strings['If you have a local support forum and wand to have a link displayed in the widget, check this box.'] = 'Se você tem um fórum de suporte local e quer mostrar um link no widget marque essa opção';
-$a->strings['Name of the local support group'] = 'Nome do fórum local de suporte';
-$a->strings['If you checked the above, specify the <em>nickname</em> of the local support group here (i.e. helpers)'] = 'Se você marcou  opção acima, especifique o <em>apelido</em> do grupo de suporte local aqui (exemplo: helpers)';
+;
+$a->strings["New Member"] = "Novo Membro";
+$a->strings["Tips for New Members"] = "Dicas para Novos Membros";
+$a->strings["Global Support Forum"] = "Fórum de suporte global";
+$a->strings["Local Support Forum"] = "Fórum de suporte local";
+$a->strings["Save Settings"] = "Salva configurações";
+$a->strings["Message"] = "Mensagem";
+$a->strings["Your message for new members. You can use bbcode here."] = "Sua mensagem para novos membros. Você pode usar bbcode aqui.";
+$a->strings["Add a link to global support forum"] = "Adicione um link para o fórum de suporte global";
+$a->strings["Should a link to the global support forum be displayed?"] = "Um link para o fórum de suporte global deve ser mostrado?";
+$a->strings["Add a link to the local support forum"] = "Adicione um link para o fórum de suporte local";
+$a->strings["If you have a local support forum and wand to have a link displayed in the widget, check this box."] = "Se você tem um fórum de suporte local e quer mostrar um link no widget marque essa opção";
+$a->strings["Name of the local support group"] = "Nome do fórum local de suporte";
+$a->strings["If you checked the above, specify the <em>nickname</em> of the local support group here (i.e. helpers)"] = "Se você marcou  opção acima, especifique o <em>apelido</em> do grupo de suporte local aqui (exemplo: helpers)";
diff --git a/newmemberwidget/lang/ro/strings.php b/newmemberwidget/lang/ro/strings.php
index 006cca41..0a00d1a6 100644
--- a/newmemberwidget/lang/ro/strings.php
+++ b/newmemberwidget/lang/ro/strings.php
@@ -2,19 +2,19 @@
 
 if(! function_exists("string_plural_select_ro")) {
 function string_plural_select_ro($n){
-	$n = intval($n);
-	if ($n==1) { return 0; } else if ((($n%100>19)||(($n%100==0)&&($n!=0)))) { return 2; } else  { return 1; }
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
 }}
-$a->strings['New Member'] = 'Membru Nou';
-$a->strings['Tips for New Members'] = 'Sfaturi pentru Membrii Noi';
-$a->strings['Global Support Forum'] = 'Forum Global Asistentă';
-$a->strings['Local Support Forum'] = 'Forum Local Asistență';
-$a->strings['Save Settings'] = 'Salvare Configurări';
-$a->strings['Message'] = 'Mesaj';
-$a->strings['Your message for new members. You can use bbcode here.'] = 'Mesajul dumneavoastră pentru noii membri. Puteți folosi aici codul BB.';
-$a->strings['Add a link to global support forum'] = 'Adăugați o legătură către forumul global de asistentă';
-$a->strings['Should a link to the global support forum be displayed?'] = 'Ar trebui afișată o legătură către forumul global de asistență?';
-$a->strings['Add a link to the local support forum'] = 'Adăugați o legătură către forumul local de asistență';
-$a->strings['If you have a local support forum and wand to have a link displayed in the widget, check this box.'] = 'Dacă dețineți un forum local de asistentă şi doriți să aveți o legătură afișată în mini-aplicația widget, bifați această casetă.';
-$a->strings['Name of the local support group'] = 'Numele grupului local de asistență';
-$a->strings['If you checked the above, specify the <em>nickname</em> of the local support group here (i.e. helpers)'] = 'Dacă ați bifat mai sus, specificați aici <em>pseudonimul</em> grupului local de asistență (adică operatorii de asistență)';
+;
+$a->strings["New Member"] = "Membru Nou";
+$a->strings["Tips for New Members"] = "Sfaturi pentru Membrii Noi";
+$a->strings["Global Support Forum"] = "Forum Global Asistentă";
+$a->strings["Local Support Forum"] = "Forum Local Asistență";
+$a->strings["Save Settings"] = "Salvare Configurări";
+$a->strings["Message"] = "Mesaj";
+$a->strings["Your message for new members. You can use bbcode here."] = "Mesajul dumneavoastră pentru noii membri. Puteți folosi aici codul BB.";
+$a->strings["Add a link to global support forum"] = "Adăugați o legătură către forumul global de asistentă";
+$a->strings["Should a link to the global support forum be displayed?"] = "Ar trebui afișată o legătură către forumul global de asistență?";
+$a->strings["Add a link to the local support forum"] = "Adăugați o legătură către forumul local de asistență";
+$a->strings["If you have a local support forum and wand to have a link displayed in the widget, check this box."] = "Dacă dețineți un forum local de asistentă şi doriți să aveți o legătură afișată în mini-aplicația widget, bifați această casetă.";
+$a->strings["Name of the local support group"] = "Numele grupului local de asistență";
+$a->strings["If you checked the above, specify the <em>nickname</em> of the local support group here (i.e. helpers)"] = "Dacă ați bifat mai sus, specificați aici <em>pseudonimul</em> grupului local de asistență (adică operatorii de asistență)";
diff --git a/newmemberwidget/lang/ru/messages.po b/newmemberwidget/lang/ru/messages.po
deleted file mode 100644
index 1fe611e9..00000000
--- a/newmemberwidget/lang/ru/messages.po
+++ /dev/null
@@ -1,76 +0,0 @@
-# ADDON newmemberwidget
-# Copyright (C)
-# This file is distributed under the same license as the Friendica newmemberwidget addon package.
-# 
-# 
-# Translators:
-# Alexander An <ravnina@gmail.com>, 2020
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-06-03 15:50-0400\n"
-"PO-Revision-Date: 2014-06-23 10:26+0000\n"
-"Last-Translator: Alexander An <ravnina@gmail.com>, 2020\n"
-"Language-Team: Russian (http://app.transifex.com/Friendica/friendica/language/ru/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ru\n"
-"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
-
-#: newmemberwidget.php:29
-msgid "New Member"
-msgstr "Новичок"
-
-#: newmemberwidget.php:30
-msgid "Tips for New Members"
-msgstr "Советы новичкам"
-
-#: newmemberwidget.php:33
-msgid "Global Support Group"
-msgstr ""
-
-#: newmemberwidget.php:37
-msgid "Local Support Group"
-msgstr ""
-
-#: newmemberwidget.php:62
-msgid "Save Settings"
-msgstr "Сохранить настройки"
-
-#: newmemberwidget.php:63
-msgid "Message"
-msgstr "Сообщение"
-
-#: newmemberwidget.php:63
-msgid "Your message for new members. You can use bbcode here."
-msgstr "Ваше сообщение новичкам. Вы можете использовать BBCode."
-
-#: newmemberwidget.php:64
-msgid "Add a link to global support group"
-msgstr ""
-
-#: newmemberwidget.php:64
-msgid "Should a link to the global support group be displayed?"
-msgstr ""
-
-#: newmemberwidget.php:65
-msgid "Add a link to the local support group"
-msgstr ""
-
-#: newmemberwidget.php:65
-msgid ""
-"If you have a local support group and want to have a link displayed in the "
-"widget, check this box."
-msgstr ""
-
-#: newmemberwidget.php:66
-msgid "Name of the local support group"
-msgstr "Название местной группы поддержки"
-
-#: newmemberwidget.php:66
-msgid ""
-"If you checked the above, specify the <em>nickname</em> of the local support"
-" group here (i.e. helpers)"
-msgstr "Если вы включили настройку выше, укажите <em>ник</em>местной группы поддержки пользователей."
diff --git a/newmemberwidget/lang/ru/strings.php b/newmemberwidget/lang/ru/strings.php
deleted file mode 100644
index 6f27bb1a..00000000
--- a/newmemberwidget/lang/ru/strings.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_ru")) {
-function string_plural_select_ru($n){
-	$n = intval($n);
-	if ($n%10==1 && $n%100!=11) { return 0; } else if ($n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14)) { return 1; } else if ($n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)) { return 2; } else  { return 3; }
-}}
-$a->strings['New Member'] = 'Новичок';
-$a->strings['Tips for New Members'] = 'Советы новичкам';
-$a->strings['Save Settings'] = 'Сохранить настройки';
-$a->strings['Message'] = 'Сообщение';
-$a->strings['Your message for new members. You can use bbcode here.'] = 'Ваше сообщение новичкам. Вы можете использовать BBCode.';
-$a->strings['Name of the local support group'] = 'Название местной группы поддержки';
-$a->strings['If you checked the above, specify the <em>nickname</em> of the local support group here (i.e. helpers)'] = 'Если вы включили настройку выше, укажите <em>ник</em>местной группы поддержки пользователей.';
diff --git a/newmemberwidget/lang/sv/messages.po b/newmemberwidget/lang/sv/messages.po
deleted file mode 100644
index a1a6167a..00000000
--- a/newmemberwidget/lang/sv/messages.po
+++ /dev/null
@@ -1,76 +0,0 @@
-# ADDON newmemberwidget
-# Copyright (C)
-# This file is distributed under the same license as the Friendica newmemberwidget addon package.
-# 
-# 
-# Translators:
-# Kristoffer Grundström <lovaren@gmail.com>, 2022
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-06-03 15:50-0400\n"
-"PO-Revision-Date: 2014-06-23 10:26+0000\n"
-"Last-Translator: Kristoffer Grundström <lovaren@gmail.com>, 2022\n"
-"Language-Team: Swedish (http://app.transifex.com/Friendica/friendica/language/sv/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: sv\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: newmemberwidget.php:29
-msgid "New Member"
-msgstr "Ny medlem"
-
-#: newmemberwidget.php:30
-msgid "Tips for New Members"
-msgstr "Tips för nya medlemmar"
-
-#: newmemberwidget.php:33
-msgid "Global Support Group"
-msgstr ""
-
-#: newmemberwidget.php:37
-msgid "Local Support Group"
-msgstr ""
-
-#: newmemberwidget.php:62
-msgid "Save Settings"
-msgstr "Spara inställningar"
-
-#: newmemberwidget.php:63
-msgid "Message"
-msgstr "Meddelande"
-
-#: newmemberwidget.php:63
-msgid "Your message for new members. You can use bbcode here."
-msgstr ""
-
-#: newmemberwidget.php:64
-msgid "Add a link to global support group"
-msgstr ""
-
-#: newmemberwidget.php:64
-msgid "Should a link to the global support group be displayed?"
-msgstr ""
-
-#: newmemberwidget.php:65
-msgid "Add a link to the local support group"
-msgstr ""
-
-#: newmemberwidget.php:65
-msgid ""
-"If you have a local support group and want to have a link displayed in the "
-"widget, check this box."
-msgstr ""
-
-#: newmemberwidget.php:66
-msgid "Name of the local support group"
-msgstr ""
-
-#: newmemberwidget.php:66
-msgid ""
-"If you checked the above, specify the <em>nickname</em> of the local support"
-" group here (i.e. helpers)"
-msgstr ""
diff --git a/newmemberwidget/lang/sv/strings.php b/newmemberwidget/lang/sv/strings.php
deleted file mode 100644
index e92a428f..00000000
--- a/newmemberwidget/lang/sv/strings.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_sv")) {
-function string_plural_select_sv($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['New Member'] = 'Ny medlem';
-$a->strings['Tips for New Members'] = 'Tips för nya medlemmar';
-$a->strings['Save Settings'] = 'Spara inställningar';
-$a->strings['Message'] = 'Meddelande';
diff --git a/newmemberwidget/newmemberwidget.php b/newmemberwidget/newmemberwidget.php
index 01977d0c..c8d1ccf9 100644
--- a/newmemberwidget/newmemberwidget.php
+++ b/newmemberwidget/newmemberwidget.php
@@ -1,69 +1,77 @@
 <?php
 /***
  * Name: New Member Widget
- * Description: Adds a widget for new members into the sidebar of the network page. The widget will be displayed for the first 14 days of an account's existence and contains a link to the new member page and free-form text the admin can define.
+ * Description: Adds a widget for new members into the sidebar of the network page. The widget will be displayed for the 1st 14days of a account existance and contains a link to the new member page and a free-form text the admin can define.
  * Version: 1
  * Author: Tobias Diekershoff <https://f.diekershoff.de/profile/tobias>
  ***/
 
-use Friendica\App;
 use Friendica\Content\Text\BBCode;
+use Friendica\Core\Config;
 use Friendica\Core\Hook;
+use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
-use Friendica\DI;
-use Friendica\Model\User;
+use Friendica\Util\Strings;
 
 function newmemberwidget_install()
 {
 	Hook::register( 'network_mod_init', 'addon/newmemberwidget/newmemberwidget.php', 'newmemberwidget_network_mod_init');
-	Logger::notice('newmemberwidget installed');
+	Logger::log('newmemberwidget installed');
 }
 
-function newmemberwidget_network_mod_init ($b)
+function newmemberwidget_uninstall()
+{
+	Hook::unregister( 'network_mod_init', 'addon/newmemberwidget/newmemberwidget.php', 'newmemberwidget_network_mod_init');
+}
+
+function newmemberwidget_network_mod_init ($a, $b)
 {
 	if (empty($_SESSION['new_member'])) {
 		return;
 	}
 
-	$t = '<div id="newmember_widget" class="widget">';
-	$t .= '<h3>'.DI::l10n()->t('New Member').'</h3>';
-	$t .= '<a href="newmember" id="newmemberwidget-tips">' . DI::l10n()->t('Tips for New Members') . '</a><br />';
+	$t = '<div id="newmember_widget" class="widget">'.EOL;
+	$t .= '<h3>'.L10n::t('New Member').'</h3>'.EOL;
+	$t .= '<a href="newmember" id="newmemberwidget-tips">' . L10n::t('Tips for New Members') . '</a><br />'.EOL;
 
-	if (DI::config()->get('newmemberwidget','linkglobalsupport', false)) {
-		$t .= '<a href="https://forum.friendi.ca/profile/helpers" target="_new">' . DI::l10n()->t('Global Support Group') . '</a><br />';
+	if (Config::get('newmemberwidget','linkglobalsupport', false)) {
+		$t .= '<a href="https://forum.friendi.ca/profile/helpers" target="_new">'.L10n::t('Global Support Forum').'</a><br />'.EOL;
 	}
 
-	if (DI::config()->get('newmemberwidget','linklocalsupport', false)) {
-		$t .= '<a href="' . DI::baseUrl() . '/profile/' . DI::config()->get('newmemberwidget', 'localsupport') . '" target="_new">' . DI::l10n()->t('Local Support Group') . '</a><br />';
+	if (Config::get('newmemberwidget','linklocalsupport', false)) {
+		$t .= '<a href="'.$a->getBaseURL().'/profile/'.Config::get('newmemberwidget','localsupport').'" target="_new">'.L10n::t('Local Support Forum').'</a><br />'.EOL;
 	}
 
-	$ft = DI::config()->get('newmemberwidget','freetext', '');
+	$ft = Config::get('newmemberwidget','freetext', '');
 	if (!empty($ft)) {
-		$t .= '<p>'.BBCode::convertForUriId(User::getSystemUriId(), trim($ft)).'</p>';
+		$t .= '<p>'.BBCode::convert(trim($ft)).'</p>';
 	}
 
 	$t .= '</div><div class="clear"></div>';
-	DI::page()['aside'] = $t . DI::page()['aside'];
+	$a->page['aside'] = $t . $a->page['aside'];
 }
 
-function newmemberwidget_addon_admin_post()
+function newmemberwidget_addon_admin_post(&$a)
 {
-	DI::config()->set('newmemberwidget', 'freetext',           (!empty($_POST['freetext']) ? trim($_POST['freetext']) : ""));
-	DI::config()->set('newmemberwidget', 'linkglobalsupport',  intval($_POST['linkglobalsupport']));
-	DI::config()->set('newmemberwidget', 'linklocalsupport',   intval($_POST['linklocalsupport']));
-	DI::config()->set('newmemberwidget', 'localsupport',       trim($_POST['localsupportname'] ?? ''));
+	$ft = (!empty($_POST['freetext']) ? trim($_POST['freetext']) : "");
+	$lsn = (!empty($_POST['localsupportname']) ? Strings::escapeTags(trim($_POST['localsupportname'])) : "");
+	$gs = intval($_POST['linkglobalsupport']);
+	$ls = intval($_POST['linklocalsupport']);
+	Config::set('newmemberwidget', 'freetext',           trim($ft));
+	Config::set('newmemberwidget', 'linkglobalsupport',  $gs);
+	Config::set('newmemberwidget', 'linklocalsupport',   $ls);
+	Config::set('newmemberwidget', 'localsupport',       trim($lsn));
 }
 
-function newmemberwidget_addon_admin(string &$o)
+function newmemberwidget_addon_admin(&$a, &$o)
 {
 	$t = Renderer::getMarkupTemplate('admin.tpl', 'addon/newmemberwidget');
-
 	$o = Renderer::replaceMacros($t, [
-		'$submit' => DI::l10n()->t('Save Settings'),
-		'$freetext' => ["freetext", DI::l10n()->t("Message"), DI::config()->get("newmemberwidget", "freetext"), DI::l10n()->t("Your message for new members. You can use bbcode here.")],
-		'$linkglobalsupport' => ["linkglobalsupport", DI::l10n()->t('Add a link to global support group'), DI::config()->get('newmemberwidget', 'linkglobalsupport'), DI::l10n()->t('Should a link to the global support group be displayed?')." (<a href='https://forum.friendi.ca/profile/helpers'>@helpers</a>)"],
-		'$linklocalsupport' => ["linklocalsupport", DI::l10n()->t('Add a link to the local support group'), DI::config()->get('newmemberwidget', 'linklocalsupport'), DI::l10n()->t('If you have a local support group and want to have a link displayed in the widget, check this box.')],
-		'$localsupportname' => ["localsupportname", DI::l10n()->t('Name of the local support group'), DI::config()->get('newmemberwidget', 'localsupport'), DI::l10n()->t('If you checked the above, specify the <em>nickname</em> of the local support group here (i.e. helpers)')],
+	'$submit' => L10n::t('Save Settings'),
+	'$freetext' => [ "freetext", L10n::t("Message"), Config::get("newmemberwidget", "freetext"), L10n::t("Your message for new members. You can use bbcode here.")],
+	'$linkglobalsupport' => [ "linkglobalsupport", L10n::t('Add a link to global support forum'), Config::get('newmemberwidget', 'linkglobalsupport'), L10n::t('Should a link to the global support forum be displayed?')." (<a href='https://forum.friendi.ca/profile/helpers'>@helpers</a>)"],
+	'$linklocalsupport' => [ "linklocalsupport", L10n::t('Add a link to the local support forum'), Config::get('newmemberwidget', 'linklocalsupport'), L10n::t('If you have a local support forum and want to have a link displayed in the widget, check this box.')],
+	'$localsupportname' => [ "localsupportname", L10n::t('Name of the local support group'), Config::get('newmemberwidget', 'localsupport'), L10n::t('If you checked the above, specify the <em>nickname</em> of the local support group here (i.e. helpers)')],
 	]);
 }
diff --git a/nitter/LICENSE b/nitter/LICENSE
deleted file mode 100644
index 69d75892..00000000
--- a/nitter/LICENSE
+++ /dev/null
@@ -1,7 +0,0 @@
-Copyright 2020 Tobias Diekershoff
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/nitter/README.md b/nitter/README.md
deleted file mode 100644
index 24b10798..00000000
--- a/nitter/README.md
+++ /dev/null
@@ -1,30 +0,0 @@
-nitter Addon for Friendica
-==========================
-
-This addon will replace all occurances of the string _https://twitter.com_ with the server address of a nitter installation in all displayed postings on a Friendica node.
-
-Note: If you are using the twitter connector on your server, the links to the contacts profile pages will not be replaced by this addon. Only links in the body of the postings are affected.
-
-Nitter sources can be found on [github.com](https://github.com/zedeus/nitter) it is released unter the AGPLv3 or later.
-
-Why
----
-
-Excerp from nitters about page.
-
-> It's basically impossible to use Twitter without JavaScript enabled. If you try, you're redirected to the legacy mobile version which is awful both functionally and aesthetically. For privacy-minded folks, preventing JavaScript analytics and potential IP-based tracking is important, but apart from using the legacy mobile version and a VPN, it's impossible.
->
-> Using an instance of Nitter (hosted on a VPS for example), you can browse Twitter without JavaScript while retaining your privacy. In addition to respecting your privacy, Nitter is on average around 15 times lighter than Twitter, and in some cases serves pages faster.
->
-> In the future a simple account system will be added that lets you follow Twitter users, allowing you to have a clean chronological timeline without needing a Twitter account.
-
-Changelog
----------
-
-* **Version 2.0**
-  * Changes the used hook by the addon, so that attached previews of postings get replaced as well.
-    This means the admins need to reload the addon
-* **Version 1.1**
-  * Initial localization support with DE translation
-  * Configurable nitter instance address from the admin panel
-* **Version 1.0**: Initial Release
diff --git a/nitter/lang/C/messages.po b/nitter/lang/C/messages.po
deleted file mode 100644
index 34bd12a9..00000000
--- a/nitter/lang/C/messages.po
+++ /dev/null
@@ -1,39 +0,0 @@
-# ADDON nitter
-# Copyright (C) 
-# This file is distributed under the same license as the Friendica nitter addon package.
-# 
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-12-13 17:26+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: nitter.php:51
-#, php-format
-msgid ""
-"Which nitter server shall be used for the replacements in the post bodies? "
-"Use the URL with servername and protocol.  See %s for a list of available "
-"public Nitter servers."
-msgstr ""
-
-#: nitter.php:52
-msgid "Nitter server"
-msgstr ""
-
-#: nitter.php:53
-msgid "Save Settings"
-msgstr ""
-
-#: nitter.php:74
-#, php-format
-msgid "(Nitter addon enabled: Twitter links via %s)"
-msgstr ""
diff --git a/nitter/lang/ar/messages.po b/nitter/lang/ar/messages.po
deleted file mode 100644
index 83bd4c11..00000000
--- a/nitter/lang/ar/messages.po
+++ /dev/null
@@ -1,45 +0,0 @@
-# ADDON nitter
-# Copyright (C)
-# This file is distributed under the same license as the Friendica nitter addon package.
-# 
-# 
-# Translators:
-# ButterflyOfFire, 2022
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-10-01 16:10+0200\n"
-"PO-Revision-Date: 2021-05-21 12:58+0000\n"
-"Last-Translator: ButterflyOfFire, 2022\n"
-"Language-Team: Arabic (https://www.transifex.com/Friendica/teams/12172/ar/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ar\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-
-#: nitter.php:52
-#, php-format
-msgid ""
-"Which nitter server shall be used for the replacements in the post bodies? "
-"Use the URL with servername and protocol.  See %s for a list of available "
-"public Nitter servers."
-msgstr ""
-
-#: nitter.php:53
-msgid "Nitter server"
-msgstr "خادم Nitter"
-
-#: nitter.php:54
-msgid "Save Settings"
-msgstr "احفظ الإعدادات"
-
-#: nitter.php:99
-#, php-format
-msgid ""
-"In an attempt to protect your privacy, links to Twitter in this posting were"
-" replaced by links to the Nitter instance at %s"
-msgstr ""
diff --git a/nitter/lang/ar/strings.php b/nitter/lang/ar/strings.php
deleted file mode 100644
index 850cee90..00000000
--- a/nitter/lang/ar/strings.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_ar")) {
-function string_plural_select_ar($n){
-	$n = intval($n);
-	if ($n==0) { return 0; } else if ($n==1) { return 1; } else if ($n==2) { return 2; } else if ($n%100>=3 && $n%100<=10) { return 3; } else if ($n%100>=11 && $n%100<=99) { return 4; } else  { return 5; }
-}}
-$a->strings['Nitter server'] = 'خادم Nitter';
-$a->strings['Save Settings'] = 'احفظ الإعدادات';
diff --git a/nitter/lang/de/messages.po b/nitter/lang/de/messages.po
deleted file mode 100644
index ba95c1a2..00000000
--- a/nitter/lang/de/messages.po
+++ /dev/null
@@ -1,50 +0,0 @@
-# ADDON nitter
-# Copyright (C)
-# This file is distributed under the same license as the Friendica nitter addon package.
-# 
-# 
-# Translators:
-# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2021
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-10-01 16:10+0200\n"
-"PO-Revision-Date: 2021-05-21 12:58+0000\n"
-"Last-Translator: Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2021\n"
-"Language-Team: German (https://www.transifex.com/Friendica/teams/12172/de/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: de\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: nitter.php:52
-#, php-format
-msgid ""
-"Which nitter server shall be used for the replacements in the post bodies? "
-"Use the URL with servername and protocol.  See %s for a list of available "
-"public Nitter servers."
-msgstr ""
-"Welcher Nitter server soll für die Ersetzungen verwendet werden? Gib die URL"
-" mit Servername und Protokoll an. Eine Liste von öffentlichen Nitter servern"
-" findest du unter %s."
-
-#: nitter.php:53
-msgid "Nitter server"
-msgstr "Nitter Server"
-
-#: nitter.php:54
-msgid "Save Settings"
-msgstr "Einstellungen Speichern"
-
-#: nitter.php:99
-#, php-format
-msgid ""
-"In an attempt to protect your privacy, links to Twitter in this posting were"
-" replaced by links to the Nitter instance at %s"
-msgstr ""
-"Um deine Privatsphäre zu schützen, wurden in diesem Beitrag Links nach "
-"twitter.com durch die Nitter Instanz auf %s ersetzt."
diff --git a/nitter/lang/de/strings.php b/nitter/lang/de/strings.php
deleted file mode 100644
index da3fe82d..00000000
--- a/nitter/lang/de/strings.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_de")) {
-function string_plural_select_de($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Which nitter server shall be used for the replacements in the post bodies? Use the URL with servername and protocol.  See %s for a list of available public Nitter servers.'] = 'Welcher Nitter server soll für die Ersetzungen verwendet werden? Gib die URL mit Servername und Protokoll an. Eine Liste von öffentlichen Nitter servern findest du unter %s.';
-$a->strings['Nitter server'] = 'Nitter Server';
-$a->strings['Save Settings'] = 'Einstellungen Speichern';
-$a->strings['In an attempt to protect your privacy, links to Twitter in this posting were replaced by links to the Nitter instance at %s'] = 'Um deine Privatsphäre zu schützen, wurden in diesem Beitrag Links nach twitter.com durch die Nitter Instanz auf %s ersetzt.';
diff --git a/nitter/lang/hu/messages.po b/nitter/lang/hu/messages.po
deleted file mode 100644
index 6177bf39..00000000
--- a/nitter/lang/hu/messages.po
+++ /dev/null
@@ -1,50 +0,0 @@
-# ADDON nitter
-# Copyright (C)
-# This file is distributed under the same license as the Friendica nitter addon package.
-# 
-# 
-# Translators:
-# Balázs Úr, 2021
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-08 07:44+0100\n"
-"PO-Revision-Date: 2021-05-21 12:58+0000\n"
-"Last-Translator: Balázs Úr, 2021\n"
-"Language-Team: Hungarian (https://www.transifex.com/Friendica/teams/12172/hu/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: hu\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: nitter.php:51
-#, php-format
-msgid ""
-"Which nitter server shall be used for the replacements in the post bodies? "
-"Use the URL with servername and protocol.  See %s for a list of available "
-"public Nitter servers."
-msgstr ""
-"Melyik Nitter-kiszolgálót kell használni a bejegyzések törzseiben történő "
-"cserékhez? Az URL-t kiszolgálónévvel és protokollal használja. Az elérhető "
-"nyilvános Nitter-kiszolgálók listájáért nézze meg a %s oldalt."
-
-#: nitter.php:52
-msgid "Nitter server"
-msgstr "Nitter-kiszolgáló"
-
-#: nitter.php:53
-msgid "Save Settings"
-msgstr "Beállítások mentése"
-
-#: nitter.php:65
-#, php-format
-msgid ""
-"Links to Twitter in this posting were replaced by links to the Nitter "
-"instance at %s"
-msgstr ""
-"Ebben a bejegyzésben a Twitterre mutató hivatkozások ki lettek cserélve a %s"
-" címen elérhető Nitter-példányra mutató hivatkozásokkal."
diff --git a/nitter/lang/hu/strings.php b/nitter/lang/hu/strings.php
deleted file mode 100644
index a3a21333..00000000
--- a/nitter/lang/hu/strings.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_hu")) {
-function string_plural_select_hu($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Which nitter server shall be used for the replacements in the post bodies? Use the URL with servername and protocol.  See %s for a list of available public Nitter servers.'] = 'Melyik Nitter-kiszolgálót kell használni a bejegyzések törzseiben történő cserékhez? Az URL-t kiszolgálónévvel és protokollal használja. Az elérhető nyilvános Nitter-kiszolgálók listájáért nézze meg a %s oldalt.';
-$a->strings['Nitter server'] = 'Nitter-kiszolgáló';
-$a->strings['Save Settings'] = 'Beállítások mentése';
-$a->strings['Links to Twitter in this posting were replaced by links to the Nitter instance at %s'] = 'Ebben a bejegyzésben a Twitterre mutató hivatkozások ki lettek cserélve a %s címen elérhető Nitter-példányra mutató hivatkozásokkal.';
diff --git a/nitter/lang/ja/messages.po b/nitter/lang/ja/messages.po
deleted file mode 100644
index 920c0963..00000000
--- a/nitter/lang/ja/messages.po
+++ /dev/null
@@ -1,46 +0,0 @@
-# ADDON nitter
-# Copyright (C)
-# This file is distributed under the same license as the Friendica nitter addon package.
-# 
-# 
-# Translators:
-# XMPPはいいぞ, 2021
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-03-08 07:44+0100\n"
-"PO-Revision-Date: 2021-05-21 12:58+0000\n"
-"Last-Translator: XMPPはいいぞ, 2021\n"
-"Language-Team: Japanese (https://www.transifex.com/Friendica/teams/12172/ja/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ja\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-
-#: nitter.php:51
-#, php-format
-msgid ""
-"Which nitter server shall be used for the replacements in the post bodies? "
-"Use the URL with servername and protocol.  See %s for a list of available "
-"public Nitter servers."
-msgstr ""
-"投稿本文の置換には、どのnitterサーバーを使用しますか？サーバー名とプロトコルを記載したURLを使用します。公開されているNitterサーバーの一覧は%sをご覧ください。"
-
-#: nitter.php:52
-msgid "Nitter server"
-msgstr "Nitterサーバー"
-
-#: nitter.php:53
-msgid "Save Settings"
-msgstr "設定を保存"
-
-#: nitter.php:65
-#, php-format
-msgid ""
-"Links to Twitter in this posting were replaced by links to the Nitter "
-"instance at %s"
-msgstr "この投稿のTwitterへのリンクは、%sのNitterインスタンスへのリンクに置換されました"
diff --git a/nitter/lang/ja/strings.php b/nitter/lang/ja/strings.php
deleted file mode 100644
index 30b9cb10..00000000
--- a/nitter/lang/ja/strings.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_ja")) {
-function string_plural_select_ja($n){
-	$n = intval($n);
-	return intval(0);
-}}
-$a->strings['Which nitter server shall be used for the replacements in the post bodies? Use the URL with servername and protocol.  See %s for a list of available public Nitter servers.'] = '投稿本文の置換には、どのnitterサーバーを使用しますか？サーバー名とプロトコルを記載したURLを使用します。公開されているNitterサーバーの一覧は%sをご覧ください。';
-$a->strings['Nitter server'] = 'Nitterサーバー';
-$a->strings['Save Settings'] = '設定を保存';
-$a->strings['Links to Twitter in this posting were replaced by links to the Nitter instance at %s'] = 'この投稿のTwitterへのリンクは、%sのNitterインスタンスへのリンクに置換されました';
diff --git a/nitter/nitter.php b/nitter/nitter.php
deleted file mode 100644
index 946b18c0..00000000
--- a/nitter/nitter.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-/*
- * Name: nitter
- * Description: Replaces links to twitter.com to a nitter server in all displays of postings on a node.
- * Version: 2.0
- * Author: Tobias Diekershoff <tobias@social.diekershoff.de>
- * Status: Unsupported
- * Note: Please use the URL Replace addon instead
- *
- * Copyright (c) 2020 Tobias Diekershoff
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
- * associated documentation files (the "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or substantial
- * portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT
- * NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-use Friendica\App;
-use Friendica\Core\Hook;
-use Friendica\Core\Renderer;
-use Friendica\DI;
-
-function nitter_install()
-{
-	Hook::register('prepare_body_final', 'addon/nitter/nitter.php', 'nitter_render');
-}
-
-/* Handle the send data from the admin settings
- */
-function nitter_addon_admin_post()
-{
-	DI::config()->set('nitter', 'server', rtrim(trim($_POST['nitterserver']), '/'));
-}
-
-/* Hook into the admin settings to let the admin choose a
- * nitter server to use for the replacement.
- */
-function nitter_addon_admin(string &$o)
-{
-	$nitterserver = DI::config()->get('nitter', 'server');
-	$t = Renderer::getMarkupTemplate('admin.tpl', 'addon/nitter/');
-	$o = Renderer::replaceMacros($t, [
-		'$settingdescription' => DI::l10n()->t('Which nitter server shall be used for the replacements in the post bodies? Use the URL with servername and protocol.  See %s for a list of available public Nitter servers.', 'https://github.com/zedeus/nitter/wiki/Instances'),
-		'$nitterserver' => ['nitterserver', DI::l10n()->t('Nitter server'), $nitterserver, 'https://example.com'],
-		'$submit' => DI::l10n()->t('Save Settings'),
-	]);
-}
-
-/*
- *  replace "twitter.com" with "nitter.net"
- */
-function nitter_render(array &$b)
-{
-	// this needs to be a system setting
-	$replaced = false;
-	$nitter = DI::config()->get('nitter', 'server', 'https://nitter.net');
-	if (strstr($b['html'], 'https://mobile.twitter.com')) {
-		$b['html'] = str_replace('https://mobile.twitter.com', $nitter, $b['html']);
-		$replaced = true;
-	}
-	if (strstr($b['html'], 'https://twitter.com')) {
-		$b['html'] = str_replace('https://twitter.com', $nitter, $b['html']);
-		$replaced = true;
-	}
-	if ($replaced) {
-		$b['html'] .= '<hr><p><small>' . DI::l10n()->t('(Nitter addon enabled: Twitter links via %s)', $nitter) . '</small></p>';
-	}
-}
diff --git a/nitter/templates/admin.tpl b/nitter/templates/admin.tpl
deleted file mode 100644
index b7f02421..00000000
--- a/nitter/templates/admin.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-<p>{{$settingdescription}}</p>
-
-{{include file="field_input.tpl" field=$nitterserver}}
-
-<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
diff --git a/nominatim/nominatim.php b/nominatim/nominatim.php
deleted file mode 100644
index 6ad4a8a3..00000000
--- a/nominatim/nominatim.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-/**
- * Name: Nominatim
- * Description: Use Nominatim from OpenStreetMap to resolve the location for the given latitude and longitude. Derived from "geocoordinates"
- * Version: 0.1
- * Author: Michael Vogel <https://pirati.ca/profile/heluecht>
- */
-
-use Friendica\App;
-use Friendica\Core\Hook;
-use Friendica\Core\Logger;
-use Friendica\Core\Renderer;
-use Friendica\DI;
-
-function nominatim_install()
-{
-	Hook::register('post_local', 'addon/nominatim/nominatim.php', 'nominatim_post_hook');
-	Hook::register('post_remote', 'addon/nominatim/nominatim.php', 'nominatim_post_hook');
-}
-
-function nominatim_resolve_item(array &$item)
-{
-	if(empty($item['coord']) || !empty($item['location'])) {
-		return;
-	}
-
-	$language = DI::config()->get('nominatim', 'language');
-	if (empty($language)) {
-		$language = 'en';
-	}
-
-	$coords = explode(' ',$item['coord']);
-
-	if (count($coords) < 2) {
-		return;
-	}
-
-	$coords[0] = round($coords[0], 5);
-	$coords[1] = round($coords[1], 5);
-
-	$result = DI::cache()->get('nominatim:' . $language . ':' . $coords[0] . '-' . $coords[1]);
-	if (!is_null($result)) {
-		$item['location'] = $result;
-		return;
-	}
-
-	$s = DI::httpClient()->fetch('https://nominatim.openstreetmap.org/reverse?lat=' . $coords[0] . '&lon=' . $coords[1] . '&format=json&addressdetails=0&accept-language=' . $language);
-	if (empty($s)) {
-		Logger::info('API could not be queried');
-		return;
-	}
-
-	$data = json_decode($s, true);
-	if (empty($data['display_name'])) {
-		Logger::info('No results found for coordinates', ['coordinates' => $item['coord'], 'data' => $data]);
-		return;
-	}
-
-	$item['location'] = $data['display_name'];
-
-	Logger::info('Got location', ['lat' => $coords[0], 'long' => $coords[1], 'location' => $item['location']]);
-
-	if (!empty($item['location'])) {
-		DI::cache()->set('nominatim:' . $language . ':' . $coords[0] . '-' . $coords[1], $item['location']);
-	}
-}
-
-function nominatim_post_hook(array &$item)
-{
-	nominatim_resolve_item($item);
-}
-
-function nominatim_addon_admin(string &$o)
-{
-
-	$t = Renderer::getMarkupTemplate('admin.tpl', 'addon/nominatim/');
-
-	$o = Renderer::replaceMacros($t, [
-		'$submit' => DI::l10n()->t('Save Settings'),
-		'$language' => ['language', DI::l10n()->t('Language code (IETF format)'), DI::config()->get('nominatim', 'language'), ''],
-	]);
-}
-
-function nominatim_addon_admin_post()
-{
-	DI::config()->set('nominatim', 'language', (!empty($_POST['language']) ? trim($_POST['language']) : ''));
-}
diff --git a/nominatim/templates/admin.tpl b/nominatim/templates/admin.tpl
deleted file mode 100644
index 12dbf27f..00000000
--- a/nominatim/templates/admin.tpl
+++ /dev/null
@@ -1,2 +0,0 @@
-{{include file="field_input.tpl" field=$language}}
-<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
diff --git a/notifyall/NotifyAllEmail.php b/notifyall/NotifyAllEmail.php
deleted file mode 100644
index 7a00a2c9..00000000
--- a/notifyall/NotifyAllEmail.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-/**
- * @copyright Copyright (C) 2020, Friendica
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- *
- */
-
-namespace Friendica\Addon\notifyall;
-
-use Friendica\App\BaseURL;
-use Friendica\Content\Text\BBCode;
-use Friendica\Core\Config\Capability\IManageConfigValues;
-use Friendica\Core\L10n;
-use Friendica\Model\User;
-use Friendica\Object\Email;
-
-/**
- * Class for creating a Notify-All EMail
- */
-class NotifyAllEmail extends Email
-{
-	public function __construct(L10n $l10n, IManageConfigValues $config, BaseURL $baseUrl, string $text)
-	{
-		$sitename = $config->get('config', 'sitename');
-
-		if (empty($config->get('config', 'admin_name'))) {
-			$sender_name = '"' . $l10n->t('%s Administrator', $sitename) . '"';
-		} else {
-			$sender_name = '"' . $l10n->t('%1$s, %2$s Administrator', $config->get('config', 'admin_name'), $sitename) . '"';
-		}
-
-		if (!$config->get('config', 'sender_email')) {
-			$sender_email = 'noreply@' . $baseUrl->getHost();
-		} else {
-			$sender_email = $config->get('config', 'sender_email');
-		}
-
-		$subject = $_REQUEST['subject'];
-
-		$textversion = strip_tags(html_entity_decode(BBCode::convertForUriId(User::getSystemUriId(), stripslashes(str_replace(["\\r", "\\n"], ["", "\n"], $text))), ENT_QUOTES, 'UTF-8'));
-
-		$htmlversion = BBCode::convertForUriId(User::getSystemUriId(), stripslashes(str_replace(["\\r", "\\n"], ["", "<br />\n"], $text)));
-
-		parent::__construct($sender_name, $sender_email, $sender_email, '', $subject, $htmlversion, $textversion);
-	}
-}
diff --git a/notifyall/lang/C/messages.po b/notifyall/lang/C/messages.po
index 81f2d784..66e2a4d2 100644
--- a/notifyall/lang/C/messages.po
+++ b/notifyall/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
+"POT-Creation-Date: 2016-08-14 16:41+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,40 +17,40 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: NotifyAllEmail.php:40
+#: notifyall.php:26
+msgid "Send email to all members"
+msgstr ""
+
+#: notifyall.php:42
 #, php-format
 msgid "%s Administrator"
 msgstr ""
 
-#: NotifyAllEmail.php:42
+#: notifyall.php:44
 #, php-format
 msgid "%1$s, %2$s Administrator"
 msgstr ""
 
-#: notifyall.php:22
-msgid "Send email to all members"
-msgstr ""
-
-#: notifyall.php:49
+#: notifyall.php:60
 msgid "No recipients found."
 msgstr ""
 
-#: notifyall.php:59
+#: notifyall.php:78
 msgid "Emails sent"
 msgstr ""
 
-#: notifyall.php:69
+#: notifyall.php:86
 msgid "Send email to all members of this Friendica instance."
 msgstr ""
 
-#: notifyall.php:74
+#: notifyall.php:91
 msgid "Message subject"
 msgstr ""
 
-#: notifyall.php:75
+#: notifyall.php:92
 msgid "Test mode (only send to administrator)"
 msgstr ""
 
-#: notifyall.php:76
+#: notifyall.php:93
 msgid "Submit"
 msgstr ""
diff --git a/notifyall/lang/ar/messages.po b/notifyall/lang/ar/messages.po
deleted file mode 100644
index c8eb4228..00000000
--- a/notifyall/lang/ar/messages.po
+++ /dev/null
@@ -1,56 +0,0 @@
-# ADDON notifyall
-# Copyright (C)
-# This file is distributed under the same license as the Friendica notifyall addon package.
-# 
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2016-08-14 19:29+0000\n"
-"Language-Team: Arabic (https://www.transifex.com/Friendica/teams/12172/ar/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ar\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-
-#: NotifyAllEmail.php:40
-#, php-format
-msgid "%s Administrator"
-msgstr ""
-
-#: NotifyAllEmail.php:42
-#, php-format
-msgid "%1$s, %2$s Administrator"
-msgstr ""
-
-#: notifyall.php:22
-msgid "Send email to all members"
-msgstr ""
-
-#: notifyall.php:49
-msgid "No recipients found."
-msgstr ""
-
-#: notifyall.php:59
-msgid "Emails sent"
-msgstr ""
-
-#: notifyall.php:69
-msgid "Send email to all members of this Friendica instance."
-msgstr ""
-
-#: notifyall.php:74
-msgid "Message subject"
-msgstr ""
-
-#: notifyall.php:75
-msgid "Test mode (only send to administrator)"
-msgstr ""
-
-#: notifyall.php:76
-msgid "Submit"
-msgstr ""
diff --git a/notifyall/lang/ar/strings.php b/notifyall/lang/ar/strings.php
deleted file mode 100644
index eea34dd6..00000000
--- a/notifyall/lang/ar/strings.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_ar")) {
-function string_plural_select_ar($n){
-	$n = intval($n);
-	if ($n==0) { return 0; } else if ($n==1) { return 1; } else if ($n==2) { return 2; } else if ($n%100>=3 && $n%100<=10) { return 3; } else if ($n%100>=11 && $n%100<=99) { return 4; } else  { return 5; }
-}}
diff --git a/notifyall/lang/cs/strings.php b/notifyall/lang/cs/strings.php
index 3b53ab60..e01528ce 100644
--- a/notifyall/lang/cs/strings.php
+++ b/notifyall/lang/cs/strings.php
@@ -3,14 +3,15 @@
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
 	$n = intval($n);
-	if (($n == 1 && $n % 1 == 0)) { return 0; } else if (($n >= 2 && $n <= 4 && $n % 1 == 0)) { return 1; } else if (($n % 1 != 0 )) { return 2; } else  { return 3; }
+	return ($n == 1 && $n % 1 == 0) ? 0 : ($n >= 2 && $n <= 4 && $n % 1 == 0) ? 1: ($n % 1 != 0 ) ? 2 : 3;;
 }}
-$a->strings['Send email to all members'] = 'Odeslat e-mail všem členům';
-$a->strings['%s Administrator'] = '%s Administrátor';
-$a->strings['%1$s, %2$s Administrator'] = '%1$s, %2$s Administrátor';
-$a->strings['No recipients found.'] = 'Nenalezeni žádní příjemci.';
-$a->strings['Emails sent'] = 'E-maily odeslány';
-$a->strings['Send email to all members of this Friendica instance.'] = 'Odeslat e-mail všem členům této instance Friendica.';
-$a->strings['Message subject'] = 'Předmět zprávy';
-$a->strings['Test mode (only send to administrator)'] = 'Testovací režim (odeslat pouze administrátorovi)';
-$a->strings['Submit'] = 'Odeslat';
+;
+$a->strings["Send email to all members"] = "Odeslat e-mail všem členům";
+$a->strings["%s Administrator"] = "%s Administrátor";
+$a->strings["%1\$s, %2\$s Administrator"] = "%1\$s, %2\$s Administrátor";
+$a->strings["No recipients found."] = "Nenalezeni žádní příjemci.";
+$a->strings["Emails sent"] = "E-maily odeslány";
+$a->strings["Send email to all members of this Friendica instance."] = "Odeslat e-mail všem členům této instance Friendica.";
+$a->strings["Message subject"] = "Předmět zprávy";
+$a->strings["Test mode (only send to administrator)"] = "Testovací režim (odeslat pouze administrátorovi)";
+$a->strings["Submit"] = "Odeslat";
diff --git a/notifyall/lang/da-dk/messages.po b/notifyall/lang/da-dk/messages.po
deleted file mode 100644
index 5fb47263..00000000
--- a/notifyall/lang/da-dk/messages.po
+++ /dev/null
@@ -1,60 +0,0 @@
-# ADDON notifyall
-# Copyright (C)
-# This file is distributed under the same license as the Friendica notifyall addon package.
-# 
-# 
-# Translators:
-# Anton <dev@atjn.dk>, 2022
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2016-08-14 19:29+0000\n"
-"Last-Translator: Anton <dev@atjn.dk>, 2022\n"
-"Language-Team: Danish (Denmark) (https://www.transifex.com/Friendica/teams/12172/da_DK/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: da_DK\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: NotifyAllEmail.php:40
-#, php-format
-msgid "%s Administrator"
-msgstr "%s Administrator"
-
-#: NotifyAllEmail.php:42
-#, php-format
-msgid "%1$s, %2$s Administrator"
-msgstr "%1$s, %2$s Administrator"
-
-#: notifyall.php:22
-msgid "Send email to all members"
-msgstr "Send email til alle medlemmer"
-
-#: notifyall.php:49
-msgid "No recipients found."
-msgstr "Ingen modtagere fundet."
-
-#: notifyall.php:59
-msgid "Emails sent"
-msgstr "Emails sendt"
-
-#: notifyall.php:69
-msgid "Send email to all members of this Friendica instance."
-msgstr "Send emails til alle medlemmer af denne Friendica instans"
-
-#: notifyall.php:74
-msgid "Message subject"
-msgstr "Beskedemne"
-
-#: notifyall.php:75
-msgid "Test mode (only send to administrator)"
-msgstr "Testtilstand (send kun til administrator)"
-
-#: notifyall.php:76
-msgid "Submit"
-msgstr "Indsend"
diff --git a/notifyall/lang/da-dk/strings.php b/notifyall/lang/da-dk/strings.php
deleted file mode 100644
index 4cafcae1..00000000
--- a/notifyall/lang/da-dk/strings.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_da_dk")) {
-function string_plural_select_da_dk($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['%s Administrator'] = '%s Administrator';
-$a->strings['%1$s, %2$s Administrator'] = '%1$s, %2$s Administrator';
-$a->strings['Send email to all members'] = 'Send email til alle medlemmer';
-$a->strings['No recipients found.'] = 'Ingen modtagere fundet.';
-$a->strings['Emails sent'] = 'Emails sendt';
-$a->strings['Send email to all members of this Friendica instance.'] = 'Send emails til alle medlemmer af denne Friendica instans';
-$a->strings['Message subject'] = 'Beskedemne';
-$a->strings['Test mode (only send to administrator)'] = 'Testtilstand (send kun til administrator)';
-$a->strings['Submit'] = 'Indsend';
diff --git a/notifyall/lang/de/messages.po b/notifyall/lang/de/messages.po
index 372694ef..af0034a9 100644
--- a/notifyall/lang/de/messages.po
+++ b/notifyall/lang/de/messages.po
@@ -3,59 +3,55 @@
 # This file is distributed under the same license as the Friendica notifyall addon package.
 # 
 # 
-# Translators:
-# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2016
-# Ulf Rompe <transifex.com@rompe.org>, 2019
-# 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2016-08-14 19:29+0000\n"
-"Last-Translator: Ulf Rompe <transifex.com@rompe.org>, 2019\n"
-"Language-Team: German (https://app.transifex.com/Friendica/teams/12172/de/)\n"
+"POT-Creation-Date: 2016-08-14 16:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2016\n"
+"Language-Team: German (https://www.transifex.com/Friendica/teams/12172/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: NotifyAllEmail.php:40
+#: notifyall.php:26
+msgid "Send email to all members"
+msgstr "Sende eine E-Mail an alle Nutzer der Seite"
+
+#: notifyall.php:42
 #, php-format
 msgid "%s Administrator"
 msgstr "der Administrator von %s"
 
-#: NotifyAllEmail.php:42
+#: notifyall.php:44
 #, php-format
 msgid "%1$s, %2$s Administrator"
 msgstr "%1$s, %2$s Administrator"
 
-#: notifyall.php:22
-msgid "Send email to all members"
-msgstr "Sende eine E-Mail an alle Nutzer der Seite"
-
-#: notifyall.php:49
+#: notifyall.php:60
 msgid "No recipients found."
 msgstr "Keine Empfänger gefunden"
 
-#: notifyall.php:59
+#: notifyall.php:78
 msgid "Emails sent"
 msgstr "E-Mails gesendet."
 
-#: notifyall.php:69
+#: notifyall.php:86
 msgid "Send email to all members of this Friendica instance."
-msgstr "Sende eine E-Mail an alle Nutzer dieser Friendica-Instanz"
+msgstr "Sende eine E-Mail an alle Nutzer dieser Friendica Instanz"
 
-#: notifyall.php:74
+#: notifyall.php:91
 msgid "Message subject"
 msgstr "Betreff der Nachricht"
 
-#: notifyall.php:75
+#: notifyall.php:92
 msgid "Test mode (only send to administrator)"
-msgstr "Test-Modus (E-Mail nur an den Administrator senden)"
+msgstr "Test Modus (E-Mail nur an den Administrator senden)"
 
-#: notifyall.php:76
+#: notifyall.php:93
 msgid "Submit"
 msgstr "Senden"
diff --git a/notifyall/lang/de/strings.php b/notifyall/lang/de/strings.php
index 418fca5a..9c92b42e 100644
--- a/notifyall/lang/de/strings.php
+++ b/notifyall/lang/de/strings.php
@@ -2,15 +2,15 @@
 
 if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['%s Administrator'] = 'der Administrator von %s';
-$a->strings['%1$s, %2$s Administrator'] = '%1$s, %2$s Administrator';
-$a->strings['Send email to all members'] = 'Sende eine E-Mail an alle Nutzer der Seite';
-$a->strings['No recipients found.'] = 'Keine Empfänger gefunden';
-$a->strings['Emails sent'] = 'E-Mails gesendet.';
-$a->strings['Send email to all members of this Friendica instance.'] = 'Sende eine E-Mail an alle Nutzer dieser Friendica-Instanz';
-$a->strings['Message subject'] = 'Betreff der Nachricht';
-$a->strings['Test mode (only send to administrator)'] = 'Test-Modus (E-Mail nur an den Administrator senden)';
-$a->strings['Submit'] = 'Senden';
+;
+$a->strings["Send email to all members"] = "Sende eine E-Mail an alle Nutzer der Seite";
+$a->strings["%s Administrator"] = "der Administrator von %s";
+$a->strings["%1\$s, %2\$s Administrator"] = "%1\$s, %2\$s Administrator";
+$a->strings["No recipients found."] = "Keine Empfänger gefunden";
+$a->strings["Emails sent"] = "E-Mails gesendet.";
+$a->strings["Send email to all members of this Friendica instance."] = "Sende eine E-Mail an alle Nutzer dieser Friendica Instanz";
+$a->strings["Message subject"] = "Betreff der Nachricht";
+$a->strings["Test mode (only send to administrator)"] = "Test Modus (E-Mail nur an den Administrator senden)";
+$a->strings["Submit"] = "Senden";
diff --git a/notifyall/lang/es/strings.php b/notifyall/lang/es/strings.php
index f02d8dee..312a6acd 100644
--- a/notifyall/lang/es/strings.php
+++ b/notifyall/lang/es/strings.php
@@ -2,15 +2,15 @@
 
 if(! function_exists("string_plural_select_es")) {
 function string_plural_select_es($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Send email to all members'] = 'Enviar email a todos los miembros';
-$a->strings['%s Administrator'] = '%s Administrador';
-$a->strings['%1$s, %2$s Administrator'] = '%1$s, %2$s Administrador';
-$a->strings['No recipients found.'] = 'No se encontraron destinatarios.';
-$a->strings['Emails sent'] = 'Emails enviados';
-$a->strings['Send email to all members of this Friendica instance.'] = 'Enviar email a todos los miembros de esta instancia de Friendica.';
-$a->strings['Message subject'] = 'Tema del mensaje';
-$a->strings['Test mode (only send to administrator)'] = 'Modo de prueba (sólo envíar al administrador)';
-$a->strings['Submit'] = 'Enviar';
+;
+$a->strings["Send email to all members"] = "Enviar email a todos los miembros";
+$a->strings["%s Administrator"] = "%s Administrador";
+$a->strings["%1\$s, %2\$s Administrator"] = "%1\$s, %2\$s Administrador";
+$a->strings["No recipients found."] = "No se encontraron destinatarios.";
+$a->strings["Emails sent"] = "Emails enviados";
+$a->strings["Send email to all members of this Friendica instance."] = "Enviar email a todos los miembros de esta instancia de Friendica.";
+$a->strings["Message subject"] = "Tema del mensaje";
+$a->strings["Test mode (only send to administrator)"] = "Modo de prueba (sólo envíar al administrador)";
+$a->strings["Submit"] = "Enviar";
diff --git a/notifyall/lang/fi-fi/strings.php b/notifyall/lang/fi-fi/strings.php
index 3927bd26..1c467153 100644
--- a/notifyall/lang/fi-fi/strings.php
+++ b/notifyall/lang/fi-fi/strings.php
@@ -3,12 +3,15 @@
 if(! function_exists("string_plural_select_fi_fi")) {
 function string_plural_select_fi_fi($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Send email to all members'] = 'Lähetä sähköposti kaikille jäsenille';
-$a->strings['%s Administrator'] = '%s-ylläpitäjä';
-$a->strings['%1$s, %2$s Administrator'] = '%1$s, %2$s-ylläpitäjä';
-$a->strings['No recipients found.'] = 'Vastaanottajaa ei löytynyt.';
-$a->strings['Emails sent'] = 'Sähköpostit lähetetty';
-$a->strings['Message subject'] = 'Viestin aihe';
-$a->strings['Submit'] = 'Lähetä';
+;
+$a->strings["Send email to all members"] = "Lähetä sähköposti kaikille jäsenille";
+$a->strings["%s Administrator"] = "%s-ylläpitäjä";
+$a->strings["%1\$s, %2\$s Administrator"] = "%1\$s, %2\$s-ylläpitäjä";
+$a->strings["No recipients found."] = "Vastaanottajaa ei löytynyt.";
+$a->strings["Emails sent"] = "Sähköpostit lähetetty";
+$a->strings["Send email to all members of this Friendica instance."] = "";
+$a->strings["Message subject"] = "Viestin aihe";
+$a->strings["Test mode (only send to administrator)"] = "";
+$a->strings["Submit"] = "Lähetä";
diff --git a/notifyall/lang/fr/messages.po b/notifyall/lang/fr/messages.po
index c2db9f63..dbc88aba 100644
--- a/notifyall/lang/fr/messages.po
+++ b/notifyall/lang/fr/messages.po
@@ -3,59 +3,55 @@
 # This file is distributed under the same license as the Friendica notifyall addon package.
 # 
 # 
-# Translators:
-# Thecross, 2017
-# Nicolas Derive, 2022
-# 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2016-08-14 19:29+0000\n"
-"Last-Translator: Nicolas Derive, 2022\n"
+"POT-Creation-Date: 2016-08-14 16:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Thecross <louis1302@hotmail.fr>, 2017\n"
 "Language-Team: French (https://www.transifex.com/Friendica/teams/12172/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fr\n"
-"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: NotifyAllEmail.php:40
-#, php-format
-msgid "%s Administrator"
-msgstr "L'administrateur de %s"
-
-#: NotifyAllEmail.php:42
-#, php-format
-msgid "%1$s, %2$s Administrator"
-msgstr "L'administrateur de %1$s, %2$s."
-
-#: notifyall.php:22
+#: notifyall.php:26
 msgid "Send email to all members"
 msgstr "Envoyer un courriel à tous les membres"
 
-#: notifyall.php:49
+#: notifyall.php:42
+#, php-format
+msgid "%s Administrator"
+msgstr ""
+
+#: notifyall.php:44
+#, php-format
+msgid "%1$s, %2$s Administrator"
+msgstr ""
+
+#: notifyall.php:60
 msgid "No recipients found."
 msgstr "Aucun destinataire trouvé."
 
-#: notifyall.php:59
+#: notifyall.php:78
 msgid "Emails sent"
 msgstr "Courriels envoyés"
 
-#: notifyall.php:69
+#: notifyall.php:86
 msgid "Send email to all members of this Friendica instance."
 msgstr "Envoyer un courriel à tous les membres de cet instance Friendica."
 
-#: notifyall.php:74
+#: notifyall.php:91
 msgid "Message subject"
 msgstr "Objet du message"
 
-#: notifyall.php:75
+#: notifyall.php:92
 msgid "Test mode (only send to administrator)"
 msgstr "Mode test (envoyer uniquement à l'administrateur)"
 
-#: notifyall.php:76
+#: notifyall.php:93
 msgid "Submit"
 msgstr "Envoyer"
diff --git a/notifyall/lang/fr/strings.php b/notifyall/lang/fr/strings.php
index 487f2083..b0fbefa3 100644
--- a/notifyall/lang/fr/strings.php
+++ b/notifyall/lang/fr/strings.php
@@ -2,15 +2,15 @@
 
 if(! function_exists("string_plural_select_fr")) {
 function string_plural_select_fr($n){
-	$n = intval($n);
-	if (($n == 0 || $n == 1)) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
+	return ($n > 1);;
 }}
-$a->strings['%s Administrator'] = 'L\'administrateur de %s';
-$a->strings['%1$s, %2$s Administrator'] = 'L\'administrateur de %1$s, %2$s.';
-$a->strings['Send email to all members'] = 'Envoyer un courriel à tous les membres';
-$a->strings['No recipients found.'] = 'Aucun destinataire trouvé.';
-$a->strings['Emails sent'] = 'Courriels envoyés';
-$a->strings['Send email to all members of this Friendica instance.'] = 'Envoyer un courriel à tous les membres de cet instance Friendica.';
-$a->strings['Message subject'] = 'Objet du message';
-$a->strings['Test mode (only send to administrator)'] = 'Mode test (envoyer uniquement à l\'administrateur)';
-$a->strings['Submit'] = 'Envoyer';
+;
+$a->strings["Send email to all members"] = "Envoyer un courriel à tous les membres";
+$a->strings["%s Administrator"] = "";
+$a->strings["%1\$s, %2\$s Administrator"] = "";
+$a->strings["No recipients found."] = "Aucun destinataire trouvé.";
+$a->strings["Emails sent"] = "Courriels envoyés";
+$a->strings["Send email to all members of this Friendica instance."] = "Envoyer un courriel à tous les membres de cet instance Friendica.";
+$a->strings["Message subject"] = "Objet du message";
+$a->strings["Test mode (only send to administrator)"] = "Mode test (envoyer uniquement à l'administrateur)";
+$a->strings["Submit"] = "Envoyer";
diff --git a/notifyall/lang/hu/messages.po b/notifyall/lang/hu/messages.po
deleted file mode 100644
index 8d030ab8..00000000
--- a/notifyall/lang/hu/messages.po
+++ /dev/null
@@ -1,60 +0,0 @@
-# ADDON notifyall
-# Copyright (C)
-# This file is distributed under the same license as the Friendica notifyall addon package.
-# 
-# 
-# Translators:
-# Balázs Úr, 2021
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2016-08-14 19:29+0000\n"
-"Last-Translator: Balázs Úr, 2021\n"
-"Language-Team: Hungarian (https://app.transifex.com/Friendica/teams/12172/hu/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: hu\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: NotifyAllEmail.php:40
-#, php-format
-msgid "%s Administrator"
-msgstr "A(z) %s adminisztrátora"
-
-#: NotifyAllEmail.php:42
-#, php-format
-msgid "%1$s, %2$s Administrator"
-msgstr "%1$s, a(z) %2$s adminisztrátora"
-
-#: notifyall.php:22
-msgid "Send email to all members"
-msgstr "E-mail küldése az összes tagnak"
-
-#: notifyall.php:49
-msgid "No recipients found."
-msgstr "Nem találhatók címzettek."
-
-#: notifyall.php:59
-msgid "Emails sent"
-msgstr "E-mailek elküldve"
-
-#: notifyall.php:69
-msgid "Send email to all members of this Friendica instance."
-msgstr "E-mail küldése ezen Friendica példány összes tagjának."
-
-#: notifyall.php:74
-msgid "Message subject"
-msgstr "Üzenet tárgya"
-
-#: notifyall.php:75
-msgid "Test mode (only send to administrator)"
-msgstr "Tesztmód (küldés csak az adminisztrátornak)"
-
-#: notifyall.php:76
-msgid "Submit"
-msgstr "Elküldés"
diff --git a/notifyall/lang/hu/strings.php b/notifyall/lang/hu/strings.php
deleted file mode 100644
index 7745ed87..00000000
--- a/notifyall/lang/hu/strings.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_hu")) {
-function string_plural_select_hu($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['%s Administrator'] = 'A(z) %s adminisztrátora';
-$a->strings['%1$s, %2$s Administrator'] = '%1$s, a(z) %2$s adminisztrátora';
-$a->strings['Send email to all members'] = 'E-mail küldése az összes tagnak';
-$a->strings['No recipients found.'] = 'Nem találhatók címzettek.';
-$a->strings['Emails sent'] = 'E-mailek elküldve';
-$a->strings['Send email to all members of this Friendica instance.'] = 'E-mail küldése ezen Friendica példány összes tagjának.';
-$a->strings['Message subject'] = 'Üzenet tárgya';
-$a->strings['Test mode (only send to administrator)'] = 'Tesztmód (küldés csak az adminisztrátornak)';
-$a->strings['Submit'] = 'Elküldés';
diff --git a/notifyall/lang/it/messages.po b/notifyall/lang/it/messages.po
index d590306b..e56126b7 100644
--- a/notifyall/lang/it/messages.po
+++ b/notifyall/lang/it/messages.po
@@ -3,59 +3,55 @@
 # This file is distributed under the same license as the Friendica notifyall addon package.
 # 
 # 
-# Translators:
-# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2016
-# fabrixxm <fabrix.xm@gmail.com>, 2017
-# 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2016-08-14 19:29+0000\n"
+"POT-Creation-Date: 2016-08-14 16:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fabrixxm <fabrix.xm@gmail.com>, 2017\n"
-"Language-Team: Italian (https://app.transifex.com/Friendica/teams/12172/it/)\n"
+"Language-Team: Italian (https://www.transifex.com/Friendica/teams/12172/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: it\n"
-"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: NotifyAllEmail.php:40
+#: notifyall.php:26
+msgid "Send email to all members"
+msgstr "Invia email a tutti i membri"
+
+#: notifyall.php:42
 #, php-format
 msgid "%s Administrator"
 msgstr "Amministratore %s"
 
-#: NotifyAllEmail.php:42
+#: notifyall.php:44
 #, php-format
 msgid "%1$s, %2$s Administrator"
 msgstr "%1$s,  amministratore di %2$s"
 
-#: notifyall.php:22
-msgid "Send email to all members"
-msgstr "Invia email a tutti i membri"
-
-#: notifyall.php:49
+#: notifyall.php:60
 msgid "No recipients found."
 msgstr "Nessun destinatario trovato."
 
-#: notifyall.php:59
+#: notifyall.php:78
 msgid "Emails sent"
 msgstr "Email inviate"
 
-#: notifyall.php:69
+#: notifyall.php:86
 msgid "Send email to all members of this Friendica instance."
 msgstr "Invia email a tutti i membri di questa istanza Friendica."
 
-#: notifyall.php:74
+#: notifyall.php:91
 msgid "Message subject"
 msgstr "Oggetto del messaggio"
 
-#: notifyall.php:75
+#: notifyall.php:92
 msgid "Test mode (only send to administrator)"
 msgstr "Modalità test (invia solo agli amministratori)"
 
-#: notifyall.php:76
+#: notifyall.php:93
 msgid "Submit"
 msgstr "Invia"
diff --git a/notifyall/lang/it/strings.php b/notifyall/lang/it/strings.php
index 630f693a..c47067b6 100644
--- a/notifyall/lang/it/strings.php
+++ b/notifyall/lang/it/strings.php
@@ -2,15 +2,15 @@
 
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
-	$n = intval($n);
-	if ($n == 1) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
+	return ($n != 1);;
 }}
-$a->strings['%s Administrator'] = 'Amministratore %s';
-$a->strings['%1$s, %2$s Administrator'] = '%1$s,  amministratore di %2$s';
-$a->strings['Send email to all members'] = 'Invia email a tutti i membri';
-$a->strings['No recipients found.'] = 'Nessun destinatario trovato.';
-$a->strings['Emails sent'] = 'Email inviate';
-$a->strings['Send email to all members of this Friendica instance.'] = 'Invia email a tutti i membri di questa istanza Friendica.';
-$a->strings['Message subject'] = 'Oggetto del messaggio';
-$a->strings['Test mode (only send to administrator)'] = 'Modalità test (invia solo agli amministratori)';
-$a->strings['Submit'] = 'Invia';
+;
+$a->strings["Send email to all members"] = "Invia email a tutti i membri";
+$a->strings["%s Administrator"] = "Amministratore %s";
+$a->strings["%1\$s, %2\$s Administrator"] = "%1\$s,  amministratore di %2\$s";
+$a->strings["No recipients found."] = "Nessun destinatario trovato.";
+$a->strings["Emails sent"] = "Email inviate";
+$a->strings["Send email to all members of this Friendica instance."] = "Invia email a tutti i membri di questa istanza Friendica.";
+$a->strings["Message subject"] = "Oggetto del messaggio";
+$a->strings["Test mode (only send to administrator)"] = "Modalità test (invia solo agli amministratori)";
+$a->strings["Submit"] = "Invia";
diff --git a/notifyall/lang/nl/strings.php b/notifyall/lang/nl/strings.php
index afc3f5f2..78c6488d 100644
--- a/notifyall/lang/nl/strings.php
+++ b/notifyall/lang/nl/strings.php
@@ -3,8 +3,15 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Send email to all members'] = 'Stuur e-mail naar alle leden';
-$a->strings['%s Administrator'] = '%s Beheerder';
-$a->strings['%1$s, %2$s Administrator'] = '%1$s%2$s Beheerder';
+;
+$a->strings["Send email to all members"] = "Stuur e-mail naar alle leden";
+$a->strings["%s Administrator"] = "%s Beheerder";
+$a->strings["%1\$s, %2\$s Administrator"] = "%1\$s%2\$s Beheerder";
+$a->strings["No recipients found."] = "";
+$a->strings["Emails sent"] = "";
+$a->strings["Send email to all members of this Friendica instance."] = "";
+$a->strings["Message subject"] = "";
+$a->strings["Test mode (only send to administrator)"] = "";
+$a->strings["Submit"] = "";
diff --git a/notifyall/lang/pl/messages.po b/notifyall/lang/pl/messages.po
index 494d2c38..a8110249 100644
--- a/notifyall/lang/pl/messages.po
+++ b/notifyall/lang/pl/messages.po
@@ -3,17 +3,14 @@
 # This file is distributed under the same license as the Friendica notifyall addon package.
 # 
 # 
-# Translators:
-# Waldemar Stoczkowski, 2018
-# 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2016-08-14 19:29+0000\n"
-"Last-Translator: Waldemar Stoczkowski, 2018\n"
+"POT-Creation-Date: 2016-08-14 16:41+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>, 2018\n"
 "Language-Team: Polish (https://www.transifex.com/Friendica/teams/12172/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,41 +18,41 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
-#: NotifyAllEmail.php:40
+#: notifyall.php:26
+msgid "Send email to all members"
+msgstr "Wyślij e-mail do wszystkich członków"
+
+#: notifyall.php:42
 #, php-format
 msgid "%s Administrator"
 msgstr "%s Administrator"
 
-#: NotifyAllEmail.php:42
+#: notifyall.php:44
 #, php-format
 msgid "%1$s, %2$s Administrator"
 msgstr "%1$s, %2$s Administrator"
 
-#: notifyall.php:22
-msgid "Send email to all members"
-msgstr "Wyślij e-mail do wszystkich członków"
-
-#: notifyall.php:49
+#: notifyall.php:60
 msgid "No recipients found."
 msgstr "Nie znaleziono adresatów."
 
-#: notifyall.php:59
+#: notifyall.php:78
 msgid "Emails sent"
 msgstr "Wysłane wiadomości e-mail"
 
-#: notifyall.php:69
+#: notifyall.php:86
 msgid "Send email to all members of this Friendica instance."
 msgstr ""
 "Wyślij wiadomość e-mail do wszystkich członków tej instancji Friendica."
 
-#: notifyall.php:74
+#: notifyall.php:91
 msgid "Message subject"
 msgstr "Temat wiadomości"
 
-#: notifyall.php:75
+#: notifyall.php:92
 msgid "Test mode (only send to administrator)"
-msgstr "Tryb testowy (wiadomość wysyłana tylko do administratora)"
+msgstr "Tryb testowy (wysyłany tylko do administratora)"
 
-#: notifyall.php:76
+#: notifyall.php:93
 msgid "Submit"
 msgstr "Zatwierdź"
diff --git a/notifyall/lang/pl/strings.php b/notifyall/lang/pl/strings.php
index 453f2479..38a91bb0 100644
--- a/notifyall/lang/pl/strings.php
+++ b/notifyall/lang/pl/strings.php
@@ -2,15 +2,15 @@
 
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
-	$n = intval($n);
-	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
+	return ($n==1 ? 0 : ($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14) ? 1 : $n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14) ? 2 : 3);;
 }}
-$a->strings['%s Administrator'] = '%s Administrator';
-$a->strings['%1$s, %2$s Administrator'] = '%1$s, %2$s Administrator';
-$a->strings['Send email to all members'] = 'Wyślij e-mail do wszystkich członków';
-$a->strings['No recipients found.'] = 'Nie znaleziono adresatów.';
-$a->strings['Emails sent'] = 'Wysłane wiadomości e-mail';
-$a->strings['Send email to all members of this Friendica instance.'] = 'Wyślij wiadomość e-mail do wszystkich członków tej instancji Friendica.';
-$a->strings['Message subject'] = 'Temat wiadomości';
-$a->strings['Test mode (only send to administrator)'] = 'Tryb testowy (wiadomość wysyłana tylko do administratora)';
-$a->strings['Submit'] = 'Zatwierdź';
+;
+$a->strings["Send email to all members"] = "Wyślij e-mail do wszystkich członków";
+$a->strings["%s Administrator"] = "%s Administrator";
+$a->strings["%1\$s, %2\$s Administrator"] = "%1\$s, %2\$s Administrator";
+$a->strings["No recipients found."] = "Nie znaleziono adresatów.";
+$a->strings["Emails sent"] = "Wysłane wiadomości e-mail";
+$a->strings["Send email to all members of this Friendica instance."] = "Wyślij wiadomość e-mail do wszystkich członków tej instancji Friendica.";
+$a->strings["Message subject"] = "Temat wiadomości";
+$a->strings["Test mode (only send to administrator)"] = "Tryb testowy (wysyłany tylko do administratora)";
+$a->strings["Submit"] = "Zatwierdź";
diff --git a/notifyall/lang/pt-br/strings.php b/notifyall/lang/pt-br/strings.php
index b262404c..7df5beec 100644
--- a/notifyall/lang/pt-br/strings.php
+++ b/notifyall/lang/pt-br/strings.php
@@ -2,15 +2,15 @@
 
 if(! function_exists("string_plural_select_pt_br")) {
 function string_plural_select_pt_br($n){
-	$n = intval($n);
-	return intval($n > 1);
+	return ($n > 1);;
 }}
-$a->strings['Send email to all members'] = 'Enviar e-mail para todos os membros';
-$a->strings['%s Administrator'] = 'Administrador de %s';
-$a->strings['%1$s, %2$s Administrator'] = '%1$s, administrador de %2$s';
-$a->strings['No recipients found.'] = 'Não foi encontrado nenhum destinatário.';
-$a->strings['Emails sent'] = 'E-mails enviados';
-$a->strings['Send email to all members of this Friendica instance.'] = 'Enviar e-mail para todos os membros desta instância do Friendica.';
-$a->strings['Message subject'] = 'Assunto da mensagem';
-$a->strings['Test mode (only send to administrator)'] = 'Modo de teste (enviar só para o administrador)';
-$a->strings['Submit'] = 'Enviar';
+;
+$a->strings["Send email to all members"] = "Enviar e-mail para todos os membros";
+$a->strings["%s Administrator"] = "Administrador de %s";
+$a->strings["%1\$s, %2\$s Administrator"] = "%1\$s, administrador de %2\$s";
+$a->strings["No recipients found."] = "Não foi encontrado nenhum destinatário.";
+$a->strings["Emails sent"] = "E-mails enviados";
+$a->strings["Send email to all members of this Friendica instance."] = "Enviar e-mail para todos os membros desta instância do Friendica.";
+$a->strings["Message subject"] = "Assunto da mensagem";
+$a->strings["Test mode (only send to administrator)"] = "Modo de teste (enviar só para o administrador)";
+$a->strings["Submit"] = "Enviar";
diff --git a/notifyall/lang/ru/messages.po b/notifyall/lang/ru/messages.po
deleted file mode 100644
index 63d44846..00000000
--- a/notifyall/lang/ru/messages.po
+++ /dev/null
@@ -1,60 +0,0 @@
-# ADDON notifyall
-# Copyright (C)
-# This file is distributed under the same license as the Friendica notifyall addon package.
-# 
-# 
-# Translators:
-# Alexander An <ravnina@gmail.com>, 2020
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-14 16:41+0200\n"
-"PO-Revision-Date: 2016-08-14 19:29+0000\n"
-"Last-Translator: Alexander An <ravnina@gmail.com>, 2020\n"
-"Language-Team: Russian (https://www.transifex.com/Friendica/teams/12172/ru/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ru\n"
-"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
-
-#: notifyall.php:26
-msgid "Send email to all members"
-msgstr "Послать почту всем пользователям"
-
-#: notifyall.php:42
-#, php-format
-msgid "%s Administrator"
-msgstr "%s Администратор"
-
-#: notifyall.php:44
-#, php-format
-msgid "%1$s, %2$s Administrator"
-msgstr "%1$s, %2$s Администратор"
-
-#: notifyall.php:60
-msgid "No recipients found."
-msgstr "Получатели не найдены."
-
-#: notifyall.php:78
-msgid "Emails sent"
-msgstr "Сообщения высланы."
-
-#: notifyall.php:86
-msgid "Send email to all members of this Friendica instance."
-msgstr "Выслать почтовое сообщение всем пользователям этого узла Friendica."
-
-#: notifyall.php:91
-msgid "Message subject"
-msgstr "Тема сообщения"
-
-#: notifyall.php:92
-msgid "Test mode (only send to administrator)"
-msgstr "Пробный режим (отправить только администратору)"
-
-#: notifyall.php:93
-msgid "Submit"
-msgstr "Отправить"
diff --git a/notifyall/lang/ru/strings.php b/notifyall/lang/ru/strings.php
deleted file mode 100644
index cacc8f95..00000000
--- a/notifyall/lang/ru/strings.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_ru")) {
-function string_plural_select_ru($n){
-	$n = intval($n);
-	if ($n%10==1 && $n%100!=11) { return 0; } else if ($n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14)) { return 1; } else if ($n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)) { return 2; } else  { return 3; }
-}}
-$a->strings['Send email to all members'] = 'Послать почту всем пользователям';
-$a->strings['%s Administrator'] = '%s Администратор';
-$a->strings['%1$s, %2$s Administrator'] = '%1$s, %2$s Администратор';
-$a->strings['No recipients found.'] = 'Получатели не найдены.';
-$a->strings['Emails sent'] = 'Сообщения высланы.';
-$a->strings['Send email to all members of this Friendica instance.'] = 'Выслать почтовое сообщение всем пользователям этого узла Friendica.';
-$a->strings['Message subject'] = 'Тема сообщения';
-$a->strings['Test mode (only send to administrator)'] = 'Пробный режим (отправить только администратору)';
-$a->strings['Submit'] = 'Отправить';
diff --git a/notifyall/lang/sv/messages.po b/notifyall/lang/sv/messages.po
deleted file mode 100644
index cda04485..00000000
--- a/notifyall/lang/sv/messages.po
+++ /dev/null
@@ -1,56 +0,0 @@
-# ADDON notifyall
-# Copyright (C)
-# This file is distributed under the same license as the Friendica notifyall addon package.
-# 
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2016-08-14 19:29+0000\n"
-"Language-Team: Swedish (https://www.transifex.com/Friendica/teams/12172/sv/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: sv\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: NotifyAllEmail.php:40
-#, php-format
-msgid "%s Administrator"
-msgstr ""
-
-#: NotifyAllEmail.php:42
-#, php-format
-msgid "%1$s, %2$s Administrator"
-msgstr ""
-
-#: notifyall.php:22
-msgid "Send email to all members"
-msgstr ""
-
-#: notifyall.php:49
-msgid "No recipients found."
-msgstr ""
-
-#: notifyall.php:59
-msgid "Emails sent"
-msgstr ""
-
-#: notifyall.php:69
-msgid "Send email to all members of this Friendica instance."
-msgstr ""
-
-#: notifyall.php:74
-msgid "Message subject"
-msgstr ""
-
-#: notifyall.php:75
-msgid "Test mode (only send to administrator)"
-msgstr ""
-
-#: notifyall.php:76
-msgid "Submit"
-msgstr ""
diff --git a/notifyall/lang/sv/strings.php b/notifyall/lang/sv/strings.php
deleted file mode 100644
index 72e9772f..00000000
--- a/notifyall/lang/sv/strings.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_sv")) {
-function string_plural_select_sv($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
diff --git a/notifyall/notifyall.php b/notifyall/notifyall.php
index 966a9184..af52e668 100644
--- a/notifyall/notifyall.php
+++ b/notifyall/notifyall.php
@@ -8,29 +8,36 @@
  * Author: Rabuzarus <https://friendica.kommune4.de/profile/rabuzarus> (Port to Friendica)
  */
 
-use Friendica\Addon\notifyall\NotifyAllEmail;
 use Friendica\App;
-use Friendica\Database\DBA;
+use Friendica\Content\Text\BBCode;
+use Friendica\Core\Config;
+use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
-use Friendica\DI;
+use Friendica\Core\System;
+use Friendica\Util\Emailer;
+
+function notifyall_install()
+{
+	Logger::log("installed notifyall");
+}
+
+function notifyall_uninstall()
+{
+	Logger::log("removed notifyall");
+}
 
-/**
- * This is a statement rather than an actual function definition. The simple
- * existence of this method is checked to figure out if the addon offers a
- * module.
- */
 function notifyall_module() {}
 
-function notifyall_addon_admin(string &$o)
+function notifyall_addon_admin(App $a, &$o)
 {
-	$o = '<div></div>&nbsp;&nbsp;&nbsp;&nbsp;<a href="' . DI::baseUrl() . '/notifyall">' . DI::l10n()->t('Send email to all members') . '</a></br/>';
+	$o = '<div></div>&nbsp;&nbsp;&nbsp;&nbsp;<a href="' . $a->getBaseURL() . '/notifyall">' . L10n::t('Send email to all members') . '</a></br/>';
 }
 
 
-function notifyall_post()
+function notifyall_post(App $a)
 {
-	if (!DI::userSession()->isSiteAdmin()) {
+	if(!is_site_admin()) {
 		return;
 	}
 
@@ -40,47 +47,72 @@ function notifyall_post()
 		return;
 	}
 
-	$condition = ['account_removed' => false, 'account_expired' => false];
+	$sitename = Config::get('config', 'sitename');
+
+	if (empty(Config::get('config', 'admin_name'))) {
+		$sender_name = '"' . L10n::t('%s Administrator', $sitename) . '"';
+	} else {
+		$sender_name = '"' . L10n::t('%1$s, %2$s Administrator', Config::get('config', 'admin_name'), $sitename) . '"';
+	}
+
+	if (!Config::get('config', 'sender_email')) {
+		$sender_email = 'noreply@' . $a->getHostName();
+	} else {
+		$sender_email = Config::get('config', 'sender_email');
+	}
+
+	$subject = $_REQUEST['subject'];
+
+
+	$textversion = strip_tags(html_entity_decode(BBCode::convert(stripslashes(str_replace(["\\r", "\\n"], ["", "\n"], $text))), ENT_QUOTES, 'UTF-8'));
+
+	$htmlversion = BBCode::convert(stripslashes(str_replace(["\\r", "\\n"], ["", "<br />\n"], $text)));
 
 	// if this is a test, send it only to the admin(s)
 	// admin_email might be a comma separated list, but we need "a@b','c@d','e@f
 	if (intval($_REQUEST['test'])) {
-		$adminEmails = \Friendica\Model\User::getAdminListForEmailing(['email']);
-
-		$condition['email'] = array_column($adminEmails, 'email');
+		$email = Config::get('config', 'admin_email');
+		$email = "'" . str_replace([" ",","], ["","','"], $email) . "'";
 	}
+	$sql_extra = ((intval($_REQUEST['test'])) ? sprintf(" AND `email` in ( %s )", $email) : '');
 
-	$recipients = DBA::p("SELECT DISTINCT `email` FROM `user`" . DBA::buildCondition($condition), $condition);
+	$recips = q("SELECT DISTINCT `email` FROM `user` WHERE `verified` AND NOT `account_removed` AND NOT `account_expired` $sql_extra");
 
-	if (! $recipients) {
-		DI::sysmsg()->addNotice(DI::l10n()->t('No recipients found.'));
+	if (! $recips) {
+		notice(L10n::t('No recipients found.') . EOL);
 		return;
 	}
 
-	$notifyEmail = new NotifyAllEmail(DI::l10n(), DI::config(), DI::baseUrl(), $text);
-
-	foreach ($recipients as $recipient) {
-		DI::emailer()->send($notifyEmail->withRecipient($recipient['email']));
+	foreach ($recips as $recip) {
+		Emailer::send([
+			'fromName'             => $sender_name,
+			'fromEmail'            => $sender_email,
+			'replyTo'              => $sender_email,
+			'toEmail'              => $recip['email'],
+			'messageSubject'       => $subject,
+			'htmlVersion'          => $htmlversion,
+			'textVersion'          => $textversion
+		]);
 	}
 
-	DI::sysmsg()->addInfo(DI::l10n()->t('Emails sent'));
-	DI::baseUrl()->redirect('admin');
+	notice(L10n::t('Emails sent'));
+	$a->internalRedirect('admin');
 }
 
-function notifyall_content()
+function notifyall_content(&$a)
 {
-	if (!DI::userSession()->isSiteAdmin()) {
-		return '';
+	if (! is_site_admin()) {
+		return;
 	}
 
-	$title = DI::l10n()->t('Send email to all members of this Friendica instance.');
+	$title = L10n::t('Send email to all members of this Friendica instance.');
 
 	$o = Renderer::replaceMacros(Renderer::getMarkupTemplate('notifyall_form.tpl', 'addon/notifyall/'), [
 		'$title' => $title,
 		'$text' => htmlspecialchars($_REQUEST['text'] ?? ''),
-		'$subject' => ['subject', DI::l10n()->t('Message subject'), $_REQUEST['subject'] ?? '',''],
-		'$test' => ['test',DI::l10n()->t('Test mode (only send to administrator)'), 0,''],
-		'$submit' => DI::l10n()->t('Submit')
+		'$subject' => ['subject', L10n::t('Message subject'), $_REQUEST['subject'] ?? '',''],
+		'$test' => ['test',L10n::t('Test mode (only send to administrator)'), 0,''],
+		'$submit' => L10n::t('Submit')
 	]);
 
 	return $o;
diff --git a/notimeline/lang/C/messages.po b/notimeline/lang/C/messages.po
new file mode 100644
index 00000000..76a4fcd9
--- /dev/null
+++ b/notimeline/lang/C/messages.po
@@ -0,0 +1,34 @@
+# ADDON notimeline
+# Copyright (C) 
+# This file is distributed under the same license as the Friendica notimeline addon package.
+# 
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: notimeline.php:32
+msgid "No Timeline settings updated."
+msgstr ""
+
+#: notimeline.php:56
+msgid "No Timeline Settings"
+msgstr ""
+
+#: notimeline.php:58
+msgid "Disable Archive selector on profile wall"
+msgstr ""
+
+#: notimeline.php:64
+msgid "Submit"
+msgstr ""
diff --git a/notimeline/lang/ca/strings.php b/notimeline/lang/ca/strings.php
new file mode 100644
index 00000000..5dc52a8b
--- /dev/null
+++ b/notimeline/lang/ca/strings.php
@@ -0,0 +1,6 @@
+<?php
+
+$a->strings["No Timeline settings updated."] = "No s'han actualitzat els ajustos de la línia de temps";
+$a->strings["No Timeline Settings"] = "No hi han ajustos de la línia de temps";
+$a->strings["Disable Archive selector on profile wall"] = "Desactivar el selector d'arxius del mur de perfils";
+$a->strings["Submit"] = "Enviar";
diff --git a/notimeline/lang/cs/messages.po b/notimeline/lang/cs/messages.po
new file mode 100644
index 00000000..f5280e5a
--- /dev/null
+++ b/notimeline/lang/cs/messages.po
@@ -0,0 +1,36 @@
+# ADDON notimeline
+# Copyright (C)
+# This file is distributed under the same license as the Friendica notimeline addon package.
+# 
+# 
+# Translators:
+# Michal Šupler <msupler@gmail.com>, 2014-2015
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2015-02-11 19:38+0000\n"
+"Last-Translator: Michal Šupler <msupler@gmail.com>\n"
+"Language-Team: Czech (http://www.transifex.com/projects/p/friendica/language/cs/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#: notimeline.php:32
+msgid "No Timeline settings updated."
+msgstr "Nastavení No Timeline aktualizováno."
+
+#: notimeline.php:56
+msgid "No Timeline Settings"
+msgstr "Nastavení No Timeline"
+
+#: notimeline.php:58
+msgid "Disable Archive selector on profile wall"
+msgstr "Znemožnit použití archivu na této profilové zdi."
+
+#: notimeline.php:64
+msgid "Submit"
+msgstr "Odeslat"
diff --git a/notimeline/lang/cs/strings.php b/notimeline/lang/cs/strings.php
new file mode 100644
index 00000000..c3b6c081
--- /dev/null
+++ b/notimeline/lang/cs/strings.php
@@ -0,0 +1,11 @@
+<?php
+
+if(! function_exists("string_plural_select_cs")) {
+function string_plural_select_cs($n){
+	return ($n==1) ? 0 : ($n>=2 && $n<=4) ? 1 : 2;;
+}}
+;
+$a->strings["No Timeline settings updated."] = "Nastavení No Timeline aktualizováno.";
+$a->strings["No Timeline Settings"] = "Nastavení No Timeline";
+$a->strings["Disable Archive selector on profile wall"] = "Znemožnit použití archivu na této profilové zdi.";
+$a->strings["Submit"] = "Odeslat";
diff --git a/notimeline/lang/de/messages.po b/notimeline/lang/de/messages.po
new file mode 100644
index 00000000..a7b9105e
--- /dev/null
+++ b/notimeline/lang/de/messages.po
@@ -0,0 +1,37 @@
+# ADDON notimeline
+# Copyright (C)
+# This file is distributed under the same license as the Friendica notimeline addon package.
+# 
+# 
+# Translators:
+# Andreas H., 2014
+# Ulf Rompe <transifex.com@rompe.org>, 2019
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2019-02-18 15:06+0000\n"
+"Last-Translator: Ulf Rompe <transifex.com@rompe.org>\n"
+"Language-Team: German (http://www.transifex.com/Friendica/friendica/language/de/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: notimeline.php:32
+msgid "No Timeline settings updated."
+msgstr "Keine Timeline-Einstellungen aktualisiert."
+
+#: notimeline.php:56
+msgid "No Timeline Settings"
+msgstr "Keine Timeline-Einstellungen"
+
+#: notimeline.php:58
+msgid "Disable Archive selector on profile wall"
+msgstr "Deaktiviere Archiv-Auswahl auf deiner Pinnwand"
+
+#: notimeline.php:64
+msgid "Submit"
+msgstr "Senden"
diff --git a/notimeline/lang/de/strings.php b/notimeline/lang/de/strings.php
new file mode 100644
index 00000000..85459dac
--- /dev/null
+++ b/notimeline/lang/de/strings.php
@@ -0,0 +1,12 @@
+<?php
+
+if(! function_exists("string_plural_select_de")) {
+function string_plural_select_de($n){
+	$n = intval($n);
+	return ($n != 1);;
+}}
+;
+$a->strings["No Timeline settings updated."] = "Keine Timeline-Einstellungen aktualisiert.";
+$a->strings["No Timeline Settings"] = "Keine Timeline-Einstellungen";
+$a->strings["Disable Archive selector on profile wall"] = "Deaktiviere Archiv-Auswahl auf deiner Pinnwand";
+$a->strings["Submit"] = "Senden";
diff --git a/notimeline/lang/eo/strings.php b/notimeline/lang/eo/strings.php
new file mode 100644
index 00000000..9d890e2a
--- /dev/null
+++ b/notimeline/lang/eo/strings.php
@@ -0,0 +1,6 @@
+<?php
+
+$a->strings["No Timeline settings updated."] = "No Timeline agordojn ĝisdatigita.";
+$a->strings["No Timeline Settings"] = "No Timeline Agordoj";
+$a->strings["Disable Archive selector on profile wall"] = "Malaktivigi la Arkivo elektilo sur la profilmuro";
+$a->strings["Submit"] = "Sendi";
diff --git a/notimeline/lang/es/messages.po b/notimeline/lang/es/messages.po
new file mode 100644
index 00000000..bd69aa60
--- /dev/null
+++ b/notimeline/lang/es/messages.po
@@ -0,0 +1,36 @@
+# ADDON notimeline
+# Copyright (C)
+# This file is distributed under the same license as the Friendica notimeline addon package.
+# 
+# 
+# Translators:
+# Albert, 2016
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2016-11-17 22:07+0000\n"
+"Last-Translator: Albert\n"
+"Language-Team: Spanish (http://www.transifex.com/Friendica/friendica/language/es/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: notimeline.php:32
+msgid "No Timeline settings updated."
+msgstr "Ningún ajuste de Línea de Tiempo actualizado"
+
+#: notimeline.php:56
+msgid "No Timeline Settings"
+msgstr "No hay ajustes de Línea de Tiempo"
+
+#: notimeline.php:58
+msgid "Disable Archive selector on profile wall"
+msgstr "Deshabilitar el selector Archivo en el muro de perfil"
+
+#: notimeline.php:64
+msgid "Submit"
+msgstr "Enviar"
diff --git a/notimeline/lang/es/strings.php b/notimeline/lang/es/strings.php
new file mode 100644
index 00000000..ec69f6ff
--- /dev/null
+++ b/notimeline/lang/es/strings.php
@@ -0,0 +1,11 @@
+<?php
+
+if(! function_exists("string_plural_select_es")) {
+function string_plural_select_es($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["No Timeline settings updated."] = "Ningún ajuste de Línea de Tiempo actualizado";
+$a->strings["No Timeline Settings"] = "No hay ajustes de Línea de Tiempo";
+$a->strings["Disable Archive selector on profile wall"] = "Deshabilitar el selector Archivo en el muro de perfil";
+$a->strings["Submit"] = "Enviar";
diff --git a/notimeline/lang/fi-fi/messages.po b/notimeline/lang/fi-fi/messages.po
new file mode 100644
index 00000000..0301e7d5
--- /dev/null
+++ b/notimeline/lang/fi-fi/messages.po
@@ -0,0 +1,37 @@
+# ADDON notimeline
+# Copyright (C)
+# This file is distributed under the same license as the Friendica notimeline addon package.
+# 
+# 
+# Translators:
+# Kris, 2018
+# Kris, 2018
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2018-04-08 16:10+0000\n"
+"Last-Translator: Kris\n"
+"Language-Team: Finnish (Finland) (http://www.transifex.com/Friendica/friendica/language/fi_FI/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fi_FI\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: notimeline.php:32
+msgid "No Timeline settings updated."
+msgstr "No Timeline -asetukset päivitetty"
+
+#: notimeline.php:56
+msgid "No Timeline Settings"
+msgstr "No Timeline -asetukset"
+
+#: notimeline.php:58
+msgid "Disable Archive selector on profile wall"
+msgstr ""
+
+#: notimeline.php:64
+msgid "Submit"
+msgstr "Lähetä"
diff --git a/notimeline/lang/fi-fi/strings.php b/notimeline/lang/fi-fi/strings.php
new file mode 100644
index 00000000..22688493
--- /dev/null
+++ b/notimeline/lang/fi-fi/strings.php
@@ -0,0 +1,11 @@
+<?php
+
+if(! function_exists("string_plural_select_fi_fi")) {
+function string_plural_select_fi_fi($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["No Timeline settings updated."] = "No Timeline -asetukset päivitetty";
+$a->strings["No Timeline Settings"] = "No Timeline -asetukset";
+$a->strings["Disable Archive selector on profile wall"] = "";
+$a->strings["Submit"] = "Lähetä";
diff --git a/notimeline/lang/fr/strings.php b/notimeline/lang/fr/strings.php
new file mode 100644
index 00000000..70b6d96f
--- /dev/null
+++ b/notimeline/lang/fr/strings.php
@@ -0,0 +1,6 @@
+<?php
+
+$a->strings["No Timeline settings updated."] = "Pas de mise à jour de paramètres du calendrier.";
+$a->strings["No Timeline Settings"] = "Pas de paramètres de calendrier";
+$a->strings["Disable Archive selector on profile wall"] = "Désactiver le sélecteur d'archives sur le mur";
+$a->strings["Submit"] = "Envoyer";
diff --git a/notimeline/lang/is/strings.php b/notimeline/lang/is/strings.php
new file mode 100644
index 00000000..9100a7d0
--- /dev/null
+++ b/notimeline/lang/is/strings.php
@@ -0,0 +1,6 @@
+<?php
+
+$a->strings["No Timeline settings updated."] = "";
+$a->strings["No Timeline Settings"] = "";
+$a->strings["Disable Archive selector on profile wall"] = "";
+$a->strings["Submit"] = "Senda inn";
diff --git a/notimeline/lang/it/messages.po b/notimeline/lang/it/messages.po
new file mode 100644
index 00000000..c42ec252
--- /dev/null
+++ b/notimeline/lang/it/messages.po
@@ -0,0 +1,36 @@
+# ADDON notimeline
+# Copyright (C)
+# This file is distributed under the same license as the Friendica notimeline addon package.
+# 
+# 
+# Translators:
+# fabrixxm <fabrix.xm@gmail.com>, 2014-2015
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2017-09-20 06:08+0000\n"
+"Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n"
+"Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: it\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: notimeline.php:32
+msgid "No Timeline settings updated."
+msgstr "Impostazioni \"No Timeline\" aggiornate."
+
+#: notimeline.php:56
+msgid "No Timeline Settings"
+msgstr "Impostazioni \"No Timeline\""
+
+#: notimeline.php:58
+msgid "Disable Archive selector on profile wall"
+msgstr "Disabilita il selettore dell'archivio sulla pagina del profilo"
+
+#: notimeline.php:64
+msgid "Submit"
+msgstr "Invia"
diff --git a/notimeline/lang/it/strings.php b/notimeline/lang/it/strings.php
new file mode 100644
index 00000000..cb5be511
--- /dev/null
+++ b/notimeline/lang/it/strings.php
@@ -0,0 +1,11 @@
+<?php
+
+if(! function_exists("string_plural_select_it")) {
+function string_plural_select_it($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["No Timeline settings updated."] = "Impostazioni \"No Timeline\" aggiornate.";
+$a->strings["No Timeline Settings"] = "Impostazioni \"No Timeline\"";
+$a->strings["Disable Archive selector on profile wall"] = "Disabilita il selettore dell'archivio sulla pagina del profilo";
+$a->strings["Submit"] = "Invia";
diff --git a/notimeline/lang/nb-no/strings.php b/notimeline/lang/nb-no/strings.php
new file mode 100644
index 00000000..d330f5a9
--- /dev/null
+++ b/notimeline/lang/nb-no/strings.php
@@ -0,0 +1,6 @@
+<?php
+
+$a->strings["No Timeline settings updated."] = "";
+$a->strings["No Timeline Settings"] = "";
+$a->strings["Disable Archive selector on profile wall"] = "";
+$a->strings["Submit"] = "Lagre";
diff --git a/notimeline/lang/nl/messages.po b/notimeline/lang/nl/messages.po
new file mode 100644
index 00000000..7b7589bb
--- /dev/null
+++ b/notimeline/lang/nl/messages.po
@@ -0,0 +1,36 @@
+# ADDON notimeline
+# Copyright (C)
+# This file is distributed under the same license as the Friendica notimeline addon package.
+# 
+# 
+# Translators:
+# Jeroen De Meerleer <me@jeroened.be>, 2018
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2018-08-24 13:48+0000\n"
+"Last-Translator: Jeroen De Meerleer <me@jeroened.be>\n"
+"Language-Team: Dutch (http://www.transifex.com/Friendica/friendica/language/nl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: notimeline.php:32
+msgid "No Timeline settings updated."
+msgstr "Geen tijdlijn instellingen opgeslagen"
+
+#: notimeline.php:56
+msgid "No Timeline Settings"
+msgstr "No Timeline instellingen"
+
+#: notimeline.php:58
+msgid "Disable Archive selector on profile wall"
+msgstr ""
+
+#: notimeline.php:64
+msgid "Submit"
+msgstr ""
diff --git a/notimeline/lang/nl/strings.php b/notimeline/lang/nl/strings.php
new file mode 100644
index 00000000..4e113f31
--- /dev/null
+++ b/notimeline/lang/nl/strings.php
@@ -0,0 +1,12 @@
+<?php
+
+if(! function_exists("string_plural_select_nl")) {
+function string_plural_select_nl($n){
+	$n = intval($n);
+	return ($n != 1);;
+}}
+;
+$a->strings["No Timeline settings updated."] = "Geen tijdlijn instellingen opgeslagen";
+$a->strings["No Timeline Settings"] = "No Timeline instellingen";
+$a->strings["Disable Archive selector on profile wall"] = "";
+$a->strings["Submit"] = "";
diff --git a/notimeline/lang/pl/messages.po b/notimeline/lang/pl/messages.po
new file mode 100644
index 00000000..3e1b37e7
--- /dev/null
+++ b/notimeline/lang/pl/messages.po
@@ -0,0 +1,36 @@
+# ADDON notimeline
+# Copyright (C)
+# This file is distributed under the same license as the Friendica notimeline addon package.
+# 
+# 
+# Translators:
+# Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>, 2018
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2018-03-31 19:17+0000\n"
+"Last-Translator: Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>\n"
+"Language-Team: Polish (http://www.transifex.com/Friendica/friendica/language/pl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pl\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
+
+#: notimeline.php:32
+msgid "No Timeline settings updated."
+msgstr "Nie zaktualizowano ustawień osi czasu."
+
+#: notimeline.php:56
+msgid "No Timeline Settings"
+msgstr "Brak ustawień osi czasu"
+
+#: notimeline.php:58
+msgid "Disable Archive selector on profile wall"
+msgstr "Wyłącz selektor Archiwum na ścianie profilowej"
+
+#: notimeline.php:64
+msgid "Submit"
+msgstr "Wyślij"
diff --git a/notimeline/lang/pl/strings.php b/notimeline/lang/pl/strings.php
new file mode 100644
index 00000000..8e7aa6bf
--- /dev/null
+++ b/notimeline/lang/pl/strings.php
@@ -0,0 +1,11 @@
+<?php
+
+if(! function_exists("string_plural_select_pl")) {
+function string_plural_select_pl($n){
+	return ($n==1 ? 0 : ($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14) ? 1 : $n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14) ? 2 : 3);;
+}}
+;
+$a->strings["No Timeline settings updated."] = "Nie zaktualizowano ustawień osi czasu.";
+$a->strings["No Timeline Settings"] = "Brak ustawień osi czasu";
+$a->strings["Disable Archive selector on profile wall"] = "Wyłącz selektor Archiwum na ścianie profilowej";
+$a->strings["Submit"] = "Wyślij";
diff --git a/notimeline/lang/pt-br/strings.php b/notimeline/lang/pt-br/strings.php
new file mode 100644
index 00000000..bf7560b1
--- /dev/null
+++ b/notimeline/lang/pt-br/strings.php
@@ -0,0 +1,6 @@
+<?php
+
+$a->strings["No Timeline settings updated."] = "";
+$a->strings["No Timeline Settings"] = "";
+$a->strings["Disable Archive selector on profile wall"] = "";
+$a->strings["Submit"] = "Enviar";
diff --git a/notimeline/lang/ro/messages.po b/notimeline/lang/ro/messages.po
new file mode 100644
index 00000000..d89a14ef
--- /dev/null
+++ b/notimeline/lang/ro/messages.po
@@ -0,0 +1,36 @@
+# ADDON notimeline
+# Copyright (C)
+# This file is distributed under the same license as the Friendica notimeline addon package.
+# 
+# 
+# Translators:
+# Doru  DEACONU <dumitrudeaconu@yahoo.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2014-11-27 14:16+0000\n"
+"Last-Translator: Doru  DEACONU <dumitrudeaconu@yahoo.com>\n"
+"Language-Team: Romanian (Romania) (http://www.transifex.com/projects/p/friendica/language/ro_RO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ro_RO\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
+
+#: notimeline.php:32
+msgid "No Timeline settings updated."
+msgstr "Configurările pentru Lipsă Cronologie, au fost actualizate."
+
+#: notimeline.php:56
+msgid "No Timeline Settings"
+msgstr "Configurări pentru Lipsă Cronologie"
+
+#: notimeline.php:58
+msgid "Disable Archive selector on profile wall"
+msgstr "Dezactivare selector Arhivă din peretele de profil"
+
+#: notimeline.php:64
+msgid "Submit"
+msgstr "Trimite"
diff --git a/notimeline/lang/ro/strings.php b/notimeline/lang/ro/strings.php
new file mode 100644
index 00000000..ea995674
--- /dev/null
+++ b/notimeline/lang/ro/strings.php
@@ -0,0 +1,11 @@
+<?php
+
+if(! function_exists("string_plural_select_ro")) {
+function string_plural_select_ro($n){
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+}}
+;
+$a->strings["No Timeline settings updated."] = "Configurările pentru Lipsă Cronologie, au fost actualizate.";
+$a->strings["No Timeline Settings"] = "Configurări pentru Lipsă Cronologie";
+$a->strings["Disable Archive selector on profile wall"] = "Dezactivare selector Arhivă din peretele de profil";
+$a->strings["Submit"] = "Trimite";
diff --git a/notimeline/lang/ru/strings.php b/notimeline/lang/ru/strings.php
new file mode 100644
index 00000000..e0d0a9e0
--- /dev/null
+++ b/notimeline/lang/ru/strings.php
@@ -0,0 +1,6 @@
+<?php
+
+$a->strings["No Timeline settings updated."] = "";
+$a->strings["No Timeline Settings"] = "";
+$a->strings["Disable Archive selector on profile wall"] = "";
+$a->strings["Submit"] = "Подтвердить";
diff --git a/notimeline/lang/sv/strings.php b/notimeline/lang/sv/strings.php
new file mode 100644
index 00000000..3ec569a7
--- /dev/null
+++ b/notimeline/lang/sv/strings.php
@@ -0,0 +1,3 @@
+<?php
+
+$a->strings["Submit"] = "Spara";
diff --git a/notimeline/lang/zh-cn/messages.po b/notimeline/lang/zh-cn/messages.po
new file mode 100644
index 00000000..ed7edb67
--- /dev/null
+++ b/notimeline/lang/zh-cn/messages.po
@@ -0,0 +1,36 @@
+# ADDON notimeline
+# Copyright (C)
+# This file is distributed under the same license as the Friendica notimeline addon package.
+# 
+# 
+# Translators:
+# 朱陈锬 <tangenters@outlook.com>, 2018
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2018-06-16 09:44+0000\n"
+"Last-Translator: 朱陈锬 <tangenters@outlook.com>\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/Friendica/friendica/language/zh_CN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: notimeline.php:32
+msgid "No Timeline settings updated."
+msgstr "时间轴设置未更新。"
+
+#: notimeline.php:56
+msgid "No Timeline Settings"
+msgstr "无时间轴设置"
+
+#: notimeline.php:58
+msgid "Disable Archive selector on profile wall"
+msgstr ""
+
+#: notimeline.php:64
+msgid "Submit"
+msgstr "提交"
diff --git a/notimeline/lang/zh-cn/strings.php b/notimeline/lang/zh-cn/strings.php
new file mode 100644
index 00000000..c4b2a794
--- /dev/null
+++ b/notimeline/lang/zh-cn/strings.php
@@ -0,0 +1,12 @@
+<?php
+
+if(! function_exists("string_plural_select_zh_cn")) {
+function string_plural_select_zh_cn($n){
+	$n = intval($n);
+	return 0;;
+}}
+;
+$a->strings["No Timeline settings updated."] = "时间轴设置未更新。";
+$a->strings["No Timeline Settings"] = "无时间轴设置";
+$a->strings["Disable Archive selector on profile wall"] = "";
+$a->strings["Submit"] = "提交";
diff --git a/notimeline/notimeline.css b/notimeline/notimeline.css
new file mode 100644
index 00000000..5440337b
--- /dev/null
+++ b/notimeline/notimeline.css
@@ -0,0 +1,14 @@
+
+
+
+#notimeline-label {
+	float: left;
+	width: 200px;
+	margin-bottom: 25px;
+}
+
+#notimeline-checkbox {
+	float: left;
+}
+
+
diff --git a/notimeline/notimeline.php b/notimeline/notimeline.php
new file mode 100644
index 00000000..d8d6b2ac
--- /dev/null
+++ b/notimeline/notimeline.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * Name: Notimeline
+ * Description: Disable "Archives" widget on profile page
+ * Version: 1.0
+ * Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
+ * Status: Unsupported
+ *
+ */
+use Friendica\Core\Hook;
+use Friendica\Core\L10n;
+use Friendica\Core\PConfig;
+
+function notimeline_install()
+{
+	Hook::register('addon_settings', 'addon/notimeline/notimeline.php', 'notimeline_settings');
+	Hook::register('addon_settings_post', 'addon/notimeline/notimeline.php', 'notimeline_settings_post');
+}
+
+function notimeline_uninstall()
+{
+	Hook::unregister('addon_settings', 'addon/notimeline/notimeline.php', 'notimeline_settings');
+	Hook::unregister('addon_settings_post', 'addon/notimeline/notimeline.php', 'notimeline_settings_post');
+}
+
+function notimeline_settings_post($a, $post)
+{
+	if (!local_user() || empty($_POST['notimeline-submit'])) {
+		return;
+	}
+
+	PConfig::set(local_user(), 'system', 'no_wall_archive_widget', intval($_POST['notimeline']));
+	info(L10n::t('No Timeline settings updated.') . EOL);
+}
+
+function notimeline_settings(&$a, &$s)
+{
+	if (! local_user()) {
+		return;
+	}
+
+	/* Add our stylesheet to the page so we can make our settings look nice */
+
+	$a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->getBaseURL() . '/addon/notimeline/notimeline.css' . '" media="all" />' . "\r\n";
+
+	/* Get the current state of our config variable */
+
+	$notimeline = PConfig::get(local_user(), 'system', 'no_wall_archive_widget', false);
+
+	$notimeline_checked = (($notimeline) ? ' checked="checked" ' : '');
+
+	
+	/* Add some HTML to the existing form */
+
+	$s .= '<div class="settings-block">';
+	$s .= '<h3>' . L10n::t('No Timeline Settings') . '</h3>';
+	$s .= '<div id="notimeline-wrapper">';
+	$s .= '<label id="notimeline-label" for="notimeline-checkbox">' . L10n::t('Disable Archive selector on profile wall') . '</label>';
+	$s .= '<input id="notimeline-checkbox" type="checkbox" name="notimeline" value="1" ' . $notimeline_checked . '/>';
+	$s .= '</div><div class="clear"></div>';
+
+	/* provide a submit button */
+
+	$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="notimeline-submit" class="settings-submit" value="' . L10n::t('Save Settings') . '" /></div></div>';
+}
diff --git a/notimeline/templates/settings.tpl b/notimeline/templates/settings.tpl
deleted file mode 100644
index 2f3f4ce7..00000000
--- a/notimeline/templates/settings.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{{include file="field_checkbox.tpl" field=$enabled}}
diff --git a/nsfw/README b/nsfw/README
index 41189c6f..e4a8b9d3 100644
--- a/nsfw/README
+++ b/nsfw/README
@@ -7,7 +7,7 @@ Scans the message content for the string 'nsfw'
 with a "click to open/close" link, default is closed.
 
 If you click on the 'Not safe for work' addon under
-/settings/addons a text field appears, where you can
+/settings/addon a text field appears, where you can
 extend the list of search terms. The terms must be
 seperated by commas.
 
diff --git a/nsfw/lang/C/messages.po b/nsfw/lang/C/messages.po
index 241143e8..7d83e15e 100644
--- a/nsfw/lang/C/messages.po
+++ b/nsfw/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-12-10 14:42-0500\n"
+"POT-Creation-Date: 2018-04-01 11:11-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,7 +17,11 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: nsfw.php:65
+#: nsfw.php:77 nsfw.php:81
+msgid "Content Filter (NSFW and more)"
+msgstr ""
+
+#: nsfw.php:85
 msgid ""
 "This addon searches for specified words/text in posts and collapses them. It "
 "can be used to filter content tagged with for instance #NSFW that may be "
@@ -25,35 +29,32 @@ msgid ""
 "is also useful for hiding irrelevant or annoying content from direct view."
 msgstr ""
 
-#: nsfw.php:66
+#: nsfw.php:86
 msgid "Enable Content filter"
 msgstr ""
 
-#: nsfw.php:67
+#: nsfw.php:89
 msgid "Comma separated list of keywords to hide"
 msgstr ""
 
-#: nsfw.php:67
-msgid ""
-"Use /expression/ to provide regular expressions, #tag to specfically match "
-"hashtags (case-insensitive), or regular words (case-sensitive)"
+#: nsfw.php:93
+msgid "Save Settings"
 msgstr ""
 
-#: nsfw.php:72
-msgid "Content Filter (NSFW and more)"
+#: nsfw.php:94
+msgid "Use /expression/ to provide regular expressions"
 msgstr ""
 
-#: nsfw.php:96
-#, php-format
-msgid "Regular expression \"%s\" fails to compile"
+#: nsfw.php:109
+msgid "NSFW Settings saved."
 msgstr ""
 
-#: nsfw.php:154
+#: nsfw.php:162
 #, php-format
 msgid "Filtered tag: %s"
 msgstr ""
 
-#: nsfw.php:156
+#: nsfw.php:164
 #, php-format
 msgid "Filtered word: %s"
 msgstr ""
diff --git a/nsfw/lang/ar/messages.po b/nsfw/lang/ar/messages.po
deleted file mode 100644
index 65bafe51..00000000
--- a/nsfw/lang/ar/messages.po
+++ /dev/null
@@ -1,58 +0,0 @@
-# ADDON nsfw
-# Copyright (C)
-# This file is distributed under the same license as the Friendica nsfw addon package.
-# 
-# 
-# Translators:
-# Farida Khalaf <faridakhalaf@hotmail.com>, 2021
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2021-02-21 18:41+0000\n"
-"Last-Translator: Farida Khalaf <faridakhalaf@hotmail.com>\n"
-"Language-Team: Arabic (http://www.transifex.com/Friendica/friendica/language/ar/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ar\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-
-#: nsfw.php:68 nsfw.php:72
-msgid "Content Filter (NSFW and more)"
-msgstr ""
-
-#: nsfw.php:76
-msgid ""
-"This addon searches for specified words/text in posts and collapses them. It"
-" can be used to filter content tagged with for instance #NSFW that may be "
-"deemed inappropriate at certain times or places, such as being at work. It "
-"is also useful for hiding irrelevant or annoying content from direct view."
-msgstr ""
-
-#: nsfw.php:77
-msgid "Enable Content filter"
-msgstr ""
-
-#: nsfw.php:80
-msgid "Comma separated list of keywords to hide"
-msgstr ""
-
-#: nsfw.php:84
-msgid "Save Settings"
-msgstr "حفظ الإعدادات"
-
-#: nsfw.php:85
-msgid "Use /expression/ to provide regular expressions"
-msgstr ""
-
-#: nsfw.php:152
-#, php-format
-msgid "Filtered tag: %s"
-msgstr ""
-
-#: nsfw.php:154
-#, php-format
-msgid "Filtered word: %s"
-msgstr ""
diff --git a/nsfw/lang/ar/strings.php b/nsfw/lang/ar/strings.php
deleted file mode 100644
index 285ad303..00000000
--- a/nsfw/lang/ar/strings.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_ar")) {
-function string_plural_select_ar($n){
-	$n = intval($n);
-	if ($n==0) { return 0; } else if ($n==1) { return 1; } else if ($n==2) { return 2; } else if ($n%100>=3 && $n%100<=10) { return 3; } else if ($n%100>=11 && $n%100<=99) { return 4; } else  { return 5; }
-}}
-$a->strings['Save Settings'] = 'حفظ الإعدادات';
diff --git a/nsfw/lang/cs/messages.po b/nsfw/lang/cs/messages.po
index 34a931ad..fc585d80 100644
--- a/nsfw/lang/cs/messages.po
+++ b/nsfw/lang/cs/messages.po
@@ -11,17 +11,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-12-10 14:42-0500\n"
-"PO-Revision-Date: 2014-06-23 10:34+0000\n"
-"Last-Translator: Aditoo, 2018\n"
-"Language-Team: Czech (http://app.transifex.com/Friendica/friendica/language/cs/)\n"
+"POT-Creation-Date: 2018-04-01 11:11-0400\n"
+"PO-Revision-Date: 2018-08-16 10:09+0000\n"
+"Last-Translator: Aditoo\n"
+"Language-Team: Czech (http://www.transifex.com/Friendica/friendica/language/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: cs\n"
 "Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
 
-#: nsfw.php:65
+#: nsfw.php:77 nsfw.php:81
+msgid "Content Filter (NSFW and more)"
+msgstr "Filtr obsahu (citlivý obsah a další)"
+
+#: nsfw.php:85
 msgid ""
 "This addon searches for specified words/text in posts and collapses them. It"
 " can be used to filter content tagged with for instance #NSFW that may be "
@@ -29,35 +33,32 @@ msgid ""
 "is also useful for hiding irrelevant or annoying content from direct view."
 msgstr "Tento doplněk vyhledává specifikovaná slova/text v příspěvcích a skrývá je. Může být použit pro filtrování obsahu označeného štítky, jako například #NSFW, který může být považován za nevhodný v určitých časech či místech, například když jste v práci. Může být také užitečný ke skrývání nepodstatného či nepříjemného obsahu z přímého pohledu."
 
-#: nsfw.php:66
+#: nsfw.php:86
 msgid "Enable Content filter"
 msgstr "Povolit filtr obsahu"
 
-#: nsfw.php:67
+#: nsfw.php:89
 msgid "Comma separated list of keywords to hide"
-msgstr "Seznam klíčových slov ke skrytí, oddělených čárkami"
+msgstr "Čárkou oddělený seznam klíčových slov ke skrytí"
 
-#: nsfw.php:67
-msgid ""
-"Use /expression/ to provide regular expressions, #tag to specfically match "
-"hashtags (case-insensitive), or regular words (case-sensitive)"
-msgstr ""
+#: nsfw.php:93
+msgid "Save Settings"
+msgstr "Uložit nastavení"
 
-#: nsfw.php:72
-msgid "Content Filter (NSFW and more)"
-msgstr "Filtr obsahu (citlivý obsah a další)"
+#: nsfw.php:94
+msgid "Use /expression/ to provide regular expressions"
+msgstr "Použijte /výraz/ pro použití regulárních výrazů"
 
-#: nsfw.php:96
-#, php-format
-msgid "Regular expression \"%s\" fails to compile"
-msgstr ""
+#: nsfw.php:109
+msgid "NSFW Settings saved."
+msgstr "Nastavení NSFW uloženo"
 
-#: nsfw.php:154
+#: nsfw.php:162
 #, php-format
 msgid "Filtered tag: %s"
-msgstr "Filtrovaný štítek: %s"
+msgstr "Filtrovaná značka: %s"
 
-#: nsfw.php:156
+#: nsfw.php:164
 #, php-format
 msgid "Filtered word: %s"
 msgstr "Filtrované slovo: %s"
diff --git a/nsfw/lang/cs/strings.php b/nsfw/lang/cs/strings.php
index 4898f2f1..a783951f 100644
--- a/nsfw/lang/cs/strings.php
+++ b/nsfw/lang/cs/strings.php
@@ -3,11 +3,15 @@
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
 	$n = intval($n);
-	if (($n == 1 && $n % 1 == 0)) { return 0; } else if (($n >= 2 && $n <= 4 && $n % 1 == 0)) { return 1; } else if (($n % 1 != 0 )) { return 2; } else  { return 3; }
+	return ($n == 1 && $n % 1 == 0) ? 0 : ($n >= 2 && $n <= 4 && $n % 1 == 0) ? 1: ($n % 1 != 0 ) ? 2 : 3;;
 }}
-$a->strings['This addon searches for specified words/text in posts and collapses them. It can be used to filter content tagged with for instance #NSFW that may be deemed inappropriate at certain times or places, such as being at work. It is also useful for hiding irrelevant or annoying content from direct view.'] = 'Tento doplněk vyhledává specifikovaná slova/text v příspěvcích a skrývá je. Může být použit pro filtrování obsahu označeného štítky, jako například #NSFW, který může být považován za nevhodný v určitých časech či místech, například když jste v práci. Může být také užitečný ke skrývání nepodstatného či nepříjemného obsahu z přímého pohledu.';
-$a->strings['Enable Content filter'] = 'Povolit filtr obsahu';
-$a->strings['Comma separated list of keywords to hide'] = 'Seznam klíčových slov ke skrytí, oddělených čárkami';
-$a->strings['Content Filter (NSFW and more)'] = 'Filtr obsahu (citlivý obsah a další)';
-$a->strings['Filtered tag: %s'] = 'Filtrovaný štítek: %s';
-$a->strings['Filtered word: %s'] = 'Filtrované slovo: %s';
+;
+$a->strings["Content Filter (NSFW and more)"] = "Filtr obsahu (citlivý obsah a další)";
+$a->strings["This addon searches for specified words/text in posts and collapses them. It can be used to filter content tagged with for instance #NSFW that may be deemed inappropriate at certain times or places, such as being at work. It is also useful for hiding irrelevant or annoying content from direct view."] = "Tento doplněk vyhledává specifikovaná slova/text v příspěvcích a skrývá je. Může být použit pro filtrování obsahu označeného štítky, jako například #NSFW, který může být považován za nevhodný v určitých časech či místech, například když jste v práci. Může být také užitečný ke skrývání nepodstatného či nepříjemného obsahu z přímého pohledu.";
+$a->strings["Enable Content filter"] = "Povolit filtr obsahu";
+$a->strings["Comma separated list of keywords to hide"] = "Čárkou oddělený seznam klíčových slov ke skrytí";
+$a->strings["Save Settings"] = "Uložit nastavení";
+$a->strings["Use /expression/ to provide regular expressions"] = "Použijte /výraz/ pro použití regulárních výrazů";
+$a->strings["NSFW Settings saved."] = "Nastavení NSFW uloženo";
+$a->strings["Filtered tag: %s"] = "Filtrovaná značka: %s";
+$a->strings["Filtered word: %s"] = "Filtrované slovo: %s";
diff --git a/nsfw/lang/da-dk/messages.po b/nsfw/lang/da-dk/messages.po
deleted file mode 100644
index 1b7dc383..00000000
--- a/nsfw/lang/da-dk/messages.po
+++ /dev/null
@@ -1,54 +0,0 @@
-# ADDON nsfw
-# Copyright (C)
-# This file is distributed under the same license as the Friendica nsfw addon package.
-# 
-# 
-# Translators:
-# Anton <dev@atjn.dk>, 2022
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:15-0500\n"
-"PO-Revision-Date: 2014-06-23 10:34+0000\n"
-"Last-Translator: Anton <dev@atjn.dk>, 2022\n"
-"Language-Team: Danish (Denmark) (http://www.transifex.com/Friendica/friendica/language/da_DK/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: da_DK\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: nsfw.php:65
-msgid ""
-"This addon searches for specified words/text in posts and collapses them. It"
-" can be used to filter content tagged with for instance #NSFW that may be "
-"deemed inappropriate at certain times or places, such as being at work. It "
-"is also useful for hiding irrelevant or annoying content from direct view."
-msgstr "Denne tilføjelse søger efter specificerede ord/tekst i opslag og kollapser dem. Den kan bruges til at filtrere indhold tagget med for eksempel #NSFW, som kan være betragtet som uanstændigt på bestemte tidspunkter eller bestemte steder, som eksempelvis på arbejde. Den er også brugbar til at skjule irrelevant eller irriterende indhold fra at blive vist direkte."
-
-#: nsfw.php:66
-msgid "Enable Content filter"
-msgstr "Aktivér indholdsfilter"
-
-#: nsfw.php:67
-msgid "Comma separated list of keywords to hide"
-msgstr "Kommasepareret liste af nøgleord som skal skjules"
-
-#: nsfw.php:67
-msgid "Use /expression/ to provide regular expressions"
-msgstr "Brug /expression/ for at lave regular expressions"
-
-#: nsfw.php:72
-msgid "Content Filter (NSFW and more)"
-msgstr "Indholdsfilter (NSFW og mere)"
-
-#: nsfw.php:140
-#, php-format
-msgid "Filtered tag: %s"
-msgstr "Filtreret tag: %s"
-
-#: nsfw.php:142
-#, php-format
-msgid "Filtered word: %s"
-msgstr "Filtreret ord: %s"
diff --git a/nsfw/lang/da-dk/strings.php b/nsfw/lang/da-dk/strings.php
deleted file mode 100644
index 9df7cc0a..00000000
--- a/nsfw/lang/da-dk/strings.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_da_dk")) {
-function string_plural_select_da_dk($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['This addon searches for specified words/text in posts and collapses them. It can be used to filter content tagged with for instance #NSFW that may be deemed inappropriate at certain times or places, such as being at work. It is also useful for hiding irrelevant or annoying content from direct view.'] = 'Denne tilføjelse søger efter specificerede ord/tekst i opslag og kollapser dem. Den kan bruges til at filtrere indhold tagget med for eksempel #NSFW, som kan være betragtet som uanstændigt på bestemte tidspunkter eller bestemte steder, som eksempelvis på arbejde. Den er også brugbar til at skjule irrelevant eller irriterende indhold fra at blive vist direkte.';
-$a->strings['Enable Content filter'] = 'Aktivér indholdsfilter';
-$a->strings['Comma separated list of keywords to hide'] = 'Kommasepareret liste af nøgleord som skal skjules';
-$a->strings['Use /expression/ to provide regular expressions'] = 'Brug /expression/ for at lave regular expressions';
-$a->strings['Content Filter (NSFW and more)'] = 'Indholdsfilter (NSFW og mere)';
-$a->strings['Filtered tag: %s'] = 'Filtreret tag: %s';
-$a->strings['Filtered word: %s'] = 'Filtreret ord: %s';
diff --git a/nsfw/lang/de/messages.po b/nsfw/lang/de/messages.po
index 4fefb60c..c297759f 100644
--- a/nsfw/lang/de/messages.po
+++ b/nsfw/lang/de/messages.po
@@ -6,61 +6,60 @@
 # Translators:
 # Andreas H., 2014
 # hoergen <hoergen@hoergen.org>, 2018
-# foss <oss@disr.it>, 2022
 # Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2014
-# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2018,2022
-# Ulf Rompe <transifex.com@rompe.org>, 2019
+# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-12-10 14:42-0500\n"
-"PO-Revision-Date: 2014-06-23 10:34+0000\n"
-"Last-Translator: foss <oss@disr.it>, 2022\n"
-"Language-Team: German (http://app.transifex.com/Friendica/friendica/language/de/)\n"
+"POT-Creation-Date: 2018-04-01 11:11-0400\n"
+"PO-Revision-Date: 2018-06-09 09:27+0000\n"
+"Last-Translator: hoergen <hoergen@hoergen.org>\n"
+"Language-Team: German (http://www.transifex.com/Friendica/friendica/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: nsfw.php:65
+#: nsfw.php:77 nsfw.php:81
+msgid "Content Filter (NSFW and more)"
+msgstr "Inhaltsfilter (NSFW und mehr)"
+
+#: nsfw.php:85
 msgid ""
 "This addon searches for specified words/text in posts and collapses them. It"
 " can be used to filter content tagged with for instance #NSFW that may be "
 "deemed inappropriate at certain times or places, such as being at work. It "
 "is also useful for hiding irrelevant or annoying content from direct view."
-msgstr "Dieses Addon sucht nach den von dir definierten Wörtern bzw. Texten in Beiträgen und klappt bei einem Treffer den gesamten Beitrag zusammen. Damit können bspw. Inhalte gefiltert werden, die mit #NSFW (Not Safe for Work, für die Arbeit unangemessene Beiträge) gekennzeichnet sind. Des Weiteren können damit natürlich auch irrelevante und lästige Beiträge verborgen werden."
+msgstr "Dieses Addon sucht, nach den von dir definierten Wörtern bzw. Texten in Beiträgen und klappt bei einem Treffer den gesamten Beitrag zusammen. Damit können z.B. Inhalte gefiltert werden, die mit #NSFW (Not Safe for Work, für die Arbeit unangemessene Beiträge), gekennzeichnet sind. Des Weiteren können damit natürlich auch nicht gewünschte und lästige Beiträge verborgen werden."
 
-#: nsfw.php:66
+#: nsfw.php:86
 msgid "Enable Content filter"
 msgstr "Aktiviere den Inhaltsfilter"
 
-#: nsfw.php:67
+#: nsfw.php:89
 msgid "Comma separated list of keywords to hide"
-msgstr "Durch Kommata getrennte Liste von Schlüsselwörtern, die verborgen werden sollen"
+msgstr "Durch Kommata getrennte Liste von Schlüsselwörtern die verborgen werden sollen"
 
-#: nsfw.php:67
-msgid ""
-"Use /expression/ to provide regular expressions, #tag to specfically match "
-"hashtags (case-insensitive), or regular words (case-sensitive)"
-msgstr "Verwende /ausdruck/ für reguläre Ausdrücke, #tag um einen speziellen Hashtag zu filtern (unabhängig von der Groß- und Kleinschreibung) oder einfache Wörter (Groß- und Kleinschreibung beachten)."
+#: nsfw.php:93
+msgid "Save Settings"
+msgstr "Einstellungen speichern"
 
-#: nsfw.php:72
-msgid "Content Filter (NSFW and more)"
-msgstr "Inhaltsfilter (NSFW und mehr)"
+#: nsfw.php:94
+msgid "Use /expression/ to provide regular expressions"
+msgstr "Verwende /expression/ um Reguläre Ausdrücke zu verwenden"
 
-#: nsfw.php:96
-#, php-format
-msgid "Regular expression \"%s\" fails to compile"
-msgstr "Regulärer Ausdruck \"%s\" schlägt beim Kompiliern fehl."
+#: nsfw.php:109
+msgid "NSFW Settings saved."
+msgstr "NSFW-Einstellungen gespeichert"
 
-#: nsfw.php:154
+#: nsfw.php:162
 #, php-format
 msgid "Filtered tag: %s"
 msgstr "Gefiltertes Schlagwort: %s"
 
-#: nsfw.php:156
+#: nsfw.php:164
 #, php-format
 msgid "Filtered word: %s"
 msgstr "Gefilterter Begriff: %s"
diff --git a/nsfw/lang/de/strings.php b/nsfw/lang/de/strings.php
index 9e0546ad..e1d04ad1 100644
--- a/nsfw/lang/de/strings.php
+++ b/nsfw/lang/de/strings.php
@@ -3,13 +3,15 @@
 if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['This addon searches for specified words/text in posts and collapses them. It can be used to filter content tagged with for instance #NSFW that may be deemed inappropriate at certain times or places, such as being at work. It is also useful for hiding irrelevant or annoying content from direct view.'] = 'Dieses Addon sucht nach den von dir definierten Wörtern bzw. Texten in Beiträgen und klappt bei einem Treffer den gesamten Beitrag zusammen. Damit können bspw. Inhalte gefiltert werden, die mit #NSFW (Not Safe for Work, für die Arbeit unangemessene Beiträge) gekennzeichnet sind. Des Weiteren können damit natürlich auch irrelevante und lästige Beiträge verborgen werden.';
-$a->strings['Enable Content filter'] = 'Aktiviere den Inhaltsfilter';
-$a->strings['Comma separated list of keywords to hide'] = 'Durch Kommata getrennte Liste von Schlüsselwörtern, die verborgen werden sollen';
-$a->strings['Use /expression/ to provide regular expressions, #tag to specfically match hashtags (case-insensitive), or regular words (case-sensitive)'] = 'Verwende /ausdruck/ für reguläre Ausdrücke, #tag um einen speziellen Hashtag zu filtern (unabhängig von der Groß- und Kleinschreibung) oder einfache Wörter (Groß- und Kleinschreibung beachten).';
-$a->strings['Content Filter (NSFW and more)'] = 'Inhaltsfilter (NSFW und mehr)';
-$a->strings['Regular expression "%s" fails to compile'] = 'Regulärer Ausdruck "%s" schlägt beim Kompiliern fehl.';
-$a->strings['Filtered tag: %s'] = 'Gefiltertes Schlagwort: %s';
-$a->strings['Filtered word: %s'] = 'Gefilterter Begriff: %s';
+;
+$a->strings["Content Filter (NSFW and more)"] = "Inhaltsfilter (NSFW und mehr)";
+$a->strings["This addon searches for specified words/text in posts and collapses them. It can be used to filter content tagged with for instance #NSFW that may be deemed inappropriate at certain times or places, such as being at work. It is also useful for hiding irrelevant or annoying content from direct view."] = "Dieses Addon sucht, nach den von dir definierten Wörtern bzw. Texten in Beiträgen und klappt bei einem Treffer den gesamten Beitrag zusammen. Damit können z.B. Inhalte gefiltert werden, die mit #NSFW (Not Safe for Work, für die Arbeit unangemessene Beiträge), gekennzeichnet sind. Des Weiteren können damit natürlich auch nicht gewünschte und lästige Beiträge verborgen werden.";
+$a->strings["Enable Content filter"] = "Aktiviere den Inhaltsfilter";
+$a->strings["Comma separated list of keywords to hide"] = "Durch Kommata getrennte Liste von Schlüsselwörtern die verborgen werden sollen";
+$a->strings["Save Settings"] = "Einstellungen speichern";
+$a->strings["Use /expression/ to provide regular expressions"] = "Verwende /expression/ um Reguläre Ausdrücke zu verwenden";
+$a->strings["NSFW Settings saved."] = "NSFW-Einstellungen gespeichert";
+$a->strings["Filtered tag: %s"] = "Gefiltertes Schlagwort: %s";
+$a->strings["Filtered word: %s"] = "Gefilterter Begriff: %s";
diff --git a/nsfw/lang/en-gb/strings.php b/nsfw/lang/en-gb/strings.php
index 6ece2689..a7ace525 100644
--- a/nsfw/lang/en-gb/strings.php
+++ b/nsfw/lang/en-gb/strings.php
@@ -2,11 +2,14 @@
 
 if(! function_exists("string_plural_select_en_gb")) {
 function string_plural_select_en_gb($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Enable Content filter'] = 'Enable content filter';
-$a->strings['Comma separated list of keywords to hide'] = 'Comma separated list of keywords';
-$a->strings['Use /expression/ to provide regular expressions'] = 'Use /expression/ for regular expressions.';
-$a->strings['NSFW Settings saved.'] = 'NSFW settings saved.';
-$a->strings['%s - Click to open/close'] = '%s - Reveal/hide';
+;
+$a->strings["Content Filter (NSFW and more)"] = "";
+$a->strings["This addon searches for specified words/text in posts and collapses them. It can be used to filter content tagged with for instance #NSFW that may be deemed inappropriate at certain times or places, such as being at work. It is also useful for hiding irrelevant or annoying content from direct view."] = "";
+$a->strings["Enable Content filter"] = "Enable content filter";
+$a->strings["Comma separated list of keywords to hide"] = "Comma separated list of keywords";
+$a->strings["Save Settings"] = "";
+$a->strings["Use /expression/ to provide regular expressions"] = "Use /expression/ for regular expressions.";
+$a->strings["NSFW Settings saved."] = "NSFW settings saved.";
+$a->strings["%s - Click to open/close"] = "%s - Reveal/hide";
diff --git a/nsfw/lang/en-us/strings.php b/nsfw/lang/en-us/strings.php
index a19b50b8..294cbbd6 100644
--- a/nsfw/lang/en-us/strings.php
+++ b/nsfw/lang/en-us/strings.php
@@ -2,11 +2,14 @@
 
 if(! function_exists("string_plural_select_en_us")) {
 function string_plural_select_en_us($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Enable Content filter'] = 'Enable content filter';
-$a->strings['Comma separated list of keywords to hide'] = 'Comma separated list of keywords';
-$a->strings['Use /expression/ to provide regular expressions'] = 'Use /expression/ for regular expressions.';
-$a->strings['NSFW Settings saved.'] = 'NSFW settings saved.';
-$a->strings['%s - Click to open/close'] = '%s - Reveal/hide';
+;
+$a->strings["Content Filter (NSFW and more)"] = "";
+$a->strings["This addon searches for specified words/text in posts and collapses them. It can be used to filter content tagged with for instance #NSFW that may be deemed inappropriate at certain times or places, such as being at work. It is also useful for hiding irrelevant or annoying content from direct view."] = "";
+$a->strings["Enable Content filter"] = "Enable content filter";
+$a->strings["Comma separated list of keywords to hide"] = "Comma separated list of keywords";
+$a->strings["Save Settings"] = "";
+$a->strings["Use /expression/ to provide regular expressions"] = "Use /expression/ for regular expressions.";
+$a->strings["NSFW Settings saved."] = "NSFW settings saved.";
+$a->strings["%s - Click to open/close"] = "%s - Reveal/hide";
diff --git a/nsfw/lang/es/messages.po b/nsfw/lang/es/messages.po
index 43fde3cb..2950395f 100644
--- a/nsfw/lang/es/messages.po
+++ b/nsfw/lang/es/messages.po
@@ -4,59 +4,56 @@
 # 
 # 
 # Translators:
-# Senex Petrovic <javierruizo@hotmail.com>, 2021
 # Tupambae.org, 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-12-10 14:42-0500\n"
-"PO-Revision-Date: 2014-06-23 10:34+0000\n"
-"Last-Translator: Senex Petrovic <javierruizo@hotmail.com>, 2021\n"
-"Language-Team: Spanish (http://app.transifex.com/Friendica/friendica/language/es/)\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2016-04-18 19:53+0000\n"
+"Last-Translator: Tupambae.org\n"
+"Language-Team: Spanish (http://www.transifex.com/Friendica/friendica/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: es\n"
-"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: nsfw.php:65
+#: nsfw.php:78
+msgid "Not Safe For Work (General Purpose Content Filter) settings"
+msgstr "Configuración \"No apto para trabajar\" (Filtro genérico de contenido)"
+
+#: nsfw.php:80
 msgid ""
-"This addon searches for specified words/text in posts and collapses them. It"
-" can be used to filter content tagged with for instance #NSFW that may be "
-"deemed inappropriate at certain times or places, such as being at work. It "
-"is also useful for hiding irrelevant or annoying content from direct view."
-msgstr "Este complemento busca palabras / texto específicos en las publicaciones y las contrae. Se puede utilizar para filtrar contenido etiquetado con, por ejemplo, #NSFW que puede considerarse inapropiado en determinados momentos o lugares, como en el trabajo. También es útil para ocultar contenido irrelevante o molesto de la vista directa."
+"This addon looks in posts for the words/text you specify below, and "
+"collapses any content containing those keywords so it is not displayed at "
+"inappropriate times, such as sexual innuendo that may be improper in a work "
+"setting. It is polite and recommended to tag any content containing nudity "
+"with #NSFW.  This filter can also match any other word/text you specify, and"
+" can thereby be used as a general purpose content filter."
+msgstr "Este addon se fija por el contenido del texto y colapsa todo tema o respuesta que contiene las palabras establecidas. Como tales pueden ser contenido sexual o de otra índole que no conviene desplegar en el trabajo o ambientes correspondientes. Es de buena educación y recomendado de identificar todo tipo de contenido explicito con #NSFW. Este filtro además puede ser usado con cualquier palabra a especificar y por lo tanto ser usado como un filtro generico de contenido."
 
-#: nsfw.php:66
+#: nsfw.php:81
 msgid "Enable Content filter"
 msgstr "Habilitar filtro de contenido"
 
-#: nsfw.php:67
+#: nsfw.php:84
 msgid "Comma separated list of keywords to hide"
 msgstr "Lista de palabras claves separadas por coma para colapsar el contenido correspondiente."
 
-#: nsfw.php:67
-msgid ""
-"Use /expression/ to provide regular expressions, #tag to specfically match "
-"hashtags (case-insensitive), or regular words (case-sensitive)"
-msgstr ""
+#: nsfw.php:88
+msgid "Submit"
+msgstr "Enviar"
 
-#: nsfw.php:72
-msgid "Content Filter (NSFW and more)"
-msgstr "Filtro de contenido (NSFW y más)"
+#: nsfw.php:89
+msgid "Use /expression/ to provide regular expressions"
+msgstr "Utiliza /expresión/ para proveer expresiones regulares."
 
-#: nsfw.php:96
+#: nsfw.php:105
+msgid "NSFW Settings saved."
+msgstr "Configuración NSFW guardada."
+
+#: nsfw.php:157
 #, php-format
-msgid "Regular expression \"%s\" fails to compile"
-msgstr ""
-
-#: nsfw.php:154
-#, php-format
-msgid "Filtered tag: %s"
-msgstr "Etiqueta filtrada: %s"
-
-#: nsfw.php:156
-#, php-format
-msgid "Filtered word: %s"
-msgstr "Palabra filtrada: %s"
+msgid "%s - Click to open/close"
+msgstr "%s - Click aquí para abrir/cerrar"
diff --git a/nsfw/lang/es/strings.php b/nsfw/lang/es/strings.php
index 4b41bd14..75d3211d 100644
--- a/nsfw/lang/es/strings.php
+++ b/nsfw/lang/es/strings.php
@@ -2,12 +2,14 @@
 
 if(! function_exists("string_plural_select_es")) {
 function string_plural_select_es($n){
-	$n = intval($n);
-	if ($n == 1) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
+	return ($n != 1);;
 }}
-$a->strings['This addon searches for specified words/text in posts and collapses them. It can be used to filter content tagged with for instance #NSFW that may be deemed inappropriate at certain times or places, such as being at work. It is also useful for hiding irrelevant or annoying content from direct view.'] = 'Este complemento busca palabras / texto específicos en las publicaciones y las contrae. Se puede utilizar para filtrar contenido etiquetado con, por ejemplo, #NSFW que puede considerarse inapropiado en determinados momentos o lugares, como en el trabajo. También es útil para ocultar contenido irrelevante o molesto de la vista directa.';
-$a->strings['Enable Content filter'] = 'Habilitar filtro de contenido';
-$a->strings['Comma separated list of keywords to hide'] = 'Lista de palabras claves separadas por coma para colapsar el contenido correspondiente.';
-$a->strings['Content Filter (NSFW and more)'] = 'Filtro de contenido (NSFW y más)';
-$a->strings['Filtered tag: %s'] = 'Etiqueta filtrada: %s';
-$a->strings['Filtered word: %s'] = 'Palabra filtrada: %s';
+;
+$a->strings["Not Safe For Work (General Purpose Content Filter) settings"] = "Configuración \"No apto para trabajar\" (Filtro genérico de contenido)";
+$a->strings["This addon looks in posts for the words/text you specify below, and collapses any content containing those keywords so it is not displayed at inappropriate times, such as sexual innuendo that may be improper in a work setting. It is polite and recommended to tag any content containing nudity with #NSFW.  This filter can also match any other word/text you specify, and can thereby be used as a general purpose content filter."] = "Este addon se fija por el contenido del texto y colapsa todo tema o respuesta que contiene las palabras establecidas. Como tales pueden ser contenido sexual o de otra índole que no conviene desplegar en el trabajo o ambientes correspondientes. Es de buena educación y recomendado de identificar todo tipo de contenido explicito con #NSFW. Este filtro además puede ser usado con cualquier palabra a especificar y por lo tanto ser usado como un filtro generico de contenido.";
+$a->strings["Enable Content filter"] = "Habilitar filtro de contenido";
+$a->strings["Comma separated list of keywords to hide"] = "Lista de palabras claves separadas por coma para colapsar el contenido correspondiente.";
+$a->strings["Submit"] = "Enviar";
+$a->strings["Use /expression/ to provide regular expressions"] = "Utiliza /expresión/ para proveer expresiones regulares.";
+$a->strings["NSFW Settings saved."] = "Configuración NSFW guardada.";
+$a->strings["%s - Click to open/close"] = "%s - Click aquí para abrir/cerrar";
diff --git a/nsfw/lang/fi-fi/strings.php b/nsfw/lang/fi-fi/strings.php
index adb4b76d..2afd44f4 100644
--- a/nsfw/lang/fi-fi/strings.php
+++ b/nsfw/lang/fi-fi/strings.php
@@ -3,11 +3,15 @@
 if(! function_exists("string_plural_select_fi_fi")) {
 function string_plural_select_fi_fi($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Content Filter (NSFW and more)'] = 'Sisällönsuodatin (NSFW yms.)';
-$a->strings['Enable Content filter'] = 'Ota sisällönsuodatin käyttöön';
-$a->strings['Save Settings'] = 'Tallenna asetukset';
-$a->strings['NSFW Settings saved.'] = 'NSFW-asetukset tallennettu.';
-$a->strings['Filtered tag: %s'] = 'Suodatettu tunniste: %s';
-$a->strings['Filtered word: %s'] = 'Suodatettu sana: %s';
+;
+$a->strings["Content Filter (NSFW and more)"] = "Sisällönsuodatin (NSFW yms.)";
+$a->strings["This addon searches for specified words/text in posts and collapses them. It can be used to filter content tagged with for instance #NSFW that may be deemed inappropriate at certain times or places, such as being at work. It is also useful for hiding irrelevant or annoying content from direct view."] = "";
+$a->strings["Enable Content filter"] = "Ota sisällönsuodatin käyttöön";
+$a->strings["Comma separated list of keywords to hide"] = "";
+$a->strings["Save Settings"] = "Tallenna asetukset";
+$a->strings["Use /expression/ to provide regular expressions"] = "";
+$a->strings["NSFW Settings saved."] = "NSFW-asetukset tallennettu.";
+$a->strings["Filtered tag: %s"] = "Suodatettu tunniste: %s";
+$a->strings["Filtered word: %s"] = "Suodatettu sana: %s";
diff --git a/nsfw/lang/fr/messages.po b/nsfw/lang/fr/messages.po
deleted file mode 100644
index 36fd22cc..00000000
--- a/nsfw/lang/fr/messages.po
+++ /dev/null
@@ -1,64 +0,0 @@
-# ADDON nsfw
-# Copyright (C)
-# This file is distributed under the same license as the Friendica nsfw addon package.
-# 
-# 
-# Translators:
-# Florent C., 2023
-# Nicolas Derive, 2022-2023
-# StefOfficiel <pichard.stephane@free.fr>, 2015
-# Vincent Vindarel <vindarel@mailz.org>, 2018
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-12-10 14:42-0500\n"
-"PO-Revision-Date: 2014-06-23 10:34+0000\n"
-"Last-Translator: Florent C., 2023\n"
-"Language-Team: French (http://app.transifex.com/Friendica/friendica/language/fr/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: fr\n"
-"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
-
-#: nsfw.php:65
-msgid ""
-"This addon searches for specified words/text in posts and collapses them. It"
-" can be used to filter content tagged with for instance #NSFW that may be "
-"deemed inappropriate at certain times or places, such as being at work. It "
-"is also useful for hiding irrelevant or annoying content from direct view."
-msgstr "Cette extension recherche des mots/textes spécifiés dans les publications et les masque. Elle peut être utilisée pour filtrer le contenu étiqueté par exemple avec #NSFW qui peut être considéré comme inapproprié à certains moments ou endroits, comme par exemple au travail. Elle est aussi utile pour cacher du contenu non pertinent ou ennuyeux d'une vue directe."
-
-#: nsfw.php:66
-msgid "Enable Content filter"
-msgstr "Activer le filtrage de contenu"
-
-#: nsfw.php:67
-msgid "Comma separated list of keywords to hide"
-msgstr "Liste de mots-clés - séparés par des virgules - à cacher"
-
-#: nsfw.php:67
-msgid ""
-"Use /expression/ to provide regular expressions, #tag to specfically match "
-"hashtags (case-insensitive), or regular words (case-sensitive)"
-msgstr "Utiliser /expression/ pour fournir des expressions régulières, #tag pour correspondre à un tag (insensible à la casse), ou des mots classiques (sensible à la casse)"
-
-#: nsfw.php:72
-msgid "Content Filter (NSFW and more)"
-msgstr "Filtre de contenu (NSFW et autres)"
-
-#: nsfw.php:96
-#, php-format
-msgid "Regular expression \"%s\" fails to compile"
-msgstr "La compilation de l'expression régulière \"%s\" a échoué"
-
-#: nsfw.php:154
-#, php-format
-msgid "Filtered tag: %s"
-msgstr "Tag filtré : %s"
-
-#: nsfw.php:156
-#, php-format
-msgid "Filtered word: %s"
-msgstr "Mot filtré: %s"
diff --git a/nsfw/lang/fr/strings.php b/nsfw/lang/fr/strings.php
index fc03d5ad..09086f48 100644
--- a/nsfw/lang/fr/strings.php
+++ b/nsfw/lang/fr/strings.php
@@ -1,15 +1,10 @@
-<?php
-
-if(! function_exists("string_plural_select_fr")) {
-function string_plural_select_fr($n){
-	$n = intval($n);
-	if (($n == 0 || $n == 1)) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
-}}
-$a->strings['This addon searches for specified words/text in posts and collapses them. It can be used to filter content tagged with for instance #NSFW that may be deemed inappropriate at certain times or places, such as being at work. It is also useful for hiding irrelevant or annoying content from direct view.'] = 'Cette extension recherche des mots/textes spécifiés dans les publications et les masque. Elle peut être utilisée pour filtrer le contenu étiqueté par exemple avec #NSFW qui peut être considéré comme inapproprié à certains moments ou endroits, comme par exemple au travail. Elle est aussi utile pour cacher du contenu non pertinent ou ennuyeux d\'une vue directe.';
-$a->strings['Enable Content filter'] = 'Activer le filtrage de contenu';
-$a->strings['Comma separated list of keywords to hide'] = 'Liste de mots-clés - séparés par des virgules - à cacher';
-$a->strings['Use /expression/ to provide regular expressions, #tag to specfically match hashtags (case-insensitive), or regular words (case-sensitive)'] = 'Utiliser /expression/ pour fournir des expressions régulières, #tag pour correspondre à un tag (insensible à la casse), ou des mots classiques (sensible à la casse)';
-$a->strings['Content Filter (NSFW and more)'] = 'Filtre de contenu (NSFW et autres)';
-$a->strings['Regular expression "%s" fails to compile'] = 'La compilation de l\'expression régulière "%s" a échoué';
-$a->strings['Filtered tag: %s'] = 'Tag filtré : %s';
-$a->strings['Filtered word: %s'] = 'Mot filtré: %s';
+<?php
+
+$a->strings["Not Safe For Work (General Purpose Content Filter) settings"] = "Réglages de \"NSFW\" (filtrage de contenu)";
+$a->strings["This addon looks in posts for the words/text you specify below, and collapses any content containing those keywords so it is not displayed at inappropriate times, such as sexual innuendo that may be improper in a work setting. It is polite and recommended to tag any content containing nudity with #NSFW.  This filter can also match any other word/text you specify, and can thereby be used as a general purpose content filter."] = "Cette extension va parcourir les publications à la recherche des mots (ou phrases) que vous spécifierez ci-dessous, et repliera automatiquement tout contenu qui les contiendrait, afin de ne pas risquer de les afficher à un moment inopportun. Comme par exemple des messages à caractère sexuel dans un contexte professionnel. Il est globalement considéré comme correct et poli de \"tagguer\" toute publication contenant de la nudité avec #NSFW (Not Safe For Work - pas pour le boulot).    Ce filtre peut également fonctionner pour tout autre texte que vous spécifierez, et pourra ainsi être utilisé comme filtre de contenu générique.";
+$a->strings["Enable Content filter"] = "Activer le filtrage de contenu";
+$a->strings["Comma separated list of keywords to hide"] = "Liste de mots-clés - séparés par des virgules - à cacher";
+$a->strings["Submit"] = "Envoyer";
+$a->strings["Use /expression/ to provide regular expressions"] = "Utilisez /expression/ pour les expressions rationnelles";
+$a->strings["NSFW Settings saved."] = "Réglages NSFW sauvegardés.";
+$a->strings["%s - Click to open/close"] = "%s - cliquer pour ouvrir/fermer";
diff --git a/nsfw/lang/hu/messages.po b/nsfw/lang/hu/messages.po
deleted file mode 100644
index 9632a2ff..00000000
--- a/nsfw/lang/hu/messages.po
+++ /dev/null
@@ -1,61 +0,0 @@
-# ADDON nsfw
-# Copyright (C)
-# This file is distributed under the same license as the Friendica nsfw addon package.
-# 
-# 
-# Translators:
-# Balázs Úr, 2020-2023
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-12-10 14:42-0500\n"
-"PO-Revision-Date: 2014-06-23 10:34+0000\n"
-"Last-Translator: Balázs Úr, 2020-2023\n"
-"Language-Team: Hungarian (http://app.transifex.com/Friendica/friendica/language/hu/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: hu\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: nsfw.php:65
-msgid ""
-"This addon searches for specified words/text in posts and collapses them. It"
-" can be used to filter content tagged with for instance #NSFW that may be "
-"deemed inappropriate at certain times or places, such as being at work. It "
-"is also useful for hiding irrelevant or annoying content from direct view."
-msgstr "Ez a bővítmény megadott szavakra vagy szövegre keres a bejegyzésekben, és összecsukja azokat. Használható például az #NSFW megjelölésű tartalmak szűréséhez, amelyek bizonyos időkben vagy helyeken nem megfelelőnek tekinthetők, mint például munka közben. Ez hasznos a nem kapcsolódó vagy idegesítő tartalom elrejtéséhez a közvetlen megtekintés elől."
-
-#: nsfw.php:66
-msgid "Enable Content filter"
-msgstr "Tartalomszűrő engedélyezése"
-
-#: nsfw.php:67
-msgid "Comma separated list of keywords to hide"
-msgstr "Kulcsszavak vesszővel elválasztott listája az elrejtéshez"
-
-#: nsfw.php:67
-msgid ""
-"Use /expression/ to provide regular expressions, #tag to specfically match "
-"hashtags (case-insensitive), or regular words (case-sensitive)"
-msgstr "Használjon /kifejezést/ reguláris kifejezések megadásához, #címkét a kettőskeresztescímkék kifejezett illesztéséhez (nem érzékeny a kis- és nagybetűkre) vagy szabályos szavakat (kis- és nagybetűérzékeny)"
-
-#: nsfw.php:72
-msgid "Content Filter (NSFW and more)"
-msgstr "Tartalomszűrő (érzékeny tartalmak és egyebek)"
-
-#: nsfw.php:96
-#, php-format
-msgid "Regular expression \"%s\" fails to compile"
-msgstr "A(z) „%s” reguláris kifejezés nem fordítható le"
-
-#: nsfw.php:154
-#, php-format
-msgid "Filtered tag: %s"
-msgstr "Kiszűrt címke: %s"
-
-#: nsfw.php:156
-#, php-format
-msgid "Filtered word: %s"
-msgstr "Kiszűrt szó: %s"
diff --git a/nsfw/lang/hu/strings.php b/nsfw/lang/hu/strings.php
deleted file mode 100644
index 5f335b3e..00000000
--- a/nsfw/lang/hu/strings.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_hu")) {
-function string_plural_select_hu($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['This addon searches for specified words/text in posts and collapses them. It can be used to filter content tagged with for instance #NSFW that may be deemed inappropriate at certain times or places, such as being at work. It is also useful for hiding irrelevant or annoying content from direct view.'] = 'Ez a bővítmény megadott szavakra vagy szövegre keres a bejegyzésekben, és összecsukja azokat. Használható például az #NSFW megjelölésű tartalmak szűréséhez, amelyek bizonyos időkben vagy helyeken nem megfelelőnek tekinthetők, mint például munka közben. Ez hasznos a nem kapcsolódó vagy idegesítő tartalom elrejtéséhez a közvetlen megtekintés elől.';
-$a->strings['Enable Content filter'] = 'Tartalomszűrő engedélyezése';
-$a->strings['Comma separated list of keywords to hide'] = 'Kulcsszavak vesszővel elválasztott listája az elrejtéshez';
-$a->strings['Use /expression/ to provide regular expressions, #tag to specfically match hashtags (case-insensitive), or regular words (case-sensitive)'] = 'Használjon /kifejezést/ reguláris kifejezések megadásához, #címkét a kettőskeresztescímkék kifejezett illesztéséhez (nem érzékeny a kis- és nagybetűkre) vagy szabályos szavakat (kis- és nagybetűérzékeny)';
-$a->strings['Content Filter (NSFW and more)'] = 'Tartalomszűrő (érzékeny tartalmak és egyebek)';
-$a->strings['Regular expression "%s" fails to compile'] = 'A(z) „%s” reguláris kifejezés nem fordítható le';
-$a->strings['Filtered tag: %s'] = 'Kiszűrt címke: %s';
-$a->strings['Filtered word: %s'] = 'Kiszűrt szó: %s';
diff --git a/nsfw/lang/it/messages.po b/nsfw/lang/it/messages.po
index eadbb1aa..abb605cd 100644
--- a/nsfw/lang/it/messages.po
+++ b/nsfw/lang/it/messages.po
@@ -5,58 +5,58 @@
 # 
 # Translators:
 # fabrixxm <fabrix.xm@gmail.com>, 2014-2015,2018
-# Sylke Vicious <silkevicious@gmail.com>, 2020,2023
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-12-10 14:42-0500\n"
-"PO-Revision-Date: 2014-06-23 10:34+0000\n"
-"Last-Translator: Sylke Vicious <silkevicious@gmail.com>, 2020,2023\n"
-"Language-Team: Italian (http://app.transifex.com/Friendica/friendica/language/it/)\n"
+"POT-Creation-Date: 2018-04-01 11:11-0400\n"
+"PO-Revision-Date: 2018-05-28 09:01+0000\n"
+"Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n"
+"Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: it\n"
-"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: nsfw.php:65
+#: nsfw.php:77 nsfw.php:81
+msgid "Content Filter (NSFW and more)"
+msgstr "Filtro Contenuto (NSFW e altro)"
+
+#: nsfw.php:85
 msgid ""
 "This addon searches for specified words/text in posts and collapses them. It"
 " can be used to filter content tagged with for instance #NSFW that may be "
 "deemed inappropriate at certain times or places, such as being at work. It "
 "is also useful for hiding irrelevant or annoying content from direct view."
-msgstr "Questo componente aggiuntivo cerca per le parole specificate nei messaggi e li collassa. Può essere usato per filtrare contenuto taggato, per esempio, #NSFW (non sicuro per il lavoro), che può risultare inappropriato in certi orari o in certi luoghi, come appunto al lavoro. È anche utile per nascondere contenuto irrilevante o fastidioso."
+msgstr "Questo componente aggiuntivo cerca per le parole specificate nei messaggi e li collassa. Può essere usato per filtrare contenuto taggato, per esempio, #NSFW (non sicuro per il lavoro), che puo' risultare inappropriato in certi orari o in certi luoghi, come appunto al lavoro. È anche utile per nascondere contenuto irrilevante o fastidioso."
 
-#: nsfw.php:66
+#: nsfw.php:86
 msgid "Enable Content filter"
 msgstr "Abilita il Filtro Contenuti"
 
-#: nsfw.php:67
+#: nsfw.php:89
 msgid "Comma separated list of keywords to hide"
 msgstr "Elenco separato da virgole di parole da nascondere"
 
-#: nsfw.php:67
-msgid ""
-"Use /expression/ to provide regular expressions, #tag to specfically match "
-"hashtags (case-insensitive), or regular words (case-sensitive)"
-msgstr "Usa /expression/ per fornire espressioni regolari, #tag per gli hashtag che coincidono specificatamente (insensibile alle maiuscole), o parole normali (sensibile alle maiuscole)"
+#: nsfw.php:93
+msgid "Save Settings"
+msgstr "Salva Impostazioni"
 
-#: nsfw.php:72
-msgid "Content Filter (NSFW and more)"
-msgstr "Filtro Contenuto (NSFW e altro)"
+#: nsfw.php:94
+msgid "Use /expression/ to provide regular expressions"
+msgstr "Utilizza /espressione/ per inserire espressioni regolari"
 
-#: nsfw.php:96
-#, php-format
-msgid "Regular expression \"%s\" fails to compile"
-msgstr "L'espressione regolare \"%s\" fallisce la compilazione"
+#: nsfw.php:109
+msgid "NSFW Settings saved."
+msgstr "Impostazioni NSFW salvate."
 
-#: nsfw.php:154
+#: nsfw.php:162
 #, php-format
 msgid "Filtered tag: %s"
 msgstr "Tag filtrato: %s"
 
-#: nsfw.php:156
+#: nsfw.php:164
 #, php-format
 msgid "Filtered word: %s"
 msgstr "Parola filtrata:  %s"
diff --git a/nsfw/lang/it/strings.php b/nsfw/lang/it/strings.php
index ff963972..18ecfb16 100644
--- a/nsfw/lang/it/strings.php
+++ b/nsfw/lang/it/strings.php
@@ -3,13 +3,15 @@
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
 	$n = intval($n);
-	if ($n == 1) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
+	return ($n != 1);;
 }}
-$a->strings['This addon searches for specified words/text in posts and collapses them. It can be used to filter content tagged with for instance #NSFW that may be deemed inappropriate at certain times or places, such as being at work. It is also useful for hiding irrelevant or annoying content from direct view.'] = 'Questo componente aggiuntivo cerca per le parole specificate nei messaggi e li collassa. Può essere usato per filtrare contenuto taggato, per esempio, #NSFW (non sicuro per il lavoro), che può risultare inappropriato in certi orari o in certi luoghi, come appunto al lavoro. È anche utile per nascondere contenuto irrilevante o fastidioso.';
-$a->strings['Enable Content filter'] = 'Abilita il Filtro Contenuti';
-$a->strings['Comma separated list of keywords to hide'] = 'Elenco separato da virgole di parole da nascondere';
-$a->strings['Use /expression/ to provide regular expressions, #tag to specfically match hashtags (case-insensitive), or regular words (case-sensitive)'] = 'Usa /expression/ per fornire espressioni regolari, #tag per gli hashtag che coincidono specificatamente (insensibile alle maiuscole), o parole normali (sensibile alle maiuscole)';
-$a->strings['Content Filter (NSFW and more)'] = 'Filtro Contenuto (NSFW e altro)';
-$a->strings['Regular expression "%s" fails to compile'] = 'L\'espressione regolare "%s" fallisce la compilazione';
-$a->strings['Filtered tag: %s'] = 'Tag filtrato: %s';
-$a->strings['Filtered word: %s'] = 'Parola filtrata:  %s';
+;
+$a->strings["Content Filter (NSFW and more)"] = "Filtro Contenuto (NSFW e altro)";
+$a->strings["This addon searches for specified words/text in posts and collapses them. It can be used to filter content tagged with for instance #NSFW that may be deemed inappropriate at certain times or places, such as being at work. It is also useful for hiding irrelevant or annoying content from direct view."] = "Questo componente aggiuntivo cerca per le parole specificate nei messaggi e li collassa. Può essere usato per filtrare contenuto taggato, per esempio, #NSFW (non sicuro per il lavoro), che puo' risultare inappropriato in certi orari o in certi luoghi, come appunto al lavoro. È anche utile per nascondere contenuto irrilevante o fastidioso.";
+$a->strings["Enable Content filter"] = "Abilita il Filtro Contenuti";
+$a->strings["Comma separated list of keywords to hide"] = "Elenco separato da virgole di parole da nascondere";
+$a->strings["Save Settings"] = "Salva Impostazioni";
+$a->strings["Use /expression/ to provide regular expressions"] = "Utilizza /espressione/ per inserire espressioni regolari";
+$a->strings["NSFW Settings saved."] = "Impostazioni NSFW salvate.";
+$a->strings["Filtered tag: %s"] = "Tag filtrato: %s";
+$a->strings["Filtered word: %s"] = "Parola filtrata:  %s";
diff --git a/nsfw/lang/nl/messages.po b/nsfw/lang/nl/messages.po
index a012eee1..e7af8746 100644
--- a/nsfw/lang/nl/messages.po
+++ b/nsfw/lang/nl/messages.po
@@ -4,15 +4,14 @@
 # 
 # 
 # Translators:
-# Casper <casper@vrije-mens.org>, 2020
 # Jeroen De Meerleer <me@jeroened.be>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-04-01 11:11-0400\n"
-"PO-Revision-Date: 2020-09-04 21:08+0000\n"
-"Last-Translator: Casper <casper@vrije-mens.org>\n"
+"PO-Revision-Date: 2018-08-24 13:43+0000\n"
+"Last-Translator: Jeroen De Meerleer <me@jeroened.be>\n"
 "Language-Team: Dutch (http://www.transifex.com/Friendica/friendica/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -30,7 +29,7 @@ msgid ""
 " can be used to filter content tagged with for instance #NSFW that may be "
 "deemed inappropriate at certain times or places, such as being at work. It "
 "is also useful for hiding irrelevant or annoying content from direct view."
-msgstr "Deze add-on zoekt naar gespecificeerde woorden / tekst in berichten en vouwt ze samen. Het kan worden gebruikt om inhoud te filteren die is getagd met bijvoorbeeld #NSFW die op bepaalde tijden of plaatsen als ongepast kan worden beschouwd, zoals op het werk. Het is ook handig om irrelevante of irritante inhoud voor direct zicht te verbergen."
+msgstr ""
 
 #: nsfw.php:86
 msgid "Enable Content filter"
diff --git a/nsfw/lang/nl/strings.php b/nsfw/lang/nl/strings.php
index 67d071bb..d1a121a7 100644
--- a/nsfw/lang/nl/strings.php
+++ b/nsfw/lang/nl/strings.php
@@ -3,10 +3,15 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Content Filter (NSFW and more)'] = 'Inhoud filter (NSFW en meer)';
-$a->strings['This addon searches for specified words/text in posts and collapses them. It can be used to filter content tagged with for instance #NSFW that may be deemed inappropriate at certain times or places, such as being at work. It is also useful for hiding irrelevant or annoying content from direct view.'] = 'Deze add-on zoekt naar gespecificeerde woorden / tekst in berichten en vouwt ze samen. Het kan worden gebruikt om inhoud te filteren die is getagd met bijvoorbeeld #NSFW die op bepaalde tijden of plaatsen als ongepast kan worden beschouwd, zoals op het werk. Het is ook handig om irrelevante of irritante inhoud voor direct zicht te verbergen.';
-$a->strings['Enable Content filter'] = 'Content filter inschakelen';
-$a->strings['Save Settings'] = 'Instellingen opslaan';
-$a->strings['NSFW Settings saved.'] = 'NSFW instellingen opgeslagen';
+;
+$a->strings["Content Filter (NSFW and more)"] = "Inhoud filter (NSFW en meer)";
+$a->strings["This addon searches for specified words/text in posts and collapses them. It can be used to filter content tagged with for instance #NSFW that may be deemed inappropriate at certain times or places, such as being at work. It is also useful for hiding irrelevant or annoying content from direct view."] = "";
+$a->strings["Enable Content filter"] = "Content filter inschakelen";
+$a->strings["Comma separated list of keywords to hide"] = "";
+$a->strings["Save Settings"] = "Instellingen opslaan";
+$a->strings["Use /expression/ to provide regular expressions"] = "";
+$a->strings["NSFW Settings saved."] = "NSFW instellingen opgeslagen";
+$a->strings["Filtered tag: %s"] = "";
+$a->strings["Filtered word: %s"] = "";
diff --git a/nsfw/lang/pl/messages.po b/nsfw/lang/pl/messages.po
index 67de5248..3345750f 100644
--- a/nsfw/lang/pl/messages.po
+++ b/nsfw/lang/pl/messages.po
@@ -4,15 +4,14 @@
 # 
 # 
 # Translators:
-# Piotr Strębski <strebski@gmail.com>, 2022
-# Waldemar Stoczkowski, 2018
+# Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-11-18 11:57-0500\n"
-"PO-Revision-Date: 2014-06-23 10:34+0000\n"
-"Last-Translator: Piotr Strębski <strebski@gmail.com>, 2022\n"
+"POT-Creation-Date: 2018-04-01 11:11-0400\n"
+"PO-Revision-Date: 2018-04-07 16:56+0000\n"
+"Last-Translator: Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.com/Friendica/friendica/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,7 +19,11 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
-#: nsfw.php:65
+#: nsfw.php:77 nsfw.php:81
+msgid "Content Filter (NSFW and more)"
+msgstr "Filtr zawartości (NSFW i więcej)"
+
+#: nsfw.php:85
 msgid ""
 "This addon searches for specified words/text in posts and collapses them. It"
 " can be used to filter content tagged with for instance #NSFW that may be "
@@ -28,30 +31,32 @@ msgid ""
 "is also useful for hiding irrelevant or annoying content from direct view."
 msgstr "Ten dodatek szuka określonych słów/tekstów w postach i zwija je. Może służyć do filtrowania treści oznaczonych np. NSFW, które mogą zostać uznane za nieodpowiednie w określonych momentach lub miejscach, na przykład w pracy. Jest to również przydatne do ukrywania nieistotnych lub irytujących treści z bezpośredniego widoku."
 
-#: nsfw.php:66
+#: nsfw.php:86
 msgid "Enable Content filter"
 msgstr "Włącz filtr treści"
 
-#: nsfw.php:67
+#: nsfw.php:89
 msgid "Comma separated list of keywords to hide"
 msgstr "Rozdzielana przecinkami lista słów kluczowych do ukrycia"
 
-#: nsfw.php:67
-msgid ""
-"Use /expression/ to provide regular expressions, #tag to specfically match "
-"hashtags (case-insensitive), or regular words (case-sensitive)"
-msgstr ""
+#: nsfw.php:93
+msgid "Save Settings"
+msgstr "Zapisz ustawienia"
 
-#: nsfw.php:72
-msgid "Content Filter (NSFW and more)"
-msgstr "Filtr zawartości (NSFW i więcej)"
+#: nsfw.php:94
+msgid "Use /expression/ to provide regular expressions"
+msgstr "Użyj /wyrażenia/, aby zapewnić wyrażenia regularne"
 
-#: nsfw.php:140
+#: nsfw.php:109
+msgid "NSFW Settings saved."
+msgstr "Ustawienia NSFW zostały zapisane."
+
+#: nsfw.php:162
 #, php-format
 msgid "Filtered tag: %s"
-msgstr "Filtrowane znaczników: %s"
+msgstr "Filtrowane tagów: %s"
 
-#: nsfw.php:142
+#: nsfw.php:164
 #, php-format
 msgid "Filtered word: %s"
 msgstr "Filtrowane słowo: %s"
diff --git a/nsfw/lang/pl/strings.php b/nsfw/lang/pl/strings.php
index 3fc65a76..e749b72d 100644
--- a/nsfw/lang/pl/strings.php
+++ b/nsfw/lang/pl/strings.php
@@ -2,12 +2,15 @@
 
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
-	$n = intval($n);
-	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
+	return ($n==1 ? 0 : ($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14) ? 1 : $n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14) ? 2 : 3);;
 }}
-$a->strings['This addon searches for specified words/text in posts and collapses them. It can be used to filter content tagged with for instance #NSFW that may be deemed inappropriate at certain times or places, such as being at work. It is also useful for hiding irrelevant or annoying content from direct view.'] = 'Ten dodatek szuka określonych słów/tekstów w postach i zwija je. Może służyć do filtrowania treści oznaczonych np. NSFW, które mogą zostać uznane za nieodpowiednie w określonych momentach lub miejscach, na przykład w pracy. Jest to również przydatne do ukrywania nieistotnych lub irytujących treści z bezpośredniego widoku.';
-$a->strings['Enable Content filter'] = 'Włącz filtr treści';
-$a->strings['Comma separated list of keywords to hide'] = 'Rozdzielana przecinkami lista słów kluczowych do ukrycia';
-$a->strings['Content Filter (NSFW and more)'] = 'Filtr zawartości (NSFW i więcej)';
-$a->strings['Filtered tag: %s'] = 'Filtrowane znaczników: %s';
-$a->strings['Filtered word: %s'] = 'Filtrowane słowo: %s';
+;
+$a->strings["Content Filter (NSFW and more)"] = "Filtr zawartości (NSFW i więcej)";
+$a->strings["This addon searches for specified words/text in posts and collapses them. It can be used to filter content tagged with for instance #NSFW that may be deemed inappropriate at certain times or places, such as being at work. It is also useful for hiding irrelevant or annoying content from direct view."] = "Ten dodatek szuka określonych słów/tekstów w postach i zwija je. Może służyć do filtrowania treści oznaczonych np. NSFW, które mogą zostać uznane za nieodpowiednie w określonych momentach lub miejscach, na przykład w pracy. Jest to również przydatne do ukrywania nieistotnych lub irytujących treści z bezpośredniego widoku.";
+$a->strings["Enable Content filter"] = "Włącz filtr treści";
+$a->strings["Comma separated list of keywords to hide"] = "Rozdzielana przecinkami lista słów kluczowych do ukrycia";
+$a->strings["Save Settings"] = "Zapisz ustawienia";
+$a->strings["Use /expression/ to provide regular expressions"] = "Użyj /wyrażenia/, aby zapewnić wyrażenia regularne";
+$a->strings["NSFW Settings saved."] = "Ustawienia NSFW zostały zapisane.";
+$a->strings["Filtered tag: %s"] = "Filtrowane tagów: %s";
+$a->strings["Filtered word: %s"] = "Filtrowane słowo: %s";
diff --git a/nsfw/lang/pt-br/strings.php b/nsfw/lang/pt-br/strings.php
index e4f37758..21a81492 100644
--- a/nsfw/lang/pt-br/strings.php
+++ b/nsfw/lang/pt-br/strings.php
@@ -2,8 +2,14 @@
 
 if(! function_exists("string_plural_select_pt_br")) {
 function string_plural_select_pt_br($n){
-	$n = intval($n);
-	return intval($n > 1);
+	return ($n > 1);;
 }}
-$a->strings['Enable Content filter'] = 'Habilitar filtro de conteúdo';
-$a->strings['Submit'] = 'Enviar';
+;
+$a->strings["Not Safe For Work (General Purpose Content Filter) settings"] = "";
+$a->strings["This addon looks in posts for the words/text you specify below, and collapses any content containing those keywords so it is not displayed at inappropriate times, such as sexual innuendo that may be improper in a work setting. It is polite and recommended to tag any content containing nudity with #NSFW.  This filter can also match any other word/text you specify, and can thereby be used as a general purpose content filter."] = "";
+$a->strings["Enable Content filter"] = "Habilitar filtro de conteúdo";
+$a->strings["Comma separated list of keywords to hide"] = "";
+$a->strings["Submit"] = "Enviar";
+$a->strings["Use /expression/ to provide regular expressions"] = "";
+$a->strings["NSFW Settings saved."] = "";
+$a->strings["%s - Click to open/close"] = "";
diff --git a/nsfw/lang/ro/strings.php b/nsfw/lang/ro/strings.php
index ab190285..f03f490f 100644
--- a/nsfw/lang/ro/strings.php
+++ b/nsfw/lang/ro/strings.php
@@ -2,14 +2,14 @@
 
 if(! function_exists("string_plural_select_ro")) {
 function string_plural_select_ro($n){
-	$n = intval($n);
-	if ($n==1) { return 0; } else if ((($n%100>19)||(($n%100==0)&&($n!=0)))) { return 2; } else  { return 1; }
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
 }}
-$a->strings['Not Safe For Work (General Purpose Content Filter) settings'] = 'Nesigur Pentru Lucru (Filtrare de Conținut pentru Uz General )';
-$a->strings['This addon looks in posts for the words/text you specify below, and collapses any content containing those keywords so it is not displayed at inappropriate times, such as sexual innuendo that may be improper in a work setting. It is polite and recommended to tag any content containing nudity with #NSFW.  This filter can also match any other word/text you specify, and can thereby be used as a general purpose content filter.'] = 'Acest modul verifică în postări, cuvintele/textele pe care le specificați mai jos, și cenzurează orice conținut cu aceste cuvinte cheie, astfel încât să nu se afișeze în momentele necorespunzătoare, precum aluziile sexuale ce pot fi necorespunzătoare într-un mediu de lucru. Este politicos și recomandat să etichetați orice conținut cu nuditate, folosind eticheta #NSFW. Acest filtru poate de asemenea, potrivi orice alt cuvânt/text specificat, şi poate fi folosit astfel și ca filtru de conținut cu scop general.';
-$a->strings['Enable Content filter'] = 'Activare filtru de Conținut';
-$a->strings['Comma separated list of keywords to hide'] = 'Lista cu separator prin virgulă a cuvintelor cheie, ce vor declanșa ascunderea';
-$a->strings['Submit'] = 'Trimite';
-$a->strings['Use /expression/ to provide regular expressions'] = 'Utilizați /expresia/ pentru a oferi expresii regulate';
-$a->strings['NSFW Settings saved.'] = 'Configurările NSFW au fost salvate.';
-$a->strings['%s - Click to open/close'] = '%s - Apăsați pentru a deschide/închide';
+;
+$a->strings["Not Safe For Work (General Purpose Content Filter) settings"] = "Nesigur Pentru Lucru (Filtrare de Conținut pentru Uz General )";
+$a->strings["This addon looks in posts for the words/text you specify below, and collapses any content containing those keywords so it is not displayed at inappropriate times, such as sexual innuendo that may be improper in a work setting. It is polite and recommended to tag any content containing nudity with #NSFW.  This filter can also match any other word/text you specify, and can thereby be used as a general purpose content filter."] = "Acest modul verifică în postări, cuvintele/textele pe care le specificați mai jos, și cenzurează orice conținut cu aceste cuvinte cheie, astfel încât să nu se afișeze în momentele necorespunzătoare, precum aluziile sexuale ce pot fi necorespunzătoare într-un mediu de lucru. Este politicos și recomandat să etichetați orice conținut cu nuditate, folosind eticheta #NSFW. Acest filtru poate de asemenea, potrivi orice alt cuvânt/text specificat, şi poate fi folosit astfel și ca filtru de conținut cu scop general.";
+$a->strings["Enable Content filter"] = "Activare filtru de Conținut";
+$a->strings["Comma separated list of keywords to hide"] = "Lista cu separator prin virgulă a cuvintelor cheie, ce vor declanșa ascunderea";
+$a->strings["Submit"] = "Trimite";
+$a->strings["Use /expression/ to provide regular expressions"] = "Utilizați /expresia/ pentru a oferi expresii regulate";
+$a->strings["NSFW Settings saved."] = "Configurările NSFW au fost salvate.";
+$a->strings["%s - Click to open/close"] = "%s - Apăsați pentru a deschide/închide";
diff --git a/nsfw/lang/ru/messages.po b/nsfw/lang/ru/messages.po
deleted file mode 100644
index b3298e11..00000000
--- a/nsfw/lang/ru/messages.po
+++ /dev/null
@@ -1,61 +0,0 @@
-# ADDON nsfw
-# Copyright (C)
-# This file is distributed under the same license as the Friendica nsfw addon package.
-# 
-# 
-# Translators:
-# Alexander An <ravnina@gmail.com>, 2020
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-12-10 14:42-0500\n"
-"PO-Revision-Date: 2014-06-23 10:34+0000\n"
-"Last-Translator: Alexander An <ravnina@gmail.com>, 2020\n"
-"Language-Team: Russian (http://app.transifex.com/Friendica/friendica/language/ru/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ru\n"
-"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
-
-#: nsfw.php:65
-msgid ""
-"This addon searches for specified words/text in posts and collapses them. It"
-" can be used to filter content tagged with for instance #NSFW that may be "
-"deemed inappropriate at certain times or places, such as being at work. It "
-"is also useful for hiding irrelevant or annoying content from direct view."
-msgstr "Это дополнение ищет указанные слова и выражения в записях и сворачивает запись, если найдёт. Это можно использовать для скрытия записей с тэгом #NSFW, просмотр которых может быть нежелателен в определённое время, например, на работе. Так же можно использовать для скрытия иного контента."
-
-#: nsfw.php:66
-msgid "Enable Content filter"
-msgstr "Включить фильтр контента"
-
-#: nsfw.php:67
-msgid "Comma separated list of keywords to hide"
-msgstr "Ключевые слова для скрытия, через запятую"
-
-#: nsfw.php:67
-msgid ""
-"Use /expression/ to provide regular expressions, #tag to specfically match "
-"hashtags (case-insensitive), or regular words (case-sensitive)"
-msgstr ""
-
-#: nsfw.php:72
-msgid "Content Filter (NSFW and more)"
-msgstr "Фильтр контента (NSFW и прочее)"
-
-#: nsfw.php:96
-#, php-format
-msgid "Regular expression \"%s\" fails to compile"
-msgstr ""
-
-#: nsfw.php:154
-#, php-format
-msgid "Filtered tag: %s"
-msgstr "Скрыт тэг: %s"
-
-#: nsfw.php:156
-#, php-format
-msgid "Filtered word: %s"
-msgstr "Скрыто слово: %s"
diff --git a/nsfw/lang/ru/strings.php b/nsfw/lang/ru/strings.php
index c9035421..7e821ed8 100644
--- a/nsfw/lang/ru/strings.php
+++ b/nsfw/lang/ru/strings.php
@@ -1,13 +1,10 @@
-<?php
-
-if(! function_exists("string_plural_select_ru")) {
-function string_plural_select_ru($n){
-	$n = intval($n);
-	if ($n%10==1 && $n%100!=11) { return 0; } else if ($n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14)) { return 1; } else if ($n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)) { return 2; } else  { return 3; }
-}}
-$a->strings['This addon searches for specified words/text in posts and collapses them. It can be used to filter content tagged with for instance #NSFW that may be deemed inappropriate at certain times or places, such as being at work. It is also useful for hiding irrelevant or annoying content from direct view.'] = 'Это дополнение ищет указанные слова и выражения в записях и сворачивает запись, если найдёт. Это можно использовать для скрытия записей с тэгом #NSFW, просмотр которых может быть нежелателен в определённое время, например, на работе. Так же можно использовать для скрытия иного контента.';
-$a->strings['Enable Content filter'] = 'Включить фильтр контента';
-$a->strings['Comma separated list of keywords to hide'] = 'Ключевые слова для скрытия, через запятую';
-$a->strings['Content Filter (NSFW and more)'] = 'Фильтр контента (NSFW и прочее)';
-$a->strings['Filtered tag: %s'] = 'Скрыт тэг: %s';
-$a->strings['Filtered word: %s'] = 'Скрыто слово: %s';
+<?php
+
+$a->strings["Not Safe For Work (General Purpose Content Filter) settings"] = "";
+$a->strings["This addon looks in posts for the words/text you specify below, and collapses any content containing those keywords so it is not displayed at inappropriate times, such as sexual innuendo that may be improper in a work setting. It is polite and recommended to tag any content containing nudity with #NSFW.  This filter can also match any other word/text you specify, and can thereby be used as a general purpose content filter."] = "";
+$a->strings["Enable Content filter"] = "Включить фильтр содержимого";
+$a->strings["Comma separated list of keywords to hide"] = "ключевые слова, которые скрыть (список через запятую)";
+$a->strings["Submit"] = "Подтвердить";
+$a->strings["Use /expression/ to provide regular expressions"] = "";
+$a->strings["NSFW Settings saved."] = "NSFW Настройки сохранены.";
+$a->strings["%s - Click to open/close"] = "%s - Нажмите для открытия / закрытия";
diff --git a/nsfw/lang/sv/messages.po b/nsfw/lang/sv/messages.po
deleted file mode 100644
index 0eb50267..00000000
--- a/nsfw/lang/sv/messages.po
+++ /dev/null
@@ -1,54 +0,0 @@
-# ADDON nsfw
-# Copyright (C)
-# This file is distributed under the same license as the Friendica nsfw addon package.
-# 
-# 
-# Translators:
-# Kristoffer Grundström <lovaren@gmail.com>, 2022
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:15-0500\n"
-"PO-Revision-Date: 2022-01-16 00:49+0000\n"
-"Last-Translator: Kristoffer Grundström <lovaren@gmail.com>\n"
-"Language-Team: Swedish (http://www.transifex.com/Friendica/friendica/language/sv/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: sv\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: nsfw.php:65
-msgid ""
-"This addon searches for specified words/text in posts and collapses them. It"
-" can be used to filter content tagged with for instance #NSFW that may be "
-"deemed inappropriate at certain times or places, such as being at work. It "
-"is also useful for hiding irrelevant or annoying content from direct view."
-msgstr ""
-
-#: nsfw.php:66
-msgid "Enable Content filter"
-msgstr "Aktivera innehållsfilter"
-
-#: nsfw.php:67
-msgid "Comma separated list of keywords to hide"
-msgstr ""
-
-#: nsfw.php:67
-msgid "Use /expression/ to provide regular expressions"
-msgstr ""
-
-#: nsfw.php:72
-msgid "Content Filter (NSFW and more)"
-msgstr ""
-
-#: nsfw.php:140
-#, php-format
-msgid "Filtered tag: %s"
-msgstr ""
-
-#: nsfw.php:142
-#, php-format
-msgid "Filtered word: %s"
-msgstr ""
diff --git a/nsfw/lang/sv/strings.php b/nsfw/lang/sv/strings.php
index fec01347..3ec569a7 100644
--- a/nsfw/lang/sv/strings.php
+++ b/nsfw/lang/sv/strings.php
@@ -1,8 +1,3 @@
-<?php
-
-if(! function_exists("string_plural_select_sv")) {
-function string_plural_select_sv($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Enable Content filter'] = 'Aktivera innehållsfilter';
+<?php
+
+$a->strings["Submit"] = "Spara";
diff --git a/nsfw/lang/zh-cn/strings.php b/nsfw/lang/zh-cn/strings.php
index a7aa8e5c..4aaae05b 100644
--- a/nsfw/lang/zh-cn/strings.php
+++ b/nsfw/lang/zh-cn/strings.php
@@ -3,13 +3,15 @@
 if(! function_exists("string_plural_select_zh_cn")) {
 function string_plural_select_zh_cn($n){
 	$n = intval($n);
-	return intval(0);
+	return 0;;
 }}
-$a->strings['Content Filter (NSFW and more)'] = '内容过滤 ( NSFW 及其他更多)';
-$a->strings['Enable Content filter'] = '启用内容过滤';
-$a->strings['Comma separated list of keywords to hide'] = '以逗号分隔需隐藏关键字列表';
-$a->strings['Save Settings'] = '保存设置';
-$a->strings['Use /expression/ to provide regular expressions'] = '使用 /expression/ 以提供正则表达式';
-$a->strings['NSFW Settings saved.'] = 'NSFW 设置已保存';
-$a->strings['Filtered tag: %s'] = '已过滤标签：%s';
-$a->strings['Filtered word: %s'] = '已过滤字词：%s';
+;
+$a->strings["Content Filter (NSFW and more)"] = "内容过滤 ( NSFW 及其他更多)";
+$a->strings["This addon searches for specified words/text in posts and collapses them. It can be used to filter content tagged with for instance #NSFW that may be deemed inappropriate at certain times or places, such as being at work. It is also useful for hiding irrelevant or annoying content from direct view."] = "";
+$a->strings["Enable Content filter"] = "启用内容过滤";
+$a->strings["Comma separated list of keywords to hide"] = "以逗号分隔需隐藏关键字列表";
+$a->strings["Save Settings"] = "保存设置";
+$a->strings["Use /expression/ to provide regular expressions"] = "使用 /expression/ 以提供正则表达式";
+$a->strings["NSFW Settings saved."] = "NSFW 设置已保存";
+$a->strings["Filtered tag: %s"] = "已过滤标签：%s";
+$a->strings["Filtered word: %s"] = "已过滤字词：%s";
diff --git a/nsfw/nsfw.css b/nsfw/nsfw.css
new file mode 100644
index 00000000..a8c1bfe8
--- /dev/null
+++ b/nsfw/nsfw.css
@@ -0,0 +1,19 @@
+
+#nsfw-label, #nsfw-enable-label {
+	float: left;
+	width: 300px;
+	margin-top: 10px;
+}
+
+#nsfw-words, #nsfw-enable {
+	float: left;
+	margin-top: 10px;
+}
+
+#nsfw-submit {
+	margin-top: 15px;
+}
+
+.nsfw-desc {
+	margin-top: 10px;
+}
\ No newline at end of file
diff --git a/nsfw/nsfw.php b/nsfw/nsfw.php
index 4a54d899..b9240103 100644
--- a/nsfw/nsfw.php
+++ b/nsfw/nsfw.php
@@ -7,11 +7,9 @@
  * Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
  *
  */
-
-use Friendica\App;
 use Friendica\Core\Hook;
-use Friendica\Core\Renderer;
-use Friendica\DI;
+use Friendica\Core\L10n;
+use Friendica\Core\PConfig;
 
 function nsfw_install()
 {
@@ -20,6 +18,14 @@ function nsfw_install()
 	Hook::register('addon_settings_post', 'addon/nsfw/nsfw.php', 'nsfw_addon_settings_post');
 }
 
+function nsfw_uninstall()
+{
+	Hook::unregister('prepare_body_content_filter', 'addon/nsfw/nsfw.php', 'nsfw_prepare_body_content_filter');
+	Hook::unregister('prepare_body', 'addon/nsfw/nsfw.php', 'nsfw_prepare_body');
+	Hook::unregister('addon_settings', 'addon/nsfw/nsfw.php', 'nsfw_addon_settings');
+	Hook::unregister('addon_settings_post', 'addon/nsfw/nsfw.php', 'nsfw_addon_settings_post');
+}
+
 // This function isn't perfect and isn't trying to preserve the html structure - it's just a
 // quick and dirty filter to pull out embedded photo blobs because 'nsfw' seems to come up
 // inside them quite often. We don't need anything fancy, just pull out the data blob so we can
@@ -51,66 +57,68 @@ function nsfw_extract_photos($body)
 	return $new_body;
 }
 
-function nsfw_addon_settings(array &$data)
+function nsfw_addon_settings(&$a, &$s)
 {
-	if (!DI::userSession()->getLocalUserId()) {
+	if (!local_user()) {
 		return;
 	}
 
-	$enabled = !DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'nsfw', 'disable');
-	$words   = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'nsfw', 'words', 'nsfw,');
+	/* Add our stylesheet to the page so we can make our settings look nice */
 
-	$t    = Renderer::getMarkupTemplate('settings.tpl', 'addon/nsfw/');
-	$html = Renderer::replaceMacros($t, [
-		'$info'    => DI::l10n()->t('This addon searches for specified words/text in posts and collapses them. It can be used to filter content tagged with for instance #NSFW that may be deemed inappropriate at certain times or places, such as being at work. It is also useful for hiding irrelevant or annoying content from direct view.'),
-		'$enabled' => ['nsfw-enable', DI::l10n()->t('Enable Content filter'), $enabled],
-		'$words'   => ['nsfw-words', DI::l10n()->t('Comma separated list of keywords to hide'), $words, DI::l10n()->t('Use /expression/ to provide regular expressions, #tag to specfically match hashtags (case-insensitive), or regular words (case-sensitive)')],
-	]);
+	$a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->getBaseURL() . '/addon/nsfw/nsfw.css' . '" media="all" />' . "\r\n";
 
-	$data = [
-		'addon' => 'nsfw',
-		'title' => DI::l10n()->t('Content Filter (NSFW and more)'),
-		'html'  => $html,
-	];
+	$enable_checked = (intval(PConfig::get(local_user(), 'nsfw', 'disable')) ? '' : ' checked="checked" ');
+	$words = PConfig::get(local_user(), 'nsfw', 'words');
+	if (!$words) {
+		$words = 'nsfw,';
+	}
+
+	$s .= '<span id="settings_nsfw_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_nsfw_expanded\'); openClose(\'settings_nsfw_inflated\');">';
+	$s .= '<h3>' . L10n::t('Content Filter (NSFW and more)') . '</h3>';
+	$s .= '</span>';
+	$s .= '<div id="settings_nsfw_expanded" class="settings-block" style="display: none;">';
+	$s .= '<span class="fakelink" onclick="openClose(\'settings_nsfw_expanded\'); openClose(\'settings_nsfw_inflated\');">';
+	$s .= '<h3>' . L10n::t('Content Filter (NSFW and more)') . '</h3>';
+	$s .= '</span>';
+
+	$s .= '<div id="nsfw-wrapper">';
+	$s .= '<p>' . L10n::t('This addon searches for specified words/text in posts and collapses them. It can be used to filter content tagged with for instance #NSFW that may be deemed inappropriate at certain times or places, such as being at work. It is also useful for hiding irrelevant or annoying content from direct view.') . '</p>';
+	$s .= '<label id="nsfw-enable-label" for="nsfw-enable">' . L10n::t('Enable Content filter') . ' </label>';
+	$s .= '<input id="nsfw-enable" type="checkbox" name="nsfw-enable" value="1"' . $enable_checked . ' />';
+	$s .= '<div class="clear"></div>';
+	$s .= '<label id="nsfw-label" for="nsfw-words">' . L10n::t('Comma separated list of keywords to hide') . ' </label>';
+	$s .= '<textarea id="nsfw-words" type="text" name="nsfw-words">' . $words . '</textarea>';
+	$s .= '</div><div class="clear"></div>';
+
+	$s .= '<div class="settings-submit-wrapper" ><input type="submit" id="nsfw-submit" name="nsfw-submit" class="settings-submit" value="' . L10n::t('Save Settings') . '" /></div>';
+	$s .= '<div class="nsfw-desc">' . L10n::t('Use /expression/ to provide regular expressions') . '</div></div>';
+	return;
 }
 
-function nsfw_addon_settings_post(array &$b)
+function nsfw_addon_settings_post(&$a, &$b)
 {
-	if (!DI::userSession()->getLocalUserId()) {
+	if (!local_user()) {
 		return;
 	}
 
 	if (!empty($_POST['nsfw-submit'])) {
-		$enable = !empty($_POST['nsfw-enable']) ? intval($_POST['nsfw-enable']) : 0;
+		PConfig::set(local_user(), 'nsfw', 'words', trim($_POST['nsfw-words']));
+		$enable = (!empty($_POST['nsfw-enable']) ? intval($_POST['nsfw-enable']) : 0);
 		$disable = 1 - $enable;
-
-		$words = trim($_POST['nsfw-words']);
-		$word_list = explode(',', $words);
-		foreach ($word_list as $word) {
-			$word = trim($word);
-			if (!$words || strpos($word, '/') !== 0) {
-				continue;
-			}
-
-			if (@preg_match($word, '') === false) {
-				DI::sysmsg()->addNotice(DI::l10n()->t('Regular expression "%s" fails to compile', $word));
-			};
-		}
-
-		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'nsfw', 'words', $words);
-		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'nsfw', 'disable', $disable);
+		PConfig::set(local_user(), 'nsfw', 'disable', $disable);
+		info(L10n::t('NSFW Settings saved.') . EOL);
 	}
 }
 
-function nsfw_prepare_body_content_filter(&$hook_data)
+function nsfw_prepare_body_content_filter(\Friendica\App $a, &$hook_data)
 {
 	$words = null;
-	if (DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'nsfw', 'disable')) {
+	if (PConfig::get(local_user(), 'nsfw', 'disable')) {
 		return;
 	}
 
-	if (DI::userSession()->getLocalUserId()) {
-		$words = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'nsfw', 'words');
+	if (local_user()) {
+		$words = PConfig::get(local_user(), 'nsfw', 'words');
 	}
 
 	if ($words) {
@@ -132,14 +140,14 @@ function nsfw_prepare_body_content_filter(&$hook_data)
 			$tag_search = false;
 			switch ($word[0]) {
 				case '/'; // Regular expression
-					$found = @preg_match($word, $body);
+					$found = preg_match($word, $body);
 					break;
 				case '#': // Hashtag-only search
 					$tag_search = true;
 					$found = nsfw_find_word_in_item_tags($hook_data['item']['hashtags'], substr($word, 1));
 					break;
 				default:
-					$found = strpos($body, $word) !== false || nsfw_find_word_in_item_tags($hook_data['item']['tags'], $word);
+					$found = stripos($body, $word) !== false || nsfw_find_word_in_item_tags($hook_data['item']['tags'], $word);
 					break;
 			}
 
@@ -151,9 +159,9 @@ function nsfw_prepare_body_content_filter(&$hook_data)
 
 	if ($found) {
 		if ($tag_search) {
-			$hook_data['filter_reasons'][] = DI::l10n()->t('Filtered tag: %s', $word);
+			$hook_data['filter_reasons'][] = L10n::t('Filtered tag: %s', $word);
 		} else {
-			$hook_data['filter_reasons'][] = DI::l10n()->t('Filtered word: %s', $word);
+			$hook_data['filter_reasons'][] = L10n::t('Filtered word: %s', $word);
 		}
 	}
 }
diff --git a/nsfw/templates/settings.tpl b/nsfw/templates/settings.tpl
deleted file mode 100644
index 1e3a2cbe..00000000
--- a/nsfw/templates/settings.tpl
+++ /dev/null
@@ -1,3 +0,0 @@
-<p>{{$info}}</p>
-{{include file="field_checkbox.tpl" field=$enabled}}
-{{include file="field_textarea.tpl" field=$words}}
diff --git a/numfriends/lang/C/messages.po b/numfriends/lang/C/messages.po
index 40b8146e..91af964d 100644
--- a/numfriends/lang/C/messages.po
+++ b/numfriends/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:15-0500\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,10 +17,18 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: numfriends.php:55
+#: numfriends.php:46
+msgid "Numfriends settings updated."
+msgstr ""
+
+#: numfriends.php:77
+msgid "Numfriends Settings"
+msgstr ""
+
+#: numfriends.php:79
 msgid "How many contacts to display on profile sidebar"
 msgstr ""
 
-#: numfriends.php:60
-msgid "Numfriends Settings"
+#: numfriends.php:85
+msgid "Submit"
 msgstr ""
diff --git a/numfriends/lang/ar/messages.po b/numfriends/lang/ar/messages.po
deleted file mode 100644
index a6d82d29..00000000
--- a/numfriends/lang/ar/messages.po
+++ /dev/null
@@ -1,32 +0,0 @@
-# ADDON numfriends
-# Copyright (C)
-# This file is distributed under the same license as the Friendica numfriends addon package.
-# 
-# 
-# Translators:
-# Farida Khalaf <faridakhalaf@hotmail.com>, 2021
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2021-02-22 02:39+0000\n"
-"Last-Translator: Farida Khalaf <faridakhalaf@hotmail.com>\n"
-"Language-Team: Arabic (http://www.transifex.com/Friendica/friendica/language/ar/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ar\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-
-#: numfriends.php:59
-msgid "Numfriends Settings"
-msgstr "إعدادات Numfriends"
-
-#: numfriends.php:61
-msgid "How many contacts to display on profile sidebar"
-msgstr "كم عدد جهات الاتصال لعرضها على الشريط الجانبي للملف الشخصي"
-
-#: numfriends.php:67
-msgid "Save Settings"
-msgstr "حفظ الإعدادات"
diff --git a/numfriends/lang/ar/strings.php b/numfriends/lang/ar/strings.php
deleted file mode 100644
index 9bbf2f23..00000000
--- a/numfriends/lang/ar/strings.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_ar")) {
-function string_plural_select_ar($n){
-	$n = intval($n);
-	if ($n==0) { return 0; } else if ($n==1) { return 1; } else if ($n==2) { return 2; } else if ($n%100>=3 && $n%100<=10) { return 3; } else if ($n%100>=11 && $n%100<=99) { return 4; } else  { return 5; }
-}}
-$a->strings['Numfriends Settings'] = 'إعدادات Numfriends';
-$a->strings['How many contacts to display on profile sidebar'] = 'كم عدد جهات الاتصال لعرضها على الشريط الجانبي للملف الشخصي';
-$a->strings['Save Settings'] = 'حفظ الإعدادات';
diff --git a/numfriends/lang/cs/messages.po b/numfriends/lang/cs/messages.po
index 1598bc1d..1c2b092e 100644
--- a/numfriends/lang/cs/messages.po
+++ b/numfriends/lang/cs/messages.po
@@ -10,20 +10,28 @@ msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:15-0500\n"
-"PO-Revision-Date: 2014-06-23 10:58+0000\n"
-"Last-Translator: Aditoo, 2018\n"
-"Language-Team: Czech (http://app.transifex.com/Friendica/friendica/language/cs/)\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2018-07-03 14:45+0000\n"
+"Last-Translator: Aditoo\n"
+"Language-Team: Czech (http://www.transifex.com/Friendica/friendica/language/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: cs\n"
 "Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
 
-#: numfriends.php:55
-msgid "How many contacts to display on profile sidebar"
-msgstr "Počet kontaktů k zobrazení na profilové postranní liště"
+#: numfriends.php:46
+msgid "Numfriends settings updated."
+msgstr "Nastavení Numfriends aktualizováno"
 
-#: numfriends.php:60
+#: numfriends.php:77
 msgid "Numfriends Settings"
 msgstr "Nastavení Numfriends"
+
+#: numfriends.php:79
+msgid "How many contacts to display on profile sidebar"
+msgstr "Kolik kontaktů zobrazit na profilové postranní liště"
+
+#: numfriends.php:85
+msgid "Submit"
+msgstr "Odeslat"
diff --git a/numfriends/lang/cs/strings.php b/numfriends/lang/cs/strings.php
index 2f58574d..e8565071 100644
--- a/numfriends/lang/cs/strings.php
+++ b/numfriends/lang/cs/strings.php
@@ -3,7 +3,10 @@
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
 	$n = intval($n);
-	if (($n == 1 && $n % 1 == 0)) { return 0; } else if (($n >= 2 && $n <= 4 && $n % 1 == 0)) { return 1; } else if (($n % 1 != 0 )) { return 2; } else  { return 3; }
+	return ($n == 1 && $n % 1 == 0) ? 0 : ($n >= 2 && $n <= 4 && $n % 1 == 0) ? 1: ($n % 1 != 0 ) ? 2 : 3;;
 }}
-$a->strings['How many contacts to display on profile sidebar'] = 'Počet kontaktů k zobrazení na profilové postranní liště';
-$a->strings['Numfriends Settings'] = 'Nastavení Numfriends';
+;
+$a->strings["Numfriends settings updated."] = "Nastavení Numfriends aktualizováno";
+$a->strings["Numfriends Settings"] = "Nastavení Numfriends";
+$a->strings["How many contacts to display on profile sidebar"] = "Kolik kontaktů zobrazit na profilové postranní liště";
+$a->strings["Submit"] = "Odeslat";
diff --git a/numfriends/lang/da-dk/messages.po b/numfriends/lang/da-dk/messages.po
deleted file mode 100644
index 6a1cd9ce..00000000
--- a/numfriends/lang/da-dk/messages.po
+++ /dev/null
@@ -1,28 +0,0 @@
-# ADDON numfriends
-# Copyright (C)
-# This file is distributed under the same license as the Friendica numfriends addon package.
-# 
-# 
-# Translators:
-# Anton <dev@atjn.dk>, 2022
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:15-0500\n"
-"PO-Revision-Date: 2014-06-23 10:58+0000\n"
-"Last-Translator: Anton <dev@atjn.dk>, 2022\n"
-"Language-Team: Danish (Denmark) (http://www.transifex.com/Friendica/friendica/language/da_DK/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: da_DK\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: numfriends.php:55
-msgid "How many contacts to display on profile sidebar"
-msgstr "Hvor mange kontakter der vises på profilsidebjælken"
-
-#: numfriends.php:60
-msgid "Numfriends Settings"
-msgstr "Numvenner Indstillinger"
diff --git a/numfriends/lang/da-dk/strings.php b/numfriends/lang/da-dk/strings.php
deleted file mode 100644
index bcd0f7af..00000000
--- a/numfriends/lang/da-dk/strings.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_da_dk")) {
-function string_plural_select_da_dk($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['How many contacts to display on profile sidebar'] = 'Hvor mange kontakter der vises på profilsidebjælken';
-$a->strings['Numfriends Settings'] = 'Numvenner Indstillinger';
diff --git a/numfriends/lang/de/messages.po b/numfriends/lang/de/messages.po
index b71a9b13..1fe8e79f 100644
--- a/numfriends/lang/de/messages.po
+++ b/numfriends/lang/de/messages.po
@@ -4,28 +4,34 @@
 # 
 # 
 # Translators:
-# Andreas H., 2014
-# Steffen K9, 2021
-# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2014
-# Ulf Rompe <transifex.com@rompe.org>, 2019
+# Abrax <webmaster@a-zwenkau.de>, 2014
+# bavatar <tobias.diekershoff@gmx.net>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:15-0500\n"
-"PO-Revision-Date: 2021-12-22 15:27+0000\n"
-"Last-Translator: Transifex Bot <>\n"
-"Language-Team: German (http://www.transifex.com/Friendica/friendica/language/de/)\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2014-10-15 12:32+0000\n"
+"Last-Translator: Abrax <webmaster@a-zwenkau.de>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/friendica/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: numfriends.php:55
+#: numfriends.php:46
+msgid "Numfriends settings updated."
+msgstr "Numfriends Einstellungen aktualisiert"
+
+#: numfriends.php:77
+msgid "Numfriends Settings"
+msgstr "Numfriends Einstellungen"
+
+#: numfriends.php:79
 msgid "How many contacts to display on profile sidebar"
 msgstr "Wie viele Kontakte sollen in der Seitenleiste angezeigt werden"
 
-#: numfriends.php:60
-msgid "Numfriends Settings"
-msgstr "Numfriends-Einstellungen"
+#: numfriends.php:85
+msgid "Submit"
+msgstr "Senden"
diff --git a/numfriends/lang/de/strings.php b/numfriends/lang/de/strings.php
index ed029b74..c77ab53e 100644
--- a/numfriends/lang/de/strings.php
+++ b/numfriends/lang/de/strings.php
@@ -2,8 +2,10 @@
 
 if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['How many contacts to display on profile sidebar'] = 'Wie viele Kontakte sollen in der Seitenleiste angezeigt werden';
-$a->strings['Numfriends Settings'] = 'Numfriends-Einstellungen';
+;
+$a->strings["Numfriends settings updated."] = "Numfriends Einstellungen aktualisiert";
+$a->strings["Numfriends Settings"] = "Numfriends Einstellungen";
+$a->strings["How many contacts to display on profile sidebar"] = "Wie viele Kontakte sollen in der Seitenleiste angezeigt werden";
+$a->strings["Submit"] = "Senden";
diff --git a/numfriends/lang/es/messages.po b/numfriends/lang/es/messages.po
index 76cb94a5..d5ef1464 100644
--- a/numfriends/lang/es/messages.po
+++ b/numfriends/lang/es/messages.po
@@ -5,14 +5,13 @@
 # 
 # Translators:
 # Albert, 2016
-# Senex Petrovic <javierruizo@hotmail.com>, 2021
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2021-04-06 01:50+0000\n"
-"Last-Translator: Senex Petrovic <javierruizo@hotmail.com>\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2016-11-17 22:08+0000\n"
+"Last-Translator: Albert\n"
 "Language-Team: Spanish (http://www.transifex.com/Friendica/friendica/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,14 +19,18 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: numfriends.php:59
+#: numfriends.php:46
+msgid "Numfriends settings updated."
+msgstr "Ajustes de Numfriends actualizados."
+
+#: numfriends.php:77
 msgid "Numfriends Settings"
 msgstr "Ajustes de Numfriends"
 
-#: numfriends.php:61
+#: numfriends.php:79
 msgid "How many contacts to display on profile sidebar"
 msgstr "Cuántos contactos mostrar en la barra lateral del perfil"
 
-#: numfriends.php:67
-msgid "Save Settings"
-msgstr "Grabar ajustes"
+#: numfriends.php:85
+msgid "Submit"
+msgstr "Enviar"
diff --git a/numfriends/lang/es/strings.php b/numfriends/lang/es/strings.php
index cfd9f387..a06fbcf3 100644
--- a/numfriends/lang/es/strings.php
+++ b/numfriends/lang/es/strings.php
@@ -2,9 +2,10 @@
 
 if(! function_exists("string_plural_select_es")) {
 function string_plural_select_es($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Numfriends Settings'] = 'Ajustes de Numfriends';
-$a->strings['How many contacts to display on profile sidebar'] = 'Cuántos contactos mostrar en la barra lateral del perfil';
-$a->strings['Save Settings'] = 'Grabar ajustes';
+;
+$a->strings["Numfriends settings updated."] = "Ajustes de Numfriends actualizados.";
+$a->strings["Numfriends Settings"] = "Ajustes de Numfriends";
+$a->strings["How many contacts to display on profile sidebar"] = "Cuántos contactos mostrar en la barra lateral del perfil";
+$a->strings["Submit"] = "Enviar";
diff --git a/numfriends/lang/fi-fi/strings.php b/numfriends/lang/fi-fi/strings.php
index 90cb3e3d..029928a0 100644
--- a/numfriends/lang/fi-fi/strings.php
+++ b/numfriends/lang/fi-fi/strings.php
@@ -3,9 +3,10 @@
 if(! function_exists("string_plural_select_fi_fi")) {
 function string_plural_select_fi_fi($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Numfriends settings updated.'] = 'Numfriends -asetukset päivitetty.';
-$a->strings['Numfriends Settings'] = 'Numfriends -asetukset';
-$a->strings['How many contacts to display on profile sidebar'] = 'Kuinka monta kontaktia näytetään profiilin sivupalkissa';
-$a->strings['Submit'] = 'Lähetä';
+;
+$a->strings["Numfriends settings updated."] = "Numfriends -asetukset päivitetty.";
+$a->strings["Numfriends Settings"] = "Numfriends -asetukset";
+$a->strings["How many contacts to display on profile sidebar"] = "Kuinka monta kontaktia näytetään profiilin sivupalkissa";
+$a->strings["Submit"] = "Lähetä";
diff --git a/numfriends/lang/fr/messages.po b/numfriends/lang/fr/messages.po
index 3accdb49..31f3220f 100644
--- a/numfriends/lang/fr/messages.po
+++ b/numfriends/lang/fr/messages.po
@@ -9,20 +9,28 @@ msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:15-0500\n"
-"PO-Revision-Date: 2014-06-23 10:58+0000\n"
-"Last-Translator: Thecross, 2017\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2017-12-09 23:22+0000\n"
+"Last-Translator: Thecross\n"
 "Language-Team: French (http://www.transifex.com/Friendica/friendica/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fr\n"
-"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: numfriends.php:55
+#: numfriends.php:46
+msgid "Numfriends settings updated."
+msgstr "Configuration de Numfriends mise à jour."
+
+#: numfriends.php:77
+msgid "Numfriends Settings"
+msgstr "Réglages de Numfriends"
+
+#: numfriends.php:79
 msgid "How many contacts to display on profile sidebar"
 msgstr "Nombre de contacts à afficher dans le volet de profil"
 
-#: numfriends.php:60
-msgid "Numfriends Settings"
-msgstr "Réglages de Numfriends"
+#: numfriends.php:85
+msgid "Submit"
+msgstr "Appliquer"
diff --git a/numfriends/lang/fr/strings.php b/numfriends/lang/fr/strings.php
index d55ac894..84ec8c8d 100644
--- a/numfriends/lang/fr/strings.php
+++ b/numfriends/lang/fr/strings.php
@@ -2,8 +2,10 @@
 
 if(! function_exists("string_plural_select_fr")) {
 function string_plural_select_fr($n){
-	$n = intval($n);
-	if (($n == 0 || $n == 1)) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
+	return ($n > 1);;
 }}
-$a->strings['How many contacts to display on profile sidebar'] = 'Nombre de contacts à afficher dans le volet de profil';
-$a->strings['Numfriends Settings'] = 'Réglages de Numfriends';
+;
+$a->strings["Numfriends settings updated."] = "Configuration de Numfriends mise à jour.";
+$a->strings["Numfriends Settings"] = "Réglages de Numfriends";
+$a->strings["How many contacts to display on profile sidebar"] = "Nombre de contacts à afficher dans le volet de profil";
+$a->strings["Submit"] = "Appliquer";
diff --git a/numfriends/lang/hu/messages.po b/numfriends/lang/hu/messages.po
deleted file mode 100644
index 33c313c2..00000000
--- a/numfriends/lang/hu/messages.po
+++ /dev/null
@@ -1,28 +0,0 @@
-# ADDON numfriends
-# Copyright (C)
-# This file is distributed under the same license as the Friendica numfriends addon package.
-# 
-# 
-# Translators:
-# Balázs Úr, 2020-2021
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:15-0500\n"
-"PO-Revision-Date: 2014-06-23 10:58+0000\n"
-"Last-Translator: Balázs Úr, 2020-2021\n"
-"Language-Team: Hungarian (http://www.transifex.com/Friendica/friendica/language/hu/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: hu\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: numfriends.php:55
-msgid "How many contacts to display on profile sidebar"
-msgstr "Hány partner legyen megjelenítve a profil oldalsávján"
-
-#: numfriends.php:60
-msgid "Numfriends Settings"
-msgstr "Ismerősszám beállításai"
diff --git a/numfriends/lang/hu/strings.php b/numfriends/lang/hu/strings.php
deleted file mode 100644
index 858deafa..00000000
--- a/numfriends/lang/hu/strings.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_hu")) {
-function string_plural_select_hu($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['How many contacts to display on profile sidebar'] = 'Hány partner legyen megjelenítve a profil oldalsávján';
-$a->strings['Numfriends Settings'] = 'Ismerősszám beállításai';
diff --git a/numfriends/lang/it/messages.po b/numfriends/lang/it/messages.po
index 55ac96af..e460b1f1 100644
--- a/numfriends/lang/it/messages.po
+++ b/numfriends/lang/it/messages.po
@@ -5,25 +5,32 @@
 # 
 # Translators:
 # fabrixxm <fabrix.xm@gmail.com>, 2014-2015
-# Sylke Vicious <silkevicious@gmail.com>, 2021
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:15-0500\n"
-"PO-Revision-Date: 2014-06-23 10:58+0000\n"
-"Last-Translator: Sylke Vicious <silkevicious@gmail.com>, 2021\n"
-"Language-Team: Italian (http://app.transifex.com/Friendica/friendica/language/it/)\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2017-09-20 06:08+0000\n"
+"Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n"
+"Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: it\n"
-"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: numfriends.php:55
+#: numfriends.php:46
+msgid "Numfriends settings updated."
+msgstr "Impostazioni \"Numfriends' aggiornate."
+
+#: numfriends.php:77
+msgid "Numfriends Settings"
+msgstr "Impostazioni Numfriends"
+
+#: numfriends.php:79
 msgid "How many contacts to display on profile sidebar"
 msgstr "Quanti contatti visualizzare nella barra laterale del profilo"
 
-#: numfriends.php:60
-msgid "Numfriends Settings"
-msgstr "Impostazioni Numfriends"
+#: numfriends.php:85
+msgid "Submit"
+msgstr "Invia"
diff --git a/numfriends/lang/it/strings.php b/numfriends/lang/it/strings.php
index d593d0ea..c1ab0ada 100644
--- a/numfriends/lang/it/strings.php
+++ b/numfriends/lang/it/strings.php
@@ -2,8 +2,10 @@
 
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
-	$n = intval($n);
-	if ($n == 1) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
+	return ($n != 1);;
 }}
-$a->strings['How many contacts to display on profile sidebar'] = 'Quanti contatti visualizzare nella barra laterale del profilo';
-$a->strings['Numfriends Settings'] = 'Impostazioni Numfriends';
+;
+$a->strings["Numfriends settings updated."] = "Impostazioni \"Numfriends' aggiornate.";
+$a->strings["Numfriends Settings"] = "Impostazioni Numfriends";
+$a->strings["How many contacts to display on profile sidebar"] = "Quanti contatti visualizzare nella barra laterale del profilo";
+$a->strings["Submit"] = "Invia";
diff --git a/numfriends/lang/nl/strings.php b/numfriends/lang/nl/strings.php
index 818d5a8f..7ad90c3f 100644
--- a/numfriends/lang/nl/strings.php
+++ b/numfriends/lang/nl/strings.php
@@ -3,7 +3,10 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Numfriends settings updated.'] = 'Numfriends instellingen opgeslagen';
-$a->strings['Numfriends Settings'] = 'Numfriends instellingen';
+;
+$a->strings["Numfriends settings updated."] = "Numfriends instellingen opgeslagen";
+$a->strings["Numfriends Settings"] = "Numfriends instellingen";
+$a->strings["How many contacts to display on profile sidebar"] = "";
+$a->strings["Submit"] = "";
diff --git a/numfriends/lang/pl/messages.po b/numfriends/lang/pl/messages.po
index 4534282b..d63e4cdb 100644
--- a/numfriends/lang/pl/messages.po
+++ b/numfriends/lang/pl/messages.po
@@ -4,14 +4,14 @@
 # 
 # 
 # Translators:
-# Waldemar Stoczkowski, 2018
+# Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:15-0500\n"
-"PO-Revision-Date: 2014-06-23 10:58+0000\n"
-"Last-Translator: Waldemar Stoczkowski, 2018\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2018-03-31 19:18+0000\n"
+"Last-Translator: Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.com/Friendica/friendica/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,10 +19,18 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
-#: numfriends.php:55
+#: numfriends.php:46
+msgid "Numfriends settings updated."
+msgstr "Zaktualizowano ustawienia Numfriends."
+
+#: numfriends.php:77
+msgid "Numfriends Settings"
+msgstr "Ustawienia Numfriends"
+
+#: numfriends.php:79
 msgid "How many contacts to display on profile sidebar"
 msgstr "Ile kontaktów można wyświetlić na pasku bocznym profilu"
 
-#: numfriends.php:60
-msgid "Numfriends Settings"
-msgstr "Ustawienia Liczba kontaktów"
+#: numfriends.php:85
+msgid "Submit"
+msgstr "Wyślij"
diff --git a/numfriends/lang/pl/strings.php b/numfriends/lang/pl/strings.php
index 6693c0f2..949fbc5b 100644
--- a/numfriends/lang/pl/strings.php
+++ b/numfriends/lang/pl/strings.php
@@ -2,8 +2,10 @@
 
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
-	$n = intval($n);
-	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
+	return ($n==1 ? 0 : ($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14) ? 1 : $n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14) ? 2 : 3);;
 }}
-$a->strings['How many contacts to display on profile sidebar'] = 'Ile kontaktów można wyświetlić na pasku bocznym profilu';
-$a->strings['Numfriends Settings'] = 'Ustawienia Liczba kontaktów';
+;
+$a->strings["Numfriends settings updated."] = "Zaktualizowano ustawienia Numfriends.";
+$a->strings["Numfriends Settings"] = "Ustawienia Numfriends";
+$a->strings["How many contacts to display on profile sidebar"] = "Ile kontaktów można wyświetlić na pasku bocznym profilu";
+$a->strings["Submit"] = "Wyślij";
diff --git a/numfriends/lang/ro/strings.php b/numfriends/lang/ro/strings.php
index 27d06ae4..7ee199fe 100644
--- a/numfriends/lang/ro/strings.php
+++ b/numfriends/lang/ro/strings.php
@@ -2,10 +2,10 @@
 
 if(! function_exists("string_plural_select_ro")) {
 function string_plural_select_ro($n){
-	$n = intval($n);
-	if ($n==1) { return 0; } else if ((($n%100>19)||(($n%100==0)&&($n!=0)))) { return 2; } else  { return 1; }
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
 }}
-$a->strings['Numfriends settings updated.'] = 'Configurările NumFriends au fost actualizate.';
-$a->strings['Numfriends Settings'] = 'Configurări NumFriends';
-$a->strings['How many contacts to display on profile sidebar'] = 'Câte contacte se afișează în bara laterală a profilului ';
-$a->strings['Submit'] = 'Trimite';
+;
+$a->strings["Numfriends settings updated."] = "Configurările NumFriends au fost actualizate.";
+$a->strings["Numfriends Settings"] = "Configurări NumFriends";
+$a->strings["How many contacts to display on profile sidebar"] = "Câte contacte se afișează în bara laterală a profilului ";
+$a->strings["Submit"] = "Trimite";
diff --git a/numfriends/lang/ru/messages.po b/numfriends/lang/ru/messages.po
deleted file mode 100644
index c85c364b..00000000
--- a/numfriends/lang/ru/messages.po
+++ /dev/null
@@ -1,36 +0,0 @@
-# ADDON numfriends
-# Copyright (C)
-# This file is distributed under the same license as the Friendica numfriends addon package.
-# 
-# 
-# Translators:
-# Alexander An <ravnina@gmail.com>, 2020
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-27 05:01-0500\n"
-"PO-Revision-Date: 2020-04-23 14:26+0000\n"
-"Last-Translator: Alexander An <ravnina@gmail.com>\n"
-"Language-Team: Russian (http://www.transifex.com/Friendica/friendica/language/ru/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ru\n"
-"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
-
-#: numfriends.php:46
-msgid "Numfriends settings updated."
-msgstr "Настройки Numfriends обновлены."
-
-#: numfriends.php:77
-msgid "Numfriends Settings"
-msgstr "Настройки Numfriends"
-
-#: numfriends.php:79
-msgid "How many contacts to display on profile sidebar"
-msgstr "Сколько контактов показывать на боковой панели профиля"
-
-#: numfriends.php:85
-msgid "Submit"
-msgstr "Добавить"
diff --git a/numfriends/lang/ru/strings.php b/numfriends/lang/ru/strings.php
index f2646841..4674a1b4 100644
--- a/numfriends/lang/ru/strings.php
+++ b/numfriends/lang/ru/strings.php
@@ -1,11 +1,6 @@
-<?php
-
-if(! function_exists("string_plural_select_ru")) {
-function string_plural_select_ru($n){
-	$n = intval($n);
-	if ($n%10==1 && $n%100!=11) { return 0; } else if ($n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14)) { return 1; } else if ($n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)) { return 2; } else  { return 3; }
-}}
-$a->strings['Numfriends settings updated.'] = 'Настройки Numfriends обновлены.';
-$a->strings['Numfriends Settings'] = 'Настройки Numfriends';
-$a->strings['How many contacts to display on profile sidebar'] = 'Сколько контактов показывать на боковой панели профиля';
-$a->strings['Submit'] = 'Добавить';
+<?php
+
+$a->strings["Numfriends settings updated."] = "";
+$a->strings["Numfriends Settings"] = "";
+$a->strings["How many contacts to display on profile sidebar"] = "";
+$a->strings["Submit"] = "Подтвердить";
diff --git a/numfriends/lang/sv/messages.po b/numfriends/lang/sv/messages.po
deleted file mode 100644
index c2646b29..00000000
--- a/numfriends/lang/sv/messages.po
+++ /dev/null
@@ -1,27 +0,0 @@
-# ADDON numfriends
-# Copyright (C)
-# This file is distributed under the same license as the Friendica numfriends addon package.
-# 
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:15-0500\n"
-"PO-Revision-Date: 2021-12-22 15:27+0000\n"
-"Last-Translator: Transifex Bot <>\n"
-"Language-Team: Swedish (http://www.transifex.com/Friendica/friendica/language/sv/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: sv\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: numfriends.php:55
-msgid "How many contacts to display on profile sidebar"
-msgstr ""
-
-#: numfriends.php:60
-msgid "Numfriends Settings"
-msgstr ""
diff --git a/numfriends/lang/sv/strings.php b/numfriends/lang/sv/strings.php
index 72e9772f..3ec569a7 100644
--- a/numfriends/lang/sv/strings.php
+++ b/numfriends/lang/sv/strings.php
@@ -1,7 +1,3 @@
-<?php
-
-if(! function_exists("string_plural_select_sv")) {
-function string_plural_select_sv($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
+<?php
+
+$a->strings["Submit"] = "Spara";
diff --git a/numfriends/numfriends.css b/numfriends/numfriends.css
new file mode 100644
index 00000000..c92ef8dc
--- /dev/null
+++ b/numfriends/numfriends.css
@@ -0,0 +1,14 @@
+
+
+
+#numfriends-label {
+	float: left;
+	width: 200px;
+	margin-bottom: 25px;
+}
+
+#numfriends {
+	float: left;
+}
+
+
diff --git a/numfriends/numfriends.php b/numfriends/numfriends.php
index 538a4a3e..8bb4e747 100644
--- a/numfriends/numfriends.php
+++ b/numfriends/numfriends.php
@@ -5,19 +5,27 @@
  * Version: 1.0
  * Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
  */
-
-use Friendica\App;
 use Friendica\Core\Hook;
+use Friendica\Core\L10n;
 use Friendica\Core\Logger;
-use Friendica\Core\Renderer;
-use Friendica\DI;
+use Friendica\Core\PConfig;
 
 function numfriends_install() {
 
 	Hook::register('addon_settings', 'addon/numfriends/numfriends.php', 'numfriends_settings');
 	Hook::register('addon_settings_post', 'addon/numfriends/numfriends.php', 'numfriends_settings_post');
 
-	Logger::notice("installed numfriends");
+	Logger::log("installed numfriends");
+}
+
+
+function numfriends_uninstall() {
+
+	Hook::unregister('addon_settings', 'addon/numfriends/numfriends.php', 'numfriends_settings');
+	Hook::unregister('addon_settings_post', 'addon/numfriends/numfriends.php', 'numfriends_settings_post');
+
+
+	Logger::log("removed numfriends");
 }
 
 /**
@@ -28,12 +36,12 @@ function numfriends_install() {
  * and if so set our configuration setting for this person.
  *
  */
-function numfriends_settings_post($post) {
-	if (! DI::userSession()->getLocalUserId() || empty($_POST['numfriends-submit'])) {
+function numfriends_settings_post($a,$post) {
+	if(! local_user() || empty($_POST['numfriends-submit']))
 		return;
-	}
 
-	DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'system', 'display_friend_count', intval($_POST['numfriends']));
+	PConfig::set(local_user(),'system','display_friend_count',intval($_POST['numfriends']));
+	info( L10n::t('Numfriends settings updated.') . EOL);
 }
 
 
@@ -43,22 +51,30 @@ function numfriends_settings_post($post) {
  * Add our own settings info to the page.
  *
  */
-function numfriends_settings(array &$data)
+function numfriends_settings(&$a, &$s)
 {
-	if (!DI::userSession()->getLocalUserId()) {
+	if (! local_user()) {
 		return;
 	}
 
-	$numfriends = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'system', 'display_friend_count', 24);
-	
-	$t    = Renderer::getMarkupTemplate('settings.tpl', 'addon/numfriends/');
-	$html = Renderer::replaceMacros($t, [
-		'$numfriends' => ['numfriends', DI::l10n()->t('How many contacts to display on profile sidebar'), $numfriends],
-	]);
+	/* Add our stylesheet to the page so we can make our settings look nice */
 
-	$data = [
-		'addon' => 'numfriends',
-		'title' => DI::l10n()->t('Numfriends Settings'),
-		'html'  => $html,
-	];
+	$a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->getBaseURL() . '/addon/numfriends/numfriends.css' . '" media="all" />' . "\r\n";
+
+	/* Get the current state of our config variable */
+
+	$numfriends = PConfig::get(local_user(), 'system', 'display_friend_count', 24);
+	
+	/* Add some HTML to the existing form */
+
+	$s .= '<div class="settings-block">';
+	$s .= '<h3>' . L10n::t('Numfriends Settings') . '</h3>';
+	$s .= '<div id="numfriends-wrapper">';
+	$s .= '<label id="numfriends-label" for="numfriends">' . L10n::t('How many contacts to display on profile sidebar') . '</label>';
+	$s .= '<input id="numfriends-input" type="text" name="numfriends" value="' . intval($numfriends) . '" ' . '/>';
+	$s .= '</div><div class="clear"></div>';
+
+	/* provide a submit button */
+
+	$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="numfriends-submit" class="settings-submit" value="' . L10n::t('Save Settings') . '" /></div></div>';
 }
diff --git a/numfriends/templates/settings.tpl b/numfriends/templates/settings.tpl
deleted file mode 100644
index c8221bb4..00000000
--- a/numfriends/templates/settings.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{{include file="field_input.tpl" field=$numfriends}}
diff --git a/openstreetmap/README.md b/openstreetmap/README.md
index 782389f5..d8709a18 100644
--- a/openstreetmap/README.md
+++ b/openstreetmap/README.md
@@ -34,29 +34,26 @@ zoom level available.
 
 ## Alternative Configuration
 
-Open the `config/node.config.php` file and add "openstreetmap" to the list of activated addons.
+Open the `config/local.config.php` file and add "openstreetmap" to the list of activated addons.
 
-	'addons' => [
-		...
-		'openstreetmap' => [
-			admin => true,			
-		],
-	]
+     'system' => [
+         ...
+         'addon' => '...,openstreetmap'
+         ...
+     ]
 
-You can set configuration variables for the addon in the `config/openstreetmap.config.php` file:
+You can set configuration variables for the addon in the `config/addon.config.php` file:
 
-	return [
-		'openstreetmap' => [
-			'tmsserver' => 'https://www.openstreetmap.org',
-			'nomserver' => 'https://nominatim.openstreetmap.org/search.php',
-			'zoom' => 16,
-			'marker' => 0,
-		],
-	];
+	'openstreetmap' => [
+		'tmsserver' => 'https://www.openstreetmap.org',
+		'nomserver' => 'https://nominatim.openstreetmap.org/search.php',
+		'zoom' => 16,
+		'marker' => 0,
+	],
 
 The *tmsserver* points to the tile server you want to use. Use the full URL,
 with protocol (http/s) and trailing slash. You can configure the default zoom
 level on the map with *zoom*. 1 will show the whole world and 18 is the highest
 zoom level available.
 
-Please see provided `config/openstreetmap.php` file for explanation on the additional configuration keys.
+Please see provided `config/openstreetmap.php` file for explanation on the additional configuration keys.
\ No newline at end of file
diff --git a/openstreetmap/config/openstreetmap.config.php b/openstreetmap/config/openstreetmap.config.php
index d633fd26..e9252ca5 100644
--- a/openstreetmap/config/openstreetmap.config.php
+++ b/openstreetmap/config/openstreetmap.config.php
@@ -1,7 +1,7 @@
 <?php
 
 // Warning: Don't change this file! It only holds the default config values for this addon.
-// Instead, copy this file to config/openstreetmap.config.php in your Friendica directory and set the correct values there
+// Instead overwrite these config values in config/addon.config.php in your Friendica directory
 
 return [
 	'openstreetmap' => [
@@ -10,7 +10,7 @@ return [
 		'tmsserver' => 'https://www.openstreetmap.org',
 
 		// nomserver (String)
-		'nomserver' => 'https://nominatim.openstreetmap.org/search',
+		'nomserver' => 'https://nominatim.openstreetmap.org/search.php',
 
 		// zoom (Integer)
 		// The default zoom level on the map.
diff --git a/openstreetmap/lang/C/messages.po b/openstreetmap/lang/C/messages.po
index 6424eff5..040503b4 100644
--- a/openstreetmap/lang/C/messages.po
+++ b/openstreetmap/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,47 +17,28 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: openstreetmap.php:167
-msgid "View Larger"
-msgstr ""
-
-#: openstreetmap.php:194
+#: openstreetmap.php:94
 msgid "Submit"
 msgstr ""
 
-#: openstreetmap.php:195
+#: openstreetmap.php:95
 msgid "Tile Server URL"
 msgstr ""
 
-#: openstreetmap.php:195
+#: openstreetmap.php:95
 msgid ""
 "A list of <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank"
-"\" rel=\"noopener noreferrer\">public tile servers</a>"
+"\">public tile servers</a>"
 msgstr ""
 
-#: openstreetmap.php:196
-msgid "Nominatim (reverse geocoding) Server URL"
-msgstr ""
-
-#: openstreetmap.php:196
-msgid ""
-"A list of <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim\" target="
-"\"_blank\" rel=\"noopener noreferrer\">Nominatim servers</a>"
-msgstr ""
-
-#: openstreetmap.php:197
+#: openstreetmap.php:96
 msgid "Default zoom"
 msgstr ""
 
-#: openstreetmap.php:197
-msgid ""
-"The default zoom level. (1:world, 18:highest, also depends on tile server)"
+#: openstreetmap.php:96
+msgid "The default zoom level. (1:world, 18:highest)"
 msgstr ""
 
-#: openstreetmap.php:198
-msgid "Include marker on map"
-msgstr ""
-
-#: openstreetmap.php:198
-msgid "Include a marker on the map."
+#: openstreetmap.php:104
+msgid "Settings updated."
 msgstr ""
diff --git a/openstreetmap/lang/ar/messages.po b/openstreetmap/lang/ar/messages.po
deleted file mode 100644
index e3c99fe3..00000000
--- a/openstreetmap/lang/ar/messages.po
+++ /dev/null
@@ -1,64 +0,0 @@
-# ADDON openstreetmap
-# Copyright (C)
-# This file is distributed under the same license as the Friendica openstreetmap addon package.
-# 
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2021-02-01 19:14+0000\n"
-"Last-Translator: Transifex Bot <>\n"
-"Language-Team: Arabic (http://www.transifex.com/Friendica/friendica/language/ar/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ar\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-
-#: openstreetmap.php:167
-msgid "View Larger"
-msgstr ""
-
-#: openstreetmap.php:194
-msgid "Submit"
-msgstr ""
-
-#: openstreetmap.php:195
-msgid "Tile Server URL"
-msgstr ""
-
-#: openstreetmap.php:195
-msgid ""
-"A list of <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" "
-"target=\"_blank\" rel=\"noopener noreferrer\">public tile servers</a>"
-msgstr ""
-
-#: openstreetmap.php:196
-msgid "Nominatim (reverse geocoding) Server URL"
-msgstr ""
-
-#: openstreetmap.php:196
-msgid ""
-"A list of <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim\" "
-"target=\"_blank\" rel=\"noopener noreferrer\">Nominatim servers</a>"
-msgstr ""
-
-#: openstreetmap.php:197
-msgid "Default zoom"
-msgstr ""
-
-#: openstreetmap.php:197
-msgid ""
-"The default zoom level. (1:world, 18:highest, also depends on tile server)"
-msgstr ""
-
-#: openstreetmap.php:198
-msgid "Include marker on map"
-msgstr ""
-
-#: openstreetmap.php:198
-msgid "Include a marker on the map."
-msgstr ""
diff --git a/openstreetmap/lang/ar/strings.php b/openstreetmap/lang/ar/strings.php
deleted file mode 100644
index eea34dd6..00000000
--- a/openstreetmap/lang/ar/strings.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_ar")) {
-function string_plural_select_ar($n){
-	$n = intval($n);
-	if ($n==0) { return 0; } else if ($n==1) { return 1; } else if ($n==2) { return 2; } else if ($n%100>=3 && $n%100<=10) { return 3; } else if ($n%100>=11 && $n%100<=99) { return 4; } else  { return 5; }
-}}
diff --git a/openstreetmap/lang/cs/messages.po b/openstreetmap/lang/cs/messages.po
index ee350a4e..6385626b 100644
--- a/openstreetmap/lang/cs/messages.po
+++ b/openstreetmap/lang/cs/messages.po
@@ -4,63 +4,43 @@
 # 
 # 
 # Translators:
-# Aditoo, 2018
-# michal_s <msupler@gmail.com>, 2014-2015
+# Michal Šupler <msupler@gmail.com>, 2014-2015
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2014-06-23 11:01+0000\n"
-"Last-Translator: Aditoo, 2018\n"
-"Language-Team: Czech (http://app.transifex.com/Friendica/friendica/language/cs/)\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2015-02-11 19:39+0000\n"
+"Last-Translator: Michal Šupler <msupler@gmail.com>\n"
+"Language-Team: Czech (http://www.transifex.com/projects/p/friendica/language/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: cs\n"
-"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: openstreetmap.php:167
-msgid "View Larger"
-msgstr ""
-
-#: openstreetmap.php:194
+#: openstreetmap.php:94
 msgid "Submit"
 msgstr "Odeslat"
 
-#: openstreetmap.php:195
+#: openstreetmap.php:95
 msgid "Tile Server URL"
 msgstr "URL adresa Tile serveru"
 
-#: openstreetmap.php:195
+#: openstreetmap.php:95
 msgid ""
 "A list of <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" "
-"target=\"_blank\" rel=\"noopener noreferrer\">public tile servers</a>"
-msgstr ""
+"target=\"_blank\">public tile servers</a>"
+msgstr "Seznam <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\">veřejných tile serverů</a>"
 
-#: openstreetmap.php:196
-msgid "Nominatim (reverse geocoding) Server URL"
-msgstr ""
-
-#: openstreetmap.php:196
-msgid ""
-"A list of <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim\" "
-"target=\"_blank\" rel=\"noopener noreferrer\">Nominatim servers</a>"
-msgstr ""
-
-#: openstreetmap.php:197
+#: openstreetmap.php:96
 msgid "Default zoom"
-msgstr "Výchozí zvětšení"
+msgstr "Defaultní lupa"
 
-#: openstreetmap.php:197
-msgid ""
-"The default zoom level. (1:world, 18:highest, also depends on tile server)"
-msgstr ""
+#: openstreetmap.php:96
+msgid "The default zoom level. (1:world, 18:highest)"
+msgstr "Defaultní nastavení lupy (1:svět, 18:nejvyšší)"
 
-#: openstreetmap.php:198
-msgid "Include marker on map"
-msgstr ""
-
-#: openstreetmap.php:198
-msgid "Include a marker on the map."
-msgstr ""
+#: openstreetmap.php:104
+msgid "Settings updated."
+msgstr "Nastavení aktualizováno."
diff --git a/openstreetmap/lang/cs/strings.php b/openstreetmap/lang/cs/strings.php
index dc941275..fbfec194 100644
--- a/openstreetmap/lang/cs/strings.php
+++ b/openstreetmap/lang/cs/strings.php
@@ -2,9 +2,12 @@
 
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
-	$n = intval($n);
-	if (($n == 1 && $n % 1 == 0)) { return 0; } else if (($n >= 2 && $n <= 4 && $n % 1 == 0)) { return 1; } else if (($n % 1 != 0 )) { return 2; } else  { return 3; }
+	return ($n==1) ? 0 : ($n>=2 && $n<=4) ? 1 : 2;;
 }}
-$a->strings['Submit'] = 'Odeslat';
-$a->strings['Tile Server URL'] = 'URL adresa Tile serveru';
-$a->strings['Default zoom'] = 'Výchozí zvětšení';
+;
+$a->strings["Submit"] = "Odeslat";
+$a->strings["Tile Server URL"] = "URL adresa Tile serveru";
+$a->strings["A list of <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\">public tile servers</a>"] = "Seznam <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\">veřejných tile serverů</a>";
+$a->strings["Default zoom"] = "Defaultní lupa";
+$a->strings["The default zoom level. (1:world, 18:highest)"] = "Defaultní nastavení lupy (1:svět, 18:nejvyšší)";
+$a->strings["Settings updated."] = "Nastavení aktualizováno.";
diff --git a/openstreetmap/lang/da-dk/messages.po b/openstreetmap/lang/da-dk/messages.po
deleted file mode 100644
index 47dd9818..00000000
--- a/openstreetmap/lang/da-dk/messages.po
+++ /dev/null
@@ -1,65 +0,0 @@
-# ADDON openstreetmap
-# Copyright (C)
-# This file is distributed under the same license as the Friendica openstreetmap addon package.
-# 
-# 
-# Translators:
-# Anton <dev@atjn.dk>, 2022
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2014-06-23 11:01+0000\n"
-"Last-Translator: Anton <dev@atjn.dk>, 2022\n"
-"Language-Team: Danish (Denmark) (http://www.transifex.com/Friendica/friendica/language/da_DK/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: da_DK\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: openstreetmap.php:167
-msgid "View Larger"
-msgstr "Vis større"
-
-#: openstreetmap.php:194
-msgid "Submit"
-msgstr "Indsend"
-
-#: openstreetmap.php:195
-msgid "Tile Server URL"
-msgstr "Fliseserver URL"
-
-#: openstreetmap.php:195
-msgid ""
-"A list of <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" "
-"target=\"_blank\" rel=\"noopener noreferrer\">public tile servers</a>"
-msgstr "En liste af <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\" rel=\"noopener noreferrer\">offentlige fliseservere</a>"
-
-#: openstreetmap.php:196
-msgid "Nominatim (reverse geocoding) Server URL"
-msgstr "Nominatim (omvendt geokodning) Server URL"
-
-#: openstreetmap.php:196
-msgid ""
-"A list of <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim\" "
-"target=\"_blank\" rel=\"noopener noreferrer\">Nominatim servers</a>"
-msgstr "En liste af <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim\" target=\"_blank\" rel=\"noopener noreferrer\">Nominatim servere</a>"
-
-#: openstreetmap.php:197
-msgid "Default zoom"
-msgstr "Standard zoom"
-
-#: openstreetmap.php:197
-msgid ""
-"The default zoom level. (1:world, 18:highest, also depends on tile server)"
-msgstr "Det normale zoom niveau. (1:verden, 18:højest, afhænger også af fliseserveren)"
-
-#: openstreetmap.php:198
-msgid "Include marker on map"
-msgstr "Inkluder markør på kort"
-
-#: openstreetmap.php:198
-msgid "Include a marker on the map."
-msgstr "Inkluder en markør på kortet."
diff --git a/openstreetmap/lang/da-dk/strings.php b/openstreetmap/lang/da-dk/strings.php
deleted file mode 100644
index a8a4e1f5..00000000
--- a/openstreetmap/lang/da-dk/strings.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_da_dk")) {
-function string_plural_select_da_dk($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['View Larger'] = 'Vis større';
-$a->strings['Submit'] = 'Indsend';
-$a->strings['Tile Server URL'] = 'Fliseserver URL';
-$a->strings['A list of <a href="http://wiki.openstreetmap.org/wiki/TMS" target="_blank" rel="noopener noreferrer">public tile servers</a>'] = 'En liste af <a href="http://wiki.openstreetmap.org/wiki/TMS" target="_blank" rel="noopener noreferrer">offentlige fliseservere</a>';
-$a->strings['Nominatim (reverse geocoding) Server URL'] = 'Nominatim (omvendt geokodning) Server URL';
-$a->strings['A list of <a href="http://wiki.openstreetmap.org/wiki/Nominatim" target="_blank" rel="noopener noreferrer">Nominatim servers</a>'] = 'En liste af <a href="http://wiki.openstreetmap.org/wiki/Nominatim" target="_blank" rel="noopener noreferrer">Nominatim servere</a>';
-$a->strings['Default zoom'] = 'Standard zoom';
-$a->strings['The default zoom level. (1:world, 18:highest, also depends on tile server)'] = 'Det normale zoom niveau. (1:verden, 18:højest, afhænger også af fliseserveren)';
-$a->strings['Include marker on map'] = 'Inkluder markør på kort';
-$a->strings['Include a marker on the map.'] = 'Inkluder en markør på kortet.';
diff --git a/openstreetmap/lang/de/messages.po b/openstreetmap/lang/de/messages.po
index f99bdb2f..b346e525 100644
--- a/openstreetmap/lang/de/messages.po
+++ b/openstreetmap/lang/de/messages.po
@@ -4,65 +4,44 @@
 # 
 # 
 # Translators:
-# Andreas H., 2014
-# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2014
-# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2021
-# Ulf Rompe <transifex.com@rompe.org>, 2019
+# Abrax <webmaster@a-zwenkau.de>, 2014
+# bavatar <tobias.diekershoff@gmx.net>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2014-06-23 11:01+0000\n"
-"Last-Translator: Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2021\n"
-"Language-Team: German (http://app.transifex.com/Friendica/friendica/language/de/)\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2014-10-15 12:32+0000\n"
+"Last-Translator: Abrax <webmaster@a-zwenkau.de>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/friendica/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: openstreetmap.php:167
-msgid "View Larger"
-msgstr "Vergrößern"
-
-#: openstreetmap.php:194
+#: openstreetmap.php:94
 msgid "Submit"
 msgstr "Senden"
 
-#: openstreetmap.php:195
+#: openstreetmap.php:95
 msgid "Tile Server URL"
 msgstr "Die URL des Servers"
 
-#: openstreetmap.php:195
+#: openstreetmap.php:95
 msgid ""
 "A list of <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" "
-"target=\"_blank\" rel=\"noopener noreferrer\">public tile servers</a>"
-msgstr "Eine Liste <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\" rel=\"noopener noreferrer\">öffentlicher Tile-Server</a>"
+"target=\"_blank\">public tile servers</a>"
+msgstr "Eine Liste <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\">öffentlicher Tile Server</a>"
 
-#: openstreetmap.php:196
-msgid "Nominatim (reverse geocoding) Server URL"
-msgstr "Nominatim (umgekehrte Geokodierung) Server URL"
-
-#: openstreetmap.php:196
-msgid ""
-"A list of <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim\" "
-"target=\"_blank\" rel=\"noopener noreferrer\">Nominatim servers</a>"
-msgstr "Eine Liste von <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim\" target=\"_blank\" rel=\"noopener noreferrer\">Nominatim Servern</a>"
-
-#: openstreetmap.php:197
+#: openstreetmap.php:96
 msgid "Default zoom"
-msgstr "Standard-Zoom"
+msgstr "Standard Zoom"
 
-#: openstreetmap.php:197
-msgid ""
-"The default zoom level. (1:world, 18:highest, also depends on tile server)"
-msgstr "Das voreingestellte Zoom Level (1 Welt, 18 höchstes; hängt auch vom Tile-Server ab)"
+#: openstreetmap.php:96
+msgid "The default zoom level. (1:world, 18:highest)"
+msgstr "Standard Zoo,level (1: Welt; 18: höchstes)"
 
-#: openstreetmap.php:198
-msgid "Include marker on map"
-msgstr "Markierung auf der Karte anzeigen"
-
-#: openstreetmap.php:198
-msgid "Include a marker on the map."
-msgstr "Eine Markierung auf der Karte anzeigen."
+#: openstreetmap.php:104
+msgid "Settings updated."
+msgstr "Einstellungen aktualisiert."
diff --git a/openstreetmap/lang/de/strings.php b/openstreetmap/lang/de/strings.php
index 8430c6cc..b3bbbb22 100644
--- a/openstreetmap/lang/de/strings.php
+++ b/openstreetmap/lang/de/strings.php
@@ -2,16 +2,12 @@
 
 if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['View Larger'] = 'Vergrößern';
-$a->strings['Submit'] = 'Senden';
-$a->strings['Tile Server URL'] = 'Die URL des Servers';
-$a->strings['A list of <a href="http://wiki.openstreetmap.org/wiki/TMS" target="_blank" rel="noopener noreferrer">public tile servers</a>'] = 'Eine Liste <a href="http://wiki.openstreetmap.org/wiki/TMS" target="_blank" rel="noopener noreferrer">öffentlicher Tile-Server</a>';
-$a->strings['Nominatim (reverse geocoding) Server URL'] = 'Nominatim (umgekehrte Geokodierung) Server URL';
-$a->strings['A list of <a href="http://wiki.openstreetmap.org/wiki/Nominatim" target="_blank" rel="noopener noreferrer">Nominatim servers</a>'] = 'Eine Liste von <a href="http://wiki.openstreetmap.org/wiki/Nominatim" target="_blank" rel="noopener noreferrer">Nominatim Servern</a>';
-$a->strings['Default zoom'] = 'Standard-Zoom';
-$a->strings['The default zoom level. (1:world, 18:highest, also depends on tile server)'] = 'Das voreingestellte Zoom Level (1 Welt, 18 höchstes; hängt auch vom Tile-Server ab)';
-$a->strings['Include marker on map'] = 'Markierung auf der Karte anzeigen';
-$a->strings['Include a marker on the map.'] = 'Eine Markierung auf der Karte anzeigen.';
+;
+$a->strings["Submit"] = "Senden";
+$a->strings["Tile Server URL"] = "Die URL des Servers";
+$a->strings["A list of <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\">public tile servers</a>"] = "Eine Liste <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\">öffentlicher Tile Server</a>";
+$a->strings["Default zoom"] = "Standard Zoom";
+$a->strings["The default zoom level. (1:world, 18:highest)"] = "Standard Zoo,level (1: Welt; 18: höchstes)";
+$a->strings["Settings updated."] = "Einstellungen aktualisiert.";
diff --git a/openstreetmap/lang/es/messages.po b/openstreetmap/lang/es/messages.po
index f6167838..c7db998b 100644
--- a/openstreetmap/lang/es/messages.po
+++ b/openstreetmap/lang/es/messages.po
@@ -4,15 +4,14 @@
 # 
 # 
 # Translators:
-# Albert, 2016
-# Senex Petrovic <javierruizo@hotmail.com>, 2021
+# Alberto Díaz <albertodiaztormo@gmail.com>, 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2021-04-06 01:53+0000\n"
-"Last-Translator: Senex Petrovic <javierruizo@hotmail.com>\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2016-10-12 15:01+0000\n"
+"Last-Translator: Alberto Díaz <albertodiaztormo@gmail.com>\n"
 "Language-Team: Spanish (http://www.transifex.com/Friendica/friendica/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,47 +19,28 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: openstreetmap.php:167
-msgid "View Larger"
-msgstr "Ver mas grande"
-
-#: openstreetmap.php:194
+#: openstreetmap.php:94
 msgid "Submit"
 msgstr "Enviar"
 
-#: openstreetmap.php:195
+#: openstreetmap.php:95
 msgid "Tile Server URL"
 msgstr "URL del mosaico de servidor"
 
-#: openstreetmap.php:195
+#: openstreetmap.php:95
 msgid ""
 "A list of <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" "
-"target=\"_blank\" rel=\"noopener noreferrer\">public tile servers</a>"
-msgstr "Una lista de <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\" rel=\"noopener noreferrer\">servidores de archivos públicos</a>"
+"target=\"_blank\">public tile servers</a>"
+msgstr "Una lista de <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\">mosaico de servidores públicos</a>"
 
-#: openstreetmap.php:196
-msgid "Nominatim (reverse geocoding) Server URL"
-msgstr "URL del servidor Nominatim (codificación geográfica inversa)"
-
-#: openstreetmap.php:196
-msgid ""
-"A list of <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim\" "
-"target=\"_blank\" rel=\"noopener noreferrer\">Nominatim servers</a>"
-msgstr "Una lista de <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim\" target=\"_blank\" rel=\"noopener noreferrer\">servidores Nominatim</a>"
-
-#: openstreetmap.php:197
+#: openstreetmap.php:96
 msgid "Default zoom"
 msgstr "Zoom por defecto"
 
-#: openstreetmap.php:197
-msgid ""
-"The default zoom level. (1:world, 18:highest, also depends on tile server)"
-msgstr "El nivel de zoom predeterminado. (1: mundo, 18: más alto, también depende del servidor de mosaicos)"
+#: openstreetmap.php:96
+msgid "The default zoom level. (1:world, 18:highest)"
+msgstr "El nivel por defecto de zoom. (1:world, 18:highest)"
 
-#: openstreetmap.php:198
-msgid "Include marker on map"
-msgstr "Incluir marcador en el mapa"
-
-#: openstreetmap.php:198
-msgid "Include a marker on the map."
-msgstr "Incluir un marcador en el mapa."
+#: openstreetmap.php:104
+msgid "Settings updated."
+msgstr "Ajustes actualizados"
diff --git a/openstreetmap/lang/es/strings.php b/openstreetmap/lang/es/strings.php
index 57119bb8..d8a59d0e 100644
--- a/openstreetmap/lang/es/strings.php
+++ b/openstreetmap/lang/es/strings.php
@@ -2,16 +2,12 @@
 
 if(! function_exists("string_plural_select_es")) {
 function string_plural_select_es($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['View Larger'] = 'Ver mas grande';
-$a->strings['Submit'] = 'Enviar';
-$a->strings['Tile Server URL'] = 'URL del mosaico de servidor';
-$a->strings['A list of <a href="http://wiki.openstreetmap.org/wiki/TMS" target="_blank" rel="noopener noreferrer">public tile servers</a>'] = 'Una lista de <a href="http://wiki.openstreetmap.org/wiki/TMS" target="_blank" rel="noopener noreferrer">servidores de archivos públicos</a>';
-$a->strings['Nominatim (reverse geocoding) Server URL'] = 'URL del servidor Nominatim (codificación geográfica inversa)';
-$a->strings['A list of <a href="http://wiki.openstreetmap.org/wiki/Nominatim" target="_blank" rel="noopener noreferrer">Nominatim servers</a>'] = 'Una lista de <a href="http://wiki.openstreetmap.org/wiki/Nominatim" target="_blank" rel="noopener noreferrer">servidores Nominatim</a>';
-$a->strings['Default zoom'] = 'Zoom por defecto';
-$a->strings['The default zoom level. (1:world, 18:highest, also depends on tile server)'] = 'El nivel de zoom predeterminado. (1: mundo, 18: más alto, también depende del servidor de mosaicos)';
-$a->strings['Include marker on map'] = 'Incluir marcador en el mapa';
-$a->strings['Include a marker on the map.'] = 'Incluir un marcador en el mapa.';
+;
+$a->strings["Submit"] = "Enviar";
+$a->strings["Tile Server URL"] = "URL del mosaico de servidor";
+$a->strings["A list of <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\">public tile servers</a>"] = "Una lista de <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\">mosaico de servidores públicos</a>";
+$a->strings["Default zoom"] = "Zoom por defecto";
+$a->strings["The default zoom level. (1:world, 18:highest)"] = "El nivel por defecto de zoom. (1:world, 18:highest)";
+$a->strings["Settings updated."] = "Ajustes actualizados";
diff --git a/openstreetmap/lang/fi-fi/strings.php b/openstreetmap/lang/fi-fi/strings.php
index e403a87d..62c6e54c 100644
--- a/openstreetmap/lang/fi-fi/strings.php
+++ b/openstreetmap/lang/fi-fi/strings.php
@@ -3,9 +3,12 @@
 if(! function_exists("string_plural_select_fi_fi")) {
 function string_plural_select_fi_fi($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Submit'] = 'Lähetä';
-$a->strings['Default zoom'] = 'Oletuszoomaus';
-$a->strings['The default zoom level. (1:world, 18:highest)'] = 'Oletuszoomaustaso (1: kaukaisin, 18: läheisin)';
-$a->strings['Settings updated.'] = 'Asetukset päivitetty';
+;
+$a->strings["Submit"] = "Lähetä";
+$a->strings["Tile Server URL"] = "";
+$a->strings["A list of <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\">public tile servers</a>"] = "";
+$a->strings["Default zoom"] = "Oletuszoomaus";
+$a->strings["The default zoom level. (1:world, 18:highest)"] = "Oletuszoomaustaso (1: kaukaisin, 18: läheisin)";
+$a->strings["Settings updated."] = "Asetukset päivitetty";
diff --git a/openstreetmap/lang/fr/messages.po b/openstreetmap/lang/fr/messages.po
index 9a61af43..24781497 100644
--- a/openstreetmap/lang/fr/messages.po
+++ b/openstreetmap/lang/fr/messages.po
@@ -5,64 +5,44 @@
 # 
 # Translators:
 # Damien Goutte-Gattat <damien+transifex@incenp.org>, 2016
-# Hypolite Petovan <hypolite@mrpetovan.com>, 2022
-# ea1cd8241cb389ffb6f92bc6891eff5d_dc12308 <70dced5587d47e18d88f9298024d96f8_93383>, 2015
+# Nicola Spanti <translations@nicola-spanti.info>, 2015
 # StefOfficiel <pichard.stephane@free.fr>, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2014-06-23 11:01+0000\n"
-"Last-Translator: Hypolite Petovan <hypolite@mrpetovan.com>, 2022\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2016-09-12 15:41+0000\n"
+"Last-Translator: Damien Goutte-Gattat <damien+transifex@incenp.org>\n"
 "Language-Team: French (http://www.transifex.com/Friendica/friendica/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fr\n"
-"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: openstreetmap.php:167
-msgid "View Larger"
-msgstr "Voir en plus grand"
-
-#: openstreetmap.php:194
+#: openstreetmap.php:94
 msgid "Submit"
 msgstr "Envoyer"
 
-#: openstreetmap.php:195
+#: openstreetmap.php:95
 msgid "Tile Server URL"
 msgstr "URL du serveur de tuiles"
 
-#: openstreetmap.php:195
+#: openstreetmap.php:95
 msgid ""
 "A list of <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" "
-"target=\"_blank\" rel=\"noopener noreferrer\">public tile servers</a>"
-msgstr "Liste de <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\" rel=\"noopener noreferrer\">serveurs de tuile publics</a>"
+"target=\"_blank\">public tile servers</a>"
+msgstr "Une liste de <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\">serveurs de tuiles publics</a>"
 
-#: openstreetmap.php:196
-msgid "Nominatim (reverse geocoding) Server URL"
-msgstr "URL de server Nominatim (geocoding inversé)"
-
-#: openstreetmap.php:196
-msgid ""
-"A list of <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim\" "
-"target=\"_blank\" rel=\"noopener noreferrer\">Nominatim servers</a>"
-msgstr "Liste de <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim\" target=\"_blank\" rel=\"noopener noreferrer\">serveurs Nominatim</a>"
-
-#: openstreetmap.php:197
+#: openstreetmap.php:96
 msgid "Default zoom"
 msgstr "Zoom par défaut"
 
-#: openstreetmap.php:197
-msgid ""
-"The default zoom level. (1:world, 18:highest, also depends on tile server)"
-msgstr "Niveau de zoom par défaut (1:monde, 18:le plus proche, dépend également du serveur de tuile)."
+#: openstreetmap.php:96
+msgid "The default zoom level. (1:world, 18:highest)"
+msgstr "Le niveau de zoom affiché par défaut. (1: monde entier, 18: détail maximum)"
 
-#: openstreetmap.php:198
-msgid "Include marker on map"
-msgstr "Inclut un marqueur sur la carte"
-
-#: openstreetmap.php:198
-msgid "Include a marker on the map."
-msgstr "Inclut un marqueur sur la carte."
+#: openstreetmap.php:104
+msgid "Settings updated."
+msgstr "Paramètres mis à jour."
diff --git a/openstreetmap/lang/fr/strings.php b/openstreetmap/lang/fr/strings.php
index 4c72fd59..cdd98efc 100644
--- a/openstreetmap/lang/fr/strings.php
+++ b/openstreetmap/lang/fr/strings.php
@@ -2,16 +2,12 @@
 
 if(! function_exists("string_plural_select_fr")) {
 function string_plural_select_fr($n){
-	$n = intval($n);
-	if (($n == 0 || $n == 1)) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
+	return ($n > 1);;
 }}
-$a->strings['View Larger'] = 'Voir en plus grand';
-$a->strings['Submit'] = 'Envoyer';
-$a->strings['Tile Server URL'] = 'URL du serveur de tuiles';
-$a->strings['A list of <a href="http://wiki.openstreetmap.org/wiki/TMS" target="_blank" rel="noopener noreferrer">public tile servers</a>'] = 'Liste de <a href="http://wiki.openstreetmap.org/wiki/TMS" target="_blank" rel="noopener noreferrer">serveurs de tuile publics</a>';
-$a->strings['Nominatim (reverse geocoding) Server URL'] = 'URL de server Nominatim (geocoding inversé)';
-$a->strings['A list of <a href="http://wiki.openstreetmap.org/wiki/Nominatim" target="_blank" rel="noopener noreferrer">Nominatim servers</a>'] = 'Liste de <a href="http://wiki.openstreetmap.org/wiki/Nominatim" target="_blank" rel="noopener noreferrer">serveurs Nominatim</a>';
-$a->strings['Default zoom'] = 'Zoom par défaut';
-$a->strings['The default zoom level. (1:world, 18:highest, also depends on tile server)'] = 'Niveau de zoom par défaut (1:monde, 18:le plus proche, dépend également du serveur de tuile).';
-$a->strings['Include marker on map'] = 'Inclut un marqueur sur la carte';
-$a->strings['Include a marker on the map.'] = 'Inclut un marqueur sur la carte.';
+;
+$a->strings["Submit"] = "Envoyer";
+$a->strings["Tile Server URL"] = "URL du serveur de tuiles";
+$a->strings["A list of <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\">public tile servers</a>"] = "Une liste de <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\">serveurs de tuiles publics</a>";
+$a->strings["Default zoom"] = "Zoom par défaut";
+$a->strings["The default zoom level. (1:world, 18:highest)"] = "Le niveau de zoom affiché par défaut. (1: monde entier, 18: détail maximum)";
+$a->strings["Settings updated."] = "Paramètres mis à jour.";
diff --git a/openstreetmap/lang/hu/messages.po b/openstreetmap/lang/hu/messages.po
deleted file mode 100644
index 9925c60f..00000000
--- a/openstreetmap/lang/hu/messages.po
+++ /dev/null
@@ -1,65 +0,0 @@
-# ADDON openstreetmap
-# Copyright (C)
-# This file is distributed under the same license as the Friendica openstreetmap addon package.
-# 
-# 
-# Translators:
-# Balázs Úr, 2020-2021
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2014-06-23 11:01+0000\n"
-"Last-Translator: Balázs Úr, 2020-2021\n"
-"Language-Team: Hungarian (http://www.transifex.com/Friendica/friendica/language/hu/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: hu\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: openstreetmap.php:167
-msgid "View Larger"
-msgstr "Nagyobb megtekintése"
-
-#: openstreetmap.php:194
-msgid "Submit"
-msgstr "Elküldés"
-
-#: openstreetmap.php:195
-msgid "Tile Server URL"
-msgstr "Csempekiszolgáló URL"
-
-#: openstreetmap.php:195
-msgid ""
-"A list of <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" "
-"target=\"_blank\" rel=\"noopener noreferrer\">public tile servers</a>"
-msgstr "<a href=\"https://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\" rel=\"noopener noreferrer\">Nyilvános csempekiszolgálók</a> listája"
-
-#: openstreetmap.php:196
-msgid "Nominatim (reverse geocoding) Server URL"
-msgstr "Nominatim (fordított geokódolás) kiszolgáló URL"
-
-#: openstreetmap.php:196
-msgid ""
-"A list of <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim\" "
-"target=\"_blank\" rel=\"noopener noreferrer\">Nominatim servers</a>"
-msgstr "<a href=\"https://wiki.openstreetmap.org/wiki/Nominatim\" target=\"_blank\" rel=\"noopener noreferrer\">Nominatim kiszolgálók</a> listája"
-
-#: openstreetmap.php:197
-msgid "Default zoom"
-msgstr "Alapértelmezett nagyítás"
-
-#: openstreetmap.php:197
-msgid ""
-"The default zoom level. (1:world, 18:highest, also depends on tile server)"
-msgstr "Az alapértelmezett nagyítási szint (1: világ, 18: legnagyobb, de függ a csempekiszolgálótól is)."
-
-#: openstreetmap.php:198
-msgid "Include marker on map"
-msgstr "Jelölő felvétele a térképre"
-
-#: openstreetmap.php:198
-msgid "Include a marker on the map."
-msgstr "Egy jelölő felvétele a térképre."
diff --git a/openstreetmap/lang/hu/strings.php b/openstreetmap/lang/hu/strings.php
deleted file mode 100644
index 116a7724..00000000
--- a/openstreetmap/lang/hu/strings.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_hu")) {
-function string_plural_select_hu($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['View Larger'] = 'Nagyobb megtekintése';
-$a->strings['Submit'] = 'Elküldés';
-$a->strings['Tile Server URL'] = 'Csempekiszolgáló URL';
-$a->strings['A list of <a href="http://wiki.openstreetmap.org/wiki/TMS" target="_blank" rel="noopener noreferrer">public tile servers</a>'] = '<a href="https://wiki.openstreetmap.org/wiki/TMS" target="_blank" rel="noopener noreferrer">Nyilvános csempekiszolgálók</a> listája';
-$a->strings['Nominatim (reverse geocoding) Server URL'] = 'Nominatim (fordított geokódolás) kiszolgáló URL';
-$a->strings['A list of <a href="http://wiki.openstreetmap.org/wiki/Nominatim" target="_blank" rel="noopener noreferrer">Nominatim servers</a>'] = '<a href="https://wiki.openstreetmap.org/wiki/Nominatim" target="_blank" rel="noopener noreferrer">Nominatim kiszolgálók</a> listája';
-$a->strings['Default zoom'] = 'Alapértelmezett nagyítás';
-$a->strings['The default zoom level. (1:world, 18:highest, also depends on tile server)'] = 'Az alapértelmezett nagyítási szint (1: világ, 18: legnagyobb, de függ a csempekiszolgálótól is).';
-$a->strings['Include marker on map'] = 'Jelölő felvétele a térképre';
-$a->strings['Include a marker on the map.'] = 'Egy jelölő felvétele a térképre.';
diff --git a/openstreetmap/lang/is/strings.php b/openstreetmap/lang/is/strings.php
index fb3ad32c..d14a7713 100644
--- a/openstreetmap/lang/is/strings.php
+++ b/openstreetmap/lang/is/strings.php
@@ -3,11 +3,12 @@
 if(! function_exists("string_plural_select_is")) {
 function string_plural_select_is($n){
 	$n = intval($n);
-	return intval($n % 10 != 1 || $n % 100 == 11);
+	return ($n % 10 != 1 || $n % 100 == 11);;
 }}
-$a->strings['Submit'] = 'Senda inn';
-$a->strings['Tile Server URL'] = 'Slóð á kortaflísamiðlara';
-$a->strings['A list of <a href="http://wiki.openstreetmap.org/wiki/TMS" target="_blank">public tile servers</a>'] = 'Listi yfir <a href="http://wiki.openstreetmap.org/wiki/TMS" target="_blank">opinbera kortaflísamiðlara</a>';
-$a->strings['Default zoom'] = 'Sjálfgefinn aðdráttur';
-$a->strings['The default zoom level. (1:world, 18:highest)'] = 'Sjálfgefið aðdráttarstig. (1:heimur, 18:mest)';
-$a->strings['Settings updated.'] = 'Stillingar uppfærðar.';
+;
+$a->strings["Submit"] = "Senda inn";
+$a->strings["Tile Server URL"] = "Slóð á kortaflísamiðlara";
+$a->strings["A list of <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\">public tile servers</a>"] = "Listi yfir <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\">opinbera kortaflísamiðlara</a>";
+$a->strings["Default zoom"] = "Sjálfgefinn aðdráttur";
+$a->strings["The default zoom level. (1:world, 18:highest)"] = "Sjálfgefið aðdráttarstig. (1:heimur, 18:mest)";
+$a->strings["Settings updated."] = "Stillingar uppfærðar.";
diff --git a/openstreetmap/lang/it/messages.po b/openstreetmap/lang/it/messages.po
index 19d08e66..db2fe993 100644
--- a/openstreetmap/lang/it/messages.po
+++ b/openstreetmap/lang/it/messages.po
@@ -5,14 +5,13 @@
 # 
 # Translators:
 # fabrixxm <fabrix.xm@gmail.com>, 2014-2015
-# Sylke Vicious <silkevicious@gmail.com>, 2021
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2021-02-16 13:01+0000\n"
-"Last-Translator: Sylke Vicious <silkevicious@gmail.com>\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2017-09-20 06:08+0000\n"
+"Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,47 +19,28 @@ msgstr ""
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: openstreetmap.php:167
-msgid "View Larger"
-msgstr "Vedi Ingrandito"
-
-#: openstreetmap.php:194
+#: openstreetmap.php:94
 msgid "Submit"
 msgstr "Invia"
 
-#: openstreetmap.php:195
+#: openstreetmap.php:95
 msgid "Tile Server URL"
 msgstr "Indirizzo del server dei tasselli"
 
-#: openstreetmap.php:195
+#: openstreetmap.php:95
 msgid ""
 "A list of <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" "
-"target=\"_blank\" rel=\"noopener noreferrer\">public tile servers</a>"
-msgstr "Una lista dei <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\" rel=\"noopener noreferrer\">server dei tasselli pubblici</a>"
+"target=\"_blank\">public tile servers</a>"
+msgstr "Lista dei <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\">server dei tasselli pubblici</a>"
 
-#: openstreetmap.php:196
-msgid "Nominatim (reverse geocoding) Server URL"
-msgstr "URL Server Nominatim (reverse geocoding)"
-
-#: openstreetmap.php:196
-msgid ""
-"A list of <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim\" "
-"target=\"_blank\" rel=\"noopener noreferrer\">Nominatim servers</a>"
-msgstr "Una lista dei <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim\" target=\"_blank\" rel=\"noopener noreferrer\">server Nominatim</a>"
-
-#: openstreetmap.php:197
+#: openstreetmap.php:96
 msgid "Default zoom"
 msgstr "Zoom predefinito"
 
-#: openstreetmap.php:197
-msgid ""
-"The default zoom level. (1:world, 18:highest, also depends on tile server)"
-msgstr "Il livello di zoom predefinito. (1:mondo, 18:massimo, ma dipende dal server di tasselli)"
+#: openstreetmap.php:96
+msgid "The default zoom level. (1:world, 18:highest)"
+msgstr "Il livello di zoom predefinito (1:Mondo, 18:il massimo)"
 
-#: openstreetmap.php:198
-msgid "Include marker on map"
-msgstr "Includi segnaposto sulla mappa"
-
-#: openstreetmap.php:198
-msgid "Include a marker on the map."
-msgstr "Includi un segnaposto sulla mappa."
+#: openstreetmap.php:104
+msgid "Settings updated."
+msgstr "Impostazioni aggiornate."
diff --git a/openstreetmap/lang/it/strings.php b/openstreetmap/lang/it/strings.php
index fc3c3701..f85b520b 100644
--- a/openstreetmap/lang/it/strings.php
+++ b/openstreetmap/lang/it/strings.php
@@ -2,16 +2,12 @@
 
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['View Larger'] = 'Vedi Ingrandito';
-$a->strings['Submit'] = 'Invia';
-$a->strings['Tile Server URL'] = 'Indirizzo del server dei tasselli';
-$a->strings['A list of <a href="http://wiki.openstreetmap.org/wiki/TMS" target="_blank" rel="noopener noreferrer">public tile servers</a>'] = 'Una lista dei <a href="http://wiki.openstreetmap.org/wiki/TMS" target="_blank" rel="noopener noreferrer">server dei tasselli pubblici</a>';
-$a->strings['Nominatim (reverse geocoding) Server URL'] = 'URL Server Nominatim (reverse geocoding)';
-$a->strings['A list of <a href="http://wiki.openstreetmap.org/wiki/Nominatim" target="_blank" rel="noopener noreferrer">Nominatim servers</a>'] = 'Una lista dei <a href="http://wiki.openstreetmap.org/wiki/Nominatim" target="_blank" rel="noopener noreferrer">server Nominatim</a>';
-$a->strings['Default zoom'] = 'Zoom predefinito';
-$a->strings['The default zoom level. (1:world, 18:highest, also depends on tile server)'] = 'Il livello di zoom predefinito. (1:mondo, 18:massimo, ma dipende dal server di tasselli)';
-$a->strings['Include marker on map'] = 'Includi segnaposto sulla mappa';
-$a->strings['Include a marker on the map.'] = 'Includi un segnaposto sulla mappa.';
+;
+$a->strings["Submit"] = "Invia";
+$a->strings["Tile Server URL"] = "Indirizzo del server dei tasselli";
+$a->strings["A list of <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\">public tile servers</a>"] = "Lista dei <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\">server dei tasselli pubblici</a>";
+$a->strings["Default zoom"] = "Zoom predefinito";
+$a->strings["The default zoom level. (1:world, 18:highest)"] = "Il livello di zoom predefinito (1:Mondo, 18:il massimo)";
+$a->strings["Settings updated."] = "Impostazioni aggiornate.";
diff --git a/openstreetmap/lang/nl/strings.php b/openstreetmap/lang/nl/strings.php
index 1b63398f..6d3e5b23 100644
--- a/openstreetmap/lang/nl/strings.php
+++ b/openstreetmap/lang/nl/strings.php
@@ -3,8 +3,12 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Submit'] = 'Opslaan';
-$a->strings['Tile Server URL'] = 'URL met kaarttegels';
-$a->strings['Settings updated.'] = 'Instellingen opgeslagen';
+;
+$a->strings["Submit"] = "Opslaan";
+$a->strings["Tile Server URL"] = "URL met kaarttegels";
+$a->strings["A list of <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\">public tile servers</a>"] = "";
+$a->strings["Default zoom"] = "";
+$a->strings["The default zoom level. (1:world, 18:highest)"] = "";
+$a->strings["Settings updated."] = "Instellingen opgeslagen";
diff --git a/openstreetmap/lang/pl/messages.po b/openstreetmap/lang/pl/messages.po
index 36863a31..38be16a3 100644
--- a/openstreetmap/lang/pl/messages.po
+++ b/openstreetmap/lang/pl/messages.po
@@ -4,15 +4,14 @@
 # 
 # 
 # Translators:
-# Piotr Strębski <strebski@gmail.com>, 2022
-# Waldemar Stoczkowski, 2018
+# Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2014-06-23 11:01+0000\n"
-"Last-Translator: Piotr Strębski <strebski@gmail.com>, 2022\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2018-08-04 10:52+0000\n"
+"Last-Translator: Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.com/Friendica/friendica/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,47 +19,28 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
-#: openstreetmap.php:167
-msgid "View Larger"
-msgstr "Zobacz większą"
-
-#: openstreetmap.php:194
+#: openstreetmap.php:94
 msgid "Submit"
 msgstr "Zatwierdź"
 
-#: openstreetmap.php:195
+#: openstreetmap.php:95
 msgid "Tile Server URL"
-msgstr "Adres URL serwera kafelków"
+msgstr "Adres URL serwera sąsiadująco"
 
-#: openstreetmap.php:195
+#: openstreetmap.php:95
 msgid ""
 "A list of <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" "
-"target=\"_blank\" rel=\"noopener noreferrer\">public tile servers</a>"
-msgstr "Lista <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\" rel=\"noopener noreferrer\">publicznych serwerów z kafelkami</a>"
+"target=\"_blank\">public tile servers</a>"
+msgstr "Lista <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\">serwerów publicznych</a>"
 
-#: openstreetmap.php:196
-msgid "Nominatim (reverse geocoding) Server URL"
-msgstr "Adres URL serwera Nominatim (geokodowanie odwrotne)"
-
-#: openstreetmap.php:196
-msgid ""
-"A list of <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim\" "
-"target=\"_blank\" rel=\"noopener noreferrer\">Nominatim servers</a>"
-msgstr "Lista <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim\" target=\"_blank\" rel=\"noopener noreferrer\">serwerów Nominatim</a>"
-
-#: openstreetmap.php:197
+#: openstreetmap.php:96
 msgid "Default zoom"
 msgstr "Domyślne powiększenie"
 
-#: openstreetmap.php:197
-msgid ""
-"The default zoom level. (1:world, 18:highest, also depends on tile server)"
-msgstr "Domyślny poziom powiększenia. (1:świat, 18:największy; zależy to także od serwera kafelków)"
+#: openstreetmap.php:96
+msgid "The default zoom level. (1:world, 18:highest)"
+msgstr "Domyślny poziom powiększenia. (1:świat, 18:najwyższy)"
 
-#: openstreetmap.php:198
-msgid "Include marker on map"
-msgstr "Uwzględnij znacznik na mapie"
-
-#: openstreetmap.php:198
-msgid "Include a marker on the map."
-msgstr "Uwzględnij znacznik na mapie."
+#: openstreetmap.php:104
+msgid "Settings updated."
+msgstr "Zaktualizowano ustawienia."
diff --git a/openstreetmap/lang/pl/strings.php b/openstreetmap/lang/pl/strings.php
index c442cff4..630cb92c 100644
--- a/openstreetmap/lang/pl/strings.php
+++ b/openstreetmap/lang/pl/strings.php
@@ -3,15 +3,12 @@
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
 	$n = intval($n);
-	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
+	return ($n==1 ? 0 : ($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14) ? 1 : $n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14) ? 2 : 3);;
 }}
-$a->strings['View Larger'] = 'Zobacz większą';
-$a->strings['Submit'] = 'Zatwierdź';
-$a->strings['Tile Server URL'] = 'Adres URL serwera kafelków';
-$a->strings['A list of <a href="http://wiki.openstreetmap.org/wiki/TMS" target="_blank" rel="noopener noreferrer">public tile servers</a>'] = 'Lista <a href="http://wiki.openstreetmap.org/wiki/TMS" target="_blank" rel="noopener noreferrer">publicznych serwerów z kafelkami</a>';
-$a->strings['Nominatim (reverse geocoding) Server URL'] = 'Adres URL serwera Nominatim (geokodowanie odwrotne)';
-$a->strings['A list of <a href="http://wiki.openstreetmap.org/wiki/Nominatim" target="_blank" rel="noopener noreferrer">Nominatim servers</a>'] = 'Lista <a href="http://wiki.openstreetmap.org/wiki/Nominatim" target="_blank" rel="noopener noreferrer">serwerów Nominatim</a>';
-$a->strings['Default zoom'] = 'Domyślne powiększenie';
-$a->strings['The default zoom level. (1:world, 18:highest, also depends on tile server)'] = 'Domyślny poziom powiększenia. (1:świat, 18:największy; zależy to także od serwera kafelków)';
-$a->strings['Include marker on map'] = 'Uwzględnij znacznik na mapie';
-$a->strings['Include a marker on the map.'] = 'Uwzględnij znacznik na mapie.';
+;
+$a->strings["Submit"] = "Zatwierdź";
+$a->strings["Tile Server URL"] = "Adres URL serwera sąsiadująco";
+$a->strings["A list of <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\">public tile servers</a>"] = "Lista <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\">serwerów publicznych</a>";
+$a->strings["Default zoom"] = "Domyślne powiększenie";
+$a->strings["The default zoom level. (1:world, 18:highest)"] = "Domyślny poziom powiększenia. (1:świat, 18:najwyższy)";
+$a->strings["Settings updated."] = "Zaktualizowano ustawienia.";
diff --git a/openstreetmap/lang/pt-br/strings.php b/openstreetmap/lang/pt-br/strings.php
index f784ad04..ac18fd0d 100644
--- a/openstreetmap/lang/pt-br/strings.php
+++ b/openstreetmap/lang/pt-br/strings.php
@@ -2,12 +2,12 @@
 
 if(! function_exists("string_plural_select_pt_br")) {
 function string_plural_select_pt_br($n){
-	$n = intval($n);
-	return intval($n > 1);
+	return ($n > 1);;
 }}
-$a->strings['Submit'] = 'Enviar';
-$a->strings['Tile Server URL'] = 'URL do Servidor de Bloco';
-$a->strings['A list of <a href="http://wiki.openstreetmap.org/wiki/TMS" target="_blank">public tile servers</a>'] = 'Uma lista de <a href="http://wiki.openstreetmap.org/wiki/TMS" target="_blank">servidores de bloco públicos</a>';
-$a->strings['Default zoom'] = 'Zoom padrão';
-$a->strings['The default zoom level. (1:world, 18:highest)'] = 'O nível padrão de zoom. (1:mundo, 18:máximo) ';
-$a->strings['Settings updated.'] = 'As configurações foram atualizadas.';
+;
+$a->strings["Submit"] = "Enviar";
+$a->strings["Tile Server URL"] = "URL do Servidor de Bloco";
+$a->strings["A list of <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\">public tile servers</a>"] = "Uma lista de <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\">servidores de bloco públicos</a>";
+$a->strings["Default zoom"] = "Zoom padrão";
+$a->strings["The default zoom level. (1:world, 18:highest)"] = "O nível padrão de zoom. (1:mundo, 18:máximo) ";
+$a->strings["Settings updated."] = "As configurações foram atualizadas.";
diff --git a/openstreetmap/lang/ro/strings.php b/openstreetmap/lang/ro/strings.php
index ede51418..83700eed 100644
--- a/openstreetmap/lang/ro/strings.php
+++ b/openstreetmap/lang/ro/strings.php
@@ -2,12 +2,12 @@
 
 if(! function_exists("string_plural_select_ro")) {
 function string_plural_select_ro($n){
-	$n = intval($n);
-	if ($n==1) { return 0; } else if ((($n%100>19)||(($n%100==0)&&($n!=0)))) { return 2; } else  { return 1; }
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
 }}
-$a->strings['Submit'] = 'Trimite';
-$a->strings['Tile Server URL'] = 'URL Server pentru Stratificare Hărți';
-$a->strings['A list of <a href="http://wiki.openstreetmap.org/wiki/TMS" target="_blank">public tile servers</a>'] = 'O lista cu <a href="http://wiki.openstreetmap.org/wiki/TMS" target="_blank">servere publice cu tipuri de hărți</a>';
-$a->strings['Default zoom'] = 'Magnificare implicită';
-$a->strings['The default zoom level. (1:world, 18:highest)'] = 'Nivelul implicit de magnificare. (1:nivel global, 18:cea mai mare)';
-$a->strings['Settings updated.'] = 'Configurări actualizate.';
+;
+$a->strings["Submit"] = "Trimite";
+$a->strings["Tile Server URL"] = "URL Server pentru Stratificare Hărți";
+$a->strings["A list of <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\">public tile servers</a>"] = "O lista cu <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\">servere publice cu tipuri de hărți</a>";
+$a->strings["Default zoom"] = "Magnificare implicită";
+$a->strings["The default zoom level. (1:world, 18:highest)"] = "Nivelul implicit de magnificare. (1:nivel global, 18:cea mai mare)";
+$a->strings["Settings updated."] = "Configurări actualizate.";
diff --git a/openstreetmap/lang/sv/messages.po b/openstreetmap/lang/sv/messages.po
deleted file mode 100644
index 8181304d..00000000
--- a/openstreetmap/lang/sv/messages.po
+++ /dev/null
@@ -1,66 +0,0 @@
-# ADDON openstreetmap
-# Copyright (C)
-# This file is distributed under the same license as the Friendica openstreetmap addon package.
-# 
-# 
-# Translators:
-# Hypolite Petovan <hypolite@mrpetovan.com>, 2019
-# Kristoffer Grundström <lovaren@gmail.com>, 2022
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2022-01-16 00:49+0000\n"
-"Last-Translator: Kristoffer Grundström <lovaren@gmail.com>\n"
-"Language-Team: Swedish (http://www.transifex.com/Friendica/friendica/language/sv/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: sv\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: openstreetmap.php:167
-msgid "View Larger"
-msgstr ""
-
-#: openstreetmap.php:194
-msgid "Submit"
-msgstr "Spara"
-
-#: openstreetmap.php:195
-msgid "Tile Server URL"
-msgstr ""
-
-#: openstreetmap.php:195
-msgid ""
-"A list of <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" "
-"target=\"_blank\" rel=\"noopener noreferrer\">public tile servers</a>"
-msgstr ""
-
-#: openstreetmap.php:196
-msgid "Nominatim (reverse geocoding) Server URL"
-msgstr ""
-
-#: openstreetmap.php:196
-msgid ""
-"A list of <a href=\"http://wiki.openstreetmap.org/wiki/Nominatim\" "
-"target=\"_blank\" rel=\"noopener noreferrer\">Nominatim servers</a>"
-msgstr ""
-
-#: openstreetmap.php:197
-msgid "Default zoom"
-msgstr "Standardzoom"
-
-#: openstreetmap.php:197
-msgid ""
-"The default zoom level. (1:world, 18:highest, also depends on tile server)"
-msgstr ""
-
-#: openstreetmap.php:198
-msgid "Include marker on map"
-msgstr ""
-
-#: openstreetmap.php:198
-msgid "Include a marker on the map."
-msgstr ""
diff --git a/openstreetmap/lang/sv/strings.php b/openstreetmap/lang/sv/strings.php
index 5ecb9e95..dcd4e821 100644
--- a/openstreetmap/lang/sv/strings.php
+++ b/openstreetmap/lang/sv/strings.php
@@ -1,9 +1,4 @@
-<?php
-
-if(! function_exists("string_plural_select_sv")) {
-function string_plural_select_sv($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Submit'] = 'Spara';
-$a->strings['Default zoom'] = 'Standardzoom';
+<?php
+
+$a->strings["Submit"] = "Spara";
+$a->strings["Settings updated."] = "Inst&auml;llningarna har uppdaterats.";
diff --git a/openstreetmap/openstreetmap.php b/openstreetmap/openstreetmap.php
index ae22aff0..7b33306f 100644
--- a/openstreetmap/openstreetmap.php
+++ b/openstreetmap/openstreetmap.php
@@ -9,13 +9,14 @@
  *
  */
 
-use Friendica\App;
-use Friendica\Core\Cache\Enum\Duration;
+use Friendica\Core\Cache;
+use Friendica\Core\Config;
 use Friendica\Core\Hook;
+use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
-use Friendica\DI;
-use Friendica\Core\Config\Util\ConfigFileManager;
+use Friendica\Util\ConfigFileLoader;
+use Friendica\Util\Network;
 use Friendica\Util\Strings;
 
 const OSM_TMS = 'https://www.openstreetmap.org';
@@ -32,18 +33,30 @@ function openstreetmap_install()
 	Hook::register('Map::getCoordinates', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_get_coordinates');
 	Hook::register('page_header', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_alterheader');
 
-	Logger::notice("installed openstreetmap");
+	Logger::log("installed openstreetmap");
 }
 
-function openstreetmap_load_config(ConfigFileManager $loader)
+function openstreetmap_uninstall()
 {
-	DI::app()->getConfigCache()->load($loader->loadAddonConfig('openstreetmap'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
+	Hook::unregister('load_config',     'addon/openstreetmap/openstreetmap.php', 'openstreetmap_load_config');
+	Hook::unregister('render_location', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_location');
+	Hook::unregister('generate_map', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_generate_map');
+	Hook::unregister('generate_named_map', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_generate_named_map');
+	Hook::unregister('Map::getCoordinates', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_get_coordinates');
+	Hook::unregister('page_header', 'addon/openstreetmap/openstreetmap.php', 'openstreetmap_alterheader');
+
+	Logger::log("removed openstreetmap");
 }
 
-function openstreetmap_alterheader(&$navHtml)
+function openstreetmap_load_config(\Friendica\App $a, ConfigFileLoader $loader)
 {
-	$addScriptTag = '<script type="text/javascript" src="' . DI::baseUrl() . '/addon/openstreetmap/openstreetmap.js"></script>' . "\r\n";
-	DI::page()['htmlhead'] .= $addScriptTag;
+	$a->getConfigCache()->load($loader->loadAddonConfig('openstreetmap'));
+}
+
+function openstreetmap_alterheader($a, &$navHtml)
+{
+	$addScriptTag = '<script type="text/javascript" src="' . $a->getBaseURL() . '/addon/openstreetmap/openstreetmap.js"></script>' . "\r\n";
+	$a->page['htmlhead'] .= $addScriptTag;
 }
 
 /**
@@ -52,9 +65,10 @@ function openstreetmap_alterheader(&$navHtml)
  * If an item has coordinates add link to a tile map server, e.g. openstreetmap.org.
  * If an item has a location open it with the help of OSM's Nominatim reverse geocode search.
  *
+ * @param mixed $a
  * @param array& $item
  */
-function openstreetmap_location(array &$item)
+function openstreetmap_location($a, &$item)
 {
 	if (!(strlen($item['location']) || strlen($item['coord']))) {
 		return;
@@ -68,19 +82,19 @@ function openstreetmap_location(array &$item)
 	 * ?mlat=lat&mlon=lon for markers.
 	 */
 
-	$tmsserver = DI::config()->get('openstreetmap', 'tmsserver', OSM_TMS);
-	$nomserver = DI::config()->get('openstreetmap', 'nomserver', OSM_NOM);
-	$zoom = DI::config()->get('openstreetmap', 'zoom', OSM_ZOOM);
-	$marker = DI::config()->get('openstreetmap', 'marker', OSM_MARKER);
+	$tmsserver = Config::get('openstreetmap', 'tmsserver', OSM_TMS);
+	$nomserver = Config::get('openstreetmap', 'nomserver', OSM_NOM);
+	$zoom = Config::get('openstreetmap', 'zoom', OSM_ZOOM);
+	$marker = Config::get('openstreetmap', 'marker', OSM_MARKER);
 
 	// This is needed since we stored an empty string in the config in previous versions
 	if (empty($nomserver)) {
 		$nomserver = OSM_NOM;
 	}
 
-	if ($item['coord'] != '') {
+	if ($item['coord'] != "") {
 		$coords = explode(' ', $item['coord']);
-		if ((count($coords) > 1) && is_numeric($coords[0]) && is_numeric($coords[1])) {
+		if (count($coords) > 1) {
 			$lat = urlencode(round($coords[0], 5));
 			$lon = urlencode(round($coords[1], 5));
 			$target = $tmsserver;
@@ -95,18 +109,18 @@ function openstreetmap_location(array &$item)
 		$target = $nomserver.'?q='.urlencode($item['location']);
 	}
 
-	if ($item['location'] != '') {
+	if ($item['location'] != "") {
 		$title = $item['location'];
 	} else {
 		$title = $item['coord'];
 	}
 
-	$item['html'] = '<a target="map" title="' . $title . '" href= "' . $target . '">' . $title . '</a>';
+	$item['html'] = '<a target="map" title="'.$title.'" href= "'.$target.'">'.$title.'</a>';
 }
 
-function openstreetmap_get_coordinates(array &$b)
+function openstreetmap_get_coordinates($a, &$b)
 {
-	$nomserver = DI::config()->get('openstreetmap', 'nomserver', OSM_NOM);
+	$nomserver = Config::get('openstreetmap', 'nomserver', OSM_NOM);
 
 	// This is needed since we stored an empty string in the config in previous versions
 	if (empty($nomserver)) {
@@ -115,14 +129,14 @@ function openstreetmap_get_coordinates(array &$b)
 
 	$args = '?q=' . urlencode($b['location']) . '&format=json';
 
-	$cachekey = 'openstreetmap:' . $b['location'];
-	$j = DI::cache()->get($cachekey);
+	$cachekey = "openstreetmap:" . $b['location'];
+	$j = Cache::get($cachekey);
 
 	if (is_null($j)) {
-		$curlResult = DI::httpClient()->get($nomserver . $args);
+		$curlResult = Network::curl($nomserver . $args);
 		if ($curlResult->isSuccess()) {
-			$j = json_decode($curlResult->getBodyString(), true);
-			DI::cache()->set($cachekey, $j, Duration::MONTH);
+			$j = json_decode($curlResult->getBody(), true);
+			Cache::set($cachekey, $j, Cache::MONTH);
 		}
 	}
 
@@ -132,31 +146,31 @@ function openstreetmap_get_coordinates(array &$b)
 	}
 }
 
-function openstreetmap_generate_named_map(array &$b)
+function openstreetmap_generate_named_map(&$a, &$b)
 {
-	openstreetmap_get_coordinates($b);
+	openstreetmap_get_coordinates($a, $b);
 
 	if (!empty($b['lat']) && !empty($b['lon'])) {
-		openstreetmap_generate_map($b);
+		openstreetmap_generate_map($a, $b);
 	}
 }
 
-function openstreetmap_generate_map(array &$b)
+function openstreetmap_generate_map(&$a, &$b)
 {
-	$tmsserver = DI::config()->get('openstreetmap', 'tmsserver', OSM_TMS);
+	$tmsserver = Config::get('openstreetmap', 'tmsserver', OSM_TMS);
 
-	if (strpos(DI::baseUrl(), 'https:') !== false) {
+	if (strpos($a->getBaseURL(true), 'https:') !== false) {
 		$tmsserver = str_replace('http:','https:',$tmsserver);
 	}
 
-	$zoom = DI::config()->get('openstreetmap', 'zoom', OSM_ZOOM);
-	$marker = DI::config()->get('openstreetmap', 'marker', OSM_MARKER);
+	$zoom = Config::get('openstreetmap', 'zoom', OSM_ZOOM);
+	$marker = Config::get('openstreetmap', 'marker', OSM_MARKER);
 
 	$lat = $b['lat']; // round($b['lat'], 5);
 	$lon = $b['lon']; // round($b['lon'], 5);
 
-	Logger::debug('lat: ' . $lat);
-	Logger::debug('lon: ' . $lon);
+	Logger::log('lat: ' . $lat, Logger::DATA);
+	Logger::log('lon: ' . $lon, Logger::DATA);
 
 	$cardlink = '<a href="' . $tmsserver;
 
@@ -164,7 +178,7 @@ function openstreetmap_generate_map(array &$b)
 		$cardlink .= '?mlat=' . $lat . '&mlon=' . $lon;
 	}
 
-	$cardlink .= '#map=' . $zoom . '/' . $lat . '/' . $lon . '">' . ($b['location'] ??0? Strings::escapeHtml($b['location']) : DI::l10n()->t('View Larger')) . '</a>';
+	$cardlink .= '#map=' . $zoom . '/' . $lat . '/' . $lon . '">' . ($b['location'] ? Strings::escapeHtml($b['location']) : L10n::t('View Larger')) . '</a>';
 	if (empty($b['mode'])) {
 		$b['html'] = '<iframe style="width:100%; height:300px; border:1px solid #ccc" src="' . $tmsserver .
 				'/export/embed.html?bbox=' . ($lon - 0.01) . '%2C' . ($lat - 0.01) . '%2C' . ($lon + 0.01) . '%2C' . ($lat + 0.01) .
@@ -174,16 +188,16 @@ function openstreetmap_generate_map(array &$b)
 		$b['html'] .= '<br/>' . $cardlink;
 	}
 
-	Logger::debug('generate_map: ' . $b['html']);
+	Logger::log('generate_map: ' . $b['html'], Logger::DATA);
 }
 
-function openstreetmap_addon_admin(string &$o)
+function openstreetmap_addon_admin(&$a, &$o)
 {
-	$t = Renderer::getMarkupTemplate('admin.tpl', 'addon/openstreetmap/');
-	$tmsserver = DI::config()->get('openstreetmap', 'tmsserver', OSM_TMS);
-	$nomserver = DI::config()->get('openstreetmap', 'nomserver', OSM_NOM);
-	$zoom = DI::config()->get('openstreetmap', 'zoom', OSM_ZOOM);
-	$marker = DI::config()->get('openstreetmap', 'marker', OSM_MARKER);
+	$t = Renderer::getMarkupTemplate("admin.tpl", "addon/openstreetmap/");
+	$tmsserver = Config::get('openstreetmap', 'tmsserver', OSM_TMS);
+	$nomserver = Config::get('openstreetmap', 'nomserver', OSM_NOM);
+	$zoom = Config::get('openstreetmap', 'zoom', OSM_ZOOM);
+	$marker = Config::get('openstreetmap', 'marker', OSM_MARKER);
 
 	// This is needed since we stored an empty string in the config in previous versions
 	if (empty($nomserver)) {
@@ -191,18 +205,25 @@ function openstreetmap_addon_admin(string &$o)
 	}
 
 	$o = Renderer::replaceMacros($t, [
-			'$submit' => DI::l10n()->t('Submit'),
-			'$tmsserver' => ['tmsserver', DI::l10n()->t('Tile Server URL'), $tmsserver, DI::l10n()->t('A list of <a href="http://wiki.openstreetmap.org/wiki/TMS" target="_blank" rel="noopener noreferrer">public tile servers</a>')],
-			'$nomserver' => ['nomserver', DI::l10n()->t('Nominatim (reverse geocoding) Server URL'), $nomserver, DI::l10n()->t('A list of <a href="http://wiki.openstreetmap.org/wiki/Nominatim" target="_blank" rel="noopener noreferrer">Nominatim servers</a>')],
-			'$zoom' => ['zoom', DI::l10n()->t('Default zoom'), $zoom, DI::l10n()->t('The default zoom level. (1:world, 18:highest, also depends on tile server)')],
-			'$marker' => ['marker', DI::l10n()->t('Include marker on map'), $marker, DI::l10n()->t('Include a marker on the map.')],
+			'$submit' => L10n::t('Submit'),
+			'$tmsserver' => ['tmsserver', L10n::t('Tile Server URL'), $tmsserver, L10n::t('A list of <a href="http://wiki.openstreetmap.org/wiki/TMS" target="_blank">public tile servers</a>')],
+			'$nomserver' => ['nomserver', L10n::t('Nominatim (reverse geocoding) Server URL'), $nomserver, L10n::t('A list of <a href="http://wiki.openstreetmap.org/wiki/Nominatim" target="_blank">Nominatim servers</a>')],
+			'$zoom' => ['zoom', L10n::t('Default zoom'), $zoom, L10n::t('The default zoom level. (1:world, 18:highest, also depends on tile server)')],
+			'$marker' => ['marker', L10n::t('Include marker on map'), $marker, L10n::t('Include a marker on the map.')],
 	]);
 }
 
-function openstreetmap_addon_admin_post()
+function openstreetmap_addon_admin_post(&$a)
 {
-	DI::config()->set('openstreetmap', 'tmsserver', ($_POST['tmsserver'] ?? '') ?: OSM_TMS);
-	DI::config()->set('openstreetmap', 'nomserver', ($_POST['nomserver'] ?? '') ?: OSM_NOM);
-	DI::config()->set('openstreetmap', 'zoom', ($_POST['zoom'] ?? '') ?: OSM_ZOOM);
-	DI::config()->set('openstreetmap', 'marker', ($_POST['marker'] ?? '') ?: OSM_MARKER);
+	$urltms = ($_POST['tmsserver'] ?? '') ?: OSM_TMS;
+	$urlnom = ($_POST['nomserver'] ?? '') ?: OSM_NOM;
+	$zoom = ($_POST['zoom'] ?? '') ?: OSM_ZOOM;
+	$marker = ($_POST['marker'] ?? '') ?: OSM_MARKER;
+
+	Config::set('openstreetmap', 'tmsserver', $urltms);
+	Config::set('openstreetmap', 'nomserver', $urlnom);
+	Config::set('openstreetmap', 'zoom', $zoom);
+	Config::set('openstreetmap', 'marker', $marker);
+
+	info(L10n::t('Settings updated.') . EOL);
 }
diff --git a/opmlexport/README.md b/opmlexport/README.md
deleted file mode 100644
index 6d944de9..00000000
--- a/opmlexport/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# OPML Export
-
-Export user's active RSS/Atom contacts as OPML.
-
-Launch from `Settings` -> `Addons` -> `OPML Export`
\ No newline at end of file
diff --git a/opmlexport/lang/C/messages.po b/opmlexport/lang/C/messages.po
deleted file mode 100644
index fe485540..00000000
--- a/opmlexport/lang/C/messages.po
+++ /dev/null
@@ -1,26 +0,0 @@
-# ADDON opmlexport
-# Copyright (C) 
-# This file is distributed under the same license as the Friendica opmlexport addon package.
-# 
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:15-0500\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: opmlexport.php:79
-msgid "OPML Export"
-msgstr ""
-
-#: opmlexport.php:80
-msgid "Export RSS/Atom contacts"
-msgstr ""
diff --git a/opmlexport/opmlexport.php b/opmlexport/opmlexport.php
deleted file mode 100644
index fdfacc3e..00000000
--- a/opmlexport/opmlexport.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-/**
- * Name: OPML Export
- * Description: Export user's RSS/Atom contacts as OPML
- * Version: 1.0
- * Author: Fabio Comuni <https://social.gl-como.it/profile/fabrixxm>
- * License: 3-clause BSD license
- */
-
-use Friendica\DI;
-use Friendica\App;
-use Friendica\Core\Hook;
-use Friendica\Core\Logger;
-use Friendica\Network\HTTPException;
-use Friendica\Database\DBA;
-use Friendica\Core\Renderer;
-use Friendica\Core\Protocol;
-use Friendica\Model\Contact;
-use Friendica\Model\User;
-
-function opmlexport_install()
-{
-	Hook::register('addon_settings',        __FILE__, 'opmlexport_addon_settings');
-	Hook::register('addon_settings_post',   __FILE__, 'opmlexport_addon_settings_post');
-	Logger::notice('installed opmlexport Addon');
-}
-
-
-function opmlexport()
-{
-	$condition = [
-		'uid' => DI::userSession()->getLocalUserId(),
-		'self' => false,
-		'deleted' => false,
-		'archive' => false,
-		'blocked' => false,
-		'pending' => false,
-		'network' => Protocol::FEED
-	];
-	$data = Contact::selectToArray([], $condition, ['order' => ['name']]);
-	$user = User::getById(DI::userSession()->getLocalUserId());
-
-	$xml = new \DOMDocument( '1.0', 'utf-8' );
-	$opml = $xml->createElement('opml');
-	$head = $xml->createElement('head');
-	$body = $xml->createElement('body');
-	$outline = $xml->createElement('outline');
-	$outline->setAttribute('title', $user['username'] . '\'s RSS/Atom contacts');
-	$outline->setAttribute('text', $user['username'] . '\'s RSS/Atom contacts');
-
-	foreach($data as $c) {
-		$entry = $xml->createElement('outline');
-		$entry->setAttribute('title',  $c['name']);
-		$entry->setAttribute('text',   $c['name']);
-		$entry->setAttribute('xmlUrl', $c['url']);
-		$outline->appendChild($entry);
-	}
-
-	$body->appendChild($outline);
-	$opml->appendChild($head);
-	$opml->appendChild($body);
-	$xml->appendChild($opml);
-	header('Content-Type: text/x-opml');
-	header('Content-Disposition: attachment; filename=feeds.opml');
-	$xml->formatOutput = true;
-	echo $xml->saveXML();
-	die();
-}
-
-
-function opmlexport_addon_settings(array &$data)
-{
-	if (!DI::userSession()->getLocalUserId()) {
-		return;
-	}
-
-	$data = [
-		'addon'  => 'opmlexport',
-		'title'  => DI::l10n()->t('OPML Export'),
-		'submit' => DI::l10n()->t('Export RSS/Atom contacts'),
-	];
-}
-
-
-function opmlexport_addon_settings_post(array &$b)
-{
-	if (!DI::userSession()->getLocalUserId() || empty($_POST['opmlexport-submit'])) {
-		return;
-	}
-
-	opmlexport();
-}
diff --git a/pageheader/lang/C/messages.po b/pageheader/lang/C/messages.po
index 2965e53d..f8958d2f 100644
--- a/pageheader/lang/C/messages.po
+++ b/pageheader/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
+"POT-Creation-Date: 2018-03-11 18:52+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,20 +17,24 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: pageheader.php:36
+#: pageheader.php:53
 msgid "\"pageheader\" Settings"
 msgstr ""
 
-#: pageheader.php:37
+#: pageheader.php:54
 msgid "Message"
 msgstr ""
 
-#: pageheader.php:37
+#: pageheader.php:54
 msgid ""
 "Message to display on every page on this server (or put a pageheader.html "
 "file in your docroot)"
 msgstr ""
 
-#: pageheader.php:38
+#: pageheader.php:55
 msgid "Save Settings"
 msgstr ""
+
+#: pageheader.php:69
+msgid "pageheader Settings saved."
+msgstr ""
diff --git a/pageheader/lang/ar/messages.po b/pageheader/lang/ar/messages.po
deleted file mode 100644
index 56000234..00000000
--- a/pageheader/lang/ar/messages.po
+++ /dev/null
@@ -1,38 +0,0 @@
-# ADDON pageheader
-# Copyright (C)
-# This file is distributed under the same license as the Friendica pageheader addon package.
-# 
-# 
-# Translators:
-# Farida Khalaf <faridakhalaf@hotmail.com>, 2021
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2021-02-22 02:43+0000\n"
-"Last-Translator: Farida Khalaf <faridakhalaf@hotmail.com>\n"
-"Language-Team: Arabic (http://www.transifex.com/Friendica/friendica/language/ar/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ar\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-
-#: pageheader.php:36
-msgid "\"pageheader\" Settings"
-msgstr "إعدادات رأس الصفحة"
-
-#: pageheader.php:37
-msgid "Message"
-msgstr "رسالة"
-
-#: pageheader.php:37
-msgid ""
-"Message to display on every page on this server (or put a pageheader.html "
-"file in your docroot)"
-msgstr "رسالة ليتم عرضها في كل صفحة على هذا الملقم (أو ضع ملف pageheader.html في docroot)"
-
-#: pageheader.php:38
-msgid "Save Settings"
-msgstr "حفظ الإعدادات"
diff --git a/pageheader/lang/ar/strings.php b/pageheader/lang/ar/strings.php
deleted file mode 100644
index 6e72b169..00000000
--- a/pageheader/lang/ar/strings.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_ar")) {
-function string_plural_select_ar($n){
-	$n = intval($n);
-	if ($n==0) { return 0; } else if ($n==1) { return 1; } else if ($n==2) { return 2; } else if ($n%100>=3 && $n%100<=10) { return 3; } else if ($n%100>=11 && $n%100<=99) { return 4; } else  { return 5; }
-}}
-$a->strings['"pageheader" Settings'] = 'إعدادات رأس الصفحة';
-$a->strings['Message'] = 'رسالة';
-$a->strings['Message to display on every page on this server (or put a pageheader.html file in your docroot)'] = 'رسالة ليتم عرضها في كل صفحة على هذا الملقم (أو ضع ملف pageheader.html في docroot)';
-$a->strings['Save Settings'] = 'حفظ الإعدادات';
diff --git a/pageheader/lang/cs/messages.po b/pageheader/lang/cs/messages.po
index 4caf402e..1621e180 100644
--- a/pageheader/lang/cs/messages.po
+++ b/pageheader/lang/cs/messages.po
@@ -4,37 +4,40 @@
 # 
 # 
 # Translators:
-# Aditoo, 2018
-# Aditoo, 2018
+# Lorem Ipsum <aditoo@seznam.cz>, 2018
 # michal_s <msupler@gmail.com>, 2014-2015
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2014-06-23 11:17+0000\n"
-"Last-Translator: Aditoo, 2018\n"
-"Language-Team: Czech (http://app.transifex.com/Friendica/friendica/language/cs/)\n"
+"POT-Creation-Date: 2018-03-11 18:52+0100\n"
+"PO-Revision-Date: 2018-06-10 09:12+0000\n"
+"Last-Translator: Lorem Ipsum <aditoo@seznam.cz>\n"
+"Language-Team: Czech (http://www.transifex.com/Friendica/friendica/language/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: cs\n"
 "Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
 
-#: pageheader.php:36
+#: pageheader.php:53
 msgid "\"pageheader\" Settings"
 msgstr "Nastavení záhlaví stránky"
 
-#: pageheader.php:37
+#: pageheader.php:54
 msgid "Message"
 msgstr "Zpráva"
 
-#: pageheader.php:37
+#: pageheader.php:54
 msgid ""
 "Message to display on every page on this server (or put a pageheader.html "
 "file in your docroot)"
-msgstr "Zpráva, která má být zobrazena na každé stránce tohoto serveru (nebo vložte do kořenové složky Vašeho serveru soubor pageheader.html)"
+msgstr "Zpráva, která má být zobrazena na každé stránce tohoto serveru (nebo vložte soubor pageheader.html do kořenové složky Vašeho serveru)"
 
-#: pageheader.php:38
+#: pageheader.php:55
 msgid "Save Settings"
 msgstr "Uložit nastavení"
+
+#: pageheader.php:69
+msgid "pageheader Settings saved."
+msgstr "Nastavení záhlaví stránky uloženo."
diff --git a/pageheader/lang/cs/strings.php b/pageheader/lang/cs/strings.php
index 3cb727cc..a32e5ed7 100644
--- a/pageheader/lang/cs/strings.php
+++ b/pageheader/lang/cs/strings.php
@@ -3,9 +3,11 @@
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
 	$n = intval($n);
-	if (($n == 1 && $n % 1 == 0)) { return 0; } else if (($n >= 2 && $n <= 4 && $n % 1 == 0)) { return 1; } else if (($n % 1 != 0 )) { return 2; } else  { return 3; }
+	return ($n == 1 && $n % 1 == 0) ? 0 : ($n >= 2 && $n <= 4 && $n % 1 == 0) ? 1: ($n % 1 != 0 ) ? 2 : 3;;
 }}
-$a->strings['"pageheader" Settings'] = 'Nastavení záhlaví stránky';
-$a->strings['Message'] = 'Zpráva';
-$a->strings['Message to display on every page on this server (or put a pageheader.html file in your docroot)'] = 'Zpráva, která má být zobrazena na každé stránce tohoto serveru (nebo vložte do kořenové složky Vašeho serveru soubor pageheader.html)';
-$a->strings['Save Settings'] = 'Uložit nastavení';
+;
+$a->strings["\"pageheader\" Settings"] = "Nastavení záhlaví stránky";
+$a->strings["Message"] = "Zpráva";
+$a->strings["Message to display on every page on this server (or put a pageheader.html file in your docroot)"] = "Zpráva, která má být zobrazena na každé stránce tohoto serveru (nebo vložte soubor pageheader.html do kořenové složky Vašeho serveru)";
+$a->strings["Save Settings"] = "Uložit nastavení";
+$a->strings["pageheader Settings saved."] = "Nastavení záhlaví stránky uloženo.";
diff --git a/pageheader/lang/da-dk/messages.po b/pageheader/lang/da-dk/messages.po
deleted file mode 100644
index 738ec669..00000000
--- a/pageheader/lang/da-dk/messages.po
+++ /dev/null
@@ -1,38 +0,0 @@
-# ADDON pageheader
-# Copyright (C)
-# This file is distributed under the same license as the Friendica pageheader addon package.
-# 
-# 
-# Translators:
-# Anton <dev@atjn.dk>, 2022
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2014-06-23 11:17+0000\n"
-"Last-Translator: Anton <dev@atjn.dk>, 2022\n"
-"Language-Team: Danish (Denmark) (http://www.transifex.com/Friendica/friendica/language/da_DK/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: da_DK\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: pageheader.php:36
-msgid "\"pageheader\" Settings"
-msgstr "\"sidehoved\" Indstillinger"
-
-#: pageheader.php:37
-msgid "Message"
-msgstr "Besked"
-
-#: pageheader.php:37
-msgid ""
-"Message to display on every page on this server (or put a pageheader.html "
-"file in your docroot)"
-msgstr "Besked at vise på hver side på denne server (eller put en pageheader.html fil i din docroot)"
-
-#: pageheader.php:38
-msgid "Save Settings"
-msgstr "Gem indstillinger"
diff --git a/pageheader/lang/da-dk/strings.php b/pageheader/lang/da-dk/strings.php
deleted file mode 100644
index 6f736758..00000000
--- a/pageheader/lang/da-dk/strings.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_da_dk")) {
-function string_plural_select_da_dk($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['"pageheader" Settings'] = '"sidehoved" Indstillinger';
-$a->strings['Message'] = 'Besked';
-$a->strings['Message to display on every page on this server (or put a pageheader.html file in your docroot)'] = 'Besked at vise på hver side på denne server (eller put en pageheader.html fil i din docroot)';
-$a->strings['Save Settings'] = 'Gem indstillinger';
diff --git a/pageheader/lang/de/messages.po b/pageheader/lang/de/messages.po
index 73ce2bbd..c8848b72 100644
--- a/pageheader/lang/de/messages.po
+++ b/pageheader/lang/de/messages.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2021-02-01 20:21+0000\n"
-"Last-Translator: Transifex Bot <>\n"
+"POT-Creation-Date: 2018-03-11 18:52+0100\n"
+"PO-Revision-Date: 2018-03-16 07:42+0000\n"
+"Last-Translator: Tobias Diekershoff <tobias.diekershoff@gmx.net>\n"
 "Language-Team: German (http://www.transifex.com/Friendica/friendica/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,20 +21,24 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: pageheader.php:36
+#: pageheader.php:53
 msgid "\"pageheader\" Settings"
 msgstr "\"pageheader\"-Einstellungen"
 
-#: pageheader.php:37
+#: pageheader.php:54
 msgid "Message"
 msgstr "Mitteilung"
 
-#: pageheader.php:37
+#: pageheader.php:54
 msgid ""
 "Message to display on every page on this server (or put a pageheader.html "
 "file in your docroot)"
 msgstr "Die Mitteilung, die auf jeder Seite dieses Knotens angezeigt werden soll (alternativ kann die Datei pageheader.html im Stammverzeichnis der Friendica Installation angelegt werden)."
 
-#: pageheader.php:38
+#: pageheader.php:55
 msgid "Save Settings"
 msgstr "Einstellungen speichern"
+
+#: pageheader.php:69
+msgid "pageheader Settings saved."
+msgstr "pageheader-Einstellungen gespeichert."
diff --git a/pageheader/lang/de/strings.php b/pageheader/lang/de/strings.php
index fa8ea07b..c0bfeee4 100644
--- a/pageheader/lang/de/strings.php
+++ b/pageheader/lang/de/strings.php
@@ -2,10 +2,11 @@
 
 if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['"pageheader" Settings'] = '"pageheader"-Einstellungen';
-$a->strings['Message'] = 'Mitteilung';
-$a->strings['Message to display on every page on this server (or put a pageheader.html file in your docroot)'] = 'Die Mitteilung, die auf jeder Seite dieses Knotens angezeigt werden soll (alternativ kann die Datei pageheader.html im Stammverzeichnis der Friendica Installation angelegt werden).';
-$a->strings['Save Settings'] = 'Einstellungen speichern';
+;
+$a->strings["\"pageheader\" Settings"] = "\"pageheader\"-Einstellungen";
+$a->strings["Message"] = "Mitteilung";
+$a->strings["Message to display on every page on this server (or put a pageheader.html file in your docroot)"] = "Die Mitteilung, die auf jeder Seite dieses Knotens angezeigt werden soll (alternativ kann die Datei pageheader.html im Stammverzeichnis der Friendica Installation angelegt werden).";
+$a->strings["Save Settings"] = "Einstellungen speichern";
+$a->strings["pageheader Settings saved."] = "pageheader-Einstellungen gespeichert.";
diff --git a/pageheader/lang/en-gb/strings.php b/pageheader/lang/en-gb/strings.php
index 85714106..d81a110f 100644
--- a/pageheader/lang/en-gb/strings.php
+++ b/pageheader/lang/en-gb/strings.php
@@ -2,11 +2,11 @@
 
 if(! function_exists("string_plural_select_en_gb")) {
 function string_plural_select_en_gb($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['"pageheader" Settings'] = 'Pageheader settings';
-$a->strings['Message'] = 'Message';
-$a->strings['Message to display on every page on this server (or put a pageheader.html file in your docroot)'] = 'Message to display above every page on this server (alternatively, put a pageheader.html file in your docroot)';
-$a->strings['Save Settings'] = 'Save settings';
-$a->strings['pageheader Settings saved.'] = 'Pageheader settings saved.';
+;
+$a->strings["\"pageheader\" Settings"] = "Pageheader settings";
+$a->strings["Message"] = "Message";
+$a->strings["Message to display on every page on this server (or put a pageheader.html file in your docroot)"] = "Message to display above every page on this server (alternatively, put a pageheader.html file in your docroot)";
+$a->strings["Save Settings"] = "Save settings";
+$a->strings["pageheader Settings saved."] = "Pageheader settings saved.";
diff --git a/pageheader/lang/es/messages.po b/pageheader/lang/es/messages.po
index 4ee04873..baf5c742 100644
--- a/pageheader/lang/es/messages.po
+++ b/pageheader/lang/es/messages.po
@@ -5,14 +5,13 @@
 # 
 # Translators:
 # Albert, 2016
-# Senex Petrovic <javierruizo@hotmail.com>, 2021
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2021-04-06 01:57+0000\n"
-"Last-Translator: Senex Petrovic <javierruizo@hotmail.com>\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2016-11-17 22:09+0000\n"
+"Last-Translator: Albert\n"
 "Language-Team: Spanish (http://www.transifex.com/Friendica/friendica/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,20 +19,14 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: pageheader.php:36
+#: pageheader.php:50
 msgid "\"pageheader\" Settings"
 msgstr "Ajustes de \"pageheader\""
 
-#: pageheader.php:37
-msgid "Message"
-msgstr "Mensaje"
+#: pageheader.php:55
+msgid "Submit"
+msgstr "Enviar"
 
-#: pageheader.php:37
-msgid ""
-"Message to display on every page on this server (or put a pageheader.html "
-"file in your docroot)"
-msgstr "Mensaje para mostrar en todas las páginas de este servidor (o poner un archivo pageheader.html en su docroot)"
-
-#: pageheader.php:38
-msgid "Save Settings"
-msgstr "Guardar ajustes"
+#: pageheader.php:68
+msgid "pageheader Settings saved."
+msgstr "Ajustes de pageheader actualizados."
diff --git a/pageheader/lang/es/strings.php b/pageheader/lang/es/strings.php
index e3a5e3d6..254c0f6a 100644
--- a/pageheader/lang/es/strings.php
+++ b/pageheader/lang/es/strings.php
@@ -2,10 +2,9 @@
 
 if(! function_exists("string_plural_select_es")) {
 function string_plural_select_es($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['"pageheader" Settings'] = 'Ajustes de "pageheader"';
-$a->strings['Message'] = 'Mensaje';
-$a->strings['Message to display on every page on this server (or put a pageheader.html file in your docroot)'] = 'Mensaje para mostrar en todas las páginas de este servidor (o poner un archivo pageheader.html en su docroot)';
-$a->strings['Save Settings'] = 'Guardar ajustes';
+;
+$a->strings["\"pageheader\" Settings"] = "Ajustes de \"pageheader\"";
+$a->strings["Submit"] = "Enviar";
+$a->strings["pageheader Settings saved."] = "Ajustes de pageheader actualizados.";
diff --git a/pageheader/lang/fi-fi/strings.php b/pageheader/lang/fi-fi/strings.php
index 52a4b7b4..cef521e2 100644
--- a/pageheader/lang/fi-fi/strings.php
+++ b/pageheader/lang/fi-fi/strings.php
@@ -2,10 +2,11 @@
 
 if(! function_exists("string_plural_select_fi_fi")) {
 function string_plural_select_fi_fi($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['"pageheader" Settings'] = '"pageheader" -asetukset';
-$a->strings['Message'] = 'Viesti';
-$a->strings['Save Settings'] = 'Tallenna asetukset';
-$a->strings['pageheader Settings saved.'] = 'pageheader -asetukset tallennettu.';
+;
+$a->strings["\"pageheader\" Settings"] = "\"pageheader\" -asetukset";
+$a->strings["Message"] = "Viesti";
+$a->strings["Message to display on every page on this server (or put a pageheader.html file in your docroot)"] = "";
+$a->strings["Save Settings"] = "Tallenna asetukset";
+$a->strings["pageheader Settings saved."] = "pageheader -asetukset tallennettu.";
diff --git a/pageheader/lang/fr/messages.po b/pageheader/lang/fr/messages.po
index d63cef8e..dc89362f 100644
--- a/pageheader/lang/fr/messages.po
+++ b/pageheader/lang/fr/messages.po
@@ -10,30 +10,34 @@ msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2014-06-23 11:17+0000\n"
-"Last-Translator: Vincent Vindarel <vindarel@mailz.org>, 2018\n"
+"POT-Creation-Date: 2018-03-11 18:52+0100\n"
+"PO-Revision-Date: 2018-05-14 09:54+0000\n"
+"Last-Translator: Vincent Vindarel <vindarel@mailz.org>\n"
 "Language-Team: French (http://www.transifex.com/Friendica/friendica/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fr\n"
-"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: pageheader.php:36
+#: pageheader.php:53
 msgid "\"pageheader\" Settings"
 msgstr "Paramètres de la page d'en-tête"
 
-#: pageheader.php:37
+#: pageheader.php:54
 msgid "Message"
 msgstr "Message"
 
-#: pageheader.php:37
+#: pageheader.php:54
 msgid ""
 "Message to display on every page on this server (or put a pageheader.html "
 "file in your docroot)"
 msgstr "Message à publier sur toutes les pages de ce serveur (ou bien mettez un fichier pageheader.html dans votre docroot)"
 
-#: pageheader.php:38
+#: pageheader.php:55
 msgid "Save Settings"
 msgstr "Sauvegarder les paramètres"
+
+#: pageheader.php:69
+msgid "pageheader Settings saved."
+msgstr "Paramètres sauvegardés"
diff --git a/pageheader/lang/fr/strings.php b/pageheader/lang/fr/strings.php
index 6326b6f3..01d90072 100644
--- a/pageheader/lang/fr/strings.php
+++ b/pageheader/lang/fr/strings.php
@@ -3,9 +3,11 @@
 if(! function_exists("string_plural_select_fr")) {
 function string_plural_select_fr($n){
 	$n = intval($n);
-	if (($n == 0 || $n == 1)) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
+	return ($n > 1);;
 }}
-$a->strings['"pageheader" Settings'] = 'Paramètres de la page d\'en-tête';
-$a->strings['Message'] = 'Message';
-$a->strings['Message to display on every page on this server (or put a pageheader.html file in your docroot)'] = 'Message à publier sur toutes les pages de ce serveur (ou bien mettez un fichier pageheader.html dans votre docroot)';
-$a->strings['Save Settings'] = 'Sauvegarder les paramètres';
+;
+$a->strings["\"pageheader\" Settings"] = "Paramètres de la page d'en-tête";
+$a->strings["Message"] = "Message";
+$a->strings["Message to display on every page on this server (or put a pageheader.html file in your docroot)"] = "Message à publier sur toutes les pages de ce serveur (ou bien mettez un fichier pageheader.html dans votre docroot)";
+$a->strings["Save Settings"] = "Sauvegarder les paramètres";
+$a->strings["pageheader Settings saved."] = "Paramètres sauvegardés";
diff --git a/pageheader/lang/hu/messages.po b/pageheader/lang/hu/messages.po
deleted file mode 100644
index 261895cc..00000000
--- a/pageheader/lang/hu/messages.po
+++ /dev/null
@@ -1,38 +0,0 @@
-# ADDON pageheader
-# Copyright (C)
-# This file is distributed under the same license as the Friendica pageheader addon package.
-# 
-# 
-# Translators:
-# Balázs Úr, 2020-2021
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2014-06-23 11:17+0000\n"
-"Last-Translator: Balázs Úr, 2020-2021\n"
-"Language-Team: Hungarian (http://www.transifex.com/Friendica/friendica/language/hu/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: hu\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: pageheader.php:36
-msgid "\"pageheader\" Settings"
-msgstr "Oldalfejléc beállításai"
-
-#: pageheader.php:37
-msgid "Message"
-msgstr "Üzenet"
-
-#: pageheader.php:37
-msgid ""
-"Message to display on every page on this server (or put a pageheader.html "
-"file in your docroot)"
-msgstr "A kiszolgálón lévő összes oldalon megjelenítendő üzenet (vagy tegyen egy pageheader.html fájlt a dokumentumgyökérbe)"
-
-#: pageheader.php:38
-msgid "Save Settings"
-msgstr "Beállítások mentése"
diff --git a/pageheader/lang/hu/strings.php b/pageheader/lang/hu/strings.php
deleted file mode 100644
index 5acfc66f..00000000
--- a/pageheader/lang/hu/strings.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_hu")) {
-function string_plural_select_hu($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['"pageheader" Settings'] = 'Oldalfejléc beállításai';
-$a->strings['Message'] = 'Üzenet';
-$a->strings['Message to display on every page on this server (or put a pageheader.html file in your docroot)'] = 'A kiszolgálón lévő összes oldalon megjelenítendő üzenet (vagy tegyen egy pageheader.html fájlt a dokumentumgyökérbe)';
-$a->strings['Save Settings'] = 'Beállítások mentése';
diff --git a/pageheader/lang/it/messages.po b/pageheader/lang/it/messages.po
index 2da356d0..f3ac805c 100644
--- a/pageheader/lang/it/messages.po
+++ b/pageheader/lang/it/messages.po
@@ -9,30 +9,34 @@ msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2014-06-23 11:17+0000\n"
-"Last-Translator: fabrixxm <fabrix.xm@gmail.com>, 2014-2015,2018\n"
-"Language-Team: Italian (http://app.transifex.com/Friendica/friendica/language/it/)\n"
+"POT-Creation-Date: 2018-03-11 18:52+0100\n"
+"PO-Revision-Date: 2018-03-19 13:19+0000\n"
+"Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n"
+"Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: it\n"
-"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: pageheader.php:36
+#: pageheader.php:53
 msgid "\"pageheader\" Settings"
 msgstr "Impostazioni \"Intestazione pagina\""
 
-#: pageheader.php:37
+#: pageheader.php:54
 msgid "Message"
 msgstr "Messaggio"
 
-#: pageheader.php:37
+#: pageheader.php:54
 msgid ""
 "Message to display on every page on this server (or put a pageheader.html "
 "file in your docroot)"
 msgstr "Il messaggio da mostrare su ogni pagina di questo server (puoi anche aggiungere un file pageheader.html nella root)"
 
-#: pageheader.php:38
+#: pageheader.php:55
 msgid "Save Settings"
 msgstr "Salva Impostazioni"
+
+#: pageheader.php:69
+msgid "pageheader Settings saved."
+msgstr "Impostazioni \"Intestazione pagina\" salvate."
diff --git a/pageheader/lang/it/strings.php b/pageheader/lang/it/strings.php
index deed2ed9..e81ef80d 100644
--- a/pageheader/lang/it/strings.php
+++ b/pageheader/lang/it/strings.php
@@ -2,10 +2,11 @@
 
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
-	$n = intval($n);
-	if ($n == 1) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
+	return ($n != 1);;
 }}
-$a->strings['"pageheader" Settings'] = 'Impostazioni "Intestazione pagina"';
-$a->strings['Message'] = 'Messaggio';
-$a->strings['Message to display on every page on this server (or put a pageheader.html file in your docroot)'] = 'Il messaggio da mostrare su ogni pagina di questo server (puoi anche aggiungere un file pageheader.html nella root)';
-$a->strings['Save Settings'] = 'Salva Impostazioni';
+;
+$a->strings["\"pageheader\" Settings"] = "Impostazioni \"Intestazione pagina\"";
+$a->strings["Message"] = "Messaggio";
+$a->strings["Message to display on every page on this server (or put a pageheader.html file in your docroot)"] = "Il messaggio da mostrare su ogni pagina di questo server (puoi anche aggiungere un file pageheader.html nella root)";
+$a->strings["Save Settings"] = "Salva Impostazioni";
+$a->strings["pageheader Settings saved."] = "Impostazioni \"Intestazione pagina\" salvate.";
diff --git a/pageheader/lang/nl/strings.php b/pageheader/lang/nl/strings.php
index 5785832c..3d6e2df7 100644
--- a/pageheader/lang/nl/strings.php
+++ b/pageheader/lang/nl/strings.php
@@ -3,8 +3,11 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['"pageheader" Settings'] = '"pageheader" instellingen';
-$a->strings['Save Settings'] = 'Instellingen opslaan';
-$a->strings['pageheader Settings saved.'] = 'Pageheader instellingen opgeslagen.';
+;
+$a->strings["\"pageheader\" Settings"] = "\"pageheader\" instellingen";
+$a->strings["Message"] = "";
+$a->strings["Message to display on every page on this server (or put a pageheader.html file in your docroot)"] = "";
+$a->strings["Save Settings"] = "Instellingen opslaan";
+$a->strings["pageheader Settings saved."] = "Pageheader instellingen opgeslagen.";
diff --git a/pageheader/lang/pl/messages.po b/pageheader/lang/pl/messages.po
index fb174ac6..d0b2d9a4 100644
--- a/pageheader/lang/pl/messages.po
+++ b/pageheader/lang/pl/messages.po
@@ -4,14 +4,14 @@
 # 
 # 
 # Translators:
-# Waldemar Stoczkowski, 2018
+# Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2014-06-23 11:17+0000\n"
-"Last-Translator: Waldemar Stoczkowski, 2018\n"
+"POT-Creation-Date: 2018-03-11 18:52+0100\n"
+"PO-Revision-Date: 2018-04-10 16:56+0000\n"
+"Last-Translator: Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.com/Friendica/friendica/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,20 +19,24 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
-#: pageheader.php:36
+#: pageheader.php:53
 msgid "\"pageheader\" Settings"
 msgstr "Ustawienia \"nagłówek strony\""
 
-#: pageheader.php:37
+#: pageheader.php:54
 msgid "Message"
 msgstr "Wiadomość"
 
-#: pageheader.php:37
+#: pageheader.php:54
 msgid ""
 "Message to display on every page on this server (or put a pageheader.html "
 "file in your docroot)"
 msgstr "Komunikat wyświetlany na każdej stronie, na tym serwerze (lub umieść plik pageheader.html w swoim dokumencie roboczym)"
 
-#: pageheader.php:38
+#: pageheader.php:55
 msgid "Save Settings"
 msgstr "Zapisz ustawienia"
+
+#: pageheader.php:69
+msgid "pageheader Settings saved."
+msgstr "nagłówek strony Ustawienia zapisane."
diff --git a/pageheader/lang/pl/strings.php b/pageheader/lang/pl/strings.php
index edeb0a85..db2737b2 100644
--- a/pageheader/lang/pl/strings.php
+++ b/pageheader/lang/pl/strings.php
@@ -2,10 +2,11 @@
 
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
-	$n = intval($n);
-	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
+	return ($n==1 ? 0 : ($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14) ? 1 : $n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14) ? 2 : 3);;
 }}
-$a->strings['"pageheader" Settings'] = 'Ustawienia "nagłówek strony"';
-$a->strings['Message'] = 'Wiadomość';
-$a->strings['Message to display on every page on this server (or put a pageheader.html file in your docroot)'] = 'Komunikat wyświetlany na każdej stronie, na tym serwerze (lub umieść plik pageheader.html w swoim dokumencie roboczym)';
-$a->strings['Save Settings'] = 'Zapisz ustawienia';
+;
+$a->strings["\"pageheader\" Settings"] = "Ustawienia \"nagłówek strony\"";
+$a->strings["Message"] = "Wiadomość";
+$a->strings["Message to display on every page on this server (or put a pageheader.html file in your docroot)"] = "Komunikat wyświetlany na każdej stronie, na tym serwerze (lub umieść plik pageheader.html w swoim dokumencie roboczym)";
+$a->strings["Save Settings"] = "Zapisz ustawienia";
+$a->strings["pageheader Settings saved."] = "nagłówek strony Ustawienia zapisane.";
diff --git a/pageheader/lang/ro/strings.php b/pageheader/lang/ro/strings.php
index 3e4b5abf..cdcce616 100644
--- a/pageheader/lang/ro/strings.php
+++ b/pageheader/lang/ro/strings.php
@@ -2,9 +2,9 @@
 
 if(! function_exists("string_plural_select_ro")) {
 function string_plural_select_ro($n){
-	$n = intval($n);
-	if ($n==1) { return 0; } else if ((($n%100>19)||(($n%100==0)&&($n!=0)))) { return 2; } else  { return 1; }
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
 }}
-$a->strings['"pageheader" Settings'] = 'Configurări "Pageheader"';
-$a->strings['Submit'] = 'Trimite';
-$a->strings['pageheader Settings saved.'] = 'Configurările antetului de pagină au fost salvate.';
+;
+$a->strings["\"pageheader\" Settings"] = "Configurări \"Pageheader\"";
+$a->strings["Submit"] = "Trimite";
+$a->strings["pageheader Settings saved."] = "Configurările antetului de pagină au fost salvate.";
diff --git a/pageheader/lang/ru/messages.po b/pageheader/lang/ru/messages.po
deleted file mode 100644
index f637afa4..00000000
--- a/pageheader/lang/ru/messages.po
+++ /dev/null
@@ -1,42 +0,0 @@
-# ADDON pageheader
-# Copyright (C)
-# This file is distributed under the same license as the Friendica pageheader addon package.
-# 
-# 
-# Translators:
-# Alexander An <ravnina@gmail.com>, 2020
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-03-11 18:52+0100\n"
-"PO-Revision-Date: 2020-09-01 05:29+0000\n"
-"Last-Translator: Alexander An <ravnina@gmail.com>\n"
-"Language-Team: Russian (http://www.transifex.com/Friendica/friendica/language/ru/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ru\n"
-"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
-
-#: pageheader.php:53
-msgid "\"pageheader\" Settings"
-msgstr ""
-
-#: pageheader.php:54
-msgid "Message"
-msgstr "Сообщение"
-
-#: pageheader.php:54
-msgid ""
-"Message to display on every page on this server (or put a pageheader.html "
-"file in your docroot)"
-msgstr "Сообщение для отображения на каждой странице этого сервера (или поместите файл pageheader.html в корневую папку веб-сервера)"
-
-#: pageheader.php:55
-msgid "Save Settings"
-msgstr "Сохранить настройки"
-
-#: pageheader.php:69
-msgid "pageheader Settings saved."
-msgstr "pageheader Настройки сохранены."
diff --git a/pageheader/lang/ru/strings.php b/pageheader/lang/ru/strings.php
index 3eb35b14..edf7ea45 100644
--- a/pageheader/lang/ru/strings.php
+++ b/pageheader/lang/ru/strings.php
@@ -1,11 +1,5 @@
-<?php
-
-if(! function_exists("string_plural_select_ru")) {
-function string_plural_select_ru($n){
-	$n = intval($n);
-	if ($n%10==1 && $n%100!=11) { return 0; } else if ($n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14)) { return 1; } else if ($n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)) { return 2; } else  { return 3; }
-}}
-$a->strings['Message'] = 'Сообщение';
-$a->strings['Message to display on every page on this server (or put a pageheader.html file in your docroot)'] = 'Сообщение для отображения на каждой странице этого сервера (или поместите файл pageheader.html в корневую папку веб-сервера)';
-$a->strings['Save Settings'] = 'Сохранить настройки';
-$a->strings['pageheader Settings saved.'] = 'pageheader Настройки сохранены.';
+<?php
+
+$a->strings["\"pageheader\" Settings"] = "";
+$a->strings["Submit"] = "Подтвердить";
+$a->strings["pageheader Settings saved."] = "";
diff --git a/pageheader/lang/sv/messages.po b/pageheader/lang/sv/messages.po
deleted file mode 100644
index 22b437f9..00000000
--- a/pageheader/lang/sv/messages.po
+++ /dev/null
@@ -1,37 +0,0 @@
-# ADDON pageheader
-# Copyright (C)
-# This file is distributed under the same license as the Friendica pageheader addon package.
-# 
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2021-02-01 20:21+0000\n"
-"Last-Translator: Transifex Bot <>\n"
-"Language-Team: Swedish (http://www.transifex.com/Friendica/friendica/language/sv/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: sv\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: pageheader.php:36
-msgid "\"pageheader\" Settings"
-msgstr ""
-
-#: pageheader.php:37
-msgid "Message"
-msgstr ""
-
-#: pageheader.php:37
-msgid ""
-"Message to display on every page on this server (or put a pageheader.html "
-"file in your docroot)"
-msgstr ""
-
-#: pageheader.php:38
-msgid "Save Settings"
-msgstr ""
diff --git a/pageheader/lang/sv/strings.php b/pageheader/lang/sv/strings.php
index 72e9772f..3ec569a7 100644
--- a/pageheader/lang/sv/strings.php
+++ b/pageheader/lang/sv/strings.php
@@ -1,7 +1,3 @@
-<?php
-
-if(! function_exists("string_plural_select_sv")) {
-function string_plural_select_sv($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
+<?php
+
+$a->strings["Submit"] = "Spara";
diff --git a/pageheader/pageheader.css b/pageheader/pageheader.css
index f6c28fbf..8b3282fb 100644
--- a/pageheader/pageheader.css
+++ b/pageheader/pageheader.css
@@ -20,9 +20,4 @@
 	width: 100%;
 	margin-top: 25px;
 	font-size: 20px;
-	/* The pageheader box */
-	padding: 20px;
-	border: 1px solid transparent;
-	border-radius: 2px;
-	margin-bottom: 15px;
 }
diff --git a/pageheader/pageheader.php b/pageheader/pageheader.php
index 057bb863..fd07fc1d 100644
--- a/pageheader/pageheader.php
+++ b/pageheader/pageheader.php
@@ -9,60 +9,65 @@
  */
 
 use Friendica\App;
+use Friendica\Core\Config;
 use Friendica\Core\Hook;
+use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
-use Friendica\DI;
 
 function pageheader_install() {
     Hook::register('page_content_top', __FILE__, 'pageheader_fetch');
 }
 
-function pageheader_addon_admin(string &$s)
+function pageheader_addon_admin(App &$a, &$s)
 {
-	if (!DI::userSession()->isSiteAdmin()) {
+	if(! is_site_admin()) {
 		return;
 	}
 
-	DI::page()->registerStylesheet(__DIR__ . '/pageheader.css');
+    /* Add our stylesheet to the page so we can make our settings look nice */
+	$stylesheetPath = __DIR__ . '/pageheader.css';
+	$a->registerStylesheet($stylesheetPath);
 
-	$words = DI::config()->get('pageheader','text');
+	$words = Config::get('pageheader','text');
 	if(! $words)
 		$words = '';
 
-	$t = Renderer::getMarkupTemplate('admin.tpl', 'addon/pageheader');
+	$t = Renderer::getMarkupTemplate('admin.tpl', __DIR__);
 	$s .= Renderer::replaceMacros($t, [
-		'$title' => DI::l10n()->t('"pageheader" Settings'),
-		'$phwords' => ['pageheader-words', DI::l10n()->t('Message'), $words, DI::l10n()->t('Message to display on every page on this server (or put a pageheader.html file in your docroot)')],
-		'$submit' => DI::l10n()->t('Save Settings')
+		'$title' => L10n::t('"pageheader" Settings'),
+		'$phwords' => ['pageheader-words', L10n::t('Message'), $words, L10n::t('Message to display on every page on this server (or put a pageheader.html file in your docroot)')],
+		'$submit' => L10n::t('Save Settings')
 	]);
 
 	return;
 }
 
-function pageheader_addon_admin_post()
+function pageheader_addon_admin_post(App $a)
 {
-	if (!DI::userSession()->isSiteAdmin()) {
+	if(!is_site_admin()) {
 		return;
 	}
 
 	if(!empty($_POST['pageheader-submit'])) {
 		if (isset($_POST['pageheader-words'])) {
-			DI::config()->set('pageheader', 'text', trim(strip_tags($_POST['pageheader-words'])));
+			Config::set('pageheader', 'text', trim(strip_tags($_POST['pageheader-words'])));
 		}
+		info(L10n::t('pageheader Settings saved.'));
 	}
 }
 
-function pageheader_fetch(string &$b)
+function pageheader_fetch(App $a, &$b)
 {
-	if (file_exists('pageheader.html')) {
+	if(file_exists('pageheader.html')){
 		$s = file_get_contents('pageheader.html');
 	} else {
-		$s = DI::config()->get('pageheader', 'text');
+		$s = Config::get('pageheader', 'text');
 	}
 
-	DI::page()->registerStylesheet(__DIR__ .'/pageheader.css');
-
-	if ($s) {
-		$b .= '<div class="pageheader">' . $s . '</div>';
-	}
+	$stylesheetPath = __DIR__ .'/pageheader.css';
+	$a->registerStylesheet($stylesheetPath);
+    
+    if ($s) {
+        $b .= '<div class="pageheader">' . $s . '</div>';
+    }
 }
diff --git a/phpmailer/README.md b/phpmailer/README.md
index 23ce75c0..c51405f4 100644
--- a/phpmailer/README.md
+++ b/phpmailer/README.md
@@ -8,7 +8,45 @@ This addon replaces the default `mail()` function by the `PHPMailer` library, al
 Configuration
 -------------
 
-The configuration options for this module are described in the `config/phpmailer.config.php` file.
+You can override the default value of the following config keys in your base Friendica install `config/addon.config.php` file:
+
+	'phpmailer' => [
+        // smtp (Boolean)
+        // Enables SMTP relaying for outbound emails
+        'smtp' => false,
+
+        // smtp_server (String)
+        // SMTP server host name
+        'smtp_server' => 'smtp.example.com',
+
+        // smtp_port (Integer)
+        // SMTP server port number
+        'smtp_port' => 25,
+
+        // smtp_secure (String)
+        // What kind of encryption to use on the SMTP connection.
+        // Options: '', 'ssl' or 'tls'.
+        'smtp_secure' => '',
+
+        // smtp_port_s (Integer)
+        // Secure SMTP server port number
+        'smtp_port_s' => 465,
+
+        // smtp_username (String)
+        // SMTP server authentication user name
+        // Empty string disables authentication
+        'smtp_username' => '',
+
+        // smtp_password (String)
+        // SMTP server authentication password
+        // Empty string disables authentication
+        'smtp_password' => '',
+
+        // smtp_from (String)
+        // From address used when using the SMTP server
+        // Example: no-reply@example.com
+        'smtp_from' => '',
+    ],
 
 License
 =======
diff --git a/phpmailer/composer.json b/phpmailer/composer.json
deleted file mode 100644
index 84d18543..00000000
--- a/phpmailer/composer.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    "name": "friendica-addons/phpmailer",
-    "description": "Replaces the default `mail()` function by the `PHPMailer` library",
-    "type": "friendica-addon",
-    "authors": [
-        {
-            "name": "Marcus Mueller",
-            "role": "Developer"
-        }
-    ],
-    "require": {
-        "php": ">=7.0",
-        "phpmailer/phpmailer": "^6.1"
-    },
-    "license": "3-clause BSD license",
-    "minimum-stability": "stable",
-    "config": {
-        "optimize-autoloader": true,
-        "autoloader-suffix": "PhpMailerAddon",
-        "preferred-install": "dist"
-    }
-}
diff --git a/phpmailer/composer.lock b/phpmailer/composer.lock
deleted file mode 100644
index b2144482..00000000
--- a/phpmailer/composer.lock
+++ /dev/null
@@ -1,98 +0,0 @@
-{
-    "_readme": [
-        "This file locks the dependencies of your project to a known state",
-        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
-        "This file is @generated automatically"
-    ],
-    "content-hash": "e156d817a0131f48464d430ed74d355d",
-    "packages": [
-        {
-            "name": "phpmailer/phpmailer",
-            "version": "v6.9.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/PHPMailer/PHPMailer.git",
-                "reference": "039de174cd9c17a8389754d3b877a2ed22743e18"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/039de174cd9c17a8389754d3b877a2ed22743e18",
-                "reference": "039de174cd9c17a8389754d3b877a2ed22743e18",
-                "shasum": ""
-            },
-            "require": {
-                "ext-ctype": "*",
-                "ext-filter": "*",
-                "ext-hash": "*",
-                "php": ">=5.5.0"
-            },
-            "require-dev": {
-                "dealerdirect/phpcodesniffer-composer-installer": "^1.0",
-                "doctrine/annotations": "^1.2.6 || ^1.13.3",
-                "php-parallel-lint/php-console-highlighter": "^1.0.0",
-                "php-parallel-lint/php-parallel-lint": "^1.3.2",
-                "phpcompatibility/php-compatibility": "^9.3.5",
-                "roave/security-advisories": "dev-latest",
-                "squizlabs/php_codesniffer": "^3.7.2",
-                "yoast/phpunit-polyfills": "^1.0.4"
-            },
-            "suggest": {
-                "decomplexity/SendOauth2": "Adapter for using XOAUTH2 authentication",
-                "ext-mbstring": "Needed to send email in multibyte encoding charset or decode encoded addresses",
-                "ext-openssl": "Needed for secure SMTP sending and DKIM signing",
-                "greew/oauth2-azure-provider": "Needed for Microsoft Azure XOAUTH2 authentication",
-                "hayageek/oauth2-yahoo": "Needed for Yahoo XOAUTH2 authentication",
-                "league/oauth2-google": "Needed for Google XOAUTH2 authentication",
-                "psr/log": "For optional PSR-3 debug logging",
-                "symfony/polyfill-mbstring": "To support UTF-8 if the Mbstring PHP extension is not enabled (^1.2)",
-                "thenetworg/oauth2-azure": "Needed for Microsoft XOAUTH2 authentication"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "PHPMailer\\PHPMailer\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "LGPL-2.1-only"
-            ],
-            "authors": [
-                {
-                    "name": "Marcus Bointon",
-                    "email": "phpmailer@synchromedia.co.uk"
-                },
-                {
-                    "name": "Jim Jagielski",
-                    "email": "jimjag@gmail.com"
-                },
-                {
-                    "name": "Andy Prevost",
-                    "email": "codeworxtech@users.sourceforge.net"
-                },
-                {
-                    "name": "Brent R. Matzelle"
-                }
-            ],
-            "description": "PHPMailer is a full-featured email creation and transfer class for PHP",
-            "funding": [
-                {
-                    "url": "https://github.com/Synchro",
-                    "type": "github"
-                }
-            ],
-            "time": "2023-11-25T22:23:28+00:00"
-        }
-    ],
-    "packages-dev": [],
-    "aliases": [],
-    "minimum-stability": "stable",
-    "stability-flags": [],
-    "prefer-stable": false,
-    "prefer-lowest": false,
-    "platform": {
-        "php": ">=7.0"
-    },
-    "platform-dev": [],
-    "plugin-api-version": "1.1.0"
-}
diff --git a/phpmailer/config/phpmailer.config.php b/phpmailer/config/phpmailer.config.php
index 4b084da7..b2916471 100644
--- a/phpmailer/config/phpmailer.config.php
+++ b/phpmailer/config/phpmailer.config.php
@@ -1,7 +1,7 @@
 <?php
 
 // Warning: Don't change this file! It only holds the default config values for this addon.
-// Instead, copy this file to config/phpmailer.config.php in your Friendica directory and set the correct values there
+// Instead overwrite these config values in config/addon.config.php in your Friendica directory
 
 return [
 	'phpmailer' => [
diff --git a/phpmailer/phpmailer.php b/phpmailer/phpmailer.php
index 4c12709d..a5ab2558 100644
--- a/phpmailer/phpmailer.php
+++ b/phpmailer/phpmailer.php
@@ -8,102 +8,97 @@
  */
 
 use Friendica\App;
+use Friendica\Core\Config;
 use Friendica\Core\Hook;
-use Friendica\DI;
-use Friendica\Object\EMail\IEmail;
-use Friendica\Core\Config\Util\ConfigFileManager;
+use Friendica\Util\ConfigFileLoader;
 use PHPMailer\PHPMailer\PHPMailer;
 use PHPMailer\PHPMailer\Exception;
 
-require_once __DIR__ . DIRECTORY_SEPARATOR . 'vendor' . DIRECTORY_SEPARATOR . 'autoload.php';
-
 function phpmailer_install()
 {
 	Hook::register('load_config'         , __FILE__, 'phpmailer_load_config');
-	Hook::register('emailer_send_prepare', __FILE__, 'phpmailer_emailer_send_prepare', 5);
+	Hook::register('emailer_send_prepare', __FILE__, 'phpmailer_emailer_send_prepare');
 }
 
-function phpmailer_load_config(ConfigFileManager $loader)
+function phpmailer_load_config(App $a, ConfigFileLoader $loader)
 {
-	DI::app()->getConfigCache()->load($loader->loadAddonConfig('phpmailer'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
+	$a->getConfigCache()->load($loader->loadAddonConfig('phpmailer'));
 }
 
 /**
- * @param IEmail $email
+ * @param App $a
+ * @param array $b
  */
-function phpmailer_emailer_send_prepare(IEmail &$email)
+function phpmailer_emailer_send_prepare(App $a, array &$b)
 {
-	// Passing `true` enables exceptions
-	$mailer = new PHPMailer(true);
-	try {
-		// Setup encoding.
-		$mailer->CharSet  = 'UTF-8';
-		$mailer->Encoding = 'base64';
+	require_once __DIR__ . '/phpmailer/src/PHPMailer.php';
+	require_once __DIR__ . '/phpmailer/src/SMTP.php';
+	require_once __DIR__ . '/phpmailer/src/Exception.php';
 
-		if (DI::config()->get('phpmailer', 'smtp')) {
+	// Passing `true` enables exceptions
+	$mail = new PHPMailer(true);
+	try {
+		if (Config::get('phpmailer', 'smtp')) {
 			// Set mailer to use SMTP
-			$mailer->isSMTP();
+			$mail->isSMTP();
+
+			// Setup encoding.
+			$mail->CharSet = 'UTF-8';
+			$mail->Encoding = 'base64';
 
 			// Specify main and backup SMTP servers
-			$mailer->Host = DI::config()->get('phpmailer', 'smtp_server');
-			$mailer->Port = DI::config()->get('phpmailer', 'smtp_port');
+			$mail->Host = Config::get('phpmailer', 'smtp_server');
+			$mail->Port = Config::get('phpmailer', 'smtp_port');
 
-			if (DI::config()->get('system', 'smtp_secure') && DI::config()->get('phpmailer', 'smtp_port_s')) {
-				$mailer->SMTPSecure = DI::config()->get('phpmailer', 'smtp_secure');
-				$mailer->Port       = DI::config()->get('phpmailer', 'smtp_port_s');
+			if (Config::get('system', 'smtp_secure') && Config::get('phpmailer', 'smtp_port_s')) {
+				$mail->SMTPSecure = Config::get('phpmailer', 'smtp_secure');
+				$mail->Port = Config::get('phpmailer', 'smtp_port_s');
 			}
 
-			if (DI::config()->get('phpmailer', 'smtp_username') && DI::config()->get('phpmailer', 'smtp_password')) {
-				$mailer->SMTPAuth = true;
-				$mailer->Username = DI::config()->get('phpmailer', 'smtp_username');
-				$mailer->Password = DI::config()->get('phpmailer', 'smtp_password');
+			if (Config::get('phpmailer', 'smtp_username') && Config::get('phpmailer', 'smtp_password')) {
+				$mail->SMTPAuth = true;
+				$mail->Username = Config::get('phpmailer', 'smtp_username');
+				$mail->Password = Config::get('phpmailer', 'smtp_password');
 			}
 
-			if (DI::config()->get('phpmailer', 'smtp_from')) {
-				$mailer->setFrom(DI::config()->get('phpmailer', 'smtp_from'), $email->getFromName());
+			if (Config::get('phpmailer', 'smtp_from')) {
+				$mail->setFrom(Config::get('phpmailer', 'smtp_from'), $b['fromName']);
 			}
 		} else {
-			$mailer->setFrom($email->getFromAddress(), $email->getFromName());
+			$mail->setFrom($b['fromEmail'], $b['fromName']);
 		}
 
 		// subject
-		$mailer->Subject = $email->getSubject();
+		$mail->Subject = $b['messageSubject'];
 
-		if (!empty($email->getToAddress())) {
-			$mailer->addAddress($email->getToAddress());
+		if (!empty($b['toEmail'])) {
+			$mail->addAddress($b['toEmail']);
 		}
 
 		// html version
-		if (!empty($email->getMessage())) {
-			$mailer->isHTML(true);
-			$mailer->Body    = $email->getMessage();
-			$mailer->AltBody = $email->getMessage(true);
+		if (!empty($b['htmlVersion'])) {
+			$mail->isHTML(true);
+			$mail->Body = $b['htmlVersion'];
+			$mail->AltBody = $b['textVersion'];
 		} else {
 			// add text
-			$mailer->Body = $email->getMessage(true);
+			$mail->Body = $b['textVersion'];
 		}
 
-		if (!empty($email->getReplyTo())) {
-			$mailer->addReplyTo($email->getReplyTo(), $email->getFromName());
+		if (!empty($b['replyTo'])) {
+			$mail->addReplyTo($b['replyTo'], $b['fromName']);
 		}
 
 		// additional headers
-		if (!empty($email->getAdditionalMailHeader())) {
-			foreach ($email->getAdditionalMailHeader() as $name => $values) {
-				// Set the "Message-ID" header for PHP-Mailer directly
-				if (strtolower($name) === 'message-id') {
-					// implode all values to one entry, because there's only one value possible
-					$mailer->MessageID = trim(implode("", $values));
-				} else {
-					$mailer->addCustomHeader(trim($name), trim(implode("\n", $values)));
-				}
+		if (!empty($b['additionalMailHeader'])) {
+			foreach (explode("\n", trim($b['additionalMailHeader'])) as $header_line) {
+				list($name, $value) = explode(':', $header_line, 2);
+				$mail->addCustomHeader(trim($name), trim($value));
 			}
 		}
 
-		if ($mailer->send()) {
-			$email = null;
-		}
+		$b['sent'] = $mail->send();
 	} catch (Exception $e) {
-		DI::logger()->error('PHPMailer error', ['email' => $email, 'ErrorInfo' => $mailer->ErrorInfo, 'exception' => $e]);
+		$a->getLogger()->error('PHPMailer error', ['ErrorInfo' => $mail->ErrorInfo, 'code' => $e->getCode(), 'message' => $e->getMessage()]);
 	}
 }
diff --git a/phpmailer/vendor/phpmailer/phpmailer/LICENSE b/phpmailer/phpmailer/LICENSE
similarity index 100%
rename from phpmailer/vendor/phpmailer/phpmailer/LICENSE
rename to phpmailer/phpmailer/LICENSE
diff --git a/phpmailer/phpmailer/README.md b/phpmailer/phpmailer/README.md
new file mode 100644
index 00000000..f4e6658e
--- /dev/null
+++ b/phpmailer/phpmailer/README.md
@@ -0,0 +1,216 @@
+![PHPMailer](https://raw.github.com/PHPMailer/PHPMailer/master/examples/images/phpmailer.png)
+
+# PHPMailer - A full-featured email creation and transfer class for PHP
+
+Build status: [![Build Status](https://travis-ci.org/PHPMailer/PHPMailer.svg)](https://travis-ci.org/PHPMailer/PHPMailer)
+[![Scrutinizer Quality Score](https://scrutinizer-ci.com/g/PHPMailer/PHPMailer/badges/quality-score.png?s=3758e21d279becdf847a557a56a3ed16dfec9d5d)](https://scrutinizer-ci.com/g/PHPMailer/PHPMailer/)
+[![Code Coverage](https://scrutinizer-ci.com/g/PHPMailer/PHPMailer/badges/coverage.png?s=3fe6ca5fe8cd2cdf96285756e42932f7ca256962)](https://scrutinizer-ci.com/g/PHPMailer/PHPMailer/)
+
+[![Latest Stable Version](https://poser.pugx.org/phpmailer/phpmailer/v/stable.svg)](https://packagist.org/packages/phpmailer/phpmailer) [![Total Downloads](https://poser.pugx.org/phpmailer/phpmailer/downloads)](https://packagist.org/packages/phpmailer/phpmailer) [![Latest Unstable Version](https://poser.pugx.org/phpmailer/phpmailer/v/unstable.svg)](https://packagist.org/packages/phpmailer/phpmailer) [![License](https://poser.pugx.org/phpmailer/phpmailer/license.svg)](https://packagist.org/packages/phpmailer/phpmailer)
+
+## Class Features
+- Probably the world's most popular code for sending email from PHP!
+- Used by many open-source projects: WordPress, Drupal, 1CRM, SugarCRM, Yii, Joomla! and many more
+- Integrated SMTP support - send without a local mail server
+- Send emails with multiple To, CC, BCC and Reply-to addresses
+- Multipart/alternative emails for mail clients that do not read HTML email
+- Add attachments, including inline
+- Support for UTF-8 content and 8bit, base64, binary, and quoted-printable encodings
+- SMTP authentication with LOGIN, PLAIN, CRAM-MD5 and XOAUTH2 mechanisms over SSL and SMTP+STARTTLS transports
+- Validates email addresses automatically
+- Protect against header injection attacks
+- Error messages in 47 languages!
+- DKIM and S/MIME signing support
+- Compatible with PHP 5.5 and later
+- Namespaced to prevent name clashes
+- Much more!
+
+## Why you might need it
+Many PHP developers utilize email in their code. The only PHP function that supports this is the `mail()` function. However, it does not provide any assistance for making use of popular features such as HTML-based emails and attachments.
+
+Formatting email correctly is surprisingly difficult. There are myriad overlapping RFCs, requiring tight adherence to horribly complicated formatting and encoding rules - the vast majority of code that you'll find online that uses the `mail()` function directly is just plain wrong!
+*Please* don't be tempted to do it yourself - if you don't use PHPMailer, there are many other excellent libraries that you should look at before rolling your own - try [SwiftMailer](https://swiftmailer.symfony.com/), [Zend/Mail](https://zendframework.github.io/zend-mail/), [eZcomponents](https://github.com/zetacomponents/Mail) etc.
+
+The PHP `mail()` function usually sends via a local mail server, typically fronted by a `sendmail` binary on Linux, BSD and OS X platforms, however, Windows usually doesn't include a local mail server; PHPMailer's integrated SMTP implementation allows email sending on Windows platforms without a local mail server.
+
+## License
+This software is distributed under the [LGPL 2.1](http://www.gnu.org/licenses/lgpl-2.1.html) license. Please read LICENSE for information on the software availability and distribution.
+
+## Installation & loading
+PHPMailer is available on [Packagist](https://packagist.org/packages/phpmailer/phpmailer) (using semantic versioning), and installation via [Composer](https://getcomposer.org) is the recommended way to install PHPMailer. Just add this line to your `composer.json` file:
+
+```json
+"phpmailer/phpmailer": "~6.0"
+```
+
+or run
+
+```sh
+composer require phpmailer/phpmailer
+```
+
+Note that the `vendor` folder and the `vendor/autoload.php` script are generated by Composer; they are not part of PHPMailer.
+
+If you want to use the Gmail XOAUTH2 authentication class, you will also need to add a dependency on the `league/oauth2-client` package in your `composer.json`.
+
+Alternatively, if you're not using Composer, copy the contents of the PHPMailer folder into one of the `include_path` directories specified in your PHP configuration and load each class file manually:
+
+```php
+<?php
+use PHPMailer\PHPMailer\PHPMailer;
+use PHPMailer\PHPMailer\Exception;
+
+require 'path/to/PHPMailer/src/Exception.php';
+require 'path/to/PHPMailer/src/PHPMailer.php';
+require 'path/to/PHPMailer/src/SMTP.php';
+```
+
+If you're not using the `SMTP` class explicitly (you're probably not), you don't need a `use` line for the SMTP class.
+
+If you don't speak git or just want a tarball, click the 'zip' button on the right of the project page in GitHub, though note that docs and examples are not included in the tarball.
+
+## Legacy versions
+PHPMailer 5.2 (which is compatible with PHP 5.0 - 7.0) is no longer being supported for feature updates, and will only be receiving security updates from now on. You will find the latest version of 5.2 in the [5.2-stable branch](https://github.com/PHPMailer/PHPMailer/tree/5.2-stable), and future versions of 5.2 will be tagged with 5.2.x version numbers, so existing Composer configs should remain working. If you're using PHP 5.5 or later, we recommend you make the necessary changes to switch to the 6.0 release.
+
+## Upgrading from 5.2
+The biggest changes are that source files are now in the `src/` folder, and PHPMailer now declares the namespace `PHPMailer\PHPMailer`. This has several important effects – [read the upgrade guide](https://github.com/PHPMailer/PHPMailer/tree/master/UPGRADING.md) for more details.
+
+### Minimal installation
+While installing the entire package manually or with Composer is simple, convenient and reliable, you may want to include only vital files in your project. At the very least you will need [src/PHPMailer.php](https://github.com/PHPMailer/PHPMailer/tree/master/src/PHPMailer.php). If you're using SMTP, you'll need [src/SMTP.php](https://github.com/PHPMailer/PHPMailer/tree/master/src/SMTP.php), and if you're using POP-before SMTP, you'll need [src/POP3.php](https://github.com/PHPMailer/PHPMailer/tree/master/src/POP3.php). You can skip the [language](https://github.com/PHPMailer/PHPMailer/tree/master/language/) folder if you're not showing errors to users and can make do with English-only errors. If you're using XOAUTH2 you will need [src/OAuth.php](https://github.com/PHPMailer/PHPMailer/tree/master/src/OAuth.php) as well as the Composer dependencies for the services you wish to authenticate with. Really, it's much easier to use Composer!
+
+## A Simple Example
+
+```php
+<?php
+// Import PHPMailer classes into the global namespace
+// These must be at the top of your script, not inside a function
+use PHPMailer\PHPMailer\PHPMailer;
+use PHPMailer\PHPMailer\Exception;
+
+//Load Composer's autoloader
+require 'vendor/autoload.php';
+
+$mail = new PHPMailer(true);                              // Passing `true` enables exceptions
+try {
+    //Server settings
+    $mail->SMTPDebug = 2;                                 // Enable verbose debug output
+    $mail->isSMTP();                                      // Set mailer to use SMTP
+    $mail->Host = 'smtp1.example.com;smtp2.example.com';  // Specify main and backup SMTP servers
+    $mail->SMTPAuth = true;                               // Enable SMTP authentication
+    $mail->Username = 'user@example.com';                 // SMTP username
+    $mail->Password = 'secret';                           // SMTP password
+    $mail->SMTPSecure = 'tls';                            // Enable TLS encryption, `ssl` also accepted
+    $mail->Port = 587;                                    // TCP port to connect to
+
+    //Recipients
+    $mail->setFrom('from@example.com', 'Mailer');
+    $mail->addAddress('joe@example.net', 'Joe User');     // Add a recipient
+    $mail->addAddress('ellen@example.com');               // Name is optional
+    $mail->addReplyTo('info@example.com', 'Information');
+    $mail->addCC('cc@example.com');
+    $mail->addBCC('bcc@example.com');
+
+    //Attachments
+    $mail->addAttachment('/var/tmp/file.tar.gz');         // Add attachments
+    $mail->addAttachment('/tmp/image.jpg', 'new.jpg');    // Optional name
+
+    //Content
+    $mail->isHTML(true);                                  // Set email format to HTML
+    $mail->Subject = 'Here is the subject';
+    $mail->Body    = 'This is the HTML message body <b>in bold!</b>';
+    $mail->AltBody = 'This is the body in plain text for non-HTML mail clients';
+
+    $mail->send();
+    echo 'Message has been sent';
+} catch (Exception $e) {
+    echo 'Message could not be sent. Mailer Error: ', $mail->ErrorInfo;
+}
+```
+
+You'll find plenty more to play with in the [examples](https://github.com/PHPMailer/PHPMailer/tree/master/examples) folder.
+
+That's it. You should now be ready to use PHPMailer!
+
+## Localization
+PHPMailer defaults to English, but in the [language](https://github.com/PHPMailer/PHPMailer/tree/master/language/) folder you'll find numerous (47 at the time of writing!) translations for PHPMailer error messages that you may encounter. Their filenames contain [ISO 639-1](http://en.wikipedia.org/wiki/ISO_639-1) language code for the translations, for example `fr` for French. To specify a language, you need to tell PHPMailer which one to use, like this:
+
+```php
+// To load the French version
+$mail->setLanguage('fr', '/optional/path/to/language/directory/');
+```
+
+We welcome corrections and new languages - if you're looking for corrections to do, run the [PHPMailerLangTest.php](https://github.com/PHPMailer/PHPMailer/tree/master/test/PHPMailerLangTest.php) script in the tests folder and it will show any missing translations.
+
+## Documentation
+Start reading at the [GitHub wiki](https://github.com/PHPMailer/PHPMailer/wiki). If you're having trouble, this should be the first place you look as it's the most frequently updated.
+
+Examples of how to use PHPMailer for common scenarios can be found in the [examples](https://github.com/PHPMailer/PHPMailer/tree/master/examples) folder. If you're looking for a good starting point, we recommend you start with [the Gmail example](https://github.com/PHPMailer/PHPMailer/tree/master/examples/gmail.phps).
+
+Note that in order to reduce PHPMailer's deployed code footprint, the examples are no longer included if you load PHPMailer via Composer or via [GitHub's zip file download](https://github.com/PHPMailer/PHPMailer/archive/master.zip), so you'll need to either clone the git repository or use the above links to get to the examples directly.
+
+Complete generated API documentation is [available online](http://phpmailer.github.io/PHPMailer/).
+
+You can generate complete API-level documentation by running `phpdoc` in the top-level folder, and documentation will appear in teh `docs` folder, though you'll need to have [PHPDocumentor](http://www.phpdoc.org) installed. You may find [the unit tests](https://github.com/PHPMailer/PHPMailer/tree/master/test/phpmailerTest.php) a good source of how to do various operations such as encryption.
+
+If the documentation doesn't cover what you need, search the [many questions on Stack Overflow](http://stackoverflow.com/questions/tagged/phpmailer), and before you ask a question about "SMTP Error: Could not connect to SMTP host.", [read the troubleshooting guide](https://github.com/PHPMailer/PHPMailer/wiki/Troubleshooting).
+
+## Tests
+There is a PHPUnit test script in the [test](https://github.com/PHPMailer/PHPMailer/tree/master/test/) folder. PHPMailer uses PHPUnit 4.8 - we would use 5.x but we need to run on PHP 5.5.
+
+Build status: [![Build Status](https://travis-ci.org/PHPMailer/PHPMailer.svg)](https://travis-ci.org/PHPMailer/PHPMailer)
+
+If this isn't passing, is there something you can do to help?
+
+## Security
+Please disclose any vulnerabilities found responsibly - report any security problems found to the maintainers privately.
+
+PHPMailer versions prior to 5.2.22 (released January 9th 2017) have a local file disclosure vulnerability, [CVE-2017-5223](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2017-5223). If content passed into `msgHTML()` is sourced from unfiltered user input, relative paths can map to absolute local file paths and added as attachments. Also note that `addAttachment` (just like `file_get_contents`, `passthru`, `unlink`, etc) should not be passed user-sourced params either! Reported by Yongxiang Li of Asiasecurity.
+
+PHPMailer versions prior to 5.2.20 (released December 28th 2016) are vulnerable to [CVE-2016-10045](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2016-10045) a remote code execution vulnerability, responsibly reported by [Dawid Golunski](https://legalhackers.com/advisories/PHPMailer-Exploit-Remote-Code-Exec-CVE-2016-10045-Vuln-Patch-Bypass.html), and patched by Paul Buonopane (@Zenexer).
+
+PHPMailer versions prior to 5.2.18 (released December 2016) are vulnerable to [CVE-2016-10033](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2016-10033) a critical remote code execution vulnerability, responsibly reported by [Dawid Golunski](http://legalhackers.com/advisories/PHPMailer-Exploit-Remote-Code-Exec-CVE-2016-10033-Vuln.html).
+
+See [SECURITY](https://github.com/PHPMailer/PHPMailer/tree/master/SECURITY.md) for more detail on security issues.
+
+## Contributing
+Please submit bug reports, suggestions and pull requests to the [GitHub issue tracker](https://github.com/PHPMailer/PHPMailer/issues).
+
+We're particularly interested in fixing edge-cases, expanding test coverage and updating translations.
+
+If you found a mistake in the docs, or want to add something, go ahead and amend the wiki - anyone can edit it.
+
+If you have git clones from prior to the move to the PHPMailer GitHub organisation, you'll need to update any remote URLs referencing the old GitHub location with a command like this from within your clone:
+
+```sh
+git remote set-url upstream https://github.com/PHPMailer/PHPMailer.git
+```
+
+Please *don't* use the SourceForge or Google Code projects any more; they are obsolete and no longer maintained.
+
+## Sponsorship
+Development time and resources for PHPMailer are provided by [Smartmessages.net](https://info.smartmessages.net/), a powerful email marketing system.
+
+<a href="https://info.smartmessages.net/"><img src="https://www.smartmessages.net/img/smartmessages-logo.svg" width="250" height="28" alt="Smartmessages email marketing"></a>
+
+Other contributions are gladly received, whether in beer 🍺, T-shirts 👕, Amazon wishlist raids, or cold, hard cash 💰. If you'd like to donate to say "thank you" to maintainers or contributors, please contact them through individual profile pages via [the contributors page](https://github.com/PHPMailer/PHPMailer/graphs/contributors).
+
+## Changelog
+See [changelog](changelog.md).
+
+## History
+- PHPMailer was originally written in 2001 by Brent R. Matzelle as a [SourceForge project](http://sourceforge.net/projects/phpmailer/).
+- Marcus Bointon (coolbru on SF) and Andy Prevost (codeworxtech) took over the project in 2004.
+- Became an Apache incubator project on Google Code in 2010, managed by Jim Jagielski.
+- Marcus created his fork on [GitHub](https://github.com/Synchro/PHPMailer) in 2008.
+- Jim and Marcus decide to join forces and use GitHub as the canonical and official repo for PHPMailer in 2013.
+- PHPMailer moves to the [PHPMailer organisation](https://github.com/PHPMailer) on GitHub in 2013.
+
+### What's changed since moving from SourceForge?
+- Official successor to the SourceForge and Google Code projects.
+- Test suite.
+- Continuous integration with Travis-CI.
+- Composer support.
+- Public development.
+- Additional languages and language strings.
+- CRAM-MD5 authentication support.
+- Preserves full repo history of authors, commits and branches from the original SourceForge project.
diff --git a/phpmailer/phpmailer/SECURITY.md b/phpmailer/phpmailer/SECURITY.md
new file mode 100644
index 00000000..57a1f136
--- /dev/null
+++ b/phpmailer/phpmailer/SECURITY.md
@@ -0,0 +1,26 @@
+# Security notices relating to PHPMailer
+
+Please disclose any vulnerabilities found responsibly - report any security problems found to the maintainers privately.
+
+PHPMailer versions prior to 5.2.24 (released July 26th 2017) have an XSS vulnerability in one of the code examples, [CVE-2017-11503](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2017-11503). The `code_generator.phps` example did not filter user input prior to output. This file is distributed with a `.phps` extension, so it it not normally executable unless it is explicitly renamed, so it is safe by default. There was also an undisclosed potential XSS vulnerability in the default exception handler (unused by default). Patches for both issues kindly provided by Patrick Monnerat of the Fedora Project.
+
+PHPMailer versions prior to 5.2.22 (released January 9th 2017) have a local file disclosure vulnerability, [CVE-2017-5223](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2017-5223). If content passed into `msgHTML()` is sourced from unfiltered user input, relative paths can map to absolute local file paths and added as attachments. Also note that `addAttachment` (just like `file_get_contents`, `passthru`, `unlink`, etc) should not be passed user-sourced params either! Reported by Yongxiang Li of Asiasecurity.
+
+PHPMailer versions prior to 5.2.20 (released December 28th 2016) are vulnerable to [CVE-2016-10045](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2016-10045) a remote code execution vulnerability, responsibly reported by [Dawid Golunski](https://legalhackers.com/advisories/PHPMailer-Exploit-Remote-Code-Exec-CVE-2016-10045-Vuln-Patch-Bypass.html), and patched by Paul Buonopane (@Zenexer).
+
+PHPMailer versions prior to 5.2.18 (released December 2016) are vulnerable to [CVE-2016-10033](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2016-10033) a remote code execution vulnerability, responsibly reported by [Dawid Golunski](http://legalhackers.com/advisories/PHPMailer-Exploit-Remote-Code-Exec-CVE-2016-10033-Vuln.html).
+
+PHPMailer versions prior to 5.2.14 (released November 2015) are vulnerable to [CVE-2015-8476](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2015-8476) an SMTP CRLF injection bug permitting arbitrary message sending.
+
+PHPMailer versions prior to 5.2.10 (released May 2015) are vulnerable to [CVE-2008-5619](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2008-5619), a remote code execution vulnerability in the bundled html2text library. This file was removed in 5.2.10, so if you are using a version prior to that and make use of the html2text function, it's vitally important that you upgrade and remove this file.
+
+PHPMailer versions prior to 2.0.7 and 2.2.1 are vulnerable to [CVE-2012-0796](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2012-0796), an email header injection attack.
+
+Joomla 1.6.0 uses PHPMailer in an unsafe way, allowing it to reveal local file paths, reported in [CVE-2011-3747](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2011-3747).
+
+PHPMailer didn't sanitise the `$lang_path` parameter in `SetLanguage`. This wasn't a problem in itself, but some apps (PHPClassifieds, ATutor) also failed to sanitise user-provided parameters passed to it, permitting semi-arbitrary local file inclusion, reported in [CVE-2010-4914](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2010-4914), [CVE-2007-2021](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2007-2021) and [CVE-2006-5734](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2006-5734).
+
+PHPMailer 1.7.2 and earlier contained a possible DDoS vulnerability reported in [CVE-2005-1807](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2005-1807).
+
+PHPMailer 1.7 and earlier (June 2003) have a possible vulnerability in the `SendmailSend` method where shell commands may not be sanitised. Reported in [CVE-2007-3215](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2007-3215).
+
diff --git a/phpmailer/phpmailer/VERSION b/phpmailer/phpmailer/VERSION
new file mode 100644
index 00000000..81f0c273
--- /dev/null
+++ b/phpmailer/phpmailer/VERSION
@@ -0,0 +1 @@
+6.0.5
\ No newline at end of file
diff --git a/phpmailer/phpmailer/get_oauth_token.php b/phpmailer/phpmailer/get_oauth_token.php
new file mode 100644
index 00000000..1237b57b
--- /dev/null
+++ b/phpmailer/phpmailer/get_oauth_token.php
@@ -0,0 +1,144 @@
+<?php
+/**
+ * PHPMailer - PHP email creation and transport class.
+ * PHP Version 5.5
+ * @package PHPMailer
+ * @see https://github.com/PHPMailer/PHPMailer/ The PHPMailer GitHub project
+ * @author Marcus Bointon (Synchro/coolbru) <phpmailer@synchromedia.co.uk>
+ * @author Jim Jagielski (jimjag) <jimjag@gmail.com>
+ * @author Andy Prevost (codeworxtech) <codeworxtech@users.sourceforge.net>
+ * @author Brent R. Matzelle (original founder)
+ * @copyright 2012 - 2017 Marcus Bointon
+ * @copyright 2010 - 2012 Jim Jagielski
+ * @copyright 2004 - 2009 Andy Prevost
+ * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
+ * @note This program is distributed in the hope that it will be useful - WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.
+ */
+/**
+ * Get an OAuth2 token from an OAuth2 provider.
+ * * Install this script on your server so that it's accessible
+ * as [https/http]://<yourdomain>/<folder>/get_oauth_token.php
+ * e.g.: http://localhost/phpmailer/get_oauth_token.php
+ * * Ensure dependencies are installed with 'composer install'
+ * * Set up an app in your Google/Yahoo/Microsoft account
+ * * Set the script address as the app's redirect URL
+ * If no refresh token is obtained when running this file,
+ * revoke access to your app and run the script again.
+ */
+
+namespace PHPMailer\PHPMailer;
+
+/**
+ * Aliases for League Provider Classes
+ * Make sure you have added these to your composer.json and run `composer install`
+ * Plenty to choose from here:
+ * @see http://oauth2-client.thephpleague.com/providers/thirdparty/
+ */
+// @see https://github.com/thephpleague/oauth2-google
+use League\OAuth2\Client\Provider\Google;
+// @see https://packagist.org/packages/hayageek/oauth2-yahoo
+use Hayageek\OAuth2\Client\Provider\Yahoo;
+// @see https://github.com/stevenmaguire/oauth2-microsoft
+use Stevenmaguire\OAuth2\Client\Provider\Microsoft;
+
+if (!isset($_GET['code']) && !isset($_GET['provider'])) {
+?>
+<html>
+<body>Select Provider:<br/>
+<a href='?provider=Google'>Google</a><br/>
+<a href='?provider=Yahoo'>Yahoo</a><br/>
+<a href='?provider=Microsoft'>Microsoft/Outlook/Hotmail/Live/Office365</a><br/>
+</body>
+</html>
+<?php
+exit;
+}
+
+require 'vendor/autoload.php';
+
+session_start();
+
+$providerName = '';
+
+if (array_key_exists('provider', $_GET)) {
+    $providerName = $_GET['provider'];
+    $_SESSION['provider'] = $providerName;
+} elseif (array_key_exists('provider', $_SESSION)) {
+    $providerName = $_SESSION['provider'];
+}
+if (!in_array($providerName, ['Google', 'Microsoft', 'Yahoo'])) {
+    exit('Only Google, Microsoft and Yahoo OAuth2 providers are currently supported in this script.');
+}
+
+//These details are obtained by setting up an app in the Google developer console,
+//or whichever provider you're using.
+$clientId = 'RANDOMCHARS-----duv1n2.apps.googleusercontent.com';
+$clientSecret = 'RANDOMCHARS-----lGyjPcRtvP';
+
+//If this automatic URL doesn't work, set it yourself manually to the URL of this script
+$redirectUri = (isset($_SERVER['HTTPS']) ? 'https://' : 'http://') . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF'];
+//$redirectUri = 'http://localhost/PHPMailer/redirect';
+
+$params = [
+    'clientId' => $clientId,
+    'clientSecret' => $clientSecret,
+    'redirectUri' => $redirectUri,
+    'accessType' => 'offline'
+];
+
+$options = [];
+$provider = null;
+
+switch ($providerName) {
+    case 'Google':
+        $provider = new Google($params);
+        $options = [
+            'scope' => [
+                'https://mail.google.com/'
+            ]
+        ];
+        break;
+    case 'Yahoo':
+        $provider = new Yahoo($params);
+        break;
+    case 'Microsoft':
+        $provider = new Microsoft($params);
+        $options = [
+            'scope' => [
+                'wl.imap',
+                'wl.offline_access'
+            ]
+        ];
+        break;
+}
+
+if (null === $provider) {
+    exit('Provider missing');
+}
+
+if (!isset($_GET['code'])) {
+    // If we don't have an authorization code then get one
+    $authUrl = $provider->getAuthorizationUrl($options);
+    $_SESSION['oauth2state'] = $provider->getState();
+    header('Location: ' . $authUrl);
+    exit;
+// Check given state against previously stored one to mitigate CSRF attack
+} elseif (empty($_GET['state']) || ($_GET['state'] !== $_SESSION['oauth2state'])) {
+    unset($_SESSION['oauth2state']);
+    unset($_SESSION['provider']);
+    exit('Invalid state');
+} else {
+    unset($_SESSION['provider']);
+    // Try to get an access token (using the authorization code grant)
+    $token = $provider->getAccessToken(
+        'authorization_code',
+        [
+            'code' => $_GET['code']
+        ]
+    );
+    // Use this to interact with an API on the users behalf
+    // Use this to get a new access token if the old one expires
+    echo 'Refresh Token: ', $token->getRefreshToken();
+}
diff --git a/phpmailer/phpmailer/language/phpmailer.lang-am.php b/phpmailer/phpmailer/language/phpmailer.lang-am.php
new file mode 100644
index 00000000..ff2a9695
--- /dev/null
+++ b/phpmailer/phpmailer/language/phpmailer.lang-am.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Armenian PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ * @author Hrayr Grigoryan <hrayr@bits.am>
+ */
+ 
+$PHPMAILER_LANG['authenticate']         = 'SMTP -ի սխալ: չհաջողվեց ստուգել իսկությունը.';
+$PHPMAILER_LANG['connect_host']         = 'SMTP -ի սխալ: չհաջողվեց կապ հաստատել SMTP սերվերի հետ.';
+$PHPMAILER_LANG['data_not_accepted']    = 'SMTP -ի սխալ: տվյալները ընդունված չեն.';
+$PHPMAILER_LANG['empty_message']        = 'Հաղորդագրությունը դատարկ է';
+$PHPMAILER_LANG['encoding']             = 'Կոդավորման անհայտ տեսակ: ';
+$PHPMAILER_LANG['execute']              = 'Չհաջողվեց իրականացնել հրամանը: ';
+$PHPMAILER_LANG['file_access']          = 'Ֆայլը հասանելի չէ: ';
+$PHPMAILER_LANG['file_open']            = 'Ֆայլի սխալ: ֆայլը չհաջողվեց բացել: ';
+$PHPMAILER_LANG['from_failed']          = 'Ուղարկողի հետևյալ հասցեն սխալ է: ';
+$PHPMAILER_LANG['instantiate']          = 'Հնարավոր չէ կանչել mail ֆունկցիան.';
+$PHPMAILER_LANG['invalid_address']      = 'Հասցեն սխալ է: ';
+$PHPMAILER_LANG['mailer_not_supported'] = ' փոստային սերվերի հետ չի աշխատում.';
+$PHPMAILER_LANG['provide_address']      = 'Անհրաժեշտ է տրամադրել գոնե մեկ ստացողի e-mail հասցե.';
+$PHPMAILER_LANG['recipients_failed']    = 'SMTP -ի սխալ: չի հաջողվել ուղարկել հետևյալ ստացողների հասցեներին: ';
+$PHPMAILER_LANG['signing']              = 'Ստորագրման սխալ: ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP -ի connect() ֆունկցիան չի հաջողվել';
+$PHPMAILER_LANG['smtp_error']           = 'SMTP սերվերի սխալ: ';
+$PHPMAILER_LANG['variable_set']         = 'Չի հաջողվում ստեղծել կամ վերափոխել փոփոխականը: ';
+$PHPMAILER_LANG['extension_missing']    = 'Հավելվածը բացակայում է: ';
diff --git a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-ar.php b/phpmailer/phpmailer/language/phpmailer.lang-ar.php
similarity index 91%
rename from phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-ar.php
rename to phpmailer/phpmailer/language/phpmailer.lang-ar.php
index f795580a..790e2a5e 100644
--- a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-ar.php
+++ b/phpmailer/phpmailer/language/phpmailer.lang-ar.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * Arabic PHPMailer language file: refer to English translation for definitive list
  * @package PHPMailer
@@ -19,9 +18,10 @@ $PHPMAILER_LANG['instantiate']          = 'لا يمكن توفير خدمة ا
 $PHPMAILER_LANG['invalid_address']      = 'الإرسال غير ممكن لأن عنوان البريد الإلكتروني غير صالح: ';
 $PHPMAILER_LANG['mailer_not_supported'] = ' برنامج الإرسال غير مدعوم.';
 $PHPMAILER_LANG['provide_address']      = 'يجب توفير عنوان البريد الإلكتروني لمستلم واحد على الأقل.';
-$PHPMAILER_LANG['recipients_failed']    = 'خطأ SMTP: الأخطاء التالية فشل في الارسال لكل من : ';
+$PHPMAILER_LANG['recipients_failed']    = 'خطأ SMTP: الأخطاء التالية ' .
+                                          'فشل في الارسال لكل من : ';
 $PHPMAILER_LANG['signing']              = 'خطأ في التوقيع: ';
 $PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Connect() غير ممكن.';
 $PHPMAILER_LANG['smtp_error']           = 'خطأ على مستوى الخادم SMTP: ';
 $PHPMAILER_LANG['variable_set']         = 'لا يمكن تعيين أو إعادة تعيين متغير: ';
-$PHPMAILER_LANG['extension_missing']    = 'الإضافة غير موجودة: ';
+//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';
diff --git a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-az.php b/phpmailer/phpmailer/language/phpmailer.lang-az.php
similarity index 99%
rename from phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-az.php
rename to phpmailer/phpmailer/language/phpmailer.lang-az.php
index 552167ef..3749d83d 100644
--- a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-az.php
+++ b/phpmailer/phpmailer/language/phpmailer.lang-az.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * Azerbaijani PHPMailer language file: refer to English translation for definitive list
  * @package PHPMailer
diff --git a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-ba.php b/phpmailer/phpmailer/language/phpmailer.lang-ba.php
similarity index 99%
rename from phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-ba.php
rename to phpmailer/phpmailer/language/phpmailer.lang-ba.php
index 3694f344..576c4bb5 100644
--- a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-ba.php
+++ b/phpmailer/phpmailer/language/phpmailer.lang-ba.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * Bosnian PHPMailer language file: refer to English translation for definitive list
  * @package PHPMailer
@@ -24,4 +23,4 @@ $PHPMAILER_LANG['signing']              = 'Greška prilikom prijave: ';
 $PHPMAILER_LANG['smtp_connect_failed']  = 'Spajanje na SMTP server nije uspjelo.';
 $PHPMAILER_LANG['smtp_error']           = 'SMTP greška: ';
 $PHPMAILER_LANG['variable_set']         = 'Nije moguće postaviti varijablu ili je vratiti nazad: ';
-$PHPMAILER_LANG['extension_missing']    = 'Nedostaje ekstenzija: ';
+$PHPMAILER_LANG['extension_missing']    = 'Nedostaje ekstenzija: ';
\ No newline at end of file
diff --git a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-be.php b/phpmailer/phpmailer/language/phpmailer.lang-be.php
similarity index 99%
rename from phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-be.php
rename to phpmailer/phpmailer/language/phpmailer.lang-be.php
index 9e92ddaa..e2f98f0f 100644
--- a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-be.php
+++ b/phpmailer/phpmailer/language/phpmailer.lang-be.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * Belarusian PHPMailer language file: refer to English translation for definitive list
  * @package PHPMailer
diff --git a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-bg.php b/phpmailer/phpmailer/language/phpmailer.lang-bg.php
similarity index 99%
rename from phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-bg.php
rename to phpmailer/phpmailer/language/phpmailer.lang-bg.php
index c41f675d..b22941f6 100644
--- a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-bg.php
+++ b/phpmailer/phpmailer/language/phpmailer.lang-bg.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * Bulgarian PHPMailer language file: refer to English translation for definitive list
  * @package PHPMailer
diff --git a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-ca.php b/phpmailer/phpmailer/language/phpmailer.lang-ca.php
similarity index 99%
rename from phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-ca.php
rename to phpmailer/phpmailer/language/phpmailer.lang-ca.php
index 34684855..4117596c 100644
--- a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-ca.php
+++ b/phpmailer/phpmailer/language/phpmailer.lang-ca.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * Catalan PHPMailer language file: refer to English translation for definitive list
  * @package PHPMailer
diff --git a/phpmailer/phpmailer/language/phpmailer.lang-ch.php b/phpmailer/phpmailer/language/phpmailer.lang-ch.php
new file mode 100644
index 00000000..4fda6b85
--- /dev/null
+++ b/phpmailer/phpmailer/language/phpmailer.lang-ch.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Chinese PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ * @author LiuXin <http://www.80x86.cn/blog/>
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'SMTP 错误：身份验证失败。';
+$PHPMAILER_LANG['connect_host']         = 'SMTP 错误: 不能连接SMTP主机。';
+$PHPMAILER_LANG['data_not_accepted']    = 'SMTP 错误: 数据不可接受。';
+//$PHPMAILER_LANG['empty_message']        = 'Message body empty';
+$PHPMAILER_LANG['encoding']             = '未知编码：';
+$PHPMAILER_LANG['execute']              = '不能执行: ';
+$PHPMAILER_LANG['file_access']          = '不能访问文件：';
+$PHPMAILER_LANG['file_open']            = '文件错误：不能打开文件：';
+$PHPMAILER_LANG['from_failed']          = '下面的发送地址邮件发送失败了： ';
+$PHPMAILER_LANG['instantiate']          = '不能实现mail方法。';
+//$PHPMAILER_LANG['invalid_address']      = 'Invalid address: ';
+$PHPMAILER_LANG['mailer_not_supported'] = ' 您所选择的发送邮件的方法并不支持。';
+$PHPMAILER_LANG['provide_address']      = '您必须提供至少一个 收信人的email地址。';
+$PHPMAILER_LANG['recipients_failed']    = 'SMTP 错误： 下面的 收件人失败了： ';
+//$PHPMAILER_LANG['signing']              = 'Signing Error: ';
+//$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Connect() failed.';
+//$PHPMAILER_LANG['smtp_error']           = 'SMTP server error: ';
+//$PHPMAILER_LANG['variable_set']         = 'Cannot set or reset variable: ';
+//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';
diff --git a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-cs.php b/phpmailer/phpmailer/language/phpmailer.lang-cs.php
similarity index 91%
rename from phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-cs.php
rename to phpmailer/phpmailer/language/phpmailer.lang-cs.php
index e770a1a2..1160cf0c 100644
--- a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-cs.php
+++ b/phpmailer/phpmailer/language/phpmailer.lang-cs.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * Czech PHPMailer language file: refer to English translation for definitive list
  * @package PHPMailer
@@ -16,8 +15,6 @@ $PHPMAILER_LANG['file_open']            = 'Chyba souboru: Nelze otevřít soubor
 $PHPMAILER_LANG['from_failed']          = 'Následující adresa odesílatele je nesprávná: ';
 $PHPMAILER_LANG['instantiate']          = 'Nelze vytvořit instanci emailové funkce.';
 $PHPMAILER_LANG['invalid_address']      = 'Neplatná adresa: ';
-$PHPMAILER_LANG['invalid_hostentry']    = 'Záznam hostitele je nesprávný: ';
-$PHPMAILER_LANG['invalid_host']         = 'Hostitel je nesprávný: ';
 $PHPMAILER_LANG['mailer_not_supported'] = ' mailer není podporován.';
 $PHPMAILER_LANG['provide_address']      = 'Musíte zadat alespoň jednu emailovou adresu příjemce.';
 $PHPMAILER_LANG['recipients_failed']    = 'Chyba SMTP: Následující adresy příjemců nejsou správně: ';
diff --git a/phpmailer/phpmailer/language/phpmailer.lang-da.php b/phpmailer/phpmailer/language/phpmailer.lang-da.php
new file mode 100644
index 00000000..e725f4b4
--- /dev/null
+++ b/phpmailer/phpmailer/language/phpmailer.lang-da.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Danish PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ * @author Mikael Stokkebro <info@stokkebro.dk>
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'SMTP fejl: Kunne ikke logge på.';
+$PHPMAILER_LANG['connect_host']         = 'SMTP fejl: Kunne ikke tilslutte SMTP serveren.';
+$PHPMAILER_LANG['data_not_accepted']    = 'SMTP fejl: Data kunne ikke accepteres.';
+//$PHPMAILER_LANG['empty_message']        = 'Message body empty';
+$PHPMAILER_LANG['encoding']             = 'Ukendt encode-format: ';
+$PHPMAILER_LANG['execute']              = 'Kunne ikke køre: ';
+$PHPMAILER_LANG['file_access']          = 'Ingen adgang til fil: ';
+$PHPMAILER_LANG['file_open']            = 'Fil fejl: Kunne ikke åbne filen: ';
+$PHPMAILER_LANG['from_failed']          = 'Følgende afsenderadresse er forkert: ';
+$PHPMAILER_LANG['instantiate']          = 'Kunne ikke initialisere email funktionen.';
+//$PHPMAILER_LANG['invalid_address']        = 'Invalid address: ';
+$PHPMAILER_LANG['mailer_not_supported'] = ' mailer understøttes ikke.';
+$PHPMAILER_LANG['provide_address']      = 'Du skal indtaste mindst en modtagers emailadresse.';
+$PHPMAILER_LANG['recipients_failed']    = 'SMTP fejl: Følgende modtagere er forkerte: ';
+//$PHPMAILER_LANG['signing']              = 'Signing Error: ';
+//$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Connect() failed.';
+//$PHPMAILER_LANG['smtp_error']           = 'SMTP server error: ';
+//$PHPMAILER_LANG['variable_set']         = 'Cannot set or reset variable: ';
+//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';
diff --git a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-de.php b/phpmailer/phpmailer/language/phpmailer.lang-de.php
similarity index 92%
rename from phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-de.php
rename to phpmailer/phpmailer/language/phpmailer.lang-de.php
index e7e59d2b..aa987a9c 100644
--- a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-de.php
+++ b/phpmailer/phpmailer/language/phpmailer.lang-de.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * German PHPMailer language file: refer to English translation for definitive list
  * @package PHPMailer
@@ -16,8 +15,6 @@ $PHPMAILER_LANG['file_open']            = 'Dateifehler: Konnte folgende Datei ni
 $PHPMAILER_LANG['from_failed']          = 'Die folgende Absenderadresse ist nicht korrekt: ';
 $PHPMAILER_LANG['instantiate']          = 'Mail-Funktion konnte nicht initialisiert werden.';
 $PHPMAILER_LANG['invalid_address']      = 'Die Adresse ist ungültig: ';
-$PHPMAILER_LANG['invalid_hostentry']    = 'Ungültiger Hosteintrag: ';
-$PHPMAILER_LANG['invalid_host']         = 'Ungültiger Host: ';
 $PHPMAILER_LANG['mailer_not_supported'] = ' mailer wird nicht unterstützt.';
 $PHPMAILER_LANG['provide_address']      = 'Bitte geben Sie mindestens eine Empfängeradresse an.';
 $PHPMAILER_LANG['recipients_failed']    = 'SMTP-Fehler: Die folgenden Empfänger sind nicht korrekt: ';
diff --git a/phpmailer/phpmailer/language/phpmailer.lang-el.php b/phpmailer/phpmailer/language/phpmailer.lang-el.php
new file mode 100644
index 00000000..7109641e
--- /dev/null
+++ b/phpmailer/phpmailer/language/phpmailer.lang-el.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Greek PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'SMTP Σφάλμα: Αδυναμία πιστοποίησης (authentication).';
+$PHPMAILER_LANG['connect_host']         = 'SMTP Σφάλμα: Αδυναμία σύνδεσης στον SMTP-Host.';
+$PHPMAILER_LANG['data_not_accepted']    = 'SMTP Σφάλμα: Τα δεδομένα δεν έγιναν αποδεκτά.';
+$PHPMAILER_LANG['empty_message']        = 'Το E-Mail δεν έχει περιεχόμενο .';
+$PHPMAILER_LANG['encoding']             = 'Αγνωστο Encoding-Format: ';
+$PHPMAILER_LANG['execute']              = 'Αδυναμία εκτέλεσης ακόλουθης εντολής: ';
+$PHPMAILER_LANG['file_access']          = 'Αδυναμία προσπέλασης του αρχείου: ';
+$PHPMAILER_LANG['file_open']            = 'Σφάλμα Αρχείου: Δεν είναι δυνατό το άνοιγμα του ακόλουθου αρχείου: ';
+$PHPMAILER_LANG['from_failed']          = 'Η παρακάτω διεύθυνση αποστολέα δεν είναι σωστή: ';
+$PHPMAILER_LANG['instantiate']          = 'Αδυναμία εκκίνησης Mail function.';
+$PHPMAILER_LANG['invalid_address']      = 'Το μήνυμα δεν εστάλη, η διεύθυνση δεν είναι έγκυρη: ';
+$PHPMAILER_LANG['mailer_not_supported'] = ' mailer δεν υποστηρίζεται.';
+$PHPMAILER_LANG['provide_address']      = 'Παρακαλούμε δώστε τουλάχιστον μια e-mail διεύθυνση παραλήπτη.';
+$PHPMAILER_LANG['recipients_failed']    = 'SMTP Σφάλμα: Οι παρακάτω διευθύνσεις παραλήπτη δεν είναι έγκυρες: ';
+$PHPMAILER_LANG['signing']              = 'Σφάλμα υπογραφής: ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'Αποτυχία σύνδεσης στον SMTP Server.';
+$PHPMAILER_LANG['smtp_error']           = 'Σφάλμα από τον SMTP Server: ';
+$PHPMAILER_LANG['variable_set']         = 'Αδυναμία ορισμού ή αρχικοποίησης μεταβλητής: ';
+//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';
diff --git a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-eo.php b/phpmailer/phpmailer/language/phpmailer.lang-eo.php
similarity index 99%
rename from phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-eo.php
rename to phpmailer/phpmailer/language/phpmailer.lang-eo.php
index fa8c2c17..5ca6cb70 100644
--- a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-eo.php
+++ b/phpmailer/phpmailer/language/phpmailer.lang-eo.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * Esperanto PHPMailer language file: refer to English translation for definitive list
  * @package PHPMailer
diff --git a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-es.php b/phpmailer/phpmailer/language/phpmailer.lang-es.php
similarity index 84%
rename from phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-es.php
rename to phpmailer/phpmailer/language/phpmailer.lang-es.php
index 69920418..f2c4e831 100644
--- a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-es.php
+++ b/phpmailer/phpmailer/language/phpmailer.lang-es.php
@@ -1,10 +1,8 @@
 <?php
-
 /**
  * Spanish PHPMailer language file: refer to English translation for definitive list
  * @package PHPMailer
  * @author Matt Sturdy <matt.sturdy@gmail.com>
- * @author Crystopher Glodzienski Cardoso <crystopher.glodzienski@gmail.com>
  */
 
 $PHPMAILER_LANG['authenticate']         = 'Error SMTP: Imposible autentificar.';
@@ -26,6 +24,3 @@ $PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Connect() falló.';
 $PHPMAILER_LANG['smtp_error']           = 'Error del servidor SMTP: ';
 $PHPMAILER_LANG['variable_set']         = 'No se pudo configurar la variable: ';
 $PHPMAILER_LANG['extension_missing']    = 'Extensión faltante: ';
-$PHPMAILER_LANG['smtp_code']            = 'Código del servidor SMTP: ';
-$PHPMAILER_LANG['smtp_code_ex']         = 'Información adicional del servidor SMTP: ';
-$PHPMAILER_LANG['invalid_header']       = 'Nombre o valor de encabezado no válido';
diff --git a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-et.php b/phpmailer/phpmailer/language/phpmailer.lang-et.php
similarity index 99%
rename from phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-et.php
rename to phpmailer/phpmailer/language/phpmailer.lang-et.php
index 93addc9e..7e06da13 100644
--- a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-et.php
+++ b/phpmailer/phpmailer/language/phpmailer.lang-et.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * Estonian PHPMailer language file: refer to English translation for definitive list
  * @package PHPMailer
diff --git a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-fa.php b/phpmailer/phpmailer/language/phpmailer.lang-fa.php
similarity index 96%
rename from phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-fa.php
rename to phpmailer/phpmailer/language/phpmailer.lang-fa.php
index 295a47f9..ad0745c5 100644
--- a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-fa.php
+++ b/phpmailer/phpmailer/language/phpmailer.lang-fa.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * Persian/Farsi PHPMailer language file: refer to English translation for definitive list
  * @package PHPMailer
@@ -25,4 +24,4 @@ $PHPMAILER_LANG['signing']              = 'خطا در امضا: ';
 $PHPMAILER_LANG['smtp_connect_failed']  = 'خطا در اتصال به SMTP.';
 $PHPMAILER_LANG['smtp_error']           = 'خطا در SMTP Server: ';
 $PHPMAILER_LANG['variable_set']         = 'امکان ارسال یا ارسال مجدد متغیر‌ها وجود ندارد: ';
-$PHPMAILER_LANG['extension_missing']    = 'افزونه موجود نیست: ';
+//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';
diff --git a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-fi.php b/phpmailer/phpmailer/language/phpmailer.lang-fi.php
similarity index 95%
rename from phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-fi.php
rename to phpmailer/phpmailer/language/phpmailer.lang-fi.php
index 6d1e6373..ec4e7523 100644
--- a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-fi.php
+++ b/phpmailer/phpmailer/language/phpmailer.lang-fi.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * Finnish PHPMailer language file: refer to English translation for definitive list
  * @package PHPMailer
@@ -20,6 +19,7 @@ $PHPMAILER_LANG['instantiate']          = 'mail-funktion luonti epäonnistui.';
 $PHPMAILER_LANG['mailer_not_supported'] = 'postivälitintyyppiä ei tueta.';
 $PHPMAILER_LANG['provide_address']      = 'Aseta vähintään yksi vastaanottajan sähk&ouml;postiosoite.';
 $PHPMAILER_LANG['recipients_failed']    = 'SMTP-virhe: seuraava vastaanottaja osoite on virheellinen.';
+$PHPMAILER_LANG['encoding']             = 'Tuntematon koodaustyyppi: ';
 //$PHPMAILER_LANG['signing']              = 'Signing Error: ';
 //$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Connect() failed.';
 //$PHPMAILER_LANG['smtp_error']           = 'SMTP server error: ';
diff --git a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-fo.php b/phpmailer/phpmailer/language/phpmailer.lang-fo.php
similarity index 99%
rename from phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-fo.php
rename to phpmailer/phpmailer/language/phpmailer.lang-fo.php
index b30f0520..68cdef1d 100644
--- a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-fo.php
+++ b/phpmailer/phpmailer/language/phpmailer.lang-fo.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * Faroese PHPMailer language file: refer to English translation for definitive list
  * @package PHPMailer
diff --git a/phpmailer/phpmailer/language/phpmailer.lang-fr.php b/phpmailer/phpmailer/language/phpmailer.lang-fr.php
new file mode 100644
index 00000000..af68c923
--- /dev/null
+++ b/phpmailer/phpmailer/language/phpmailer.lang-fr.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * French PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ * Some French punctuation requires a thin non-breaking space (U+202F) character before it,
+ * for example before a colon or exclamation mark.
+ * There is one of these characters between these quotes: " "
+ * @see http://unicode.org/udhr/n/notes_fra.html
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'Erreur SMTP : échec de l\'authentification.';
+$PHPMAILER_LANG['connect_host']         = 'Erreur SMTP : impossible de se connecter au serveur SMTP.';
+$PHPMAILER_LANG['data_not_accepted']    = 'Erreur SMTP : données incorrectes.';
+$PHPMAILER_LANG['empty_message']        = 'Corps du message vide.';
+$PHPMAILER_LANG['encoding']             = 'Encodage inconnu : ';
+$PHPMAILER_LANG['execute']              = 'Impossible de lancer l\'exécution : ';
+$PHPMAILER_LANG['file_access']          = 'Impossible d\'accéder au fichier : ';
+$PHPMAILER_LANG['file_open']            = 'Ouverture du fichier impossible : ';
+$PHPMAILER_LANG['from_failed']          = 'L\'adresse d\'expéditeur suivante a échoué : ';
+$PHPMAILER_LANG['instantiate']          = 'Impossible d\'instancier la fonction mail.';
+$PHPMAILER_LANG['invalid_address']      = 'L\'adresse courriel n\'est pas valide : ';
+$PHPMAILER_LANG['mailer_not_supported'] = ' client de messagerie non supporté.';
+$PHPMAILER_LANG['provide_address']      = 'Vous devez fournir au moins une adresse de destinataire.';
+$PHPMAILER_LANG['recipients_failed']    = 'Erreur SMTP : les destinataires suivants sont en erreur : ';
+$PHPMAILER_LANG['signing']              = 'Erreur de signature : ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'Échec de la connexion SMTP.';
+$PHPMAILER_LANG['smtp_error']           = 'Erreur du serveur SMTP : ';
+$PHPMAILER_LANG['variable_set']         = 'Impossible d\'initialiser ou de réinitialiser une variable : ';
+$PHPMAILER_LANG['extension_missing']    = 'Extension manquante : ';
diff --git a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-gl.php b/phpmailer/phpmailer/language/phpmailer.lang-gl.php
similarity index 99%
rename from phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-gl.php
rename to phpmailer/phpmailer/language/phpmailer.lang-gl.php
index 3f3ab376..9b4ce4d8 100644
--- a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-gl.php
+++ b/phpmailer/phpmailer/language/phpmailer.lang-gl.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * Galician PHPMailer language file: refer to English translation for definitive list
  * @package PHPMailer
diff --git a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-he.php b/phpmailer/phpmailer/language/phpmailer.lang-he.php
similarity index 99%
rename from phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-he.php
rename to phpmailer/phpmailer/language/phpmailer.lang-he.php
index b123aa5f..70eb7175 100644
--- a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-he.php
+++ b/phpmailer/phpmailer/language/phpmailer.lang-he.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * Hebrew PHPMailer language file: refer to English translation for definitive list
  * @package PHPMailer
diff --git a/phpmailer/phpmailer/language/phpmailer.lang-hi.php b/phpmailer/phpmailer/language/phpmailer.lang-hi.php
new file mode 100644
index 00000000..607a5ee3
--- /dev/null
+++ b/phpmailer/phpmailer/language/phpmailer.lang-hi.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Hindi PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ * @author Yash Karanke <mr.karanke@gmail.com>
+ */
+ 
+$PHPMAILER_LANG['authenticate']         = 'SMTP त्रुटि: प्रामाणिकता की जांच नहीं हो सका। ';
+$PHPMAILER_LANG['connect_host']         = 'SMTP त्रुटि: SMTP सर्वर से कनेक्ट नहीं हो सका। ';
+$PHPMAILER_LANG['data_not_accepted']    = 'SMTP त्रुटि: डेटा स्वीकार नहीं किया जाता है। ';
+$PHPMAILER_LANG['empty_message']        = 'संदेश खाली है। ';
+$PHPMAILER_LANG['encoding']             = 'अज्ञात एन्कोडिंग प्रकार। ';
+$PHPMAILER_LANG['execute']              = 'आदेश को निष्पादित करने में विफल। ';
+$PHPMAILER_LANG['file_access']          = 'फ़ाइल उपलब्ध नहीं है। ';
+$PHPMAILER_LANG['file_open']            = 'फ़ाइल त्रुटि: फाइल को खोला नहीं जा सका। ';
+$PHPMAILER_LANG['from_failed']          = 'प्रेषक का पता गलत है। ';
+$PHPMAILER_LANG['instantiate']          = 'मेल फ़ंक्शन कॉल नहीं कर सकता है।';
+$PHPMAILER_LANG['invalid_address']      = 'पता गलत है। ';
+$PHPMAILER_LANG['mailer_not_supported'] = 'मेल सर्वर के साथ काम नहीं करता है। ';
+$PHPMAILER_LANG['provide_address']      = 'आपको कम से कम एक प्राप्तकर्ता का ई-मेल पता प्रदान करना होगा।';
+$PHPMAILER_LANG['recipients_failed']    = 'SMTP त्रुटि: निम्न प्राप्तकर्ताओं को पते भेजने में विफल। ';
+$PHPMAILER_LANG['signing']              = 'साइनअप त्रुटि:। ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP का connect () फ़ंक्शन विफल हुआ। ';
+$PHPMAILER_LANG['smtp_error']           = 'SMTP सर्वर त्रुटि। ';
+$PHPMAILER_LANG['variable_set']         = 'चर को बना या संशोधित नहीं किया जा सकता। ';
+$PHPMAILER_LANG['extension_missing']    = 'एक्सटेन्षन गायब है: ';
diff --git a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-hr.php b/phpmailer/phpmailer/language/phpmailer.lang-hr.php
similarity index 99%
rename from phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-hr.php
rename to phpmailer/phpmailer/language/phpmailer.lang-hr.php
index cacb6c37..3822920a 100644
--- a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-hr.php
+++ b/phpmailer/phpmailer/language/phpmailer.lang-hr.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * Croatian PHPMailer language file: refer to English translation for definitive list
  * @package PHPMailer
diff --git a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-hu.php b/phpmailer/phpmailer/language/phpmailer.lang-hu.php
similarity index 95%
rename from phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-hu.php
rename to phpmailer/phpmailer/language/phpmailer.lang-hu.php
index e6b58b0d..d7ca8887 100644
--- a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-hu.php
+++ b/phpmailer/phpmailer/language/phpmailer.lang-hu.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * Hungarian PHPMailer language file: refer to English translation for definitive list
  * @package PHPMailer
@@ -24,4 +23,4 @@ $PHPMAILER_LANG['signing']              = 'Hibás aláírás: ';
 $PHPMAILER_LANG['smtp_connect_failed']  = 'Hiba az SMTP-kapcsolatban.';
 $PHPMAILER_LANG['smtp_error']           = 'SMTP-szerver hiba: ';
 $PHPMAILER_LANG['variable_set']         = 'A következő változók beállítása nem sikerült: ';
-$PHPMAILER_LANG['extension_missing']    = 'Bővítmény hiányzik: ';
+//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';
diff --git a/phpmailer/phpmailer/language/phpmailer.lang-id.php b/phpmailer/phpmailer/language/phpmailer.lang-id.php
new file mode 100644
index 00000000..97c16e08
--- /dev/null
+++ b/phpmailer/phpmailer/language/phpmailer.lang-id.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Indonesian PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ * @author Cecep Prawiro <cecep.prawiro@gmail.com>
+ * @author @januridp
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'Kesalahan SMTP: Tidak dapat mengotentikasi.';
+$PHPMAILER_LANG['connect_host']         = 'Kesalahan SMTP: Tidak dapat terhubung ke host SMTP.';
+$PHPMAILER_LANG['data_not_accepted']    = 'Kesalahan SMTP: Data tidak diterima peladen.';
+$PHPMAILER_LANG['empty_message']        = 'Isi pesan kosong';
+$PHPMAILER_LANG['encoding']             = 'Pengkodean karakter tidak dikenali: ';
+$PHPMAILER_LANG['execute']              = 'Tidak dapat menjalankan proses : ';
+$PHPMAILER_LANG['file_access']          = 'Tidak dapat mengakses berkas : ';
+$PHPMAILER_LANG['file_open']            = 'Kesalahan File: Berkas tidak bisa dibuka : ';
+$PHPMAILER_LANG['from_failed']          = 'Alamat pengirim berikut mengakibatkan kesalahan : ';
+$PHPMAILER_LANG['instantiate']          = 'Tidak dapat menginisialisasi fungsi surel';
+$PHPMAILER_LANG['invalid_address']      = 'Gagal terkirim, alamat surel tidak benar : ';
+$PHPMAILER_LANG['provide_address']      = 'Harus disediakan minimal satu alamat tujuan';
+$PHPMAILER_LANG['mailer_not_supported'] = 'Pengirim tidak didukung';
+$PHPMAILER_LANG['recipients_failed']    = 'Kesalahan SMTP: Alamat tujuan berikut menghasilkan kesalahan : ';
+$PHPMAILER_LANG['signing']              = 'Kesalahan dalam tanda tangan : ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Connect() gagal.';
+$PHPMAILER_LANG['smtp_error']           = 'Kesalahan pada pelayan SMTP : ';
+$PHPMAILER_LANG['variable_set']         = 'Tidak berhasil mengatur atau mengatur ulang variable : ';
+$PHPMAILER_LANG['extension_missing']    = 'Ekstensi hilang: ';
diff --git a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-it.php b/phpmailer/phpmailer/language/phpmailer.lang-it.php
similarity index 96%
rename from phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-it.php
rename to phpmailer/phpmailer/language/phpmailer.lang-it.php
index 08a6b733..d2f4643e 100644
--- a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-it.php
+++ b/phpmailer/phpmailer/language/phpmailer.lang-it.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * Italian PHPMailer language file: refer to English translation for definitive list
  * @package PHPMailer
@@ -25,4 +24,4 @@ $PHPMAILER_LANG['signing']              = 'Errore nella firma: ';
 $PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Connect() fallita.';
 $PHPMAILER_LANG['smtp_error']           = 'Errore del server SMTP: ';
 $PHPMAILER_LANG['variable_set']         = 'Impossibile impostare o resettare la variabile: ';
-$PHPMAILER_LANG['extension_missing']    = 'Estensione mancante: ';
+//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';
diff --git a/phpmailer/phpmailer/language/phpmailer.lang-ja.php b/phpmailer/phpmailer/language/phpmailer.lang-ja.php
new file mode 100644
index 00000000..2d778728
--- /dev/null
+++ b/phpmailer/phpmailer/language/phpmailer.lang-ja.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Japanese PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ * @author Mitsuhiro Yoshida <http://mitstek.com/>
+ * @author Yoshi Sakai <http://bluemooninc.jp/>
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'SMTPエラー: 認証できませんでした。';
+$PHPMAILER_LANG['connect_host']         = 'SMTPエラー: SMTPホストに接続できませんでした。';
+$PHPMAILER_LANG['data_not_accepted']    = 'SMTPエラー: データが受け付けられませんでした。';
+//$PHPMAILER_LANG['empty_message']        = 'Message body empty';
+$PHPMAILER_LANG['encoding']             = '不明なエンコーディング: ';
+$PHPMAILER_LANG['execute']              = '実行できませんでした: ';
+$PHPMAILER_LANG['file_access']          = 'ファイルにアクセスできません: ';
+$PHPMAILER_LANG['file_open']            = 'ファイルエラー: ファイルを開けません: ';
+$PHPMAILER_LANG['from_failed']          = 'Fromアドレスを登録する際にエラーが発生しました: ';
+$PHPMAILER_LANG['instantiate']          = 'メール関数が正常に動作しませんでした。';
+//$PHPMAILER_LANG['invalid_address']      = 'Invalid address: ';
+$PHPMAILER_LANG['provide_address']      = '少なくとも1つメールアドレスを 指定する必要があります。';
+$PHPMAILER_LANG['mailer_not_supported'] = ' メーラーがサポートされていません。';
+$PHPMAILER_LANG['recipients_failed']    = 'SMTPエラー: 次の受信者アドレスに 間違いがあります: ';
+//$PHPMAILER_LANG['signing']              = 'Signing Error: ';
+//$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Connect() failed.';
+//$PHPMAILER_LANG['smtp_error']           = 'SMTP server error: ';
+//$PHPMAILER_LANG['variable_set']         = 'Cannot set or reset variable: ';
+//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';
diff --git a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-ka.php b/phpmailer/phpmailer/language/phpmailer.lang-ka.php
similarity index 99%
rename from phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-ka.php
rename to phpmailer/phpmailer/language/phpmailer.lang-ka.php
index 51fe403b..dd1af8ab 100644
--- a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-ka.php
+++ b/phpmailer/phpmailer/language/phpmailer.lang-ka.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * Georgian PHPMailer language file: refer to English translation for definitive list
  * @package PHPMailer
diff --git a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-ko.php b/phpmailer/phpmailer/language/phpmailer.lang-ko.php
similarity index 99%
rename from phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-ko.php
rename to phpmailer/phpmailer/language/phpmailer.lang-ko.php
index 8c97dd94..9599fa68 100644
--- a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-ko.php
+++ b/phpmailer/phpmailer/language/phpmailer.lang-ko.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * Korean PHPMailer language file: refer to English translation for definitive list
  * @package PHPMailer
diff --git a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-lt.php b/phpmailer/phpmailer/language/phpmailer.lang-lt.php
similarity index 99%
rename from phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-lt.php
rename to phpmailer/phpmailer/language/phpmailer.lang-lt.php
index 4f115b1c..1253a4fd 100644
--- a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-lt.php
+++ b/phpmailer/phpmailer/language/phpmailer.lang-lt.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * Lithuanian PHPMailer language file: refer to English translation for definitive list
  * @package PHPMailer
diff --git a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-lv.php b/phpmailer/phpmailer/language/phpmailer.lang-lv.php
similarity index 99%
rename from phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-lv.php
rename to phpmailer/phpmailer/language/phpmailer.lang-lv.php
index 679b18cf..39bf9a19 100644
--- a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-lv.php
+++ b/phpmailer/phpmailer/language/phpmailer.lang-lv.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * Latvian PHPMailer language file: refer to English translation for definitive list
  * @package PHPMailer
diff --git a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-ms.php b/phpmailer/phpmailer/language/phpmailer.lang-ms.php
similarity index 96%
rename from phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-ms.php
rename to phpmailer/phpmailer/language/phpmailer.lang-ms.php
index 71db3383..4e2c3408 100644
--- a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-ms.php
+++ b/phpmailer/phpmailer/language/phpmailer.lang-ms.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * Malaysian PHPMailer language file: refer to English translation for definitive list
  * @package PHPMailer
@@ -24,4 +23,4 @@ $PHPMAILER_LANG['signing']              = 'Ralat pada tanda tangan: ';
 $PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Connect() telah gagal.';
 $PHPMAILER_LANG['smtp_error']           = 'Ralat pada pelayan SMTP: ';
 $PHPMAILER_LANG['variable_set']         = 'Tidak boleh menetapkan atau menetapkan semula pembolehubah: ';
-$PHPMAILER_LANG['extension_missing']    = 'Sambungan hilang: ';
+//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';
diff --git a/phpmailer/phpmailer/language/phpmailer.lang-nb.php b/phpmailer/phpmailer/language/phpmailer.lang-nb.php
new file mode 100644
index 00000000..44610542
--- /dev/null
+++ b/phpmailer/phpmailer/language/phpmailer.lang-nb.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Norwegian Bokmål PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'SMTP Feil: Kunne ikke autentisere.';
+$PHPMAILER_LANG['connect_host']         = 'SMTP Feil: Kunne ikke koble til SMTP tjener.';
+$PHPMAILER_LANG['data_not_accepted']    = 'SMTP Feil: Datainnhold ikke akseptert.';
+$PHPMAILER_LANG['empty_message']        = 'Melding kropp tomt';
+$PHPMAILER_LANG['encoding']             = 'Ukjent koding: ';
+$PHPMAILER_LANG['execute']              = 'Kunne ikke utføre: ';
+$PHPMAILER_LANG['file_access']          = 'Får ikke tilgang til filen: ';
+$PHPMAILER_LANG['file_open']            = 'Fil Feil: Kunne ikke åpne filen: ';
+$PHPMAILER_LANG['from_failed']          = 'Følgende Frå adresse feilet: ';
+$PHPMAILER_LANG['instantiate']          = 'Kunne ikke initialisere post funksjon.';
+$PHPMAILER_LANG['invalid_address']      = 'Ugyldig adresse: ';
+$PHPMAILER_LANG['mailer_not_supported'] = ' sender er ikke støttet.';
+$PHPMAILER_LANG['provide_address']      = 'Du må opppgi minst en mottakeradresse.';
+$PHPMAILER_LANG['recipients_failed']    = 'SMTP Feil: Følgende mottakeradresse feilet: ';
+$PHPMAILER_LANG['signing']              = 'Signering Feil: ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP connect() feilet.';
+$PHPMAILER_LANG['smtp_error']           = 'SMTP server feil: ';
+$PHPMAILER_LANG['variable_set']         = 'Kan ikke skrive eller omskrive variabel: ';
+$PHPMAILER_LANG['extension_missing']    = 'Utvidelse mangler: ';
diff --git a/phpmailer/phpmailer/language/phpmailer.lang-nl.php b/phpmailer/phpmailer/language/phpmailer.lang-nl.php
new file mode 100644
index 00000000..2fb01b2d
--- /dev/null
+++ b/phpmailer/phpmailer/language/phpmailer.lang-nl.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Dutch PHPMailer language file: refer to PHPMailer.php for definitive list.
+ * @package PHPMailer
+ * @author Tuxion <team@tuxion.nl>
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'SMTP-fout: authenticatie mislukt.';
+$PHPMAILER_LANG['connect_host']         = 'SMTP-fout: kon niet verbinden met SMTP-host.';
+$PHPMAILER_LANG['data_not_accepted']    = 'SMTP-fout: data niet geaccepteerd.';
+$PHPMAILER_LANG['empty_message']        = 'Berichttekst is leeg';
+$PHPMAILER_LANG['encoding']             = 'Onbekende codering: ';
+$PHPMAILER_LANG['execute']              = 'Kon niet uitvoeren: ';
+$PHPMAILER_LANG['file_access']          = 'Kreeg geen toegang tot bestand: ';
+$PHPMAILER_LANG['file_open']            = 'Bestandsfout: kon bestand niet openen: ';
+$PHPMAILER_LANG['from_failed']          = 'Het volgende afzendersadres is mislukt: ';
+$PHPMAILER_LANG['instantiate']          = 'Kon mailfunctie niet initialiseren.';
+$PHPMAILER_LANG['invalid_address']      = 'Ongeldig adres: ';
+$PHPMAILER_LANG['mailer_not_supported'] = ' mailer wordt niet ondersteund.';
+$PHPMAILER_LANG['provide_address']      = 'Er moet minstens één ontvanger worden opgegeven.';
+$PHPMAILER_LANG['recipients_failed']    = 'SMTP-fout: de volgende ontvangers zijn mislukt: ';
+$PHPMAILER_LANG['signing']              = 'Signeerfout: ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Verbinding mislukt.';
+$PHPMAILER_LANG['smtp_error']           = 'SMTP-serverfout: ';
+$PHPMAILER_LANG['variable_set']         = 'Kan de volgende variabele niet instellen of resetten: ';
+$PHPMAILER_LANG['extension_missing']    = 'Extensie afwezig: ';
diff --git a/phpmailer/phpmailer/language/phpmailer.lang-pl.php b/phpmailer/phpmailer/language/phpmailer.lang-pl.php
new file mode 100644
index 00000000..3da0dee9
--- /dev/null
+++ b/phpmailer/phpmailer/language/phpmailer.lang-pl.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Polish PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'Błąd SMTP: Nie można przeprowadzić uwierzytelnienia.';
+$PHPMAILER_LANG['connect_host']         = 'Błąd SMTP: Nie można połączyć się z wybranym hostem.';
+$PHPMAILER_LANG['data_not_accepted']    = 'Błąd SMTP: Dane nie zostały przyjęte.';
+$PHPMAILER_LANG['empty_message']        = 'Wiadomość jest pusta.';
+$PHPMAILER_LANG['encoding']             = 'Nieznany sposób kodowania znaków: ';
+$PHPMAILER_LANG['execute']              = 'Nie można uruchomić: ';
+$PHPMAILER_LANG['file_access']          = 'Brak dostępu do pliku: ';
+$PHPMAILER_LANG['file_open']            = 'Nie można otworzyć pliku: ';
+$PHPMAILER_LANG['from_failed']          = 'Następujący adres Nadawcy jest nieprawidłowy: ';
+$PHPMAILER_LANG['instantiate']          = 'Nie można wywołać funkcji mail(). Sprawdź konfigurację serwera.';
+$PHPMAILER_LANG['invalid_address']      = 'Nie można wysłać wiadomości, '.
+    'następujący adres Odbiorcy jest nieprawidłowy: ';
+$PHPMAILER_LANG['provide_address']      = 'Należy podać prawidłowy adres email Odbiorcy.';
+$PHPMAILER_LANG['mailer_not_supported'] = 'Wybrana metoda wysyłki wiadomości nie jest obsługiwana.';
+$PHPMAILER_LANG['recipients_failed']    = 'Błąd SMTP: Następujący odbiorcy są nieprawidłowi: ';
+$PHPMAILER_LANG['signing']              = 'Błąd podpisywania wiadomości: ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Connect() zakończone niepowodzeniem.';
+$PHPMAILER_LANG['smtp_error']           = 'Błąd SMTP: ';
+$PHPMAILER_LANG['variable_set']         = 'Nie można ustawić lub zmodyfikować zmiennej: ';
+$PHPMAILER_LANG['extension_missing']    = 'Brakujące rozszerzenie: ';
diff --git a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-pt.php b/phpmailer/phpmailer/language/phpmailer.lang-pt.php
similarity index 99%
rename from phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-pt.php
rename to phpmailer/phpmailer/language/phpmailer.lang-pt.php
index f1ce946e..f365d5d0 100644
--- a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-pt.php
+++ b/phpmailer/phpmailer/language/phpmailer.lang-pt.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * Portuguese (European) PHPMailer language file: refer to English translation for definitive list
  * @package PHPMailer
diff --git a/phpmailer/phpmailer/language/phpmailer.lang-pt_br.php b/phpmailer/phpmailer/language/phpmailer.lang-pt_br.php
new file mode 100644
index 00000000..4ec10f77
--- /dev/null
+++ b/phpmailer/phpmailer/language/phpmailer.lang-pt_br.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Brazilian Portuguese PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ * @author Paulo Henrique Garcia <paulo@controllerweb.com.br>
+ * @author Lucas Guimarães <lucas@lucasguimaraes.com>
+ * @author Phelipe Alves <phelipealvesdesouza@gmail.com>
+ * @author Fabio Beneditto <fabiobeneditto@gmail.com>
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'Erro de SMTP: Não foi possível autenticar.';
+$PHPMAILER_LANG['connect_host']         = 'Erro de SMTP: Não foi possível conectar ao servidor SMTP.';
+$PHPMAILER_LANG['data_not_accepted']    = 'Erro de SMTP: Dados rejeitados.';
+$PHPMAILER_LANG['empty_message']        = 'Mensagem vazia';
+$PHPMAILER_LANG['encoding']             = 'Codificação desconhecida: ';
+$PHPMAILER_LANG['execute']              = 'Não foi possível executar: ';
+$PHPMAILER_LANG['file_access']          = 'Não foi possível acessar o arquivo: ';
+$PHPMAILER_LANG['file_open']            = 'Erro de Arquivo: Não foi possível abrir o arquivo: ';
+$PHPMAILER_LANG['from_failed']          = 'Os seguintes remetentes falharam: ';
+$PHPMAILER_LANG['instantiate']          = 'Não foi possível instanciar a função mail.';
+$PHPMAILER_LANG['invalid_address']      = 'Endereço de e-mail inválido: ';
+$PHPMAILER_LANG['mailer_not_supported'] = ' mailer não é suportado.';
+$PHPMAILER_LANG['provide_address']      = 'Você deve informar pelo menos um destinatário.';
+$PHPMAILER_LANG['recipients_failed']    = 'Erro de SMTP: Os seguintes destinatários falharam: ';
+$PHPMAILER_LANG['signing']              = 'Erro de Assinatura: ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Connect() falhou.';
+$PHPMAILER_LANG['smtp_error']           = 'Erro de servidor SMTP: ';
+$PHPMAILER_LANG['variable_set']         = 'Não foi possível definir ou redefinir a variável: ';
+$PHPMAILER_LANG['extension_missing']    = 'Extensão ausente: ';
diff --git a/phpmailer/phpmailer/language/phpmailer.lang-ro.php b/phpmailer/phpmailer/language/phpmailer.lang-ro.php
new file mode 100644
index 00000000..fa100eaa
--- /dev/null
+++ b/phpmailer/phpmailer/language/phpmailer.lang-ro.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Romanian PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ * @author Alex Florea <alecz.fia@gmail.com>
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'Eroare SMTP: Autentificarea a eșuat.';
+$PHPMAILER_LANG['connect_host']         = 'Eroare SMTP: Conectarea la serverul SMTP a eșuat.';
+$PHPMAILER_LANG['data_not_accepted']    = 'Eroare SMTP: Datele nu au fost acceptate.';
+$PHPMAILER_LANG['empty_message']        = 'Mesajul este gol.';
+$PHPMAILER_LANG['encoding']             = 'Encodare necunoscută: ';
+$PHPMAILER_LANG['execute']              = 'Nu se poate executa următoarea comandă:  ';
+$PHPMAILER_LANG['file_access']          = 'Nu se poate accesa următorul fișier: ';
+$PHPMAILER_LANG['file_open']            = 'Eroare fișier: Nu se poate deschide următorul fișier: ';
+$PHPMAILER_LANG['from_failed']          = 'Următoarele adrese From au dat eroare: ';
+$PHPMAILER_LANG['instantiate']          = 'Funcția mail nu a putut fi inițializată.';
+$PHPMAILER_LANG['invalid_address']      = 'Adresa de email nu este validă: ';
+$PHPMAILER_LANG['mailer_not_supported'] = ' mailer nu este suportat.';
+$PHPMAILER_LANG['provide_address']      = 'Trebuie să adăugați cel puțin o adresă de email.';
+$PHPMAILER_LANG['recipients_failed']    = 'Eroare SMTP: Următoarele adrese de email au eșuat: ';
+$PHPMAILER_LANG['signing']              = 'A aparut o problemă la semnarea emailului. ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'Conectarea la serverul SMTP a eșuat.';
+$PHPMAILER_LANG['smtp_error']           = 'Eroare server SMTP: ';
+$PHPMAILER_LANG['variable_set']         = 'Nu se poate seta/reseta variabila. ';
+$PHPMAILER_LANG['extension_missing']    = 'Lipsește extensia: ';
diff --git a/phpmailer/phpmailer/language/phpmailer.lang-rs.php b/phpmailer/phpmailer/language/phpmailer.lang-rs.php
new file mode 100644
index 00000000..0502f021
--- /dev/null
+++ b/phpmailer/phpmailer/language/phpmailer.lang-rs.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Serbian PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ * @author Александар Јевремовић <ajevremovic@gmail.com>
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'SMTP грешка: аутентификација није успела.';
+$PHPMAILER_LANG['connect_host']         = 'SMTP грешка: није могуће повезивање са SMTP сервером.';
+$PHPMAILER_LANG['data_not_accepted']    = 'SMTP грешка: подаци нису прихваћени.';
+$PHPMAILER_LANG['empty_message']        = 'Садржај поруке је празан.';
+$PHPMAILER_LANG['encoding']             = 'Непознато кодовање: ';
+$PHPMAILER_LANG['execute']              = 'Није могуће извршити наредбу: ';
+$PHPMAILER_LANG['file_access']          = 'Није могуће приступити датотеци: ';
+$PHPMAILER_LANG['file_open']            = 'Није могуће отворити датотеку: ';
+$PHPMAILER_LANG['from_failed']          = 'SMTP грешка: слање са следећих адреса није успело: ';
+$PHPMAILER_LANG['recipients_failed']    = 'SMTP грешка: слање на следеће адресе није успело: ';
+$PHPMAILER_LANG['instantiate']          = 'Није могуће покренути mail функцију.';
+$PHPMAILER_LANG['invalid_address']      = 'Порука није послата због неисправне адресе: ';
+$PHPMAILER_LANG['mailer_not_supported'] = ' мејлер није подржан.';
+$PHPMAILER_LANG['provide_address']      = 'Потребно је задати најмање једну адресу.';
+$PHPMAILER_LANG['signing']              = 'Грешка приликом пријављивања: ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'Повезивање са SMTP сервером није успело.';
+$PHPMAILER_LANG['smtp_error']           = 'Грешка SMTP сервера: ';
+$PHPMAILER_LANG['variable_set']         = 'Није могуће задати променљиву, нити је вратити уназад: ';
+$PHPMAILER_LANG['extension_missing']    = 'Недостаје проширење: ';
diff --git a/phpmailer/phpmailer/language/phpmailer.lang-ru.php b/phpmailer/phpmailer/language/phpmailer.lang-ru.php
new file mode 100644
index 00000000..4066f6b4
--- /dev/null
+++ b/phpmailer/phpmailer/language/phpmailer.lang-ru.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Russian PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ * @author Alexey Chumakov <alex@chumakov.ru>
+ * @author Foster Snowhill <i18n@forstwoof.ru>
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'Ошибка SMTP: ошибка авторизации.';
+$PHPMAILER_LANG['connect_host']         = 'Ошибка SMTP: не удается подключиться к серверу SMTP.';
+$PHPMAILER_LANG['data_not_accepted']    = 'Ошибка SMTP: данные не приняты.';
+$PHPMAILER_LANG['encoding']             = 'Неизвестный вид кодировки: ';
+$PHPMAILER_LANG['execute']              = 'Невозможно выполнить команду: ';
+$PHPMAILER_LANG['file_access']          = 'Нет доступа к файлу: ';
+$PHPMAILER_LANG['file_open']            = 'Файловая ошибка: не удается открыть файл: ';
+$PHPMAILER_LANG['from_failed']          = 'Неверный адрес отправителя: ';
+$PHPMAILER_LANG['instantiate']          = 'Невозможно запустить функцию mail.';
+$PHPMAILER_LANG['provide_address']      = 'Пожалуйста, введите хотя бы один адрес e-mail получателя.';
+$PHPMAILER_LANG['mailer_not_supported'] = ' — почтовый сервер не поддерживается.';
+$PHPMAILER_LANG['recipients_failed']    = 'Ошибка SMTP: отправка по следующим адресам получателей не удалась: ';
+$PHPMAILER_LANG['empty_message']        = 'Пустое сообщение';
+$PHPMAILER_LANG['invalid_address']      = 'Не отослано, неправильный формат email адреса: ';
+$PHPMAILER_LANG['signing']              = 'Ошибка подписи: ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'Ошибка соединения с SMTP-сервером';
+$PHPMAILER_LANG['smtp_error']           = 'Ошибка SMTP-сервера: ';
+$PHPMAILER_LANG['variable_set']         = 'Невозможно установить или переустановить переменную: ';
+$PHPMAILER_LANG['extension_missing']    = 'Расширение отсутствует: ';
diff --git a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-sk.php b/phpmailer/phpmailer/language/phpmailer.lang-sk.php
similarity index 86%
rename from phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-sk.php
rename to phpmailer/phpmailer/language/phpmailer.lang-sk.php
index 028f5bc4..a38f4e52 100644
--- a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-sk.php
+++ b/phpmailer/phpmailer/language/phpmailer.lang-sk.php
@@ -1,10 +1,8 @@
 <?php
-
 /**
  * Slovak PHPMailer language file: refer to English translation for definitive list
  * @package PHPMailer
  * @author Michal Tinka <michaltinka@gmail.com>
- * @author Peter Orlický <pcmanik91@gmail.com>
  */
 
 $PHPMAILER_LANG['authenticate']         = 'SMTP Error: Chyba autentifikácie.';
@@ -18,8 +16,6 @@ $PHPMAILER_LANG['file_open']            = 'File Error: Súbor sa otvoriť pre č
 $PHPMAILER_LANG['from_failed']          = 'Následujúca adresa From je nesprávna: ';
 $PHPMAILER_LANG['instantiate']          = 'Nedá sa vytvoriť inštancia emailovej funkcie.';
 $PHPMAILER_LANG['invalid_address']      = 'Neodoslané, emailová adresa je nesprávna: ';
-$PHPMAILER_LANG['invalid_hostentry']    = 'Záznam hostiteľa je nesprávny: ';
-$PHPMAILER_LANG['invalid_host']         = 'Hostiteľ je nesprávny: ';
 $PHPMAILER_LANG['mailer_not_supported'] = ' emailový klient nieje podporovaný.';
 $PHPMAILER_LANG['provide_address']      = 'Musíte zadať aspoň jednu emailovú adresu príjemcu.';
 $PHPMAILER_LANG['recipients_failed']    = 'SMTP Error: Adresy príjemcov niesu správne ';
@@ -27,4 +23,4 @@ $PHPMAILER_LANG['signing']              = 'Chyba prihlasovania: ';
 $PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Connect() zlyhalo.';
 $PHPMAILER_LANG['smtp_error']           = 'SMTP chyba serveru: ';
 $PHPMAILER_LANG['variable_set']         = 'Nemožno nastaviť alebo resetovať premennú: ';
-$PHPMAILER_LANG['extension_missing']    = 'Chýba rozšírenie: ';
+//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';
diff --git a/phpmailer/phpmailer/language/phpmailer.lang-sl.php b/phpmailer/phpmailer/language/phpmailer.lang-sl.php
new file mode 100644
index 00000000..54c95725
--- /dev/null
+++ b/phpmailer/phpmailer/language/phpmailer.lang-sl.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Slovene PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ * @author Klemen Tušar <techouse@gmail.com>
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'SMTP napaka: Avtentikacija ni uspela.';
+$PHPMAILER_LANG['connect_host']         = 'SMTP napaka: Ne morem vzpostaviti povezave s SMTP gostiteljem.';
+$PHPMAILER_LANG['data_not_accepted']    = 'SMTP napaka: Strežnik zavrača podatke.';
+$PHPMAILER_LANG['empty_message']        = 'E-poštno sporočilo nima vsebine.';
+$PHPMAILER_LANG['encoding']             = 'Nepoznan tip kodiranja: ';
+$PHPMAILER_LANG['execute']              = 'Operacija ni uspela: ';
+$PHPMAILER_LANG['file_access']          = 'Nimam dostopa do datoteke: ';
+$PHPMAILER_LANG['file_open']            = 'Ne morem odpreti datoteke: ';
+$PHPMAILER_LANG['from_failed']          = 'Neveljaven e-naslov pošiljatelja: ';
+$PHPMAILER_LANG['instantiate']          = 'Ne morem inicializirati mail funkcije.';
+$PHPMAILER_LANG['invalid_address']      = 'E-poštno sporočilo ni bilo poslano. E-naslov je neveljaven: ';
+$PHPMAILER_LANG['mailer_not_supported'] = ' mailer ni podprt.';
+$PHPMAILER_LANG['provide_address']      = 'Prosim vnesite vsaj enega naslovnika.';
+$PHPMAILER_LANG['recipients_failed']    = 'SMTP napaka: Sledeči naslovniki so neveljavni: ';
+$PHPMAILER_LANG['signing']              = 'Napaka pri podpisovanju: ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'Ne morem vzpostaviti povezave s SMTP strežnikom.';
+$PHPMAILER_LANG['smtp_error']           = 'Napaka SMTP strežnika: ';
+$PHPMAILER_LANG['variable_set']         = 'Ne morem nastaviti oz. ponastaviti spremenljivke: ';
+//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';
diff --git a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-sv.php b/phpmailer/phpmailer/language/phpmailer.lang-sv.php
similarity index 92%
rename from phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-sv.php
rename to phpmailer/phpmailer/language/phpmailer.lang-sv.php
index 9872c192..4408e63e 100644
--- a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-sv.php
+++ b/phpmailer/phpmailer/language/phpmailer.lang-sv.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * Swedish PHPMailer language file: refer to English translation for definitive list
  * @package PHPMailer
@@ -20,8 +19,8 @@ $PHPMAILER_LANG['invalid_address']      = 'Felaktig adress: ';
 $PHPMAILER_LANG['provide_address']      = 'Du måste ange minst en mottagares e-postadress.';
 $PHPMAILER_LANG['mailer_not_supported'] = ' mailer stöds inte.';
 $PHPMAILER_LANG['recipients_failed']    = 'SMTP fel: Följande mottagare är felaktig: ';
-$PHPMAILER_LANG['signing']              = 'Signeringsfel: ';
+$PHPMAILER_LANG['signing']              = 'Signerings fel: ';
 $PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Connect() misslyckades.';
-$PHPMAILER_LANG['smtp_error']           = 'SMTP serverfel: ';
+$PHPMAILER_LANG['smtp_error']           = 'SMTP server fel: ';
 $PHPMAILER_LANG['variable_set']         = 'Kunde inte definiera eller återställa variabel: ';
 $PHPMAILER_LANG['extension_missing']    = 'Tillägg ej tillgängligt: ';
diff --git a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-tr.php b/phpmailer/phpmailer/language/phpmailer.lang-tr.php
similarity index 99%
rename from phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-tr.php
rename to phpmailer/phpmailer/language/phpmailer.lang-tr.php
index f938f802..cfe8eaae 100644
--- a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-tr.php
+++ b/phpmailer/phpmailer/language/phpmailer.lang-tr.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * Turkish PHPMailer language file: refer to English translation for definitive list
  * @package PHPMailer
diff --git a/phpmailer/phpmailer/language/phpmailer.lang-uk.php b/phpmailer/phpmailer/language/phpmailer.lang-uk.php
new file mode 100644
index 00000000..9a7b3467
--- /dev/null
+++ b/phpmailer/phpmailer/language/phpmailer.lang-uk.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Ukrainian PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ * @author Yuriy Rudyy <yrudyy@prs.net.ua>
+ * @fixed by Boris Yurchenko <boris@yurchenko.pp.ua>
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'Помилка SMTP: помилка авторизації.';
+$PHPMAILER_LANG['connect_host']         = 'Помилка SMTP: не вдається під\'єднатися до серверу SMTP.';
+$PHPMAILER_LANG['data_not_accepted']    = 'Помилка SMTP: дані не прийняті.';
+$PHPMAILER_LANG['encoding']             = 'Невідомий тип кодування: ';
+$PHPMAILER_LANG['execute']              = 'Неможливо виконати команду: ';
+$PHPMAILER_LANG['file_access']          = 'Немає доступу до файлу: ';
+$PHPMAILER_LANG['file_open']            = 'Помилка файлової системи: не вдається відкрити файл: ';
+$PHPMAILER_LANG['from_failed']          = 'Невірна адреса відправника: ';
+$PHPMAILER_LANG['instantiate']          = 'Неможливо запустити функцію mail.';
+$PHPMAILER_LANG['provide_address']      = 'Будь-ласка, введіть хоча б одну адресу e-mail отримувача.';
+$PHPMAILER_LANG['mailer_not_supported'] = ' - поштовий сервер не підтримується.';
+$PHPMAILER_LANG['recipients_failed']    = 'Помилка SMTP: відправлення наступним отримувачам не вдалося: ';
+$PHPMAILER_LANG['empty_message']        = 'Пусте тіло повідомлення';
+$PHPMAILER_LANG['invalid_address']      = 'Не відправлено, невірний формат адреси e-mail: ';
+$PHPMAILER_LANG['signing']              = 'Помилка підпису: ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'Помилка з\'єднання із SMTP-сервером';
+$PHPMAILER_LANG['smtp_error']           = 'Помилка SMTP-сервера: ';
+$PHPMAILER_LANG['variable_set']         = 'Неможливо встановити або перевстановити змінну: ';
+//$PHPMAILER_LANG['extension_missing']    = 'Extension missing: ';
diff --git a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-vi.php b/phpmailer/phpmailer/language/phpmailer.lang-vi.php
similarity index 99%
rename from phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-vi.php
rename to phpmailer/phpmailer/language/phpmailer.lang-vi.php
index d65576e2..c60dadeb 100644
--- a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-vi.php
+++ b/phpmailer/phpmailer/language/phpmailer.lang-vi.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * Vietnamese (Tiếng Việt) PHPMailer language file: refer to English translation for definitive list.
  * @package PHPMailer
diff --git a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-zh.php b/phpmailer/phpmailer/language/phpmailer.lang-zh.php
similarity index 99%
rename from phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-zh.php
rename to phpmailer/phpmailer/language/phpmailer.lang-zh.php
index 35e4e700..3e9e358c 100644
--- a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-zh.php
+++ b/phpmailer/phpmailer/language/phpmailer.lang-zh.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * Traditional Chinese PHPMailer language file: refer to English translation for definitive list
  * @package PHPMailer
diff --git a/phpmailer/phpmailer/language/phpmailer.lang-zh_cn.php b/phpmailer/phpmailer/language/phpmailer.lang-zh_cn.php
new file mode 100644
index 00000000..37537802
--- /dev/null
+++ b/phpmailer/phpmailer/language/phpmailer.lang-zh_cn.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Simplified Chinese PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ * @author liqwei <liqwei@liqwei.com>
+ * @author young <masxy@foxmail.com>
+ * @author Teddysun <i@teddysun.com>
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'SMTP 错误：登录失败。';
+$PHPMAILER_LANG['connect_host']         = 'SMTP 错误：无法连接到 SMTP 主机。';
+$PHPMAILER_LANG['data_not_accepted']    = 'SMTP 错误：数据不被接受。';
+$PHPMAILER_LANG['empty_message']        = '邮件正文为空。';
+$PHPMAILER_LANG['encoding']             = '未知编码：';
+$PHPMAILER_LANG['execute']              = '无法执行：';
+$PHPMAILER_LANG['file_access']          = '无法访问文件：';
+$PHPMAILER_LANG['file_open']            = '文件错误：无法打开文件：';
+$PHPMAILER_LANG['from_failed']          = '发送地址错误：';
+$PHPMAILER_LANG['instantiate']          = '未知函数调用。';
+$PHPMAILER_LANG['invalid_address']      = '发送失败，电子邮箱地址是无效的：';
+$PHPMAILER_LANG['mailer_not_supported'] = '发信客户端不被支持。';
+$PHPMAILER_LANG['provide_address']      = '必须提供至少一个收件人地址。';
+$PHPMAILER_LANG['recipients_failed']    = 'SMTP 错误：收件人地址错误：';
+$PHPMAILER_LANG['signing']              = '登录失败：';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP服务器连接失败。';
+$PHPMAILER_LANG['smtp_error']           = 'SMTP服务器出错：';
+$PHPMAILER_LANG['variable_set']         = '无法设置或重置变量：';
+$PHPMAILER_LANG['extension_missing']    = '丢失模块 Extension：';
diff --git a/phpmailer/vendor/phpmailer/phpmailer/src/Exception.php b/phpmailer/phpmailer/src/Exception.php
similarity index 87%
rename from phpmailer/vendor/phpmailer/phpmailer/src/Exception.php
rename to phpmailer/phpmailer/src/Exception.php
index 52eaf951..9a05dec3 100644
--- a/phpmailer/vendor/phpmailer/phpmailer/src/Exception.php
+++ b/phpmailer/phpmailer/src/Exception.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * PHPMailer Exception class.
  * PHP Version 5.5.
@@ -10,7 +9,7 @@
  * @author    Jim Jagielski (jimjag) <jimjag@gmail.com>
  * @author    Andy Prevost (codeworxtech) <codeworxtech@users.sourceforge.net>
  * @author    Brent R. Matzelle (original founder)
- * @copyright 2012 - 2020 Marcus Bointon
+ * @copyright 2012 - 2017 Marcus Bointon
  * @copyright 2010 - 2012 Jim Jagielski
  * @copyright 2004 - 2009 Andy Prevost
  * @license   http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
@@ -24,7 +23,7 @@ namespace PHPMailer\PHPMailer;
 /**
  * PHPMailer exception handler.
  *
- * @author Marcus Bointon <phpmailer@synchromedia.co.uk>
+ * @author  Marcus Bointon <phpmailer@synchromedia.co.uk>
  */
 class Exception extends \Exception
 {
@@ -35,6 +34,6 @@ class Exception extends \Exception
      */
     public function errorMessage()
     {
-        return '<strong>' . htmlspecialchars($this->getMessage(), ENT_COMPAT | ENT_HTML401) . "</strong><br />\n";
+        return '<strong>' . htmlspecialchars($this->getMessage()) . "</strong><br />\n";
     }
 }
diff --git a/phpmailer/vendor/phpmailer/phpmailer/src/OAuth.php b/phpmailer/phpmailer/src/OAuth.php
similarity index 94%
rename from phpmailer/vendor/phpmailer/phpmailer/src/OAuth.php
rename to phpmailer/phpmailer/src/OAuth.php
index c1d5b776..0bce7e34 100644
--- a/phpmailer/vendor/phpmailer/phpmailer/src/OAuth.php
+++ b/phpmailer/phpmailer/src/OAuth.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * PHPMailer - PHP email creation and transport class.
  * PHP Version 5.5.
@@ -10,7 +9,7 @@
  * @author    Jim Jagielski (jimjag) <jimjag@gmail.com>
  * @author    Andy Prevost (codeworxtech) <codeworxtech@users.sourceforge.net>
  * @author    Brent R. Matzelle (original founder)
- * @copyright 2012 - 2020 Marcus Bointon
+ * @copyright 2012 - 2015 Marcus Bointon
  * @copyright 2010 - 2012 Jim Jagielski
  * @copyright 2004 - 2009 Andy Prevost
  * @license   http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
@@ -33,7 +32,7 @@ use League\OAuth2\Client\Token\AccessToken;
  *
  * @author  Marcus Bointon (Synchro/coolbru) <phpmailer@synchromedia.co.uk>
  */
-class OAuth implements OAuthTokenProvider
+class OAuth
 {
     /**
      * An instance of the League OAuth Client Provider.
@@ -123,8 +122,8 @@ class OAuth implements OAuthTokenProvider
      */
     public function getOauth64()
     {
-        //Get a new token if it's not available or has expired
-        if (null === $this->oauthToken || $this->oauthToken->hasExpired()) {
+        // Get a new token if it's not available or has expired
+        if (null === $this->oauthToken or $this->oauthToken->hasExpired()) {
             $this->oauthToken = $this->getToken();
         }
 
diff --git a/phpmailer/phpmailer/src/PHPMailer.php b/phpmailer/phpmailer/src/PHPMailer.php
new file mode 100644
index 00000000..528828cd
--- /dev/null
+++ b/phpmailer/phpmailer/src/PHPMailer.php
@@ -0,0 +1,4436 @@
+<?php
+/**
+ * PHPMailer - PHP email creation and transport class.
+ * PHP Version 5.5.
+ *
+ * @see       https://github.com/PHPMailer/PHPMailer/ The PHPMailer GitHub project
+ *
+ * @author    Marcus Bointon (Synchro/coolbru) <phpmailer@synchromedia.co.uk>
+ * @author    Jim Jagielski (jimjag) <jimjag@gmail.com>
+ * @author    Andy Prevost (codeworxtech) <codeworxtech@users.sourceforge.net>
+ * @author    Brent R. Matzelle (original founder)
+ * @copyright 2012 - 2017 Marcus Bointon
+ * @copyright 2010 - 2012 Jim Jagielski
+ * @copyright 2004 - 2009 Andy Prevost
+ * @license   http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
+ * @note      This program is distributed in the hope that it will be useful - WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.
+ */
+
+namespace PHPMailer\PHPMailer;
+
+/**
+ * PHPMailer - PHP email creation and transport class.
+ *
+ * @author  Marcus Bointon (Synchro/coolbru) <phpmailer@synchromedia.co.uk>
+ * @author  Jim Jagielski (jimjag) <jimjag@gmail.com>
+ * @author  Andy Prevost (codeworxtech) <codeworxtech@users.sourceforge.net>
+ * @author  Brent R. Matzelle (original founder)
+ */
+class PHPMailer
+{
+    const CHARSET_ISO88591 = 'iso-8859-1';
+    const CHARSET_UTF8 = 'utf-8';
+
+    const CONTENT_TYPE_PLAINTEXT = 'text/plain';
+    const CONTENT_TYPE_TEXT_CALENDAR = 'text/calendar';
+    const CONTENT_TYPE_TEXT_HTML = 'text/html';
+    const CONTENT_TYPE_MULTIPART_ALTERNATIVE = 'multipart/alternative';
+    const CONTENT_TYPE_MULTIPART_MIXED = 'multipart/mixed';
+    const CONTENT_TYPE_MULTIPART_RELATED = 'multipart/related';
+
+    const ENCODING_7BIT = '7bit';
+    const ENCODING_8BIT = '8bit';
+    const ENCODING_BASE64 = 'base64';
+    const ENCODING_BINARY = 'binary';
+    const ENCODING_QUOTED_PRINTABLE = 'quoted-printable';
+
+    /**
+     * Email priority.
+     * Options: null (default), 1 = High, 3 = Normal, 5 = low.
+     * When null, the header is not set at all.
+     *
+     * @var int
+     */
+    public $Priority;
+
+    /**
+     * The character set of the message.
+     *
+     * @var string
+     */
+    public $CharSet = self::CHARSET_ISO88591;
+
+    /**
+     * The MIME Content-type of the message.
+     *
+     * @var string
+     */
+    public $ContentType = self::CONTENT_TYPE_PLAINTEXT;
+
+    /**
+     * The message encoding.
+     * Options: "8bit", "7bit", "binary", "base64", and "quoted-printable".
+     *
+     * @var string
+     */
+    public $Encoding = self::ENCODING_8BIT;
+
+    /**
+     * Holds the most recent mailer error message.
+     *
+     * @var string
+     */
+    public $ErrorInfo = '';
+
+    /**
+     * The From email address for the message.
+     *
+     * @var string
+     */
+    public $From = 'root@localhost';
+
+    /**
+     * The From name of the message.
+     *
+     * @var string
+     */
+    public $FromName = 'Root User';
+
+    /**
+     * The envelope sender of the message.
+     * This will usually be turned into a Return-Path header by the receiver,
+     * and is the address that bounces will be sent to.
+     * If not empty, will be passed via `-f` to sendmail or as the 'MAIL FROM' value over SMTP.
+     *
+     * @var string
+     */
+    public $Sender = '';
+
+    /**
+     * The Subject of the message.
+     *
+     * @var string
+     */
+    public $Subject = '';
+
+    /**
+     * An HTML or plain text message body.
+     * If HTML then call isHTML(true).
+     *
+     * @var string
+     */
+    public $Body = '';
+
+    /**
+     * The plain-text message body.
+     * This body can be read by mail clients that do not have HTML email
+     * capability such as mutt & Eudora.
+     * Clients that can read HTML will view the normal Body.
+     *
+     * @var string
+     */
+    public $AltBody = '';
+
+    /**
+     * An iCal message part body.
+     * Only supported in simple alt or alt_inline message types
+     * To generate iCal event structures, use classes like EasyPeasyICS or iCalcreator.
+     *
+     * @see http://sprain.ch/blog/downloads/php-class-easypeasyics-create-ical-files-with-php/
+     * @see http://kigkonsult.se/iCalcreator/
+     *
+     * @var string
+     */
+    public $Ical = '';
+
+    /**
+     * The complete compiled MIME message body.
+     *
+     * @var string
+     */
+    protected $MIMEBody = '';
+
+    /**
+     * The complete compiled MIME message headers.
+     *
+     * @var string
+     */
+    protected $MIMEHeader = '';
+
+    /**
+     * Extra headers that createHeader() doesn't fold in.
+     *
+     * @var string
+     */
+    protected $mailHeader = '';
+
+    /**
+     * Word-wrap the message body to this number of chars.
+     * Set to 0 to not wrap. A useful value here is 78, for RFC2822 section 2.1.1 compliance.
+     *
+     * @see static::STD_LINE_LENGTH
+     *
+     * @var int
+     */
+    public $WordWrap = 0;
+
+    /**
+     * Which method to use to send mail.
+     * Options: "mail", "sendmail", or "smtp".
+     *
+     * @var string
+     */
+    public $Mailer = 'mail';
+
+    /**
+     * The path to the sendmail program.
+     *
+     * @var string
+     */
+    public $Sendmail = '/usr/sbin/sendmail';
+
+    /**
+     * Whether mail() uses a fully sendmail-compatible MTA.
+     * One which supports sendmail's "-oi -f" options.
+     *
+     * @var bool
+     */
+    public $UseSendmailOptions = true;
+
+    /**
+     * The email address that a reading confirmation should be sent to, also known as read receipt.
+     *
+     * @var string
+     */
+    public $ConfirmReadingTo = '';
+
+    /**
+     * The hostname to use in the Message-ID header and as default HELO string.
+     * If empty, PHPMailer attempts to find one with, in order,
+     * $_SERVER['SERVER_NAME'], gethostname(), php_uname('n'), or the value
+     * 'localhost.localdomain'.
+     *
+     * @var string
+     */
+    public $Hostname = '';
+
+    /**
+     * An ID to be used in the Message-ID header.
+     * If empty, a unique id will be generated.
+     * You can set your own, but it must be in the format "<id@domain>",
+     * as defined in RFC5322 section 3.6.4 or it will be ignored.
+     *
+     * @see https://tools.ietf.org/html/rfc5322#section-3.6.4
+     *
+     * @var string
+     */
+    public $MessageID = '';
+
+    /**
+     * The message Date to be used in the Date header.
+     * If empty, the current date will be added.
+     *
+     * @var string
+     */
+    public $MessageDate = '';
+
+    /**
+     * SMTP hosts.
+     * Either a single hostname or multiple semicolon-delimited hostnames.
+     * You can also specify a different port
+     * for each host by using this format: [hostname:port]
+     * (e.g. "smtp1.example.com:25;smtp2.example.com").
+     * You can also specify encryption type, for example:
+     * (e.g. "tls://smtp1.example.com:587;ssl://smtp2.example.com:465").
+     * Hosts will be tried in order.
+     *
+     * @var string
+     */
+    public $Host = 'localhost';
+
+    /**
+     * The default SMTP server port.
+     *
+     * @var int
+     */
+    public $Port = 25;
+
+    /**
+     * The SMTP HELO of the message.
+     * Default is $Hostname. If $Hostname is empty, PHPMailer attempts to find
+     * one with the same method described above for $Hostname.
+     *
+     * @see PHPMailer::$Hostname
+     *
+     * @var string
+     */
+    public $Helo = '';
+
+    /**
+     * What kind of encryption to use on the SMTP connection.
+     * Options: '', 'ssl' or 'tls'.
+     *
+     * @var string
+     */
+    public $SMTPSecure = '';
+
+    /**
+     * Whether to enable TLS encryption automatically if a server supports it,
+     * even if `SMTPSecure` is not set to 'tls'.
+     * Be aware that in PHP >= 5.6 this requires that the server's certificates are valid.
+     *
+     * @var bool
+     */
+    public $SMTPAutoTLS = true;
+
+    /**
+     * Whether to use SMTP authentication.
+     * Uses the Username and Password properties.
+     *
+     * @see PHPMailer::$Username
+     * @see PHPMailer::$Password
+     *
+     * @var bool
+     */
+    public $SMTPAuth = false;
+
+    /**
+     * Options array passed to stream_context_create when connecting via SMTP.
+     *
+     * @var array
+     */
+    public $SMTPOptions = [];
+
+    /**
+     * SMTP username.
+     *
+     * @var string
+     */
+    public $Username = '';
+
+    /**
+     * SMTP password.
+     *
+     * @var string
+     */
+    public $Password = '';
+
+    /**
+     * SMTP auth type.
+     * Options are CRAM-MD5, LOGIN, PLAIN, XOAUTH2, attempted in that order if not specified.
+     *
+     * @var string
+     */
+    public $AuthType = '';
+
+    /**
+     * An instance of the PHPMailer OAuth class.
+     *
+     * @var OAuth
+     */
+    protected $oauth;
+
+    /**
+     * The SMTP server timeout in seconds.
+     * Default of 5 minutes (300sec) is from RFC2821 section 4.5.3.2.
+     *
+     * @var int
+     */
+    public $Timeout = 300;
+
+    /**
+     * SMTP class debug output mode.
+     * Debug output level.
+     * Options:
+     * * `0` No output
+     * * `1` Commands
+     * * `2` Data and commands
+     * * `3` As 2 plus connection status
+     * * `4` Low-level data output.
+     *
+     * @see SMTP::$do_debug
+     *
+     * @var int
+     */
+    public $SMTPDebug = 0;
+
+    /**
+     * How to handle debug output.
+     * Options:
+     * * `echo` Output plain-text as-is, appropriate for CLI
+     * * `html` Output escaped, line breaks converted to `<br>`, appropriate for browser output
+     * * `error_log` Output to error log as configured in php.ini
+     * By default PHPMailer will use `echo` if run from a `cli` or `cli-server` SAPI, `html` otherwise.
+     * Alternatively, you can provide a callable expecting two params: a message string and the debug level:
+     *
+     * ```php
+     * $mail->Debugoutput = function($str, $level) {echo "debug level $level; message: $str";};
+     * ```
+     *
+     * Alternatively, you can pass in an instance of a PSR-3 compatible logger, though only `debug`
+     * level output is used:
+     *
+     * ```php
+     * $mail->Debugoutput = new myPsr3Logger;
+     * ```
+     *
+     * @see SMTP::$Debugoutput
+     *
+     * @var string|callable|\Psr\Log\LoggerInterface
+     */
+    public $Debugoutput = 'echo';
+
+    /**
+     * Whether to keep SMTP connection open after each message.
+     * If this is set to true then to close the connection
+     * requires an explicit call to smtpClose().
+     *
+     * @var bool
+     */
+    public $SMTPKeepAlive = false;
+
+    /**
+     * Whether to split multiple to addresses into multiple messages
+     * or send them all in one message.
+     * Only supported in `mail` and `sendmail` transports, not in SMTP.
+     *
+     * @var bool
+     */
+    public $SingleTo = false;
+
+    /**
+     * Storage for addresses when SingleTo is enabled.
+     *
+     * @var array
+     */
+    protected $SingleToArray = [];
+
+    /**
+     * Whether to generate VERP addresses on send.
+     * Only applicable when sending via SMTP.
+     *
+     * @see https://en.wikipedia.org/wiki/Variable_envelope_return_path
+     * @see http://www.postfix.org/VERP_README.html Postfix VERP info
+     *
+     * @var bool
+     */
+    public $do_verp = false;
+
+    /**
+     * Whether to allow sending messages with an empty body.
+     *
+     * @var bool
+     */
+    public $AllowEmpty = false;
+
+    /**
+     * DKIM selector.
+     *
+     * @var string
+     */
+    public $DKIM_selector = '';
+
+    /**
+     * DKIM Identity.
+     * Usually the email address used as the source of the email.
+     *
+     * @var string
+     */
+    public $DKIM_identity = '';
+
+    /**
+     * DKIM passphrase.
+     * Used if your key is encrypted.
+     *
+     * @var string
+     */
+    public $DKIM_passphrase = '';
+
+    /**
+     * DKIM signing domain name.
+     *
+     * @example 'example.com'
+     *
+     * @var string
+     */
+    public $DKIM_domain = '';
+
+    /**
+     * DKIM private key file path.
+     *
+     * @var string
+     */
+    public $DKIM_private = '';
+
+    /**
+     * DKIM private key string.
+     *
+     * If set, takes precedence over `$DKIM_private`.
+     *
+     * @var string
+     */
+    public $DKIM_private_string = '';
+
+    /**
+     * Callback Action function name.
+     *
+     * The function that handles the result of the send email action.
+     * It is called out by send() for each email sent.
+     *
+     * Value can be any php callable: http://www.php.net/is_callable
+     *
+     * Parameters:
+     *   bool $result        result of the send action
+     *   array   $to            email addresses of the recipients
+     *   array   $cc            cc email addresses
+     *   array   $bcc           bcc email addresses
+     *   string  $subject       the subject
+     *   string  $body          the email body
+     *   string  $from          email address of sender
+     *   string  $extra         extra information of possible use
+     *                          "smtp_transaction_id' => last smtp transaction id
+     *
+     * @var string
+     */
+    public $action_function = '';
+
+    /**
+     * What to put in the X-Mailer header.
+     * Options: An empty string for PHPMailer default, whitespace for none, or a string to use.
+     *
+     * @var string
+     */
+    public $XMailer = '';
+
+    /**
+     * Which validator to use by default when validating email addresses.
+     * May be a callable to inject your own validator, but there are several built-in validators.
+     * The default validator uses PHP's FILTER_VALIDATE_EMAIL filter_var option.
+     *
+     * @see PHPMailer::validateAddress()
+     *
+     * @var string|callable
+     */
+    public static $validator = 'php';
+
+    /**
+     * An instance of the SMTP sender class.
+     *
+     * @var SMTP
+     */
+    protected $smtp;
+
+    /**
+     * The array of 'to' names and addresses.
+     *
+     * @var array
+     */
+    protected $to = [];
+
+    /**
+     * The array of 'cc' names and addresses.
+     *
+     * @var array
+     */
+    protected $cc = [];
+
+    /**
+     * The array of 'bcc' names and addresses.
+     *
+     * @var array
+     */
+    protected $bcc = [];
+
+    /**
+     * The array of reply-to names and addresses.
+     *
+     * @var array
+     */
+    protected $ReplyTo = [];
+
+    /**
+     * An array of all kinds of addresses.
+     * Includes all of $to, $cc, $bcc.
+     *
+     * @see PHPMailer::$to
+     * @see PHPMailer::$cc
+     * @see PHPMailer::$bcc
+     *
+     * @var array
+     */
+    protected $all_recipients = [];
+
+    /**
+     * An array of names and addresses queued for validation.
+     * In send(), valid and non duplicate entries are moved to $all_recipients
+     * and one of $to, $cc, or $bcc.
+     * This array is used only for addresses with IDN.
+     *
+     * @see PHPMailer::$to
+     * @see PHPMailer::$cc
+     * @see PHPMailer::$bcc
+     * @see PHPMailer::$all_recipients
+     *
+     * @var array
+     */
+    protected $RecipientsQueue = [];
+
+    /**
+     * An array of reply-to names and addresses queued for validation.
+     * In send(), valid and non duplicate entries are moved to $ReplyTo.
+     * This array is used only for addresses with IDN.
+     *
+     * @see PHPMailer::$ReplyTo
+     *
+     * @var array
+     */
+    protected $ReplyToQueue = [];
+
+    /**
+     * The array of attachments.
+     *
+     * @var array
+     */
+    protected $attachment = [];
+
+    /**
+     * The array of custom headers.
+     *
+     * @var array
+     */
+    protected $CustomHeader = [];
+
+    /**
+     * The most recent Message-ID (including angular brackets).
+     *
+     * @var string
+     */
+    protected $lastMessageID = '';
+
+    /**
+     * The message's MIME type.
+     *
+     * @var string
+     */
+    protected $message_type = '';
+
+    /**
+     * The array of MIME boundary strings.
+     *
+     * @var array
+     */
+    protected $boundary = [];
+
+    /**
+     * The array of available languages.
+     *
+     * @var array
+     */
+    protected $language = [];
+
+    /**
+     * The number of errors encountered.
+     *
+     * @var int
+     */
+    protected $error_count = 0;
+
+    /**
+     * The S/MIME certificate file path.
+     *
+     * @var string
+     */
+    protected $sign_cert_file = '';
+
+    /**
+     * The S/MIME key file path.
+     *
+     * @var string
+     */
+    protected $sign_key_file = '';
+
+    /**
+     * The optional S/MIME extra certificates ("CA Chain") file path.
+     *
+     * @var string
+     */
+    protected $sign_extracerts_file = '';
+
+    /**
+     * The S/MIME password for the key.
+     * Used only if the key is encrypted.
+     *
+     * @var string
+     */
+    protected $sign_key_pass = '';
+
+    /**
+     * Whether to throw exceptions for errors.
+     *
+     * @var bool
+     */
+    protected $exceptions = false;
+
+    /**
+     * Unique ID used for message ID and boundaries.
+     *
+     * @var string
+     */
+    protected $uniqueid = '';
+
+    /**
+     * The PHPMailer Version number.
+     *
+     * @var string
+     */
+    const VERSION = '6.0.5';
+
+    /**
+     * Error severity: message only, continue processing.
+     *
+     * @var int
+     */
+    const STOP_MESSAGE = 0;
+
+    /**
+     * Error severity: message, likely ok to continue processing.
+     *
+     * @var int
+     */
+    const STOP_CONTINUE = 1;
+
+    /**
+     * Error severity: message, plus full stop, critical error reached.
+     *
+     * @var int
+     */
+    const STOP_CRITICAL = 2;
+
+    /**
+     * SMTP RFC standard line ending.
+     *
+     * @var string
+     */
+    protected static $LE = "\r\n";
+
+    /**
+     * The maximum line length allowed by RFC 2822 section 2.1.1.
+     *
+     * @var int
+     */
+    const MAX_LINE_LENGTH = 998;
+
+    /**
+     * The lower maximum line length allowed by RFC 2822 section 2.1.1.
+     * This length does NOT include the line break
+     * 76 means that lines will be 77 or 78 chars depending on whether
+     * the line break format is LF or CRLF; both are valid.
+     *
+     * @var int
+     */
+    const STD_LINE_LENGTH = 76;
+
+    /**
+     * Constructor.
+     *
+     * @param bool $exceptions Should we throw external exceptions?
+     */
+    public function __construct($exceptions = null)
+    {
+        if (null !== $exceptions) {
+            $this->exceptions = (bool) $exceptions;
+        }
+        //Pick an appropriate debug output format automatically
+        $this->Debugoutput = (strpos(PHP_SAPI, 'cli') !== false ? 'echo' : 'html');
+    }
+
+    /**
+     * Destructor.
+     */
+    public function __destruct()
+    {
+        //Close any open SMTP connection nicely
+        $this->smtpClose();
+    }
+
+    /**
+     * Call mail() in a safe_mode-aware fashion.
+     * Also, unless sendmail_path points to sendmail (or something that
+     * claims to be sendmail), don't pass params (not a perfect fix,
+     * but it will do).
+     *
+     * @param string      $to      To
+     * @param string      $subject Subject
+     * @param string      $body    Message Body
+     * @param string      $header  Additional Header(s)
+     * @param string|null $params  Params
+     *
+     * @return bool
+     */
+    private function mailPassthru($to, $subject, $body, $header, $params)
+    {
+        //Check overloading of mail function to avoid double-encoding
+        if (ini_get('mbstring.func_overload') & 1) {
+            $subject = $this->secureHeader($subject);
+        } else {
+            $subject = $this->encodeHeader($this->secureHeader($subject));
+        }
+        //Calling mail() with null params breaks
+        if (!$this->UseSendmailOptions or null === $params) {
+            $result = @mail($to, $subject, $body, $header);
+        } else {
+            $result = @mail($to, $subject, $body, $header, $params);
+        }
+
+        return $result;
+    }
+
+    /**
+     * Output debugging info via user-defined method.
+     * Only generates output if SMTP debug output is enabled (@see SMTP::$do_debug).
+     *
+     * @see PHPMailer::$Debugoutput
+     * @see PHPMailer::$SMTPDebug
+     *
+     * @param string $str
+     */
+    protected function edebug($str)
+    {
+        if ($this->SMTPDebug <= 0) {
+            return;
+        }
+        //Is this a PSR-3 logger?
+        if ($this->Debugoutput instanceof \Psr\Log\LoggerInterface) {
+            $this->Debugoutput->debug($str);
+
+            return;
+        }
+        //Avoid clash with built-in function names
+        if (!in_array($this->Debugoutput, ['error_log', 'html', 'echo']) and is_callable($this->Debugoutput)) {
+            call_user_func($this->Debugoutput, $str, $this->SMTPDebug);
+
+            return;
+        }
+        switch ($this->Debugoutput) {
+            case 'error_log':
+                //Don't output, just log
+                error_log($str);
+                break;
+            case 'html':
+                //Cleans up output a bit for a better looking, HTML-safe output
+                echo htmlentities(
+                    preg_replace('/[\r\n]+/', '', $str),
+                    ENT_QUOTES,
+                    'UTF-8'
+                ), "<br>\n";
+                break;
+            case 'echo':
+            default:
+                //Normalize line breaks
+                $str = preg_replace('/\r\n|\r/ms', "\n", $str);
+                echo gmdate('Y-m-d H:i:s'),
+                "\t",
+                    //Trim trailing space
+                trim(
+                //Indent for readability, except for trailing break
+                    str_replace(
+                        "\n",
+                        "\n                   \t                  ",
+                        trim($str)
+                    )
+                ),
+                "\n";
+        }
+    }
+
+    /**
+     * Sets message type to HTML or plain.
+     *
+     * @param bool $isHtml True for HTML mode
+     */
+    public function isHTML($isHtml = true)
+    {
+        if ($isHtml) {
+            $this->ContentType = static::CONTENT_TYPE_TEXT_HTML;
+        } else {
+            $this->ContentType = static::CONTENT_TYPE_PLAINTEXT;
+        }
+    }
+
+    /**
+     * Send messages using SMTP.
+     */
+    public function isSMTP()
+    {
+        $this->Mailer = 'smtp';
+    }
+
+    /**
+     * Send messages using PHP's mail() function.
+     */
+    public function isMail()
+    {
+        $this->Mailer = 'mail';
+    }
+
+    /**
+     * Send messages using $Sendmail.
+     */
+    public function isSendmail()
+    {
+        $ini_sendmail_path = ini_get('sendmail_path');
+
+        if (false === stripos($ini_sendmail_path, 'sendmail')) {
+            $this->Sendmail = '/usr/sbin/sendmail';
+        } else {
+            $this->Sendmail = $ini_sendmail_path;
+        }
+        $this->Mailer = 'sendmail';
+    }
+
+    /**
+     * Send messages using qmail.
+     */
+    public function isQmail()
+    {
+        $ini_sendmail_path = ini_get('sendmail_path');
+
+        if (false === stripos($ini_sendmail_path, 'qmail')) {
+            $this->Sendmail = '/var/qmail/bin/qmail-inject';
+        } else {
+            $this->Sendmail = $ini_sendmail_path;
+        }
+        $this->Mailer = 'qmail';
+    }
+
+    /**
+     * Add a "To" address.
+     *
+     * @param string $address The email address to send to
+     * @param string $name
+     *
+     * @return bool true on success, false if address already used or invalid in some way
+     */
+    public function addAddress($address, $name = '')
+    {
+        return $this->addOrEnqueueAnAddress('to', $address, $name);
+    }
+
+    /**
+     * Add a "CC" address.
+     *
+     * @param string $address The email address to send to
+     * @param string $name
+     *
+     * @return bool true on success, false if address already used or invalid in some way
+     */
+    public function addCC($address, $name = '')
+    {
+        return $this->addOrEnqueueAnAddress('cc', $address, $name);
+    }
+
+    /**
+     * Add a "BCC" address.
+     *
+     * @param string $address The email address to send to
+     * @param string $name
+     *
+     * @return bool true on success, false if address already used or invalid in some way
+     */
+    public function addBCC($address, $name = '')
+    {
+        return $this->addOrEnqueueAnAddress('bcc', $address, $name);
+    }
+
+    /**
+     * Add a "Reply-To" address.
+     *
+     * @param string $address The email address to reply to
+     * @param string $name
+     *
+     * @return bool true on success, false if address already used or invalid in some way
+     */
+    public function addReplyTo($address, $name = '')
+    {
+        return $this->addOrEnqueueAnAddress('Reply-To', $address, $name);
+    }
+
+    /**
+     * Add an address to one of the recipient arrays or to the ReplyTo array. Because PHPMailer
+     * can't validate addresses with an IDN without knowing the PHPMailer::$CharSet (that can still
+     * be modified after calling this function), addition of such addresses is delayed until send().
+     * Addresses that have been added already return false, but do not throw exceptions.
+     *
+     * @param string $kind    One of 'to', 'cc', 'bcc', or 'ReplyTo'
+     * @param string $address The email address to send, resp. to reply to
+     * @param string $name
+     *
+     * @throws Exception
+     *
+     * @return bool true on success, false if address already used or invalid in some way
+     */
+    protected function addOrEnqueueAnAddress($kind, $address, $name)
+    {
+        $address = trim($address);
+        $name = trim(preg_replace('/[\r\n]+/', '', $name)); //Strip breaks and trim
+        $pos = strrpos($address, '@');
+        if (false === $pos) {
+            // At-sign is missing.
+            $error_message = sprintf('%s (%s): %s',
+                $this->lang('invalid_address'),
+                $kind,
+                $address);
+            $this->setError($error_message);
+            $this->edebug($error_message);
+            if ($this->exceptions) {
+                throw new Exception($error_message);
+            }
+
+            return false;
+        }
+        $params = [$kind, $address, $name];
+        // Enqueue addresses with IDN until we know the PHPMailer::$CharSet.
+        if ($this->has8bitChars(substr($address, ++$pos)) and static::idnSupported()) {
+            if ('Reply-To' != $kind) {
+                if (!array_key_exists($address, $this->RecipientsQueue)) {
+                    $this->RecipientsQueue[$address] = $params;
+
+                    return true;
+                }
+            } else {
+                if (!array_key_exists($address, $this->ReplyToQueue)) {
+                    $this->ReplyToQueue[$address] = $params;
+
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        // Immediately add standard addresses without IDN.
+        return call_user_func_array([$this, 'addAnAddress'], $params);
+    }
+
+    /**
+     * Add an address to one of the recipient arrays or to the ReplyTo array.
+     * Addresses that have been added already return false, but do not throw exceptions.
+     *
+     * @param string $kind    One of 'to', 'cc', 'bcc', or 'ReplyTo'
+     * @param string $address The email address to send, resp. to reply to
+     * @param string $name
+     *
+     * @throws Exception
+     *
+     * @return bool true on success, false if address already used or invalid in some way
+     */
+    protected function addAnAddress($kind, $address, $name = '')
+    {
+        if (!in_array($kind, ['to', 'cc', 'bcc', 'Reply-To'])) {
+            $error_message = sprintf('%s: %s',
+                $this->lang('Invalid recipient kind'),
+                $kind);
+            $this->setError($error_message);
+            $this->edebug($error_message);
+            if ($this->exceptions) {
+                throw new Exception($error_message);
+            }
+
+            return false;
+        }
+        if (!static::validateAddress($address)) {
+            $error_message = sprintf('%s (%s): %s',
+                $this->lang('invalid_address'),
+                $kind,
+                $address);
+            $this->setError($error_message);
+            $this->edebug($error_message);
+            if ($this->exceptions) {
+                throw new Exception($error_message);
+            }
+
+            return false;
+        }
+        if ('Reply-To' != $kind) {
+            if (!array_key_exists(strtolower($address), $this->all_recipients)) {
+                $this->{$kind}[] = [$address, $name];
+                $this->all_recipients[strtolower($address)] = true;
+
+                return true;
+            }
+        } else {
+            if (!array_key_exists(strtolower($address), $this->ReplyTo)) {
+                $this->ReplyTo[strtolower($address)] = [$address, $name];
+
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Parse and validate a string containing one or more RFC822-style comma-separated email addresses
+     * of the form "display name <address>" into an array of name/address pairs.
+     * Uses the imap_rfc822_parse_adrlist function if the IMAP extension is available.
+     * Note that quotes in the name part are removed.
+     *
+     * @see    http://www.andrew.cmu.edu/user/agreen1/testing/mrbs/web/Mail/RFC822.php A more careful implementation
+     *
+     * @param string $addrstr The address list string
+     * @param bool   $useimap Whether to use the IMAP extension to parse the list
+     *
+     * @return array
+     */
+    public static function parseAddresses($addrstr, $useimap = true)
+    {
+        $addresses = [];
+        if ($useimap and function_exists('imap_rfc822_parse_adrlist')) {
+            //Use this built-in parser if it's available
+            $list = imap_rfc822_parse_adrlist($addrstr, '');
+            foreach ($list as $address) {
+                if ('.SYNTAX-ERROR.' != $address->host) {
+                    if (static::validateAddress($address->mailbox . '@' . $address->host)) {
+                        $addresses[] = [
+                            'name' => (property_exists($address, 'personal') ? $address->personal : ''),
+                            'address' => $address->mailbox . '@' . $address->host,
+                        ];
+                    }
+                }
+            }
+        } else {
+            //Use this simpler parser
+            $list = explode(',', $addrstr);
+            foreach ($list as $address) {
+                $address = trim($address);
+                //Is there a separate name part?
+                if (strpos($address, '<') === false) {
+                    //No separate name, just use the whole thing
+                    if (static::validateAddress($address)) {
+                        $addresses[] = [
+                            'name' => '',
+                            'address' => $address,
+                        ];
+                    }
+                } else {
+                    list($name, $email) = explode('<', $address);
+                    $email = trim(str_replace('>', '', $email));
+                    if (static::validateAddress($email)) {
+                        $addresses[] = [
+                            'name' => trim(str_replace(['"', "'"], '', $name)),
+                            'address' => $email,
+                        ];
+                    }
+                }
+            }
+        }
+
+        return $addresses;
+    }
+
+    /**
+     * Set the From and FromName properties.
+     *
+     * @param string $address
+     * @param string $name
+     * @param bool   $auto    Whether to also set the Sender address, defaults to true
+     *
+     * @throws Exception
+     *
+     * @return bool
+     */
+    public function setFrom($address, $name = '', $auto = true)
+    {
+        $address = trim($address);
+        $name = trim(preg_replace('/[\r\n]+/', '', $name)); //Strip breaks and trim
+        // Don't validate now addresses with IDN. Will be done in send().
+        $pos = strrpos($address, '@');
+        if (false === $pos or
+            (!$this->has8bitChars(substr($address, ++$pos)) or !static::idnSupported()) and
+            !static::validateAddress($address)) {
+            $error_message = sprintf('%s (From): %s',
+                $this->lang('invalid_address'),
+                $address);
+            $this->setError($error_message);
+            $this->edebug($error_message);
+            if ($this->exceptions) {
+                throw new Exception($error_message);
+            }
+
+            return false;
+        }
+        $this->From = $address;
+        $this->FromName = $name;
+        if ($auto) {
+            if (empty($this->Sender)) {
+                $this->Sender = $address;
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Return the Message-ID header of the last email.
+     * Technically this is the value from the last time the headers were created,
+     * but it's also the message ID of the last sent message except in
+     * pathological cases.
+     *
+     * @return string
+     */
+    public function getLastMessageID()
+    {
+        return $this->lastMessageID;
+    }
+
+    /**
+     * Check that a string looks like an email address.
+     * Validation patterns supported:
+     * * `auto` Pick best pattern automatically;
+     * * `pcre8` Use the squiloople.com pattern, requires PCRE > 8.0;
+     * * `pcre` Use old PCRE implementation;
+     * * `php` Use PHP built-in FILTER_VALIDATE_EMAIL;
+     * * `html5` Use the pattern given by the HTML5 spec for 'email' type form input elements.
+     * * `noregex` Don't use a regex: super fast, really dumb.
+     * Alternatively you may pass in a callable to inject your own validator, for example:
+     *
+     * ```php
+     * PHPMailer::validateAddress('user@example.com', function($address) {
+     *     return (strpos($address, '@') !== false);
+     * });
+     * ```
+     *
+     * You can also set the PHPMailer::$validator static to a callable, allowing built-in methods to use your validator.
+     *
+     * @param string          $address       The email address to check
+     * @param string|callable $patternselect Which pattern to use
+     *
+     * @return bool
+     */
+    public static function validateAddress($address, $patternselect = null)
+    {
+        if (null === $patternselect) {
+            $patternselect = static::$validator;
+        }
+        if (is_callable($patternselect)) {
+            return call_user_func($patternselect, $address);
+        }
+        //Reject line breaks in addresses; it's valid RFC5322, but not RFC5321
+        if (strpos($address, "\n") !== false or strpos($address, "\r") !== false) {
+            return false;
+        }
+        switch ($patternselect) {
+            case 'pcre': //Kept for BC
+            case 'pcre8':
+                /*
+                 * A more complex and more permissive version of the RFC5322 regex on which FILTER_VALIDATE_EMAIL
+                 * is based.
+                 * In addition to the addresses allowed by filter_var, also permits:
+                 *  * dotless domains: `a@b`
+                 *  * comments: `1234 @ local(blah) .machine .example`
+                 *  * quoted elements: `'"test blah"@example.org'`
+                 *  * numeric TLDs: `a@b.123`
+                 *  * unbracketed IPv4 literals: `a@192.168.0.1`
+                 *  * IPv6 literals: 'first.last@[IPv6:a1::]'
+                 * Not all of these will necessarily work for sending!
+                 *
+                 * @see       http://squiloople.com/2009/12/20/email-address-validation/
+                 * @copyright 2009-2010 Michael Rushton
+                 * Feel free to use and redistribute this code. But please keep this copyright notice.
+                 */
+                return (bool) preg_match(
+                    '/^(?!(?>(?1)"?(?>\\\[ -~]|[^"])"?(?1)){255,})(?!(?>(?1)"?(?>\\\[ -~]|[^"])"?(?1)){65,}@)' .
+                    '((?>(?>(?>((?>(?>(?>\x0D\x0A)?[\t ])+|(?>[\t ]*\x0D\x0A)?[\t ]+)?)(\((?>(?2)' .
+                    '(?>[\x01-\x08\x0B\x0C\x0E-\'*-\[\]-\x7F]|\\\[\x00-\x7F]|(?3)))*(?2)\)))+(?2))|(?2))?)' .
+                    '([!#-\'*+\/-9=?^-~-]+|"(?>(?2)(?>[\x01-\x08\x0B\x0C\x0E-!#-\[\]-\x7F]|\\\[\x00-\x7F]))*' .
+                    '(?2)")(?>(?1)\.(?1)(?4))*(?1)@(?!(?1)[a-z0-9-]{64,})(?1)(?>([a-z0-9](?>[a-z0-9-]*[a-z0-9])?)' .
+                    '(?>(?1)\.(?!(?1)[a-z0-9-]{64,})(?1)(?5)){0,126}|\[(?:(?>IPv6:(?>([a-f0-9]{1,4})(?>:(?6)){7}' .
+                    '|(?!(?:.*[a-f0-9][:\]]){8,})((?6)(?>:(?6)){0,6})?::(?7)?))|(?>(?>IPv6:(?>(?6)(?>:(?6)){5}:' .
+                    '|(?!(?:.*[a-f0-9]:){6,})(?8)?::(?>((?6)(?>:(?6)){0,4}):)?))?(25[0-5]|2[0-4][0-9]|1[0-9]{2}' .
+                    '|[1-9]?[0-9])(?>\.(?9)){3}))\])(?1)$/isD',
+                    $address
+                );
+            case 'html5':
+                /*
+                 * This is the pattern used in the HTML5 spec for validation of 'email' type form input elements.
+                 *
+                 * @see http://www.whatwg.org/specs/web-apps/current-work/#e-mail-state-(type=email)
+                 */
+                return (bool) preg_match(
+                    '/^[a-zA-Z0-9.!#$%&\'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}' .
+                    '[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$/sD',
+                    $address
+                );
+            case 'php':
+            default:
+                return (bool) filter_var($address, FILTER_VALIDATE_EMAIL);
+        }
+    }
+
+    /**
+     * Tells whether IDNs (Internationalized Domain Names) are supported or not. This requires the
+     * `intl` and `mbstring` PHP extensions.
+     *
+     * @return bool `true` if required functions for IDN support are present
+     */
+    public static function idnSupported()
+    {
+        return function_exists('idn_to_ascii') and function_exists('mb_convert_encoding');
+    }
+
+    /**
+     * Converts IDN in given email address to its ASCII form, also known as punycode, if possible.
+     * Important: Address must be passed in same encoding as currently set in PHPMailer::$CharSet.
+     * This function silently returns unmodified address if:
+     * - No conversion is necessary (i.e. domain name is not an IDN, or is already in ASCII form)
+     * - Conversion to punycode is impossible (e.g. required PHP functions are not available)
+     *   or fails for any reason (e.g. domain contains characters not allowed in an IDN).
+     *
+     * @see    PHPMailer::$CharSet
+     *
+     * @param string $address The email address to convert
+     *
+     * @return string The encoded address in ASCII form
+     */
+    public function punyencodeAddress($address)
+    {
+        // Verify we have required functions, CharSet, and at-sign.
+        $pos = strrpos($address, '@');
+        if (static::idnSupported() and
+            !empty($this->CharSet) and
+            false !== $pos
+        ) {
+            $domain = substr($address, ++$pos);
+            // Verify CharSet string is a valid one, and domain properly encoded in this CharSet.
+            if ($this->has8bitChars($domain) and @mb_check_encoding($domain, $this->CharSet)) {
+                $domain = mb_convert_encoding($domain, 'UTF-8', $this->CharSet);
+                //Ignore IDE complaints about this line - method signature changed in PHP 5.4
+                $errorcode = 0;
+                $punycode = idn_to_ascii($domain, $errorcode, INTL_IDNA_VARIANT_UTS46);
+                if (false !== $punycode) {
+                    return substr($address, 0, $pos) . $punycode;
+                }
+            }
+        }
+
+        return $address;
+    }
+
+    /**
+     * Create a message and send it.
+     * Uses the sending method specified by $Mailer.
+     *
+     * @throws Exception
+     *
+     * @return bool false on error - See the ErrorInfo property for details of the error
+     */
+    public function send()
+    {
+        try {
+            if (!$this->preSend()) {
+                return false;
+            }
+
+            return $this->postSend();
+        } catch (Exception $exc) {
+            $this->mailHeader = '';
+            $this->setError($exc->getMessage());
+            if ($this->exceptions) {
+                throw $exc;
+            }
+
+            return false;
+        }
+    }
+
+    /**
+     * Prepare a message for sending.
+     *
+     * @throws Exception
+     *
+     * @return bool
+     */
+    public function preSend()
+    {
+        if ('smtp' == $this->Mailer or
+            ('mail' == $this->Mailer and stripos(PHP_OS, 'WIN') === 0)
+        ) {
+            //SMTP mandates RFC-compliant line endings
+            //and it's also used with mail() on Windows
+            static::setLE("\r\n");
+        } else {
+            //Maintain backward compatibility with legacy Linux command line mailers
+            static::setLE(PHP_EOL);
+        }
+        //Check for buggy PHP versions that add a header with an incorrect line break
+        if (ini_get('mail.add_x_header') == 1
+            and 'mail' == $this->Mailer
+            and stripos(PHP_OS, 'WIN') === 0
+            and ((version_compare(PHP_VERSION, '7.0.0', '>=')
+                    and version_compare(PHP_VERSION, '7.0.17', '<'))
+                or (version_compare(PHP_VERSION, '7.1.0', '>=')
+                    and version_compare(PHP_VERSION, '7.1.3', '<')))
+        ) {
+            trigger_error(
+                'Your version of PHP is affected by a bug that may result in corrupted messages.' .
+                ' To fix it, switch to sending using SMTP, disable the mail.add_x_header option in' .
+                ' your php.ini, switch to MacOS or Linux, or upgrade your PHP to version 7.0.17+ or 7.1.3+.',
+                E_USER_WARNING
+            );
+        }
+
+        try {
+            $this->error_count = 0; // Reset errors
+            $this->mailHeader = '';
+
+            // Dequeue recipient and Reply-To addresses with IDN
+            foreach (array_merge($this->RecipientsQueue, $this->ReplyToQueue) as $params) {
+                $params[1] = $this->punyencodeAddress($params[1]);
+                call_user_func_array([$this, 'addAnAddress'], $params);
+            }
+            if (count($this->to) + count($this->cc) + count($this->bcc) < 1) {
+                throw new Exception($this->lang('provide_address'), self::STOP_CRITICAL);
+            }
+
+            // Validate From, Sender, and ConfirmReadingTo addresses
+            foreach (['From', 'Sender', 'ConfirmReadingTo'] as $address_kind) {
+                $this->$address_kind = trim($this->$address_kind);
+                if (empty($this->$address_kind)) {
+                    continue;
+                }
+                $this->$address_kind = $this->punyencodeAddress($this->$address_kind);
+                if (!static::validateAddress($this->$address_kind)) {
+                    $error_message = sprintf('%s (%s): %s',
+                        $this->lang('invalid_address'),
+                        $address_kind,
+                        $this->$address_kind);
+                    $this->setError($error_message);
+                    $this->edebug($error_message);
+                    if ($this->exceptions) {
+                        throw new Exception($error_message);
+                    }
+
+                    return false;
+                }
+            }
+
+            // Set whether the message is multipart/alternative
+            if ($this->alternativeExists()) {
+                $this->ContentType = static::CONTENT_TYPE_MULTIPART_ALTERNATIVE;
+            }
+
+            $this->setMessageType();
+            // Refuse to send an empty message unless we are specifically allowing it
+            if (!$this->AllowEmpty and empty($this->Body)) {
+                throw new Exception($this->lang('empty_message'), self::STOP_CRITICAL);
+            }
+
+            //Trim subject consistently
+            $this->Subject = trim($this->Subject);
+            // Create body before headers in case body makes changes to headers (e.g. altering transfer encoding)
+            $this->MIMEHeader = '';
+            $this->MIMEBody = $this->createBody();
+            // createBody may have added some headers, so retain them
+            $tempheaders = $this->MIMEHeader;
+            $this->MIMEHeader = $this->createHeader();
+            $this->MIMEHeader .= $tempheaders;
+
+            // To capture the complete message when using mail(), create
+            // an extra header list which createHeader() doesn't fold in
+            if ('mail' == $this->Mailer) {
+                if (count($this->to) > 0) {
+                    $this->mailHeader .= $this->addrAppend('To', $this->to);
+                } else {
+                    $this->mailHeader .= $this->headerLine('To', 'undisclosed-recipients:;');
+                }
+                $this->mailHeader .= $this->headerLine(
+                    'Subject',
+                    $this->encodeHeader($this->secureHeader($this->Subject))
+                );
+            }
+
+            // Sign with DKIM if enabled
+            if (!empty($this->DKIM_domain)
+                and !empty($this->DKIM_selector)
+                and (!empty($this->DKIM_private_string)
+                    or (!empty($this->DKIM_private) and file_exists($this->DKIM_private))
+                )
+            ) {
+                $header_dkim = $this->DKIM_Add(
+                    $this->MIMEHeader . $this->mailHeader,
+                    $this->encodeHeader($this->secureHeader($this->Subject)),
+                    $this->MIMEBody
+                );
+                $this->MIMEHeader = rtrim($this->MIMEHeader, "\r\n ") . static::$LE .
+                    static::normalizeBreaks($header_dkim) . static::$LE;
+            }
+
+            return true;
+        } catch (Exception $exc) {
+            $this->setError($exc->getMessage());
+            if ($this->exceptions) {
+                throw $exc;
+            }
+
+            return false;
+        }
+    }
+
+    /**
+     * Actually send a message via the selected mechanism.
+     *
+     * @throws Exception
+     *
+     * @return bool
+     */
+    public function postSend()
+    {
+        try {
+            // Choose the mailer and send through it
+            switch ($this->Mailer) {
+                case 'sendmail':
+                case 'qmail':
+                    return $this->sendmailSend($this->MIMEHeader, $this->MIMEBody);
+                case 'smtp':
+                    return $this->smtpSend($this->MIMEHeader, $this->MIMEBody);
+                case 'mail':
+                    return $this->mailSend($this->MIMEHeader, $this->MIMEBody);
+                default:
+                    $sendMethod = $this->Mailer . 'Send';
+                    if (method_exists($this, $sendMethod)) {
+                        return $this->$sendMethod($this->MIMEHeader, $this->MIMEBody);
+                    }
+
+                    return $this->mailSend($this->MIMEHeader, $this->MIMEBody);
+            }
+        } catch (Exception $exc) {
+            $this->setError($exc->getMessage());
+            $this->edebug($exc->getMessage());
+            if ($this->exceptions) {
+                throw $exc;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Send mail using the $Sendmail program.
+     *
+     * @see    PHPMailer::$Sendmail
+     *
+     * @param string $header The message headers
+     * @param string $body   The message body
+     *
+     * @throws Exception
+     *
+     * @return bool
+     */
+    protected function sendmailSend($header, $body)
+    {
+        // CVE-2016-10033, CVE-2016-10045: Don't pass -f if characters will be escaped.
+        if (!empty($this->Sender) and self::isShellSafe($this->Sender)) {
+            if ('qmail' == $this->Mailer) {
+                $sendmailFmt = '%s -f%s';
+            } else {
+                $sendmailFmt = '%s -oi -f%s -t';
+            }
+        } else {
+            if ('qmail' == $this->Mailer) {
+                $sendmailFmt = '%s';
+            } else {
+                $sendmailFmt = '%s -oi -t';
+            }
+        }
+
+        $sendmail = sprintf($sendmailFmt, escapeshellcmd($this->Sendmail), $this->Sender);
+
+        if ($this->SingleTo) {
+            foreach ($this->SingleToArray as $toAddr) {
+                $mail = @popen($sendmail, 'w');
+                if (!$mail) {
+                    throw new Exception($this->lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
+                }
+                fwrite($mail, 'To: ' . $toAddr . "\n");
+                fwrite($mail, $header);
+                fwrite($mail, $body);
+                $result = pclose($mail);
+                $this->doCallback(
+                    ($result == 0),
+                    [$toAddr],
+                    $this->cc,
+                    $this->bcc,
+                    $this->Subject,
+                    $body,
+                    $this->From,
+                    []
+                );
+                if (0 !== $result) {
+                    throw new Exception($this->lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
+                }
+            }
+        } else {
+            $mail = @popen($sendmail, 'w');
+            if (!$mail) {
+                throw new Exception($this->lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
+            }
+            fwrite($mail, $header);
+            fwrite($mail, $body);
+            $result = pclose($mail);
+            $this->doCallback(
+                ($result == 0),
+                $this->to,
+                $this->cc,
+                $this->bcc,
+                $this->Subject,
+                $body,
+                $this->From,
+                []
+            );
+            if (0 !== $result) {
+                throw new Exception($this->lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Fix CVE-2016-10033 and CVE-2016-10045 by disallowing potentially unsafe shell characters.
+     * Note that escapeshellarg and escapeshellcmd are inadequate for our purposes, especially on Windows.
+     *
+     * @see https://github.com/PHPMailer/PHPMailer/issues/924 CVE-2016-10045 bug report
+     *
+     * @param string $string The string to be validated
+     *
+     * @return bool
+     */
+    protected static function isShellSafe($string)
+    {
+        // Future-proof
+        if (escapeshellcmd($string) !== $string
+            or !in_array(escapeshellarg($string), ["'$string'", "\"$string\""])
+        ) {
+            return false;
+        }
+
+        $length = strlen($string);
+
+        for ($i = 0; $i < $length; ++$i) {
+            $c = $string[$i];
+
+            // All other characters have a special meaning in at least one common shell, including = and +.
+            // Full stop (.) has a special meaning in cmd.exe, but its impact should be negligible here.
+            // Note that this does permit non-Latin alphanumeric characters based on the current locale.
+            if (!ctype_alnum($c) && strpos('@_-.', $c) === false) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Send mail using the PHP mail() function.
+     *
+     * @see    http://www.php.net/manual/en/book.mail.php
+     *
+     * @param string $header The message headers
+     * @param string $body   The message body
+     *
+     * @throws Exception
+     *
+     * @return bool
+     */
+    protected function mailSend($header, $body)
+    {
+        $toArr = [];
+        foreach ($this->to as $toaddr) {
+            $toArr[] = $this->addrFormat($toaddr);
+        }
+        $to = implode(', ', $toArr);
+
+        $params = null;
+        //This sets the SMTP envelope sender which gets turned into a return-path header by the receiver
+        if (!empty($this->Sender) and static::validateAddress($this->Sender)) {
+            //A space after `-f` is optional, but there is a long history of its presence
+            //causing problems, so we don't use one
+            //Exim docs: http://www.exim.org/exim-html-current/doc/html/spec_html/ch-the_exim_command_line.html
+            //Sendmail docs: http://www.sendmail.org/~ca/email/man/sendmail.html
+            //Qmail docs: http://www.qmail.org/man/man8/qmail-inject.html
+            //Example problem: https://www.drupal.org/node/1057954
+            // CVE-2016-10033, CVE-2016-10045: Don't pass -f if characters will be escaped.
+            if (self::isShellSafe($this->Sender)) {
+                $params = sprintf('-f%s', $this->Sender);
+            }
+        }
+        if (!empty($this->Sender) and static::validateAddress($this->Sender)) {
+            $old_from = ini_get('sendmail_from');
+            ini_set('sendmail_from', $this->Sender);
+        }
+        $result = false;
+        if ($this->SingleTo and count($toArr) > 1) {
+            foreach ($toArr as $toAddr) {
+                $result = $this->mailPassthru($toAddr, $this->Subject, $body, $header, $params);
+                $this->doCallback($result, [$toAddr], $this->cc, $this->bcc, $this->Subject, $body, $this->From, []);
+            }
+        } else {
+            $result = $this->mailPassthru($to, $this->Subject, $body, $header, $params);
+            $this->doCallback($result, $this->to, $this->cc, $this->bcc, $this->Subject, $body, $this->From, []);
+        }
+        if (isset($old_from)) {
+            ini_set('sendmail_from', $old_from);
+        }
+        if (!$result) {
+            throw new Exception($this->lang('instantiate'), self::STOP_CRITICAL);
+        }
+
+        return true;
+    }
+
+    /**
+     * Get an instance to use for SMTP operations.
+     * Override this function to load your own SMTP implementation,
+     * or set one with setSMTPInstance.
+     *
+     * @return SMTP
+     */
+    public function getSMTPInstance()
+    {
+        if (!is_object($this->smtp)) {
+            $this->smtp = new SMTP();
+        }
+
+        return $this->smtp;
+    }
+
+    /**
+     * Provide an instance to use for SMTP operations.
+     *
+     * @param SMTP $smtp
+     *
+     * @return SMTP
+     */
+    public function setSMTPInstance(SMTP $smtp)
+    {
+        $this->smtp = $smtp;
+
+        return $this->smtp;
+    }
+
+    /**
+     * Send mail via SMTP.
+     * Returns false if there is a bad MAIL FROM, RCPT, or DATA input.
+     *
+     * @see PHPMailer::setSMTPInstance() to use a different class.
+     *
+     * @uses \PHPMailer\PHPMailer\SMTP
+     *
+     * @param string $header The message headers
+     * @param string $body   The message body
+     *
+     * @throws Exception
+     *
+     * @return bool
+     */
+    protected function smtpSend($header, $body)
+    {
+        $bad_rcpt = [];
+        if (!$this->smtpConnect($this->SMTPOptions)) {
+            throw new Exception($this->lang('smtp_connect_failed'), self::STOP_CRITICAL);
+        }
+        //Sender already validated in preSend()
+        if ('' == $this->Sender) {
+            $smtp_from = $this->From;
+        } else {
+            $smtp_from = $this->Sender;
+        }
+        if (!$this->smtp->mail($smtp_from)) {
+            $this->setError($this->lang('from_failed') . $smtp_from . ' : ' . implode(',', $this->smtp->getError()));
+            throw new Exception($this->ErrorInfo, self::STOP_CRITICAL);
+        }
+
+        $callbacks = [];
+        // Attempt to send to all recipients
+        foreach ([$this->to, $this->cc, $this->bcc] as $togroup) {
+            foreach ($togroup as $to) {
+                if (!$this->smtp->recipient($to[0])) {
+                    $error = $this->smtp->getError();
+                    $bad_rcpt[] = ['to' => $to[0], 'error' => $error['detail']];
+                    $isSent = false;
+                } else {
+                    $isSent = true;
+                }
+
+                $callbacks[] = ['issent'=>$isSent, 'to'=>$to[0]];
+            }
+        }
+
+        // Only send the DATA command if we have viable recipients
+        if ((count($this->all_recipients) > count($bad_rcpt)) and !$this->smtp->data($header . $body)) {
+            throw new Exception($this->lang('data_not_accepted'), self::STOP_CRITICAL);
+        }
+
+        $smtp_transaction_id = $this->smtp->getLastTransactionID();
+
+        if ($this->SMTPKeepAlive) {
+            $this->smtp->reset();
+        } else {
+            $this->smtp->quit();
+            $this->smtp->close();
+        }
+
+        foreach ($callbacks as $cb) {
+            $this->doCallback(
+                $cb['issent'],
+                [$cb['to']],
+                [],
+                [],
+                $this->Subject,
+                $body,
+                $this->From,
+                ['smtp_transaction_id' => $smtp_transaction_id]
+            );
+        }
+
+        //Create error message for any bad addresses
+        if (count($bad_rcpt) > 0) {
+            $errstr = '';
+            foreach ($bad_rcpt as $bad) {
+                $errstr .= $bad['to'] . ': ' . $bad['error'];
+            }
+            throw new Exception(
+                $this->lang('recipients_failed') . $errstr,
+                self::STOP_CONTINUE
+            );
+        }
+
+        return true;
+    }
+
+    /**
+     * Initiate a connection to an SMTP server.
+     * Returns false if the operation failed.
+     *
+     * @param array $options An array of options compatible with stream_context_create()
+     *
+     * @throws Exception
+     *
+     * @uses \PHPMailer\PHPMailer\SMTP
+     *
+     * @return bool
+     */
+    public function smtpConnect($options = null)
+    {
+        if (null === $this->smtp) {
+            $this->smtp = $this->getSMTPInstance();
+        }
+
+        //If no options are provided, use whatever is set in the instance
+        if (null === $options) {
+            $options = $this->SMTPOptions;
+        }
+
+        // Already connected?
+        if ($this->smtp->connected()) {
+            return true;
+        }
+
+        $this->smtp->setTimeout($this->Timeout);
+        $this->smtp->setDebugLevel($this->SMTPDebug);
+        $this->smtp->setDebugOutput($this->Debugoutput);
+        $this->smtp->setVerp($this->do_verp);
+        $hosts = explode(';', $this->Host);
+        $lastexception = null;
+
+        foreach ($hosts as $hostentry) {
+            $hostinfo = [];
+            if (!preg_match(
+                '/^((ssl|tls):\/\/)*([a-zA-Z0-9\.-]*|\[[a-fA-F0-9:]+\]):?([0-9]*)$/',
+                trim($hostentry),
+                $hostinfo
+            )) {
+                static::edebug($this->lang('connect_host') . ' ' . $hostentry);
+                // Not a valid host entry
+                continue;
+            }
+            // $hostinfo[2]: optional ssl or tls prefix
+            // $hostinfo[3]: the hostname
+            // $hostinfo[4]: optional port number
+            // The host string prefix can temporarily override the current setting for SMTPSecure
+            // If it's not specified, the default value is used
+
+            //Check the host name is a valid name or IP address before trying to use it
+            if (!static::isValidHost($hostinfo[3])) {
+                static::edebug($this->lang('connect_host') . ' ' . $hostentry);
+                continue;
+            }
+            $prefix = '';
+            $secure = $this->SMTPSecure;
+            $tls = ('tls' == $this->SMTPSecure);
+            if ('ssl' == $hostinfo[2] or ('' == $hostinfo[2] and 'ssl' == $this->SMTPSecure)) {
+                $prefix = 'ssl://';
+                $tls = false; // Can't have SSL and TLS at the same time
+                $secure = 'ssl';
+            } elseif ('tls' == $hostinfo[2]) {
+                $tls = true;
+                // tls doesn't use a prefix
+                $secure = 'tls';
+            }
+            //Do we need the OpenSSL extension?
+            $sslext = defined('OPENSSL_ALGO_SHA256');
+            if ('tls' === $secure or 'ssl' === $secure) {
+                //Check for an OpenSSL constant rather than using extension_loaded, which is sometimes disabled
+                if (!$sslext) {
+                    throw new Exception($this->lang('extension_missing') . 'openssl', self::STOP_CRITICAL);
+                }
+            }
+            $host = $hostinfo[3];
+            $port = $this->Port;
+            $tport = (int) $hostinfo[4];
+            if ($tport > 0 and $tport < 65536) {
+                $port = $tport;
+            }
+            if ($this->smtp->connect($prefix . $host, $port, $this->Timeout, $options)) {
+                try {
+                    if ($this->Helo) {
+                        $hello = $this->Helo;
+                    } else {
+                        $hello = $this->serverHostname();
+                    }
+                    $this->smtp->hello($hello);
+                    //Automatically enable TLS encryption if:
+                    // * it's not disabled
+                    // * we have openssl extension
+                    // * we are not already using SSL
+                    // * the server offers STARTTLS
+                    if ($this->SMTPAutoTLS and $sslext and 'ssl' != $secure and $this->smtp->getServerExt('STARTTLS')) {
+                        $tls = true;
+                    }
+                    if ($tls) {
+                        if (!$this->smtp->startTLS()) {
+                            throw new Exception($this->lang('connect_host'));
+                        }
+                        // We must resend EHLO after TLS negotiation
+                        $this->smtp->hello($hello);
+                    }
+                    if ($this->SMTPAuth) {
+                        if (!$this->smtp->authenticate(
+                            $this->Username,
+                            $this->Password,
+                            $this->AuthType,
+                            $this->oauth
+                        )
+                        ) {
+                            throw new Exception($this->lang('authenticate'));
+                        }
+                    }
+
+                    return true;
+                } catch (Exception $exc) {
+                    $lastexception = $exc;
+                    $this->edebug($exc->getMessage());
+                    // We must have connected, but then failed TLS or Auth, so close connection nicely
+                    $this->smtp->quit();
+                }
+            }
+        }
+        // If we get here, all connection attempts have failed, so close connection hard
+        $this->smtp->close();
+        // As we've caught all exceptions, just report whatever the last one was
+        if ($this->exceptions and null !== $lastexception) {
+            throw $lastexception;
+        }
+
+        return false;
+    }
+
+    /**
+     * Close the active SMTP session if one exists.
+     */
+    public function smtpClose()
+    {
+        if (null !== $this->smtp) {
+            if ($this->smtp->connected()) {
+                $this->smtp->quit();
+                $this->smtp->close();
+            }
+        }
+    }
+
+    /**
+     * Set the language for error messages.
+     * Returns false if it cannot load the language file.
+     * The default language is English.
+     *
+     * @param string $langcode  ISO 639-1 2-character language code (e.g. French is "fr")
+     * @param string $lang_path Path to the language file directory, with trailing separator (slash)
+     *
+     * @return bool
+     */
+    public function setLanguage($langcode = 'en', $lang_path = '')
+    {
+        // Backwards compatibility for renamed language codes
+        $renamed_langcodes = [
+            'br' => 'pt_br',
+            'cz' => 'cs',
+            'dk' => 'da',
+            'no' => 'nb',
+            'se' => 'sv',
+            'sr' => 'rs',
+        ];
+
+        if (isset($renamed_langcodes[$langcode])) {
+            $langcode = $renamed_langcodes[$langcode];
+        }
+
+        // Define full set of translatable strings in English
+        $PHPMAILER_LANG = [
+            'authenticate' => 'SMTP Error: Could not authenticate.',
+            'connect_host' => 'SMTP Error: Could not connect to SMTP host.',
+            'data_not_accepted' => 'SMTP Error: data not accepted.',
+            'empty_message' => 'Message body empty',
+            'encoding' => 'Unknown encoding: ',
+            'execute' => 'Could not execute: ',
+            'file_access' => 'Could not access file: ',
+            'file_open' => 'File Error: Could not open file: ',
+            'from_failed' => 'The following From address failed: ',
+            'instantiate' => 'Could not instantiate mail function.',
+            'invalid_address' => 'Invalid address: ',
+            'mailer_not_supported' => ' mailer is not supported.',
+            'provide_address' => 'You must provide at least one recipient email address.',
+            'recipients_failed' => 'SMTP Error: The following recipients failed: ',
+            'signing' => 'Signing Error: ',
+            'smtp_connect_failed' => 'SMTP connect() failed.',
+            'smtp_error' => 'SMTP server error: ',
+            'variable_set' => 'Cannot set or reset variable: ',
+            'extension_missing' => 'Extension missing: ',
+        ];
+        if (empty($lang_path)) {
+            // Calculate an absolute path so it can work if CWD is not here
+            $lang_path = dirname(__DIR__) . DIRECTORY_SEPARATOR . 'language' . DIRECTORY_SEPARATOR;
+        }
+        //Validate $langcode
+        if (!preg_match('/^[a-z]{2}(?:_[a-zA-Z]{2})?$/', $langcode)) {
+            $langcode = 'en';
+        }
+        $foundlang = true;
+        $lang_file = $lang_path . 'phpmailer.lang-' . $langcode . '.php';
+        // There is no English translation file
+        if ('en' != $langcode) {
+            // Make sure language file path is readable
+            if (!file_exists($lang_file)) {
+                $foundlang = false;
+            } else {
+                // Overwrite language-specific strings.
+                // This way we'll never have missing translation keys.
+                $foundlang = include $lang_file;
+            }
+        }
+        $this->language = $PHPMAILER_LANG;
+
+        return (bool) $foundlang; // Returns false if language not found
+    }
+
+    /**
+     * Get the array of strings for the current language.
+     *
+     * @return array
+     */
+    public function getTranslations()
+    {
+        return $this->language;
+    }
+
+    /**
+     * Create recipient headers.
+     *
+     * @param string $type
+     * @param array  $addr An array of recipients,
+     *                     where each recipient is a 2-element indexed array with element 0 containing an address
+     *                     and element 1 containing a name, like:
+     *                     [['joe@example.com', 'Joe User'], ['zoe@example.com', 'Zoe User']]
+     *
+     * @return string
+     */
+    public function addrAppend($type, $addr)
+    {
+        $addresses = [];
+        foreach ($addr as $address) {
+            $addresses[] = $this->addrFormat($address);
+        }
+
+        return $type . ': ' . implode(', ', $addresses) . static::$LE;
+    }
+
+    /**
+     * Format an address for use in a message header.
+     *
+     * @param array $addr A 2-element indexed array, element 0 containing an address, element 1 containing a name like
+     *                    ['joe@example.com', 'Joe User']
+     *
+     * @return string
+     */
+    public function addrFormat($addr)
+    {
+        if (empty($addr[1])) { // No name provided
+            return $this->secureHeader($addr[0]);
+        }
+
+        return $this->encodeHeader($this->secureHeader($addr[1]), 'phrase') . ' <' . $this->secureHeader(
+                $addr[0]
+            ) . '>';
+    }
+
+    /**
+     * Word-wrap message.
+     * For use with mailers that do not automatically perform wrapping
+     * and for quoted-printable encoded messages.
+     * Original written by philippe.
+     *
+     * @param string $message The message to wrap
+     * @param int    $length  The line length to wrap to
+     * @param bool   $qp_mode Whether to run in Quoted-Printable mode
+     *
+     * @return string
+     */
+    public function wrapText($message, $length, $qp_mode = false)
+    {
+        if ($qp_mode) {
+            $soft_break = sprintf(' =%s', static::$LE);
+        } else {
+            $soft_break = static::$LE;
+        }
+        // If utf-8 encoding is used, we will need to make sure we don't
+        // split multibyte characters when we wrap
+        $is_utf8 = 'utf-8' == strtolower($this->CharSet);
+        $lelen = strlen(static::$LE);
+        $crlflen = strlen(static::$LE);
+
+        $message = static::normalizeBreaks($message);
+        //Remove a trailing line break
+        if (substr($message, -$lelen) == static::$LE) {
+            $message = substr($message, 0, -$lelen);
+        }
+
+        //Split message into lines
+        $lines = explode(static::$LE, $message);
+        //Message will be rebuilt in here
+        $message = '';
+        foreach ($lines as $line) {
+            $words = explode(' ', $line);
+            $buf = '';
+            $firstword = true;
+            foreach ($words as $word) {
+                if ($qp_mode and (strlen($word) > $length)) {
+                    $space_left = $length - strlen($buf) - $crlflen;
+                    if (!$firstword) {
+                        if ($space_left > 20) {
+                            $len = $space_left;
+                            if ($is_utf8) {
+                                $len = $this->utf8CharBoundary($word, $len);
+                            } elseif ('=' == substr($word, $len - 1, 1)) {
+                                --$len;
+                            } elseif ('=' == substr($word, $len - 2, 1)) {
+                                $len -= 2;
+                            }
+                            $part = substr($word, 0, $len);
+                            $word = substr($word, $len);
+                            $buf .= ' ' . $part;
+                            $message .= $buf . sprintf('=%s', static::$LE);
+                        } else {
+                            $message .= $buf . $soft_break;
+                        }
+                        $buf = '';
+                    }
+                    while (strlen($word) > 0) {
+                        if ($length <= 0) {
+                            break;
+                        }
+                        $len = $length;
+                        if ($is_utf8) {
+                            $len = $this->utf8CharBoundary($word, $len);
+                        } elseif ('=' == substr($word, $len - 1, 1)) {
+                            --$len;
+                        } elseif ('=' == substr($word, $len - 2, 1)) {
+                            $len -= 2;
+                        }
+                        $part = substr($word, 0, $len);
+                        $word = substr($word, $len);
+
+                        if (strlen($word) > 0) {
+                            $message .= $part . sprintf('=%s', static::$LE);
+                        } else {
+                            $buf = $part;
+                        }
+                    }
+                } else {
+                    $buf_o = $buf;
+                    if (!$firstword) {
+                        $buf .= ' ';
+                    }
+                    $buf .= $word;
+
+                    if (strlen($buf) > $length and '' != $buf_o) {
+                        $message .= $buf_o . $soft_break;
+                        $buf = $word;
+                    }
+                }
+                $firstword = false;
+            }
+            $message .= $buf . static::$LE;
+        }
+
+        return $message;
+    }
+
+    /**
+     * Find the last character boundary prior to $maxLength in a utf-8
+     * quoted-printable encoded string.
+     * Original written by Colin Brown.
+     *
+     * @param string $encodedText utf-8 QP text
+     * @param int    $maxLength   Find the last character boundary prior to this length
+     *
+     * @return int
+     */
+    public function utf8CharBoundary($encodedText, $maxLength)
+    {
+        $foundSplitPos = false;
+        $lookBack = 3;
+        while (!$foundSplitPos) {
+            $lastChunk = substr($encodedText, $maxLength - $lookBack, $lookBack);
+            $encodedCharPos = strpos($lastChunk, '=');
+            if (false !== $encodedCharPos) {
+                // Found start of encoded character byte within $lookBack block.
+                // Check the encoded byte value (the 2 chars after the '=')
+                $hex = substr($encodedText, $maxLength - $lookBack + $encodedCharPos + 1, 2);
+                $dec = hexdec($hex);
+                if ($dec < 128) {
+                    // Single byte character.
+                    // If the encoded char was found at pos 0, it will fit
+                    // otherwise reduce maxLength to start of the encoded char
+                    if ($encodedCharPos > 0) {
+                        $maxLength -= $lookBack - $encodedCharPos;
+                    }
+                    $foundSplitPos = true;
+                } elseif ($dec >= 192) {
+                    // First byte of a multi byte character
+                    // Reduce maxLength to split at start of character
+                    $maxLength -= $lookBack - $encodedCharPos;
+                    $foundSplitPos = true;
+                } elseif ($dec < 192) {
+                    // Middle byte of a multi byte character, look further back
+                    $lookBack += 3;
+                }
+            } else {
+                // No encoded character found
+                $foundSplitPos = true;
+            }
+        }
+
+        return $maxLength;
+    }
+
+    /**
+     * Apply word wrapping to the message body.
+     * Wraps the message body to the number of chars set in the WordWrap property.
+     * You should only do this to plain-text bodies as wrapping HTML tags may break them.
+     * This is called automatically by createBody(), so you don't need to call it yourself.
+     */
+    public function setWordWrap()
+    {
+        if ($this->WordWrap < 1) {
+            return;
+        }
+
+        switch ($this->message_type) {
+            case 'alt':
+            case 'alt_inline':
+            case 'alt_attach':
+            case 'alt_inline_attach':
+                $this->AltBody = $this->wrapText($this->AltBody, $this->WordWrap);
+                break;
+            default:
+                $this->Body = $this->wrapText($this->Body, $this->WordWrap);
+                break;
+        }
+    }
+
+    /**
+     * Assemble message headers.
+     *
+     * @return string The assembled headers
+     */
+    public function createHeader()
+    {
+        $result = '';
+
+        $result .= $this->headerLine('Date', '' == $this->MessageDate ? self::rfcDate() : $this->MessageDate);
+
+        // To be created automatically by mail()
+        if ($this->SingleTo) {
+            if ('mail' != $this->Mailer) {
+                foreach ($this->to as $toaddr) {
+                    $this->SingleToArray[] = $this->addrFormat($toaddr);
+                }
+            }
+        } else {
+            if (count($this->to) > 0) {
+                if ('mail' != $this->Mailer) {
+                    $result .= $this->addrAppend('To', $this->to);
+                }
+            } elseif (count($this->cc) == 0) {
+                $result .= $this->headerLine('To', 'undisclosed-recipients:;');
+            }
+        }
+
+        $result .= $this->addrAppend('From', [[trim($this->From), $this->FromName]]);
+
+        // sendmail and mail() extract Cc from the header before sending
+        if (count($this->cc) > 0) {
+            $result .= $this->addrAppend('Cc', $this->cc);
+        }
+
+        // sendmail and mail() extract Bcc from the header before sending
+        if ((
+                'sendmail' == $this->Mailer or 'qmail' == $this->Mailer or 'mail' == $this->Mailer
+            )
+            and count($this->bcc) > 0
+        ) {
+            $result .= $this->addrAppend('Bcc', $this->bcc);
+        }
+
+        if (count($this->ReplyTo) > 0) {
+            $result .= $this->addrAppend('Reply-To', $this->ReplyTo);
+        }
+
+        // mail() sets the subject itself
+        if ('mail' != $this->Mailer) {
+            $result .= $this->headerLine('Subject', $this->encodeHeader($this->secureHeader($this->Subject)));
+        }
+
+        // Only allow a custom message ID if it conforms to RFC 5322 section 3.6.4
+        // https://tools.ietf.org/html/rfc5322#section-3.6.4
+        if ('' != $this->MessageID and preg_match('/^<.*@.*>$/', $this->MessageID)) {
+            $this->lastMessageID = $this->MessageID;
+        } else {
+            $this->lastMessageID = sprintf('<%s@%s>', $this->uniqueid, $this->serverHostname());
+        }
+        $result .= $this->headerLine('Message-ID', $this->lastMessageID);
+        if (null !== $this->Priority) {
+            $result .= $this->headerLine('X-Priority', $this->Priority);
+        }
+        if ('' == $this->XMailer) {
+            $result .= $this->headerLine(
+                'X-Mailer',
+                'PHPMailer ' . self::VERSION . ' (https://github.com/PHPMailer/PHPMailer)'
+            );
+        } else {
+            $myXmailer = trim($this->XMailer);
+            if ($myXmailer) {
+                $result .= $this->headerLine('X-Mailer', $myXmailer);
+            }
+        }
+
+        if ('' != $this->ConfirmReadingTo) {
+            $result .= $this->headerLine('Disposition-Notification-To', '<' . $this->ConfirmReadingTo . '>');
+        }
+
+        // Add custom headers
+        foreach ($this->CustomHeader as $header) {
+            $result .= $this->headerLine(
+                trim($header[0]),
+                $this->encodeHeader(trim($header[1]))
+            );
+        }
+        if (!$this->sign_key_file) {
+            $result .= $this->headerLine('MIME-Version', '1.0');
+            $result .= $this->getMailMIME();
+        }
+
+        return $result;
+    }
+
+    /**
+     * Get the message MIME type headers.
+     *
+     * @return string
+     */
+    public function getMailMIME()
+    {
+        $result = '';
+        $ismultipart = true;
+        switch ($this->message_type) {
+            case 'inline':
+                $result .= $this->headerLine('Content-Type', static::CONTENT_TYPE_MULTIPART_RELATED . ';');
+                $result .= $this->textLine("\tboundary=\"" . $this->boundary[1] . '"');
+                break;
+            case 'attach':
+            case 'inline_attach':
+            case 'alt_attach':
+            case 'alt_inline_attach':
+                $result .= $this->headerLine('Content-Type', static::CONTENT_TYPE_MULTIPART_MIXED . ';');
+                $result .= $this->textLine("\tboundary=\"" . $this->boundary[1] . '"');
+                break;
+            case 'alt':
+            case 'alt_inline':
+                $result .= $this->headerLine('Content-Type', static::CONTENT_TYPE_MULTIPART_ALTERNATIVE . ';');
+                $result .= $this->textLine("\tboundary=\"" . $this->boundary[1] . '"');
+                break;
+            default:
+                // Catches case 'plain': and case '':
+                $result .= $this->textLine('Content-Type: ' . $this->ContentType . '; charset=' . $this->CharSet);
+                $ismultipart = false;
+                break;
+        }
+        // RFC1341 part 5 says 7bit is assumed if not specified
+        if (static::ENCODING_7BIT != $this->Encoding) {
+            // RFC 2045 section 6.4 says multipart MIME parts may only use 7bit, 8bit or binary CTE
+            if ($ismultipart) {
+                if (static::ENCODING_8BIT == $this->Encoding) {
+                    $result .= $this->headerLine('Content-Transfer-Encoding', static::ENCODING_8BIT);
+                }
+                // The only remaining alternatives are quoted-printable and base64, which are both 7bit compatible
+            } else {
+                $result .= $this->headerLine('Content-Transfer-Encoding', $this->Encoding);
+            }
+        }
+
+        if ('mail' != $this->Mailer) {
+            $result .= static::$LE;
+        }
+
+        return $result;
+    }
+
+    /**
+     * Returns the whole MIME message.
+     * Includes complete headers and body.
+     * Only valid post preSend().
+     *
+     * @see PHPMailer::preSend()
+     *
+     * @return string
+     */
+    public function getSentMIMEMessage()
+    {
+        return rtrim($this->MIMEHeader . $this->mailHeader, "\n\r") . static::$LE . static::$LE . $this->MIMEBody;
+    }
+
+    /**
+     * Create a unique ID to use for boundaries.
+     *
+     * @return string
+     */
+    protected function generateId()
+    {
+        $len = 32; //32 bytes = 256 bits
+        if (function_exists('random_bytes')) {
+            $bytes = random_bytes($len);
+        } elseif (function_exists('openssl_random_pseudo_bytes')) {
+            $bytes = openssl_random_pseudo_bytes($len);
+        } else {
+            //Use a hash to force the length to the same as the other methods
+            $bytes = hash('sha256', uniqid((string) mt_rand(), true), true);
+        }
+
+        //We don't care about messing up base64 format here, just want a random string
+        return str_replace(['=', '+', '/'], '', base64_encode(hash('sha256', $bytes, true)));
+    }
+
+    /**
+     * Assemble the message body.
+     * Returns an empty string on failure.
+     *
+     * @throws Exception
+     *
+     * @return string The assembled message body
+     */
+    public function createBody()
+    {
+        $body = '';
+        //Create unique IDs and preset boundaries
+        $this->uniqueid = $this->generateId();
+        $this->boundary[1] = 'b1_' . $this->uniqueid;
+        $this->boundary[2] = 'b2_' . $this->uniqueid;
+        $this->boundary[3] = 'b3_' . $this->uniqueid;
+
+        if ($this->sign_key_file) {
+            $body .= $this->getMailMIME() . static::$LE;
+        }
+
+        $this->setWordWrap();
+
+        $bodyEncoding = $this->Encoding;
+        $bodyCharSet = $this->CharSet;
+        //Can we do a 7-bit downgrade?
+        if (static::ENCODING_8BIT == $bodyEncoding and !$this->has8bitChars($this->Body)) {
+            $bodyEncoding = static::ENCODING_7BIT;
+            //All ISO 8859, Windows codepage and UTF-8 charsets are ascii compatible up to 7-bit
+            $bodyCharSet = 'us-ascii';
+        }
+        //If lines are too long, and we're not already using an encoding that will shorten them,
+        //change to quoted-printable transfer encoding for the body part only
+        if (static::ENCODING_BASE64 != $this->Encoding and static::hasLineLongerThanMax($this->Body)) {
+            $bodyEncoding = static::ENCODING_QUOTED_PRINTABLE;
+        }
+
+        $altBodyEncoding = $this->Encoding;
+        $altBodyCharSet = $this->CharSet;
+        //Can we do a 7-bit downgrade?
+        if (static::ENCODING_8BIT == $altBodyEncoding and !$this->has8bitChars($this->AltBody)) {
+            $altBodyEncoding = static::ENCODING_7BIT;
+            //All ISO 8859, Windows codepage and UTF-8 charsets are ascii compatible up to 7-bit
+            $altBodyCharSet = 'us-ascii';
+        }
+        //If lines are too long, and we're not already using an encoding that will shorten them,
+        //change to quoted-printable transfer encoding for the alt body part only
+        if (static::ENCODING_BASE64 != $altBodyEncoding and static::hasLineLongerThanMax($this->AltBody)) {
+            $altBodyEncoding = static::ENCODING_QUOTED_PRINTABLE;
+        }
+        //Use this as a preamble in all multipart message types
+        $mimepre = 'This is a multi-part message in MIME format.' . static::$LE;
+        switch ($this->message_type) {
+            case 'inline':
+                $body .= $mimepre;
+                $body .= $this->getBoundary($this->boundary[1], $bodyCharSet, '', $bodyEncoding);
+                $body .= $this->encodeString($this->Body, $bodyEncoding);
+                $body .= static::$LE;
+                $body .= $this->attachAll('inline', $this->boundary[1]);
+                break;
+            case 'attach':
+                $body .= $mimepre;
+                $body .= $this->getBoundary($this->boundary[1], $bodyCharSet, '', $bodyEncoding);
+                $body .= $this->encodeString($this->Body, $bodyEncoding);
+                $body .= static::$LE;
+                $body .= $this->attachAll('attachment', $this->boundary[1]);
+                break;
+            case 'inline_attach':
+                $body .= $mimepre;
+                $body .= $this->textLine('--' . $this->boundary[1]);
+                $body .= $this->headerLine('Content-Type', static::CONTENT_TYPE_MULTIPART_RELATED . ';');
+                $body .= $this->textLine("\tboundary=\"" . $this->boundary[2] . '"');
+                $body .= static::$LE;
+                $body .= $this->getBoundary($this->boundary[2], $bodyCharSet, '', $bodyEncoding);
+                $body .= $this->encodeString($this->Body, $bodyEncoding);
+                $body .= static::$LE;
+                $body .= $this->attachAll('inline', $this->boundary[2]);
+                $body .= static::$LE;
+                $body .= $this->attachAll('attachment', $this->boundary[1]);
+                break;
+            case 'alt':
+                $body .= $mimepre;
+                $body .= $this->getBoundary($this->boundary[1], $altBodyCharSet, static::CONTENT_TYPE_PLAINTEXT, $altBodyEncoding);
+                $body .= $this->encodeString($this->AltBody, $altBodyEncoding);
+                $body .= static::$LE;
+                $body .= $this->getBoundary($this->boundary[1], $bodyCharSet, static::CONTENT_TYPE_TEXT_HTML, $bodyEncoding);
+                $body .= $this->encodeString($this->Body, $bodyEncoding);
+                $body .= static::$LE;
+                if (!empty($this->Ical)) {
+                    $body .= $this->getBoundary($this->boundary[1], '', static::CONTENT_TYPE_TEXT_CALENDAR . '; method=REQUEST', '');
+                    $body .= $this->encodeString($this->Ical, $this->Encoding);
+                    $body .= static::$LE;
+                }
+                $body .= $this->endBoundary($this->boundary[1]);
+                break;
+            case 'alt_inline':
+                $body .= $mimepre;
+                $body .= $this->getBoundary($this->boundary[1], $altBodyCharSet, static::CONTENT_TYPE_PLAINTEXT, $altBodyEncoding);
+                $body .= $this->encodeString($this->AltBody, $altBodyEncoding);
+                $body .= static::$LE;
+                $body .= $this->textLine('--' . $this->boundary[1]);
+                $body .= $this->headerLine('Content-Type', static::CONTENT_TYPE_MULTIPART_RELATED . ';');
+                $body .= $this->textLine("\tboundary=\"" . $this->boundary[2] . '"');
+                $body .= static::$LE;
+                $body .= $this->getBoundary($this->boundary[2], $bodyCharSet, static::CONTENT_TYPE_TEXT_HTML, $bodyEncoding);
+                $body .= $this->encodeString($this->Body, $bodyEncoding);
+                $body .= static::$LE;
+                $body .= $this->attachAll('inline', $this->boundary[2]);
+                $body .= static::$LE;
+                $body .= $this->endBoundary($this->boundary[1]);
+                break;
+            case 'alt_attach':
+                $body .= $mimepre;
+                $body .= $this->textLine('--' . $this->boundary[1]);
+                $body .= $this->headerLine('Content-Type', static::CONTENT_TYPE_MULTIPART_ALTERNATIVE . ';');
+                $body .= $this->textLine("\tboundary=\"" . $this->boundary[2] . '"');
+                $body .= static::$LE;
+                $body .= $this->getBoundary($this->boundary[2], $altBodyCharSet, static::CONTENT_TYPE_PLAINTEXT, $altBodyEncoding);
+                $body .= $this->encodeString($this->AltBody, $altBodyEncoding);
+                $body .= static::$LE;
+                $body .= $this->getBoundary($this->boundary[2], $bodyCharSet, static::CONTENT_TYPE_TEXT_HTML, $bodyEncoding);
+                $body .= $this->encodeString($this->Body, $bodyEncoding);
+                $body .= static::$LE;
+                if (!empty($this->Ical)) {
+                    $body .= $this->getBoundary($this->boundary[2], '', static::CONTENT_TYPE_TEXT_CALENDAR . '; method=REQUEST', '');
+                    $body .= $this->encodeString($this->Ical, $this->Encoding);
+                }
+                $body .= $this->endBoundary($this->boundary[2]);
+                $body .= static::$LE;
+                $body .= $this->attachAll('attachment', $this->boundary[1]);
+                break;
+            case 'alt_inline_attach':
+                $body .= $mimepre;
+                $body .= $this->textLine('--' . $this->boundary[1]);
+                $body .= $this->headerLine('Content-Type', static::CONTENT_TYPE_MULTIPART_ALTERNATIVE . ';');
+                $body .= $this->textLine("\tboundary=\"" . $this->boundary[2] . '"');
+                $body .= static::$LE;
+                $body .= $this->getBoundary($this->boundary[2], $altBodyCharSet, static::CONTENT_TYPE_PLAINTEXT, $altBodyEncoding);
+                $body .= $this->encodeString($this->AltBody, $altBodyEncoding);
+                $body .= static::$LE;
+                $body .= $this->textLine('--' . $this->boundary[2]);
+                $body .= $this->headerLine('Content-Type', static::CONTENT_TYPE_MULTIPART_RELATED . ';');
+                $body .= $this->textLine("\tboundary=\"" . $this->boundary[3] . '"');
+                $body .= static::$LE;
+                $body .= $this->getBoundary($this->boundary[3], $bodyCharSet, static::CONTENT_TYPE_TEXT_HTML, $bodyEncoding);
+                $body .= $this->encodeString($this->Body, $bodyEncoding);
+                $body .= static::$LE;
+                $body .= $this->attachAll('inline', $this->boundary[3]);
+                $body .= static::$LE;
+                $body .= $this->endBoundary($this->boundary[2]);
+                $body .= static::$LE;
+                $body .= $this->attachAll('attachment', $this->boundary[1]);
+                break;
+            default:
+                // Catch case 'plain' and case '', applies to simple `text/plain` and `text/html` body content types
+                //Reset the `Encoding` property in case we changed it for line length reasons
+                $this->Encoding = $bodyEncoding;
+                $body .= $this->encodeString($this->Body, $this->Encoding);
+                break;
+        }
+
+        if ($this->isError()) {
+            $body = '';
+            if ($this->exceptions) {
+                throw new Exception($this->lang('empty_message'), self::STOP_CRITICAL);
+            }
+        } elseif ($this->sign_key_file) {
+            try {
+                if (!defined('PKCS7_TEXT')) {
+                    throw new Exception($this->lang('extension_missing') . 'openssl');
+                }
+                // @TODO would be nice to use php://temp streams here
+                $file = tempnam(sys_get_temp_dir(), 'mail');
+                if (false === file_put_contents($file, $body)) {
+                    throw new Exception($this->lang('signing') . ' Could not write temp file');
+                }
+                $signed = tempnam(sys_get_temp_dir(), 'signed');
+                //Workaround for PHP bug https://bugs.php.net/bug.php?id=69197
+                if (empty($this->sign_extracerts_file)) {
+                    $sign = @openssl_pkcs7_sign(
+                        $file,
+                        $signed,
+                        'file://' . realpath($this->sign_cert_file),
+                        ['file://' . realpath($this->sign_key_file), $this->sign_key_pass],
+                        []
+                    );
+                } else {
+                    $sign = @openssl_pkcs7_sign(
+                        $file,
+                        $signed,
+                        'file://' . realpath($this->sign_cert_file),
+                        ['file://' . realpath($this->sign_key_file), $this->sign_key_pass],
+                        [],
+                        PKCS7_DETACHED,
+                        $this->sign_extracerts_file
+                    );
+                }
+                @unlink($file);
+                if ($sign) {
+                    $body = file_get_contents($signed);
+                    @unlink($signed);
+                    //The message returned by openssl contains both headers and body, so need to split them up
+                    $parts = explode("\n\n", $body, 2);
+                    $this->MIMEHeader .= $parts[0] . static::$LE . static::$LE;
+                    $body = $parts[1];
+                } else {
+                    @unlink($signed);
+                    throw new Exception($this->lang('signing') . openssl_error_string());
+                }
+            } catch (Exception $exc) {
+                $body = '';
+                if ($this->exceptions) {
+                    throw $exc;
+                }
+            }
+        }
+
+        return $body;
+    }
+
+    /**
+     * Return the start of a message boundary.
+     *
+     * @param string $boundary
+     * @param string $charSet
+     * @param string $contentType
+     * @param string $encoding
+     *
+     * @return string
+     */
+    protected function getBoundary($boundary, $charSet, $contentType, $encoding)
+    {
+        $result = '';
+        if ('' == $charSet) {
+            $charSet = $this->CharSet;
+        }
+        if ('' == $contentType) {
+            $contentType = $this->ContentType;
+        }
+        if ('' == $encoding) {
+            $encoding = $this->Encoding;
+        }
+        $result .= $this->textLine('--' . $boundary);
+        $result .= sprintf('Content-Type: %s; charset=%s', $contentType, $charSet);
+        $result .= static::$LE;
+        // RFC1341 part 5 says 7bit is assumed if not specified
+        if (static::ENCODING_7BIT != $encoding) {
+            $result .= $this->headerLine('Content-Transfer-Encoding', $encoding);
+        }
+        $result .= static::$LE;
+
+        return $result;
+    }
+
+    /**
+     * Return the end of a message boundary.
+     *
+     * @param string $boundary
+     *
+     * @return string
+     */
+    protected function endBoundary($boundary)
+    {
+        return static::$LE . '--' . $boundary . '--' . static::$LE;
+    }
+
+    /**
+     * Set the message type.
+     * PHPMailer only supports some preset message types, not arbitrary MIME structures.
+     */
+    protected function setMessageType()
+    {
+        $type = [];
+        if ($this->alternativeExists()) {
+            $type[] = 'alt';
+        }
+        if ($this->inlineImageExists()) {
+            $type[] = 'inline';
+        }
+        if ($this->attachmentExists()) {
+            $type[] = 'attach';
+        }
+        $this->message_type = implode('_', $type);
+        if ('' == $this->message_type) {
+            //The 'plain' message_type refers to the message having a single body element, not that it is plain-text
+            $this->message_type = 'plain';
+        }
+    }
+
+    /**
+     * Format a header line.
+     *
+     * @param string     $name
+     * @param string|int $value
+     *
+     * @return string
+     */
+    public function headerLine($name, $value)
+    {
+        return $name . ': ' . $value . static::$LE;
+    }
+
+    /**
+     * Return a formatted mail line.
+     *
+     * @param string $value
+     *
+     * @return string
+     */
+    public function textLine($value)
+    {
+        return $value . static::$LE;
+    }
+
+    /**
+     * Add an attachment from a path on the filesystem.
+     * Never use a user-supplied path to a file!
+     * Returns false if the file could not be found or read.
+     *
+     * @param string $path        Path to the attachment
+     * @param string $name        Overrides the attachment name
+     * @param string $encoding    File encoding (see $Encoding)
+     * @param string $type        File extension (MIME) type
+     * @param string $disposition Disposition to use
+     *
+     * @throws Exception
+     *
+     * @return bool
+     */
+    public function addAttachment($path, $name = '', $encoding = self::ENCODING_BASE64, $type = '', $disposition = 'attachment')
+    {
+        try {
+            if (!@is_file($path)) {
+                throw new Exception($this->lang('file_access') . $path, self::STOP_CONTINUE);
+            }
+
+            // If a MIME type is not specified, try to work it out from the file name
+            if ('' == $type) {
+                $type = static::filenameToType($path);
+            }
+
+            $filename = basename($path);
+            if ('' == $name) {
+                $name = $filename;
+            }
+
+            $this->attachment[] = [
+                0 => $path,
+                1 => $filename,
+                2 => $name,
+                3 => $encoding,
+                4 => $type,
+                5 => false, // isStringAttachment
+                6 => $disposition,
+                7 => $name,
+            ];
+        } catch (Exception $exc) {
+            $this->setError($exc->getMessage());
+            $this->edebug($exc->getMessage());
+            if ($this->exceptions) {
+                throw $exc;
+            }
+
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Return the array of attachments.
+     *
+     * @return array
+     */
+    public function getAttachments()
+    {
+        return $this->attachment;
+    }
+
+    /**
+     * Attach all file, string, and binary attachments to the message.
+     * Returns an empty string on failure.
+     *
+     * @param string $disposition_type
+     * @param string $boundary
+     *
+     * @return string
+     */
+    protected function attachAll($disposition_type, $boundary)
+    {
+        // Return text of body
+        $mime = [];
+        $cidUniq = [];
+        $incl = [];
+
+        // Add all attachments
+        foreach ($this->attachment as $attachment) {
+            // Check if it is a valid disposition_filter
+            if ($attachment[6] == $disposition_type) {
+                // Check for string attachment
+                $string = '';
+                $path = '';
+                $bString = $attachment[5];
+                if ($bString) {
+                    $string = $attachment[0];
+                } else {
+                    $path = $attachment[0];
+                }
+
+                $inclhash = hash('sha256', serialize($attachment));
+                if (in_array($inclhash, $incl)) {
+                    continue;
+                }
+                $incl[] = $inclhash;
+                $name = $attachment[2];
+                $encoding = $attachment[3];
+                $type = $attachment[4];
+                $disposition = $attachment[6];
+                $cid = $attachment[7];
+                if ('inline' == $disposition and array_key_exists($cid, $cidUniq)) {
+                    continue;
+                }
+                $cidUniq[$cid] = true;
+
+                $mime[] = sprintf('--%s%s', $boundary, static::$LE);
+                //Only include a filename property if we have one
+                if (!empty($name)) {
+                    $mime[] = sprintf(
+                        'Content-Type: %s; name="%s"%s',
+                        $type,
+                        $this->encodeHeader($this->secureHeader($name)),
+                        static::$LE
+                    );
+                } else {
+                    $mime[] = sprintf(
+                        'Content-Type: %s%s',
+                        $type,
+                        static::$LE
+                    );
+                }
+                // RFC1341 part 5 says 7bit is assumed if not specified
+                if (static::ENCODING_7BIT != $encoding) {
+                    $mime[] = sprintf('Content-Transfer-Encoding: %s%s', $encoding, static::$LE);
+                }
+
+                if (!empty($cid)) {
+                    $mime[] = sprintf('Content-ID: <%s>%s', $cid, static::$LE);
+                }
+
+                // If a filename contains any of these chars, it should be quoted,
+                // but not otherwise: RFC2183 & RFC2045 5.1
+                // Fixes a warning in IETF's msglint MIME checker
+                // Allow for bypassing the Content-Disposition header totally
+                if (!(empty($disposition))) {
+                    $encoded_name = $this->encodeHeader($this->secureHeader($name));
+                    if (preg_match('/[ \(\)<>@,;:\\"\/\[\]\?=]/', $encoded_name)) {
+                        $mime[] = sprintf(
+                            'Content-Disposition: %s; filename="%s"%s',
+                            $disposition,
+                            $encoded_name,
+                            static::$LE . static::$LE
+                        );
+                    } else {
+                        if (!empty($encoded_name)) {
+                            $mime[] = sprintf(
+                                'Content-Disposition: %s; filename=%s%s',
+                                $disposition,
+                                $encoded_name,
+                                static::$LE . static::$LE
+                            );
+                        } else {
+                            $mime[] = sprintf(
+                                'Content-Disposition: %s%s',
+                                $disposition,
+                                static::$LE . static::$LE
+                            );
+                        }
+                    }
+                } else {
+                    $mime[] = static::$LE;
+                }
+
+                // Encode as string attachment
+                if ($bString) {
+                    $mime[] = $this->encodeString($string, $encoding);
+                } else {
+                    $mime[] = $this->encodeFile($path, $encoding);
+                }
+                if ($this->isError()) {
+                    return '';
+                }
+                $mime[] = static::$LE;
+            }
+        }
+
+        $mime[] = sprintf('--%s--%s', $boundary, static::$LE);
+
+        return implode('', $mime);
+    }
+
+    /**
+     * Encode a file attachment in requested format.
+     * Returns an empty string on failure.
+     *
+     * @param string $path     The full path to the file
+     * @param string $encoding The encoding to use; one of 'base64', '7bit', '8bit', 'binary', 'quoted-printable'
+     *
+     * @throws Exception
+     *
+     * @return string
+     */
+    protected function encodeFile($path, $encoding = self::ENCODING_BASE64)
+    {
+        try {
+            if (!file_exists($path)) {
+                throw new Exception($this->lang('file_open') . $path, self::STOP_CONTINUE);
+            }
+            $file_buffer = file_get_contents($path);
+            if (false === $file_buffer) {
+                throw new Exception($this->lang('file_open') . $path, self::STOP_CONTINUE);
+            }
+            $file_buffer = $this->encodeString($file_buffer, $encoding);
+
+            return $file_buffer;
+        } catch (Exception $exc) {
+            $this->setError($exc->getMessage());
+
+            return '';
+        }
+    }
+
+    /**
+     * Encode a string in requested format.
+     * Returns an empty string on failure.
+     *
+     * @param string $str      The text to encode
+     * @param string $encoding The encoding to use; one of 'base64', '7bit', '8bit', 'binary', 'quoted-printable'
+     *
+     * @return string
+     */
+    public function encodeString($str, $encoding = self::ENCODING_BASE64)
+    {
+        $encoded = '';
+        switch (strtolower($encoding)) {
+            case static::ENCODING_BASE64:
+                $encoded = chunk_split(
+                    base64_encode($str),
+                    static::STD_LINE_LENGTH,
+                    static::$LE
+                );
+                break;
+            case static::ENCODING_7BIT:
+            case static::ENCODING_8BIT:
+                $encoded = static::normalizeBreaks($str);
+                // Make sure it ends with a line break
+                if (substr($encoded, -(strlen(static::$LE))) != static::$LE) {
+                    $encoded .= static::$LE;
+                }
+                break;
+            case static::ENCODING_BINARY:
+                $encoded = $str;
+                break;
+            case static::ENCODING_QUOTED_PRINTABLE:
+                $encoded = $this->encodeQP($str);
+                break;
+            default:
+                $this->setError($this->lang('encoding') . $encoding);
+                break;
+        }
+
+        return $encoded;
+    }
+
+    /**
+     * Encode a header value (not including its label) optimally.
+     * Picks shortest of Q, B, or none. Result includes folding if needed.
+     * See RFC822 definitions for phrase, comment and text positions.
+     *
+     * @param string $str      The header value to encode
+     * @param string $position What context the string will be used in
+     *
+     * @return string
+     */
+    public function encodeHeader($str, $position = 'text')
+    {
+        $matchcount = 0;
+        switch (strtolower($position)) {
+            case 'phrase':
+                if (!preg_match('/[\200-\377]/', $str)) {
+                    // Can't use addslashes as we don't know the value of magic_quotes_sybase
+                    $encoded = addcslashes($str, "\0..\37\177\\\"");
+                    if (($str == $encoded) and !preg_match('/[^A-Za-z0-9!#$%&\'*+\/=?^_`{|}~ -]/', $str)) {
+                        return $encoded;
+                    }
+
+                    return "\"$encoded\"";
+                }
+                $matchcount = preg_match_all('/[^\040\041\043-\133\135-\176]/', $str, $matches);
+                break;
+            /* @noinspection PhpMissingBreakStatementInspection */
+            case 'comment':
+                $matchcount = preg_match_all('/[()"]/', $str, $matches);
+            //fallthrough
+            case 'text':
+            default:
+                $matchcount += preg_match_all('/[\000-\010\013\014\016-\037\177-\377]/', $str, $matches);
+                break;
+        }
+
+        //RFCs specify a maximum line length of 78 chars, however mail() will sometimes
+        //corrupt messages with headers longer than 65 chars. See #818
+        $lengthsub = 'mail' == $this->Mailer ? 13 : 0;
+        $maxlen = static::STD_LINE_LENGTH - $lengthsub;
+        // Try to select the encoding which should produce the shortest output
+        if ($matchcount > strlen($str) / 3) {
+            // More than a third of the content will need encoding, so B encoding will be most efficient
+            $encoding = 'B';
+            //This calculation is:
+            // max line length
+            // - shorten to avoid mail() corruption
+            // - Q/B encoding char overhead ("` =?<charset>?[QB]?<content>?=`")
+            // - charset name length
+            $maxlen = static::STD_LINE_LENGTH - $lengthsub - 8 - strlen($this->CharSet);
+            if ($this->hasMultiBytes($str)) {
+                // Use a custom function which correctly encodes and wraps long
+                // multibyte strings without breaking lines within a character
+                $encoded = $this->base64EncodeWrapMB($str, "\n");
+            } else {
+                $encoded = base64_encode($str);
+                $maxlen -= $maxlen % 4;
+                $encoded = trim(chunk_split($encoded, $maxlen, "\n"));
+            }
+            $encoded = preg_replace('/^(.*)$/m', ' =?' . $this->CharSet . "?$encoding?\\1?=", $encoded);
+        } elseif ($matchcount > 0) {
+            //1 or more chars need encoding, use Q-encode
+            $encoding = 'Q';
+            //Recalc max line length for Q encoding - see comments on B encode
+            $maxlen = static::STD_LINE_LENGTH - $lengthsub - 8 - strlen($this->CharSet);
+            $encoded = $this->encodeQ($str, $position);
+            $encoded = $this->wrapText($encoded, $maxlen, true);
+            $encoded = str_replace('=' . static::$LE, "\n", trim($encoded));
+            $encoded = preg_replace('/^(.*)$/m', ' =?' . $this->CharSet . "?$encoding?\\1?=", $encoded);
+        } elseif (strlen($str) > $maxlen) {
+            //No chars need encoding, but line is too long, so fold it
+            $encoded = trim($this->wrapText($str, $maxlen, false));
+            if ($str == $encoded) {
+                //Wrapping nicely didn't work, wrap hard instead
+                $encoded = trim(chunk_split($str, static::STD_LINE_LENGTH, static::$LE));
+            }
+            $encoded = str_replace(static::$LE, "\n", trim($encoded));
+            $encoded = preg_replace('/^(.*)$/m', ' \\1', $encoded);
+        } else {
+            //No reformatting needed
+            return $str;
+        }
+
+        return trim(static::normalizeBreaks($encoded));
+    }
+
+    /**
+     * Check if a string contains multi-byte characters.
+     *
+     * @param string $str multi-byte text to wrap encode
+     *
+     * @return bool
+     */
+    public function hasMultiBytes($str)
+    {
+        if (function_exists('mb_strlen')) {
+            return strlen($str) > mb_strlen($str, $this->CharSet);
+        }
+
+        // Assume no multibytes (we can't handle without mbstring functions anyway)
+        return false;
+    }
+
+    /**
+     * Does a string contain any 8-bit chars (in any charset)?
+     *
+     * @param string $text
+     *
+     * @return bool
+     */
+    public function has8bitChars($text)
+    {
+        return (bool) preg_match('/[\x80-\xFF]/', $text);
+    }
+
+    /**
+     * Encode and wrap long multibyte strings for mail headers
+     * without breaking lines within a character.
+     * Adapted from a function by paravoid.
+     *
+     * @see http://www.php.net/manual/en/function.mb-encode-mimeheader.php#60283
+     *
+     * @param string $str       multi-byte text to wrap encode
+     * @param string $linebreak string to use as linefeed/end-of-line
+     *
+     * @return string
+     */
+    public function base64EncodeWrapMB($str, $linebreak = null)
+    {
+        $start = '=?' . $this->CharSet . '?B?';
+        $end = '?=';
+        $encoded = '';
+        if (null === $linebreak) {
+            $linebreak = static::$LE;
+        }
+
+        $mb_length = mb_strlen($str, $this->CharSet);
+        // Each line must have length <= 75, including $start and $end
+        $length = 75 - strlen($start) - strlen($end);
+        // Average multi-byte ratio
+        $ratio = $mb_length / strlen($str);
+        // Base64 has a 4:3 ratio
+        $avgLength = floor($length * $ratio * .75);
+
+        for ($i = 0; $i < $mb_length; $i += $offset) {
+            $lookBack = 0;
+            do {
+                $offset = $avgLength - $lookBack;
+                $chunk = mb_substr($str, $i, $offset, $this->CharSet);
+                $chunk = base64_encode($chunk);
+                ++$lookBack;
+            } while (strlen($chunk) > $length);
+            $encoded .= $chunk . $linebreak;
+        }
+
+        // Chomp the last linefeed
+        return substr($encoded, 0, -strlen($linebreak));
+    }
+
+    /**
+     * Encode a string in quoted-printable format.
+     * According to RFC2045 section 6.7.
+     *
+     * @param string $string The text to encode
+     *
+     * @return string
+     */
+    public function encodeQP($string)
+    {
+        return static::normalizeBreaks(quoted_printable_encode($string));
+    }
+
+    /**
+     * Encode a string using Q encoding.
+     *
+     * @see http://tools.ietf.org/html/rfc2047#section-4.2
+     *
+     * @param string $str      the text to encode
+     * @param string $position Where the text is going to be used, see the RFC for what that means
+     *
+     * @return string
+     */
+    public function encodeQ($str, $position = 'text')
+    {
+        // There should not be any EOL in the string
+        $pattern = '';
+        $encoded = str_replace(["\r", "\n"], '', $str);
+        switch (strtolower($position)) {
+            case 'phrase':
+                // RFC 2047 section 5.3
+                $pattern = '^A-Za-z0-9!*+\/ -';
+                break;
+            /*
+             * RFC 2047 section 5.2.
+             * Build $pattern without including delimiters and []
+             */
+            /* @noinspection PhpMissingBreakStatementInspection */
+            case 'comment':
+                $pattern = '\(\)"';
+            /* Intentional fall through */
+            case 'text':
+            default:
+                // RFC 2047 section 5.1
+                // Replace every high ascii, control, =, ? and _ characters
+                /** @noinspection SuspiciousAssignmentsInspection */
+                $pattern = '\000-\011\013\014\016-\037\075\077\137\177-\377' . $pattern;
+                break;
+        }
+        $matches = [];
+        if (preg_match_all("/[{$pattern}]/", $encoded, $matches)) {
+            // If the string contains an '=', make sure it's the first thing we replace
+            // so as to avoid double-encoding
+            $eqkey = array_search('=', $matches[0]);
+            if (false !== $eqkey) {
+                unset($matches[0][$eqkey]);
+                array_unshift($matches[0], '=');
+            }
+            foreach (array_unique($matches[0]) as $char) {
+                $encoded = str_replace($char, '=' . sprintf('%02X', ord($char)), $encoded);
+            }
+        }
+        // Replace spaces with _ (more readable than =20)
+        // RFC 2047 section 4.2(2)
+        return str_replace(' ', '_', $encoded);
+    }
+
+    /**
+     * Add a string or binary attachment (non-filesystem).
+     * This method can be used to attach ascii or binary data,
+     * such as a BLOB record from a database.
+     *
+     * @param string $string      String attachment data
+     * @param string $filename    Name of the attachment
+     * @param string $encoding    File encoding (see $Encoding)
+     * @param string $type        File extension (MIME) type
+     * @param string $disposition Disposition to use
+     */
+    public function addStringAttachment(
+        $string,
+        $filename,
+        $encoding = self::ENCODING_BASE64,
+        $type = '',
+        $disposition = 'attachment'
+    ) {
+        // If a MIME type is not specified, try to work it out from the file name
+        if ('' == $type) {
+            $type = static::filenameToType($filename);
+        }
+        // Append to $attachment array
+        $this->attachment[] = [
+            0 => $string,
+            1 => $filename,
+            2 => basename($filename),
+            3 => $encoding,
+            4 => $type,
+            5 => true, // isStringAttachment
+            6 => $disposition,
+            7 => 0,
+        ];
+    }
+
+    /**
+     * Add an embedded (inline) attachment from a file.
+     * This can include images, sounds, and just about any other document type.
+     * These differ from 'regular' attachments in that they are intended to be
+     * displayed inline with the message, not just attached for download.
+     * This is used in HTML messages that embed the images
+     * the HTML refers to using the $cid value.
+     * Never use a user-supplied path to a file!
+     *
+     * @param string $path        Path to the attachment
+     * @param string $cid         Content ID of the attachment; Use this to reference
+     *                            the content when using an embedded image in HTML
+     * @param string $name        Overrides the attachment name
+     * @param string $encoding    File encoding (see $Encoding)
+     * @param string $type        File MIME type
+     * @param string $disposition Disposition to use
+     *
+     * @return bool True on successfully adding an attachment
+     */
+    public function addEmbeddedImage($path, $cid, $name = '', $encoding = self::ENCODING_BASE64, $type = '', $disposition = 'inline')
+    {
+        if (!@is_file($path)) {
+            $this->setError($this->lang('file_access') . $path);
+
+            return false;
+        }
+
+        // If a MIME type is not specified, try to work it out from the file name
+        if ('' == $type) {
+            $type = static::filenameToType($path);
+        }
+
+        $filename = basename($path);
+        if ('' == $name) {
+            $name = $filename;
+        }
+
+        // Append to $attachment array
+        $this->attachment[] = [
+            0 => $path,
+            1 => $filename,
+            2 => $name,
+            3 => $encoding,
+            4 => $type,
+            5 => false, // isStringAttachment
+            6 => $disposition,
+            7 => $cid,
+        ];
+
+        return true;
+    }
+
+    /**
+     * Add an embedded stringified attachment.
+     * This can include images, sounds, and just about any other document type.
+     * If your filename doesn't contain an extension, be sure to set the $type to an appropriate MIME type.
+     *
+     * @param string $string      The attachment binary data
+     * @param string $cid         Content ID of the attachment; Use this to reference
+     *                            the content when using an embedded image in HTML
+     * @param string $name        A filename for the attachment. If this contains an extension,
+     *                            PHPMailer will attempt to set a MIME type for the attachment.
+     *                            For example 'file.jpg' would get an 'image/jpeg' MIME type.
+     * @param string $encoding    File encoding (see $Encoding), defaults to 'base64'
+     * @param string $type        MIME type - will be used in preference to any automatically derived type
+     * @param string $disposition Disposition to use
+     *
+     * @return bool True on successfully adding an attachment
+     */
+    public function addStringEmbeddedImage(
+        $string,
+        $cid,
+        $name = '',
+        $encoding = self::ENCODING_BASE64,
+        $type = '',
+        $disposition = 'inline'
+    ) {
+        // If a MIME type is not specified, try to work it out from the name
+        if ('' == $type and !empty($name)) {
+            $type = static::filenameToType($name);
+        }
+
+        // Append to $attachment array
+        $this->attachment[] = [
+            0 => $string,
+            1 => $name,
+            2 => $name,
+            3 => $encoding,
+            4 => $type,
+            5 => true, // isStringAttachment
+            6 => $disposition,
+            7 => $cid,
+        ];
+
+        return true;
+    }
+
+    /**
+     * Check if an embedded attachment is present with this cid.
+     *
+     * @param string $cid
+     *
+     * @return bool
+     */
+    protected function cidExists($cid)
+    {
+        foreach ($this->attachment as $attachment) {
+            if ('inline' == $attachment[6] and $cid == $attachment[7]) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Check if an inline attachment is present.
+     *
+     * @return bool
+     */
+    public function inlineImageExists()
+    {
+        foreach ($this->attachment as $attachment) {
+            if ('inline' == $attachment[6]) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Check if an attachment (non-inline) is present.
+     *
+     * @return bool
+     */
+    public function attachmentExists()
+    {
+        foreach ($this->attachment as $attachment) {
+            if ('attachment' == $attachment[6]) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Check if this message has an alternative body set.
+     *
+     * @return bool
+     */
+    public function alternativeExists()
+    {
+        return !empty($this->AltBody);
+    }
+
+    /**
+     * Clear queued addresses of given kind.
+     *
+     * @param string $kind 'to', 'cc', or 'bcc'
+     */
+    public function clearQueuedAddresses($kind)
+    {
+        $this->RecipientsQueue = array_filter(
+            $this->RecipientsQueue,
+            function ($params) use ($kind) {
+                return $params[0] != $kind;
+            }
+        );
+    }
+
+    /**
+     * Clear all To recipients.
+     */
+    public function clearAddresses()
+    {
+        foreach ($this->to as $to) {
+            unset($this->all_recipients[strtolower($to[0])]);
+        }
+        $this->to = [];
+        $this->clearQueuedAddresses('to');
+    }
+
+    /**
+     * Clear all CC recipients.
+     */
+    public function clearCCs()
+    {
+        foreach ($this->cc as $cc) {
+            unset($this->all_recipients[strtolower($cc[0])]);
+        }
+        $this->cc = [];
+        $this->clearQueuedAddresses('cc');
+    }
+
+    /**
+     * Clear all BCC recipients.
+     */
+    public function clearBCCs()
+    {
+        foreach ($this->bcc as $bcc) {
+            unset($this->all_recipients[strtolower($bcc[0])]);
+        }
+        $this->bcc = [];
+        $this->clearQueuedAddresses('bcc');
+    }
+
+    /**
+     * Clear all ReplyTo recipients.
+     */
+    public function clearReplyTos()
+    {
+        $this->ReplyTo = [];
+        $this->ReplyToQueue = [];
+    }
+
+    /**
+     * Clear all recipient types.
+     */
+    public function clearAllRecipients()
+    {
+        $this->to = [];
+        $this->cc = [];
+        $this->bcc = [];
+        $this->all_recipients = [];
+        $this->RecipientsQueue = [];
+    }
+
+    /**
+     * Clear all filesystem, string, and binary attachments.
+     */
+    public function clearAttachments()
+    {
+        $this->attachment = [];
+    }
+
+    /**
+     * Clear all custom headers.
+     */
+    public function clearCustomHeaders()
+    {
+        $this->CustomHeader = [];
+    }
+
+    /**
+     * Add an error message to the error container.
+     *
+     * @param string $msg
+     */
+    protected function setError($msg)
+    {
+        ++$this->error_count;
+        if ('smtp' == $this->Mailer and null !== $this->smtp) {
+            $lasterror = $this->smtp->getError();
+            if (!empty($lasterror['error'])) {
+                $msg .= $this->lang('smtp_error') . $lasterror['error'];
+                if (!empty($lasterror['detail'])) {
+                    $msg .= ' Detail: ' . $lasterror['detail'];
+                }
+                if (!empty($lasterror['smtp_code'])) {
+                    $msg .= ' SMTP code: ' . $lasterror['smtp_code'];
+                }
+                if (!empty($lasterror['smtp_code_ex'])) {
+                    $msg .= ' Additional SMTP info: ' . $lasterror['smtp_code_ex'];
+                }
+            }
+        }
+        $this->ErrorInfo = $msg;
+    }
+
+    /**
+     * Return an RFC 822 formatted date.
+     *
+     * @return string
+     */
+    public static function rfcDate()
+    {
+        // Set the time zone to whatever the default is to avoid 500 errors
+        // Will default to UTC if it's not set properly in php.ini
+        date_default_timezone_set(@date_default_timezone_get());
+
+        return date('D, j M Y H:i:s O');
+    }
+
+    /**
+     * Get the server hostname.
+     * Returns 'localhost.localdomain' if unknown.
+     *
+     * @return string
+     */
+    protected function serverHostname()
+    {
+        $result = '';
+        if (!empty($this->Hostname)) {
+            $result = $this->Hostname;
+        } elseif (isset($_SERVER) and array_key_exists('SERVER_NAME', $_SERVER)) {
+            $result = $_SERVER['SERVER_NAME'];
+        } elseif (function_exists('gethostname') and gethostname() !== false) {
+            $result = gethostname();
+        } elseif (php_uname('n') !== false) {
+            $result = php_uname('n');
+        }
+        if (!static::isValidHost($result)) {
+            return 'localhost.localdomain';
+        }
+
+        return $result;
+    }
+
+    /**
+     * Validate whether a string contains a valid value to use as a hostname or IP address.
+     * IPv6 addresses must include [], e.g. `[::1]`, not just `::1`.
+     *
+     * @param string $host The host name or IP address to check
+     *
+     * @return bool
+     */
+    public static function isValidHost($host)
+    {
+        //Simple syntax limits
+        if (empty($host)
+            or !is_string($host)
+            or strlen($host) > 256
+        ) {
+            return false;
+        }
+        //Looks like a bracketed IPv6 address
+        if (trim($host, '[]') != $host) {
+            return (bool) filter_var(trim($host, '[]'), FILTER_VALIDATE_IP, FILTER_FLAG_IPV6);
+        }
+        //If removing all the dots results in a numeric string, it must be an IPv4 address.
+        //Need to check this first because otherwise things like `999.0.0.0` are considered valid host names
+        if (is_numeric(str_replace('.', '', $host))) {
+            //Is it a valid IPv4 address?
+            return (bool) filter_var($host, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4);
+        }
+        if (filter_var('http://' . $host, FILTER_VALIDATE_URL, FILTER_FLAG_HOST_REQUIRED)) {
+            //Is it a syntactically valid hostname?
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Get an error message in the current language.
+     *
+     * @param string $key
+     *
+     * @return string
+     */
+    protected function lang($key)
+    {
+        if (count($this->language) < 1) {
+            $this->setLanguage('en'); // set the default language
+        }
+
+        if (array_key_exists($key, $this->language)) {
+            if ('smtp_connect_failed' == $key) {
+                //Include a link to troubleshooting docs on SMTP connection failure
+                //this is by far the biggest cause of support questions
+                //but it's usually not PHPMailer's fault.
+                return $this->language[$key] . ' https://github.com/PHPMailer/PHPMailer/wiki/Troubleshooting';
+            }
+
+            return $this->language[$key];
+        }
+
+        //Return the key as a fallback
+        return $key;
+    }
+
+    /**
+     * Check if an error occurred.
+     *
+     * @return bool True if an error did occur
+     */
+    public function isError()
+    {
+        return $this->error_count > 0;
+    }
+
+    /**
+     * Add a custom header.
+     * $name value can be overloaded to contain
+     * both header name and value (name:value).
+     *
+     * @param string      $name  Custom header name
+     * @param string|null $value Header value
+     */
+    public function addCustomHeader($name, $value = null)
+    {
+        if (null === $value) {
+            // Value passed in as name:value
+            $this->CustomHeader[] = explode(':', $name, 2);
+        } else {
+            $this->CustomHeader[] = [$name, $value];
+        }
+    }
+
+    /**
+     * Returns all custom headers.
+     *
+     * @return array
+     */
+    public function getCustomHeaders()
+    {
+        return $this->CustomHeader;
+    }
+
+    /**
+     * Create a message body from an HTML string.
+     * Automatically inlines images and creates a plain-text version by converting the HTML,
+     * overwriting any existing values in Body and AltBody.
+     * Do not source $message content from user input!
+     * $basedir is prepended when handling relative URLs, e.g. <img src="/images/a.png"> and must not be empty
+     * will look for an image file in $basedir/images/a.png and convert it to inline.
+     * If you don't provide a $basedir, relative paths will be left untouched (and thus probably break in email)
+     * Converts data-uri images into embedded attachments.
+     * If you don't want to apply these transformations to your HTML, just set Body and AltBody directly.
+     *
+     * @param string        $message  HTML message string
+     * @param string        $basedir  Absolute path to a base directory to prepend to relative paths to images
+     * @param bool|callable $advanced Whether to use the internal HTML to text converter
+     *                                or your own custom converter @see PHPMailer::html2text()
+     *
+     * @return string $message The transformed message Body
+     */
+    public function msgHTML($message, $basedir = '', $advanced = false)
+    {
+        preg_match_all('/(src|background)=["\'](.*)["\']/Ui', $message, $images);
+        if (array_key_exists(2, $images)) {
+            if (strlen($basedir) > 1 && '/' != substr($basedir, -1)) {
+                // Ensure $basedir has a trailing /
+                $basedir .= '/';
+            }
+            foreach ($images[2] as $imgindex => $url) {
+                // Convert data URIs into embedded images
+                //e.g. "data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw=="
+                if (preg_match('#^data:(image/(?:jpe?g|gif|png));?(base64)?,(.+)#', $url, $match)) {
+                    if (count($match) == 4 and static::ENCODING_BASE64 == $match[2]) {
+                        $data = base64_decode($match[3]);
+                    } elseif ('' == $match[2]) {
+                        $data = rawurldecode($match[3]);
+                    } else {
+                        //Not recognised so leave it alone
+                        continue;
+                    }
+                    //Hash the decoded data, not the URL so that the same data-URI image used in multiple places
+                    //will only be embedded once, even if it used a different encoding
+                    $cid = hash('sha256', $data) . '@phpmailer.0'; // RFC2392 S 2
+
+                    if (!$this->cidExists($cid)) {
+                        $this->addStringEmbeddedImage($data, $cid, 'embed' . $imgindex, static::ENCODING_BASE64, $match[1]);
+                    }
+                    $message = str_replace(
+                        $images[0][$imgindex],
+                        $images[1][$imgindex] . '="cid:' . $cid . '"',
+                        $message
+                    );
+                    continue;
+                }
+                if (// Only process relative URLs if a basedir is provided (i.e. no absolute local paths)
+                    !empty($basedir)
+                    // Ignore URLs containing parent dir traversal (..)
+                    and (strpos($url, '..') === false)
+                    // Do not change urls that are already inline images
+                    and 0 !== strpos($url, 'cid:')
+                    // Do not change absolute URLs, including anonymous protocol
+                    and !preg_match('#^[a-z][a-z0-9+.-]*:?//#i', $url)
+                ) {
+                    $filename = basename($url);
+                    $directory = dirname($url);
+                    if ('.' == $directory) {
+                        $directory = '';
+                    }
+                    $cid = hash('sha256', $url) . '@phpmailer.0'; // RFC2392 S 2
+                    if (strlen($basedir) > 1 and '/' != substr($basedir, -1)) {
+                        $basedir .= '/';
+                    }
+                    if (strlen($directory) > 1 and '/' != substr($directory, -1)) {
+                        $directory .= '/';
+                    }
+                    if ($this->addEmbeddedImage(
+                        $basedir . $directory . $filename,
+                        $cid,
+                        $filename,
+                        static::ENCODING_BASE64,
+                        static::_mime_types((string) static::mb_pathinfo($filename, PATHINFO_EXTENSION))
+                    )
+                    ) {
+                        $message = preg_replace(
+                            '/' . $images[1][$imgindex] . '=["\']' . preg_quote($url, '/') . '["\']/Ui',
+                            $images[1][$imgindex] . '="cid:' . $cid . '"',
+                            $message
+                        );
+                    }
+                }
+            }
+        }
+        $this->isHTML(true);
+        // Convert all message body line breaks to LE, makes quoted-printable encoding work much better
+        $this->Body = static::normalizeBreaks($message);
+        $this->AltBody = static::normalizeBreaks($this->html2text($message, $advanced));
+        if (!$this->alternativeExists()) {
+            $this->AltBody = 'This is an HTML-only message. To view it, activate HTML in your email application.'
+                . static::$LE;
+        }
+
+        return $this->Body;
+    }
+
+    /**
+     * Convert an HTML string into plain text.
+     * This is used by msgHTML().
+     * Note - older versions of this function used a bundled advanced converter
+     * which was removed for license reasons in #232.
+     * Example usage:
+     *
+     * ```php
+     * // Use default conversion
+     * $plain = $mail->html2text($html);
+     * // Use your own custom converter
+     * $plain = $mail->html2text($html, function($html) {
+     *     $converter = new MyHtml2text($html);
+     *     return $converter->get_text();
+     * });
+     * ```
+     *
+     * @param string        $html     The HTML text to convert
+     * @param bool|callable $advanced Any boolean value to use the internal converter,
+     *                                or provide your own callable for custom conversion
+     *
+     * @return string
+     */
+    public function html2text($html, $advanced = false)
+    {
+        if (is_callable($advanced)) {
+            return call_user_func($advanced, $html);
+        }
+
+        return html_entity_decode(
+            trim(strip_tags(preg_replace('/<(head|title|style|script)[^>]*>.*?<\/\\1>/si', '', $html))),
+            ENT_QUOTES,
+            $this->CharSet
+        );
+    }
+
+    /**
+     * Get the MIME type for a file extension.
+     *
+     * @param string $ext File extension
+     *
+     * @return string MIME type of file
+     */
+    public static function _mime_types($ext = '')
+    {
+        $mimes = [
+            'xl' => 'application/excel',
+            'js' => 'application/javascript',
+            'hqx' => 'application/mac-binhex40',
+            'cpt' => 'application/mac-compactpro',
+            'bin' => 'application/macbinary',
+            'doc' => 'application/msword',
+            'word' => 'application/msword',
+            'xlsx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+            'xltx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.template',
+            'potx' => 'application/vnd.openxmlformats-officedocument.presentationml.template',
+            'ppsx' => 'application/vnd.openxmlformats-officedocument.presentationml.slideshow',
+            'pptx' => 'application/vnd.openxmlformats-officedocument.presentationml.presentation',
+            'sldx' => 'application/vnd.openxmlformats-officedocument.presentationml.slide',
+            'docx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+            'dotx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.template',
+            'xlam' => 'application/vnd.ms-excel.addin.macroEnabled.12',
+            'xlsb' => 'application/vnd.ms-excel.sheet.binary.macroEnabled.12',
+            'class' => 'application/octet-stream',
+            'dll' => 'application/octet-stream',
+            'dms' => 'application/octet-stream',
+            'exe' => 'application/octet-stream',
+            'lha' => 'application/octet-stream',
+            'lzh' => 'application/octet-stream',
+            'psd' => 'application/octet-stream',
+            'sea' => 'application/octet-stream',
+            'so' => 'application/octet-stream',
+            'oda' => 'application/oda',
+            'pdf' => 'application/pdf',
+            'ai' => 'application/postscript',
+            'eps' => 'application/postscript',
+            'ps' => 'application/postscript',
+            'smi' => 'application/smil',
+            'smil' => 'application/smil',
+            'mif' => 'application/vnd.mif',
+            'xls' => 'application/vnd.ms-excel',
+            'ppt' => 'application/vnd.ms-powerpoint',
+            'wbxml' => 'application/vnd.wap.wbxml',
+            'wmlc' => 'application/vnd.wap.wmlc',
+            'dcr' => 'application/x-director',
+            'dir' => 'application/x-director',
+            'dxr' => 'application/x-director',
+            'dvi' => 'application/x-dvi',
+            'gtar' => 'application/x-gtar',
+            'php3' => 'application/x-httpd-php',
+            'php4' => 'application/x-httpd-php',
+            'php' => 'application/x-httpd-php',
+            'phtml' => 'application/x-httpd-php',
+            'phps' => 'application/x-httpd-php-source',
+            'swf' => 'application/x-shockwave-flash',
+            'sit' => 'application/x-stuffit',
+            'tar' => 'application/x-tar',
+            'tgz' => 'application/x-tar',
+            'xht' => 'application/xhtml+xml',
+            'xhtml' => 'application/xhtml+xml',
+            'zip' => 'application/zip',
+            'mid' => 'audio/midi',
+            'midi' => 'audio/midi',
+            'mp2' => 'audio/mpeg',
+            'mp3' => 'audio/mpeg',
+            'm4a' => 'audio/mp4',
+            'mpga' => 'audio/mpeg',
+            'aif' => 'audio/x-aiff',
+            'aifc' => 'audio/x-aiff',
+            'aiff' => 'audio/x-aiff',
+            'ram' => 'audio/x-pn-realaudio',
+            'rm' => 'audio/x-pn-realaudio',
+            'rpm' => 'audio/x-pn-realaudio-plugin',
+            'ra' => 'audio/x-realaudio',
+            'wav' => 'audio/x-wav',
+            'mka' => 'audio/x-matroska',
+            'bmp' => 'image/bmp',
+            'gif' => 'image/gif',
+            'jpeg' => 'image/jpeg',
+            'jpe' => 'image/jpeg',
+            'jpg' => 'image/jpeg',
+            'png' => 'image/png',
+            'tiff' => 'image/tiff',
+            'tif' => 'image/tiff',
+            'webp' => 'image/webp',
+            'heif' => 'image/heif',
+            'heifs' => 'image/heif-sequence',
+            'heic' => 'image/heic',
+            'heics' => 'image/heic-sequence',
+            'eml' => 'message/rfc822',
+            'css' => 'text/css',
+            'html' => 'text/html',
+            'htm' => 'text/html',
+            'shtml' => 'text/html',
+            'log' => 'text/plain',
+            'text' => 'text/plain',
+            'txt' => 'text/plain',
+            'rtx' => 'text/richtext',
+            'rtf' => 'text/rtf',
+            'vcf' => 'text/vcard',
+            'vcard' => 'text/vcard',
+            'ics' => 'text/calendar',
+            'xml' => 'text/xml',
+            'xsl' => 'text/xml',
+            'wmv' => 'video/x-ms-wmv',
+            'mpeg' => 'video/mpeg',
+            'mpe' => 'video/mpeg',
+            'mpg' => 'video/mpeg',
+            'mp4' => 'video/mp4',
+            'm4v' => 'video/mp4',
+            'mov' => 'video/quicktime',
+            'qt' => 'video/quicktime',
+            'rv' => 'video/vnd.rn-realvideo',
+            'avi' => 'video/x-msvideo',
+            'movie' => 'video/x-sgi-movie',
+            'webm' => 'video/webm',
+            'mkv' => 'video/x-matroska',
+        ];
+        $ext = strtolower($ext);
+        if (array_key_exists($ext, $mimes)) {
+            return $mimes[$ext];
+        }
+
+        return 'application/octet-stream';
+    }
+
+    /**
+     * Map a file name to a MIME type.
+     * Defaults to 'application/octet-stream', i.e.. arbitrary binary data.
+     *
+     * @param string $filename A file name or full path, does not need to exist as a file
+     *
+     * @return string
+     */
+    public static function filenameToType($filename)
+    {
+        // In case the path is a URL, strip any query string before getting extension
+        $qpos = strpos($filename, '?');
+        if (false !== $qpos) {
+            $filename = substr($filename, 0, $qpos);
+        }
+        $ext = static::mb_pathinfo($filename, PATHINFO_EXTENSION);
+
+        return static::_mime_types($ext);
+    }
+
+    /**
+     * Multi-byte-safe pathinfo replacement.
+     * Drop-in replacement for pathinfo(), but multibyte- and cross-platform-safe.
+     *
+     * @see    http://www.php.net/manual/en/function.pathinfo.php#107461
+     *
+     * @param string     $path    A filename or path, does not need to exist as a file
+     * @param int|string $options Either a PATHINFO_* constant,
+     *                            or a string name to return only the specified piece
+     *
+     * @return string|array
+     */
+    public static function mb_pathinfo($path, $options = null)
+    {
+        $ret = ['dirname' => '', 'basename' => '', 'extension' => '', 'filename' => ''];
+        $pathinfo = [];
+        if (preg_match('#^(.*?)[\\\\/]*(([^/\\\\]*?)(\.([^\.\\\\/]+?)|))[\\\\/\.]*$#im', $path, $pathinfo)) {
+            if (array_key_exists(1, $pathinfo)) {
+                $ret['dirname'] = $pathinfo[1];
+            }
+            if (array_key_exists(2, $pathinfo)) {
+                $ret['basename'] = $pathinfo[2];
+            }
+            if (array_key_exists(5, $pathinfo)) {
+                $ret['extension'] = $pathinfo[5];
+            }
+            if (array_key_exists(3, $pathinfo)) {
+                $ret['filename'] = $pathinfo[3];
+            }
+        }
+        switch ($options) {
+            case PATHINFO_DIRNAME:
+            case 'dirname':
+                return $ret['dirname'];
+            case PATHINFO_BASENAME:
+            case 'basename':
+                return $ret['basename'];
+            case PATHINFO_EXTENSION:
+            case 'extension':
+                return $ret['extension'];
+            case PATHINFO_FILENAME:
+            case 'filename':
+                return $ret['filename'];
+            default:
+                return $ret;
+        }
+    }
+
+    /**
+     * Set or reset instance properties.
+     * You should avoid this function - it's more verbose, less efficient, more error-prone and
+     * harder to debug than setting properties directly.
+     * Usage Example:
+     * `$mail->set('SMTPSecure', 'tls');`
+     *   is the same as:
+     * `$mail->SMTPSecure = 'tls';`.
+     *
+     * @param string $name  The property name to set
+     * @param mixed  $value The value to set the property to
+     *
+     * @return bool
+     */
+    public function set($name, $value = '')
+    {
+        if (property_exists($this, $name)) {
+            $this->$name = $value;
+
+            return true;
+        }
+        $this->setError($this->lang('variable_set') . $name);
+
+        return false;
+    }
+
+    /**
+     * Strip newlines to prevent header injection.
+     *
+     * @param string $str
+     *
+     * @return string
+     */
+    public function secureHeader($str)
+    {
+        return trim(str_replace(["\r", "\n"], '', $str));
+    }
+
+    /**
+     * Normalize line breaks in a string.
+     * Converts UNIX LF, Mac CR and Windows CRLF line breaks into a single line break format.
+     * Defaults to CRLF (for message bodies) and preserves consecutive breaks.
+     *
+     * @param string $text
+     * @param string $breaktype What kind of line break to use; defaults to static::$LE
+     *
+     * @return string
+     */
+    public static function normalizeBreaks($text, $breaktype = null)
+    {
+        if (null === $breaktype) {
+            $breaktype = static::$LE;
+        }
+        // Normalise to \n
+        $text = str_replace(["\r\n", "\r"], "\n", $text);
+        // Now convert LE as needed
+        if ("\n" !== $breaktype) {
+            $text = str_replace("\n", $breaktype, $text);
+        }
+
+        return $text;
+    }
+
+    /**
+     * Return the current line break format string.
+     *
+     * @return string
+     */
+    public static function getLE()
+    {
+        return static::$LE;
+    }
+
+    /**
+     * Set the line break format string, e.g. "\r\n".
+     *
+     * @param string $le
+     */
+    protected static function setLE($le)
+    {
+        static::$LE = $le;
+    }
+
+    /**
+     * Set the public and private key files and password for S/MIME signing.
+     *
+     * @param string $cert_filename
+     * @param string $key_filename
+     * @param string $key_pass            Password for private key
+     * @param string $extracerts_filename Optional path to chain certificate
+     */
+    public function sign($cert_filename, $key_filename, $key_pass, $extracerts_filename = '')
+    {
+        $this->sign_cert_file = $cert_filename;
+        $this->sign_key_file = $key_filename;
+        $this->sign_key_pass = $key_pass;
+        $this->sign_extracerts_file = $extracerts_filename;
+    }
+
+    /**
+     * Quoted-Printable-encode a DKIM header.
+     *
+     * @param string $txt
+     *
+     * @return string
+     */
+    public function DKIM_QP($txt)
+    {
+        $line = '';
+        $len = strlen($txt);
+        for ($i = 0; $i < $len; ++$i) {
+            $ord = ord($txt[$i]);
+            if (((0x21 <= $ord) and ($ord <= 0x3A)) or $ord == 0x3C or ((0x3E <= $ord) and ($ord <= 0x7E))) {
+                $line .= $txt[$i];
+            } else {
+                $line .= '=' . sprintf('%02X', $ord);
+            }
+        }
+
+        return $line;
+    }
+
+    /**
+     * Generate a DKIM signature.
+     *
+     * @param string $signHeader
+     *
+     * @throws Exception
+     *
+     * @return string The DKIM signature value
+     */
+    public function DKIM_Sign($signHeader)
+    {
+        if (!defined('PKCS7_TEXT')) {
+            if ($this->exceptions) {
+                throw new Exception($this->lang('extension_missing') . 'openssl');
+            }
+
+            return '';
+        }
+        $privKeyStr = !empty($this->DKIM_private_string) ?
+            $this->DKIM_private_string :
+            file_get_contents($this->DKIM_private);
+        if ('' != $this->DKIM_passphrase) {
+            $privKey = openssl_pkey_get_private($privKeyStr, $this->DKIM_passphrase);
+        } else {
+            $privKey = openssl_pkey_get_private($privKeyStr);
+        }
+        if (openssl_sign($signHeader, $signature, $privKey, 'sha256WithRSAEncryption')) {
+            openssl_pkey_free($privKey);
+
+            return base64_encode($signature);
+        }
+        openssl_pkey_free($privKey);
+
+        return '';
+    }
+
+    /**
+     * Generate a DKIM canonicalization header.
+     * Uses the 'relaxed' algorithm from RFC6376 section 3.4.2.
+     * Canonicalized headers should *always* use CRLF, regardless of mailer setting.
+     *
+     * @see    https://tools.ietf.org/html/rfc6376#section-3.4.2
+     *
+     * @param string $signHeader Header
+     *
+     * @return string
+     */
+    public function DKIM_HeaderC($signHeader)
+    {
+        //Unfold all header continuation lines
+        //Also collapses folded whitespace.
+        //Note PCRE \s is too broad a definition of whitespace; RFC5322 defines it as `[ \t]`
+        //@see https://tools.ietf.org/html/rfc5322#section-2.2
+        //That means this may break if you do something daft like put vertical tabs in your headers.
+        $signHeader = preg_replace('/\r\n[ \t]+/', ' ', $signHeader);
+        $lines = explode("\r\n", $signHeader);
+        foreach ($lines as $key => $line) {
+            //If the header is missing a :, skip it as it's invalid
+            //This is likely to happen because the explode() above will also split
+            //on the trailing LE, leaving an empty line
+            if (strpos($line, ':') === false) {
+                continue;
+            }
+            list($heading, $value) = explode(':', $line, 2);
+            //Lower-case header name
+            $heading = strtolower($heading);
+            //Collapse white space within the value
+            $value = preg_replace('/[ \t]{2,}/', ' ', $value);
+            //RFC6376 is slightly unclear here - it says to delete space at the *end* of each value
+            //But then says to delete space before and after the colon.
+            //Net result is the same as trimming both ends of the value.
+            //by elimination, the same applies to the field name
+            $lines[$key] = trim($heading, " \t") . ':' . trim($value, " \t");
+        }
+
+        return implode("\r\n", $lines);
+    }
+
+    /**
+     * Generate a DKIM canonicalization body.
+     * Uses the 'simple' algorithm from RFC6376 section 3.4.3.
+     * Canonicalized bodies should *always* use CRLF, regardless of mailer setting.
+     *
+     * @see    https://tools.ietf.org/html/rfc6376#section-3.4.3
+     *
+     * @param string $body Message Body
+     *
+     * @return string
+     */
+    public function DKIM_BodyC($body)
+    {
+        if (empty($body)) {
+            return "\r\n";
+        }
+        // Normalize line endings to CRLF
+        $body = static::normalizeBreaks($body, "\r\n");
+
+        //Reduce multiple trailing line breaks to a single one
+        return rtrim($body, "\r\n") . "\r\n";
+    }
+
+    /**
+     * Create the DKIM header and body in a new message header.
+     *
+     * @param string $headers_line Header lines
+     * @param string $subject      Subject
+     * @param string $body         Body
+     *
+     * @return string
+     */
+    public function DKIM_Add($headers_line, $subject, $body)
+    {
+        $DKIMsignatureType = 'rsa-sha256'; // Signature & hash algorithms
+        $DKIMcanonicalization = 'relaxed/simple'; // Canonicalization of header/body
+        $DKIMquery = 'dns/txt'; // Query method
+        $DKIMtime = time(); // Signature Timestamp = seconds since 00:00:00 - Jan 1, 1970 (UTC time zone)
+        $subject_header = "Subject: $subject";
+        $headers = explode(static::$LE, $headers_line);
+        $from_header = '';
+        $to_header = '';
+        $date_header = '';
+        $current = '';
+        foreach ($headers as $header) {
+            if (strpos($header, 'From:') === 0) {
+                $from_header = $header;
+                $current = 'from_header';
+            } elseif (strpos($header, 'To:') === 0) {
+                $to_header = $header;
+                $current = 'to_header';
+            } elseif (strpos($header, 'Date:') === 0) {
+                $date_header = $header;
+                $current = 'date_header';
+            } else {
+                if (!empty($$current) and strpos($header, ' =?') === 0) {
+                    $$current .= $header;
+                } else {
+                    $current = '';
+                }
+            }
+        }
+        $from = str_replace('|', '=7C', $this->DKIM_QP($from_header));
+        $to = str_replace('|', '=7C', $this->DKIM_QP($to_header));
+        $date = str_replace('|', '=7C', $this->DKIM_QP($date_header));
+        $subject = str_replace(
+            '|',
+            '=7C',
+            $this->DKIM_QP($subject_header)
+        ); // Copied header fields (dkim-quoted-printable)
+        $body = $this->DKIM_BodyC($body);
+        $DKIMlen = strlen($body); // Length of body
+        $DKIMb64 = base64_encode(pack('H*', hash('sha256', $body))); // Base64 of packed binary SHA-256 hash of body
+        if ('' == $this->DKIM_identity) {
+            $ident = '';
+        } else {
+            $ident = ' i=' . $this->DKIM_identity . ';';
+        }
+        $dkimhdrs = 'DKIM-Signature: v=1; a=' .
+            $DKIMsignatureType . '; q=' .
+            $DKIMquery . '; l=' .
+            $DKIMlen . '; s=' .
+            $this->DKIM_selector .
+            ";\r\n" .
+            "\tt=" . $DKIMtime . '; c=' . $DKIMcanonicalization . ";\r\n" .
+            "\th=From:To:Date:Subject;\r\n" .
+            "\td=" . $this->DKIM_domain . ';' . $ident . "\r\n" .
+            "\tz=$from\r\n" .
+            "\t|$to\r\n" .
+            "\t|$date\r\n" .
+            "\t|$subject;\r\n" .
+            "\tbh=" . $DKIMb64 . ";\r\n" .
+            "\tb=";
+        $toSign = $this->DKIM_HeaderC(
+            $from_header . "\r\n" .
+            $to_header . "\r\n" .
+            $date_header . "\r\n" .
+            $subject_header . "\r\n" .
+            $dkimhdrs
+        );
+        $signed = $this->DKIM_Sign($toSign);
+
+        return static::normalizeBreaks($dkimhdrs . $signed) . static::$LE;
+    }
+
+    /**
+     * Detect if a string contains a line longer than the maximum line length
+     * allowed by RFC 2822 section 2.1.1.
+     *
+     * @param string $str
+     *
+     * @return bool
+     */
+    public static function hasLineLongerThanMax($str)
+    {
+        return (bool) preg_match('/^(.{' . (self::MAX_LINE_LENGTH + strlen(static::$LE)) . ',})/m', $str);
+    }
+
+    /**
+     * Allows for public read access to 'to' property.
+     * Before the send() call, queued addresses (i.e. with IDN) are not yet included.
+     *
+     * @return array
+     */
+    public function getToAddresses()
+    {
+        return $this->to;
+    }
+
+    /**
+     * Allows for public read access to 'cc' property.
+     * Before the send() call, queued addresses (i.e. with IDN) are not yet included.
+     *
+     * @return array
+     */
+    public function getCcAddresses()
+    {
+        return $this->cc;
+    }
+
+    /**
+     * Allows for public read access to 'bcc' property.
+     * Before the send() call, queued addresses (i.e. with IDN) are not yet included.
+     *
+     * @return array
+     */
+    public function getBccAddresses()
+    {
+        return $this->bcc;
+    }
+
+    /**
+     * Allows for public read access to 'ReplyTo' property.
+     * Before the send() call, queued addresses (i.e. with IDN) are not yet included.
+     *
+     * @return array
+     */
+    public function getReplyToAddresses()
+    {
+        return $this->ReplyTo;
+    }
+
+    /**
+     * Allows for public read access to 'all_recipients' property.
+     * Before the send() call, queued addresses (i.e. with IDN) are not yet included.
+     *
+     * @return array
+     */
+    public function getAllRecipientAddresses()
+    {
+        return $this->all_recipients;
+    }
+
+    /**
+     * Perform a callback.
+     *
+     * @param bool   $isSent
+     * @param array  $to
+     * @param array  $cc
+     * @param array  $bcc
+     * @param string $subject
+     * @param string $body
+     * @param string $from
+     * @param array  $extra
+     */
+    protected function doCallback($isSent, $to, $cc, $bcc, $subject, $body, $from, $extra)
+    {
+        if (!empty($this->action_function) and is_callable($this->action_function)) {
+            call_user_func($this->action_function, $isSent, $to, $cc, $bcc, $subject, $body, $from, $extra);
+        }
+    }
+
+    /**
+     * Get the OAuth instance.
+     *
+     * @return OAuth
+     */
+    public function getOAuth()
+    {
+        return $this->oauth;
+    }
+
+    /**
+     * Set an OAuth instance.
+     *
+     * @param OAuth $oauth
+     */
+    public function setOAuth(OAuth $oauth)
+    {
+        $this->oauth = $oauth;
+    }
+}
diff --git a/phpmailer/vendor/phpmailer/phpmailer/src/POP3.php b/phpmailer/phpmailer/src/POP3.php
similarity index 76%
rename from phpmailer/vendor/phpmailer/phpmailer/src/POP3.php
rename to phpmailer/phpmailer/src/POP3.php
index 7b25fdd7..9b51c8ac 100644
--- a/phpmailer/vendor/phpmailer/phpmailer/src/POP3.php
+++ b/phpmailer/phpmailer/src/POP3.php
@@ -1,16 +1,15 @@
 <?php
-
 /**
  * PHPMailer POP-Before-SMTP Authentication Class.
  * PHP Version 5.5.
  *
- * @see https://github.com/PHPMailer/PHPMailer/ The PHPMailer GitHub project
+ * @see       https://github.com/PHPMailer/PHPMailer/ The PHPMailer GitHub project
  *
  * @author    Marcus Bointon (Synchro/coolbru) <phpmailer@synchromedia.co.uk>
  * @author    Jim Jagielski (jimjag) <jimjag@gmail.com>
  * @author    Andy Prevost (codeworxtech) <codeworxtech@users.sourceforge.net>
  * @author    Brent R. Matzelle (original founder)
- * @copyright 2012 - 2020 Marcus Bointon
+ * @copyright 2012 - 2017 Marcus Bointon
  * @copyright 2010 - 2012 Jim Jagielski
  * @copyright 2004 - 2009 Andy Prevost
  * @license   http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
@@ -30,14 +29,14 @@ namespace PHPMailer\PHPMailer;
  *   and then loop through your mail sending script. Providing this process doesn't
  *   take longer than the verification period lasts on your POP3 server, you should be fine.
  * 3) This is really ancient technology; you should only need to use it to talk to very old systems.
- * 4) This POP3 class is deliberately lightweight and incomplete, implementing just
+ * 4) This POP3 class is deliberately lightweight and incomplete, and implements just
  *   enough to do authentication.
  *   If you want a more complete class there are other POP3 classes for PHP available.
  *
- * @author Richard Davey (original author) <rich@corephp.co.uk>
- * @author Marcus Bointon (Synchro/coolbru) <phpmailer@synchromedia.co.uk>
- * @author Jim Jagielski (jimjag) <jimjag@gmail.com>
- * @author Andy Prevost (codeworxtech) <codeworxtech@users.sourceforge.net>
+ * @author  Richard Davey (original author) <rich@corephp.co.uk>
+ * @author  Marcus Bointon (Synchro/coolbru) <phpmailer@synchromedia.co.uk>
+ * @author  Jim Jagielski (jimjag) <jimjag@gmail.com>
+ * @author  Andy Prevost (codeworxtech) <codeworxtech@users.sourceforge.net>
  */
 class POP3
 {
@@ -46,7 +45,7 @@ class POP3
      *
      * @var string
      */
-    const VERSION = '6.9.1';
+    const VERSION = '6.0.5';
 
     /**
      * Default POP3 port number.
@@ -63,16 +62,12 @@ class POP3
     const DEFAULT_TIMEOUT = 30;
 
     /**
-     * POP3 class debug output mode.
-     * Debug output level.
-     * Options:
-     * @see POP3::DEBUG_OFF: No output
-     * @see POP3::DEBUG_SERVER: Server messages, connection/server errors
-     * @see POP3::DEBUG_CLIENT: Client and Server messages, connection/server errors
+     * Debug display level.
+     * Options: 0 = no, 1+ = yes.
      *
      * @var int
      */
-    public $do_debug = self::DEBUG_OFF;
+    public $do_debug = 0;
 
     /**
      * POP3 mail server hostname.
@@ -135,28 +130,6 @@ class POP3
      */
     const LE = "\r\n";
 
-    /**
-     * Debug level for no output.
-     *
-     * @var int
-     */
-    const DEBUG_OFF = 0;
-
-    /**
-     * Debug level to show server -> client messages
-     * also shows clients connection errors or errors from server
-     *
-     * @var int
-     */
-    const DEBUG_SERVER = 1;
-
-    /**
-     * Debug level to show client -> server and server -> client messages.
-     *
-     * @var int
-     */
-    const DEBUG_CLIENT = 2;
-
     /**
      * Simple static wrapper for all-in-one POP before SMTP.
      *
@@ -199,13 +172,13 @@ class POP3
     public function authorise($host, $port = false, $timeout = false, $username = '', $password = '', $debug_level = 0)
     {
         $this->host = $host;
-        //If no port value provided, use default
+        // If no port value provided, use default
         if (false === $port) {
             $this->port = static::DEFAULT_PORT;
         } else {
             $this->port = (int) $port;
         }
-        //If no timeout value provided, use default
+        // If no timeout value provided, use default
         if (false === $timeout) {
             $this->tval = static::DEFAULT_TIMEOUT;
         } else {
@@ -214,9 +187,9 @@ class POP3
         $this->do_debug = $debug_level;
         $this->username = $username;
         $this->password = $password;
-        //Reset the error log
+        //  Reset the error log
         $this->errors = [];
-        //Connect
+        //  connect
         $result = $this->connect($this->host, $this->port, $this->tval);
         if ($result) {
             $login_result = $this->login($this->username, $this->password);
@@ -226,7 +199,7 @@ class POP3
                 return true;
             }
         }
-        //We need to disconnect regardless of whether the login succeeded
+        // We need to disconnect regardless of whether the login succeeded
         $this->disconnect();
 
         return false;
@@ -243,7 +216,7 @@ class POP3
      */
     public function connect($host, $port = false, $tval = 30)
     {
-        //Are we already connected?
+        //  Are we already connected?
         if ($this->connected) {
             return true;
         }
@@ -256,22 +229,20 @@ class POP3
             $port = static::DEFAULT_PORT;
         }
 
-        //Connect to the POP3 server
-        $errno = 0;
-        $errstr = '';
+        //  connect to the POP3 server
         $this->pop_conn = fsockopen(
-            $host, //POP3 Host
-            $port, //Port #
-            $errno, //Error Number
-            $errstr, //Error Message
+            $host, //  POP3 Host
+            $port, //  Port #
+            $errno, //  Error Number
+            $errstr, //  Error Message
             $tval
-        ); //Timeout (seconds)
-        //Restore the error handler
+        ); //  Timeout (seconds)
+        //  Restore the error handler
         restore_error_handler();
 
-        //Did we connect?
+        //  Did we connect?
         if (false === $this->pop_conn) {
-            //It would appear not...
+            //  It would appear not...
             $this->setError(
                 "Failed to connect to server $host on port $port. errno: $errno; errstr: $errstr"
             );
@@ -279,14 +250,14 @@ class POP3
             return false;
         }
 
-        //Increase the stream time-out
+        //  Increase the stream time-out
         stream_set_timeout($this->pop_conn, $tval, 0);
 
-        //Get the POP3 server response
+        //  Get the POP3 server response
         $pop3_response = $this->getResponse();
-        //Check for the +OK
+        //  Check for the +OK
         if ($this->checkResponse($pop3_response)) {
-            //The connection is established and the POP3 server is talking
+            //  The connection is established and the POP3 server is talking
             $this->connected = true;
 
             return true;
@@ -308,7 +279,6 @@ class POP3
     {
         if (!$this->connected) {
             $this->setError('Not connected to POP3 server');
-            return false;
         }
         if (empty($username)) {
             $username = $this->username;
@@ -317,11 +287,11 @@ class POP3
             $password = $this->password;
         }
 
-        //Send the Username
+        // Send the Username
         $this->sendString("USER $username" . static::LE);
         $pop3_response = $this->getResponse();
         if ($this->checkResponse($pop3_response)) {
-            //Send the Password
+            // Send the Password
             $this->sendString("PASS $password" . static::LE);
             $pop3_response = $this->getResponse();
             if ($this->checkResponse($pop3_response)) {
@@ -337,21 +307,7 @@ class POP3
      */
     public function disconnect()
     {
-        // If could not connect at all, no need to disconnect
-        if ($this->pop_conn === false) {
-            return;
-        }
-
-        $this->sendString('QUIT' . static::LE);
-
-        // RFC 1939 shows POP3 server sending a +OK response to the QUIT command.
-        // Try to get it.  Ignore any failures here.
-        try {
-            $this->getResponse();
-        } catch (Exception $e) {
-            //Do nothing
-        }
-
+        $this->sendString('QUIT');
         //The QUIT command may cause the daemon to exit, which will kill our connection
         //So ignore errors here
         try {
@@ -359,10 +315,6 @@ class POP3
         } catch (Exception $e) {
             //Do nothing
         }
-
-        // Clean up attributes.
-        $this->connected = false;
-        $this->pop_conn  = false;
     }
 
     /**
@@ -375,7 +327,7 @@ class POP3
     protected function getResponse($size = 128)
     {
         $response = fgets($this->pop_conn, $size);
-        if ($this->do_debug >= self::DEBUG_SERVER) {
+        if ($this->do_debug >= 1) {
             echo 'Server -> Client: ', $response;
         }
 
@@ -392,7 +344,7 @@ class POP3
     protected function sendString($string)
     {
         if ($this->pop_conn) {
-            if ($this->do_debug >= self::DEBUG_CLIENT) { //Show client messages when debug >= 2
+            if ($this->do_debug >= 2) { //Show client messages when debug >= 2
                 echo 'Client -> Server: ', $string;
             }
 
@@ -412,7 +364,7 @@ class POP3
      */
     protected function checkResponse($string)
     {
-        if (strpos($string, '+OK') !== 0) {
+        if (substr($string, 0, 3) !== '+OK') {
             $this->setError("Server reported an error: $string");
 
             return false;
@@ -430,7 +382,7 @@ class POP3
     protected function setError($error)
     {
         $this->errors[] = $error;
-        if ($this->do_debug >= self::DEBUG_SERVER) {
+        if ($this->do_debug >= 1) {
             echo '<pre>';
             foreach ($this->errors as $e) {
                 print_r($e);
diff --git a/phpmailer/vendor/phpmailer/phpmailer/src/SMTP.php b/phpmailer/phpmailer/src/SMTP.php
similarity index 76%
rename from phpmailer/vendor/phpmailer/phpmailer/src/SMTP.php
rename to phpmailer/phpmailer/src/SMTP.php
index 1b5b0077..13d2ebe7 100644
--- a/phpmailer/vendor/phpmailer/phpmailer/src/SMTP.php
+++ b/phpmailer/phpmailer/src/SMTP.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * PHPMailer RFC821 SMTP email transport class.
  * PHP Version 5.5.
@@ -10,7 +9,7 @@
  * @author    Jim Jagielski (jimjag) <jimjag@gmail.com>
  * @author    Andy Prevost (codeworxtech) <codeworxtech@users.sourceforge.net>
  * @author    Brent R. Matzelle (original founder)
- * @copyright 2012 - 2020 Marcus Bointon
+ * @copyright 2012 - 2017 Marcus Bointon
  * @copyright 2010 - 2012 Jim Jagielski
  * @copyright 2004 - 2009 Andy Prevost
  * @license   http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
@@ -25,8 +24,8 @@ namespace PHPMailer\PHPMailer;
  * PHPMailer RFC821 SMTP email transport class.
  * Implements RFC 821 SMTP commands and provides some utility methods for sending mail to an SMTP server.
  *
- * @author Chris Ryan
- * @author Marcus Bointon <phpmailer@synchromedia.co.uk>
+ * @author  Chris Ryan
+ * @author  Marcus Bointon <phpmailer@synchromedia.co.uk>
  */
 class SMTP
 {
@@ -35,7 +34,7 @@ class SMTP
      *
      * @var string
      */
-    const VERSION = '6.9.1';
+    const VERSION = '6.0.5';
 
     /**
      * SMTP line break constant.
@@ -52,64 +51,34 @@ class SMTP
     const DEFAULT_PORT = 25;
 
     /**
-     * The SMTPs port to use if one is not specified.
-     *
-     * @var int
-     */
-    const DEFAULT_SECURE_PORT = 465;
-
-    /**
-     * The maximum line length allowed by RFC 5321 section 4.5.3.1.6,
-     * *excluding* a trailing CRLF break.
-     *
-     * @see https://tools.ietf.org/html/rfc5321#section-4.5.3.1.6
+     * The maximum line length allowed by RFC 2822 section 2.1.1.
      *
      * @var int
      */
     const MAX_LINE_LENGTH = 998;
 
-    /**
-     * The maximum line length allowed for replies in RFC 5321 section 4.5.3.1.5,
-     * *including* a trailing CRLF line break.
-     *
-     * @see https://tools.ietf.org/html/rfc5321#section-4.5.3.1.5
-     *
-     * @var int
-     */
-    const MAX_REPLY_LENGTH = 512;
-
     /**
      * Debug level for no output.
-     *
-     * @var int
      */
     const DEBUG_OFF = 0;
 
     /**
      * Debug level to show client -> server messages.
-     *
-     * @var int
      */
     const DEBUG_CLIENT = 1;
 
     /**
      * Debug level to show client -> server and server -> client messages.
-     *
-     * @var int
      */
     const DEBUG_SERVER = 2;
 
     /**
      * Debug level to show connection status, client -> server and server -> client messages.
-     *
-     * @var int
      */
     const DEBUG_CONNECTION = 3;
 
     /**
      * Debug level to show all messages.
-     *
-     * @var int
      */
     const DEBUG_LOWLEVEL = 4;
 
@@ -193,21 +162,6 @@ class SMTP
         'Amazon_SES' => '/[\d]{3} Ok (.*)/',
         'SendGrid' => '/[\d]{3} Ok: queued as (.*)/',
         'CampaignMonitor' => '/[\d]{3} 2.0.0 OK:([a-zA-Z\d]{48})/',
-        'Haraka' => '/[\d]{3} Message Queued \((.*)\)/',
-        'ZoneMTA' => '/[\d]{3} Message queued as (.*)/',
-        'Mailjet' => '/[\d]{3} OK queued as (.*)/',
-    ];
-
-    /**
-     * Allowed SMTP XCLIENT attributes.
-     * Must be allowed by the SMTP server. EHLO response is not checked.
-     *
-     * @see https://www.postfix.org/XCLIENT_README.html
-     *
-     * @var array
-     */
-    public static $xclient_allowed_attributes = [
-        'NAME', 'ADDR', 'PORT', 'PROTO', 'HELO', 'LOGIN', 'DESTADDR', 'DESTPORT'
     ];
 
     /**
@@ -243,7 +197,7 @@ class SMTP
      *
      * @var string|null
      */
-    protected $helo_rply;
+    protected $helo_rply = null;
 
     /**
      * The set of SMTP extensions sent in reply to EHLO command.
@@ -255,7 +209,7 @@ class SMTP
      *
      * @var array|null
      */
-    protected $server_caps;
+    protected $server_caps = null;
 
     /**
      * The most recent reply received from the server.
@@ -285,7 +239,7 @@ class SMTP
             return;
         }
         //Avoid clash with built-in function names
-        if (is_callable($this->Debugoutput) && !in_array($this->Debugoutput, ['error_log', 'html', 'echo'])) {
+        if (!in_array($this->Debugoutput, ['error_log', 'html', 'echo']) and is_callable($this->Debugoutput)) {
             call_user_func($this->Debugoutput, $str, $level);
 
             return;
@@ -306,12 +260,12 @@ class SMTP
             case 'echo':
             default:
                 //Normalize line breaks
-                $str = preg_replace('/\r\n|\r/m', "\n", $str);
+                $str = preg_replace('/\r\n|\r/ms', "\n", $str);
                 echo gmdate('Y-m-d H:i:s'),
                 "\t",
                     //Trim trailing space
                 trim(
-                    //Indent for readability, except for trailing break
+                //Indent for readability, except for trailing break
                     str_replace(
                         "\n",
                         "\n                   \t                  ",
@@ -334,11 +288,17 @@ class SMTP
      */
     public function connect($host, $port = null, $timeout = 30, $options = [])
     {
-        //Clear errors to avoid confusion
+        static $streamok;
+        //This is enabled by default since 5.0.0 but some providers disable it
+        //Check this once and cache the result
+        if (null === $streamok) {
+            $streamok = function_exists('stream_socket_client');
+        }
+        // Clear errors to avoid confusion
         $this->setError('');
-        //Make sure we are __not__ connected
+        // Make sure we are __not__ connected
         if ($this->connected()) {
-            //Already connected, generate error
+            // Already connected, generate error
             $this->setError('Already connected to a server');
 
             return false;
@@ -346,66 +306,18 @@ class SMTP
         if (empty($port)) {
             $port = self::DEFAULT_PORT;
         }
-        //Connect to the SMTP server
+        // Connect to the SMTP server
         $this->edebug(
             "Connection: opening to $host:$port, timeout=$timeout, options=" .
             (count($options) > 0 ? var_export($options, true) : 'array()'),
             self::DEBUG_CONNECTION
         );
-
-        $this->smtp_conn = $this->getSMTPConnection($host, $port, $timeout, $options);
-
-        if ($this->smtp_conn === false) {
-            //Error info already set inside `getSMTPConnection()`
-            return false;
-        }
-
-        $this->edebug('Connection: opened', self::DEBUG_CONNECTION);
-
-        //Get any announcement
-        $this->last_reply = $this->get_lines();
-        $this->edebug('SERVER -> CLIENT: ' . $this->last_reply, self::DEBUG_SERVER);
-        $responseCode = (int)substr($this->last_reply, 0, 3);
-        if ($responseCode === 220) {
-            return true;
-        }
-        //Anything other than a 220 response means something went wrong
-        //RFC 5321 says the server will wait for us to send a QUIT in response to a 554 error
-        //https://tools.ietf.org/html/rfc5321#section-3.1
-        if ($responseCode === 554) {
-            $this->quit();
-        }
-        //This will handle 421 responses which may not wait for a QUIT (e.g. if the server is being shut down)
-        $this->edebug('Connection: closing due to error', self::DEBUG_CONNECTION);
-        $this->close();
-        return false;
-    }
-
-    /**
-     * Create connection to the SMTP server.
-     *
-     * @param string $host    SMTP server IP or host name
-     * @param int    $port    The port number to connect to
-     * @param int    $timeout How long to wait for the connection to open
-     * @param array  $options An array of options for stream_context_create()
-     *
-     * @return false|resource
-     */
-    protected function getSMTPConnection($host, $port = null, $timeout = 30, $options = [])
-    {
-        static $streamok;
-        //This is enabled by default since 5.0.0 but some providers disable it
-        //Check this once and cache the result
-        if (null === $streamok) {
-            $streamok = function_exists('stream_socket_client');
-        }
-
         $errno = 0;
         $errstr = '';
         if ($streamok) {
             $socket_context = stream_context_create($options);
             set_error_handler([$this, 'errorHandler']);
-            $connection = stream_socket_client(
+            $this->smtp_conn = stream_socket_client(
                 $host . ':' . $port,
                 $errno,
                 $errstr,
@@ -413,6 +325,7 @@ class SMTP
                 STREAM_CLIENT_CONNECT,
                 $socket_context
             );
+            restore_error_handler();
         } else {
             //Fall back to fsockopen which should work in more places, but is missing some features
             $this->edebug(
@@ -420,23 +333,22 @@ class SMTP
                 self::DEBUG_CONNECTION
             );
             set_error_handler([$this, 'errorHandler']);
-            $connection = fsockopen(
+            $this->smtp_conn = fsockopen(
                 $host,
                 $port,
                 $errno,
                 $errstr,
                 $timeout
             );
+            restore_error_handler();
         }
-        restore_error_handler();
-
-        //Verify we connected properly
-        if (!is_resource($connection)) {
+        // Verify we connected properly
+        if (!is_resource($this->smtp_conn)) {
             $this->setError(
                 'Failed to connect to server',
                 '',
                 (string) $errno,
-                $errstr
+                (string) $errstr
             );
             $this->edebug(
                 'SMTP ERROR: ' . $this->error['error']
@@ -446,19 +358,22 @@ class SMTP
 
             return false;
         }
-
-        //SMTP server can take longer to respond, give longer timeout for first read
-        //Windows does not have support for this timeout function
-        if (strpos(PHP_OS, 'WIN') !== 0) {
-            $max = (int)ini_get('max_execution_time');
-            //Don't bother if unlimited, or if set_time_limit is disabled
-            if (0 !== $max && $timeout > $max && strpos(ini_get('disable_functions'), 'set_time_limit') === false) {
+        $this->edebug('Connection: opened', self::DEBUG_CONNECTION);
+        // SMTP server can take longer to respond, give longer timeout for first read
+        // Windows does not have support for this timeout function
+        if (substr(PHP_OS, 0, 3) != 'WIN') {
+            $max = ini_get('max_execution_time');
+            // Don't bother if unlimited
+            if (0 != $max and $timeout > $max) {
                 @set_time_limit($timeout);
             }
-            stream_set_timeout($connection, $timeout, 0);
+            stream_set_timeout($this->smtp_conn, $timeout, 0);
         }
+        // Get any announcement
+        $announce = $this->get_lines();
+        $this->edebug('SERVER -> CLIENT: ' . $announce, self::DEBUG_SERVER);
 
-        return $connection;
+        return true;
     }
 
     /**
@@ -482,7 +397,7 @@ class SMTP
             $crypto_method |= STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT;
         }
 
-        //Begin encrypted connection
+        // Begin encrypted connection
         set_error_handler([$this, 'errorHandler']);
         $crypto_ok = stream_socket_enable_crypto(
             $this->smtp_conn,
@@ -503,7 +418,7 @@ class SMTP
      * @param string $username The user name
      * @param string $password The password
      * @param string $authtype The auth type (CRAM-MD5, PLAIN, LOGIN, XOAUTH2)
-     * @param OAuthTokenProvider $OAuth An optional OAuthTokenProvider instance for XOAUTH2 authentication
+     * @param OAuth  $OAuth    An optional OAuth instance for XOAUTH2 authentication
      *
      * @return bool True if successfully authenticated
      */
@@ -520,23 +435,23 @@ class SMTP
         }
 
         if (array_key_exists('EHLO', $this->server_caps)) {
-            //SMTP extensions are available; try to find a proper authentication method
+            // SMTP extensions are available; try to find a proper authentication method
             if (!array_key_exists('AUTH', $this->server_caps)) {
                 $this->setError('Authentication is not allowed at this stage');
-                //'at this stage' means that auth may be allowed after the stage changes
-                //e.g. after STARTTLS
+                // 'at this stage' means that auth may be allowed after the stage changes
+                // e.g. after STARTTLS
 
                 return false;
             }
 
-            $this->edebug('Auth method requested: ' . ($authtype ?: 'UNSPECIFIED'), self::DEBUG_LOWLEVEL);
+            $this->edebug('Auth method requested: ' . ($authtype ? $authtype : 'UNSPECIFIED'), self::DEBUG_LOWLEVEL);
             $this->edebug(
                 'Auth methods available on the server: ' . implode(',', $this->server_caps['AUTH']),
                 self::DEBUG_LOWLEVEL
             );
 
             //If we have requested a specific auth type, check the server supports it before trying others
-            if (null !== $authtype && !in_array($authtype, $this->server_caps['AUTH'], true)) {
+            if (null !== $authtype and !in_array($authtype, $this->server_caps['AUTH'])) {
                 $this->edebug('Requested auth method not available: ' . $authtype, self::DEBUG_LOWLEVEL);
                 $authtype = null;
             }
@@ -545,7 +460,7 @@ class SMTP
                 //If no auth mechanism is specified, attempt to use these, in this order
                 //Try CRAM-MD5 first as it's more secure than the others
                 foreach (['CRAM-MD5', 'LOGIN', 'PLAIN', 'XOAUTH2'] as $method) {
-                    if (in_array($method, $this->server_caps['AUTH'], true)) {
+                    if (in_array($method, $this->server_caps['AUTH'])) {
                         $authtype = $method;
                         break;
                     }
@@ -555,10 +470,10 @@ class SMTP
 
                     return false;
                 }
-                $this->edebug('Auth method selected: ' . $authtype, self::DEBUG_LOWLEVEL);
+                self::edebug('Auth method selected: ' . $authtype, self::DEBUG_LOWLEVEL);
             }
 
-            if (!in_array($authtype, $this->server_caps['AUTH'], true)) {
+            if (!in_array($authtype, $this->server_caps['AUTH'])) {
                 $this->setError("The requested authentication method \"$authtype\" is not supported by the server");
 
                 return false;
@@ -568,25 +483,22 @@ class SMTP
         }
         switch ($authtype) {
             case 'PLAIN':
-                //Start authentication
+                // Start authentication
                 if (!$this->sendCommand('AUTH', 'AUTH PLAIN', 334)) {
                     return false;
                 }
-                //Send encoded username and password
-                if (
-                    //Format from https://tools.ietf.org/html/rfc4616#section-2
-                    //We skip the first field (it's forgery), so the string starts with a null byte
-                    !$this->sendCommand(
-                        'User & Password',
-                        base64_encode("\0" . $username . "\0" . $password),
-                        235
-                    )
+                // Send encoded username and password
+                if (!$this->sendCommand(
+                    'User & Password',
+                    base64_encode("\0" . $username . "\0" . $password),
+                    235
+                )
                 ) {
                     return false;
                 }
                 break;
             case 'LOGIN':
-                //Start authentication
+                // Start authentication
                 if (!$this->sendCommand('AUTH', 'AUTH LOGIN', 334)) {
                     return false;
                 }
@@ -598,17 +510,17 @@ class SMTP
                 }
                 break;
             case 'CRAM-MD5':
-                //Start authentication
+                // Start authentication
                 if (!$this->sendCommand('AUTH CRAM-MD5', 'AUTH CRAM-MD5', 334)) {
                     return false;
                 }
-                //Get the challenge
+                // Get the challenge
                 $challenge = base64_decode(substr($this->last_reply, 4));
 
-                //Build the response
+                // Build the response
                 $response = $username . ' ' . $this->hmac($challenge, $password);
 
-                //send encoded credentials
+                // send encoded credentials
                 return $this->sendCommand('Username', base64_encode($response), 235);
             case 'XOAUTH2':
                 //The OAuth instance must be set up prior to requesting auth.
@@ -617,7 +529,7 @@ class SMTP
                 }
                 $oauth = $OAuth->getOauth64();
 
-                //Start authentication
+                // Start authentication
                 if (!$this->sendCommand('AUTH', 'AUTH XOAUTH2 ' . $oauth, 235)) {
                     return false;
                 }
@@ -647,15 +559,15 @@ class SMTP
             return hash_hmac('md5', $data, $key);
         }
 
-        //The following borrowed from
-        //http://php.net/manual/en/function.mhash.php#27225
+        // The following borrowed from
+        // http://php.net/manual/en/function.mhash.php#27225
 
-        //RFC 2104 HMAC implementation for php.
-        //Creates an md5 HMAC.
-        //Eliminates the need to install mhash to compute a HMAC
-        //by Lance Rushing
+        // RFC 2104 HMAC implementation for php.
+        // Creates an md5 HMAC.
+        // Eliminates the need to install mhash to compute a HMAC
+        // by Lance Rushing
 
-        $bytelen = 64; //byte length for md5
+        $bytelen = 64; // byte length for md5
         if (strlen($key) > $bytelen) {
             $key = pack('H*', md5($key));
         }
@@ -678,7 +590,7 @@ class SMTP
         if (is_resource($this->smtp_conn)) {
             $sock_status = stream_get_meta_data($this->smtp_conn);
             if ($sock_status['eof']) {
-                //The socket is valid but we are not connected
+                // The socket is valid but we are not connected
                 $this->edebug(
                     'SMTP NOTICE: EOF caught while checking if connected',
                     self::DEBUG_CLIENT
@@ -688,7 +600,7 @@ class SMTP
                 return false;
             }
 
-            return true; //everything looks good
+            return true; // everything looks good
         }
 
         return false;
@@ -702,10 +614,11 @@ class SMTP
      */
     public function close()
     {
+        $this->setError('');
         $this->server_caps = null;
         $this->helo_rply = null;
         if (is_resource($this->smtp_conn)) {
-            //Close the connection and cleanup
+            // close the connection and cleanup
             fclose($this->smtp_conn);
             $this->smtp_conn = null; //Makes for cleaner serialization
             $this->edebug('Connection: closed', self::DEBUG_CONNECTION);
@@ -715,8 +628,8 @@ class SMTP
     /**
      * Send an SMTP DATA command.
      * Issues a data command and sends the msg_data to the server,
-     * finalizing the mail transaction. $msg_data is the message
-     * that is to be sent with the headers. Each header needs to be
+     * finializing the mail transaction. $msg_data is the message
+     * that is to be send with the headers. Each header needs to be
      * on a single line followed by a <CRLF> with the message headers
      * and the message body being separated by an additional <CRLF>.
      * Implements RFC 821: DATA <CRLF>.
@@ -740,23 +653,23 @@ class SMTP
          * NOTE: this does not count towards line-length limit.
          */
 
-        //Normalize line breaks before exploding
+        // Normalize line breaks before exploding
         $lines = explode("\n", str_replace(["\r\n", "\r"], "\n", $msg_data));
 
         /* To distinguish between a complete RFC822 message and a plain message body, we check if the first field
-         * of the first line (':' separated) does not contain a space then it _should_ be a header, and we will
+         * of the first line (':' separated) does not contain a space then it _should_ be a header and we will
          * process all lines before a blank line as headers.
          */
 
         $field = substr($lines[0], 0, strpos($lines[0], ':'));
         $in_headers = false;
-        if (!empty($field) && strpos($field, ' ') === false) {
+        if (!empty($field) and strpos($field, ' ') === false) {
             $in_headers = true;
         }
 
         foreach ($lines as $line) {
             $lines_out = [];
-            if ($in_headers && $line === '') {
+            if ($in_headers and $line == '') {
                 $in_headers = false;
             }
             //Break this line up into several smaller lines if it's too long
@@ -786,9 +699,8 @@ class SMTP
 
             //Send the lines to the server
             foreach ($lines_out as $line_out) {
-                //Dot-stuffing as per RFC5321 section 4.5.2
-                //https://tools.ietf.org/html/rfc5321#section-4.5.2
-                if (!empty($line_out) && $line_out[0] === '.') {
+                //RFC2821 section 4.5.2
+                if (!empty($line_out) and $line_out[0] == '.') {
                     $line_out = '.' . $line_out;
                 }
                 $this->client_send($line_out . static::LE, 'DATA');
@@ -798,7 +710,7 @@ class SMTP
         //Message data has been sent, complete the command
         //Increase timelimit for end of DATA command
         $savetimelimit = $this->Timelimit;
-        $this->Timelimit *= 2;
+        $this->Timelimit = $this->Timelimit * 2;
         $result = $this->sendCommand('DATA END', '.', 250);
         $this->recordLastTransactionID();
         //Restore timelimit
@@ -821,16 +733,7 @@ class SMTP
     public function hello($host = '')
     {
         //Try extended hello first (RFC 2821)
-        if ($this->sendHello('EHLO', $host)) {
-            return true;
-        }
-
-        //Some servers shut down the SMTP service here (RFC 5321)
-        if (substr($this->helo_rply, 0, 3) == '421') {
-            return false;
-        }
-
-        return $this->sendHello('HELO', $host);
+        return (bool) ($this->sendHello('EHLO', $host) or $this->sendHello('HELO', $host));
     }
 
     /**
@@ -842,7 +745,7 @@ class SMTP
      *
      * @return bool
      *
-     * @see hello()
+     * @see    hello()
      */
     protected function sendHello($hello, $host)
     {
@@ -935,7 +838,7 @@ class SMTP
     {
         $noerror = $this->sendCommand('QUIT', 'QUIT', 221);
         $err = $this->error; //Save any error
-        if ($noerror || $close_on_error) {
+        if ($noerror or $close_on_error) {
             $this->close();
             $this->error = $err; //Restore any error from the quit command
         }
@@ -950,58 +853,18 @@ class SMTP
      * Implements from RFC 821: RCPT <SP> TO:<forward-path> <CRLF>.
      *
      * @param string $address The address the message is being sent to
-     * @param string $dsn     Comma separated list of DSN notifications. NEVER, SUCCESS, FAILURE
-     *                        or DELAY. If you specify NEVER all other notifications are ignored.
      *
      * @return bool
      */
-    public function recipient($address, $dsn = '')
+    public function recipient($address)
     {
-        if (empty($dsn)) {
-            $rcpt = 'RCPT TO:<' . $address . '>';
-        } else {
-            $dsn = strtoupper($dsn);
-            $notify = [];
-
-            if (strpos($dsn, 'NEVER') !== false) {
-                $notify[] = 'NEVER';
-            } else {
-                foreach (['SUCCESS', 'FAILURE', 'DELAY'] as $value) {
-                    if (strpos($dsn, $value) !== false) {
-                        $notify[] = $value;
-                    }
-                }
-            }
-
-            $rcpt = 'RCPT TO:<' . $address . '> NOTIFY=' . implode(',', $notify);
-        }
-
         return $this->sendCommand(
             'RCPT TO',
-            $rcpt,
+            'RCPT TO:<' . $address . '>',
             [250, 251]
         );
     }
 
-    /**
-     * Send SMTP XCLIENT command to server and check its return code.
-     *
-     * @return bool True on success
-     */
-    public function xclient(array $vars)
-    {
-        $xclient_options = "";
-        foreach ($vars as $key => $value) {
-            if (in_array($key, SMTP::$xclient_allowed_attributes)) {
-                $xclient_options .= " {$key}={$value}";
-            }
-        }
-        if (!$xclient_options) {
-            return true;
-        }
-        return $this->sendCommand('XCLIENT', 'XCLIENT' . $xclient_options, 250);
-    }
-
     /**
      * Send an SMTP RSET command.
      * Abort any transaction that is currently in progress.
@@ -1031,7 +894,7 @@ class SMTP
             return false;
         }
         //Reject line breaks in all commands
-        if ((strpos($commandstring, "\n") !== false) || (strpos($commandstring, "\r") !== false)) {
+        if (strpos($commandstring, "\n") !== false or strpos($commandstring, "\r") !== false) {
             $this->setError("Command '$command' contained line breaks");
 
             return false;
@@ -1039,12 +902,12 @@ class SMTP
         $this->client_send($commandstring . static::LE, $command);
 
         $this->last_reply = $this->get_lines();
-        //Fetch SMTP code and possible error code explanation
+        // Fetch SMTP code and possible error code explanation
         $matches = [];
-        if (preg_match('/^([\d]{3})[ -](?:([\d]\\.[\d]\\.[\d]{1,2}) )?/', $this->last_reply, $matches)) {
-            $code = (int) $matches[1];
+        if (preg_match('/^([0-9]{3})[ -](?:([0-9]\\.[0-9]\\.[0-9]) )?/', $this->last_reply, $matches)) {
+            $code = $matches[1];
             $code_ex = (count($matches) > 2 ? $matches[2] : null);
-            //Cut off error code from each response line
+            // Cut off error code from each response line
             $detail = preg_replace(
                 "/{$code}[ -]" .
                 ($code_ex ? str_replace('.', '\\.', $code_ex) . ' ' : '') . '/m',
@@ -1052,15 +915,15 @@ class SMTP
                 $this->last_reply
             );
         } else {
-            //Fall back to simple parsing if regex fails
-            $code = (int) substr($this->last_reply, 0, 3);
+            // Fall back to simple parsing if regex fails
+            $code = substr($this->last_reply, 0, 3);
             $code_ex = null;
             $detail = substr($this->last_reply, 4);
         }
 
         $this->edebug('SERVER -> CLIENT: ' . $this->last_reply, self::DEBUG_SERVER);
 
-        if (!in_array($code, (array) $expect, true)) {
+        if (!in_array($code, (array) $expect)) {
             $this->setError(
                 "$command command failed",
                 $detail,
@@ -1075,10 +938,7 @@ class SMTP
             return false;
         }
 
-        //Don't clear the error store when using keepalive
-        if ($command !== 'RSET') {
-            $this->setError('');
-        }
+        $this->setError('');
 
         return true;
     }
@@ -1154,11 +1014,9 @@ class SMTP
     {
         //If SMTP transcripts are left enabled, or debug output is posted online
         //it can leak credentials, so hide credentials in all but lowest level
-        if (
-            self::DEBUG_LOWLEVEL > $this->do_debug &&
-            in_array($command, ['User & Password', 'Username', 'Password'], true)
-        ) {
-            $this->edebug('CLIENT -> SERVER: [credentials hidden]', self::DEBUG_CLIENT);
+        if (self::DEBUG_LOWLEVEL > $this->do_debug and
+            in_array($command, ['User & Password', 'Username', 'Password'], true)) {
+            $this->edebug('CLIENT -> SERVER: <credentials hidden>', self::DEBUG_CLIENT);
         } else {
             $this->edebug('CLIENT -> SERVER: ' . $data, self::DEBUG_CLIENT);
         }
@@ -1204,26 +1062,26 @@ class SMTP
      *
      * @param string $name Name of SMTP extension or 'HELO'|'EHLO'
      *
-     * @return string|bool|null
+     * @return mixed
      */
     public function getServerExt($name)
     {
         if (!$this->server_caps) {
             $this->setError('No HELO/EHLO was sent');
 
-            return null;
+            return;
         }
 
         if (!array_key_exists($name, $this->server_caps)) {
-            if ('HELO' === $name) {
+            if ('HELO' == $name) {
                 return $this->server_caps['EHLO'];
             }
-            if ('EHLO' === $name || array_key_exists('EHLO', $this->server_caps)) {
+            if ('EHLO' == $name || array_key_exists('EHLO', $this->server_caps)) {
                 return false;
             }
             $this->setError('HELO handshake was used; No information about server extensions available');
 
-            return null;
+            return;
         }
 
         return $this->server_caps[$name];
@@ -1250,7 +1108,7 @@ class SMTP
      */
     protected function get_lines()
     {
-        //If the connection is bad, give up straight away
+        // If the connection is bad, give up straight away
         if (!is_resource($this->smtp_conn)) {
             return '';
         }
@@ -1262,64 +1120,36 @@ class SMTP
         }
         $selR = [$this->smtp_conn];
         $selW = null;
-        while (is_resource($this->smtp_conn) && !feof($this->smtp_conn)) {
+        while (is_resource($this->smtp_conn) and !feof($this->smtp_conn)) {
             //Must pass vars in here as params are by reference
-            //solution for signals inspired by https://github.com/symfony/symfony/pull/6540
-            set_error_handler([$this, 'errorHandler']);
-            $n = stream_select($selR, $selW, $selW, $this->Timelimit);
-            restore_error_handler();
-
-            if ($n === false) {
-                $message = $this->getError()['detail'];
-
+            if (!stream_select($selR, $selW, $selW, $this->Timelimit)) {
                 $this->edebug(
-                    'SMTP -> get_lines(): select failed (' . $message . ')',
-                    self::DEBUG_LOWLEVEL
-                );
-
-                //stream_select returns false when the `select` system call is interrupted
-                //by an incoming signal, try the select again
-                if (stripos($message, 'interrupted system call') !== false) {
-                    $this->edebug(
-                        'SMTP -> get_lines(): retrying stream_select',
-                        self::DEBUG_LOWLEVEL
-                    );
-                    $this->setError('');
-                    continue;
-                }
-
-                break;
-            }
-
-            if (!$n) {
-                $this->edebug(
-                    'SMTP -> get_lines(): select timed-out in (' . $this->Timelimit . ' sec)',
+                    'SMTP -> get_lines(): timed-out (' . $this->Timeout . ' sec)',
                     self::DEBUG_LOWLEVEL
                 );
                 break;
             }
-
             //Deliberate noise suppression - errors are handled afterwards
-            $str = @fgets($this->smtp_conn, self::MAX_REPLY_LENGTH);
+            $str = @fgets($this->smtp_conn, 515);
             $this->edebug('SMTP INBOUND: "' . trim($str) . '"', self::DEBUG_LOWLEVEL);
             $data .= $str;
-            //If response is only 3 chars (not valid, but RFC5321 S4.2 says it must be handled),
-            //or 4th character is a space or a line break char, we are done reading, break the loop.
-            //String array access is a significant micro-optimisation over strlen
-            if (!isset($str[3]) || $str[3] === ' ' || $str[3] === "\r" || $str[3] === "\n") {
+            // If response is only 3 chars (not valid, but RFC5321 S4.2 says it must be handled),
+            // or 4th character is a space, we are done reading, break the loop,
+            // string array access is a micro-optimisation over strlen
+            if (!isset($str[3]) or (isset($str[3]) and $str[3] == ' ')) {
                 break;
             }
-            //Timed-out? Log and break
+            // Timed-out? Log and break
             $info = stream_get_meta_data($this->smtp_conn);
             if ($info['timed_out']) {
                 $this->edebug(
-                    'SMTP -> get_lines(): stream timed-out (' . $this->Timeout . ' sec)',
+                    'SMTP -> get_lines(): timed-out (' . $this->Timeout . ' sec)',
                     self::DEBUG_LOWLEVEL
                 );
                 break;
             }
-            //Now check if reads took too long
-            if ($endtime && time() > $endtime) {
+            // Now check if reads took too long
+            if ($endtime and time() > $endtime) {
                 $this->edebug(
                     'SMTP -> get_lines(): timelimit reached (' .
                     $this->Timelimit . ' sec)',
@@ -1459,7 +1289,7 @@ class SMTP
      * If no reply has been received yet, it will return null.
      * If no pattern was matched, it will return false.
      *
-     * @return bool|string|null
+     * @return bool|null|string
      */
     protected function recordLastTransactionID()
     {
@@ -1470,7 +1300,6 @@ class SMTP
         } else {
             $this->last_smtp_transaction_id = false;
             foreach ($this->smtp_transaction_id_patterns as $smtp_transaction_id_pattern) {
-                $matches = [];
                 if (preg_match($smtp_transaction_id_pattern, $reply, $matches)) {
                     $this->last_smtp_transaction_id = trim($matches[1]);
                     break;
@@ -1486,7 +1315,7 @@ class SMTP
      * If no reply has been received yet, it will return null.
      * If no pattern was matched, it will return false.
      *
-     * @return bool|string|null
+     * @return bool|null|string
      *
      * @see recordLastTransactionID()
      */
diff --git a/phpmailer/vendor/autoload.php b/phpmailer/vendor/autoload.php
deleted file mode 100644
index 60925835..00000000
--- a/phpmailer/vendor/autoload.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-// autoload.php @generated by Composer
-
-require_once __DIR__ . '/composer/autoload_real.php';
-
-return ComposerAutoloaderInitPhpMailerAddon::getLoader();
diff --git a/phpmailer/vendor/composer/ClassLoader.php b/phpmailer/vendor/composer/ClassLoader.php
deleted file mode 100644
index 03b9bb9c..00000000
--- a/phpmailer/vendor/composer/ClassLoader.php
+++ /dev/null
@@ -1,445 +0,0 @@
-<?php
-
-/*
- * This file is part of Composer.
- *
- * (c) Nils Adermann <naderman@naderman.de>
- *     Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Composer\Autoload;
-
-/**
- * ClassLoader implements a PSR-0, PSR-4 and classmap class loader.
- *
- *     $loader = new \Composer\Autoload\ClassLoader();
- *
- *     // register classes with namespaces
- *     $loader->add('Symfony\Component', __DIR__.'/component');
- *     $loader->add('Symfony',           __DIR__.'/framework');
- *
- *     // activate the autoloader
- *     $loader->register();
- *
- *     // to enable searching the include path (eg. for PEAR packages)
- *     $loader->setUseIncludePath(true);
- *
- * In this example, if you try to use a class in the Symfony\Component
- * namespace or one of its children (Symfony\Component\Console for instance),
- * the autoloader will first look for the class under the component/
- * directory, and it will then fallback to the framework/ directory if not
- * found before giving up.
- *
- * This class is loosely based on the Symfony UniversalClassLoader.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- * @author Jordi Boggiano <j.boggiano@seld.be>
- * @see    http://www.php-fig.org/psr/psr-0/
- * @see    http://www.php-fig.org/psr/psr-4/
- */
-class ClassLoader
-{
-    // PSR-4
-    private $prefixLengthsPsr4 = array();
-    private $prefixDirsPsr4 = array();
-    private $fallbackDirsPsr4 = array();
-
-    // PSR-0
-    private $prefixesPsr0 = array();
-    private $fallbackDirsPsr0 = array();
-
-    private $useIncludePath = false;
-    private $classMap = array();
-    private $classMapAuthoritative = false;
-    private $missingClasses = array();
-    private $apcuPrefix;
-
-    public function getPrefixes()
-    {
-        if (!empty($this->prefixesPsr0)) {
-            return call_user_func_array('array_merge', array_values($this->prefixesPsr0));
-        }
-
-        return array();
-    }
-
-    public function getPrefixesPsr4()
-    {
-        return $this->prefixDirsPsr4;
-    }
-
-    public function getFallbackDirs()
-    {
-        return $this->fallbackDirsPsr0;
-    }
-
-    public function getFallbackDirsPsr4()
-    {
-        return $this->fallbackDirsPsr4;
-    }
-
-    public function getClassMap()
-    {
-        return $this->classMap;
-    }
-
-    /**
-     * @param array $classMap Class to filename map
-     */
-    public function addClassMap(array $classMap)
-    {
-        if ($this->classMap) {
-            $this->classMap = array_merge($this->classMap, $classMap);
-        } else {
-            $this->classMap = $classMap;
-        }
-    }
-
-    /**
-     * Registers a set of PSR-0 directories for a given prefix, either
-     * appending or prepending to the ones previously set for this prefix.
-     *
-     * @param string       $prefix  The prefix
-     * @param array|string $paths   The PSR-0 root directories
-     * @param bool         $prepend Whether to prepend the directories
-     */
-    public function add($prefix, $paths, $prepend = false)
-    {
-        if (!$prefix) {
-            if ($prepend) {
-                $this->fallbackDirsPsr0 = array_merge(
-                    (array) $paths,
-                    $this->fallbackDirsPsr0
-                );
-            } else {
-                $this->fallbackDirsPsr0 = array_merge(
-                    $this->fallbackDirsPsr0,
-                    (array) $paths
-                );
-            }
-
-            return;
-        }
-
-        $first = $prefix[0];
-        if (!isset($this->prefixesPsr0[$first][$prefix])) {
-            $this->prefixesPsr0[$first][$prefix] = (array) $paths;
-
-            return;
-        }
-        if ($prepend) {
-            $this->prefixesPsr0[$first][$prefix] = array_merge(
-                (array) $paths,
-                $this->prefixesPsr0[$first][$prefix]
-            );
-        } else {
-            $this->prefixesPsr0[$first][$prefix] = array_merge(
-                $this->prefixesPsr0[$first][$prefix],
-                (array) $paths
-            );
-        }
-    }
-
-    /**
-     * Registers a set of PSR-4 directories for a given namespace, either
-     * appending or prepending to the ones previously set for this namespace.
-     *
-     * @param string       $prefix  The prefix/namespace, with trailing '\\'
-     * @param array|string $paths   The PSR-4 base directories
-     * @param bool         $prepend Whether to prepend the directories
-     *
-     * @throws \InvalidArgumentException
-     */
-    public function addPsr4($prefix, $paths, $prepend = false)
-    {
-        if (!$prefix) {
-            // Register directories for the root namespace.
-            if ($prepend) {
-                $this->fallbackDirsPsr4 = array_merge(
-                    (array) $paths,
-                    $this->fallbackDirsPsr4
-                );
-            } else {
-                $this->fallbackDirsPsr4 = array_merge(
-                    $this->fallbackDirsPsr4,
-                    (array) $paths
-                );
-            }
-        } elseif (!isset($this->prefixDirsPsr4[$prefix])) {
-            // Register directories for a new namespace.
-            $length = strlen($prefix);
-            if ('\\' !== $prefix[$length - 1]) {
-                throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
-            }
-            $this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length;
-            $this->prefixDirsPsr4[$prefix] = (array) $paths;
-        } elseif ($prepend) {
-            // Prepend directories for an already registered namespace.
-            $this->prefixDirsPsr4[$prefix] = array_merge(
-                (array) $paths,
-                $this->prefixDirsPsr4[$prefix]
-            );
-        } else {
-            // Append directories for an already registered namespace.
-            $this->prefixDirsPsr4[$prefix] = array_merge(
-                $this->prefixDirsPsr4[$prefix],
-                (array) $paths
-            );
-        }
-    }
-
-    /**
-     * Registers a set of PSR-0 directories for a given prefix,
-     * replacing any others previously set for this prefix.
-     *
-     * @param string       $prefix The prefix
-     * @param array|string $paths  The PSR-0 base directories
-     */
-    public function set($prefix, $paths)
-    {
-        if (!$prefix) {
-            $this->fallbackDirsPsr0 = (array) $paths;
-        } else {
-            $this->prefixesPsr0[$prefix[0]][$prefix] = (array) $paths;
-        }
-    }
-
-    /**
-     * Registers a set of PSR-4 directories for a given namespace,
-     * replacing any others previously set for this namespace.
-     *
-     * @param string       $prefix The prefix/namespace, with trailing '\\'
-     * @param array|string $paths  The PSR-4 base directories
-     *
-     * @throws \InvalidArgumentException
-     */
-    public function setPsr4($prefix, $paths)
-    {
-        if (!$prefix) {
-            $this->fallbackDirsPsr4 = (array) $paths;
-        } else {
-            $length = strlen($prefix);
-            if ('\\' !== $prefix[$length - 1]) {
-                throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
-            }
-            $this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length;
-            $this->prefixDirsPsr4[$prefix] = (array) $paths;
-        }
-    }
-
-    /**
-     * Turns on searching the include path for class files.
-     *
-     * @param bool $useIncludePath
-     */
-    public function setUseIncludePath($useIncludePath)
-    {
-        $this->useIncludePath = $useIncludePath;
-    }
-
-    /**
-     * Can be used to check if the autoloader uses the include path to check
-     * for classes.
-     *
-     * @return bool
-     */
-    public function getUseIncludePath()
-    {
-        return $this->useIncludePath;
-    }
-
-    /**
-     * Turns off searching the prefix and fallback directories for classes
-     * that have not been registered with the class map.
-     *
-     * @param bool $classMapAuthoritative
-     */
-    public function setClassMapAuthoritative($classMapAuthoritative)
-    {
-        $this->classMapAuthoritative = $classMapAuthoritative;
-    }
-
-    /**
-     * Should class lookup fail if not found in the current class map?
-     *
-     * @return bool
-     */
-    public function isClassMapAuthoritative()
-    {
-        return $this->classMapAuthoritative;
-    }
-
-    /**
-     * APCu prefix to use to cache found/not-found classes, if the extension is enabled.
-     *
-     * @param string|null $apcuPrefix
-     */
-    public function setApcuPrefix($apcuPrefix)
-    {
-        $this->apcuPrefix = function_exists('apcu_fetch') && filter_var(ini_get('apc.enabled'), FILTER_VALIDATE_BOOLEAN) ? $apcuPrefix : null;
-    }
-
-    /**
-     * The APCu prefix in use, or null if APCu caching is not enabled.
-     *
-     * @return string|null
-     */
-    public function getApcuPrefix()
-    {
-        return $this->apcuPrefix;
-    }
-
-    /**
-     * Registers this instance as an autoloader.
-     *
-     * @param bool $prepend Whether to prepend the autoloader or not
-     */
-    public function register($prepend = false)
-    {
-        spl_autoload_register(array($this, 'loadClass'), true, $prepend);
-    }
-
-    /**
-     * Unregisters this instance as an autoloader.
-     */
-    public function unregister()
-    {
-        spl_autoload_unregister(array($this, 'loadClass'));
-    }
-
-    /**
-     * Loads the given class or interface.
-     *
-     * @param  string    $class The name of the class
-     * @return bool|null True if loaded, null otherwise
-     */
-    public function loadClass($class)
-    {
-        if ($file = $this->findFile($class)) {
-            includeFile($file);
-
-            return true;
-        }
-    }
-
-    /**
-     * Finds the path to the file where the class is defined.
-     *
-     * @param string $class The name of the class
-     *
-     * @return string|false The path if found, false otherwise
-     */
-    public function findFile($class)
-    {
-        // class map lookup
-        if (isset($this->classMap[$class])) {
-            return $this->classMap[$class];
-        }
-        if ($this->classMapAuthoritative || isset($this->missingClasses[$class])) {
-            return false;
-        }
-        if (null !== $this->apcuPrefix) {
-            $file = apcu_fetch($this->apcuPrefix.$class, $hit);
-            if ($hit) {
-                return $file;
-            }
-        }
-
-        $file = $this->findFileWithExtension($class, '.php');
-
-        // Search for Hack files if we are running on HHVM
-        if (false === $file && defined('HHVM_VERSION')) {
-            $file = $this->findFileWithExtension($class, '.hh');
-        }
-
-        if (null !== $this->apcuPrefix) {
-            apcu_add($this->apcuPrefix.$class, $file);
-        }
-
-        if (false === $file) {
-            // Remember that this class does not exist.
-            $this->missingClasses[$class] = true;
-        }
-
-        return $file;
-    }
-
-    private function findFileWithExtension($class, $ext)
-    {
-        // PSR-4 lookup
-        $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR) . $ext;
-
-        $first = $class[0];
-        if (isset($this->prefixLengthsPsr4[$first])) {
-            $subPath = $class;
-            while (false !== $lastPos = strrpos($subPath, '\\')) {
-                $subPath = substr($subPath, 0, $lastPos);
-                $search = $subPath . '\\';
-                if (isset($this->prefixDirsPsr4[$search])) {
-                    $pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1);
-                    foreach ($this->prefixDirsPsr4[$search] as $dir) {
-                        if (file_exists($file = $dir . $pathEnd)) {
-                            return $file;
-                        }
-                    }
-                }
-            }
-        }
-
-        // PSR-4 fallback dirs
-        foreach ($this->fallbackDirsPsr4 as $dir) {
-            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4)) {
-                return $file;
-            }
-        }
-
-        // PSR-0 lookup
-        if (false !== $pos = strrpos($class, '\\')) {
-            // namespaced class name
-            $logicalPathPsr0 = substr($logicalPathPsr4, 0, $pos + 1)
-                . strtr(substr($logicalPathPsr4, $pos + 1), '_', DIRECTORY_SEPARATOR);
-        } else {
-            // PEAR-like class name
-            $logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR) . $ext;
-        }
-
-        if (isset($this->prefixesPsr0[$first])) {
-            foreach ($this->prefixesPsr0[$first] as $prefix => $dirs) {
-                if (0 === strpos($class, $prefix)) {
-                    foreach ($dirs as $dir) {
-                        if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
-                            return $file;
-                        }
-                    }
-                }
-            }
-        }
-
-        // PSR-0 fallback dirs
-        foreach ($this->fallbackDirsPsr0 as $dir) {
-            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
-                return $file;
-            }
-        }
-
-        // PSR-0 include paths.
-        if ($this->useIncludePath && $file = stream_resolve_include_path($logicalPathPsr0)) {
-            return $file;
-        }
-
-        return false;
-    }
-}
-
-/**
- * Scope isolated include.
- *
- * Prevents access to $this/self from included files.
- */
-function includeFile($file)
-{
-    include $file;
-}
diff --git a/phpmailer/vendor/composer/LICENSE b/phpmailer/vendor/composer/LICENSE
deleted file mode 100644
index f27399a0..00000000
--- a/phpmailer/vendor/composer/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-
-Copyright (c) Nils Adermann, Jordi Boggiano
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is furnished
-to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
diff --git a/phpmailer/vendor/composer/autoload_classmap.php b/phpmailer/vendor/composer/autoload_classmap.php
deleted file mode 100644
index 31c59aff..00000000
--- a/phpmailer/vendor/composer/autoload_classmap.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-// autoload_classmap.php @generated by Composer
-
-$vendorDir = dirname(dirname(__FILE__));
-$baseDir = dirname($vendorDir);
-
-return array(
-    'PHPMailer\\PHPMailer\\DSNConfigurator' => $vendorDir . '/phpmailer/phpmailer/src/DSNConfigurator.php',
-    'PHPMailer\\PHPMailer\\Exception' => $vendorDir . '/phpmailer/phpmailer/src/Exception.php',
-    'PHPMailer\\PHPMailer\\OAuth' => $vendorDir . '/phpmailer/phpmailer/src/OAuth.php',
-    'PHPMailer\\PHPMailer\\OAuthTokenProvider' => $vendorDir . '/phpmailer/phpmailer/src/OAuthTokenProvider.php',
-    'PHPMailer\\PHPMailer\\PHPMailer' => $vendorDir . '/phpmailer/phpmailer/src/PHPMailer.php',
-    'PHPMailer\\PHPMailer\\POP3' => $vendorDir . '/phpmailer/phpmailer/src/POP3.php',
-    'PHPMailer\\PHPMailer\\SMTP' => $vendorDir . '/phpmailer/phpmailer/src/SMTP.php',
-);
diff --git a/phpmailer/vendor/composer/autoload_namespaces.php b/phpmailer/vendor/composer/autoload_namespaces.php
deleted file mode 100644
index b7fc0125..00000000
--- a/phpmailer/vendor/composer/autoload_namespaces.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-// autoload_namespaces.php @generated by Composer
-
-$vendorDir = dirname(dirname(__FILE__));
-$baseDir = dirname($vendorDir);
-
-return array(
-);
diff --git a/phpmailer/vendor/composer/autoload_psr4.php b/phpmailer/vendor/composer/autoload_psr4.php
deleted file mode 100644
index 0706da6f..00000000
--- a/phpmailer/vendor/composer/autoload_psr4.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-// autoload_psr4.php @generated by Composer
-
-$vendorDir = dirname(dirname(__FILE__));
-$baseDir = dirname($vendorDir);
-
-return array(
-    'PHPMailer\\PHPMailer\\' => array($vendorDir . '/phpmailer/phpmailer/src'),
-);
diff --git a/phpmailer/vendor/composer/autoload_real.php b/phpmailer/vendor/composer/autoload_real.php
deleted file mode 100644
index e7e97ae8..00000000
--- a/phpmailer/vendor/composer/autoload_real.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-
-// autoload_real.php @generated by Composer
-
-class ComposerAutoloaderInitPhpMailerAddon
-{
-    private static $loader;
-
-    public static function loadClassLoader($class)
-    {
-        if ('Composer\Autoload\ClassLoader' === $class) {
-            require __DIR__ . '/ClassLoader.php';
-        }
-    }
-
-    /**
-     * @return \Composer\Autoload\ClassLoader
-     */
-    public static function getLoader()
-    {
-        if (null !== self::$loader) {
-            return self::$loader;
-        }
-
-        spl_autoload_register(array('ComposerAutoloaderInitPhpMailerAddon', 'loadClassLoader'), true, true);
-        self::$loader = $loader = new \Composer\Autoload\ClassLoader();
-        spl_autoload_unregister(array('ComposerAutoloaderInitPhpMailerAddon', 'loadClassLoader'));
-
-        $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
-        if ($useStaticLoader) {
-            require_once __DIR__ . '/autoload_static.php';
-
-            call_user_func(\Composer\Autoload\ComposerStaticInitPhpMailerAddon::getInitializer($loader));
-        } else {
-            $map = require __DIR__ . '/autoload_namespaces.php';
-            foreach ($map as $namespace => $path) {
-                $loader->set($namespace, $path);
-            }
-
-            $map = require __DIR__ . '/autoload_psr4.php';
-            foreach ($map as $namespace => $path) {
-                $loader->setPsr4($namespace, $path);
-            }
-
-            $classMap = require __DIR__ . '/autoload_classmap.php';
-            if ($classMap) {
-                $loader->addClassMap($classMap);
-            }
-        }
-
-        $loader->register(true);
-
-        return $loader;
-    }
-}
diff --git a/phpmailer/vendor/composer/autoload_static.php b/phpmailer/vendor/composer/autoload_static.php
deleted file mode 100644
index d07c239a..00000000
--- a/phpmailer/vendor/composer/autoload_static.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-// autoload_static.php @generated by Composer
-
-namespace Composer\Autoload;
-
-class ComposerStaticInitPhpMailerAddon
-{
-    public static $prefixLengthsPsr4 = array (
-        'P' => 
-        array (
-            'PHPMailer\\PHPMailer\\' => 20,
-        ),
-    );
-
-    public static $prefixDirsPsr4 = array (
-        'PHPMailer\\PHPMailer\\' => 
-        array (
-            0 => __DIR__ . '/..' . '/phpmailer/phpmailer/src',
-        ),
-    );
-
-    public static $classMap = array (
-        'PHPMailer\\PHPMailer\\DSNConfigurator' => __DIR__ . '/..' . '/phpmailer/phpmailer/src/DSNConfigurator.php',
-        'PHPMailer\\PHPMailer\\Exception' => __DIR__ . '/..' . '/phpmailer/phpmailer/src/Exception.php',
-        'PHPMailer\\PHPMailer\\OAuth' => __DIR__ . '/..' . '/phpmailer/phpmailer/src/OAuth.php',
-        'PHPMailer\\PHPMailer\\OAuthTokenProvider' => __DIR__ . '/..' . '/phpmailer/phpmailer/src/OAuthTokenProvider.php',
-        'PHPMailer\\PHPMailer\\PHPMailer' => __DIR__ . '/..' . '/phpmailer/phpmailer/src/PHPMailer.php',
-        'PHPMailer\\PHPMailer\\POP3' => __DIR__ . '/..' . '/phpmailer/phpmailer/src/POP3.php',
-        'PHPMailer\\PHPMailer\\SMTP' => __DIR__ . '/..' . '/phpmailer/phpmailer/src/SMTP.php',
-    );
-
-    public static function getInitializer(ClassLoader $loader)
-    {
-        return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInitPhpMailerAddon::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInitPhpMailerAddon::$prefixDirsPsr4;
-            $loader->classMap = ComposerStaticInitPhpMailerAddon::$classMap;
-
-        }, null, ClassLoader::class);
-    }
-}
diff --git a/phpmailer/vendor/composer/installed.json b/phpmailer/vendor/composer/installed.json
deleted file mode 100644
index 99511ee9..00000000
--- a/phpmailer/vendor/composer/installed.json
+++ /dev/null
@@ -1,81 +0,0 @@
-[
-    {
-        "name": "phpmailer/phpmailer",
-        "version": "v6.9.1",
-        "version_normalized": "6.9.1.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/PHPMailer/PHPMailer.git",
-            "reference": "039de174cd9c17a8389754d3b877a2ed22743e18"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/PHPMailer/PHPMailer/zipball/039de174cd9c17a8389754d3b877a2ed22743e18",
-            "reference": "039de174cd9c17a8389754d3b877a2ed22743e18",
-            "shasum": ""
-        },
-        "require": {
-            "ext-ctype": "*",
-            "ext-filter": "*",
-            "ext-hash": "*",
-            "php": ">=5.5.0"
-        },
-        "require-dev": {
-            "dealerdirect/phpcodesniffer-composer-installer": "^1.0",
-            "doctrine/annotations": "^1.2.6 || ^1.13.3",
-            "php-parallel-lint/php-console-highlighter": "^1.0.0",
-            "php-parallel-lint/php-parallel-lint": "^1.3.2",
-            "phpcompatibility/php-compatibility": "^9.3.5",
-            "roave/security-advisories": "dev-latest",
-            "squizlabs/php_codesniffer": "^3.7.2",
-            "yoast/phpunit-polyfills": "^1.0.4"
-        },
-        "suggest": {
-            "decomplexity/SendOauth2": "Adapter for using XOAUTH2 authentication",
-            "ext-mbstring": "Needed to send email in multibyte encoding charset or decode encoded addresses",
-            "ext-openssl": "Needed for secure SMTP sending and DKIM signing",
-            "greew/oauth2-azure-provider": "Needed for Microsoft Azure XOAUTH2 authentication",
-            "hayageek/oauth2-yahoo": "Needed for Yahoo XOAUTH2 authentication",
-            "league/oauth2-google": "Needed for Google XOAUTH2 authentication",
-            "psr/log": "For optional PSR-3 debug logging",
-            "symfony/polyfill-mbstring": "To support UTF-8 if the Mbstring PHP extension is not enabled (^1.2)",
-            "thenetworg/oauth2-azure": "Needed for Microsoft XOAUTH2 authentication"
-        },
-        "time": "2023-11-25T22:23:28+00:00",
-        "type": "library",
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "PHPMailer\\PHPMailer\\": "src/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "LGPL-2.1-only"
-        ],
-        "authors": [
-            {
-                "name": "Marcus Bointon",
-                "email": "phpmailer@synchromedia.co.uk"
-            },
-            {
-                "name": "Jim Jagielski",
-                "email": "jimjag@gmail.com"
-            },
-            {
-                "name": "Andy Prevost",
-                "email": "codeworxtech@users.sourceforge.net"
-            },
-            {
-                "name": "Brent R. Matzelle"
-            }
-        ],
-        "description": "PHPMailer is a full-featured email creation and transfer class for PHP",
-        "funding": [
-            {
-                "url": "https://github.com/Synchro",
-                "type": "github"
-            }
-        ]
-    }
-]
diff --git a/phpmailer/vendor/phpmailer/phpmailer/.editorconfig b/phpmailer/vendor/phpmailer/phpmailer/.editorconfig
deleted file mode 100644
index a7c44ddb..00000000
--- a/phpmailer/vendor/phpmailer/phpmailer/.editorconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-root = true
-
-[*]
-charset = utf-8
-indent_size = 4
-indent_style = space
-end_of_line = lf
-insert_final_newline = true
-trim_trailing_whitespace = true
-
-[*.md]
-trim_trailing_whitespace = false
-
-[*.{yml,yaml}]
-indent_size = 2
diff --git a/phpmailer/vendor/phpmailer/phpmailer/COMMITMENT b/phpmailer/vendor/phpmailer/phpmailer/COMMITMENT
deleted file mode 100644
index a687e0dd..00000000
--- a/phpmailer/vendor/phpmailer/phpmailer/COMMITMENT
+++ /dev/null
@@ -1,46 +0,0 @@
-GPL Cooperation Commitment
-Version 1.0
-
-Before filing or continuing to prosecute any legal proceeding or claim
-(other than a Defensive Action) arising from termination of a Covered
-License, we commit to extend to the person or entity ('you') accused
-of violating the Covered License the following provisions regarding
-cure and reinstatement, taken from GPL version 3. As used here, the
-term 'this License' refers to the specific Covered License being
-enforced.
-
-    However, if you cease all violation of this License, then your
-    license from a particular copyright holder is reinstated (a)
-    provisionally, unless and until the copyright holder explicitly
-    and finally terminates your license, and (b) permanently, if the
-    copyright holder fails to notify you of the violation by some
-    reasonable means prior to 60 days after the cessation.
-
-    Moreover, your license from a particular copyright holder is
-    reinstated permanently if the copyright holder notifies you of the
-    violation by some reasonable means, this is the first time you
-    have received notice of violation of this License (for any work)
-    from that copyright holder, and you cure the violation prior to 30
-    days after your receipt of the notice.
-
-We intend this Commitment to be irrevocable, and binding and
-enforceable against us and assignees of or successors to our
-copyrights.
-
-Definitions
-
-'Covered License' means the GNU General Public License, version 2
-(GPLv2), the GNU Lesser General Public License, version 2.1
-(LGPLv2.1), or the GNU Library General Public License, version 2
-(LGPLv2), all as published by the Free Software Foundation.
-
-'Defensive Action' means a legal proceeding or claim that We bring
-against you in response to a prior proceeding or claim initiated by
-you or your affiliate.
-
-'We' means each contributor to this repository as of the date of
-inclusion of this file, including subsidiaries of a corporate
-contributor.
-
-This work is available under a Creative Commons Attribution-ShareAlike
-4.0 International license (https://creativecommons.org/licenses/by-sa/4.0/).
diff --git a/phpmailer/vendor/phpmailer/phpmailer/README.md b/phpmailer/vendor/phpmailer/phpmailer/README.md
deleted file mode 100644
index e3e4ecff..00000000
--- a/phpmailer/vendor/phpmailer/phpmailer/README.md
+++ /dev/null
@@ -1,231 +0,0 @@
-[![SWUbanner](https://raw.githubusercontent.com/vshymanskyy/StandWithUkraine/main/banner2-direct.svg)](https://supportukrainenow.org/)
-
-![PHPMailer](https://raw.github.com/PHPMailer/PHPMailer/master/examples/images/phpmailer.png)
-
-# PHPMailer – A full-featured email creation and transfer class for PHP
-
-[![Test status](https://github.com/PHPMailer/PHPMailer/workflows/Tests/badge.svg)](https://github.com/PHPMailer/PHPMailer/actions)
-[![codecov.io](https://codecov.io/gh/PHPMailer/PHPMailer/branch/master/graph/badge.svg?token=iORZpwmYmM)](https://codecov.io/gh/PHPMailer/PHPMailer)
-[![Latest Stable Version](https://poser.pugx.org/phpmailer/phpmailer/v/stable.svg)](https://packagist.org/packages/phpmailer/phpmailer)
-[![Total Downloads](https://poser.pugx.org/phpmailer/phpmailer/downloads)](https://packagist.org/packages/phpmailer/phpmailer)
-[![License](https://poser.pugx.org/phpmailer/phpmailer/license.svg)](https://packagist.org/packages/phpmailer/phpmailer)
-[![API Docs](https://github.com/phpmailer/phpmailer/workflows/Docs/badge.svg)](https://phpmailer.github.io/PHPMailer/)
-[![OpenSSF Scorecard](https://api.securityscorecards.dev/projects/github.com/PHPMailer/PHPMailer/badge)](https://api.securityscorecards.dev/projects/github.com/PHPMailer/PHPMailer)
-
-## Features
-- Probably the world's most popular code for sending email from PHP!
-- Used by many open-source projects: WordPress, Drupal, 1CRM, SugarCRM, Yii, Joomla! and many more
-- Integrated SMTP support – send without a local mail server
-- Send emails with multiple To, CC, BCC, and Reply-to addresses
-- Multipart/alternative emails for mail clients that do not read HTML email
-- Add attachments, including inline
-- Support for UTF-8 content and 8bit, base64, binary, and quoted-printable encodings
-- SMTP authentication with LOGIN, PLAIN, CRAM-MD5, and XOAUTH2 mechanisms over SMTPS and SMTP+STARTTLS transports
-- Validates email addresses automatically
-- Protects against header injection attacks
-- Error messages in over 50 languages!
-- DKIM and S/MIME signing support
-- Compatible with PHP 5.5 and later, including PHP 8.2
-- Namespaced to prevent name clashes
-- Much more!
-
-## Why you might need it
-Many PHP developers need to send email from their code. The only PHP function that supports this directly is [`mail()`](https://www.php.net/manual/en/function.mail.php). However, it does not provide any assistance for making use of popular features such as encryption, authentication, HTML messages, and attachments.
-
-Formatting email correctly is surprisingly difficult. There are myriad overlapping (and conflicting) standards, requiring tight adherence to horribly complicated formatting and encoding rules – the vast majority of code that you'll find online that uses the `mail()` function directly is just plain wrong, if not unsafe!
-
-The PHP `mail()` function usually sends via a local mail server, typically fronted by a `sendmail` binary on Linux, BSD, and macOS platforms, however, Windows usually doesn't include a local mail server; PHPMailer's integrated SMTP client allows email sending on all platforms without needing a local mail server. Be aware though, that the `mail()` function should be avoided when possible; it's both faster and [safer](https://exploitbox.io/paper/Pwning-PHP-Mail-Function-For-Fun-And-RCE.html) to use SMTP to localhost.
-
-*Please* don't be tempted to do it yourself – if you don't use PHPMailer, there are many other excellent libraries that
-you should look at before rolling your own. Try [SwiftMailer](https://swiftmailer.symfony.com/)
-, [Laminas/Mail](https://docs.laminas.dev/laminas-mail/), [ZetaComponents](https://github.com/zetacomponents/Mail), etc.
-
-## License
-This software is distributed under the [LGPL 2.1](http://www.gnu.org/licenses/lgpl-2.1.html) license, along with the [GPL Cooperation Commitment](https://gplcc.github.io/gplcc/). Please read [LICENSE](https://github.com/PHPMailer/PHPMailer/blob/master/LICENSE) for information on the software availability and distribution.
-
-## Installation & loading
-PHPMailer is available on [Packagist](https://packagist.org/packages/phpmailer/phpmailer) (using semantic versioning), and installation via [Composer](https://getcomposer.org) is the recommended way to install PHPMailer. Just add this line to your `composer.json` file:
-
-```json
-"phpmailer/phpmailer": "^6.9.1"
-```
-
-or run
-
-```sh
-composer require phpmailer/phpmailer
-```
-
-Note that the `vendor` folder and the `vendor/autoload.php` script are generated by Composer; they are not part of PHPMailer.
-
-If you want to use XOAUTH2 authentication, you will also need to add a dependency on the `league/oauth2-client` and appropriate service adapters package in your `composer.json`, or take a look at
-by @decomplexity's [SendOauth2 wrapper](https://github.com/decomplexity/SendOauth2), especially if you're using Microsoft services.
-
-Alternatively, if you're not using Composer, you
-can [download PHPMailer as a zip file](https://github.com/PHPMailer/PHPMailer/archive/master.zip), (note that docs and examples are not included in the zip file), then copy the contents of the PHPMailer folder into one of the `include_path` directories specified in your PHP configuration and load each class file manually:
-
-```php
-<?php
-use PHPMailer\PHPMailer\PHPMailer;
-use PHPMailer\PHPMailer\Exception;
-
-require 'path/to/PHPMailer/src/Exception.php';
-require 'path/to/PHPMailer/src/PHPMailer.php';
-require 'path/to/PHPMailer/src/SMTP.php';
-```
-
-If you're not using the `SMTP` class explicitly (you're probably not), you don't need a `use` line for the SMTP class. Even if you're not using exceptions, you do still need to load the `Exception` class as it is used internally.
-
-## Legacy versions
-PHPMailer 5.2 (which is compatible with PHP 5.0 — 7.0) is no longer supported, even for security updates. You will find the latest version of 5.2 in the [5.2-stable branch](https://github.com/PHPMailer/PHPMailer/tree/5.2-stable). If you're using PHP 5.5 or later (which you should be), switch to the 6.x releases.
-
-### Upgrading from 5.2
-The biggest changes are that source files are now in the `src/` folder, and PHPMailer now declares the namespace `PHPMailer\PHPMailer`. This has several important effects – [read the upgrade guide](https://github.com/PHPMailer/PHPMailer/tree/master/UPGRADING.md) for more details.
-
-### Minimal installation
-While installing the entire package manually or with Composer is simple, convenient, and reliable, you may want to include only vital files in your project. At the very least you will need [src/PHPMailer.php](https://github.com/PHPMailer/PHPMailer/tree/master/src/PHPMailer.php). If you're using SMTP, you'll need [src/SMTP.php](https://github.com/PHPMailer/PHPMailer/tree/master/src/SMTP.php), and if you're using POP-before SMTP (*very* unlikely!), you'll need [src/POP3.php](https://github.com/PHPMailer/PHPMailer/tree/master/src/POP3.php). You can skip the [language](https://github.com/PHPMailer/PHPMailer/tree/master/language/) folder if you're not showing errors to users and can make do with English-only errors. If you're using XOAUTH2 you will need [src/OAuth.php](https://github.com/PHPMailer/PHPMailer/tree/master/src/OAuth.php) as well as the Composer dependencies for the services you wish to authenticate with. Really, it's much easier to use Composer!
-
-## A Simple Example
-
-```php
-<?php
-//Import PHPMailer classes into the global namespace
-//These must be at the top of your script, not inside a function
-use PHPMailer\PHPMailer\PHPMailer;
-use PHPMailer\PHPMailer\SMTP;
-use PHPMailer\PHPMailer\Exception;
-
-//Load Composer's autoloader
-require 'vendor/autoload.php';
-
-//Create an instance; passing `true` enables exceptions
-$mail = new PHPMailer(true);
-
-try {
-    //Server settings
-    $mail->SMTPDebug = SMTP::DEBUG_SERVER;                      //Enable verbose debug output
-    $mail->isSMTP();                                            //Send using SMTP
-    $mail->Host       = 'smtp.example.com';                     //Set the SMTP server to send through
-    $mail->SMTPAuth   = true;                                   //Enable SMTP authentication
-    $mail->Username   = 'user@example.com';                     //SMTP username
-    $mail->Password   = 'secret';                               //SMTP password
-    $mail->SMTPSecure = PHPMailer::ENCRYPTION_SMTPS;            //Enable implicit TLS encryption
-    $mail->Port       = 465;                                    //TCP port to connect to; use 587 if you have set `SMTPSecure = PHPMailer::ENCRYPTION_STARTTLS`
-
-    //Recipients
-    $mail->setFrom('from@example.com', 'Mailer');
-    $mail->addAddress('joe@example.net', 'Joe User');     //Add a recipient
-    $mail->addAddress('ellen@example.com');               //Name is optional
-    $mail->addReplyTo('info@example.com', 'Information');
-    $mail->addCC('cc@example.com');
-    $mail->addBCC('bcc@example.com');
-
-    //Attachments
-    $mail->addAttachment('/var/tmp/file.tar.gz');         //Add attachments
-    $mail->addAttachment('/tmp/image.jpg', 'new.jpg');    //Optional name
-
-    //Content
-    $mail->isHTML(true);                                  //Set email format to HTML
-    $mail->Subject = 'Here is the subject';
-    $mail->Body    = 'This is the HTML message body <b>in bold!</b>';
-    $mail->AltBody = 'This is the body in plain text for non-HTML mail clients';
-
-    $mail->send();
-    echo 'Message has been sent';
-} catch (Exception $e) {
-    echo "Message could not be sent. Mailer Error: {$mail->ErrorInfo}";
-}
-```
-
-You'll find plenty to play with in the [examples](https://github.com/PHPMailer/PHPMailer/tree/master/examples) folder, which covers many common scenarios including sending through Gmail, building contact forms, sending to mailing lists, and more.
-
-If you are re-using the instance (e.g. when sending to a mailing list), you may need to clear the recipient list to avoid sending duplicate messages. See [the mailing list example](https://github.com/PHPMailer/PHPMailer/blob/master/examples/mailing_list.phps) for further guidance.
-
-That's it. You should now be ready to use PHPMailer!
-
-## Localization
-PHPMailer defaults to English, but in the [language](https://github.com/PHPMailer/PHPMailer/tree/master/language/) folder, you'll find many translations for PHPMailer error messages that you may encounter. Their filenames contain [ISO 639-1](http://en.wikipedia.org/wiki/ISO_639-1) language code for the translations, for example `fr` for French. To specify a language, you need to tell PHPMailer which one to use, like this:
-
-```php
-//To load the French version
-$mail->setLanguage('fr', '/optional/path/to/language/directory/');
-```
-
-We welcome corrections and new languages – if you're looking for corrections, run the [Language/TranslationCompletenessTest.php](https://github.com/PHPMailer/PHPMailer/blob/master/test/Language/TranslationCompletenessTest.php) script in the tests folder and it will show any missing translations.
-
-## Documentation
-Start reading at the [GitHub wiki](https://github.com/PHPMailer/PHPMailer/wiki). If you're having trouble, head for [the troubleshooting guide](https://github.com/PHPMailer/PHPMailer/wiki/Troubleshooting) as it's frequently updated.
-
-Examples of how to use PHPMailer for common scenarios can be found in the [examples](https://github.com/PHPMailer/PHPMailer/tree/master/examples) folder. If you're looking for a good starting point, we recommend you start with [the Gmail example](https://github.com/PHPMailer/PHPMailer/tree/master/examples/gmail.phps).
-
-To reduce PHPMailer's deployed code footprint, examples are not included if you load PHPMailer via Composer or via [GitHub's zip file download](https://github.com/PHPMailer/PHPMailer/archive/master.zip), so you'll need to either clone the git repository or use the above links to get to the examples directly.
-
-Complete generated API documentation is [available online](https://phpmailer.github.io/PHPMailer/).
-
-You can generate complete API-level documentation by running `phpdoc` in the top-level folder, and documentation will appear in the `docs` folder, though you'll need to have [PHPDocumentor](http://www.phpdoc.org) installed. You may find [the unit tests](https://github.com/PHPMailer/PHPMailer/blob/master/test/PHPMailerTest.php) a good reference for how to do various operations such as encryption.
-
-If the documentation doesn't cover what you need, search the [many questions on Stack Overflow](http://stackoverflow.com/questions/tagged/phpmailer), and before you ask a question about "SMTP Error: Could not connect to SMTP host.", [read the troubleshooting guide](https://github.com/PHPMailer/PHPMailer/wiki/Troubleshooting).
-
-## Tests
-[PHPMailer tests](https://github.com/PHPMailer/PHPMailer/tree/master/test/) use PHPUnit 9, with [a polyfill](https://github.com/Yoast/PHPUnit-Polyfills) to let 9-style tests run on older PHPUnit and PHP versions.
-
-[![Test status](https://github.com/PHPMailer/PHPMailer/workflows/Tests/badge.svg)](https://github.com/PHPMailer/PHPMailer/actions)
-
-If this isn't passing, is there something you can do to help?
-
-## Security
-Please disclose any vulnerabilities found responsibly – report security issues to the maintainers privately.
-
-See [SECURITY](https://github.com/PHPMailer/PHPMailer/tree/master/SECURITY.md) and [PHPMailer's security advisories on GitHub](https://github.com/PHPMailer/PHPMailer/security). 
-
-## Contributing
-Please submit bug reports, suggestions, and pull requests to the [GitHub issue tracker](https://github.com/PHPMailer/PHPMailer/issues).
-
-We're particularly interested in fixing edge cases, expanding test coverage, and updating translations.
-
-If you found a mistake in the docs, or want to add something, go ahead and amend the wiki – anyone can edit it.
-
-If you have git clones from prior to the move to the PHPMailer GitHub organisation, you'll need to update any remote URLs referencing the old GitHub location with a command like this from within your clone:
-
-```sh
-git remote set-url upstream https://github.com/PHPMailer/PHPMailer.git
-```
-
-Please *don't* use the SourceForge or Google Code projects any more; they are obsolete and no longer maintained.
-
-## Sponsorship
-Development time and resources for PHPMailer are provided by [Smartmessages.net](https://info.smartmessages.net/), the world's only privacy-first email marketing system.
-
-<a href="https://info.smartmessages.net/"><img src="https://www.smartmessages.net/img/smartmessages-logo.svg" width="550" alt="Smartmessages.net privacy-first email marketing logo"></a>
-
-Donations are very welcome, whether in beer 🍺, T-shirts 👕, or cold, hard cash 💰. Sponsorship through GitHub is a simple and convenient way to say "thank you" to PHPMailer's maintainers and contributors – just click the "Sponsor" button [on the project page](https://github.com/PHPMailer/PHPMailer). If your company uses PHPMailer, consider taking part in Tidelift's enterprise support programme.
-
-## PHPMailer For Enterprise
-
-Available as part of the Tidelift Subscription.
-
-The maintainers of PHPMailer and thousands of other packages are working with Tidelift to deliver commercial
-support and maintenance for the open-source packages you use to build your applications. Save time, reduce risk, and
-improve code health, while paying the maintainers of the exact packages you
-use. [Learn more.](https://tidelift.com/subscription/pkg/packagist-phpmailer-phpmailer?utm_source=packagist-phpmailer-phpmailer&utm_medium=referral&utm_campaign=enterprise&utm_term=repo)
-
-## Changelog
-See [changelog](changelog.md).
-
-## History
-- PHPMailer was originally written in 2001 by Brent R. Matzelle as a [SourceForge project](http://sourceforge.net/projects/phpmailer/).
-- [Marcus Bointon](https://github.com/Synchro) (`coolbru` on SF) and Andy Prevost (`codeworxtech`) took over the project in 2004.
-- Became an Apache incubator project on Google Code in 2010, managed by Jim Jagielski.
-- Marcus created [his fork on GitHub](https://github.com/Synchro/PHPMailer) in 2008.
-- Jim and Marcus decide to join forces and use GitHub as the canonical and official repo for PHPMailer in 2013.
-- PHPMailer moves to [the PHPMailer organisation](https://github.com/PHPMailer) on GitHub in 2013.
-
-### What's changed since moving from SourceForge?
-- Official successor to the SourceForge and Google Code projects.
-- Test suite.
-- Continuous integration with GitHub Actions.
-- Composer support.
-- Public development.
-- Additional languages and language strings.
-- CRAM-MD5 authentication support.
-- Preserves full repo history of authors, commits, and branches from the original SourceForge project.
diff --git a/phpmailer/vendor/phpmailer/phpmailer/SECURITY.md b/phpmailer/vendor/phpmailer/phpmailer/SECURITY.md
deleted file mode 100644
index 035a87f7..00000000
--- a/phpmailer/vendor/phpmailer/phpmailer/SECURITY.md
+++ /dev/null
@@ -1,37 +0,0 @@
-# Security notices relating to PHPMailer
-
-Please disclose any security issues or vulnerabilities found through [Tidelift's coordinated disclosure system](https://tidelift.com/security) or to the maintainers privately.
-
-PHPMailer 6.4.1 and earlier contain a vulnerability that can result in untrusted code being called (if such code is injected into the host project's scope by other means). If the `$patternselect` parameter to `validateAddress()` is set to `'php'` (the default, defined by `PHPMailer::$validator`), and the global namespace contains a function called `php`, it will be called in preference to the built-in validator of the same name. Mitigated in PHPMailer 6.5.0 by denying the use of simple strings as validator function names. Recorded as [CVE-2021-3603](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-3603). Reported by [Vikrant Singh Chauhan](mailto:vi@hackberry.xyz) via [huntr.dev](https://www.huntr.dev/).
-
-PHPMailer versions 6.4.1 and earlier contain a possible remote code execution vulnerability through the `$lang_path` parameter of the `setLanguage()` method. If the `$lang_path` parameter is passed unfiltered from user input, it can be set to [a UNC path](https://docs.microsoft.com/en-us/dotnet/standard/io/file-path-formats#unc-paths), and if an attacker is also able to persuade the server to load a file from that UNC path, a script file under their control may be executed. This vulnerability only applies to systems that resolve UNC paths, typically only Microsoft Windows.
-PHPMailer 6.5.0 mitigates this by no longer treating translation files as PHP code, but by parsing their text content directly. This approach avoids the possibility of executing unknown code while retaining backward compatibility. This isn't ideal, so the current translation format is deprecated and will be replaced in the next major release. Recorded as [CVE-2021-34551](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2021-34551). Reported by [Jilin Diting Information Technology Co., Ltd](https://listensec.com) via Tidelift.
-
-PHPMailer versions between 6.1.8 and 6.4.0 contain a regression of the earlier CVE-2018-19296 object injection vulnerability as a result of [a fix for Windows UNC paths in 6.1.8](https://github.com/PHPMailer/PHPMailer/commit/e2e07a355ee8ff36aba21d0242c5950c56e4c6f9). Recorded as [CVE-2020-36326](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2020-36326). Reported by Fariskhi Vidyan via Tidelift. 6.4.1 fixes this issue, and also enforces stricter checks for URL schemes in local path contexts.
-
-PHPMailer versions 6.1.5 and earlier contain an output escaping bug that occurs in `Content-Type` and `Content-Disposition` when filenames passed into `addAttachment` and other methods that accept attachment names contain double quote characters, in contravention of RFC822 3.4.1. No specific vulnerability has been found relating to this, but it could allow file attachments to bypass attachment filters that are based on matching filename extensions. Recorded as [CVE-2020-13625](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2020-13625). Reported by Elar Lang of Clarified Security.
-
-PHPMailer versions prior to 6.0.6 and 5.2.27 are vulnerable to an object injection attack by passing `phar://` paths into `addAttachment()` and other functions that may receive unfiltered local paths, possibly leading to RCE. Recorded as [CVE-2018-19296](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2018-19296). See [this article](https://knasmueller.net/5-answers-about-php-phar-exploitation) for more info on this type of vulnerability. Mitigated by blocking the use of paths containing URL-protocol style prefixes such as `phar://`. Reported by Sehun Oh of cyberone.kr.
-
-PHPMailer versions prior to 5.2.24 (released July 26th 2017) have an XSS vulnerability in one of the code examples, [CVE-2017-11503](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2017-11503). The `code_generator.phps` example did not filter user input prior to output. This file is distributed with a `.phps` extension, so it it not normally executable unless it is explicitly renamed, and the file is not included when PHPMailer is loaded through composer, so it is safe by default. There was also an undisclosed potential XSS vulnerability in the default exception handler (unused by default). Patches for both issues kindly provided by Patrick Monnerat of the Fedora Project.
-
-PHPMailer versions prior to 5.2.22 (released January 9th 2017) have a local file disclosure vulnerability, [CVE-2017-5223](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2017-5223). If content passed into `msgHTML()` is sourced from unfiltered user input, relative paths can map to absolute local file paths and added as attachments. Also note that `addAttachment` (just like `file_get_contents`, `passthru`, `unlink`, etc) should not be passed user-sourced params either! Reported by Yongxiang Li of Asiasecurity.
-
-PHPMailer versions prior to 5.2.20 (released December 28th 2016) are vulnerable to [CVE-2016-10045](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2016-10045) a remote code execution vulnerability, responsibly reported by [Dawid Golunski](https://legalhackers.com/advisories/PHPMailer-Exploit-Remote-Code-Exec-CVE-2016-10045-Vuln-Patch-Bypass.html), and patched by Paul Buonopane (@Zenexer).
-
-PHPMailer versions prior to 5.2.18 (released December 2016) are vulnerable to [CVE-2016-10033](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2016-10033) a remote code execution vulnerability, responsibly reported by [Dawid Golunski](http://legalhackers.com/advisories/PHPMailer-Exploit-Remote-Code-Exec-CVE-2016-10033-Vuln.html).
-
-PHPMailer versions prior to 5.2.14 (released November 2015) are vulnerable to [CVE-2015-8476](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2015-8476) an SMTP CRLF injection bug permitting arbitrary message sending.
-
-PHPMailer versions prior to 5.2.10 (released May 2015) are vulnerable to [CVE-2008-5619](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2008-5619), a remote code execution vulnerability in the bundled html2text library. This file was removed in 5.2.10, so if you are using a version prior to that and make use of the html2text function, it's vitally important that you upgrade and remove this file.
-
-PHPMailer versions prior to 2.0.7 and 2.2.1 are vulnerable to [CVE-2012-0796](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2012-0796), an email header injection attack.
-
-Joomla 1.6.0 uses PHPMailer in an unsafe way, allowing it to reveal local file paths, reported in [CVE-2011-3747](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2011-3747).
-
-PHPMailer didn't sanitise the `$lang_path` parameter in `SetLanguage`. This wasn't a problem in itself, but some apps (PHPClassifieds, ATutor) also failed to sanitise user-provided parameters passed to it, permitting semi-arbitrary local file inclusion, reported in [CVE-2010-4914](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2010-4914), [CVE-2007-2021](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2007-2021) and [CVE-2006-5734](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2006-5734).
-
-PHPMailer 1.7.2 and earlier contained a possible DDoS vulnerability reported in [CVE-2005-1807](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2005-1807).
-
-PHPMailer 1.7 and earlier (June 2003) have a possible vulnerability in the `SendmailSend` method where shell commands may not be sanitised. Reported in [CVE-2007-3215](https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2007-3215).
-
diff --git a/phpmailer/vendor/phpmailer/phpmailer/VERSION b/phpmailer/vendor/phpmailer/phpmailer/VERSION
deleted file mode 100644
index dc3829f5..00000000
--- a/phpmailer/vendor/phpmailer/phpmailer/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-6.9.1
diff --git a/phpmailer/vendor/phpmailer/phpmailer/composer.json b/phpmailer/vendor/phpmailer/phpmailer/composer.json
deleted file mode 100644
index fa170a0b..00000000
--- a/phpmailer/vendor/phpmailer/phpmailer/composer.json
+++ /dev/null
@@ -1,79 +0,0 @@
-{
-    "name": "phpmailer/phpmailer",
-    "type": "library",
-    "description": "PHPMailer is a full-featured email creation and transfer class for PHP",
-    "authors": [
-        {
-            "name": "Marcus Bointon",
-            "email": "phpmailer@synchromedia.co.uk"
-        },
-        {
-            "name": "Jim Jagielski",
-            "email": "jimjag@gmail.com"
-        },
-        {
-            "name": "Andy Prevost",
-            "email": "codeworxtech@users.sourceforge.net"
-        },
-        {
-            "name": "Brent R. Matzelle"
-        }
-    ],
-    "funding": [
-        {
-            "url": "https://github.com/Synchro",
-            "type": "github"
-        }
-    ],
-    "config": {
-        "allow-plugins": {
-            "dealerdirect/phpcodesniffer-composer-installer": true
-        }
-    },
-    "require": {
-        "php": ">=5.5.0",
-        "ext-ctype": "*",
-        "ext-filter": "*",
-        "ext-hash": "*"
-    },
-    "require-dev": {
-        "dealerdirect/phpcodesniffer-composer-installer": "^1.0",
-        "doctrine/annotations": "^1.2.6 || ^1.13.3",
-        "php-parallel-lint/php-console-highlighter": "^1.0.0",
-        "php-parallel-lint/php-parallel-lint": "^1.3.2",
-        "phpcompatibility/php-compatibility": "^9.3.5",
-        "roave/security-advisories": "dev-latest",
-        "squizlabs/php_codesniffer": "^3.7.2",
-        "yoast/phpunit-polyfills": "^1.0.4"
-    },
-    "suggest": {
-        "decomplexity/SendOauth2": "Adapter for using XOAUTH2 authentication",
-        "ext-mbstring": "Needed to send email in multibyte encoding charset or decode encoded addresses",
-        "ext-openssl": "Needed for secure SMTP sending and DKIM signing",
-        "greew/oauth2-azure-provider": "Needed for Microsoft Azure XOAUTH2 authentication",
-        "hayageek/oauth2-yahoo": "Needed for Yahoo XOAUTH2 authentication",
-        "league/oauth2-google": "Needed for Google XOAUTH2 authentication",
-        "psr/log": "For optional PSR-3 debug logging",
-        "thenetworg/oauth2-azure": "Needed for Microsoft XOAUTH2 authentication",
-        "symfony/polyfill-mbstring": "To support UTF-8 if the Mbstring PHP extension is not enabled (^1.2)"
-    },
-    "autoload": {
-        "psr-4": {
-            "PHPMailer\\PHPMailer\\": "src/"
-        }
-    },
-    "autoload-dev": {
-        "psr-4": {
-            "PHPMailer\\Test\\": "test/"
-        }
-    },
-    "license": "LGPL-2.1-only",
-    "scripts": {
-        "check": "./vendor/bin/phpcs",
-        "test": "./vendor/bin/phpunit --no-coverage",
-        "coverage": "./vendor/bin/phpunit",
-        "lint": [
-            "@php ./vendor/php-parallel-lint/php-parallel-lint/parallel-lint . --show-deprecated -e php,phps --exclude vendor --exclude .git --exclude build"
-        ]
-    }
-}
diff --git a/phpmailer/vendor/phpmailer/phpmailer/get_oauth_token.php b/phpmailer/vendor/phpmailer/phpmailer/get_oauth_token.php
deleted file mode 100644
index cda0445c..00000000
--- a/phpmailer/vendor/phpmailer/phpmailer/get_oauth_token.php
+++ /dev/null
@@ -1,182 +0,0 @@
-<?php
-
-/**
- * PHPMailer - PHP email creation and transport class.
- * PHP Version 5.5
- * @package PHPMailer
- * @see https://github.com/PHPMailer/PHPMailer/ The PHPMailer GitHub project
- * @author Marcus Bointon (Synchro/coolbru) <phpmailer@synchromedia.co.uk>
- * @author Jim Jagielski (jimjag) <jimjag@gmail.com>
- * @author Andy Prevost (codeworxtech) <codeworxtech@users.sourceforge.net>
- * @author Brent R. Matzelle (original founder)
- * @copyright 2012 - 2020 Marcus Bointon
- * @copyright 2010 - 2012 Jim Jagielski
- * @copyright 2004 - 2009 Andy Prevost
- * @license http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
- * @note This program is distributed in the hope that it will be useful - WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-/**
- * Get an OAuth2 token from an OAuth2 provider.
- * * Install this script on your server so that it's accessible
- * as [https/http]://<yourdomain>/<folder>/get_oauth_token.php
- * e.g.: http://localhost/phpmailer/get_oauth_token.php
- * * Ensure dependencies are installed with 'composer install'
- * * Set up an app in your Google/Yahoo/Microsoft account
- * * Set the script address as the app's redirect URL
- * If no refresh token is obtained when running this file,
- * revoke access to your app and run the script again.
- */
-
-namespace PHPMailer\PHPMailer;
-
-/**
- * Aliases for League Provider Classes
- * Make sure you have added these to your composer.json and run `composer install`
- * Plenty to choose from here:
- * @see http://oauth2-client.thephpleague.com/providers/thirdparty/
- */
-//@see https://github.com/thephpleague/oauth2-google
-use League\OAuth2\Client\Provider\Google;
-//@see https://packagist.org/packages/hayageek/oauth2-yahoo
-use Hayageek\OAuth2\Client\Provider\Yahoo;
-//@see https://github.com/stevenmaguire/oauth2-microsoft
-use Stevenmaguire\OAuth2\Client\Provider\Microsoft;
-//@see https://github.com/greew/oauth2-azure-provider
-use Greew\OAuth2\Client\Provider\Azure;
-
-if (!isset($_GET['code']) && !isset($_POST['provider'])) {
-    ?>
-<html>
-<body>
-<form method="post">
-    <h1>Select Provider</h1>
-    <input type="radio" name="provider" value="Google" id="providerGoogle">
-    <label for="providerGoogle">Google</label><br>
-    <input type="radio" name="provider" value="Yahoo" id="providerYahoo">
-    <label for="providerYahoo">Yahoo</label><br>
-    <input type="radio" name="provider" value="Microsoft" id="providerMicrosoft">
-    <label for="providerMicrosoft">Microsoft</label><br>
-    <input type="radio" name="provider" value="Azure" id="providerAzure">
-    <label for="providerAzure">Azure</label><br>
-    <h1>Enter id and secret</h1>
-    <p>These details are obtained by setting up an app in your provider's developer console.
-    </p>
-    <p>ClientId: <input type="text" name="clientId"><p>
-    <p>ClientSecret: <input type="text" name="clientSecret"></p>
-    <p>TenantID (only relevant for Azure): <input type="text" name="tenantId"></p>
-    <input type="submit" value="Continue">
-</form>
-</body>
-</html>
-    <?php
-    exit;
-}
-
-require 'vendor/autoload.php';
-
-session_start();
-
-$providerName = '';
-$clientId = '';
-$clientSecret = '';
-$tenantId = '';
-
-if (array_key_exists('provider', $_POST)) {
-    $providerName = $_POST['provider'];
-    $clientId = $_POST['clientId'];
-    $clientSecret = $_POST['clientSecret'];
-    $tenantId = $_POST['tenantId'];
-    $_SESSION['provider'] = $providerName;
-    $_SESSION['clientId'] = $clientId;
-    $_SESSION['clientSecret'] = $clientSecret;
-    $_SESSION['tenantId'] = $tenantId;
-} elseif (array_key_exists('provider', $_SESSION)) {
-    $providerName = $_SESSION['provider'];
-    $clientId = $_SESSION['clientId'];
-    $clientSecret = $_SESSION['clientSecret'];
-    $tenantId = $_SESSION['tenantId'];
-}
-
-//If you don't want to use the built-in form, set your client id and secret here
-//$clientId = 'RANDOMCHARS-----duv1n2.apps.googleusercontent.com';
-//$clientSecret = 'RANDOMCHARS-----lGyjPcRtvP';
-
-//If this automatic URL doesn't work, set it yourself manually to the URL of this script
-$redirectUri = (isset($_SERVER['HTTPS']) ? 'https://' : 'http://') . $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF'];
-//$redirectUri = 'http://localhost/PHPMailer/redirect';
-
-$params = [
-    'clientId' => $clientId,
-    'clientSecret' => $clientSecret,
-    'redirectUri' => $redirectUri,
-    'accessType' => 'offline'
-];
-
-$options = [];
-$provider = null;
-
-switch ($providerName) {
-    case 'Google':
-        $provider = new Google($params);
-        $options = [
-            'scope' => [
-                'https://mail.google.com/'
-            ]
-        ];
-        break;
-    case 'Yahoo':
-        $provider = new Yahoo($params);
-        break;
-    case 'Microsoft':
-        $provider = new Microsoft($params);
-        $options = [
-            'scope' => [
-                'wl.imap',
-                'wl.offline_access'
-            ]
-        ];
-        break;
-    case 'Azure':
-        $params['tenantId'] = $tenantId;
-
-        $provider = new Azure($params);
-        $options = [
-            'scope' => [
-                'https://outlook.office.com/SMTP.Send',
-                'offline_access'
-            ]
-        ];
-        break;
-}
-
-if (null === $provider) {
-    exit('Provider missing');
-}
-
-if (!isset($_GET['code'])) {
-    //If we don't have an authorization code then get one
-    $authUrl = $provider->getAuthorizationUrl($options);
-    $_SESSION['oauth2state'] = $provider->getState();
-    header('Location: ' . $authUrl);
-    exit;
-    //Check given state against previously stored one to mitigate CSRF attack
-} elseif (empty($_GET['state']) || ($_GET['state'] !== $_SESSION['oauth2state'])) {
-    unset($_SESSION['oauth2state']);
-    unset($_SESSION['provider']);
-    exit('Invalid state');
-} else {
-    unset($_SESSION['provider']);
-    //Try to get an access token (using the authorization code grant)
-    $token = $provider->getAccessToken(
-        'authorization_code',
-        [
-            'code' => $_GET['code']
-        ]
-    );
-    //Use this to interact with an API on the users behalf
-    //Use this to get a new access token if the old one expires
-    echo 'Refresh Token: ', $token->getRefreshToken();
-}
diff --git a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-af.php b/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-af.php
deleted file mode 100644
index 0b2a72d5..00000000
--- a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-af.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-/**
- * Afrikaans PHPMailer language file: refer to English translation for definitive list
- * @package PHPMailer
- */
-
-$PHPMAILER_LANG['authenticate']         = 'SMTP-fout: kon nie geverifieer word nie.';
-$PHPMAILER_LANG['connect_host']         = 'SMTP-fout: kon nie aan SMTP-verbind nie.';
-$PHPMAILER_LANG['data_not_accepted']    = 'SMTP-fout: data nie aanvaar nie.';
-$PHPMAILER_LANG['empty_message']        = 'Boodskapliggaam leeg.';
-$PHPMAILER_LANG['encoding']             = 'Onbekende kodering: ';
-$PHPMAILER_LANG['execute']              = 'Kon nie uitvoer nie: ';
-$PHPMAILER_LANG['file_access']          = 'Kon nie lêer oopmaak nie: ';
-$PHPMAILER_LANG['file_open']            = 'Lêerfout: Kon nie lêer oopmaak nie: ';
-$PHPMAILER_LANG['from_failed']          = 'Die volgende Van adres misluk: ';
-$PHPMAILER_LANG['instantiate']          = 'Kon nie posfunksie instansieer nie.';
-$PHPMAILER_LANG['invalid_address']      = 'Ongeldige adres: ';
-$PHPMAILER_LANG['mailer_not_supported'] = ' mailer word nie ondersteun nie.';
-$PHPMAILER_LANG['provide_address']      = 'U moet ten minste een ontvanger e-pos adres verskaf.';
-$PHPMAILER_LANG['recipients_failed']    = 'SMTP-fout: Die volgende ontvangers het misluk: ';
-$PHPMAILER_LANG['signing']              = 'Ondertekening Fout: ';
-$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP-verbinding () misluk.';
-$PHPMAILER_LANG['smtp_error']           = 'SMTP-bediener fout: ';
-$PHPMAILER_LANG['variable_set']         = 'Kan nie veranderlike instel of herstel nie: ';
-$PHPMAILER_LANG['extension_missing']    = 'Uitbreiding ontbreek: ';
diff --git a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-as.php b/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-as.php
deleted file mode 100644
index 327dfbaf..00000000
--- a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-as.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-/**
- * Assamese PHPMailer language file: refer to English translation for definitive list
- * @package PHPMailer
- * @author Manish Sarkar <manish.n.manish@gmail.com>
- */
-
-$PHPMAILER_LANG['authenticate']         = 'SMTP ত্ৰুটি: প্ৰমাণীকৰণ কৰিব নোৱাৰি';
-$PHPMAILER_LANG['buggy_php']            = 'আপোনাৰ PHP সংস্কৰণ এটা বাগৰ দ্বাৰা প্ৰভাৱিত হয় যাৰ ফলত নষ্ট বাৰ্তা হব পাৰে । ইয়াক সমাধান কৰিবলে, প্ৰেৰণ কৰিবলে SMTP ব্যৱহাৰ কৰক, আপোনাৰ php.ini ত mail.add_x_header বিকল্প নিষ্ক্ৰিয় কৰক, MacOS বা Linux লৈ সলনি কৰক, বা আপোনাৰ PHP সংস্কৰণ 7.0.17+ বা 7.1.3+ লৈ সলনি কৰক ।';
-$PHPMAILER_LANG['connect_host']         = 'SMTP ত্ৰুটি: SMTP চাৰ্ভাৰৰ সৈতে সংযোগ কৰিবলে অক্ষম';
-$PHPMAILER_LANG['data_not_accepted']    = 'SMTP ত্ৰুটি: তথ্য গ্ৰহণ কৰা হোৱা নাই';
-$PHPMAILER_LANG['empty_message']        = 'বাৰ্তাৰ মূখ্য অংশ খালী।';
-$PHPMAILER_LANG['encoding']             = 'অজ্ঞাত এনকোডিং: ';
-$PHPMAILER_LANG['execute']              = 'এক্সিকিউট কৰিব নোৱাৰি: ';
-$PHPMAILER_LANG['extension_missing']    = 'সম্প্ৰসাৰণ নোহোৱা হৈছে: ';
-$PHPMAILER_LANG['file_access']          = 'ফাইল অভিগম কৰিবলে অক্ষম: ';
-$PHPMAILER_LANG['file_open']            = 'ফাইল ত্ৰুটি: ফাইল খোলিবলৈ অক্ষম: ';
-$PHPMAILER_LANG['from_failed']          = 'নিম্নলিখিত প্ৰেৰকৰ ঠিকনা(সমূহ) ব্যৰ্থ: ';
-$PHPMAILER_LANG['instantiate']          = 'মেইল ফাংচনৰ এটা উদাহৰণ সৃষ্টি কৰিবলে অক্ষম';
-$PHPMAILER_LANG['invalid_address']      = 'প্ৰেৰণ কৰিব নোৱাৰি: অবৈধ ইমেইল ঠিকনা: ';
-$PHPMAILER_LANG['invalid_header']       = 'অবৈধ হেডাৰৰ নাম বা মান';
-$PHPMAILER_LANG['invalid_hostentry']    = 'অবৈধ হোষ্টেন্ট্ৰি: ';
-$PHPMAILER_LANG['invalid_host']         = 'অবৈধ হস্ট:';
-$PHPMAILER_LANG['mailer_not_supported'] = 'মেইলাৰ সমৰ্থিত নহয়।';
-$PHPMAILER_LANG['provide_address']      = 'আপুনি অন্ততঃ এটা গন্তব্য ইমেইল ঠিকনা দিব লাগিব';
-$PHPMAILER_LANG['recipients_failed']    = 'SMTP ত্ৰুটি: নিম্নলিখিত গন্তব্যস্থানসমূহ ব্যৰ্থ: ';
-$PHPMAILER_LANG['signing']              = 'স্বাক্ষৰ কৰাত ব্যৰ্থ: ';
-$PHPMAILER_LANG['smtp_code']            = 'SMTP কড: ';
-$PHPMAILER_LANG['smtp_code_ex']         = 'অতিৰিক্ত SMTP তথ্য: ';
-$PHPMAILER_LANG['smtp_detail']          = 'বিৱৰণ:';
-$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP সংযোগ() ব্যৰ্থ';
-$PHPMAILER_LANG['smtp_error']           = 'SMTP চাৰ্ভাৰৰ ত্ৰুটি: ';
-$PHPMAILER_LANG['variable_set']         = 'চলক নিৰ্ধাৰণ কৰিব পৰা নগল: ';
-$PHPMAILER_LANG['extension_missing']    = 'অনুপস্থিত সম্প্ৰসাৰণ: ';
diff --git a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-bn.php b/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-bn.php
deleted file mode 100644
index 47365108..00000000
--- a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-bn.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-/**
- * Bengali PHPMailer language file: refer to English translation for definitive list
- * @package PHPMailer
- * @author Manish Sarkar <manish.n.manish@gmail.com>
- */
-
-$PHPMAILER_LANG['authenticate']         = 'SMTP ত্রুটি: প্রমাণীকরণ করতে অক্ষম৷';
-$PHPMAILER_LANG['buggy_php']            = 'আপনার PHP সংস্করণ একটি বাগ দ্বারা প্রভাবিত হয় যার ফলে দূষিত বার্তা হতে পারে। এটি ঠিক করতে, পাঠাতে SMTP ব্যবহার করুন, আপনার php.ini এ mail.add_x_header বিকল্পটি নিষ্ক্রিয় করুন, MacOS বা Linux-এ স্যুইচ করুন, অথবা আপনার PHP সংস্করণকে 7.0.17+ বা 7.1.3+ এ পরিবর্তন করুন।';
-$PHPMAILER_LANG['connect_host']         = 'SMTP ত্রুটি: SMTP সার্ভারের সাথে সংযোগ করতে অক্ষম৷';
-$PHPMAILER_LANG['data_not_accepted']    = 'SMTP ত্রুটি: ডেটা গ্রহণ করা হয়নি৷';
-$PHPMAILER_LANG['empty_message']        = 'বার্তার অংশটি খালি।';
-$PHPMAILER_LANG['encoding']             = 'অজানা এনকোডিং: ';
-$PHPMAILER_LANG['execute']              = 'নির্বাহ করতে অক্ষম: ';
-$PHPMAILER_LANG['extension_missing']    = 'এক্সটেনশন অনুপস্থিত:';
-$PHPMAILER_LANG['file_access']          = 'ফাইল অ্যাক্সেস করতে অক্ষম: ';
-$PHPMAILER_LANG['file_open']            = 'ফাইল ত্রুটি: ফাইল খুলতে অক্ষম: ';
-$PHPMAILER_LANG['from_failed']          = 'নিম্নলিখিত প্রেরকের ঠিকানা(গুলি) ব্যর্থ হয়েছে: ';
-$PHPMAILER_LANG['instantiate']          = 'মেল ফাংশনের একটি উদাহরণ তৈরি করতে অক্ষম৷';
-$PHPMAILER_LANG['invalid_address']      = 'পাঠাতে অক্ষম: অবৈধ ইমেল ঠিকানা: ';
-$PHPMAILER_LANG['invalid_header']       = 'অবৈধ হেডার নাম বা মান';
-$PHPMAILER_LANG['invalid_hostentry']    = 'অবৈধ হোস্টেন্ট্রি: ';
-$PHPMAILER_LANG['invalid_host']         = 'অবৈধ হোস্ট:';
-$PHPMAILER_LANG['mailer_not_supported'] = 'মেইলার সমর্থিত নয়।';
-$PHPMAILER_LANG['provide_address']      = 'আপনাকে অবশ্যই অন্তত একটি গন্তব্য ইমেল ঠিকানা প্রদান করতে হবে৷';
-$PHPMAILER_LANG['recipients_failed']    = 'SMTP ত্রুটি: নিম্নলিখিত গন্তব্যগুলি ব্যর্থ হয়েছে: ';
-$PHPMAILER_LANG['signing']              = 'স্বাক্ষর করতে ব্যর্থ হয়েছে: ';
-$PHPMAILER_LANG['smtp_code']            = 'SMTP কোড: ';
-$PHPMAILER_LANG['smtp_code_ex']         = 'অতিরিক্ত SMTP তথ্য:';
-$PHPMAILER_LANG['smtp_detail']          = 'বর্ণনা: ';
-$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP সংযোগ() ব্যর্থ হয়েছে৷';
-$PHPMAILER_LANG['smtp_error']           = 'SMTP সার্ভার ত্রুটি: ';
-$PHPMAILER_LANG['variable_set']         = 'পরিবর্তনশীল সেট করা যায়নি: ';
-$PHPMAILER_LANG['extension_missing']    = 'অনুপস্থিত এক্সটেনশন: ';
diff --git a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-da.php b/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-da.php
deleted file mode 100644
index db9a1ef5..00000000
--- a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-da.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-/**
- * Danish PHPMailer language file: refer to English translation for definitive list
- * @package PHPMailer
- * @author John Sebastian <jms@iwb.dk>
- * Rewrite and extension of the work by Mikael Stokkebro <info@stokkebro.dk>
- *
- */
-
-$PHPMAILER_LANG['authenticate']         = 'SMTP fejl: Login mislykkedes.';
-$PHPMAILER_LANG['buggy_php']            = 'Din version af PHP er berørt af en fejl, som gør at dine beskeder muligvis vises forkert. For at rette dette kan du skifte til SMTP, slå mail.add_x_header headeren i din php.ini fil fra, skifte til MacOS eller Linux eller opgradere din version af PHP til 7.0.17+ eller 7.1.3+.';
-$PHPMAILER_LANG['connect_host']         = 'SMTP fejl: Forbindelse til SMTP serveren kunne ikke oprettes.';
-$PHPMAILER_LANG['data_not_accepted']    = 'SMTP fejl: Data blev ikke accepteret.';
-$PHPMAILER_LANG['empty_message']        = 'Meddelelsen er uden indhold';
-$PHPMAILER_LANG['encoding']             = 'Ukendt encode-format: ';
-$PHPMAILER_LANG['execute']              = 'Kunne ikke afvikle: ';
-$PHPMAILER_LANG['extension_missing']    = 'Udvidelse mangler: ';
-$PHPMAILER_LANG['file_access']          = 'Kunne ikke tilgå filen: ';
-$PHPMAILER_LANG['file_open']            = 'Fil fejl: Kunne ikke åbne filen: ';
-$PHPMAILER_LANG['from_failed']          = 'Følgende afsenderadresse er forkert: ';
-$PHPMAILER_LANG['instantiate']          = 'Email funktionen kunne ikke initialiseres.';
-$PHPMAILER_LANG['invalid_address']      = 'Udgyldig adresse: ';
-$PHPMAILER_LANG['invalid_header']       = 'Ugyldig header navn eller værdi';
-$PHPMAILER_LANG['invalid_hostentry']    = 'Ugyldig hostentry: ';
-$PHPMAILER_LANG['invalid_host']         = 'Ugyldig vært: ';
-$PHPMAILER_LANG['mailer_not_supported'] = ' mailer understøttes ikke.';
-$PHPMAILER_LANG['provide_address']      = 'Indtast mindst en modtagers email adresse.';
-$PHPMAILER_LANG['recipients_failed']    = 'SMTP fejl: Følgende modtagere fejlede: ';
-$PHPMAILER_LANG['signing']              = 'Signeringsfejl: ';
-$PHPMAILER_LANG['smtp_code']            = 'SMTP kode: ';
-$PHPMAILER_LANG['smtp_code_ex']         = 'Yderligere SMTP info: ';
-$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Connect() fejlede.';
-$PHPMAILER_LANG['smtp_detail']          = 'Detalje: ';
-$PHPMAILER_LANG['smtp_error']           = 'SMTP server fejl: ';
-$PHPMAILER_LANG['variable_set']         = 'Kunne ikke definere eller nulstille variablen: ';
diff --git a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-el.php b/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-el.php
deleted file mode 100644
index 339ee575..00000000
--- a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-el.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-/**
- * Greek PHPMailer language file: refer to English translation for definitive list
- * @package PHPMailer
- */
-
-$PHPMAILER_LANG['authenticate']         = 'Σφάλμα SMTP: Αδυναμία πιστοποίησης.';
-$PHPMAILER_LANG['buggy_php']            = 'Η έκδοση PHP που χρησιμοποιείτε παρουσιάζει σφάλμα που μπορεί να έχει ως αποτέλεσμα κατεστραμένα μηνύματα. Για να το διορθώσετε, αλλάξτε τον τρόπο αποστολής σε SMTP, απενεργοποιήστε την επιλογή mail.add_x_header στο αρχείο php.ini, αλλάξτε λειτουργικό σε MacOS ή Linux ή αναβαθμίστε την PHP σε έκδοση 7.0.17+ ή 7.1.3+.';
-$PHPMAILER_LANG['connect_host']         = 'Σφάλμα SMTP: Αδυναμία σύνδεσης με τον φιλοξενητή SMTP.';
-$PHPMAILER_LANG['data_not_accepted']    = 'Σφάλμα SMTP: Μη αποδεκτά δεδομένα.';
-$PHPMAILER_LANG['empty_message']        = 'Η ηλεκτρονική επιστολή δεν έχει περιεχόμενο.';
-$PHPMAILER_LANG['encoding']             = 'Άγνωστη μορφή κωδικοποίησης: ';
-$PHPMAILER_LANG['execute']              = 'Αδυναμία εκτέλεσης: ';
-$PHPMAILER_LANG['extension_missing']    = 'Απουσία επέκτασης: ';
-$PHPMAILER_LANG['file_access']          = 'Αδυναμία πρόσβασης στο αρχείο: ';
-$PHPMAILER_LANG['file_open']            = 'Σφάλμα Αρχείου: Αδυναμία ανοίγματος αρχείου: ';
-$PHPMAILER_LANG['from_failed']          = 'Η ακόλουθη διεύθυνση αποστολέα δεν είναι σωστή: ';
-$PHPMAILER_LANG['instantiate']          = 'Αδυναμία εκκίνησης συνάρτησης Mail.';
-$PHPMAILER_LANG['invalid_address']      = 'Μη έγκυρη διεύθυνση: ';
-$PHPMAILER_LANG['invalid_header']       = 'Μη έγκυρο όνομα κεφαλίδας ή τιμή';
-$PHPMAILER_LANG['invalid_hostentry']    = 'Μη έγκυρη εισαγωγή φιλοξενητή: ';
-$PHPMAILER_LANG['invalid_host']         = 'Μη έγκυρος φιλοξενητής: ';
-$PHPMAILER_LANG['mailer_not_supported'] = ' mailer δεν υποστηρίζεται.';
-$PHPMAILER_LANG['provide_address']      = 'Δώστε τουλάχιστον μια ηλεκτρονική διεύθυνση παραλήπτη.';
-$PHPMAILER_LANG['recipients_failed']    = 'Σφάλμα SMTP: Οι παρακάτω διευθύνσεις παραλήπτη δεν είναι έγκυρες: ';
-$PHPMAILER_LANG['signing']              = 'Σφάλμα υπογραφής: ';
-$PHPMAILER_LANG['smtp_code']            = 'Κώδικάς SMTP: ';
-$PHPMAILER_LANG['smtp_code_ex']         = 'Πρόσθετες πληροφορίες SMTP: ';
-$PHPMAILER_LANG['smtp_connect_failed']  = 'Αποτυχία σύνδεσης SMTP.';
-$PHPMAILER_LANG['smtp_detail']          = 'Λεπτομέρεια: ';
-$PHPMAILER_LANG['smtp_error']           = 'Σφάλμα με τον διακομιστή SMTP: ';
-$PHPMAILER_LANG['variable_set']         = 'Αδυναμία ορισμού ή επαναφοράς μεταβλητής: ';
diff --git a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-fr.php b/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-fr.php
deleted file mode 100644
index 0d367fcf..00000000
--- a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-fr.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-/**
- * French PHPMailer language file: refer to English translation for definitive list
- * @package PHPMailer
- * Some French punctuation requires a thin non-breaking space (U+202F) character before it,
- * for example before a colon or exclamation mark.
- * There is one of these characters between these quotes: " "
- * @see http://unicode.org/udhr/n/notes_fra.html
- */
-
-$PHPMAILER_LANG['authenticate']         = 'Erreur SMTP : échec de l’authentification.';
-$PHPMAILER_LANG['buggy_php']            = 'Votre version de PHP est affectée par un bug qui peut entraîner des messages corrompus. Pour résoudre ce problème, passez à l’envoi par SMTP, désactivez l’option mail.add_x_header dans le fichier php.ini, passez à MacOS ou Linux, ou passez PHP à la version 7.0.17+ ou 7.1.3+.';
-$PHPMAILER_LANG['connect_host']         = 'Erreur SMTP : impossible de se connecter au serveur SMTP.';
-$PHPMAILER_LANG['data_not_accepted']    = 'Erreur SMTP : données incorrectes.';
-$PHPMAILER_LANG['empty_message']        = 'Corps du message vide.';
-$PHPMAILER_LANG['encoding']             = 'Encodage inconnu : ';
-$PHPMAILER_LANG['execute']              = 'Impossible de lancer l’exécution : ';
-$PHPMAILER_LANG['extension_missing']    = 'Extension manquante : ';
-$PHPMAILER_LANG['file_access']          = 'Impossible d’accéder au fichier : ';
-$PHPMAILER_LANG['file_open']            = 'Ouverture du fichier impossible : ';
-$PHPMAILER_LANG['from_failed']          = 'L’adresse d’expéditeur suivante a échoué : ';
-$PHPMAILER_LANG['instantiate']          = 'Impossible d’instancier la fonction mail.';
-$PHPMAILER_LANG['invalid_address']      = 'Adresse courriel non valide : ';
-$PHPMAILER_LANG['invalid_header']       = 'Nom ou valeur de l’en-tête non valide';
-$PHPMAILER_LANG['invalid_hostentry']    = 'Entrée d’hôte non valide : ';
-$PHPMAILER_LANG['invalid_host']         = 'Hôte non valide : ';
-$PHPMAILER_LANG['mailer_not_supported'] = ' client de messagerie non supporté.';
-$PHPMAILER_LANG['provide_address']      = 'Vous devez fournir au moins une adresse de destinataire.';
-$PHPMAILER_LANG['recipients_failed']    = 'Erreur SMTP : les destinataires suivants ont échoué : ';
-$PHPMAILER_LANG['signing']              = 'Erreur de signature : ';
-$PHPMAILER_LANG['smtp_code']            = 'Code SMTP : ';
-$PHPMAILER_LANG['smtp_code_ex']         = 'Informations supplémentaires SMTP : ';
-$PHPMAILER_LANG['smtp_connect_failed']  = 'La fonction SMTP connect() a échouée.';
-$PHPMAILER_LANG['smtp_detail']          = 'Détails : ';
-$PHPMAILER_LANG['smtp_error']           = 'Erreur du serveur SMTP : ';
-$PHPMAILER_LANG['variable_set']         = 'Impossible d’initialiser ou de réinitialiser une variable : ';
diff --git a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-hi.php b/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-hi.php
deleted file mode 100644
index d2856e05..00000000
--- a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-hi.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-/**
- * Hindi PHPMailer language file: refer to English translation for definitive list
- * @package PHPMailer
- * @author Yash Karanke <mr.karanke@gmail.com>
- * Rewrite and extension of the work by Jayanti Suthar <suthar.jayanti93@gmail.com>
- */
-
-$PHPMAILER_LANG['authenticate']         = 'SMTP त्रुटि: प्रामाणिकता की जांच नहीं हो सका। ';
-$PHPMAILER_LANG['buggy_php']            = 'PHP का आपका संस्करण एक बग से प्रभावित है जिसके परिणामस्वरूप संदेश दूषित हो सकते हैं. इसे ठीक करने हेतु, भेजने के लिए SMTP का उपयोग करे, अपने php.ini में mail.add_x_header विकल्प को अक्षम करें, MacOS या Linux पर जाए, या अपने PHP संस्करण को 7.0.17+ या 7.1.3+ बदले.';
-$PHPMAILER_LANG['connect_host']         = 'SMTP त्रुटि: SMTP सर्वर से कनेक्ट नहीं हो सका। ';
-$PHPMAILER_LANG['data_not_accepted']    = 'SMTP त्रुटि: डेटा स्वीकार नहीं किया जाता है। ';
-$PHPMAILER_LANG['empty_message']        = 'संदेश खाली है। ';
-$PHPMAILER_LANG['encoding']             = 'अज्ञात एन्कोडिंग प्रकार। ';
-$PHPMAILER_LANG['execute']              = 'आदेश को निष्पादित करने में विफल। ';
-$PHPMAILER_LANG['extension_missing']    = 'एक्सटेन्षन गायब है: ';
-$PHPMAILER_LANG['file_access']          = 'फ़ाइल उपलब्ध नहीं है। ';
-$PHPMAILER_LANG['file_open']            = 'फ़ाइल त्रुटि: फाइल को खोला नहीं जा सका। ';
-$PHPMAILER_LANG['from_failed']          = 'प्रेषक का पता गलत है। ';
-$PHPMAILER_LANG['instantiate']          = 'मेल फ़ंक्शन कॉल नहीं कर सकता है।';
-$PHPMAILER_LANG['invalid_address']      = 'पता गलत है। ';
-$PHPMAILER_LANG['invalid_header']       = 'अमान्य हेडर नाम या मान';
-$PHPMAILER_LANG['invalid_hostentry']    = 'अमान्य hostentry: ';
-$PHPMAILER_LANG['invalid_host']         = 'अमान्य होस्ट: ';
-$PHPMAILER_LANG['mailer_not_supported'] = 'मेल सर्वर के साथ काम नहीं करता है। ';
-$PHPMAILER_LANG['provide_address']      = 'आपको कम से कम एक प्राप्तकर्ता का ई-मेल पता प्रदान करना होगा।';
-$PHPMAILER_LANG['recipients_failed']    = 'SMTP त्रुटि: निम्न प्राप्तकर्ताओं को पते भेजने में विफल। ';
-$PHPMAILER_LANG['signing']              = 'साइनअप त्रुटि: ';
-$PHPMAILER_LANG['smtp_code']            = 'SMTP कोड: ';
-$PHPMAILER_LANG['smtp_code_ex']         = 'अतिरिक्त SMTP जानकारी: ';
-$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP का connect () फ़ंक्शन विफल हुआ। ';
-$PHPMAILER_LANG['smtp_detail']          = 'विवरण: ';
-$PHPMAILER_LANG['smtp_error']           = 'SMTP सर्वर त्रुटि। ';
-$PHPMAILER_LANG['variable_set']         = 'चर को बना या संशोधित नहीं किया जा सकता। ';
diff --git a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-hy.php b/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-hy.php
deleted file mode 100644
index bb05d2d9..00000000
--- a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-hy.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-/**
- * Armenian PHPMailer language file: refer to English translation for definitive list
- * @package PHPMailer
- * @author Hrayr Grigoryan <hrayr@bits.am>
- */
-
-$PHPMAILER_LANG['authenticate']         = 'SMTP -ի սխալ: չհաջողվեց ստուգել իսկությունը.';
-$PHPMAILER_LANG['connect_host']         = 'SMTP -ի սխալ: չհաջողվեց կապ հաստատել SMTP սերվերի հետ.';
-$PHPMAILER_LANG['data_not_accepted']    = 'SMTP -ի սխալ: տվյալները ընդունված չեն.';
-$PHPMAILER_LANG['empty_message']        = 'Հաղորդագրությունը դատարկ է';
-$PHPMAILER_LANG['encoding']             = 'Կոդավորման անհայտ տեսակ: ';
-$PHPMAILER_LANG['execute']              = 'Չհաջողվեց իրականացնել հրամանը: ';
-$PHPMAILER_LANG['file_access']          = 'Ֆայլը հասանելի չէ: ';
-$PHPMAILER_LANG['file_open']            = 'Ֆայլի սխալ: ֆայլը չհաջողվեց բացել: ';
-$PHPMAILER_LANG['from_failed']          = 'Ուղարկողի հետևյալ հասցեն սխալ է: ';
-$PHPMAILER_LANG['instantiate']          = 'Հնարավոր չէ կանչել mail ֆունկցիան.';
-$PHPMAILER_LANG['invalid_address']      = 'Հասցեն սխալ է: ';
-$PHPMAILER_LANG['mailer_not_supported'] = ' փոստային սերվերի հետ չի աշխատում.';
-$PHPMAILER_LANG['provide_address']      = 'Անհրաժեշտ է տրամադրել գոնե մեկ ստացողի e-mail հասցե.';
-$PHPMAILER_LANG['recipients_failed']    = 'SMTP -ի սխալ: չի հաջողվել ուղարկել հետևյալ ստացողների հասցեներին: ';
-$PHPMAILER_LANG['signing']              = 'Ստորագրման սխալ: ';
-$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP -ի connect() ֆունկցիան չի հաջողվել';
-$PHPMAILER_LANG['smtp_error']           = 'SMTP սերվերի սխալ: ';
-$PHPMAILER_LANG['variable_set']         = 'Չի հաջողվում ստեղծել կամ վերափոխել փոփոխականը: ';
-$PHPMAILER_LANG['extension_missing']    = 'Հավելվածը բացակայում է: ';
diff --git a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-id.php b/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-id.php
deleted file mode 100644
index 212a11f1..00000000
--- a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-id.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-/**
- * Indonesian PHPMailer language file: refer to English translation for definitive list
- * @package PHPMailer
- * @author Cecep Prawiro <cecep.prawiro@gmail.com>
- * @author @januridp
- * @author Ian Mustafa <mail@ianmustafa.com>
- */
-
-$PHPMAILER_LANG['authenticate']         = 'Kesalahan SMTP: Tidak dapat mengotentikasi.';
-$PHPMAILER_LANG['connect_host']         = 'Kesalahan SMTP: Tidak dapat terhubung ke host SMTP.';
-$PHPMAILER_LANG['data_not_accepted']    = 'Kesalahan SMTP: Data tidak diterima.';
-$PHPMAILER_LANG['empty_message']        = 'Isi pesan kosong';
-$PHPMAILER_LANG['encoding']             = 'Pengkodean karakter tidak dikenali: ';
-$PHPMAILER_LANG['execute']              = 'Tidak dapat menjalankan proses: ';
-$PHPMAILER_LANG['file_access']          = 'Tidak dapat mengakses berkas: ';
-$PHPMAILER_LANG['file_open']            = 'Kesalahan Berkas: Berkas tidak dapat dibuka: ';
-$PHPMAILER_LANG['from_failed']          = 'Alamat pengirim berikut mengakibatkan kesalahan: ';
-$PHPMAILER_LANG['instantiate']          = 'Tidak dapat menginisialisasi fungsi surel.';
-$PHPMAILER_LANG['invalid_address']      = 'Gagal terkirim, alamat surel tidak sesuai: ';
-$PHPMAILER_LANG['invalid_hostentry']    = 'Gagal terkirim, entri host tidak sesuai: ';
-$PHPMAILER_LANG['invalid_host']         = 'Gagal terkirim, host tidak sesuai: ';
-$PHPMAILER_LANG['provide_address']      = 'Harus tersedia minimal satu alamat tujuan';
-$PHPMAILER_LANG['mailer_not_supported'] = ' mailer tidak didukung';
-$PHPMAILER_LANG['recipients_failed']    = 'Kesalahan SMTP: Alamat tujuan berikut menyebabkan kesalahan: ';
-$PHPMAILER_LANG['signing']              = 'Kesalahan dalam penandatangan SSL: ';
-$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Connect() gagal.';
-$PHPMAILER_LANG['smtp_error']           = 'Kesalahan pada pelayan SMTP: ';
-$PHPMAILER_LANG['variable_set']         = 'Tidak dapat mengatur atau mengatur ulang variabel: ';
-$PHPMAILER_LANG['extension_missing']    = 'Ekstensi PHP tidak tersedia: ';
diff --git a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-ja.php b/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-ja.php
deleted file mode 100644
index c76f5264..00000000
--- a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-ja.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-/**
- * Japanese PHPMailer language file: refer to English translation for definitive list
- * @package PHPMailer
- * @author Mitsuhiro Yoshida <http://mitstek.com/>
- * @author Yoshi Sakai <http://bluemooninc.jp/>
- * @author Arisophy <https://github.com/arisophy/>
- */
-
-$PHPMAILER_LANG['authenticate']         = 'SMTPエラー: 認証できませんでした。';
-$PHPMAILER_LANG['connect_host']         = 'SMTPエラー: SMTPホストに接続できませんでした。';
-$PHPMAILER_LANG['data_not_accepted']    = 'SMTPエラー: データが受け付けられませんでした。';
-$PHPMAILER_LANG['empty_message']        = 'メール本文が空です。';
-$PHPMAILER_LANG['encoding']             = '不明なエンコーディング: ';
-$PHPMAILER_LANG['execute']              = '実行できませんでした: ';
-$PHPMAILER_LANG['file_access']          = 'ファイルにアクセスできません: ';
-$PHPMAILER_LANG['file_open']            = 'ファイルエラー: ファイルを開けません: ';
-$PHPMAILER_LANG['from_failed']          = 'Fromアドレスを登録する際にエラーが発生しました: ';
-$PHPMAILER_LANG['instantiate']          = 'メール関数が正常に動作しませんでした。';
-$PHPMAILER_LANG['invalid_address']      = '不正なメールアドレス: ';
-$PHPMAILER_LANG['provide_address']      = '少なくとも1つメールアドレスを 指定する必要があります。';
-$PHPMAILER_LANG['mailer_not_supported'] = ' メーラーがサポートされていません。';
-$PHPMAILER_LANG['recipients_failed']    = 'SMTPエラー: 次の受信者アドレスに 間違いがあります: ';
-$PHPMAILER_LANG['signing']              = '署名エラー: ';
-$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP接続に失敗しました。';
-$PHPMAILER_LANG['smtp_error']           = 'SMTPサーバーエラー: ';
-$PHPMAILER_LANG['variable_set']         = '変数が存在しません: ';
-$PHPMAILER_LANG['extension_missing']    = '拡張機能が見つかりません: ';
diff --git a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-mg.php b/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-mg.php
deleted file mode 100644
index 8a94f6a0..00000000
--- a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-mg.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-/**
- * Malagasy PHPMailer language file: refer to English translation for definitive list
- * @package PHPMailer
- * @author Hackinet <piyushjha8164@gmail.com>
- */
-
-$PHPMAILER_LANG['authenticate']         = 'Hadisoana SMTP: Tsy nahomby ny fanamarinana.';
-$PHPMAILER_LANG['connect_host']         = 'SMTP Error: Tsy afaka mampifandray amin\'ny mpampiantrano SMTP.';
-$PHPMAILER_LANG['data_not_accepted']    = 'SMTP diso: tsy voarakitra ny angona.';
-$PHPMAILER_LANG['empty_message']        = 'Tsy misy ny votoaty mailaka.';
-$PHPMAILER_LANG['encoding']             = 'Tsy fantatra encoding: ';
-$PHPMAILER_LANG['execute']              = 'Tsy afaka manatanteraka ity baiko manaraka ity: ';
-$PHPMAILER_LANG['file_access']          = 'Tsy nahomby ny fidirana amin\'ity rakitra ity: ';
-$PHPMAILER_LANG['file_open']            = 'Hadisoana diso: Tsy afaka nanokatra ity file manaraka ity: ';
-$PHPMAILER_LANG['from_failed']          = 'Ny adiresy iraka manaraka dia diso: ';
-$PHPMAILER_LANG['instantiate']          = 'Tsy afaka nanomboka ny hetsika mail.';
-$PHPMAILER_LANG['invalid_address']      = 'Tsy mety ny adiresy: ';
-$PHPMAILER_LANG['mailer_not_supported'] = ' mailer tsy manohana.';
-$PHPMAILER_LANG['provide_address']      = 'Alefaso azafady iray adiresy iray farafahakeliny.';
-$PHPMAILER_LANG['recipients_failed']    = 'SMTP Error: Tsy mety ireo mpanaraka ireto: ';
-$PHPMAILER_LANG['signing']              = 'Error nandritra ny sonia:';
-$PHPMAILER_LANG['smtp_connect_failed']  = 'Tsy nahomby ny fifandraisana tamin\'ny server SMTP.';
-$PHPMAILER_LANG['smtp_error']           = 'Fahadisoana tamin\'ny server SMTP: ';
-$PHPMAILER_LANG['variable_set']         = 'Tsy azo atao ny mametraka na mamerina ny variable: ';
-$PHPMAILER_LANG['extension_missing']    = 'Tsy hita ny ampahany: ';
diff --git a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-mn.php b/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-mn.php
deleted file mode 100644
index 04d262c7..00000000
--- a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-mn.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-/**
- * Mongolian PHPMailer language file: refer to English translation for definitive list
- * @package PHPMailer
- * @author @wispas
- */
-
-$PHPMAILER_LANG['authenticate']         = 'Алдаа SMTP: Холбогдож чадсангүй.';
-$PHPMAILER_LANG['connect_host']         = 'Алдаа SMTP: SMTP- сервертэй холбогдож болохгүй байна.';
-$PHPMAILER_LANG['data_not_accepted']    = 'Алдаа SMTP: зөвшөөрөгдсөнгүй.';
-$PHPMAILER_LANG['encoding']             = 'Тодорхойгүй кодчилол: ';
-$PHPMAILER_LANG['execute']              = 'Коммандыг гүйцэтгэх боломжгүй байна: ';
-$PHPMAILER_LANG['file_access']          = 'Файлд хандах боломжгүй байна: ';
-$PHPMAILER_LANG['file_open']            = 'Файлын алдаа: файлыг нээх боломжгүй байна: ';
-$PHPMAILER_LANG['from_failed']          = 'Илгээгчийн хаяг буруу байна: ';
-$PHPMAILER_LANG['instantiate']          = 'Mail () функцийг ажиллуулах боломжгүй байна.';
-$PHPMAILER_LANG['provide_address']      = 'Хүлээн авагчийн имэйл хаягийг оруулна уу.';
-$PHPMAILER_LANG['mailer_not_supported'] = ' — мэйл серверийг дэмжсэнгүй.';
-$PHPMAILER_LANG['recipients_failed']    = 'Алдаа SMTP: ийм хаягийг илгээж чадсангүй: ';
-$PHPMAILER_LANG['empty_message']        = 'Хоосон мессэж';
-$PHPMAILER_LANG['invalid_address']      = 'И-Мэйл буруу форматтай тул илгээх боломжгүй: ';
-$PHPMAILER_LANG['signing']              = 'Гарын үсгийн алдаа: ';
-$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP сервертэй холбогдоход алдаа гарлаа';
-$PHPMAILER_LANG['smtp_error']           = 'SMTP серверийн алдаа: ';
-$PHPMAILER_LANG['variable_set']         = 'Хувьсагчийг тохируулах эсвэл дахин тохируулах боломжгүй байна: ';
-$PHPMAILER_LANG['extension_missing']    = 'Өргөтгөл байхгүй: ';
diff --git a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-nb.php b/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-nb.php
deleted file mode 100644
index c9621a16..00000000
--- a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-nb.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-/**
- * Norwegian Bokmål PHPMailer language file: refer to English translation for definitive list
- * @package PHPMailer
- */
-
- $PHPMAILER_LANG['authenticate']         = 'SMTP-feil: Kunne ikke autentiseres.';
- $PHPMAILER_LANG['buggy_php']            = 'Din versjon av PHP er berørt av en feil som kan føre til ødelagte meldinger. For å løse problemet kan du bytte til SMTP, deaktivere alternativet mail.add_x_header i php.ini, bytte til MacOS eller Linux eller oppgradere PHP til versjon 7.0.17+ eller 7.1.3+.';
- $PHPMAILER_LANG['connect_host']         = 'SMTP-feil: Kunne ikke koble til SMTP-vert.';
- $PHPMAILER_LANG['data_not_accepted']    = 'SMTP-feil: data ikke akseptert.';
- $PHPMAILER_LANG['empty_message']        = 'Meldingstekst mangler';
- $PHPMAILER_LANG['encoding']             = 'Ukjent koding: ';
- $PHPMAILER_LANG['execute']              = 'Kunne ikke utføres: ';
- $PHPMAILER_LANG['extension_missing']    = 'Utvidelse mangler: ';
- $PHPMAILER_LANG['file_access']          = 'Kunne ikke få tilgang til filen: ';
- $PHPMAILER_LANG['file_open']            = 'Feil i fil: Kunne ikke åpne filen: ';
- $PHPMAILER_LANG['from_failed']          = 'Følgende Fra-adresse mislyktes: ';
- $PHPMAILER_LANG['instantiate']          = 'Kunne ikke instansiere e-postfunksjonen.';
- $PHPMAILER_LANG['invalid_address']      = 'Ugyldig adresse: ';
- $PHPMAILER_LANG['invalid_header']       = 'Ugyldig headernavn eller verdi';
- $PHPMAILER_LANG['invalid_hostentry']    = 'Ugyldig vertsinngang: ';
- $PHPMAILER_LANG['invalid_host']         = 'Ugyldig vert: ';
- $PHPMAILER_LANG['mailer_not_supported'] = ' sender er ikke støttet.';
- $PHPMAILER_LANG['provide_address']      = 'Du må oppgi minst én mottaker-e-postadresse.';
- $PHPMAILER_LANG['recipients_failed']    = 'SMTP Feil: Følgende mottakeradresse feilet: ';
- $PHPMAILER_LANG['signing']              = 'Signeringsfeil: ';
- $PHPMAILER_LANG['smtp_code']            = 'SMTP-kode: ';
- $PHPMAILER_LANG['smtp_code_ex']         = 'Ytterligere SMTP-info: ';
- $PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP connect() mislyktes.';
- $PHPMAILER_LANG['smtp_detail']          = 'Detaljer: ';
- $PHPMAILER_LANG['smtp_error']           = 'SMTP-serverfeil: ';
- $PHPMAILER_LANG['variable_set']         = 'Kan ikke angi eller tilbakestille variabel: ';
diff --git a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-nl.php b/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-nl.php
deleted file mode 100644
index 8229d5e2..00000000
--- a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-nl.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/**
- * Dutch PHPMailer language file: refer to PHPMailer.php for definitive list.
- * @package PHPMailer
- * @author Tuxion <team@tuxion.nl>
- */
-
-$PHPMAILER_LANG['authenticate']         = 'SMTP-fout: authenticatie mislukt.';
-$PHPMAILER_LANG['buggy_php']            = 'PHP versie gededecteerd die onderhavig is aan een bug die kan resulteren in gecorrumpeerde berichten. Om dit te voorkomen, gebruik SMTP voor het verzenden van berichten, zet de mail.add_x_header optie in uw php.ini file uit, gebruik MacOS of Linux, of pas de gebruikte PHP versie aan naar versie 7.0.17+ or 7.1.3+.';
-$PHPMAILER_LANG['connect_host']         = 'SMTP-fout: kon niet verbinden met SMTP-host.';
-$PHPMAILER_LANG['data_not_accepted']    = 'SMTP-fout: data niet geaccepteerd.';
-$PHPMAILER_LANG['empty_message']        = 'Berichttekst is leeg';
-$PHPMAILER_LANG['encoding']             = 'Onbekende codering: ';
-$PHPMAILER_LANG['execute']              = 'Kon niet uitvoeren: ';
-$PHPMAILER_LANG['extension_missing']    = 'Extensie afwezig: ';
-$PHPMAILER_LANG['file_access']          = 'Kreeg geen toegang tot bestand: ';
-$PHPMAILER_LANG['file_open']            = 'Bestandsfout: kon bestand niet openen: ';
-$PHPMAILER_LANG['from_failed']          = 'Het volgende afzendersadres is mislukt: ';
-$PHPMAILER_LANG['instantiate']          = 'Kon mailfunctie niet initialiseren.';
-$PHPMAILER_LANG['invalid_address']      = 'Ongeldig adres: ';
-$PHPMAILER_LANG['invalid_header']       = 'Ongeldige header naam of waarde';
-$PHPMAILER_LANG['invalid_hostentry']    = 'Ongeldige hostentry: ';
-$PHPMAILER_LANG['invalid_host']         = 'Ongeldige host: ';
-$PHPMAILER_LANG['mailer_not_supported'] = ' mailer wordt niet ondersteund.';
-$PHPMAILER_LANG['provide_address']      = 'Er moet minstens één ontvanger worden opgegeven.';
-$PHPMAILER_LANG['recipients_failed']    = 'SMTP-fout: de volgende ontvangers zijn mislukt: ';
-$PHPMAILER_LANG['signing']              = 'Signeerfout: ';
-$PHPMAILER_LANG['smtp_code']            = 'SMTP code: ';
-$PHPMAILER_LANG['smtp_code_ex']         = 'Aanvullende SMTP informatie: ';
-$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Verbinding mislukt.';
-$PHPMAILER_LANG['smtp_detail']          = 'Detail: ';
-$PHPMAILER_LANG['smtp_error']           = 'SMTP-serverfout: ';
-$PHPMAILER_LANG['variable_set']         = 'Kan de volgende variabele niet instellen of resetten: ';
diff --git a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-pl.php b/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-pl.php
deleted file mode 100644
index cb7b2c21..00000000
--- a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-pl.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-/**
- * Polish PHPMailer language file: refer to English translation for definitive list
- * @package PHPMailer
- */
-
-$PHPMAILER_LANG['authenticate']         = 'Błąd SMTP: Nie można przeprowadzić uwierzytelnienia.';
-$PHPMAILER_LANG['buggy_php']            = 'Twoja wersja PHP zawiera błąd, który może powodować uszkodzenie wiadomości. Aby go naprawić, przełącz się na wysyłanie za pomocą SMTP, wyłącz opcję mail.add_x_header w php.ini, przełącz się na MacOS lub Linux lub zaktualizuj PHP do wersji 7.0.17+ lub 7.1.3+.';
-$PHPMAILER_LANG['connect_host']         = 'Błąd SMTP: Nie można połączyć się z wybranym hostem.';
-$PHPMAILER_LANG['data_not_accepted']    = 'Błąd SMTP: Dane nie zostały przyjęte.';
-$PHPMAILER_LANG['empty_message']        = 'Wiadomość jest pusta.';
-$PHPMAILER_LANG['encoding']             = 'Błędny sposób kodowania znaków: ';
-$PHPMAILER_LANG['execute']              = 'Nie można uruchomić: ';
-$PHPMAILER_LANG['extension_missing']    = 'Brakujące rozszerzenie: ';
-$PHPMAILER_LANG['file_access']          = 'Brak dostępu do pliku: ';
-$PHPMAILER_LANG['file_open']            = 'Nie można otworzyć pliku: ';
-$PHPMAILER_LANG['from_failed']          = 'Następujący adres nadawcy jest nieprawidłowy lub nie istnieje: ';
-$PHPMAILER_LANG['instantiate']          = 'Nie można wywołać funkcji mail(). Sprawdź konfigurację serwera.';
-$PHPMAILER_LANG['invalid_address']      = 'Nie można wysłać wiadomości, ' . 'następujący adres odbiorcy jest nieprawidłowy lub nie istnieje: ';
-$PHPMAILER_LANG['invalid_header']       = 'Nieprawidłowa nazwa lub wartość nagłówka';
-$PHPMAILER_LANG['invalid_hostentry']    = 'Nieprawidłowy wpis hosta: ';
-$PHPMAILER_LANG['invalid_host']         = 'Nieprawidłowy host: ';
-$PHPMAILER_LANG['provide_address']      = 'Należy podać prawidłowy adres email odbiorcy.';
-$PHPMAILER_LANG['mailer_not_supported'] = 'Wybrana metoda wysyłki wiadomości nie jest obsługiwana.';
-$PHPMAILER_LANG['recipients_failed']    = 'Błąd SMTP: Następujący odbiorcy są nieprawidłowi lub nie istnieją: ';
-$PHPMAILER_LANG['signing']              = 'Błąd podpisywania wiadomości: ';
-$PHPMAILER_LANG['smtp_code']            = 'Kod SMTP: ';
-$PHPMAILER_LANG['smtp_code_ex']         = 'Dodatkowe informacje SMTP: ';
-$PHPMAILER_LANG['smtp_connect_failed']  = 'Wywołanie funkcji SMTP Connect() zostało zakończone niepowodzeniem.';
-$PHPMAILER_LANG['smtp_detail']          = 'Szczegóły: ';
-$PHPMAILER_LANG['smtp_error']           = 'Błąd SMTP: ';
-$PHPMAILER_LANG['variable_set']         = 'Nie można ustawić lub zmodyfikować zmiennej: ';
diff --git a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-pt_br.php b/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-pt_br.php
deleted file mode 100644
index 5239865a..00000000
--- a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-pt_br.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-/**
- * Brazilian Portuguese PHPMailer language file: refer to English translation for definitive list
- * @package PHPMailer
- * @author Paulo Henrique Garcia <paulo@controllerweb.com.br>
- * @author Lucas Guimarães <lucas@lucasguimaraes.com>
- * @author Phelipe Alves <phelipealvesdesouza@gmail.com>
- * @author Fabio Beneditto <fabiobeneditto@gmail.com>
- * @author Geidson Benício Coelho <geidsonc@gmail.com>
- */
-
-$PHPMAILER_LANG['authenticate']         = 'Erro de SMTP: Não foi possível autenticar.';
-$PHPMAILER_LANG['buggy_php']            = 'Sua versão do PHP é afetada por um bug que por resultar em messagens corrompidas. Para corrigir, mude para enviar usando SMTP, desative a opção mail.add_x_header em seu php.ini, mude para MacOS ou Linux, ou atualize seu PHP para versão 7.0.17+ ou 7.1.3+ ';
-$PHPMAILER_LANG['connect_host']         = 'Erro de SMTP: Não foi possível conectar ao servidor SMTP.';
-$PHPMAILER_LANG['data_not_accepted']    = 'Erro de SMTP: Dados rejeitados.';
-$PHPMAILER_LANG['empty_message']        = 'Mensagem vazia';
-$PHPMAILER_LANG['encoding']             = 'Codificação desconhecida: ';
-$PHPMAILER_LANG['execute']              = 'Não foi possível executar: ';
-$PHPMAILER_LANG['extension_missing']    = 'Extensão não existe: ';
-$PHPMAILER_LANG['file_access']          = 'Não foi possível acessar o arquivo: ';
-$PHPMAILER_LANG['file_open']            = 'Erro de Arquivo: Não foi possível abrir o arquivo: ';
-$PHPMAILER_LANG['from_failed']          = 'Os seguintes remetentes falharam: ';
-$PHPMAILER_LANG['instantiate']          = 'Não foi possível instanciar a função mail.';
-$PHPMAILER_LANG['invalid_address']      = 'Endereço de e-mail inválido: ';
-$PHPMAILER_LANG['invalid_header']       = 'Nome ou valor de cabeçalho inválido';
-$PHPMAILER_LANG['invalid_hostentry']    = 'hostentry inválido: ';
-$PHPMAILER_LANG['invalid_host']         = 'host inválido: ';
-$PHPMAILER_LANG['mailer_not_supported'] = ' mailer não é suportado.';
-$PHPMAILER_LANG['provide_address']      = 'Você deve informar pelo menos um destinatário.';
-$PHPMAILER_LANG['recipients_failed']    = 'Erro de SMTP: Os seguintes destinatários falharam: ';
-$PHPMAILER_LANG['signing']              = 'Erro de Assinatura: ';
-$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP Connect() falhou.';
-$PHPMAILER_LANG['smtp_code']            = 'Código do servidor SMTP: ';
-$PHPMAILER_LANG['smtp_error']           = 'Erro de servidor SMTP: ';
-$PHPMAILER_LANG['smtp_code_ex']         = 'Informações adicionais do servidor SMTP: ';
-$PHPMAILER_LANG['smtp_detail']          = 'Detalhes do servidor SMTP: ';
-$PHPMAILER_LANG['variable_set']         = 'Não foi possível definir ou redefinir a variável: ';
diff --git a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-ro.php b/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-ro.php
deleted file mode 100644
index 45bef915..00000000
--- a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-ro.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-/**
- * Romanian PHPMailer language file: refer to English translation for definitive list
- * @package PHPMailer
- */
-
-$PHPMAILER_LANG['authenticate']         = 'Eroare SMTP: Autentificarea a eșuat.';
-$PHPMAILER_LANG['buggy_php']            = 'Versiunea instalată de PHP este afectată de o problemă care poate duce la coruperea mesajelor Pentru a preveni această problemă, folosiți SMTP, dezactivați opțiunea mail.add_x_header din php.ini, folosiți MacOS/Linux sau actualizați versiunea de PHP la 7.0.17+ sau 7.1.3+.';
-$PHPMAILER_LANG['connect_host']         = 'Eroare SMTP: Conectarea la serverul SMTP a eșuat.';
-$PHPMAILER_LANG['data_not_accepted']    = 'Eroare SMTP: Datele nu au fost acceptate.';
-$PHPMAILER_LANG['empty_message']        = 'Mesajul este gol.';
-$PHPMAILER_LANG['encoding']             = 'Encodare necunoscută: ';
-$PHPMAILER_LANG['execute']              = 'Nu se poate executa următoarea comandă:  ';
-$PHPMAILER_LANG['extension_missing']    = 'Lipsește extensia: ';
-$PHPMAILER_LANG['file_access']          = 'Nu se poate accesa următorul fișier: ';
-$PHPMAILER_LANG['file_open']            = 'Eroare fișier: Nu se poate deschide următorul fișier: ';
-$PHPMAILER_LANG['from_failed']          = 'Următoarele adrese From au dat eroare: ';
-$PHPMAILER_LANG['instantiate']          = 'Funcția mail nu a putut fi inițializată.';
-$PHPMAILER_LANG['invalid_address']      = 'Adresa de email nu este validă: ';
-$PHPMAILER_LANG['invalid_header']       = 'Numele sau valoarea header-ului nu este validă: ';
-$PHPMAILER_LANG['invalid_hostentry']    = 'Hostentry invalid: ';
-$PHPMAILER_LANG['invalid_host']         = 'Host invalid: ';
-$PHPMAILER_LANG['mailer_not_supported'] = ' mailer nu este suportat.';
-$PHPMAILER_LANG['provide_address']      = 'Trebuie să adăugați cel puțin o adresă de email.';
-$PHPMAILER_LANG['recipients_failed']    = 'Eroare SMTP: Următoarele adrese de email au eșuat: ';
-$PHPMAILER_LANG['signing']              = 'A aparut o problemă la semnarea emailului. ';
-$PHPMAILER_LANG['smtp_code']            = 'Cod SMTP: ';
-$PHPMAILER_LANG['smtp_code_ex']         = 'Informații SMTP adiționale: ';
-$PHPMAILER_LANG['smtp_connect_failed']  = 'Conectarea la serverul SMTP a eșuat.';
-$PHPMAILER_LANG['smtp_detail']          = 'Detalii SMTP: ';
-$PHPMAILER_LANG['smtp_error']           = 'Eroare server SMTP: ';
-$PHPMAILER_LANG['variable_set']         = 'Nu se poate seta/reseta variabila. ';
diff --git a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-ru.php b/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-ru.php
deleted file mode 100644
index 8c8c5e81..00000000
--- a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-ru.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-/**
- * Russian PHPMailer language file: refer to English translation for definitive list
- * @package PHPMailer
- * @author Alexey Chumakov <alex@chumakov.ru>
- * @author Foster Snowhill <i18n@forstwoof.ru>
- */
-
-$PHPMAILER_LANG['authenticate']         = 'Ошибка SMTP: ошибка авторизации.';
-$PHPMAILER_LANG['connect_host']         = 'Ошибка SMTP: не удается подключиться к SMTP-серверу.';
-$PHPMAILER_LANG['data_not_accepted']    = 'Ошибка SMTP: данные не приняты.';
-$PHPMAILER_LANG['encoding']             = 'Неизвестная кодировка: ';
-$PHPMAILER_LANG['execute']              = 'Невозможно выполнить команду: ';
-$PHPMAILER_LANG['file_access']          = 'Нет доступа к файлу: ';
-$PHPMAILER_LANG['file_open']            = 'Файловая ошибка: не удаётся открыть файл: ';
-$PHPMAILER_LANG['from_failed']          = 'Неверный адрес отправителя: ';
-$PHPMAILER_LANG['instantiate']          = 'Невозможно запустить функцию mail().';
-$PHPMAILER_LANG['provide_address']      = 'Пожалуйста, введите хотя бы один email-адрес получателя.';
-$PHPMAILER_LANG['mailer_not_supported'] = ' — почтовый сервер не поддерживается.';
-$PHPMAILER_LANG['recipients_failed']    = 'Ошибка SMTP: не удалась отправка таким адресатам: ';
-$PHPMAILER_LANG['empty_message']        = 'Пустое сообщение';
-$PHPMAILER_LANG['invalid_address']      = 'Не отправлено из-за неправильного формата email-адреса: ';
-$PHPMAILER_LANG['signing']              = 'Ошибка подписи: ';
-$PHPMAILER_LANG['smtp_connect_failed']  = 'Ошибка соединения с SMTP-сервером';
-$PHPMAILER_LANG['smtp_error']           = 'Ошибка SMTP-сервера: ';
-$PHPMAILER_LANG['variable_set']         = 'Невозможно установить или сбросить переменную: ';
-$PHPMAILER_LANG['extension_missing']    = 'Расширение отсутствует: ';
diff --git a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-si.php b/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-si.php
deleted file mode 100644
index dce502aa..00000000
--- a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-si.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/**
- * Sinhalese PHPMailer language file: refer to English translation for definitive list
- * @package PHPMailer
- * @author Ayesh Karunaratne <ayesh@aye.sh>
- */
-
-$PHPMAILER_LANG['authenticate']         = 'SMTP දෝෂය: සත්‍යාපනය අසාර්ථක විය.';
-$PHPMAILER_LANG['buggy_php']            = 'ඔබගේ PHP version එකෙහි පවතින දෝෂයක් නිසා email පණිවිඩ දෝෂ සහගත වීමේ හැකියාවක් ඇත. මෙය විසදීම සදහා SMTP භාවිතා කිරීම, mail.add_x_header INI setting එක අක්‍රීය කිරීම, MacOS හෝ Linux වලට මාරු වීම, හෝ ඔබගේ PHP version එක 7.0.17+ හෝ 7.1.3+ වලට අලුත් කිරීම කරගන්න.';
-$PHPMAILER_LANG['connect_host']         = 'SMTP දෝෂය: සම්බන්ධ වීමට නොහැකි විය.';
-$PHPMAILER_LANG['data_not_accepted']    = 'SMTP දෝෂය: දත්ත පිළිගනු නොලැබේ.';
-$PHPMAILER_LANG['empty_message']        = 'පණිවිඩ අන්තර්ගතය හිස්';
-$PHPMAILER_LANG['encoding']             = 'නොදන්නා කේතනය: ';
-$PHPMAILER_LANG['execute']              = 'ක්‍රියාත්මක කළ නොහැකි විය: ';
-$PHPMAILER_LANG['extension_missing']    = 'Extension එක නොමැත: ';
-$PHPMAILER_LANG['file_access']          = 'File එකට ප්‍රවේශ විය නොහැකි විය: ';
-$PHPMAILER_LANG['file_open']            = 'File දෝෂය: File එක විවෘත කළ නොහැක: ';
-$PHPMAILER_LANG['from_failed']          = 'පහත From ලිපිනයන් අසාර්ථක විය: ';
-$PHPMAILER_LANG['instantiate']          = 'mail function එක ක්‍රියාත්මක කළ නොහැක.';
-$PHPMAILER_LANG['invalid_address']      = 'වලංගු නොවන ලිපිනය: ';
-$PHPMAILER_LANG['invalid_header']       = 'වලංගු නොවන header නාමයක් හෝ අගයක්';
-$PHPMAILER_LANG['invalid_hostentry']    = 'වලංගු නොවන hostentry එකක්: ';
-$PHPMAILER_LANG['invalid_host']         = 'වලංගු නොවන host එකක්: ';
-$PHPMAILER_LANG['mailer_not_supported'] = ' mailer සහාය නොදක්වයි.';
-$PHPMAILER_LANG['provide_address']      = 'ඔබ අවම වශයෙන් එක් ලබන්නෙකුගේ ඊමේල් ලිපිනයක් සැපයිය යුතුය.';
-$PHPMAILER_LANG['recipients_failed']    = 'SMTP දෝෂය: පහත ලබන්නන් අසමත් විය: ';
-$PHPMAILER_LANG['signing']              = 'Sign කිරීමේ දෝෂය: ';
-$PHPMAILER_LANG['smtp_code']            = 'SMTP කේතය: ';
-$PHPMAILER_LANG['smtp_code_ex']         = 'අමතර SMTP තොරතුරු: ';
-$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP සම්බන්ධය අසාර්ථක විය.';
-$PHPMAILER_LANG['smtp_detail']          = 'තොරතුරු: ';
-$PHPMAILER_LANG['smtp_error']           = 'SMTP දෝෂය: ';
-$PHPMAILER_LANG['variable_set']         = 'Variable එක සැකසීමට හෝ නැවත සැකසීමට නොහැක: ';
diff --git a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-sl.php b/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-sl.php
deleted file mode 100644
index 3e00c259..00000000
--- a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-sl.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-/**
- * Slovene PHPMailer language file: refer to English translation for definitive list
- * @package PHPMailer
- * @author Klemen Tušar <techouse@gmail.com>
- * @author Filip Š <projects@filips.si>
- * @author Blaž Oražem <blaz@orazem.si>
- */
-
-$PHPMAILER_LANG['authenticate']         = 'SMTP napaka: Avtentikacija ni uspela.';
-$PHPMAILER_LANG['buggy_php']            = 'Na vašo PHP različico vpliva napaka, ki lahko povzroči poškodovana sporočila. Če želite težavo odpraviti, preklopite na pošiljanje prek SMTP, onemogočite možnost mail.add_x_header v vaši php.ini datoteki, preklopite na MacOS ali Linux, ali nadgradite vašo PHP zaličico na 7.0.17+ ali 7.1.3+.';
-$PHPMAILER_LANG['connect_host']         = 'SMTP napaka: Vzpostavljanje povezave s SMTP gostiteljem ni uspelo.';
-$PHPMAILER_LANG['data_not_accepted']    = 'SMTP napaka: Strežnik zavrača podatke.';
-$PHPMAILER_LANG['empty_message']        = 'E-poštno sporočilo nima vsebine.';
-$PHPMAILER_LANG['encoding']             = 'Nepoznan tip kodiranja: ';
-$PHPMAILER_LANG['execute']              = 'Operacija ni uspela: ';
-$PHPMAILER_LANG['extension_missing']    = 'Manjkajoča razširitev: ';
-$PHPMAILER_LANG['file_access']          = 'Nimam dostopa do datoteke: ';
-$PHPMAILER_LANG['file_open']            = 'Ne morem odpreti datoteke: ';
-$PHPMAILER_LANG['from_failed']          = 'Neveljaven e-naslov pošiljatelja: ';
-$PHPMAILER_LANG['instantiate']          = 'Ne morem inicializirati mail funkcije.';
-$PHPMAILER_LANG['invalid_address']      = 'E-poštno sporočilo ni bilo poslano. E-naslov je neveljaven: ';
-$PHPMAILER_LANG['invalid_header']       = 'Neveljavno ime ali vrednost glave';
-$PHPMAILER_LANG['invalid_hostentry']    = 'Neveljaven vnos gostitelja: ';
-$PHPMAILER_LANG['invalid_host']         = 'Neveljaven gostitelj: ';
-$PHPMAILER_LANG['mailer_not_supported'] = ' mailer ni podprt.';
-$PHPMAILER_LANG['provide_address']      = 'Prosimo, vnesite vsaj enega naslovnika.';
-$PHPMAILER_LANG['recipients_failed']    = 'SMTP napaka: Sledeči naslovniki so neveljavni: ';
-$PHPMAILER_LANG['signing']              = 'Napaka pri podpisovanju: ';
-$PHPMAILER_LANG['smtp_code']            = 'SMTP koda: ';
-$PHPMAILER_LANG['smtp_code_ex']         = 'Dodatne informacije o SMTP: ';
-$PHPMAILER_LANG['smtp_connect_failed']  = 'Ne morem vzpostaviti povezave s SMTP strežnikom.';
-$PHPMAILER_LANG['smtp_detail']          = 'Podrobnosti: ';
-$PHPMAILER_LANG['smtp_error']           = 'Napaka SMTP strežnika: ';
-$PHPMAILER_LANG['variable_set']         = 'Ne morem nastaviti oz. ponastaviti spremenljivke: ';
diff --git a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-sr.php b/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-sr.php
deleted file mode 100644
index 0b5280f7..00000000
--- a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-sr.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-/**
- * Serbian PHPMailer language file: refer to English translation for definitive list
- * @package PHPMailer
- * @author Александар Јевремовић <ajevremovic@gmail.com>
- * @author Miloš Milanović <mmilanovic016@gmail.com>
- */
-
-$PHPMAILER_LANG['authenticate']         = 'SMTP грешка: аутентификација није успела.';
-$PHPMAILER_LANG['connect_host']         = 'SMTP грешка: повезивање са SMTP сервером није успело.';
-$PHPMAILER_LANG['data_not_accepted']    = 'SMTP грешка: подаци нису прихваћени.';
-$PHPMAILER_LANG['empty_message']        = 'Садржај поруке је празан.';
-$PHPMAILER_LANG['encoding']             = 'Непознато кодирање: ';
-$PHPMAILER_LANG['execute']              = 'Није могуће извршити наредбу: ';
-$PHPMAILER_LANG['file_access']          = 'Није могуће приступити датотеци: ';
-$PHPMAILER_LANG['file_open']            = 'Није могуће отворити датотеку: ';
-$PHPMAILER_LANG['from_failed']          = 'SMTP грешка: слање са следећих адреса није успело: ';
-$PHPMAILER_LANG['recipients_failed']    = 'SMTP грешка: слање на следеће адресе није успело: ';
-$PHPMAILER_LANG['instantiate']          = 'Није могуће покренути mail функцију.';
-$PHPMAILER_LANG['invalid_address']      = 'Порука није послата. Неисправна адреса: ';
-$PHPMAILER_LANG['mailer_not_supported'] = ' мејлер није подржан.';
-$PHPMAILER_LANG['provide_address']      = 'Дефинишите бар једну адресу примаоца.';
-$PHPMAILER_LANG['signing']              = 'Грешка приликом пријаве: ';
-$PHPMAILER_LANG['smtp_connect_failed']  = 'Повезивање са SMTP сервером није успело.';
-$PHPMAILER_LANG['smtp_error']           = 'Грешка SMTP сервера: ';
-$PHPMAILER_LANG['variable_set']         = 'Није могуће задати нити ресетовати променљиву: ';
-$PHPMAILER_LANG['extension_missing']    = 'Недостаје проширење: ';
diff --git a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-sr_latn.php b/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-sr_latn.php
deleted file mode 100644
index 62138329..00000000
--- a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-sr_latn.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-/**
- * Serbian PHPMailer language file: refer to English translation for definitive list
- * @package PHPMailer
- * @author Александар Јевремовић <ajevremovic@gmail.com>
- * @author Miloš Milanović <mmilanovic016@gmail.com>
- */
-
-$PHPMAILER_LANG['authenticate']         = 'SMTP greška: autentifikacija nije uspela.';
-$PHPMAILER_LANG['connect_host']         = 'SMTP greška: povezivanje sa SMTP serverom nije uspelo.';
-$PHPMAILER_LANG['data_not_accepted']    = 'SMTP greška: podaci nisu prihvaćeni.';
-$PHPMAILER_LANG['empty_message']        = 'Sadržaj poruke je prazan.';
-$PHPMAILER_LANG['encoding']             = 'Nepoznato kodiranje: ';
-$PHPMAILER_LANG['execute']              = 'Nije moguće izvršiti naredbu: ';
-$PHPMAILER_LANG['file_access']          = 'Nije moguće pristupiti datoteci: ';
-$PHPMAILER_LANG['file_open']            = 'Nije moguće otvoriti datoteku: ';
-$PHPMAILER_LANG['from_failed']          = 'SMTP greška: slanje sa sledećih adresa nije uspelo: ';
-$PHPMAILER_LANG['recipients_failed']    = 'SMTP greška: slanje na sledeće adrese nije uspelo: ';
-$PHPMAILER_LANG['instantiate']          = 'Nije moguće pokrenuti mail funkciju.';
-$PHPMAILER_LANG['invalid_address']      = 'Poruka nije poslata. Neispravna adresa: ';
-$PHPMAILER_LANG['mailer_not_supported'] = ' majler nije podržan.';
-$PHPMAILER_LANG['provide_address']      = 'Definišite bar jednu adresu primaoca.';
-$PHPMAILER_LANG['signing']              = 'Greška prilikom prijave: ';
-$PHPMAILER_LANG['smtp_connect_failed']  = 'Povezivanje sa SMTP serverom nije uspelo.';
-$PHPMAILER_LANG['smtp_error']           = 'Greška SMTP servera: ';
-$PHPMAILER_LANG['variable_set']         = 'Nije moguće zadati niti resetovati promenljivu: ';
-$PHPMAILER_LANG['extension_missing']    = 'Nedostaje proširenje: ';
diff --git a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-tl.php b/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-tl.php
deleted file mode 100644
index d15bed1c..00000000
--- a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-tl.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-/**
- * Tagalog PHPMailer language file: refer to English translation for definitive list
- *
- *   @package PHPMailer
- *   @author Adriane Justine Tan <eidoriantan@gmail.com>
- */
-
-$PHPMAILER_LANG['authenticate']         = 'SMTP Error: Hindi mapatotohanan.';
-$PHPMAILER_LANG['connect_host']         = 'SMTP Error: Hindi makakonekta sa SMTP host.';
-$PHPMAILER_LANG['data_not_accepted']    = 'SMTP Error: Ang datos ay hindi naitanggap.';
-$PHPMAILER_LANG['empty_message']        = 'Walang laman ang mensahe';
-$PHPMAILER_LANG['encoding']             = 'Hindi alam ang encoding: ';
-$PHPMAILER_LANG['execute']              = 'Hindi maisasagawa: ';
-$PHPMAILER_LANG['file_access']          = 'Hindi ma-access ang file: ';
-$PHPMAILER_LANG['file_open']            = 'File Error: Hindi mabuksan ang file: ';
-$PHPMAILER_LANG['from_failed']          = 'Ang sumusunod na address ay nabigo: ';
-$PHPMAILER_LANG['instantiate']          = 'Hindi maisimulan ang instance ng mail function.';
-$PHPMAILER_LANG['invalid_address']      = 'Hindi wasto ang address na naibigay: ';
-$PHPMAILER_LANG['mailer_not_supported'] = 'Ang mailer ay hindi suportado.';
-$PHPMAILER_LANG['provide_address']      = 'Kailangan mong magbigay ng kahit isang email address na tatanggap.';
-$PHPMAILER_LANG['recipients_failed']    = 'SMTP Error: Ang mga sumusunod na tatanggap ay nabigo: ';
-$PHPMAILER_LANG['signing']              = 'Hindi ma-sign: ';
-$PHPMAILER_LANG['smtp_connect_failed']  = 'Ang SMTP connect() ay nabigo.';
-$PHPMAILER_LANG['smtp_error']           = 'Ang server ng SMTP ay nabigo: ';
-$PHPMAILER_LANG['variable_set']         = 'Hindi matatakda o ma-reset ang mga variables: ';
-$PHPMAILER_LANG['extension_missing']    = 'Nawawala ang extension: ';
diff --git a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-uk.php b/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-uk.php
deleted file mode 100644
index 3dea055b..00000000
--- a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-uk.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-/**
- * Ukrainian PHPMailer language file: refer to English translation for definitive list
- * @package PHPMailer
- * @author Yuriy Rudyy <yrudyy@prs.net.ua>
- * @fixed by Boris Yurchenko <boris@yurchenko.pp.ua>
- */
-
-$PHPMAILER_LANG['authenticate']         = 'Помилка SMTP: помилка авторизації.';
-$PHPMAILER_LANG['connect_host']         = 'Помилка SMTP: не вдається під\'єднатися до SMTP-серверу.';
-$PHPMAILER_LANG['data_not_accepted']    = 'Помилка SMTP: дані не прийнято.';
-$PHPMAILER_LANG['encoding']             = 'Невідоме кодування: ';
-$PHPMAILER_LANG['execute']              = 'Неможливо виконати команду: ';
-$PHPMAILER_LANG['file_access']          = 'Немає доступу до файлу: ';
-$PHPMAILER_LANG['file_open']            = 'Помилка файлової системи: не вдається відкрити файл: ';
-$PHPMAILER_LANG['from_failed']          = 'Невірна адреса відправника: ';
-$PHPMAILER_LANG['instantiate']          = 'Неможливо запустити функцію mail().';
-$PHPMAILER_LANG['provide_address']      = 'Будь ласка, введіть хоча б одну email-адресу отримувача.';
-$PHPMAILER_LANG['mailer_not_supported'] = ' - поштовий сервер не підтримується.';
-$PHPMAILER_LANG['recipients_failed']    = 'Помилка SMTP: не вдалося відправлення для таких отримувачів: ';
-$PHPMAILER_LANG['empty_message']        = 'Пусте повідомлення';
-$PHPMAILER_LANG['invalid_address']      = 'Не відправлено через неправильний формат email-адреси: ';
-$PHPMAILER_LANG['signing']              = 'Помилка підпису: ';
-$PHPMAILER_LANG['smtp_connect_failed']  = 'Помилка з\'єднання з SMTP-сервером';
-$PHPMAILER_LANG['smtp_error']           = 'Помилка SMTP-сервера: ';
-$PHPMAILER_LANG['variable_set']         = 'Неможливо встановити або скинути змінну: ';
-$PHPMAILER_LANG['extension_missing']    = 'Розширення відсутнє: ';
diff --git a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-zh_cn.php b/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-zh_cn.php
deleted file mode 100644
index 03d49116..00000000
--- a/phpmailer/vendor/phpmailer/phpmailer/language/phpmailer.lang-zh_cn.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-/**
- * Simplified Chinese PHPMailer language file: refer to English translation for definitive list
- * @package PHPMailer
- * @author liqwei <liqwei@liqwei.com>
- * @author young <masxy@foxmail.com>
- * @author Teddysun <i@teddysun.com>
- */
-
-$PHPMAILER_LANG['authenticate']         = 'SMTP 错误：登录失败。';
-$PHPMAILER_LANG['buggy_php']            = '您的 PHP 版本存在漏洞，可能会导致消息损坏。为修复此问题，请切换到使用 SMTP 发送，在您的 php.ini 中禁用 mail.add_x_header 选项。切换到 MacOS 或 Linux，或将您的 PHP 升级到 7.0.17+ 或 7.1.3+ 版本。';
-$PHPMAILER_LANG['connect_host']         = 'SMTP 错误：无法连接到 SMTP 主机。';
-$PHPMAILER_LANG['data_not_accepted']    = 'SMTP 错误：数据不被接受。';
-$PHPMAILER_LANG['empty_message']        = '邮件正文为空。';
-$PHPMAILER_LANG['encoding']             = '未知编码：';
-$PHPMAILER_LANG['execute']              = '无法执行：';
-$PHPMAILER_LANG['extension_missing']    = '缺少扩展名：';
-$PHPMAILER_LANG['file_access']          = '无法访问文件：';
-$PHPMAILER_LANG['file_open']            = '文件错误：无法打开文件：';
-$PHPMAILER_LANG['from_failed']          = '发送地址错误：';
-$PHPMAILER_LANG['instantiate']          = '未知函数调用。';
-$PHPMAILER_LANG['invalid_address']      = '发送失败，电子邮箱地址是无效的：';
-$PHPMAILER_LANG['mailer_not_supported'] = '发信客户端不被支持。';
-$PHPMAILER_LANG['provide_address']      = '必须提供至少一个收件人地址。';
-$PHPMAILER_LANG['recipients_failed']    = 'SMTP 错误：收件人地址错误：';
-$PHPMAILER_LANG['smtp_connect_failed']  = 'SMTP服务器连接失败。';
-$PHPMAILER_LANG['smtp_error']           = 'SMTP服务器出错：';
-$PHPMAILER_LANG['variable_set']         = '无法设置或重置变量：';
-$PHPMAILER_LANG['invalid_header']       = '无效的标题名称或值';
-$PHPMAILER_LANG['invalid_hostentry']    = '无效的hostentry： ';
-$PHPMAILER_LANG['invalid_host']         = '无效的主机：';
-$PHPMAILER_LANG['signing']              = '签名错误：';
-$PHPMAILER_LANG['smtp_code']            = 'SMTP代码： ';
-$PHPMAILER_LANG['smtp_code_ex']         = '附加SMTP信息： ';
-$PHPMAILER_LANG['smtp_detail']          = '详情:';
diff --git a/phpmailer/vendor/phpmailer/phpmailer/src/DSNConfigurator.php b/phpmailer/vendor/phpmailer/phpmailer/src/DSNConfigurator.php
deleted file mode 100644
index 566c9618..00000000
--- a/phpmailer/vendor/phpmailer/phpmailer/src/DSNConfigurator.php
+++ /dev/null
@@ -1,245 +0,0 @@
-<?php
-
-/**
- * PHPMailer - PHP email creation and transport class.
- * PHP Version 5.5.
- *
- * @see https://github.com/PHPMailer/PHPMailer/ The PHPMailer GitHub project
- *
- * @author    Marcus Bointon (Synchro/coolbru) <phpmailer@synchromedia.co.uk>
- * @author    Jim Jagielski (jimjag) <jimjag@gmail.com>
- * @author    Andy Prevost (codeworxtech) <codeworxtech@users.sourceforge.net>
- * @author    Brent R. Matzelle (original founder)
- * @copyright 2012 - 2023 Marcus Bointon
- * @copyright 2010 - 2012 Jim Jagielski
- * @copyright 2004 - 2009 Andy Prevost
- * @license   http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
- * @note      This program is distributed in the hope that it will be useful - WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-namespace PHPMailer\PHPMailer;
-
-/**
- * Configure PHPMailer with DSN string.
- *
- * @see https://en.wikipedia.org/wiki/Data_source_name
- *
- * @author Oleg Voronkovich <oleg-voronkovich@yandex.ru>
- */
-class DSNConfigurator
-{
-    /**
-     * Create new PHPMailer instance configured by DSN.
-     *
-     * @param string $dsn        DSN
-     * @param bool   $exceptions Should we throw external exceptions?
-     *
-     * @return PHPMailer
-     */
-    public static function mailer($dsn, $exceptions = null)
-    {
-        static $configurator = null;
-
-        if (null === $configurator) {
-            $configurator = new DSNConfigurator();
-        }
-
-        return $configurator->configure(new PHPMailer($exceptions), $dsn);
-    }
-
-    /**
-     * Configure PHPMailer instance with DSN string.
-     *
-     * @param PHPMailer $mailer PHPMailer instance
-     * @param string    $dsn    DSN
-     *
-     * @return PHPMailer
-     */
-    public function configure(PHPMailer $mailer, $dsn)
-    {
-        $config = $this->parseDSN($dsn);
-
-        $this->applyConfig($mailer, $config);
-
-        return $mailer;
-    }
-
-    /**
-     * Parse DSN string.
-     *
-     * @param string $dsn DSN
-     *
-     * @throws Exception If DSN is malformed
-     *
-     * @return array Configuration
-     */
-    private function parseDSN($dsn)
-    {
-        $config = $this->parseUrl($dsn);
-
-        if (false === $config || !isset($config['scheme']) || !isset($config['host'])) {
-            throw new Exception('Malformed DSN');
-        }
-
-        if (isset($config['query'])) {
-            parse_str($config['query'], $config['query']);
-        }
-
-        return $config;
-    }
-
-    /**
-     * Apply configuration to mailer.
-     *
-     * @param PHPMailer $mailer PHPMailer instance
-     * @param array     $config Configuration
-     *
-     * @throws Exception If scheme is invalid
-     */
-    private function applyConfig(PHPMailer $mailer, $config)
-    {
-        switch ($config['scheme']) {
-            case 'mail':
-                $mailer->isMail();
-                break;
-            case 'sendmail':
-                $mailer->isSendmail();
-                break;
-            case 'qmail':
-                $mailer->isQmail();
-                break;
-            case 'smtp':
-            case 'smtps':
-                $mailer->isSMTP();
-                $this->configureSMTP($mailer, $config);
-                break;
-            default:
-                throw new Exception(
-                    sprintf(
-                        'Invalid scheme: "%s". Allowed values: "mail", "sendmail", "qmail", "smtp", "smtps".',
-                        $config['scheme']
-                    )
-                );
-        }
-
-        if (isset($config['query'])) {
-            $this->configureOptions($mailer, $config['query']);
-        }
-    }
-
-    /**
-     * Configure SMTP.
-     *
-     * @param PHPMailer $mailer PHPMailer instance
-     * @param array     $config Configuration
-     */
-    private function configureSMTP($mailer, $config)
-    {
-        $isSMTPS = 'smtps' === $config['scheme'];
-
-        if ($isSMTPS) {
-            $mailer->SMTPSecure = PHPMailer::ENCRYPTION_STARTTLS;
-        }
-
-        $mailer->Host = $config['host'];
-
-        if (isset($config['port'])) {
-            $mailer->Port = $config['port'];
-        } elseif ($isSMTPS) {
-            $mailer->Port = SMTP::DEFAULT_SECURE_PORT;
-        }
-
-        $mailer->SMTPAuth = isset($config['user']) || isset($config['pass']);
-
-        if (isset($config['user'])) {
-            $mailer->Username = $config['user'];
-        }
-
-        if (isset($config['pass'])) {
-            $mailer->Password = $config['pass'];
-        }
-    }
-
-    /**
-     * Configure options.
-     *
-     * @param PHPMailer $mailer  PHPMailer instance
-     * @param array     $options Options
-     *
-     * @throws Exception If option is unknown
-     */
-    private function configureOptions(PHPMailer $mailer, $options)
-    {
-        $allowedOptions = get_object_vars($mailer);
-
-        unset($allowedOptions['Mailer']);
-        unset($allowedOptions['SMTPAuth']);
-        unset($allowedOptions['Username']);
-        unset($allowedOptions['Password']);
-        unset($allowedOptions['Hostname']);
-        unset($allowedOptions['Port']);
-        unset($allowedOptions['ErrorInfo']);
-
-        $allowedOptions = \array_keys($allowedOptions);
-
-        foreach ($options as $key => $value) {
-            if (!in_array($key, $allowedOptions)) {
-                throw new Exception(
-                    sprintf(
-                        'Unknown option: "%s". Allowed values: "%s"',
-                        $key,
-                        implode('", "', $allowedOptions)
-                    )
-                );
-            }
-
-            switch ($key) {
-                case 'AllowEmpty':
-                case 'SMTPAutoTLS':
-                case 'SMTPKeepAlive':
-                case 'SingleTo':
-                case 'UseSendmailOptions':
-                case 'do_verp':
-                case 'DKIM_copyHeaderFields':
-                    $mailer->$key = (bool) $value;
-                    break;
-                case 'Priority':
-                case 'SMTPDebug':
-                case 'WordWrap':
-                    $mailer->$key = (int) $value;
-                    break;
-                default:
-                    $mailer->$key = $value;
-                    break;
-            }
-        }
-    }
-
-    /**
-     * Parse a URL.
-     * Wrapper for the built-in parse_url function to work around a bug in PHP 5.5.
-     *
-     * @param string $url URL
-     *
-     * @return array|false
-     */
-    protected function parseUrl($url)
-    {
-        if (\PHP_VERSION_ID >= 50600 || false === strpos($url, '?')) {
-            return parse_url($url);
-        }
-
-        $chunks = explode('?', $url);
-        if (is_array($chunks)) {
-            $result = parse_url($chunks[0]);
-            if (is_array($result)) {
-                $result['query'] = $chunks[1];
-            }
-            return $result;
-        }
-
-        return false;
-    }
-}
diff --git a/phpmailer/vendor/phpmailer/phpmailer/src/OAuthTokenProvider.php b/phpmailer/vendor/phpmailer/phpmailer/src/OAuthTokenProvider.php
deleted file mode 100644
index 11555074..00000000
--- a/phpmailer/vendor/phpmailer/phpmailer/src/OAuthTokenProvider.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-/**
- * PHPMailer - PHP email creation and transport class.
- * PHP Version 5.5.
- *
- * @see https://github.com/PHPMailer/PHPMailer/ The PHPMailer GitHub project
- *
- * @author    Marcus Bointon (Synchro/coolbru) <phpmailer@synchromedia.co.uk>
- * @author    Jim Jagielski (jimjag) <jimjag@gmail.com>
- * @author    Andy Prevost (codeworxtech) <codeworxtech@users.sourceforge.net>
- * @author    Brent R. Matzelle (original founder)
- * @copyright 2012 - 2020 Marcus Bointon
- * @copyright 2010 - 2012 Jim Jagielski
- * @copyright 2004 - 2009 Andy Prevost
- * @license   http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
- * @note      This program is distributed in the hope that it will be useful - WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-namespace PHPMailer\PHPMailer;
-
-/**
- * OAuthTokenProvider - OAuth2 token provider interface.
- * Provides base64 encoded OAuth2 auth strings for SMTP authentication.
- *
- * @see     OAuth
- * @see     SMTP::authenticate()
- *
- * @author  Peter Scopes (pdscopes)
- * @author  Marcus Bointon (Synchro/coolbru) <phpmailer@synchromedia.co.uk>
- */
-interface OAuthTokenProvider
-{
-    /**
-     * Generate a base64-encoded OAuth token ensuring that the access token has not expired.
-     * The string to be base 64 encoded should be in the form:
-     * "user=<user_email_address>\001auth=Bearer <access_token>\001\001"
-     *
-     * @return string
-     */
-    public function getOauth64();
-}
diff --git a/phpmailer/vendor/phpmailer/phpmailer/src/PHPMailer.php b/phpmailer/vendor/phpmailer/phpmailer/src/PHPMailer.php
deleted file mode 100644
index ba4bcd47..00000000
--- a/phpmailer/vendor/phpmailer/phpmailer/src/PHPMailer.php
+++ /dev/null
@@ -1,5252 +0,0 @@
-<?php
-
-/**
- * PHPMailer - PHP email creation and transport class.
- * PHP Version 5.5.
- *
- * @see https://github.com/PHPMailer/PHPMailer/ The PHPMailer GitHub project
- *
- * @author    Marcus Bointon (Synchro/coolbru) <phpmailer@synchromedia.co.uk>
- * @author    Jim Jagielski (jimjag) <jimjag@gmail.com>
- * @author    Andy Prevost (codeworxtech) <codeworxtech@users.sourceforge.net>
- * @author    Brent R. Matzelle (original founder)
- * @copyright 2012 - 2020 Marcus Bointon
- * @copyright 2010 - 2012 Jim Jagielski
- * @copyright 2004 - 2009 Andy Prevost
- * @license   http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
- * @note      This program is distributed in the hope that it will be useful - WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-namespace PHPMailer\PHPMailer;
-
-/**
- * PHPMailer - PHP email creation and transport class.
- *
- * @author Marcus Bointon (Synchro/coolbru) <phpmailer@synchromedia.co.uk>
- * @author Jim Jagielski (jimjag) <jimjag@gmail.com>
- * @author Andy Prevost (codeworxtech) <codeworxtech@users.sourceforge.net>
- * @author Brent R. Matzelle (original founder)
- */
-class PHPMailer
-{
-    const CHARSET_ASCII = 'us-ascii';
-    const CHARSET_ISO88591 = 'iso-8859-1';
-    const CHARSET_UTF8 = 'utf-8';
-
-    const CONTENT_TYPE_PLAINTEXT = 'text/plain';
-    const CONTENT_TYPE_TEXT_CALENDAR = 'text/calendar';
-    const CONTENT_TYPE_TEXT_HTML = 'text/html';
-    const CONTENT_TYPE_MULTIPART_ALTERNATIVE = 'multipart/alternative';
-    const CONTENT_TYPE_MULTIPART_MIXED = 'multipart/mixed';
-    const CONTENT_TYPE_MULTIPART_RELATED = 'multipart/related';
-
-    const ENCODING_7BIT = '7bit';
-    const ENCODING_8BIT = '8bit';
-    const ENCODING_BASE64 = 'base64';
-    const ENCODING_BINARY = 'binary';
-    const ENCODING_QUOTED_PRINTABLE = 'quoted-printable';
-
-    const ENCRYPTION_STARTTLS = 'tls';
-    const ENCRYPTION_SMTPS = 'ssl';
-
-    const ICAL_METHOD_REQUEST = 'REQUEST';
-    const ICAL_METHOD_PUBLISH = 'PUBLISH';
-    const ICAL_METHOD_REPLY = 'REPLY';
-    const ICAL_METHOD_ADD = 'ADD';
-    const ICAL_METHOD_CANCEL = 'CANCEL';
-    const ICAL_METHOD_REFRESH = 'REFRESH';
-    const ICAL_METHOD_COUNTER = 'COUNTER';
-    const ICAL_METHOD_DECLINECOUNTER = 'DECLINECOUNTER';
-
-    /**
-     * Email priority.
-     * Options: null (default), 1 = High, 3 = Normal, 5 = low.
-     * When null, the header is not set at all.
-     *
-     * @var int|null
-     */
-    public $Priority;
-
-    /**
-     * The character set of the message.
-     *
-     * @var string
-     */
-    public $CharSet = self::CHARSET_ISO88591;
-
-    /**
-     * The MIME Content-type of the message.
-     *
-     * @var string
-     */
-    public $ContentType = self::CONTENT_TYPE_PLAINTEXT;
-
-    /**
-     * The message encoding.
-     * Options: "8bit", "7bit", "binary", "base64", and "quoted-printable".
-     *
-     * @var string
-     */
-    public $Encoding = self::ENCODING_8BIT;
-
-    /**
-     * Holds the most recent mailer error message.
-     *
-     * @var string
-     */
-    public $ErrorInfo = '';
-
-    /**
-     * The From email address for the message.
-     *
-     * @var string
-     */
-    public $From = '';
-
-    /**
-     * The From name of the message.
-     *
-     * @var string
-     */
-    public $FromName = '';
-
-    /**
-     * The envelope sender of the message.
-     * This will usually be turned into a Return-Path header by the receiver,
-     * and is the address that bounces will be sent to.
-     * If not empty, will be passed via `-f` to sendmail or as the 'MAIL FROM' value over SMTP.
-     *
-     * @var string
-     */
-    public $Sender = '';
-
-    /**
-     * The Subject of the message.
-     *
-     * @var string
-     */
-    public $Subject = '';
-
-    /**
-     * An HTML or plain text message body.
-     * If HTML then call isHTML(true).
-     *
-     * @var string
-     */
-    public $Body = '';
-
-    /**
-     * The plain-text message body.
-     * This body can be read by mail clients that do not have HTML email
-     * capability such as mutt & Eudora.
-     * Clients that can read HTML will view the normal Body.
-     *
-     * @var string
-     */
-    public $AltBody = '';
-
-    /**
-     * An iCal message part body.
-     * Only supported in simple alt or alt_inline message types
-     * To generate iCal event structures, use classes like EasyPeasyICS or iCalcreator.
-     *
-     * @see http://sprain.ch/blog/downloads/php-class-easypeasyics-create-ical-files-with-php/
-     * @see http://kigkonsult.se/iCalcreator/
-     *
-     * @var string
-     */
-    public $Ical = '';
-
-    /**
-     * Value-array of "method" in Contenttype header "text/calendar"
-     *
-     * @var string[]
-     */
-    protected static $IcalMethods = [
-        self::ICAL_METHOD_REQUEST,
-        self::ICAL_METHOD_PUBLISH,
-        self::ICAL_METHOD_REPLY,
-        self::ICAL_METHOD_ADD,
-        self::ICAL_METHOD_CANCEL,
-        self::ICAL_METHOD_REFRESH,
-        self::ICAL_METHOD_COUNTER,
-        self::ICAL_METHOD_DECLINECOUNTER,
-    ];
-
-    /**
-     * The complete compiled MIME message body.
-     *
-     * @var string
-     */
-    protected $MIMEBody = '';
-
-    /**
-     * The complete compiled MIME message headers.
-     *
-     * @var string
-     */
-    protected $MIMEHeader = '';
-
-    /**
-     * Extra headers that createHeader() doesn't fold in.
-     *
-     * @var string
-     */
-    protected $mailHeader = '';
-
-    /**
-     * Word-wrap the message body to this number of chars.
-     * Set to 0 to not wrap. A useful value here is 78, for RFC2822 section 2.1.1 compliance.
-     *
-     * @see static::STD_LINE_LENGTH
-     *
-     * @var int
-     */
-    public $WordWrap = 0;
-
-    /**
-     * Which method to use to send mail.
-     * Options: "mail", "sendmail", or "smtp".
-     *
-     * @var string
-     */
-    public $Mailer = 'mail';
-
-    /**
-     * The path to the sendmail program.
-     *
-     * @var string
-     */
-    public $Sendmail = '/usr/sbin/sendmail';
-
-    /**
-     * Whether mail() uses a fully sendmail-compatible MTA.
-     * One which supports sendmail's "-oi -f" options.
-     *
-     * @var bool
-     */
-    public $UseSendmailOptions = true;
-
-    /**
-     * The email address that a reading confirmation should be sent to, also known as read receipt.
-     *
-     * @var string
-     */
-    public $ConfirmReadingTo = '';
-
-    /**
-     * The hostname to use in the Message-ID header and as default HELO string.
-     * If empty, PHPMailer attempts to find one with, in order,
-     * $_SERVER['SERVER_NAME'], gethostname(), php_uname('n'), or the value
-     * 'localhost.localdomain'.
-     *
-     * @see PHPMailer::$Helo
-     *
-     * @var string
-     */
-    public $Hostname = '';
-
-    /**
-     * An ID to be used in the Message-ID header.
-     * If empty, a unique id will be generated.
-     * You can set your own, but it must be in the format "<id@domain>",
-     * as defined in RFC5322 section 3.6.4 or it will be ignored.
-     *
-     * @see https://tools.ietf.org/html/rfc5322#section-3.6.4
-     *
-     * @var string
-     */
-    public $MessageID = '';
-
-    /**
-     * The message Date to be used in the Date header.
-     * If empty, the current date will be added.
-     *
-     * @var string
-     */
-    public $MessageDate = '';
-
-    /**
-     * SMTP hosts.
-     * Either a single hostname or multiple semicolon-delimited hostnames.
-     * You can also specify a different port
-     * for each host by using this format: [hostname:port]
-     * (e.g. "smtp1.example.com:25;smtp2.example.com").
-     * You can also specify encryption type, for example:
-     * (e.g. "tls://smtp1.example.com:587;ssl://smtp2.example.com:465").
-     * Hosts will be tried in order.
-     *
-     * @var string
-     */
-    public $Host = 'localhost';
-
-    /**
-     * The default SMTP server port.
-     *
-     * @var int
-     */
-    public $Port = 25;
-
-    /**
-     * The SMTP HELO/EHLO name used for the SMTP connection.
-     * Default is $Hostname. If $Hostname is empty, PHPMailer attempts to find
-     * one with the same method described above for $Hostname.
-     *
-     * @see PHPMailer::$Hostname
-     *
-     * @var string
-     */
-    public $Helo = '';
-
-    /**
-     * What kind of encryption to use on the SMTP connection.
-     * Options: '', static::ENCRYPTION_STARTTLS, or static::ENCRYPTION_SMTPS.
-     *
-     * @var string
-     */
-    public $SMTPSecure = '';
-
-    /**
-     * Whether to enable TLS encryption automatically if a server supports it,
-     * even if `SMTPSecure` is not set to 'tls'.
-     * Be aware that in PHP >= 5.6 this requires that the server's certificates are valid.
-     *
-     * @var bool
-     */
-    public $SMTPAutoTLS = true;
-
-    /**
-     * Whether to use SMTP authentication.
-     * Uses the Username and Password properties.
-     *
-     * @see PHPMailer::$Username
-     * @see PHPMailer::$Password
-     *
-     * @var bool
-     */
-    public $SMTPAuth = false;
-
-    /**
-     * Options array passed to stream_context_create when connecting via SMTP.
-     *
-     * @var array
-     */
-    public $SMTPOptions = [];
-
-    /**
-     * SMTP username.
-     *
-     * @var string
-     */
-    public $Username = '';
-
-    /**
-     * SMTP password.
-     *
-     * @var string
-     */
-    public $Password = '';
-
-    /**
-     * SMTP authentication type. Options are CRAM-MD5, LOGIN, PLAIN, XOAUTH2.
-     * If not specified, the first one from that list that the server supports will be selected.
-     *
-     * @var string
-     */
-    public $AuthType = '';
-
-    /**
-     * SMTP SMTPXClient command attibutes
-     *
-     * @var array
-     */
-    protected $SMTPXClient = [];
-
-    /**
-     * An implementation of the PHPMailer OAuthTokenProvider interface.
-     *
-     * @var OAuthTokenProvider
-     */
-    protected $oauth;
-
-    /**
-     * The SMTP server timeout in seconds.
-     * Default of 5 minutes (300sec) is from RFC2821 section 4.5.3.2.
-     *
-     * @var int
-     */
-    public $Timeout = 300;
-
-    /**
-     * Comma separated list of DSN notifications
-     * 'NEVER' under no circumstances a DSN must be returned to the sender.
-     *         If you use NEVER all other notifications will be ignored.
-     * 'SUCCESS' will notify you when your mail has arrived at its destination.
-     * 'FAILURE' will arrive if an error occurred during delivery.
-     * 'DELAY'   will notify you if there is an unusual delay in delivery, but the actual
-     *           delivery's outcome (success or failure) is not yet decided.
-     *
-     * @see https://tools.ietf.org/html/rfc3461 See section 4.1 for more information about NOTIFY
-     */
-    public $dsn = '';
-
-    /**
-     * SMTP class debug output mode.
-     * Debug output level.
-     * Options:
-     * @see SMTP::DEBUG_OFF: No output
-     * @see SMTP::DEBUG_CLIENT: Client messages
-     * @see SMTP::DEBUG_SERVER: Client and server messages
-     * @see SMTP::DEBUG_CONNECTION: As SERVER plus connection status
-     * @see SMTP::DEBUG_LOWLEVEL: Noisy, low-level data output, rarely needed
-     *
-     * @see SMTP::$do_debug
-     *
-     * @var int
-     */
-    public $SMTPDebug = 0;
-
-    /**
-     * How to handle debug output.
-     * Options:
-     * * `echo` Output plain-text as-is, appropriate for CLI
-     * * `html` Output escaped, line breaks converted to `<br>`, appropriate for browser output
-     * * `error_log` Output to error log as configured in php.ini
-     * By default PHPMailer will use `echo` if run from a `cli` or `cli-server` SAPI, `html` otherwise.
-     * Alternatively, you can provide a callable expecting two params: a message string and the debug level:
-     *
-     * ```php
-     * $mail->Debugoutput = function($str, $level) {echo "debug level $level; message: $str";};
-     * ```
-     *
-     * Alternatively, you can pass in an instance of a PSR-3 compatible logger, though only `debug`
-     * level output is used:
-     *
-     * ```php
-     * $mail->Debugoutput = new myPsr3Logger;
-     * ```
-     *
-     * @see SMTP::$Debugoutput
-     *
-     * @var string|callable|\Psr\Log\LoggerInterface
-     */
-    public $Debugoutput = 'echo';
-
-    /**
-     * Whether to keep the SMTP connection open after each message.
-     * If this is set to true then the connection will remain open after a send,
-     * and closing the connection will require an explicit call to smtpClose().
-     * It's a good idea to use this if you are sending multiple messages as it reduces overhead.
-     * See the mailing list example for how to use it.
-     *
-     * @var bool
-     */
-    public $SMTPKeepAlive = false;
-
-    /**
-     * Whether to split multiple to addresses into multiple messages
-     * or send them all in one message.
-     * Only supported in `mail` and `sendmail` transports, not in SMTP.
-     *
-     * @var bool
-     *
-     * @deprecated 6.0.0 PHPMailer isn't a mailing list manager!
-     */
-    public $SingleTo = false;
-
-    /**
-     * Storage for addresses when SingleTo is enabled.
-     *
-     * @var array
-     */
-    protected $SingleToArray = [];
-
-    /**
-     * Whether to generate VERP addresses on send.
-     * Only applicable when sending via SMTP.
-     *
-     * @see https://en.wikipedia.org/wiki/Variable_envelope_return_path
-     * @see http://www.postfix.org/VERP_README.html Postfix VERP info
-     *
-     * @var bool
-     */
-    public $do_verp = false;
-
-    /**
-     * Whether to allow sending messages with an empty body.
-     *
-     * @var bool
-     */
-    public $AllowEmpty = false;
-
-    /**
-     * DKIM selector.
-     *
-     * @var string
-     */
-    public $DKIM_selector = '';
-
-    /**
-     * DKIM Identity.
-     * Usually the email address used as the source of the email.
-     *
-     * @var string
-     */
-    public $DKIM_identity = '';
-
-    /**
-     * DKIM passphrase.
-     * Used if your key is encrypted.
-     *
-     * @var string
-     */
-    public $DKIM_passphrase = '';
-
-    /**
-     * DKIM signing domain name.
-     *
-     * @example 'example.com'
-     *
-     * @var string
-     */
-    public $DKIM_domain = '';
-
-    /**
-     * DKIM Copy header field values for diagnostic use.
-     *
-     * @var bool
-     */
-    public $DKIM_copyHeaderFields = true;
-
-    /**
-     * DKIM Extra signing headers.
-     *
-     * @example ['List-Unsubscribe', 'List-Help']
-     *
-     * @var array
-     */
-    public $DKIM_extraHeaders = [];
-
-    /**
-     * DKIM private key file path.
-     *
-     * @var string
-     */
-    public $DKIM_private = '';
-
-    /**
-     * DKIM private key string.
-     *
-     * If set, takes precedence over `$DKIM_private`.
-     *
-     * @var string
-     */
-    public $DKIM_private_string = '';
-
-    /**
-     * Callback Action function name.
-     *
-     * The function that handles the result of the send email action.
-     * It is called out by send() for each email sent.
-     *
-     * Value can be any php callable: http://www.php.net/is_callable
-     *
-     * Parameters:
-     *   bool $result        result of the send action
-     *   array   $to            email addresses of the recipients
-     *   array   $cc            cc email addresses
-     *   array   $bcc           bcc email addresses
-     *   string  $subject       the subject
-     *   string  $body          the email body
-     *   string  $from          email address of sender
-     *   string  $extra         extra information of possible use
-     *                          "smtp_transaction_id' => last smtp transaction id
-     *
-     * @var string
-     */
-    public $action_function = '';
-
-    /**
-     * What to put in the X-Mailer header.
-     * Options: An empty string for PHPMailer default, whitespace/null for none, or a string to use.
-     *
-     * @var string|null
-     */
-    public $XMailer = '';
-
-    /**
-     * Which validator to use by default when validating email addresses.
-     * May be a callable to inject your own validator, but there are several built-in validators.
-     * The default validator uses PHP's FILTER_VALIDATE_EMAIL filter_var option.
-     *
-     * @see PHPMailer::validateAddress()
-     *
-     * @var string|callable
-     */
-    public static $validator = 'php';
-
-    /**
-     * An instance of the SMTP sender class.
-     *
-     * @var SMTP
-     */
-    protected $smtp;
-
-    /**
-     * The array of 'to' names and addresses.
-     *
-     * @var array
-     */
-    protected $to = [];
-
-    /**
-     * The array of 'cc' names and addresses.
-     *
-     * @var array
-     */
-    protected $cc = [];
-
-    /**
-     * The array of 'bcc' names and addresses.
-     *
-     * @var array
-     */
-    protected $bcc = [];
-
-    /**
-     * The array of reply-to names and addresses.
-     *
-     * @var array
-     */
-    protected $ReplyTo = [];
-
-    /**
-     * An array of all kinds of addresses.
-     * Includes all of $to, $cc, $bcc.
-     *
-     * @see PHPMailer::$to
-     * @see PHPMailer::$cc
-     * @see PHPMailer::$bcc
-     *
-     * @var array
-     */
-    protected $all_recipients = [];
-
-    /**
-     * An array of names and addresses queued for validation.
-     * In send(), valid and non duplicate entries are moved to $all_recipients
-     * and one of $to, $cc, or $bcc.
-     * This array is used only for addresses with IDN.
-     *
-     * @see PHPMailer::$to
-     * @see PHPMailer::$cc
-     * @see PHPMailer::$bcc
-     * @see PHPMailer::$all_recipients
-     *
-     * @var array
-     */
-    protected $RecipientsQueue = [];
-
-    /**
-     * An array of reply-to names and addresses queued for validation.
-     * In send(), valid and non duplicate entries are moved to $ReplyTo.
-     * This array is used only for addresses with IDN.
-     *
-     * @see PHPMailer::$ReplyTo
-     *
-     * @var array
-     */
-    protected $ReplyToQueue = [];
-
-    /**
-     * The array of attachments.
-     *
-     * @var array
-     */
-    protected $attachment = [];
-
-    /**
-     * The array of custom headers.
-     *
-     * @var array
-     */
-    protected $CustomHeader = [];
-
-    /**
-     * The most recent Message-ID (including angular brackets).
-     *
-     * @var string
-     */
-    protected $lastMessageID = '';
-
-    /**
-     * The message's MIME type.
-     *
-     * @var string
-     */
-    protected $message_type = '';
-
-    /**
-     * The array of MIME boundary strings.
-     *
-     * @var array
-     */
-    protected $boundary = [];
-
-    /**
-     * The array of available text strings for the current language.
-     *
-     * @var array
-     */
-    protected $language = [];
-
-    /**
-     * The number of errors encountered.
-     *
-     * @var int
-     */
-    protected $error_count = 0;
-
-    /**
-     * The S/MIME certificate file path.
-     *
-     * @var string
-     */
-    protected $sign_cert_file = '';
-
-    /**
-     * The S/MIME key file path.
-     *
-     * @var string
-     */
-    protected $sign_key_file = '';
-
-    /**
-     * The optional S/MIME extra certificates ("CA Chain") file path.
-     *
-     * @var string
-     */
-    protected $sign_extracerts_file = '';
-
-    /**
-     * The S/MIME password for the key.
-     * Used only if the key is encrypted.
-     *
-     * @var string
-     */
-    protected $sign_key_pass = '';
-
-    /**
-     * Whether to throw exceptions for errors.
-     *
-     * @var bool
-     */
-    protected $exceptions = false;
-
-    /**
-     * Unique ID used for message ID and boundaries.
-     *
-     * @var string
-     */
-    protected $uniqueid = '';
-
-    /**
-     * The PHPMailer Version number.
-     *
-     * @var string
-     */
-    const VERSION = '6.9.1';
-
-    /**
-     * Error severity: message only, continue processing.
-     *
-     * @var int
-     */
-    const STOP_MESSAGE = 0;
-
-    /**
-     * Error severity: message, likely ok to continue processing.
-     *
-     * @var int
-     */
-    const STOP_CONTINUE = 1;
-
-    /**
-     * Error severity: message, plus full stop, critical error reached.
-     *
-     * @var int
-     */
-    const STOP_CRITICAL = 2;
-
-    /**
-     * The SMTP standard CRLF line break.
-     * If you want to change line break format, change static::$LE, not this.
-     */
-    const CRLF = "\r\n";
-
-    /**
-     * "Folding White Space" a white space string used for line folding.
-     */
-    const FWS = ' ';
-
-    /**
-     * SMTP RFC standard line ending; Carriage Return, Line Feed.
-     *
-     * @var string
-     */
-    protected static $LE = self::CRLF;
-
-    /**
-     * The maximum line length supported by mail().
-     *
-     * Background: mail() will sometimes corrupt messages
-     * with headers longer than 65 chars, see #818.
-     *
-     * @var int
-     */
-    const MAIL_MAX_LINE_LENGTH = 63;
-
-    /**
-     * The maximum line length allowed by RFC 2822 section 2.1.1.
-     *
-     * @var int
-     */
-    const MAX_LINE_LENGTH = 998;
-
-    /**
-     * The lower maximum line length allowed by RFC 2822 section 2.1.1.
-     * This length does NOT include the line break
-     * 76 means that lines will be 77 or 78 chars depending on whether
-     * the line break format is LF or CRLF; both are valid.
-     *
-     * @var int
-     */
-    const STD_LINE_LENGTH = 76;
-
-    /**
-     * Constructor.
-     *
-     * @param bool $exceptions Should we throw external exceptions?
-     */
-    public function __construct($exceptions = null)
-    {
-        if (null !== $exceptions) {
-            $this->exceptions = (bool) $exceptions;
-        }
-        //Pick an appropriate debug output format automatically
-        $this->Debugoutput = (strpos(PHP_SAPI, 'cli') !== false ? 'echo' : 'html');
-    }
-
-    /**
-     * Destructor.
-     */
-    public function __destruct()
-    {
-        //Close any open SMTP connection nicely
-        $this->smtpClose();
-    }
-
-    /**
-     * Call mail() in a safe_mode-aware fashion.
-     * Also, unless sendmail_path points to sendmail (or something that
-     * claims to be sendmail), don't pass params (not a perfect fix,
-     * but it will do).
-     *
-     * @param string      $to      To
-     * @param string      $subject Subject
-     * @param string      $body    Message Body
-     * @param string      $header  Additional Header(s)
-     * @param string|null $params  Params
-     *
-     * @return bool
-     */
-    private function mailPassthru($to, $subject, $body, $header, $params)
-    {
-        //Check overloading of mail function to avoid double-encoding
-        if ((int)ini_get('mbstring.func_overload') & 1) {
-            $subject = $this->secureHeader($subject);
-        } else {
-            $subject = $this->encodeHeader($this->secureHeader($subject));
-        }
-        //Calling mail() with null params breaks
-        $this->edebug('Sending with mail()');
-        $this->edebug('Sendmail path: ' . ini_get('sendmail_path'));
-        $this->edebug("Envelope sender: {$this->Sender}");
-        $this->edebug("To: {$to}");
-        $this->edebug("Subject: {$subject}");
-        $this->edebug("Headers: {$header}");
-        if (!$this->UseSendmailOptions || null === $params) {
-            $result = @mail($to, $subject, $body, $header);
-        } else {
-            $this->edebug("Additional params: {$params}");
-            $result = @mail($to, $subject, $body, $header, $params);
-        }
-        $this->edebug('Result: ' . ($result ? 'true' : 'false'));
-        return $result;
-    }
-
-    /**
-     * Output debugging info via a user-defined method.
-     * Only generates output if debug output is enabled.
-     *
-     * @see PHPMailer::$Debugoutput
-     * @see PHPMailer::$SMTPDebug
-     *
-     * @param string $str
-     */
-    protected function edebug($str)
-    {
-        if ($this->SMTPDebug <= 0) {
-            return;
-        }
-        //Is this a PSR-3 logger?
-        if ($this->Debugoutput instanceof \Psr\Log\LoggerInterface) {
-            $this->Debugoutput->debug($str);
-
-            return;
-        }
-        //Avoid clash with built-in function names
-        if (is_callable($this->Debugoutput) && !in_array($this->Debugoutput, ['error_log', 'html', 'echo'])) {
-            call_user_func($this->Debugoutput, $str, $this->SMTPDebug);
-
-            return;
-        }
-        switch ($this->Debugoutput) {
-            case 'error_log':
-                //Don't output, just log
-                /** @noinspection ForgottenDebugOutputInspection */
-                error_log($str);
-                break;
-            case 'html':
-                //Cleans up output a bit for a better looking, HTML-safe output
-                echo htmlentities(
-                    preg_replace('/[\r\n]+/', '', $str),
-                    ENT_QUOTES,
-                    'UTF-8'
-                ), "<br>\n";
-                break;
-            case 'echo':
-            default:
-                //Normalize line breaks
-                $str = preg_replace('/\r\n|\r/m', "\n", $str);
-                echo gmdate('Y-m-d H:i:s'),
-                "\t",
-                    //Trim trailing space
-                trim(
-                    //Indent for readability, except for trailing break
-                    str_replace(
-                        "\n",
-                        "\n                   \t                  ",
-                        trim($str)
-                    )
-                ),
-                "\n";
-        }
-    }
-
-    /**
-     * Sets message type to HTML or plain.
-     *
-     * @param bool $isHtml True for HTML mode
-     */
-    public function isHTML($isHtml = true)
-    {
-        if ($isHtml) {
-            $this->ContentType = static::CONTENT_TYPE_TEXT_HTML;
-        } else {
-            $this->ContentType = static::CONTENT_TYPE_PLAINTEXT;
-        }
-    }
-
-    /**
-     * Send messages using SMTP.
-     */
-    public function isSMTP()
-    {
-        $this->Mailer = 'smtp';
-    }
-
-    /**
-     * Send messages using PHP's mail() function.
-     */
-    public function isMail()
-    {
-        $this->Mailer = 'mail';
-    }
-
-    /**
-     * Send messages using $Sendmail.
-     */
-    public function isSendmail()
-    {
-        $ini_sendmail_path = ini_get('sendmail_path');
-
-        if (false === stripos($ini_sendmail_path, 'sendmail')) {
-            $this->Sendmail = '/usr/sbin/sendmail';
-        } else {
-            $this->Sendmail = $ini_sendmail_path;
-        }
-        $this->Mailer = 'sendmail';
-    }
-
-    /**
-     * Send messages using qmail.
-     */
-    public function isQmail()
-    {
-        $ini_sendmail_path = ini_get('sendmail_path');
-
-        if (false === stripos($ini_sendmail_path, 'qmail')) {
-            $this->Sendmail = '/var/qmail/bin/qmail-inject';
-        } else {
-            $this->Sendmail = $ini_sendmail_path;
-        }
-        $this->Mailer = 'qmail';
-    }
-
-    /**
-     * Add a "To" address.
-     *
-     * @param string $address The email address to send to
-     * @param string $name
-     *
-     * @throws Exception
-     *
-     * @return bool true on success, false if address already used or invalid in some way
-     */
-    public function addAddress($address, $name = '')
-    {
-        return $this->addOrEnqueueAnAddress('to', $address, $name);
-    }
-
-    /**
-     * Add a "CC" address.
-     *
-     * @param string $address The email address to send to
-     * @param string $name
-     *
-     * @throws Exception
-     *
-     * @return bool true on success, false if address already used or invalid in some way
-     */
-    public function addCC($address, $name = '')
-    {
-        return $this->addOrEnqueueAnAddress('cc', $address, $name);
-    }
-
-    /**
-     * Add a "BCC" address.
-     *
-     * @param string $address The email address to send to
-     * @param string $name
-     *
-     * @throws Exception
-     *
-     * @return bool true on success, false if address already used or invalid in some way
-     */
-    public function addBCC($address, $name = '')
-    {
-        return $this->addOrEnqueueAnAddress('bcc', $address, $name);
-    }
-
-    /**
-     * Add a "Reply-To" address.
-     *
-     * @param string $address The email address to reply to
-     * @param string $name
-     *
-     * @throws Exception
-     *
-     * @return bool true on success, false if address already used or invalid in some way
-     */
-    public function addReplyTo($address, $name = '')
-    {
-        return $this->addOrEnqueueAnAddress('Reply-To', $address, $name);
-    }
-
-    /**
-     * Add an address to one of the recipient arrays or to the ReplyTo array. Because PHPMailer
-     * can't validate addresses with an IDN without knowing the PHPMailer::$CharSet (that can still
-     * be modified after calling this function), addition of such addresses is delayed until send().
-     * Addresses that have been added already return false, but do not throw exceptions.
-     *
-     * @param string $kind    One of 'to', 'cc', 'bcc', or 'ReplyTo'
-     * @param string $address The email address
-     * @param string $name    An optional username associated with the address
-     *
-     * @throws Exception
-     *
-     * @return bool true on success, false if address already used or invalid in some way
-     */
-    protected function addOrEnqueueAnAddress($kind, $address, $name)
-    {
-        $pos = false;
-        if ($address !== null) {
-            $address = trim($address);
-            $pos = strrpos($address, '@');
-        }
-        if (false === $pos) {
-            //At-sign is missing.
-            $error_message = sprintf(
-                '%s (%s): %s',
-                $this->lang('invalid_address'),
-                $kind,
-                $address
-            );
-            $this->setError($error_message);
-            $this->edebug($error_message);
-            if ($this->exceptions) {
-                throw new Exception($error_message);
-            }
-
-            return false;
-        }
-        if ($name !== null && is_string($name)) {
-            $name = trim(preg_replace('/[\r\n]+/', '', $name)); //Strip breaks and trim
-        } else {
-            $name = '';
-        }
-        $params = [$kind, $address, $name];
-        //Enqueue addresses with IDN until we know the PHPMailer::$CharSet.
-        //Domain is assumed to be whatever is after the last @ symbol in the address
-        if (static::idnSupported() && $this->has8bitChars(substr($address, ++$pos))) {
-            if ('Reply-To' !== $kind) {
-                if (!array_key_exists($address, $this->RecipientsQueue)) {
-                    $this->RecipientsQueue[$address] = $params;
-
-                    return true;
-                }
-            } elseif (!array_key_exists($address, $this->ReplyToQueue)) {
-                $this->ReplyToQueue[$address] = $params;
-
-                return true;
-            }
-
-            return false;
-        }
-
-        //Immediately add standard addresses without IDN.
-        return call_user_func_array([$this, 'addAnAddress'], $params);
-    }
-
-    /**
-     * Set the boundaries to use for delimiting MIME parts.
-     * If you override this, ensure you set all 3 boundaries to unique values.
-     * The default boundaries include a "=_" sequence which cannot occur in quoted-printable bodies,
-     * as suggested by https://www.rfc-editor.org/rfc/rfc2045#section-6.7
-     *
-     * @return void
-     */
-    public function setBoundaries()
-    {
-        $this->uniqueid = $this->generateId();
-        $this->boundary[1] = 'b1=_' . $this->uniqueid;
-        $this->boundary[2] = 'b2=_' . $this->uniqueid;
-        $this->boundary[3] = 'b3=_' . $this->uniqueid;
-    }
-
-    /**
-     * Add an address to one of the recipient arrays or to the ReplyTo array.
-     * Addresses that have been added already return false, but do not throw exceptions.
-     *
-     * @param string $kind    One of 'to', 'cc', 'bcc', or 'ReplyTo'
-     * @param string $address The email address to send, resp. to reply to
-     * @param string $name
-     *
-     * @throws Exception
-     *
-     * @return bool true on success, false if address already used or invalid in some way
-     */
-    protected function addAnAddress($kind, $address, $name = '')
-    {
-        if (!in_array($kind, ['to', 'cc', 'bcc', 'Reply-To'])) {
-            $error_message = sprintf(
-                '%s: %s',
-                $this->lang('Invalid recipient kind'),
-                $kind
-            );
-            $this->setError($error_message);
-            $this->edebug($error_message);
-            if ($this->exceptions) {
-                throw new Exception($error_message);
-            }
-
-            return false;
-        }
-        if (!static::validateAddress($address)) {
-            $error_message = sprintf(
-                '%s (%s): %s',
-                $this->lang('invalid_address'),
-                $kind,
-                $address
-            );
-            $this->setError($error_message);
-            $this->edebug($error_message);
-            if ($this->exceptions) {
-                throw new Exception($error_message);
-            }
-
-            return false;
-        }
-        if ('Reply-To' !== $kind) {
-            if (!array_key_exists(strtolower($address), $this->all_recipients)) {
-                $this->{$kind}[] = [$address, $name];
-                $this->all_recipients[strtolower($address)] = true;
-
-                return true;
-            }
-        } elseif (!array_key_exists(strtolower($address), $this->ReplyTo)) {
-            $this->ReplyTo[strtolower($address)] = [$address, $name];
-
-            return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Parse and validate a string containing one or more RFC822-style comma-separated email addresses
-     * of the form "display name <address>" into an array of name/address pairs.
-     * Uses the imap_rfc822_parse_adrlist function if the IMAP extension is available.
-     * Note that quotes in the name part are removed.
-     *
-     * @see http://www.andrew.cmu.edu/user/agreen1/testing/mrbs/web/Mail/RFC822.php A more careful implementation
-     *
-     * @param string $addrstr The address list string
-     * @param bool   $useimap Whether to use the IMAP extension to parse the list
-     * @param string $charset The charset to use when decoding the address list string.
-     *
-     * @return array
-     */
-    public static function parseAddresses($addrstr, $useimap = true, $charset = self::CHARSET_ISO88591)
-    {
-        $addresses = [];
-        if ($useimap && function_exists('imap_rfc822_parse_adrlist')) {
-            //Use this built-in parser if it's available
-            $list = imap_rfc822_parse_adrlist($addrstr, '');
-            // Clear any potential IMAP errors to get rid of notices being thrown at end of script.
-            imap_errors();
-            foreach ($list as $address) {
-                if (
-                    '.SYNTAX-ERROR.' !== $address->host &&
-                    static::validateAddress($address->mailbox . '@' . $address->host)
-                ) {
-                    //Decode the name part if it's present and encoded
-                    if (
-                        property_exists($address, 'personal') &&
-                        //Check for a Mbstring constant rather than using extension_loaded, which is sometimes disabled
-                        defined('MB_CASE_UPPER') &&
-                        preg_match('/^=\?.*\?=$/s', $address->personal)
-                    ) {
-                        $origCharset = mb_internal_encoding();
-                        mb_internal_encoding($charset);
-                        //Undo any RFC2047-encoded spaces-as-underscores
-                        $address->personal = str_replace('_', '=20', $address->personal);
-                        //Decode the name
-                        $address->personal = mb_decode_mimeheader($address->personal);
-                        mb_internal_encoding($origCharset);
-                    }
-
-                    $addresses[] = [
-                        'name' => (property_exists($address, 'personal') ? $address->personal : ''),
-                        'address' => $address->mailbox . '@' . $address->host,
-                    ];
-                }
-            }
-        } else {
-            //Use this simpler parser
-            $list = explode(',', $addrstr);
-            foreach ($list as $address) {
-                $address = trim($address);
-                //Is there a separate name part?
-                if (strpos($address, '<') === false) {
-                    //No separate name, just use the whole thing
-                    if (static::validateAddress($address)) {
-                        $addresses[] = [
-                            'name' => '',
-                            'address' => $address,
-                        ];
-                    }
-                } else {
-                    list($name, $email) = explode('<', $address);
-                    $email = trim(str_replace('>', '', $email));
-                    $name = trim($name);
-                    if (static::validateAddress($email)) {
-                        //Check for a Mbstring constant rather than using extension_loaded, which is sometimes disabled
-                        //If this name is encoded, decode it
-                        if (defined('MB_CASE_UPPER') && preg_match('/^=\?.*\?=$/s', $name)) {
-                            $origCharset = mb_internal_encoding();
-                            mb_internal_encoding($charset);
-                            //Undo any RFC2047-encoded spaces-as-underscores
-                            $name = str_replace('_', '=20', $name);
-                            //Decode the name
-                            $name = mb_decode_mimeheader($name);
-                            mb_internal_encoding($origCharset);
-                        }
-                        $addresses[] = [
-                            //Remove any surrounding quotes and spaces from the name
-                            'name' => trim($name, '\'" '),
-                            'address' => $email,
-                        ];
-                    }
-                }
-            }
-        }
-
-        return $addresses;
-    }
-
-    /**
-     * Set the From and FromName properties.
-     *
-     * @param string $address
-     * @param string $name
-     * @param bool   $auto    Whether to also set the Sender address, defaults to true
-     *
-     * @throws Exception
-     *
-     * @return bool
-     */
-    public function setFrom($address, $name = '', $auto = true)
-    {
-        $address = trim((string)$address);
-        $name = trim(preg_replace('/[\r\n]+/', '', $name)); //Strip breaks and trim
-        //Don't validate now addresses with IDN. Will be done in send().
-        $pos = strrpos($address, '@');
-        if (
-            (false === $pos)
-            || ((!$this->has8bitChars(substr($address, ++$pos)) || !static::idnSupported())
-            && !static::validateAddress($address))
-        ) {
-            $error_message = sprintf(
-                '%s (From): %s',
-                $this->lang('invalid_address'),
-                $address
-            );
-            $this->setError($error_message);
-            $this->edebug($error_message);
-            if ($this->exceptions) {
-                throw new Exception($error_message);
-            }
-
-            return false;
-        }
-        $this->From = $address;
-        $this->FromName = $name;
-        if ($auto && empty($this->Sender)) {
-            $this->Sender = $address;
-        }
-
-        return true;
-    }
-
-    /**
-     * Return the Message-ID header of the last email.
-     * Technically this is the value from the last time the headers were created,
-     * but it's also the message ID of the last sent message except in
-     * pathological cases.
-     *
-     * @return string
-     */
-    public function getLastMessageID()
-    {
-        return $this->lastMessageID;
-    }
-
-    /**
-     * Check that a string looks like an email address.
-     * Validation patterns supported:
-     * * `auto` Pick best pattern automatically;
-     * * `pcre8` Use the squiloople.com pattern, requires PCRE > 8.0;
-     * * `pcre` Use old PCRE implementation;
-     * * `php` Use PHP built-in FILTER_VALIDATE_EMAIL;
-     * * `html5` Use the pattern given by the HTML5 spec for 'email' type form input elements.
-     * * `noregex` Don't use a regex: super fast, really dumb.
-     * Alternatively you may pass in a callable to inject your own validator, for example:
-     *
-     * ```php
-     * PHPMailer::validateAddress('user@example.com', function($address) {
-     *     return (strpos($address, '@') !== false);
-     * });
-     * ```
-     *
-     * You can also set the PHPMailer::$validator static to a callable, allowing built-in methods to use your validator.
-     *
-     * @param string          $address       The email address to check
-     * @param string|callable $patternselect Which pattern to use
-     *
-     * @return bool
-     */
-    public static function validateAddress($address, $patternselect = null)
-    {
-        if (null === $patternselect) {
-            $patternselect = static::$validator;
-        }
-        //Don't allow strings as callables, see SECURITY.md and CVE-2021-3603
-        if (is_callable($patternselect) && !is_string($patternselect)) {
-            return call_user_func($patternselect, $address);
-        }
-        //Reject line breaks in addresses; it's valid RFC5322, but not RFC5321
-        if (strpos($address, "\n") !== false || strpos($address, "\r") !== false) {
-            return false;
-        }
-        switch ($patternselect) {
-            case 'pcre': //Kept for BC
-            case 'pcre8':
-                /*
-                 * A more complex and more permissive version of the RFC5322 regex on which FILTER_VALIDATE_EMAIL
-                 * is based.
-                 * In addition to the addresses allowed by filter_var, also permits:
-                 *  * dotless domains: `a@b`
-                 *  * comments: `1234 @ local(blah) .machine .example`
-                 *  * quoted elements: `'"test blah"@example.org'`
-                 *  * numeric TLDs: `a@b.123`
-                 *  * unbracketed IPv4 literals: `a@192.168.0.1`
-                 *  * IPv6 literals: 'first.last@[IPv6:a1::]'
-                 * Not all of these will necessarily work for sending!
-                 *
-                 * @see       http://squiloople.com/2009/12/20/email-address-validation/
-                 * @copyright 2009-2010 Michael Rushton
-                 * Feel free to use and redistribute this code. But please keep this copyright notice.
-                 */
-                return (bool) preg_match(
-                    '/^(?!(?>(?1)"?(?>\\\[ -~]|[^"])"?(?1)){255,})(?!(?>(?1)"?(?>\\\[ -~]|[^"])"?(?1)){65,}@)' .
-                    '((?>(?>(?>((?>(?>(?>\x0D\x0A)?[\t ])+|(?>[\t ]*\x0D\x0A)?[\t ]+)?)(\((?>(?2)' .
-                    '(?>[\x01-\x08\x0B\x0C\x0E-\'*-\[\]-\x7F]|\\\[\x00-\x7F]|(?3)))*(?2)\)))+(?2))|(?2))?)' .
-                    '([!#-\'*+\/-9=?^-~-]+|"(?>(?2)(?>[\x01-\x08\x0B\x0C\x0E-!#-\[\]-\x7F]|\\\[\x00-\x7F]))*' .
-                    '(?2)")(?>(?1)\.(?1)(?4))*(?1)@(?!(?1)[a-z0-9-]{64,})(?1)(?>([a-z0-9](?>[a-z0-9-]*[a-z0-9])?)' .
-                    '(?>(?1)\.(?!(?1)[a-z0-9-]{64,})(?1)(?5)){0,126}|\[(?:(?>IPv6:(?>([a-f0-9]{1,4})(?>:(?6)){7}' .
-                    '|(?!(?:.*[a-f0-9][:\]]){8,})((?6)(?>:(?6)){0,6})?::(?7)?))|(?>(?>IPv6:(?>(?6)(?>:(?6)){5}:' .
-                    '|(?!(?:.*[a-f0-9]:){6,})(?8)?::(?>((?6)(?>:(?6)){0,4}):)?))?(25[0-5]|2[0-4][0-9]|1[0-9]{2}' .
-                    '|[1-9]?[0-9])(?>\.(?9)){3}))\])(?1)$/isD',
-                    $address
-                );
-            case 'html5':
-                /*
-                 * This is the pattern used in the HTML5 spec for validation of 'email' type form input elements.
-                 *
-                 * @see https://html.spec.whatwg.org/#e-mail-state-(type=email)
-                 */
-                return (bool) preg_match(
-                    '/^[a-zA-Z0-9.!#$%&\'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}' .
-                    '[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$/sD',
-                    $address
-                );
-            case 'php':
-            default:
-                return filter_var($address, FILTER_VALIDATE_EMAIL) !== false;
-        }
-    }
-
-    /**
-     * Tells whether IDNs (Internationalized Domain Names) are supported or not. This requires the
-     * `intl` and `mbstring` PHP extensions.
-     *
-     * @return bool `true` if required functions for IDN support are present
-     */
-    public static function idnSupported()
-    {
-        return function_exists('idn_to_ascii') && function_exists('mb_convert_encoding');
-    }
-
-    /**
-     * Converts IDN in given email address to its ASCII form, also known as punycode, if possible.
-     * Important: Address must be passed in same encoding as currently set in PHPMailer::$CharSet.
-     * This function silently returns unmodified address if:
-     * - No conversion is necessary (i.e. domain name is not an IDN, or is already in ASCII form)
-     * - Conversion to punycode is impossible (e.g. required PHP functions are not available)
-     *   or fails for any reason (e.g. domain contains characters not allowed in an IDN).
-     *
-     * @see PHPMailer::$CharSet
-     *
-     * @param string $address The email address to convert
-     *
-     * @return string The encoded address in ASCII form
-     */
-    public function punyencodeAddress($address)
-    {
-        //Verify we have required functions, CharSet, and at-sign.
-        $pos = strrpos($address, '@');
-        if (
-            !empty($this->CharSet) &&
-            false !== $pos &&
-            static::idnSupported()
-        ) {
-            $domain = substr($address, ++$pos);
-            //Verify CharSet string is a valid one, and domain properly encoded in this CharSet.
-            if ($this->has8bitChars($domain) && @mb_check_encoding($domain, $this->CharSet)) {
-                //Convert the domain from whatever charset it's in to UTF-8
-                $domain = mb_convert_encoding($domain, self::CHARSET_UTF8, $this->CharSet);
-                //Ignore IDE complaints about this line - method signature changed in PHP 5.4
-                $errorcode = 0;
-                if (defined('INTL_IDNA_VARIANT_UTS46')) {
-                    //Use the current punycode standard (appeared in PHP 7.2)
-                    $punycode = idn_to_ascii(
-                        $domain,
-                        \IDNA_DEFAULT | \IDNA_USE_STD3_RULES | \IDNA_CHECK_BIDI |
-                            \IDNA_CHECK_CONTEXTJ | \IDNA_NONTRANSITIONAL_TO_ASCII,
-                        \INTL_IDNA_VARIANT_UTS46
-                    );
-                } elseif (defined('INTL_IDNA_VARIANT_2003')) {
-                    //Fall back to this old, deprecated/removed encoding
-                    $punycode = idn_to_ascii($domain, $errorcode, \INTL_IDNA_VARIANT_2003);
-                } else {
-                    //Fall back to a default we don't know about
-                    $punycode = idn_to_ascii($domain, $errorcode);
-                }
-                if (false !== $punycode) {
-                    return substr($address, 0, $pos) . $punycode;
-                }
-            }
-        }
-
-        return $address;
-    }
-
-    /**
-     * Create a message and send it.
-     * Uses the sending method specified by $Mailer.
-     *
-     * @throws Exception
-     *
-     * @return bool false on error - See the ErrorInfo property for details of the error
-     */
-    public function send()
-    {
-        try {
-            if (!$this->preSend()) {
-                return false;
-            }
-
-            return $this->postSend();
-        } catch (Exception $exc) {
-            $this->mailHeader = '';
-            $this->setError($exc->getMessage());
-            if ($this->exceptions) {
-                throw $exc;
-            }
-
-            return false;
-        }
-    }
-
-    /**
-     * Prepare a message for sending.
-     *
-     * @throws Exception
-     *
-     * @return bool
-     */
-    public function preSend()
-    {
-        if (
-            'smtp' === $this->Mailer
-            || ('mail' === $this->Mailer && (\PHP_VERSION_ID >= 80000 || stripos(PHP_OS, 'WIN') === 0))
-        ) {
-            //SMTP mandates RFC-compliant line endings
-            //and it's also used with mail() on Windows
-            static::setLE(self::CRLF);
-        } else {
-            //Maintain backward compatibility with legacy Linux command line mailers
-            static::setLE(PHP_EOL);
-        }
-        //Check for buggy PHP versions that add a header with an incorrect line break
-        if (
-            'mail' === $this->Mailer
-            && ((\PHP_VERSION_ID >= 70000 && \PHP_VERSION_ID < 70017)
-                || (\PHP_VERSION_ID >= 70100 && \PHP_VERSION_ID < 70103))
-            && ini_get('mail.add_x_header') === '1'
-            && stripos(PHP_OS, 'WIN') === 0
-        ) {
-            trigger_error($this->lang('buggy_php'), E_USER_WARNING);
-        }
-
-        try {
-            $this->error_count = 0; //Reset errors
-            $this->mailHeader = '';
-
-            //Dequeue recipient and Reply-To addresses with IDN
-            foreach (array_merge($this->RecipientsQueue, $this->ReplyToQueue) as $params) {
-                $params[1] = $this->punyencodeAddress($params[1]);
-                call_user_func_array([$this, 'addAnAddress'], $params);
-            }
-            if (count($this->to) + count($this->cc) + count($this->bcc) < 1) {
-                throw new Exception($this->lang('provide_address'), self::STOP_CRITICAL);
-            }
-
-            //Validate From, Sender, and ConfirmReadingTo addresses
-            foreach (['From', 'Sender', 'ConfirmReadingTo'] as $address_kind) {
-                if ($this->{$address_kind} === null) {
-                    $this->{$address_kind} = '';
-                    continue;
-                }
-                $this->{$address_kind} = trim($this->{$address_kind});
-                if (empty($this->{$address_kind})) {
-                    continue;
-                }
-                $this->{$address_kind} = $this->punyencodeAddress($this->{$address_kind});
-                if (!static::validateAddress($this->{$address_kind})) {
-                    $error_message = sprintf(
-                        '%s (%s): %s',
-                        $this->lang('invalid_address'),
-                        $address_kind,
-                        $this->{$address_kind}
-                    );
-                    $this->setError($error_message);
-                    $this->edebug($error_message);
-                    if ($this->exceptions) {
-                        throw new Exception($error_message);
-                    }
-
-                    return false;
-                }
-            }
-
-            //Set whether the message is multipart/alternative
-            if ($this->alternativeExists()) {
-                $this->ContentType = static::CONTENT_TYPE_MULTIPART_ALTERNATIVE;
-            }
-
-            $this->setMessageType();
-            //Refuse to send an empty message unless we are specifically allowing it
-            if (!$this->AllowEmpty && empty($this->Body)) {
-                throw new Exception($this->lang('empty_message'), self::STOP_CRITICAL);
-            }
-
-            //Trim subject consistently
-            $this->Subject = trim($this->Subject);
-            //Create body before headers in case body makes changes to headers (e.g. altering transfer encoding)
-            $this->MIMEHeader = '';
-            $this->MIMEBody = $this->createBody();
-            //createBody may have added some headers, so retain them
-            $tempheaders = $this->MIMEHeader;
-            $this->MIMEHeader = $this->createHeader();
-            $this->MIMEHeader .= $tempheaders;
-
-            //To capture the complete message when using mail(), create
-            //an extra header list which createHeader() doesn't fold in
-            if ('mail' === $this->Mailer) {
-                if (count($this->to) > 0) {
-                    $this->mailHeader .= $this->addrAppend('To', $this->to);
-                } else {
-                    $this->mailHeader .= $this->headerLine('To', 'undisclosed-recipients:;');
-                }
-                $this->mailHeader .= $this->headerLine(
-                    'Subject',
-                    $this->encodeHeader($this->secureHeader($this->Subject))
-                );
-            }
-
-            //Sign with DKIM if enabled
-            if (
-                !empty($this->DKIM_domain)
-                && !empty($this->DKIM_selector)
-                && (!empty($this->DKIM_private_string)
-                    || (!empty($this->DKIM_private)
-                        && static::isPermittedPath($this->DKIM_private)
-                        && file_exists($this->DKIM_private)
-                    )
-                )
-            ) {
-                $header_dkim = $this->DKIM_Add(
-                    $this->MIMEHeader . $this->mailHeader,
-                    $this->encodeHeader($this->secureHeader($this->Subject)),
-                    $this->MIMEBody
-                );
-                $this->MIMEHeader = static::stripTrailingWSP($this->MIMEHeader) . static::$LE .
-                    static::normalizeBreaks($header_dkim) . static::$LE;
-            }
-
-            return true;
-        } catch (Exception $exc) {
-            $this->setError($exc->getMessage());
-            if ($this->exceptions) {
-                throw $exc;
-            }
-
-            return false;
-        }
-    }
-
-    /**
-     * Actually send a message via the selected mechanism.
-     *
-     * @throws Exception
-     *
-     * @return bool
-     */
-    public function postSend()
-    {
-        try {
-            //Choose the mailer and send through it
-            switch ($this->Mailer) {
-                case 'sendmail':
-                case 'qmail':
-                    return $this->sendmailSend($this->MIMEHeader, $this->MIMEBody);
-                case 'smtp':
-                    return $this->smtpSend($this->MIMEHeader, $this->MIMEBody);
-                case 'mail':
-                    return $this->mailSend($this->MIMEHeader, $this->MIMEBody);
-                default:
-                    $sendMethod = $this->Mailer . 'Send';
-                    if (method_exists($this, $sendMethod)) {
-                        return $this->{$sendMethod}($this->MIMEHeader, $this->MIMEBody);
-                    }
-
-                    return $this->mailSend($this->MIMEHeader, $this->MIMEBody);
-            }
-        } catch (Exception $exc) {
-            $this->setError($exc->getMessage());
-            $this->edebug($exc->getMessage());
-            if ($this->Mailer === 'smtp' && $this->SMTPKeepAlive == true && $this->smtp->connected()) {
-                $this->smtp->reset();
-            }
-            if ($this->exceptions) {
-                throw $exc;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Send mail using the $Sendmail program.
-     *
-     * @see PHPMailer::$Sendmail
-     *
-     * @param string $header The message headers
-     * @param string $body   The message body
-     *
-     * @throws Exception
-     *
-     * @return bool
-     */
-    protected function sendmailSend($header, $body)
-    {
-        if ($this->Mailer === 'qmail') {
-            $this->edebug('Sending with qmail');
-        } else {
-            $this->edebug('Sending with sendmail');
-        }
-        $header = static::stripTrailingWSP($header) . static::$LE . static::$LE;
-        //This sets the SMTP envelope sender which gets turned into a return-path header by the receiver
-        //A space after `-f` is optional, but there is a long history of its presence
-        //causing problems, so we don't use one
-        //Exim docs: http://www.exim.org/exim-html-current/doc/html/spec_html/ch-the_exim_command_line.html
-        //Sendmail docs: http://www.sendmail.org/~ca/email/man/sendmail.html
-        //Qmail docs: http://www.qmail.org/man/man8/qmail-inject.html
-        //Example problem: https://www.drupal.org/node/1057954
-
-        //PHP 5.6 workaround
-        $sendmail_from_value = ini_get('sendmail_from');
-        if (empty($this->Sender) && !empty($sendmail_from_value)) {
-            //PHP config has a sender address we can use
-            $this->Sender = ini_get('sendmail_from');
-        }
-        //CVE-2016-10033, CVE-2016-10045: Don't pass -f if characters will be escaped.
-        if (!empty($this->Sender) && static::validateAddress($this->Sender) && self::isShellSafe($this->Sender)) {
-            if ($this->Mailer === 'qmail') {
-                $sendmailFmt = '%s -f%s';
-            } else {
-                $sendmailFmt = '%s -oi -f%s -t';
-            }
-        } else {
-            //allow sendmail to choose a default envelope sender. It may
-            //seem preferable to force it to use the From header as with
-            //SMTP, but that introduces new problems (see
-            //<https://github.com/PHPMailer/PHPMailer/issues/2298>), and
-            //it has historically worked this way.
-            $sendmailFmt = '%s -oi -t';
-        }
-
-        $sendmail = sprintf($sendmailFmt, escapeshellcmd($this->Sendmail), $this->Sender);
-        $this->edebug('Sendmail path: ' . $this->Sendmail);
-        $this->edebug('Sendmail command: ' . $sendmail);
-        $this->edebug('Envelope sender: ' . $this->Sender);
-        $this->edebug("Headers: {$header}");
-
-        if ($this->SingleTo) {
-            foreach ($this->SingleToArray as $toAddr) {
-                $mail = @popen($sendmail, 'w');
-                if (!$mail) {
-                    throw new Exception($this->lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
-                }
-                $this->edebug("To: {$toAddr}");
-                fwrite($mail, 'To: ' . $toAddr . "\n");
-                fwrite($mail, $header);
-                fwrite($mail, $body);
-                $result = pclose($mail);
-                $addrinfo = static::parseAddresses($toAddr, true, $this->CharSet);
-                $this->doCallback(
-                    ($result === 0),
-                    [[$addrinfo['address'], $addrinfo['name']]],
-                    $this->cc,
-                    $this->bcc,
-                    $this->Subject,
-                    $body,
-                    $this->From,
-                    []
-                );
-                $this->edebug("Result: " . ($result === 0 ? 'true' : 'false'));
-                if (0 !== $result) {
-                    throw new Exception($this->lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
-                }
-            }
-        } else {
-            $mail = @popen($sendmail, 'w');
-            if (!$mail) {
-                throw new Exception($this->lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
-            }
-            fwrite($mail, $header);
-            fwrite($mail, $body);
-            $result = pclose($mail);
-            $this->doCallback(
-                ($result === 0),
-                $this->to,
-                $this->cc,
-                $this->bcc,
-                $this->Subject,
-                $body,
-                $this->From,
-                []
-            );
-            $this->edebug("Result: " . ($result === 0 ? 'true' : 'false'));
-            if (0 !== $result) {
-                throw new Exception($this->lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * Fix CVE-2016-10033 and CVE-2016-10045 by disallowing potentially unsafe shell characters.
-     * Note that escapeshellarg and escapeshellcmd are inadequate for our purposes, especially on Windows.
-     *
-     * @see https://github.com/PHPMailer/PHPMailer/issues/924 CVE-2016-10045 bug report
-     *
-     * @param string $string The string to be validated
-     *
-     * @return bool
-     */
-    protected static function isShellSafe($string)
-    {
-        //It's not possible to use shell commands safely (which includes the mail() function) without escapeshellarg,
-        //but some hosting providers disable it, creating a security problem that we don't want to have to deal with,
-        //so we don't.
-        if (!function_exists('escapeshellarg') || !function_exists('escapeshellcmd')) {
-            return false;
-        }
-
-        if (
-            escapeshellcmd($string) !== $string
-            || !in_array(escapeshellarg($string), ["'$string'", "\"$string\""])
-        ) {
-            return false;
-        }
-
-        $length = strlen($string);
-
-        for ($i = 0; $i < $length; ++$i) {
-            $c = $string[$i];
-
-            //All other characters have a special meaning in at least one common shell, including = and +.
-            //Full stop (.) has a special meaning in cmd.exe, but its impact should be negligible here.
-            //Note that this does permit non-Latin alphanumeric characters based on the current locale.
-            if (!ctype_alnum($c) && strpos('@_-.', $c) === false) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * Check whether a file path is of a permitted type.
-     * Used to reject URLs and phar files from functions that access local file paths,
-     * such as addAttachment.
-     *
-     * @param string $path A relative or absolute path to a file
-     *
-     * @return bool
-     */
-    protected static function isPermittedPath($path)
-    {
-        //Matches scheme definition from https://tools.ietf.org/html/rfc3986#section-3.1
-        return !preg_match('#^[a-z][a-z\d+.-]*://#i', $path);
-    }
-
-    /**
-     * Check whether a file path is safe, accessible, and readable.
-     *
-     * @param string $path A relative or absolute path to a file
-     *
-     * @return bool
-     */
-    protected static function fileIsAccessible($path)
-    {
-        if (!static::isPermittedPath($path)) {
-            return false;
-        }
-        $readable = is_file($path);
-        //If not a UNC path (expected to start with \\), check read permission, see #2069
-        if (strpos($path, '\\\\') !== 0) {
-            $readable = $readable && is_readable($path);
-        }
-        return  $readable;
-    }
-
-    /**
-     * Send mail using the PHP mail() function.
-     *
-     * @see http://www.php.net/manual/en/book.mail.php
-     *
-     * @param string $header The message headers
-     * @param string $body   The message body
-     *
-     * @throws Exception
-     *
-     * @return bool
-     */
-    protected function mailSend($header, $body)
-    {
-        $header = static::stripTrailingWSP($header) . static::$LE . static::$LE;
-
-        $toArr = [];
-        foreach ($this->to as $toaddr) {
-            $toArr[] = $this->addrFormat($toaddr);
-        }
-        $to = trim(implode(', ', $toArr));
-
-        //If there are no To-addresses (e.g. when sending only to BCC-addresses)
-        //the following should be added to get a correct DKIM-signature.
-        //Compare with $this->preSend()
-        if ($to === '') {
-            $to = 'undisclosed-recipients:;';
-        }
-
-        $params = null;
-        //This sets the SMTP envelope sender which gets turned into a return-path header by the receiver
-        //A space after `-f` is optional, but there is a long history of its presence
-        //causing problems, so we don't use one
-        //Exim docs: http://www.exim.org/exim-html-current/doc/html/spec_html/ch-the_exim_command_line.html
-        //Sendmail docs: http://www.sendmail.org/~ca/email/man/sendmail.html
-        //Qmail docs: http://www.qmail.org/man/man8/qmail-inject.html
-        //Example problem: https://www.drupal.org/node/1057954
-        //CVE-2016-10033, CVE-2016-10045: Don't pass -f if characters will be escaped.
-
-        //PHP 5.6 workaround
-        $sendmail_from_value = ini_get('sendmail_from');
-        if (empty($this->Sender) && !empty($sendmail_from_value)) {
-            //PHP config has a sender address we can use
-            $this->Sender = ini_get('sendmail_from');
-        }
-        if (!empty($this->Sender) && static::validateAddress($this->Sender)) {
-            if (self::isShellSafe($this->Sender)) {
-                $params = sprintf('-f%s', $this->Sender);
-            }
-            $old_from = ini_get('sendmail_from');
-            ini_set('sendmail_from', $this->Sender);
-        }
-        $result = false;
-        if ($this->SingleTo && count($toArr) > 1) {
-            foreach ($toArr as $toAddr) {
-                $result = $this->mailPassthru($toAddr, $this->Subject, $body, $header, $params);
-                $addrinfo = static::parseAddresses($toAddr, true, $this->CharSet);
-                $this->doCallback(
-                    $result,
-                    [[$addrinfo['address'], $addrinfo['name']]],
-                    $this->cc,
-                    $this->bcc,
-                    $this->Subject,
-                    $body,
-                    $this->From,
-                    []
-                );
-            }
-        } else {
-            $result = $this->mailPassthru($to, $this->Subject, $body, $header, $params);
-            $this->doCallback($result, $this->to, $this->cc, $this->bcc, $this->Subject, $body, $this->From, []);
-        }
-        if (isset($old_from)) {
-            ini_set('sendmail_from', $old_from);
-        }
-        if (!$result) {
-            throw new Exception($this->lang('instantiate'), self::STOP_CRITICAL);
-        }
-
-        return true;
-    }
-
-    /**
-     * Get an instance to use for SMTP operations.
-     * Override this function to load your own SMTP implementation,
-     * or set one with setSMTPInstance.
-     *
-     * @return SMTP
-     */
-    public function getSMTPInstance()
-    {
-        if (!is_object($this->smtp)) {
-            $this->smtp = new SMTP();
-        }
-
-        return $this->smtp;
-    }
-
-    /**
-     * Provide an instance to use for SMTP operations.
-     *
-     * @return SMTP
-     */
-    public function setSMTPInstance(SMTP $smtp)
-    {
-        $this->smtp = $smtp;
-
-        return $this->smtp;
-    }
-
-    /**
-     * Provide SMTP XCLIENT attributes
-     *
-     * @param string $name  Attribute name
-     * @param ?string $value Attribute value
-     *
-     * @return bool
-     */
-    public function setSMTPXclientAttribute($name, $value)
-    {
-        if (!in_array($name, SMTP::$xclient_allowed_attributes)) {
-            return false;
-        }
-        if (isset($this->SMTPXClient[$name]) && $value === null) {
-            unset($this->SMTPXClient[$name]);
-        } elseif ($value !== null) {
-            $this->SMTPXClient[$name] = $value;
-        }
-
-        return true;
-    }
-
-    /**
-     * Get SMTP XCLIENT attributes
-     *
-     * @return array
-     */
-    public function getSMTPXclientAttributes()
-    {
-        return $this->SMTPXClient;
-    }
-
-    /**
-     * Send mail via SMTP.
-     * Returns false if there is a bad MAIL FROM, RCPT, or DATA input.
-     *
-     * @see PHPMailer::setSMTPInstance() to use a different class.
-     *
-     * @uses \PHPMailer\PHPMailer\SMTP
-     *
-     * @param string $header The message headers
-     * @param string $body   The message body
-     *
-     * @throws Exception
-     *
-     * @return bool
-     */
-    protected function smtpSend($header, $body)
-    {
-        $header = static::stripTrailingWSP($header) . static::$LE . static::$LE;
-        $bad_rcpt = [];
-        if (!$this->smtpConnect($this->SMTPOptions)) {
-            throw new Exception($this->lang('smtp_connect_failed'), self::STOP_CRITICAL);
-        }
-        //Sender already validated in preSend()
-        if ('' === $this->Sender) {
-            $smtp_from = $this->From;
-        } else {
-            $smtp_from = $this->Sender;
-        }
-        if (count($this->SMTPXClient)) {
-            $this->smtp->xclient($this->SMTPXClient);
-        }
-        if (!$this->smtp->mail($smtp_from)) {
-            $this->setError($this->lang('from_failed') . $smtp_from . ' : ' . implode(',', $this->smtp->getError()));
-            throw new Exception($this->ErrorInfo, self::STOP_CRITICAL);
-        }
-
-        $callbacks = [];
-        //Attempt to send to all recipients
-        foreach ([$this->to, $this->cc, $this->bcc] as $togroup) {
-            foreach ($togroup as $to) {
-                if (!$this->smtp->recipient($to[0], $this->dsn)) {
-                    $error = $this->smtp->getError();
-                    $bad_rcpt[] = ['to' => $to[0], 'error' => $error['detail']];
-                    $isSent = false;
-                } else {
-                    $isSent = true;
-                }
-
-                $callbacks[] = ['issent' => $isSent, 'to' => $to[0], 'name' => $to[1]];
-            }
-        }
-
-        //Only send the DATA command if we have viable recipients
-        if ((count($this->all_recipients) > count($bad_rcpt)) && !$this->smtp->data($header . $body)) {
-            throw new Exception($this->lang('data_not_accepted'), self::STOP_CRITICAL);
-        }
-
-        $smtp_transaction_id = $this->smtp->getLastTransactionID();
-
-        if ($this->SMTPKeepAlive) {
-            $this->smtp->reset();
-        } else {
-            $this->smtp->quit();
-            $this->smtp->close();
-        }
-
-        foreach ($callbacks as $cb) {
-            $this->doCallback(
-                $cb['issent'],
-                [[$cb['to'], $cb['name']]],
-                [],
-                [],
-                $this->Subject,
-                $body,
-                $this->From,
-                ['smtp_transaction_id' => $smtp_transaction_id]
-            );
-        }
-
-        //Create error message for any bad addresses
-        if (count($bad_rcpt) > 0) {
-            $errstr = '';
-            foreach ($bad_rcpt as $bad) {
-                $errstr .= $bad['to'] . ': ' . $bad['error'];
-            }
-            throw new Exception($this->lang('recipients_failed') . $errstr, self::STOP_CONTINUE);
-        }
-
-        return true;
-    }
-
-    /**
-     * Initiate a connection to an SMTP server.
-     * Returns false if the operation failed.
-     *
-     * @param array $options An array of options compatible with stream_context_create()
-     *
-     * @throws Exception
-     *
-     * @uses \PHPMailer\PHPMailer\SMTP
-     *
-     * @return bool
-     */
-    public function smtpConnect($options = null)
-    {
-        if (null === $this->smtp) {
-            $this->smtp = $this->getSMTPInstance();
-        }
-
-        //If no options are provided, use whatever is set in the instance
-        if (null === $options) {
-            $options = $this->SMTPOptions;
-        }
-
-        //Already connected?
-        if ($this->smtp->connected()) {
-            return true;
-        }
-
-        $this->smtp->setTimeout($this->Timeout);
-        $this->smtp->setDebugLevel($this->SMTPDebug);
-        $this->smtp->setDebugOutput($this->Debugoutput);
-        $this->smtp->setVerp($this->do_verp);
-        if ($this->Host === null) {
-            $this->Host = 'localhost';
-        }
-        $hosts = explode(';', $this->Host);
-        $lastexception = null;
-
-        foreach ($hosts as $hostentry) {
-            $hostinfo = [];
-            if (
-                !preg_match(
-                    '/^(?:(ssl|tls):\/\/)?(.+?)(?::(\d+))?$/',
-                    trim($hostentry),
-                    $hostinfo
-                )
-            ) {
-                $this->edebug($this->lang('invalid_hostentry') . ' ' . trim($hostentry));
-                //Not a valid host entry
-                continue;
-            }
-            //$hostinfo[1]: optional ssl or tls prefix
-            //$hostinfo[2]: the hostname
-            //$hostinfo[3]: optional port number
-            //The host string prefix can temporarily override the current setting for SMTPSecure
-            //If it's not specified, the default value is used
-
-            //Check the host name is a valid name or IP address before trying to use it
-            if (!static::isValidHost($hostinfo[2])) {
-                $this->edebug($this->lang('invalid_host') . ' ' . $hostinfo[2]);
-                continue;
-            }
-            $prefix = '';
-            $secure = $this->SMTPSecure;
-            $tls = (static::ENCRYPTION_STARTTLS === $this->SMTPSecure);
-            if ('ssl' === $hostinfo[1] || ('' === $hostinfo[1] && static::ENCRYPTION_SMTPS === $this->SMTPSecure)) {
-                $prefix = 'ssl://';
-                $tls = false; //Can't have SSL and TLS at the same time
-                $secure = static::ENCRYPTION_SMTPS;
-            } elseif ('tls' === $hostinfo[1]) {
-                $tls = true;
-                //TLS doesn't use a prefix
-                $secure = static::ENCRYPTION_STARTTLS;
-            }
-            //Do we need the OpenSSL extension?
-            $sslext = defined('OPENSSL_ALGO_SHA256');
-            if (static::ENCRYPTION_STARTTLS === $secure || static::ENCRYPTION_SMTPS === $secure) {
-                //Check for an OpenSSL constant rather than using extension_loaded, which is sometimes disabled
-                if (!$sslext) {
-                    throw new Exception($this->lang('extension_missing') . 'openssl', self::STOP_CRITICAL);
-                }
-            }
-            $host = $hostinfo[2];
-            $port = $this->Port;
-            if (
-                array_key_exists(3, $hostinfo) &&
-                is_numeric($hostinfo[3]) &&
-                $hostinfo[3] > 0 &&
-                $hostinfo[3] < 65536
-            ) {
-                $port = (int) $hostinfo[3];
-            }
-            if ($this->smtp->connect($prefix . $host, $port, $this->Timeout, $options)) {
-                try {
-                    if ($this->Helo) {
-                        $hello = $this->Helo;
-                    } else {
-                        $hello = $this->serverHostname();
-                    }
-                    $this->smtp->hello($hello);
-                    //Automatically enable TLS encryption if:
-                    //* it's not disabled
-                    //* we are not connecting to localhost
-                    //* we have openssl extension
-                    //* we are not already using SSL
-                    //* the server offers STARTTLS
-                    if (
-                        $this->SMTPAutoTLS &&
-                        $this->Host !== 'localhost' &&
-                        $sslext &&
-                        $secure !== 'ssl' &&
-                        $this->smtp->getServerExt('STARTTLS')
-                    ) {
-                        $tls = true;
-                    }
-                    if ($tls) {
-                        if (!$this->smtp->startTLS()) {
-                            $message = $this->getSmtpErrorMessage('connect_host');
-                            throw new Exception($message);
-                        }
-                        //We must resend EHLO after TLS negotiation
-                        $this->smtp->hello($hello);
-                    }
-                    if (
-                        $this->SMTPAuth && !$this->smtp->authenticate(
-                            $this->Username,
-                            $this->Password,
-                            $this->AuthType,
-                            $this->oauth
-                        )
-                    ) {
-                        throw new Exception($this->lang('authenticate'));
-                    }
-
-                    return true;
-                } catch (Exception $exc) {
-                    $lastexception = $exc;
-                    $this->edebug($exc->getMessage());
-                    //We must have connected, but then failed TLS or Auth, so close connection nicely
-                    $this->smtp->quit();
-                }
-            }
-        }
-        //If we get here, all connection attempts have failed, so close connection hard
-        $this->smtp->close();
-        //As we've caught all exceptions, just report whatever the last one was
-        if ($this->exceptions && null !== $lastexception) {
-            throw $lastexception;
-        }
-        if ($this->exceptions) {
-            // no exception was thrown, likely $this->smtp->connect() failed
-            $message = $this->getSmtpErrorMessage('connect_host');
-            throw new Exception($message);
-        }
-
-        return false;
-    }
-
-    /**
-     * Close the active SMTP session if one exists.
-     */
-    public function smtpClose()
-    {
-        if ((null !== $this->smtp) && $this->smtp->connected()) {
-            $this->smtp->quit();
-            $this->smtp->close();
-        }
-    }
-
-    /**
-     * Set the language for error messages.
-     * The default language is English.
-     *
-     * @param string $langcode  ISO 639-1 2-character language code (e.g. French is "fr")
-     *                          Optionally, the language code can be enhanced with a 4-character
-     *                          script annotation and/or a 2-character country annotation.
-     * @param string $lang_path Path to the language file directory, with trailing separator (slash)
-     *                          Do not set this from user input!
-     *
-     * @return bool Returns true if the requested language was loaded, false otherwise.
-     */
-    public function setLanguage($langcode = 'en', $lang_path = '')
-    {
-        //Backwards compatibility for renamed language codes
-        $renamed_langcodes = [
-            'br' => 'pt_br',
-            'cz' => 'cs',
-            'dk' => 'da',
-            'no' => 'nb',
-            'se' => 'sv',
-            'rs' => 'sr',
-            'tg' => 'tl',
-            'am' => 'hy',
-        ];
-
-        if (array_key_exists($langcode, $renamed_langcodes)) {
-            $langcode = $renamed_langcodes[$langcode];
-        }
-
-        //Define full set of translatable strings in English
-        $PHPMAILER_LANG = [
-            'authenticate' => 'SMTP Error: Could not authenticate.',
-            'buggy_php' => 'Your version of PHP is affected by a bug that may result in corrupted messages.' .
-                ' To fix it, switch to sending using SMTP, disable the mail.add_x_header option in' .
-                ' your php.ini, switch to MacOS or Linux, or upgrade your PHP to version 7.0.17+ or 7.1.3+.',
-            'connect_host' => 'SMTP Error: Could not connect to SMTP host.',
-            'data_not_accepted' => 'SMTP Error: data not accepted.',
-            'empty_message' => 'Message body empty',
-            'encoding' => 'Unknown encoding: ',
-            'execute' => 'Could not execute: ',
-            'extension_missing' => 'Extension missing: ',
-            'file_access' => 'Could not access file: ',
-            'file_open' => 'File Error: Could not open file: ',
-            'from_failed' => 'The following From address failed: ',
-            'instantiate' => 'Could not instantiate mail function.',
-            'invalid_address' => 'Invalid address: ',
-            'invalid_header' => 'Invalid header name or value',
-            'invalid_hostentry' => 'Invalid hostentry: ',
-            'invalid_host' => 'Invalid host: ',
-            'mailer_not_supported' => ' mailer is not supported.',
-            'provide_address' => 'You must provide at least one recipient email address.',
-            'recipients_failed' => 'SMTP Error: The following recipients failed: ',
-            'signing' => 'Signing Error: ',
-            'smtp_code' => 'SMTP code: ',
-            'smtp_code_ex' => 'Additional SMTP info: ',
-            'smtp_connect_failed' => 'SMTP connect() failed.',
-            'smtp_detail' => 'Detail: ',
-            'smtp_error' => 'SMTP server error: ',
-            'variable_set' => 'Cannot set or reset variable: ',
-        ];
-        if (empty($lang_path)) {
-            //Calculate an absolute path so it can work if CWD is not here
-            $lang_path = dirname(__DIR__) . DIRECTORY_SEPARATOR . 'language' . DIRECTORY_SEPARATOR;
-        }
-
-        //Validate $langcode
-        $foundlang = true;
-        $langcode  = strtolower($langcode);
-        if (
-            !preg_match('/^(?P<lang>[a-z]{2})(?P<script>_[a-z]{4})?(?P<country>_[a-z]{2})?$/', $langcode, $matches)
-            && $langcode !== 'en'
-        ) {
-            $foundlang = false;
-            $langcode = 'en';
-        }
-
-        //There is no English translation file
-        if ('en' !== $langcode) {
-            $langcodes = [];
-            if (!empty($matches['script']) && !empty($matches['country'])) {
-                $langcodes[] = $matches['lang'] . $matches['script'] . $matches['country'];
-            }
-            if (!empty($matches['country'])) {
-                $langcodes[] = $matches['lang'] . $matches['country'];
-            }
-            if (!empty($matches['script'])) {
-                $langcodes[] = $matches['lang'] . $matches['script'];
-            }
-            $langcodes[] = $matches['lang'];
-
-            //Try and find a readable language file for the requested language.
-            $foundFile = false;
-            foreach ($langcodes as $code) {
-                $lang_file = $lang_path . 'phpmailer.lang-' . $code . '.php';
-                if (static::fileIsAccessible($lang_file)) {
-                    $foundFile = true;
-                    break;
-                }
-            }
-
-            if ($foundFile === false) {
-                $foundlang = false;
-            } else {
-                $lines = file($lang_file);
-                foreach ($lines as $line) {
-                    //Translation file lines look like this:
-                    //$PHPMAILER_LANG['authenticate'] = 'SMTP-Fehler: Authentifizierung fehlgeschlagen.';
-                    //These files are parsed as text and not PHP so as to avoid the possibility of code injection
-                    //See https://blog.stevenlevithan.com/archives/match-quoted-string
-                    $matches = [];
-                    if (
-                        preg_match(
-                            '/^\$PHPMAILER_LANG\[\'([a-z\d_]+)\'\]\s*=\s*(["\'])(.+)*?\2;/',
-                            $line,
-                            $matches
-                        ) &&
-                        //Ignore unknown translation keys
-                        array_key_exists($matches[1], $PHPMAILER_LANG)
-                    ) {
-                        //Overwrite language-specific strings so we'll never have missing translation keys.
-                        $PHPMAILER_LANG[$matches[1]] = (string)$matches[3];
-                    }
-                }
-            }
-        }
-        $this->language = $PHPMAILER_LANG;
-
-        return $foundlang; //Returns false if language not found
-    }
-
-    /**
-     * Get the array of strings for the current language.
-     *
-     * @return array
-     */
-    public function getTranslations()
-    {
-        if (empty($this->language)) {
-            $this->setLanguage(); // Set the default language.
-        }
-
-        return $this->language;
-    }
-
-    /**
-     * Create recipient headers.
-     *
-     * @param string $type
-     * @param array  $addr An array of recipients,
-     *                     where each recipient is a 2-element indexed array with element 0 containing an address
-     *                     and element 1 containing a name, like:
-     *                     [['joe@example.com', 'Joe User'], ['zoe@example.com', 'Zoe User']]
-     *
-     * @return string
-     */
-    public function addrAppend($type, $addr)
-    {
-        $addresses = [];
-        foreach ($addr as $address) {
-            $addresses[] = $this->addrFormat($address);
-        }
-
-        return $type . ': ' . implode(', ', $addresses) . static::$LE;
-    }
-
-    /**
-     * Format an address for use in a message header.
-     *
-     * @param array $addr A 2-element indexed array, element 0 containing an address, element 1 containing a name like
-     *                    ['joe@example.com', 'Joe User']
-     *
-     * @return string
-     */
-    public function addrFormat($addr)
-    {
-        if (!isset($addr[1]) || ($addr[1] === '')) { //No name provided
-            return $this->secureHeader($addr[0]);
-        }
-
-        return $this->encodeHeader($this->secureHeader($addr[1]), 'phrase') .
-            ' <' . $this->secureHeader($addr[0]) . '>';
-    }
-
-    /**
-     * Word-wrap message.
-     * For use with mailers that do not automatically perform wrapping
-     * and for quoted-printable encoded messages.
-     * Original written by philippe.
-     *
-     * @param string $message The message to wrap
-     * @param int    $length  The line length to wrap to
-     * @param bool   $qp_mode Whether to run in Quoted-Printable mode
-     *
-     * @return string
-     */
-    public function wrapText($message, $length, $qp_mode = false)
-    {
-        if ($qp_mode) {
-            $soft_break = sprintf(' =%s', static::$LE);
-        } else {
-            $soft_break = static::$LE;
-        }
-        //If utf-8 encoding is used, we will need to make sure we don't
-        //split multibyte characters when we wrap
-        $is_utf8 = static::CHARSET_UTF8 === strtolower($this->CharSet);
-        $lelen = strlen(static::$LE);
-        $crlflen = strlen(static::$LE);
-
-        $message = static::normalizeBreaks($message);
-        //Remove a trailing line break
-        if (substr($message, -$lelen) === static::$LE) {
-            $message = substr($message, 0, -$lelen);
-        }
-
-        //Split message into lines
-        $lines = explode(static::$LE, $message);
-        //Message will be rebuilt in here
-        $message = '';
-        foreach ($lines as $line) {
-            $words = explode(' ', $line);
-            $buf = '';
-            $firstword = true;
-            foreach ($words as $word) {
-                if ($qp_mode && (strlen($word) > $length)) {
-                    $space_left = $length - strlen($buf) - $crlflen;
-                    if (!$firstword) {
-                        if ($space_left > 20) {
-                            $len = $space_left;
-                            if ($is_utf8) {
-                                $len = $this->utf8CharBoundary($word, $len);
-                            } elseif ('=' === substr($word, $len - 1, 1)) {
-                                --$len;
-                            } elseif ('=' === substr($word, $len - 2, 1)) {
-                                $len -= 2;
-                            }
-                            $part = substr($word, 0, $len);
-                            $word = substr($word, $len);
-                            $buf .= ' ' . $part;
-                            $message .= $buf . sprintf('=%s', static::$LE);
-                        } else {
-                            $message .= $buf . $soft_break;
-                        }
-                        $buf = '';
-                    }
-                    while ($word !== '') {
-                        if ($length <= 0) {
-                            break;
-                        }
-                        $len = $length;
-                        if ($is_utf8) {
-                            $len = $this->utf8CharBoundary($word, $len);
-                        } elseif ('=' === substr($word, $len - 1, 1)) {
-                            --$len;
-                        } elseif ('=' === substr($word, $len - 2, 1)) {
-                            $len -= 2;
-                        }
-                        $part = substr($word, 0, $len);
-                        $word = (string) substr($word, $len);
-
-                        if ($word !== '') {
-                            $message .= $part . sprintf('=%s', static::$LE);
-                        } else {
-                            $buf = $part;
-                        }
-                    }
-                } else {
-                    $buf_o = $buf;
-                    if (!$firstword) {
-                        $buf .= ' ';
-                    }
-                    $buf .= $word;
-
-                    if ('' !== $buf_o && strlen($buf) > $length) {
-                        $message .= $buf_o . $soft_break;
-                        $buf = $word;
-                    }
-                }
-                $firstword = false;
-            }
-            $message .= $buf . static::$LE;
-        }
-
-        return $message;
-    }
-
-    /**
-     * Find the last character boundary prior to $maxLength in a utf-8
-     * quoted-printable encoded string.
-     * Original written by Colin Brown.
-     *
-     * @param string $encodedText utf-8 QP text
-     * @param int    $maxLength   Find the last character boundary prior to this length
-     *
-     * @return int
-     */
-    public function utf8CharBoundary($encodedText, $maxLength)
-    {
-        $foundSplitPos = false;
-        $lookBack = 3;
-        while (!$foundSplitPos) {
-            $lastChunk = substr($encodedText, $maxLength - $lookBack, $lookBack);
-            $encodedCharPos = strpos($lastChunk, '=');
-            if (false !== $encodedCharPos) {
-                //Found start of encoded character byte within $lookBack block.
-                //Check the encoded byte value (the 2 chars after the '=')
-                $hex = substr($encodedText, $maxLength - $lookBack + $encodedCharPos + 1, 2);
-                $dec = hexdec($hex);
-                if ($dec < 128) {
-                    //Single byte character.
-                    //If the encoded char was found at pos 0, it will fit
-                    //otherwise reduce maxLength to start of the encoded char
-                    if ($encodedCharPos > 0) {
-                        $maxLength -= $lookBack - $encodedCharPos;
-                    }
-                    $foundSplitPos = true;
-                } elseif ($dec >= 192) {
-                    //First byte of a multi byte character
-                    //Reduce maxLength to split at start of character
-                    $maxLength -= $lookBack - $encodedCharPos;
-                    $foundSplitPos = true;
-                } elseif ($dec < 192) {
-                    //Middle byte of a multi byte character, look further back
-                    $lookBack += 3;
-                }
-            } else {
-                //No encoded character found
-                $foundSplitPos = true;
-            }
-        }
-
-        return $maxLength;
-    }
-
-    /**
-     * Apply word wrapping to the message body.
-     * Wraps the message body to the number of chars set in the WordWrap property.
-     * You should only do this to plain-text bodies as wrapping HTML tags may break them.
-     * This is called automatically by createBody(), so you don't need to call it yourself.
-     */
-    public function setWordWrap()
-    {
-        if ($this->WordWrap < 1) {
-            return;
-        }
-
-        switch ($this->message_type) {
-            case 'alt':
-            case 'alt_inline':
-            case 'alt_attach':
-            case 'alt_inline_attach':
-                $this->AltBody = $this->wrapText($this->AltBody, $this->WordWrap);
-                break;
-            default:
-                $this->Body = $this->wrapText($this->Body, $this->WordWrap);
-                break;
-        }
-    }
-
-    /**
-     * Assemble message headers.
-     *
-     * @return string The assembled headers
-     */
-    public function createHeader()
-    {
-        $result = '';
-
-        $result .= $this->headerLine('Date', '' === $this->MessageDate ? self::rfcDate() : $this->MessageDate);
-
-        //The To header is created automatically by mail(), so needs to be omitted here
-        if ('mail' !== $this->Mailer) {
-            if ($this->SingleTo) {
-                foreach ($this->to as $toaddr) {
-                    $this->SingleToArray[] = $this->addrFormat($toaddr);
-                }
-            } elseif (count($this->to) > 0) {
-                $result .= $this->addrAppend('To', $this->to);
-            } elseif (count($this->cc) === 0) {
-                $result .= $this->headerLine('To', 'undisclosed-recipients:;');
-            }
-        }
-        $result .= $this->addrAppend('From', [[trim($this->From), $this->FromName]]);
-
-        //sendmail and mail() extract Cc from the header before sending
-        if (count($this->cc) > 0) {
-            $result .= $this->addrAppend('Cc', $this->cc);
-        }
-
-        //sendmail and mail() extract Bcc from the header before sending
-        if (
-            (
-                'sendmail' === $this->Mailer || 'qmail' === $this->Mailer || 'mail' === $this->Mailer
-            )
-            && count($this->bcc) > 0
-        ) {
-            $result .= $this->addrAppend('Bcc', $this->bcc);
-        }
-
-        if (count($this->ReplyTo) > 0) {
-            $result .= $this->addrAppend('Reply-To', $this->ReplyTo);
-        }
-
-        //mail() sets the subject itself
-        if ('mail' !== $this->Mailer) {
-            $result .= $this->headerLine('Subject', $this->encodeHeader($this->secureHeader($this->Subject)));
-        }
-
-        //Only allow a custom message ID if it conforms to RFC 5322 section 3.6.4
-        //https://tools.ietf.org/html/rfc5322#section-3.6.4
-        if (
-            '' !== $this->MessageID &&
-            preg_match(
-                '/^<((([a-z\d!#$%&\'*+\/=?^_`{|}~-]+(\.[a-z\d!#$%&\'*+\/=?^_`{|}~-]+)*)' .
-                '|("(([\x01-\x08\x0B\x0C\x0E-\x1F\x7F]|[\x21\x23-\x5B\x5D-\x7E])' .
-                '|(\\[\x01-\x09\x0B\x0C\x0E-\x7F]))*"))@(([a-z\d!#$%&\'*+\/=?^_`{|}~-]+' .
-                '(\.[a-z\d!#$%&\'*+\/=?^_`{|}~-]+)*)|(\[(([\x01-\x08\x0B\x0C\x0E-\x1F\x7F]' .
-                '|[\x21-\x5A\x5E-\x7E])|(\\[\x01-\x09\x0B\x0C\x0E-\x7F]))*\])))>$/Di',
-                $this->MessageID
-            )
-        ) {
-            $this->lastMessageID = $this->MessageID;
-        } else {
-            $this->lastMessageID = sprintf('<%s@%s>', $this->uniqueid, $this->serverHostname());
-        }
-        $result .= $this->headerLine('Message-ID', $this->lastMessageID);
-        if (null !== $this->Priority) {
-            $result .= $this->headerLine('X-Priority', $this->Priority);
-        }
-        if ('' === $this->XMailer) {
-            //Empty string for default X-Mailer header
-            $result .= $this->headerLine(
-                'X-Mailer',
-                'PHPMailer ' . self::VERSION . ' (https://github.com/PHPMailer/PHPMailer)'
-            );
-        } elseif (is_string($this->XMailer) && trim($this->XMailer) !== '') {
-            //Some string
-            $result .= $this->headerLine('X-Mailer', trim($this->XMailer));
-        } //Other values result in no X-Mailer header
-
-        if ('' !== $this->ConfirmReadingTo) {
-            $result .= $this->headerLine('Disposition-Notification-To', '<' . $this->ConfirmReadingTo . '>');
-        }
-
-        //Add custom headers
-        foreach ($this->CustomHeader as $header) {
-            $result .= $this->headerLine(
-                trim($header[0]),
-                $this->encodeHeader(trim($header[1]))
-            );
-        }
-        if (!$this->sign_key_file) {
-            $result .= $this->headerLine('MIME-Version', '1.0');
-            $result .= $this->getMailMIME();
-        }
-
-        return $result;
-    }
-
-    /**
-     * Get the message MIME type headers.
-     *
-     * @return string
-     */
-    public function getMailMIME()
-    {
-        $result = '';
-        $ismultipart = true;
-        switch ($this->message_type) {
-            case 'inline':
-                $result .= $this->headerLine('Content-Type', static::CONTENT_TYPE_MULTIPART_RELATED . ';');
-                $result .= $this->textLine(' boundary="' . $this->boundary[1] . '"');
-                break;
-            case 'attach':
-            case 'inline_attach':
-            case 'alt_attach':
-            case 'alt_inline_attach':
-                $result .= $this->headerLine('Content-Type', static::CONTENT_TYPE_MULTIPART_MIXED . ';');
-                $result .= $this->textLine(' boundary="' . $this->boundary[1] . '"');
-                break;
-            case 'alt':
-            case 'alt_inline':
-                $result .= $this->headerLine('Content-Type', static::CONTENT_TYPE_MULTIPART_ALTERNATIVE . ';');
-                $result .= $this->textLine(' boundary="' . $this->boundary[1] . '"');
-                break;
-            default:
-                //Catches case 'plain': and case '':
-                $result .= $this->textLine('Content-Type: ' . $this->ContentType . '; charset=' . $this->CharSet);
-                $ismultipart = false;
-                break;
-        }
-        //RFC1341 part 5 says 7bit is assumed if not specified
-        if (static::ENCODING_7BIT !== $this->Encoding) {
-            //RFC 2045 section 6.4 says multipart MIME parts may only use 7bit, 8bit or binary CTE
-            if ($ismultipart) {
-                if (static::ENCODING_8BIT === $this->Encoding) {
-                    $result .= $this->headerLine('Content-Transfer-Encoding', static::ENCODING_8BIT);
-                }
-                //The only remaining alternatives are quoted-printable and base64, which are both 7bit compatible
-            } else {
-                $result .= $this->headerLine('Content-Transfer-Encoding', $this->Encoding);
-            }
-        }
-
-        return $result;
-    }
-
-    /**
-     * Returns the whole MIME message.
-     * Includes complete headers and body.
-     * Only valid post preSend().
-     *
-     * @see PHPMailer::preSend()
-     *
-     * @return string
-     */
-    public function getSentMIMEMessage()
-    {
-        return static::stripTrailingWSP($this->MIMEHeader . $this->mailHeader) .
-            static::$LE . static::$LE . $this->MIMEBody;
-    }
-
-    /**
-     * Create a unique ID to use for boundaries.
-     *
-     * @return string
-     */
-    protected function generateId()
-    {
-        $len = 32; //32 bytes = 256 bits
-        $bytes = '';
-        if (function_exists('random_bytes')) {
-            try {
-                $bytes = random_bytes($len);
-            } catch (\Exception $e) {
-                //Do nothing
-            }
-        } elseif (function_exists('openssl_random_pseudo_bytes')) {
-            /** @noinspection CryptographicallySecureRandomnessInspection */
-            $bytes = openssl_random_pseudo_bytes($len);
-        }
-        if ($bytes === '') {
-            //We failed to produce a proper random string, so make do.
-            //Use a hash to force the length to the same as the other methods
-            $bytes = hash('sha256', uniqid((string) mt_rand(), true), true);
-        }
-
-        //We don't care about messing up base64 format here, just want a random string
-        return str_replace(['=', '+', '/'], '', base64_encode(hash('sha256', $bytes, true)));
-    }
-
-    /**
-     * Assemble the message body.
-     * Returns an empty string on failure.
-     *
-     * @throws Exception
-     *
-     * @return string The assembled message body
-     */
-    public function createBody()
-    {
-        $body = '';
-        //Create unique IDs and preset boundaries
-        $this->setBoundaries();
-
-        if ($this->sign_key_file) {
-            $body .= $this->getMailMIME() . static::$LE;
-        }
-
-        $this->setWordWrap();
-
-        $bodyEncoding = $this->Encoding;
-        $bodyCharSet = $this->CharSet;
-        //Can we do a 7-bit downgrade?
-        if (static::ENCODING_8BIT === $bodyEncoding && !$this->has8bitChars($this->Body)) {
-            $bodyEncoding = static::ENCODING_7BIT;
-            //All ISO 8859, Windows codepage and UTF-8 charsets are ascii compatible up to 7-bit
-            $bodyCharSet = static::CHARSET_ASCII;
-        }
-        //If lines are too long, and we're not already using an encoding that will shorten them,
-        //change to quoted-printable transfer encoding for the body part only
-        if (static::ENCODING_BASE64 !== $this->Encoding && static::hasLineLongerThanMax($this->Body)) {
-            $bodyEncoding = static::ENCODING_QUOTED_PRINTABLE;
-        }
-
-        $altBodyEncoding = $this->Encoding;
-        $altBodyCharSet = $this->CharSet;
-        //Can we do a 7-bit downgrade?
-        if (static::ENCODING_8BIT === $altBodyEncoding && !$this->has8bitChars($this->AltBody)) {
-            $altBodyEncoding = static::ENCODING_7BIT;
-            //All ISO 8859, Windows codepage and UTF-8 charsets are ascii compatible up to 7-bit
-            $altBodyCharSet = static::CHARSET_ASCII;
-        }
-        //If lines are too long, and we're not already using an encoding that will shorten them,
-        //change to quoted-printable transfer encoding for the alt body part only
-        if (static::ENCODING_BASE64 !== $altBodyEncoding && static::hasLineLongerThanMax($this->AltBody)) {
-            $altBodyEncoding = static::ENCODING_QUOTED_PRINTABLE;
-        }
-        //Use this as a preamble in all multipart message types
-        $mimepre = '';
-        switch ($this->message_type) {
-            case 'inline':
-                $body .= $mimepre;
-                $body .= $this->getBoundary($this->boundary[1], $bodyCharSet, '', $bodyEncoding);
-                $body .= $this->encodeString($this->Body, $bodyEncoding);
-                $body .= static::$LE;
-                $body .= $this->attachAll('inline', $this->boundary[1]);
-                break;
-            case 'attach':
-                $body .= $mimepre;
-                $body .= $this->getBoundary($this->boundary[1], $bodyCharSet, '', $bodyEncoding);
-                $body .= $this->encodeString($this->Body, $bodyEncoding);
-                $body .= static::$LE;
-                $body .= $this->attachAll('attachment', $this->boundary[1]);
-                break;
-            case 'inline_attach':
-                $body .= $mimepre;
-                $body .= $this->textLine('--' . $this->boundary[1]);
-                $body .= $this->headerLine('Content-Type', static::CONTENT_TYPE_MULTIPART_RELATED . ';');
-                $body .= $this->textLine(' boundary="' . $this->boundary[2] . '";');
-                $body .= $this->textLine(' type="' . static::CONTENT_TYPE_TEXT_HTML . '"');
-                $body .= static::$LE;
-                $body .= $this->getBoundary($this->boundary[2], $bodyCharSet, '', $bodyEncoding);
-                $body .= $this->encodeString($this->Body, $bodyEncoding);
-                $body .= static::$LE;
-                $body .= $this->attachAll('inline', $this->boundary[2]);
-                $body .= static::$LE;
-                $body .= $this->attachAll('attachment', $this->boundary[1]);
-                break;
-            case 'alt':
-                $body .= $mimepre;
-                $body .= $this->getBoundary(
-                    $this->boundary[1],
-                    $altBodyCharSet,
-                    static::CONTENT_TYPE_PLAINTEXT,
-                    $altBodyEncoding
-                );
-                $body .= $this->encodeString($this->AltBody, $altBodyEncoding);
-                $body .= static::$LE;
-                $body .= $this->getBoundary(
-                    $this->boundary[1],
-                    $bodyCharSet,
-                    static::CONTENT_TYPE_TEXT_HTML,
-                    $bodyEncoding
-                );
-                $body .= $this->encodeString($this->Body, $bodyEncoding);
-                $body .= static::$LE;
-                if (!empty($this->Ical)) {
-                    $method = static::ICAL_METHOD_REQUEST;
-                    foreach (static::$IcalMethods as $imethod) {
-                        if (stripos($this->Ical, 'METHOD:' . $imethod) !== false) {
-                            $method = $imethod;
-                            break;
-                        }
-                    }
-                    $body .= $this->getBoundary(
-                        $this->boundary[1],
-                        '',
-                        static::CONTENT_TYPE_TEXT_CALENDAR . '; method=' . $method,
-                        ''
-                    );
-                    $body .= $this->encodeString($this->Ical, $this->Encoding);
-                    $body .= static::$LE;
-                }
-                $body .= $this->endBoundary($this->boundary[1]);
-                break;
-            case 'alt_inline':
-                $body .= $mimepre;
-                $body .= $this->getBoundary(
-                    $this->boundary[1],
-                    $altBodyCharSet,
-                    static::CONTENT_TYPE_PLAINTEXT,
-                    $altBodyEncoding
-                );
-                $body .= $this->encodeString($this->AltBody, $altBodyEncoding);
-                $body .= static::$LE;
-                $body .= $this->textLine('--' . $this->boundary[1]);
-                $body .= $this->headerLine('Content-Type', static::CONTENT_TYPE_MULTIPART_RELATED . ';');
-                $body .= $this->textLine(' boundary="' . $this->boundary[2] . '";');
-                $body .= $this->textLine(' type="' . static::CONTENT_TYPE_TEXT_HTML . '"');
-                $body .= static::$LE;
-                $body .= $this->getBoundary(
-                    $this->boundary[2],
-                    $bodyCharSet,
-                    static::CONTENT_TYPE_TEXT_HTML,
-                    $bodyEncoding
-                );
-                $body .= $this->encodeString($this->Body, $bodyEncoding);
-                $body .= static::$LE;
-                $body .= $this->attachAll('inline', $this->boundary[2]);
-                $body .= static::$LE;
-                $body .= $this->endBoundary($this->boundary[1]);
-                break;
-            case 'alt_attach':
-                $body .= $mimepre;
-                $body .= $this->textLine('--' . $this->boundary[1]);
-                $body .= $this->headerLine('Content-Type', static::CONTENT_TYPE_MULTIPART_ALTERNATIVE . ';');
-                $body .= $this->textLine(' boundary="' . $this->boundary[2] . '"');
-                $body .= static::$LE;
-                $body .= $this->getBoundary(
-                    $this->boundary[2],
-                    $altBodyCharSet,
-                    static::CONTENT_TYPE_PLAINTEXT,
-                    $altBodyEncoding
-                );
-                $body .= $this->encodeString($this->AltBody, $altBodyEncoding);
-                $body .= static::$LE;
-                $body .= $this->getBoundary(
-                    $this->boundary[2],
-                    $bodyCharSet,
-                    static::CONTENT_TYPE_TEXT_HTML,
-                    $bodyEncoding
-                );
-                $body .= $this->encodeString($this->Body, $bodyEncoding);
-                $body .= static::$LE;
-                if (!empty($this->Ical)) {
-                    $method = static::ICAL_METHOD_REQUEST;
-                    foreach (static::$IcalMethods as $imethod) {
-                        if (stripos($this->Ical, 'METHOD:' . $imethod) !== false) {
-                            $method = $imethod;
-                            break;
-                        }
-                    }
-                    $body .= $this->getBoundary(
-                        $this->boundary[2],
-                        '',
-                        static::CONTENT_TYPE_TEXT_CALENDAR . '; method=' . $method,
-                        ''
-                    );
-                    $body .= $this->encodeString($this->Ical, $this->Encoding);
-                }
-                $body .= $this->endBoundary($this->boundary[2]);
-                $body .= static::$LE;
-                $body .= $this->attachAll('attachment', $this->boundary[1]);
-                break;
-            case 'alt_inline_attach':
-                $body .= $mimepre;
-                $body .= $this->textLine('--' . $this->boundary[1]);
-                $body .= $this->headerLine('Content-Type', static::CONTENT_TYPE_MULTIPART_ALTERNATIVE . ';');
-                $body .= $this->textLine(' boundary="' . $this->boundary[2] . '"');
-                $body .= static::$LE;
-                $body .= $this->getBoundary(
-                    $this->boundary[2],
-                    $altBodyCharSet,
-                    static::CONTENT_TYPE_PLAINTEXT,
-                    $altBodyEncoding
-                );
-                $body .= $this->encodeString($this->AltBody, $altBodyEncoding);
-                $body .= static::$LE;
-                $body .= $this->textLine('--' . $this->boundary[2]);
-                $body .= $this->headerLine('Content-Type', static::CONTENT_TYPE_MULTIPART_RELATED . ';');
-                $body .= $this->textLine(' boundary="' . $this->boundary[3] . '";');
-                $body .= $this->textLine(' type="' . static::CONTENT_TYPE_TEXT_HTML . '"');
-                $body .= static::$LE;
-                $body .= $this->getBoundary(
-                    $this->boundary[3],
-                    $bodyCharSet,
-                    static::CONTENT_TYPE_TEXT_HTML,
-                    $bodyEncoding
-                );
-                $body .= $this->encodeString($this->Body, $bodyEncoding);
-                $body .= static::$LE;
-                $body .= $this->attachAll('inline', $this->boundary[3]);
-                $body .= static::$LE;
-                $body .= $this->endBoundary($this->boundary[2]);
-                $body .= static::$LE;
-                $body .= $this->attachAll('attachment', $this->boundary[1]);
-                break;
-            default:
-                //Catch case 'plain' and case '', applies to simple `text/plain` and `text/html` body content types
-                //Reset the `Encoding` property in case we changed it for line length reasons
-                $this->Encoding = $bodyEncoding;
-                $body .= $this->encodeString($this->Body, $this->Encoding);
-                break;
-        }
-
-        if ($this->isError()) {
-            $body = '';
-            if ($this->exceptions) {
-                throw new Exception($this->lang('empty_message'), self::STOP_CRITICAL);
-            }
-        } elseif ($this->sign_key_file) {
-            try {
-                if (!defined('PKCS7_TEXT')) {
-                    throw new Exception($this->lang('extension_missing') . 'openssl');
-                }
-
-                $file = tempnam(sys_get_temp_dir(), 'srcsign');
-                $signed = tempnam(sys_get_temp_dir(), 'mailsign');
-                file_put_contents($file, $body);
-
-                //Workaround for PHP bug https://bugs.php.net/bug.php?id=69197
-                if (empty($this->sign_extracerts_file)) {
-                    $sign = @openssl_pkcs7_sign(
-                        $file,
-                        $signed,
-                        'file://' . realpath($this->sign_cert_file),
-                        ['file://' . realpath($this->sign_key_file), $this->sign_key_pass],
-                        []
-                    );
-                } else {
-                    $sign = @openssl_pkcs7_sign(
-                        $file,
-                        $signed,
-                        'file://' . realpath($this->sign_cert_file),
-                        ['file://' . realpath($this->sign_key_file), $this->sign_key_pass],
-                        [],
-                        PKCS7_DETACHED,
-                        $this->sign_extracerts_file
-                    );
-                }
-
-                @unlink($file);
-                if ($sign) {
-                    $body = file_get_contents($signed);
-                    @unlink($signed);
-                    //The message returned by openssl contains both headers and body, so need to split them up
-                    $parts = explode("\n\n", $body, 2);
-                    $this->MIMEHeader .= $parts[0] . static::$LE . static::$LE;
-                    $body = $parts[1];
-                } else {
-                    @unlink($signed);
-                    throw new Exception($this->lang('signing') . openssl_error_string());
-                }
-            } catch (Exception $exc) {
-                $body = '';
-                if ($this->exceptions) {
-                    throw $exc;
-                }
-            }
-        }
-
-        return $body;
-    }
-
-    /**
-     * Get the boundaries that this message will use
-     * @return array
-     */
-    public function getBoundaries()
-    {
-        if (empty($this->boundary)) {
-            $this->setBoundaries();
-        }
-        return $this->boundary;
-    }
-
-    /**
-     * Return the start of a message boundary.
-     *
-     * @param string $boundary
-     * @param string $charSet
-     * @param string $contentType
-     * @param string $encoding
-     *
-     * @return string
-     */
-    protected function getBoundary($boundary, $charSet, $contentType, $encoding)
-    {
-        $result = '';
-        if ('' === $charSet) {
-            $charSet = $this->CharSet;
-        }
-        if ('' === $contentType) {
-            $contentType = $this->ContentType;
-        }
-        if ('' === $encoding) {
-            $encoding = $this->Encoding;
-        }
-        $result .= $this->textLine('--' . $boundary);
-        $result .= sprintf('Content-Type: %s; charset=%s', $contentType, $charSet);
-        $result .= static::$LE;
-        //RFC1341 part 5 says 7bit is assumed if not specified
-        if (static::ENCODING_7BIT !== $encoding) {
-            $result .= $this->headerLine('Content-Transfer-Encoding', $encoding);
-        }
-        $result .= static::$LE;
-
-        return $result;
-    }
-
-    /**
-     * Return the end of a message boundary.
-     *
-     * @param string $boundary
-     *
-     * @return string
-     */
-    protected function endBoundary($boundary)
-    {
-        return static::$LE . '--' . $boundary . '--' . static::$LE;
-    }
-
-    /**
-     * Set the message type.
-     * PHPMailer only supports some preset message types, not arbitrary MIME structures.
-     */
-    protected function setMessageType()
-    {
-        $type = [];
-        if ($this->alternativeExists()) {
-            $type[] = 'alt';
-        }
-        if ($this->inlineImageExists()) {
-            $type[] = 'inline';
-        }
-        if ($this->attachmentExists()) {
-            $type[] = 'attach';
-        }
-        $this->message_type = implode('_', $type);
-        if ('' === $this->message_type) {
-            //The 'plain' message_type refers to the message having a single body element, not that it is plain-text
-            $this->message_type = 'plain';
-        }
-    }
-
-    /**
-     * Format a header line.
-     *
-     * @param string     $name
-     * @param string|int $value
-     *
-     * @return string
-     */
-    public function headerLine($name, $value)
-    {
-        return $name . ': ' . $value . static::$LE;
-    }
-
-    /**
-     * Return a formatted mail line.
-     *
-     * @param string $value
-     *
-     * @return string
-     */
-    public function textLine($value)
-    {
-        return $value . static::$LE;
-    }
-
-    /**
-     * Add an attachment from a path on the filesystem.
-     * Never use a user-supplied path to a file!
-     * Returns false if the file could not be found or read.
-     * Explicitly *does not* support passing URLs; PHPMailer is not an HTTP client.
-     * If you need to do that, fetch the resource yourself and pass it in via a local file or string.
-     *
-     * @param string $path        Path to the attachment
-     * @param string $name        Overrides the attachment name
-     * @param string $encoding    File encoding (see $Encoding)
-     * @param string $type        MIME type, e.g. `image/jpeg`; determined automatically from $path if not specified
-     * @param string $disposition Disposition to use
-     *
-     * @throws Exception
-     *
-     * @return bool
-     */
-    public function addAttachment(
-        $path,
-        $name = '',
-        $encoding = self::ENCODING_BASE64,
-        $type = '',
-        $disposition = 'attachment'
-    ) {
-        try {
-            if (!static::fileIsAccessible($path)) {
-                throw new Exception($this->lang('file_access') . $path, self::STOP_CONTINUE);
-            }
-
-            //If a MIME type is not specified, try to work it out from the file name
-            if ('' === $type) {
-                $type = static::filenameToType($path);
-            }
-
-            $filename = (string) static::mb_pathinfo($path, PATHINFO_BASENAME);
-            if ('' === $name) {
-                $name = $filename;
-            }
-            if (!$this->validateEncoding($encoding)) {
-                throw new Exception($this->lang('encoding') . $encoding);
-            }
-
-            $this->attachment[] = [
-                0 => $path,
-                1 => $filename,
-                2 => $name,
-                3 => $encoding,
-                4 => $type,
-                5 => false, //isStringAttachment
-                6 => $disposition,
-                7 => $name,
-            ];
-        } catch (Exception $exc) {
-            $this->setError($exc->getMessage());
-            $this->edebug($exc->getMessage());
-            if ($this->exceptions) {
-                throw $exc;
-            }
-
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Return the array of attachments.
-     *
-     * @return array
-     */
-    public function getAttachments()
-    {
-        return $this->attachment;
-    }
-
-    /**
-     * Attach all file, string, and binary attachments to the message.
-     * Returns an empty string on failure.
-     *
-     * @param string $disposition_type
-     * @param string $boundary
-     *
-     * @throws Exception
-     *
-     * @return string
-     */
-    protected function attachAll($disposition_type, $boundary)
-    {
-        //Return text of body
-        $mime = [];
-        $cidUniq = [];
-        $incl = [];
-
-        //Add all attachments
-        foreach ($this->attachment as $attachment) {
-            //Check if it is a valid disposition_filter
-            if ($attachment[6] === $disposition_type) {
-                //Check for string attachment
-                $string = '';
-                $path = '';
-                $bString = $attachment[5];
-                if ($bString) {
-                    $string = $attachment[0];
-                } else {
-                    $path = $attachment[0];
-                }
-
-                $inclhash = hash('sha256', serialize($attachment));
-                if (in_array($inclhash, $incl, true)) {
-                    continue;
-                }
-                $incl[] = $inclhash;
-                $name = $attachment[2];
-                $encoding = $attachment[3];
-                $type = $attachment[4];
-                $disposition = $attachment[6];
-                $cid = $attachment[7];
-                if ('inline' === $disposition && array_key_exists($cid, $cidUniq)) {
-                    continue;
-                }
-                $cidUniq[$cid] = true;
-
-                $mime[] = sprintf('--%s%s', $boundary, static::$LE);
-                //Only include a filename property if we have one
-                if (!empty($name)) {
-                    $mime[] = sprintf(
-                        'Content-Type: %s; name=%s%s',
-                        $type,
-                        static::quotedString($this->encodeHeader($this->secureHeader($name))),
-                        static::$LE
-                    );
-                } else {
-                    $mime[] = sprintf(
-                        'Content-Type: %s%s',
-                        $type,
-                        static::$LE
-                    );
-                }
-                //RFC1341 part 5 says 7bit is assumed if not specified
-                if (static::ENCODING_7BIT !== $encoding) {
-                    $mime[] = sprintf('Content-Transfer-Encoding: %s%s', $encoding, static::$LE);
-                }
-
-                //Only set Content-IDs on inline attachments
-                if ((string) $cid !== '' && $disposition === 'inline') {
-                    $mime[] = 'Content-ID: <' . $this->encodeHeader($this->secureHeader($cid)) . '>' . static::$LE;
-                }
-
-                //Allow for bypassing the Content-Disposition header
-                if (!empty($disposition)) {
-                    $encoded_name = $this->encodeHeader($this->secureHeader($name));
-                    if (!empty($encoded_name)) {
-                        $mime[] = sprintf(
-                            'Content-Disposition: %s; filename=%s%s',
-                            $disposition,
-                            static::quotedString($encoded_name),
-                            static::$LE . static::$LE
-                        );
-                    } else {
-                        $mime[] = sprintf(
-                            'Content-Disposition: %s%s',
-                            $disposition,
-                            static::$LE . static::$LE
-                        );
-                    }
-                } else {
-                    $mime[] = static::$LE;
-                }
-
-                //Encode as string attachment
-                if ($bString) {
-                    $mime[] = $this->encodeString($string, $encoding);
-                } else {
-                    $mime[] = $this->encodeFile($path, $encoding);
-                }
-                if ($this->isError()) {
-                    return '';
-                }
-                $mime[] = static::$LE;
-            }
-        }
-
-        $mime[] = sprintf('--%s--%s', $boundary, static::$LE);
-
-        return implode('', $mime);
-    }
-
-    /**
-     * Encode a file attachment in requested format.
-     * Returns an empty string on failure.
-     *
-     * @param string $path     The full path to the file
-     * @param string $encoding The encoding to use; one of 'base64', '7bit', '8bit', 'binary', 'quoted-printable'
-     *
-     * @return string
-     */
-    protected function encodeFile($path, $encoding = self::ENCODING_BASE64)
-    {
-        try {
-            if (!static::fileIsAccessible($path)) {
-                throw new Exception($this->lang('file_open') . $path, self::STOP_CONTINUE);
-            }
-            $file_buffer = file_get_contents($path);
-            if (false === $file_buffer) {
-                throw new Exception($this->lang('file_open') . $path, self::STOP_CONTINUE);
-            }
-            $file_buffer = $this->encodeString($file_buffer, $encoding);
-
-            return $file_buffer;
-        } catch (Exception $exc) {
-            $this->setError($exc->getMessage());
-            $this->edebug($exc->getMessage());
-            if ($this->exceptions) {
-                throw $exc;
-            }
-
-            return '';
-        }
-    }
-
-    /**
-     * Encode a string in requested format.
-     * Returns an empty string on failure.
-     *
-     * @param string $str      The text to encode
-     * @param string $encoding The encoding to use; one of 'base64', '7bit', '8bit', 'binary', 'quoted-printable'
-     *
-     * @throws Exception
-     *
-     * @return string
-     */
-    public function encodeString($str, $encoding = self::ENCODING_BASE64)
-    {
-        $encoded = '';
-        switch (strtolower($encoding)) {
-            case static::ENCODING_BASE64:
-                $encoded = chunk_split(
-                    base64_encode($str),
-                    static::STD_LINE_LENGTH,
-                    static::$LE
-                );
-                break;
-            case static::ENCODING_7BIT:
-            case static::ENCODING_8BIT:
-                $encoded = static::normalizeBreaks($str);
-                //Make sure it ends with a line break
-                if (substr($encoded, -(strlen(static::$LE))) !== static::$LE) {
-                    $encoded .= static::$LE;
-                }
-                break;
-            case static::ENCODING_BINARY:
-                $encoded = $str;
-                break;
-            case static::ENCODING_QUOTED_PRINTABLE:
-                $encoded = $this->encodeQP($str);
-                break;
-            default:
-                $this->setError($this->lang('encoding') . $encoding);
-                if ($this->exceptions) {
-                    throw new Exception($this->lang('encoding') . $encoding);
-                }
-                break;
-        }
-
-        return $encoded;
-    }
-
-    /**
-     * Encode a header value (not including its label) optimally.
-     * Picks shortest of Q, B, or none. Result includes folding if needed.
-     * See RFC822 definitions for phrase, comment and text positions.
-     *
-     * @param string $str      The header value to encode
-     * @param string $position What context the string will be used in
-     *
-     * @return string
-     */
-    public function encodeHeader($str, $position = 'text')
-    {
-        $matchcount = 0;
-        switch (strtolower($position)) {
-            case 'phrase':
-                if (!preg_match('/[\200-\377]/', $str)) {
-                    //Can't use addslashes as we don't know the value of magic_quotes_sybase
-                    $encoded = addcslashes($str, "\0..\37\177\\\"");
-                    if (($str === $encoded) && !preg_match('/[^A-Za-z0-9!#$%&\'*+\/=?^_`{|}~ -]/', $str)) {
-                        return $encoded;
-                    }
-
-                    return "\"$encoded\"";
-                }
-                $matchcount = preg_match_all('/[^\040\041\043-\133\135-\176]/', $str, $matches);
-                break;
-            /* @noinspection PhpMissingBreakStatementInspection */
-            case 'comment':
-                $matchcount = preg_match_all('/[()"]/', $str, $matches);
-            //fallthrough
-            case 'text':
-            default:
-                $matchcount += preg_match_all('/[\000-\010\013\014\016-\037\177-\377]/', $str, $matches);
-                break;
-        }
-
-        if ($this->has8bitChars($str)) {
-            $charset = $this->CharSet;
-        } else {
-            $charset = static::CHARSET_ASCII;
-        }
-
-        //Q/B encoding adds 8 chars and the charset ("` =?<charset>?[QB]?<content>?=`").
-        $overhead = 8 + strlen($charset);
-
-        if ('mail' === $this->Mailer) {
-            $maxlen = static::MAIL_MAX_LINE_LENGTH - $overhead;
-        } else {
-            $maxlen = static::MAX_LINE_LENGTH - $overhead;
-        }
-
-        //Select the encoding that produces the shortest output and/or prevents corruption.
-        if ($matchcount > strlen($str) / 3) {
-            //More than 1/3 of the content needs encoding, use B-encode.
-            $encoding = 'B';
-        } elseif ($matchcount > 0) {
-            //Less than 1/3 of the content needs encoding, use Q-encode.
-            $encoding = 'Q';
-        } elseif (strlen($str) > $maxlen) {
-            //No encoding needed, but value exceeds max line length, use Q-encode to prevent corruption.
-            $encoding = 'Q';
-        } else {
-            //No reformatting needed
-            $encoding = false;
-        }
-
-        switch ($encoding) {
-            case 'B':
-                if ($this->hasMultiBytes($str)) {
-                    //Use a custom function which correctly encodes and wraps long
-                    //multibyte strings without breaking lines within a character
-                    $encoded = $this->base64EncodeWrapMB($str, "\n");
-                } else {
-                    $encoded = base64_encode($str);
-                    $maxlen -= $maxlen % 4;
-                    $encoded = trim(chunk_split($encoded, $maxlen, "\n"));
-                }
-                $encoded = preg_replace('/^(.*)$/m', ' =?' . $charset . "?$encoding?\\1?=", $encoded);
-                break;
-            case 'Q':
-                $encoded = $this->encodeQ($str, $position);
-                $encoded = $this->wrapText($encoded, $maxlen, true);
-                $encoded = str_replace('=' . static::$LE, "\n", trim($encoded));
-                $encoded = preg_replace('/^(.*)$/m', ' =?' . $charset . "?$encoding?\\1?=", $encoded);
-                break;
-            default:
-                return $str;
-        }
-
-        return trim(static::normalizeBreaks($encoded));
-    }
-
-    /**
-     * Check if a string contains multi-byte characters.
-     *
-     * @param string $str multi-byte text to wrap encode
-     *
-     * @return bool
-     */
-    public function hasMultiBytes($str)
-    {
-        if (function_exists('mb_strlen')) {
-            return strlen($str) > mb_strlen($str, $this->CharSet);
-        }
-
-        //Assume no multibytes (we can't handle without mbstring functions anyway)
-        return false;
-    }
-
-    /**
-     * Does a string contain any 8-bit chars (in any charset)?
-     *
-     * @param string $text
-     *
-     * @return bool
-     */
-    public function has8bitChars($text)
-    {
-        return (bool) preg_match('/[\x80-\xFF]/', $text);
-    }
-
-    /**
-     * Encode and wrap long multibyte strings for mail headers
-     * without breaking lines within a character.
-     * Adapted from a function by paravoid.
-     *
-     * @see http://www.php.net/manual/en/function.mb-encode-mimeheader.php#60283
-     *
-     * @param string $str       multi-byte text to wrap encode
-     * @param string $linebreak string to use as linefeed/end-of-line
-     *
-     * @return string
-     */
-    public function base64EncodeWrapMB($str, $linebreak = null)
-    {
-        $start = '=?' . $this->CharSet . '?B?';
-        $end = '?=';
-        $encoded = '';
-        if (null === $linebreak) {
-            $linebreak = static::$LE;
-        }
-
-        $mb_length = mb_strlen($str, $this->CharSet);
-        //Each line must have length <= 75, including $start and $end
-        $length = 75 - strlen($start) - strlen($end);
-        //Average multi-byte ratio
-        $ratio = $mb_length / strlen($str);
-        //Base64 has a 4:3 ratio
-        $avgLength = floor($length * $ratio * .75);
-
-        $offset = 0;
-        for ($i = 0; $i < $mb_length; $i += $offset) {
-            $lookBack = 0;
-            do {
-                $offset = $avgLength - $lookBack;
-                $chunk = mb_substr($str, $i, $offset, $this->CharSet);
-                $chunk = base64_encode($chunk);
-                ++$lookBack;
-            } while (strlen($chunk) > $length);
-            $encoded .= $chunk . $linebreak;
-        }
-
-        //Chomp the last linefeed
-        return substr($encoded, 0, -strlen($linebreak));
-    }
-
-    /**
-     * Encode a string in quoted-printable format.
-     * According to RFC2045 section 6.7.
-     *
-     * @param string $string The text to encode
-     *
-     * @return string
-     */
-    public function encodeQP($string)
-    {
-        return static::normalizeBreaks(quoted_printable_encode($string));
-    }
-
-    /**
-     * Encode a string using Q encoding.
-     *
-     * @see http://tools.ietf.org/html/rfc2047#section-4.2
-     *
-     * @param string $str      the text to encode
-     * @param string $position Where the text is going to be used, see the RFC for what that means
-     *
-     * @return string
-     */
-    public function encodeQ($str, $position = 'text')
-    {
-        //There should not be any EOL in the string
-        $pattern = '';
-        $encoded = str_replace(["\r", "\n"], '', $str);
-        switch (strtolower($position)) {
-            case 'phrase':
-                //RFC 2047 section 5.3
-                $pattern = '^A-Za-z0-9!*+\/ -';
-                break;
-            /*
-             * RFC 2047 section 5.2.
-             * Build $pattern without including delimiters and []
-             */
-            /* @noinspection PhpMissingBreakStatementInspection */
-            case 'comment':
-                $pattern = '\(\)"';
-            /* Intentional fall through */
-            case 'text':
-            default:
-                //RFC 2047 section 5.1
-                //Replace every high ascii, control, =, ? and _ characters
-                $pattern = '\000-\011\013\014\016-\037\075\077\137\177-\377' . $pattern;
-                break;
-        }
-        $matches = [];
-        if (preg_match_all("/[{$pattern}]/", $encoded, $matches)) {
-            //If the string contains an '=', make sure it's the first thing we replace
-            //so as to avoid double-encoding
-            $eqkey = array_search('=', $matches[0], true);
-            if (false !== $eqkey) {
-                unset($matches[0][$eqkey]);
-                array_unshift($matches[0], '=');
-            }
-            foreach (array_unique($matches[0]) as $char) {
-                $encoded = str_replace($char, '=' . sprintf('%02X', ord($char)), $encoded);
-            }
-        }
-        //Replace spaces with _ (more readable than =20)
-        //RFC 2047 section 4.2(2)
-        return str_replace(' ', '_', $encoded);
-    }
-
-    /**
-     * Add a string or binary attachment (non-filesystem).
-     * This method can be used to attach ascii or binary data,
-     * such as a BLOB record from a database.
-     *
-     * @param string $string      String attachment data
-     * @param string $filename    Name of the attachment
-     * @param string $encoding    File encoding (see $Encoding)
-     * @param string $type        File extension (MIME) type
-     * @param string $disposition Disposition to use
-     *
-     * @throws Exception
-     *
-     * @return bool True on successfully adding an attachment
-     */
-    public function addStringAttachment(
-        $string,
-        $filename,
-        $encoding = self::ENCODING_BASE64,
-        $type = '',
-        $disposition = 'attachment'
-    ) {
-        try {
-            //If a MIME type is not specified, try to work it out from the file name
-            if ('' === $type) {
-                $type = static::filenameToType($filename);
-            }
-
-            if (!$this->validateEncoding($encoding)) {
-                throw new Exception($this->lang('encoding') . $encoding);
-            }
-
-            //Append to $attachment array
-            $this->attachment[] = [
-                0 => $string,
-                1 => $filename,
-                2 => static::mb_pathinfo($filename, PATHINFO_BASENAME),
-                3 => $encoding,
-                4 => $type,
-                5 => true, //isStringAttachment
-                6 => $disposition,
-                7 => 0,
-            ];
-        } catch (Exception $exc) {
-            $this->setError($exc->getMessage());
-            $this->edebug($exc->getMessage());
-            if ($this->exceptions) {
-                throw $exc;
-            }
-
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Add an embedded (inline) attachment from a file.
-     * This can include images, sounds, and just about any other document type.
-     * These differ from 'regular' attachments in that they are intended to be
-     * displayed inline with the message, not just attached for download.
-     * This is used in HTML messages that embed the images
-     * the HTML refers to using the `$cid` value in `img` tags, for example `<img src="cid:mylogo">`.
-     * Never use a user-supplied path to a file!
-     *
-     * @param string $path        Path to the attachment
-     * @param string $cid         Content ID of the attachment; Use this to reference
-     *                            the content when using an embedded image in HTML
-     * @param string $name        Overrides the attachment filename
-     * @param string $encoding    File encoding (see $Encoding) defaults to `base64`
-     * @param string $type        File MIME type (by default mapped from the `$path` filename's extension)
-     * @param string $disposition Disposition to use: `inline` (default) or `attachment`
-     *                            (unlikely you want this – {@see `addAttachment()`} instead)
-     *
-     * @return bool True on successfully adding an attachment
-     * @throws Exception
-     *
-     */
-    public function addEmbeddedImage(
-        $path,
-        $cid,
-        $name = '',
-        $encoding = self::ENCODING_BASE64,
-        $type = '',
-        $disposition = 'inline'
-    ) {
-        try {
-            if (!static::fileIsAccessible($path)) {
-                throw new Exception($this->lang('file_access') . $path, self::STOP_CONTINUE);
-            }
-
-            //If a MIME type is not specified, try to work it out from the file name
-            if ('' === $type) {
-                $type = static::filenameToType($path);
-            }
-
-            if (!$this->validateEncoding($encoding)) {
-                throw new Exception($this->lang('encoding') . $encoding);
-            }
-
-            $filename = (string) static::mb_pathinfo($path, PATHINFO_BASENAME);
-            if ('' === $name) {
-                $name = $filename;
-            }
-
-            //Append to $attachment array
-            $this->attachment[] = [
-                0 => $path,
-                1 => $filename,
-                2 => $name,
-                3 => $encoding,
-                4 => $type,
-                5 => false, //isStringAttachment
-                6 => $disposition,
-                7 => $cid,
-            ];
-        } catch (Exception $exc) {
-            $this->setError($exc->getMessage());
-            $this->edebug($exc->getMessage());
-            if ($this->exceptions) {
-                throw $exc;
-            }
-
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Add an embedded stringified attachment.
-     * This can include images, sounds, and just about any other document type.
-     * If your filename doesn't contain an extension, be sure to set the $type to an appropriate MIME type.
-     *
-     * @param string $string      The attachment binary data
-     * @param string $cid         Content ID of the attachment; Use this to reference
-     *                            the content when using an embedded image in HTML
-     * @param string $name        A filename for the attachment. If this contains an extension,
-     *                            PHPMailer will attempt to set a MIME type for the attachment.
-     *                            For example 'file.jpg' would get an 'image/jpeg' MIME type.
-     * @param string $encoding    File encoding (see $Encoding), defaults to 'base64'
-     * @param string $type        MIME type - will be used in preference to any automatically derived type
-     * @param string $disposition Disposition to use
-     *
-     * @throws Exception
-     *
-     * @return bool True on successfully adding an attachment
-     */
-    public function addStringEmbeddedImage(
-        $string,
-        $cid,
-        $name = '',
-        $encoding = self::ENCODING_BASE64,
-        $type = '',
-        $disposition = 'inline'
-    ) {
-        try {
-            //If a MIME type is not specified, try to work it out from the name
-            if ('' === $type && !empty($name)) {
-                $type = static::filenameToType($name);
-            }
-
-            if (!$this->validateEncoding($encoding)) {
-                throw new Exception($this->lang('encoding') . $encoding);
-            }
-
-            //Append to $attachment array
-            $this->attachment[] = [
-                0 => $string,
-                1 => $name,
-                2 => $name,
-                3 => $encoding,
-                4 => $type,
-                5 => true, //isStringAttachment
-                6 => $disposition,
-                7 => $cid,
-            ];
-        } catch (Exception $exc) {
-            $this->setError($exc->getMessage());
-            $this->edebug($exc->getMessage());
-            if ($this->exceptions) {
-                throw $exc;
-            }
-
-            return false;
-        }
-
-        return true;
-    }
-
-    /**
-     * Validate encodings.
-     *
-     * @param string $encoding
-     *
-     * @return bool
-     */
-    protected function validateEncoding($encoding)
-    {
-        return in_array(
-            $encoding,
-            [
-                self::ENCODING_7BIT,
-                self::ENCODING_QUOTED_PRINTABLE,
-                self::ENCODING_BASE64,
-                self::ENCODING_8BIT,
-                self::ENCODING_BINARY,
-            ],
-            true
-        );
-    }
-
-    /**
-     * Check if an embedded attachment is present with this cid.
-     *
-     * @param string $cid
-     *
-     * @return bool
-     */
-    protected function cidExists($cid)
-    {
-        foreach ($this->attachment as $attachment) {
-            if ('inline' === $attachment[6] && $cid === $attachment[7]) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Check if an inline attachment is present.
-     *
-     * @return bool
-     */
-    public function inlineImageExists()
-    {
-        foreach ($this->attachment as $attachment) {
-            if ('inline' === $attachment[6]) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Check if an attachment (non-inline) is present.
-     *
-     * @return bool
-     */
-    public function attachmentExists()
-    {
-        foreach ($this->attachment as $attachment) {
-            if ('attachment' === $attachment[6]) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Check if this message has an alternative body set.
-     *
-     * @return bool
-     */
-    public function alternativeExists()
-    {
-        return !empty($this->AltBody);
-    }
-
-    /**
-     * Clear queued addresses of given kind.
-     *
-     * @param string $kind 'to', 'cc', or 'bcc'
-     */
-    public function clearQueuedAddresses($kind)
-    {
-        $this->RecipientsQueue = array_filter(
-            $this->RecipientsQueue,
-            static function ($params) use ($kind) {
-                return $params[0] !== $kind;
-            }
-        );
-    }
-
-    /**
-     * Clear all To recipients.
-     */
-    public function clearAddresses()
-    {
-        foreach ($this->to as $to) {
-            unset($this->all_recipients[strtolower($to[0])]);
-        }
-        $this->to = [];
-        $this->clearQueuedAddresses('to');
-    }
-
-    /**
-     * Clear all CC recipients.
-     */
-    public function clearCCs()
-    {
-        foreach ($this->cc as $cc) {
-            unset($this->all_recipients[strtolower($cc[0])]);
-        }
-        $this->cc = [];
-        $this->clearQueuedAddresses('cc');
-    }
-
-    /**
-     * Clear all BCC recipients.
-     */
-    public function clearBCCs()
-    {
-        foreach ($this->bcc as $bcc) {
-            unset($this->all_recipients[strtolower($bcc[0])]);
-        }
-        $this->bcc = [];
-        $this->clearQueuedAddresses('bcc');
-    }
-
-    /**
-     * Clear all ReplyTo recipients.
-     */
-    public function clearReplyTos()
-    {
-        $this->ReplyTo = [];
-        $this->ReplyToQueue = [];
-    }
-
-    /**
-     * Clear all recipient types.
-     */
-    public function clearAllRecipients()
-    {
-        $this->to = [];
-        $this->cc = [];
-        $this->bcc = [];
-        $this->all_recipients = [];
-        $this->RecipientsQueue = [];
-    }
-
-    /**
-     * Clear all filesystem, string, and binary attachments.
-     */
-    public function clearAttachments()
-    {
-        $this->attachment = [];
-    }
-
-    /**
-     * Clear all custom headers.
-     */
-    public function clearCustomHeaders()
-    {
-        $this->CustomHeader = [];
-    }
-
-    /**
-     * Clear a specific custom header by name or name and value.
-     * $name value can be overloaded to contain
-     * both header name and value (name:value).
-     *
-     * @param string      $name  Custom header name
-     * @param string|null $value Header value
-     *
-     * @return bool True if a header was replaced successfully
-     */
-    public function clearCustomHeader($name, $value = null)
-    {
-        if (null === $value && strpos($name, ':') !== false) {
-            //Value passed in as name:value
-            list($name, $value) = explode(':', $name, 2);
-        }
-        $name = trim($name);
-        $value = (null === $value) ? null : trim($value);
-
-        foreach ($this->CustomHeader as $k => $pair) {
-            if ($pair[0] == $name) {
-                // We remove the header if the value is not provided or it matches.
-                if (null === $value ||  $pair[1] == $value) {
-                    unset($this->CustomHeader[$k]);
-                }
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * Replace a custom header.
-     * $name value can be overloaded to contain
-     * both header name and value (name:value).
-     *
-     * @param string      $name  Custom header name
-     * @param string|null $value Header value
-     *
-     * @return bool True if a header was replaced successfully
-     * @throws Exception
-     */
-    public function replaceCustomHeader($name, $value = null)
-    {
-        if (null === $value && strpos($name, ':') !== false) {
-            //Value passed in as name:value
-            list($name, $value) = explode(':', $name, 2);
-        }
-        $name = trim($name);
-        $value = (null === $value) ? '' : trim($value);
-
-        $replaced = false;
-        foreach ($this->CustomHeader as $k => $pair) {
-            if ($pair[0] == $name) {
-                if ($replaced) {
-                    unset($this->CustomHeader[$k]);
-                    continue;
-                }
-                if (strpbrk($name . $value, "\r\n") !== false) {
-                    if ($this->exceptions) {
-                        throw new Exception($this->lang('invalid_header'));
-                    }
-
-                    return false;
-                }
-                $this->CustomHeader[$k] = [$name, $value];
-                $replaced = true;
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * Add an error message to the error container.
-     *
-     * @param string $msg
-     */
-    protected function setError($msg)
-    {
-        ++$this->error_count;
-        if ('smtp' === $this->Mailer && null !== $this->smtp) {
-            $lasterror = $this->smtp->getError();
-            if (!empty($lasterror['error'])) {
-                $msg .= $this->lang('smtp_error') . $lasterror['error'];
-                if (!empty($lasterror['detail'])) {
-                    $msg .= ' ' . $this->lang('smtp_detail') . $lasterror['detail'];
-                }
-                if (!empty($lasterror['smtp_code'])) {
-                    $msg .= ' ' . $this->lang('smtp_code') . $lasterror['smtp_code'];
-                }
-                if (!empty($lasterror['smtp_code_ex'])) {
-                    $msg .= ' ' . $this->lang('smtp_code_ex') . $lasterror['smtp_code_ex'];
-                }
-            }
-        }
-        $this->ErrorInfo = $msg;
-    }
-
-    /**
-     * Return an RFC 822 formatted date.
-     *
-     * @return string
-     */
-    public static function rfcDate()
-    {
-        //Set the time zone to whatever the default is to avoid 500 errors
-        //Will default to UTC if it's not set properly in php.ini
-        date_default_timezone_set(@date_default_timezone_get());
-
-        return date('D, j M Y H:i:s O');
-    }
-
-    /**
-     * Get the server hostname.
-     * Returns 'localhost.localdomain' if unknown.
-     *
-     * @return string
-     */
-    protected function serverHostname()
-    {
-        $result = '';
-        if (!empty($this->Hostname)) {
-            $result = $this->Hostname;
-        } elseif (isset($_SERVER) && array_key_exists('SERVER_NAME', $_SERVER)) {
-            $result = $_SERVER['SERVER_NAME'];
-        } elseif (function_exists('gethostname') && gethostname() !== false) {
-            $result = gethostname();
-        } elseif (php_uname('n') !== false) {
-            $result = php_uname('n');
-        }
-        if (!static::isValidHost($result)) {
-            return 'localhost.localdomain';
-        }
-
-        return $result;
-    }
-
-    /**
-     * Validate whether a string contains a valid value to use as a hostname or IP address.
-     * IPv6 addresses must include [], e.g. `[::1]`, not just `::1`.
-     *
-     * @param string $host The host name or IP address to check
-     *
-     * @return bool
-     */
-    public static function isValidHost($host)
-    {
-        //Simple syntax limits
-        if (
-            empty($host)
-            || !is_string($host)
-            || strlen($host) > 256
-            || !preg_match('/^([a-zA-Z\d.-]*|\[[a-fA-F\d:]+\])$/', $host)
-        ) {
-            return false;
-        }
-        //Looks like a bracketed IPv6 address
-        if (strlen($host) > 2 && substr($host, 0, 1) === '[' && substr($host, -1, 1) === ']') {
-            return filter_var(substr($host, 1, -1), FILTER_VALIDATE_IP, FILTER_FLAG_IPV6) !== false;
-        }
-        //If removing all the dots results in a numeric string, it must be an IPv4 address.
-        //Need to check this first because otherwise things like `999.0.0.0` are considered valid host names
-        if (is_numeric(str_replace('.', '', $host))) {
-            //Is it a valid IPv4 address?
-            return filter_var($host, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4) !== false;
-        }
-        //Is it a syntactically valid hostname (when embeded in a URL)?
-        return filter_var('http://' . $host, FILTER_VALIDATE_URL) !== false;
-    }
-
-    /**
-     * Get an error message in the current language.
-     *
-     * @param string $key
-     *
-     * @return string
-     */
-    protected function lang($key)
-    {
-        if (count($this->language) < 1) {
-            $this->setLanguage(); //Set the default language
-        }
-
-        if (array_key_exists($key, $this->language)) {
-            if ('smtp_connect_failed' === $key) {
-                //Include a link to troubleshooting docs on SMTP connection failure.
-                //This is by far the biggest cause of support questions
-                //but it's usually not PHPMailer's fault.
-                return $this->language[$key] . ' https://github.com/PHPMailer/PHPMailer/wiki/Troubleshooting';
-            }
-
-            return $this->language[$key];
-        }
-
-        //Return the key as a fallback
-        return $key;
-    }
-
-    /**
-     * Build an error message starting with a generic one and adding details if possible.
-     *
-     * @param string $base_key
-     * @return string
-     */
-    private function getSmtpErrorMessage($base_key)
-    {
-        $message = $this->lang($base_key);
-        $error = $this->smtp->getError();
-        if (!empty($error['error'])) {
-            $message .= ' ' . $error['error'];
-            if (!empty($error['detail'])) {
-                $message .= ' ' . $error['detail'];
-            }
-        }
-
-        return $message;
-    }
-
-    /**
-     * Check if an error occurred.
-     *
-     * @return bool True if an error did occur
-     */
-    public function isError()
-    {
-        return $this->error_count > 0;
-    }
-
-    /**
-     * Add a custom header.
-     * $name value can be overloaded to contain
-     * both header name and value (name:value).
-     *
-     * @param string      $name  Custom header name
-     * @param string|null $value Header value
-     *
-     * @return bool True if a header was set successfully
-     * @throws Exception
-     */
-    public function addCustomHeader($name, $value = null)
-    {
-        if (null === $value && strpos($name, ':') !== false) {
-            //Value passed in as name:value
-            list($name, $value) = explode(':', $name, 2);
-        }
-        $name = trim($name);
-        $value = (null === $value) ? '' : trim($value);
-        //Ensure name is not empty, and that neither name nor value contain line breaks
-        if (empty($name) || strpbrk($name . $value, "\r\n") !== false) {
-            if ($this->exceptions) {
-                throw new Exception($this->lang('invalid_header'));
-            }
-
-            return false;
-        }
-        $this->CustomHeader[] = [$name, $value];
-
-        return true;
-    }
-
-    /**
-     * Returns all custom headers.
-     *
-     * @return array
-     */
-    public function getCustomHeaders()
-    {
-        return $this->CustomHeader;
-    }
-
-    /**
-     * Create a message body from an HTML string.
-     * Automatically inlines images and creates a plain-text version by converting the HTML,
-     * overwriting any existing values in Body and AltBody.
-     * Do not source $message content from user input!
-     * $basedir is prepended when handling relative URLs, e.g. <img src="/images/a.png"> and must not be empty
-     * will look for an image file in $basedir/images/a.png and convert it to inline.
-     * If you don't provide a $basedir, relative paths will be left untouched (and thus probably break in email)
-     * Converts data-uri images into embedded attachments.
-     * If you don't want to apply these transformations to your HTML, just set Body and AltBody directly.
-     *
-     * @param string        $message  HTML message string
-     * @param string        $basedir  Absolute path to a base directory to prepend to relative paths to images
-     * @param bool|callable $advanced Whether to use the internal HTML to text converter
-     *                                or your own custom converter
-     * @return string The transformed message body
-     *
-     * @throws Exception
-     *
-     * @see PHPMailer::html2text()
-     */
-    public function msgHTML($message, $basedir = '', $advanced = false)
-    {
-        preg_match_all('/(?<!-)(src|background)=["\'](.*)["\']/Ui', $message, $images);
-        if (array_key_exists(2, $images)) {
-            if (strlen($basedir) > 1 && '/' !== substr($basedir, -1)) {
-                //Ensure $basedir has a trailing /
-                $basedir .= '/';
-            }
-            foreach ($images[2] as $imgindex => $url) {
-                //Convert data URIs into embedded images
-                //e.g. "data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw=="
-                $match = [];
-                if (preg_match('#^data:(image/(?:jpe?g|gif|png));?(base64)?,(.+)#', $url, $match)) {
-                    if (count($match) === 4 && static::ENCODING_BASE64 === $match[2]) {
-                        $data = base64_decode($match[3]);
-                    } elseif ('' === $match[2]) {
-                        $data = rawurldecode($match[3]);
-                    } else {
-                        //Not recognised so leave it alone
-                        continue;
-                    }
-                    //Hash the decoded data, not the URL, so that the same data-URI image used in multiple places
-                    //will only be embedded once, even if it used a different encoding
-                    $cid = substr(hash('sha256', $data), 0, 32) . '@phpmailer.0'; //RFC2392 S 2
-
-                    if (!$this->cidExists($cid)) {
-                        $this->addStringEmbeddedImage(
-                            $data,
-                            $cid,
-                            'embed' . $imgindex,
-                            static::ENCODING_BASE64,
-                            $match[1]
-                        );
-                    }
-                    $message = str_replace(
-                        $images[0][$imgindex],
-                        $images[1][$imgindex] . '="cid:' . $cid . '"',
-                        $message
-                    );
-                    continue;
-                }
-                if (
-                    //Only process relative URLs if a basedir is provided (i.e. no absolute local paths)
-                    !empty($basedir)
-                    //Ignore URLs containing parent dir traversal (..)
-                    && (strpos($url, '..') === false)
-                    //Do not change urls that are already inline images
-                    && 0 !== strpos($url, 'cid:')
-                    //Do not change absolute URLs, including anonymous protocol
-                    && !preg_match('#^[a-z][a-z0-9+.-]*:?//#i', $url)
-                ) {
-                    $filename = static::mb_pathinfo($url, PATHINFO_BASENAME);
-                    $directory = dirname($url);
-                    if ('.' === $directory) {
-                        $directory = '';
-                    }
-                    //RFC2392 S 2
-                    $cid = substr(hash('sha256', $url), 0, 32) . '@phpmailer.0';
-                    if (strlen($basedir) > 1 && '/' !== substr($basedir, -1)) {
-                        $basedir .= '/';
-                    }
-                    if (strlen($directory) > 1 && '/' !== substr($directory, -1)) {
-                        $directory .= '/';
-                    }
-                    if (
-                        $this->addEmbeddedImage(
-                            $basedir . $directory . $filename,
-                            $cid,
-                            $filename,
-                            static::ENCODING_BASE64,
-                            static::_mime_types((string) static::mb_pathinfo($filename, PATHINFO_EXTENSION))
-                        )
-                    ) {
-                        $message = preg_replace(
-                            '/' . $images[1][$imgindex] . '=["\']' . preg_quote($url, '/') . '["\']/Ui',
-                            $images[1][$imgindex] . '="cid:' . $cid . '"',
-                            $message
-                        );
-                    }
-                }
-            }
-        }
-        $this->isHTML();
-        //Convert all message body line breaks to LE, makes quoted-printable encoding work much better
-        $this->Body = static::normalizeBreaks($message);
-        $this->AltBody = static::normalizeBreaks($this->html2text($message, $advanced));
-        if (!$this->alternativeExists()) {
-            $this->AltBody = 'This is an HTML-only message. To view it, activate HTML in your email application.'
-                . static::$LE;
-        }
-
-        return $this->Body;
-    }
-
-    /**
-     * Convert an HTML string into plain text.
-     * This is used by msgHTML().
-     * Note - older versions of this function used a bundled advanced converter
-     * which was removed for license reasons in #232.
-     * Example usage:
-     *
-     * ```php
-     * //Use default conversion
-     * $plain = $mail->html2text($html);
-     * //Use your own custom converter
-     * $plain = $mail->html2text($html, function($html) {
-     *     $converter = new MyHtml2text($html);
-     *     return $converter->get_text();
-     * });
-     * ```
-     *
-     * @param string        $html     The HTML text to convert
-     * @param bool|callable $advanced Any boolean value to use the internal converter,
-     *                                or provide your own callable for custom conversion.
-     *                                *Never* pass user-supplied data into this parameter
-     *
-     * @return string
-     */
-    public function html2text($html, $advanced = false)
-    {
-        if (is_callable($advanced)) {
-            return call_user_func($advanced, $html);
-        }
-
-        return html_entity_decode(
-            trim(strip_tags(preg_replace('/<(head|title|style|script)[^>]*>.*?<\/\\1>/si', '', $html))),
-            ENT_QUOTES,
-            $this->CharSet
-        );
-    }
-
-    /**
-     * Get the MIME type for a file extension.
-     *
-     * @param string $ext File extension
-     *
-     * @return string MIME type of file
-     */
-    public static function _mime_types($ext = '')
-    {
-        $mimes = [
-            'xl' => 'application/excel',
-            'js' => 'application/javascript',
-            'hqx' => 'application/mac-binhex40',
-            'cpt' => 'application/mac-compactpro',
-            'bin' => 'application/macbinary',
-            'doc' => 'application/msword',
-            'word' => 'application/msword',
-            'xlsx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
-            'xltx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.template',
-            'potx' => 'application/vnd.openxmlformats-officedocument.presentationml.template',
-            'ppsx' => 'application/vnd.openxmlformats-officedocument.presentationml.slideshow',
-            'pptx' => 'application/vnd.openxmlformats-officedocument.presentationml.presentation',
-            'sldx' => 'application/vnd.openxmlformats-officedocument.presentationml.slide',
-            'docx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
-            'dotx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.template',
-            'xlam' => 'application/vnd.ms-excel.addin.macroEnabled.12',
-            'xlsb' => 'application/vnd.ms-excel.sheet.binary.macroEnabled.12',
-            'class' => 'application/octet-stream',
-            'dll' => 'application/octet-stream',
-            'dms' => 'application/octet-stream',
-            'exe' => 'application/octet-stream',
-            'lha' => 'application/octet-stream',
-            'lzh' => 'application/octet-stream',
-            'psd' => 'application/octet-stream',
-            'sea' => 'application/octet-stream',
-            'so' => 'application/octet-stream',
-            'oda' => 'application/oda',
-            'pdf' => 'application/pdf',
-            'ai' => 'application/postscript',
-            'eps' => 'application/postscript',
-            'ps' => 'application/postscript',
-            'smi' => 'application/smil',
-            'smil' => 'application/smil',
-            'mif' => 'application/vnd.mif',
-            'xls' => 'application/vnd.ms-excel',
-            'ppt' => 'application/vnd.ms-powerpoint',
-            'wbxml' => 'application/vnd.wap.wbxml',
-            'wmlc' => 'application/vnd.wap.wmlc',
-            'dcr' => 'application/x-director',
-            'dir' => 'application/x-director',
-            'dxr' => 'application/x-director',
-            'dvi' => 'application/x-dvi',
-            'gtar' => 'application/x-gtar',
-            'php3' => 'application/x-httpd-php',
-            'php4' => 'application/x-httpd-php',
-            'php' => 'application/x-httpd-php',
-            'phtml' => 'application/x-httpd-php',
-            'phps' => 'application/x-httpd-php-source',
-            'swf' => 'application/x-shockwave-flash',
-            'sit' => 'application/x-stuffit',
-            'tar' => 'application/x-tar',
-            'tgz' => 'application/x-tar',
-            'xht' => 'application/xhtml+xml',
-            'xhtml' => 'application/xhtml+xml',
-            'zip' => 'application/zip',
-            'mid' => 'audio/midi',
-            'midi' => 'audio/midi',
-            'mp2' => 'audio/mpeg',
-            'mp3' => 'audio/mpeg',
-            'm4a' => 'audio/mp4',
-            'mpga' => 'audio/mpeg',
-            'aif' => 'audio/x-aiff',
-            'aifc' => 'audio/x-aiff',
-            'aiff' => 'audio/x-aiff',
-            'ram' => 'audio/x-pn-realaudio',
-            'rm' => 'audio/x-pn-realaudio',
-            'rpm' => 'audio/x-pn-realaudio-plugin',
-            'ra' => 'audio/x-realaudio',
-            'wav' => 'audio/x-wav',
-            'mka' => 'audio/x-matroska',
-            'bmp' => 'image/bmp',
-            'gif' => 'image/gif',
-            'jpeg' => 'image/jpeg',
-            'jpe' => 'image/jpeg',
-            'jpg' => 'image/jpeg',
-            'png' => 'image/png',
-            'tiff' => 'image/tiff',
-            'tif' => 'image/tiff',
-            'webp' => 'image/webp',
-            'avif' => 'image/avif',
-            'heif' => 'image/heif',
-            'heifs' => 'image/heif-sequence',
-            'heic' => 'image/heic',
-            'heics' => 'image/heic-sequence',
-            'eml' => 'message/rfc822',
-            'css' => 'text/css',
-            'html' => 'text/html',
-            'htm' => 'text/html',
-            'shtml' => 'text/html',
-            'log' => 'text/plain',
-            'text' => 'text/plain',
-            'txt' => 'text/plain',
-            'rtx' => 'text/richtext',
-            'rtf' => 'text/rtf',
-            'vcf' => 'text/vcard',
-            'vcard' => 'text/vcard',
-            'ics' => 'text/calendar',
-            'xml' => 'text/xml',
-            'xsl' => 'text/xml',
-            'csv' => 'text/csv',
-            'wmv' => 'video/x-ms-wmv',
-            'mpeg' => 'video/mpeg',
-            'mpe' => 'video/mpeg',
-            'mpg' => 'video/mpeg',
-            'mp4' => 'video/mp4',
-            'm4v' => 'video/mp4',
-            'mov' => 'video/quicktime',
-            'qt' => 'video/quicktime',
-            'rv' => 'video/vnd.rn-realvideo',
-            'avi' => 'video/x-msvideo',
-            'movie' => 'video/x-sgi-movie',
-            'webm' => 'video/webm',
-            'mkv' => 'video/x-matroska',
-        ];
-        $ext = strtolower($ext);
-        if (array_key_exists($ext, $mimes)) {
-            return $mimes[$ext];
-        }
-
-        return 'application/octet-stream';
-    }
-
-    /**
-     * Map a file name to a MIME type.
-     * Defaults to 'application/octet-stream', i.e.. arbitrary binary data.
-     *
-     * @param string $filename A file name or full path, does not need to exist as a file
-     *
-     * @return string
-     */
-    public static function filenameToType($filename)
-    {
-        //In case the path is a URL, strip any query string before getting extension
-        $qpos = strpos($filename, '?');
-        if (false !== $qpos) {
-            $filename = substr($filename, 0, $qpos);
-        }
-        $ext = static::mb_pathinfo($filename, PATHINFO_EXTENSION);
-
-        return static::_mime_types($ext);
-    }
-
-    /**
-     * Multi-byte-safe pathinfo replacement.
-     * Drop-in replacement for pathinfo(), but multibyte- and cross-platform-safe.
-     *
-     * @see http://www.php.net/manual/en/function.pathinfo.php#107461
-     *
-     * @param string     $path    A filename or path, does not need to exist as a file
-     * @param int|string $options Either a PATHINFO_* constant,
-     *                            or a string name to return only the specified piece
-     *
-     * @return string|array
-     */
-    public static function mb_pathinfo($path, $options = null)
-    {
-        $ret = ['dirname' => '', 'basename' => '', 'extension' => '', 'filename' => ''];
-        $pathinfo = [];
-        if (preg_match('#^(.*?)[\\\\/]*(([^/\\\\]*?)(\.([^.\\\\/]+?)|))[\\\\/.]*$#m', $path, $pathinfo)) {
-            if (array_key_exists(1, $pathinfo)) {
-                $ret['dirname'] = $pathinfo[1];
-            }
-            if (array_key_exists(2, $pathinfo)) {
-                $ret['basename'] = $pathinfo[2];
-            }
-            if (array_key_exists(5, $pathinfo)) {
-                $ret['extension'] = $pathinfo[5];
-            }
-            if (array_key_exists(3, $pathinfo)) {
-                $ret['filename'] = $pathinfo[3];
-            }
-        }
-        switch ($options) {
-            case PATHINFO_DIRNAME:
-            case 'dirname':
-                return $ret['dirname'];
-            case PATHINFO_BASENAME:
-            case 'basename':
-                return $ret['basename'];
-            case PATHINFO_EXTENSION:
-            case 'extension':
-                return $ret['extension'];
-            case PATHINFO_FILENAME:
-            case 'filename':
-                return $ret['filename'];
-            default:
-                return $ret;
-        }
-    }
-
-    /**
-     * Set or reset instance properties.
-     * You should avoid this function - it's more verbose, less efficient, more error-prone and
-     * harder to debug than setting properties directly.
-     * Usage Example:
-     * `$mail->set('SMTPSecure', static::ENCRYPTION_STARTTLS);`
-     *   is the same as:
-     * `$mail->SMTPSecure = static::ENCRYPTION_STARTTLS;`.
-     *
-     * @param string $name  The property name to set
-     * @param mixed  $value The value to set the property to
-     *
-     * @return bool
-     */
-    public function set($name, $value = '')
-    {
-        if (property_exists($this, $name)) {
-            $this->{$name} = $value;
-
-            return true;
-        }
-        $this->setError($this->lang('variable_set') . $name);
-
-        return false;
-    }
-
-    /**
-     * Strip newlines to prevent header injection.
-     *
-     * @param string $str
-     *
-     * @return string
-     */
-    public function secureHeader($str)
-    {
-        return trim(str_replace(["\r", "\n"], '', $str));
-    }
-
-    /**
-     * Normalize line breaks in a string.
-     * Converts UNIX LF, Mac CR and Windows CRLF line breaks into a single line break format.
-     * Defaults to CRLF (for message bodies) and preserves consecutive breaks.
-     *
-     * @param string $text
-     * @param string $breaktype What kind of line break to use; defaults to static::$LE
-     *
-     * @return string
-     */
-    public static function normalizeBreaks($text, $breaktype = null)
-    {
-        if (null === $breaktype) {
-            $breaktype = static::$LE;
-        }
-        //Normalise to \n
-        $text = str_replace([self::CRLF, "\r"], "\n", $text);
-        //Now convert LE as needed
-        if ("\n" !== $breaktype) {
-            $text = str_replace("\n", $breaktype, $text);
-        }
-
-        return $text;
-    }
-
-    /**
-     * Remove trailing whitespace from a string.
-     *
-     * @param string $text
-     *
-     * @return string The text to remove whitespace from
-     */
-    public static function stripTrailingWSP($text)
-    {
-        return rtrim($text, " \r\n\t");
-    }
-
-    /**
-     * Strip trailing line breaks from a string.
-     *
-     * @param string $text
-     *
-     * @return string The text to remove breaks from
-     */
-    public static function stripTrailingBreaks($text)
-    {
-        return rtrim($text, "\r\n");
-    }
-
-    /**
-     * Return the current line break format string.
-     *
-     * @return string
-     */
-    public static function getLE()
-    {
-        return static::$LE;
-    }
-
-    /**
-     * Set the line break format string, e.g. "\r\n".
-     *
-     * @param string $le
-     */
-    protected static function setLE($le)
-    {
-        static::$LE = $le;
-    }
-
-    /**
-     * Set the public and private key files and password for S/MIME signing.
-     *
-     * @param string $cert_filename
-     * @param string $key_filename
-     * @param string $key_pass            Password for private key
-     * @param string $extracerts_filename Optional path to chain certificate
-     */
-    public function sign($cert_filename, $key_filename, $key_pass, $extracerts_filename = '')
-    {
-        $this->sign_cert_file = $cert_filename;
-        $this->sign_key_file = $key_filename;
-        $this->sign_key_pass = $key_pass;
-        $this->sign_extracerts_file = $extracerts_filename;
-    }
-
-    /**
-     * Quoted-Printable-encode a DKIM header.
-     *
-     * @param string $txt
-     *
-     * @return string
-     */
-    public function DKIM_QP($txt)
-    {
-        $line = '';
-        $len = strlen($txt);
-        for ($i = 0; $i < $len; ++$i) {
-            $ord = ord($txt[$i]);
-            if (((0x21 <= $ord) && ($ord <= 0x3A)) || $ord === 0x3C || ((0x3E <= $ord) && ($ord <= 0x7E))) {
-                $line .= $txt[$i];
-            } else {
-                $line .= '=' . sprintf('%02X', $ord);
-            }
-        }
-
-        return $line;
-    }
-
-    /**
-     * Generate a DKIM signature.
-     *
-     * @param string $signHeader
-     *
-     * @throws Exception
-     *
-     * @return string The DKIM signature value
-     */
-    public function DKIM_Sign($signHeader)
-    {
-        if (!defined('PKCS7_TEXT')) {
-            if ($this->exceptions) {
-                throw new Exception($this->lang('extension_missing') . 'openssl');
-            }
-
-            return '';
-        }
-        $privKeyStr = !empty($this->DKIM_private_string) ?
-            $this->DKIM_private_string :
-            file_get_contents($this->DKIM_private);
-        if ('' !== $this->DKIM_passphrase) {
-            $privKey = openssl_pkey_get_private($privKeyStr, $this->DKIM_passphrase);
-        } else {
-            $privKey = openssl_pkey_get_private($privKeyStr);
-        }
-        if (openssl_sign($signHeader, $signature, $privKey, 'sha256WithRSAEncryption')) {
-            if (\PHP_MAJOR_VERSION < 8) {
-                openssl_pkey_free($privKey);
-            }
-
-            return base64_encode($signature);
-        }
-        if (\PHP_MAJOR_VERSION < 8) {
-            openssl_pkey_free($privKey);
-        }
-
-        return '';
-    }
-
-    /**
-     * Generate a DKIM canonicalization header.
-     * Uses the 'relaxed' algorithm from RFC6376 section 3.4.2.
-     * Canonicalized headers should *always* use CRLF, regardless of mailer setting.
-     *
-     * @see https://tools.ietf.org/html/rfc6376#section-3.4.2
-     *
-     * @param string $signHeader Header
-     *
-     * @return string
-     */
-    public function DKIM_HeaderC($signHeader)
-    {
-        //Normalize breaks to CRLF (regardless of the mailer)
-        $signHeader = static::normalizeBreaks($signHeader, self::CRLF);
-        //Unfold header lines
-        //Note PCRE \s is too broad a definition of whitespace; RFC5322 defines it as `[ \t]`
-        //@see https://tools.ietf.org/html/rfc5322#section-2.2
-        //That means this may break if you do something daft like put vertical tabs in your headers.
-        $signHeader = preg_replace('/\r\n[ \t]+/', ' ', $signHeader);
-        //Break headers out into an array
-        $lines = explode(self::CRLF, $signHeader);
-        foreach ($lines as $key => $line) {
-            //If the header is missing a :, skip it as it's invalid
-            //This is likely to happen because the explode() above will also split
-            //on the trailing LE, leaving an empty line
-            if (strpos($line, ':') === false) {
-                continue;
-            }
-            list($heading, $value) = explode(':', $line, 2);
-            //Lower-case header name
-            $heading = strtolower($heading);
-            //Collapse white space within the value, also convert WSP to space
-            $value = preg_replace('/[ \t]+/', ' ', $value);
-            //RFC6376 is slightly unclear here - it says to delete space at the *end* of each value
-            //But then says to delete space before and after the colon.
-            //Net result is the same as trimming both ends of the value.
-            //By elimination, the same applies to the field name
-            $lines[$key] = trim($heading, " \t") . ':' . trim($value, " \t");
-        }
-
-        return implode(self::CRLF, $lines);
-    }
-
-    /**
-     * Generate a DKIM canonicalization body.
-     * Uses the 'simple' algorithm from RFC6376 section 3.4.3.
-     * Canonicalized bodies should *always* use CRLF, regardless of mailer setting.
-     *
-     * @see https://tools.ietf.org/html/rfc6376#section-3.4.3
-     *
-     * @param string $body Message Body
-     *
-     * @return string
-     */
-    public function DKIM_BodyC($body)
-    {
-        if (empty($body)) {
-            return self::CRLF;
-        }
-        //Normalize line endings to CRLF
-        $body = static::normalizeBreaks($body, self::CRLF);
-
-        //Reduce multiple trailing line breaks to a single one
-        return static::stripTrailingBreaks($body) . self::CRLF;
-    }
-
-    /**
-     * Create the DKIM header and body in a new message header.
-     *
-     * @param string $headers_line Header lines
-     * @param string $subject      Subject
-     * @param string $body         Body
-     *
-     * @throws Exception
-     *
-     * @return string
-     */
-    public function DKIM_Add($headers_line, $subject, $body)
-    {
-        $DKIMsignatureType = 'rsa-sha256'; //Signature & hash algorithms
-        $DKIMcanonicalization = 'relaxed/simple'; //Canonicalization methods of header & body
-        $DKIMquery = 'dns/txt'; //Query method
-        $DKIMtime = time();
-        //Always sign these headers without being asked
-        //Recommended list from https://tools.ietf.org/html/rfc6376#section-5.4.1
-        $autoSignHeaders = [
-            'from',
-            'to',
-            'cc',
-            'date',
-            'subject',
-            'reply-to',
-            'message-id',
-            'content-type',
-            'mime-version',
-            'x-mailer',
-        ];
-        if (stripos($headers_line, 'Subject') === false) {
-            $headers_line .= 'Subject: ' . $subject . static::$LE;
-        }
-        $headerLines = explode(static::$LE, $headers_line);
-        $currentHeaderLabel = '';
-        $currentHeaderValue = '';
-        $parsedHeaders = [];
-        $headerLineIndex = 0;
-        $headerLineCount = count($headerLines);
-        foreach ($headerLines as $headerLine) {
-            $matches = [];
-            if (preg_match('/^([^ \t]*?)(?::[ \t]*)(.*)$/', $headerLine, $matches)) {
-                if ($currentHeaderLabel !== '') {
-                    //We were previously in another header; This is the start of a new header, so save the previous one
-                    $parsedHeaders[] = ['label' => $currentHeaderLabel, 'value' => $currentHeaderValue];
-                }
-                $currentHeaderLabel = $matches[1];
-                $currentHeaderValue = $matches[2];
-            } elseif (preg_match('/^[ \t]+(.*)$/', $headerLine, $matches)) {
-                //This is a folded continuation of the current header, so unfold it
-                $currentHeaderValue .= ' ' . $matches[1];
-            }
-            ++$headerLineIndex;
-            if ($headerLineIndex >= $headerLineCount) {
-                //This was the last line, so finish off this header
-                $parsedHeaders[] = ['label' => $currentHeaderLabel, 'value' => $currentHeaderValue];
-            }
-        }
-        $copiedHeaders = [];
-        $headersToSignKeys = [];
-        $headersToSign = [];
-        foreach ($parsedHeaders as $header) {
-            //Is this header one that must be included in the DKIM signature?
-            if (in_array(strtolower($header['label']), $autoSignHeaders, true)) {
-                $headersToSignKeys[] = $header['label'];
-                $headersToSign[] = $header['label'] . ': ' . $header['value'];
-                if ($this->DKIM_copyHeaderFields) {
-                    $copiedHeaders[] = $header['label'] . ':' . //Note no space after this, as per RFC
-                        str_replace('|', '=7C', $this->DKIM_QP($header['value']));
-                }
-                continue;
-            }
-            //Is this an extra custom header we've been asked to sign?
-            if (in_array($header['label'], $this->DKIM_extraHeaders, true)) {
-                //Find its value in custom headers
-                foreach ($this->CustomHeader as $customHeader) {
-                    if ($customHeader[0] === $header['label']) {
-                        $headersToSignKeys[] = $header['label'];
-                        $headersToSign[] = $header['label'] . ': ' . $header['value'];
-                        if ($this->DKIM_copyHeaderFields) {
-                            $copiedHeaders[] = $header['label'] . ':' . //Note no space after this, as per RFC
-                                str_replace('|', '=7C', $this->DKIM_QP($header['value']));
-                        }
-                        //Skip straight to the next header
-                        continue 2;
-                    }
-                }
-            }
-        }
-        $copiedHeaderFields = '';
-        if ($this->DKIM_copyHeaderFields && count($copiedHeaders) > 0) {
-            //Assemble a DKIM 'z' tag
-            $copiedHeaderFields = ' z=';
-            $first = true;
-            foreach ($copiedHeaders as $copiedHeader) {
-                if (!$first) {
-                    $copiedHeaderFields .= static::$LE . ' |';
-                }
-                //Fold long values
-                if (strlen($copiedHeader) > self::STD_LINE_LENGTH - 3) {
-                    $copiedHeaderFields .= substr(
-                        chunk_split($copiedHeader, self::STD_LINE_LENGTH - 3, static::$LE . self::FWS),
-                        0,
-                        -strlen(static::$LE . self::FWS)
-                    );
-                } else {
-                    $copiedHeaderFields .= $copiedHeader;
-                }
-                $first = false;
-            }
-            $copiedHeaderFields .= ';' . static::$LE;
-        }
-        $headerKeys = ' h=' . implode(':', $headersToSignKeys) . ';' . static::$LE;
-        $headerValues = implode(static::$LE, $headersToSign);
-        $body = $this->DKIM_BodyC($body);
-        //Base64 of packed binary SHA-256 hash of body
-        $DKIMb64 = base64_encode(pack('H*', hash('sha256', $body)));
-        $ident = '';
-        if ('' !== $this->DKIM_identity) {
-            $ident = ' i=' . $this->DKIM_identity . ';' . static::$LE;
-        }
-        //The DKIM-Signature header is included in the signature *except for* the value of the `b` tag
-        //which is appended after calculating the signature
-        //https://tools.ietf.org/html/rfc6376#section-3.5
-        $dkimSignatureHeader = 'DKIM-Signature: v=1;' .
-            ' d=' . $this->DKIM_domain . ';' .
-            ' s=' . $this->DKIM_selector . ';' . static::$LE .
-            ' a=' . $DKIMsignatureType . ';' .
-            ' q=' . $DKIMquery . ';' .
-            ' t=' . $DKIMtime . ';' .
-            ' c=' . $DKIMcanonicalization . ';' . static::$LE .
-            $headerKeys .
-            $ident .
-            $copiedHeaderFields .
-            ' bh=' . $DKIMb64 . ';' . static::$LE .
-            ' b=';
-        //Canonicalize the set of headers
-        $canonicalizedHeaders = $this->DKIM_HeaderC(
-            $headerValues . static::$LE . $dkimSignatureHeader
-        );
-        $signature = $this->DKIM_Sign($canonicalizedHeaders);
-        $signature = trim(chunk_split($signature, self::STD_LINE_LENGTH - 3, static::$LE . self::FWS));
-
-        return static::normalizeBreaks($dkimSignatureHeader . $signature);
-    }
-
-    /**
-     * Detect if a string contains a line longer than the maximum line length
-     * allowed by RFC 2822 section 2.1.1.
-     *
-     * @param string $str
-     *
-     * @return bool
-     */
-    public static function hasLineLongerThanMax($str)
-    {
-        return (bool) preg_match('/^(.{' . (self::MAX_LINE_LENGTH + strlen(static::$LE)) . ',})/m', $str);
-    }
-
-    /**
-     * If a string contains any "special" characters, double-quote the name,
-     * and escape any double quotes with a backslash.
-     *
-     * @param string $str
-     *
-     * @return string
-     *
-     * @see RFC822 3.4.1
-     */
-    public static function quotedString($str)
-    {
-        if (preg_match('/[ ()<>@,;:"\/\[\]?=]/', $str)) {
-            //If the string contains any of these chars, it must be double-quoted
-            //and any double quotes must be escaped with a backslash
-            return '"' . str_replace('"', '\\"', $str) . '"';
-        }
-
-        //Return the string untouched, it doesn't need quoting
-        return $str;
-    }
-
-    /**
-     * Allows for public read access to 'to' property.
-     * Before the send() call, queued addresses (i.e. with IDN) are not yet included.
-     *
-     * @return array
-     */
-    public function getToAddresses()
-    {
-        return $this->to;
-    }
-
-    /**
-     * Allows for public read access to 'cc' property.
-     * Before the send() call, queued addresses (i.e. with IDN) are not yet included.
-     *
-     * @return array
-     */
-    public function getCcAddresses()
-    {
-        return $this->cc;
-    }
-
-    /**
-     * Allows for public read access to 'bcc' property.
-     * Before the send() call, queued addresses (i.e. with IDN) are not yet included.
-     *
-     * @return array
-     */
-    public function getBccAddresses()
-    {
-        return $this->bcc;
-    }
-
-    /**
-     * Allows for public read access to 'ReplyTo' property.
-     * Before the send() call, queued addresses (i.e. with IDN) are not yet included.
-     *
-     * @return array
-     */
-    public function getReplyToAddresses()
-    {
-        return $this->ReplyTo;
-    }
-
-    /**
-     * Allows for public read access to 'all_recipients' property.
-     * Before the send() call, queued addresses (i.e. with IDN) are not yet included.
-     *
-     * @return array
-     */
-    public function getAllRecipientAddresses()
-    {
-        return $this->all_recipients;
-    }
-
-    /**
-     * Perform a callback.
-     *
-     * @param bool   $isSent
-     * @param array  $to
-     * @param array  $cc
-     * @param array  $bcc
-     * @param string $subject
-     * @param string $body
-     * @param string $from
-     * @param array  $extra
-     */
-    protected function doCallback($isSent, $to, $cc, $bcc, $subject, $body, $from, $extra)
-    {
-        if (!empty($this->action_function) && is_callable($this->action_function)) {
-            call_user_func($this->action_function, $isSent, $to, $cc, $bcc, $subject, $body, $from, $extra);
-        }
-    }
-
-    /**
-     * Get the OAuthTokenProvider instance.
-     *
-     * @return OAuthTokenProvider
-     */
-    public function getOAuth()
-    {
-        return $this->oauth;
-    }
-
-    /**
-     * Set an OAuthTokenProvider instance.
-     */
-    public function setOAuth(OAuthTokenProvider $oauth)
-    {
-        $this->oauth = $oauth;
-    }
-}
diff --git a/piwik/README.md b/piwik/README.md
index c7e57a0f..0878394e 100644
--- a/piwik/README.md
+++ b/piwik/README.md
@@ -22,26 +22,22 @@ The easiest way to configure this addon is by activating the admin panels of you
 
 If you don't want to use the admin panel, you can configure the addon through the `config/local.config.php` file.
 
-Open the `config/node.config.php` file and add "piwik" to the list of activated addons.
+Open the `config/local.config.php` file and add "piwik" to the list of activated addons.
 
-	'addons' => [
-		...
-		'piwik' => [
-			admin => true,			
-		],
-	]
+    'system' => [
+        ...
+        'addon' => '...,piwik'
+        ...
+    ]
 
-You can change 5 more configuration variables for the addon in the `config/piwik.config.php` file:
+You can change 4 more configuration variables for the addon in the `config/addon.config.php` file:
 
-	return [
-		'piwik' => [
-			'baseurl' => 'example.com/piwik/',
-			'sideid' => 1,
-			'optout' => true,
-			'async' => false,
-			'shortendpoint' => false,
-		],
-	];
+	'piwik' => [
+        'baseurl' => 'example.com/piwik/',
+        'sideid' => 1,
+        'optout' => true,
+        'async' => false,
+    ],
 
 Configuration fields
 ---------------------
@@ -51,7 +47,7 @@ Configuration fields
 * The *optout* parameter (true|false) defines whether or not a short notice about the utilization of Piwik will be displayed on every page of your Friendica site (at the bottom of the page with some spacing to the
 other content). Part of the note is a link that allows the visitor to set an _opt-out_ cookie which will prevent visits from that user be tracked by piwik.
 * The *async* parameter (true|false) defines whether or not to use asynchronous tracking so pages load (or appear to load) faster.
-* The *shortendpoint* parameter (true|false) defines whether or not to use a short path to the tracking script: "/js/" instead of "/piwik.js".
+
 Currently the optional notice states the following:
 
 >    This website is tracked using the Piwik analytics tool. If you do not want that your visits are logged this way you can set a cookie to prevent Piwik from tracking further visits of the site (opt-out).
diff --git a/piwik/config/piwik.config.php b/piwik/config/piwik.config.php
index 66f71dc7..7543097c 100644
--- a/piwik/config/piwik.config.php
+++ b/piwik/config/piwik.config.php
@@ -1,7 +1,7 @@
 <?php
 
 // Warning: Don't change this file! It only holds the default config values for this addon.
-// Instead, copy this file to config/piwik.config.php in your Friendica directory and set the correct values there
+// Instead overwrite these config values in config/addon.config.php in your Friendica directory
 
 return [
 	'piwik' => [
@@ -25,9 +25,5 @@ return [
 		// async (Boolean)
 		// This defines whether or not to use asynchronous tracking so pages load (or appear to load) faster.
 		'async' => false,
-
-		// shortendpoint (Boolean)
-		// This defines whether or not to use a short path to the tracking script: "/js/" instead of "/piwik.js".
-		'shortendpoint' => false,
 	],
 ];
diff --git a/piwik/lang/C/messages.po b/piwik/lang/C/messages.po
index 881bd796..cadacb40 100644
--- a/piwik/lang/C/messages.po
+++ b/piwik/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-05-01 07:39+0200\n"
+"POT-Creation-Date: 2019-02-19 10:42+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,13 +17,13 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: piwik.php:96
+#: piwik.php:94
 msgid ""
 "This website is tracked using the <a href='http://www.matomo.org'>Matomo</a> "
 "analytics tool."
 msgstr ""
 
-#: piwik.php:99
+#: piwik.php:97
 #, php-format
 msgid ""
 "If you do not want that your visits are logged in this way you <a "
@@ -31,32 +31,32 @@ msgid ""
 "visits of the site</a> (opt-out)."
 msgstr ""
 
-#: piwik.php:108
+#: piwik.php:104
 msgid "Save Settings"
 msgstr ""
 
-#: piwik.php:109
+#: piwik.php:105
 msgid "Matomo (Piwik) Base URL"
 msgstr ""
 
-#: piwik.php:109
+#: piwik.php:105
 msgid ""
 "Absolute path to your Matomo (Piwik) installation. (without protocol (http/"
 "s), with trailing slash)"
 msgstr ""
 
-#: piwik.php:110
+#: piwik.php:106
 msgid "Site ID"
 msgstr ""
 
-#: piwik.php:111
+#: piwik.php:107
 msgid "Show opt-out cookie link?"
 msgstr ""
 
-#: piwik.php:112
+#: piwik.php:108
 msgid "Asynchronous tracking"
 msgstr ""
 
-#: piwik.php:113
-msgid "Shortcut path to the script ('/js/' instead of '/piwik.js')"
+#: piwik.php:120
+msgid "Settings updated."
 msgstr ""
diff --git a/piwik/lang/ar/messages.po b/piwik/lang/ar/messages.po
deleted file mode 100644
index 03ff27a7..00000000
--- a/piwik/lang/ar/messages.po
+++ /dev/null
@@ -1,60 +0,0 @@
-# ADDON piwik
-# Copyright (C)
-# This file is distributed under the same license as the Friendica piwik addon package.
-# 
-# 
-# Translators:
-# Farida Khalaf <faridakhalaf@hotmail.com>, 2021
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2021-02-21 18:42+0000\n"
-"Last-Translator: Farida Khalaf <faridakhalaf@hotmail.com>\n"
-"Language-Team: Arabic (http://www.transifex.com/Friendica/friendica/language/ar/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ar\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-
-#: piwik.php:87
-msgid ""
-"This website is tracked using the <a href='http://www.matomo.org'>Matomo</a>"
-" analytics tool."
-msgstr ""
-
-#: piwik.php:90
-#, php-format
-msgid ""
-"If you do not want that your visits are logged in this way you <a "
-"href='%s'>can set a cookie to prevent Matomo / Piwik from tracking further "
-"visits of the site</a> (opt-out)."
-msgstr ""
-
-#: piwik.php:97
-msgid "Save Settings"
-msgstr "حفظ الإعدادات"
-
-#: piwik.php:98
-msgid "Matomo (Piwik) Base URL"
-msgstr ""
-
-#: piwik.php:98
-msgid ""
-"Absolute path to your Matomo (Piwik) installation. (without protocol "
-"(http/s), with trailing slash)"
-msgstr ""
-
-#: piwik.php:99
-msgid "Site ID"
-msgstr ""
-
-#: piwik.php:100
-msgid "Show opt-out cookie link?"
-msgstr ""
-
-#: piwik.php:101
-msgid "Asynchronous tracking"
-msgstr ""
diff --git a/piwik/lang/ar/strings.php b/piwik/lang/ar/strings.php
deleted file mode 100644
index 285ad303..00000000
--- a/piwik/lang/ar/strings.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_ar")) {
-function string_plural_select_ar($n){
-	$n = intval($n);
-	if ($n==0) { return 0; } else if ($n==1) { return 1; } else if ($n==2) { return 2; } else if ($n%100>=3 && $n%100<=10) { return 3; } else if ($n%100>=11 && $n%100<=99) { return 4; } else  { return 5; }
-}}
-$a->strings['Save Settings'] = 'حفظ الإعدادات';
diff --git a/piwik/lang/cs/strings.php b/piwik/lang/cs/strings.php
index 77594dcf..6c46466d 100644
--- a/piwik/lang/cs/strings.php
+++ b/piwik/lang/cs/strings.php
@@ -3,14 +3,15 @@
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
 	$n = intval($n);
-	if (($n == 1 && $n % 1 == 0)) { return 0; } else if (($n >= 2 && $n <= 4 && $n % 1 == 0)) { return 1; } else if (($n % 1 != 0 )) { return 2; } else  { return 3; }
+	return ($n == 1 && $n % 1 == 0) ? 0 : ($n >= 2 && $n <= 4 && $n % 1 == 0) ? 1: ($n % 1 != 0 ) ? 2 : 3;;
 }}
-$a->strings['This website is tracked using the <a href=\'http://www.matomo.org\'>Matomo</a> analytics tool.'] = 'Tato webová stránka je sledována pomocí nástroje pro analýzu <a href=\'http://www.matomo.org\'>Matomo</a>.';
-$a->strings['If you do not want that your visits are logged in this way you <a href=\'%s\'>can set a cookie to prevent Matomo / Piwik from tracking further visits of the site</a> (opt-out).'] = 'Pokut nechcete, aby byly vaše návštěvy takto sledovány, můžete si <a href=\'%s\'>nastavit soubor cookie, která zabrání službě  Matomo/Piwik, aby sledovala vaše další návštěvy na stránce</a> (tzv. opt-out)';
-$a->strings['Save Settings'] = 'Uložit nastavení';
-$a->strings['Matomo (Piwik) Base URL'] = 'Základní URL adresa Matomo (Piwik)';
-$a->strings['Absolute path to your Matomo (Piwik) installation. (without protocol (http/s), with trailing slash)'] = 'Absolutní cesta k vaší instalaci Matomo (Piwik). (bez protokolu (http/s), s lomítkem na konci)';
-$a->strings['Site ID'] = 'ID webu';
-$a->strings['Show opt-out cookie link?'] = 'Zobrazit odkaz pro opt-out cookie?';
-$a->strings['Asynchronous tracking'] = 'Asynchronní sledování';
-$a->strings['Settings updated.'] = 'Nastavení aktualizováno.';
+;
+$a->strings["This website is tracked using the <a href='http://www.matomo.org'>Matomo</a> analytics tool."] = "Tato webová stránka je sledována pomocí nástroje pro analýzu <a href='http://www.matomo.org'>Matomo</a>.";
+$a->strings["If you do not want that your visits are logged in this way you <a href='%s'>can set a cookie to prevent Matomo / Piwik from tracking further visits of the site</a> (opt-out)."] = "Pokut nechcete, aby byly vaše návštěvy takto sledovány, můžete si <a href='%s'>nastavit soubor cookie, která zabrání službě  Matomo/Piwik, aby sledovala vaše další návštěvy na stránce</a> (tzv. opt-out)";
+$a->strings["Save Settings"] = "Uložit nastavení";
+$a->strings["Matomo (Piwik) Base URL"] = "Základní URL adresa Matomo (Piwik)";
+$a->strings["Absolute path to your Matomo (Piwik) installation. (without protocol (http/s), with trailing slash)"] = "Absolutní cesta k vaší instalaci Matomo (Piwik). (bez protokolu (http/s), s lomítkem na konci)";
+$a->strings["Site ID"] = "ID webu";
+$a->strings["Show opt-out cookie link?"] = "Zobrazit odkaz pro opt-out cookie?";
+$a->strings["Asynchronous tracking"] = "Asynchronní sledování";
+$a->strings["Settings updated."] = "Nastavení aktualizováno.";
diff --git a/piwik/lang/da-dk/messages.po b/piwik/lang/da-dk/messages.po
deleted file mode 100644
index 2241aee9..00000000
--- a/piwik/lang/da-dk/messages.po
+++ /dev/null
@@ -1,60 +0,0 @@
-# ADDON piwik
-# Copyright (C)
-# This file is distributed under the same license as the Friendica piwik addon package.
-# 
-# 
-# Translators:
-# Anton <dev@atjn.dk>, 2022
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2014-06-23 11:18+0000\n"
-"Last-Translator: Anton <dev@atjn.dk>, 2022\n"
-"Language-Team: Danish (Denmark) (http://www.transifex.com/Friendica/friendica/language/da_DK/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: da_DK\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: piwik.php:87
-msgid ""
-"This website is tracked using the <a href='http://www.matomo.org'>Matomo</a>"
-" analytics tool."
-msgstr "Denne hjemmeside er sporet med analyticsværktøjet <a href='http://www.matomo.org'>Matomo</a>."
-
-#: piwik.php:90
-#, php-format
-msgid ""
-"If you do not want that your visits are logged in this way you <a "
-"href='%s'>can set a cookie to prevent Matomo / Piwik from tracking further "
-"visits of the site</a> (opt-out)."
-msgstr "Hvis du ikke vil have at dine besøg bliver logget på denne måde, kan du <a href='%s'>sætte en cookie for at forhindre Matomo / Piwik i at spore yderligere besøg på siden</a> (opt-out)."
-
-#: piwik.php:97
-msgid "Save Settings"
-msgstr "Gem indstillinger"
-
-#: piwik.php:98
-msgid "Matomo (Piwik) Base URL"
-msgstr "Matomo (Piwik) Base URL"
-
-#: piwik.php:98
-msgid ""
-"Absolute path to your Matomo (Piwik) installation. (without protocol "
-"(http/s), with trailing slash)"
-msgstr "Absolut sti til din Matomo (Piwik) installation. (uden protokol (http/s), med efterfølgende skråstreg)"
-
-#: piwik.php:99
-msgid "Site ID"
-msgstr "Side ID"
-
-#: piwik.php:100
-msgid "Show opt-out cookie link?"
-msgstr "Vis opt-out cookie link?"
-
-#: piwik.php:101
-msgid "Asynchronous tracking"
-msgstr "Asynkron sporing"
diff --git a/piwik/lang/da-dk/strings.php b/piwik/lang/da-dk/strings.php
deleted file mode 100644
index 4e5c7ede..00000000
--- a/piwik/lang/da-dk/strings.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_da_dk")) {
-function string_plural_select_da_dk($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['This website is tracked using the <a href=\'http://www.matomo.org\'>Matomo</a> analytics tool.'] = 'Denne hjemmeside er sporet med analyticsværktøjet <a href=\'http://www.matomo.org\'>Matomo</a>.';
-$a->strings['If you do not want that your visits are logged in this way you <a href=\'%s\'>can set a cookie to prevent Matomo / Piwik from tracking further visits of the site</a> (opt-out).'] = 'Hvis du ikke vil have at dine besøg bliver logget på denne måde, kan du <a href=\'%s\'>sætte en cookie for at forhindre Matomo / Piwik i at spore yderligere besøg på siden</a> (opt-out).';
-$a->strings['Save Settings'] = 'Gem indstillinger';
-$a->strings['Matomo (Piwik) Base URL'] = 'Matomo (Piwik) Base URL';
-$a->strings['Absolute path to your Matomo (Piwik) installation. (without protocol (http/s), with trailing slash)'] = 'Absolut sti til din Matomo (Piwik) installation. (uden protokol (http/s), med efterfølgende skråstreg)';
-$a->strings['Site ID'] = 'Side ID';
-$a->strings['Show opt-out cookie link?'] = 'Vis opt-out cookie link?';
-$a->strings['Asynchronous tracking'] = 'Asynkron sporing';
diff --git a/piwik/lang/de/messages.po b/piwik/lang/de/messages.po
index 0fdaa7b3..8bab1adf 100644
--- a/piwik/lang/de/messages.po
+++ b/piwik/lang/de/messages.po
@@ -5,31 +5,30 @@
 # 
 # Translators:
 # Andreas H., 2014-2015
-# Till Mohr <tmtrfx@till-mohr.de>, 2021
 # Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2014
-# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2019,2023
+# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2019
 # Ulf Rompe <transifex.com@rompe.org>, 2019
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-05-01 07:39+0200\n"
-"PO-Revision-Date: 2014-06-23 11:18+0000\n"
-"Last-Translator: Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2019,2023\n"
-"Language-Team: German (http://app.transifex.com/Friendica/friendica/language/de/)\n"
+"POT-Creation-Date: 2019-02-19 10:42+0100\n"
+"PO-Revision-Date: 2019-02-21 06:03+0000\n"
+"Last-Translator: Tobias Diekershoff <tobias.diekershoff@gmx.net>\n"
+"Language-Team: German (http://www.transifex.com/Friendica/friendica/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: piwik.php:96
+#: piwik.php:94
 msgid ""
 "This website is tracked using the <a href='http://www.matomo.org'>Matomo</a>"
 " analytics tool."
-msgstr "Diese Website benutzt <a href='http://www.matomo.org'>Matomo</a>, eine Open-Source-Software zur statistischen Auswertung der Besucherzugriffe."
+msgstr "Diese Website benutzt <a href='http://www.matomo.org'>Matomo</a>, eine Open Source-Software zur statistischen Auswertung der Besucherzugriffe."
 
-#: piwik.php:99
+#: piwik.php:97
 #, php-format
 msgid ""
 "If you do not want that your visits are logged in this way you <a "
@@ -37,32 +36,32 @@ msgid ""
 "visits of the site</a> (opt-out)."
 msgstr "Wenn du nicht willst, dass Deine Besuche auf diese Weise gespeichert werden, kannst du <a href='%s'>ein Cookie setzen</a>. Dann wird Matomo / Piwik dich auf dieser Website nicht mehr verfolgen (opt-out)."
 
-#: piwik.php:108
+#: piwik.php:104
 msgid "Save Settings"
 msgstr "Einstellungen speichern"
 
-#: piwik.php:109
+#: piwik.php:105
 msgid "Matomo (Piwik) Base URL"
-msgstr "Matomo-Basis-URL (Piwik-Basis-URL)"
+msgstr "Matomo (Piwiki) Basis URL"
 
-#: piwik.php:109
+#: piwik.php:105
 msgid ""
 "Absolute path to your Matomo (Piwik) installation. (without protocol "
 "(http/s), with trailing slash)"
-msgstr "Absoluter Pfad zu deiner Matomo-/Piwik-Installation (ohne \"http://\" oder \"https://\"), mit abschließendem Schrägstrich"
+msgstr "Absoluter Pfad zu deiner Matomo (Piwik)-Installation (ohne Protokoll (http/s) und mit abschließendem Schrägstrich)"
 
-#: piwik.php:110
+#: piwik.php:106
 msgid "Site ID"
 msgstr "Seiten-ID"
 
-#: piwik.php:111
+#: piwik.php:107
 msgid "Show opt-out cookie link?"
 msgstr "Link zum Setzen des Opt-Out-Cookies anzeigen?"
 
-#: piwik.php:112
+#: piwik.php:108
 msgid "Asynchronous tracking"
 msgstr "Asynchrones Tracking"
 
-#: piwik.php:113
-msgid "Shortcut path to the script ('/js/' instead of '/piwik.js')"
-msgstr "Shortcut Pfad zum Script ('/js/' anstelle von '/piwik.js')"
+#: piwik.php:120
+msgid "Settings updated."
+msgstr "Einstellungen aktualisiert."
diff --git a/piwik/lang/de/strings.php b/piwik/lang/de/strings.php
index 9e126972..32e2e6cf 100644
--- a/piwik/lang/de/strings.php
+++ b/piwik/lang/de/strings.php
@@ -3,14 +3,15 @@
 if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['This website is tracked using the <a href=\'http://www.matomo.org\'>Matomo</a> analytics tool.'] = 'Diese Website benutzt <a href=\'http://www.matomo.org\'>Matomo</a>, eine Open-Source-Software zur statistischen Auswertung der Besucherzugriffe.';
-$a->strings['If you do not want that your visits are logged in this way you <a href=\'%s\'>can set a cookie to prevent Matomo / Piwik from tracking further visits of the site</a> (opt-out).'] = 'Wenn du nicht willst, dass Deine Besuche auf diese Weise gespeichert werden, kannst du <a href=\'%s\'>ein Cookie setzen</a>. Dann wird Matomo / Piwik dich auf dieser Website nicht mehr verfolgen (opt-out).';
-$a->strings['Save Settings'] = 'Einstellungen speichern';
-$a->strings['Matomo (Piwik) Base URL'] = 'Matomo-Basis-URL (Piwik-Basis-URL)';
-$a->strings['Absolute path to your Matomo (Piwik) installation. (without protocol (http/s), with trailing slash)'] = 'Absoluter Pfad zu deiner Matomo-/Piwik-Installation (ohne "http://" oder "https://"), mit abschließendem Schrägstrich';
-$a->strings['Site ID'] = 'Seiten-ID';
-$a->strings['Show opt-out cookie link?'] = 'Link zum Setzen des Opt-Out-Cookies anzeigen?';
-$a->strings['Asynchronous tracking'] = 'Asynchrones Tracking';
-$a->strings['Shortcut path to the script (\'/js/\' instead of \'/piwik.js\')'] = 'Shortcut Pfad zum Script (\'/js/\' anstelle von \'/piwik.js\')';
+;
+$a->strings["This website is tracked using the <a href='http://www.matomo.org'>Matomo</a> analytics tool."] = "Diese Website benutzt <a href='http://www.matomo.org'>Matomo</a>, eine Open Source-Software zur statistischen Auswertung der Besucherzugriffe.";
+$a->strings["If you do not want that your visits are logged in this way you <a href='%s'>can set a cookie to prevent Matomo / Piwik from tracking further visits of the site</a> (opt-out)."] = "Wenn du nicht willst, dass Deine Besuche auf diese Weise gespeichert werden, kannst du <a href='%s'>ein Cookie setzen</a>. Dann wird Matomo / Piwik dich auf dieser Website nicht mehr verfolgen (opt-out).";
+$a->strings["Save Settings"] = "Einstellungen speichern";
+$a->strings["Matomo (Piwik) Base URL"] = "Matomo (Piwiki) Basis URL";
+$a->strings["Absolute path to your Matomo (Piwik) installation. (without protocol (http/s), with trailing slash)"] = "Absoluter Pfad zu deiner Matomo (Piwik)-Installation (ohne Protokoll (http/s) und mit abschließendem Schrägstrich)";
+$a->strings["Site ID"] = "Seiten-ID";
+$a->strings["Show opt-out cookie link?"] = "Link zum Setzen des Opt-Out-Cookies anzeigen?";
+$a->strings["Asynchronous tracking"] = "Asynchrones Tracking";
+$a->strings["Settings updated."] = "Einstellungen aktualisiert.";
diff --git a/piwik/lang/en-gb/messages.po b/piwik/lang/en-gb/messages.po
index 74c95ed7..e55e1a66 100644
--- a/piwik/lang/en-gb/messages.po
+++ b/piwik/lang/en-gb/messages.po
@@ -20,13 +20,13 @@ msgstr ""
 "Language: en_GB\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: piwik.php:95
+#: piwik.php:94
 msgid ""
 "This website is tracked using the <a href='http://www.matomo.org'>Matomo</a>"
 " analytics tool."
 msgstr "This website is tracking, using the <a href='http://www.matomo.org'>Matomo</a> analytics tool."
 
-#: piwik.php:98
+#: piwik.php:97
 #, php-format
 msgid ""
 "If you do not want that your visits are logged in this way you <a "
@@ -34,36 +34,32 @@ msgid ""
 "visits of the site</a> (opt-out)."
 msgstr "If you do not want that your visits logged in this way you <a href='%s'>can set a cookie to prevent Matomo / Piwik from tracking further visits of the site</a> (opt-out)."
 
-#: piwik.php:107
+#: piwik.php:104
 msgid "Save Settings"
 msgstr "Save settings"
 
-#: piwik.php:108
+#: piwik.php:105
 msgid "Matomo (Piwik) Base URL"
 msgstr "Matomo (Piwik) Base URL"
 
-#: piwik.php:108
+#: piwik.php:105
 msgid ""
 "Absolute path to your Matomo (Piwik) installation. (without protocol "
 "(http/s), with trailing slash)"
 msgstr "Absolute path to your Matomo (Piwik) installation. (without protocol (http/s), with trailing slash)"
 
-#: piwik.php:109
+#: piwik.php:106
 msgid "Site ID"
 msgstr "Site ID"
 
-#: piwik.php:110
+#: piwik.php:107
 msgid "Show opt-out cookie link?"
 msgstr "Show opt-out cookie link?"
 
-#: piwik.php:111
+#: piwik.php:108
 msgid "Asynchronous tracking"
 msgstr "Asynchronous tracking"
 
-#: piwik.php:112
-msgid "Shortcut path to the script ('/js/' instead of '/piwik.js')"
-msgstr "Shortcut path to the script ('/js/' instead of '/piwik.js')"
-
 #: piwik.php:120
 msgid "Settings updated."
-msgstr "Settings updated."
\ No newline at end of file
+msgstr "Settings updated."
diff --git a/piwik/lang/en-gb/strings.php b/piwik/lang/en-gb/strings.php
index ab46f859..667d9218 100644
--- a/piwik/lang/en-gb/strings.php
+++ b/piwik/lang/en-gb/strings.php
@@ -3,15 +3,15 @@
 if(! function_exists("string_plural_select_en_gb")) {
 function string_plural_select_en_gb($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['This website is tracked using the <a href=\'http://www.matomo.org\'>Matomo</a> analytics tool.'] = 'This website is tracking, using the <a href=\'http://www.matomo.org\'>Matomo</a> analytics tool.';
-$a->strings['If you do not want that your visits are logged in this way you <a href=\'%s\'>can set a cookie to prevent Matomo / Piwik from tracking further visits of the site</a> (opt-out).'] = 'If you do not want that your visits logged in this way you <a href=\'%s\'>can set a cookie to prevent Matomo / Piwik from tracking further visits of the site</a> (opt-out).';
-$a->strings['Save Settings'] = 'Save settings';
-$a->strings['Matomo (Piwik) Base URL'] = 'Matomo (Piwik) Base URL';
-$a->strings['Absolute path to your Matomo (Piwik) installation. (without protocol (http/s), with trailing slash)'] = 'Absolute path to your Matomo (Piwik) installation. (without protocol (http/s), with trailing slash)';
-$a->strings['Site ID'] = 'Site ID';
-$a->strings['Show opt-out cookie link?'] = 'Show opt-out cookie link?';
-$a->strings['Asynchronous tracking'] = 'Asynchronous tracking';
-$a->strings['Shortcut path to the script (\'/js/\' instead of \'/piwik.js\')'] = 'Shortcut path to the script (\'/js/\' instead of \'/piwik.js\')';
-$a->strings['Settings updated.'] = 'Settings updated.';
+;
+$a->strings["This website is tracked using the <a href='http://www.matomo.org'>Matomo</a> analytics tool."] = "This website is tracking, using the <a href='http://www.matomo.org'>Matomo</a> analytics tool.";
+$a->strings["If you do not want that your visits are logged in this way you <a href='%s'>can set a cookie to prevent Matomo / Piwik from tracking further visits of the site</a> (opt-out)."] = "If you do not want that your visits logged in this way you <a href='%s'>can set a cookie to prevent Matomo / Piwik from tracking further visits of the site</a> (opt-out).";
+$a->strings["Save Settings"] = "Save settings";
+$a->strings["Matomo (Piwik) Base URL"] = "Matomo (Piwik) Base URL";
+$a->strings["Absolute path to your Matomo (Piwik) installation. (without protocol (http/s), with trailing slash)"] = "Absolute path to your Matomo (Piwik) installation. (without protocol (http/s), with trailing slash)";
+$a->strings["Site ID"] = "Site ID";
+$a->strings["Show opt-out cookie link?"] = "Show opt-out cookie link?";
+$a->strings["Asynchronous tracking"] = "Asynchronous tracking";
+$a->strings["Settings updated."] = "Settings updated.";
diff --git a/piwik/lang/es/messages.po b/piwik/lang/es/messages.po
index 2fb6490d..fff8cea3 100644
--- a/piwik/lang/es/messages.po
+++ b/piwik/lang/es/messages.po
@@ -4,15 +4,14 @@
 # 
 # 
 # Translators:
-# Albert, 2016
-# Senex Petrovic <javierruizo@hotmail.com>, 2021
+# Alberto Díaz <albertodiaztormo@gmail.com>, 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2021-04-06 02:00+0000\n"
-"Last-Translator: Senex Petrovic <javierruizo@hotmail.com>\n"
+"POT-Creation-Date: 2015-07-26 12:49+0200\n"
+"PO-Revision-Date: 2016-10-12 14:57+0000\n"
+"Last-Translator: Alberto Díaz <albertodiaztormo@gmail.com>\n"
 "Language-Team: Spanish (http://www.transifex.com/Friendica/friendica/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,42 +19,46 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: piwik.php:87
+#: piwik.php:79
 msgid ""
-"This website is tracked using the <a href='http://www.matomo.org'>Matomo</a>"
-" analytics tool."
-msgstr "Este sitio web se rastrea mediante la herramienta de análisis <a href='http://www.matomo.org'>Matomo</a>."
+"This website is tracked using the <a href='http://www.piwik.org'>Piwik</a> "
+"analytics tool."
+msgstr "Esta página es rastreada usando la herramienta analítica <a href='http://www.piwik.org'>Piwik</a>."
 
-#: piwik.php:90
+#: piwik.php:82
 #, php-format
 msgid ""
 "If you do not want that your visits are logged in this way you <a "
-"href='%s'>can set a cookie to prevent Matomo / Piwik from tracking further "
-"visits of the site</a> (opt-out)."
-msgstr "Si no desea que sus visitas se registren de esta manera, <a href='%s'> puede configurar una cookie para evitar que Matomo / Piwik rastree más visitas del sitio </a> (optar por no participar)."
+"href='%s'>can set a cookie to prevent Piwik from tracking further visits of "
+"the site</a> (opt-out)."
+msgstr "Si no quiere que sus visitas sean registradas puede <a href='%s'> seleccionar una cookie para evitar que Piwik rastree más visitas de la página </a> (cláusula de opción)."
 
-#: piwik.php:97
+#: piwik.php:89
 msgid "Save Settings"
 msgstr "Guardar ajustes"
 
-#: piwik.php:98
-msgid "Matomo (Piwik) Base URL"
-msgstr "Matomo (Piwik) URL Base"
+#: piwik.php:90
+msgid "Piwik Base URL"
+msgstr "URL Base de Piwik"
 
-#: piwik.php:98
+#: piwik.php:90
 msgid ""
-"Absolute path to your Matomo (Piwik) installation. (without protocol "
-"(http/s), with trailing slash)"
-msgstr "Ruta absoluta a su instalación de Matomo (Piwik). (sin protocolo (http/s), con barra diagonal al final)"
+"Absolute path to your Piwik installation. (without protocol (http/s), with "
+"trailing slash)"
+msgstr "Camino a la instalación de su Piwik. (sin protocolo (http/s), con corte de cola)"
 
-#: piwik.php:99
+#: piwik.php:91
 msgid "Site ID"
 msgstr "ID de la página"
 
-#: piwik.php:100
+#: piwik.php:92
 msgid "Show opt-out cookie link?"
 msgstr "Mostrar enlace a cláusula de opción de cookie"
 
-#: piwik.php:101
+#: piwik.php:93
 msgid "Asynchronous tracking"
 msgstr "Rastreo asíncrono"
+
+#: piwik.php:105
+msgid "Settings updated."
+msgstr "Ajustes actualizados"
diff --git a/piwik/lang/es/strings.php b/piwik/lang/es/strings.php
index f29f9e8d..96a61a4a 100644
--- a/piwik/lang/es/strings.php
+++ b/piwik/lang/es/strings.php
@@ -2,14 +2,15 @@
 
 if(! function_exists("string_plural_select_es")) {
 function string_plural_select_es($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['This website is tracked using the <a href=\'http://www.matomo.org\'>Matomo</a> analytics tool.'] = 'Este sitio web se rastrea mediante la herramienta de análisis <a href=\'http://www.matomo.org\'>Matomo</a>.';
-$a->strings['If you do not want that your visits are logged in this way you <a href=\'%s\'>can set a cookie to prevent Matomo / Piwik from tracking further visits of the site</a> (opt-out).'] = 'Si no desea que sus visitas se registren de esta manera, <a href=\'%s\'> puede configurar una cookie para evitar que Matomo / Piwik rastree más visitas del sitio </a> (optar por no participar).';
-$a->strings['Save Settings'] = 'Guardar ajustes';
-$a->strings['Matomo (Piwik) Base URL'] = 'Matomo (Piwik) URL Base';
-$a->strings['Absolute path to your Matomo (Piwik) installation. (without protocol (http/s), with trailing slash)'] = 'Ruta absoluta a su instalación de Matomo (Piwik). (sin protocolo (http/s), con barra diagonal al final)';
-$a->strings['Site ID'] = 'ID de la página';
-$a->strings['Show opt-out cookie link?'] = 'Mostrar enlace a cláusula de opción de cookie';
-$a->strings['Asynchronous tracking'] = 'Rastreo asíncrono';
+;
+$a->strings["This website is tracked using the <a href='http://www.piwik.org'>Piwik</a> analytics tool."] = "Esta página es rastreada usando la herramienta analítica <a href='http://www.piwik.org'>Piwik</a>.";
+$a->strings["If you do not want that your visits are logged in this way you <a href='%s'>can set a cookie to prevent Piwik from tracking further visits of the site</a> (opt-out)."] = "Si no quiere que sus visitas sean registradas puede <a href='%s'> seleccionar una cookie para evitar que Piwik rastree más visitas de la página </a> (cláusula de opción).";
+$a->strings["Save Settings"] = "Guardar ajustes";
+$a->strings["Piwik Base URL"] = "URL Base de Piwik";
+$a->strings["Absolute path to your Piwik installation. (without protocol (http/s), with trailing slash)"] = "Camino a la instalación de su Piwik. (sin protocolo (http/s), con corte de cola)";
+$a->strings["Site ID"] = "ID de la página";
+$a->strings["Show opt-out cookie link?"] = "Mostrar enlace a cláusula de opción de cookie";
+$a->strings["Asynchronous tracking"] = "Rastreo asíncrono";
+$a->strings["Settings updated."] = "Ajustes actualizados";
diff --git a/piwik/lang/fi-fi/strings.php b/piwik/lang/fi-fi/strings.php
index 666828ba..8e5278c3 100644
--- a/piwik/lang/fi-fi/strings.php
+++ b/piwik/lang/fi-fi/strings.php
@@ -2,9 +2,15 @@
 
 if(! function_exists("string_plural_select_fi_fi")) {
 function string_plural_select_fi_fi($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Save Settings'] = 'Tallenna asetukset';
-$a->strings['Asynchronous tracking'] = 'Asynkroninen seuranta';
-$a->strings['Settings updated.'] = 'Asetukset päivitetty.';
+;
+$a->strings["This website is tracked using the <a href='http://www.piwik.org'>Piwik</a> analytics tool."] = "";
+$a->strings["If you do not want that your visits are logged in this way you <a href='%s'>can set a cookie to prevent Piwik from tracking further visits of the site</a> (opt-out)."] = "";
+$a->strings["Save Settings"] = "Tallenna asetukset";
+$a->strings["Piwik Base URL"] = "";
+$a->strings["Absolute path to your Piwik installation. (without protocol (http/s), with trailing slash)"] = "";
+$a->strings["Site ID"] = "";
+$a->strings["Show opt-out cookie link?"] = "";
+$a->strings["Asynchronous tracking"] = "Asynkroninen seuranta";
+$a->strings["Settings updated."] = "Asetukset päivitetty.";
diff --git a/piwik/lang/fr/messages.po b/piwik/lang/fr/messages.po
index b8bf84ce..7a4bf703 100644
--- a/piwik/lang/fr/messages.po
+++ b/piwik/lang/fr/messages.po
@@ -4,65 +4,62 @@
 # 
 # 
 # Translators:
-# Florent C., 2023
-# Hypolite Petovan <hypolite@mrpetovan.com>, 2022
-# Nicolas Derive, 2022
-# ea1cd8241cb389ffb6f92bc6891eff5d_dc12308 <70dced5587d47e18d88f9298024d96f8_93383>, 2015
+# Nicola Spanti <translations@nicola-spanti.info>, 2015
 # StefOfficiel <pichard.stephane@free.fr>, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-05-01 07:39+0200\n"
-"PO-Revision-Date: 2014-06-23 11:18+0000\n"
-"Last-Translator: Florent C., 2023\n"
-"Language-Team: French (http://app.transifex.com/Friendica/friendica/language/fr/)\n"
+"POT-Creation-Date: 2015-07-26 12:49+0200\n"
+"PO-Revision-Date: 2015-08-30 17:16+0000\n"
+"Last-Translator: Nicola Spanti <translations@nicola-spanti.info>\n"
+"Language-Team: French (http://www.transifex.com/Friendica/friendica/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fr\n"
-"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: piwik.php:96
+#: piwik.php:79
 msgid ""
-"This website is tracked using the <a href='http://www.matomo.org'>Matomo</a>"
-" analytics tool."
-msgstr "Ce site Internet utilise <a href='http://www.matomo.org'>Matomo</a> pour mesurer son audience."
+"This website is tracked using the <a href='http://www.piwik.org'>Piwik</a> "
+"analytics tool."
+msgstr "Ce site web utilise <a href='http://www.piwik.org'>Piwik</a> en tant qu'outil d'analyses."
 
-#: piwik.php:99
+#: piwik.php:82
 #, php-format
 msgid ""
 "If you do not want that your visits are logged in this way you <a "
-"href='%s'>can set a cookie to prevent Matomo / Piwik from tracking further "
-"visits of the site</a> (opt-out)."
-msgstr "Si vous ne désirez pas que vos visites soient journalisées de cette manière, vous <a href='%s'>pouvez définir un cookie pour empêcher Matomo/Piwik de surveiller de prochaines visites sur le site</a> (opt-out)"
+"href='%s'>can set a cookie to prevent Piwik from tracking further visits of "
+"the site</a> (opt-out)."
+msgstr ""
 
-#: piwik.php:108
+#: piwik.php:89
 msgid "Save Settings"
 msgstr "Sauvegarder les paramètres"
 
-#: piwik.php:109
-msgid "Matomo (Piwik) Base URL"
-msgstr "URL de base de Matomo (Piwik)"
+#: piwik.php:90
+msgid "Piwik Base URL"
+msgstr "URL de base de Piwik"
 
-#: piwik.php:109
+#: piwik.php:90
 msgid ""
-"Absolute path to your Matomo (Piwik) installation. (without protocol "
-"(http/s), with trailing slash)"
-msgstr "Chemin absolu vers votre installation Matomo (Piwik) (sans protocole (http/s), avec un slash à la fin)."
+"Absolute path to your Piwik installation. (without protocol (http/s), with "
+"trailing slash)"
+msgstr ""
 
-#: piwik.php:110
+#: piwik.php:91
 msgid "Site ID"
 msgstr "ID du site"
 
-#: piwik.php:111
+#: piwik.php:92
 msgid "Show opt-out cookie link?"
 msgstr "Montrer le lien d'opt-out pour les cookies ?"
 
-#: piwik.php:112
+#: piwik.php:93
 msgid "Asynchronous tracking"
 msgstr "Suivi asynchrone"
 
-#: piwik.php:113
-msgid "Shortcut path to the script ('/js/' instead of '/piwik.js')"
-msgstr "Chemin réduit vers le script ('/js/' au lieu de '/piwik.js') "
+#: piwik.php:105
+msgid "Settings updated."
+msgstr "Paramètres mis à jour."
diff --git a/piwik/lang/fr/strings.php b/piwik/lang/fr/strings.php
index 3c150e01..a62c77ea 100644
--- a/piwik/lang/fr/strings.php
+++ b/piwik/lang/fr/strings.php
@@ -2,15 +2,15 @@
 
 if(! function_exists("string_plural_select_fr")) {
 function string_plural_select_fr($n){
-	$n = intval($n);
-	if (($n == 0 || $n == 1)) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
+	return ($n > 1);;
 }}
-$a->strings['This website is tracked using the <a href=\'http://www.matomo.org\'>Matomo</a> analytics tool.'] = 'Ce site Internet utilise <a href=\'http://www.matomo.org\'>Matomo</a> pour mesurer son audience.';
-$a->strings['If you do not want that your visits are logged in this way you <a href=\'%s\'>can set a cookie to prevent Matomo / Piwik from tracking further visits of the site</a> (opt-out).'] = 'Si vous ne désirez pas que vos visites soient journalisées de cette manière, vous <a href=\'%s\'>pouvez définir un cookie pour empêcher Matomo/Piwik de surveiller de prochaines visites sur le site</a> (opt-out)';
-$a->strings['Save Settings'] = 'Sauvegarder les paramètres';
-$a->strings['Matomo (Piwik) Base URL'] = 'URL de base de Matomo (Piwik)';
-$a->strings['Absolute path to your Matomo (Piwik) installation. (without protocol (http/s), with trailing slash)'] = 'Chemin absolu vers votre installation Matomo (Piwik) (sans protocole (http/s), avec un slash à la fin).';
-$a->strings['Site ID'] = 'ID du site';
-$a->strings['Show opt-out cookie link?'] = 'Montrer le lien d\'opt-out pour les cookies ?';
-$a->strings['Asynchronous tracking'] = 'Suivi asynchrone';
-$a->strings['Shortcut path to the script (\'/js/\' instead of \'/piwik.js\')'] = 'Chemin réduit vers le script (\'/js/\' au lieu de \'/piwik.js\') ';
+;
+$a->strings["This website is tracked using the <a href='http://www.piwik.org'>Piwik</a> analytics tool."] = "Ce site web utilise <a href='http://www.piwik.org'>Piwik</a> en tant qu'outil d'analyses.";
+$a->strings["If you do not want that your visits are logged in this way you <a href='%s'>can set a cookie to prevent Piwik from tracking further visits of the site</a> (opt-out)."] = "";
+$a->strings["Save Settings"] = "Sauvegarder les paramètres";
+$a->strings["Piwik Base URL"] = "URL de base de Piwik";
+$a->strings["Absolute path to your Piwik installation. (without protocol (http/s), with trailing slash)"] = "";
+$a->strings["Site ID"] = "ID du site";
+$a->strings["Show opt-out cookie link?"] = "Montrer le lien d'opt-out pour les cookies ?";
+$a->strings["Asynchronous tracking"] = "Suivi asynchrone";
+$a->strings["Settings updated."] = "Paramètres mis à jour.";
diff --git a/piwik/lang/hu/messages.po b/piwik/lang/hu/messages.po
deleted file mode 100644
index 62644161..00000000
--- a/piwik/lang/hu/messages.po
+++ /dev/null
@@ -1,64 +0,0 @@
-# ADDON piwik
-# Copyright (C)
-# This file is distributed under the same license as the Friendica piwik addon package.
-# 
-# 
-# Translators:
-# Balázs Úr, 2020-2021,2023
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-05-01 07:39+0200\n"
-"PO-Revision-Date: 2014-06-23 11:18+0000\n"
-"Last-Translator: Balázs Úr, 2020-2021,2023\n"
-"Language-Team: Hungarian (http://app.transifex.com/Friendica/friendica/language/hu/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: hu\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: piwik.php:96
-msgid ""
-"This website is tracked using the <a href='http://www.matomo.org'>Matomo</a>"
-" analytics tool."
-msgstr "Ez a weboldal a <a href='http://www.matomo.org'>Matomo</a> analitikai eszköz használatával van követve."
-
-#: piwik.php:99
-#, php-format
-msgid ""
-"If you do not want that your visits are logged in this way you <a "
-"href='%s'>can set a cookie to prevent Matomo / Piwik from tracking further "
-"visits of the site</a> (opt-out)."
-msgstr "Ha nem szeretné, hogy a látogatásai ilyen módon naplózva legyenek, akkor <a href='%s'>beállíthat egy sütit annak megakadályozásához, hogy a Matomo vagy a Piwik kövesse az oldal további meglátogatásait</a> (lemondás)."
-
-#: piwik.php:108
-msgid "Save Settings"
-msgstr "Beállítások mentése"
-
-#: piwik.php:109
-msgid "Matomo (Piwik) Base URL"
-msgstr "Matomo (Piwik) alap URL"
-
-#: piwik.php:109
-msgid ""
-"Absolute path to your Matomo (Piwik) installation. (without protocol "
-"(http/s), with trailing slash)"
-msgstr "Abszolút útvonal a Matomo (Piwik) telepítéséhez (http vagy https protokoll nélkül, de lezáró perjellel)."
-
-#: piwik.php:110
-msgid "Site ID"
-msgstr "Oldalazonosító"
-
-#: piwik.php:111
-msgid "Show opt-out cookie link?"
-msgstr "Megjeleníti a lemondó süti hivatkozását?"
-
-#: piwik.php:112
-msgid "Asynchronous tracking"
-msgstr "Aszinkron követés"
-
-#: piwik.php:113
-msgid "Shortcut path to the script ('/js/' instead of '/piwik.js')"
-msgstr "A parancsfájl rövidített útvonala („/js/” a „/piwik.js” helyett)"
diff --git a/piwik/lang/hu/strings.php b/piwik/lang/hu/strings.php
deleted file mode 100644
index 4b249396..00000000
--- a/piwik/lang/hu/strings.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_hu")) {
-function string_plural_select_hu($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['This website is tracked using the <a href=\'http://www.matomo.org\'>Matomo</a> analytics tool.'] = 'Ez a weboldal a <a href=\'http://www.matomo.org\'>Matomo</a> analitikai eszköz használatával van követve.';
-$a->strings['If you do not want that your visits are logged in this way you <a href=\'%s\'>can set a cookie to prevent Matomo / Piwik from tracking further visits of the site</a> (opt-out).'] = 'Ha nem szeretné, hogy a látogatásai ilyen módon naplózva legyenek, akkor <a href=\'%s\'>beállíthat egy sütit annak megakadályozásához, hogy a Matomo vagy a Piwik kövesse az oldal további meglátogatásait</a> (lemondás).';
-$a->strings['Save Settings'] = 'Beállítások mentése';
-$a->strings['Matomo (Piwik) Base URL'] = 'Matomo (Piwik) alap URL';
-$a->strings['Absolute path to your Matomo (Piwik) installation. (without protocol (http/s), with trailing slash)'] = 'Abszolút útvonal a Matomo (Piwik) telepítéséhez (http vagy https protokoll nélkül, de lezáró perjellel).';
-$a->strings['Site ID'] = 'Oldalazonosító';
-$a->strings['Show opt-out cookie link?'] = 'Megjeleníti a lemondó süti hivatkozását?';
-$a->strings['Asynchronous tracking'] = 'Aszinkron követés';
-$a->strings['Shortcut path to the script (\'/js/\' instead of \'/piwik.js\')'] = 'A parancsfájl rövidített útvonala („/js/” a „/piwik.js” helyett)';
diff --git a/piwik/lang/it/messages.po b/piwik/lang/it/messages.po
index f169f383..e7a070b1 100644
--- a/piwik/lang/it/messages.po
+++ b/piwik/lang/it/messages.po
@@ -5,28 +5,27 @@
 # 
 # Translators:
 # fabrixxm <fabrix.xm@gmail.com>, 2014-2015,2019
-# Sylke Vicious <silkevicious@gmail.com>, 2020
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2014-06-23 11:18+0000\n"
-"Last-Translator: Sylke Vicious <silkevicious@gmail.com>, 2020\n"
-"Language-Team: Italian (http://app.transifex.com/Friendica/friendica/language/it/)\n"
+"POT-Creation-Date: 2019-02-19 10:42+0100\n"
+"PO-Revision-Date: 2019-03-11 14:19+0000\n"
+"Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n"
+"Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: it\n"
-"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: piwik.php:87
+#: piwik.php:94
 msgid ""
 "This website is tracked using the <a href='http://www.matomo.org'>Matomo</a>"
 " analytics tool."
 msgstr "Questo sito è monitorato con lo strumento di analisi <a href='http://www.matomo.org'>Matomo</a>."
 
-#: piwik.php:90
+#: piwik.php:97
 #, php-format
 msgid ""
 "If you do not want that your visits are logged in this way you <a "
@@ -34,28 +33,32 @@ msgid ""
 "visits of the site</a> (opt-out)."
 msgstr "Se non vuoi che le tue visite vengano registrate in questo modo è  possibile <a href='%s'>impostare un cookie per evitare che Matomo / Piwik rintracci ulteriori visite del sito</a> (opt-out)."
 
-#: piwik.php:97
+#: piwik.php:104
 msgid "Save Settings"
 msgstr "Salva Impostazioni"
 
-#: piwik.php:98
+#: piwik.php:105
 msgid "Matomo (Piwik) Base URL"
 msgstr "Indirizzo di base di Matomo (Piwik)"
 
-#: piwik.php:98
+#: piwik.php:105
 msgid ""
 "Absolute path to your Matomo (Piwik) installation. (without protocol "
 "(http/s), with trailing slash)"
 msgstr "Percorso assoluto alla tua installazione di Matomo (Piwik) (senza il protocollo (http/https), con la barra alla fine)"
 
-#: piwik.php:99
+#: piwik.php:106
 msgid "Site ID"
 msgstr "ID del sito"
 
-#: piwik.php:100
+#: piwik.php:107
 msgid "Show opt-out cookie link?"
-msgstr "Mostra il collegamento per l'opt-out dei cookie?"
+msgstr "Mostra il link per il cookie opt-out?"
 
-#: piwik.php:101
+#: piwik.php:108
 msgid "Asynchronous tracking"
 msgstr "Tracciamento asincrono"
+
+#: piwik.php:120
+msgid "Settings updated."
+msgstr "Impostazioni aggiornate."
diff --git a/piwik/lang/it/strings.php b/piwik/lang/it/strings.php
index 0080af7e..0fc1c763 100644
--- a/piwik/lang/it/strings.php
+++ b/piwik/lang/it/strings.php
@@ -3,13 +3,15 @@
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
 	$n = intval($n);
-	if ($n == 1) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
+	return ($n != 1);;
 }}
-$a->strings['This website is tracked using the <a href=\'http://www.matomo.org\'>Matomo</a> analytics tool.'] = 'Questo sito è monitorato con lo strumento di analisi <a href=\'http://www.matomo.org\'>Matomo</a>.';
-$a->strings['If you do not want that your visits are logged in this way you <a href=\'%s\'>can set a cookie to prevent Matomo / Piwik from tracking further visits of the site</a> (opt-out).'] = 'Se non vuoi che le tue visite vengano registrate in questo modo è  possibile <a href=\'%s\'>impostare un cookie per evitare che Matomo / Piwik rintracci ulteriori visite del sito</a> (opt-out).';
-$a->strings['Save Settings'] = 'Salva Impostazioni';
-$a->strings['Matomo (Piwik) Base URL'] = 'Indirizzo di base di Matomo (Piwik)';
-$a->strings['Absolute path to your Matomo (Piwik) installation. (without protocol (http/s), with trailing slash)'] = 'Percorso assoluto alla tua installazione di Matomo (Piwik) (senza il protocollo (http/https), con la barra alla fine)';
-$a->strings['Site ID'] = 'ID del sito';
-$a->strings['Show opt-out cookie link?'] = 'Mostra il collegamento per l\'opt-out dei cookie?';
-$a->strings['Asynchronous tracking'] = 'Tracciamento asincrono';
+;
+$a->strings["This website is tracked using the <a href='http://www.matomo.org'>Matomo</a> analytics tool."] = "Questo sito è monitorato con lo strumento di analisi <a href='http://www.matomo.org'>Matomo</a>.";
+$a->strings["If you do not want that your visits are logged in this way you <a href='%s'>can set a cookie to prevent Matomo / Piwik from tracking further visits of the site</a> (opt-out)."] = "Se non vuoi che le tue visite vengano registrate in questo modo è  possibile <a href='%s'>impostare un cookie per evitare che Matomo / Piwik rintracci ulteriori visite del sito</a> (opt-out).";
+$a->strings["Save Settings"] = "Salva Impostazioni";
+$a->strings["Matomo (Piwik) Base URL"] = "Indirizzo di base di Matomo (Piwik)";
+$a->strings["Absolute path to your Matomo (Piwik) installation. (without protocol (http/s), with trailing slash)"] = "Percorso assoluto alla tua installazione di Matomo (Piwik) (senza il protocollo (http/https), con la barra alla fine)";
+$a->strings["Site ID"] = "ID del sito";
+$a->strings["Show opt-out cookie link?"] = "Mostra il link per il cookie opt-out?";
+$a->strings["Asynchronous tracking"] = "Tracciamento asincrono";
+$a->strings["Settings updated."] = "Impostazioni aggiornate.";
diff --git a/piwik/lang/nl/strings.php b/piwik/lang/nl/strings.php
index 02310f01..c0a7cecc 100644
--- a/piwik/lang/nl/strings.php
+++ b/piwik/lang/nl/strings.php
@@ -3,8 +3,15 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['This website is tracked using the <a href=\'http://www.piwik.org\'>Piwik</a> analytics tool.'] = 'Deze website word gevolgd door <a href=\'http://www.piwik.org\'>Piwik</a> analytics';
-$a->strings['Save Settings'] = 'Instellingen opslaan';
-$a->strings['Settings updated.'] = 'Instellingen opgeslagen';
+;
+$a->strings["This website is tracked using the <a href='http://www.piwik.org'>Piwik</a> analytics tool."] = "Deze website word gevolgd door <a href='http://www.piwik.org'>Piwik</a> analytics";
+$a->strings["If you do not want that your visits are logged in this way you <a href='%s'>can set a cookie to prevent Piwik from tracking further visits of the site</a> (opt-out)."] = "";
+$a->strings["Save Settings"] = "Instellingen opslaan";
+$a->strings["Piwik Base URL"] = "";
+$a->strings["Absolute path to your Piwik installation. (without protocol (http/s), with trailing slash)"] = "";
+$a->strings["Site ID"] = "";
+$a->strings["Show opt-out cookie link?"] = "";
+$a->strings["Asynchronous tracking"] = "";
+$a->strings["Settings updated."] = "Instellingen opgeslagen";
diff --git a/piwik/lang/pl/messages.po b/piwik/lang/pl/messages.po
index dffb568c..6226c4bc 100644
--- a/piwik/lang/pl/messages.po
+++ b/piwik/lang/pl/messages.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2014-06-23 11:18+0000\n"
-"Last-Translator: Waldemar Stoczkowski, 2018-2019\n"
+"POT-Creation-Date: 2019-02-19 10:42+0100\n"
+"PO-Revision-Date: 2019-03-07 19:29+0000\n"
+"Last-Translator: Waldemar Stoczkowski\n"
 "Language-Team: Polish (http://www.transifex.com/Friendica/friendica/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,13 +19,13 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
-#: piwik.php:87
+#: piwik.php:94
 msgid ""
 "This website is tracked using the <a href='http://www.matomo.org'>Matomo</a>"
 " analytics tool."
 msgstr "Ta strona internetowa jest śledzona za pomocą narzędzia analitycznego <a href='http://www.matomo.org'>Matomo</a>."
 
-#: piwik.php:90
+#: piwik.php:97
 #, php-format
 msgid ""
 "If you do not want that your visits are logged in this way you <a "
@@ -33,28 +33,32 @@ msgid ""
 "visits of the site</a> (opt-out)."
 msgstr "Jeśli nie chcesz, aby twoje wizyty były rejestrowane w ten sposób, <a href='%s'>możesz ustawić plik cookie, aby uniemożliwić Matomo / Piwik śledzenie dalszych wizyt w witrynie</a> (rezygnacja)."
 
-#: piwik.php:97
+#: piwik.php:104
 msgid "Save Settings"
 msgstr "Zapisz ustawienia"
 
-#: piwik.php:98
+#: piwik.php:105
 msgid "Matomo (Piwik) Base URL"
 msgstr "Podstawowy adres URL Matomo (Piwik)"
 
-#: piwik.php:98
+#: piwik.php:105
 msgid ""
 "Absolute path to your Matomo (Piwik) installation. (without protocol "
 "(http/s), with trailing slash)"
 msgstr "Ścieżka bezwzględna do instalacji Matomo (Piwik). (bez protokołu (http/s), z ukośnikiem)"
 
-#: piwik.php:99
+#: piwik.php:106
 msgid "Site ID"
 msgstr "Identyfikator ID witryny"
 
-#: piwik.php:100
+#: piwik.php:107
 msgid "Show opt-out cookie link?"
 msgstr "Pokazać link do rezygnacji z plików cookie?"
 
-#: piwik.php:101
+#: piwik.php:108
 msgid "Asynchronous tracking"
 msgstr "Śledzenie asynchroniczne"
+
+#: piwik.php:120
+msgid "Settings updated."
+msgstr "Zaktualizowano ustawienia."
diff --git a/piwik/lang/pl/strings.php b/piwik/lang/pl/strings.php
index c00a5966..0a05fc1c 100644
--- a/piwik/lang/pl/strings.php
+++ b/piwik/lang/pl/strings.php
@@ -3,13 +3,15 @@
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
 	$n = intval($n);
-	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
+	return ($n==1 ? 0 : ($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14) ? 1 : $n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14) ? 2 : 3);;
 }}
-$a->strings['This website is tracked using the <a href=\'http://www.matomo.org\'>Matomo</a> analytics tool.'] = 'Ta strona internetowa jest śledzona za pomocą narzędzia analitycznego <a href=\'http://www.matomo.org\'>Matomo</a>.';
-$a->strings['If you do not want that your visits are logged in this way you <a href=\'%s\'>can set a cookie to prevent Matomo / Piwik from tracking further visits of the site</a> (opt-out).'] = 'Jeśli nie chcesz, aby twoje wizyty były rejestrowane w ten sposób, <a href=\'%s\'>możesz ustawić plik cookie, aby uniemożliwić Matomo / Piwik śledzenie dalszych wizyt w witrynie</a> (rezygnacja).';
-$a->strings['Save Settings'] = 'Zapisz ustawienia';
-$a->strings['Matomo (Piwik) Base URL'] = 'Podstawowy adres URL Matomo (Piwik)';
-$a->strings['Absolute path to your Matomo (Piwik) installation. (without protocol (http/s), with trailing slash)'] = 'Ścieżka bezwzględna do instalacji Matomo (Piwik). (bez protokołu (http/s), z ukośnikiem)';
-$a->strings['Site ID'] = 'Identyfikator ID witryny';
-$a->strings['Show opt-out cookie link?'] = 'Pokazać link do rezygnacji z plików cookie?';
-$a->strings['Asynchronous tracking'] = 'Śledzenie asynchroniczne';
+;
+$a->strings["This website is tracked using the <a href='http://www.matomo.org'>Matomo</a> analytics tool."] = "Ta strona internetowa jest śledzona za pomocą narzędzia analitycznego <a href='http://www.matomo.org'>Matomo</a>.";
+$a->strings["If you do not want that your visits are logged in this way you <a href='%s'>can set a cookie to prevent Matomo / Piwik from tracking further visits of the site</a> (opt-out)."] = "Jeśli nie chcesz, aby twoje wizyty były rejestrowane w ten sposób, <a href='%s'>możesz ustawić plik cookie, aby uniemożliwić Matomo / Piwik śledzenie dalszych wizyt w witrynie</a> (rezygnacja).";
+$a->strings["Save Settings"] = "Zapisz ustawienia";
+$a->strings["Matomo (Piwik) Base URL"] = "Podstawowy adres URL Matomo (Piwik)";
+$a->strings["Absolute path to your Matomo (Piwik) installation. (without protocol (http/s), with trailing slash)"] = "Ścieżka bezwzględna do instalacji Matomo (Piwik). (bez protokołu (http/s), z ukośnikiem)";
+$a->strings["Site ID"] = "Identyfikator ID witryny";
+$a->strings["Show opt-out cookie link?"] = "Pokazać link do rezygnacji z plików cookie?";
+$a->strings["Asynchronous tracking"] = "Śledzenie asynchroniczne";
+$a->strings["Settings updated."] = "Zaktualizowano ustawienia.";
diff --git a/piwik/lang/ro/strings.php b/piwik/lang/ro/strings.php
index 3eaefd52..7b3f04b1 100644
--- a/piwik/lang/ro/strings.php
+++ b/piwik/lang/ro/strings.php
@@ -2,15 +2,15 @@
 
 if(! function_exists("string_plural_select_ro")) {
 function string_plural_select_ro($n){
-	$n = intval($n);
-	if ($n==1) { return 0; } else if ((($n%100>19)||(($n%100==0)&&($n!=0)))) { return 2; } else  { return 1; }
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
 }}
-$a->strings['This website is tracked using the <a href=\'http://www.piwik.org\'>Piwik</a> analytics tool.'] = 'Acest site web este contorizat folosind instrumentul analitic <a href=\'http://www.piwik.org\'>Piwik</a>.';
-$a->strings['If you do not want that your visits are logged this way you <a href=\'%s\'>can set a cookie to prevent Piwik from tracking further visits of the site</a> (opt-out).'] = 'Dacă nu doriți ca vizitele dumneavoastră să fie înregistrate în acest mod,<a href=\'%s\'> puteți stabili un cookie pentru a împiedica Piwik să vă contorizeze viitoarele vizite pe site</a> (renunțare la opțiune).';
-$a->strings['Submit'] = 'Trimite';
-$a->strings['Piwik Base URL'] = 'Adresa URL de Bază Piwik';
-$a->strings['Absolute path to your Piwik installation. (without protocol (http/s), with trailing slash)'] = 'Calea absolută către locația de instalare Piwik. (fără protocolul (http/s), urmată de slash-uri)';
-$a->strings['Site ID'] = 'ID Site';
-$a->strings['Show opt-out cookie link?'] = 'Se afișează legătura cookie de renunțare la opțiune?';
-$a->strings['Asynchronous tracking'] = 'Contorizare asincronă';
-$a->strings['Settings updated.'] = 'Configurări actualizate.';
+;
+$a->strings["This website is tracked using the <a href='http://www.piwik.org'>Piwik</a> analytics tool."] = "Acest site web este contorizat folosind instrumentul analitic <a href='http://www.piwik.org'>Piwik</a>.";
+$a->strings["If you do not want that your visits are logged this way you <a href='%s'>can set a cookie to prevent Piwik from tracking further visits of the site</a> (opt-out)."] = "Dacă nu doriți ca vizitele dumneavoastră să fie înregistrate în acest mod,<a href='%s'> puteți stabili un cookie pentru a împiedica Piwik să vă contorizeze viitoarele vizite pe site</a> (renunțare la opțiune).";
+$a->strings["Submit"] = "Trimite";
+$a->strings["Piwik Base URL"] = "Adresa URL de Bază Piwik";
+$a->strings["Absolute path to your Piwik installation. (without protocol (http/s), with trailing slash)"] = "Calea absolută către locația de instalare Piwik. (fără protocolul (http/s), urmată de slash-uri)";
+$a->strings["Site ID"] = "ID Site";
+$a->strings["Show opt-out cookie link?"] = "Se afișează legătura cookie de renunțare la opțiune?";
+$a->strings["Asynchronous tracking"] = "Contorizare asincronă";
+$a->strings["Settings updated."] = "Configurări actualizate.";
diff --git a/piwik/lang/ru/strings.php b/piwik/lang/ru/strings.php
index 74ad22a5..8f58ef45 100644
--- a/piwik/lang/ru/strings.php
+++ b/piwik/lang/ru/strings.php
@@ -9,4 +9,3 @@ $a->strings["Site ID"] = "ID сайта";
 $a->strings["Show opt-out cookie link?"] = "Показать ссылку opt-out cookie?";
 $a->strings["Asynchronous tracking"] = "Асинхронное отслеживание";
 $a->strings["Settings updated."] = "Настройки обновлены.";
-$a->strings["Shortcut path to the script ('/js/' instead of '/piwik.js')"] = "Сокращенный путь к скрипту ('/js/' вместо '/piwik.js')";
\ No newline at end of file
diff --git a/piwik/lang/sv/messages.po b/piwik/lang/sv/messages.po
deleted file mode 100644
index 073c51f1..00000000
--- a/piwik/lang/sv/messages.po
+++ /dev/null
@@ -1,61 +0,0 @@
-# ADDON piwik
-# Copyright (C)
-# This file is distributed under the same license as the Friendica piwik addon package.
-# 
-# 
-# Translators:
-# Hypolite Petovan <hypolite@mrpetovan.com>, 2019
-# Kristoffer Grundström <lovaren@gmail.com>, 2022
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2022-01-16 01:06+0000\n"
-"Last-Translator: Kristoffer Grundström <lovaren@gmail.com>\n"
-"Language-Team: Swedish (http://www.transifex.com/Friendica/friendica/language/sv/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: sv\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: piwik.php:87
-msgid ""
-"This website is tracked using the <a href='http://www.matomo.org'>Matomo</a>"
-" analytics tool."
-msgstr ""
-
-#: piwik.php:90
-#, php-format
-msgid ""
-"If you do not want that your visits are logged in this way you <a "
-"href='%s'>can set a cookie to prevent Matomo / Piwik from tracking further "
-"visits of the site</a> (opt-out)."
-msgstr ""
-
-#: piwik.php:97
-msgid "Save Settings"
-msgstr "Spara inställningar"
-
-#: piwik.php:98
-msgid "Matomo (Piwik) Base URL"
-msgstr ""
-
-#: piwik.php:98
-msgid ""
-"Absolute path to your Matomo (Piwik) installation. (without protocol "
-"(http/s), with trailing slash)"
-msgstr ""
-
-#: piwik.php:99
-msgid "Site ID"
-msgstr ""
-
-#: piwik.php:100
-msgid "Show opt-out cookie link?"
-msgstr ""
-
-#: piwik.php:101
-msgid "Asynchronous tracking"
-msgstr ""
diff --git a/piwik/lang/sv/strings.php b/piwik/lang/sv/strings.php
index 21e4e59f..dcd4e821 100644
--- a/piwik/lang/sv/strings.php
+++ b/piwik/lang/sv/strings.php
@@ -1,8 +1,4 @@
-<?php
-
-if(! function_exists("string_plural_select_sv")) {
-function string_plural_select_sv($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Save Settings'] = 'Spara inställningar';
+<?php
+
+$a->strings["Submit"] = "Spara";
+$a->strings["Settings updated."] = "Inst&auml;llningarna har uppdaterats.";
diff --git a/piwik/lang/zh-cn/strings.php b/piwik/lang/zh-cn/strings.php
index 41795595..ad99b364 100644
--- a/piwik/lang/zh-cn/strings.php
+++ b/piwik/lang/zh-cn/strings.php
@@ -2,10 +2,15 @@
 
 if(! function_exists("string_plural_select_zh_cn")) {
 function string_plural_select_zh_cn($n){
-	$n = intval($n);
-	return intval(0);
+	return 0;;
 }}
-$a->strings['This website is tracked using the <a href=\'http://www.piwik.org\'>Piwik</a> analytics tool.'] = '此网站用 <a href=\'http://www.piwik.org\'>Piwik</a> 追踪分析工具。';
-$a->strings['Save Settings'] = '保存设置';
-$a->strings['Asynchronous tracking'] = '异步追踪';
-$a->strings['Settings updated.'] = '设置已更新。';
+;
+$a->strings["This website is tracked using the <a href='http://www.piwik.org'>Piwik</a> analytics tool."] = "此网站用 <a href='http://www.piwik.org'>Piwik</a> 追踪分析工具。";
+$a->strings["If you do not want that your visits are logged in this way you <a href='%s'>can set a cookie to prevent Piwik from tracking further visits of the site</a> (opt-out)."] = "";
+$a->strings["Save Settings"] = "保存设置";
+$a->strings["Piwik Base URL"] = "";
+$a->strings["Absolute path to your Piwik installation. (without protocol (http/s), with trailing slash)"] = "";
+$a->strings["Site ID"] = "";
+$a->strings["Show opt-out cookie link?"] = "";
+$a->strings["Asynchronous tracking"] = "异步追踪";
+$a->strings["Settings updated."] = "设置已更新。";
diff --git a/piwik/piwik.php b/piwik/piwik.php
index fd6d5fc9..cd41ad7b 100644
--- a/piwik/piwik.php
+++ b/piwik/piwik.php
@@ -16,18 +16,14 @@
  *
  *   Configuration:
  *     Use the administration panel to configure the Piwik tracking addon, or
- *     in case you don't use this, add the following lines to your config/piwik.config.php
+ *     in case you don't use this add the following lines to your config/addon.config.php
  *     file:
  *
- *      return [
- *          'piwik' => [
- *              'baseurl' => '',
- *              'sideid' => '',
- *              'optout' => true,
- *              'async' => false,
- *              'shortendpoint' => false,
- *          ],
- *      ];
+ *     [piwik]
+ *     baseurl = example.com/piwik/
+ *     sideid = 1
+ *     optout = true ;set to false to disable
+ *     async = false ;set to true to enable
  *
  *     Change the siteid to the ID that the Piwik tracker for your Friendica
  *     installation has. Alter the baseurl to fit your needs, don't care
@@ -35,56 +31,59 @@
  *     setting.
  */
 
-use Friendica\App;
+use Friendica\Core\Config;
 use Friendica\Core\Hook;
+use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
-use Friendica\DI;
-use Friendica\Core\Config\Util\ConfigFileManager;
+use Friendica\Util\ConfigFileLoader;
+use Friendica\Util\Strings;
 
 function piwik_install() {
 	Hook::register('load_config', 'addon/piwik/piwik.php', 'piwik_load_config');
 	Hook::register('page_end', 'addon/piwik/piwik.php', 'piwik_analytics');
 
-	Logger::notice("installed piwik addon");
+	Logger::log("installed piwik addon");
 }
 
-function piwik_load_config(ConfigFileManager $loader)
-{
-	DI::app()->getConfigCache()->load($loader->loadAddonConfig('piwik'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
+function piwik_uninstall() {
+	Hook::unregister('load_config', 'addon/piwik/piwik.php', 'piwik_load_config');
+	Hook::unregister('page_end', 'addon/piwik/piwik.php', 'piwik_analytics');
+
+	Logger::log("uninstalled piwik addon");
 }
 
-function piwik_analytics(string &$b)
+function piwik_load_config(\Friendica\App $a, ConfigFileLoader $loader)
 {
+	$a->getConfigCache()->load($loader->loadAddonConfig('piwik'));
+}
+
+function piwik_analytics($a,&$b) {
+
 	/*
 	 *   styling of every HTML block added by this addon is done in the
 	 *   associated CSS file. We just have to tell Friendica to get it
 	 *   into the page header.
 	 */
-	DI::page()->registerStylesheet('addon/piwik/piwik.css', 'all');
+	$a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->getBaseURL() . '/addon/piwik/piwik.css' . '" media="all" />';
 
 	/*
-	 *   Get the configuration values.
+	 *   Get the configuration variables from the config/addon.config.php file.
 	 */
-	$baseurl = DI::config()->get('piwik', 'baseurl');
-	$siteid  = DI::config()->get('piwik', 'siteid');
-	$optout  = DI::config()->get('piwik', 'optout');
-	$async   = DI::config()->get('piwik', 'async');
-	$shortendpoint = DI::config()->get('piwik', 'shortendpoint');
+	$baseurl = Config::get('piwik', 'baseurl');
+	$siteid  = Config::get('piwik', 'siteid');
+	$optout  = Config::get('piwik', 'optout');
+	$async   = Config::get('piwik', 'async');
 
 	/*
 	 *   Add the Piwik tracking code for the site.
 	 *   If async is set to true use asynchronous tracking
 	 */
-	
-	$scriptAsyncValue = $async ? 'true' : 'false';
-	$scriptPhpEndpoint = $shortendpoint ? 'js/' : 'piwik.php';
-	$scriptJsEndpoint = $shortendpoint ? 'js/' : 'piwik.js';
-
-	$b .= "<!-- Piwik --> <script type=\"text/javascript\"> var _paq = _paq || []; _paq.push(['trackPageView']); _paq.push(['enableLinkTracking']); (function() { var u=((\"https:\" == document.location.protocol) ? \"https\" : \"http\") + \"://$baseurl\"; _paq.push(['setTrackerUrl', u+'$scriptPhpEndpoint']); _paq.push(['setSiteId', $siteid]); var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0]; g.type='text/javascript'; g.defer=true; g.async=$scriptAsyncValue; g.src=u+'$scriptJsEndpoint'; s.parentNode.insertBefore(g,s); })(); </script> <!-- End Piwik Code -->\r\n";
-
 	if ($async) {
-		$b .= "<div id='piwik-code-block'> <!-- Piwik -->\r\n<noscript><p><img src=\"//$baseurl$scriptPhpEndpoint?idsite=$siteid\" style=\"border:0\" alt=\"\" /></p></noscript>\r\n <!-- End Piwik Tracking Tag --> </div>";
+	  $b .= "<!-- Piwik --> <script type=\"text/javascript\"> var _paq = _paq || []; _paq.push(['trackPageView']); _paq.push(['enableLinkTracking']); (function() { var u=((\"https:\" == document.location.protocol) ? \"https\" : \"http\") + \"://".$baseurl."\"; _paq.push(['setTrackerUrl', u+'piwik.php']); _paq.push(['setSiteId', ".$siteid."]); var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0]; g.type='text/javascript'; g.defer=true; g.async=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s); })(); </script> <!-- End Piwik Code -->\r\n";
+	  $b .= "<div id='piwik-code-block'> <!-- Piwik -->\r\n<noscript><p><img src=\"//".$baseurl."piwik.php?idsite=".$siteid."\" style=\"border:0\" alt=\"\" /></p></noscript>\r\n <!-- End Piwik Tracking Tag --> </div>";
+	} else {
+	  $b .= "<!-- Piwik --> <script type=\"text/javascript\"> var _paq = _paq || []; _paq.push(['trackPageView']); _paq.push(['enableLinkTracking']); (function() { var u=((\"https:\" == document.location.protocol) ? \"https\" : \"http\") + \"://".$baseurl."\"; _paq.push(['setTrackerUrl', u+'piwik.php']); _paq.push(['setSiteId', ".$siteid."]); var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0]; g.type='text/javascript'; g.defer=true; g.async=false; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s); })(); </script> <!-- End Piwik Code -->\r\n";
 	}
 
 	/*
@@ -93,32 +92,31 @@ function piwik_analytics(string &$b)
 	 */
 	if ($optout) {
 		$b .= "<div id='piwik-optout-link'>";
-		$b .= DI::l10n()->t("This website is tracked using the <a href='http://www.matomo.org'>Matomo</a> analytics tool.");
+		$b .= L10n::t("This website is tracked using the <a href='http://www.matomo.org'>Matomo</a> analytics tool.");
 		$b .= " ";
-		$the_url =  "http://{$baseurl}index.php?module=CoreAdminHome&action=optOut";
-		$b .= DI::l10n()->t("If you do not want that your visits are logged in this way you <a href='%s'>can set a cookie to prevent Matomo / Piwik from tracking further visits of the site</a> (opt-out).", $the_url);
+		$the_url =  "http://".$baseurl ."index.php?module=CoreAdminHome&action=optOut";
+		$b .= L10n::t("If you do not want that your visits are logged in this way you <a href='%s'>can set a cookie to prevent Matomo / Piwik from tracking further visits of the site</a> (opt-out).", $the_url);
 		$b .= "</div>";
 	}
 }
-function piwik_addon_admin (string &$o)
-{
+function piwik_addon_admin (&$a, &$o) {
 	$t = Renderer::getMarkupTemplate( "admin.tpl", "addon/piwik/" );
-
 	$o = Renderer::replaceMacros( $t, [
-		'$submit' => DI::l10n()->t('Save Settings'),
-		'$piwikbaseurl' => ['baseurl', DI::l10n()->t('Matomo (Piwik) Base URL'), DI::config()->get('piwik','baseurl' ), DI::l10n()->t('Absolute path to your Matomo (Piwik) installation. (without protocol (http/s), with trailing slash)')],
-		'$siteid' => ['siteid', DI::l10n()->t('Site ID'), DI::config()->get('piwik','siteid' ), ''],
-		'$optout' => ['optout', DI::l10n()->t('Show opt-out cookie link?'), DI::config()->get('piwik','optout' ), ''],
-		'$async' => ['async', DI::l10n()->t('Asynchronous tracking'), DI::config()->get('piwik','async' ), ''],
-		'$shortendpoint' => ['shortendpoint', DI::l10n()->t("Shortcut path to the script ('/js/' instead of '/piwik.js')"), DI::config()->get('piwik','shortendpoint' ), ''],
+		'$submit' => L10n::t('Save Settings'),
+		'$piwikbaseurl' => ['baseurl', L10n::t('Matomo (Piwik) Base URL'), Config::get('piwik','baseurl' ), L10n::t('Absolute path to your Matomo (Piwik) installation. (without protocol (http/s), with trailing slash)')],
+		'$siteid' => ['siteid', L10n::t('Site ID'), Config::get('piwik','siteid' ), ''],
+		'$optout' => ['optout', L10n::t('Show opt-out cookie link?'), Config::get('piwik','optout' ), ''],
+		'$async' => ['async', L10n::t('Asynchronous tracking'), Config::get('piwik','async' ), ''],
 	]);
 }
-
-function piwik_addon_admin_post()
-{
-	DI::config()->set('piwik', 'baseurl', trim($_POST['baseurl'] ?? ''));
-	DI::config()->set('piwik', 'siteid', trim($_POST['siteid'] ?? ''));
-	DI::config()->set('piwik', 'optout', trim($_POST['optout'] ?? ''));
-	DI::config()->set('piwik', 'async', trim($_POST['async'] ?? ''));
-	DI::config()->set('piwik', 'shortendpoint', trim($_POST['shortendpoint'] ?? ''));
+function piwik_addon_admin_post (&$a) {
+	$url = (!empty($_POST['baseurl']) ? Strings::escapeTags(trim($_POST['baseurl'])) : '');
+	$id = (!empty($_POST['siteid']) ? trim($_POST['siteid']) : '');
+	$optout = (!empty($_POST['optout']) ? trim($_POST['optout']) : '');
+	$async = (!empty($_POST['async']) ? trim($_POST['async']) : '');
+	Config::set('piwik', 'baseurl', $url);
+	Config::set('piwik', 'siteid', $id);
+	Config::set('piwik', 'optout', $optout);
+	Config::set('piwik', 'async', $async);
+	info(L10n::t('Settings updated.'). EOL);
 }
diff --git a/piwik/templates/admin.tpl b/piwik/templates/admin.tpl
index 7a9b5d71..2ab1869b 100644
--- a/piwik/templates/admin.tpl
+++ b/piwik/templates/admin.tpl
@@ -2,5 +2,4 @@
 {{include file="field_input.tpl" field=$siteid}}
 {{include file="field_checkbox.tpl" field=$optout}}
 {{include file="field_checkbox.tpl" field=$async}}
-{{include file="field_checkbox.tpl" field=$shortendpoint}}
 <div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
diff --git a/planets/lang/C/messages.po b/planets/lang/C/messages.po
index e09be45a..f0773cc2 100644
--- a/planets/lang/C/messages.po
+++ b/planets/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:15-0500\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,10 +17,14 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: planets.php:126
+#: planets.php:150
+msgid "Planets Settings"
+msgstr ""
+
+#: planets.php:152
 msgid "Enable Planets Addon"
 msgstr ""
 
-#: planets.php:131
-msgid "Planets Settings"
+#: planets.php:158
+msgid "Submit"
 msgstr ""
diff --git a/planets/lang/ar/messages.po b/planets/lang/ar/messages.po
deleted file mode 100644
index b1a660d4..00000000
--- a/planets/lang/ar/messages.po
+++ /dev/null
@@ -1,36 +0,0 @@
-# ADDON planets
-# Copyright (C)
-# This file is distributed under the same license as the Friendica planets addon package.
-# 
-# 
-# Translators:
-# Farida Khalaf <faridakhalaf@hotmail.com>, 2021
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2021-02-22 02:45+0000\n"
-"Last-Translator: Farida Khalaf <faridakhalaf@hotmail.com>\n"
-"Language-Team: Arabic (http://www.transifex.com/Friendica/friendica/language/ar/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ar\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-
-#: planets.php:131 planets.php:135
-msgid "Planets"
-msgstr "كَواكِب"
-
-#: planets.php:139
-msgid "Planets Settings"
-msgstr " إعدادات الكَواكِب"
-
-#: planets.php:141
-msgid "Enable Planets Addon"
-msgstr "تمكين ملحق الكَواكِب"
-
-#: planets.php:147
-msgid "Save Settings"
-msgstr "حفظ الإعدادات"
diff --git a/planets/lang/ar/strings.php b/planets/lang/ar/strings.php
deleted file mode 100644
index 8d6b5fec..00000000
--- a/planets/lang/ar/strings.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_ar")) {
-function string_plural_select_ar($n){
-	$n = intval($n);
-	if ($n==0) { return 0; } else if ($n==1) { return 1; } else if ($n==2) { return 2; } else if ($n%100>=3 && $n%100<=10) { return 3; } else if ($n%100>=11 && $n%100<=99) { return 4; } else  { return 5; }
-}}
-$a->strings['Planets'] = 'كَواكِب';
-$a->strings['Planets Settings'] = ' إعدادات الكَواكِب';
-$a->strings['Enable Planets Addon'] = 'تمكين ملحق الكَواكِب';
-$a->strings['Save Settings'] = 'حفظ الإعدادات';
diff --git a/planets/lang/cs/strings.php b/planets/lang/cs/strings.php
index 1a0bdb95..d0b883d2 100644
--- a/planets/lang/cs/strings.php
+++ b/planets/lang/cs/strings.php
@@ -3,8 +3,9 @@
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
 	$n = intval($n);
-	if (($n == 1 && $n % 1 == 0)) { return 0; } else if (($n >= 2 && $n <= 4 && $n % 1 == 0)) { return 1; } else if (($n % 1 != 0 )) { return 2; } else  { return 3; }
+	return ($n == 1 && $n % 1 == 0) ? 0 : ($n >= 2 && $n <= 4 && $n % 1 == 0) ? 1: ($n % 1 != 0 ) ? 2 : 3;;
 }}
-$a->strings['Planets Settings'] = 'Nastavení Planets';
-$a->strings['Enable Planets Addon'] = 'Povolit doplněk Planets';
-$a->strings['Submit'] = 'Odeslat';
+;
+$a->strings["Planets Settings"] = "Nastavení Planets";
+$a->strings["Enable Planets Addon"] = "Povolit doplněk Planets";
+$a->strings["Submit"] = "Odeslat";
diff --git a/planets/lang/da-dk/messages.po b/planets/lang/da-dk/messages.po
deleted file mode 100644
index b84fd40d..00000000
--- a/planets/lang/da-dk/messages.po
+++ /dev/null
@@ -1,28 +0,0 @@
-# ADDON planets
-# Copyright (C)
-# This file is distributed under the same license as the Friendica planets addon package.
-# 
-# 
-# Translators:
-# Anton <dev@atjn.dk>, 2022
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:15-0500\n"
-"PO-Revision-Date: 2014-06-23 11:19+0000\n"
-"Last-Translator: Anton <dev@atjn.dk>, 2022\n"
-"Language-Team: Danish (Denmark) (http://www.transifex.com/Friendica/friendica/language/da_DK/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: da_DK\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: planets.php:126
-msgid "Enable Planets Addon"
-msgstr "Aktivér Planets tilføjelsen"
-
-#: planets.php:131
-msgid "Planets Settings"
-msgstr "Planets Indstillinger"
diff --git a/planets/lang/da-dk/strings.php b/planets/lang/da-dk/strings.php
deleted file mode 100644
index a1d9b1a8..00000000
--- a/planets/lang/da-dk/strings.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_da_dk")) {
-function string_plural_select_da_dk($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Enable Planets Addon'] = 'Aktivér Planets tilføjelsen';
-$a->strings['Planets Settings'] = 'Planets Indstillinger';
diff --git a/planets/lang/de/messages.po b/planets/lang/de/messages.po
index c06493e2..89f4d07a 100644
--- a/planets/lang/de/messages.po
+++ b/planets/lang/de/messages.po
@@ -4,29 +4,30 @@
 # 
 # 
 # Translators:
-# Andreas H., 2014
-# Steffen K9, 2021
-# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2014
-# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2018
-# Ulf Rompe <transifex.com@rompe.org>, 2019
+# Abrax <webmaster@a-zwenkau.de>, 2014
+# bavatar <tobias.diekershoff@gmx.net>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:15-0500\n"
-"PO-Revision-Date: 2014-06-23 11:19+0000\n"
-"Last-Translator: Steffen K9, 2021\n"
-"Language-Team: German (http://app.transifex.com/Friendica/friendica/language/de/)\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2014-10-15 12:32+0000\n"
+"Last-Translator: Abrax <webmaster@a-zwenkau.de>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/friendica/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: planets.php:126
+#: planets.php:150
+msgid "Planets Settings"
+msgstr "Planeten Einstellungen"
+
+#: planets.php:152
 msgid "Enable Planets Addon"
 msgstr "Planeten-Addon aktivieren"
 
-#: planets.php:131
-msgid "Planets Settings"
-msgstr "Planeten-Einstellungen"
+#: planets.php:158
+msgid "Submit"
+msgstr "Senden"
diff --git a/planets/lang/de/strings.php b/planets/lang/de/strings.php
index 72d99dc8..653d025b 100644
--- a/planets/lang/de/strings.php
+++ b/planets/lang/de/strings.php
@@ -2,8 +2,9 @@
 
 if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Enable Planets Addon'] = 'Planeten-Addon aktivieren';
-$a->strings['Planets Settings'] = 'Planeten-Einstellungen';
+;
+$a->strings["Planets Settings"] = "Planeten Einstellungen";
+$a->strings["Enable Planets Addon"] = "Planeten-Addon aktivieren";
+$a->strings["Submit"] = "Senden";
diff --git a/planets/lang/es/messages.po b/planets/lang/es/messages.po
index 308738c3..b1e33659 100644
--- a/planets/lang/es/messages.po
+++ b/planets/lang/es/messages.po
@@ -4,15 +4,14 @@
 # 
 # 
 # Translators:
-# Albert, 2016
-# Senex Petrovic <javierruizo@hotmail.com>, 2021
+# Alberto Díaz <albertodiaztormo@gmail.com>, 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2021-04-06 02:01+0000\n"
-"Last-Translator: Senex Petrovic <javierruizo@hotmail.com>\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2016-10-12 15:12+0000\n"
+"Last-Translator: Alberto Díaz <albertodiaztormo@gmail.com>\n"
 "Language-Team: Spanish (http://www.transifex.com/Friendica/friendica/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,18 +19,14 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: planets.php:131 planets.php:135
-msgid "Planets"
-msgstr "Planets"
-
-#: planets.php:139
+#: planets.php:150
 msgid "Planets Settings"
 msgstr "Ajustes de Planets"
 
-#: planets.php:141
+#: planets.php:152
 msgid "Enable Planets Addon"
-msgstr "Habilitar Addon/plugin Planets"
+msgstr "Habilite eladdonPlanets"
 
-#: planets.php:147
-msgid "Save Settings"
-msgstr "Grabar ajustes"
+#: planets.php:158
+msgid "Submit"
+msgstr "Enviar"
diff --git a/planets/lang/es/strings.php b/planets/lang/es/strings.php
index 7cf73926..2fd5ed90 100644
--- a/planets/lang/es/strings.php
+++ b/planets/lang/es/strings.php
@@ -2,10 +2,9 @@
 
 if(! function_exists("string_plural_select_es")) {
 function string_plural_select_es($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Planets'] = 'Planets';
-$a->strings['Planets Settings'] = 'Ajustes de Planets';
-$a->strings['Enable Planets Addon'] = 'Habilitar Addon/plugin Planets';
-$a->strings['Save Settings'] = 'Grabar ajustes';
+;
+$a->strings["Planets Settings"] = "Ajustes de Planets";
+$a->strings["Enable Planets Addon"] = "Habilite el addon Planets";
+$a->strings["Submit"] = "Enviar";
diff --git a/planets/lang/fi-fi/strings.php b/planets/lang/fi-fi/strings.php
index 3fa4ecbc..c33c09ee 100644
--- a/planets/lang/fi-fi/strings.php
+++ b/planets/lang/fi-fi/strings.php
@@ -2,9 +2,9 @@
 
 if(! function_exists("string_plural_select_fi_fi")) {
 function string_plural_select_fi_fi($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Planets Settings'] = 'Planets -asetukset';
-$a->strings['Enable Planets Addon'] = 'Ota Planets -lisäosa käyttöön';
-$a->strings['Submit'] = 'Lähetä';
+;
+$a->strings["Planets Settings"] = "Planets -asetukset";
+$a->strings["Enable Planets Addon"] = "Ota Planets -lisäosa käyttöön";
+$a->strings["Submit"] = "Lähetä";
diff --git a/planets/lang/fr/messages.po b/planets/lang/fr/messages.po
deleted file mode 100644
index 07560dd5..00000000
--- a/planets/lang/fr/messages.po
+++ /dev/null
@@ -1,28 +0,0 @@
-# ADDON planets
-# Copyright (C)
-# This file is distributed under the same license as the Friendica planets addon package.
-# 
-# 
-# Translators:
-# Hypolite Petovan <hypolite@mrpetovan.com>, 2022
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:15-0500\n"
-"PO-Revision-Date: 2014-06-23 11:19+0000\n"
-"Last-Translator: Hypolite Petovan <hypolite@mrpetovan.com>, 2022\n"
-"Language-Team: French (http://www.transifex.com/Friendica/friendica/language/fr/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: fr\n"
-"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
-
-#: planets.php:126
-msgid "Enable Planets Addon"
-msgstr "Activer l'extension Planètes"
-
-#: planets.php:131
-msgid "Planets Settings"
-msgstr "Paramètres des planètes"
diff --git a/planets/lang/fr/strings.php b/planets/lang/fr/strings.php
index fe4e42ab..b4524f10 100644
--- a/planets/lang/fr/strings.php
+++ b/planets/lang/fr/strings.php
@@ -1,9 +1,5 @@
-<?php
-
-if(! function_exists("string_plural_select_fr")) {
-function string_plural_select_fr($n){
-	$n = intval($n);
-	if (($n == 0 || $n == 1)) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
-}}
-$a->strings['Enable Planets Addon'] = 'Activer l\'extension Planètes';
-$a->strings['Planets Settings'] = 'Paramètres des planètes';
+<?php
+
+$a->strings["Planets Settings"] = "Réglages des Planets";
+$a->strings["Enable Planets Addon"] = "Activer Planets";
+$a->strings["Submit"] = "Envoyer";
diff --git a/planets/lang/hu/messages.po b/planets/lang/hu/messages.po
deleted file mode 100644
index c87043ad..00000000
--- a/planets/lang/hu/messages.po
+++ /dev/null
@@ -1,28 +0,0 @@
-# ADDON planets
-# Copyright (C)
-# This file is distributed under the same license as the Friendica planets addon package.
-# 
-# 
-# Translators:
-# Balázs Úr, 2020-2021
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:15-0500\n"
-"PO-Revision-Date: 2014-06-23 11:19+0000\n"
-"Last-Translator: Balázs Úr, 2020-2021\n"
-"Language-Team: Hungarian (http://www.transifex.com/Friendica/friendica/language/hu/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: hu\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: planets.php:126
-msgid "Enable Planets Addon"
-msgstr "Bolygók bővítmény engedélyezése"
-
-#: planets.php:131
-msgid "Planets Settings"
-msgstr "Bolygók beállításai"
diff --git a/planets/lang/hu/strings.php b/planets/lang/hu/strings.php
deleted file mode 100644
index 6912a283..00000000
--- a/planets/lang/hu/strings.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_hu")) {
-function string_plural_select_hu($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Enable Planets Addon'] = 'Bolygók bővítmény engedélyezése';
-$a->strings['Planets Settings'] = 'Bolygók beállításai';
diff --git a/planets/lang/it/messages.po b/planets/lang/it/messages.po
index c15d7460..2cf9592c 100644
--- a/planets/lang/it/messages.po
+++ b/planets/lang/it/messages.po
@@ -5,25 +5,28 @@
 # 
 # Translators:
 # fabrixxm <fabrix.xm@gmail.com>, 2014-2015,2018
-# Sylke Vicious <silkevicious@gmail.com>, 2021
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:15-0500\n"
-"PO-Revision-Date: 2014-06-23 11:19+0000\n"
-"Last-Translator: Sylke Vicious <silkevicious@gmail.com>, 2021\n"
-"Language-Team: Italian (http://app.transifex.com/Friendica/friendica/language/it/)\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2018-03-19 13:25+0000\n"
+"Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n"
+"Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: it\n"
-"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: planets.php:126
+#: planets.php:150
+msgid "Planets Settings"
+msgstr "Impostazioni \"Pianeti\""
+
+#: planets.php:152
 msgid "Enable Planets Addon"
 msgstr "Abilita il componente aggiuntivo Pianeti"
 
-#: planets.php:131
-msgid "Planets Settings"
-msgstr "Impostazioni \"Pianeti\""
+#: planets.php:158
+msgid "Submit"
+msgstr "Invia"
diff --git a/planets/lang/it/strings.php b/planets/lang/it/strings.php
index 040f65ad..1b5aaa91 100644
--- a/planets/lang/it/strings.php
+++ b/planets/lang/it/strings.php
@@ -2,8 +2,9 @@
 
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
-	$n = intval($n);
-	if ($n == 1) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
+	return ($n != 1);;
 }}
-$a->strings['Enable Planets Addon'] = 'Abilita il componente aggiuntivo Pianeti';
-$a->strings['Planets Settings'] = 'Impostazioni "Pianeti"';
+;
+$a->strings["Planets Settings"] = "Impostazioni \"Pianeti\"";
+$a->strings["Enable Planets Addon"] = "Abilita il componente aggiuntivo Pianeti";
+$a->strings["Submit"] = "Invia";
diff --git a/planets/lang/nl/strings.php b/planets/lang/nl/strings.php
index 18e08d4b..0c681407 100644
--- a/planets/lang/nl/strings.php
+++ b/planets/lang/nl/strings.php
@@ -3,7 +3,9 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Planets Settings'] = 'Planets instellingen';
-$a->strings['Enable Planets Addon'] = 'Planets Addon inschakelen';
+;
+$a->strings["Planets Settings"] = "Planets instellingen";
+$a->strings["Enable Planets Addon"] = "Planets Addon inschakelen";
+$a->strings["Submit"] = "";
diff --git a/planets/lang/pl/messages.po b/planets/lang/pl/messages.po
index dbcaf608..3018da60 100644
--- a/planets/lang/pl/messages.po
+++ b/planets/lang/pl/messages.po
@@ -4,14 +4,14 @@
 # 
 # 
 # Translators:
-# Waldemar Stoczkowski, 2018
+# Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:15-0500\n"
-"PO-Revision-Date: 2014-06-23 11:19+0000\n"
-"Last-Translator: Waldemar Stoczkowski, 2018\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2018-03-31 19:10+0000\n"
+"Last-Translator: Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.com/Friendica/friendica/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,10 +19,14 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
-#: planets.php:126
+#: planets.php:150
+msgid "Planets Settings"
+msgstr "Ustawienia Planet"
+
+#: planets.php:152
 msgid "Enable Planets Addon"
 msgstr "Włącz dodatek Planets"
 
-#: planets.php:131
-msgid "Planets Settings"
-msgstr "Ustawienia Planet"
+#: planets.php:158
+msgid "Submit"
+msgstr "Wyślij"
diff --git a/planets/lang/pl/strings.php b/planets/lang/pl/strings.php
index 1636bc8f..61b08753 100644
--- a/planets/lang/pl/strings.php
+++ b/planets/lang/pl/strings.php
@@ -2,8 +2,9 @@
 
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
-	$n = intval($n);
-	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
+	return ($n==1 ? 0 : ($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14) ? 1 : $n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14) ? 2 : 3);;
 }}
-$a->strings['Enable Planets Addon'] = 'Włącz dodatek Planets';
-$a->strings['Planets Settings'] = 'Ustawienia Planet';
+;
+$a->strings["Planets Settings"] = "Ustawienia Planet";
+$a->strings["Enable Planets Addon"] = "Włącz dodatek Planets";
+$a->strings["Submit"] = "Wyślij";
diff --git a/planets/lang/ro/strings.php b/planets/lang/ro/strings.php
index baf8e32b..19a2e3de 100644
--- a/planets/lang/ro/strings.php
+++ b/planets/lang/ro/strings.php
@@ -2,9 +2,9 @@
 
 if(! function_exists("string_plural_select_ro")) {
 function string_plural_select_ro($n){
-	$n = intval($n);
-	if ($n==1) { return 0; } else if ((($n%100>19)||(($n%100==0)&&($n!=0)))) { return 2; } else  { return 1; }
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
 }}
-$a->strings['Planets Settings'] = 'Configurări Planets';
-$a->strings['Enable Planets Addon'] = 'Activare Modul Planets';
-$a->strings['Submit'] = 'Trimite';
+;
+$a->strings["Planets Settings"] = "Configurări Planets";
+$a->strings["Enable Planets Addon"] = "Activare Modul Planets";
+$a->strings["Submit"] = "Trimite";
diff --git a/planets/lang/ru/messages.po b/planets/lang/ru/messages.po
deleted file mode 100644
index 3105b659..00000000
--- a/planets/lang/ru/messages.po
+++ /dev/null
@@ -1,28 +0,0 @@
-# ADDON planets
-# Copyright (C)
-# This file is distributed under the same license as the Friendica planets addon package.
-# 
-# 
-# Translators:
-# Alexander An <ravnina@gmail.com>, 2022
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:15-0500\n"
-"PO-Revision-Date: 2014-06-23 11:19+0000\n"
-"Last-Translator: Alexander An <ravnina@gmail.com>, 2022\n"
-"Language-Team: Russian (http://www.transifex.com/Friendica/friendica/language/ru/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ru\n"
-"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
-
-#: planets.php:126
-msgid "Enable Planets Addon"
-msgstr "Включить дополнение Planets"
-
-#: planets.php:131
-msgid "Planets Settings"
-msgstr "Настройки Planets"
diff --git a/planets/lang/ru/strings.php b/planets/lang/ru/strings.php
index f6c97362..b84e2bbc 100644
--- a/planets/lang/ru/strings.php
+++ b/planets/lang/ru/strings.php
@@ -1,9 +1,5 @@
-<?php
-
-if(! function_exists("string_plural_select_ru")) {
-function string_plural_select_ru($n){
-	$n = intval($n);
-	if ($n%10==1 && $n%100!=11) { return 0; } else if ($n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14)) { return 1; } else if ($n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)) { return 2; } else  { return 3; }
-}}
-$a->strings['Enable Planets Addon'] = 'Включить дополнение Planets';
-$a->strings['Planets Settings'] = 'Настройки Planets';
+<?php
+
+$a->strings["Planets Settings"] = "";
+$a->strings["Enable Planets Addon"] = "";
+$a->strings["Submit"] = "Подтвердить";
diff --git a/planets/lang/sv/messages.po b/planets/lang/sv/messages.po
deleted file mode 100644
index 4d959f63..00000000
--- a/planets/lang/sv/messages.po
+++ /dev/null
@@ -1,27 +0,0 @@
-# ADDON planets
-# Copyright (C)
-# This file is distributed under the same license as the Friendica planets addon package.
-# 
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:15-0500\n"
-"PO-Revision-Date: 2021-12-22 16:22+0000\n"
-"Last-Translator: Transifex Bot <>\n"
-"Language-Team: Swedish (http://www.transifex.com/Friendica/friendica/language/sv/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: sv\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: planets.php:126
-msgid "Enable Planets Addon"
-msgstr ""
-
-#: planets.php:131
-msgid "Planets Settings"
-msgstr ""
diff --git a/planets/lang/sv/strings.php b/planets/lang/sv/strings.php
index 72e9772f..3ec569a7 100644
--- a/planets/lang/sv/strings.php
+++ b/planets/lang/sv/strings.php
@@ -1,7 +1,3 @@
-<?php
-
-if(! function_exists("string_plural_select_sv")) {
-function string_plural_select_sv($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
+<?php
+
+$a->strings["Submit"] = "Spara";
diff --git a/planets/planets.css b/planets/planets.css
new file mode 100644
index 00000000..668b65bc
--- /dev/null
+++ b/planets/planets.css
@@ -0,0 +1,14 @@
+
+
+
+#planets-enable-label {
+	float: left;
+	width: 200px;
+	margin-bottom: 25px;
+}
+
+#planets-checkbox {
+	float: left;
+}
+
+
diff --git a/planets/planets.php b/planets/planets.php
index 8a206fb5..48ba5767 100644
--- a/planets/planets.php
+++ b/planets/planets.php
@@ -6,63 +6,85 @@
  * Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
  * Author: Tony Baldwin <https://free-haven.org/profile/tony>
  */
-
-use Friendica\App;
 use Friendica\Core\Hook;
+use Friendica\Core\L10n;
 use Friendica\Core\Logger;
-use Friendica\Core\Renderer;
-use Friendica\DI;
+use Friendica\Core\PConfig;
+
+function planets_install() {
 
-function planets_install()
-{
 	/**
+	 *
 	 * Our demo addon will attach in three places.
 	 * The first is just prior to storing a local post.
+	 *
 	 */
+
 	Hook::register('post_local', 'addon/planets/planets.php', 'planets_post_hook');
 
 	/**
+	 *
 	 * Then we'll attach into the addon settings page, and also the
 	 * settings post hook so that we can create and update
 	 * user preferences.
+	 *
 	 */
+
 	Hook::register('addon_settings', 'addon/planets/planets.php', 'planets_settings');
 	Hook::register('addon_settings_post', 'addon/planets/planets.php', 'planets_settings_post');
 
-	Logger::notice("installed planets");
+	Logger::log("installed planets");
 }
 
-/**
- * An item was posted on the local system.
- * We are going to look for specific items:
- *      - A status post by a profile owner
- *      - The profile owner must have allowed our addon
- */
-function planets_post_hook(&$item)
-{
-	Logger::notice('planets invoked');
 
-	if (!DI::userSession()->getLocalUserId()) {
-		/* non-zero if this is a logged in user of this system */
-		return;
-	}
+function planets_uninstall() {
 
-	if (DI::userSession()->getLocalUserId() != $item['uid']) {
-		/* Does this person own the post? */
-		return;
-	}
+	/**
+	 *
+	 * uninstall unregisters any hooks created with register_hook
+	 * during install. It may also delete configuration settings
+	 * and any other cleanup.
+	 *
+	 */
 
-	if ($item['parent']) {
-		/* If the item has a parent, this is a comment or something else, not a status post. */
+	Hook::unregister('post_local',    'addon/planets/planets.php', 'planets_post_hook');
+	Hook::unregister('addon_settings', 'addon/planets/planets.php', 'planets_settings');
+	Hook::unregister('addon_settings_post', 'addon/planets/planets.php', 'planets_settings_post');
+
+
+	Logger::log("removed planets");
+}
+
+
+
+function planets_post_hook($a, &$item) {
+
+	/**
+	 *
+	 * An item was posted on the local system.
+	 * We are going to look for specific items:
+	 *      - A status post by a profile owner
+	 *      - The profile owner must have allowed our addon
+	 *
+	 */
+
+	Logger::log('planets invoked');
+
+	if(! local_user())   /* non-zero if this is a logged in user of this system */
+		return;
+
+	if(local_user() != $item['uid'])    /* Does this person own the post? */
+		return;
+
+	if($item['parent'])   /* If the item has a parent, this is a comment or something else, not a status post. */
 		return;
-	}
 
 	/* Retrieve our personal config setting */
-	$active = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'planets', 'enable');
 
-	if (!$active) {
+	$active = PConfig::get(local_user(), 'planets', 'enable');
+
+	if(! $active)
 		return;
-	}
 
 	/**
 	 *
@@ -93,14 +115,11 @@ function planets_post_hook(&$item)
  *
  */
 
-function planets_settings_post($post)
-{
-	if (!DI::userSession()->getLocalUserId()) {
+function planets_settings_post($a,$post) {
+	if(! local_user())
 		return;
-	}
-	if ($_POST['planets-submit']) {
-		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'planets', 'enable' ,intval($_POST['planets']));
-	}
+	if($_POST['planets-submit'])
+		PConfig::set(local_user(),'planets','enable',intval($_POST['planets']));
 }
 
 
@@ -113,22 +132,40 @@ function planets_settings_post($post)
 
 
 
-function planets_settings(array &$data)
-{
-	if(!DI::userSession()->getLocalUserId()) {
+function planets_settings(&$a,&$s) {
+
+	if(! local_user())
 		return;
-	}
 
-	$enabled = DI::pConfig()->get(DI::userSession()->getLocalUserId(),'planets','enable');
+	/* Add our stylesheet to the page so we can make our settings look nice */
 
-	$t    = Renderer::getMarkupTemplate('settings.tpl', 'addon/planets/');
-	$html = Renderer::replaceMacros($t, [
-		'$enabled' => ['planets', DI::l10n()->t('Enable Planets Addon'), $enabled],
-	]);
+	$a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->getBaseURL() . '/addon/planets/planets.css' . '" media="all" />' . "\r\n";
+
+	/* Get the current state of our config variable */
+
+	$enabled = PConfig::get(local_user(),'planets','enable');
+
+	$checked = (($enabled) ? ' checked="checked" ' : '');
+
+	/* Add some HTML to the existing form */
+
+    $s .= '<span id="settings_planets_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_planets_expanded\'); openClose(\'settings_planets_inflated\');">';
+	$s .= '<h3>' . L10n::t('Planets') . '</h3>';
+	$s .= '</span>';
+	$s .= '<div id="settings_planets_expanded" class="settings-block" style="display: none;">';
+	$s .= '<span class="fakelink" onclick="openClose(\'settings_planets_expanded\'); openClose(\'settings_planets_inflated\');">';
+	$s .= '<h3>' . L10n::t('Planets') . '</h3>';
+	$s .= '</span>';
+
+    $s .= '<div class="settings-block">';
+	$s .= '<h3>' . L10n::t('Planets Settings') . '</h3>';
+	$s .= '<div id="planets-enable-wrapper">';
+	$s .= '<label id="planets-enable-label" for="planets-checkbox">' . L10n::t('Enable Planets Addon') . '</label>';
+	$s .= '<input id="planets-checkbox" type="checkbox" name="planets" value="1" ' . $checked . '/>';
+	$s .= '</div><div class="clear"></div></div>';
+
+	/* provide a submit button */
+
+	$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="planets-submit" class="settings-submit" value="' . L10n::t('Save Settings') . '" /></div></div>';
 
-	$data = [
-		'addon' => 'planets',
-		'title' => DI::l10n()->t('Planets Settings'),
-		'html'  => $html,
-	];
 }
diff --git a/planets/templates/settings.tpl b/planets/templates/settings.tpl
deleted file mode 100644
index 2f3f4ce7..00000000
--- a/planets/templates/settings.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{{include file="field_checkbox.tpl" field=$enabled}}
diff --git a/pnut/LICENSE b/pnut/LICENSE
deleted file mode 100644
index fe6b9036..00000000
--- a/pnut/LICENSE
+++ /dev/null
@@ -1,662 +0,0 @@
-                    GNU AFFERO GENERAL PUBLIC LICENSE
-                       Version 3, 19 November 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU Affero General Public License is a free, copyleft license for
-software and other kinds of works, specifically designed to ensure
-cooperation with the community in the case of network server software.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-our General Public Licenses are intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  Developers that use our General Public Licenses protect your rights
-with two steps: (1) assert copyright on the software, and (2) offer
-you this License which gives you legal permission to copy, distribute
-and/or modify the software.
-
-  A secondary benefit of defending all users' freedom is that
-improvements made in alternate versions of the program, if they
-receive widespread use, become available for other developers to
-incorporate.  Many developers of free software are heartened and
-encouraged by the resulting cooperation.  However, in the case of
-software used on network servers, this result may fail to come about.
-The GNU General Public License permits making a modified version and
-letting the public access it on a server without ever releasing its
-source code to the public.
-
-  The GNU Affero General Public License is designed specifically to
-ensure that, in such cases, the modified source code becomes available
-to the community.  It requires the operator of a network server to
-provide the source code of the modified version running there to the
-users of that server.  Therefore, public use of a modified version, on
-a publicly accessible server, gives the public access to the source
-code of the modified version.
-
-  An older license, called the Affero General Public License and
-published by Affero, was designed to accomplish similar goals.  This is
-a different license, not a version of the Affero GPL, but Affero has
-released a new version of the Affero GPL which permits relicensing under
-this license.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU Affero General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Remote Network Interaction; Use with the GNU General Public License.
-
-  Notwithstanding any other provision of this License, if you modify the
-Program, your modified version must prominently offer all users
-interacting with it remotely through a computer network (if your version
-supports such interaction) an opportunity to receive the Corresponding
-Source of your version by providing access to the Corresponding Source
-from a network server at no charge, through some standard or customary
-means of facilitating copying of software.  This Corresponding Source
-shall include the Corresponding Source for any work covered by version 3
-of the GNU General Public License that is incorporated pursuant to the
-following paragraph.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the work with which it is combined will remain governed by version
-3 of the GNU General Public License.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU Affero General Public License from time to time.  Such new versions
-will be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU Affero General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU Affero General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU Affero General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published
-    by the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If your software can interact with users remotely through a computer
-network, you should also make sure that it provides a way for users to
-get its source.  For example, if your program is a web application, its
-interface could display a "Source" link that leads users to an archive
-of the code.  There are many ways you could offer source, and different
-solutions will be better for different programs; see section 13 for the
-specific requirements.
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU AGPL, see
-<https://www.gnu.org/licenses/>.
-
diff --git a/pnut/README.md b/pnut/README.md
deleted file mode 100644
index 798174b8..00000000
--- a/pnut/README.md
+++ /dev/null
@@ -1,10 +0,0 @@
-# Pnut connector
-
-With this addon to friendica you can give your users the possibility to post their *public* messages to pnut.io. 
-
-No setup is needed for the admins to make it work for their users, however it is possible for the admin to create a client, so that the users don't have to.
-
-To do so, go to https://pnut.io/dev and scroll down to "Create New Client".
-Enter a name of your choice and enter your Friendica host name as the website.
-Use https://(yourhost.name)/pnut/connect as a redirect url, replace "(yourhost.name)" with the host name of your system.
-Limit the scope to "basic,files,follow,polls,presence,stream,update_profile,write_post"
\ No newline at end of file
diff --git a/pnut/lang/C/messages.po b/pnut/lang/C/messages.po
deleted file mode 100644
index 89b065fd..00000000
--- a/pnut/lang/C/messages.po
+++ /dev/null
@@ -1,74 +0,0 @@
-# ADDON pnut
-# Copyright (C) 
-# This file is distributed under the same license as the Friendica pnut addon package.
-# 
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-03-03 11:53+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: pnut.php:42
-msgid "Permission denied."
-msgstr ""
-
-#: pnut.php:79
-msgid "You are now authenticated with pnut.io."
-msgstr ""
-
-#: pnut.php:82
-msgid "Error fetching token. Please try again."
-msgstr ""
-
-#: pnut.php:85
-msgid "return to the connector page"
-msgstr ""
-
-#: pnut.php:103
-msgid "Save Settings"
-msgstr ""
-
-#: pnut.php:104 pnut.php:150
-msgid "Client ID"
-msgstr ""
-
-#: pnut.php:105 pnut.php:151
-msgid "Client Secret"
-msgstr ""
-
-#: pnut.php:139
-msgid "Authenticate with pnut.io"
-msgstr ""
-
-#: pnut.php:143
-msgid "Disconnect"
-msgstr ""
-
-#: pnut.php:148
-msgid "Enable Pnut Post Addon"
-msgstr ""
-
-#: pnut.php:149
-msgid "Post to Pnut by default"
-msgstr ""
-
-#: pnut.php:152
-msgid "Access Token"
-msgstr ""
-
-#: pnut.php:161
-msgid "Pnut Export"
-msgstr ""
-
-#: pnut.php:203
-msgid "Post to Pnut"
-msgstr ""
diff --git a/pnut/lib/LICENSE b/pnut/lib/LICENSE
deleted file mode 100644
index 579599a8..00000000
--- a/pnut/lib/LICENSE
+++ /dev/null
@@ -1,24 +0,0 @@
-Copyright (c) 2013, Josh Dolitsky
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-    * Neither the name of the Josh Dolitsky nor the names of its 
-      contributors may be used to endorse or promote products derived 
-      from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL TRAVIS RICHARDSON BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
diff --git a/pnut/lib/phpnut.php b/pnut/lib/phpnut.php
deleted file mode 100644
index 303a860b..00000000
--- a/pnut/lib/phpnut.php
+++ /dev/null
@@ -1,2504 +0,0 @@
-<?php
-
-namespace phpnut;
-
-/**
- * phpnut.php
- * pnut.io PHP library
- * https://github.com/pnut-api/phpnut
- *
- * This class handles a lower level type of access to pnut.io. It's ideal
- * for command line scripts and other places where you want full control
- * over what's happening, and you're at least a little familiar with oAuth.
- *
- * Alternatively you can use the EZphpnut class which automatically takes
- * care of a lot of the details like logging in, keeping track of tokens,
- * etc. EZphpnut assumes you're accessing pnut.io via a browser, whereas
- * this class tries to make no assumptions at all.
- */
-class phpnut
-{
-    protected $_baseUrl = 'https://api.pnut.io/v1/';
-    protected $_authUrl = 'https://pnut.io/oauth/';
-
-    private $_authPostParams = [];
-
-    // stores the access token after login
-    private $_accessToken = null;
-
-    // stores the App access token if we have it
-    private $_appAccessToken = null;
-
-    // stores the user ID returned when fetching the auth token
-    private $_user_id = null;
-
-    // stores the username returned when fetching the auth token
-    private $_username = null;
-
-    // The total number of requests you're allowed within the alloted time period
-    private $_rateLimit = null;
-
-    // The number of requests you have remaining within the alloted time period
-    private $_rateLimitRemaining = null;
-
-    // The number of seconds remaining in the alloted time period
-    private $_rateLimitReset = null;
-
-    // The scope the user has
-    private $_scope = null;
-
-    // token scopes
-    private $_scopes = [];
-
-    // debug info
-    private $_last_request = null;
-    private $_last_response = null;
-
-    // ssl certification
-    private $_sslCA = null;
-
-    // the callback function to be called when an event is received from the stream
-    private $_streamCallback = null;
-
-    // the stream buffer
-    private $_streamBuffer = '';
-
-    // stores the curl handler for the current stream
-    private $_currentStream = null;
-
-    // stores the curl multi handler for the current stream
-    private $_multiStream = null;
-
-    // stores the number of failed connects, so we can back off multiple failures
-    private $_connectFailCounter = 0;
-
-    // stores the most recent stream url, so we can re-connect when needed
-    private $_streamUrl = null;
-
-    // keeps track of the last time we've received a packet from the api, if it's too long we'll reconnect
-    private $_lastStreamActivity = null;
-
-    // stores the headers received when connecting to the stream
-    private $_streamHeaders = null;
-
-    // response meta max_id data
-    private $_maxid = null;
-
-    // response meta min_id data
-    private $_minid = null;
-
-    // response meta more data
-    private $_more = null;
-
-    // response stream marker data
-    private $_last_marker = null;
-
-    // strip envelope response from returned value
-    private $_stripResponseEnvelope = true;
-
-    // if processing stream_markers or any fast stream, decrease $sleepFor
-    public $streamingSleepFor = 20000;
-
-    /**
-     * Constructs an phpnut PHP object with the specified client ID and
-     * client secret.
-     * @param string $client_id The client ID you received from pnut.io when
-     * creating your app.
-     * @param string $client_secret The client secret you received from
-     * pnut.io when creating your app.
-     */
-    public function __construct(?string $client_id_or_token=null, ?string $client_secret=null)
-    {
-        if (!$client_id_or_token) {
-            if (isset($_ENV['PNUT_ACCESS_TOKEN'])) {
-                $client_id_or_token = $_ENV['PNUT_ACCESS_TOKEN'];
-            } elseif (defined('PNUT_ACCESS_TOKEN')) {
-                $client_id_or_token = PNUT_ACCESS_TOKEN;
-            } elseif (defined('PNUT_CLIENT_ID') && defined('PNUT_CLIENT_SECRET')) {
-                $client_id_or_token = PNUT_CLIENT_ID;
-                $client_secret = PNUT_CLIENT_SECRET;
-            }
-        }
-
-        if (!$client_id_or_token) {
-            throw new phpnutException('You must specify your pnut access token or client ID and secret');
-        }
-
-        if ($client_id_or_token && $client_secret) {
-            $this->_clientId = $client_id_or_token;
-            $this->_clientSecret = $client_secret;
-        } else {
-            $this->_accessToken = $client_id_or_token;
-        }
-
-        // if the digicert certificate exists in the same folder as this file,
-        // remember that fact for later
-        if (file_exists(__DIR__ . '/DigiCertHighAssuranceEVRootCA.pem')) {
-            $this->_sslCA = __DIR__ . '/DigiCertHighAssuranceEVRootCA.pem';
-        }
-    }
-
-    /**
-     * Set whether or not to strip Envelope Response (meta) information
-     * This option will be deprecated in the future. Is it to allow
-     * a stepped migration path between code expecting the old behavior
-     * and new behavior. When not stripped, you still can use the proper
-     * method to pull the meta information. Please start converting your code ASAP
-     */
-    public function includeResponseEnvelope(): void
-    {
-        $this->_stripResponseEnvelope = false;
-    }
-
-    /**
-     * Construct the proper Auth URL for the user to visit and either grant
-     * or not access to your app. Usually you would place this as a link for
-     * the user to client, or a redirect to send them to the auth URL.
-     * Also can be called after authentication for additional scopes
-     * @param string $callbackUri Where you want the user to be directed
-     * after authenticating with pnut.io. This must be one of the URIs
-     * allowed by your pnut.io application settings.
-     * @param array $scope An array of scopes (permissions) you wish to obtain
-     * from the user. If you don't specify anything, you'll only receive
-     * access to the user's basic profile (the default).
-     */
-    public function getAuthUrl(?string $callback_uri=null, array|string|null $scope=null): string
-    {
-        if (empty($this->_clientId)) {
-            throw new phpnutException('You must specify your pnut client ID');
-        }
-
-        if (is_null($callback_uri)) {
-            if (defined('PNUT_REDIRECT_URI')) {
-                $callback_uri = PNUT_REDIRECT_URI;
-            } elseif (isset($_ENV['PNUT_REDIRECT_URI'])) {
-                $callback_uri = $_ENV['PNUT_REDIRECT_URI'];
-            } else {
-                throw new phpnutException('You must specify your pnut callback URI');
-            }
-        }
-
-        if (is_null($scope)) {
-            if (defined('PNUT_APP_SCOPE')) {
-                $scope = PNUT_APP_SCOPE;
-            } elseif (isset($_ENV['PNUT_APP_SCOPE'])) {
-                $scope = $_ENV['PNUT_APP_SCOPE'];
-            } else {
-                $scope = 'basic';
-            }
-        }
-
-        if (is_array($scope)) {
-            $scope = implode(',', $scope);
-        }
-
-        // construct an authorization url based on our client id and other data
-        $data = [
-            'client_id'=>$this->_clientId,
-            'response_type'=>'code',
-            'redirect_uri'=>$callback_uri,
-            'scope'=>$scope,
-        ];
-
-        $url = $this->_authUrl;
-        if ($this->_accessToken) {
-            $url .= 'authorize?';
-        } else {
-            $url .= 'authenticate?';
-        }
-        $url .= $this->buildQueryString($data);
-
-        // return the constructed url
-        return $url;
-    }
-
-    /**
-     * Call this after they return from the auth page, or anytime you need the
-     * token. For example, you could store it in a database and use
-     * setAccessToken() later on to return on behalf of the user.
-     */
-    public function getAccessToken(string $callback_uri)
-    {
-        // if there's no access token set, and they're returning from
-        // the auth page with a code, use the code to get a token
-        if (!$this->_accessToken && isset($_GET['code']) && $_GET['code'] !== '') {
-
-            if (empty($this->_clientId) || empty($this->_clientSecret)) {
-                throw new phpnutException('You must specify your Pnut client ID and client secret');
-            }
-
-            // construct the necessary elements to get a token
-            $data = [
-                'client_id'=>$this->_clientId,
-                'client_secret'=>$this->_clientSecret,
-                'grant_type'=>'authorization_code',
-                'redirect_uri'=>$callback_uri,
-                'code'=>$_GET['code'],
-            ];
-
-            // try and fetch the token with the above data
-            $res = $this->httpReq(
-                'post',
-                "{$this->_baseUrl}oauth/access_token",
-                $data
-            );
-
-            // store it for later
-            $this->_accessToken = $res['access_token'];
-            $this->_username = $res['username'];
-            $this->_user_id = $res['user_id'];
-        }
-
-        // return what we have (this may be a token, or it may be nothing)
-        return $this->_accessToken;
-    }
-
-    /**
-     * Check the scope of current token to see if it has required scopes
-     * has to be done after a check
-     */
-    public function checkScopes(array $app_scopes): int|array
-    {
-        if (count($this->_scopes) === 0) {
-            return -1; // _scope is empty
-        }
-        $missing = [];
-        foreach($app_scopes as $scope) {
-            if (!in_array($scope, $this->_scopes)) {
-                if ($scope === 'public_messages') {
-                    // messages works for public_messages
-                    if (in_array('messages', $this->_scopes)) {
-                        // if we have messages in our scopes
-                        continue;
-                    }
-                }
-                $missing[] = $scope;
-            }
-        }
-        // identify the ones missing
-        if (count($missing) !== 0) {
-            // do something
-            return $missing;
-        }
-        return 0; // 0 missing
-     }
-
-    /**
-     * Set the access token (eg: after retrieving it from offline storage)
-     * @param string $token A valid access token you're previously received
-     * from calling getAccessToken().
-     */
-    public function setAccessToken(?string $token=null): void
-    {
-        $this->_accessToken = $token;
-    }
-
-    /**
-     * Deauthorize the current token (delete your authorization from the API)
-     * Generally this is useful for logging users out from a web app, so they
-     * don't get automatically logged back in the next time you redirect them
-     * to the authorization URL.
-     */
-    public function deauthorizeToken()
-    {
-        return $this->httpReq('delete', "{$this->_baseUrl}token");
-    }
-    
-    /**
-     * Retrieve an app access token from the app.net API. This allows you
-     * to access the API without going through the user access flow if you
-     * just want to (eg) consume global. App access tokens are required for
-     * some actions (like streaming global). DO NOT share the return value
-     * of this function with any user (or save it in a cookie, etc). This
-     * is considered secret info for your app only.
-     * @return string The app access token
-     */
-    public function getAppAccessToken()
-    {    
-        if (empty($this->_clientId) || empty($this->_clientSecret)) {
-            throw new phpnutException('You must specify your Pnut client ID and client secret');
-        }
-
-        // construct the necessary elements to get a token
-        $data = [
-            'client_id'=>$this->_clientId,
-            'client_secret'=>$this->_clientSecret,
-            'grant_type'=>'client_credentials',
-        ];
-        // try and fetch the token with the above data
-        $res = $this->httpReq(
-            'post',
-            "{$this->_baseUrl}oauth/access_token",
-            $data
-        );
-        // store it for later
-        $this->_appAccessToken = $res['access_token'];
-        $this->_accessToken = $res['access_token'];
-        $this->_username = null;
-        $this->_user_id = null;
-        return $this->_accessToken;
-    }
-
-    /**
-     * Returns the total number of requests you're allowed within the
-     * alloted time period.
-     * @see getRateLimitReset()
-     */
-    public function getRateLimit()
-    {
-        return $this->_rateLimit;
-    }
-
-    /**
-     * The number of requests you have remaining within the alloted time period
-     * @see getRateLimitReset()
-     */
-    public function getRateLimitRemaining()
-    {
-        return $this->_rateLimitRemaining;
-    }
-
-    /**
-     * The number of seconds remaining in the alloted time period.
-     * When this time is up you'll have getRateLimit() available again.
-     */
-    public function getRateLimitReset()
-    {
-        return $this->_rateLimitReset;
-    }
-
-    /**
-     * The scope the user has
-     */
-    public function getScope()
-    {
-        return $this->_scope;
-    }
-
-    /**
-     * Internal function, parses out important information pnut.io adds
-     * to the headers.
-     */
-    protected function parseHeaders(string $response)
-    {
-        // take out the headers
-        // set internal variables
-        // return the body/content
-        $this->_rateLimit = null;
-        $this->_rateLimitRemaining = null;
-        $this->_rateLimitReset = null;
-        $this->_scope = null;
-
-        $response = explode("\r\n\r\n", $response, 2);
-        $headers = $response[0];
-
-        if ($headers === 'HTTP/1.1 100 Continue') {
-            $response = explode("\r\n\r\n", $response[1], 2);
-            $headers = $response[0];
-        }
-
-        // this is not a good way to parse http headers
-        // it will not (for example) take into account multiline headers
-        // but what we're looking for is pretty basic, so we can ignore those shortcomings
-        $headers = explode("\r\n", $headers);
-        foreach ($headers as $header) {
-            $header = explode(': ', $header, 2);
-            if (count($header) < 2) {
-                continue;
-            }
-            list($k, $v) = $header;
-            switch ($k) {
-                case 'X-RateLimit-Remaining':
-                    $this->_rateLimitRemaining = $v;
-                    break;
-                case 'X-RateLimit-Limit':
-                    $this->_rateLimit = $v;
-                    break;
-                case 'X-RateLimit-Reset':
-                    $this->_rateLimitReset = $v;
-                    break;
-                case 'X-OAuth-Scopes':
-                    $this->_scope = $v;
-                    $this->_scopes = explode(',', $v);
-                    break;
-            }
-        }
-        return $response[1] ?? null;
-    }
-
-    /**
-     * Internal function. Used to turn things like TRUE into 1, and then
-     * calls http_build_query.
-     */
-    protected function buildQueryString(array $array): string
-    {
-        foreach ($array as $k => &$v) {
-            if (is_array($v)) {
-                $v = implode(',', $v);
-            } elseif ($v === true) {
-                $v = '1';
-            }
-            elseif ($v === false) {
-                $v = '0';
-            }
-            unset($v);
-        }
-        return http_build_query($array);
-    }
-
-
-    /**
-     * Internal function to handle all
-     * HTTP requests (POST,PUT,GET,DELETE)
-     */
-    protected function httpReq(string $act, string $req, string|array $params=[], string $contentType='application/x-www-form-urlencoded')
-    {
-        $ch = curl_init($req);
-        $headers = [];
-        if($act !== 'get') {
-            curl_setopt($ch, CURLOPT_POST, true);
-            // if they passed an array, build a list of parameters from it
-            if (is_array($params) && $act !== 'post-raw') {
-                $params = $this->buildQueryString($params);
-            }
-            curl_setopt($ch, CURLOPT_POSTFIELDS, $params);
-            $headers[] = "Content-Type: {$contentType}";
-        }
-        if($act !== 'post' && $act !== 'post-raw') {
-            curl_setopt($ch, CURLOPT_CUSTOMREQUEST, strtoupper($act));
-        }
-        if($act === 'get' && isset($params['access_token'])) {
-            $headers[] = "Authorization: Bearer {$params['access_token']}";
-        } elseif ($this->_accessToken) {
-            $headers[] = "Authorization: Bearer {$this->_accessToken}";
-        }
-        curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
-        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-        curl_setopt($ch, CURLINFO_HEADER_OUT, true);
-        curl_setopt($ch, CURLOPT_HEADER, true);
-        if ($this->_sslCA) {
-            curl_setopt($ch, CURLOPT_CAINFO, $this->_sslCA);
-        }
-        $this->_last_response = curl_exec($ch);
-        $this->_last_request = curl_getinfo($ch, CURLINFO_HEADER_OUT);
-        $http_status = curl_getinfo($ch, CURLINFO_HTTP_CODE);
-        curl_close($ch);
-
-        if ($http_status === 0) {
-            throw new phpnutException("Unable to connect to {$req}");
-        }
-        if ($this->_last_request === false) {
-            if (!curl_getinfo($ch, CURLINFO_SSL_VERIFYRESULT)) {
-                throw new phpnutException('SSL verification failed, connection terminated.');
-            }
-        }
-        if ($this->_last_response) {
-            $response = $this->parseHeaders($this->_last_response);
-            if ($response) {
-                $response = json_decode($response, true);
-
-                if (isset($response['meta'])) {
-                    if (isset($response['meta']['max_id'])) {
-                        $this->_maxid = $response['meta']['max_id'];
-                        $this->_minid = $response['meta']['min_id'];
-                    }
-                    if (isset($response['meta']['more'])) {
-                        $this->_more = $response['meta']['more'];
-                    }
-                    if (isset($response['meta']['marker'])) {
-                        $this->_last_marker = $response['meta']['marker'];
-                    }
-                }
-
-                // look for errors
-                if (isset($response['error'])) {
-                    if (is_array($response['error'])) {
-                        throw new phpnutException(
-                            $response['error']['message'],
-                            $response['error']['code']
-                        );
-                    } else {
-                        throw new phpnutException($response['error']);
-                    }
-                } 
-
-                // look for response migration errors
-                elseif (isset($response['meta'], $response['meta']['error_message'])) {
-                    throw new phpnutException(
-                        $response['meta']['error_message'],
-                        $response['meta']['code']
-                    );
-                }
-            }
-        }
-
-        if ($http_status < 200 || $http_status >= 300) {
-            throw new phpnutException("HTTP error {$http_status}");
-        }
-
-        // if we've received a migration response, handle it and return data only
-        elseif ($this->_stripResponseEnvelope && isset($response['meta'], $response['data'])) {
-            return $response['data'];
-        }
-
-        // else non response migration response, just return it
-        elseif (isset($response)) {
-            return $response;
-        }
-
-        else {
-            throw new phpnutException('No response');
-        }
-    }
-
-
-    /**
-     * Get max_id from last meta response data envelope
-     */
-    public function getResponseMaxID()
-    {
-        return $this->_maxid;
-    }
-
-    /**
-     * Get min_id from last meta response data envelope
-     */
-    public function getResponseMinID()
-    {
-        return $this->_minid;
-    }
-
-    /**
-     * Get more from last meta response data envelope
-     */
-    public function getResponseMore()
-    {
-        return $this->_more;
-    }
-
-    /**
-     * Get marker from last meta response data envelope
-     */
-    public function getResponseMarker()
-    {
-        return $this->_last_marker;
-    }
-
-    public function getLastRequest()
-    {
-        return $this->_last_request;
-    }
-    
-    public function getLastResponse()
-    {
-        return $this->_last_response;
-    }
-
-    /**
-     * Fetch API configuration object
-     * @return array
-     */
-    public function getConfig()
-    {
-        return $this->httpReq('get', "{$this->_baseUrl}sys/config");
-    }
-
-    /**
-     * Fetch basic API statistics
-     * @return array
-     */
-    public function getStats()
-    {
-        return $this->httpReq('get', "{$this->_baseUrl}sys/stats");
-    }
-
-    /**
-     * Process user content, message or post text.
-     * Mentions and hashtags will be parsed out of the
-     * text, as will bare URLs. To create a link in the text without using a
-     * bare URL, include the anchor text in the object text and include a link
-     * entity in the function call.
-     * @param string $text The text of the user/message/post
-     * @param array $data An associative array of optional post data. This
-     * will likely change as the API evolves, as of this writing allowed keys are:
-     * reply_to, and raw. "raw" may be a complex object represented
-     * by an associative array.
-     * @param array $params An associative array of optional data to be included
-     * in the URL (such as 'include_raw')
-     * @return array An associative array representing the post.
-     */
-    public function processText(string $text, array $data=[], array $params=[])
-    {
-        $data['text'] = $text;
-        $json = json_encode($data);
-        $qs = '';
-        if (!empty($params)) {
-            $qs = '?' . $this->buildQueryString($params);
-        }
-        return $this->httpReq(
-            'post',
-            $this->_baseUrl . 'text/process' . $qs,
-            $json,
-            'application/json'
-        );
-    }
-
-    /**
-     * Create a new Post object. Mentions and hashtags will be parsed out of the
-     * post text, as will bare URLs. To create a link in a post without using a
-     * bare URL, include the anchor text in the post's text and include a link
-     * entity in the post creation call.
-     * @param string $text The text of the post
-     * @param array $data An associative array of optional post data. This
-     * will likely change as the API evolves, as of this writing allowed keys are:
-     * reply_to, is_nsfw, and raw. "raw" may be a complex object represented
-     * by an associative array.
-     * @param array $params An associative array of optional data to be included
-     * in the URL (such as 'include_raw')
-     * @return array An associative array representing the post.
-     */
-    public function createPost(string $text, array $data=[], array $params=[])
-    {
-        $data['text'] = $text;
-        $json = json_encode($data);
-        $qs = '';
-        if (!empty($params)) {
-            $qs = '?' . $this->buildQueryString($params);
-        }
-        return $this->httpReq(
-            'post',
-            $this->_baseUrl . 'posts' . $qs,
-            $json,
-            'application/json'
-        );
-    }
-
-    /**
-     * Create a new Post object. Mentions and hashtags will be parsed out of the
-     * post text, as will bare URLs. To create a link in a post without using a
-     * bare URL, include the anchor text in the post's text and include a link
-     * entity in the post creation call.
-     * @param integer $post_id The ID of the post to revise
-     * @param string $text The new text of the post
-     * @param array $data An associative array of optional post data. This
-     * will likely change as the API evolves, as of this writing allowed keys are:
-     * is_nsfw.
-     * @param array $params An associative array of optional data to be included
-     * in the URL (such as 'include_raw')
-     * @return array An associative array representing the post.
-     */
-    public function revisePost(int $post_id, string $text, array $data=[], array $params=[])
-    {
-        $data['text'] = $text;
-        $json = json_encode($data);
-        $qs = '';
-        if (!empty($params)) {
-            $qs = '?' . $this->buildQueryString($params);
-        }
-        return $this->httpReq(
-            'put',
-            $this->_baseUrl . 'posts/' . urlencode($post_id) . $qs,
-            $json,
-            'application/json'
-        );
-    }
-
-    /**
-     * Returns a specific Post.
-     * @param integer $post_id The ID of the post to retrieve
-     * @param array $params An associative array of optional general parameters.
-     * @return array An associative array representing the post
-     */
-    public function getPost(int $post_id, array $params=[])
-    {
-        return $this->httpReq(
-            'get',
-            $this->_baseUrl . 'posts/' . urlencode($post_id) . '?'
-                . $this->buildQueryString($params)
-        );
-    }
-
-    /**
-     * Returns a list of Posts.
-     * @param array $post_ids The list of post IDs to retrieve
-     * @param array $params An associative array of optional general parameters.
-     * @return array An array of arrays representing the posts
-     */
-    public function getMultiplePosts(array $post_ids, array $params=[])
-    {
-        $params['ids'] = $post_ids;
-
-        return $this->httpReq(
-            'get',
-            $this->_baseUrl . 'posts?' . $this->buildQueryString($params)
-        );
-    }
-
-    /**
-     * Delete a Post. The current user must be the same user who created the Post.
-     * It returns the deleted Post on success.
-     * @param integer $post_id The ID of the post to delete
-     * @param array An associative array representing the post that was deleted
-     */
-    public function deletePost(int $post_id)
-    {
-        return $this->httpReq(
-            'delete',
-            $this->_baseUrl . 'posts/' . urlencode($post_id)
-        );
-    }
-
-    /**
-     * Retrieve the Posts that are 'in reply to' a specific Post.
-     * @param integer $post_id The ID of the post you want to retrieve replies for.
-     * @param array $params An associative array of optional general parameters.
-     * @return An array of associative arrays, each representing a single post.
-     */
-    public function getPostThread(int $post_id, array $params=[])
-    {
-        return $this->httpReq(
-            'get',
-            $this->_baseUrl . 'posts/' . urlencode($post_id) . '/thread?'
-                . $this->buildQueryString($params)
-        );
-    }
-
-    /**
-     * Retrieve revisions of a post. Currently only one can be created.
-     * @param integer $post_id The ID of the post you want to retrieve previous revisions of.
-     * @param array $params An associative array of optional general parameters.
-     * @return An array of associative arrays, each representing a single post.
-     */
-    public function getPostRevisions(int $post_id, array $params=[])
-    {
-        return $this->httpReq(
-            'get',
-            $this->_baseUrl . 'posts/' . urlencode($post_id) . '/revisions?'
-                . $this->buildQueryString($params)
-        );
-    }
-
-    /**
-     * Get the most recent Posts created by a specific User in reverse
-     * chronological order (most recent first).
-     * @param mixed $user_id Either the ID of the user you wish to retrieve posts by,
-     * or the string "me", which will retrieve posts for the user you're authenticated
-     * as.
-     * @param array $params An associative array of optional general parameters.
-     * @return An array of associative arrays, each representing a single post.
-     */
-    public function getUserPosts(string|int $user_id='me', array $params=[])
-    {
-        return $this->httpReq(
-            'get',
-            $this->_baseUrl . 'users/' . urlencode($user_id) . '/posts?'
-                . $this->buildQueryString($params)
-        );
-    }
-
-    /**
-     * Get the most recent Posts mentioning by a specific User in reverse
-     * chronological order (newest first).
-     * @param mixed $user_id Either the ID of the user who is being mentioned, or
-     * the string "me", which will retrieve posts for the user you're authenticated
-     * as.
-     * @param array $params An associative array of optional general parameters.
-     * @return An array of associative arrays, each representing a single post.
-     */
-    public function getUserMentions(string|int $user_id='me', array $params=[])
-    {
-        return $this->httpReq(
-            'get',
-            $this->_baseUrl . 'users/' . urlencode($user_id) . '/mentions?'
-                . $this->buildQueryString($params)
-        );
-    }
-
-    /**
-     * Get the currently authenticated user's recent messages
-     * @param array $params An associative array of optional general parameters.
-     * @return An array of associative arrays, each representing a single post.
-     */
-    public function getUserMessages(array $params=[])
-    {
-        return $this->httpReq(
-            'get',
-            $this->_baseUrl . 'users/me/messages?'
-                . $this->buildQueryString($params)
-        );
-    }
-
-    /**
-     * Return the 20 most recent posts from the current User and
-     * the Users they follow.
-     * @param array $params An associative array of optional general parameters.
-     * @return An array of associative arrays, each representing a single post.
-     */
-    public function getUserStream(array $params=[])
-    {
-        return $this->httpReq(
-            'get',
-            $this->_baseUrl . 'posts/streams/me?'
-                . $this->buildQueryString($params)
-        );
-    }
-
-    /**
-     * Retrieve a list of all public Posts on pnut.io, often referred to as the
-     * global stream.
-     * @param array $params An associative array of optional general parameters.
-     * @return An array of associative arrays, each representing a single post.
-     */
-    public function getPublicPosts(array $params=[])
-    {
-        return $this->httpReq(
-            'get',
-            $this->_baseUrl . 'posts/streams/global?'
-                . $this->buildQueryString($params)
-        );
-    }
-
-    /**
-     * Retrieve a list of "explore" streams
-     * @return An array of associative arrays, each representing a single explore stream.
-     */
-    public function getPostExploreStreams()
-    {
-        return $this->httpReq(
-            'get',
-            $this->_baseUrl . 'posts/streams/explore'
-        );
-    }
-
-    /**
-     * Retrieve a list of posts from an "explore" stream on pnut.io.
-     * @param  string $slug [<description>]
-     * @param array $params An associative array of optional general parameters.
-     * @return An array of associative arrays, each representing a single post.
-     */
-    public function getPostExploreStream(string $slug, array $params=[])
-    {
-        return $this->httpReq(
-            'get',
-            $this->_baseUrl . 'posts/streams/explore/' . urlencode($slug) . '?'
-                . $this->buildQueryString($params)
-        );
-    }
-
-    /**
-    * Bookmark a post
-    * @param integer $post_id The post ID to bookmark
-    */
-    public function bookmarkPost(int $post_id)
-    {
-        return $this->httpReq(
-            'put',
-            $this->_baseUrl . 'posts/' . urlencode($post_id) . '/bookmark'
-        );
-    }
-
-    /**
-    * Unbookmark a post
-    * @param integer $post_id The post ID to unbookmark
-    */
-    public function unbookmarkPost(int $post_id)
-    {
-        return $this->httpReq(
-            'delete',
-            $this->_baseUrl . 'posts/' . urlencode($post_id) . '/bookmark'
-        );
-    }
-
-    /**
-    * List the posts bookmarked by the current user
-    * @param array $params An associative array of optional general parameters.
-    * This will likely change as the API evolves, as of this writing allowed keys
-    * are:    count, before_id, since_id, include_muted, include_deleted,
-    * and include_post_raw.
-    * See https://github.com/phpnut/api-spec/blob/master/resources/posts.md#general-parameters
-    * @return array An array of associative arrays, each representing a single
-    * user who has bookmarked a post
-    */
-    public function getBookmarked(string|int $user_id='me', array $params=[])
-    {
-        return $this->httpReq(
-            'get',
-            $this->_baseUrl . 'users/' . urlencode($user_id) . '/bookmarks?'
-                . $this->buildQueryString($params)
-        );
-    }
-
-    /**
-    * List the interactions with a post (bookmark, repost, reply)
-    * @param integer $post_id the post ID to get interactions from
-    * @param array $params optional parameters like filters or excludes
-    * @return array An array of associative arrays, each representing one post interaction.
-    */
-    public function getPostInteractions(int $post_id, array $params=[])
-    {
-        return $this->httpReq(
-            'get',
-            $this->_baseUrl . 'posts/' . urlencode($post_id) . '/interactions?'
-                . $this->buildQueryString($params)
-        );
-    }
-
-    /**
-    * List the bookmarks of a post
-    * @param integer $post_id the post ID to get stars from
-    * @return array An array of associative arrays, each representing one bookmark action.
-    */
-    public function getPostBookmarks(int $post_id)
-    {
-        return $this->getPostInteractions($post_id, ['filters'=>['bookmark']]);
-    }
-
-    /**
-     * Returns an array of User objects of users who reposted the specified post.
-     * @param integer $post_id the post ID to
-     * @return array An array of associative arrays, each representing a single
-     * user who reposted $post_id
-     */
-    public function getPostReposts(int $post_id)
-    {
-        return $this->getPostInteractions($post_id, ['filters'=>['repost']]);
-    }
-
-    /**
-     * Repost an existing Post object.
-     * @param integer $post_id The id of the post
-     * @return the reposted post
-     */
-    public function repost(int $post_id)
-    {
-        return $this->httpReq(
-            'put',
-            $this->_baseUrl . 'posts/' . urlencode($post_id) . '/repost'
-        );
-    }
-
-    /**
-     * Delete a post that the user has reposted.
-     * @param integer $post_id The id of the post
-     * @return the un-reposted post
-     */
-    public function deleteRepost(int $post_id)
-    {
-        return $this->httpReq(
-            'delete',
-            $this->_baseUrl . 'posts/' . urlencode($post_id) . '/repost'
-        );
-    }
-
-    /**
-     * Return Posts matching a specific #hashtag.
-     * @param string $hashtag The hashtag you're looking for.
-     * @param array $params An associative array of optional general parameters.
-     * This will likely change as the API evolves, as of this writing allowed keys
-     * are: count, before_id, since_id, include_muted, include_deleted,
-     * include_directed_posts, and include_raw.
-     * @return An array of associative arrays, each representing a single post.
-     */
-    public function searchHashtags(string $hashtag, array $params=[])
-    {
-        return $this->httpReq(
-            'get',
-            $this->_baseUrl . 'posts/tags/' . urlencode($hashtag) . '?'
-                . $this->buildQueryString($params)
-        );
-    }
-
-    /**
-     * List the posts who match a specific search term
-     * @param array $params a list of filter, search query, and general Post parameters
-     * see: https://docs.pnut.io/resources/posts/search
-     * @param string $query The search query. Supports
-     * normal search terms. Searches post text.
-     * @return array An array of associative arrays, each representing one post.
-     * or false on error
-     */
-    public function searchPosts(array $params=[], string $query='', string $order='default')
-    {
-        if (!is_array($params)) {
-            return false;
-        }
-        if (!empty($query)) {
-            $params['q'] = $query;
-        }
-        if ($order === 'default') {
-            if (!empty($query)) {
-                $params['order'] = 'relevance';
-            } else {
-                $params['order'] = 'id';
-            }
-        }
-        return $this->httpReq(
-            'get',
-            $this->_baseUrl . 'posts/search?' . $this->buildQueryString($params)
-        );
-    }
-
-    /**
-     * Return the 20 most recent posts for a stream using a valid Token
-     * @param array $params An associative array of optional general parameters.
-     * This will likely change as the API evolves, as of this writing allowed keys
-     * are: count, before_id, since_id, include_muted, include_deleted,
-     * and include_post_raw.
-     * @return An array of associative arrays, each representing a single post.
-     */
-    public function getUserPersonalStream(array $params=[])
-    {
-        if ($params['access_token']) {
-            return $this->httpReq(
-                'get',
-                $this->_baseUrl . 'posts/streams/me?'
-                    . $this->buildQueryString($params),
-                $params
-            );
-        } else {
-            return $this->httpReq(
-                'get',
-                $this->_baseUrl . 'posts/streams/me?'
-                    . $this->buildQueryString($params)
-            );
-        }
-    }
-    
-    /**
-    * Return the 20 most recent Posts from the current User's personalized stream
-    * and mentions stream merged into one stream.
-    * @param array $params An associative array of optional general parameters.
-    * This will likely change as the API evolves, as of this writing allowed keys
-    * are: count, before_id, since_id, include_muted, include_deleted,
-    * include_directed_posts, and include_raw.
-    * @return An array of associative arrays, each representing a single post.
-    */
-    public function getUserUnifiedStream(array $params=[])
-    {
-        return $this->httpReq(
-            'get',
-            $this->_baseUrl . 'posts/streams/unified?'
-                . $this->buildQueryString($params)
-        );
-    }
-
-    /**
-     * List User interactions
-     */
-    public function getMyActions(array $params=[])
-    {
-        return $this->httpReq(
-            'get',
-            $this->_baseUrl . 'users/me/interactions?'
-                . $this->buildQueryString($params)
-        );
-    }
-
-    /**
-     * Returns a specific user object.
-     * @param mixed $user_id The ID of the user you want to retrieve, or the string "@-username", or the string
-     * "me" to retrieve data for the users you're currently authenticated as.
-     * @param array $params An associative array of optional general parameters.
-     * This will likely change as the API evolves, as of this writing allowed keys
-     * are: include_raw|include_user_raw.
-     * @return array An associative array representing the user data.
-     */
-    public function getUser(string|int $user_id='me', array $params=[])
-    {
-        return $this->httpReq(
-            'get',
-            $this->_baseUrl . 'users/' . urlencode($user_id) . '?'
-                . $this->buildQueryString($params)
-        );
-    }
-
-    /**
-     * Returns multiple users request by an array of user ids
-     * @param array $params An associative array of optional general parameters.
-     * This will likely change as the API evolves, as of this writing allowed keys
-     * are: include_raw|include_user_raw.
-     * @return array An associative array representing the users data.
-     */
-    public function getUsers(array $user_arr, array $params=[])
-    {
-        return $this->httpReq(
-            'get',
-            $this->_baseUrl . 'users?ids=' . implode(',', $user_arr)
-                    . '&' . $this->buildQueryString($params)
-        );
-    }
-
-    /**
-     * Add the specified user ID to the list of users followed.
-     * Returns the User object of the user being followed.
-     * @param integer $user_id The user ID of the user to follow.
-     * @return array An associative array representing the user you just followed.
-     */
-    public function followUser(string|int $user_id)
-    {
-        return $this->httpReq(
-            'put',
-            $this->_baseUrl . 'users/' . urlencode($user_id) . '/follow'
-        );
-    }
-
-    /**
-     * Removes the specified user ID to the list of users followed.
-     * Returns the User object of the user being unfollowed.
-     * @param integer $user_id The user ID of the user to unfollow.
-     * @return array An associative array representing the user you just unfollowed.
-     */
-    public function unfollowUser(string|int $user_id)
-    {
-        return $this->httpReq(
-            'delete',
-            $this->_baseUrl . 'users/' . urlencode($user_id) . '/follow'
-        );
-    }
-
-    /**
-     * Returns an array of User objects the specified user is following.
-     * @param mixed $user_id Either the ID of the user being followed, or
-     * the string "me", which will retrieve posts for the user you're authenticated
-     * as.
-     * @return array An array of associative arrays, each representing a single
-     * user following $user_id
-     */
-    public function getFollowing(string|int $user_id='me', array $params=[])
-    {
-        return $this->httpReq(
-            'get',
-            $this->_baseUrl . 'users/' . urlencode($user_id) . '/following?'
-                . $this->buildQueryString($params)
-        );
-    }
-    
-    /**
-     * Returns an array of User ids the specified user is following.
-     * @param mixed $user_id Either the ID of the user being followed, or
-     * the string "me", which will retrieve posts for the user you're authenticated
-     * as.
-     * @return array user ids the specified user is following.
-     */
-    public function getFollowingIDs(string|int $user_id='me')
-    {
-        return $this->httpReq(
-            'get',
-            "{$this->_baseUrl}users/{$user_id}/following?include_user=0"
-        );
-    }
-    
-    /**
-     * Returns an array of User objects for users following the specified user.
-     * @param mixed $user_id Either the ID of the user being followed, or
-     * the string "me", which will retrieve posts for the user you're authenticated
-     * as.
-     * @return array An array of associative arrays, each representing a single
-     * user following $user_id
-     */
-    public function getFollowers(string|int $user_id='me', array $params=[])
-    {
-        return $this->httpReq(
-            'get',
-            $this->_baseUrl . 'users/' . urlencode($user_id) . '/followers?'
-                . $this->buildQueryString($params)
-        );
-    }
-    
-    /**
-     * Returns an array of User ids for users following the specified user.
-     * @param mixed $user_id Either the ID of the user being followed, or
-     * the string "me", which will retrieve posts for the user you're authenticated
-     * as.
-     * @return array user ids for users following the specified user
-     */
-    public function getFollowersIDs(string|int $user_id='me')
-    {
-        return $this->httpReq(
-            'get',
-            "{$this->_baseUrl}users/{$user_id}/followers?include_user=0"
-        );
-    }
-
-    /**
-     * Retrieve a user's user ID by specifying their username.
-     * @param string $username The username of the user you want the ID of, without
-     * an @ symbol at the beginning.
-     * @return integer The user's user ID
-     */
-    public function getIdByUsername(string $username)
-    {
-        return $this->httpReq(
-            'get',
-            "{$this->_baseUrl}users/@{$username}?include_user=0"
-        );
-    }
-
-    /**
-     * Mute a user
-     * @param integer $user_id The user ID to mute
-     */
-    public function muteUser(string|int $user_id)
-    {
-         return $this->httpReq(
-            'put',
-            $this->_baseUrl . 'users/' . urlencode($user_id) . '/mute'
-        );
-    }
-
-    /**
-     * Unmute a user
-     * @param integer $user_id The user ID to unmute
-     */
-    public function unmuteUser(string|int $user_id)
-    {
-        return $this->httpReq(
-            'delete',
-            $this->_baseUrl . 'users/' . urlencode($user_id) . '/mute'
-        );
-    }
-
-    /**
-     * List the users muted by the current user
-     * @return array An array of associative arrays, each representing one muted user.
-     */
-    public function getMuted()
-    {
-        return $this->httpReq(
-            'get',
-            "{$this->_baseUrl}users/me/muted"
-        );
-    }
-
-    /**
-     * Get a user object by username
-     * @param string $name the @name to get
-     * @return array representing one user
-     */
-    public function getUserByName(string $name)
-    {
-        return $this->httpReq(
-            'get',
-            "{$this->_baseUrl}users/@{$name}"
-        );
-    }
-
-    /**
-     * List the users who match a specific search term
-     * @param string $search The search query. Supports @username or #tag searches as
-     * well as normal search terms. Searches username, display name, bio information.
-     * Does not search posts.
-     * @return array An array of associative arrays, each representing one user.
-     */
-    public function searchUsers(array $params=[], string $query='')
-    {
-        if (!is_array($params)) {
-            return false;
-        }
-        if ($query === '') {
-            return false;
-        }
-        $params['q'] = $query;
-        return $this->httpReq(
-            'get',
-            $this->_baseUrl . 'users/search?q=' . $this->buildQueryString($params)
-        );
-    }
-
-    /**
-     * Update Profile Data via JSON
-     * @data array containing user descriptors
-     */
-    public function updateUserData(array $data=[], array $params=[])
-    {
-        $json = json_encode($data);
-        return $this->httpReq(
-            'put',
-            $this->_baseUrl . 'users/me?'
-                . $this->buildQueryString($params),
-            $json,
-            'application/json'
-        );
-    }
-
-    /**
-     * Update a user image
-     * @image path reference to image
-     * @which avatar|cover
-     */
-    protected function updateUserImage(string $image, string $which='avatar')
-    {
-        $test = @getimagesize($image);
-        if ($test && array_key_exists('mime', $test)) {
-            $mimeType = $test['mime'];
-        }
-        $data = [
-            $which => new CurlFile($image, $mimeType)
-        ];
-        return $this->httpReq(
-            'post-raw',
-            "{$this->_baseUrl}users/me/{$which}",
-            $data,
-            'multipart/form-data'
-        );
-    }
-
-    public function updateUserAvatar($avatar)
-    {
-        return $this->updateUserImage('avatar', $avatar);
-    }
-
-    public function updateUserCover($cover)
-    {
-        return $this->updateUserImage('cover', $cover);
-    }
-
-    /**
-     * Returns a Client object
-     * @param string $client_id
-     * @return array An array representing the client
-     */
-    public function getClient(string $client_id, array $params=[])
-    {
-        return $this->httpReq(
-            'get',
-            $this->_baseUrl . 'clients/' . urlencode($client_id) . '?'
-                . $this->buildQueryString($params)
-        );
-    }
-
-    /**
-     * Returns a list of truncated client details made by a user
-     * @param string $user_id
-     * @return array A list of arrays representing clients
-     */
-    public function getUserClients(string $user_id)
-    {
-        return $this->httpReq(
-            'get',
-            $this->_baseUrl . 'users/' . urlencode($user_id) . '/clients'
-        );
-    }
-
-    /**
-     * update stream marker
-     */
-    public function updateStreamMarker(array $data=[])
-    {
-        $json = json_encode($data);
-        return $this->httpReq(
-            'post',
-            "{$this->_baseUrl}markers",
-            $json,
-            'application/json'
-        );
-    }
-
-    /**
-     * get a page of current user subscribed channels
-     */
-    public function getMyChannelSubscriptions(array $params=[])
-    {
-        return $this->httpReq(
-            'get',
-            $this->_baseUrl . 'users/me/channels/subscribed?' . $this->buildQueryString($params)
-        );
-    }
-
-    /**
-     * get user channels
-     */
-    public function getMyChannels(array $params=[])
-    {
-        return $this->httpReq(
-            'get',
-            $this->_baseUrl . 'users/me/channels?' . $this->buildQueryString($params)
-        );
-    }
-
-    /**
-     * create a channel
-     * note: you cannot create a channel with type=io.pnut.core.pm (see createMessage)
-     */
-    public function createChannel(array $data=[])
-    {
-        $json = json_encode($data);
-        return $this->httpReq(
-            'post',
-            "{$this->_baseUrl}channels",
-            $json,
-            'application/json'
-        );
-    }
-
-    /**
-     * get channelid info
-     */
-    public function getChannel(int $channelid, array $params=[])
-    {
-        return $this->httpReq(
-            'get',
-            $this->_baseUrl . 'channels/' . $channelid . '?'
-                . $this->buildQueryString($params)
-        );
-    }
-
-    /**
-     * get an existing private message channel between multiple users
-     * @param mixed $users Can be a comma- or space-separated string, or an array.
-     * Usernames with @-symbol, or user ids.
-     */
-    public function getExistingPM(string|array $users, array $params=[])
-    {
-        if (is_string($users)) {
-            $users = explode(',', str_replace(' ', ',', $users));
-        }
-        foreach($users as $key=>$user) {
-            if (!is_numeric($user) && substr($user, 0, 1) !== '@') {
-                $users[$key] = "@{$user}";
-            }
-        }
-        $params['ids'] = $users;
-        return $this->httpReq(
-            'get',
-            $this->_baseUrl . 'users/me/channels/existing_pm?'
-                . $this->buildQueryString($params)
-        );
-    }
-
-    /**
-     * get multiple channels' info by an array of channelids
-     */
-    public function getChannels(array $channels, array $params=[])
-    {
-        return $this->httpReq(
-            'get',
-            $this->_baseUrl . 'channels?ids=' . implode(',', $channels) . '&'
-                . $this->buildQueryString($params)
-        );
-    }
-
-    /**
-     * update channelid
-     */
-    public function updateChannel(int $channelid, array $data=[])
-    {
-        $json = json_encode($data);
-        return $this->httpReq(
-            'put',
-            "{$this->_baseUrl}channels/{$channelid}",
-            $json,
-            'application/json'
-        );
-    }
-
-    /**
-     * subscribe from channelid
-     */
-    public function channelSubscribe(int $channelid)
-    {
-        return $this->httpReq(
-            'put',
-            $this->_baseUrl.'channels/'.$channelid.'/subscribe'
-        );
-    }
-
-    /**
-     * unsubscribe from channelid
-     */
-    public function channelUnsubscribe(int $channelid)
-    {
-        return $this->httpReq(
-            'delete',
-            $this->_baseUrl.'channels/'.$channelid.'/subscribe'
-        );
-    }
-
-    /**
-     * mute channelid
-     */
-    public function channelMute(int $channelid)
-    {
-        return $this->httpReq(
-            'put',
-            $this->_baseUrl.'channels/'.$channelid.'/mute'
-        );
-    }
-
-    /**
-     * unmute channelid
-     */
-    public function channelUnmute(int $channelid)
-    {
-        return $this->httpReq(
-            'delete',
-            $this->_baseUrl.'channels/'.$channelid.'/mute'
-        );
-    }
-
-    /**
-     * get all user objects subscribed to channelid
-     */
-    public function getChannelSubscriptions(int $channelid, array $params=[])
-    {
-        return $this->httpReq(
-            'get',
-            $this->_baseUrl.'channels/'.$channelid.'/subscribers?'
-                . $this->buildQueryString($params)
-        );
-    }
-
-    /**
-     * get all user IDs subscribed to channelid
-     */
-    public function getChannelSubscriptionsById(int $channelid)
-    {
-        return $this->httpReq(
-            'get',
-            "{$this->_baseUrl}channels/{$channelid}/subscribers?include_user=0"
-        );
-    }
-
-    /**
-     * Retrieve a list of "explore" streams
-     * @return An array of associative arrays, each representing a single explore stream.
-     */
-    public function getChannelExploreStreams()
-    {
-        return $this->httpReq(
-            'get',
-            $this->_baseUrl . 'channels/streams/explore'
-        );
-    }
-
-    /**
-     * Retrieve a list of channels from an "explore" stream on pnut.io.
-     * @param  string $slug [<description>]
-     * @param array $params An associative array of optional general parameters.
-     * @return An array of associative arrays, each representing a single channel.
-     */
-    public function getChannelExploreStream(string $slug, array $params=[])
-    {
-        return $this->httpReq(
-            'get',
-            $this->_baseUrl . 'channels/streams/explore/' . urlencode($slug) . '?'
-                . $this->buildQueryString($params)
-        );
-    }
-    
-    /**
-     * mark channel inactive
-     */
-    public function deleteChannel(int $channelid)
-    {
-        return $this->httpReq(
-            'delete',
-            $this->_baseUrl.'channels/'.$channelid
-        );
-    }
-
-    /**
-     * List the channels that match a specific search term
-     * @param array $params a list of filter, search query, and general Channel parameters
-     * see: https://docs.pnut.io/resources/channels/search
-     * @param string $query The search query. Supports
-     * normal search terms. Searches common channel raw.
-     * @return array An array of associative arrays, each representing one channel.
-     * or false on error
-     */
-    public function searchChannels(array $params=[], string $query='', string $order='default')
-    {
-        if (!empty($query)) {
-            $params['q'] = $query;
-        }
-        if ($order === 'default') {
-            if (!empty($query)) {
-                $params['order'] = 'id';
-            } else {
-                $params['order'] = 'activity';
-            }
-        }
-        return $this->httpReq(
-            'get',
-            $this->_baseUrl . 'channels/search?' . $this->buildQueryString($params)
-        );
-    }
-
-
-    /**
-     * get a page of messages in channelid
-     */
-    public function getMessages(int $channelid, array $params=[])
-    {
-        return $this->httpReq(
-            'get',
-            $this->_baseUrl.'channels/'.$channelid.'/messages?'
-                . $this->buildQueryString($params)
-        );
-    }
-
-    /**
-     * get a page of messages in channelid in a thread
-     */
-    public function getMessageThread(int $channelid, int $messageid, array $params=[])
-    {
-        return $this->httpReq(
-            'get',
-            $this->_baseUrl.'channels/'.$channelid.'/messages/'.$messageid.'/thread?'
-                . $this->buildQueryString($params)
-        );
-    }
-
-    /**
-     * get a page of sticky messages in channelid
-     */
-    public function getStickyMessages(int $channelid, array $params=[])
-    {
-        return $this->httpReq(
-            'get',
-            $this->_baseUrl.'channels/'.$channelid.'/sticky_messages?'
-                . $this->buildQueryString($params)
-        );
-    }
-
-    /**
-     * sticky messsage
-     */
-    public function stickyMessage(int $channelid, int $messageid)
-    {
-        return $this->httpReq(
-            'put',
-            $this->_baseUrl.'channels/'.$channelid.'/messages/'.$messageid.'/sticky'
-        );
-    }
-
-    /**
-     * unsticky messsage
-     */
-    public function unstickyMessage(int $channelid, int $messageid)
-    {
-        return $this->httpReq(
-            'delete',
-            $this->_baseUrl.'channels/'.$channelid.'/messages/'.$messageid.'/sticky'
-        );
-    }
-
-    /**
-     * create message
-     * @param $channelid numeric or "pm" for auto-channel (type=io.pnut.core.pm)
-     * @param array $data array('text'=>'YOUR_MESSAGE') If a type=io.pnut.core.pm, then "destinations" key can be set to address as an array of people to send this PM too
-     * @param array $params query parameters
-     */
-    public function createMessage(string|int $channelid, array $data, array $params=[])
-    {
-        if (isset($data['destinations'])) {
-            if (is_string($data['destinations'])) {
-                $data['destinations'] = explode(',', str_replace(' ', ',', $data['destinations']));
-            }
-            foreach($data['destinations'] as $key=>$user) {
-                if (!is_numeric($user) && substr($user, 0,1 ) !== '@') {
-                    $data['destinations'][$key] = "@{$user}";
-                }
-            }
-        }
-        $json = json_encode($data);
-        return $this->httpReq(
-            'post',
-            $this->_baseUrl.'channels/'.$channelid.'/messages?'
-                . $this->buildQueryString($params),
-            $json,
-            'application/json'
-        );
-    }
-
-    /**
-     * get message
-     */
-    public function getMessage(int $channelid, int $messageid, array $params=[])
-    {
-        return $this->httpReq(
-            'get',
-            $this->_baseUrl.'channels/'.$channelid.'/messages/'.$messageid.'?'
-                . $this->buildQueryString($params)
-        );
-    }
-
-    /**
-     * Returns a list of Messages.
-     * @param array $message_ids The list of message IDs to retrieve
-     * @param array $params An associative array of optional general parameters.
-     * @return array An array of arrays representing the messages
-     */
-    public function getMultipleMessages(array $message_ids, array $params=[])
-    {
-        $params['ids'] = $message_ids;
-
-        return $this->httpReq(
-            'get',
-            $this->_baseUrl . 'channels/messages?' . $this->buildQueryString($params)
-        );
-    }
-
-    /**
-     * delete messsage
-     */
-    public function deleteMessage(int $channelid, int $messageid)
-    {
-        return $this->httpReq(
-            'delete',
-            $this->_baseUrl.'channels/'.$channelid.'/messages/'.$messageid
-        );
-    }
-
-    /**
-     * List the messages that match a specific search term
-     * @param array $params a list of filter, search query, and general Message parameters
-     * see: https://docs.pnut.io/resources/messages/search
-     * @param string $query The search query. Supports
-     * normal search terms. Searches common channel raw.
-     * @return array An array of associative arrays, each representing one channel.
-     * or false on error
-     */
-    public function searchMessages(array $params=[], string $query='', string $order='default')
-    {
-        if (!is_array($params)) {
-            return false;
-        }
-        if (!empty($query)) {
-            $params['q'] = $query;
-        }
-        if ($order === 'default') {
-            if (!empty($query)) {
-                $params['order'] = 'id';
-            } else {
-                $params['order'] = 'relevance';
-            }
-        }
-        return $this->httpReq(
-            'get',
-            $this->_baseUrl . 'channels/messages/search?'
-                . $this->buildQueryString($params)
-        );
-    }
-
-    /**
-     * Upload a file to a user's file store
-     * @param string $file A string containing the path of the file to upload.
-     * @param array $data Additional data about the file you're uploading. At the
-     * moment accepted keys are: mime-type, kind, type, name, public and raw.
-     * - If you don't specify mime-type, phpnut will attempt to guess the mime type
-     * based on the file, however this isn't always reliable.
-     * - If you don't specify kind phpnut will attempt to determine if the file is
-     * an image or not.
-     * - If you don't specify name, phpnut will use the filename of the first
-     * parameter.
-     * - If you don't specify is_public, your file will be uploaded as a private file.
-     * - Type is REQUIRED.
-     * @param array $params An associative array of optional general parameters.
-     * This will likely change as the API evolves, as of this writing allowed keys
-     * are: include_raw|include_file_raw.
-     * @return array An associative array representing the file
-     */
-    public function createFile($file, array $data, array $params=[])
-    {
-        if (!$file) {
-            throw new PhpnutException('You must specify a path to a file');
-        }
-        if (!file_exists($file)) {
-            throw new PhpnutException('File path specified does not exist');
-        }
-        if (!is_readable($file)) {
-            throw new PhpnutException('File path specified is not readable');
-        }
-        if (!array_key_exists('type', $data) || !$data['type']) {
-            throw new PhpnutException('Type is required when creating a file');
-        }
-        if (!array_key_exists('name', $data)) {
-            $data['name'] = basename($file);
-        }
-        if (array_key_exists('mime-type', $data)) {
-            $mimeType = $data['mime-type'];
-            unset($data['mime-type']);
-        } else {
-            $mimeType = null;
-        }
-        if (!array_key_exists('kind', $data)) {
-            $test = @getimagesize($path);
-            if ($test && array_key_exists('mime', $test)) {
-                $data['kind'] = 'image';
-                if (!$mimeType) {
-                    $mimeType = $test['mime'];
-                }
-            }
-            else {
-                $data['kind'] = 'other';
-            }
-        }
-        if (!$mimeType) {
-            $finfo = finfo_open(FILEINFO_MIME_TYPE);
-            $mimeType = finfo_file($finfo, $file);
-            finfo_close($finfo);
-        }
-        if (!$mimeType) {
-            throw new PhpnutException('Unable to determine mime type of file, try specifying it explicitly');
-        }
-        $data['content'] = new \CurlFile($file, $mimeType);
-        return $this->httpReq(
-            'post-raw',
-            "{$this->_baseUrl}files",
-            $data,
-            'multipart/form-data'
-        );
-    }
-
-    public function createFilePlaceholder($file, array $params=[])
-    {
-        $name = basename($file);
-        $data = [
-            'raw' => $params['raw'],
-            'kind' => $params['kind'],
-            'name' => $name,
-            'type' => $params['metadata']
-        ];
-        $json = json_encode($data);
-        return $this->httpReq(
-            'post',
-            $this->_baseUrl.'files',
-            $json,
-            'application/json'
-        );
-    }
-
-    public function updateFileContent(int $fileid, string $file)
-    {
-        $data = file_get_contents($file);
-        $finfo = finfo_open(FILEINFO_MIME_TYPE);
-        $mime = finfo_file($finfo, $file);
-        finfo_close($finfo);
-        return $this->httpReq(
-            'put',
-            $this->_baseUrl.'files/'.$fileid.'/content',
-            $data,
-            $mime
-        );
-    }
-
-    /**
-     * Allows for file rename and annotation changes.
-     * @param integer $file_id The ID of the file to update
-     * @param array $params An associative array of file parameters.
-     * @return array An associative array representing the updated file
-    */
-    public function updateFile(int $file_id, array $params=[])
-    {
-        $data = [
-            'raw' => $params['raw'],
-            'name' => $params['name'],
-        ];
-        $json = json_encode($data);
-        return $this->httpReq(
-            'put',
-            $this->_baseUrl.'files/'.urlencode($file_id),
-            $json,
-            'application/json'
-        );
-    }
-
-    /**
-     * Returns a specific File.
-     * @param integer $file_id The ID of the file to retrieve
-     * @param array $params An associative array of optional general parameters.
-     * This will likely change as the API evolves, as of this writing allowed keys
-     * are: include_raw|include_file_raw.
-     * @return array An associative array representing the file
-     */
-    public function getFile(int $file_id, array $params=[])
-    {
-        return $this->httpReq(
-            'get',
-            $this->_baseUrl.'files/'.urlencode($file_id).'?'
-                . $this->buildQueryString($params)
-        );
-    }
-
-    public function getFileContent(int $file_id, array $params=[])
-    {
-        return $this->httpReq(
-            'get',
-            $this->_baseUrl.'files/'.urlencode($file_id).'/content?'
-                . $this->buildQueryString($params)
-        );
-    }
-
-    /** $file_key : derived_file_key */
-    public function getDerivedFileContent(int $file_id, string $file_key, array $params=[])
-    {
-        return $this->httpReq(
-            'get',
-            $this->_baseUrl.'files/'.urlencode($file_id).'/content/'.urlencode($file_key).'?'.$this->buildQueryString($params)
-        );
-    }
-
-    /**
-     * Returns file objects.
-     * @param array $file_ids The IDs of the files to retrieve
-     * @param array $params An associative array of optional general parameters.
-     * This will likely change as the API evolves, as of this writing allowed keys
-     * are: include_raw|include_file_raw.
-     * @return array An associative array representing the file data.
-     */
-    public function getFiles(array $file_ids, array $params=[])
-    {
-        $ids = '';
-        foreach($file_ids as $id) {
-            $ids .= $id . ',';
-        }
-        $params['ids'] = substr($ids, 0, -1);
-        return $this->httpReq(
-            'get',
-            $this->_baseUrl.'files?'.$this->buildQueryString($params)
-        );
-    }
-
-    /**
-     * Returns a user's file objects.
-     * @param array $params An associative array of optional general parameters.
-     * This will likely change as the API evolves, as of this writing allowed keys
-     * are: include_raw|include_file_raw|include_user_raw.
-     * @return array An associative array representing the file data.
-     */
-    public function getUserFiles(array $params=[])
-    {
-        return $this->httpReq(
-            'get',
-            $this->_baseUrl.'users/me/files?'.$this->buildQueryString($params)
-        );
-    }
-
-    /**
-     * Delete a File. The current user must be the same user who created the File.
-     * It returns the deleted File on success.
-     * @param integer $file_id The ID of the file to delete
-     * @return array An associative array representing the file that was deleted
-     */
-    public function deleteFile(int $file_id)
-    {
-        return $this->httpReq(
-            'delete',
-            $this->_baseUrl.'files/'.urlencode($file_id)
-        );
-    }
-
-    /**
-     * Create a poll
-     * @param array $data An associative array of the required parameters.
-     * @param array $params An associative array of optional general parameters.
-     * Allowed keys: include_raw,include_poll_raw, ...
-     * @return array An associative array representing the poll
-     */
-    public function createPoll(array $data, array $params=[])
-    {
-        $json = json_encode($data);
-        return $this->httpReq(
-            'post',
-            $this->_baseUrl.'polls?'.$this->buildQueryString($params), 
-            $json,
-            'application/json'
-        );
-    }
-
-    /**
-     * Responds to a poll.
-     * @param integer $poll_id The ID of the poll to respond to
-     * @param array list of positions for the poll response
-     * @param array $params An associative array of optional general parameters.
-     */
-    public function respondToPoll(int $poll_id, array $positions, array $params=[])
-    {
-        $json = json_encode(['positions' => $positions]);
-        return $this->httpReq(
-            'put',
-            $this->_baseUrl.'polls/'.urlencode($poll_id).'/response?'.$this->buildQueryString($params),
-            $json, 
-            'application/json'
-        );
-    }
-
-    /**
-     * Returns a specific Poll.
-     * @param integer $poll_id The ID of the poll to retrieve
-     * @param array $params An associative array of optional general parameters.
-     * @return array An associative array representing the poll
-     */
-    public function getPoll(int $poll_id, array $params=[])
-    {
-        return $this->httpReq(
-            'get',
-            $this->_baseUrl.'polls/'.urlencode($poll_id).'?'.$this->buildQueryString($params)
-        );
-    }
-
-    /**
-     * Returns a list of Polls.
-     * @param array $poll_ids The list of poll IDs to retrieve
-     * @param array $params An associative array of optional general parameters.
-     * @return array An array of arrays representing the polls
-     */
-    public function getMultiplePolls(array $poll_ids, array $params=[])
-    {
-        $params['ids'] = $poll_ids;
-
-        return $this->httpReq(
-            'get',
-            $this->_baseUrl . 'polls?' . $this->buildQueryString($params)
-        );
-    }
-
-    /**
-     * Returns a user's poll objects.
-     * @param array $params An associative array of optional general parameters.
-     * @return array An associative array representing the poll data.
-     */
-    public function getUserPolls(array $params=[])
-    {
-        return $this->httpReq(
-            'get',
-            $this->_baseUrl.'users/me/polls?'.$this->buildQueryString($params)
-        );
-    }
-
-    /**
-     * Delete a Poll. The current user must be the same user who created the Poll.
-     * @param integer $poll_id The ID of the poll to delete
-     * @param array $params An associative array of optional general parameters.
-     * @return array An associative array representing the poll that was deleted
-     */
-    public function deletePoll(int $poll_id, array $params=[])
-    {
-        return $this->httpReq(
-            'delete',
-            $this->_baseUrl.'polls/'.urlencode($poll_id).'?'.$this->buildQueryString($params)
-        );
-    }
-
-    /**
-     * List the polls that match a specific search term
-     * @param array $params a list of filter, search query, and general Poll parameters
-     * see: https://docs.pnut.io/resources/channels/search
-     * @param string $query The search query. Supports
-     * normal search terms.
-     * @return array An array of associative arrays, each representing one poll.
-     * or false on error
-     */
-    public function searchPolls(array $params=[], string $order='id')
-    {
-        $params['order'] = $order;
-
-        return $this->httpReq(
-            'get',
-            $this->_baseUrl . 'polls/search?' . $this->buildQueryString($params)
-        );
-    }
-
-
-    /**
-     * Get Application Information
-     */
-    public function getAppTokenInfo()
-    {
-        // requires appAccessToken
-        if (!$this->_appAccessToken) {
-            $this->getAppAccessToken();
-        }
-        // ensure request is made with our appAccessToken
-        $params['access_token'] = $this->_appAccessToken;
-        return $this->httpReq(
-            'get',
-            "{$this->_baseUrl}token",
-            $params
-        );
-    }
-    
-    /**
-     * Get User Information
-     */
-    public function getUserTokenInfo()
-    {
-        return $this->httpReq(
-            'get',
-            "{$this->_baseUrl}token"
-        );
-    }
-    
-    /**
-     * Get Application Authorized User IDs
-     */
-    public function getAppUserIDs()
-    {
-        // requires appAccessToken
-        if (!$this->_appAccessToken) {
-            $this->getAppAccessToken();
-        }
-        // ensure request is made with our appAccessToken
-        $params['access_token'] = $this->_appAccessToken;
-        return $this->httpReq(
-            'get',
-            "{$this->_baseUrl}apps/me/users/ids",
-            $params
-        );
-    }
-    
-    /**
-     * Get Application Authorized User Tokens
-     */
-    public function getAppUserTokens()
-    {
-        // requires appAccessToken
-        if (!$this->_appAccessToken) {
-            $this->getAppAccessToken();
-        }
-        // ensure request is made with our appAccessToken
-        $params['access_token'] = $this->_appAccessToken;
-        return $this->httpReq(
-            'get',
-            "{$this->_baseUrl}apps/me/users/tokens",
-            $params
-        );
-    }
-
-
-
-    /**
-     * Registers your function (or an array of object and method) to be called
-     * whenever an event is received via an open pnut.io stream. Your function
-     * will receive a single parameter, which is the object wrapper containing
-     * the meta and data.
-     * @param mixed A PHP callback (either a string containing the function name,
-     * or an array where the first element is the class/object and the second
-     * is the method).
-     */
-    public function registerStreamFunction($function): void
-    {
-        $this->_streamCallback = $function;
-    }
-    
-    /**
-     * Opens a stream that's been created for this user/app and starts sending
-     * events/objects to your defined callback functions. You must define at
-     * least one callback function before opening a stream.
-     * @param mixed $stream Either a stream ID or the endpoint of a stream
-     * you've already created. This stream must exist and must be valid for
-     * your current access token. If you pass a stream ID, the library will
-     * make an API call to get the endpoint.
-     *
-     * This function will return immediately, but your callback functions
-     * will continue to receive events until you call closeStream() or until
-     * pnut.io terminates the stream from their end with an error.
-     *
-     * If you're disconnected due to a network error, the library will
-     * automatically attempt to reconnect you to the same stream, no action
-     * on your part is necessary for this. However if the pnut.io API returns
-     * an error, a reconnection attempt will not be made.
-     *
-     * Note there is no closeStream, because once you open a stream you
-     * can't stop it (unless you exit() or die() or throw an uncaught
-     * exception, or something else that terminates the script).
-     * @return boolean True
-     * @see createStream()
-     */
-    public function openStream($stream): bool
-    {
-        // if there's already a stream running, don't allow another
-        if ($this->_currentStream) {
-            throw new phpnutException('There is already a stream being consumed, only one stream can be consumed per phpnutStream instance');
-        }
-        // must register a callback (or the exercise is pointless)
-        if (!$this->_streamCallback) {
-            throw new phpnutException('You must define your callback function using registerStreamFunction() before calling openStream');
-        }
-        // if the stream is a numeric value, get the stream info from the api
-        if (is_numeric($stream)) {
-            $stream = $this->getStream($stream);
-            $this->_streamUrl = $stream['endpoint'];
-        }
-        else {
-            $this->_streamUrl = $stream;
-        }
-        // continue doing this until we get an error back or something...?
-        $this->httpStream(
-            'get',
-            $this->_streamUrl
-        );
-        return true;
-    }
-    
-    /**
-     * Close the currently open stream.
-     * @return true;
-     */
-    public function closeStream(): void
-    {
-        if (!$this->_lastStreamActivity) {
-            // never opened
-            return;
-        }
-        if (!$this->_multiStream) {
-            throw new phpnutException('You must open a stream before calling closeStream()');
-        }
-        curl_close($this->_currentStream);
-        curl_multi_remove_handle($this->_multiStream, $this->_currentStream);
-        curl_multi_close($this->_multiStream);
-        $this->_currentStream = null;
-        $this->_multiStream = null;
-    }
-    
-    /**
-     * Retrieve all streams for the current access token.
-     * @return array An array of stream definitions.
-     */
-    public function getAllStreams()
-    {
-        return $this->httpReq(
-            'get',
-            "{$this->_baseUrl}streams"
-        );
-    }
-    
-    /**
-     * Returns a single stream specified by a stream ID. The stream must have been
-     * created with the current access token.
-     * @return array A stream definition
-     */
-    public function getStream(string $streamId)
-    {
-        return $this->httpReq(
-            'get',
-            $this->_baseUrl.'streams/'.urlencode($streamId)
-        );
-    }
-    
-    /**
-     * Creates a stream for the current app access token.
-     *
-     * @param array $objectTypes The objects you want to retrieve data for from the
-     * stream. At time of writing these can be 'post', 'bookmark', 'user_follow', 'mute', 'block', 'stream_marker', 'message', 'channel', 'channel_subscription', 'token', and/or 'user'.
-     * If you don't specify, a few standard events will be retrieved.
-     */
-    public function createStream(?array $objectTypes=null)
-    {
-        // default object types to everything
-        if (is_null($objectTypes)) {
-            $objectTypes = [
-                'post',
-                'bookmark',
-                'user_follow',
-            ];
-        }
-        $data = [
-            'object_types'=>$objectTypes,
-            'type'=>'long_poll',
-        ];
-        $data = json_encode($data);
-        $response = $this->httpReq(
-            'post',
-            "{$this->_baseUrl}streams",
-            $data,
-            'application/json'
-        );
-        return $response;
-    }
-    
-    /**
-     * Update stream for the current app access token
-     *
-     * @param string $streamId The stream ID to update. This stream must have been
-     * created by the current access token.
-     * @param array $data allows object_types, type, filter_id and key to be updated. filter_id/key can be omitted
-     */
-    public function updateStream(string $streamId, array $data)
-    {
-        // objectTypes is likely required
-        if (is_null($data['object_types'])) {
-            $data['object_types'] = [
-                'post',
-                'bookmark',
-                'user_follow',
-            ];
-        }
-        // type can still only be long_poll
-        if (is_null($data['type'])) {
-            $data['type'] = 'long_poll';
-        }
-        $data = json_encode($data);
-        $response = $this->httpReq(
-            'put',
-            $this->_baseUrl.'streams/'.urlencode($streamId),
-            $data,
-            'application/json'
-        );
-        return $response;
-    }
-     
-    /**
-     * Deletes a stream if you no longer need it.
-     *
-     * @param string $streamId The stream ID to delete. This stream must have been
-     * created by the current access token.
-     */
-    public function deleteStream(string $streamId)
-    {
-        return $this->httpReq(
-            'delete',
-            $this->_baseUrl.'streams/'.urlencode($streamId)
-        );
-    }
-    
-    /**
-     * Deletes all streams created by the current access token.
-     */
-    public function deleteAllStreams()
-    {
-        return $this->httpReq(
-            'delete',
-            "{$this->_baseUrl}streams"
-        );
-    }
-    
-    /**
-     * Internal function used to process incoming chunks from the stream. This is only
-     * public because it needs to be accessed by CURL. Do not call or use this function
-     * in your own code.
-     * @ignore
-     */
-    public function httpStreamReceive($ch, $data)
-    {
-        $this->_lastStreamActivity = time();
-        $this->_streamBuffer .= $data;
-        if (!$this->_streamHeaders) {
-            $pos = strpos($this->_streamBuffer, "\r\n\r\n");
-            if ($pos !== false) {
-                $this->_streamHeaders = substr($this->_streamBuffer, 0, $pos);
-                $this->_streamBuffer = substr($this->_streamBuffer, $pos+4);
-            }
-        } else {
-            $pos = strpos($this->_streamBuffer, "\r\n");
-            while ($pos !== false) {
-                $command = substr($this->_streamBuffer, 0, $pos);
-                $this->_streamBuffer = substr($this->_streamBuffer, $pos+2);
-                $command = json_decode($command, true);
-                if ($command) {
-                    call_user_func($this->_streamCallback, $command);
-                }
-                $pos = strpos($this->_streamBuffer, "\r\n");
-            }
-        }
-        return strlen($data);
-    }
-    
-    /**
-     * Opens a long lived HTTP connection to the pnut.io servers, and sends data
-     * received to the httpStreamReceive function. As a general rule you should not
-     * directly call this method, it's used by openStream().
-     */
-    protected function httpStream(string $act, $req, array $params=[], string $contentType='application/x-www-form-urlencoded'): void
-    {
-        if ($this->_currentStream) {
-            throw new phpnutException('There is already an open stream, you must close the existing one before opening a new one');
-        }
-        $headers = [];
-        $this->_streamBuffer = '';
-        if ($this->_accessToken) {
-            $headers[] = "Authorization: Bearer {$this->_accessToken}";
-        }
-        $this->_currentStream = curl_init($req);
-        curl_setopt($this->_currentStream, CURLOPT_HTTPHEADER, $headers);
-        curl_setopt($this->_currentStream, CURLOPT_RETURNTRANSFER, true);
-        curl_setopt($this->_currentStream, CURLINFO_HEADER_OUT, true);
-        curl_setopt($this->_currentStream, CURLOPT_HEADER, true);
-        if ($this->_sslCA) {
-            curl_setopt($this->_currentStream, CURLOPT_CAINFO, $this->_sslCA);
-        }
-        // every time we receive a chunk of data, forward it to httpStreamReceive
-        curl_setopt($this->_currentStream, CURLOPT_WRITEFUNCTION, array($this, 'httpStreamReceive'));
-        // curl_exec($ch);
-        // return;
-        $this->_multiStream = curl_multi_init();
-        $this->_lastStreamActivity = time();
-        curl_multi_add_handle($this->_multiStream, $this->_currentStream);
-    }
-    
-    public function reconnectStream(): void
-    {
-        $this->closeStream();
-        $this->_connectFailCounter++;
-        // if we've failed a few times, back off
-        if ($this->_connectFailCounter > 1) {
-            $sleepTime = pow(2, $this->_connectFailCounter);
-            // don't sleep more than 60 seconds
-            if ($sleepTime > 60) {
-                $sleepTime = 60;
-            }
-            sleep($sleepTime);
-        }
-        $this->httpStream('get', $this->_streamUrl);
-    }
-    
-    /**
-     * Process an open stream for x microseconds, then return. This is useful if you want
-     * to be doing other things while processing the stream. If you just want to
-     * consume the stream without other actions, you can call processForever() instead.
-     * @param float @microseconds The number of microseconds to process for before
-     * returning. There are 1,000,000 microseconds in a second.
-     *
-     * @return void
-     */
-    public function processStream($microseconds=null): void
-    {
-        if (!$this->_multiStream) {
-            throw new phpnutException('You must open a stream before calling processStream()');
-        }
-        $start = microtime(true);
-        $active = null;
-        $inQueue = null;
-        $sleepFor = 0;
-        do {
-            // if we haven't received anything within 5.5 minutes, reconnect
-            // keepalives are sent every 5 minutes (measured on 2013-3-12 by @ryantharp)
-            if (time()-$this->_lastStreamActivity >= 330) {
-                $this->reconnectStream();
-            }
-            curl_multi_exec($this->_multiStream, $active);
-            if (!$active) {
-                $httpCode = curl_getinfo($this->_currentStream, CURLINFO_HTTP_CODE);
-                // don't reconnect on 400 errors
-                if ($httpCode >= 400 && $httpCode <= 499) {
-                    throw new phpnutException("Received HTTP error {$httpCode} check your URL and credentials before reconnecting");
-                }
-                $this->reconnectStream();
-            }
-            // sleep for a max of 2/10 of a second
-            $timeSoFar = (microtime(true)-$start)*1000000;
-            $sleepFor = $this->streamingSleepFor;
-            if ($timeSoFar+$sleepFor > $microseconds) {
-                $sleepFor = $microseconds - $timeSoFar;
-            }
-            if ($sleepFor > 0) {
-                usleep($sleepFor);
-            }
-        } while ($timeSoFar+$sleepFor < $microseconds);
-    }
-    
-    /**
-     * Process an open stream forever. This function will never return, if you
-     * want to perform other actions while consuming the stream, you should use
-     * processFor() instead.
-     * @return void This function will never return
-     * @see processFor();
-     */
-    public function processStreamForever(): void
-    {
-        while (true) {
-            $this->processStream(600);
-        }
-    }
-}
diff --git a/pnut/lib/phpnutException.php b/pnut/lib/phpnutException.php
deleted file mode 100644
index 77e768fe..00000000
--- a/pnut/lib/phpnutException.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-namespace phpnut;
-
-class phpnutException extends \Exception {}
diff --git a/pnut/pnut.php b/pnut/pnut.php
deleted file mode 100644
index e84f208b..00000000
--- a/pnut/pnut.php
+++ /dev/null
@@ -1,325 +0,0 @@
-<?php
-/**
- * Name: Pnut Connector
- * Description: Post to pnut.io
- * Version: 0.1.2
- * Author: Morgan McMillian <https://social.clacks.network/profile/spacenerdmo>
- * Status: In Development
- */
-
-require_once 'addon/pnut/lib/phpnut.php';
-require_once 'addon/pnut/lib/phpnutException.php';
-
-use Friendica\Content\Text\BBCode;
-use Friendica\Content\Text\Plaintext;
-use Friendica\Core\Config\Util\ConfigFileManager;
-use Friendica\Core\Hook;
-use Friendica\Core\Logger;
-use Friendica\Core\Renderer;
-use Friendica\Core\System;
-use Friendica\DI;
-use Friendica\Model\Photo;
-use phpnut\phpnutException;
-
-const PNUT_LIMIT = 256;
-
-function pnut_install()
-{
-	Hook::register('load_config',             __FILE__, 'pnut_load_config');
-	Hook::register('hook_fork',               __FILE__, 'pnut_hook_fork');
-	Hook::register('post_local',              __FILE__, 'pnut_post_local');
-	Hook::register('notifier_normal',         __FILE__, 'pnut_post_hook');
-	Hook::register('jot_networks',            __FILE__, 'pnut_jot_nets');
-	Hook::register('connector_settings',      __FILE__, 'pnut_settings');
-	Hook::register('connector_settings_post', __FILE__, 'pnut_settings_post');
-}
-
-function pnut_module() {}
-
-function pnut_content()
-{
-	if (!DI::userSession()->getLocalUserId()) {
-		DI::sysmsg()->addNotice(DI::l10n()->t('Permission denied.'));
-		return '';
-	}
-
-	if (isset(DI::args()->getArgv()[1])) {
-		switch (DI::args()->getArgv()[1]) {
-			case 'connect':
-				$o = pnut_connect();
-				break;
-
-			default:
-				$o = print_r(DI::args()->getArgv(), true);
-				break;
-		}
-	} else {
-		$o = pnut_connect();
-	}
-	return $o;
-}
-
-function pnut_connect()
-{
-	$client_id     = DI::config()->get('pnut', 'client_id');
-	$client_secret = DI::config()->get('pnut', 'client_secret');
-
-	if (empty($client_id) || empty($client_secret)) {
-		$client_id     = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'pnut', 'client_id');
-		$client_secret = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'pnut', 'client_secret');
-	}
-
-	$callback_url = DI::baseUrl() . '/pnut/connect';
-
-	$nut = new phpnut\phpnut($client_id, $client_secret);
-
-	try {
-		$token = $nut->getAccessToken($callback_url);
-		Logger::debug('Got Token', [$token]);
-		$o = DI::l10n()->t('You are now authenticated with pnut.io.');
-		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'pnut', 'access_token', $token);
-	} catch (phpnutException $e) {
-		$o = DI::l10n()->t('Error fetching token. Please try again.', ['code' => $e->getCode(), 'message' => $e->getMessage()]);
-	}
-
-	$o .= '<br /><a href="' . DI::baseUrl() . '/settings/connectors">' . DI::l10n()->t("return to the connector page").'</a>';
-
-	return $o;
-}
-
-function pnut_load_config(ConfigFileManager $loader)
-{
-	DI::app()->getConfigCache()->load($loader->loadAddonConfig('pnut'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
-}
-
-function pnut_addon_admin(string &$o)
-{
-	$client_id     = DI::config()->get('pnut', 'client_id');
-	$client_secret = DI::config()->get('pnut', 'client_secret');
-
-	$t = Renderer::getMarkupTemplate('admin.tpl', 'addon/pnut/');
-
-	$o = Renderer::replaceMacros($t, [
-		'$submit'        => DI::l10n()->t('Save Settings'),
-		'$client_id'     => ['pnut_client_id', DI::l10n()->t('Client ID'), $client_id],
-		'$client_secret' => ['pnut_client_secret', DI::l10n()->t('Client Secret'), $client_secret],
-	]);
-}
-
-function pnut_addon_admin_post()
-{
-	DI::config()->set('pnut', 'client_id',     $_POST['pnut_client_id']);
-	DI::config()->set('pnut', 'client_secret', $_POST['pnut_client_secret']);
-}
-
-function pnut_settings(array &$data)
-{
-	if (!DI::userSession()->getLocalUserId()) {
-		return;
-	}
-
-	$redirectUri  = DI::baseUrl() . '/pnut/connect';
-	$scope        = ['write_post','files'];
-
-	$enabled       = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'pnut', 'post') ?? false;
-	$def_enabled   = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'pnut', 'post_by_default') ?? false;
-	$client_id     = DI::config()->get('pnut', 'client_id');
-	$client_secret = DI::config()->get('pnut', 'client_secret');
-	$token         = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'pnut', 'access_token');
-	
-	$user_client = empty($client_id) || empty($client_secret);
-	if ($user_client) {
-		$client_id     = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'pnut', 'client_id');
-		$client_secret = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'pnut', 'client_secret');
-	}
-
-	if (!empty($client_id) && !empty($client_secret) && empty($token)) {
-		$nut = new phpnut\phpnut($client_id, $client_secret);
-		$authorize_url = $nut->getAuthUrl($redirectUri, $scope);
-		$authorize_text = DI::l10n()->t('Authenticate with pnut.io');
-	}
-
-	if (!empty($token)) {
-		$disconn_btn = DI::l10n()->t('Disconnect');
-	}
-
-	$t    = Renderer::getMarkupTemplate('connector_settings.tpl', 'addon/pnut/');
-	$html = Renderer::replaceMacros($t, [
-		'$enable'         => ['pnut', DI::l10n()->t('Enable Pnut Post Addon'), $enabled],
-		'$bydefault'      => ['pnut_bydefault', DI::l10n()->t('Post to Pnut by default'), $def_enabled],
-		'$client_id'      => ['pnut_client_id', DI::l10n()->t('Client ID'), $client_id],
-		'$client_secret'  => ['pnut_client_secret', DI::l10n()->t('Client Secret'), $client_secret],
-		'$access_token'   => ['pnut_access_token', DI::l10n()->t('Access Token'), $token, '', '', 'readonly'],
-		'$authorize_url'  => $authorize_url ?? '',
-		'$authorize_text' => $authorize_text ?? '',
-		'$disconn_btn'    => $disconn_btn ?? '',
-		'user_client'     => $user_client,
-	]);
-
-	$data = [
-		'connector' => 'pnut',
-		'title'     => DI::l10n()->t('Pnut Export'),
-		'image'     => 'addon/pnut/pnut.svg',
-		'enabled'   => $enabled,
-		'html'      => $html,
-	];
-}
-
-function pnut_settings_post(array &$b)
-{
-	if (empty($_POST['pnut-submit']) && empty($_POST['pnut-disconnect'])) {
-		return;
-	}
-
-	if (!empty($_POST['pnut-disconnect'])) {
-		DI::pConfig()->delete(DI::userSession()->getLocalUserId(), 'pnut', 'post');
-		DI::pConfig()->delete(DI::userSession()->getLocalUserId(), 'pnut', 'post_by_default');
-		DI::pConfig()->delete(DI::userSession()->getLocalUserId(), 'pnut', 'client_id');
-		DI::pConfig()->delete(DI::userSession()->getLocalUserId(), 'pnut', 'client_secret');
-		DI::pConfig()->delete(DI::userSession()->getLocalUserId(), 'pnut', 'access_token');
-	} else {
-		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'pnut', 'post',            intval($_POST['pnut']));
-		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'pnut', 'post_by_default', intval($_POST['pnut_bydefault']));
-		if (!empty($_POST['pnut_client_id'])) {
-			DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'pnut', 'client_id',     $_POST['pnut_client_id']);
-		}
-		if (!empty($_POST['pnut_client_secret'])) {
-			DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'pnut', 'client_secret', $_POST['pnut_client_secret']);
-		}
-	}
-}
-
-function pnut_jot_nets(array &$jotnets_fields)
-{
-	if (!DI::userSession()->getLocalUserId()) {
-		return;
-	}
-
-	if (DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'pnut', 'post')) {
-		$jotnets_fields[] = [
-			'type'  => 'checkbox',
-			'field' => [
-				'pnut_enable',
-				DI::l10n()->t('Post to Pnut'),
-				DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'pnut', 'post_by_default')
-			]
-		];
-	}
-}
-
-function pnut_hook_fork(array &$b)
-{
-	if ($b['name'] != 'notifier_normal') {
-		return;
-	}
-
-	$post = $b['data'];
-
-	if (($post['created'] !== $post['edited']) && !$post['deleted']) {
-		DI::logger()->info('Editing is not supported by the addon');
-		$b['execute'] = false;
-		return;
-	}
-
-	if (!strstr($post['postopts'] ?? '', 'pnut') || ($post['parent'] != $post['id']) || $post['private']) {
-		$b['execute'] = false;
-		return;
-	}
-}
-
-function pnut_post_local(array &$b)
-{
-	if ($b['edit']) {
-		return;
-	}
-
-	if (!DI::userSession()->getLocalUserId() || (DI::userSession()->getLocalUserId() != $b['uid'])) {
-		return;
-	}
-
-	if ($b['private'] || $b['parent']) {
-		return;
-	}
-
-	$pnut_post   = intval(DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'pnut', 'post'));
-	$pnut_enable = (($pnut_post && !empty($_REQUEST['pnut_enable'])) ? intval($_REQUEST['pnut_enable']) : 0);
-
-	// if API is used, default to the chosen settings
-	if ($b['api_source'] && intval(DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'pnut', 'post_by_default'))) {
-		$pnut_enable = 1;
-	}
-
-	if (!$pnut_enable) {
-		return;
-	}
-
-	if (strlen($b['postopts'])) {
-		$b['postopts'] .= ',';
-	}
-
-	$b['postopts'] .= 'pnut';
-}
-
-function pnut_post_hook(array &$b)
-{
-	/**
-	 * Post to pnut.io
-	 */
-	if ($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited'])) {
-		return;
-	}
-
-	Logger::notice('PNUT post invoked', ['id' => $b['id'], 'guid' => $b['guid'], 'plink' => $b['plink']]);
-	Logger::debug('PNUT array', $b);
-
-	$token = DI::pConfig()->get($b['uid'], 'pnut', 'access_token');
-	$nut = new phpnut\phpnut($token);
-
-	$msgarr = Plaintext::getPost($b, PNUT_LIMIT, true, BBCode::EXTERNAL);
-	$text = $msgarr['text'];
-	$raw = [];
-
-	Logger::debug('PNUT msgarr', $msgarr);
-
-	if (count($msgarr['parts']) > 1) {
-		$tstamp = time();
-		$raw['nl.chimpnut.blog.post'][] = ['body' => $b['body'], 'tstamp' => $tstamp];
-		$text = Plaintext::shorten($text, 252 - strlen($b['plink']), $b['uid']);
-		$text .= "\n" . $b['plink'];
-	}
-
-	if ($msgarr['type'] == 'link') {
-		$text .= "\n[" . $msgarr['title'] . "](" . $msgarr['url'] . ")";
-	}
-
-	if ($msgarr['type'] == 'photo') {
-		$fileraw = ['type' => 'dev.mcmillian.friendica.image', 'kind' => 'image', 'is_public' => true];
-		foreach ($msgarr['images'] as $image) {
-			Logger::debug('PNUT image', $image);
-
-			if (!empty($image['id'])) {
-				$photo = Photo::selectFirst([], ['id' => $image['id']]);
-				Logger::debug('PNUT selectFirst');
-			} else {
-				$photo = Photo::createPhotoForExternalResource($image['url']);
-				Logger::debug('PNUT createPhotoForExternalResource');
-			}
-			$picturedata = Photo::getImageForPhoto($photo);
-
-			Logger::debug('PNUT photo', $photo);
-			$picurefile = tempnam(System::getTempPath(), 'pnut');
-			file_put_contents($picurefile, $picturedata);
-			Logger::debug('PNUT got file?', ['filename' => $picurefile]);
-			$imagefile = $nut->createFile($picurefile, $fileraw);
-			Logger::debug('PNUT file', ['pnutimagefile' => $imagefile]);
-			unlink($picurefile);
-
-			$raw['io.pnut.core.oembed'][] = ['+io.pnut.core.file' => ['file_id' => $imagefile['id'], 'file_token' => $imagefile['file_token'], 'format' => 'oembed']];
-		}
-	}
-
-	$raw['io.pnut.core.crosspost'][] = ['canonical_url' => $b['plink']];
-	$nut->createPost($text, ['raw' => $raw]);
-
-	Logger::debug('PNUT post complete', ['id' => $b['id'], 'text' => $text, 'raw' => $raw]);
-}
diff --git a/pnut/pnut.svg b/pnut/pnut.svg
deleted file mode 100644
index 6cc64b01..00000000
--- a/pnut/pnut.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg width="100%" height="100%" viewBox="0 0 662 577" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:1.41421;"><g><g><path d="M80.265,421.001l0,-20.71l49.893,0l1.647,14.827c3.766,-5.492 8.277,-9.728 13.533,-12.709c5.256,-2.981 11.375,-4.471 18.356,-4.471c15.768,0 28.006,6.158 36.714,18.474c8.708,12.316 13.062,28.516 13.062,48.599l0,2.471c0,18.827 -4.354,33.968 -13.062,45.421c-8.708,11.453 -20.867,17.18 -36.478,17.18c-6.668,0 -12.591,-1.235 -17.769,-3.707c-5.177,-2.471 -9.61,-6.099 -13.297,-10.884l0,36.831l16.592,3.53l0,20.71l-67.426,0l0,-20.71l16.592,-3.53l0,-127.792l-18.357,-3.53Zm98.844,44.01c0,-12.003 -2,-21.731 -6.001,-29.183c-4.001,-7.453 -10.12,-11.179 -18.357,-11.179c-5.177,0 -9.59,1.059 -13.238,3.177c-3.648,2.118 -6.53,5.139 -8.649,9.061l0,55.776c2.119,3.609 5.001,6.355 8.649,8.237c3.648,1.883 8.139,2.825 13.474,2.825c8.315,0 14.415,-3.256 18.298,-9.767c3.883,-6.511 5.824,-15.337 5.824,-26.476l0,-2.471Z" style="fill:#008c99;fill-rule:nonzero;"/><path d="M248.573,507.019l16.475,-3.53l0,-78.958l-18.24,-3.53l0,-20.71l50.246,0l1.53,18.239c4.236,-6.511 9.453,-11.571 15.65,-15.179c6.198,-3.609 13.14,-5.413 20.828,-5.413c12.866,0 22.907,4.04 30.124,12.12c7.217,8.08 10.826,20.749 10.826,38.008l0,55.423l16.474,3.53l0,20.593l-65.661,0l0,-20.593l14.709,-3.53l0,-55.306c0,-8.55 -1.726,-14.61 -5.177,-18.18c-3.452,-3.569 -8.669,-5.354 -15.651,-5.354c-4.55,0 -8.629,0.922 -12.238,2.765c-3.608,1.844 -6.628,4.452 -9.06,7.826l0,68.249l13.885,3.53l0,20.593l-64.72,0l0,-20.593Z" style="fill:#008c99;fill-rule:nonzero;"/><path d="M475.638,511.491c-4.08,5.962 -9.12,10.551 -15.121,13.768c-6.001,3.216 -12.846,4.824 -20.534,4.824c-13.414,0 -23.926,-4.295 -31.536,-12.885c-7.609,-8.59 -11.414,-21.946 -11.414,-40.067l0,-52.6l-14.003,-3.53l0,-20.71l48.363,0l0,77.075c0,9.257 1.549,15.905 4.648,19.945c3.099,4.041 7.708,6.061 13.827,6.061c5.413,0 10.1,-0.883 14.061,-2.648c3.962,-1.765 7.198,-4.295 9.708,-7.59l0,-68.603l-15.062,-3.53l0,-20.71l49.423,0l0,103.198l15.415,3.53l0,20.593l-45.539,0l-2.236,-16.121Z" style="fill:#008c99;fill-rule:nonzero;"/><path d="M570.792,369.108l0,31.183l22.358,0l0,24.123l-22.358,0l0,64.837c0,4.942 1.02,8.472 3.059,10.59c2.04,2.119 4.786,3.178 8.237,3.178c2.354,0 4.413,-0.098 6.178,-0.295c1.765,-0.196 3.746,-0.529 5.943,-1l2.941,24.829c-3.844,1.177 -7.648,2.059 -11.414,2.648c-3.765,0.588 -7.845,0.882 -12.238,0.882c-11.845,0 -20.965,-3.256 -27.358,-9.767c-6.394,-6.511 -9.591,-16.827 -9.591,-30.947l0,-64.955l-18.709,0l0,-24.123l18.709,0l0,-31.183l34.243,0Z" style="fill:#008c99;fill-rule:nonzero;"/></g><path d="M443.348,0.858c2.329,0.009 4.657,0.043 6.984,0.111c4.608,0.135 9.211,0.391 13.805,0.77c14.091,1.162 28.088,3.482 41.789,6.977c24.76,6.315 48.578,16.481 70.015,30.421c3.101,2.016 6.15,4.111 9.144,6.283c3.296,2.392 6.525,4.878 9.677,7.456c3.591,2.937 7.084,5.994 10.467,9.168c6.53,6.126 12.651,12.689 18.274,19.658c6.401,7.932 12.154,16.391 17.12,25.294c5.592,10.027 10.181,20.615 13.596,31.578c2.211,7.098 3.929,14.348 5.128,21.684c0.991,6.061 1.627,12.179 1.906,18.314c0.399,8.774 0.07,17.582 -0.989,26.302c-0.898,7.404 -2.324,14.742 -4.254,21.945c-2.722,10.153 -6.448,20.03 -11.058,29.475c-4.026,8.248 -8.724,16.163 -13.993,23.677c-1.806,2.576 -3.68,5.105 -5.617,7.584c-12.75,16.324 -28.197,30.468 -45.288,42.141c-3.069,2.096 -6.191,4.113 -9.363,6.051c-22.127,13.521 -46.566,23.142 -71.853,28.809c-18.425,4.129 -37.312,6.164 -56.192,6.161c-18.665,-0.002 -37.332,-1.985 -55.558,-6.02c-26.059,-5.769 -51.233,-15.733 -73.918,-29.832c-3.256,-2.023 -6.459,-4.131 -9.604,-6.323c-6.208,-4.325 -12.189,-8.977 -17.896,-13.945c-1.826,-1.59 -3.624,-3.212 -5.393,-4.866c-0.64,-0.599 -1.277,-1.203 -1.91,-1.811c-0.224,-0.215 -0.445,-0.438 -0.675,-0.647c-0.068,-0.062 -0.138,-0.121 -0.21,-0.179c-0.277,-0.216 -0.578,-0.4 -0.9,-0.543c-0.854,-0.376 -1.828,-0.459 -2.732,-0.229c-0.405,0.102 -0.789,0.267 -1.146,0.482c-0.17,0.105 -0.338,0.212 -0.507,0.318c-0.363,0.227 -0.727,0.452 -1.092,0.677c-3.555,2.18 -7.182,4.24 -10.881,6.167c-3.862,2.011 -7.798,3.875 -11.794,5.603c-0.046,0.289 -0.095,0.578 -0.146,0.866c-0.38,2.093 -0.885,4.16 -1.446,6.211c-0.58,2.118 -1.22,4.22 -1.888,6.311c-1.638,5.125 -3.444,10.195 -5.264,15.257c-1.325,3.674 -2.663,7.344 -3.991,11.018c-1.058,2.933 -2.111,5.868 -3.132,8.815c-0.743,2.141 -1.47,4.287 -2.164,6.445c-0.595,1.848 -1.168,3.704 -1.688,5.575c-0.407,1.462 -0.789,2.934 -1.077,4.424c-0.085,0.44 -0.155,0.882 -0.223,1.325l-0.041,0.237c-0.104,0.542 -0.233,1.078 -0.402,1.605c-0.354,1.107 -0.861,2.164 -1.5,3.134c-1.141,1.73 -2.703,3.171 -4.52,4.167c-1.725,0.946 -3.664,1.485 -5.629,1.565c-1.232,0.05 -2.471,-0.08 -3.666,-0.384c-1.411,-0.359 -2.758,-0.961 -3.967,-1.772c-0.844,-0.566 -1.619,-1.233 -2.306,-1.982c-0.318,-0.348 -0.61,-0.716 -0.898,-1.088c-0.292,-0.377 -0.579,-0.757 -0.862,-1.14c-1.209,-1.637 -2.35,-3.323 -3.455,-5.031c-1.985,-3.063 -3.859,-6.197 -5.691,-9.353c-2.217,-3.819 -4.368,-7.677 -6.501,-11.544c-2.228,-4.041 -4.433,-8.095 -6.652,-12.14c-0.572,-1.04 -1.144,-2.08 -1.718,-3.119c-1.471,-2.653 -2.95,-5.302 -4.476,-7.923c-1.153,-1.98 -2.33,-3.948 -3.592,-5.86l-0.058,-0.088c-0.499,-0.002 -0.997,-0.006 -1.496,-0.01c-0.547,-0.007 -1.095,-0.015 -1.642,-0.025c-2.902,-0.059 -5.801,-0.174 -8.698,-0.356c-6.056,-0.381 -12.095,-1.041 -18.09,-1.981c-16.809,-2.638 -33.276,-7.495 -48.768,-14.542c-8.731,-3.972 -17.147,-8.637 -25.119,-13.971c-9.506,-6.36 -18.379,-13.674 -26.367,-21.862c-6.067,-6.22 -11.621,-12.944 -16.538,-20.108c-5.049,-7.356 -9.424,-15.177 -13.001,-23.352c-3.016,-6.894 -5.461,-14.039 -7.28,-21.342c-1.765,-7.088 -2.939,-14.321 -3.503,-21.604c-0.953,-12.314 -0.165,-24.757 2.345,-36.851c2.104,-10.14 5.415,-20.02 9.789,-29.406c3.839,-8.236 8.493,-16.087 13.824,-23.443c4.642,-6.404 9.795,-12.435 15.368,-18.046c4.976,-5.01 10.286,-9.686 15.87,-14.007c11.334,-8.773 23.786,-16.079 36.909,-21.832c10.483,-4.595 21.397,-8.2 32.542,-10.802c17.274,-4.033 35.099,-5.65 52.819,-4.917c10.221,0.422 20.41,1.634 30.44,3.65c11.709,2.353 23.201,5.801 34.251,10.336c5.382,2.209 10.658,4.675 15.802,7.394c1.659,0.877 3.305,1.781 4.935,2.711c0.542,0.309 1.082,0.621 1.62,0.936c0.283,0.165 0.565,0.334 0.85,0.497c0.102,0.056 0.204,0.112 0.307,0.167c0.912,0.471 1.878,0.826 2.882,1.041c1.312,0.28 2.672,0.325 3.999,0.134c1.107,-0.16 2.19,-0.484 3.203,-0.959c0.65,-0.304 1.27,-0.672 1.85,-1.094c0.314,-0.229 0.614,-0.474 0.904,-0.732c0.34,-0.308 0.678,-0.619 1.017,-0.929c1.905,-1.723 3.836,-3.416 5.802,-5.07c3.964,-3.335 8.053,-6.522 12.253,-9.556c2.827,-2.043 5.705,-4.018 8.627,-5.922c21.205,-13.817 44.749,-23.938 69.231,-30.286c13.586,-3.523 27.468,-5.888 41.449,-7.112c4.623,-0.405 9.256,-0.685 13.894,-0.842c2.467,-0.083 4.934,-0.129 7.403,-0.146c0.729,-0.003 1.459,-0.004 2.188,-0.003Zm-1.386,20.833c-1.594,0.007 -3.188,0.025 -4.781,0.061c-3.161,0.071 -6.32,0.204 -9.475,0.4c-9.918,0.616 -19.799,1.85 -29.56,3.715c-23.779,4.543 -46.883,12.841 -67.895,24.902c-2.942,1.689 -5.842,3.451 -8.695,5.286c-6.263,4.027 -12.3,8.407 -18.056,13.129c-1.789,1.467 -3.55,2.968 -5.282,4.501c-0.574,0.508 -1.146,1.02 -1.714,1.536c-0.369,0.336 -0.737,0.674 -1.107,1.01l-0.247,0.219c-0.742,0.646 -1.506,1.265 -2.302,1.845c-1.566,1.141 -3.236,2.139 -4.982,2.98c-3.332,1.604 -6.939,2.625 -10.618,3.01c-3.678,0.384 -7.418,0.13 -11.01,-0.751c-2.199,-0.54 -4.34,-1.312 -6.377,-2.301c-0.591,-0.287 -1.174,-0.592 -1.747,-0.915c-0.287,-0.161 -0.571,-0.329 -0.855,-0.496c-0.379,-0.223 -0.759,-0.443 -1.139,-0.663c-0.477,-0.274 -0.955,-0.546 -1.434,-0.816c-2.027,-1.136 -4.077,-2.23 -6.152,-3.277c-4.206,-2.123 -8.507,-4.057 -12.885,-5.8c-10.988,-4.375 -22.449,-7.547 -34.11,-9.517c-9.207,-1.554 -18.538,-2.36 -27.874,-2.437c-9.349,-0.077 -18.704,0.573 -27.949,1.972c-10.535,1.594 -20.926,4.161 -30.976,7.702c-13.981,4.926 -27.312,11.743 -39.372,20.374c-6.059,4.336 -11.793,9.128 -17.107,14.35c-4.787,4.704 -9.231,9.758 -13.255,15.129c-4.501,6.007 -8.473,12.413 -11.806,19.14c-2.471,4.987 -4.587,10.15 -6.313,15.442c-1.687,5.174 -2.997,10.47 -3.909,15.834c-1.497,8.799 -1.918,17.78 -1.262,26.681c0.53,7.189 1.767,14.323 3.684,21.272c1.514,5.49 3.45,10.862 5.767,16.064c1.896,4.256 4.048,8.397 6.43,12.402c1.993,3.351 4.146,6.606 6.444,9.756c1.922,2.635 3.946,5.196 6.061,7.678c1.87,2.196 3.812,4.33 5.819,6.4c1.738,1.792 3.524,3.537 5.356,5.233c13.022,12.052 28.282,21.599 44.633,28.447c15.085,6.317 31.106,10.339 47.363,12.077c4.65,0.498 9.321,0.809 13.996,0.936c1.471,0.041 2.943,0.063 4.415,0.067c0.797,0.002 1.594,-0.007 2.39,-0.008c0.23,0.003 0.23,0.003 0.459,0.009c0.383,0.016 0.765,0.04 1.147,0.081c0.904,0.096 1.799,0.27 2.674,0.519c2.466,0.703 4.75,2.006 6.611,3.772c0.444,0.421 0.863,0.868 1.256,1.338c0.355,0.425 0.689,0.868 1.018,1.313c0.405,0.549 0.798,1.108 1.182,1.672c1.293,1.899 2.496,3.859 3.67,5.834c0.994,1.671 1.965,3.356 2.922,5.048c1.343,2.373 2.665,4.758 3.981,7.146c2.21,4.022 4.405,8.052 6.615,12.074c1.883,3.421 3.779,6.835 5.717,10.225l0.293,0.512l0.236,0.41c0.27,-0.802 0.545,-1.601 0.82,-2.401c0.975,-2.817 1.975,-5.625 2.983,-8.431c1.471,-4.077 2.957,-8.149 4.427,-12.227c0.977,-2.716 1.948,-5.435 2.891,-8.163c0.731,-2.118 1.447,-4.241 2.129,-6.375c0.536,-1.677 1.052,-3.361 1.524,-5.057c0.405,-1.454 0.786,-2.918 1.074,-4.401c0.09,-0.468 0.163,-0.937 0.235,-1.408l0.055,-0.321c0.079,-0.423 0.165,-0.845 0.267,-1.263c0.231,-0.936 0.529,-1.855 0.892,-2.747c0.677,-1.663 1.58,-3.233 2.676,-4.654c1.031,-1.337 2.233,-2.542 3.567,-3.577c0.845,-0.655 1.742,-1.241 2.681,-1.753c0.475,-0.258 0.961,-0.492 1.453,-0.715c0.563,-0.244 1.127,-0.486 1.689,-0.733c1.533,-0.676 3.058,-1.373 4.57,-2.096c3.11,-1.487 6.171,-3.075 9.177,-4.764c1.542,-0.867 3.07,-1.761 4.582,-2.681c0.431,-0.261 0.859,-0.525 1.287,-0.791c0.346,-0.215 0.69,-0.433 1.037,-0.647c0.233,-0.14 0.232,-0.139 0.466,-0.277c0.624,-0.357 1.258,-0.693 1.908,-0.999c1.44,-0.676 2.944,-1.215 4.486,-1.605c2.855,-0.724 5.835,-0.937 8.764,-0.63c3.015,0.316 5.968,1.184 8.675,2.551c1.662,0.839 3.229,1.865 4.663,3.052c0.347,0.287 0.686,0.583 1.016,0.888c0.18,0.165 0.355,0.334 0.53,0.503c0.281,0.271 0.562,0.541 0.844,0.81c0.285,0.271 0.57,0.542 0.856,0.812c1.439,1.35 2.896,2.681 4.376,3.987c3.14,2.77 6.375,5.432 9.694,7.984c2.883,2.217 5.829,4.352 8.831,6.403c2.701,1.844 5.447,3.622 8.235,5.331c20.228,12.399 42.593,21.201 65.725,26.393c16.956,3.805 34.333,5.671 51.708,5.673c17.348,0.002 34.703,-1.863 51.634,-5.657c22.696,-5.086 44.653,-13.646 64.582,-25.671c2.884,-1.74 5.725,-3.553 8.517,-5.437c15.397,-10.389 29.357,-22.982 40.893,-37.561c1.624,-2.053 3.2,-4.144 4.724,-6.273c5.008,-6.996 9.457,-14.396 13.232,-22.129c3.801,-7.788 6.917,-15.911 9.253,-24.258c1.883,-6.728 3.258,-13.598 4.1,-20.534c0.877,-7.229 1.177,-14.528 0.901,-21.806c-0.233,-6.186 -0.887,-12.356 -1.954,-18.454c-0.967,-5.526 -2.273,-10.993 -3.902,-16.362c-2.916,-9.61 -6.87,-18.896 -11.702,-27.698c-4.249,-7.74 -9.174,-15.104 -14.652,-22.027c-4.951,-6.258 -10.355,-12.156 -16.124,-17.667c-5.125,-4.896 -10.54,-9.487 -16.191,-13.764c-2.951,-2.233 -5.967,-4.381 -9.041,-6.442c-2.8,-1.878 -5.647,-3.684 -8.538,-5.417c-20.324,-12.187 -42.737,-20.78 -65.885,-25.773c-10.53,-2.271 -21.219,-3.801 -31.962,-4.601c-3.598,-0.268 -7.202,-0.454 -10.809,-0.56c-1.714,-0.05 -3.427,-0.079 -5.141,-0.095c-0.874,-0.006 -1.748,-0.008 -2.621,-0.007Z" style="fill:#767676;fill-rule:nonzero;"/><path d="M267.017,298.075c5.743,-3.668 13.259,-2.88 18.116,1.9c38.217,36.942 94.631,60.326 157.514,60.326c114.993,0 208.353,-78.197 208.353,-174.514c0,-96.317 -93.36,-174.513 -208.353,-174.513c-61.005,0 -115.922,22.007 -154.04,57.053c-7.063,6.468 -17.522,7.56 -25.769,2.692c-25.816,-15.241 -57.044,-24.13 -90.661,-24.13c-88.956,0 -161.177,62.238 -161.177,138.898c0,76.66 72.221,138.898 161.177,138.898c0.587,0 1.174,-0.003 1.759,-0.008c1.712,-0.015 3.334,0.763 4.393,2.107c7.296,9.258 24.677,45.814 34.622,58.435c0.584,0.74 1.552,1.062 2.462,0.818c0.91,-0.244 1.588,-1.007 1.723,-1.94c2.059,-14.22 19.017,-52.406 21.062,-66.532c0.477,-3.287 2.636,-6.087 5.694,-7.383c8.123,-3.478 15.854,-7.537 23.125,-12.107Z" style="fill:#fffefb;"/><g><path d="M412.356,310.721c-3.895,-0.398 -7.532,1.999 -8.703,5.735c-1.115,3.542 -2.29,7.066 -3.525,10.568c-0.297,0.836 -0.198,1.761 0.268,2.515c0.466,0.754 1.249,1.256 2.128,1.365c0,0.001 0.001,0.001 0.001,0.001c11.339,1.407 22.753,2.201 34.177,2.405c0.837,0.014 1.596,-0.49 1.907,-1.267c0.001,0 0.001,-0.001 0.001,-0.001c1.852,-4.626 3.586,-9.3 5.204,-14.013c0.001,-0.001 0.001,-0.001 0.001,-0.002c0.459,-1.337 0.248,-2.813 -0.568,-3.968c-0.816,-1.155 -2.137,-1.848 -3.551,-1.862c-0.438,-0.004 -0.877,-0.009 -1.315,-0.015c-8.691,-0.119 -17.377,-0.602 -26.025,-1.461Z" style="fill:#faf3d2;stroke:#e9e9e9;stroke-width:1px;"/><path d="M463.661,321.235c-0.874,2.638 -0.359,5.539 1.369,7.716c1.728,2.177 4.437,3.336 7.205,3.083c2.84,-0.257 5.677,-0.551 8.509,-0.884c6.407,-0.754 12.792,-1.702 19.14,-2.851c2.88,-0.527 5.264,-2.543 6.264,-5.295c0.601,-1.653 1.186,-3.312 1.758,-4.975c0.126,-0.369 0.252,-0.737 0.377,-1.106c0.886,-2.607 0.317,-5.489 -1.493,-7.565c-1.81,-2.075 -4.587,-3.03 -7.291,-2.507c0,0 0,0 0,0c-10.11,1.957 -20.325,3.362 -30.584,4.242c0,0 0,0 0,0c-1.282,0.11 -2.367,0.99 -2.739,2.221c-0.805,2.651 -1.643,5.291 -2.515,7.921Z" style="fill:#faf3d2;stroke:#e9e9e9;stroke-width:1px;"/><path d="M345.36,295.717c-0.889,-0.325 -1.874,-0.257 -2.711,0.186c-0.837,0.442 -1.447,1.219 -1.678,2.137c-0.573,2.265 -1.169,4.523 -1.788,6.776c-0.247,0.899 -0.498,1.797 -0.753,2.694c-1.196,4.223 1.127,8.643 5.283,10.053c0.454,0.154 0.909,0.308 1.364,0.46c7.815,2.612 15.748,4.872 23.761,6.794c1.011,0.242 2.024,0.48 3.037,0.712c4.09,0.938 8.233,-1.345 9.623,-5.304c0.258,-0.731 0.512,-1.463 0.764,-2.196c0.268,-0.783 0.534,-1.567 0.796,-2.352c0.741,-2.208 0.512,-4.626 -0.628,-6.657c-1.14,-2.03 -3.085,-3.484 -5.356,-4.001c-1.102,-0.25 -2.203,-0.507 -3.302,-0.771c-9.62,-2.308 -19.117,-5.138 -28.411,-8.531c0,0 -0.001,0 -0.001,0Z" style="fill:#faf3d2;stroke:#e9e9e9;stroke-width:1px;"/><path d="M532.071,307.161c-0.832,2.954 0.046,6.125 2.278,8.231c2.231,2.106 5.448,2.798 8.348,1.796c5.319,-1.842 10.582,-3.844 15.773,-6.019c3.188,-1.336 6.35,-2.737 9.48,-4.205c2.017,-0.949 3.563,-2.674 4.287,-4.783c2.056,-6.043 3.888,-12.16 5.504,-18.334c0.307,-1.186 -0.125,-2.439 -1.096,-3.185c-0.971,-0.745 -2.294,-0.837 -3.359,-0.234c-0.002,-0.001 -0.002,0 -0.003,0c-9.836,5.569 -20.134,10.307 -30.703,14.305c-1.283,0.486 -2.569,0.96 -3.859,1.423c-2.55,0.916 -4.487,3.026 -5.181,5.644c-0.267,1.007 -0.539,2.012 -0.815,3.016c-0.215,0.782 -0.433,1.564 -0.654,2.345Z" style="fill:#faf3d2;stroke:#e9e9e9;stroke-width:1px;"/><path d="M301.19,273.826c-0.376,-0.246 -0.855,-0.269 -1.253,-0.06c-0.397,0.209 -0.649,0.618 -0.658,1.067c-0.007,0.324 -0.013,0.648 -0.02,0.972c-0.112,5.474 -0.245,10.948 -0.407,16.421c-0.092,3.073 1.533,5.942 4.215,7.443c1.911,1.059 3.835,2.093 5.774,3.099c2.216,1.15 4.833,1.233 7.117,0.227c2.284,-1.006 3.989,-2.994 4.636,-5.404c0.736,-2.735 1.433,-5.481 2.094,-8.235c0.409,-1.714 -0.413,-3.485 -1.986,-4.279c0,-0.001 0,-0.001 -0.001,-0.001c-6.705,-3.384 -13.233,-7.124 -19.511,-11.249c0,0 0,0 0,-0.001Z" style="fill:#faf3d2;stroke:#e9e9e9;stroke-width:1px;"/><path d="M177.105,303.349c0.367,1.265 1.552,2.115 2.868,2.057c0.001,0 0.001,0 0.001,0c1.592,-0.071 3.184,-0.164 4.775,-0.271c1.87,-0.126 3.739,-0.272 5.606,-0.435c2.531,-0.222 5.061,-0.476 7.585,-0.765c2.404,-0.276 4.805,-0.584 7.199,-0.934c1.328,-0.193 2.653,-0.402 3.978,-0.62c1.646,-0.27 3.291,-0.554 4.933,-0.852c0,0 0,0 0,0c0.617,-0.112 1.161,-0.475 1.5,-1.004c0.339,-0.528 0.442,-1.174 0.286,-1.782c-1.183,-4.634 -2.269,-9.293 -3.26,-13.972c-0.502,-2.389 -2.802,-3.953 -5.207,-3.543c-0.001,0 -0.001,0 -0.001,0c-1.866,0.318 -3.736,0.62 -5.61,0.89c-2.071,0.299 -4.148,0.564 -6.227,0.802c-2.337,0.268 -4.678,0.503 -7.021,0.708c-2.404,0.211 -4.811,0.391 -7.221,0.53c-1.017,0.059 -2.035,0.11 -3.054,0.15c-0.769,0.029 -1.537,0.053 -2.306,0.058c-0.003,0 -0.006,0 -0.008,0c0,0 0,0 0,0c-0.003,-0.001 -0.005,-0.002 -0.008,-0.002c-0.284,-0.057 -0.361,-0.076 -0.646,-0.121c-0.282,-0.044 -0.567,-0.078 -0.852,-0.102c-0.631,-0.052 -1.267,-0.052 -1.898,-0.006c0,0 0,0 0,0c-0.078,0.006 -0.149,0.045 -0.196,0.108c-0.046,0.062 -0.063,0.142 -0.046,0.218c1.421,6.343 3.028,12.643 4.83,18.888Z" style="fill:#faf3d2;stroke:#e9e9e9;stroke-width:1px;"/><path d="M123.759,278.988c-2.546,-0.572 -5.207,0.208 -7.041,2.063c-1.835,1.855 -2.585,4.525 -1.985,7.064c0.496,2.09 1.009,4.175 1.544,6.256c0.785,3.03 3.219,5.355 6.283,5.999c4.186,0.872 8.396,1.628 12.623,2.27c3.322,0.504 6.653,0.939 9.993,1.304c2.666,0.292 5.308,-0.731 7.082,-2.743c1.773,-2.012 2.457,-4.761 1.832,-7.369c-0.374,-1.566 -0.738,-3.135 -1.092,-4.705c-0.767,-3.43 -3.623,-5.996 -7.114,-6.392c-7.434,-0.864 -14.823,-2.108 -22.124,-3.747c-0.001,0 -0.001,0 -0.001,0Z" style="fill:#faf3d2;stroke:#e9e9e9;stroke-width:1px;"/><path d="M471.336,294.34c-0.188,0.776 0.005,1.597 0.521,2.207c0.516,0.611 1.292,0.939 2.09,0.883c0,0 0,0 0.001,0c10.231,-0.721 20.439,-1.803 30.59,-3.273c1.837,-0.266 3.672,-0.545 5.505,-0.836c3.306,-0.526 5.966,-2.999 6.73,-6.258c0.719,-3.098 1.394,-6.206 2.026,-9.323c0.538,-2.664 -0.272,-5.422 -2.165,-7.372c-1.893,-1.951 -4.626,-2.842 -7.305,-2.383c-9.829,1.656 -19.727,2.907 -29.654,3.791c0,0 0,0 0,0c-2.196,0.196 -3.991,1.832 -4.389,4c-1.151,6.221 -2.466,12.413 -3.95,18.564Z" style="fill:#faf3d2;stroke:#e9e9e9;stroke-width:1px;"/><path d="M234.696,292.438c0.296,1.172 1.05,2.175 2.094,2.785c1.043,0.61 2.288,0.774 3.453,0.456c0,0.001 0.001,0.001 0.001,0.001c1.512,-0.413 3.019,-0.842 4.515,-1.31c0.534,-0.167 1.065,-0.341 1.592,-0.527c0.462,-0.162 0.922,-0.334 1.373,-0.525c0.216,-0.092 0.431,-0.187 0.643,-0.289c0.058,-0.028 0.116,-0.057 0.174,-0.086c0.064,-0.031 0.127,-0.064 0.19,-0.097c0.24,-0.127 0.48,-0.255 0.72,-0.381c0.007,-0.004 0.014,-0.007 0.021,-0.011c2.62,-1.351 5.378,-2.408 8.141,-3.425l0.007,-0.002c1.006,-0.369 1.684,-1.313 1.713,-2.383c0.005,-0.174 0.009,-0.347 0.014,-0.521c0.149,-5.635 0.27,-11.271 0.371,-16.907c0,0 0,0 0,0c0.014,-0.795 -0.367,-1.545 -1.016,-2.003c-0.65,-0.459 -1.485,-0.566 -2.229,-0.286c-0.209,0.079 -0.418,0.157 -0.628,0.235c-1.705,0.634 -3.42,1.244 -5.129,1.867c-0.004,0.001 -0.007,0.003 -0.01,0.004c-0.384,0.141 -0.768,0.282 -1.152,0.424c-0.006,0.002 -0.011,0.004 -0.016,0.006c-1.827,0.681 -3.645,1.385 -5.436,2.156c-1.474,0.634 -2.928,1.314 -4.354,2.051c-0.306,0.159 -0.625,0.293 -0.954,0.4c0,0 0,0 0,0c-0.003,0.001 -0.006,0.002 -0.009,0.003c-1.357,0.438 -2.731,0.825 -4.107,1.2c0,0 0,0 0,0c-2.033,0.554 -3.284,2.595 -2.855,4.659c0.877,4.187 1.834,8.357 2.873,12.506Z" style="fill:#faf3d2;stroke:#e9e9e9;stroke-width:1px;"/><path d="M389.106,295.278c9.436,1.167 20.099,1.996 20.099,1.996c10.874,0.82 21.779,1.23 32.684,1.248c0.516,0.001 1.033,0.001 1.549,0c3.773,-0.005 7.061,-2.57 7.983,-6.229c0.736,-2.952 1.432,-5.913 2.088,-8.884c0.538,-2.447 -0.067,-5.006 -1.644,-6.954c-1.576,-1.948 -3.953,-3.073 -6.458,-3.057c-3.297,0.02 -6.593,0.002 -9.889,-0.053c-7.034,-0.117 -14.065,-0.408 -21.084,-0.879c-0.069,-0.005 -0.137,-0.01 -0.205,-0.017l-19.61,-1.81c-0.068,-0.008 -0.137,-0.015 -0.206,-0.021c-1.823,-0.215 -3.645,-0.443 -5.464,-0.684c-7.909,-1.046 -15.785,-2.34 -23.609,-3.901c-3.827,-0.764 -7.641,-1.592 -11.439,-2.489c-1.49,-0.354 -3.06,-0.072 -4.334,0.778c-1.273,0.849 -2.137,2.19 -2.383,3.702c0,0 0,0 0,0c-0.617,3.789 -1.294,7.568 -2.031,11.336c-0.834,4.249 1.862,8.391 6.085,9.347c0,0.002 0,0.002 0.001,0.002c9.54,2.162 19.169,3.932 28.847,5.35c3.002,0.44 6.009,0.846 9.02,1.219Z" style="fill:#faf3d2;stroke:#e9e9e9;stroke-width:1px;"/><path d="M179.538,285.843c0.05,0.029 0.099,0.06 0.147,0.093c0.061,0.043 0.139,0.097 0.139,0.097c0,0 -0.002,-0.001 -0.006,-0.004c-0.072,-0.05 -0.145,-0.098 -0.22,-0.144c-0.026,-0.017 -0.053,-0.034 -0.075,-0.048c-0.001,0 -0.001,-0.001 -0.001,-0.002c0.001,0 0.001,0 0.002,0c0.005,0.003 0.009,0.005 0.014,0.008Z" style="fill:#faf3d2;stroke:#e9e9e9;stroke-width:1px;"/><path d="M170.873,277.894c0.022,0.106 0.115,0.182 0.223,0.183c0,0 0,0 0,0c0.18,0 0.36,0.001 0.54,0.001c0.198,0 0.647,0.003 0.899,-0.003c0.097,-0.002 0.193,-0.007 0.289,-0.01c0.018,-0.001 0.035,-0.002 0.053,-0.003c0,0 0,0 0,0c0.04,-0.002 0.08,-0.001 0.12,0.003l0.16,0.014c0.195,0.016 0.203,0.016 0.383,0.029c0.032,0.002 0.063,0.004 0.095,0.006c0.977,0.054 1.956,0.055 2.935,0.044c1.114,-0.012 2.228,-0.041 3.342,-0.077c3.225,-0.105 6.449,-0.272 9.67,-0.472c2.736,-0.171 5.471,-0.369 8.203,-0.598c2.389,-0.201 4.776,-0.425 7.159,-0.679c0,0 0.001,0 0.001,0c1.504,-0.161 2.875,-0.936 3.788,-2.142c0.913,-1.206 1.287,-2.735 1.033,-4.226c-0.805,-4.776 -1.514,-9.568 -2.131,-14.371c-0.335,-2.635 -2.716,-4.519 -5.357,-4.237c0,0 0,0 0,0c-4.335,0.462 -8.681,0.819 -13.031,1.105c-2.624,0.172 -5.25,0.318 -7.878,0.429c-1.026,0.043 -2.053,0.082 -3.081,0.11c-0.823,0.024 -1.647,0.041 -2.472,0.045c-0.004,0 -0.008,0 -0.012,0c0,0 0,0 0,0c-0.02,0 -0.041,-0.002 -0.061,-0.005c-0.002,-0.001 -0.004,-0.001 -0.006,-0.002c-0.062,-0.01 -0.124,-0.02 -0.186,-0.029c-0.04,-0.006 -0.087,-0.013 -0.126,-0.019c-0.068,-0.01 -0.137,-0.019 -0.205,-0.027c-0.38,-0.046 -0.76,-0.083 -1.142,-0.099c-0.488,-0.022 -0.975,-0.017 -1.462,0.009c-0.3,0.016 -0.598,0.043 -0.897,0.074c-0.004,0 -0.009,0.001 -0.014,0.001c-0.01,0.001 -0.028,0.003 -0.046,0.005c-0.037,0.005 -0.075,0.007 -0.112,0.006c-0.001,0.001 -0.001,0.001 -0.001,0.001c-1.21,-0.004 -2.362,0.519 -3.157,1.431c-0.795,0.912 -1.156,2.124 -0.988,3.322c0.96,6.759 2.114,13.491 3.472,20.181Z" style="fill:#faf3d2;stroke:#e9e9e9;stroke-width:1px;"/><path d="M109.865,208.992c-1.133,-0.14 -2.272,0.22 -3.12,0.985c-0.848,0.765 -1.321,1.861 -1.298,3.003c0,0.001 0,0.001 0,0.002c0.097,4.715 0.279,9.429 0.549,14.138c0.231,4.033 0.526,8.062 0.887,12.086c0.98,10.907 2.443,21.778 4.424,32.552c0.077,0.421 0.405,0.75 0.825,0.83c0,0 0.001,0 0.001,0c6.532,1.241 13.107,2.258 19.707,3.066c2.654,0.326 5.312,0.617 7.973,0.875c2.543,0.249 5.058,-0.697 6.808,-2.559c1.75,-1.863 2.537,-4.431 2.131,-6.955c-0.458,-2.86 -0.882,-5.726 -1.273,-8.596c-0.508,-3.771 -3.53,-6.704 -7.315,-7.099c-2.068,-0.216 -4.134,-0.453 -6.198,-0.713c-8.511,-1.07 -16.978,-2.517 -25.35,-4.391c-0.001,-0.001 -0.002,-0.001 -0.003,-0.001c-0.023,-0.006 -0.038,-0.029 -0.033,-0.053c0.004,-0.023 0.026,-0.039 0.05,-0.037c6.968,0.811 13.954,1.467 20.949,1.987c2.365,0.176 4.731,0.336 7.098,0.481c2.394,0.148 4.734,-0.755 6.408,-2.472c1.675,-1.718 2.519,-4.079 2.312,-6.469c-0.342,-3.946 -0.623,-7.897 -0.845,-11.851c-0.269,-4.8 -0.452,-9.605 -0.551,-14.412c0,0 0,0 0,0c-0.017,-0.822 -0.665,-1.492 -1.485,-1.537c-0.263,-0.014 -0.526,-0.028 -0.788,-0.043c-8.878,-0.496 -17.745,-1.216 -26.582,-2.198c-1.762,-0.196 -3.522,-0.402 -5.281,-0.619Z" style="fill:#faf3d2;stroke:#e9e9e9;stroke-width:1px;"/><path d="M253.15,165.338c1.702,0.194 3.406,-0.354 4.676,-1.503c1.27,-1.15 1.985,-2.79 1.962,-4.503c-0.083,-6.178 -0.181,-12.355 -0.295,-18.532c-0.152,-8.255 -0.332,-16.509 -0.549,-24.763c-0.182,-6.951 -0.391,-13.901 -0.639,-20.85c-0.141,-3.926 -0.293,-7.852 -0.466,-11.777c-0.038,-0.865 -0.582,-1.626 -1.388,-1.942c0,0 0,0 0,0c-1.202,-0.471 -2.409,-0.93 -3.619,-1.379c-2.022,-0.751 -4.263,-0.643 -6.204,0.297c-1.941,0.941 -3.414,2.634 -4.077,4.686c-0.001,0 -0.001,0 -0.001,0.001c-0.951,2.942 -1.859,5.899 -2.727,8.867c-0.589,2.022 0.507,4.151 2.495,4.846c0,0 0,0 0,0c3.667,1.281 7.293,2.677 10.87,4.192c1.167,0.495 2.33,1.002 3.487,1.523c0,0 0.001,0.001 0.002,0.001c0.071,0.034 0.105,0.116 0.077,0.19c-0.028,0.074 -0.107,0.114 -0.183,0.092c-0.285,-0.082 -0.57,-0.164 -0.855,-0.245c-4.579,-1.306 -9.195,-2.481 -13.839,-3.534c-2.133,-0.481 -4.264,0.817 -4.816,2.933c0,0 0,0.001 0,0.001c-1.601,6.14 -3.042,12.322 -4.331,18.536c-0.245,1.183 0.509,2.344 1.689,2.602c0.001,0 0.003,0 0.004,0.001c0.057,0.015 0.093,0.071 0.083,0.13c-0.011,0.058 -0.065,0.098 -0.124,0.091c-0.001,0 -0.001,0 -0.001,0c-1.233,-0.14 -2.366,0.691 -2.603,1.908c-0.395,2.029 -0.775,4.061 -1.138,6.095c-1.193,6.674 -2.218,13.378 -3.075,20.103c-0.274,2.171 0.327,4.361 1.67,6.089c1.342,1.727 3.317,2.85 5.488,3.121c2.181,0.272 4.359,0.56 6.536,0.866c3.927,0.552 7.846,1.162 11.754,1.838c0.045,0.008 0.09,0.014 0.136,0.019c0,0 0.001,0 0.001,0Z" style="fill:#faf3d2;stroke:#e9e9e9;stroke-width:1px;"/><path d="M427.59,224.129c-4.412,-0.09 -8.113,3.311 -8.396,7.715c-0.442,6.692 -1.055,13.372 -1.844,20.031c-0.279,2.309 0.43,4.629 1.953,6.386c1.523,1.758 3.717,2.791 6.042,2.844c5.996,0.134 11.994,0.196 17.991,0.191c2.406,-0.002 4.811,-0.015 7.216,-0.039c4.103,-0.041 7.551,-3.092 8.09,-7.159c0.65,-4.95 1.196,-9.913 1.643,-14.884c0.361,-4.024 0.656,-8.053 0.887,-12.086c0,-0.001 0,-0.001 0,-0.001c0.046,-0.793 -0.242,-1.568 -0.793,-2.14c-0.552,-0.571 -1.316,-0.886 -2.11,-0.869c-5.925,0.123 -11.851,0.176 -17.777,0.159c-4.301,-0.013 -8.602,-0.061 -12.902,-0.148Z" style="fill:#faf3d2;stroke:#e9e9e9;stroke-width:1px;"/><path d="M478.639,254.048c-0.203,1.604 0.316,3.216 1.418,4.4c1.102,1.185 2.673,1.818 4.288,1.731c0,0.001 0,0.001 0,0.001c10.51,-0.57 21.009,-1.363 31.482,-2.41c3.832,-0.388 6.884,-3.378 7.352,-7.201c0.458,-3.779 0.856,-7.565 1.197,-11.355c0.361,-4.024 0.656,-8.053 0.887,-12.086c0,-0.001 0,-0.001 0,-0.001c0.109,-1.903 -0.625,-3.757 -2.007,-5.07c-1.382,-1.312 -3.272,-1.95 -5.167,-1.742c-1.314,0.144 -2.628,0.284 -3.942,0.419c-8.518,0.879 -17.054,1.58 -25.601,2.12c-4.154,0.258 -7.464,3.572 -7.717,7.726c-0.493,7.843 -1.22,15.67 -2.19,23.468Z" style="fill:#faf3d2;stroke:#e9e9e9;stroke-width:1px;"/><path d="M360.797,219.576c-2.267,-0.276 -4.547,0.402 -6.296,1.871c-1.749,1.468 -2.811,3.597 -2.931,5.878c-0.366,6.686 -0.9,13.363 -1.609,20.021c-0.489,4.49 2.728,8.538 7.213,9.075c3.421,0.411 6.847,0.791 10.275,1.144c7.031,0.725 14.073,1.334 21.123,1.838c4.364,0.308 8.208,-2.845 8.759,-7.185c0.545,-4.326 1.011,-8.662 1.401,-13.004c0.361,-4.024 0.656,-8.053 0.887,-12.086c0,0 0,0 0,-0.001c0.129,-2.255 -1.586,-4.192 -3.841,-4.336c-7.129,-0.461 -14.251,-1.034 -21.362,-1.729c-4.545,-0.444 -9.085,-0.938 -13.619,-1.486Z" style="fill:#faf3d2;stroke:#e9e9e9;stroke-width:1px;"/><path d="M179.126,254.072c0.066,0.028 0.131,0.058 0.195,0.09c0.068,0.035 0.148,0.076 0.148,0.076c0,0 0,0 0,0c-0.085,-0.043 -0.17,-0.084 -0.257,-0.123c-0.03,-0.014 -0.061,-0.028 -0.087,-0.04c-0.001,-0.001 -0.001,-0.001 -0.001,-0.002c0.001,-0.001 0.001,-0.001 0.002,-0.001c0,0 0,0 0,0Z" style="fill:#faf3d2;stroke:#e9e9e9;stroke-width:1px;"/><path d="M178.967,213.337c0.065,0.017 0.129,0.035 0.192,0.055c0.014,0.005 0.028,0.009 0.04,0.013c0.001,0 0.001,0.001 0.001,0.001c0,0 -0.001,0 -0.001,0c-0.06,-0.017 -0.174,-0.049 -0.259,-0.074c-0.001,0 -0.001,0 -0.001,-0.001c0,-0.001 0.001,-0.001 0.001,-0.001c0.009,0.002 0.018,0.005 0.027,0.007Z" style="fill:#faf3d2;stroke:#e9e9e9;stroke-width:1px;"/><path d="M177.904,213.065c0.05,0.01 0.099,0.021 0.147,0.033c0.018,0.005 0.038,0.01 0.059,0.016c0.001,0 0.002,0.001 0.001,0.002c0,0.001 -0.001,0.001 -0.002,0.001c-0.072,-0.017 -0.149,-0.035 -0.193,-0.046c-0.026,-0.006 -0.051,-0.012 -0.077,-0.017c-0.014,-0.003 -0.026,-0.005 -0.026,-0.005c0.03,0.005 0.061,0.011 0.091,0.016Z" style="fill:#faf3d2;stroke:#e9e9e9;stroke-width:1px;"/><path d="M459.924,166.022c-0.202,-2.093 -1.957,-3.693 -4.06,-3.701c-3.505,-0.011 -7.01,-0.018 -10.515,-0.022c-0.002,0 -0.004,0 -0.006,0c-1.376,-0.001 -2.752,-0.001 -4.128,-0.001c-0.001,0 -0.002,0 -0.003,0c-4.765,0.003 -9.529,0.014 -14.294,0.034c-2.293,0.009 -4.479,0.974 -6.032,2.662c-1.553,1.687 -2.332,3.946 -2.151,6.232c0.128,1.606 0.247,3.212 0.356,4.82c0.697,10.201 1.03,20.427 0.986,30.653c-0.002,0.604 -0.006,1.208 -0.012,1.813c-0.001,0.184 0.071,0.362 0.2,0.494c0.13,0.131 0.306,0.206 0.491,0.207c0,0 0,0 0,0c11.768,0.068 23.537,0.081 35.305,0.039c0,0 0,0 0.001,0c3.18,-0.011 5.749,-2.597 5.74,-5.777c-0.013,-3.447 -0.07,-6.894 -0.172,-10.34c-0.267,-9.053 -0.838,-18.097 -1.706,-27.112c0,0 0,-0.001 0,-0.001Z" style="fill:#faf3d2;stroke:#e9e9e9;stroke-width:1px;"/><path d="M398.371,166.022c-0.188,-1.955 -1.844,-3.44 -3.808,-3.414c-9.284,0.121 -18.568,0.281 -27.851,0.482c-2.595,0.057 -5.19,0.116 -7.784,0.18c-2.261,0.055 -4.4,1.036 -5.916,2.714c-1.517,1.678 -2.277,3.905 -2.104,6.159c0.101,1.301 0.196,2.601 0.285,3.903c0.697,10.201 1.03,20.427 0.986,30.653c0,0 0,0 0,0c-0.004,0.797 0.63,1.45 1.426,1.471c9.366,0.246 18.733,0.444 28.101,0.603c3.388,0.058 6.776,0.11 10.164,0.157c2.222,0.031 4.362,-0.836 5.936,-2.405c1.573,-1.569 2.447,-3.707 2.422,-5.929c-0.027,-2.487 -0.077,-4.975 -0.151,-7.461c-0.267,-9.053 -0.838,-18.097 -1.706,-27.112c0,0 0,-0.001 0,-0.001Z" style="fill:#faf3d2;stroke:#e9e9e9;stroke-width:1px;"/><path d="M553.013,164.05c-2.341,-0.08 -4.606,0.839 -6.229,2.529c-1.623,1.69 -2.45,3.991 -2.275,6.327c0.079,1.046 0.155,2.093 0.226,3.14c0.697,10.201 1.03,20.427 0.986,30.653c0,0 0,0 0,0c-0.001,0.279 0.111,0.547 0.311,0.741c0.2,0.195 0.471,0.3 0.75,0.291c6.997,-0.224 13.993,-0.478 20.988,-0.769c4.721,-0.197 9.443,-0.41 14.163,-0.645c3.117,-0.156 5.552,-2.749 5.513,-5.87c0,0 0,0 0,0c-0.1,-7.832 -0.46,-15.66 -1.072,-23.469c-0.126,-1.607 -0.262,-3.214 -0.41,-4.82c-0.353,-3.865 -3.501,-6.879 -7.378,-7.064c0,0 -0.001,0 -0.001,0c-8.521,-0.406 -17.045,-0.749 -25.572,-1.044Z" style="fill:#faf3d2;stroke:#e9e9e9;stroke-width:1px;"/><path d="M299.79,198.32c0.017,4.39 3.47,7.997 7.855,8.204c3.695,0.174 7.391,0.336 11.087,0.488c1.671,0.068 3.342,0.135 5.013,0.199c2.263,0.088 4.461,-0.759 6.081,-2.342c1.619,-1.582 2.516,-3.761 2.481,-6.025c-0.03,-1.903 -0.072,-3.806 -0.128,-5.709c-0.267,-9.053 -0.838,-18.097 -1.706,-27.112c0,0 0,0 0,0c-0.103,-1.069 -1.021,-1.872 -2.094,-1.834c-6.754,0.246 -13.507,0.522 -20.258,0.838c-0.741,0.035 -1.483,0.07 -2.224,0.106c-3.552,0.17 -6.334,3.119 -6.297,6.675c0,0.001 0,0.001 0,0.001c0.091,8.837 0.155,17.674 0.19,26.511Z" style="fill:#faf3d2;stroke:#e9e9e9;stroke-width:1px;"/><path d="M163.749,206.794c0,0.058 0.047,0.104 0.104,0.104c0,0 0.001,0 0.001,0c2.077,0.007 4.155,0.01 6.233,0.012c0.747,0 1.495,0.002 2.242,0c0.014,0 0.028,0 0.041,0c0.293,-0.002 0.586,-0.007 0.879,-0.011c0.157,-0.001 0.156,-0.001 0.314,0.006l0.193,0.005c0.032,0.001 0.064,0.001 0.097,0.002c0.191,0.002 0.382,0.004 0.573,0.006c0.01,0 0.02,0 0.029,0c0.665,0.002 1.329,0.002 1.993,0.002c0.002,0 0.005,0 0.007,0c4.355,-0.007 8.71,-0.034 13.065,-0.066c4.517,-0.033 9.033,-0.075 13.549,-0.13c0,0 0.214,-0.003 0.472,-0.006c0.502,-0.006 0.905,-0.415 0.904,-0.917c0,0 0,0 0,0c-0.01,-4.42 0.051,-8.84 0.182,-13.258c0.185,-6.308 0.512,-12.611 0.978,-18.905c0.171,-2.273 -0.608,-4.516 -2.151,-6.195c-1.542,-1.679 -3.712,-2.644 -5.992,-2.665c-9.819,-0.091 -19.64,-0.126 -29.46,-0.111c0,0 -0.421,0 -0.899,0.001c-0.766,0.002 -1.406,0.584 -1.479,1.346c0,0 0,0.001 0,0.001c-0.868,9.015 -1.439,18.059 -1.706,27.112c-0.134,4.554 -0.191,9.111 -0.169,13.667Z" style="fill:#faf3d2;stroke:#e9e9e9;stroke-width:1px;"/><path d="M105.426,197.891c-0.082,4.537 3.518,8.287 8.054,8.391c7.377,0.165 14.755,0.294 22.133,0.391c4.544,0.058 8.279,-3.571 8.35,-8.115c0.025,-1.713 0.062,-3.425 0.108,-5.137c0.18,-6.565 0.513,-13.125 0.995,-19.674c0.173,-2.305 -0.63,-4.577 -2.213,-6.262c-1.582,-1.684 -3.8,-2.627 -6.111,-2.597c-4.228,0.053 -8.456,0.117 -12.684,0.192c-5.393,0.097 -10.786,0.21 -16.179,0.344c-0.33,0.008 -0.603,0.261 -0.635,0.591c0,0 0,0 0,0c-0.868,9.015 -1.439,18.059 -1.706,27.112c-0.047,1.588 -0.084,3.176 -0.112,4.764Z" style="fill:#faf3d2;stroke:#e9e9e9;stroke-width:1px;"/><path d="M108.323,156.08c-0.195,1.631 0.367,3.262 1.526,4.428c1.159,1.165 2.786,1.737 4.419,1.553c0,0 0,0 0,0c5.699,-0.644 11.411,-1.179 17.129,-1.615c2.685,-0.204 5.371,-0.387 8.058,-0.55c3.973,-0.239 7.208,-3.282 7.688,-7.234c0.975,-7.909 2.17,-15.792 3.587,-23.634c0,-0.001 0,-0.001 0,-0.002c0.299,-1.653 -0.172,-3.353 -1.279,-4.617c-1.107,-1.264 -2.729,-1.955 -4.408,-1.877c-2.133,0.099 -4.265,0.209 -6.397,0.332c-6.4,0.369 -12.794,0.848 -19.176,1.448c-3.668,0.349 -6.659,3.09 -7.326,6.713c-0.141,0.759 -0.279,1.518 -0.414,2.277c-1.351,7.558 -2.486,15.155 -3.407,22.778Z" style="fill:#faf3d2;stroke:#e9e9e9;stroke-width:1px;"/><path d="M179.162,121.951c-3.993,-0.045 -7.445,2.777 -8.193,6.7c-0.296,1.549 -0.582,3.099 -0.859,4.651c-1.297,7.256 -2.395,14.548 -3.296,21.864c-0.116,0.956 0.184,1.917 0.824,2.637c0.64,0.72 1.559,1.131 2.523,1.128c0,0 0,0 0,0c9.653,-0.035 19.307,0.175 28.948,0.65c4.321,0.22 8.077,-2.937 8.603,-7.232c0.968,-7.804 2.15,-15.582 3.548,-23.321c0,-0.001 0,-0.001 0,-0.001c0.265,-1.464 -0.11,-2.971 -1.029,-4.14c-0.919,-1.169 -2.294,-1.89 -3.779,-1.979c-6.063,-0.358 -12.132,-0.616 -18.203,-0.781c-3.028,-0.082 -6.058,-0.14 -9.087,-0.176Z" style="fill:#faf3d2;stroke:#e9e9e9;stroke-width:1px;"/><path d="M391.079,119.103c-0.879,-4.028 -4.599,-6.788 -8.709,-6.46c-5.795,0.465 -11.584,1.005 -17.365,1.622c-4.42,0.472 -8.835,0.99 -13.244,1.557c-2.251,0.292 -4.282,1.498 -5.615,3.336c-1.333,1.837 -1.849,4.143 -1.427,6.373c0.023,0.125 0.046,0.25 0.07,0.375c1.504,7.977 2.776,15.998 3.821,24.047c0,0.001 0,0.001 0,0.001c0.123,0.947 0.619,1.806 1.378,2.386c0.758,0.58 1.717,0.833 2.663,0.704c7.46,-1.015 14.94,-1.873 22.434,-2.597c4.131,-0.4 8.267,-0.758 12.405,-1.077c2.3,-0.177 4.421,-1.31 5.848,-3.123c1.426,-1.813 2.027,-4.141 1.658,-6.418c-0.312,-1.925 -0.638,-3.848 -0.977,-5.768c-0.884,-5.004 -1.863,-9.992 -2.94,-14.958Z" style="fill:#faf3d2;stroke:#e9e9e9;stroke-width:1px;"/><path d="M481.8,111.259c-2.538,-0.126 -4.993,0.925 -6.653,2.85c-1.659,1.925 -2.338,4.508 -1.84,7c0.32,1.597 0.632,3.196 0.933,4.797c1.226,6.502 2.298,13.033 3.218,19.586c0.213,1.525 1.479,2.686 3.017,2.765c0,0 0,0 0,0c11.822,0.61 23.63,1.516 35.402,2.764c0.001,0 0.001,0 0.001,0c1.571,0.167 3.131,-0.403 4.225,-1.543c1.094,-1.139 1.599,-2.721 1.369,-4.284c-0.552,-3.719 -1.155,-7.431 -1.809,-11.133c-0.851,-4.813 -1.789,-9.611 -2.817,-14.389c-0.764,-3.523 -3.728,-6.142 -7.318,-6.465c-0.291,-0.028 -0.583,-0.054 -0.874,-0.08c-8.938,-0.794 -17.892,-1.413 -26.854,-1.868Z" style="fill:#faf3d2;stroke:#e9e9e9;stroke-width:1px;"/><path d="M451.812,115.41c-0.685,-2.99 -3.34,-5.115 -6.407,-5.126c-0.001,-0.001 -0.001,-0.001 -0.001,-0.001c-0.001,0 -0.002,0 -0.004,0c-1.16,-0.004 -2.321,-0.005 -3.481,-0.005c-0.003,0 -0.005,0 -0.007,0c-4.116,0.006 -8.231,0.04 -12.346,0.108c-3.367,0.056 -6.734,0.133 -10.1,0.233c-2.429,0.072 -4.702,1.212 -6.212,3.114c-1.511,1.903 -2.106,4.375 -1.625,6.757c0.365,1.803 0.718,3.608 1.058,5.416c0.917,4.86 1.747,9.735 2.492,14.624c0.623,4.112 4.211,7.116 8.368,7.006c6.585,-0.167 13.171,-0.247 19.757,-0.241c1.57,0.001 3.139,0.007 4.709,0.018c2.435,0.017 4.753,-1.044 6.332,-2.898c1.579,-1.854 2.257,-4.311 1.854,-6.713c-0.204,-1.214 -0.413,-2.428 -0.627,-3.641c-1.104,-6.246 -2.355,-12.466 -3.76,-18.651Z" style="fill:#faf3d2;stroke:#e9e9e9;stroke-width:1px;"/><path d="M531.669,82.333c-0.914,-0.2 -1.866,0.098 -2.502,0.785c-0.636,0.687 -0.861,1.659 -0.591,2.556c0,0 0,0.001 0,0.001c1.97,6.547 3.753,13.151 5.362,19.796c0,0.001 0,0.001 0,0.001c0.501,2.066 2.1,3.688 4.159,4.218c5.757,1.49 11.471,3.145 17.127,4.983c6.852,2.226 13.619,4.721 20.252,7.534c0,0 0,0 0,0c0.495,0.21 1.066,0.123 1.476,-0.225c0.409,-0.348 0.588,-0.897 0.461,-1.419c-0.961,-3.931 -1.995,-7.843 -3.107,-11.734c-1.095,-3.829 -2.266,-7.637 -3.521,-11.417c-0.071,-0.213 -0.143,-0.427 -0.214,-0.641c-0.821,-2.453 -2.746,-4.379 -5.199,-5.201c-2.426,-0.811 -4.863,-1.59 -7.31,-2.34c-6.008,-1.84 -12.071,-3.498 -18.174,-4.991c-2.732,-0.668 -5.472,-1.303 -8.219,-1.906Z" style="fill:#faf3d2;stroke:#e9e9e9;stroke-width:1px;"/><path d="M185.89,93.769c-3.829,-0.144 -7.253,2.369 -8.262,6.066c-0.375,1.366 -0.74,2.734 -1.097,4.104c-1.085,4.161 -2.097,8.342 -3.037,12.538c-0.117,0.52 0.009,1.065 0.34,1.483c0.331,0.417 0.834,0.663 1.367,0.668c0.001,0 0.001,0 0.001,0c8.368,0.08 16.734,0.488 25.068,1.245c1.691,0.154 3.38,0.322 5.068,0.504c4.187,0.452 8.04,-2.325 8.937,-6.439c0.954,-4.35 1.98,-8.684 3.081,-12.999c0.277,-1.079 0.077,-2.226 -0.549,-3.148c-0.626,-0.922 -1.617,-1.531 -2.723,-1.673c0,0 0,0 0,0c-9.358,-1.195 -18.768,-1.97 -28.194,-2.349Z" style="fill:#faf3d2;stroke:#e9e9e9;stroke-width:1px;"/><path d="M472.608,74.051c-2.699,-0.177 -5.313,0.982 -6.994,3.101c-1.682,2.119 -2.216,4.928 -1.431,7.517c0.1,0.336 0.201,0.671 0.302,1.006c0.764,2.538 1.499,5.085 2.207,7.639c0.93,3.356 3.868,5.766 7.341,6.021c6.992,0.524 13.971,1.229 20.925,2.124c1.889,0.243 3.775,0.499 5.66,0.771c2.787,0.398 5.583,-0.653 7.418,-2.787c1.835,-2.135 2.454,-5.058 1.642,-7.753c-0.475,-1.583 -0.962,-3.163 -1.461,-4.739c-0.561,-1.773 -1.137,-3.542 -1.729,-5.305c-0.859,-2.555 -3.094,-4.402 -5.766,-4.762c0,-0.001 0,-0.001 0,-0.001c-9.336,-1.261 -18.715,-2.199 -28.114,-2.832Z" style="fill:#faf3d2;stroke:#e9e9e9;stroke-width:1px;"/><path d="M298.125,99.187c0.004,0.121 0.074,0.231 0.183,0.286c0.108,0.055 0.238,0.047 0.338,-0.022c0,0 0,0 0,0c1.754,-1.196 3.53,-2.36 5.325,-3.495c3.054,-1.93 6.163,-3.772 9.32,-5.529c1.229,-0.682 1.808,-2.135 1.384,-3.476c0,0 0,0 0,0c-1.894,-5.987 -3.96,-11.919 -6.232,-17.773c0,0 0,0 0,0c-0.013,-0.035 -0.041,-0.062 -0.076,-0.075c-0.034,-0.013 -0.073,-0.011 -0.105,0.007c-2.252,1.176 -4.484,2.39 -6.695,3.642c-2.696,1.53 -4.306,4.443 -4.166,7.54c0.075,1.697 0.148,3.394 0.217,5.091c0.189,4.6 0.356,9.202 0.507,13.804Z" style="fill:#faf3d2;stroke:#e9e9e9;stroke-width:1px;"/><path d="M440.007,74.803c-0.381,-1.045 -1.38,-1.735 -2.492,-1.723c0,0 -0.001,0 -0.001,0c-3.393,0.039 -6.787,0.115 -10.178,0.231c-5.798,0.197 -11.591,0.507 -17.376,0.933c-2.495,0.186 -4.77,1.495 -6.184,3.559c-1.415,2.063 -1.816,4.657 -1.09,7.051c0.081,0.274 0.164,0.547 0.246,0.821c0.747,2.483 1.467,4.974 2.161,7.472c1.049,3.776 4.611,6.292 8.52,6.018c4.401,-0.305 8.806,-0.538 13.214,-0.702c3.196,-0.119 6.393,-0.202 9.591,-0.248c1.612,-0.024 3.223,-0.037 4.834,-0.043c0.005,0 0.009,0 0.014,0c0.677,-0.002 1.355,-0.003 2.032,-0.002l0.007,0c0.986,0.002 1.916,-0.461 2.509,-1.249c0.593,-0.788 0.78,-1.81 0.504,-2.757c-0.704,-2.413 -1.434,-4.817 -2.192,-7.213c-1.29,-4.077 -2.659,-8.129 -4.119,-12.148Z" style="fill:#faf3d2;stroke:#e9e9e9;stroke-width:1px;"/><path d="M121.51,91.92c-0.078,0.263 -0.011,0.548 0.177,0.748c0.188,0.2 0.468,0.285 0.735,0.223c0.001,0 0.001,0 0.001,0c12.127,-2.807 24.503,-4.518 36.929,-5.212c0,0 0,0 0,0c0.678,-0.038 1.258,-0.497 1.452,-1.147c1.081,-3.626 2.219,-7.234 3.42,-10.822c0,0 0,-0.001 0,-0.001c0.729,-2.18 0.328,-4.58 -1.072,-6.403c-1.399,-1.824 -3.613,-2.834 -5.907,-2.694c-1.285,0.078 -2.569,0.164 -3.852,0.261c-6.587,0.496 -13.156,1.256 -19.68,2.289c-2.945,0.473 -5.404,2.501 -6.43,5.302c-1.282,3.513 -2.494,7.051 -3.643,10.609c-0.735,2.274 -1.445,4.557 -2.13,6.847Z" style="fill:#faf3d2;stroke:#e9e9e9;stroke-width:1px;"/><path d="M190.073,66.808c-0.865,-0.061 -1.669,0.447 -1.986,1.253c0,0 0,0 0,0.001c-2.204,5.603 -4.216,11.281 -6.067,17.011c0,0 -0.001,0 -0.001,0c-0.186,0.576 -0.093,1.206 0.252,1.705c0.344,0.498 0.901,0.807 1.506,0.836c7.007,0.354 13.998,1.031 20.941,2.044c2.555,0.373 5.103,0.791 7.642,1.256c4.126,0.756 8.162,-1.707 9.375,-5.723c0.962,-3.174 1.967,-6.336 3.019,-9.481c0,0 0,-0.001 0,-0.001c0.308,-0.92 0.208,-1.927 -0.273,-2.769c-0.482,-0.842 -1.3,-1.438 -2.249,-1.639c-2.504,-0.528 -5.017,-1.014 -7.538,-1.458c-8.147,-1.437 -16.369,-2.444 -24.621,-3.035Z" style="fill:#faf3d2;stroke:#e9e9e9;stroke-width:1px;"/><path d="M522.68,48.323c-1.658,-0.433 -3.417,0.113 -4.537,1.409c-1.12,1.295 -1.407,3.115 -0.739,4.692c-0.002,0.002 -0.002,0.002 -0.002,0.003c1.994,4.712 3.849,9.483 5.584,14.297c0,0 0,0 0,0c0.409,1.134 1.332,2.005 2.487,2.348c2.524,0.753 5.037,1.543 7.536,2.373c8.082,2.683 16.03,5.774 23.778,9.307c2.864,1.306 5.7,2.672 8.505,4.101c0.34,0.174 0.751,0.119 1.035,-0.137c0.283,-0.255 0.378,-0.66 0.239,-1.015c0,-0.001 0,-0.002 -0.001,-0.002c-1.067,-2.732 -2.189,-5.442 -3.378,-8.123c-1.14,-2.572 -2.341,-5.117 -3.623,-7.622c-0.998,-1.948 -2.044,-3.873 -3.161,-5.757c-0.97,-1.635 -1.992,-3.243 -3.113,-4.78c-0.001,-0.002 -0.003,-0.004 -0.004,-0.006c0,0 0,0 0,0c-0.182,-0.247 -0.403,-0.463 -0.654,-0.638c-0.527,-0.367 -1.059,-0.726 -1.589,-1.089c-0.553,-0.381 -1.15,-0.692 -1.778,-0.928c-2.022,-0.757 -4.053,-1.49 -6.093,-2.198c-6.747,-2.342 -13.586,-4.417 -20.492,-6.235Z" style="fill:#faf3d2;stroke:#e9e9e9;stroke-width:1px;"/><path d="M369.378,53c-1.597,-3.344 -5.356,-5.068 -8.932,-4.097c-0.001,0 -0.001,0 -0.001,0c-9.079,2.467 -18.038,5.379 -26.816,8.765c0,0 -0.001,0.001 -0.001,0.001c-3.996,1.541 -6.023,5.999 -4.558,10.024c0.125,0.343 0.25,0.687 0.374,1.031c0.433,1.2 0.858,2.403 1.276,3.609c0.734,2.109 2.292,3.83 4.318,4.77c2.026,0.94 4.346,1.017 6.43,0.215c2.894,-1.115 5.809,-2.172 8.743,-3.174c5.297,-1.81 10.654,-3.443 16.058,-4.904c2.331,-0.628 4.27,-2.246 5.305,-4.427c1.034,-2.181 1.06,-4.706 0.071,-6.908c-0.492,-1.106 -0.995,-2.206 -1.508,-3.302c-0.251,-0.535 -0.504,-1.07 -0.759,-1.603Z" style="fill:#faf3d2;stroke:#e9e9e9;stroke-width:1px;"/><path d="M449.58,38.283c-0.812,-0.017 -1.574,0.392 -2.01,1.078c-0.435,0.686 -0.48,1.549 -0.119,2.277c0.067,0.135 0.134,0.269 0.201,0.404c2.012,4.069 3.89,8.204 5.659,12.385c0.381,0.899 0.756,1.8 1.126,2.703c0.622,1.517 2.064,2.537 3.701,2.619c0,0 0,0 0.001,0c13.879,0.696 27.715,2.333 41.36,4.974c0,0 0,0 0.001,0c0.153,0.03 0.31,-0.027 0.408,-0.148c0.099,-0.12 0.124,-0.285 0.064,-0.429c-1.325,-3.212 -2.718,-6.396 -4.191,-9.543c-1.969,-4.206 -4.078,-8.349 -6.381,-12.383c0,0 0,0 0,0c-0.258,-0.452 -0.711,-0.76 -1.226,-0.833c-9.159,-1.299 -18.376,-2.191 -27.612,-2.692c-3.658,-0.199 -7.319,-0.336 -10.982,-0.412c0,0 0,0 0,0Z" style="fill:#faf3d2;stroke:#e9e9e9;stroke-width:1px;"/><path d="M424.207,40.324c-0.564,-0.952 -1.616,-1.508 -2.721,-1.437c0,0 0,0 0,0c-10.846,0.698 -21.658,1.937 -32.376,3.742c-0.001,0 -0.001,0 -0.001,0c-0.593,0.1 -1.105,0.472 -1.382,1.006c-0.278,0.533 -0.29,1.165 -0.032,1.708c1.42,2.999 2.771,6.029 4.063,9.084c0.375,0.885 0.744,1.772 1.109,2.661c1.431,3.479 5.035,5.549 8.761,5.03c8.384,-1.145 16.819,-1.925 25.27,-2.356c0.574,-0.029 1.149,-0.057 1.724,-0.083c1.19,-0.054 2.274,-0.699 2.89,-1.718c0.616,-1.019 0.683,-2.279 0.178,-3.357c0,0 0,0 0,-0.001c-1.969,-4.206 -4.078,-8.349 -6.381,-12.383c-0.362,-0.635 -0.729,-1.267 -1.102,-1.896Z" style="fill:#faf3d2;stroke:#e9e9e9;stroke-width:1px;"/><path d="M557.252,61.478c0.023,0.012 0.039,0.035 0.043,0.061c0.003,0.026 -0.005,0.052 -0.024,0.071c-0.562,-0.38 -1.144,-0.724 -1.716,-1.084c-0.002,-0.002 -0.005,-0.004 -0.008,-0.006c0,0 0,0 0,0c0.568,0.319 1.137,0.639 1.705,0.958Z" style="fill:#faf3d2;stroke:#e9e9e9;stroke-width:1px;"/></g></g></svg>
\ No newline at end of file
diff --git a/pnut/templates/connector_settings.tpl b/pnut/templates/connector_settings.tpl
deleted file mode 100644
index 6662a5ae..00000000
--- a/pnut/templates/connector_settings.tpl
+++ /dev/null
@@ -1,14 +0,0 @@
-<p>{{$status}}</p>
-{{include file="field_checkbox.tpl" field=$enable}}
-{{include file="field_checkbox.tpl" field=$bydefault}}
-{{if $user_client}}
-	{{include file="field_input.tpl" field=$client_id}}
-	{{include file="field_input.tpl" field=$client_secret}}
-	{{include file="field_input.tpl" field=$access_token}}
-{{/if}}
-{{if $authorize_url}}
-	<a href="{{$authorize_url}}">{{$authorize_text}}</a>
-{{/if}}
-{{if $disconn_btn}}
-	<div class="submit"><input type="submit" name="pnut-disconnect" value="{{$disconn_btn}}" /></div>
-{{/if}}
diff --git a/public_server/README.md b/public_server/README.md
index 082379c3..fecc38ba 100644
--- a/public_server/README.md
+++ b/public_server/README.md
@@ -6,23 +6,21 @@ Public Server is a Friendica addon which implements automatic account & post exp
 
 This is a modified version of the testdrive addon, DO NOT ACTIVATE AT THE SAME TIME AS THE TESTDRIVE ADDON.
 
-	return [
-		'public_server' => [
-			// When an account is created on the site, it is given a hard expiration date of. 0 to disable.
-			'expiredays' => 0,
-			// Set the default days for posts to expire here. 0 to disable.
-			'expireposts' => 0,
-			// Remove users who have never logged in after nologin days. 0 to disable.
-			'nologin' => 0,
-			// Remove users who last logged in over flagusers days ago. 0 to disable.
-			'flagusers' => 0,
-			// For users who last logged in over flagposts days ago set post expiry days to flagpostsexpire. 0 to disable.
-			'flagposts' => 0,
-			'flagpostsexpire' => 0,
-		],
-	];
+    'public_server' => [
+        // When an account is created on the site, it is given a hard expiration date of. 0 to disable.
+        'expiredays' => 0,
+        // Set the default days for posts to expire here. 0 to disable.
+        'expireposts' => 0,
+        // Remove users who have never logged in after nologin days. 0 to disable.
+        'nologin' => 0,
+        // Remove users who last logged in over flagusers days ago. 0 to disable.
+        'flagusers' => 0,
+        // For users who last logged in over flagposts days ago set post expiry days to flagpostsexpire. 0 to disable.
+        'flagposts' => 0,
+        'flagpostsexpire' => 0,
+    ],
 
-Set these in your `config/public_server.config.php` file. By default, nothing is defined in case the addon is activated accidentally.
+Set these in your `config/addon.config.php` file. By default nothing is defined in case the addon is activated accidentally.
 They can be ommitted or set to 0 to disable each option.
 The default values are those used by friendica.eu, change these as desired.
 
diff --git a/public_server/config/public_server.config.php b/public_server/config/public_server.config.php
index 6315cc93..47ad4107 100644
--- a/public_server/config/public_server.config.php
+++ b/public_server/config/public_server.config.php
@@ -1,7 +1,7 @@
 <?php
 
 // Warning: Don't change this file! It only holds the default config values for this addon.
-// Instead, copy this file to config/public_server.config.php in your Friendica directory and set the correct values there
+// Instead overwrite these config values in config/addon.config.php in your Friendica directory
 
 return [
 	'public_server' => [
diff --git a/public_server/lang/C/messages.po b/public_server/lang/C/messages.po
index 5994deb5..045ddc39 100644
--- a/public_server/lang/C/messages.po
+++ b/public_server/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,20 +17,20 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: public_server.php:64
+#: public_server.php:62
 msgid "Administrator"
 msgstr ""
 
-#: public_server.php:118
+#: public_server.php:126
 #, php-format
 msgid "Your account on %s will expire in a few days."
 msgstr ""
 
-#: public_server.php:119
+#: public_server.php:127
 msgid "Your Friendica account is about to expire."
 msgstr ""
 
-#: public_server.php:120
+#: public_server.php:128
 #, php-format
 msgid ""
 "Hi %1$s,\n"
@@ -38,11 +38,3 @@ msgid ""
 "Your account on %2$s will expire in less than five days. You may keep your "
 "account by logging in at least once every 30 days"
 msgstr ""
-
-#: public_server.php:158
-msgid "Save Settings"
-msgstr ""
-
-#: public_server.php:160
-msgid "Set any of these options to 0 to deactivate it."
-msgstr ""
diff --git a/public_server/lang/ar/messages.po b/public_server/lang/ar/messages.po
deleted file mode 100644
index 3934d636..00000000
--- a/public_server/lang/ar/messages.po
+++ /dev/null
@@ -1,49 +0,0 @@
-# ADDON public_server
-# Copyright (C)
-# This file is distributed under the same license as the Friendica public_server addon package.
-# 
-# 
-# Translators:
-# Farida Khalaf <faridakhalaf@hotmail.com>, 2021
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2021-02-21 18:42+0000\n"
-"Last-Translator: Farida Khalaf <faridakhalaf@hotmail.com>\n"
-"Language-Team: Arabic (http://www.transifex.com/Friendica/friendica/language/ar/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ar\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-
-#: public_server.php:64
-msgid "Administrator"
-msgstr ""
-
-#: public_server.php:118
-#, php-format
-msgid "Your account on %s will expire in a few days."
-msgstr ""
-
-#: public_server.php:119
-msgid "Your Friendica account is about to expire."
-msgstr ""
-
-#: public_server.php:120
-#, php-format
-msgid ""
-"Hi %1$s,\n"
-"\n"
-"Your account on %2$s will expire in less than five days. You may keep your account by logging in at least once every 30 days"
-msgstr ""
-
-#: public_server.php:158
-msgid "Save Settings"
-msgstr "حفظ الإعدادات"
-
-#: public_server.php:160
-msgid "Set any of these options to 0 to deactivate it."
-msgstr ""
diff --git a/public_server/lang/ar/strings.php b/public_server/lang/ar/strings.php
deleted file mode 100644
index 285ad303..00000000
--- a/public_server/lang/ar/strings.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_ar")) {
-function string_plural_select_ar($n){
-	$n = intval($n);
-	if ($n==0) { return 0; } else if ($n==1) { return 1; } else if ($n==2) { return 2; } else if ($n%100>=3 && $n%100<=10) { return 3; } else if ($n%100>=11 && $n%100<=99) { return 4; } else  { return 5; }
-}}
-$a->strings['Save Settings'] = 'حفظ الإعدادات';
diff --git a/public_server/lang/cs/strings.php b/public_server/lang/cs/strings.php
index 27c73af3..0d6c5118 100644
--- a/public_server/lang/cs/strings.php
+++ b/public_server/lang/cs/strings.php
@@ -3,13 +3,10 @@
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
 	$n = intval($n);
-	if (($n == 1 && $n % 1 == 0)) { return 0; } else if (($n >= 2 && $n <= 4 && $n % 1 == 0)) { return 1; } else if (($n % 1 != 0 )) { return 2; } else  { return 3; }
+	return ($n == 1 && $n % 1 == 0) ? 0 : ($n >= 2 && $n <= 4 && $n % 1 == 0) ? 1: ($n % 1 != 0 ) ? 2 : 3;;
 }}
-$a->strings['Administrator'] = 'Administrátor';
-$a->strings['Your account on %s will expire in a few days.'] = 'Platnost Vašeho účtu na %s vyprší během několika dní.';
-$a->strings['Your Friendica account is about to expire.'] = 'Váš účet na Frendica brzy vyprší.';
-$a->strings['Hi %1$s,
-
-Your account on %2$s will expire in less than five days. You may keep your account by logging in at least once every 30 days'] = 'Dobrý den, %1$s,
-
-Váš účet na %2$s vyprší za méně než pět dní. Svůj účet si zachováte, pokud se přihlásíte alespoň jednou za každých 30 dní.';
+;
+$a->strings["Administrator"] = "Administrátor";
+$a->strings["Your account on %s will expire in a few days."] = "Platnost Vašeho účtu na %s vyprší během několika dní.";
+$a->strings["Your Friendica account is about to expire."] = "Váš účet na Frendica brzy vyprší.";
+$a->strings["Hi %1\$s,\n\nYour account on %2\$s will expire in less than five days. You may keep your account by logging in at least once every 30 days"] = "Dobrý den, %1\$s,\n\nVáš účet na %2\$s vyprší za méně než pět dní. Svůj účet si zachováte, pokud se přihlásíte alespoň jednou za každých 30 dní.";
diff --git a/public_server/lang/da-dk/messages.po b/public_server/lang/da-dk/messages.po
deleted file mode 100644
index 480eb851..00000000
--- a/public_server/lang/da-dk/messages.po
+++ /dev/null
@@ -1,49 +0,0 @@
-# ADDON public_server
-# Copyright (C)
-# This file is distributed under the same license as the Friendica public_server addon package.
-# 
-# 
-# Translators:
-# Anton <dev@atjn.dk>, 2022
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2014-06-23 11:24+0000\n"
-"Last-Translator: Anton <dev@atjn.dk>, 2022\n"
-"Language-Team: Danish (Denmark) (http://www.transifex.com/Friendica/friendica/language/da_DK/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: da_DK\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: public_server.php:64
-msgid "Administrator"
-msgstr "Administrator"
-
-#: public_server.php:118
-#, php-format
-msgid "Your account on %s will expire in a few days."
-msgstr "Din konto på %s udløber om nogle få dage."
-
-#: public_server.php:119
-msgid "Your Friendica account is about to expire."
-msgstr "Din Friendica konto er ved at udløbe."
-
-#: public_server.php:120
-#, php-format
-msgid ""
-"Hi %1$s,\n"
-"\n"
-"Your account on %2$s will expire in less than five days. You may keep your account by logging in at least once every 30 days"
-msgstr "Hej %1$s,\n\nDin konto på %2$s udløber om mindre end fem dage. Du kan beholde din konto ved at logge ind mindst én gang hver 30 dage"
-
-#: public_server.php:158
-msgid "Save Settings"
-msgstr "Gem indstillinger"
-
-#: public_server.php:160
-msgid "Set any of these options to 0 to deactivate it."
-msgstr "Sæt enhver af disse indstillinger til 0 for at deaktivere den."
diff --git a/public_server/lang/da-dk/strings.php b/public_server/lang/da-dk/strings.php
deleted file mode 100644
index 0989a18a..00000000
--- a/public_server/lang/da-dk/strings.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_da_dk")) {
-function string_plural_select_da_dk($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Administrator'] = 'Administrator';
-$a->strings['Your account on %s will expire in a few days.'] = 'Din konto på %s udløber om nogle få dage.';
-$a->strings['Your Friendica account is about to expire.'] = 'Din Friendica konto er ved at udløbe.';
-$a->strings['Hi %1$s,
-
-Your account on %2$s will expire in less than five days. You may keep your account by logging in at least once every 30 days'] = 'Hej %1$s,
-
-Din konto på %2$s udløber om mindre end fem dage. Du kan beholde din konto ved at logge ind mindst én gang hver 30 dage';
-$a->strings['Save Settings'] = 'Gem indstillinger';
-$a->strings['Set any of these options to 0 to deactivate it.'] = 'Sæt enhver af disse indstillinger til 0 for at deaktivere den.';
diff --git a/public_server/lang/de/messages.po b/public_server/lang/de/messages.po
index cc2cf617..1003cca1 100644
--- a/public_server/lang/de/messages.po
+++ b/public_server/lang/de/messages.po
@@ -4,48 +4,38 @@
 # 
 # 
 # Translators:
-# Steffen K9, 2021
-# Till Mohr <tmtrfx@till-mohr.de>, 2021
-# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2014
+# bavatar <tobias.diekershoff@gmx.net>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2014-06-23 11:24+0000\n"
-"Last-Translator: Till Mohr <tmtrfx@till-mohr.de>, 2021\n"
-"Language-Team: German (http://app.transifex.com/Friendica/friendica/language/de/)\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2014-10-15 09:02+0000\n"
+"Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/friendica/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: public_server.php:64
+#: public_server.php:62
 msgid "Administrator"
 msgstr "Administrator"
 
-#: public_server.php:118
+#: public_server.php:126
 #, php-format
 msgid "Your account on %s will expire in a few days."
 msgstr "Dein Konto auf %s wird in ein paar Tagen verfallen."
 
-#: public_server.php:119
+#: public_server.php:127
 msgid "Your Friendica account is about to expire."
 msgstr "Dein Friendica-Konto wird in Kürze auslaufen."
 
-#: public_server.php:120
+#: public_server.php:128
 #, php-format
 msgid ""
 "Hi %1$s,\n"
 "\n"
 "Your account on %2$s will expire in less than five days. You may keep your account by logging in at least once every 30 days"
 msgstr "Hallo %1$s,\n\ndein Account auf %2$s wird in weniger als fünf Tagen auslaufen. Du kannst das verhindern, indem du dich mindestens einmal alle 30 Tage anmeldest."
-
-#: public_server.php:158
-msgid "Save Settings"
-msgstr "Einstellungen speichern"
-
-#: public_server.php:160
-msgid "Set any of these options to 0 to deactivate it."
-msgstr "Setze eine dieser Einstellungen auf 0, um sie zu deaktivieren."
diff --git a/public_server/lang/de/strings.php b/public_server/lang/de/strings.php
index a46df71b..09b3f2a1 100644
--- a/public_server/lang/de/strings.php
+++ b/public_server/lang/de/strings.php
@@ -2,16 +2,10 @@
 
 if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Administrator'] = 'Administrator';
-$a->strings['Your account on %s will expire in a few days.'] = 'Dein Konto auf %s wird in ein paar Tagen verfallen.';
-$a->strings['Your Friendica account is about to expire.'] = 'Dein Friendica-Konto wird in Kürze auslaufen.';
-$a->strings['Hi %1$s,
-
-Your account on %2$s will expire in less than five days. You may keep your account by logging in at least once every 30 days'] = 'Hallo %1$s,
-
-dein Account auf %2$s wird in weniger als fünf Tagen auslaufen. Du kannst das verhindern, indem du dich mindestens einmal alle 30 Tage anmeldest.';
-$a->strings['Save Settings'] = 'Einstellungen speichern';
-$a->strings['Set any of these options to 0 to deactivate it.'] = 'Setze eine dieser Einstellungen auf 0, um sie zu deaktivieren.';
+;
+$a->strings["Administrator"] = "Administrator";
+$a->strings["Your account on %s will expire in a few days."] = "Dein Konto auf %s wird in ein paar Tagen verfallen.";
+$a->strings["Your Friendica account is about to expire."] = "Dein Friendica-Konto wird in Kürze auslaufen.";
+$a->strings["Hi %1\$s,\n\nYour account on %2\$s will expire in less than five days. You may keep your account by logging in at least once every 30 days"] = "Hallo %1\$s,\n\ndein Account auf %2\$s wird in weniger als fünf Tagen auslaufen. Du kannst das verhindern, indem du dich mindestens einmal alle 30 Tage anmeldest.";
diff --git a/public_server/lang/es/messages.po b/public_server/lang/es/messages.po
index 63864547..12d8cef6 100644
--- a/public_server/lang/es/messages.po
+++ b/public_server/lang/es/messages.po
@@ -5,14 +5,13 @@
 # 
 # Translators:
 # Albert, 2016
-# Senex Petrovic <javierruizo@hotmail.com>, 2021
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2021-04-06 02:02+0000\n"
-"Last-Translator: Senex Petrovic <javierruizo@hotmail.com>\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2016-11-17 22:12+0000\n"
+"Last-Translator: Albert\n"
 "Language-Team: Spanish (http://www.transifex.com/Friendica/friendica/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,31 +19,23 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: public_server.php:64
+#: public_server.php:62
 msgid "Administrator"
 msgstr "Administrador"
 
-#: public_server.php:118
+#: public_server.php:126
 #, php-format
 msgid "Your account on %s will expire in a few days."
 msgstr "Su cuenta de %s expirará en unos días."
 
-#: public_server.php:119
+#: public_server.php:127
 msgid "Your Friendica account is about to expire."
 msgstr "Su cuenta de Friendica está a punto de expirar."
 
-#: public_server.php:120
+#: public_server.php:128
 #, php-format
 msgid ""
 "Hi %1$s,\n"
 "\n"
 "Your account on %2$s will expire in less than five days. You may keep your account by logging in at least once every 30 days"
 msgstr "Hola %1$s,\n\nSu cuenta de %2$s expirará en menos de cinco días. Puede conservar su cuenta iniciando sesión al menos una vez cada 30 días"
-
-#: public_server.php:158
-msgid "Save Settings"
-msgstr "Grabar ajustes"
-
-#: public_server.php:160
-msgid "Set any of these options to 0 to deactivate it."
-msgstr "Establezca cualquiera de estas opciones en 0 para desactivarla."
diff --git a/public_server/lang/es/strings.php b/public_server/lang/es/strings.php
index e33ffebe..fa1db55a 100644
--- a/public_server/lang/es/strings.php
+++ b/public_server/lang/es/strings.php
@@ -2,16 +2,10 @@
 
 if(! function_exists("string_plural_select_es")) {
 function string_plural_select_es($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Administrator'] = 'Administrador';
-$a->strings['Your account on %s will expire in a few days.'] = 'Su cuenta de %s expirará en unos días.';
-$a->strings['Your Friendica account is about to expire.'] = 'Su cuenta de Friendica está a punto de expirar.';
-$a->strings['Hi %1$s,
-
-Your account on %2$s will expire in less than five days. You may keep your account by logging in at least once every 30 days'] = 'Hola %1$s,
-
-Su cuenta de %2$s expirará en menos de cinco días. Puede conservar su cuenta iniciando sesión al menos una vez cada 30 días';
-$a->strings['Save Settings'] = 'Grabar ajustes';
-$a->strings['Set any of these options to 0 to deactivate it.'] = 'Establezca cualquiera de estas opciones en 0 para desactivarla.';
+;
+$a->strings["Administrator"] = "Administrador";
+$a->strings["Your account on %s will expire in a few days."] = "Su cuenta de %s expirará en unos días.";
+$a->strings["Your Friendica account is about to expire."] = "Su cuenta de Friendica está a punto de expirar.";
+$a->strings["Hi %1\$s,\n\nYour account on %2\$s will expire in less than five days. You may keep your account by logging in at least once every 30 days"] = "Hola %1\$s,\n\nSu cuenta de %2\$s expirará en menos de cinco días. Puede conservar su cuenta iniciando sesión al menos una vez cada 30 días";
diff --git a/public_server/lang/fi-fi/strings.php b/public_server/lang/fi-fi/strings.php
index 64cfce4d..2d81c883 100644
--- a/public_server/lang/fi-fi/strings.php
+++ b/public_server/lang/fi-fi/strings.php
@@ -3,8 +3,10 @@
 if(! function_exists("string_plural_select_fi_fi")) {
 function string_plural_select_fi_fi($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Administrator'] = 'Ylläpitäjä';
-$a->strings['Your account on %s will expire in a few days.'] = '%s -tilisi vanhenee muutaman päivän kuluttua.';
-$a->strings['Your Friendica account is about to expire.'] = 'Friendica-tilisi umpeutuu kohta.';
+;
+$a->strings["Administrator"] = "Ylläpitäjä";
+$a->strings["Your account on %s will expire in a few days."] = "%s -tilisi vanhenee muutaman päivän kuluttua.";
+$a->strings["Your Friendica account is about to expire."] = "Friendica-tilisi umpeutuu kohta.";
+$a->strings["Hi %1\$s,\n\nYour account on %2\$s will expire in less than five days. You may keep your account by logging in at least once every 30 days"] = "";
diff --git a/public_server/lang/fr/messages.po b/public_server/lang/fr/messages.po
deleted file mode 100644
index edc6bdc3..00000000
--- a/public_server/lang/fr/messages.po
+++ /dev/null
@@ -1,50 +0,0 @@
-# ADDON public_server
-# Copyright (C)
-# This file is distributed under the same license as the Friendica public_server addon package.
-# 
-# 
-# Translators:
-# Hypolite Petovan <hypolite@mrpetovan.com>, 2022
-# StefOfficiel <pichard.stephane@free.fr>, 2015
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2014-06-23 11:24+0000\n"
-"Last-Translator: Hypolite Petovan <hypolite@mrpetovan.com>, 2022\n"
-"Language-Team: French (http://www.transifex.com/Friendica/friendica/language/fr/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: fr\n"
-"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
-
-#: public_server.php:64
-msgid "Administrator"
-msgstr "Administrateur"
-
-#: public_server.php:118
-#, php-format
-msgid "Your account on %s will expire in a few days."
-msgstr "Votre compte sur %s va expirer dans quelques jours."
-
-#: public_server.php:119
-msgid "Your Friendica account is about to expire."
-msgstr "Votre compte Friendica est sur le point d'expirer."
-
-#: public_server.php:120
-#, php-format
-msgid ""
-"Hi %1$s,\n"
-"\n"
-"Your account on %2$s will expire in less than five days. You may keep your account by logging in at least once every 30 days"
-msgstr "%1$s,\n\nVotre compte sur %2$s va expirer dans moins de 5 jours. Vous pouvez conserver votre compte en vous identifiant au moins une fois tous les 30 jours"
-
-#: public_server.php:158
-msgid "Save Settings"
-msgstr "Enregistrer les paramètres"
-
-#: public_server.php:160
-msgid "Set any of these options to 0 to deactivate it."
-msgstr "Entrez 0 comme valeur pour n'importe quelle de ces options pour la désactiver."
diff --git a/public_server/lang/fr/strings.php b/public_server/lang/fr/strings.php
index add86c16..436529e6 100644
--- a/public_server/lang/fr/strings.php
+++ b/public_server/lang/fr/strings.php
@@ -1,17 +1,5 @@
-<?php
-
-if(! function_exists("string_plural_select_fr")) {
-function string_plural_select_fr($n){
-	$n = intval($n);
-	if (($n == 0 || $n == 1)) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
-}}
-$a->strings['Administrator'] = 'Administrateur';
-$a->strings['Your account on %s will expire in a few days.'] = 'Votre compte sur %s va expirer dans quelques jours.';
-$a->strings['Your Friendica account is about to expire.'] = 'Votre compte Friendica est sur le point d\'expirer.';
-$a->strings['Hi %1$s,
-
-Your account on %2$s will expire in less than five days. You may keep your account by logging in at least once every 30 days'] = '%1$s,
-
-Votre compte sur %2$s va expirer dans moins de 5 jours. Vous pouvez conserver votre compte en vous identifiant au moins une fois tous les 30 jours';
-$a->strings['Save Settings'] = 'Enregistrer les paramètres';
-$a->strings['Set any of these options to 0 to deactivate it.'] = 'Entrez 0 comme valeur pour n\'importe quelle de ces options pour la désactiver.';
+<?php
+
+$a->strings["Administrator"] = "Administrateur";
+$a->strings["Your account on %s will expire in a few days."] = "Votre compte chez %s va expirer dans quelques jours.";
+$a->strings["Your Friendica account is about to expire."] = "Votre compte sur Friendica est sur le point d'expirer.";
diff --git a/public_server/lang/hu/messages.po b/public_server/lang/hu/messages.po
deleted file mode 100644
index aadd0981..00000000
--- a/public_server/lang/hu/messages.po
+++ /dev/null
@@ -1,49 +0,0 @@
-# ADDON public_server
-# Copyright (C)
-# This file is distributed under the same license as the Friendica public_server addon package.
-# 
-# 
-# Translators:
-# Balázs Úr, 2020-2021
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2014-06-23 11:24+0000\n"
-"Last-Translator: Balázs Úr, 2020-2021\n"
-"Language-Team: Hungarian (http://www.transifex.com/Friendica/friendica/language/hu/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: hu\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: public_server.php:64
-msgid "Administrator"
-msgstr "Adminisztrátor"
-
-#: public_server.php:118
-#, php-format
-msgid "Your account on %s will expire in a few days."
-msgstr "A(z) %s oldalon lévő fiókja néhány napon belül le fog járni."
-
-#: public_server.php:119
-msgid "Your Friendica account is about to expire."
-msgstr "A Friendica-fiókja hamarosan lejár."
-
-#: public_server.php:120
-#, php-format
-msgid ""
-"Hi %1$s,\n"
-"\n"
-"Your account on %2$s will expire in less than five days. You may keep your account by logging in at least once every 30 days"
-msgstr "Kedves %1$s!\n\nA(z) %2$s oldalon lévő fiókja öt napon belül le fog járni. Megtarthatja a fiókját, ha legalább 30 naponta egyszer bejelentkezik."
-
-#: public_server.php:158
-msgid "Save Settings"
-msgstr "Beállítások mentése"
-
-#: public_server.php:160
-msgid "Set any of these options to 0 to deactivate it."
-msgstr "Állítsa ezen beállítások bármelyikét 0 értékre a kikapcsolásukhoz."
diff --git a/public_server/lang/hu/strings.php b/public_server/lang/hu/strings.php
deleted file mode 100644
index e0953869..00000000
--- a/public_server/lang/hu/strings.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_hu")) {
-function string_plural_select_hu($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Administrator'] = 'Adminisztrátor';
-$a->strings['Your account on %s will expire in a few days.'] = 'A(z) %s oldalon lévő fiókja néhány napon belül le fog járni.';
-$a->strings['Your Friendica account is about to expire.'] = 'A Friendica-fiókja hamarosan lejár.';
-$a->strings['Hi %1$s,
-
-Your account on %2$s will expire in less than five days. You may keep your account by logging in at least once every 30 days'] = 'Kedves %1$s!
-
-A(z) %2$s oldalon lévő fiókja öt napon belül le fog járni. Megtarthatja a fiókját, ha legalább 30 naponta egyszer bejelentkezik.';
-$a->strings['Save Settings'] = 'Beállítások mentése';
-$a->strings['Set any of these options to 0 to deactivate it.'] = 'Állítsa ezen beállítások bármelyikét 0 értékre a kikapcsolásukhoz.';
diff --git a/public_server/lang/it/messages.po b/public_server/lang/it/messages.po
index c091cfd6..d4288edb 100644
--- a/public_server/lang/it/messages.po
+++ b/public_server/lang/it/messages.po
@@ -5,46 +5,37 @@
 # 
 # Translators:
 # fabrixxm <fabrix.xm@gmail.com>, 2014
-# Sylke Vicious <silkevicious@gmail.com>, 2021
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2014-06-23 11:24+0000\n"
-"Last-Translator: Sylke Vicious <silkevicious@gmail.com>, 2021\n"
-"Language-Team: Italian (http://app.transifex.com/Friendica/friendica/language/it/)\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2017-09-20 06:08+0000\n"
+"Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n"
+"Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: it\n"
-"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: public_server.php:64
+#: public_server.php:62
 msgid "Administrator"
 msgstr "Amministratore"
 
-#: public_server.php:118
+#: public_server.php:126
 #, php-format
 msgid "Your account on %s will expire in a few days."
 msgstr "Il tuo account su %s scadrà tra pochi giorni."
 
-#: public_server.php:119
+#: public_server.php:127
 msgid "Your Friendica account is about to expire."
 msgstr "Il tuo account Friendica sta per scadere."
 
-#: public_server.php:120
+#: public_server.php:128
 #, php-format
 msgid ""
 "Hi %1$s,\n"
 "\n"
 "Your account on %2$s will expire in less than five days. You may keep your account by logging in at least once every 30 days"
 msgstr "Ciao %1$s,\n\nIl tuo account su %2$s scadrà in meno di cinque giorni. Puoi mantenere il tuo account autenticandoti almeno una volta ogni 30 giorni"
-
-#: public_server.php:158
-msgid "Save Settings"
-msgstr "Salva Impostazioni"
-
-#: public_server.php:160
-msgid "Set any of these options to 0 to deactivate it."
-msgstr "Imposta una qualunque di queste opzioni a 0 per disattivarla."
diff --git a/public_server/lang/it/strings.php b/public_server/lang/it/strings.php
index 41d5b0e9..9fa926d6 100644
--- a/public_server/lang/it/strings.php
+++ b/public_server/lang/it/strings.php
@@ -2,16 +2,10 @@
 
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
-	$n = intval($n);
-	if ($n == 1) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
+	return ($n != 1);;
 }}
-$a->strings['Administrator'] = 'Amministratore';
-$a->strings['Your account on %s will expire in a few days.'] = 'Il tuo account su %s scadrà tra pochi giorni.';
-$a->strings['Your Friendica account is about to expire.'] = 'Il tuo account Friendica sta per scadere.';
-$a->strings['Hi %1$s,
-
-Your account on %2$s will expire in less than five days. You may keep your account by logging in at least once every 30 days'] = 'Ciao %1$s,
-
-Il tuo account su %2$s scadrà in meno di cinque giorni. Puoi mantenere il tuo account autenticandoti almeno una volta ogni 30 giorni';
-$a->strings['Save Settings'] = 'Salva Impostazioni';
-$a->strings['Set any of these options to 0 to deactivate it.'] = 'Imposta una qualunque di queste opzioni a 0 per disattivarla.';
+;
+$a->strings["Administrator"] = "Amministratore";
+$a->strings["Your account on %s will expire in a few days."] = "Il tuo account su %s scadrà tra pochi giorni.";
+$a->strings["Your Friendica account is about to expire."] = "Il tuo account Friendica sta per scadere.";
+$a->strings["Hi %1\$s,\n\nYour account on %2\$s will expire in less than five days. You may keep your account by logging in at least once every 30 days"] = "Ciao %1\$s,\n\nIl tuo account su %2\$s scadrà in meno di cinque giorni. Puoi mantenere il tuo account autenticandoti almeno una volta ogni 30 giorni";
diff --git a/public_server/lang/nl/strings.php b/public_server/lang/nl/strings.php
index d5d52f91..e7ec4742 100644
--- a/public_server/lang/nl/strings.php
+++ b/public_server/lang/nl/strings.php
@@ -3,7 +3,10 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Administrator'] = 'Beheerder';
-$a->strings['Your account on %s will expire in a few days.'] = 'Uw account op %s zal over enkele dagen vervallen';
+;
+$a->strings["Administrator"] = "Beheerder";
+$a->strings["Your account on %s will expire in a few days."] = "Uw account op %s zal over enkele dagen vervallen";
+$a->strings["Your Friendica account is about to expire."] = "";
+$a->strings["Hi %1\$s,\n\nYour account on %2\$s will expire in less than five days. You may keep your account by logging in at least once every 30 days"] = "";
diff --git a/public_server/lang/pl/messages.po b/public_server/lang/pl/messages.po
index 03470df7..92ea576e 100644
--- a/public_server/lang/pl/messages.po
+++ b/public_server/lang/pl/messages.po
@@ -4,15 +4,14 @@
 # 
 # 
 # Translators:
-# Piotr Strębski <strebski@gmail.com>, 2022
-# Waldemar Stoczkowski, 2018
+# Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2014-06-23 11:24+0000\n"
-"Last-Translator: Piotr Strębski <strebski@gmail.com>, 2022\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2018-03-31 16:44+0000\n"
+"Last-Translator: Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.com/Friendica/friendica/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,31 +19,23 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
-#: public_server.php:64
+#: public_server.php:62
 msgid "Administrator"
 msgstr "Administrator"
 
-#: public_server.php:118
+#: public_server.php:126
 #, php-format
 msgid "Your account on %s will expire in a few days."
 msgstr "Twoje konto na %s wygaśnie w ciągu kilku dni."
 
-#: public_server.php:119
+#: public_server.php:127
 msgid "Your Friendica account is about to expire."
 msgstr "Twoje konto Friendica jest w trakcie wygaszania"
 
-#: public_server.php:120
+#: public_server.php:128
 #, php-format
 msgid ""
 "Hi %1$s,\n"
 "\n"
 "Your account on %2$s will expire in less than five days. You may keep your account by logging in at least once every 30 days"
-msgstr "Cześć%1$s,\n\nTwoje konto na %2$s wygaśnie za mniej niż pięć dni. Możesz zachować swoje konto logując się przynajmniej raz na 30 dni."
-
-#: public_server.php:158
-msgid "Save Settings"
-msgstr "Zapisz ustawienia"
-
-#: public_server.php:160
-msgid "Set any of these options to 0 to deactivate it."
-msgstr "Ustaw dowolną z tych opcji na 0, aby ją wyłączyć."
+msgstr "Cześć ,%1$s\n\nTwoje konto wygaśnie za %2$s mniej niż pięć dni. Możesz zachować swoje konto logując się przynajmniej raz na 30 dni"
diff --git a/public_server/lang/pl/strings.php b/public_server/lang/pl/strings.php
index aa266077..489f356f 100644
--- a/public_server/lang/pl/strings.php
+++ b/public_server/lang/pl/strings.php
@@ -2,16 +2,10 @@
 
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
-	$n = intval($n);
-	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
+	return ($n==1 ? 0 : ($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14) ? 1 : $n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14) ? 2 : 3);;
 }}
-$a->strings['Administrator'] = 'Administrator';
-$a->strings['Your account on %s will expire in a few days.'] = 'Twoje konto na %s wygaśnie w ciągu kilku dni.';
-$a->strings['Your Friendica account is about to expire.'] = 'Twoje konto Friendica jest w trakcie wygaszania';
-$a->strings['Hi %1$s,
-
-Your account on %2$s will expire in less than five days. You may keep your account by logging in at least once every 30 days'] = 'Cześć%1$s,
-
-Twoje konto na %2$s wygaśnie za mniej niż pięć dni. Możesz zachować swoje konto logując się przynajmniej raz na 30 dni.';
-$a->strings['Save Settings'] = 'Zapisz ustawienia';
-$a->strings['Set any of these options to 0 to deactivate it.'] = 'Ustaw dowolną z tych opcji na 0, aby ją wyłączyć.';
+;
+$a->strings["Administrator"] = "Administrator";
+$a->strings["Your account on %s will expire in a few days."] = "Twoje konto na %s wygaśnie w ciągu kilku dni.";
+$a->strings["Your Friendica account is about to expire."] = "Twoje konto Friendica jest w trakcie wygaszania";
+$a->strings["Hi %1\$s,\n\nYour account on %2\$s will expire in less than five days. You may keep your account by logging in at least once every 30 days"] = "Cześć ,%1\$s\n\nTwoje konto wygaśnie za %2\$s mniej niż pięć dni. Możesz zachować swoje konto logując się przynajmniej raz na 30 dni";
diff --git a/public_server/lang/pt-br/strings.php b/public_server/lang/pt-br/strings.php
index 91733b08..86bd24ad 100644
--- a/public_server/lang/pt-br/strings.php
+++ b/public_server/lang/pt-br/strings.php
@@ -2,13 +2,10 @@
 
 if(! function_exists("string_plural_select_pt_br")) {
 function string_plural_select_pt_br($n){
-	$n = intval($n);
-	return intval($n > 1);
+	return ($n > 1);;
 }}
-$a->strings['Your account on %s will expire in a few days.'] = 'Sua conta do %s vai expirar em alguns dias.';
-$a->strings['Your Friendica account is about to expire.'] = 'Sua conta no Friendica está prestes a expirar.';
-$a->strings['Hi %1$s,
-
-Your account on %2$s will expire in less than five days. You may keep your account by logging in at least once every 30 days'] = 'Olá, %1$s,
-
-Sua conta no %2$s vai expirar em menos de cinco dias. Para manter sua conta, lembre-se de entrar pelo menos uma vez a cada 30 dias.';
+;
+$a->strings["Administrator"] = "";
+$a->strings["Your account on %s will expire in a few days."] = "Sua conta do %s vai expirar em alguns dias.";
+$a->strings["Your Friendica account is about to expire."] = "Sua conta no Friendica está prestes a expirar.";
+$a->strings["Hi %1\$s,\n\nYour account on %2\$s will expire in less than five days. You may keep your account by logging in at least once every 30 days"] = "Olá, %1\$s,\n\nSua conta no %2\$s vai expirar em menos de cinco dias. Para manter sua conta, lembre-se de entrar pelo menos uma vez a cada 30 dias.";
diff --git a/public_server/lang/ro/strings.php b/public_server/lang/ro/strings.php
index c12ea3ac..3ab2356a 100644
--- a/public_server/lang/ro/strings.php
+++ b/public_server/lang/ro/strings.php
@@ -2,14 +2,10 @@
 
 if(! function_exists("string_plural_select_ro")) {
 function string_plural_select_ro($n){
-	$n = intval($n);
-	if ($n==1) { return 0; } else if ((($n%100>19)||(($n%100==0)&&($n!=0)))) { return 2; } else  { return 1; }
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
 }}
-$a->strings['Administrator'] = 'Administrator';
-$a->strings['Your account on %s will expire in a few days.'] = 'Contul dvs. de pe %s va expira în câteva zile.';
-$a->strings['Your Friendica account is about to expire.'] = 'Contul dvs. Friendica este pe cale sa expire.';
-$a->strings['Hi %1$s,
-
-Your account on %2$s will expire in less than five days. You may keep your account by logging in at least once every 30 days'] = 'Bună ziua %1$s,
-
-Contul dvs. de pe %2$s va expira în mai puțin de cinci zile. Vă puteți păstra contul conectându-vă la el, cel puțin o dată la fiecare 30 de zile';
+;
+$a->strings["Administrator"] = "Administrator";
+$a->strings["Your account on %s will expire in a few days."] = "Contul dvs. de pe %s va expira în câteva zile.";
+$a->strings["Your Friendica account is about to expire."] = "Contul dvs. Friendica este pe cale sa expire.";
+$a->strings["Hi %1\$s,\n\nYour account on %2\$s will expire in less than five days. You may keep your account by logging in at least once every 30 days"] = "Bună ziua %1\$s,\n\nContul dvs. de pe %2\$s va expira în mai puțin de cinci zile. Vă puteți păstra contul conectându-vă la el, cel puțin o dată la fiecare 30 de zile";
diff --git a/public_server/lang/sv/messages.po b/public_server/lang/sv/messages.po
deleted file mode 100644
index 79b6f83b..00000000
--- a/public_server/lang/sv/messages.po
+++ /dev/null
@@ -1,49 +0,0 @@
-# ADDON public_server
-# Copyright (C)
-# This file is distributed under the same license as the Friendica public_server addon package.
-# 
-# 
-# Translators:
-# Kristoffer Grundström <lovaren@gmail.com>, 2022
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2022-01-16 00:50+0000\n"
-"Last-Translator: Kristoffer Grundström <lovaren@gmail.com>\n"
-"Language-Team: Swedish (http://www.transifex.com/Friendica/friendica/language/sv/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: sv\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: public_server.php:64
-msgid "Administrator"
-msgstr "Administratör"
-
-#: public_server.php:118
-#, php-format
-msgid "Your account on %s will expire in a few days."
-msgstr ""
-
-#: public_server.php:119
-msgid "Your Friendica account is about to expire."
-msgstr "Ditt Friendica-konto är på väg att sluta gälla."
-
-#: public_server.php:120
-#, php-format
-msgid ""
-"Hi %1$s,\n"
-"\n"
-"Your account on %2$s will expire in less than five days. You may keep your account by logging in at least once every 30 days"
-msgstr ""
-
-#: public_server.php:158
-msgid "Save Settings"
-msgstr ""
-
-#: public_server.php:160
-msgid "Set any of these options to 0 to deactivate it."
-msgstr ""
diff --git a/public_server/lang/sv/strings.php b/public_server/lang/sv/strings.php
index dae623b9..ea2177b9 100644
--- a/public_server/lang/sv/strings.php
+++ b/public_server/lang/sv/strings.php
@@ -1,9 +1,3 @@
-<?php
-
-if(! function_exists("string_plural_select_sv")) {
-function string_plural_select_sv($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Administrator'] = 'Administratör';
-$a->strings['Your Friendica account is about to expire.'] = 'Ditt Friendica-konto är på väg att sluta gälla.';
+<?php
+
+$a->strings["Administrator"] = "Admin";
diff --git a/public_server/lang/zh-cn/strings.php b/public_server/lang/zh-cn/strings.php
index 9f6578ba..f50a5834 100644
--- a/public_server/lang/zh-cn/strings.php
+++ b/public_server/lang/zh-cn/strings.php
@@ -3,13 +3,10 @@
 if(! function_exists("string_plural_select_zh_cn")) {
 function string_plural_select_zh_cn($n){
 	$n = intval($n);
-	return intval(0);
+	return 0;;
 }}
-$a->strings['Administrator'] = '管理员';
-$a->strings['Your account on %s will expire in a few days.'] = '您在 %s 的帐号将在几天内到期。';
-$a->strings['Your Friendica account is about to expire.'] = '您的 Friendica 帐号即将到期。';
-$a->strings['Hi %1$s,
-
-Your account on %2$s will expire in less than five days. You may keep your account by logging in at least once every 30 days'] = '您好 %1$s，
-
-您在 %2$s 的帐号将在五天内到期。您可以通过每 30 天至少登录一次的方式保留您的帐号。';
+;
+$a->strings["Administrator"] = "管理员";
+$a->strings["Your account on %s will expire in a few days."] = "您在 %s 的帐号将在几天内到期。";
+$a->strings["Your Friendica account is about to expire."] = "您的 Friendica 帐号即将到期。";
+$a->strings["Hi %1\$s,\n\nYour account on %2\$s will expire in less than five days. You may keep your account by logging in at least once every 30 days"] = "您好 %1\$s，\n\n您在 %2\$s 的帐号将在五天内到期。您可以通过每 30 天至少登录一次的方式保留您的帐号。";
diff --git a/public_server/public_server.php b/public_server/public_server.php
index 7591c7d0..e6817c64 100644
--- a/public_server/public_server.php
+++ b/public_server/public_server.php
@@ -1,22 +1,22 @@
 <?php
 /**
  * Name: public_server
- * Description: Friendica addon with functions suitable for a public server. WARNING: This addon is currently not well maintained. It may produce unexpected results. Use with caution!
+ * Description: Friendica addon with functions suitable for a public server.
  * Version: 1.1
  * Author: Keith Fernie <http://friendika.me4.it/profile/keith>
  */
 
 use Friendica\App;
 use Friendica\BaseModule;
+use Friendica\Core\Config;
 use Friendica\Core\Hook;
+use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\Database\DBA;
-use Friendica\DI;
-use Friendica\Model\Notification;
-use Friendica\Model\User;
-use Friendica\Core\Config\Util\ConfigFileManager;
+use Friendica\Util\ConfigFileLoader;
 use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Strings;
 
 function public_server_install()
 {
@@ -27,17 +27,26 @@ function public_server_install()
 	Hook::register('logged_in', 'addon/public_server/public_server.php', 'public_server_login');
 }
 
-function public_server_load_config(ConfigFileManager $loader)
+function public_server_uninstall()
 {
-	DI::app()->getConfigCache()->load($loader->loadAddonConfig('public_server'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
+	Hook::unregister('load_config',      'addon/public_server/public_server.php', 'public_server_load_config');
+	Hook::unregister('register_account', 'addon/public_server/public_server.php', 'public_server_register_account');
+	Hook::unregister('cron', 'addon/public_server/public_server.php', 'public_server_cron');
+	Hook::unregister('enotify', 'addon/public_server/public_server.php', 'public_server_enotify');
+	Hook::unregister('logged_in', 'addon/public_server/public_server.php', 'public_server_login');
 }
 
-function public_server_register_account($b)
+function public_server_load_config(App $a, ConfigFileLoader $loader)
+{
+	$a->getConfigCache()->load($loader->loadAddonConfig('public_server'));
+}
+
+function public_server_register_account($a, $b)
 {
 	$uid = $b;
 
-	$days = DI::config()->get('public_server', 'expiredays');
-	$days_posts = DI::config()->get('public_server', 'expireposts');
+	$days = Config::get('public_server', 'expiredays');
+	$days_posts = Config::get('public_server', 'expireposts');
 	if (!$days) {
 		return;
 	}
@@ -46,108 +55,127 @@ function public_server_register_account($b)
 	DBA::update('user', $fields, ['uid' => $uid]);
 }
 
-function public_server_cron($b)
+function public_server_cron($a, $b)
 {
-	Logger::notice("public_server: cron start");
+	Logger::log("public_server: cron start");
 
-	$users = DBA::selectToArray('user', [], ["`account_expires_on` > ? AND `account_expires_on` < ?
-		AND `expire_notification_sent` <= ?", DBA::NULL_DATETIME, DateTimeFormat::utc('now + 5 days'), DBA::NULL_DATETIME]);
-	foreach ($users as $rr) {
-		DI::notify()->createFromArray([
-			'type' => Notification\Type::SYSTEM,
-			'event' => 'SYSTEM_PUBLIC_SERVER_EXPIRATION',
-			'uid' => $rr['uid'],
-			'system_type' => 'public_server_expire',
-			'source_name'  => DI::l10n()->t('Administrator'),
-			'source_link'  => DI::baseUrl(),
-			'source_photo' => DI::baseUrl() . '/images/person-80.jpg',
-		]);
+	$r = q("SELECT * FROM `user` WHERE `account_expires_on` < UTC_TIMESTAMP() + INTERVAL 5 DAY AND
+		`account_expires_on` > '%s' AND
+		`expire_notification_sent` <= '%s'",
+		DBA::NULL_DATETIME, DBA::NULL_DATETIME);
 
-		$fields = ['expire_notification_sent' => DateTimeFormat::utcNow()];
-		DBA::update('user', $fields, ['uid' => $rr['uid']]);
+	if (DBA::isResult($r)) {
+		foreach ($r as $rr) {
+			notification([
+				'uid' => $rr['uid'],
+				'type' => NOTIFY_SYSTEM,
+				'system_type' => 'public_server_expire',
+				'language'     => $rr['language'],
+				'to_name'      => $rr['username'],
+				'to_email'     => $rr['email'],
+				'source_name'  => L10n::t('Administrator'),
+				'source_link'  => $a->getBaseURL(),
+				'source_photo' => $a->getBaseURL() . '/images/person-80.jpg',
+			]);
+
+			$fields = ['expire_notification_sent' => DateTimeFormat::utcNow()];
+			DBA::update('user', $fields, ['uid' => $rr['uid']]);
+		}
 	}
 
-	$nologin = DI::config()->get('public_server', 'nologin', false);
+	$nologin = Config::get('public_server', 'nologin', false);
 	if ($nologin) {
-		$users = DBA::selectToArray('user', [], ["NOT `account_expired` AND `login_date` <= ? AND `register_date` < ? AND `account_expires_on` <= ?",
-			DBA::NULL_DATETIME, DateTimeFormat::utc('now -  ' . (int)$nologin . ' days'), DBA::NULL_DATETIME]);
-		foreach ($users as $rr) {
-			$fields = ['account_expires_on' => DateTimeFormat::utc('now +6 days')];
-			DBA::update('user', $fields, ['uid' => $rr['uid']]);
+		$r = q("SELECT `uid` FROM `user` WHERE NOT `account_expired` AND `login_date` <= '%s' AND `register_date` < UTC_TIMESTAMP() - INTERVAL %d DAY AND `account_expires_on` <= '%s'",
+			DBA::NULL_DATETIME, intval($nologin), DBA::NULL_DATETIME);
+		if (DBA::isResult($r)) {
+			foreach ($r as $rr) {
+				$fields = ['account_expires_on' => DateTimeFormat::utc('now +6 days')];
+				DBA::update('user', $fields, ['uid' => $rr['uid']]);
+			}
 		}
 	}
 
-	$flagusers = DI::config()->get('public_server', 'flagusers', false);
+	$flagusers = Config::get('public_server', 'flagusers', false);
 	if ($flagusers) {
-		$users = DBA::selectToArray('user', [], ["NOT `account_expired` AND `login_date` < ? AND `account_expires_on` <= ? AND `page-flags` = ?",
-            DateTimeFormat::utc('now -  ' . (int)$flagusers . ' days'), DBA::NULL_DATETIME, User::PAGE_FLAGS_NORMAL]);
-		foreach ($users as $rr) {
-			$fields = ['account_expires_on' => DateTimeFormat::utc('now +6 days')];
-			DBA::update('user', $fields, ['uid' => $rr['uid']]);
+		$r = q("SELECT `uid` FROM `user` WHERE NOT `account_expired` AND `login_date` < UTC_TIMESTAMP() - INTERVAL %d DAY AND `account_expires_on` <= '%s' AND `page-flags` = 0",
+			intval($flagusers), DBA::NULL_DATETIME);
+		if (DBA::isResult($r)) {
+			foreach ($r as $rr) {
+				$fields = ['account_expires_on' => DateTimeFormat::utc('now +6 days')];
+				DBA::update('user', $fields, ['uid' => $rr['uid']]);
+			}
 		}
 	}
 
-	$flagposts = DI::config()->get('public_server', 'flagposts');
-	$flagpostsexpire = DI::config()->get('public_server', 'flagpostsexpire');
+	$flagposts = Config::get('public_server', 'flagposts');
+	$flagpostsexpire = Config::get('public_server', 'flagpostsexpire');
 	if ($flagposts && $flagpostsexpire) {
-		$users = DBA::selectToArray('user', [], ["NOT `account_expired` AND `login_date` < ? AND `account_expires_on` <= ? AND NOT `expire` AND `page-flags` = ?",
-            DateTimeFormat::utc('now -  ' . (int)$flagposts . ' days'), DBA::NULL_DATETIME, User::PAGE_FLAGS_NORMAL]);
-		foreach ($users as $rr) {
-			DBA::update('user', ['expire' => $flagpostsexpire], ['uid' => $rr['uid']]);
+		$r = q("SELECT `uid` FROM `user` WHERE NOT `account_expired` AND `login_date` < UTC_TIMESTAMP() - INTERVAL %d DAY AND `account_expires_on` <= '%s' and `expire` = 0 AND `page-flags` = 0",
+			intval($flagposts), DBA::NULL_DATETIME);
+		if (DBA::isResult($r)) {
+			foreach ($r as $rr) {
+				DBA::update('user', ['expire' => $flagpostsexpire], ['uid' => $rr['uid']]);
+			}
 		}
 	}
 
-	Logger::notice("public_server: cron end");
+	Logger::log("public_server: cron end");
 }
 
-function public_server_enotify(array &$b)
+function public_server_enotify(&$a, &$b)
 {
-	if (!empty($b['params']) && $b['params']['type'] == Notification\Type::SYSTEM
+	if (!empty($b['params']) && $b['params']['type'] == NOTIFY_SYSTEM
 		&& !empty($b['params']['system_type']) && $b['params']['system_type'] === 'public_server_expire') {
-		$b['itemlink'] = DI::baseUrl();
-		$b['epreamble'] = $b['preamble'] = DI::l10n()->t('Your account on %s will expire in a few days.', DI::config()->get('system', 'sitename'));
-		$b['subject'] = DI::l10n()->t('Your Friendica account is about to expire.');
-		$b['body'] = DI::l10n()->t("Hi %1\$s,\n\nYour account on %2\$s will expire in less than five days. You may keep your account by logging in at least once every 30 days", $b['params']['to_name'], "[url=" . DI::config()->get('system', 'url') . "]" . DI::config()->get('config', 'sitename') . "[/url]");
+		$b['itemlink'] = $a->getBaseURL();
+		$b['epreamble'] = $b['preamble'] = L10n::t('Your account on %s will expire in a few days.', Config::get('system', 'sitename'));
+		$b['subject'] = L10n::t('Your Friendica account is about to expire.');
+		$b['body'] = L10n::t("Hi %1\$s,\n\nYour account on %2\$s will expire in less than five days. You may keep your account by logging in at least once every 30 days", $b['params']['to_name'], "[url=" . Config::get('system', 'url') . "]" . Config::get('config', 'sitename') . "[/url]");
 	}
 }
 
-function public_server_login($b)
+function public_server_login($a, $b)
 {
-	$days = DI::config()->get('public_server', 'expiredays');
+	$days = Config::get('public_server', 'expiredays');
 	if (!$days) {
 		return;
 	}
 
 	$fields = ['account_expires_on' => DateTimeFormat::utc('now +' . $days . ' days')];
-	$condition = ["`uid` = ? AND `account_expires_on` > ?", DI::userSession()->getLocalUserId(), DBA::NULL_DATETIME];
+	$condition = ["`uid` = ? AND `account_expires_on` > ?", local_user(), DBA::NULL_DATETIME];
 	DBA::update('user', $fields, $condition);
 }
 
-function public_server_addon_admin_post()
+function public_server_addon_admin_post(&$a)
 {
 	BaseModule::checkFormSecurityTokenRedirectOnError('/admin/addons/publicserver', 'publicserver');
-
-	DI::config()->set('public_server', 'expiredays', trim($_POST['expiredays'] ?? ''));
-	DI::config()->set('public_server', 'expireposts', trim($_POST['expireposts'] ?? ''));
-	DI::config()->set('public_server', 'nologin', trim($_POST['nologin'] ?? ''));
-	DI::config()->set('public_server', 'flagusers', trim($_POST['flagusers'] ?? ''));
-	DI::config()->set('public_server', 'flagposts', trim($_POST['flagposts'] ?? ''));
-	DI::config()->set('public_server', 'flagpostsexpire', trim($_POST['flagpostsexpire'] ?? ''));
+	$expiredays = (!empty($_POST['expiredays']) ? Strings::escapeTags(trim($_POST['expiredays'])) : '');
+	$expireposts = (!empty($_POST['expireposts']) ? Strings::escapeTags(trim($_POST['expireposts'])) : '');
+	$nologin = (!empty($_POST['nologin']) ? Strings::escapeTags(trim($_POST['nologin'])) : '');
+	$flagusers = (!empty($_POST['flagusers']) ? Strings::escapeTags(trim($_POST['flagusers'])) : '');
+	$flagposts = (!empty($_POST['flagposts']) ? Strings::escapeTags(trim($_POST['flagposts'])) : '');
+	$flagpostsexpire = (!empty($_POST['flagpostsexpire']) ? Strings::escapeTags(trim($_POST['flagpostsexpire'])) : '');
+	Config::set('public_server', 'expiredays', $expiredays);
+	Config::set('public_server', 'expireposts', $expireposts);
+	Config::set('public_server', 'nologin', $nologin);
+	Config::set('public_server', 'flagusers', $flagusers);
+	Config::set('public_server', 'flagposts', $flagposts);
+	Config::set('public_server', 'flagpostsexpire', $flagpostsexpire);
+	info(L10n::t('Settings saved').EOL);
 }
 
-function public_server_addon_admin(string &$o)
+function public_server_addon_admin(&$a, &$o)
 {
-	$token = BaseModule::getFormSecurityToken('publicserver');
-	$t = Renderer::getMarkupTemplate('admin.tpl', 'addon/public_server');
+	$token = BaseModule::getFormSecurityToken("publicserver");
+	$t = Renderer::getMarkupTemplate("admin.tpl", "addon/public_server");
 	$o = Renderer::replaceMacros($t, [
-		'$submit' => DI::l10n()->t('Save Settings'),
+		'$submit' => L10n::t('Save Settings'),
 		'$form_security_token' => $token,
-		'$infotext' => DI::l10n()->t('Set any of these options to 0 to deactivate it.'),
-		'$expiredays' => ["expiredays", "Expire Days", intval(DI::config()->get('public_server', 'expiredays')), "When an account is created on the site, it is given a hard "],
-		'$expireposts' => ["expireposts", "Expire Posts", intval(DI::config()->get('public_server', 'expireposts')), "Set the default days for posts to expire here"],
-		'$nologin' => ["nologin", "No Login", intval(DI::config()->get('public_server', 'nologin')), "Remove users who have never logged in after nologin days "],
-		'$flagusers' => ["flagusers", "Flag users", intval(DI::config()->get('public_server', 'flagusers')), "Remove users who last logged in over flagusers days ago"],
-		'$flagposts' => ["flagposts", "Flag posts", intval(DI::config()->get('public_server', 'flagposts')), "For users who last logged in over flagposts days ago set post expiry days to flagpostsexpire "],
-		'$flagpostsexpire' => ["flagpostsexpire", "Flag posts expire", intval(DI::config()->get('public_server', 'flagpostsexpire'))],
+		'$infotext' => L10n::t('Set any of these options to 0 to deactivate it.'),
+		'$expiredays' => ["expiredays","Expire Days", intval(Config::get('public_server', 'expiredays')), "When an account is created on the site, it is given a hard "],
+		'$expireposts' => ["expireposts", "Expire Posts", intval(Config::get('public_server', 'expireposts')), "Set the default days for posts to expire here"],
+		'$nologin' => ["nologin", "No Login", intval(Config::get('public_server', 'nologin')), "Remove users who have never logged in after nologin days "],
+		'$flagusers' => ["flagusers", "Flag users", intval(Config::get('public_server', 'flagusers')), "Remove users who last logged in over flagusers days ago"],
+		'$flagposts' => ["flagposts", "Flag posts", intval(Config::get('public_server', 'flagposts')), "For users who last logged in over flagposts days ago set post expiry days to flagpostsexpire "],
+		'$flagpostsexpire' => ["flagpostsexpire", "Flag posts expire", intval(Config::get('public_server', 'flagpostsexpire'))],
 	]);
 }
diff --git a/pumpio/README.md b/pumpio/README.md
index ab53a300..33137984 100644
--- a/pumpio/README.md
+++ b/pumpio/README.md
@@ -1,13 +1,11 @@
-To let the connector work properly you should define an application name in `config/pumpio.config.php`:
+To let the connector work properly you should define an application name in `config/addon.config.php`:
 
-	return [
-		'pumpio' => [
-			'application_name' => '',
-			// Displays forwarded posts like "wall-to-wall" posts.
-			'wall-to-wall_share' => false,
-			// Given in minutes
-			'poll_interval' => 5,
-		],
-	];
+	'pumpio' => [
+		'application_name' => '',
+		// Displays forwarded posts like "wall-to-wall" posts.
+		'wall-to-wall_share' => false,
+		// Given in minutes
+		'poll_interval' => 5,
+	],
 
 This name appears at pump.io and is important for not mirroring back posts that came from Friendica.
diff --git a/pumpio/config/pumpio.config.php b/pumpio/config/pumpio.config.php
index e2c5b726..4f3dc460 100644
--- a/pumpio/config/pumpio.config.php
+++ b/pumpio/config/pumpio.config.php
@@ -1,7 +1,7 @@
 <?php
 
 // Warning: Don't change this file! It only holds the default config values for this addon.
-// Instead, copy this file to config/pumpio.config.php in your Friendica directory and set the correct values there
+// Instead overwrite these config values in config/addon.config.php in your Friendica directory
 
 return [
 	'pumpio' => [
diff --git a/pumpio/lang/C/messages.po b/pumpio/lang/C/messages.po
index 7e14cd79..a35f0410 100644
--- a/pumpio/lang/C/messages.po
+++ b/pumpio/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-06-03 15:50-0400\n"
+"POT-Creation-Date: 2014-06-23 14:45+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,76 +17,84 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: pumpio.php:62
+#: pumpio.php:38
 msgid "Permission denied."
 msgstr ""
 
-#: pumpio.php:156
+#: pumpio.php:124
 #, php-format
 msgid "Unable to register the client at the pump.io server '%s'."
 msgstr ""
 
-#: pumpio.php:196
+#: pumpio.php:164
 msgid "You are now authenticated to pumpio."
 msgstr ""
 
-#: pumpio.php:197
+#: pumpio.php:165
 msgid "return to the connector page"
 msgstr ""
 
-#: pumpio.php:217
+#: pumpio.php:183
 msgid "Post to pumpio"
 msgstr ""
 
-#: pumpio.php:241
-msgid "Save Settings"
-msgstr ""
-
-#: pumpio.php:243
-msgid "Delete this preset"
-msgstr ""
-
-#: pumpio.php:249
-msgid "Authenticate your pump.io connection"
-msgstr ""
-
-#: pumpio.php:256
-msgid "Pump.io servername (without \"http://\" or \"https://\" )"
-msgstr ""
-
-#: pumpio.php:257
-msgid "Pump.io username (without the servername)"
-msgstr ""
-
-#: pumpio.php:258
-msgid "Import the remote timeline"
-msgstr ""
-
-#: pumpio.php:259
-msgid "Enable Pump.io Post Addon"
-msgstr ""
-
-#: pumpio.php:260
-msgid "Post to Pump.io by default"
-msgstr ""
-
-#: pumpio.php:261
-msgid "Should posts be public?"
-msgstr ""
-
-#: pumpio.php:262
-msgid "Mirror all public posts"
-msgstr ""
-
-#: pumpio.php:267
+#: pumpio.php:221 pumpio.php:225
 msgid "Pump.io Import/Export/Mirror"
 msgstr ""
 
-#: pumpio.php:924
+#: pumpio.php:229
+msgid "pump.io username (without the servername)"
+msgstr ""
+
+#: pumpio.php:234
+msgid "pump.io servername (without \"http://\" or \"https://\" )"
+msgstr ""
+
+#: pumpio.php:246
+msgid "Authenticate your pump.io connection"
+msgstr ""
+
+#: pumpio.php:250
+msgid "Import the remote timeline"
+msgstr ""
+
+#: pumpio.php:255
+msgid "Enable pump.io Post Addon"
+msgstr ""
+
+#: pumpio.php:260
+msgid "Post to pump.io by default"
+msgstr ""
+
+#: pumpio.php:265
+msgid "Should posts be public?"
+msgstr ""
+
+#: pumpio.php:270
+msgid "Mirror all public posts"
+msgstr ""
+
+#: pumpio.php:275
+msgid "Check to delete this preset"
+msgstr ""
+
+#: pumpio.php:285
+msgid "Save Settings"
+msgstr ""
+
+#: pumpio.php:515
+msgid "Pump.io post failed. Queued for retry."
+msgstr ""
+
+#: pumpio.php:587
+msgid "Pump.io like failed. Queued for retry."
+msgstr ""
+
+#: pumpio.php:875
 msgid "status"
 msgstr ""
 
-#: pumpio.php:928
+#: pumpio.php:879
 #, php-format
 msgid "%1$s likes %2$s's %3$s"
 msgstr ""
diff --git a/pumpio/lang/ar/messages.po b/pumpio/lang/ar/messages.po
deleted file mode 100644
index 6ef561f9..00000000
--- a/pumpio/lang/ar/messages.po
+++ /dev/null
@@ -1,94 +0,0 @@
-# ADDON pumpio
-# Copyright (C)
-# This file is distributed under the same license as the Friendica pumpio addon package.
-# 
-# 
-# Translators:
-# Farida Khalaf <faridakhalaf@hotmail.com>, 2021
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-25 13:16+0000\n"
-"PO-Revision-Date: 2021-02-21 18:43+0000\n"
-"Last-Translator: Farida Khalaf <faridakhalaf@hotmail.com>\n"
-"Language-Team: Arabic (http://www.transifex.com/Friendica/friendica/language/ar/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ar\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-
-#: pumpio.php:54
-msgid "Permission denied."
-msgstr "الطلب مرفوض."
-
-#: pumpio.php:149
-#, php-format
-msgid "Unable to register the client at the pump.io server '%s'."
-msgstr ""
-
-#: pumpio.php:189
-msgid "You are now authenticated to pumpio."
-msgstr ""
-
-#: pumpio.php:190
-msgid "return to the connector page"
-msgstr "الرجوع إلى صفحة الموصل"
-
-#: pumpio.php:210
-msgid "Post to pumpio"
-msgstr ""
-
-#: pumpio.php:251 pumpio.php:255
-msgid "Pump.io Import/Export/Mirror"
-msgstr ""
-
-#: pumpio.php:259
-msgid "pump.io username (without the servername)"
-msgstr ""
-
-#: pumpio.php:264
-msgid "pump.io servername (without \"http://\" or \"https://\" )"
-msgstr ""
-
-#: pumpio.php:275
-msgid "Authenticate your pump.io connection"
-msgstr ""
-
-#: pumpio.php:279
-msgid "Import the remote timeline"
-msgstr ""
-
-#: pumpio.php:284
-msgid "Enable pump.io Post Addon"
-msgstr ""
-
-#: pumpio.php:289
-msgid "Post to pump.io by default"
-msgstr ""
-
-#: pumpio.php:294
-msgid "Should posts be public?"
-msgstr ""
-
-#: pumpio.php:299
-msgid "Mirror all public posts"
-msgstr ""
-
-#: pumpio.php:304
-msgid "Check to delete this preset"
-msgstr "تحقق لحذف هذا الإعداد المسبق"
-
-#: pumpio.php:314
-msgid "Save Settings"
-msgstr "حفظ الإعدادات"
-
-#: pumpio.php:983
-msgid "status"
-msgstr ""
-
-#: pumpio.php:987
-#, php-format
-msgid "%1$s likes %2$s's %3$s"
-msgstr ""
diff --git a/pumpio/lang/ar/strings.php b/pumpio/lang/ar/strings.php
deleted file mode 100644
index 682f90a4..00000000
--- a/pumpio/lang/ar/strings.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_ar")) {
-function string_plural_select_ar($n){
-	$n = intval($n);
-	if ($n==0) { return 0; } else if ($n==1) { return 1; } else if ($n==2) { return 2; } else if ($n%100>=3 && $n%100<=10) { return 3; } else if ($n%100>=11 && $n%100<=99) { return 4; } else  { return 5; }
-}}
-$a->strings['Permission denied.'] = 'الطلب مرفوض.';
-$a->strings['return to the connector page'] = 'الرجوع إلى صفحة الموصل';
-$a->strings['Check to delete this preset'] = 'تحقق لحذف هذا الإعداد المسبق';
-$a->strings['Save Settings'] = 'حفظ الإعدادات';
diff --git a/pumpio/lang/cs/messages.po b/pumpio/lang/cs/messages.po
index 64293afb..73453e94 100644
--- a/pumpio/lang/cs/messages.po
+++ b/pumpio/lang/cs/messages.po
@@ -10,86 +10,94 @@ msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:17-0500\n"
-"PO-Revision-Date: 2014-06-23 11:30+0000\n"
-"Last-Translator: Aditoo, 2018\n"
-"Language-Team: Czech (http://app.transifex.com/Friendica/friendica/language/cs/)\n"
+"POT-Creation-Date: 2014-06-23 14:45+0200\n"
+"PO-Revision-Date: 2018-06-11 19:43+0000\n"
+"Last-Translator: Aditoo\n"
+"Language-Team: Czech (http://www.transifex.com/Friendica/friendica/language/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: cs\n"
 "Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
 
-#: pumpio.php:57
+#: pumpio.php:38
 msgid "Permission denied."
 msgstr "Přístup odmítnut."
 
-#: pumpio.php:152
+#: pumpio.php:124
 #, php-format
 msgid "Unable to register the client at the pump.io server '%s'."
-msgstr "Nebylo možné registrovat klienta na serveru pump.io \"%s\"."
+msgstr "Nebylo možné registrovat klienta na pump.io serveru '%s'."
 
-#: pumpio.php:192
+#: pumpio.php:164
 msgid "You are now authenticated to pumpio."
-msgstr "Nyní jste přihlášen/a na pump.io."
+msgstr "Nyní jste přihlášen k pumpio."
 
-#: pumpio.php:193
+#: pumpio.php:165
 msgid "return to the connector page"
-msgstr "návrat na stránku konektoru"
+msgstr "návrat ke stránce konektor"
 
-#: pumpio.php:213
+#: pumpio.php:183
 msgid "Post to pumpio"
-msgstr "Posílat na pump.io"
+msgstr "Příspěvek na pumpio"
 
-#: pumpio.php:237
-msgid "Save Settings"
-msgstr "Uložit nastavení"
+#: pumpio.php:221 pumpio.php:225
+msgid "Pump.io Import/Export/Mirror"
+msgstr "Pump.oi Import/Export/Zrcadlení"
 
-#: pumpio.php:239
-msgid "Delete this preset"
-msgstr ""
+#: pumpio.php:229
+msgid "pump.io username (without the servername)"
+msgstr "uživatelské jméno pump.io (bez jména serveru)"
 
-#: pumpio.php:245
+#: pumpio.php:234
+msgid "pump.io servername (without \"http://\" or \"https://\" )"
+msgstr "jméno serveru pump.io  (bez \"http://\" nebo \"https://\" )"
+
+#: pumpio.php:246
 msgid "Authenticate your pump.io connection"
 msgstr "Přihlásit ke spojení na pump.io"
 
-#: pumpio.php:252
-msgid "Pump.io servername (without \"http://\" or \"https://\" )"
-msgstr ""
-
-#: pumpio.php:253
-msgid "Pump.io username (without the servername)"
-msgstr ""
-
-#: pumpio.php:254
+#: pumpio.php:250
 msgid "Import the remote timeline"
 msgstr "Importovat vzdálenou časovou osu"
 
 #: pumpio.php:255
-msgid "Enable Pump.io Post Addon"
-msgstr ""
+msgid "Enable pump.io Post Addon"
+msgstr "Povolit doplněk pumo.io Post"
 
-#: pumpio.php:256
-msgid "Post to Pump.io by default"
-msgstr ""
+#: pumpio.php:260
+msgid "Post to pump.io by default"
+msgstr "Posílat příspěvky na pump.io automaticky"
 
-#: pumpio.php:257
+#: pumpio.php:265
 msgid "Should posts be public?"
 msgstr "Mají být příspěvky veřejné?"
 
-#: pumpio.php:258
+#: pumpio.php:270
 msgid "Mirror all public posts"
 msgstr "Zrcadlit všechny veřejné příspěvky"
 
-#: pumpio.php:263
-msgid "Pump.io Import/Export/Mirror"
-msgstr "Import/Export/Zrcadlení Pump.io"
+#: pumpio.php:275
+msgid "Check to delete this preset"
+msgstr "Zaškrtnout pro smazání tohoto nastavení"
 
-#: pumpio.php:920
+#: pumpio.php:285
+msgid "Save Settings"
+msgstr "Uložit Nastavení"
+
+#: pumpio.php:515
+msgid "Pump.io post failed. Queued for retry."
+msgstr "Zaslání příspěvku na Pump.io selhalo. Příspěvek byl zařazen do fronty pro opakované odeslání."
+
+#: pumpio.php:587
+msgid "Pump.io like failed. Queued for retry."
+msgstr "Zaslání příspěvku na Pump.io zřejmě selhalo. Příspěvek byl zařazen do fronty pro opakované odeslání."
+
+#: pumpio.php:875
 msgid "status"
 msgstr "stav"
 
-#: pumpio.php:924
+#: pumpio.php:879
 #, php-format
 msgid "%1$s likes %2$s's %3$s"
-msgstr "Uživateli %1$s se líbí %3$s uživatele %2$s"
+msgstr "%1$s se líbí %3$s %2$s"
diff --git a/pumpio/lang/cs/strings.php b/pumpio/lang/cs/strings.php
index 9e90d014..1462bf5f 100644
--- a/pumpio/lang/cs/strings.php
+++ b/pumpio/lang/cs/strings.php
@@ -3,18 +3,26 @@
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
 	$n = intval($n);
-	if (($n == 1 && $n % 1 == 0)) { return 0; } else if (($n >= 2 && $n <= 4 && $n % 1 == 0)) { return 1; } else if (($n % 1 != 0 )) { return 2; } else  { return 3; }
+	return ($n == 1 && $n % 1 == 0) ? 0 : ($n >= 2 && $n <= 4 && $n % 1 == 0) ? 1: ($n % 1 != 0 ) ? 2 : 3;;
 }}
-$a->strings['Permission denied.'] = 'Přístup odmítnut.';
-$a->strings['Unable to register the client at the pump.io server \'%s\'.'] = 'Nebylo možné registrovat klienta na serveru pump.io "%s".';
-$a->strings['You are now authenticated to pumpio.'] = 'Nyní jste přihlášen/a na pump.io.';
-$a->strings['return to the connector page'] = 'návrat na stránku konektoru';
-$a->strings['Post to pumpio'] = 'Posílat na pump.io';
-$a->strings['Save Settings'] = 'Uložit nastavení';
-$a->strings['Authenticate your pump.io connection'] = 'Přihlásit ke spojení na pump.io';
-$a->strings['Import the remote timeline'] = 'Importovat vzdálenou časovou osu';
-$a->strings['Should posts be public?'] = 'Mají být příspěvky veřejné?';
-$a->strings['Mirror all public posts'] = 'Zrcadlit všechny veřejné příspěvky';
-$a->strings['Pump.io Import/Export/Mirror'] = 'Import/Export/Zrcadlení Pump.io';
-$a->strings['status'] = 'stav';
-$a->strings['%1$s likes %2$s\'s %3$s'] = 'Uživateli %1$s se líbí %3$s uživatele %2$s';
+;
+$a->strings["Permission denied."] = "Přístup odmítnut.";
+$a->strings["Unable to register the client at the pump.io server '%s'."] = "Nebylo možné registrovat klienta na pump.io serveru '%s'.";
+$a->strings["You are now authenticated to pumpio."] = "Nyní jste přihlášen k pumpio.";
+$a->strings["return to the connector page"] = "návrat ke stránce konektor";
+$a->strings["Post to pumpio"] = "Příspěvek na pumpio";
+$a->strings["Pump.io Import/Export/Mirror"] = "Pump.oi Import/Export/Zrcadlení";
+$a->strings["pump.io username (without the servername)"] = "uživatelské jméno pump.io (bez jména serveru)";
+$a->strings["pump.io servername (without \"http://\" or \"https://\" )"] = "jméno serveru pump.io  (bez \"http://\" nebo \"https://\" )";
+$a->strings["Authenticate your pump.io connection"] = "Přihlásit ke spojení na pump.io";
+$a->strings["Import the remote timeline"] = "Importovat vzdálenou časovou osu";
+$a->strings["Enable pump.io Post Addon"] = "Povolit doplněk pumo.io Post";
+$a->strings["Post to pump.io by default"] = "Posílat příspěvky na pump.io automaticky";
+$a->strings["Should posts be public?"] = "Mají být příspěvky veřejné?";
+$a->strings["Mirror all public posts"] = "Zrcadlit všechny veřejné příspěvky";
+$a->strings["Check to delete this preset"] = "Zaškrtnout pro smazání tohoto nastavení";
+$a->strings["Save Settings"] = "Uložit Nastavení";
+$a->strings["Pump.io post failed. Queued for retry."] = "Zaslání příspěvku na Pump.io selhalo. Příspěvek byl zařazen do fronty pro opakované odeslání.";
+$a->strings["Pump.io like failed. Queued for retry."] = "Zaslání příspěvku na Pump.io zřejmě selhalo. Příspěvek byl zařazen do fronty pro opakované odeslání.";
+$a->strings["status"] = "stav";
+$a->strings["%1\$s likes %2\$s's %3\$s"] = "%1\$s se líbí %3\$s %2\$s";
diff --git a/pumpio/lang/da-dk/messages.po b/pumpio/lang/da-dk/messages.po
deleted file mode 100644
index 22b2073c..00000000
--- a/pumpio/lang/da-dk/messages.po
+++ /dev/null
@@ -1,93 +0,0 @@
-# ADDON pumpio
-# Copyright (C)
-# This file is distributed under the same license as the Friendica pumpio addon package.
-# 
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:17-0500\n"
-"PO-Revision-Date: 2014-06-23 11:30+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Danish (Denmark) (http://www.transifex.com/Friendica/friendica/language/da_DK/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: da_DK\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: pumpio.php:57
-msgid "Permission denied."
-msgstr ""
-
-#: pumpio.php:152
-#, php-format
-msgid "Unable to register the client at the pump.io server '%s'."
-msgstr ""
-
-#: pumpio.php:192
-msgid "You are now authenticated to pumpio."
-msgstr ""
-
-#: pumpio.php:193
-msgid "return to the connector page"
-msgstr ""
-
-#: pumpio.php:213
-msgid "Post to pumpio"
-msgstr ""
-
-#: pumpio.php:237
-msgid "Save Settings"
-msgstr ""
-
-#: pumpio.php:239
-msgid "Delete this preset"
-msgstr ""
-
-#: pumpio.php:245
-msgid "Authenticate your pump.io connection"
-msgstr ""
-
-#: pumpio.php:252
-msgid "Pump.io servername (without \"http://\" or \"https://\" )"
-msgstr ""
-
-#: pumpio.php:253
-msgid "Pump.io username (without the servername)"
-msgstr ""
-
-#: pumpio.php:254
-msgid "Import the remote timeline"
-msgstr ""
-
-#: pumpio.php:255
-msgid "Enable Pump.io Post Addon"
-msgstr ""
-
-#: pumpio.php:256
-msgid "Post to Pump.io by default"
-msgstr ""
-
-#: pumpio.php:257
-msgid "Should posts be public?"
-msgstr ""
-
-#: pumpio.php:258
-msgid "Mirror all public posts"
-msgstr ""
-
-#: pumpio.php:263
-msgid "Pump.io Import/Export/Mirror"
-msgstr ""
-
-#: pumpio.php:920
-msgid "status"
-msgstr ""
-
-#: pumpio.php:924
-#, php-format
-msgid "%1$s likes %2$s's %3$s"
-msgstr ""
diff --git a/pumpio/lang/da-dk/strings.php b/pumpio/lang/da-dk/strings.php
deleted file mode 100644
index 09554750..00000000
--- a/pumpio/lang/da-dk/strings.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_da_dk")) {
-function string_plural_select_da_dk($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
diff --git a/pumpio/lang/de/messages.po b/pumpio/lang/de/messages.po
index 40119f32..acfb87fa 100644
--- a/pumpio/lang/de/messages.po
+++ b/pumpio/lang/de/messages.po
@@ -4,93 +4,99 @@
 # 
 # 
 # Translators:
-# Andreas H., 2014
-# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2018,2022
-# Ulf Rompe <transifex.com@rompe.org>, 2019
+# Abrax <webmaster@a-zwenkau.de>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:17-0500\n"
-"PO-Revision-Date: 2014-06-23 11:30+0000\n"
-"Last-Translator: Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2018,2022\n"
-"Language-Team: German (http://app.transifex.com/Friendica/friendica/language/de/)\n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-10-14 09:37+0000\n"
+"Last-Translator: Abrax <webmaster@a-zwenkau.de>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/friendica/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: pumpio.php:57
+#: pumpio.php:38
 msgid "Permission denied."
 msgstr "Zugriff verweigert."
 
-#: pumpio.php:152
+#: pumpio.php:124
 #, php-format
 msgid "Unable to register the client at the pump.io server '%s'."
 msgstr "Die Registrierung des Nutzers auf dem Pump.io-Server '%s' ist nicht möglich."
 
-#: pumpio.php:192
+#: pumpio.php:164
 msgid "You are now authenticated to pumpio."
 msgstr "Du bist nun auf pumpio authentifiziert."
 
-#: pumpio.php:193
+#: pumpio.php:165
 msgid "return to the connector page"
-msgstr "zurück zur Connector-Seite"
+msgstr "zurück zur Connector Seite"
 
-#: pumpio.php:213
+#: pumpio.php:183
 msgid "Post to pumpio"
 msgstr "Auf pumpio veröffentlichen"
 
-#: pumpio.php:237
-msgid "Save Settings"
-msgstr "Einstellungen speichern"
+#: pumpio.php:221 pumpio.php:225
+msgid "Pump.io Import/Export/Mirror"
+msgstr " Pump.io Import/Export/Spiegeln"
 
-#: pumpio.php:239
-msgid "Delete this preset"
-msgstr "Diese Voreinstellung entfernen"
-
-#: pumpio.php:245
-msgid "Authenticate your pump.io connection"
-msgstr "Authentifiziere deine  Pump.ioVerbindung"
-
-#: pumpio.php:252
-msgid "Pump.io servername (without \"http://\" or \"https://\" )"
-msgstr " Pump.io Servername (ohne \"http://\" oder \"https://\" )"
-
-#: pumpio.php:253
-msgid "Pump.io username (without the servername)"
+#: pumpio.php:229
+msgid "pump.io username (without the servername)"
 msgstr " Pump.io Nutzername (ohne den Servernamen)"
 
-#: pumpio.php:254
+#: pumpio.php:234
+msgid "pump.io servername (without \"http://\" or \"https://\" )"
+msgstr " Pump.io Servername (ohne \"http://\" oder \"https://\" )"
+
+#: pumpio.php:246
+msgid "Authenticate your pump.io connection"
+msgstr "Authentifiziere deine  Pump.io Verbindung"
+
+#: pumpio.php:250
 msgid "Import the remote timeline"
 msgstr "Importiere die entfernte Zeitleiste"
 
 #: pumpio.php:255
-msgid "Enable Pump.io Post Addon"
-msgstr "Pump.io Post Addon aktivieren"
+msgid "Enable pump.io Post Addon"
+msgstr "Pump.io-Post-Addon aktivieren"
 
-#: pumpio.php:256
-msgid "Post to Pump.io by default"
+#: pumpio.php:260
+msgid "Post to pump.io by default"
 msgstr "Standardmäßig bei  Pump.io veröffentlichen"
 
-#: pumpio.php:257
+#: pumpio.php:265
 msgid "Should posts be public?"
-msgstr "Sollen Nachrichten öffentlich sein?"
+msgstr "Sollen Nachrichten öffentlich sein ?"
 
-#: pumpio.php:258
+#: pumpio.php:270
 msgid "Mirror all public posts"
 msgstr "Spiegle alle öffentlichen Nachrichten"
 
-#: pumpio.php:263
-msgid "Pump.io Import/Export/Mirror"
-msgstr " Pump.io-Import/Export/Spiegeln"
+#: pumpio.php:275
+msgid "Check to delete this preset"
+msgstr "Markieren um dieses Preset zu löschen"
 
-#: pumpio.php:920
+#: pumpio.php:285
+msgid "Save Settings"
+msgstr "Einstellungen speichern"
+
+#: pumpio.php:515
+msgid "Pump.io post failed. Queued for retry."
+msgstr "Veröffentlichung bei Pump.io gescheitert. Wir versuchen es später erneut."
+
+#: pumpio.php:587
+msgid "Pump.io like failed. Queued for retry."
+msgstr "Veröffentlichung bei Pump.io gescheitert. Wir versuchen es später erneut."
+
+#: pumpio.php:875
 msgid "status"
 msgstr "Status"
 
-#: pumpio.php:924
+#: pumpio.php:879
 #, php-format
 msgid "%1$s likes %2$s's %3$s"
 msgstr "%1$s mag %2$s's %3$s"
diff --git a/pumpio/lang/de/strings.php b/pumpio/lang/de/strings.php
index 8248185f..4f2c8c88 100644
--- a/pumpio/lang/de/strings.php
+++ b/pumpio/lang/de/strings.php
@@ -2,24 +2,26 @@
 
 if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Permission denied.'] = 'Zugriff verweigert.';
-$a->strings['Unable to register the client at the pump.io server \'%s\'.'] = 'Die Registrierung des Nutzers auf dem Pump.io-Server \'%s\' ist nicht möglich.';
-$a->strings['You are now authenticated to pumpio.'] = 'Du bist nun auf pumpio authentifiziert.';
-$a->strings['return to the connector page'] = 'zurück zur Connector-Seite';
-$a->strings['Post to pumpio'] = 'Auf pumpio veröffentlichen';
-$a->strings['Save Settings'] = 'Einstellungen speichern';
-$a->strings['Delete this preset'] = 'Diese Voreinstellung entfernen';
-$a->strings['Authenticate your pump.io connection'] = 'Authentifiziere deine  Pump.ioVerbindung';
-$a->strings['Pump.io servername (without "http://" or "https://" )'] = ' Pump.io Servername (ohne "http://" oder "https://" )';
-$a->strings['Pump.io username (without the servername)'] = ' Pump.io Nutzername (ohne den Servernamen)';
-$a->strings['Import the remote timeline'] = 'Importiere die entfernte Zeitleiste';
-$a->strings['Enable Pump.io Post Addon'] = 'Pump.io Post Addon aktivieren';
-$a->strings['Post to Pump.io by default'] = 'Standardmäßig bei  Pump.io veröffentlichen';
-$a->strings['Should posts be public?'] = 'Sollen Nachrichten öffentlich sein?';
-$a->strings['Mirror all public posts'] = 'Spiegle alle öffentlichen Nachrichten';
-$a->strings['Pump.io Import/Export/Mirror'] = ' Pump.io-Import/Export/Spiegeln';
-$a->strings['status'] = 'Status';
-$a->strings['%1$s likes %2$s\'s %3$s'] = '%1$s mag %2$s\'s %3$s';
+;
+$a->strings["Permission denied."] = "Zugriff verweigert.";
+$a->strings["Unable to register the client at the pump.io server '%s'."] = "Die Registrierung des Nutzers auf dem Pump.io-Server '%s' ist nicht möglich.";
+$a->strings["You are now authenticated to pumpio."] = "Du bist nun auf pumpio authentifiziert.";
+$a->strings["return to the connector page"] = "zurück zur Connector Seite";
+$a->strings["Post to pumpio"] = "Auf pumpio veröffentlichen";
+$a->strings["Pump.io Import/Export/Mirror"] = " Pump.io Import/Export/Spiegeln";
+$a->strings["pump.io username (without the servername)"] = " Pump.io Nutzername (ohne den Servernamen)";
+$a->strings["pump.io servername (without \"http://\" or \"https://\" )"] = " Pump.io Servername (ohne \"http://\" oder \"https://\" )";
+$a->strings["Authenticate your pump.io connection"] = "Authentifiziere deine  Pump.io Verbindung";
+$a->strings["Import the remote timeline"] = "Importiere die entfernte Zeitleiste";
+$a->strings["Enable pump.io Post Addon"] = "Pump.io-Post-Addon aktivieren";
+$a->strings["Post to pump.io by default"] = "Standardmäßig bei  Pump.io veröffentlichen";
+$a->strings["Should posts be public?"] = "Sollen Nachrichten öffentlich sein ?";
+$a->strings["Mirror all public posts"] = "Spiegle alle öffentlichen Nachrichten";
+$a->strings["Check to delete this preset"] = "Markieren um dieses Preset zu löschen";
+$a->strings["Save Settings"] = "Einstellungen speichern";
+$a->strings["Pump.io post failed. Queued for retry."] = "Veröffentlichung bei Pump.io gescheitert. Wir versuchen es später erneut.";
+$a->strings["Pump.io like failed. Queued for retry."] = "Veröffentlichung bei Pump.io gescheitert. Wir versuchen es später erneut.";
+$a->strings["status"] = "Status";
+$a->strings["%1\$s likes %2\$s's %3\$s"] = "%1\$s mag %2\$s's %3\$s";
diff --git a/pumpio/lang/es/messages.po b/pumpio/lang/es/messages.po
index 1f73a8cf..86981996 100644
--- a/pumpio/lang/es/messages.po
+++ b/pumpio/lang/es/messages.po
@@ -5,14 +5,13 @@
 # 
 # Translators:
 # Albert, 2016
-# Senex Petrovic <javierruizo@hotmail.com>, 2021
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2021-04-06 02:03+0000\n"
-"Last-Translator: Senex Petrovic <javierruizo@hotmail.com>\n"
+"POT-Creation-Date: 2014-06-23 14:45+0200\n"
+"PO-Revision-Date: 2016-11-17 22:20+0000\n"
+"Last-Translator: Albert\n"
 "Language-Team: Spanish (http://www.transifex.com/Friendica/friendica/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,76 +19,84 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: pumpio.php:54
+#: pumpio.php:38
 msgid "Permission denied."
 msgstr "Permiso denegado."
 
-#: pumpio.php:149
+#: pumpio.php:124
 #, php-format
 msgid "Unable to register the client at the pump.io server '%s'."
 msgstr "Imposible registrar el cliente en el servidor '%s' de pump.io."
 
-#: pumpio.php:189
+#: pumpio.php:164
 msgid "You are now authenticated to pumpio."
 msgstr "Ahora está autenticado en Pump.io."
 
-#: pumpio.php:190
+#: pumpio.php:165
 msgid "return to the connector page"
 msgstr "volver a la página del conector"
 
-#: pumpio.php:210
+#: pumpio.php:183
 msgid "Post to pumpio"
 msgstr "Publicar en Pump.io"
 
-#: pumpio.php:251 pumpio.php:255
+#: pumpio.php:221 pumpio.php:225
 msgid "Pump.io Import/Export/Mirror"
 msgstr "Importar/Exportar/Reflejar Pump.io"
 
-#: pumpio.php:259
+#: pumpio.php:229
 msgid "pump.io username (without the servername)"
 msgstr "Nombre de usuario de Pump.io (sin el nombre de servidor)"
 
-#: pumpio.php:264
+#: pumpio.php:234
 msgid "pump.io servername (without \"http://\" or \"https://\" )"
 msgstr "Nombre de servidor de Pump.io (sin \"http://\" o \"https://\" )"
 
-#: pumpio.php:275
+#: pumpio.php:246
 msgid "Authenticate your pump.io connection"
 msgstr "Autenticar su conexión de Pump.io"
 
-#: pumpio.php:279
+#: pumpio.php:250
 msgid "Import the remote timeline"
 msgstr "Importar la línea de tiempo remota"
 
-#: pumpio.php:284
+#: pumpio.php:255
 msgid "Enable pump.io Post Addon"
-msgstr "Habilitar el complemento de publicación pump.io"
+msgstr "Habilitar Addon de publicación de Pump.io"
 
-#: pumpio.php:289
+#: pumpio.php:260
 msgid "Post to pump.io by default"
 msgstr "Publicar en Pump.io por defecto"
 
-#: pumpio.php:294
+#: pumpio.php:265
 msgid "Should posts be public?"
 msgstr "¿Deberían de ser públicas las entradas?"
 
-#: pumpio.php:299
+#: pumpio.php:270
 msgid "Mirror all public posts"
 msgstr "Reflejar todas las entradas públicas"
 
-#: pumpio.php:304
+#: pumpio.php:275
 msgid "Check to delete this preset"
 msgstr "Chequear para eliminar este preajuste"
 
-#: pumpio.php:314
+#: pumpio.php:285
 msgid "Save Settings"
 msgstr "Guardar Ajustes"
 
-#: pumpio.php:981
+#: pumpio.php:515
+msgid "Pump.io post failed. Queued for retry."
+msgstr "Falló la publicación de Pump.io. En cola para reintentar."
+
+#: pumpio.php:587
+msgid "Pump.io like failed. Queued for retry."
+msgstr "Falló el Like de Pump.io. En cola para reintentar."
+
+#: pumpio.php:875
 msgid "status"
 msgstr "estado"
 
-#: pumpio.php:985
+#: pumpio.php:879
 #, php-format
 msgid "%1$s likes %2$s's %3$s"
 msgstr "A %1$s le gustan los %3$s de %2$s"
diff --git a/pumpio/lang/es/strings.php b/pumpio/lang/es/strings.php
index 05169c16..df9630b2 100644
--- a/pumpio/lang/es/strings.php
+++ b/pumpio/lang/es/strings.php
@@ -2,24 +2,26 @@
 
 if(! function_exists("string_plural_select_es")) {
 function string_plural_select_es($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Permission denied.'] = 'Permiso denegado.';
-$a->strings['Unable to register the client at the pump.io server \'%s\'.'] = 'Imposible registrar el cliente en el servidor \'%s\' de pump.io.';
-$a->strings['You are now authenticated to pumpio.'] = 'Ahora está autenticado en Pump.io.';
-$a->strings['return to the connector page'] = 'volver a la página del conector';
-$a->strings['Post to pumpio'] = 'Publicar en Pump.io';
-$a->strings['Pump.io Import/Export/Mirror'] = 'Importar/Exportar/Reflejar Pump.io';
-$a->strings['pump.io username (without the servername)'] = 'Nombre de usuario de Pump.io (sin el nombre de servidor)';
-$a->strings['pump.io servername (without "http://" or "https://" )'] = 'Nombre de servidor de Pump.io (sin "http://" o "https://" )';
-$a->strings['Authenticate your pump.io connection'] = 'Autenticar su conexión de Pump.io';
-$a->strings['Import the remote timeline'] = 'Importar la línea de tiempo remota';
-$a->strings['Enable pump.io Post Addon'] = 'Habilitar el complemento de publicación pump.io';
-$a->strings['Post to pump.io by default'] = 'Publicar en Pump.io por defecto';
-$a->strings['Should posts be public?'] = '¿Deberían de ser públicas las entradas?';
-$a->strings['Mirror all public posts'] = 'Reflejar todas las entradas públicas';
-$a->strings['Check to delete this preset'] = 'Chequear para eliminar este preajuste';
-$a->strings['Save Settings'] = 'Guardar Ajustes';
-$a->strings['status'] = 'estado';
-$a->strings['%1$s likes %2$s\'s %3$s'] = 'A %1$s le gustan los %3$s de %2$s';
+;
+$a->strings["Permission denied."] = "Permiso denegado.";
+$a->strings["Unable to register the client at the pump.io server '%s'."] = "Imposible registrar el cliente en el servidor '%s' de pump.io.";
+$a->strings["You are now authenticated to pumpio."] = "Ahora está autenticado en Pump.io.";
+$a->strings["return to the connector page"] = "volver a la página del conector";
+$a->strings["Post to pumpio"] = "Publicar en Pump.io";
+$a->strings["Pump.io Import/Export/Mirror"] = "Importar/Exportar/Reflejar Pump.io";
+$a->strings["pump.io username (without the servername)"] = "Nombre de usuario de Pump.io (sin el nombre de servidor)";
+$a->strings["pump.io servername (without \"http://\" or \"https://\" )"] = "Nombre de servidor de Pump.io (sin \"http://\" o \"https://\" )";
+$a->strings["Authenticate your pump.io connection"] = "Autenticar su conexión de Pump.io";
+$a->strings["Import the remote timeline"] = "Importar la línea de tiempo remota";
+$a->strings["Enable pump.io Post Addon"] = "Habilitar Addon de publicación de Pump.io";
+$a->strings["Post to pump.io by default"] = "Publicar en Pump.io por defecto";
+$a->strings["Should posts be public?"] = "¿Deberían de ser públicas las entradas?";
+$a->strings["Mirror all public posts"] = "Reflejar todas las entradas públicas";
+$a->strings["Check to delete this preset"] = "Chequear para eliminar este preajuste";
+$a->strings["Save Settings"] = "Guardar Ajustes";
+$a->strings["Pump.io post failed. Queued for retry."] = "Falló la publicación de Pump.io. En cola para reintentar.";
+$a->strings["Pump.io like failed. Queued for retry."] = "Falló el Like de Pump.io. En cola para reintentar.";
+$a->strings["status"] = "estado";
+$a->strings["%1\$s likes %2\$s's %3\$s"] = "A %1\$s le gustan los %3\$s de %2\$s";
diff --git a/pumpio/lang/fi-fi/strings.php b/pumpio/lang/fi-fi/strings.php
index b79e70fd..cd409e19 100644
--- a/pumpio/lang/fi-fi/strings.php
+++ b/pumpio/lang/fi-fi/strings.php
@@ -3,17 +3,26 @@
 if(! function_exists("string_plural_select_fi_fi")) {
 function string_plural_select_fi_fi($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Permission denied.'] = 'Lupa kielletty.';
-$a->strings['Post to pumpio'] = 'Lähetä pump.ioon';
-$a->strings['pump.io username (without the servername)'] = 'pump.io käyttäjätunnus (ilman palvelinnimeä)';
-$a->strings['pump.io servername (without "http://" or "https://" )'] = 'pump.io palvelinnimi (ilman "http://" tai "https://" )';
-$a->strings['Import the remote timeline'] = 'Tuo etäaikajana';
-$a->strings['Enable pump.io Post Addon'] = 'Ota pump.io -viestilisäosa käyttöön';
-$a->strings['Post to pump.io by default'] = 'Lähetä pump.iohon oletuksena';
-$a->strings['Mirror all public posts'] = 'Peilaa kaikki julkiset julkaisut';
-$a->strings['Save Settings'] = 'Tallenna asetukset';
-$a->strings['Pump.io post failed. Queued for retry.'] = 'Pump.io -julkaisu epäonnistui. Jonossa uudelleenyritykseen.';
-$a->strings['Pump.io like failed. Queued for retry.'] = 'Pump.io -tykkäys epäonnistui. Jonossa uudelleenyritykseen.';
-$a->strings['status'] = 'tila';
+;
+$a->strings["Permission denied."] = "Lupa kielletty.";
+$a->strings["Unable to register the client at the pump.io server '%s'."] = "";
+$a->strings["You are now authenticated to pumpio."] = "";
+$a->strings["return to the connector page"] = "";
+$a->strings["Post to pumpio"] = "Lähetä pump.ioon";
+$a->strings["Pump.io Import/Export/Mirror"] = "";
+$a->strings["pump.io username (without the servername)"] = "pump.io käyttäjätunnus (ilman palvelinnimeä)";
+$a->strings["pump.io servername (without \"http://\" or \"https://\" )"] = "pump.io palvelinnimi (ilman \"http://\" tai \"https://\" )";
+$a->strings["Authenticate your pump.io connection"] = "";
+$a->strings["Import the remote timeline"] = "Tuo etäaikajana";
+$a->strings["Enable pump.io Post Addon"] = "Ota pump.io -viestilisäosa käyttöön";
+$a->strings["Post to pump.io by default"] = "Lähetä pump.iohon oletuksena";
+$a->strings["Should posts be public?"] = "";
+$a->strings["Mirror all public posts"] = "Peilaa kaikki julkiset julkaisut";
+$a->strings["Check to delete this preset"] = "";
+$a->strings["Save Settings"] = "Tallenna asetukset";
+$a->strings["Pump.io post failed. Queued for retry."] = "Pump.io -julkaisu epäonnistui. Jonossa uudelleenyritykseen.";
+$a->strings["Pump.io like failed. Queued for retry."] = "Pump.io -tykkäys epäonnistui. Jonossa uudelleenyritykseen.";
+$a->strings["status"] = "tila";
+$a->strings["%1\$s likes %2\$s's %3\$s"] = "";
diff --git a/pumpio/lang/fr/messages.po b/pumpio/lang/fr/messages.po
index 22b98743..28c5891f 100644
--- a/pumpio/lang/fr/messages.po
+++ b/pumpio/lang/fr/messages.po
@@ -4,94 +4,100 @@
 # 
 # 
 # Translators:
-# Florent C., 2023
-# Hypolite Petovan <hypolite@mrpetovan.com>, 2022
-# ea1cd8241cb389ffb6f92bc6891eff5d_dc12308 <70dced5587d47e18d88f9298024d96f8_93383>, 2015
+# Nicola Spanti <translations@nicola-spanti.info>, 2015
 # StefOfficiel <pichard.stephane@free.fr>, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-06-03 15:50-0400\n"
-"PO-Revision-Date: 2014-06-23 11:30+0000\n"
-"Last-Translator: Florent C., 2023\n"
-"Language-Team: French (http://app.transifex.com/Friendica/friendica/language/fr/)\n"
+"POT-Creation-Date: 2014-06-23 14:45+0200\n"
+"PO-Revision-Date: 2015-08-30 17:19+0000\n"
+"Last-Translator: Nicola Spanti <translations@nicola-spanti.info>\n"
+"Language-Team: French (http://www.transifex.com/Friendica/friendica/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fr\n"
-"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: pumpio.php:62
+#: pumpio.php:38
 msgid "Permission denied."
 msgstr "Permission refusée."
 
-#: pumpio.php:156
+#: pumpio.php:124
 #, php-format
 msgid "Unable to register the client at the pump.io server '%s'."
-msgstr "Impossible d'enregistrer le client sur le serveur pump.io \"%s\"."
+msgstr ""
 
-#: pumpio.php:196
+#: pumpio.php:164
 msgid "You are now authenticated to pumpio."
 msgstr "Vous êtes maintenant authentifié sur pump.io."
 
-#: pumpio.php:197
+#: pumpio.php:165
 msgid "return to the connector page"
 msgstr "Retourner à la page du connecteur"
 
-#: pumpio.php:217
+#: pumpio.php:183
 msgid "Post to pumpio"
 msgstr "Publier sur pump.io"
 
-#: pumpio.php:241
-msgid "Save Settings"
-msgstr "Sauvegarder les paramètres"
+#: pumpio.php:221 pumpio.php:225
+msgid "Pump.io Import/Export/Mirror"
+msgstr ""
 
-#: pumpio.php:243
-msgid "Delete this preset"
-msgstr "Supprimer ce préréglage"
+#: pumpio.php:229
+msgid "pump.io username (without the servername)"
+msgstr "Nom d'utilisateur pump.io (sans le nom du serveur)"
 
-#: pumpio.php:249
+#: pumpio.php:234
+msgid "pump.io servername (without \"http://\" or \"https://\" )"
+msgstr ""
+
+#: pumpio.php:246
 msgid "Authenticate your pump.io connection"
-msgstr "Identifiez votre connexion à pump.io"
+msgstr ""
 
-#: pumpio.php:256
-msgid "Pump.io servername (without \"http://\" or \"https://\" )"
-msgstr "Domaine du serveur Pump.io (sans \"http://\" ou \"https://\")"
-
-#: pumpio.php:257
-msgid "Pump.io username (without the servername)"
-msgstr "Nom d'utilisateur Pump.io (sans le domaine de serveur)"
-
-#: pumpio.php:258
+#: pumpio.php:250
 msgid "Import the remote timeline"
-msgstr "Importer le flux distant"
+msgstr "Importer la timeline distante"
 
-#: pumpio.php:259
-msgid "Enable Pump.io Post Addon"
-msgstr "Activer l'extension Pump.io"
+#: pumpio.php:255
+msgid "Enable pump.io Post Addon"
+msgstr ""
 
 #: pumpio.php:260
-msgid "Post to Pump.io by default"
-msgstr "Publier sur Pump.io par défaut"
+msgid "Post to pump.io by default"
+msgstr "Publier sur pump.io par défaut"
 
-#: pumpio.php:261
+#: pumpio.php:265
 msgid "Should posts be public?"
 msgstr "Les messages devraient être publiques ?"
 
-#: pumpio.php:262
+#: pumpio.php:270
 msgid "Mirror all public posts"
-msgstr "Refléter toutes les publications publiques"
+msgstr ""
 
-#: pumpio.php:267
-msgid "Pump.io Import/Export/Mirror"
-msgstr "Import/Export/Miroir Pump.io"
+#: pumpio.php:275
+msgid "Check to delete this preset"
+msgstr ""
 
-#: pumpio.php:924
+#: pumpio.php:285
+msgid "Save Settings"
+msgstr "Sauvegarder les paramètres"
+
+#: pumpio.php:515
+msgid "Pump.io post failed. Queued for retry."
+msgstr ""
+
+#: pumpio.php:587
+msgid "Pump.io like failed. Queued for retry."
+msgstr ""
+
+#: pumpio.php:875
 msgid "status"
 msgstr "statut"
 
-#: pumpio.php:928
+#: pumpio.php:879
 #, php-format
 msgid "%1$s likes %2$s's %3$s"
-msgstr "%1$s aime lea %3$s de %2$s"
+msgstr ""
diff --git a/pumpio/lang/fr/strings.php b/pumpio/lang/fr/strings.php
index 14ddade1..3e69c272 100644
--- a/pumpio/lang/fr/strings.php
+++ b/pumpio/lang/fr/strings.php
@@ -2,24 +2,26 @@
 
 if(! function_exists("string_plural_select_fr")) {
 function string_plural_select_fr($n){
-	$n = intval($n);
-	if (($n == 0 || $n == 1)) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
+	return ($n > 1);;
 }}
-$a->strings['Permission denied.'] = 'Permission refusée.';
-$a->strings['Unable to register the client at the pump.io server \'%s\'.'] = 'Impossible d\'enregistrer le client sur le serveur pump.io "%s".';
-$a->strings['You are now authenticated to pumpio.'] = 'Vous êtes maintenant authentifié sur pump.io.';
-$a->strings['return to the connector page'] = 'Retourner à la page du connecteur';
-$a->strings['Post to pumpio'] = 'Publier sur pump.io';
-$a->strings['Save Settings'] = 'Sauvegarder les paramètres';
-$a->strings['Delete this preset'] = 'Supprimer ce préréglage';
-$a->strings['Authenticate your pump.io connection'] = 'Identifiez votre connexion à pump.io';
-$a->strings['Pump.io servername (without "http://" or "https://" )'] = 'Domaine du serveur Pump.io (sans "http://" ou "https://")';
-$a->strings['Pump.io username (without the servername)'] = 'Nom d\'utilisateur Pump.io (sans le domaine de serveur)';
-$a->strings['Import the remote timeline'] = 'Importer le flux distant';
-$a->strings['Enable Pump.io Post Addon'] = 'Activer l\'extension Pump.io';
-$a->strings['Post to Pump.io by default'] = 'Publier sur Pump.io par défaut';
-$a->strings['Should posts be public?'] = 'Les messages devraient être publiques ?';
-$a->strings['Mirror all public posts'] = 'Refléter toutes les publications publiques';
-$a->strings['Pump.io Import/Export/Mirror'] = 'Import/Export/Miroir Pump.io';
-$a->strings['status'] = 'statut';
-$a->strings['%1$s likes %2$s\'s %3$s'] = '%1$s aime lea %3$s de %2$s';
+;
+$a->strings["Permission denied."] = "Permission refusée.";
+$a->strings["Unable to register the client at the pump.io server '%s'."] = "";
+$a->strings["You are now authenticated to pumpio."] = "Vous êtes maintenant authentifié sur pump.io.";
+$a->strings["return to the connector page"] = "Retourner à la page du connecteur";
+$a->strings["Post to pumpio"] = "Publier sur pump.io";
+$a->strings["Pump.io Import/Export/Mirror"] = "";
+$a->strings["pump.io username (without the servername)"] = "Nom d'utilisateur pump.io (sans le nom du serveur)";
+$a->strings["pump.io servername (without \"http://\" or \"https://\" )"] = "";
+$a->strings["Authenticate your pump.io connection"] = "";
+$a->strings["Import the remote timeline"] = "Importer la timeline distante";
+$a->strings["Enable pump.io Post Addon"] = "";
+$a->strings["Post to pump.io by default"] = "Publier sur pump.io par défaut";
+$a->strings["Should posts be public?"] = "Les messages devraient être publiques ?";
+$a->strings["Mirror all public posts"] = "";
+$a->strings["Check to delete this preset"] = "";
+$a->strings["Save Settings"] = "Sauvegarder les paramètres";
+$a->strings["Pump.io post failed. Queued for retry."] = "";
+$a->strings["Pump.io like failed. Queued for retry."] = "";
+$a->strings["status"] = "statut";
+$a->strings["%1\$s likes %2\$s's %3\$s"] = "";
diff --git a/pumpio/lang/hu/messages.po b/pumpio/lang/hu/messages.po
deleted file mode 100644
index 511c8205..00000000
--- a/pumpio/lang/hu/messages.po
+++ /dev/null
@@ -1,94 +0,0 @@
-# ADDON pumpio
-# Copyright (C)
-# This file is distributed under the same license as the Friendica pumpio addon package.
-# 
-# 
-# Translators:
-# Balázs Úr, 2020-2021
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:17-0500\n"
-"PO-Revision-Date: 2014-06-23 11:30+0000\n"
-"Last-Translator: Balázs Úr, 2020-2021\n"
-"Language-Team: Hungarian (http://www.transifex.com/Friendica/friendica/language/hu/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: hu\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: pumpio.php:57
-msgid "Permission denied."
-msgstr "Engedély megtagadva."
-
-#: pumpio.php:152
-#, php-format
-msgid "Unable to register the client at the pump.io server '%s'."
-msgstr "Nem lehet regisztrálni a klienst a(z) „%s” pump.io kiszolgálón."
-
-#: pumpio.php:192
-msgid "You are now authenticated to pumpio."
-msgstr "Most már hitelesítve van a pump.io-hoz."
-
-#: pumpio.php:193
-msgid "return to the connector page"
-msgstr "visszatérés a csatlakozó oldalára"
-
-#: pumpio.php:213
-msgid "Post to pumpio"
-msgstr "Beküldése a pump.io-ra"
-
-#: pumpio.php:237
-msgid "Save Settings"
-msgstr "Beállítások mentése"
-
-#: pumpio.php:239
-msgid "Delete this preset"
-msgstr "Előbeállítás törlése"
-
-#: pumpio.php:245
-msgid "Authenticate your pump.io connection"
-msgstr "A pump.io-kapcsolatának hitelesítése"
-
-#: pumpio.php:252
-msgid "Pump.io servername (without \"http://\" or \"https://\" )"
-msgstr "Pump.io kiszolgálónév („http://” vagy „https://” nélkül)"
-
-#: pumpio.php:253
-msgid "Pump.io username (without the servername)"
-msgstr "Pump.io felhasználónév (a kiszolgálónév nélkül)"
-
-#: pumpio.php:254
-msgid "Import the remote timeline"
-msgstr "A távoli idővonal importálása"
-
-#: pumpio.php:255
-msgid "Enable Pump.io Post Addon"
-msgstr "A Pump.io-beküldő bővítmény engedélyezése"
-
-#: pumpio.php:256
-msgid "Post to Pump.io by default"
-msgstr "Beküldés a Pump.io-ra alapértelmezetten"
-
-#: pumpio.php:257
-msgid "Should posts be public?"
-msgstr "Nyilvánosak legyenek a bejegyzések?"
-
-#: pumpio.php:258
-msgid "Mirror all public posts"
-msgstr "Összes nyilvános bejegyzés tükrözése"
-
-#: pumpio.php:263
-msgid "Pump.io Import/Export/Mirror"
-msgstr "Pump.io importálás, exportálás vagy tükrözés"
-
-#: pumpio.php:920
-msgid "status"
-msgstr "állapotát"
-
-#: pumpio.php:924
-#, php-format
-msgid "%1$s likes %2$s's %3$s"
-msgstr "%1$s kedveli %2$s %3$s"
diff --git a/pumpio/lang/hu/strings.php b/pumpio/lang/hu/strings.php
deleted file mode 100644
index 2d1312bb..00000000
--- a/pumpio/lang/hu/strings.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_hu")) {
-function string_plural_select_hu($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Permission denied.'] = 'Engedély megtagadva.';
-$a->strings['Unable to register the client at the pump.io server \'%s\'.'] = 'Nem lehet regisztrálni a klienst a(z) „%s” pump.io kiszolgálón.';
-$a->strings['You are now authenticated to pumpio.'] = 'Most már hitelesítve van a pump.io-hoz.';
-$a->strings['return to the connector page'] = 'visszatérés a csatlakozó oldalára';
-$a->strings['Post to pumpio'] = 'Beküldése a pump.io-ra';
-$a->strings['Save Settings'] = 'Beállítások mentése';
-$a->strings['Delete this preset'] = 'Előbeállítás törlése';
-$a->strings['Authenticate your pump.io connection'] = 'A pump.io-kapcsolatának hitelesítése';
-$a->strings['Pump.io servername (without "http://" or "https://" )'] = 'Pump.io kiszolgálónév („http://” vagy „https://” nélkül)';
-$a->strings['Pump.io username (without the servername)'] = 'Pump.io felhasználónév (a kiszolgálónév nélkül)';
-$a->strings['Import the remote timeline'] = 'A távoli idővonal importálása';
-$a->strings['Enable Pump.io Post Addon'] = 'A Pump.io-beküldő bővítmény engedélyezése';
-$a->strings['Post to Pump.io by default'] = 'Beküldés a Pump.io-ra alapértelmezetten';
-$a->strings['Should posts be public?'] = 'Nyilvánosak legyenek a bejegyzések?';
-$a->strings['Mirror all public posts'] = 'Összes nyilvános bejegyzés tükrözése';
-$a->strings['Pump.io Import/Export/Mirror'] = 'Pump.io importálás, exportálás vagy tükrözés';
-$a->strings['status'] = 'állapotát';
-$a->strings['%1$s likes %2$s\'s %3$s'] = '%1$s kedveli %2$s %3$s';
diff --git a/pumpio/lang/it/messages.po b/pumpio/lang/it/messages.po
index 052e8797..2ab7e050 100644
--- a/pumpio/lang/it/messages.po
+++ b/pumpio/lang/it/messages.po
@@ -5,91 +5,98 @@
 # 
 # Translators:
 # fabrixxm <fabrix.xm@gmail.com>, 2014,2018
-# Sylke Vicious <silkevicious@gmail.com>, 2023
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:17-0500\n"
-"PO-Revision-Date: 2014-06-23 11:30+0000\n"
-"Last-Translator: Sylke Vicious <silkevicious@gmail.com>, 2023\n"
-"Language-Team: Italian (http://app.transifex.com/Friendica/friendica/language/it/)\n"
+"POT-Creation-Date: 2014-06-23 14:45+0200\n"
+"PO-Revision-Date: 2018-03-19 13:25+0000\n"
+"Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n"
+"Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: it\n"
-"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: pumpio.php:57
+#: pumpio.php:38
 msgid "Permission denied."
 msgstr "Permesso negato."
 
-#: pumpio.php:152
+#: pumpio.php:124
 #, php-format
 msgid "Unable to register the client at the pump.io server '%s'."
 msgstr "Impossibile registrare il client sul server pump.io '%s'"
 
-#: pumpio.php:192
+#: pumpio.php:164
 msgid "You are now authenticated to pumpio."
 msgstr "Sei autenticato su pump.io"
 
-#: pumpio.php:193
+#: pumpio.php:165
 msgid "return to the connector page"
 msgstr "ritorna alla pagina del connettore"
 
-#: pumpio.php:213
+#: pumpio.php:183
 msgid "Post to pumpio"
 msgstr "Invia a pump.io"
 
-#: pumpio.php:237
-msgid "Save Settings"
-msgstr "Salva Impostazioni"
+#: pumpio.php:221 pumpio.php:225
+msgid "Pump.io Import/Export/Mirror"
+msgstr "Esporta/Importa/Clona pump.io"
 
-#: pumpio.php:239
-msgid "Delete this preset"
-msgstr "Elimina questa preimpostazione"
+#: pumpio.php:229
+msgid "pump.io username (without the servername)"
+msgstr "nome utente pump.io (senza il nome del server)"
 
-#: pumpio.php:245
+#: pumpio.php:234
+msgid "pump.io servername (without \"http://\" or \"https://\" )"
+msgstr "nome del server pump.io (senza \"http://\" o \"https://\")"
+
+#: pumpio.php:246
 msgid "Authenticate your pump.io connection"
 msgstr "Autentica la tua connessione pump.io"
 
-#: pumpio.php:252
-msgid "Pump.io servername (without \"http://\" or \"https://\" )"
-msgstr "Nome server Pump.io (senza \"http://\" o \"https://\" )"
-
-#: pumpio.php:253
-msgid "Pump.io username (without the servername)"
-msgstr "Nome utente Pump.io (senza nome server)"
-
-#: pumpio.php:254
+#: pumpio.php:250
 msgid "Import the remote timeline"
 msgstr "Importa la timeline remota"
 
 #: pumpio.php:255
-msgid "Enable Pump.io Post Addon"
-msgstr "Abilita componente aggiuntivo di pubblicazione Pump.io"
+msgid "Enable pump.io Post Addon"
+msgstr "Abilita il componente aggiuntivo di invio ad pump.io"
 
-#: pumpio.php:256
-msgid "Post to Pump.io by default"
-msgstr "Pubblica su Pump.io per impostazione predefinita"
+#: pumpio.php:260
+msgid "Post to pump.io by default"
+msgstr "Invia sempre a pump.io"
 
-#: pumpio.php:257
+#: pumpio.php:265
 msgid "Should posts be public?"
 msgstr "I messaggi devono essere pubblici?"
 
-#: pumpio.php:258
+#: pumpio.php:270
 msgid "Mirror all public posts"
 msgstr "Clona tutti i messaggi pubblici"
 
-#: pumpio.php:263
-msgid "Pump.io Import/Export/Mirror"
-msgstr "Esporta/Importa/Clona pump.io"
+#: pumpio.php:275
+msgid "Check to delete this preset"
+msgstr "Seleziona per elimiare queto preset"
 
-#: pumpio.php:920
+#: pumpio.php:285
+msgid "Save Settings"
+msgstr "Salva Impostazioni"
+
+#: pumpio.php:515
+msgid "Pump.io post failed. Queued for retry."
+msgstr "Invio a pump.io fallito. In attesa di riprovare."
+
+#: pumpio.php:587
+msgid "Pump.io like failed. Queued for retry."
+msgstr "Invio 'mi piace' a pump.io fallito. In attesa di riprovare."
+
+#: pumpio.php:875
 msgid "status"
 msgstr "stato"
 
-#: pumpio.php:924
+#: pumpio.php:879
 #, php-format
 msgid "%1$s likes %2$s's %3$s"
 msgstr "a %1$s piace %2$s di %3$s"
diff --git a/pumpio/lang/it/strings.php b/pumpio/lang/it/strings.php
index 512d3e7f..86b7ed29 100644
--- a/pumpio/lang/it/strings.php
+++ b/pumpio/lang/it/strings.php
@@ -2,24 +2,26 @@
 
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
-	$n = intval($n);
-	if ($n == 1) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
+	return ($n != 1);;
 }}
-$a->strings['Permission denied.'] = 'Permesso negato.';
-$a->strings['Unable to register the client at the pump.io server \'%s\'.'] = 'Impossibile registrare il client sul server pump.io \'%s\'';
-$a->strings['You are now authenticated to pumpio.'] = 'Sei autenticato su pump.io';
-$a->strings['return to the connector page'] = 'ritorna alla pagina del connettore';
-$a->strings['Post to pumpio'] = 'Invia a pump.io';
-$a->strings['Save Settings'] = 'Salva Impostazioni';
-$a->strings['Delete this preset'] = 'Elimina questa preimpostazione';
-$a->strings['Authenticate your pump.io connection'] = 'Autentica la tua connessione pump.io';
-$a->strings['Pump.io servername (without "http://" or "https://" )'] = 'Nome server Pump.io (senza "http://" o "https://" )';
-$a->strings['Pump.io username (without the servername)'] = 'Nome utente Pump.io (senza nome server)';
-$a->strings['Import the remote timeline'] = 'Importa la timeline remota';
-$a->strings['Enable Pump.io Post Addon'] = 'Abilita componente aggiuntivo di pubblicazione Pump.io';
-$a->strings['Post to Pump.io by default'] = 'Pubblica su Pump.io per impostazione predefinita';
-$a->strings['Should posts be public?'] = 'I messaggi devono essere pubblici?';
-$a->strings['Mirror all public posts'] = 'Clona tutti i messaggi pubblici';
-$a->strings['Pump.io Import/Export/Mirror'] = 'Esporta/Importa/Clona pump.io';
-$a->strings['status'] = 'stato';
-$a->strings['%1$s likes %2$s\'s %3$s'] = 'a %1$s piace %2$s di %3$s';
+;
+$a->strings["Permission denied."] = "Permesso negato.";
+$a->strings["Unable to register the client at the pump.io server '%s'."] = "Impossibile registrare il client sul server pump.io '%s'";
+$a->strings["You are now authenticated to pumpio."] = "Sei autenticato su pump.io";
+$a->strings["return to the connector page"] = "ritorna alla pagina del connettore";
+$a->strings["Post to pumpio"] = "Invia a pump.io";
+$a->strings["Pump.io Import/Export/Mirror"] = "Esporta/Importa/Clona pump.io";
+$a->strings["pump.io username (without the servername)"] = "nome utente pump.io (senza il nome del server)";
+$a->strings["pump.io servername (without \"http://\" or \"https://\" )"] = "nome del server pump.io (senza \"http://\" o \"https://\")";
+$a->strings["Authenticate your pump.io connection"] = "Autentica la tua connessione pump.io";
+$a->strings["Import the remote timeline"] = "Importa la timeline remota";
+$a->strings["Enable pump.io Post Addon"] = "Abilita il componente aggiuntivo di invio ad pump.io";
+$a->strings["Post to pump.io by default"] = "Invia sempre a pump.io";
+$a->strings["Should posts be public?"] = "I messaggi devono essere pubblici?";
+$a->strings["Mirror all public posts"] = "Clona tutti i messaggi pubblici";
+$a->strings["Check to delete this preset"] = "Seleziona per elimiare queto preset";
+$a->strings["Save Settings"] = "Salva Impostazioni";
+$a->strings["Pump.io post failed. Queued for retry."] = "Invio a pump.io fallito. In attesa di riprovare.";
+$a->strings["Pump.io like failed. Queued for retry."] = "Invio 'mi piace' a pump.io fallito. In attesa di riprovare.";
+$a->strings["status"] = "stato";
+$a->strings["%1\$s likes %2\$s's %3\$s"] = "a %1\$s piace %2\$s di %3\$s";
diff --git a/pumpio/lang/nl/strings.php b/pumpio/lang/nl/strings.php
index 2ac4e7fb..61297c4f 100644
--- a/pumpio/lang/nl/strings.php
+++ b/pumpio/lang/nl/strings.php
@@ -3,11 +3,26 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Permission denied.'] = 'Toegang geweigerd.';
-$a->strings['Unable to register the client at the pump.io server \'%s\'.'] = 'Niet mogelijk om uw client te registreren op pump.io server \'%s\'';
-$a->strings['Pump.io Import/Export/Mirror'] = 'Pump.io Import/Exporteren/Spiegelen';
-$a->strings['Enable pump.io Post Addon'] = 'Pump.io Post Addon inschakelen';
-$a->strings['Post to pump.io by default'] = 'Plaatsen op pump.io als standaard instellen ';
-$a->strings['Save Settings'] = 'Instellingen opslaan';
+;
+$a->strings["Permission denied."] = "Toegang geweigerd.";
+$a->strings["Unable to register the client at the pump.io server '%s'."] = "Niet mogelijk om uw client te registreren op pump.io server '%s'";
+$a->strings["You are now authenticated to pumpio."] = "";
+$a->strings["return to the connector page"] = "";
+$a->strings["Post to pumpio"] = "";
+$a->strings["Pump.io Import/Export/Mirror"] = "Pump.io Import/Exporteren/Spiegelen";
+$a->strings["pump.io username (without the servername)"] = "";
+$a->strings["pump.io servername (without \"http://\" or \"https://\" )"] = "";
+$a->strings["Authenticate your pump.io connection"] = "";
+$a->strings["Import the remote timeline"] = "";
+$a->strings["Enable pump.io Post Addon"] = "Pump.io Post Addon inschakelen";
+$a->strings["Post to pump.io by default"] = "Plaatsen op pump.io als standaard instellen ";
+$a->strings["Should posts be public?"] = "";
+$a->strings["Mirror all public posts"] = "";
+$a->strings["Check to delete this preset"] = "";
+$a->strings["Save Settings"] = "Instellingen opslaan";
+$a->strings["Pump.io post failed. Queued for retry."] = "";
+$a->strings["Pump.io like failed. Queued for retry."] = "";
+$a->strings["status"] = "";
+$a->strings["%1\$s likes %2\$s's %3\$s"] = "";
diff --git a/pumpio/lang/pl/messages.po b/pumpio/lang/pl/messages.po
index a5ab3ea2..98e910a7 100644
--- a/pumpio/lang/pl/messages.po
+++ b/pumpio/lang/pl/messages.po
@@ -4,15 +4,14 @@
 # 
 # 
 # Translators:
-# Piotr Strębski <strebski@gmail.com>, 2022
-# Waldemar Stoczkowski, 2018
+# Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:17-0500\n"
-"PO-Revision-Date: 2014-06-23 11:30+0000\n"
-"Last-Translator: Piotr Strębski <strebski@gmail.com>, 2022\n"
+"POT-Creation-Date: 2014-06-23 14:45+0200\n"
+"PO-Revision-Date: 2018-08-05 15:43+0000\n"
+"Last-Translator: Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.com/Friendica/friendica/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,76 +19,84 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
-#: pumpio.php:57
+#: pumpio.php:38
 msgid "Permission denied."
 msgstr "Odmowa dostępu."
 
-#: pumpio.php:152
+#: pumpio.php:124
 #, php-format
 msgid "Unable to register the client at the pump.io server '%s'."
 msgstr "Nie można zarejestrować klienta na serwerze pump.io '%s'."
 
-#: pumpio.php:192
+#: pumpio.php:164
 msgid "You are now authenticated to pumpio."
 msgstr "Jesteś teraz uwierzytelniony w trybie pumpio."
 
-#: pumpio.php:193
+#: pumpio.php:165
 msgid "return to the connector page"
 msgstr "powrót do strony łączenia"
 
-#: pumpio.php:213
+#: pumpio.php:183
 msgid "Post to pumpio"
 msgstr "Prześlij do pumpio"
 
-#: pumpio.php:237
-msgid "Save Settings"
-msgstr "Zapisz ustawienia"
+#: pumpio.php:221 pumpio.php:225
+msgid "Pump.io Import/Export/Mirror"
+msgstr "Pump.io Import/Export/Mirror"
 
-#: pumpio.php:239
-msgid "Delete this preset"
-msgstr "Usuń to ustawienie wstępne"
+#: pumpio.php:229
+msgid "pump.io username (without the servername)"
+msgstr "nazwa użytkownika pump.io (bez nazwy serwera)"
 
-#: pumpio.php:245
+#: pumpio.php:234
+msgid "pump.io servername (without \"http://\" or \"https://\" )"
+msgstr "pump.io nazwa_serwera (bez \"http://\" lub \"https://\")"
+
+#: pumpio.php:246
 msgid "Authenticate your pump.io connection"
 msgstr "Uwierzytelnij swoje połączenie pump.io"
 
-#: pumpio.php:252
-msgid "Pump.io servername (without \"http://\" or \"https://\" )"
-msgstr "Nazwa serwera Pump.io (bez \"http://\" lub \"https://\")"
-
-#: pumpio.php:253
-msgid "Pump.io username (without the servername)"
-msgstr "Nazwa użytkownika Pump.io (bez nazwy serwera)"
-
-#: pumpio.php:254
+#: pumpio.php:250
 msgid "Import the remote timeline"
 msgstr "Zaimportuj zdalną oś czasu"
 
 #: pumpio.php:255
-msgid "Enable Pump.io Post Addon"
-msgstr "Włącz dodatek Pump.io"
+msgid "Enable pump.io Post Addon"
+msgstr "Włącz dodatek pump.io"
 
-#: pumpio.php:256
-msgid "Post to Pump.io by default"
-msgstr "Publikuj domyślnie w Pump.io"
+#: pumpio.php:260
+msgid "Post to pump.io by default"
+msgstr "Opublikuj domyślnie w pump.io"
 
-#: pumpio.php:257
+#: pumpio.php:265
 msgid "Should posts be public?"
 msgstr "Czy posty powinny być publiczne?"
 
-#: pumpio.php:258
+#: pumpio.php:270
 msgid "Mirror all public posts"
 msgstr "Odbij wszystkie publiczne posty"
 
-#: pumpio.php:263
-msgid "Pump.io Import/Export/Mirror"
-msgstr "Pump.io Import/Export/Mirror"
+#: pumpio.php:275
+msgid "Check to delete this preset"
+msgstr "Zaznacz, aby usunąć to ustawienie wstępne"
 
-#: pumpio.php:920
+#: pumpio.php:285
+msgid "Save Settings"
+msgstr "Zapisz ustawienia"
+
+#: pumpio.php:515
+msgid "Pump.io post failed. Queued for retry."
+msgstr "Błąd Pump.io post. W kolejce do ponowienia."
+
+#: pumpio.php:587
+msgid "Pump.io like failed. Queued for retry."
+msgstr "Błąd Pump.io. W kolejce do ponowienia."
+
+#: pumpio.php:875
 msgid "status"
 msgstr "status"
 
-#: pumpio.php:924
+#: pumpio.php:879
 #, php-format
 msgid "%1$s likes %2$s's %3$s"
 msgstr "%1$slubi %2$s %3$s "
diff --git a/pumpio/lang/pl/strings.php b/pumpio/lang/pl/strings.php
index b3d3925c..a7868f06 100644
--- a/pumpio/lang/pl/strings.php
+++ b/pumpio/lang/pl/strings.php
@@ -3,23 +3,26 @@
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
 	$n = intval($n);
-	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
+	return ($n==1 ? 0 : ($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14) ? 1 : $n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14) ? 2 : 3);;
 }}
-$a->strings['Permission denied.'] = 'Odmowa dostępu.';
-$a->strings['Unable to register the client at the pump.io server \'%s\'.'] = 'Nie można zarejestrować klienta na serwerze pump.io \'%s\'.';
-$a->strings['You are now authenticated to pumpio.'] = 'Jesteś teraz uwierzytelniony w trybie pumpio.';
-$a->strings['return to the connector page'] = 'powrót do strony łączenia';
-$a->strings['Post to pumpio'] = 'Prześlij do pumpio';
-$a->strings['Save Settings'] = 'Zapisz ustawienia';
-$a->strings['Delete this preset'] = 'Usuń to ustawienie wstępne';
-$a->strings['Authenticate your pump.io connection'] = 'Uwierzytelnij swoje połączenie pump.io';
-$a->strings['Pump.io servername (without "http://" or "https://" )'] = 'Nazwa serwera Pump.io (bez "http://" lub "https://")';
-$a->strings['Pump.io username (without the servername)'] = 'Nazwa użytkownika Pump.io (bez nazwy serwera)';
-$a->strings['Import the remote timeline'] = 'Zaimportuj zdalną oś czasu';
-$a->strings['Enable Pump.io Post Addon'] = 'Włącz dodatek Pump.io';
-$a->strings['Post to Pump.io by default'] = 'Publikuj domyślnie w Pump.io';
-$a->strings['Should posts be public?'] = 'Czy posty powinny być publiczne?';
-$a->strings['Mirror all public posts'] = 'Odbij wszystkie publiczne posty';
-$a->strings['Pump.io Import/Export/Mirror'] = 'Pump.io Import/Export/Mirror';
-$a->strings['status'] = 'status';
-$a->strings['%1$s likes %2$s\'s %3$s'] = '%1$slubi %2$s %3$s ';
+;
+$a->strings["Permission denied."] = "Odmowa dostępu.";
+$a->strings["Unable to register the client at the pump.io server '%s'."] = "Nie można zarejestrować klienta na serwerze pump.io '%s'.";
+$a->strings["You are now authenticated to pumpio."] = "Jesteś teraz uwierzytelniony w trybie pumpio.";
+$a->strings["return to the connector page"] = "powrót do strony łączenia";
+$a->strings["Post to pumpio"] = "Prześlij do pumpio";
+$a->strings["Pump.io Import/Export/Mirror"] = "Pump.io Import/Export/Mirror";
+$a->strings["pump.io username (without the servername)"] = "nazwa użytkownika pump.io (bez nazwy serwera)";
+$a->strings["pump.io servername (without \"http://\" or \"https://\" )"] = "pump.io nazwa_serwera (bez \"http://\" lub \"https://\")";
+$a->strings["Authenticate your pump.io connection"] = "Uwierzytelnij swoje połączenie pump.io";
+$a->strings["Import the remote timeline"] = "Zaimportuj zdalną oś czasu";
+$a->strings["Enable pump.io Post Addon"] = "Włącz dodatek pump.io";
+$a->strings["Post to pump.io by default"] = "Opublikuj domyślnie w pump.io";
+$a->strings["Should posts be public?"] = "Czy posty powinny być publiczne?";
+$a->strings["Mirror all public posts"] = "Odbij wszystkie publiczne posty";
+$a->strings["Check to delete this preset"] = "Zaznacz, aby usunąć to ustawienie wstępne";
+$a->strings["Save Settings"] = "Zapisz ustawienia";
+$a->strings["Pump.io post failed. Queued for retry."] = "Błąd Pump.io post. W kolejce do ponowienia.";
+$a->strings["Pump.io like failed. Queued for retry."] = "Błąd Pump.io. W kolejce do ponowienia.";
+$a->strings["status"] = "status";
+$a->strings["%1\$s likes %2\$s's %3\$s"] = "%1\$slubi %2\$s %3\$s ";
diff --git a/pumpio/lang/pt-br/strings.php b/pumpio/lang/pt-br/strings.php
index bb4bce55..e93516b4 100644
--- a/pumpio/lang/pt-br/strings.php
+++ b/pumpio/lang/pt-br/strings.php
@@ -2,18 +2,26 @@
 
 if(! function_exists("string_plural_select_pt_br")) {
 function string_plural_select_pt_br($n){
-	$n = intval($n);
-	return intval($n > 1);
+	return ($n > 1);;
 }}
-$a->strings['Permission denied.'] = 'Permissão negada.';
-$a->strings['You are now authenticated to pumpio.'] = 'Você se autenticou no Pump.io.';
-$a->strings['return to the connector page'] = 'voltar à página de conectores';
-$a->strings['Post to pumpio'] = 'Publicar no Pump.io';
-$a->strings['pump.io username (without the servername)'] = 'Nome de usuário no pump.io (sem o nome do servidor)';
-$a->strings['Import the remote timeline'] = 'Importar a linha do tempo remota';
-$a->strings['Enable pump.io Post Addon'] = 'Habilitar plug-in para publicar no Pump.io';
-$a->strings['Post to pump.io by default'] = 'Publicar no Pump.io por padrão';
-$a->strings['Save Settings'] = 'Salvar Configurações';
-$a->strings['Pump.io post failed. Queued for retry.'] = 'Falha ao publicar no Pump.io. Na fila para tentar novamente.';
-$a->strings['Pump.io like failed. Queued for retry.'] = 'Falha ao curtir no Pump.io. Na fila para tentar novamente.';
-$a->strings['%1$s likes %2$s\'s %3$s'] = '%1$s curtiu o %3$s de %2$s';
+;
+$a->strings["Permission denied."] = "Permissão negada.";
+$a->strings["Unable to register the client at the pump.io server '%s'."] = "";
+$a->strings["You are now authenticated to pumpio."] = "Você se autenticou no Pump.io.";
+$a->strings["return to the connector page"] = "voltar à página de conectores";
+$a->strings["Post to pumpio"] = "Publicar no Pump.io";
+$a->strings["Pump.io Import/Export/Mirror"] = "";
+$a->strings["pump.io username (without the servername)"] = "Nome de usuário no pump.io (sem o nome do servidor)";
+$a->strings["pump.io servername (without \"http://\" or \"https://\" )"] = "";
+$a->strings["Authenticate your pump.io connection"] = "";
+$a->strings["Import the remote timeline"] = "Importar a linha do tempo remota";
+$a->strings["Enable pump.io Post Addon"] = "Habilitar plug-in para publicar no Pump.io";
+$a->strings["Post to pump.io by default"] = "Publicar no Pump.io por padrão";
+$a->strings["Should posts be public?"] = "";
+$a->strings["Mirror all public posts"] = "";
+$a->strings["Check to delete this preset"] = "";
+$a->strings["Save Settings"] = "Salvar Configurações";
+$a->strings["Pump.io post failed. Queued for retry."] = "Falha ao publicar no Pump.io. Na fila para tentar novamente.";
+$a->strings["Pump.io like failed. Queued for retry."] = "Falha ao curtir no Pump.io. Na fila para tentar novamente.";
+$a->strings["status"] = "";
+$a->strings["%1\$s likes %2\$s's %3\$s"] = "%1\$s curtiu o %3\$s de %2\$s";
diff --git a/pumpio/lang/ro/strings.php b/pumpio/lang/ro/strings.php
index 4214efd4..b0ee9a25 100644
--- a/pumpio/lang/ro/strings.php
+++ b/pumpio/lang/ro/strings.php
@@ -2,26 +2,26 @@
 
 if(! function_exists("string_plural_select_ro")) {
 function string_plural_select_ro($n){
-	$n = intval($n);
-	if ($n==1) { return 0; } else if ((($n%100>19)||(($n%100==0)&&($n!=0)))) { return 2; } else  { return 1; }
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
 }}
-$a->strings['Permission denied.'] = 'Permisiune refuzată.';
-$a->strings['Unable to register the client at the pump.io server \'%s\'.'] = 'Imposibil de înregistrat clientul pe serverul pump.io \'%s\'.';
-$a->strings['You are now authenticated to pumpio.'] = 'Acum sunteți autentificat pe pumpio.';
-$a->strings['return to the connector page'] = 'revenire la pagina de conectare';
-$a->strings['Post to pumpio'] = 'Postați pe pumpio';
-$a->strings['Pump.io Import/Export/Mirror'] = 'Import/Export/Clonare Pump.io ';
-$a->strings['pump.io username (without the servername)'] = 'Utilizator pump.io (fără nume server)';
-$a->strings['pump.io servername (without "http://" or "https://" )'] = 'Nume server pump.io (fără "http://" ori "https://" )';
-$a->strings['Authenticate your pump.io connection'] = 'Autentificați-vă conectarea la pump.io';
-$a->strings['Import the remote timeline'] = 'Importare cronologie la distanță';
-$a->strings['Enable pump.io Post Addon'] = 'Activare Modul Postare pump.io';
-$a->strings['Post to pump.io by default'] = 'Postați implicit pe pump.io';
-$a->strings['Should posts be public?'] = 'Postările ar trebui sa fie publice?';
-$a->strings['Mirror all public posts'] = 'Reproducere pentru toate postările publice';
-$a->strings['Check to delete this preset'] = 'Bifați pentru a șterge această presetare';
-$a->strings['Save Settings'] = 'Salvare Configurări';
-$a->strings['Pump.io post failed. Queued for retry.'] = 'Postarea pe pump.io a eșuat. S-a pus în așteptare pentru reîncercare.';
-$a->strings['Pump.io like failed. Queued for retry.'] = 'Aprecierea de pe pump.io a eșuat. S-a pus în așteptare pentru reîncercare.';
-$a->strings['status'] = 'status';
-$a->strings['%1$s likes %2$s\'s %3$s'] = '%1$s apreciază %3$s lui %2$s ';
+;
+$a->strings["Permission denied."] = "Permisiune refuzată.";
+$a->strings["Unable to register the client at the pump.io server '%s'."] = "Imposibil de înregistrat clientul pe serverul pump.io '%s'.";
+$a->strings["You are now authenticated to pumpio."] = "Acum sunteți autentificat pe pumpio.";
+$a->strings["return to the connector page"] = "revenire la pagina de conectare";
+$a->strings["Post to pumpio"] = "Postați pe pumpio";
+$a->strings["Pump.io Import/Export/Mirror"] = "Import/Export/Clonare Pump.io ";
+$a->strings["pump.io username (without the servername)"] = "Utilizator pump.io (fără nume server)";
+$a->strings["pump.io servername (without \"http://\" or \"https://\" )"] = "Nume server pump.io (fără \"http://\" ori \"https://\" )";
+$a->strings["Authenticate your pump.io connection"] = "Autentificați-vă conectarea la pump.io";
+$a->strings["Import the remote timeline"] = "Importare cronologie la distanță";
+$a->strings["Enable pump.io Post Addon"] = "Activare Modul Postare pump.io";
+$a->strings["Post to pump.io by default"] = "Postați implicit pe pump.io";
+$a->strings["Should posts be public?"] = "Postările ar trebui sa fie publice?";
+$a->strings["Mirror all public posts"] = "Reproducere pentru toate postările publice";
+$a->strings["Check to delete this preset"] = "Bifați pentru a șterge această presetare";
+$a->strings["Save Settings"] = "Salvare Configurări";
+$a->strings["Pump.io post failed. Queued for retry."] = "Postarea pe pump.io a eșuat. S-a pus în așteptare pentru reîncercare.";
+$a->strings["Pump.io like failed. Queued for retry."] = "Aprecierea de pe pump.io a eșuat. S-a pus în așteptare pentru reîncercare.";
+$a->strings["status"] = "status";
+$a->strings["%1\$s likes %2\$s's %3\$s"] = "%1\$s apreciază %3\$s lui %2\$s ";
diff --git a/pumpio/lang/sv/messages.po b/pumpio/lang/sv/messages.po
deleted file mode 100644
index a5e332ec..00000000
--- a/pumpio/lang/sv/messages.po
+++ /dev/null
@@ -1,95 +0,0 @@
-# ADDON pumpio
-# Copyright (C)
-# This file is distributed under the same license as the Friendica pumpio addon package.
-# 
-# 
-# Translators:
-# Hypolite Petovan <hypolite@mrpetovan.com>, 2019
-# Kristoffer Grundström <lovaren@gmail.com>, 2022
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:17-0500\n"
-"PO-Revision-Date: 2022-01-16 00:51+0000\n"
-"Last-Translator: Kristoffer Grundström <lovaren@gmail.com>\n"
-"Language-Team: Swedish (http://www.transifex.com/Friendica/friendica/language/sv/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: sv\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: pumpio.php:57
-msgid "Permission denied."
-msgstr "Åtkomst nekad."
-
-#: pumpio.php:152
-#, php-format
-msgid "Unable to register the client at the pump.io server '%s'."
-msgstr ""
-
-#: pumpio.php:192
-msgid "You are now authenticated to pumpio."
-msgstr "Du är nu autentiserad till pumpio."
-
-#: pumpio.php:193
-msgid "return to the connector page"
-msgstr ""
-
-#: pumpio.php:213
-msgid "Post to pumpio"
-msgstr ""
-
-#: pumpio.php:237
-msgid "Save Settings"
-msgstr "Spara inställningar"
-
-#: pumpio.php:239
-msgid "Delete this preset"
-msgstr ""
-
-#: pumpio.php:245
-msgid "Authenticate your pump.io connection"
-msgstr "Autentisera din pum.io-anslutning"
-
-#: pumpio.php:252
-msgid "Pump.io servername (without \"http://\" or \"https://\" )"
-msgstr ""
-
-#: pumpio.php:253
-msgid "Pump.io username (without the servername)"
-msgstr ""
-
-#: pumpio.php:254
-msgid "Import the remote timeline"
-msgstr ""
-
-#: pumpio.php:255
-msgid "Enable Pump.io Post Addon"
-msgstr ""
-
-#: pumpio.php:256
-msgid "Post to Pump.io by default"
-msgstr ""
-
-#: pumpio.php:257
-msgid "Should posts be public?"
-msgstr "Bör inlägg vara publika?"
-
-#: pumpio.php:258
-msgid "Mirror all public posts"
-msgstr "Spegla alla publika inlägg"
-
-#: pumpio.php:263
-msgid "Pump.io Import/Export/Mirror"
-msgstr ""
-
-#: pumpio.php:920
-msgid "status"
-msgstr "status"
-
-#: pumpio.php:924
-#, php-format
-msgid "%1$s likes %2$s's %3$s"
-msgstr "%1$s gillar %2$s's %3$s"
diff --git a/pumpio/lang/sv/strings.php b/pumpio/lang/sv/strings.php
deleted file mode 100644
index 185d8795..00000000
--- a/pumpio/lang/sv/strings.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_sv")) {
-function string_plural_select_sv($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Permission denied.'] = 'Åtkomst nekad.';
-$a->strings['You are now authenticated to pumpio.'] = 'Du är nu autentiserad till pumpio.';
-$a->strings['Save Settings'] = 'Spara inställningar';
-$a->strings['Authenticate your pump.io connection'] = 'Autentisera din pum.io-anslutning';
-$a->strings['Should posts be public?'] = 'Bör inlägg vara publika?';
-$a->strings['Mirror all public posts'] = 'Spegla alla publika inlägg';
-$a->strings['status'] = 'status';
-$a->strings['%1$s likes %2$s\'s %3$s'] = '%1$s gillar %2$s\'s %3$s';
diff --git a/pumpio/pumpio.css b/pumpio/pumpio.css
new file mode 100644
index 00000000..86dc5a0d
--- /dev/null
+++ b/pumpio/pumpio.css
@@ -0,0 +1,16 @@
+
+#pumpio-import-label,#pumpio-mirror-label,#pumpio-public-label, #pumpio-enable-label, #pumpio-username-label, #pumpio-servername-label, #pumpio-bydefault-label, #pumpio-delete-label {
+	float: left;
+	width: 200px;
+	margin-top: 10px;
+}
+
+#pumpio-import,#pumpio-mirror,#pumpio-public, #pumpio-checkbox, #pumpio-username, #pumpio-servername, #pumpio-bydefault, #pumpio-delete {
+	float: left;
+	margin-top: 10px;
+}
+
+#pumpio-submit {
+	margin-top: 15px;
+}
+
diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php
index 6600696e..e8b740c2 100644
--- a/pumpio/pumpio.php
+++ b/pumpio/pumpio.php
@@ -9,30 +9,29 @@
 use Friendica\App;
 use Friendica\Content\Text\BBCode;
 use Friendica\Content\Text\HTML;
-use Friendica\Core\Addon;
+use Friendica\Core\Config;
 use Friendica\Core\Hook;
+use Friendica\Core\L10n;
 use Friendica\Core\Logger;
+use Friendica\Core\PConfig;
 use Friendica\Core\Protocol;
-use Friendica\Core\Renderer;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
-use Friendica\DI;
 use Friendica\Model\Contact;
-use Friendica\Model\Circle;
+use Friendica\Model\Group;
 use Friendica\Model\Item;
-use Friendica\Model\Post;
 use Friendica\Model\User;
-use Friendica\Network\HTTPClient\Client\HttpClientAccept;
-use Friendica\Network\HTTPClient\Client\HttpClientOptions;
 use Friendica\Protocol\Activity;
 use Friendica\Protocol\ActivityNamespace;
-use Friendica\Core\Config\Util\ConfigFileManager;
+use Friendica\Util\ConfigFileLoader;
 use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Network;
 use Friendica\Util\Strings;
 use Friendica\Util\XML;
 
 require 'addon/pumpio/oauth/http.php';
 require 'addon/pumpio/oauth/oauth_client.php';
+require_once "mod/share.php";
 
 define('PUMPIO_DEFAULT_POLL_INTERVAL', 5); // given in minutes
 
@@ -49,115 +48,125 @@ function pumpio_install()
 	Hook::register('check_item_notification', 'addon/pumpio/pumpio.php', 'pumpio_check_item_notification');
 }
 
-/**
- * This is a statement rather than an actual function definition. The simple
- * existence of this method is checked to figure out if the addon offers a
- * module.
- */
+function pumpio_uninstall()
+{
+	Hook::unregister('load_config',      'addon/pumpio/pumpio.php', 'pumpio_load_config');
+	Hook::unregister('hook_fork',        'addon/pumpio/pumpio.php', 'pumpio_hook_fork');
+	Hook::unregister('post_local',       'addon/pumpio/pumpio.php', 'pumpio_post_local');
+	Hook::unregister('notifier_normal',  'addon/pumpio/pumpio.php', 'pumpio_send');
+	Hook::unregister('jot_networks',     'addon/pumpio/pumpio.php', 'pumpio_jot_nets');
+	Hook::unregister('connector_settings',      'addon/pumpio/pumpio.php', 'pumpio_settings');
+	Hook::unregister('connector_settings_post', 'addon/pumpio/pumpio.php', 'pumpio_settings_post');
+	Hook::unregister('cron', 'addon/pumpio/pumpio.php', 'pumpio_cron');
+	Hook::unregister('check_item_notification', 'addon/pumpio/pumpio.php', 'pumpio_check_item_notification');
+}
+
 function pumpio_module() {}
 
-function pumpio_content()
+function pumpio_content(App $a)
 {
-	if (!DI::userSession()->getLocalUserId()) {
-		DI::sysmsg()->addNotice(DI::l10n()->t('Permission denied.'));
+	if (!local_user()) {
+		notice(L10n::t('Permission denied.') . EOL);
 		return '';
 	}
 
-	if (isset(DI::args()->getArgv()[1])) {
-		switch (DI::args()->getArgv()[1]) {
-			case 'connect':
-				$o = pumpio_connect();
-				break;
+	require_once("mod/settings.php");
+	settings_init($a);
 
+	if (isset($a->argv[1])) {
+		switch ($a->argv[1]) {
+			case "connect":
+				$o = pumpio_connect($a);
+				break;
 			default:
-				$o = print_r(DI::args()->getArgv(), true);
+				$o = print_r($a->argv, true);
 				break;
 		}
 	} else {
-		$o = pumpio_connect();
+		$o = pumpio_connect($a);
 	}
 	return $o;
 }
 
-function pumpio_check_item_notification(array &$notification_data)
+function pumpio_check_item_notification($a, &$notification_data)
 {
-	$hostname = DI::pConfig()->get($notification_data['uid'], 'pumpio', 'host');
-	$username = DI::pConfig()->get($notification_data['uid'], 'pumpio', 'user');
+	$hostname = PConfig::get($notification_data["uid"], 'pumpio', 'host');
+	$username = PConfig::get($notification_data["uid"], "pumpio", "user");
 
-	$notification_data['profiles'][] = 'https://' . $hostname . '/' . $username;
+	$notification_data["profiles"][] = "https://".$hostname."/".$username;
 }
 
-function pumpio_registerclient($host)
+function pumpio_registerclient(App $a, $host)
 {
-	$url = 'https://' . $host . '/api/client/register';
+	$url = "https://".$host."/api/client/register";
 
 	$params = [];
 
-	$application_name  = DI::config()->get('pumpio', 'application_name');
+	$application_name  = Config::get('pumpio', 'application_name');
 
-	if ($application_name == '') {
-		$application_name = DI::baseUrl()->getHost();
+	if ($application_name == "") {
+		$application_name = $a->getHostName();
 	}
 
-	$firstAdmin = User::getFirstAdmin(['email']);
+	$adminlist = explode(",", str_replace(" ", "", Config::get('config', 'admin_email')));
 
-	$params['type'] = 'client_associate';
-	$params['contacts'] = $firstAdmin['email'];
-	$params['application_type'] = 'native';
-	$params['application_name'] = $application_name;
-	$params['logo_url'] = DI::baseUrl() . '/images/friendica-256.png';
-	$params['redirect_uris'] = DI::baseUrl() . '/pumpio/connect';
+	$params["type"] = "client_associate";
+	$params["contacts"] = $adminlist[0];
+	$params["application_type"] = "native";
+	$params["application_name"] = $application_name;
+	$params["logo_url"] = $a->getBaseURL()."/images/friendica-256.png";
+	$params["redirect_uris"] = $a->getBaseURL()."/pumpio/connect";
 
-	Logger::info('pumpio_registerclient: ' . $url . ' parameters', $params);
+	Logger::log("pumpio_registerclient: ".$url." parameters ".print_r($params, true), Logger::DEBUG);
 
-	// @TODO Rewrite this to our own HTTP client
 	$ch = curl_init($url);
 	curl_setopt($ch, CURLOPT_HEADER, false);
 	curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
 	curl_setopt($ch, CURLOPT_POST,1);
 	curl_setopt($ch, CURLOPT_POSTFIELDS, $params);
-	curl_setopt($ch, CURLOPT_USERAGENT, 'Friendica');
+	curl_setopt($ch, CURLOPT_USERAGENT, "Friendica");
 
 	$s = curl_exec($ch);
 	$curl_info = curl_getinfo($ch);
 
-	if ($curl_info['http_code'] == '200') {
+	if ($curl_info["http_code"] == "200") {
 		$values = json_decode($s);
-		Logger::info('pumpio_registerclient: success ', (array)$values);
+		Logger::log("pumpio_registerclient: success ".print_r($values, true), Logger::DEBUG);
 		return $values;
 	}
-	Logger::info('pumpio_registerclient: failed: ', $curl_info);
+	Logger::log("pumpio_registerclient: failed: ".print_r($curl_info, true), Logger::DEBUG);
 	return false;
 
 }
 
-function pumpio_connect()
+function pumpio_connect(App $a)
 {
 	// Define the needed keys
-	$consumer_key    = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'pumpio', 'consumer_key');
-	$consumer_secret = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'pumpio', 'consumer_secret');
-	$hostname        = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'pumpio', 'host');
+	$consumer_key = PConfig::get(local_user(), 'pumpio', 'consumer_key');
+	$consumer_secret = PConfig::get(local_user(), 'pumpio', 'consumer_secret');
+	$hostname = PConfig::get(local_user(), 'pumpio', 'host');
 
-	if ((($consumer_key == '') || ($consumer_secret == '')) && ($hostname != '')) {
-		Logger::notice('pumpio_connect: register client');
-		$clientdata = pumpio_registerclient($hostname);
-		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'pumpio', 'consumer_key', $clientdata->client_id);
-		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'pumpio', 'consumer_secret', $clientdata->client_secret);
+	if ((($consumer_key == "") || ($consumer_secret == "")) && ($hostname != "")) {
+		Logger::log("pumpio_connect: register client");
+		$clientdata = pumpio_registerclient($a, $hostname);
+		PConfig::set(local_user(), 'pumpio', 'consumer_key', $clientdata->client_id);
+		PConfig::set(local_user(), 'pumpio', 'consumer_secret', $clientdata->client_secret);
 
-		$consumer_key    = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'pumpio', 'consumer_key');
-		$consumer_secret = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'pumpio', 'consumer_secret');
+		$consumer_key = PConfig::get(local_user(), 'pumpio', 'consumer_key');
+		$consumer_secret = PConfig::get(local_user(), 'pumpio', 'consumer_secret');
 
-		Logger::info('pumpio_connect: ckey: ' . $consumer_key . ' csecrect: ' . $consumer_secret);
+		Logger::log("pumpio_connect: ckey: ".$consumer_key." csecrect: ".$consumer_secret, Logger::DEBUG);
 	}
 
-	if (($consumer_key == '') || ($consumer_secret == '')) {
-		Logger::notice('pumpio_connect: '.sprintf('Unable to register the client at the pump.io server "%s".', $hostname));
+	if (($consumer_key == "") || ($consumer_secret == "")) {
+		Logger::log("pumpio_connect: ".sprintf("Unable to register the client at the pump.io server '%s'.", $hostname));
 
-		return DI::l10n()->t("Unable to register the client at the pump.io server '%s'.", $hostname);
+		$o .= L10n::t("Unable to register the client at the pump.io server '%s'.", $hostname);
+		return $o;
 	}
 
 	// The callback URL is the script that gets called after the user authenticates with pumpio
-	$callback_url = DI::baseUrl() . '/pumpio/connect';
+	$callback_url = $a->getBaseURL()."/pumpio/connect";
 
 	// Let's begin.  First we need a Request Token.  The request token is required to send the user
 	// to pumpio's login page.
@@ -180,9 +189,9 @@ function pumpio_connect()
 	if (($success = $client->Initialize())) {
 		if (($success = $client->Process())) {
 			if (strlen($client->access_token)) {
-				Logger::info('pumpio_connect: otoken: ' . $client->access_token . ', osecrect: ' . $client->access_token_secret);
-				DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'pumpio', 'oauth_token', $client->access_token);
-				DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'pumpio', 'oauth_token_secret', $client->access_token_secret);
+				Logger::log("pumpio_connect: otoken: ".$client->access_token." osecrect: ".$client->access_token_secret, Logger::DEBUG);
+				PConfig::set(local_user(), "pumpio", "oauth_token", $client->access_token);
+				PConfig::set(local_user(), "pumpio", "oauth_token_secret", $client->access_token_secret);
 			}
 		}
 		$success = $client->Finalize($success);
@@ -192,184 +201,235 @@ function pumpio_connect()
 	}
 
 	if ($success) {
-		Logger::notice('pumpio_connect: authenticated');
-		$o = DI::l10n()->t('You are now authenticated to pumpio.');
-		$o .= '<br /><a href="' . DI::baseUrl() . '/settings/connectors">' . DI::l10n()->t('return to the connector page') . '</a>';
+		Logger::log("pumpio_connect: authenticated");
+		$o = L10n::t("You are now authenticated to pumpio.");
+		$o .= '<br /><a href="'.$a->getBaseURL().'/settings/connectors">'.L10n::t("return to the connector page").'</a>';
 	} else {
-		Logger::notice('pumpio_connect: could not connect');
+		Logger::log("pumpio_connect: could not connect");
 		$o = 'Could not connect to pumpio. Refresh the page or try again later.';
 	}
 
 	return $o;
 }
 
-function pumpio_jot_nets(array &$jotnets_fields)
+function pumpio_jot_nets(App $a, array &$jotnets_fields)
 {
-	if (!DI::userSession()->getLocalUserId()) {
+	if (! local_user()) {
 		return;
 	}
 
-	if (DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'pumpio', 'post')) {
+	if (PConfig::get(local_user(), 'pumpio', 'post')) {
 		$jotnets_fields[] = [
 			'type' => 'checkbox',
 			'field' => [
 				'pumpio_enable',
-				DI::l10n()->t('Post to pumpio'),
-				DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'pumpio', 'post_by_default')
+				L10n::t('Post to pumpio'),
+				PConfig::get(local_user(), 'pumpio', 'post_by_default')
 			]
 		];
 	}
 }
 
-function pumpio_settings(array &$data)
+function pumpio_settings(App $a, &$s)
 {
-	if (!DI::userSession()->getLocalUserId()) {
+	if (!local_user()) {
 		return;
 	}
 
-	$pumpio_host        = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'pumpio', 'host');
-	$pumpio_user        = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'pumpio', 'user');
-	$oauth_token        = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'pumpio', 'oauth_token');
-	$oauth_token_secret = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'pumpio', 'oauth_token_secret');
+	/* Add our stylesheet to the page so we can make our settings look nice */
 
-	$import_enabled = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'pumpio', 'import', false);
-	$enabled        = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'pumpio', 'post', false);
-	$def_enabled    = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'pumpio', 'post_by_default', false);
-	$public_enabled = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'pumpio', 'public', false);
-	$mirror_enabled = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'pumpio', 'mirror', false);
+	$a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->getBaseURL() . '/addon/pumpio/pumpio.css' . '" media="all" />' . "\r\n";
 
-	$submit = ['pumpio-submit' => DI::l10n()->t('Save Settings')];
-	if ($oauth_token && $oauth_token_secret) {
-		$submit['pumpio-delete'] = DI::l10n()->t('Delete this preset');
+	/* Get the current state of our config variables */
+
+	$import_enabled = PConfig::get(local_user(), 'pumpio', 'import');
+	$import_checked = (($import_enabled) ? ' checked="checked" ' : '');
+
+	$enabled = PConfig::get(local_user(), 'pumpio', 'post');
+	$checked = (($enabled) ? ' checked="checked" ' : '');
+	$css = (($enabled) ? '' : '-disabled');
+
+	$def_enabled = PConfig::get(local_user(), 'pumpio', 'post_by_default');
+	$def_checked = (($def_enabled) ? ' checked="checked" ' : '');
+
+	$public_enabled = PConfig::get(local_user(), 'pumpio', 'public');
+	$public_checked = (($public_enabled) ? ' checked="checked" ' : '');
+
+	$mirror_enabled = PConfig::get(local_user(), 'pumpio', 'mirror');
+	$mirror_checked = (($mirror_enabled) ? ' checked="checked" ' : '');
+
+	$servername = PConfig::get(local_user(), "pumpio", "host");
+	$username = PConfig::get(local_user(), "pumpio", "user");
+
+	/* Add some HTML to the existing form */
+
+	$s .= '<span id="settings_pumpio_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_pumpio_expanded\'); openClose(\'settings_pumpio_inflated\');">';
+	$s .= '<img class="connector'.$css.'" src="images/pumpio.png" /><h3 class="connector">'. L10n::t('Pump.io Import/Export/Mirror').'</h3>';
+	$s .= '</span>';
+	$s .= '<div id="settings_pumpio_expanded" class="settings-block" style="display: none;">';
+	$s .= '<span class="fakelink" onclick="openClose(\'settings_pumpio_expanded\'); openClose(\'settings_pumpio_inflated\');">';
+	$s .= '<img class="connector'.$css.'" src="images/pumpio.png" /><h3 class="connector">'. L10n::t('Pump.io Import/Export/Mirror').'</h3>';
+	$s .= '</span>';
+
+	$s .= '<div id="pumpio-username-wrapper">';
+	$s .= '<label id="pumpio-username-label" for="pumpio-username">'.L10n::t('pump.io username (without the servername)').'</label>';
+	$s .= '<input id="pumpio-username" type="text" name="pumpio_user" value="'.$username.'" />';
+	$s .= '</div><div class="clear"></div>';
+
+	$s .= '<div id="pumpio-servername-wrapper">';
+	$s .= '<label id="pumpio-servername-label" for="pumpio-servername">'.L10n::t('pump.io servername (without "http://" or "https://" )').'</label>';
+	$s .= '<input id="pumpio-servername" type="text" name="pumpio_host" value="'.$servername.'" />';
+	$s .= '</div><div class="clear"></div>';
+
+	if (($username != '') && ($servername != '')) {
+		$oauth_token = PConfig::get(local_user(), "pumpio", "oauth_token");
+		$oauth_token_secret = PConfig::get(local_user(), "pumpio", "oauth_token_secret");
+
+		$s .= '<div id="pumpio-password-wrapper">';
+		if (($oauth_token == "") || ($oauth_token_secret == "")) {
+			$s .= '<div id="pumpio-authenticate-wrapper">';
+			$s .= '<a href="'.$a->getBaseURL().'/pumpio/connect">'.L10n::t("Authenticate your pump.io connection").'</a>';
+			$s .= '</div><div class="clear"></div>';
+		} else {
+			$s .= '<div id="pumpio-import-wrapper">';
+			$s .= '<label id="pumpio-import-label" for="pumpio-import">' . L10n::t('Import the remote timeline') . '</label>';
+			$s .= '<input id="pumpio-import" type="checkbox" name="pumpio_import" value="1" ' . $import_checked . '/>';
+			$s .= '</div><div class="clear"></div>';
+
+			$s .= '<div id="pumpio-enable-wrapper">';
+			$s .= '<label id="pumpio-enable-label" for="pumpio-checkbox">' . L10n::t('Enable pump.io Post Addon') . '</label>';
+			$s .= '<input id="pumpio-checkbox" type="checkbox" name="pumpio" value="1" ' . $checked . '/>';
+			$s .= '</div><div class="clear"></div>';
+
+			$s .= '<div id="pumpio-bydefault-wrapper">';
+			$s .= '<label id="pumpio-bydefault-label" for="pumpio-bydefault">' . L10n::t('Post to pump.io by default') . '</label>';
+			$s .= '<input id="pumpio-bydefault" type="checkbox" name="pumpio_bydefault" value="1" ' . $def_checked . '/>';
+			$s .= '</div><div class="clear"></div>';
+
+			$s .= '<div id="pumpio-public-wrapper">';
+			$s .= '<label id="pumpio-public-label" for="pumpio-public">' . L10n::t('Should posts be public?') . '</label>';
+			$s .= '<input id="pumpio-public" type="checkbox" name="pumpio_public" value="1" ' . $public_checked . '/>';
+			$s .= '</div><div class="clear"></div>';
+
+			$s .= '<div id="pumpio-mirror-wrapper">';
+			$s .= '<label id="pumpio-mirror-label" for="pumpio-mirror">' . L10n::t('Mirror all public posts') . '</label>';
+			$s .= '<input id="pumpio-mirror" type="checkbox" name="pumpio_mirror" value="1" ' . $mirror_checked . '/>';
+			$s .= '</div><div class="clear"></div>';
+
+			$s .= '<div id="pumpio-delete-wrapper">';
+			$s .= '<label id="pumpio-delete-label" for="pumpio-delete">' . L10n::t('Check to delete this preset') . '</label>';
+			$s .= '<input id="pumpio-delete" type="checkbox" name="pumpio_delete" value="1" />';
+			$s .= '</div><div class="clear"></div>';
+		}
+
+		$s .= '</div><div class="clear"></div>';
 	}
 
-	$t    = Renderer::getMarkupTemplate('connector_settings.tpl', 'addon/pumpio/');
-	$html = Renderer::replaceMacros($t, [
-		'$l10n'               => [
-			'authenticate' => DI::l10n()->t('Authenticate your pump.io connection'),
-		],
-		'$pumpio_host'        => $pumpio_host,
-		'$pumpio_user'        => $pumpio_user,
-		'$oauth_token'        => $oauth_token,
-		'$oauth_token_secret' => $oauth_token_secret,
-		'$authenticate_url'   => DI::baseUrl() . '/pumpio/connect',
-		'$servername'         => ['pumpio_host', DI::l10n()->t('Pump.io servername (without "http://" or "https://" )'), $pumpio_host],
-		'$username'           => ['pumpio_user', DI::l10n()->t('Pump.io username (without the servername)'), $pumpio_user],
-		'$import'             => ['pumpio_import', DI::l10n()->t('Import the remote timeline'), $import_enabled],
-		'$enabled'            => ['pumpio', DI::l10n()->t('Enable Pump.io Post Addon'), $enabled],
-		'$bydefault'          => ['pumpio_bydefault', DI::l10n()->t('Post to Pump.io by default'), $def_enabled],
-		'$public'             => ['pumpio_public', DI::l10n()->t('Should posts be public?'), $public_enabled],
-		'$mirror'             => ['pumpio_mirror', DI::l10n()->t('Mirror all public posts'), $mirror_enabled],
-	]);
+	/* provide a submit button */
 
-	$data = [
-		'connector' => 'pumpio',
-		'title'     => DI::l10n()->t('Pump.io Import/Export/Mirror'),
-		'image'     => 'images/pumpio.png',
-		'enabled'   => $enabled,
-		'html'      => $html,
-		'submit'    => $submit,
-	];
+	$s .= '<div class="settings-submit-wrapper" ><input type="submit" id="pumpio-submit" name="pumpio-submit" class="settings-submit" value="' . L10n::t('Save Settings') . '" /></div></div>';
 }
 
-function pumpio_settings_post(array &$b)
+function pumpio_settings_post(App $a, array &$b)
 {
-	if (!empty($_POST['pumpio_delete'])) {
-		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'pumpio', 'consumer_key'      , '');
-		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'pumpio', 'consumer_secret'   , '');
-		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'pumpio', 'oauth_token'       , '');
-		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'pumpio', 'oauth_token_secret', '');
-		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'pumpio', 'post'              , false);
-		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'pumpio', 'import'            , false);
-		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'pumpio', 'host'              , '');
-		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'pumpio', 'user'              , '');
-		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'pumpio', 'public'            , false);
-		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'pumpio', 'mirror'            , false);
-		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'pumpio', 'post_by_default'   , false);
-		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'pumpio', 'lastdate'          , 0);
-		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'pumpio', 'last_id'           , '');
-	} elseif (!empty($_POST['pumpio-submit'])) {
-		// filtering the username if it is filled wrong
-		$user = $_POST['pumpio_user'];
-		if (strstr($user, '@')) {
-			$pos = strpos($user, '@');
+	if (!empty($_POST['pumpio-submit'])) {
+		if (!empty($_POST['pumpio_delete'])) {
+			PConfig::set(local_user(), 'pumpio', 'consumer_key'      , '');
+			PConfig::set(local_user(), 'pumpio', 'consumer_secret'   , '');
+			PConfig::set(local_user(), 'pumpio', 'oauth_token'       , '');
+			PConfig::set(local_user(), 'pumpio', 'oauth_token_secret', '');
+			PConfig::set(local_user(), 'pumpio', 'post'              , false);
+			PConfig::set(local_user(), 'pumpio', 'import'            , false);
+			PConfig::set(local_user(), 'pumpio', 'host'              , '');
+			PConfig::set(local_user(), 'pumpio', 'user'              , '');
+			PConfig::set(local_user(), 'pumpio', 'public'            , false);
+			PConfig::set(local_user(), 'pumpio', 'mirror'            , false);
+			PConfig::set(local_user(), 'pumpio', 'post_by_default'   , false);
+			PConfig::set(local_user(), 'pumpio', 'lastdate'          , 0);
+			PConfig::set(local_user(), 'pumpio', 'last_id'           , '');
+		} else {
+			// filtering the username if it is filled wrong
+			$user = $_POST['pumpio_user'];
+			if (strstr($user, "@")) {
+				$pos = strpos($user, "@");
 
-			if ($pos > 0) {
-				$user = substr($user, 0, $pos);
+				if ($pos > 0) {
+					$user = substr($user, 0, $pos);
+				}
+			}
+
+			// Filtering the hostname if someone is entering it with "http"
+			$host = $_POST['pumpio_host'];
+			$host = trim($host);
+			$host = str_replace(["https://", "http://"], ["", ""], $host);
+
+			PConfig::set(local_user(), 'pumpio', 'post'           , $_POST['pumpio'] ?? false);
+			PConfig::set(local_user(), 'pumpio', 'import'         , $_POST['pumpio_import'] ?? false);
+			PConfig::set(local_user(), 'pumpio', 'host'           , $host);
+			PConfig::set(local_user(), 'pumpio', 'user'           , $user);
+			PConfig::set(local_user(), 'pumpio', 'public'         , $_POST['pumpio_public'] ?? false);
+			PConfig::set(local_user(), 'pumpio', 'mirror'         , $_POST['pumpio_mirror'] ?? false);
+			PConfig::set(local_user(), 'pumpio', 'post_by_default', $_POST['pumpio_bydefault'] ?? false);
+
+			if (!empty($_POST['pumpio_mirror'])) {
+				PConfig::delete(local_user(), 'pumpio', 'lastdate');
 			}
 		}
-
-		// Filtering the hostname if someone is entering it with "http"
-		$host = $_POST['pumpio_host'];
-		$host = trim($host);
-		$host = str_replace(['https://', 'http://'], ['', ''], $host);
-
-		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'pumpio', 'post'           , $_POST['pumpio'] ?? false);
-		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'pumpio', 'import'         , $_POST['pumpio_import'] ?? false);
-		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'pumpio', 'host'           , $host);
-		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'pumpio', 'user'           , $user);
-		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'pumpio', 'public'         , $_POST['pumpio_public'] ?? false);
-		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'pumpio', 'mirror'         , $_POST['pumpio_mirror'] ?? false);
-		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'pumpio', 'post_by_default', $_POST['pumpio_bydefault'] ?? false);
-
-		if (!empty($_POST['pumpio_mirror'])) {
-			DI::pConfig()->delete(DI::userSession()->getLocalUserId(), 'pumpio', 'lastdate');
-		}
 	}
 }
 
-function pumpio_load_config(ConfigFileManager $loader)
+function pumpio_load_config(App $a, ConfigFileLoader $loader)
 {
-	DI::app()->getConfigCache()->load($loader->loadAddonConfig('pumpio'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
+	$a->getConfigCache()->load($loader->loadAddonConfig('pumpio'));
 }
 
-function pumpio_hook_fork(array &$b)
+function pumpio_hook_fork(App $a, array &$b)
 {
-	if ($b['name'] != 'notifier_normal') {
-		return;
-	}
+        if ($b['name'] != 'notifier_normal') {
+                return;
+        }
 
-	$post = $b['data'];
+        $post = $b['data'];
 
-	// Deleting and editing is not supported by the addon (deleting could, but isn't by now)
-	if ($post['deleted'] || ($post['created'] !== $post['edited'])) {
-		$b['execute'] = false;
-		return;
-	}
+        // Deleting and editing is not supported by the addon (deleting could, but isn't by now)
+        if ($post['deleted'] || ($post['created'] !== $post['edited'])) {
+                $b['execute'] = false;
+                return;
+        }
 
-	// if post comes from pump.io don't send it back
-	if ($post['app'] == 'pump.io') {
-		$b['execute'] = false;
-		return;
-	}
+        // if post comes from pump.io don't send it back
+	if ($post['app'] == "pump.io") {
+                $b['execute'] = false;
+                return;
+        }
 
-	if (DI::pConfig()->get($post['uid'], 'pumpio', 'import')) {
-		// Don't fork if it isn't a reply to a pump.io post
-		if (($post['parent'] != $post['id']) && !Post::exists(['id' => $post['parent'], 'network' => Protocol::PUMPIO])) {
-			Logger::notice('No pump.io parent found for item ' . $post['id']);
-			$b['execute'] = false;
-			return;
-		}
-	} else {
-		// Comments are never exported when we don't import the pumpio timeline
-		if (!strstr($post['postopts'], 'pumpio') || ($post['parent'] != $post['id']) || $post['private']) {
-			$b['execute'] = false;
-			return;
-		}
-	}
+        if (PConfig::get($post['uid'], 'pumpio', 'import')) {
+                // Don't fork if it isn't a reply to a pump.io post
+                if (($post['parent'] != $post['id']) && !Item::exists(['id' => $post['parent'], 'network' => Protocol::PUMPIO])) {
+                        Logger::log('No pump.io parent found for item ' . $post['id']);
+                        $b['execute'] = false;
+                        return;
+                }
+        } else {
+                // Comments are never exported when we don't import the pumpio timeline
+                if (!strstr($post['postopts'], 'pumpio') || ($post['parent'] != $post['id']) || $post['private']) {
+                        $b['execute'] = false;
+                        return;
+                }
+        }
 }
 
-function pumpio_post_local(array &$b)
+function pumpio_post_local(App $a, array &$b)
 {
-	if (!DI::userSession()->getLocalUserId() || (DI::userSession()->getLocalUserId() != $b['uid'])) {
+	if (!local_user() || (local_user() != $b['uid'])) {
 		return;
 	}
 
-	$pumpio_post   = intval(DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'pumpio', 'post'));
+	$pumpio_post   = intval(PConfig::get(local_user(), 'pumpio', 'post'));
 
 	$pumpio_enable = (($pumpio_post && !empty($_REQUEST['pumpio_enable'])) ? intval($_REQUEST['pumpio_enable']) : 0);
 
-	if ($b['api_source'] && intval(DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'pumpio', 'post_by_default'))) {
+	if ($b['api_source'] && intval(PConfig::get(local_user(), 'pumpio', 'post_by_default'))) {
 		$pumpio_enable = 1;
 	}
 
@@ -384,23 +444,21 @@ function pumpio_post_local(array &$b)
 	$b['postopts'] .= 'pumpio';
 }
 
-function pumpio_send(array &$b)
+function pumpio_send(App $a, array &$b)
 {
-	if (!DI::pConfig()->get($b['uid'], 'pumpio', 'import') && ($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited']))) {
+	if (!PConfig::get($b["uid"], 'pumpio', 'import') && ($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited']))) {
 		return;
 	}
 
-	Logger::debug('pumpio_send: parameter ', $b);
-
-	$b['body'] = Post\Media::addAttachmentsToBody($b['uri-id'], DI::contentItem()->addSharedPost($b));
+	Logger::log("pumpio_send: parameter ".print_r($b, true), Logger::DATA);
 
 	if ($b['parent'] != $b['id']) {
 		// Looking if its a reply to a pumpio post
 		$condition = ['id' => $b['parent'], 'network' => Protocol::PUMPIO];
-		$orig_post = Post::selectFirst([], $condition);
+		$orig_post = Item::selectFirst([], $condition);
 
 		if (!DBA::isResult($orig_post)) {
-			Logger::notice('pumpio_send: no pumpio post ' . $b['parent']);
+			Logger::log("pumpio_send: no pumpio post ".$b["parent"]);
 			return;
 		} else {
 			$iscomment = true;
@@ -408,17 +466,17 @@ function pumpio_send(array &$b)
 	} else {
 		$iscomment = false;
 
-		$receiver = pumpio_getreceiver($b);
+		$receiver = pumpio_getreceiver($a, $b);
 
-		Logger::notice('pumpio_send: receiver ', $receiver);
+		Logger::log("pumpio_send: receiver ".print_r($receiver, true));
 
 		if (!count($receiver) && ($b['private'] || !strstr($b['postopts'], 'pumpio'))) {
 			return;
 		}
 
 		// Dont't post if the post doesn't belong to us.
-		// This is a check for group postings
-		$self = User::getOwnerDataById($b['uid']);
+		// This is a check for forum postings
+		$self = DBA::selectFirst('contact', ['id'], ['uid' => $b['uid'], 'self' => true]);
 		if ($b['contact-id'] != $self['id']) {
 			return;
 		}
@@ -426,9 +484,9 @@ function pumpio_send(array &$b)
 
 	if ($b['verb'] == Activity::LIKE) {
 		if ($b['deleted']) {
-			pumpio_action($b['uid'], $b['thr-parent'], 'unlike');
+			pumpio_action($a, $b["uid"], $b["thr-parent"], "unlike");
 		} else {
-			pumpio_action($b['uid'], $b['thr-parent'], 'like');
+			pumpio_action($a, $b["uid"], $b["thr-parent"], "like");
 		}
 		return;
 	}
@@ -438,11 +496,11 @@ function pumpio_send(array &$b)
 	}
 
 	if (($b['verb'] == Activity::POST) && ($b['created'] !== $b['edited']) && !$b['deleted']) {
-		pumpio_action($b['uid'], $b['uri'], 'update', $b['body']);
+		pumpio_action($a, $b["uid"], $b["uri"], "update", $b["body"]);
 	}
 
 	if (($b['verb'] == Activity::POST) && $b['deleted']) {
-		pumpio_action($b['uid'], $b['uri'], 'delete');
+		pumpio_action($a, $b["uid"], $b["uri"], "delete");
 	}
 
 	if ($b['deleted'] || ($b['created'] !== $b['edited'])) {
@@ -450,7 +508,7 @@ function pumpio_send(array &$b)
 	}
 
 	// if post comes from pump.io don't send it back
-	if ($b['app'] == 'pump.io') {
+	if ($b['app'] == "pump.io") {
 		return;
 	}
 
@@ -458,65 +516,63 @@ function pumpio_send(array &$b)
 	// Support for native shares
 	// http://<hostname>/api/<type>/shares?id=<the-object-id>
 
-	$oauth_token        = DI::pConfig()->get($b['uid'], 'pumpio', 'oauth_token');
-	$oauth_token_secret = DI::pConfig()->get($b['uid'], 'pumpio', 'oauth_token_secret');
-	$consumer_key       = DI::pConfig()->get($b['uid'], 'pumpio', 'consumer_key');
-	$consumer_secret    = DI::pConfig()->get($b['uid'], 'pumpio', 'consumer_secret');
+	$oauth_token = PConfig::get($b['uid'], "pumpio", "oauth_token");
+	$oauth_token_secret = PConfig::get($b['uid'], "pumpio", "oauth_token_secret");
+	$consumer_key = PConfig::get($b['uid'], "pumpio","consumer_key");
+	$consumer_secret = PConfig::get($b['uid'], "pumpio","consumer_secret");
 
-	$host   = DI::pConfig()->get($b['uid'], 'pumpio', 'host');
-	$user   = DI::pConfig()->get($b['uid'], 'pumpio', 'user');
-	$public = DI::pConfig()->get($b['uid'], 'pumpio', 'public');
+	$host = PConfig::get($b['uid'], "pumpio", "host");
+	$user = PConfig::get($b['uid'], "pumpio", "user");
+	$public = PConfig::get($b['uid'], "pumpio", "public");
 
 	if ($oauth_token && $oauth_token_secret) {
 		$title = trim($b['title']);
 
-		$content = BBCode::convertForUriId($b['uri-id'], $b['body'], BBCode::CONNECTORS);
+		$content = BBCode::convert($b['body'], false, 4);
 
 		$params = [];
 
-		$params['verb'] = 'post';
+		$params["verb"] = "post";
 
 		if (!$iscomment) {
-			$params['object'] = [
-				'objectType' => 'note',
+			$params["object"] = [
+				'objectType' => "note",
 				'content' => $content];
 
 			if (!empty($title)) {
-				$params['object']['displayName'] = $title;
+				$params["object"]["displayName"] = $title;
 			}
 
-			if (!empty($receiver['to'])) {
-				$params['to'] = $receiver['to'];
+			if (!empty($receiver["to"])) {
+				$params["to"] = $receiver["to"];
 			}
 
-			if (!empty($receiver['bto'])) {
-				$params['bto'] = $receiver['bto'];
+			if (!empty($receiver["bto"])) {
+				$params["bto"] = $receiver["bto"];
 			}
 
-			if (!empty($receiver['cc'])) {
-				$params['cc'] = $receiver['cc'];
+			if (!empty($receiver["cc"])) {
+				$params["cc"] = $receiver["cc"];
 			}
 
-			if (!empty($receiver['bcc'])) {
-				$params['bcc'] = $receiver['bcc'];
+			if (!empty($receiver["bcc"])) {
+				$params["bcc"] = $receiver["bcc"];
 			}
 		 } else {
-			$inReplyTo = [
-				'id' => $orig_post['uri'],
-				'objectType' => 'note',
-			];
+			$inReplyTo = ["id" => $orig_post["uri"],
+				"objectType" => "note"];
 
-			if (($orig_post['object-type'] != '') && (strstr($orig_post['object-type'], ActivityNamespace::ACTIVITY_SCHEMA))) {
-				$inReplyTo['objectType'] = str_replace(ActivityNamespace::ACTIVITY_SCHEMA, '', $orig_post['object-type']);
+			if (($orig_post["object-type"] != "") && (strstr($orig_post["object-type"], ActivityNamespace::ACTIVITY_SCHEMA))) {
+				$inReplyTo["objectType"] = str_replace(ActivityNamespace::ACTIVITY_SCHEMA, '', $orig_post["object-type"]);
 			}
 
-			$params['object'] = [
-				'objectType' => 'comment',
+			$params["object"] = [
+				'objectType' => "comment",
 				'content' => $content,
 				'inReplyTo' => $inReplyTo];
 
-			if ($title != '') {
-				$params['object']['displayName'] = $title;
+			if ($title != "") {
+				$params["object"]["displayName"] = $title;
 			}
 		}
 
@@ -529,75 +585,73 @@ function pumpio_send(array &$b)
 		$client->client_id = $consumer_key;
 		$client->client_secret = $consumer_secret;
 
-		$username = $user . '@' . $host;
-		$url = 'https://' . $host . '/api/user/' . $user . '/feed';
+		$username = $user.'@'.$host;
+		$url = 'https://'.$host.'/api/user/'.$user.'/feed';
 
 		if (pumpio_reachable($url)) {
-			$success = $client->CallAPI($url, 'POST', $params, ['FailOnAccessError' => true, 'RequestContentType' => 'application/json'], $user);
+			$success = $client->CallAPI($url, 'POST', $params, ['FailOnAccessError'=>true, 'RequestContentType'=>'application/json'], $user);
 		} else {
 			$success = false;
 		}
 
 		if ($success) {
 			if ($user->generator->displayName) {
-				DI::pConfig()->set($b['uid'], 'pumpio', 'application_name', $user->generator->displayName);
+				PConfig::set($b["uid"], "pumpio", "application_name", $user->generator->displayName);
 			}
 
 			$post_id = $user->object->id;
-			Logger::notice('pumpio_send ' . $username . ': success ' . $post_id);
+			Logger::log('pumpio_send '.$username.': success '.$post_id);
 			if ($post_id && $iscomment) {
-				Logger::notice('pumpio_send ' . $username . ': Update extid ' . $post_id . ' for post id ' . $b['id']);
+				Logger::log('pumpio_send '.$username.': Update extid '.$post_id." for post id ".$b['id']);
 				Item::update(['extid' => $post_id], ['id' => $b['id']]);
 			}
 		} else {
-			Logger::notice('pumpio_send '.$username.': '.$url.' general error: ' . print_r($user, true));
+			Logger::log('pumpio_send '.$username.': '.$url.' general error: ' . print_r($user, true));
 			Worker::defer();
 		}
 	}
 }
 
-function pumpio_action(int $uid, string $uri, string $action, string $content = '')
+function pumpio_action(App $a, $uid, $uri, $action, $content = "")
 {
 	// Don't do likes and other stuff if you don't import the timeline
-	if (!DI::pConfig()->get($uid, 'pumpio', 'import')) {
+	if (!PConfig::get($uid, 'pumpio', 'import')) {
 		return;
 	}
 
-	$ckey     = DI::pConfig()->get($uid, 'pumpio', 'consumer_key');
-	$csecret  = DI::pConfig()->get($uid, 'pumpio', 'consumer_secret');
-	$otoken   = DI::pConfig()->get($uid, 'pumpio', 'oauth_token');
-	$osecret  = DI::pConfig()->get($uid, 'pumpio', 'oauth_token_secret');
-	$hostname = DI::pConfig()->get($uid, 'pumpio', 'host');
-	$username = DI::pConfig()->get($uid, 'pumpio', 'user');
+	$ckey    = PConfig::get($uid, 'pumpio', 'consumer_key');
+	$csecret = PConfig::get($uid, 'pumpio', 'consumer_secret');
+	$otoken  = PConfig::get($uid, 'pumpio', 'oauth_token');
+	$osecret = PConfig::get($uid, 'pumpio', 'oauth_token_secret');
+	$hostname = PConfig::get($uid, 'pumpio', 'host');
+	$username = PConfig::get($uid, "pumpio", "user");
 
-	$orig_post = Post::selectFirst([], ['uri' => $uri, 'uid' => $uid]);
+	$orig_post = Item::selectFirst([], ['uri' => $uri, 'uid' => $uid]);
 
 	if (!DBA::isResult($orig_post)) {
 		return;
 	}
 
-	if ($orig_post['extid'] && !strstr($orig_post['extid'], '/proxy/')) {
-		$uri = $orig_post['extid'];
+	if ($orig_post["extid"] && !strstr($orig_post["extid"], "/proxy/")) {
+		$uri = $orig_post["extid"];
 	} else {
-		$uri = $orig_post['uri'];
+		$uri = $orig_post["uri"];
 	}
 
-	if (($orig_post['object-type'] != '') && (strstr($orig_post['object-type'], ActivityNamespace::ACTIVITY_SCHEMA))) {
-		$objectType = str_replace(ActivityNamespace::ACTIVITY_SCHEMA, '', $orig_post['object-type']);
-	} elseif (strstr($uri, '/api/comment/')) {
-		$objectType = 'comment';
-	} elseif (strstr($uri, '/api/note/')) {
-		$objectType = 'note';
-	} elseif (strstr($uri, '/api/image/')) {
-		$objectType = 'image';
+	if (($orig_post["object-type"] != "") && (strstr($orig_post["object-type"], ActivityNamespace::ACTIVITY_SCHEMA))) {
+		$objectType = str_replace(ActivityNamespace::ACTIVITY_SCHEMA, '', $orig_post["object-type"]);
+	} elseif (strstr($uri, "/api/comment/")) {
+		$objectType = "comment";
+	} elseif (strstr($uri, "/api/note/")) {
+		$objectType = "note";
+	} elseif (strstr($uri, "/api/image/")) {
+		$objectType = "image";
 	}
 
-	$params['verb'] = $action;
-	$params['object'] = [
-		'id' => $uri,
-		'objectType' => $objectType,
-		'content' => $content,
-	];
+	$params["verb"] = $action;
+	$params["object"] = ['id' => $uri,
+				"objectType" => $objectType,
+				"content" => $content];
 
 	$client = new oauth_client_class;
 	$client->oauth_version = '1.0a';
@@ -612,109 +666,116 @@ function pumpio_action(int $uid, string $uri, string $action, string $content =
 	$url = 'https://'.$hostname.'/api/user/'.$username.'/feed';
 
 	if (pumpio_reachable($url)) {
-		$success = $client->CallAPI($url, 'POST', $params, ['FailOnAccessError' => true, 'RequestContentType' => 'application/json'], $user);
+		$success = $client->CallAPI($url, 'POST', $params, ['FailOnAccessError'=>true, 'RequestContentType'=>'application/json'], $user);
 	} else {
 		$success = false;
 	}
 
 	if ($success) {
-		Logger::notice('pumpio_action '.$username.' '.$action.': success '.$uri);
+		Logger::log('pumpio_action '.$username.' '.$action.': success '.$uri);
 	} else {
-		Logger::notice('pumpio_action '.$username.' '.$action.': general error: '.$uri);
+		Logger::log('pumpio_action '.$username.' '.$action.': general error: '.$uri.' '.print_r($user, true));
 		Worker::defer();
 	}
 }
 
-function pumpio_sync()
+function pumpio_sync(App $a)
 {
-	if (!Addon::isEnabled('pumpio')) {
+	$r = q("SELECT * FROM `addon` WHERE `installed` = 1 AND `name` = 'pumpio'");
+
+	if (!DBA::isResult($r)) {
 		return;
 	}
 
-	$last = DI::keyValue()->get('pumpio_last_poll');
+	$last = Config::get('pumpio', 'last_poll');
 
-	$poll_interval = intval(DI::config()->get('pumpio', 'poll_interval', PUMPIO_DEFAULT_POLL_INTERVAL));
+	$poll_interval = intval(Config::get('pumpio', 'poll_interval', PUMPIO_DEFAULT_POLL_INTERVAL));
 
 	if ($last) {
 		$next = $last + ($poll_interval * 60);
 		if ($next > time()) {
-			Logger::notice('pumpio: poll intervall not reached');
+			Logger::log('pumpio: poll intervall not reached');
 			return;
 		}
 	}
-	Logger::notice('pumpio: cron_start');
+	Logger::log('pumpio: cron_start');
 
-	$pconfigs = DBA::selectToArray('pconfig', ['uid'], ['cat' => 'pumpio', 'k' => 'mirror', 'v' => '1']);
-	foreach ($pconfigs as $rr) {
-		Logger::notice('pumpio: mirroring user '.$rr['uid']);
-		pumpio_fetchtimeline($rr['uid']);
+	$r = q("SELECT * FROM `pconfig` WHERE `cat` = 'pumpio' AND `k` = 'mirror' AND `v` = '1' ORDER BY RAND() ");
+	if (DBA::isResult($r)) {
+		foreach ($r as $rr) {
+			Logger::log('pumpio: mirroring user '.$rr['uid']);
+			pumpio_fetchtimeline($a, $rr['uid']);
+		}
 	}
 
-	$abandon_days = intval(DI::config()->get('system', 'account_abandon_days'));
+	$abandon_days = intval(Config::get('system', 'account_abandon_days'));
 	if ($abandon_days < 1) {
 		$abandon_days = 0;
 	}
 
 	$abandon_limit = date(DateTimeFormat::MYSQL, time() - $abandon_days * 86400);
 
-	$pconfigs = DBA::selectToArray('pconfig', ['uid'], ['cat' => 'pumpio', 'k' => 'import', 'v' => '1']);
-	foreach ($pconfigs as $rr) {
-		if ($abandon_days != 0) {
-			if (DBA::exists('user', ["uid = ? AND `login_date` >= ?", $rr['uid'], $abandon_limit])) {
-				Logger::notice('abandoned account: timeline from user '.$rr['uid'].' will not be imported');
-				continue;
+	$r = q("SELECT * FROM `pconfig` WHERE `cat` = 'pumpio' AND `k` = 'import' AND `v` = '1' ORDER BY RAND() ");
+	if (DBA::isResult($r)) {
+		foreach ($r as $rr) {
+			if ($abandon_days != 0) {
+				$user = q("SELECT `login_date` FROM `user` WHERE uid=%d AND `login_date` >= '%s'", $rr['uid'], $abandon_limit);
+				if (!DBA::isResult($user)) {
+					Logger::log('abandoned account: timeline from user '.$rr['uid'].' will not be imported');
+					continue;
+				}
 			}
-		}
 
-		Logger::notice('pumpio: importing timeline from user '.$rr['uid']);
-		pumpio_fetchinbox($rr['uid']);
+			Logger::log('pumpio: importing timeline from user '.$rr['uid']);
+			pumpio_fetchinbox($a, $rr['uid']);
 
-		// check for new contacts once a day
-		$last_contact_check = DI::pConfig()->get($rr['uid'], 'pumpio', 'contact_check');
-		if ($last_contact_check) {
-			$next_contact_check = $last_contact_check + 86400;
-		} else {
-			$next_contact_check = 0;
-		}
+			// check for new contacts once a day
+			$last_contact_check = PConfig::get($rr['uid'], 'pumpio', 'contact_check');
+			if ($last_contact_check) {
+				$next_contact_check = $last_contact_check + 86400;
+			} else {
+				$next_contact_check = 0;
+			}
 
-		if ($next_contact_check <= time()) {
-			pumpio_getallusers($rr['uid']);
-			DI::pConfig()->set($rr['uid'], 'pumpio', 'contact_check', time());
+			if ($next_contact_check <= time()) {
+				pumpio_getallusers($a, $rr["uid"]);
+				PConfig::set($rr['uid'], 'pumpio', 'contact_check', time());
+			}
 		}
 	}
 
-	Logger::notice('pumpio: cron_end');
+	Logger::log('pumpio: cron_end');
 
-	DI::keyValue()->set('pumpio_last_poll', time());
+	Config::set('pumpio', 'last_poll', time());
 }
 
-function pumpio_cron($b)
+function pumpio_cron(App $a, $b)
 {
-	Worker::add(Worker::PRIORITY_MEDIUM, 'addon/pumpio/pumpio_sync.php');
+	Worker::add(PRIORITY_MEDIUM,"addon/pumpio/pumpio_sync.php");
 }
 
-function pumpio_fetchtimeline(int $uid)
+function pumpio_fetchtimeline(App $a, $uid)
 {
-	$ckey     = DI::pConfig()->get($uid, 'pumpio', 'consumer_key');
-	$csecret  = DI::pConfig()->get($uid, 'pumpio', 'consumer_secret');
-	$otoken   = DI::pConfig()->get($uid, 'pumpio', 'oauth_token');
-	$osecret  = DI::pConfig()->get($uid, 'pumpio', 'oauth_token_secret');
-	$lastdate = DI::pConfig()->get($uid, 'pumpio', 'lastdate');
-	$hostname = DI::pConfig()->get($uid, 'pumpio', 'host');
-	$username = DI::pConfig()->get($uid, 'pumpio', 'user');
+	$ckey    = PConfig::get($uid, 'pumpio', 'consumer_key');
+	$csecret = PConfig::get($uid, 'pumpio', 'consumer_secret');
+	$otoken  = PConfig::get($uid, 'pumpio', 'oauth_token');
+	$osecret = PConfig::get($uid, 'pumpio', 'oauth_token_secret');
+	$lastdate = PConfig::get($uid, 'pumpio', 'lastdate');
+	$hostname = PConfig::get($uid, 'pumpio', 'host');
+	$username = PConfig::get($uid, "pumpio", "user");
 
 	//  get the application name for the pump.io app
 	//  1st try personal config, then system config and fallback to the
 	//  hostname of the node if neither one is set.
-	$application_name  = DI::pConfig()->get($uid, 'pumpio', 'application_name');
-	if ($application_name == '') {
-		$application_name  = DI::config()->get('pumpio', 'application_name');
+	$application_name  = PConfig::get($uid, 'pumpio', 'application_name');
+	if ($application_name == "") {
+		$application_name  = Config::get('pumpio', 'application_name');
 	}
-	if ($application_name == '') {
-		$application_name = DI::baseUrl()->getHost();
+	if ($application_name == "") {
+		$application_name = $a->getHostName();
 	}
 
-	$first_time = ($lastdate == '');
+	$first_time = ($lastdate == "");
 
 	$client = new oauth_client_class;
 	$client->oauth_version = '1.0a';
@@ -728,19 +789,19 @@ function pumpio_fetchtimeline(int $uid)
 
 	$url = 'https://'.$hostname.'/api/user/'.$username.'/feed/major';
 
-	Logger::notice('pumpio: fetching for user ' . $uid . ' ' . $url . ' C:' . $client->client_id . ' CS:' . $client->client_secret . ' T:' . $client->access_token . ' TS:' . $client->access_token_secret);
+	Logger::log('pumpio: fetching for user '.$uid.' '.$url.' C:'.$client->client_id.' CS:'.$client->client_secret.' T:'.$client->access_token.' TS:'.$client->access_token_secret);
 
 	$useraddr = $username.'@'.$hostname;
 
 	if (pumpio_reachable($url)) {
-		$success = $client->CallAPI($url, 'GET', [], ['FailOnAccessError' => true], $user);
+		$success = $client->CallAPI($url, 'GET', [], ['FailOnAccessError'=>true], $user);
 	} else {
 		$success = false;
 		$user = [];
 	}
 
 	if (!$success) {
-		Logger::notice('pumpio: error fetching posts for user ' . $uid . ' ' . $useraddr . ' ', $user);
+		Logger::log('pumpio: error fetching posts for user '.$uid." ".$useraddr." ".print_r($user, true));
 		return;
 	}
 
@@ -773,54 +834,64 @@ function pumpio_fetchtimeline(int $uid)
 			}
 
 			$public = false;
-			foreach ($receiptians as $receiver) {
-				if (is_string($receiver->objectType) && ($receiver->id == 'http://activityschema.org/collection/public')) {
+			foreach ($receiptians AS $receiver) {
+				if (is_string($receiver->objectType) && ($receiver->id == "http://activityschema.org/collection/public")) {
 					$public = true;
 				}
 			}
 
 			if ($public && !stristr($post->generator->displayName, $application_name)) {
-				$postarray['uid'] = $uid;
-				$postarray['app'] = 'pump.io';
+				$_SESSION["authenticated"] = true;
+				$_SESSION["uid"] = $uid;
 
-				if ($post->object->displayName != '') {
-					$postarray['title'] = HTML::toBBCode($post->object->displayName);
-				} else {
-					$postarray['title'] = '';
+				unset($_REQUEST);
+				$_REQUEST["api_source"] = true;
+				$_REQUEST["profile_uid"] = $uid;
+				$_REQUEST["source"] = "pump.io";
+
+				if (isset($post->object->id)) {
+					$_REQUEST['message_id'] = Protocol::PUMPIO.":".$post->object->id;
 				}
 
-				$postarray['body'] = HTML::toBBCode($post->object->content);
+				if ($post->object->displayName != "") {
+					$_REQUEST["title"] = HTML::toBBCode($post->object->displayName);
+				} else {
+					$_REQUEST["title"] = "";
+				}
+
+				$_REQUEST["body"] = HTML::toBBCode($post->object->content);
 
 				// To-Do: Picture has to be cached and stored locally
-				if ($post->object->fullImage->url != '') {
-					if ($post->object->fullImage->pump_io->proxyURL != '') {
-						$postarray['body'] = '[url=' . $post->object->fullImage->pump_io->proxyURL . '][img]' . $post->object->image->pump_io->proxyURL . "[/img][/url]\n" . $postarray['body'];
+				if ($post->object->fullImage->url != "") {
+					if ($post->object->fullImage->pump_io->proxyURL != "") {
+						$_REQUEST["body"] = "[url=".$post->object->fullImage->pump_io->proxyURL."][img]".$post->object->image->pump_io->proxyURL."[/img][/url]\n".$_REQUEST["body"];
 					} else {
-						$postarray['body'] = '[url=' . $post->object->fullImage->url . '][img]' . $post->object->image->url . "[/img][/url]\n" . $postarray['body'];
+						$_REQUEST["body"] = "[url=".$post->object->fullImage->url."][img]".$post->object->image->url."[/img][/url]\n".$_REQUEST["body"];
 					}
 				}
 
-				Logger::notice('pumpio: posting for user ' . $uid);
+				Logger::log('pumpio: posting for user '.$uid);
 
-				Item::insert($postarray, true);
+				require_once('mod/item.php');
 
-				Logger::notice('pumpio: posting done - user ' . $uid);
+				item_post($a);
+				Logger::log('pumpio: posting done - user '.$uid);
 			}
 		}
 	}
 
 	if ($lastdate != 0) {
-		DI::pConfig()->set($uid, 'pumpio', 'lastdate', $lastdate);
+		PConfig::set($uid, 'pumpio', 'lastdate', $lastdate);
 	}
 }
 
-function pumpio_dounlike(int $uid, array $self, $post, string $own_id)
+function pumpio_dounlike(App $a, $uid, $self, $post, $own_id)
 {
 	// Searching for the unliked post
 	// Two queries for speed issues
-	$orig_post = Post::selectFirst([], ['uri' => $post->object->id, 'uid' => $uid]);
+	$orig_post = Item::selectFirst([], ['uri' => $post->object->id, 'uid' => $uid]);
 	if (!DBA::isResult($orig_post)) {
-		$orig_post = Post::selectFirst([], ['extid' => $post->object->id, 'uid' => $uid]);
+		$orig_post = Item::selectFirst([], ['extid' => $post->object->id, 'uid' => $uid]);
 		if (!DBA::isResult($orig_post)) {
 			return;
 		}
@@ -829,11 +900,15 @@ function pumpio_dounlike(int $uid, array $self, $post, string $own_id)
 	$contactid = 0;
 
 	if (Strings::compareLink($post->actor->url, $own_id)) {
-		$contactid = $self['id'];
+		$contactid = $self[0]['id'];
 	} else {
-		$contact = Contact::selectFirst([], ['nurl' => Strings::normaliseLink($post->actor->url), 'uid' => $uid, 'blocked' => false, 'readonly' => false]);
-		if (DBA::isResult($contact)) {
-			$contactid = $contact['id'];
+		$r = q("SELECT * FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d AND `blocked` = 0 AND `readonly` = 0 LIMIT 1",
+			DBA::escape(Strings::normaliseLink($post->actor->url)),
+			intval($uid)
+		);
+
+		if (DBA::isResult($r)) {
+			$contactid = $r[0]['id'];
 		}
 
 		if ($contactid == 0) {
@@ -841,27 +916,29 @@ function pumpio_dounlike(int $uid, array $self, $post, string $own_id)
 		}
 	}
 
-	Item::markForDeletion(['verb' => Activity::LIKE, 'uid' => $uid, 'contact-id' => $contactid, 'thr-parent' => $orig_post['uri']]);
+	Item::delete(['verb' => Activity::LIKE, 'uid' => $uid, 'contact-id' => $contactid, 'thr-parent' => $orig_post['uri']]);
 
-	if (DBA::isResult($contact)) {
-		Logger::notice('pumpio_dounlike: unliked existing like. User ' . $own_id . ' ' . $uid . ' Contact: ' . $contactid . ' URI ' . $orig_post['uri']);
+	if (DBA::isResult($r)) {
+		Logger::log("pumpio_dounlike: unliked existing like. User ".$own_id." ".$uid." Contact: ".$contactid." Url ".$orig_post['uri']);
 	} else {
-		Logger::notice('pumpio_dounlike: not found. User ' . $own_id . ' ' . $uid . ' Contact: ' . $contactid . ' Url ' . $orig_post['uri']);
+		Logger::log("pumpio_dounlike: not found. User ".$own_id." ".$uid." Contact: ".$contactid." Url ".$orig_post['uri']);
 	}
 }
 
-function pumpio_dolike(int $uid, array $self, $post, string $own_id, $threadcompletion = true)
+function pumpio_dolike(App $a, $uid, $self, $post, $own_id, $threadcompletion = true)
 {
+	require_once('include/items.php');
+
 	if (empty($post->object->id)) {
-		Logger::info('Got empty like: '.print_r($post, true));
+		Logger::log('Got empty like: '.print_r($post, true), Logger::DEBUG);
 		return;
 	}
 
 	// Searching for the liked post
 	// Two queries for speed issues
-	$orig_post = Post::selectFirst([], ['uri' => $post->object->id, 'uid' => $uid]);
+	$orig_post = Item::selectFirst([], ['uri' => $post->object->id, 'uid' => $uid]);
 	if (!DBA::isResult($orig_post)) {
-		$orig_post = Post::selectFirst([], ['extid' => $post->object->id, 'uid' => $uid]);
+		$orig_post = Item::selectFirst([], ['extid' => $post->object->id, 'uid' => $uid]);
 		if (!DBA::isResult($orig_post)) {
 			return;
 		}
@@ -869,20 +946,24 @@ function pumpio_dolike(int $uid, array $self, $post, string $own_id, $threadcomp
 
 	// thread completion
 	if ($threadcompletion) {
-		pumpio_fetchallcomments($uid, $post->object->id);
+		pumpio_fetchallcomments($a, $uid, $post->object->id);
 	}
 
 	$contactid = 0;
 
 	if (Strings::compareLink($post->actor->url, $own_id)) {
-		$contactid = $self['id'];
-		$post->actor->displayName = $self['name'];
-		$post->actor->url = $self['url'];
-		$post->actor->image->url = $self['photo'];
+		$contactid = $self[0]['id'];
+		$post->actor->displayName = $self[0]['name'];
+		$post->actor->url = $self[0]['url'];
+		$post->actor->image->url = $self[0]['photo'];
 	} else {
-		$contact = Contact::selectFirst([], ['nurl' => Strings::normaliseLink($post->actor->url), 'uid' => $uid, 'blocked' => false, 'readonly' => false]);
-		if (DBA::isResult($contact)) {
-			$contactid = $contact['id'];
+		$r = q("SELECT * FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d AND `blocked` = 0 AND `readonly` = 0 LIMIT 1",
+			DBA::escape(Strings::normaliseLink($post->actor->url)),
+			intval($uid)
+		);
+
+		if (DBA::isResult($r)) {
+			$contactid = $r[0]['id'];
 		}
 
 		if ($contactid == 0) {
@@ -890,27 +971,21 @@ function pumpio_dolike(int $uid, array $self, $post, string $own_id, $threadcomp
 		}
 	}
 
-	$condition = [
-		'verb' => Activity::LIKE,
-		'uid' => $uid,
-		'contact-id' => $contactid,
-		'thr-parent' => $orig_post['uri'],
-	];
-
-	if (Post::exists($condition)) {
-		Logger::notice('pumpio_dolike: found existing like. User ' . $own_id . ' ' . $uid . ' Contact: ' . $contactid . ' URI ' . $orig_post['uri']);
+	$condition = ['verb' => Activity::LIKE, 'uid' => $uid, 'contact-id' => $contactid, 'thr-parent' => $orig_post['uri']];
+	if (Item::exists($condition)) {
+		Logger::log("pumpio_dolike: found existing like. User ".$own_id." ".$uid." Contact: ".$contactid." Url ".$orig_post['uri']);
 		return;
 	}
 
 	$likedata = [];
 	$likedata['parent'] = $orig_post['id'];
 	$likedata['verb'] = Activity::LIKE;
-	$likedata['gravity'] = Item::GRAVITY_ACTIVITY;
+	$likedata['gravity'] = GRAVITY_ACTIVITY;
 	$likedata['uid'] = $uid;
 	$likedata['wall'] = 0;
 	$likedata['network'] = Protocol::PUMPIO;
-	$likedata['uri'] = Item::newURI();
-	$likedata['thr-parent'] = $orig_post['uri'];
+	$likedata['uri'] = Item::newURI($uid);
+	$likedata['parent-uri'] = $orig_post["uri"];
 	$likedata['contact-id'] = $contactid;
 	$likedata['app'] = $post->generator->displayName;
 	$likedata['author-name'] = $post->actor->displayName;
@@ -921,18 +996,18 @@ function pumpio_dolike(int $uid, array $self, $post, string $own_id, $threadcomp
 
 	$author  = '[url=' . $likedata['author-link'] . ']' . $likedata['author-name'] . '[/url]';
 	$objauthor =  '[url=' . $orig_post['author-link'] . ']' . $orig_post['author-name'] . '[/url]';
-	$post_type = DI::l10n()->t('status');
+	$post_type = L10n::t('status');
 	$plink = '[url=' . $orig_post['plink'] . ']' . $post_type . '[/url]';
 	$likedata['object-type'] = Activity\ObjectType::NOTE;
 
-	$likedata['body'] = DI::l10n()->t('%1$s likes %2$s\'s %3$s', $author, $objauthor, $plink);
+	$likedata['body'] = L10n::t('%1$s likes %2$s\'s %3$s', $author, $objauthor, $plink);
 
 	$likedata['object'] = '<object><type>' . Activity\ObjectType::NOTE . '</type><local>1</local>' .
 		'<id>' . $orig_post['uri'] . '</id><link>' . XML::escape('<link rel="alternate" type="text/html" href="' . XML::escape($orig_post['plink']) . '" />') . '</link><title>' . $orig_post['title'] . '</title><content>' . $orig_post['body'] . '</content></object>';
 
 	$ret = Item::insert($likedata);
 
-	Logger::notice('pumpio_dolike: ' . $ret . ' User ' . $own_id . ' ' . $uid . ' Contact: ' . $contactid . ' URI ' . $orig_post['uri']);
+	Logger::log("pumpio_dolike: ".$ret." User ".$own_id." ".$uid." Contact: ".$contactid." Url ".$orig_post['uri']);
 }
 
 function pumpio_get_contact($uid, $contact, $no_insert = false)
@@ -943,94 +1018,112 @@ function pumpio_get_contact($uid, $contact, $no_insert = false)
 		return $cid;
 	}
 
-	$r = Contact::selectFirst([], ['uid' => $uid, 'nurl' => Strings::normaliseLink($contact->url)]);
+	$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `nurl` = '%s' LIMIT 1",
+		intval($uid), DBA::escape(Strings::normaliseLink($contact->url)));
+
 	if (!DBA::isResult($r)) {
 		// create contact record
-		Contact::insert([
-			'uid'      => $uid,
-			'created'  => DateTimeFormat::utcNow(),
-			'url'      => $contact->url,
-			'nurl'     => Strings::normaliseLink($contact->url),
-			'addr'     => str_replace('acct:', '', $contact->id),
-			'alias'    => '',
-			'notify'   => $contact->id,
-			'poll'     => 'pump.io ' . $contact->id,
-			'name'     => $contact->displayName,
-			'nick'     => $contact->preferredUsername,
-			'photo'    => $contact->image->url,
-			'network'  => Protocol::PUMPIO,
-			'rel'      => Contact::FRIEND,
-			'priority' => 1,
-			'location' => $contact->location->displayName,
-			'about'    => $contact->summary,
-			'writable' => 1,
-			'blocked'  => 0,
-			'readonly' => 0,
-			'pending'  => 0
-		]);
+		q("INSERT INTO `contact` (`uid`, `created`, `url`, `nurl`, `addr`, `alias`, `notify`, `poll`,
+					`name`, `nick`, `photo`, `network`, `rel`, `priority`,
+					`location`, `about`, `writable`, `blocked`, `readonly`, `pending` )
+				VALUES (%d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', '%s', %d, 0, 0, 0)",
+			intval($uid),
+			DBA::escape(DateTimeFormat::utcNow()),
+			DBA::escape($contact->url),
+			DBA::escape(Strings::normaliseLink($contact->url)),
+			DBA::escape(str_replace("acct:", "", $contact->id)),
+			DBA::escape(''),
+			DBA::escape($contact->id), // What is it for?
+			DBA::escape('pump.io ' . $contact->id), // What is it for?
+			DBA::escape($contact->displayName),
+			DBA::escape($contact->preferredUsername),
+			DBA::escape($contact->image->url),
+			DBA::escape(Protocol::PUMPIO),
+			intval(Contact::FRIEND),
+			intval(1),
+			DBA::escape($contact->location->displayName),
+			DBA::escape($contact->summary),
+			intval(1)
+		);
+
+		$r = q("SELECT * FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d LIMIT 1",
+			DBA::escape(Strings::normaliseLink($contact->url)),
+			intval($uid)
+			);
 
-		$r = Contact::selectFirst([], ['uid' => $uid, 'nurl' => Strings::normaliseLink($contact->url)]);
 		if (!DBA::isResult($r)) {
 			return false;
 		}
 
-		$contact_id = $r['id'];
+		$contact_id = $r[0]['id'];
 
-		Circle::addMember(User::getDefaultCircle($uid), $contact_id);
+		Group::addMember(User::getDefaultGroup($uid), $contact_id);
 	} else {
-		$contact_id = $r['id'];
+		$contact_id = $r[0]["id"];
+
+		/*	if (DB_UPDATE_VERSION >= "1177")
+				q("UPDATE `contact` SET `location` = '%s',
+							`about` = '%s'
+						WHERE `id` = %d",
+					dbesc($contact->location->displayName),
+					dbesc($contact->summary),
+					intval($r[0]['id'])
+				);
+		*/
 	}
 
 	if (!empty($contact->image->url)) {
-		Contact::updateAvatar($contact_id, $contact->image->url);
+		Contact::updateAvatar($contact->image->url, $uid, $contact_id);
 	}
 
 	return $contact_id;
 }
 
-function pumpio_dodelete(int $uid, array $self, $post, string $own_id)
+function pumpio_dodelete(App $a, $uid, $self, $post, $own_id)
 {
 	// Two queries for speed issues
 	$condition = ['uri' => $post->object->id, 'uid' => $uid];
-	if (Post::exists($condition)) {
-		Item::markForDeletion($condition);
+	if (Item::exists($condition)) {
+		Item::delete($condition);
 		return true;
 	}
 
 	$condition = ['extid' => $post->object->id, 'uid' => $uid];
-	if (Post::exists($condition)) {
-		Item::markForDeletion($condition);
+	if (Item::exists($condition)) {
+		Item::delete($condition);
 		return true;
 	}
 	return false;
 }
 
-function pumpio_dopost($client, int $uid, array $self, $post, string $own_id, bool $threadcompletion = true)
+function pumpio_dopost(App $a, $client, $uid, $self, $post, $own_id, $threadcompletion = true)
 {
-	if (($post->verb == 'like') || ($post->verb == 'favorite')) {
-		return pumpio_dolike($uid, $self, $post, $own_id);
+	require_once('include/items.php');
+
+	if (($post->verb == "like") || ($post->verb == "favorite")) {
+		return pumpio_dolike($a, $uid, $self, $post, $own_id);
 	}
 
-	if (($post->verb == 'unlike') || ($post->verb == 'unfavorite')) {
-		return pumpio_dounlike($uid, $self, $post, $own_id);
+	if (($post->verb == "unlike") || ($post->verb == "unfavorite")) {
+		return pumpio_dounlike($a, $uid, $self, $post, $own_id);
 	}
 
-	if ($post->verb == 'delete') {
-		return pumpio_dodelete($uid, $self, $post, $own_id);
+	if ($post->verb == "delete") {
+		return pumpio_dodelete($a, $uid, $self, $post, $own_id);
 	}
 
-	if ($post->verb != 'update') {
+	if ($post->verb != "update") {
 		// Two queries for speed issues
-		if (Post::exists(['uri' => $post->object->id, 'uid' => $uid])) {
+		if (Item::exists(['uri' => $post->object->id, 'uid' => $uid])) {
 			return false;
 		}
-		if (Post::exists(['extid' => $post->object->id, 'uid' => $uid])) {
+		if (Item::exists(['extid' => $post->object->id, 'uid' => $uid])) {
 			return false;
 		}
 	}
 
 	// Only handle these three types
-	if (!strstr('post|share|update', $post->verb)) {
+	if (!strstr("post|share|update", $post->verb)) {
 		return false;
 	}
 
@@ -1045,8 +1138,8 @@ function pumpio_dopost($client, int $uid, array $self, $post, string $own_id, bo
 
 	$public = false;
 
-	foreach ($receiptians as $receiver) {
-		if (is_string($receiver->objectType) && ($receiver->id == 'http://activityschema.org/collection/public')) {
+	foreach ($receiptians AS $receiver) {
+		if (is_string($receiver->objectType) && ($receiver->id == "http://activityschema.org/collection/public")) {
 			$public = true;
 		}
 	}
@@ -1058,39 +1151,52 @@ function pumpio_dopost($client, int $uid, array $self, $post, string $own_id, bo
 	$postarray['uri'] = $post->object->id;
 	$postarray['object-type'] = ActivityNamespace::ACTIVITY_SCHEMA . strtolower($post->object->objectType);
 
-	if ($post->object->objectType != 'comment') {
+	if ($post->object->objectType != "comment") {
 		$contact_id = pumpio_get_contact($uid, $post->actor);
 
 		if (!$contact_id) {
-			$contact_id = $self['id'];
+			$contact_id = $self[0]['id'];
 		}
 
-		$postarray['thr-parent'] = $post->object->id;
+		$postarray['parent-uri'] = $post->object->id;
 
 		if (!$public) {
 			$postarray['private'] = 1;
-			$postarray['allow_cid'] = '<' . $self['id'] . '>';
+			$postarray['allow_cid'] = '<' . $self[0]['id'] . '>';
 		}
 	} else {
 		$contact_id = pumpio_get_contact($uid, $post->actor, true);
 
 		if (Strings::compareLink($post->actor->url, $own_id)) {
-			$contact_id = $self['id'];
-			$post->actor->displayName = $self['name'];
-			$post->actor->url = $self['url'];
-			$post->actor->image->url = $self['photo'];
+			$contact_id = $self[0]['id'];
+			$post->actor->displayName = $self[0]['name'];
+			$post->actor->url = $self[0]['url'];
+			$post->actor->image->url = $self[0]['photo'];
 		} elseif ($contact_id == 0) {
 			// Take an existing contact, the contact of the note or - as a fallback - the id of the user
-			$contact = Contact::selectFirst([], ['nurl' => Strings::normaliseLink($post->actor->url), 'uid' => $uid, 'blocked' => false, 'readonly' => false]);
-			if (DBA::isResult($contact)) {
-				$contact_id = $contact['id'];
+			$r = q("SELECT * FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d AND `blocked` = 0 AND `readonly` = 0 LIMIT 1",
+				DBA::escape(Strings::normaliseLink($post->actor->url)),
+				intval($uid)
+			);
+
+			if (DBA::isResult($r)) {
+				$contact_id = $r[0]['id'];
 			} else {
-				$contact_id = $self['id'];
+				$r = q("SELECT * FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d AND `blocked` = 0 AND `readonly` = 0 LIMIT 1",
+					DBA::escape(Strings::normaliseLink($post->actor->url)),
+					intval($uid)
+				);
+
+				if (DBA::isResult($r)) {
+					$contact_id = $r[0]['id'];
+				} else {
+					$contact_id = $self[0]['id'];
+				}
 			}
 		}
 
 		$reply = new stdClass;
-		$reply->verb = 'note';
+		$reply->verb = "note";
 
 		if (isset($post->cc)) {
 			$reply->cc = $post->cc;
@@ -1107,12 +1213,13 @@ function pumpio_dopost($client, int $uid, array $self, $post, string $own_id, bo
 		$reply->actor = $post->object->inReplyTo->author;
 		$reply->url = $post->object->inReplyTo->url;
 		$reply->generator = new stdClass;
-		$reply->generator->displayName = 'pumpio';
+		$reply->generator->displayName = "pumpio";
 		$reply->published = $post->object->inReplyTo->published;
 		$reply->received = $post->object->inReplyTo->updated;
-		pumpio_dopost($client, $uid, $self, $reply, $own_id, false);
+		$reply->url = $post->object->inReplyTo->url;
+		pumpio_dopost($a, $client, $uid, $self, $reply, $own_id, false);
 
-		$postarray['thr-parent'] = $post->object->inReplyTo->id;
+		$postarray['parent-uri'] = $post->object->inReplyTo->id;
 	}
 
 	// When there is no content there is no need to continue
@@ -1141,7 +1248,7 @@ function pumpio_dopost($client, int $uid, array $self, $post, string $own_id, bo
 	$postarray['object'] = json_encode($post);
 
 	if (!empty($post->object->fullImage->url)) {
-		$postarray['body'] = '[url=' . $post->object->fullImage->url . '][img]' . $post->object->image->url . "[/img][/url]\n" . $postarray['body'];
+		$postarray["body"] = "[url=".$post->object->fullImage->url."][img]".$post->object->image->url."[/img][/url]\n".$postarray["body"];
 	}
 
 	if (!empty($post->object->displayName)) {
@@ -1157,10 +1264,10 @@ function pumpio_dopost($client, int $uid, array $self, $post, string $own_id, bo
 		$postarray['edited'] = $postarray['created'];
 	}
 
-	if ($post->verb == 'share') {
-		if (isset($post->object->author->displayName) && ($post->object->author->displayName != '')) {
+	if ($post->verb == "share") {
+		if (isset($post->object->author->displayName) && ($post->object->author->displayName != "")) {
 			$share_author = $post->object->author->displayName;
-		} elseif (isset($post->object->author->preferredUsername) && ($post->object->author->preferredUsername != '')) {
+		} elseif (isset($post->object->author->preferredUsername) && ($post->object->author->preferredUsername != "")) {
 			$share_author = $post->object->author->preferredUsername;
 		} else {
 			$share_author = $post->object->author->url;
@@ -1172,55 +1279,56 @@ function pumpio_dopost($client, int $uid, array $self, $post, string $own_id, bo
 			$created = '';
 		}
 
-		$postarray['body'] = Friendica\Content\Text\BBCode::getShareOpeningTag($share_author, $post->object->author->url,
-						$post->object->author->image->url, $post->links->self->href, $created) .
-					$postarray['body'] . '[/share]';
+		$postarray['body'] = share_header($share_author, $post->object->author->url,
+						$post->object->author->image->url, "",
+						$created, $post->links->self->href).
+					$postarray['body']."[/share]";
 	}
 
-	if (trim($postarray['body']) == '') {
+	if (trim($postarray['body']) == "") {
 		return false;
 	}
 
 	$top_item = Item::insert($postarray);
-	$postarray['id'] = $top_item;
+	$postarray["id"] = $top_item;
 
-	if (($top_item == 0) && ($post->verb == 'update')) {
-		$fields = [
-			'title' => $postarray['title'],
-			'body' => $postarray['body'],
-			'changed' => $postarray['edited'],
-		];
-		$condition = ['uri' => $postarray['uri'], 'uid' => $uid];
+	if (($top_item == 0) && ($post->verb == "update")) {
+		$fields = ['title' => $postarray["title"], 'body' => $postarray["body"], 'changed' => $postarray["edited"]];
+		$condition = ['uri' => $postarray["uri"], 'uid' => $uid];
 		Item::update($fields, $condition);
 	}
 
-	if (($post->object->objectType == 'comment') && $threadcompletion) {
-		pumpio_fetchallcomments($uid, $postarray['thr-parent']);
+	if (($post->object->objectType == "comment") && $threadcompletion) {
+		pumpio_fetchallcomments($a, $uid, $postarray['parent-uri']);
 	}
 
 	return $top_item;
 }
 
-function pumpio_fetchinbox(int $uid)
+function pumpio_fetchinbox(App $a, $uid)
 {
-	$ckey     = DI::pConfig()->get($uid, 'pumpio', 'consumer_key');
-	$csecret  = DI::pConfig()->get($uid, 'pumpio', 'consumer_secret');
-	$otoken   = DI::pConfig()->get($uid, 'pumpio', 'oauth_token');
-	$osecret  = DI::pConfig()->get($uid, 'pumpio', 'oauth_token_secret');
-	$lastdate = DI::pConfig()->get($uid, 'pumpio', 'lastdate');
-	$hostname = DI::pConfig()->get($uid, 'pumpio', 'host');
-	$username = DI::pConfig()->get($uid, 'pumpio', 'user');
+	$ckey     = PConfig::get($uid, 'pumpio', 'consumer_key');
+	$csecret  = PConfig::get($uid, 'pumpio', 'consumer_secret');
+	$otoken   = PConfig::get($uid, 'pumpio', 'oauth_token');
+	$osecret  = PConfig::get($uid, 'pumpio', 'oauth_token_secret');
+	$lastdate = PConfig::get($uid, 'pumpio', 'lastdate');
+	$hostname = PConfig::get($uid, 'pumpio', 'host');
+	$username = PConfig::get($uid, "pumpio", "user");
 
-	$own_id = 'https://' . $hostname . '/' . $username;
+	$own_id = "https://".$hostname."/".$username;
 
-	$self = User::getOwnerDataById($uid);
+	$self = q("SELECT * FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1",
+		intval($uid));
 
-	$lastitems = DBA::p("SELECT `uri` FROM `post-thread-user`
-		INNER JOIN `post-view` ON `post-view`.`uri-id` = `post-thread-user`.`uri-id`
-		WHERE `post-thread-user`.`network` = ? AND `post-thread-user`.`uid` = ? AND `post-view`.`extid` != ''
-		ORDER BY `post-thread-user`.`commented` DESC LIMIT 10", Protocol::PUMPIO, $uid);
+	$lastitems = q("SELECT `uri` FROM `thread`
+			INNER JOIN `item` ON `item`.`id` = `thread`.`iid`
+			WHERE `thread`.`network` = '%s' AND `thread`.`uid` = %d AND `item`.`extid` != ''
+			ORDER BY `thread`.`commented` DESC LIMIT 10",
+				DBA::escape(Protocol::PUMPIO),
+				intval($uid)
+			);
 
-	$client = new oauth_client_class();
+	$client = new oauth_client_class;
 	$client->oauth_version = '1.0a';
 	$client->authorization_header = true;
 	$client->url_parameters = false;
@@ -1230,16 +1338,16 @@ function pumpio_fetchinbox(int $uid)
 	$client->access_token = $otoken;
 	$client->access_token_secret = $osecret;
 
-	$last_id = DI::pConfig()->get($uid, 'pumpio', 'last_id');
+	$last_id = PConfig::get($uid, 'pumpio', 'last_id');
 
 	$url = 'https://'.$hostname.'/api/user/'.$username.'/inbox';
 
-	if ($last_id != '') {
-		$url .= '?since=' . urlencode($last_id);
+	if ($last_id != "") {
+		$url .= '?since='.urlencode($last_id);
 	}
 
 	if (pumpio_reachable($url)) {
-		$success = $client->CallAPI($url, 'GET', [], ['FailOnAccessError' => true], $user);
+		$success = $client->CallAPI($url, 'GET', [], ['FailOnAccessError'=>true], $user);
 	} else {
 		$success = false;
 	}
@@ -1254,27 +1362,26 @@ function pumpio_fetchinbox(int $uid)
 		if (count($posts)) {
 			foreach ($posts as $post) {
 				$last_id = $post->id;
-				pumpio_dopost($client, $uid, $self, $post, $own_id, true);
+				pumpio_dopost($a, $client, $uid, $self, $post, $own_id, true);
 			}
 		}
 	}
 
-	while ($item = DBA::fetch($lastitems)) {
-		pumpio_fetchallcomments($uid, $item['uri']);
+	foreach ($lastitems as $item) {
+		pumpio_fetchallcomments($a, $uid, $item["uri"]);
 	}
-	DBA::close($lastitems);
 
-	DI::pConfig()->set($uid, 'pumpio', 'last_id', $last_id);
+	PConfig::set($uid, 'pumpio', 'last_id', $last_id);
 }
 
-function pumpio_getallusers(int $uid)
+function pumpio_getallusers(App &$a, $uid)
 {
-	$ckey     = DI::pConfig()->get($uid, 'pumpio', 'consumer_key');
-	$csecret  = DI::pConfig()->get($uid, 'pumpio', 'consumer_secret');
-	$otoken   = DI::pConfig()->get($uid, 'pumpio', 'oauth_token');
-	$osecret  = DI::pConfig()->get($uid, 'pumpio', 'oauth_token_secret');
-	$hostname = DI::pConfig()->get($uid, 'pumpio', 'host');
-	$username = DI::pConfig()->get($uid, 'pumpio', 'user');
+	$ckey     = PConfig::get($uid, 'pumpio', 'consumer_key');
+	$csecret  = PConfig::get($uid, 'pumpio', 'consumer_secret');
+	$otoken   = PConfig::get($uid, 'pumpio', 'oauth_token');
+	$osecret  = PConfig::get($uid, 'pumpio', 'oauth_token_secret');
+	$hostname = PConfig::get($uid, 'pumpio', 'host');
+	$username = PConfig::get($uid, "pumpio", "user");
 
 	$client = new oauth_client_class;
 	$client->oauth_version = '1.0a';
@@ -1286,7 +1393,7 @@ function pumpio_getallusers(int $uid)
 	$client->access_token = $otoken;
 	$client->access_token_secret = $osecret;
 
-	$url = 'https://' . $hostname . '/api/user/' . $username . '/following';
+	$url = 'https://'.$hostname.'/api/user/'.$username.'/following';
 
 	if (pumpio_reachable($url)) {
 		$success = $client->CallAPI($url, 'GET', [], ['FailOnAccessError' => true], $users);
@@ -1315,78 +1422,84 @@ function pumpio_getallusers(int $uid)
 	}
 }
 
-function pumpio_getreceiver(array $b)
+function pumpio_getreceiver(App $a, array $b)
 {
 	$receiver = [];
 
-	if (!$b['private']) {
+	if (!$b["private"]) {
 		if (!strstr($b['postopts'], 'pumpio')) {
 			return $receiver;
 		}
 
-		$public = DI::pConfig()->get($b['uid'], 'pumpio', 'public');
+		$public = PConfig::get($b['uid'], "pumpio", "public");
 
 		if ($public) {
-			$receiver['to'][] = [
-				'objectType' => 'collection',
-				'id' => 'http://activityschema.org/collection/public'
-			];
+			$receiver["to"][] = [
+						"objectType" => "collection",
+						"id" => "http://activityschema.org/collection/public"];
 		}
 	} else {
-		$cids = explode('><', $b['allow_cid']);
-		$gids = explode('><', $b['allow_gid']);
+		$cids = explode("><", $b["allow_cid"]);
+		$gids = explode("><", $b["allow_gid"]);
 
-		foreach ($cids as $cid) {
-			$cid = trim($cid, ' <>');
+		foreach ($cids AS $cid) {
+			$cid = trim($cid, " <>");
 
-			$contact = Contact::selectFirst(['name', 'nick', 'url'], ['id' => $cid, 'uid' => $b['uid'], 'network' => Protocol::PUMPIO, 'blocked' => false, 'readonly' => false]);
-			if (DBA::isResult($contact)) {
-				$receiver['bcc'][] = [
-					'displayName' => $contact['name'],
-					'objectType' => 'person',
-					'preferredUsername' => $contact['nick'],
-					'url' => $contact['url'],
-				];
+			$r = q("SELECT `name`, `nick`, `url` FROM `contact` WHERE `id` = %d AND `uid` = %d AND `network` = '%s' AND `blocked` = 0 AND `readonly` = 0 LIMIT 1",
+				intval($cid),
+				intval($b["uid"]),
+				DBA::escape(Protocol::PUMPIO)
+				);
+
+			if (DBA::isResult($r)) {
+				$receiver["bcc"][] = [
+							"displayName" => $r[0]["name"],
+							"objectType" => "person",
+							"preferredUsername" => $r[0]["nick"],
+							"url" => $r[0]["url"]];
 			}
 		}
-		foreach ($gids as $gid) {
-			$gid = trim($gid, ' <>');
+		foreach ($gids AS $gid) {
+			$gid = trim($gid, " <>");
 
-			$contacts = DBA::p("SELECT `contact`.`name`, `contact`.`nick`, `contact`.`url`, `contact`.`network`
-				FROM `group_member` AS `circle_member`, `contact` WHERE `circle_member`.`gid` = ?
-				AND `contact`.`id` = `circle_member`.`contact-id` AND `contact`.`network` = ?",
-				$gid, Protocol::PUMPIO);
+			$r = q("SELECT `contact`.`name`, `contact`.`nick`, `contact`.`url`, `contact`.`network` ".
+				"FROM `group_member`, `contact` WHERE `group_member`.`gid` = %d ".
+				"AND `contact`.`id` = `group_member`.`contact-id` AND `contact`.`network` = '%s'",
+					intval($gid),
+					DBA::escape(Protocol::PUMPIO)
+				);
 
-			while ($row = DBA::fetch($contacts)) {
-				$receiver['bcc'][] = [
-					'displayName' => $row['name'],
-					'objectType' => 'person',
-					'preferredUsername' => $row['nick'],
-					'url' => $row['url'],
-				];
-			}
-			DBA::close($contacts);
+			foreach ($r AS $row)
+				$receiver["bcc"][] = [
+							"displayName" => $row["name"],
+							"objectType" => "person",
+							"preferredUsername" => $row["nick"],
+							"url" => $row["url"]];
 		}
 	}
 
-	if ($b['inform'] != '') {
-		$inform = explode(',', $b['inform']);
+	if ($b["inform"] != "") {
+		$inform = explode(",", $b["inform"]);
 
-		foreach ($inform as $cid) {
-			if (substr($cid, 0, 4) != 'cid:') {
+		foreach ($inform AS $cid) {
+			if (substr($cid, 0, 4) != "cid:") {
 				continue;
 			}
 
-			$cid = str_replace('cid:', '', $cid);
+			$cid = str_replace("cid:", "", $cid);
 
-			$contact = Contact::selectFirst(['name', 'nick', 'url'], ['id' => $cid, 'uid' => $b['uid'], 'network' => Protocol::PUMPIO, 'blocked' => false, 'readonly' => false]);
-			if (DBA::isResult($contact)) {
-				$receiver['to'][] = [
-					'displayName' => $contact['name'],
-					'objectType' => 'person',
-					'preferredUsername' => $contact['nick'],
-					'url' => $contact['url'],
-				];
+			$r = q("SELECT `name`, `nick`, `url` FROM `contact` WHERE `id` = %d AND `uid` = %d AND `network` = '%s' AND `blocked` = 0 AND `readonly` = 0 LIMIT 1",
+				intval($cid),
+				intval($b["uid"]),
+				DBA::escape(Protocol::PUMPIO)
+				);
+
+			if (DBA::isResult($r)) {
+				$receiver["to"][] = [
+					"displayName" => $r[0]["name"],
+					"objectType" => "person",
+					"preferredUsername" => $r[0]["nick"],
+					"url" => $r[0]["url"]];
 			}
 		}
 	}
@@ -1394,29 +1507,30 @@ function pumpio_getreceiver(array $b)
 	return $receiver;
 }
 
-function pumpio_fetchallcomments($uid, $id)
+function pumpio_fetchallcomments(App $a, $uid, $id)
 {
-	$ckey     = DI::pConfig()->get($uid, 'pumpio', 'consumer_key');
-	$csecret  = DI::pConfig()->get($uid, 'pumpio', 'consumer_secret');
-	$otoken   = DI::pConfig()->get($uid, 'pumpio', 'oauth_token');
-	$osecret  = DI::pConfig()->get($uid, 'pumpio', 'oauth_token_secret');
-	$hostname = DI::pConfig()->get($uid, 'pumpio', 'host');
-	$username = DI::pConfig()->get($uid, 'pumpio', 'user');
+	$ckey     = PConfig::get($uid, 'pumpio', 'consumer_key');
+	$csecret  = PConfig::get($uid, 'pumpio', 'consumer_secret');
+	$otoken   = PConfig::get($uid, 'pumpio', 'oauth_token');
+	$osecret  = PConfig::get($uid, 'pumpio', 'oauth_token_secret');
+	$hostname = PConfig::get($uid, 'pumpio', 'host');
+	$username = PConfig::get($uid, "pumpio", "user");
 
-	Logger::notice('pumpio_fetchallcomments: completing comment for user ' . $uid . ' post id ' . $id);
+	Logger::log("pumpio_fetchallcomments: completing comment for user ".$uid." post id ".$id);
 
-	$own_id = 'https://' . $hostname . '/' . $username;
+	$own_id = "https://".$hostname."/".$username;
 
-	$self = User::getOwnerDataById($uid);
+	$self = q("SELECT * FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1",
+		intval($uid));
 
 	// Fetching the original post
 	$condition = ["`uri` = ? AND `uid` = ? AND `extid` != ''", $id, $uid];
-	$original = Post::selectFirst(['extid'], $condition);
-	if (!DBA::isResult($original)) {
+	$item = Item::selectFirst(['extid'], $condition);
+	if (!DBA::isResult($item)) {
 		return false;
 	}
 
-	$url = $original['extid'];
+	$url = $item["extid"];
 
 	$client = new oauth_client_class;
 	$client->oauth_version = '1.0a';
@@ -1428,10 +1542,10 @@ function pumpio_fetchallcomments($uid, $id)
 	$client->access_token = $otoken;
 	$client->access_token_secret = $osecret;
 
-	Logger::notice('pumpio_fetchallcomments: fetching comment for user ' . $uid . ', URL ' . $url);
+	Logger::log("pumpio_fetchallcomments: fetching comment for user ".$uid." url ".$url);
 
 	if (pumpio_reachable($url)) {
-		$success = $client->CallAPI($url, 'GET', [], ['FailOnAccessError' => true], $item);
+		$success = $client->CallAPI($url, 'GET', [], ['FailOnAccessError'=>true], $item);
 	} else {
 		$success = false;
 	}
@@ -1441,7 +1555,7 @@ function pumpio_fetchallcomments($uid, $id)
 	}
 
 	if ($item->likes->totalItems != 0) {
-		foreach ($item->likes->items as $post) {
+		foreach ($item->likes->items AS $post) {
 			$like = new stdClass;
 			$like->object = new stdClass;
 			$like->object->id = $item->id;
@@ -1453,8 +1567,8 @@ function pumpio_fetchallcomments($uid, $id)
 			//$like->actor->image = $item->image;
 			$like->actor->url = $item->url;
 			$like->generator = new stdClass;
-			$like->generator->displayName = 'pumpio';
-			pumpio_dolike($uid, $self, $post, $own_id, false);
+			$like->generator->displayName = "pumpio";
+			pumpio_dolike($a, $uid, $self, $post, $own_id, false);
 		}
 	}
 
@@ -1462,27 +1576,27 @@ function pumpio_fetchallcomments($uid, $id)
 		return;
 	}
 
-	foreach ($item->replies->items as $item) {
+	foreach ($item->replies->items AS $item) {
 		if ($item->id == $id) {
 			continue;
 		}
 
 		// Checking if the comment already exists - Two queries for speed issues
-		if (Post::exists(['uri' => $item->id, 'uid' => $uid])) {
+		if (Item::exists(['uri' => $item->id, 'uid' => $uid])) {
 			continue;
 		}
 
-		if (Post::exists(['extid' => $item->id, 'uid' => $uid])) {
+		if (Item::exists(['extid' => $item->id, 'uid' => $uid])) {
 			continue;
 		}
 
 		$post = new stdClass;
-		$post->verb = 'post';
+		$post->verb = "post";
 		$post->actor = $item->author;
 		$post->published = $item->published;
 		$post->received = $item->updated;
 		$post->generator = new stdClass;
-		$post->generator->displayName = 'pumpio';
+		$post->generator->displayName = "pumpio";
 		// To-Do: Check for public post
 
 		unset($item->author);
@@ -1491,14 +1605,14 @@ function pumpio_fetchallcomments($uid, $id)
 
 		$post->object = $item;
 
-		Logger::notice('pumpio_fetchallcomments: posting comment ' . $post->object->id . ' ', json_decode(json_encode($post), true));
-		pumpio_dopost($client, $uid, $self, $post, $own_id, false);
+		Logger::log("pumpio_fetchallcomments: posting comment ".$post->object->id." ".print_r($post, true));
+		pumpio_dopost($a, $client, $uid, $self, $post, $own_id, false);
 	}
 }
 
-function pumpio_reachable(string $url): bool
+function pumpio_reachable($url)
 {
-	return DI::httpClient()->get($url, HttpClientAccept::DEFAULT, [HttpClientOptions::TIMEOUT => 10])->isSuccess();
+	return Network::curl($url, false, ['timeout' => 10])->isSuccess();
 }
 
 /*
diff --git a/pumpio/pumpio_sync.php b/pumpio/pumpio_sync.php
index beaf6e81..de794ad6 100644
--- a/pumpio/pumpio_sync.php
+++ b/pumpio/pumpio_sync.php
@@ -1,17 +1,19 @@
 <?php
+use Friendica\Core\Config;
 use Friendica\Core\Logger;
-use Friendica\DI;
 
-function pumpio_sync_run(array $argv, int $argc) {
-	require_once 'addon/pumpio/pumpio.php';
+function pumpio_sync_run(&$argv, &$argc) {
+	$a = Friendica\BaseObject::getApp();
+
+	require_once("addon/pumpio/pumpio.php");
 
 	if (function_exists('sys_getloadavg')) {
 		$load = sys_getloadavg();
-		if (intval($load[0]) > DI::config()->get('system', 'maxloadavg', 50)) {
-			Logger::notice('system: load ' . $load[0] . ' too high. Pumpio sync deferred to next scheduled run.');
+		if (intval($load[0]) > Config::get('system', 'maxloadavg', 50)) {
+			Logger::log('system: load ' . $load[0] . ' too high. Pumpio sync deferred to next scheduled run.');
 			return;
 		}
 	}
 
-	pumpio_sync();
+	pumpio_sync($a);
 }
diff --git a/pumpio/templates/connector_settings.tpl b/pumpio/templates/connector_settings.tpl
deleted file mode 100644
index 6c688ad4..00000000
--- a/pumpio/templates/connector_settings.tpl
+++ /dev/null
@@ -1,13 +0,0 @@
-{{include file="field_input.tpl" field=$servername}}
-{{include file="field_input.tpl" field=$username}}
-
-{{if $oauth_token && $oauth_token_secret}}
-	{{include file="field_checkbox.tpl" field=$enabled}}
-	{{include file="field_checkbox.tpl" field=$bydefault}}
-	{{include file="field_checkbox.tpl" field=$public}}
-	{{include file="field_checkbox.tpl" field=$mirror}}
-{{elseif $pumpio_host && $pumpio_user}}
-	<div id="pumpio-authenticate-wrapper">
-		<a href="{{$authenticate_url}}">{{$l10n.authenticate}}</a>
-	</div>
-{{/if}}
diff --git a/qcomment/lang/C/messages.po b/qcomment/lang/C/messages.po
index 2c9ba17a..a55cd9ee 100644
--- a/qcomment/lang/C/messages.po
+++ b/qcomment/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:16-0500\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,28 +17,36 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: qcomment.php:45
+#: qcomment.php:51
 msgid ":-)"
 msgstr ""
 
-#: qcomment.php:45
+#: qcomment.php:51
 msgid ":-("
 msgstr ""
 
-#: qcomment.php:45
+#: qcomment.php:51
 msgid "lol"
 msgstr ""
 
-#: qcomment.php:49
+#: qcomment.php:54
+msgid "Quick Comment Settings"
+msgstr ""
+
+#: qcomment.php:56
 msgid ""
 "Quick comments are found near comment boxes, sometimes hidden. Click them to "
 "provide simple replies."
 msgstr ""
 
-#: qcomment.php:50
+#: qcomment.php:57
 msgid "Enter quick comments, one per line"
 msgstr ""
 
-#: qcomment.php:55
-msgid "Quick Comment Settings"
+#: qcomment.php:61
+msgid "Submit"
+msgstr ""
+
+#: qcomment.php:75
+msgid "Quick Comment settings saved."
 msgstr ""
diff --git a/qcomment/lang/ar/messages.po b/qcomment/lang/ar/messages.po
deleted file mode 100644
index fd79b460..00000000
--- a/qcomment/lang/ar/messages.po
+++ /dev/null
@@ -1,50 +0,0 @@
-# ADDON qcomment
-# Copyright (C)
-# This file is distributed under the same license as the Friendica qcomment addon package.
-# 
-# 
-# Translators:
-# Farida Khalaf <faridakhalaf@hotmail.com>, 2021
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2021-02-21 18:44+0000\n"
-"Last-Translator: Farida Khalaf <faridakhalaf@hotmail.com>\n"
-"Language-Team: Arabic (http://www.transifex.com/Friendica/friendica/language/ar/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ar\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-
-#: qcomment.php:42
-msgid ":-)"
-msgstr ""
-
-#: qcomment.php:42
-msgid ":-("
-msgstr ""
-
-#: qcomment.php:42
-msgid "lol"
-msgstr ""
-
-#: qcomment.php:47
-msgid "Quick Comment Settings"
-msgstr ""
-
-#: qcomment.php:48
-msgid ""
-"Quick comments are found near comment boxes, sometimes hidden. Click them to"
-" provide simple replies."
-msgstr ""
-
-#: qcomment.php:49
-msgid "Save Settings"
-msgstr "حفظ الإعدادات"
-
-#: qcomment.php:50
-msgid "Enter quick comments, one per line"
-msgstr ""
diff --git a/qcomment/lang/ar/strings.php b/qcomment/lang/ar/strings.php
deleted file mode 100644
index 285ad303..00000000
--- a/qcomment/lang/ar/strings.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_ar")) {
-function string_plural_select_ar($n){
-	$n = intval($n);
-	if ($n==0) { return 0; } else if ($n==1) { return 1; } else if ($n==2) { return 2; } else if ($n%100>=3 && $n%100<=10) { return 3; } else if ($n%100>=11 && $n%100<=99) { return 4; } else  { return 5; }
-}}
-$a->strings['Save Settings'] = 'حفظ الإعدادات';
diff --git a/qcomment/lang/cs/messages.po b/qcomment/lang/cs/messages.po
index deb0b4ec..d2a204e3 100644
--- a/qcomment/lang/cs/messages.po
+++ b/qcomment/lang/cs/messages.po
@@ -10,38 +10,46 @@ msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:16-0500\n"
-"PO-Revision-Date: 2014-06-23 12:30+0000\n"
-"Last-Translator: Aditoo, 2018\n"
-"Language-Team: Czech (http://app.transifex.com/Friendica/friendica/language/cs/)\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2018-06-13 18:00+0000\n"
+"Last-Translator: Aditoo\n"
+"Language-Team: Czech (http://www.transifex.com/Friendica/friendica/language/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: cs\n"
 "Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
 
-#: qcomment.php:45
+#: qcomment.php:51
 msgid ":-)"
 msgstr ":-)"
 
-#: qcomment.php:45
+#: qcomment.php:51
 msgid ":-("
 msgstr ":-("
 
-#: qcomment.php:45
+#: qcomment.php:51
 msgid "lol"
 msgstr "lol"
 
-#: qcomment.php:49
+#: qcomment.php:54
+msgid "Quick Comment Settings"
+msgstr "Nastavení rychlých komentářů"
+
+#: qcomment.php:56
 msgid ""
 "Quick comments are found near comment boxes, sometimes hidden. Click them to"
 " provide simple replies."
-msgstr "Rychlé komentáře jsou k nalezení blízko polí s komentáři, někdy jsou skryté. Klikněte na ně pro poskytnutí jednoduchých odpovědí."
+msgstr "Rychlé komentáře jsou k nalezení blízko polí s komentáři, někdy jsou skryté. Klikněte na ně k poskytnutí jednoduchých odpovědí."
 
-#: qcomment.php:50
+#: qcomment.php:57
 msgid "Enter quick comments, one per line"
 msgstr "Zadejte rychlé komentáře, každý na nový řádek"
 
-#: qcomment.php:55
-msgid "Quick Comment Settings"
-msgstr "Nastavení rychlých komentářů"
+#: qcomment.php:61
+msgid "Submit"
+msgstr "Odeslat"
+
+#: qcomment.php:75
+msgid "Quick Comment settings saved."
+msgstr "Nastavení Quick Comment uloženo."
diff --git a/qcomment/lang/cs/strings.php b/qcomment/lang/cs/strings.php
index 08df5fb4..b37a8d2b 100644
--- a/qcomment/lang/cs/strings.php
+++ b/qcomment/lang/cs/strings.php
@@ -3,11 +3,14 @@
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
 	$n = intval($n);
-	if (($n == 1 && $n % 1 == 0)) { return 0; } else if (($n >= 2 && $n <= 4 && $n % 1 == 0)) { return 1; } else if (($n % 1 != 0 )) { return 2; } else  { return 3; }
+	return ($n == 1 && $n % 1 == 0) ? 0 : ($n >= 2 && $n <= 4 && $n % 1 == 0) ? 1: ($n % 1 != 0 ) ? 2 : 3;;
 }}
-$a->strings[':-)'] = ':-)';
-$a->strings[':-('] = ':-(';
-$a->strings['lol'] = 'lol';
-$a->strings['Quick comments are found near comment boxes, sometimes hidden. Click them to provide simple replies.'] = 'Rychlé komentáře jsou k nalezení blízko polí s komentáři, někdy jsou skryté. Klikněte na ně pro poskytnutí jednoduchých odpovědí.';
-$a->strings['Enter quick comments, one per line'] = 'Zadejte rychlé komentáře, každý na nový řádek';
-$a->strings['Quick Comment Settings'] = 'Nastavení rychlých komentářů';
+;
+$a->strings[":-)"] = ":-)";
+$a->strings[":-("] = ":-(";
+$a->strings["lol"] = "lol";
+$a->strings["Quick Comment Settings"] = "Nastavení rychlých komentářů";
+$a->strings["Quick comments are found near comment boxes, sometimes hidden. Click them to provide simple replies."] = "Rychlé komentáře jsou k nalezení blízko polí s komentáři, někdy jsou skryté. Klikněte na ně k poskytnutí jednoduchých odpovědí.";
+$a->strings["Enter quick comments, one per line"] = "Zadejte rychlé komentáře, každý na nový řádek";
+$a->strings["Submit"] = "Odeslat";
+$a->strings["Quick Comment settings saved."] = "Nastavení Quick Comment uloženo.";
diff --git a/qcomment/lang/da-dk/messages.po b/qcomment/lang/da-dk/messages.po
deleted file mode 100644
index eb0fb707..00000000
--- a/qcomment/lang/da-dk/messages.po
+++ /dev/null
@@ -1,46 +0,0 @@
-# ADDON qcomment
-# Copyright (C)
-# This file is distributed under the same license as the Friendica qcomment addon package.
-# 
-# 
-# Translators:
-# Anton <dev@atjn.dk>, 2022
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:16-0500\n"
-"PO-Revision-Date: 2014-06-23 12:30+0000\n"
-"Last-Translator: Anton <dev@atjn.dk>, 2022\n"
-"Language-Team: Danish (Denmark) (http://www.transifex.com/Friendica/friendica/language/da_DK/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: da_DK\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: qcomment.php:45
-msgid ":-)"
-msgstr ":-)"
-
-#: qcomment.php:45
-msgid ":-("
-msgstr ":-("
-
-#: qcomment.php:45
-msgid "lol"
-msgstr "lol"
-
-#: qcomment.php:49
-msgid ""
-"Quick comments are found near comment boxes, sometimes hidden. Click them to"
-" provide simple replies."
-msgstr "Hurtige kommentarer kan findes ved kommentarboksene, nogle gange skjult. Klik på dem for at give simple svar."
-
-#: qcomment.php:50
-msgid "Enter quick comments, one per line"
-msgstr "Skriv hurtige kommentarer, én per linje"
-
-#: qcomment.php:55
-msgid "Quick Comment Settings"
-msgstr "Hurtige kommentarer Indstillinger"
diff --git a/qcomment/lang/da-dk/strings.php b/qcomment/lang/da-dk/strings.php
deleted file mode 100644
index abc07f2f..00000000
--- a/qcomment/lang/da-dk/strings.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_da_dk")) {
-function string_plural_select_da_dk($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings[':-)'] = ':-)';
-$a->strings[':-('] = ':-(';
-$a->strings['lol'] = 'lol';
-$a->strings['Quick comments are found near comment boxes, sometimes hidden. Click them to provide simple replies.'] = 'Hurtige kommentarer kan findes ved kommentarboksene, nogle gange skjult. Klik på dem for at give simple svar.';
-$a->strings['Enter quick comments, one per line'] = 'Skriv hurtige kommentarer, én per linje';
-$a->strings['Quick Comment Settings'] = 'Hurtige kommentarer Indstillinger';
diff --git a/qcomment/lang/de/messages.po b/qcomment/lang/de/messages.po
index bab1515f..772edfb0 100644
--- a/qcomment/lang/de/messages.po
+++ b/qcomment/lang/de/messages.po
@@ -4,45 +4,51 @@
 # 
 # 
 # Translators:
-# Steffen K9, 2021
-# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2014-2015
-# Ulf Rompe <transifex.com@rompe.org>, 2019
+# bavatar <tobias.diekershoff@gmx.net>, 2014-2015
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:16-0500\n"
-"PO-Revision-Date: 2014-06-23 12:30+0000\n"
-"Last-Translator: Steffen K9, 2021\n"
-"Language-Team: German (http://app.transifex.com/Friendica/friendica/language/de/)\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2015-07-28 05:48+0000\n"
+"Last-Translator: bavatar <tobias.diekershoff@gmx.net>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/friendica/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: qcomment.php:45
+#: qcomment.php:51
 msgid ":-)"
 msgstr ":-)"
 
-#: qcomment.php:45
+#: qcomment.php:51
 msgid ":-("
 msgstr ":-("
 
-#: qcomment.php:45
+#: qcomment.php:51
 msgid "lol"
 msgstr "lol"
 
-#: qcomment.php:49
+#: qcomment.php:54
+msgid "Quick Comment Settings"
+msgstr "Schnell-Kommentar Einstellungen"
+
+#: qcomment.php:56
 msgid ""
 "Quick comments are found near comment boxes, sometimes hidden. Click them to"
 " provide simple replies."
 msgstr "Kurz-Kommentare findet man in der Nähe der Kommentar-Boxen. Ein Klick darauf erstellt einfache Antworten."
 
-#: qcomment.php:50
+#: qcomment.php:57
 msgid "Enter quick comments, one per line"
 msgstr "Gib einen Schnell-Kommentar pro Zeile ein"
 
-#: qcomment.php:55
-msgid "Quick Comment Settings"
-msgstr "Schnell-Kommentar-Einstellungen"
+#: qcomment.php:61
+msgid "Submit"
+msgstr "Senden"
+
+#: qcomment.php:75
+msgid "Quick Comment settings saved."
+msgstr "Schnell-Kommentare Einstellungen gespeichert"
diff --git a/qcomment/lang/de/strings.php b/qcomment/lang/de/strings.php
index 15101302..09356851 100644
--- a/qcomment/lang/de/strings.php
+++ b/qcomment/lang/de/strings.php
@@ -2,12 +2,14 @@
 
 if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings[':-)'] = ':-)';
-$a->strings[':-('] = ':-(';
-$a->strings['lol'] = 'lol';
-$a->strings['Quick comments are found near comment boxes, sometimes hidden. Click them to provide simple replies.'] = 'Kurz-Kommentare findet man in der Nähe der Kommentar-Boxen. Ein Klick darauf erstellt einfache Antworten.';
-$a->strings['Enter quick comments, one per line'] = 'Gib einen Schnell-Kommentar pro Zeile ein';
-$a->strings['Quick Comment Settings'] = 'Schnell-Kommentar-Einstellungen';
+;
+$a->strings[":-)"] = ":-)";
+$a->strings[":-("] = ":-(";
+$a->strings["lol"] = "lol";
+$a->strings["Quick Comment Settings"] = "Schnell-Kommentar Einstellungen";
+$a->strings["Quick comments are found near comment boxes, sometimes hidden. Click them to provide simple replies."] = "Kurz-Kommentare findet man in der Nähe der Kommentar-Boxen. Ein Klick darauf erstellt einfache Antworten.";
+$a->strings["Enter quick comments, one per line"] = "Gib einen Schnell-Kommentar pro Zeile ein";
+$a->strings["Submit"] = "Senden";
+$a->strings["Quick Comment settings saved."] = "Schnell-Kommentare Einstellungen gespeichert";
diff --git a/qcomment/lang/es/messages.po b/qcomment/lang/es/messages.po
index 118ed4f9..ddf80128 100644
--- a/qcomment/lang/es/messages.po
+++ b/qcomment/lang/es/messages.po
@@ -5,14 +5,13 @@
 # 
 # Translators:
 # Albert, 2016
-# Senex Petrovic <javierruizo@hotmail.com>, 2021
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2021-04-06 02:03+0000\n"
-"Last-Translator: Senex Petrovic <javierruizo@hotmail.com>\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2016-11-17 22:22+0000\n"
+"Last-Translator: Albert\n"
 "Language-Team: Spanish (http://www.transifex.com/Friendica/friendica/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,32 +19,36 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: qcomment.php:42
+#: qcomment.php:51
 msgid ":-)"
 msgstr ":-)"
 
-#: qcomment.php:42
+#: qcomment.php:51
 msgid ":-("
 msgstr ":-("
 
-#: qcomment.php:42
+#: qcomment.php:51
 msgid "lol"
 msgstr "LOL"
 
-#: qcomment.php:47
+#: qcomment.php:54
 msgid "Quick Comment Settings"
 msgstr "Ajustes de Comentario Rápido"
 
-#: qcomment.php:48
+#: qcomment.php:56
 msgid ""
 "Quick comments are found near comment boxes, sometimes hidden. Click them to"
 " provide simple replies."
 msgstr "Los comentarios rápidos están junto a las cajas de comentario, a veces ocultos. Click sobre ellos para proveer respuestas simples."
 
-#: qcomment.php:49
-msgid "Save Settings"
-msgstr "Grabar ajustes"
-
-#: qcomment.php:50
+#: qcomment.php:57
 msgid "Enter quick comments, one per line"
 msgstr "Introducir comentarios rápidos, uno por línea"
+
+#: qcomment.php:61
+msgid "Submit"
+msgstr "Enviar"
+
+#: qcomment.php:75
+msgid "Quick Comment settings saved."
+msgstr "Ajustes de Comentario Rápido guardados."
diff --git a/qcomment/lang/es/strings.php b/qcomment/lang/es/strings.php
index db84fc1c..ce1e3bf1 100644
--- a/qcomment/lang/es/strings.php
+++ b/qcomment/lang/es/strings.php
@@ -2,13 +2,14 @@
 
 if(! function_exists("string_plural_select_es")) {
 function string_plural_select_es($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings[':-)'] = ':-)';
-$a->strings[':-('] = ':-(';
-$a->strings['lol'] = 'LOL';
-$a->strings['Quick Comment Settings'] = 'Ajustes de Comentario Rápido';
-$a->strings['Quick comments are found near comment boxes, sometimes hidden. Click them to provide simple replies.'] = 'Los comentarios rápidos están junto a las cajas de comentario, a veces ocultos. Click sobre ellos para proveer respuestas simples.';
-$a->strings['Save Settings'] = 'Grabar ajustes';
-$a->strings['Enter quick comments, one per line'] = 'Introducir comentarios rápidos, uno por línea';
+;
+$a->strings[":-)"] = ":-)";
+$a->strings[":-("] = ":-(";
+$a->strings["lol"] = "LOL";
+$a->strings["Quick Comment Settings"] = "Ajustes de Comentario Rápido";
+$a->strings["Quick comments are found near comment boxes, sometimes hidden. Click them to provide simple replies."] = "Los comentarios rápidos están junto a las cajas de comentario, a veces ocultos. Click sobre ellos para proveer respuestas simples.";
+$a->strings["Enter quick comments, one per line"] = "Introducir comentarios rápidos, uno por línea";
+$a->strings["Submit"] = "Enviar";
+$a->strings["Quick Comment settings saved."] = "Ajustes de Comentario Rápido guardados.";
diff --git a/qcomment/lang/fi-fi/strings.php b/qcomment/lang/fi-fi/strings.php
index f4ec581e..99c218b0 100644
--- a/qcomment/lang/fi-fi/strings.php
+++ b/qcomment/lang/fi-fi/strings.php
@@ -2,13 +2,14 @@
 
 if(! function_exists("string_plural_select_fi_fi")) {
 function string_plural_select_fi_fi($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings[':-)'] = ':-)';
-$a->strings[':-('] = ':-(';
-$a->strings['lol'] = 'lol';
-$a->strings['Quick Comment Settings'] = 'Quick Comment -asetukset';
-$a->strings['Enter quick comments, one per line'] = 'Syötä kommentit, yksi riviä kohden:';
-$a->strings['Submit'] = 'Lähetä';
-$a->strings['Quick Comment settings saved.'] = 'Quick Comment -asetukset tallennettu.';
+;
+$a->strings[":-)"] = ":-)";
+$a->strings[":-("] = ":-(";
+$a->strings["lol"] = "lol";
+$a->strings["Quick Comment Settings"] = "Quick Comment -asetukset";
+$a->strings["Quick comments are found near comment boxes, sometimes hidden. Click them to provide simple replies."] = "";
+$a->strings["Enter quick comments, one per line"] = "Syötä kommentit, yksi riviä kohden:";
+$a->strings["Submit"] = "Lähetä";
+$a->strings["Quick Comment settings saved."] = "Quick Comment -asetukset tallennettu.";
diff --git a/qcomment/lang/fr/messages.po b/qcomment/lang/fr/messages.po
deleted file mode 100644
index 0d02046f..00000000
--- a/qcomment/lang/fr/messages.po
+++ /dev/null
@@ -1,47 +0,0 @@
-# ADDON qcomment
-# Copyright (C)
-# This file is distributed under the same license as the Friendica qcomment addon package.
-# 
-# 
-# Translators:
-# Hypolite Petovan <hypolite@mrpetovan.com>, 2022
-# StefOfficiel <pichard.stephane@free.fr>, 2015
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:16-0500\n"
-"PO-Revision-Date: 2014-06-23 12:30+0000\n"
-"Last-Translator: Hypolite Petovan <hypolite@mrpetovan.com>, 2022\n"
-"Language-Team: French (http://www.transifex.com/Friendica/friendica/language/fr/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: fr\n"
-"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
-
-#: qcomment.php:45
-msgid ":-)"
-msgstr ":-)"
-
-#: qcomment.php:45
-msgid ":-("
-msgstr ":-("
-
-#: qcomment.php:45
-msgid "lol"
-msgstr "lol"
-
-#: qcomment.php:49
-msgid ""
-"Quick comments are found near comment boxes, sometimes hidden. Click them to"
-" provide simple replies."
-msgstr "Les Commentaires Rapides sont des suggestions de réponses simples disponibles autour des formulaires de commentaire."
-
-#: qcomment.php:50
-msgid "Enter quick comments, one per line"
-msgstr "Saisissez les Commentaires Rapides, un par ligne"
-
-#: qcomment.php:55
-msgid "Quick Comment Settings"
-msgstr "Paramètres de Commentaire Rapide"
diff --git a/qcomment/lang/fr/strings.php b/qcomment/lang/fr/strings.php
index 2c84924d..3e60c182 100644
--- a/qcomment/lang/fr/strings.php
+++ b/qcomment/lang/fr/strings.php
@@ -1,13 +1,10 @@
-<?php
-
-if(! function_exists("string_plural_select_fr")) {
-function string_plural_select_fr($n){
-	$n = intval($n);
-	if (($n == 0 || $n == 1)) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
-}}
-$a->strings[':-)'] = ':-)';
-$a->strings[':-('] = ':-(';
-$a->strings['lol'] = 'lol';
-$a->strings['Quick comments are found near comment boxes, sometimes hidden. Click them to provide simple replies.'] = 'Les Commentaires Rapides sont des suggestions de réponses simples disponibles autour des formulaires de commentaire.';
-$a->strings['Enter quick comments, one per line'] = 'Saisissez les Commentaires Rapides, un par ligne';
-$a->strings['Quick Comment Settings'] = 'Paramètres de Commentaire Rapide';
+<?php
+
+$a->strings[":-)"] = ":-)";
+$a->strings[":-("] = ":-(";
+$a->strings["lol"] = "mdr";
+$a->strings["Quick Comment Settings"] = "Réglages de Quick Comment";
+$a->strings["Quick comments are found near comment boxes, sometimes hidden. Click them to provide simple replies."] = "Les commentaires rapides peuvent être trouvés à proximité des boîtes de commentaire, parfois cachés. Cliquez dessus pour fournir des réponses simples et lapidaires.";
+$a->strings["Enter quick comments, one per line"] = "Entrez les réponses rapides, une par ligne";
+$a->strings["Submit"] = "Envoyer";
+$a->strings["Quick Comment settings saved."] = "Réglages de Quick Comment sauvés.";
diff --git a/qcomment/lang/hu/messages.po b/qcomment/lang/hu/messages.po
deleted file mode 100644
index 02177c78..00000000
--- a/qcomment/lang/hu/messages.po
+++ /dev/null
@@ -1,46 +0,0 @@
-# ADDON qcomment
-# Copyright (C)
-# This file is distributed under the same license as the Friendica qcomment addon package.
-# 
-# 
-# Translators:
-# Balázs Úr, 2020-2021
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:16-0500\n"
-"PO-Revision-Date: 2014-06-23 12:30+0000\n"
-"Last-Translator: Balázs Úr, 2020-2021\n"
-"Language-Team: Hungarian (http://www.transifex.com/Friendica/friendica/language/hu/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: hu\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: qcomment.php:45
-msgid ":-)"
-msgstr ":-)"
-
-#: qcomment.php:45
-msgid ":-("
-msgstr ":-("
-
-#: qcomment.php:45
-msgid "lol"
-msgstr "lol"
-
-#: qcomment.php:49
-msgid ""
-"Quick comments are found near comment boxes, sometimes hidden. Click them to"
-" provide simple replies."
-msgstr "A gyors hozzászólások a hozzászólásmezők közelében találhatók, néha rejtetten. Kattintson rájuk egyszerű válaszok küldéséhez."
-
-#: qcomment.php:50
-msgid "Enter quick comments, one per line"
-msgstr "Adja meg a gyors hozzászólásokat, soronként egyet"
-
-#: qcomment.php:55
-msgid "Quick Comment Settings"
-msgstr "Gyors hozzászólás beállításai"
diff --git a/qcomment/lang/hu/strings.php b/qcomment/lang/hu/strings.php
deleted file mode 100644
index 253f2dc8..00000000
--- a/qcomment/lang/hu/strings.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_hu")) {
-function string_plural_select_hu($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings[':-)'] = ':-)';
-$a->strings[':-('] = ':-(';
-$a->strings['lol'] = 'lol';
-$a->strings['Quick comments are found near comment boxes, sometimes hidden. Click them to provide simple replies.'] = 'A gyors hozzászólások a hozzászólásmezők közelében találhatók, néha rejtetten. Kattintson rájuk egyszerű válaszok küldéséhez.';
-$a->strings['Enter quick comments, one per line'] = 'Adja meg a gyors hozzászólásokat, soronként egyet';
-$a->strings['Quick Comment Settings'] = 'Gyors hozzászólás beállításai';
diff --git a/qcomment/lang/it/messages.po b/qcomment/lang/it/messages.po
index 2347a0dd..5772fcd2 100644
--- a/qcomment/lang/it/messages.po
+++ b/qcomment/lang/it/messages.po
@@ -5,43 +5,50 @@
 # 
 # Translators:
 # fabrixxm <fabrix.xm@gmail.com>, 2014-2015
-# Sylke Vicious <silkevicious@gmail.com>, 2021
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:16-0500\n"
-"PO-Revision-Date: 2014-06-23 12:30+0000\n"
-"Last-Translator: Sylke Vicious <silkevicious@gmail.com>, 2021\n"
-"Language-Team: Italian (http://app.transifex.com/Friendica/friendica/language/it/)\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2017-09-20 06:08+0000\n"
+"Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n"
+"Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: it\n"
-"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: qcomment.php:45
+#: qcomment.php:51
 msgid ":-)"
 msgstr ":-)"
 
-#: qcomment.php:45
+#: qcomment.php:51
 msgid ":-("
 msgstr ":-("
 
-#: qcomment.php:45
+#: qcomment.php:51
 msgid "lol"
 msgstr "lol"
 
-#: qcomment.php:49
+#: qcomment.php:54
+msgid "Quick Comment Settings"
+msgstr "Impostazioni commento rapido"
+
+#: qcomment.php:56
 msgid ""
 "Quick comments are found near comment boxes, sometimes hidden. Click them to"
 " provide simple replies."
 msgstr "Trovi i commenti rapidi vicino al box dei commenti, a volte nascosti. Cliccali per inviare semplici risposte."
 
-#: qcomment.php:50
+#: qcomment.php:57
 msgid "Enter quick comments, one per line"
 msgstr "Inserire un commento rapido, uno per linea"
 
-#: qcomment.php:55
-msgid "Quick Comment Settings"
-msgstr "Impostazioni commento rapido"
+#: qcomment.php:61
+msgid "Submit"
+msgstr "Invia"
+
+#: qcomment.php:75
+msgid "Quick Comment settings saved."
+msgstr "Impostazioni commento rapido salvate."
diff --git a/qcomment/lang/it/strings.php b/qcomment/lang/it/strings.php
index 26f8229a..059cb098 100644
--- a/qcomment/lang/it/strings.php
+++ b/qcomment/lang/it/strings.php
@@ -2,12 +2,14 @@
 
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
-	$n = intval($n);
-	if ($n == 1) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
+	return ($n != 1);;
 }}
-$a->strings[':-)'] = ':-)';
-$a->strings[':-('] = ':-(';
-$a->strings['lol'] = 'lol';
-$a->strings['Quick comments are found near comment boxes, sometimes hidden. Click them to provide simple replies.'] = 'Trovi i commenti rapidi vicino al box dei commenti, a volte nascosti. Cliccali per inviare semplici risposte.';
-$a->strings['Enter quick comments, one per line'] = 'Inserire un commento rapido, uno per linea';
-$a->strings['Quick Comment Settings'] = 'Impostazioni commento rapido';
+;
+$a->strings[":-)"] = ":-)";
+$a->strings[":-("] = ":-(";
+$a->strings["lol"] = "lol";
+$a->strings["Quick Comment Settings"] = "Impostazioni commento rapido";
+$a->strings["Quick comments are found near comment boxes, sometimes hidden. Click them to provide simple replies."] = "Trovi i commenti rapidi vicino al box dei commenti, a volte nascosti. Cliccali per inviare semplici risposte.";
+$a->strings["Enter quick comments, one per line"] = "Inserire un commento rapido, uno per linea";
+$a->strings["Submit"] = "Invia";
+$a->strings["Quick Comment settings saved."] = "Impostazioni commento rapido salvate.";
diff --git a/qcomment/lang/nl/strings.php b/qcomment/lang/nl/strings.php
index 5a1fefcb..647aae18 100644
--- a/qcomment/lang/nl/strings.php
+++ b/qcomment/lang/nl/strings.php
@@ -3,9 +3,14 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings[':-)'] = ':-)';
-$a->strings[':-('] = ':-(';
-$a->strings['Quick Comment Settings'] = 'Snelle reactie instellingen';
-$a->strings['Quick Comment settings saved.'] = 'Snelle Reactie instellingen opgeslagen';
+;
+$a->strings[":-)"] = ":-)";
+$a->strings[":-("] = ":-(";
+$a->strings["lol"] = "";
+$a->strings["Quick Comment Settings"] = "Snelle reactie instellingen";
+$a->strings["Quick comments are found near comment boxes, sometimes hidden. Click them to provide simple replies."] = "";
+$a->strings["Enter quick comments, one per line"] = "";
+$a->strings["Submit"] = "";
+$a->strings["Quick Comment settings saved."] = "Snelle Reactie instellingen opgeslagen";
diff --git a/qcomment/lang/pl/messages.po b/qcomment/lang/pl/messages.po
index c2e6dd98..7574a2c3 100644
--- a/qcomment/lang/pl/messages.po
+++ b/qcomment/lang/pl/messages.po
@@ -4,14 +4,14 @@
 # 
 # 
 # Translators:
-# Waldemar Stoczkowski, 2018
+# Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:16-0500\n"
-"PO-Revision-Date: 2014-06-23 12:30+0000\n"
-"Last-Translator: Waldemar Stoczkowski, 2018\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2018-03-31 20:01+0000\n"
+"Last-Translator: Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.com/Friendica/friendica/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,28 +19,36 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
-#: qcomment.php:45
+#: qcomment.php:51
 msgid ":-)"
 msgstr ":-)"
 
-#: qcomment.php:45
+#: qcomment.php:51
 msgid ":-("
 msgstr ":-("
 
-#: qcomment.php:45
+#: qcomment.php:51
 msgid "lol"
 msgstr "lol"
 
-#: qcomment.php:49
+#: qcomment.php:54
+msgid "Quick Comment Settings"
+msgstr "Ustawienia szybkiego komentowania"
+
+#: qcomment.php:56
 msgid ""
 "Quick comments are found near comment boxes, sometimes hidden. Click them to"
 " provide simple replies."
 msgstr "Szybkie komentarze znajdują się w pobliżu pól komentarza, czasami są ukryte. Kliknij je, aby zapewnić proste odpowiedzi."
 
-#: qcomment.php:50
+#: qcomment.php:57
 msgid "Enter quick comments, one per line"
-msgstr "Wprowadź szybkie komentarze, po jednym w wierszu"
+msgstr ""
 
-#: qcomment.php:55
-msgid "Quick Comment Settings"
-msgstr "Ustawienia szybkiego komentowania"
+#: qcomment.php:61
+msgid "Submit"
+msgstr "Wyślij"
+
+#: qcomment.php:75
+msgid "Quick Comment settings saved."
+msgstr "Zapisano szybkie ustawienia komentarzy."
diff --git a/qcomment/lang/pl/strings.php b/qcomment/lang/pl/strings.php
index d2cdf52c..20742b16 100644
--- a/qcomment/lang/pl/strings.php
+++ b/qcomment/lang/pl/strings.php
@@ -2,12 +2,14 @@
 
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
-	$n = intval($n);
-	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
+	return ($n==1 ? 0 : ($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14) ? 1 : $n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14) ? 2 : 3);;
 }}
-$a->strings[':-)'] = ':-)';
-$a->strings[':-('] = ':-(';
-$a->strings['lol'] = 'lol';
-$a->strings['Quick comments are found near comment boxes, sometimes hidden. Click them to provide simple replies.'] = 'Szybkie komentarze znajdują się w pobliżu pól komentarza, czasami są ukryte. Kliknij je, aby zapewnić proste odpowiedzi.';
-$a->strings['Enter quick comments, one per line'] = 'Wprowadź szybkie komentarze, po jednym w wierszu';
-$a->strings['Quick Comment Settings'] = 'Ustawienia szybkiego komentowania';
+;
+$a->strings[":-)"] = ":-)";
+$a->strings[":-("] = ":-(";
+$a->strings["lol"] = "lol";
+$a->strings["Quick Comment Settings"] = "Ustawienia szybkiego komentowania";
+$a->strings["Quick comments are found near comment boxes, sometimes hidden. Click them to provide simple replies."] = "Szybkie komentarze znajdują się w pobliżu pól komentarza, czasami są ukryte. Kliknij je, aby zapewnić proste odpowiedzi.";
+$a->strings["Enter quick comments, one per line"] = "";
+$a->strings["Submit"] = "Wyślij";
+$a->strings["Quick Comment settings saved."] = "Zapisano szybkie ustawienia komentarzy.";
diff --git a/qcomment/lang/pt-br/strings.php b/qcomment/lang/pt-br/strings.php
index 7710e8a6..87f7a76e 100644
--- a/qcomment/lang/pt-br/strings.php
+++ b/qcomment/lang/pt-br/strings.php
@@ -2,14 +2,14 @@
 
 if(! function_exists("string_plural_select_pt_br")) {
 function string_plural_select_pt_br($n){
-	$n = intval($n);
-	return intval($n > 1);
+	return ($n > 1);;
 }}
-$a->strings[':-)'] = ':-)';
-$a->strings[':-('] = ':-(';
-$a->strings['lol'] = 'lol';
-$a->strings['Quick Comment Settings'] = 'Configurações de Comentários Rápidos';
-$a->strings['Quick comments are found near comment boxes, sometimes hidden. Click them to provide simple replies.'] = 'Comentários rápidos são encontrados próximo às caixas de comentários, algumas vezes ocultos. Clique neles para dar respostas simples.';
-$a->strings['Enter quick comments, one per line'] = 'Insira comentários rápidos, um em cada linha';
-$a->strings['Submit'] = 'Enviar';
-$a->strings['Quick Comment settings saved.'] = 'As configurações de comentários rápidos foram salvas.';
+;
+$a->strings[":-)"] = ":-)";
+$a->strings[":-("] = ":-(";
+$a->strings["lol"] = "lol";
+$a->strings["Quick Comment Settings"] = "Configurações de Comentários Rápidos";
+$a->strings["Quick comments are found near comment boxes, sometimes hidden. Click them to provide simple replies."] = "Comentários rápidos são encontrados próximo às caixas de comentários, algumas vezes ocultos. Clique neles para dar respostas simples.";
+$a->strings["Enter quick comments, one per line"] = "Insira comentários rápidos, um em cada linha";
+$a->strings["Submit"] = "Enviar";
+$a->strings["Quick Comment settings saved."] = "As configurações de comentários rápidos foram salvas.";
diff --git a/qcomment/lang/ro/strings.php b/qcomment/lang/ro/strings.php
index 791f4e7f..65b9a5d4 100644
--- a/qcomment/lang/ro/strings.php
+++ b/qcomment/lang/ro/strings.php
@@ -2,14 +2,14 @@
 
 if(! function_exists("string_plural_select_ro")) {
 function string_plural_select_ro($n){
-	$n = intval($n);
-	if ($n==1) { return 0; } else if ((($n%100>19)||(($n%100==0)&&($n!=0)))) { return 2; } else  { return 1; }
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
 }}
-$a->strings[':-)'] = ':-)';
-$a->strings[':-('] = ':-(';
-$a->strings['lol'] = 'lol';
-$a->strings['Quick Comment Settings'] = 'Configurări Comentariu Rapid';
-$a->strings['Quick comments are found near comment boxes, sometimes hidden. Click them to provide simple replies.'] = 'Comentariile rapide se regăsesc lângă casetele comentariilor, uneori ascunse. Apăsați pe ele pentru a posta răspunsuri simple.';
-$a->strings['Enter quick comments, one per line'] = 'Introduceți cometarii rapide, câte unul pe linie:';
-$a->strings['Save Settings'] = 'Salvare Configurări';
-$a->strings['Quick Comment settings saved.'] = 'Configurările pentru Comentariu Rapid au fost salvate.';
+;
+$a->strings[":-)"] = ":-)";
+$a->strings[":-("] = ":-(";
+$a->strings["lol"] = "lol";
+$a->strings["Quick Comment Settings"] = "Configurări Comentariu Rapid";
+$a->strings["Quick comments are found near comment boxes, sometimes hidden. Click them to provide simple replies."] = "Comentariile rapide se regăsesc lângă casetele comentariilor, uneori ascunse. Apăsați pe ele pentru a posta răspunsuri simple.";
+$a->strings["Enter quick comments, one per line"] = "Introduceți cometarii rapide, câte unul pe linie:";
+$a->strings["Save Settings"] = "Salvare Configurări";
+$a->strings["Quick Comment settings saved."] = "Configurările pentru Comentariu Rapid au fost salvate.";
diff --git a/qcomment/lang/ru/messages.po b/qcomment/lang/ru/messages.po
deleted file mode 100644
index 53e086df..00000000
--- a/qcomment/lang/ru/messages.po
+++ /dev/null
@@ -1,54 +0,0 @@
-# ADDON qcomment
-# Copyright (C)
-# This file is distributed under the same license as the Friendica qcomment addon package.
-# 
-# 
-# Translators:
-# Alexander An <ravnina@gmail.com>, 2020
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-27 05:01-0500\n"
-"PO-Revision-Date: 2020-04-23 14:31+0000\n"
-"Last-Translator: Alexander An <ravnina@gmail.com>\n"
-"Language-Team: Russian (http://www.transifex.com/Friendica/friendica/language/ru/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ru\n"
-"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
-
-#: qcomment.php:51
-msgid ":-)"
-msgstr ":-)"
-
-#: qcomment.php:51
-msgid ":-("
-msgstr ":-("
-
-#: qcomment.php:51
-msgid "lol"
-msgstr "lol"
-
-#: qcomment.php:54
-msgid "Quick Comment Settings"
-msgstr "Настройки быстрых комментариев"
-
-#: qcomment.php:56
-msgid ""
-"Quick comments are found near comment boxes, sometimes hidden. Click them to"
-" provide simple replies."
-msgstr "Быстрые комментарии находятся рядом с полями комментариев, иногда они скрыты. Нажмите на них, чтобы использовать готовые ответы."
-
-#: qcomment.php:57
-msgid "Enter quick comments, one per line"
-msgstr "Введите быстрые комментарии, по одному на строку"
-
-#: qcomment.php:61
-msgid "Submit"
-msgstr "Добавить"
-
-#: qcomment.php:75
-msgid "Quick Comment settings saved."
-msgstr "Настройки сохранены."
diff --git a/qcomment/lang/ru/strings.php b/qcomment/lang/ru/strings.php
index 66dbaa78..5ccbcd7d 100644
--- a/qcomment/lang/ru/strings.php
+++ b/qcomment/lang/ru/strings.php
@@ -1,15 +1,10 @@
-<?php
-
-if(! function_exists("string_plural_select_ru")) {
-function string_plural_select_ru($n){
-	$n = intval($n);
-	if ($n%10==1 && $n%100!=11) { return 0; } else if ($n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14)) { return 1; } else if ($n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)) { return 2; } else  { return 3; }
-}}
-$a->strings[':-)'] = ':-)';
-$a->strings[':-('] = ':-(';
-$a->strings['lol'] = 'lol';
-$a->strings['Quick Comment Settings'] = 'Настройки быстрых комментариев';
-$a->strings['Quick comments are found near comment boxes, sometimes hidden. Click them to provide simple replies.'] = 'Быстрые комментарии находятся рядом с полями комментариев, иногда они скрыты. Нажмите на них, чтобы использовать готовые ответы.';
-$a->strings['Enter quick comments, one per line'] = 'Введите быстрые комментарии, по одному на строку';
-$a->strings['Submit'] = 'Добавить';
-$a->strings['Quick Comment settings saved.'] = 'Настройки сохранены.';
+<?php
+
+$a->strings[":-)"] = ":-)";
+$a->strings[":-("] = ":-(";
+$a->strings["lol"] = "lol";
+$a->strings["Quick Comment Settings"] = "";
+$a->strings["Quick comments are found near comment boxes, sometimes hidden. Click them to provide simple replies."] = "";
+$a->strings["Enter quick comments, one per line"] = "Введите короткие комментарии, по одному в строке:";
+$a->strings["Submit"] = "Подтвердить";
+$a->strings["Quick Comment settings saved."] = "";
diff --git a/qcomment/lang/sv/messages.po b/qcomment/lang/sv/messages.po
deleted file mode 100644
index ba5ede7b..00000000
--- a/qcomment/lang/sv/messages.po
+++ /dev/null
@@ -1,46 +0,0 @@
-# ADDON qcomment
-# Copyright (C)
-# This file is distributed under the same license as the Friendica qcomment addon package.
-# 
-# 
-# Translators:
-# Kristoffer Grundström <lovaren@gmail.com>, 2022
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:16-0500\n"
-"PO-Revision-Date: 2022-01-16 00:51+0000\n"
-"Last-Translator: Kristoffer Grundström <lovaren@gmail.com>\n"
-"Language-Team: Swedish (http://www.transifex.com/Friendica/friendica/language/sv/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: sv\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: qcomment.php:45
-msgid ":-)"
-msgstr ":-)"
-
-#: qcomment.php:45
-msgid ":-("
-msgstr ":-("
-
-#: qcomment.php:45
-msgid "lol"
-msgstr "lol"
-
-#: qcomment.php:49
-msgid ""
-"Quick comments are found near comment boxes, sometimes hidden. Click them to"
-" provide simple replies."
-msgstr ""
-
-#: qcomment.php:50
-msgid "Enter quick comments, one per line"
-msgstr ""
-
-#: qcomment.php:55
-msgid "Quick Comment Settings"
-msgstr ""
diff --git a/qcomment/lang/sv/strings.php b/qcomment/lang/sv/strings.php
index faa250cb..3ec569a7 100644
--- a/qcomment/lang/sv/strings.php
+++ b/qcomment/lang/sv/strings.php
@@ -1,10 +1,3 @@
-<?php
-
-if(! function_exists("string_plural_select_sv")) {
-function string_plural_select_sv($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings[':-)'] = ':-)';
-$a->strings[':-('] = ':-(';
-$a->strings['lol'] = 'lol';
+<?php
+
+$a->strings["Submit"] = "Spara";
diff --git a/qcomment/qcomment.css b/qcomment/qcomment.css
new file mode 100644
index 00000000..3e5513bb
--- /dev/null
+++ b/qcomment/qcomment.css
@@ -0,0 +1,19 @@
+
+#qcomment-label {
+	float: left;
+	width: 300px;
+	margin-top: 10px;
+}
+
+#qcomment-words {
+	float: left;
+	margin-top: 10px;
+	width: 100px;
+	height: 150px;
+
+}
+
+#qcomment-submit {
+	margin-top: 15px;
+}
+
diff --git a/qcomment/qcomment.js b/qcomment/qcomment.js
deleted file mode 100644
index 1f5c3496..00000000
--- a/qcomment/qcomment.js
+++ /dev/null
@@ -1,18 +0,0 @@
-function qCommentInsert(obj, id)
-{
-	let $textarea = $('#comment-edit-text-' + id);
-
-	if ($textarea.val() === '') {
-		$textarea.addClass('comment-edit-text-full');
-		$textarea.removeClass('comment-edit-text-empty');
-		openMenu('comment-edit-submit-wrapper-' + id);
-	}
-
-	var ins = $(obj).val();
-	ins = ins.replace('&lt;', '<');
-	ins = ins.replace('&gt;', '>');
-	ins = ins.replace('&amp;', '&');
-	ins = ins.replace('&quot;', '"');
-	$textarea.val($textarea.val() + ins);
-	$(obj).val('');
-}
diff --git a/qcomment/qcomment.php b/qcomment/qcomment.php
index 1b8bfcbf..7c5e0358 100644
--- a/qcomment/qcomment.php
+++ b/qcomment/qcomment.php
@@ -17,53 +17,57 @@
  * them to open the comment window fully and insert the qcomment. Then "Submit" will submit it.
  *
  */
-
-use Friendica\App;
 use Friendica\Core\Hook;
-use Friendica\Core\Renderer;
-use Friendica\DI;
+use Friendica\Core\L10n;
+use Friendica\Core\PConfig;
 use Friendica\Util\XML;
 
-function qcomment_install()
-{
-	Hook::register('addon_settings'     , __FILE__, 'qcomment_addon_settings');
-	Hook::register('addon_settings_post', __FILE__, 'qcomment_addon_settings_post');
-	Hook::register('footer'             , __FILE__, 'qcomment_footer');
+function qcomment_install() {
+	Hook::register('addon_settings', 'addon/qcomment/qcomment.php', 'qcomment_addon_settings');
+	Hook::register('addon_settings_post', 'addon/qcomment/qcomment.php', 'qcomment_addon_settings_post');
+
 }
 
-function qcomment_footer(string &$body)
-{
-	DI::page()->registerFooterScript('addon/qcomment/qcomment.js');
+function qcomment_uninstall() {
+	Hook::unregister('addon_settings', 'addon/qcomment/qcomment.php', 'qcomment_addon_settings');
+	Hook::unregister('addon_settings_post', 'addon/qcomment/qcomment.php', 'qcomment_addon_settings_post');
+
 }
 
-function qcomment_addon_settings(array &$data)
+function qcomment_addon_settings(&$a, &$s)
 {
-	if (!DI::userSession()->getLocalUserId()) {
+	if (! local_user()) {
 		return;
 	}
 
-	$words = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'qcomment', 'words', DI::l10n()->t(':-)') . "\n" . DI::l10n()->t(':-(') . "\n" . DI::l10n()->t('lol'));
+	/* Add our stylesheet to the page so we can make our settings look nice */
 
-	$t    = Renderer::getMarkupTemplate('settings.tpl', 'addon/qcomment/');
-	$html = Renderer::replaceMacros($t, [
-		'$description' => DI::l10n()->t('Quick comments are found near comment boxes, sometimes hidden. Click them to provide simple replies.'),
-		'$words'       => ['qcomment-words', DI::l10n()->t('Enter quick comments, one per line'), $words, null, ' rows="10"'],
-	]);
+	$a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->getBaseURL() . '/addon/qcomment/qcomment.css' . '" media="all" />' . "\r\n";
 
-	$data = [
-		'addon' => 'qcomment',
-		'title' => DI::l10n()->t('Quick Comment Settings'),
-		'html'  => $html,
-	];
+	$words = PConfig::get(local_user(), 'qcomment', 'words', L10n::t(':-)') . "\n" . L10n::t(':-(') . "\n" .  L10n::t('lol'));
+
+	$s .= '<div class="settings-block">';
+	$s .= '<h3>' . L10n::t('Quick Comment Settings') . '</h3>';
+	$s .= '<div id="qcomment-wrapper">';
+	$s .= '<div id="qcomment-desc">' . L10n::t("Quick comments are found near comment boxes, sometimes hidden. Click them to provide simple replies.") . '</div>';
+	$s .= '<label id="qcomment-label" for="qcomment-words">' . L10n::t('Enter quick comments, one per line') . ' </label>';
+	$s .= '<textarea id="qcomment-words" type="text" name="qcomment-words" >' . htmlspecialchars(XML::unescape($words)) . '</textarea>';
+	$s .= '</div><div class="clear"></div>';
+
+	$s .= '<div class="settings-submit-wrapper" ><input type="submit" id="qcomment-submit" name="qcomment-submit" class="settings-submit" value="' . L10n::t('Save Settings') . '" /></div>';
+	$s .= '</div>';
+
+	return;
 }
 
-function qcomment_addon_settings_post(array &$b)
+function qcomment_addon_settings_post(&$a, &$b)
 {
-	if (!DI::userSession()->getLocalUserId()) {
+	if (! local_user()) {
 		return;
 	}
 
-	if (isset($_POST['qcomment-words'])) {
-		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'qcomment', 'words', XML::escape($_POST['qcomment-words']));
+	if ($_POST['qcomment-submit']) {
+		PConfig::set(local_user(), 'qcomment', 'words', XML::escape($_POST['qcomment-words']));
+		info(L10n::t('Quick Comment settings saved.') . EOL);
 	}
 }
diff --git a/qcomment/templates/settings.tpl b/qcomment/templates/settings.tpl
deleted file mode 100644
index a9bf0d2e..00000000
--- a/qcomment/templates/settings.tpl
+++ /dev/null
@@ -1,2 +0,0 @@
-<p>{{$description}}</p>
-{{include file="field_textarea.tpl" field=$words}}
diff --git a/randplace/lang/C/messages.po b/randplace/lang/C/messages.po
index e1a95548..3d2ed587 100644
--- a/randplace/lang/C/messages.po
+++ b/randplace/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:16-0500\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,10 +17,14 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: randplace.php:161
+#: randplace.php:169
+msgid "Randplace Settings"
+msgstr ""
+
+#: randplace.php:171
 msgid "Enable Randplace Addon"
 msgstr ""
 
-#: randplace.php:166
-msgid "Randplace Settings"
+#: randplace.php:177
+msgid "Submit"
 msgstr ""
diff --git a/randplace/lang/ar/messages.po b/randplace/lang/ar/messages.po
deleted file mode 100644
index d6002362..00000000
--- a/randplace/lang/ar/messages.po
+++ /dev/null
@@ -1,32 +0,0 @@
-# ADDON randplace
-# Copyright (C)
-# This file is distributed under the same license as the Friendica randplace addon package.
-# 
-# 
-# Translators:
-# Farida Khalaf <faridakhalaf@hotmail.com>, 2021
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2021-02-22 02:47+0000\n"
-"Last-Translator: Farida Khalaf <faridakhalaf@hotmail.com>\n"
-"Language-Team: Arabic (http://www.transifex.com/Friendica/friendica/language/ar/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ar\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-
-#: randplace.php:166
-msgid "Randplace Settings"
-msgstr "إعدادات Randplace "
-
-#: randplace.php:168
-msgid "Enable Randplace Addon"
-msgstr "تمكين ملحق Randplace"
-
-#: randplace.php:174
-msgid "Save Settings"
-msgstr "حفظ الإعدادات"
diff --git a/randplace/lang/ar/strings.php b/randplace/lang/ar/strings.php
deleted file mode 100644
index b3512277..00000000
--- a/randplace/lang/ar/strings.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_ar")) {
-function string_plural_select_ar($n){
-	$n = intval($n);
-	if ($n==0) { return 0; } else if ($n==1) { return 1; } else if ($n==2) { return 2; } else if ($n%100>=3 && $n%100<=10) { return 3; } else if ($n%100>=11 && $n%100<=99) { return 4; } else  { return 5; }
-}}
-$a->strings['Randplace Settings'] = 'إعدادات Randplace ';
-$a->strings['Enable Randplace Addon'] = 'تمكين ملحق Randplace';
-$a->strings['Save Settings'] = 'حفظ الإعدادات';
diff --git a/randplace/lang/cs/strings.php b/randplace/lang/cs/strings.php
index 23f74a6b..1095d55f 100644
--- a/randplace/lang/cs/strings.php
+++ b/randplace/lang/cs/strings.php
@@ -3,8 +3,9 @@
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
 	$n = intval($n);
-	if (($n == 1 && $n % 1 == 0)) { return 0; } else if (($n >= 2 && $n <= 4 && $n % 1 == 0)) { return 1; } else if (($n % 1 != 0 )) { return 2; } else  { return 3; }
+	return ($n == 1 && $n % 1 == 0) ? 0 : ($n >= 2 && $n <= 4 && $n % 1 == 0) ? 1: ($n % 1 != 0 ) ? 2 : 3;;
 }}
-$a->strings['Randplace Settings'] = 'Randplace Nastavení';
-$a->strings['Enable Randplace Addon'] = 'Povolit doplněk Randplace';
-$a->strings['Submit'] = 'Odeslat';
+;
+$a->strings["Randplace Settings"] = "Randplace Nastavení";
+$a->strings["Enable Randplace Addon"] = "Povolit doplněk Randplace";
+$a->strings["Submit"] = "Odeslat";
diff --git a/randplace/lang/da-dk/messages.po b/randplace/lang/da-dk/messages.po
deleted file mode 100644
index 7f265087..00000000
--- a/randplace/lang/da-dk/messages.po
+++ /dev/null
@@ -1,27 +0,0 @@
-# ADDON randplace
-# Copyright (C)
-# This file is distributed under the same license as the Friendica randplace addon package.
-# 
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:16-0500\n"
-"PO-Revision-Date: 2014-06-23 12:34+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Danish (Denmark) (http://www.transifex.com/Friendica/friendica/language/da_DK/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: da_DK\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: randplace.php:161
-msgid "Enable Randplace Addon"
-msgstr ""
-
-#: randplace.php:166
-msgid "Randplace Settings"
-msgstr ""
diff --git a/randplace/lang/da-dk/strings.php b/randplace/lang/da-dk/strings.php
deleted file mode 100644
index 09554750..00000000
--- a/randplace/lang/da-dk/strings.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_da_dk")) {
-function string_plural_select_da_dk($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
diff --git a/randplace/lang/de/messages.po b/randplace/lang/de/messages.po
index abbaefd8..c575242f 100644
--- a/randplace/lang/de/messages.po
+++ b/randplace/lang/de/messages.po
@@ -4,27 +4,29 @@
 # 
 # 
 # Translators:
-# Steffen K9, 2021
-# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2014-2015
-# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2018
+# bavatar <tobias.diekershoff@gmx.net>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:16-0500\n"
-"PO-Revision-Date: 2014-06-23 12:34+0000\n"
-"Last-Translator: Steffen K9, 2021\n"
-"Language-Team: German (http://app.transifex.com/Friendica/friendica/language/de/)\n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-08 19:23+0000\n"
+"Last-Translator: bavatar <tobias.diekershoff@gmx.net>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/friendica/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: randplace.php:161
+#: randplace.php:169
+msgid "Randplace Settings"
+msgstr "Randplace-Einstellungen"
+
+#: randplace.php:171
 msgid "Enable Randplace Addon"
 msgstr "Randplace-Addon aktivieren"
 
-#: randplace.php:166
-msgid "Randplace Settings"
-msgstr "Randplace-Einstellungen"
+#: randplace.php:177
+msgid "Save Settings"
+msgstr "Einstellungen speichern"
diff --git a/randplace/lang/de/strings.php b/randplace/lang/de/strings.php
index a3da42d2..5a5b69f3 100644
--- a/randplace/lang/de/strings.php
+++ b/randplace/lang/de/strings.php
@@ -2,8 +2,9 @@
 
 if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Enable Randplace Addon'] = 'Randplace-Addon aktivieren';
-$a->strings['Randplace Settings'] = 'Randplace-Einstellungen';
+;
+$a->strings["Randplace Settings"] = "Randplace-Einstellungen";
+$a->strings["Enable Randplace Addon"] = "Randplace-Addon aktivieren";
+$a->strings["Save Settings"] = "Einstellungen speichern";
diff --git a/randplace/lang/es/messages.po b/randplace/lang/es/messages.po
index c194acac..7f0a1047 100644
--- a/randplace/lang/es/messages.po
+++ b/randplace/lang/es/messages.po
@@ -5,14 +5,13 @@
 # 
 # Translators:
 # Albert, 2016
-# Senex Petrovic <javierruizo@hotmail.com>, 2021
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2021-04-06 02:05+0000\n"
-"Last-Translator: Senex Petrovic <javierruizo@hotmail.com>\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2016-11-17 22:23+0000\n"
+"Last-Translator: Albert\n"
 "Language-Team: Spanish (http://www.transifex.com/Friendica/friendica/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,14 +19,14 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: randplace.php:166
+#: randplace.php:169
 msgid "Randplace Settings"
 msgstr "Ajustes de Randplace"
 
-#: randplace.php:168
+#: randplace.php:171
 msgid "Enable Randplace Addon"
-msgstr "Habilitar el complemento Randplace"
+msgstr "Habilitar el Addon de Randplace"
 
-#: randplace.php:174
-msgid "Save Settings"
-msgstr "Guardar ajustes"
+#: randplace.php:177
+msgid "Submit"
+msgstr "Enviar"
diff --git a/randplace/lang/es/strings.php b/randplace/lang/es/strings.php
index 1a9b38b0..b196c6b8 100644
--- a/randplace/lang/es/strings.php
+++ b/randplace/lang/es/strings.php
@@ -2,9 +2,9 @@
 
 if(! function_exists("string_plural_select_es")) {
 function string_plural_select_es($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Randplace Settings'] = 'Ajustes de Randplace';
-$a->strings['Enable Randplace Addon'] = 'Habilitar el complemento Randplace';
-$a->strings['Save Settings'] = 'Guardar ajustes';
+;
+$a->strings["Randplace Settings"] = "Ajustes de Randplace";
+$a->strings["Enable Randplace Addon"] = "Habilitar el Addon de Randplace";
+$a->strings["Submit"] = "Enviar";
diff --git a/randplace/lang/fi-fi/strings.php b/randplace/lang/fi-fi/strings.php
index 67141f13..188f9915 100644
--- a/randplace/lang/fi-fi/strings.php
+++ b/randplace/lang/fi-fi/strings.php
@@ -2,9 +2,9 @@
 
 if(! function_exists("string_plural_select_fi_fi")) {
 function string_plural_select_fi_fi($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Randplace Settings'] = 'Randplace -asetukset';
-$a->strings['Enable Randplace Addon'] = 'Ota Randplace -lisäosa käyttöön';
-$a->strings['Submit'] = 'Lähetä';
+;
+$a->strings["Randplace Settings"] = "Randplace -asetukset";
+$a->strings["Enable Randplace Addon"] = "Ota Randplace -lisäosa käyttöön";
+$a->strings["Submit"] = "Lähetä";
diff --git a/randplace/lang/fr/messages.po b/randplace/lang/fr/messages.po
deleted file mode 100644
index 53843ecf..00000000
--- a/randplace/lang/fr/messages.po
+++ /dev/null
@@ -1,28 +0,0 @@
-# ADDON randplace
-# Copyright (C)
-# This file is distributed under the same license as the Friendica randplace addon package.
-# 
-# 
-# Translators:
-# Hypolite Petovan <hypolite@mrpetovan.com>, 2022
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:16-0500\n"
-"PO-Revision-Date: 2014-06-23 12:34+0000\n"
-"Last-Translator: Hypolite Petovan <hypolite@mrpetovan.com>, 2022\n"
-"Language-Team: French (http://www.transifex.com/Friendica/friendica/language/fr/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: fr\n"
-"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
-
-#: randplace.php:161
-msgid "Enable Randplace Addon"
-msgstr "Activer l'extension Randplace"
-
-#: randplace.php:166
-msgid "Randplace Settings"
-msgstr "Paramètres de Randplace"
diff --git a/randplace/lang/fr/strings.php b/randplace/lang/fr/strings.php
index f670cc74..f9d354b4 100644
--- a/randplace/lang/fr/strings.php
+++ b/randplace/lang/fr/strings.php
@@ -1,9 +1,5 @@
-<?php
-
-if(! function_exists("string_plural_select_fr")) {
-function string_plural_select_fr($n){
-	$n = intval($n);
-	if (($n == 0 || $n == 1)) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
-}}
-$a->strings['Enable Randplace Addon'] = 'Activer l\'extension Randplace';
-$a->strings['Randplace Settings'] = 'Paramètres de Randplace';
+<?php
+
+$a->strings["Randplace Settings"] = "Réglages de Randplace";
+$a->strings["Enable Randplace Addon"] = "Activer l'extension Randplace";
+$a->strings["Submit"] = "Envoyer";
diff --git a/randplace/lang/gd/messages.po b/randplace/lang/gd/messages.po
deleted file mode 100644
index d90c1135..00000000
--- a/randplace/lang/gd/messages.po
+++ /dev/null
@@ -1,28 +0,0 @@
-# ADDON randplace
-# Copyright (C)
-# This file is distributed under the same license as the Friendica randplace addon package.
-# 
-# 
-# Translators:
-# GunChleoc, 2022
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:16-0500\n"
-"PO-Revision-Date: 2014-06-23 12:34+0000\n"
-"Last-Translator: GunChleoc, 2022\n"
-"Language-Team: Gaelic, Scottish (http://www.transifex.com/Friendica/friendica/language/gd/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: gd\n"
-"Plural-Forms: nplurals=4; plural=(n==1 || n==11) ? 0 : (n==2 || n==12) ? 1 : (n > 2 && n < 20) ? 2 : 3;\n"
-
-#: randplace.php:161
-msgid "Enable Randplace Addon"
-msgstr "Cuir an comas tuilleadan Randplace"
-
-#: randplace.php:166
-msgid "Randplace Settings"
-msgstr "Roghainnean Randplace"
diff --git a/randplace/lang/gd/strings.php b/randplace/lang/gd/strings.php
deleted file mode 100644
index ddc35af1..00000000
--- a/randplace/lang/gd/strings.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_gd")) {
-function string_plural_select_gd($n){
-	$n = intval($n);
-	if (($n==1 || $n==11)) { return 0; } else if (($n==2 || $n==12)) { return 1; } else if (($n > 2 && $n < 20)) { return 2; } else  { return 3; }
-}}
-$a->strings['Enable Randplace Addon'] = 'Cuir an comas tuilleadan Randplace';
-$a->strings['Randplace Settings'] = 'Roghainnean Randplace';
diff --git a/randplace/lang/hu/messages.po b/randplace/lang/hu/messages.po
deleted file mode 100644
index 50fa0a18..00000000
--- a/randplace/lang/hu/messages.po
+++ /dev/null
@@ -1,28 +0,0 @@
-# ADDON randplace
-# Copyright (C)
-# This file is distributed under the same license as the Friendica randplace addon package.
-# 
-# 
-# Translators:
-# Balázs Úr, 2020-2021
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:16-0500\n"
-"PO-Revision-Date: 2014-06-23 12:34+0000\n"
-"Last-Translator: Balázs Úr, 2020-2021\n"
-"Language-Team: Hungarian (http://www.transifex.com/Friendica/friendica/language/hu/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: hu\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: randplace.php:161
-msgid "Enable Randplace Addon"
-msgstr "A véletlen hely bővítmény engedélyezése"
-
-#: randplace.php:166
-msgid "Randplace Settings"
-msgstr "Véletlen hely beállításai"
diff --git a/randplace/lang/hu/strings.php b/randplace/lang/hu/strings.php
deleted file mode 100644
index ac15c909..00000000
--- a/randplace/lang/hu/strings.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_hu")) {
-function string_plural_select_hu($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Enable Randplace Addon'] = 'A véletlen hely bővítmény engedélyezése';
-$a->strings['Randplace Settings'] = 'Véletlen hely beállításai';
diff --git a/randplace/lang/it/messages.po b/randplace/lang/it/messages.po
index 673d0f6f..30ee2653 100644
--- a/randplace/lang/it/messages.po
+++ b/randplace/lang/it/messages.po
@@ -5,25 +5,28 @@
 # 
 # Translators:
 # fabrixxm <fabrix.xm@gmail.com>, 2014-2015,2018
-# Sylke Vicious <silkevicious@gmail.com>, 2021
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:16-0500\n"
-"PO-Revision-Date: 2014-06-23 12:34+0000\n"
-"Last-Translator: Sylke Vicious <silkevicious@gmail.com>, 2021\n"
-"Language-Team: Italian (http://app.transifex.com/Friendica/friendica/language/it/)\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2018-03-19 13:25+0000\n"
+"Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n"
+"Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: it\n"
-"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: randplace.php:161
+#: randplace.php:169
+msgid "Randplace Settings"
+msgstr "Impostazioni \"Posizione casuale\""
+
+#: randplace.php:171
 msgid "Enable Randplace Addon"
 msgstr "Abilita il componente aggiuntivo Posizione Casuale"
 
-#: randplace.php:166
-msgid "Randplace Settings"
-msgstr "Impostazioni \"Posizione casuale\""
+#: randplace.php:177
+msgid "Submit"
+msgstr "Invia"
diff --git a/randplace/lang/it/strings.php b/randplace/lang/it/strings.php
index 5d71eba3..1a26d777 100644
--- a/randplace/lang/it/strings.php
+++ b/randplace/lang/it/strings.php
@@ -2,8 +2,9 @@
 
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
-	$n = intval($n);
-	if ($n == 1) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
+	return ($n != 1);;
 }}
-$a->strings['Enable Randplace Addon'] = 'Abilita il componente aggiuntivo Posizione Casuale';
-$a->strings['Randplace Settings'] = 'Impostazioni "Posizione casuale"';
+;
+$a->strings["Randplace Settings"] = "Impostazioni \"Posizione casuale\"";
+$a->strings["Enable Randplace Addon"] = "Abilita il componente aggiuntivo Posizione Casuale";
+$a->strings["Submit"] = "Invia";
diff --git a/randplace/lang/nl/strings.php b/randplace/lang/nl/strings.php
index 725f4fc8..392e25b8 100644
--- a/randplace/lang/nl/strings.php
+++ b/randplace/lang/nl/strings.php
@@ -3,7 +3,9 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Randplace Settings'] = 'Randplace instellingen';
-$a->strings['Enable Randplace Addon'] = 'Randplace Addon inschakelen';
+;
+$a->strings["Randplace Settings"] = "Randplace instellingen";
+$a->strings["Enable Randplace Addon"] = "Randplace Addon inschakelen";
+$a->strings["Submit"] = "";
diff --git a/randplace/lang/pl/messages.po b/randplace/lang/pl/messages.po
index 18bf07e2..14e59112 100644
--- a/randplace/lang/pl/messages.po
+++ b/randplace/lang/pl/messages.po
@@ -4,14 +4,14 @@
 # 
 # 
 # Translators:
-# Waldemar Stoczkowski, 2018
+# Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:16-0500\n"
-"PO-Revision-Date: 2014-06-23 12:34+0000\n"
-"Last-Translator: Waldemar Stoczkowski, 2018\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2018-03-31 19:11+0000\n"
+"Last-Translator: Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.com/Friendica/friendica/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,10 +19,14 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
-#: randplace.php:161
+#: randplace.php:169
+msgid "Randplace Settings"
+msgstr "Ustawienia Randplace"
+
+#: randplace.php:171
 msgid "Enable Randplace Addon"
 msgstr "Włącz dodatek Randplace"
 
-#: randplace.php:166
-msgid "Randplace Settings"
-msgstr "Ustawienia Randplace"
+#: randplace.php:177
+msgid "Submit"
+msgstr "Wyślij"
diff --git a/randplace/lang/pl/strings.php b/randplace/lang/pl/strings.php
index 73771c9a..582d0a10 100644
--- a/randplace/lang/pl/strings.php
+++ b/randplace/lang/pl/strings.php
@@ -2,8 +2,9 @@
 
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
-	$n = intval($n);
-	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
+	return ($n==1 ? 0 : ($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14) ? 1 : $n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14) ? 2 : 3);;
 }}
-$a->strings['Enable Randplace Addon'] = 'Włącz dodatek Randplace';
-$a->strings['Randplace Settings'] = 'Ustawienia Randplace';
+;
+$a->strings["Randplace Settings"] = "Ustawienia Randplace";
+$a->strings["Enable Randplace Addon"] = "Włącz dodatek Randplace";
+$a->strings["Submit"] = "Wyślij";
diff --git a/randplace/lang/ro/strings.php b/randplace/lang/ro/strings.php
index cbfa2339..81607079 100644
--- a/randplace/lang/ro/strings.php
+++ b/randplace/lang/ro/strings.php
@@ -2,9 +2,9 @@
 
 if(! function_exists("string_plural_select_ro")) {
 function string_plural_select_ro($n){
-	$n = intval($n);
-	if ($n==1) { return 0; } else if ((($n%100>19)||(($n%100==0)&&($n!=0)))) { return 2; } else  { return 1; }
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
 }}
-$a->strings['Randplace Settings'] = 'Configurări Randplace';
-$a->strings['Enable Randplace Addon'] = 'Activare Modul Randplace';
-$a->strings['Save Settings'] = 'Salvare Configurări';
+;
+$a->strings["Randplace Settings"] = "Configurări Randplace";
+$a->strings["Enable Randplace Addon"] = "Activare Modul Randplace";
+$a->strings["Save Settings"] = "Salvare Configurări";
diff --git a/randplace/lang/sv/messages.po b/randplace/lang/sv/messages.po
deleted file mode 100644
index d4cd8cd7..00000000
--- a/randplace/lang/sv/messages.po
+++ /dev/null
@@ -1,27 +0,0 @@
-# ADDON randplace
-# Copyright (C)
-# This file is distributed under the same license as the Friendica randplace addon package.
-# 
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:16-0500\n"
-"PO-Revision-Date: 2021-12-22 17:21+0000\n"
-"Last-Translator: Transifex Bot <>\n"
-"Language-Team: Swedish (http://www.transifex.com/Friendica/friendica/language/sv/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: sv\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: randplace.php:161
-msgid "Enable Randplace Addon"
-msgstr ""
-
-#: randplace.php:166
-msgid "Randplace Settings"
-msgstr ""
diff --git a/randplace/lang/sv/strings.php b/randplace/lang/sv/strings.php
index 72e9772f..c47a51ca 100644
--- a/randplace/lang/sv/strings.php
+++ b/randplace/lang/sv/strings.php
@@ -1,7 +1,5 @@
-<?php
-
-if(! function_exists("string_plural_select_sv")) {
-function string_plural_select_sv($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
+<?php
+
+$a->strings["Randplace Settings"] = "Randplace Settings";
+$a->strings["Enable Randplace Addon"] = "Enable Randplace Addon";
+$a->strings["Submit"] = "Spara";
diff --git a/randplace/lang/zh-cn/strings.php b/randplace/lang/zh-cn/strings.php
index b2f41b04..1a756fc4 100644
--- a/randplace/lang/zh-cn/strings.php
+++ b/randplace/lang/zh-cn/strings.php
@@ -3,8 +3,9 @@
 if(! function_exists("string_plural_select_zh_cn")) {
 function string_plural_select_zh_cn($n){
 	$n = intval($n);
-	return intval(0);
+	return 0;;
 }}
-$a->strings['Randplace Settings'] = '随机站点设置';
-$a->strings['Enable Randplace Addon'] = '启用随机站点插件';
-$a->strings['Submit'] = '提交';
+;
+$a->strings["Randplace Settings"] = "随机站点设置";
+$a->strings["Enable Randplace Addon"] = "启用随机站点插件";
+$a->strings["Submit"] = "提交";
diff --git a/randplace/randplace.css b/randplace/randplace.css
new file mode 100644
index 00000000..bd7af6d7
--- /dev/null
+++ b/randplace/randplace.css
@@ -0,0 +1,14 @@
+
+
+
+#randplace-enable-label {
+	float: left;
+	width: 200px;
+	margin-bottom: 25px;
+}
+
+#randplace-checkbox {
+	float: left;
+}
+
+
diff --git a/randplace/randplace.php b/randplace/randplace.php
index 34f48c6c..ffc3237c 100644
--- a/randplace/randplace.php
+++ b/randplace/randplace.php
@@ -18,74 +18,85 @@
  * system will call the name_uninstall() function.
  *
  */
-
-use Friendica\App;
 use Friendica\Core\Hook;
+use Friendica\Core\L10n;
 use Friendica\Core\Logger;
-use Friendica\Core\Renderer;
-use Friendica\DI;
+use Friendica\Core\PConfig;
 
-function randplace_install()
-{
-	/*
+function randplace_install() {
+
+	/**
+	 *
 	 * Our demo addon will attach in three places.
 	 * The first is just prior to storing a local post.
+	 *
 	 */
+
 	Hook::register('post_local', 'addon/randplace/randplace.php', 'randplace_post_hook');
 
-	/*
+	/**
+	 *
 	 * Then we'll attach into the addon settings page, and also the
 	 * settings post hook so that we can create and update
 	 * user preferences.
+	 *
 	 */
+
 	Hook::register('addon_settings', 'addon/randplace/randplace.php', 'randplace_settings');
 	Hook::register('addon_settings_post', 'addon/randplace/randplace.php', 'randplace_settings_post');
 
-	Logger::notice("installed randplace");
+	Logger::log("installed randplace");
 }
 
-function randplace_uninstall()
-{
-	/*
-	 * This function should undo anything that was done in name_install()
+
+function randplace_uninstall() {
+
+	/**
+	 *
+	 * uninstall unregisters any hooks created with register_hook
+	 * during install. It may also delete configuration settings
+	 * and any other cleanup.
 	 *
-	 * Except hooks, they are all unregistered automatically and don't need to be unregistered manually.
 	 */
-	Logger::notice("removed randplace");
+
+	Hook::unregister('post_local',    'addon/randplace/randplace.php', 'randplace_post_hook');
+	Hook::unregister('addon_settings', 'addon/randplace/randplace.php', 'randplace_settings');
+	Hook::unregister('addon_settings_post', 'addon/randplace/randplace.php', 'randplace_settings_post');
+
+
+	Logger::log("removed randplace");
 }
 
-function randplace_post_hook(&$item)
-{
-	/*
+
+
+function randplace_post_hook($a, &$item) {
+
+	/**
+	 *
 	 * An item was posted on the local system.
 	 * We are going to look for specific items:
 	 *      - A status post by a profile owner
 	 *      - The profile owner must have allowed our addon
+	 *
 	 */
-	Logger::notice('randplace invoked');
 
-	if (!DI::userSession()->getLocalUserId()) {
-		/* non-zero if this is a logged in user of this system */
-		return;
-	}
+	Logger::log('randplace invoked');
 
-	if (DI::userSession()->getLocalUserId() != $item['uid']) {
-		/* Does this person own the post? */
+	if(! local_user())   /* non-zero if this is a logged in user of this system */
 		return;
-	}
 
-	if ($item['parent']) {
-		/* If the item has a parent, this is a comment or something else, not a status post. */
+	if(local_user() != $item['uid'])    /* Does this person own the post? */
+		return;
+
+	if($item['parent'])   /* If the item has a parent, this is a comment or something else, not a status post. */
 		return;
-	}
 
 	/* Retrieve our personal config setting */
 
-	$active = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'randplace', 'enable');
+	$active = PConfig::get(local_user(), 'randplace', 'enable');
 
-	if (!$active) {
+	if(! $active)
 		return;
-	}
 
 	/**
 	 *
@@ -99,59 +110,73 @@ function randplace_post_hook(&$item)
 	$cities = [];
 	$zones = timezone_identifiers_list();
 	foreach($zones as $zone) {
-		if ((strpos($zone, '/')) && (! stristr($zone, 'US/')) && (! stristr($zone, 'Etc/'))) {
-			$cities[] = str_replace('_', ' ',substr($zone, strpos($zone, '/') + 1));
-		}
+		if((strpos($zone,'/')) && (! stristr($zone,'US/')) && (! stristr($zone,'Etc/')))
+			$cities[] = str_replace('_', ' ',substr($zone,strpos($zone,'/') + 1));
 	}
 
-	if (!count($cities)) {
+	if(! count($cities))
 		return;
-	}
-
 	$city = array_rand($cities,1);
 	$item['location'] = $cities[$city];
 
 	return;
 }
 
+
+
+
 /**
+ *
  * Callback from the settings post function.
  * $post contains the $_POST array.
  * We will make sure we've got a valid user account
  * and if so set our configuration setting for this person.
+ *
  */
-function randplace_settings_post($post)
-{
-	if (!DI::userSession()->getLocalUserId()) {
-		return;
-	}
 
-	if ($_POST['randplace-submit']) {
-		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'randplace', 'enable', intval($_POST['randplace']));
-	}
+function randplace_settings_post($a,$post) {
+	if(! local_user())
+		return;
+	if($_POST['randplace-submit'])
+		PConfig::set(local_user(),'randplace','enable',intval($_POST['randplace']));
 }
 
 
 /**
+ *
  * Called from the Addon Setting form.
  * Add our own settings info to the page.
+ *
  */
-function randplace_settings(array &$data)
-{
-	if(!DI::userSession()->getLocalUserId()) {
+
+
+
+function randplace_settings(&$a,&$s) {
+
+	if(! local_user())
 		return;
-	}
 
-	$enabled = DI::pConfig()->get(DI::userSession()->getLocalUserId(),'randplace','enable');
+	/* Add our stylesheet to the page so we can make our settings look nice */
 
-	$t    = Renderer::getMarkupTemplate('settings.tpl', 'addon/randplace/');
-	$html = Renderer::replaceMacros($t, [
-		'$enabled' => ['randplace', DI::l10n()->t('Enable Randplace Addon'), $enabled],
-	]);
+	$a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->getBaseURL() . '/addon/randplace/randplace.css' . '" media="all" />' . "\r\n";
+
+	/* Get the current state of our config variable */
+
+	$enabled = PConfig::get(local_user(),'randplace','enable');
+
+	$checked = (($enabled) ? ' checked="checked" ' : '');
+
+	/* Add some HTML to the existing form */
+
+	$s .= '<div class="settings-block">';
+	$s .= '<h3>' . L10n::t('Randplace Settings') . '</h3>';
+	$s .= '<div id="randplace-enable-wrapper">';
+	$s .= '<label id="randplace-enable-label" for="randplace-checkbox">' . L10n::t('Enable Randplace Addon') . '</label>';
+	$s .= '<input id="randplace-checkbox" type="checkbox" name="randplace" value="1" ' . $checked . '/>';
+	$s .= '</div><div class="clear"></div>';
+
+	/* provide a submit button */
+
+	$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="randplace-submit" class="settings-submit" value="' . L10n::t('Save Settings') . '" /></div></div>';
 
-	$data = [
-		'addon' => 'randplace',
-		'title' => DI::l10n()->t('Randplace Settings'),
-		'html'  => $html,
-	];
 }
diff --git a/randplace/templates/settings.tpl b/randplace/templates/settings.tpl
deleted file mode 100644
index 2f3f4ce7..00000000
--- a/randplace/templates/settings.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{{include file="field_checkbox.tpl" field=$enabled}}
diff --git a/remote_permissions/README.md b/remote_permissions/README.md
new file mode 100644
index 00000000..33e106ce
--- /dev/null
+++ b/remote_permissions/README.md
@@ -0,0 +1,8 @@
+The Remote Permissions addon enables recipients of private posts to see who else has received the post. This can be beneficial on community servers where people may want to modify the way they speak depending on who can see their comments to the post.
+
+Note that since Friendica is federated, the local hub may have posts that originated elsewhere. In that case, the addon has no way of knowing all the recipients of the post, and it must settle for finding out who else can see it on the local hub.
+
+The hub admin can specify one of two behaviors for this addon:
+
+* **Global:** every private post on the local hub will show all recipients (or at least the ones it can discover) of the post to any other users on the local hub
+* **Individual:** only private posts from those users on the local hub who "opt-in" will show the post recipients. None of the private posts that originated elsewhere will show even partial lists of post recipients
diff --git a/remote_permissions/lang/C/messages.po b/remote_permissions/lang/C/messages.po
new file mode 100644
index 00000000..cfb874d5
--- /dev/null
+++ b/remote_permissions/lang/C/messages.po
@@ -0,0 +1,68 @@
+# ADDON remote_permissions
+# Copyright (C) 
+# This file is distributed under the same license as the Friendica remote_permissions addon package.
+# 
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: remote_permissions.php:45
+msgid "Remote Permissions Settings"
+msgstr ""
+
+#: remote_permissions.php:46
+msgid ""
+"Allow recipients of your private posts to see the other recipients of the "
+"posts"
+msgstr ""
+
+#: remote_permissions.php:48 remote_permissions.php:196
+msgid "Submit"
+msgstr ""
+
+#: remote_permissions.php:58
+msgid "Remote Permissions settings updated."
+msgstr ""
+
+#: remote_permissions.php:124
+msgid "Visible to:"
+msgstr ""
+
+#: remote_permissions.php:178
+msgid "Visible to"
+msgstr ""
+
+#: remote_permissions.php:178
+msgid "may only be a partial list"
+msgstr ""
+
+#: remote_permissions.php:197
+msgid "Global"
+msgstr ""
+
+#: remote_permissions.php:197
+msgid "The posts of every user on this server show the post recipients"
+msgstr ""
+
+#: remote_permissions.php:198
+msgid "Individual"
+msgstr ""
+
+#: remote_permissions.php:198
+msgid "Each user chooses whether his/her posts show the post recipients"
+msgstr ""
+
+#: remote_permissions.php:205
+msgid "Settings updated."
+msgstr ""
diff --git a/remote_permissions/lang/ca/strings.php b/remote_permissions/lang/ca/strings.php
new file mode 100644
index 00000000..0a05b9d7
--- /dev/null
+++ b/remote_permissions/lang/ca/strings.php
@@ -0,0 +1,14 @@
+<?php
+
+$a->strings["Remote Permissions Settings"] = "";
+$a->strings["Allow recipients of your private posts to see the other recipients of the posts"] = "";
+$a->strings["Submit"] = "Enviar";
+$a->strings["Remote Permissions settings updated."] = "";
+$a->strings["Visible to:"] = "Visible per a:";
+$a->strings["Visible to"] = "";
+$a->strings["may only be a partial list"] = "";
+$a->strings["Global"] = "";
+$a->strings["The posts of every user on this server show the post recipients"] = "";
+$a->strings["Individual"] = "";
+$a->strings["Each user chooses whether his/her posts show the post recipients"] = "";
+$a->strings["Settings updated."] = "Ajustos actualitzats.";
diff --git a/remote_permissions/lang/cs/messages.po b/remote_permissions/lang/cs/messages.po
new file mode 100644
index 00000000..45cc232e
--- /dev/null
+++ b/remote_permissions/lang/cs/messages.po
@@ -0,0 +1,71 @@
+# ADDON remote_permissions
+# Copyright (C)
+# This file is distributed under the same license as the Friendica remote_permissions addon package.
+# 
+# 
+# Translators:
+# Aditoo, 2018
+# michal_s <msupler@gmail.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2018-06-13 18:01+0000\n"
+"Last-Translator: Aditoo\n"
+"Language-Team: Czech (http://www.transifex.com/Friendica/friendica/language/cs/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
+
+#: remote_permissions.php:45
+msgid "Remote Permissions Settings"
+msgstr "Nastavení Vzdálených oprávnění"
+
+#: remote_permissions.php:46
+msgid ""
+"Allow recipients of your private posts to see the other recipients of the "
+"posts"
+msgstr "Umožnit příjemcům Vašich soukromých příspěvků vidět ostatní příjemce příspěvků"
+
+#: remote_permissions.php:48 remote_permissions.php:196
+msgid "Submit"
+msgstr "Odeslat"
+
+#: remote_permissions.php:58
+msgid "Remote Permissions settings updated."
+msgstr "Nastavení Vzdálených opravnění aktualizováno."
+
+#: remote_permissions.php:124
+msgid "Visible to:"
+msgstr "Viditelné pro:"
+
+#: remote_permissions.php:178
+msgid "Visible to"
+msgstr "Viditelné pro"
+
+#: remote_permissions.php:178
+msgid "may only be a partial list"
+msgstr "pouze pro část seznamu"
+
+#: remote_permissions.php:197
+msgid "Global"
+msgstr "Globální"
+
+#: remote_permissions.php:197
+msgid "The posts of every user on this server show the post recipients"
+msgstr "Příspěvek každého uživatele na tomto serveru zobrazuje příjemce příspěvků"
+
+#: remote_permissions.php:198
+msgid "Individual"
+msgstr "Individuálové"
+
+#: remote_permissions.php:198
+msgid "Each user chooses whether his/her posts show the post recipients"
+msgstr "Každý uživatel si zvolí, zda-li jeho/její příspěvek zobrazí příjemce příspěvku."
+
+#: remote_permissions.php:205
+msgid "Settings updated."
+msgstr "Nastavení aktualizováno."
diff --git a/remote_permissions/lang/cs/strings.php b/remote_permissions/lang/cs/strings.php
new file mode 100644
index 00000000..5ca17b28
--- /dev/null
+++ b/remote_permissions/lang/cs/strings.php
@@ -0,0 +1,20 @@
+<?php
+
+if(! function_exists("string_plural_select_cs")) {
+function string_plural_select_cs($n){
+	$n = intval($n);
+	return ($n == 1 && $n % 1 == 0) ? 0 : ($n >= 2 && $n <= 4 && $n % 1 == 0) ? 1: ($n % 1 != 0 ) ? 2 : 3;;
+}}
+;
+$a->strings["Remote Permissions Settings"] = "Nastavení Vzdálených oprávnění";
+$a->strings["Allow recipients of your private posts to see the other recipients of the posts"] = "Umožnit příjemcům Vašich soukromých příspěvků vidět ostatní příjemce příspěvků";
+$a->strings["Submit"] = "Odeslat";
+$a->strings["Remote Permissions settings updated."] = "Nastavení Vzdálených opravnění aktualizováno.";
+$a->strings["Visible to:"] = "Viditelné pro:";
+$a->strings["Visible to"] = "Viditelné pro";
+$a->strings["may only be a partial list"] = "pouze pro část seznamu";
+$a->strings["Global"] = "Globální";
+$a->strings["The posts of every user on this server show the post recipients"] = "Příspěvek každého uživatele na tomto serveru zobrazuje příjemce příspěvků";
+$a->strings["Individual"] = "Individuálové";
+$a->strings["Each user chooses whether his/her posts show the post recipients"] = "Každý uživatel si zvolí, zda-li jeho/její příspěvek zobrazí příjemce příspěvku.";
+$a->strings["Settings updated."] = "Nastavení aktualizováno.";
diff --git a/remote_permissions/lang/de/messages.po b/remote_permissions/lang/de/messages.po
new file mode 100644
index 00000000..467ff2f7
--- /dev/null
+++ b/remote_permissions/lang/de/messages.po
@@ -0,0 +1,70 @@
+# ADDON remote_permissions
+# Copyright (C)
+# This file is distributed under the same license as the Friendica remote_permissions addon package.
+# 
+# 
+# Translators:
+# bavatar <tobias.diekershoff@gmx.net>, 2014-2015
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2015-07-27 05:19+0000\n"
+"Last-Translator: bavatar <tobias.diekershoff@gmx.net>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/friendica/language/de/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: remote_permissions.php:45
+msgid "Remote Permissions Settings"
+msgstr "Entfernte Privatsphäreneinstellungen"
+
+#: remote_permissions.php:46
+msgid ""
+"Allow recipients of your private posts to see the other recipients of the "
+"posts"
+msgstr "Erlaube Empfängern von privaten Nachrichten zu sehen wer die anderen Empfänger sind"
+
+#: remote_permissions.php:48 remote_permissions.php:196
+msgid "Submit"
+msgstr "Senden"
+
+#: remote_permissions.php:58
+msgid "Remote Permissions settings updated."
+msgstr "Entfernte Privatsphäreneinstellungen aktualisiert."
+
+#: remote_permissions.php:124
+msgid "Visible to:"
+msgstr "Sichtbar für:"
+
+#: remote_permissions.php:178
+msgid "Visible to"
+msgstr "Sichtbar für"
+
+#: remote_permissions.php:178
+msgid "may only be a partial list"
+msgstr "könnte nur ein Teil der Liste sein"
+
+#: remote_permissions.php:197
+msgid "Global"
+msgstr "Global"
+
+#: remote_permissions.php:197
+msgid "The posts of every user on this server show the post recipients"
+msgstr "Die Beiträge jedes Nutzers dieses Servers werden die Empfänger des Beitrags anzeigen"
+
+#: remote_permissions.php:198
+msgid "Individual"
+msgstr "Individuell"
+
+#: remote_permissions.php:198
+msgid "Each user chooses whether his/her posts show the post recipients"
+msgstr "Jede/r Nutzer/in kann wählen ob die Empfänger der Beiträge angezeigt werden sollen oder nicht"
+
+#: remote_permissions.php:205
+msgid "Settings updated."
+msgstr "Einstellungen aktualisiert."
diff --git a/remote_permissions/lang/de/strings.php b/remote_permissions/lang/de/strings.php
new file mode 100644
index 00000000..141dd6ce
--- /dev/null
+++ b/remote_permissions/lang/de/strings.php
@@ -0,0 +1,19 @@
+<?php
+
+if(! function_exists("string_plural_select_de")) {
+function string_plural_select_de($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["Remote Permissions Settings"] = "Entfernte Privatsphäreneinstellungen";
+$a->strings["Allow recipients of your private posts to see the other recipients of the posts"] = "Erlaube Empfängern von privaten Nachrichten zu sehen wer die anderen Empfänger sind";
+$a->strings["Submit"] = "Senden";
+$a->strings["Remote Permissions settings updated."] = "Entfernte Privatsphäreneinstellungen aktualisiert.";
+$a->strings["Visible to:"] = "Sichtbar für:";
+$a->strings["Visible to"] = "Sichtbar für";
+$a->strings["may only be a partial list"] = "könnte nur ein Teil der Liste sein";
+$a->strings["Global"] = "Global";
+$a->strings["The posts of every user on this server show the post recipients"] = "Die Beiträge jedes Nutzers dieses Servers werden die Empfänger des Beitrags anzeigen";
+$a->strings["Individual"] = "Individuell";
+$a->strings["Each user chooses whether his/her posts show the post recipients"] = "Jede/r Nutzer/in kann wählen ob die Empfänger der Beiträge angezeigt werden sollen oder nicht";
+$a->strings["Settings updated."] = "Einstellungen aktualisiert.";
diff --git a/remote_permissions/lang/eo/strings.php b/remote_permissions/lang/eo/strings.php
new file mode 100644
index 00000000..1e7ba04e
--- /dev/null
+++ b/remote_permissions/lang/eo/strings.php
@@ -0,0 +1,5 @@
+<?php
+
+$a->strings["Submit"] = "Sendi";
+$a->strings["Visible to:"] = "Videbla al:";
+$a->strings["Settings updated."] = "Agordoj ĝisdatigita.";
diff --git a/remote_permissions/lang/es/messages.po b/remote_permissions/lang/es/messages.po
new file mode 100644
index 00000000..a47fb575
--- /dev/null
+++ b/remote_permissions/lang/es/messages.po
@@ -0,0 +1,70 @@
+# ADDON remote_permissions
+# Copyright (C)
+# This file is distributed under the same license as the Friendica remote_permissions addon package.
+# 
+# 
+# Translators:
+# Albert, 2016
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2016-11-17 22:30+0000\n"
+"Last-Translator: Albert\n"
+"Language-Team: Spanish (http://www.transifex.com/Friendica/friendica/language/es/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: remote_permissions.php:45
+msgid "Remote Permissions Settings"
+msgstr "Ajustes de Permisos Remotos"
+
+#: remote_permissions.php:46
+msgid ""
+"Allow recipients of your private posts to see the other recipients of the "
+"posts"
+msgstr "Permitir a los destinatarios de sus publicaciones privadas ver a los otros destinatarios de sus publicaciones"
+
+#: remote_permissions.php:48 remote_permissions.php:196
+msgid "Submit"
+msgstr "Enviar"
+
+#: remote_permissions.php:58
+msgid "Remote Permissions settings updated."
+msgstr "Ajustes de Permisos Remotos actualizados."
+
+#: remote_permissions.php:124
+msgid "Visible to:"
+msgstr "Visible para:"
+
+#: remote_permissions.php:178
+msgid "Visible to"
+msgstr "Visible para"
+
+#: remote_permissions.php:178
+msgid "may only be a partial list"
+msgstr "puede ser sólo una lista parcial"
+
+#: remote_permissions.php:197
+msgid "Global"
+msgstr "Global"
+
+#: remote_permissions.php:197
+msgid "The posts of every user on this server show the post recipients"
+msgstr "Las entradas de cada usuario de este servidor muestran a los destinatarios de la entrada"
+
+#: remote_permissions.php:198
+msgid "Individual"
+msgstr "Individuo"
+
+#: remote_permissions.php:198
+msgid "Each user chooses whether his/her posts show the post recipients"
+msgstr "Cada usuario elige si sus entradas muestran a los destinatarios de la entrada"
+
+#: remote_permissions.php:205
+msgid "Settings updated."
+msgstr "Ajustes actualizados."
diff --git a/remote_permissions/lang/es/strings.php b/remote_permissions/lang/es/strings.php
new file mode 100644
index 00000000..6a3d42f0
--- /dev/null
+++ b/remote_permissions/lang/es/strings.php
@@ -0,0 +1,19 @@
+<?php
+
+if(! function_exists("string_plural_select_es")) {
+function string_plural_select_es($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["Remote Permissions Settings"] = "Ajustes de Permisos Remotos";
+$a->strings["Allow recipients of your private posts to see the other recipients of the posts"] = "Permitir a los destinatarios de sus publicaciones privadas ver a los otros destinatarios de sus publicaciones";
+$a->strings["Submit"] = "Enviar";
+$a->strings["Remote Permissions settings updated."] = "Ajustes de Permisos Remotos actualizados.";
+$a->strings["Visible to:"] = "Visible para:";
+$a->strings["Visible to"] = "Visible para";
+$a->strings["may only be a partial list"] = "puede ser sólo una lista parcial";
+$a->strings["Global"] = "Global";
+$a->strings["The posts of every user on this server show the post recipients"] = "Las entradas de cada usuario de este servidor muestran a los destinatarios de la entrada";
+$a->strings["Individual"] = "Individuo";
+$a->strings["Each user chooses whether his/her posts show the post recipients"] = "Cada usuario elige si sus entradas muestran a los destinatarios de la entrada";
+$a->strings["Settings updated."] = "Ajustes actualizados.";
diff --git a/remote_permissions/lang/fi-fi/messages.po b/remote_permissions/lang/fi-fi/messages.po
new file mode 100644
index 00000000..df0f7795
--- /dev/null
+++ b/remote_permissions/lang/fi-fi/messages.po
@@ -0,0 +1,71 @@
+# ADDON remote_permissions
+# Copyright (C)
+# This file is distributed under the same license as the Friendica remote_permissions addon package.
+# 
+# 
+# Translators:
+# Kris, 2018
+# Kris, 2018
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2018-04-16 16:05+0000\n"
+"Last-Translator: Kris\n"
+"Language-Team: Finnish (Finland) (http://www.transifex.com/Friendica/friendica/language/fi_FI/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fi_FI\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: remote_permissions.php:45
+msgid "Remote Permissions Settings"
+msgstr "Remote Permissions -asetukset"
+
+#: remote_permissions.php:46
+msgid ""
+"Allow recipients of your private posts to see the other recipients of the "
+"posts"
+msgstr ""
+
+#: remote_permissions.php:48 remote_permissions.php:196
+msgid "Submit"
+msgstr "Lähetä"
+
+#: remote_permissions.php:58
+msgid "Remote Permissions settings updated."
+msgstr "Remote Pemissions -asetukset päivitetty."
+
+#: remote_permissions.php:124
+msgid "Visible to:"
+msgstr "Näkyvyys:"
+
+#: remote_permissions.php:178
+msgid "Visible to"
+msgstr ""
+
+#: remote_permissions.php:178
+msgid "may only be a partial list"
+msgstr ""
+
+#: remote_permissions.php:197
+msgid "Global"
+msgstr ""
+
+#: remote_permissions.php:197
+msgid "The posts of every user on this server show the post recipients"
+msgstr ""
+
+#: remote_permissions.php:198
+msgid "Individual"
+msgstr ""
+
+#: remote_permissions.php:198
+msgid "Each user chooses whether his/her posts show the post recipients"
+msgstr ""
+
+#: remote_permissions.php:205
+msgid "Settings updated."
+msgstr "Asetukset päivitetty."
diff --git a/remote_permissions/lang/fi-fi/strings.php b/remote_permissions/lang/fi-fi/strings.php
new file mode 100644
index 00000000..05f18162
--- /dev/null
+++ b/remote_permissions/lang/fi-fi/strings.php
@@ -0,0 +1,19 @@
+<?php
+
+if(! function_exists("string_plural_select_fi_fi")) {
+function string_plural_select_fi_fi($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["Remote Permissions Settings"] = "Remote Permissions -asetukset";
+$a->strings["Allow recipients of your private posts to see the other recipients of the posts"] = "";
+$a->strings["Submit"] = "Lähetä";
+$a->strings["Remote Permissions settings updated."] = "Remote Pemissions -asetukset päivitetty.";
+$a->strings["Visible to:"] = "Näkyvyys:";
+$a->strings["Visible to"] = "";
+$a->strings["may only be a partial list"] = "";
+$a->strings["Global"] = "";
+$a->strings["The posts of every user on this server show the post recipients"] = "";
+$a->strings["Individual"] = "";
+$a->strings["Each user chooses whether his/her posts show the post recipients"] = "";
+$a->strings["Settings updated."] = "Asetukset päivitetty.";
diff --git a/remote_permissions/lang/fr/strings.php b/remote_permissions/lang/fr/strings.php
new file mode 100644
index 00000000..e9f6f46a
--- /dev/null
+++ b/remote_permissions/lang/fr/strings.php
@@ -0,0 +1,14 @@
+<?php
+
+$a->strings["Remote Permissions Settings"] = "Permissions distantes";
+$a->strings["Allow recipients of your private posts to see the other recipients of the posts"] = "Autoriser les destinataires de vos messages privés a voir les autres destinataires du message";
+$a->strings["Submit"] = "Envoyer";
+$a->strings["Remote Permissions settings updated."] = "Permissions distantes mises-à-jour.";
+$a->strings["Visible to:"] = "Visible par:";
+$a->strings["Visible to"] = "Visibilité";
+$a->strings["may only be a partial list"] = "peut être une liste partielle";
+$a->strings["Global"] = "Global";
+$a->strings["The posts of every user on this server show the post recipients"] = "Les publications de tous les utilisateurs de ce serveur afficheront leurs destinataires";
+$a->strings["Individual"] = "Individuel";
+$a->strings["Each user chooses whether his/her posts show the post recipients"] = "Chaque utilisateur du serveur pourra choisir si ses publications affichent leurs destinataires";
+$a->strings["Settings updated."] = "Réglages mis à jour.";
diff --git a/remote_permissions/lang/is/strings.php b/remote_permissions/lang/is/strings.php
new file mode 100644
index 00000000..f89368f7
--- /dev/null
+++ b/remote_permissions/lang/is/strings.php
@@ -0,0 +1,5 @@
+<?php
+
+$a->strings["Submit"] = "Senda inn";
+$a->strings["Visible to:"] = "Sýnilegt eftirfarandi:";
+$a->strings["Settings updated."] = "Stillingar uppfærðar";
diff --git a/remote_permissions/lang/it/messages.po b/remote_permissions/lang/it/messages.po
new file mode 100644
index 00000000..141059e6
--- /dev/null
+++ b/remote_permissions/lang/it/messages.po
@@ -0,0 +1,70 @@
+# ADDON remote_permissions
+# Copyright (C)
+# This file is distributed under the same license as the Friendica remote_permissions addon package.
+# 
+# 
+# Translators:
+# fabrixxm <fabrix.xm@gmail.com>, 2014-2015
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2017-09-20 06:08+0000\n"
+"Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n"
+"Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: it\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: remote_permissions.php:45
+msgid "Remote Permissions Settings"
+msgstr "Impostazioni Permissi Remoti"
+
+#: remote_permissions.php:46
+msgid ""
+"Allow recipients of your private posts to see the other recipients of the "
+"posts"
+msgstr "Permetti ai destinatari dei tuoi messaggi privati di vedere gli altri destinatari del messaggio"
+
+#: remote_permissions.php:48 remote_permissions.php:196
+msgid "Submit"
+msgstr "Invia"
+
+#: remote_permissions.php:58
+msgid "Remote Permissions settings updated."
+msgstr "Impostazioni Permessi Remoti aggiornate."
+
+#: remote_permissions.php:124
+msgid "Visible to:"
+msgstr "Visibile a:"
+
+#: remote_permissions.php:178
+msgid "Visible to"
+msgstr "Visibile a"
+
+#: remote_permissions.php:178
+msgid "may only be a partial list"
+msgstr "può essere solo una lista parziale"
+
+#: remote_permissions.php:197
+msgid "Global"
+msgstr "Globale"
+
+#: remote_permissions.php:197
+msgid "The posts of every user on this server show the post recipients"
+msgstr "I messaggi di tutti gli utenti di questo server mostrano i destinatari"
+
+#: remote_permissions.php:198
+msgid "Individual"
+msgstr "Individuale"
+
+#: remote_permissions.php:198
+msgid "Each user chooses whether his/her posts show the post recipients"
+msgstr "Ogni utente sceglie se i suoi messaggi mostreranno i destinatari"
+
+#: remote_permissions.php:205
+msgid "Settings updated."
+msgstr "Impostazioni aggiornate."
diff --git a/remote_permissions/lang/it/strings.php b/remote_permissions/lang/it/strings.php
new file mode 100644
index 00000000..a872e779
--- /dev/null
+++ b/remote_permissions/lang/it/strings.php
@@ -0,0 +1,19 @@
+<?php
+
+if(! function_exists("string_plural_select_it")) {
+function string_plural_select_it($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["Remote Permissions Settings"] = "Impostazioni Permissi Remoti";
+$a->strings["Allow recipients of your private posts to see the other recipients of the posts"] = "Permetti ai destinatari dei tuoi messaggi privati di vedere gli altri destinatari del messaggio";
+$a->strings["Submit"] = "Invia";
+$a->strings["Remote Permissions settings updated."] = "Impostazioni Permessi Remoti aggiornate.";
+$a->strings["Visible to:"] = "Visibile a:";
+$a->strings["Visible to"] = "Visibile a";
+$a->strings["may only be a partial list"] = "può essere solo una lista parziale";
+$a->strings["Global"] = "Globale";
+$a->strings["The posts of every user on this server show the post recipients"] = "I messaggi di tutti gli utenti di questo server mostrano i destinatari";
+$a->strings["Individual"] = "Individuale";
+$a->strings["Each user chooses whether his/her posts show the post recipients"] = "Ogni utente sceglie se i suoi messaggi mostreranno i destinatari";
+$a->strings["Settings updated."] = "Impostazioni aggiornate.";
diff --git a/remote_permissions/lang/nb-no/strings.php b/remote_permissions/lang/nb-no/strings.php
new file mode 100644
index 00000000..1e141776
--- /dev/null
+++ b/remote_permissions/lang/nb-no/strings.php
@@ -0,0 +1,14 @@
+<?php
+
+$a->strings["Remote Permissions Settings"] = "";
+$a->strings["Allow recipients of your private posts to see the other recipients of the posts"] = "";
+$a->strings["Submit"] = "Lagre";
+$a->strings["Remote Permissions settings updated."] = "";
+$a->strings["Visible to:"] = "Synlig for:";
+$a->strings["Visible to"] = "";
+$a->strings["may only be a partial list"] = "";
+$a->strings["Global"] = "";
+$a->strings["The posts of every user on this server show the post recipients"] = "";
+$a->strings["Individual"] = "";
+$a->strings["Each user chooses whether his/her posts show the post recipients"] = "";
+$a->strings["Settings updated."] = "Innstillinger oppdatert.";
diff --git a/remote_permissions/lang/nl/messages.po b/remote_permissions/lang/nl/messages.po
new file mode 100644
index 00000000..f2f30e03
--- /dev/null
+++ b/remote_permissions/lang/nl/messages.po
@@ -0,0 +1,70 @@
+# ADDON remote_permissions
+# Copyright (C)
+# This file is distributed under the same license as the Friendica remote_permissions addon package.
+# 
+# 
+# Translators:
+# Jeroen De Meerleer <me@jeroened.be>, 2018
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2018-08-24 13:51+0000\n"
+"Last-Translator: Jeroen De Meerleer <me@jeroened.be>\n"
+"Language-Team: Dutch (http://www.transifex.com/Friendica/friendica/language/nl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: remote_permissions.php:45
+msgid "Remote Permissions Settings"
+msgstr "Instellingen voor toegang op afstand"
+
+#: remote_permissions.php:46
+msgid ""
+"Allow recipients of your private posts to see the other recipients of the "
+"posts"
+msgstr "Ontvangers van private berichten toestaan andere ontvangers te bekijken"
+
+#: remote_permissions.php:48 remote_permissions.php:196
+msgid "Submit"
+msgstr ""
+
+#: remote_permissions.php:58
+msgid "Remote Permissions settings updated."
+msgstr "Toegang op afstand instellingen opgeslagen"
+
+#: remote_permissions.php:124
+msgid "Visible to:"
+msgstr ""
+
+#: remote_permissions.php:178
+msgid "Visible to"
+msgstr ""
+
+#: remote_permissions.php:178
+msgid "may only be a partial list"
+msgstr ""
+
+#: remote_permissions.php:197
+msgid "Global"
+msgstr ""
+
+#: remote_permissions.php:197
+msgid "The posts of every user on this server show the post recipients"
+msgstr ""
+
+#: remote_permissions.php:198
+msgid "Individual"
+msgstr ""
+
+#: remote_permissions.php:198
+msgid "Each user chooses whether his/her posts show the post recipients"
+msgstr ""
+
+#: remote_permissions.php:205
+msgid "Settings updated."
+msgstr "Instellingen opgeslagen"
diff --git a/remote_permissions/lang/nl/strings.php b/remote_permissions/lang/nl/strings.php
new file mode 100644
index 00000000..cb29d66e
--- /dev/null
+++ b/remote_permissions/lang/nl/strings.php
@@ -0,0 +1,20 @@
+<?php
+
+if(! function_exists("string_plural_select_nl")) {
+function string_plural_select_nl($n){
+	$n = intval($n);
+	return ($n != 1);;
+}}
+;
+$a->strings["Remote Permissions Settings"] = "Instellingen voor toegang op afstand";
+$a->strings["Allow recipients of your private posts to see the other recipients of the posts"] = "Ontvangers van private berichten toestaan andere ontvangers te bekijken";
+$a->strings["Submit"] = "";
+$a->strings["Remote Permissions settings updated."] = "Toegang op afstand instellingen opgeslagen";
+$a->strings["Visible to:"] = "";
+$a->strings["Visible to"] = "";
+$a->strings["may only be a partial list"] = "";
+$a->strings["Global"] = "";
+$a->strings["The posts of every user on this server show the post recipients"] = "";
+$a->strings["Individual"] = "";
+$a->strings["Each user chooses whether his/her posts show the post recipients"] = "";
+$a->strings["Settings updated."] = "Instellingen opgeslagen";
diff --git a/remote_permissions/lang/pl/messages.po b/remote_permissions/lang/pl/messages.po
new file mode 100644
index 00000000..fb68a7cd
--- /dev/null
+++ b/remote_permissions/lang/pl/messages.po
@@ -0,0 +1,70 @@
+# ADDON remote_permissions
+# Copyright (C)
+# This file is distributed under the same license as the Friendica remote_permissions addon package.
+# 
+# 
+# Translators:
+# Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>, 2018
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2018-03-31 20:21+0000\n"
+"Last-Translator: Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>\n"
+"Language-Team: Polish (http://www.transifex.com/Friendica/friendica/language/pl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pl\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
+
+#: remote_permissions.php:45
+msgid "Remote Permissions Settings"
+msgstr "Ustawienia uprawnień zdalnych"
+
+#: remote_permissions.php:46
+msgid ""
+"Allow recipients of your private posts to see the other recipients of the "
+"posts"
+msgstr "Zezwalaj odbiorcom prywatnych wpisów na wyświetlanie innych adresatów postów"
+
+#: remote_permissions.php:48 remote_permissions.php:196
+msgid "Submit"
+msgstr "Wyślij"
+
+#: remote_permissions.php:58
+msgid "Remote Permissions settings updated."
+msgstr "Zaktualizowano ustawienia uprawnień zdalnych."
+
+#: remote_permissions.php:124
+msgid "Visible to:"
+msgstr "Widoczny dla:"
+
+#: remote_permissions.php:178
+msgid "Visible to"
+msgstr "Widoczny dla"
+
+#: remote_permissions.php:178
+msgid "may only be a partial list"
+msgstr "mogą być tylko częściowe listy"
+
+#: remote_permissions.php:197
+msgid "Global"
+msgstr "Ogólnoświatowy"
+
+#: remote_permissions.php:197
+msgid "The posts of every user on this server show the post recipients"
+msgstr "Wpisy każdego użytkownika na tym serwerze pokazują odbiorców wiadomości"
+
+#: remote_permissions.php:198
+msgid "Individual"
+msgstr "Indywidualny"
+
+#: remote_permissions.php:198
+msgid "Each user chooses whether his/her posts show the post recipients"
+msgstr "Każdy użytkownik wybiera, czy jego/jej posty pokazują odbiorców postów"
+
+#: remote_permissions.php:205
+msgid "Settings updated."
+msgstr "Zaktualizowano ustawienia."
diff --git a/remote_permissions/lang/pl/strings.php b/remote_permissions/lang/pl/strings.php
new file mode 100644
index 00000000..7af64153
--- /dev/null
+++ b/remote_permissions/lang/pl/strings.php
@@ -0,0 +1,19 @@
+<?php
+
+if(! function_exists("string_plural_select_pl")) {
+function string_plural_select_pl($n){
+	return ($n==1 ? 0 : ($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14) ? 1 : $n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14) ? 2 : 3);;
+}}
+;
+$a->strings["Remote Permissions Settings"] = "Ustawienia uprawnień zdalnych";
+$a->strings["Allow recipients of your private posts to see the other recipients of the posts"] = "Zezwalaj odbiorcom prywatnych wpisów na wyświetlanie innych adresatów postów";
+$a->strings["Submit"] = "Wyślij";
+$a->strings["Remote Permissions settings updated."] = "Zaktualizowano ustawienia uprawnień zdalnych.";
+$a->strings["Visible to:"] = "Widoczny dla:";
+$a->strings["Visible to"] = "Widoczny dla";
+$a->strings["may only be a partial list"] = "mogą być tylko częściowe listy";
+$a->strings["Global"] = "Ogólnoświatowy";
+$a->strings["The posts of every user on this server show the post recipients"] = "Wpisy każdego użytkownika na tym serwerze pokazują odbiorców wiadomości";
+$a->strings["Individual"] = "Indywidualny";
+$a->strings["Each user chooses whether his/her posts show the post recipients"] = "Każdy użytkownik wybiera, czy jego/jej posty pokazują odbiorców postów";
+$a->strings["Settings updated."] = "Zaktualizowano ustawienia.";
diff --git a/remote_permissions/lang/pt-br/strings.php b/remote_permissions/lang/pt-br/strings.php
new file mode 100644
index 00000000..5f2c03dc
--- /dev/null
+++ b/remote_permissions/lang/pt-br/strings.php
@@ -0,0 +1,14 @@
+<?php
+
+$a->strings["Remote Permissions Settings"] = "";
+$a->strings["Allow recipients of your private posts to see the other recipients of the posts"] = "";
+$a->strings["Submit"] = "Enviar";
+$a->strings["Remote Permissions settings updated."] = "";
+$a->strings["Visible to:"] = "Visível para:";
+$a->strings["Visible to"] = "";
+$a->strings["may only be a partial list"] = "";
+$a->strings["Global"] = "";
+$a->strings["The posts of every user on this server show the post recipients"] = "";
+$a->strings["Individual"] = "";
+$a->strings["Each user chooses whether his/her posts show the post recipients"] = "";
+$a->strings["Settings updated."] = "As configurações foram atualizadas.";
diff --git a/remote_permissions/lang/ro/messages.po b/remote_permissions/lang/ro/messages.po
new file mode 100644
index 00000000..27b7e040
--- /dev/null
+++ b/remote_permissions/lang/ro/messages.po
@@ -0,0 +1,69 @@
+# ADDON remote_permissions
+# Copyright (C)
+# This file is distributed under the same license as the Friendica remote_permissions addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-08 12:05+0000\n"
+"Last-Translator: Arian - Cazare Muncitori <arianserv@gmail.com>\n"
+"Language-Team: Romanian (Romania) (http://www.transifex.com/projects/p/friendica/language/ro_RO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ro_RO\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
+
+#: remote_permissions.php:45
+msgid "Remote Permissions Settings"
+msgstr "Configurări Permisiuni la Distanță"
+
+#: remote_permissions.php:46
+msgid ""
+"Allow recipients of your private posts to see the other recipients of the "
+"posts"
+msgstr "Permite destinatarilor, posturile dvs. private, să-i vadă și pe ceilalți destinatari ai postărilor"
+
+#: remote_permissions.php:48 remote_permissions.php:196
+msgid "Save Settings"
+msgstr "Salvare Configurări"
+
+#: remote_permissions.php:58
+msgid "Remote Permissions settings updated."
+msgstr "Configurările Permisiunilor la Distanță, au fost actualizate."
+
+#: remote_permissions.php:124
+msgid "Visible to:"
+msgstr "Vizibil pentru :"
+
+#: remote_permissions.php:178
+msgid "Visible to"
+msgstr "Vizibil pentru"
+
+#: remote_permissions.php:178
+msgid "may only be a partial list"
+msgstr "poate fi doar o listă parțială"
+
+#: remote_permissions.php:197
+msgid "Global"
+msgstr "Global"
+
+#: remote_permissions.php:197
+msgid "The posts of every user on this server show the post recipients"
+msgstr "Postările fiecărui utilizator de pe acest server, afișează destinatarii mesajului"
+
+#: remote_permissions.php:198
+msgid "Individual"
+msgstr "Individual"
+
+#: remote_permissions.php:198
+msgid "Each user chooses whether his/her posts show the post recipients"
+msgstr "Fiecare utilizator alege dacă postările lui/ei, afișează și destinatarii mesajului"
+
+#: remote_permissions.php:205
+msgid "Settings updated."
+msgstr "Configurări actualizate."
diff --git a/remote_permissions/lang/ro/strings.php b/remote_permissions/lang/ro/strings.php
new file mode 100644
index 00000000..9a68662a
--- /dev/null
+++ b/remote_permissions/lang/ro/strings.php
@@ -0,0 +1,19 @@
+<?php
+
+if(! function_exists("string_plural_select_ro")) {
+function string_plural_select_ro($n){
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+}}
+;
+$a->strings["Remote Permissions Settings"] = "Configurări Permisiuni la Distanță";
+$a->strings["Allow recipients of your private posts to see the other recipients of the posts"] = "Permite destinatarilor, posturile dvs. private, să-i vadă și pe ceilalți destinatari ai postărilor";
+$a->strings["Save Settings"] = "Salvare Configurări";
+$a->strings["Remote Permissions settings updated."] = "Configurările Permisiunilor la Distanță, au fost actualizate.";
+$a->strings["Visible to:"] = "Vizibil pentru :";
+$a->strings["Visible to"] = "Vizibil pentru";
+$a->strings["may only be a partial list"] = "poate fi doar o listă parțială";
+$a->strings["Global"] = "Global";
+$a->strings["The posts of every user on this server show the post recipients"] = "Postările fiecărui utilizator de pe acest server, afișează destinatarii mesajului";
+$a->strings["Individual"] = "Individual";
+$a->strings["Each user chooses whether his/her posts show the post recipients"] = "Fiecare utilizator alege dacă postările lui/ei, afișează și destinatarii mesajului";
+$a->strings["Settings updated."] = "Configurări actualizate.";
diff --git a/remote_permissions/lang/ru/strings.php b/remote_permissions/lang/ru/strings.php
new file mode 100644
index 00000000..d43d61ea
--- /dev/null
+++ b/remote_permissions/lang/ru/strings.php
@@ -0,0 +1,14 @@
+<?php
+
+$a->strings["Remote Permissions Settings"] = "";
+$a->strings["Allow recipients of your private posts to see the other recipients of the posts"] = "";
+$a->strings["Submit"] = "Подтвердить";
+$a->strings["Remote Permissions settings updated."] = "";
+$a->strings["Visible to:"] = "Кто может видеть:";
+$a->strings["Visible to"] = "";
+$a->strings["may only be a partial list"] = "";
+$a->strings["Global"] = "";
+$a->strings["The posts of every user on this server show the post recipients"] = "";
+$a->strings["Individual"] = "";
+$a->strings["Each user chooses whether his/her posts show the post recipients"] = "";
+$a->strings["Settings updated."] = "Настройки обновлены.";
diff --git a/remote_permissions/lang/sv/strings.php b/remote_permissions/lang/sv/strings.php
new file mode 100644
index 00000000..dbec1ace
--- /dev/null
+++ b/remote_permissions/lang/sv/strings.php
@@ -0,0 +1,5 @@
+<?php
+
+$a->strings["Submit"] = "Spara";
+$a->strings["Visible to:"] = "Synlig f&ouml;r:";
+$a->strings["Settings updated."] = "Inst&auml;llningarna har uppdaterats.";
diff --git a/remote_permissions/lang/zh-cn/strings.php b/remote_permissions/lang/zh-cn/strings.php
new file mode 100644
index 00000000..68a0afe8
--- /dev/null
+++ b/remote_permissions/lang/zh-cn/strings.php
@@ -0,0 +1,14 @@
+<?php
+
+$a->strings["Remote Permissions Settings"] = "对外批准设置";
+$a->strings["Allow recipients of your private posts to see the other recipients of the posts"] = "允许您私人文章接受者看别接受者。";
+$a->strings["Submit"] = "提交";
+$a->strings["Remote Permissions settings updated."] = "对外批准设置更新了。";
+$a->strings["Visible to:"] = "可见给：";
+$a->strings["Visible to"] = "可见的给";
+$a->strings["may only be a partial list"] = "可能部分的单";
+$a->strings["Global"] = "综合";
+$a->strings["The posts of every user on this server show the post recipients"] = "这网站所有用户的文章表示接受者";
+$a->strings["Individual"] = "一个人的";
+$a->strings["Each user chooses whether his/her posts show the post recipients"] = "各用户选择他问上是否表示接受者";
+$a->strings["Settings updated."] = "设置跟新了";
diff --git a/remote_permissions/remote_permissions.php b/remote_permissions/remote_permissions.php
new file mode 100644
index 00000000..ad6d7b25
--- /dev/null
+++ b/remote_permissions/remote_permissions.php
@@ -0,0 +1,218 @@
+<?php
+/**
+ * Name: Remote Permissions
+ * Description: Allow the recipients of private posts to see who else can see the post by clicking the lock icon
+ * Version: 1.0
+ * Author: Zach <https://f.shmuz.in/profile/techcity>
+ * Status: Unsupported
+ */
+
+use Friendica\BaseObject;
+use Friendica\Core\Config;
+use Friendica\Core\Hook;
+use Friendica\Core\L10n;
+use Friendica\Core\PConfig;
+use Friendica\Core\Renderer;
+use Friendica\Database\DBA;
+use Friendica\Util\ACLFormatter;
+use Friendica\Util\Strings;
+
+function remote_permissions_install() {
+	Hook::register('lockview_content', 'addon/remote_permissions/remote_permissions.php', 'remote_permissions_content');
+	Hook::register('addon_settings', 'addon/remote_permissions/remote_permissions.php', 'remote_permissions_settings');
+	Hook::register('addon_settings_post', 'addon/remote_permissions/remote_permissions.php', 'remote_permissions_settings_post');
+}
+
+function remote_permissions_uninstall() {
+	Hook::unregister('lockview_content', 'addon/remote_permissions/remote_permissions.php', 'remote_permissions_content');
+	Hook::unregister('addon_settings', 'addon/remote_permissions/remote_permissions.php', 'remote_permissions_settings');
+	Hook::unregister('addon_settings_post', 'addon/remote_permissions/remote_permissions.php', 'remote_permissions_settings_post');
+}
+
+function remote_permissions_settings(&$a,&$o) {
+
+	if(! local_user())
+		return;
+
+	$global = Config::get("remote_perms", "global");
+	if($global == 1)
+		return;
+
+	/* Add our stylesheet to the page so we can make our settings look nice */
+
+	$a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->getBaseURL() . '/addon/remote_permissions/settings.css' . '" media="all" />' . "\r\n";
+
+	/* Get the current state of our config variable */
+
+	$remote_perms = PConfig::get(local_user(),'remote_perms','show');
+
+	/* Add some HTML to the existing form */
+
+//	$t = file_get_contents("addon/remote_permissions/settings.tpl" );
+	$t = Renderer::getMarkupTemplate("settings.tpl", "addon/remote_permissions/" );
+	$o .= Renderer::replaceMacros($t, [
+		'$remote_perms_title' => L10n::t('Remote Permissions Settings'),
+		'$remote_perms_label' => L10n::t('Allow recipients of your private posts to see the other recipients of the posts'),
+		'$checked' => (($remote_perms == 1) ? 'checked="checked"' : ''),
+		'$submit' => L10n::t('Save Settings')
+	]);
+
+}
+
+function remote_permissions_settings_post($a,$post) {
+	if(! local_user() || empty($_POST['remote-perms-submit']))
+		return;
+
+	PConfig::set(local_user(),'remote_perms','show',intval($_POST['remote-perms']));
+	info(L10n::t('Remote Permissions settings updated.') . EOL);
+}
+
+function remote_permissions_content($a, $item_copy) {
+
+	if($item_copy['uid'] != local_user())
+		return;
+
+	if(Config::get('remote_perms','global') == 0) {
+		// Admin has set Individual choice. We need to find
+		// the original poster. First, get the contact's info
+		$r = q("SELECT nick, url FROM contact WHERE id = %d LIMIT 1",
+		       intval($item_copy['contact-id'])
+		);
+		if(! $r)
+			return;
+
+		// Find out if the contact lives here
+		$baseurl = $a->getBaseURL();
+		$baseurl = substr($baseurl, strpos($baseurl, '://') + 3);
+		if(strpos($r[0]['url'], $baseurl) === false)
+			return;
+
+		// The contact lives here. Get his/her user info
+		$nick = $r[0]['nick'];
+		$r = q("SELECT uid FROM user WHERE nickname = '%s' LIMIT 1",
+		       DBA::escape($nick)
+		);
+		if(! $r)
+			return;
+
+		if(PConfig::get($r[0]['uid'],'remote_perms','show') == 0)
+			return;
+	}
+
+	if(($item_copy['private'] == 1) && (! strlen($item_copy['allow_cid'])) && (! strlen($item_copy['allow_gid']))
+		&& (! strlen($item_copy['deny_cid'])) && (! strlen($item_copy['deny_gid']))) {
+
+		$allow_names = [];
+
+		// Check for the original post here -- that's the only way
+		// to definitely get all of the recipients
+
+		if($item_copy['uri'] === $item_copy['parent-uri']) {
+			// Lockview for a top-level post
+			$r = q("SELECT allow_cid, allow_gid, deny_cid, deny_gid FROM item WHERE uri = '%s' AND type = 'wall' LIMIT 1",
+				   DBA::escape($item_copy['uri'])
+			);
+		}
+		else {
+			// Lockview for a comment
+			$r = q("SELECT allow_cid, allow_gid, deny_cid, deny_gid FROM item WHERE uri = '%s'
+			        AND parent = ( SELECT id FROM item WHERE uri = '%s' AND type = 'wall' ) LIMIT 1",
+				   DBA::escape($item_copy['uri']),
+				   DBA::escape($item_copy['parent-uri'])
+			);
+		}
+		if($r) {
+
+			$item = $r[0];
+
+			/** @var ACLFormatter $aclFormatter */
+			$aclFormatter = BaseObject::getClass(ACLFormatter::class);
+
+			$allowed_users = $aclFormatter->expand($item['allow_cid']);
+			$allowed_groups = $aclFormatter->expand($item['allow_gid']);
+			$deny_users = $aclFormatter->expand($item['deny_cid']);
+			$deny_groups = $aclFormatter->expand($item['deny_gid']);
+
+			$o = L10n::t('Visible to:') . '<br />';
+			$allow = [];
+			$deny = [];
+
+			if(count($allowed_groups)) {
+				$r = q("SELECT DISTINCT `contact-id` FROM group_member WHERE gid IN ( %s )",
+					DBA::escape(implode(', ', $allowed_groups))
+				);
+				foreach($r as $rr)
+					$allow[] = $rr['contact-id'];
+			}
+			$allow = array_unique($allow + $allowed_users);
+
+			if(count($deny_groups)) {
+				$r = q("SELECT DISTINCT `contact-id` FROM group_member WHERE gid IN ( %s )",
+					DBA::escape(implode(', ', $deny_groups))
+				);
+				foreach($r as $rr)
+					$deny[] = $rr['contact-id'];
+			}
+			$deny = $deny + $deny_users;
+
+			if($allow)
+			{
+				$r = q("SELECT name FROM contact WHERE id IN ( %s )",
+					   DBA::escape(implode(', ', array_diff($allow, $deny)))
+				);
+				foreach($r as $rr)
+					$allow_names[] = $rr['name'];
+			}
+		}
+		else {
+			// We don't have the original post. Let's try for the next best thing:
+			// checking who else has the post on our own server. Note that comments
+			// that were sent to Diaspora and were relayed to others on our server
+			// will have different URIs than the original. We can match the GUID for
+			// those
+			$r = q("SELECT `uid` FROM item WHERE uri = '%s' OR guid = '%s'",
+				   DBA::escape($item_copy['uri']),
+			       DBA::escape($item_copy['guid'])
+			);
+			if(! $r)
+				return;
+
+			$allow = [];
+			foreach($r as $rr)
+				$allow[] = $rr['uid'];
+
+			$r = q("SELECT username FROM user WHERE uid IN ( %s )",
+				DBA::escape(implode(', ', $allow))
+			);
+			if(! $r)
+				return;
+
+			$o = L10n::t('Visible to') . ' (' . L10n::t('may only be a partial list') . '):<br />';
+
+			foreach($r as $rr)
+				$allow_names[] = $rr['username'];
+		}
+
+		// Sort the names alphabetically, case-insensitive
+		natcasesort($allow_names);
+		echo $o . implode(', ', $allow_names);
+		exit();
+	}
+
+	return;
+}
+
+function remote_permissions_addon_admin(&$a, &$o){
+	$t = Renderer::getMarkupTemplate( "admin.tpl", "addon/remote_permissions/" );
+	$o = Renderer::replaceMacros($t, [
+		'$submit' => L10n::t('Save Settings'),
+		'$global' => ['remotepermschoice', L10n::t('Global'), 1, L10n::t('The posts of every user on this server show the post recipients'),  Config::get('remote_perms', 'global') == 1],
+		'$individual' => ['remotepermschoice', L10n::t('Individual'), 2, L10n::t('Each user chooses whether his/her posts show the post recipients'),  Config::get('remote_perms', 'global') == 0]
+	]);
+}
+
+function remote_permissions_addon_admin_post(&$a){
+	$choice	=	(!empty($_POST['remotepermschoice'])		? Strings::escapeTags(trim($_POST['remotepermschoice']))	: '');
+	Config::set('remote_perms','global',($choice == 1 ? 1 : 0));
+	info(L10n::t('Settings updated.'). EOL);
+}
diff --git a/remote_permissions/settings.css b/remote_permissions/settings.css
new file mode 100644
index 00000000..ef6051d2
--- /dev/null
+++ b/remote_permissions/settings.css
@@ -0,0 +1,16 @@
+
+
+
+#remote-perms-label {
+	float: left;
+	width: 200px;
+	margin-bottom: 25px;
+	margin-right: 20px;
+	text-align: justify;
+}
+
+#remote-perms {
+	float: left;
+}
+
+
diff --git a/remote_permissions/templates/admin.tpl b/remote_permissions/templates/admin.tpl
new file mode 100644
index 00000000..e67afd73
--- /dev/null
+++ b/remote_permissions/templates/admin.tpl
@@ -0,0 +1,3 @@
+{{include file="field_radio.tpl" field=$global}}
+{{include file="field_radio.tpl" field=$individual}}
+<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
diff --git a/remote_permissions/templates/settings.tpl b/remote_permissions/templates/settings.tpl
new file mode 100644
index 00000000..df89a32e
--- /dev/null
+++ b/remote_permissions/templates/settings.tpl
@@ -0,0 +1,8 @@
+	<div class="settings-block">
+	<h3>{{$remote_perms_title}}</h3>
+	<div id="remote-perms-wrapper">
+	<label id="remote-perms-label" for="remote-perms">{{$remote_perms_label}}</label>
+	<input id="remote-perms-input" type="checkbox" name="remote-perms" value="1" {{$checked}} />
+	</div><div class="clear"></div>
+	<div class="settings-submit-wrapper" ><input type="submit" name="remote-perms-submit" class="settings-submit" value="{{$submit}}" /></div></div>
+
diff --git a/rendertime/lang/C/messages.po b/rendertime/lang/C/messages.po
index 7d482ca1..ed61f81f 100644
--- a/rendertime/lang/C/messages.po
+++ b/rendertime/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-12 22:09+0000\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,36 +17,9 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: rendertime.php:30
-msgid "Save Settings"
-msgstr ""
-
-#: rendertime.php:31
-msgid "Show callstack"
-msgstr ""
-
-#: rendertime.php:31
-msgid ""
-"Show detailed performance measures in the callstack. When deactivated, only "
-"the summary will be displayed."
-msgstr ""
-
-#: rendertime.php:32
-msgid "Minimal time"
-msgstr ""
-
-#: rendertime.php:32
-msgid "Minimal time that an activity needs to be listed in the callstack."
-msgstr ""
-
-#: rendertime.php:57
+#: rendertime.php:29
 #, php-format
 msgid ""
-"Database: %s/%s, Network: %s, Rendering: %s, Session: %s, I/O: %s, Other: "
-"%s, Total: %s"
-msgstr ""
-
-#: rendertime.php:74
-#, php-format
-msgid "Class-Init: %s, Boot: %s, Init: %s, Content: %s, Other: %s, Total: %s"
+"Performance: Database: %s, Network: %s, Rendering: %s, Parser: %s, I/O: %s, "
+"Other: %s, Total: %s"
 msgstr ""
diff --git a/rendertime/lang/ar/messages.po b/rendertime/lang/ar/messages.po
deleted file mode 100644
index 4533380c..00000000
--- a/rendertime/lang/ar/messages.po
+++ /dev/null
@@ -1,55 +0,0 @@
-# ADDON rendertime
-# Copyright (C)
-# This file is distributed under the same license as the Friendica rendertime addon package.
-# 
-# 
-# Translators:
-# ButterflyOfFire, 2022
-# Farida Khalaf <faridakhalaf@hotmail.com>, 2021
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-12 22:09+0000\n"
-"PO-Revision-Date: 2014-06-23 12:36+0000\n"
-"Last-Translator: ButterflyOfFire, 2022\n"
-"Language-Team: Arabic (http://www.transifex.com/Friendica/friendica/language/ar/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ar\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-
-#: rendertime.php:30
-msgid "Save Settings"
-msgstr "احفظ الإعدادات"
-
-#: rendertime.php:31
-msgid "Show callstack"
-msgstr ""
-
-#: rendertime.php:31
-msgid ""
-"Show detailed performance measures in the callstack. When deactivated, only "
-"the summary will be displayed."
-msgstr ""
-
-#: rendertime.php:32
-msgid "Minimal time"
-msgstr ""
-
-#: rendertime.php:32
-msgid "Minimal time that an activity needs to be listed in the callstack."
-msgstr ""
-
-#: rendertime.php:57
-#, php-format
-msgid ""
-"Database: %s/%s, Network: %s, Rendering: %s, Session: %s, I/O: %s, Other: "
-"%s, Total: %s"
-msgstr "قاعدة البيانات: %s/ %s، الشبكة:%s ، التقديم: %s، الجلسة:%s ، الإدخال / الإخراج: %s، أخرى: %s، المجموع:%s"
-
-#: rendertime.php:74
-#, php-format
-msgid "Class-Init: %s, Boot: %s, Init: %s, Content: %s, Other: %s, Total: %s"
-msgstr "تهيئة النوع:%s ، التمهيد: %s، التهيئة: %s، المحتوى: %s، أخرى:%s ، الإجمالي:%s"
diff --git a/rendertime/lang/ar/strings.php b/rendertime/lang/ar/strings.php
deleted file mode 100644
index b5b885f9..00000000
--- a/rendertime/lang/ar/strings.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_ar")) {
-function string_plural_select_ar($n){
-	$n = intval($n);
-	if ($n==0) { return 0; } else if ($n==1) { return 1; } else if ($n==2) { return 2; } else if ($n%100>=3 && $n%100<=10) { return 3; } else if ($n%100>=11 && $n%100<=99) { return 4; } else  { return 5; }
-}}
-$a->strings['Save Settings'] = 'احفظ الإعدادات';
-$a->strings['Database: %s/%s, Network: %s, Rendering: %s, Session: %s, I/O: %s, Other: %s, Total: %s'] = 'قاعدة البيانات: %s/ %s، الشبكة:%s ، التقديم: %s، الجلسة:%s ، الإدخال / الإخراج: %s، أخرى: %s، المجموع:%s';
-$a->strings['Class-Init: %s, Boot: %s, Init: %s, Content: %s, Other: %s, Total: %s'] = 'تهيئة النوع:%s ، التمهيد: %s، التهيئة: %s، المحتوى: %s، أخرى:%s ، الإجمالي:%s';
diff --git a/rendertime/lang/cs/messages.po b/rendertime/lang/cs/messages.po
index e9fc0c9b..1a2404d7 100644
--- a/rendertime/lang/cs/messages.po
+++ b/rendertime/lang/cs/messages.po
@@ -4,52 +4,24 @@
 # 
 # 
 # Translators:
-# Aditoo, 2018
-# michal_s <msupler@gmail.com>, 2014
+# Michal Šupler <msupler@gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-12 22:09+0000\n"
-"PO-Revision-Date: 2014-06-23 12:36+0000\n"
-"Last-Translator: Aditoo, 2018\n"
-"Language-Team: Czech (http://app.transifex.com/Friendica/friendica/language/cs/)\n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-07-28 18:10+0000\n"
+"Last-Translator: Michal Šupler <msupler@gmail.com>\n"
+"Language-Team: Czech (http://www.transifex.com/projects/p/friendica/language/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: cs\n"
-"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #: rendertime.php:30
-msgid "Save Settings"
-msgstr ""
-
-#: rendertime.php:31
-msgid "Show callstack"
-msgstr ""
-
-#: rendertime.php:31
-msgid ""
-"Show detailed performance measures in the callstack. When deactivated, only "
-"the summary will be displayed."
-msgstr ""
-
-#: rendertime.php:32
-msgid "Minimal time"
-msgstr ""
-
-#: rendertime.php:32
-msgid "Minimal time that an activity needs to be listed in the callstack."
-msgstr ""
-
-#: rendertime.php:57
 #, php-format
 msgid ""
-"Database: %s/%s, Network: %s, Rendering: %s, Session: %s, I/O: %s, Other: "
-"%s, Total: %s"
-msgstr ""
-
-#: rendertime.php:74
-#, php-format
-msgid "Class-Init: %s, Boot: %s, Init: %s, Content: %s, Other: %s, Total: %s"
-msgstr ""
+"Performance: Database: %s, Network: %s, Rendering: %s, Parser: %s, I/O: %s, "
+"Other: %s, Total: %s"
+msgstr "Výkonnost: Databáze: %s, Síť: %s, Rendering: %s, Parser: %s, I/O: %s, Ostatní: %s, Celkem: %s"
diff --git a/rendertime/lang/cs/strings.php b/rendertime/lang/cs/strings.php
index ce2e465e..151316c1 100644
--- a/rendertime/lang/cs/strings.php
+++ b/rendertime/lang/cs/strings.php
@@ -2,6 +2,7 @@
 
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
-	$n = intval($n);
-	if (($n == 1 && $n % 1 == 0)) { return 0; } else if (($n >= 2 && $n <= 4 && $n % 1 == 0)) { return 1; } else if (($n % 1 != 0 )) { return 2; } else  { return 3; }
+	return ($n==1) ? 0 : ($n>=2 && $n<=4) ? 1 : 2;;
 }}
+;
+$a->strings["Performance: Database: %s, Network: %s, Rendering: %s, Parser: %s, I/O: %s, Other: %s, Total: %s"] = "Výkonnost: Databáze: %s, Síť: %s, Rendering: %s, Parser: %s, I/O: %s, Ostatní: %s, Celkem: %s";
diff --git a/rendertime/lang/da-dk/messages.po b/rendertime/lang/da-dk/messages.po
deleted file mode 100644
index 03387847..00000000
--- a/rendertime/lang/da-dk/messages.po
+++ /dev/null
@@ -1,53 +0,0 @@
-# ADDON rendertime
-# Copyright (C)
-# This file is distributed under the same license as the Friendica rendertime addon package.
-# 
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-12 22:09+0000\n"
-"PO-Revision-Date: 2014-06-23 12:36+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Danish (Denmark) (http://www.transifex.com/Friendica/friendica/language/da_DK/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: da_DK\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: rendertime.php:30
-msgid "Save Settings"
-msgstr ""
-
-#: rendertime.php:31
-msgid "Show callstack"
-msgstr ""
-
-#: rendertime.php:31
-msgid ""
-"Show detailed performance measures in the callstack. When deactivated, only "
-"the summary will be displayed."
-msgstr ""
-
-#: rendertime.php:32
-msgid "Minimal time"
-msgstr ""
-
-#: rendertime.php:32
-msgid "Minimal time that an activity needs to be listed in the callstack."
-msgstr ""
-
-#: rendertime.php:57
-#, php-format
-msgid ""
-"Database: %s/%s, Network: %s, Rendering: %s, Session: %s, I/O: %s, Other: "
-"%s, Total: %s"
-msgstr ""
-
-#: rendertime.php:74
-#, php-format
-msgid "Class-Init: %s, Boot: %s, Init: %s, Content: %s, Other: %s, Total: %s"
-msgstr ""
diff --git a/rendertime/lang/da-dk/strings.php b/rendertime/lang/da-dk/strings.php
deleted file mode 100644
index 09554750..00000000
--- a/rendertime/lang/da-dk/strings.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_da_dk")) {
-function string_plural_select_da_dk($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
diff --git a/rendertime/lang/de/messages.po b/rendertime/lang/de/messages.po
index 293ed698..4924324d 100644
--- a/rendertime/lang/de/messages.po
+++ b/rendertime/lang/de/messages.po
@@ -4,16 +4,15 @@
 # 
 # 
 # Translators:
-# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2014
-# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2021-2022
+# bavatar <tobias.diekershoff@gmx.net>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-12 22:09+0000\n"
-"PO-Revision-Date: 2014-06-23 12:36+0000\n"
-"Last-Translator: Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2021-2022\n"
-"Language-Team: German (http://app.transifex.com/Friendica/friendica/language/de/)\n"
+"POT-Creation-Date: 2014-06-22 13:18+0200\n"
+"PO-Revision-Date: 2014-10-02 14:36+0000\n"
+"Last-Translator: bavatar <tobias.diekershoff@gmx.net>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/friendica/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -21,35 +20,8 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: rendertime.php:30
-msgid "Save Settings"
-msgstr "Einstellungen speichern"
-
-#: rendertime.php:31
-msgid "Show callstack"
-msgstr "Callstack anzeigen"
-
-#: rendertime.php:31
-msgid ""
-"Show detailed performance measures in the callstack. When deactivated, only "
-"the summary will be displayed."
-msgstr "Detailierte Performance Messungen im Callstack anzeigen. Wenn dies aktiviert ist werden anstelle der Zusammenfassung mehr Details angezeigt."
-
-#: rendertime.php:32
-msgid "Minimal time"
-msgstr "Minimale Zeit"
-
-#: rendertime.php:32
-msgid "Minimal time that an activity needs to be listed in the callstack."
-msgstr "Minimale Zeit die eine Aktivität dauern soll, ehe sie im Callstack aufgelistet wird."
-
-#: rendertime.php:57
 #, php-format
 msgid ""
-"Database: %s/%s, Network: %s, Rendering: %s, Session: %s, I/O: %s, Other: "
-"%s, Total: %s"
-msgstr "Datenbank: %s/%s, Netzwerk: %s, Darstellung: %s, Sitzung: %s, I/O: %s, Sonstiges: %s, Gesamt: %s"
-
-#: rendertime.php:74
-#, php-format
-msgid "Class-Init: %s, Boot: %s, Init: %s, Content: %s, Other: %s, Total: %s"
-msgstr "Class-Init: %s, Boot: %s, Init: %s, Inhalt: %s, Sonstiges: %s, Gesamt: %s"
+"Performance: Database: %s, Network: %s, Rendering: %s, Parser: %s, I/O: %s, "
+"Other: %s, Total: %s"
+msgstr "Performance: Datenbank: %s, Netzwerk: %s, Rendering: %s, Parser: %s, I/O: %s, Anderes: %s, Gesamt: %s"
diff --git a/rendertime/lang/de/strings.php b/rendertime/lang/de/strings.php
index d31a9f92..f591a702 100644
--- a/rendertime/lang/de/strings.php
+++ b/rendertime/lang/de/strings.php
@@ -2,13 +2,7 @@
 
 if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Save Settings'] = 'Einstellungen speichern';
-$a->strings['Show callstack'] = 'Callstack anzeigen';
-$a->strings['Show detailed performance measures in the callstack. When deactivated, only the summary will be displayed.'] = 'Detailierte Performance Messungen im Callstack anzeigen. Wenn dies aktiviert ist werden anstelle der Zusammenfassung mehr Details angezeigt.';
-$a->strings['Minimal time'] = 'Minimale Zeit';
-$a->strings['Minimal time that an activity needs to be listed in the callstack.'] = 'Minimale Zeit die eine Aktivität dauern soll, ehe sie im Callstack aufgelistet wird.';
-$a->strings['Database: %s/%s, Network: %s, Rendering: %s, Session: %s, I/O: %s, Other: %s, Total: %s'] = 'Datenbank: %s/%s, Netzwerk: %s, Darstellung: %s, Sitzung: %s, I/O: %s, Sonstiges: %s, Gesamt: %s';
-$a->strings['Class-Init: %s, Boot: %s, Init: %s, Content: %s, Other: %s, Total: %s'] = 'Class-Init: %s, Boot: %s, Init: %s, Inhalt: %s, Sonstiges: %s, Gesamt: %s';
+;
+$a->strings["Performance: Database: %s, Network: %s, Rendering: %s, Parser: %s, I/O: %s, Other: %s, Total: %s"] = "Performance: Datenbank: %s, Netzwerk: %s, Rendering: %s, Parser: %s, I/O: %s, Anderes: %s, Gesamt: %s";
diff --git a/rendertime/lang/es/messages.po b/rendertime/lang/es/messages.po
index 33aa6afd..b672e0a8 100644
--- a/rendertime/lang/es/messages.po
+++ b/rendertime/lang/es/messages.po
@@ -5,14 +5,13 @@
 # 
 # Translators:
 # Albert, 2016
-# Senex Petrovic <javierruizo@hotmail.com>, 2021
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2021-04-06 02:05+0000\n"
-"Last-Translator: Senex Petrovic <javierruizo@hotmail.com>\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2016-11-17 22:31+0000\n"
+"Last-Translator: Albert\n"
 "Language-Team: Spanish (http://www.transifex.com/Friendica/friendica/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,14 +19,9 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: rendertime.php:36
+#: rendertime.php:29
 #, php-format
 msgid ""
-"Database: %s/%s, Network: %s, Rendering: %s, Session: %s, I/O: %s, Other: "
-"%s, Total: %s"
-msgstr "Base de Datos: %s/%s, Red: %s, Reproducción: %s, Sesión: %s, E/S: %s, Otros: %s, Total: %s"
-
-#: rendertime.php:53
-#, php-format
-msgid "Class-Init: %s, Boot: %s, Init: %s, Content: %s, Other: %s, Total: %s"
-msgstr "Clase de Inicio: %s, Arranque: %s, Inicio: %s, Contenido: %s, Otros: %s, Total: %s"
+"Performance: Database: %s, Network: %s, Rendering: %s, Parser: %s, I/O: %s, "
+"Other: %s, Total: %s"
+msgstr "Cumplimiento: Base de datos: %s, Red: %s, Renderizado: %s, Analizador: %s, I/O: %s, Otro: %s, Total: %s"
diff --git a/rendertime/lang/es/strings.php b/rendertime/lang/es/strings.php
index 28cc6393..1cd57a0b 100644
--- a/rendertime/lang/es/strings.php
+++ b/rendertime/lang/es/strings.php
@@ -2,8 +2,7 @@
 
 if(! function_exists("string_plural_select_es")) {
 function string_plural_select_es($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Database: %s/%s, Network: %s, Rendering: %s, Session: %s, I/O: %s, Other: %s, Total: %s'] = 'Base de Datos: %s/%s, Red: %s, Reproducción: %s, Sesión: %s, E/S: %s, Otros: %s, Total: %s';
-$a->strings['Class-Init: %s, Boot: %s, Init: %s, Content: %s, Other: %s, Total: %s'] = 'Clase de Inicio: %s, Arranque: %s, Inicio: %s, Contenido: %s, Otros: %s, Total: %s';
+;
+$a->strings["Performance: Database: %s, Network: %s, Rendering: %s, Parser: %s, I/O: %s, Other: %s, Total: %s"] = "Cumplimiento: Base de datos: %s, Red: %s, Renderizado: %s, Analizador: %s, I/O: %s, Otro: %s, Total: %s";
diff --git a/rendertime/lang/fi-fi/strings.php b/rendertime/lang/fi-fi/strings.php
index 8712034e..47c2a91b 100644
--- a/rendertime/lang/fi-fi/strings.php
+++ b/rendertime/lang/fi-fi/strings.php
@@ -2,6 +2,7 @@
 
 if(! function_exists("string_plural_select_fi_fi")) {
 function string_plural_select_fi_fi($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
+;
+$a->strings["Performance: Database: %s, Network: %s, Rendering: %s, Parser: %s, I/O: %s, Other: %s, Total: %s"] = "";
diff --git a/rendertime/lang/fr/messages.po b/rendertime/lang/fr/messages.po
index 0740d569..42bd84a9 100644
--- a/rendertime/lang/fr/messages.po
+++ b/rendertime/lang/fr/messages.po
@@ -4,53 +4,24 @@
 # 
 # 
 # Translators:
-# Hypolite Petovan <hypolite@mrpetovan.com>, 2022
-# Nicolas Derive, 2022
 # Thecross, 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-12 22:09+0000\n"
-"PO-Revision-Date: 2014-06-23 12:36+0000\n"
-"Last-Translator: Nicolas Derive, 2022\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2017-12-04 22:24+0000\n"
+"Last-Translator: Thecross\n"
 "Language-Team: French (http://www.transifex.com/Friendica/friendica/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fr\n"
-"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: rendertime.php:30
-msgid "Save Settings"
-msgstr "Enregistrer les paramètres"
-
-#: rendertime.php:31
-msgid "Show callstack"
-msgstr "Afficher le callstack"
-
-#: rendertime.php:31
-msgid ""
-"Show detailed performance measures in the callstack. When deactivated, only "
-"the summary will be displayed."
-msgstr "Affiche les performances détaillées dans le callstack. Si désactivé, seul le résumé sera affiché."
-
-#: rendertime.php:32
-msgid "Minimal time"
-msgstr "Temps minimal"
-
-#: rendertime.php:32
-msgid "Minimal time that an activity needs to be listed in the callstack."
-msgstr "Temps minimal qu'une activité nécessite afin d'être listée dans le callstack."
-
-#: rendertime.php:57
+#: rendertime.php:29
 #, php-format
 msgid ""
-"Database: %s/%s, Network: %s, Rendering: %s, Session: %s, I/O: %s, Other: "
-"%s, Total: %s"
-msgstr "Base de données : %s/%s, Réseau : %s, Rendu : %s, Session : %s, E/S : %s, Autre : %s, Total : %s"
-
-#: rendertime.php:74
-#, php-format
-msgid "Class-Init: %s, Boot: %s, Init: %s, Content: %s, Other: %s, Total: %s"
-msgstr "Initialisation classes : %s, Démarrage : %s, Initialisation :%s, Contenu : %s, Autre : %s, Total : %s"
+"Performance: Database: %s, Network: %s, Rendering: %s, Parser: %s, I/O: %s, "
+"Other: %s, Total: %s"
+msgstr "Performances: Base de données : %s, Réseau : %s, Rendu : %s, Parser : %s, Entrées/sorties : %s, Autre : %s, Total : %s"
diff --git a/rendertime/lang/fr/strings.php b/rendertime/lang/fr/strings.php
index d6aed6fa..b806c8f3 100644
--- a/rendertime/lang/fr/strings.php
+++ b/rendertime/lang/fr/strings.php
@@ -2,13 +2,7 @@
 
 if(! function_exists("string_plural_select_fr")) {
 function string_plural_select_fr($n){
-	$n = intval($n);
-	if (($n == 0 || $n == 1)) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
+	return ($n > 1);;
 }}
-$a->strings['Save Settings'] = 'Enregistrer les paramètres';
-$a->strings['Show callstack'] = 'Afficher le callstack';
-$a->strings['Show detailed performance measures in the callstack. When deactivated, only the summary will be displayed.'] = 'Affiche les performances détaillées dans le callstack. Si désactivé, seul le résumé sera affiché.';
-$a->strings['Minimal time'] = 'Temps minimal';
-$a->strings['Minimal time that an activity needs to be listed in the callstack.'] = 'Temps minimal qu\'une activité nécessite afin d\'être listée dans le callstack.';
-$a->strings['Database: %s/%s, Network: %s, Rendering: %s, Session: %s, I/O: %s, Other: %s, Total: %s'] = 'Base de données : %s/%s, Réseau : %s, Rendu : %s, Session : %s, E/S : %s, Autre : %s, Total : %s';
-$a->strings['Class-Init: %s, Boot: %s, Init: %s, Content: %s, Other: %s, Total: %s'] = 'Initialisation classes : %s, Démarrage : %s, Initialisation :%s, Contenu : %s, Autre : %s, Total : %s';
+;
+$a->strings["Performance: Database: %s, Network: %s, Rendering: %s, Parser: %s, I/O: %s, Other: %s, Total: %s"] = "Performances: Base de données : %s, Réseau : %s, Rendu : %s, Parser : %s, Entrées/sorties : %s, Autre : %s, Total : %s";
diff --git a/rendertime/lang/hu/messages.po b/rendertime/lang/hu/messages.po
deleted file mode 100644
index 6e26a25b..00000000
--- a/rendertime/lang/hu/messages.po
+++ /dev/null
@@ -1,54 +0,0 @@
-# ADDON rendertime
-# Copyright (C)
-# This file is distributed under the same license as the Friendica rendertime addon package.
-# 
-# 
-# Translators:
-# Balázs Úr, 2020-2021
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-12 22:09+0000\n"
-"PO-Revision-Date: 2014-06-23 12:36+0000\n"
-"Last-Translator: Balázs Úr, 2020-2021\n"
-"Language-Team: Hungarian (http://www.transifex.com/Friendica/friendica/language/hu/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: hu\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: rendertime.php:30
-msgid "Save Settings"
-msgstr "Beállítások mentése"
-
-#: rendertime.php:31
-msgid "Show callstack"
-msgstr "Hívásverem megjelenítése"
-
-#: rendertime.php:31
-msgid ""
-"Show detailed performance measures in the callstack. When deactivated, only "
-"the summary will be displayed."
-msgstr "Részletes teljesítménymérések megjelenítése a hívásveremben. Ha ki van kapcsolva, akkor csak az összegzés lesz megjelenítve."
-
-#: rendertime.php:32
-msgid "Minimal time"
-msgstr "Legkevesebb idő"
-
-#: rendertime.php:32
-msgid "Minimal time that an activity needs to be listed in the callstack."
-msgstr "A legkevesebb idő, amíg egy tevékenységnek szerepelnie kell a hívásveremben."
-
-#: rendertime.php:57
-#, php-format
-msgid ""
-"Database: %s/%s, Network: %s, Rendering: %s, Session: %s, I/O: %s, Other: "
-"%s, Total: %s"
-msgstr "Adatbázis: %s/%s, hálózat: %s, megjelenítés: %s, munkamenet: %s, lemezművelet: %s, egyéb: %s, összesen: %s"
-
-#: rendertime.php:74
-#, php-format
-msgid "Class-Init: %s, Boot: %s, Init: %s, Content: %s, Other: %s, Total: %s"
-msgstr "Osztály-előkészítés: %s, indítás: %s, előkészítés: %s, tartalom: %s, egyéb: %s, összesen: %s"
diff --git a/rendertime/lang/hu/strings.php b/rendertime/lang/hu/strings.php
deleted file mode 100644
index 527ac507..00000000
--- a/rendertime/lang/hu/strings.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_hu")) {
-function string_plural_select_hu($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Save Settings'] = 'Beállítások mentése';
-$a->strings['Show callstack'] = 'Hívásverem megjelenítése';
-$a->strings['Show detailed performance measures in the callstack. When deactivated, only the summary will be displayed.'] = 'Részletes teljesítménymérések megjelenítése a hívásveremben. Ha ki van kapcsolva, akkor csak az összegzés lesz megjelenítve.';
-$a->strings['Minimal time'] = 'Legkevesebb idő';
-$a->strings['Minimal time that an activity needs to be listed in the callstack.'] = 'A legkevesebb idő, amíg egy tevékenységnek szerepelnie kell a hívásveremben.';
-$a->strings['Database: %s/%s, Network: %s, Rendering: %s, Session: %s, I/O: %s, Other: %s, Total: %s'] = 'Adatbázis: %s/%s, hálózat: %s, megjelenítés: %s, munkamenet: %s, lemezművelet: %s, egyéb: %s, összesen: %s';
-$a->strings['Class-Init: %s, Boot: %s, Init: %s, Content: %s, Other: %s, Total: %s'] = 'Osztály-előkészítés: %s, indítás: %s, előkészítés: %s, tartalom: %s, egyéb: %s, összesen: %s';
diff --git a/rendertime/lang/it/messages.po b/rendertime/lang/it/messages.po
index 482abb02..c16855c3 100644
--- a/rendertime/lang/it/messages.po
+++ b/rendertime/lang/it/messages.po
@@ -5,51 +5,23 @@
 # 
 # Translators:
 # fabrixxm <fabrix.xm@gmail.com>, 2014
-# Sylke Vicious <silkevicious@gmail.com>, 2021
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-12 22:09+0000\n"
-"PO-Revision-Date: 2014-06-23 12:36+0000\n"
-"Last-Translator: Sylke Vicious <silkevicious@gmail.com>, 2021\n"
-"Language-Team: Italian (http://app.transifex.com/Friendica/friendica/language/it/)\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2017-09-20 06:08+0000\n"
+"Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n"
+"Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: it\n"
-"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: rendertime.php:30
-msgid "Save Settings"
-msgstr ""
-
-#: rendertime.php:31
-msgid "Show callstack"
-msgstr ""
-
-#: rendertime.php:31
-msgid ""
-"Show detailed performance measures in the callstack. When deactivated, only "
-"the summary will be displayed."
-msgstr ""
-
-#: rendertime.php:32
-msgid "Minimal time"
-msgstr ""
-
-#: rendertime.php:32
-msgid "Minimal time that an activity needs to be listed in the callstack."
-msgstr ""
-
-#: rendertime.php:57
+#: rendertime.php:29
 #, php-format
 msgid ""
-"Database: %s/%s, Network: %s, Rendering: %s, Session: %s, I/O: %s, Other: "
-"%s, Total: %s"
-msgstr "Database: %s/%s, Rete: %s, Rendering: %s, Sessione: %s, I/O: %s, Altro: %s, Totale: %s"
-
-#: rendertime.php:74
-#, php-format
-msgid "Class-Init: %s, Boot: %s, Init: %s, Content: %s, Other: %s, Total: %s"
-msgstr "Class-Init: %s, Boot: %s, Init: %s, Content: %s, Altro: %s, Totale: %s"
+"Performance: Database: %s, Network: %s, Rendering: %s, Parser: %s, I/O: %s, "
+"Other: %s, Total: %s"
+msgstr "Performance: Database: %s, Network: %s, Rendering: %s, Parser: %s, I/O: %s, Other: %s, Total: %s"
diff --git a/rendertime/lang/it/strings.php b/rendertime/lang/it/strings.php
index 5b05d933..ad0c22d4 100644
--- a/rendertime/lang/it/strings.php
+++ b/rendertime/lang/it/strings.php
@@ -2,8 +2,7 @@
 
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
-	$n = intval($n);
-	if ($n == 1) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
+	return ($n != 1);;
 }}
-$a->strings['Database: %s/%s, Network: %s, Rendering: %s, Session: %s, I/O: %s, Other: %s, Total: %s'] = 'Database: %s/%s, Rete: %s, Rendering: %s, Sessione: %s, I/O: %s, Altro: %s, Totale: %s';
-$a->strings['Class-Init: %s, Boot: %s, Init: %s, Content: %s, Other: %s, Total: %s'] = 'Class-Init: %s, Boot: %s, Init: %s, Content: %s, Altro: %s, Totale: %s';
+;
+$a->strings["Performance: Database: %s, Network: %s, Rendering: %s, Parser: %s, I/O: %s, Other: %s, Total: %s"] = "Performance: Database: %s, Network: %s, Rendering: %s, Parser: %s, I/O: %s, Other: %s, Total: %s";
diff --git a/rendertime/lang/nl/strings.php b/rendertime/lang/nl/strings.php
index cccb5c93..55e9f35f 100644
--- a/rendertime/lang/nl/strings.php
+++ b/rendertime/lang/nl/strings.php
@@ -3,6 +3,7 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Performance: Database: %s, Network: %s, Rendering: %s, Parser: %s, I/O: %s, Other: %s, Total: %s'] = 'Prestaties: Database: %s, Netwerk: %s, Weergave: %s, Verwerken: %s, Input/Output: %s, Andere: %s, Totaal: %s';
+;
+$a->strings["Performance: Database: %s, Network: %s, Rendering: %s, Parser: %s, I/O: %s, Other: %s, Total: %s"] = "Prestaties: Database: %s, Netwerk: %s, Weergave: %s, Verwerken: %s, Input/Output: %s, Andere: %s, Totaal: %s";
diff --git a/rendertime/lang/pl/messages.po b/rendertime/lang/pl/messages.po
index 97ba0d9e..18ea5047 100644
--- a/rendertime/lang/pl/messages.po
+++ b/rendertime/lang/pl/messages.po
@@ -4,16 +4,14 @@
 # 
 # 
 # Translators:
-# Joe Doe, 2021
-# Piotr Strębski <strebski@gmail.com>, 2022
-# Waldemar Stoczkowski, 2018
+# Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-12 22:09+0000\n"
-"PO-Revision-Date: 2014-06-23 12:36+0000\n"
-"Last-Translator: Piotr Strębski <strebski@gmail.com>, 2022\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2018-04-18 20:50+0000\n"
+"Last-Translator: Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.com/Friendica/friendica/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,36 +19,9 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
-#: rendertime.php:30
-msgid "Save Settings"
-msgstr "Zapisz ustawienia"
-
-#: rendertime.php:31
-msgid "Show callstack"
-msgstr "Pokaż stos wywołań"
-
-#: rendertime.php:31
-msgid ""
-"Show detailed performance measures in the callstack. When deactivated, only "
-"the summary will be displayed."
-msgstr "Pokaż szczegółowe miary wydajności w stosie wywołań. Po dezaktywacji wyświetlane będzie tylko podsumowanie."
-
-#: rendertime.php:32
-msgid "Minimal time"
-msgstr "Czas minimalny"
-
-#: rendertime.php:32
-msgid "Minimal time that an activity needs to be listed in the callstack."
-msgstr "Minimalny czas, przez który czynność musi być wymieniona w stosie wywołań."
-
-#: rendertime.php:57
+#: rendertime.php:29
 #, php-format
 msgid ""
-"Database: %s/%s, Network: %s, Rendering: %s, Session: %s, I/O: %s, Other: "
-"%s, Total: %s"
-msgstr "Baza danych: %s/%s, Sieć: %s, Rendering: %s, Sesja: %s, Wej/Wyj: %s, Inne: %s, Łącznie: %s"
-
-#: rendertime.php:74
-#, php-format
-msgid "Class-Init: %s, Boot: %s, Init: %s, Content: %s, Other: %s, Total: %s"
-msgstr "Rozpoczęcie klasy: %s, Rozruch: %s, Rozpoczęcie: %s, Zawartość: %s, Inne: %s, Łącznie: %s"
+"Performance: Database: %s, Network: %s, Rendering: %s, Parser: %s, I/O: %s, "
+"Other: %s, Total: %s"
+msgstr "Wydajność: Baza danych: %s, Sieć: %s, Renderowanie: %s, Analizator składni: %s, I/O: %s, Inne: %s, Razem: %s"
diff --git a/rendertime/lang/pl/strings.php b/rendertime/lang/pl/strings.php
index 566394df..fed1242e 100644
--- a/rendertime/lang/pl/strings.php
+++ b/rendertime/lang/pl/strings.php
@@ -2,13 +2,7 @@
 
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
-	$n = intval($n);
-	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
+	return ($n==1 ? 0 : ($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14) ? 1 : $n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14) ? 2 : 3);;
 }}
-$a->strings['Save Settings'] = 'Zapisz ustawienia';
-$a->strings['Show callstack'] = 'Pokaż stos wywołań';
-$a->strings['Show detailed performance measures in the callstack. When deactivated, only the summary will be displayed.'] = 'Pokaż szczegółowe miary wydajności w stosie wywołań. Po dezaktywacji wyświetlane będzie tylko podsumowanie.';
-$a->strings['Minimal time'] = 'Czas minimalny';
-$a->strings['Minimal time that an activity needs to be listed in the callstack.'] = 'Minimalny czas, przez który czynność musi być wymieniona w stosie wywołań.';
-$a->strings['Database: %s/%s, Network: %s, Rendering: %s, Session: %s, I/O: %s, Other: %s, Total: %s'] = 'Baza danych: %s/%s, Sieć: %s, Rendering: %s, Sesja: %s, Wej/Wyj: %s, Inne: %s, Łącznie: %s';
-$a->strings['Class-Init: %s, Boot: %s, Init: %s, Content: %s, Other: %s, Total: %s'] = 'Rozpoczęcie klasy: %s, Rozruch: %s, Rozpoczęcie: %s, Zawartość: %s, Inne: %s, Łącznie: %s';
+;
+$a->strings["Performance: Database: %s, Network: %s, Rendering: %s, Parser: %s, I/O: %s, Other: %s, Total: %s"] = "Wydajność: Baza danych: %s, Sieć: %s, Renderowanie: %s, Analizator składni: %s, I/O: %s, Inne: %s, Razem: %s";
diff --git a/rendertime/lang/ro/strings.php b/rendertime/lang/ro/strings.php
index 854f559f..2d3fd76a 100644
--- a/rendertime/lang/ro/strings.php
+++ b/rendertime/lang/ro/strings.php
@@ -2,7 +2,7 @@
 
 if(! function_exists("string_plural_select_ro")) {
 function string_plural_select_ro($n){
-	$n = intval($n);
-	if ($n==1) { return 0; } else if ((($n%100>19)||(($n%100==0)&&($n!=0)))) { return 2; } else  { return 1; }
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
 }}
-$a->strings['Performance: Database: %s, Network: %s, Rendering: %s, Parser: %s, I/O: %s, Other: %s, Total: %s'] = 'Performantă: Baza de Date: %s, Rețea: %s, Procesare: %s, Analizator: %s, I/O: %s Altele: %s, Total: %s';
+;
+$a->strings["Performance: Database: %s, Network: %s, Rendering: %s, Parser: %s, I/O: %s, Other: %s, Total: %s"] = "Performantă: Baza de Date: %s, Rețea: %s, Procesare: %s, Analizator: %s, I/O: %s Altele: %s, Total: %s";
diff --git a/rendertime/lang/sv/messages.po b/rendertime/lang/sv/messages.po
deleted file mode 100644
index f91228af..00000000
--- a/rendertime/lang/sv/messages.po
+++ /dev/null
@@ -1,53 +0,0 @@
-# ADDON rendertime
-# Copyright (C)
-# This file is distributed under the same license as the Friendica rendertime addon package.
-# 
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-12 22:09+0000\n"
-"PO-Revision-Date: 2021-12-22 16:17+0000\n"
-"Last-Translator: Transifex Bot <>\n"
-"Language-Team: Swedish (http://www.transifex.com/Friendica/friendica/language/sv/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: sv\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: rendertime.php:30
-msgid "Save Settings"
-msgstr ""
-
-#: rendertime.php:31
-msgid "Show callstack"
-msgstr ""
-
-#: rendertime.php:31
-msgid ""
-"Show detailed performance measures in the callstack. When deactivated, only "
-"the summary will be displayed."
-msgstr ""
-
-#: rendertime.php:32
-msgid "Minimal time"
-msgstr ""
-
-#: rendertime.php:32
-msgid "Minimal time that an activity needs to be listed in the callstack."
-msgstr ""
-
-#: rendertime.php:57
-#, php-format
-msgid ""
-"Database: %s/%s, Network: %s, Rendering: %s, Session: %s, I/O: %s, Other: "
-"%s, Total: %s"
-msgstr ""
-
-#: rendertime.php:74
-#, php-format
-msgid "Class-Init: %s, Boot: %s, Init: %s, Content: %s, Other: %s, Total: %s"
-msgstr ""
diff --git a/rendertime/lang/sv/strings.php b/rendertime/lang/sv/strings.php
index 72e9772f..ab4fa67a 100644
--- a/rendertime/lang/sv/strings.php
+++ b/rendertime/lang/sv/strings.php
@@ -1,7 +1,2 @@
-<?php
-
-if(! function_exists("string_plural_select_sv")) {
-function string_plural_select_sv($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
+<?php
+
diff --git a/rendertime/lang/zh-cn/strings.php b/rendertime/lang/zh-cn/strings.php
index ff635d15..639560cb 100644
--- a/rendertime/lang/zh-cn/strings.php
+++ b/rendertime/lang/zh-cn/strings.php
@@ -3,6 +3,7 @@
 if(! function_exists("string_plural_select_zh_cn")) {
 function string_plural_select_zh_cn($n){
 	$n = intval($n);
-	return intval(0);
+	return 0;;
 }}
-$a->strings['Performance: Database: %s, Network: %s, Rendering: %s, Parser: %s, I/O: %s, Other: %s, Total: %s'] = '性能：数据库：%s ，网络：%s ，渲染：%s ，分析器：%s ，I/O：%s ，其他：%s ，总计：%s';
+;
+$a->strings["Performance: Database: %s, Network: %s, Rendering: %s, Parser: %s, I/O: %s, Other: %s, Total: %s"] = "性能：数据库：%s ，网络：%s ，渲染：%s ，分析器：%s ，I/O：%s ，其他：%s ，总计：%s";
diff --git a/rendertime/rendertime.php b/rendertime/rendertime.php
index 731cf003..a54fc489 100644
--- a/rendertime/rendertime.php
+++ b/rendertime/rendertime.php
@@ -7,88 +7,56 @@
  *
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
-use Friendica\Core\Renderer;
-use Friendica\DI;
+use Friendica\Core\L10n;
 
 function rendertime_install() {
 	Hook::register('page_end', 'addon/rendertime/rendertime.php', 'rendertime_page_end');
-	DI::config()->set('system', 'profiler', true);
 }
 
-function rendertime_uninstall()
-{
-	DI::config()->delete('system', 'profiler');
+
+function rendertime_uninstall() {
+	Hook::unregister('init_1', 'addon/rendertime/rendertime.php', 'rendertime_init_1');
+	Hook::unregister('page_end', 'addon/rendertime/rendertime.php', 'rendertime_page_end');
 }
 
-function rendertime_init_1()
-{
-}
-
-function rendertime_addon_admin(string &$o)
-{
-	$t = Renderer::getMarkupTemplate('admin.tpl', 'addon/rendertime/');
-
-	$o = Renderer::replaceMacros($t, [
-		'$submit' => DI::l10n()->t('Save Settings'),
-		'$callstack' => ['callstack', DI::l10n()->t('Show callstack'), DI::config()->get('rendertime', 'callstack'), DI::l10n()->t('Show detailed performance measures in the callstack. When deactivated, only the summary will be displayed.')],
-		'$minimal_time' => ['minimal_time', DI::l10n()->t('Minimal time'), DI::config()->get('rendertime', 'minimal_time'), DI::l10n()->t('Minimal time that an activity needs to be listed in the callstack.')],
-	]);
-}
-
-function rendertime_addon_admin_post()
-{
-	DI::config()->set('rendertime', 'callstack', $_POST['callstack'] ?? false);
-	DI::config()->set('rendertime', 'minimal_time', $_POST['minimal_time'] ?? 0);
+function rendertime_init_1(&$a) {
 }
 
 /**
+ * @param Friendica\App $a
  * @param string $o
  */
-function rendertime_page_end(string &$o)
+function rendertime_page_end(Friendica\App $a, &$o)
 {
-	$profiler = DI::profiler();
+
+	$profiler = $a->getProfiler();
 
 	$duration = microtime(true) - $profiler->get('start');
 
-	$ignored_modules = [
-		\Friendica\Module\Media\Photo\Browser::class,
-		\Friendica\Module\Media\Attachment\Browser::class,
-	];
-	$ignored = in_array(DI::router()->getModuleClass(), $ignored_modules);
+	$ignored_modules = ["fbrowser"];
+	$ignored = in_array($a->module, $ignored_modules);
 
-	if (DI::userSession()->isSiteAdmin() && (($_GET['mode'] ?? '') != 'minimal') && !DI::mode()->isMobile() && !DI::mode()->isMobile() && !$ignored) {
+	if (is_site_admin() && (($_GET['mode'] ?? '') != 'minimal') && !$a->is_mobile && !$a->is_tablet && !$ignored) {
 
-		$o = $o . '<div class="renderinfo">' . DI::l10n()->t("Database: %s/%s, Network: %s, Rendering: %s, Session: %s, I/O: %s, Other: %s, Total: %s",
+		$o = $o . '<div class="renderinfo">' . L10n::t("Database: %s/%s, Network: %s, Rendering: %s, Session: %s, I/O: %s, Other: %s, Total: %s",
 				round($profiler->get('database') - $profiler->get('database_write'), 3),
 				round($profiler->get('database_write'), 3),
 				round($profiler->get('network'), 2),
 				round($profiler->get('rendering'), 2),
-				round($profiler->get('session'), 2),
+				round($profiler->get('parser'), 2),
 				round($profiler->get('file'), 2),
 				round($duration - $profiler->get('database')
 					- $profiler->get('network') - $profiler->get('rendering')
-					- $profiler->get('session') - $profiler->get('file'), 2),
+					- $profiler->get('parser') - $profiler->get('file'), 2),
 				round($duration, 2)
 			//round($profiler->get('markstart'), 3)
 			//round($profiler->get('plugin'), 3)
 			) . '</div>';
 
-			$total = microtime(true) - $profiler->get('start');
-			$rest = $total - ($profiler->get('ready') - $profiler->get('start')) - $profiler->get('init') - $profiler->get('content');
-			$o = $o . '<div class="renderinfo">' . DI::l10n()->t("Class-Init: %s, Boot: %s, Init: %s, Content: %s, Other: %s, Total: %s",
-				round($profiler->get('classinit') - $profiler->get('start'), 3),
-				round($profiler->get('ready') - $profiler->get('classinit'), 3),
-				round($profiler->get('init'), 3),
-				round($profiler->get('content'), 3),
-				round($rest, 3),
-				round($total, 3)
-				) . '</div>';
-
 		if ($profiler->isRendertime()) {
 			$o .= '<pre>';
-			$o .= $profiler->getRendertimeString(floatval(DI::config()->get('rendertime', 'minimal_time', 0)));
+			$o .= $profiler->getRendertimeString();
 			$o .= '</pre>';
 		}
 	}
diff --git a/rendertime/templates/admin.tpl b/rendertime/templates/admin.tpl
deleted file mode 100644
index e99072e7..00000000
--- a/rendertime/templates/admin.tpl
+++ /dev/null
@@ -1,3 +0,0 @@
-{{include file="field_checkbox.tpl" field=$callstack}}
-{{include file="field_input.tpl" field=$minimal_time}}
-<div class="submit"><button type="submit" class="btn btn-primary" name="page_site" value="{{$submit}}">{{$submit}}</button></div>
diff --git a/s3_storage/composer.json b/s3_storage/composer.json
deleted file mode 100644
index 002c7dc0..00000000
--- a/s3_storage/composer.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "name": "friendica-addons/s3_storage",
-    "description": "Adds the possibility to use S3 as a selectable storage backend",
-    "type": "friendica-addon",
-    "authors": [
-        {
-            "name": "Philipp Holzer",
-            "email": "admin@philipp.info",
-            "homepage": "https://blog.philipp.info",
-            "role": "Developer"
-        }
-    ],
-    "require": {
-        "php": ">=7.0",
-        "akeeba/s3": "^2.0"
-    },
-    "license": "3-clause BSD license",
-    "config": {
-        "optimize-autoloader": true,
-        "autoloader-suffix": "S3StorageAddon",
-        "preferred-install": "dist"
-    }
-}
diff --git a/s3_storage/composer.lock b/s3_storage/composer.lock
deleted file mode 100644
index 766b8e6d..00000000
--- a/s3_storage/composer.lock
+++ /dev/null
@@ -1,68 +0,0 @@
-{
-    "_readme": [
-        "This file locks the dependencies of your project to a known state",
-        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
-        "This file is @generated automatically"
-    ],
-    "content-hash": "380e2e4853de027e64448857e2e9fead",
-    "packages": [
-        {
-            "name": "akeeba/s3",
-            "version": "2.3.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/akeeba/s3.git",
-                "reference": "452fbd3084f1cb581851a1602226224d29d586d4"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/akeeba/s3/zipball/452fbd3084f1cb581851a1602226224d29d586d4",
-                "reference": "452fbd3084f1cb581851a1602226224d29d586d4",
-                "shasum": ""
-            },
-            "require": {
-                "ext-curl": "*",
-                "ext-simplexml": "*",
-                "php": ">=7.1.0 <8.4"
-            },
-            "type": "library",
-            "autoload": {
-                "files": [
-                    "src/aliasing.php"
-                ],
-                "psr-4": {
-                    "Akeeba\\S3\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "GPL-3.0-or-later"
-            ],
-            "authors": [
-                {
-                    "name": "Nicholas K. Dionysopoulos",
-                    "email": "nicholas_NO_SPAM_PLEASE@akeeba.com",
-                    "homepage": "http://www.dionysopoulos.me",
-                    "role": "Lead Developer"
-                }
-            ],
-            "description": "A compact, dependency-less Amazon S3 API client implementing the most commonly used features",
-            "homepage": "https://github.com/akeeba/s3",
-            "keywords": [
-                "s3"
-            ],
-            "time": "2024-02-19T10:08:06+00:00"
-        }
-    ],
-    "packages-dev": [],
-    "aliases": [],
-    "minimum-stability": "stable",
-    "stability-flags": [],
-    "prefer-stable": false,
-    "prefer-lowest": false,
-    "platform": {
-        "php": ">=7.0"
-    },
-    "platform-dev": [],
-    "plugin-api-version": "1.1.0"
-}
diff --git a/s3_storage/lang/C/messages.po b/s3_storage/lang/C/messages.po
deleted file mode 100644
index cfbf0c4f..00000000
--- a/s3_storage/lang/C/messages.po
+++ /dev/null
@@ -1,108 +0,0 @@
-# ADDON s3_storage
-# Copyright (C) 
-# This file is distributed under the same license as the Friendica s3_storage addon package.
-# 
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-02-24 23:25+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: src/S3Config.php:113
-msgid "Access Key"
-msgstr ""
-
-#: src/S3Config.php:115
-msgid "Set the Access Key of the S3 storage"
-msgstr ""
-
-#: src/S3Config.php:120
-msgid "Secret Key"
-msgstr ""
-
-#: src/S3Config.php:122
-msgid "Set the Secret Key of the S3 storage"
-msgstr ""
-
-#: src/S3Config.php:127
-msgid "Bucket"
-msgstr ""
-
-#: src/S3Config.php:129
-msgid "The S3 Bucket (name), you want to use with Friendica"
-msgstr ""
-
-#: src/S3Config.php:134
-msgid "Signature Method"
-msgstr ""
-
-#: src/S3Config.php:136
-msgid ""
-"Set the signature method to use (BEWARE: v4 will be automatically set to v2 "
-"in case the endpoint isn't amazon)"
-msgstr ""
-
-#: src/S3Config.php:141
-#, php-format
-msgid "Amazon S3 compatible endpoint (leave empty for '%s')"
-msgstr ""
-
-#: src/S3Config.php:143
-msgid ""
-"Set the S3 endpoint. Do NOT use a protocol (You can use a custom endpoint "
-"with v2 signatures to access third party services which offer S3 "
-"compatibility, e.g. OwnCloud, Google Storage etc.)"
-msgstr ""
-
-#: src/S3Config.php:147
-#, php-format
-msgid "AWS region (leave empty for '%s')"
-msgstr ""
-
-#: src/S3Config.php:149
-msgid "The AWS region is mandatory for v4 signatures"
-msgstr ""
-
-#: src/S3Config.php:153
-msgid "Use the dualstack URL (which will ship traffic over ipv6 in most cases)"
-msgstr ""
-
-#: src/S3Config.php:155
-msgid ""
-"For more information on these endpoints please read https://docs.aws.amazon."
-"com/AmazonS3/latest/dev/dual-stack-endpoints.html"
-msgstr ""
-
-#: src/S3Config.php:159
-msgid "Use legacy, path-style access to the bucket"
-msgstr ""
-
-#: src/S3Config.php:161
-msgid ""
-"When it's turned off (default) we use virtual hosting stylepaths which are "
-"RECOMMENDED BY AMAZON per http://docs.aws.amazon.com/AmazonS3/latest/API/"
-"APIRest.html"
-msgstr ""
-
-#: src/S3Config.php:175
-msgid "Invalid input"
-msgstr ""
-
-#: src/S3Config.php:214
-#, php-format
-msgid "error '%s', message '%s'"
-msgstr ""
-
-#: src/S3Config.php:222
-#, php-format
-msgid "Bucket %s cannot be not found, possible buckets: %s"
-msgstr ""
diff --git a/s3_storage/s3_storage.php b/s3_storage/s3_storage.php
deleted file mode 100644
index 361577be..00000000
--- a/s3_storage/s3_storage.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-/*
- * Name: S3 Storage
- * Description: Adds the possibility to use Amazon S3 as a selectable storage backend
- * Version: 1.0
- * Author: Philipp Holzer
- */
-
-use Friendica\Addon\s3_storage\src\S3Client;
-use Friendica\Addon\s3_storage\src\S3Config;
-use Friendica\App;
-use Friendica\Core\Hook;
-use Friendica\DI;
-
-require_once __DIR__ . DIRECTORY_SEPARATOR . 'vendor' . DIRECTORY_SEPARATOR . 'autoload.php';
-
-function s3_storage_install()
-{
-	Hook::register('storage_instance' , __FILE__, 's3_storage_instance');
-	Hook::register('storage_config' , __FILE__, 's3_storage_config');
-	DI::storageManager()->register(S3Client::class);
-}
-
-function s3_storage_uninstall()
-{
-	DI::storageManager()->unregister(S3Client::class);
-}
-
-function s3_storage_instance(array &$data)
-{
-	if ($data['name'] == S3Client::getName()) {
-		$config          = new S3Config(DI::l10n(), DI::config());
-		$data['storage'] = new S3Client($config->getConfig(), $config->getBucket());
-	}
-}
-
-function s3_storage_config(array &$data)
-{
-	if ($data['name'] == S3Client::getName()) {
-		$data['storage_config'] = new S3Config(DI::l10n(), DI::config());
-	}
-}
diff --git a/s3_storage/src/S3Client.php b/s3_storage/src/S3Client.php
deleted file mode 100644
index 643df2b0..00000000
--- a/s3_storage/src/S3Client.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-
-namespace Friendica\Addon\s3_storage\src;
-
-defined('AKEEBAENGINE') or define('AKEEBAENGINE', 1);
-
-use Akeeba\Engine\Postproc\Connector\S3v4\Configuration;
-use Akeeba\Engine\Postproc\Connector\S3v4\Connector;
-use Akeeba\Engine\Postproc\Connector\S3v4\Exception\CannotDeleteFile;
-use Akeeba\Engine\Postproc\Connector\S3v4\Input;
-use Friendica\Core\Storage\Capability\ICanWriteToStorage;
-use Friendica\Core\Storage\Exception\StorageException;
-use Friendica\Util\Strings;
-
-/**
- * A WebDav Backend Storage class
- */
-class S3Client implements ICanWriteToStorage
-{
-	const NAME = 'S3';
-
-	/** @var Connector */
-	protected $connector;
-
-	/** @var string The name of the bucket used for the backend */
-	protected $bucket;
-
-	public function __construct(Configuration $config, string $bucket)
-	{
-		$this->connector = new Connector($config);
-		$this->bucket    = $bucket;
-	}
-
-	/**
-	 * Split data ref and return file path
-	 *
-	 * @param string $reference Data reference
-	 *
-	 * @return string
-	 */
-	private function pathForRef(string $reference): string
-	{
-		$fold1 = substr($reference, 0, 2);
-		$fold2 = substr($reference, 2, 2);
-		$file  = substr($reference, 4);
-
-		return implode('/', [$fold1, $fold2, $file]);
-	}
-
-	/** {@inheritDoc} */
-	public function __toString(): string
-	{
-		return self::getName();
-	}
-
-	/** {@inheritDoc} */
-	public static function getName(): string
-	{
-		return self::NAME;
-	}
-
-	/** {@inheritDoc} */
-	public function get(string $reference): string
-	{
-		try {
-			return $this->connector->getObject($this->bucket, $this->pathForRef($reference), false);
-		} catch (\RuntimeException $exception) {
-			throw new StorageException(sprintf('Cannot get reference %s', $reference), $exception->getCode(), $exception);
-		}
-	}
-
-	/** {@inheritDoc} */
-	public function put(string $data, string $reference = ""): string
-	{
-		if ($reference === '') {
-			try {
-				$reference = Strings::getRandomHex();
-			} catch (\Exception $exception) {
-				throw new StorageException('S3 storage failed to generate a random hex', $exception->getCode(), $exception);
-			}
-		}
-
-		try {
-			$input = Input::createFromData($data);
-			$this->connector->putObject($input, $this->bucket, $this->pathForRef($reference));
-			return $reference;
-		} catch (\Exception $exception) {
-			throw new StorageException(sprintf('Cannot put data for reference %s', $reference), $exception->getCode(), $exception);
-		}
-	}
-
-	/** {@inheritDoc} */
-	public function delete(string $reference)
-	{
-		try {
-			$this->connector->deleteObject($this->bucket, $this->pathForRef($reference));
-		} catch (CannotDeleteFile $exception) {
-			throw new StorageException(sprintf('Cannot delete reference %s', $reference), $exception->getCode(), $exception);
-		}
-	}
-}
diff --git a/s3_storage/src/S3Config.php b/s3_storage/src/S3Config.php
deleted file mode 100644
index 809cdd28..00000000
--- a/s3_storage/src/S3Config.php
+++ /dev/null
@@ -1,262 +0,0 @@
-<?php
-
-namespace Friendica\Addon\s3_storage\src;
-
-defined('AKEEBAENGINE') or define('AKEEBAENGINE', 1);
-
-use Akeeba\Engine\Postproc\Connector\S3v4\Configuration;
-use Akeeba\Engine\Postproc\Connector\S3v4\Connector;
-use Friendica\Core\Config\Capability\IManageConfigValues;
-use Friendica\Core\L10n;
-use Friendica\Core\Storage\Capability\ICanConfigureStorage;
-use ParagonIE\HiddenString\HiddenString;
-
-/**
- * The WebDav Backend Storage configuration class
- */
-class S3Config implements ICanConfigureStorage
-{
-	const NAME = 'S3Config';
-
-	const DEFAULT_REGION    = 'us-east-1';
-	const DEFAULT_ENDPOINT  = 's3.amazonaws.com';
-	const DEFAULT_SIGMETHOD = 'v2';
-	const DEFAULT_BUCKET    = 'friendica';
-
-	/** @var L10n */
-	private $l10n;
-
-	/** @var IManageConfigValues */
-	private $config;
-
-	/** @var string */
-	private $endpoint;
-
-	/** @var HiddenString */
-	private $accessKey;
-
-	/** @var HiddenString */
-	private $secretKey;
-
-	/** @var string */
-	private $signatureMethod;
-
-	/** @var ?string */
-	private $bucket;
-
-	/** @var ?string */
-	private $region;
-
-	/** @var bool */
-	private $legacy;
-
-	/** @var bool */
-	private $dualStack;
-
-	public function __construct(L10n $l10n, IManageConfigValues $config)
-	{
-		$this->l10n   = $l10n;
-		$this->config = $config;
-
-		$this->accessKey       = new HiddenString($this->config->get('s3', 'access_key', ''));
-		$this->secretKey       = new HiddenString($this->config->get('s3', 'secret_key', ''));
-		$this->signatureMethod = $this->config->get('s3', 'signature_method', self::DEFAULT_SIGMETHOD);
-		$this->bucket          = $this->config->get('s3', 'bucket', self::DEFAULT_BUCKET);
-		$this->legacy          = !empty($this->config->get('s3', 'legacy'));
-		$this->dualStack       = !empty($this->config->get('s3', 'dual_stack'));
-		$this->region          = $this->config->get('s3', 'region');
-		$this->endpoint        = $this->config->get('s3', 'endpoint');
-	}
-
-	/**
-	 * Returns the whole configuration as a Akeeba compatible configuration instance
-	 *
-	 * @return Configuration
-	 */
-	public function getConfig(): Configuration
-	{
-		$config = new Configuration($this->accessKey, $this->secretKey);
-		$config->setUseLegacyPathStyle($this->legacy ?? false);
-		$config->setUseDualstackUrl($this->dualStack ?? false);
-
-		if (!empty($this->region)) {
-			$config->setRegion($this->region);
-		}
-		if (!empty($this->endpoint)) {
-			$config->setEndpoint($this->endpoint);
-		}
-		if (!empty($this->signatureMethod) && empty($this->endpoint)) {
-			$config->setSignatureMethod($this->signatureMethod);
-		}
-
-		return $config;
-	}
-
-	public function getBucket(): string
-	{
-		return $this->bucket;
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getOptions(): array
-	{
-		$sigMethods = [
-			'v2' => 'v2',
-			'v4' => 'v4',
-		];
-
-		return [
-			'access_key' => [
-				'password',
-				$this->l10n->t('Access Key'),
-				$this->accessKey,
-				$this->l10n->t('Set the Access Key of the S3 storage'),
-				true,
-			],
-			'secret_key' => [
-				'password',
-				$this->l10n->t('Secret Key'),
-				$this->secretKey,
-				$this->l10n->t('Set the Secret Key of the S3 storage'),
-				true,
-			],
-			'bucket' => [
-				'input',
-				$this->l10n->t('Bucket'),
-				$this->bucket,
-				$this->l10n->t('The S3 Bucket (name), you want to use with Friendica'),
-				true,
-			],
-			'signature_method' => [
-				'select',
-				$this->l10n->t('Signature Method'),
-				$this->signatureMethod,
-				$this->l10n->t('Set the signature method to use (BEWARE: v4 will be automatically set to v2 in case the endpoint isn\'t amazon)'),
-				$sigMethods,
-			],
-			'endpoint' => [
-				'input',
-				$this->l10n->t("Amazon S3 compatible endpoint (leave empty for '%s')", self::DEFAULT_ENDPOINT),
-				$this->endpoint,
-				$this->l10n->t('Set the S3 endpoint. Do NOT use a protocol (You can use a custom endpoint with v2 signatures to access third party services which offer S3 compatibility, e.g. OwnCloud, Google Storage etc.)'),
-			],
-			'region' => [
-				'input',
-				$this->l10n->t("AWS region (leave empty for '%s')", self::DEFAULT_REGION),
-				$this->region,
-				$this->l10n->t('The AWS region is mandatory for v4 signatures'),
-			],
-			'dualstack_url' => [
-				'checkbox',
-				$this->l10n->t('Use the dualstack URL (which will ship traffic over ipv6 in most cases)'),
-				$this->dualStack,
-				$this->l10n->t('For more information on these endpoints please read https://docs.aws.amazon.com/AmazonS3/latest/dev/dual-stack-endpoints.html'),
-			],
-			'legacy' => [
-				'checkbox',
-				$this->l10n->t('Use legacy, path-style access to the bucket'),
-				$this->legacy,
-				$this->l10n->t('When it\'s turned off (default) we use virtual hosting stylepaths which are RECOMMENDED BY AMAZON per http://docs.aws.amazon.com/AmazonS3/latest/API/APIRest.html'),
-			],
-		];
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function saveOptions(array $data): array
-	{
-		$feedback = [];
-
-		if (empty($data['access_key']) || empty($data['secret_key']) || empty($data['bucket'])) {
-			return [
-				'access_key' => $this->l10n->t('Invalid input')
-			];
-		}
-
-		$s3Config = new Configuration(
-			$data['access_key'],
-			$data['secret_key']
-		);
-
-		$bucket = $data['bucket'];
-
-		if (!empty($data['endpoint'])) {
-			try {
-				$s3Config->setEndpoint($data['endpoint']);
-			} catch (\Exception $exception) {
-				$feedback['endpoint'] = $exception->getMessage();
-			}
-		}
-		if (!empty($data['region'])) {
-			try {
-				$s3Config->setRegion($data['region']);
-			} catch (\Exception $exception) {
-				$feedback['region'] = $exception->getMessage();
-			}
-		}
-
-		try {
-			$s3Config->setUseLegacyPathStyle((bool)$data['legacy'] ?? false);
-		} catch (\Exception $exception) {
-			$feedback['legacy'] = $exception->getMessage();
-		}
-		try {
-			$s3Config->setUseDualstackUrl((bool)$data['dualstack_url'] ?? false);
-		} catch (\Exception $exception) {
-			$feedback['dualstack_url'] = $exception->getMessage();
-		}
-		try {
-			$s3Config->setSignatureMethod($data['signature_method'] ?? self::DEFAULT_SIGMETHOD);
-		} catch (\Exception $exception) {
-			$feedback['signature_method'] = $this->l10n->t("error '%s', message '%s'", $exception->getCode(), $exception->getMessage());
-		}
-
-		try {
-			$connector = new Connector($s3Config);
-			$buckets   = $connector->listBuckets();
-			if (!in_array($bucket, $buckets)) {
-				return [
-					'bucket' => $this->l10n->t('Bucket %s cannot be not found, possible buckets: %s', $bucket, implode(', ', $buckets))
-				];
-			}
-			$connector->getBucket($bucket);
-		} catch (\Exception $exception) {
-			return [
-				'bucket' => $exception->getMessage()
-			];
-		}
-
-		$this->config->set('s3', 'access_key', ($this->accessKey = new HiddenString($data['access_key']))->getString());
-		$this->config->set('s3', 'secret_key', ($this->secretKey = new HiddenString($data['secret_key']))->getString());
-		$this->config->set('s3', 'bucket', ($this->bucket = $bucket));
-
-		if ($s3Config->getUseLegacyPathStyle()) {
-			$this->config->set('s3', 'legacy', '1');
-		} else {
-			$this->config->delete('s3', 'legacy');
-		}
-		if ($s3Config->getDualstackUrl()) {
-			$this->config->set('s3', 'dual_stack', '1');
-		} else {
-			$this->config->delete('s3', 'dual_stack');
-		}
-		$this->config->set('s3','signature_method', $s3Config->getSignatureMethod());
-
-		if (!empty($data['endpoint'])) {
-			$this->config->set('s3', 'endpoint', $s3Config->getEndpoint());
-		} else {
-			$this->config->delete('s3', 'endpoint');
-		}
-
-		if (!empty($data['region'])) {
-			$this->config->set('s3', 'region', $s3Config->getRegion());
-		} else {
-			$this->config->delete('s3', 'region');
-		}
-
-		return $feedback;
-	}
-}
diff --git a/s3_storage/vendor/akeeba/s3/.gitignore b/s3_storage/vendor/akeeba/s3/.gitignore
deleted file mode 100644
index 09e75c29..00000000
--- a/s3_storage/vendor/akeeba/s3/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-/.idea/
-/000/
-/minitest/config.*
-!/minitest/config.dist.php
-/minitest/tmp
-/vendor/
diff --git a/s3_storage/vendor/akeeba/s3/README.md b/s3_storage/vendor/akeeba/s3/README.md
deleted file mode 100644
index fae5fb33..00000000
--- a/s3_storage/vendor/akeeba/s3/README.md
+++ /dev/null
@@ -1,368 +0,0 @@
-# Akeeba Amazon S3 Connector
-
-A compact, dependency-less Amazon S3 API client implementing the most commonly used features.
-
-This library is designed to work with Amazon S3 proper, as well as S3-compatible services such as but not limited to Wasabi, Google Storage, Synology C2, ExoScale etc.
-
-## Why reinvent the wheel
-
-After having a lot of impossible to debug problems with Amazon's Guzzle-based AWS SDK we decided to roll our own connector for Amazon S3. This is by no means a complete implementation, just a small subset of S3's features which are required by our software. The design goals are simplicity, no external dependencies and a low memory footprint.
-
-This code was originally based on [S3.php written by Donovan Schonknecht](http://undesigned.org.za/2007/10/22/amazon-s3-php-class) which is available under a BSD-like license. This repository no longer reflects the original author's work and should not be confused with it.
-
-This software is distributed under the GNU General Public License version 3 or, at your option, any later version published by the Free Software Foundation (FSF). In short, it's GPL-3.0-or-later, as noted in composer.json.
-
-## Important notes about version 2
-
-### PHP version support since 2.0
-
-Akeeba Amazon S3 Connector version 2 has dropped support for PHP 5.3 to 7.0 inclusive.
-
-The most significant change in this version is that all methods use scalar type hints for parameters and return values. This _may_ break existing consumers which relied on implicit type conversion.
-
-### Namespace change since 2.3
-
-Up to and including version 2.2 of the library, the namespace was `\Akeeba\Engine\Postproc\Connector\S3v4`. From version 2.3 of the library the namespace has changed to `\Akeeba\S3`.
-
-The library automatically registers aliases of the old classes to the new ones, thus ensuring updating the library will not introduce backwards incompatible changes. This is why it's not a major version update. Aliases will remain in place until at least version 3.0 of the library.
-
-## Using the connector
-
-You need to define a constant before using or referencing any class in the library:
-
-```php
-defined('AKEEBAENGINE') or define('AKEEBAENGINE', 1);
-```
-
-All library files have a line similar to
-
-```php
-defined('AKEEBAENGINE') or die();
-```
-
-to prevent direct access to the libraries files. This is intentional. The primary use case for this library is mass-distributed software which gets installed in a publicly accessible subdirectory of the web root. This line prevents any accidental path disclosure from PHP error messages if someone were to access these files directly on misconfigured servers.
-
-If you are writing a Joomla extension, especially a plugin or module, please _always_ check if the constant has already been defined before defining it yourself. Thank you! 
-
-### Get a connector object
-
-```php
-$configuration = new \Akeeba\S3\Configuration(
-	'YourAmazonAccessKey',
-	'YourAmazonSecretKey'
-);
-
-$connector = new \Akeeba\S3\Connector($configuration);
-```
-
-If you are running inside an Amazon EC2 instance you can fetch temporary credentials from the instance's metadata
-server using the IAM Role attached to the EC2 instance. In this case you need to do this (169.254.169.254 is a fixed
-IP hosting the instance's metadata cache service):
-
-```php
-$role = file_get_contents('http://169.254.169.254/latest/meta-data/iam/security-credentials/');
-$jsonCredentials = file_get_contents('http://169.254.169.254/latest/meta-data/iam/security-credentials/' . $role);
-$credentials = json_decode($jsonCredentials, true);
-$configuration = new \Akeeba\S3\Configuration(
-	$credentials['AccessKeyId'],
-	$credentials['SecretAccessKey'],
-	'v4',
-	$yourRegion
-);
-$configuration->setToken($credentials['Token']);
-
-$connector = new \Akeeba\S3\Connector($configuration);
-```
-
-where `$yourRegion` is the AWS region of your bucket, e.g. `us-east-1`. Please note that we are passing the security
-token (`$credentials['Token']`) to the Configuration object. This is REQUIRED. The temporary credentials returned by
-the metadata service won't work without it.
-
-Another point worth noting is that the temporary credentials don't last forever. Check the `$credentials['Expiration']` to see
-when they are about to expire. Amazon recommends that you retry fetching new credentials from the metadata service
-10 minutes before your cached credentials are set to expire. The metadata service is guaranteed to provision fresh
-temporary credentials by that time. 
-
-### Listing buckets
-
-```php
-$listing = $connector->listBuckets(true);
-```
-
-Returns an array like this:
-
-```
-array(2) {
-  'owner' =>
-  array(2) {
-    'id' =>
-    string(64) "0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"
-    'name' =>
-    string(8) "someUserName"
-  }
-  'buckets' =>
-  array(3) {
-    [0] =>
-    array(2) {
-      'name' =>
-      string(10) "mybucket"
-      'time' =>
-      int(1267730711)
-    }
-    [1] =>
-    array(2) {
-      'name' =>
-      string(10) "anotherbucket"
-      'time' =>
-      int(1269516249)
-    }
-    [2] =>
-    array(2) {
-      'name' =>
-      string(11) "differentbucket"
-      'time' =>
-      int(1354458048)
-    }
-  }
-}
-```
-
-### Listing bucket contents
-
-```php
-$listing = $connector->getBucket('mybucket', 'path/to/list/');
-```
-
-If you want to list "subdirectories" you need to do
- 
-```php
-$listing = $connector->getBucket('mybucket', 'path/to/list/', null, null, '/', true);
-```
-
-The last parameter (common prefixes) controls the listing of "subdirectories"
-
-### Uploading (small) files
-
-From a file:
-
-```php
-$input = \Akeeba\S3\Input::createFromFile($sourceFile);   
-$connector->putObject($input, 'mybucket', 'path/to/myfile.txt');
-```
-
-From a string:
-
-```php
-$input = \Akeeba\S3\Input::createFromData($sourceString);   
-$connector->putObject($input, 'mybucket', 'path/to/myfile.txt');
-```
-
-From a stream resource:
-
-```php
-$input = \Akeeba\S3\Input::createFromResource($streamHandle, false);   
-$connector->putObject($input, 'mybucket', 'path/to/myfile.txt');
-```
-
-In all cases the entirety of the file has to be loaded in memory.
-
-### Uploading large file with multipart (chunked) uploads
-
-Files are uploaded in 5Mb chunks.
-
-```php
-$input = \Akeeba\S3\Input::createFromFile($sourceFile);
-$uploadId = $connector->startMultipart($input, 'mybucket', 'mypath/movie.mov');
-
-$eTags = array();
-$eTag = null;
-$partNumber = 0;
-
-do
-{
-	// IMPORTANT: You MUST create the input afresh before each uploadMultipart call
-	$input = \Akeeba\S3\Input::createFromFile($sourceFile);
-	$input->setUploadID($uploadId);
-	$input->setPartNumber(++$partNumber);
-	
-	$eTag = $connector->uploadMultipart($input, 'mybucket', 'mypath/movie.mov');
-
-	if (!is_null($eTag))
-	{
-		$eTags[] = $eTag;
-	}
-}
-while (!is_null($eTag));
-
-// IMPORTANT: You MUST create the input afresh before finalising the multipart upload
-$input = \Akeeba\S3\Input::createFromFile($sourceFile);
-$input->setUploadID($uploadId);
-$input->setEtags($eTags);
-
-$connector->finalizeMultipart($input, 'mybucket', 'mypath/movie.mov');
-```
-
-As long as you keep track of the UploadId, PartNumber and ETags you can have each uploadMultipart call in a separate
-page load to prevent timeouts.
-
-### Get presigned URLs
-
-Allows browsers to download files directly without exposing your credentials and without going through your server:
-
-```php
-$preSignedURL = $connector->getAuthenticatedURL('mybucket', 'path/to/file.jpg', 60);
-```
-
-The last parameter controls how many seconds into the future this URL will be valid.
-
-### Download
-
-To a file with absolute path `$targetFile`
-
-```php
-$connector->getObject('mybucket', 'path/to/file.jpg', $targetFile);
-```
-
-To a string
-
-```php
-$content = $connector->getObject('mybucket', 'path/to/file.jpg', false);
-```
-
-### Delete an object
-
-```php
-$connector->deleteObject('mybucket', 'path/to/file.jpg');
-```
-
-### Test if an object exists
-
-```php
-try
-{
-    $headers = $connector->headObject('mybucket', 'path/to/file.jpg');
-    $exists  = true;
-}
-catch (\Akeeba\S3\Exception\CannotGetFile $e)
-{
-    $headers = [];
-    $exists  = false;
-}
-```
-
-The `$headers` variable contains an array with the S3 headers returned by the [HeadObject(https://docs.aws.amazon.com/AmazonS3/latest/API/API_HeadObject.html) API call. The header keys are always in lowercase. Please note that _not all_ of the headers Amazon describes in their documentation are returned in every request.
-
-## Configuration options
-
-The Configuration option has optional methods which can be used to enable some useful features in the connector.
-
-You need to execute these methods against the Configuration object before passing it to the Connector's constructor. For example:
-
-```php
-$configuration = new \Akeeba\S3\Configuration(
-	'YourAmazonAccessKey',
-	'YourAmazonSecretKey'
-);
-
-// Use v4 signatures and Dualstack URLs
-$configuration->setSignatureMethod('v4');
-$configuration->setUseDualstackUrl(true);
-
-$connector = new \Akeeba\S3\Connector($configuration);
-```
-
-### HTTPS vs plain HTTP
-
-**It is not recommended to use plain HTTP connections to Amazon S3**. If, however, you have no other option you can tell the Configuration object to use plain HTTP URLs:
-
-```php
-$configuration->setSSL(false);
-```
-
-Caveat: HTTPS will only work if PHP can verify the TLS certificate of your endpoint. This may not be the case when using a local testing service (e.g. LocalStack), or for some buckets with dots in their names. Moreover, if you are on Windows, do note that neither PHP comes with a Certification Authority cache, nor is there a system-wide CA cache; you'll have to [download](https://curl.se/docs/caextract.html) it and configure PHP, or use [composer/ca-bundle](https://packagist.org/packages/composer/ca-bundle) in your `composer.json` file.
-
-### Custom endpoint
-
-You can use the Akeeba Amazon S3 Connector library with S3-compatible APIs such as DigitalOcean's Spaces by changing the endpoint URL.
-
-Please note that if the S3-compatible APi uses v4 signatures you need to enter the region-specific endpoint domain name and the region when initializing the object, e.g.:
-
-```php
-// DigitalOcean Spaces using v4 signatures
-// The access credentials are those used in the example at https://developers.digitalocean.com/documentation/spaces/
-$configuration = new \Akeeba\S3\Configuration(
-	'532SZONTQ6ALKBCU94OU',
-	'zCkY83KVDXD8u83RouEYPKEm/dhPSPB45XsfnWj8fxQ',
-    'v4',
-    'nyc3'
-);
-$configuration->setEndpoint('nyc3.digitaloceanspaces.com');
-$configuration->setRegion('nyc3');
-$configuration->setSignatureMethod('v4');
-
-$connector = new \Akeeba\S3\Connector($configuration);
-```
-
-If your S3-compatible API uses v2 signatures you do not need to specify a region.
-
-```php
-// DigitalOcean Spaces using v2 signatures
-// The access credentials are those used in the example at https://developers.digitalocean.com/documentation/spaces/
-$configuration = new \Akeeba\S3\Configuration(
-	'532SZONTQ6ALKBCU94OU',
-	'zCkY83KVDXD8u83RouEYPKEm/dhPSPB45XsfnWj8fxQ',
-    'v2'
-);
-$configuration->setEndpoint('nyc3.digitaloceanspaces.com');
-
-$connector = new \Akeeba\S3\Connector($configuration);
-```
-
-Caveat: Setting the endpoint resets the signature version and region. This is why you need to set them _a second time_, after setting the endpoint, as seen in the first example above.
-
-### Legacy path-style access
-
-The S3 API calls made by this library will use by default the subdomain-style access. That is to say, the endpoint will be prefixed with the name of the bucket. For example, a bucket called `example` in the `eu-west-1` region will be accessed using the endpoint URL `example.s3.eu-west-1.amazonaws.com`.
-
-If you have buckets with characters that are invalid in the context of DNS (most notably dots and uppercase characters) this will fail. You will need to use the legacy path style instead. In this case the endpoint used is the generic region specific one (`s3.eu-west-1.amazonaws.com` in our example above), and the API URL will be prefixed with the bucket name.
-
-You need to do:
-```php
-$configuration->setUseLegacyPathStyle(true);
-```
-
-Caveats:
-* This will not work with v2 signatures if you are using Amazon AWS S3 proper. It will very likely work with the v2 signatures if you are using a custom endpoint, though.
-* This option has no effect on pre-authorised (pre-signed) URLs. Legacy path-style access is used for these URLs by default.
-
-### Dualstack (IPv4 and IPv6) support
-
-Amazon S3 supports dual-stack URLs which resolve to both IPv4 and IPv6 addresses. By default they are _not_ used. If you want to enable this feature you need to do:
-
-```php
-$connector->setUseDualstackUrl(true);
-```
-
-Caveat: This option only takes effect if you are using Amazon S3 proper. It will _not_ have any effect with custom endpoints. DualStack support is deprecated by Amazon S3. We strongly advise you NOT to use it anymore.
-
-### Alternate Date Format
-
-By default, this library uses the standard date format `D, d M Y H:i:s O` which Amazon _incorrectly_ documents as "ISO 8601" (it's not, see the [ISO 8601 Wikipedia entry](https://en.wikipedia.org/wiki/ISO_8601) for reference). Most third party, Amazon S3-compatible services use the same and understand it just fine.
-
-A minority of services don't understand the GMT offset at the end of the date format, and instead need the format `D, d M Y H:i:s T`. You can set a flag to enable this behaviour like so:
-```php
-$configuration->setAlternateDateHeaderFormat(true);
-```
-
-Caveat: Enabling this flag breaks compatibility with S3 proper.
-
-### Using The HTTP Date Header Instead Of X-Amz-Date
-
-Amazon documents that you should be using the standard HTTP `Date` header, and only resort to using the `X-Amz-Date` header when using the standard header is impossible, e.g. when creating pre-authorised (signed) URLs, or when your HTTP library does not let you set the standard header.
-
-Unfortunately, some third party S3-compatible services such as Wasabi and ExoScale do _NOT_ support the standard `Date` header at all. Using it makes them falsely spit out a message about the signature being wrong. They are the reason why, by default, we are passing the request date and time using the `X-Amz-Date` header.
-
-If you are using a third party service which for any reason does not understand the `X-Amz-Date` header you need to set a flag which forces the use of the standard `Date` header like so:
-```php
-$configuration->setUseHTTPDateHeader(true);
-```
\ No newline at end of file
diff --git a/s3_storage/vendor/akeeba/s3/composer.json b/s3_storage/vendor/akeeba/s3/composer.json
deleted file mode 100644
index 2d3ef59f..00000000
--- a/s3_storage/vendor/akeeba/s3/composer.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-	"name": "akeeba/s3",
-	"type": "library",
-	"description": "A compact, dependency-less Amazon S3 API client implementing the most commonly used features",
-	"require": {
-		"php": ">=7.1.0 <8.4",
-		"ext-curl": "*",
-		"ext-simplexml": "*"
-	},
-	"keywords": [
-		"s3"
-	],
-	"homepage": "https://github.com/akeeba/s3",
-	"license": "GPL-3.0-or-later",
-	"authors": [
-		{
-			"name": "Nicholas K. Dionysopoulos",
-			"email": "nicholas_NO_SPAM_PLEASE@akeeba.com",
-			"homepage": "http://www.dionysopoulos.me",
-			"role": "Lead Developer"
-		}
-	],
-	"autoload": {
-		"psr-4": {
-			"Akeeba\\S3\\": "src"
-		},
-		"files": [
-			"src/aliasing.php"
-		]
-	},
-	"archive": {
-		"exclude": [
-			"minitest",
-			"TODO.md"
-		]
-	}
-}
diff --git a/s3_storage/vendor/akeeba/s3/composer.lock b/s3_storage/vendor/akeeba/s3/composer.lock
deleted file mode 100644
index a7e203f9..00000000
--- a/s3_storage/vendor/akeeba/s3/composer.lock
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    "_readme": [
-        "This file locks the dependencies of your project to a known state",
-        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
-        "This file is @generated automatically"
-    ],
-    "content-hash": "27f387a657b2784510b177f73c436346",
-    "packages": [],
-    "packages-dev": [],
-    "aliases": [],
-    "minimum-stability": "stable",
-    "stability-flags": [],
-    "prefer-stable": false,
-    "prefer-lowest": false,
-    "platform": {
-        "php": ">=7.1.0 <8.4",
-        "ext-curl": "*",
-        "ext-simplexml": "*"
-    },
-    "platform-dev": [],
-    "plugin-api-version": "2.3.0"
-}
diff --git a/s3_storage/vendor/akeeba/s3/minitest/NOTES.md b/s3_storage/vendor/akeeba/s3/minitest/NOTES.md
deleted file mode 100644
index f44c79c8..00000000
--- a/s3_storage/vendor/akeeba/s3/minitest/NOTES.md
+++ /dev/null
@@ -1,86 +0,0 @@
-# Testing notes
-
-**⚠️ WARNING**: Running all tests across all services takes _hours_. It is recommended that you use the SignedURLs test as a quick validation tool across multiple services, then test against the `$standardTests` suite overnight.
-
-## Against Amazon S3 proper
-
-This is the _canonical_ method for testing this library since Amazon S3 proper is the canonical provider of the S3 API (and not all of its quirks are fully documented, we might add). 
-
-Copy `config.dist.php` to `config.php` and enter the connection information to your Amazon S3 or compatible service.
-
-## Against [LocalStack](https://localstack.cloud)
-
-This method is very useful for development. It is the most faithful implementation of S3, but it does have some minor quirks not present in the real thing as a result of it running inside a Docker container.
-
-Install LocalStack [per its documentation](https://docs.localstack.cloud/getting-started/installation/), or using its Docker Desktop Extension.
-
-You will also need to install [`awslocal`](https://github.com/localstack/awscli-local) like so:
-```php
-pip install awscli
-pip install awscli-local
-```
-
-Start LocalStack e.g. `localstack start -d` or via the Docker Desktop Extension.
-
-Create a new bucket called `test` i.e. `awslocal s3 mb s3://test`
-
-The `config.dist.php` already has a configuration for LocalStack. Yes, the access and secret key can be any random string.
-
-## Against Wasabi
-
-Wasabi nominally supports v4 signatures, but their implementation is actually _non-canonical_, as they only read the date from the optional `x-amz-date` header, without falling back to the standard HTTP `Date` header. We have changed the behaviour of the library to always go through the X-Amz-Date header as a result. Hence, the need to test with Wasabi.
-
-The Wasabi configuration block looks like this:
-
-```php
-	'wasabi-v4' => [
-		'access'      => 'THE_ACCESS_KEY',
-		'secret'      => 'VERY_SECRET_MUCH_WOW',
-		'region'      => 'eu-central-2',
-		'bucket'      => 'bucketname',
-		'signature'   => 'v4',
-		'dualstack'   => false,
-		'path_access' => true,
-		'ssl'         => true,
-		'endpoint'    => 's3.eu-central-2.wasabisys.com',
-	],
-	'wasabi-v2' => [
-		'access'      => 'THE_ACCESS_KEY',
-		'secret'      => 'VERY_SECRET_MUCH_WOW',
-		'region'      => 'eu-central-2',
-		'bucket'      => 'bucketname',
-		'signature'   => 'v2',
-		'dualstack'   => false,
-		'path_access' => true,
-		'ssl'         => true,
-		'endpoint'    => 's3.eu-central-2.wasabisys.com',
-	],
-
-```
-
-**❗Important**: The Endpoint and Region must match each other, and the region the bucket was crated in. In the example above, we have created a bucket in the `eu-central-2` region. If you use the wrong region and/or endpoint the tests _will_ fail! 
-
-## Against Synology C2
-
-Synology C2 is an S3-“compatible” storage service. It is not very “compatible” though, since they implemented Amazon's documentation of the v4 signatures instead of how the v4 signatures work in the real world (yeah, there's a very big difference). While Amazon S3 _in reality_ expects all dates to be formatted as per RFC1123, they document that they expect them to be formatted as per “ISO 8601”, and they give their _completely wrong_ interpretation of what the “ISO 8601” format is. Synology did not catch that discrepancy, and they only expect the wrongly formatted dates which is totally NOT what S3 itself expects. Luckily, most third party implementations expect either format because they've caught the discrepancy between documentation and reality, therefore making it possible for us to come up with a viable workaround.
-
-And that's why we need to test with C2 as well, folks.
-
-The C2 config block looks like this:
-
-```php
-	'c2' => [
-		'access'      => 'THE_ACCESS_KEY',
-		'secret'      => 'VERY_SECRET_MUCH_WOW',
-		'region'      => 'eu-002',
-		'bucket'      => 'bucketname',
-		'signature'   => 'v4',
-		'dualstack'   => false,
-		'path_access' => false,
-		'ssl'         => true,
-		'endpoint'    => 'eu-002.s3.synologyc2.net',
-	],
-
-```
-
-The endpoint URL is given in the Synology C2 Object Manager, next to each bucket. Note the part before `.s3.`. This is the **region** you need to use with v4 signatures. They do not document this anywhere.
\ No newline at end of file
diff --git a/s3_storage/vendor/akeeba/s3/minitest/Test/AbstractTest.php b/s3_storage/vendor/akeeba/s3/minitest/Test/AbstractTest.php
deleted file mode 100644
index e3f77cce..00000000
--- a/s3_storage/vendor/akeeba/s3/minitest/Test/AbstractTest.php
+++ /dev/null
@@ -1,242 +0,0 @@
-<?php
-/**
- * Akeeba Engine
- *
- * @package   akeebaengine
- * @copyright Copyright (c)2006-2024 Nicholas K. Dionysopoulos / Akeeba Ltd
- * @license   GNU General Public License version 3, or later
- */
-
-namespace Akeeba\MiniTest\Test;
-
-use Akeeba\S3\Connector;
-use RuntimeException;
-
-abstract class AbstractTest
-{
-	const TEN_KB = 10240;
-
-	const HUNDRED_KB = 102400;
-
-	const SIX_HUNDRED_KB = 614400;
-
-	const ONE_MB = 1048576;
-
-	const FIVE_MB = 5242880;
-
-	const SIX_MB = 6291456;
-
-	const TEN_MB = 10485760;
-
-	const ELEVEN_MB = 11534336;
-
-	const BLOCK_SIZE = 1048576;
-
-	const FILE_HASHING_ALGORITHM = 'sha256';
-
-	public static function setup(Connector $s3, array $options): void
-	{
-		// Runs before any test
-	}
-
-	public static function teardown(Connector $s3, array $options): void
-	{
-		// Runs after all tests are finished
-	}
-
-	/**
-	 * Creates a file with random data and returns its file path.
-	 *
-	 * The random data in the file repeats every $blockSize bytes when $reuseBlock is true.
-	 *
-	 * @param   int   $size  Size in files
-	 *
-	 * @param   int   $blockSize
-	 * @param   bool  $reuseBlock
-	 *
-	 * @return  string  The full path to the temporary file.
-	 */
-	protected static function createFile(int $size = AbstractTest::SIX_HUNDRED_KB, int $blockSize = self::BLOCK_SIZE, bool $reuseBlock = true)
-	{
-		$tempFilePath = tempnam(static::getTempFolder(), 'as3');
-
-		if ($tempFilePath === false)
-		{
-			throw new RuntimeException("Cannot create a temporary file.");
-		}
-
-		$fp = @fopen($tempFilePath, 'w', false);
-
-		if ($fp === false)
-		{
-			throw new RuntimeException("Cannot write to the temporary file.");
-		}
-
-		$blockSize     = static::BLOCK_SIZE;
-		$lastBlockSize = $size % $blockSize;
-		$wholeBlocks   = (int) (($size - $lastBlockSize) / $blockSize);
-		$blockData     = static::getRandomData();
-
-		for ($i = 0; $i < $wholeBlocks; $i++)
-		{
-			fwrite($fp, $blockData);
-
-			if (!$reuseBlock)
-			{
-				$blockData = static::getRandomData($blockSize);
-			}
-		}
-
-		if ($lastBlockSize > 0)
-		{
-			fwrite($fp, $blockData, $lastBlockSize);
-		}
-
-
-		fclose($fp);
-
-		return $tempFilePath;
-	}
-
-	/**
-	 * Get a writeable temporary folder
-	 *
-	 * @return  string
-	 */
-	protected static function getTempFolder(): string
-	{
-		$tempPath = sys_get_temp_dir();
-
-		if (!is_writable($tempPath))
-		{
-			$tempPath = __DIR__ . '/tmp';
-
-			if (!is_dir($tempPath))
-			{
-				@mkdir($tempPath, 0755, true);
-			}
-		}
-
-		if (!is_writable($tempPath))
-		{
-			throw new RuntimeException("Cannot get a writeable temporary path.");
-		}
-
-		return $tempPath;
-	}
-
-	/**
-	 * Checks that two files are of equal length and contents
-	 *
-	 * @param   string  $referenceFilePath  The known, reference file
-	 * @param   string  $unknownFilePath    The file we want to verify is the same as the reference file
-	 *
-	 * @return  bool
-	 */
-	protected static function areFilesEqual(string $referenceFilePath, string $unknownFilePath): bool
-	{
-		if (!file_exists($referenceFilePath) || !file_exists($unknownFilePath))
-		{
-			return false;
-		}
-
-		if (!is_file($referenceFilePath) || !is_file($unknownFilePath))
-		{
-			return false;
-		}
-
-		if (!is_readable($referenceFilePath) || !is_readable($unknownFilePath))
-		{
-			return false;
-		}
-
-		if (@filesize($referenceFilePath) !== @filesize($unknownFilePath))
-		{
-			return false;
-		}
-
-		return hash_file(static::FILE_HASHING_ALGORITHM, $referenceFilePath) === hash_file(static::FILE_HASHING_ALGORITHM, $unknownFilePath);
-	}
-
-	/**
-	 * Checks that two strings are of equal length and contents
-	 *
-	 * @param   string  $referenceString  The known, reference file
-	 * @param   string  $unknownString    The file we want to verify is the same as the reference file
-	 *
-	 * @return  bool
-	 */
-	protected static function areStringsEqual(string $referenceString, string $unknownString): bool
-	{
-		return $referenceString === $unknownString;
-	}
-
-	/**
-	 * Returns random data of the specific size in bytes
-	 *
-	 * @param   int  $length  How many bytes of random data to return
-	 *
-	 * @return  string  Your random data
-	 */
-	protected static function getRandomData(int $length = self::BLOCK_SIZE): string
-	{
-		$blockData = '';
-
-		if (substr(strtolower(PHP_OS), 0, 7) !== 'windows')
-		{
-			$fpRandom = @fopen('/dev/urandom', 'r');
-			if ($fpRandom !== false)
-			{
-				$blockData = @fread($fpRandom, $length);
-				@fclose($fpRandom);
-			}
-		}
-
-		if (empty($blockData) && function_exists('random_bytes'))
-		{
-			try
-			{
-				$blockData = random_bytes($length);
-			}
-			catch (\Exception $e)
-			{
-				$blockData = '';
-			}
-		}
-
-		if (empty($blockData) && function_exists('openssl_random_pseudo_bytes'))
-		{
-			$blockData = openssl_random_pseudo_bytes($length);
-		}
-
-		if (empty($blockData) && function_exists('mcrypt_create_iv'))
-		{
-			$blockData = mcrypt_create_iv($length, MCRYPT_DEV_URANDOM);
-
-			if (empty($blockData))
-			{
-				$blockData = mcrypt_create_iv($length, MCRYPT_RAND);
-			}
-		}
-
-		if (empty($blockData))
-		{
-			for ($i = 0; $i < $length; $i++)
-			{
-				$blockData .= ord(mt_rand(0, 255));
-			}
-		}
-
-		return $blockData;
-	}
-
-	protected static function assert(bool $condition, string $message): void
-	{
-		if ($condition)
-		{
-			return;
-		}
-
-		throw new RuntimeException($message);
-	}
-}
\ No newline at end of file
diff --git a/s3_storage/vendor/akeeba/s3/minitest/Test/BigFiles.php b/s3_storage/vendor/akeeba/s3/minitest/Test/BigFiles.php
deleted file mode 100644
index 17969be9..00000000
--- a/s3_storage/vendor/akeeba/s3/minitest/Test/BigFiles.php
+++ /dev/null
@@ -1,217 +0,0 @@
-<?php
-/**
- * Akeeba Engine
- *
- * @package   akeebaengine
- * @copyright Copyright (c)2006-2024 Nicholas K. Dionysopoulos / Akeeba Ltd
- * @license   GNU General Public License version 3, or later
- */
-
-namespace Akeeba\MiniTest\Test;
-
-
-use Akeeba\S3\Connector;
-use Akeeba\S3\Input;
-
-/**
- * Upload, download and delete big files (over 1MB), without multipart uploads. Uses string or file sources.
- *
- * @package Akeeba\MiniTest\Test
- */
-class BigFiles extends AbstractTest
-{
-	/**
-	 * Should I download the file after uploading it to test for contents consistency?
-	 *
-	 * @var bool
-	 */
-	protected static $downloadAfter = true;
-
-	/**
-	 * Should I delete the uploaded file after the test case is done?
-	 *
-	 * @var bool
-	 */
-	protected static $deleteRemote = true;
-
-	/**
-	 * Should I use multipart (chunked) uploads?
-	 *
-	 * @var bool
-	 */
-	protected static $multipart = false;
-
-	/**
-	 * Chunk size for each multipart upload. Must be at least 5MB or the library overrides us.
-	 *
-	 * @var int
-	 */
-	protected static $uploadChunkSize = 5242880;
-
-	/**
-	 * Number of uploaded chunks.
-	 *
-	 * This is set by static::upload(). Zero for single part uploads, non-zero for multipart uploads.
-	 *
-	 * @var int
-	 */
-	protected static $numberOfChunks = 0;
-
-	public static function upload5MBString(Connector $s3, array $options): bool
-	{
-		return static::upload($s3, $options, static::FIVE_MB, 'bigtest_5mb.dat');
-	}
-
-	public static function upload6MBString(Connector $s3, array $options): bool
-	{
-		return static::upload($s3, $options, static::SIX_MB, 'bigtest_6mb.dat');
-	}
-
-	public static function upload10MBString(Connector $s3, array $options): bool
-	{
-		return static::upload($s3, $options, static::TEN_MB, 'bigtest_10mb.dat');
-	}
-
-	public static function upload11MBString(Connector $s3, array $options): bool
-	{
-		return static::upload($s3, $options, static::ELEVEN_MB, 'bigtest_11mb.dat');
-	}
-
-	public static function upload5MBFile(Connector $s3, array $options): bool
-	{
-		return static::upload($s3, $options, static::FIVE_MB, 'bigtest_5mb.dat', false);
-	}
-
-	public static function upload6MBFile(Connector $s3, array $options): bool
-	{
-		return static::upload($s3, $options, static::SIX_MB, 'bigtest_6mb.dat', false);
-	}
-
-	public static function upload10MBFile(Connector $s3, array $options): bool
-	{
-		return static::upload($s3, $options, static::TEN_MB, 'bigtest_10mb.dat', false);
-	}
-
-	public static function upload11MBFile(Connector $s3, array $options): bool
-	{
-		return static::upload($s3, $options, static::ELEVEN_MB, 'bigtest_11mb.dat', false);
-	}
-
-	protected static function upload(Connector $s3, array $options, int $size, string $uri, bool $useString = true): bool
-	{
-		// Randomize the name. Required for archive buckets where you cannot overwrite data.
-		$dotPos = strrpos($uri, '.');
-		$uri    = substr($uri, 0, $dotPos) . '.' . md5(microtime(false)) . substr($uri, $dotPos);
-
-		static::$numberOfChunks = 0;
-
-		if ($useString)
-		{
-			$sourceData = static::getRandomData($size);
-			$input      = Input::createFromData($sourceData);
-		}
-		else
-		{
-			// Create a file with random data
-			$sourceFile = static::createFile($size);
-			$input      = Input::createFromFile($sourceFile);
-		}
-
-		// Upload the file. Throws exception if it fails.
-		$bucket = $options['bucket'];
-
-		if (!static::$multipart)
-		{
-			$s3->putObject($input, $bucket, $uri);
-		}
-		else
-		{
-			// Get an upload session
-			$uploadSession = $s3->startMultipart($input, $bucket, $uri);
-
-			// This array holds the etags of uploaded parts. Used by finalizeMultipart.
-			$eTags      = [];
-			$partNumber = 1;
-
-			while (true)
-			{
-				// We need to create a new input for each upload chunk
-				if ($useString)
-				{
-					$input = Input::createFromData($sourceData);
-				}
-				else
-				{
-					$input = Input::createFromFile($sourceFile);
-				}
-
-				$input->setUploadID($uploadSession);
-				$input->setEtags($eTags);
-				$input->setPartNumber($partNumber);
-
-				$etag = $s3->uploadMultipart($input, $bucket, $uri, [], static::$uploadChunkSize);
-
-				// If the result was null we have no more file parts to process.
-				if (is_null($etag))
-				{
-					break;
-				}
-
-				// Append the etag to the etags array
-				$eTags[] = $etag;
-
-				// Set the etags array in the Input object (required by finalizeMultipart)
-				$input->setEtags($eTags);
-
-				$partNumber++;
-			}
-
-			static::$numberOfChunks = count($eTags);
-
-			// Finalize the multipart upload. Tells Amazon to construct the file from the uploaded parts.
-			$s3->finalizeMultipart($input, $bucket, $uri);
-		}
-
-		// Tentatively accept that this method succeeded.
-		$result = true;
-
-		// Should I download the file and compare its contents?
-		if (static::$downloadAfter)
-		{
-			if ($useString)
-			{
-				// Download the data. Throws exception if it fails.
-				$downloadedData = $s3->getObject($bucket, $uri);
-
-				// Compare the file contents.
-				$result = static::areStringsEqual($sourceData, $downloadedData);
-			}
-			else
-			{
-				// Download the data. Throws exception if it fails.
-				$downloadedFile = tempnam(static::getTempFolder(), 'as3');
-				$s3->getObject($bucket, $uri, $downloadedFile);
-
-				// Compare the file contents.
-				$result = static::areFilesEqual($sourceFile, $downloadedFile);
-
-				@unlink($downloadedFile);
-			}
-		}
-
-		// Remove the local files
-		if (!$useString)
-		{
-			@unlink($sourceFile);
-		}
-
-		// Should I delete the remotely stored file?
-		if (static::$deleteRemote)
-		{
-			// Delete the remote file. Throws exception if it fails.
-			$s3->deleteObject($bucket, $uri);
-		}
-
-		return $result;
-	}
-}
\ No newline at end of file
diff --git a/s3_storage/vendor/akeeba/s3/minitest/Test/BucketLocation.php b/s3_storage/vendor/akeeba/s3/minitest/Test/BucketLocation.php
deleted file mode 100644
index 70552045..00000000
--- a/s3_storage/vendor/akeeba/s3/minitest/Test/BucketLocation.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * Akeeba Engine
- *
- * @package   akeebaengine
- * @copyright Copyright (c)2006-2024 Nicholas K. Dionysopoulos / Akeeba Ltd
- * @license   GNU General Public License version 3, or later
- */
-
-namespace Akeeba\MiniTest\Test;
-
-
-use Akeeba\S3\Connector;
-
-class BucketLocation extends AbstractTest
-{
-	public static function getBucketLocation(Connector $s3, array $options): bool
-	{
-		$location = $s3->getBucketLocation($options['bucket']);
-
-		static::assert($location === $options['region'], "Bucket ‘{$options['bucket']}′ reports being in region ‘{$location}′ instead of expected ‘{$options['region']}′");
-
-		return true;
-	}
-}
\ No newline at end of file
diff --git a/s3_storage/vendor/akeeba/s3/minitest/Test/BucketsList.php b/s3_storage/vendor/akeeba/s3/minitest/Test/BucketsList.php
deleted file mode 100644
index ebd7d5eb..00000000
--- a/s3_storage/vendor/akeeba/s3/minitest/Test/BucketsList.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-/**
- * Akeeba Engine
- *
- * @package   akeebaengine
- * @copyright Copyright (c)2006-2024 Nicholas K. Dionysopoulos / Akeeba Ltd
- * @license   GNU General Public License version 3, or later
- */
-
-namespace Akeeba\MiniTest\Test;
-
-
-use Akeeba\S3\Connector;
-use RuntimeException;
-
-class BucketsList extends AbstractTest
-{
-	public static function listBucketsDetailed(Connector $s3, array $options): bool
-	{
-		$buckets = $s3->listBuckets(true);
-
-		static::assert(is_array($buckets), "Detailed buckets list is not an array");
-		static::assert(isset($buckets['owner']), "Detailed buckets list does not list an owner");
-		static::assert(isset($buckets['owner']['id']), "Detailed buckets list does not list an owner's id");
-		static::assert(isset($buckets['owner']['name']), "Detailed buckets list does not list an owner's name");
-		static::assert(isset($buckets['buckets']), "Detailed buckets list does not list any buckets");
-
-		foreach ($buckets['buckets'] as $bucketInfo)
-		{
-			static::assert(isset($bucketInfo['name']), "Bucket information does not list a name");
-			static::assert(isset($bucketInfo['time']), "Bucket information does not list a created times");
-
-			if ($bucketInfo['name'] === $options['bucket'])
-			{
-				return true;
-			}
-		}
-
-		throw new RuntimeException("Detailed buckets list does not include configured bucket ‘{$options['bucket']}′");
-	}
-
-	public static function listBucketsSimple(Connector $s3, array $options): bool
-	{
-		$buckets = $s3->listBuckets(false);
-
-		static::assert(is_array($buckets), "Simple buckets list is not an array");
-		static::assert(in_array($options['bucket'], $buckets), "Simple buckets list does not include configured bucket ‘{$options['bucket']}′");
-
-		return true;
-	}
-
-}
\ No newline at end of file
diff --git a/s3_storage/vendor/akeeba/s3/minitest/Test/HeadObject.php b/s3_storage/vendor/akeeba/s3/minitest/Test/HeadObject.php
deleted file mode 100644
index abcb5177..00000000
--- a/s3_storage/vendor/akeeba/s3/minitest/Test/HeadObject.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-/**
- * Akeeba Engine
- *
- * @package   akeebaengine
- * @copyright Copyright (c)2006-2024 Nicholas K. Dionysopoulos / Akeeba Ltd
- * @license   GNU General Public License version 3, or later
- */
-
-
-namespace Akeeba\MiniTest\Test;
-
-
-use Akeeba\S3\Connector;
-use Akeeba\S3\Exception\CannotDeleteFile;
-use Akeeba\S3\Exception\CannotGetFile;
-use Akeeba\S3\Input;
-
-class HeadObject extends AbstractTest
-{
-	public static function testExistingFile(Connector $s3, array $options): bool
-	{
-		$uri = 'head_test.dat';
-
-		// Randomize the name. Required for archive buckets where you cannot overwrite data.
-		$dotPos = strrpos($uri, '.');
-		$uri    = substr($uri, 0, $dotPos) . '.' . md5(microtime(false)) . substr($uri, $dotPos);
-
-		// Create a file with random data
-		$sourceFile = static::createFile(AbstractTest::TEN_KB);
-
-		// Upload the file. Throws exception if it fails.
-		$bucket = $options['bucket'];
-		$input  = Input::createFromFile($sourceFile);
-
-		$s3->putObject($input, $bucket, $uri);
-
-		$headers = $s3->headObject($bucket, $uri);
-
-		static::assert(isset($headers['size']), 'The returned headers do not contain the object size');
-		static::assert($headers['size'] == AbstractTest::TEN_KB, 'The returned size does not match');
-
-		// Remove the local files
-		@unlink($sourceFile);
-
-		// Delete the remote file. Throws exception if it fails.
-		$s3->deleteObject($bucket, $uri);
-
-		return true;
-	}
-
-	public static function testMissingFile(Connector $s3, array $options): bool
-	{
-		$bucket = $options['bucket'];
-
-		try
-		{
-			$headers = $s3->headObject($bucket, md5(microtime(false)) . '_does_not_exist');
-		}
-		catch (CannotGetFile $e)
-		{
-			return true;
-		}
-
-		return false;
-	}
-}
\ No newline at end of file
diff --git a/s3_storage/vendor/akeeba/s3/minitest/Test/ListFiles.php b/s3_storage/vendor/akeeba/s3/minitest/Test/ListFiles.php
deleted file mode 100644
index fc6ed232..00000000
--- a/s3_storage/vendor/akeeba/s3/minitest/Test/ListFiles.php
+++ /dev/null
@@ -1,308 +0,0 @@
-<?php
-/**
- * Akeeba Engine
- *
- * @package   akeebaengine
- * @copyright Copyright (c)2006-2024 Nicholas K. Dionysopoulos / Akeeba Ltd
- * @license   GNU General Public License version 3, or later
- */
-
-namespace Akeeba\MiniTest\Test;
-
-
-use Akeeba\S3\Connector;
-use Akeeba\S3\Exception\CannotPutFile;
-use Akeeba\S3\Input;
-
-class ListFiles extends AbstractTest
-{
-	private static $paths = [
-		'listtest_one.dat',
-		'listtest_two.dat',
-		'listtest_three.dat',
-		'list_deeper/test_one.dat',
-		'list_deeper/test_two.dat',
-		'list_deeper/test_three.dat',
-		'list_deeper/listtest_four.dat',
-		'list_deeper/listtest_five.dat',
-		'list_deeper/listtest_six.dat',
-		'list_deeper/spam.dat',
-		'list_deeper/listtest_deeper/seven.dat',
-		'list_deeper/listtest_deeper/eight.dat',
-		'spam.dat',
-	];
-
-	public static function setup(Connector $s3, array $options): void
-	{
-		$data = static::getRandomData(static::TEN_KB);
-
-		foreach (static::$paths as $uri)
-		{
-			$input = Input::createFromData($data);
-			try
-			{
-				$s3->putObject($input, $options['bucket'], $uri);
-			}
-			catch (CannotPutFile $e)
-			{
-				// Expected for archival buckets
-			}
-		}
-	}
-
-	public static function teardown(Connector $s3, array $options): void
-	{
-		foreach (static::$paths as $uri)
-		{
-			try
-			{
-				$s3->deleteObject($options['bucket'], $uri);
-			}
-			catch (\Exception $e)
-			{
-				// No problem if I can't delete the file
-			}
-		}
-	}
-
-	public static function testGetAll(Connector $s3, array $options): bool
-	{
-		$listing = $s3->getBucket($options['bucket'], 'listtest_');
-
-		static::assert(is_array($listing), "The files listing must be an array");
-		static::assert(count($listing) == 3, "I am expecting to see 3 files");
-
-		// Make sure I have the expected files
-		static::assert(array_key_exists('listtest_one.dat', $listing), "File listtest_one.dat not in listing");
-		static::assert(array_key_exists('listtest_two.dat', $listing), "File listtest_two.dat not in listing");
-		static::assert(array_key_exists('listtest_three.dat', $listing), "File listtest_three.dat not in listing");
-
-		// I must not see the files in subdirectories
-		static::assert(!array_key_exists('listtest_four.dat', $listing), "File listtest_four.dat in listing");
-		static::assert(!array_key_exists('listtest_five.dat', $listing), "File listtest_five.dat in listing");
-		static::assert(!array_key_exists('listtest_six.dat', $listing), "File listtest_six.dat in listing");
-
-		// I must not see the files not matching the prefix I gave
-		static::assert(!array_key_exists('spam.dat', $listing), "File spam.dat in listing");
-		static::assert(!array_key_exists('ham.dat', $listing), "File ham.dat in listing");
-
-		foreach ($listing as $fileName => $info)
-		{
-			static::assert(isset($info['name']), "File entries must have a name");
-			static::assert(isset($info['time']), "File entries must have a time");
-			static::assert(isset($info['size']), "File entries must have a size");
-			static::assert(isset($info['hash']), "File entries must have a hash");
-		}
-
-		return true;
-	}
-
-	public static function testGetContinue(Connector $s3, array $options): bool
-	{
-		$listing = $s3->getBucket($options['bucket'], 'listtest_', null, 1);
-
-		static::assert(is_array($listing), "The files listing must be an array");
-		static::assert(count($listing) == 1, sprintf("I am expecting to see 1 file, %s seen", count($listing)));
-
-		$files     = array_keys($listing);
-		$continued = $s3->getBucket($options['bucket'], 'listtest_', array_shift($files));
-
-		static::assert(is_array($continued), "The continued files listing must be an array");
-		static::assert(count($continued) == 2, sprintf("I am expecting to see 2 files, %s seen", count($continued)));
-
-		$listing = array_merge($listing, $continued);
-
-		// Make sure I have the expected files
-		static::assert(array_key_exists('listtest_one.dat', $listing), "File listtest_one.dat not in listing");
-		static::assert(array_key_exists('listtest_two.dat', $listing), "File listtest_two.dat not in listing");
-		static::assert(array_key_exists('listtest_three.dat', $listing), "File listtest_three.dat not in listing");
-
-		// I must not see the files in subdirectories
-		static::assert(!array_key_exists('listtest_four.dat', $listing), "File listtest_four.dat in listing");
-		static::assert(!array_key_exists('listtest_five.dat', $listing), "File listtest_five.dat in listing");
-		static::assert(!array_key_exists('listtest_six.dat', $listing), "File listtest_six.dat in listing");
-
-		// I must not see the files not matching the prefix I gave
-		static::assert(!array_key_exists('spam.dat', $listing), "File spam.dat in listing");
-		static::assert(!array_key_exists('ham.dat', $listing), "File ham.dat in listing");
-
-		foreach ($listing as $fileName => $info)
-		{
-			static::assert(isset($info['name']), "File entries must have a name");
-			static::assert(isset($info['time']), "File entries must have a time");
-			static::assert(isset($info['size']), "File entries must have a size");
-			static::assert(isset($info['hash']), "File entries must have a hash");
-		}
-
-		return true;
-	}
-
-	public static function testGetSubdirectoryFiles(Connector $s3, array $options): bool
-	{
-		$listing = $s3->getBucket($options['bucket'], 'list_deeper/test_');
-
-		static::assert(is_array($listing), "The files listing must be an array");
-		static::assert(count($listing) == 3, "I am expecting to see 3 files");
-
-		// Make sure I have the expected files
-		static::assert(array_key_exists('list_deeper/test_one.dat', $listing), "File test_one.dat not in listing");
-		static::assert(array_key_exists('list_deeper/test_two.dat', $listing), "File test_two.dat not in listing");
-		static::assert(array_key_exists('list_deeper/test_three.dat', $listing), "File test_three.dat not in listing");
-
-		// I must not see the files with different  prefix
-		static::assert(!array_key_exists('list_deeper/listtest_four.dat', $listing), "File listtest_four.dat in listing");
-		static::assert(!array_key_exists('list_deeper/listtest_five.dat', $listing), "File listtest_five.dat in listing");
-		static::assert(!array_key_exists('list_deeper/listtest_six.dat', $listing), "File listtest_six.dat in listing");
-		static::assert(!array_key_exists('list_deeper/spam.dat', $listing), "File spam.dat in listing");
-
-		// I must not see the files in subdirectories
-		static::assert(!array_key_exists('list_deeper/listtest_deeper/seven.dat', $listing), "File spam.dat in listing");
-		static::assert(!array_key_exists('list_deeper/listtest_deeper/eight.dat', $listing), "File spam.dat in listing");
-
-		foreach ($listing as $fileName => $info)
-		{
-			static::assert(isset($info['name']), "File entries must have a name");
-			static::assert(isset($info['time']), "File entries must have a time");
-			static::assert(isset($info['size']), "File entries must have a size");
-			static::assert(isset($info['hash']), "File entries must have a hash");
-		}
-
-		return true;
-	}
-
-	public static function testGetSubdirectoryFilesWithContinue(Connector $s3, array $options): bool
-	{
-		$listing = $s3->getBucket($options['bucket'], 'list_deeper/test_', null, 1);
-
-		static::assert(is_array($listing), "The files listing must be an array");
-		static::assert(count($listing) == 1, sprintf("I am expecting to see 1 file, %s seen", count($listing)));
-
-		$files     = array_keys($listing);
-		$continued = $s3->getBucket($options['bucket'], 'list_deeper/test_', array_shift($files));
-
-		static::assert(is_array($continued), "The continued files listing must be an array");
-		static::assert(count($continued) == 2, sprintf("I am expecting to see 2 files, %s seen", count($continued)));
-
-		$listing = array_merge($listing, $continued);
-
-		static::assert(is_array($listing), "The files listing must be an array");
-		static::assert(count($listing) == 3, "I am expecting to see 3 files");
-
-		// Make sure I have the expected files
-		static::assert(array_key_exists('list_deeper/test_one.dat', $listing), "File test_one.dat not in listing");
-		static::assert(array_key_exists('list_deeper/test_two.dat', $listing), "File test_two.dat not in listing");
-		static::assert(array_key_exists('list_deeper/test_three.dat', $listing), "File test_three.dat not in listing");
-
-		// I must not see the files with different  prefix
-		static::assert(!array_key_exists('list_deeper/listtest_four.dat', $listing), "File listtest_four.dat in listing");
-		static::assert(!array_key_exists('list_deeper/listtest_five.dat', $listing), "File listtest_five.dat in listing");
-		static::assert(!array_key_exists('list_deeper/listtest_six.dat', $listing), "File listtest_six.dat in listing");
-		static::assert(!array_key_exists('list_deeper/spam.dat', $listing), "File spam.dat in listing");
-
-		// I must not see the files in subdirectories
-		static::assert(!array_key_exists('list_deeper/listtest_deeper/seven.dat', $listing), "File spam.dat in listing");
-		static::assert(!array_key_exists('list_deeper/listtest_deeper/eight.dat', $listing), "File spam.dat in listing");
-
-		foreach ($listing as $fileName => $info)
-		{
-			static::assert(isset($info['name']), "File entries must have a name");
-			static::assert(isset($info['time']), "File entries must have a time");
-			static::assert(isset($info['size']), "File entries must have a size");
-			static::assert(isset($info['hash']), "File entries must have a hash");
-		}
-
-		return true;
-	}
-
-	public static function testListWithPrefixSharedWithFolder(Connector $s3, array $options): bool
-	{
-		/**
-		 * The prefix list_deeper/listtest_ matches BOTH keys (files) and common prefixes (folders).
-		 *
-		 * Common prefixes have priority so the first request would return zero files. The Connector catches that
-		 * internally and performs more requests until it has at least as many files as we requeted.
-		 */
-		$listing = $s3->getBucket($options['bucket'], 'list_deeper/listtest_', null, 1);
-
-		static::assert(is_array($listing), "The files listing must be an array");
-		static::assert(count($listing) == 1, sprintf("I am expecting to see 1 files, %s seen", count($listing)));
-
-		$files     = array_keys($listing);
-		$continued = $s3->getBucket($options['bucket'], 'list_deeper/listtest_', array_shift($files));
-
-		static::assert(is_array($continued), "The continued files listing must be an array");
-		static::assert(count($continued) == 2, sprintf("I am expecting to see 2 files, %s seen", count($continued)));
-
-		$listing = array_merge($listing, $continued);
-
-		static::assert(is_array($listing), "The files listing must be an array");
-		static::assert(count($listing) == 3, "I am expecting to see 3 files");
-
-		// Make sure I have the expected files
-		static::assert(array_key_exists('list_deeper/listtest_four.dat', $listing), "File listtest_four.dat not in listing");
-		static::assert(array_key_exists('list_deeper/listtest_five.dat', $listing), "File listtest_five.dat not in listing");
-		static::assert(array_key_exists('list_deeper/listtest_six.dat', $listing), "File listtest_six.dat not in listing");
-
-
-		// I must not see the files with different  prefix
-		static::assert(!array_key_exists('list_deeper/test_one.dat', $listing), "File test_one.dat in listing");
-		static::assert(!array_key_exists('list_deeper/test_two.dat', $listing), "File test_two.dat in listing");
-		static::assert(!array_key_exists('list_deeper/test_three.dat', $listing), "File test_three.dat in listing");
-		static::assert(!array_key_exists('list_deeper/spam.dat', $listing), "File spam.dat in listing");
-
-		// I must not see the files in subdirectories
-		static::assert(!array_key_exists('list_deeper/listtest_deeper/seven.dat', $listing), "File spam.dat in listing");
-		static::assert(!array_key_exists('list_deeper/listtest_deeper/eight.dat', $listing), "File spam.dat in listing");
-
-		foreach ($listing as $fileName => $info)
-		{
-			static::assert(isset($info['name']), "File entries must have a name");
-			static::assert(isset($info['time']), "File entries must have a time");
-			static::assert(isset($info['size']), "File entries must have a size");
-			static::assert(isset($info['hash']), "File entries must have a hash");
-		}
-
-		return true;
-	}
-
-	public static function testCommonPrefixes(Connector $s3, array $options): bool
-	{
-		$listing = $s3->getBucket($options['bucket'], 'list_deeper/listtest_', null, null, '/', true);
-
-		static::assert(is_array($listing), "The files listing must be an array");
-		static::assert(count($listing) == 4, sprintf("I am expecting to see 4 entries, %s entries seen.", count($listing)));
-
-		// Make sure I have the expected files
-		static::assert(array_key_exists('list_deeper/listtest_four.dat', $listing), "File listtest_four.dat not in listing");
-		static::assert(array_key_exists('list_deeper/listtest_five.dat', $listing), "File listtest_five.dat not in listing");
-		static::assert(array_key_exists('list_deeper/listtest_six.dat', $listing), "File listtest_six.dat not in listing");
-		static::assert(array_key_exists('list_deeper/listtest_deeper/', $listing), "Folder listtest_deeper not in listing");
-
-		// I must not see the files in subdirectories
-		static::assert(!array_key_exists('list_deeper/listtest_deeper/seven.dat', $listing), "File seven.dat in listing");
-		static::assert(!array_key_exists('list_deeper/listtest_deeper/eight.dat', $listing), "File eight.dat in listing");
-
-		// I must not see the files with different  prefix
-		static::assert(!array_key_exists('list_deeper/spam.dat', $listing), "File spam.dat in listing");
-		static::assert(!array_key_exists('list_deeper/test_one.dat', $listing), "File test_one.dat not in listing");
-		static::assert(!array_key_exists('list_deeper/test_two.dat', $listing), "File test_two.dat not in listing");
-		static::assert(!array_key_exists('list_deeper/test_three.dat', $listing), "File test_three.dat not in listing");
-
-		foreach ($listing as $fileName => $info)
-		{
-			if (substr($fileName, -1) !== '/')
-			{
-				static::assert(isset($info['name']), "File entries must have a name");
-				static::assert(isset($info['time']), "File entries must have a time");
-				static::assert(isset($info['size']), "File entries must have a size");
-				static::assert(isset($info['hash']), "File entries must have a hash");
-			}
-			else
-			{
-				static::assert(isset($info['prefix']), "Folder entries must return a prefix");
-			}
-		}
-
-		return true;
-	}
-}
\ No newline at end of file
diff --git a/s3_storage/vendor/akeeba/s3/minitest/Test/ListThousandsOfFiles.php b/s3_storage/vendor/akeeba/s3/minitest/Test/ListThousandsOfFiles.php
deleted file mode 100644
index 8485a715..00000000
--- a/s3_storage/vendor/akeeba/s3/minitest/Test/ListThousandsOfFiles.php
+++ /dev/null
@@ -1,111 +0,0 @@
-<?php
-/**
- * Akeeba Engine
- *
- * @package   akeebaengine
- * @copyright Copyright (c)2006-2024 Nicholas K. Dionysopoulos / Akeeba Ltd
- * @license   GNU General Public License version 3, or later
- */
-
-namespace Akeeba\MiniTest\Test;
-
-use Akeeba\S3\Connector;
-use Akeeba\S3\Input;
-
-class ListThousandsOfFiles extends AbstractTest
-{
-	private const PATH_PREFIX = 'massive/';
-
-	public static function setup(Connector $s3, array $options): void
-	{
-		if (defined('CREATE_2100_FILES') && CREATE_2100_FILES === false)
-		{
-			return;
-		}
-
-		$data = static::getRandomData(128);
-
-		echo "\nPopulating with 2100 files\n";
-
-		for ($i = 1; $i <= 2100; $i++)
-		{
-			if ($i % 10 === 0)
-			{
-				echo "Uploading from $i...\n";
-			}
-
-			$uri   = sprintf('%stest_%04u.dat', static::PATH_PREFIX, $i);
-			$input = Input::createFromData($data);
-			$s3->putObject($input, $options['bucket'], $uri);
-		}
-	}
-
-	public static function testGetAll(Connector $s3, array $options): bool
-	{
-		$listing = $s3->getBucket($options['bucket'], static::PATH_PREFIX);
-
-		static::assert(is_array($listing), "The files listing must be an array");
-		static::assert(count($listing) === 2100, "I am expecting to see 2100 files");
-
-		for ($i = 1; $i <= 2100; $i++)
-		{
-			$key = sprintf('%stest_%04u.dat', static::PATH_PREFIX, $i);
-
-			static::assert(array_key_exists($key, $listing), sprintf('Results should list object %s', $key));
-		}
-
-		return true;
-	}
-
-	public static function testGetHundred(Connector $s3, array $options): bool
-	{
-		$listing = $s3->getBucket($options['bucket'], static::PATH_PREFIX, null, 100);
-
-		static::assert(is_array($listing), "The files listing must be an array");
-		static::assert(count($listing) === 100, "I am expecting to see 100 files");
-
-		for ($i = 1; $i <= 100; $i++)
-		{
-			$key = sprintf('%stest_%04u.dat', static::PATH_PREFIX, $i);
-
-			static::assert(array_key_exists($key, $listing), sprintf('Results should list object %s', $key));
-		}
-
-		return true;
-	}
-
-	public static function testGetElevenHundred(Connector $s3, array $options): bool
-	{
-		$listing = $s3->getBucket($options['bucket'], static::PATH_PREFIX, null, 1100);
-
-		static::assert(is_array($listing), "The files listing must be an array");
-		static::assert(count($listing) === 1100, "I am expecting to see 1100 files");
-
-		for ($i = 1; $i <= 1100; $i++)
-		{
-			$key = sprintf('%stest_%04u.dat', static::PATH_PREFIX, $i);
-
-			static::assert(array_key_exists($key, $listing), sprintf('Results should list object %s', $key));
-		}
-
-		return true;
-	}
-
-	public static function testGetLastHundred(Connector $s3, array $options): bool
-	{
-		$listing = $s3->getBucket($options['bucket'], static::PATH_PREFIX . 'test_20', null);
-
-		static::assert(is_array($listing), "The files listing must be an array");
-		static::assert(count($listing) === 100, "I am expecting to see 100 files");
-
-		for ($i = 2000; $i <= 2099; $i++)
-		{
-			$key = sprintf('%stest_%04u.dat', static::PATH_PREFIX, $i);
-
-			static::assert(array_key_exists($key, $listing), sprintf('Results should list object %s', $key));
-		}
-
-		return true;
-	}
-
-}
\ No newline at end of file
diff --git a/s3_storage/vendor/akeeba/s3/minitest/Test/Multipart.php b/s3_storage/vendor/akeeba/s3/minitest/Test/Multipart.php
deleted file mode 100644
index fc244c62..00000000
--- a/s3_storage/vendor/akeeba/s3/minitest/Test/Multipart.php
+++ /dev/null
@@ -1,103 +0,0 @@
-<?php
-/**
- * Akeeba Engine
- *
- * @package   akeebaengine
- * @copyright Copyright (c)2006-2024 Nicholas K. Dionysopoulos / Akeeba Ltd
- * @license   GNU General Public License version 3, or later
- */
-
-namespace Akeeba\MiniTest\Test;
-
-
-use Akeeba\S3\Connector;
-
-class Multipart extends BigFiles
-{
-	public static function setup(Connector $s3, array $options): void
-	{
-		static::$multipart = true;
-
-		parent::setup($s3, $options);
-	}
-
-	public static function upload5MBString(Connector $s3, array $options): bool
-	{
-		$result = parent::upload5MBString($s3, $options);
-
-		$expectedChunks = 1;
-		static::assert(static::$numberOfChunks === $expectedChunks, sprintf("Expected %s chunks, upload complete in %s chunks", $expectedChunks, static::$numberOfChunks));
-
-		return $result;
-	}
-
-	public static function upload6MBString(Connector $s3, array $options): bool
-	{
-		$result = parent::upload6MBString($s3, $options);
-
-		$expectedChunks = 2;
-		static::assert(static::$numberOfChunks === $expectedChunks, sprintf("Expected %s chunks, upload complete in %s chunks", $expectedChunks, static::$numberOfChunks));
-
-		return $result;
-	}
-
-	public static function upload10MBString(Connector $s3, array $options): bool
-	{
-		$result = parent::upload10MBString($s3, $options);
-
-		$expectedChunks = 2;
-		static::assert(static::$numberOfChunks === $expectedChunks, sprintf("Expected %s chunks, upload complete in %s chunks", $expectedChunks, static::$numberOfChunks));
-
-		return $result;
-	}
-
-	public static function upload11MBString(Connector $s3, array $options): bool
-	{
-		$result = parent::upload11MBString($s3, $options);
-
-		$expectedChunks = 3;
-		static::assert(static::$numberOfChunks === $expectedChunks, sprintf("Expected %s chunks, upload complete in %s chunks", $expectedChunks, static::$numberOfChunks));
-
-		return $result;
-	}
-
-	public static function upload5MBFile(Connector $s3, array $options): bool
-	{
-		$result = parent::upload5MBFile($s3, $options);
-
-		$expectedChunks = 1;
-		static::assert(static::$numberOfChunks === $expectedChunks, sprintf("Expected %s chunks, upload complete in %s chunks", $expectedChunks, static::$numberOfChunks));
-
-		return $result;
-	}
-
-	public static function upload6MBFile(Connector $s3, array $options): bool
-	{
-		$result = parent::upload6MBFile($s3, $options);
-
-		$expectedChunks = 2;
-		static::assert(static::$numberOfChunks === $expectedChunks, sprintf("Expected %s chunks, upload complete in %s chunks", $expectedChunks, static::$numberOfChunks));
-
-		return $result;
-	}
-
-	public static function upload10MBFile(Connector $s3, array $options): bool
-	{
-		$result = parent::upload10MBFile($s3, $options);
-
-		$expectedChunks = 2;
-		static::assert(static::$numberOfChunks === $expectedChunks, sprintf("Expected %s chunks, upload complete in %s chunks", $expectedChunks, static::$numberOfChunks));
-
-		return $result;
-	}
-
-	public static function upload11MBFile(Connector $s3, array $options): bool
-	{
-		$result = parent::upload11MBFile($s3, $options);
-
-		$expectedChunks = 3;
-		static::assert(static::$numberOfChunks === $expectedChunks, sprintf("Expected %s chunks, upload complete in %s chunks", $expectedChunks, static::$numberOfChunks));
-
-		return $result;
-	}
-}
\ No newline at end of file
diff --git a/s3_storage/vendor/akeeba/s3/minitest/Test/SignedURLs.php b/s3_storage/vendor/akeeba/s3/minitest/Test/SignedURLs.php
deleted file mode 100644
index 41667cc3..00000000
--- a/s3_storage/vendor/akeeba/s3/minitest/Test/SignedURLs.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-/**
- * Akeeba Engine
- *
- * @package   akeebaengine
- * @copyright Copyright (c)2006-2024 Nicholas K. Dionysopoulos / Akeeba Ltd
- * @license   GNU General Public License version 3, or later
- */
-
-namespace Akeeba\MiniTest\Test;
-
-
-use Akeeba\S3\Acl;
-use Akeeba\S3\Connector;
-use Akeeba\S3\Input;
-use RuntimeException;
-
-class SignedURLs extends AbstractTest
-{
-	public static function signedURLPublicObject(Connector $s3, array $options): bool
-	{
-		return static::signedURL($s3, $options, Acl::ACL_PUBLIC_READ);
-	}
-
-	public static function signedURLPublicObjectSpaces(Connector $s3, array $options): bool
-	{
-		return static::signedURL($s3, array_merge($options, [
-			'spaces' => true
-		]), Acl::ACL_PUBLIC_READ);
-	}
-
-	public static function signedURLPrivateObject(Connector $s3, array $options): bool
-	{
-		return static::signedURL($s3, $options, Acl::ACL_PRIVATE);
-	}
-
-	public static function signedURLPrivateObjectSpaces(Connector $s3, array $options): bool
-	{
-		return static::signedURL($s3, array_merge($options, [
-			'spaces' => true
-		]), Acl::ACL_PRIVATE);
-	}
-
-	private static function signedURL(Connector $s3, array $options, string $aclPrivilege): bool
-	{
-		$spaces   = isset($options['spaces']) && boolval($options['spaces']);
-		$tempData = static::getRandomData(AbstractTest::TEN_KB);
-		$input    = Input::createFromData($tempData);
-		$prefix   = $spaces ? 'test file' : 'test';
-		$uri      = $prefix . '.' . md5(microtime(false)) . '.dat';
-
-		$s3->putObject($input, $options['bucket'], $uri, $aclPrivilege);
-
-		$downloadURL    = $s3->getAuthenticatedURL($options['bucket'], $uri, null, $options['ssl']);
-
-		echo "\n\tDownload URL: $downloadURL\n";
-
-		$downloadedData = @file_get_contents($downloadURL);
-
-		try
-		{
-			$s3->deleteObject($options['bucket'], $uri);
-		}
-		catch (\Exception $e)
-		{
-			// Ignore deletion errors
-		}
-
-		if ($downloadedData === false)
-		{
-			throw new RuntimeException("Failed to download from signed URL ‘{$downloadURL}′");
-		}
-
-		static::assert(static::areStringsEqual($tempData, $downloadedData), "Wrong data received from signed URL ‘{$downloadURL}′");
-
-		return true;
-	}
-}
\ No newline at end of file
diff --git a/s3_storage/vendor/akeeba/s3/minitest/Test/SingleSmallFile.php b/s3_storage/vendor/akeeba/s3/minitest/Test/SingleSmallFile.php
deleted file mode 100644
index 51716621..00000000
--- a/s3_storage/vendor/akeeba/s3/minitest/Test/SingleSmallFile.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-/**
- * Akeeba Engine
- *
- * @package   akeebaengine
- * @copyright Copyright (c)2006-2024 Nicholas K. Dionysopoulos / Akeeba Ltd
- * @license   GNU General Public License version 3, or later
- */
-
-namespace Akeeba\MiniTest\Test;
-
-use Akeeba\S3\Connector;
-use Akeeba\S3\Input;
-
-/**
- * Upload, download and delete small files (under 1MB) using a string source
- *
- * @package Akeeba\MiniTest\Test
- */
-class SingleSmallFile extends AbstractTest
-{
-	public static function upload(Connector $s3, array $options): bool
-	{
-		$uri        = 'test.txt';
-		$sourceData = <<< TEXT
-This is a small text file.
-TEXT;
-
-
-		// Upload the data. Throws exception if it fails.
-		$bucket = $options['bucket'];
-		$input  = Input::createFromData($sourceData);
-
-		$s3->putObject($input, $bucket, $uri);
-
-		$downloadedData = $s3->getObject($bucket, $uri);
-		$result         = static::areStringsEqual($sourceData, $downloadedData);
-
-		$s3->deleteObject($bucket, $uri);
-
-		return $result ?? true;
-	}
-}
\ No newline at end of file
diff --git a/s3_storage/vendor/akeeba/s3/minitest/Test/SmallFiles.php b/s3_storage/vendor/akeeba/s3/minitest/Test/SmallFiles.php
deleted file mode 100644
index 75d91d11..00000000
--- a/s3_storage/vendor/akeeba/s3/minitest/Test/SmallFiles.php
+++ /dev/null
@@ -1,109 +0,0 @@
-<?php
-/**
- * Akeeba Engine
- *
- * @package   akeebaengine
- * @copyright Copyright (c)2006-2024 Nicholas K. Dionysopoulos / Akeeba Ltd
- * @license   GNU General Public License version 3, or later
- */
-
-namespace Akeeba\MiniTest\Test;
-
-
-use Akeeba\S3\Connector;
-use Akeeba\S3\Input;
-
-/**
- * Upload, download and delete small files (under 1MB) using a file source
- *
- * @package Akeeba\MiniTest\Test
- */
-class SmallFiles extends AbstractTest
-{
-	/**
-	 * Should I download the file after uploading it to test for contents consistency?
-	 *
-	 * @var bool
-	 */
-	protected static $downloadAfter = true;
-
-	/**
-	 * Should I delete the uploaded file after the test case is done?
-	 *
-	 * @var bool
-	 */
-	protected static $deleteRemote = true;
-
-	public static function upload10KbRoot(Connector $s3, array $options): bool
-	{
-		return static::upload($s3, $options, AbstractTest::TEN_KB, 'root_10kb.dat');
-	}
-
-	public static function upload10KbRootGreek(Connector $s3, array $options): bool
-	{
-		return static::upload($s3, $options, AbstractTest::TEN_KB, 'δοκιμή_10kb.dat');
-	}
-
-	public static function upload10KbFolderGreek(Connector $s3, array $options): bool
-	{
-		return static::upload($s3, $options, AbstractTest::TEN_KB, 'ο_φάκελός_μου/δοκιμή_10kb.dat');
-	}
-
-	public static function upload600KbRoot(Connector $s3, array $options): bool
-	{
-		return static::upload($s3, $options, AbstractTest::SIX_HUNDRED_KB, 'root_600kb.dat');
-	}
-
-	public static function upload10KbFolder(Connector $s3, array $options): bool
-	{
-		return static::upload($s3, $options, AbstractTest::TEN_KB, 'my_folder/10kb.dat');
-	}
-
-	public static function upload600KbFolder(Connector $s3, array $options): bool
-	{
-		return static::upload($s3, $options, AbstractTest::SIX_HUNDRED_KB, 'my_folder/600kb.dat');
-	}
-
-	protected static function upload(Connector $s3, array $options, int $size, string $uri): bool
-	{
-		// Randomize the name. Required for archive buckets where you cannot overwrite data.
-		$dotPos = strrpos($uri, '.');
-		$uri    = substr($uri, 0, $dotPos) . '.' . md5(microtime(false)) . substr($uri, $dotPos);
-
-		// Create a file with random data
-		$sourceFile = static::createFile($size);
-
-		// Upload the file. Throws exception if it fails.
-		$bucket = $options['bucket'];
-		$input  = Input::createFromFile($sourceFile);
-
-		$s3->putObject($input, $bucket, $uri);
-
-		// Tentatively accept that this method succeeded.
-		$result = true;
-
-		// Should I download the file and compare its contents?
-		if (static::$downloadAfter)
-		{
-			// Donwload the data. Throws exception if it fails.
-			$downloadedFile = tempnam(static::getTempFolder(), 'as3');
-			$s3->getObject($bucket, $uri, $downloadedFile);
-
-			// Compare the file contents.
-			$result = static::areFilesEqual($sourceFile, $downloadedFile);
-		}
-
-		// Remove the local files
-		@unlink($sourceFile);
-		@unlink($downloadedFile);
-
-		// Should I delete the remotely stored file?
-		if (static::$deleteRemote)
-		{
-			// Delete the remote file. Throws exception if it fails.
-			$s3->deleteObject($bucket, $uri);
-		}
-
-		return $result;
-	}
-}
\ No newline at end of file
diff --git a/s3_storage/vendor/akeeba/s3/minitest/Test/SmallFilesNoDelete.php b/s3_storage/vendor/akeeba/s3/minitest/Test/SmallFilesNoDelete.php
deleted file mode 100644
index fee30e5f..00000000
--- a/s3_storage/vendor/akeeba/s3/minitest/Test/SmallFilesNoDelete.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
- * Akeeba Engine
- *
- * @package   akeebaengine
- * @copyright Copyright (c)2006-2024 Nicholas K. Dionysopoulos / Akeeba Ltd
- * @license   GNU General Public License version 3, or later
- */
-
-namespace Akeeba\MiniTest\Test;
-
-
-use Akeeba\S3\Connector;
-
-/**
- * Upload and download small files (under 1MB) using a file source
- *
- * @package Akeeba\MiniTest\Test
- */
-class SmallFilesNoDelete extends SmallFiles
-{
-	public static function setup(Connector $s3, array $options): void
-	{
-		static::$deleteRemote = false;
-
-		parent::setup($s3, $options);
-	}
-}
\ No newline at end of file
diff --git a/s3_storage/vendor/akeeba/s3/minitest/Test/SmallFilesOnlyUpload.php b/s3_storage/vendor/akeeba/s3/minitest/Test/SmallFilesOnlyUpload.php
deleted file mode 100644
index 1d2aa370..00000000
--- a/s3_storage/vendor/akeeba/s3/minitest/Test/SmallFilesOnlyUpload.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-/**
- * Akeeba Engine
- *
- * @package   akeebaengine
- * @copyright Copyright (c)2006-2024 Nicholas K. Dionysopoulos / Akeeba Ltd
- * @license   GNU General Public License version 3, or later
- */
-
-namespace Akeeba\MiniTest\Test;
-
-
-use Akeeba\S3\Connector;
-
-/**
- * Upload small files (under 1MB) using a file source
- *
- * @package Akeeba\MiniTest\Test
- */
-class SmallFilesOnlyUpload extends SmallFiles
-{
-	public static function setup(Connector $s3, array $options): void
-	{
-		static::$deleteRemote  = false;
-		static::$downloadAfter = false;
-
-		parent::setup($s3, $options);
-	}
-
-
-}
\ No newline at end of file
diff --git a/s3_storage/vendor/akeeba/s3/minitest/Test/SmallInlineFiles.php b/s3_storage/vendor/akeeba/s3/minitest/Test/SmallInlineFiles.php
deleted file mode 100644
index 378f04b1..00000000
--- a/s3_storage/vendor/akeeba/s3/minitest/Test/SmallInlineFiles.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-/**
- * Akeeba Engine
- *
- * @package   akeebaengine
- * @copyright Copyright (c)2006-2024 Nicholas K. Dionysopoulos / Akeeba Ltd
- * @license   GNU General Public License version 3, or later
- */
-
-namespace Akeeba\MiniTest\Test;
-
-use Akeeba\S3\Connector;
-use Akeeba\S3\Input;
-
-/**
- * Upload, download and delete small files (under 1MB) using a string source
- *
- * @package Akeeba\MiniTest\Test
- */
-class SmallInlineFiles extends SmallFiles
-{
-	protected static function upload(Connector $s3, array $options, int $size, string $uri): bool
-	{
-		// Randomize the name. Required for archive buckets where you cannot overwrite data.
-		$dotPos = strrpos($uri, '.');
-		$uri    = substr($uri, 0, $dotPos) . '.' . md5(microtime(false)) . substr($uri, $dotPos);
-
-		// Create some random data to upload
-		$sourceData = static::getRandomData($size);
-
-		// Upload the data. Throws exception if it fails.
-		$bucket = $options['bucket'];
-		$input  = Input::createFromData($sourceData);
-
-		$s3->putObject($input, $bucket, $uri);
-
-		// Tentatively accept that this method succeeded.
-		$result = true;
-
-		// Should I download the file and compare its contents with my random data?
-		if (static::$downloadAfter)
-		{
-			$downloadedData = $s3->getObject($bucket, $uri);
-
-			$result = static::areStringsEqual($sourceData, $downloadedData);
-		}
-
-		// Should I delete the remotely stored file?
-		if (static::$deleteRemote)
-		{
-			// Delete the remote file. Throws exception if it fails.
-			$s3->deleteObject($bucket, $uri);
-		}
-
-		return $result;
-	}
-}
\ No newline at end of file
diff --git a/s3_storage/vendor/akeeba/s3/minitest/Test/SmallInlineFilesNoDelete.php b/s3_storage/vendor/akeeba/s3/minitest/Test/SmallInlineFilesNoDelete.php
deleted file mode 100644
index f17f84d9..00000000
--- a/s3_storage/vendor/akeeba/s3/minitest/Test/SmallInlineFilesNoDelete.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
- * Akeeba Engine
- *
- * @package   akeebaengine
- * @copyright Copyright (c)2006-2024 Nicholas K. Dionysopoulos / Akeeba Ltd
- * @license   GNU General Public License version 3, or later
- */
-
-namespace Akeeba\MiniTest\Test;
-
-
-use Akeeba\S3\Connector;
-
-/**
- * Upload and download small files (under 1MB) using a string source
- *
- * @package Akeeba\MiniTest\Test
- */
-class SmallInlineFilesNoDelete extends SmallInlineFiles
-{
-	public static function setup(Connector $s3, array $options): void
-	{
-		static:: $deleteRemote = false;
-
-		parent::setup($s3, $options);
-	}
-}
\ No newline at end of file
diff --git a/s3_storage/vendor/akeeba/s3/minitest/Test/SmallInlineFilesOnlyUpload.php b/s3_storage/vendor/akeeba/s3/minitest/Test/SmallInlineFilesOnlyUpload.php
deleted file mode 100644
index 3d9202e7..00000000
--- a/s3_storage/vendor/akeeba/s3/minitest/Test/SmallInlineFilesOnlyUpload.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/**
- * Akeeba Engine
- *
- * @package   akeebaengine
- * @copyright Copyright (c)2006-2024 Nicholas K. Dionysopoulos / Akeeba Ltd
- * @license   GNU General Public License version 3, or later
- */
-
-namespace Akeeba\MiniTest\Test;
-
-
-use Akeeba\S3\Connector;
-
-/**
- * Upload small files (under 1MB) using a string source
- *
- * @package Akeeba\MiniTest\Test
- */
-class SmallInlineFilesOnlyUpload extends SmallInlineFiles
-{
-	public static function setup(Connector $s3, array $options): void
-	{
-		static::$deleteRemote  = false;
-		static::$downloadAfter = false;
-
-		parent::setup($s3, $options);
-	}
-
-}
\ No newline at end of file
diff --git a/s3_storage/vendor/akeeba/s3/minitest/Test/SmallInlineXMLFiles.php b/s3_storage/vendor/akeeba/s3/minitest/Test/SmallInlineXMLFiles.php
deleted file mode 100644
index 8c94ff07..00000000
--- a/s3_storage/vendor/akeeba/s3/minitest/Test/SmallInlineXMLFiles.php
+++ /dev/null
@@ -1,131 +0,0 @@
-<?php
-/**
- * Akeeba Engine
- *
- * @package   akeebaengine
- * @copyright Copyright (c)2006-2024 Nicholas K. Dionysopoulos / Akeeba Ltd
- * @license   GNU General Public License version 3, or later
- */
-
-namespace Akeeba\MiniTest\Test;
-
-
-use Akeeba\S3\Connector;
-use Akeeba\S3\Input;
-
-/**
- * Upload, download and delete small XML files (under 1MB) using a string source
- *
- * @package Akeeba\MiniTest\Test
- */
-class SmallInlineXMLFiles extends SmallFiles
-{
-	public static function upload10KbRoot(Connector $s3, array $options): bool
-	{
-		return static::upload($s3, $options, AbstractTest::TEN_KB, 'root_10kb.xml');
-	}
-
-	public static function upload10KbRootGreek(Connector $s3, array $options): bool
-	{
-		return static::upload($s3, $options, AbstractTest::TEN_KB, 'δοκιμή_10kb.xml');
-	}
-
-	public static function upload10KbFolderGreek(Connector $s3, array $options): bool
-	{
-		return static::upload($s3, $options, AbstractTest::TEN_KB, 'ο_φάκελός_μου/δοκιμή_10kb.xml');
-	}
-
-	public static function upload600KbRoot(Connector $s3, array $options): bool
-	{
-		return static::upload($s3, $options, AbstractTest::SIX_HUNDRED_KB, 'root_600kb.xml');
-	}
-
-	public static function upload10KbFolder(Connector $s3, array $options): bool
-	{
-		return static::upload($s3, $options, AbstractTest::TEN_KB, 'my_folder/10kb.xml');
-	}
-
-	public static function upload600KbFolder(Connector $s3, array $options): bool
-	{
-		return static::upload($s3, $options, AbstractTest::SIX_HUNDRED_KB, 'my_folder/600kb.xml');
-	}
-
-	protected static function upload(Connector $s3, array $options, int $size, string $uri): bool
-	{
-		// Randomize the name. Required for archive buckets where you cannot overwrite data.
-		$dotPos = strrpos($uri, '.');
-		$uri    = substr($uri, 0, $dotPos) . '.' . md5(microtime(false)) . substr($uri, $dotPos);
-
-		// Create some random data to upload
-		$sourceData = static::createXMLFile($size);
-
-		// Upload the data. Throws exception if it fails.
-		$bucket = $options['bucket'];
-		$input  = Input::createFromData($sourceData);
-
-		$s3->putObject($input, $bucket, $uri);
-
-		// Tentatively accept that this method succeeded.
-		$result = true;
-
-		// Should I download the file and compare its contents with my random data?
-		if (static::$downloadAfter)
-		{
-			$downloadedData = $s3->getObject($bucket, $uri);
-
-			$result = static::areStringsEqual($sourceData, $downloadedData);
-		}
-
-		// Should I delete the remotely stored file?
-		if (static::$deleteRemote)
-		{
-			// Delete the remote file. Throws exception if it fails.
-			$s3->deleteObject($bucket, $uri);
-		}
-
-		return $result;
-	}
-
-	private static function createXMLFile(int $size): string
-	{
-		$out = <<< XML
-<?xml version="1.0" encoding="utf-8" ?>
-<root>
-XML;
-
-		$chunks = floor(($size - 55) / 1024);
-
-		for ($i = 1; $i <= $chunks; $i++)
-		{
-			$randomBlock = static::genRandomData(1024 - 63);
-			$out .= <<< XML
-		<element>
-			<id>$i</id>
-			<data><![CDATA[$randomBlock]]></data>
-		</element>
-XML;
-
-		}
-
-
-		$out .= <<< XML
-</root>
-XML;
-
-		return $out;
-	}
-
-	private static function genRandomData(int $length): string
-	{
-		$chars     = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ01234567890';
-		$maxLength = strlen($chars) - 1;
-		$salt      = '';
-
-		for ($i = 0; $i < $length; $i++)
-		{
-			$salt .= substr($chars, random_int(0, $maxLength), 1);
-		}
-
-		return $salt;
-	}
-}
\ No newline at end of file
diff --git a/s3_storage/vendor/akeeba/s3/minitest/Test/StorageClasses.php b/s3_storage/vendor/akeeba/s3/minitest/Test/StorageClasses.php
deleted file mode 100644
index a6144c4b..00000000
--- a/s3_storage/vendor/akeeba/s3/minitest/Test/StorageClasses.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-/**
- * Akeeba Engine
- *
- * @package   akeebaengine
- * @copyright Copyright (c)2006-2024 Nicholas K. Dionysopoulos / Akeeba Ltd
- * @license   GNU General Public License version 3, or later
- */
-
-namespace Akeeba\MiniTest\Test;
-
-
-use Akeeba\S3\Acl;
-use Akeeba\S3\Connector;
-use Akeeba\S3\Input;
-use Akeeba\S3\StorageClass;
-
-class StorageClasses extends AbstractTest
-{
-	protected static $downloadAfter = true;
-
-	protected static $deleteRemote = true;
-
-	public static function uploadRRS(Connector $s3, array $options): bool
-	{
-		return static::upload($s3, $options, static::TEN_KB, 'rrs_test_10kb.dat', StorageClass::REDUCED_REDUNDANCY);
-	}
-
-	public static function uploadIntelligentTiering(Connector $s3, array $options): bool
-	{
-		return static::upload($s3, $options, static::TEN_KB, 'rrs_test_10kb.dat', StorageClass::INTELLIGENT_TIERING);
-	}
-
-	protected static function upload(Connector $s3, array $options, int $size, string $uri, string $storageClass = null)
-	{
-		// Randomize the name. Required for archive buckets where you cannot overwrite data.
-		$dotPos = strrpos($uri, '.');
-		$uri    = substr($uri, 0, $dotPos) . '.' . md5(microtime(false)) . substr($uri, $dotPos);
-
-		// Create some random data to upload
-		$sourceData = static::getRandomData($size);
-
-		// Upload the data. Throws exception if it fails.
-		$bucket = $options['bucket'];
-		$input  = Input::createFromData($sourceData);
-
-		// Get the headers
-		$headers = [];
-		StorageClass::setStorageClass($headers, $storageClass);
-
-		$s3->putObject($input, $bucket, $uri, Acl::ACL_PRIVATE, $headers);
-
-		// Tentatively accept that this method succeeded.
-		$result = true;
-
-		// Should I download the file and compare its contents with my random data?
-		if (static::$downloadAfter)
-		{
-			$downloadedData = $s3->getObject($bucket, $uri);
-
-			$result = static::areStringsEqual($sourceData, $downloadedData);
-		}
-
-		// Should I delete the remotely stored file?
-		if (static::$deleteRemote)
-		{
-			// Delete the remote file. Throws exception if it fails.
-			$s3->deleteObject($bucket, $uri);
-		}
-
-		return $result;
-	}
-
-}
\ No newline at end of file
diff --git a/s3_storage/vendor/akeeba/s3/minitest/config.dist.php b/s3_storage/vendor/akeeba/s3/minitest/config.dist.php
deleted file mode 100644
index f67e521e..00000000
--- a/s3_storage/vendor/akeeba/s3/minitest/config.dist.php
+++ /dev/null
@@ -1,303 +0,0 @@
-<?php
-/**
- * Akeeba Engine
- *
- * @package   akeebaengine
- * @copyright Copyright (c)2006-2024 Nicholas K. Dionysopoulos / Akeeba Ltd
- * @license   GNU General Public License version 3, or later
- */
-
-// Create the 2100 test files in the bucket?
-define('CREATE_2100_FILES', true);
-
-/**
- * Configure the connection options for S3 and S3-compatible services here. Use them in the $testConfigurations array.
- */
-$serviceConfigurations = [
-	's3-v4'         => [
-		'access'      => 'AK0123456789BCDEFGHI',
-		'secret'      => 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX',
-		'region'      => 'eu-west-1',
-		'bucket'      => 'mybucket',
-		'signature'   => 'v4',
-		'dualstack'   => false,
-		'path_access' => false,
-		'ssl'         => false,
-		'endpoint'    => null,
-	],
-	's3-v2'         => [
-		'access'      => 'AK0123456789BCDEFGHI',
-		'secret'      => 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX',
-		'region'      => 'eu-west-1',
-		'bucket'      => 'mybucket',
-		'signature'   => 'v2',
-		'dualstack'   => false,
-		'path_access' => false,
-		'ssl'         => false,
-		'endpoint'    => null,
-	],
-	'localstack-v4' => [
-		'access'      => 'KYLOREN',
-		'secret'      => 'BenSolo',
-		'region'      => 'us-east-1',
-		'bucket'      => 'test',
-		'signature'   => 'v4',
-		'dualstack'   => false,
-		'path_access' => true,
-		'ssl'         => false,
-		'endpoint'    => 'localhost.localstack.cloud:4566',
-	],
-	'localstack-v2' => [
-		'access'      => 'KYLOREN',
-		'secret'      => 'BenSolo',
-		'region'      => 'us-east-1',
-		'bucket'      => 'test',
-		'signature'   => 'v2',
-		'dualstack'   => false,
-		'path_access' => true,
-		'ssl'         => false,
-		'endpoint'    => 'localhost.localstack.cloud:4566',
-	],
-];
-
-/**
- * Test EVERYTHING.
- */
-$allTheTests = [
-	'BucketsList',
-	'BucketLocation',
-	'HeadObject',
-	'ListFiles',
-	'SmallFiles',
-	'SmallInlineFiles',
-	'SmallFilesNoDelete',
-	'SmallFilesOnlyUpload',
-	'SmallInlineFilesNoDelete',
-	'SmallInlineFilesOnlyUpload',
-	'SmallInlineXMLFiles',
-	'BigFiles',
-	'Multipart',
-	'StorageClasses',
-	'SignedURLs',
-];
-
-if (CREATE_2100_FILES)
-{
-	$allTheTests[] = 'ListThousandsOfFiles';
-}
-
-/**
- * Tests for standard key pairs allowing us to read, write and delete
- *
- * This is the main test suite
- */
-$standardTests = [
-	'BucketsList',
-	'BucketLocation',
-	'HeadObject',
-	'ListFiles',
-	'SmallFiles',
-	'SmallInlineFiles',
-	'SmallInlineXMLFiles',
-	'BigFiles',
-	'Multipart',
-	'StorageClasses',
-	'SignedURLs',
-];
-
-/**
- * Tests for key pairs or buckets which do NOT allow us to delete, but DO allow us to write and read data
- *
- * Example: archival buckets
- */
-$noDeleteTests = [
-	'SmallFilesNoDelete',
-	'SmallInlineFilesNoDelete',
-];
-
-/**
- * Tests for key pairs which do NOT allow us to read, but DO allow us to write/delete
- *
- * Example: write-only key pairs per my documentation information from 2011 :)
- */
-$writeOnlyTests = [
-	'SmallFilesOnlyUpload',
-	'SmallInlineFilesOnlyUpload',
-];
-
-/**
- * These are the individual test configurations.
- *
- * Each configuration consists of two keys:
- *
- * * **configuration**  Overrides to the default configuration.
- * * **tests**          The names of the test classes to execute. Use the format ['classname', 'method'] to execute
- *                      specific test methods only.
- */
-$testConfigurations = [
-// Format of each
-//	'Description of this configuration' => array(
-//		'configuration' => array(
-//			// You can skip one or more keys. The defaults will be used.
-//			'access' => 'a different access key',
-//			'secret' => 'a different secret key',
-//			'region' => 'eu-west-1',
-//			'bucket' => 'different_example',
-//			'signature' => 'v2',
-//			'dualstack' => true,
-//			'path_access' => true,
-//			'ssl' => true,
-//          // Only if you want to use a custom, non-Amazon endpoint
-//          'endpoint' => null,
-//		),
-//		'tests' => array(
-//          // Use a start to run all tests
-//			'*',
-//          // Alternatively you can define single test classes:
-//			'SmallFiles',
-//          // ..or specific tests:
-//			array('SmallFiles', 'upload10KbRoot'),
-//		)
-//	),
-	/**/
-
-	/**
-	 * These are the standard tests we run for each region and key pair.
-	 *
-	 * For all available regions please consult https://docs.aws.amazon.com/general/latest/gr/s3.html
-	 *
-	 * It is recommended to run against the following regions:
-	 * - eu-east-1     The original Amazon S3 region, it often has special meaning in APIs.
-	 * - eu-west-1     Ireland. The original EU region for S3, as a test for the non-default region.
-	 * - eu-central-1  Frankfurt. This region –like all newer regions– only allows v4 signatures!
-	 * - cn-north-1    Beijing, China. Requires running it from inside China.
-	 * - NON-AMAZON    A custom endpoint for a third party, S3-compatible API. Ideally one for v2 and one for v4.
-	 *
-	 * Further to that test the following:
-	 * - Write-only, bucket-restricted keys
-	 * - Read/write, bucket-restricted keys
-	 * - Buckets with dots
-	 * - Buckets with uppercase letters
-	 * - Buckets with international letters
-	 * - Access from within EC2
-	 */
-
-	// Amazon S3, v2 signatures
-	'S3, v2, subdomain, single stack'  => [
-		'configuration' => array_merge(
-			$serviceConfigurations['s3-v2'],
-			[
-				'dualstack'   => false,
-				'path_access' => false,
-			]
-		),
-		'tests'         => $standardTests,
-		'skip'          => false,
-	],
-	'S3, v2, subdomain, dual stack'    => [
-		'configuration' => array_merge(
-			$serviceConfigurations['s3-v2'],
-			[
-				'dualstack'   => true,
-				'path_access' => false,
-			]
-		),
-		'tests'         => $standardTests,
-		'skip'          => false,
-	],
-	'S3, v2, path, single stack'  => [
-		'configuration' => array_merge(
-			$serviceConfigurations['s3-v2'],
-			[
-				'dualstack'   => false,
-				'path_access' => true,
-			]
-		),
-		'tests'         => $standardTests,
-		'skip'          => false,
-	],
-	'S3, v2, path, dual stack'    => [
-		'configuration' => array_merge(
-			$serviceConfigurations['s3-v2'],
-			[
-				'dualstack'   => true,
-				'path_access' => true,
-			]
-		),
-		'tests'         => $standardTests,
-		'skip'          => false,
-	],
-
-	// Amazon S3, v4 signatures
-	'S3, v4, subdomain, single stack'  => [
-		'configuration' => array_merge(
-			$serviceConfigurations['s3-v4'],
-			[
-				'dualstack'   => false,
-				'path_access' => false,
-			]
-		),
-		'tests'         => $standardTests,
-		'skip'          => false,
-	],
-	'S3, v4, subdomain, dual stack'    => [
-		'configuration' => array_merge(
-			$serviceConfigurations['s3-v4'],
-			[
-				'dualstack'   => true,
-				'path_access' => false,
-			]
-		),
-		'tests'         => $standardTests,
-		'skip'          => false,
-	],
-	'S3, v4, path, single stack'  => [
-		'configuration' => array_merge(
-			$serviceConfigurations['s3-v4'],
-			[
-				'dualstack'   => false,
-				'path_access' => true,
-			]
-		),
-		'tests'         => $standardTests,
-		'skip'          => false,
-	],
-	'S3, v4, path, dual stack'    => [
-		'configuration' => array_merge(
-			$serviceConfigurations['s3-v4'],
-			[
-				'dualstack'   => true,
-				'path_access' => true,
-			]
-		),
-		'tests'         => $standardTests,
-		'skip'          => false,
-	],
-
-	// LocalStack
-	'LocalStack, V2 (always path access, single stack)' => [
-		'configuration' => $serviceConfigurations['localstack-v2'],
-		'tests'         => $allTheTests,
-		'skip'          => false,
-	],
-
-	'LocalStack, V4 (always path access, single stack)' => [
-		'configuration' => $serviceConfigurations['localstack-v4'],
-		'tests'         => $allTheTests,
-		'skip'          => false,
-	],
-
-	/**
-	 * In the real config file we also have tests running on:
-	 *
-	 * - Wasabi, v2, path-style access.
-	 * - Wasabi, v4, path-style access.
-	 * - Synology C2, subdomain access.
-	 *
-	 * See [[NOTES.md]] for more information. If you have another environment you think we should test with please
-	 * update NOTES.md and make a pull request, along with the reasoning behind it.
-	 *
-	 * There are known failures for some cases, notably LocalStack v4 (something is amiss?) and C2 (necessary flag is
-	 * not yet supported by the minitest framework).
-	 */
-];
\ No newline at end of file
diff --git a/s3_storage/vendor/akeeba/s3/minitest/minitest.php b/s3_storage/vendor/akeeba/s3/minitest/minitest.php
deleted file mode 100644
index 0d986804..00000000
--- a/s3_storage/vendor/akeeba/s3/minitest/minitest.php
+++ /dev/null
@@ -1,441 +0,0 @@
-<?php
-/**
- * Akeeba Engine
- *
- * @package   akeebaengine
- * @copyright Copyright (c)2006-2024 Nicholas K. Dionysopoulos / Akeeba Ltd
- * @license   GNU General Public License version 3, or later
- */
-
-use Akeeba\S3\Configuration;
-use Akeeba\S3\Connector;
-
-/**
- * The Miniature Test Framework For The Akeeba S3 Library
- *
- * This is a self-contained test-suite runner. Running minitest.php will execute all the tests against all
- * configurations set up in the config.php file. When it's decked out with all real world examples this can take many
- * hours to complete (it's not as "mini" as its name would like you to believe).
- *
- * Please read NOTES.md before proceeding and do keep in mind that some tests may fail for reasons outside the control
- * of the library such as network conditions, whether PHP has a configured Certification Authority cache etc.
- *
- * As to why we didn't use Unit Tests: Elementary, dear Watson. Unit Tests are great when testing your code against a
- * specification. In this case, the specification would be the Amazon S3 API documentation. Sounds great in theory, but
- * not even Amazon itself works according to its own documentation, let alone the third party "S3-compatible" services
- * which each one implements its own interpretation of that documentation. Therefore, slow-as-heck integration testing
- * is the only way to do any kind of meaningful testing.
- */
-
-// Necessary for including the library
-define('AKEEBAENGINE', 1);
-
-if (!file_exists(__DIR__ . '/../vendor/autoload.php'))
-{
-	die ('Please run composer install before running the mini test suite.');
-}
-
-// Use Composer's autoloader to load the library
-/** @var \Composer\Autoload\ClassLoader $autoloader */
-$autoloader = require_once(__DIR__ . '/../vendor/autoload.php');
-
-// Add the minitest PSR-4 path map to Composer's autoloader
-$autoloader->addPsr4('Akeeba\\MiniTest\\', __DIR__);
-
-function getAllTestClasses(): array
-{
-	static $testClasses = [];
-
-	if (!empty($testClasses))
-	{
-		return $testClasses;
-	}
-
-	$folder = __DIR__ . '/Test';
-	$di     = new DirectoryIterator($folder);
-
-	foreach ($di as $entry)
-	{
-		if ($entry->isDot() || !$entry->isFile())
-		{
-			continue;
-		}
-
-		$baseName  = $entry->getBasename('.php');
-		$className = '\\Akeeba\\MiniTest\\Test\\' . $baseName;
-
-		if (!class_exists($className))
-		{
-			continue;
-		}
-
-		$reflectedClass = new ReflectionClass($className);
-
-		if ($reflectedClass->isAbstract())
-		{
-			continue;
-		}
-
-		$testClasses[] = $className;
-	}
-
-	return $testClasses;
-}
-
-function getTestMethods(string $className): array
-{
-	static $classMethodMap = [];
-
-	if (isset($classMethodMap[$className]))
-	{
-		return $classMethodMap[$className];
-	}
-
-	$classMethodMap[$className] = [];
-
-	if (!class_exists($className))
-	{
-		return $classMethodMap[$className];
-	}
-
-	$reflectedClass = new ReflectionClass($className);
-	$methods        = $reflectedClass->getMethods(ReflectionMethod::IS_PUBLIC | ReflectionMethod::IS_STATIC);
-
-	$classMethodMap[$className] = array_map(function (ReflectionMethod $refMethod) {
-		if ($refMethod->isPrivate() || $refMethod->isProtected() || $refMethod->isAbstract())
-		{
-			return null;
-		}
-
-		if (!$refMethod->isStatic())
-		{
-			return null;
-		}
-
-		return $refMethod->getName();
-	}, $methods);
-
-	$classMethodMap[$className] = array_filter($classMethodMap[$className], function ($method) {
-		if (is_null($method))
-		{
-			return false;
-		}
-
-		if (in_array($method, ['setup', 'teardown']))
-		{
-			return false;
-		}
-
-		return true;
-	});
-
-	return $classMethodMap[$className];
-}
-
-function simplifyClassName(?string $className): string
-{
-	if (empty($className))
-	{
-		return '';
-	}
-
-	$namespace = __NAMESPACE__ . '\\Test\\';
-
-	if (strpos($className, $namespace) === 0)
-	{
-		return substr($className, strlen($namespace));
-	}
-
-	return $className;
-}
-
-if (!file_exists(__DIR__ . '/config.php'))
-{
-	die ('Please rename config.dist.php to config.php and customise it before running the mini test suite.');
-}
-
-require __DIR__ . '/config.php';
-
-global $testConfigurations;
-
-$total      = 0;
-$broken     = 0;
-$failed     = 0;
-$successful = 0;
-
-foreach ($testConfigurations as $description => $setup)
-{
-	echo "▶ " . $description . PHP_EOL;
-	echo str_repeat('〰', 80) . PHP_EOL . PHP_EOL;
-
-	if ($setup['skip'] ?? false)
-	{
-		echo "\t🤡 Skipping\n\n";
-
-		continue;
-	}
-
-	// Extract the configuration options
-	if (!isset($setup['configuration']))
-	{
-		$setup['configuration'] = [];
-	}
-
-	$configOptions = array_merge([
-		'access'      => defined('DEFAULT_ACCESS_KEY') ? DEFAULT_ACCESS_KEY : null,
-		'secret'      => defined('DEFAULT_SECRET_KEY') ? DEFAULT_SECRET_KEY : null,
-		'region'      => defined('DEFAULT_REGION') ? DEFAULT_REGION : null,
-		'bucket'      => defined('DEFAULT_BUCKET') ? DEFAULT_BUCKET : null,
-		'signature'   => defined('DEFAULT_SIGNATURE') ? DEFAULT_SIGNATURE : null,
-		'dualstack'   => defined('DEFAULT_DUALSTACK') ? DEFAULT_DUALSTACK : null,
-		'path_access' => defined('DEFAULT_PATH_ACCESS') ? DEFAULT_PATH_ACCESS : null,
-		'ssl'         => defined('DEFAULT_SSL') ? DEFAULT_SSL : null,
-		'endpoint'    => defined('DEFAULT_ENDPOINT') ? constant('DEFAULT_ENDPOINT') : null,
-	], $setup['configuration']);
-
-	// Extract the test classes/methods to run
-	if (!isset($setup['tests']))
-	{
-		$setup['tests'] = getAllTestClasses();
-	}
-
-	$tests = $setup['tests'];
-
-	if (!is_array($tests) || (is_array($tests) && in_array('*', $tests)))
-	{
-		$tests = getAllTestClasses();
-	}
-
-	// Create the S3 configuration object
-	$s3Configuration = new Configuration($configOptions['access'], $configOptions['secret'], $configOptions['signature'], $configOptions['region']);
-	$s3Configuration->setRegion($configOptions['region']);
-	$s3Configuration->setSignatureMethod($configOptions['signature']);
-
-	if (!is_null($configOptions['endpoint']))
-	{
-		$s3Configuration->setEndpoint($configOptions['endpoint']);
-		// We need to redo this because setting the endpoint may reset these options
-		$s3Configuration->setRegion($configOptions['region']);
-		$s3Configuration->setSignatureMethod($configOptions['signature']);
-	}
-
-	$s3Configuration->setUseDualstackUrl($configOptions['dualstack']);
-	$s3Configuration->setUseLegacyPathStyle($configOptions['path_access']);
-	$s3Configuration->setSSL($configOptions['ssl']);
-
-	// Feature flags
-	if (isset($configOptions['alternateDateHeaderFormat']))
-	{
-		$s3Configuration->setAlternateDateHeaderFormat((bool) $configOptions['alternateDateHeaderFormat']);
-	}
-
-	if (isset($configOptions['useHTTPDateHeader']))
-	{
-		$s3Configuration->setUseHTTPDateHeader((bool) $configOptions['useHTTPDateHeader']);
-	}
-
-	if (isset($configOptions['preSignedBucketInURL']))
-	{
-		$s3Configuration->setPreSignedBucketInURL((bool) $configOptions['preSignedBucketInURL']);
-	}
-
-	// Create the connector object
-	$s3Connector = new Connector($s3Configuration);
-
-	// Run the tests
-	foreach ($tests as $testInfo)
-	{
-		if (!is_array($testInfo))
-		{
-			$className = $testInfo;
-
-			if (!class_exists($className))
-			{
-				$className = '\\Akeeba\\MiniTest\\Test\\' . $className;
-			}
-
-			if (!class_exists($className))
-			{
-				$total++;
-				$broken++;
-				echo "  ⁉️ Test class {$className} not found." . PHP_EOL;
-
-				continue;
-			}
-
-			$testInfo = array_map(function ($method) use ($className) {
-				return [$className, $method];
-			}, getTestMethods($className));
-		}
-		else
-		{
-			[$className, $method] = $testInfo;
-
-			if (!class_exists($className))
-			{
-				$className = '\\Akeeba\\MiniTest\\Test\\' . $className;
-			}
-
-			if (!class_exists($className))
-			{
-				$total++;
-				$broken++;
-				echo "  ⁉️ Test class {$className} not found." . PHP_EOL;
-
-				continue;
-			}
-
-			$testInfo = [
-				[$className, $method],
-			];
-		}
-
-		$firstOne            = false;
-		$className           = null;
-		$callableSetup       = null;
-		$callableTeardown    = null;
-		$simplifiedClassname = simplifyClassName($className);
-
-		if (!empty($testInfo))
-		{
-			$firstOne = array_shift($testInfo);
-			array_unshift($testInfo, $firstOne);
-		}
-
-		if ($firstOne)
-		{
-			[$className,] = $firstOne;
-
-			if ($className)
-			{
-				$callableSetup    = [$className, 'setup'];
-				$callableTeardown = [$className, 'teardown'];
-			}
-		}
-
-		if (is_callable($callableSetup))
-		{
-			[$classNameSetup, $method] = $callableSetup;
-			$simplifiedClassname = simplifyClassName($classNameSetup);
-			echo "  ⏱ Preparing {$simplifiedClassname}:{$method}…";
-			call_user_func($callableSetup, $s3Connector, $configOptions);
-			echo "\r     Prepared {$simplifiedClassname}   " . PHP_EOL;
-		}
-
-		foreach ($testInfo as $callable)
-		{
-			$total++;
-			[$className, $method] = $callable;
-
-			if (!class_exists($className))
-			{
-				$broken++;
-				echo "  ⁉️ Test class {$className} not found." . PHP_EOL;
-
-				continue;
-			}
-
-			if (!method_exists($className, $method))
-			{
-				$broken++;
-				echo "  ⁉️ Method {$method} not found in test class {$className}." . PHP_EOL;
-
-				continue;
-			}
-
-			echo "  ⏱ {$simplifiedClassname}:{$method}…";
-			$errorException = null;
-
-			try
-			{
-				$result = call_user_func([$className, $method], $s3Connector, $configOptions);
-			}
-			catch (Exception $e)
-			{
-				$result         = false;
-				$errorException = $e;
-			}
-
-			echo "\r  " . ($result ? '✔' : '🚨') . " {$simplifiedClassname}:{$method}  " . PHP_EOL;
-
-			if ($result)
-			{
-				$successful++;
-				continue;
-			}
-
-			$failed++;
-
-			if (is_null($errorException))
-			{
-				echo "    Returned false" . PHP_EOL;
-
-				continue;
-			}
-
-			echo "    {$errorException->getCode()} – {$errorException->getMessage()}" . PHP_EOL;
-			echo "    {$errorException->getFile()}({$errorException->getLine()})" . PHP_EOL . PHP_EOL;
-
-			$errorLines = explode("\n", $errorException->getTraceAsString());
-
-			foreach ($errorLines as $line)
-			{
-				echo "    $line" . PHP_EOL;
-			}
-		}
-
-		if (is_callable($callableTeardown))
-		{
-			[$className, $method] = $callableSetup;
-			echo "  ⏱ Tearing down {$className}:{$method}…";
-			call_user_func($callableTeardown, $s3Connector, $configOptions);
-			echo "\r     Tore down {$className}   " . PHP_EOL;
-		}
-	}
-
-	echo PHP_EOL;
-}
-
-echo PHP_EOL;
-echo str_repeat('⎺', 80) . PHP_EOL;
-echo PHP_EOL;
-
-echo "Summary:" . PHP_EOL;
-if ($broken)
-{
-	echo "  Broken     : $broken" . PHP_EOL;
-}
-if ($failed)
-{
-	echo "  Failed     : $failed" . PHP_EOL;
-}
-if ($successful)
-{
-	echo "  Successful : $successful" . PHP_EOL;
-}
-echo "  Total      : $total" . PHP_EOL . PHP_EOL;
-
-echo "Conclusion: " . PHP_EOL . "  ";
-
-if ($failed > 0)
-{
-	echo "❌ FAILED 😭😭😭" . PHP_EOL;
-
-	exit(1);
-}
-
-if ($successful === 0)
-{
-	echo "🔥 No tests executed! 🤪" . PHP_EOL;
-
-	exit (3);
-}
-
-if ($broken > 0)
-{
-	echo "⁉️ SUCCESS but some tests are broken 🤦" . PHP_EOL;
-
-	exit (2);
-}
-
-echo "✅ PASSED" . PHP_EOL;
\ No newline at end of file
diff --git a/s3_storage/vendor/akeeba/s3/src/Acl.php b/s3_storage/vendor/akeeba/s3/src/Acl.php
deleted file mode 100644
index 178932a6..00000000
--- a/s3_storage/vendor/akeeba/s3/src/Acl.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-/**
- * Akeeba Engine
- *
- * @package   akeebaengine
- * @copyright Copyright (c)2006-2024 Nicholas K. Dionysopoulos / Akeeba Ltd
- * @license   GNU General Public License version 3, or later
- */
-
-namespace Akeeba\S3;
-
-// Protection against direct access
-defined('AKEEBAENGINE') || die();
-
-/**
- * Shortcuts to often used access control privileges
- */
-class Acl
-{
-	public const ACL_PRIVATE = 'private';
-
-	public const ACL_PUBLIC_READ = 'public-read';
-
-	public const ACL_PUBLIC_READ_WRITE = 'public-read-write';
-
-	public const ACL_AUTHENTICATED_READ = 'authenticated-read';
-
-	public const ACL_BUCKET_OWNER_READ = 'bucket-owner-read';
-
-	public const ACL_BUCKET_OWNER_FULL_CONTROL = 'bucket-owner-full-control';
-}
diff --git a/s3_storage/vendor/akeeba/s3/src/Configuration.php b/s3_storage/vendor/akeeba/s3/src/Configuration.php
deleted file mode 100644
index 9128ae50..00000000
--- a/s3_storage/vendor/akeeba/s3/src/Configuration.php
+++ /dev/null
@@ -1,447 +0,0 @@
-<?php
-/**
- * Akeeba Engine
- *
- * @package   akeebaengine
- * @copyright Copyright (c)2006-2024 Nicholas K. Dionysopoulos / Akeeba Ltd
- * @license   GNU General Public License version 3, or later
- */
-
-namespace Akeeba\S3;
-
-// Protection against direct access
-defined('AKEEBAENGINE') || die();
-
-/**
- * Holds the Amazon S3 confiugration credentials
- */
-class Configuration
-{
-	/**
-	 * Access Key
-	 *
-	 * @var  string
-	 */
-	protected $access = '';
-
-	/**
-	 * Secret Key
-	 *
-	 * @var  string
-	 */
-	protected $secret = '';
-
-	/**
-	 * Security token. This is only required with temporary credentials provisioned by an EC2 instance.
-	 *
-	 * @var  string
-	 */
-	protected $token = '';
-
-	/**
-	 * Signature calculation method ('v2' or 'v4')
-	 *
-	 * @var  string
-	 */
-	protected $signatureMethod = 'v2';
-
-	/**
-	 * AWS region, used for v4 signatures
-	 *
-	 * @var  string
-	 */
-	protected $region = 'us-east-1';
-
-	/**
-	 * Should I use SSL (HTTPS) to communicate to Amazon S3?
-	 *
-	 * @var  bool
-	 */
-	protected $useSSL = true;
-
-	/**
-	 * Should I use SSL (HTTPS) to communicate to Amazon S3?
-	 *
-	 * @var  bool
-	 */
-	protected $useDualstackUrl = false;
-
-	/**
-	 * Should I use legacy, path-style access to the bucket? When it's turned off (default) we use virtual hosting style
-	 * paths which are RECOMMENDED BY AMAZON per http://docs.aws.amazon.com/AmazonS3/latest/API/APIRest.html
-	 *
-	 * @var  bool
-	 */
-	protected $useLegacyPathStyle = false;
-
-	/**
-	 * Amazon S3 endpoint. You can use a custom endpoint with v2 signatures to access third party services which offer
-	 * S3 compatibility, e.g. OwnCloud, Google Storage etc.
-	 *
-	 * @var  string
-	 */
-	protected $endpoint = 's3.amazonaws.com';
-
-	/**
-	 * Should I use an alternative date header format (D, d M Y H:i:s T instead of D, d M Y H:i:s O) for non-Amazon,
-	 * S3-compatible services?
-	 *
-	 * This is enabled by default.
-	 *
-	 * @var  bool
-	 */
-	protected $alternateDateHeaderFormat = true;
-
-	/**
-	 * Should I use the standard HTTP Date header instead of the X-Amz-Date header?
-	 *
-	 * @var  bool
-	 */
-	protected $useHTTPDateHeader = false;
-
-	/**
-	 * Should pre-signed URLs include the bucket name in the URL? Only applies to v4 signatures.
-	 *
-	 * Amazon S3 and most implementations need this turned off (default). LocalStack seems to not work properly with the
-	 * bucket name as a subdomain, hence the need for this flag.
-	 *
-	 * @var  bool
-	 */
-	protected $preSignedBucketInURL = false;
-
-	/**
-	 * Public constructor
-	 *
-	 * @param   string  $access           Amazon S3 Access Key
-	 * @param   string  $secret           Amazon S3 Secret Key
-	 * @param   string  $signatureMethod  Signature method (v2 or v4)
-	 * @param   string  $region           Region, only required for v4 signatures
-	 */
-	function __construct(string $access, string $secret, string $signatureMethod = 'v2', string $region = '')
-	{
-		$this->setAccess($access);
-		$this->setSecret($secret);
-		$this->setSignatureMethod($signatureMethod);
-		$this->setRegion($region);
-	}
-
-	/**
-	 * Get the Amazon access key
-	 *
-	 * @return  string
-	 */
-	public function getAccess(): string
-	{
-		return $this->access;
-	}
-
-	/**
-	 * Set the Amazon access key
-	 *
-	 * @param   string  $access  The access key to set
-	 *
-	 * @throws  Exception\InvalidAccessKey
-	 */
-	public function setAccess(string $access): void
-	{
-		if (empty($access))
-		{
-			throw new Exception\InvalidAccessKey;
-		}
-
-		$this->access = $access;
-	}
-
-	/**
-	 * Get the Amazon secret key
-	 *
-	 * @return string
-	 */
-	public function getSecret(): string
-	{
-		return $this->secret;
-	}
-
-	/**
-	 * Set the Amazon secret key
-	 *
-	 * @param   string  $secret  The secret key to set
-	 *
-	 * @throws  Exception\InvalidSecretKey
-	 */
-	public function setSecret(string $secret): void
-	{
-		if (empty($secret))
-		{
-			throw new Exception\InvalidSecretKey;
-		}
-
-		$this->secret = $secret;
-	}
-
-	/**
-	 * Return the security token. Only for temporary credentials provisioned through an EC2 instance.
-	 *
-	 * @return  string
-	 */
-	public function getToken(): string
-	{
-		return $this->token;
-	}
-
-	/**
-	 * Set the security token. Only for temporary credentials provisioned through an EC2 instance.
-	 *
-	 * @param   string  $token
-	 */
-	public function setToken(string $token): void
-	{
-		$this->token = $token;
-	}
-
-	/**
-	 * Get the signature method to use
-	 *
-	 * @return  string
-	 */
-	public function getSignatureMethod(): string
-	{
-		return $this->signatureMethod;
-	}
-
-	/**
-	 * Set the signature method to use
-	 *
-	 * @param   string  $signatureMethod  One of v2 or v4
-	 *
-	 * @throws  Exception\InvalidSignatureMethod
-	 */
-	public function setSignatureMethod(string $signatureMethod): void
-	{
-		$signatureMethod = strtolower($signatureMethod);
-		$signatureMethod = trim($signatureMethod);
-
-		if (!in_array($signatureMethod, ['v2', 'v4']))
-		{
-			throw new Exception\InvalidSignatureMethod;
-		}
-
-		$this->signatureMethod = $signatureMethod;
-
-		// If you switch to v2 signatures we unset the region.
-		if ($signatureMethod == 'v2')
-		{
-			$this->setRegion('');
-
-			/**
-			 * If we are using Amazon S3 proper (not a custom endpoint) we have to set path style access to false.
-			 * Amazon S3 does not support v2 signatures with path style access at all (it returns an error telling
-			 * us to use the virtual hosting endpoint BUCKETNAME.s3.amazonaws.com).
-			 */
-			if (strpos($this->endpoint, 'amazonaws.com') !== false)
-			{
-				$this->setUseLegacyPathStyle(false);
-			}
-
-		}
-	}
-
-	/**
-	 * Get the Amazon S3 region
-	 *
-	 * @return  string
-	 */
-	public function getRegion(): string
-	{
-		return $this->region;
-	}
-
-	/**
-	 * Set the Amazon S3 region
-	 *
-	 * @param   string  $region
-	 */
-	public function setRegion(string $region): void
-	{
-		/**
-		 * You can only leave the region empty if you're using v2 signatures. Anything else gets you an exception.
-		 */
-		if (empty($region) && ($this->signatureMethod == 'v4'))
-		{
-			throw new Exception\InvalidRegion;
-		}
-
-		/**
-		 * Setting a Chinese-looking region force-changes the endpoint but ONLY if you were using the original Amazon S3
-		 * endpoint. If you're using a custom endpoint and provide a region with 'cn-' in its name we don't override
-		 * your custom endpoint.
-		 */
-		if (($this->endpoint == 's3.amazonaws.com') && (substr($region, 0, 3) == 'cn-'))
-		{
-			$this->setEndpoint('amazonaws.com.cn');
-		}
-
-		$this->region = $region;
-	}
-
-	/**
-	 * Is the connection to be made over HTTPS?
-	 *
-	 * @return  bool
-	 */
-	public function isSSL(): bool
-	{
-		return $this->useSSL;
-	}
-
-	/**
-	 * Set the connection SSL preference
-	 *
-	 * @param   bool  $useSSL  True to use HTTPS
-	 */
-	public function setSSL(bool $useSSL): void
-	{
-		$this->useSSL = $useSSL ? true : false;
-	}
-
-	/**
-	 * Get the Amazon S3 endpoint
-	 *
-	 * @return  string
-	 */
-	public function getEndpoint(): string
-	{
-		return $this->endpoint;
-	}
-
-	/**
-	 * Set the Amazon S3 endpoint. Do NOT use a protocol
-	 *
-	 * @param   string  $endpoint  Custom endpoint, e.g. 's3.example.com' or 'www.example.com/s3api'
-	 */
-	public function setEndpoint(string $endpoint): void
-	{
-		if (stristr($endpoint, '://'))
-		{
-			throw new Exception\InvalidEndpoint;
-		}
-
-		/**
-		 * If you set a custom endpoint we have to switch to v2 signatures since our v4 implementation only supports
-		 * Amazon endpoints.
-		 */
-		if ((strpos($endpoint, 'amazonaws.com') === false))
-		{
-			$this->setSignatureMethod('v2');
-		}
-
-		$this->endpoint = $endpoint;
-	}
-
-	/**
-	 * Should I use legacy, path-style access to the bucket? You should only use it with custom endpoints. Amazon itself
-	 * is currently deprecating support for path-style access but has extended the migration date to an unknown
-	 * time https://aws.amazon.com/blogs/aws/amazon-s3-path-deprecation-plan-the-rest-of-the-story/
-	 *
-	 * @return  bool
-	 */
-	public function getUseLegacyPathStyle(): bool
-	{
-		return $this->useLegacyPathStyle;
-	}
-
-	/**
-	 * Set the flag for using legacy, path-style access to the bucket
-	 *
-	 * @param   bool  $useLegacyPathStyle
-	 */
-	public function setUseLegacyPathStyle(bool $useLegacyPathStyle): void
-	{
-		$this->useLegacyPathStyle = $useLegacyPathStyle;
-
-		/**
-		 * If we are using Amazon S3 proper (not a custom endpoint) we have to set path style access to false.
-		 * Amazon S3 does not support v2 signatures with path style access at all (it returns an error telling
-		 * us to use the virtual hosting endpoint BUCKETNAME.s3.amazonaws.com).
-		 */
-		if ((strpos($this->endpoint, 'amazonaws.com') !== false) && ($this->signatureMethod == 'v2'))
-		{
-			$this->useLegacyPathStyle = false;
-		}
-	}
-
-	/**
-	 * Should we use the dualstack URL (which will ship traffic over ipv6 in most cases). For more information on these
-	 * endpoints please read https://docs.aws.amazon.com/AmazonS3/latest/dev/dual-stack-endpoints.html
-	 *
-	 * @return  bool
-	 */
-	public function getDualstackUrl(): bool
-	{
-		return $this->useDualstackUrl;
-	}
-
-	/**
-	 * Set the flag for using legacy, path-style access to the bucket
-	 *
-	 * @param   bool  $useDualstackUrl
-	 */
-	public function setUseDualstackUrl(bool $useDualstackUrl): void
-	{
-		$this->useDualstackUrl = $useDualstackUrl;
-	}
-
-	/**
-	 * Get the flag for using an alternate date format for non-Amazon, S3-compatible services.
-	 *
-	 * @return bool
-	 */
-	public function getAlternateDateHeaderFormat(): bool
-	{
-		return $this->alternateDateHeaderFormat;
-	}
-
-	/**
-	 * Set the flag for using an alternate date format for non-Amazon, S3-compatible services.
-	 *
-	 * @param   bool  $alternateDateHeaderFormat
-	 *
-	 * @return  void
-	 */
-	public function setAlternateDateHeaderFormat(bool $alternateDateHeaderFormat): void
-	{
-		$this->alternateDateHeaderFormat = $alternateDateHeaderFormat;
-	}
-
-	/**
-	 * Get the flag indicating whether to use the HTTP Date header
-	 *
-	 * @return  bool  Flag indicating whether to use the HTTP Date header
-	 */
-	public function getUseHTTPDateHeader(): bool
-	{
-		return $this->useHTTPDateHeader;
-	}
-
-	/**
-	 * Set the flag indicating whether to use the HTTP Date header.
-	 *
-	 * @param   bool  $useHTTPDateHeader  Whether to use the HTTP Date header
-	 *
-	 * @return  void
-	 */
-	public function setUseHTTPDateHeader(bool $useHTTPDateHeader): void
-	{
-		$this->useHTTPDateHeader = $useHTTPDateHeader;
-	}
-
-	public function getPreSignedBucketInURL(): bool
-	{
-		return $this->preSignedBucketInURL;
-	}
-
-	public function setPreSignedBucketInURL(bool $preSignedBucketInURL): void
-	{
-		$this->preSignedBucketInURL = $preSignedBucketInURL;
-	}
-}
diff --git a/s3_storage/vendor/akeeba/s3/src/Connector.php b/s3_storage/vendor/akeeba/s3/src/Connector.php
deleted file mode 100644
index e57e710f..00000000
--- a/s3_storage/vendor/akeeba/s3/src/Connector.php
+++ /dev/null
@@ -1,983 +0,0 @@
-<?php
-/**
- * Akeeba Engine
- *
- * @package   akeebaengine
- * @copyright Copyright (c)2006-2024 Nicholas K. Dionysopoulos / Akeeba Ltd
- * @license   GNU General Public License version 3, or later
- */
-
-namespace Akeeba\S3;
-
-// Protection against direct access
-use Akeeba\S3\Exception\CannotDeleteFile;
-use Akeeba\S3\Exception\CannotGetBucket;
-use Akeeba\S3\Exception\CannotGetFile;
-use Akeeba\S3\Exception\CannotListBuckets;
-use Akeeba\S3\Exception\CannotOpenFileForWrite;
-use Akeeba\S3\Exception\CannotPutFile;
-use Akeeba\S3\Response\Error;
-
-defined('AKEEBAENGINE') || die();
-
-class Connector
-{
-	/**
-	 * Amazon S3 configuration object
-	 *
-	 * @var  Configuration
-	 */
-	private $configuration = null;
-
-	/**
-	 * Connector constructor.
-	 *
-	 * @param   Configuration  $configuration  The configuration object to use
-	 */
-	public function __construct(Configuration $configuration)
-	{
-		$this->configuration = $configuration;
-	}
-
-	/**
-	 * Put an object to Amazon S3, i.e. upload a file. If the object already exists it will be overwritten.
-	 *
-	 * @param   Input   $input           Input object
-	 * @param   string  $bucket          Bucket name. If you're using v4 signatures it MUST be on the region defined.
-	 * @param   string  $uri             Object URI. Think of it as the absolute path of the file in the bucket.
-	 * @param   string  $acl             ACL constant, by default the object is private (visible only to the uploading
-	 *                                   user)
-	 * @param   array   $requestHeaders  Array of request headers
-	 *
-	 * @return  void
-	 *
-	 * @throws CannotPutFile If the upload is not possible
-	 */
-	public function putObject(Input $input, string $bucket, string $uri, string $acl = Acl::ACL_PRIVATE, array $requestHeaders = []): void
-	{
-		$request = new Request('PUT', $bucket, $uri, $this->configuration);
-		$request->setInput($input);
-
-		// Custom request headers (Content-Type, Content-Disposition, Content-Encoding)
-		if (count($requestHeaders))
-		{
-			foreach ($requestHeaders as $h => $v)
-			{
-				if (strtolower(substr($h, 0, 6)) == 'x-amz-')
-				{
-					$request->setAmzHeader(strtolower($h), $v);
-				}
-				else
-				{
-					$request->setHeader($h, $v);
-				}
-			}
-		}
-
-		if (isset($requestHeaders['Content-Type']))
-		{
-			$input->setType($requestHeaders['Content-Type']);
-		}
-
-		if (($input->getSize() <= 0) || (($input->getInputType() == Input::INPUT_DATA) && (!strlen($input->getDataReference()))))
-		{
-			if (substr($uri, -1) !== '/')
-			{
-				throw new CannotPutFile('Missing input parameters', 0);
-			}
-		}
-
-		// We need to post with Content-Length and Content-Type, MD5 is optional
-		$request->setHeader('Content-Type', $input->getType());
-		$request->setHeader('Content-Length', $input->getSize());
-
-		if ($input->getMd5sum())
-		{
-			$request->setHeader('Content-MD5', $input->getMd5sum());
-		}
-
-		$request->setAmzHeader('x-amz-acl', $acl);
-
-		$response = $request->getResponse();
-
-		if ($response->code !== 200)
-		{
-			if (!$response->error->isError())
-			{
-				throw new CannotPutFile("Unexpected HTTP status {$response->code}", $response->code);
-			}
-
-			if (is_object($response->body) && ($response->body instanceof \SimpleXMLElement) && (strpos($input->getSize(), ',') === false))
-			{
-				// For some reason, trying to single part upload files on some hosts comes back with an inexplicable
-				// error from Amazon that we need to set Content-Length:5242880,5242880 instead of
-				// Content-Length:5242880 which is AGAINST Amazon's documentation. In this case we pass the header
-				// 'workaround-braindead-error-from-amazon' and retry. Uh, OK?
-				if (isset($response->body->CanonicalRequest))
-				{
-					$amazonsCanonicalRequest = (string) $response->body->CanonicalRequest;
-					$lines                   = explode("\n", $amazonsCanonicalRequest);
-
-					foreach ($lines as $line)
-					{
-						if (substr($line, 0, 15) != 'content-length:')
-						{
-							continue;
-						}
-
-						[$junk, $stupidAmazonDefinedContentLength] = explode(":", $line);
-
-						if (strpos($stupidAmazonDefinedContentLength, ',') !== false)
-						{
-							if (!isset($requestHeaders['workaround-braindead-error-from-amazon']))
-							{
-								$requestHeaders['workaround-braindead-error-from-amazon'] = 'you can\'t fix stupid';
-
-								$this->putObject($input, $bucket, $uri, $acl, $requestHeaders);
-
-								return;
-							}
-						}
-					}
-				}
-			}
-		}
-
-
-		if ($response->error->isError())
-		{
-			throw new CannotPutFile(
-				sprintf(__METHOD__ . "(): [%s] %s\n\nDebug info:\n%s", $response->error->getCode(), $response->error->getMessage(), print_r($response->body, true))
-			);
-		}
-	}
-
-	/**
-	 * Get (download) an object
-	 *
-	 * @param   string                $bucket  Bucket name
-	 * @param   string                $uri     Object URI
-	 * @param   string|resource|null  $saveTo  Filename or resource to write to
-	 * @param   int|null              $from    Start of the download range, null to download the entire object
-	 * @param   int|null              $to      End of the download range, null to download the entire object
-	 *
-	 * @return  string|null  No return if $saveTo is specified; data as string otherwise
-	 *
-	 */
-	public function getObject(string $bucket, string $uri, $saveTo = null, ?int $from = null, ?int $to = null): ?string
-	{
-		$request = new Request('GET', $bucket, $uri, $this->configuration);
-
-		$fp = null;
-
-		if (!is_resource($saveTo) && is_string($saveTo))
-		{
-			$fp = @fopen($saveTo, 'w');
-
-			if ($fp === false)
-			{
-				throw new CannotOpenFileForWrite($saveTo);
-			}
-		}
-
-		if (is_resource($saveTo))
-		{
-			$fp = $saveTo;
-		}
-
-		if (is_resource($fp))
-		{
-			$request->setFp($fp);
-		}
-
-		// Set the range header
-		if ((!empty($from) && !empty($to)) || (!is_null($from) && !empty($to)))
-		{
-			$request->setHeader('Range', "bytes=$from-$to");
-		}
-
-		$response = $request->getResponse(true);
-
-		if (!$response->error->isError() && (($response->code !== 200) && ($response->code !== 206)))
-		{
-			$response->error = new Error(
-				$response->code,
-				"Unexpected HTTP status {$response->code}"
-			);
-		}
-
-		if ($response->error->isError())
-		{
-			throw new CannotGetFile(
-				sprintf(
-					__METHOD__ . "({%s}, {%s}): [%s] %s\n\nDebug info:\n%s",
-					$bucket,
-					$uri,
-					$response->error->getCode(),
-					$response->error->getMessage(),
-					print_r($response->body, true)
-				)
-			);
-		}
-
-		if (!is_resource($fp))
-		{
-			return $response->body;
-		}
-
-		return null;
-	}
-
-	/**
-	 * Get information about an object.
-	 *
-	 * @param   string  $bucket  Bucket name
-	 * @param   string  $uri     Object URI
-	 *
-	 * @return  array  The headers returned by Amazon S3
-	 *
-	 * @throws  CannotGetFile  If the file does not exist
-	 * @see     https://docs.aws.amazon.com/AmazonS3/latest/API/API_HeadObject.html
-	 */
-	public function headObject(string $bucket, string $uri): array
-	{
-		$request = new Request('HEAD', $bucket, $uri, $this->configuration);
-
-		$response = $request->getResponse();
-
-		if (!$response->error->isError() && (($response->code !== 200) && ($response->code !== 206)))
-		{
-			$response->error = new Error(
-				$response->code,
-				"Unexpected HTTP status {$response->code}"
-			);
-		}
-
-		if ($response->error->isError())
-		{
-			throw new CannotGetFile(
-				sprintf(
-					__METHOD__ . "({%s}, {%s}): [%s] %s\n\nDebug info:\n%s",
-					$bucket,
-					$uri,
-					$response->error->getCode(),
-					$response->error->getMessage(),
-					print_r($response->body, true)
-				)
-			);
-		}
-
-		return $response->getHeaders();
-	}
-
-
-	/**
-	 * Delete an object
-	 *
-	 * @param   string  $bucket  Bucket name
-	 * @param   string  $uri     Object URI
-	 *
-	 * @return  void
-	 */
-	public function deleteObject(string $bucket, string $uri): void
-	{
-		$request  = new Request('DELETE', $bucket, $uri, $this->configuration);
-		$response = $request->getResponse();
-
-		if (!$response->error->isError() && ($response->code !== 204))
-		{
-			$response->error = new Error(
-				$response->code,
-				"Unexpected HTTP status {$response->code}"
-			);
-		}
-
-		if ($response->error->isError())
-		{
-			throw new CannotDeleteFile(
-				sprintf(
-					__METHOD__ . "({%s}, {%s}): [%s] %s",
-					$bucket,
-					$uri,
-					$response->error->getCode(),
-					$response->error->getMessage()
-				)
-			);
-		}
-	}
-
-	/**
-	 * Get a query string authenticated URL
-	 *
-	 * @param   string    $bucket    Bucket name
-	 * @param   string    $uri       Object URI
-	 * @param   int|null  $lifetime  Lifetime in seconds
-	 * @param   bool      $https     Use HTTPS ($hostBucket should be false for SSL verification)?
-	 *
-	 * @return  string
-	 */
-	public function getAuthenticatedURL(string $bucket, string $uri, ?int $lifetime = null, bool $https = false): string
-	{
-		// Get a request from the URI and bucket
-		$questionmarkPos = strpos($uri, '?');
-		$query           = '';
-
-		if ($questionmarkPos !== false)
-		{
-			$query = substr($uri, $questionmarkPos + 1);
-			$uri   = substr($uri, 0, $questionmarkPos);
-		}
-
-
-		/**
-		 * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-		 * !!!!             DO NOT TOUCH THIS CODE. YOU WILL BREAK PRE-SIGNED URLS WITH v4 SIGNATURES.              !!!!
-		 * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-		 *
-		 * The following two lines seem weird and possibly extraneous at first glance. However, they are VERY important.
-		 * If you remove them pre-signed URLs for v4 signatures will break! That's because pre-signed URLs with v4
-		 * signatures follow different rules than with v2 signatures.
-		 *
-		 * Authenticated (pre-signed) URLs are always made against the generic S3 region endpoint, not the bucket's
-		 * virtual-hosting-style domain name. The bucket is always the first component of the path.
-		 *
-		 * For example, given a bucket called foobar, and an object baz.txt in it, we are pre-signing the URL
-		 * https://s3-eu-west-1.amazonaws.com/foobar/baz.txt, not
-		 * https://foobar.s3-eu-west-1.amazonaws.com/foobar/baz.txt (as we'd be doing with v2 signatures).
-		 *
-		 * The problem is that the Request object needs to be created before we can convey the intent (regular request
-		 * or generation of a pre-signed URL). As a result its constructor creates the (immutable) request URI solely
-		 * based on whether the Configuration object's getUseLegacyPathStyle() returns false or not.
-		 *
-		 * Since we want to request URI to contain the bucket name we need to tell the Request object's constructor that
-		 * we are creating a Request object for path-style access, i.e. the useLegacyPathStyle flag in the Configuration
-		 * object is true. Naturally, the default behavior being virtual-hosting-style access to buckets, this flag is
-		 * most likely **false**.
-		 *
-		 * Therefore, we need to clone the Configuration object, set the flag to true and create a Request object using
-		 * the falsified Configuration object.
-		 *
-		 * Note that v2 signatures are not affected. In v2 we are always appending the bucket name to the path, despite
-		 * the fact that we include the bucket name in the domain name.
-		 *
-		 * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-		 * !!!!             DO NOT TOUCH THIS CODE. YOU WILL BREAK PRE-SIGNED URLS WITH v4 SIGNATURES.              !!!!
-		 * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-		 */
-		$newConfig = clone $this->configuration;
-		$newConfig->setUseLegacyPathStyle(true);
-
-		// Create the request object.
-		$request = new Request('GET', $bucket, $uri, $newConfig);
-
-		if ($query)
-		{
-			parse_str($query, $parameters);
-
-			if (count($parameters))
-			{
-				foreach ($parameters as $k => $v)
-				{
-					$request->setParameter($k, $v);
-				}
-			}
-		}
-
-		// Get the signed URI from the Request object
-		return $request->getAuthenticatedURL($lifetime, $https);
-	}
-
-	/**
-	 * Get the location (region) of a bucket. You need this to use the V4 API on that bucket!
-	 *
-	 * @param   string  $bucket  Bucket name
-	 *
-	 * @return  string
-	 */
-	public function getBucketLocation(string $bucket): string
-	{
-		$request = new Request('GET', $bucket, '', $this->configuration);
-		$request->setParameter('location', null);
-
-		$response = $request->getResponse();
-
-		if (!$response->error->isError() && $response->code !== 200)
-		{
-			$response->error = new Error(
-				$response->code,
-				"Unexpected HTTP status {$response->code}"
-			);
-		}
-
-		if ($response->error->isError())
-		{
-			throw new CannotGetBucket(
-				sprintf(__METHOD__ . "(): [%s] %s", $response->error->getCode(), $response->error->getMessage())
-			);
-		}
-
-		$result = 'us-east-1';
-
-		if ($response->hasBody())
-		{
-			$result = (string) $response->body;
-		}
-
-		switch ($result)
-		{
-			// "EU" is an alias for 'eu-west-1', however the canonical location name you MUST use is 'eu-west-1'
-			case 'EU':
-			case 'eu':
-				$result = 'eu-west-1';
-				break;
-
-			// If the bucket location is 'us-east-1' you get an empty string. @#$%^&*()!!
-			case '':
-				$result = 'us-east-1';
-				break;
-		}
-
-		return $result;
-	}
-
-	/**
-	 * Get the contents of a bucket
-	 *
-	 * If maxKeys is null this method will loop through truncated result sets
-	 *
-	 * @param   string       $bucket                Bucket name
-	 * @param   string|null  $prefix                Prefix (directory)
-	 * @param   string|null  $marker                Marker (last file listed)
-	 * @param   int|null     $maxKeys               Maximum number of keys ("files" and "directories") to return
-	 * @param   string       $delimiter             Delimiter, typically "/"
-	 * @param   bool         $returnCommonPrefixes  Set to true to return CommonPrefixes
-	 *
-	 * @return  array
-	 */
-	public function getBucket(string $bucket, ?string $prefix = null, ?string $marker = null, ?int $maxKeys = null, string $delimiter = '/', bool $returnCommonPrefixes = false): array
-	{
-		$internalResult = $this->internalGetBucket($bucket, $prefix, $marker, $maxKeys, $delimiter, $returnCommonPrefixes);
-
-		/**
-		 * @var array   $objects
-		 * @var ?string $nextMarker
-		 */
-		extract($internalResult);
-		unset($internalResult);
-
-		// Loop through truncated results if maxKeys isn't specified or we don't have enough object records yet.
-		if ($nextMarker !== null && ($maxKeys === null || count($objects) < $maxKeys))
-		{
-			do
-			{
-				$internalResult = $this->internalGetBucket($bucket, $prefix, $nextMarker, $maxKeys, $delimiter, $returnCommonPrefixes);
-
-				$nextMarker = $internalResult['nextMarker'];
-				$objects    = array_merge($objects, $internalResult['objects']);
-
-				unset($internalResult);
-
-				// If the last call did not return a nextMarker I am done iterating.
-				if ($nextMarker === null)
-				{
-					break;
-				}
-
-				// If we have maxKeys AND the number of objects is at least this many I am done iterating.
-				if ($maxKeys !== null && count($objects) >= $maxKeys)
-				{
-					break;
-				}
-			} while (true);
-		}
-
-		if ($maxKeys !== null)
-		{
-			return array_splice($objects, 0, $maxKeys);
-		}
-
-		return $objects;
-	}
-
-	/**
-	 * Get a list of buckets
-	 *
-	 * @param   bool  $detailed  Returns detailed bucket list when true
-	 *
-	 * @return  array
-	 */
-	public function listBuckets(bool $detailed = false): array
-	{
-		// When listing buckets with the AWSv4 signature method we MUST set the region to us-east-1. Don't ask...
-		$configuration = clone $this->configuration;
-		$configuration->setRegion('us-east-1');
-
-		$request  = new Request('GET', '', '', $configuration);
-		$response = $request->getResponse();
-
-		if (!$response->error->isError() && (($response->code !== 200)))
-		{
-			$response->error = new Error(
-				$response->code,
-				"Unexpected HTTP status {$response->code}"
-			);
-		}
-
-		if ($response->error->isError())
-		{
-			throw new CannotListBuckets(
-				sprintf(__METHOD__ . "(): [%s] %s", $response->error->getCode(), $response->error->getMessage())
-			);
-		}
-
-		$results = [];
-
-		if (!isset($response->body->Buckets))
-		{
-			return $results;
-		}
-
-		if ($detailed)
-		{
-			if (isset($response->body->Owner, $response->body->Owner->ID, $response->body->Owner->DisplayName))
-			{
-				$results['owner'] = [
-					'id'   => (string) $response->body->Owner->ID,
-					'name' => (string) $response->body->Owner->DisplayName,
-				];
-			}
-
-			$results['buckets'] = [];
-
-			foreach ($response->body->Buckets->Bucket as $b)
-			{
-				$results['buckets'][] = [
-					'name' => (string) $b->Name,
-					'time' => strtotime((string) $b->CreationDate),
-				];
-			}
-		}
-		else
-		{
-			foreach ($response->body->Buckets->Bucket as $b)
-			{
-				$results[] = (string) $b->Name;
-			}
-		}
-
-		return $results;
-	}
-
-	/**
-	 * Start a multipart upload of an object
-	 *
-	 * @param   Input   $input           Input data
-	 * @param   string  $bucket          Bucket name
-	 * @param   string  $uri             Object URI
-	 * @param   string  $acl             ACL constant
-	 * @param   array   $requestHeaders  Array of request headers
-	 *
-	 * @return  string  The upload session ID (UploadId)
-	 */
-	public function startMultipart(Input $input, string $bucket, string $uri, string $acl = Acl::ACL_PRIVATE, array $requestHeaders = []): string
-	{
-		$request = new Request('POST', $bucket, $uri, $this->configuration);
-		$request->setParameter('uploads', '');
-
-		// Custom request headers (Content-Type, Content-Disposition, Content-Encoding)
-		if (is_array($requestHeaders))
-		{
-			foreach ($requestHeaders as $h => $v)
-			{
-				if (strtolower(substr($h, 0, 6)) == 'x-amz-')
-				{
-					$request->setAmzHeader(strtolower($h), $v);
-				}
-				else
-				{
-					$request->setHeader($h, $v);
-				}
-			}
-		}
-
-		$request->setAmzHeader('x-amz-acl', $acl);
-
-		if (isset($requestHeaders['Content-Type']))
-		{
-			$input->setType($requestHeaders['Content-Type']);
-		}
-
-		$request->setHeader('Content-Type', $input->getType());
-
-		$response = $request->getResponse();
-
-		if (!$response->error->isError() && ($response->code !== 200))
-		{
-			$response->error = new Error(
-				$response->code,
-				"Unexpected HTTP status {$response->code}"
-			);
-		}
-
-		if ($response->error->isError())
-		{
-			throw new CannotPutFile(
-				sprintf(
-					__METHOD__ . "(): [%s] %s\n\nDebug info:\n%s",
-					$response->error->getCode(),
-					$response->error->getMessage(),
-					print_r($response->body, true)
-				)
-			);
-		}
-
-		return (string) $response->body->UploadId;
-	}
-
-	/**
-	 * Uploads a part of a multipart object upload
-	 *
-	 * @param   Input   $input           Input data. You MUST specify the UploadID and PartNumber
-	 * @param   string  $bucket          Bucket name
-	 * @param   string  $uri             Object URI
-	 * @param   array   $requestHeaders  Array of request headers or content type as a string
-	 * @param   int     $chunkSize       Size of each upload chunk, in bytes. It cannot be less than 5242880 bytes (5Mb)
-	 *
-	 * @return  null|string  The ETag of the upload part of null if we have ran out of parts to upload
-	 */
-	public function uploadMultipart(Input $input, string $bucket, string $uri, array $requestHeaders = [], int $chunkSize = 5242880): ?string
-	{
-		if ($chunkSize < 5242880)
-		{
-			$chunkSize = 5242880;
-		}
-
-		// We need a valid UploadID and PartNumber
-		$UploadID   = $input->getUploadID();
-		$PartNumber = $input->getPartNumber();
-
-		if (empty($UploadID))
-		{
-			throw new CannotPutFile(
-				__METHOD__ . '(): No UploadID specified'
-			);
-		}
-
-		if (empty($PartNumber))
-		{
-			throw new CannotPutFile(
-				__METHOD__ . '(): No PartNumber specified'
-			);
-		}
-
-		$UploadID   = urlencode($UploadID);
-		$PartNumber = (int) $PartNumber;
-
-		$request = new Request('PUT', $bucket, $uri, $this->configuration);
-		$request->setParameter('partNumber', $PartNumber);
-		$request->setParameter('uploadId', $UploadID);
-		$request->setInput($input);
-
-		// Full data length
-		$totalSize = $input->getSize();
-
-		// No Content-Type for multipart uploads
-		$input->setType(null);
-
-		// Calculate part offset
-		$partOffset = $chunkSize * ($PartNumber - 1);
-
-		if ($partOffset > $totalSize)
-		{
-			// This is to signify that we ran out of parts ;)
-			return null;
-		}
-
-		// How many parts are there?
-		$totalParts = floor($totalSize / $chunkSize);
-
-		if ($totalParts * $chunkSize < $totalSize)
-		{
-			$totalParts++;
-		}
-
-		// Calculate Content-Length
-		$size = $chunkSize;
-
-		if ($PartNumber >= $totalParts)
-		{
-			$size = $totalSize - ($PartNumber - 1) * $chunkSize;
-		}
-
-		if ($size <= 0)
-		{
-			// This is to signify that we ran out of parts ;)
-			return null;
-		}
-
-		$input->setSize($size);
-
-		switch ($input->getInputType())
-		{
-			case Input::INPUT_DATA:
-				$input->setData(substr($input->getData(), ($PartNumber - 1) * $chunkSize, $input->getSize()));
-				break;
-
-			case Input::INPUT_FILE:
-			case Input::INPUT_RESOURCE:
-				$fp = $input->getFp();
-				fseek($fp, ($PartNumber - 1) * $chunkSize);
-				break;
-		}
-
-		// Custom request headers (Content-Type, Content-Disposition, Content-Encoding)
-		if (is_array($requestHeaders))
-		{
-			foreach ($requestHeaders as $h => $v)
-			{
-				if (strtolower(substr($h, 0, 6)) == 'x-amz-')
-				{
-					$request->setAmzHeader(strtolower($h), $v);
-				}
-				else
-				{
-					$request->setHeader($h, $v);
-				}
-			}
-		}
-
-		$request->setHeader('Content-Length', $input->getSize());
-
-		if ($input->getInputType() === Input::INPUT_DATA)
-		{
-			$request->setHeader('Content-Type', "application/x-www-form-urlencoded");
-		}
-
-		$response = $request->getResponse();
-
-		if ($response->code !== 200)
-		{
-			if (!$response->error->isError())
-			{
-				$response->error = new Error(
-					$response->code,
-					"Unexpected HTTP status {$response->code}"
-				);
-			}
-
-			if (is_object($response->body) && ($response->body instanceof \SimpleXMLElement) && (strpos($input->getSize(), ',') === false))
-			{
-				// For some moronic reason, trying to multipart upload files on some hosts comes back with a crazy
-				// error from Amazon that we need to set Content-Length:5242880,5242880 instead of
-				// Content-Length:5242880 which is AGAINST Amazon's documentation. In this case we pass the header
-				// 'workaround-broken-content-length' and retry. Whatever.
-				if (isset($response->body->CanonicalRequest))
-				{
-					$amazonsCanonicalRequest = (string) $response->body->CanonicalRequest;
-					$lines                   = explode("\n", $amazonsCanonicalRequest);
-
-					foreach ($lines as $line)
-					{
-						if (substr($line, 0, 15) != 'content-length:')
-						{
-							continue;
-						}
-
-						[$junk, $stupidAmazonDefinedContentLength] = explode(":", $line);
-
-						if (strpos($stupidAmazonDefinedContentLength, ',') !== false)
-						{
-							if (!isset($requestHeaders['workaround-broken-content-length']))
-							{
-								$requestHeaders['workaround-broken-content-length'] = true;
-
-								// This is required to reset the input size to its default value. If you don't do that
-								// only one part will ever be uploaded. Oops!
-								$input->setSize(-1);
-
-								return $this->uploadMultipart($input, $bucket, $uri, $requestHeaders, $chunkSize);
-							}
-						}
-					}
-				}
-
-			}
-
-			throw new CannotPutFile(
-				sprintf(__METHOD__ . "(): [%s] %s\n\nDebug info:\n%s", $response->error->getCode(), $response->error->getMessage(), print_r($response->body, true))
-			);
-		}
-
-		// Return the ETag header
-		return $response->headers['hash'];
-	}
-
-	/**
-	 * Finalizes the multi-part upload. The $input object should contain two keys, etags an array of ETags of the
-	 * uploaded parts and UploadID the multipart upload ID.
-	 *
-	 * @param   Input   $input   The array of input elements
-	 * @param   string  $bucket  The bucket where the object is being stored
-	 * @param   string  $uri     The key (path) to the object
-	 *
-	 * @return  void
-	 */
-	public function finalizeMultipart(Input $input, string $bucket, string $uri): void
-	{
-		$etags    = $input->getEtags();
-		$UploadID = $input->getUploadID();
-
-		if (empty($etags))
-		{
-			throw new CannotPutFile(
-				__METHOD__ . '(): No ETags array specified'
-			);
-		}
-
-		if (empty($UploadID))
-		{
-			throw new CannotPutFile(
-				__METHOD__ . '(): No UploadID specified'
-			);
-		}
-
-		// Create the message
-		$message = "<CompleteMultipartUpload>\n";
-		$part    = 0;
-
-		foreach ($etags as $etag)
-		{
-			$part++;
-			$message .= "\t<Part>\n\t\t<PartNumber>$part</PartNumber>\n\t\t<ETag>\"$etag\"</ETag>\n\t</Part>\n";
-		}
-
-		$message .= "</CompleteMultipartUpload>";
-
-		// Get a request query
-		$reqInput = Input::createFromData($message);
-
-		$request = new Request('POST', $bucket, $uri, $this->configuration);
-		$request->setParameter('uploadId', $UploadID);
-		$request->setInput($reqInput);
-
-		// Do post
-		$request->setHeader('Content-Type', 'application/xml'); // Even though the Amazon API doc doesn't mention it, it's required... :(
-		$response = $request->getResponse();
-
-		if (!$response->error->isError() && ($response->code != 200))
-		{
-			$response->error = new Error(
-				$response->code,
-				"Unexpected HTTP status {$response->code}"
-			);
-		}
-
-		if ($response->error->isError())
-		{
-			if ($response->error->getCode() == 'RequestTimeout')
-			{
-				return;
-			}
-
-			throw new CannotPutFile(
-				sprintf(__METHOD__ . "(): [%s] %s\n\nDebug info:\n%s", $response->error->getCode(), $response->error->getMessage(), print_r($response->body, true))
-			);
-		}
-	}
-
-	/**
-	 * Returns the configuration object
-	 *
-	 * @return  Configuration
-	 */
-	public function getConfiguration(): Configuration
-	{
-		return $this->configuration;
-	}
-
-	private function internalGetBucket(string $bucket, ?string $prefix = null, ?string $marker = null, ?int $maxKeys = null, string $delimiter = '/', bool $returnCommonPrefixes = false): array
-	{
-		$request = new Request('GET', $bucket, '', $this->configuration);
-
-		if (!empty($prefix))
-		{
-			$request->setParameter('prefix', $prefix);
-		}
-
-		if (!empty($marker))
-		{
-			$request->setParameter('marker', $marker);
-		}
-
-		if (!empty($maxKeys))
-		{
-			$request->setParameter('max-keys', $maxKeys);
-		}
-
-		if (!empty($delimiter))
-		{
-			$request->setParameter('delimiter', $delimiter);
-		}
-
-		$response = $request->getResponse();
-
-		if (!$response->error->isError() && $response->code !== 200)
-		{
-			$response->error = new Error(
-				$response->code,
-				"Unexpected HTTP status {$response->code}"
-			);
-		}
-
-		if ($response->error->isError())
-		{
-			throw new CannotGetBucket(
-				sprintf(__METHOD__ . "(): [%s] %s", $response->error->getCode(), $response->error->getMessage())
-			);
-		}
-
-		$results = [
-			'objects'    => [],
-			'nextMarker' => null,
-		];
-
-		if ($response->hasBody() && isset($response->body->Contents))
-		{
-			foreach ($response->body->Contents as $c)
-			{
-				$results['objects'][(string) $c->Key] = [
-					'name' => (string) $c->Key,
-					'time' => strtotime((string) $c->LastModified),
-					'size' => (int) $c->Size,
-					'hash' => substr((string) $c->ETag, 1, -1),
-				];
-
-				$results['nextMarker'] = (string) $c->Key;
-			}
-		}
-
-		if ($returnCommonPrefixes && $response->hasBody() && isset($response->body->CommonPrefixes))
-		{
-			foreach ($response->body->CommonPrefixes as $c)
-			{
-				$results['objects'][(string) $c->Prefix] = ['prefix' => (string) $c->Prefix];
-			}
-		}
-
-		if ($response->hasBody() && isset($response->body->IsTruncated) &&
-			((string) $response->body->IsTruncated == 'false')
-		)
-		{
-			$results['nextMarker'] = null;
-
-			return $results;
-		}
-
-		if ($response->hasBody() && isset($response->body->NextMarker))
-		{
-			$results['nextMarker'] = (string) $response->body->NextMarker;
-		}
-
-		return $results;
-	}
-}
diff --git a/s3_storage/vendor/akeeba/s3/src/Exception/CannotDeleteFile.php b/s3_storage/vendor/akeeba/s3/src/Exception/CannotDeleteFile.php
deleted file mode 100644
index 7bb47035..00000000
--- a/s3_storage/vendor/akeeba/s3/src/Exception/CannotDeleteFile.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * Akeeba Engine
- *
- * @package   akeebaengine
- * @copyright Copyright (c)2006-2024 Nicholas K. Dionysopoulos / Akeeba Ltd
- * @license   GNU General Public License version 3, or later
- */
-
-namespace Akeeba\S3\Exception;
-
-// Protection against direct access
-defined('AKEEBAENGINE') || die();
-
-use RuntimeException;
-
-class CannotDeleteFile extends RuntimeException
-{
-}
diff --git a/s3_storage/vendor/akeeba/s3/src/Exception/CannotGetBucket.php b/s3_storage/vendor/akeeba/s3/src/Exception/CannotGetBucket.php
deleted file mode 100644
index 0910fb61..00000000
--- a/s3_storage/vendor/akeeba/s3/src/Exception/CannotGetBucket.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * Akeeba Engine
- *
- * @package   akeebaengine
- * @copyright Copyright (c)2006-2024 Nicholas K. Dionysopoulos / Akeeba Ltd
- * @license   GNU General Public License version 3, or later
- */
-
-namespace Akeeba\S3\Exception;
-
-// Protection against direct access
-defined('AKEEBAENGINE') || die();
-
-use RuntimeException;
-
-class CannotGetBucket extends RuntimeException
-{
-}
diff --git a/s3_storage/vendor/akeeba/s3/src/Exception/CannotGetFile.php b/s3_storage/vendor/akeeba/s3/src/Exception/CannotGetFile.php
deleted file mode 100644
index 3582cea1..00000000
--- a/s3_storage/vendor/akeeba/s3/src/Exception/CannotGetFile.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * Akeeba Engine
- *
- * @package   akeebaengine
- * @copyright Copyright (c)2006-2024 Nicholas K. Dionysopoulos / Akeeba Ltd
- * @license   GNU General Public License version 3, or later
- */
-
-namespace Akeeba\S3\Exception;
-
-// Protection against direct access
-defined('AKEEBAENGINE') || die();
-
-use RuntimeException;
-
-class CannotGetFile extends RuntimeException
-{
-}
diff --git a/s3_storage/vendor/akeeba/s3/src/Exception/CannotListBuckets.php b/s3_storage/vendor/akeeba/s3/src/Exception/CannotListBuckets.php
deleted file mode 100644
index 86799275..00000000
--- a/s3_storage/vendor/akeeba/s3/src/Exception/CannotListBuckets.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * Akeeba Engine
- *
- * @package   akeebaengine
- * @copyright Copyright (c)2006-2024 Nicholas K. Dionysopoulos / Akeeba Ltd
- * @license   GNU General Public License version 3, or later
- */
-
-namespace Akeeba\S3\Exception;
-
-// Protection against direct access
-defined('AKEEBAENGINE') || die();
-
-use RuntimeException;
-
-class CannotListBuckets extends RuntimeException
-{
-}
diff --git a/s3_storage/vendor/akeeba/s3/src/Exception/CannotOpenFileForRead.php b/s3_storage/vendor/akeeba/s3/src/Exception/CannotOpenFileForRead.php
deleted file mode 100644
index ea8c729e..00000000
--- a/s3_storage/vendor/akeeba/s3/src/Exception/CannotOpenFileForRead.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-/**
- * Akeeba Engine
- *
- * @package   akeebaengine
- * @copyright Copyright (c)2006-2024 Nicholas K. Dionysopoulos / Akeeba Ltd
- * @license   GNU General Public License version 3, or later
- */
-
-namespace Akeeba\S3\Exception;
-
-// Protection against direct access
-defined('AKEEBAENGINE') || die();
-
-use Exception;
-use RuntimeException;
-
-class CannotOpenFileForRead extends RuntimeException
-{
-	public function __construct(string $file = "", int $code = 0, Exception $previous = null)
-	{
-		$message = "Cannot open $file for reading";
-
-		parent::__construct($message, $code, $previous);
-	}
-
-}
diff --git a/s3_storage/vendor/akeeba/s3/src/Exception/CannotOpenFileForWrite.php b/s3_storage/vendor/akeeba/s3/src/Exception/CannotOpenFileForWrite.php
deleted file mode 100644
index 9a7fcde9..00000000
--- a/s3_storage/vendor/akeeba/s3/src/Exception/CannotOpenFileForWrite.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-/**
- * Akeeba Engine
- *
- * @package   akeebaengine
- * @copyright Copyright (c)2006-2024 Nicholas K. Dionysopoulos / Akeeba Ltd
- * @license   GNU General Public License version 3, or later
- */
-
-namespace Akeeba\S3\Exception;
-
-// Protection against direct access
-defined('AKEEBAENGINE') || die();
-
-use Exception;
-use RuntimeException;
-
-class CannotOpenFileForWrite extends RuntimeException
-{
-	public function __construct(string $file = "", int $code = 0, Exception $previous = null)
-	{
-		$message = "Cannot open $file for writing";
-
-		parent::__construct($message, $code, $previous);
-	}
-
-}
diff --git a/s3_storage/vendor/akeeba/s3/src/Exception/CannotPutFile.php b/s3_storage/vendor/akeeba/s3/src/Exception/CannotPutFile.php
deleted file mode 100644
index 2656eeae..00000000
--- a/s3_storage/vendor/akeeba/s3/src/Exception/CannotPutFile.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * Akeeba Engine
- *
- * @package   akeebaengine
- * @copyright Copyright (c)2006-2024 Nicholas K. Dionysopoulos / Akeeba Ltd
- * @license   GNU General Public License version 3, or later
- */
-
-namespace Akeeba\S3\Exception;
-
-// Protection against direct access
-defined('AKEEBAENGINE') || die();
-
-use RuntimeException;
-
-class CannotPutFile extends RuntimeException
-{
-}
diff --git a/s3_storage/vendor/akeeba/s3/src/Exception/ConfigurationError.php b/s3_storage/vendor/akeeba/s3/src/Exception/ConfigurationError.php
deleted file mode 100644
index f4789687..00000000
--- a/s3_storage/vendor/akeeba/s3/src/Exception/ConfigurationError.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * Akeeba Engine
- *
- * @package   akeebaengine
- * @copyright Copyright (c)2006-2024 Nicholas K. Dionysopoulos / Akeeba Ltd
- * @license   GNU General Public License version 3, or later
- */
-
-namespace Akeeba\S3\Exception;
-
-// Protection against direct access
-defined('AKEEBAENGINE') || die();
-
-use RuntimeException;
-
-/**
- * Configuration error
- */
-abstract class ConfigurationError extends RuntimeException
-{
-
-}
diff --git a/s3_storage/vendor/akeeba/s3/src/Exception/InvalidAccessKey.php b/s3_storage/vendor/akeeba/s3/src/Exception/InvalidAccessKey.php
deleted file mode 100644
index d8e7afe7..00000000
--- a/s3_storage/vendor/akeeba/s3/src/Exception/InvalidAccessKey.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/**
- * Akeeba Engine
- *
- * @package   akeebaengine
- * @copyright Copyright (c)2006-2024 Nicholas K. Dionysopoulos / Akeeba Ltd
- * @license   GNU General Public License version 3, or later
- */
-
-namespace Akeeba\S3\Exception;
-
-// Protection against direct access
-defined('AKEEBAENGINE') || die();
-
-use Exception;
-
-/**
- * Invalid Amazon S3 access key
- */
-class InvalidAccessKey extends ConfigurationError
-{
-	public function __construct(string $message = "", int $code = 0, Exception $previous = null)
-	{
-		if (empty($message))
-		{
-			$message = 'The Amazon S3 Access Key provided is invalid';
-		}
-
-		parent::__construct($message, $code, $previous);
-	}
-
-}
diff --git a/s3_storage/vendor/akeeba/s3/src/Exception/InvalidBody.php b/s3_storage/vendor/akeeba/s3/src/Exception/InvalidBody.php
deleted file mode 100644
index 4971a468..00000000
--- a/s3_storage/vendor/akeeba/s3/src/Exception/InvalidBody.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * Akeeba Engine
- *
- * @package   akeebaengine
- * @copyright Copyright (c)2006-2024 Nicholas K. Dionysopoulos / Akeeba Ltd
- * @license   GNU General Public License version 3, or later
- */
-
-namespace Akeeba\S3\Exception;
-
-// Protection against direct access
-defined('AKEEBAENGINE') || die();
-
-use Exception;
-use RuntimeException;
-
-/**
- * Invalid response body type
- */
-class InvalidBody extends RuntimeException
-{
-	public function __construct(string $message = "", int $code = 0, Exception $previous = null)
-	{
-		if (empty($message))
-		{
-			$message = 'Invalid response body type';
-		}
-
-		parent::__construct($message, $code, $previous);
-	}
-
-}
diff --git a/s3_storage/vendor/akeeba/s3/src/Exception/InvalidEndpoint.php b/s3_storage/vendor/akeeba/s3/src/Exception/InvalidEndpoint.php
deleted file mode 100644
index 0ef7a3fe..00000000
--- a/s3_storage/vendor/akeeba/s3/src/Exception/InvalidEndpoint.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/**
- * Akeeba Engine
- *
- * @package   akeebaengine
- * @copyright Copyright (c)2006-2024 Nicholas K. Dionysopoulos / Akeeba Ltd
- * @license   GNU General Public License version 3, or later
- */
-
-namespace Akeeba\S3\Exception;
-
-// Protection against direct access
-defined('AKEEBAENGINE') || die();
-
-use Exception;
-
-/**
- * Invalid Amazon S3 endpoint
- */
-class InvalidEndpoint extends ConfigurationError
-{
-	public function __construct(string $message = "", int $code = 0, Exception $previous = null)
-	{
-		if (empty($message))
-		{
-			$message = 'The custom S3 endpoint provided is invalid. Do NOT include the protocol (http:// or https://). Valid examples are s3.example.com and www.example.com/s3Api';
-		}
-
-		parent::__construct($message, $code, $previous);
-	}
-
-}
diff --git a/s3_storage/vendor/akeeba/s3/src/Exception/InvalidFilePointer.php b/s3_storage/vendor/akeeba/s3/src/Exception/InvalidFilePointer.php
deleted file mode 100644
index 4b6bc1c4..00000000
--- a/s3_storage/vendor/akeeba/s3/src/Exception/InvalidFilePointer.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/**
- * Akeeba Engine
- *
- * @package   akeebaengine
- * @copyright Copyright (c)2006-2024 Nicholas K. Dionysopoulos / Akeeba Ltd
- * @license   GNU General Public License version 3, or later
- */
-
-namespace Akeeba\S3\Exception;
-
-// Protection against direct access
-defined('AKEEBAENGINE') || die();
-
-use Exception;
-use InvalidArgumentException;
-
-class InvalidFilePointer extends InvalidArgumentException
-{
-	public function __construct(string $message = "", int $code = 0, Exception $previous = null)
-	{
-		if (empty($message))
-		{
-			$message = 'The specified file pointer is not a valid stream resource';
-		}
-
-		parent::__construct($message, $code, $previous);
-	}
-
-}
diff --git a/s3_storage/vendor/akeeba/s3/src/Exception/InvalidRegion.php b/s3_storage/vendor/akeeba/s3/src/Exception/InvalidRegion.php
deleted file mode 100644
index 6fd7a9eb..00000000
--- a/s3_storage/vendor/akeeba/s3/src/Exception/InvalidRegion.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/**
- * Akeeba Engine
- *
- * @package   akeebaengine
- * @copyright Copyright (c)2006-2024 Nicholas K. Dionysopoulos / Akeeba Ltd
- * @license   GNU General Public License version 3, or later
- */
-
-namespace Akeeba\S3\Exception;
-
-// Protection against direct access
-defined('AKEEBAENGINE') || die();
-
-use Exception;
-
-/**
- * Invalid Amazon S3 region
- */
-class InvalidRegion extends ConfigurationError
-{
-	public function __construct(string $message = "", int $code = 0, Exception $previous = null)
-	{
-		if (empty($message))
-		{
-			$message = 'The Amazon S3 region provided is invalid.';
-		}
-
-		parent::__construct($message, $code, $previous);
-	}
-
-}
diff --git a/s3_storage/vendor/akeeba/s3/src/Exception/InvalidSecretKey.php b/s3_storage/vendor/akeeba/s3/src/Exception/InvalidSecretKey.php
deleted file mode 100644
index 31e964ef..00000000
--- a/s3_storage/vendor/akeeba/s3/src/Exception/InvalidSecretKey.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/**
- * Akeeba Engine
- *
- * @package   akeebaengine
- * @copyright Copyright (c)2006-2024 Nicholas K. Dionysopoulos / Akeeba Ltd
- * @license   GNU General Public License version 3, or later
- */
-
-namespace Akeeba\S3\Exception;
-
-// Protection against direct access
-defined('AKEEBAENGINE') || die();
-
-use Exception;
-
-/**
- * Invalid Amazon S3 secret key
- */
-class InvalidSecretKey extends ConfigurationError
-{
-	public function __construct(string $message = "", int $code = 0, Exception $previous = null)
-	{
-		if (empty($message))
-		{
-			$message = 'The Amazon S3 Secret Key provided is invalid';
-		}
-
-		parent::__construct($message, $code, $previous);
-	}
-
-}
diff --git a/s3_storage/vendor/akeeba/s3/src/Exception/InvalidSignatureMethod.php b/s3_storage/vendor/akeeba/s3/src/Exception/InvalidSignatureMethod.php
deleted file mode 100644
index 44b8b5c7..00000000
--- a/s3_storage/vendor/akeeba/s3/src/Exception/InvalidSignatureMethod.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/**
- * Akeeba Engine
- *
- * @package   akeebaengine
- * @copyright Copyright (c)2006-2024 Nicholas K. Dionysopoulos / Akeeba Ltd
- * @license   GNU General Public License version 3, or later
- */
-
-namespace Akeeba\S3\Exception;
-
-// Protection against direct access
-defined('AKEEBAENGINE') || die();
-
-use Exception;
-
-/**
- * Invalid Amazon S3 signature method
- */
-class InvalidSignatureMethod extends ConfigurationError
-{
-	public function __construct(string $message = "", int $code = 0, Exception $previous = null)
-	{
-		if (empty($message))
-		{
-			$message = 'The Amazon S3 signature method provided is invalid. Only v2 and v4 signatures are supported.';
-		}
-
-		parent::__construct($message, $code, $previous);
-	}
-
-}
diff --git a/s3_storage/vendor/akeeba/s3/src/Exception/PropertyNotFound.php b/s3_storage/vendor/akeeba/s3/src/Exception/PropertyNotFound.php
deleted file mode 100644
index 58eb7755..00000000
--- a/s3_storage/vendor/akeeba/s3/src/Exception/PropertyNotFound.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-/**
- * Akeeba Engine
- *
- * @package   akeebaengine
- * @copyright Copyright (c)2006-2024 Nicholas K. Dionysopoulos / Akeeba Ltd
- * @license   GNU General Public License version 3, or later
- */
-
-namespace Akeeba\S3\Exception;
-
-// Protection against direct access
-defined('AKEEBAENGINE') || die();
-
-use LogicException;
-
-/**
- * Invalid magic property name
- */
-class PropertyNotFound extends LogicException
-{
-}
diff --git a/s3_storage/vendor/akeeba/s3/src/Input.php b/s3_storage/vendor/akeeba/s3/src/Input.php
deleted file mode 100644
index 1fab7186..00000000
--- a/s3_storage/vendor/akeeba/s3/src/Input.php
+++ /dev/null
@@ -1,758 +0,0 @@
-<?php
-/**
- * Akeeba Engine
- *
- * @package   akeebaengine
- * @copyright Copyright (c)2006-2024 Nicholas K. Dionysopoulos / Akeeba Ltd
- * @license   GNU General Public License version 3, or later
- */
-
-namespace Akeeba\S3;
-
-// Protection against direct access
-defined('AKEEBAENGINE') || die();
-
-/**
- * Defines an input source for PUT/POST requests to Amazon S3
- */
-class Input
-{
-	/**
-	 * Input type: resource
-	 */
-	public const INPUT_RESOURCE = 1;
-
-	/**
-	 * Input type: file
-	 */
-	public const INPUT_FILE = 2;
-
-	/**
-	 * Input type: raw data
-	 */
-	public const INPUT_DATA = 3;
-
-	/**
-	 * File pointer, in case we have a resource
-	 *
-	 * @var  resource
-	 */
-	private $fp = null;
-
-	/**
-	 * Absolute filename to the file
-	 *
-	 * @var  string
-	 */
-	private $file = null;
-
-	/**
-	 * Data to upload, as a string
-	 *
-	 * @var  string
-	 */
-	private $data = null;
-
-	/**
-	 * Length of the data to upload
-	 *
-	 * @var  int
-	 */
-	private $size = -1;
-
-	/**
-	 * Content type (MIME type)
-	 *
-	 * @var  string|null
-	 */
-	private $type = '';
-
-	/**
-	 * MD5 sum of the data to upload, as base64 encoded string. If it's false no MD5 sum will be returned.
-	 *
-	 * @var  string|null
-	 */
-	private $md5sum = null;
-
-	/**
-	 * SHA-256 sum of the data to upload, as lowercase hex string.
-	 *
-	 * @var  string|null
-	 */
-	private $sha256 = null;
-
-	/**
-	 * The Upload Session ID used for multipart uploads
-	 *
-	 * @var  string|null
-	 */
-	private $UploadID = null;
-
-	/**
-	 * The part number used in multipart uploads
-	 *
-	 * @var  int|null
-	 */
-	private $PartNumber = null;
-
-	/**
-	 * The list of ETags used when finalising a multipart upload
-	 *
-	 * @var  string[]
-	 */
-	private $etags = [];
-
-	/**
-	 * Create an input object from a file (also: any valid URL wrapper)
-	 *
-	 * @param   string       $file       Absolute file path or any valid URL fopen() wrapper
-	 * @param   null|string  $md5sum     The MD5 sum. null to auto calculate, empty string to never calculate.
-	 * @param   null|string  $sha256sum  The SHA256 sum. null to auto calculate.
-	 *
-	 * @return  Input
-	 */
-	public static function createFromFile(string $file, ?string $md5sum = null, ?string $sha256sum = null): self
-	{
-		$input = new Input();
-
-		$input->setFile($file);
-		$input->setMd5sum($md5sum);
-		$input->setSha256($sha256sum);
-
-		return $input;
-	}
-
-	/**
-	 * Create an input object from a stream resource / file pointer.
-	 *
-	 * Please note that the contentLength cannot be calculated automatically unless you have a seekable stream resource.
-	 *
-	 * @param   resource     $resource       The file pointer or stream resource
-	 * @param   int          $contentLength  The length of the content in bytes. Set to -1 for auto calculation.
-	 * @param   null|string  $md5sum         The MD5 sum. null to auto calculate, empty string to never calculate.
-	 * @param   null|string  $sha256sum      The SHA256 sum. null to auto calculate.
-	 *
-	 * @return  Input
-	 */
-	public static function createFromResource(&$resource, int $contentLength, ?string $md5sum = null, ?string $sha256sum = null): self
-	{
-		$input = new Input();
-
-		$input->setFp($resource);
-		$input->setSize($contentLength);
-		$input->setMd5sum($md5sum);
-		$input->setSha256($sha256sum);
-
-		return $input;
-	}
-
-	/**
-	 * Create an input object from raw data.
-	 *
-	 * Please bear in mind that the data is being duplicated in memory. Therefore you'll need at least 2xstrlen($data)
-	 * of free memory when you are using this method. You can instantiate an object and use assignData to work around
-	 * this limitation when handling large amounts of data which may cause memory outages (typically: over 10Mb).
-	 *
-	 * @param   string       $data       The data to use.
-	 * @param   null|string  $md5sum     The MD5 sum. null to auto calculate, empty string to never calculate.
-	 * @param   null|string  $sha256sum  The SHA256 sum. null to auto calculate.
-	 *
-	 * @return  Input
-	 */
-	public static function createFromData(string &$data, ?string $md5sum = null, ?string $sha256sum = null): self
-	{
-		$input = new Input();
-
-		$input->setData($data);
-		$input->setMd5sum($md5sum);
-		$input->setSha256($sha256sum);
-
-		return $input;
-	}
-
-	/**
-	 * Destructor.
-	 */
-	function __destruct()
-	{
-		if (is_resource($this->fp))
-		{
-			try
-			{
-				@fclose($this->fp);
-			}
-			catch (\Throwable $e)
-			{
-			}
-		}
-	}
-
-	/**
-	 * Returns the input type (resource, file or data)
-	 *
-	 * @return  int
-	 */
-	public function getInputType(): int
-	{
-		if (!empty($this->file))
-		{
-			return self::INPUT_FILE;
-		}
-
-		if (!empty($this->fp))
-		{
-			return self::INPUT_RESOURCE;
-		}
-
-		return self::INPUT_DATA;
-	}
-
-	/**
-	 * Return the file pointer to the data, or null if this is not a resource input
-	 *
-	 * @return  resource|null
-	 */
-	public function getFp()
-	{
-		if (!is_resource($this->fp))
-		{
-			return null;
-		}
-
-		return $this->fp;
-	}
-
-	/**
-	 * Set the file pointer (or, generally, stream resource)
-	 *
-	 * @param   resource  $fp
-	 */
-	public function setFp($fp): void
-	{
-		if (!is_resource($fp))
-		{
-			throw new Exception\InvalidFilePointer('$fp is not a file resource');
-		}
-
-		$this->fp = $fp;
-	}
-
-	/**
-	 * Get the absolute path to the input file, or null if this is not a file input
-	 *
-	 * @return  string|null
-	 */
-	public function getFile(): ?string
-	{
-		if (empty($this->file))
-		{
-			return null;
-		}
-
-		return $this->file;
-	}
-
-	/**
-	 * Set the absolute path to the input file
-	 *
-	 * @param   string  $file
-	 */
-	public function setFile(string $file): void
-	{
-		$this->file = $file;
-		$this->data = null;
-
-		if (is_resource($this->fp))
-		{
-			try
-			{
-				@fclose($this->fp);
-			}
-			catch (\Throwable $e)
-			{
-			}
-		}
-
-		$this->fp = @fopen($file, 'r');
-
-		if ($this->fp === false)
-		{
-			throw new Exception\CannotOpenFileForRead($file);
-		}
-	}
-
-	/**
-	 * Return the raw input data, or null if this is a file or stream input
-	 *
-	 * @return  string|null
-	 */
-	public function getData(): ?string
-	{
-		if (empty($this->data) && ($this->getInputType() != self::INPUT_DATA))
-		{
-			return null;
-		}
-
-		return $this->data;
-	}
-
-	/**
-	 * Set the raw input data
-	 *
-	 * @param   string  $data
-	 */
-	public function setData(string $data): void
-	{
-		$this->data = $data;
-
-		if (is_resource($this->fp))
-		{
-			try
-			{
-				@fclose($this->fp);
-			}
-			catch (\Throwable $e)
-			{
-			}
-		}
-
-		$this->file = null;
-		$this->fp   = null;
-	}
-
-	/**
-	 * Return a reference to the raw input data
-	 *
-	 * @return  string|null
-	 */
-	public function &getDataReference(): ?string
-	{
-		if (empty($this->data) && ($this->getInputType() != self::INPUT_DATA))
-		{
-			$this->data = null;
-		}
-
-		return $this->data;
-	}
-
-	/**
-	 * Set the raw input data by doing an assignment instead of memory copy. While this conserves memory you cannot use
-	 * this with hardcoded strings, method results etc without going through a variable first.
-	 *
-	 * @param   string  $data
-	 */
-	public function assignData(string &$data): void
-	{
-		$this->data = $data;
-
-		if (is_resource($this->fp))
-		{
-			try
-			{
-				@fclose($this->fp);
-			}
-			catch (\Throwable $e)
-			{
-			}
-		}
-
-		$this->file = null;
-		$this->fp   = null;
-	}
-
-	/**
-	 * Returns the size of the data to be uploaded, in bytes. If it's not already specified it will try to guess.
-	 *
-	 * @return  int
-	 */
-	public function getSize(): int
-	{
-		if ($this->size < 0)
-		{
-			$this->size = $this->getInputSize();
-		}
-
-		return $this->size;
-	}
-
-	/**
-	 * Set the size of the data to be uploaded.
-	 *
-	 * @param   int  $size
-	 */
-	public function setSize(int $size)
-	{
-		$this->size = $size;
-	}
-
-	/**
-	 * Get the MIME type of the data
-	 *
-	 * @return  string|null
-	 */
-	public function getType(): ?string
-	{
-		if (empty($this->type))
-		{
-			$this->type = 'application/octet-stream';
-
-			if ($this->getInputType() == self::INPUT_FILE)
-			{
-				$this->type = $this->getMimeType($this->file);
-			}
-		}
-
-		return $this->type;
-	}
-
-	/**
-	 * Set the MIME type of the data
-	 *
-	 * @param   string|null  $type
-	 */
-	public function setType(?string $type)
-	{
-		$this->type = $type;
-	}
-
-	/**
-	 * Get the MD5 sum of the content
-	 *
-	 * @return  null|string
-	 */
-	public function getMd5sum(): ?string
-	{
-		if ($this->md5sum === '')
-		{
-			return null;
-		}
-
-		if (is_null($this->md5sum))
-		{
-			$this->md5sum = $this->calculateMd5();
-		}
-
-		return $this->md5sum;
-	}
-
-	/**
-	 * Set the MD5 sum of the content as a base64 encoded string of the raw MD5 binary value.
-	 *
-	 * WARNING: Do not set a binary MD5 sum or a hex-encoded MD5 sum, it will result in an invalid signature error!
-	 *
-	 * Set to null to automatically calculate it from the raw data. Set to an empty string to force it to never be
-	 * calculated and no value for it set either.
-	 *
-	 * @param   string|null  $md5sum
-	 */
-	public function setMd5sum(?string $md5sum): void
-	{
-		$this->md5sum = $md5sum;
-	}
-
-	/**
-	 * Get the SHA-256 hash of the content
-	 *
-	 * @return  string
-	 */
-	public function getSha256(): string
-	{
-		if (empty($this->sha256))
-		{
-			$this->sha256 = $this->calculateSha256();
-		}
-
-		return $this->sha256;
-	}
-
-	/**
-	 * Set the SHA-256 sum of the content. It must be a lowercase hexadecimal encoded string.
-	 *
-	 * Set to null to automatically calculate it from the raw data.
-	 *
-	 * @param   string|null  $sha256
-	 */
-	public function setSha256(?string $sha256): void
-	{
-		$this->sha256 = is_null($sha256) ? null : strtolower($sha256);
-	}
-
-	/**
-	 * Get the Upload Session ID for multipart uploads
-	 *
-	 * @return  string|null
-	 */
-	public function getUploadID(): ?string
-	{
-		return $this->UploadID;
-	}
-
-	/**
-	 * Set the Upload Session ID for multipart uploads
-	 *
-	 * @param   string|null  $UploadID
-	 */
-	public function setUploadID(?string $UploadID): void
-	{
-		$this->UploadID = $UploadID;
-	}
-
-	/**
-	 * Get the part number for multipart uploads.
-	 *
-	 * Returns null if the part number has not been set yet.
-	 *
-	 * @return  int|null
-	 */
-	public function getPartNumber(): ?int
-	{
-		return $this->PartNumber;
-	}
-
-	/**
-	 * Set the part number for multipart uploads
-	 *
-	 * @param   int  $PartNumber
-	 */
-	public function setPartNumber(int $PartNumber): void
-	{
-		// Clamp the part number to integers greater than zero.
-		$this->PartNumber = max(1, (int) $PartNumber);
-	}
-
-	/**
-	 * Get the list of ETags for multipart uploads
-	 *
-	 * @return  string[]
-	 */
-	public function getEtags(): array
-	{
-		return $this->etags;
-	}
-
-	/**
-	 * Set the list of ETags for multipart uploads
-	 *
-	 * @param   string[]  $etags
-	 */
-	public function setEtags(array $etags): void
-	{
-		$this->etags = $etags;
-	}
-
-	/**
-	 * Calculates the upload size from the input source. For data it's the entire raw string length. For a file resource
-	 * it's the entire file's length. For seekable stream resources it's the remaining data from the current seek
-	 * position to EOF.
-	 *
-	 * WARNING: You should never try to specify files or resources over 2Gb minus 1 byte otherwise 32-bit versions of
-	 * PHP (anything except Linux x64 builds) will fail in unpredictable ways: the internal int representation in PHP
-	 * depends on the target platform and is typically a signed 32-bit integer.
-	 *
-	 * @return  int
-	 */
-	private function getInputSize(): int
-	{
-		switch ($this->getInputType())
-		{
-			case self::INPUT_DATA:
-				return function_exists('mb_strlen') ? mb_strlen($this->data ?? '', '8bit') : strlen($this->data ?? '');
-				break;
-
-			case self::INPUT_FILE:
-				clearstatcache(true, $this->file);
-
-				$filesize = @filesize($this->file);
-
-				return ($filesize === false) ? 0 : $filesize;
-				break;
-
-			case self::INPUT_RESOURCE:
-				$meta = stream_get_meta_data($this->fp);
-
-				if ($meta['seekable'])
-				{
-					$pos    = ftell($this->fp);
-					$endPos = fseek($this->fp, 0, SEEK_END);
-					fseek($this->fp, $pos, SEEK_SET);
-
-					return $endPos - $pos + 1;
-				}
-
-				break;
-		}
-
-		return 0;
-	}
-
-	/**
-	 * Get the MIME type of a file
-	 *
-	 * @param   string  $file  The absolute path to the file for which we want to get the MIME type
-	 *
-	 * @return  string  The MIME type of the file
-	 */
-	private function getMimeType(string $file): string
-	{
-		$type = false;
-
-		// Fileinfo documentation says fileinfo_open() will use the
-		// MAGIC env var for the magic file
-		if (extension_loaded('fileinfo') && isset($_ENV['MAGIC']) &&
-			($finfo = finfo_open(FILEINFO_MIME, $_ENV['MAGIC'])) !== false
-		)
-		{
-			if (($type = finfo_file($finfo, $file)) !== false)
-			{
-				// Remove the charset and grab the last content-type
-				$type = explode(' ', str_replace('; charset=', ';charset=', $type));
-				$type = array_pop($type);
-				$type = explode(';', $type);
-				$type = trim(array_shift($type));
-			}
-
-			finfo_close($finfo);
-		}
-		elseif (function_exists('mime_content_type'))
-		{
-			$type = trim(mime_content_type($file));
-		}
-
-		if ($type !== false && strlen($type) > 0)
-		{
-			return $type;
-		}
-
-		// Otherwise do it the old fashioned way
-		static $exts = [
-			'jpg'  => 'image/jpeg',
-			'gif'  => 'image/gif',
-			'png'  => 'image/png',
-			'tif'  => 'image/tiff',
-			'tiff' => 'image/tiff',
-			'ico'  => 'image/x-icon',
-			'swf'  => 'application/x-shockwave-flash',
-			'pdf'  => 'application/pdf',
-			'zip'  => 'application/zip',
-			'gz'   => 'application/x-gzip',
-			'tar'  => 'application/x-tar',
-			'bz'   => 'application/x-bzip',
-			'bz2'  => 'application/x-bzip2',
-			'txt'  => 'text/plain',
-			'asc'  => 'text/plain',
-			'htm'  => 'text/html',
-			'html' => 'text/html',
-			'css'  => 'text/css',
-			'js'   => 'text/javascript',
-			'xml'  => 'text/xml',
-			'xsl'  => 'application/xsl+xml',
-			'ogg'  => 'application/ogg',
-			'mp3'  => 'audio/mpeg',
-			'wav'  => 'audio/x-wav',
-			'avi'  => 'video/x-msvideo',
-			'mpg'  => 'video/mpeg',
-			'mpeg' => 'video/mpeg',
-			'mov'  => 'video/quicktime',
-			'flv'  => 'video/x-flv',
-			'php'  => 'text/x-php',
-		];
-
-		$ext = strtolower(pathInfo($file, PATHINFO_EXTENSION));
-
-		return $exts[$ext] ?? 'application/octet-stream';
-	}
-
-	/**
-	 * Calculate the MD5 sum of the input data
-	 *
-	 * @return  string  Base-64 encoded MD5 sum
-	 */
-	private function calculateMd5(): string
-	{
-		switch ($this->getInputType())
-		{
-			case self::INPUT_DATA:
-				return base64_encode(md5($this->data, true));
-				break;
-
-			case self::INPUT_FILE:
-				return base64_encode(md5_file($this->file, true));
-				break;
-
-			case self::INPUT_RESOURCE:
-				$ctx   = hash_init('md5');
-				$pos   = ftell($this->fp);
-				$size  = $this->getSize();
-				$done  = 0;
-				$batch = min(1048576, $size);
-
-				while ($done < $size)
-				{
-					$toRead = min($batch, $done - $size);
-					$data   = @fread($this->fp, $toRead);
-					hash_update($ctx, $data);
-					unset($data);
-				}
-
-				fseek($this->fp, $pos, SEEK_SET);
-
-				return base64_encode(hash_final($ctx, true));
-
-				break;
-		}
-
-		return '';
-	}
-
-	/**
-	 * Calcualte the SHA256 data of the input data
-	 *
-	 * @return  string  Lowercase hex representation of the SHA-256 sum
-	 */
-	private function calculateSha256(): string
-	{
-		$inputType = $this->getInputType();
-		switch ($inputType)
-		{
-			case self::INPUT_DATA:
-				return hash('sha256', $this->data, false);
-				break;
-
-			case self::INPUT_FILE:
-			case self::INPUT_RESOURCE:
-				if ($inputType == self::INPUT_FILE)
-				{
-					$filesize = @filesize($this->file);
-					$fPos     = @ftell($this->fp);
-
-					if (($filesize == $this->getSize()) && ($fPos === 0))
-					{
-						return hash_file('sha256', $this->file, false);
-					}
-				}
-
-				$ctx   = hash_init('sha256');
-				$pos   = ftell($this->fp);
-				$size  = $this->getSize();
-				$done  = 0;
-				$batch = min(1048576, $size);
-
-				while ($done < $size)
-				{
-					$toRead = min($batch, $size - $done);
-					$data   = @fread($this->fp, $toRead);
-					$done   += $toRead;
-					hash_update($ctx, $data);
-					unset($data);
-				}
-
-				fseek($this->fp, $pos, SEEK_SET);
-
-				return hash_final($ctx, false);
-
-				break;
-		}
-
-		return '';
-	}
-}
diff --git a/s3_storage/vendor/akeeba/s3/src/Request.php b/s3_storage/vendor/akeeba/s3/src/Request.php
deleted file mode 100644
index d9b1833a..00000000
--- a/s3_storage/vendor/akeeba/s3/src/Request.php
+++ /dev/null
@@ -1,823 +0,0 @@
-<?php
-/**
- * Akeeba Engine
- *
- * @package   akeebaengine
- * @copyright Copyright (c)2006-2024 Nicholas K. Dionysopoulos / Akeeba Ltd
- * @license   GNU General Public License version 3, or later
- */
-
-namespace Akeeba\S3;
-
-use Akeeba\S3\Response\Error;
-
-// Protection against direct access
-defined('AKEEBAENGINE') || die();
-
-
-class Request
-{
-	/**
-	 * The HTTP verb to use
-	 *
-	 * @var  string
-	 */
-	private $verb = 'GET';
-
-	/**
-	 * The bucket we are using
-	 *
-	 * @var  string
-	 */
-	private $bucket = '';
-
-	/**
-	 * The object URI, relative to the bucket's root
-	 *
-	 * @var  string
-	 */
-	private $uri = '';
-
-	/**
-	 * The remote resource we are querying
-	 *
-	 * @var  string
-	 */
-	private $resource = '';
-
-	/**
-	 * Query string parameters
-	 *
-	 * @var  array
-	 */
-	private $parameters = [];
-
-	/**
-	 * Amazon-specific headers to pass to the request
-	 *
-	 * @var  array
-	 */
-	private $amzHeaders = [];
-
-	/**
-	 * Regular HTTP headers to send in the request
-	 *
-	 * @var  array
-	 */
-	private $headers = [
-		'Host'         => '',
-		'Date'         => '',
-		'Content-MD5'  => '',
-		'Content-Type' => '',
-	];
-
-	/**
-	 * Input data for the request
-	 *
-	 * @var  Input
-	 */
-	private $input = null;
-
-	/**
-	 * The file resource we are writing data to
-	 *
-	 * @var  resource|null
-	 */
-	private $fp = null;
-
-	/**
-	 * The Amazon S3 configuration object
-	 *
-	 * @var Configuration
-	 */
-	private $configuration = null;
-
-	/**
-	 * The response object
-	 *
-	 * @var  Response
-	 */
-	private $response = null;
-
-	/**
-	 * The location of the CA certificate cache. It can be a file or a directory. If it's not specified, the location
-	 * set in AKEEBA_CACERT_PEM will be used
-	 *
-	 * @var  string|null
-	 */
-	private $caCertLocation = null;
-
-	/**
-	 * Constructor
-	 *
-	 * @param   string         $verb           HTTP verb, e.g. 'POST'
-	 * @param   string         $bucket         Bucket name, e.g. 'example-bucket'
-	 * @param   string         $uri            Object URI
-	 * @param   Configuration  $configuration  The Amazon S3 configuration object to use
-	 *
-	 * @return  void
-	 */
-	function __construct(string $verb, string $bucket, string $uri, Configuration $configuration)
-	{
-		$this->verb          = $verb;
-		$this->bucket        = $bucket;
-		$this->uri           = '/';
-		$this->configuration = $configuration;
-
-		if (!empty($uri))
-		{
-			$this->uri = '/' . str_replace('%2F', '/', rawurlencode($uri));
-		}
-
-		$this->headers['Host'] = $this->getHostName($configuration, $this->bucket);
-		$this->resource        = $this->uri;
-
-		if (($this->bucket !== '') && $configuration->getUseLegacyPathStyle())
-		{
-			$this->resource = '/' . $this->bucket . $this->uri;
-
-			$this->uri = $this->resource;
-		}
-
-		// The date must always be added as a header
-		$this->headers['Date'] = gmdate('D, d M Y H:i:s O');
-
-		// S3-"compatible" services use a different date format. Because why not?
-		if ($this->configuration->getAlternateDateHeaderFormat() && strpos($this->headers['Host'], '.amazonaws.com') === false)
-		{
-			$this->headers['Date'] = gmdate('D, d M Y H:i:s T');
-		}
-
-		// If there is a security token we need to set up the X-Amz-Security-Token header
-		$token = $this->configuration->getToken();
-
-		if (!empty($token))
-		{
-			$this->setAmzHeader('x-amz-security-token', $token);
-		}
-
-		// Initialize the response object
-		$this->response = new Response();
-	}
-
-	/**
-	 * Get the input object
-	 *
-	 * @return  Input|null
-	 */
-	public function getInput(): ?Input
-	{
-		return $this->input;
-	}
-
-	/**
-	 * Set the input object
-	 *
-	 * @param   Input  $input
-	 *
-	 * @return  void
-	 */
-	public function setInput(Input $input): void
-	{
-		$this->input = $input;
-	}
-
-	/**
-	 * Set a request parameter
-	 *
-	 * @param   string       $key    The parameter name
-	 * @param   string|null  $value  The parameter value
-	 *
-	 * @return  void
-	 */
-	public function setParameter(string $key, ?string $value): void
-	{
-		$this->parameters[$key] = $value;
-	}
-
-	/**
-	 * Set a request header
-	 *
-	 * @param   string  $key    The header name
-	 * @param   string  $value  The header value
-	 *
-	 * @return  void
-	 */
-	public function setHeader(string $key, string $value): void
-	{
-		$this->headers[$key] = $value;
-	}
-
-	/**
-	 * Set an x-amz-meta-* header
-	 *
-	 * @param   string  $key    The header name
-	 * @param   string  $value  The header value
-	 *
-	 * @return  void
-	 */
-	public function setAmzHeader(string $key, string $value): void
-	{
-		$this->amzHeaders[$key] = $value;
-	}
-
-	/**
-	 * Get the HTTP verb of this request
-	 *
-	 * @return  string
-	 */
-	public function getVerb(): string
-	{
-		return $this->verb;
-	}
-
-	/**
-	 * Get the S3 bucket's name
-	 *
-	 * @return  string
-	 */
-	public function getBucket(): string
-	{
-		return $this->bucket;
-	}
-
-	/**
-	 * Get the absolute URI of the resource we're accessing
-	 *
-	 * @return  string
-	 */
-	public function getResource(): string
-	{
-		return $this->resource;
-	}
-
-	/**
-	 * Get the parameters array
-	 *
-	 * @return  array
-	 */
-	public function getParameters(): array
-	{
-		return $this->parameters;
-	}
-
-	/**
-	 * Get the Amazon headers array
-	 *
-	 * @return  array
-	 */
-	public function getAmzHeaders(): array
-	{
-		return $this->amzHeaders;
-	}
-
-	/**
-	 * Get the other headers array
-	 *
-	 * @return  array
-	 */
-	public function getHeaders(): array
-	{
-		return $this->headers;
-	}
-
-	/**
-	 * Get a reference to the Amazon configuration object
-	 *
-	 * @return  Configuration
-	 */
-	public function getConfiguration(): Configuration
-	{
-		return $this->configuration;
-	}
-
-	/**
-	 * Get the file pointer resource (for PUT and POST requests)
-	 *
-	 * @return  resource|null
-	 */
-	public function &getFp()
-	{
-		return $this->fp;
-	}
-
-	/**
-	 * Set the data resource as a file pointer
-	 *
-	 * @param   resource  $fp
-	 */
-	public function setFp($fp): void
-	{
-		$this->fp = $fp;
-	}
-
-	/**
-	 * Get the certificate authority location
-	 *
-	 * @return  string|null
-	 */
-	public function getCaCertLocation(): ?string
-	{
-		if (!empty($this->caCertLocation))
-		{
-			return $this->caCertLocation;
-		}
-
-		if (defined('AKEEBA_CACERT_PEM'))
-		{
-			return AKEEBA_CACERT_PEM;
-		}
-
-		return null;
-	}
-
-	/**
-	 * @param   null|string  $caCertLocation
-	 */
-	public function setCaCertLocation(?string $caCertLocation): void
-	{
-		if (empty($caCertLocation))
-		{
-			$caCertLocation = null;
-		}
-
-		if (!is_null($caCertLocation) && !is_file($caCertLocation) && !is_dir($caCertLocation))
-		{
-			$caCertLocation = null;
-		}
-
-		$this->caCertLocation = $caCertLocation;
-	}
-
-	/**
-	 * Get a pre-signed URL for the request.
-	 *
-	 * Typically used to pre-sign GET requests to objects, i.e. give shareable pre-authorized URLs for downloading
-	 * private or otherwise inaccessible files from S3.
-	 *
-	 * @param   int|null  $lifetime  Lifetime in seconds
-	 * @param   bool      $https     Use HTTPS ($hostBucket should be false for SSL verification)?
-	 *
-	 * @return  string  The authenticated URL, complete with signature
-	 */
-	public function getAuthenticatedURL(?int $lifetime = null, bool $https = false): string
-	{
-		$this->processParametersIntoResource();
-		$signer = Signature::getSignatureObject($this, $this->configuration->getSignatureMethod());
-
-		return $signer->getAuthenticatedURL($lifetime, $https);
-	}
-
-	/**
-	 * Get the S3 response
-	 *
-	 * @return  Response
-	 */
-	public function getResponse(bool $rawResponse = false): Response
-	{
-		$this->processParametersIntoResource();
-
-		$schema = 'http://';
-
-		if ($this->configuration->isSSL())
-		{
-			$schema = 'https://';
-		}
-
-		// Very special case. IF the URI ends in /?location AND the region is us-east-1 (Host is
-		// s3-external-1.amazonaws.com) THEN the host MUST become s3.amazonaws.com for the request to work. This is case
-		// of us not knowing the region of the bucket, therefore having to use a special endpoint which lets us query
-		// the region of the bucket without knowing its region. See
-		// http://stackoverflow.com/questions/27091816/retrieve-buckets-objects-without-knowing-buckets-region-with-aws-s3-rest-api
-		if ((substr($this->uri, -10) == '/?location') && ($this->headers['Host'] == 's3-external-1.amazonaws.com'))
-		{
-			$this->headers['Host'] = 's3.amazonaws.com';
-		}
-
-		$url = $schema . $this->headers['Host'] . $this->uri;
-
-		// Basic setup
-		$curl = curl_init();
-		curl_setopt($curl, CURLOPT_USERAGENT, 'AkeebaBackupProfessional/S3PostProcessor');
-
-		if ($this->configuration->isSSL())
-		{
-			// Set the CA certificate cache location
-			$caCert = $this->getCaCertLocation();
-
-			if (!empty($caCert))
-			{
-				if (is_dir($caCert))
-				{
-					@curl_setopt($curl, CURLOPT_CAPATH, $caCert);
-				}
-				else
-				{
-					@curl_setopt($curl, CURLOPT_CAINFO, $caCert);
-				}
-			}
-
-			/**
-			 * Verify the host name in the certificate and the certificate itself.
-			 *
-			 * Caveat: if your bucket contains dots in the name we have to turn off host verification due to the way the
-			 * S3 SSL certificates are set up.
-			 */
-			$isAmazonS3  = (substr($this->headers['Host'], -14) == '.amazonaws.com')
-			               || substr(
-				                  $this->headers['Host'], -16
-			                  ) == 'amazonaws.com.cn';
-			$tooManyDots = substr_count($this->headers['Host'], '.') > 4;
-
-			$verifyHost = ($isAmazonS3 && $tooManyDots) ? 0 : 2;
-
-			curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, $verifyHost);
-			curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, true);
-		}
-
-		curl_setopt($curl, CURLOPT_URL, $url);
-
-		/**
-		 * Set the optional x-amz-date header instead of the standard HTTP Date header.
-		 *
-		 * Amazon S3 proper expects to get the date from the Date header. It also allows you to instead use the optional
-		 * X-Amz-Date header as a means to resolve situations where your HTTP library does not let you control the
-		 * standard Date header. In other words, it accepts both, it encourages the standard Date header, but it will
-		 * give priority to the X-Amz-Date header to help you get out of a sticky situation.
-		 *
-		 * Unfortunately, third party services which claim to be "S3-compatible" are written by people with poor reading
-		 * skills or, more likely, under unrealistic time constraints to deliver working code. They are implementing the
-		 * date handling behaviout wrong. Instead of using the Date header unless the X-Amz-Date header is set, they
-		 * **expect** to only ever see the X-Amz-Date header. If it's missing, they do not fall back to the standard
-		 * Date header; they just spit out a message about the signature being wrong. Wasabi and ExoScale are two prime
-		 * examples of that, and only when using v2 signatures.
-		 *
-		 * To avoid this problem, we are now defaulting to always using the X-Amz-Date header everywhere. If you want to
-		 * revert to using the Date header with S3 proper please use setUseHTTPDateHeader(true) to your configuration
-		 * object. In this case DO NOT set the X-Amz-Date header yourself, or you're going to have a *really* bad time.
-		 */
-		if (!$this->configuration->getUseHTTPDateHeader())
-		{
-			$this->amzHeaders['x-amz-date'] = (new \DateTime($this->headers['Date']))->format('Ymd\THis\Z');
-
-			unset ($this->headers['Date']);
-		}
-
-		/**
-		 * Remove empty headers.
-		 *
-		 * While Amazon S3 proper and most third party implementations have no problem with that, there a few of them
-		 * (such as Synology C2) which choke on empty headers.
-		 */
-		$this->headers = array_filter($this->headers);
-
-		// Get the request signature
-		$signer = Signature::getSignatureObject($this, $this->configuration->getSignatureMethod());
-		$signer->preProcessHeaders($this->headers, $this->amzHeaders);
-
-		// Headers
-		$headers = [];
-
-		foreach ($this->amzHeaders as $header => $value)
-		{
-			if (strlen($value) > 0)
-			{
-				$headers[] = $header . ': ' . $value;
-			}
-		}
-
-		foreach ($this->headers as $header => $value)
-		{
-			if (strlen($value) > 0)
-			{
-				$headers[] = $header . ': ' . $value;
-			}
-		}
-
-		$headers[] = 'Authorization: ' . $signer->getAuthorizationHeader();
-
-		curl_setopt($curl, CURLOPT_HTTPHEADER, $headers);
-		curl_setopt($curl, CURLOPT_HEADER, false);
-		curl_setopt($curl, CURLOPT_RETURNTRANSFER, false);
-		curl_setopt($curl, CURLOPT_WRITEFUNCTION, [$this, '__responseWriteCallback']);
-		curl_setopt($curl, CURLOPT_HEADERFUNCTION, [$this, '__responseHeaderCallback']);
-		curl_setopt($curl, CURLOPT_FOLLOWLOCATION, true);
-
-		// Request types
-		switch ($this->verb)
-		{
-			case 'GET':
-				break;
-
-			case 'PUT':
-			case 'POST':
-				if (!is_object($this->input) || !($this->input instanceof Input))
-				{
-					$this->input = new Input();
-				}
-
-				$size = $this->input->getSize();
-				$type = $this->input->getInputType();
-
-				if ($type == Input::INPUT_DATA)
-				{
-					curl_setopt($curl, CURLOPT_CUSTOMREQUEST, $this->verb);
-
-					$data = $this->input->getDataReference();
-
-					if (strlen($data ?? ''))
-					{
-						curl_setopt($curl, CURLOPT_POSTFIELDS, $data);
-					}
-
-					if ($size > 0)
-					{
-						curl_setopt($curl, CURLOPT_BUFFERSIZE, $size);
-					}
-				}
-				else
-				{
-					curl_setopt($curl, CURLOPT_PUT, true);
-					curl_setopt($curl, CURLOPT_INFILE, $this->input->getFp());
-
-					if ($size > 0)
-					{
-						curl_setopt($curl, CURLOPT_INFILESIZE, $size);
-					}
-				}
-
-
-				break;
-
-			case 'HEAD':
-				curl_setopt($curl, CURLOPT_CUSTOMREQUEST, 'HEAD');
-				curl_setopt($curl, CURLOPT_NOBODY, true);
-				break;
-
-			case 'DELETE':
-				curl_setopt($curl, CURLOPT_CUSTOMREQUEST, 'DELETE');
-				break;
-
-			default:
-				break;
-		}
-
-		// Execute, grab errors
-		$this->response->resetBody();
-
-		if (curl_exec($curl))
-		{
-			$this->response->code = curl_getinfo($curl, CURLINFO_HTTP_CODE);
-		}
-		else
-		{
-			$this->response->error = new Error(
-				curl_errno($curl),
-				curl_error($curl),
-				$this->resource
-			);
-		}
-
-		@curl_close($curl);
-
-		// Set the body data
-		$this->response->finaliseBody($rawResponse);
-
-		// Clean up file resources
-		if (!is_null($this->fp) && is_resource($this->fp))
-		{
-			try
-			{
-				@fclose($this->fp);
-			}
-			catch (\Throwable $e)
-			{
-			}
-		}
-
-		return $this->response;
-	}
-
-
-	/**
-	 * cURL write callback
-	 *
-	 * @param   resource   &$curl  cURL resource
-	 * @param   string     &$data  Data
-	 *
-	 * @return  int  Length in bytes
-	 */
-	protected function __responseWriteCallback($curl, string $data): int
-	{
-		if (in_array($this->response->code, [0, 200, 206]) && !is_null($this->fp) && is_resource($this->fp))
-		{
-			return fwrite($this->fp, $data);
-		}
-
-		$this->response->addToBody($data);
-
-		return strlen($data);
-	}
-
-	/**
-	 * cURL header callback
-	 *
-	 * @param   resource   $curl  cURL resource
-	 * @param   string    &$data  Data
-	 *
-	 * @return  int  Length in bytes
-	 */
-	protected function __responseHeaderCallback($curl, string $data): int
-	{
-		if (($strlen = strlen($data)) <= 2)
-		{
-			return $strlen;
-		}
-
-		if (substr($data, 0, 4) == 'HTTP')
-		{
-			$this->response->code = (int) substr($data, 9, 3);
-
-			return $strlen;
-		}
-
-		// Ignore malformed headers without a value.
-		if (strpos($data, ':') === false)
-		{
-			return $strlen;
-		}
-
-		[$header, $value] = explode(':', trim($data), 2);
-		$header = trim($header ?? '');
-		$value  = trim($value ?? '');
-
-		switch (strtolower($header))
-		{
-			case 'last-modified':
-				$this->response->setHeader('time', strtotime($value));
-				break;
-
-			case 'content-length':
-				$this->response->setHeader('size', (int) $value);
-				break;
-
-			case 'content-type':
-				$this->response->setHeader('type', $value);
-				break;
-
-			case 'etag':
-				$this->response->setHeader('hash', trim($value, '"'));
-				break;
-
-			default:
-				$this->response->setHeader(strtolower($header), is_numeric($value) ? (int) $value : $value);
-
-				if (preg_match('/^x-amz-meta-.*$/', $header))
-				{
-					$this->setHeader($header, is_numeric($value) ? (int) $value : $value);
-				}
-				break;
-		}
-
-		return $strlen;
-	}
-
-	/**
-	 * Processes $this->parameters as a query string into $this->resource
-	 *
-	 * @return  void
-	 */
-	private function processParametersIntoResource(): void
-	{
-		if (count($this->parameters))
-		{
-			$query = substr($this->uri, -1) !== '?' ? '?' : '&';
-
-			ksort($this->parameters);
-
-			foreach ($this->parameters as $var => $value)
-			{
-				if ($value == null || $value == '')
-				{
-					$query .= $var . '&';
-				}
-				else
-				{
-					// Parameters must be URL-encoded
-					$query .= $var . '=' . rawurlencode($value) . '&';
-				}
-			}
-
-			$query     = substr($query, 0, -1);
-			$this->uri .= $query;
-
-			if (array_key_exists('acl', $this->parameters) || array_key_exists('location', $this->parameters)
-			    || array_key_exists('torrent', $this->parameters)
-			    || array_key_exists('logging', $this->parameters)
-			    || array_key_exists('uploads', $this->parameters)
-			    || array_key_exists('uploadId', $this->parameters)
-			    || array_key_exists('partNumber', $this->parameters)
-			)
-			{
-				$this->resource .= $query;
-			}
-		}
-	}
-
-	/**
-	 * Get the region-specific hostname for an operation given a configuration and a bucket name. This ensures we can
-	 * always use an HTTPS connection, even with buckets containing dots in their names, without SSL certificate host
-	 * name validation issues.
-	 *
-	 * Please note that this requires the pathStyle flag to be set in Configuration because Amazon RECOMMENDS using the
-	 * virtual-hosted style request where applicable. See http://docs.aws.amazon.com/AmazonS3/latest/API/APIRest.html
-	 * Quoting this documentation:
-	 * "Although the path-style is still supported for legacy applications, we recommend using the virtual-hosted style
-	 * where applicable."
-	 *
-	 * @param   Configuration  $configuration
-	 * @param   string         $bucket
-	 *
-	 * @return  string
-	 */
-	private function getHostName(Configuration $configuration, string $bucket): string
-	{
-		// http://docs.aws.amazon.com/general/latest/gr/rande.html#s3_region
-		$endpoint = $configuration->getEndpoint();
-		$region   = $configuration->getRegion();
-
-		// If it's a bucket in China we need to use a different endpoint
-		if (($endpoint == 's3.amazonaws.com') && (substr($region, 0, 3) == 'cn-'))
-		{
-			$endpoint = 'amazonaws.com.cn';
-		}
-
-		/**
-		 * If there is no bucket we use the default endpoint, whatever it is. For Amazon S3 this format is only used
-		 * when we are making account-level, cross-region requests, e.g. list all buckets. For S3-compatible APIs it
-		 * depends on the API, but generally it's just for listing available buckets.
-		 */
-		if (empty($bucket))
-		{
-			return $endpoint;
-		}
-
-		/**
-		 * Are we using v2 signatures? In this case we use the endpoint defined by the user without translating it.
-		 */
-		if ($configuration->getSignatureMethod() != 'v4')
-		{
-			// Legacy path style: the hostname is the endpoint
-			if ($configuration->getUseLegacyPathStyle())
-			{
-				return $endpoint;
-			}
-
-			// Virtual hosting style: the hostname is the bucket, dot and endpoint.
-			return $bucket . '.' . $endpoint;
-		}
-
-		/**
-		 * Only applies to Amazon S3 proper.
-		 *
-		 * When using the Amazon S3 with the v4 signature API we have to use a different hostname per region. The
-		 * mapping can be found in https://docs.aws.amazon.com/general/latest/gr/s3.html#s3_region
-		 *
-		 * This means changing the endpoint to s3.REGION.amazonaws.com with the following exceptions:
-		 * For China: s3.REGION.amazonaws.com.cn
-		 *
-		 * v4 signing does NOT support non-Amazon endpoints.
-		 */
-		if (in_array($endpoint, ['s3.amazonaws.com', 'amazonaws.com.cn']))
-		{
-			// Most endpoints: s3-REGION.amazonaws.com
-			$regionalEndpoint = $region . '.amazonaws.com';
-
-			// Exception: China
-			if (substr($region, 0, 3) == 'cn-')
-			{
-				// Chinese endpoint, e.g.: s3.cn-north-1.amazonaws.com.cn
-				$regionalEndpoint = $regionalEndpoint . '.cn';
-			}
-
-			// If dual-stack URLs are enabled then prepend the endpoint
-			if ($configuration->getDualstackUrl())
-			{
-				$endpoint = 's3.dualstack.' . $regionalEndpoint;
-			}
-			else
-			{
-				$endpoint = 's3.' . $regionalEndpoint;
-			}
-		}
-
-		// Legacy path style access: return just the endpoint
-		if ($configuration->getUseLegacyPathStyle())
-		{
-			return $endpoint;
-		}
-
-		// Recommended virtual hosting access: bucket, dot, endpoint.
-		return $bucket . '.' . $endpoint;
-	}
-}
diff --git a/s3_storage/vendor/akeeba/s3/src/Response.php b/s3_storage/vendor/akeeba/s3/src/Response.php
deleted file mode 100644
index 56bb5d83..00000000
--- a/s3_storage/vendor/akeeba/s3/src/Response.php
+++ /dev/null
@@ -1,351 +0,0 @@
-<?php
-/**
- * Akeeba Engine
- *
- * @package   akeebaengine
- * @copyright Copyright (c)2006-2024 Nicholas K. Dionysopoulos / Akeeba Ltd
- * @license   GNU General Public License version 3, or later
- */
-
-namespace Akeeba\S3;
-
-use Akeeba\S3\Exception\PropertyNotFound;
-use Akeeba\S3\Response\Error;
-use SimpleXMLElement;
-
-// Protection against direct access
-defined('AKEEBAENGINE') || die();
-
-/**
- * Amazon S3 API response object
- *
- * @property   Error                        $error    Response error object
- * @property   string|SimpleXMLElement|null $body     Body data
- * @property   int                          $code     Response code
- * @property   array                        $headers  Any headers we may have
- */
-class Response
-{
-	/**
-	 * Error object
-	 *
-	 * @var  Error
-	 */
-	private $error = null;
-
-	/**
-	 * Response body
-	 *
-	 * @var  string|SimpleXMLElement|null
-	 */
-	private $body = null;
-
-	/**
-	 * Status code of the response, e.g. 200 for OK, 403 for Forbidden etc
-	 *
-	 * @var  int
-	 */
-	private $code = 0;
-
-	/**
-	 * Response headers
-	 *
-	 * @var  array
-	 */
-	private $headers = [];
-
-	/**
-	 * Response constructor.
-	 */
-	public function __construct()
-	{
-		$this->error = new Error();
-	}
-
-	/**
-	 * Is this an error response?
-	 *
-	 * @return  bool
-	 */
-	public function isError(): bool
-	{
-		return is_null($this->error) || $this->error->isError();
-	}
-
-	/**
-	 * Does this response have a body?
-	 *
-	 * @return  bool
-	 */
-	public function hasBody(): bool
-	{
-		return !empty($this->body);
-	}
-
-	/**
-	 * Get the response error object
-	 *
-	 * @return  Error
-	 */
-	public function getError(): Error
-	{
-		return $this->error;
-	}
-
-	/**
-	 * Set the response error object
-	 *
-	 * @param   Error  $error
-	 */
-	public function setError(Error $error): void
-	{
-		$this->error = $error;
-	}
-
-	/**
-	 * Get the response body
-	 *
-	 * If there is no body set up you get NULL.
-	 *
-	 * If the body is binary data (e.g. downloading a file) or other non-XML data you get a string.
-	 *
-	 * If the body was an XML string – the standard Amazon S3 REST API response type – you get a SimpleXMLElement
-	 * object.
-	 *
-	 * @return string|SimpleXMLElement|null
-	 */
-	public function getBody()
-	{
-		return $this->body;
-	}
-
-	/**
-	 * Set the response body. If it's a string we'll try to parse it as XML.
-	 *
-	 * @param   string|SimpleXMLElement|null  $body
-	 */
-	public function setBody($body, bool $rawResponse = false): void
-	{
-		$this->body = null;
-
-		if (empty($body))
-		{
-			return;
-		}
-
-		$this->body = $body;
-
-		$this->finaliseBody($rawResponse);
-	}
-
-	public function resetBody(): void
-	{
-		$this->body = null;
-	}
-
-	public function addToBody(string $data): void
-	{
-		if (empty($this->body))
-		{
-			$this->body = '';
-		}
-
-		$this->body .= $data;
-	}
-
-	public function finaliseBody(bool $rawResponse = false): void
-	{
-		if (!$this->hasBody())
-		{
-			return;
-		}
-
-		if (!isset($this->headers['type']))
-		{
-			$this->headers['type'] = 'text/plain';
-		}
-
-		if (
-			!$rawResponse
-			&& is_string($this->body)
-			&&
-			(
-				($this->headers['type'] == 'application/xml')
-				|| (substr($this->body, 0, 5) == '<?xml')
-			)
-		)
-		{
-			$this->body = simplexml_load_string($this->body);
-		}
-
-		if (is_object($this->body) && ($this->body instanceof SimpleXMLElement))
-		{
-			$this->parseBody();
-		}
-	}
-
-	/**
-	 * Returns the status code of the response
-	 *
-	 * @return  int
-	 */
-	public function getCode(): int
-	{
-		return $this->code;
-	}
-
-	/**
-	 * Sets the status code of the response
-	 *
-	 * @param   int  $code
-	 */
-	public function setCode(int $code): void
-	{
-		$this->code = $code;
-	}
-
-	/**
-	 * Get the response headers
-	 *
-	 * @return  array
-	 */
-	public function getHeaders(): array
-	{
-		return $this->headers;
-	}
-
-	/**
-	 * Set the response headers
-	 *
-	 * @param   array  $headers
-	 */
-	public function setHeaders(array $headers): void
-	{
-		$this->headers = $headers;
-	}
-
-	/**
-	 * Set a single header
-	 *
-	 * @param   string  $name   The header name
-	 * @param   string  $value  The header value
-	 *
-	 * @return  void
-	 */
-	public function setHeader(string $name, string $value): void
-	{
-		$this->headers[$name] = $value;
-	}
-
-	/**
-	 * Does a header by this name exist?
-	 *
-	 * @param   string  $name  The header to look for
-	 *
-	 * @return  bool  True if it exists
-	 */
-	public function hasHeader(string $name): bool
-	{
-		return array_key_exists($name, $this->headers);
-	}
-
-	/**
-	 * Unset a response header
-	 *
-	 * @param   string  $name  The header to unset
-	 *
-	 * @return  void
-	 */
-	public function unsetHeader(string $name): void
-	{
-		if ($this->hasHeader($name))
-		{
-			unset ($this->headers[$name]);
-		}
-	}
-
-	/**
-	 * Magic getter for the protected properties
-	 *
-	 * @param   string  $name
-	 *
-	 * @return  mixed
-	 */
-	public function __get(string $name)
-	{
-		switch ($name)
-		{
-			case 'error':
-				return $this->getError();
-				break;
-
-			case 'body':
-				return $this->getBody();
-				break;
-
-			case 'code':
-				return $this->getCode();
-				break;
-
-			case 'headers':
-				return $this->getHeaders();
-				break;
-		}
-
-		throw new PropertyNotFound("Property $name not found in " . get_class($this));
-	}
-
-	/**
-	 * Magic setter for the protected properties
-	 *
-	 * @param   string  $name   The name of the property
-	 * @param   mixed   $value  The value of the property
-	 *
-	 * @return  void
-	 */
-	public function __set(string $name, $value): void
-	{
-		switch ($name)
-		{
-			case 'error':
-				$this->setError($value);
-				break;
-
-			case 'body':
-				$this->setBody($value);
-				break;
-
-			case 'code':
-				$this->setCode($value);
-				break;
-
-			case 'headers':
-				$this->setHeaders($value);
-				break;
-
-			default:
-				throw new PropertyNotFound("Property $name not found in " . get_class($this));
-		}
-	}
-
-	/**
-	 * Scans the SimpleXMLElement body for errors and propagates them to the Error object
-	 */
-	protected function parseBody(): void
-	{
-		if (!in_array($this->code, [200, 204]) &&
-			isset($this->body->Code, $this->body->Message)
-		)
-		{
-			$this->error = new Error(
-				500,
-				(string) $this->body->Code . ':' . (string) $this->body->Message
-			);
-
-			if (isset($this->body->Resource))
-			{
-				$this->error->setResource((string) $this->body->Resource);
-			}
-		}
-	}
-}
diff --git a/s3_storage/vendor/akeeba/s3/src/Response/Error.php b/s3_storage/vendor/akeeba/s3/src/Response/Error.php
deleted file mode 100644
index f316b6ae..00000000
--- a/s3_storage/vendor/akeeba/s3/src/Response/Error.php
+++ /dev/null
@@ -1,139 +0,0 @@
-<?php
-/**
- * Akeeba Engine
- *
- * @package   akeebaengine
- * @copyright Copyright (c)2006-2024 Nicholas K. Dionysopoulos / Akeeba Ltd
- * @license   GNU General Public License version 3, or later
- */
-
-namespace Akeeba\S3\Response;
-
-// Protection against direct access
-defined('AKEEBAENGINE') || die();
-
-/**
- * S3 response error object
- */
-class Error
-{
-	/**
-	 * Error code
-	 *
-	 * @var  int
-	 */
-	private $code = 0;
-
-	/**
-	 * Error message
-	 *
-	 * @var  string
-	 */
-	private $message = '';
-
-	/**
-	 * URI to the resource that throws the error
-	 *
-	 * @var  string
-	 */
-	private $resource = '';
-
-	/**
-	 * Create a new error object
-	 *
-	 * @param   int     $code      The error code
-	 * @param   string  $message   The error message
-	 * @param   string  $resource  The URI to the resource throwing the error
-	 *
-	 * @return  void
-	 */
-	function __construct($code = 0, $message = '', $resource = '')
-	{
-		$this->setCode($code);
-		$this->setMessage($message);
-		$this->setResource($resource);
-	}
-
-	/**
-	 * Get the error code
-	 *
-	 * @return  int
-	 */
-	public function getCode(): int
-	{
-		return $this->code;
-	}
-
-	/**
-	 * Set the error code
-	 *
-	 * @param   int  $code  Set to zeroo or a negative value to clear errors
-	 *
-	 * @return  void
-	 */
-	public function setCode(int $code): void
-	{
-		if ($code <= 0)
-		{
-			$code = 0;
-			$this->setMessage('');
-			$this->setResource('');
-		}
-
-		$this->code = $code;
-	}
-
-	/**
-	 * Get the error message
-	 *
-	 * @return  string
-	 */
-	public function getMessage(): string
-	{
-		return $this->message;
-	}
-
-	/**
-	 * Set the error message
-	 *
-	 * @param   string  $message  The error message to set
-	 *
-	 * @return  void
-	 */
-	public function setMessage(string $message): void
-	{
-		$this->message = $message;
-	}
-
-	/**
-	 * Get the URI of the resource throwing the error
-	 *
-	 * @return  string
-	 */
-	public function getResource(): string
-	{
-		return $this->resource;
-	}
-
-	/**
-	 * Set the URI of the resource throwing the error
-	 *
-	 * @param   string  $resource
-	 *
-	 * @return  void
-	 */
-	public function setResource(string $resource): void
-	{
-		$this->resource = $resource;
-	}
-
-	/**
-	 * Do we actually have an error?
-	 *
-	 * @return  bool
-	 */
-	public function isError(): bool
-	{
-		return ($this->code > 0) || !empty($this->message);
-	}
-}
diff --git a/s3_storage/vendor/akeeba/s3/src/Signature.php b/s3_storage/vendor/akeeba/s3/src/Signature.php
deleted file mode 100644
index a1def56c..00000000
--- a/s3_storage/vendor/akeeba/s3/src/Signature.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-/**
- * Akeeba Engine
- *
- * @package   akeebaengine
- * @copyright Copyright (c)2006-2024 Nicholas K. Dionysopoulos / Akeeba Ltd
- * @license   GNU General Public License version 3, or later
- */
-
-namespace Akeeba\S3;
-
-// Protection against direct access
-defined('AKEEBAENGINE') || die();
-
-/**
- * Base class for request signing objects.
- */
-abstract class Signature
-{
-	/**
-	 * The request we will be signing
-	 *
-	 * @var  Request
-	 */
-	protected $request = null;
-
-	/**
-	 * Signature constructor.
-	 *
-	 * @param   Request  $request  The request we will be signing
-	 */
-	public function __construct(Request $request)
-	{
-		$this->request = $request;
-	}
-
-	/**
-	 * Get a signature object for the request
-	 *
-	 * @param   Request  $request  The request which needs signing
-	 * @param   string   $method   The signature method, "v2" or "v4"
-	 *
-	 * @return  Signature
-	 */
-	public static function getSignatureObject(Request $request, string $method = 'v2'): self
-	{
-		$className = __NAMESPACE__ . '\\Signature\\' . ucfirst($method);
-
-		return new $className($request);
-	}
-
-	/**
-	 * Returns the authorization header for the request
-	 *
-	 * @return  string
-	 */
-	abstract public function getAuthorizationHeader(): string;
-
-	/**
-	 * Pre-process the request headers before we convert them to cURL-compatible format. Used by signature engines to
-	 * add custom headers, e.g. x-amz-content-sha256
-	 *
-	 * @param   array  $headers     The associative array of headers to process
-	 * @param   array  $amzHeaders  The associative array of amz-* headers to process
-	 *
-	 * @return  void
-	 */
-	abstract public function preProcessHeaders(array &$headers, array &$amzHeaders): void;
-
-	/**
-	 * Get a pre-signed URL for the request. Typically used to pre-sign GET requests to objects, i.e. give shareable
-	 * pre-authorized URLs for downloading files from S3.
-	 *
-	 * @param   integer|null  $lifetime  Lifetime in seconds. NULL for default lifetime.
-	 * @param   bool          $https     Use HTTPS ($hostBucket should be false for SSL verification)?
-	 *
-	 * @return  string  The authenticated URL, complete with signature
-	 */
-	abstract public function getAuthenticatedURL(?int $lifetime = null, bool $https = false): string;
-}
diff --git a/s3_storage/vendor/akeeba/s3/src/Signature/V2.php b/s3_storage/vendor/akeeba/s3/src/Signature/V2.php
deleted file mode 100644
index ef7e7daa..00000000
--- a/s3_storage/vendor/akeeba/s3/src/Signature/V2.php
+++ /dev/null
@@ -1,218 +0,0 @@
-<?php
-/**
- * Akeeba Engine
- *
- * @package   akeebaengine
- * @copyright Copyright (c)2006-2024 Nicholas K. Dionysopoulos / Akeeba Ltd
- * @license   GNU General Public License version 3, or later
- */
-
-namespace Akeeba\S3\Signature;
-
-// Protection against direct access
-defined('AKEEBAENGINE') || die();
-
-use Akeeba\S3\Signature;
-
-/**
- * Implements the Amazon AWS v2 signatures
- *
- * @see http://docs.aws.amazon.com/AmazonS3/latest/dev/RESTAuthentication.html
- */
-class V2 extends Signature
-{
-	/**
-	 * Pre-process the request headers before we convert them to cURL-compatible format. Used by signature engines to
-	 * add custom headers, e.g. x-amz-content-sha256
-	 *
-	 * @param   array  $headers     The associative array of headers to process
-	 * @param   array  $amzHeaders  The associative array of amz-* headers to process
-	 *
-	 * @return  void
-	 */
-	public function preProcessHeaders(array &$headers, array &$amzHeaders): void
-	{
-		// No pre-processing required for V2 signatures
-	}
-
-	/**
-	 * Get a pre-signed URL for the request. Typically used to pre-sign GET requests to objects, i.e. give shareable
-	 * pre-authorized URLs for downloading files from S3.
-	 *
-	 * @param   integer|null  $lifetime  Lifetime in seconds. NULL for default lifetime.
-	 * @param   bool          $https     Use HTTPS ($hostBucket should be false for SSL verification)?
-	 *
-	 * @return  string  The presigned URL
-	 */
-	public function getAuthenticatedURL(?int $lifetime = null, bool $https = false): string
-	{
-		// Set the Expires header
-		if (is_null($lifetime))
-		{
-			$lifetime = 10;
-		}
-
-		$expires = time() + $lifetime;
-		$this->request->setHeader('Expires', $expires);
-
-		$bucket    = $this->request->getBucket();
-		$uri       = $this->request->getResource();
-		$headers   = $this->request->getHeaders();
-		$accessKey = $this->request->getConfiguration()->getAccess();
-		$protocol  = $https ? 'https' : 'http';
-		$signature = $this->getAuthorizationHeader();
-
-		$search = '/' . $bucket;
-
-		// This does not look right... The bucket name must be included in the URL.
-//		 if (strpos($uri, $search) === 0)
-//		 {
-//		 	$uri = substr($uri, strlen($search));
-//		 }
-
-		$queryParameters = array_merge($this->request->getParameters(), [
-			'AWSAccessKeyId' => $accessKey,
-			'Expires'        => sprintf('%u', $expires),
-			'Signature'      => $signature,
-		]);
-
-		$query = http_build_query($queryParameters);
-
-		// fix authenticated url for Google Cloud Storage - https://cloud.google.com/storage/docs/access-control/create-signed-urls-program
-		if ($this->request->getConfiguration()->getEndpoint() === "storage.googleapis.com")
-		{
-			// replace host with endpoint
-			$headers['Host'] = 'storage.googleapis.com';
-			// replace "AWSAccessKeyId" with "GoogleAccessId"
-			$query = str_replace('AWSAccessKeyId', 'GoogleAccessId', $query);
-			// add bucket to url
-			$uri = '/' . $bucket . $uri;
-		}
-
-		$url = $protocol . '://' . $headers['Host'] . $uri;
-		$url .= (strpos($uri, '?') !== false) ? '&' : '?';
-		$url .= $query;
-
-		return $url;
-	}
-
-	/**
-	 * Returns the authorization header for the request
-	 *
-	 * @return  string
-	 */
-	public function getAuthorizationHeader(): string
-	{
-		$verb           = strtoupper($this->request->getVerb());
-		$resourcePath   = $this->request->getResource();
-		$headers        = $this->request->getHeaders();
-		$amzHeaders     = $this->request->getAmzHeaders();
-		$parameters     = $this->request->getParameters();
-		$bucket         = $this->request->getBucket();
-		$isPresignedURL = false;
-
-		$amz       = [];
-		$amzString = '';
-
-		// Collect AMZ headers for signature
-		foreach ($amzHeaders as $header => $value)
-		{
-			if (strlen($value) > 0)
-			{
-				$amz[] = strtolower($header) . ':' . $value;
-			}
-		}
-
-		// AMZ headers must be sorted and sent as separate lines
-		if (count($amz) > 0)
-		{
-			sort($amz);
-			$amzString = "\n" . implode("\n", $amz);
-		}
-
-		// If the Expires query string parameter is set up we're pre-signing a download URL. The string to sign is a bit
-		// different in this case; it does not include the Date, it includes the Expires.
-		// See http://docs.aws.amazon.com/AmazonS3/latest/dev/RESTAuthentication.html#RESTAuthenticationQueryStringAuth
-		if (isset($headers['Expires']))
-		{
-			if (isset($headers['Date']))
-			{
-				$headers['Date'] = $headers['Expires'];
-			}
-			else
-			{
-				$amzHeaders['x-amz-date'] = $headers['Expires'];
-			}
-
-			unset ($headers['Expires']);
-
-			$isPresignedURL = true;
-		}
-
-		/**
-		 * The resource path in S3 V2 signatures must ALWAYS contain the bucket name if a bucket is defined, even if we
-		 * are not using path-style access to the resource
-		 */
-		if (!empty($bucket) && !$this->request->getConfiguration()->getUseLegacyPathStyle())
-		{
-			$resourcePath = '/' . $bucket . $resourcePath;
-		}
-
-		$stringToSign = $verb . "\n" .
-			($headers['Content-MD5'] ?? '') . "\n" .
-			($headers['Content-Type'] ?? '') . "\n" .
-			($headers['Date'] ?? '') .
-			$amzString . "\n" .
-			$resourcePath;
-
-		// CloudFront only requires a date to be signed
-		if ($headers['Host'] == 'cloudfront.amazonaws.com')
-		{
-			$stringToSign = $headers['Date'] ?? $amzHeaders['x-amz-date'] ?? '';
-		}
-
-		$amazonV2Hash = $this->amazonV2Hash($stringToSign);
-
-		// For presigned URLs we only return the Base64-encoded signature without the AWS format specifier and the
-		// public access key.
-		if ($isPresignedURL)
-		{
-			return $amazonV2Hash;
-		}
-
-		return 'AWS ' .
-			$this->request->getConfiguration()->getAccess() . ':' .
-			$amazonV2Hash;
-	}
-
-	/**
-	 * Creates a HMAC-SHA1 hash. Uses the hash extension if present, otherwise falls back to slower, manual calculation.
-	 *
-	 * @param   string  $stringToSign  String to sign
-	 *
-	 * @return  string
-	 */
-	private function amazonV2Hash(string $stringToSign): string
-	{
-		$secret = $this->request->getConfiguration()->getSecret();
-
-		if (extension_loaded('hash'))
-		{
-			$raw = hash_hmac('sha1', $stringToSign, $secret, true);
-
-			return base64_encode($raw);
-		}
-
-		$raw = pack('H*', sha1(
-				(str_pad($secret, 64, chr(0x00)) ^ (str_repeat(chr(0x5c), 64))) .
-				pack('H*', sha1(
-						(str_pad($secret, 64, chr(0x00)) ^ (str_repeat(chr(0x36), 64))) . $stringToSign
-					)
-				)
-			)
-		);
-
-		return base64_encode($raw);
-	}
-
-}
diff --git a/s3_storage/vendor/akeeba/s3/src/Signature/V4.php b/s3_storage/vendor/akeeba/s3/src/Signature/V4.php
deleted file mode 100644
index daf27afc..00000000
--- a/s3_storage/vendor/akeeba/s3/src/Signature/V4.php
+++ /dev/null
@@ -1,539 +0,0 @@
-<?php
-/**
- * Akeeba Engine
- *
- * @package   akeebaengine
- * @copyright Copyright (c)2006-2024 Nicholas K. Dionysopoulos / Akeeba Ltd
- * @license   GNU General Public License version 3, or later
- */
-
-namespace Akeeba\S3\Signature;
-
-// Protection against direct access
-defined('AKEEBAENGINE') || die();
-
-use Akeeba\S3\Signature;
-use DateTime;
-
-/**
- * Implements the Amazon AWS v4 signatures
- *
- * @see http://docs.aws.amazon.com/general/latest/gr/signature-version-4.html
- */
-class V4 extends Signature
-{
-	/**
-	 * Pre-process the request headers before we convert them to cURL-compatible format. Used by signature engines to
-	 * add custom headers, e.g. x-amz-content-sha256
-	 *
-	 * @param   array  $headers     The associative array of headers to process
-	 * @param   array  $amzHeaders  The associative array of amz-* headers to process
-	 *
-	 * @return  void
-	 */
-	public function preProcessHeaders(array &$headers, array &$amzHeaders): void
-	{
-		// Do we already have an SHA-256 payload hash?
-		if (isset($amzHeaders['x-amz-content-sha256']))
-		{
-			return;
-		}
-
-		// Set the payload hash header
-		$input = $this->request->getInput();
-
-		if (is_object($input))
-		{
-			$requestPayloadHash = $input->getSha256();
-		}
-		else
-		{
-			$requestPayloadHash = hash('sha256', '', false);
-		}
-
-		$amzHeaders['x-amz-content-sha256'] = $requestPayloadHash;
-	}
-
-	/**
-	 * Get a pre-signed URL for the request. Typically used to pre-sign GET requests to objects, i.e. give shareable
-	 * pre-authorized URLs for downloading files from S3.
-	 *
-	 * @param   integer|null  $lifetime  Lifetime in seconds. NULL for default lifetime.
-	 * @param   bool          $https     Use HTTPS ($hostBucket should be false for SSL verification)?
-	 *
-	 * @return  string  The presigned URL
-	 */
-	public function getAuthenticatedURL(?int $lifetime = null, bool $https = false): string
-	{
-		// Set the Expires header
-		if (is_null($lifetime))
-		{
-			$lifetime = 10;
-		}
-
-		/**
-		 * Authenticated URLs must always go through the generic regional endpoint, not the virtual hosting-style domain
-		 * name. This means that if you have a bucket "example" in the EU West 1 (Ireland) region we have to go through
-		 * http://s3-eu-west-1.amazonaws.com/example instead of http://example.amazonaws.com/ for all authenticated URLs
-		 */
-		$region   = $this->request->getConfiguration()->getRegion();
-		$bucket   = $this->request->getBucket();
-		$hostname = $this->getPresignedHostnameForRegion($region);
-
-		if (!$this->request->getConfiguration()->getPreSignedBucketInURL() && $this->isValidBucketName($bucket))
-		{
-			$hostname = $bucket . '.' . $hostname;
-		}
-
-		$this->request->setHeader('Host', $hostname);
-
-		// Set the expiration time in seconds
-		$this->request->setHeader('Expires', (int) $lifetime);
-
-		// Get the query parameters, including the calculated signature
-		$uri              = $this->request->getResource();
-		$headers          = $this->request->getHeaders();
-		$protocol         = $https ? 'https' : 'http';
-		$serialisedParams = $this->getAuthorizationHeader();
-
-		// The query parameters are returned serialized; unserialize them, then build and return the URL.
-		$queryParameters = unserialize($serialisedParams);
-
-		// This should be toggleable
-		if (
-			!$this->request->getConfiguration()->getPreSignedBucketInURL()
-			&& $this->isValidBucketName($bucket)
-			&& strpos($uri, '/' . $bucket) === 0)
-		{
-			$uri = substr($uri, strlen($bucket) + 1);
-		}
-
-		$query = http_build_query($queryParameters);
-
-		$url = $protocol . '://' . $headers['Host'] . $uri;
-		$url .= (strpos($uri, '?') !== false) ? '&' : '?';
-		$url .= $query;
-
-		return $url;
-	}
-
-	/**
-	 * Returns the authorization header for the request
-	 *
-	 * @return  string
-	 */
-	public function getAuthorizationHeader(): string
-	{
-		$verb           = strtoupper($this->request->getVerb());
-		$resourcePath   = $this->request->getResource();
-		$headers        = $this->request->getHeaders();
-		$amzHeaders     = $this->request->getAmzHeaders();
-		$parameters     = $this->request->getParameters();
-		$bucket         = $this->request->getBucket();
-		$isPresignedURL = false;
-
-		// See the Connector class for the explanation behind this ugly workaround
-		$amazonIsBraindead = isset($headers['workaround-braindead-error-from-amazon']);
-
-		if ($amazonIsBraindead)
-		{
-			unset ($headers['workaround-braindead-error-from-amazon']);
-		}
-
-		// Get the credentials scope
-		$signatureDate = new DateTime($headers['Date'] ?? $amzHeaders['x-amz-date']);
-
-		$credentialScope = $signatureDate->format('Ymd') . '/' .
-		                   $this->request->getConfiguration()->getRegion() . '/' .
-		                   's3/aws4_request';
-
-		/**
-		 * If the Expires header is set up we're pre-signing a download URL. The string to sign is a bit
-		 * different in this case and we have to pass certain headers as query string parameters.
-		 *
-		 * @see http://docs.aws.amazon.com/general/latest/gr/sigv4-create-string-to-sign.html
-		 */
-		if (isset($headers['Expires']))
-		{
-			$gmtDate = clone $signatureDate;
-			$gmtDate->setTimezone(new \DateTimeZone('GMT'));
-
-			$parameters['X-Amz-Algorithm']  = "AWS4-HMAC-SHA256";
-			$parameters['X-Amz-Credential'] = $this->request->getConfiguration()->getAccess() . '/' . $credentialScope;
-			$parameters['X-Amz-Date']       = $gmtDate->format('Ymd\THis\Z');
-			$parameters['X-Amz-Expires']    = sprintf('%u', $headers['Expires']);
-			$token                          = $this->request->getConfiguration()->getToken();
-
-			if (!empty($token))
-			{
-				$parameters['x-amz-security-token'] = $token;
-			}
-
-			unset($headers['Expires']);
-			unset($headers['Date']);
-			unset($headers['Content-MD5']);
-			unset($headers['Content-Type']);
-
-			$isPresignedURL = true;
-		}
-
-		// ========== Step 1: Create a canonical request ==========
-		// See http://docs.aws.amazon.com/general/latest/gr/sigv4-create-canonical-request.html
-
-		$canonicalHeaders   = "";
-		$signedHeadersArray = [];
-
-		// Calculate the canonical headers and the signed headers
-		if ($isPresignedURL)
-		{
-			// Presigned URLs use UNSIGNED-PAYLOAD instead
-			unset($amzHeaders['x-amz-content-sha256']);
-		}
-
-		$allHeaders = array_merge($headers, $amzHeaders);
-		ksort($allHeaders);
-
-		foreach ($allHeaders as $k => $v)
-		{
-			$lowercaseHeaderName = strtolower($k);
-
-			if ($amazonIsBraindead && ($lowercaseHeaderName == 'content-length'))
-			{
-				/**
-				 * I know it looks crazy. It is. Somehow Amazon requires me to do this and only on _some_ servers, mind
-				 * you. This is something undocumented and which is not covered by their official SDK. I had to write
-				 * my own library because of that and the official SDK's inability to upload large files without using
-				 * at least as much memory as the file itself (which doesn't fly well for files around 2Gb, let me tell
-				 * you that!).
-				 */
-				$v = "$v,$v";
-			}
-
-			$canonicalHeaders     .= $lowercaseHeaderName . ':' . trim($v) . "\n";
-			$signedHeadersArray[] = $lowercaseHeaderName;
-		}
-
-		$signedHeaders = implode(';', $signedHeadersArray);
-
-		if ($isPresignedURL)
-		{
-			$parameters['X-Amz-SignedHeaders'] = $signedHeaders;
-		}
-
-		// The canonical URI is the resource path
-		$canonicalURI     = $resourcePath;
-		$bucketResource   = '/' . $bucket . '/';
-		$regionalHostname = ($headers['Host'] != 's3.amazonaws.com')
-		                    && ($headers['Host'] != $bucket . '.s3.amazonaws.com');
-
-		/**
-		 * Yet another special case for third party, S3-compatible services, when using pre-signed URLs.
-		 *
-		 * Given a bucket `example` and filepath `foo/bar.txt` the canonical URI to sign is supposed to be
-		 * /example/foo/bar.txt regardless of whether we are using path style or subdomain hosting style access to the
-		 * bucket.
-		 *
-		 * When calculating a pre-signed URL, the URL we will be accessing will be something to the tune of
-		 * example.endpoint.com/foo/bar.txt. Amazon S3 proper allows us to use EITHER the nominal canonical URI
-		 * /foo/bar.txt OR the /example/foo/bar.txt canonical URI for consistency. Some third party providers, like
-		 * Wasabi, will choke on the former and complain about the signature being invalid.
-		 *
-		 * To address this issue we check if all the following conditions are met:
-		 * - We are calculating a signature for a pre-signed URL.
-		 * - The service is NOT Amazon S3 proper.
-		 * - The domain name starts with the bucket name.
-		 * In this case, and this case only, we set $regionalHostname to false. This triggers an if-block further down
-		 * which strips the `/bucketName/` prefix from the canonical URI, converting it to `/`. Therefore, the canonical
-		 * URI in the signature becomes the nominal URI we will be accessing in the bucket, solving the problem with
-		 * those third party services.
-		 */
-		// Figuring out whether it's a regional hostname DOES NOT work above if it's not AWS S3 proper. Let's fix that.
-		if ($isPresignedURL && strpos($headers['Host'], 'amazonaws.com') === false && !strpos($headers['Host'], $bucket . '.'))
-		{
-			$regionalHostname = false;
-		}
-
-		// Special case: if the canonical URI ends in /?location the bucket name DOES count as part of the canonical URL
-		// even though the Host is s3.amazonaws.com (in which case it normally shouldn't count). Yeah, I know, it makes
-		// no sense!!!
-		if (!$regionalHostname && ($headers['Host'] == 's3.amazonaws.com')
-		    && (substr($canonicalURI, -10) == '/?location'))
-		{
-			$regionalHostname = true;
-		}
-
-		if (!$regionalHostname && (strpos($canonicalURI, $bucketResource) === 0 || strpos($canonicalURI, substr($bucketResource, 0, -1)) === 0))
-		{
-			if ($canonicalURI === substr($bucketResource, 0, -1))
-			{
-				$canonicalURI = '/';
-			}
-			else
-			{
-				$canonicalURI = substr($canonicalURI, strlen($bucketResource) - 1);
-			}
-		}
-
-		// If the resource path has a query yank it and parse it into the parameters array
-		$questionMarkPos = strpos($canonicalURI, '?');
-
-		if ($questionMarkPos !== false)
-		{
-			$canonicalURI = substr($canonicalURI, 0, $questionMarkPos);
-			$queryString  = @substr($canonicalURI, $questionMarkPos + 1);
-			@parse_str($queryString, $extraQuery);
-
-			if (count($extraQuery))
-			{
-				$parameters = array_merge($parameters, $extraQuery);
-			}
-		}
-
-		// The canonical query string is the string representation of $parameters, alpha sorted by key
-		ksort($parameters);
-
-		// We build the query the hard way because http_build_query in PHP 5.3 does NOT have the fourth parameter
-		// (encoding type), defaulting to RFC 1738 encoding whereas S3 expects RFC 3986 encoding
-		$canonicalQueryString = '';
-
-		if (!empty($parameters))
-		{
-			$temp = [];
-
-			foreach ($parameters as $k => $v)
-			{
-				$temp[] = $this->urlencode($k) . '=' . $this->urlencode($v);
-			}
-
-			$canonicalQueryString = implode('&', $temp);
-		}
-
-		// Get the payload hash
-		$requestPayloadHash = 'UNSIGNED-PAYLOAD';
-
-		if (isset($amzHeaders['x-amz-content-sha256']))
-		{
-			$requestPayloadHash = $amzHeaders['x-amz-content-sha256'];
-		}
-
-		// Calculate the canonical request
-		$canonicalRequest = $verb . "\n" .
-		                    $canonicalURI . "\n" .
-		                    $canonicalQueryString . "\n" .
-		                    $canonicalHeaders . "\n" .
-		                    $signedHeaders . "\n" .
-		                    $requestPayloadHash;
-
-		$hashedCanonicalRequest = hash('sha256', $canonicalRequest);
-
-		// ========== Step 2: Create a string to sign ==========
-		// See http://docs.aws.amazon.com/general/latest/gr/sigv4-create-string-to-sign.html
-
-		if (!isset($headers['Date']))
-		{
-			$headers['Date'] = '';
-		}
-
-		/**
-		 * The Date in the String-to-Sign is a messy situation.
-		 *
-		 * Amazon's documentation says it must be in ISO 8601 format: `Ymd\THis\Z`. Unfortunately, Amazon's
-		 * documentation is actually wrong :troll_face: The actual Amazon S3 service expects the date to be formatted as
-		 * per RFC1123.
-		 *
-		 * Most third party implementations have caught up to the fact that Amazon has documented the v4 signatures
-		 * wrongly (naughty AWS!) and accept either format.
-		 *
-		 * Some other third party implementations, which never bothered to validate their implementations against Amazon
-		 * S3 proper, only expect what Amazon has documented as "ISO 8601". Therefore, we detect third party services
-		 * and switch to the as-documented date format.
-		 *
-		 * Some other third party services, like Wasabi, are broken in yet a different way. They will only use the date
-		 * from the x-amz-date header, WITHOUT falling back to the Date header if the former is not present. This is
-		 * the opposite of Amazon S3 proper which does expect the Date header. That's why the Request class sets both
-		 * headers if the request is made to a service _other_ than Amazon S3 proper.
-		 */
-		$dateToSignFor = strpos($headers['Host'], '.amazonaws.com') !== false
-			? (($headers['Date'] ?? null) ?: ($amzHeaders['x-amz-date'] ?? null) ?: $signatureDate->format('Ymd\THis\Z'))
-			: $signatureDate->format('Ymd\THis\Z');
-
-		$stringToSign = "AWS4-HMAC-SHA256\n" .
-		                $dateToSignFor . "\n" .
-		                $credentialScope . "\n" .
-		                $hashedCanonicalRequest;
-
-		if ($isPresignedURL)
-		{
-			$stringToSign = "AWS4-HMAC-SHA256\n" .
-			                $parameters['X-Amz-Date'] . "\n" .
-			                $credentialScope . "\n" .
-			                $hashedCanonicalRequest;
-		}
-
-		// ========== Step 3: Calculate the signature ==========
-		// See http://docs.aws.amazon.com/general/latest/gr/sigv4-calculate-signature.html
-		$kSigning = $this->getSigningKey($signatureDate);
-
-		$signature = hash_hmac('sha256', $stringToSign, $kSigning, false);
-
-		// ========== Step 4: Add the signing information to the Request ==========
-		// See http://docs.aws.amazon.com/general/latest/gr/sigv4-add-signature-to-request.html
-
-		$authorization = 'AWS4-HMAC-SHA256 Credential=' .
-		                 $this->request->getConfiguration()->getAccess() . '/' . $credentialScope . ', ' .
-		                 'SignedHeaders=' . $signedHeaders . ', ' .
-		                 'Signature=' . $signature;
-
-		// For presigned URLs we only return the Base64-encoded signature without the AWS format specifier and the
-		// public access key.
-		if ($isPresignedURL)
-		{
-			$parameters['X-Amz-Signature'] = $signature;
-
-			return serialize($parameters);
-		}
-
-		return $authorization;
-	}
-
-	/**
-	 * Calculate the AWS4 signing key
-	 *
-	 * @param   DateTime  $signatureDate  The date the signing key is good for
-	 *
-	 * @return  string
-	 */
-	private function getSigningKey(DateTime $signatureDate): string
-	{
-		$kSecret  = $this->request->getConfiguration()->getSecret();
-		$kDate    = hash_hmac('sha256', $signatureDate->format('Ymd'), 'AWS4' . $kSecret, true);
-		$kRegion  = hash_hmac('sha256', $this->request->getConfiguration()->getRegion(), $kDate, true);
-		$kService = hash_hmac('sha256', 's3', $kRegion, true);
-		$kSigning = hash_hmac('sha256', 'aws4_request', $kService, true);
-
-		return $kSigning;
-	}
-
-	private function urlencode(?string $toEncode): string
-	{
-		if (empty($toEncode))
-		{
-			return '';
-		}
-
-		return str_replace('+', '%20', urlencode($toEncode));
-	}
-
-	/**
-	 * Get the correct hostname for the given AWS region
-	 *
-	 * @param   string  $region
-	 *
-	 * @return  string
-	 */
-	private function getPresignedHostnameForRegion(string $region): string
-	{
-		$config   = $this->request->getConfiguration();
-		$endpoint = $config->getEndpoint();
-
-		if (empty($endpoint))
-		{
-			$endpoint = 's3.' . $region . '.amazonaws.com';
-		}
-
-		// As of October 2023, AWS does not consider DualStack signed URLs as valid. Whatever.
-		$dualstackEnabled = false && $this->request->getConfiguration()->getDualstackUrl();
-
-		// If dual-stack URLs are enabled then prepend the endpoint
-		if ($dualstackEnabled)
-		{
-			$endpoint = 's3.dualstack.' . $region . '.amazonaws.com';
-		}
-
-		if ($region == 'cn-north-1')
-		{
-			return $endpoint . '.cn';
-		}
-
-		return $endpoint;
-	}
-
-	/**
-	 * Is this a valid bucket name?
-	 *
-	 * @param   string  $bucketName   The bucket name to check
-	 * @param   bool    $asSubdomain  Should I put additional restrictions for use as a subdomain?
-	 *
-	 * @return  bool
-	 * @since   2.3.1
-	 *
-	 * @see     https://docs.aws.amazon.com/AmazonS3/latest/userguide/bucketnamingrules.html
-	 */
-	private function isValidBucketName(string $bucketName, bool $asSubdomain = true): bool
-	{
-		/**
-		 * If there are dots in the bucket name I can't use it as a subdomain.
-		 *
-		 * "If you include dots in a bucket's name, you can't use virtual-host-style addressing over HTTPS, unless you
-		 * perform your own certificate validation. This is because the security certificates used for virtual hosting
-		 * of buckets don't work for buckets with dots in their names."
-		 */
-		if ($asSubdomain && strpos($bucketName, '.') !== false)
-		{
-			return false;
-		}
-
-		/**
-		 * - Bucket names must be between 3 (min) and 63 (max) characters long.
-		 * - Bucket names can consist only of lowercase letters, numbers, dots (.), and hyphens (-).
-		 */
-		if (!preg_match('/^[a-z0-9\-.]{3,63}$/', $bucketName))
-		{
-			return false;
-		}
-
-		// Bucket names must begin and end with a letter or number.
-		if (!preg_match('/^[a-z0-9].*[a-z0-9]$/', $bucketName))
-		{
-			return false;
-		}
-
-		// Bucket names must not contain two adjacent periods.
-		if (preg_match('/\.\./', $bucketName))
-		{
-			return false;
-		}
-
-		// Bucket names must not be formatted as an IP address (for example, 192.168.5.4).
-		if (preg_match('/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/', $bucketName))
-		{
-			return false;
-		}
-
-		// Bucket names must not start with the prefix xn--.
-		if (strpos($bucketName, 'xn--') === 0)
-		{
-			return false;
-		}
-
-		// Bucket names must not start with the prefix sthree- and the prefix sthree-configurator.
-		if (strpos($bucketName, 'sthree-') === 0)
-		{
-			return false;
-		}
-
-		// Bucket names must not end with the suffix -s3alias.
-		if (substr($bucketName, -8) === '-s3alias')
-		{
-			return false;
-		}
-
-		// Bucket names must not end with the suffix --ol-s3.
-		if (substr($bucketName, -7) === '--ol-s3')
-		{
-			return false;
-		}
-
-		return true;
-	}
-}
diff --git a/s3_storage/vendor/akeeba/s3/src/StorageClass.php b/s3_storage/vendor/akeeba/s3/src/StorageClass.php
deleted file mode 100644
index 91f9bb84..00000000
--- a/s3_storage/vendor/akeeba/s3/src/StorageClass.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-/**
- * Akeeba Engine
- *
- * @package   akeebaengine
- * @copyright Copyright (c)2006-2024 Nicholas K. Dionysopoulos / Akeeba Ltd
- * @license   GNU General Public License version 3, or later
- */
-
-namespace Akeeba\S3;
-
-/**
- * Amazon S3 Storage Classes
- *
- * When you want to override the default storage class of the bucket pass
- * array('X-Amz-Storage-Class' => StorageClass::STANDARD)
- * in the $headers array of Connector::putObject().
- *
- * Alternatively, run the $headers array through setStorageClass(), e.g.
- * $headers = array(); // You can put your stuff here
- * StorageClass::setStorageClass($headers, StorageClass::STANDARD);
- * $connector->putObject($myInput, 'bucketname', 'path/to/object.dat', Acl::PRIVATE, $headers)
- *
- * @see https://aws.amazon.com/s3/storage-classes/
- */
-class StorageClass
-{
-	/**
-	 * Amazon S3 Standard (S3 Standard)
-	 */
-	public const STANDARD = 'STANDARD';
-
-	/**
-	 * Reduced redundancy storage
-	 *
-	 * Not recommended anymore. Use INTELLIGENT_TIERING instead.
-	 */
-	public const REDUCED_REDUNDANCY = 'REDUCED_REDUNDANCY';
-
-	/**
-	 * Amazon S3 Intelligent-Tiering (S3 Intelligent-Tiering)
-	 */
-	public const INTELLIGENT_TIERING = 'INTELLIGENT_TIERING';
-
-	/**
-	 * Amazon S3 Standard-Infrequent Access (S3 Standard-IA)
-	 */
-	public const STANDARD_IA = 'STANDARD_IA';
-
-	/**
-	 * Amazon S3 One Zone-Infrequent Access (S3 One Zone-IA)
-	 */
-	public const ONEZONE_IA = 'ONEZONE_IA';
-
-	/**
-	 * Amazon S3 Glacier (S3 Glacier)
-	 */
-	public const GLACIER = 'GLACIER';
-
-	/**
-	 * Amazon S3 Glacier Deep Archive (S3 Glacier Deep Archive)
-	 */
-	public const DEEP_ARCHIVE = 'DEEP_ARCHIVE';
-
-	/**
-	 * Manipulate the $headers array, setting the X-Amz-Storage-Class header for the requested storage class.
-	 *
-	 * This method will automatically remove any previously set X-Amz-Storage-Class header, case-insensitive. The reason
-	 * for that is that Amazon headers **are** case-insensitive and you could easily end up having two separate headers
-	 * with competing storage classes. This would mess up the signature and your request would promptly fail.
-	 *
-	 * @param   array   $headers
-	 * @param   string  $storageClass
-	 *
-	 * @return  void
-	 */
-	public static function setStorageClass(array &$headers, string $storageClass): void
-	{
-		// Remove all previously set X-Amz-Storage-Class headers (case-insensitive)
-		$killList = [];
-
-		foreach ($headers as $key => $value)
-		{
-			if (strtolower($key) === 'x-amz-storage-class')
-			{
-				$killList[] = $key;
-			}
-		}
-
-		foreach ($killList as $key)
-		{
-			unset($headers[$key]);
-		}
-
-		// Add the new X-Amz-Storage-Class header
-		$headers['X-Amz-Storage-Class'] = $storageClass;
-	}
-}
\ No newline at end of file
diff --git a/s3_storage/vendor/akeeba/s3/src/aliasing.php b/s3_storage/vendor/akeeba/s3/src/aliasing.php
deleted file mode 100644
index f5a11897..00000000
--- a/s3_storage/vendor/akeeba/s3/src/aliasing.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/**
- * Akeeba Engine
- *
- * @package   akeebaengine
- * @copyright Copyright (c)2006-2024 Nicholas K. Dionysopoulos / Akeeba Ltd
- * @license   GNU General Public License version 3, or later
- */
-
-/**
- * Automatic aliasing of the old namespace to the new, as you use each old class.
- */
-spl_autoload_register(
-	static function (string $className)
-	{
-		$oldNS = 'Akeeba\Engine\Postproc\Connector\S3v4';
-		$newNS = 'Akeeba\S3';
-
-		$className = trim($className, '\\');
-
-		if (strpos($className, $oldNS) !== 0)
-		{
-			return false;
-		}
-
-		$newClassName = $newNS . '\\' . trim(substr($className, strlen($oldNS)), '\\');
-
-		if (class_exists($newClassName, true))
-		{
-			class_alias($newClassName, $className, false);
-		}
-
-		return true;
-	}
-);
diff --git a/s3_storage/vendor/autoload.php b/s3_storage/vendor/autoload.php
deleted file mode 100644
index d19614c2..00000000
--- a/s3_storage/vendor/autoload.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-// autoload.php @generated by Composer
-
-require_once __DIR__ . '/composer/autoload_real.php';
-
-return ComposerAutoloaderInitS3StorageAddon::getLoader();
diff --git a/s3_storage/vendor/composer/ClassLoader.php b/s3_storage/vendor/composer/ClassLoader.php
deleted file mode 100644
index 03b9bb9c..00000000
--- a/s3_storage/vendor/composer/ClassLoader.php
+++ /dev/null
@@ -1,445 +0,0 @@
-<?php
-
-/*
- * This file is part of Composer.
- *
- * (c) Nils Adermann <naderman@naderman.de>
- *     Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Composer\Autoload;
-
-/**
- * ClassLoader implements a PSR-0, PSR-4 and classmap class loader.
- *
- *     $loader = new \Composer\Autoload\ClassLoader();
- *
- *     // register classes with namespaces
- *     $loader->add('Symfony\Component', __DIR__.'/component');
- *     $loader->add('Symfony',           __DIR__.'/framework');
- *
- *     // activate the autoloader
- *     $loader->register();
- *
- *     // to enable searching the include path (eg. for PEAR packages)
- *     $loader->setUseIncludePath(true);
- *
- * In this example, if you try to use a class in the Symfony\Component
- * namespace or one of its children (Symfony\Component\Console for instance),
- * the autoloader will first look for the class under the component/
- * directory, and it will then fallback to the framework/ directory if not
- * found before giving up.
- *
- * This class is loosely based on the Symfony UniversalClassLoader.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- * @author Jordi Boggiano <j.boggiano@seld.be>
- * @see    http://www.php-fig.org/psr/psr-0/
- * @see    http://www.php-fig.org/psr/psr-4/
- */
-class ClassLoader
-{
-    // PSR-4
-    private $prefixLengthsPsr4 = array();
-    private $prefixDirsPsr4 = array();
-    private $fallbackDirsPsr4 = array();
-
-    // PSR-0
-    private $prefixesPsr0 = array();
-    private $fallbackDirsPsr0 = array();
-
-    private $useIncludePath = false;
-    private $classMap = array();
-    private $classMapAuthoritative = false;
-    private $missingClasses = array();
-    private $apcuPrefix;
-
-    public function getPrefixes()
-    {
-        if (!empty($this->prefixesPsr0)) {
-            return call_user_func_array('array_merge', array_values($this->prefixesPsr0));
-        }
-
-        return array();
-    }
-
-    public function getPrefixesPsr4()
-    {
-        return $this->prefixDirsPsr4;
-    }
-
-    public function getFallbackDirs()
-    {
-        return $this->fallbackDirsPsr0;
-    }
-
-    public function getFallbackDirsPsr4()
-    {
-        return $this->fallbackDirsPsr4;
-    }
-
-    public function getClassMap()
-    {
-        return $this->classMap;
-    }
-
-    /**
-     * @param array $classMap Class to filename map
-     */
-    public function addClassMap(array $classMap)
-    {
-        if ($this->classMap) {
-            $this->classMap = array_merge($this->classMap, $classMap);
-        } else {
-            $this->classMap = $classMap;
-        }
-    }
-
-    /**
-     * Registers a set of PSR-0 directories for a given prefix, either
-     * appending or prepending to the ones previously set for this prefix.
-     *
-     * @param string       $prefix  The prefix
-     * @param array|string $paths   The PSR-0 root directories
-     * @param bool         $prepend Whether to prepend the directories
-     */
-    public function add($prefix, $paths, $prepend = false)
-    {
-        if (!$prefix) {
-            if ($prepend) {
-                $this->fallbackDirsPsr0 = array_merge(
-                    (array) $paths,
-                    $this->fallbackDirsPsr0
-                );
-            } else {
-                $this->fallbackDirsPsr0 = array_merge(
-                    $this->fallbackDirsPsr0,
-                    (array) $paths
-                );
-            }
-
-            return;
-        }
-
-        $first = $prefix[0];
-        if (!isset($this->prefixesPsr0[$first][$prefix])) {
-            $this->prefixesPsr0[$first][$prefix] = (array) $paths;
-
-            return;
-        }
-        if ($prepend) {
-            $this->prefixesPsr0[$first][$prefix] = array_merge(
-                (array) $paths,
-                $this->prefixesPsr0[$first][$prefix]
-            );
-        } else {
-            $this->prefixesPsr0[$first][$prefix] = array_merge(
-                $this->prefixesPsr0[$first][$prefix],
-                (array) $paths
-            );
-        }
-    }
-
-    /**
-     * Registers a set of PSR-4 directories for a given namespace, either
-     * appending or prepending to the ones previously set for this namespace.
-     *
-     * @param string       $prefix  The prefix/namespace, with trailing '\\'
-     * @param array|string $paths   The PSR-4 base directories
-     * @param bool         $prepend Whether to prepend the directories
-     *
-     * @throws \InvalidArgumentException
-     */
-    public function addPsr4($prefix, $paths, $prepend = false)
-    {
-        if (!$prefix) {
-            // Register directories for the root namespace.
-            if ($prepend) {
-                $this->fallbackDirsPsr4 = array_merge(
-                    (array) $paths,
-                    $this->fallbackDirsPsr4
-                );
-            } else {
-                $this->fallbackDirsPsr4 = array_merge(
-                    $this->fallbackDirsPsr4,
-                    (array) $paths
-                );
-            }
-        } elseif (!isset($this->prefixDirsPsr4[$prefix])) {
-            // Register directories for a new namespace.
-            $length = strlen($prefix);
-            if ('\\' !== $prefix[$length - 1]) {
-                throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
-            }
-            $this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length;
-            $this->prefixDirsPsr4[$prefix] = (array) $paths;
-        } elseif ($prepend) {
-            // Prepend directories for an already registered namespace.
-            $this->prefixDirsPsr4[$prefix] = array_merge(
-                (array) $paths,
-                $this->prefixDirsPsr4[$prefix]
-            );
-        } else {
-            // Append directories for an already registered namespace.
-            $this->prefixDirsPsr4[$prefix] = array_merge(
-                $this->prefixDirsPsr4[$prefix],
-                (array) $paths
-            );
-        }
-    }
-
-    /**
-     * Registers a set of PSR-0 directories for a given prefix,
-     * replacing any others previously set for this prefix.
-     *
-     * @param string       $prefix The prefix
-     * @param array|string $paths  The PSR-0 base directories
-     */
-    public function set($prefix, $paths)
-    {
-        if (!$prefix) {
-            $this->fallbackDirsPsr0 = (array) $paths;
-        } else {
-            $this->prefixesPsr0[$prefix[0]][$prefix] = (array) $paths;
-        }
-    }
-
-    /**
-     * Registers a set of PSR-4 directories for a given namespace,
-     * replacing any others previously set for this namespace.
-     *
-     * @param string       $prefix The prefix/namespace, with trailing '\\'
-     * @param array|string $paths  The PSR-4 base directories
-     *
-     * @throws \InvalidArgumentException
-     */
-    public function setPsr4($prefix, $paths)
-    {
-        if (!$prefix) {
-            $this->fallbackDirsPsr4 = (array) $paths;
-        } else {
-            $length = strlen($prefix);
-            if ('\\' !== $prefix[$length - 1]) {
-                throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
-            }
-            $this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length;
-            $this->prefixDirsPsr4[$prefix] = (array) $paths;
-        }
-    }
-
-    /**
-     * Turns on searching the include path for class files.
-     *
-     * @param bool $useIncludePath
-     */
-    public function setUseIncludePath($useIncludePath)
-    {
-        $this->useIncludePath = $useIncludePath;
-    }
-
-    /**
-     * Can be used to check if the autoloader uses the include path to check
-     * for classes.
-     *
-     * @return bool
-     */
-    public function getUseIncludePath()
-    {
-        return $this->useIncludePath;
-    }
-
-    /**
-     * Turns off searching the prefix and fallback directories for classes
-     * that have not been registered with the class map.
-     *
-     * @param bool $classMapAuthoritative
-     */
-    public function setClassMapAuthoritative($classMapAuthoritative)
-    {
-        $this->classMapAuthoritative = $classMapAuthoritative;
-    }
-
-    /**
-     * Should class lookup fail if not found in the current class map?
-     *
-     * @return bool
-     */
-    public function isClassMapAuthoritative()
-    {
-        return $this->classMapAuthoritative;
-    }
-
-    /**
-     * APCu prefix to use to cache found/not-found classes, if the extension is enabled.
-     *
-     * @param string|null $apcuPrefix
-     */
-    public function setApcuPrefix($apcuPrefix)
-    {
-        $this->apcuPrefix = function_exists('apcu_fetch') && filter_var(ini_get('apc.enabled'), FILTER_VALIDATE_BOOLEAN) ? $apcuPrefix : null;
-    }
-
-    /**
-     * The APCu prefix in use, or null if APCu caching is not enabled.
-     *
-     * @return string|null
-     */
-    public function getApcuPrefix()
-    {
-        return $this->apcuPrefix;
-    }
-
-    /**
-     * Registers this instance as an autoloader.
-     *
-     * @param bool $prepend Whether to prepend the autoloader or not
-     */
-    public function register($prepend = false)
-    {
-        spl_autoload_register(array($this, 'loadClass'), true, $prepend);
-    }
-
-    /**
-     * Unregisters this instance as an autoloader.
-     */
-    public function unregister()
-    {
-        spl_autoload_unregister(array($this, 'loadClass'));
-    }
-
-    /**
-     * Loads the given class or interface.
-     *
-     * @param  string    $class The name of the class
-     * @return bool|null True if loaded, null otherwise
-     */
-    public function loadClass($class)
-    {
-        if ($file = $this->findFile($class)) {
-            includeFile($file);
-
-            return true;
-        }
-    }
-
-    /**
-     * Finds the path to the file where the class is defined.
-     *
-     * @param string $class The name of the class
-     *
-     * @return string|false The path if found, false otherwise
-     */
-    public function findFile($class)
-    {
-        // class map lookup
-        if (isset($this->classMap[$class])) {
-            return $this->classMap[$class];
-        }
-        if ($this->classMapAuthoritative || isset($this->missingClasses[$class])) {
-            return false;
-        }
-        if (null !== $this->apcuPrefix) {
-            $file = apcu_fetch($this->apcuPrefix.$class, $hit);
-            if ($hit) {
-                return $file;
-            }
-        }
-
-        $file = $this->findFileWithExtension($class, '.php');
-
-        // Search for Hack files if we are running on HHVM
-        if (false === $file && defined('HHVM_VERSION')) {
-            $file = $this->findFileWithExtension($class, '.hh');
-        }
-
-        if (null !== $this->apcuPrefix) {
-            apcu_add($this->apcuPrefix.$class, $file);
-        }
-
-        if (false === $file) {
-            // Remember that this class does not exist.
-            $this->missingClasses[$class] = true;
-        }
-
-        return $file;
-    }
-
-    private function findFileWithExtension($class, $ext)
-    {
-        // PSR-4 lookup
-        $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR) . $ext;
-
-        $first = $class[0];
-        if (isset($this->prefixLengthsPsr4[$first])) {
-            $subPath = $class;
-            while (false !== $lastPos = strrpos($subPath, '\\')) {
-                $subPath = substr($subPath, 0, $lastPos);
-                $search = $subPath . '\\';
-                if (isset($this->prefixDirsPsr4[$search])) {
-                    $pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1);
-                    foreach ($this->prefixDirsPsr4[$search] as $dir) {
-                        if (file_exists($file = $dir . $pathEnd)) {
-                            return $file;
-                        }
-                    }
-                }
-            }
-        }
-
-        // PSR-4 fallback dirs
-        foreach ($this->fallbackDirsPsr4 as $dir) {
-            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4)) {
-                return $file;
-            }
-        }
-
-        // PSR-0 lookup
-        if (false !== $pos = strrpos($class, '\\')) {
-            // namespaced class name
-            $logicalPathPsr0 = substr($logicalPathPsr4, 0, $pos + 1)
-                . strtr(substr($logicalPathPsr4, $pos + 1), '_', DIRECTORY_SEPARATOR);
-        } else {
-            // PEAR-like class name
-            $logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR) . $ext;
-        }
-
-        if (isset($this->prefixesPsr0[$first])) {
-            foreach ($this->prefixesPsr0[$first] as $prefix => $dirs) {
-                if (0 === strpos($class, $prefix)) {
-                    foreach ($dirs as $dir) {
-                        if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
-                            return $file;
-                        }
-                    }
-                }
-            }
-        }
-
-        // PSR-0 fallback dirs
-        foreach ($this->fallbackDirsPsr0 as $dir) {
-            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
-                return $file;
-            }
-        }
-
-        // PSR-0 include paths.
-        if ($this->useIncludePath && $file = stream_resolve_include_path($logicalPathPsr0)) {
-            return $file;
-        }
-
-        return false;
-    }
-}
-
-/**
- * Scope isolated include.
- *
- * Prevents access to $this/self from included files.
- */
-function includeFile($file)
-{
-    include $file;
-}
diff --git a/s3_storage/vendor/composer/LICENSE b/s3_storage/vendor/composer/LICENSE
deleted file mode 100644
index f27399a0..00000000
--- a/s3_storage/vendor/composer/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-
-Copyright (c) Nils Adermann, Jordi Boggiano
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is furnished
-to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
diff --git a/s3_storage/vendor/composer/autoload_classmap.php b/s3_storage/vendor/composer/autoload_classmap.php
deleted file mode 100644
index 8da34f5d..00000000
--- a/s3_storage/vendor/composer/autoload_classmap.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-// autoload_classmap.php @generated by Composer
-
-$vendorDir = dirname(dirname(__FILE__));
-$baseDir = dirname($vendorDir);
-
-return array(
-    'Akeeba\\S3\\Acl' => $vendorDir . '/akeeba/s3/src/Acl.php',
-    'Akeeba\\S3\\Configuration' => $vendorDir . '/akeeba/s3/src/Configuration.php',
-    'Akeeba\\S3\\Connector' => $vendorDir . '/akeeba/s3/src/Connector.php',
-    'Akeeba\\S3\\Exception\\CannotDeleteFile' => $vendorDir . '/akeeba/s3/src/Exception/CannotDeleteFile.php',
-    'Akeeba\\S3\\Exception\\CannotGetBucket' => $vendorDir . '/akeeba/s3/src/Exception/CannotGetBucket.php',
-    'Akeeba\\S3\\Exception\\CannotGetFile' => $vendorDir . '/akeeba/s3/src/Exception/CannotGetFile.php',
-    'Akeeba\\S3\\Exception\\CannotListBuckets' => $vendorDir . '/akeeba/s3/src/Exception/CannotListBuckets.php',
-    'Akeeba\\S3\\Exception\\CannotOpenFileForRead' => $vendorDir . '/akeeba/s3/src/Exception/CannotOpenFileForRead.php',
-    'Akeeba\\S3\\Exception\\CannotOpenFileForWrite' => $vendorDir . '/akeeba/s3/src/Exception/CannotOpenFileForWrite.php',
-    'Akeeba\\S3\\Exception\\CannotPutFile' => $vendorDir . '/akeeba/s3/src/Exception/CannotPutFile.php',
-    'Akeeba\\S3\\Exception\\ConfigurationError' => $vendorDir . '/akeeba/s3/src/Exception/ConfigurationError.php',
-    'Akeeba\\S3\\Exception\\InvalidAccessKey' => $vendorDir . '/akeeba/s3/src/Exception/InvalidAccessKey.php',
-    'Akeeba\\S3\\Exception\\InvalidBody' => $vendorDir . '/akeeba/s3/src/Exception/InvalidBody.php',
-    'Akeeba\\S3\\Exception\\InvalidEndpoint' => $vendorDir . '/akeeba/s3/src/Exception/InvalidEndpoint.php',
-    'Akeeba\\S3\\Exception\\InvalidFilePointer' => $vendorDir . '/akeeba/s3/src/Exception/InvalidFilePointer.php',
-    'Akeeba\\S3\\Exception\\InvalidRegion' => $vendorDir . '/akeeba/s3/src/Exception/InvalidRegion.php',
-    'Akeeba\\S3\\Exception\\InvalidSecretKey' => $vendorDir . '/akeeba/s3/src/Exception/InvalidSecretKey.php',
-    'Akeeba\\S3\\Exception\\InvalidSignatureMethod' => $vendorDir . '/akeeba/s3/src/Exception/InvalidSignatureMethod.php',
-    'Akeeba\\S3\\Exception\\PropertyNotFound' => $vendorDir . '/akeeba/s3/src/Exception/PropertyNotFound.php',
-    'Akeeba\\S3\\Input' => $vendorDir . '/akeeba/s3/src/Input.php',
-    'Akeeba\\S3\\Request' => $vendorDir . '/akeeba/s3/src/Request.php',
-    'Akeeba\\S3\\Response' => $vendorDir . '/akeeba/s3/src/Response.php',
-    'Akeeba\\S3\\Response\\Error' => $vendorDir . '/akeeba/s3/src/Response/Error.php',
-    'Akeeba\\S3\\Signature' => $vendorDir . '/akeeba/s3/src/Signature.php',
-    'Akeeba\\S3\\Signature\\V2' => $vendorDir . '/akeeba/s3/src/Signature/V2.php',
-    'Akeeba\\S3\\Signature\\V4' => $vendorDir . '/akeeba/s3/src/Signature/V4.php',
-    'Akeeba\\S3\\StorageClass' => $vendorDir . '/akeeba/s3/src/StorageClass.php',
-);
diff --git a/s3_storage/vendor/composer/autoload_files.php b/s3_storage/vendor/composer/autoload_files.php
deleted file mode 100644
index cc01550f..00000000
--- a/s3_storage/vendor/composer/autoload_files.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-// autoload_files.php @generated by Composer
-
-$vendorDir = dirname(dirname(__FILE__));
-$baseDir = dirname($vendorDir);
-
-return array(
-    '714ccd4b330431237faf946f71c4c9a4' => $vendorDir . '/akeeba/s3/src/aliasing.php',
-);
diff --git a/s3_storage/vendor/composer/autoload_namespaces.php b/s3_storage/vendor/composer/autoload_namespaces.php
deleted file mode 100644
index b7fc0125..00000000
--- a/s3_storage/vendor/composer/autoload_namespaces.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-// autoload_namespaces.php @generated by Composer
-
-$vendorDir = dirname(dirname(__FILE__));
-$baseDir = dirname($vendorDir);
-
-return array(
-);
diff --git a/s3_storage/vendor/composer/autoload_psr4.php b/s3_storage/vendor/composer/autoload_psr4.php
deleted file mode 100644
index 400320bf..00000000
--- a/s3_storage/vendor/composer/autoload_psr4.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-// autoload_psr4.php @generated by Composer
-
-$vendorDir = dirname(dirname(__FILE__));
-$baseDir = dirname($vendorDir);
-
-return array(
-    'Akeeba\\S3\\' => array($vendorDir . '/akeeba/s3/src'),
-);
diff --git a/s3_storage/vendor/composer/autoload_real.php b/s3_storage/vendor/composer/autoload_real.php
deleted file mode 100644
index 9df2057b..00000000
--- a/s3_storage/vendor/composer/autoload_real.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-
-// autoload_real.php @generated by Composer
-
-class ComposerAutoloaderInitS3StorageAddon
-{
-    private static $loader;
-
-    public static function loadClassLoader($class)
-    {
-        if ('Composer\Autoload\ClassLoader' === $class) {
-            require __DIR__ . '/ClassLoader.php';
-        }
-    }
-
-    /**
-     * @return \Composer\Autoload\ClassLoader
-     */
-    public static function getLoader()
-    {
-        if (null !== self::$loader) {
-            return self::$loader;
-        }
-
-        spl_autoload_register(array('ComposerAutoloaderInitS3StorageAddon', 'loadClassLoader'), true, true);
-        self::$loader = $loader = new \Composer\Autoload\ClassLoader();
-        spl_autoload_unregister(array('ComposerAutoloaderInitS3StorageAddon', 'loadClassLoader'));
-
-        $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
-        if ($useStaticLoader) {
-            require_once __DIR__ . '/autoload_static.php';
-
-            call_user_func(\Composer\Autoload\ComposerStaticInitS3StorageAddon::getInitializer($loader));
-        } else {
-            $map = require __DIR__ . '/autoload_namespaces.php';
-            foreach ($map as $namespace => $path) {
-                $loader->set($namespace, $path);
-            }
-
-            $map = require __DIR__ . '/autoload_psr4.php';
-            foreach ($map as $namespace => $path) {
-                $loader->setPsr4($namespace, $path);
-            }
-
-            $classMap = require __DIR__ . '/autoload_classmap.php';
-            if ($classMap) {
-                $loader->addClassMap($classMap);
-            }
-        }
-
-        $loader->register(true);
-
-        if ($useStaticLoader) {
-            $includeFiles = Composer\Autoload\ComposerStaticInitS3StorageAddon::$files;
-        } else {
-            $includeFiles = require __DIR__ . '/autoload_files.php';
-        }
-        foreach ($includeFiles as $fileIdentifier => $file) {
-            composerRequireS3StorageAddon($fileIdentifier, $file);
-        }
-
-        return $loader;
-    }
-}
-
-function composerRequireS3StorageAddon($fileIdentifier, $file)
-{
-    if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
-        require $file;
-
-        $GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;
-    }
-}
diff --git a/s3_storage/vendor/composer/autoload_static.php b/s3_storage/vendor/composer/autoload_static.php
deleted file mode 100644
index 929f8194..00000000
--- a/s3_storage/vendor/composer/autoload_static.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-
-// autoload_static.php @generated by Composer
-
-namespace Composer\Autoload;
-
-class ComposerStaticInitS3StorageAddon
-{
-    public static $files = array (
-        '714ccd4b330431237faf946f71c4c9a4' => __DIR__ . '/..' . '/akeeba/s3/src/aliasing.php',
-    );
-
-    public static $prefixLengthsPsr4 = array (
-        'A' => 
-        array (
-            'Akeeba\\S3\\' => 10,
-        ),
-    );
-
-    public static $prefixDirsPsr4 = array (
-        'Akeeba\\S3\\' => 
-        array (
-            0 => __DIR__ . '/..' . '/akeeba/s3/src',
-        ),
-    );
-
-    public static $classMap = array (
-        'Akeeba\\S3\\Acl' => __DIR__ . '/..' . '/akeeba/s3/src/Acl.php',
-        'Akeeba\\S3\\Configuration' => __DIR__ . '/..' . '/akeeba/s3/src/Configuration.php',
-        'Akeeba\\S3\\Connector' => __DIR__ . '/..' . '/akeeba/s3/src/Connector.php',
-        'Akeeba\\S3\\Exception\\CannotDeleteFile' => __DIR__ . '/..' . '/akeeba/s3/src/Exception/CannotDeleteFile.php',
-        'Akeeba\\S3\\Exception\\CannotGetBucket' => __DIR__ . '/..' . '/akeeba/s3/src/Exception/CannotGetBucket.php',
-        'Akeeba\\S3\\Exception\\CannotGetFile' => __DIR__ . '/..' . '/akeeba/s3/src/Exception/CannotGetFile.php',
-        'Akeeba\\S3\\Exception\\CannotListBuckets' => __DIR__ . '/..' . '/akeeba/s3/src/Exception/CannotListBuckets.php',
-        'Akeeba\\S3\\Exception\\CannotOpenFileForRead' => __DIR__ . '/..' . '/akeeba/s3/src/Exception/CannotOpenFileForRead.php',
-        'Akeeba\\S3\\Exception\\CannotOpenFileForWrite' => __DIR__ . '/..' . '/akeeba/s3/src/Exception/CannotOpenFileForWrite.php',
-        'Akeeba\\S3\\Exception\\CannotPutFile' => __DIR__ . '/..' . '/akeeba/s3/src/Exception/CannotPutFile.php',
-        'Akeeba\\S3\\Exception\\ConfigurationError' => __DIR__ . '/..' . '/akeeba/s3/src/Exception/ConfigurationError.php',
-        'Akeeba\\S3\\Exception\\InvalidAccessKey' => __DIR__ . '/..' . '/akeeba/s3/src/Exception/InvalidAccessKey.php',
-        'Akeeba\\S3\\Exception\\InvalidBody' => __DIR__ . '/..' . '/akeeba/s3/src/Exception/InvalidBody.php',
-        'Akeeba\\S3\\Exception\\InvalidEndpoint' => __DIR__ . '/..' . '/akeeba/s3/src/Exception/InvalidEndpoint.php',
-        'Akeeba\\S3\\Exception\\InvalidFilePointer' => __DIR__ . '/..' . '/akeeba/s3/src/Exception/InvalidFilePointer.php',
-        'Akeeba\\S3\\Exception\\InvalidRegion' => __DIR__ . '/..' . '/akeeba/s3/src/Exception/InvalidRegion.php',
-        'Akeeba\\S3\\Exception\\InvalidSecretKey' => __DIR__ . '/..' . '/akeeba/s3/src/Exception/InvalidSecretKey.php',
-        'Akeeba\\S3\\Exception\\InvalidSignatureMethod' => __DIR__ . '/..' . '/akeeba/s3/src/Exception/InvalidSignatureMethod.php',
-        'Akeeba\\S3\\Exception\\PropertyNotFound' => __DIR__ . '/..' . '/akeeba/s3/src/Exception/PropertyNotFound.php',
-        'Akeeba\\S3\\Input' => __DIR__ . '/..' . '/akeeba/s3/src/Input.php',
-        'Akeeba\\S3\\Request' => __DIR__ . '/..' . '/akeeba/s3/src/Request.php',
-        'Akeeba\\S3\\Response' => __DIR__ . '/..' . '/akeeba/s3/src/Response.php',
-        'Akeeba\\S3\\Response\\Error' => __DIR__ . '/..' . '/akeeba/s3/src/Response/Error.php',
-        'Akeeba\\S3\\Signature' => __DIR__ . '/..' . '/akeeba/s3/src/Signature.php',
-        'Akeeba\\S3\\Signature\\V2' => __DIR__ . '/..' . '/akeeba/s3/src/Signature/V2.php',
-        'Akeeba\\S3\\Signature\\V4' => __DIR__ . '/..' . '/akeeba/s3/src/Signature/V4.php',
-        'Akeeba\\S3\\StorageClass' => __DIR__ . '/..' . '/akeeba/s3/src/StorageClass.php',
-    );
-
-    public static function getInitializer(ClassLoader $loader)
-    {
-        return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInitS3StorageAddon::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInitS3StorageAddon::$prefixDirsPsr4;
-            $loader->classMap = ComposerStaticInitS3StorageAddon::$classMap;
-
-        }, null, ClassLoader::class);
-    }
-}
diff --git a/s3_storage/vendor/composer/installed.json b/s3_storage/vendor/composer/installed.json
deleted file mode 100644
index ac2eaec6..00000000
--- a/s3_storage/vendor/composer/installed.json
+++ /dev/null
@@ -1,51 +0,0 @@
-[
-    {
-        "name": "akeeba/s3",
-        "version": "2.3.2",
-        "version_normalized": "2.3.2.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/akeeba/s3.git",
-            "reference": "452fbd3084f1cb581851a1602226224d29d586d4"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/akeeba/s3/zipball/452fbd3084f1cb581851a1602226224d29d586d4",
-            "reference": "452fbd3084f1cb581851a1602226224d29d586d4",
-            "shasum": ""
-        },
-        "require": {
-            "ext-curl": "*",
-            "ext-simplexml": "*",
-            "php": ">=7.1.0 <8.4"
-        },
-        "time": "2024-02-19T10:08:06+00:00",
-        "type": "library",
-        "installation-source": "dist",
-        "autoload": {
-            "files": [
-                "src/aliasing.php"
-            ],
-            "psr-4": {
-                "Akeeba\\S3\\": "src"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "GPL-3.0-or-later"
-        ],
-        "authors": [
-            {
-                "name": "Nicholas K. Dionysopoulos",
-                "email": "nicholas_NO_SPAM_PLEASE@akeeba.com",
-                "homepage": "http://www.dionysopoulos.me",
-                "role": "Lead Developer"
-            }
-        ],
-        "description": "A compact, dependency-less Amazon S3 API client implementing the most commonly used features",
-        "homepage": "https://github.com/akeeba/s3",
-        "keywords": [
-            "s3"
-        ]
-    }
-]
diff --git a/saml/README.md b/saml/README.md
deleted file mode 100755
index 6a2ee8f7..00000000
--- a/saml/README.md
+++ /dev/null
@@ -1,17 +0,0 @@
-SAML Addon
-=============
-
-This addon replaces the normal login and registration mechanism with SSO and SLO via a SAML identity provider.
-
-New users are created in the Friendica database when they log in via SAML for the first time. They are given a random password at least 24 characters long.
-
-SAML users with the same usernames/nicknames as existing users will be able to log in as those existing users. Make sure to create SAML accounts for any existing users before activating this addon, or you'll create a situation where a person may claim someone else's account by registering a SAML account with their username.
-
-SSO is triggered when the user visits the Friendica homepage while logged out.
-
-If using KeyCloak as your IdP, make sure the "role_list" scope is either set up to return a single "Role" attribute or to not return one at all. (This addon doesn't need it.) The SAML library used here does not allow multiple attributes with the same name.
-
-To remove the "role_list" from your client in Keycloak, edit the client you created for this addon, click the "Client Scopes" tab, select "role_list" under "Assigned Default Client Scopes," and click "Remove Selected."
-
-For more details on the Keycloak "role_list" issue:
-https://help.nextcloud.com/t/solved-nextcloud-saml-keycloak-as-identity-provider-issues/19293/9
diff --git a/saml/composer.json b/saml/composer.json
deleted file mode 100644
index 2418c2f1..00000000
--- a/saml/composer.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "require": {
-        "onelogin/php-saml": "^4.0",
-        "robrichards/xmlseclibs": "^3.1"
-    }
-}
diff --git a/saml/composer.lock b/saml/composer.lock
deleted file mode 100644
index 46ee7ce6..00000000
--- a/saml/composer.lock
+++ /dev/null
@@ -1,112 +0,0 @@
-{
-    "_readme": [
-        "This file locks the dependencies of your project to a known state",
-        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
-        "This file is @generated automatically"
-    ],
-    "content-hash": "3b4cc13e4ad8a08e53069e39d86dd86f",
-    "packages": [
-        {
-            "name": "onelogin/php-saml",
-            "version": "4.1.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/onelogin/php-saml.git",
-                "reference": "b22a57ebd13e838b90df5d3346090bc37056409d"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/onelogin/php-saml/zipball/b22a57ebd13e838b90df5d3346090bc37056409d",
-                "reference": "b22a57ebd13e838b90df5d3346090bc37056409d",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=7.3",
-                "robrichards/xmlseclibs": ">=3.1.1"
-            },
-            "require-dev": {
-                "pdepend/pdepend": "^2.8.0",
-                "php-coveralls/php-coveralls": "^2.0",
-                "phploc/phploc": "^4.0 || ^5.0 || ^6.0 || ^7.0",
-                "phpunit/phpunit": "^9.5",
-                "sebastian/phpcpd": "^4.0 || ^5.0 || ^6.0 ",
-                "squizlabs/php_codesniffer": "^3.5.8"
-            },
-            "suggest": {
-                "ext-curl": "Install curl lib to be able to use the IdPMetadataParser for parsing remote XMLs",
-                "ext-dom": "Install xml lib",
-                "ext-openssl": "Install openssl lib in order to handle with x509 certs (require to support sign and encryption)",
-                "ext-zlib": "Install zlib"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "OneLogin\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "description": "OneLogin PHP SAML Toolkit",
-            "homepage": "https://developers.onelogin.com/saml/php",
-            "keywords": [
-                "SAML2",
-                "onelogin",
-                "saml"
-            ],
-            "time": "2022-07-15T20:44:36+00:00"
-        },
-        {
-            "name": "robrichards/xmlseclibs",
-            "version": "3.1.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/robrichards/xmlseclibs.git",
-                "reference": "f8f19e58f26cdb42c54b214ff8a820760292f8df"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/robrichards/xmlseclibs/zipball/f8f19e58f26cdb42c54b214ff8a820760292f8df",
-                "reference": "f8f19e58f26cdb42c54b214ff8a820760292f8df",
-                "shasum": ""
-            },
-            "require": {
-                "ext-openssl": "*",
-                "php": ">= 5.4"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "RobRichards\\XMLSecLibs\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "description": "A PHP library for XML Security",
-            "homepage": "https://github.com/robrichards/xmlseclibs",
-            "keywords": [
-                "security",
-                "signature",
-                "xml",
-                "xmldsig"
-            ],
-            "support": {
-                "issues": "https://github.com/robrichards/xmlseclibs/issues",
-                "source": "https://github.com/robrichards/xmlseclibs/tree/3.1.1"
-            },
-            "time": "2020-09-05T13:00:25+00:00"
-        }
-    ],
-    "packages-dev": [],
-    "aliases": [],
-    "minimum-stability": "stable",
-    "stability-flags": [],
-    "prefer-stable": false,
-    "prefer-lowest": false,
-    "platform": [],
-    "platform-dev": [],
-    "plugin-api-version": "1.1.0"
-}
diff --git a/saml/lang/C/messages.po b/saml/lang/C/messages.po
deleted file mode 100644
index 05579568..00000000
--- a/saml/lang/C/messages.po
+++ /dev/null
@@ -1,98 +0,0 @@
-# ADDON saml
-# Copyright (C) 
-# This file is distributed under the same license as the Friendica saml addon package.
-# 
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-18 07:23+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: saml.php:231
-msgid "Settings statement"
-msgstr ""
-
-#: saml.php:232
-msgid ""
-"A statement on the settings page explaining where the user should go to "
-"change their e-mail and password. BBCode allowed."
-msgstr ""
-
-#: saml.php:237
-msgid "IdP ID"
-msgstr ""
-
-#: saml.php:238
-msgid ""
-"Identity provider (IdP) entity URI (e.g., https://example.com/auth/realms/"
-"user)."
-msgstr ""
-
-#: saml.php:242
-msgid "Client ID"
-msgstr ""
-
-#: saml.php:243
-msgid "Identifier assigned to client by the identity provider (IdP)."
-msgstr ""
-
-#: saml.php:247
-msgid "IdP SSO URL"
-msgstr ""
-
-#: saml.php:248
-msgid "The URL for your identity provider's SSO endpoint."
-msgstr ""
-
-#: saml.php:252
-msgid "IdP SLO request URL"
-msgstr ""
-
-#: saml.php:253
-msgid "The URL for your identity provider's SLO request endpoint."
-msgstr ""
-
-#: saml.php:257
-msgid "IdP SLO response URL"
-msgstr ""
-
-#: saml.php:258
-msgid "The URL for your identity provider's SLO response endpoint."
-msgstr ""
-
-#: saml.php:262
-msgid "SP private key"
-msgstr ""
-
-#: saml.php:263
-msgid "The private key the addon should use to authenticate."
-msgstr ""
-
-#: saml.php:267
-msgid "SP certificate"
-msgstr ""
-
-#: saml.php:268
-msgid "The certficate for the addon's private key."
-msgstr ""
-
-#: saml.php:272
-msgid "IdP certificate"
-msgstr ""
-
-#: saml.php:273
-msgid "The x509 certficate for your identity provider."
-msgstr ""
-
-#: saml.php:276
-msgid "Save Settings"
-msgstr ""
diff --git a/saml/lang/de/messages.po b/saml/lang/de/messages.po
deleted file mode 100644
index 720a248f..00000000
--- a/saml/lang/de/messages.po
+++ /dev/null
@@ -1,110 +0,0 @@
-# ADDON saml
-# Copyright (C)
-# This file is distributed under the same license as the Friendica saml addon package.
-# 
-# 
-# Translators:
-# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2021
-# Till Mohr <tmtrfx@till-mohr.de>, 2021
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-18 07:23+0200\n"
-"PO-Revision-Date: 2021-05-18 11:39+0000\n"
-"Last-Translator: Till Mohr <tmtrfx@till-mohr.de>, 2021\n"
-"Language-Team: German (https://www.transifex.com/Friendica/teams/12172/de/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: de\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: saml.php:231
-msgid "Settings statement"
-msgstr "Anweisungen zu den Einstellungen"
-
-#: saml.php:232
-msgid ""
-"A statement on the settings page explaining where the user should go to "
-"change their e-mail and password. BBCode allowed."
-msgstr ""
-"Erörternde Anweisungen, die auf der Einstellungsseite angezeigt werden und "
-"den Nutzern erklären, wo sie ihre E-Mail Adressen und Passwörter ändern "
-"sollen. BBCode wird unterstützt."
-
-#: saml.php:237
-msgid "IdP ID"
-msgstr "IdP ID"
-
-#: saml.php:238
-msgid ""
-"Identity provider (IdP) entity URI (e.g., "
-"https://example.com/auth/realms/user)."
-msgstr ""
-"Entitäten-URL des Identitätsanbieters (IdP)  (z.B. "
-"https://example.com/auth/realms/user)."
-
-#: saml.php:242
-msgid "Client ID"
-msgstr "Client-ID"
-
-#: saml.php:243
-msgid "Identifier assigned to client by the identity provider (IdP)."
-msgstr ""
-"Kennung des Clients, die vom Identitätsanbieter (IdP) zugewiesen wurde."
-
-#: saml.php:247
-msgid "IdP SSO URL"
-msgstr "IdP SSO URL"
-
-#: saml.php:248
-msgid "The URL for your identity provider's SSO endpoint."
-msgstr "Die URL des SSO-Endpunktes deines Identitätenanbieters."
-
-#: saml.php:252
-msgid "IdP SLO request URL"
-msgstr "IdP-SLO-Anfrage-URL"
-
-#: saml.php:253
-msgid "The URL for your identity provider's SLO request endpoint."
-msgstr "Die URL des SLO-Anfrage-Endpunktes deines Identitätenanbieters."
-
-#: saml.php:257
-msgid "IdP SLO response URL"
-msgstr "IdP-SLO-Antwort-URL"
-
-#: saml.php:258
-msgid "The URL for your identity provider's SLO response endpoint."
-msgstr "Die URL des SLO-Antwort-Endpunktes deines Identitätenanbieters."
-
-#: saml.php:262
-msgid "SP private key"
-msgstr "Privater Schlüssel (SP)"
-
-#: saml.php:263
-msgid "The private key the addon should use to authenticate."
-msgstr ""
-"Der private Schlüssel, den das Addon zur Authentifizierung verwenden soll."
-
-#: saml.php:267
-msgid "SP certificate"
-msgstr "SP-Zertifikat"
-
-#: saml.php:268
-msgid "The certficate for the addon's private key."
-msgstr "Das Zertifikat für den privaten Schlüssel des Addons."
-
-#: saml.php:272
-msgid "IdP certificate"
-msgstr "IdP-Zertifikat"
-
-#: saml.php:273
-msgid "The x509 certficate for your identity provider."
-msgstr "Das x509-Zertifikat deines Identitätanbieters."
-
-#: saml.php:276
-msgid "Save Settings"
-msgstr "Einstellungen speichern"
diff --git a/saml/lang/de/strings.php b/saml/lang/de/strings.php
deleted file mode 100644
index 5ea6ad35..00000000
--- a/saml/lang/de/strings.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_de")) {
-function string_plural_select_de($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Settings statement'] = 'Anweisungen zu den Einstellungen';
-$a->strings['A statement on the settings page explaining where the user should go to change their e-mail and password. BBCode allowed.'] = 'Erörternde Anweisungen, die auf der Einstellungsseite angezeigt werden und den Nutzern erklären, wo sie ihre E-Mail Adressen und Passwörter ändern sollen. BBCode wird unterstützt.';
-$a->strings['IdP ID'] = 'IdP ID';
-$a->strings['Identity provider (IdP) entity URI (e.g., https://example.com/auth/realms/user).'] = 'Entitäten-URL des Identitätsanbieters (IdP)  (z.B. https://example.com/auth/realms/user).';
-$a->strings['Client ID'] = 'Client-ID';
-$a->strings['Identifier assigned to client by the identity provider (IdP).'] = 'Kennung des Clients, die vom Identitätsanbieter (IdP) zugewiesen wurde.';
-$a->strings['IdP SSO URL'] = 'IdP SSO URL';
-$a->strings['The URL for your identity provider\'s SSO endpoint.'] = 'Die URL des SSO-Endpunktes deines Identitätenanbieters.';
-$a->strings['IdP SLO request URL'] = 'IdP-SLO-Anfrage-URL';
-$a->strings['The URL for your identity provider\'s SLO request endpoint.'] = 'Die URL des SLO-Anfrage-Endpunktes deines Identitätenanbieters.';
-$a->strings['IdP SLO response URL'] = 'IdP-SLO-Antwort-URL';
-$a->strings['The URL for your identity provider\'s SLO response endpoint.'] = 'Die URL des SLO-Antwort-Endpunktes deines Identitätenanbieters.';
-$a->strings['SP private key'] = 'Privater Schlüssel (SP)';
-$a->strings['The private key the addon should use to authenticate.'] = 'Der private Schlüssel, den das Addon zur Authentifizierung verwenden soll.';
-$a->strings['SP certificate'] = 'SP-Zertifikat';
-$a->strings['The certficate for the addon\'s private key.'] = 'Das Zertifikat für den privaten Schlüssel des Addons.';
-$a->strings['IdP certificate'] = 'IdP-Zertifikat';
-$a->strings['The x509 certficate for your identity provider.'] = 'Das x509-Zertifikat deines Identitätanbieters.';
-$a->strings['Save Settings'] = 'Einstellungen speichern';
diff --git a/saml/lang/hu/messages.po b/saml/lang/hu/messages.po
deleted file mode 100644
index 95dbea6e..00000000
--- a/saml/lang/hu/messages.po
+++ /dev/null
@@ -1,116 +0,0 @@
-# ADDON saml
-# Copyright (C)
-# This file is distributed under the same license as the Friendica saml addon package.
-# 
-# 
-# Translators:
-# Balázs Úr, 2021
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-18 07:23+0200\n"
-"PO-Revision-Date: 2021-05-18 11:39+0000\n"
-"Last-Translator: Balázs Úr, 2021\n"
-"Language-Team: Hungarian (https://www.transifex.com/Friendica/teams/12172/hu/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: hu\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: saml.php:231
-msgid "Settings statement"
-msgstr "Beállítások nyilatkozata"
-
-#: saml.php:232
-msgid ""
-"A statement on the settings page explaining where the user should go to "
-"change their e-mail and password. BBCode allowed."
-msgstr ""
-"Egy nyilatkozat a beállítások oldalon, amely elmagyarázza, hogy a "
-"felhasználónak hova kell mennie az e-mail-címének és a jelszavának "
-"megváltoztatásához. A BBCode engedélyezett."
-
-#: saml.php:237
-msgid "IdP ID"
-msgstr "IdP-azonosító"
-
-#: saml.php:238
-msgid ""
-"Identity provider (IdP) entity URI (e.g., "
-"https://example.com/auth/realms/user)."
-msgstr ""
-"Személyazonosság-szolgáltató (IdP) entitás URI-ja (például "
-"https://example.com/auth/realms/user)."
-
-#: saml.php:242
-msgid "Client ID"
-msgstr "Ügyfél-azonosító"
-
-#: saml.php:243
-msgid "Identifier assigned to client by the identity provider (IdP)."
-msgstr ""
-"A személyazonosság-szolgáltató (IdP) által az ügyfélhez rendelt azonosító."
-
-#: saml.php:247
-msgid "IdP SSO URL"
-msgstr "IdP SSO URL"
-
-#: saml.php:248
-msgid "The URL for your identity provider's SSO endpoint."
-msgstr ""
-"Az URL a személyazonosság-szolgáltatója egyszeri bejelentkezésének "
-"végpontjához."
-
-#: saml.php:252
-msgid "IdP SLO request URL"
-msgstr "IdP SLO kérés URL"
-
-#: saml.php:253
-msgid "The URL for your identity provider's SLO request endpoint."
-msgstr ""
-"Az URL a személyazonosság-szolgáltatója egyszeri kijelentkezési kérésének "
-"végpontjához."
-
-#: saml.php:257
-msgid "IdP SLO response URL"
-msgstr "IdP SLO válasz URL"
-
-#: saml.php:258
-msgid "The URL for your identity provider's SLO response endpoint."
-msgstr ""
-"Az URL a személyazonosság-szolgáltatója egyszeri kijelentkezési válaszának "
-"végpontjához."
-
-#: saml.php:262
-msgid "SP private key"
-msgstr "Szolgáltató személyes kulcsa"
-
-#: saml.php:263
-msgid "The private key the addon should use to authenticate."
-msgstr ""
-"Az a személyes kulcs, amelyet a bővítménynek a hitelesítéshez kell "
-"használnia."
-
-#: saml.php:267
-msgid "SP certificate"
-msgstr "Szolgáltató tanúsítványa"
-
-#: saml.php:268
-msgid "The certficate for the addon's private key."
-msgstr "A tanúsítvány a bővítmény személyes kulcsához."
-
-#: saml.php:272
-msgid "IdP certificate"
-msgstr "IdP tanúsítvány"
-
-#: saml.php:273
-msgid "The x509 certficate for your identity provider."
-msgstr "A személyazonosság-szolgáltatójának x509 tanúsítványa."
-
-#: saml.php:276
-msgid "Save Settings"
-msgstr "Beállítások mentése"
diff --git a/saml/lang/hu/strings.php b/saml/lang/hu/strings.php
deleted file mode 100644
index 40a0f3a2..00000000
--- a/saml/lang/hu/strings.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_hu")) {
-function string_plural_select_hu($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Settings statement'] = 'Beállítások nyilatkozata';
-$a->strings['A statement on the settings page explaining where the user should go to change their e-mail and password. BBCode allowed.'] = 'Egy nyilatkozat a beállítások oldalon, amely elmagyarázza, hogy a felhasználónak hova kell mennie az e-mail-címének és a jelszavának megváltoztatásához. A BBCode engedélyezett.';
-$a->strings['IdP ID'] = 'IdP-azonosító';
-$a->strings['Identity provider (IdP) entity URI (e.g., https://example.com/auth/realms/user).'] = 'Személyazonosság-szolgáltató (IdP) entitás URI-ja (például https://example.com/auth/realms/user).';
-$a->strings['Client ID'] = 'Ügyfél-azonosító';
-$a->strings['Identifier assigned to client by the identity provider (IdP).'] = 'A személyazonosság-szolgáltató (IdP) által az ügyfélhez rendelt azonosító.';
-$a->strings['IdP SSO URL'] = 'IdP SSO URL';
-$a->strings['The URL for your identity provider\'s SSO endpoint.'] = 'Az URL a személyazonosság-szolgáltatója egyszeri bejelentkezésének végpontjához.';
-$a->strings['IdP SLO request URL'] = 'IdP SLO kérés URL';
-$a->strings['The URL for your identity provider\'s SLO request endpoint.'] = 'Az URL a személyazonosság-szolgáltatója egyszeri kijelentkezési kérésének végpontjához.';
-$a->strings['IdP SLO response URL'] = 'IdP SLO válasz URL';
-$a->strings['The URL for your identity provider\'s SLO response endpoint.'] = 'Az URL a személyazonosság-szolgáltatója egyszeri kijelentkezési válaszának végpontjához.';
-$a->strings['SP private key'] = 'Szolgáltató személyes kulcsa';
-$a->strings['The private key the addon should use to authenticate.'] = 'Az a személyes kulcs, amelyet a bővítménynek a hitelesítéshez kell használnia.';
-$a->strings['SP certificate'] = 'Szolgáltató tanúsítványa';
-$a->strings['The certficate for the addon\'s private key.'] = 'A tanúsítvány a bővítmény személyes kulcsához.';
-$a->strings['IdP certificate'] = 'IdP tanúsítvány';
-$a->strings['The x509 certficate for your identity provider.'] = 'A személyazonosság-szolgáltatójának x509 tanúsítványa.';
-$a->strings['Save Settings'] = 'Beállítások mentése';
diff --git a/saml/lang/pl/messages.po b/saml/lang/pl/messages.po
deleted file mode 100644
index 21a978ae..00000000
--- a/saml/lang/pl/messages.po
+++ /dev/null
@@ -1,108 +0,0 @@
-# ADDON saml
-# Copyright (C)
-# This file is distributed under the same license as the Friendica saml addon package.
-# 
-# 
-# Translators:
-# Piotr Strębski <strebski@gmail.com>, 2022
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-05-18 07:23+0200\n"
-"PO-Revision-Date: 2021-05-18 11:39+0000\n"
-"Last-Translator: Piotr Strębski <strebski@gmail.com>, 2022\n"
-"Language-Team: Polish (https://www.transifex.com/Friendica/teams/12172/pl/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: pl\n"
-"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
-
-#: saml.php:231
-msgid "Settings statement"
-msgstr "Oświadczenie o ustawieniach"
-
-#: saml.php:232
-msgid ""
-"A statement on the settings page explaining where the user should go to "
-"change their e-mail and password. BBCode allowed."
-msgstr ""
-"Oświadczenie na stronie ustawień wyjaśniające, gdzie użytkownik powinien się"
-" udać, aby zmienić swój adres e-mail i hasło. Dozwolony kod BBCode."
-
-#: saml.php:237
-msgid "IdP ID"
-msgstr "ID IdP"
-
-#: saml.php:238
-msgid ""
-"Identity provider (IdP) entity URI (e.g., "
-"https://example.com/auth/realms/user)."
-msgstr ""
-"Identyfikator URI jednostki dostawcy tożsamości (IdP) (np. "
-"https://example.com/auth/realms/user)."
-
-#: saml.php:242
-msgid "Client ID"
-msgstr "ID klienta"
-
-#: saml.php:243
-msgid "Identifier assigned to client by the identity provider (IdP)."
-msgstr "Identyfikator przypisywany klientowi przez dostawcę tożsamości (IdP)."
-
-#: saml.php:247
-msgid "IdP SSO URL"
-msgstr "Adres URL logowania jednokrotnego dostawcy tożsamości"
-
-#: saml.php:248
-msgid "The URL for your identity provider's SSO endpoint."
-msgstr ""
-"Adres URL punktu końcowego logowania jednokrotnego dostawcy tożsamości."
-
-#: saml.php:252
-msgid "IdP SLO request URL"
-msgstr "Adres URL żądania SLO dostawcy tożsamości"
-
-#: saml.php:253
-msgid "The URL for your identity provider's SLO request endpoint."
-msgstr "Adres URL punktu końcowego żądania SLO dostawcy tożsamości."
-
-#: saml.php:257
-msgid "IdP SLO response URL"
-msgstr "Adres URL odpowiedzi dostawcy usług SLO"
-
-#: saml.php:258
-msgid "The URL for your identity provider's SLO response endpoint."
-msgstr ""
-"Adres URL punktu końcowego odpowiedzi SLO Twojego dostawcy tożsamości."
-
-#: saml.php:262
-msgid "SP private key"
-msgstr "Klucz prywatny SP"
-
-#: saml.php:263
-msgid "The private key the addon should use to authenticate."
-msgstr "Klucz prywatny, którego dodatek powinien używać do uwierzytelniania."
-
-#: saml.php:267
-msgid "SP certificate"
-msgstr "Certyfikat SP"
-
-#: saml.php:268
-msgid "The certficate for the addon's private key."
-msgstr "Certyfikat klucza prywatnego dodatku."
-
-#: saml.php:272
-msgid "IdP certificate"
-msgstr "Certyfikat IdP"
-
-#: saml.php:273
-msgid "The x509 certficate for your identity provider."
-msgstr "Certyfikat x509 dla dostawcy tożsamości."
-
-#: saml.php:276
-msgid "Save Settings"
-msgstr "Zapisz ustawienia"
diff --git a/saml/lang/pl/strings.php b/saml/lang/pl/strings.php
deleted file mode 100644
index 961bb610..00000000
--- a/saml/lang/pl/strings.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_pl")) {
-function string_plural_select_pl($n){
-	$n = intval($n);
-	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
-}}
-$a->strings['Settings statement'] = 'Oświadczenie o ustawieniach';
-$a->strings['A statement on the settings page explaining where the user should go to change their e-mail and password. BBCode allowed.'] = 'Oświadczenie na stronie ustawień wyjaśniające, gdzie użytkownik powinien się udać, aby zmienić swój adres e-mail i hasło. Dozwolony kod BBCode.';
-$a->strings['IdP ID'] = 'ID IdP';
-$a->strings['Identity provider (IdP) entity URI (e.g., https://example.com/auth/realms/user).'] = 'Identyfikator URI jednostki dostawcy tożsamości (IdP) (np. https://example.com/auth/realms/user).';
-$a->strings['Client ID'] = 'ID klienta';
-$a->strings['Identifier assigned to client by the identity provider (IdP).'] = 'Identyfikator przypisywany klientowi przez dostawcę tożsamości (IdP).';
-$a->strings['IdP SSO URL'] = 'Adres URL logowania jednokrotnego dostawcy tożsamości';
-$a->strings['The URL for your identity provider\'s SSO endpoint.'] = 'Adres URL punktu końcowego logowania jednokrotnego dostawcy tożsamości.';
-$a->strings['IdP SLO request URL'] = 'Adres URL żądania SLO dostawcy tożsamości';
-$a->strings['The URL for your identity provider\'s SLO request endpoint.'] = 'Adres URL punktu końcowego żądania SLO dostawcy tożsamości.';
-$a->strings['IdP SLO response URL'] = 'Adres URL odpowiedzi dostawcy usług SLO';
-$a->strings['The URL for your identity provider\'s SLO response endpoint.'] = 'Adres URL punktu końcowego odpowiedzi SLO Twojego dostawcy tożsamości.';
-$a->strings['SP private key'] = 'Klucz prywatny SP';
-$a->strings['The private key the addon should use to authenticate.'] = 'Klucz prywatny, którego dodatek powinien używać do uwierzytelniania.';
-$a->strings['SP certificate'] = 'Certyfikat SP';
-$a->strings['The certficate for the addon\'s private key.'] = 'Certyfikat klucza prywatnego dodatku.';
-$a->strings['IdP certificate'] = 'Certyfikat IdP';
-$a->strings['The x509 certficate for your identity provider.'] = 'Certyfikat x509 dla dostawcy tożsamości.';
-$a->strings['Save Settings'] = 'Zapisz ustawienia';
diff --git a/saml/saml.css b/saml/saml.css
deleted file mode 100644
index 087633cd..00000000
--- a/saml/saml.css
+++ /dev/null
@@ -1 +0,0 @@
-#settings-form > div:first-of-type, #settings-form > h2:first-of-type, #wrapper_mpassword, #wrapper_email { display: none !important; }
diff --git a/saml/saml.php b/saml/saml.php
deleted file mode 100755
index 56dd0f5d..00000000
--- a/saml/saml.php
+++ /dev/null
@@ -1,470 +0,0 @@
-<?php
-/*
- * Name: SAML SSO and SLO
- * Description: replace login and registration with a SAML identity provider.
- * Version: 1.0
- * Author: Ryan <https://friendica.verya.pe/profile/ryan>
- */
-
-use Friendica\Content\Text\BBCode;
-use Friendica\Core\Hook;
-use Friendica\Core\Logger;
-use Friendica\Core\Renderer;
-use Friendica\Database\DBA;
-use Friendica\DI;
-use Friendica\Model\User;
-use OneLogin\Saml2\Utils;
-
-require_once(__DIR__ . '/vendor/autoload.php');
-
-define('PW_LEN', 32); // number of characters to use for random passwords
-
-function saml_module() {}
-
-function saml_init()
-{
-	if (DI::args()->getArgc() < 2) {
-		return;
-	}
-
-	if (!saml_is_configured()) {
-		echo 'Please configure the SAML add-on via the admin interface.';
-		return;
-	}
-
-	switch (DI::args()->get(1)) {
-		case 'metadata.xml':
-			saml_metadata();
-			break;
-		case 'sso':
-			saml_sso_reply();
-			break;
-		case 'slo':
-			saml_slo_reply();
-			break;
-	}
-	exit();
-}
-
-function saml_metadata()
-{
-	try {
-		$settings = new \OneLogin\Saml2\Settings(saml_settings());
-		$metadata = $settings->getSPMetadata();
-		$errors = $settings->validateMetadata($metadata);
-
-		if (empty($errors)) {
-			header('Content-Type: text/xml');
-			echo $metadata;
-		} else {
-			throw new \OneLogin\Saml2\Error(
-				'Invalid SP metadata: '.implode(', ', $errors),
-				\OneLogin\Saml2\Error::METADATA_SP_INVALID
-			);
-		}
-	} catch (Exception $e) {
-		Logger::error($e->getMessage());
-	}
-}
-
-function saml_install()
-{
-	Hook::register('login_hook', __FILE__, 'saml_sso_initiate');
-	Hook::register('logging_out', __FILE__, 'saml_slo_initiate');
-	Hook::register('head', __FILE__, 'saml_head');
-	Hook::register('footer', __FILE__, 'saml_footer');
-}
-
-function saml_head(string &$body)
-{
-	DI::page()->registerStylesheet(__DIR__ . '/saml.css');
-}
-
-function saml_footer(string &$body)
-{
-	$fragment = addslashes(BBCode::convertForUriId(User::getSystemUriId(), DI::config()->get('saml', 'settings_statement')));
-	$body .= <<<EOL
-<script>
-var target=$("#settings-nickname-desc");
-if (target.length) { target.append("<p>$fragment</p>"); }
-</script>
-EOL;
-}
-
-function saml_is_configured()
-{
-	return
-		DI::config()->get('saml', 'idp_id') &&
-		DI::config()->get('saml', 'client_id') &&
-		DI::config()->get('saml', 'sso_url') &&
-		DI::config()->get('saml', 'slo_request_url') &&
-		DI::config()->get('saml', 'slo_response_url') &&
-		DI::config()->get('saml', 'sp_key') &&
-		DI::config()->get('saml', 'sp_cert') &&
-		DI::config()->get('saml', 'idp_cert');
-}
-
-function saml_sso_initiate(string &$body)
-{
-	if (!saml_is_configured()) {
-		Logger::warning('SAML SSO tried to trigger, but the SAML addon is not configured yet!');
-		return;
-	}
-
-	$auth = new \OneLogin\Saml2\Auth(saml_settings());
-	$ssoBuiltUrl = $auth->login(null, [], false, false, true);
-	DI::session()->set('AuthNRequestID', $auth->getLastRequestID());
-	header('Pragma: no-cache');
-	header('Cache-Control: no-cache, must-revalidate');
-	header('Location: ' . $ssoBuiltUrl);
-	exit();
-}
-
-function saml_sso_reply()
-{
-	$auth = new \OneLogin\Saml2\Auth(saml_settings());
-	$requestID = null;
-
-	if (DI::session()->exists('AuthNRequestID')) {
-		$requestID = DI::session()->get('AuthNRequestID');
-	}
-
-	$auth->processResponse($requestID);
-	DI::session()->remove('AuthNRequestID');
-
-	$errors = $auth->getErrors();
-
-	if (!empty($errors)) {
-		echo 'Errors encountered.';
-		Logger::error(implode(', ', $errors));
-		exit();
-	}
-
-	if (!$auth->isAuthenticated()) {
-		echo 'Not authenticated';
-		exit();
-	}
-
-	$username = $auth->getNameId();
-	$email = $auth->getAttributeWithFriendlyName('email')[0];
-	$name = $auth->getAttributeWithFriendlyName('givenName')[0];
-	$last_name = $auth->getAttributeWithFriendlyName('surname')[0];
-
-	if (strlen($last_name)) {
-		$name .= " $last_name";
-	}
-
-	if (!DBA::exists('user', ['nickname' => $username])) {
-		$user = saml_create_user($username, $email, $name);
-	} else {
-		$user = User::getByNickname($username);
-	}
-
-	if (!empty($user['uid'])) {
-		DI::auth()->setForUser(DI::app(), $user);
-	}
-
-	if (isset($_POST['RelayState']) && Utils::getSelfURL() != $_POST['RelayState']) {
-		$auth->redirectTo($_POST['RelayState']);
-	}
-}
-
-function saml_slo_initiate()
-{
-	if (!saml_is_configured()) {
-		Logger::warning('SAML SLO tried to trigger, but the SAML addon is not configured yet!');
-		return;
-	}
-
-	$auth = new \OneLogin\Saml2\Auth(saml_settings());
-
-	$sloBuiltUrl = $auth->logout();
-	DI::session()->set('LogoutRequestID', $auth->getLastRequestID());
-	header('Pragma: no-cache');
-	header('Cache-Control: no-cache, must-revalidate');
-	header('Location: ' . $sloBuiltUrl);
-	exit();
-}
-
-function saml_slo_reply()
-{
-	$auth = new \OneLogin\Saml2\Auth(saml_settings());
-
-	if (DI::session()->exists('LogoutRequestID')) {
-		$requestID = DI::session()->get('LogoutRequestID');
-	} else {
-		$requestID = null;
-	}
-
-	$auth->processSLO(false, $requestID);
-
-	$errors = $auth->getErrors();
-
-	if (empty($errors)) {
-		$auth->redirectTo(DI::baseUrl());
-	} else {
-		Logger::error(implode(', ', $errors));
-	}
-}
-
-function saml_input($key, $label, $description)
-{
-	return [
-		'$' . $key => [
-			$key,
-			$label,
-			DI::config()->get('saml', $key),
-			$description,
-			true, // all the fields are required
-		]
-	];
-}
-
-function saml_addon_admin(string &$o)
-{
-	$form =
-		saml_input(
-			'settings_statement',
-			DI::l10n()->t('Settings statement'),
-			DI::l10n()->t('A statement on the settings page explaining where the user should go to change '
-					. 'their e-mail and password. BBCode allowed.')
-		) +
-		saml_input(
-			'idp_id',
-			DI::l10n()->t('IdP ID'),
-			DI::l10n()->t('Identity provider (IdP) entity URI (e.g., https://example.com/auth/realms/user).')
-		) +
-		saml_input(
-			'client_id',
-			DI::l10n()->t('Client ID'),
-			DI::l10n()->t('Identifier assigned to client by the identity provider (IdP).')
-		) +
-		saml_input(
-			'sso_url',
-			DI::l10n()->t('IdP SSO URL'),
-			DI::l10n()->t('The URL for your identity provider\'s SSO endpoint.')
-		) +
-		saml_input(
-			'slo_request_url',
-			DI::l10n()->t('IdP SLO request URL'),
-			DI::l10n()->t('The URL for your identity provider\'s SLO request endpoint.')
-		) +
-		saml_input(
-			'slo_response_url',
-			DI::l10n()->t('IdP SLO response URL'),
-			DI::l10n()->t('The URL for your identity provider\'s SLO response endpoint.')
-		) +
-		saml_input(
-			'sp_key',
-			DI::l10n()->t('SP private key'),
-			DI::l10n()->t('The private key the addon should use to authenticate.')
-		) +
-		saml_input(
-			'sp_cert',
-			DI::l10n()->t('SP certificate'),
-			DI::l10n()->t('The certficate for the addon\'s private key.')
-		) +
-		saml_input(
-			'idp_cert',
-			DI::l10n()->t('IdP certificate'),
-			DI::l10n()->t('The x509 certficate for your identity provider.')
-		) +
-		[
-			'$submit'  => DI::l10n()->t('Save Settings'),
-		];
-	$t = Renderer::getMarkupTemplate('admin.tpl', 'addon/saml/');
-	$o = Renderer::replaceMacros($t, $form);
-}
-
-function saml_addon_admin_post()
-{
-	$set = function ($key) {
-		$val = (!empty($_POST[$key]) ? trim($_POST[$key]) : '');
-		DI::config()->set('saml', $key, $val);
-	};
-	$set('idp_id');
-	$set('client_id');
-	$set('sso_url');
-	$set('slo_request_url');
-	$set('slo_response_url');
-	$set('sp_key');
-	$set('sp_cert');
-	$set('idp_cert');
-	$set('settings_statement');
-}
-
-function saml_create_user($username, $email, $name)
-{
-	if (!strlen($email) || !strlen($name)) {
-		Logger::error('Could not create user: no email or username given.');
-		return false;
-	}
-
-	try {
-		$strong = false;
-		$bytes = openssl_random_pseudo_bytes(intval(ceil(PW_LEN * 0.75)), $strong);
-
-		if (!$strong) {
-			throw new Exception('Strong algorithm not available for PRNG.');
-		}
-
-		$user = User::create([
-			'username' => $name,
-			'nickname' => $username,
-			'email'	=> $email,
-			'password' => base64_encode($bytes), // should be at least PW_LEN long
-			'verified' => true
-		]);
-
-		return $user;
-	} catch (Exception $e) {
-		Logger::error(
-			'Exception while creating user',
-			[
-				'username'  => $username,
-				'email'	 => $email,
-				'name'	  => $name,
-				'exception' => $e->getMessage(),
-				'trace'	 => $e->getTraceAsString()
-			]
-		);
-
-		return false;
-	}
-}
-
-function saml_settings()
-{
-	return [
-
-		// If 'strict' is True, then the PHP Toolkit will reject unsigned
-		// or unencrypted messages if it expects them to be signed or encrypted.
-		// Also it will reject the messages if the SAML standard is not strictly
-		// followed: Destination, NameId, Conditions ... are validated too.
-		// Should never be set to anything else in production!
-		'strict' => true,
-
-		// Enable debug mode (to print errors).
-		'debug' => false,
-
-		// Set a BaseURL to be used instead of try to guess
-		// the BaseURL of the view that process the SAML Message.
-		// Ex http://sp.example.com/
-		//	http://example.com/sp/
-		'baseurl' => DI::baseUrl() . '/saml',
-
-		// Service Provider Data that we are deploying.
-		'sp' => [
-
-			// Identifier of the SP entity  (must be a URI)
-			'entityId' => DI::config()->get('saml', 'client_id'),
-
-			// Specifies info about where and how the <AuthnResponse> message MUST be
-			// returned to the requester, in this case our SP.
-			'assertionConsumerService' => [
-
-				// URL Location where the <Response> from the IdP will be returned
-				'url' => DI::baseUrl() . '/saml/sso',
-
-				// SAML protocol binding to be used when returning the <Response>
-				// message. OneLogin Toolkit supports this endpoint for the
-				// HTTP-POST binding only.
-				'binding' => 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST',
-			],
-
-			// If you need to specify requested attributes, set a
-			// attributeConsumingService. nameFormat, attributeValue and
-			// friendlyName can be omitted
-			'attributeConsumingService'=> [
-				'serviceName' => 'Friendica SAML SSO and SLO Addon',
-				'serviceDescription' => 'SLO and SSO support for Friendica',
-				'requestedAttributes' => [
-					[
-						'uid' => '',
-						'isRequired' => false,
-					]
-				]
-			],
-
-			// Specifies info about where and how the <Logout Response> message MUST be
-			// returned to the requester, in this case our SP.
-			'singleLogoutService' => [
-
-				// URL Location where the <Response> from the IdP will be returned
-				'url' => DI::baseUrl() . '/saml/slo',
-
-				// SAML protocol binding to be used when returning the <Response>
-				// message. OneLogin Toolkit supports the HTTP-Redirect binding
-				// only for this endpoint.
-				'binding' => 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect',
-			],
-
-			// Specifies the constraints on the name identifier to be used to
-			// represent the requested subject.
-			// Take a look on lib/Saml2/Constants.php to see the NameIdFormat supported.
-			'NameIDFormat' => 'urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified',
-
-			// Usually x509cert and privateKey of the SP are provided by files placed at
-			// the certs folder. But we can also provide them with the following parameters
-			'x509cert' => DI::config()->get('saml', 'sp_cert'),
-			'privateKey' => DI::config()->get('saml', 'sp_key'),
-		],
-
-		// Identity Provider Data that we want connected with our SP.
-		'idp' => [
-
-			// Identifier of the IdP entity  (must be a URI)
-			'entityId' => DI::config()->get('saml', 'idp_id'),
-
-			// SSO endpoint info of the IdP. (Authentication Request protocol)
-			'singleSignOnService' => [
-
-				// URL Target of the IdP where the Authentication Request Message
-				// will be sent.
-				'url' => DI::config()->get('saml', 'sso_url'),
-
-				// SAML protocol binding to be used when returning the <Response>
-				// message. OneLogin Toolkit supports the HTTP-Redirect binding
-				// only for this endpoint.
-				'binding' => 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect',
-			],
-
-			// SLO endpoint info of the IdP.
-			'singleLogoutService' => [
-
-				// URL Location of the IdP where SLO Request will be sent.
-				'url' => DI::config()->get('saml', 'slo_request_url'),
-
-				// URL location of the IdP where SLO Response will be sent (ResponseLocation)
-				// if not set, url for the SLO Request will be used
-				'responseUrl' => DI::config()->get('saml', 'slo_response_url'),
-
-				// SAML protocol binding to be used when returning the <Response>
-				// message. OneLogin Toolkit supports the HTTP-Redirect binding
-				// only for this endpoint.
-				'binding' => 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect',
-			],
-
-			// Public x509 certificate of the IdP
-			'x509cert' => DI::config()->get('saml', 'idp_cert'),
-		],
-		'security' => [
-			'wantXMLValidation' => false,
-
-			// Indicates whether the <samlp:AuthnRequest> messages sent by this SP
-			// will be signed.  [Metadata of the SP will offer this info]
-			'authnRequestsSigned' => true,
-
-			// Indicates whether the <samlp:logoutRequest> messages sent by this SP
-			// will be signed.
-			'logoutRequestSigned' => true,
-
-			// Indicates whether the <samlp:logoutResponse> messages sent by this SP
-			// will be signed.
-			'logoutResponseSigned' => true,
-
-			// Sign the Metadata
-			'signMetadata' => true,
-		]
-	];
-}
diff --git a/saml/templates/admin.tpl b/saml/templates/admin.tpl
deleted file mode 100755
index a563481c..00000000
--- a/saml/templates/admin.tpl
+++ /dev/null
@@ -1,10 +0,0 @@
-{{include file="field_textarea.tpl" field=$settings_statement}}
-{{include file="field_input.tpl" field=$idp_id}}
-{{include file="field_input.tpl" field=$client_id}}
-{{include file="field_input.tpl" field=$sso_url}}
-{{include file="field_input.tpl" field=$slo_request_url}}
-{{include file="field_input.tpl" field=$slo_response_url}}
-{{include file="field_textarea.tpl" field=$sp_key}}
-{{include file="field_textarea.tpl" field=$sp_cert}}
-{{include file="field_textarea.tpl" field=$idp_cert}}
-<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
diff --git a/saml/vendor/autoload.php b/saml/vendor/autoload.php
deleted file mode 100644
index c3e11136..00000000
--- a/saml/vendor/autoload.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-// autoload.php @generated by Composer
-
-require_once __DIR__ . '/composer/autoload_real.php';
-
-return ComposerAutoloaderInit6ecac07d47dd9d108b36bee3eda76704::getLoader();
diff --git a/saml/vendor/composer/ClassLoader.php b/saml/vendor/composer/ClassLoader.php
deleted file mode 100644
index 03b9bb9c..00000000
--- a/saml/vendor/composer/ClassLoader.php
+++ /dev/null
@@ -1,445 +0,0 @@
-<?php
-
-/*
- * This file is part of Composer.
- *
- * (c) Nils Adermann <naderman@naderman.de>
- *     Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Composer\Autoload;
-
-/**
- * ClassLoader implements a PSR-0, PSR-4 and classmap class loader.
- *
- *     $loader = new \Composer\Autoload\ClassLoader();
- *
- *     // register classes with namespaces
- *     $loader->add('Symfony\Component', __DIR__.'/component');
- *     $loader->add('Symfony',           __DIR__.'/framework');
- *
- *     // activate the autoloader
- *     $loader->register();
- *
- *     // to enable searching the include path (eg. for PEAR packages)
- *     $loader->setUseIncludePath(true);
- *
- * In this example, if you try to use a class in the Symfony\Component
- * namespace or one of its children (Symfony\Component\Console for instance),
- * the autoloader will first look for the class under the component/
- * directory, and it will then fallback to the framework/ directory if not
- * found before giving up.
- *
- * This class is loosely based on the Symfony UniversalClassLoader.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- * @author Jordi Boggiano <j.boggiano@seld.be>
- * @see    http://www.php-fig.org/psr/psr-0/
- * @see    http://www.php-fig.org/psr/psr-4/
- */
-class ClassLoader
-{
-    // PSR-4
-    private $prefixLengthsPsr4 = array();
-    private $prefixDirsPsr4 = array();
-    private $fallbackDirsPsr4 = array();
-
-    // PSR-0
-    private $prefixesPsr0 = array();
-    private $fallbackDirsPsr0 = array();
-
-    private $useIncludePath = false;
-    private $classMap = array();
-    private $classMapAuthoritative = false;
-    private $missingClasses = array();
-    private $apcuPrefix;
-
-    public function getPrefixes()
-    {
-        if (!empty($this->prefixesPsr0)) {
-            return call_user_func_array('array_merge', array_values($this->prefixesPsr0));
-        }
-
-        return array();
-    }
-
-    public function getPrefixesPsr4()
-    {
-        return $this->prefixDirsPsr4;
-    }
-
-    public function getFallbackDirs()
-    {
-        return $this->fallbackDirsPsr0;
-    }
-
-    public function getFallbackDirsPsr4()
-    {
-        return $this->fallbackDirsPsr4;
-    }
-
-    public function getClassMap()
-    {
-        return $this->classMap;
-    }
-
-    /**
-     * @param array $classMap Class to filename map
-     */
-    public function addClassMap(array $classMap)
-    {
-        if ($this->classMap) {
-            $this->classMap = array_merge($this->classMap, $classMap);
-        } else {
-            $this->classMap = $classMap;
-        }
-    }
-
-    /**
-     * Registers a set of PSR-0 directories for a given prefix, either
-     * appending or prepending to the ones previously set for this prefix.
-     *
-     * @param string       $prefix  The prefix
-     * @param array|string $paths   The PSR-0 root directories
-     * @param bool         $prepend Whether to prepend the directories
-     */
-    public function add($prefix, $paths, $prepend = false)
-    {
-        if (!$prefix) {
-            if ($prepend) {
-                $this->fallbackDirsPsr0 = array_merge(
-                    (array) $paths,
-                    $this->fallbackDirsPsr0
-                );
-            } else {
-                $this->fallbackDirsPsr0 = array_merge(
-                    $this->fallbackDirsPsr0,
-                    (array) $paths
-                );
-            }
-
-            return;
-        }
-
-        $first = $prefix[0];
-        if (!isset($this->prefixesPsr0[$first][$prefix])) {
-            $this->prefixesPsr0[$first][$prefix] = (array) $paths;
-
-            return;
-        }
-        if ($prepend) {
-            $this->prefixesPsr0[$first][$prefix] = array_merge(
-                (array) $paths,
-                $this->prefixesPsr0[$first][$prefix]
-            );
-        } else {
-            $this->prefixesPsr0[$first][$prefix] = array_merge(
-                $this->prefixesPsr0[$first][$prefix],
-                (array) $paths
-            );
-        }
-    }
-
-    /**
-     * Registers a set of PSR-4 directories for a given namespace, either
-     * appending or prepending to the ones previously set for this namespace.
-     *
-     * @param string       $prefix  The prefix/namespace, with trailing '\\'
-     * @param array|string $paths   The PSR-4 base directories
-     * @param bool         $prepend Whether to prepend the directories
-     *
-     * @throws \InvalidArgumentException
-     */
-    public function addPsr4($prefix, $paths, $prepend = false)
-    {
-        if (!$prefix) {
-            // Register directories for the root namespace.
-            if ($prepend) {
-                $this->fallbackDirsPsr4 = array_merge(
-                    (array) $paths,
-                    $this->fallbackDirsPsr4
-                );
-            } else {
-                $this->fallbackDirsPsr4 = array_merge(
-                    $this->fallbackDirsPsr4,
-                    (array) $paths
-                );
-            }
-        } elseif (!isset($this->prefixDirsPsr4[$prefix])) {
-            // Register directories for a new namespace.
-            $length = strlen($prefix);
-            if ('\\' !== $prefix[$length - 1]) {
-                throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
-            }
-            $this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length;
-            $this->prefixDirsPsr4[$prefix] = (array) $paths;
-        } elseif ($prepend) {
-            // Prepend directories for an already registered namespace.
-            $this->prefixDirsPsr4[$prefix] = array_merge(
-                (array) $paths,
-                $this->prefixDirsPsr4[$prefix]
-            );
-        } else {
-            // Append directories for an already registered namespace.
-            $this->prefixDirsPsr4[$prefix] = array_merge(
-                $this->prefixDirsPsr4[$prefix],
-                (array) $paths
-            );
-        }
-    }
-
-    /**
-     * Registers a set of PSR-0 directories for a given prefix,
-     * replacing any others previously set for this prefix.
-     *
-     * @param string       $prefix The prefix
-     * @param array|string $paths  The PSR-0 base directories
-     */
-    public function set($prefix, $paths)
-    {
-        if (!$prefix) {
-            $this->fallbackDirsPsr0 = (array) $paths;
-        } else {
-            $this->prefixesPsr0[$prefix[0]][$prefix] = (array) $paths;
-        }
-    }
-
-    /**
-     * Registers a set of PSR-4 directories for a given namespace,
-     * replacing any others previously set for this namespace.
-     *
-     * @param string       $prefix The prefix/namespace, with trailing '\\'
-     * @param array|string $paths  The PSR-4 base directories
-     *
-     * @throws \InvalidArgumentException
-     */
-    public function setPsr4($prefix, $paths)
-    {
-        if (!$prefix) {
-            $this->fallbackDirsPsr4 = (array) $paths;
-        } else {
-            $length = strlen($prefix);
-            if ('\\' !== $prefix[$length - 1]) {
-                throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
-            }
-            $this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length;
-            $this->prefixDirsPsr4[$prefix] = (array) $paths;
-        }
-    }
-
-    /**
-     * Turns on searching the include path for class files.
-     *
-     * @param bool $useIncludePath
-     */
-    public function setUseIncludePath($useIncludePath)
-    {
-        $this->useIncludePath = $useIncludePath;
-    }
-
-    /**
-     * Can be used to check if the autoloader uses the include path to check
-     * for classes.
-     *
-     * @return bool
-     */
-    public function getUseIncludePath()
-    {
-        return $this->useIncludePath;
-    }
-
-    /**
-     * Turns off searching the prefix and fallback directories for classes
-     * that have not been registered with the class map.
-     *
-     * @param bool $classMapAuthoritative
-     */
-    public function setClassMapAuthoritative($classMapAuthoritative)
-    {
-        $this->classMapAuthoritative = $classMapAuthoritative;
-    }
-
-    /**
-     * Should class lookup fail if not found in the current class map?
-     *
-     * @return bool
-     */
-    public function isClassMapAuthoritative()
-    {
-        return $this->classMapAuthoritative;
-    }
-
-    /**
-     * APCu prefix to use to cache found/not-found classes, if the extension is enabled.
-     *
-     * @param string|null $apcuPrefix
-     */
-    public function setApcuPrefix($apcuPrefix)
-    {
-        $this->apcuPrefix = function_exists('apcu_fetch') && filter_var(ini_get('apc.enabled'), FILTER_VALIDATE_BOOLEAN) ? $apcuPrefix : null;
-    }
-
-    /**
-     * The APCu prefix in use, or null if APCu caching is not enabled.
-     *
-     * @return string|null
-     */
-    public function getApcuPrefix()
-    {
-        return $this->apcuPrefix;
-    }
-
-    /**
-     * Registers this instance as an autoloader.
-     *
-     * @param bool $prepend Whether to prepend the autoloader or not
-     */
-    public function register($prepend = false)
-    {
-        spl_autoload_register(array($this, 'loadClass'), true, $prepend);
-    }
-
-    /**
-     * Unregisters this instance as an autoloader.
-     */
-    public function unregister()
-    {
-        spl_autoload_unregister(array($this, 'loadClass'));
-    }
-
-    /**
-     * Loads the given class or interface.
-     *
-     * @param  string    $class The name of the class
-     * @return bool|null True if loaded, null otherwise
-     */
-    public function loadClass($class)
-    {
-        if ($file = $this->findFile($class)) {
-            includeFile($file);
-
-            return true;
-        }
-    }
-
-    /**
-     * Finds the path to the file where the class is defined.
-     *
-     * @param string $class The name of the class
-     *
-     * @return string|false The path if found, false otherwise
-     */
-    public function findFile($class)
-    {
-        // class map lookup
-        if (isset($this->classMap[$class])) {
-            return $this->classMap[$class];
-        }
-        if ($this->classMapAuthoritative || isset($this->missingClasses[$class])) {
-            return false;
-        }
-        if (null !== $this->apcuPrefix) {
-            $file = apcu_fetch($this->apcuPrefix.$class, $hit);
-            if ($hit) {
-                return $file;
-            }
-        }
-
-        $file = $this->findFileWithExtension($class, '.php');
-
-        // Search for Hack files if we are running on HHVM
-        if (false === $file && defined('HHVM_VERSION')) {
-            $file = $this->findFileWithExtension($class, '.hh');
-        }
-
-        if (null !== $this->apcuPrefix) {
-            apcu_add($this->apcuPrefix.$class, $file);
-        }
-
-        if (false === $file) {
-            // Remember that this class does not exist.
-            $this->missingClasses[$class] = true;
-        }
-
-        return $file;
-    }
-
-    private function findFileWithExtension($class, $ext)
-    {
-        // PSR-4 lookup
-        $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR) . $ext;
-
-        $first = $class[0];
-        if (isset($this->prefixLengthsPsr4[$first])) {
-            $subPath = $class;
-            while (false !== $lastPos = strrpos($subPath, '\\')) {
-                $subPath = substr($subPath, 0, $lastPos);
-                $search = $subPath . '\\';
-                if (isset($this->prefixDirsPsr4[$search])) {
-                    $pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1);
-                    foreach ($this->prefixDirsPsr4[$search] as $dir) {
-                        if (file_exists($file = $dir . $pathEnd)) {
-                            return $file;
-                        }
-                    }
-                }
-            }
-        }
-
-        // PSR-4 fallback dirs
-        foreach ($this->fallbackDirsPsr4 as $dir) {
-            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4)) {
-                return $file;
-            }
-        }
-
-        // PSR-0 lookup
-        if (false !== $pos = strrpos($class, '\\')) {
-            // namespaced class name
-            $logicalPathPsr0 = substr($logicalPathPsr4, 0, $pos + 1)
-                . strtr(substr($logicalPathPsr4, $pos + 1), '_', DIRECTORY_SEPARATOR);
-        } else {
-            // PEAR-like class name
-            $logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR) . $ext;
-        }
-
-        if (isset($this->prefixesPsr0[$first])) {
-            foreach ($this->prefixesPsr0[$first] as $prefix => $dirs) {
-                if (0 === strpos($class, $prefix)) {
-                    foreach ($dirs as $dir) {
-                        if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
-                            return $file;
-                        }
-                    }
-                }
-            }
-        }
-
-        // PSR-0 fallback dirs
-        foreach ($this->fallbackDirsPsr0 as $dir) {
-            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
-                return $file;
-            }
-        }
-
-        // PSR-0 include paths.
-        if ($this->useIncludePath && $file = stream_resolve_include_path($logicalPathPsr0)) {
-            return $file;
-        }
-
-        return false;
-    }
-}
-
-/**
- * Scope isolated include.
- *
- * Prevents access to $this/self from included files.
- */
-function includeFile($file)
-{
-    include $file;
-}
diff --git a/saml/vendor/composer/InstalledVersions.php b/saml/vendor/composer/InstalledVersions.php
deleted file mode 100644
index c71929ad..00000000
--- a/saml/vendor/composer/InstalledVersions.php
+++ /dev/null
@@ -1,301 +0,0 @@
-<?php
-
-
-
-
-
-
-
-
-
-
-
-namespace Composer;
-
-use Composer\Autoload\ClassLoader;
-use Composer\Semver\VersionParser;
-
-
-
-
-
-
-class InstalledVersions
-{
-private static $installed = array (
-  'root' => 
-  array (
-    'pretty_version' => 'dev-develop',
-    'version' => 'dev-develop',
-    'aliases' => 
-    array (
-    ),
-    'reference' => '559c85775e78669a168f48a4302e807d213f6d9f',
-    'name' => '__root__',
-  ),
-  'versions' => 
-  array (
-    '__root__' => 
-    array (
-      'pretty_version' => 'dev-develop',
-      'version' => 'dev-develop',
-      'aliases' => 
-      array (
-      ),
-      'reference' => '559c85775e78669a168f48a4302e807d213f6d9f',
-    ),
-    'onelogin/php-saml' => 
-    array (
-      'pretty_version' => '4.0.0',
-      'version' => '4.0.0.0',
-      'aliases' => 
-      array (
-      ),
-      'reference' => 'f30f5062f3653c4d2082892d207f4dc3e577d979',
-    ),
-    'robrichards/xmlseclibs' => 
-    array (
-      'pretty_version' => '3.1.1',
-      'version' => '3.1.1.0',
-      'aliases' => 
-      array (
-      ),
-      'reference' => 'f8f19e58f26cdb42c54b214ff8a820760292f8df',
-    ),
-  ),
-);
-private static $canGetVendors;
-private static $installedByVendor = array();
-
-
-
-
-
-
-
-public static function getInstalledPackages()
-{
-$packages = array();
-foreach (self::getInstalled() as $installed) {
-$packages[] = array_keys($installed['versions']);
-}
-
-
-if (1 === \count($packages)) {
-return $packages[0];
-}
-
-return array_keys(array_flip(\call_user_func_array('array_merge', $packages)));
-}
-
-
-
-
-
-
-
-
-
-public static function isInstalled($packageName)
-{
-foreach (self::getInstalled() as $installed) {
-if (isset($installed['versions'][$packageName])) {
-return true;
-}
-}
-
-return false;
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-public static function satisfies(VersionParser $parser, $packageName, $constraint)
-{
-$constraint = $parser->parseConstraints($constraint);
-$provided = $parser->parseConstraints(self::getVersionRanges($packageName));
-
-return $provided->matches($constraint);
-}
-
-
-
-
-
-
-
-
-
-
-public static function getVersionRanges($packageName)
-{
-foreach (self::getInstalled() as $installed) {
-if (!isset($installed['versions'][$packageName])) {
-continue;
-}
-
-$ranges = array();
-if (isset($installed['versions'][$packageName]['pretty_version'])) {
-$ranges[] = $installed['versions'][$packageName]['pretty_version'];
-}
-if (array_key_exists('aliases', $installed['versions'][$packageName])) {
-$ranges = array_merge($ranges, $installed['versions'][$packageName]['aliases']);
-}
-if (array_key_exists('replaced', $installed['versions'][$packageName])) {
-$ranges = array_merge($ranges, $installed['versions'][$packageName]['replaced']);
-}
-if (array_key_exists('provided', $installed['versions'][$packageName])) {
-$ranges = array_merge($ranges, $installed['versions'][$packageName]['provided']);
-}
-
-return implode(' || ', $ranges);
-}
-
-throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
-}
-
-
-
-
-
-public static function getVersion($packageName)
-{
-foreach (self::getInstalled() as $installed) {
-if (!isset($installed['versions'][$packageName])) {
-continue;
-}
-
-if (!isset($installed['versions'][$packageName]['version'])) {
-return null;
-}
-
-return $installed['versions'][$packageName]['version'];
-}
-
-throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
-}
-
-
-
-
-
-public static function getPrettyVersion($packageName)
-{
-foreach (self::getInstalled() as $installed) {
-if (!isset($installed['versions'][$packageName])) {
-continue;
-}
-
-if (!isset($installed['versions'][$packageName]['pretty_version'])) {
-return null;
-}
-
-return $installed['versions'][$packageName]['pretty_version'];
-}
-
-throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
-}
-
-
-
-
-
-public static function getReference($packageName)
-{
-foreach (self::getInstalled() as $installed) {
-if (!isset($installed['versions'][$packageName])) {
-continue;
-}
-
-if (!isset($installed['versions'][$packageName]['reference'])) {
-return null;
-}
-
-return $installed['versions'][$packageName]['reference'];
-}
-
-throw new \OutOfBoundsException('Package "' . $packageName . '" is not installed');
-}
-
-
-
-
-
-public static function getRootPackage()
-{
-$installed = self::getInstalled();
-
-return $installed[0]['root'];
-}
-
-
-
-
-
-
-
-public static function getRawData()
-{
-return self::$installed;
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-public static function reload($data)
-{
-self::$installed = $data;
-self::$installedByVendor = array();
-}
-
-
-
-
-private static function getInstalled()
-{
-if (null === self::$canGetVendors) {
-self::$canGetVendors = method_exists('Composer\Autoload\ClassLoader', 'getRegisteredLoaders');
-}
-
-$installed = array();
-
-if (self::$canGetVendors) {
-foreach (ClassLoader::getRegisteredLoaders() as $vendorDir => $loader) {
-if (isset(self::$installedByVendor[$vendorDir])) {
-$installed[] = self::$installedByVendor[$vendorDir];
-} elseif (is_file($vendorDir.'/composer/installed.php')) {
-$installed[] = self::$installedByVendor[$vendorDir] = require $vendorDir.'/composer/installed.php';
-}
-}
-}
-
-$installed[] = self::$installed;
-
-return $installed;
-}
-}
diff --git a/saml/vendor/composer/LICENSE b/saml/vendor/composer/LICENSE
deleted file mode 100644
index f27399a0..00000000
--- a/saml/vendor/composer/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-
-Copyright (c) Nils Adermann, Jordi Boggiano
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is furnished
-to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
diff --git a/saml/vendor/composer/autoload_classmap.php b/saml/vendor/composer/autoload_classmap.php
deleted file mode 100644
index 7a91153b..00000000
--- a/saml/vendor/composer/autoload_classmap.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-// autoload_classmap.php @generated by Composer
-
-$vendorDir = dirname(dirname(__FILE__));
-$baseDir = dirname($vendorDir);
-
-return array(
-);
diff --git a/saml/vendor/composer/autoload_namespaces.php b/saml/vendor/composer/autoload_namespaces.php
deleted file mode 100644
index b7fc0125..00000000
--- a/saml/vendor/composer/autoload_namespaces.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-// autoload_namespaces.php @generated by Composer
-
-$vendorDir = dirname(dirname(__FILE__));
-$baseDir = dirname($vendorDir);
-
-return array(
-);
diff --git a/saml/vendor/composer/autoload_psr4.php b/saml/vendor/composer/autoload_psr4.php
deleted file mode 100644
index 231bdc9b..00000000
--- a/saml/vendor/composer/autoload_psr4.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-// autoload_psr4.php @generated by Composer
-
-$vendorDir = dirname(dirname(__FILE__));
-$baseDir = dirname($vendorDir);
-
-return array(
-    'RobRichards\\XMLSecLibs\\' => array($vendorDir . '/robrichards/xmlseclibs/src'),
-    'OneLogin\\' => array($vendorDir . '/onelogin/php-saml/src'),
-);
diff --git a/saml/vendor/composer/autoload_real.php b/saml/vendor/composer/autoload_real.php
deleted file mode 100644
index 724ced60..00000000
--- a/saml/vendor/composer/autoload_real.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-
-// autoload_real.php @generated by Composer
-
-class ComposerAutoloaderInit6ecac07d47dd9d108b36bee3eda76704
-{
-    private static $loader;
-
-    public static function loadClassLoader($class)
-    {
-        if ('Composer\Autoload\ClassLoader' === $class) {
-            require __DIR__ . '/ClassLoader.php';
-        }
-    }
-
-    /**
-     * @return \Composer\Autoload\ClassLoader
-     */
-    public static function getLoader()
-    {
-        if (null !== self::$loader) {
-            return self::$loader;
-        }
-
-        spl_autoload_register(array('ComposerAutoloaderInit6ecac07d47dd9d108b36bee3eda76704', 'loadClassLoader'), true, true);
-        self::$loader = $loader = new \Composer\Autoload\ClassLoader();
-        spl_autoload_unregister(array('ComposerAutoloaderInit6ecac07d47dd9d108b36bee3eda76704', 'loadClassLoader'));
-
-        $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
-        if ($useStaticLoader) {
-            require_once __DIR__ . '/autoload_static.php';
-
-            call_user_func(\Composer\Autoload\ComposerStaticInit6ecac07d47dd9d108b36bee3eda76704::getInitializer($loader));
-        } else {
-            $map = require __DIR__ . '/autoload_namespaces.php';
-            foreach ($map as $namespace => $path) {
-                $loader->set($namespace, $path);
-            }
-
-            $map = require __DIR__ . '/autoload_psr4.php';
-            foreach ($map as $namespace => $path) {
-                $loader->setPsr4($namespace, $path);
-            }
-
-            $classMap = require __DIR__ . '/autoload_classmap.php';
-            if ($classMap) {
-                $loader->addClassMap($classMap);
-            }
-        }
-
-        $loader->register(true);
-
-        return $loader;
-    }
-}
diff --git a/saml/vendor/composer/autoload_static.php b/saml/vendor/composer/autoload_static.php
deleted file mode 100644
index 395b9179..00000000
--- a/saml/vendor/composer/autoload_static.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-// autoload_static.php @generated by Composer
-
-namespace Composer\Autoload;
-
-class ComposerStaticInit6ecac07d47dd9d108b36bee3eda76704
-{
-    public static $prefixLengthsPsr4 = array (
-        'R' => 
-        array (
-            'RobRichards\\XMLSecLibs\\' => 23,
-        ),
-        'O' => 
-        array (
-            'OneLogin\\' => 9,
-        ),
-    );
-
-    public static $prefixDirsPsr4 = array (
-        'RobRichards\\XMLSecLibs\\' => 
-        array (
-            0 => __DIR__ . '/..' . '/robrichards/xmlseclibs/src',
-        ),
-        'OneLogin\\' => 
-        array (
-            0 => __DIR__ . '/..' . '/onelogin/php-saml/src',
-        ),
-    );
-
-    public static function getInitializer(ClassLoader $loader)
-    {
-        return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInit6ecac07d47dd9d108b36bee3eda76704::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInit6ecac07d47dd9d108b36bee3eda76704::$prefixDirsPsr4;
-
-        }, null, ClassLoader::class);
-    }
-}
diff --git a/saml/vendor/composer/installed.json b/saml/vendor/composer/installed.json
deleted file mode 100644
index f87cbadb..00000000
--- a/saml/vendor/composer/installed.json
+++ /dev/null
@@ -1,99 +0,0 @@
-[
-    {
-        "name": "onelogin/php-saml",
-        "version": "4.1.0",
-        "version_normalized": "4.1.0.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/onelogin/php-saml.git",
-            "reference": "b22a57ebd13e838b90df5d3346090bc37056409d"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/onelogin/php-saml/zipball/b22a57ebd13e838b90df5d3346090bc37056409d",
-            "reference": "b22a57ebd13e838b90df5d3346090bc37056409d",
-            "shasum": ""
-        },
-        "require": {
-            "php": ">=7.3",
-            "robrichards/xmlseclibs": ">=3.1.1"
-        },
-        "require-dev": {
-            "pdepend/pdepend": "^2.8.0",
-            "php-coveralls/php-coveralls": "^2.0",
-            "phploc/phploc": "^4.0 || ^5.0 || ^6.0 || ^7.0",
-            "phpunit/phpunit": "^9.5",
-            "sebastian/phpcpd": "^4.0 || ^5.0 || ^6.0 ",
-            "squizlabs/php_codesniffer": "^3.5.8"
-        },
-        "suggest": {
-            "ext-curl": "Install curl lib to be able to use the IdPMetadataParser for parsing remote XMLs",
-            "ext-dom": "Install xml lib",
-            "ext-openssl": "Install openssl lib in order to handle with x509 certs (require to support sign and encryption)",
-            "ext-zlib": "Install zlib"
-        },
-        "time": "2022-07-15T20:44:36+00:00",
-        "type": "library",
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "OneLogin\\": "src/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "description": "OneLogin PHP SAML Toolkit",
-        "homepage": "https://developers.onelogin.com/saml/php",
-        "keywords": [
-            "SAML2",
-            "onelogin",
-            "saml"
-        ]
-    },
-    {
-        "name": "robrichards/xmlseclibs",
-        "version": "3.1.1",
-        "version_normalized": "3.1.1.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/robrichards/xmlseclibs.git",
-            "reference": "f8f19e58f26cdb42c54b214ff8a820760292f8df"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/robrichards/xmlseclibs/zipball/f8f19e58f26cdb42c54b214ff8a820760292f8df",
-            "reference": "f8f19e58f26cdb42c54b214ff8a820760292f8df",
-            "shasum": ""
-        },
-        "require": {
-            "ext-openssl": "*",
-            "php": ">= 5.4"
-        },
-        "time": "2020-09-05T13:00:25+00:00",
-        "type": "library",
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "RobRichards\\XMLSecLibs\\": "src"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "BSD-3-Clause"
-        ],
-        "description": "A PHP library for XML Security",
-        "homepage": "https://github.com/robrichards/xmlseclibs",
-        "keywords": [
-            "security",
-            "signature",
-            "xml",
-            "xmldsig"
-        ],
-        "support": {
-            "issues": "https://github.com/robrichards/xmlseclibs/issues",
-            "source": "https://github.com/robrichards/xmlseclibs/tree/3.1.1"
-        }
-    }
-]
diff --git a/saml/vendor/composer/installed.php b/saml/vendor/composer/installed.php
deleted file mode 100644
index 91dbd460..00000000
--- a/saml/vendor/composer/installed.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php return array (
-  'root' => 
-  array (
-    'pretty_version' => 'dev-develop',
-    'version' => 'dev-develop',
-    'aliases' => 
-    array (
-    ),
-    'reference' => '559c85775e78669a168f48a4302e807d213f6d9f',
-    'name' => '__root__',
-  ),
-  'versions' => 
-  array (
-    '__root__' => 
-    array (
-      'pretty_version' => 'dev-develop',
-      'version' => 'dev-develop',
-      'aliases' => 
-      array (
-      ),
-      'reference' => '559c85775e78669a168f48a4302e807d213f6d9f',
-    ),
-    'onelogin/php-saml' => 
-    array (
-      'pretty_version' => '4.0.0',
-      'version' => '4.0.0.0',
-      'aliases' => 
-      array (
-      ),
-      'reference' => 'f30f5062f3653c4d2082892d207f4dc3e577d979',
-    ),
-    'robrichards/xmlseclibs' => 
-    array (
-      'pretty_version' => '3.1.1',
-      'version' => '3.1.1.0',
-      'aliases' => 
-      array (
-      ),
-      'reference' => 'f8f19e58f26cdb42c54b214ff8a820760292f8df',
-    ),
-  ),
-);
diff --git a/saml/vendor/composer/platform_check.php b/saml/vendor/composer/platform_check.php
deleted file mode 100644
index 92370c5a..00000000
--- a/saml/vendor/composer/platform_check.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-// platform_check.php @generated by Composer
-
-$issues = array();
-
-if (!(PHP_VERSION_ID >= 70300)) {
-    $issues[] = 'Your Composer dependencies require a PHP version ">= 7.3.0". You are running ' . PHP_VERSION . '.';
-}
-
-if ($issues) {
-    if (!headers_sent()) {
-        header('HTTP/1.1 500 Internal Server Error');
-    }
-    if (!ini_get('display_errors')) {
-        if (PHP_SAPI === 'cli' || PHP_SAPI === 'phpdbg') {
-            fwrite(STDERR, 'Composer detected issues in your platform:' . PHP_EOL.PHP_EOL . implode(PHP_EOL, $issues) . PHP_EOL.PHP_EOL);
-        } elseif (!headers_sent()) {
-            echo 'Composer detected issues in your platform:' . PHP_EOL.PHP_EOL . str_replace('You are running '.PHP_VERSION.'.', '', implode(PHP_EOL, $issues)) . PHP_EOL.PHP_EOL;
-        }
-    }
-    trigger_error(
-        'Composer detected issues in your platform: ' . implode(' ', $issues),
-        E_USER_ERROR
-    );
-}
diff --git a/saml/vendor/onelogin/php-saml/.github/workflows/php-package.yml b/saml/vendor/onelogin/php-saml/.github/workflows/php-package.yml
deleted file mode 100644
index 3ba3d152..00000000
--- a/saml/vendor/onelogin/php-saml/.github/workflows/php-package.yml
+++ /dev/null
@@ -1,54 +0,0 @@
-# This workflow will install PHP dependencies, run tests and lint with a variety of PHP versions
-# For more information see: https://github.com/marketplace/actions/setup-php-action
-
-name: php-saml 4.x package
-
-on:
-  push:
-    branches: [ 4.* ]
-  pull_request:
-    branches: [ 4.* ]
-
-jobs:
-  test:
-    runs-on: ${{ matrix.operating-system }}
-    strategy:
-      fail-fast: false
-      matrix:
-        operating-system: ['ubuntu-latest']
-        php-versions: [7.3, 7.4, 8.0, 8.1]
-    steps:
-      - name: Setup PHP, with composer and extensions
-        uses: shivammathur/setup-php@v2 #https://github.com/shivammathur/setup-php
-        with:
-          php-version: ${{ matrix.php-versions }}
-          extensions: mbstring, intl, mcrypt, xml
-          tools: composer:v2
-          ini-values: post_max_size=256M, max_execution_time=180
-          coverage: xdebug
-
-      - name: Set git to use LF
-        run: |
-          git config --global core.autocrlf false
-          git config --global core.eol lf
-      - uses: actions/checkout@v2
-
-      - name: Validate composer.json and composer.lock
-        run: composer validate
-
-      - name: Install Composer dependencies
-        run: |
-          composer self-update
-          composer install --prefer-source --no-interaction
-      - name: Syntax check PHP
-        run: |
-          php vendor/bin/phpcpd --exclude tests --exclude vendor .
-          php vendor/bin/phploc src/.
-          mkdir -p tests/build/dependences
-          php vendor/bin/pdepend --summary-xml=tests/build/logs/dependence-summary.xml --jdepend-chart=tests/build/dependences/jdepend.svg --overview-pyramid=tests/build/dependences/pyramid.svg  src/.
- 
-      - name: PHP Code Sniffer
-        run: php vendor/bin/phpcs --standard=tests/ZendModStandard src/Saml2 demo1 demo2 endpoints tests/src
-    
-      - name: Run unit tests
-        run: vendor/bin/phpunit --verbose --debug
diff --git a/saml/vendor/onelogin/php-saml/CHANGELOG b/saml/vendor/onelogin/php-saml/CHANGELOG
deleted file mode 100644
index 27a4b2bd..00000000
--- a/saml/vendor/onelogin/php-saml/CHANGELOG
+++ /dev/null
@@ -1,318 +0,0 @@
-CHANGELOG
-=========
-v4.0.0
-* Supports PHP 8.X
-
-v3.6.1
-* [#467](https://github.com/onelogin/php-saml/issues/467) Fix bug on getSelfRoutedURLNoQuery method
-
-v3.6.0
-* Add AES128_GCM encryption on generateNameId method. New setting parameter encryption_algorithm. If you set a encryption method different than AES128_CBC then the algorithm RSA_OAEP_MGF1P will be used as well instead RSA_1_5
-* PHP 8.0 support
-
-v3.5.1
-* 3.5.0 packagist/github release due a confusion were using the master (2.X branch). I'm releasing 3.5.1 to fix this issue and go back to 3.X branch
-
-v3.5.0
-* [#412](https://github.com/onelogin/php-saml/pull/412) Empty instead of unset the $_SESSION variable
-* [#433](https://github.com/onelogin/php-saml/issues/443) Fix Incorrect Destination in LogoutResponse when using responseUrl #443
-* Update xmlseclibs to 3.1.1
-* Add support for SMARTCARD_PKI and RSA_TOKEN Auth Contexts
-* Get lib path dinamically
-* Check for x509Cert of the IdP when loading settings, even if the security index was not provided
-* Support Statements with Attribute elements with the same name enabling the allowRepeatAttributeName setting
-
-v3.4.1
-* Add setSchemasPath to Auth class and fix backward compatibility
-
-v.3.4.0
-* Support rejecting unsolicited SAMLResponses.
-* Support stric destination matching.
-* Reject SAMLResponse if requestID was provided to the validotr but the InResponseTo attributeof the SAMLResponse is missing
-* Check destination against the getSelfURLNoQuery as well on LogoutRequest and LogoutResponse as we do on Response
-* Improve getSelfRoutedURLNoQuery method
-* Only add responseUrl to the settings if ResponseLocation present in the IdPMetadataParser
-* Remove use of $_GET on static method validateBinarySign
-* Fix error message when Assertion and NameId are both encrypted (not supported)
-
-v.3.3.1
-* Update xmlseclibs to 3.0.4
-* Remove Comparison atribute from RequestedAuthnContext when setting has empty value
-
-v.3.3.0
-* Set true as the default value for strict setting
-* Relax comparision of false on SignMetadata
-* Fix CI
-
-v.3.2.1
-* Add missed nameIdValueReq parameter to buildAuthnRequest method
-
-v.3.2.0
-* Add support for Subjects on AuthNRequests by the new parameter nameIdValueReq
-* Support SLO ResponseLocation
-* [#344](https://github.com/onelogin/php-saml/issues/344) Raise errors on IdPMetadataParser::parseRemoteXML and IdPMetadataParser::parseFileXML
-* [#356](https://github.com/onelogin/php-saml/issues/356) Support 'x509cert' and 'privateKey' on signMetadata security setting
-
-v.3.1.1
-* Force to use at least xmlseclibs 3.0.3 for security reasons
-* [#367](https://github.com/onelogin/php-saml/pull/367) Move the creation of the AuthnRequest to separate function
-* Set strict=true on config examples
-* Move phpunit.xml
-
-v.3.1.0
-* Security improvement suggested by Nils Engelbertz to prevent DDOS by expansion of internally defined entities (XEE)
-* Fix setting_example.php servicename parameter 
-
-v.3.0.0
-* Remove mcrypt dependency. Compatible with PHP 7.2
-* xmlseclibs now is not part of the toolkit and need to be installed from original source
-
-v.2.18.0
-* Support rejecting unsolicited SAMLResponses.
-* Support stric destination matching.
-* Reject SAMLResponse if requestID was provided to the validotr but the InResponseTo attributeof the SAMLResponse is missing
-* Check destination against the getSelfURLNoQuery as well on LogoutRequest and LogoutResponse as we do on Response
-* Improve getSelfRoutedURLNoQuery method
-* Only add responseUrl to the settings if ResponseLocation present in the IdPMetadataParser
-* Remove use of $_GET on static method validateBinarySign
-* Fix error message when Assertion and NameId are both encrypted (not supported)
-
-v.2.17.1
-* Update xmlseclibs to 3.0.4
-* Remove Comparison atribute from RequestedAuthnContext when setting has empty value
-
-v.2.17.0
-* Set true as the default value for strict setting
-* Support 'x509cert' and 'privateKey' on signMetadata security settings
-* Relax comparision of false on SignMetadata
-* Fix CI
-
-v.2.16.0
-* Support SLO ResponseLocation
-* [#344](https://github.com/onelogin/php-saml/issues/344) Raise errors on IdPMetadataParser::parseRemoteXML and IdPMetadataParser::parseFileXML
-* Adjusted acs endpoint to extract NameQualifier and SPNameQualifier from SAMLResponse. Adjusted single logout service to provide NameQualifier and SPNameQualifier to logout method. Add getNameIdNameQualifier to Auth and SamlResponse. Extend logout method from Auth and LogoutRequest constructor to support SPNameQualifier parameter. Align LogoutRequest constructor with SAML specs
-* Add support for Subjects on AuthNRequests by the new parameter
-* Set strict=true on config examples
-
-v.2.15.0
-* Security improvement suggested by Nils Engelbertz to prevent DDOS by expansion of internally defined entities (XEE)
-* Fix bug on settings_example.php
-
-v.2.14.0
-* Add  parameter to the decryptElement method to make optional the formatting
-* [#283](https://github.com/onelogin/php-saml/pull/283) New method of importing a decrypted assertion into the XML document to replace the EncryptedAssertion. Fix signature issues on Signed Encrypted Assertions with default namespace
-* Allow the getSPMetadata() method to always include the encryption Key Descriptor
-* Change some Fatal Error to Exceptions
-* [#265](https://github.com/onelogin/php-saml/issues/265) Support parameters at getSPMetadata method
-* Avoid calling static method using this
-
-v.2.13.0
-* Update xmlseclibs with some fixes.
-* Add extra protection verifying the Signature algorithm used on SignedInfo element, not only rely on the xmlseclibs verify / verifySignature methods.
-* Add getAttributesWithFriendlyName method which returns the set of SAML attributes indexed by FriendlyName
-* Fix bug on parseRemoteXML and parseFileXML. Internal calls to parseXML missed the desiredNameIdFormat parameter
-
-v.2.12.0
-* Improve Time management. Use DateTime/DateTimeZone classes.
-* Escape error messages in debug mode
-* Improve phpdoc
-* Add an extra filter to the url to be used on redirection
-
-* [#242](https://github.com/onelogin/php-saml/pull/242) Document that SHA-1 must not be used
-* [#250](https://github.com/onelogin/php-saml/pull/250) Fixed issue with IdPMetadataParser only keeping 1 certificate when multiple certificates of a single type were provided.
-* [#263](https://github.com/onelogin/php-saml/issues/263) Fix incompatibility with ADFS on SLO. When on php saml settings NameID Format is set as unspecified but the SAMLResponse has no NameID Format, no NameID Format should be specified on LogoutRequest.
-
-v.2.11.0
-* [#236](https://github.com/onelogin/php-saml/pull/236) Exclude unnecesary files from Composer production downloads
-* [#226](https://github.com/onelogin/php-saml/pull/226) Add possibility to handle nameId NameQualifier attribute in SLO Request
-* Improve logout documentation on Readme.
-* Improve multi-certificate support
-
-v.2.10.7
-* Fix IdPMetadataParser. The SingleLogoutService retrieved method was wrong
-* [#201](https://github.com/onelogin/php-saml/issues/201) Fix issues with SP entity_id, acs url and sls url that contains &
-
-v.2.10.6
-* [#206](https://github.com/onelogin/php-saml/pull/206)Be able to register future SP x509cert on the settings and publish it on SP metadata
-* [#206](https://github.com/onelogin/php-saml/pull/206) Be able to register more than 1 Identity Provider x509cert, linked with an specific use (signing or encryption)
-* [#206](https://github.com/onelogin/php-saml/pull/206) Support the ability to parse IdP XML metadata (remote url or file) and be able to inject the data obtained on the settings.
-
-v.2.10.5
-* Be able to get at the auth object the last processed ID
-* Improve NameID Format support
-* Reset errorReason attribute of the auth object after each Process method
-* Validate serial number as string to work around libxml2 limitation
-* Make the Issuer on the Response Optional
-
-v.2.10.4
-* [+](https://github.com/onelogin/php-saml/commit/949359f5cad5e1d085c4e5447d9aa8f49a6e82a1) Security update for signature validation on LogoutRequest/LogoutResponse
-* [#192](https://github.com/onelogin/php-saml/pull/192) Added ability to configure DigestAlgorithm in settings
-* [#183](https://github.com/onelogin/php-saml/pull/183) Fix strpos bug when decrypting assertions
-* [#186](https://github.com/onelogin/php-saml/pull/186) Improve info on entityId validation Exception
-* [#188](https://github.com/onelogin/php-saml/pull/188) Fixed issue with undefined constant of UNEXPECTED_SIGNED_ELEMENT
-* Read ACS binding on AuthNRequest builder from settings
-* Be able to relax Destination validation on SAMLResponses and let this
-  attribute to be empty with the 'relaxDestinationValidation' setting
-
-v.2.10.3
-* Implement a more specific exception class for handling some validation errors
-* Minor changes on time validation/exceptions
-* Add hooks to retrieve last-sent and last-received requests and responses
-* Improve/Fix tests
-* Add DigestAlgorithm support on addSign
-* [#177](https://github.com/onelogin/php-saml/pull/177) Add error message for bad OneLogin_Saml2_Settings argument
-
-v.2.10.2
-* [#175](https://github.com/onelogin/php-saml/pull/175) Allow overriding of host, port, protocol and url path for URL building
-* [#173](https://github.com/onelogin/php-saml/pull/173) Provide better support to NameIdFormat
-* Fix another issue on Assertion Signature validation when the assertion contains no namespace, container has saml2 namespace and it was encrypted
-
-v.2.10.1
-* Fix error message on SignMetadata process
-* Fix issue on Assertion Signature validation when the assertion contains no namespace and it was encrypted
-
-v.2.10.0
-* Several security improvements:
-  * Conditions element required and unique.
-  * AuthnStatement element required and unique.
-  * SPNameQualifier must math the SP EntityID
-  * Reject saml:Attribute element with same “Name” attribute
-  * Reject empty nameID
-  * Require Issuer element. (Must match IdP EntityID).
-  * Destination value can't be blank (if present must match ACS URL).
-  * Check that the EncryptedAssertion element only contains 1 Assertion element.
-* Improve Signature validation process
-* AttributeConsumingService support
-* Support lowercase Urlencoding (ADFS compatibility).
-* [#154](https://github.com/onelogin/php-saml/pull/154) getSelfHost no longer returns a port number
-* [#156](https://github.com/onelogin/php-saml/pull/156) Use correct host on response destination fallback check
-* [#158](https://github.com/onelogin/php-saml/pull/158) NEW Control usage of X-Forwarded-* headers
-* Fix issue with buildRequestSignature. Added RelayState to the SignQuery only if is not null.
-* Add Signature Wrapping prevention Test
-* Improve _decryptAssertion in order to take care of Assertions with problems with namespaces
-* Improve documentation
-
-v.2.9.1
-.......
-* [134](https://github.com/onelogin/php-saml/pull/134) PHP7 production settings compiles out assert(), throw an exception explicitly
-* [132](https://github.com/onelogin/php-saml/pull/132) Add note for "wantAssertionsEncrypted"
-* Update copyright on LICENSE
-
-v.2.9.0
--------
-* Change the decrypt assertion process.
-* Add 2 extra validations to prevent Signature wrapping attacks.
-* Remove reference to wrong NameIDFormat: urn:oasis:names:tc:SAML:2.0:nameid-format:unspecified should be urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified
-* [128](https://github.com/onelogin/php-saml/pull/128) Test php7 and upgrade phpunit
-* Update Readme with more descriptive requestedAuthnContext description and Security Guidelines
-
-v.2.8.0
--------
-* Make NameIDPolicy of AuthNRequest optional
-* Make nameID requirement on SAMLResponse optional
-* Fix empty URI support
-* Symmetric encryption key support
-* Add more Auth Context options to the constant class
-* Fix DSA_SHA1 constant on xmlseclibs
-* Set none requestedAuthnContext as default behaviour
-* Update xmlseclibs lib
-* Improve formatPrivateKey method
-* Fix bug when signing metadata, the SignatureMethod was not provided
-* Fix getter for lastRequestID parameter in OneLogin_Saml2_Auth class
-* Add $wantEncrypted parameter on addX509KeyDescriptors method that will allow to set KeyDescriptor[use='encryption'] if wantNameIdEncrypted or wantAssertionsEncrypted enabled
-* Add $stay parameter on redirectTo method. (login/logout supports $stay but I forgot add this on previous 2.7.0 version)
-* Improve code style
-
-v.2.7.0
--------
-* Trim acs, slo and issuer urls.
-* Fix PHP 7 error (used continue outside a loop/switch).
-* Fix bug on organization element of the SP metadata builder.
-* Fix typos on documentation. Fix ALOWED Misspell.
-* Be able to extract RequestID. Add RequestID validation on demo1. 
-* Add $stay parameter to login, logout and processSLO method.
-
-v.2.6.1
--------
-* Fix bug on cacheDuration of the Metadata XML generated.
-* Make SPNameQualifier optional on the generateNameId method. Avoid the use of SPNameQualifier when generating the NameID on the LogoutRequest builder.
-* Allows the authn comparsion attribute to be set via config.
-* Retrieve Session Timeout after processResponse with getSessionExpiration().
-* Improve readme readability.
-* Allow single log out to work for applications not leveraging php session_start. Added a callback parameter in order to close the session at processSLO.
-
-v.2.6.0
--------
-* Set NAMEID_UNSPECIFIED as default NameIDFormat to prevent conflicts with IdPs that don't support NAMEID_PERSISTENT.
-* Now the SP is able to select the algorithm to be used on signatures (DSA_SHA1, RSA_SHA1, RSA_SHA256, RSA_SHA384, RSA_SHA512).
-* Change visibility of _decryptAssertion to protected.
-* Update xmlseclibs library.
-* Handle valid but uncommon dsig block with no URI in the reference.
-* login, logout and processSLO now return ->redirectTo instead of just call it.
-* Split the setting check methods. Now 1 method for IdP settings and other for SP settings.
-* Let the setting object to avoid the IdP setting check. required if we want to publish SP SAML Metadata when the IdP data is still not provided.
-
-v.2.5.0
--------
-* Do accesible the ID of the object Logout Request (id attribute).
-* Add note about the fact that PHP 5.3 is unssuported.
-* Add fingerprint algorithm support.
-* Add dependences to composer.
-
-v.2.4.0
--------
-* Fix wrong element order in generated metadata.
-* Added SLO with nameID and SessionIndex in demo1.
-* Improve isHTTPS method in order to support HTTP_X_FORWARDED_PORT.
-* Set optional the XMLvalidation (enable/disable it with wantXMLValidation security setting).
-
-v.2.3.0
--------
-* Resolve namespace problem. Some IdPs uses saml2p:Response and saml2:Assertion instead of samlp:Response saml:Assertion.
-* Improve test and documentation.
-* Improve ADFS compatibility.
-* Remove unnecessary XSDs files.
-* Make available the reason for the saml message invalidation.
-* Adding ability to set idp cert once the Setting object initialized.
-* Fix status info issue.
-* Reject SAML Response if not signed and strict = false.
-* Support NameId and SessionIndex in LogoutRequest.
-* Add ForceAuh and IsPassive support.
-
-v.2.2.0
--------
-* Fix bug with Encrypted nameID on LogoutRequest.
-* Fixed usability bug. SP will inform about AuthFail status after process a Response.
-* Added SessionIndex support on LogoutRequest, and know is accesible from the Auth class.
-* LogoutRequest and LogoutResponse classes now accept non deflated xml.
-* Improved the XML metadata/ Decrypted Assertion output. (prettyprint).
-* Fix bug in formatPrivateKey method, the key could be not RSA.
-* Explicit warning message for signed element problem.
-* Decrypt method improved.
-* Support more algorithm at the SigAlg in the Signed LogoutRequests and LogoutResponses
-* AuthNRequest now stores ID (it can be retrieved later).
-* Fixed a typo on the 'NameIdPolicy' attribute that appeared at the README and settings_example file.
-
-
-v.2.1.0
--------
-
-* The isValid method of the Logout Request is now non-static. (affects processSLO method of Auth.php).
-* Logout Request constructor now accepts encoded logout requests.
-* Now after validate a message, if fails a method getError of the object will return the cause.
-* Fix typos.
-* Added extra parameters option to login and logout methods.
-* Improve Test (new test, use the new getError method for testing).
-* Bugfix namespace problem when getting Attributes.
-
-
-v.2.0.0
--------
-
-* New PHP SAML Toolkit (SLO, Sign, Encryptation).
-
-
-v.1.0.0
--------
-
-* Old PHP SAML Toolkit.
diff --git a/saml/vendor/onelogin/php-saml/LICENSE b/saml/vendor/onelogin/php-saml/LICENSE
deleted file mode 100644
index dbbca9c6..00000000
--- a/saml/vendor/onelogin/php-saml/LICENSE
+++ /dev/null
@@ -1,23 +0,0 @@
-Copyright (c) 2010-2016 OneLogin, Inc.
-
-Permission is hereby granted, free of charge, to any person
-obtaining a copy of this software and associated documentation
-files (the "Software"), to deal in the Software without
-restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
diff --git a/saml/vendor/onelogin/php-saml/README.md b/saml/vendor/onelogin/php-saml/README.md
deleted file mode 100644
index 99c24c42..00000000
--- a/saml/vendor/onelogin/php-saml/README.md
+++ /dev/null
@@ -1,1585 +0,0 @@
-# OneLogin's SAML PHP Toolkit Compatible with PHP 7.X & 8.X
-
-[![Build Status](https://api.travis-ci.org/onelogin/php-saml.png?branch=master)](http://travis-ci.org/onelogin/php-saml) [![Coverage Status](https://coveralls.io/repos/onelogin/php-saml/badge.png)](https://coveralls.io/r/onelogin/php-saml) [![License](https://poser.pugx.org/onelogin/php-saml/license.png)](https://packagist.org/packages/onelogin/php-saml)
-
-Add SAML support to your PHP software using this library.
-Forget those complicated libraries and use this open source library provided
-and supported by OneLogin Inc.
-
-
-Warning
--------
-
-This version is compatible with PHP >=7.3 and 8.X and does not include xmlseclibs (you will need to install it via composer, dependency described in composer.json)
-
-Security Guidelines
--------------------
-
-If you believe you have discovered a security vulnerability in this toolkit, please report it at https://www.onelogin.com/security with a description. We follow responsible disclosure guidelines, and will work with you to quickly find a resolution.
-
-
-Why add SAML support to my software?
-------------------------------------
-
-SAML is an XML-based standard for web browser single sign-on and is defined by
-the OASIS Security Services Technical Committee. The standard has been around
-since 2002, but lately it is becoming popular due its advantages:
-
- * **Usability** - One-click access from portals or intranets, deep linking,
-   password elimination and automatically renewing sessions make life
-   easier for the user.
- * **Security** - Based on strong digital signatures for authentication and
-   integrity, SAML is a secure single sign-on protocol that the largest
-   and most security conscious enterprises in the world rely on.
- * **Speed** - SAML is fast. One browser redirect is all it takes to securely
-   sign a user into an application.
- * **Phishing Prevention** - If you don’t have a password for an app, you
-   can’t be tricked into entering it on a fake login page.
- * **IT Friendly** - SAML simplifies life for IT because it centralizes
-   authentication, provides greater visibility and makes directory
-   integration easier.
- * **Opportunity** - B2B cloud vendor should support SAML to facilitate the
-   integration of their product.
-
-
-General description
--------------------
-
-OneLogin's SAML PHP toolkit let you build a SP (Service Provider) over
-your PHP application and connect it to any IdP (Identity Provider).
-
-Supports:
-
- * SSO and SLO (SP-Initiated and IdP-Initiated).
- * Assertion and nameId encryption.
- * Assertion signature.
- * Message signature: AuthNRequest, LogoutRequest, LogoutResponses.
- * Enable an Assertion Consumer Service endpoint.
- * Enable a Single Logout Service endpoint.
- * Publish the SP metadata (which can be signed).
-
-Key features:
-
- * **saml2int** - Implements the SAML 2.0 Web Browser SSO Profile.
- * **Session-less** - Forget those common conflicts between the SP and
-   the final app, the toolkit delegate session in the final app.
- * **Easy to use** - Programmer will be allowed to code high-level and
-   low-level programming, 2 easy to use APIs are available.
- * **Tested** - Thoroughly tested.
- * **Popular** - OneLogin's customers use it. Many PHP SAML plugins uses it.
-
-Integrate your PHP toolkit at OneLogin using this guide: [https://developers.onelogin.com/page/saml-toolkit-for-php](https://developers.onelogin.com/page/saml-toolkit-for-php)
-
-Installation
-------------
-
-### Dependencies ###
-
- * `php >= 5.4` and some core extensions like `php-xml`, `php-date`, `php-zlib`.
- * `openssl`. Install the openssl library. It handles x509 certificates.
- * `gettext`. Install that library and its php driver. It handles translations.
- * `curl`. Install that library and its php driver if you plan to use the IdP Metadata parser.
-
-### Code ###
-
-#### Option 1. clone the repository from  github ####
-
-git clone git@github.com:onelogin/php-saml.git
-
-Then pull the 3.X.X branch/tag
-
-#### Option 2. Download from github ####
-
-The toolkit is hosted on github. You can download it from:
-
- * https://github.com/onelogin/php-saml/releases
-
-Search for 3.X.X releases
-
-Copy the core of the library inside the php application. (each application has its
-structure so take your time to locate the PHP SAML toolkit in the best place).
-See the "Guide to add SAML support to my app" to know how.
-
-Take in mind that the compressed file only contains the main files.
-If you plan to play with the demos, use the Option 1.
-
-#### Option 3. Composer ####
-
-The toolkit supports [composer](https://getcomposer.org/). You can find the `onelogin/php-saml` package at https://packagist.org/packages/onelogin/php-saml
-
-In order to import the saml toolkit to your current php project, execute
-```
-composer require onelogin/php-saml
-```
-
-Remember to select the 3.X.X branch
-
-After installation has completed you will find at the `vendor/` folder a new folder named `onelogin` and inside the `php-saml`. Make sure you are including the autoloader provided by composer. It can be found at `vendor/autoload.php`.
-
-**Important** In this option, the x509 certs must be stored at `vendor/onelogin/php-saml/certs`
-and settings file stored at `vendor/onelogin/php-saml`.
-
-Your settings are at risk of being deleted when updating packages using `composer update` or similar commands. So it is **highly** recommended that instead of using settings files, you pass the settings as an array directly to the constructor (explained later in this document). If you do not use this approach your settings are at risk of being deleted when updating packages using `composer update` or similar commands.
-
-Compatibility
--------------
-
-This 4.X.X supports PHP >=7.3 .
-
-It is not compatible with PHP5.6 or PHP7.0.
-
-Namespaces
-----------
-
-If you are using the library with a framework like Symfony that contains
-namespaces, remember that calls to the class must be done by adding a backslash (`\`) to the
-start, for example to use the static method getSelfURLNoQuery use:
-
-    \OneLogin\Saml2\Utils::getSelfURLNoQuery()
-
-
-Security warning
-----------------
-
-In production, the `strict` parameter **MUST** be set as `"true"` and the
-`signatureAlgorithm` and `digestAlgorithm` under `security` must be set to
-something other than SHA1 (see https://shattered.io/ ). Otherwise your
-environment is not secure and will be exposed to attacks.
-
-In production also we highly recommended to register on the settings the IdP certificate instead of using the fingerprint method. The fingerprint, is a hash, so at the end is open to a collision attack that can end on a signature validation bypass. Other SAML toolkits deprecated that mechanism, we maintain it for compatibility and also to be used on test environment.
-
-
-### Avoiding Open Redirect attacks ###
-
-Some implementations uses the RelayState parameter as a way to control the flow when SSO and SLO succeeded. So basically the
-user is redirected to the value of the RelayState.
-
-If you are using Signature Validation on the HTTP-Redirect binding, you will have the RelayState value integrity covered, otherwise, and
-on HTTP-POST binding, you can't trust the RelayState so before
-executing the validation, you need to verify that its value belong
-a trusted and expected URL.
-
-Read more about Open Redirect [CWE-601](https://cwe.mitre.org/data/definitions/601.html).
-
-
-### Avoiding Reply attacks ###
-
-A reply attack is basically try to reuse an intercepted valid SAML Message in order to impersonate a SAML action (SSO or SLO).
-
-SAML Messages have a limited timelife (NotBefore, NotOnOrAfter) that
-make harder this kind of attacks, but they are still possible.
-
-In order to avoid them, the SP can keep a list of SAML Messages or Assertion IDs alredy valdidated and processed. Those values only need
-to be stored the amount of time of the SAML Message life time, so
-we don't need to store all processed message/assertion Ids, but the most recent ones.
-
-The OneLogin_Saml2_Auth class contains the [getLastRequestID](https://github.com/onelogin/php-saml/blob/b8214b74dd72960fa6aa88ab454667c64cea935c/src/Saml2/Auth.php#L657), [getLastMessageId](https://github.com/onelogin/php-saml/blob/b8214b74dd72960fa6aa88ab454667c64cea935c/src/Saml2/Auth.php#L762) and [getLastAssertionId](https://github.com/onelogin/php-saml/blob/b8214b74dd72960fa6aa88ab454667c64cea935c/src/Saml2/Auth.php#L770) methods to retrieve the IDs
-
-Checking that the ID of the current Message/Assertion does not exists in the list of the ones already processed will prevent reply
-attacks.
-
-
-Getting started
----------------
-
-### Knowing the toolkit ###
-
-The new OneLogin SAML Toolkit contains different folders (`certs`, `endpoints`,
-`lib`, `demo`, etc.) and some files.
-
-Let's start describing the folders:
-
-#### `certs/` ####
-
-SAML requires a x509 cert to sign and encrypt elements like `NameID`, `Message`,
-`Assertion`, `Metadata`.
-
-If our environment requires sign or encrypt support, this folder may contain
-the x509 cert and the private key that the SP will use:
-
- * `sp.crt` - The public cert of the SP
- * `sp.key` - The private key of the SP
-
-Or also we can provide those data in the setting file at the `$settings['sp']['x509cert']`
-and the `$settings['sp']['privateKey']`.
-
-Sometimes we could need a signature on the metadata published by the SP, in
-this case we could use the x509 cert previously mentioned or use a new x.509
-cert: `metadata.crt` and `metadata.key`.
-
-Use `sp_new.crt` if you are in a key rollover process and you want to
-publish that x509 certificate on Service Provider metadata.
-
-#### `src/` ####
-
-This folder contains the heart of the toolkit, the libraries:
-
- * `Saml2` folder contains the new version of the classes and methods that
-   are described in a later section.
-
-
-#### `doc/` ####
-
-This folder contains the API documentation of the toolkit.
-
-
-#### `endpoints/` ####
-
-The toolkit has three endpoints:
-
- * `metadata.php` - Where the metadata of the SP is published.
- * `acs.php` - Assertion Consumer Service. Processes the SAML Responses.
- * `sls.php` - Single Logout Service. Processes Logout Requests and Logout
-   Responses.
-
-You can use the files provided by the toolkit or create your own endpoints
-files when adding SAML support to your applications. Take in mind that those
-endpoints files uses the setting file of the toolkit's base folder.
-
-
-#### `locale/` ####
-
-Locale folder contains some translations: `en_US` and `es_ES` as a proof of concept.
-Currently there are no translations but we will eventually localize the messages
-and support multiple languages.
-
-
-#### Other important files ####
-
-* `settings_example.php` - A template to be used in order to create a
-  settings.php file which contains the basic configuration info of the toolkit.
-* `advanced_settings_example.php` - A template to be used in order to create a
-  advanced_settings.php file which contains extra configuration info related to
-  the security, the contact person, and the organization associated to the SP.
-* `_toolkit_loader.php` - This file load the toolkit libraries (The SAML2 lib).
-
-
-#### Miscellaneous ####
-
-* `tests/` - Contains the unit test of the toolkit.
-* `demo1/` - Contains an example of a simple PHP app with SAML support.
-  Read the `Readme.txt` inside for more info.
-* `demo2/` - Contains another example.
-
-
-### How it works ###
-
-#### Settings ####
-
-First of all we need to configure the toolkit. The SP's info, the IdP's info,
-and in some cases, configure advanced security issues like signatures and
-encryption.
-
-There are two ways to provide the settings information:
-
- * Use a `settings.php` file that we should locate at the base folder of the
-   toolkit.
- * Use an array with the setting data and provide it directly to the
-   constructor of the class.
-
-
-There is a template file, `settings_example.php`, so you can make a copy of this
-file, rename and edit it.
-
-```php
-<?php
-
-$settings = array(
-    // If 'strict' is True, then the PHP Toolkit will reject unsigned
-    // or unencrypted messages if it expects them to be signed or encrypted.
-    // Also it will reject the messages if the SAML standard is not strictly
-    // followed: Destination, NameId, Conditions ... are validated too.
-    'strict' => true,
-
-    // Enable debug mode (to print errors).
-    'debug' => false,
-
-    // Set a BaseURL to be used instead of try to guess
-    // the BaseURL of the view that process the SAML Message.
-    // Ex http://sp.example.com/
-    //    http://example.com/sp/
-    'baseurl' => null,
-
-    // Service Provider Data that we are deploying.
-    'sp' => array(
-        // Identifier of the SP entity  (must be a URI)
-        'entityId' => '',
-        // Specifies info about where and how the <AuthnResponse> message MUST be
-        // returned to the requester, in this case our SP.
-        'assertionConsumerService' => array(
-            // URL Location where the <Response> from the IdP will be returned
-            'url' => '',
-            // SAML protocol binding to be used when returning the <Response>
-            // message. OneLogin Toolkit supports this endpoint for the
-            // HTTP-POST binding only.
-            'binding' => 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST',
-        ),
-        // If you need to specify requested attributes, set a
-        // attributeConsumingService. nameFormat, attributeValue and
-        // friendlyName can be omitted
-        "attributeConsumingService"=> array(
-                "serviceName" => "SP test",
-                "serviceDescription" => "Test Service",
-                "requestedAttributes" => array(
-                    array(
-                        "name" => "",
-                        "isRequired" => false,
-                        "nameFormat" => "",
-                        "friendlyName" => "",
-                        "attributeValue" => array()
-                    )
-                )
-        ),
-        // Specifies info about where and how the <Logout Response> message MUST be
-        // returned to the requester, in this case our SP.
-        'singleLogoutService' => array(
-            // URL Location where the <Response> from the IdP will be returned
-            'url' => '',
-            // SAML protocol binding to be used when returning the <Response>
-            // message. OneLogin Toolkit supports the HTTP-Redirect binding
-            // only for this endpoint.
-            'binding' => 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect',
-        ),
-        // Specifies the constraints on the name identifier to be used to
-        // represent the requested subject.
-        // Take a look on lib/Saml2/Constants.php to see the NameIdFormat supported.
-        'NameIDFormat' => 'urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress',
-        // Usually x509cert and privateKey of the SP are provided by files placed at
-        // the certs folder. But we can also provide them with the following parameters
-        'x509cert' => '',
-        'privateKey' => '',
-
-        /*
-         * Key rollover
-         * If you plan to update the SP x509cert and privateKey
-         * you can define here the new x509cert and it will be
-         * published on the SP metadata so Identity Providers can
-         * read them and get ready for rollover.
-         */
-        // 'x509certNew' => '',
-    ),
-
-    // Identity Provider Data that we want connected with our SP.
-    'idp' => array(
-        // Identifier of the IdP entity  (must be a URI)
-        'entityId' => '',
-        // SSO endpoint info of the IdP. (Authentication Request protocol)
-        'singleSignOnService' => array(
-            // URL Target of the IdP where the Authentication Request Message
-            // will be sent.
-            'url' => '',
-            // SAML protocol binding to be used when returning the <Response>
-            // message. OneLogin Toolkit supports the HTTP-Redirect binding
-            // only for this endpoint.
-            'binding' => 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect',
-        ),
-        // SLO endpoint info of the IdP.
-        'singleLogoutService' => array(
-            // URL Location of the IdP where SLO Request will be sent.
-            'url' => '',
-            // URL location of the IdP where SLO Response will be sent (ResponseLocation)
-            // if not set, url for the SLO Request will be used
-            'responseUrl' => '',
-            // SAML protocol binding to be used when returning the <Response>
-            // message. OneLogin Toolkit supports the HTTP-Redirect binding
-            // only for this endpoint.
-            'binding' => 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect',
-        ),
-        // Public x509 certificate of the IdP
-        'x509cert' => '',
-        /*
-         *  Instead of use the whole x509cert you can use a fingerprint in order to
-         *  validate a SAMLResponse, but we don't recommend to use that
-         *  method on production since is exploitable by a collision attack.
-         *  (openssl x509 -noout -fingerprint -in "idp.crt" to generate it,
-         *   or add for example the -sha256 , -sha384 or -sha512 parameter)
-         *
-         *  If a fingerprint is provided, then the certFingerprintAlgorithm is required in order to
-         *  let the toolkit know which algorithm was used. Possible values: sha1, sha256, sha384 or sha512
-         *  'sha1' is the default value.
-         *
-         *  Notice that if you want to validate any SAML Message sent by the HTTP-Redirect binding, you
-         *  will need to provide the whole x509cert.
-         */
-        // 'certFingerprint' => '',
-        // 'certFingerprintAlgorithm' => 'sha1',
-
-        /* In some scenarios the IdP uses different certificates for
-         * signing/encryption, or is under key rollover phase and
-         * more than one certificate is published on IdP metadata.
-         * In order to handle that the toolkit offers that parameter.
-         * (when used, 'x509cert' and 'certFingerprint' values are
-         * ignored).
-         */
-        // 'x509certMulti' => array(
-        //      'signing' => array(
-        //          0 => '<cert1-string>',
-        //      ),
-        //      'encryption' => array(
-        //          0 => '<cert2-string>',
-        //      )
-        // ),
-    ),
-);
-```
-In addition to the required settings data (IdP, SP), there is extra
-information that could be defined. In the same way that a template exists
-for the basic info, there is a template for that advanced info located
-at the base folder of the toolkit and named `advanced_settings_example.php`
-that you can copy and rename it as `advanced_settings.php`
-
-```php
-<?php
-
-$advancedSettings = array(
-
-    // Compression settings
-    'compress' => array(
-        'requests' => true,
-        'responses' => true
-    ),
-    // Security settings
-    'security' => array(
-
-        /** signatures and encryptions offered */
-
-        // Indicates that the nameID of the <samlp:logoutRequest> sent by this SP
-        // will be encrypted.
-        'nameIdEncrypted' => false,
-
-        // Indicates whether the <samlp:AuthnRequest> messages sent by this SP
-        // will be signed.  [Metadata of the SP will offer this info]
-        'authnRequestsSigned' => false,
-
-        // Indicates whether the <samlp:logoutRequest> messages sent by this SP
-        // will be signed.
-        'logoutRequestSigned' => false,
-
-        // Indicates whether the <samlp:logoutResponse> messages sent by this SP
-        // will be signed.
-        'logoutResponseSigned' => false,
-
-        /* Sign the Metadata
-         False || True (use sp certs) || array (
-                                                    'keyFileName' => 'metadata.key',
-                                                    'certFileName' => 'metadata.crt'
-                                               )
-                                      || array (
-                                                    'x509cert' => '',
-                                                    'privateKey' => ''
-                                               )
-        */
-        'signMetadata' => false,
-
-        /** signatures and encryptions required **/
-
-        // Indicates a requirement for the <samlp:Response>, <samlp:LogoutRequest>
-        // and <samlp:LogoutResponse> elements received by this SP to be signed.
-        'wantMessagesSigned' => false,
-
-        // Indicates a requirement for the <saml:Assertion> elements received by
-        // this SP to be encrypted.
-        'wantAssertionsEncrypted' => false,
-
-        // Indicates a requirement for the <saml:Assertion> elements received by
-        // this SP to be signed. [Metadata of the SP will offer this info]
-        'wantAssertionsSigned' => false,
-
-        // Indicates a requirement for the NameID element on the SAMLResponse
-        // received by this SP to be present.
-        'wantNameId' => true,
-
-        // Indicates a requirement for the NameID received by
-        // this SP to be encrypted.
-        'wantNameIdEncrypted' => false,
-
-        // Authentication context.
-        // Set to false and no AuthContext will be sent in the AuthNRequest.
-        // Set true or don't present this parameter and you will get an AuthContext 'exact' 'urn:oasis:names:tc:SAML:2.0:ac:classes:PasswordProtectedTransport'.
-        // Set an array with the possible auth context values: array('urn:oasis:names:tc:SAML:2.0:ac:classes:Password', 'urn:oasis:names:tc:SAML:2.0:ac:classes:X509').
-        'requestedAuthnContext' => false,
-
-        // Indicates if the SP will validate all received xmls.
-        // (In order to validate the xml, 'strict' and 'wantXMLValidation' must be true).
-        'wantXMLValidation' => true,
-
-        // If true, SAMLResponses with an empty value at its Destination
-        // attribute will not be rejected for this fact.
-        'relaxDestinationValidation' => false,
-
-        // If true, Destination URL should strictly match to the address to
-        // which the response has been sent.
-        // Notice that if 'relaxDestinationValidation' is true an empty Destintation
-        // will be accepted.
-        'destinationStrictlyMatches' => false,
-
-        // If true, the toolkit will not raised an error when the Statement Element
-        // contain atribute elements with name duplicated
-        'allowRepeatAttributeName' => false,
-
-        // If true, SAMLResponses with an InResponseTo value will be rejectd if not
-        // AuthNRequest ID provided to the validation method.
-        'rejectUnsolicitedResponsesWithInResponseTo' => false,
-
-        // Algorithm that the toolkit will use on signing process. Options:
-        //    'http://www.w3.org/2000/09/xmldsig#rsa-sha1'
-        //    'http://www.w3.org/2000/09/xmldsig#dsa-sha1'
-        //    'http://www.w3.org/2001/04/xmldsig-more#rsa-sha256'
-        //    'http://www.w3.org/2001/04/xmldsig-more#rsa-sha384'
-        //    'http://www.w3.org/2001/04/xmldsig-more#rsa-sha512'
-        // Notice that rsa-sha1 is a deprecated algorithm and should not be used
-        'signatureAlgorithm' => 'http://www.w3.org/2001/04/xmldsig-more#rsa-sha256',
-
-        // Algorithm that the toolkit will use on digest process. Options:
-        //    'http://www.w3.org/2000/09/xmldsig#sha1'
-        //    'http://www.w3.org/2001/04/xmlenc#sha256'
-        //    'http://www.w3.org/2001/04/xmldsig-more#sha384'
-        //    'http://www.w3.org/2001/04/xmlenc#sha512'
-        // Notice that sha1 is a deprecated algorithm and should not be used
-        'digestAlgorithm' => 'http://www.w3.org/2001/04/xmlenc#sha256',
-
-        // Algorithm that the toolkit will use for encryption process. Options:
-        // 'http://www.w3.org/2001/04/xmlenc#tripledes-cbc'
-        // 'http://www.w3.org/2001/04/xmlenc#aes128-cbc'
-        // 'http://www.w3.org/2001/04/xmlenc#aes192-cbc'
-        // 'http://www.w3.org/2001/04/xmlenc#aes256-cbc'
-        // 'http://www.w3.org/2009/xmlenc11#aes128-gcm'
-        // 'http://www.w3.org/2009/xmlenc11#aes192-gcm'
-        // 'http://www.w3.org/2009/xmlenc11#aes256-gcm';
-        // Notice that aes-cbc are not consider secure anymore so should not be used
-        'encryption_algorithm' => 'http://www.w3.org/2009/xmlenc11#aes128-gcm',
-
-        // ADFS URL-Encodes SAML data as lowercase, and the toolkit by default uses
-        // uppercase. Turn it True for ADFS compatibility on signature verification
-        'lowercaseUrlencoding' => false,
-    ),
-
-    // Contact information template, it is recommended to supply a
-    // technical and support contacts.
-    'contactPerson' => array(
-        'technical' => array(
-            'givenName' => '',
-            'emailAddress' => ''
-        ),
-        'support' => array(
-            'givenName' => '',
-            'emailAddress' => ''
-        ),
-    ),
-
-    // Organization information template, the info in en_US lang is
-    // recomended, add more if required.
-    'organization' => array(
-        'en-US' => array(
-            'name' => '',
-            'displayname' => '',
-            'url' => ''
-        ),
-    ),
-);
-```
-
-The compression settings allow you to instruct whether or not the IdP can accept
-data that has been compressed using [gzip](gzip) ('requests' and 'responses').
-But if we provide a `$deflate` boolean parameter to the `getRequest` or `getResponse` method it will have priority over the compression settings.
-
-In the security section, you can set the way that the SP will handle the messages
-and assertions. Contact the admin of the IdP and ask him what the IdP expects,
-and decide what validations will handle the SP and what requirements the SP will have
-and communicate them to the IdP's admin too.
-
-Once we know what kind of data could be configured, let's talk about the way
-settings are handled within the toolkit.
-
-The settings files described (`settings.php` and `advanced_settings.php`) are loaded
-by the toolkit if no other array with settings info is provided in the constructor of the toolkit. Let's see some examples.
-
-```php
-// Initializes toolkit with settings.php & advanced_settings files.
-$auth = new OneLogin\Saml2\Auth();
-//or
-$settings = new OneLogin\Saml2\Settings();
-
-// Initializes toolkit with the array provided.
-$auth = new OneLogin\Saml2\Auth($settingsInfo);
-//or
-$settings = new OneLogin\Saml2\Settings($settingsInfo);
-```
-
-You can declare the `$settingsInfo` in the file that contains the constructor
-execution or locate them in any file and load the file in order to get the
-array available as we see in the following example:
-
-```php
-<?php
-
-require_once 'custom_settings.php';  // The custom_settings.php contains a
-                                     // $settingsInfo array.
-
-$auth = new OneLogin\Saml2\Auth($settingsInfo);
-```
-
-
-#### How load the library ####
-
-
-In order to use the toolkit library, if your project support composer you only
-need to install it with composer (See the installation section) and you are done.
-
-
-If your project doesn't use composer you need to import the `_toolkit_loader.php`
-file located on the base folder of the toolkit. You can load this file in this way:
-
-```php
-<?php
-
-define("TOOLKIT_PATH", '/var/www/php-saml/');
-require_once(TOOLKIT_PATH . '_toolkit_loader.php');
-```
-
-After that line we will be able to use the classes (and their methods) of the
-toolkit (because the external and the Saml2 libraries files are loaded).
-
-That toolkit depends on [xmlseclibs](https://github.com/robrichards/xmlseclibs) 3.X.X branch,
-you will need to get its code and place on your project and reuse the _toolkit_loader.php 
-file to include xmlseclibs as well.
-
-
-#### Initiate SSO ####
-
-In order to send an `AuthNRequest` to the IdP:
-
-```php
-<?php
-
-define("TOOLKIT_PATH", '/var/www/php-saml/');
-require_once(TOOLKIT_PATH . '_toolkit_loader.php');   // We load the SAML2 lib
-
-$auth = new OneLogin\Saml2\Auth(); // Constructor of the SP, loads settings.php
-                                   // and advanced_settings.php
-$auth->login();   // Method that sent the AuthNRequest
-```
-
-The `AuthNRequest` will be sent signed or unsigned based on the security info
-of the `advanced_settings.php` (`'authnRequestsSigned'`).
-
-
-The IdP will then return the SAML Response to the user's client. The client is then forwarded to the Attribute Consumer Service of the SP with this information. If we do not set a `'url'` param in the login method and we are using the default ACS provided by the toolkit (`endpoints/acs.php`), then the ACS endpoint will redirect the user to the file that launched the SSO request.
-
-We can set a `'returnTo'` url to change the workflow and redirect the user to the other PHP file.
-
-```php
-$newTargetUrl = 'http://example.com/consume2.php';
-$auth = new OneLogin\Saml2\Auth();
-$auth->login($newTargetUrl);
-```
-
-The login method can receive other six optional parameters:
-
-* `$parameters` - An array of parameters that will be added to the `GET` in the HTTP-Redirect.
-* `$forceAuthn` - When true the `AuthNRequest` will set the `ForceAuthn='true'`
-* `$isPassive` - When true the `AuthNRequest` will set the `Ispassive='true'`
-* `$strict` - True if we want to stay (returns the url string) False to redirect
-* `$setNameIdPolicy` - When true the AuthNRequest will set a nameIdPolicy element.
-* `$nameIdValueReq` - Indicates to the IdP the subject that should be authenticated.
-
-If a match on the future SAMLResponse ID and the AuthNRequest ID to be sent is required, that AuthNRequest ID must to be extracted and saved.
-
-```php
-$ssoBuiltUrl = $auth->login(null, array(), false, false, true);
-$_SESSION['AuthNRequestID'] = $auth->getLastRequestID();
-header('Pragma: no-cache');
-header('Cache-Control: no-cache, must-revalidate');
-header('Location: ' . $ssoBuiltUrl);
-exit();
-```
-
-#### The SP Endpoints ####
-
-Related to the SP there are three important views: The metadata view, the ACS view and the SLS view. The toolkit
-provides examples of those views in the endpoints directory.
-
-##### SP Metadata `endpoints/metadata.php` #####
-
-This code will provide the XML metadata file of our SP, based on the info that we provided in the settings files.
-
-```php
-<?php
-
-define("TOOLKIT_PATH", '/var/www/php-saml/');
-require_once dirname(TOOLKIT_PATH.'/_toolkit_loader.php';
-
-try {
-    $auth = new OneLogin\Saml2\Auth();
-    $settings = $auth->getSettings();
-    $metadata = $settings->getSPMetadata();
-    $errors = $settings->validateMetadata($metadata);
-    if (empty($errors)) {
-        header('Content-Type: text/xml');
-        echo $metadata;
-    } else {
-        throw new OneLogin\Saml2\Error(
-            'Invalid SP metadata: '.implode(', ', $errors),
-            OneLogin\Saml2\Error::METADATA_SP_INVALID
-        );
-    }
-} catch (Exception $e) {
-    echo $e->getMessage();
-}
-```
-The `getSPMetadata` will return the metadata signed or not based
-on the security info of the `advanced_settings.php` (`'signMetadata'`).
-
-Before the XML metadata is exposed, a check takes place to ensure
-that the info to be provided is valid.
-
-Instead of use the Auth object, you can directly use
-
-```php
-$settings = new OneLogin\Saml2\Settings($settingsInfo, true);
-```
-to get the settings object and with the true parameter we will avoid the IdP Settings validation.
-
-
-##### Attribute Consumer Service(ACS) `endpoints/acs.php` #####
-
-This code handles the SAML response that the IdP forwards to the SP through the user's client.
-
-```php
-<?php
-
-session_start();  // IMPORTANT: This is required in order to be able
-                  // to store the user data in the session.
-
-define("TOOLKIT_PATH", '/var/www/php-saml/');
-require_once dirname(TOOLKIT_PATH.'/_toolkit_loader.php';
-
-$auth = new OneLogin\Saml2\Auth();
-
-if (isset($_SESSION) && isset($_SESSION['AuthNRequestID'])) {
-    $requestID = $_SESSION['AuthNRequestID'];
-} else {
-    $requestID = null;
-}
-
-$auth->processResponse($requestID);
-unset($_SESSION['AuthNRequestID']);
-
-$errors = $auth->getErrors();
-
-if (!empty($errors)) {
-    echo '<p>' . implode(', ', $errors) . '</p>';
-    exit();
-}
-
-if (!$auth->isAuthenticated()) {
-    echo "<p>Not authenticated</p>";
-    exit();
-}
-
-$_SESSION['samlUserdata'] = $auth->getAttributes();
-$_SESSION['samlNameId'] = $auth->getNameId();
-$_SESSION['samlNameIdFormat'] = $auth->getNameIdFormat();
-$_SESSION['samlNameidNameQualifier'] = $auth->getNameIdNameQualifier();
-$_SESSION['samlNameidSPNameQualifier'] = $auth->getNameIdSPNameQualifier();
-$_SESSION['samlSessionIndex'] = $auth->getSessionIndex();
-
-if (isset($_POST['RelayState']) && OneLogin\Saml2\Utils::getSelfURL() != $_POST['RelayState']) {
-    // To avoid 'Open Redirect' attacks, before execute the
-    // redirection confirm the value of $_POST['RelayState'] is a // trusted URL.
-    $auth->redirectTo($_POST['RelayState']);
-}
-
-$attributes = $_SESSION['samlUserdata'];
-$nameId = $_SESSION['samlNameId'];
-
-echo '<h1>Identified user: '. htmlentities($nameId) .'</h1>';
-
-if (!empty($attributes)) {
-    echo '<h2>' . _('User attributes:') . '</h2>';
-    echo '<table><thead><th>' . _('Name') . '</th><th>' . _('Values') . '</th></thead><tbody>';
-    foreach ($attributes as $attributeName => $attributeValues) {
-        echo '<tr><td>' . htmlentities($attributeName) . '</td><td><ul>';
-        foreach ($attributeValues as $attributeValue) {
-            echo '<li>' . htmlentities($attributeValue) . '</li>';
-        }
-        echo '</ul></td></tr>';
-    }
-    echo '</tbody></table>';
-} else {
-    echo _('No attributes found.');
-}
-```
-
-The SAML response is processed and then checked that there are no errors.
-It also verifies that the user is authenticated and stored the userdata in session.
-
-At that point there are two possible alternatives:
-
- 1. If no `RelayState` is provided, we could show the user data in this view
- or however we wanted.
-
- 2. If `RelayState` is provided, a redirection takes place.
-
-Notice that we saved the user data in the session before the redirection to
-have the user data available at the `RelayState` view.
-
-
-###### The `getAttributes` method ######
-
-In order to retrieve attributes we can use:
-
-```php
-$attributes = $auth->getAttributes();
-```
-
-With this method we get all the user data provided by the IdP in the Assertion
-of the SAML Response.
-
-If we execute ```print_r($attributes)``` we could get:
-
-```php
-Array
-(
-    [cn] => Array
-        (
-            [0] => John
-        )
-    [sn] => Array
-        (
-            [0] => Doe
-        )
-    [mail] => Array
-        (
-            [0] => john.doe@example.com
-        )
-    [groups] => Array
-        (
-            [0] => users
-            [1] => members
-        )
-)
-```
-
-Each attribute name can be used as an index into `$attributes` to obtain the value. Every attribute value
-is an array - a single-valued attribute is an array of a single element.
-
-
-The following code is equivalent:
-
-```php
-$attributes = $auth->getAttributes();
-print_r($attributes['cn']);
-```
-
-```php
-print_r($auth->getAttribute('cn'));
-```
-
-
-Before trying to get an attribute, check that the user is
-authenticated. If the user isn't authenticated or if there were
-no attributes in the SAML assertion, an empty array will be
-returned. For example, if we call to `getAttributes` before a
-`$auth->processResponse`, the `getAttributes()` will return an
-empty array.
-
-
-##### Single Logout Service (SLS) `endpoints/sls.php` #####
-
-This code handles the Logout Request and the Logout Responses.
-
-```php
-<?php
-
-session_start();  // IMPORTANT: This is required in order to be able
-                  // to close the user session.
-
-define("TOOLKIT_PATH", '/var/www/php-saml/');
-require_once dirname(TOOLKIT_PATH.'/_toolkit_loader.php';
-
-$auth = new OneLogin\Saml2\Auth();
-
-if (isset($_SESSION) && isset($_SESSION['LogoutRequestID'])) {
-    $requestID = $_SESSION['LogoutRequestID'];
-} else {
-    $requestID = null;
-}
-
-$auth->processSLO(false, $requestID);
-
-$errors = $auth->getErrors();
-
-if (empty($errors)) {
-    echo 'Sucessfully logged out';
-} else {
-    echo implode(', ', $errors);
-}
-```
-
-If the SLS endpoints receives a Logout Response, the response is
-validated and the session could be closed
-
-
-
-```php
-// part of the processSLO method
-
-$logoutResponse = new OneLogin\Saml2\LogoutResponse($this->_settings, $_GET['SAMLResponse']);
-if (!$logoutResponse->isValid($requestId)) {
-    $this->_errors[] = 'invalid_logout_response';
-} else if ($logoutResponse->getStatus() !== OneLogin\Saml2\Constants::STATUS_SUCCESS) {
-    $this->_errors[] = 'logout_not_success';
-} else {
-    if (!$keepLocalSession) {
-        OneLogin\Saml2\Utils::deleteLocalSession();
-    }
-}
-```
-
-If the SLS endpoints receives an Logout Request, the request is validated,
-the session is closed and a Logout Response is sent to the SLS endpoint of
-the IdP.
-
-```php
-// part of the processSLO method
-
-$decoded = base64_decode($_GET['SAMLRequest']);
-$request = gzinflate($decoded);
-if (!OneLogin\Saml2\LogoutRequest::isValid($this->_settings, $request)) {
-    $this->_errors[] = 'invalid_logout_request';
-} else {
-    if (!$keepLocalSession) {
-        OneLogin\Saml2\Utils::deleteLocalSession();
-    }
-
-    $inResponseTo = $request->id;
-    $responseBuilder = new OneLogin\Saml2\LogoutResponse($this->_settings);
-    $responseBuilder->build($inResponseTo);
-    $logoutResponse = $responseBuilder->getResponse();
-
-    $parameters = array('SAMLResponse' => $logoutResponse);
-    if (isset($_GET['RelayState'])) {
-        $parameters['RelayState'] = $_GET['RelayState'];
-    }
-
-    $security = $this->_settings->getSecurityData();
-    if (isset($security['logoutResponseSigned']) && $security['logoutResponseSigned']) {
-        $signature = $this->buildResponseSignature($logoutResponse, $parameters['RelayState'], $security['signatureAlgorithm']);
-        $parameters['SigAlg'] = $security['signatureAlgorithm'];
-        $parameters['Signature'] = $signature;
-    }
-
-    $this->redirectTo($this->getSLOurl(), $parameters);
-}
-```
-
-If you aren't using the default PHP session, or otherwise need a manual
-way to destroy the session, you can pass a callback method to the
-`processSLO` method as the fourth parameter
-
-```php
-$keepLocalSession = False;
-$callback = function () {
-    // Destroy user session
-};
-
-$auth->processSLO($keepLocalSession, null, false, $callback);
-```
-
-
-If we don't want that `processSLO` to destroy the session, pass a true
-parameter to the `processSLO` method
-
-```php
-$keepLocalSession = True;
-$auth->processSLO($keepLocalSession);
-```
-
-#### Initiate SLO ####
-
-In order to send a Logout Request to the IdP:
-
-```php
-<?php
-
-define("TOOLKIT_PATH", '/var/www/php-saml/');
-require_once(TOOLKIT_PATH . '_toolkit_loader.php');
-
-$auth = new OneLogin\Saml2\Auth();
-
-$auth->logout();   // Method that sent the Logout Request.
-```
-
-Also there are eight optional parameters that can be set:
-* `$returnTo` - The target URL the user should be returned to after logout.
-* `$parameters` - Extra parameters to be added to the GET.
-* `$name_id` - That will be used to build the LogoutRequest. If `name_id` parameter is not set and the auth object processed a
-SAML Response with a `NameId`, then this `NameId` will be used.
-* `$session_index` - SessionIndex that identifies the session of the user.
-* `$stay` - True if we want to stay (returns the url string) False to redirect.
-* `$nameIdFormat` - The NameID Format will be set in the LogoutRequest.
-* `$nameIdNameQualifier` - The NameID NameQualifier will be set in the LogoutRequest.
-* `$nameIdSPNameQualifier` - The NameID SP NameQualifier will be set in the LogoutRequest.
-
-The Logout Request will be sent signed or unsigned based on the security
-info of the `advanced_settings.php` (`'logoutRequestSigned'`).
-
-The IdP will return the Logout Response through the user's client to the
-Single Logout Service of the SP.
-If we do not set a `'url'` param in the logout method and are using the
-default SLS provided by the toolkit (`endpoints/sls.php`), then the SLS
-endpoint will redirect the user to the file that launched the SLO request.
-
-We can set an `'returnTo'` url to change the workflow and redirect the user
-to other php file.
-
-```php
-$newTargetUrl = 'http://example.com/loggedOut.php';
-$auth = new OneLogin\Saml2\Auth();
-$auth->logout($newTargetUrl);
-```
-A more complex logout with all the parameters:
-```
-$auth = new OneLogin\Saml2\Auth();
-$returnTo = null;
-$parameters = array();
-$nameId = null;
-$sessionIndex = null;
-$nameIdFormat = null;
-$nameIdNameQualifier = null;
-$nameIdSPNameQualifier = null;
-
-if (isset($_SESSION['samlNameId'])) {
-    $nameId = $_SESSION['samlNameId'];
-}
-if (isset($_SESSION['samlSessionIndex'])) {
-    $sessionIndex = $_SESSION['samlSessionIndex'];
-}
-if (isset($_SESSION['samlNameIdFormat'])) {
-    $nameIdFormat = $_SESSION['samlNameIdFormat'];
-}
-if (isset($_SESSION['samlNameIdNameQualifier'])) {
-    $nameIdNameQualifier = $_SESSION['samlNameIdNameQualifier'];
-}
-if (isset($_SESSION['samlNameIdSPNameQualifier'])) {
-    $nameIdSPNameQualifier = $_SESSION['samlNameIdSPNameQualifier'];
-}
-$auth->logout($returnTo, $parameters, $nameId, $sessionIndex, false, $nameIdFormat, $nameIdNameQualifier, $nameIdSPNameQualifier);
-```
-
-If a match on the future LogoutResponse ID and the LogoutRequest ID to be sent is required, that LogoutRequest ID must to be extracted and stored.
-
-```php
-$sloBuiltUrl = $auth->logout(null, $parameters, $nameId, $sessionIndex, true);
-$_SESSION['LogoutRequestID'] = $auth->getLastRequestID();
-header('Pragma: no-cache');
-header('Cache-Control: no-cache, must-revalidate');
-header('Location: ' . $sloBuiltUrl);
-exit();
-```
-
-#### Example of a view that initiates the SSO request and handles the response (is the acs target) ####
-
-We can code a unique file that initiates the SSO process, handle the response, get the attributes, initiate
-the SLO and processes the logout response.
-
-Note: Review the `demo1` folder that contains that use case; in a later section we
-explain the demo1 use case further in detail.
-
-```php
-<?php
-
-session_start();    // Initialize the session, we do that because
-                    // Note that processResponse and processSLO
-                    // methods could manipulate/close that session
-
-require_once dirname(__DIR__) . '/_toolkit_loader.php'; // Load Saml2 and xmlseclibs
-require_once 'settings.php';    // Load the setting info as an Array
-
-$auth = new OneLogin\Saml2\Auth($settingsInfo);  // Initialize the SP SAML instance
-
-if (isset($_GET['sso'])) {    // SSO action.  Will send an AuthNRequest to the IdP
-    $auth->login();
-} else if (isset($_GET['sso2'])) {              // Another SSO action
-    $returnTo = $spBaseUrl.'/demo1/attrs.php';  // but set a custom RelayState URL
-    $auth->login($returnTo);
-} else if (isset($_GET['slo'])) {  // SLO action. Will sent a Logout Request to IdP
-    $auth->logout();
-} else if (isset($_GET['acs'])) {  // Assertion Consumer Service
-    $auth->processResponse();      // Process the Response of the IdP, get the
-                                   // attributes and put then at
-                                   // $_SESSION['samlUserdata']
-
-    $errors = $auth->getErrors();  // This method receives an array with the errors
-                                   // that could took place during the process
-
-    if (!empty($errors)) {
-        echo '<p>' . implode(', ', $errors) . '</p>';
-    }
-                                          // This check if the response was
-    if (!$auth->isAuthenticated()) {      // sucessfully validated and the user
-        echo '<p>Not authenticated</p>';  // data retrieved or not
-        exit();
-    }
-
-    $_SESSION['samlUserdata'] = $auth->getAttributes(); // Retrieves user data
-    if (isset($_POST['RelayState']) && OneLogin\Saml2\Utils::getSelfURL() != $_POST['RelayState']) {
-        // To avoid 'Open Redirect' attacks, before execute the
-        // redirection confirm the value of $_POST['RelayState'] is a // trusted URL.
-        $auth->redirectTo($_POST['RelayState']);  // Redirect if there is a
-    }                                             // relayState set
-} else if (isset($_GET['sls'])) {   // Single Logout Service
-    $auth->processSLO();            // Process the Logout Request & Logout Response
-    $errors = $auth->getErrors(); // Retrieves possible validation errors
-    if (empty($errors)) {
-        echo '<p>Sucessfully logged out</p>';
-    } else {
-        echo '<p>' . htmlentities(implode(', ', $errors)) . '</p>';
-    }
-}
-
-if (isset($_SESSION['samlUserdata'])) {   // If there is user data we print it.
-    if (!empty($_SESSION['samlUserdata'])) {
-        $attributes = $_SESSION['samlUserdata'];
-        echo 'You have the following attributes:<br>';
-        echo '<table><thead><th>Name</th><th>Values</th></thead><tbody>';
-        foreach ($attributes as $attributeName => $attributeValues) {
-            echo '<tr><td>' . htmlentities($attributeName) . '</td><td><ul>';
-            foreach ($attributeValues as $attributeValue) {
-                echo '<li>' . htmlentities($attributeValue) . '</li>';
-            }
-            echo '</ul></td></tr>';
-        }
-        echo '</tbody></table>';
-    } else {                             // If there is not user data, we notify
-        echo "<p>You don't have any attribute</p>";
-    }
-
-    echo '<p><a href="?slo" >Logout</a></p>'; // Print some links with possible
-} else {                                      // actions
-    echo '<p><a href="?sso" >Login</a></p>';
-    echo '<p><a href="?sso2" >Login and access to attrs.php page</a></p>';
-}
-```
-
-#### URL-guessing methods ####
-
-php-saml toolkit uses a bunch of methods in OneLogin\Saml2\Utils that try to guess the URL where the SAML messages are processed.
-
-* `getSelfHost` Returns the current host.
-* `getSelfPort` Return the port number used for the request
-* `isHTTPS` Checks if the protocol is https or http.
-* `getSelfURLhost` Returns the protocol + the current host + the port (if different than common ports).
-* `getSelfURL` Returns the URL of the current host + current view + query.
-* `getSelfURLNoQuery` Returns the URL of the current host + current view.
-* `getSelfRoutedURLNoQuery` Returns the routed URL of the current host + current view.
-
-getSelfURLNoQuery and getSelfRoutedURLNoQuery are used to calculate the currentURL in order to validate SAML elements like Destination or Recipient.
-
-When the PHP application is behind a proxy or a load balancer we can execute `setProxyVars(true)` and `setSelfPort` and `isHTTPS` will take care of the `$_SERVER["HTTP_X_FORWARDED_PORT"]` and `$_SERVER['HTTP_X_FORWARDED_PROTO']` vars (otherwise they are ignored).
-
-Also a developer can use `setSelfProtocol`, `setSelfHost`, `setSelfPort` and `getBaseURLPath` to define a specific value to be returned by `isHTTPS`, `getSelfHost`, `getSelfPort` and `getBaseURLPath`. And define a `setBasePath` to be used on the `getSelfURL` and `getSelfRoutedURLNoQuery` to replace the data extracted from `$_SERVER["REQUEST_URI"]`.
-
-At the settings the developer will be able to set a `'baseurl'` parameter that automatically will use `setBaseURL` to set values for `setSelfProtocol`, `setSelfHost`, `setSelfPort` and `setBaseURLPath`.
-
-
-### Working behind load balancer ###
-
-Is possible that asserting request URL and Destination attribute of SAML response fails when working behind load balancer with SSL offload.
-
-You should be able to workaround this by configuring your server so that it is aware of the proxy and returns the original url when requested.
-
-Or by using the method described on the previous section.
-
-
-### SP Key rollover ###
-
-If you plan to update the SP x509cert and privateKey you can define the new x509cert as `$settings['sp']['x509certNew']` and it will be
-published on the SP metadata so Identity Providers can read them and get ready for rollover.
-
-
-### IdP with multiple certificates ###
-
-In some scenarios the IdP uses different certificates for
-signing/encryption, or is under key rollover phase and more than one certificate is published on IdP metadata.
-
-In order to handle that the toolkit offers the `$settings['idp']['x509certMulti']` parameter.
-
-When that parameter is used, `'x509cert'` and `'certFingerprint'` values will be ignored by the toolkit.
-
-The `x509certMulti` is an array with 2 keys:
-- `signing`. An array of certs that will be used to validate IdP signature
-- `encryption` An array with one unique cert that will be used to encrypt data to be sent to the IdP
-
-
-### Replay attacks ###
-
-In order to avoid replay attacks, you can store the ID of the SAML messages already processed, to avoid processing them twice. Since the Messages expires and will be invalidated due that fact, you don't need to store those IDs longer than the time frame that you currently accepting.
-
-Get the ID of the last processed message/assertion with the `getLastMessageId`/`getLastAssertionId` methods of the Auth object.
-
-
-### Main classes and methods ###
-
-Described below are the main classes and methods that can be invoked.
-
-#### Saml2 library ####
-
-Lets describe now the classes and methods of the SAML2 library.
-
-##### OneLogin\Saml2\Auth - Auth.php #####
-
-Main class of OneLogin PHP Toolkit
-
- * `Auth` - Initializes the SP SAML instance
- * `login` - Initiates the SSO process.
- * `logout` - Initiates the SLO process.
- * `processResponse` - Process the SAML Response sent by the IdP.
- * `processSLO` - Process the SAML Logout Response / Logout Request sent by the
-   IdP.
- * `redirectTo` - Redirects the user to the url past by parameter or to the url
-   that we defined in our SSO Request.
- * `isAuthenticated` - Checks if the user is authenticated or not.
- * `getAttributes` - Returns the set of SAML attributes.
- * `getAttribute` - Returns the requested SAML attribute
- * `getNameId` - Returns the nameID
- * `getNameIdFormat` - Gets the NameID Format provided by the SAML response from the IdP.
- * `getNameIdNameQualifier` - Gets the NameID NameQualifier provided from the SAML Response String.
- * `getNameIdSPNameQualifier` - Gets the NameID SP NameQualifier provided from the SAML Response String.
- * `getSessionIndex` - Gets the SessionIndex from the AuthnStatement.
- * `getErrors` - Returns if there were any error
- * `getSSOurl` - Gets the SSO url.
- * `getSLOurl` - Gets the SLO url.
- * `getLastRequestID` - The ID of the last Request SAML message generated.
- * `buildRequestSignature` - Generates the Signature for a SAML Request
- * `buildResponseSignature` - Generates the Signature for a SAML Response
- * `getSettings` - Returns the settings info
- * `setStrict` - Set the strict mode active/disable
- * `getLastRequestID` - Gets the ID of the last AuthNRequest or LogoutRequest generated by the Service Provider.
- * `getLastRequestXML` - Returns the most recently-constructed/processed XML SAML request (AuthNRequest, LogoutRequest)
- * `getLastResponseXML` - Returns the most recently-constructed/processed XML SAML response (SAMLResponse, LogoutResponse). If the SAMLResponse had an encrypted assertion, decrypts it.
-
-
-##### OneLogin\Saml2\AuthnRequest - `AuthnRequest.php` #####
-
-SAML 2 Authentication Request class
-
- * `AuthnRequest` - Constructs the `AuthnRequest` object.
- * `getRequest` - Returns deflated, base64 encoded, unsigned `AuthnRequest`.
- * `getId` - Returns the `AuthNRequest` ID.
- * `getXML` - Returns the XML that will be sent as part of the request.
-
-##### OneLogin\Saml2\Response - `Response.php` #####
-
-SAML 2 Authentication Response class
-
- * `Response` - Constructs the SAML Response object.
- * `isValid` - Determines if the SAML Response is valid using the certificate.
- * `checkStatus` - Checks if the Status is success.
- * `getAudiences` - Gets the audiences.
- * `getIssuers` - Gets the Issuers (from Response and Assertion)
- * `getNameIdData` - Gets the NameID Data provided by the SAML response from the
-   IdP.
- * `getNameId` - Gets the NameID provided by the SAML response from the IdP.
- * `getNameIdFormat` - Gets the NameID Format provided by the SAML response from the IdP.
- * `getNameIdNameQualifier` - Gets the NameID NameQualifier provided from the SAML Response String.
- * `getNameIdSPNameQualifier` - Gets the NameID SP NameQualifier provided from the SAML Response String.
- * `getSessionNotOnOrAfter` - Gets the SessionNotOnOrAfter from the
-   AuthnStatement
- * `getSessionIndex` - Gets the SessionIndex from the AuthnStatement.
- * `getAttributes` - Gets the Attributes from the AttributeStatement element.
- * `validateNumAssertions` - Verifies that the document only contains a single
-   Assertion (encrypted or not).
- * `validateTimestamps` - Verifies that the document is still valid according
-   Conditions Element.
- * `getError` - After executing a validation process, if it fails, this method returns the cause
- * `getXMLDocument` - Returns the SAML Response document (If contains an encrypted assertion, decrypts it)
-
-##### OneLogin\Saml2\LogoutRequest - `LogoutRequest.php` #####
-
-SAML 2 Logout Request class
-
- * `LogoutRequest` - Constructs the Logout Request object.
- * `getRequest` - Returns the Logout Request defated, base64encoded, unsigned
- * `getID` - Returns the ID of the Logout Request. (If you have the object you can access to the id attribute)
- * `getNameIdData` - Gets the NameID Data of the the Logout Request.
- * `getNameId` - Gets the NameID of the Logout Request.
- * `getIssuer` - Gets the Issuer of the Logout Request.
- * `getSessionIndexes` - Gets the SessionIndexes from the Logout Request.
- * `isValid` - Checks if the Logout Request received is valid.
- * `getError` - After executing a validation process, if it fails, this method returns the cause
- * `getXML` - Returns the XML that will be sent as part of the request or that was received at the SP.
-
-##### OneLogin\Saml2\LogoutResponse - `LogoutResponse.php` #####
-
-SAML 2 Logout Response class
-
- * `LogoutResponse` - Constructs a Logout Response object
-   (Initialize params from settings and if provided load the Logout Response)
- * `getIssuer` - Gets the Issuer of the Logout Response.
- * `getStatus` - Gets the Status of the Logout Response.
- * `isValid` - Determines if the SAML LogoutResponse is valid
- * `build` - Generates a Logout Response object.
- * `getResponse` - Returns a Logout Response object.
- * `getError` - After executing a validation process, if it fails, this method returns the cause.
- * `getXML` - Returns the XML that will be sent as part of the response or that was received at the SP.
-
-##### OneLogin\Saml2\Settings - `Settings.php` #####
-
-Configuration of the OneLogin PHP Toolkit
-
- * `Settings` -  Initializes the settings: Sets the paths of
-   the different folders and Loads settings info from settings file or
-   array/object provided
- * `checkSettings` - Checks the settings info.
- * `getBasePath` - Returns base path.
- * `getCertPath` - Returns cert path.
- * `getLibPath` - Returns lib path.
- * `getExtLibPath` - Returns external lib path.
- * `getSchemasPath` - Returns schema path.
- * `checkSPCerts` - Checks if the x509 certs of the SP exists and are valid.
- * `getSPkey` - Returns the x509 private key of the SP.
- * `getSPcert` - Returns the x509 public cert of the SP.
- * `getSPcertNew` - Returns the future x509 public cert of the SP.
- * `getIdPData` - Gets the IdP data.
- * `getSPData`Gets the SP data.
- * `getSecurityData` - Gets security data.
- * `getContacts` - Gets contact data.
- * `getOrganization` - Gets organization data.
- * `getSPMetadata` - Gets the SP metadata. The XML representation.
- * `validateMetadata` - Validates an XML SP Metadata.
- * `formatIdPCert` - Formats the IdP cert.
- * `formatSPCert` - Formats the SP cert.
- * `formatSPCertNew` - Formats the SP cert new.
- * `formatSPKey` - Formats the SP private key.
- * `getErrors` - Returns an array with the errors, the array is empty when
-   the settings is ok.
- * `getLastErrorReason` - Returns the reason of the last error
- * `getBaseURL` -  Returns the baseurl set on the settings if any.
- * `setBaseURL` - Set a baseurl value
- * `setStrict` - Activates or deactivates the strict mode.
- * `isStrict` - Returns if the 'strict' mode is active.
- * `isDebugActive` - Returns if the debug is active.
-
-##### OneLogin\Saml2\Metadata - `Metadata.php` #####
-
-A class that contains functionality related to the metadata of the SP
-
-* `builder` - Generates the metadata of the SP based on the settings.
-* `signmetadata` - Signs the metadata with the key/cert provided
-* `addX509KeyDescriptors` - Adds the x509 descriptors (sign/encriptation) to
-  the metadata
-
-##### OneLogin\Saml2\Utils - `Utils.php` #####
-
-Auxiliary class that contains several methods
-
- * `validateXML` - This function attempts to validate an XML string against
-   the specified schema.
- * `formatCert` - Returns a x509 cert (adding header & footer if required).
- * `formatPrivateKey` - returns a RSA private key (adding header & footer if required).
- * `redirect` - Executes a redirection to the provided url (or return the
-   target url).
- * `isHTTPS` - Checks if https or http.
- * `getSelfHost` - Returns the current host.
- * `getSelfURLhost` - Returns the protocol + the current host + the port
-   (if different than common ports).
- * `getSelfURLNoQuery` - Returns the URL of the current host + current view.
- * `getSelfURL` - Returns the URL of the current host + current view + query.
- * `generateUniqueID` - Generates a unique string (used for example as ID
-   for assertions).
- * `parseTime2SAML` - Converts a UNIX timestamp to SAML2 timestamp on the
-   form `yyyy-mm-ddThh:mm:ss(\.s+)?Z`.
- * `parseSAML2Time` - Converts a SAML2 timestamp on the form
-   `yyyy-mm-ddThh:mm:ss(\.s+)?Z` to a UNIX timestamp. The sub-second part is
-   ignored.
- * `parseDuration` - Interprets a ISO8601 duration value relative to a given
-   timestamp.
- * `getExpireTime` - Compares two dates and returns the earliest.
- * `query` - Extracts nodes from the DOMDocument.
- * `isSessionStarted` - Checks if the session is started or not.
- * `deleteLocalSession` - Deletes the local session.
- * `calculateX509Fingerprint` - Calculates the fingerprint of a x509cert.
- * `formatFingerPrint` - Formats a fingerprint.
- * `generateNameId` - Generates a `nameID`.
- * `getStatus` - Gets Status from a Response.
- * `decryptElement` - Decrypts an encrypted element.
- * `castKey` - Converts a `XMLSecurityKey` to the correct algorithm.
- * `addSign` - Adds signature key and senders certificate to an element
-   (Message or Assertion).
- * `validateSign` - Validates a signature (Message or Assertion).
-
-##### OneLogin\Saml2\IdPMetadataParser - `IdPMetadataParser.php` #####
-
-Auxiliary class that contains several methods to retrieve and process IdP metadata
-
- * `parseRemoteXML` - Get IdP Metadata Info from URL.
- * `parseFileXML` - Get IdP Metadata Info from File.
- * `parseXML` - Get IdP Metadata Info from XML.
- * `injectIntoSettings` - Inject metadata info into php-saml settings array.
-
-The class does not validate in any way the URL that is introduced on methods like parseRemoteXML in order to retrieve the remove XML. Usually is the same administrator that handles the Service Provider the ones that set the URL that should belong to a trusted third-party IdP.
-But there are other scenarios, like a SAAS app where the administrator of the app delegates on other administrators. In such case, extra protection should be taken in order to validate such URL inputs and avoid attacks like SSRF.
-
-For more info, look at the source code; each method is documented and details
-about what it does and how to use it are provided. Make sure to also check the doc folder where
-HTML documentation about the classes and methods is provided for SAML and
-SAML2.
-
-
-Demos included in the toolkit
------------------------------
-
-The toolkit includes three demo apps to teach how use the toolkit, take a look on it.
-
-Demos require that SP and IdP are well configured before test it.
-
-## Demo1 ##
-
-### SP setup ###
-
-The Onelogin's PHP Toolkit allows you to provide the settings info in two ways:
-
- * Use a `settings.php` file that we should locate at the base folder of the
-   toolkit.
- * Use an array with the setting data.
-
-In this demo we provide the data in the second way, using a setting array named
-`$settingsInfo`. This array users the `settings_example.php` included as a template
-to create the `settings.php` settings and store it in the `demo1/` folder.
-Configure the SP part and later review the metadata of the IdP and complete the IdP info.
-
-If you check the code of the index.php file you will see that the `settings.php`
-file is loaded in order to get the `$settingsInfo` var to be used in order to initialize
-the `Setting` class.
-
-Notice that in this demo, the `setting.php` file that could be defined at the base
-folder of the toolkit is ignored and the libs are loaded using the
-`_toolkit_loader.php` located at the base folder of the toolkit.
-
-
-### IdP setup ###
-
-Once the SP is configured, the metadata of the SP is published at the
-`metadata.php` file. Configure the IdP based on that information.
-
-
-### How it works ###
-
- 1. First time you access to `index.php` view, you can select to login and return
-    to the same view or login and be redirected to the `attrs.php` view.
-
- 2. When you click:
-
-    2.1 in the first link, we access to (`index.php?sso`) an `AuthNRequest`
-    is sent to the IdP, we authenticate at the IdP and then a Response is sent
-    through the user's client to the SP, specifically the Assertion Consumer Service view: `index.php?acs`.
-    Notice that a `RelayState` parameter is set to the url that initiated the
-    process, the `index.php` view.
-
-    2.2 in the second link we access to (`attrs.php`) have the same process
-    described at 2.1 with the difference that as `RelayState` is set the `attrs.php`.
-
- 3. The SAML Response is processed in the ACS (`index.php?acs`), if the Response
-    is not valid, the process stops here and a message is shown. Otherwise we
-    are redirected to the RelayState view. a) `index.php` or b) `attrs.php`.
-
- 4. We are logged in the app and the user attributes are showed.
-    At this point, we can test the single log out functionality.
-
- 5. The single log out functionality could be tested by two ways.
-
-    5.1 SLO Initiated by SP. Click on the "logout" link at the SP, after that a
-    Logout Request is sent to the IdP, the session at the IdP is closed and
-    replies through the client to the SP with a Logout Response (sent to the
-    Single Logout Service endpoint). The SLS endpoint (`index.php?sls`) of the SP
-    process the Logout Response and if is valid, close the user session of the
-    local app. Notice that the SLO Workflow starts and ends at the SP.
-
-    5.2 SLO Initiated by IdP. In this case, the action takes place on the IdP
-    side, the logout process is initiated at the idP, sends a Logout
-    Request to the SP (SLS endpoint, `index.php?sls`). The SLS endpoint of the SP
-    process the Logout Request and if is valid, close the session of the user
-    at the local app and send a Logout Response to the IdP (to the SLS endpoint
-    of the IdP). The IdP receives the Logout Response, process it and close the
-    session at of the IdP. Notice that the SLO Workflow starts and ends at the IdP.
-
-Notice that all the SAML Requests and Responses are handled by a unique file,
-the `index.php` file and how `GET` parameters are used to know the action that
-must be done.
-
-
-## Demo2 ##
-
-### SP setup ###
-
-The Onelogin's PHP Toolkit allows you to provide the settings info in two ways:
-
- * Use a `settings.php` file that we should locate at the base folder of the
-   toolkit.
- * Use an array with the setting data.
-
-The first is the case of the demo2 app. The `setting.php` file and the
-`setting_extended.php` file should be defined at the base folder of the toolkit.
-Review the `setting_example.php` and the `advanced_settings_example.php` to
-learn how to build them.
-
-In this case as Attribute Consume Service and Single Logout Service we are going to
-use the files located in the endpoint folder (`acs.php` and `sls.php`).
-
-
-### IdP setup ###
-
-Once the SP is configured, the metadata of the SP is published at the
-`metadata.php` file. Based on that info, configure the IdP.
-
-
-### How it works ###
-
-At demo1, we saw how all the SAML Request and Responses were handler at an
-unique file, the `index.php` file. This demo1 uses high-level programming.
-
-At demo2, we have several views: `index.php`, `sso.php`, `slo.php`, `consume.php`
-and `metadata.php`. As we said, we will use the endpoints that are defined
-in the toolkit (`acs.php`, `sls.php` of the endpoints folder). This demo2 uses
-low-level programming.
-
-Notice that the SSO action can be initiated at `index.php` or `sso.php`.
-
-The SAML workflow that take place is similar that the workflow defined in the
-demo1, only changes the targets.
-
- 1. When you access `index.php` or `sso.php` for the first time, an `AuthNRequest` is
-    sent to the IdP automatically, (as `RelayState` is sent the origin url).
-    We authenticate at the IdP and then a `Response` is sent to the SP, to the
-    ACS endpoint, in this case `acs.php` of the endpoints folder.
-
- 2. The SAML Response is processed in the ACS, if the `Response` is not valid,
-    the process stops here and a message is shown. Otherwise we are redirected
-    to the `RelayState` view (`sso.php` or `index.php`). The `sso.php` detects if the
-    user is logged and redirects to `index.php`, so we will be in the
-    `index.php` at the end.
-
- 3. We are logged into the app and the user attributes (if any) are shown.
-    At this point, we can test the single log out functionality.
-
- 4. The single log out functionality could be tested by two ways.
-
-    4.1 SLO Initiated by SP. Click on the "logout" link at the SP, after that
-    we are redirected to the `slo.php` view and there a Logout Request is sent
-    to the IdP, the session at the IdP is closed and replies to the SP a
-    Logout Response (sent to the Single Logout Service endpoint). In this case
-    The SLS endpoint of the SP process the Logout Response and if is
-    valid, close the user session of the local app. Notice that the SLO
-    Workflow starts and ends at the SP.
-
-    4.2 SLO Initiated by IdP. In this case, the action takes place on the IdP
-    side, the logout process is initiated at the idP, sends a Logout
-    Request to the SP (SLS endpoint `sls.php` of the endpoint folder).
-    The SLS endpoint of the SP process the Logout Request and if is valid,
-    close the session of the user at the local app and sends a Logout Response
-    to the IdP (to the SLS endpoint of the IdP).The IdP receives the Logout
-    Response, process it and close the session at of the IdP. Notice that the
-    SLO Workflow starts and ends at the IdP.
-
diff --git a/saml/vendor/onelogin/php-saml/_toolkit_loader.php b/saml/vendor/onelogin/php-saml/_toolkit_loader.php
deleted file mode 100644
index c4649d76..00000000
--- a/saml/vendor/onelogin/php-saml/_toolkit_loader.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-// Create an __autoload function
-// (can conflicts other autoloaders)
-// http://php.net/manual/en/language.oop5.autoload.php
-
-// Load composer vendor folder if any
-if (file_exists(__DIR__ . '/vendor/autoload.php')) {
-    require __DIR__ . '/vendor/autoload.php';
-}
-
-/*
-// Load xmlseclibs
-
-$xmlseclibsSrcDir = '';
-
-include_once $xmlseclibsSrcDir.'/XMLSecEnc.php';
-include_once $xmlseclibsSrcDir.'/XMLSecurityDSig.php';
-include_once $xmlseclibsSrcDir.'/XMLSecurityKey.php';
-include_once $xmlseclibsSrcDir.'/Utils/XPath.php';
-*/
-
-
-// Load php-saml
-$libDir = __DIR__ . '/src/Saml2/';
-
-$folderInfo = scandir($libDir);
-
-foreach ($folderInfo as $element) {
-    if (is_file($libDir.$element) && (substr($element, -4) === '.php')) {
-        include_once $libDir.$element;
-    }
-}
-
diff --git a/saml/vendor/onelogin/php-saml/advanced_settings_example.php b/saml/vendor/onelogin/php-saml/advanced_settings_example.php
deleted file mode 100644
index d9c16e28..00000000
--- a/saml/vendor/onelogin/php-saml/advanced_settings_example.php
+++ /dev/null
@@ -1,165 +0,0 @@
-<?php
-
-$advancedSettings = array(
-
-    // Compression settings
-    // Handle if the getRequest/getResponse methods will return the Request/Response deflated.
-    // But if we provide a $deflate boolean parameter to the getRequest or getResponse
-    // method it will have priority over the compression settings.
-    'compress' => array(
-        'requests' => true,
-        'responses' => true
-    ),
-
-    // Security settings
-    'security' => array(
-
-        /** signatures and encryptions offered */
-
-        // Indicates that the nameID of the <samlp:logoutRequest> sent by this SP
-        // will be encrypted.
-        'nameIdEncrypted' => false,
-
-        // Indicates whether the <samlp:AuthnRequest> messages sent by this SP
-        // will be signed.              [The Metadata of the SP will offer this info]
-        'authnRequestsSigned' => false,
-
-        // Indicates whether the <samlp:logoutRequest> messages sent by this SP
-        // will be signed.
-        'logoutRequestSigned' => false,
-
-        // Indicates whether the <samlp:logoutResponse> messages sent by this SP
-        // will be signed.
-        'logoutResponseSigned' => false,
-
-        /* Sign the Metadata
-         False || True (use sp certs) || array (
-                                                    'keyFileName' => 'metadata.key',
-                                                    'certFileName' => 'metadata.crt'
-                                               )
-                                      || array (
-                                                    'x509cert' => '',
-                                                    'privateKey' => ''
-                                               )
-        */
-        'signMetadata' => false,
-
-
-        /** signatures and encryptions required **/
-
-        // Indicates a requirement for the <samlp:Response>, <samlp:LogoutRequest> and
-        // <samlp:LogoutResponse> elements received by this SP to be signed.
-        'wantMessagesSigned' => false,
-
-        // Indicates a requirement for the <saml:Assertion> elements received by
-        // this SP to be encrypted.
-        'wantAssertionsEncrypted' => false,
-
-        // Indicates a requirement for the <saml:Assertion> elements received by
-        // this SP to be signed.        [The Metadata of the SP will offer this info]
-        'wantAssertionsSigned' => false,
-
-        // Indicates a requirement for the NameID element on the SAMLResponse received
-        // by this SP to be present.
-        'wantNameId' => true,
-
-        // Indicates a requirement for the NameID received by
-        // this SP to be encrypted.
-        'wantNameIdEncrypted' => false,
-
-        // Authentication context.
-        // Set to false and no AuthContext will be sent in the AuthNRequest,
-        // Set true or don't present this parameter and you will get an AuthContext 'exact' 'urn:oasis:names:tc:SAML:2.0:ac:classes:PasswordProtectedTransport'
-        // Set an array with the possible auth context values: array('urn:oasis:names:tc:SAML:2.0:ac:classes:Password', 'urn:oasis:names:tc:SAML:2.0:ac:classes:X509'),
-        'requestedAuthnContext' => false,
-
-        // Allows the authn comparison parameter to be set, defaults to 'exact' if
-        // the setting is not present.
-        'requestedAuthnContextComparison' => 'exact',
-
-        // Indicates if the SP will validate all received xmls.
-        // (In order to validate the xml, 'strict' and 'wantXMLValidation' must be true).
-        'wantXMLValidation' => true,
-
-        // If true, SAMLResponses with an empty value at its Destination
-        // attribute will not be rejected for this fact.
-        'relaxDestinationValidation' => false,
-
-        // If true, Destination URL should strictly match to the address to
-        // which the response has been sent.
-        // Notice that if 'relaxDestinationValidation' is true an empty Destintation
-        // will be accepted.
-        'destinationStrictlyMatches' => false,
-
-        // If true, the toolkit will not raised an error when the Statement Element
-        // contain atribute elements with name duplicated
-        'allowRepeatAttributeName' => false,
-
-        // If true, SAMLResponses with an InResponseTo value will be rejectd if not
-        // AuthNRequest ID provided to the validation method.
-        'rejectUnsolicitedResponsesWithInResponseTo' => false,
-
-        // Algorithm that the toolkit will use on signing process. Options:
-        //    'http://www.w3.org/2000/09/xmldsig#rsa-sha1'
-        //    'http://www.w3.org/2000/09/xmldsig#dsa-sha1'
-        //    'http://www.w3.org/2001/04/xmldsig-more#rsa-sha256'
-        //    'http://www.w3.org/2001/04/xmldsig-more#rsa-sha384'
-        //    'http://www.w3.org/2001/04/xmldsig-more#rsa-sha512'
-        // Notice that rsa-sha1 is a deprecated algorithm and should not be used
-        'signatureAlgorithm' => 'http://www.w3.org/2001/04/xmldsig-more#rsa-sha256',
-
-        // Algorithm that the toolkit will use on digest process. Options:
-        //    'http://www.w3.org/2000/09/xmldsig#sha1'
-        //    'http://www.w3.org/2001/04/xmlenc#sha256'
-        //    'http://www.w3.org/2001/04/xmldsig-more#sha384'
-        //    'http://www.w3.org/2001/04/xmlenc#sha512'
-        // Notice that sha1 is a deprecated algorithm and should not be used
-        'digestAlgorithm' => 'http://www.w3.org/2001/04/xmlenc#sha256',
-
-        // Algorithm that the toolkit will use for encryption process. Options:
-        // 'http://www.w3.org/2001/04/xmlenc#tripledes-cbc'
-        // 'http://www.w3.org/2001/04/xmlenc#aes128-cbc'
-        // 'http://www.w3.org/2001/04/xmlenc#aes192-cbc'
-        // 'http://www.w3.org/2001/04/xmlenc#aes256-cbc'
-        // 'http://www.w3.org/2009/xmlenc11#aes128-gcm'
-        // 'http://www.w3.org/2009/xmlenc11#aes192-gcm'
-        // 'http://www.w3.org/2009/xmlenc11#aes256-gcm';
-        // Notice that aes-cbc are not consider secure anymore so should not be used
-        'encryption_algorithm' => 'http://www.w3.org/2009/xmlenc11#aes128-gcm',
-
-        // ADFS URL-Encodes SAML data as lowercase, and the toolkit by default uses
-        // uppercase. Turn it True for ADFS compatibility on signature verification
-        'lowercaseUrlencoding' => false,
-    ),
-
-    // Contact information template, it is recommended to suply a technical and support contacts
-    'contactPerson' => array(
-        'technical' => array(
-            'givenName' => '',
-            'emailAddress' => ''
-        ),
-        'support' => array(
-            'givenName' => '',
-            'emailAddress' => ''
-        ),
-    ),
-
-    // Organization information template, the info in en_US lang is recomended, add more if required
-    'organization' => array(
-        'en-US' => array(
-            'name' => '',
-            'displayname' => '',
-            'url' => ''
-        ),
-    ),
-);
-
-
-/* Interoperable SAML 2.0 Web Browser SSO Profile [saml2int]   http://saml2int.org/profile/current
-
-   'authnRequestsSigned' => false,    // SP SHOULD NOT sign the <samlp:AuthnRequest>,
-                                      // MUST NOT assume that the IdP validates the sign
-   'wantAssertionsSigned' => true,
-   'wantAssertionsEncrypted' => true, // MUST be enabled if SSL/HTTPs is disabled
-   'wantNameIdEncrypted' => false,
-*/
diff --git a/saml/vendor/onelogin/php-saml/certs/README b/saml/vendor/onelogin/php-saml/certs/README
deleted file mode 100644
index 1616ebda..00000000
--- a/saml/vendor/onelogin/php-saml/certs/README
+++ /dev/null
@@ -1,14 +0,0 @@
-Take care of this folder that could contain private key. Be sure that this folder never is published.
-
-Onelogin PHP Toolkit expects certs for the SP stored at:
-
- * sp.key   Private Key
- * sp.crt  Public cert
- * sp_new.crt Future Public cert
-
-Also you can use other cert to sign the metadata of the SP using the:
-
- * metadata.key
- * metadata.crt
-
-If you are using composer to install the php-saml toolkit, You should move the certs folder to  vendor/onelogin/php-saml/certs
diff --git a/saml/vendor/onelogin/php-saml/composer.json b/saml/vendor/onelogin/php-saml/composer.json
deleted file mode 100644
index 42290e8e..00000000
--- a/saml/vendor/onelogin/php-saml/composer.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-    "name": "onelogin/php-saml",
-    "description": "OneLogin PHP SAML Toolkit",
-    "license": "MIT",
-    "homepage": "https://developers.onelogin.com/saml/php",
-    "keywords": ["saml", "saml2", "onelogin"],
-    "autoload": {
-        "psr-4": {
-            "OneLogin\\": "src/"
-        }
-    },
-    "support": {
-        "email": "sixto.garcia@onelogin.com",
-        "issues": "https://github.com/onelogin/php-saml/issues",
-        "source": "https://github.com/onelogin/php-saml/"
-    },
-    "require": {
-        "php": ">=7.3",
-        "robrichards/xmlseclibs": ">=3.1.1"
-    },
-    "require-dev": {
-        "phpunit/phpunit": "^9.5",
-        "php-coveralls/php-coveralls": "^2.0",
-        "sebastian/phpcpd": "^4.0 || ^5.0 || ^6.0 ",
-        "phploc/phploc": "^4.0 || ^5.0 || ^6.0 || ^7.0",
-        "pdepend/pdepend": "^2.8.0",
-        "squizlabs/php_codesniffer": "^3.5.8"
-    },
-    "config": {
-        "platform": {
-            "php": "7.3.0"
-        },
-        "optimize-autoloader": true,
-        "sort-packages": true
-    },
-    "suggest": {
-        "ext-openssl": "Install openssl lib in order to handle with x509 certs (require to support sign and encryption)",
-        "ext-curl": "Install curl lib to be able to use the IdPMetadataParser for parsing remote XMLs",
-        "ext-dom": "Install xml lib",
-        "ext-zlib": "Install zlib"
-    }
-}
diff --git a/saml/vendor/onelogin/php-saml/phpunit.xml b/saml/vendor/onelogin/php-saml/phpunit.xml
deleted file mode 100644
index 600c3bab..00000000
--- a/saml/vendor/onelogin/php-saml/phpunit.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" bootstrap="tests/bootstrap.php" colors="true" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" verbose="true">
-  <coverage processUncoveredFiles="true">
-    <include>
-      <directory>./src</directory>
-    </include>
-    <report>
-      <clover outputFile="tests/build/logs/clover.xml"/>
-      <html outputDirectory="tests/build/coverage" lowUpperBound="35" highLowerBound="70"/>
-      <php outputFile="tests/build/logs/coverage.cov"/>
-      <xml outputDirectory="tests/build/logfile.xml"/>
-    </report>
-  </coverage>
-  <testsuites>
-    <testsuite name="OneLogin PHP-SAML Test Suite">
-      <directory>./tests/src</directory>
-    </testsuite>
-  </testsuites>
-  <logging/>
-</phpunit>
diff --git a/saml/vendor/onelogin/php-saml/settings_example.php b/saml/vendor/onelogin/php-saml/settings_example.php
deleted file mode 100644
index 981a21a3..00000000
--- a/saml/vendor/onelogin/php-saml/settings_example.php
+++ /dev/null
@@ -1,137 +0,0 @@
-<?php
-
-$settings = array(
-    // If 'strict' is True, then the PHP Toolkit will reject unsigned
-    // or unencrypted messages if it expects them signed or encrypted
-    // Also will reject the messages if not strictly follow the SAML
-    // standard: Destination, NameId, Conditions ... are validated too.
-    'strict' => true,
-
-    // Enable debug mode (to print errors)
-    'debug' => false,
-
-    // Set a BaseURL to be used instead of try to guess
-    // the BaseURL of the view that process the SAML Message.
-    // Ex. http://sp.example.com/
-    //     http://example.com/sp/
-    'baseurl' => null,
-
-    // Service Provider Data that we are deploying
-    'sp' => array(
-        // Identifier of the SP entity  (must be a URI)
-        'entityId' => '',
-        // Specifies info about where and how the <AuthnResponse> message MUST be
-        // returned to the requester, in this case our SP.
-        'assertionConsumerService' => array(
-            // URL Location where the <Response> from the IdP will be returned
-            'url' => '',
-            // SAML protocol binding to be used when returning the <Response>
-            // message.  Onelogin Toolkit supports for this endpoint the
-            // HTTP-POST binding only
-            'binding' => 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST',
-        ),
-        // If you need to specify requested attributes, set a
-        // attributeConsumingService. nameFormat, attributeValue and
-        // friendlyName can be omitted. Otherwise remove this section.
-        "attributeConsumingService"=> array(
-                "serviceName" => "SP test",
-                "serviceDescription" => "Test Service",
-                "requestedAttributes" => array(
-                    array(
-                        "name" => "",
-                        "isRequired" => false,
-                        "nameFormat" => "",
-                        "friendlyName" => "",
-                        "attributeValue" => ""
-                    )
-                )
-        ),
-        // Specifies info about where and how the <Logout Response> message MUST be
-        // returned to the requester, in this case our SP.
-        'singleLogoutService' => array(
-            // URL Location where the <Response> from the IdP will be returned
-            'url' => '',
-            // SAML protocol binding to be used when returning the <Response>
-            // message.  Onelogin Toolkit supports for this endpoint the
-            // HTTP-Redirect binding only
-            'binding' => 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect',
-        ),
-        // Specifies constraints on the name identifier to be used to
-        // represent the requested subject.
-        // Take a look on lib/Saml2/Constants.php to see the NameIdFormat supported
-        'NameIDFormat' => 'urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified',
-
-        // Usually x509cert and privateKey of the SP are provided by files placed at
-        // the certs folder. But we can also provide them with the following parameters
-        'x509cert' => '',
-        'privateKey' => '',
-
-        /*
-         * Key rollover
-         * If you plan to update the SP x509cert and privateKey
-         * you can define here the new x509cert and it will be 
-         * published on the SP metadata so Identity Providers can
-         * read them and get ready for rollover.
-         */
-        // 'x509certNew' => '',
-    ),
-
-    // Identity Provider Data that we want connect with our SP
-    'idp' => array(
-        // Identifier of the IdP entity  (must be a URI)
-        'entityId' => '',
-        // SSO endpoint info of the IdP. (Authentication Request protocol)
-        'singleSignOnService' => array(
-            // URL Target of the IdP where the SP will send the Authentication Request Message
-            'url' => '',
-            // SAML protocol binding to be used when returning the <Response>
-            // message.  Onelogin Toolkit supports for this endpoint the
-            // HTTP-Redirect binding only
-            'binding' => 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect',
-        ),
-        // SLO endpoint info of the IdP.
-        'singleLogoutService' => array(
-            // URL Location of the IdP where the SP will send the SLO Request
-            'url' => '',
-            // URL location of the IdP where the SP SLO Response will be sent (ResponseLocation)
-            // if not set, url for the SLO Request will be used
-            'responseUrl' => '',
-            // SAML protocol binding to be used when returning the <Response>
-            // message.  Onelogin Toolkit supports for this endpoint the
-            // HTTP-Redirect binding only
-            'binding' => 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect',
-        ),
-        // Public x509 certificate of the IdP
-        'x509cert' => '',
-        /*
-         *  Instead of use the whole x509cert you can use a fingerprint in
-         *  order to validate the SAMLResponse, but we don't recommend to use
-         *  that method on production since is exploitable by a collision
-         *  attack.
-         *  (openssl x509 -noout -fingerprint -in "idp.crt" to generate it,
-         *   or add for example the -sha256 , -sha384 or -sha512 parameter)
-         *
-         *  If a fingerprint is provided, then the certFingerprintAlgorithm is required in order to
-         *  let the toolkit know which Algorithm was used. Possible values: sha1, sha256, sha384 or sha512
-         *  'sha1' is the default value.
-         */
-        // 'certFingerprint' => '',
-        // 'certFingerprintAlgorithm' => 'sha1',
-
-        /* In some scenarios the IdP uses different certificates for
-         * signing/encryption, or is under key rollover phase and more 
-         * than one certificate is published on IdP metadata.
-         * In order to handle that the toolkit offers that parameter.
-         * (when used, 'x509cert' and 'certFingerprint' values are
-         * ignored).
-         */
-        // 'x509certMulti' => array(
-        //      'signing' => array(
-        //          0 => '<cert1-string>',
-        //      ),
-        //      'encryption' => array(
-        //          0 => '<cert2-string>',
-        //      )
-        // ),
-    ),
-);
diff --git a/saml/vendor/onelogin/php-saml/src/Saml2/Auth.php b/saml/vendor/onelogin/php-saml/src/Saml2/Auth.php
deleted file mode 100644
index e5c4d54c..00000000
--- a/saml/vendor/onelogin/php-saml/src/Saml2/Auth.php
+++ /dev/null
@@ -1,818 +0,0 @@
-<?php
-/**
- * This file is part of php-saml.
- *
- * (c) OneLogin Inc
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- *
- * @package OneLogin
- * @author  OneLogin Inc <saml-info@onelogin.com>
- * @license MIT https://github.com/onelogin/php-saml/blob/master/LICENSE
- * @link    https://github.com/onelogin/php-saml
- */
-
-namespace OneLogin\Saml2;
-
-use RobRichards\XMLSecLibs\XMLSecurityKey;
-
-use Exception;
-
-/**
- * Main class of OneLogin's PHP Toolkit
- */
-class Auth
-{
-    /**
-     * Settings data.
-     *
-     * @var Settings
-     */
-    private $_settings;
-
-    /**
-     * User attributes data.
-     *
-     * @var array
-     */
-    private $_attributes = array();
-
-    /**
-     * User attributes data with FriendlyName index.
-     *
-     * @var array
-     */
-    private $_attributesWithFriendlyName = array();
-
-    /**
-     * NameID
-     *
-     * @var string
-     */
-    private $_nameid;
-
-    /**
-     * NameID Format
-     *
-     * @var string
-     */
-    private $_nameidFormat;
-
-    /**
-     * NameID NameQualifier
-     *
-     * @var string
-     */
-    private $_nameidNameQualifier;
-
-    /**
-     * NameID SP NameQualifier
-     *
-     * @var string
-     */
-    private $_nameidSPNameQualifier;
-
-    /**
-     * If user is authenticated.
-     *
-     * @var bool
-     */
-    private $_authenticated = false;
-
-
-    /**
-     * SessionIndex. When the user is logged, this stored it
-     * from the AuthnStatement of the SAML Response
-     *
-     * @var string
-     */
-    private $_sessionIndex;
-
-    /**
-     * SessionNotOnOrAfter. When the user is logged, this stored it
-     * from the AuthnStatement of the SAML Response
-     *
-     * @var int|null
-     */
-    private $_sessionExpiration;
-
-    /**
-     * The ID of the last message processed
-     *
-     * @var string
-     */
-    private $_lastMessageId;
-
-    /**
-     * The ID of the last assertion processed
-     *
-     * @var string
-     */
-    private $_lastAssertionId;
-
-    /**
-     * The NotOnOrAfter value of the valid SubjectConfirmationData
-     * node (if any) of the last assertion processed
-     *
-     * @var int
-     */
-    private $_lastAssertionNotOnOrAfter;
-
-    /**
-     * If any error.
-     *
-     * @var array
-     */
-    private $_errors = array();
-
-    /**
-     * Last error object.
-     *
-     * @var Error|null
-     */
-    private $_lastErrorException;
-
-    /**
-     * Last error.
-     *
-     * @var string|null
-     */
-    private $_lastError;
-
-    /**
-     * Last AuthNRequest ID or LogoutRequest ID generated by this Service Provider
-     *
-     * @var string
-     */
-    private $_lastRequestID;
-
-    /**
-     * The most recently-constructed/processed XML SAML request
-     * (AuthNRequest, LogoutRequest)
-     *
-     * @var string
-     */
-    private $_lastRequest;
-
-    /**
-     * The most recently-constructed/processed XML SAML response
-     * (SAMLResponse, LogoutResponse). If the SAMLResponse was
-     * encrypted, by default tries to return the decrypted XML
-     *
-     * @var string|\DomDocument|null
-     */
-    private $_lastResponse;
-
-    /**
-     * Initializes the SP SAML instance.
-     *
-     * @param array|null $settings Setting data
-     * @param bool $spValidationOnly if true, The library will only validate the SAML SP settings,
-     *
-     * @throws Exception
-     * @throws Error
-     */
-    public function __construct(array $settings = null, bool $spValidationOnly = false)
-    {
-        $this->_settings = new Settings($settings, $spValidationOnly);
-    }
-
-    /**
-     * Returns the settings info
-     *
-     * @return Settings The settings data.
-     */
-    public function getSettings()
-    {
-        return $this->_settings;
-    }
-
-    /**
-     * Set the strict mode active/disable
-     *
-     * @param bool $value Strict parameter
-     *
-     * @throws Error
-     */
-    public function setStrict($value)
-    {
-        if (!is_bool($value)) {
-            throw new Error(
-                'Invalid value passed to setStrict()',
-                Error::SETTINGS_INVALID_SYNTAX
-            );
-        }
-
-        $this->_settings->setStrict($value);
-    }
-
-    /**
-     * Set schemas path
-     *
-     * @param string $path
-     * @return $this
-     */
-    public function setSchemasPath($path)
-    {
-        $this->_paths['schemas'] = $path;
-    }
-
-    /**
-     * Process the SAML Response sent by the IdP.
-     *
-     * @param string|null $requestId The ID of the AuthNRequest sent by this SP to the IdP
-     *
-     * @throws Error
-     * @throws ValidationError
-     */
-    public function processResponse($requestId = null)
-    {
-        $this->_errors = array();
-        $this->_lastError = $this->_lastErrorException = null;
-        if (isset($_POST['SAMLResponse'])) {
-            // AuthnResponse -- HTTP_POST Binding
-            $response = new Response($this->_settings, $_POST['SAMLResponse']);
-            $this->_lastResponse = $response->getXMLDocument();
-
-            if ($response->isValid($requestId)) {
-                $this->_attributes = $response->getAttributes();
-                $this->_attributesWithFriendlyName = $response->getAttributesWithFriendlyName();
-                $this->_nameid = $response->getNameId();
-                $this->_nameidFormat = $response->getNameIdFormat();
-                $this->_nameidNameQualifier = $response->getNameIdNameQualifier();
-                $this->_nameidSPNameQualifier = $response->getNameIdSPNameQualifier();
-                $this->_authenticated = true;
-                $this->_sessionIndex = $response->getSessionIndex();
-                $this->_sessionExpiration = $response->getSessionNotOnOrAfter();
-                $this->_lastMessageId = $response->getId();
-                $this->_lastAssertionId = $response->getAssertionId();
-                $this->_lastAssertionNotOnOrAfter = $response->getAssertionNotOnOrAfter();
-            } else {
-                $this->_errors[] = 'invalid_response';
-                $this->_lastErrorException = $response->getErrorException();
-                $this->_lastError = $response->getError();
-            }
-        } else {
-            $this->_errors[] = 'invalid_binding';
-            throw new Error(
-                'SAML Response not found, Only supported HTTP_POST Binding',
-                Error::SAML_RESPONSE_NOT_FOUND
-            );
-        }
-    }
-
-    /**
-     * Process the SAML Logout Response / Logout Request sent by the IdP.
-     *
-     * @param bool        $keepLocalSession             When false will destroy the local session, otherwise will keep it
-     * @param string|null $requestId                    The ID of the LogoutRequest sent by this SP to the IdP
-     * @param bool        $retrieveParametersFromServer True if we want to use parameters from $_SERVER to validate the signature
-     * @param callable    $cbDeleteSession              Callback to be executed to delete session
-     * @param bool        $stay                         True if we want to stay (returns the url string) False to redirect
-     *
-     * @return string|null
-     *
-     * @throws Error
-     */
-    public function processSLO($keepLocalSession = false, $requestId = null, $retrieveParametersFromServer = false, $cbDeleteSession = null, $stay = false)
-    {
-        $this->_errors = array();
-        $this->_lastError = $this->_lastErrorException = null;
-        if (isset($_GET['SAMLResponse'])) {
-            $logoutResponse = new LogoutResponse($this->_settings, $_GET['SAMLResponse']);
-            $this->_lastResponse = $logoutResponse->getXML();
-            if (!$logoutResponse->isValid($requestId, $retrieveParametersFromServer)) {
-                $this->_errors[] = 'invalid_logout_response';
-                $this->_lastErrorException = $logoutResponse->getErrorException();
-                $this->_lastError = $logoutResponse->getError();
-
-            } else if ($logoutResponse->getStatus() !== Constants::STATUS_SUCCESS) {
-                $this->_errors[] = 'logout_not_success';
-            } else {
-                $this->_lastMessageId = $logoutResponse->id;
-                if (!$keepLocalSession) {
-                    if ($cbDeleteSession === null) {
-                        Utils::deleteLocalSession();
-                    } else {
-                        call_user_func($cbDeleteSession);
-                    }
-                }
-            }
-        } else if (isset($_GET['SAMLRequest'])) {
-            $logoutRequest = new LogoutRequest($this->_settings, $_GET['SAMLRequest']);
-            $this->_lastRequest = $logoutRequest->getXML();
-            if (!$logoutRequest->isValid($retrieveParametersFromServer)) {
-                $this->_errors[] = 'invalid_logout_request';
-                $this->_lastErrorException = $logoutRequest->getErrorException();
-                $this->_lastError = $logoutRequest->getError();
-            } else {
-                if (!$keepLocalSession) {
-                    if ($cbDeleteSession === null) {
-                        Utils::deleteLocalSession();
-                    } else {
-                        call_user_func($cbDeleteSession);
-                    }
-                }
-                $inResponseTo = $logoutRequest->id;
-                $this->_lastMessageId = $logoutRequest->id;
-                $responseBuilder = new LogoutResponse($this->_settings);
-                $responseBuilder->build($inResponseTo);
-                $this->_lastResponse = $responseBuilder->getXML();
-
-                $logoutResponse = $responseBuilder->getResponse();
-
-                $parameters = array('SAMLResponse' => $logoutResponse);
-                if (isset($_GET['RelayState'])) {
-                    $parameters['RelayState'] = $_GET['RelayState'];
-                }
-
-                $security = $this->_settings->getSecurityData();
-                if (isset($security['logoutResponseSigned']) && $security['logoutResponseSigned']) {
-                    $signature = $this->buildResponseSignature($logoutResponse, isset($parameters['RelayState'])? $parameters['RelayState']: null, $security['signatureAlgorithm']);
-                    $parameters['SigAlg'] = $security['signatureAlgorithm'];
-                    $parameters['Signature'] = $signature;
-                }
-
-                return $this->redirectTo($this->getSLOResponseUrl(), $parameters, $stay);
-            }
-        } else {
-            $this->_errors[] = 'invalid_binding';
-            throw new Error(
-                'SAML LogoutRequest/LogoutResponse not found. Only supported HTTP_REDIRECT Binding',
-                Error::SAML_LOGOUTMESSAGE_NOT_FOUND
-            );
-        }
-    }
-
-    /**
-     * Redirects the user to the url past by parameter
-     * or to the url that we defined in our SSO Request.
-     *
-     * @param string $url        The target URL to redirect the user.
-     * @param array  $parameters Extra parameters to be passed as part of the url
-     * @param bool   $stay       True if we want to stay (returns the url string) False to redirect
-     *
-     * @return string|null
-     */
-    public function redirectTo($url = '', array $parameters = array(), $stay = false)
-    {
-        assert(is_string($url));
-
-        if (empty($url) && isset($_REQUEST['RelayState'])) {
-            $url = $_REQUEST['RelayState'];
-        }
-
-        return Utils::redirect($url, $parameters, $stay);
-    }
-
-    /**
-     * Checks if the user is authenticated or not.
-     *
-     * @return bool  True if the user is authenticated
-     */
-    public function isAuthenticated()
-    {
-        return $this->_authenticated;
-    }
-
-    /**
-     * Returns the set of SAML attributes.
-     *
-     * @return array  Attributes of the user.
-     */
-    public function getAttributes()
-    {
-        return $this->_attributes;
-    }
-
-
-    /**
-     * Returns the set of SAML attributes indexed by FriendlyName
-     *
-     * @return array  Attributes of the user.
-     */
-    public function getAttributesWithFriendlyName()
-    {
-        return $this->_attributesWithFriendlyName;
-    }
-
-    /**
-     * Returns the nameID
-     *
-     * @return string  The nameID of the assertion
-     */
-    public function getNameId()
-    {
-        return $this->_nameid;
-    }
-
-    /**
-     * Returns the nameID Format
-     *
-     * @return string  The nameID Format of the assertion
-     */
-    public function getNameIdFormat()
-    {
-        return $this->_nameidFormat;
-    }
-
-    /**
-     * Returns the nameID NameQualifier
-     *
-     * @return string  The nameID NameQualifier of the assertion
-     */
-    public function getNameIdNameQualifier()
-    {
-        return $this->_nameidNameQualifier;
-    }
-
-    /**
-     * Returns the nameID SP NameQualifier
-     *
-     * @return string  The nameID SP NameQualifier of the assertion
-     */
-    public function getNameIdSPNameQualifier()
-    {
-        return $this->_nameidSPNameQualifier;
-    }
-
-    /**
-     * Returns the SessionIndex
-     *
-     * @return string|null  The SessionIndex of the assertion
-     */
-    public function getSessionIndex()
-    {
-        return $this->_sessionIndex;
-    }
-
-    /**
-     * Returns the SessionNotOnOrAfter
-     *
-     * @return int|null  The SessionNotOnOrAfter of the assertion
-     */
-    public function getSessionExpiration()
-    {
-        return $this->_sessionExpiration;
-    }
-
-    /**
-     * Returns if there were any error
-     *
-     * @return array  Errors
-     */
-    public function getErrors()
-    {
-        return $this->_errors;
-    }
-
-    /**
-     * Returns the reason for the last error
-     *
-     * @return string|null  Error reason
-     */
-    public function getLastErrorReason()
-    {
-        return $this->_lastError;
-    }
-
-
-    /**
-     * Returns the last error
-     *
-     * @return Exception|null Error
-     */
-    public function getLastErrorException()
-    {
-        return $this->_lastErrorException;
-    }
-
-    /**
-     * Returns the requested SAML attribute
-     *
-     * @param string $name The requested attribute of the user.
-     *
-     * @return array|null Requested SAML attribute ($name).
-     */
-    public function getAttribute($name)
-    {
-        assert(is_string($name));
-
-        $value = null;
-        if (isset($this->_attributes[$name])) {
-            return $this->_attributes[$name];
-        }
-        return $value;
-    }
-
-    /**
-     * Returns the requested SAML attribute indexed by FriendlyName
-     *
-     * @param string $friendlyName The requested attribute of the user.
-     *
-     * @return array|null Requested SAML attribute ($friendlyName).
-     */
-    public function getAttributeWithFriendlyName($friendlyName)
-    {
-        assert(is_string($friendlyName));
-        $value = null;
-        if (isset($this->_attributesWithFriendlyName[$friendlyName])) {
-            return $this->_attributesWithFriendlyName[$friendlyName];
-        }
-        return $value;
-    }
-
-    /**
-     * Initiates the SSO process.
-     *
-     * @param string|null $returnTo        The target URL the user should be returned to after login.
-     * @param array       $parameters      Extra parameters to be added to the GET
-     * @param bool        $forceAuthn      When true the AuthNRequest will set the ForceAuthn='true'
-     * @param bool        $isPassive       When true the AuthNRequest will set the Ispassive='true'
-     * @param bool        $stay            True if we want to stay (returns the url string) False to redirect
-     * @param bool        $setNameIdPolicy When true the AuthNRequest will set a nameIdPolicy element
-     * @param string      $nameIdValueReq  Indicates to the IdP the subject that should be authenticated
-     *
-     * @return string|null If $stay is True, it return a string with the SLO URL + LogoutRequest + parameters
-     *
-     * @throws Error
-     */
-    public function login($returnTo = null, array $parameters = array(), $forceAuthn = false, $isPassive = false, $stay = false, $setNameIdPolicy = true, $nameIdValueReq = null)
-    {
-        $authnRequest = $this->buildAuthnRequest($this->_settings, $forceAuthn, $isPassive, $setNameIdPolicy, $nameIdValueReq);
-
-        $this->_lastRequest = $authnRequest->getXML();
-        $this->_lastRequestID = $authnRequest->getId();
-
-        $samlRequest = $authnRequest->getRequest();
-        $parameters['SAMLRequest'] = $samlRequest;
-
-        if (!empty($returnTo)) {
-            $parameters['RelayState'] = $returnTo;
-        } else {
-            $parameters['RelayState'] = Utils::getSelfRoutedURLNoQuery();
-        }
-
-        $security = $this->_settings->getSecurityData();
-        if (isset($security['authnRequestsSigned']) && $security['authnRequestsSigned']) {
-            $signature = $this->buildRequestSignature($samlRequest, $parameters['RelayState'], $security['signatureAlgorithm']);
-            $parameters['SigAlg'] = $security['signatureAlgorithm'];
-            $parameters['Signature'] = $signature;
-        }
-        return $this->redirectTo($this->getSSOurl(), $parameters, $stay);
-    }
-
-    /**
-     * Initiates the SLO process.
-     *
-     * @param string|null $returnTo            The target URL the user should be returned to after logout.
-     * @param array       $parameters          Extra parameters to be added to the GET
-     * @param string|null $nameId              The NameID that will be set in the LogoutRequest.
-     * @param string|null $sessionIndex        The SessionIndex (taken from the SAML Response in the SSO process).
-     * @param bool        $stay                True if we want to stay (returns the url string) False to redirect
-     * @param string|null $nameIdFormat        The NameID Format will be set in the LogoutRequest.
-     * @param string|null $nameIdNameQualifier The NameID NameQualifier will be set in the LogoutRequest.
-     *
-     * @return string|null If $stay is True, it return a string with the SLO URL + LogoutRequest + parameters
-     *
-     * @throws Error
-     */
-    public function logout($returnTo = null, array $parameters = array(), $nameId = null, $sessionIndex = null, $stay = false, $nameIdFormat = null, $nameIdNameQualifier = null, $nameIdSPNameQualifier = null)
-    {
-        $sloUrl = $this->getSLOurl();
-        if (empty($sloUrl)) {
-            throw new Error(
-                'The IdP does not support Single Log Out',
-                Error::SAML_SINGLE_LOGOUT_NOT_SUPPORTED
-            );
-        }
-
-        if (empty($nameId) && !empty($this->_nameid)) {
-            $nameId = $this->_nameid;
-        }
-        if (empty($nameIdFormat) && !empty($this->_nameidFormat)) {
-            $nameIdFormat = $this->_nameidFormat;
-        }
-
-        $logoutRequest = new LogoutRequest($this->_settings, null, $nameId, $sessionIndex, $nameIdFormat, $nameIdNameQualifier, $nameIdSPNameQualifier);
-
-        $this->_lastRequest = $logoutRequest->getXML();
-        $this->_lastRequestID = $logoutRequest->id;
-
-        $samlRequest = $logoutRequest->getRequest();
-
-        $parameters['SAMLRequest'] = $samlRequest;
-        if (!empty($returnTo)) {
-            $parameters['RelayState'] = $returnTo;
-        } else {
-            $parameters['RelayState'] = Utils::getSelfRoutedURLNoQuery();
-        }
-
-        $security = $this->_settings->getSecurityData();
-        if (isset($security['logoutRequestSigned']) && $security['logoutRequestSigned']) {
-            $signature = $this->buildRequestSignature($samlRequest, $parameters['RelayState'], $security['signatureAlgorithm']);
-            $parameters['SigAlg'] = $security['signatureAlgorithm'];
-            $parameters['Signature'] = $signature;
-        }
-
-        return $this->redirectTo($sloUrl, $parameters, $stay);
-    }
-
-   /**
-     * Gets the IdP SSO url.
-     *
-     * @return string The url of the IdP Single Sign On Service
-     */
-    public function getSSOurl()
-    {
-        return $this->_settings->getIdPSSOUrl();
-    }
-
-    /**
-     * Gets the IdP SLO url.
-     *
-     * @return string|null The url of the IdP Single Logout Service
-     */
-    public function getSLOurl()
-    {
-        return $this->_settings->getIdPSLOUrl();
-    }
-
-    /**
-     * Gets the IdP SLO response url.
-     *
-     * @return string|null The response url of the IdP Single Logout Service
-     */
-    public function getSLOResponseUrl()
-    {
-        return $this->_settings->getIdPSLOResponseUrl();
-    }
-
-
-    /**
-     * Gets the ID of the last AuthNRequest or LogoutRequest generated by the Service Provider.
-     *
-     * @return string The ID of the Request SAML message.
-     */
-    public function getLastRequestID()
-    {
-        return $this->_lastRequestID;
-    }
-
-    /**
-     * Creates an AuthnRequest
-     *
-     * @param Settings $settings        Setting data
-     * @param bool     $forceAuthn      When true the AuthNRequest will set the ForceAuthn='true'
-     * @param bool     $isPassive       When true the AuthNRequest will set the Ispassive='true'
-     * @param bool     $setNameIdPolicy When true the AuthNRequest will set a nameIdPolicy element
-     * @param string   $nameIdValueReq  Indicates to the IdP the subject that should be authenticated
-     *
-     * @return AuthnRequest The AuthnRequest object
-     */
-    public function buildAuthnRequest($settings, $forceAuthn, $isPassive, $setNameIdPolicy, $nameIdValueReq = null)
-    {
-        return new AuthnRequest($settings, $forceAuthn, $isPassive, $setNameIdPolicy, $nameIdValueReq);
-    }
-
-    /**
-     * Generates the Signature for a SAML Request
-     *
-     * @param string $samlRequest   The SAML Request
-     * @param string $relayState    The RelayState
-     * @param string $signAlgorithm Signature algorithm method
-     *
-     * @return string A base64 encoded signature
-     *
-     * @throws Exception
-     * @throws Error
-     */
-    public function buildRequestSignature($samlRequest, $relayState, $signAlgorithm = XMLSecurityKey::RSA_SHA256)
-    {
-        return $this->buildMessageSignature($samlRequest, $relayState, $signAlgorithm, "SAMLRequest");
-    }
-
-    /**
-     * Generates the Signature for a SAML Response
-     *
-     * @param string $samlResponse  The SAML Response
-     * @param string $relayState    The RelayState
-     * @param string $signAlgorithm Signature algorithm method
-     *
-     * @return string A base64 encoded signature
-     *
-     * @throws Exception
-     * @throws Error
-     */
-    public function buildResponseSignature($samlResponse, $relayState, $signAlgorithm = XMLSecurityKey::RSA_SHA256)
-    {
-        return $this->buildMessageSignature($samlResponse, $relayState, $signAlgorithm, "SAMLResponse");
-    }
-
-    /**
-     * Generates the Signature for a SAML Message
-     *
-     * @param string $samlMessage   The SAML Message
-     * @param string $relayState    The RelayState
-     * @param string $signAlgorithm Signature algorithm method
-     * @param string $type          "SAMLRequest" or "SAMLResponse"
-     *
-     * @return string A base64 encoded signature
-     *
-     * @throws Exception
-     * @throws Error
-     */
-    private function buildMessageSignature($samlMessage, $relayState, $signAlgorithm = XMLSecurityKey::RSA_SHA256, $type = "SAMLRequest")
-    {
-        $key = $this->_settings->getSPkey();
-        if (empty($key)) {
-            if ($type == "SAMLRequest") {
-                $errorMsg = "Trying to sign the SAML Request but can't load the SP private key";
-            } else {
-                $errorMsg = "Trying to sign the SAML Response but can't load the SP private key";
-            }
-
-            throw new Error($errorMsg, Error::PRIVATE_KEY_NOT_FOUND);
-        }
-
-        $objKey = new XMLSecurityKey($signAlgorithm, array('type' => 'private'));
-        $objKey->loadKey($key, false);
-
-        $security = $this->_settings->getSecurityData();
-        if ($security['lowercaseUrlencoding']) {
-            $msg = $type.'='.rawurlencode($samlMessage);
-            if (isset($relayState)) {
-                $msg .= '&RelayState='.rawurlencode($relayState);
-            }
-            $msg .= '&SigAlg=' . rawurlencode($signAlgorithm);
-        } else {
-            $msg = $type.'='.urlencode($samlMessage);
-            if (isset($relayState)) {
-                $msg .= '&RelayState='.urlencode($relayState);
-            }
-            $msg .= '&SigAlg=' . urlencode($signAlgorithm);
-        }
-        $signature = $objKey->signData($msg);
-        return base64_encode($signature);
-    }
-
-    /**
-     * @return string The ID of the last message processed
-     */
-    public function getLastMessageId()
-    {
-        return $this->_lastMessageId;
-    }
-
-    /**
-     * @return string The ID of the last assertion processed
-     */
-    public function getLastAssertionId()
-    {
-        return $this->_lastAssertionId;
-    }
-
-    /**
-     * @return int The NotOnOrAfter value of the valid
-     *         SubjectConfirmationData node (if any)
-     *         of the last assertion processed
-     */
-    public function getLastAssertionNotOnOrAfter()
-    {
-        return $this->_lastAssertionNotOnOrAfter;
-    }
-
-    /**
-     * Returns the most recently-constructed/processed
-     * XML SAML request (AuthNRequest, LogoutRequest)
-     *
-     * @return string|null The Request XML
-     */
-    public function getLastRequestXML()
-    {
-        return $this->_lastRequest;
-    }
-
-    /**
-     * Returns the most recently-constructed/processed
-     * XML SAML response (SAMLResponse, LogoutResponse).
-     * If the SAMLResponse was encrypted, by default tries
-     * to return the decrypted XML.
-     *
-     * @return string|null The Response XML
-     */
-    public function getLastResponseXML()
-    {
-        $response = null;
-        if (isset($this->_lastResponse)) {
-            if (is_string($this->_lastResponse)) {
-                $response = $this->_lastResponse;
-            } else {
-                $response = $this->_lastResponse->saveXML();
-            }
-        }
-
-        return $response;
-    }
-}
diff --git a/saml/vendor/onelogin/php-saml/src/Saml2/AuthnRequest.php b/saml/vendor/onelogin/php-saml/src/Saml2/AuthnRequest.php
deleted file mode 100644
index fd9afb53..00000000
--- a/saml/vendor/onelogin/php-saml/src/Saml2/AuthnRequest.php
+++ /dev/null
@@ -1,214 +0,0 @@
-<?php
-/**
- * This file is part of php-saml.
- *
- * (c) OneLogin Inc
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- *
- * @package OneLogin
- * @author  OneLogin Inc <saml-info@onelogin.com>
- * @license MIT https://github.com/onelogin/php-saml/blob/master/LICENSE
- * @link    https://github.com/onelogin/php-saml
- */
-
-namespace OneLogin\Saml2;
-
-/**
- * SAML 2 Authentication Request
- */
-class AuthnRequest
-{
-    /**
-     * Object that represents the setting info
-     *
-     * @var Settings
-     */
-    protected $_settings;
-
-    /**
-     * SAML AuthNRequest string
-     *
-     * @var string
-     */
-    private $_authnRequest;
-
-    /**
-     * SAML AuthNRequest ID.
-     *
-     * @var string
-     */
-    private $_id;
-
-    /**
-     * Constructs the AuthnRequest object.
-     *
-     * @param Settings $settings SAML Toolkit Settings
-     * @param bool $forceAuthn When true the AuthNReuqest will set the ForceAuthn='true'
-     * @param bool $isPassive When true the AuthNReuqest will set the Ispassive='true'
-     * @param bool $setNameIdPolicy When true the AuthNReuqest will set a nameIdPolicy
-     * @param string $nameIdValueReq Indicates to the IdP the subject that should be authenticated
-     */
-    public function __construct(\OneLogin\Saml2\Settings $settings, $forceAuthn = false, $isPassive = false, $setNameIdPolicy = true, $nameIdValueReq = null)
-    {
-        $this->_settings = $settings;
-
-        $spData = $this->_settings->getSPData();
-        $security = $this->_settings->getSecurityData();
-
-        $id = Utils::generateUniqueID();
-        $issueInstant = Utils::parseTime2SAML(time());
-
-        $subjectStr = "";
-        if (isset($nameIdValueReq)) {
-            $subjectStr = <<<SUBJECT
-
-     <saml:Subject>
-        <saml:NameID Format="{$spData['NameIDFormat']}">{$nameIdValueReq}</saml:NameID>
-        <saml:SubjectConfirmation Method="urn:oasis:names:tc:SAML:2.0:cm:bearer"></saml:SubjectConfirmation>
-    </saml:Subject>
-SUBJECT;
-        }
-
-        $nameIdPolicyStr = '';
-        if ($setNameIdPolicy) {
-            $nameIDPolicyFormat = $spData['NameIDFormat'];
-            if (isset($security['wantNameIdEncrypted']) && $security['wantNameIdEncrypted']) {
-                $nameIDPolicyFormat = Constants::NAMEID_ENCRYPTED;
-            }
-
-            $nameIdPolicyStr = <<<NAMEIDPOLICY
-
-    <samlp:NameIDPolicy
-        Format="{$nameIDPolicyFormat}"
-        AllowCreate="true" />
-NAMEIDPOLICY;
-        }
-
-
-        $providerNameStr = '';
-        $organizationData = $settings->getOrganization();
-        if (!empty($organizationData)) {
-            $langs = array_keys($organizationData);
-            if (in_array('en-US', $langs)) {
-                $lang = 'en-US';
-            } else {
-                $lang = $langs[0];
-            }
-            if (isset($organizationData[$lang]['displayname']) && !empty($organizationData[$lang]['displayname'])) {
-                $providerNameStr = <<<PROVIDERNAME
-    ProviderName="{$organizationData[$lang]['displayname']}"
-PROVIDERNAME;
-            }
-        }
-
-        $forceAuthnStr = '';
-        if ($forceAuthn) {
-            $forceAuthnStr = <<<FORCEAUTHN
-
-    ForceAuthn="true"
-FORCEAUTHN;
-        }
-
-        $isPassiveStr = '';
-        if ($isPassive) {
-            $isPassiveStr = <<<ISPASSIVE
-
-    IsPassive="true"
-ISPASSIVE;
-        }
-
-        $requestedAuthnStr = '';
-        if (isset($security['requestedAuthnContext']) && $security['requestedAuthnContext'] !== false) {
-            $authnComparison = 'exact';
-            if (isset($security['requestedAuthnContextComparison'])) {
-                $authnComparison = $security['requestedAuthnContextComparison'];
-            }
-
-            $authnComparisonAttr = '';
-            if (!empty($authnComparison)) {
-                $authnComparisonAttr = sprintf('Comparison="%s"', $authnComparison);
-            }
-
-            if ($security['requestedAuthnContext'] === true) {
-                $requestedAuthnStr = <<<REQUESTEDAUTHN
-
-    <samlp:RequestedAuthnContext $authnComparisonAttr>
-        <saml:AuthnContextClassRef>urn:oasis:names:tc:SAML:2.0:ac:classes:PasswordProtectedTransport</saml:AuthnContextClassRef>
-    </samlp:RequestedAuthnContext>
-REQUESTEDAUTHN;
-            } else {
-                $requestedAuthnStr .= "    <samlp:RequestedAuthnContext $authnComparisonAttr>\n";
-                foreach ($security['requestedAuthnContext'] as $contextValue) {
-                    $requestedAuthnStr .= "        <saml:AuthnContextClassRef>".$contextValue."</saml:AuthnContextClassRef>\n";
-                }
-                $requestedAuthnStr .= '    </samlp:RequestedAuthnContext>';
-            }
-        }
-
-        $spEntityId = htmlspecialchars($spData['entityId'], ENT_QUOTES);
-        $acsUrl = htmlspecialchars($spData['assertionConsumerService']['url'], ENT_QUOTES);
-        $destination = $this->_settings->getIdPSSOUrl();
-        $request = <<<AUTHNREQUEST
-<samlp:AuthnRequest
-    xmlns:samlp="urn:oasis:names:tc:SAML:2.0:protocol"
-    xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"
-    ID="$id"
-    Version="2.0"
-{$providerNameStr}{$forceAuthnStr}{$isPassiveStr}
-    IssueInstant="{$issueInstant}"
-    Destination="{$destination}"
-    ProtocolBinding="{$spData['assertionConsumerService']['binding']}"
-    AssertionConsumerServiceURL="{$acsUrl}">
-    <saml:Issuer>{$spEntityId}</saml:Issuer>{$subjectStr}{$nameIdPolicyStr}{$requestedAuthnStr}
-</samlp:AuthnRequest>
-AUTHNREQUEST;
-
-        $this->_id = $id;
-        $this->_authnRequest = $request;
-    }
-
-    /**
-     * Returns deflated, base64 encoded, unsigned AuthnRequest.
-     *
-     * @param bool|null $deflate Whether or not we should 'gzdeflate' the request body before we return it.
-     *
-     * @return string
-     */
-    public function getRequest($deflate = null)
-    {
-        $subject = $this->_authnRequest;
-
-        if (is_null($deflate)) {
-            $deflate = $this->_settings->shouldCompressRequests();
-        }
-
-        if ($deflate) {
-            $subject = gzdeflate($this->_authnRequest);
-        }
-
-        $base64Request = base64_encode($subject);
-        return $base64Request;
-    }
-
-    /**
-     * Returns the AuthNRequest ID.
-     *
-     * @return string
-     */
-    public function getId()
-    {
-        return $this->_id;
-    }
-
-    /**
-     * Returns the XML that will be sent as part of the request
-     *
-     * @return string
-     */
-    public function getXML()
-    {
-        return $this->_authnRequest;
-    }
-}
diff --git a/saml/vendor/onelogin/php-saml/src/Saml2/Constants.php b/saml/vendor/onelogin/php-saml/src/Saml2/Constants.php
deleted file mode 100644
index 1b467dd6..00000000
--- a/saml/vendor/onelogin/php-saml/src/Saml2/Constants.php
+++ /dev/null
@@ -1,86 +0,0 @@
-<?php
-/**
- * This file is part of php-saml.
- *
- * (c) OneLogin Inc
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- *
- * @package OneLogin
- * @author  OneLogin Inc <saml-info@onelogin.com>
- * @license MIT https://github.com/onelogin/php-saml/blob/master/LICENSE
- * @link    https://github.com/onelogin/php-saml
- */
-
-namespace OneLogin\Saml2;
-
-/**
- * Constants of OneLogin PHP Toolkit
- *
- * Defines all required constants
- */
-class Constants
-{
-    // Value added to the current time in time condition validations
-    const ALLOWED_CLOCK_DRIFT = 180;  // 3 min in seconds
-
-    // NameID Formats
-    const NAMEID_EMAIL_ADDRESS = 'urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress';
-    const NAMEID_X509_SUBJECT_NAME = 'urn:oasis:names:tc:SAML:1.1:nameid-format:X509SubjectName';
-    const NAMEID_WINDOWS_DOMAIN_QUALIFIED_NAME = 'urn:oasis:names:tc:SAML:1.1:nameid-format:WindowsDomainQualifiedName';
-    const NAMEID_UNSPECIFIED = 'urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified';
-    const NAMEID_KERBEROS   = 'urn:oasis:names:tc:SAML:2.0:nameid-format:kerberos';
-    const NAMEID_ENTITY     = 'urn:oasis:names:tc:SAML:2.0:nameid-format:entity';
-    const NAMEID_TRANSIENT  = 'urn:oasis:names:tc:SAML:2.0:nameid-format:transient';
-    const NAMEID_PERSISTENT = 'urn:oasis:names:tc:SAML:2.0:nameid-format:persistent';
-    const NAMEID_ENCRYPTED = 'urn:oasis:names:tc:SAML:2.0:nameid-format:encrypted';
-
-    // Attribute Name Formats
-    const ATTRNAME_FORMAT_UNSPECIFIED = 'urn:oasis:names:tc:SAML:2.0:attrname-format:unspecified';
-    const ATTRNAME_FORMAT_URI = 'urn:oasis:names:tc:SAML:2.0:attrname-format:uri';
-    const ATTRNAME_FORMAT_BASIC = 'urn:oasis:names:tc:SAML:2.0:attrname-format:basic';
-
-    // Namespaces
-    const NS_SAML = 'urn:oasis:names:tc:SAML:2.0:assertion';
-    const NS_SAMLP = 'urn:oasis:names:tc:SAML:2.0:protocol';
-    const NS_SOAP = 'http://schemas.xmlsoap.org/soap/envelope/';
-    const NS_MD = 'urn:oasis:names:tc:SAML:2.0:metadata';
-    const NS_XS = 'http://www.w3.org/2001/XMLSchema';
-    const NS_XSI = 'http://www.w3.org/2001/XMLSchema-instance';
-    const NS_XENC = 'http://www.w3.org/2001/04/xmlenc#';
-    const NS_DS = 'http://www.w3.org/2000/09/xmldsig#';
-
-    // Bindings
-    const BINDING_HTTP_POST = 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST';
-    const BINDING_HTTP_REDIRECT = 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect';
-    const BINDING_HTTP_ARTIFACT = 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact';
-    const BINDING_SOAP = 'urn:oasis:names:tc:SAML:2.0:bindings:SOAP';
-    const BINDING_DEFLATE = 'urn:oasis:names:tc:SAML:2.0:bindings:URL-Encoding:DEFLATE';
-
-    // Auth Context Class
-    const AC_UNSPECIFIED = 'urn:oasis:names:tc:SAML:2.0:ac:classes:unspecified';
-    const AC_PASSWORD = 'urn:oasis:names:tc:SAML:2.0:ac:classes:Password';
-    const AC_PASSWORD_PROTECTED = 'urn:oasis:names:tc:SAML:2.0:ac:classes:PasswordProtectedTransport';
-    const AC_X509 = 'urn:oasis:names:tc:SAML:2.0:ac:classes:X509';
-    const AC_SMARTCARD = 'urn:oasis:names:tc:SAML:2.0:ac:classes:Smartcard';
-    const AC_SMARTCARD_PKI = 'urn:oasis:names:tc:SAML:2.0:ac:classes:SmartcardPKI';
-    const AC_KERBEROS = 'urn:oasis:names:tc:SAML:2.0:ac:classes:Kerberos';
-    const AC_WINDOWS = 'urn:federation:authentication:windows';
-    const AC_TLS = 'urn:oasis:names:tc:SAML:2.0:ac:classes:TLSClient';
-    const AC_RSATOKEN = 'urn:oasis:names:tc:SAML:2.0:ac:classes:TimeSyncToken';
-
-    // Subject Confirmation
-    const CM_BEARER = 'urn:oasis:names:tc:SAML:2.0:cm:bearer';
-    const CM_HOLDER_KEY = 'urn:oasis:names:tc:SAML:2.0:cm:holder-of-key';
-    const CM_SENDER_VOUCHES = 'urn:oasis:names:tc:SAML:2.0:cm:sender-vouches';
-
-    // Status Codes
-    const STATUS_SUCCESS = 'urn:oasis:names:tc:SAML:2.0:status:Success';
-    const STATUS_REQUESTER = 'urn:oasis:names:tc:SAML:2.0:status:Requester';
-    const STATUS_RESPONDER = 'urn:oasis:names:tc:SAML:2.0:status:Responder';
-    const STATUS_VERSION_MISMATCH = 'urn:oasis:names:tc:SAML:2.0:status:VersionMismatch';
-    const STATUS_NO_PASSIVE = 'urn:oasis:names:tc:SAML:2.0:status:NoPassive';
-    const STATUS_PARTIAL_LOGOUT = 'urn:oasis:names:tc:SAML:2.0:status:PartialLogout';
-    const STATUS_PROXY_COUNT_EXCEEDED = 'urn:oasis:names:tc:SAML:2.0:status:ProxyCountExceeded';
-}
diff --git a/saml/vendor/onelogin/php-saml/src/Saml2/Error.php b/saml/vendor/onelogin/php-saml/src/Saml2/Error.php
deleted file mode 100644
index 211acf48..00000000
--- a/saml/vendor/onelogin/php-saml/src/Saml2/Error.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-/**
- * This file is part of php-saml.
- *
- * (c) OneLogin Inc
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- *
- * @package OneLogin
- * @author  OneLogin Inc <saml-info@onelogin.com>
- * @license MIT https://github.com/onelogin/php-saml/blob/master/LICENSE
- * @link    https://github.com/onelogin/php-saml
- */
-
-namespace OneLogin\Saml2;
-
-use Exception;
-
-/**
- * Error class of OneLogin PHP Toolkit
- *
- * Defines the Error class
- */
-class Error extends Exception
-{
-    // Errors
-    const SETTINGS_FILE_NOT_FOUND = 0;
-    const SETTINGS_INVALID_SYNTAX = 1;
-    const SETTINGS_INVALID = 2;
-    const METADATA_SP_INVALID = 3;
-    const SP_CERTS_NOT_FOUND = 4;
-    // SP_CERTS_NOT_FOUND is deprecated, use CERT_NOT_FOUND instead
-    const CERT_NOT_FOUND = 4;
-    const REDIRECT_INVALID_URL = 5;
-    const PUBLIC_CERT_FILE_NOT_FOUND = 6;
-    const PRIVATE_KEY_FILE_NOT_FOUND = 7;
-    const SAML_RESPONSE_NOT_FOUND = 8;
-    const SAML_LOGOUTMESSAGE_NOT_FOUND = 9;
-    const SAML_LOGOUTREQUEST_INVALID = 10;
-    const SAML_LOGOUTRESPONSE_INVALID  = 11;
-    const SAML_SINGLE_LOGOUT_NOT_SUPPORTED = 12;
-    const PRIVATE_KEY_NOT_FOUND = 13;
-    const UNSUPPORTED_SETTINGS_OBJECT = 14;
-
-    /**
-     * Constructor
-     *
-     * @param string     $msg  Describes the error.
-     * @param int        $code The code error (defined in the error class).
-     * @param array|null $args Arguments used in the message that describes the error.
-     */
-    public function __construct($msg, $code = 0, $args = array())
-    {
-        assert(is_string($msg));
-        assert(is_int($code));
-
-        if (!isset($args)) {
-            $args = array();
-        }
-        $params = array_merge(array($msg), $args);
-        $message = call_user_func_array('sprintf', $params);
-
-        parent::__construct($message, $code);
-    }
-}
diff --git a/saml/vendor/onelogin/php-saml/src/Saml2/IdPMetadataParser.php b/saml/vendor/onelogin/php-saml/src/Saml2/IdPMetadataParser.php
deleted file mode 100644
index a4fcc30e..00000000
--- a/saml/vendor/onelogin/php-saml/src/Saml2/IdPMetadataParser.php
+++ /dev/null
@@ -1,250 +0,0 @@
-<?php
-/**
- * This file is part of php-saml.
- *
- * (c) OneLogin Inc
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- *
- * @package OneLogin
- * @author  OneLogin Inc <saml-info@onelogin.com>
- * @license MIT https://github.com/onelogin/php-saml/blob/master/LICENSE
- * @link    https://github.com/onelogin/php-saml
- */
-
-namespace OneLogin\Saml2;
-
-use DOMDocument;
-use Exception;
-
-/**
- * IdP Metadata Parser of OneLogin PHP Toolkit
- */
-class IdPMetadataParser
-{
-    /**
-     * Get IdP Metadata Info from URL
-     *
-     * This class does not validate in any way the URL that is introduced,
-     * make sure to validate it properly before use it in the parseRemoteXML
-     * method in order to avoid security issues like SSRF attacks.
-     *
-     * @param string $url                 URL where the IdP metadata is published
-     * @param string $entityId            Entity Id of the desired IdP, if no
-     *                                    entity Id is provided and the XML
-     *                                    metadata contains more than one
-     *                                    IDPSSODescriptor, the first is returned
-     * @param string $desiredNameIdFormat If available on IdP metadata, use that nameIdFormat
-     * @param string $desiredSSOBinding   Parse specific binding SSO endpoint
-     * @param string $desiredSLOBinding   Parse specific binding SLO endpoint
-     *
-     * @return array metadata info in php-saml settings format
-     */
-    public static function parseRemoteXML($url, $entityId = null, $desiredNameIdFormat = null, $desiredSSOBinding = Constants::BINDING_HTTP_REDIRECT, $desiredSLOBinding = Constants::BINDING_HTTP_REDIRECT)
-    {
-        $metadataInfo = array();
-
-        try {
-            $ch = curl_init($url);
-            curl_setopt($ch, CURLOPT_PROTOCOLS, CURLPROTO_HTTPS | CURLPROTO_HTTP);
-            curl_setopt($ch, CURLOPT_REDIR_PROTOCOLS, CURLPROTO_HTTPS  | CURLPROTO_HTTP);
-            curl_setopt($ch, CURLOPT_MAXREDIRS, 5);
-            curl_setopt($ch, CURLOPT_CUSTOMREQUEST, "GET");
-            curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-            curl_setopt($ch, CURLOPT_FOLLOWLOCATION, 1);
-            curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0);
-            curl_setopt($ch, CURLOPT_FAILONERROR, 1);
-
-            $xml = curl_exec($ch);
-            if ($xml !== false) {
-                $metadataInfo = self::parseXML($xml, $entityId, $desiredNameIdFormat, $desiredSSOBinding, $desiredSLOBinding);
-            } else {
-                throw new Exception(curl_error($ch), curl_errno($ch));
-            }
-        } catch (Exception $e) {
-            throw new Exception('Error on parseRemoteXML. '.$e->getMessage());
-        }
-        return $metadataInfo;
-    }
-
-    /**
-     * Get IdP Metadata Info from File
-     *
-     * @param string $filepath            File path
-     * @param string $entityId            Entity Id of the desired IdP, if no
-     *                                    entity Id is provided and the XML
-     *                                    metadata contains more than one
-     *                                    IDPSSODescriptor, the first is returned
-     * @param string $desiredNameIdFormat If available on IdP metadata, use that nameIdFormat
-     * @param string $desiredSSOBinding   Parse specific binding SSO endpoint
-     * @param string $desiredSLOBinding   Parse specific binding SLO endpoint
-     *
-     * @return array metadata info in php-saml settings format
-     */
-    public static function parseFileXML($filepath, $entityId = null, $desiredNameIdFormat = null, $desiredSSOBinding = Constants::BINDING_HTTP_REDIRECT, $desiredSLOBinding = Constants::BINDING_HTTP_REDIRECT)
-    {
-        $metadataInfo = array();
-
-        try {
-            if (file_exists($filepath)) {
-                $data = file_get_contents($filepath);
-                $metadataInfo = self::parseXML($data, $entityId, $desiredNameIdFormat, $desiredSSOBinding, $desiredSLOBinding);
-            }
-        } catch (Exception $e) {
-            throw new Exception('Error on parseFileXML. '.$e->getMessage());
-        }
-        return $metadataInfo;
-    }
-
-    /**
-     * Get IdP Metadata Info from URL
-     *
-     * @param string $xml                 XML that contains IdP metadata
-     * @param string $entityId            Entity Id of the desired IdP, if no
-     *                                    entity Id is provided and the XML
-     *                                    metadata contains more than one
-     *                                    IDPSSODescriptor, the first is returned
-     * @param string $desiredNameIdFormat If available on IdP metadata, use that nameIdFormat
-     * @param string $desiredSSOBinding   Parse specific binding SSO endpoint
-     * @param string $desiredSLOBinding   Parse specific binding SLO endpoint
-     *
-     * @return array metadata info in php-saml settings format
-     *
-     * @throws Exception
-     */
-    public static function parseXML($xml, $entityId = null, $desiredNameIdFormat = null, $desiredSSOBinding = Constants::BINDING_HTTP_REDIRECT, $desiredSLOBinding = Constants::BINDING_HTTP_REDIRECT)
-    {
-        $metadataInfo = array();
-
-        $dom = new DOMDocument();
-        $dom->preserveWhiteSpace = false;
-        $dom->formatOutput = true;
-        try {
-            $dom = Utils::loadXML($dom, $xml);
-            if (!$dom) {
-                throw new Exception('Error parsing metadata');
-            }
-
-            $customIdPStr = '';
-            if (!empty($entityId)) {
-                $customIdPStr = '[@entityID="' . $entityId . '"]';
-            }
-            $idpDescryptorXPath = '//md:EntityDescriptor' . $customIdPStr . '/md:IDPSSODescriptor';
-
-            $idpDescriptorNodes = Utils::query($dom, $idpDescryptorXPath);
-
-            if (isset($idpDescriptorNodes) && $idpDescriptorNodes->length > 0) {
-                $metadataInfo['idp'] = array();
-
-                $idpDescriptor = $idpDescriptorNodes->item(0);
-
-                if (empty($entityId) && $idpDescriptor->parentNode->hasAttribute('entityID')) {
-                    $entityId = $idpDescriptor->parentNode->getAttribute('entityID');
-                }
-
-                if (!empty($entityId)) {
-                    $metadataInfo['idp']['entityId'] = $entityId;
-                }
-
-                $ssoNodes = Utils::query($dom, './md:SingleSignOnService[@Binding="'.$desiredSSOBinding.'"]', $idpDescriptor);
-                if ($ssoNodes->length < 1) {
-                    $ssoNodes = Utils::query($dom, './md:SingleSignOnService', $idpDescriptor);
-                }
-                if ($ssoNodes->length > 0) {
-                    $metadataInfo['idp']['singleSignOnService'] = array(
-                        'url' => $ssoNodes->item(0)->getAttribute('Location'),
-                        'binding' => $ssoNodes->item(0)->getAttribute('Binding')
-                    );
-                }
-
-                $sloNodes = Utils::query($dom, './md:SingleLogoutService[@Binding="'.$desiredSLOBinding.'"]', $idpDescriptor);
-                if ($sloNodes->length < 1) {
-                    $sloNodes = Utils::query($dom, './md:SingleLogoutService', $idpDescriptor);
-                }
-                if ($sloNodes->length > 0) {
-                    $metadataInfo['idp']['singleLogoutService'] = array(
-                        'url' => $sloNodes->item(0)->getAttribute('Location'),
-                        'binding' => $sloNodes->item(0)->getAttribute('Binding')
-                    );
-
-                    if ($sloNodes->item(0)->hasAttribute('ResponseLocation')) {
-                        $metadataInfo['idp']['singleLogoutService']['responseUrl'] = $sloNodes->item(0)->getAttribute('ResponseLocation');
-                    }
-                }
-
-                $keyDescriptorCertSigningNodes = Utils::query($dom, './md:KeyDescriptor[not(contains(@use, "encryption"))]/ds:KeyInfo/ds:X509Data/ds:X509Certificate', $idpDescriptor);
-
-                $keyDescriptorCertEncryptionNodes = Utils::query($dom, './md:KeyDescriptor[not(contains(@use, "signing"))]/ds:KeyInfo/ds:X509Data/ds:X509Certificate', $idpDescriptor);
-
-                if (!empty($keyDescriptorCertSigningNodes) || !empty($keyDescriptorCertEncryptionNodes)) {
-                    $metadataInfo['idp']['x509certMulti'] = array();
-                    if (!empty($keyDescriptorCertSigningNodes)) {
-                        $idpInfo['x509certMulti']['signing'] = array();
-                        foreach ($keyDescriptorCertSigningNodes as $keyDescriptorCertSigningNode) {
-                            $metadataInfo['idp']['x509certMulti']['signing'][] = Utils::formatCert($keyDescriptorCertSigningNode->nodeValue, false);
-                        }
-                    }
-                    if (!empty($keyDescriptorCertEncryptionNodes)) {
-                        $idpInfo['x509certMulti']['encryption'] = array();
-                        foreach ($keyDescriptorCertEncryptionNodes as $keyDescriptorCertEncryptionNode) {
-                            $metadataInfo['idp']['x509certMulti']['encryption'][] = Utils::formatCert($keyDescriptorCertEncryptionNode->nodeValue, false);
-                        }
-                    }
-
-                    $idpCertdata = $metadataInfo['idp']['x509certMulti'];
-                    if ((count($idpCertdata) == 1 and
-                         ((isset($idpCertdata['signing']) and count($idpCertdata['signing']) == 1) or (isset($idpCertdata['encryption']) and count($idpCertdata['encryption']) == 1))) or
-                         ((isset($idpCertdata['signing']) && count($idpCertdata['signing']) == 1) && isset($idpCertdata['encryption']) && count($idpCertdata['encryption']) == 1 && strcmp($idpCertdata['signing'][0], $idpCertdata['encryption'][0]) == 0)) {
-                        if (isset($metadataInfo['idp']['x509certMulti']['signing'][0])) {
-                            $metadataInfo['idp']['x509cert'] = $metadataInfo['idp']['x509certMulti']['signing'][0];
-                        } else {
-                            $metadataInfo['idp']['x509cert'] = $metadataInfo['idp']['x509certMulti']['encryption'][0];
-                        }
-                        unset($metadataInfo['idp']['x509certMulti']);
-                    }
-                }
-
-                $nameIdFormatNodes = Utils::query($dom, './md:NameIDFormat', $idpDescriptor);
-                if ($nameIdFormatNodes->length > 0) {
-                    $metadataInfo['sp']['NameIDFormat'] = $nameIdFormatNodes->item(0)->nodeValue;
-                    if (!empty($desiredNameIdFormat)) {
-                        foreach ($nameIdFormatNodes as $nameIdFormatNode) {
-                            if (strcmp($nameIdFormatNode->nodeValue, $desiredNameIdFormat) == 0) {
-                                $metadataInfo['sp']['NameIDFormat'] = $nameIdFormatNode->nodeValue;
-                                break;
-                            }
-                        }
-                    }
-                }
-            }
-        } catch (Exception $e) {
-            throw new Exception('Error parsing metadata. '.$e->getMessage());
-        }
-
-        return $metadataInfo;
-    }
-
-    /**
-     * Inject metadata info into php-saml settings array
-     *
-     * @param array $settings     php-saml settings array
-     * @param array $metadataInfo array metadata info
-     *
-     * @return array settings
-     */
-    public static function injectIntoSettings($settings, $metadataInfo)
-    {
-        if (isset($metadataInfo['idp']) && isset($settings['idp'])) {
-            if (isset($metadataInfo['idp']['x509certMulti']) && !empty($metadataInfo['idp']['x509certMulti']) && isset($settings['idp']['x509cert'])) {
-                unset($settings['idp']['x509cert']);
-            }
-
-            if (isset($metadataInfo['idp']['x509cert']) && !empty($metadataInfo['idp']['x509cert']) && isset($settings['idp']['x509certMulti'])) {
-                unset($settings['idp']['x509certMulti']);
-            }
-        }
-
-        return array_replace_recursive($settings, $metadataInfo);
-    }
-}
diff --git a/saml/vendor/onelogin/php-saml/src/Saml2/LogoutRequest.php b/saml/vendor/onelogin/php-saml/src/Saml2/LogoutRequest.php
deleted file mode 100644
index 108c49be..00000000
--- a/saml/vendor/onelogin/php-saml/src/Saml2/LogoutRequest.php
+++ /dev/null
@@ -1,494 +0,0 @@
-<?php
-/**
- * This file is part of php-saml.
- *
- * (c) OneLogin Inc
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- *
- * @package OneLogin
- * @author  OneLogin Inc <saml-info@onelogin.com>
- * @license MIT https://github.com/onelogin/php-saml/blob/master/LICENSE
- * @link    https://github.com/onelogin/php-saml
- */
-
-namespace OneLogin\Saml2;
-
-use RobRichards\XMLSecLibs\XMLSecurityKey;
-
-use DOMDocument;
-use Exception;
-
-/**
- * SAML 2 Logout Request
- */
-class LogoutRequest
-{
-    /**
-     * Contains the ID of the Logout Request
-     *
-     * @var string
-     */
-    public $id;
-
-    /**
-     * Object that represents the setting info
-     *
-     * @var Settings
-     */
-    protected $_settings;
-
-    /**
-     * SAML Logout Request
-     *
-     * @var string
-     */
-    protected $_logoutRequest;
-
-    /**
-     * After execute a validation process, this var contains the cause
-     *
-     * @var Exception
-     */
-    private $_error;
-
-    /**
-     * Constructs the Logout Request object.
-     *
-     * @param Settings $settings            Settings
-     * @param string|null             $request             A UUEncoded Logout Request.
-     * @param string|null             $nameId              The NameID that will be set in the LogoutRequest.
-     * @param string|null             $sessionIndex        The SessionIndex (taken from the SAML Response in the SSO process).
-     * @param string|null             $nameIdFormat        The NameID Format will be set in the LogoutRequest.
-     * @param string|null             $nameIdNameQualifier The NameID NameQualifier will be set in the LogoutRequest.
-     * @param string|null             $nameIdSPNameQualifier The NameID SP NameQualifier will be set in the LogoutRequest.
-     */
-    public function __construct(\OneLogin\Saml2\Settings $settings, $request = null, $nameId = null, $sessionIndex = null, $nameIdFormat = null, $nameIdNameQualifier = null, $nameIdSPNameQualifier = null)
-    {
-        $this->_settings = $settings;
-
-        $baseURL = $this->_settings->getBaseURL();
-        if (!empty($baseURL)) {
-            Utils::setBaseURL($baseURL);
-        }
-
-        if (!isset($request) || empty($request)) {
-            $spData = $this->_settings->getSPData();
-            $idpData = $this->_settings->getIdPData();
-            $security = $this->_settings->getSecurityData();
-
-            $id = Utils::generateUniqueID();
-            $this->id = $id;
-
-            $issueInstant = Utils::parseTime2SAML(time());
-
-            $cert = null;
-            if (isset($security['nameIdEncrypted']) && $security['nameIdEncrypted']) {
-                $existsMultiX509Enc = isset($idpData['x509certMulti']) && isset($idpData['x509certMulti']['encryption']) && !empty($idpData['x509certMulti']['encryption']);
-
-                if ($existsMultiX509Enc) {
-                    $cert = $idpData['x509certMulti']['encryption'][0];
-                } else {
-                    $cert = $idpData['x509cert'];
-                }
-            }
-
-            if (!empty($nameId)) {
-                if (empty($nameIdFormat)
-                    && $spData['NameIDFormat'] != Constants::NAMEID_UNSPECIFIED) {
-                    $nameIdFormat = $spData['NameIDFormat'];
-                }
-            } else {
-                $nameId = $idpData['entityId'];
-                $nameIdFormat = Constants::NAMEID_ENTITY;
-            }
-
-            /* From saml-core-2.0-os 8.3.6, when the entity Format is used:
-               "The NameQualifier, SPNameQualifier, and SPProvidedID attributes MUST be omitted.
-            */
-            if (!empty($nameIdFormat) && $nameIdFormat == Constants::NAMEID_ENTITY) {
-                $nameIdNameQualifier = null;
-                $nameIdSPNameQualifier = null;
-            }
-
-            // NameID Format UNSPECIFIED omitted
-            if (!empty($nameIdFormat) && $nameIdFormat == Constants::NAMEID_UNSPECIFIED) {
-                $nameIdFormat = null;
-            }
-
-            $nameIdObj = Utils::generateNameId(
-                $nameId,
-                $nameIdSPNameQualifier,
-                $nameIdFormat,
-                $cert,
-                $nameIdNameQualifier,
-                $security['encryption_algorithm']
-            );
-
-            $sessionIndexStr = isset($sessionIndex) ? "<samlp:SessionIndex>{$sessionIndex}</samlp:SessionIndex>" : "";
-
-            $spEntityId = htmlspecialchars($spData['entityId'], ENT_QUOTES);
-            $destination = $this->_settings->getIdPSLOUrl();
-            $logoutRequest = <<<LOGOUTREQUEST
-<samlp:LogoutRequest
-    xmlns:samlp="urn:oasis:names:tc:SAML:2.0:protocol"
-    xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"
-    ID="{$id}"
-    Version="2.0"
-    IssueInstant="{$issueInstant}"
-    Destination="{$destination}">
-    <saml:Issuer>{$spEntityId}</saml:Issuer>
-    {$nameIdObj}
-    {$sessionIndexStr}
-</samlp:LogoutRequest>
-LOGOUTREQUEST;
-        } else {
-            $decoded = base64_decode($request);
-            // We try to inflate
-            $inflated = @gzinflate($decoded);
-            if ($inflated != false) {
-                $logoutRequest = $inflated;
-            } else {
-                $logoutRequest = $decoded;
-            }
-            $this->id = static::getID($logoutRequest);
-        }
-        $this->_logoutRequest = $logoutRequest;
-    }
-
-    /**
-     * Returns the Logout Request defated, base64encoded, unsigned
-     *
-     * @param bool|null $deflate Whether or not we should 'gzdeflate' the request body before we return it.
-     *
-     * @return string Deflated base64 encoded Logout Request
-     */
-    public function getRequest($deflate = null)
-    {
-        $subject = $this->_logoutRequest;
-
-        if (is_null($deflate)) {
-            $deflate = $this->_settings->shouldCompressRequests();
-        }
-
-        if ($deflate) {
-            $subject = gzdeflate($this->_logoutRequest);
-        }
-
-        return base64_encode($subject);
-    }
-
-    /**
-     * Returns the ID of the Logout Request.
-     *
-     * @param string|DOMDocument $request Logout Request Message
-     *
-     * @return string ID
-     *
-     * @throws Error
-     */
-    public static function getID($request)
-    {
-        if ($request instanceof DOMDocument) {
-            $dom = $request;
-        } else {
-            $dom = new DOMDocument();
-            $dom = Utils::loadXML($dom, $request);
-        }
-
-
-        if (false === $dom) {
-            throw new Error(
-                "LogoutRequest could not be processed",
-                Error::SAML_LOGOUTREQUEST_INVALID
-            );
-        }
-
-        $id = $dom->documentElement->getAttribute('ID');
-        return $id;
-    }
-
-    /**
-     * Gets the NameID Data of the the Logout Request.
-     *
-     * @param string|DOMDocument $request Logout Request Message
-     * @param string|null        $key     The SP key
-     *
-     * @return array Name ID Data (Value, Format, NameQualifier, SPNameQualifier)
-     *
-     * @throws Error
-     * @throws Exception
-     * @throws ValidationError
-     */
-    public static function getNameIdData($request, $key = null)
-    {
-        if ($request instanceof DOMDocument) {
-            $dom = $request;
-        } else {
-            $dom = new DOMDocument();
-            $dom = Utils::loadXML($dom, $request);
-        }
-
-        $encryptedEntries = Utils::query($dom, '/samlp:LogoutRequest/saml:EncryptedID');
-
-        if ($encryptedEntries->length == 1) {
-            $encryptedDataNodes = $encryptedEntries->item(0)->getElementsByTagName('EncryptedData');
-            $encryptedData = $encryptedDataNodes->item(0);
-
-            if (empty($key)) {
-                throw new Error(
-                    "Private Key is required in order to decrypt the NameID, check settings",
-                    Error::PRIVATE_KEY_NOT_FOUND
-                );
-            }
-
-            $seckey = new XMLSecurityKey(XMLSecurityKey::RSA_1_5, array('type'=>'private'));
-            $seckey->loadKey($key);
-
-            $nameId = Utils::decryptElement($encryptedData, $seckey);
-
-        } else {
-            $entries = Utils::query($dom, '/samlp:LogoutRequest/saml:NameID');
-            if ($entries->length == 1) {
-                $nameId = $entries->item(0);
-            }
-        }
-
-        if (!isset($nameId)) {
-            throw new ValidationError(
-                "NameID not found in the Logout Request",
-                ValidationError::NO_NAMEID
-            );
-        }
-
-        $nameIdData = array();
-        $nameIdData['Value'] = $nameId->nodeValue;
-        foreach (array('Format', 'SPNameQualifier', 'NameQualifier') as $attr) {
-            if ($nameId->hasAttribute($attr)) {
-                $nameIdData[$attr] = $nameId->getAttribute($attr);
-            }
-        }
-
-        return $nameIdData;
-    }
-
-    /**
-     * Gets the NameID of the Logout Request.
-     *
-     * @param string|DOMDocument $request Logout Request Message
-     * @param string|null        $key     The SP key
-     *
-     * @return string Name ID Value
-     *
-     * @throws Error
-     * @throws Exception
-     * @throws ValidationError
-     */
-    public static function getNameId($request, $key = null)
-    {
-        $nameId = self::getNameIdData($request, $key);
-        return $nameId['Value'];
-    }
-
-    /**
-     * Gets the Issuer of the Logout Request.
-     *
-     * @param string|DOMDocument $request Logout Request Message
-     *
-     * @return string|null $issuer The Issuer
-     *
-     * @throws Exception
-     */
-    public static function getIssuer($request)
-    {
-        if ($request instanceof DOMDocument) {
-            $dom = $request;
-        } else {
-            $dom = new DOMDocument();
-            $dom = Utils::loadXML($dom, $request);
-        }
-
-        $issuer = null;
-        $issuerNodes = Utils::query($dom, '/samlp:LogoutRequest/saml:Issuer');
-        if ($issuerNodes->length == 1) {
-            $issuer = $issuerNodes->item(0)->textContent;
-        }
-        return $issuer;
-    }
-
-    /**
-     * Gets the SessionIndexes from the Logout Request.
-     * Notice: Our Constructor only support 1 SessionIndex but this parser
-     *         extracts an array of all the  SessionIndex found on a
-     *         Logout Request, that could be many.
-     *
-     * @param string|DOMDocument $request Logout Request Message
-     *
-     * @return array The SessionIndex value
-     *
-     * @throws Exception
-     */
-    public static function getSessionIndexes($request)
-    {
-        if ($request instanceof DOMDocument) {
-            $dom = $request;
-        } else {
-            $dom = new DOMDocument();
-            $dom = Utils::loadXML($dom, $request);
-        }
-
-        $sessionIndexes = array();
-        $sessionIndexNodes = Utils::query($dom, '/samlp:LogoutRequest/samlp:SessionIndex');
-        foreach ($sessionIndexNodes as $sessionIndexNode) {
-            $sessionIndexes[] = $sessionIndexNode->textContent;
-        }
-        return $sessionIndexes;
-    }
-
-    /**
-     * Checks if the Logout Request recieved is valid.
-     *
-     * @param bool $retrieveParametersFromServer True if we want to use parameters from $_SERVER to validate the signature
-     *
-     * @return bool If the Logout Request is or not valid
-     *
-     * @throws Exception
-     * @throws ValidationError
-     */
-    public function isValid($retrieveParametersFromServer = false)
-    {
-        $this->_error = null;
-        try {
-            $dom = new DOMDocument();
-            $dom = Utils::loadXML($dom, $this->_logoutRequest);
-
-            $idpData = $this->_settings->getIdPData();
-            $idPEntityId = $idpData['entityId'];
-
-            if ($this->_settings->isStrict()) {
-                $security = $this->_settings->getSecurityData();
-
-                if ($security['wantXMLValidation']) {
-                    $res = Utils::validateXML($dom, 'saml-schema-protocol-2.0.xsd', $this->_settings->isDebugActive(), $this->_settings->getSchemasPath());
-                    if (!$res instanceof DOMDocument) {
-                        throw new ValidationError(
-                            "Invalid SAML Logout Request. Not match the saml-schema-protocol-2.0.xsd",
-                            ValidationError::INVALID_XML_FORMAT
-                        );
-                    }
-                }
-
-                $currentURL = Utils::getSelfRoutedURLNoQuery();
-
-                // Check NotOnOrAfter
-                if ($dom->documentElement->hasAttribute('NotOnOrAfter')) {
-                    $na = Utils::parseSAML2Time($dom->documentElement->getAttribute('NotOnOrAfter'));
-                    if ($na <= time()) {
-                        throw new ValidationError(
-                            "Could not validate timestamp: expired. Check system clock.",
-                            ValidationError::RESPONSE_EXPIRED
-                        );
-                    }
-                }
-
-                // Check destination
-                if ($dom->documentElement->hasAttribute('Destination')) {
-                    $destination = $dom->documentElement->getAttribute('Destination');
-                    if (empty($destination)) {
-                        if (!$security['relaxDestinationValidation']) {
-                            throw new ValidationError(
-                                "The LogoutRequest has an empty Destination value",
-                                ValidationError::EMPTY_DESTINATION
-                            );
-                        }
-                    } else {
-                        $urlComparisonLength = $security['destinationStrictlyMatches'] ? strlen($destination) : strlen($currentURL);
-                        if (strncmp($destination, $currentURL, $urlComparisonLength) !== 0) {
-                            $currentURLNoRouted = Utils::getSelfURLNoQuery();
-                            $urlComparisonLength = $security['destinationStrictlyMatches'] ? strlen($destination) : strlen($currentURLNoRouted);
-                            if (strncmp($destination, $currentURLNoRouted, $urlComparisonLength) !== 0) {
-                                throw new ValidationError(
-                                    "The LogoutRequest was received at $currentURL instead of $destination",
-                                    ValidationError::WRONG_DESTINATION
-                                );
-                            }
-                        }
-                    }
-                }
-
-                $nameId = static::getNameId($dom, $this->_settings->getSPkey());
-
-                // Check issuer
-                $issuer = static::getIssuer($dom);
-                if (!empty($issuer) && $issuer != $idPEntityId) {
-                    throw new ValidationError(
-                        "Invalid issuer in the Logout Request",
-                        ValidationError::WRONG_ISSUER
-                    );
-                }
-
-                if ($security['wantMessagesSigned'] && !isset($_GET['Signature'])) {
-                    throw new ValidationError(
-                        "The Message of the Logout Request is not signed and the SP require it",
-                        ValidationError::NO_SIGNED_MESSAGE
-                    );
-                }
-            }
-
-            if (isset($_GET['Signature'])) {
-                $signatureValid = Utils::validateBinarySign("SAMLRequest", $_GET, $idpData, $retrieveParametersFromServer);
-                if (!$signatureValid) {
-                    throw new ValidationError(
-                        "Signature validation failed. Logout Request rejected",
-                        ValidationError::INVALID_SIGNATURE
-                    );
-                }
-            }
-
-            return true;
-        } catch (Exception $e) {
-            $this->_error = $e;
-            $debug = $this->_settings->isDebugActive();
-            if ($debug) {
-                echo htmlentities($this->_error->getMessage());
-            }
-            return false;
-        }
-    }
-
-    /**
-     * After execute a validation process, if fails this method returns the Exception of the cause
-     *
-     * @return Exception Cause
-     */
-    public function getErrorException()
-    {
-        return $this->_error;
-    }
-
-    /**
-     * After execute a validation process, if fails this method returns the cause
-     *
-     * @return null|string Error reason
-     */
-    public function getError()
-    {
-        $errorMsg = null;
-        if (isset($this->_error)) {
-            $errorMsg = htmlentities($this->_error->getMessage());
-        }
-        return $errorMsg;
-    }
-
-    /**
-     * Returns the XML that will be sent as part of the request
-     * or that was received at the SP
-     *
-     * @return string
-     */
-    public function getXML()
-    {
-        return $this->_logoutRequest;
-    }
-}
diff --git a/saml/vendor/onelogin/php-saml/src/Saml2/LogoutResponse.php b/saml/vendor/onelogin/php-saml/src/Saml2/LogoutResponse.php
deleted file mode 100644
index 9c3f020e..00000000
--- a/saml/vendor/onelogin/php-saml/src/Saml2/LogoutResponse.php
+++ /dev/null
@@ -1,347 +0,0 @@
-<?php
-/**
- * This file is part of php-saml.
- *
- * (c) OneLogin Inc
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- *
- * @package OneLogin
- * @author  OneLogin Inc <saml-info@onelogin.com>
- * @license MIT https://github.com/onelogin/php-saml/blob/master/LICENSE
- * @link    https://github.com/onelogin/php-saml
- */
-
-namespace OneLogin\Saml2;
-
-use DOMDocument;
-use DOMNodeList;
-use Exception;
-
-/**
- * SAML 2 Logout Response
- */
-class LogoutResponse
-{
-    /**
-     * Contains the ID of the Logout Response
-     *
-     * @var string
-     */
-    public $id;
-
-    /**
-     * Object that represents the setting info
-     *
-     * @var Settings
-     */
-    protected $_settings;
-
-    /**
-     * The decoded, unprocessed XML response provided to the constructor.
-     *
-     * @var string|null
-     */
-    protected $_logoutResponse;
-
-    /**
-     * A DOMDocument class loaded from the SAML LogoutResponse.
-     *
-     * @var DOMDocument
-     */
-    public $document;
-
-    /**
-     * After execute a validation process, if it fails, this var contains the cause
-     *
-     * @var Exception|null
-     */
-    private $_error;
-
-    /**
-     * Constructs a Logout Response object (Initialize params from settings and if provided
-     * load the Logout Response.
-     *
-     * @param Settings $settings Settings.
-     * @param string|null             $response An UUEncoded SAML Logout response from the IdP.
-     *
-     * @throws Error
-     * @throws Exception
-     */
-    public function __construct(\OneLogin\Saml2\Settings $settings, $response = null)
-    {
-        $this->_settings = $settings;
-
-        $baseURL = $this->_settings->getBaseURL();
-        if (!empty($baseURL)) {
-            Utils::setBaseURL($baseURL);
-        }
-
-        if ($response) {
-            $decoded = base64_decode($response);
-            $inflated = @gzinflate($decoded);
-            if ($inflated != false) {
-                $this->_logoutResponse = $inflated;
-            } else {
-                $this->_logoutResponse = $decoded;
-            }
-            $this->document = new DOMDocument();
-            $this->document = Utils::loadXML($this->document, $this->_logoutResponse);
-
-            if (false === $this->document) {
-                throw new Error(
-                    "LogoutResponse could not be processed",
-                    Error::SAML_LOGOUTRESPONSE_INVALID
-                );
-            }
-
-            if ($this->document->documentElement->hasAttribute('ID')) {
-                $this->id = $this->document->documentElement->getAttribute('ID');
-            }
-        }
-    }
-
-    /**
-     * Gets the Issuer of the Logout Response.
-     *
-     * @return string|null $issuer The Issuer
-     */
-    public function getIssuer()
-    {
-        $issuer = null;
-        $issuerNodes = $this->_query('/samlp:LogoutResponse/saml:Issuer');
-        if ($issuerNodes->length == 1) {
-            $issuer = $issuerNodes->item(0)->textContent;
-        }
-        return $issuer;
-    }
-
-    /**
-     * Gets the Status of the Logout Response.
-     *
-     * @return string|null The Status
-     */
-    public function getStatus()
-    {
-        $entries = $this->_query('/samlp:LogoutResponse/samlp:Status/samlp:StatusCode');
-        if ($entries->length != 1) {
-            return null;
-        }
-        $status = $entries->item(0)->getAttribute('Value');
-        return $status;
-    }
-
-    /**
-     * Determines if the SAML LogoutResponse is valid
-     *
-     * @param string|null $requestId                    The ID of the LogoutRequest sent by this SP to the IdP
-     * @param bool        $retrieveParametersFromServer True if we want to use parameters from $_SERVER to validate the signature
-     *
-     * @return bool Returns if the SAML LogoutResponse is or not valid
-     *
-     * @throws ValidationError
-     */
-    public function isValid($requestId = null, $retrieveParametersFromServer = false)
-    {
-        $this->_error = null;
-        try {
-            $idpData = $this->_settings->getIdPData();
-            $idPEntityId = $idpData['entityId'];
-
-            if ($this->_settings->isStrict()) {
-                $security = $this->_settings->getSecurityData();
-
-                if ($security['wantXMLValidation']) {
-                    $res = Utils::validateXML($this->document, 'saml-schema-protocol-2.0.xsd', $this->_settings->isDebugActive(), $this->_settings->getSchemasPath());
-                    if (!$res instanceof DOMDocument) {
-                        throw new ValidationError(
-                            "Invalid SAML Logout Response. Not match the saml-schema-protocol-2.0.xsd",
-                            ValidationError::INVALID_XML_FORMAT
-                        );
-                    }
-                }
-
-                // Check if the InResponseTo of the Logout Response matchs the ID of the Logout Request (requestId) if provided
-                if (isset($requestId) && $this->document->documentElement->hasAttribute('InResponseTo')) {
-                    $inResponseTo = $this->document->documentElement->getAttribute('InResponseTo');
-                    if ($requestId != $inResponseTo) {
-                        throw new ValidationError(
-                            "The InResponseTo of the Logout Response: $inResponseTo, does not match the ID of the Logout request sent by the SP: $requestId",
-                            ValidationError::WRONG_INRESPONSETO
-                        );
-                    }
-                }
-
-                // Check issuer
-                $issuer = $this->getIssuer();
-                if (!empty($issuer) && $issuer != $idPEntityId) {
-                    throw new ValidationError(
-                        "Invalid issuer in the Logout Response",
-                        ValidationError::WRONG_ISSUER
-                    );
-                }
-
-                $currentURL = Utils::getSelfRoutedURLNoQuery();
-
-                if ($this->document->documentElement->hasAttribute('Destination')) {
-                    $destination = $this->document->documentElement->getAttribute('Destination');
-                    if (empty($destination)) {
-                        if (!$security['relaxDestinationValidation']) {
-                            throw new ValidationError(
-                                "The LogoutResponse has an empty Destination value",
-                                ValidationError::EMPTY_DESTINATION
-                            );
-                        }
-                    } else {
-                        $urlComparisonLength = $security['destinationStrictlyMatches'] ? strlen($destination) : strlen($currentURL);
-                        if (strncmp($destination, $currentURL, $urlComparisonLength) !== 0) {
-                            $currentURLNoRouted = Utils::getSelfURLNoQuery();
-                            $urlComparisonLength = $security['destinationStrictlyMatches'] ? strlen($destination) : strlen($currentURLNoRouted);
-                            if (strncmp($destination, $currentURLNoRouted, $urlComparisonLength) !== 0) {
-                                throw new ValidationError(
-                                    "The LogoutResponse was received at $currentURL instead of $destination",
-                                    ValidationError::WRONG_DESTINATION
-                                );
-                            }
-                        }
-                    }
-                }
-
-                if ($security['wantMessagesSigned'] && !isset($_GET['Signature'])) {
-                    throw new ValidationError(
-                        "The Message of the Logout Response is not signed and the SP requires it",
-                        ValidationError::NO_SIGNED_MESSAGE
-                    );
-                }
-            }
-
-            if (isset($_GET['Signature'])) {
-                $signatureValid = Utils::validateBinarySign("SAMLResponse", $_GET, $idpData, $retrieveParametersFromServer);
-                if (!$signatureValid) {
-                    throw new ValidationError(
-                        "Signature validation failed. Logout Response rejected",
-                        ValidationError::INVALID_SIGNATURE
-                    );
-                }
-            }
-            return true;
-        } catch (Exception $e) {
-            $this->_error = $e;
-            $debug = $this->_settings->isDebugActive();
-            if ($debug) {
-                echo htmlentities($this->_error->getMessage());
-            }
-            return false;
-        }
-    }
-
-    /**
-     * Extracts a node from the DOMDocument (Logout Response Menssage)
-     *
-     * @param string $query Xpath Expression
-     *
-     * @return DOMNodeList The queried node
-     */
-    private function _query($query)
-    {
-        return Utils::query($this->document, $query);
-
-    }
-
-    /**
-     * Generates a Logout Response object.
-     *
-     * @param string $inResponseTo InResponseTo value for the Logout Response.
-     */
-    public function build($inResponseTo)
-    {
-
-        $spData = $this->_settings->getSPData();
-
-        $this->id = Utils::generateUniqueID();
-        $issueInstant = Utils::parseTime2SAML(time());
-        $spEntityId = htmlspecialchars($spData['entityId'], ENT_QUOTES);
-        $destination = $this->_settings->getIdPSLOResponseUrl();
-        $logoutResponse = <<<LOGOUTRESPONSE
-<samlp:LogoutResponse xmlns:samlp="urn:oasis:names:tc:SAML:2.0:protocol"
-                  xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"
-                  ID="{$this->id}"
-                  Version="2.0"
-                  IssueInstant="{$issueInstant}"
-                  Destination="{$destination}"
-                  InResponseTo="{$inResponseTo}"
-                  >
-    <saml:Issuer>{$spEntityId}</saml:Issuer>
-    <samlp:Status>
-        <samlp:StatusCode Value="urn:oasis:names:tc:SAML:2.0:status:Success" />
-    </samlp:Status>
-</samlp:LogoutResponse>
-LOGOUTRESPONSE;
-        $this->_logoutResponse = $logoutResponse;
-    }
-
-    /**
-     * Returns a Logout Response object.
-     *
-     * @param bool|null $deflate Whether or not we should 'gzdeflate' the response body before we return it.
-     *
-     * @return string Logout Response deflated and base64 encoded
-     */
-    public function getResponse($deflate = null)
-    {
-        $logoutResponse = $this->_logoutResponse;
-
-        if (is_null($deflate)) {
-            $deflate = $this->_settings->shouldCompressResponses();
-        }
-
-        if ($deflate) {
-            $logoutResponse = gzdeflate($this->_logoutResponse);
-        }
-        return base64_encode($logoutResponse);
-    }
-
-    /**
-     * After execute a validation process, if fails this method returns the cause.
-     *
-     * @return Exception|null Cause
-     */
-    public function getErrorException()
-    {
-        return $this->_error;
-    }
-
-    /**
-     * After execute a validation process, if fails this method returns the cause
-     *
-     * @return null|string Error reason
-     */
-    public function getError()
-    {
-        $errorMsg = null;
-        if (isset($this->_error)) {
-            $errorMsg = htmlentities($this->_error->getMessage());
-        }
-        return $errorMsg;
-    }
-
-    /**
-     * @return string the ID of the Response
-     */
-    public function getId()
-    {
-        return $this->id;
-    }
-
-    /**
-     * Returns the XML that will be sent as part of the response
-     * or that was received at the SP
-     *
-     * @return string|null
-     */
-    public function getXML()
-    {
-        return $this->_logoutResponse;
-    }
-}
diff --git a/saml/vendor/onelogin/php-saml/src/Saml2/Metadata.php b/saml/vendor/onelogin/php-saml/src/Saml2/Metadata.php
deleted file mode 100644
index 922ad60b..00000000
--- a/saml/vendor/onelogin/php-saml/src/Saml2/Metadata.php
+++ /dev/null
@@ -1,267 +0,0 @@
-<?php
-/**
- * This file is part of php-saml.
- *
- * (c) OneLogin Inc
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- *
- * @package OneLogin
- * @author  OneLogin Inc <saml-info@onelogin.com>
- * @license MIT https://github.com/onelogin/php-saml/blob/master/LICENSE
- * @link    https://github.com/onelogin/php-saml
- */
-
-namespace OneLogin\Saml2;
-
-use RobRichards\XMLSecLibs\XMLSecurityKey;
-use RobRichards\XMLSecLibs\XMLSecurityDSig;
-
-use DOMDocument;
-use Exception;
-
-/**
- * Metadata lib of OneLogin PHP Toolkit
- */
-class Metadata
-{
-    const TIME_VALID = 172800;  // 2 days
-    const TIME_CACHED = 604800; // 1 week
-
-    /**
-     * Generates the metadata of the SP based on the settings
-     *
-     * @param array         $sp            The SP data
-     * @param bool|string   $authnsign     authnRequestsSigned attribute
-     * @param bool|string   $wsign         wantAssertionsSigned attribute
-     * @param int|null      $validUntil    Metadata's valid time
-     * @param int|null      $cacheDuration Duration of the cache in seconds
-     * @param array         $contacts      Contacts info
-     * @param array         $organization  Organization ingo
-     * @param array         $attributes
-     *
-     * @return string SAML Metadata XML
-     */
-    public static function builder($sp, $authnsign = false, $wsign = false, $validUntil = null, $cacheDuration = null, $contacts = array(), $organization = array(), $attributes = array())
-    {
-
-        if (!isset($validUntil)) {
-            $validUntil =  time() + self::TIME_VALID;
-        }
-        $validUntilTime =  Utils::parseTime2SAML($validUntil);
-
-        if (!isset($cacheDuration)) {
-            $cacheDuration = self::TIME_CACHED;
-        }
-
-        $sls = '';
-
-        if (isset($sp['singleLogoutService'])) {
-            $slsUrl = htmlspecialchars($sp['singleLogoutService']['url'], ENT_QUOTES);
-            $sls = <<<SLS_TEMPLATE
-        <md:SingleLogoutService Binding="{$sp['singleLogoutService']['binding']}"
-                                Location="{$slsUrl}" />
-
-SLS_TEMPLATE;
-        }
-
-        if ($authnsign) {
-            $strAuthnsign = 'true';
-        } else {
-            $strAuthnsign = 'false';
-        }
-
-        if ($wsign) {
-            $strWsign = 'true';
-        } else {
-            $strWsign = 'false';
-        }
-
-        $strOrganization = '';
-
-        if (!empty($organization)) {
-            $organizationInfoNames = array();
-            $organizationInfoDisplaynames = array();
-            $organizationInfoUrls = array();
-            foreach ($organization as $lang => $info) {
-                $organizationInfoNames[] = <<<ORGANIZATION_NAME
-       <md:OrganizationName xml:lang="{$lang}">{$info['name']}</md:OrganizationName>
-ORGANIZATION_NAME;
-                $organizationInfoDisplaynames[] = <<<ORGANIZATION_DISPLAY
-       <md:OrganizationDisplayName xml:lang="{$lang}">{$info['displayname']}</md:OrganizationDisplayName>
-ORGANIZATION_DISPLAY;
-                $organizationInfoUrls[] = <<<ORGANIZATION_URL
-       <md:OrganizationURL xml:lang="{$lang}">{$info['url']}</md:OrganizationURL>
-ORGANIZATION_URL;
-            }
-            $orgData = implode("\n", $organizationInfoNames)."\n".implode("\n", $organizationInfoDisplaynames)."\n".implode("\n", $organizationInfoUrls);
-            $strOrganization = <<<ORGANIZATIONSTR
-
-    <md:Organization>
-{$orgData}
-    </md:Organization>
-ORGANIZATIONSTR;
-        }
-
-        $strContacts = '';
-        if (!empty($contacts)) {
-            $contactsInfo = array();
-            foreach ($contacts as $type => $info) {
-                $contactsInfo[] = <<<CONTACT
-    <md:ContactPerson contactType="{$type}">
-        <md:GivenName>{$info['givenName']}</md:GivenName>
-        <md:EmailAddress>{$info['emailAddress']}</md:EmailAddress>
-    </md:ContactPerson>
-CONTACT;
-            }
-            $strContacts = "\n".implode("\n", $contactsInfo);
-        }
-
-        $strAttributeConsumingService = '';
-        if (isset($sp['attributeConsumingService'])) {
-            $attrCsDesc = '';
-            if (isset($sp['attributeConsumingService']['serviceDescription'])) {
-                $attrCsDesc = sprintf(
-                    '            <md:ServiceDescription xml:lang="en">%s</md:ServiceDescription>' . PHP_EOL,
-                    $sp['attributeConsumingService']['serviceDescription']
-                );
-            }
-            if (!isset($sp['attributeConsumingService']['serviceName'])) {
-                $sp['attributeConsumingService']['serviceName'] = 'Service';
-            }
-            $requestedAttributeData = array();
-            foreach ($sp['attributeConsumingService']['requestedAttributes'] as $attribute) {
-                $requestedAttributeStr = sprintf('            <md:RequestedAttribute Name="%s"', $attribute['name']);
-                if (isset($attribute['nameFormat'])) {
-                    $requestedAttributeStr .= sprintf(' NameFormat="%s"', $attribute['nameFormat']);
-                }
-                if (isset($attribute['friendlyName'])) {
-                    $requestedAttributeStr .= sprintf(' FriendlyName="%s"', $attribute['friendlyName']);
-                }
-                if (isset($attribute['isRequired'])) {
-                    $requestedAttributeStr .= sprintf(' isRequired="%s"', $attribute['isRequired'] === true ? 'true' : 'false');
-                }
-                $reqAttrAuxStr = " />";
-
-                if (isset($attribute['attributeValue']) && !empty($attribute['attributeValue'])) {
-                    $reqAttrAuxStr = '>';
-                    if (is_string($attribute['attributeValue'])) {
-                        $attribute['attributeValue'] = array($attribute['attributeValue']);
-                    }
-                    foreach ($attribute['attributeValue'] as $attrValue) {
-                        $reqAttrAuxStr .=<<<ATTRIBUTEVALUE
-
-                <saml:AttributeValue xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion">{$attrValue}</saml:AttributeValue>
-ATTRIBUTEVALUE;
-                    }
-                    $reqAttrAuxStr .= "\n            </md:RequestedAttribute>";
-                }
-
-                $requestedAttributeData[] = $requestedAttributeStr . $reqAttrAuxStr;
-            }
-
-            $requestedAttributeStr = implode(PHP_EOL, $requestedAttributeData);
-            $strAttributeConsumingService = <<<METADATA_TEMPLATE
-<md:AttributeConsumingService index="1">
-            <md:ServiceName xml:lang="en">{$sp['attributeConsumingService']['serviceName']}</md:ServiceName>
-{$attrCsDesc}{$requestedAttributeStr}
-        </md:AttributeConsumingService>
-METADATA_TEMPLATE;
-        }
-
-        $spEntityId = htmlspecialchars($sp['entityId'], ENT_QUOTES);
-        $acsUrl = htmlspecialchars($sp['assertionConsumerService']['url'], ENT_QUOTES);
-        $metadata = <<<METADATA_TEMPLATE
-<?xml version="1.0"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
-                     validUntil="{$validUntilTime}"
-                     cacheDuration="PT{$cacheDuration}S"
-                     entityID="{$spEntityId}">
-    <md:SPSSODescriptor AuthnRequestsSigned="{$strAuthnsign}" WantAssertionsSigned="{$strWsign}" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-{$sls}        <md:NameIDFormat>{$sp['NameIDFormat']}</md:NameIDFormat>
-        <md:AssertionConsumerService Binding="{$sp['assertionConsumerService']['binding']}"
-                                     Location="{$acsUrl}"
-                                     index="1" />
-        {$strAttributeConsumingService}
-    </md:SPSSODescriptor>{$strOrganization}{$strContacts}
-</md:EntityDescriptor>
-METADATA_TEMPLATE;
-        return $metadata;
-    }
-
-    /**
-     * Signs the metadata with the key/cert provided
-     *
-     * @param string $metadata        SAML Metadata XML
-     * @param string $key             x509 key
-     * @param string $cert            x509 cert
-     * @param string $signAlgorithm   Signature algorithm method
-     * @param string $digestAlgorithm Digest algorithm method
-     *
-     * @return string Signed Metadata
-     *
-     * @throws Exception
-     */
-    public static function signMetadata($metadata, $key, $cert, $signAlgorithm = XMLSecurityKey::RSA_SHA256, $digestAlgorithm = XMLSecurityDSig::SHA256)
-    {
-        return Utils::addSign($metadata, $key, $cert, $signAlgorithm, $digestAlgorithm);
-    }
-
-    /**
-     * Adds the x509 descriptors (sign/encryption) to the metadata
-     * The same cert will be used for sign/encrypt
-     *
-     * @param string $metadata       SAML Metadata XML
-     * @param string $cert           x509 cert
-     * @param bool   $wantsEncrypted Whether to include the KeyDescriptor for encryption
-     *
-     * @return string Metadata with KeyDescriptors
-     *
-     * @throws Exception
-     */
-    public static function addX509KeyDescriptors($metadata, $cert, $wantsEncrypted = true)
-    {
-        $xml = new DOMDocument();
-        $xml->preserveWhiteSpace = false;
-        $xml->formatOutput = true;
-        try {
-            $xml = Utils::loadXML($xml, $metadata);
-            if (!$xml) {
-                throw new Exception('Error parsing metadata');
-            }
-        } catch (Exception $e) {
-            throw new Exception('Error parsing metadata. '.$e->getMessage());
-        }
-
-        $formatedCert = Utils::formatCert($cert, false);
-        $x509Certificate = $xml->createElementNS(Constants::NS_DS, 'X509Certificate', $formatedCert);
-
-        $keyData = $xml->createElementNS(Constants::NS_DS, 'ds:X509Data');
-        $keyData->appendChild($x509Certificate);
-
-        $keyInfo = $xml->createElementNS(Constants::NS_DS, 'ds:KeyInfo');
-        $keyInfo->appendChild($keyData);
-
-        $keyDescriptor = $xml->createElementNS(Constants::NS_MD, "md:KeyDescriptor");
-
-        $SPSSODescriptor = $xml->getElementsByTagName('SPSSODescriptor')->item(0);
-        $SPSSODescriptor->insertBefore($keyDescriptor->cloneNode(), $SPSSODescriptor->firstChild);
-        if ($wantsEncrypted === true) {
-            $SPSSODescriptor->insertBefore($keyDescriptor->cloneNode(), $SPSSODescriptor->firstChild);
-        }
-
-        $signing = $xml->getElementsByTagName('KeyDescriptor')->item(0);
-        $signing->setAttribute('use', 'signing');
-        $signing->appendChild($keyInfo);
-
-        if ($wantsEncrypted === true) {
-            $encryption = $xml->getElementsByTagName('KeyDescriptor')->item(1);
-            $encryption->setAttribute('use', 'encryption');
-
-            $encryption->appendChild($keyInfo->cloneNode(true));
-        }
-
-        return $xml->saveXML();
-    }
-}
diff --git a/saml/vendor/onelogin/php-saml/src/Saml2/Response.php b/saml/vendor/onelogin/php-saml/src/Saml2/Response.php
deleted file mode 100644
index 813aa66a..00000000
--- a/saml/vendor/onelogin/php-saml/src/Saml2/Response.php
+++ /dev/null
@@ -1,1245 +0,0 @@
-<?php
-/**
- * This file is part of php-saml.
- *
- * (c) OneLogin Inc
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- *
- * @package OneLogin
- * @author  OneLogin Inc <saml-info@onelogin.com>
- * @license MIT https://github.com/onelogin/php-saml/blob/master/LICENSE
- * @link    https://github.com/onelogin/php-saml
- */
-
-namespace OneLogin\Saml2;
-
-use RobRichards\XMLSecLibs\XMLSecurityKey;
-use RobRichards\XMLSecLibs\XMLSecEnc;
-
-use DOMDocument;
-use DOMNodeList;
-use DOMXPath;
-use Exception;
-
-/**
- * SAML 2 Authentication Response
- */
-class Response
-{
-    /**
-     * Settings
-     *
-     * @var Settings
-     */
-    protected $_settings;
-
-    /**
-     * The decoded, unprocessed XML response provided to the constructor.
-     *
-     * @var string
-     */
-    public $response;
-
-    /**
-     * A DOMDocument class loaded from the SAML Response.
-     *
-     * @var DOMDocument
-     */
-    public $document;
-
-    /**
-     * A DOMDocument class loaded from the SAML Response (Decrypted).
-     *
-     * @var DOMDocument
-     */
-    public $decryptedDocument;
-
-    /**
-     * The response contains an encrypted assertion.
-     *
-     * @var bool
-     */
-    public $encrypted = false;
-
-    /**
-     * After validation, if it fail this var has the cause of the problem
-     *
-     * @var Exception|null
-     */
-    private $_error;
-
-    /**
-     * NotOnOrAfter value of a valid SubjectConfirmationData node
-     *
-     * @var int
-     */
-    private $_validSCDNotOnOrAfter;
-
-    /**
-     * Constructs the SAML Response object.
-     *
-     * @param Settings $settings Settings.
-     * @param string   $response A UUEncoded SAML response from the IdP.
-     *
-     * @throws Exception
-     * @throws ValidationError
-     */
-    public function __construct(\OneLogin\Saml2\Settings $settings, $response)
-    {
-        $this->_settings = $settings;
-
-        $baseURL = $this->_settings->getBaseURL();
-        if (!empty($baseURL)) {
-            Utils::setBaseURL($baseURL);
-        }
-
-        $this->response = base64_decode($response);
-
-        $this->document = new DOMDocument();
-        $this->document = Utils::loadXML($this->document, $this->response);
-        if (!$this->document) {
-            throw new ValidationError(
-                "SAML Response could not be processed",
-                ValidationError::INVALID_XML_FORMAT
-            );
-        }
-
-        // Quick check for the presence of EncryptedAssertion
-        $encryptedAssertionNodes = $this->document->getElementsByTagName('EncryptedAssertion');
-        if ($encryptedAssertionNodes->length !== 0) {
-            $this->decryptedDocument = clone $this->document;
-            $this->encrypted = true;
-            $this->decryptedDocument = $this->decryptAssertion($this->decryptedDocument);
-        }
-    }
-
-    /**
-     * Determines if the SAML Response is valid using the certificate.
-     *
-     * @param string|null $requestId The ID of the AuthNRequest sent by this SP to the IdP
-     *
-     * @return bool Validate the document
-     *
-     * @throws Exception
-     * @throws ValidationError
-     */
-    public function isValid($requestId = null)
-    {
-        $this->_error = null;
-        try {
-            // Check SAML version
-            if ($this->document->documentElement->getAttribute('Version') != '2.0') {
-                throw new ValidationError(
-                    "Unsupported SAML version",
-                    ValidationError::UNSUPPORTED_SAML_VERSION
-                );
-            }
-
-            if (!$this->document->documentElement->hasAttribute('ID')) {
-                throw new ValidationError(
-                    "Missing ID attribute on SAML Response",
-                    ValidationError::MISSING_ID
-                );
-            }
-
-            $this->checkStatus();
-
-            $singleAssertion = $this->validateNumAssertions();
-            if (!$singleAssertion) {
-                throw new ValidationError(
-                    "SAML Response must contain 1 assertion",
-                    ValidationError::WRONG_NUMBER_OF_ASSERTIONS
-                );
-            }
-
-            $idpData = $this->_settings->getIdPData();
-            $idPEntityId = $idpData['entityId'];
-            $spData = $this->_settings->getSPData();
-            $spEntityId = $spData['entityId'];
-
-            $signedElements = $this->processSignedElements();
-
-            $responseTag = '{'.Constants::NS_SAMLP.'}Response';
-            $assertionTag = '{'.Constants::NS_SAML.'}Assertion';
-
-            $hasSignedResponse = in_array($responseTag, $signedElements);
-            $hasSignedAssertion = in_array($assertionTag, $signedElements);
-
-            if ($this->_settings->isStrict()) {
-                $security = $this->_settings->getSecurityData();
-
-                if ($security['wantXMLValidation']) {
-                    $errorXmlMsg = "Invalid SAML Response. Not match the saml-schema-protocol-2.0.xsd";
-                    $res = Utils::validateXML($this->document, 'saml-schema-protocol-2.0.xsd', $this->_settings->isDebugActive(), $this->_settings->getSchemasPath());
-                    if (!$res instanceof DOMDocument) {
-                        throw new ValidationError(
-                            $errorXmlMsg,
-                            ValidationError::INVALID_XML_FORMAT
-                        );
-                    }
-
-                    // If encrypted, check also the decrypted document
-                    if ($this->encrypted) {
-                        $res = Utils::validateXML($this->decryptedDocument, 'saml-schema-protocol-2.0.xsd', $this->_settings->isDebugActive(), $this->_settings->getSchemasPath());
-                        if (!$res instanceof DOMDocument) {
-                            throw new ValidationError(
-                                $errorXmlMsg,
-                                ValidationError::INVALID_XML_FORMAT
-                            );
-                        }
-                    }
-
-                }
-
-                $currentURL = Utils::getSelfRoutedURLNoQuery();
-
-                $responseInResponseTo = null;
-                if ($this->document->documentElement->hasAttribute('InResponseTo')) {
-                    $responseInResponseTo = $this->document->documentElement->getAttribute('InResponseTo');
-                }
-
-                if (!isset($requestId) && isset($responseInResponseTo) && $security['rejectUnsolicitedResponsesWithInResponseTo']) {
-                    throw new ValidationError(
-                        "The Response has an InResponseTo attribute: " . $responseInResponseTo . " while no InResponseTo was expected",
-                        ValidationError::WRONG_INRESPONSETO
-                    );
-                }
-
-                // Check if the InResponseTo of the Response matchs the ID of the AuthNRequest (requestId) if provided
-                if (isset($requestId) && $requestId != $responseInResponseTo) {
-                    if ($responseInResponseTo == null) {
-                        throw new ValidationError(
-                            "No InResponseTo at the Response, but it was provided the requestId related to the AuthNRequest sent by the SP: $requestId",
-                            ValidationError::WRONG_INRESPONSETO
-                        );
-                    } else {
-                        throw new ValidationError(
-                            "The InResponseTo of the Response: $responseInResponseTo, does not match the ID of the AuthNRequest sent by the SP: $requestId",
-                            ValidationError::WRONG_INRESPONSETO
-                        );
-                    }
-                }
-
-                if (!$this->encrypted && $security['wantAssertionsEncrypted']) {
-                    throw new ValidationError(
-                        "The assertion of the Response is not encrypted and the SP requires it",
-                        ValidationError::NO_ENCRYPTED_ASSERTION
-                    );
-                }
-
-                if ($security['wantNameIdEncrypted']) {
-                    $encryptedIdNodes = $this->_queryAssertion('/saml:Subject/saml:EncryptedID/xenc:EncryptedData');
-                    if ($encryptedIdNodes->length != 1) {
-                        throw new ValidationError(
-                            "The NameID of the Response is not encrypted and the SP requires it",
-                            ValidationError::NO_ENCRYPTED_NAMEID
-                        );
-                    }
-                }
-
-                // Validate Conditions element exists
-                if (!$this->checkOneCondition()) {
-                    throw new ValidationError(
-                        "The Assertion must include a Conditions element",
-                        ValidationError::MISSING_CONDITIONS
-                    );
-                }
-
-                // Validate Asserion timestamps
-                $this->validateTimestamps();
-
-                // Validate AuthnStatement element exists and is unique
-                if (!$this->checkOneAuthnStatement()) {
-                    throw new ValidationError(
-                        "The Assertion must include an AuthnStatement element",
-                        ValidationError::WRONG_NUMBER_OF_AUTHSTATEMENTS
-                    );
-                }
-
-                // EncryptedAttributes are not supported
-                $encryptedAttributeNodes = $this->_queryAssertion('/saml:AttributeStatement/saml:EncryptedAttribute');
-                if ($encryptedAttributeNodes->length > 0) {
-                    throw new ValidationError(
-                        "There is an EncryptedAttribute in the Response and this SP not support them",
-                        ValidationError::ENCRYPTED_ATTRIBUTES
-                    );
-                }
-
-                // Check destination
-                if ($this->document->documentElement->hasAttribute('Destination')) {
-                    $destination = $this->document->documentElement->getAttribute('Destination');
-                    if (isset($destination)) {
-                        $destination = trim($destination);
-                    }
-                    if (empty($destination)) {
-                        if (!$security['relaxDestinationValidation']) {
-                            throw new ValidationError(
-                                "The response has an empty Destination value",
-                                ValidationError::EMPTY_DESTINATION
-                            );
-                        }
-                    } else {
-                        $urlComparisonLength = $security['destinationStrictlyMatches'] ? strlen($destination) : strlen($currentURL);
-                        if (strncmp($destination, $currentURL, $urlComparisonLength) !== 0) {
-                            $currentURLNoRouted = Utils::getSelfURLNoQuery();
-                            $urlComparisonLength = $security['destinationStrictlyMatches'] ? strlen($destination) : strlen($currentURLNoRouted);
-                            if (strncmp($destination, $currentURLNoRouted, $urlComparisonLength) !== 0) {
-                                throw new ValidationError(
-                                    "The response was received at $currentURL instead of $destination",
-                                    ValidationError::WRONG_DESTINATION
-                                );
-                            }
-                        }
-                    }
-                }
-
-                // Check audience
-                $validAudiences = $this->getAudiences();
-                if (!empty($validAudiences) && !in_array($spEntityId, $validAudiences, true)) {
-                    throw new ValidationError(
-                        sprintf(
-                            "Invalid audience for this Response (expected '%s', got '%s')",
-                            $spEntityId,
-                            implode(',', $validAudiences)
-                        ),
-                        ValidationError::WRONG_AUDIENCE
-                    );
-                }
-
-                // Check the issuers
-                $issuers = $this->getIssuers();
-                foreach ($issuers as $issuer) {
-                    if (isset($issuer)) {
-                        $trimmedIssuer = trim($issuer);
-                        if (empty($trimmedIssuer) || $trimmedIssuer !== $idPEntityId) {
-                            throw new ValidationError(
-                                "Invalid issuer in the Assertion/Response (expected '$idPEntityId', got '$trimmedIssuer')",
-                                ValidationError::WRONG_ISSUER
-                            );
-                        }
-                    }
-                }
-
-                // Check the session Expiration
-                $sessionExpiration = $this->getSessionNotOnOrAfter();
-                if (!empty($sessionExpiration) && $sessionExpiration + Constants::ALLOWED_CLOCK_DRIFT <= time()) {
-                    throw new ValidationError(
-                        "The attributes have expired, based on the SessionNotOnOrAfter of the AttributeStatement of this Response",
-                        ValidationError::SESSION_EXPIRED
-                    );
-                }
-
-                // Check the SubjectConfirmation, at least one SubjectConfirmation must be valid
-                $anySubjectConfirmation = false;
-                $subjectConfirmationNodes = $this->_queryAssertion('/saml:Subject/saml:SubjectConfirmation');
-                foreach ($subjectConfirmationNodes as $scn) {
-                    if ($scn->hasAttribute('Method') && $scn->getAttribute('Method') != Constants::CM_BEARER) {
-                        continue;
-                    }
-                    $subjectConfirmationDataNodes = $scn->getElementsByTagName('SubjectConfirmationData');
-                    if ($subjectConfirmationDataNodes->length == 0) {
-                        continue;
-                    } else {
-                        $scnData = $subjectConfirmationDataNodes->item(0);
-                        if ($scnData->hasAttribute('InResponseTo')) {
-                            $inResponseTo = $scnData->getAttribute('InResponseTo');
-                            if (isset($responseInResponseTo) && $responseInResponseTo != $inResponseTo) {
-                                continue;
-                            }
-                        }
-                        if ($scnData->hasAttribute('Recipient')) {
-                            $recipient = $scnData->getAttribute('Recipient');
-                            if (!empty($recipient) && strpos($recipient, $currentURL) === false) {
-                                continue;
-                            }
-                        }
-                        if ($scnData->hasAttribute('NotOnOrAfter')) {
-                            $noa = Utils::parseSAML2Time($scnData->getAttribute('NotOnOrAfter'));
-                            if ($noa + Constants::ALLOWED_CLOCK_DRIFT <= time()) {
-                                continue;
-                            }
-                        }
-                        if ($scnData->hasAttribute('NotBefore')) {
-                            $nb = Utils::parseSAML2Time($scnData->getAttribute('NotBefore'));
-                            if ($nb > time() + Constants::ALLOWED_CLOCK_DRIFT) {
-                                continue;
-                            }
-                        }
-
-                        // Save NotOnOrAfter value
-                        if ($scnData->hasAttribute('NotOnOrAfter')) {
-                            $this->_validSCDNotOnOrAfter = $noa;
-                        }
-                        $anySubjectConfirmation = true;
-                        break;
-                    }
-                }
-
-                if (!$anySubjectConfirmation) {
-                    throw new ValidationError(
-                        "A valid SubjectConfirmation was not found on this Response",
-                        ValidationError::WRONG_SUBJECTCONFIRMATION
-                    );
-                }
-
-                if ($security['wantAssertionsSigned'] && !$hasSignedAssertion) {
-                    throw new ValidationError(
-                        "The Assertion of the Response is not signed and the SP requires it",
-                        ValidationError::NO_SIGNED_ASSERTION
-                    );
-                }
-
-                if ($security['wantMessagesSigned'] && !$hasSignedResponse) {
-                    throw new ValidationError(
-                        "The Message of the Response is not signed and the SP requires it",
-                        ValidationError::NO_SIGNED_MESSAGE
-                    );
-                }
-            }
-
-            // Detect case not supported
-            if ($this->encrypted) {
-                $encryptedIDNodes = Utils::query($this->decryptedDocument, '/samlp:Response/saml:Assertion/saml:Subject/saml:EncryptedID');
-                if ($encryptedIDNodes->length > 0) {
-                    throw new ValidationError(
-                        'SAML Response that contains an encrypted Assertion with encrypted nameId is not supported.',
-                        ValidationError::NOT_SUPPORTED
-                    );
-                }
-            }
-
-            if (empty($signedElements) || (!$hasSignedResponse && !$hasSignedAssertion)) {
-                throw new ValidationError(
-                    'No Signature found. SAML Response rejected',
-                    ValidationError::NO_SIGNATURE_FOUND
-                );
-            } else {
-                $cert = $idpData['x509cert'];
-                $fingerprint = $idpData['certFingerprint'];
-                $fingerprintalg = $idpData['certFingerprintAlgorithm'];
-
-                $multiCerts = null;
-                $existsMultiX509Sign = isset($idpData['x509certMulti']) && isset($idpData['x509certMulti']['signing']) && !empty($idpData['x509certMulti']['signing']);
-
-                if ($existsMultiX509Sign) {
-                    $multiCerts = $idpData['x509certMulti']['signing'];
-                }
-
-                // If find a Signature on the Response, validates it checking the original response
-                if ($hasSignedResponse && !Utils::validateSign($this->document, $cert, $fingerprint, $fingerprintalg, Utils::RESPONSE_SIGNATURE_XPATH, $multiCerts)) {
-                    throw new ValidationError(
-                        "Signature validation failed. SAML Response rejected",
-                        ValidationError::INVALID_SIGNATURE
-                    );
-                }
-
-                // If find a Signature on the Assertion (decrypted assertion if was encrypted)
-                $documentToCheckAssertion = $this->encrypted ? $this->decryptedDocument : $this->document;
-                if ($hasSignedAssertion && !Utils::validateSign($documentToCheckAssertion, $cert, $fingerprint, $fingerprintalg, Utils::ASSERTION_SIGNATURE_XPATH, $multiCerts)) {
-                    throw new ValidationError(
-                        "Signature validation failed. SAML Response rejected",
-                        ValidationError::INVALID_SIGNATURE
-                    );
-                }
-            }
-            return true;
-        } catch (Exception $e) {
-            $this->_error = $e;
-            $debug = $this->_settings->isDebugActive();
-            if ($debug) {
-                echo htmlentities($e->getMessage());
-            }
-            return false;
-        }
-    }
-
-    /**
-     * @return string|null the ID of the Response
-     */
-    public function getId()
-    {
-        $id = null;
-        if ($this->document->documentElement->hasAttribute('ID')) {
-            $id = $this->document->documentElement->getAttribute('ID');
-        }
-        return $id;
-    }
-
-    /**
-     * @return string|null the ID of the assertion in the Response
-     *
-     * @throws ValidationError
-     */
-    public function getAssertionId()
-    {
-        if (!$this->validateNumAssertions()) {
-            throw new ValidationError("SAML Response must contain 1 Assertion.", ValidationError::WRONG_NUMBER_OF_ASSERTIONS);
-        }
-        $assertionNodes = $this->_queryAssertion("");
-        $id = null;
-        if ($assertionNodes->length == 1 && $assertionNodes->item(0)->hasAttribute('ID')) {
-            $id = $assertionNodes->item(0)->getAttribute('ID');
-        }
-        return $id;
-    }
-
-    /**
-     * @return int the NotOnOrAfter value of the valid SubjectConfirmationData
-     * node if any
-     */
-    public function getAssertionNotOnOrAfter()
-    {
-        return $this->_validSCDNotOnOrAfter;
-    }
-
-    /**
-     * Checks if the Status is success
-     *
-     * @throws ValidationError If status is not success
-     */
-    public function checkStatus()
-    {
-        $status = Utils::getStatus($this->document);
-
-        if (isset($status['code']) && $status['code'] !== Constants::STATUS_SUCCESS) {
-            $explodedCode = explode(':', $status['code']);
-            $printableCode = array_pop($explodedCode);
-
-            $statusExceptionMsg = 'The status code of the Response was not Success, was '.$printableCode;
-            if (!empty($status['msg'])) {
-                $statusExceptionMsg .= ' -> '.$status['msg'];
-            }
-            throw new ValidationError(
-                $statusExceptionMsg,
-                ValidationError::STATUS_CODE_IS_NOT_SUCCESS
-            );
-        }
-    }
-
-    /**
-     * Checks that the samlp:Response/saml:Assertion/saml:Conditions element exists and is unique.
-     *
-     * @return boolean true if the Conditions element exists and is unique
-     */
-    public function checkOneCondition()
-    {
-        $entries = $this->_queryAssertion("/saml:Conditions");
-        if ($entries->length == 1) {
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * Checks that the samlp:Response/saml:Assertion/saml:AuthnStatement element exists and is unique.
-     *
-     * @return boolean true if the AuthnStatement element exists and is unique
-     */
-    public function checkOneAuthnStatement()
-    {
-        $entries = $this->_queryAssertion("/saml:AuthnStatement");
-        if ($entries->length == 1) {
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * Gets the audiences.
-     *
-     * @return array @audience The valid audiences of the response
-     */
-    public function getAudiences()
-    {
-        $audiences = array();
-
-        $entries = $this->_queryAssertion('/saml:Conditions/saml:AudienceRestriction/saml:Audience');
-        foreach ($entries as $entry) {
-            $value = $entry->textContent;
-            if (isset($value)) {
-                $value = trim($value);
-            }
-            if (!empty($value)) {
-                $audiences[] = $value;
-            }
-        }
-
-        return array_unique($audiences);
-    }
-
-    /**
-     * Gets the Issuers (from Response and Assertion).
-     *
-     * @return array @issuers The issuers of the assertion/response
-     *
-     * @throws ValidationError
-     */
-    public function getIssuers()
-    {
-        $issuers = array();
-
-        $responseIssuer = Utils::query($this->document, '/samlp:Response/saml:Issuer');
-        if ($responseIssuer->length > 0) {
-            if ($responseIssuer->length == 1) {
-                $issuers[] = $responseIssuer->item(0)->textContent;
-            } else {
-                throw new ValidationError(
-                    "Issuer of the Response is multiple.",
-                    ValidationError::ISSUER_MULTIPLE_IN_RESPONSE
-                );
-            }
-        }
-
-        $assertionIssuer = $this->_queryAssertion('/saml:Issuer');
-        if ($assertionIssuer->length == 1) {
-            $issuers[] = $assertionIssuer->item(0)->textContent;
-        } else {
-            throw new ValidationError(
-                "Issuer of the Assertion not found or multiple.",
-                ValidationError::ISSUER_NOT_FOUND_IN_ASSERTION
-            );
-        }
-
-        return array_unique($issuers);
-    }
-
-    /**
-     * Gets the NameID Data provided by the SAML response from the IdP.
-     *
-     * @return array Name ID Data (Value, Format, NameQualifier, SPNameQualifier)
-     *
-     * @throws ValidationError
-     */
-    public function getNameIdData()
-    {
-        $encryptedIdDataEntries = $this->_queryAssertion('/saml:Subject/saml:EncryptedID/xenc:EncryptedData');
-
-        if ($encryptedIdDataEntries->length == 1) {
-            $encryptedData = $encryptedIdDataEntries->item(0);
-
-            $key = $this->_settings->getSPkey();
-            $seckey = new XMLSecurityKey(XMLSecurityKey::RSA_1_5, array('type'=>'private'));
-            $seckey->loadKey($key);
-
-            $nameId = Utils::decryptElement($encryptedData, $seckey);
-
-        } else {
-            $entries = $this->_queryAssertion('/saml:Subject/saml:NameID');
-            if ($entries->length == 1) {
-                $nameId = $entries->item(0);
-            }
-        }
-
-        $nameIdData = array();
-
-        if (!isset($nameId)) {
-            $security = $this->_settings->getSecurityData();
-            if ($security['wantNameId']) {
-                throw new ValidationError(
-                    "NameID not found in the assertion of the Response",
-                    ValidationError::NO_NAMEID
-                );
-            }
-        } else {
-            if ($this->_settings->isStrict() && empty($nameId->nodeValue)) {
-                throw new ValidationError(
-                    "An empty NameID value found",
-                    ValidationError::EMPTY_NAMEID
-                );
-            }
-            $nameIdData['Value'] = $nameId->nodeValue;
-
-            foreach (array('Format', 'SPNameQualifier', 'NameQualifier') as $attr) {
-                if ($nameId->hasAttribute($attr)) {
-                    if ($this->_settings->isStrict() && $attr == 'SPNameQualifier') {
-                        $spData = $this->_settings->getSPData();
-                        $spEntityId = $spData['entityId'];
-                        if ($spEntityId != $nameId->getAttribute($attr)) {
-                            throw new ValidationError(
-                                "The SPNameQualifier value mistmatch the SP entityID value.",
-                                ValidationError::SP_NAME_QUALIFIER_NAME_MISMATCH
-                            );
-                        }
-                    }
-                    $nameIdData[$attr] = $nameId->getAttribute($attr);
-                }
-            }
-        }
-
-        return $nameIdData;
-    }
-
-    /**
-     * Gets the NameID provided by the SAML response from the IdP.
-     *
-     * @return string|null Name ID Value
-     *
-     * @throws ValidationError
-     */
-    public function getNameId()
-    {
-        $nameIdvalue = null;
-        $nameIdData = $this->getNameIdData();
-        if (!empty($nameIdData) && isset($nameIdData['Value'])) {
-            $nameIdvalue = $nameIdData['Value'];
-        }
-        return $nameIdvalue;
-    }
-
-    /**
-     * Gets the NameID Format provided by the SAML response from the IdP.
-     *
-     * @return string|null Name ID Format
-     *
-     * @throws ValidationError
-     */
-    public function getNameIdFormat()
-    {
-        $nameIdFormat = null;
-        $nameIdData = $this->getNameIdData();
-        if (!empty($nameIdData) && isset($nameIdData['Format'])) {
-            $nameIdFormat = $nameIdData['Format'];
-        }
-        return $nameIdFormat;
-    }
-
-    /**
-     * Gets the NameID NameQualifier provided by the SAML response from the IdP.
-     *
-     * @return string|null Name ID NameQualifier
-     *
-     * @throws ValidationError
-     */
-    public function getNameIdNameQualifier()
-    {
-        $nameIdNameQualifier = null;
-        $nameIdData = $this->getNameIdData();
-        if (!empty($nameIdData) && isset($nameIdData['NameQualifier'])) {
-            $nameIdNameQualifier = $nameIdData['NameQualifier'];
-        }
-        return $nameIdNameQualifier;
-    }
-
-    /**
-     * Gets the NameID SP NameQualifier provided by the SAML response from the IdP.
-     *
-     * @return string|null NameID SP NameQualifier
-     *
-     * @throws ValidationError
-     */
-    public function getNameIdSPNameQualifier()
-    {
-        $nameIdSPNameQualifier = null;
-        $nameIdData = $this->getNameIdData();
-        if (!empty($nameIdData) && isset($nameIdData['SPNameQualifier'])) {
-            $nameIdSPNameQualifier = $nameIdData['SPNameQualifier'];
-        }
-        return $nameIdSPNameQualifier;
-    }
-
-    /**
-     * Gets the SessionNotOnOrAfter from the AuthnStatement.
-     * Could be used to set the local session expiration
-     *
-     * @return int|null The SessionNotOnOrAfter value
-     *
-     * @throws Exception
-     */
-    public function getSessionNotOnOrAfter()
-    {
-        $notOnOrAfter = null;
-        $entries = $this->_queryAssertion('/saml:AuthnStatement[@SessionNotOnOrAfter]');
-        if ($entries->length !== 0) {
-            $notOnOrAfter = Utils::parseSAML2Time($entries->item(0)->getAttribute('SessionNotOnOrAfter'));
-        }
-        return $notOnOrAfter;
-    }
-
-    /**
-     * Gets the SessionIndex from the AuthnStatement.
-     * Could be used to be stored in the local session in order
-     * to be used in a future Logout Request that the SP could
-     * send to the SP, to set what specific session must be deleted
-     *
-     * @return string|null The SessionIndex value
-     */
-    public function getSessionIndex()
-    {
-        $sessionIndex = null;
-        $entries = $this->_queryAssertion('/saml:AuthnStatement[@SessionIndex]');
-        if ($entries->length !== 0) {
-            $sessionIndex = $entries->item(0)->getAttribute('SessionIndex');
-        }
-        return $sessionIndex;
-    }
-
-    /**
-     * Gets the Attributes from the AttributeStatement element.
-     *
-     * @return array The attributes of the SAML Assertion
-     *
-     * @throws ValidationError
-     */
-    public function getAttributes()
-    {
-        return $this->_getAttributesByKeyName('Name');
-    }
-
-    /**
-     * Gets the Attributes from the AttributeStatement element using their FriendlyName.
-     *
-     * @return array The attributes of the SAML Assertion
-     *
-     * @throws ValidationError
-     */
-    public function getAttributesWithFriendlyName()
-    {
-        return $this->_getAttributesByKeyName('FriendlyName');
-    }
-
-    /**
-     * @param string $keyName
-     *
-     * @return array
-     *
-     * @throws ValidationError
-     */
-    private function _getAttributesByKeyName($keyName = "Name")
-    {
-        $attributes = array();
-        $entries = $this->_queryAssertion('/saml:AttributeStatement/saml:Attribute');
-
-        $security = $this->_settings->getSecurityData();
-        $allowRepeatAttributeName = $security['allowRepeatAttributeName'];
-        /** @var $entry DOMNode */
-        foreach ($entries as $entry) {
-            $attributeKeyNode = $entry->attributes->getNamedItem($keyName);
-            if ($attributeKeyNode === null) {
-                continue;
-            }
-            $attributeKeyName = $attributeKeyNode->nodeValue;
-            if (in_array($attributeKeyName, array_keys($attributes), true)) {
-                if (!$allowRepeatAttributeName) {
-                    throw new ValidationError(
-                        "Found an Attribute element with duplicated ".$keyName,
-                        ValidationError::DUPLICATED_ATTRIBUTE_NAME_FOUND
-                    );
-                }
-            }
-            $attributeValues = array();
-            foreach ($entry->childNodes as $childNode) {
-                $tagName = ($childNode->prefix ? $childNode->prefix.':' : '') . 'AttributeValue';
-                if ($childNode->nodeType == XML_ELEMENT_NODE && $childNode->tagName === $tagName) {
-                    $attributeValues[] = $childNode->nodeValue;
-                }
-            }
-
-            if (in_array($attributeKeyName, array_keys($attributes), true)) {
-                $attributes[$attributeKeyName] = array_merge($attributes[$attributeKeyName], $attributeValues);
-            } else {
-                $attributes[$attributeKeyName] = $attributeValues;
-            }
-        }
-        return $attributes;
-    }
-
-    /**
-     * Verifies that the document only contains a single Assertion (encrypted or not).
-     *
-     * @return bool TRUE if the document passes.
-     */
-    public function validateNumAssertions()
-    {
-        $encryptedAssertionNodes = $this->document->getElementsByTagName('EncryptedAssertion');
-        $assertionNodes = $this->document->getElementsByTagName('Assertion');
-
-        $valid = $assertionNodes->length + $encryptedAssertionNodes->length == 1;
-
-        if ($this->encrypted) {
-            $assertionNodes = $this->decryptedDocument->getElementsByTagName('Assertion');
-            $valid = $valid && $assertionNodes->length == 1;
-        }
-
-        return $valid;
-    }
-
-    /**
-     * Verifies the signature nodes:
-     *   - Checks that are Response or Assertion
-     *   - Check that IDs and reference URI are unique and consistent.
-     *
-     * @return array Signed element tags
-     *
-     * @throws ValidationError
-     */
-    public function processSignedElements()
-    {
-        $signedElements = array();
-        $verifiedSeis = array();
-        $verifiedIds = array();
-
-        if ($this->encrypted) {
-            $signNodes = $this->decryptedDocument->getElementsByTagName('Signature');
-        } else {
-            $signNodes = $this->document->getElementsByTagName('Signature');
-        }
-        foreach ($signNodes as $signNode) {
-            $responseTag = '{'.Constants::NS_SAMLP.'}Response';
-            $assertionTag = '{'.Constants::NS_SAML.'}Assertion';
-
-            $signedElement = '{'.$signNode->parentNode->namespaceURI.'}'.$signNode->parentNode->localName;
-
-            if ($signedElement != $responseTag && $signedElement != $assertionTag) {
-                throw new ValidationError(
-                    "Invalid Signature Element $signedElement SAML Response rejected",
-                    ValidationError::WRONG_SIGNED_ELEMENT
-                );
-            }
-
-            // Check that reference URI matches the parent ID and no duplicate References or IDs
-            $idValue = $signNode->parentNode->getAttribute('ID');
-            if (empty($idValue)) {
-                throw new ValidationError(
-                    'Signed Element must contain an ID. SAML Response rejected',
-                    ValidationError::ID_NOT_FOUND_IN_SIGNED_ELEMENT
-                );
-            }
-
-            if (in_array($idValue, $verifiedIds)) {
-                throw new ValidationError(
-                    'Duplicated ID. SAML Response rejected',
-                    ValidationError::DUPLICATED_ID_IN_SIGNED_ELEMENTS
-                );
-            }
-            $verifiedIds[] = $idValue;
-
-            $ref = $signNode->getElementsByTagName('Reference');
-            if ($ref->length == 1) {
-                $ref = $ref->item(0);
-                $sei = $ref->getAttribute('URI');
-                if (!empty($sei)) {
-                    $sei = substr($sei, 1);
-
-                    if ($sei != $idValue) {
-                        throw new ValidationError(
-                            'Found an invalid Signed Element. SAML Response rejected',
-                            ValidationError::INVALID_SIGNED_ELEMENT
-                        );
-                    }
-
-                    if (in_array($sei, $verifiedSeis)) {
-                        throw new ValidationError(
-                            'Duplicated Reference URI. SAML Response rejected',
-                            ValidationError::DUPLICATED_REFERENCE_IN_SIGNED_ELEMENTS
-                        );
-                    }
-                    $verifiedSeis[] = $sei;
-                }
-            } else {
-                throw new ValidationError(
-                    'Unexpected number of Reference nodes found for signature. SAML Response rejected.',
-                    ValidationError::UNEXPECTED_REFERENCE
-                );
-            }
-            $signedElements[] = $signedElement;
-        }
-
-        // Check SignedElements
-        if (!empty($signedElements) && !$this->validateSignedElements($signedElements)) {
-            throw new ValidationError(
-                'Found an unexpected Signature Element. SAML Response rejected',
-                ValidationError::UNEXPECTED_SIGNED_ELEMENTS
-            );
-        }
-        return $signedElements;
-    }
-
-    /**
-     * Verifies that the document is still valid according Conditions Element.
-     *
-     * @return bool
-     *
-     * @throws Exception
-     * @throws ValidationError
-     */
-    public function validateTimestamps()
-    {
-        if ($this->encrypted) {
-            $document = $this->decryptedDocument;
-        } else {
-            $document = $this->document;
-        }
-
-        $timestampNodes = $document->getElementsByTagName('Conditions');
-        for ($i = 0; $i < $timestampNodes->length; $i++) {
-            $nbAttribute = $timestampNodes->item($i)->attributes->getNamedItem("NotBefore");
-            $naAttribute = $timestampNodes->item($i)->attributes->getNamedItem("NotOnOrAfter");
-            if ($nbAttribute && Utils::parseSAML2Time($nbAttribute->textContent) > time() + Constants::ALLOWED_CLOCK_DRIFT) {
-                throw new ValidationError(
-                    'Could not validate timestamp: not yet valid. Check system clock.',
-                    ValidationError::ASSERTION_TOO_EARLY
-                );
-            }
-            if ($naAttribute && Utils::parseSAML2Time($naAttribute->textContent) + Constants::ALLOWED_CLOCK_DRIFT <= time()) {
-                throw new ValidationError(
-                    'Could not validate timestamp: expired. Check system clock.',
-                    ValidationError::ASSERTION_EXPIRED
-                );
-            }
-        }
-        return true;
-    }
-
-    /**
-     * Verifies that the document has the expected signed nodes.
-     *
-     * @param array $signedElements Signed elements
-     *
-     * @return bool
-     *
-     * @throws ValidationError
-     */
-    public function validateSignedElements($signedElements)
-    {
-        if (count($signedElements) > 2) {
-            return false;
-        }
-
-        $responseTag = '{'.Constants::NS_SAMLP.'}Response';
-        $assertionTag = '{'.Constants::NS_SAML.'}Assertion';
-
-        $ocurrence = array_count_values($signedElements);
-        if ((in_array($responseTag, $signedElements) && $ocurrence[$responseTag] > 1)
-            || (in_array($assertionTag, $signedElements) && $ocurrence[$assertionTag] > 1)
-            || !in_array($responseTag, $signedElements) && !in_array($assertionTag, $signedElements)
-        ) {
-            return false;
-        }
-
-        // Check that the signed elements found here, are the ones that will be verified
-        // by Utils->validateSign()
-        if (in_array($responseTag, $signedElements)) {
-            $expectedSignatureNodes = Utils::query($this->document, Utils::RESPONSE_SIGNATURE_XPATH);
-            if ($expectedSignatureNodes->length != 1) {
-                throw new ValidationError(
-                    "Unexpected number of Response signatures found. SAML Response rejected.",
-                    ValidationError::WRONG_NUMBER_OF_SIGNATURES_IN_RESPONSE
-                );
-            }
-        }
-
-        if (in_array($assertionTag, $signedElements)) {
-            $expectedSignatureNodes = $this->_query(Utils::ASSERTION_SIGNATURE_XPATH);
-            if ($expectedSignatureNodes->length != 1) {
-                throw new ValidationError(
-                    "Unexpected number of Assertion signatures found. SAML Response rejected.",
-                    ValidationError::WRONG_NUMBER_OF_SIGNATURES_IN_ASSERTION
-                );
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * Extracts a node from the DOMDocument (Assertion).
-     *
-     * @param string $assertionXpath Xpath Expression
-     *
-     * @return DOMNodeList The queried node
-     */
-    protected function _queryAssertion($assertionXpath)
-    {
-        if ($this->encrypted) {
-            $xpath = new DOMXPath($this->decryptedDocument);
-        } else {
-            $xpath = new DOMXPath($this->document);
-        }
-
-        $xpath->registerNamespace('samlp', Constants::NS_SAMLP);
-        $xpath->registerNamespace('saml', Constants::NS_SAML);
-        $xpath->registerNamespace('ds', Constants::NS_DS);
-        $xpath->registerNamespace('xenc', Constants::NS_XENC);
-
-        $assertionNode = '/samlp:Response/saml:Assertion';
-        $signatureQuery = $assertionNode . '/ds:Signature/ds:SignedInfo/ds:Reference';
-        $assertionReferenceNode = $xpath->query($signatureQuery)->item(0);
-        if (!$assertionReferenceNode) {
-            // is the response signed as a whole?
-            $signatureQuery = '/samlp:Response/ds:Signature/ds:SignedInfo/ds:Reference';
-            $responseReferenceNode = $xpath->query($signatureQuery)->item(0);
-            if ($responseReferenceNode) {
-                $uri = $responseReferenceNode->attributes->getNamedItem('URI')->nodeValue;
-                if (empty($uri)) {
-                    $id = $responseReferenceNode->parentNode->parentNode->parentNode->attributes->getNamedItem('ID')->nodeValue;
-                } else {
-                    $id = substr($responseReferenceNode->attributes->getNamedItem('URI')->nodeValue, 1);
-                }
-                $nameQuery = "/samlp:Response[@ID='$id']/saml:Assertion" . $assertionXpath;
-            } else {
-                $nameQuery = "/samlp:Response/saml:Assertion" . $assertionXpath;
-            }
-        } else {
-            $uri = $assertionReferenceNode->attributes->getNamedItem('URI')->nodeValue;
-            if (empty($uri)) {
-                $id = $assertionReferenceNode->parentNode->parentNode->parentNode->attributes->getNamedItem('ID')->nodeValue;
-            } else {
-                $id = substr($assertionReferenceNode->attributes->getNamedItem('URI')->nodeValue, 1);
-            }
-            $nameQuery = $assertionNode."[@ID='$id']" . $assertionXpath;
-        }
-
-        return $xpath->query($nameQuery);
-    }
-
-    /**
-     * Extracts nodes that match the query from the DOMDocument (Response Menssage)
-     *
-     * @param string $query Xpath Expression
-     *
-     * @return DOMNodeList The queried nodes
-     */
-    private function _query($query)
-    {
-        if ($this->encrypted) {
-            return Utils::query($this->decryptedDocument, $query);
-        } else {
-            return Utils::query($this->document, $query);
-        }
-    }
-
-    /**
-     * Decrypts the Assertion (DOMDocument)
-     *
-     * @param \DomNode $dom DomDocument
-     *
-     * @return DOMDocument Decrypted Assertion
-     *
-     * @throws Exception
-     * @throws ValidationError
-     */
-    protected function decryptAssertion(\DomNode $dom)
-    {
-        $pem = $this->_settings->getSPkey();
-
-        if (empty($pem)) {
-            throw new Error(
-                "No private key available, check settings",
-                Error::PRIVATE_KEY_NOT_FOUND
-            );
-        }
-
-        $objenc = new XMLSecEnc();
-        $encData = $objenc->locateEncryptedData($dom);
-        if (!$encData) {
-            throw new ValidationError(
-                "Cannot locate encrypted assertion",
-                ValidationError::MISSING_ENCRYPTED_ELEMENT
-            );
-        }
-
-        $objenc->setNode($encData);
-        $objenc->type = $encData->getAttribute("Type");
-        if (!$objKey = $objenc->locateKey()) {
-            throw new ValidationError(
-                "Unknown algorithm",
-                ValidationError::KEY_ALGORITHM_ERROR
-            );
-        }
-
-        $key = null;
-        if ($objKeyInfo = $objenc->locateKeyInfo($objKey)) {
-            if ($objKeyInfo->isEncrypted) {
-                $objencKey = $objKeyInfo->encryptedCtx;
-                $objKeyInfo->loadKey($pem, false, false);
-                $key = $objencKey->decryptKey($objKeyInfo);
-            } else {
-                // symmetric encryption key support
-                $objKeyInfo->loadKey($pem, false, false);
-            }
-        }
-
-        if (empty($objKey->key)) {
-            $objKey->loadKey($key);
-        }
-
-        $decryptedXML = $objenc->decryptNode($objKey, false);
-        $decrypted = new DOMDocument();
-        $check = Utils::loadXML($decrypted, $decryptedXML);
-        if ($check === false) {
-            throw new Exception('Error: string from decrypted assertion could not be loaded into a XML document');
-        }
-        if ($encData->parentNode instanceof DOMDocument) {
-            return $decrypted;
-        } else {
-            $decrypted = $decrypted->documentElement;
-            $encryptedAssertion = $encData->parentNode;
-            $container = $encryptedAssertion->parentNode;
-
-            // Fix possible issue with saml namespace
-            if (!$decrypted->hasAttributeNS('http://www.w3.org/2000/xmlns/', 'xmlns:saml')
-                && !$decrypted->hasAttributeNS('http://www.w3.org/2000/xmlns/', 'xmlns:saml2')
-                && !$decrypted->hasAttributeNS('http://www.w3.org/2000/xmlns/', 'xmlns')
-                && !$container->hasAttributeNS('http://www.w3.org/2000/xmlns/', 'xmlns:saml')
-                && !$container->hasAttributeNS('http://www.w3.org/2000/xmlns/', 'xmlns:saml2')
-            ) {
-                if (strpos($encryptedAssertion->tagName, 'saml2:') !== false) {
-                    $ns = 'xmlns:saml2';
-                } else if (strpos($encryptedAssertion->tagName, 'saml:') !== false) {
-                    $ns = 'xmlns:saml';
-                } else {
-                    $ns = 'xmlns';
-                }
-                $decrypted->setAttributeNS('http://www.w3.org/2000/xmlns/', $ns, Constants::NS_SAML);
-            }
-
-            Utils::treeCopyReplace($encryptedAssertion, $decrypted);
-
-            // Rebuild the DOM will fix issues with namespaces as well
-            $dom = new DOMDocument();
-            return Utils::loadXML($dom, $container->ownerDocument->saveXML());
-        }
-    }
-
-    /**
-     * After execute a validation process, if fails this method returns the cause
-     *
-     * @return Exception|null Cause
-     */
-    public function getErrorException()
-    {
-        return $this->_error;
-    }
-
-    /**
-     * After execute a validation process, if fails this method returns the cause
-     *
-     * @return null|string Error reason
-     */
-    public function getError()
-    {
-        $errorMsg = null;
-        if (isset($this->_error)) {
-            $errorMsg = htmlentities($this->_error->getMessage());
-        }
-        return $errorMsg;
-    }
-
-    /**
-     * Returns the SAML Response document (If contains an encrypted assertion, decrypts it)
-     *
-     * @return DomDocument SAML Response
-     */
-    public function getXMLDocument()
-    {
-        if ($this->encrypted) {
-            return $this->decryptedDocument;
-        } else {
-            return $this->document;
-        }
-    }
-}
diff --git a/saml/vendor/onelogin/php-saml/src/Saml2/Settings.php b/saml/vendor/onelogin/php-saml/src/Saml2/Settings.php
deleted file mode 100644
index 4d9b3339..00000000
--- a/saml/vendor/onelogin/php-saml/src/Saml2/Settings.php
+++ /dev/null
@@ -1,1166 +0,0 @@
-<?php
-/**
- * This file is part of php-saml.
- *
- * (c) OneLogin Inc
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- *
- * @package OneLogin
- * @author  OneLogin Inc <saml-info@onelogin.com>
- * @license MIT https://github.com/onelogin/php-saml/blob/master/LICENSE
- * @link    https://github.com/onelogin/php-saml
- */
-
-namespace OneLogin\Saml2;
-
-use RobRichards\XMLSecLibs\XMLSecurityKey;
-use RobRichards\XMLSecLibs\XMLSecurityDSig;
-
-use DOMDocument;
-use Exception;
-
-/**
- * Configuration of the OneLogin PHP Toolkit
- */
-class Settings
-{
-    /**
-     * List of paths.
-     *
-     * @var array
-     */
-    private $_paths = array();
-
-    /**
-     * @var string
-     */
-    private $_baseurl;
-
-    /**
-     * Strict. If active, PHP Toolkit will reject unsigned or unencrypted messages
-     * if it expects them signed or encrypted. If not, the messages will be accepted
-     * and some security issues will be also relaxed.
-     *
-     * @var bool
-     */
-    private $_strict = true;
-
-    /**
-     * Activate debug mode
-     *
-     * @var bool
-     */
-    private $_debug = false;
-
-    /**
-     * SP data.
-     *
-     * @var array
-     */
-    private $_sp = array();
-
-    /**
-     * IdP data.
-     *
-     * @var array
-     */
-    private $_idp = array();
-
-    /**
-     * Compression settings that determine
-     * whether gzip compression should be used.
-     *
-     * @var array
-     */
-    private $_compress = array();
-
-    /**
-     * Security Info related to the SP.
-     *
-     * @var array
-     */
-    private $_security = array();
-
-    /**
-     * Setting contacts.
-     *
-     * @var array
-     */
-    private $_contacts = array();
-
-    /**
-     * Setting organization.
-     *
-     * @var array
-     */
-    private $_organization = array();
-
-    /**
-     * Setting errors.
-     *
-     * @var array
-     */
-    private $_errors = array();
-
-    /**
-     * Valitate SP data only flag
-     *
-     * @var bool
-     */
-    private $_spValidationOnly = false;
-
-    /**
-     * Initializes the settings:
-     * - Sets the paths of the different folders
-     * - Loads settings info from settings file or array/object provided
-     *
-     * @param array|null $settings         SAML Toolkit Settings
-     * @param bool       $spValidationOnly Validate or not the IdP data
-     *
-     * @throws Error If any settings parameter is invalid
-     * @throws Exception If Settings is incorrectly supplied
-     */
-    public function __construct(array $settings = null,bool $spValidationOnly = false)
-    {
-        $this->_spValidationOnly = $spValidationOnly;
-        $this->_loadPaths();
-
-        if (!isset($settings)) {
-            if (!$this->_loadSettingsFromFile()) {
-                throw new Error(
-                    'Invalid file settings: %s',
-                    Error::SETTINGS_INVALID,
-                    array(implode(', ', $this->_errors))
-                );
-            }
-            $this->_addDefaultValues();
-        } else {
-            if (!$this->_loadSettingsFromArray($settings)) {
-                throw new Error(
-                    'Invalid array settings: %s',
-                    Error::SETTINGS_INVALID,
-                    array(implode(', ', $this->_errors))
-                );
-            }
-        }
-
-        $this->formatIdPCert();
-        $this->formatSPCert();
-        $this->formatSPKey();
-        $this->formatSPCertNew();
-        $this->formatIdPCertMulti();
-    }
-
-    /**
-     * Sets the paths of the different folders
-     * @suppress PhanUndeclaredConstant
-     */
-    private function _loadPaths()
-    {
-        $basePath = dirname(dirname(__DIR__)) . '/';
-        $this->_paths = array(
-            'base' => $basePath,
-            'config' => $basePath,
-            'cert' => $basePath.'certs/',
-            'lib' => __DIR__ . '/',
-        );
-
-        if (defined('ONELOGIN_CUSTOMPATH')) {
-            $this->_paths['config'] = ONELOGIN_CUSTOMPATH;
-            $this->_paths['cert'] = ONELOGIN_CUSTOMPATH . 'certs/';
-        }
-    }
-
-    /**
-     * Returns base path.
-     *
-     * @return string  The base toolkit folder path
-     */
-    public function getBasePath()
-    {
-        return $this->_paths['base'];
-    }
-
-    /**
-     * Returns cert path.
-     *
-     * @return string The cert folder path
-     */
-    public function getCertPath()
-    {
-        return $this->_paths['cert'];
-    }
-
-    /**
-     * Returns config path.
-     *
-     * @return string The config folder path
-     */
-    public function getConfigPath()
-    {
-        return $this->_paths['config'];
-    }
-
-    /**
-     * Returns lib path.
-     *
-     * @return string The library folder path
-     */
-    public function getLibPath()
-    {
-        return $this->_paths['lib'];
-    }
-
-    /**
-     * Returns schema path.
-     *
-     * @return string  The external library folder path
-     */
-    public function getSchemasPath()
-    {
-        if (isset($this->_paths['schemas'])) {
-            return $this->_paths['schemas'];
-        }
-        return __DIR__ . '/schemas/';
-    }
-
-    /**
-     * Set schemas path
-     *
-     * @param string $path
-     * @return $this
-     */
-    public function setSchemasPath($path)
-    {
-        $this->_paths['schemas'] = $path;
-    }
-
-    /**
-     * Loads settings info from a settings Array
-     *
-     * @param array $settings SAML Toolkit Settings
-     *
-     * @return bool True if the settings info is valid
-     */
-    private function _loadSettingsFromArray(array $settings)
-    {
-        if (isset($settings['sp'])) {
-            $this->_sp = $settings['sp'];
-        }
-        if (isset($settings['idp'])) {
-            $this->_idp = $settings['idp'];
-        }
-
-        $errors = $this->checkSettings($settings);
-        if (empty($errors)) {
-            $this->_errors = array();
-
-            if (isset($settings['strict'])) {
-                $this->_strict = $settings['strict'];
-            }
-            if (isset($settings['debug'])) {
-                $this->_debug = $settings['debug'];
-            }
-
-            if (isset($settings['baseurl'])) {
-                $this->_baseurl = $settings['baseurl'];
-            }
-
-            if (isset($settings['compress'])) {
-                $this->_compress = $settings['compress'];
-            }
-
-            if (isset($settings['security'])) {
-                $this->_security = $settings['security'];
-            }
-
-            if (isset($settings['contactPerson'])) {
-                $this->_contacts = $settings['contactPerson'];
-            }
-
-            if (isset($settings['organization'])) {
-                $this->_organization = $settings['organization'];
-            }
-
-            $this->_addDefaultValues();
-            return true;
-        } else {
-            $this->_errors = $errors;
-            return false;
-        }
-    }
-
-    /**
-     * Loads settings info from the settings file
-     *
-     * @return bool True if the settings info is valid
-     *
-     * @throws Error
-     *
-     * @suppress PhanUndeclaredVariable
-     */
-    private function _loadSettingsFromFile()
-    {
-        $filename = $this->getConfigPath().'settings.php';
-
-        if (!file_exists($filename)) {
-            throw new Error(
-                'Settings file not found: %s',
-                Error::SETTINGS_FILE_NOT_FOUND,
-                array($filename)
-            );
-        }
-
-        /** @var array $settings */
-        include $filename;
-
-        // Add advance_settings if exists
-        $advancedFilename = $this->getConfigPath().'advanced_settings.php';
-
-        if (file_exists($advancedFilename)) {
-            /** @var array $advancedSettings */
-            include $advancedFilename;
-            $settings = array_merge($settings, $advancedSettings);
-        }
-
-
-        return $this->_loadSettingsFromArray($settings);
-    }
-
-    /**
-     * Add default values if the settings info is not complete
-     */
-    private function _addDefaultValues()
-    {
-        if (!isset($this->_sp['assertionConsumerService']['binding'])) {
-            $this->_sp['assertionConsumerService']['binding'] = Constants::BINDING_HTTP_POST;
-        }
-        if (isset($this->_sp['singleLogoutService']) && !isset($this->_sp['singleLogoutService']['binding'])) {
-            $this->_sp['singleLogoutService']['binding'] = Constants::BINDING_HTTP_REDIRECT;
-        }
-
-        if (!isset($this->_compress['requests'])) {
-            $this->_compress['requests'] = true;
-        }
-
-        if (!isset($this->_compress['responses'])) {
-            $this->_compress['responses'] = true;
-        }
-
-        // Related to nameID
-        if (!isset($this->_sp['NameIDFormat'])) {
-            $this->_sp['NameIDFormat'] = Constants::NAMEID_UNSPECIFIED;
-        }
-        if (!isset($this->_security['nameIdEncrypted'])) {
-            $this->_security['nameIdEncrypted'] = false;
-        }
-        if (!isset($this->_security['requestedAuthnContext'])) {
-            $this->_security['requestedAuthnContext'] = true;
-        }
-
-        // sign provided
-        if (!isset($this->_security['authnRequestsSigned'])) {
-            $this->_security['authnRequestsSigned'] = false;
-        }
-        if (!isset($this->_security['logoutRequestSigned'])) {
-            $this->_security['logoutRequestSigned'] = false;
-        }
-        if (!isset($this->_security['logoutResponseSigned'])) {
-            $this->_security['logoutResponseSigned'] = false;
-        }
-        if (!isset($this->_security['signMetadata'])) {
-            $this->_security['signMetadata'] = false;
-        }
-
-        // sign expected
-        if (!isset($this->_security['wantMessagesSigned'])) {
-            $this->_security['wantMessagesSigned'] = false;
-        }
-        if (!isset($this->_security['wantAssertionsSigned'])) {
-            $this->_security['wantAssertionsSigned'] = false;
-        }
-
-        // NameID element expected
-        if (!isset($this->_security['wantNameId'])) {
-            $this->_security['wantNameId'] = true;
-        }
-
-        // Relax Destination validation
-        if (!isset($this->_security['relaxDestinationValidation'])) {
-            $this->_security['relaxDestinationValidation'] = false;
-        }
-
-        // Strict Destination match validation
-        if (!isset($this->_security['destinationStrictlyMatches'])) {
-            $this->_security['destinationStrictlyMatches'] = false;
-        }
-
-        // Allow duplicated Attribute Names
-        if (!isset($this->_security['allowRepeatAttributeName'])) {
-            $this->_security['allowRepeatAttributeName'] = false;
-        }
-
-        // InResponseTo
-        if (!isset($this->_security['rejectUnsolicitedResponsesWithInResponseTo'])) {
-            $this->_security['rejectUnsolicitedResponsesWithInResponseTo'] = false;
-        }
-
-        // encrypt expected
-        if (!isset($this->_security['wantAssertionsEncrypted'])) {
-            $this->_security['wantAssertionsEncrypted'] = false;
-        }
-        if (!isset($this->_security['wantNameIdEncrypted'])) {
-            $this->_security['wantNameIdEncrypted'] = false;
-        }
-
-        // XML validation
-        if (!isset($this->_security['wantXMLValidation'])) {
-            $this->_security['wantXMLValidation'] = true;
-        }
-
-        // SignatureAlgorithm
-        if (!isset($this->_security['signatureAlgorithm'])) {
-            $this->_security['signatureAlgorithm'] = XMLSecurityKey::RSA_SHA256;
-        }
-
-        // DigestAlgorithm
-        if (!isset($this->_security['digestAlgorithm'])) {
-            $this->_security['digestAlgorithm'] = XMLSecurityDSig::SHA256;
-        }
-
-        // EncryptionAlgorithm
-        if (!isset($this->_security['encryption_algorithm'])) {
-            $this->_security['encryption_algorithm'] = XMLSecurityKey::AES128_CBC;
-        }
-
-        if (!isset($this->_security['lowercaseUrlencoding'])) {
-            $this->_security['lowercaseUrlencoding'] = false;
-        }
-
-        // Certificates / Private key /Fingerprint
-        if (!isset($this->_idp['x509cert'])) {
-            $this->_idp['x509cert'] = '';
-        }
-        if (!isset($this->_idp['certFingerprint'])) {
-            $this->_idp['certFingerprint'] = '';
-        }
-        if (!isset($this->_idp['certFingerprintAlgorithm'])) {
-            $this->_idp['certFingerprintAlgorithm'] = 'sha1';
-        }
-
-        if (!isset($this->_sp['x509cert'])) {
-            $this->_sp['x509cert'] = '';
-        }
-        if (!isset($this->_sp['privateKey'])) {
-            $this->_sp['privateKey'] = '';
-        }
-    }
-
-    /**
-     * Checks the settings info.
-     *
-     * @param array $settings Array with settings data
-     *
-     * @return array $errors  Errors found on the settings data
-     */
-    public function checkSettings(array $settings)
-    {
-        if (empty($settings)) {
-            $errors = array('invalid_syntax');
-        } else {
-            $errors = array();
-            if (!$this->_spValidationOnly) {
-                $idpErrors = $this->checkIdPSettings($settings);
-                $errors = array_merge($idpErrors, $errors);
-            }
-            $spErrors = $this->checkSPSettings($settings);
-            $errors = array_merge($spErrors, $errors);
-
-            $compressErrors = $this->checkCompressionSettings($settings);
-            $errors = array_merge($compressErrors, $errors);
-        }
-
-        return $errors;
-    }
-
-    /**
-     * Checks the compression settings info.
-     *
-     * @param array $settings Array with settings data
-     *
-     * @return array $errors  Errors found on the settings data
-     */
-    public function checkCompressionSettings($settings)
-    {
-        $errors = array();
-
-        if (isset($settings['compress'])) {
-            if (!is_array($settings['compress'])) {
-                $errors[] = "invalid_syntax";
-            } else if (isset($settings['compress']['requests'])
-                && $settings['compress']['requests'] !== true
-                && $settings['compress']['requests'] !== false
-            ) {
-                $errors[] = "'compress'=>'requests' values must be true or false.";
-            } else if (isset($settings['compress']['responses'])
-                && $settings['compress']['responses'] !== true
-                && $settings['compress']['responses'] !== false
-            ) {
-                $errors[] = "'compress'=>'responses' values must be true or false.";
-            }
-        }
-        return $errors;
-    }
-
-    /**
-     * Checks the IdP settings info.
-     *
-     * @param array $settings Array with settings data
-     *
-     * @return array $errors  Errors found on the IdP settings data
-     */
-    public function checkIdPSettings(array $settings)
-    {
-        if (empty($settings)) {
-            return array('invalid_syntax');
-        }
-
-        $errors = array();
-
-        if (!isset($settings['idp']) || empty($settings['idp'])) {
-            $errors[] = 'idp_not_found';
-        } else {
-            $idp = $settings['idp'];
-            if (!isset($idp['entityId']) || empty($idp['entityId'])) {
-                $errors[] = 'idp_entityId_not_found';
-            }
-
-            if (!isset($idp['singleSignOnService'])
-                || !isset($idp['singleSignOnService']['url'])
-                || empty($idp['singleSignOnService']['url'])
-            ) {
-                $errors[] = 'idp_sso_not_found';
-            } else if (!filter_var($idp['singleSignOnService']['url'], FILTER_VALIDATE_URL)) {
-                $errors[] = 'idp_sso_url_invalid';
-            }
-
-            if (isset($idp['singleLogoutService'])
-                && isset($idp['singleLogoutService']['url'])
-                && !empty($idp['singleLogoutService']['url'])
-                && !filter_var($idp['singleLogoutService']['url'], FILTER_VALIDATE_URL)
-            ) {
-                $errors[] = 'idp_slo_url_invalid';
-            }
-
-            if (isset($idp['singleLogoutService'])
-                && isset($idp['singleLogoutService']['responseUrl'])
-                && !empty($idp['singleLogoutService']['responseUrl'])
-                && !filter_var($idp['singleLogoutService']['responseUrl'], FILTER_VALIDATE_URL)
-            ) {
-                $errors[] = 'idp_slo_response_url_invalid';
-            }
-
-            $existsX509 = isset($idp['x509cert']) && !empty($idp['x509cert']);
-            $existsMultiX509Sign = isset($idp['x509certMulti']) && isset($idp['x509certMulti']['signing']) && !empty($idp['x509certMulti']['signing']);
-            $existsFingerprint = isset($idp['certFingerprint']) && !empty($idp['certFingerprint']);
-            if (!($existsX509 || $existsFingerprint || $existsMultiX509Sign)
-            ) {
-                $errors[] = 'idp_cert_or_fingerprint_not_found_and_required';
-            }
-
-            if (isset($settings['security'])) {
-                $existsMultiX509Enc = isset($idp['x509certMulti']) && isset($idp['x509certMulti']['encryption']) && !empty($idp['x509certMulti']['encryption']);
-
-                if ((isset($settings['security']['nameIdEncrypted']) && $settings['security']['nameIdEncrypted'] == true)
-                    && !($existsX509 || $existsMultiX509Enc)
-                ) {
-                    $errors[] = 'idp_cert_not_found_and_required';
-                }
-            }
-        }
-
-        return $errors;
-    }
-
-    /**
-     * Checks the SP settings info.
-     *
-     * @param array $settings Array with settings data
-     *
-     * @return array $errors  Errors found on the SP settings data
-     */
-    public function checkSPSettings(array $settings)
-    {
-        if (empty($settings)) {
-            return array('invalid_syntax');
-        }
-
-        $errors = array();
-
-        if (!isset($settings['sp']) || empty($settings['sp'])) {
-            $errors[] = 'sp_not_found';
-        } else {
-            $sp = $settings['sp'];
-            $security = array();
-            if (isset($settings['security'])) {
-                $security = $settings['security'];
-            }
-
-            if (!isset($sp['entityId']) || empty($sp['entityId'])) {
-                $errors[] = 'sp_entityId_not_found';
-            }
-
-            if (!isset($sp['assertionConsumerService'])
-                || !isset($sp['assertionConsumerService']['url'])
-                || empty($sp['assertionConsumerService']['url'])
-            ) {
-                $errors[] = 'sp_acs_not_found';
-            } else if (!filter_var($sp['assertionConsumerService']['url'], FILTER_VALIDATE_URL)) {
-                $errors[] = 'sp_acs_url_invalid';
-            }
-
-            if (isset($sp['singleLogoutService'])
-                && isset($sp['singleLogoutService']['url'])
-                && !filter_var($sp['singleLogoutService']['url'], FILTER_VALIDATE_URL)
-            ) {
-                $errors[] = 'sp_sls_url_invalid';
-            }
-
-            if (isset($security['signMetadata']) && is_array($security['signMetadata'])) {
-                if ((!isset($security['signMetadata']['keyFileName'])
-                    || !isset($security['signMetadata']['certFileName'])) &&
-                    (!isset($security['signMetadata']['privateKey'])
-                    || !isset($security['signMetadata']['x509cert']))
-                ) {
-                    $errors[] = 'sp_signMetadata_invalid';
-                }
-            }
-
-            if (((isset($security['authnRequestsSigned']) && $security['authnRequestsSigned'] == true)
-                || (isset($security['logoutRequestSigned']) && $security['logoutRequestSigned'] == true)
-                || (isset($security['logoutResponseSigned']) && $security['logoutResponseSigned'] == true)
-                || (isset($security['wantAssertionsEncrypted']) && $security['wantAssertionsEncrypted'] == true)
-                || (isset($security['wantNameIdEncrypted']) && $security['wantNameIdEncrypted'] == true))
-                && !$this->checkSPCerts()
-            ) {
-                $errors[] = 'sp_certs_not_found_and_required';
-            }
-        }
-
-        if (isset($settings['contactPerson'])) {
-            $types = array_keys($settings['contactPerson']);
-            $validTypes = array('technical', 'support', 'administrative', 'billing', 'other');
-            foreach ($types as $type) {
-                if (!in_array($type, $validTypes)) {
-                    $errors[] = 'contact_type_invalid';
-                    break;
-                }
-            }
-
-            foreach ($settings['contactPerson'] as $type => $contact) {
-                if (!isset($contact['givenName']) || empty($contact['givenName'])
-                    || !isset($contact['emailAddress']) || empty($contact['emailAddress'])
-                ) {
-                    $errors[] = 'contact_not_enought_data';
-                    break;
-                }
-            }
-        }
-
-        if (isset($settings['organization'])) {
-            foreach ($settings['organization'] as $organization) {
-                if (!isset($organization['name']) || empty($organization['name'])
-                    || !isset($organization['displayname']) || empty($organization['displayname'])
-                    || !isset($organization['url']) || empty($organization['url'])
-                ) {
-                    $errors[] = 'organization_not_enought_data';
-                    break;
-                }
-            }
-        }
-
-        return $errors;
-    }
-
-    /**
-     * Checks if the x509 certs of the SP exists and are valid.
-     *
-     * @return bool
-     */
-    public function checkSPCerts()
-    {
-        $key = $this->getSPkey();
-        $cert = $this->getSPcert();
-        return (!empty($key) && !empty($cert));
-    }
-
-    /**
-     * Returns the x509 private key of the SP.
-     *
-     * @return string SP private key
-     */
-    public function getSPkey()
-    {
-        $key = null;
-        if (isset($this->_sp['privateKey']) && !empty($this->_sp['privateKey'])) {
-            $key = $this->_sp['privateKey'];
-        } else {
-            $keyFile = $this->_paths['cert'].'sp.key';
-
-            if (file_exists($keyFile)) {
-                $key = file_get_contents($keyFile);
-            }
-        }
-        return $key;
-    }
-
-    /**
-     * Returns the x509 public cert of the SP.
-     *
-     * @return string SP public cert
-     */
-    public function getSPcert()
-    {
-        $cert = null;
-
-        if (isset($this->_sp['x509cert']) && !empty($this->_sp['x509cert'])) {
-            $cert = $this->_sp['x509cert'];
-        } else {
-            $certFile = $this->_paths['cert'].'sp.crt';
-
-            if (file_exists($certFile)) {
-                $cert = file_get_contents($certFile);
-            }
-        }
-        return $cert;
-    }
-
-    /**
-     * Returns the x509 public of the SP that is
-     * planed to be used soon instead the other
-     * public cert
-     *
-     * @return string SP public cert New
-     */
-    public function getSPcertNew()
-    {
-        $cert = null;
-
-        if (isset($this->_sp['x509certNew']) && !empty($this->_sp['x509certNew'])) {
-            $cert = $this->_sp['x509certNew'];
-        } else {
-            $certFile = $this->_paths['cert'].'sp_new.crt';
-
-            if (file_exists($certFile)) {
-                $cert = file_get_contents($certFile);
-            }
-        }
-        return $cert;
-    }
-
-    /**
-     * Gets the IdP data.
-     *
-     * @return array  IdP info
-     */
-    public function getIdPData()
-    {
-        return $this->_idp;
-    }
-
-    /**
-     * Gets the SP data.
-     *
-     * @return array  SP info
-     */
-    public function getSPData()
-    {
-        return $this->_sp;
-    }
-
-    /**
-     * Gets security data.
-     *
-     * @return array  SP info
-     */
-    public function getSecurityData()
-    {
-        return $this->_security;
-    }
-
-    /**
-     * Gets contact data.
-     *
-     * @return array  SP info
-     */
-    public function getContacts()
-    {
-        return $this->_contacts;
-    }
-
-    /**
-     * Gets organization data.
-     *
-     * @return array  SP info
-     */
-    public function getOrganization()
-    {
-        return $this->_organization;
-    }
-
-    /**
-     * Should SAML requests be compressed?
-     *
-     * @return bool Yes/No as True/False
-     */
-    public function shouldCompressRequests()
-    {
-        return $this->_compress['requests'];
-    }
-
-    /**
-     * Should SAML responses be compressed?
-     *
-     * @return bool Yes/No as True/False
-     */
-    public function shouldCompressResponses()
-    {
-        return $this->_compress['responses'];
-    }
-
-    /**
-     * Gets the IdP SSO url.
-     *
-     * @return string|null The url of the IdP Single Sign On Service
-     */
-    public function getIdPSSOUrl()
-    {
-        $ssoUrl = null;
-        if (isset($this->_idp['singleSignOnService']) && isset($this->_idp['singleSignOnService']['url'])) {
-            $ssoUrl = $this->_idp['singleSignOnService']['url'];
-        }
-        return $ssoUrl;
-    }
-
-    /**
-     * Gets the IdP SLO url.
-     *
-     * @return string|null The request url of the IdP Single Logout Service
-     */
-    public function getIdPSLOUrl()
-    {
-        $sloUrl = null;
-        if (isset($this->_idp['singleLogoutService']) && isset($this->_idp['singleLogoutService']['url'])) {
-            $sloUrl = $this->_idp['singleLogoutService']['url'];
-        }
-        return $sloUrl;
-    }
-
-    /**
-     * Gets the IdP SLO response url.
-     *
-     * @return string|null The response url of the IdP Single Logout Service
-     */
-    public function getIdPSLOResponseUrl()
-    {
-        if (isset($this->_idp['singleLogoutService']) && isset($this->_idp['singleLogoutService']['responseUrl'])) {
-            return $this->_idp['singleLogoutService']['responseUrl'];
-        }
-        return $this->getIdPSLOUrl();
-    }
-
-    /**
-     * Gets the SP metadata. The XML representation.
-     *
-     * @param bool $alwaysPublishEncryptionCert When 'true', the returned
-     * metadata will always include an 'encryption' KeyDescriptor. Otherwise,
-     * the 'encryption' KeyDescriptor will only be included if
-     * $advancedSettings['security']['wantNameIdEncrypted'] or
-     * $advancedSettings['security']['wantAssertionsEncrypted'] are enabled.
-     * @param int|null      $validUntil    Metadata's valid time
-     * @param int|null      $cacheDuration Duration of the cache in seconds
-     *
-     * @return string  SP metadata (xml)
-     * @throws Exception
-     * @throws Error
-     */
-    public function getSPMetadata($alwaysPublishEncryptionCert = false, $validUntil = null, $cacheDuration = null)
-    {
-        $metadata = Metadata::builder($this->_sp, $this->_security['authnRequestsSigned'], $this->_security['wantAssertionsSigned'], $validUntil, $cacheDuration, $this->getContacts(), $this->getOrganization());
-
-        $certNew = $this->getSPcertNew();
-        if (!empty($certNew)) {
-            $metadata = Metadata::addX509KeyDescriptors(
-                $metadata,
-                $certNew,
-                $alwaysPublishEncryptionCert || $this->_security['wantNameIdEncrypted'] || $this->_security['wantAssertionsEncrypted']
-            );
-        }
-
-        $cert = $this->getSPcert();
-        if (!empty($cert)) {
-            $metadata = Metadata::addX509KeyDescriptors(
-                $metadata,
-                $cert,
-                $alwaysPublishEncryptionCert || $this->_security['wantNameIdEncrypted'] || $this->_security['wantAssertionsEncrypted']
-            );
-        }
-
-        //Sign Metadata
-        if (isset($this->_security['signMetadata']) && $this->_security['signMetadata'] != false) {
-            if ($this->_security['signMetadata'] === true) {
-                $keyMetadata = $this->getSPkey();
-                $certMetadata = $cert;
-
-                if (!$keyMetadata) {
-                    throw new Error(
-                        'SP Private key not found.',
-                        Error::PRIVATE_KEY_FILE_NOT_FOUND
-                    );
-                }
-
-                if (!$certMetadata) {
-                    throw new Error(
-                        'SP Public cert not found.',
-                        Error::PUBLIC_CERT_FILE_NOT_FOUND
-                    );
-                }
-            } else if (isset($this->_security['signMetadata']['keyFileName']) &&
-                isset($this->_security['signMetadata']['certFileName'])) {
-                $keyFileName = $this->_security['signMetadata']['keyFileName'];
-                $certFileName = $this->_security['signMetadata']['certFileName'];
-
-                $keyMetadataFile = $this->_paths['cert'].$keyFileName;
-                $certMetadataFile = $this->_paths['cert'].$certFileName;
-
-                if (!file_exists($keyMetadataFile)) {
-                    throw new Error(
-                        'SP Private key file not found: %s',
-                        Error::PRIVATE_KEY_FILE_NOT_FOUND,
-                        array($keyMetadataFile)
-                    );
-                }
-
-                if (!file_exists($certMetadataFile)) {
-                    throw new Error(
-                        'SP Public cert file not found: %s',
-                        Error::PUBLIC_CERT_FILE_NOT_FOUND,
-                        array($certMetadataFile)
-                    );
-                }
-                $keyMetadata = file_get_contents($keyMetadataFile);
-                $certMetadata = file_get_contents($certMetadataFile);
-            } else if (isset($this->_security['signMetadata']['privateKey']) &&
-                isset($this->_security['signMetadata']['x509cert'])) {
-                $keyMetadata = Utils::formatPrivateKey($this->_security['signMetadata']['privateKey']);
-                $certMetadata = Utils::formatCert($this->_security['signMetadata']['x509cert']);
-                if (!$keyMetadata) {
-                    throw new Error(
-                        'Private key not found.',
-                        Error::PRIVATE_KEY_FILE_NOT_FOUND
-                    );
-                }
-
-                if (!$certMetadata) {
-                    throw new Error(
-                        'Public cert not found.',
-                        Error::PUBLIC_CERT_FILE_NOT_FOUND
-                    );
-                }
-            } else {
-                throw new Error(
-                    'Invalid Setting: signMetadata value of the sp is not valid',
-                    Error::SETTINGS_INVALID_SYNTAX
-                );
-
-            }
-
-            $signatureAlgorithm = $this->_security['signatureAlgorithm'];
-            $digestAlgorithm = $this->_security['digestAlgorithm'];
-            $metadata = Metadata::signMetadata($metadata, $keyMetadata, $certMetadata, $signatureAlgorithm, $digestAlgorithm);
-        }
-        return $metadata;
-    }
-
-    /**
-     * Validates an XML SP Metadata.
-     *
-     * @param string $xml Metadata's XML that will be validate
-     *
-     * @return array The list of found errors
-     *
-     * @throws Exception
-     */
-    public function validateMetadata($xml)
-    {
-        assert(is_string($xml));
-
-        $errors = array();
-        $res = Utils::validateXML($xml, 'saml-schema-metadata-2.0.xsd', $this->_debug, $this->getSchemasPath());
-        if (!$res instanceof DOMDocument) {
-            $errors[] = $res;
-        } else {
-            $dom = $res;
-            $element = $dom->documentElement;
-            if ($element->tagName !== 'md:EntityDescriptor') {
-                $errors[] = 'noEntityDescriptor_xml';
-            } else {
-                $validUntil = $cacheDuration = $expireTime = null;
-
-                if ($element->hasAttribute('validUntil')) {
-                    $validUntil = Utils::parseSAML2Time($element->getAttribute('validUntil'));
-                }
-                if ($element->hasAttribute('cacheDuration')) {
-                    $cacheDuration = $element->getAttribute('cacheDuration');
-                }
-
-                $expireTime = Utils::getExpireTime($cacheDuration, $validUntil);
-                if (isset($expireTime) && time() > $expireTime) {
-                    $errors[] = 'expired_xml';
-                }
-            }
-        }
-
-        // TODO: Support Metadata Sign Validation
-
-        return $errors;
-    }
-
-    /**
-     * Formats the IdP cert.
-     */
-    public function formatIdPCert()
-    {
-        if (isset($this->_idp['x509cert'])) {
-            $this->_idp['x509cert'] = Utils::formatCert($this->_idp['x509cert']);
-        }
-    }
-
-    /**
-     * Formats the Multple IdP certs.
-     */
-    public function formatIdPCertMulti()
-    {
-        if (isset($this->_idp['x509certMulti'])) {
-            if (isset($this->_idp['x509certMulti']['signing'])) {
-                foreach ($this->_idp['x509certMulti']['signing'] as $i => $cert) {
-                    $this->_idp['x509certMulti']['signing'][$i] = Utils::formatCert($cert);
-                }
-            }
-            if (isset($this->_idp['x509certMulti']['encryption'])) {
-                foreach ($this->_idp['x509certMulti']['encryption'] as $i => $cert) {
-                    $this->_idp['x509certMulti']['encryption'][$i] = Utils::formatCert($cert);
-                }
-            }
-        }
-    }
-
-    /**
-     * Formats the SP cert.
-     */
-    public function formatSPCert()
-    {
-        if (isset($this->_sp['x509cert'])) {
-            $this->_sp['x509cert'] = Utils::formatCert($this->_sp['x509cert']);
-        }
-    }
-
-    /**
-     * Formats the SP cert.
-     */
-    public function formatSPCertNew()
-    {
-        if (isset($this->_sp['x509certNew'])) {
-            $this->_sp['x509certNew'] = Utils::formatCert($this->_sp['x509certNew']);
-        }
-    }
-
-    /**
-     * Formats the SP private key.
-     */
-    public function formatSPKey()
-    {
-        if (isset($this->_sp['privateKey'])) {
-            $this->_sp['privateKey'] = Utils::formatPrivateKey($this->_sp['privateKey']);
-        }
-    }
-
-    /**
-     * Returns an array with the errors, the array is empty when the settings is ok.
-     *
-     * @return array Errors
-     */
-    public function getErrors()
-    {
-        return $this->_errors;
-    }
-
-    /**
-     * Activates or deactivates the strict mode.
-     *
-     * @param bool $value Strict parameter
-     *
-     * @throws Exception
-     */
-    public function setStrict($value)
-    {
-        if (!is_bool($value)) {
-            throw new Exception('Invalid value passed to setStrict()');
-        }
-
-        $this->_strict = $value;
-    }
-
-    /**
-     * Returns if the 'strict' mode is active.
-     *
-     * @return bool Strict parameter
-     */
-    public function isStrict()
-    {
-        return $this->_strict;
-    }
-
-    /**
-     * Returns if the debug is active.
-     *
-     * @return bool Debug parameter
-     */
-    public function isDebugActive()
-    {
-        return $this->_debug;
-    }
-
-    /**
-     * Set a baseurl value.
-     *
-     * @param string $baseurl Base URL.
-     */
-    public function setBaseURL($baseurl)
-    {
-        $this->_baseurl = $baseurl;
-    }
-
-    /**
-     * Returns the baseurl set on the settings if any.
-     *
-     * @return null|string The baseurl
-     */
-    public function getBaseURL()
-    {
-        return $this->_baseurl;
-    }
-
-    /**
-     * Sets the IdP certificate.
-     *
-     * @param string $cert IdP certificate
-     */
-    public function setIdPCert($cert)
-    {
-        $this->_idp['x509cert'] = $cert;
-        $this->formatIdPCert();
-    }
-}
diff --git a/saml/vendor/onelogin/php-saml/src/Saml2/Utils.php b/saml/vendor/onelogin/php-saml/src/Saml2/Utils.php
deleted file mode 100644
index c6e912c4..00000000
--- a/saml/vendor/onelogin/php-saml/src/Saml2/Utils.php
+++ /dev/null
@@ -1,1602 +0,0 @@
-<?php
-/**
- * This file is part of php-saml.
- *
- * (c) OneLogin Inc
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- *
- * @package OneLogin
- * @author  OneLogin Inc <saml-info@onelogin.com>
- * @license MIT https://github.com/onelogin/php-saml/blob/master/LICENSE
- * @link    https://github.com/onelogin/php-saml
- */
-
-namespace OneLogin\Saml2;
-
-use RobRichards\XMLSecLibs\XMLSecurityKey;
-use RobRichards\XMLSecLibs\XMLSecurityDSig;
-use RobRichards\XMLSecLibs\XMLSecEnc;
-
-use DOMDocument;
-use DOMElement;
-use DOMNodeList;
-use DomNode;
-use DOMXPath;
-use Exception;
-
-/**
- * Utils of OneLogin PHP Toolkit
- *
- * Defines several often used methods
- */
-class Utils
-{
-    const RESPONSE_SIGNATURE_XPATH = "/samlp:Response/ds:Signature";
-    const ASSERTION_SIGNATURE_XPATH = "/samlp:Response/saml:Assertion/ds:Signature";
-
-    /**
-     * @var bool Control if the `Forwarded-For-*` headers are used
-     */
-    private static $_proxyVars = false;
-
-    /**
-     * @var string|null
-     */
-    private static $_host;
-
-    /**
-     * @var string|null
-     */
-    private static $_protocol;
-
-    /**
-     * @var string
-     */
-    private static $_protocolRegex = '@^https?://@i';
-
-    /**
-     * @var int|null
-     */
-    private static $_port;
-
-    /**
-     * @var string|null
-     */
-    private static $_baseurlpath;
-
-    /**
-     * This function load an XML string in a save way.
-     * Prevent XEE/XXE Attacks
-     *
-     * @param DOMDocument $dom The document where load the xml.
-     * @param string      $xml The XML string to be loaded.
-     *
-     * @return DOMDocument|false $dom The result of load the XML at the DOMDocument
-     *
-     * @throws Exception
-     */
-    public static function loadXML(DOMDocument $dom, $xml)
-    {
-        assert($dom instanceof DOMDocument);
-        assert(is_string($xml));
-
-        $oldEntityLoader = null;
-        if (PHP_VERSION_ID < 80000) {
-            $oldEntityLoader = libxml_disable_entity_loader(true);
-        }
-
-        $res = $dom->loadXML($xml);
-
-        if (PHP_VERSION_ID < 80000) {
-            libxml_disable_entity_loader($oldEntityLoader);
-        }
-
-        foreach ($dom->childNodes as $child) {
-            if ($child->nodeType === XML_DOCUMENT_TYPE_NODE) {
-                throw new Exception(
-                    'Detected use of DOCTYPE/ENTITY in XML, disabled to prevent XXE/XEE attacks'
-                );
-            }
-        }
-
-        if (!$res) {
-            return false;
-        } else {
-            return $dom;
-        }
-    }
-
-    /**
-     * This function attempts to validate an XML string against the specified schema.
-     *
-     * It will parse the string into a DOMDocument and validate this document against the schema.
-     *
-     * @param string|DOMDocument $xml    The XML string or document which should be validated.
-     * @param string             $schema The schema filename which should be used.
-     * @param bool               $debug  To disable/enable the debug mode
-     * @param string             $schemaPath Change schema path
-     *
-     * @return string|DOMDocument $dom  string that explains the problem or the DOMDocument
-     *
-     * @throws Exception
-     */
-    public static function validateXML($xml, $schema, $debug = false, $schemaPath = null)
-    {
-        assert(is_string($xml) || $xml instanceof DOMDocument);
-        assert(is_string($schema));
-
-        libxml_clear_errors();
-        libxml_use_internal_errors(true);
-
-        if ($xml instanceof DOMDocument) {
-            $dom = $xml;
-        } else {
-            $dom = new DOMDocument;
-            $dom = self::loadXML($dom, $xml);
-            if (!$dom) {
-                return 'unloaded_xml';
-            }
-        }
-
-        if (isset($schemaPath)) {
-            $schemaFile = $schemaPath . $schema;
-        } else {
-            $schemaFile = __DIR__ . '/schemas/' . $schema;
-        }
-
-        $oldEntityLoader = null;
-        if (PHP_VERSION_ID < 80000) {
-            $oldEntityLoader = libxml_disable_entity_loader(false);
-        }
-        $res = $dom->schemaValidate($schemaFile);
-        if (PHP_VERSION_ID < 80000) {
-            libxml_disable_entity_loader($oldEntityLoader);
-        }
-        if (!$res) {
-            $xmlErrors = libxml_get_errors();
-            syslog(LOG_INFO, 'Error validating the metadata: '.var_export($xmlErrors, true));
-
-            if ($debug) {
-                foreach ($xmlErrors as $error) {
-                    echo htmlentities($error->message)."\n";
-                }
-            }
-            return 'invalid_xml';
-        }
-
-        return $dom;
-    }
-
-    /**
-     * Import a node tree into a target document
-     * Copy it before a reference node as a sibling
-     * and at the end of the copy remove
-     * the reference node in the target document
-     * As it were 'replacing' it
-     * Leaving nested default namespaces alone
-     * (Standard importNode with deep copy
-     *  mangles nested default namespaces)
-     *
-     * The reference node must not be a DomDocument
-     * It CAN be the top element of a document
-     * Returns the copied node in the target document
-     *
-     * @param DomNode $targetNode
-     * @param DomNode $sourceNode
-     * @param bool $recurse
-     * @return DOMNode
-     * @throws Exception
-     */
-    public static function treeCopyReplace(DomNode $targetNode, DomNode $sourceNode, $recurse = false)
-    {
-        if ($targetNode->parentNode === null) {
-            throw new Exception('Illegal argument targetNode. It has no parentNode.');
-        }
-        $clonedNode = $targetNode->ownerDocument->importNode($sourceNode, false);
-        if ($recurse) {
-            $resultNode = $targetNode->appendChild($clonedNode);
-        } else {
-            $resultNode = $targetNode->parentNode->insertBefore($clonedNode, $targetNode);
-        }
-        if ($sourceNode->childNodes !== null) {
-            foreach ($sourceNode->childNodes as $child) {
-                self::treeCopyReplace($resultNode, $child, true);
-            }
-        }
-        if (!$recurse) {
-            $targetNode->parentNode->removeChild($targetNode);
-        }
-        return $resultNode;
-    }
-
-    /**
-     * Returns a x509 cert (adding header & footer if required).
-     *
-     * @param string $cert  A x509 unformated cert
-     * @param bool   $heads True if we want to include head and footer
-     *
-     * @return string $x509 Formatted cert
-     */
-    public static function formatCert($cert, $heads = true)
-    {
-        if (is_null($cert)) {
-          return;
-        }
-
-        $x509cert = str_replace(array("\x0D", "\r", "\n"), "", $cert);
-        if (!empty($x509cert)) {
-            $x509cert = str_replace('-----BEGIN CERTIFICATE-----', "", $x509cert);
-            $x509cert = str_replace('-----END CERTIFICATE-----', "", $x509cert);
-            $x509cert = str_replace(' ', '', $x509cert);
-
-            if ($heads) {
-                $x509cert = "-----BEGIN CERTIFICATE-----\n".chunk_split($x509cert, 64, "\n")."-----END CERTIFICATE-----\n";
-            }
-
-        }
-        return $x509cert;
-    }
-
-    /**
-     * Returns a private key (adding header & footer if required).
-     *
-     * @param string $key   A private key
-     * @param bool   $heads True if we want to include head and footer
-     *
-     * @return string $rsaKey Formatted private key
-     */
-    public static function formatPrivateKey($key, $heads = true)
-    {
-        if (is_null($key)) {
-          return;
-        }
-
-        $key = str_replace(array("\x0D", "\r", "\n"), "", $key);
-        if (!empty($key)) {
-            if (strpos($key, '-----BEGIN PRIVATE KEY-----') !== false) {
-                $key = Utils::getStringBetween($key, '-----BEGIN PRIVATE KEY-----', '-----END PRIVATE KEY-----');
-                $key = str_replace(' ', '', $key);
-
-                if ($heads) {
-                    $key = "-----BEGIN PRIVATE KEY-----\n".chunk_split($key, 64, "\n")."-----END PRIVATE KEY-----\n";
-                }
-            } else if (strpos($key, '-----BEGIN RSA PRIVATE KEY-----') !== false) {
-                $key = Utils::getStringBetween($key, '-----BEGIN RSA PRIVATE KEY-----', '-----END RSA PRIVATE KEY-----');
-                $key = str_replace(' ', '', $key);
-
-                if ($heads) {
-                    $key = "-----BEGIN RSA PRIVATE KEY-----\n".chunk_split($key, 64, "\n")."-----END RSA PRIVATE KEY-----\n";
-                }
-            } else {
-                $key = str_replace(' ', '', $key);
-
-                if ($heads) {
-                    $key = "-----BEGIN RSA PRIVATE KEY-----\n".chunk_split($key, 64, "\n")."-----END RSA PRIVATE KEY-----\n";
-                }
-            }
-        }
-        return $key;
-    }
-
-    /**
-     * Extracts a substring between 2 marks
-     *
-     * @param string $str   The target string
-     * @param string $start The initial mark
-     * @param string $end   The end mark
-     *
-     * @return string A substring or an empty string if is not able to find the marks
-     *                or if there is no string between the marks
-     */
-    public static function getStringBetween($str, $start, $end)
-    {
-        $str = ' ' . $str;
-        $ini = strpos($str, $start);
-
-        if ($ini == 0) {
-            return '';
-        }
-
-        $ini += strlen($start);
-        $len = strpos($str, $end, $ini) - $ini;
-        return substr($str, $ini, $len);
-    }
-
-    /**
-     * Executes a redirection to the provided url (or return the target url).
-     *
-     * @param string $url        The target url
-     * @param array  $parameters Extra parameters to be passed as part of the url
-     * @param bool   $stay       True if we want to stay (returns the url string) False to redirect
-     *
-     * @return string|null $url
-     *
-     * @throws Error
-     */
-    public static function redirect($url, array $parameters = array(), $stay = false)
-    {
-        assert(is_string($url));
-
-        if (substr($url, 0, 1) === '/') {
-            $url = self::getSelfURLhost() . $url;
-        }
-
-        /**
-         * Verify that the URL matches the regex for the protocol.
-         * By default this will check for http and https
-         */
-        if (isset(self::$_protocolRegex)) {
-            $protocol = self::$_protocolRegex;
-        } else {
-            $protocol = "";
-        }
-        $wrongProtocol = !preg_match($protocol, $url);
-        $url = filter_var($url, FILTER_VALIDATE_URL);
-        if ($wrongProtocol || empty($url)) {
-            throw new Error(
-                'Redirect to invalid URL: ' . $url,
-                Error::REDIRECT_INVALID_URL
-            );
-        }
-
-        /* Add encoded parameters */
-        if (strpos($url, '?') === false) {
-            $paramPrefix = '?';
-        } else {
-            $paramPrefix = '&';
-        }
-
-        foreach ($parameters as $name => $value) {
-            if ($value === null) {
-                $param = urlencode($name);
-            } else if (is_array($value)) {
-                $param = "";
-                foreach ($value as $val) {
-                    $param .= urlencode($name) . "[]=" . urlencode($val). '&';
-                }
-                if (!empty($param)) {
-                    $param = substr($param, 0, -1);
-                }
-            } else {
-                $param = urlencode($name) . '=' . urlencode($value);
-            }
-
-            if (!empty($param)) {
-                $url .= $paramPrefix . $param;
-                $paramPrefix = '&';
-            }
-        }
-
-        if ($stay) {
-            return $url;
-        }
-
-        header('Pragma: no-cache');
-        header('Cache-Control: no-cache, must-revalidate');
-        header('Location: ' . $url);
-        exit();
-    }
-
-     /**
-     * @param $protocolRegex string
-     */
-    public static function setProtocolRegex($protocolRegex)
-    {
-        if (!empty($protocolRegex)) {
-            self::$_protocolRegex = $protocolRegex;
-        }
-    }
-
-    /**
-     * Set the Base URL value.
-     *
-     * @param string $baseurl The base url to be used when constructing URLs
-     */
-    public static function setBaseURL($baseurl)
-    {
-        if (!empty($baseurl)) {
-            $baseurlpath = '/';
-            $matches = array();
-            if (preg_match('#^https?://([^/]*)/?(.*)#i', $baseurl, $matches)) {
-                if (strpos($baseurl, 'https://') === false) {
-                    self::setSelfProtocol('http');
-                    $port = '80';
-                } else {
-                    self::setSelfProtocol('https');
-                    $port = '443';
-                }
-
-                $currentHost = $matches[1];
-                if (false !== strpos($currentHost, ':')) {
-                    list($currentHost, $possiblePort) = explode(':', $matches[1], 2);
-                    if (is_numeric($possiblePort)) {
-                        $port = $possiblePort;
-                    }
-                }
-
-                if (isset($matches[2]) && !empty($matches[2])) {
-                    $baseurlpath = $matches[2];
-                }
-
-                self::setSelfHost($currentHost);
-                self::setSelfPort($port);
-                self::setBaseURLPath($baseurlpath);
-            }
-        } else {
-                self::$_host = null;
-                self::$_protocol = null;
-                self::$_port = null;
-                self::$_baseurlpath = null;
-        }
-    }
-
-    /**
-     * @param bool $proxyVars Whether to use `X-Forwarded-*` headers to determine port/domain/protocol
-     */
-    public static function setProxyVars($proxyVars)
-    {
-        self::$_proxyVars = (bool)$proxyVars;
-    }
-
-    /**
-     * @return bool
-     */
-    public static function getProxyVars()
-    {
-        return self::$_proxyVars;
-    }
-
-    /**
-     * Returns the protocol + the current host + the port (if different than
-     * common ports).
-     *
-     * @return string The URL
-     */
-    public static function getSelfURLhost()
-    {
-        $currenthost = self::getSelfHost();
-
-        $port = '';
-
-        if (self::isHTTPS()) {
-            $protocol = 'https';
-        } else {
-            $protocol = 'http';
-        }
-
-        $portnumber = self::getSelfPort();
-
-        if (isset($portnumber) && ($portnumber != '80') && ($portnumber != '443')) {
-            $port = ':' . $portnumber;
-        }
-
-        return $protocol."://" . $currenthost . $port;
-    }
-
-    /**
-     * @param string $host The host to use when constructing URLs
-     */
-    public static function setSelfHost($host)
-    {
-        self::$_host = $host;
-    }
-
-    /**
-     * @param string $baseurlpath The baseurl path to use when constructing URLs
-     */
-    public static function setBaseURLPath($baseurlpath)
-    {
-        if (empty($baseurlpath)) {
-            self::$_baseurlpath = null;
-        } else if ($baseurlpath == '/') {
-            self::$_baseurlpath = '/';
-        } else {
-            self::$_baseurlpath = '/' . trim($baseurlpath, '/') . '/';
-        }
-    }
-
-    /**
-     * @return string The baseurlpath to be used when constructing URLs
-     */
-    public static function getBaseURLPath()
-    {
-        return self::$_baseurlpath;
-    }
-
-    /**
-     * @return string The raw host name
-     */
-    protected static function getRawHost()
-    {
-        if (self::$_host) {
-            $currentHost = self::$_host;
-        } elseif (self::getProxyVars() && array_key_exists('HTTP_X_FORWARDED_HOST', $_SERVER)) {
-            $currentHost = $_SERVER['HTTP_X_FORWARDED_HOST'];
-        } elseif (array_key_exists('HTTP_HOST', $_SERVER)) {
-            $currentHost = $_SERVER['HTTP_HOST'];
-        } elseif (array_key_exists('SERVER_NAME', $_SERVER)) {
-            $currentHost = $_SERVER['SERVER_NAME'];
-        } else {
-            if (function_exists('gethostname')) {
-                $currentHost = gethostname();
-            } else {
-                $currentHost = php_uname("n");
-            }
-        }
-        return $currentHost;
-    }
-
-    /**
-     * @param int $port The port number to use when constructing URLs
-     */
-    public static function setSelfPort($port)
-    {
-        self::$_port = $port;
-    }
-
-    /**
-     * @param string $protocol The protocol to identify as using, usually http or https
-     */
-    public static function setSelfProtocol($protocol)
-    {
-        self::$_protocol = $protocol;
-    }
-
-    /**
-     * @return string http|https
-     */
-    public static function getSelfProtocol()
-    {
-        $protocol = 'http';
-        if (self::$_protocol) {
-            $protocol = self::$_protocol;
-        } elseif (self::getSelfPort() == 443) {
-            $protocol = 'https';
-        } elseif (self::getProxyVars() && isset($_SERVER['HTTP_X_FORWARDED_PROTO'])) {
-            $protocol = $_SERVER['HTTP_X_FORWARDED_PROTO'];
-        } elseif (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') {
-            $protocol = 'https';
-        }
-        return $protocol;
-    }
-
-    /**
-     * Returns the current host.
-     *
-     * @return string $currentHost The current host
-     */
-    public static function getSelfHost()
-    {
-        $currentHost = self::getRawHost();
-
-        // strip the port
-        if (false !== strpos($currentHost, ':')) {
-            list($currentHost, $port) = explode(':', $currentHost, 2);
-        }
-
-        return $currentHost;
-    }
-
-    /**
-     * @return null|string The port number used for the request
-     */
-    public static function getSelfPort()
-    {
-        $portnumber = null;
-        if (self::$_port) {
-            $portnumber = self::$_port;
-        } else if (self::getProxyVars() && isset($_SERVER["HTTP_X_FORWARDED_PORT"])) {
-            $portnumber = $_SERVER["HTTP_X_FORWARDED_PORT"];
-        } else if (isset($_SERVER["SERVER_PORT"])) {
-            $portnumber = $_SERVER["SERVER_PORT"];
-        } else {
-            $currentHost = self::getRawHost();
-
-            // strip the port
-            if (false !== strpos($currentHost, ':')) {
-                list($currentHost, $port) = explode(':', $currentHost, 2);
-                if (is_numeric($port)) {
-                    $portnumber = $port;
-                }
-            }
-        }
-        return $portnumber;
-    }
-
-    /**
-     * Checks if https or http.
-     *
-     * @return bool $isHttps False if https is not active
-     */
-    public static function isHTTPS()
-    {
-        return self::getSelfProtocol() == 'https';
-    }
-
-    /**
-     * Returns the URL of the current host + current view.
-     *
-     * @return string
-     */
-    public static function getSelfURLNoQuery()
-    {
-        $selfURLNoQuery = self::getSelfURLhost();
-
-        $infoWithBaseURLPath = self::buildWithBaseURLPath($_SERVER['SCRIPT_NAME']);
-        if (!empty($infoWithBaseURLPath)) {
-            $selfURLNoQuery .= $infoWithBaseURLPath;
-        } else {
-            $selfURLNoQuery .= $_SERVER['SCRIPT_NAME'];
-        }
-
-        if (isset($_SERVER['PATH_INFO'])) {
-            $selfURLNoQuery .= $_SERVER['PATH_INFO'];
-        }
-
-        return $selfURLNoQuery;
-    }
-
-    /**
-     * Returns the routed URL of the current host + current view.
-     *
-     * @return string
-     */
-    public static function getSelfRoutedURLNoQuery()
-    {
-        $selfURLhost = self::getSelfURLhost();
-        $route = '';
-
-        if (!empty($_SERVER['REQUEST_URI'])) {
-            $route = $_SERVER['REQUEST_URI'];
-            if (!empty($_SERVER['QUERY_STRING'])) {
-                $route = self::strLreplace($_SERVER['QUERY_STRING'], '', $route);
-                if (substr($route, -1) == '?') {
-                    $route = substr($route, 0, -1);
-                }
-            }
-        }
-
-        $infoWithBaseURLPath = self::buildWithBaseURLPath($route);
-        if (!empty($infoWithBaseURLPath)) {
-            $route = $infoWithBaseURLPath;
-        }
-
-        $selfRoutedURLNoQuery = $selfURLhost . $route;
-
-        $pos = strpos($selfRoutedURLNoQuery, "?");
-        if ($pos !== false) {
-            $selfRoutedURLNoQuery = substr($selfRoutedURLNoQuery, 0, $pos);
-        }
-
-        return $selfRoutedURLNoQuery;
-    }
-
-    public static function strLreplace($search, $replace, $subject)
-    {
-        $pos = strrpos($subject, $search);
-
-        if ($pos !== false) {
-            $subject = substr_replace($subject, $replace, $pos, strlen($search));
-        }
-
-        return $subject;
-    }
-
-    /**
-     * Returns the URL of the current host + current view + query.
-     *
-     * @return string
-     */
-    public static function getSelfURL()
-    {
-        $selfURLhost = self::getSelfURLhost();
-
-        $requestURI = '';
-        if (!empty($_SERVER['REQUEST_URI'])) {
-            $requestURI = $_SERVER['REQUEST_URI'];
-            $matches = array();
-            if ($requestURI[0] !== '/' && preg_match('#^https?://[^/]*(/.*)#i', $requestURI, $matches)) {
-                $requestURI = $matches[1];
-            }
-        }
-
-        $infoWithBaseURLPath = self::buildWithBaseURLPath($requestURI);
-        if (!empty($infoWithBaseURLPath)) {
-            $requestURI = $infoWithBaseURLPath;
-        }
-
-        return $selfURLhost . $requestURI;
-    }
-
-    /**
-     * Returns the part of the URL with the BaseURLPath.
-     *
-     * @param string $info Contains path info
-     *
-     * @return string
-     */
-    protected static function buildWithBaseURLPath($info)
-    {
-        $result = '';
-        $baseURLPath = self::getBaseURLPath();
-        if (!empty($baseURLPath)) {
-            $result = $baseURLPath;
-            if (!empty($info)) {
-                $path = explode('/', $info);
-                $extractedInfo = array_pop($path);
-                if (!empty($extractedInfo)) {
-                    $result .= $extractedInfo;
-                }
-            }
-        }
-        return $result;
-    }
-
-    /**
-     * Extract a query param - as it was sent - from $_SERVER[QUERY_STRING]
-     *
-     * @param string $name The param to-be extracted
-     *
-     * @return string
-     */
-    public static function extractOriginalQueryParam($name)
-    {
-        $index = strpos($_SERVER['QUERY_STRING'], $name.'=');
-        $substring = substr($_SERVER['QUERY_STRING'], $index + strlen($name) + 1);
-        $end = strpos($substring, '&');
-        return $end ? substr($substring, 0, strpos($substring, '&')) : $substring;
-    }
-
-    /**
-     * Generates an unique string (used for example as ID for assertions).
-     *
-     * @return string  A unique string
-     */
-    public static function generateUniqueID()
-    {
-        return 'ONELOGIN_' . sha1(random_bytes(20));
-    }
-
-    /**
-     * Converts a UNIX timestamp to SAML2 timestamp on the form
-     * yyyy-mm-ddThh:mm:ss(\.s+)?Z.
-     *
-     * @param string|int $time The time we should convert (DateTime).
-     *
-     * @return string $timestamp SAML2 timestamp.
-     */
-    public static function parseTime2SAML($time)
-    {
-        $date = new \DateTime("@$time", new \DateTimeZone('UTC'));
-        $timestamp = $date->format("Y-m-d\TH:i:s\Z");
-        return $timestamp;
-    }
-
-    /**
-     * Converts a SAML2 timestamp on the form yyyy-mm-ddThh:mm:ss(\.s+)?Z
-     * to a UNIX timestamp. The sub-second part is ignored.
-     *
-     * @param string $time The time we should convert (SAML Timestamp).
-     *
-     * @return int $timestamp  Converted to a unix timestamp.
-     *
-     * @throws Exception
-     */
-    public static function parseSAML2Time($time)
-    {
-        if (empty($time)) {
-          return null;
-        }
-
-        $matches = array();
-
-        /* We use a very strict regex to parse the timestamp. */
-        $exp1 = '/^(\\d\\d\\d\\d)-(\\d\\d)-(\\d\\d)';
-        $exp2 = 'T(\\d\\d):(\\d\\d):(\\d\\d)(?:\\.\\d+)?Z$/D';
-        if (preg_match($exp1 . $exp2, $time, $matches) == 0) {
-            throw new Exception(
-                'Invalid SAML2 timestamp passed to' .
-                ' parseSAML2Time: ' . $time
-            );
-        }
-
-        /* Extract the different components of the time from the
-         * matches in the regex. int cast will ignore leading zeroes
-         * in the string.
-         */
-        $year = (int) $matches[1];
-        $month = (int) $matches[2];
-        $day = (int) $matches[3];
-        $hour = (int) $matches[4];
-        $minute = (int) $matches[5];
-        $second = (int) $matches[6];
-
-        /* We use gmmktime because the timestamp will always be given
-         * in UTC.
-         */
-        $ts = gmmktime($hour, $minute, $second, $month, $day, $year);
-
-        return $ts;
-    }
-
-
-    /**
-     * Interprets a ISO8601 duration value relative to a given timestamp.
-     *
-     * @param string   $duration  The duration, as a string.
-     * @param int|null $timestamp The unix timestamp we should apply the
-     *                            duration to. Optional, default to the
-     *                            current time.
-     *
-     * @return int The new timestamp, after the duration is applied.
-     *
-     * @throws Exception
-     */
-    public static function parseDuration($duration, $timestamp = null)
-    {
-        assert(is_string($duration));
-        assert(is_null($timestamp) || is_int($timestamp));
-
-        $matches = array();
-
-        /* Parse the duration. We use a very strict pattern. */
-        $durationRegEx = '#^(-?)P(?:(?:(?:(\\d+)Y)?(?:(\\d+)M)?(?:(\\d+)D)?(?:T(?:(\\d+)H)?(?:(\\d+)M)?(?:(\\d+)S)?)?)|(?:(\\d+)W))$#D';
-        if (!preg_match($durationRegEx, $duration, $matches)) {
-            throw new Exception('Invalid ISO 8601 duration: ' . $duration);
-        }
-
-        $durYears = (empty($matches[2]) ? 0 : (int)$matches[2]);
-        $durMonths = (empty($matches[3]) ? 0 : (int)$matches[3]);
-        $durDays = (empty($matches[4]) ? 0 : (int)$matches[4]);
-        $durHours = (empty($matches[5]) ? 0 : (int)$matches[5]);
-        $durMinutes = (empty($matches[6]) ? 0 : (int)$matches[6]);
-        $durSeconds = (empty($matches[7]) ? 0 : (int)$matches[7]);
-        $durWeeks = (empty($matches[8]) ? 0 : (int)$matches[8]);
-
-        if (!empty($matches[1])) {
-            /* Negative */
-            $durYears = -$durYears;
-            $durMonths = -$durMonths;
-            $durDays = -$durDays;
-            $durHours = -$durHours;
-            $durMinutes = -$durMinutes;
-            $durSeconds = -$durSeconds;
-            $durWeeks = -$durWeeks;
-        }
-
-        if ($timestamp === null) {
-            $timestamp = time();
-        }
-
-        if ($durYears !== 0 || $durMonths !== 0) {
-            /* Special handling of months and years, since they aren't a specific interval, but
-             * instead depend on the current time.
-             */
-
-            /* We need the year and month from the timestamp. Unfortunately, PHP doesn't have the
-             * gmtime function. Instead we use the gmdate function, and split the result.
-             */
-            $yearmonth = explode(':', gmdate('Y:n', $timestamp));
-            $year = (int)$yearmonth[0];
-            $month = (int)$yearmonth[1];
-
-            /* Remove the year and month from the timestamp. */
-            $timestamp -= gmmktime(0, 0, 0, $month, 1, $year);
-
-            /* Add years and months, and normalize the numbers afterwards. */
-            $year += $durYears;
-            $month += $durMonths;
-            while ($month > 12) {
-                $year += 1;
-                $month -= 12;
-            }
-            while ($month < 1) {
-                $year -= 1;
-                $month += 12;
-            }
-
-            /* Add year and month back into timestamp. */
-            $timestamp += gmmktime(0, 0, 0, $month, 1, $year);
-        }
-
-        /* Add the other elements. */
-        $timestamp += $durWeeks * 7 * 24 * 60 * 60;
-        $timestamp += $durDays * 24 * 60 * 60;
-        $timestamp += $durHours * 60 * 60;
-        $timestamp += $durMinutes * 60;
-        $timestamp += $durSeconds;
-
-        return $timestamp;
-    }
-
-    /**
-     * Compares 2 dates and returns the earliest.
-     *
-     * @param string|null     $cacheDuration The duration, as a string.
-     * @param string|int|null $validUntil    The valid until date, as a string or as a timestamp
-     *
-     * @return int|null $expireTime  The expiration time.
-     *
-     * @throws Exception
-     */
-    public static function getExpireTime($cacheDuration = null, $validUntil = null)
-    {
-        $expireTime = null;
-
-        if ($cacheDuration !== null) {
-            $expireTime = self::parseDuration($cacheDuration, time());
-        }
-
-        if ($validUntil !== null) {
-            if (is_int($validUntil)) {
-                $validUntilTime = $validUntil;
-            } else {
-                $validUntilTime = self::parseSAML2Time($validUntil);
-            }
-            if ($expireTime === null || $expireTime > $validUntilTime) {
-                $expireTime = $validUntilTime;
-            }
-        }
-
-        return $expireTime;
-    }
-
-
-    /**
-     * Extracts nodes from the DOMDocument.
-     *
-     * @param DOMDocument      $dom     The DOMDocument
-     * @param string           $query   \Xpath Expression
-     * @param DOMElement|null  $context Context Node (DOMElement)
-     *
-     * @return DOMNodeList The queried nodes
-     */
-    public static function query(DOMDocument $dom, $query, DOMElement $context = null)
-    {
-        $xpath = new DOMXPath($dom);
-        $xpath->registerNamespace('samlp', Constants::NS_SAMLP);
-        $xpath->registerNamespace('saml', Constants::NS_SAML);
-        $xpath->registerNamespace('ds', Constants::NS_DS);
-        $xpath->registerNamespace('xenc', Constants::NS_XENC);
-        $xpath->registerNamespace('xsi', Constants::NS_XSI);
-        $xpath->registerNamespace('xs', Constants::NS_XS);
-        $xpath->registerNamespace('md', Constants::NS_MD);
-
-        if (isset($context)) {
-            $res = $xpath->query($query, $context);
-        } else {
-            $res = $xpath->query($query);
-        }
-        return $res;
-    }
-
-    /**
-     * Checks if the session is started or not.
-     *
-     * @return bool true if the sessíon is started
-     */
-    public static function isSessionStarted()
-    {
-        if (PHP_VERSION_ID >= 50400) {
-            return session_status() === PHP_SESSION_ACTIVE ? true : false;
-        } else {
-            return session_id() === '' ? false : true;
-        }
-    }
-
-    /**
-     * Deletes the local session.
-     */
-    public static function deleteLocalSession()
-    {
-        if (Utils::isSessionStarted()) {
-            session_unset();
-            session_destroy();
-        } else {
-            $_SESSION = array();
-        }
-    }
-
-    /**
-     * Calculates the fingerprint of a x509cert.
-     *
-     * @param string $x509cert x509 cert formatted
-     * @param string $alg      Algorithm to be used in order to calculate the fingerprint
-     *
-     * @return null|string Formatted fingerprint
-     */
-    public static function calculateX509Fingerprint($x509cert, $alg = 'sha1')
-    {
-        assert(is_string($x509cert));
-
-        $arCert = explode("\n", $x509cert);
-        $data = '';
-        $inData = false;
-
-        foreach ($arCert as $curData) {
-            if (! $inData) {
-                if (strncmp($curData, '-----BEGIN CERTIFICATE', 22) == 0) {
-                    $inData = true;
-                } elseif ((strncmp($curData, '-----BEGIN PUBLIC KEY', 21) == 0) || (strncmp($curData, '-----BEGIN RSA PRIVATE KEY', 26) == 0)) {
-                    /* This isn't an X509 certificate. */
-                    return null;
-                }
-            } else {
-                if (strncmp($curData, '-----END CERTIFICATE', 20) == 0) {
-                    break;
-                }
-                if (isset($curData)) {
-                    $curData = trim($curData);
-                }
-                $data .= $curData;
-            }
-        }
-
-        if (empty($data)) {
-            return null;
-        }
-
-        $decodedData = base64_decode($data);
-
-        switch ($alg) {
-            case 'sha512':
-            case 'sha384':
-            case 'sha256':
-                $fingerprint = hash($alg, $decodedData, false);
-                break;
-            case 'sha1':
-            default:
-                $fingerprint = strtolower(sha1($decodedData));
-                break;
-        }
-        return $fingerprint;
-    }
-
-    /**
-     * Formates a fingerprint.
-     *
-     * @param string $fingerprint fingerprint
-     *
-     * @return string Formatted fingerprint
-     */
-    public static function formatFingerPrint($fingerprint)
-    {
-        if (is_null($fingerprint)) {
-            return;
-        }
-        $formatedFingerprint = str_replace(':', '', $fingerprint);
-        $formatedFingerprint = strtolower($formatedFingerprint);
-        return $formatedFingerprint;
-    }
-
-    /**
-     * Generates a nameID.
-     *
-     * @param string      $value  fingerprint
-     * @param string      $spnq   SP Name Qualifier
-     * @param string|null $format SP Format
-     * @param string|null $cert   IdP Public cert to encrypt the nameID
-     * @param string|null $nq     IdP Name Qualifier
-     * @param string|null $encAlg Encryption algorithm
-     *
-     * @return string $nameIDElement DOMElement | XMLSec nameID
-     *
-     * @throws Exception
-     */
-    public static function generateNameId($value, $spnq, $format = null, $cert = null, $nq = null, $encAlg = XMLSecurityKey::AES128_CBC)
-    {
-
-        $doc = new DOMDocument();
-
-        $nameId = $doc->createElement('saml:NameID');
-        if (isset($spnq)) {
-            $nameId->setAttribute('SPNameQualifier', $spnq);
-        }
-        if (isset($nq)) {
-            $nameId->setAttribute('NameQualifier', $nq);
-        }
-        if (isset($format)) {
-            $nameId->setAttribute('Format', $format);
-        }
-        $nameId->appendChild($doc->createTextNode($value));
-
-        $doc->appendChild($nameId);
-
-        if (!empty($cert)) {
-            if ($encAlg == XMLSecurityKey::AES128_CBC) {
-                $seckey = new XMLSecurityKey(XMLSecurityKey::RSA_1_5, array('type'=>'public'));
-            } else {
-                $seckey = new XMLSecurityKey(XMLSecurityKey::RSA_OAEP_MGF1P, array('type'=>'public'));
-            }
-            $seckey->loadKey($cert);
-
-            $enc = new XMLSecEnc();
-            $enc->setNode($nameId);
-            $enc->type = XMLSecEnc::Element;
-
-            $symmetricKey = new XMLSecurityKey($encAlg);
-            $symmetricKey->generateSessionKey();
-            $enc->encryptKey($seckey, $symmetricKey);
-
-            $encryptedData = $enc->encryptNode($symmetricKey);
-
-            $newdoc = new DOMDocument();
-
-            $encryptedID = $newdoc->createElement('saml:EncryptedID');
-
-            $newdoc->appendChild($encryptedID);
-
-            $encryptedID->appendChild($encryptedID->ownerDocument->importNode($encryptedData, true));
-
-            return $newdoc->saveXML($encryptedID);
-        } else {
-            return $doc->saveXML($nameId);
-        }
-    }
-
-
-    /**
-     * Gets Status from a Response.
-     *
-     * @param DOMDocument $dom The Response as XML
-     *
-     * @return array $status The Status, an array with the code and a message.
-     *
-     * @throws ValidationError
-     */
-    public static function getStatus(DOMDocument $dom)
-    {
-        $status = array();
-
-        $statusEntry = self::query($dom, '/samlp:Response/samlp:Status');
-        if ($statusEntry->length != 1) {
-            throw new ValidationError(
-                "Missing Status on response",
-                ValidationError::MISSING_STATUS
-            );
-        }
-
-        $codeEntry = self::query($dom, '/samlp:Response/samlp:Status/samlp:StatusCode', $statusEntry->item(0));
-        if ($codeEntry->length != 1) {
-            throw new ValidationError(
-                "Missing Status Code on response",
-                ValidationError::MISSING_STATUS_CODE
-            );
-        }
-        $code = $codeEntry->item(0)->getAttribute('Value');
-        $status['code'] = $code;
-
-        $status['msg'] = '';
-        $messageEntry = self::query($dom, '/samlp:Response/samlp:Status/samlp:StatusMessage', $statusEntry->item(0));
-        if ($messageEntry->length == 0) {
-            $subCodeEntry = self::query($dom, '/samlp:Response/samlp:Status/samlp:StatusCode/samlp:StatusCode', $statusEntry->item(0));
-            if ($subCodeEntry->length == 1) {
-                $status['msg'] = $subCodeEntry->item(0)->getAttribute('Value');
-            }
-        } else if ($messageEntry->length == 1) {
-            $msg = $messageEntry->item(0)->textContent;
-            $status['msg'] = $msg;
-        }
-
-        return $status;
-    }
-
-    /**
-     * Decrypts an encrypted element.
-     *
-     * @param DOMElement     $encryptedData The encrypted data.
-     * @param XMLSecurityKey $inputKey      The decryption key.
-     * @param bool           $formatOutput  Format or not the output.
-     *
-     * @return DOMElement  The decrypted element.
-     *
-     * @throws ValidationError
-     */
-    public static function decryptElement(DOMElement $encryptedData, XMLSecurityKey $inputKey, $formatOutput = true)
-    {
-
-        $enc = new XMLSecEnc();
-
-        $enc->setNode($encryptedData);
-        $enc->type = $encryptedData->getAttribute("Type");
-
-        $symmetricKey = $enc->locateKey($encryptedData);
-        if (!$symmetricKey) {
-            throw new ValidationError(
-                'Could not locate key algorithm in encrypted data.',
-                ValidationError::KEY_ALGORITHM_ERROR
-            );
-        }
-
-        $symmetricKeyInfo = $enc->locateKeyInfo($symmetricKey);
-        if (!$symmetricKeyInfo) {
-            throw new ValidationError(
-                "Could not locate <dsig:KeyInfo> for the encrypted key.",
-                ValidationError::KEYINFO_NOT_FOUND_IN_ENCRYPTED_DATA
-            );
-        }
-
-        $inputKeyAlgo = $inputKey->getAlgorithm();
-        if ($symmetricKeyInfo->isEncrypted) {
-            $symKeyInfoAlgo = $symmetricKeyInfo->getAlgorithm();
-
-            if ($symKeyInfoAlgo === XMLSecurityKey::RSA_OAEP_MGF1P && $inputKeyAlgo === XMLSecurityKey::RSA_1_5) {
-                $inputKeyAlgo = XMLSecurityKey::RSA_OAEP_MGF1P;
-            }
-
-            if ($inputKeyAlgo !== $symKeyInfoAlgo) {
-                throw new ValidationError(
-                    'Algorithm mismatch between input key and key used to encrypt ' .
-                    ' the symmetric key for the message. Key was: ' .
-                    var_export($inputKeyAlgo, true) . '; message was: ' .
-                    var_export($symKeyInfoAlgo, true),
-                    ValidationError::KEY_ALGORITHM_ERROR
-                );
-            }
-
-            $encKey = $symmetricKeyInfo->encryptedCtx;
-            $symmetricKeyInfo->key = $inputKey->key;
-            $keySize = $symmetricKey->getSymmetricKeySize();
-            if ($keySize === null) {
-                // To protect against "key oracle" attacks
-                throw new ValidationError(
-                    'Unknown key size for encryption algorithm: ' . var_export($symmetricKey->type, true),
-                    ValidationError::KEY_ALGORITHM_ERROR
-                );
-            }
-
-            $key = $encKey->decryptKey($symmetricKeyInfo);
-            if (strlen($key) != $keySize) {
-                $encryptedKey = $encKey->getCipherValue();
-                $pkey = openssl_pkey_get_details($symmetricKeyInfo->key);
-                $pkey = sha1(serialize($pkey), true);
-                $key = sha1($encryptedKey . $pkey, true);
-
-                /* Make sure that the key has the correct length. */
-                if (strlen($key) > $keySize) {
-                    $key = substr($key, 0, $keySize);
-                } elseif (strlen($key) < $keySize) {
-                    $key = str_pad($key, $keySize);
-                }
-            }
-            $symmetricKey->loadKey($key);
-        } else {
-            $symKeyAlgo = $symmetricKey->getAlgorithm();
-            if ($inputKeyAlgo !== $symKeyAlgo) {
-                throw new ValidationError(
-                    'Algorithm mismatch between input key and key in message. ' .
-                    'Key was: ' . var_export($inputKeyAlgo, true) . '; message was: ' .
-                    var_export($symKeyAlgo, true),
-                    ValidationError::KEY_ALGORITHM_ERROR
-                );
-            }
-            $symmetricKey = $inputKey;
-        }
-
-        $decrypted = $enc->decryptNode($symmetricKey, false);
-
-        $xml = '<root xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">'.$decrypted.'</root>';
-        $newDoc = new DOMDocument();
-        if ($formatOutput) {
-            $newDoc->preserveWhiteSpace = false;
-            $newDoc->formatOutput = true;
-        }
-        $newDoc = self::loadXML($newDoc, $xml);
-        if (!$newDoc) {
-            throw new ValidationError(
-                'Failed to parse decrypted XML.',
-                ValidationError::INVALID_XML_FORMAT
-            );
-        }
-
-        $decryptedElement = $newDoc->firstChild->firstChild;
-        if ($decryptedElement === null) {
-            throw new ValidationError(
-                'Missing encrypted element.',
-                ValidationError::MISSING_ENCRYPTED_ELEMENT
-            );
-        }
-
-        return $decryptedElement;
-    }
-
-     /**
-      * Converts a XMLSecurityKey to the correct algorithm.
-      *
-      * @param XMLSecurityKey $key       The key.
-      * @param string         $algorithm The desired algorithm.
-      * @param string         $type      Public or private key, defaults to public.
-      *
-      * @return XMLSecurityKey The new key.
-      *
-      * @throws Exception
-      */
-    public static function castKey(XMLSecurityKey $key, $algorithm, $type = 'public')
-    {
-        assert(is_string($algorithm));
-        assert($type === 'public' || $type === 'private');
-
-        // do nothing if algorithm is already the type of the key
-        if ($key->type === $algorithm) {
-            return $key;
-        }
-
-        if (!Utils::isSupportedSigningAlgorithm($algorithm)) {
-            throw new Exception('Unsupported signing algorithm.');
-        }
-
-        $keyInfo = openssl_pkey_get_details($key->key);
-        if ($keyInfo === false) {
-            throw new Exception('Unable to get key details from XMLSecurityKey.');
-        }
-        if (!isset($keyInfo['key'])) {
-            throw new Exception('Missing key in public key details.');
-        }
-        $newKey = new XMLSecurityKey($algorithm, array('type'=>$type));
-        $newKey->loadKey($keyInfo['key']);
-        return $newKey;
-    }
-
-    /**
-     * @param $algorithm
-     *
-     * @return bool
-     */
-    public static function isSupportedSigningAlgorithm($algorithm)
-    {
-        return in_array(
-            $algorithm,
-            array(
-                XMLSecurityKey::RSA_1_5,
-                XMLSecurityKey::RSA_SHA1,
-                XMLSecurityKey::RSA_SHA256,
-                XMLSecurityKey::RSA_SHA384,
-                XMLSecurityKey::RSA_SHA512
-            )
-        );
-    }
-
-    /**
-     * Adds signature key and senders certificate to an element (Message or Assertion).
-     *
-     * @param string|DOMDocument $xml             The element we should sign
-     * @param string             $key             The private key
-     * @param string             $cert            The public
-     * @param string             $signAlgorithm   Signature algorithm method
-     * @param string             $digestAlgorithm Digest algorithm method
-     *
-     * @return string
-     *
-     * @throws Exception
-     */
-    public static function addSign($xml, $key, $cert, $signAlgorithm = XMLSecurityKey::RSA_SHA256, $digestAlgorithm = XMLSecurityDSig::SHA256)
-    {
-        if ($xml instanceof DOMDocument) {
-            $dom = $xml;
-        } else {
-            $dom = new DOMDocument();
-            $dom = self::loadXML($dom, $xml);
-            if (!$dom) {
-                throw new Exception('Error parsing xml string');
-            }
-        }
-
-        /* Load the private key. */
-        $objKey = new XMLSecurityKey($signAlgorithm, array('type' => 'private'));
-        $objKey->loadKey($key, false);
-
-        /* Get the EntityDescriptor node we should sign. */
-        $rootNode = $dom->firstChild;
-
-        /* Sign the metadata with our private key. */
-        $objXMLSecDSig = new XMLSecurityDSig();
-        $objXMLSecDSig->setCanonicalMethod(XMLSecurityDSig::EXC_C14N);
-
-        $objXMLSecDSig->addReferenceList(
-            array($rootNode),
-            $digestAlgorithm,
-            array('http://www.w3.org/2000/09/xmldsig#enveloped-signature', XMLSecurityDSig::EXC_C14N),
-            array('id_name' => 'ID')
-        );
-
-        $objXMLSecDSig->sign($objKey);
-
-        /* Add the certificate to the signature. */
-        $objXMLSecDSig->add509Cert($cert, true);
-
-        $insertBefore = $rootNode->firstChild;
-        $messageTypes = array('AuthnRequest', 'Response', 'LogoutRequest','LogoutResponse');
-        if (in_array($rootNode->localName, $messageTypes)) {
-            $issuerNodes = self::query($dom, '/'.$rootNode->tagName.'/saml:Issuer');
-            if ($issuerNodes->length == 1) {
-                $insertBefore = $issuerNodes->item(0)->nextSibling;
-            }
-        }
-
-        /* Add the signature. */
-        $objXMLSecDSig->insertSignature($rootNode, $insertBefore);
-
-        /* Return the DOM tree as a string. */
-        $signedxml = $dom->saveXML();
-
-        return $signedxml;
-    }
-
-    /**
-     * Validates a signature (Message or Assertion).
-     *
-     * @param string|\DomNode   $xml            The element we should validate
-     * @param string|null       $cert           The public cert
-     * @param string|null       $fingerprint    The fingerprint of the public cert
-     * @param string|null       $fingerprintalg The algorithm used to get the fingerprint
-     * @param string|null       $xpath          The xpath of the signed element
-     * @param array|null        $multiCerts     Multiple public certs
-     *
-     * @return bool
-     *
-     * @throws Exception
-     */
-    public static function validateSign($xml, $cert = null, $fingerprint = null, $fingerprintalg = 'sha1', $xpath = null, $multiCerts = null)
-    {
-        if ($xml instanceof DOMDocument) {
-            $dom = clone $xml;
-        } else if ($xml instanceof DOMElement) {
-            $dom = clone $xml->ownerDocument;
-        } else {
-            $dom = new DOMDocument();
-            $dom = self::loadXML($dom, $xml);
-        }
-
-        $objXMLSecDSig = new XMLSecurityDSig();
-        $objXMLSecDSig->idKeys = array('ID');
-
-        if ($xpath) {
-            $nodeset = Utils::query($dom, $xpath);
-            $objDSig = $nodeset->item(0);
-            $objXMLSecDSig->sigNode = $objDSig;
-        } else {
-            $objDSig = $objXMLSecDSig->locateSignature($dom);
-        }
-
-        if (!$objDSig) {
-            throw new Exception('Cannot locate Signature Node');
-        }
-
-        $objKey = $objXMLSecDSig->locateKey();
-        if (!$objKey) {
-            throw new Exception('We have no idea about the key');
-        }
-
-        if (!Utils::isSupportedSigningAlgorithm($objKey->type)) {
-            throw new Exception('Unsupported signing algorithm.');
-        }
-
-        $objXMLSecDSig->canonicalizeSignedInfo();
-
-        try {
-            $retVal = $objXMLSecDSig->validateReference();
-        } catch (Exception $e) {
-            throw $e;
-        }
-
-        XMLSecEnc::staticLocateKeyInfo($objKey, $objDSig);
-
-        if (!empty($multiCerts)) {
-            // If multiple certs are provided, I may ignore $cert and
-            // $fingerprint provided by the method and just check the
-            // certs on the array
-            $fingerprint = null;
-        } else {
-            // else I add the cert to the array in order to check
-            // validate signatures with it and the with it and the
-            // $fingerprint value
-            $multiCerts = array($cert);
-        }
-
-        $valid = false;
-        foreach ($multiCerts as $cert) {
-            if (!empty($cert)) {
-                $objKey->loadKey($cert, false, true);
-                if ($objXMLSecDSig->verify($objKey) === 1) {
-                    $valid = true;
-                    break;
-                }
-            } else {
-                if (!empty($fingerprint)) {
-                    $domCert = $objKey->getX509Certificate();
-                    $domCertFingerprint = Utils::calculateX509Fingerprint($domCert, $fingerprintalg);
-                    if (Utils::formatFingerPrint($fingerprint) == $domCertFingerprint) {
-                        $objKey->loadKey($domCert, false, true);
-                        if ($objXMLSecDSig->verify($objKey) === 1) {
-                            $valid = true;
-                            break;
-                        }
-                    }
-                }
-            }
-        }
-        return $valid;
-    }
-
-    /**
-     * Validates a binary signature
-     *
-     * @param string $messageType                    Type of SAML Message
-     * @param array  $getData                        HTTP GET array
-     * @param array  $idpData                        IdP setting data
-     * @param bool   $retrieveParametersFromServer   Indicates where to get the values in order to validate the Sign, from getData or from $_SERVER
-     *
-     * @return bool
-     *
-     * @throws Exception
-     */
-    public static function validateBinarySign($messageType, $getData, $idpData, $retrieveParametersFromServer = false)
-    {
-        if (!isset($getData['SigAlg'])) {
-            $signAlg = XMLSecurityKey::RSA_SHA1;
-        } else {
-            $signAlg = $getData['SigAlg'];
-        }
-
-        if ($retrieveParametersFromServer) {
-            $signedQuery = $messageType.'='.Utils::extractOriginalQueryParam($messageType);
-            if (isset($getData['RelayState'])) {
-                $signedQuery .= '&RelayState='.Utils::extractOriginalQueryParam('RelayState');
-            }
-            $signedQuery .= '&SigAlg='.Utils::extractOriginalQueryParam('SigAlg');
-        } else {
-            $signedQuery = $messageType.'='.urlencode($getData[$messageType]);
-            if (isset($getData['RelayState'])) {
-                $signedQuery .= '&RelayState='.urlencode($getData['RelayState']);
-            }
-            $signedQuery .= '&SigAlg='.urlencode($signAlg);
-        }
-
-        if ($messageType == "SAMLRequest") {
-            $strMessageType = "Logout Request";
-        } else {
-            $strMessageType = "Logout Response";
-        }
-        $existsMultiX509Sign = isset($idpData['x509certMulti']) && isset($idpData['x509certMulti']['signing']) && !empty($idpData['x509certMulti']['signing']);
-        if ((!isset($idpData['x509cert']) || empty($idpData['x509cert'])) && !$existsMultiX509Sign) {
-            throw new Error(
-                "In order to validate the sign on the ".$strMessageType.", the x509cert of the IdP is required",
-                Error::CERT_NOT_FOUND
-            );
-        }
-
-        if ($existsMultiX509Sign) {
-            $multiCerts = $idpData['x509certMulti']['signing'];
-        } else {
-            $multiCerts = array($idpData['x509cert']);
-        }
-
-        $signatureValid = false;
-        foreach ($multiCerts as $cert) {
-            $objKey = new XMLSecurityKey(XMLSecurityKey::RSA_SHA1, array('type' => 'public'));
-            $objKey->loadKey($cert, false, true);
-
-            if ($signAlg != XMLSecurityKey::RSA_SHA1) {
-                try {
-                    $objKey = Utils::castKey($objKey, $signAlg, 'public');
-                } catch (Exception $e) {
-                    $ex = new ValidationError(
-                        "Invalid signAlg in the recieved ".$strMessageType,
-                        ValidationError::INVALID_SIGNATURE
-                    );
-                    if (count($multiCerts) == 1) {
-                        throw $ex;
-                    }
-                }
-            }
-
-            if ($objKey->verifySignature($signedQuery, base64_decode($getData['Signature'])) === 1) {
-                $signatureValid = true;
-                break;
-            }
-        }
-        return $signatureValid;
-    }
-}
diff --git a/saml/vendor/onelogin/php-saml/src/Saml2/ValidationError.php b/saml/vendor/onelogin/php-saml/src/Saml2/ValidationError.php
deleted file mode 100644
index 889f531c..00000000
--- a/saml/vendor/onelogin/php-saml/src/Saml2/ValidationError.php
+++ /dev/null
@@ -1,100 +0,0 @@
-<?php
-/**
- * This file is part of php-saml.
- *
- * (c) OneLogin Inc
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- *
- * @package OneLogin
- * @author  OneLogin Inc <saml-info@onelogin.com>
- * @license MIT https://github.com/onelogin/php-saml/blob/master/LICENSE
- * @link    https://github.com/onelogin/php-saml
- */
-
-namespace OneLogin\Saml2;
-
-use Exception;
-
-/**
- * ValidationError class of OneLogin PHP Toolkit
- *
- * This class implements another custom Exception handler,
- * related to exceptions that happens during validation process.
- */
-class ValidationError extends Exception
-{
-    // Validation Errors
-    const UNSUPPORTED_SAML_VERSION = 0;
-    const MISSING_ID = 1;
-    const WRONG_NUMBER_OF_ASSERTIONS = 2;
-    const MISSING_STATUS = 3;
-    const MISSING_STATUS_CODE = 4;
-    const STATUS_CODE_IS_NOT_SUCCESS = 5;
-    const WRONG_SIGNED_ELEMENT = 6;
-    const ID_NOT_FOUND_IN_SIGNED_ELEMENT = 7;
-    const DUPLICATED_ID_IN_SIGNED_ELEMENTS = 8;
-    const INVALID_SIGNED_ELEMENT = 9;
-    const DUPLICATED_REFERENCE_IN_SIGNED_ELEMENTS = 10;
-    const UNEXPECTED_SIGNED_ELEMENTS = 11;
-    const WRONG_NUMBER_OF_SIGNATURES_IN_RESPONSE = 12;
-    const WRONG_NUMBER_OF_SIGNATURES_IN_ASSERTION = 13;
-    const INVALID_XML_FORMAT = 14;
-    const WRONG_INRESPONSETO = 15;
-    const NO_ENCRYPTED_ASSERTION = 16;
-    const NO_ENCRYPTED_NAMEID = 17;
-    const MISSING_CONDITIONS = 18;
-    const ASSERTION_TOO_EARLY = 19;
-    const ASSERTION_EXPIRED = 20;
-    const WRONG_NUMBER_OF_AUTHSTATEMENTS = 21;
-    const NO_ATTRIBUTESTATEMENT = 22;
-    const ENCRYPTED_ATTRIBUTES = 23;
-    const WRONG_DESTINATION = 24;
-    const EMPTY_DESTINATION = 25;
-    const WRONG_AUDIENCE = 26;
-    const ISSUER_MULTIPLE_IN_RESPONSE = 27;
-    const ISSUER_NOT_FOUND_IN_ASSERTION = 28;
-    const WRONG_ISSUER = 29;
-    const SESSION_EXPIRED = 30;
-    const WRONG_SUBJECTCONFIRMATION = 31;
-    const NO_SIGNED_MESSAGE = 32;
-    const NO_SIGNED_ASSERTION = 33;
-    const NO_SIGNATURE_FOUND = 34;
-    const KEYINFO_NOT_FOUND_IN_ENCRYPTED_DATA = 35;
-    const CHILDREN_NODE_NOT_FOUND_IN_KEYINFO = 36;
-    const UNSUPPORTED_RETRIEVAL_METHOD = 37;
-    const NO_NAMEID = 38;
-    const EMPTY_NAMEID = 39;
-    const SP_NAME_QUALIFIER_NAME_MISMATCH = 40;
-    const DUPLICATED_ATTRIBUTE_NAME_FOUND = 41;
-    const INVALID_SIGNATURE = 42;
-    const WRONG_NUMBER_OF_SIGNATURES = 43;
-    const RESPONSE_EXPIRED = 44;
-    const UNEXPECTED_REFERENCE = 45;
-    const NOT_SUPPORTED = 46;
-    const KEY_ALGORITHM_ERROR = 47;
-    const MISSING_ENCRYPTED_ELEMENT = 48;
-
-
-    /**
-     * Constructor
-     *
-     * @param string     $msg  Describes the error.
-     * @param int        $code The code error (defined in the error class).
-     * @param array|null $args Arguments used in the message that describes the error.
-     */
-    public function __construct($msg, $code = 0, $args = array())
-    {
-        assert(is_string($msg));
-        assert(is_int($code));
-
-        if (!isset($args)) {
-            $args = array();
-        }
-        $params = array_merge(array($msg), $args);
-        $message = call_user_func_array('sprintf', $params);
-
-        parent::__construct($message, $code);
-    }
-}
diff --git a/saml/vendor/onelogin/php-saml/src/Saml2/schemas/saml-schema-assertion-2.0.xsd b/saml/vendor/onelogin/php-saml/src/Saml2/schemas/saml-schema-assertion-2.0.xsd
deleted file mode 100644
index 2b2f7b80..00000000
--- a/saml/vendor/onelogin/php-saml/src/Saml2/schemas/saml-schema-assertion-2.0.xsd
+++ /dev/null
@@ -1,283 +0,0 @@
-<?xml version="1.0" encoding="US-ASCII"?>
-<schema
-    targetNamespace="urn:oasis:names:tc:SAML:2.0:assertion"
-    xmlns="http://www.w3.org/2001/XMLSchema"
-    xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"
-    xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-    xmlns:xenc="http://www.w3.org/2001/04/xmlenc#"
-    elementFormDefault="unqualified"
-    attributeFormDefault="unqualified"
-    blockDefault="substitution"
-    version="2.0">
-    <import namespace="http://www.w3.org/2000/09/xmldsig#"
-        schemaLocation="xmldsig-core-schema.xsd"/>
-    <import namespace="http://www.w3.org/2001/04/xmlenc#"
-        schemaLocation="xenc-schema.xsd"/>
-    <annotation>
-        <documentation>
-            Document identifier: saml-schema-assertion-2.0
-            Location: http://docs.oasis-open.org/security/saml/v2.0/
-            Revision history:
-            V1.0 (November, 2002):
-              Initial Standard Schema.
-            V1.1 (September, 2003):
-              Updates within the same V1.0 namespace.
-            V2.0 (March, 2005):
-              New assertion schema for SAML V2.0 namespace.
-        </documentation>
-    </annotation>
-    <attributeGroup name="IDNameQualifiers">
-        <attribute name="NameQualifier" type="string" use="optional"/>
-        <attribute name="SPNameQualifier" type="string" use="optional"/>
-    </attributeGroup>
-    <element name="BaseID" type="saml:BaseIDAbstractType"/>
-    <complexType name="BaseIDAbstractType" abstract="true">
-        <attributeGroup ref="saml:IDNameQualifiers"/>
-    </complexType>
-    <element name="NameID" type="saml:NameIDType"/>
-    <complexType name="NameIDType">
-        <simpleContent>
-            <extension base="string">
-                <attributeGroup ref="saml:IDNameQualifiers"/>
-                <attribute name="Format" type="anyURI" use="optional"/>
-                <attribute name="SPProvidedID" type="string" use="optional"/>
-            </extension>
-        </simpleContent>
-    </complexType>
-    <complexType name="EncryptedElementType">
-        <sequence>
-            <element ref="xenc:EncryptedData"/>
-            <element ref="xenc:EncryptedKey" minOccurs="0" maxOccurs="unbounded"/>
-        </sequence>
-    </complexType>
-    <element name="EncryptedID" type="saml:EncryptedElementType"/>
-    <element name="Issuer" type="saml:NameIDType"/>
-    <element name="AssertionIDRef" type="NCName"/>
-    <element name="AssertionURIRef" type="anyURI"/>
-    <element name="Assertion" type="saml:AssertionType"/>
-    <complexType name="AssertionType">
-        <sequence>
-            <element ref="saml:Issuer"/>
-            <element ref="ds:Signature" minOccurs="0"/>
-            <element ref="saml:Subject" minOccurs="0"/>
-            <element ref="saml:Conditions" minOccurs="0"/>
-            <element ref="saml:Advice" minOccurs="0"/>
-            <choice minOccurs="0" maxOccurs="unbounded">
-                <element ref="saml:Statement"/>
-                <element ref="saml:AuthnStatement"/>
-                <element ref="saml:AuthzDecisionStatement"/>
-                <element ref="saml:AttributeStatement"/>
-            </choice>
-        </sequence>
-        <attribute name="Version" type="string" use="required"/>
-        <attribute name="ID" type="ID" use="required"/>
-        <attribute name="IssueInstant" type="dateTime" use="required"/>
-    </complexType>
-    <element name="Subject" type="saml:SubjectType"/>
-    <complexType name="SubjectType">
-        <choice>
-            <sequence>
-                <choice>
-                    <element ref="saml:BaseID"/>
-                    <element ref="saml:NameID"/>
-                    <element ref="saml:EncryptedID"/>
-                </choice>
-                <element ref="saml:SubjectConfirmation" minOccurs="0" maxOccurs="unbounded"/>
-            </sequence>
-            <element ref="saml:SubjectConfirmation" maxOccurs="unbounded"/>
-        </choice>
-    </complexType>
-    <element name="SubjectConfirmation" type="saml:SubjectConfirmationType"/>
-    <complexType name="SubjectConfirmationType">
-        <sequence>
-            <choice minOccurs="0">
-                <element ref="saml:BaseID"/>
-                <element ref="saml:NameID"/>
-                <element ref="saml:EncryptedID"/>
-            </choice>
-            <element ref="saml:SubjectConfirmationData" minOccurs="0"/>
-        </sequence>
-        <attribute name="Method" type="anyURI" use="required"/>
-    </complexType>
-    <element name="SubjectConfirmationData" type="saml:SubjectConfirmationDataType"/>
-    <complexType name="SubjectConfirmationDataType" mixed="true">
-        <complexContent>
-            <restriction base="anyType">
-                <sequence>
-                    <any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-                </sequence>
-                <attribute name="NotBefore" type="dateTime" use="optional"/>
-                <attribute name="NotOnOrAfter" type="dateTime" use="optional"/>
-                <attribute name="Recipient" type="anyURI" use="optional"/>
-                <attribute name="InResponseTo" type="NCName" use="optional"/>
-                <attribute name="Address" type="string" use="optional"/>
-                <anyAttribute namespace="##other" processContents="lax"/>
-            </restriction>
-        </complexContent>
-    </complexType>
-    <complexType name="KeyInfoConfirmationDataType" mixed="false">
-        <complexContent>
-            <restriction base="saml:SubjectConfirmationDataType">
-                <sequence>
-                    <element ref="ds:KeyInfo" maxOccurs="unbounded"/>
-                </sequence>
-            </restriction>
-        </complexContent>
-    </complexType>
-    <element name="Conditions" type="saml:ConditionsType"/>
-    <complexType name="ConditionsType">
-        <choice minOccurs="0" maxOccurs="unbounded">
-            <element ref="saml:Condition"/>
-            <element ref="saml:AudienceRestriction"/>
-            <element ref="saml:OneTimeUse"/>
-            <element ref="saml:ProxyRestriction"/>
-        </choice>
-        <attribute name="NotBefore" type="dateTime" use="optional"/>
-        <attribute name="NotOnOrAfter" type="dateTime" use="optional"/>
-    </complexType>
-    <element name="Condition" type="saml:ConditionAbstractType"/>
-    <complexType name="ConditionAbstractType" abstract="true"/>
-    <element name="AudienceRestriction" type="saml:AudienceRestrictionType"/>
-    <complexType name="AudienceRestrictionType">
-        <complexContent>
-            <extension base="saml:ConditionAbstractType">
-                <sequence>
-                    <element ref="saml:Audience" maxOccurs="unbounded"/>
-                </sequence>
-            </extension>
-        </complexContent>
-    </complexType>
-    <element name="Audience" type="anyURI"/>
-    <element name="OneTimeUse" type="saml:OneTimeUseType" />
-    <complexType name="OneTimeUseType">
-        <complexContent>
-            <extension base="saml:ConditionAbstractType"/>
-        </complexContent>
-    </complexType>
-    <element name="ProxyRestriction" type="saml:ProxyRestrictionType"/>
-    <complexType name="ProxyRestrictionType">
-    <complexContent>
-        <extension base="saml:ConditionAbstractType">
-            <sequence>
-                <element ref="saml:Audience" minOccurs="0" maxOccurs="unbounded"/>
-            </sequence>
-            <attribute name="Count" type="nonNegativeInteger" use="optional"/>
-        </extension>
-	</complexContent>
-    </complexType>
-    <element name="Advice" type="saml:AdviceType"/>
-    <complexType name="AdviceType">
-        <choice minOccurs="0" maxOccurs="unbounded">
-            <element ref="saml:AssertionIDRef"/>
-            <element ref="saml:AssertionURIRef"/>
-            <element ref="saml:Assertion"/>
-            <element ref="saml:EncryptedAssertion"/>
-            <any namespace="##other" processContents="lax"/>
-        </choice>
-    </complexType>
-    <element name="EncryptedAssertion" type="saml:EncryptedElementType"/>
-    <element name="Statement" type="saml:StatementAbstractType"/>
-    <complexType name="StatementAbstractType" abstract="true"/>
-    <element name="AuthnStatement" type="saml:AuthnStatementType"/>
-    <complexType name="AuthnStatementType">
-        <complexContent>
-            <extension base="saml:StatementAbstractType">
-                <sequence>
-                    <element ref="saml:SubjectLocality" minOccurs="0"/>
-                    <element ref="saml:AuthnContext"/>
-                </sequence>
-                <attribute name="AuthnInstant" type="dateTime" use="required"/>
-                <attribute name="SessionIndex" type="string" use="optional"/>
-                <attribute name="SessionNotOnOrAfter" type="dateTime" use="optional"/>
-            </extension>
-        </complexContent>
-    </complexType>
-    <element name="SubjectLocality" type="saml:SubjectLocalityType"/>
-    <complexType name="SubjectLocalityType">
-        <attribute name="Address" type="string" use="optional"/>
-        <attribute name="DNSName" type="string" use="optional"/>
-    </complexType>
-    <element name="AuthnContext" type="saml:AuthnContextType"/>
-    <complexType name="AuthnContextType">
-        <sequence>
-            <choice>
-                <sequence>
-                    <element ref="saml:AuthnContextClassRef"/>
-                    <choice minOccurs="0">
-                        <element ref="saml:AuthnContextDecl"/>
-                        <element ref="saml:AuthnContextDeclRef"/>
-                    </choice>
-                </sequence>
-                <choice>
-                    <element ref="saml:AuthnContextDecl"/>
-                    <element ref="saml:AuthnContextDeclRef"/>
-                </choice>
-            </choice>
-            <element ref="saml:AuthenticatingAuthority" minOccurs="0" maxOccurs="unbounded"/>
-        </sequence>
-    </complexType>
-    <element name="AuthnContextClassRef" type="anyURI"/>
-    <element name="AuthnContextDeclRef" type="anyURI"/>
-    <element name="AuthnContextDecl" type="anyType"/>
-    <element name="AuthenticatingAuthority" type="anyURI"/>
-    <element name="AuthzDecisionStatement" type="saml:AuthzDecisionStatementType"/>
-    <complexType name="AuthzDecisionStatementType">
-        <complexContent>
-            <extension base="saml:StatementAbstractType">
-                <sequence>
-                    <element ref="saml:Action" maxOccurs="unbounded"/>
-                    <element ref="saml:Evidence" minOccurs="0"/>
-                </sequence>
-                <attribute name="Resource" type="anyURI" use="required"/>
-                <attribute name="Decision" type="saml:DecisionType" use="required"/>
-            </extension>
-        </complexContent>
-    </complexType>
-    <simpleType name="DecisionType">
-        <restriction base="string">
-            <enumeration value="Permit"/>
-            <enumeration value="Deny"/>
-            <enumeration value="Indeterminate"/>
-        </restriction>
-    </simpleType>
-    <element name="Action" type="saml:ActionType"/>
-    <complexType name="ActionType">
-        <simpleContent>
-            <extension base="string">
-                <attribute name="Namespace" type="anyURI" use="required"/>
-            </extension>
-        </simpleContent>
-    </complexType>
-    <element name="Evidence" type="saml:EvidenceType"/>
-    <complexType name="EvidenceType">
-        <choice maxOccurs="unbounded">
-            <element ref="saml:AssertionIDRef"/>
-            <element ref="saml:AssertionURIRef"/>
-            <element ref="saml:Assertion"/>
-            <element ref="saml:EncryptedAssertion"/>
-        </choice>
-    </complexType>
-    <element name="AttributeStatement" type="saml:AttributeStatementType"/>
-    <complexType name="AttributeStatementType">
-        <complexContent>
-            <extension base="saml:StatementAbstractType">
-                <choice maxOccurs="unbounded">
-                    <element ref="saml:Attribute"/>
-                    <element ref="saml:EncryptedAttribute"/>
-                </choice>
-            </extension>
-        </complexContent>
-    </complexType>
-    <element name="Attribute" type="saml:AttributeType"/>
-    <complexType name="AttributeType">
-        <sequence>
-            <element ref="saml:AttributeValue" minOccurs="0" maxOccurs="unbounded"/>
-        </sequence>
-        <attribute name="Name" type="string" use="required"/>
-        <attribute name="NameFormat" type="anyURI" use="optional"/>
-        <attribute name="FriendlyName" type="string" use="optional"/>
-        <anyAttribute namespace="##other" processContents="lax"/>
-    </complexType>
-    <element name="AttributeValue" type="anyType" nillable="true"/>
-    <element name="EncryptedAttribute" type="saml:EncryptedElementType"/>
-</schema>
diff --git a/saml/vendor/onelogin/php-saml/src/Saml2/schemas/saml-schema-authn-context-2.0.xsd b/saml/vendor/onelogin/php-saml/src/Saml2/schemas/saml-schema-authn-context-2.0.xsd
deleted file mode 100644
index e4754faf..00000000
--- a/saml/vendor/onelogin/php-saml/src/Saml2/schemas/saml-schema-authn-context-2.0.xsd
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema 
-  targetNamespace="urn:oasis:names:tc:SAML:2.0:ac"
-  xmlns:xs="http://www.w3.org/2001/XMLSchema"
-  xmlns="urn:oasis:names:tc:SAML:2.0:ac"
-  blockDefault="substitution"
-  version="2.0">
-
-  <xs:annotation>
-    <xs:documentation>
-      Document identifier: saml-schema-authn-context-2.0
-      Location: http://docs.oasis-open.org/security/saml/v2.0/
-      Revision history:
-        V2.0 (March, 2005):
-          New core authentication context schema for SAML V2.0. 
-          This is just an include of all types from the schema
-          referred to in the include statement below.
-    </xs:documentation>
-  </xs:annotation>
-
-  <xs:include schemaLocation="saml-schema-authn-context-types-2.0.xsd"/>
-
-</xs:schema>
\ No newline at end of file
diff --git a/saml/vendor/onelogin/php-saml/src/Saml2/schemas/saml-schema-authn-context-types-2.0.xsd b/saml/vendor/onelogin/php-saml/src/Saml2/schemas/saml-schema-authn-context-types-2.0.xsd
deleted file mode 100644
index 8513959a..00000000
--- a/saml/vendor/onelogin/php-saml/src/Saml2/schemas/saml-schema-authn-context-types-2.0.xsd
+++ /dev/null
@@ -1,821 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema 
-  xmlns:xs="http://www.w3.org/2001/XMLSchema"
-  elementFormDefault="qualified"
-  version="2.0">
-
-  <xs:annotation>
-    <xs:documentation>
-      Document identifier: saml-schema-authn-context-types-2.0
-      Location: http://docs.oasis-open.org/security/saml/v2.0/
-      Revision history:
-          V2.0 (March, 2005):
-          New core authentication context schema types for SAML V2.0. 
-    </xs:documentation>
-  </xs:annotation>
-
-  <xs:element name="AuthenticationContextDeclaration" type="AuthnContextDeclarationBaseType">
-    <xs:annotation>
-      <xs:documentation>
-        A particular assertion on an identity
-        provider's part with respect to the authentication
-        context associated with an authentication assertion.
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-
-  <xs:element name="Identification" type="IdentificationType">
-    <xs:annotation>
-      <xs:documentation>
-        Refers to those characteristics that describe the
-        processes and mechanisms
-        the Authentication Authority uses to initially create
-        an association between a Principal
-        and the identity (or name) by which the Principal will
-        be known
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-
-  <xs:element name="PhysicalVerification">
-    <xs:annotation>
-      <xs:documentation>
-        This element indicates that identification has been
-        performed in a physical
-        face-to-face meeting with the principal and not in an
-        online manner.
-      </xs:documentation>
-    </xs:annotation>
-    <xs:complexType>
-      <xs:attribute name="credentialLevel">
-        <xs:simpleType>
-          <xs:restriction base="xs:NMTOKEN">
-            <xs:enumeration value="primary"/>
-            <xs:enumeration value="secondary"/>
-          </xs:restriction>
-        </xs:simpleType>
-      </xs:attribute>
-    </xs:complexType>
-  </xs:element>
-
-  <xs:element name="WrittenConsent" type="ExtensionOnlyType"/>
-
-  <xs:element name="TechnicalProtection" type="TechnicalProtectionBaseType">
-    <xs:annotation>
-      <xs:documentation>
-        Refers to those characterstics that describe how the
-        'secret' (the knowledge or possession
-        of which allows the Principal to authenticate to the
-        Authentication Authority) is kept secure
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-
-  <xs:element name="SecretKeyProtection" type="SecretKeyProtectionType">
-    <xs:annotation>
-      <xs:documentation>
-        This element indicates the types and strengths of
-        facilities
-        of a UA used to protect a shared secret key from
-        unauthorized access and/or use.
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-
-  <xs:element name="PrivateKeyProtection" type="PrivateKeyProtectionType">
-    <xs:annotation>
-      <xs:documentation>
-        This element indicates the types and strengths of
-        facilities
-        of a UA used to protect a private key from
-        unauthorized access and/or use.
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-
-  <xs:element name="KeyActivation" type="KeyActivationType">
-    <xs:annotation>
-      <xs:documentation>The actions that must be performed
-        before the private key can be used. </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-
-  <xs:element name="KeySharing" type="KeySharingType">
-    <xs:annotation>
-      <xs:documentation>Whether or not the private key is shared
-        with the certificate authority.</xs:documentation>
-    </xs:annotation>
-  </xs:element>
-
-  <xs:element name="KeyStorage" type="KeyStorageType">
-    <xs:annotation>
-      <xs:documentation>
-        In which medium is the key stored.
-        memory - the key is stored in memory.
-        smartcard - the key is stored in a smartcard.
-        token - the key is stored in a hardware token.
-        MobileDevice - the key is stored in a mobile device.
-        MobileAuthCard - the key is stored in a mobile
-        authentication card.
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-
-  <xs:element name="SubscriberLineNumber" type="ExtensionOnlyType"/>
-  <xs:element name="UserSuffix" type="ExtensionOnlyType"/>
-
-  <xs:element name="Password" type="PasswordType">
-    <xs:annotation>
-      <xs:documentation>
-        This element indicates that a password (or passphrase)
-        has been used to
-        authenticate the Principal to a remote system.
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-
-  <xs:element name="ActivationPin" type="ActivationPinType">
-    <xs:annotation>
-      <xs:documentation>
-        This element indicates that a Pin (Personal
-        Identification Number) has been used to authenticate the Principal to
-        some local system in order to activate a key.
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-
-  <xs:element name="Token" type="TokenType">
-    <xs:annotation>
-      <xs:documentation>
-        This element indicates that a hardware or software
-        token is used
-        as a method of identifying the Principal.
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-
-  <xs:element name="TimeSyncToken" type="TimeSyncTokenType">
-    <xs:annotation>
-      <xs:documentation>
-        This element indicates that a time synchronization
-        token is used to identify the Principal. hardware -
-        the time synchonization
-        token has been implemented in hardware. software - the
-        time synchronization
-        token has been implemented in software. SeedLength -
-        the length, in bits, of the
-        random seed used in the time synchronization token.
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-
-  <xs:element name="Smartcard" type="ExtensionOnlyType">
-    <xs:annotation>
-      <xs:documentation>
-        This element indicates that a smartcard is used to
-        identity the Principal.
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-
-  <xs:element name="Length" type="LengthType">
-    <xs:annotation>
-      <xs:documentation>
-        This element indicates the minimum and/or maximum
-        ASCII length of the password which is enforced (by the UA or the
-        IdP). In other words, this is the minimum and/or maximum number of
-        ASCII characters required to represent a valid password.
-        min - the minimum number of ASCII characters required
-        in a valid password, as enforced by the UA or the IdP.
-        max - the maximum number of ASCII characters required
-        in a valid password, as enforced by the UA or the IdP.
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-
-  <xs:element name="ActivationLimit" type="ActivationLimitType">
-    <xs:annotation>
-      <xs:documentation>
-        This element indicates the length of time for which an
-        PIN-based authentication is valid.
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-
-  <xs:element name="Generation">
-    <xs:annotation>
-      <xs:documentation>
-        Indicates whether the password was chosen by the
-        Principal or auto-supplied by the Authentication Authority.
-        principalchosen - the Principal is allowed to choose
-        the value of the password. This is true even if
-        the initial password is chosen at random by the UA or
-        the IdP and the Principal is then free to change
-        the password.
-        automatic - the password is chosen by the UA or the
-        IdP to be cryptographically strong in some sense,
-        or to satisfy certain password rules, and that the
-        Principal is not free to change it or to choose a new password.
-      </xs:documentation>
-    </xs:annotation>
-
-    <xs:complexType>
-      <xs:attribute name="mechanism" use="required">
-        <xs:simpleType>
-          <xs:restriction base="xs:NMTOKEN">
-            <xs:enumeration value="principalchosen"/>
-            <xs:enumeration value="automatic"/>
-          </xs:restriction>
-        </xs:simpleType>
-      </xs:attribute>
-    </xs:complexType>
-  </xs:element>
-
-  <xs:element name="AuthnMethod" type="AuthnMethodBaseType">
-    <xs:annotation>
-      <xs:documentation>
-        Refers to those characteristics that define the
-        mechanisms by which the Principal authenticates to the Authentication
-        Authority.
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-
-  <xs:element name="PrincipalAuthenticationMechanism" type="PrincipalAuthenticationMechanismType">
-    <xs:annotation>
-      <xs:documentation>
-        The method that a Principal employs to perform
-        authentication to local system components.
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-
-  <xs:element name="Authenticator" type="AuthenticatorBaseType">
-    <xs:annotation>
-      <xs:documentation>
-        The method applied to validate a principal's
-        authentication across a network
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-
-  <xs:element name="ComplexAuthenticator" type="ComplexAuthenticatorType">
-    <xs:annotation>
-      <xs:documentation>
-        Supports Authenticators with nested combinations of
-        additional complexity.
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-
-  <xs:element name="PreviousSession" type="ExtensionOnlyType">
-    <xs:annotation>
-      <xs:documentation>
-        Indicates that the Principal has been strongly
-        authenticated in a previous session during which the IdP has set a
-        cookie in the UA. During the present session the Principal has only
-        been authenticated by the UA returning the cookie to the IdP.
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-
-  <xs:element name="ResumeSession" type="ExtensionOnlyType">
-    <xs:annotation>
-      <xs:documentation>
-        Rather like PreviousSession but using stronger
-        security. A secret that was established in a previous session with
-        the Authentication Authority has been cached by the local system and
-        is now re-used (e.g. a Master Secret is used to derive new session
-        keys in TLS, SSL, WTLS).
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-
-  <xs:element name="ZeroKnowledge" type="ExtensionOnlyType">
-    <xs:annotation>
-      <xs:documentation>
-        This element indicates that the Principal has been
-        authenticated by a zero knowledge technique as specified in ISO/IEC
-        9798-5.
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-
-  <xs:element name="SharedSecretChallengeResponse" type="SharedSecretChallengeResponseType"/>
-
-  <xs:complexType name="SharedSecretChallengeResponseType">
-    <xs:annotation>
-      <xs:documentation>
-        This element indicates that the Principal has been
-        authenticated by a challenge-response protocol utilizing shared secret
-        keys and symmetric cryptography.
-      </xs:documentation>
-    </xs:annotation>
-    <xs:sequence>
-      <xs:element ref="Extension" minOccurs="0" maxOccurs="unbounded"/>
-    </xs:sequence>
-    <xs:attribute name="method" type="xs:anyURI" use="optional"/>
-  </xs:complexType>
-
-  <xs:element name="DigSig" type="PublicKeyType">
-    <xs:annotation>
-      <xs:documentation>
-        This element indicates that the Principal has been
-        authenticated by a mechanism which involves the Principal computing a
-        digital signature over at least challenge data provided by the IdP.
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-
-  <xs:element name="AsymmetricDecryption" type="PublicKeyType">
-    <xs:annotation>
-      <xs:documentation>
-        The local system has a private key but it is used
-        in decryption mode, rather than signature mode. For example, the
-        Authentication Authority generates a secret and encrypts it using the
-        local system's public key: the local system then proves it has
-        decrypted the secret.
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-
-  <xs:element name="AsymmetricKeyAgreement" type="PublicKeyType">
-    <xs:annotation>
-      <xs:documentation>
-        The local system has a private key and uses it for
-        shared secret key agreement with the Authentication Authority (e.g.
-        via Diffie Helman).
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-
-  <xs:complexType name="PublicKeyType">
-    <xs:sequence>
-      <xs:element ref="Extension" minOccurs="0" maxOccurs="unbounded"/>
-    </xs:sequence>
-    <xs:attribute name="keyValidation" use="optional"/>
-  </xs:complexType>
-
-  <xs:element name="IPAddress" type="ExtensionOnlyType">
-    <xs:annotation>
-      <xs:documentation>
-        This element indicates that the Principal has been
-        authenticated through connection from a particular IP address.
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-
-  <xs:element name="SharedSecretDynamicPlaintext" type="ExtensionOnlyType">
-    <xs:annotation>
-      <xs:documentation>
-        The local system and Authentication Authority
-        share a secret key. The local system uses this to encrypt a
-        randomised string to pass to the Authentication Authority.
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-
-  <xs:element name="AuthenticatorTransportProtocol" type="AuthenticatorTransportProtocolType">
-    <xs:annotation>
-      <xs:documentation>
-        The protocol across which Authenticator information is
-        transferred to an Authentication Authority verifier.
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-
-  <xs:element name="HTTP" type="ExtensionOnlyType">
-    <xs:annotation>
-      <xs:documentation>
-        This element indicates that the Authenticator has been
-        transmitted using bare HTTP utilizing no additional security
-        protocols.
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-
-  <xs:element name="IPSec" type="ExtensionOnlyType">
-    <xs:annotation>
-      <xs:documentation>
-        This element indicates that the Authenticator has been
-        transmitted using a transport mechanism protected by an IPSEC session.
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-  
-  <xs:element name="WTLS" type="ExtensionOnlyType">
-    <xs:annotation>
-      <xs:documentation>
-        This element indicates that the Authenticator has been
-        transmitted using a transport mechanism protected by a WTLS session.
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-
-  <xs:element name="MobileNetworkNoEncryption" type="ExtensionOnlyType">
-    <xs:annotation>
-      <xs:documentation>
-        This element indicates that the Authenticator has been
-        transmitted solely across a mobile network using no additional
-        security mechanism.
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-
-  <xs:element name="MobileNetworkRadioEncryption" type="ExtensionOnlyType"/>
-  <xs:element name="MobileNetworkEndToEndEncryption" type="ExtensionOnlyType"/>
-
-  <xs:element name="SSL" type="ExtensionOnlyType">
-    <xs:annotation>
-      <xs:documentation>
-        This element indicates that the Authenticator has been
-        transmitted using a transport mechnanism protected by an SSL or TLS
-        session.
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-  
-  <xs:element name="PSTN" type="ExtensionOnlyType"/>
-  <xs:element name="ISDN" type="ExtensionOnlyType"/>
-  <xs:element name="ADSL" type="ExtensionOnlyType"/>
-
-  <xs:element name="OperationalProtection" type="OperationalProtectionType">
-    <xs:annotation>
-      <xs:documentation>
-        Refers to those characteristics that describe
-        procedural security controls employed by the Authentication Authority.
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-
-  <xs:element name="SecurityAudit" type="SecurityAuditType"/>
-  <xs:element name="SwitchAudit" type="ExtensionOnlyType"/>
-  <xs:element name="DeactivationCallCenter" type="ExtensionOnlyType"/>
-
-  <xs:element name="GoverningAgreements" type="GoverningAgreementsType">
-    <xs:annotation>
-      <xs:documentation>
-        Provides a mechanism for linking to external (likely
-        human readable) documents in which additional business agreements,
-        (e.g. liability constraints, obligations, etc) can be placed.
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-
-  <xs:element name="GoverningAgreementRef" type="GoverningAgreementRefType"/>
-
-  <xs:simpleType name="nymType">
-    <xs:restriction base="xs:NMTOKEN">
-      <xs:enumeration value="anonymity"/>
-      <xs:enumeration value="verinymity"/>
-      <xs:enumeration value="pseudonymity"/>
-    </xs:restriction>
-  </xs:simpleType>
-
-  <xs:complexType name="AuthnContextDeclarationBaseType">
-    <xs:sequence>
-      <xs:element ref="Identification" minOccurs="0"/>
-      <xs:element ref="TechnicalProtection" minOccurs="0"/>
-      <xs:element ref="OperationalProtection" minOccurs="0"/>
-      <xs:element ref="AuthnMethod" minOccurs="0"/>
-      <xs:element ref="GoverningAgreements" minOccurs="0"/>
-      <xs:element ref="Extension" minOccurs="0" maxOccurs="unbounded"/>
-    </xs:sequence>
-    <xs:attribute name="ID" type="xs:ID" use="optional"/>
-  </xs:complexType>
-  
-  <xs:complexType name="IdentificationType">
-    <xs:sequence>
-      <xs:element ref="PhysicalVerification" minOccurs="0"/>
-      <xs:element ref="WrittenConsent" minOccurs="0"/>
-      <xs:element ref="GoverningAgreements" minOccurs="0"/>
-      <xs:element ref="Extension" minOccurs="0" maxOccurs="unbounded"/>
-    </xs:sequence>
-    <xs:attribute name="nym" type="nymType">
-      <xs:annotation>
-        <xs:documentation>
-          This attribute indicates whether or not the
-          Identification mechanisms allow the actions of the Principal to be
-          linked to an actual end user.
-        </xs:documentation>
-      </xs:annotation>
-    </xs:attribute>
-  </xs:complexType>
-
-  <xs:complexType name="TechnicalProtectionBaseType">
-    <xs:sequence>
-      <xs:choice minOccurs="0">
-        <xs:element ref="PrivateKeyProtection"/>
-        <xs:element ref="SecretKeyProtection"/>
-      </xs:choice>
-      <xs:element ref="Extension" minOccurs="0" maxOccurs="unbounded"/>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="OperationalProtectionType">
-    <xs:sequence>
-      <xs:element ref="SecurityAudit" minOccurs="0"/>
-      <xs:element ref="DeactivationCallCenter" minOccurs="0"/>
-      <xs:element ref="Extension" minOccurs="0" maxOccurs="unbounded"/>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="AuthnMethodBaseType">
-    <xs:sequence>
-      <xs:element ref="PrincipalAuthenticationMechanism" minOccurs="0"/>
-      <xs:element ref="Authenticator" minOccurs="0"/>
-      <xs:element ref="AuthenticatorTransportProtocol" minOccurs="0"/>
-      <xs:element ref="Extension" minOccurs="0" maxOccurs="unbounded"/>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="GoverningAgreementsType">
-    <xs:sequence>
-      <xs:element ref="GoverningAgreementRef" maxOccurs="unbounded"/>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="GoverningAgreementRefType">
-    <xs:attribute name="governingAgreementRef" type="xs:anyURI" use="required"/>
-  </xs:complexType>
-
-  <xs:complexType name="PrincipalAuthenticationMechanismType">
-    <xs:sequence>
-      <xs:element ref="Password" minOccurs="0"/>
-      <xs:element ref="RestrictedPassword" minOccurs="0"/>
-      <xs:element ref="Token" minOccurs="0"/>
-      <xs:element ref="Smartcard" minOccurs="0"/>
-      <xs:element ref="ActivationPin" minOccurs="0"/>
-      <xs:element ref="Extension" minOccurs="0" maxOccurs="unbounded"/>
-    </xs:sequence>
-    <xs:attribute name="preauth" type="xs:integer" use="optional"/>
-  </xs:complexType>
-  
-  <xs:group name="AuthenticatorChoiceGroup">
-    <xs:choice>
-      <xs:element ref="PreviousSession"/>
-      <xs:element ref="ResumeSession"/>
-      <xs:element ref="DigSig"/>
-      <xs:element ref="Password"/>
-      <xs:element ref="RestrictedPassword"/>
-      <xs:element ref="ZeroKnowledge"/>
-      <xs:element ref="SharedSecretChallengeResponse"/>
-      <xs:element ref="SharedSecretDynamicPlaintext"/>
-      <xs:element ref="IPAddress"/>
-      <xs:element ref="AsymmetricDecryption"/>
-      <xs:element ref="AsymmetricKeyAgreement"/>
-      <xs:element ref="SubscriberLineNumber"/>
-      <xs:element ref="UserSuffix"/>
-      <xs:element ref="ComplexAuthenticator"/>
-    </xs:choice>
-  </xs:group>
-  
-  <xs:group name="AuthenticatorSequenceGroup">
-    <xs:sequence>
-      <xs:element ref="PreviousSession" minOccurs="0"/>
-      <xs:element ref="ResumeSession" minOccurs="0"/>
-      <xs:element ref="DigSig" minOccurs="0"/>
-      <xs:element ref="Password" minOccurs="0"/>
-      <xs:element ref="RestrictedPassword" minOccurs="0"/>
-      <xs:element ref="ZeroKnowledge" minOccurs="0"/>
-      <xs:element ref="SharedSecretChallengeResponse" minOccurs="0"/>
-      <xs:element ref="SharedSecretDynamicPlaintext" minOccurs="0"/>
-      <xs:element ref="IPAddress" minOccurs="0"/>
-      <xs:element ref="AsymmetricDecryption" minOccurs="0"/>
-      <xs:element ref="AsymmetricKeyAgreement" minOccurs="0"/>
-      <xs:element ref="SubscriberLineNumber" minOccurs="0"/>
-      <xs:element ref="UserSuffix" minOccurs="0"/>
-      <xs:element ref="Extension" minOccurs="0" maxOccurs="unbounded"/>
-    </xs:sequence>
-  </xs:group>
-
-  <xs:complexType name="AuthenticatorBaseType">
-    <xs:sequence>
-      <xs:group ref="AuthenticatorChoiceGroup"/>
-      <xs:group ref="AuthenticatorSequenceGroup"/>
-    </xs:sequence>
-  </xs:complexType>
-  
-  <xs:complexType name="ComplexAuthenticatorType">
-    <xs:sequence>
-      <xs:group ref="AuthenticatorChoiceGroup"/>
-      <xs:group ref="AuthenticatorSequenceGroup"/>
-    </xs:sequence>
-  </xs:complexType>
-  
-  <xs:complexType name="AuthenticatorTransportProtocolType">
-    <xs:sequence>
-      <xs:choice minOccurs="0">
-        <xs:element ref="HTTP"/>
-        <xs:element ref="SSL"/>
-        <xs:element ref="MobileNetworkNoEncryption"/>
-        <xs:element ref="MobileNetworkRadioEncryption"/>
-        <xs:element ref="MobileNetworkEndToEndEncryption"/>
-        <xs:element ref="WTLS"/>
-        <xs:element ref="IPSec"/>
-        <xs:element ref="PSTN"/>
-        <xs:element ref="ISDN"/>
-        <xs:element ref="ADSL"/>
-      </xs:choice>
-      <xs:element ref="Extension" minOccurs="0" maxOccurs="unbounded"/>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="KeyActivationType">
-    <xs:sequence>
-      <xs:element ref="ActivationPin" minOccurs="0"/>
-      <xs:element ref="Extension" minOccurs="0" maxOccurs="unbounded"/>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="KeySharingType">
-    <xs:attribute name="sharing" type="xs:boolean" use="required"/>
-  </xs:complexType>
-
-  <xs:complexType name="PrivateKeyProtectionType">
-    <xs:sequence>
-      <xs:element ref="KeyActivation" minOccurs="0"/>
-      <xs:element ref="KeyStorage" minOccurs="0"/>
-      <xs:element ref="KeySharing" minOccurs="0"/>
-      <xs:element ref="Extension" minOccurs="0" maxOccurs="unbounded"/>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="PasswordType">
-    <xs:sequence>
-      <xs:element ref="Length" minOccurs="0"/>
-      <xs:element ref="Alphabet" minOccurs="0"/>
-      <xs:element ref="Generation" minOccurs="0"/>
-      <xs:element ref="Extension" minOccurs="0" maxOccurs="unbounded"/>
-    </xs:sequence>
-    <xs:attribute name="ExternalVerification" type="xs:anyURI" use="optional"/>
-  </xs:complexType>
-
-  <xs:element name="RestrictedPassword" type="RestrictedPasswordType"/>
-
-  <xs:complexType name="RestrictedPasswordType">
-    <xs:complexContent>
-      <xs:restriction base="PasswordType">
-        <xs:sequence>
-          <xs:element name="Length" type="RestrictedLengthType" minOccurs="1"/>
-          <xs:element ref="Generation" minOccurs="0"/>
-          <xs:element ref="Extension" minOccurs="0" maxOccurs="unbounded"/>
-        </xs:sequence>
-        <xs:attribute name="ExternalVerification" type="xs:anyURI" use="optional"/>
-      </xs:restriction>
-    </xs:complexContent>
-  </xs:complexType>
-  
-  <xs:complexType name="RestrictedLengthType">
-    <xs:complexContent>
-      <xs:restriction base="LengthType">
-        <xs:attribute name="min" use="required">
-          <xs:simpleType>
-            <xs:restriction base="xs:integer">
-              <xs:minInclusive value="3"/>
-            </xs:restriction>
-          </xs:simpleType>
-        </xs:attribute>
-        <xs:attribute name="max" type="xs:integer" use="optional"/>
-      </xs:restriction>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <xs:complexType name="ActivationPinType">
-    <xs:sequence>
-      <xs:element ref="Length" minOccurs="0"/>
-      <xs:element ref="Alphabet" minOccurs="0"/>
-      <xs:element ref="Generation" minOccurs="0"/>
-      <xs:element ref="ActivationLimit" minOccurs="0"/>
-      <xs:element ref="Extension" minOccurs="0" maxOccurs="unbounded"/>
-    </xs:sequence>
-  </xs:complexType>
-  
-  <xs:element name="Alphabet" type="AlphabetType"/>
-  <xs:complexType name="AlphabetType">
-    <xs:attribute name="requiredChars" type="xs:string" use="required"/>
-    <xs:attribute name="excludedChars" type="xs:string" use="optional"/>
-    <xs:attribute name="case" type="xs:string" use="optional"/>
-  </xs:complexType>
-  
-  <xs:complexType name="TokenType">
-    <xs:sequence>
-      <xs:element ref="TimeSyncToken"/>
-      <xs:element ref="Extension" minOccurs="0" maxOccurs="unbounded"/>
-    </xs:sequence>
-  </xs:complexType>
-  
-  <xs:simpleType name="DeviceTypeType">
-    <xs:restriction base="xs:NMTOKEN">
-      <xs:enumeration value="hardware"/>
-      <xs:enumeration value="software"/>
-    </xs:restriction>
-  </xs:simpleType>
-  
-  <xs:simpleType name="booleanType">
-    <xs:restriction base="xs:NMTOKEN">
-      <xs:enumeration value="true"/>
-      <xs:enumeration value="false"/>
-    </xs:restriction>
-  </xs:simpleType>
-  
-  <xs:complexType name="TimeSyncTokenType">
-    <xs:attribute name="DeviceType" type="DeviceTypeType" use="required"/>
-    <xs:attribute name="SeedLength" type="xs:integer" use="required"/>
-    <xs:attribute name="DeviceInHand" type="booleanType" use="required"/>
-  </xs:complexType>
-  
-  <xs:complexType name="ActivationLimitType">
-    <xs:choice>
-      <xs:element ref="ActivationLimitDuration"/>
-      <xs:element ref="ActivationLimitUsages"/>
-      <xs:element ref="ActivationLimitSession"/>
-    </xs:choice>
-  </xs:complexType>
-  
-  <xs:element name="ActivationLimitDuration" type="ActivationLimitDurationType">
-    <xs:annotation>
-      <xs:documentation>
-        This element indicates that the Key Activation Limit is
-        defined as a specific duration of time.
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-  
-  <xs:element name="ActivationLimitUsages" type="ActivationLimitUsagesType">
-    <xs:annotation>
-      <xs:documentation>
-        This element indicates that the Key Activation Limit is
-        defined as a number of usages.
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-  
-  <xs:element name="ActivationLimitSession" type="ActivationLimitSessionType">
-    <xs:annotation>
-      <xs:documentation>
-        This element indicates that the Key Activation Limit is
-        the session.
-      </xs:documentation>
-    </xs:annotation>
-  </xs:element>
-  
-  <xs:complexType name="ActivationLimitDurationType">
-    <xs:attribute name="duration" type="xs:duration" use="required"/>
-  </xs:complexType>
-  
-  <xs:complexType name="ActivationLimitUsagesType">
-    <xs:attribute name="number" type="xs:integer" use="required"/>
-  </xs:complexType>
-  
-  <xs:complexType name="ActivationLimitSessionType"/>
-  
-  <xs:complexType name="LengthType">
-    <xs:attribute name="min" type="xs:integer" use="required"/>
-    <xs:attribute name="max" type="xs:integer" use="optional"/>
-  </xs:complexType>
-
-  <xs:simpleType name="mediumType">
-    <xs:restriction base="xs:NMTOKEN">
-      <xs:enumeration value="memory"/>
-      <xs:enumeration value="smartcard"/>
-      <xs:enumeration value="token"/>
-      <xs:enumeration value="MobileDevice"/>
-      <xs:enumeration value="MobileAuthCard"/>
-    </xs:restriction>
-  </xs:simpleType>
-
-  <xs:complexType name="KeyStorageType">
-    <xs:attribute name="medium" type="mediumType" use="required"/>
-  </xs:complexType>
-
-  <xs:complexType name="SecretKeyProtectionType">
-    <xs:sequence>
-      <xs:element ref="KeyActivation" minOccurs="0"/>
-      <xs:element ref="KeyStorage" minOccurs="0"/>
-      <xs:element ref="Extension" minOccurs="0" maxOccurs="unbounded"/>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="SecurityAuditType">
-    <xs:sequence>
-      <xs:element ref="SwitchAudit" minOccurs="0"/>
-      <xs:element ref="Extension" minOccurs="0" maxOccurs="unbounded"/>
-    </xs:sequence>
-  </xs:complexType>
-
-  <xs:complexType name="ExtensionOnlyType">
-    <xs:sequence>
-      <xs:element ref="Extension" minOccurs="0"  maxOccurs="unbounded"/>
-    </xs:sequence>
-  </xs:complexType>
-  
-  <xs:element name="Extension" type="ExtensionType"/>
-
-  <xs:complexType name="ExtensionType">
-    <xs:sequence>
-      <xs:any namespace="##other" processContents="lax" maxOccurs="unbounded"/>
-    </xs:sequence>
-  </xs:complexType>
-
-</xs:schema>
diff --git a/saml/vendor/onelogin/php-saml/src/Saml2/schemas/saml-schema-metadata-2.0.xsd b/saml/vendor/onelogin/php-saml/src/Saml2/schemas/saml-schema-metadata-2.0.xsd
deleted file mode 100644
index 86e58f9b..00000000
--- a/saml/vendor/onelogin/php-saml/src/Saml2/schemas/saml-schema-metadata-2.0.xsd
+++ /dev/null
@@ -1,336 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema
-    targetNamespace="urn:oasis:names:tc:SAML:2.0:metadata"
-    xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
-    xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-    xmlns:xenc="http://www.w3.org/2001/04/xmlenc#"
-    xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"
-    xmlns="http://www.w3.org/2001/XMLSchema"
-    elementFormDefault="unqualified"
-    attributeFormDefault="unqualified"
-    blockDefault="substitution"
-    version="2.0">
-    <import namespace="http://www.w3.org/2000/09/xmldsig#"
-        schemaLocation="xmldsig-core-schema.xsd"/>
-    <import namespace="http://www.w3.org/2001/04/xmlenc#"
-        schemaLocation="xenc-schema.xsd"/>
-    <import namespace="urn:oasis:names:tc:SAML:2.0:assertion"
-        schemaLocation="saml-schema-assertion-2.0.xsd"/>
-    <import namespace="http://www.w3.org/XML/1998/namespace"
-        schemaLocation="xml.xsd"/>
-    <annotation>
-        <documentation>
-            Document identifier: saml-schema-metadata-2.0
-            Location: http://docs.oasis-open.org/security/saml/v2.0/
-            Revision history:
-              V2.0 (March, 2005):
-                Schema for SAML metadata, first published in SAML 2.0.
-        </documentation>
-    </annotation>
-
-    <simpleType name="entityIDType">
-        <restriction base="anyURI">
-            <maxLength value="1024"/>
-        </restriction>
-    </simpleType>
-    <complexType name="localizedNameType">
-        <simpleContent>
-            <extension base="string">
-                <attribute ref="xml:lang" use="required"/>
-            </extension>
-        </simpleContent>
-    </complexType>
-    <complexType name="localizedURIType">
-        <simpleContent>
-            <extension base="anyURI">
-                <attribute ref="xml:lang" use="required"/>
-            </extension>
-        </simpleContent>
-    </complexType>
-    
-    <element name="Extensions" type="md:ExtensionsType"/>
-    <complexType final="#all" name="ExtensionsType">
-        <sequence>
-            <any namespace="##other" processContents="lax" maxOccurs="unbounded"/>
-        </sequence>
-    </complexType>
-    
-    <complexType name="EndpointType">
-        <sequence>
-            <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-        </sequence>
-        <attribute name="Binding" type="anyURI" use="required"/>
-        <attribute name="Location" type="anyURI" use="required"/>
-        <attribute name="ResponseLocation" type="anyURI" use="optional"/>
-        <anyAttribute namespace="##other" processContents="lax"/>
-    </complexType>
-    
-    <complexType name="IndexedEndpointType">
-        <complexContent>
-            <extension base="md:EndpointType">
-                <attribute name="index" type="unsignedShort" use="required"/>
-                <attribute name="isDefault" type="boolean" use="optional"/>
-            </extension>
-        </complexContent>
-    </complexType>
-    
-    <element name="EntitiesDescriptor" type="md:EntitiesDescriptorType"/>
-    <complexType name="EntitiesDescriptorType">
-        <sequence>
-            <element ref="ds:Signature" minOccurs="0"/>
-            <element ref="md:Extensions" minOccurs="0"/>
-            <choice minOccurs="1" maxOccurs="unbounded">
-                <element ref="md:EntityDescriptor"/>
-                <element ref="md:EntitiesDescriptor"/>
-            </choice>
-        </sequence>
-        <attribute name="validUntil" type="dateTime" use="optional"/>
-        <attribute name="cacheDuration" type="duration" use="optional"/>
-        <attribute name="ID" type="ID" use="optional"/>
-        <attribute name="Name" type="string" use="optional"/>
-    </complexType>
-
-    <element name="EntityDescriptor" type="md:EntityDescriptorType"/>
-    <complexType name="EntityDescriptorType">
-        <sequence>
-            <element ref="ds:Signature" minOccurs="0"/>
-            <element ref="md:Extensions" minOccurs="0"/>
-            <choice>
-                <choice maxOccurs="unbounded">
-                    <element ref="md:RoleDescriptor"/>
-                    <element ref="md:IDPSSODescriptor"/>
-                    <element ref="md:SPSSODescriptor"/>
-                    <element ref="md:AuthnAuthorityDescriptor"/>
-                    <element ref="md:AttributeAuthorityDescriptor"/>
-                    <element ref="md:PDPDescriptor"/>
-                </choice>
-                <element ref="md:AffiliationDescriptor"/>
-            </choice>
-            <element ref="md:Organization" minOccurs="0"/>
-            <element ref="md:ContactPerson" minOccurs="0" maxOccurs="unbounded"/>
-            <element ref="md:AdditionalMetadataLocation" minOccurs="0" maxOccurs="unbounded"/>
-        </sequence>
-        <attribute name="entityID" type="md:entityIDType" use="required"/>
-        <attribute name="validUntil" type="dateTime" use="optional"/>
-        <attribute name="cacheDuration" type="duration" use="optional"/>
-        <attribute name="ID" type="ID" use="optional"/>
-        <anyAttribute namespace="##other" processContents="lax"/>
-    </complexType>
-    
-    <element name="Organization" type="md:OrganizationType"/>
-    <complexType name="OrganizationType">
-        <sequence>
-            <element ref="md:Extensions" minOccurs="0"/>
-            <element ref="md:OrganizationName" maxOccurs="unbounded"/>
-            <element ref="md:OrganizationDisplayName" maxOccurs="unbounded"/>
-            <element ref="md:OrganizationURL" maxOccurs="unbounded"/>
-        </sequence>
-        <anyAttribute namespace="##other" processContents="lax"/>
-    </complexType>
-    <element name="OrganizationName" type="md:localizedNameType"/>
-    <element name="OrganizationDisplayName" type="md:localizedNameType"/>
-    <element name="OrganizationURL" type="md:localizedURIType"/>
-    <element name="ContactPerson" type="md:ContactType"/>
-    <complexType name="ContactType">
-        <sequence>
-            <element ref="md:Extensions" minOccurs="0"/>
-            <element ref="md:Company" minOccurs="0"/>
-            <element ref="md:GivenName" minOccurs="0"/>
-            <element ref="md:SurName" minOccurs="0"/>
-            <element ref="md:EmailAddress" minOccurs="0" maxOccurs="unbounded"/>
-            <element ref="md:TelephoneNumber" minOccurs="0" maxOccurs="unbounded"/>
-        </sequence>
-        <attribute name="contactType" type="md:ContactTypeType" use="required"/>
-        <anyAttribute namespace="##other" processContents="lax"/>
-    </complexType>
-    <element name="Company" type="string"/>
-    <element name="GivenName" type="string"/>
-    <element name="SurName" type="string"/>
-    <element name="EmailAddress" type="anyURI"/>
-    <element name="TelephoneNumber" type="string"/>
-    <simpleType name="ContactTypeType">
-        <restriction base="string">
-            <enumeration value="technical"/>
-            <enumeration value="support"/>
-            <enumeration value="administrative"/>
-            <enumeration value="billing"/>
-            <enumeration value="other"/>
-        </restriction>
-    </simpleType>
-
-    <element name="AdditionalMetadataLocation" type="md:AdditionalMetadataLocationType"/>
-    <complexType name="AdditionalMetadataLocationType">
-        <simpleContent>
-            <extension base="anyURI">
-                <attribute name="namespace" type="anyURI" use="required"/>
-            </extension>
-        </simpleContent>
-    </complexType>
-
-    <element name="RoleDescriptor" type="md:RoleDescriptorType"/>
-    <complexType name="RoleDescriptorType" abstract="true">
-        <sequence>
-            <element ref="ds:Signature" minOccurs="0"/>
-            <element ref="md:Extensions" minOccurs="0"/>
-            <element ref="md:KeyDescriptor" minOccurs="0" maxOccurs="unbounded"/>
-            <element ref="md:Organization" minOccurs="0"/>
-            <element ref="md:ContactPerson" minOccurs="0" maxOccurs="unbounded"/>
-        </sequence>
-        <attribute name="ID" type="ID" use="optional"/>
-        <attribute name="validUntil" type="dateTime" use="optional"/>
-        <attribute name="cacheDuration" type="duration" use="optional"/>
-        <attribute name="protocolSupportEnumeration" type="md:anyURIListType" use="required"/>
-        <attribute name="errorURL" type="anyURI" use="optional"/>
-        <anyAttribute namespace="##other" processContents="lax"/>
-    </complexType>
-    <simpleType name="anyURIListType">
-        <list itemType="anyURI"/>
-    </simpleType>
-
-    <element name="KeyDescriptor" type="md:KeyDescriptorType"/>
-    <complexType name="KeyDescriptorType">
-        <sequence>
-            <element ref="ds:KeyInfo"/>
-            <element ref="md:EncryptionMethod" minOccurs="0" maxOccurs="unbounded"/>
-        </sequence>
-        <attribute name="use" type="md:KeyTypes" use="optional"/>
-    </complexType>
-    <simpleType name="KeyTypes">
-        <restriction base="string">
-            <enumeration value="encryption"/>
-            <enumeration value="signing"/>
-        </restriction>
-    </simpleType>
-    <element name="EncryptionMethod" type="xenc:EncryptionMethodType"/>
-    
-    <complexType name="SSODescriptorType" abstract="true">
-        <complexContent>
-            <extension base="md:RoleDescriptorType">
-                <sequence>
-                    <element ref="md:ArtifactResolutionService" minOccurs="0" maxOccurs="unbounded"/>
-                    <element ref="md:SingleLogoutService" minOccurs="0" maxOccurs="unbounded"/>
-                    <element ref="md:ManageNameIDService" minOccurs="0" maxOccurs="unbounded"/>
-                    <element ref="md:NameIDFormat" minOccurs="0" maxOccurs="unbounded"/>
-                </sequence>
-            </extension>
-        </complexContent>
-    </complexType>
-    <element name="ArtifactResolutionService" type="md:IndexedEndpointType"/>
-    <element name="SingleLogoutService" type="md:EndpointType"/>
-    <element name="ManageNameIDService" type="md:EndpointType"/>
-    <element name="NameIDFormat" type="anyURI"/>
-
-    <element name="IDPSSODescriptor" type="md:IDPSSODescriptorType"/>
-    <complexType name="IDPSSODescriptorType">
-        <complexContent>
-            <extension base="md:SSODescriptorType">
-                <sequence>
-                    <element ref="md:SingleSignOnService" maxOccurs="unbounded"/>
-                    <element ref="md:NameIDMappingService" minOccurs="0" maxOccurs="unbounded"/>
-                    <element ref="md:AssertionIDRequestService" minOccurs="0" maxOccurs="unbounded"/>
-                    <element ref="md:AttributeProfile" minOccurs="0" maxOccurs="unbounded"/>
-                    <element ref="saml:Attribute" minOccurs="0" maxOccurs="unbounded"/>
-                </sequence>
-                <attribute name="WantAuthnRequestsSigned" type="boolean" use="optional"/>
-            </extension>
-        </complexContent>
-    </complexType>
-    <element name="SingleSignOnService" type="md:EndpointType"/>
-    <element name="NameIDMappingService" type="md:EndpointType"/>
-    <element name="AssertionIDRequestService" type="md:EndpointType"/>
-    <element name="AttributeProfile" type="anyURI"/>
-    
-    <element name="SPSSODescriptor" type="md:SPSSODescriptorType"/>
-    <complexType name="SPSSODescriptorType">
-        <complexContent>
-            <extension base="md:SSODescriptorType">
-                <sequence>
-                    <element ref="md:AssertionConsumerService" maxOccurs="unbounded"/>
-                    <element ref="md:AttributeConsumingService" minOccurs="0" maxOccurs="unbounded"/>
-                </sequence>
-                <attribute name="AuthnRequestsSigned" type="boolean" use="optional"/>
-                <attribute name="WantAssertionsSigned" type="boolean" use="optional"/>
-            </extension>
-        </complexContent>
-    </complexType>
-    <element name="AssertionConsumerService" type="md:IndexedEndpointType"/>
-    <element name="AttributeConsumingService" type="md:AttributeConsumingServiceType"/>
-    <complexType name="AttributeConsumingServiceType">
-        <sequence>
-            <element ref="md:ServiceName" maxOccurs="unbounded"/>
-            <element ref="md:ServiceDescription" minOccurs="0" maxOccurs="unbounded"/>
-            <element ref="md:RequestedAttribute" maxOccurs="unbounded"/>
-        </sequence>
-        <attribute name="index" type="unsignedShort" use="required"/>
-        <attribute name="isDefault" type="boolean" use="optional"/>
-    </complexType>
-    <element name="ServiceName" type="md:localizedNameType"/>
-    <element name="ServiceDescription" type="md:localizedNameType"/>
-    <element name="RequestedAttribute" type="md:RequestedAttributeType"/>
-    <complexType name="RequestedAttributeType">
-        <complexContent>
-            <extension base="saml:AttributeType">
-                <attribute name="isRequired" type="boolean" use="optional"/>
-            </extension>
-        </complexContent>
-    </complexType>
-  
-    <element name="AuthnAuthorityDescriptor" type="md:AuthnAuthorityDescriptorType"/>
-    <complexType name="AuthnAuthorityDescriptorType">
-        <complexContent>
-            <extension base="md:RoleDescriptorType">
-                <sequence>
-                    <element ref="md:AuthnQueryService" maxOccurs="unbounded"/>
-                    <element ref="md:AssertionIDRequestService" minOccurs="0" maxOccurs="unbounded"/>
-                    <element ref="md:NameIDFormat" minOccurs="0" maxOccurs="unbounded"/>
-                </sequence>
-            </extension>
-        </complexContent>
-    </complexType>
-    <element name="AuthnQueryService" type="md:EndpointType"/>
-
-    <element name="PDPDescriptor" type="md:PDPDescriptorType"/>
-    <complexType name="PDPDescriptorType">
-        <complexContent>
-            <extension base="md:RoleDescriptorType">
-                <sequence>
-                    <element ref="md:AuthzService" maxOccurs="unbounded"/>
-                    <element ref="md:AssertionIDRequestService" minOccurs="0" maxOccurs="unbounded"/>
-                    <element ref="md:NameIDFormat" minOccurs="0" maxOccurs="unbounded"/>
-                </sequence>
-            </extension>
-        </complexContent>
-    </complexType>
-    <element name="AuthzService" type="md:EndpointType"/>
-
-    <element name="AttributeAuthorityDescriptor" type="md:AttributeAuthorityDescriptorType"/>
-    <complexType name="AttributeAuthorityDescriptorType">
-        <complexContent>
-            <extension base="md:RoleDescriptorType">
-                <sequence>
-                    <element ref="md:AttributeService" maxOccurs="unbounded"/>
-                    <element ref="md:AssertionIDRequestService" minOccurs="0" maxOccurs="unbounded"/>
-                    <element ref="md:NameIDFormat" minOccurs="0" maxOccurs="unbounded"/>
-                    <element ref="md:AttributeProfile" minOccurs="0" maxOccurs="unbounded"/>
-                    <element ref="saml:Attribute" minOccurs="0" maxOccurs="unbounded"/>
-                </sequence>
-            </extension>
-        </complexContent>
-    </complexType>
-    <element name="AttributeService" type="md:EndpointType"/>
-   
-    <element name="AffiliationDescriptor" type="md:AffiliationDescriptorType"/>
-    <complexType name="AffiliationDescriptorType">
-        <sequence>
-            <element ref="ds:Signature" minOccurs="0"/>
-            <element ref="md:Extensions" minOccurs="0"/>
-            <element ref="md:AffiliateMember" maxOccurs="unbounded"/>
-        </sequence>
-        <attribute name="affiliationOwnerID" type="md:entityIDType" use="required"/>
-        <attribute name="validUntil" type="dateTime" use="optional"/>
-        <attribute name="cacheDuration" type="duration" use="optional"/>
-        <attribute name="ID" type="ID" use="optional"/>
-        <anyAttribute namespace="##other" processContents="lax"/>
-    </complexType>
-    <element name="AffiliateMember" type="md:entityIDType"/>
-</schema>
diff --git a/saml/vendor/onelogin/php-saml/src/Saml2/schemas/saml-schema-protocol-2.0.xsd b/saml/vendor/onelogin/php-saml/src/Saml2/schemas/saml-schema-protocol-2.0.xsd
deleted file mode 100644
index 7fa6f489..00000000
--- a/saml/vendor/onelogin/php-saml/src/Saml2/schemas/saml-schema-protocol-2.0.xsd
+++ /dev/null
@@ -1,302 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema
-    targetNamespace="urn:oasis:names:tc:SAML:2.0:protocol"
-    xmlns="http://www.w3.org/2001/XMLSchema"
-    xmlns:samlp="urn:oasis:names:tc:SAML:2.0:protocol"
-    xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"
-    xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-    elementFormDefault="unqualified"
-    attributeFormDefault="unqualified"
-    blockDefault="substitution"
-    version="2.0">
-    <import namespace="urn:oasis:names:tc:SAML:2.0:assertion"
-        schemaLocation="saml-schema-assertion-2.0.xsd"/>
-    <import namespace="http://www.w3.org/2000/09/xmldsig#"
-        schemaLocation="xmldsig-core-schema.xsd"/>
-    <annotation>
-        <documentation>
-            Document identifier: saml-schema-protocol-2.0
-            Location: http://docs.oasis-open.org/security/saml/v2.0/
-            Revision history:
-            V1.0 (November, 2002):
-              Initial Standard Schema.
-            V1.1 (September, 2003):
-              Updates within the same V1.0 namespace.
-            V2.0 (March, 2005):
-              New protocol schema based in a SAML V2.0 namespace.
-     </documentation>
-    </annotation>
-    <complexType name="RequestAbstractType" abstract="true">
-        <sequence>
-            <element ref="saml:Issuer" minOccurs="0"/>
-            <element ref="ds:Signature" minOccurs="0"/>
-            <element ref="samlp:Extensions" minOccurs="0"/>
-        </sequence>
-        <attribute name="ID" type="ID" use="required"/>
-        <attribute name="Version" type="string" use="required"/>
-        <attribute name="IssueInstant" type="dateTime" use="required"/>
-        <attribute name="Destination" type="anyURI" use="optional"/>
-    	<attribute name="Consent" type="anyURI" use="optional"/>
-    </complexType>
-    <element name="Extensions" type="samlp:ExtensionsType"/>
-    <complexType name="ExtensionsType">
-        <sequence>
-            <any namespace="##other" processContents="lax" maxOccurs="unbounded"/>
-        </sequence>
-    </complexType>
-    <complexType name="StatusResponseType">
-    	<sequence>
-            <element ref="saml:Issuer" minOccurs="0"/>
-            <element ref="ds:Signature" minOccurs="0"/>
-            <element ref="samlp:Extensions" minOccurs="0"/>
-            <element ref="samlp:Status"/>
-    	</sequence>
-    	<attribute name="ID" type="ID" use="required"/>
-    	<attribute name="InResponseTo" type="NCName" use="optional"/>
-    	<attribute name="Version" type="string" use="required"/>
-    	<attribute name="IssueInstant" type="dateTime" use="required"/>
-    	<attribute name="Destination" type="anyURI" use="optional"/>
-    	<attribute name="Consent" type="anyURI" use="optional"/>
-    </complexType>
-    <element name="Status" type="samlp:StatusType"/>
-    <complexType name="StatusType">
-        <sequence>
-            <element ref="samlp:StatusCode"/>
-            <element ref="samlp:StatusMessage" minOccurs="0"/>
-            <element ref="samlp:StatusDetail" minOccurs="0"/>
-        </sequence>
-    </complexType>
-    <element name="StatusCode" type="samlp:StatusCodeType"/>
-    <complexType name="StatusCodeType">
-        <sequence>
-            <element ref="samlp:StatusCode" minOccurs="0"/>
-        </sequence>
-        <attribute name="Value" type="anyURI" use="required"/>
-    </complexType>
-    <element name="StatusMessage" type="string"/>
-    <element name="StatusDetail" type="samlp:StatusDetailType"/>
-    <complexType name="StatusDetailType">
-        <sequence>
-            <any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-        </sequence>
-    </complexType>
-    <element name="AssertionIDRequest" type="samlp:AssertionIDRequestType"/>
-    <complexType name="AssertionIDRequestType">
-    	<complexContent>
-            <extension base="samlp:RequestAbstractType">
-                <sequence>
-                    <element ref="saml:AssertionIDRef" maxOccurs="unbounded"/>
-                </sequence>
-            </extension>
-    	</complexContent>
-    </complexType>
-    <element name="SubjectQuery" type="samlp:SubjectQueryAbstractType"/>
-    <complexType name="SubjectQueryAbstractType" abstract="true">
-    	<complexContent>
-            <extension base="samlp:RequestAbstractType">
-                <sequence>
-                    <element ref="saml:Subject"/>
-                </sequence>
-            </extension>
-    	</complexContent>
-    </complexType>
-    <element name="AuthnQuery" type="samlp:AuthnQueryType"/>
-    <complexType name="AuthnQueryType">
-        <complexContent>
-            <extension base="samlp:SubjectQueryAbstractType">
-                <sequence>
-                    <element ref="samlp:RequestedAuthnContext" minOccurs="0"/>
-                </sequence>
-                <attribute name="SessionIndex" type="string" use="optional"/>
-            </extension>
-        </complexContent>
-    </complexType>
-    <element name="RequestedAuthnContext" type="samlp:RequestedAuthnContextType"/>
-    <complexType name="RequestedAuthnContextType">
-        <choice>
-            <element ref="saml:AuthnContextClassRef" maxOccurs="unbounded"/>
-            <element ref="saml:AuthnContextDeclRef" maxOccurs="unbounded"/>
-        </choice>
-        <attribute name="Comparison" type="samlp:AuthnContextComparisonType" use="optional"/>
-    </complexType>
-    <simpleType name="AuthnContextComparisonType">
-        <restriction base="string">
-            <enumeration value="exact"/>
-            <enumeration value="minimum"/>
-            <enumeration value="maximum"/>
-            <enumeration value="better"/>
-        </restriction>
-    </simpleType>
-    <element name="AttributeQuery" type="samlp:AttributeQueryType"/>
-    <complexType name="AttributeQueryType">
-        <complexContent>
-            <extension base="samlp:SubjectQueryAbstractType">
-                <sequence>
-                    <element ref="saml:Attribute" minOccurs="0" maxOccurs="unbounded"/>
-                </sequence>
-            </extension>
-        </complexContent>
-    </complexType>
-    <element name="AuthzDecisionQuery" type="samlp:AuthzDecisionQueryType"/>
-    <complexType name="AuthzDecisionQueryType">
-        <complexContent>
-            <extension base="samlp:SubjectQueryAbstractType">
-                <sequence>
-                    <element ref="saml:Action" maxOccurs="unbounded"/>
-                    <element ref="saml:Evidence" minOccurs="0"/>
-                </sequence>
-                <attribute name="Resource" type="anyURI" use="required"/>
-            </extension>
-        </complexContent>
-    </complexType>
-    <element name="AuthnRequest" type="samlp:AuthnRequestType"/>
-    <complexType name="AuthnRequestType">
-        <complexContent>
-            <extension base="samlp:RequestAbstractType">
-                <sequence>
-                    <element ref="saml:Subject" minOccurs="0"/>
-                    <element ref="samlp:NameIDPolicy" minOccurs="0"/>
-                    <element ref="saml:Conditions" minOccurs="0"/>
-                    <element ref="samlp:RequestedAuthnContext" minOccurs="0"/>
-                    <element ref="samlp:Scoping" minOccurs="0"/>
-                </sequence>
-                <attribute name="ForceAuthn" type="boolean" use="optional"/>
-                <attribute name="IsPassive" type="boolean" use="optional"/>
-                <attribute name="ProtocolBinding" type="anyURI" use="optional"/>
-                <attribute name="AssertionConsumerServiceIndex" type="unsignedShort" use="optional"/>
-                <attribute name="AssertionConsumerServiceURL" type="anyURI" use="optional"/>
-                <attribute name="AttributeConsumingServiceIndex" type="unsignedShort" use="optional"/>
-                <attribute name="ProviderName" type="string" use="optional"/>
-            </extension>
-        </complexContent>
-    </complexType>
-    <element name="NameIDPolicy" type="samlp:NameIDPolicyType"/>
-    <complexType name="NameIDPolicyType">
-        <attribute name="Format" type="anyURI" use="optional"/>
-        <attribute name="SPNameQualifier" type="string" use="optional"/>
-        <attribute name="AllowCreate" type="boolean" use="optional"/>
-    </complexType>
-    <element name="Scoping" type="samlp:ScopingType"/>
-    <complexType name="ScopingType">
-        <sequence>
-            <element ref="samlp:IDPList" minOccurs="0"/>
-            <element ref="samlp:RequesterID" minOccurs="0" maxOccurs="unbounded"/>
-        </sequence>
-        <attribute name="ProxyCount" type="nonNegativeInteger" use="optional"/>
-    </complexType>
-    <element name="RequesterID" type="anyURI"/>
-    <element name="IDPList" type="samlp:IDPListType"/>
-    <complexType name="IDPListType">
-        <sequence>
-            <element ref="samlp:IDPEntry" maxOccurs="unbounded"/>
-            <element ref="samlp:GetComplete" minOccurs="0"/>
-        </sequence>
-    </complexType>
-    <element name="IDPEntry" type="samlp:IDPEntryType"/>
-    <complexType name="IDPEntryType">
-        <attribute name="ProviderID" type="anyURI" use="required"/>
-        <attribute name="Name" type="string" use="optional"/>
-        <attribute name="Loc" type="anyURI" use="optional"/>
-    </complexType>
-    <element name="GetComplete" type="anyURI"/>
-    <element name="Response" type="samlp:ResponseType"/>
-    <complexType name="ResponseType">
-    	<complexContent>
-            <extension base="samlp:StatusResponseType">
-                <choice minOccurs="0" maxOccurs="unbounded">
-                    <element ref="saml:Assertion"/>
-                    <element ref="saml:EncryptedAssertion"/>
-                </choice>
-            </extension>
-    	</complexContent>
-    </complexType>
-    <element name="ArtifactResolve" type="samlp:ArtifactResolveType"/>
-    <complexType name="ArtifactResolveType">
-    	<complexContent>
-            <extension base="samlp:RequestAbstractType">
-                <sequence>
-                    <element ref="samlp:Artifact"/>
-                </sequence>
-            </extension>
-    	</complexContent>
-    </complexType>
-    <element name="Artifact" type="string"/>
-    <element name="ArtifactResponse" type="samlp:ArtifactResponseType"/>
-    <complexType name="ArtifactResponseType">
-    	<complexContent>
-            <extension base="samlp:StatusResponseType">
-                <sequence>
-                    <any namespace="##any" processContents="lax" minOccurs="0"/>
-                </sequence>
-            </extension>
-    	</complexContent>
-    </complexType>
-    <element name="ManageNameIDRequest" type="samlp:ManageNameIDRequestType"/>
-    <complexType name="ManageNameIDRequestType">
-    	<complexContent>
-            <extension base="samlp:RequestAbstractType">
-                <sequence>
-                    <choice>
-                        <element ref="saml:NameID"/>
-                        <element ref="saml:EncryptedID"/>
-                    </choice>
-                    <choice>
-                        <element ref="samlp:NewID"/>
-                        <element ref="samlp:NewEncryptedID"/>
-                        <element ref="samlp:Terminate"/>
-                    </choice>
-                </sequence>
-            </extension>
-    	</complexContent>
-    </complexType>
-    <element name="NewID" type="string"/>
-    <element name="NewEncryptedID" type="saml:EncryptedElementType"/>
-    <element name="Terminate" type="samlp:TerminateType"/>
-    <complexType name="TerminateType"/>
-    <element name="ManageNameIDResponse" type="samlp:StatusResponseType"/>
-    <element name="LogoutRequest" type="samlp:LogoutRequestType"/>
-    <complexType name="LogoutRequestType">
-        <complexContent>
-            <extension base="samlp:RequestAbstractType">
-                <sequence>
-                    <choice>
-                        <element ref="saml:BaseID"/>
-                        <element ref="saml:NameID"/>
-                        <element ref="saml:EncryptedID"/>
-                    </choice>
-                    <element ref="samlp:SessionIndex" minOccurs="0" maxOccurs="unbounded"/>
-                </sequence>
-                <attribute name="Reason" type="string" use="optional"/>
-                <attribute name="NotOnOrAfter" type="dateTime" use="optional"/>
-            </extension>
-        </complexContent>
-    </complexType>
-    <element name="SessionIndex" type="string"/>
-    <element name="LogoutResponse" type="samlp:StatusResponseType"/>
-    <element name="NameIDMappingRequest" type="samlp:NameIDMappingRequestType"/>
-    <complexType name="NameIDMappingRequestType">
-        <complexContent>
-            <extension base="samlp:RequestAbstractType">
-                <sequence>
-                    <choice>
-                        <element ref="saml:BaseID"/>
-                        <element ref="saml:NameID"/>
-                        <element ref="saml:EncryptedID"/>
-                    </choice>
-                    <element ref="samlp:NameIDPolicy"/>
-                </sequence>
-            </extension>
-        </complexContent>
-    </complexType>
-    <element name="NameIDMappingResponse" type="samlp:NameIDMappingResponseType"/>
-    <complexType name="NameIDMappingResponseType">
-        <complexContent>
-            <extension base="samlp:StatusResponseType">
-                <choice>
-                    <element ref="saml:NameID"/>
-                    <element ref="saml:EncryptedID"/>
-                </choice>
-            </extension>
-        </complexContent>
-    </complexType>
-</schema>
diff --git a/saml/vendor/onelogin/php-saml/src/Saml2/schemas/sstc-metadata-attr.xsd b/saml/vendor/onelogin/php-saml/src/Saml2/schemas/sstc-metadata-attr.xsd
deleted file mode 100644
index f23e462a..00000000
--- a/saml/vendor/onelogin/php-saml/src/Saml2/schemas/sstc-metadata-attr.xsd
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema 
-  targetNamespace="urn:oasis:names:tc:SAML:metadata:attribute"
-  xmlns="http://www.w3.org/2001/XMLSchema"
-  xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"
-  xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute"
-  elementFormDefault="unqualified"
-  attributeFormDefault="unqualified"
-  blockDefault="substitution"
-  version="2.0">
-
-  <annotation>
-    <documentation>
-      Document title: SAML V2.0 Metadata Extention for Entity Attributes Schema
-      Document identifier: sstc-metadata-attr.xsd
-      Location: http://www.oasis-open.org/committees/documents.php?wg_abbrev=security
-      Revision history:
-      V1.0 (November 2008):
-        Initial version.
-    </documentation>
-  </annotation>
-
-  <import namespace="urn:oasis:names:tc:SAML:2.0:assertion"
-      schemaLocation="saml-schema-assertion-2.0.xsd"/>
-
-  <element name="EntityAttributes" type="mdattr:EntityAttributesType"/>
-  <complexType name="EntityAttributesType">
-    <choice maxOccurs="unbounded">
-      <element ref="saml:Attribute"/>
-      <element ref="saml:Assertion"/>
-    </choice>
-  </complexType>
-
-</schema>
-
diff --git a/saml/vendor/onelogin/php-saml/src/Saml2/schemas/sstc-saml-attribute-ext.xsd b/saml/vendor/onelogin/php-saml/src/Saml2/schemas/sstc-saml-attribute-ext.xsd
deleted file mode 100644
index ad309c14..00000000
--- a/saml/vendor/onelogin/php-saml/src/Saml2/schemas/sstc-saml-attribute-ext.xsd
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema 
-  targetNamespace="urn:oasis:names:tc:SAML:attribute:ext"
-  xmlns="http://www.w3.org/2001/XMLSchema"
-  elementFormDefault="unqualified"
-  attributeFormDefault="unqualified"
-  blockDefault="substitution"
-  version="2.0">
-
-  <annotation>
-    <documentation>
-      Document title: SAML V2.0 Attribute Extension Schema
-      Document identifier: sstc-saml-attribute-ext.xsd
-      Location: http://www.oasis-open.org/committees/documents.php?wg_abbrev=security
-      Revision history:
-      V1.0 (October 2008):
-        Initial version.
-    </documentation>
-  </annotation>
-
-  <attribute name="OriginalIssuer" type="anyURI"/>
-  <attribute name="LastModified" type="dateTime"/>
-
-</schema>
-
diff --git a/saml/vendor/onelogin/php-saml/src/Saml2/schemas/sstc-saml-metadata-algsupport-v1.0.xsd b/saml/vendor/onelogin/php-saml/src/Saml2/schemas/sstc-saml-metadata-algsupport-v1.0.xsd
deleted file mode 100644
index 3236ffcd..00000000
--- a/saml/vendor/onelogin/php-saml/src/Saml2/schemas/sstc-saml-metadata-algsupport-v1.0.xsd
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema 
-  targetNamespace="urn:oasis:names:tc:SAML:metadata:algsupport"
-  xmlns="http://www.w3.org/2001/XMLSchema"
-  xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport"
-  elementFormDefault="unqualified"
-  attributeFormDefault="unqualified"
-  blockDefault="substitution"
-  version="1.0">
-
-  <annotation>
-    <documentation>
-      Document title: Metadata Extension Schema for SAML V2.0 Metadata Profile for Algorithm Support Version 1.0
-      Document identifier: sstc-saml-metadata-algsupport.xsd
-      Location: http://docs.oasis-open.org/security/saml/Post2.0/
-      Revision history:
-      V1.0 (June 2010):
-        Initial version.
-    </documentation>
-  </annotation>
-
-  <element name="DigestMethod" type="alg:DigestMethodType"/>
-  <complexType name="DigestMethodType">
-    <sequence>
-      <any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-    </sequence>
-    <attribute name="Algorithm" type="anyURI" use="required"/>
-  </complexType>
-
-  <element name="SigningMethod" type="alg:SigningMethodType"/>
-  <complexType name="SigningMethodType">
-    <sequence>
-      <any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-    </sequence>
-    <attribute name="Algorithm" type="anyURI" use="required"/>
-    <attribute name="MinKeySize" type="positiveInteger"/>
-    <attribute name="MaxKeySize" type="positiveInteger"/>
-  </complexType>
-
-</schema>
-
diff --git a/saml/vendor/onelogin/php-saml/src/Saml2/schemas/sstc-saml-metadata-ui-v1.0.xsd b/saml/vendor/onelogin/php-saml/src/Saml2/schemas/sstc-saml-metadata-ui-v1.0.xsd
deleted file mode 100644
index de0b754a..00000000
--- a/saml/vendor/onelogin/php-saml/src/Saml2/schemas/sstc-saml-metadata-ui-v1.0.xsd
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema 
-  targetNamespace="urn:oasis:names:tc:SAML:metadata:ui"
-  xmlns="http://www.w3.org/2001/XMLSchema"
-  xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
-  xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui"
-  elementFormDefault="unqualified"
-  attributeFormDefault="unqualified"
-  blockDefault="substitution"
-  version="1.0">
-
-  <annotation>
-    <documentation>
-      Document title: Metadata Extension Schema for SAML V2.0 Metadata Extensions for Login and Discovery User Interface Version 1.0
-      Document identifier: sstc-saml-metadata-ui-v1.0.xsd
-      Location: http://docs.oasis-open.org/security/saml/Post2.0/
-      Revision history:
-      16 November 2010:
-        Added Keywords element/type.
-      01 November 2010
-        Changed filename.
-      September 2010:
-        Initial version.
-    </documentation>
-  </annotation>
-
-  <import namespace="urn:oasis:names:tc:SAML:2.0:metadata"
-    schemaLocation="saml-schema-metadata-2.0.xsd"/>
-  <import namespace="http://www.w3.org/XML/1998/namespace"
-    schemaLocation="xml.xsd"/>
-
-  <element name="UIInfo" type="mdui:UIInfoType" />
-  <complexType name="UIInfoType">
-    <choice minOccurs="0" maxOccurs="unbounded">
-      <element ref="mdui:DisplayName"/>
-      <element ref="mdui:Description"/>
-      <element ref="mdui:Keywords"/>
-      <element ref="mdui:Logo"/>
-      <element ref="mdui:InformationURL"/>
-      <element ref="mdui:PrivacyStatementURL"/>
-      <any namespace="##other" processContents="lax"/>
-    </choice>
-  </complexType>
-
-  <element name="DisplayName" type="md:localizedNameType"/>
-  <element name="Description" type="md:localizedNameType"/>
-  <element name="InformationURL" type="md:localizedURIType"/>
-  <element name="PrivacyStatementURL" type="md:localizedURIType"/>
-
-  <element name="Keywords" type="mdui:KeywordsType"/>
-  <complexType name="KeywordsType">
-    <simpleContent>
-      <extension base="mdui:listOfStrings">
-        <attribute ref="xml:lang" use="required"/>
-      </extension>
-    </simpleContent>
-  </complexType>
-  
-  <simpleType name="listOfStrings">
-    <list itemType="string"/>
-  </simpleType>
-
-  <element name="Logo" type="mdui:LogoType"/>
-  <complexType name="LogoType">
-    <simpleContent>
-      <extension base="anyURI">
-        <attribute name="height" type="positiveInteger" use="required"/>
-        <attribute name="width" type="positiveInteger" use="required"/>
-        <attribute ref="xml:lang"/>
-      </extension>
-    </simpleContent>
-  </complexType>
-
-  <element name="DiscoHints" type="mdui:DiscoHintsType"/>
-  <complexType name="DiscoHintsType">
-    <choice minOccurs="0" maxOccurs="unbounded">
-      <element ref="mdui:IPHint"/>
-      <element ref="mdui:DomainHint"/>
-      <element ref="mdui:GeolocationHint"/>
-      <any namespace="##other" processContents="lax"/>
-    </choice>
-  </complexType>
-
-  <element name="IPHint" type="string"/>
-  <element name="DomainHint" type="string"/>	
-  <element name="GeolocationHint" type="anyURI"/>
-
-</schema>
-
diff --git a/saml/vendor/onelogin/php-saml/src/Saml2/schemas/xenc-schema.xsd b/saml/vendor/onelogin/php-saml/src/Saml2/schemas/xenc-schema.xsd
deleted file mode 100644
index d6d79103..00000000
--- a/saml/vendor/onelogin/php-saml/src/Saml2/schemas/xenc-schema.xsd
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<schema xmlns='http://www.w3.org/2001/XMLSchema' version='1.0'
-        xmlns:xenc='http://www.w3.org/2001/04/xmlenc#'
-        xmlns:ds='http://www.w3.org/2000/09/xmldsig#'
-        targetNamespace='http://www.w3.org/2001/04/xmlenc#'
-        elementFormDefault='qualified'>
-
-  <import namespace='http://www.w3.org/2000/09/xmldsig#'
-          schemaLocation='xmldsig-core-schema.xsd'/>
-
-  <complexType name='EncryptedType' abstract='true'>
-    <sequence>
-      <element name='EncryptionMethod' type='xenc:EncryptionMethodType'
-       minOccurs='0'/>
-      <element ref='ds:KeyInfo' minOccurs='0'/>
-      <element ref='xenc:CipherData'/>
-      <element ref='xenc:EncryptionProperties' minOccurs='0'/>
-    </sequence>
-    <attribute name='Id' type='ID' use='optional'/>
-    <attribute name='Type' type='anyURI' use='optional'/>
-    <attribute name='MimeType' type='string' use='optional'/>
-    <attribute name='Encoding' type='anyURI' use='optional'/>
-  </complexType>
-  
-  <complexType name='EncryptionMethodType' mixed='true'>
-    <sequence>
-      <element name='KeySize' minOccurs='0' type='xenc:KeySizeType'/>
-      <element name='OAEPparams' minOccurs='0' type='base64Binary'/>
-      <any namespace='##other' minOccurs='0' maxOccurs='unbounded'/>
-    </sequence>
-    <attribute name='Algorithm' type='anyURI' use='required'/>
-  </complexType>
-
-    <simpleType name='KeySizeType'>
-      <restriction base="integer"/>
-    </simpleType>
-
-  <element name='CipherData' type='xenc:CipherDataType'/>
-  <complexType name='CipherDataType'>
-     <choice>
-       <element name='CipherValue' type='base64Binary'/>
-       <element ref='xenc:CipherReference'/>
-     </choice>
-    </complexType>
-
-   <element name='CipherReference' type='xenc:CipherReferenceType'/>
-   <complexType name='CipherReferenceType'>
-       <choice>
-         <element name='Transforms' type='xenc:TransformsType' minOccurs='0'/>
-       </choice>
-       <attribute name='URI' type='anyURI' use='required'/>
-   </complexType>
-
-     <complexType name='TransformsType'>
-       <sequence>
-         <element ref='ds:Transform' maxOccurs='unbounded'/>
-       </sequence>
-     </complexType>
-
-
-  <element name='EncryptedData' type='xenc:EncryptedDataType'/>
-  <complexType name='EncryptedDataType'>
-    <complexContent>
-      <extension base='xenc:EncryptedType'>
-       </extension>
-    </complexContent>
-  </complexType>
-
-  <!-- Children of ds:KeyInfo -->
-
-  <element name='EncryptedKey' type='xenc:EncryptedKeyType'/>
-  <complexType name='EncryptedKeyType'>
-    <complexContent>
-      <extension base='xenc:EncryptedType'>
-        <sequence>
-          <element ref='xenc:ReferenceList' minOccurs='0'/>
-          <element name='CarriedKeyName' type='string' minOccurs='0'/>
-        </sequence>
-        <attribute name='Recipient' type='string'
-         use='optional'/>
-      </extension>
-    </complexContent>
-  </complexType>
-
-    <element name="AgreementMethod" type="xenc:AgreementMethodType"/>
-    <complexType name="AgreementMethodType" mixed="true">
-      <sequence>
-        <element name="KA-Nonce" minOccurs="0" type="base64Binary"/>
-        <!-- <element ref="ds:DigestMethod" minOccurs="0"/> -->
-        <any namespace="##other" minOccurs="0" maxOccurs="unbounded"/>
-        <element name="OriginatorKeyInfo" minOccurs="0" type="ds:KeyInfoType"/>
-        <element name="RecipientKeyInfo" minOccurs="0" type="ds:KeyInfoType"/>
-      </sequence>
-      <attribute name="Algorithm" type="anyURI" use="required"/>
-    </complexType>
-
-  <!-- End Children of ds:KeyInfo -->
-
-  <element name='ReferenceList'>
-    <complexType>
-      <choice minOccurs='1' maxOccurs='unbounded'>
-        <element name='DataReference' type='xenc:ReferenceType'/>
-        <element name='KeyReference' type='xenc:ReferenceType'/>
-      </choice>
-    </complexType>
-  </element>
-
-  <complexType name='ReferenceType'>
-    <sequence>
-      <any namespace='##other' minOccurs='0' maxOccurs='unbounded'/>
-    </sequence>
-    <attribute name='URI' type='anyURI' use='required'/>
-  </complexType>
-
-
-  <element name='EncryptionProperties' type='xenc:EncryptionPropertiesType'/>
-  <complexType name='EncryptionPropertiesType'>
-    <sequence>
-      <element ref='xenc:EncryptionProperty' maxOccurs='unbounded'/>
-    </sequence>
-    <attribute name='Id' type='ID' use='optional'/>
-  </complexType>
-
-    <element name='EncryptionProperty' type='xenc:EncryptionPropertyType'/>
-    <complexType name='EncryptionPropertyType' mixed='true'>
-      <choice maxOccurs='unbounded'>
-        <any namespace='##other' processContents='lax'/>
-      </choice>
-      <attribute name='Target' type='anyURI' use='optional'/>
-      <attribute name='Id' type='ID' use='optional'/>
-      <anyAttribute namespace="http://www.w3.org/XML/1998/namespace"/>
-    </complexType>
-
-</schema>
-
diff --git a/saml/vendor/onelogin/php-saml/src/Saml2/schemas/xml.xsd b/saml/vendor/onelogin/php-saml/src/Saml2/schemas/xml.xsd
deleted file mode 100644
index aea7d0db..00000000
--- a/saml/vendor/onelogin/php-saml/src/Saml2/schemas/xml.xsd
+++ /dev/null
@@ -1,287 +0,0 @@
-<?xml version='1.0'?>
-<?xml-stylesheet href="../2008/09/xsd.xsl" type="text/xsl"?>
-<xs:schema targetNamespace="http://www.w3.org/XML/1998/namespace" 
-  xmlns:xs="http://www.w3.org/2001/XMLSchema" 
-  xmlns   ="http://www.w3.org/1999/xhtml"
-  xml:lang="en">
-
- <xs:annotation>
-  <xs:documentation>
-   <div>
-    <h1>About the XML namespace</h1>
-
-    <div class="bodytext">
-     <p>
-      This schema document describes the XML namespace, in a form
-      suitable for import by other schema documents.
-     </p>
-     <p>
-      See <a href="http://www.w3.org/XML/1998/namespace.html">
-      http://www.w3.org/XML/1998/namespace.html</a> and
-      <a href="http://www.w3.org/TR/REC-xml">
-      http://www.w3.org/TR/REC-xml</a> for information 
-      about this namespace.
-     </p>
-     <p>
-      Note that local names in this namespace are intended to be
-      defined only by the World Wide Web Consortium or its subgroups.
-      The names currently defined in this namespace are listed below.
-      They should not be used with conflicting semantics by any Working
-      Group, specification, or document instance.
-     </p>
-     <p>   
-      See further below in this document for more information about <a
-      href="#usage">how to refer to this schema document from your own
-      XSD schema documents</a> and about <a href="#nsversioning">the
-      namespace-versioning policy governing this schema document</a>.
-     </p>
-    </div>
-   </div>
-  </xs:documentation>
- </xs:annotation>
-
- <xs:attribute name="lang">
-  <xs:annotation>
-   <xs:documentation>
-    <div>
-     
-      <h3>lang (as an attribute name)</h3>
-      <p>
-       denotes an attribute whose value
-       is a language code for the natural language of the content of
-       any element; its value is inherited.  This name is reserved
-       by virtue of its definition in the XML specification.</p>
-     
-    </div>
-    <div>
-     <h4>Notes</h4>
-     <p>
-      Attempting to install the relevant ISO 2- and 3-letter
-      codes as the enumerated possible values is probably never
-      going to be a realistic possibility.  
-     </p>
-     <p>
-      See BCP 47 at <a href="http://www.rfc-editor.org/rfc/bcp/bcp47.txt">
-       http://www.rfc-editor.org/rfc/bcp/bcp47.txt</a>
-      and the IANA language subtag registry at
-      <a href="http://www.iana.org/assignments/language-subtag-registry">
-       http://www.iana.org/assignments/language-subtag-registry</a>
-      for further information.
-     </p>
-     <p>
-      The union allows for the 'un-declaration' of xml:lang with
-      the empty string.
-     </p>
-    </div>
-   </xs:documentation>
-  </xs:annotation>
-  <xs:simpleType>
-   <xs:union memberTypes="xs:language">
-    <xs:simpleType>    
-     <xs:restriction base="xs:string">
-      <xs:enumeration value=""/>
-     </xs:restriction>
-    </xs:simpleType>
-   </xs:union>
-  </xs:simpleType>
- </xs:attribute>
-
- <xs:attribute name="space">
-  <xs:annotation>
-   <xs:documentation>
-    <div>
-     
-      <h3>space (as an attribute name)</h3>
-      <p>
-       denotes an attribute whose
-       value is a keyword indicating what whitespace processing
-       discipline is intended for the content of the element; its
-       value is inherited.  This name is reserved by virtue of its
-       definition in the XML specification.</p>
-     
-    </div>
-   </xs:documentation>
-  </xs:annotation>
-  <xs:simpleType>
-   <xs:restriction base="xs:NCName">
-    <xs:enumeration value="default"/>
-    <xs:enumeration value="preserve"/>
-   </xs:restriction>
-  </xs:simpleType>
- </xs:attribute>
- 
- <xs:attribute name="base" type="xs:anyURI"> <xs:annotation>
-   <xs:documentation>
-    <div>
-     
-      <h3>base (as an attribute name)</h3>
-      <p>
-       denotes an attribute whose value
-       provides a URI to be used as the base for interpreting any
-       relative URIs in the scope of the element on which it
-       appears; its value is inherited.  This name is reserved
-       by virtue of its definition in the XML Base specification.</p>
-     
-     <p>
-      See <a
-      href="http://www.w3.org/TR/xmlbase/">http://www.w3.org/TR/xmlbase/</a>
-      for information about this attribute.
-     </p>
-    </div>
-   </xs:documentation>
-  </xs:annotation>
- </xs:attribute>
- 
- <xs:attribute name="id" type="xs:ID">
-  <xs:annotation>
-   <xs:documentation>
-    <div>
-     
-      <h3>id (as an attribute name)</h3> 
-      <p>
-       denotes an attribute whose value
-       should be interpreted as if declared to be of type ID.
-       This name is reserved by virtue of its definition in the
-       xml:id specification.</p>
-     
-     <p>
-      See <a
-      href="http://www.w3.org/TR/xml-id/">http://www.w3.org/TR/xml-id/</a>
-      for information about this attribute.
-     </p>
-    </div>
-   </xs:documentation>
-  </xs:annotation>
- </xs:attribute>
-
- <xs:attributeGroup name="specialAttrs">
-  <xs:attribute ref="xml:base"/>
-  <xs:attribute ref="xml:lang"/>
-  <xs:attribute ref="xml:space"/>
-  <xs:attribute ref="xml:id"/>
- </xs:attributeGroup>
-
- <xs:annotation>
-  <xs:documentation>
-   <div>
-   
-    <h3>Father (in any context at all)</h3> 
-
-    <div class="bodytext">
-     <p>
-      denotes Jon Bosak, the chair of 
-      the original XML Working Group.  This name is reserved by 
-      the following decision of the W3C XML Plenary and 
-      XML Coordination groups:
-     </p>
-     <blockquote>
-       <p>
-	In appreciation for his vision, leadership and
-	dedication the W3C XML Plenary on this 10th day of
-	February, 2000, reserves for Jon Bosak in perpetuity
-	the XML name "xml:Father".
-       </p>
-     </blockquote>
-    </div>
-   </div>
-  </xs:documentation>
- </xs:annotation>
-
- <xs:annotation>
-  <xs:documentation>
-   <div xml:id="usage" id="usage">
-    <h2><a name="usage">About this schema document</a></h2>
-
-    <div class="bodytext">
-     <p>
-      This schema defines attributes and an attribute group suitable
-      for use by schemas wishing to allow <code>xml:base</code>,
-      <code>xml:lang</code>, <code>xml:space</code> or
-      <code>xml:id</code> attributes on elements they define.
-     </p>
-     <p>
-      To enable this, such a schema must import this schema for
-      the XML namespace, e.g. as follows:
-     </p>
-     <pre>
-          &lt;schema . . .>
-           . . .
-           &lt;import namespace="http://www.w3.org/XML/1998/namespace"
-                      schemaLocation="http://www.w3.org/2001/xml.xsd"/>
-     </pre>
-     <p>
-      or
-     </p>
-     <pre>
-           &lt;import namespace="http://www.w3.org/XML/1998/namespace"
-                      schemaLocation="http://www.w3.org/2009/01/xml.xsd"/>
-     </pre>
-     <p>
-      Subsequently, qualified reference to any of the attributes or the
-      group defined below will have the desired effect, e.g.
-     </p>
-     <pre>
-          &lt;type . . .>
-           . . .
-           &lt;attributeGroup ref="xml:specialAttrs"/>
-     </pre>
-     <p>
-      will define a type which will schema-validate an instance element
-      with any of those attributes.
-     </p>
-    </div>
-   </div>
-  </xs:documentation>
- </xs:annotation>
-
- <xs:annotation>
-  <xs:documentation>
-   <div id="nsversioning" xml:id="nsversioning">
-    <h2><a name="nsversioning">Versioning policy for this schema document</a></h2>
-    <div class="bodytext">
-     <p>
-      In keeping with the XML Schema WG's standard versioning
-      policy, this schema document will persist at
-      <a href="http://www.w3.org/2009/01/xml.xsd">
-       http://www.w3.org/2009/01/xml.xsd</a>.
-     </p>
-     <p>
-      At the date of issue it can also be found at
-      <a href="http://www.w3.org/2001/xml.xsd">
-       http://www.w3.org/2001/xml.xsd</a>.
-     </p>
-     <p>
-      The schema document at that URI may however change in the future,
-      in order to remain compatible with the latest version of XML
-      Schema itself, or with the XML namespace itself.  In other words,
-      if the XML Schema or XML namespaces change, the version of this
-      document at <a href="http://www.w3.org/2001/xml.xsd">
-       http://www.w3.org/2001/xml.xsd 
-      </a> 
-      will change accordingly; the version at 
-      <a href="http://www.w3.org/2009/01/xml.xsd">
-       http://www.w3.org/2009/01/xml.xsd 
-      </a> 
-      will not change.
-     </p>
-     <p>
-      Previous dated (and unchanging) versions of this schema 
-      document are at:
-     </p>
-     <ul>
-      <li><a href="http://www.w3.org/2009/01/xml.xsd">
-	http://www.w3.org/2009/01/xml.xsd</a></li>
-      <li><a href="http://www.w3.org/2007/08/xml.xsd">
-	http://www.w3.org/2007/08/xml.xsd</a></li>
-      <li><a href="http://www.w3.org/2004/10/xml.xsd">
-	http://www.w3.org/2004/10/xml.xsd</a></li>
-      <li><a href="http://www.w3.org/2001/03/xml.xsd">
-	http://www.w3.org/2001/03/xml.xsd</a></li>
-     </ul>
-    </div>
-   </div>
-  </xs:documentation>
- </xs:annotation>
-
-</xs:schema>
-
diff --git a/saml/vendor/onelogin/php-saml/src/Saml2/schemas/xmldsig-core-schema.xsd b/saml/vendor/onelogin/php-saml/src/Saml2/schemas/xmldsig-core-schema.xsd
deleted file mode 100644
index 6f5acc75..00000000
--- a/saml/vendor/onelogin/php-saml/src/Saml2/schemas/xmldsig-core-schema.xsd
+++ /dev/null
@@ -1,309 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!-- Schema for XML Signatures
-    http://www.w3.org/2000/09/xmldsig#
-    $Revision: 1.1 $ on $Date: 2002/02/08 20:32:26 $ by $Author: reagle $
-
-    Copyright 2001 The Internet Society and W3C (Massachusetts Institute
-    of Technology, Institut National de Recherche en Informatique et en
-    Automatique, Keio University). All Rights Reserved.
-    http://www.w3.org/Consortium/Legal/
-
-    This document is governed by the W3C Software License [1] as described
-    in the FAQ [2].
-
-    [1] http://www.w3.org/Consortium/Legal/copyright-software-19980720
-    [2] http://www.w3.org/Consortium/Legal/IPR-FAQ-20000620.html#DTD
--->
-
-
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
-        xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
-        targetNamespace="http://www.w3.org/2000/09/xmldsig#"
-        version="0.1" elementFormDefault="qualified"> 
-
-<!-- Basic Types Defined for Signatures -->
-
-<simpleType name="CryptoBinary">
-  <restriction base="base64Binary">
-  </restriction>
-</simpleType>
-
-<!-- Start Signature -->
-
-<element name="Signature" type="ds:SignatureType"/>
-<complexType name="SignatureType">
-  <sequence> 
-    <element ref="ds:SignedInfo"/> 
-    <element ref="ds:SignatureValue"/> 
-    <element ref="ds:KeyInfo" minOccurs="0"/> 
-    <element ref="ds:Object" minOccurs="0" maxOccurs="unbounded"/> 
-  </sequence>  
-  <attribute name="Id" type="ID" use="optional"/>
-</complexType>
-
-  <element name="SignatureValue" type="ds:SignatureValueType"/> 
-  <complexType name="SignatureValueType">
-    <simpleContent>
-      <extension base="base64Binary">
-        <attribute name="Id" type="ID" use="optional"/>
-      </extension>
-    </simpleContent>
-  </complexType>
-
-<!-- Start SignedInfo -->
-
-<element name="SignedInfo" type="ds:SignedInfoType"/>
-<complexType name="SignedInfoType">
-  <sequence> 
-    <element ref="ds:CanonicalizationMethod"/> 
-    <element ref="ds:SignatureMethod"/> 
-    <element ref="ds:Reference" maxOccurs="unbounded"/> 
-  </sequence>  
-  <attribute name="Id" type="ID" use="optional"/> 
-</complexType>
-
-  <element name="CanonicalizationMethod" type="ds:CanonicalizationMethodType"/> 
-  <complexType name="CanonicalizationMethodType" mixed="true">
-    <sequence>
-      <any namespace="##any" minOccurs="0" maxOccurs="unbounded"/>
-      <!-- (0,unbounded) elements from (1,1) namespace -->
-    </sequence>
-    <attribute name="Algorithm" type="anyURI" use="required"/> 
-  </complexType>
-
-  <element name="SignatureMethod" type="ds:SignatureMethodType"/>
-  <complexType name="SignatureMethodType" mixed="true">
-    <sequence>
-      <element name="HMACOutputLength" minOccurs="0" type="ds:HMACOutputLengthType"/>
-      <any namespace="##other" minOccurs="0" maxOccurs="unbounded"/>
-      <!-- (0,unbounded) elements from (1,1) external namespace -->
-    </sequence>
-    <attribute name="Algorithm" type="anyURI" use="required"/> 
-  </complexType>
-
-<!-- Start Reference -->
-
-<element name="Reference" type="ds:ReferenceType"/>
-<complexType name="ReferenceType">
-  <sequence> 
-    <element ref="ds:Transforms" minOccurs="0"/> 
-    <element ref="ds:DigestMethod"/> 
-    <element ref="ds:DigestValue"/> 
-  </sequence>
-  <attribute name="Id" type="ID" use="optional"/> 
-  <attribute name="URI" type="anyURI" use="optional"/> 
-  <attribute name="Type" type="anyURI" use="optional"/> 
-</complexType>
-
-  <element name="Transforms" type="ds:TransformsType"/>
-  <complexType name="TransformsType">
-    <sequence>
-      <element ref="ds:Transform" maxOccurs="unbounded"/>  
-    </sequence>
-  </complexType>
-
-  <element name="Transform" type="ds:TransformType"/>
-  <complexType name="TransformType" mixed="true">
-    <choice minOccurs="0" maxOccurs="unbounded"> 
-      <any namespace="##other" processContents="lax"/>
-      <!-- (1,1) elements from (0,unbounded) namespaces -->
-      <element name="XPath" type="string"/> 
-    </choice>
-    <attribute name="Algorithm" type="anyURI" use="required"/> 
-  </complexType>
-
-<!-- End Reference -->
-
-<element name="DigestMethod" type="ds:DigestMethodType"/>
-<complexType name="DigestMethodType" mixed="true"> 
-  <sequence>
-    <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-  </sequence>    
-  <attribute name="Algorithm" type="anyURI" use="required"/> 
-</complexType>
-
-<element name="DigestValue" type="ds:DigestValueType"/>
-<simpleType name="DigestValueType">
-  <restriction base="base64Binary"/>
-</simpleType>
-
-<!-- End SignedInfo -->
-
-<!-- Start KeyInfo -->
-
-<element name="KeyInfo" type="ds:KeyInfoType"/> 
-<complexType name="KeyInfoType" mixed="true">
-  <choice maxOccurs="unbounded">     
-    <element ref="ds:KeyName"/> 
-    <element ref="ds:KeyValue"/> 
-    <element ref="ds:RetrievalMethod"/> 
-    <element ref="ds:X509Data"/> 
-    <element ref="ds:PGPData"/> 
-    <element ref="ds:SPKIData"/>
-    <element ref="ds:MgmtData"/>
-    <any processContents="lax" namespace="##other"/>
-    <!-- (1,1) elements from (0,unbounded) namespaces -->
-  </choice>
-  <attribute name="Id" type="ID" use="optional"/> 
-</complexType>
-
-  <element name="KeyName" type="string"/>
-  <element name="MgmtData" type="string"/>
-
-  <element name="KeyValue" type="ds:KeyValueType"/> 
-  <complexType name="KeyValueType" mixed="true">
-   <choice>
-     <element ref="ds:DSAKeyValue"/>
-     <element ref="ds:RSAKeyValue"/>
-     <any namespace="##other" processContents="lax"/>
-   </choice>
-  </complexType>
-
-  <element name="RetrievalMethod" type="ds:RetrievalMethodType"/> 
-  <complexType name="RetrievalMethodType">
-    <sequence>
-      <element ref="ds:Transforms" minOccurs="0"/> 
-    </sequence>  
-    <attribute name="URI" type="anyURI"/>
-    <attribute name="Type" type="anyURI" use="optional"/>
-  </complexType>
-
-<!-- Start X509Data -->
-
-<element name="X509Data" type="ds:X509DataType"/> 
-<complexType name="X509DataType">
-  <sequence maxOccurs="unbounded">
-    <choice>
-      <element name="X509IssuerSerial" type="ds:X509IssuerSerialType"/>
-      <element name="X509SKI" type="base64Binary"/>
-      <element name="X509SubjectName" type="string"/>
-      <element name="X509Certificate" type="base64Binary"/>
-      <element name="X509CRL" type="base64Binary"/>
-      <any namespace="##other" processContents="lax"/>
-    </choice>
-  </sequence>
-</complexType>
-
-<complexType name="X509IssuerSerialType"> 
-  <sequence> 
-    <element name="X509IssuerName" type="string"/> 
-    <element name="X509SerialNumber" type="string"/> 
-  </sequence>
-</complexType>
-
-<!-- End X509Data -->
-
-<!-- Begin PGPData -->
-
-<element name="PGPData" type="ds:PGPDataType"/> 
-<complexType name="PGPDataType"> 
-  <choice>
-    <sequence>
-      <element name="PGPKeyID" type="base64Binary"/> 
-      <element name="PGPKeyPacket" type="base64Binary" minOccurs="0"/> 
-      <any namespace="##other" processContents="lax" minOccurs="0"
-       maxOccurs="unbounded"/>
-    </sequence>
-    <sequence>
-      <element name="PGPKeyPacket" type="base64Binary"/> 
-      <any namespace="##other" processContents="lax" minOccurs="0"
-       maxOccurs="unbounded"/>
-    </sequence>
-  </choice>
-</complexType>
-
-<!-- End PGPData -->
-
-<!-- Begin SPKIData -->
-
-<element name="SPKIData" type="ds:SPKIDataType"/> 
-<complexType name="SPKIDataType">
-  <sequence maxOccurs="unbounded">
-    <element name="SPKISexp" type="base64Binary"/>
-    <any namespace="##other" processContents="lax" minOccurs="0"/>
-  </sequence>
-</complexType> 
-
-<!-- End SPKIData -->
-
-<!-- End KeyInfo -->
-
-<!-- Start Object (Manifest, SignatureProperty) -->
-
-<element name="Object" type="ds:ObjectType"/> 
-<complexType name="ObjectType" mixed="true">
-  <sequence minOccurs="0" maxOccurs="unbounded">
-    <any namespace="##any" processContents="lax"/>
-  </sequence>
-  <attribute name="Id" type="ID" use="optional"/> 
-  <attribute name="MimeType" type="string" use="optional"/> <!-- add a grep facet -->
-  <attribute name="Encoding" type="anyURI" use="optional"/> 
-</complexType>
-
-<element name="Manifest" type="ds:ManifestType"/> 
-<complexType name="ManifestType">
-  <sequence>
-    <element ref="ds:Reference" maxOccurs="unbounded"/> 
-  </sequence>
-  <attribute name="Id" type="ID" use="optional"/> 
-</complexType>
-
-<element name="SignatureProperties" type="ds:SignaturePropertiesType"/> 
-<complexType name="SignaturePropertiesType">
-  <sequence>
-    <element ref="ds:SignatureProperty" maxOccurs="unbounded"/> 
-  </sequence>
-  <attribute name="Id" type="ID" use="optional"/> 
-</complexType>
-
-   <element name="SignatureProperty" type="ds:SignaturePropertyType"/> 
-   <complexType name="SignaturePropertyType" mixed="true">
-     <choice maxOccurs="unbounded">
-       <any namespace="##other" processContents="lax"/>
-       <!-- (1,1) elements from (1,unbounded) namespaces -->
-     </choice>
-     <attribute name="Target" type="anyURI" use="required"/> 
-     <attribute name="Id" type="ID" use="optional"/> 
-   </complexType>
-
-<!-- End Object (Manifest, SignatureProperty) -->
-
-<!-- Start Algorithm Parameters -->
-
-<simpleType name="HMACOutputLengthType">
-  <restriction base="integer"/>
-</simpleType>
-
-<!-- Start KeyValue Element-types -->
-
-<element name="DSAKeyValue" type="ds:DSAKeyValueType"/>
-<complexType name="DSAKeyValueType">
-  <sequence>
-    <sequence minOccurs="0">
-      <element name="P" type="ds:CryptoBinary"/>
-      <element name="Q" type="ds:CryptoBinary"/>
-    </sequence>
-    <element name="G" type="ds:CryptoBinary" minOccurs="0"/>
-    <element name="Y" type="ds:CryptoBinary"/>
-    <element name="J" type="ds:CryptoBinary" minOccurs="0"/>
-    <sequence minOccurs="0">
-      <element name="Seed" type="ds:CryptoBinary"/>
-      <element name="PgenCounter" type="ds:CryptoBinary"/>
-    </sequence>
-  </sequence>
-</complexType>
-
-<element name="RSAKeyValue" type="ds:RSAKeyValueType"/>
-<complexType name="RSAKeyValueType">
-  <sequence>
-    <element name="Modulus" type="ds:CryptoBinary"/> 
-    <element name="Exponent" type="ds:CryptoBinary"/> 
-  </sequence>
-</complexType> 
-
-<!-- End KeyValue Element-types -->
-
-<!-- End Signature -->
-
-</schema>
diff --git a/saml/vendor/onelogin/php-saml/src/Saml2/version.json b/saml/vendor/onelogin/php-saml/src/Saml2/version.json
deleted file mode 100644
index 2c41bd60..00000000
--- a/saml/vendor/onelogin/php-saml/src/Saml2/version.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "php-saml": {
-        "version": "4.1.0",
-        "released": "07/15/2022"
-    }
-}
-
diff --git a/saml/vendor/php-saml b/saml/vendor/php-saml
deleted file mode 160000
index f30f5062..00000000
--- a/saml/vendor/php-saml
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit f30f5062f3653c4d2082892d207f4dc3e577d979
diff --git a/saml/vendor/robrichards/xmlseclibs/CHANGELOG.txt b/saml/vendor/robrichards/xmlseclibs/CHANGELOG.txt
deleted file mode 100644
index 351b1042..00000000
--- a/saml/vendor/robrichards/xmlseclibs/CHANGELOG.txt
+++ /dev/null
@@ -1,228 +0,0 @@
-xmlseclibs.php
-|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
-05, Sep 2020, 3.1.1
-Features:
-- Support OAEP (iggyvolz)
-
-Bug Fixes:
-- Fix AES128 (iggyvolz)
-
-Improvements:
-- Fix tests for older PHP
-
-22, Apr 2020, 3.1.0
-Features:
-- Support AES-GCM. Requires PHP 7.1. (François Kooman)
-
-Improvements:
-- Fix Travis tests for older PHP versions.
-- Use DOMElement interface to fix some IDEs reporting documentation errors
-
-Bug Fixes:
-- FIX missing InclusiveNamespaces PrefixList from Java + Apache WSS4J. (njake)
-
-06, Nov 2019, 3.0.4
-Security Improvements:
-- Insure only a single SignedInfo element exists within a signature during 
-  verification. Refs CVE-2019-3465.
-Bug Fixes:
-- Fix variable casing.
-
-15, Nov 2018, 3.0.3
-Bug Fixes:
-- Fix casing of class name. (Willem Stuursma-Ruwen)
-- Fix Xpath casing. (Tim van Dijen)
-
-Improvements:
-- Make PCRE2 compliant. (Stefan Winter)
-- Add PHP 7.3 support. (Stefan Winter)
-
-27, Sep 2018, 3.0.2
-Security Improvements:
-- OpenSSL is now a requirement rather than suggestion. (Slaven Bacelic)
-- Filter input to avoid XPath injection. (Jaime Pérez)
-
-Bug Fixes:
-- Fix missing parentheses (Tim van Dijen)
-
-Improvements:
-- Use strict comparison operator to compare digest values. (Jaime Pérez)
-- Remove call to file_get_contents that doesn't even work. (Jaime Pérez)
-- Document potentially dangerous return value behaviour. (Thijs Kinkhorst)
-
-31, Aug 2017, 3.0.1
-Bug Fixes:
-- Fixed missing () in function call. (Dennis Væversted)
-
-Improvements:
-- Add OneLogin to supported software.
-- Add .gitattributes to remove unneeded files. (Filippo Tessarotto)
-- Fix bug in example code. (Dan Church)
-- Travis: add PHP 7.1, move hhvm to allowed failures. (Thijs Kinkhorst)
-- Drop failing extract-win-cert test (Thijs Kinkhorst). (Thijs Kinkhorst)
-- Add comments to warn about return values of verify(). (Thijs Kinkhorst)
-- Fix tests to properly check return code of verify(). (Thijs Kinkhorst)
-- Restore support for PHP >= 5.4. (Jaime Pérez)
-
-25, May 2017, 3.0.0
-Improvements:
-- Remove use of mcrypt (skymeyer)
-
-08, Sep 2016, 2.0.1
-Bug Fixes:
-- Strip whitespace characters when parsing X509Certificate. fixes #84
-  (klemen.bratec)
-- Certificate 'subject' values can be arrays. fixes #80 (Andreas Stangl)
-- HHVM signing node with ID attribute w/out namespace regenerates ID value.
-  fixes #88 (Milos Tomic)
-
-Improvements:
-- Fix typos and add some PHPDoc Blocks. (gfaust-qb)
-- Update lightSAML link. (Milos Tomic)
-- Update copyright dates.
-
-31, Jul 2015, 2.0.0
-Features:
-- Namespace support. Classes now in the RobRichards\XMLSecLibs\ namespace.
-
-Improvements:
-- Dropped support for PHP 5.2
-
-31, Jul 2015, 1.4.1
-Bug Fixes:
-- Allow for large digest values that may have line breaks. fixes #62
-
-Features:
-- Support for locating specific signature when multiple exist in 
-  document. (griga3k)
-
-Improvements:
-- Add optional argument to XMLSecurityDSig to define the prefix to be used, 
-  also allowing for null to use no prefix, for the dsig namespace. fixes #13
-- Code cleanup
-- Depreciated XMLSecurityDSig::generate_GUID for XMLSecurityDSig::generateGUID
-
-23, Jun 2015, 1.4.0
-Features:
-- Support for PSR-0 standard.
-- Support for X509SubjectName. (Milos Tomic)
-- Add HMAC-SHA1 support.
-
-Improvements:
-- Add how to install to README. (Bernardo Vieira da Silva)
-- Code cleanup. (Jaime Pérez)
-- Normalilze tests. (Hidde Wieringa)
-- Add basic usage to README. (Hidde Wieringa)
-
-21, May 2015, 1.3.2
-Bug Fixes:
-- Fix Undefined variable notice. (dpieper85)
-- Fix typo when setting MimeType attribute. (Eugene OZ)
-- Fix validateReference() with enveloping signatures
-
-Features:
-- canonicalizeData performance optimization. (Jaime Pérez)
-- Add composer support (Maks3w)
-
-19, Jun 2013, 1.3.1
-Features:
-- return encrypted node from XMLSecEnc::encryptNode() when replace is set to 
-  false. (Olav)
-- Add support for RSA SHA384 and RSA_SHA512 and SHA384 digest. (Jaime PŽrez)
-- Add options parameter to the add cert methods.
-- Add optional issuerSerial creation with cert
-
-Bug Fixes:
-- Fix persisted Id when namespaced. (Koen Thomeer)
-
-Improvements:
-- Add LICENSE file
-- Convert CHANGELOG.txt to UTF-8
-
-26, Sep 2011, 1.3.0
-Features:
-- Add param to append sig to node when signing. Fixes a problem when using 
-  inclusive canonicalization to append a signature within a namespaced subtree.
-  ex. $objDSig->sign($objKey, $appendToNode); 
-- Add ability to encrypt by reference
-- Add support for refences within an encrypted key
-- Add thumbprint generation capability (XMLSecurityKey->getX509Thumbprint() and 
-  XMLSecurityKey::getRawThumbprint($cert))
-- Return signature element node from XMLSecurityDSig::insertSignature() and 
-  XMLSecurityDSig::appendSignature() methods
-- Support for <ds:RetrievalMethod> with simple URI Id reference.
-- Add XMLSecurityKey::getSymmetricKeySize() method (Olav)
-- Add XMLSecEnc::getCipherValue() method (Olav)
-- Improve XMLSecurityKey:generateSessionKey() logic (Olav)
-
-Bug Fixes:
-- Change split() to explode() as split is now depreciated
-- ds:References using empty or simple URI Id reference should never include 
-  comments in canonicalized data.
-- Make sure that the elements in EncryptedData are emitted in the correct 
-  sequence.
-
-11 Jan 2010, 1.2.2
-Features:
-- Add support XPath support when creating signature. Provides support for 
-  working with EBXML documents.
-- Add reference option to force creation of URI attribute. For use
-  when adding a DOM Document where by default no URI attribute is added.
-- Add support for RSA-SHA256
-
-Bug Fixes:
-- fix bug #5: createDOMDocumentFragment() in decryptNode when data is node 
-  content (patch by Francois Wang)
-
-
-08 Jul 2008, 1.2.1
-Features:
-- Attempt to use mhash when hash extension is not present. (Alfredo Cubitos).
-- Add fallback to built-in sha1 if both hash and mhash are not available and 
-  throw error for other for other missing hashes. (patch by Olav Morken).
-- Add getX509Certificate method to retrieve the x509 cert used for Key. 
-  (patch by Olav Morken).
-- Add getValidatedNodes method to retrieve the elements signed by the 
-  signature. (patch by Olav Morken).
-- Add insertSignature method for precision signature insertion. Merge 
-  functionality from appendSignature in the process. (Olav Morken, Rob).
-- Finally add some tests
-
-Bug Fixes:
-- Fix canonicalization for Document node when using PHP < 5.2.
-- Add padding for RSA_SHA1. (patch by Olav Morken).
-
-
-27 Nov 2007, 1.2.0
-Features:
-- New addReference/List option (overwrite). Boolean flag indicating if URI
-  value should be overwritten if already existing within document.
-  Default is TRUE to maintain BC.
-
-18 Nov 2007, 1.1.2
-Bug Fixes:
-- Remove closing PHP tag to fix extra whitespace characters from being output
-
-11 Nov 2007, 1.1.1
-Features:
-- Add getRefNodeID() and getRefIDs() methods missed in previous release.
-  Provide functionality to find URIs of existing reference nodes.
-  Required by simpleSAMLphp project
-
-Bug Fixes:
-- Remove erroneous whitespace causing issues under certain circumastances.
-
-18 Oct 2007, 1.1.0
-Features:
-- Enable creation of enveloping signature. This allows the creation of
-  managed information cards.
-- Add addObject method for enveloping signatures.
-- Add staticGet509XCerts method. Chained certificates within a PEM file can
-  now be added within the X509Data node.
-- Add xpath support within transformations
-- Add InclusiveNamespaces prefix list support within exclusive transformations.
-
-Bug Fixes:
-- Initialize random number generator for mcrypt_create_iv. (Joan Cornadó).
-- Fix an interoperability issue with .NET when encrypting data in CBC mode.
-  (Joan Cornadó).
diff --git a/saml/vendor/robrichards/xmlseclibs/LICENSE b/saml/vendor/robrichards/xmlseclibs/LICENSE
deleted file mode 100644
index 4fe5e5ff..00000000
--- a/saml/vendor/robrichards/xmlseclibs/LICENSE
+++ /dev/null
@@ -1,31 +0,0 @@
-Copyright (c) 2007-2019, Robert Richards <rrichards@cdatazone.org>.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-  * Redistributions of source code must retain the above copyright
-    notice, this list of conditions and the following disclaimer.
-
-  * Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in
-    the documentation and/or other materials provided with the
-    distribution.
-
-  * Neither the name of Robert Richards nor the names of his
-    contributors may be used to endorse or promote products derived
-    from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
diff --git a/saml/vendor/robrichards/xmlseclibs/README.md b/saml/vendor/robrichards/xmlseclibs/README.md
deleted file mode 100644
index a576080a..00000000
--- a/saml/vendor/robrichards/xmlseclibs/README.md
+++ /dev/null
@@ -1,85 +0,0 @@
-#xmlseclibs 
-
-xmlseclibs is a library written in PHP for working with XML Encryption and Signatures.
-
-The author of xmlseclibs is Rob Richards.
-
-# Branches
-Master is currently the only actively maintained branch.
-* master/3.1: Added AES-GCM support requiring 7.1+
-* 3.0: Removes mcrypt usage requiring 5.4+ (5.6.24+ recommended for security reasons)
-* 2.0: Contains namespace support requiring 5.3+
-* 1.4: Contains auto-loader support while also maintaining backwards compatiblity with the older 1.3 version using the xmlseclibs.php file. Supports PHP 5.2+
-
-# Requirements
-
-xmlseclibs requires PHP version 5.4 or greater. **5.6.24+ recommended for security reasons**
-
-
-## How to Install
-
-Install with [`composer.phar`](http://getcomposer.org).
-
-```sh
-php composer.phar require "robrichards/xmlseclibs"
-```
-
-
-## Use cases
-
-xmlseclibs is being used in many different software.
-
-* [SimpleSAMLPHP](https://github.com/simplesamlphp/simplesamlphp)
-* [LightSAML](https://github.com/lightsaml/lightsaml)
-* [OneLogin](https://github.com/onelogin/php-saml)
-
-## Basic usage
-
-The example below shows basic usage of xmlseclibs, with a SHA-256 signature.
-
-```php
-use RobRichards\XMLSecLibs\XMLSecurityDSig;
-use RobRichards\XMLSecLibs\XMLSecurityKey;
-
-// Load the XML to be signed
-$doc = new DOMDocument();
-$doc->load('./path/to/file/tobesigned.xml');
-
-// Create a new Security object 
-$objDSig = new XMLSecurityDSig();
-// Use the c14n exclusive canonicalization
-$objDSig->setCanonicalMethod(XMLSecurityDSig::EXC_C14N);
-// Sign using SHA-256
-$objDSig->addReference(
-    $doc, 
-    XMLSecurityDSig::SHA256, 
-    array('http://www.w3.org/2000/09/xmldsig#enveloped-signature')
-);
-
-// Create a new (private) Security key
-$objKey = new XMLSecurityKey(XMLSecurityKey::RSA_SHA256, array('type'=>'private'));
-/*
-If key has a passphrase, set it using
-$objKey->passphrase = '<passphrase>';
-*/
-// Load the private key
-$objKey->loadKey('./path/to/privatekey.pem', TRUE);
-
-// Sign the XML file
-$objDSig->sign($objKey);
-
-// Add the associated public key to the signature
-$objDSig->add509Cert(file_get_contents('./path/to/file/mycert.pem'));
-
-// Append the signature to the XML
-$objDSig->appendSignature($doc->documentElement);
-// Save the signed XML
-$doc->save('./path/to/signed.xml');
-```
-
-## How to Contribute
-
-* [Open Issues](https://github.com/robrichards/xmlseclibs/issues)
-* [Open Pull Requests](https://github.com/robrichards/xmlseclibs/pulls)
-
-Mailing List: https://groups.google.com/forum/#!forum/xmlseclibs
diff --git a/saml/vendor/robrichards/xmlseclibs/composer.json b/saml/vendor/robrichards/xmlseclibs/composer.json
deleted file mode 100644
index 22ce7a3e..00000000
--- a/saml/vendor/robrichards/xmlseclibs/composer.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "name": "robrichards/xmlseclibs",
-  "description": "A PHP library for XML Security",
-  "license": "BSD-3-Clause",
-  "keywords": [
-    "xml",
-    "xmldsig",
-    "signature",
-    "security"
-  ],
-  "homepage": "https://github.com/robrichards/xmlseclibs",
-  "autoload": {
-    "psr-4": {
-      "RobRichards\\XMLSecLibs\\": "src"
-    }
-  },
-  "require": {
-    "php": ">= 5.4",
-    "ext-openssl": "*"
-  }
-}
diff --git a/saml/vendor/robrichards/xmlseclibs/src/Utils/XPath.php b/saml/vendor/robrichards/xmlseclibs/src/Utils/XPath.php
deleted file mode 100644
index 8cdc48e1..00000000
--- a/saml/vendor/robrichards/xmlseclibs/src/Utils/XPath.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-namespace RobRichards\XMLSecLibs\Utils;
-
-class XPath
-{
-    const ALPHANUMERIC = '\w\d';
-    const NUMERIC = '\d';
-    const LETTERS = '\w';
-    const EXTENDED_ALPHANUMERIC = '\w\d\s\-_:\.';
-
-    const SINGLE_QUOTE = '\'';
-    const DOUBLE_QUOTE = '"';
-    const ALL_QUOTES = '[\'"]';
-
-
-    /**
-     * Filter an attribute value for save inclusion in an XPath query.
-     *
-     * @param string $value The value to filter.
-     * @param string $quotes The quotes used to delimit the value in the XPath query.
-     *
-     * @return string The filtered attribute value.
-     */
-    public static function filterAttrValue($value, $quotes = self::ALL_QUOTES)
-    {
-        return preg_replace('#'.$quotes.'#', '', $value);
-    }
-
-
-    /**
-     * Filter an attribute name for save inclusion in an XPath query.
-     *
-     * @param string $name The attribute name to filter.
-     * @param mixed $allow The set of characters to allow. Can be one of the constants provided by this class, or a
-     * custom regex excluding the '#' character (used as delimiter).
-     *
-     * @return string The filtered attribute name.
-     */
-    public static function filterAttrName($name, $allow = self::EXTENDED_ALPHANUMERIC)
-    {
-        return preg_replace('#[^'.$allow.']#', '', $name);
-    }
-}
diff --git a/saml/vendor/robrichards/xmlseclibs/src/XMLSecEnc.php b/saml/vendor/robrichards/xmlseclibs/src/XMLSecEnc.php
deleted file mode 100644
index b9df7611..00000000
--- a/saml/vendor/robrichards/xmlseclibs/src/XMLSecEnc.php
+++ /dev/null
@@ -1,511 +0,0 @@
-<?php
-namespace RobRichards\XMLSecLibs;
-
-use DOMDocument;
-use DOMElement;
-use DOMNode;
-use DOMXPath;
-use Exception;
-use RobRichards\XMLSecLibs\Utils\XPath as XPath;
-
-/**
- * xmlseclibs.php
- *
- * Copyright (c) 2007-2020, Robert Richards <rrichards@cdatazone.org>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in
- *     the documentation and/or other materials provided with the
- *     distribution.
- *
- *   * Neither the name of Robert Richards nor the names of his
- *     contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @author    Robert Richards <rrichards@cdatazone.org>
- * @copyright 2007-2020 Robert Richards <rrichards@cdatazone.org>
- * @license   http://www.opensource.org/licenses/bsd-license.php  BSD License
- */
-
-class XMLSecEnc
-{
-    const template = "<xenc:EncryptedData xmlns:xenc='http://www.w3.org/2001/04/xmlenc#'>
-   <xenc:CipherData>
-      <xenc:CipherValue></xenc:CipherValue>
-   </xenc:CipherData>
-</xenc:EncryptedData>";
-
-    const Element = 'http://www.w3.org/2001/04/xmlenc#Element';
-    const Content = 'http://www.w3.org/2001/04/xmlenc#Content';
-    const URI = 3;
-    const XMLENCNS = 'http://www.w3.org/2001/04/xmlenc#';
-
-    /** @var null|DOMDocument */
-    private $encdoc = null;
-
-    /** @var null|DOMNode  */
-    private $rawNode = null;
-
-    /** @var null|string */
-    public $type = null;
-
-    /** @var null|DOMElement */
-    public $encKey = null;
-
-    /** @var array */
-    private $references = array();
-
-    public function __construct()
-    {
-        $this->_resetTemplate();
-    }
-
-    private function _resetTemplate()
-    {
-        $this->encdoc = new DOMDocument();
-        $this->encdoc->loadXML(self::template);
-    }
-
-    /**
-     * @param string $name
-     * @param DOMNode $node
-     * @param string $type
-     * @throws Exception
-     */
-    public function addReference($name, $node, $type)
-    {
-        if (! $node instanceOf DOMNode) {
-            throw new Exception('$node is not of type DOMNode');
-        }
-        $curencdoc = $this->encdoc;
-        $this->_resetTemplate();
-        $encdoc = $this->encdoc;
-        $this->encdoc = $curencdoc;
-        $refuri = XMLSecurityDSig::generateGUID();
-        $element = $encdoc->documentElement;
-        $element->setAttribute("Id", $refuri);
-        $this->references[$name] = array("node" => $node, "type" => $type, "encnode" => $encdoc, "refuri" => $refuri);
-    }
-
-    /**
-     * @param DOMNode $node
-     */
-    public function setNode($node)
-    {
-        $this->rawNode = $node;
-    }
-
-    /**
-     * Encrypt the selected node with the given key.
-     *
-     * @param XMLSecurityKey $objKey  The encryption key and algorithm.
-     * @param bool           $replace Whether the encrypted node should be replaced in the original tree. Default is true.
-     * @throws Exception
-     *
-     * @return DOMElement  The <xenc:EncryptedData>-element.
-     */
-    public function encryptNode($objKey, $replace = true)
-    {
-        $data = '';
-        if (empty($this->rawNode)) {
-            throw new Exception('Node to encrypt has not been set');
-        }
-        if (! $objKey instanceof XMLSecurityKey) {
-            throw new Exception('Invalid Key');
-        }
-        $doc = $this->rawNode->ownerDocument;
-        $xPath = new DOMXPath($this->encdoc);
-        $objList = $xPath->query('/xenc:EncryptedData/xenc:CipherData/xenc:CipherValue');
-        $cipherValue = $objList->item(0);
-        if ($cipherValue == null) {
-            throw new Exception('Error locating CipherValue element within template');
-        }
-        switch ($this->type) {
-            case (self::Element):
-                $data = $doc->saveXML($this->rawNode);
-                $this->encdoc->documentElement->setAttribute('Type', self::Element);
-                break;
-            case (self::Content):
-                $children = $this->rawNode->childNodes;
-                foreach ($children AS $child) {
-                    $data .= $doc->saveXML($child);
-                }
-                $this->encdoc->documentElement->setAttribute('Type', self::Content);
-                break;
-            default:
-                throw new Exception('Type is currently not supported');
-        }
-
-        $encMethod = $this->encdoc->documentElement->appendChild($this->encdoc->createElementNS(self::XMLENCNS, 'xenc:EncryptionMethod'));
-        $encMethod->setAttribute('Algorithm', $objKey->getAlgorithm());
-        $cipherValue->parentNode->parentNode->insertBefore($encMethod, $cipherValue->parentNode->parentNode->firstChild);
-
-        $strEncrypt = base64_encode($objKey->encryptData($data));
-        $value = $this->encdoc->createTextNode($strEncrypt);
-        $cipherValue->appendChild($value);
-
-        if ($replace) {
-            switch ($this->type) {
-                case (self::Element):
-                    if ($this->rawNode->nodeType == XML_DOCUMENT_NODE) {
-                        return $this->encdoc;
-                    }
-                    $importEnc = $this->rawNode->ownerDocument->importNode($this->encdoc->documentElement, true);
-                    $this->rawNode->parentNode->replaceChild($importEnc, $this->rawNode);
-                    return $importEnc;
-                case (self::Content):
-                    $importEnc = $this->rawNode->ownerDocument->importNode($this->encdoc->documentElement, true);
-                    while ($this->rawNode->firstChild) {
-                        $this->rawNode->removeChild($this->rawNode->firstChild);
-                    }
-                    $this->rawNode->appendChild($importEnc);
-                    return $importEnc;
-            }
-        } else {
-            return $this->encdoc->documentElement;
-        }
-    }
-
-    /**
-     * @param XMLSecurityKey $objKey
-     * @throws Exception
-     */
-    public function encryptReferences($objKey)
-    {
-        $curRawNode = $this->rawNode;
-        $curType = $this->type;
-        foreach ($this->references AS $name => $reference) {
-            $this->encdoc = $reference["encnode"];
-            $this->rawNode = $reference["node"];
-            $this->type = $reference["type"];
-            try {
-                $encNode = $this->encryptNode($objKey);
-                $this->references[$name]["encnode"] = $encNode;
-            } catch (Exception $e) {
-                $this->rawNode = $curRawNode;
-                $this->type = $curType;
-                throw $e;
-            }
-        }
-        $this->rawNode = $curRawNode;
-        $this->type = $curType;
-    }
-
-    /**
-     * Retrieve the CipherValue text from this encrypted node.
-     *
-     * @throws Exception
-     * @return string|null  The Ciphervalue text, or null if no CipherValue is found.
-     */
-    public function getCipherValue()
-    {
-        if (empty($this->rawNode)) {
-            throw new Exception('Node to decrypt has not been set');
-        }
-
-        $doc = $this->rawNode->ownerDocument;
-        $xPath = new DOMXPath($doc);
-        $xPath->registerNamespace('xmlencr', self::XMLENCNS);
-        /* Only handles embedded content right now and not a reference */
-        $query = "./xmlencr:CipherData/xmlencr:CipherValue";
-        $nodeset = $xPath->query($query, $this->rawNode);
-        $node = $nodeset->item(0);
-
-        if (!$node) {
-                return null;
-        }
-
-        return base64_decode($node->nodeValue);
-    }
-
-    /**
-     * Decrypt this encrypted node.
-     *
-     * The behaviour of this function depends on the value of $replace.
-     * If $replace is false, we will return the decrypted data as a string.
-     * If $replace is true, we will insert the decrypted element(s) into the
-     * document, and return the decrypted element(s).
-     *
-     * @param XMLSecurityKey $objKey  The decryption key that should be used when decrypting the node.
-     * @param boolean        $replace Whether we should replace the encrypted node in the XML document with the decrypted data. The default is true.
-     *
-     * @return string|DOMElement  The decrypted data.
-     */
-    public function decryptNode($objKey, $replace=true)
-    {
-        if (! $objKey instanceof XMLSecurityKey) {
-            throw new Exception('Invalid Key');
-        }
-
-        $encryptedData = $this->getCipherValue();
-        if ($encryptedData) {
-            $decrypted = $objKey->decryptData($encryptedData);
-            if ($replace) {
-                switch ($this->type) {
-                    case (self::Element):
-                        $newdoc = new DOMDocument();
-                        $newdoc->loadXML($decrypted);
-                        if ($this->rawNode->nodeType == XML_DOCUMENT_NODE) {
-                            return $newdoc;
-                        }
-                        $importEnc = $this->rawNode->ownerDocument->importNode($newdoc->documentElement, true);
-                        $this->rawNode->parentNode->replaceChild($importEnc, $this->rawNode);
-                        return $importEnc;
-                    case (self::Content):
-                        if ($this->rawNode->nodeType == XML_DOCUMENT_NODE) {
-                            $doc = $this->rawNode;
-                        } else {
-                            $doc = $this->rawNode->ownerDocument;
-                        }
-                        $newFrag = $doc->createDocumentFragment();
-                        $newFrag->appendXML($decrypted);
-                        $parent = $this->rawNode->parentNode;
-                        $parent->replaceChild($newFrag, $this->rawNode);
-                        return $parent;
-                    default:
-                        return $decrypted;
-                }
-            } else {
-                return $decrypted;
-            }
-        } else {
-            throw new Exception("Cannot locate encrypted data");
-        }
-    }
-
-    /**
-     * Encrypt the XMLSecurityKey
-     *
-     * @param XMLSecurityKey $srcKey
-     * @param XMLSecurityKey $rawKey
-     * @param bool $append
-     * @throws Exception
-     */
-    public function encryptKey($srcKey, $rawKey, $append=true)
-    {
-        if ((! $srcKey instanceof XMLSecurityKey) || (! $rawKey instanceof XMLSecurityKey)) {
-            throw new Exception('Invalid Key');
-        }
-        $strEncKey = base64_encode($srcKey->encryptData($rawKey->key));
-        $root = $this->encdoc->documentElement;
-        $encKey = $this->encdoc->createElementNS(self::XMLENCNS, 'xenc:EncryptedKey');
-        if ($append) {
-            $keyInfo = $root->insertBefore($this->encdoc->createElementNS('http://www.w3.org/2000/09/xmldsig#', 'dsig:KeyInfo'), $root->firstChild);
-            $keyInfo->appendChild($encKey);
-        } else {
-            $this->encKey = $encKey;
-        }
-        $encMethod = $encKey->appendChild($this->encdoc->createElementNS(self::XMLENCNS, 'xenc:EncryptionMethod'));
-        $encMethod->setAttribute('Algorithm', $srcKey->getAlgorith());
-        if (! empty($srcKey->name)) {
-            $keyInfo = $encKey->appendChild($this->encdoc->createElementNS('http://www.w3.org/2000/09/xmldsig#', 'dsig:KeyInfo'));
-            $keyInfo->appendChild($this->encdoc->createElementNS('http://www.w3.org/2000/09/xmldsig#', 'dsig:KeyName', $srcKey->name));
-        }
-        $cipherData = $encKey->appendChild($this->encdoc->createElementNS(self::XMLENCNS, 'xenc:CipherData'));
-        $cipherData->appendChild($this->encdoc->createElementNS(self::XMLENCNS, 'xenc:CipherValue', $strEncKey));
-        if (is_array($this->references) && count($this->references) > 0) {
-            $refList = $encKey->appendChild($this->encdoc->createElementNS(self::XMLENCNS, 'xenc:ReferenceList'));
-            foreach ($this->references AS $name => $reference) {
-                $refuri = $reference["refuri"];
-                $dataRef = $refList->appendChild($this->encdoc->createElementNS(self::XMLENCNS, 'xenc:DataReference'));
-                $dataRef->setAttribute("URI", '#' . $refuri);
-            }
-        }
-        return;
-    }
-
-    /**
-     * @param XMLSecurityKey $encKey
-     * @return DOMElement|string
-     * @throws Exception
-     */
-    public function decryptKey($encKey)
-    {
-        if (! $encKey->isEncrypted) {
-            throw new Exception("Key is not Encrypted");
-        }
-        if (empty($encKey->key)) {
-            throw new Exception("Key is missing data to perform the decryption");
-        }
-        return $this->decryptNode($encKey, false);
-    }
-
-    /**
-     * @param DOMDocument $element
-     * @return DOMNode|null
-     */
-    public function locateEncryptedData($element)
-    {
-        if ($element instanceof DOMDocument) {
-            $doc = $element;
-        } else {
-            $doc = $element->ownerDocument;
-        }
-        if ($doc) {
-            $xpath = new DOMXPath($doc);
-            $query = "//*[local-name()='EncryptedData' and namespace-uri()='".self::XMLENCNS."']";
-            $nodeset = $xpath->query($query);
-            return $nodeset->item(0);
-        }
-        return null;
-    }
-
-    /**
-     * Returns the key from the DOM
-     * @param null|DOMNode $node
-     * @return null|XMLSecurityKey
-     */
-    public function locateKey($node=null)
-    {
-        if (empty($node)) {
-            $node = $this->rawNode;
-        }
-        if (! $node instanceof DOMNode) {
-            return null;
-        }
-        if ($doc = $node->ownerDocument) {
-            $xpath = new DOMXPath($doc);
-            $xpath->registerNamespace('xmlsecenc', self::XMLENCNS);
-            $query = ".//xmlsecenc:EncryptionMethod";
-            $nodeset = $xpath->query($query, $node);
-            if ($encmeth = $nodeset->item(0)) {
-                   $attrAlgorithm = $encmeth->getAttribute("Algorithm");
-                try {
-                    $objKey = new XMLSecurityKey($attrAlgorithm, array('type' => 'private'));
-                } catch (Exception $e) {
-                    return null;
-                }
-                return $objKey;
-            }
-        }
-        return null;
-    }
-
-    /**
-     * @param null|XMLSecurityKey $objBaseKey
-     * @param null|DOMNode $node
-     * @return null|XMLSecurityKey
-     * @throws Exception
-     */
-    public static function staticLocateKeyInfo($objBaseKey=null, $node=null)
-    {
-        if (empty($node) || (! $node instanceof DOMNode)) {
-            return null;
-        }
-        $doc = $node->ownerDocument;
-        if (!$doc) {
-            return null;
-        }
-
-        $xpath = new DOMXPath($doc);
-        $xpath->registerNamespace('xmlsecenc', self::XMLENCNS);
-        $xpath->registerNamespace('xmlsecdsig', XMLSecurityDSig::XMLDSIGNS);
-        $query = "./xmlsecdsig:KeyInfo";
-        $nodeset = $xpath->query($query, $node);
-        $encmeth = $nodeset->item(0);
-        if (!$encmeth) {
-            /* No KeyInfo in EncryptedData / EncryptedKey. */
-            return $objBaseKey;
-        }
-
-        foreach ($encmeth->childNodes AS $child) {
-            switch ($child->localName) {
-                case 'KeyName':
-                    if (! empty($objBaseKey)) {
-                        $objBaseKey->name = $child->nodeValue;
-                    }
-                    break;
-                case 'KeyValue':
-                    foreach ($child->childNodes AS $keyval) {
-                        switch ($keyval->localName) {
-                            case 'DSAKeyValue':
-                                throw new Exception("DSAKeyValue currently not supported");
-                            case 'RSAKeyValue':
-                                $modulus = null;
-                                $exponent = null;
-                                if ($modulusNode = $keyval->getElementsByTagName('Modulus')->item(0)) {
-                                    $modulus = base64_decode($modulusNode->nodeValue);
-                                }
-                                if ($exponentNode = $keyval->getElementsByTagName('Exponent')->item(0)) {
-                                    $exponent = base64_decode($exponentNode->nodeValue);
-                                }
-                                if (empty($modulus) || empty($exponent)) {
-                                    throw new Exception("Missing Modulus or Exponent");
-                                }
-                                $publicKey = XMLSecurityKey::convertRSA($modulus, $exponent);
-                                $objBaseKey->loadKey($publicKey);
-                                break;
-                        }
-                    }
-                    break;
-                case 'RetrievalMethod':
-                    $type = $child->getAttribute('Type');
-                    if ($type !== 'http://www.w3.org/2001/04/xmlenc#EncryptedKey') {
-                        /* Unsupported key type. */
-                        break;
-                    }
-                    $uri = $child->getAttribute('URI');
-                    if ($uri[0] !== '#') {
-                        /* URI not a reference - unsupported. */
-                        break;
-                    }
-                    $id = substr($uri, 1);
-
-                    $query = '//xmlsecenc:EncryptedKey[@Id="'.XPath::filterAttrValue($id, XPath::DOUBLE_QUOTE).'"]';
-                    $keyElement = $xpath->query($query)->item(0);
-                    if (!$keyElement) {
-                        throw new Exception("Unable to locate EncryptedKey with @Id='$id'.");
-                    }
-
-                    return XMLSecurityKey::fromEncryptedKeyElement($keyElement);
-                case 'EncryptedKey':
-                    return XMLSecurityKey::fromEncryptedKeyElement($child);
-                case 'X509Data':
-                    if ($x509certNodes = $child->getElementsByTagName('X509Certificate')) {
-                        if ($x509certNodes->length > 0) {
-                            $x509cert = $x509certNodes->item(0)->textContent;
-                            $x509cert = str_replace(array("\r", "\n", " "), "", $x509cert);
-                            $x509cert = "-----BEGIN CERTIFICATE-----\n".chunk_split($x509cert, 64, "\n")."-----END CERTIFICATE-----\n";
-                            $objBaseKey->loadKey($x509cert, false, true);
-                        }
-                    }
-                    break;
-            }
-        }
-        return $objBaseKey;
-    }
-
-    /**
-     * @param null|XMLSecurityKey $objBaseKey
-     * @param null|DOMNode $node
-     * @return null|XMLSecurityKey
-     */
-    public function locateKeyInfo($objBaseKey=null, $node=null)
-    {
-        if (empty($node)) {
-            $node = $this->rawNode;
-        }
-        return self::staticLocateKeyInfo($objBaseKey, $node);
-    }
-}
diff --git a/saml/vendor/robrichards/xmlseclibs/src/XMLSecurityDSig.php b/saml/vendor/robrichards/xmlseclibs/src/XMLSecurityDSig.php
deleted file mode 100644
index 9986123e..00000000
--- a/saml/vendor/robrichards/xmlseclibs/src/XMLSecurityDSig.php
+++ /dev/null
@@ -1,1162 +0,0 @@
-<?php
-namespace RobRichards\XMLSecLibs;
-
-use DOMDocument;
-use DOMElement;
-use DOMNode;
-use DOMXPath;
-use Exception;
-use RobRichards\XMLSecLibs\Utils\XPath as XPath;
-
-/**
- * xmlseclibs.php
- *
- * Copyright (c) 2007-2020, Robert Richards <rrichards@cdatazone.org>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in
- *     the documentation and/or other materials provided with the
- *     distribution.
- *
- *   * Neither the name of Robert Richards nor the names of his
- *     contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @author    Robert Richards <rrichards@cdatazone.org>
- * @copyright 2007-2020 Robert Richards <rrichards@cdatazone.org>
- * @license   http://www.opensource.org/licenses/bsd-license.php  BSD License
- */
-
-class XMLSecurityDSig
-{
-    const XMLDSIGNS = 'http://www.w3.org/2000/09/xmldsig#';
-    const SHA1 = 'http://www.w3.org/2000/09/xmldsig#sha1';
-    const SHA256 = 'http://www.w3.org/2001/04/xmlenc#sha256';
-    const SHA384 = 'http://www.w3.org/2001/04/xmldsig-more#sha384';
-    const SHA512 = 'http://www.w3.org/2001/04/xmlenc#sha512';
-    const RIPEMD160 = 'http://www.w3.org/2001/04/xmlenc#ripemd160';
-
-    const C14N = 'http://www.w3.org/TR/2001/REC-xml-c14n-20010315';
-    const C14N_COMMENTS = 'http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithComments';
-    const EXC_C14N = 'http://www.w3.org/2001/10/xml-exc-c14n#';
-    const EXC_C14N_COMMENTS = 'http://www.w3.org/2001/10/xml-exc-c14n#WithComments';
-
-    const template = '<ds:Signature xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-  <ds:SignedInfo>
-    <ds:SignatureMethod />
-  </ds:SignedInfo>
-</ds:Signature>';
-
-    const BASE_TEMPLATE = '<Signature xmlns="http://www.w3.org/2000/09/xmldsig#">
-  <SignedInfo>
-    <SignatureMethod />
-  </SignedInfo>
-</Signature>';
-
-    /** @var DOMElement|null */
-    public $sigNode = null;
-
-    /** @var array */
-    public $idKeys = array();
-
-    /** @var array */
-    public $idNS = array();
-
-    /** @var string|null */
-    private $signedInfo = null;
-
-    /** @var DomXPath|null */
-    private $xPathCtx = null;
-
-    /** @var string|null */
-    private $canonicalMethod = null;
-
-    /** @var string */
-    private $prefix = '';
-
-    /** @var string */
-    private $searchpfx = 'secdsig';
-
-    /**
-     * This variable contains an associative array of validated nodes.
-     * @var array|null
-     */
-    private $validatedNodes = null;
-
-    /**
-     * @param string $prefix
-     */
-    public function __construct($prefix='ds')
-    {
-        $template = self::BASE_TEMPLATE;
-        if (! empty($prefix)) {
-            $this->prefix = $prefix.':';
-            $search = array("<S", "</S", "xmlns=");
-            $replace = array("<$prefix:S", "</$prefix:S", "xmlns:$prefix=");
-            $template = str_replace($search, $replace, $template);
-        }
-        $sigdoc = new DOMDocument();
-        $sigdoc->loadXML($template);
-        $this->sigNode = $sigdoc->documentElement;
-    }
-
-    /**
-     * Reset the XPathObj to null
-     */
-    private function resetXPathObj()
-    {
-        $this->xPathCtx = null;
-    }
-
-    /**
-     * Returns the XPathObj or null if xPathCtx is set and sigNode is empty.
-     *
-     * @return DOMXPath|null
-     */
-    private function getXPathObj()
-    {
-        if (empty($this->xPathCtx) && ! empty($this->sigNode)) {
-            $xpath = new DOMXPath($this->sigNode->ownerDocument);
-            $xpath->registerNamespace('secdsig', self::XMLDSIGNS);
-            $this->xPathCtx = $xpath;
-        }
-        return $this->xPathCtx;
-    }
-
-    /**
-     * Generate guid
-     *
-     * @param string $prefix Prefix to use for guid. defaults to pfx
-     *
-     * @return string The generated guid
-     */
-    public static function generateGUID($prefix='pfx')
-    {
-        $uuid = md5(uniqid(mt_rand(), true));
-        $guid = $prefix.substr($uuid, 0, 8)."-".
-                substr($uuid, 8, 4)."-".
-                substr($uuid, 12, 4)."-".
-                substr($uuid, 16, 4)."-".
-                substr($uuid, 20, 12);
-        return $guid;
-    }
-
-    /**
-     * Generate guid
-     *
-     * @param string $prefix Prefix to use for guid. defaults to pfx
-     *
-     * @return string The generated guid
-     *
-     * @deprecated Method deprecated in Release 1.4.1
-     */
-    public static function generate_GUID($prefix='pfx')
-    {
-        return self::generateGUID($prefix);
-    }
-
-    /**
-     * @param DOMDocument $objDoc
-     * @param int $pos
-     * @return DOMNode|null
-     */
-    public function locateSignature($objDoc, $pos=0)
-    {
-        if ($objDoc instanceof DOMDocument) {
-            $doc = $objDoc;
-        } else {
-            $doc = $objDoc->ownerDocument;
-        }
-        if ($doc) {
-            $xpath = new DOMXPath($doc);
-            $xpath->registerNamespace('secdsig', self::XMLDSIGNS);
-            $query = ".//secdsig:Signature";
-            $nodeset = $xpath->query($query, $objDoc);
-            $this->sigNode = $nodeset->item($pos);
-            $query = "./secdsig:SignedInfo";
-            $nodeset = $xpath->query($query, $this->sigNode);
-            if ($nodeset->length > 1) {
-                throw new Exception("Invalid structure - Too many SignedInfo elements found");
-            }
-            return $this->sigNode;
-        }
-        return null;
-    }
-
-    /**
-     * @param string $name
-     * @param null|string $value
-     * @return DOMElement
-     */
-    public function createNewSignNode($name, $value=null)
-    {
-        $doc = $this->sigNode->ownerDocument;
-        if (! is_null($value)) {
-            $node = $doc->createElementNS(self::XMLDSIGNS, $this->prefix.$name, $value);
-        } else {
-            $node = $doc->createElementNS(self::XMLDSIGNS, $this->prefix.$name);
-        }
-        return $node;
-    }
-
-    /**
-     * @param string $method
-     * @throws Exception
-     */
-    public function setCanonicalMethod($method)
-    {
-        switch ($method) {
-            case 'http://www.w3.org/TR/2001/REC-xml-c14n-20010315':
-            case 'http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithComments':
-            case 'http://www.w3.org/2001/10/xml-exc-c14n#':
-            case 'http://www.w3.org/2001/10/xml-exc-c14n#WithComments':
-                $this->canonicalMethod = $method;
-                break;
-            default:
-                throw new Exception('Invalid Canonical Method');
-        }
-        if ($xpath = $this->getXPathObj()) {
-            $query = './'.$this->searchpfx.':SignedInfo';
-            $nodeset = $xpath->query($query, $this->sigNode);
-            if ($sinfo = $nodeset->item(0)) {
-                $query = './'.$this->searchpfx.'CanonicalizationMethod';
-                $nodeset = $xpath->query($query, $sinfo);
-                if (! ($canonNode = $nodeset->item(0))) {
-                    $canonNode = $this->createNewSignNode('CanonicalizationMethod');
-                    $sinfo->insertBefore($canonNode, $sinfo->firstChild);
-                }
-                $canonNode->setAttribute('Algorithm', $this->canonicalMethod);
-            }
-        }
-    }
-
-    /**
-     * @param DOMNode $node
-     * @param string $canonicalmethod
-     * @param null|array $arXPath
-     * @param null|array $prefixList
-     * @return string
-     */
-    private function canonicalizeData($node, $canonicalmethod, $arXPath=null, $prefixList=null)
-    {
-        $exclusive = false;
-        $withComments = false;
-        switch ($canonicalmethod) {
-            case 'http://www.w3.org/TR/2001/REC-xml-c14n-20010315':
-                $exclusive = false;
-                $withComments = false;
-                break;
-            case 'http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithComments':
-                $withComments = true;
-                break;
-            case 'http://www.w3.org/2001/10/xml-exc-c14n#':
-                $exclusive = true;
-                break;
-            case 'http://www.w3.org/2001/10/xml-exc-c14n#WithComments':
-                $exclusive = true;
-                $withComments = true;
-                break;
-        }
-
-        if (is_null($arXPath) && ($node instanceof DOMNode) && ($node->ownerDocument !== null) && $node->isSameNode($node->ownerDocument->documentElement)) {
-            /* Check for any PI or comments as they would have been excluded */
-            $element = $node;
-            while ($refnode = $element->previousSibling) {
-                if ($refnode->nodeType == XML_PI_NODE || (($refnode->nodeType == XML_COMMENT_NODE) && $withComments)) {
-                    break;
-                }
-                $element = $refnode;
-            }
-            if ($refnode == null) {
-                $node = $node->ownerDocument;
-            }
-        }
-
-        return $node->C14N($exclusive, $withComments, $arXPath, $prefixList);
-    }
-
-    /**
-     * @return null|string
-     */
-    public function canonicalizeSignedInfo()
-    {
-
-        $doc = $this->sigNode->ownerDocument;
-        $canonicalmethod = null;
-        if ($doc) {
-            $xpath = $this->getXPathObj();
-            $query = "./secdsig:SignedInfo";
-            $nodeset = $xpath->query($query, $this->sigNode);
-            if ($nodeset->length > 1) {
-                throw new Exception("Invalid structure - Too many SignedInfo elements found");
-            }
-            if ($signInfoNode = $nodeset->item(0)) {
-                $query = "./secdsig:CanonicalizationMethod";
-                $nodeset = $xpath->query($query, $signInfoNode);
-                $prefixList = null;
-                if ($canonNode = $nodeset->item(0)) {
-                    $canonicalmethod = $canonNode->getAttribute('Algorithm');
-                    foreach ($canonNode->childNodes as $node)
-                    {
-                        if ($node->localName == 'InclusiveNamespaces') {
-                            if ($pfx = $node->getAttribute('PrefixList')) {
-                                $arpfx = array_filter(explode(' ', $pfx));
-                                if (count($arpfx) > 0) {
-                                    $prefixList = array_merge($prefixList ? $prefixList : array(), $arpfx);
-                                }
-                            }
-                        }
-                    }
-                }
-                $this->signedInfo = $this->canonicalizeData($signInfoNode, $canonicalmethod, null, $prefixList);
-                return $this->signedInfo;
-            }
-        }
-        return null;
-    }
-
-    /**
-     * @param string $digestAlgorithm
-     * @param string $data
-     * @param bool $encode
-     * @return string
-     * @throws Exception
-     */
-    public function calculateDigest($digestAlgorithm, $data, $encode = true)
-    {
-        switch ($digestAlgorithm) {
-            case self::SHA1:
-                $alg = 'sha1';
-                break;
-            case self::SHA256:
-                $alg = 'sha256';
-                break;
-            case self::SHA384:
-                $alg = 'sha384';
-                break;
-            case self::SHA512:
-                $alg = 'sha512';
-                break;
-            case self::RIPEMD160:
-                $alg = 'ripemd160';
-                break;
-            default:
-                throw new Exception("Cannot validate digest: Unsupported Algorithm <$digestAlgorithm>");
-        }
-
-        $digest = hash($alg, $data, true);
-        if ($encode) {
-            $digest = base64_encode($digest);
-        }
-        return $digest;
-
-    }
-
-    /**
-     * @param $refNode
-     * @param string $data
-     * @return bool
-     */
-    public function validateDigest($refNode, $data)
-    {
-        $xpath = new DOMXPath($refNode->ownerDocument);
-        $xpath->registerNamespace('secdsig', self::XMLDSIGNS);
-        $query = 'string(./secdsig:DigestMethod/@Algorithm)';
-        $digestAlgorithm = $xpath->evaluate($query, $refNode);
-        $digValue = $this->calculateDigest($digestAlgorithm, $data, false);
-        $query = 'string(./secdsig:DigestValue)';
-        $digestValue = $xpath->evaluate($query, $refNode);
-        return ($digValue === base64_decode($digestValue));
-    }
-
-    /**
-     * @param $refNode
-     * @param DOMNode $objData
-     * @param bool $includeCommentNodes
-     * @return string
-     */
-    public function processTransforms($refNode, $objData, $includeCommentNodes = true)
-    {
-        $data = $objData;
-        $xpath = new DOMXPath($refNode->ownerDocument);
-        $xpath->registerNamespace('secdsig', self::XMLDSIGNS);
-        $query = './secdsig:Transforms/secdsig:Transform';
-        $nodelist = $xpath->query($query, $refNode);
-        $canonicalMethod = 'http://www.w3.org/TR/2001/REC-xml-c14n-20010315';
-        $arXPath = null;
-        $prefixList = null;
-        foreach ($nodelist AS $transform) {
-            $algorithm = $transform->getAttribute("Algorithm");
-            switch ($algorithm) {
-                case 'http://www.w3.org/2001/10/xml-exc-c14n#':
-                case 'http://www.w3.org/2001/10/xml-exc-c14n#WithComments':
-
-                    if (!$includeCommentNodes) {
-                        /* We remove comment nodes by forcing it to use a canonicalization
-                         * without comments.
-                         */
-                        $canonicalMethod = 'http://www.w3.org/2001/10/xml-exc-c14n#';
-                    } else {
-                        $canonicalMethod = $algorithm;
-                    }
-
-                    $node = $transform->firstChild;
-                    while ($node) {
-                        if ($node->localName == 'InclusiveNamespaces') {
-                            if ($pfx = $node->getAttribute('PrefixList')) {
-                                $arpfx = array();
-                                $pfxlist = explode(" ", $pfx);
-                                foreach ($pfxlist AS $pfx) {
-                                    $val = trim($pfx);
-                                    if (! empty($val)) {
-                                        $arpfx[] = $val;
-                                    }
-                                }
-                                if (count($arpfx) > 0) {
-                                    $prefixList = $arpfx;
-                                }
-                            }
-                            break;
-                        }
-                        $node = $node->nextSibling;
-                    }
-            break;
-                case 'http://www.w3.org/TR/2001/REC-xml-c14n-20010315':
-                case 'http://www.w3.org/TR/2001/REC-xml-c14n-20010315#WithComments':
-                    if (!$includeCommentNodes) {
-                        /* We remove comment nodes by forcing it to use a canonicalization
-                         * without comments.
-                         */
-                        $canonicalMethod = 'http://www.w3.org/TR/2001/REC-xml-c14n-20010315';
-                    } else {
-                        $canonicalMethod = $algorithm;
-                    }
-
-                    break;
-                case 'http://www.w3.org/TR/1999/REC-xpath-19991116':
-                    $node = $transform->firstChild;
-                    while ($node) {
-                        if ($node->localName == 'XPath') {
-                            $arXPath = array();
-                            $arXPath['query'] = '(.//. | .//@* | .//namespace::*)['.$node->nodeValue.']';
-                            $arXPath['namespaces'] = array();
-                            $nslist = $xpath->query('./namespace::*', $node);
-                            foreach ($nslist AS $nsnode) {
-                                if ($nsnode->localName != "xml") {
-                                    $arXPath['namespaces'][$nsnode->localName] = $nsnode->nodeValue;
-                                }
-                            }
-                            break;
-                        }
-                        $node = $node->nextSibling;
-                    }
-                    break;
-            }
-        }
-        if ($data instanceof DOMNode) {
-            $data = $this->canonicalizeData($objData, $canonicalMethod, $arXPath, $prefixList);
-        }
-        return $data;
-    }
-
-    /**
-     * @param DOMNode $refNode
-     * @return bool
-     */
-    public function processRefNode($refNode)
-    {
-        $dataObject = null;
-
-        /*
-         * Depending on the URI, we may not want to include comments in the result
-         * See: http://www.w3.org/TR/xmldsig-core/#sec-ReferenceProcessingModel
-         */
-        $includeCommentNodes = true;
-
-        if ($uri = $refNode->getAttribute("URI")) {
-            $arUrl = parse_url($uri);
-            if (empty($arUrl['path'])) {
-                if ($identifier = $arUrl['fragment']) {
-
-                    /* This reference identifies a node with the given id by using
-                     * a URI on the form "#identifier". This should not include comments.
-                     */
-                    $includeCommentNodes = false;
-
-                    $xPath = new DOMXPath($refNode->ownerDocument);
-                    if ($this->idNS && is_array($this->idNS)) {
-                        foreach ($this->idNS as $nspf => $ns) {
-                            $xPath->registerNamespace($nspf, $ns);
-                        }
-                    }
-                    $iDlist = '@Id="'.XPath::filterAttrValue($identifier, XPath::DOUBLE_QUOTE).'"';
-                    if (is_array($this->idKeys)) {
-                        foreach ($this->idKeys as $idKey) {
-                            $iDlist .= " or @".XPath::filterAttrName($idKey).'="'.
-                                XPath::filterAttrValue($identifier, XPath::DOUBLE_QUOTE).'"';
-                        }
-                    }
-                    $query = '//*['.$iDlist.']';
-                    $dataObject = $xPath->query($query)->item(0);
-                } else {
-                    $dataObject = $refNode->ownerDocument;
-                }
-            }
-        } else {
-            /* This reference identifies the root node with an empty URI. This should
-             * not include comments.
-             */
-            $includeCommentNodes = false;
-
-            $dataObject = $refNode->ownerDocument;
-        }
-        $data = $this->processTransforms($refNode, $dataObject, $includeCommentNodes);
-        if (!$this->validateDigest($refNode, $data)) {
-            return false;
-        }
-
-        if ($dataObject instanceof DOMNode) {
-            /* Add this node to the list of validated nodes. */
-            if (! empty($identifier)) {
-                $this->validatedNodes[$identifier] = $dataObject;
-            } else {
-                $this->validatedNodes[] = $dataObject;
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * @param DOMNode $refNode
-     * @return null
-     */
-    public function getRefNodeID($refNode)
-    {
-        if ($uri = $refNode->getAttribute("URI")) {
-            $arUrl = parse_url($uri);
-            if (empty($arUrl['path'])) {
-                if ($identifier = $arUrl['fragment']) {
-                    return $identifier;
-                }
-            }
-        }
-        return null;
-    }
-
-    /**
-     * @return array
-     * @throws Exception
-     */
-    public function getRefIDs()
-    {
-        $refids = array();
-
-        $xpath = $this->getXPathObj();
-        $query = "./secdsig:SignedInfo[1]/secdsig:Reference";
-        $nodeset = $xpath->query($query, $this->sigNode);
-        if ($nodeset->length == 0) {
-            throw new Exception("Reference nodes not found");
-        }
-        foreach ($nodeset AS $refNode) {
-            $refids[] = $this->getRefNodeID($refNode);
-        }
-        return $refids;
-    }
-
-    /**
-     * @return bool
-     * @throws Exception
-     */
-    public function validateReference()
-    {
-        $docElem = $this->sigNode->ownerDocument->documentElement;
-        if (! $docElem->isSameNode($this->sigNode)) {
-            if ($this->sigNode->parentNode != null) {
-                $this->sigNode->parentNode->removeChild($this->sigNode);
-            }
-        }
-        $xpath = $this->getXPathObj();
-        $query = "./secdsig:SignedInfo[1]/secdsig:Reference";
-        $nodeset = $xpath->query($query, $this->sigNode);
-        if ($nodeset->length == 0) {
-            throw new Exception("Reference nodes not found");
-        }
-
-        /* Initialize/reset the list of validated nodes. */
-        $this->validatedNodes = array();
-
-        foreach ($nodeset AS $refNode) {
-            if (! $this->processRefNode($refNode)) {
-                /* Clear the list of validated nodes. */
-                $this->validatedNodes = null;
-                throw new Exception("Reference validation failed");
-            }
-        }
-        return true;
-    }
-
-    /**
-     * @param DOMNode $sinfoNode
-     * @param DOMDocument $node
-     * @param string $algorithm
-     * @param null|array $arTransforms
-     * @param null|array $options
-     */
-    private function addRefInternal($sinfoNode, $node, $algorithm, $arTransforms=null, $options=null)
-    {
-        $prefix = null;
-        $prefix_ns = null;
-        $id_name = 'Id';
-        $overwrite_id  = true;
-        $force_uri = false;
-
-        if (is_array($options)) {
-            $prefix = empty($options['prefix']) ? null : $options['prefix'];
-            $prefix_ns = empty($options['prefix_ns']) ? null : $options['prefix_ns'];
-            $id_name = empty($options['id_name']) ? 'Id' : $options['id_name'];
-            $overwrite_id = !isset($options['overwrite']) ? true : (bool) $options['overwrite'];
-            $force_uri = !isset($options['force_uri']) ? false : (bool) $options['force_uri'];
-        }
-
-        $attname = $id_name;
-        if (! empty($prefix)) {
-            $attname = $prefix.':'.$attname;
-        }
-
-        $refNode = $this->createNewSignNode('Reference');
-        $sinfoNode->appendChild($refNode);
-
-        if (! $node instanceof DOMDocument) {
-            $uri = null;
-            if (! $overwrite_id) {
-                $uri = $prefix_ns ? $node->getAttributeNS($prefix_ns, $id_name) : $node->getAttribute($id_name);
-            }
-            if (empty($uri)) {
-                $uri = self::generateGUID();
-                $node->setAttributeNS($prefix_ns, $attname, $uri);
-            }
-            $refNode->setAttribute("URI", '#'.$uri);
-        } elseif ($force_uri) {
-            $refNode->setAttribute("URI", '');
-        }
-
-        $transNodes = $this->createNewSignNode('Transforms');
-        $refNode->appendChild($transNodes);
-
-        if (is_array($arTransforms)) {
-            foreach ($arTransforms AS $transform) {
-                $transNode = $this->createNewSignNode('Transform');
-                $transNodes->appendChild($transNode);
-                if (is_array($transform) &&
-                    (! empty($transform['http://www.w3.org/TR/1999/REC-xpath-19991116'])) &&
-                    (! empty($transform['http://www.w3.org/TR/1999/REC-xpath-19991116']['query']))) {
-                    $transNode->setAttribute('Algorithm', 'http://www.w3.org/TR/1999/REC-xpath-19991116');
-                    $XPathNode = $this->createNewSignNode('XPath', $transform['http://www.w3.org/TR/1999/REC-xpath-19991116']['query']);
-                    $transNode->appendChild($XPathNode);
-                    if (! empty($transform['http://www.w3.org/TR/1999/REC-xpath-19991116']['namespaces'])) {
-                        foreach ($transform['http://www.w3.org/TR/1999/REC-xpath-19991116']['namespaces'] AS $prefix => $namespace) {
-                            $XPathNode->setAttributeNS("http://www.w3.org/2000/xmlns/", "xmlns:$prefix", $namespace);
-                        }
-                    }
-                } else {
-                    $transNode->setAttribute('Algorithm', $transform);
-                }
-            }
-        } elseif (! empty($this->canonicalMethod)) {
-            $transNode = $this->createNewSignNode('Transform');
-            $transNodes->appendChild($transNode);
-            $transNode->setAttribute('Algorithm', $this->canonicalMethod);
-        }
-
-        $canonicalData = $this->processTransforms($refNode, $node);
-        $digValue = $this->calculateDigest($algorithm, $canonicalData);
-
-        $digestMethod = $this->createNewSignNode('DigestMethod');
-        $refNode->appendChild($digestMethod);
-        $digestMethod->setAttribute('Algorithm', $algorithm);
-
-        $digestValue = $this->createNewSignNode('DigestValue', $digValue);
-        $refNode->appendChild($digestValue);
-    }
-
-    /**
-     * @param DOMDocument $node
-     * @param string $algorithm
-     * @param null|array $arTransforms
-     * @param null|array $options
-     */
-    public function addReference($node, $algorithm, $arTransforms=null, $options=null)
-    {
-        if ($xpath = $this->getXPathObj()) {
-            $query = "./secdsig:SignedInfo";
-            $nodeset = $xpath->query($query, $this->sigNode);
-            if ($sInfo = $nodeset->item(0)) {
-                $this->addRefInternal($sInfo, $node, $algorithm, $arTransforms, $options);
-            }
-        }
-    }
-
-    /**
-     * @param array $arNodes
-     * @param string $algorithm
-     * @param null|array $arTransforms
-     * @param null|array $options
-     */
-    public function addReferenceList($arNodes, $algorithm, $arTransforms=null, $options=null)
-    {
-        if ($xpath = $this->getXPathObj()) {
-            $query = "./secdsig:SignedInfo";
-            $nodeset = $xpath->query($query, $this->sigNode);
-            if ($sInfo = $nodeset->item(0)) {
-                foreach ($arNodes AS $node) {
-                    $this->addRefInternal($sInfo, $node, $algorithm, $arTransforms, $options);
-                }
-            }
-        }
-    }
-
-    /**
-     * @param DOMElement|string $data
-     * @param null|string $mimetype
-     * @param null|string $encoding
-     * @return DOMElement
-     */
-    public function addObject($data, $mimetype=null, $encoding=null)
-    {
-        $objNode = $this->createNewSignNode('Object');
-        $this->sigNode->appendChild($objNode);
-        if (! empty($mimetype)) {
-            $objNode->setAttribute('MimeType', $mimetype);
-        }
-        if (! empty($encoding)) {
-            $objNode->setAttribute('Encoding', $encoding);
-        }
-
-        if ($data instanceof DOMElement) {
-            $newData = $this->sigNode->ownerDocument->importNode($data, true);
-        } else {
-            $newData = $this->sigNode->ownerDocument->createTextNode($data);
-        }
-        $objNode->appendChild($newData);
-
-        return $objNode;
-    }
-
-    /**
-     * @param null|DOMNode $node
-     * @return null|XMLSecurityKey
-     */
-    public function locateKey($node=null)
-    {
-        if (empty($node)) {
-            $node = $this->sigNode;
-        }
-        if (! $node instanceof DOMNode) {
-            return null;
-        }
-        if ($doc = $node->ownerDocument) {
-            $xpath = new DOMXPath($doc);
-            $xpath->registerNamespace('secdsig', self::XMLDSIGNS);
-            $query = "string(./secdsig:SignedInfo/secdsig:SignatureMethod/@Algorithm)";
-            $algorithm = $xpath->evaluate($query, $node);
-            if ($algorithm) {
-                try {
-                    $objKey = new XMLSecurityKey($algorithm, array('type' => 'public'));
-                } catch (Exception $e) {
-                    return null;
-                }
-                return $objKey;
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Returns:
-     *  Bool when verifying HMAC_SHA1;
-     *  Int otherwise, with following meanings:
-     *    1 on succesful signature verification,
-     *    0 when signature verification failed,
-     *   -1 if an error occurred during processing.
-     *
-     * NOTE: be very careful when checking the int return value, because in
-     * PHP, -1 will be cast to True when in boolean context. Always check the
-     * return value in a strictly typed way, e.g. "$obj->verify(...) === 1".
-     *
-     * @param XMLSecurityKey $objKey
-     * @return bool|int
-     * @throws Exception
-     */
-    public function verify($objKey)
-    {
-        $doc = $this->sigNode->ownerDocument;
-        $xpath = new DOMXPath($doc);
-        $xpath->registerNamespace('secdsig', self::XMLDSIGNS);
-        $query = "string(./secdsig:SignatureValue)";
-        $sigValue = $xpath->evaluate($query, $this->sigNode);
-        if (empty($sigValue)) {
-            throw new Exception("Unable to locate SignatureValue");
-        }
-        return $objKey->verifySignature($this->signedInfo, base64_decode($sigValue));
-    }
-
-    /**
-     * @param XMLSecurityKey $objKey
-     * @param string $data
-     * @return mixed|string
-     */
-    public function signData($objKey, $data)
-    {
-        return $objKey->signData($data);
-    }
-
-    /**
-     * @param XMLSecurityKey $objKey
-     * @param null|DOMNode $appendToNode
-     */
-    public function sign($objKey, $appendToNode = null)
-    {
-        // If we have a parent node append it now so C14N properly works
-        if ($appendToNode != null) {
-            $this->resetXPathObj();
-            $this->appendSignature($appendToNode);
-            $this->sigNode = $appendToNode->lastChild;
-        }
-        if ($xpath = $this->getXPathObj()) {
-            $query = "./secdsig:SignedInfo";
-            $nodeset = $xpath->query($query, $this->sigNode);
-            if ($sInfo = $nodeset->item(0)) {
-                $query = "./secdsig:SignatureMethod";
-                $nodeset = $xpath->query($query, $sInfo);
-                $sMethod = $nodeset->item(0);
-                $sMethod->setAttribute('Algorithm', $objKey->type);
-                $data = $this->canonicalizeData($sInfo, $this->canonicalMethod);
-                $sigValue = base64_encode($this->signData($objKey, $data));
-                $sigValueNode = $this->createNewSignNode('SignatureValue', $sigValue);
-                if ($infoSibling = $sInfo->nextSibling) {
-                    $infoSibling->parentNode->insertBefore($sigValueNode, $infoSibling);
-                } else {
-                    $this->sigNode->appendChild($sigValueNode);
-                }
-            }
-        }
-    }
-
-    public function appendCert()
-    {
-
-    }
-
-    /**
-     * @param XMLSecurityKey $objKey
-     * @param null|DOMNode $parent
-     */
-    public function appendKey($objKey, $parent=null)
-    {
-        $objKey->serializeKey($parent);
-    }
-
-
-    /**
-     * This function inserts the signature element.
-     *
-     * The signature element will be appended to the element, unless $beforeNode is specified. If $beforeNode
-     * is specified, the signature element will be inserted as the last element before $beforeNode.
-     *
-     * @param DOMNode $node       The node the signature element should be inserted into.
-     * @param DOMNode $beforeNode The node the signature element should be located before.
-     *
-     * @return DOMNode The signature element node
-     */
-    public function insertSignature($node, $beforeNode = null)
-    {
-
-        $document = $node->ownerDocument;
-        $signatureElement = $document->importNode($this->sigNode, true);
-
-        if ($beforeNode == null) {
-            return $node->insertBefore($signatureElement);
-        } else {
-            return $node->insertBefore($signatureElement, $beforeNode);
-        }
-    }
-
-    /**
-     * @param DOMNode $parentNode
-     * @param bool $insertBefore
-     * @return DOMNode
-     */
-    public function appendSignature($parentNode, $insertBefore = false)
-    {
-        $beforeNode = $insertBefore ? $parentNode->firstChild : null;
-        return $this->insertSignature($parentNode, $beforeNode);
-    }
-
-    /**
-     * @param string $cert
-     * @param bool $isPEMFormat
-     * @return string
-     */
-    public static function get509XCert($cert, $isPEMFormat=true)
-    {
-        $certs = self::staticGet509XCerts($cert, $isPEMFormat);
-        if (! empty($certs)) {
-            return $certs[0];
-        }
-        return '';
-    }
-
-    /**
-     * @param string $certs
-     * @param bool $isPEMFormat
-     * @return array
-     */
-    public static function staticGet509XCerts($certs, $isPEMFormat=true)
-    {
-        if ($isPEMFormat) {
-            $data = '';
-            $certlist = array();
-            $arCert = explode("\n", $certs);
-            $inData = false;
-            foreach ($arCert AS $curData) {
-                if (! $inData) {
-                    if (strncmp($curData, '-----BEGIN CERTIFICATE', 22) == 0) {
-                        $inData = true;
-                    }
-                } else {
-                    if (strncmp($curData, '-----END CERTIFICATE', 20) == 0) {
-                        $inData = false;
-                        $certlist[] = $data;
-                        $data = '';
-                        continue;
-                    }
-                    $data .= trim($curData);
-                }
-            }
-            return $certlist;
-        } else {
-            return array($certs);
-        }
-    }
-
-    /**
-     * @param DOMElement $parentRef
-     * @param string $cert
-     * @param bool $isPEMFormat
-     * @param bool $isURL
-     * @param null|DOMXPath $xpath
-     * @param null|array $options
-     * @throws Exception
-     */
-    public static function staticAdd509Cert($parentRef, $cert, $isPEMFormat=true, $isURL=false, $xpath=null, $options=null)
-    {
-        if ($isURL) {
-            $cert = file_get_contents($cert);
-        }
-        if (! $parentRef instanceof DOMElement) {
-            throw new Exception('Invalid parent Node parameter');
-        }
-        $baseDoc = $parentRef->ownerDocument;
-
-        if (empty($xpath)) {
-            $xpath = new DOMXPath($parentRef->ownerDocument);
-            $xpath->registerNamespace('secdsig', self::XMLDSIGNS);
-        }
-
-        $query = "./secdsig:KeyInfo";
-        $nodeset = $xpath->query($query, $parentRef);
-        $keyInfo = $nodeset->item(0);
-        $dsig_pfx = '';
-        if (! $keyInfo) {
-            $pfx = $parentRef->lookupPrefix(self::XMLDSIGNS);
-            if (! empty($pfx)) {
-                $dsig_pfx = $pfx.":";
-            }
-            $inserted = false;
-            $keyInfo = $baseDoc->createElementNS(self::XMLDSIGNS, $dsig_pfx.'KeyInfo');
-
-            $query = "./secdsig:Object";
-            $nodeset = $xpath->query($query, $parentRef);
-            if ($sObject = $nodeset->item(0)) {
-                $sObject->parentNode->insertBefore($keyInfo, $sObject);
-                $inserted = true;
-            }
-
-            if (! $inserted) {
-                $parentRef->appendChild($keyInfo);
-            }
-        } else {
-            $pfx = $keyInfo->lookupPrefix(self::XMLDSIGNS);
-            if (! empty($pfx)) {
-                $dsig_pfx = $pfx.":";
-            }
-        }
-
-        // Add all certs if there are more than one
-        $certs = self::staticGet509XCerts($cert, $isPEMFormat);
-
-        // Attach X509 data node
-        $x509DataNode = $baseDoc->createElementNS(self::XMLDSIGNS, $dsig_pfx.'X509Data');
-        $keyInfo->appendChild($x509DataNode);
-
-        $issuerSerial = false;
-        $subjectName = false;
-        if (is_array($options)) {
-            if (! empty($options['issuerSerial'])) {
-                $issuerSerial = true;
-            }
-            if (! empty($options['subjectName'])) {
-                $subjectName = true;
-            }
-        }
-
-        // Attach all certificate nodes and any additional data
-        foreach ($certs as $X509Cert) {
-            if ($issuerSerial || $subjectName) {
-                if ($certData = openssl_x509_parse("-----BEGIN CERTIFICATE-----\n".chunk_split($X509Cert, 64, "\n")."-----END CERTIFICATE-----\n")) {
-                    if ($subjectName && ! empty($certData['subject'])) {
-                        if (is_array($certData['subject'])) {
-                            $parts = array();
-                            foreach ($certData['subject'] AS $key => $value) {
-                                if (is_array($value)) {
-                                    foreach ($value as $valueElement) {
-                                        array_unshift($parts, "$key=$valueElement");
-                                    }
-                                } else {
-                                    array_unshift($parts, "$key=$value");
-                                }
-                            }
-                            $subjectNameValue = implode(',', $parts);
-                        } else {
-                            $subjectNameValue = $certData['issuer'];
-                        }
-                        $x509SubjectNode = $baseDoc->createElementNS(self::XMLDSIGNS, $dsig_pfx.'X509SubjectName', $subjectNameValue);
-                        $x509DataNode->appendChild($x509SubjectNode);
-                    }
-                    if ($issuerSerial && ! empty($certData['issuer']) && ! empty($certData['serialNumber'])) {
-                        if (is_array($certData['issuer'])) {
-                            $parts = array();
-                            foreach ($certData['issuer'] AS $key => $value) {
-                                array_unshift($parts, "$key=$value");
-                            }
-                            $issuerName = implode(',', $parts);
-                        } else {
-                            $issuerName = $certData['issuer'];
-                        }
-
-                        $x509IssuerNode = $baseDoc->createElementNS(self::XMLDSIGNS, $dsig_pfx.'X509IssuerSerial');
-                        $x509DataNode->appendChild($x509IssuerNode);
-
-                        $x509Node = $baseDoc->createElementNS(self::XMLDSIGNS, $dsig_pfx.'X509IssuerName', $issuerName);
-                        $x509IssuerNode->appendChild($x509Node);
-                        $x509Node = $baseDoc->createElementNS(self::XMLDSIGNS, $dsig_pfx.'X509SerialNumber', $certData['serialNumber']);
-                        $x509IssuerNode->appendChild($x509Node);
-                    }
-                }
-
-            }
-            $x509CertNode = $baseDoc->createElementNS(self::XMLDSIGNS, $dsig_pfx.'X509Certificate', $X509Cert);
-            $x509DataNode->appendChild($x509CertNode);
-        }
-    }
-
-    /**
-     * @param string $cert
-     * @param bool $isPEMFormat
-     * @param bool $isURL
-     * @param null|array $options
-     */
-    public function add509Cert($cert, $isPEMFormat=true, $isURL=false, $options=null)
-    {
-        if ($xpath = $this->getXPathObj()) {
-            self::staticAdd509Cert($this->sigNode, $cert, $isPEMFormat, $isURL, $xpath, $options);
-        }
-    }
-
-    /**
-     * This function appends a node to the KeyInfo.
-     *
-     * The KeyInfo element will be created if one does not exist in the document.
-     *
-     * @param DOMNode $node The node to append to the KeyInfo.
-     *
-     * @return DOMNode The KeyInfo element node
-     */
-    public function appendToKeyInfo($node)
-    {
-        $parentRef = $this->sigNode;
-        $baseDoc = $parentRef->ownerDocument;
-
-        $xpath = $this->getXPathObj();
-        if (empty($xpath)) {
-            $xpath = new DOMXPath($parentRef->ownerDocument);
-            $xpath->registerNamespace('secdsig', self::XMLDSIGNS);
-        }
-
-        $query = "./secdsig:KeyInfo";
-        $nodeset = $xpath->query($query, $parentRef);
-        $keyInfo = $nodeset->item(0);
-        if (! $keyInfo) {
-            $dsig_pfx = '';
-            $pfx = $parentRef->lookupPrefix(self::XMLDSIGNS);
-            if (! empty($pfx)) {
-                $dsig_pfx = $pfx.":";
-            }
-            $inserted = false;
-            $keyInfo = $baseDoc->createElementNS(self::XMLDSIGNS, $dsig_pfx.'KeyInfo');
-
-            $query = "./secdsig:Object";
-            $nodeset = $xpath->query($query, $parentRef);
-            if ($sObject = $nodeset->item(0)) {
-                $sObject->parentNode->insertBefore($keyInfo, $sObject);
-                $inserted = true;
-            }
-
-            if (! $inserted) {
-                $parentRef->appendChild($keyInfo);
-            }
-        }
-
-        $keyInfo->appendChild($node);
-
-        return $keyInfo;
-    }
-
-    /**
-     * This function retrieves an associative array of the validated nodes.
-     *
-     * The array will contain the id of the referenced node as the key and the node itself
-     * as the value.
-     *
-     * Returns:
-     *  An associative array of validated nodes or null if no nodes have been validated.
-     *
-     *  @return array Associative array of validated nodes
-     */
-    public function getValidatedNodes()
-    {
-        return $this->validatedNodes;
-    }
-}
diff --git a/saml/vendor/robrichards/xmlseclibs/src/XMLSecurityKey.php b/saml/vendor/robrichards/xmlseclibs/src/XMLSecurityKey.php
deleted file mode 100644
index 7eed04d2..00000000
--- a/saml/vendor/robrichards/xmlseclibs/src/XMLSecurityKey.php
+++ /dev/null
@@ -1,813 +0,0 @@
-<?php
-namespace RobRichards\XMLSecLibs;
-
-use DOMElement;
-use Exception;
-
-/**
- * xmlseclibs.php
- *
- * Copyright (c) 2007-2020, Robert Richards <rrichards@cdatazone.org>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in
- *     the documentation and/or other materials provided with the
- *     distribution.
- *
- *   * Neither the name of Robert Richards nor the names of his
- *     contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @author    Robert Richards <rrichards@cdatazone.org>
- * @copyright 2007-2020 Robert Richards <rrichards@cdatazone.org>
- * @license   http://www.opensource.org/licenses/bsd-license.php  BSD License
- */
-
-class XMLSecurityKey
-{
-    const TRIPLEDES_CBC = 'http://www.w3.org/2001/04/xmlenc#tripledes-cbc';
-    const AES128_CBC = 'http://www.w3.org/2001/04/xmlenc#aes128-cbc';
-    const AES192_CBC = 'http://www.w3.org/2001/04/xmlenc#aes192-cbc';
-    const AES256_CBC = 'http://www.w3.org/2001/04/xmlenc#aes256-cbc';
-    const AES128_GCM = 'http://www.w3.org/2009/xmlenc11#aes128-gcm';
-    const AES192_GCM = 'http://www.w3.org/2009/xmlenc11#aes192-gcm';
-    const AES256_GCM = 'http://www.w3.org/2009/xmlenc11#aes256-gcm';
-    const RSA_1_5 = 'http://www.w3.org/2001/04/xmlenc#rsa-1_5';
-    const RSA_OAEP_MGF1P = 'http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p';
-    const RSA_OAEP = 'http://www.w3.org/2009/xmlenc11#rsa-oaep';
-    const DSA_SHA1 = 'http://www.w3.org/2000/09/xmldsig#dsa-sha1';
-    const RSA_SHA1 = 'http://www.w3.org/2000/09/xmldsig#rsa-sha1';
-    const RSA_SHA256 = 'http://www.w3.org/2001/04/xmldsig-more#rsa-sha256';
-    const RSA_SHA384 = 'http://www.w3.org/2001/04/xmldsig-more#rsa-sha384';
-    const RSA_SHA512 = 'http://www.w3.org/2001/04/xmldsig-more#rsa-sha512';
-    const HMAC_SHA1 = 'http://www.w3.org/2000/09/xmldsig#hmac-sha1';
-    const AUTHTAG_LENGTH = 16;
-
-    /** @var array */
-    private $cryptParams = array();
-
-    /** @var int|string */
-    public $type = 0;
-
-    /** @var mixed|null */
-    public $key = null;
-
-    /** @var string  */
-    public $passphrase = "";
-
-    /** @var string|null */
-    public $iv = null;
-
-    /** @var string|null */
-    public $name = null;
-
-    /** @var mixed|null */
-    public $keyChain = null;
-
-    /** @var bool */
-    public $isEncrypted = false;
-
-    /** @var XMLSecEnc|null */
-    public $encryptedCtx = null;
-
-    /** @var mixed|null */
-    public $guid = null;
-
-    /**
-     * This variable contains the certificate as a string if this key represents an X509-certificate.
-     * If this key doesn't represent a certificate, this will be null.
-     * @var string|null
-     */
-    private $x509Certificate = null;
-
-    /**
-     * This variable contains the certificate thumbprint if we have loaded an X509-certificate.
-     * @var string|null
-     */
-    private $X509Thumbprint = null;
-
-    /**
-     * @param string $type
-     * @param null|array $params
-     * @throws Exception
-     */
-    public function __construct($type, $params=null)
-    {
-        switch ($type) {
-            case (self::TRIPLEDES_CBC):
-                $this->cryptParams['library'] = 'openssl';
-                $this->cryptParams['cipher'] = 'des-ede3-cbc';
-                $this->cryptParams['type'] = 'symmetric';
-                $this->cryptParams['method'] = 'http://www.w3.org/2001/04/xmlenc#tripledes-cbc';
-                $this->cryptParams['keysize'] = 24;
-                $this->cryptParams['blocksize'] = 8;
-                break;
-            case (self::AES128_CBC):
-                $this->cryptParams['library'] = 'openssl';
-                $this->cryptParams['cipher'] = 'aes-128-cbc';
-                $this->cryptParams['type'] = 'symmetric';
-                $this->cryptParams['method'] = 'http://www.w3.org/2001/04/xmlenc#aes128-cbc';
-                $this->cryptParams['keysize'] = 16;
-                $this->cryptParams['blocksize'] = 16;
-                break;
-            case (self::AES192_CBC):
-                $this->cryptParams['library'] = 'openssl';
-                $this->cryptParams['cipher'] = 'aes-192-cbc';
-                $this->cryptParams['type'] = 'symmetric';
-                $this->cryptParams['method'] = 'http://www.w3.org/2001/04/xmlenc#aes192-cbc';
-                $this->cryptParams['keysize'] = 24;
-                $this->cryptParams['blocksize'] = 16;
-                break;
-            case (self::AES256_CBC):
-                $this->cryptParams['library'] = 'openssl';
-                $this->cryptParams['cipher'] = 'aes-256-cbc';
-                $this->cryptParams['type'] = 'symmetric';
-                $this->cryptParams['method'] = 'http://www.w3.org/2001/04/xmlenc#aes256-cbc';
-                $this->cryptParams['keysize'] = 32;
-                $this->cryptParams['blocksize'] = 16;
-                break;
-            case (self::AES128_GCM):
-                $this->cryptParams['library'] = 'openssl';
-                $this->cryptParams['cipher'] = 'aes-128-gcm';
-                $this->cryptParams['type'] = 'symmetric';
-                $this->cryptParams['method'] = 'http://www.w3.org/2009/xmlenc11#aes128-gcm';
-                $this->cryptParams['keysize'] = 16;
-                $this->cryptParams['blocksize'] = 16;
-                break;
-            case (self::AES192_GCM):
-                $this->cryptParams['library'] = 'openssl';
-                $this->cryptParams['cipher'] = 'aes-192-gcm';
-                $this->cryptParams['type'] = 'symmetric';
-                $this->cryptParams['method'] = 'http://www.w3.org/2009/xmlenc11#aes192-gcm';
-                $this->cryptParams['keysize'] = 24;
-                $this->cryptParams['blocksize'] = 16;
-                break;
-            case (self::AES256_GCM):
-                $this->cryptParams['library'] = 'openssl';
-                $this->cryptParams['cipher'] = 'aes-256-gcm';
-                $this->cryptParams['type'] = 'symmetric';
-                $this->cryptParams['method'] = 'http://www.w3.org/2009/xmlenc11#aes256-gcm';
-                $this->cryptParams['keysize'] = 32;
-                $this->cryptParams['blocksize'] = 16;
-                break;
-            case (self::RSA_1_5):
-                $this->cryptParams['library'] = 'openssl';
-                $this->cryptParams['padding'] = OPENSSL_PKCS1_PADDING;
-                $this->cryptParams['method'] = 'http://www.w3.org/2001/04/xmlenc#rsa-1_5';
-                if (is_array($params) && ! empty($params['type'])) {
-                    if ($params['type'] == 'public' || $params['type'] == 'private') {
-                        $this->cryptParams['type'] = $params['type'];
-                        break;
-                    }
-                }
-                throw new Exception('Certificate "type" (private/public) must be passed via parameters');
-            case (self::RSA_OAEP_MGF1P):
-                $this->cryptParams['library'] = 'openssl';
-                $this->cryptParams['padding'] = OPENSSL_PKCS1_OAEP_PADDING;
-                $this->cryptParams['method'] = 'http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p';
-                $this->cryptParams['hash'] = null;
-                if (is_array($params) && ! empty($params['type'])) {
-                    if ($params['type'] == 'public' || $params['type'] == 'private') {
-                        $this->cryptParams['type'] = $params['type'];
-                        break;
-                    }
-                }
-                throw new Exception('Certificate "type" (private/public) must be passed via parameters');
-            case (self::RSA_OAEP):
-                $this->cryptParams['library'] = 'openssl';
-                $this->cryptParams['padding'] = OPENSSL_PKCS1_OAEP_PADDING;
-                $this->cryptParams['method'] = 'http://www.w3.org/2009/xmlenc11#rsa-oaep';
-                $this->cryptParams['hash'] = 'http://www.w3.org/2009/xmlenc11#mgf1sha1';
-                if (is_array($params) && ! empty($params['type'])) {
-                    if ($params['type'] == 'public' || $params['type'] == 'private') {
-                        $this->cryptParams['type'] = $params['type'];
-                        break;
-                    }
-                }
-                throw new Exception('Certificate "type" (private/public) must be passed via parameters');
-            case (self::RSA_SHA1):
-                $this->cryptParams['library'] = 'openssl';
-                $this->cryptParams['method'] = 'http://www.w3.org/2000/09/xmldsig#rsa-sha1';
-                $this->cryptParams['padding'] = OPENSSL_PKCS1_PADDING;
-                if (is_array($params) && ! empty($params['type'])) {
-                    if ($params['type'] == 'public' || $params['type'] == 'private') {
-                        $this->cryptParams['type'] = $params['type'];
-                        break;
-                    }
-                }
-                throw new Exception('Certificate "type" (private/public) must be passed via parameters');
-            case (self::RSA_SHA256):
-                $this->cryptParams['library'] = 'openssl';
-                $this->cryptParams['method'] = 'http://www.w3.org/2001/04/xmldsig-more#rsa-sha256';
-                $this->cryptParams['padding'] = OPENSSL_PKCS1_PADDING;
-                $this->cryptParams['digest'] = 'SHA256';
-                if (is_array($params) && ! empty($params['type'])) {
-                    if ($params['type'] == 'public' || $params['type'] == 'private') {
-                        $this->cryptParams['type'] = $params['type'];
-                        break;
-                    }
-                }
-                throw new Exception('Certificate "type" (private/public) must be passed via parameters');
-            case (self::RSA_SHA384):
-                $this->cryptParams['library'] = 'openssl';
-                $this->cryptParams['method'] = 'http://www.w3.org/2001/04/xmldsig-more#rsa-sha384';
-                $this->cryptParams['padding'] = OPENSSL_PKCS1_PADDING;
-                $this->cryptParams['digest'] = 'SHA384';
-                if (is_array($params) && ! empty($params['type'])) {
-                    if ($params['type'] == 'public' || $params['type'] == 'private') {
-                        $this->cryptParams['type'] = $params['type'];
-                        break;
-                    }
-                }
-                throw new Exception('Certificate "type" (private/public) must be passed via parameters');
-            case (self::RSA_SHA512):
-                $this->cryptParams['library'] = 'openssl';
-                $this->cryptParams['method'] = 'http://www.w3.org/2001/04/xmldsig-more#rsa-sha512';
-                $this->cryptParams['padding'] = OPENSSL_PKCS1_PADDING;
-                $this->cryptParams['digest'] = 'SHA512';
-                if (is_array($params) && ! empty($params['type'])) {
-                    if ($params['type'] == 'public' || $params['type'] == 'private') {
-                        $this->cryptParams['type'] = $params['type'];
-                        break;
-                    }
-                }
-                throw new Exception('Certificate "type" (private/public) must be passed via parameters');
-            case (self::HMAC_SHA1):
-                $this->cryptParams['library'] = $type;
-                $this->cryptParams['method'] = 'http://www.w3.org/2000/09/xmldsig#hmac-sha1';
-                break;
-            default:
-                throw new Exception('Invalid Key Type');
-        }
-        $this->type = $type;
-    }
-
-    /**
-     * Retrieve the key size for the symmetric encryption algorithm..
-     *
-     * If the key size is unknown, or this isn't a symmetric encryption algorithm,
-     * null is returned.
-     *
-     * @return int|null  The number of bytes in the key.
-     */
-    public function getSymmetricKeySize()
-    {
-        if (! isset($this->cryptParams['keysize'])) {
-            return null;
-        }
-        return $this->cryptParams['keysize'];
-    }
-
-    /**
-     * Generates a session key using the openssl-extension.
-     * In case of using DES3-CBC the key is checked for a proper parity bits set.
-     * @return string
-     * @throws Exception
-     */
-    public function generateSessionKey()
-    {
-        if (!isset($this->cryptParams['keysize'])) {
-            throw new Exception('Unknown key size for type "' . $this->type . '".');
-        }
-        $keysize = $this->cryptParams['keysize'];
-        
-        $key = openssl_random_pseudo_bytes($keysize);
-        
-        if ($this->type === self::TRIPLEDES_CBC) {
-            /* Make sure that the generated key has the proper parity bits set.
-             * Mcrypt doesn't care about the parity bits, but others may care.
-            */
-            for ($i = 0; $i < strlen($key); $i++) {
-                $byte = ord($key[$i]) & 0xfe;
-                $parity = 1;
-                for ($j = 1; $j < 8; $j++) {
-                    $parity ^= ($byte >> $j) & 1;
-                }
-                $byte |= $parity;
-                $key[$i] = chr($byte);
-            }
-        }
-        
-        $this->key = $key;
-        return $key;
-    }
-
-    /**
-     * Get the raw thumbprint of a certificate
-     *
-     * @param string $cert
-     * @return null|string
-     */
-    public static function getRawThumbprint($cert)
-    {
-
-        $arCert = explode("\n", $cert);
-        $data = '';
-        $inData = false;
-
-        foreach ($arCert AS $curData) {
-            if (! $inData) {
-                if (strncmp($curData, '-----BEGIN CERTIFICATE', 22) == 0) {
-                    $inData = true;
-                }
-            } else {
-                if (strncmp($curData, '-----END CERTIFICATE', 20) == 0) {
-                    break;
-                }
-                $data .= trim($curData);
-            }
-        }
-
-        if (! empty($data)) {
-            return strtolower(sha1(base64_decode($data)));
-        }
-
-        return null;
-    }
-
-    /**
-     * Loads the given key, or - with isFile set true - the key from the keyfile.
-     *
-     * @param string $key
-     * @param bool $isFile
-     * @param bool $isCert
-     * @throws Exception
-     */
-    public function loadKey($key, $isFile=false, $isCert = false)
-    {
-        if ($isFile) {
-            $this->key = file_get_contents($key);
-        } else {
-            $this->key = $key;
-        }
-        if ($isCert) {
-            $this->key = openssl_x509_read($this->key);
-            openssl_x509_export($this->key, $str_cert);
-            $this->x509Certificate = $str_cert;
-            $this->key = $str_cert;
-        } else {
-            $this->x509Certificate = null;
-        }
-        if ($this->cryptParams['library'] == 'openssl') {
-            switch ($this->cryptParams['type']) {
-                case 'public':
-	                if ($isCert) {
-	                    /* Load the thumbprint if this is an X509 certificate. */
-	                    $this->X509Thumbprint = self::getRawThumbprint($this->key);
-	                }
-	                $this->key = openssl_get_publickey($this->key);
-	                if (! $this->key) {
-	                    throw new Exception('Unable to extract public key');
-	                }
-	                break;
-
-	            case 'private':
-                    $this->key = openssl_get_privatekey($this->key, $this->passphrase);
-                    break;
-
-                case'symmetric':
-                    if (strlen($this->key) < $this->cryptParams['keysize']) {
-                        throw new Exception('Key must contain at least '.$this->cryptParams['keysize'].' characters for this cipher, contains '.strlen($this->key));
-                    }
-                    break;
-
-                default:
-                    throw new Exception('Unknown type');
-            }
-        }
-    }
-
-    /**
-     * ISO 10126 Padding
-     *
-     * @param string $data
-     * @param integer $blockSize
-     * @throws Exception
-     * @return string
-     */
-    private function padISO10126($data, $blockSize)
-    {
-        if ($blockSize > 256) {
-            throw new Exception('Block size higher than 256 not allowed');
-        }
-        $padChr = $blockSize - (strlen($data) % $blockSize);
-        $pattern = chr($padChr);
-        return $data . str_repeat($pattern, $padChr);
-    }
-
-    /**
-     * Remove ISO 10126 Padding
-     *
-     * @param string $data
-     * @return string
-     */
-    private function unpadISO10126($data)
-    {
-        $padChr = substr($data, -1);
-        $padLen = ord($padChr);
-        return substr($data, 0, -$padLen);
-    }
-
-    /**
-     * Encrypts the given data (string) using the openssl-extension
-     *
-     * @param string $data
-     * @return string
-     */
-    private function encryptSymmetric($data)
-    {
-        $this->iv = openssl_random_pseudo_bytes(openssl_cipher_iv_length($this->cryptParams['cipher']));
-        $authTag = null;
-        if(in_array($this->cryptParams['cipher'], ['aes-128-gcm', 'aes-192-gcm', 'aes-256-gcm'])) {
-            if (version_compare(PHP_VERSION, '7.1.0') < 0) {
-                throw new Exception('PHP 7.1.0 is required to use AES GCM algorithms');
-            }
-            $authTag = openssl_random_pseudo_bytes(self::AUTHTAG_LENGTH);
-            $encrypted = openssl_encrypt($data, $this->cryptParams['cipher'], $this->key, OPENSSL_RAW_DATA, $this->iv, $authTag);
-        } else {
-            $data = $this->padISO10126($data, $this->cryptParams['blocksize']);
-            $encrypted = openssl_encrypt($data, $this->cryptParams['cipher'], $this->key, OPENSSL_RAW_DATA | OPENSSL_ZERO_PADDING, $this->iv);
-        }
-        
-        if (false === $encrypted) {
-            throw new Exception('Failure encrypting Data (openssl symmetric) - ' . openssl_error_string());
-        }
-        return $this->iv . $encrypted . $authTag;
-    }
-
-    /**
-     * Decrypts the given data (string) using the openssl-extension
-     *
-     * @param string $data
-     * @return string
-     */
-    private function decryptSymmetric($data)
-    {
-        $iv_length = openssl_cipher_iv_length($this->cryptParams['cipher']);
-        $this->iv = substr($data, 0, $iv_length);
-        $data = substr($data, $iv_length);
-        $authTag = null;
-        if(in_array($this->cryptParams['cipher'], ['aes-128-gcm', 'aes-192-gcm', 'aes-256-gcm'])) {
-            if (version_compare(PHP_VERSION, '7.1.0') < 0) {
-                throw new Exception('PHP 7.1.0 is required to use AES GCM algorithms');
-            }
-            // obtain and remove the authentication tag
-            $offset = 0 - self::AUTHTAG_LENGTH;
-            $authTag = substr($data, $offset);
-            $data = substr($data, 0, $offset);
-            $decrypted = openssl_decrypt($data, $this->cryptParams['cipher'], $this->key, OPENSSL_RAW_DATA, $this->iv, $authTag);
-        } else {
-            $decrypted = openssl_decrypt($data, $this->cryptParams['cipher'], $this->key, OPENSSL_RAW_DATA | OPENSSL_ZERO_PADDING, $this->iv);
-        }
-        
-        if (false === $decrypted) {
-            throw new Exception('Failure decrypting Data (openssl symmetric) - ' . openssl_error_string());
-        }
-        return null !== $authTag ? $decrypted : $this->unpadISO10126($decrypted);
-    }
-
-    /**
-     * Encrypts the given public data (string) using the openssl-extension
-     *
-     * @param string $data
-     * @return string
-     * @throws Exception
-     */
-    private function encryptPublic($data)
-    {
-        if (! openssl_public_encrypt($data, $encrypted, $this->key, $this->cryptParams['padding'])) {
-            throw new Exception('Failure encrypting Data (openssl public) - ' . openssl_error_string());
-        }
-        return $encrypted;
-    }
-
-    /**
-     * Decrypts the given public data (string) using the openssl-extension
-     *
-     * @param string $data
-     * @return string
-     * @throws Exception
-     */
-    private function decryptPublic($data)
-    {
-        if (! openssl_public_decrypt($data, $decrypted, $this->key, $this->cryptParams['padding'])) {
-            throw new Exception('Failure decrypting Data (openssl public) - ' . openssl_error_string());
-        }
-        return $decrypted;
-    }
-
-    /**
-     * Encrypts the given private data (string) using the openssl-extension
-     *
-     * @param string $data
-     * @return string
-     * @throws Exception
-     */
-    private function encryptPrivate($data)
-    {
-        if (! openssl_private_encrypt($data, $encrypted, $this->key, $this->cryptParams['padding'])) {
-            throw new Exception('Failure encrypting Data (openssl private) - ' . openssl_error_string());
-        }
-        return $encrypted;
-    }
-
-    /**
-     * Decrypts the given private data (string) using the openssl-extension
-     *
-     * @param string $data
-     * @return string
-     * @throws Exception
-     */
-    private function decryptPrivate($data)
-    {
-        if (! openssl_private_decrypt($data, $decrypted, $this->key, $this->cryptParams['padding'])) {
-            throw new Exception('Failure decrypting Data (openssl private) - ' . openssl_error_string());
-        }
-        return $decrypted;
-    }
-
-    /**
-     * Signs the given data (string) using the openssl-extension
-     *
-     * @param string $data
-     * @return string
-     * @throws Exception
-     */
-    private function signOpenSSL($data)
-    {
-        $algo = OPENSSL_ALGO_SHA1;
-        if (! empty($this->cryptParams['digest'])) {
-            $algo = $this->cryptParams['digest'];
-        }
-        if (! openssl_sign($data, $signature, $this->key, $algo)) {
-            throw new Exception('Failure Signing Data: ' . openssl_error_string() . ' - ' . $algo);
-        }
-        return $signature;
-    }
-
-    /**
-     * Verifies the given data (string) belonging to the given signature using the openssl-extension
-     *
-     * Returns:
-     *  1 on succesful signature verification,
-     *  0 when signature verification failed,
-     *  -1 if an error occurred during processing.
-     *
-     * NOTE: be very careful when checking the return value, because in PHP,
-     * -1 will be cast to True when in boolean context. So always check the
-     * return value in a strictly typed way, e.g. "$obj->verify(...) === 1".
-     *
-     * @param string $data
-     * @param string $signature
-     * @return int
-     */
-    private function verifyOpenSSL($data, $signature)
-    {
-        $algo = OPENSSL_ALGO_SHA1;
-        if (! empty($this->cryptParams['digest'])) {
-            $algo = $this->cryptParams['digest'];
-        }
-        return openssl_verify($data, $signature, $this->key, $algo);
-    }
-
-    /**
-     * Encrypts the given data (string) using the regarding php-extension, depending on the library assigned to algorithm in the contructor.
-     *
-     * @param string $data
-     * @return mixed|string
-     */
-    public function encryptData($data)
-    {
-        if ($this->cryptParams['library'] === 'openssl') {
-            switch ($this->cryptParams['type']) {
-                case 'symmetric':
-                    return $this->encryptSymmetric($data);
-                case 'public':
-                    return $this->encryptPublic($data);
-                case 'private':
-                    return $this->encryptPrivate($data);
-            }
-        }
-    }
-
-    /**
-     * Decrypts the given data (string) using the regarding php-extension, depending on the library assigned to algorithm in the contructor.
-     *
-     * @param string $data
-     * @return mixed|string
-     */
-    public function decryptData($data)
-    {
-        if ($this->cryptParams['library'] === 'openssl') {
-            switch ($this->cryptParams['type']) {
-                case 'symmetric':
-                    return $this->decryptSymmetric($data);
-                case 'public':
-                    return $this->decryptPublic($data);
-                case 'private':
-                    return $this->decryptPrivate($data);
-            }
-        }
-    }
-
-    /**
-     * Signs the data (string) using the extension assigned to the type in the constructor.
-     *
-     * @param string $data
-     * @return mixed|string
-     */
-    public function signData($data)
-    {
-        switch ($this->cryptParams['library']) {
-            case 'openssl':
-                return $this->signOpenSSL($data);
-            case (self::HMAC_SHA1):
-                return hash_hmac("sha1", $data, $this->key, true);
-        }
-    }
-
-    /**
-     * Verifies the data (string) against the given signature using the extension assigned to the type in the constructor.
-     *
-     * Returns in case of openSSL:
-     *  1 on succesful signature verification,
-     *  0 when signature verification failed,
-     *  -1 if an error occurred during processing.
-     *
-     * NOTE: be very careful when checking the return value, because in PHP,
-     * -1 will be cast to True when in boolean context. So always check the
-     * return value in a strictly typed way, e.g. "$obj->verify(...) === 1".
-     *
-     * @param string $data
-     * @param string $signature
-     * @return bool|int
-     */
-    public function verifySignature($data, $signature)
-    {
-        switch ($this->cryptParams['library']) {
-            case 'openssl':
-                return $this->verifyOpenSSL($data, $signature);
-            case (self::HMAC_SHA1):
-                $expectedSignature = hash_hmac("sha1", $data, $this->key, true);
-                return strcmp($signature, $expectedSignature) == 0;
-        }
-    }
-
-    /**
-     * @deprecated
-     * @see getAlgorithm()
-     * @return mixed
-     */
-    public function getAlgorith()
-    {
-        return $this->getAlgorithm();
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getAlgorithm()
-    {
-        return $this->cryptParams['method'];
-    }
-
-    /**
-     *
-     * @param int $type
-     * @param string $string
-     * @return null|string
-     */
-    public static function makeAsnSegment($type, $string)
-    {
-        switch ($type) {
-            case 0x02:
-                if (ord($string) > 0x7f)
-                    $string = chr(0).$string;
-                break;
-            case 0x03:
-                $string = chr(0).$string;
-                break;
-        }
-
-        $length = strlen($string);
-
-        if ($length < 128) {
-            $output = sprintf("%c%c%s", $type, $length, $string);
-        } else if ($length < 0x0100) {
-            $output = sprintf("%c%c%c%s", $type, 0x81, $length, $string);
-        } else if ($length < 0x010000) {
-            $output = sprintf("%c%c%c%c%s", $type, 0x82, $length / 0x0100, $length % 0x0100, $string);
-        } else {
-            $output = null;
-        }
-        return $output;
-    }
-
-    /**
-     *
-     * Hint: Modulus and Exponent must already be base64 decoded
-     * @param string $modulus
-     * @param string $exponent
-     * @return string
-     */
-    public static function convertRSA($modulus, $exponent)
-    {
-        /* make an ASN publicKeyInfo */
-        $exponentEncoding = self::makeAsnSegment(0x02, $exponent);
-        $modulusEncoding = self::makeAsnSegment(0x02, $modulus);
-        $sequenceEncoding = self::makeAsnSegment(0x30, $modulusEncoding.$exponentEncoding);
-        $bitstringEncoding = self::makeAsnSegment(0x03, $sequenceEncoding);
-        $rsaAlgorithmIdentifier = pack("H*", "300D06092A864886F70D0101010500");
-        $publicKeyInfo = self::makeAsnSegment(0x30, $rsaAlgorithmIdentifier.$bitstringEncoding);
-
-        /* encode the publicKeyInfo in base64 and add PEM brackets */
-        $publicKeyInfoBase64 = base64_encode($publicKeyInfo);
-        $encoding = "-----BEGIN PUBLIC KEY-----\n";
-        $offset = 0;
-        while ($segment = substr($publicKeyInfoBase64, $offset, 64)) {
-            $encoding = $encoding.$segment."\n";
-            $offset += 64;
-        }
-        return $encoding."-----END PUBLIC KEY-----\n";
-    }
-
-    /**
-     * @param mixed $parent
-     */
-    public function serializeKey($parent)
-    {
-
-    }
-
-    /**
-     * Retrieve the X509 certificate this key represents.
-     *
-     * Will return the X509 certificate in PEM-format if this key represents
-     * an X509 certificate.
-     *
-     * @return string The X509 certificate or null if this key doesn't represent an X509-certificate.
-     */
-    public function getX509Certificate()
-    {
-        return $this->x509Certificate;
-    }
-
-    /**
-     * Get the thumbprint of this X509 certificate.
-     *
-     * Returns:
-     *  The thumbprint as a lowercase 40-character hexadecimal number, or null
-     *  if this isn't a X509 certificate.
-     *
-     *  @return string Lowercase 40-character hexadecimal number of thumbprint
-     */
-    public function getX509Thumbprint()
-    {
-        return $this->X509Thumbprint;
-    }
-
-
-    /**
-     * Create key from an EncryptedKey-element.
-     *
-     * @param DOMElement $element The EncryptedKey-element.
-     * @throws Exception
-     *
-     * @return XMLSecurityKey The new key.
-     */
-    public static function fromEncryptedKeyElement(DOMElement $element)
-    {
-
-        $objenc = new XMLSecEnc();
-        $objenc->setNode($element);
-        if (! $objKey = $objenc->locateKey()) {
-            throw new Exception("Unable to locate algorithm for this Encrypted Key");
-        }
-        $objKey->isEncrypted = true;
-        $objKey->encryptedCtx = $objenc;
-        XMLSecEnc::staticLocateKeyInfo($objKey, $element);
-        return $objKey;
-    }
-
-}
diff --git a/saml/vendor/robrichards/xmlseclibs/xmlseclibs.php b/saml/vendor/robrichards/xmlseclibs/xmlseclibs.php
deleted file mode 100644
index 1c10acc7..00000000
--- a/saml/vendor/robrichards/xmlseclibs/xmlseclibs.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-/**
- * xmlseclibs.php
- *
- * Copyright (c) 2007-2020, Robert Richards <rrichards@cdatazone.org>.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   * Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in
- *     the documentation and/or other materials provided with the
- *     distribution.
- *
- *   * Neither the name of Robert Richards nor the names of his
- *     contributors may be used to endorse or promote products derived
- *     from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @author    Robert Richards <rrichards@cdatazone.org>
- * @copyright 2007-2020 Robert Richards <rrichards@cdatazone.org>
- * @license   http://www.opensource.org/licenses/bsd-license.php  BSD License
- * @version   3.1.1
- */
-
-$xmlseclibs_srcdir = dirname(__FILE__) . '/src/';
-require $xmlseclibs_srcdir . '/XMLSecurityKey.php';
-require $xmlseclibs_srcdir . '/XMLSecurityDSig.php';
-require $xmlseclibs_srcdir . '/XMLSecEnc.php';
-require $xmlseclibs_srcdir . '/Utils/XPath.php';
diff --git a/securemail/SecureTestEmail.php b/securemail/SecureTestEmail.php
deleted file mode 100644
index c614104f..00000000
--- a/securemail/SecureTestEmail.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-/**
- * @copyright Copyright (C) 2020, Friendica
- *
- * @license GNU AGPL version 3 or any later version
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
- *
- */
-
-namespace Friendica\Addon\securemail;
-
-use Friendica\App;
-use Friendica\App\BaseURL;
-use Friendica\Core\Config\Capability\IManageConfigValues;
-use Friendica\Core\PConfig\Capability\IManagePersonalConfigValues;
-use Friendica\DI;
-use Friendica\Model\User;
-use Friendica\Object\Email;
-
-/**
- * Class for creating a Test email for the securemail addon
- */
-class SecureTestEmail extends Email
-{
-	public function __construct(IManageConfigValues $config, IManagePersonalConfigValues $pConfig, BaseURL $baseUrl)
-	{
-		$sitename = $config->get('config', 'sitename');
-
-		$hostname = $baseUrl->getHost();
-		if (strpos($hostname, ':')) {
-			$hostname = substr($hostname, 0, strpos($hostname, ':'));
-		}
-
-		$sender_email = $config->get('config', 'sender_email');
-		if (empty($sender_email)) {
-			$sender_email = 'noreply@' . $hostname;
-		}
-
-		$user = User::getById(DI::userSession()->getLocalUserId());
-
-		$subject = 'Friendica - Secure Mail - Test';
-		$message = 'This is a test message from your Friendica Secure Mail addon.';
-
-		// enable addon for test
-		$pConfig->set(DI::userSession()->getLocalUserId(), 'securemail', 'enable', 1);
-
-		parent::__construct($sitename, $sender_email, $sender_email, $user['email'],
-			$subject, "<p>{$message}</p>", $message,
-			[], DI::userSession()->getLocalUserId());
-	}
-}
diff --git a/securemail/composer.json b/securemail/composer.json
index 9383d645..14a2ca9a 100644
--- a/securemail/composer.json
+++ b/securemail/composer.json
@@ -10,17 +10,12 @@
         }
     ],
     "require": {
-        "singpolyma/openpgp-php": "0.6.0"
-    },
-    "replace": {
-        "paragonie/random_compat": "9.99.99"
+        "phpseclib/phpseclib": "^2.0",
+        "singpolyma/openpgp-php": "^0.3.0"
     },
     "license": "AGPL-3.0+",
     "minimum-stability": "stable",
     "config": {
-        "autoloader-suffix": "SecuremailAddon",
-        "platform": {
-            "php": "7.3"
-        }
+        "autoloader-suffix": "SecuremailAddon"
     }
 }
diff --git a/securemail/composer.lock b/securemail/composer.lock
index 8960cfcb..08de3972 100644
--- a/securemail/composer.lock
+++ b/securemail/composer.lock
@@ -4,94 +4,32 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "e7230dc266b072700d7e108251b5ea8f",
+    "content-hash": "b3a33a493eae34d9245ca7cc1b4572ea",
     "packages": [
-        {
-            "name": "paragonie/constant_time_encoding",
-            "version": "v2.6.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/paragonie/constant_time_encoding.git",
-                "reference": "58c3f47f650c94ec05a151692652a868995d2938"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/paragonie/constant_time_encoding/zipball/58c3f47f650c94ec05a151692652a868995d2938",
-                "reference": "58c3f47f650c94ec05a151692652a868995d2938",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7|^8"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^6|^7|^8|^9",
-                "vimeo/psalm": "^1|^2|^3|^4"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "ParagonIE\\ConstantTime\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Paragon Initiative Enterprises",
-                    "email": "security@paragonie.com",
-                    "homepage": "https://paragonie.com",
-                    "role": "Maintainer"
-                },
-                {
-                    "name": "Steve 'Sc00bz' Thomas",
-                    "email": "steve@tobtu.com",
-                    "homepage": "https://www.tobtu.com",
-                    "role": "Original Developer"
-                }
-            ],
-            "description": "Constant-time Implementations of RFC 4648 Encoding (Base-64, Base-32, Base-16)",
-            "keywords": [
-                "base16",
-                "base32",
-                "base32_decode",
-                "base32_encode",
-                "base64",
-                "base64_decode",
-                "base64_encode",
-                "bin2hex",
-                "encoding",
-                "hex",
-                "hex2bin",
-                "rfc4648"
-            ],
-            "time": "2022-06-14T06:56:20+00:00"
-        },
         {
             "name": "phpseclib/phpseclib",
-            "version": "3.0.37",
+            "version": "2.0.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpseclib/phpseclib.git",
-                "reference": "cfa2013d0f68c062055180dd4328cc8b9d1f30b8"
+                "reference": "ab8028c93c03cc8d9c824efa75dc94f1db2369bf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/cfa2013d0f68c062055180dd4328cc8b9d1f30b8",
-                "reference": "cfa2013d0f68c062055180dd4328cc8b9d1f30b8",
+                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/ab8028c93c03cc8d9c824efa75dc94f1db2369bf",
+                "reference": "ab8028c93c03cc8d9c824efa75dc94f1db2369bf",
                 "shasum": ""
             },
             "require": {
-                "paragonie/constant_time_encoding": "^1|^2",
-                "paragonie/random_compat": "^1.4|^2.0|^9.99.99",
-                "php": ">=5.6.1"
+                "php": ">=5.3.3"
             },
             "require-dev": {
-                "phpunit/phpunit": "*"
+                "phing/phing": "~2.7",
+                "phpunit/phpunit": "~4.0",
+                "sami/sami": "~2.0",
+                "squizlabs/php_codesniffer": "~2.0"
             },
             "suggest": {
-                "ext-dom": "Install the DOM extension to load XML formatted public keys.",
                 "ext-gmp": "Install the GMP (GNU Multiple Precision) extension in order to speed up arbitrary precision integer arithmetic operations.",
                 "ext-libsodium": "SSH2/SFTP can make use of some algorithms provided by the libsodium-php extension.",
                 "ext-mcrypt": "Install the Mcrypt extension in order to speed up a few other cryptographic operations.",
@@ -103,7 +41,7 @@
                     "phpseclib/bootstrap.php"
                 ],
                 "psr-4": {
-                    "phpseclib3\\": "phpseclib/"
+                    "phpseclib\\": "phpseclib/"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -158,46 +96,27 @@
                 "x.509",
                 "x509"
             ],
-            "funding": [
-                {
-                    "url": "https://github.com/terrafrost",
-                    "type": "github"
-                },
-                {
-                    "url": "https://www.patreon.com/phpseclib",
-                    "type": "patreon"
-                },
-                {
-                    "url": "https://tidelift.com/funding/github/packagist/phpseclib/phpseclib",
-                    "type": "tidelift"
-                }
-            ],
-            "time": "2024-03-03T02:14:58+00:00"
+            "time": "2016-10-04T00:57:04+00:00"
         },
         {
             "name": "singpolyma/openpgp-php",
-            "version": "0.6.0",
+            "version": "0.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/singpolyma/openpgp-php.git",
-                "reference": "1c3bdcd2d9c6113c2d6b768e208e7432a48d3a1e"
+                "reference": "6006111bbc4c3b6cb8f0acb7d6c4a7047df366e8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/singpolyma/openpgp-php/zipball/1c3bdcd2d9c6113c2d6b768e208e7432a48d3a1e",
-                "reference": "1c3bdcd2d9c6113c2d6b768e208e7432a48d3a1e",
+                "url": "https://api.github.com/repos/singpolyma/openpgp-php/zipball/6006111bbc4c3b6cb8f0acb7d6c4a7047df366e8",
+                "reference": "6006111bbc4c3b6cb8f0acb7d6c4a7047df366e8",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.6 || ^7.0 || ^8.0",
-                "phpseclib/phpseclib": "^3.0.14"
+                "phpseclib/phpseclib": ">=2.0.0 <=2.0.4"
             },
             "require-dev": {
-                "phpunit/phpunit": "^9.0"
-            },
-            "suggest": {
-                "ext-mcrypt": "required if you use encryption cast5",
-                "ext-openssl": "required if you use encryption cast5"
+                "phpunit/phpunit": "~4.0"
             },
             "type": "library",
             "autoload": {
@@ -220,21 +139,7 @@
                 }
             ],
             "description": "Pure-PHP implementation of the OpenPGP Message Format (RFC 4880)",
-            "funding": [
-                {
-                    "url": "https://github.com/singpolyma",
-                    "type": "github"
-                },
-                {
-                    "url": "https://liberapay.com/singpolyma",
-                    "type": "liberapay"
-                },
-                {
-                    "url": "https://www.patreon.com/singpolyma",
-                    "type": "patreon"
-                }
-            ],
-            "time": "2022-10-31T13:43:21+00:00"
+            "time": "2017-04-12T21:23:15+00:00"
         }
     ],
     "packages-dev": [],
@@ -244,9 +149,5 @@
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": [],
-    "platform-dev": [],
-    "platform-overrides": {
-        "php": "7.3"
-    },
-    "plugin-api-version": "1.1.0"
+    "platform-dev": []
 }
diff --git a/securemail/lang/C/messages.po b/securemail/lang/C/messages.po
index b985ae83..e61f2879 100644
--- a/securemail/lang/C/messages.po
+++ b/securemail/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:16-0500\n"
+"POT-Creation-Date: 2017-04-11 21:14+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,34 +17,38 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: securemail.php:50
-msgid "Enable Secure Mail"
-msgstr ""
-
-#: securemail.php:51
-msgid "Public key"
-msgstr ""
-
-#: securemail.php:51
-msgid "Your public PGP key, ascii armored format"
-msgstr ""
-
-#: securemail.php:56
+#: securemail.php:53
 msgid "\"Secure Mail\" Settings"
 msgstr ""
 
-#: securemail.php:59
+#: securemail.php:54
 msgid "Save Settings"
 msgstr ""
 
-#: securemail.php:60
+#: securemail.php:55 securemail.php:76
 msgid "Save and send test"
 msgstr ""
 
-#: securemail.php:93
+#: securemail.php:56
+msgid "Enable Secure Mail"
+msgstr ""
+
+#: securemail.php:57
+msgid "Public key"
+msgstr ""
+
+#: securemail.php:57
+msgid "Your public PGP key, ascii armored format"
+msgstr ""
+
+#: securemail.php:74
+msgid "Secure Mail Settings saved."
+msgstr ""
+
+#: securemail.php:111
 msgid "Test email sent"
 msgstr ""
 
-#: securemail.php:95
+#: securemail.php:113
 msgid "There was an error sending the test email"
 msgstr ""
diff --git a/securemail/lang/ar/messages.po b/securemail/lang/ar/messages.po
deleted file mode 100644
index 56940657..00000000
--- a/securemail/lang/ar/messages.po
+++ /dev/null
@@ -1,54 +0,0 @@
-# ADDON securemail
-# Copyright (C)
-# This file is distributed under the same license as the Friendica securemail addon package.
-# 
-# 
-# Translators:
-# Farida Khalaf <faridakhalaf@hotmail.com>, 2021
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2018-03-20 07:26+0000\n"
-"Last-Translator: Farida Khalaf <faridakhalaf@hotmail.com>, 2021\n"
-"Language-Team: Arabic (https://www.transifex.com/Friendica/teams/12172/ar/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ar\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-
-#: securemail.php:51
-msgid "\"Secure Mail\" Settings"
-msgstr ""
-
-#: securemail.php:52
-msgid "Save Settings"
-msgstr "حفظ الإعدادات"
-
-#: securemail.php:53 securemail.php:80
-msgid "Save and send test"
-msgstr ""
-
-#: securemail.php:54
-msgid "Enable Secure Mail"
-msgstr ""
-
-#: securemail.php:55
-msgid "Public key"
-msgstr ""
-
-#: securemail.php:55
-msgid "Your public PGP key, ascii armored format"
-msgstr ""
-
-#: securemail.php:88
-msgid "Test email sent"
-msgstr ""
-
-#: securemail.php:90
-msgid "There was an error sending the test email"
-msgstr ""
diff --git a/securemail/lang/ar/strings.php b/securemail/lang/ar/strings.php
deleted file mode 100644
index 285ad303..00000000
--- a/securemail/lang/ar/strings.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_ar")) {
-function string_plural_select_ar($n){
-	$n = intval($n);
-	if ($n==0) { return 0; } else if ($n==1) { return 1; } else if ($n==2) { return 2; } else if ($n%100>=3 && $n%100<=10) { return 3; } else if ($n%100>=11 && $n%100<=99) { return 4; } else  { return 5; }
-}}
-$a->strings['Save Settings'] = 'حفظ الإعدادات';
diff --git a/securemail/lang/cs/strings.php b/securemail/lang/cs/strings.php
index eae4fff6..36d7313d 100644
--- a/securemail/lang/cs/strings.php
+++ b/securemail/lang/cs/strings.php
@@ -3,14 +3,15 @@
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
 	$n = intval($n);
-	if (($n == 1 && $n % 1 == 0)) { return 0; } else if (($n >= 2 && $n <= 4 && $n % 1 == 0)) { return 1; } else if (($n % 1 != 0 )) { return 2; } else  { return 3; }
+	return ($n == 1 && $n % 1 == 0) ? 0 : ($n >= 2 && $n <= 4 && $n % 1 == 0) ? 1: ($n % 1 != 0 ) ? 2 : 3;;
 }}
-$a->strings['"Secure Mail" Settings'] = 'Nastavení "Secure Mail"';
-$a->strings['Save Settings'] = 'Uložit nastavení';
-$a->strings['Save and send test'] = 'Uložit a poslat test';
-$a->strings['Enable Secure Mail'] = 'Povolit Secure Mail';
-$a->strings['Public key'] = 'Veřejný klíč';
-$a->strings['Your public PGP key, ascii armored format'] = 'Váš veřejný klíč PGP ve formátu ASCII Armor';
-$a->strings['Secure Mail Settings saved.'] = 'Nastavení Secure Mail uložena.';
-$a->strings['Test email sent'] = 'Testovací e-mail odeslán';
-$a->strings['There was an error sending the test email'] = 'Při odesílání testovacího e-mailu se vyskytla chyba';
+;
+$a->strings["\"Secure Mail\" Settings"] = "Nastavení \"Secure Mail\"";
+$a->strings["Save Settings"] = "Uložit nastavení";
+$a->strings["Save and send test"] = "Uložit a poslat test";
+$a->strings["Enable Secure Mail"] = "Povolit Secure Mail";
+$a->strings["Public key"] = "Veřejný klíč";
+$a->strings["Your public PGP key, ascii armored format"] = "Váš veřejný klíč PGP ve formátu ASCII Armor";
+$a->strings["Secure Mail Settings saved."] = "Nastavení Secure Mail uložena.";
+$a->strings["Test email sent"] = "Testovací e-mail odeslán";
+$a->strings["There was an error sending the test email"] = "Při odesílání testovacího e-mailu se vyskytla chyba";
diff --git a/securemail/lang/da-dk/messages.po b/securemail/lang/da-dk/messages.po
deleted file mode 100644
index d02a95ad..00000000
--- a/securemail/lang/da-dk/messages.po
+++ /dev/null
@@ -1,54 +0,0 @@
-# ADDON securemail
-# Copyright (C)
-# This file is distributed under the same license as the Friendica securemail addon package.
-# 
-# 
-# Translators:
-# Anton <dev@atjn.dk>, 2022
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:16-0500\n"
-"PO-Revision-Date: 2018-03-20 07:26+0000\n"
-"Last-Translator: Anton <dev@atjn.dk>, 2022\n"
-"Language-Team: Danish (Denmark) (https://www.transifex.com/Friendica/teams/12172/da_DK/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: da_DK\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: securemail.php:50
-msgid "Enable Secure Mail"
-msgstr "Slå sikker mail til"
-
-#: securemail.php:51
-msgid "Public key"
-msgstr "Offentlig nøgle"
-
-#: securemail.php:51
-msgid "Your public PGP key, ascii armored format"
-msgstr "Din offentlige PGP nøgle i \"ascii armored\" format"
-
-#: securemail.php:56
-msgid "\"Secure Mail\" Settings"
-msgstr "\"Sikker mail\" Indstillinger"
-
-#: securemail.php:59
-msgid "Save Settings"
-msgstr "Gem indstillinger"
-
-#: securemail.php:60
-msgid "Save and send test"
-msgstr "Gem og send test"
-
-#: securemail.php:93
-msgid "Test email sent"
-msgstr "Testmail sendt"
-
-#: securemail.php:95
-msgid "There was an error sending the test email"
-msgstr "Der skete en fejl da testmailen skulle sendes"
diff --git a/securemail/lang/da-dk/strings.php b/securemail/lang/da-dk/strings.php
deleted file mode 100644
index 83b70c40..00000000
--- a/securemail/lang/da-dk/strings.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_da_dk")) {
-function string_plural_select_da_dk($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Enable Secure Mail'] = 'Slå sikker mail til';
-$a->strings['Public key'] = 'Offentlig nøgle';
-$a->strings['Your public PGP key, ascii armored format'] = 'Din offentlige PGP nøgle i "ascii armored" format';
-$a->strings['"Secure Mail" Settings'] = '"Sikker mail" Indstillinger';
-$a->strings['Save Settings'] = 'Gem indstillinger';
-$a->strings['Save and send test'] = 'Gem og send test';
-$a->strings['Test email sent'] = 'Testmail sendt';
-$a->strings['There was an error sending the test email'] = 'Der skete en fejl da testmailen skulle sendes';
diff --git a/securemail/lang/de/messages.po b/securemail/lang/de/messages.po
index 0d913f39..7d06d3d8 100644
--- a/securemail/lang/de/messages.po
+++ b/securemail/lang/de/messages.po
@@ -3,18 +3,14 @@
 # This file is distributed under the same license as the Friendica securemail addon package.
 # 
 # 
-# Translators:
-# Richard Zsemberi <rzsemberi@gmail.com>, 2018
-# Ulf Rompe <transifex.com@rompe.org>, 2019
-# 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:16-0500\n"
-"PO-Revision-Date: 2018-03-20 07:26+0000\n"
-"Last-Translator: Ulf Rompe <transifex.com@rompe.org>, 2019\n"
+"POT-Creation-Date: 2017-04-11 21:14+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Richard Zsemberi <rzsemberi@gmail.com>, 2018\n"
 "Language-Team: German (https://www.transifex.com/Friendica/teams/12172/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,34 +18,38 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: securemail.php:50
-msgid "Enable Secure Mail"
-msgstr "\"Secure Mail\" aktivieren"
-
-#: securemail.php:51
-msgid "Public key"
-msgstr "Öffentlicher Schlüssel"
-
-#: securemail.php:51
-msgid "Your public PGP key, ascii armored format"
-msgstr "Dein öffentlicher PGP Schlüssel, im ASCII-Format"
-
-#: securemail.php:56
+#: securemail.php:53
 msgid "\"Secure Mail\" Settings"
-msgstr "\"Secure Mail\"-Einstellungen"
+msgstr "\"Secure Mail\" Einstellungen"
 
-#: securemail.php:59
+#: securemail.php:54
 msgid "Save Settings"
 msgstr "Einstellungen speichern"
 
-#: securemail.php:60
+#: securemail.php:55 securemail.php:76
 msgid "Save and send test"
-msgstr "Test speichern und senden"
+msgstr "Abspeichern und Test Senden"
 
-#: securemail.php:93
+#: securemail.php:56
+msgid "Enable Secure Mail"
+msgstr "Secure Mail aktivieren"
+
+#: securemail.php:57
+msgid "Public key"
+msgstr "Öffentlicher Schlüssel"
+
+#: securemail.php:57
+msgid "Your public PGP key, ascii armored format"
+msgstr "Dein öffentlicher PGP Schlüssel, im Ascii-Format"
+
+#: securemail.php:74
+msgid "Secure Mail Settings saved."
+msgstr "Secure Mail Einstellungen gespeichert."
+
+#: securemail.php:111
 msgid "Test email sent"
-msgstr "Test-E-Mail gesendet"
+msgstr "Test-Email gesendet"
 
-#: securemail.php:95
+#: securemail.php:113
 msgid "There was an error sending the test email"
-msgstr "Es gab ein Fehler beim Senden der Test-E-Mail"
+msgstr "Es gab ein Fehler beim Senden der Test-Email"
diff --git a/securemail/lang/de/strings.php b/securemail/lang/de/strings.php
index 119a253c..65767eff 100644
--- a/securemail/lang/de/strings.php
+++ b/securemail/lang/de/strings.php
@@ -2,14 +2,15 @@
 
 if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Enable Secure Mail'] = '"Secure Mail" aktivieren';
-$a->strings['Public key'] = 'Öffentlicher Schlüssel';
-$a->strings['Your public PGP key, ascii armored format'] = 'Dein öffentlicher PGP Schlüssel, im ASCII-Format';
-$a->strings['"Secure Mail" Settings'] = '"Secure Mail"-Einstellungen';
-$a->strings['Save Settings'] = 'Einstellungen speichern';
-$a->strings['Save and send test'] = 'Test speichern und senden';
-$a->strings['Test email sent'] = 'Test-E-Mail gesendet';
-$a->strings['There was an error sending the test email'] = 'Es gab ein Fehler beim Senden der Test-E-Mail';
+;
+$a->strings["\"Secure Mail\" Settings"] = "\"Secure Mail\" Einstellungen";
+$a->strings["Save Settings"] = "Einstellungen speichern";
+$a->strings["Save and send test"] = "Abspeichern und Test Senden";
+$a->strings["Enable Secure Mail"] = "Secure Mail aktivieren";
+$a->strings["Public key"] = "Öffentlicher Schlüssel";
+$a->strings["Your public PGP key, ascii armored format"] = "Dein öffentlicher PGP Schlüssel, im Ascii-Format";
+$a->strings["Secure Mail Settings saved."] = "Secure Mail Einstellungen gespeichert.";
+$a->strings["Test email sent"] = "Test-Email gesendet";
+$a->strings["There was an error sending the test email"] = "Es gab ein Fehler beim Senden der Test-Email";
diff --git a/securemail/lang/es/messages.po b/securemail/lang/es/messages.po
deleted file mode 100644
index a62fa0d0..00000000
--- a/securemail/lang/es/messages.po
+++ /dev/null
@@ -1,54 +0,0 @@
-# ADDON securemail
-# Copyright (C)
-# This file is distributed under the same license as the Friendica securemail addon package.
-# 
-# 
-# Translators:
-# Senex Petrovic <javierruizo@hotmail.com>, 2021
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2018-03-20 07:26+0000\n"
-"Last-Translator: Senex Petrovic <javierruizo@hotmail.com>, 2021\n"
-"Language-Team: Spanish (https://www.transifex.com/Friendica/teams/12172/es/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: es\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: securemail.php:51
-msgid "\"Secure Mail\" Settings"
-msgstr "Configuración de \"Secure Mail\""
-
-#: securemail.php:52
-msgid "Save Settings"
-msgstr "Guardar ajustes"
-
-#: securemail.php:53 securemail.php:80
-msgid "Save and send test"
-msgstr "Guardar y enviar prueba"
-
-#: securemail.php:54
-msgid "Enable Secure Mail"
-msgstr "Habilitar correo seguro"
-
-#: securemail.php:55
-msgid "Public key"
-msgstr "Public key"
-
-#: securemail.php:55
-msgid "Your public PGP key, ascii armored format"
-msgstr "Tu clave PGP pública, formato blindado ascii"
-
-#: securemail.php:88
-msgid "Test email sent"
-msgstr "Correo de prueba enviado"
-
-#: securemail.php:90
-msgid "There was an error sending the test email"
-msgstr "Hubo un error al enviar el correo electrónico de prueba."
diff --git a/securemail/lang/es/strings.php b/securemail/lang/es/strings.php
deleted file mode 100644
index 06b40108..00000000
--- a/securemail/lang/es/strings.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_es")) {
-function string_plural_select_es($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['"Secure Mail" Settings'] = 'Configuración de "Secure Mail"';
-$a->strings['Save Settings'] = 'Guardar ajustes';
-$a->strings['Save and send test'] = 'Guardar y enviar prueba';
-$a->strings['Enable Secure Mail'] = 'Habilitar correo seguro';
-$a->strings['Public key'] = 'Public key';
-$a->strings['Your public PGP key, ascii armored format'] = 'Tu clave PGP pública, formato blindado ascii';
-$a->strings['Test email sent'] = 'Correo de prueba enviado';
-$a->strings['There was an error sending the test email'] = 'Hubo un error al enviar el correo electrónico de prueba.';
diff --git a/securemail/lang/et/strings.php b/securemail/lang/et/strings.php
index 3a4d81e9..d2547c40 100644
--- a/securemail/lang/et/strings.php
+++ b/securemail/lang/et/strings.php
@@ -3,13 +3,15 @@
 if(! function_exists("string_plural_select_et")) {
 function string_plural_select_et($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['"Secure Mail" Settings'] = '"Turvaline Meil" sätted';
-$a->strings['Save Settings'] = 'Salvesta sätted';
-$a->strings['Save and send test'] = 'Salvesta ja saada testmeil';
-$a->strings['Enable Secure Mail'] = 'Aktiveeri Turvaline meil';
-$a->strings['Public key'] = 'Avalik võti';
-$a->strings['Secure Mail Settings saved.'] = 'Turvalise Meili sätted salvestatud.';
-$a->strings['Test email sent'] = 'Testmeil saadetud';
-$a->strings['There was an error sending the test email'] = 'Testmeili saatmisel ilmnes viga';
+;
+$a->strings["\"Secure Mail\" Settings"] = "\"Turvaline Meil\" sätted";
+$a->strings["Save Settings"] = "Salvesta sätted";
+$a->strings["Save and send test"] = "Salvesta ja saada testmeil";
+$a->strings["Enable Secure Mail"] = "Aktiveeri Turvaline meil";
+$a->strings["Public key"] = "Avalik võti";
+$a->strings["Your public PGP key, ascii armored format"] = "";
+$a->strings["Secure Mail Settings saved."] = "Turvalise Meili sätted salvestatud.";
+$a->strings["Test email sent"] = "Testmeil saadetud";
+$a->strings["There was an error sending the test email"] = "Testmeili saatmisel ilmnes viga";
diff --git a/securemail/lang/fi-fi/strings.php b/securemail/lang/fi-fi/strings.php
index b67499f2..182cb173 100644
--- a/securemail/lang/fi-fi/strings.php
+++ b/securemail/lang/fi-fi/strings.php
@@ -2,14 +2,15 @@
 
 if(! function_exists("string_plural_select_fi_fi")) {
 function string_plural_select_fi_fi($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['"Secure Mail" Settings'] = 'Secure Mail -asetukset';
-$a->strings['Save Settings'] = 'Tallenna asetukset';
-$a->strings['Save and send test'] = 'Tallenna ja lähetä koeviesti';
-$a->strings['Enable Secure Mail'] = 'Ota Secure Mail käyttöön';
-$a->strings['Public key'] = 'Julkinen avain';
-$a->strings['Secure Mail Settings saved.'] = 'Secure Mail -asetukset tallennettu.';
-$a->strings['Test email sent'] = 'Koeviesti lähetetty';
-$a->strings['There was an error sending the test email'] = 'Testisähköpostin lähetyksessä tapahtui virhe';
+;
+$a->strings["\"Secure Mail\" Settings"] = "Secure Mail -asetukset";
+$a->strings["Save Settings"] = "Tallenna asetukset";
+$a->strings["Save and send test"] = "Tallenna ja lähetä koeviesti";
+$a->strings["Enable Secure Mail"] = "Ota Secure Mail käyttöön";
+$a->strings["Public key"] = "Julkinen avain";
+$a->strings["Your public PGP key, ascii armored format"] = "";
+$a->strings["Secure Mail Settings saved."] = "Secure Mail -asetukset tallennettu.";
+$a->strings["Test email sent"] = "Koeviesti lähetetty";
+$a->strings["There was an error sending the test email"] = "Testisähköpostin lähetyksessä tapahtui virhe";
diff --git a/securemail/lang/fr/messages.po b/securemail/lang/fr/messages.po
deleted file mode 100644
index 828d507b..00000000
--- a/securemail/lang/fr/messages.po
+++ /dev/null
@@ -1,55 +0,0 @@
-# ADDON securemail
-# Copyright (C)
-# This file is distributed under the same license as the Friendica securemail addon package.
-# 
-# 
-# Translators:
-# Hypolite Petovan <hypolite@mrpetovan.com>, 2022
-# Florent C., 2023
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:16-0500\n"
-"PO-Revision-Date: 2018-03-20 07:26+0000\n"
-"Last-Translator: Florent C., 2023\n"
-"Language-Team: French (https://app.transifex.com/Friendica/teams/12172/fr/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: fr\n"
-"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
-
-#: securemail.php:50
-msgid "Enable Secure Mail"
-msgstr "Activer l'extension des emails sécurisés"
-
-#: securemail.php:51
-msgid "Public key"
-msgstr "Clé publique"
-
-#: securemail.php:51
-msgid "Your public PGP key, ascii armored format"
-msgstr "Votre clé publique PGP formatée compatible ASCII"
-
-#: securemail.php:56
-msgid "\"Secure Mail\" Settings"
-msgstr "Paramètres des emails sécurisés"
-
-#: securemail.php:59
-msgid "Save Settings"
-msgstr "Enregistrer les paramètres"
-
-#: securemail.php:60
-msgid "Save and send test"
-msgstr "Enregistrer et envoyer un message de test"
-
-#: securemail.php:93
-msgid "Test email sent"
-msgstr "Courriel de test envoyé avec succès"
-
-#: securemail.php:95
-msgid "There was an error sending the test email"
-msgstr "Une erreur est survenue pendant l'envoi du courriel de test"
diff --git a/securemail/lang/fr/strings.php b/securemail/lang/fr/strings.php
deleted file mode 100644
index 9d40a8e2..00000000
--- a/securemail/lang/fr/strings.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_fr")) {
-function string_plural_select_fr($n){
-	$n = intval($n);
-	if (($n == 0 || $n == 1)) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
-}}
-$a->strings['Enable Secure Mail'] = 'Activer l\'extension des emails sécurisés';
-$a->strings['Public key'] = 'Clé publique';
-$a->strings['Your public PGP key, ascii armored format'] = 'Votre clé publique PGP formatée compatible ASCII';
-$a->strings['"Secure Mail" Settings'] = 'Paramètres des emails sécurisés';
-$a->strings['Save Settings'] = 'Enregistrer les paramètres';
-$a->strings['Save and send test'] = 'Enregistrer et envoyer un message de test';
-$a->strings['Test email sent'] = 'Courriel de test envoyé avec succès';
-$a->strings['There was an error sending the test email'] = 'Une erreur est survenue pendant l\'envoi du courriel de test';
diff --git a/securemail/lang/hu/messages.po b/securemail/lang/hu/messages.po
deleted file mode 100644
index e2e8b623..00000000
--- a/securemail/lang/hu/messages.po
+++ /dev/null
@@ -1,54 +0,0 @@
-# ADDON securemail
-# Copyright (C)
-# This file is distributed under the same license as the Friendica securemail addon package.
-# 
-# 
-# Translators:
-# Balázs Úr, 2021
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:16-0500\n"
-"PO-Revision-Date: 2018-03-20 07:26+0000\n"
-"Last-Translator: Balázs Úr, 2021\n"
-"Language-Team: Hungarian (https://www.transifex.com/Friendica/teams/12172/hu/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: hu\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: securemail.php:50
-msgid "Enable Secure Mail"
-msgstr "Biztonságos levél engedélyezése"
-
-#: securemail.php:51
-msgid "Public key"
-msgstr "Nyilvános kulcs"
-
-#: securemail.php:51
-msgid "Your public PGP key, ascii armored format"
-msgstr "A nyilvános PGP kulcsa ASCII-védett formátumban"
-
-#: securemail.php:56
-msgid "\"Secure Mail\" Settings"
-msgstr "Biztonságos levél beállításai"
-
-#: securemail.php:59
-msgid "Save Settings"
-msgstr "Beállítások mentése"
-
-#: securemail.php:60
-msgid "Save and send test"
-msgstr "Mentés és teszt küldése"
-
-#: securemail.php:93
-msgid "Test email sent"
-msgstr "Tesztlevél elküldve"
-
-#: securemail.php:95
-msgid "There was an error sending the test email"
-msgstr "Hiba történt a tesztlevél küldésekor"
diff --git a/securemail/lang/hu/strings.php b/securemail/lang/hu/strings.php
deleted file mode 100644
index ee5a42fd..00000000
--- a/securemail/lang/hu/strings.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_hu")) {
-function string_plural_select_hu($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Enable Secure Mail'] = 'Biztonságos levél engedélyezése';
-$a->strings['Public key'] = 'Nyilvános kulcs';
-$a->strings['Your public PGP key, ascii armored format'] = 'A nyilvános PGP kulcsa ASCII-védett formátumban';
-$a->strings['"Secure Mail" Settings'] = 'Biztonságos levél beállításai';
-$a->strings['Save Settings'] = 'Beállítások mentése';
-$a->strings['Save and send test'] = 'Mentés és teszt küldése';
-$a->strings['Test email sent'] = 'Tesztlevél elküldve';
-$a->strings['There was an error sending the test email'] = 'Hiba történt a tesztlevél küldésekor';
diff --git a/securemail/lang/it/messages.po b/securemail/lang/it/messages.po
index ae0156d0..208bbc92 100644
--- a/securemail/lang/it/messages.po
+++ b/securemail/lang/it/messages.po
@@ -3,52 +3,53 @@
 # This file is distributed under the same license as the Friendica securemail addon package.
 # 
 # 
-# Translators:
-# fabrixxm <fabrix.xm@gmail.com>, 2018
-# 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:16-0500\n"
-"PO-Revision-Date: 2018-03-20 07:26+0000\n"
+"POT-Creation-Date: 2017-04-11 21:14+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fabrixxm <fabrix.xm@gmail.com>, 2018\n"
-"Language-Team: Italian (https://app.transifex.com/Friendica/teams/12172/it/)\n"
+"Language-Team: Italian (https://www.transifex.com/Friendica/teams/12172/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: it\n"
-"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: securemail.php:50
-msgid "Enable Secure Mail"
-msgstr "Abilita Secure Mail"
-
-#: securemail.php:51
-msgid "Public key"
-msgstr "Chiave pubblica"
-
-#: securemail.php:51
-msgid "Your public PGP key, ascii armored format"
-msgstr "La tua chiave pubblica PGP, in formato ascii armored"
-
-#: securemail.php:56
+#: securemail.php:53
 msgid "\"Secure Mail\" Settings"
 msgstr "Impostazioni Secure Mail"
 
-#: securemail.php:59
+#: securemail.php:54
 msgid "Save Settings"
 msgstr "Salva Impostazioni"
 
-#: securemail.php:60
+#: securemail.php:55 securemail.php:76
 msgid "Save and send test"
 msgstr "Salva e invia mail di prova"
 
-#: securemail.php:93
+#: securemail.php:56
+msgid "Enable Secure Mail"
+msgstr "Abilita Secure Mail"
+
+#: securemail.php:57
+msgid "Public key"
+msgstr "Chiave pubblica"
+
+#: securemail.php:57
+msgid "Your public PGP key, ascii armored format"
+msgstr "La tua chiave pubblica PGP, in formato ascii armored"
+
+#: securemail.php:74
+msgid "Secure Mail Settings saved."
+msgstr "Impostazioni Secure Mail salvate."
+
+#: securemail.php:111
 msgid "Test email sent"
 msgstr "Email di prova invata"
 
-#: securemail.php:95
+#: securemail.php:113
 msgid "There was an error sending the test email"
 msgstr "Si è verificato un errore durante l'invio dell'email di prova"
diff --git a/securemail/lang/it/strings.php b/securemail/lang/it/strings.php
index 899c8f81..2435bfba 100644
--- a/securemail/lang/it/strings.php
+++ b/securemail/lang/it/strings.php
@@ -2,14 +2,15 @@
 
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
-	$n = intval($n);
-	if ($n == 1) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
+	return ($n != 1);;
 }}
-$a->strings['Enable Secure Mail'] = 'Abilita Secure Mail';
-$a->strings['Public key'] = 'Chiave pubblica';
-$a->strings['Your public PGP key, ascii armored format'] = 'La tua chiave pubblica PGP, in formato ascii armored';
-$a->strings['"Secure Mail" Settings'] = 'Impostazioni Secure Mail';
-$a->strings['Save Settings'] = 'Salva Impostazioni';
-$a->strings['Save and send test'] = 'Salva e invia mail di prova';
-$a->strings['Test email sent'] = 'Email di prova invata';
-$a->strings['There was an error sending the test email'] = 'Si è verificato un errore durante l\'invio dell\'email di prova';
+;
+$a->strings["\"Secure Mail\" Settings"] = "Impostazioni Secure Mail";
+$a->strings["Save Settings"] = "Salva Impostazioni";
+$a->strings["Save and send test"] = "Salva e invia mail di prova";
+$a->strings["Enable Secure Mail"] = "Abilita Secure Mail";
+$a->strings["Public key"] = "Chiave pubblica";
+$a->strings["Your public PGP key, ascii armored format"] = "La tua chiave pubblica PGP, in formato ascii armored";
+$a->strings["Secure Mail Settings saved."] = "Impostazioni Secure Mail salvate.";
+$a->strings["Test email sent"] = "Email di prova invata";
+$a->strings["There was an error sending the test email"] = "Si è verificato un errore durante l'invio dell'email di prova";
diff --git a/securemail/lang/nl/strings.php b/securemail/lang/nl/strings.php
index f6c764b4..6ba0a76f 100644
--- a/securemail/lang/nl/strings.php
+++ b/securemail/lang/nl/strings.php
@@ -3,9 +3,15 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['"Secure Mail" Settings'] = '"Secure Mail" instellingen';
-$a->strings['Save Settings'] = 'Instellingen opslaan';
-$a->strings['Enable Secure Mail'] = 'Secure Mail inschakelen';
-$a->strings['Secure Mail Settings saved.'] = 'Secure Mail instellingen opgeslagen';
+;
+$a->strings["\"Secure Mail\" Settings"] = "\"Secure Mail\" instellingen";
+$a->strings["Save Settings"] = "Instellingen opslaan";
+$a->strings["Save and send test"] = "";
+$a->strings["Enable Secure Mail"] = "Secure Mail inschakelen";
+$a->strings["Public key"] = "";
+$a->strings["Your public PGP key, ascii armored format"] = "";
+$a->strings["Secure Mail Settings saved."] = "Secure Mail instellingen opgeslagen";
+$a->strings["Test email sent"] = "";
+$a->strings["There was an error sending the test email"] = "";
diff --git a/securemail/lang/pl/messages.po b/securemail/lang/pl/messages.po
index f5dd16c7..df52edf7 100644
--- a/securemail/lang/pl/messages.po
+++ b/securemail/lang/pl/messages.po
@@ -3,17 +3,14 @@
 # This file is distributed under the same license as the Friendica securemail addon package.
 # 
 # 
-# Translators:
-# Waldemar Stoczkowski, 2018
-# 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:16-0500\n"
-"PO-Revision-Date: 2018-03-20 07:26+0000\n"
-"Last-Translator: Waldemar Stoczkowski, 2018\n"
+"POT-Creation-Date: 2017-04-11 21:14+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>, 2018\n"
 "Language-Team: Polish (https://www.transifex.com/Friendica/teams/12172/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,34 +18,38 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
-#: securemail.php:50
-msgid "Enable Secure Mail"
-msgstr "Włącz bezpieczną pocztę"
-
-#: securemail.php:51
-msgid "Public key"
-msgstr "Klucz publiczny"
-
-#: securemail.php:51
-msgid "Your public PGP key, ascii armored format"
-msgstr "Twój publiczny klucz PGP, rekomendowany format ascii"
-
-#: securemail.php:56
+#: securemail.php:53
 msgid "\"Secure Mail\" Settings"
 msgstr "Ustawienia \"Bezpieczna poczta\""
 
-#: securemail.php:59
+#: securemail.php:54
 msgid "Save Settings"
 msgstr "Zapisz ustawienia"
 
-#: securemail.php:60
+#: securemail.php:55 securemail.php:76
 msgid "Save and send test"
 msgstr "Zapisz i wyślij test"
 
-#: securemail.php:93
+#: securemail.php:56
+msgid "Enable Secure Mail"
+msgstr "Włącz bezpieczną pocztę"
+
+#: securemail.php:57
+msgid "Public key"
+msgstr "Klucz publiczny"
+
+#: securemail.php:57
+msgid "Your public PGP key, ascii armored format"
+msgstr "Twój publiczny klucz PGP, rekomendowany format ascii"
+
+#: securemail.php:74
+msgid "Secure Mail Settings saved."
+msgstr "Ustawienia bezpiecznej poczty zostały zapisane."
+
+#: securemail.php:111
 msgid "Test email sent"
 msgstr "Wysłano testowy e-mail"
 
-#: securemail.php:95
+#: securemail.php:113
 msgid "There was an error sending the test email"
 msgstr "Wystąpił błąd podczas wysyłania e-maila testowego"
diff --git a/securemail/lang/pl/strings.php b/securemail/lang/pl/strings.php
index 7a5ad8b4..7b66d591 100644
--- a/securemail/lang/pl/strings.php
+++ b/securemail/lang/pl/strings.php
@@ -3,13 +3,15 @@
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
 	$n = intval($n);
-	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
+	return ($n==1 ? 0 : ($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14) ? 1 : $n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14) ? 2 : 3);;
 }}
-$a->strings['Enable Secure Mail'] = 'Włącz bezpieczną pocztę';
-$a->strings['Public key'] = 'Klucz publiczny';
-$a->strings['Your public PGP key, ascii armored format'] = 'Twój publiczny klucz PGP, rekomendowany format ascii';
-$a->strings['"Secure Mail" Settings'] = 'Ustawienia "Bezpieczna poczta"';
-$a->strings['Save Settings'] = 'Zapisz ustawienia';
-$a->strings['Save and send test'] = 'Zapisz i wyślij test';
-$a->strings['Test email sent'] = 'Wysłano testowy e-mail';
-$a->strings['There was an error sending the test email'] = 'Wystąpił błąd podczas wysyłania e-maila testowego';
+;
+$a->strings["\"Secure Mail\" Settings"] = "Ustawienia \"Bezpieczna poczta\"";
+$a->strings["Save Settings"] = "Zapisz ustawienia";
+$a->strings["Save and send test"] = "Zapisz i wyślij test";
+$a->strings["Enable Secure Mail"] = "Włącz bezpieczną pocztę";
+$a->strings["Public key"] = "Klucz publiczny";
+$a->strings["Your public PGP key, ascii armored format"] = "Twój publiczny klucz PGP, rekomendowany format ascii";
+$a->strings["Secure Mail Settings saved."] = "Ustawienia bezpiecznej poczty zostały zapisane.";
+$a->strings["Test email sent"] = "Wysłano testowy e-mail";
+$a->strings["There was an error sending the test email"] = "Wystąpił błąd podczas wysyłania e-maila testowego";
diff --git a/securemail/lang/sv/messages.po b/securemail/lang/sv/messages.po
deleted file mode 100644
index f84e24d6..00000000
--- a/securemail/lang/sv/messages.po
+++ /dev/null
@@ -1,50 +0,0 @@
-# ADDON securemail
-# Copyright (C)
-# This file is distributed under the same license as the Friendica securemail addon package.
-# 
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:16-0500\n"
-"PO-Revision-Date: 2018-03-20 07:26+0000\n"
-"Language-Team: Swedish (https://www.transifex.com/Friendica/teams/12172/sv/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: sv\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: securemail.php:50
-msgid "Enable Secure Mail"
-msgstr ""
-
-#: securemail.php:51
-msgid "Public key"
-msgstr ""
-
-#: securemail.php:51
-msgid "Your public PGP key, ascii armored format"
-msgstr ""
-
-#: securemail.php:56
-msgid "\"Secure Mail\" Settings"
-msgstr ""
-
-#: securemail.php:59
-msgid "Save Settings"
-msgstr ""
-
-#: securemail.php:60
-msgid "Save and send test"
-msgstr ""
-
-#: securemail.php:93
-msgid "Test email sent"
-msgstr ""
-
-#: securemail.php:95
-msgid "There was an error sending the test email"
-msgstr ""
diff --git a/securemail/lang/sv/strings.php b/securemail/lang/sv/strings.php
deleted file mode 100644
index 72e9772f..00000000
--- a/securemail/lang/sv/strings.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_sv")) {
-function string_plural_select_sv($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
diff --git a/securemail/lang/zh-cn/strings.php b/securemail/lang/zh-cn/strings.php
index 64fa47db..7e5d3b6d 100644
--- a/securemail/lang/zh-cn/strings.php
+++ b/securemail/lang/zh-cn/strings.php
@@ -2,15 +2,15 @@
 
 if(! function_exists("string_plural_select_zh_cn")) {
 function string_plural_select_zh_cn($n){
-	$n = intval($n);
-	return intval(0);
+	return 0;;
 }}
-$a->strings['"Secure Mail" Settings'] = '“加密邮件”设置';
-$a->strings['Save Settings'] = '保存设置';
-$a->strings['Save and send test'] = '保存并发送测试';
-$a->strings['Enable Secure Mail'] = '启用加密邮件';
-$a->strings['Public key'] = '公钥';
-$a->strings['Your public PGP key, ascii armored format'] = '您的 PGP 公钥，使用 ASCII 码格式';
-$a->strings['Secure Mail Settings saved.'] = '加密邮件设置已保存。';
-$a->strings['Test email sent'] = '测试邮件发送';
-$a->strings['There was an error sending the test email'] = '发送测试电子邮件时发生错误';
+;
+$a->strings["\"Secure Mail\" Settings"] = "“加密邮件”设置";
+$a->strings["Save Settings"] = "保存设置";
+$a->strings["Save and send test"] = "保存并发送测试";
+$a->strings["Enable Secure Mail"] = "启用加密邮件";
+$a->strings["Public key"] = "公钥";
+$a->strings["Your public PGP key, ascii armored format"] = "您的 PGP 公钥，使用 ASCII 码格式";
+$a->strings["Secure Mail Settings saved."] = "加密邮件设置已保存。";
+$a->strings["Test email sent"] = "测试邮件发送";
+$a->strings["There was an error sending the test email"] = "发送测试电子邮件时发生错误";
diff --git a/securemail/securemail.php b/securemail/securemail.php
index 5390ebd1..5662714b 100644
--- a/securemail/securemail.php
+++ b/securemail/securemail.php
@@ -6,24 +6,35 @@
  * Author: Fabio Comuni <http://kirgroup.com/profile/fabrixxm>
  */
 
-use Friendica\Addon\securemail\SecureTestEmail;
 use Friendica\App;
+use Friendica\Core\Config;
 use Friendica\Core\Hook;
+use Friendica\Core\L10n;
 use Friendica\Core\Logger;
+use Friendica\Core\PConfig;
 use Friendica\Core\Renderer;
-use Friendica\DI;
-use Friendica\Object\EMail\IEmail;
+use Friendica\Util\Emailer;
 
 require_once __DIR__ . '/vendor/autoload.php';
 
 function securemail_install()
 {
 	Hook::register('addon_settings', 'addon/securemail/securemail.php', 'securemail_settings');
-	Hook::register('addon_settings_post', 'addon/securemail/securemail.php', 'securemail_settings_post', 10);
+	Hook::register('addon_settings_post', 'addon/securemail/securemail.php', 'securemail_settings_post');
 
-	Hook::register('emailer_send_prepare', 'addon/securemail/securemail.php', 'securemail_emailer_send_prepare', 10);
+	Hook::register('emailer_send_prepare', 'addon/securemail/securemail.php', 'securemail_emailer_send_prepare');
 
-	Logger::notice('installed securemail');
+	Logger::log('installed securemail');
+}
+
+function securemail_uninstall()
+{
+	Hook::unregister('addon_settings', 'addon/securemail/securemail.php', 'securemail_settings');
+	Hook::unregister('addon_settings_post', 'addon/securemail/securemail.php', 'securemail_settings_post');
+
+	Hook::unregister('emailer_send_prepare', 'addon/securemail/securemail.php', 'securemail_emailer_send_prepare');
+
+	Logger::log('removed securemail');
 }
 
 /**
@@ -31,34 +42,29 @@ function securemail_install()
  *
  * @link  https://github.com/friendica/friendica/blob/develop/doc/Addons.md#addon_settings 'addon_settings' hook
  *
- * @param array $data
+ * @param App    $a App instance
+ * @param string $s output html
  *
  * @see   App
  */
-function securemail_settings(array &$data)
+function securemail_settings(App &$a, &$s)
 {
-	if (!DI::userSession()->getLocalUserId()) {
+	if (!local_user()) {
 		return;
 	}
 
-	$enabled   = intval(DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'securemail', 'enable'));
-	$publickey = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'securemail', 'pkey');
+	$enable = intval(PConfig::get(local_user(), 'securemail', 'enable'));
+	$publickey = PConfig::get(local_user(), 'securemail', 'pkey');
 
-	$t    = Renderer::getMarkupTemplate('settings.tpl', 'addon/securemail/');
-	$html = Renderer::replaceMacros($t, [
-		'$enabled'   => ['securemail-enable', DI::l10n()->t('Enable Secure Mail'), $enabled],
-		'$publickey' => ['securemail-pkey', DI::l10n()->t('Public key'), $publickey, DI::l10n()->t('Your public PGP key, ascii armored format')]
+	$t = Renderer::getMarkupTemplate('admin.tpl', 'addon/securemail/');
+
+	$s .= Renderer::replaceMacros($t, [
+		'$title' => L10n::t('"Secure Mail" Settings'),
+		'$submit' => L10n::t('Save Settings'),
+		'$test' => L10n::t('Save and send test'), //NOTE: update also in 'post'
+		'$enable' => ['securemail-enable', L10n::t('Enable Secure Mail'), $enable, ''],
+		'$publickey' => ['securemail-pkey', L10n::t('Public key'), $publickey, L10n::t('Your public PGP key, ascii armored format'), 'rows="10"']
 	]);
-
-	$data = [
-		'addon'  => 'securemail',
-		'title'  => DI::l10n()->t('"Secure Mail" Settings'),
-		'html'   => $html,
-		'submit' => [
-			'securemail-submit' => DI::l10n()->t('Save Settings'),
-			'securemail-test'   => DI::l10n()->t('Save and send test'),
-		],
-	];
 }
 
 /**
@@ -66,31 +72,61 @@ function securemail_settings(array &$data)
  *
  * @link  https://github.com/friendica/friendica/blob/develop/doc/Addons.md#addon_settings_post 'addon_settings_post' hook
  *
+ * @param App   $a App instance
  * @param array $b hook data
  *
  * @see   App
  */
-function securemail_settings_post(array &$b)
+function securemail_settings_post(App &$a, array &$b)
 {
-	if (!DI::userSession()->getLocalUserId()) {
+	if (!local_user()) {
 		return;
 	}
 
-	if (!empty($_POST['securemail-submit']) || !empty($_POST['securemail-test'])) {
-		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'securemail', 'pkey', trim($_POST['securemail-pkey']));
+	if ($_POST['securemail-submit']) {
+		PConfig::set(local_user(), 'securemail', 'pkey', trim($_POST['securemail-pkey']));
 		$enable = (!empty($_POST['securemail-enable']) ? 1 : 0);
-		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'securemail', 'enable', $enable);
+		PConfig::set(local_user(), 'securemail', 'enable', $enable);
+		info(L10n::t('Secure Mail Settings saved.') . EOL);
 
-		if (!empty($_POST['securemail-test'])) {
-			$res = DI::emailer()->send(new SecureTestEmail(DI::app(), DI::config(), DI::pConfig(), DI::baseUrl()));
+		if ($_POST['securemail-submit'] == L10n::t('Save and send test')) {
+			$sitename = Config::get('config', 'sitename');
+
+			$hostname = $a->getHostName();
+			if (strpos($hostname, ':')) {
+				$hostname = substr($hostname, 0, strpos($hostname, ':'));
+			}
+
+			$sender_email = Config::get('config', 'sender_email');
+			if (empty($sender_email)) {
+				$sender_email = 'noreply@' . $hostname;
+			}
+
+			$subject = 'Friendica - Secure Mail - Test';
+			$message = 'This is a test message from your Friendica Secure Mail addon.';
+
+			$params = [
+				'uid' => local_user(),
+				'fromName' => $sitename,
+				'fromEmail' => $sender_email,
+				'toEmail' => $a->user['email'],
+				'messageSubject' => $subject,
+				'htmlVersion' => "<p>{$message}</p>",
+				'textVersion' => $message,
+			];
+
+			// enable addon for test
+			PConfig::set(local_user(), 'securemail', 'enable', 1);
+
+			$res = Emailer::send($params);
 
 			// revert to saved value
-			DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'securemail', 'enable', $enable);
+			PConfig::set(local_user(), 'securemail', 'enable', $enable);
 
 			if ($res) {
-				DI::sysmsg()->addInfo(DI::l10n()->t('Test email sent'));
+				info(L10n::t('Test email sent') . EOL);
 			} else {
-				DI::sysmsg()->addNotice(DI::l10n()->t('There was an error sending the test email'));
+				notice(L10n::t('There was an error sending the test email') . EOL);
 			}
 		}
 	}
@@ -101,25 +137,25 @@ function securemail_settings_post(array &$b)
  *
  * @link  https://github.com/friendica/friendica/blob/develop/doc/Addons.md#emailer_send_prepare 'emailer_send_prepare' hook
  *
- * @param IEmail $email Email
+ * @param App   $a App instance
+ * @param array $b hook data
  *
  * @see   App
  */
-function securemail_emailer_send_prepare(IEmail &$email)
+function securemail_emailer_send_prepare(App &$a, array &$b)
 {
-	if (empty($email->getRecipientUid())) {
+	if (empty($b['uid'])) {
 		return;
 	}
 
-	$uid = $email->getRecipientUid();
+	$uid = $b['uid'];
 
-	$enable_checked = DI::pConfig()->get($uid, 'securemail', 'enable');
+	$enable_checked = PConfig::get($uid, 'securemail', 'enable');
 	if (!$enable_checked) {
-		DI::logger()->debug('No securemail enabled.');
 		return;
 	}
 
-	$public_key_ascii = DI::pConfig()->get($uid, 'securemail', 'pkey');
+	$public_key_ascii = PConfig::get($uid, 'securemail', 'pkey');
 
 	preg_match('/-----BEGIN ([A-Za-z ]+)-----/', $public_key_ascii, $matches);
 	$marker = empty($matches[1]) ? 'MESSAGE' : $matches[1];
@@ -127,23 +163,18 @@ function securemail_emailer_send_prepare(IEmail &$email)
 
 	$key = OpenPGP_Message::parse($public_key);
 
-	$data = new OpenPGP_LiteralDataPacket($email->getMessage(true), [
+	$data = new OpenPGP_LiteralDataPacket($b['textVersion'], [
 		'format' => 'u',
 		'filename' => 'encrypted.gpg'
 	]);
+	$encrypted = OpenPGP_Crypt_Symmetric::encrypt($key, new OpenPGP_Message([$data]));
+	$armored_encrypted = wordwrap(
+		OpenPGP::enarmor($encrypted->to_bytes(), 'PGP MESSAGE'),
+		64,
+		"\n",
+		true
+	);
 
-	try {
-		$encrypted = OpenPGP_Crypt_Symmetric::encrypt($key, new OpenPGP_Message([$data]));
-		$armored_encrypted = wordwrap(
-			OpenPGP::enarmor($encrypted->to_bytes(), 'PGP MESSAGE'),
-			64,
-			"\n",
-			true
-		);
-
-		$email = $email->withMessage($armored_encrypted, null);
-
-	} catch (Exception $e) {
-		DI::logger()->warning('Encryption failed.', ['email' => $email, 'exception' => $e]);
-	}
+	$b['textVersion'] = $armored_encrypted;
+	$b['htmlVersion'] = null;
 }
diff --git a/securemail/templates/admin.tpl b/securemail/templates/admin.tpl
new file mode 100644
index 00000000..c23ff2cd
--- /dev/null
+++ b/securemail/templates/admin.tpl
@@ -0,0 +1,26 @@
+{{* We organize the settings in collapsable panel-groups *}}
+{{* this div should be in frio theme *}}
+<div class="panel-group panel-group-settings" id="securemail" role="tablist" aria-multiselectable="true">
+    {{* The password setting section *}}
+    <div class="panel">
+        <div class="section-subtitle-wrapper" role="tab" id="securemail-settings">
+            <h4>
+                <a class="accordion-toggle collapsed" data-toggle="collapse" data-parent="#settings" href="#securemail-settings-collapse" aria-expanded="true" aria-controls="securemail-settings-collapse">
+                    {{$title}}
+                </a>
+            </h4>
+        </div>
+        <div id="securemail-settings-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="securemail-settings">
+            <div class="section-content-tools-wrapper">
+                {{include file="field_checkbox.tpl" field=$enable}}
+                {{include file="field_textarea.tpl" field=$publickey}}
+
+                <div class="form-group pull-right settings-submit-wrapper" >
+                    <button type="submit" name="securemail-submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button>
+                    <button type="submit" name="securemail-submit" class="btn btn-default" value="{{$test}}">{{$test}}</button>
+                </div>
+                <div class="clear"></div>
+            </div>
+        </div>
+    </div>
+</div>
diff --git a/securemail/templates/settings.tpl b/securemail/templates/settings.tpl
deleted file mode 100644
index 110a3a7d..00000000
--- a/securemail/templates/settings.tpl
+++ /dev/null
@@ -1,2 +0,0 @@
-{{include file="field_checkbox.tpl" field=$enabled}}
-{{include file="field_textarea.tpl" field=$publickey}}
diff --git a/securemail/vendor/composer/ClassLoader.php b/securemail/vendor/composer/ClassLoader.php
index 03b9bb9c..95f7e097 100644
--- a/securemail/vendor/composer/ClassLoader.php
+++ b/securemail/vendor/composer/ClassLoader.php
@@ -60,7 +60,7 @@ class ClassLoader
     public function getPrefixes()
     {
         if (!empty($this->prefixesPsr0)) {
-            return call_user_func_array('array_merge', array_values($this->prefixesPsr0));
+            return call_user_func_array('array_merge', $this->prefixesPsr0);
         }
 
         return array();
@@ -279,7 +279,7 @@ class ClassLoader
      */
     public function setApcuPrefix($apcuPrefix)
     {
-        $this->apcuPrefix = function_exists('apcu_fetch') && filter_var(ini_get('apc.enabled'), FILTER_VALIDATE_BOOLEAN) ? $apcuPrefix : null;
+        $this->apcuPrefix = function_exists('apcu_fetch') && ini_get('apc.enabled') ? $apcuPrefix : null;
     }
 
     /**
diff --git a/securemail/vendor/composer/autoload_classmap.php b/securemail/vendor/composer/autoload_classmap.php
index 77479334..65b2f24d 100644
--- a/securemail/vendor/composer/autoload_classmap.php
+++ b/securemail/vendor/composer/autoload_classmap.php
@@ -55,5 +55,4 @@ return array(
     'OpenPGP_TrustPacket' => $vendorDir . '/singpolyma/openpgp-php/lib/openpgp.php',
     'OpenPGP_UserAttributePacket' => $vendorDir . '/singpolyma/openpgp-php/lib/openpgp.php',
     'OpenPGP_UserIDPacket' => $vendorDir . '/singpolyma/openpgp-php/lib/openpgp.php',
-    'OpenSSLWrapper' => $vendorDir . '/singpolyma/openpgp-php/lib/openpgp_openssl_wrapper.php',
 );
diff --git a/securemail/vendor/composer/autoload_psr4.php b/securemail/vendor/composer/autoload_psr4.php
index c12a8d7f..38756ce7 100644
--- a/securemail/vendor/composer/autoload_psr4.php
+++ b/securemail/vendor/composer/autoload_psr4.php
@@ -6,6 +6,5 @@ $vendorDir = dirname(dirname(__FILE__));
 $baseDir = dirname($vendorDir);
 
 return array(
-    'phpseclib3\\' => array($vendorDir . '/phpseclib/phpseclib/phpseclib'),
-    'ParagonIE\\ConstantTime\\' => array($vendorDir . '/paragonie/constant_time_encoding/src'),
+    'phpseclib\\' => array($vendorDir . '/phpseclib/phpseclib/phpseclib'),
 );
diff --git a/securemail/vendor/composer/autoload_real.php b/securemail/vendor/composer/autoload_real.php
index 00bd40ef..5b57bd5a 100644
--- a/securemail/vendor/composer/autoload_real.php
+++ b/securemail/vendor/composer/autoload_real.php
@@ -13,9 +13,6 @@ class ComposerAutoloaderInitSecuremailAddon
         }
     }
 
-    /**
-     * @return \Composer\Autoload\ClassLoader
-     */
     public static function getLoader()
     {
         if (null !== self::$loader) {
diff --git a/securemail/vendor/composer/autoload_static.php b/securemail/vendor/composer/autoload_static.php
index d7427cb6..fa77ac92 100644
--- a/securemail/vendor/composer/autoload_static.php
+++ b/securemail/vendor/composer/autoload_static.php
@@ -13,23 +13,15 @@ class ComposerStaticInitSecuremailAddon
     public static $prefixLengthsPsr4 = array (
         'p' => 
         array (
-            'phpseclib3\\' => 11,
-        ),
-        'P' => 
-        array (
-            'ParagonIE\\ConstantTime\\' => 23,
+            'phpseclib\\' => 10,
         ),
     );
 
     public static $prefixDirsPsr4 = array (
-        'phpseclib3\\' => 
+        'phpseclib\\' => 
         array (
             0 => __DIR__ . '/..' . '/phpseclib/phpseclib/phpseclib',
         ),
-        'ParagonIE\\ConstantTime\\' => 
-        array (
-            0 => __DIR__ . '/..' . '/paragonie/constant_time_encoding/src',
-        ),
     );
 
     public static $classMap = array (
@@ -82,7 +74,6 @@ class ComposerStaticInitSecuremailAddon
         'OpenPGP_TrustPacket' => __DIR__ . '/..' . '/singpolyma/openpgp-php/lib/openpgp.php',
         'OpenPGP_UserAttributePacket' => __DIR__ . '/..' . '/singpolyma/openpgp-php/lib/openpgp.php',
         'OpenPGP_UserIDPacket' => __DIR__ . '/..' . '/singpolyma/openpgp-php/lib/openpgp.php',
-        'OpenSSLWrapper' => __DIR__ . '/..' . '/singpolyma/openpgp-php/lib/openpgp_openssl_wrapper.php',
     );
 
     public static function getInitializer(ClassLoader $loader)
diff --git a/securemail/vendor/composer/installed.json b/securemail/vendor/composer/installed.json
index 680a3ffe..8181f155 100644
--- a/securemail/vendor/composer/installed.json
+++ b/securemail/vendor/composer/installed.json
@@ -1,99 +1,35 @@
 [
-    {
-        "name": "paragonie/constant_time_encoding",
-        "version": "v2.6.3",
-        "version_normalized": "2.6.3.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/paragonie/constant_time_encoding.git",
-            "reference": "58c3f47f650c94ec05a151692652a868995d2938"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/paragonie/constant_time_encoding/zipball/58c3f47f650c94ec05a151692652a868995d2938",
-            "reference": "58c3f47f650c94ec05a151692652a868995d2938",
-            "shasum": ""
-        },
-        "require": {
-            "php": "^7|^8"
-        },
-        "require-dev": {
-            "phpunit/phpunit": "^6|^7|^8|^9",
-            "vimeo/psalm": "^1|^2|^3|^4"
-        },
-        "time": "2022-06-14T06:56:20+00:00",
-        "type": "library",
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "ParagonIE\\ConstantTime\\": "src/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "Paragon Initiative Enterprises",
-                "email": "security@paragonie.com",
-                "homepage": "https://paragonie.com",
-                "role": "Maintainer"
-            },
-            {
-                "name": "Steve 'Sc00bz' Thomas",
-                "email": "steve@tobtu.com",
-                "homepage": "https://www.tobtu.com",
-                "role": "Original Developer"
-            }
-        ],
-        "description": "Constant-time Implementations of RFC 4648 Encoding (Base-64, Base-32, Base-16)",
-        "keywords": [
-            "base16",
-            "base32",
-            "base32_decode",
-            "base32_encode",
-            "base64",
-            "base64_decode",
-            "base64_encode",
-            "bin2hex",
-            "encoding",
-            "hex",
-            "hex2bin",
-            "rfc4648"
-        ]
-    },
     {
         "name": "phpseclib/phpseclib",
-        "version": "3.0.37",
-        "version_normalized": "3.0.37.0",
+        "version": "2.0.4",
+        "version_normalized": "2.0.4.0",
         "source": {
             "type": "git",
             "url": "https://github.com/phpseclib/phpseclib.git",
-            "reference": "cfa2013d0f68c062055180dd4328cc8b9d1f30b8"
+            "reference": "ab8028c93c03cc8d9c824efa75dc94f1db2369bf"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/cfa2013d0f68c062055180dd4328cc8b9d1f30b8",
-            "reference": "cfa2013d0f68c062055180dd4328cc8b9d1f30b8",
+            "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/ab8028c93c03cc8d9c824efa75dc94f1db2369bf",
+            "reference": "ab8028c93c03cc8d9c824efa75dc94f1db2369bf",
             "shasum": ""
         },
         "require": {
-            "paragonie/constant_time_encoding": "^1|^2",
-            "paragonie/random_compat": "^1.4|^2.0|^9.99.99",
-            "php": ">=5.6.1"
+            "php": ">=5.3.3"
         },
         "require-dev": {
-            "phpunit/phpunit": "*"
+            "phing/phing": "~2.7",
+            "phpunit/phpunit": "~4.0",
+            "sami/sami": "~2.0",
+            "squizlabs/php_codesniffer": "~2.0"
         },
         "suggest": {
-            "ext-dom": "Install the DOM extension to load XML formatted public keys.",
             "ext-gmp": "Install the GMP (GNU Multiple Precision) extension in order to speed up arbitrary precision integer arithmetic operations.",
             "ext-libsodium": "SSH2/SFTP can make use of some algorithms provided by the libsodium-php extension.",
             "ext-mcrypt": "Install the Mcrypt extension in order to speed up a few other cryptographic operations.",
             "ext-openssl": "Install the OpenSSL extension in order to speed up a wide variety of cryptographic operations."
         },
-        "time": "2024-03-03T02:14:58+00:00",
+        "time": "2016-10-04T00:57:04+00:00",
         "type": "library",
         "installation-source": "dist",
         "autoload": {
@@ -101,7 +37,7 @@
                 "phpseclib/bootstrap.php"
             ],
             "psr-4": {
-                "phpseclib3\\": "phpseclib/"
+                "phpseclib\\": "phpseclib/"
             }
         },
         "notification-url": "https://packagist.org/downloads/",
@@ -155,49 +91,30 @@
             "twofish",
             "x.509",
             "x509"
-        ],
-        "funding": [
-            {
-                "url": "https://github.com/terrafrost",
-                "type": "github"
-            },
-            {
-                "url": "https://www.patreon.com/phpseclib",
-                "type": "patreon"
-            },
-            {
-                "url": "https://tidelift.com/funding/github/packagist/phpseclib/phpseclib",
-                "type": "tidelift"
-            }
         ]
     },
     {
         "name": "singpolyma/openpgp-php",
-        "version": "0.6.0",
-        "version_normalized": "0.6.0.0",
+        "version": "0.3.0",
+        "version_normalized": "0.3.0.0",
         "source": {
             "type": "git",
             "url": "https://github.com/singpolyma/openpgp-php.git",
-            "reference": "1c3bdcd2d9c6113c2d6b768e208e7432a48d3a1e"
+            "reference": "6006111bbc4c3b6cb8f0acb7d6c4a7047df366e8"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/singpolyma/openpgp-php/zipball/1c3bdcd2d9c6113c2d6b768e208e7432a48d3a1e",
-            "reference": "1c3bdcd2d9c6113c2d6b768e208e7432a48d3a1e",
+            "url": "https://api.github.com/repos/singpolyma/openpgp-php/zipball/6006111bbc4c3b6cb8f0acb7d6c4a7047df366e8",
+            "reference": "6006111bbc4c3b6cb8f0acb7d6c4a7047df366e8",
             "shasum": ""
         },
         "require": {
-            "php": "^5.6 || ^7.0 || ^8.0",
-            "phpseclib/phpseclib": "^3.0.14"
+            "phpseclib/phpseclib": ">=2.0.0 <=2.0.4"
         },
         "require-dev": {
-            "phpunit/phpunit": "^9.0"
+            "phpunit/phpunit": "~4.0"
         },
-        "suggest": {
-            "ext-mcrypt": "required if you use encryption cast5",
-            "ext-openssl": "required if you use encryption cast5"
-        },
-        "time": "2022-10-31T13:43:21+00:00",
+        "time": "2017-04-12T21:23:15+00:00",
         "type": "library",
         "installation-source": "dist",
         "autoload": {
@@ -219,20 +136,6 @@
                 "email": "singpolyma@singpolyma.net"
             }
         ],
-        "description": "Pure-PHP implementation of the OpenPGP Message Format (RFC 4880)",
-        "funding": [
-            {
-                "url": "https://github.com/singpolyma",
-                "type": "github"
-            },
-            {
-                "url": "https://liberapay.com/singpolyma",
-                "type": "liberapay"
-            },
-            {
-                "url": "https://www.patreon.com/singpolyma",
-                "type": "patreon"
-            }
-        ]
+        "description": "Pure-PHP implementation of the OpenPGP Message Format (RFC 4880)"
     }
 ]
diff --git a/securemail/vendor/paragonie/constant_time_encoding/LICENSE.txt b/securemail/vendor/paragonie/constant_time_encoding/LICENSE.txt
deleted file mode 100644
index 91acaca6..00000000
--- a/securemail/vendor/paragonie/constant_time_encoding/LICENSE.txt
+++ /dev/null
@@ -1,48 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2016 - 2022 Paragon Initiative Enterprises
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-------------------------------------------------------------------------------
-This library was based on the work of Steve "Sc00bz" Thomas.
-------------------------------------------------------------------------------
-
-The MIT License (MIT)
-
-Copyright (c) 2014 Steve Thomas
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
diff --git a/securemail/vendor/paragonie/constant_time_encoding/README.md b/securemail/vendor/paragonie/constant_time_encoding/README.md
deleted file mode 100644
index cedddd86..00000000
--- a/securemail/vendor/paragonie/constant_time_encoding/README.md
+++ /dev/null
@@ -1,84 +0,0 @@
-# Constant-Time Encoding
-
-[![Build Status](https://github.com/paragonie/constant_time_encoding/actions/workflows/ci.yml/badge.svg)](https://github.com/paragonie/constant_time_encoding/actions)
-[![Latest Stable Version](https://poser.pugx.org/paragonie/constant_time_encoding/v/stable)](https://packagist.org/packages/paragonie/constant_time_encoding)
-[![Latest Unstable Version](https://poser.pugx.org/paragonie/constant_time_encoding/v/unstable)](https://packagist.org/packages/paragonie/constant_time_encoding)
-[![License](https://poser.pugx.org/paragonie/constant_time_encoding/license)](https://packagist.org/packages/paragonie/constant_time_encoding)
-[![Downloads](https://img.shields.io/packagist/dt/paragonie/constant_time_encoding.svg)](https://packagist.org/packages/paragonie/constant_time_encoding)
-
-Based on the [constant-time base64 implementation made by Steve "Sc00bz" Thomas](https://github.com/Sc00bz/ConstTimeEncoding),
-this library aims to offer character encoding functions that do not leak
-information about what you are encoding/decoding via processor cache 
-misses. Further reading on [cache-timing attacks](http://blog.ircmaxell.com/2014/11/its-all-about-time.html).
-
-Our fork offers the following enchancements:
-
-* `mbstring.func_overload` resistance
-* Unit tests
-* Composer- and Packagist-ready
-* Base16 encoding
-* Base32 encoding
-* Uses `pack()` and `unpack()` instead of `chr()` and `ord()`
-
-## PHP Version Requirements
-
-Version 2 of this library should work on **PHP 7** or newer. For PHP 5
-support, see [the v1.x branch](https://github.com/paragonie/constant_time_encoding/tree/v1.x).
-
-If you are adding this as a dependency to a project intended to work on both PHP 5 and PHP 7, please set the required version to `^1|^2` instead of just `^1` or `^2`.
-
-## How to Install
-
-```sh
-composer require paragonie/constant_time_encoding
-```
-
-## How to Use
-
-```php
-use ParagonIE\ConstantTime\Encoding;
-
-// possibly (if applicable): 
-// require 'vendor/autoload.php';
-
-$data = random_bytes(32);
-echo Encoding::base64Encode($data), "\n";
-echo Encoding::base32EncodeUpper($data), "\n";
-echo Encoding::base32Encode($data), "\n";
-echo Encoding::hexEncode($data), "\n";
-echo Encoding::hexEncodeUpper($data), "\n";
-```
-
-Example output:
- 
-```
-1VilPkeVqirlPifk5scbzcTTbMT2clp+Zkyv9VFFasE=
-2VMKKPSHSWVCVZJ6E7SONRY3ZXCNG3GE6ZZFU7TGJSX7KUKFNLAQ====
-2vmkkpshswvcvzj6e7sonry3zxcng3ge6zzfu7tgjsx7kukfnlaq====
-d558a53e4795aa2ae53e27e4e6c71bcdc4d36cc4f6725a7e664caff551456ac1
-D558A53E4795AA2AE53E27E4E6C71BDCC4D36CC4F6725A7E664CAFF551456AC1
-```
-
-If you only need a particular variant, you can just reference the 
-required class like so:
-
-```php
-use ParagonIE\ConstantTime\Base64;
-use ParagonIE\ConstantTime\Base32;
-
-$data = random_bytes(32);
-echo Base64::encode($data), "\n";
-echo Base32::encode($data), "\n";
-```
-
-Example output:
-
-```
-1VilPkeVqirlPifk5scbzcTTbMT2clp+Zkyv9VFFasE=
-2vmkkpshswvcvzj6e7sonry3zxcng3ge6zzfu7tgjsx7kukfnlaq====
-```
-
-## Support Contracts
-
-If your company uses this library in their products or services, you may be
-interested in [purchasing a support contract from Paragon Initiative Enterprises](https://paragonie.com/enterprise).
diff --git a/securemail/vendor/paragonie/constant_time_encoding/composer.json b/securemail/vendor/paragonie/constant_time_encoding/composer.json
deleted file mode 100644
index 2fe9717a..00000000
--- a/securemail/vendor/paragonie/constant_time_encoding/composer.json
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-  "name": "paragonie/constant_time_encoding",
-  "description": "Constant-time Implementations of RFC 4648 Encoding (Base-64, Base-32, Base-16)",
-  "keywords": [
-    "base64",
-    "encoding",
-    "rfc4648",
-    "base32",
-    "base16",
-    "hex",
-    "bin2hex",
-    "hex2bin",
-    "base64_encode",
-    "base64_decode",
-    "base32_encode",
-    "base32_decode"
-  ],
-  "license": "MIT",
-  "type": "library",
-  "authors": [
-      {
-        "name":     "Paragon Initiative Enterprises",
-        "email":    "security@paragonie.com",
-        "homepage": "https://paragonie.com",
-        "role":     "Maintainer"
-      },
-      {
-        "name":     "Steve 'Sc00bz' Thomas",
-        "email":    "steve@tobtu.com",
-        "homepage": "https://www.tobtu.com",
-        "role":     "Original Developer"
-      }
-  ],
-  "support": {
-    "issues":   "https://github.com/paragonie/constant_time_encoding/issues",
-    "email":    "info@paragonie.com",
-    "source":   "https://github.com/paragonie/constant_time_encoding"
-  },
-  "require": {
-    "php": "^7|^8"
-  },
-  "require-dev": {
-    "phpunit/phpunit": "^6|^7|^8|^9",
-    "vimeo/psalm": "^1|^2|^3|^4"
-  },
-  "autoload": {
-    "psr-4": {
-      "ParagonIE\\ConstantTime\\": "src/"
-    }
-  },
-  "autoload-dev": {
-    "psr-4": {
-      "ParagonIE\\ConstantTime\\Tests\\": "tests/"
-    }
-  }
-}
diff --git a/securemail/vendor/paragonie/constant_time_encoding/src/Base32.php b/securemail/vendor/paragonie/constant_time_encoding/src/Base32.php
deleted file mode 100644
index 7508b3df..00000000
--- a/securemail/vendor/paragonie/constant_time_encoding/src/Base32.php
+++ /dev/null
@@ -1,519 +0,0 @@
-<?php
-declare(strict_types=1);
-namespace ParagonIE\ConstantTime;
-
-use InvalidArgumentException;
-use RangeException;
-use TypeError;
-
-/**
- *  Copyright (c) 2016 - 2022 Paragon Initiative Enterprises.
- *  Copyright (c) 2014 Steve "Sc00bz" Thomas (steve at tobtu dot com)
- *
- *  Permission is hereby granted, free of charge, to any person obtaining a copy
- *  of this software and associated documentation files (the "Software"), to deal
- *  in the Software without restriction, including without limitation the rights
- *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- *  copies of the Software, and to permit persons to whom the Software is
- *  furnished to do so, subject to the following conditions:
- *
- *  The above copyright notice and this permission notice shall be included in all
- *  copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- *  SOFTWARE.
- */
-
-/**
- * Class Base32
- * [A-Z][2-7]
- *
- * @package ParagonIE\ConstantTime
- */
-abstract class Base32 implements EncoderInterface
-{
-    /**
-     * Decode a Base32-encoded string into raw binary
-     *
-     * @param string $encodedString
-     * @param bool $strictPadding
-     * @return string
-     */
-    public static function decode(string $encodedString, bool $strictPadding = false): string
-    {
-        return static::doDecode($encodedString, false, $strictPadding);
-    }
-
-    /**
-     * Decode an uppercase Base32-encoded string into raw binary
-     *
-     * @param string $src
-     * @param bool $strictPadding
-     * @return string
-     */
-    public static function decodeUpper(string $src, bool $strictPadding = false): string
-    {
-        return static::doDecode($src, true, $strictPadding);
-    }
-
-    /**
-     * Encode into Base32 (RFC 4648)
-     *
-     * @param string $binString
-     * @return string
-     * @throws TypeError
-     */
-    public static function encode(string $binString): string
-    {
-        return static::doEncode($binString, false, true);
-    }
-    /**
-     * Encode into Base32 (RFC 4648)
-     *
-     * @param string $src
-     * @return string
-     * @throws TypeError
-     */
-    public static function encodeUnpadded(string $src): string
-    {
-        return static::doEncode($src, false, false);
-    }
-
-    /**
-     * Encode into uppercase Base32 (RFC 4648)
-     *
-     * @param string $src
-     * @return string
-     * @throws TypeError
-     */
-    public static function encodeUpper(string $src): string
-    {
-        return static::doEncode($src, true, true);
-    }
-
-    /**
-     * Encode into uppercase Base32 (RFC 4648)
-     *
-     * @param string $src
-     * @return string
-     * @throws TypeError
-     */
-    public static function encodeUpperUnpadded(string $src): string
-    {
-        return static::doEncode($src, true, false);
-    }
-
-    /**
-     * Uses bitwise operators instead of table-lookups to turn 5-bit integers
-     * into 8-bit integers.
-     *
-     * @param int $src
-     * @return int
-     */
-    protected static function decode5Bits(int $src): int
-    {
-        $ret = -1;
-
-        // if ($src > 96 && $src < 123) $ret += $src - 97 + 1; // -64
-        $ret += (((0x60 - $src) & ($src - 0x7b)) >> 8) & ($src - 96);
-
-        // if ($src > 0x31 && $src < 0x38) $ret += $src - 24 + 1; // -23
-        $ret += (((0x31 - $src) & ($src - 0x38)) >> 8) & ($src - 23);
-
-        return $ret;
-    }
-
-    /**
-     * Uses bitwise operators instead of table-lookups to turn 5-bit integers
-     * into 8-bit integers.
-     *
-     * Uppercase variant.
-     *
-     * @param int $src
-     * @return int
-     */
-    protected static function decode5BitsUpper(int $src): int
-    {
-        $ret = -1;
-
-        // if ($src > 64 && $src < 91) $ret += $src - 65 + 1; // -64
-        $ret += (((0x40 - $src) & ($src - 0x5b)) >> 8) & ($src - 64);
-
-        // if ($src > 0x31 && $src < 0x38) $ret += $src - 24 + 1; // -23
-        $ret += (((0x31 - $src) & ($src - 0x38)) >> 8) & ($src - 23);
-
-        return $ret;
-    }
-
-    /**
-     * Uses bitwise operators instead of table-lookups to turn 8-bit integers
-     * into 5-bit integers.
-     *
-     * @param int $src
-     * @return string
-     */
-    protected static function encode5Bits(int $src): string
-    {
-        $diff = 0x61;
-
-        // if ($src > 25) $ret -= 72;
-        $diff -= ((25 - $src) >> 8) & 73;
-
-        return \pack('C', $src + $diff);
-    }
-
-    /**
-     * Uses bitwise operators instead of table-lookups to turn 8-bit integers
-     * into 5-bit integers.
-     *
-     * Uppercase variant.
-     *
-     * @param int $src
-     * @return string
-     */
-    protected static function encode5BitsUpper(int $src): string
-    {
-        $diff = 0x41;
-
-        // if ($src > 25) $ret -= 40;
-        $diff -= ((25 - $src) >> 8) & 41;
-
-        return \pack('C', $src + $diff);
-    }
-
-    /**
-     * @param string $encodedString
-     * @param bool $upper
-     * @return string
-     */
-    public static function decodeNoPadding(string $encodedString, bool $upper = false): string
-    {
-        $srcLen = Binary::safeStrlen($encodedString);
-        if ($srcLen === 0) {
-            return '';
-        }
-        if (($srcLen & 7) === 0) {
-            for ($j = 0; $j < 7 && $j < $srcLen; ++$j) {
-                if ($encodedString[$srcLen - $j - 1] === '=') {
-                    throw new InvalidArgumentException(
-                        "decodeNoPadding() doesn't tolerate padding"
-                    );
-                }
-            }
-        }
-        return static::doDecode(
-            $encodedString,
-            $upper,
-            true
-        );
-    }
-
-    /**
-     * Base32 decoding
-     *
-     * @param string $src
-     * @param bool $upper
-     * @param bool $strictPadding
-     * @return string
-     *
-     * @throws TypeError
-     * @psalm-suppress RedundantCondition
-     */
-    protected static function doDecode(
-        string $src,
-        bool $upper = false,
-        bool $strictPadding = false
-    ): string {
-        // We do this to reduce code duplication:
-        $method = $upper
-            ? 'decode5BitsUpper'
-            : 'decode5Bits';
-
-        // Remove padding
-        $srcLen = Binary::safeStrlen($src);
-        if ($srcLen === 0) {
-            return '';
-        }
-        if ($strictPadding) {
-            if (($srcLen & 7) === 0) {
-                for ($j = 0; $j < 7; ++$j) {
-                    if ($src[$srcLen - 1] === '=') {
-                        $srcLen--;
-                    } else {
-                        break;
-                    }
-                }
-            }
-            if (($srcLen & 7) === 1) {
-                throw new RangeException(
-                    'Incorrect padding'
-                );
-            }
-        } else {
-            $src = \rtrim($src, '=');
-            $srcLen = Binary::safeStrlen($src);
-        }
-
-        $err = 0;
-        $dest = '';
-        // Main loop (no padding):
-        for ($i = 0; $i + 8 <= $srcLen; $i += 8) {
-            /** @var array<int, int> $chunk */
-            $chunk = \unpack('C*', Binary::safeSubstr($src, $i, 8));
-            /** @var int $c0 */
-            $c0 = static::$method($chunk[1]);
-            /** @var int $c1 */
-            $c1 = static::$method($chunk[2]);
-            /** @var int $c2 */
-            $c2 = static::$method($chunk[3]);
-            /** @var int $c3 */
-            $c3 = static::$method($chunk[4]);
-            /** @var int $c4 */
-            $c4 = static::$method($chunk[5]);
-            /** @var int $c5 */
-            $c5 = static::$method($chunk[6]);
-            /** @var int $c6 */
-            $c6 = static::$method($chunk[7]);
-            /** @var int $c7 */
-            $c7 = static::$method($chunk[8]);
-
-            $dest .= \pack(
-                'CCCCC',
-                (($c0 << 3) | ($c1 >> 2)             ) & 0xff,
-                (($c1 << 6) | ($c2 << 1) | ($c3 >> 4)) & 0xff,
-                (($c3 << 4) | ($c4 >> 1)             ) & 0xff,
-                (($c4 << 7) | ($c5 << 2) | ($c6 >> 3)) & 0xff,
-                (($c6 << 5) | ($c7     )             ) & 0xff
-            );
-            $err |= ($c0 | $c1 | $c2 | $c3 | $c4 | $c5 | $c6 | $c7) >> 8;
-        }
-        // The last chunk, which may have padding:
-        if ($i < $srcLen) {
-            /** @var array<int, int> $chunk */
-            $chunk = \unpack('C*', Binary::safeSubstr($src, $i, $srcLen - $i));
-            /** @var int $c0 */
-            $c0 = static::$method($chunk[1]);
-
-            if ($i + 6 < $srcLen) {
-                /** @var int $c1 */
-                $c1 = static::$method($chunk[2]);
-                /** @var int $c2 */
-                $c2 = static::$method($chunk[3]);
-                /** @var int $c3 */
-                $c3 = static::$method($chunk[4]);
-                /** @var int $c4 */
-                $c4 = static::$method($chunk[5]);
-                /** @var int $c5 */
-                $c5 = static::$method($chunk[6]);
-                /** @var int $c6 */
-                $c6 = static::$method($chunk[7]);
-
-                $dest .= \pack(
-                    'CCCC',
-                    (($c0 << 3) | ($c1 >> 2)             ) & 0xff,
-                    (($c1 << 6) | ($c2 << 1) | ($c3 >> 4)) & 0xff,
-                    (($c3 << 4) | ($c4 >> 1)             ) & 0xff,
-                    (($c4 << 7) | ($c5 << 2) | ($c6 >> 3)) & 0xff
-                );
-                $err |= ($c0 | $c1 | $c2 | $c3 | $c4 | $c5 | $c6) >> 8;
-                if ($strictPadding) {
-                    $err |= ($c6 << 5) & 0xff;
-                }
-            } elseif ($i + 5 < $srcLen) {
-                /** @var int $c1 */
-                $c1 = static::$method($chunk[2]);
-                /** @var int $c2 */
-                $c2 = static::$method($chunk[3]);
-                /** @var int $c3 */
-                $c3 = static::$method($chunk[4]);
-                /** @var int $c4 */
-                $c4 = static::$method($chunk[5]);
-                /** @var int $c5 */
-                $c5 = static::$method($chunk[6]);
-
-                $dest .= \pack(
-                    'CCCC',
-                    (($c0 << 3) | ($c1 >> 2)             ) & 0xff,
-                    (($c1 << 6) | ($c2 << 1) | ($c3 >> 4)) & 0xff,
-                    (($c3 << 4) | ($c4 >> 1)             ) & 0xff,
-                    (($c4 << 7) | ($c5 << 2)             ) & 0xff
-                );
-                $err |= ($c0 | $c1 | $c2 | $c3 | $c4 | $c5) >> 8;
-            } elseif ($i + 4 < $srcLen) {
-                /** @var int $c1 */
-                $c1 = static::$method($chunk[2]);
-                /** @var int $c2 */
-                $c2 = static::$method($chunk[3]);
-                /** @var int $c3 */
-                $c3 = static::$method($chunk[4]);
-                /** @var int $c4 */
-                $c4 = static::$method($chunk[5]);
-
-                $dest .= \pack(
-                    'CCC',
-                    (($c0 << 3) | ($c1 >> 2)             ) & 0xff,
-                    (($c1 << 6) | ($c2 << 1) | ($c3 >> 4)) & 0xff,
-                    (($c3 << 4) | ($c4 >> 1)             ) & 0xff
-                );
-                $err |= ($c0 | $c1 | $c2 | $c3 | $c4) >> 8;
-                if ($strictPadding) {
-                    $err |= ($c4 << 7) & 0xff;
-                }
-            } elseif ($i + 3 < $srcLen) {
-                /** @var int $c1 */
-                $c1 = static::$method($chunk[2]);
-                /** @var int $c2 */
-                $c2 = static::$method($chunk[3]);
-                /** @var int $c3 */
-                $c3 = static::$method($chunk[4]);
-
-                $dest .= \pack(
-                    'CC',
-                    (($c0 << 3) | ($c1 >> 2)             ) & 0xff,
-                    (($c1 << 6) | ($c2 << 1) | ($c3 >> 4)) & 0xff
-                );
-                $err |= ($c0 | $c1 | $c2 | $c3) >> 8;
-                if ($strictPadding) {
-                    $err |= ($c3 << 4) & 0xff;
-                }
-            } elseif ($i + 2 < $srcLen) {
-                /** @var int $c1 */
-                $c1 = static::$method($chunk[2]);
-                /** @var int $c2 */
-                $c2 = static::$method($chunk[3]);
-
-                $dest .= \pack(
-                    'CC',
-                    (($c0 << 3) | ($c1 >> 2)             ) & 0xff,
-                    (($c1 << 6) | ($c2 << 1)             ) & 0xff
-                );
-                $err |= ($c0 | $c1 | $c2) >> 8;
-                if ($strictPadding) {
-                    $err |= ($c2 << 6) & 0xff;
-                }
-            } elseif ($i + 1 < $srcLen) {
-                /** @var int $c1 */
-                $c1 = static::$method($chunk[2]);
-
-                $dest .= \pack(
-                    'C',
-                    (($c0 << 3) | ($c1 >> 2)             ) & 0xff
-                );
-                $err |= ($c0 | $c1) >> 8;
-                if ($strictPadding) {
-                    $err |= ($c1 << 6) & 0xff;
-                }
-            } else {
-                $dest .= \pack(
-                    'C',
-                    (($c0 << 3)                          ) & 0xff
-                );
-                $err |= ($c0) >> 8;
-            }
-        }
-        $check = ($err === 0);
-        if (!$check) {
-            throw new RangeException(
-                'Base32::doDecode() only expects characters in the correct base32 alphabet'
-            );
-        }
-        return $dest;
-    }
-
-    /**
-     * Base32 Encoding
-     *
-     * @param string $src
-     * @param bool $upper
-     * @param bool $pad
-     * @return string
-     * @throws TypeError
-     */
-    protected static function doEncode(string $src, bool $upper = false, $pad = true): string
-    {
-        // We do this to reduce code duplication:
-        $method = $upper
-            ? 'encode5BitsUpper'
-            : 'encode5Bits';
-        
-        $dest = '';
-        $srcLen = Binary::safeStrlen($src);
-
-        // Main loop (no padding):
-        for ($i = 0; $i + 5 <= $srcLen; $i += 5) {
-            /** @var array<int, int> $chunk */
-            $chunk = \unpack('C*', Binary::safeSubstr($src, $i, 5));
-            $b0 = $chunk[1];
-            $b1 = $chunk[2];
-            $b2 = $chunk[3];
-            $b3 = $chunk[4];
-            $b4 = $chunk[5];
-            $dest .=
-                static::$method(              ($b0 >> 3)  & 31) .
-                static::$method((($b0 << 2) | ($b1 >> 6)) & 31) .
-                static::$method((($b1 >> 1)             ) & 31) .
-                static::$method((($b1 << 4) | ($b2 >> 4)) & 31) .
-                static::$method((($b2 << 1) | ($b3 >> 7)) & 31) .
-                static::$method((($b3 >> 2)             ) & 31) .
-                static::$method((($b3 << 3) | ($b4 >> 5)) & 31) .
-                static::$method(  $b4                     & 31);
-        }
-        // The last chunk, which may have padding:
-        if ($i < $srcLen) {
-            /** @var array<int, int> $chunk */
-            $chunk = \unpack('C*', Binary::safeSubstr($src, $i, $srcLen - $i));
-            $b0 = $chunk[1];
-            if ($i + 3 < $srcLen) {
-                $b1 = $chunk[2];
-                $b2 = $chunk[3];
-                $b3 = $chunk[4];
-                $dest .=
-                    static::$method(              ($b0 >> 3)  & 31) .
-                    static::$method((($b0 << 2) | ($b1 >> 6)) & 31) .
-                    static::$method((($b1 >> 1)             ) & 31) .
-                    static::$method((($b1 << 4) | ($b2 >> 4)) & 31) .
-                    static::$method((($b2 << 1) | ($b3 >> 7)) & 31) .
-                    static::$method((($b3 >> 2)             ) & 31) .
-                    static::$method((($b3 << 3)             ) & 31);
-                if ($pad) {
-                    $dest .= '=';
-                }
-            } elseif ($i + 2 < $srcLen) {
-                $b1 = $chunk[2];
-                $b2 = $chunk[3];
-                $dest .=
-                    static::$method(              ($b0 >> 3)  & 31) .
-                    static::$method((($b0 << 2) | ($b1 >> 6)) & 31) .
-                    static::$method((($b1 >> 1)             ) & 31) .
-                    static::$method((($b1 << 4) | ($b2 >> 4)) & 31) .
-                    static::$method((($b2 << 1)             ) & 31);
-                if ($pad) {
-                    $dest .= '===';
-                }
-            } elseif ($i + 1 < $srcLen) {
-                $b1 = $chunk[2];
-                $dest .=
-                    static::$method(              ($b0 >> 3)  & 31) .
-                    static::$method((($b0 << 2) | ($b1 >> 6)) & 31) .
-                    static::$method((($b1 >> 1)             ) & 31) .
-                    static::$method((($b1 << 4)             ) & 31);
-                if ($pad) {
-                    $dest .= '====';
-                }
-            } else {
-                $dest .=
-                    static::$method(              ($b0 >> 3)  & 31) .
-                    static::$method( ($b0 << 2)               & 31);
-                if ($pad) {
-                    $dest .= '======';
-                }
-            }
-        }
-        return $dest;
-    }
-}
diff --git a/securemail/vendor/paragonie/constant_time_encoding/src/Base32Hex.php b/securemail/vendor/paragonie/constant_time_encoding/src/Base32Hex.php
deleted file mode 100644
index b868dd04..00000000
--- a/securemail/vendor/paragonie/constant_time_encoding/src/Base32Hex.php
+++ /dev/null
@@ -1,111 +0,0 @@
-<?php
-declare(strict_types=1);
-namespace ParagonIE\ConstantTime;
-
-/**
- *  Copyright (c) 2016 - 2022 Paragon Initiative Enterprises.
- *  Copyright (c) 2014 Steve "Sc00bz" Thomas (steve at tobtu dot com)
- *
- *  Permission is hereby granted, free of charge, to any person obtaining a copy
- *  of this software and associated documentation files (the "Software"), to deal
- *  in the Software without restriction, including without limitation the rights
- *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- *  copies of the Software, and to permit persons to whom the Software is
- *  furnished to do so, subject to the following conditions:
- *
- *  The above copyright notice and this permission notice shall be included in all
- *  copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- *  SOFTWARE.
- */
-
-/**
- * Class Base32Hex
- * [0-9][A-V]
- *
- * @package ParagonIE\ConstantTime
- */
-abstract class Base32Hex extends Base32
-{
-    /**
-     * Uses bitwise operators instead of table-lookups to turn 5-bit integers
-     * into 8-bit integers.
-     *
-     * @param int $src
-     * @return int
-     */
-    protected static function decode5Bits(int $src): int
-    {
-        $ret = -1;
-
-        // if ($src > 0x30 && $src < 0x3a) ret += $src - 0x2e + 1; // -47
-        $ret += (((0x2f - $src) & ($src - 0x3a)) >> 8) & ($src - 47);
-
-        // if ($src > 0x60 && $src < 0x77) ret += $src - 0x61 + 10 + 1; // -86
-        $ret += (((0x60 - $src) & ($src - 0x77)) >> 8) & ($src - 86);
-
-        return $ret;
-    }
-
-    /**
-     * Uses bitwise operators instead of table-lookups to turn 5-bit integers
-     * into 8-bit integers.
-     *
-     * @param int $src
-     * @return int
-     */
-    protected static function decode5BitsUpper(int $src): int
-    {
-        $ret = -1;
-
-        // if ($src > 0x30 && $src < 0x3a) ret += $src - 0x2e + 1; // -47
-        $ret += (((0x2f - $src) & ($src - 0x3a)) >> 8) & ($src - 47);
-
-        // if ($src > 0x40 && $src < 0x57) ret += $src - 0x41 + 10 + 1; // -54
-        $ret += (((0x40 - $src) & ($src - 0x57)) >> 8) & ($src - 54);
-
-        return $ret;
-    }
-
-    /**
-     * Uses bitwise operators instead of table-lookups to turn 8-bit integers
-     * into 5-bit integers.
-     *
-     * @param int $src
-     * @return string
-     */
-    protected static function encode5Bits(int $src): string
-    {
-        $src += 0x30;
-
-        // if ($src > 0x39) $src += 0x61 - 0x3a; // 39
-        $src += ((0x39 - $src) >> 8) & 39;
-
-        return \pack('C', $src);
-    }
-
-    /**
-     * Uses bitwise operators instead of table-lookups to turn 8-bit integers
-     * into 5-bit integers.
-     *
-     * Uppercase variant.
-     *
-     * @param int $src
-     * @return string
-     */
-    protected static function encode5BitsUpper(int $src): string
-    {
-        $src += 0x30;
-
-        // if ($src > 0x39) $src += 0x41 - 0x3a; // 7
-        $src += ((0x39 - $src) >> 8) & 7;
-
-        return \pack('C', $src);
-    }
-}
\ No newline at end of file
diff --git a/securemail/vendor/paragonie/constant_time_encoding/src/Base64.php b/securemail/vendor/paragonie/constant_time_encoding/src/Base64.php
deleted file mode 100644
index f5716179..00000000
--- a/securemail/vendor/paragonie/constant_time_encoding/src/Base64.php
+++ /dev/null
@@ -1,314 +0,0 @@
-<?php
-declare(strict_types=1);
-namespace ParagonIE\ConstantTime;
-
-use InvalidArgumentException;
-use RangeException;
-use TypeError;
-
-/**
- *  Copyright (c) 2016 - 2022 Paragon Initiative Enterprises.
- *  Copyright (c) 2014 Steve "Sc00bz" Thomas (steve at tobtu dot com)
- *
- *  Permission is hereby granted, free of charge, to any person obtaining a copy
- *  of this software and associated documentation files (the "Software"), to deal
- *  in the Software without restriction, including without limitation the rights
- *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- *  copies of the Software, and to permit persons to whom the Software is
- *  furnished to do so, subject to the following conditions:
- *
- *  The above copyright notice and this permission notice shall be included in all
- *  copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- *  SOFTWARE.
- */
-
-/**
- * Class Base64
- * [A-Z][a-z][0-9]+/
- *
- * @package ParagonIE\ConstantTime
- */
-abstract class Base64 implements EncoderInterface
-{
-    /**
-     * Encode into Base64
-     *
-     * Base64 character set "[A-Z][a-z][0-9]+/"
-     *
-     * @param string $binString
-     * @return string
-     *
-     * @throws TypeError
-     */
-    public static function encode(string $binString): string
-    {
-        return static::doEncode($binString, true);
-    }
-
-    /**
-     * Encode into Base64, no = padding
-     *
-     * Base64 character set "[A-Z][a-z][0-9]+/"
-     *
-     * @param string $src
-     * @return string
-     *
-     * @throws TypeError
-     */
-    public static function encodeUnpadded(string $src): string
-    {
-        return static::doEncode($src, false);
-    }
-
-    /**
-     * @param string $src
-     * @param bool $pad   Include = padding?
-     * @return string
-     *
-     * @throws TypeError
-     */
-    protected static function doEncode(string $src, bool $pad = true): string
-    {
-        $dest = '';
-        $srcLen = Binary::safeStrlen($src);
-        // Main loop (no padding):
-        for ($i = 0; $i + 3 <= $srcLen; $i += 3) {
-            /** @var array<int, int> $chunk */
-            $chunk = \unpack('C*', Binary::safeSubstr($src, $i, 3));
-            $b0 = $chunk[1];
-            $b1 = $chunk[2];
-            $b2 = $chunk[3];
-
-            $dest .=
-                static::encode6Bits(               $b0 >> 2       ) .
-                static::encode6Bits((($b0 << 4) | ($b1 >> 4)) & 63) .
-                static::encode6Bits((($b1 << 2) | ($b2 >> 6)) & 63) .
-                static::encode6Bits(  $b2                     & 63);
-        }
-        // The last chunk, which may have padding:
-        if ($i < $srcLen) {
-            /** @var array<int, int> $chunk */
-            $chunk = \unpack('C*', Binary::safeSubstr($src, $i, $srcLen - $i));
-            $b0 = $chunk[1];
-            if ($i + 1 < $srcLen) {
-                $b1 = $chunk[2];
-                $dest .=
-                    static::encode6Bits($b0 >> 2) .
-                    static::encode6Bits((($b0 << 4) | ($b1 >> 4)) & 63) .
-                    static::encode6Bits(($b1 << 2) & 63);
-                if ($pad) {
-                    $dest .= '=';
-                }
-            } else {
-                $dest .=
-                    static::encode6Bits( $b0 >> 2) .
-                    static::encode6Bits(($b0 << 4) & 63);
-                if ($pad) {
-                    $dest .= '==';
-                }
-            }
-        }
-        return $dest;
-    }
-
-    /**
-     * decode from base64 into binary
-     *
-     * Base64 character set "./[A-Z][a-z][0-9]"
-     *
-     * @param string $encodedString
-     * @param bool $strictPadding
-     * @return string
-     *
-     * @throws RangeException
-     * @throws TypeError
-     * @psalm-suppress RedundantCondition
-     */
-    public static function decode(string $encodedString, bool $strictPadding = false): string
-    {
-        // Remove padding
-        $srcLen = Binary::safeStrlen($encodedString);
-        if ($srcLen === 0) {
-            return '';
-        }
-
-        if ($strictPadding) {
-            if (($srcLen & 3) === 0) {
-                if ($encodedString[$srcLen - 1] === '=') {
-                    $srcLen--;
-                    if ($encodedString[$srcLen - 1] === '=') {
-                        $srcLen--;
-                    }
-                }
-            }
-            if (($srcLen & 3) === 1) {
-                throw new RangeException(
-                    'Incorrect padding'
-                );
-            }
-            if ($encodedString[$srcLen - 1] === '=') {
-                throw new RangeException(
-                    'Incorrect padding'
-                );
-            }
-        } else {
-            $encodedString = \rtrim($encodedString, '=');
-            $srcLen = Binary::safeStrlen($encodedString);
-        }
-
-        $err = 0;
-        $dest = '';
-        // Main loop (no padding):
-        for ($i = 0; $i + 4 <= $srcLen; $i += 4) {
-            /** @var array<int, int> $chunk */
-            $chunk = \unpack('C*', Binary::safeSubstr($encodedString, $i, 4));
-            $c0 = static::decode6Bits($chunk[1]);
-            $c1 = static::decode6Bits($chunk[2]);
-            $c2 = static::decode6Bits($chunk[3]);
-            $c3 = static::decode6Bits($chunk[4]);
-
-            $dest .= \pack(
-                'CCC',
-                ((($c0 << 2) | ($c1 >> 4)) & 0xff),
-                ((($c1 << 4) | ($c2 >> 2)) & 0xff),
-                ((($c2 << 6) |  $c3      ) & 0xff)
-            );
-            $err |= ($c0 | $c1 | $c2 | $c3) >> 8;
-        }
-        // The last chunk, which may have padding:
-        if ($i < $srcLen) {
-            /** @var array<int, int> $chunk */
-            $chunk = \unpack('C*', Binary::safeSubstr($encodedString, $i, $srcLen - $i));
-            $c0 = static::decode6Bits($chunk[1]);
-
-            if ($i + 2 < $srcLen) {
-                $c1 = static::decode6Bits($chunk[2]);
-                $c2 = static::decode6Bits($chunk[3]);
-                $dest .= \pack(
-                    'CC',
-                    ((($c0 << 2) | ($c1 >> 4)) & 0xff),
-                    ((($c1 << 4) | ($c2 >> 2)) & 0xff)
-                );
-                $err |= ($c0 | $c1 | $c2) >> 8;
-                if ($strictPadding) {
-                    $err |= ($c2 << 6) & 0xff;
-                }
-            } elseif ($i + 1 < $srcLen) {
-                $c1 = static::decode6Bits($chunk[2]);
-                $dest .= \pack(
-                    'C',
-                    ((($c0 << 2) | ($c1 >> 4)) & 0xff)
-                );
-                $err |= ($c0 | $c1) >> 8;
-                if ($strictPadding) {
-                    $err |= ($c1 << 4) & 0xff;
-                }
-            } elseif ($strictPadding) {
-                $err |= 1;
-            }
-        }
-        $check = ($err === 0);
-        if (!$check) {
-            throw new RangeException(
-                'Base64::decode() only expects characters in the correct base64 alphabet'
-            );
-        }
-        return $dest;
-    }
-
-    /**
-     * @param string $encodedString
-     * @return string
-     */
-    public static function decodeNoPadding(string $encodedString): string
-    {
-        $srcLen = Binary::safeStrlen($encodedString);
-        if ($srcLen === 0) {
-            return '';
-        }
-        if (($srcLen & 3) === 0) {
-            if ($encodedString[$srcLen - 1] === '=') {
-                throw new InvalidArgumentException(
-                    "decodeNoPadding() doesn't tolerate padding"
-                );
-            }
-            if (($srcLen & 3) > 1) {
-                if ($encodedString[$srcLen - 2] === '=') {
-                    throw new InvalidArgumentException(
-                        "decodeNoPadding() doesn't tolerate padding"
-                    );
-                }
-            }
-        }
-        return static::decode(
-            $encodedString,
-            true
-        );
-    }
-
-    /**
-     * Uses bitwise operators instead of table-lookups to turn 6-bit integers
-     * into 8-bit integers.
-     *
-     * Base64 character set:
-     * [A-Z]      [a-z]      [0-9]      +     /
-     * 0x41-0x5a, 0x61-0x7a, 0x30-0x39, 0x2b, 0x2f
-     *
-     * @param int $src
-     * @return int
-     */
-    protected static function decode6Bits(int $src): int
-    {
-        $ret = -1;
-
-        // if ($src > 0x40 && $src < 0x5b) $ret += $src - 0x41 + 1; // -64
-        $ret += (((0x40 - $src) & ($src - 0x5b)) >> 8) & ($src - 64);
-
-        // if ($src > 0x60 && $src < 0x7b) $ret += $src - 0x61 + 26 + 1; // -70
-        $ret += (((0x60 - $src) & ($src - 0x7b)) >> 8) & ($src - 70);
-
-        // if ($src > 0x2f && $src < 0x3a) $ret += $src - 0x30 + 52 + 1; // 5
-        $ret += (((0x2f - $src) & ($src - 0x3a)) >> 8) & ($src + 5);
-
-        // if ($src == 0x2b) $ret += 62 + 1;
-        $ret += (((0x2a - $src) & ($src - 0x2c)) >> 8) & 63;
-
-        // if ($src == 0x2f) ret += 63 + 1;
-        $ret += (((0x2e - $src) & ($src - 0x30)) >> 8) & 64;
-
-        return $ret;
-    }
-
-    /**
-     * Uses bitwise operators instead of table-lookups to turn 8-bit integers
-     * into 6-bit integers.
-     *
-     * @param int $src
-     * @return string
-     */
-    protected static function encode6Bits(int $src): string
-    {
-        $diff = 0x41;
-
-        // if ($src > 25) $diff += 0x61 - 0x41 - 26; // 6
-        $diff += ((25 - $src) >> 8) & 6;
-
-        // if ($src > 51) $diff += 0x30 - 0x61 - 26; // -75
-        $diff -= ((51 - $src) >> 8) & 75;
-
-        // if ($src > 61) $diff += 0x2b - 0x30 - 10; // -15
-        $diff -= ((61 - $src) >> 8) & 15;
-
-        // if ($src > 62) $diff += 0x2f - 0x2b - 1; // 3
-        $diff += ((62 - $src) >> 8) & 3;
-
-        return \pack('C', $src + $diff);
-    }
-}
diff --git a/securemail/vendor/paragonie/constant_time_encoding/src/Base64DotSlash.php b/securemail/vendor/paragonie/constant_time_encoding/src/Base64DotSlash.php
deleted file mode 100644
index 5e98a8f7..00000000
--- a/securemail/vendor/paragonie/constant_time_encoding/src/Base64DotSlash.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-declare(strict_types=1);
-namespace ParagonIE\ConstantTime;
-
-/**
- *  Copyright (c) 2016 - 2022 Paragon Initiative Enterprises.
- *  Copyright (c) 2014 Steve "Sc00bz" Thomas (steve at tobtu dot com)
- *
- *  Permission is hereby granted, free of charge, to any person obtaining a copy
- *  of this software and associated documentation files (the "Software"), to deal
- *  in the Software without restriction, including without limitation the rights
- *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- *  copies of the Software, and to permit persons to whom the Software is
- *  furnished to do so, subject to the following conditions:
- *
- *  The above copyright notice and this permission notice shall be included in all
- *  copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- *  SOFTWARE.
- */
-
-/**
- * Class Base64DotSlash
- * ./[A-Z][a-z][0-9]
- *
- * @package ParagonIE\ConstantTime
- */
-abstract class Base64DotSlash extends Base64
-{
-    /**
-     * Uses bitwise operators instead of table-lookups to turn 6-bit integers
-     * into 8-bit integers.
-     *
-     * Base64 character set:
-     * ./         [A-Z]      [a-z]     [0-9]
-     * 0x2e-0x2f, 0x41-0x5a, 0x61-0x7a, 0x30-0x39
-     *
-     * @param int $src
-     * @return int
-     */
-    protected static function decode6Bits(int $src): int
-    {
-        $ret = -1;
-
-        // if ($src > 0x2d && $src < 0x30) ret += $src - 0x2e + 1; // -45
-        $ret += (((0x2d - $src) & ($src - 0x30)) >> 8) & ($src - 45);
-
-        // if ($src > 0x40 && $src < 0x5b) ret += $src - 0x41 + 2 + 1; // -62
-        $ret += (((0x40 - $src) & ($src - 0x5b)) >> 8) & ($src - 62);
-
-        // if ($src > 0x60 && $src < 0x7b) ret += $src - 0x61 + 28 + 1; // -68
-        $ret += (((0x60 - $src) & ($src - 0x7b)) >> 8) & ($src - 68);
-
-        // if ($src > 0x2f && $src < 0x3a) ret += $src - 0x30 + 54 + 1; // 7
-        $ret += (((0x2f - $src) & ($src - 0x3a)) >> 8) & ($src + 7);
-
-        return $ret;
-    }
-
-    /**
-     * Uses bitwise operators instead of table-lookups to turn 8-bit integers
-     * into 6-bit integers.
-     *
-     * @param int $src
-     * @return string
-     */
-    protected static function encode6Bits(int $src): string
-    {
-        $src += 0x2e;
-
-        // if ($src > 0x2f) $src += 0x41 - 0x30; // 17
-        $src += ((0x2f - $src) >> 8) & 17;
-
-        // if ($src > 0x5a) $src += 0x61 - 0x5b; // 6
-        $src += ((0x5a - $src) >> 8) & 6;
-
-        // if ($src > 0x7a) $src += 0x30 - 0x7b; // -75
-        $src -= ((0x7a - $src) >> 8) & 75;
-
-        return \pack('C', $src);
-    }
-}
diff --git a/securemail/vendor/paragonie/constant_time_encoding/src/Base64DotSlashOrdered.php b/securemail/vendor/paragonie/constant_time_encoding/src/Base64DotSlashOrdered.php
deleted file mode 100644
index 9780b14b..00000000
--- a/securemail/vendor/paragonie/constant_time_encoding/src/Base64DotSlashOrdered.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-declare(strict_types=1);
-namespace ParagonIE\ConstantTime;
-
-/**
- *  Copyright (c) 2016 - 2022 Paragon Initiative Enterprises.
- *  Copyright (c) 2014 Steve "Sc00bz" Thomas (steve at tobtu dot com)
- *
- *  Permission is hereby granted, free of charge, to any person obtaining a copy
- *  of this software and associated documentation files (the "Software"), to deal
- *  in the Software without restriction, including without limitation the rights
- *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- *  copies of the Software, and to permit persons to whom the Software is
- *  furnished to do so, subject to the following conditions:
- *
- *  The above copyright notice and this permission notice shall be included in all
- *  copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- *  SOFTWARE.
- */
-
-/**
- * Class Base64DotSlashOrdered
- * ./[0-9][A-Z][a-z]
- *
- * @package ParagonIE\ConstantTime
- */
-abstract class Base64DotSlashOrdered extends Base64
-{
-    /**
-     * Uses bitwise operators instead of table-lookups to turn 6-bit integers
-     * into 8-bit integers.
-     *
-     * Base64 character set:
-     * [.-9]      [A-Z]      [a-z]
-     * 0x2e-0x39, 0x41-0x5a, 0x61-0x7a
-     *
-     * @param int $src
-     * @return int
-     */
-    protected static function decode6Bits(int $src): int
-    {
-        $ret = -1;
-
-        // if ($src > 0x2d && $src < 0x3a) ret += $src - 0x2e + 1; // -45
-        $ret += (((0x2d - $src) & ($src - 0x3a)) >> 8) & ($src - 45);
-
-        // if ($src > 0x40 && $src < 0x5b) ret += $src - 0x41 + 12 + 1; // -52
-        $ret += (((0x40 - $src) & ($src - 0x5b)) >> 8) & ($src - 52);
-
-        // if ($src > 0x60 && $src < 0x7b) ret += $src - 0x61 + 38 + 1; // -58
-        $ret += (((0x60 - $src) & ($src - 0x7b)) >> 8) & ($src - 58);
-
-        return $ret;
-    }
-
-    /**
-     * Uses bitwise operators instead of table-lookups to turn 8-bit integers
-     * into 6-bit integers.
-     *
-     * @param int $src
-     * @return string
-     */
-    protected static function encode6Bits(int $src): string
-    {
-        $src += 0x2e;
-
-        // if ($src > 0x39) $src += 0x41 - 0x3a; // 7
-        $src += ((0x39 - $src) >> 8) & 7;
-
-        // if ($src > 0x5a) $src += 0x61 - 0x5b; // 6
-        $src += ((0x5a - $src) >> 8) & 6;
-
-        return \pack('C', $src);
-    }
-}
diff --git a/securemail/vendor/paragonie/constant_time_encoding/src/Base64UrlSafe.php b/securemail/vendor/paragonie/constant_time_encoding/src/Base64UrlSafe.php
deleted file mode 100644
index 8192c63d..00000000
--- a/securemail/vendor/paragonie/constant_time_encoding/src/Base64UrlSafe.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-declare(strict_types=1);
-namespace ParagonIE\ConstantTime;
-
-/**
- *  Copyright (c) 2016 - 2022 Paragon Initiative Enterprises.
- *  Copyright (c) 2014 Steve "Sc00bz" Thomas (steve at tobtu dot com)
- *
- *  Permission is hereby granted, free of charge, to any person obtaining a copy
- *  of this software and associated documentation files (the "Software"), to deal
- *  in the Software without restriction, including without limitation the rights
- *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- *  copies of the Software, and to permit persons to whom the Software is
- *  furnished to do so, subject to the following conditions:
- *
- *  The above copyright notice and this permission notice shall be included in all
- *  copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- *  SOFTWARE.
- */
-
-/**
- * Class Base64UrlSafe
- * [A-Z][a-z][0-9]\-_
- *
- * @package ParagonIE\ConstantTime
- */
-abstract class Base64UrlSafe extends Base64
-{
-
-    /**
-     * Uses bitwise operators instead of table-lookups to turn 6-bit integers
-     * into 8-bit integers.
-     *
-     * Base64 character set:
-     * [A-Z]      [a-z]      [0-9]      -     _
-     * 0x41-0x5a, 0x61-0x7a, 0x30-0x39, 0x2d, 0x5f
-     *
-     * @param int $src
-     * @return int
-     */
-    protected static function decode6Bits(int $src): int
-    {
-        $ret = -1;
-
-        // if ($src > 0x40 && $src < 0x5b) $ret += $src - 0x41 + 1; // -64
-        $ret += (((0x40 - $src) & ($src - 0x5b)) >> 8) & ($src - 64);
-
-        // if ($src > 0x60 && $src < 0x7b) $ret += $src - 0x61 + 26 + 1; // -70
-        $ret += (((0x60 - $src) & ($src - 0x7b)) >> 8) & ($src - 70);
-
-        // if ($src > 0x2f && $src < 0x3a) $ret += $src - 0x30 + 52 + 1; // 5
-        $ret += (((0x2f - $src) & ($src - 0x3a)) >> 8) & ($src + 5);
-
-        // if ($src == 0x2c) $ret += 62 + 1;
-        $ret += (((0x2c - $src) & ($src - 0x2e)) >> 8) & 63;
-
-        // if ($src == 0x5f) ret += 63 + 1;
-        $ret += (((0x5e - $src) & ($src - 0x60)) >> 8) & 64;
-
-        return $ret;
-    }
-
-    /**
-     * Uses bitwise operators instead of table-lookups to turn 8-bit integers
-     * into 6-bit integers.
-     *
-     * @param int $src
-     * @return string
-     */
-    protected static function encode6Bits(int $src): string
-    {
-        $diff = 0x41;
-
-        // if ($src > 25) $diff += 0x61 - 0x41 - 26; // 6
-        $diff += ((25 - $src) >> 8) & 6;
-
-        // if ($src > 51) $diff += 0x30 - 0x61 - 26; // -75
-        $diff -= ((51 - $src) >> 8) & 75;
-
-        // if ($src > 61) $diff += 0x2d - 0x30 - 10; // -13
-        $diff -= ((61 - $src) >> 8) & 13;
-
-        // if ($src > 62) $diff += 0x5f - 0x2b - 1; // 3
-        $diff += ((62 - $src) >> 8) & 49;
-
-        return \pack('C', $src + $diff);
-    }
-}
diff --git a/securemail/vendor/paragonie/constant_time_encoding/src/Binary.php b/securemail/vendor/paragonie/constant_time_encoding/src/Binary.php
deleted file mode 100644
index 828f3e0f..00000000
--- a/securemail/vendor/paragonie/constant_time_encoding/src/Binary.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php
-declare(strict_types=1);
-namespace ParagonIE\ConstantTime;
-
-use TypeError;
-
-/**
- *  Copyright (c) 2016 - 2022 Paragon Initiative Enterprises.
- *  Copyright (c) 2014 Steve "Sc00bz" Thomas (steve at tobtu dot com)
- *
- *  Permission is hereby granted, free of charge, to any person obtaining a copy
- *  of this software and associated documentation files (the "Software"), to deal
- *  in the Software without restriction, including without limitation the rights
- *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- *  copies of the Software, and to permit persons to whom the Software is
- *  furnished to do so, subject to the following conditions:
- *
- *  The above copyright notice and this permission notice shall be included in all
- *  copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- *  SOFTWARE.
- */
-
-/**
- * Class Binary
- *
- * Binary string operators that don't choke on
- * mbstring.func_overload
- *
- * @package ParagonIE\ConstantTime
- */
-abstract class Binary
-{
-    /**
-     * Safe string length
-     *
-     * @ref mbstring.func_overload
-     *
-     * @param string $str
-     * @return int
-     */
-    public static function safeStrlen(string $str): int
-    {
-        if (\function_exists('mb_strlen')) {
-            // mb_strlen in PHP 7.x can return false.
-            /** @psalm-suppress RedundantCast */
-            return (int) \mb_strlen($str, '8bit');
-        } else {
-            return \strlen($str);
-        }
-    }
-
-    /**
-     * Safe substring
-     *
-     * @ref mbstring.func_overload
-     *
-     * @staticvar boolean $exists
-     * @param string $str
-     * @param int $start
-     * @param ?int $length
-     * @return string
-     *
-     * @throws TypeError
-     */
-    public static function safeSubstr(
-        string $str,
-        int $start = 0,
-        $length = null
-    ): string {
-        if ($length === 0) {
-            return '';
-        }
-        if (\function_exists('mb_substr')) {
-            return \mb_substr($str, $start, $length, '8bit');
-        }
-        // Unlike mb_substr(), substr() doesn't accept NULL for length
-        if ($length !== null) {
-            return \substr($str, $start, $length);
-        } else {
-            return \substr($str, $start);
-        }
-    }
-}
diff --git a/securemail/vendor/paragonie/constant_time_encoding/src/EncoderInterface.php b/securemail/vendor/paragonie/constant_time_encoding/src/EncoderInterface.php
deleted file mode 100644
index 9cafbf96..00000000
--- a/securemail/vendor/paragonie/constant_time_encoding/src/EncoderInterface.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-declare(strict_types=1);
-namespace ParagonIE\ConstantTime;
-
-/**
- *  Copyright (c) 2016 - 2022 Paragon Initiative Enterprises.
- *  Copyright (c) 2014 Steve "Sc00bz" Thomas (steve at tobtu dot com)
- *
- *  Permission is hereby granted, free of charge, to any person obtaining a copy
- *  of this software and associated documentation files (the "Software"), to deal
- *  in the Software without restriction, including without limitation the rights
- *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- *  copies of the Software, and to permit persons to whom the Software is
- *  furnished to do so, subject to the following conditions:
- *
- *  The above copyright notice and this permission notice shall be included in all
- *  copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- *  SOFTWARE.
- */
-
-/**
- * Interface EncoderInterface
- * @package ParagonIE\ConstantTime
- */
-interface EncoderInterface
-{
-    /**
-     * Convert a binary string into a hexadecimal string without cache-timing
-     * leaks
-     *
-     * @param string $binString (raw binary)
-     * @return string
-     */
-    public static function encode(string $binString): string;
-
-    /**
-     * Convert a binary string into a hexadecimal string without cache-timing
-     * leaks
-     *
-     * @param string $encodedString
-     * @param bool $strictPadding Error on invalid padding
-     * @return string (raw binary)
-     */
-    public static function decode(string $encodedString, bool $strictPadding = false): string;
-}
diff --git a/securemail/vendor/paragonie/constant_time_encoding/src/Encoding.php b/securemail/vendor/paragonie/constant_time_encoding/src/Encoding.php
deleted file mode 100644
index 8649f31f..00000000
--- a/securemail/vendor/paragonie/constant_time_encoding/src/Encoding.php
+++ /dev/null
@@ -1,262 +0,0 @@
-<?php
-declare(strict_types=1);
-namespace ParagonIE\ConstantTime;
-
-use TypeError;
-
-/**
- *  Copyright (c) 2016 - 2022 Paragon Initiative Enterprises.
- *  Copyright (c) 2014 Steve "Sc00bz" Thomas (steve at tobtu dot com)
- *
- *  Permission is hereby granted, free of charge, to any person obtaining a copy
- *  of this software and associated documentation files (the "Software"), to deal
- *  in the Software without restriction, including without limitation the rights
- *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- *  copies of the Software, and to permit persons to whom the Software is
- *  furnished to do so, subject to the following conditions:
- *
- *  The above copyright notice and this permission notice shall be included in all
- *  copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- *  SOFTWARE.
- */
-
-/**
- * Class Encoding
- * @package ParagonIE\ConstantTime
- */
-abstract class Encoding
-{
-    /**
-     * RFC 4648 Base32 encoding
-     *
-     * @param string $str
-     * @return string
-     * @throws TypeError
-     */
-    public static function base32Encode(string $str): string
-    {
-        return Base32::encode($str);
-    }
-
-    /**
-     * RFC 4648 Base32 encoding
-     *
-     * @param string $str
-     * @return string
-     * @throws TypeError
-     */
-    public static function base32EncodeUpper(string $str): string
-    {
-        return Base32::encodeUpper($str);
-    }
-
-    /**
-     * RFC 4648 Base32 decoding
-     *
-     * @param string $str
-     * @return string
-     * @throws TypeError
-     */
-    public static function base32Decode(string $str): string
-    {
-        return Base32::decode($str);
-    }
-
-    /**
-     * RFC 4648 Base32 decoding
-     *
-     * @param string $str
-     * @return string
-     * @throws TypeError
-     */
-    public static function base32DecodeUpper(string $str): string
-    {
-        return Base32::decodeUpper($str);
-    }
-
-    /**
-     * RFC 4648 Base32 encoding
-     *
-     * @param string $str
-     * @return string
-     * @throws TypeError
-     */
-    public static function base32HexEncode(string $str): string
-    {
-        return Base32Hex::encode($str);
-    }
-
-    /**
-     * RFC 4648 Base32Hex encoding
-     *
-     * @param string $str
-     * @return string
-     * @throws TypeError
-     */
-    public static function base32HexEncodeUpper(string $str): string
-    {
-        return Base32Hex::encodeUpper($str);
-    }
-
-    /**
-     * RFC 4648 Base32Hex decoding
-     *
-     * @param string $str
-     * @return string
-     * @throws TypeError
-     */
-    public static function base32HexDecode(string $str): string
-    {
-        return Base32Hex::decode($str);
-    }
-
-    /**
-     * RFC 4648 Base32Hex decoding
-     *
-     * @param string $str
-     * @return string
-     * @throws TypeError
-     */
-    public static function base32HexDecodeUpper(string $str): string
-    {
-        return Base32Hex::decodeUpper($str);
-    }
-
-    /**
-     * RFC 4648 Base64 encoding
-     *
-     * @param string $str
-     * @return string
-     * @throws TypeError
-     */
-    public static function base64Encode(string $str): string
-    {
-        return Base64::encode($str);
-    }
-
-    /**
-     * RFC 4648 Base64 decoding
-     *
-     * @param string $str
-     * @return string
-     * @throws TypeError
-     */
-    public static function base64Decode(string $str): string
-    {
-        return Base64::decode($str);
-    }
-
-    /**
-     * Encode into Base64
-     *
-     * Base64 character set "./[A-Z][a-z][0-9]"
-     * @param string $str
-     * @return string
-     * @throws TypeError
-     */
-    public static function base64EncodeDotSlash(string $str): string
-    {
-        return Base64DotSlash::encode($str);
-    }
-
-    /**
-     * Decode from base64 to raw binary
-     *
-     * Base64 character set "./[A-Z][a-z][0-9]"
-     *
-     * @param string $str
-     * @return string
-     * @throws \RangeException
-     * @throws TypeError
-     */
-    public static function base64DecodeDotSlash(string $str): string
-    {
-        return Base64DotSlash::decode($str);
-    }
-
-    /**
-     * Encode into Base64
-     *
-     * Base64 character set "[.-9][A-Z][a-z]" or "./[0-9][A-Z][a-z]"
-     * @param string $str
-     * @return string
-     * @throws TypeError
-     */
-    public static function base64EncodeDotSlashOrdered(string $str): string
-    {
-        return Base64DotSlashOrdered::encode($str);
-    }
-
-    /**
-     * Decode from base64 to raw binary
-     *
-     * Base64 character set "[.-9][A-Z][a-z]" or "./[0-9][A-Z][a-z]"
-     *
-     * @param string $str
-     * @return string
-     * @throws \RangeException
-     * @throws TypeError
-     */
-    public static function base64DecodeDotSlashOrdered(string $str): string
-    {
-        return Base64DotSlashOrdered::decode($str);
-    }
-
-    /**
-     * Convert a binary string into a hexadecimal string without cache-timing
-     * leaks
-     *
-     * @param string $bin_string (raw binary)
-     * @return string
-     * @throws TypeError
-     */
-    public static function hexEncode(string $bin_string): string
-    {
-        return Hex::encode($bin_string);
-    }
-
-    /**
-     * Convert a hexadecimal string into a binary string without cache-timing
-     * leaks
-     *
-     * @param string $hex_string
-     * @return string (raw binary)
-     * @throws \RangeException
-     */
-    public static function hexDecode(string $hex_string): string
-    {
-        return Hex::decode($hex_string);
-    }
-
-    /**
-     * Convert a binary string into a hexadecimal string without cache-timing
-     * leaks
-     *
-     * @param string $bin_string (raw binary)
-     * @return string
-     * @throws TypeError
-     */
-    public static function hexEncodeUpper(string $bin_string): string
-    {
-        return Hex::encodeUpper($bin_string);
-    }
-
-    /**
-     * Convert a binary string into a hexadecimal string without cache-timing
-     * leaks
-     *
-     * @param string $bin_string (raw binary)
-     * @return string
-     */
-    public static function hexDecodeUpper(string $bin_string): string
-    {
-        return Hex::decode($bin_string);
-    }
-}
diff --git a/securemail/vendor/paragonie/constant_time_encoding/src/Hex.php b/securemail/vendor/paragonie/constant_time_encoding/src/Hex.php
deleted file mode 100644
index a9e058cd..00000000
--- a/securemail/vendor/paragonie/constant_time_encoding/src/Hex.php
+++ /dev/null
@@ -1,146 +0,0 @@
-<?php
-declare(strict_types=1);
-namespace ParagonIE\ConstantTime;
-
-use RangeException;
-use TypeError;
-
-/**
- *  Copyright (c) 2016 - 2022 Paragon Initiative Enterprises.
- *  Copyright (c) 2014 Steve "Sc00bz" Thomas (steve at tobtu dot com)
- *
- *  Permission is hereby granted, free of charge, to any person obtaining a copy
- *  of this software and associated documentation files (the "Software"), to deal
- *  in the Software without restriction, including without limitation the rights
- *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- *  copies of the Software, and to permit persons to whom the Software is
- *  furnished to do so, subject to the following conditions:
- *
- *  The above copyright notice and this permission notice shall be included in all
- *  copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- *  SOFTWARE.
- */
-
-/**
- * Class Hex
- * @package ParagonIE\ConstantTime
- */
-abstract class Hex implements EncoderInterface
-{
-    /**
-     * Convert a binary string into a hexadecimal string without cache-timing
-     * leaks
-     *
-     * @param string $binString (raw binary)
-     * @return string
-     * @throws TypeError
-     */
-    public static function encode(string $binString): string
-    {
-        $hex = '';
-        $len = Binary::safeStrlen($binString);
-        for ($i = 0; $i < $len; ++$i) {
-            /** @var array<int, int> $chunk */
-            $chunk = \unpack('C', $binString[$i]);
-            $c = $chunk[1] & 0xf;
-            $b = $chunk[1] >> 4;
-
-            $hex .= \pack(
-                'CC',
-                (87 + $b + ((($b - 10) >> 8) & ~38)),
-                (87 + $c + ((($c - 10) >> 8) & ~38))
-            );
-        }
-        return $hex;
-    }
-
-    /**
-     * Convert a binary string into a hexadecimal string without cache-timing
-     * leaks, returning uppercase letters (as per RFC 4648)
-     *
-     * @param string $binString (raw binary)
-     * @return string
-     * @throws TypeError
-     */
-    public static function encodeUpper(string $binString): string
-    {
-        $hex = '';
-        $len = Binary::safeStrlen($binString);
-
-        for ($i = 0; $i < $len; ++$i) {
-            /** @var array<int, int> $chunk */
-            $chunk = \unpack('C', $binString[$i]);
-            $c = $chunk[1] & 0xf;
-            $b = $chunk[1] >> 4;
-
-            $hex .= \pack(
-                'CC',
-                (55 + $b + ((($b - 10) >> 8) & ~6)),
-                (55 + $c + ((($c - 10) >> 8) & ~6))
-            );
-        }
-        return $hex;
-    }
-
-    /**
-     * Convert a hexadecimal string into a binary string without cache-timing
-     * leaks
-     *
-     * @param string $encodedString
-     * @param bool $strictPadding
-     * @return string (raw binary)
-     * @throws RangeException
-     */
-    public static function decode(
-        string $encodedString,
-        bool $strictPadding = false
-    ): string {
-        $hex_pos = 0;
-        $bin = '';
-        $c_acc = 0;
-        $hex_len = Binary::safeStrlen($encodedString);
-        $state = 0;
-        if (($hex_len & 1) !== 0) {
-            if ($strictPadding) {
-                throw new RangeException(
-                    'Expected an even number of hexadecimal characters'
-                );
-            } else {
-                $encodedString = '0' . $encodedString;
-                ++$hex_len;
-            }
-        }
-
-        /** @var array<int, int> $chunk */
-        $chunk = \unpack('C*', $encodedString);
-        while ($hex_pos < $hex_len) {
-            ++$hex_pos;
-            $c = $chunk[$hex_pos];
-            $c_num = $c ^ 48;
-            $c_num0 = ($c_num - 10) >> 8;
-            $c_alpha = ($c & ~32) - 55;
-            $c_alpha0 = (($c_alpha - 10) ^ ($c_alpha - 16)) >> 8;
-
-            if (($c_num0 | $c_alpha0) === 0) {
-                throw new RangeException(
-                    'Expected hexadecimal character'
-                );
-            }
-            $c_val = ($c_num0 & $c_num) | ($c_alpha & $c_alpha0);
-            if ($state === 0) {
-                $c_acc = $c_val * 16;
-            } else {
-                $bin .= \pack('C', $c_acc | $c_val);
-            }
-            $state ^= 1;
-        }
-        return $bin;
-    }
-}
diff --git a/securemail/vendor/paragonie/constant_time_encoding/src/RFC4648.php b/securemail/vendor/paragonie/constant_time_encoding/src/RFC4648.php
deleted file mode 100644
index f124d65b..00000000
--- a/securemail/vendor/paragonie/constant_time_encoding/src/RFC4648.php
+++ /dev/null
@@ -1,186 +0,0 @@
-<?php
-declare(strict_types=1);
-namespace ParagonIE\ConstantTime;
-
-use TypeError;
-
-/**
- *  Copyright (c) 2016 - 2022 Paragon Initiative Enterprises.
- *  Copyright (c) 2014 Steve "Sc00bz" Thomas (steve at tobtu dot com)
- *
- *  Permission is hereby granted, free of charge, to any person obtaining a copy
- *  of this software and associated documentation files (the "Software"), to deal
- *  in the Software without restriction, including without limitation the rights
- *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- *  copies of the Software, and to permit persons to whom the Software is
- *  furnished to do so, subject to the following conditions:
- *
- *  The above copyright notice and this permission notice shall be included in all
- *  copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- *  SOFTWARE.
- */
-
-/**
- * Class RFC4648
- *
- * This class conforms strictly to the RFC
- *
- * @package ParagonIE\ConstantTime
- */
-abstract class RFC4648
-{
-    /**
-     * RFC 4648 Base64 encoding
-     *
-     * "foo" -> "Zm9v"
-     *
-     * @param string $str
-     * @return string
-     *
-     * @throws TypeError
-     */
-    public static function base64Encode(string $str): string
-    {
-        return Base64::encode($str);
-    }
-
-    /**
-     * RFC 4648 Base64 decoding
-     *
-     * "Zm9v" -> "foo"
-     *
-     * @param string $str
-     * @return string
-     *
-     * @throws TypeError
-     */
-    public static function base64Decode(string $str): string
-    {
-        return Base64::decode($str, true);
-    }
-
-    /**
-     * RFC 4648 Base64 (URL Safe) encoding
-     *
-     * "foo" -> "Zm9v"
-     *
-     * @param string $str
-     * @return string
-     *
-     * @throws TypeError
-     */
-    public static function base64UrlSafeEncode(string $str): string
-    {
-        return Base64UrlSafe::encode($str);
-    }
-
-    /**
-     * RFC 4648 Base64 (URL Safe) decoding
-     *
-     * "Zm9v" -> "foo"
-     *
-     * @param string $str
-     * @return string
-     *
-     * @throws TypeError
-     */
-    public static function base64UrlSafeDecode(string $str): string
-    {
-        return Base64UrlSafe::decode($str, true);
-    }
-
-    /**
-     * RFC 4648 Base32 encoding
-     *
-     * "foo" -> "MZXW6==="
-     *
-     * @param string $str
-     * @return string
-     *
-     * @throws TypeError
-     */
-    public static function base32Encode(string $str): string
-    {
-        return Base32::encodeUpper($str);
-    }
-
-    /**
-     * RFC 4648 Base32 encoding
-     *
-     * "MZXW6===" -> "foo"
-     *
-     * @param string $str
-     * @return string
-     *
-     * @throws TypeError
-     */
-    public static function base32Decode(string $str): string
-    {
-        return Base32::decodeUpper($str, true);
-    }
-
-    /**
-     * RFC 4648 Base32-Hex encoding
-     *
-     * "foo" -> "CPNMU==="
-     *
-     * @param string $str
-     * @return string
-     *
-     * @throws TypeError
-     */
-    public static function base32HexEncode(string $str): string
-    {
-        return Base32::encodeUpper($str);
-    }
-
-    /**
-     * RFC 4648 Base32-Hex decoding
-     *
-     * "CPNMU===" -> "foo"
-     *
-     * @param string $str
-     * @return string
-     *
-     * @throws TypeError
-     */
-    public static function base32HexDecode(string $str): string
-    {
-        return Base32::decodeUpper($str, true);
-    }
-
-    /**
-     * RFC 4648 Base16 decoding
-     *
-     * "foo" -> "666F6F"
-     *
-     * @param string $str
-     * @return string
-     *
-     * @throws TypeError
-     */
-    public static function base16Encode(string $str): string
-    {
-        return Hex::encodeUpper($str);
-    }
-
-    /**
-     * RFC 4648 Base16 decoding
-     *
-     * "666F6F" -> "foo"
-     *
-     * @param string $str
-     * @return string
-     */
-    public static function base16Decode(string $str): string
-    {
-        return Hex::decode($str, true);
-    }
-}
\ No newline at end of file
diff --git a/securemail/vendor/phpseclib/phpseclib/AUTHORS b/securemail/vendor/phpseclib/phpseclib/AUTHORS
index 9f10d267..a08b3099 100644
--- a/securemail/vendor/phpseclib/phpseclib/AUTHORS
+++ b/securemail/vendor/phpseclib/phpseclib/AUTHORS
@@ -4,4 +4,3 @@ phpseclib Developers:      monnerat (Patrick Monnerat)
                            bantu (Andreas Fischer)
                            petrich (Hans-Jürgen Petrich)
                            GrahamCampbell (Graham Campbell)
-                           hc-jworman
\ No newline at end of file
diff --git a/securemail/vendor/phpseclib/phpseclib/BACKERS.md b/securemail/vendor/phpseclib/phpseclib/BACKERS.md
deleted file mode 100644
index efca482a..00000000
--- a/securemail/vendor/phpseclib/phpseclib/BACKERS.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# Backers
-
-phpseclib ongoing development is made possible by [Tidelift](https://tidelift.com/subscription/pkg/packagist-phpseclib-phpseclib?utm_source=packagist-phpseclib-phpseclib&utm_medium=referral&utm_campaign=readme) and by contributions by users like you. Thank you.
-
-## Backers
-
-- Allan Simon
-- [ChargeOver](https://chargeover.com/)
-- Raghu Veer Dendukuri
-- Zane Hooper
-- [Setasign](https://www.setasign.com/)
-- [Charles Severance](https://github.com/csev)
-- [Rachel Fish](https://github.com/itsrachelfish)
-- Tharyrok
-- [cjhaas](https://github.com/cjhaas)
-- [istiak-tridip](https://github.com/istiak-tridip)
-- [Anna Filina](https://github.com/afilina)
\ No newline at end of file
diff --git a/securemail/vendor/phpseclib/phpseclib/LICENSE b/securemail/vendor/phpseclib/phpseclib/LICENSE
index e7214ebb..a8ec8ebd 100644
--- a/securemail/vendor/phpseclib/phpseclib/LICENSE
+++ b/securemail/vendor/phpseclib/phpseclib/LICENSE
@@ -1,4 +1,5 @@
-Copyright (c) 2011-2019 TerraFrost and other contributors
+Copyright 2007-2016 TerraFrost and other contributors
+http://phpseclib.sourceforge.net/
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -17,4 +18,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/securemail/vendor/phpseclib/phpseclib/README.md b/securemail/vendor/phpseclib/phpseclib/README.md
index 37cbcb9d..a6bde111 100644
--- a/securemail/vendor/phpseclib/phpseclib/README.md
+++ b/securemail/vendor/phpseclib/phpseclib/README.md
@@ -1,61 +1,22 @@
 # phpseclib - PHP Secure Communications Library
 
-[![CI Status](https://github.com/phpseclib/phpseclib/actions/workflows/ci.yml/badge.svg?branch=3.0&event=push "CI Status")](https://github.com/phpseclib/phpseclib)
+[![Build Status](https://travis-ci.org/phpseclib/phpseclib.svg?branch=2.0)](https://travis-ci.org/phpseclib/phpseclib)
 
-## Supporting phpseclib
-
-- [Become a backer or sponsor on Patreon](https://www.patreon.com/phpseclib)
-- [One-time donation via PayPal or crypto-currencies](http://sourceforge.net/donate/index.php?group_id=198487)
-- [Subscribe to Tidelift](https://tidelift.com/subscription/pkg/packagist-phpseclib-phpseclib?utm_source=packagist-phpseclib-phpseclib&utm_medium=referral&utm_campaign=readme)
-
-## Introduction
-
-MIT-licensed pure-PHP implementations of the following:
-
-SSH-2, SFTP, X.509, an arbitrary-precision integer arithmetic library, Ed25519 / Ed449 / Curve25519 / Curve449, ECDSA / ECDH (with support for 66 curves), RSA (PKCS#1 v2.2 compliant), DSA / DH, DES / 3DES / RC4 / Rijndael / AES / Blowfish / Twofish / Salsa20 / ChaCha20, GCM / Poly1305
+MIT-licensed pure-PHP implementations of an arbitrary-precision integer
+arithmetic library, fully PKCS#1 (v2.1) compliant RSA, DES, 3DES, RC4, Rijndael,
+AES, Blowfish, Twofish, SSH-1, SSH-2, SFTP, and X.509
 
+* [Download (1.0.4)](http://sourceforge.net/projects/phpseclib/files/phpseclib1.0.4.zip/download)
 * [Browse Git](https://github.com/phpseclib/phpseclib)
+* [Code Coverage Report](http://phpseclib.bantux.org/code_coverage/2.0/latest/)
+
+<img src="http://phpseclib.sourceforge.net/pear-icon.png" alt="PEAR Channel" width="16" height="16">
+PEAR Channel: [phpseclib.sourceforge.net](http://phpseclib.sourceforge.net/pear.htm)
 
 ## Documentation
 
-* [Documentation / Manual](https://phpseclib.com/)
-* [API Documentation](https://api.phpseclib.com/3.0/) (generated by Doctum)
-
-## Branches
-
-### master
-
-* Development Branch
-* Unstable API
-* Do not use in production
-
-### 3.0
-
-* Long term support (LTS) release
-* Major expansion of cryptographic primitives
-* Minimum PHP version: 5.6.1
-* PSR-4 autoloading with namespace rooted at `\phpseclib3`
-* Install via Composer: `composer require phpseclib/phpseclib:~3.0`
-
-### 2.0
-
-* Long term support (LTS) release
-* Modernized version of 1.0
-* Minimum PHP version: 5.3.3
-* PSR-4 autoloading with namespace rooted at `\phpseclib`
-* Install via Composer: `composer require phpseclib/phpseclib:~2.0`
-
-### 1.0
-
-* Long term support (LTS) release
-* PHP4 compatible
-* Composer compatible (PSR-0 autoloading)
-* Install using Composer: `composer require phpseclib/phpseclib:~1.0`
-* [Download 1.0.23 as ZIP](http://sourceforge.net/projects/phpseclib/files/phpseclib1.0.23.zip/download)
-
-## Security contact information
-
-To report a security vulnerability, please use the [Tidelift security contact](https://tidelift.com/security). Tidelift will coordinate the fix and disclosure.
+* [Documentation / Manual](http://phpseclib.sourceforge.net/)
+* [API Documentation](http://phpseclib.bantux.org/api/2.0/) (generated by Sami)
 
 ## Support
 
@@ -65,33 +26,40 @@ Need Support?
 * [Create a Support Ticket on GitHub](https://github.com/phpseclib/phpseclib/issues/new)
 * [Browse the Support Forum](http://www.frostjedi.com/phpbb/viewforum.php?f=46) (no longer in use)
 
-## Special Thanks
+## Installing Development Dependencies
 
-Special Thanks to our $50+ sponsors!:
+Dependencies are managed via Composer.
 
-- Allan Simon
-- [ChargeOver](https://chargeover.com/)
+1. Download the [`composer.phar`](https://getcomposer.org/composer.phar) executable as per the
+   [Composer Download Instructions](https://getcomposer.org/download/), e.g. by running
+
+    ``` sh
+    curl -sS https://getcomposer.org/installer | php
+    ```
+
+2. Install Dependencies
+
+    ``` sh
+    php composer.phar install
+    ```
 
 ## Contributing
 
 1. Fork the Project
 
-2. Ensure you have Composer installed (see [Composer Download Instructions](https://getcomposer.org/download/))
+2. Install Development Dependencies
 
-3. Install Development Dependencies
-    ```sh
-    composer install
+3. Create a Feature Branch
+
+4. (Recommended) Run the Test Suite
+
+    ``` sh
+    vendor/bin/phpunit
+    ```
+5. (Recommended) Check whether your code conforms to our Coding Standards by running
+
+    ``` sh
+    vendor/bin/phing -f build/build.xml sniff
     ```
 
-4. Create a Feature Branch
-
-5. Run continuous integration checks:
-   ```sh
-   composer global require php:^8.1 squizlabs/php_codesniffer friendsofphp/php-cs-fixer vimeo/psalm
-   phpcs --standard=build/php_codesniffer.xml
-   php-cs-fixer fix --config=build/php-cs-fixer.php --diff --dry-run --using-cache=no
-   psalm --config=build/psalm.xml --no-cache --long-progress --report-show-info=false --output-format=text
-   vendor/bin/phpunit --verbose --configuration tests/phpunit.xml
-   ```
-   
 6. Send us a Pull Request
diff --git a/securemail/vendor/phpseclib/phpseclib/composer.json b/securemail/vendor/phpseclib/phpseclib/composer.json
index 5052d5fb..4b84b110 100644
--- a/securemail/vendor/phpseclib/phpseclib/composer.json
+++ b/securemail/vendor/phpseclib/phpseclib/composer.json
@@ -51,34 +51,26 @@
         }
     ],
     "require": {
-        "php": ">=5.6.1",
-        "paragonie/constant_time_encoding": "^1|^2",
-        "paragonie/random_compat": "^1.4|^2.0|^9.99.99"
+        "php": ">=5.3.3"
     },
     "require-dev": {
-        "phpunit/phpunit": "*"
+        "phing/phing": "~2.7",
+        "phpunit/phpunit": "~4.0",
+        "sami/sami": "~2.0",
+        "squizlabs/php_codesniffer": "~2.0"
     },
     "suggest": {
         "ext-libsodium": "SSH2/SFTP can make use of some algorithms provided by the libsodium-php extension.",
         "ext-openssl": "Install the OpenSSL extension in order to speed up a wide variety of cryptographic operations.",
         "ext-mcrypt": "Install the Mcrypt extension in order to speed up a few other cryptographic operations.",
-        "ext-gmp": "Install the GMP (GNU Multiple Precision) extension in order to speed up arbitrary precision integer arithmetic operations.",
-        "ext-dom": "Install the DOM extension to load XML formatted public keys."
+        "ext-gmp": "Install the GMP (GNU Multiple Precision) extension in order to speed up arbitrary precision integer arithmetic operations."
     },
     "autoload": {
         "files": [
             "phpseclib/bootstrap.php"
         ],
         "psr-4": {
-            "phpseclib3\\": "phpseclib/"
+            "phpseclib\\": "phpseclib/"
         }
-    },
-    "autoload-dev": {
-        "psr-4": {
-            "phpseclib3\\Tests\\": "tests/"
-        }
-    },
-    "config": {
-        "sort-packages": true
     }
 }
diff --git a/securemail/vendor/phpseclib/phpseclib/composer.lock b/securemail/vendor/phpseclib/phpseclib/composer.lock
new file mode 100644
index 00000000..beda2d64
--- /dev/null
+++ b/securemail/vendor/phpseclib/phpseclib/composer.lock
@@ -0,0 +1,1819 @@
+{
+    "_readme": [
+        "This file locks the dependencies of your project to a known state",
+        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
+        "This file is @generated automatically"
+    ],
+    "hash": "8599992bf6058a9da82372eb8bcae2c2",
+    "content-hash": "fde47c84178c55c06de858a2128e3d07",
+    "packages": [],
+    "packages-dev": [
+        {
+            "name": "doctrine/instantiator",
+            "version": "1.0.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/doctrine/instantiator.git",
+                "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/8e884e78f9f0eb1329e445619e04456e64d8051d",
+                "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3,<8.0-DEV"
+            },
+            "require-dev": {
+                "athletic/athletic": "~0.1.8",
+                "ext-pdo": "*",
+                "ext-phar": "*",
+                "phpunit/phpunit": "~4.0",
+                "squizlabs/php_codesniffer": "~2.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Marco Pivetta",
+                    "email": "ocramius@gmail.com",
+                    "homepage": "http://ocramius.github.com/"
+                }
+            ],
+            "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
+            "homepage": "https://github.com/doctrine/instantiator",
+            "keywords": [
+                "constructor",
+                "instantiate"
+            ],
+            "time": "2015-06-14 21:17:01"
+        },
+        {
+            "name": "michelf/php-markdown",
+            "version": "1.6.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/michelf/php-markdown.git",
+                "reference": "156e56ee036505ec637d761ee62dc425d807183c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/michelf/php-markdown/zipball/156e56ee036505ec637d761ee62dc425d807183c",
+                "reference": "156e56ee036505ec637d761ee62dc425d807183c",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-lib": "1.4.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Michelf": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Michel Fortin",
+                    "email": "michel.fortin@michelf.ca",
+                    "homepage": "https://michelf.ca/",
+                    "role": "Developer"
+                },
+                {
+                    "name": "John Gruber",
+                    "homepage": "https://daringfireball.net/"
+                }
+            ],
+            "description": "PHP Markdown",
+            "homepage": "https://michelf.ca/projects/php-markdown/",
+            "keywords": [
+                "markdown"
+            ],
+            "time": "2015-12-24 01:37:31"
+        },
+        {
+            "name": "nikic/php-parser",
+            "version": "v0.9.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/nikic/PHP-Parser.git",
+                "reference": "ef70767475434bdb3615b43c327e2cae17ef12eb"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/ef70767475434bdb3615b43c327e2cae17ef12eb",
+                "reference": "ef70767475434bdb3615b43c327e2cae17ef12eb",
+                "shasum": ""
+            },
+            "require": {
+                "ext-tokenizer": "*",
+                "php": ">=5.2"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "0.9-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "PHPParser": "lib/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Nikita Popov"
+                }
+            ],
+            "description": "A PHP parser written in PHP",
+            "keywords": [
+                "parser",
+                "php"
+            ],
+            "time": "2014-07-23 18:24:17"
+        },
+        {
+            "name": "phing/phing",
+            "version": "2.14.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phingofficial/phing.git",
+                "reference": "7dd73c83c377623def54b58121f46b4dcb35dd61"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phingofficial/phing/zipball/7dd73c83c377623def54b58121f46b4dcb35dd61",
+                "reference": "7dd73c83c377623def54b58121f46b4dcb35dd61",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.2.0"
+            },
+            "require-dev": {
+                "ext-pdo_sqlite": "*",
+                "lastcraft/simpletest": "@dev",
+                "mikey179/vfsstream": "^1.6",
+                "pdepend/pdepend": "2.x",
+                "pear/archive_tar": "1.4.x",
+                "pear/http_request2": "dev-trunk",
+                "pear/net_growl": "dev-trunk",
+                "pear/pear-core-minimal": "1.10.1",
+                "pear/versioncontrol_git": "@dev",
+                "pear/versioncontrol_svn": "~0.5",
+                "phpdocumentor/phpdocumentor": "2.x",
+                "phploc/phploc": "~2.0.6",
+                "phpmd/phpmd": "~2.2",
+                "phpunit/phpunit": ">=3.7",
+                "sebastian/git": "~1.0",
+                "sebastian/phpcpd": "2.x",
+                "squizlabs/php_codesniffer": "~2.2",
+                "symfony/yaml": "~2.7"
+            },
+            "suggest": {
+                "pdepend/pdepend": "PHP version of JDepend",
+                "pear/archive_tar": "Tar file management class",
+                "pear/versioncontrol_git": "A library that provides OO interface to handle Git repository",
+                "pear/versioncontrol_svn": "A simple OO-style interface for Subversion, the free/open-source version control system",
+                "phpdocumentor/phpdocumentor": "Documentation Generator for PHP",
+                "phploc/phploc": "A tool for quickly measuring the size of a PHP project",
+                "phpmd/phpmd": "PHP version of PMD tool",
+                "phpunit/php-code-coverage": "Library that provides collection, processing, and rendering functionality for PHP code coverage information",
+                "phpunit/phpunit": "The PHP Unit Testing Framework",
+                "sebastian/phpcpd": "Copy/Paste Detector (CPD) for PHP code",
+                "tedivm/jshrink": "Javascript Minifier built in PHP"
+            },
+            "bin": [
+                "bin/phing"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.14.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "classes/phing/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "include-path": [
+                "classes"
+            ],
+            "license": [
+                "LGPL-3.0"
+            ],
+            "authors": [
+                {
+                    "name": "Michiel Rook",
+                    "email": "mrook@php.net"
+                },
+                {
+                    "name": "Phing Community",
+                    "homepage": "https://www.phing.info/trac/wiki/Development/Contributors"
+                }
+            ],
+            "description": "PHing Is Not GNU make; it's a PHP project build system or build tool based on Apache Ant.",
+            "homepage": "https://www.phing.info/",
+            "keywords": [
+                "build",
+                "phing",
+                "task",
+                "tool"
+            ],
+            "time": "2016-03-10 21:39:23"
+        },
+        {
+            "name": "phpdocumentor/reflection-common",
+            "version": "1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpDocumentor/ReflectionCommon.git",
+                "reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/144c307535e82c8fdcaacbcfc1d6d8eeb896687c",
+                "reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.5"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.6"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "phpDocumentor\\Reflection\\": [
+                        "src"
+                    ]
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jaap van Otterdijk",
+                    "email": "opensource@ijaap.nl"
+                }
+            ],
+            "description": "Common reflection classes used by phpdocumentor to reflect the code structure",
+            "homepage": "http://www.phpdoc.org",
+            "keywords": [
+                "FQSEN",
+                "phpDocumentor",
+                "phpdoc",
+                "reflection",
+                "static analysis"
+            ],
+            "time": "2015-12-27 11:43:31"
+        },
+        {
+            "name": "phpdocumentor/reflection-docblock",
+            "version": "3.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
+                "reference": "9270140b940ff02e58ec577c237274e92cd40cdd"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/9270140b940ff02e58ec577c237274e92cd40cdd",
+                "reference": "9270140b940ff02e58ec577c237274e92cd40cdd",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.5",
+                "phpdocumentor/reflection-common": "^1.0@dev",
+                "phpdocumentor/type-resolver": "^0.2.0",
+                "webmozart/assert": "^1.0"
+            },
+            "require-dev": {
+                "mockery/mockery": "^0.9.4",
+                "phpunit/phpunit": "^4.4"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "phpDocumentor\\Reflection\\": [
+                        "src/"
+                    ]
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Mike van Riel",
+                    "email": "me@mikevanriel.com"
+                }
+            ],
+            "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
+            "time": "2016-06-10 09:48:41"
+        },
+        {
+            "name": "phpdocumentor/type-resolver",
+            "version": "0.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpDocumentor/TypeResolver.git",
+                "reference": "b39c7a5b194f9ed7bd0dd345c751007a41862443"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/b39c7a5b194f9ed7bd0dd345c751007a41862443",
+                "reference": "b39c7a5b194f9ed7bd0dd345c751007a41862443",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.5",
+                "phpdocumentor/reflection-common": "^1.0"
+            },
+            "require-dev": {
+                "mockery/mockery": "^0.9.4",
+                "phpunit/phpunit": "^5.2||^4.8.24"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "phpDocumentor\\Reflection\\": [
+                        "src/"
+                    ]
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Mike van Riel",
+                    "email": "me@mikevanriel.com"
+                }
+            ],
+            "time": "2016-06-10 07:14:17"
+        },
+        {
+            "name": "phpspec/prophecy",
+            "version": "v1.6.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phpspec/prophecy.git",
+                "reference": "58a8137754bc24b25740d4281399a4a3596058e0"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/58a8137754bc24b25740d4281399a4a3596058e0",
+                "reference": "58a8137754bc24b25740d4281399a4a3596058e0",
+                "shasum": ""
+            },
+            "require": {
+                "doctrine/instantiator": "^1.0.2",
+                "php": "^5.3|^7.0",
+                "phpdocumentor/reflection-docblock": "^2.0|^3.0.2",
+                "sebastian/comparator": "^1.1",
+                "sebastian/recursion-context": "^1.0"
+            },
+            "require-dev": {
+                "phpspec/phpspec": "^2.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.6.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Prophecy\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Konstantin Kudryashov",
+                    "email": "ever.zet@gmail.com",
+                    "homepage": "http://everzet.com"
+                },
+                {
+                    "name": "Marcello Duarte",
+                    "email": "marcello.duarte@gmail.com"
+                }
+            ],
+            "description": "Highly opinionated mocking framework for PHP 5.3+",
+            "homepage": "https://github.com/phpspec/prophecy",
+            "keywords": [
+                "Double",
+                "Dummy",
+                "fake",
+                "mock",
+                "spy",
+                "stub"
+            ],
+            "time": "2016-06-07 08:13:47"
+        },
+        {
+            "name": "phpunit/php-code-coverage",
+            "version": "2.2.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
+                "reference": "eabf68b476ac7d0f73793aada060f1c1a9bf8979"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/eabf68b476ac7d0f73793aada060f1c1a9bf8979",
+                "reference": "eabf68b476ac7d0f73793aada060f1c1a9bf8979",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3",
+                "phpunit/php-file-iterator": "~1.3",
+                "phpunit/php-text-template": "~1.2",
+                "phpunit/php-token-stream": "~1.3",
+                "sebastian/environment": "^1.3.2",
+                "sebastian/version": "~1.0"
+            },
+            "require-dev": {
+                "ext-xdebug": ">=2.1.4",
+                "phpunit/phpunit": "~4"
+            },
+            "suggest": {
+                "ext-dom": "*",
+                "ext-xdebug": ">=2.2.1",
+                "ext-xmlwriter": "*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.2.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.",
+            "homepage": "https://github.com/sebastianbergmann/php-code-coverage",
+            "keywords": [
+                "coverage",
+                "testing",
+                "xunit"
+            ],
+            "time": "2015-10-06 15:47:00"
+        },
+        {
+            "name": "phpunit/php-file-iterator",
+            "version": "1.4.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
+                "reference": "6150bf2c35d3fc379e50c7602b75caceaa39dbf0"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/6150bf2c35d3fc379e50c7602b75caceaa39dbf0",
+                "reference": "6150bf2c35d3fc379e50c7602b75caceaa39dbf0",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.4.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "FilterIterator implementation that filters files based on a list of suffixes.",
+            "homepage": "https://github.com/sebastianbergmann/php-file-iterator/",
+            "keywords": [
+                "filesystem",
+                "iterator"
+            ],
+            "time": "2015-06-21 13:08:43"
+        },
+        {
+            "name": "phpunit/php-text-template",
+            "version": "1.2.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-text-template.git",
+                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
+                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Simple template engine.",
+            "homepage": "https://github.com/sebastianbergmann/php-text-template/",
+            "keywords": [
+                "template"
+            ],
+            "time": "2015-06-21 13:50:34"
+        },
+        {
+            "name": "phpunit/php-timer",
+            "version": "1.0.8",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-timer.git",
+                "reference": "38e9124049cf1a164f1e4537caf19c99bf1eb260"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/38e9124049cf1a164f1e4537caf19c99bf1eb260",
+                "reference": "38e9124049cf1a164f1e4537caf19c99bf1eb260",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4|~5"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Utility class for timing",
+            "homepage": "https://github.com/sebastianbergmann/php-timer/",
+            "keywords": [
+                "timer"
+            ],
+            "time": "2016-05-12 18:03:57"
+        },
+        {
+            "name": "phpunit/php-token-stream",
+            "version": "1.4.8",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-token-stream.git",
+                "reference": "3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da",
+                "reference": "3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da",
+                "shasum": ""
+            },
+            "require": {
+                "ext-tokenizer": "*",
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.2"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.4-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Wrapper around PHP's tokenizer extension.",
+            "homepage": "https://github.com/sebastianbergmann/php-token-stream/",
+            "keywords": [
+                "tokenizer"
+            ],
+            "time": "2015-09-15 10:49:45"
+        },
+        {
+            "name": "phpunit/phpunit",
+            "version": "4.8.26",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/phpunit.git",
+                "reference": "fc1d8cd5b5de11625979125c5639347896ac2c74"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/fc1d8cd5b5de11625979125c5639347896ac2c74",
+                "reference": "fc1d8cd5b5de11625979125c5639347896ac2c74",
+                "shasum": ""
+            },
+            "require": {
+                "ext-dom": "*",
+                "ext-json": "*",
+                "ext-pcre": "*",
+                "ext-reflection": "*",
+                "ext-spl": "*",
+                "php": ">=5.3.3",
+                "phpspec/prophecy": "^1.3.1",
+                "phpunit/php-code-coverage": "~2.1",
+                "phpunit/php-file-iterator": "~1.4",
+                "phpunit/php-text-template": "~1.2",
+                "phpunit/php-timer": "^1.0.6",
+                "phpunit/phpunit-mock-objects": "~2.3",
+                "sebastian/comparator": "~1.1",
+                "sebastian/diff": "~1.2",
+                "sebastian/environment": "~1.3",
+                "sebastian/exporter": "~1.2",
+                "sebastian/global-state": "~1.0",
+                "sebastian/version": "~1.0",
+                "symfony/yaml": "~2.1|~3.0"
+            },
+            "suggest": {
+                "phpunit/php-invoker": "~1.1"
+            },
+            "bin": [
+                "phpunit"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.8.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "The PHP Unit Testing framework.",
+            "homepage": "https://phpunit.de/",
+            "keywords": [
+                "phpunit",
+                "testing",
+                "xunit"
+            ],
+            "time": "2016-05-17 03:09:28"
+        },
+        {
+            "name": "phpunit/phpunit-mock-objects",
+            "version": "2.3.8",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
+                "reference": "ac8e7a3db35738d56ee9a76e78a4e03d97628983"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/ac8e7a3db35738d56ee9a76e78a4e03d97628983",
+                "reference": "ac8e7a3db35738d56ee9a76e78a4e03d97628983",
+                "shasum": ""
+            },
+            "require": {
+                "doctrine/instantiator": "^1.0.2",
+                "php": ">=5.3.3",
+                "phpunit/php-text-template": "~1.2",
+                "sebastian/exporter": "~1.2"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.4"
+            },
+            "suggest": {
+                "ext-soap": "*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.3.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sb@sebastian-bergmann.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Mock Object library for PHPUnit",
+            "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/",
+            "keywords": [
+                "mock",
+                "xunit"
+            ],
+            "time": "2015-10-02 06:51:40"
+        },
+        {
+            "name": "pimple/pimple",
+            "version": "v2.1.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/silexphp/Pimple.git",
+                "reference": "ea22fb2880faf7b7b0e17c9809c6fe25b071fd76"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/silexphp/Pimple/zipball/ea22fb2880faf7b7b0e17c9809c6fe25b071fd76",
+                "reference": "ea22fb2880faf7b7b0e17c9809c6fe25b071fd76",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.1.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Pimple": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                }
+            ],
+            "description": "Pimple is a simple Dependency Injection Container for PHP 5.3",
+            "homepage": "http://pimple.sensiolabs.org",
+            "keywords": [
+                "container",
+                "dependency injection"
+            ],
+            "time": "2014-07-24 07:10:08"
+        },
+        {
+            "name": "sami/sami",
+            "version": "v2.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/FriendsOfPHP/Sami.git",
+                "reference": "fa58b324f41aa2aefe21dac4f22d8c98965fc012"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/FriendsOfPHP/Sami/zipball/fa58b324f41aa2aefe21dac4f22d8c98965fc012",
+                "reference": "fa58b324f41aa2aefe21dac4f22d8c98965fc012",
+                "shasum": ""
+            },
+            "require": {
+                "michelf/php-markdown": "~1.3",
+                "nikic/php-parser": "0.9.*",
+                "php": ">=5.3.0",
+                "pimple/pimple": "2.*",
+                "symfony/console": "~2.1",
+                "symfony/filesystem": "~2.1",
+                "symfony/finder": "~2.1",
+                "symfony/process": "~2.1",
+                "symfony/yaml": "~2.1",
+                "twig/twig": "1.*"
+            },
+            "bin": [
+                "sami.php"
+            ],
+            "type": "application",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Sami": "."
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                }
+            ],
+            "description": "Sami, an API documentation generator",
+            "homepage": "http://sami.sensiolabs.org",
+            "keywords": [
+                "phpdoc"
+            ],
+            "time": "2014-06-25 12:05:18"
+        },
+        {
+            "name": "sebastian/comparator",
+            "version": "1.2.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/comparator.git",
+                "reference": "937efb279bd37a375bcadf584dec0726f84dbf22"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/937efb279bd37a375bcadf584dec0726f84dbf22",
+                "reference": "937efb279bd37a375bcadf584dec0726f84dbf22",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3",
+                "sebastian/diff": "~1.2",
+                "sebastian/exporter": "~1.2"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.4"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.2.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Jeff Welch",
+                    "email": "whatthejeff@gmail.com"
+                },
+                {
+                    "name": "Volker Dusch",
+                    "email": "github@wallbash.com"
+                },
+                {
+                    "name": "Bernhard Schussek",
+                    "email": "bschussek@2bepublished.at"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Provides the functionality to compare PHP values for equality",
+            "homepage": "http://www.github.com/sebastianbergmann/comparator",
+            "keywords": [
+                "comparator",
+                "compare",
+                "equality"
+            ],
+            "time": "2015-07-26 15:48:44"
+        },
+        {
+            "name": "sebastian/diff",
+            "version": "1.4.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/diff.git",
+                "reference": "13edfd8706462032c2f52b4b862974dd46b71c9e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/13edfd8706462032c2f52b4b862974dd46b71c9e",
+                "reference": "13edfd8706462032c2f52b4b862974dd46b71c9e",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.8"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.4-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Kore Nordmann",
+                    "email": "mail@kore-nordmann.de"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Diff implementation",
+            "homepage": "https://github.com/sebastianbergmann/diff",
+            "keywords": [
+                "diff"
+            ],
+            "time": "2015-12-08 07:14:41"
+        },
+        {
+            "name": "sebastian/environment",
+            "version": "1.3.7",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/environment.git",
+                "reference": "4e8f0da10ac5802913afc151413bc8c53b6c2716"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/4e8f0da10ac5802913afc151413bc8c53b6c2716",
+                "reference": "4e8f0da10ac5802913afc151413bc8c53b6c2716",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.4"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.3.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Provides functionality to handle HHVM/PHP environments",
+            "homepage": "http://www.github.com/sebastianbergmann/environment",
+            "keywords": [
+                "Xdebug",
+                "environment",
+                "hhvm"
+            ],
+            "time": "2016-05-17 03:18:57"
+        },
+        {
+            "name": "sebastian/exporter",
+            "version": "1.2.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/exporter.git",
+                "reference": "42c4c2eec485ee3e159ec9884f95b431287edde4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/42c4c2eec485ee3e159ec9884f95b431287edde4",
+                "reference": "42c4c2eec485ee3e159ec9884f95b431287edde4",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3",
+                "sebastian/recursion-context": "~1.0"
+            },
+            "require-dev": {
+                "ext-mbstring": "*",
+                "phpunit/phpunit": "~4.4"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.3.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Jeff Welch",
+                    "email": "whatthejeff@gmail.com"
+                },
+                {
+                    "name": "Volker Dusch",
+                    "email": "github@wallbash.com"
+                },
+                {
+                    "name": "Bernhard Schussek",
+                    "email": "bschussek@2bepublished.at"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                },
+                {
+                    "name": "Adam Harvey",
+                    "email": "aharvey@php.net"
+                }
+            ],
+            "description": "Provides the functionality to export PHP variables for visualization",
+            "homepage": "http://www.github.com/sebastianbergmann/exporter",
+            "keywords": [
+                "export",
+                "exporter"
+            ],
+            "time": "2016-06-17 09:04:28"
+        },
+        {
+            "name": "sebastian/global-state",
+            "version": "1.1.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/global-state.git",
+                "reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bc37d50fea7d017d3d340f230811c9f1d7280af4",
+                "reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.2"
+            },
+            "suggest": {
+                "ext-uopz": "*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Snapshotting of global state",
+            "homepage": "http://www.github.com/sebastianbergmann/global-state",
+            "keywords": [
+                "global state"
+            ],
+            "time": "2015-10-12 03:26:01"
+        },
+        {
+            "name": "sebastian/recursion-context",
+            "version": "1.0.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/recursion-context.git",
+                "reference": "913401df809e99e4f47b27cdd781f4a258d58791"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/913401df809e99e4f47b27cdd781f4a258d58791",
+                "reference": "913401df809e99e4f47b27cdd781f4a258d58791",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.4"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Jeff Welch",
+                    "email": "whatthejeff@gmail.com"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                },
+                {
+                    "name": "Adam Harvey",
+                    "email": "aharvey@php.net"
+                }
+            ],
+            "description": "Provides functionality to recursively process PHP variables",
+            "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
+            "time": "2015-11-11 19:50:13"
+        },
+        {
+            "name": "sebastian/version",
+            "version": "1.0.6",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/version.git",
+                "reference": "58b3a85e7999757d6ad81c787a1fbf5ff6c628c6"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/58b3a85e7999757d6ad81c787a1fbf5ff6c628c6",
+                "reference": "58b3a85e7999757d6ad81c787a1fbf5ff6c628c6",
+                "shasum": ""
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Library that helps with managing the version number of Git-hosted PHP projects",
+            "homepage": "https://github.com/sebastianbergmann/version",
+            "time": "2015-06-21 13:59:46"
+        },
+        {
+            "name": "squizlabs/php_codesniffer",
+            "version": "2.6.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/squizlabs/PHP_CodeSniffer.git",
+                "reference": "fb72ed32f8418db5e7770be1653e62e0d6f5dd3d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/squizlabs/PHP_CodeSniffer/zipball/fb72ed32f8418db5e7770be1653e62e0d6f5dd3d",
+                "reference": "fb72ed32f8418db5e7770be1653e62e0d6f5dd3d",
+                "shasum": ""
+            },
+            "require": {
+                "ext-simplexml": "*",
+                "ext-tokenizer": "*",
+                "ext-xmlwriter": "*",
+                "php": ">=5.1.2"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "~4.0"
+            },
+            "bin": [
+                "scripts/phpcs",
+                "scripts/phpcbf"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "CodeSniffer.php",
+                    "CodeSniffer/CLI.php",
+                    "CodeSniffer/Exception.php",
+                    "CodeSniffer/File.php",
+                    "CodeSniffer/Fixer.php",
+                    "CodeSniffer/Report.php",
+                    "CodeSniffer/Reporting.php",
+                    "CodeSniffer/Sniff.php",
+                    "CodeSniffer/Tokens.php",
+                    "CodeSniffer/Reports/",
+                    "CodeSniffer/Tokenizers/",
+                    "CodeSniffer/DocGenerators/",
+                    "CodeSniffer/Standards/AbstractPatternSniff.php",
+                    "CodeSniffer/Standards/AbstractScopeSniff.php",
+                    "CodeSniffer/Standards/AbstractVariableSniff.php",
+                    "CodeSniffer/Standards/IncorrectPatternException.php",
+                    "CodeSniffer/Standards/Generic/Sniffs/",
+                    "CodeSniffer/Standards/MySource/Sniffs/",
+                    "CodeSniffer/Standards/PEAR/Sniffs/",
+                    "CodeSniffer/Standards/PSR1/Sniffs/",
+                    "CodeSniffer/Standards/PSR2/Sniffs/",
+                    "CodeSniffer/Standards/Squiz/Sniffs/",
+                    "CodeSniffer/Standards/Zend/Sniffs/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Greg Sherwood",
+                    "role": "lead"
+                }
+            ],
+            "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.",
+            "homepage": "http://www.squizlabs.com/php-codesniffer",
+            "keywords": [
+                "phpcs",
+                "standards"
+            ],
+            "time": "2016-05-30 22:24:32"
+        },
+        {
+            "name": "symfony/console",
+            "version": "v2.8.7",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/console.git",
+                "reference": "5ac8bc9aa77bb2edf06af3a1bb6bc1020d23acd3"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/console/zipball/5ac8bc9aa77bb2edf06af3a1bb6bc1020d23acd3",
+                "reference": "5ac8bc9aa77bb2edf06af3a1bb6bc1020d23acd3",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.9",
+                "symfony/polyfill-mbstring": "~1.0"
+            },
+            "require-dev": {
+                "psr/log": "~1.0",
+                "symfony/event-dispatcher": "~2.1|~3.0.0",
+                "symfony/process": "~2.1|~3.0.0"
+            },
+            "suggest": {
+                "psr/log": "For using the console logger",
+                "symfony/event-dispatcher": "",
+                "symfony/process": ""
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.8-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Console\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony Console Component",
+            "homepage": "https://symfony.com",
+            "time": "2016-06-06 15:06:25"
+        },
+        {
+            "name": "symfony/filesystem",
+            "version": "v2.8.7",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/filesystem.git",
+                "reference": "dee379131dceed90a429e951546b33edfe7dccbb"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/dee379131dceed90a429e951546b33edfe7dccbb",
+                "reference": "dee379131dceed90a429e951546b33edfe7dccbb",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.9"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.8-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Filesystem\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony Filesystem Component",
+            "homepage": "https://symfony.com",
+            "time": "2016-04-12 18:01:21"
+        },
+        {
+            "name": "symfony/finder",
+            "version": "v2.8.7",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/finder.git",
+                "reference": "3ec095fab1800222732ca522a95dce8fa124007b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/3ec095fab1800222732ca522a95dce8fa124007b",
+                "reference": "3ec095fab1800222732ca522a95dce8fa124007b",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.9"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.8-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Finder\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony Finder Component",
+            "homepage": "https://symfony.com",
+            "time": "2016-06-06 11:11:27"
+        },
+        {
+            "name": "symfony/polyfill-mbstring",
+            "version": "v1.2.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-mbstring.git",
+                "reference": "dff51f72b0706335131b00a7f49606168c582594"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/dff51f72b0706335131b00a7f49606168c582594",
+                "reference": "dff51f72b0706335131b00a7f49606168c582594",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "suggest": {
+                "ext-mbstring": "For best performance"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.2-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Polyfill\\Mbstring\\": ""
+                },
+                "files": [
+                    "bootstrap.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill for the Mbstring extension",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "mbstring",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "time": "2016-05-18 14:26:46"
+        },
+        {
+            "name": "symfony/process",
+            "version": "v2.8.7",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/process.git",
+                "reference": "115347d00c342198cdc52a7bd8bc15b5ab43500c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/process/zipball/115347d00c342198cdc52a7bd8bc15b5ab43500c",
+                "reference": "115347d00c342198cdc52a7bd8bc15b5ab43500c",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.9"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.8-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Process\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony Process Component",
+            "homepage": "https://symfony.com",
+            "time": "2016-06-06 11:11:27"
+        },
+        {
+            "name": "symfony/yaml",
+            "version": "v2.8.7",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/yaml.git",
+                "reference": "815fabf3f48c7d1df345a69d1ad1a88f59757b34"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/815fabf3f48c7d1df345a69d1ad1a88f59757b34",
+                "reference": "815fabf3f48c7d1df345a69d1ad1a88f59757b34",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.9"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.8-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Yaml\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony Yaml Component",
+            "homepage": "https://symfony.com",
+            "time": "2016-06-06 11:11:27"
+        },
+        {
+            "name": "twig/twig",
+            "version": "v1.24.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/twigphp/Twig.git",
+                "reference": "3566d311a92aae4deec6e48682dc5a4528c4a512"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/twigphp/Twig/zipball/3566d311a92aae4deec6e48682dc5a4528c4a512",
+                "reference": "3566d311a92aae4deec6e48682dc5a4528c4a512",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.2.7"
+            },
+            "require-dev": {
+                "symfony/debug": "~2.7",
+                "symfony/phpunit-bridge": "~2.7"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.24-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Twig_": "lib/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com",
+                    "homepage": "http://fabien.potencier.org",
+                    "role": "Lead Developer"
+                },
+                {
+                    "name": "Armin Ronacher",
+                    "email": "armin.ronacher@active-4.com",
+                    "role": "Project Founder"
+                },
+                {
+                    "name": "Twig Team",
+                    "homepage": "http://twig.sensiolabs.org/contributors",
+                    "role": "Contributors"
+                }
+            ],
+            "description": "Twig, the flexible, fast, and secure template language for PHP",
+            "homepage": "http://twig.sensiolabs.org",
+            "keywords": [
+                "templating"
+            ],
+            "time": "2016-05-30 09:11:59"
+        },
+        {
+            "name": "webmozart/assert",
+            "version": "1.0.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/webmozart/assert.git",
+                "reference": "30eed06dd6bc88410a4ff7f77b6d22f3ce13dbde"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/webmozart/assert/zipball/30eed06dd6bc88410a4ff7f77b6d22f3ce13dbde",
+                "reference": "30eed06dd6bc88410a4ff7f77b6d22f3ce13dbde",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.6"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Webmozart\\Assert\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Bernhard Schussek",
+                    "email": "bschussek@gmail.com"
+                }
+            ],
+            "description": "Assertions to validate method input/output with nice error messages.",
+            "keywords": [
+                "assert",
+                "check",
+                "validate"
+            ],
+            "time": "2015-08-24 13:29:44"
+        }
+    ],
+    "aliases": [],
+    "minimum-stability": "stable",
+    "stability-flags": [],
+    "prefer-stable": false,
+    "prefer-lowest": false,
+    "platform": {
+        "php": ">=5.3.3"
+    },
+    "platform-dev": []
+}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Common/Functions/Strings.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Common/Functions/Strings.php
deleted file mode 100644
index eac793a6..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Common/Functions/Strings.php
+++ /dev/null
@@ -1,505 +0,0 @@
-<?php
-
-/**
- * Common String Functions
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\Common\Functions;
-
-use ParagonIE\ConstantTime\Base64;
-use ParagonIE\ConstantTime\Base64UrlSafe;
-use ParagonIE\ConstantTime\Hex;
-use phpseclib3\Math\BigInteger;
-use phpseclib3\Math\Common\FiniteField;
-
-/**
- * Common String Functions
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class Strings
-{
-    /**
-     * String Shift
-     *
-     * Inspired by array_shift
-     *
-     * @param string $string
-     * @param int $index
-     * @return string
-     */
-    public static function shift(&$string, $index = 1)
-    {
-        $substr = substr($string, 0, $index);
-        $string = substr($string, $index);
-        return $substr;
-    }
-
-    /**
-     * String Pop
-     *
-     * Inspired by array_pop
-     *
-     * @param string $string
-     * @param int $index
-     * @return string
-     */
-    public static function pop(&$string, $index = 1)
-    {
-        $substr = substr($string, -$index);
-        $string = substr($string, 0, -$index);
-        return $substr;
-    }
-
-    /**
-     * Parse SSH2-style string
-     *
-     * Returns either an array or a boolean if $data is malformed.
-     *
-     * Valid characters for $format are as follows:
-     *
-     * C = byte
-     * b = boolean (true/false)
-     * N = uint32
-     * Q = uint64
-     * s = string
-     * i = mpint
-     * L = name-list
-     *
-     * uint64 is not supported.
-     *
-     * @param string $format
-     * @param string $data
-     * @return mixed
-     */
-    public static function unpackSSH2($format, &$data)
-    {
-        $format = self::formatPack($format);
-        $result = [];
-        for ($i = 0; $i < strlen($format); $i++) {
-            switch ($format[$i]) {
-                case 'C':
-                case 'b':
-                    if (!strlen($data)) {
-                        throw new \LengthException('At least one byte needs to be present for successful C / b decodes');
-                    }
-                    break;
-                case 'N':
-                case 'i':
-                case 's':
-                case 'L':
-                    if (strlen($data) < 4) {
-                        throw new \LengthException('At least four byte needs to be present for successful N / i / s / L decodes');
-                    }
-                    break;
-                case 'Q':
-                    if (strlen($data) < 8) {
-                        throw new \LengthException('At least eight byte needs to be present for successful N / i / s / L decodes');
-                    }
-                    break;
-
-                default:
-                    throw new \InvalidArgumentException('$format contains an invalid character');
-            }
-            switch ($format[$i]) {
-                case 'C':
-                    $result[] = ord(self::shift($data));
-                    continue 2;
-                case 'b':
-                    $result[] = ord(self::shift($data)) != 0;
-                    continue 2;
-                case 'N':
-                    list(, $temp) = unpack('N', self::shift($data, 4));
-                    $result[] = $temp;
-                    continue 2;
-                case 'Q':
-                    // pack() added support for Q in PHP 5.6.3 and PHP 5.6 is phpseclib 3's minimum version
-                    // so in theory we could support this BUT, "64-bit format codes are not available for
-                    // 32-bit versions" and phpseclib works on 32-bit installs. on 32-bit installs
-                    // 64-bit floats can be used to get larger numbers then 32-bit signed ints would allow
-                    // for. sure, you're not gonna get the full precision of 64-bit numbers but just because
-                    // you need > 32-bit precision doesn't mean you need the full 64-bit precision
-                    extract(unpack('Nupper/Nlower', self::shift($data, 8)));
-                    $temp = $upper ? 4294967296 * $upper : 0;
-                    $temp += $lower < 0 ? ($lower & 0x7FFFFFFFF) + 0x80000000 : $lower;
-                    // $temp = hexdec(bin2hex(self::shift($data, 8)));
-                    $result[] = $temp;
-                    continue 2;
-            }
-            list(, $length) = unpack('N', self::shift($data, 4));
-            if (strlen($data) < $length) {
-                throw new \LengthException("$length bytes needed; " . strlen($data) . ' bytes available');
-            }
-            $temp = self::shift($data, $length);
-            switch ($format[$i]) {
-                case 'i':
-                    $result[] = new BigInteger($temp, -256);
-                    break;
-                case 's':
-                    $result[] = $temp;
-                    break;
-                case 'L':
-                    $result[] = explode(',', $temp);
-            }
-        }
-
-        return $result;
-    }
-
-    /**
-     * Create SSH2-style string
-     *
-     * @param string $format
-     * @param string|int|float|array|bool ...$elements
-     * @return string
-     */
-    public static function packSSH2($format, ...$elements)
-    {
-        $format = self::formatPack($format);
-        if (strlen($format) != count($elements)) {
-            throw new \InvalidArgumentException('There must be as many arguments as there are characters in the $format string');
-        }
-        $result = '';
-        for ($i = 0; $i < strlen($format); $i++) {
-            $element = $elements[$i];
-            switch ($format[$i]) {
-                case 'C':
-                    if (!is_int($element)) {
-                        throw new \InvalidArgumentException('Bytes must be represented as an integer between 0 and 255, inclusive.');
-                    }
-                    $result .= pack('C', $element);
-                    break;
-                case 'b':
-                    if (!is_bool($element)) {
-                        throw new \InvalidArgumentException('A boolean parameter was expected.');
-                    }
-                    $result .= $element ? "\1" : "\0";
-                    break;
-                case 'Q':
-                    if (!is_int($element) && !is_float($element)) {
-                        throw new \InvalidArgumentException('An integer was expected.');
-                    }
-                    // 4294967296 == 1 << 32
-                    $result .= pack('NN', $element / 4294967296, $element);
-                    break;
-                case 'N':
-                    if (is_float($element)) {
-                        $element = (int) $element;
-                    }
-                    if (!is_int($element)) {
-                        throw new \InvalidArgumentException('An integer was expected.');
-                    }
-                    $result .= pack('N', $element);
-                    break;
-                case 's':
-                    if (!self::is_stringable($element)) {
-                        throw new \InvalidArgumentException('A string was expected.');
-                    }
-                    $result .= pack('Na*', strlen($element), $element);
-                    break;
-                case 'i':
-                    if (!$element instanceof BigInteger && !$element instanceof FiniteField\Integer) {
-                        throw new \InvalidArgumentException('A phpseclib3\Math\BigInteger or phpseclib3\Math\Common\FiniteField\Integer object was expected.');
-                    }
-                    $element = $element->toBytes(true);
-                    $result .= pack('Na*', strlen($element), $element);
-                    break;
-                case 'L':
-                    if (!is_array($element)) {
-                        throw new \InvalidArgumentException('An array was expected.');
-                    }
-                    $element = implode(',', $element);
-                    $result .= pack('Na*', strlen($element), $element);
-                    break;
-                default:
-                    throw new \InvalidArgumentException('$format contains an invalid character');
-            }
-        }
-        return $result;
-    }
-
-    /**
-     * Expand a pack string
-     *
-     * Converts C5 to CCCCC, for example.
-     *
-     * @param string $format
-     * @return string
-     */
-    private static function formatPack($format)
-    {
-        $parts = preg_split('#(\d+)#', $format, -1, PREG_SPLIT_DELIM_CAPTURE);
-        $format = '';
-        for ($i = 1; $i < count($parts); $i += 2) {
-            $format .= substr($parts[$i - 1], 0, -1) . str_repeat(substr($parts[$i - 1], -1), $parts[$i]);
-        }
-        $format .= $parts[$i - 1];
-
-        return $format;
-    }
-
-    /**
-     * Convert binary data into bits
-     *
-     * bin2hex / hex2bin refer to base-256 encoded data as binary, whilst
-     * decbin / bindec refer to base-2 encoded data as binary. For the purposes
-     * of this function, bin refers to base-256 encoded data whilst bits refers
-     * to base-2 encoded data
-     *
-     * @param string $x
-     * @return string
-     */
-    public static function bits2bin($x)
-    {
-        /*
-        // the pure-PHP approach is faster than the GMP approach
-        if (function_exists('gmp_export')) {
-             return strlen($x) ? gmp_export(gmp_init($x, 2)) : gmp_init(0);
-        }
-        */
-
-        if (preg_match('#[^01]#', $x)) {
-            throw new \RuntimeException('The only valid characters are 0 and 1');
-        }
-
-        if (!defined('PHP_INT_MIN')) {
-            define('PHP_INT_MIN', ~PHP_INT_MAX);
-        }
-
-        $length = strlen($x);
-        if (!$length) {
-            return '';
-        }
-        $block_size = PHP_INT_SIZE << 3;
-        $pad = $block_size - ($length % $block_size);
-        if ($pad != $block_size) {
-            $x = str_repeat('0', $pad) . $x;
-        }
-
-        $parts = str_split($x, $block_size);
-        $str = '';
-        foreach ($parts as $part) {
-            $xor = $part[0] == '1' ? PHP_INT_MIN : 0;
-            $part[0] = '0';
-            $str .= pack(
-                PHP_INT_SIZE == 4 ? 'N' : 'J',
-                $xor ^ eval('return 0b' . $part . ';')
-            );
-        }
-        return ltrim($str, "\0");
-    }
-
-    /**
-     * Convert bits to binary data
-     *
-     * @param string $x
-     * @return string
-     */
-    public static function bin2bits($x, $trim = true)
-    {
-        /*
-        // the pure-PHP approach is slower than the GMP approach BUT
-        // i want to the pure-PHP version to be easily unit tested as well
-        if (function_exists('gmp_import')) {
-            return gmp_strval(gmp_import($x), 2);
-        }
-        */
-
-        $len = strlen($x);
-        $mod = $len % PHP_INT_SIZE;
-        if ($mod) {
-            $x = str_pad($x, $len + PHP_INT_SIZE - $mod, "\0", STR_PAD_LEFT);
-        }
-
-        $bits = '';
-        if (PHP_INT_SIZE == 4) {
-            $digits = unpack('N*', $x);
-            foreach ($digits as $digit) {
-                $bits .= sprintf('%032b', $digit);
-            }
-        } else {
-            $digits = unpack('J*', $x);
-            foreach ($digits as $digit) {
-                $bits .= sprintf('%064b', $digit);
-            }
-        }
-
-        return $trim ? ltrim($bits, '0') : $bits;
-    }
-
-    /**
-     * Switch Endianness Bit Order
-     *
-     * @param string $x
-     * @return string
-     */
-    public static function switchEndianness($x)
-    {
-        $r = '';
-        for ($i = strlen($x) - 1; $i >= 0; $i--) {
-            $b = ord($x[$i]);
-            if (PHP_INT_SIZE === 8) {
-                // 3 operations
-                // from http://graphics.stanford.edu/~seander/bithacks.html#ReverseByteWith64BitsDiv
-                $r .= chr((($b * 0x0202020202) & 0x010884422010) % 1023);
-            } else {
-                // 7 operations
-                // from http://graphics.stanford.edu/~seander/bithacks.html#ReverseByteWith32Bits
-                $p1 = ($b * 0x0802) & 0x22110;
-                $p2 = ($b * 0x8020) & 0x88440;
-                $r .= chr(
-                    (($p1 | $p2) * 0x10101) >> 16
-                );
-            }
-        }
-        return $r;
-    }
-
-    /**
-     * Increment the current string
-     *
-     * @param string $var
-     * @return string
-     */
-    public static function increment_str(&$var)
-    {
-        if (function_exists('sodium_increment')) {
-            $var = strrev($var);
-            sodium_increment($var);
-            $var = strrev($var);
-            return $var;
-        }
-
-        for ($i = 4; $i <= strlen($var); $i += 4) {
-            $temp = substr($var, -$i, 4);
-            switch ($temp) {
-                case "\xFF\xFF\xFF\xFF":
-                    $var = substr_replace($var, "\x00\x00\x00\x00", -$i, 4);
-                    break;
-                case "\x7F\xFF\xFF\xFF":
-                    $var = substr_replace($var, "\x80\x00\x00\x00", -$i, 4);
-                    return $var;
-                default:
-                    $temp = unpack('Nnum', $temp);
-                    $var = substr_replace($var, pack('N', $temp['num'] + 1), -$i, 4);
-                    return $var;
-            }
-        }
-
-        $remainder = strlen($var) % 4;
-
-        if ($remainder == 0) {
-            return $var;
-        }
-
-        $temp = unpack('Nnum', str_pad(substr($var, 0, $remainder), 4, "\0", STR_PAD_LEFT));
-        $temp = substr(pack('N', $temp['num'] + 1), -$remainder);
-        $var = substr_replace($var, $temp, 0, $remainder);
-
-        return $var;
-    }
-
-    /**
-     * Find whether the type of a variable is string (or could be converted to one)
-     *
-     * @param mixed $var
-     * @return bool
-     * @psalm-assert-if-true string|\Stringable $var
-     */
-    public static function is_stringable($var)
-    {
-        return is_string($var) || (is_object($var) && method_exists($var, '__toString'));
-    }
-
-    /**
-     * Constant Time Base64-decoding
-     *
-     * ParagoneIE\ConstantTime doesn't use libsodium if it's available so we'll do so
-     * ourselves. see https://github.com/paragonie/constant_time_encoding/issues/39
-     *
-     * @param string $data
-     * @return string
-     */
-    public static function base64_decode($data)
-    {
-        return function_exists('sodium_base642bin') ?
-            sodium_base642bin($data, SODIUM_BASE64_VARIANT_ORIGINAL_NO_PADDING, '=') :
-            Base64::decode($data);
-    }
-
-    /**
-     * Constant Time Base64-decoding (URL safe)
-     *
-     * @param string $data
-     * @return string
-     */
-    public static function base64url_decode($data)
-    {
-        // return self::base64_decode(str_replace(['-', '_'], ['+', '/'], $data));
-
-        return function_exists('sodium_base642bin') ?
-            sodium_base642bin($data, SODIUM_BASE64_VARIANT_URLSAFE_NO_PADDING, '=') :
-            Base64UrlSafe::decode($data);
-    }
-
-    /**
-     * Constant Time Base64-encoding
-     *
-     * @param string $data
-     * @return string
-     */
-    public static function base64_encode($data)
-    {
-        return function_exists('sodium_bin2base64') ?
-            sodium_bin2base64($data, SODIUM_BASE64_VARIANT_ORIGINAL) :
-            Base64::encode($data);
-    }
-
-    /**
-     * Constant Time Base64-encoding (URL safe)
-     *
-     * @param string $data
-     * @return string
-     */
-    public static function base64url_encode($data)
-    {
-        // return str_replace(['+', '/'], ['-', '_'], self::base64_encode($data));
-
-        return function_exists('sodium_bin2base64') ?
-            sodium_bin2base64($data, SODIUM_BASE64_VARIANT_URLSAFE) :
-            Base64UrlSafe::encode($data);
-    }
-
-    /**
-     * Constant Time Hex Decoder
-     *
-     * @param string $data
-     * @return string
-     */
-    public static function hex2bin($data)
-    {
-        return function_exists('sodium_hex2bin') ?
-            sodium_hex2bin($data) :
-            Hex::decode($data);
-    }
-
-    /**
-     * Constant Time Hex Encoder
-     *
-     * @param string $data
-     * @return string
-     */
-    public static function bin2hex($data)
-    {
-        return function_exists('sodium_bin2hex') ?
-            sodium_bin2hex($data) :
-            Hex::encode($data);
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/AES.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/AES.php
index 40387162..7d8cb8b0 100644
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/AES.php
+++ b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/AES.php
@@ -16,7 +16,7 @@
  * it'll be null-padded to 192-bits and 192 bits will be the key length until {@link self::setKey() setKey()}
  * is called, again, at which point, it'll be recalculated.
  *
- * Since \phpseclib3\Crypt\AES extends \phpseclib3\Crypt\Rijndael, some functions are available to be called that, in the context of AES, don't
+ * Since \phpseclib\Crypt\AES extends \phpseclib\Crypt\Rijndael, some functions are available to be called that, in the context of AES, don't
  * make a whole lot of sense.  {@link self::setBlockLength() setBlockLength()}, for instance.  Calling that function,
  * however possible, won't do anything (AES has a fixed block length whereas Rijndael has a variable one).
  *
@@ -25,7 +25,7 @@
  * <?php
  *    include 'vendor/autoload.php';
  *
- *    $aes = new \phpseclib3\Crypt\AES('ctr');
+ *    $aes = new \phpseclib\Crypt\AES();
  *
  *    $aes->setKey('abcdefghijklmnop');
  *
@@ -39,53 +39,57 @@
  * ?>
  * </code>
  *
+ * @category  Crypt
+ * @package   AES
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2008 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
  * @link      http://phpseclib.sourceforge.net
  */
 
-namespace phpseclib3\Crypt;
+namespace phpseclib\Crypt;
 
 /**
  * Pure-PHP implementation of AES.
  *
+ * @package AES
  * @author  Jim Wigginton <terrafrost@php.net>
+ * @access  public
  */
 class AES extends Rijndael
 {
     /**
      * Dummy function
      *
-     * Since \phpseclib3\Crypt\AES extends \phpseclib3\Crypt\Rijndael, this function is, technically, available, but it doesn't do anything.
+     * Since \phpseclib\Crypt\AES extends \phpseclib\Crypt\Rijndael, this function is, technically, available, but it doesn't do anything.
      *
-     * @see \phpseclib3\Crypt\Rijndael::setBlockLength()
+     * @see \phpseclib\Crypt\Rijndael::setBlockLength()
+     * @access public
      * @param int $length
-     * @throws \BadMethodCallException anytime it's called
      */
-    public function setBlockLength($length)
+    function setBlockLength($length)
     {
-        throw new \BadMethodCallException('The block length cannot be set for AES.');
+        return;
     }
 
     /**
      * Sets the key length
      *
-     * Valid key lengths are 128, 192, and 256.  Set the link to bool(false) to disable a fixed key length
+     * Valid key lengths are 128, 192, and 256.  If the length is less than 128, it will be rounded up to
+     * 128.  If the length is greater than 128 and invalid, it will be rounded down to the closest valid amount.
      *
-     * @see \phpseclib3\Crypt\Rijndael:setKeyLength()
+     * @see \phpseclib\Crypt\Rijndael:setKeyLength()
+     * @access public
      * @param int $length
-     * @throws \LengthException if the key length isn't supported
      */
-    public function setKeyLength($length)
+    function setKeyLength($length)
     {
         switch ($length) {
-            case 128:
-            case 192:
-            case 256:
+            case 160:
+                $length = 192;
                 break;
-            default:
-                throw new \LengthException('Key of size ' . $length . ' not supported by this algorithm. Only keys of sizes 128, 192 or 256 supported');
+            case 224:
+                $length = 256;
         }
         parent::setKeyLength($length);
     }
@@ -95,22 +99,28 @@ class AES extends Rijndael
      *
      * Rijndael supports five different key lengths, AES only supports three.
      *
-     * @see \phpseclib3\Crypt\Rijndael:setKey()
+     * @see \phpseclib\Crypt\Rijndael:setKey()
      * @see setKeyLength()
+     * @access public
      * @param string $key
-     * @throws \LengthException if the key length isn't supported
      */
-    public function setKey($key)
+    function setKey($key)
     {
-        switch (strlen($key)) {
-            case 16:
-            case 24:
-            case 32:
-                break;
-            default:
-                throw new \LengthException('Key of size ' . strlen($key) . ' not supported by this algorithm. Only keys of sizes 16, 24 or 32 supported');
-        }
-
         parent::setKey($key);
+
+        if (!$this->explicit_key_length) {
+            $length = strlen($key);
+            switch (true) {
+                case $length <= 16:
+                    $this->key_length = 16;
+                    break;
+                case $length <= 24:
+                    $this->key_length = 24;
+                    break;
+                default:
+                    $this->key_length = 32;
+            }
+            $this->_setEngine();
+        }
     }
 }
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/Base.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/Base.php
new file mode 100644
index 00000000..fd99c44f
--- /dev/null
+++ b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/Base.php
@@ -0,0 +1,2553 @@
+<?php
+
+/**
+ * Base Class for all \phpseclib\Crypt\* cipher classes
+ *
+ * PHP version 5
+ *
+ * Internally for phpseclib developers:
+ *  If you plan to add a new cipher class, please note following rules:
+ *
+ *  - The new \phpseclib\Crypt\* cipher class should extend \phpseclib\Crypt\Base
+ *
+ *  - Following methods are then required to be overridden/overloaded:
+ *
+ *    - _encryptBlock()
+ *
+ *    - _decryptBlock()
+ *
+ *    - _setupKey()
+ *
+ *  - All other methods are optional to be overridden/overloaded
+ *
+ *  - Look at the source code of the current ciphers how they extend \phpseclib\Crypt\Base
+ *    and take one of them as a start up for the new cipher class.
+ *
+ *  - Please read all the other comments/notes/hints here also for each class var/method
+ *
+ * @category  Crypt
+ * @package   Base
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @author    Hans-Juergen Petrich <petrich@tronic-media.com>
+ * @copyright 2007 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+namespace phpseclib\Crypt;
+
+/**
+ * Base Class for all \phpseclib\Crypt\* cipher classes
+ *
+ * @package Base
+ * @author  Jim Wigginton <terrafrost@php.net>
+ * @author  Hans-Juergen Petrich <petrich@tronic-media.com>
+ */
+abstract class Base
+{
+    /**#@+
+     * @access public
+     * @see \phpseclib\Crypt\Base::encrypt()
+     * @see \phpseclib\Crypt\Base::decrypt()
+     */
+    /**
+     * Encrypt / decrypt using the Counter mode.
+     *
+     * Set to -1 since that's what Crypt/Random.php uses to index the CTR mode.
+     *
+     * @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Counter_.28CTR.29
+     */
+    const MODE_CTR = -1;
+    /**
+     * Encrypt / decrypt using the Electronic Code Book mode.
+     *
+     * @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Electronic_codebook_.28ECB.29
+     */
+    const MODE_ECB = 1;
+    /**
+     * Encrypt / decrypt using the Code Book Chaining mode.
+     *
+     * @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Cipher-block_chaining_.28CBC.29
+     */
+    const MODE_CBC = 2;
+    /**
+     * Encrypt / decrypt using the Cipher Feedback mode.
+     *
+     * @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Cipher_feedback_.28CFB.29
+     */
+    const MODE_CFB = 3;
+    /**
+     * Encrypt / decrypt using the Output Feedback mode.
+     *
+     * @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Output_feedback_.28OFB.29
+     */
+    const MODE_OFB = 4;
+    /**
+     * Encrypt / decrypt using streaming mode.
+     */
+    const MODE_STREAM = 5;
+    /**#@-*/
+
+    /**
+     * Whirlpool available flag
+     *
+     * @see \phpseclib\Crypt\Base::_hashInlineCryptFunction()
+     * @var bool
+     * @access private
+     */
+    static $WHIRLPOOL_AVAILABLE;
+
+    /**#@+
+     * @access private
+     * @see \phpseclib\Crypt\Base::__construct()
+     */
+    /**
+     * Base value for the internal implementation $engine switch
+     */
+    const ENGINE_INTERNAL = 1;
+    /**
+     * Base value for the mcrypt implementation $engine switch
+     */
+    const ENGINE_MCRYPT = 2;
+    /**
+     * Base value for the mcrypt implementation $engine switch
+     */
+    const ENGINE_OPENSSL = 3;
+    /**#@-*/
+
+    /**
+     * The Encryption Mode
+     *
+     * @see self::__construct()
+     * @var int
+     * @access private
+     */
+    var $mode;
+
+    /**
+     * The Block Length of the block cipher
+     *
+     * @var int
+     * @access private
+     */
+    var $block_size = 16;
+
+    /**
+     * The Key
+     *
+     * @see self::setKey()
+     * @var string
+     * @access private
+     */
+    var $key = "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0";
+
+    /**
+     * The Initialization Vector
+     *
+     * @see self::setIV()
+     * @var string
+     * @access private
+     */
+    var $iv;
+
+    /**
+     * A "sliding" Initialization Vector
+     *
+     * @see self::enableContinuousBuffer()
+     * @see self::_clearBuffers()
+     * @var string
+     * @access private
+     */
+    var $encryptIV;
+
+    /**
+     * A "sliding" Initialization Vector
+     *
+     * @see self::enableContinuousBuffer()
+     * @see self::_clearBuffers()
+     * @var string
+     * @access private
+     */
+    var $decryptIV;
+
+    /**
+     * Continuous Buffer status
+     *
+     * @see self::enableContinuousBuffer()
+     * @var bool
+     * @access private
+     */
+    var $continuousBuffer = false;
+
+    /**
+     * Encryption buffer for CTR, OFB and CFB modes
+     *
+     * @see self::encrypt()
+     * @see self::_clearBuffers()
+     * @var array
+     * @access private
+     */
+    var $enbuffer;
+
+    /**
+     * Decryption buffer for CTR, OFB and CFB modes
+     *
+     * @see self::decrypt()
+     * @see self::_clearBuffers()
+     * @var array
+     * @access private
+     */
+    var $debuffer;
+
+    /**
+     * mcrypt resource for encryption
+     *
+     * The mcrypt resource can be recreated every time something needs to be created or it can be created just once.
+     * Since mcrypt operates in continuous mode, by default, it'll need to be recreated when in non-continuous mode.
+     *
+     * @see self::encrypt()
+     * @var resource
+     * @access private
+     */
+    var $enmcrypt;
+
+    /**
+     * mcrypt resource for decryption
+     *
+     * The mcrypt resource can be recreated every time something needs to be created or it can be created just once.
+     * Since mcrypt operates in continuous mode, by default, it'll need to be recreated when in non-continuous mode.
+     *
+     * @see self::decrypt()
+     * @var resource
+     * @access private
+     */
+    var $demcrypt;
+
+    /**
+     * Does the enmcrypt resource need to be (re)initialized?
+     *
+     * @see \phpseclib\Crypt\Twofish::setKey()
+     * @see \phpseclib\Crypt\Twofish::setIV()
+     * @var bool
+     * @access private
+     */
+    var $enchanged = true;
+
+    /**
+     * Does the demcrypt resource need to be (re)initialized?
+     *
+     * @see \phpseclib\Crypt\Twofish::setKey()
+     * @see \phpseclib\Crypt\Twofish::setIV()
+     * @var bool
+     * @access private
+     */
+    var $dechanged = true;
+
+    /**
+     * mcrypt resource for CFB mode
+     *
+     * mcrypt's CFB mode, in (and only in) buffered context,
+     * is broken, so phpseclib implements the CFB mode by it self,
+     * even when the mcrypt php extension is available.
+     *
+     * In order to do the CFB-mode work (fast) phpseclib
+     * use a separate ECB-mode mcrypt resource.
+     *
+     * @link http://phpseclib.sourceforge.net/cfb-demo.phps
+     * @see self::encrypt()
+     * @see self::decrypt()
+     * @see self::_setupMcrypt()
+     * @var resource
+     * @access private
+     */
+    var $ecb;
+
+    /**
+     * Optimizing value while CFB-encrypting
+     *
+     * Only relevant if $continuousBuffer enabled
+     * and $engine == self::ENGINE_MCRYPT
+     *
+     * It's faster to re-init $enmcrypt if
+     * $buffer bytes > $cfb_init_len than
+     * using the $ecb resource furthermore.
+     *
+     * This value depends of the chosen cipher
+     * and the time it would be needed for it's
+     * initialization [by mcrypt_generic_init()]
+     * which, typically, depends on the complexity
+     * on its internaly Key-expanding algorithm.
+     *
+     * @see self::encrypt()
+     * @var int
+     * @access private
+     */
+    var $cfb_init_len = 600;
+
+    /**
+     * Does internal cipher state need to be (re)initialized?
+     *
+     * @see self::setKey()
+     * @see self::setIV()
+     * @see self::disableContinuousBuffer()
+     * @var bool
+     * @access private
+     */
+    var $changed = true;
+
+    /**
+     * Padding status
+     *
+     * @see self::enablePadding()
+     * @var bool
+     * @access private
+     */
+    var $padding = true;
+
+    /**
+     * Is the mode one that is paddable?
+     *
+     * @see self::__construct()
+     * @var bool
+     * @access private
+     */
+    var $paddable = false;
+
+    /**
+     * Holds which crypt engine internaly should be use,
+     * which will be determined automatically on __construct()
+     *
+     * Currently available $engines are:
+     * - self::ENGINE_OPENSSL  (very fast, php-extension: openssl, extension_loaded('openssl') required)
+     * - self::ENGINE_MCRYPT   (fast, php-extension: mcrypt, extension_loaded('mcrypt') required)
+     * - self::ENGINE_INTERNAL (slower, pure php-engine, no php-extension required)
+     *
+     * @see self::_setEngine()
+     * @see self::encrypt()
+     * @see self::decrypt()
+     * @var int
+     * @access private
+     */
+    var $engine;
+
+    /**
+     * Holds the preferred crypt engine
+     *
+     * @see self::_setEngine()
+     * @see self::setPreferredEngine()
+     * @var int
+     * @access private
+     */
+    var $preferredEngine;
+
+    /**
+     * The mcrypt specific name of the cipher
+     *
+     * Only used if $engine == self::ENGINE_MCRYPT
+     *
+     * @link http://www.php.net/mcrypt_module_open
+     * @link http://www.php.net/mcrypt_list_algorithms
+     * @see self::_setupMcrypt()
+     * @var string
+     * @access private
+     */
+    var $cipher_name_mcrypt;
+
+    /**
+     * The openssl specific name of the cipher
+     *
+     * Only used if $engine == self::ENGINE_OPENSSL
+     *
+     * @link http://www.php.net/openssl-get-cipher-methods
+     * @var string
+     * @access private
+     */
+    var $cipher_name_openssl;
+
+    /**
+     * The openssl specific name of the cipher in ECB mode
+     *
+     * If OpenSSL does not support the mode we're trying to use (CTR)
+     * it can still be emulated with ECB mode.
+     *
+     * @link http://www.php.net/openssl-get-cipher-methods
+     * @var string
+     * @access private
+     */
+    var $cipher_name_openssl_ecb;
+
+    /**
+     * The default salt used by setPassword()
+     *
+     * @see self::setPassword()
+     * @var string
+     * @access private
+     */
+    var $password_default_salt = 'phpseclib/salt';
+
+    /**
+     * The name of the performance-optimized callback function
+     *
+     * Used by encrypt() / decrypt()
+     * only if $engine == self::ENGINE_INTERNAL
+     *
+     * @see self::encrypt()
+     * @see self::decrypt()
+     * @see self::_setupInlineCrypt()
+     * @see self::$use_inline_crypt
+     * @var Callback
+     * @access private
+     */
+    var $inline_crypt;
+
+    /**
+     * Holds whether performance-optimized $inline_crypt() can/should be used.
+     *
+     * @see self::encrypt()
+     * @see self::decrypt()
+     * @see self::inline_crypt
+     * @var mixed
+     * @access private
+     */
+    var $use_inline_crypt;
+
+    /**
+     * If OpenSSL can be used in ECB but not in CTR we can emulate CTR
+     *
+     * @see self::_openssl_ctr_process()
+     * @var bool
+     * @access private
+     */
+    var $openssl_emulate_ctr = false;
+
+    /**
+     * Determines what options are passed to openssl_encrypt/decrypt
+     *
+     * @see self::isValidEngine()
+     * @var mixed
+     * @access private
+     */
+    var $openssl_options;
+
+    /**
+     * Has the key length explicitly been set or should it be derived from the key, itself?
+     *
+     * @see self::setKeyLength()
+     * @var bool
+     * @access private
+     */
+    var $explicit_key_length = false;
+
+    /**
+     * Don't truncate / null pad key
+     *
+     * @see self::_clearBuffers()
+     * @var bool
+     * @access private
+     */
+    var $skip_key_adjustment = false;
+
+    /**
+     * Default Constructor.
+     *
+     * Determines whether or not the mcrypt extension should be used.
+     *
+     * $mode could be:
+     *
+     * - self::MODE_ECB
+     *
+     * - self::MODE_CBC
+     *
+     * - self::MODE_CTR
+     *
+     * - self::MODE_CFB
+     *
+     * - self::MODE_OFB
+     *
+     * If not explicitly set, self::MODE_CBC will be used.
+     *
+     * @param int $mode
+     * @access public
+     */
+    function __construct($mode = self::MODE_CBC)
+    {
+        // $mode dependent settings
+        switch ($mode) {
+            case self::MODE_ECB:
+                $this->paddable = true;
+                $this->mode = self::MODE_ECB;
+                break;
+            case self::MODE_CTR:
+            case self::MODE_CFB:
+            case self::MODE_OFB:
+            case self::MODE_STREAM:
+                $this->mode = $mode;
+                break;
+            case self::MODE_CBC:
+            default:
+                $this->paddable = true;
+                $this->mode = self::MODE_CBC;
+        }
+
+        $this->_setEngine();
+
+        // Determining whether inline crypting can be used by the cipher
+        if ($this->use_inline_crypt !== false && function_exists('create_function')) {
+            $this->use_inline_crypt = true;
+        }
+    }
+
+    /**
+     * Sets the initialization vector. (optional)
+     *
+     * SetIV is not required when self::MODE_ECB (or ie for AES: \phpseclib\Crypt\AES::MODE_ECB) is being used.  If not explicitly set, it'll be assumed
+     * to be all zero's.
+     *
+     * @access public
+     * @param string $iv
+     * @internal Can be overwritten by a sub class, but does not have to be
+     */
+    function setIV($iv)
+    {
+        if ($this->mode == self::MODE_ECB) {
+            return;
+        }
+
+        $this->iv = $iv;
+        $this->changed = true;
+    }
+
+    /**
+     * Sets the key length.
+     *
+     * Keys with explicitly set lengths need to be treated accordingly
+     *
+     * @access public
+     * @param int $length
+     */
+    function setKeyLength($length)
+    {
+        $this->explicit_key_length = true;
+        $this->changed = true;
+        $this->_setEngine();
+    }
+
+    /**
+     * Returns the current key length in bits
+     *
+     * @access public
+     * @return int
+     */
+    function getKeyLength()
+    {
+        return $this->key_length << 3;
+    }
+
+    /**
+     * Returns the current block length in bits
+     *
+     * @access public
+     * @return int
+     */
+    function getBlockLength()
+    {
+        return $this->block_size << 3;
+    }
+
+    /**
+     * Sets the key.
+     *
+     * The min/max length(s) of the key depends on the cipher which is used.
+     * If the key not fits the length(s) of the cipher it will paded with null bytes
+     * up to the closest valid key length.  If the key is more than max length,
+     * we trim the excess bits.
+     *
+     * If the key is not explicitly set, it'll be assumed to be all null bytes.
+     *
+     * @access public
+     * @param string $key
+     * @internal Could, but not must, extend by the child Crypt_* class
+     */
+    function setKey($key)
+    {
+        if (!$this->explicit_key_length) {
+            $this->setKeyLength(strlen($key) << 3);
+            $this->explicit_key_length = false;
+        }
+
+        $this->key = $key;
+        $this->changed = true;
+        $this->_setEngine();
+    }
+
+    /**
+     * Sets the password.
+     *
+     * Depending on what $method is set to, setPassword()'s (optional) parameters are as follows:
+     *     {@link http://en.wikipedia.org/wiki/PBKDF2 pbkdf2} or pbkdf1:
+     *         $hash, $salt, $count, $dkLen
+     *
+     *         Where $hash (default = sha1) currently supports the following hashes: see: Crypt/Hash.php
+     *
+     * @see Crypt/Hash.php
+     * @param string $password
+     * @param string $method
+     * @return bool
+     * @access public
+     * @internal Could, but not must, extend by the child Crypt_* class
+     */
+    function setPassword($password, $method = 'pbkdf2')
+    {
+        $key = '';
+
+        switch ($method) {
+            default: // 'pbkdf2' or 'pbkdf1'
+                $func_args = func_get_args();
+
+                // Hash function
+                $hash = isset($func_args[2]) ? $func_args[2] : 'sha1';
+
+                // WPA and WPA2 use the SSID as the salt
+                $salt = isset($func_args[3]) ? $func_args[3] : $this->password_default_salt;
+
+                // RFC2898#section-4.2 uses 1,000 iterations by default
+                // WPA and WPA2 use 4,096.
+                $count = isset($func_args[4]) ? $func_args[4] : 1000;
+
+                // Keylength
+                if (isset($func_args[5])) {
+                    $dkLen = $func_args[5];
+                } else {
+                    $dkLen = $method == 'pbkdf1' ? 2 * $this->key_length : $this->key_length;
+                }
+
+                switch (true) {
+                    case $method == 'pbkdf1':
+                        $hashObj = new Hash();
+                        $hashObj->setHash($hash);
+                        if ($dkLen > $hashObj->getLength()) {
+                            user_error('Derived key too long');
+                            return false;
+                        }
+                        $t = $password . $salt;
+                        for ($i = 0; $i < $count; ++$i) {
+                            $t = $hashObj->hash($t);
+                        }
+                        $key = substr($t, 0, $dkLen);
+
+                        $this->setKey(substr($key, 0, $dkLen >> 1));
+                        $this->setIV(substr($key, $dkLen >> 1));
+
+                        return true;
+                    // Determining if php[>=5.5.0]'s hash_pbkdf2() function avail- and useable
+                    case !function_exists('hash_pbkdf2'):
+                    case !function_exists('hash_algos'):
+                    case !in_array($hash, hash_algos()):
+                        $i = 1;
+                        while (strlen($key) < $dkLen) {
+                            $hmac = new Hash();
+                            $hmac->setHash($hash);
+                            $hmac->setKey($password);
+                            $f = $u = $hmac->hash($salt . pack('N', $i++));
+                            for ($j = 2; $j <= $count; ++$j) {
+                                $u = $hmac->hash($u);
+                                $f^= $u;
+                            }
+                            $key.= $f;
+                        }
+                        $key = substr($key, 0, $dkLen);
+                        break;
+                    default:
+                        $key = hash_pbkdf2($hash, $password, $salt, $count, $dkLen, true);
+                }
+        }
+
+        $this->setKey($key);
+
+        return true;
+    }
+
+    /**
+     * Encrypts a message.
+     *
+     * $plaintext will be padded with additional bytes such that it's length is a multiple of the block size. Other cipher
+     * implementations may or may not pad in the same manner.  Other common approaches to padding and the reasons why it's
+     * necessary are discussed in the following
+     * URL:
+     *
+     * {@link http://www.di-mgt.com.au/cryptopad.html http://www.di-mgt.com.au/cryptopad.html}
+     *
+     * An alternative to padding is to, separately, send the length of the file.  This is what SSH, in fact, does.
+     * strlen($plaintext) will still need to be a multiple of the block size, however, arbitrary values can be added to make it that
+     * length.
+     *
+     * @see self::decrypt()
+     * @access public
+     * @param string $plaintext
+     * @return string $ciphertext
+     * @internal Could, but not must, extend by the child Crypt_* class
+     */
+    function encrypt($plaintext)
+    {
+        if ($this->paddable) {
+            $plaintext = $this->_pad($plaintext);
+        }
+
+        if ($this->engine === self::ENGINE_OPENSSL) {
+            if ($this->changed) {
+                $this->_clearBuffers();
+                $this->changed = false;
+            }
+            switch ($this->mode) {
+                case self::MODE_STREAM:
+                    return openssl_encrypt($plaintext, $this->cipher_name_openssl, $this->key, $this->openssl_options);
+                case self::MODE_ECB:
+                    $result = openssl_encrypt($plaintext, $this->cipher_name_openssl, $this->key, $this->openssl_options);
+                    return !defined('OPENSSL_RAW_DATA') ? substr($result, 0, -$this->block_size) : $result;
+                case self::MODE_CBC:
+                    $result = openssl_encrypt($plaintext, $this->cipher_name_openssl, $this->key, $this->openssl_options, $this->encryptIV);
+                    if (!defined('OPENSSL_RAW_DATA')) {
+                        $result = substr($result, 0, -$this->block_size);
+                    }
+                    if ($this->continuousBuffer) {
+                        $this->encryptIV = substr($result, -$this->block_size);
+                    }
+                    return $result;
+                case self::MODE_CTR:
+                    return $this->_openssl_ctr_process($plaintext, $this->encryptIV, $this->enbuffer);
+                case self::MODE_CFB:
+                    // cfb loosely routines inspired by openssl's:
+                    // {@link http://cvs.openssl.org/fileview?f=openssl/crypto/modes/cfb128.c&v=1.3.2.2.2.1}
+                    $ciphertext = '';
+                    if ($this->continuousBuffer) {
+                        $iv = &$this->encryptIV;
+                        $pos = &$this->enbuffer['pos'];
+                    } else {
+                        $iv = $this->encryptIV;
+                        $pos = 0;
+                    }
+                    $len = strlen($plaintext);
+                    $i = 0;
+                    if ($pos) {
+                        $orig_pos = $pos;
+                        $max = $this->block_size - $pos;
+                        if ($len >= $max) {
+                            $i = $max;
+                            $len-= $max;
+                            $pos = 0;
+                        } else {
+                            $i = $len;
+                            $pos+= $len;
+                            $len = 0;
+                        }
+                        // ie. $i = min($max, $len), $len-= $i, $pos+= $i, $pos%= $blocksize
+                        $ciphertext = substr($iv, $orig_pos) ^ $plaintext;
+                        $iv = substr_replace($iv, $ciphertext, $orig_pos, $i);
+                        $plaintext = substr($plaintext, $i);
+                    }
+
+                    $overflow = $len % $this->block_size;
+
+                    if ($overflow) {
+                        $ciphertext.= openssl_encrypt(substr($plaintext, 0, -$overflow) . str_repeat("\0", $this->block_size), $this->cipher_name_openssl, $this->key, $this->openssl_options, $iv);
+                        $iv = $this->_string_pop($ciphertext, $this->block_size);
+
+                        $size = $len - $overflow;
+                        $block = $iv ^ substr($plaintext, -$overflow);
+                        $iv = substr_replace($iv, $block, 0, $overflow);
+                        $ciphertext.= $block;
+                        $pos = $overflow;
+                    } elseif ($len) {
+                        $ciphertext = openssl_encrypt($plaintext, $this->cipher_name_openssl, $this->key, $this->openssl_options, $iv);
+                        $iv = substr($ciphertext, -$this->block_size);
+                    }
+
+                    return $ciphertext;
+                case self::MODE_OFB:
+                    return $this->_openssl_ofb_process($plaintext, $this->encryptIV, $this->enbuffer);
+            }
+        }
+
+        if ($this->engine === self::ENGINE_MCRYPT) {
+            if ($this->changed) {
+                $this->_setupMcrypt();
+                $this->changed = false;
+            }
+            if ($this->enchanged) {
+                @mcrypt_generic_init($this->enmcrypt, $this->key, $this->encryptIV);
+                $this->enchanged = false;
+            }
+
+            // re: {@link http://phpseclib.sourceforge.net/cfb-demo.phps}
+            // using mcrypt's default handing of CFB the above would output two different things.  using phpseclib's
+            // rewritten CFB implementation the above outputs the same thing twice.
+            if ($this->mode == self::MODE_CFB && $this->continuousBuffer) {
+                $block_size = $this->block_size;
+                $iv = &$this->encryptIV;
+                $pos = &$this->enbuffer['pos'];
+                $len = strlen($plaintext);
+                $ciphertext = '';
+                $i = 0;
+                if ($pos) {
+                    $orig_pos = $pos;
+                    $max = $block_size - $pos;
+                    if ($len >= $max) {
+                        $i = $max;
+                        $len-= $max;
+                        $pos = 0;
+                    } else {
+                        $i = $len;
+                        $pos+= $len;
+                        $len = 0;
+                    }
+                    $ciphertext = substr($iv, $orig_pos) ^ $plaintext;
+                    $iv = substr_replace($iv, $ciphertext, $orig_pos, $i);
+                    $this->enbuffer['enmcrypt_init'] = true;
+                }
+                if ($len >= $block_size) {
+                    if ($this->enbuffer['enmcrypt_init'] === false || $len > $this->cfb_init_len) {
+                        if ($this->enbuffer['enmcrypt_init'] === true) {
+                            @mcrypt_generic_init($this->enmcrypt, $this->key, $iv);
+                            $this->enbuffer['enmcrypt_init'] = false;
+                        }
+                        $ciphertext.= @mcrypt_generic($this->enmcrypt, substr($plaintext, $i, $len - $len % $block_size));
+                        $iv = substr($ciphertext, -$block_size);
+                        $len%= $block_size;
+                    } else {
+                        while ($len >= $block_size) {
+                            $iv = @mcrypt_generic($this->ecb, $iv) ^ substr($plaintext, $i, $block_size);
+                            $ciphertext.= $iv;
+                            $len-= $block_size;
+                            $i+= $block_size;
+                        }
+                    }
+                }
+
+                if ($len) {
+                    $iv = @mcrypt_generic($this->ecb, $iv);
+                    $block = $iv ^ substr($plaintext, -$len);
+                    $iv = substr_replace($iv, $block, 0, $len);
+                    $ciphertext.= $block;
+                    $pos = $len;
+                }
+
+                return $ciphertext;
+            }
+
+            $ciphertext = @mcrypt_generic($this->enmcrypt, $plaintext);
+
+            if (!$this->continuousBuffer) {
+                @mcrypt_generic_init($this->enmcrypt, $this->key, $this->encryptIV);
+            }
+
+            return $ciphertext;
+        }
+
+        if ($this->changed) {
+            $this->_setup();
+            $this->changed = false;
+        }
+        if ($this->use_inline_crypt) {
+            $inline = $this->inline_crypt;
+            return $inline('encrypt', $this, $plaintext);
+        }
+
+        $buffer = &$this->enbuffer;
+        $block_size = $this->block_size;
+        $ciphertext = '';
+        switch ($this->mode) {
+            case self::MODE_ECB:
+                for ($i = 0; $i < strlen($plaintext); $i+=$block_size) {
+                    $ciphertext.= $this->_encryptBlock(substr($plaintext, $i, $block_size));
+                }
+                break;
+            case self::MODE_CBC:
+                $xor = $this->encryptIV;
+                for ($i = 0; $i < strlen($plaintext); $i+=$block_size) {
+                    $block = substr($plaintext, $i, $block_size);
+                    $block = $this->_encryptBlock($block ^ $xor);
+                    $xor = $block;
+                    $ciphertext.= $block;
+                }
+                if ($this->continuousBuffer) {
+                    $this->encryptIV = $xor;
+                }
+                break;
+            case self::MODE_CTR:
+                $xor = $this->encryptIV;
+                if (strlen($buffer['ciphertext'])) {
+                    for ($i = 0; $i < strlen($plaintext); $i+=$block_size) {
+                        $block = substr($plaintext, $i, $block_size);
+                        if (strlen($block) > strlen($buffer['ciphertext'])) {
+                            $buffer['ciphertext'].= $this->_encryptBlock($xor);
+                        }
+                        $this->_increment_str($xor);
+                        $key = $this->_string_shift($buffer['ciphertext'], $block_size);
+                        $ciphertext.= $block ^ $key;
+                    }
+                } else {
+                    for ($i = 0; $i < strlen($plaintext); $i+=$block_size) {
+                        $block = substr($plaintext, $i, $block_size);
+                        $key = $this->_encryptBlock($xor);
+                        $this->_increment_str($xor);
+                        $ciphertext.= $block ^ $key;
+                    }
+                }
+                if ($this->continuousBuffer) {
+                    $this->encryptIV = $xor;
+                    if ($start = strlen($plaintext) % $block_size) {
+                        $buffer['ciphertext'] = substr($key, $start) . $buffer['ciphertext'];
+                    }
+                }
+                break;
+            case self::MODE_CFB:
+                // cfb loosely routines inspired by openssl's:
+                // {@link http://cvs.openssl.org/fileview?f=openssl/crypto/modes/cfb128.c&v=1.3.2.2.2.1}
+                if ($this->continuousBuffer) {
+                    $iv = &$this->encryptIV;
+                    $pos = &$buffer['pos'];
+                } else {
+                    $iv = $this->encryptIV;
+                    $pos = 0;
+                }
+                $len = strlen($plaintext);
+                $i = 0;
+                if ($pos) {
+                    $orig_pos = $pos;
+                    $max = $block_size - $pos;
+                    if ($len >= $max) {
+                        $i = $max;
+                        $len-= $max;
+                        $pos = 0;
+                    } else {
+                        $i = $len;
+                        $pos+= $len;
+                        $len = 0;
+                    }
+                    // ie. $i = min($max, $len), $len-= $i, $pos+= $i, $pos%= $blocksize
+                    $ciphertext = substr($iv, $orig_pos) ^ $plaintext;
+                    $iv = substr_replace($iv, $ciphertext, $orig_pos, $i);
+                }
+                while ($len >= $block_size) {
+                    $iv = $this->_encryptBlock($iv) ^ substr($plaintext, $i, $block_size);
+                    $ciphertext.= $iv;
+                    $len-= $block_size;
+                    $i+= $block_size;
+                }
+                if ($len) {
+                    $iv = $this->_encryptBlock($iv);
+                    $block = $iv ^ substr($plaintext, $i);
+                    $iv = substr_replace($iv, $block, 0, $len);
+                    $ciphertext.= $block;
+                    $pos = $len;
+                }
+                break;
+            case self::MODE_OFB:
+                $xor = $this->encryptIV;
+                if (strlen($buffer['xor'])) {
+                    for ($i = 0; $i < strlen($plaintext); $i+=$block_size) {
+                        $block = substr($plaintext, $i, $block_size);
+                        if (strlen($block) > strlen($buffer['xor'])) {
+                            $xor = $this->_encryptBlock($xor);
+                            $buffer['xor'].= $xor;
+                        }
+                        $key = $this->_string_shift($buffer['xor'], $block_size);
+                        $ciphertext.= $block ^ $key;
+                    }
+                } else {
+                    for ($i = 0; $i < strlen($plaintext); $i+=$block_size) {
+                        $xor = $this->_encryptBlock($xor);
+                        $ciphertext.= substr($plaintext, $i, $block_size) ^ $xor;
+                    }
+                    $key = $xor;
+                }
+                if ($this->continuousBuffer) {
+                    $this->encryptIV = $xor;
+                    if ($start = strlen($plaintext) % $block_size) {
+                        $buffer['xor'] = substr($key, $start) . $buffer['xor'];
+                    }
+                }
+                break;
+            case self::MODE_STREAM:
+                $ciphertext = $this->_encryptBlock($plaintext);
+                break;
+        }
+
+        return $ciphertext;
+    }
+
+    /**
+     * Decrypts a message.
+     *
+     * If strlen($ciphertext) is not a multiple of the block size, null bytes will be added to the end of the string until
+     * it is.
+     *
+     * @see self::encrypt()
+     * @access public
+     * @param string $ciphertext
+     * @return string $plaintext
+     * @internal Could, but not must, extend by the child Crypt_* class
+     */
+    function decrypt($ciphertext)
+    {
+        if ($this->paddable) {
+            // we pad with chr(0) since that's what mcrypt_generic does.  to quote from {@link http://www.php.net/function.mcrypt-generic}:
+            // "The data is padded with "\0" to make sure the length of the data is n * blocksize."
+            $ciphertext = str_pad($ciphertext, strlen($ciphertext) + ($this->block_size - strlen($ciphertext) % $this->block_size) % $this->block_size, chr(0));
+        }
+
+        if ($this->engine === self::ENGINE_OPENSSL) {
+            if ($this->changed) {
+                $this->_clearBuffers();
+                $this->changed = false;
+            }
+            switch ($this->mode) {
+                case self::MODE_STREAM:
+                    $plaintext = openssl_decrypt($ciphertext, $this->cipher_name_openssl, $this->key, $this->openssl_options);
+                    break;
+                case self::MODE_ECB:
+                    if (!defined('OPENSSL_RAW_DATA')) {
+                        $ciphertext.= openssl_encrypt('', $this->cipher_name_openssl_ecb, $this->key, true);
+                    }
+                    $plaintext = openssl_decrypt($ciphertext, $this->cipher_name_openssl, $this->key, $this->openssl_options);
+                    break;
+                case self::MODE_CBC:
+                    if (!defined('OPENSSL_RAW_DATA')) {
+                        $padding = str_repeat(chr($this->block_size), $this->block_size) ^ substr($ciphertext, -$this->block_size);
+                        $ciphertext.= substr(openssl_encrypt($padding, $this->cipher_name_openssl_ecb, $this->key, true), 0, $this->block_size);
+                        $offset = 2 * $this->block_size;
+                    } else {
+                        $offset = $this->block_size;
+                    }
+                    $plaintext = openssl_decrypt($ciphertext, $this->cipher_name_openssl, $this->key, $this->openssl_options, $this->decryptIV);
+                    if ($this->continuousBuffer) {
+                        $this->decryptIV = substr($ciphertext, -$offset, $this->block_size);
+                    }
+                    break;
+                case self::MODE_CTR:
+                    $plaintext = $this->_openssl_ctr_process($ciphertext, $this->decryptIV, $this->debuffer);
+                    break;
+                case self::MODE_CFB:
+                    // cfb loosely routines inspired by openssl's:
+                    // {@link http://cvs.openssl.org/fileview?f=openssl/crypto/modes/cfb128.c&v=1.3.2.2.2.1}
+                    $plaintext = '';
+                    if ($this->continuousBuffer) {
+                        $iv = &$this->decryptIV;
+                        $pos = &$this->buffer['pos'];
+                    } else {
+                        $iv = $this->decryptIV;
+                        $pos = 0;
+                    }
+                    $len = strlen($ciphertext);
+                    $i = 0;
+                    if ($pos) {
+                        $orig_pos = $pos;
+                        $max = $this->block_size - $pos;
+                        if ($len >= $max) {
+                            $i = $max;
+                            $len-= $max;
+                            $pos = 0;
+                        } else {
+                            $i = $len;
+                            $pos+= $len;
+                            $len = 0;
+                        }
+                        // ie. $i = min($max, $len), $len-= $i, $pos+= $i, $pos%= $this->blocksize
+                        $plaintext = substr($iv, $orig_pos) ^ $ciphertext;
+                        $iv = substr_replace($iv, substr($ciphertext, 0, $i), $orig_pos, $i);
+                        $ciphertext = substr($ciphertext, $i);
+                    }
+                    $overflow = $len % $this->block_size;
+                    if ($overflow) {
+                        $plaintext.= openssl_decrypt(substr($ciphertext, 0, -$overflow), $this->cipher_name_openssl, $this->key, $this->openssl_options, $iv);
+                        if ($len - $overflow) {
+                            $iv = substr($ciphertext, -$overflow - $this->block_size, -$overflow);
+                        }
+                        $iv = openssl_encrypt(str_repeat("\0", $this->block_size), $this->cipher_name_openssl, $this->key, $this->openssl_options, $iv);
+                        $plaintext.= $iv ^ substr($ciphertext, -$overflow);
+                        $iv = substr_replace($iv, substr($ciphertext, -$overflow), 0, $overflow);
+                        $pos = $overflow;
+                    } elseif ($len) {
+                        $plaintext.= openssl_decrypt($ciphertext, $this->cipher_name_openssl, $this->key, $this->openssl_options, $iv);
+                        $iv = substr($ciphertext, -$this->block_size);
+                    }
+                    break;
+                case self::MODE_OFB:
+                    $plaintext = $this->_openssl_ofb_process($ciphertext, $this->decryptIV, $this->debuffer);
+            }
+
+            return $this->paddable ? $this->_unpad($plaintext) : $plaintext;
+        }
+
+        if ($this->engine === self::ENGINE_MCRYPT) {
+            $block_size = $this->block_size;
+            if ($this->changed) {
+                $this->_setupMcrypt();
+                $this->changed = false;
+            }
+            if ($this->dechanged) {
+                @mcrypt_generic_init($this->demcrypt, $this->key, $this->decryptIV);
+                $this->dechanged = false;
+            }
+
+            if ($this->mode == self::MODE_CFB && $this->continuousBuffer) {
+                $iv = &$this->decryptIV;
+                $pos = &$this->debuffer['pos'];
+                $len = strlen($ciphertext);
+                $plaintext = '';
+                $i = 0;
+                if ($pos) {
+                    $orig_pos = $pos;
+                    $max = $block_size - $pos;
+                    if ($len >= $max) {
+                        $i = $max;
+                        $len-= $max;
+                        $pos = 0;
+                    } else {
+                        $i = $len;
+                        $pos+= $len;
+                        $len = 0;
+                    }
+                    // ie. $i = min($max, $len), $len-= $i, $pos+= $i, $pos%= $blocksize
+                    $plaintext = substr($iv, $orig_pos) ^ $ciphertext;
+                    $iv = substr_replace($iv, substr($ciphertext, 0, $i), $orig_pos, $i);
+                }
+                if ($len >= $block_size) {
+                    $cb = substr($ciphertext, $i, $len - $len % $block_size);
+                    $plaintext.= @mcrypt_generic($this->ecb, $iv . $cb) ^ $cb;
+                    $iv = substr($cb, -$block_size);
+                    $len%= $block_size;
+                }
+                if ($len) {
+                    $iv = @mcrypt_generic($this->ecb, $iv);
+                    $plaintext.= $iv ^ substr($ciphertext, -$len);
+                    $iv = substr_replace($iv, substr($ciphertext, -$len), 0, $len);
+                    $pos = $len;
+                }
+
+                return $plaintext;
+            }
+
+            $plaintext = @mdecrypt_generic($this->demcrypt, $ciphertext);
+
+            if (!$this->continuousBuffer) {
+                @mcrypt_generic_init($this->demcrypt, $this->key, $this->decryptIV);
+            }
+
+            return $this->paddable ? $this->_unpad($plaintext) : $plaintext;
+        }
+
+        if ($this->changed) {
+            $this->_setup();
+            $this->changed = false;
+        }
+        if ($this->use_inline_crypt) {
+            $inline = $this->inline_crypt;
+            return $inline('decrypt', $this, $ciphertext);
+        }
+
+        $block_size = $this->block_size;
+
+        $buffer = &$this->debuffer;
+        $plaintext = '';
+        switch ($this->mode) {
+            case self::MODE_ECB:
+                for ($i = 0; $i < strlen($ciphertext); $i+=$block_size) {
+                    $plaintext.= $this->_decryptBlock(substr($ciphertext, $i, $block_size));
+                }
+                break;
+            case self::MODE_CBC:
+                $xor = $this->decryptIV;
+                for ($i = 0; $i < strlen($ciphertext); $i+=$block_size) {
+                    $block = substr($ciphertext, $i, $block_size);
+                    $plaintext.= $this->_decryptBlock($block) ^ $xor;
+                    $xor = $block;
+                }
+                if ($this->continuousBuffer) {
+                    $this->decryptIV = $xor;
+                }
+                break;
+            case self::MODE_CTR:
+                $xor = $this->decryptIV;
+                if (strlen($buffer['ciphertext'])) {
+                    for ($i = 0; $i < strlen($ciphertext); $i+=$block_size) {
+                        $block = substr($ciphertext, $i, $block_size);
+                        if (strlen($block) > strlen($buffer['ciphertext'])) {
+                            $buffer['ciphertext'].= $this->_encryptBlock($xor);
+                            $this->_increment_str($xor);
+                        }
+                        $key = $this->_string_shift($buffer['ciphertext'], $block_size);
+                        $plaintext.= $block ^ $key;
+                    }
+                } else {
+                    for ($i = 0; $i < strlen($ciphertext); $i+=$block_size) {
+                        $block = substr($ciphertext, $i, $block_size);
+                        $key = $this->_encryptBlock($xor);
+                        $this->_increment_str($xor);
+                        $plaintext.= $block ^ $key;
+                    }
+                }
+                if ($this->continuousBuffer) {
+                    $this->decryptIV = $xor;
+                    if ($start = strlen($ciphertext) % $block_size) {
+                        $buffer['ciphertext'] = substr($key, $start) . $buffer['ciphertext'];
+                    }
+                }
+                break;
+            case self::MODE_CFB:
+                if ($this->continuousBuffer) {
+                    $iv = &$this->decryptIV;
+                    $pos = &$buffer['pos'];
+                } else {
+                    $iv = $this->decryptIV;
+                    $pos = 0;
+                }
+                $len = strlen($ciphertext);
+                $i = 0;
+                if ($pos) {
+                    $orig_pos = $pos;
+                    $max = $block_size - $pos;
+                    if ($len >= $max) {
+                        $i = $max;
+                        $len-= $max;
+                        $pos = 0;
+                    } else {
+                        $i = $len;
+                        $pos+= $len;
+                        $len = 0;
+                    }
+                    // ie. $i = min($max, $len), $len-= $i, $pos+= $i, $pos%= $blocksize
+                    $plaintext = substr($iv, $orig_pos) ^ $ciphertext;
+                    $iv = substr_replace($iv, substr($ciphertext, 0, $i), $orig_pos, $i);
+                }
+                while ($len >= $block_size) {
+                    $iv = $this->_encryptBlock($iv);
+                    $cb = substr($ciphertext, $i, $block_size);
+                    $plaintext.= $iv ^ $cb;
+                    $iv = $cb;
+                    $len-= $block_size;
+                    $i+= $block_size;
+                }
+                if ($len) {
+                    $iv = $this->_encryptBlock($iv);
+                    $plaintext.= $iv ^ substr($ciphertext, $i);
+                    $iv = substr_replace($iv, substr($ciphertext, $i), 0, $len);
+                    $pos = $len;
+                }
+                break;
+            case self::MODE_OFB:
+                $xor = $this->decryptIV;
+                if (strlen($buffer['xor'])) {
+                    for ($i = 0; $i < strlen($ciphertext); $i+=$block_size) {
+                        $block = substr($ciphertext, $i, $block_size);
+                        if (strlen($block) > strlen($buffer['xor'])) {
+                            $xor = $this->_encryptBlock($xor);
+                            $buffer['xor'].= $xor;
+                        }
+                        $key = $this->_string_shift($buffer['xor'], $block_size);
+                        $plaintext.= $block ^ $key;
+                    }
+                } else {
+                    for ($i = 0; $i < strlen($ciphertext); $i+=$block_size) {
+                        $xor = $this->_encryptBlock($xor);
+                        $plaintext.= substr($ciphertext, $i, $block_size) ^ $xor;
+                    }
+                    $key = $xor;
+                }
+                if ($this->continuousBuffer) {
+                    $this->decryptIV = $xor;
+                    if ($start = strlen($ciphertext) % $block_size) {
+                        $buffer['xor'] = substr($key, $start) . $buffer['xor'];
+                    }
+                }
+                break;
+            case self::MODE_STREAM:
+                $plaintext = $this->_decryptBlock($ciphertext);
+                break;
+        }
+        return $this->paddable ? $this->_unpad($plaintext) : $plaintext;
+    }
+
+    /**
+     * OpenSSL CTR Processor
+     *
+     * PHP's OpenSSL bindings do not operate in continuous mode so we'll wrap around it. Since the keystream
+     * for CTR is the same for both encrypting and decrypting this function is re-used by both Base::encrypt()
+     * and Base::decrypt(). Also, OpenSSL doesn't implement CTR for all of it's symmetric ciphers so this
+     * function will emulate CTR with ECB when necessary.
+     *
+     * @see self::encrypt()
+     * @see self::decrypt()
+     * @param string $plaintext
+     * @param string $encryptIV
+     * @param array $buffer
+     * @return string
+     * @access private
+     */
+    function _openssl_ctr_process($plaintext, &$encryptIV, &$buffer)
+    {
+        $ciphertext = '';
+
+        $block_size = $this->block_size;
+        $key = $this->key;
+
+        if ($this->openssl_emulate_ctr) {
+            $xor = $encryptIV;
+            if (strlen($buffer['ciphertext'])) {
+                for ($i = 0; $i < strlen($plaintext); $i+=$block_size) {
+                    $block = substr($plaintext, $i, $block_size);
+                    if (strlen($block) > strlen($buffer['ciphertext'])) {
+                        $result = openssl_encrypt($xor, $this->cipher_name_openssl_ecb, $key, $this->openssl_options);
+                        $result = !defined('OPENSSL_RAW_DATA') ? substr($result, 0, -$this->block_size) : $result;
+                        $buffer['ciphertext'].= $result;
+                    }
+                    $this->_increment_str($xor);
+                    $otp = $this->_string_shift($buffer['ciphertext'], $block_size);
+                    $ciphertext.= $block ^ $otp;
+                }
+            } else {
+                for ($i = 0; $i < strlen($plaintext); $i+=$block_size) {
+                    $block = substr($plaintext, $i, $block_size);
+                    $otp = openssl_encrypt($xor, $this->cipher_name_openssl_ecb, $key, $this->openssl_options);
+                    $otp = !defined('OPENSSL_RAW_DATA') ? substr($otp, 0, -$this->block_size) : $otp;
+                    $this->_increment_str($xor);
+                    $ciphertext.= $block ^ $otp;
+                }
+            }
+            if ($this->continuousBuffer) {
+                $encryptIV = $xor;
+                if ($start = strlen($plaintext) % $block_size) {
+                    $buffer['ciphertext'] = substr($key, $start) . $buffer['ciphertext'];
+                }
+            }
+
+            return $ciphertext;
+        }
+
+        if (strlen($buffer['ciphertext'])) {
+            $ciphertext = $plaintext ^ $this->_string_shift($buffer['ciphertext'], strlen($plaintext));
+            $plaintext = substr($plaintext, strlen($ciphertext));
+
+            if (!strlen($plaintext)) {
+                return $ciphertext;
+            }
+        }
+
+        $overflow = strlen($plaintext) % $block_size;
+        if ($overflow) {
+            $plaintext2 = $this->_string_pop($plaintext, $overflow); // ie. trim $plaintext to a multiple of $block_size and put rest of $plaintext in $plaintext2
+            $encrypted = openssl_encrypt($plaintext . str_repeat("\0", $block_size), $this->cipher_name_openssl, $key, $this->openssl_options, $encryptIV);
+            $temp = $this->_string_pop($encrypted, $block_size);
+            $ciphertext.= $encrypted . ($plaintext2 ^ $temp);
+            if ($this->continuousBuffer) {
+                $buffer['ciphertext'] = substr($temp, $overflow);
+                $encryptIV = $temp;
+            }
+        } elseif (!strlen($buffer['ciphertext'])) {
+            $ciphertext.= openssl_encrypt($plaintext . str_repeat("\0", $block_size), $this->cipher_name_openssl, $key, $this->openssl_options, $encryptIV);
+            $temp = $this->_string_pop($ciphertext, $block_size);
+            if ($this->continuousBuffer) {
+                $encryptIV = $temp;
+            }
+        }
+        if ($this->continuousBuffer) {
+            if (!defined('OPENSSL_RAW_DATA')) {
+                $encryptIV.= openssl_encrypt('', $this->cipher_name_openssl_ecb, $key, $this->openssl_options);
+            }
+            $encryptIV = openssl_decrypt($encryptIV, $this->cipher_name_openssl_ecb, $key, $this->openssl_options);
+            if ($overflow) {
+                $this->_increment_str($encryptIV);
+            }
+        }
+
+        return $ciphertext;
+    }
+
+    /**
+     * OpenSSL OFB Processor
+     *
+     * PHP's OpenSSL bindings do not operate in continuous mode so we'll wrap around it. Since the keystream
+     * for OFB is the same for both encrypting and decrypting this function is re-used by both Base::encrypt()
+     * and Base::decrypt().
+     *
+     * @see self::encrypt()
+     * @see self::decrypt()
+     * @param string $plaintext
+     * @param string $encryptIV
+     * @param array $buffer
+     * @return string
+     * @access private
+     */
+    function _openssl_ofb_process($plaintext, &$encryptIV, &$buffer)
+    {
+        if (strlen($buffer['xor'])) {
+            $ciphertext = $plaintext ^ $buffer['xor'];
+            $buffer['xor'] = substr($buffer['xor'], strlen($ciphertext));
+            $plaintext = substr($plaintext, strlen($ciphertext));
+        } else {
+            $ciphertext = '';
+        }
+
+        $block_size = $this->block_size;
+
+        $len = strlen($plaintext);
+        $key = $this->key;
+        $overflow = $len % $block_size;
+
+        if (strlen($plaintext)) {
+            if ($overflow) {
+                $ciphertext.= openssl_encrypt(substr($plaintext, 0, -$overflow) . str_repeat("\0", $block_size), $this->cipher_name_openssl, $key, $this->openssl_options, $encryptIV);
+                $xor = $this->_string_pop($ciphertext, $block_size);
+                if ($this->continuousBuffer) {
+                    $encryptIV = $xor;
+                }
+                $ciphertext.= $this->_string_shift($xor, $overflow) ^ substr($plaintext, -$overflow);
+                if ($this->continuousBuffer) {
+                    $buffer['xor'] = $xor;
+                }
+            } else {
+                $ciphertext = openssl_encrypt($plaintext, $this->cipher_name_openssl, $key, $this->openssl_options, $encryptIV);
+                if ($this->continuousBuffer) {
+                    $encryptIV = substr($ciphertext, -$block_size) ^ substr($plaintext, -$block_size);
+                }
+            }
+        }
+
+        return $ciphertext;
+    }
+
+    /**
+     * phpseclib <-> OpenSSL Mode Mapper
+     *
+     * May need to be overwritten by classes extending this one in some cases
+     *
+     * @return int
+     * @access private
+     */
+    function _openssl_translate_mode()
+    {
+        switch ($this->mode) {
+            case self::MODE_ECB:
+                return 'ecb';
+            case self::MODE_CBC:
+                return 'cbc';
+            case self::MODE_CTR:
+                return 'ctr';
+            case self::MODE_CFB:
+                return 'cfb';
+            case self::MODE_OFB:
+                return 'ofb';
+        }
+    }
+
+    /**
+     * Pad "packets".
+     *
+     * Block ciphers working by encrypting between their specified [$this->]block_size at a time
+     * If you ever need to encrypt or decrypt something that isn't of the proper length, it becomes necessary to
+     * pad the input so that it is of the proper length.
+     *
+     * Padding is enabled by default.  Sometimes, however, it is undesirable to pad strings.  Such is the case in SSH,
+     * where "packets" are padded with random bytes before being encrypted.  Unpad these packets and you risk stripping
+     * away characters that shouldn't be stripped away. (SSH knows how many bytes are added because the length is
+     * transmitted separately)
+     *
+     * @see self::disablePadding()
+     * @access public
+     */
+    function enablePadding()
+    {
+        $this->padding = true;
+    }
+
+    /**
+     * Do not pad packets.
+     *
+     * @see self::enablePadding()
+     * @access public
+     */
+    function disablePadding()
+    {
+        $this->padding = false;
+    }
+
+    /**
+     * Treat consecutive "packets" as if they are a continuous buffer.
+     *
+     * Say you have a 32-byte plaintext $plaintext.  Using the default behavior, the two following code snippets
+     * will yield different outputs:
+     *
+     * <code>
+     *    echo $rijndael->encrypt(substr($plaintext,  0, 16));
+     *    echo $rijndael->encrypt(substr($plaintext, 16, 16));
+     * </code>
+     * <code>
+     *    echo $rijndael->encrypt($plaintext);
+     * </code>
+     *
+     * The solution is to enable the continuous buffer.  Although this will resolve the above discrepancy, it creates
+     * another, as demonstrated with the following:
+     *
+     * <code>
+     *    $rijndael->encrypt(substr($plaintext, 0, 16));
+     *    echo $rijndael->decrypt($rijndael->encrypt(substr($plaintext, 16, 16)));
+     * </code>
+     * <code>
+     *    echo $rijndael->decrypt($rijndael->encrypt(substr($plaintext, 16, 16)));
+     * </code>
+     *
+     * With the continuous buffer disabled, these would yield the same output.  With it enabled, they yield different
+     * outputs.  The reason is due to the fact that the initialization vector's change after every encryption /
+     * decryption round when the continuous buffer is enabled.  When it's disabled, they remain constant.
+     *
+     * Put another way, when the continuous buffer is enabled, the state of the \phpseclib\Crypt\*() object changes after each
+     * encryption / decryption round, whereas otherwise, it'd remain constant.  For this reason, it's recommended that
+     * continuous buffers not be used.  They do offer better security and are, in fact, sometimes required (SSH uses them),
+     * however, they are also less intuitive and more likely to cause you problems.
+     *
+     * @see self::disableContinuousBuffer()
+     * @access public
+     * @internal Could, but not must, extend by the child Crypt_* class
+     */
+    function enableContinuousBuffer()
+    {
+        if ($this->mode == self::MODE_ECB) {
+            return;
+        }
+
+        $this->continuousBuffer = true;
+
+        $this->_setEngine();
+    }
+
+    /**
+     * Treat consecutive packets as if they are a discontinuous buffer.
+     *
+     * The default behavior.
+     *
+     * @see self::enableContinuousBuffer()
+     * @access public
+     * @internal Could, but not must, extend by the child Crypt_* class
+     */
+    function disableContinuousBuffer()
+    {
+        if ($this->mode == self::MODE_ECB) {
+            return;
+        }
+        if (!$this->continuousBuffer) {
+            return;
+        }
+
+        $this->continuousBuffer = false;
+        $this->changed = true;
+
+        $this->_setEngine();
+    }
+
+    /**
+     * Test for engine validity
+     *
+     * @see self::__construct()
+     * @param int $engine
+     * @access public
+     * @return bool
+     */
+    function isValidEngine($engine)
+    {
+        switch ($engine) {
+            case self::ENGINE_OPENSSL:
+                if ($this->mode == self::MODE_STREAM && $this->continuousBuffer) {
+                    return false;
+                }
+                $this->openssl_emulate_ctr = false;
+                $result = $this->cipher_name_openssl &&
+                          extension_loaded('openssl') &&
+                          // PHP 5.3.0 - 5.3.2 did not let you set IV's
+                          version_compare(PHP_VERSION, '5.3.3', '>=');
+                if (!$result) {
+                    return false;
+                }
+
+                // prior to PHP 5.4.0 OPENSSL_RAW_DATA and OPENSSL_ZERO_PADDING were not defined. instead of expecting an integer
+                // $options openssl_encrypt expected a boolean $raw_data.
+                if (!defined('OPENSSL_RAW_DATA')) {
+                    $this->openssl_options = true;
+                } else {
+                    $this->openssl_options = OPENSSL_RAW_DATA | OPENSSL_ZERO_PADDING;
+                }
+
+                $methods = openssl_get_cipher_methods();
+                if (in_array($this->cipher_name_openssl, $methods)) {
+                    return true;
+                }
+                // not all of openssl's symmetric cipher's support ctr. for those
+                // that don't we'll emulate it
+                switch ($this->mode) {
+                    case self::MODE_CTR:
+                        if (in_array($this->cipher_name_openssl_ecb, $methods)) {
+                            $this->openssl_emulate_ctr = true;
+                            return true;
+                        }
+                }
+                return false;
+            case self::ENGINE_MCRYPT:
+                return $this->cipher_name_mcrypt &&
+                       extension_loaded('mcrypt') &&
+                       in_array($this->cipher_name_mcrypt, @mcrypt_list_algorithms());
+            case self::ENGINE_INTERNAL:
+                return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Sets the preferred crypt engine
+     *
+     * Currently, $engine could be:
+     *
+     * - \phpseclib\Crypt\Base::ENGINE_OPENSSL  [very fast]
+     *
+     * - \phpseclib\Crypt\Base::ENGINE_MCRYPT   [fast]
+     *
+     * - \phpseclib\Crypt\Base::ENGINE_INTERNAL [slow]
+     *
+     * If the preferred crypt engine is not available the fastest available one will be used
+     *
+     * @see self::__construct()
+     * @param int $engine
+     * @access public
+     */
+    function setPreferredEngine($engine)
+    {
+        switch ($engine) {
+            //case self::ENGINE_OPENSSL;
+            case self::ENGINE_MCRYPT:
+            case self::ENGINE_INTERNAL:
+                $this->preferredEngine = $engine;
+                break;
+            default:
+                $this->preferredEngine = self::ENGINE_OPENSSL;
+        }
+
+        $this->_setEngine();
+    }
+
+    /**
+     * Returns the engine currently being utilized
+     *
+     * @see self::_setEngine()
+     * @access public
+     */
+    function getEngine()
+    {
+        return $this->engine;
+    }
+
+    /**
+     * Sets the engine as appropriate
+     *
+     * @see self::__construct()
+     * @access private
+     */
+    function _setEngine()
+    {
+        $this->engine = null;
+
+        $candidateEngines = array(
+            $this->preferredEngine,
+            self::ENGINE_OPENSSL,
+            self::ENGINE_MCRYPT
+        );
+        foreach ($candidateEngines as $engine) {
+            if ($this->isValidEngine($engine)) {
+                $this->engine = $engine;
+                break;
+            }
+        }
+        if (!$this->engine) {
+            $this->engine = self::ENGINE_INTERNAL;
+        }
+
+        if ($this->engine != self::ENGINE_MCRYPT && $this->enmcrypt) {
+            // Closing the current mcrypt resource(s). _mcryptSetup() will, if needed,
+            // (re)open them with the module named in $this->cipher_name_mcrypt
+            @mcrypt_module_close($this->enmcrypt);
+            @mcrypt_module_close($this->demcrypt);
+            $this->enmcrypt = null;
+            $this->demcrypt = null;
+
+            if ($this->ecb) {
+                @mcrypt_module_close($this->ecb);
+                $this->ecb = null;
+            }
+        }
+
+        $this->changed = true;
+    }
+
+    /**
+     * Encrypts a block
+     *
+     * Note: Must be extended by the child \phpseclib\Crypt\* class
+     *
+     * @access private
+     * @param string $in
+     * @return string
+     */
+    abstract function _encryptBlock($in);
+
+    /**
+     * Decrypts a block
+     *
+     * Note: Must be extended by the child \phpseclib\Crypt\* class
+     *
+     * @access private
+     * @param string $in
+     * @return string
+     */
+    abstract function _decryptBlock($in);
+
+    /**
+     * Setup the key (expansion)
+     *
+     * Only used if $engine == self::ENGINE_INTERNAL
+     *
+     * Note: Must extend by the child \phpseclib\Crypt\* class
+     *
+     * @see self::_setup()
+     * @access private
+     */
+    abstract function _setupKey();
+
+    /**
+     * Setup the self::ENGINE_INTERNAL $engine
+     *
+     * (re)init, if necessary, the internal cipher $engine and flush all $buffers
+     * Used (only) if $engine == self::ENGINE_INTERNAL
+     *
+     * _setup() will be called each time if $changed === true
+     * typically this happens when using one or more of following public methods:
+     *
+     * - setKey()
+     *
+     * - setIV()
+     *
+     * - disableContinuousBuffer()
+     *
+     * - First run of encrypt() / decrypt() with no init-settings
+     *
+     * @see self::setKey()
+     * @see self::setIV()
+     * @see self::disableContinuousBuffer()
+     * @access private
+     * @internal _setup() is always called before en/decryption.
+     * @internal Could, but not must, extend by the child Crypt_* class
+     */
+    function _setup()
+    {
+        $this->_clearBuffers();
+        $this->_setupKey();
+
+        if ($this->use_inline_crypt) {
+            $this->_setupInlineCrypt();
+        }
+    }
+
+    /**
+     * Setup the self::ENGINE_MCRYPT $engine
+     *
+     * (re)init, if necessary, the (ext)mcrypt resources and flush all $buffers
+     * Used (only) if $engine = self::ENGINE_MCRYPT
+     *
+     * _setupMcrypt() will be called each time if $changed === true
+     * typically this happens when using one or more of following public methods:
+     *
+     * - setKey()
+     *
+     * - setIV()
+     *
+     * - disableContinuousBuffer()
+     *
+     * - First run of encrypt() / decrypt()
+     *
+     * @see self::setKey()
+     * @see self::setIV()
+     * @see self::disableContinuousBuffer()
+     * @access private
+     * @internal Could, but not must, extend by the child Crypt_* class
+     */
+    function _setupMcrypt()
+    {
+        $this->_clearBuffers();
+        $this->enchanged = $this->dechanged = true;
+
+        if (!isset($this->enmcrypt)) {
+            static $mcrypt_modes = array(
+                self::MODE_CTR    => 'ctr',
+                self::MODE_ECB    => MCRYPT_MODE_ECB,
+                self::MODE_CBC    => MCRYPT_MODE_CBC,
+                self::MODE_CFB    => 'ncfb',
+                self::MODE_OFB    => MCRYPT_MODE_NOFB,
+                self::MODE_STREAM => MCRYPT_MODE_STREAM,
+            );
+
+            $this->demcrypt = @mcrypt_module_open($this->cipher_name_mcrypt, '', $mcrypt_modes[$this->mode], '');
+            $this->enmcrypt = @mcrypt_module_open($this->cipher_name_mcrypt, '', $mcrypt_modes[$this->mode], '');
+
+            // we need the $ecb mcrypt resource (only) in MODE_CFB with enableContinuousBuffer()
+            // to workaround mcrypt's broken ncfb implementation in buffered mode
+            // see: {@link http://phpseclib.sourceforge.net/cfb-demo.phps}
+            if ($this->mode == self::MODE_CFB) {
+                $this->ecb = @mcrypt_module_open($this->cipher_name_mcrypt, '', MCRYPT_MODE_ECB, '');
+            }
+        } // else should mcrypt_generic_deinit be called?
+
+        if ($this->mode == self::MODE_CFB) {
+            @mcrypt_generic_init($this->ecb, $this->key, str_repeat("\0", $this->block_size));
+        }
+    }
+
+    /**
+     * Pads a string
+     *
+     * Pads a string using the RSA PKCS padding standards so that its length is a multiple of the blocksize.
+     * $this->block_size - (strlen($text) % $this->block_size) bytes are added, each of which is equal to
+     * chr($this->block_size - (strlen($text) % $this->block_size)
+     *
+     * If padding is disabled and $text is not a multiple of the blocksize, the string will be padded regardless
+     * and padding will, hence forth, be enabled.
+     *
+     * @see self::_unpad()
+     * @param string $text
+     * @access private
+     * @return string
+     */
+    function _pad($text)
+    {
+        $length = strlen($text);
+
+        if (!$this->padding) {
+            if ($length % $this->block_size == 0) {
+                return $text;
+            } else {
+                user_error("The plaintext's length ($length) is not a multiple of the block size ({$this->block_size})");
+                $this->padding = true;
+            }
+        }
+
+        $pad = $this->block_size - ($length % $this->block_size);
+
+        return str_pad($text, $length + $pad, chr($pad));
+    }
+
+    /**
+     * Unpads a string.
+     *
+     * If padding is enabled and the reported padding length is invalid the encryption key will be assumed to be wrong
+     * and false will be returned.
+     *
+     * @see self::_pad()
+     * @param string $text
+     * @access private
+     * @return string
+     */
+    function _unpad($text)
+    {
+        if (!$this->padding) {
+            return $text;
+        }
+
+        $length = ord($text[strlen($text) - 1]);
+
+        if (!$length || $length > $this->block_size) {
+            return false;
+        }
+
+        return substr($text, 0, -$length);
+    }
+
+    /**
+     * Clears internal buffers
+     *
+     * Clearing/resetting the internal buffers is done everytime
+     * after disableContinuousBuffer() or on cipher $engine (re)init
+     * ie after setKey() or setIV()
+     *
+     * @access public
+     * @internal Could, but not must, extend by the child Crypt_* class
+     */
+    function _clearBuffers()
+    {
+        $this->enbuffer = $this->debuffer = array('ciphertext' => '', 'xor' => '', 'pos' => 0, 'enmcrypt_init' => true);
+
+        // mcrypt's handling of invalid's $iv:
+        // $this->encryptIV = $this->decryptIV = strlen($this->iv) == $this->block_size ? $this->iv : str_repeat("\0", $this->block_size);
+        $this->encryptIV = $this->decryptIV = str_pad(substr($this->iv, 0, $this->block_size), $this->block_size, "\0");
+
+        if (!$this->skip_key_adjustment) {
+            $this->key = str_pad(substr($this->key, 0, $this->key_length), $this->key_length, "\0");
+        }
+    }
+
+    /**
+     * String Shift
+     *
+     * Inspired by array_shift
+     *
+     * @param string $string
+     * @param int $index
+     * @access private
+     * @return string
+     */
+    function _string_shift(&$string, $index = 1)
+    {
+        $substr = substr($string, 0, $index);
+        $string = substr($string, $index);
+        return $substr;
+    }
+
+    /**
+     * String Pop
+     *
+     * Inspired by array_pop
+     *
+     * @param string $string
+     * @param int $index
+     * @access private
+     * @return string
+     */
+    function _string_pop(&$string, $index = 1)
+    {
+        $substr = substr($string, -$index);
+        $string = substr($string, 0, -$index);
+        return $substr;
+    }
+
+    /**
+     * Increment the current string
+     *
+     * @see self::decrypt()
+     * @see self::encrypt()
+     * @param string $var
+     * @access private
+     */
+    function _increment_str(&$var)
+    {
+        for ($i = 4; $i <= strlen($var); $i+= 4) {
+            $temp = substr($var, -$i, 4);
+            switch ($temp) {
+                case "\xFF\xFF\xFF\xFF":
+                    $var = substr_replace($var, "\x00\x00\x00\x00", -$i, 4);
+                    break;
+                case "\x7F\xFF\xFF\xFF":
+                    $var = substr_replace($var, "\x80\x00\x00\x00", -$i, 4);
+                    return;
+                default:
+                    $temp = unpack('Nnum', $temp);
+                    $var = substr_replace($var, pack('N', $temp['num'] + 1), -$i, 4);
+                    return;
+            }
+        }
+
+        $remainder = strlen($var) % 4;
+
+        if ($remainder == 0) {
+            return;
+        }
+
+        $temp = unpack('Nnum', str_pad(substr($var, 0, $remainder), 4, "\0", STR_PAD_LEFT));
+        $temp = substr(pack('N', $temp['num'] + 1), -$remainder);
+        $var = substr_replace($var, $temp, 0, $remainder);
+    }
+
+    /**
+     * Setup the performance-optimized function for de/encrypt()
+     *
+     * Stores the created (or existing) callback function-name
+     * in $this->inline_crypt
+     *
+     * Internally for phpseclib developers:
+     *
+     *     _setupInlineCrypt() would be called only if:
+     *
+     *     - $engine == self::ENGINE_INTERNAL and
+     *
+     *     - $use_inline_crypt === true
+     *
+     *     - each time on _setup(), after(!) _setupKey()
+     *
+     *
+     *     This ensures that _setupInlineCrypt() has always a
+     *     full ready2go initializated internal cipher $engine state
+     *     where, for example, the keys allready expanded,
+     *     keys/block_size calculated and such.
+     *
+     *     It is, each time if called, the responsibility of _setupInlineCrypt():
+     *
+     *     - to set $this->inline_crypt to a valid and fully working callback function
+     *       as a (faster) replacement for encrypt() / decrypt()
+     *
+     *     - NOT to create unlimited callback functions (for memory reasons!)
+     *       no matter how often _setupInlineCrypt() would be called. At some
+     *       point of amount they must be generic re-useable.
+     *
+     *     - the code of _setupInlineCrypt() it self,
+     *       and the generated callback code,
+     *       must be, in following order:
+     *       - 100% safe
+     *       - 100% compatible to encrypt()/decrypt()
+     *       - using only php5+ features/lang-constructs/php-extensions if
+     *         compatibility (down to php4) or fallback is provided
+     *       - readable/maintainable/understandable/commented and... not-cryptic-styled-code :-)
+     *       - >= 10% faster than encrypt()/decrypt() [which is, by the way,
+     *         the reason for the existence of _setupInlineCrypt() :-)]
+     *       - memory-nice
+     *       - short (as good as possible)
+     *
+     * Note: - _setupInlineCrypt() is using _createInlineCryptFunction() to create the full callback function code.
+     *       - In case of using inline crypting, _setupInlineCrypt() must extend by the child \phpseclib\Crypt\* class.
+     *       - The following variable names are reserved:
+     *         - $_*  (all variable names prefixed with an underscore)
+     *         - $self (object reference to it self. Do not use $this, but $self instead)
+     *         - $in (the content of $in has to en/decrypt by the generated code)
+     *       - The callback function should not use the 'return' statement, but en/decrypt'ing the content of $in only
+     *
+     *
+     * @see self::_setup()
+     * @see self::_createInlineCryptFunction()
+     * @see self::encrypt()
+     * @see self::decrypt()
+     * @access private
+     * @internal If a Crypt_* class providing inline crypting it must extend _setupInlineCrypt()
+     */
+    function _setupInlineCrypt()
+    {
+        // If, for any reason, an extending \phpseclib\Crypt\Base() \phpseclib\Crypt\* class
+        // not using inline crypting then it must be ensured that: $this->use_inline_crypt = false
+        // ie in the class var declaration of $use_inline_crypt in general for the \phpseclib\Crypt\* class,
+        // in the constructor at object instance-time
+        // or, if it's runtime-specific, at runtime
+
+        $this->use_inline_crypt = false;
+    }
+
+    /**
+     * Creates the performance-optimized function for en/decrypt()
+     *
+     * Internally for phpseclib developers:
+     *
+     *    _createInlineCryptFunction():
+     *
+     *    - merge the $cipher_code [setup'ed by _setupInlineCrypt()]
+     *      with the current [$this->]mode of operation code
+     *
+     *    - create the $inline function, which called by encrypt() / decrypt()
+     *      as its replacement to speed up the en/decryption operations.
+     *
+     *    - return the name of the created $inline callback function
+     *
+     *    - used to speed up en/decryption
+     *
+     *
+     *
+     *    The main reason why can speed up things [up to 50%] this way are:
+     *
+     *    - using variables more effective then regular.
+     *      (ie no use of expensive arrays but integers $k_0, $k_1 ...
+     *      or even, for example, the pure $key[] values hardcoded)
+     *
+     *    - avoiding 1000's of function calls of ie _encryptBlock()
+     *      but inlining the crypt operations.
+     *      in the mode of operation for() loop.
+     *
+     *    - full loop unroll the (sometimes key-dependent) rounds
+     *      avoiding this way ++$i counters and runtime-if's etc...
+     *
+     *    The basic code architectur of the generated $inline en/decrypt()
+     *    lambda function, in pseudo php, is:
+     *
+     *    <code>
+     *    +----------------------------------------------------------------------------------------------+
+     *    | callback $inline = create_function:                                                          |
+     *    | lambda_function_0001_crypt_ECB($action, $text)                                               |
+     *    | {                                                                                            |
+     *    |     INSERT PHP CODE OF:                                                                      |
+     *    |     $cipher_code['init_crypt'];                  // general init code.                       |
+     *    |                                                  // ie: $sbox'es declarations used for       |
+     *    |                                                  //     encrypt and decrypt'ing.             |
+     *    |                                                                                              |
+     *    |     switch ($action) {                                                                       |
+     *    |         case 'encrypt':                                                                      |
+     *    |             INSERT PHP CODE OF:                                                              |
+     *    |             $cipher_code['init_encrypt'];       // encrypt sepcific init code.               |
+     *    |                                                    ie: specified $key or $box                |
+     *    |                                                        declarations for encrypt'ing.         |
+     *    |                                                                                              |
+     *    |             foreach ($ciphertext) {                                                          |
+     *    |                 $in = $block_size of $ciphertext;                                            |
+     *    |                                                                                              |
+     *    |                 INSERT PHP CODE OF:                                                          |
+     *    |                 $cipher_code['encrypt_block'];  // encrypt's (string) $in, which is always:  |
+     *    |                                                 // strlen($in) == $this->block_size          |
+     *    |                                                 // here comes the cipher algorithm in action |
+     *    |                                                 // for encryption.                           |
+     *    |                                                 // $cipher_code['encrypt_block'] has to      |
+     *    |                                                 // encrypt the content of the $in variable   |
+     *    |                                                                                              |
+     *    |                 $plaintext .= $in;                                                           |
+     *    |             }                                                                                |
+     *    |             return $plaintext;                                                               |
+     *    |                                                                                              |
+     *    |         case 'decrypt':                                                                      |
+     *    |             INSERT PHP CODE OF:                                                              |
+     *    |             $cipher_code['init_decrypt'];       // decrypt sepcific init code                |
+     *    |                                                    ie: specified $key or $box                |
+     *    |                                                        declarations for decrypt'ing.         |
+     *    |             foreach ($plaintext) {                                                           |
+     *    |                 $in = $block_size of $plaintext;                                             |
+     *    |                                                                                              |
+     *    |                 INSERT PHP CODE OF:                                                          |
+     *    |                 $cipher_code['decrypt_block'];  // decrypt's (string) $in, which is always   |
+     *    |                                                 // strlen($in) == $this->block_size          |
+     *    |                                                 // here comes the cipher algorithm in action |
+     *    |                                                 // for decryption.                           |
+     *    |                                                 // $cipher_code['decrypt_block'] has to      |
+     *    |                                                 // decrypt the content of the $in variable   |
+     *    |                 $ciphertext .= $in;                                                          |
+     *    |             }                                                                                |
+     *    |             return $ciphertext;                                                              |
+     *    |     }                                                                                        |
+     *    | }                                                                                            |
+     *    +----------------------------------------------------------------------------------------------+
+     *    </code>
+     *
+     *    See also the \phpseclib\Crypt\*::_setupInlineCrypt()'s for
+     *    productive inline $cipher_code's how they works.
+     *
+     *    Structure of:
+     *    <code>
+     *    $cipher_code = array(
+     *        'init_crypt'    => (string) '', // optional
+     *        'init_encrypt'  => (string) '', // optional
+     *        'init_decrypt'  => (string) '', // optional
+     *        'encrypt_block' => (string) '', // required
+     *        'decrypt_block' => (string) ''  // required
+     *    );
+     *    </code>
+     *
+     * @see self::_setupInlineCrypt()
+     * @see self::encrypt()
+     * @see self::decrypt()
+     * @param array $cipher_code
+     * @access private
+     * @return string (the name of the created callback function)
+     */
+    function _createInlineCryptFunction($cipher_code)
+    {
+        $block_size = $this->block_size;
+
+        // optional
+        $init_crypt    = isset($cipher_code['init_crypt'])    ? $cipher_code['init_crypt']    : '';
+        $init_encrypt  = isset($cipher_code['init_encrypt'])  ? $cipher_code['init_encrypt']  : '';
+        $init_decrypt  = isset($cipher_code['init_decrypt'])  ? $cipher_code['init_decrypt']  : '';
+        // required
+        $encrypt_block = $cipher_code['encrypt_block'];
+        $decrypt_block = $cipher_code['decrypt_block'];
+
+        // Generating mode of operation inline code,
+        // merged with the $cipher_code algorithm
+        // for encrypt- and decryption.
+        switch ($this->mode) {
+            case self::MODE_ECB:
+                $encrypt = $init_encrypt . '
+                    $_ciphertext = "";
+                    $_plaintext_len = strlen($_text);
+
+                    for ($_i = 0; $_i < $_plaintext_len; $_i+= '.$block_size.') {
+                        $in = substr($_text, $_i, '.$block_size.');
+                        '.$encrypt_block.'
+                        $_ciphertext.= $in;
+                    }
+
+                    return $_ciphertext;
+                    ';
+
+                $decrypt = $init_decrypt . '
+                    $_plaintext = "";
+                    $_text = str_pad($_text, strlen($_text) + ('.$block_size.' - strlen($_text) % '.$block_size.') % '.$block_size.', chr(0));
+                    $_ciphertext_len = strlen($_text);
+
+                    for ($_i = 0; $_i < $_ciphertext_len; $_i+= '.$block_size.') {
+                        $in = substr($_text, $_i, '.$block_size.');
+                        '.$decrypt_block.'
+                        $_plaintext.= $in;
+                    }
+
+                    return $self->_unpad($_plaintext);
+                    ';
+                break;
+            case self::MODE_CTR:
+                $encrypt = $init_encrypt . '
+                    $_ciphertext = "";
+                    $_plaintext_len = strlen($_text);
+                    $_xor = $self->encryptIV;
+                    $_buffer = &$self->enbuffer;
+                    if (strlen($_buffer["ciphertext"])) {
+                        for ($_i = 0; $_i < $_plaintext_len; $_i+= '.$block_size.') {
+                            $_block = substr($_text, $_i, '.$block_size.');
+                            if (strlen($_block) > strlen($_buffer["ciphertext"])) {
+                                $in = $_xor;
+                                '.$encrypt_block.'
+                                $self->_increment_str($_xor);
+                                $_buffer["ciphertext"].= $in;
+                            }
+                            $_key = $self->_string_shift($_buffer["ciphertext"], '.$block_size.');
+                            $_ciphertext.= $_block ^ $_key;
+                        }
+                    } else {
+                        for ($_i = 0; $_i < $_plaintext_len; $_i+= '.$block_size.') {
+                            $_block = substr($_text, $_i, '.$block_size.');
+                            $in = $_xor;
+                            '.$encrypt_block.'
+                            $self->_increment_str($_xor);
+                            $_key = $in;
+                            $_ciphertext.= $_block ^ $_key;
+                        }
+                    }
+                    if ($self->continuousBuffer) {
+                        $self->encryptIV = $_xor;
+                        if ($_start = $_plaintext_len % '.$block_size.') {
+                            $_buffer["ciphertext"] = substr($_key, $_start) . $_buffer["ciphertext"];
+                        }
+                    }
+
+                    return $_ciphertext;
+                ';
+
+                $decrypt = $init_encrypt . '
+                    $_plaintext = "";
+                    $_ciphertext_len = strlen($_text);
+                    $_xor = $self->decryptIV;
+                    $_buffer = &$self->debuffer;
+
+                    if (strlen($_buffer["ciphertext"])) {
+                        for ($_i = 0; $_i < $_ciphertext_len; $_i+= '.$block_size.') {
+                            $_block = substr($_text, $_i, '.$block_size.');
+                            if (strlen($_block) > strlen($_buffer["ciphertext"])) {
+                                $in = $_xor;
+                                '.$encrypt_block.'
+                                $self->_increment_str($_xor);
+                                $_buffer["ciphertext"].= $in;
+                            }
+                            $_key = $self->_string_shift($_buffer["ciphertext"], '.$block_size.');
+                            $_plaintext.= $_block ^ $_key;
+                        }
+                    } else {
+                        for ($_i = 0; $_i < $_ciphertext_len; $_i+= '.$block_size.') {
+                            $_block = substr($_text, $_i, '.$block_size.');
+                            $in = $_xor;
+                            '.$encrypt_block.'
+                            $self->_increment_str($_xor);
+                            $_key = $in;
+                            $_plaintext.= $_block ^ $_key;
+                        }
+                    }
+                    if ($self->continuousBuffer) {
+                        $self->decryptIV = $_xor;
+                        if ($_start = $_ciphertext_len % '.$block_size.') {
+                            $_buffer["ciphertext"] = substr($_key, $_start) . $_buffer["ciphertext"];
+                        }
+                    }
+
+                    return $_plaintext;
+                    ';
+                break;
+            case self::MODE_CFB:
+                $encrypt = $init_encrypt . '
+                    $_ciphertext = "";
+                    $_buffer = &$self->enbuffer;
+
+                    if ($self->continuousBuffer) {
+                        $_iv = &$self->encryptIV;
+                        $_pos = &$_buffer["pos"];
+                    } else {
+                        $_iv = $self->encryptIV;
+                        $_pos = 0;
+                    }
+                    $_len = strlen($_text);
+                    $_i = 0;
+                    if ($_pos) {
+                        $_orig_pos = $_pos;
+                        $_max = '.$block_size.' - $_pos;
+                        if ($_len >= $_max) {
+                            $_i = $_max;
+                            $_len-= $_max;
+                            $_pos = 0;
+                        } else {
+                            $_i = $_len;
+                            $_pos+= $_len;
+                            $_len = 0;
+                        }
+                        $_ciphertext = substr($_iv, $_orig_pos) ^ $_text;
+                        $_iv = substr_replace($_iv, $_ciphertext, $_orig_pos, $_i);
+                    }
+                    while ($_len >= '.$block_size.') {
+                        $in = $_iv;
+                        '.$encrypt_block.';
+                        $_iv = $in ^ substr($_text, $_i, '.$block_size.');
+                        $_ciphertext.= $_iv;
+                        $_len-= '.$block_size.';
+                        $_i+= '.$block_size.';
+                    }
+                    if ($_len) {
+                        $in = $_iv;
+                        '.$encrypt_block.'
+                        $_iv = $in;
+                        $_block = $_iv ^ substr($_text, $_i);
+                        $_iv = substr_replace($_iv, $_block, 0, $_len);
+                        $_ciphertext.= $_block;
+                        $_pos = $_len;
+                    }
+                    return $_ciphertext;
+                ';
+
+                $decrypt = $init_encrypt . '
+                    $_plaintext = "";
+                    $_buffer = &$self->debuffer;
+
+                    if ($self->continuousBuffer) {
+                        $_iv = &$self->decryptIV;
+                        $_pos = &$_buffer["pos"];
+                    } else {
+                        $_iv = $self->decryptIV;
+                        $_pos = 0;
+                    }
+                    $_len = strlen($_text);
+                    $_i = 0;
+                    if ($_pos) {
+                        $_orig_pos = $_pos;
+                        $_max = '.$block_size.' - $_pos;
+                        if ($_len >= $_max) {
+                            $_i = $_max;
+                            $_len-= $_max;
+                            $_pos = 0;
+                        } else {
+                            $_i = $_len;
+                            $_pos+= $_len;
+                            $_len = 0;
+                        }
+                        $_plaintext = substr($_iv, $_orig_pos) ^ $_text;
+                        $_iv = substr_replace($_iv, substr($_text, 0, $_i), $_orig_pos, $_i);
+                    }
+                    while ($_len >= '.$block_size.') {
+                        $in = $_iv;
+                        '.$encrypt_block.'
+                        $_iv = $in;
+                        $cb = substr($_text, $_i, '.$block_size.');
+                        $_plaintext.= $_iv ^ $cb;
+                        $_iv = $cb;
+                        $_len-= '.$block_size.';
+                        $_i+= '.$block_size.';
+                    }
+                    if ($_len) {
+                        $in = $_iv;
+                        '.$encrypt_block.'
+                        $_iv = $in;
+                        $_plaintext.= $_iv ^ substr($_text, $_i);
+                        $_iv = substr_replace($_iv, substr($_text, $_i), 0, $_len);
+                        $_pos = $_len;
+                    }
+
+                    return $_plaintext;
+                    ';
+                break;
+            case self::MODE_OFB:
+                $encrypt = $init_encrypt . '
+                    $_ciphertext = "";
+                    $_plaintext_len = strlen($_text);
+                    $_xor = $self->encryptIV;
+                    $_buffer = &$self->enbuffer;
+
+                    if (strlen($_buffer["xor"])) {
+                        for ($_i = 0; $_i < $_plaintext_len; $_i+= '.$block_size.') {
+                            $_block = substr($_text, $_i, '.$block_size.');
+                            if (strlen($_block) > strlen($_buffer["xor"])) {
+                                $in = $_xor;
+                                '.$encrypt_block.'
+                                $_xor = $in;
+                                $_buffer["xor"].= $_xor;
+                            }
+                            $_key = $self->_string_shift($_buffer["xor"], '.$block_size.');
+                            $_ciphertext.= $_block ^ $_key;
+                        }
+                    } else {
+                        for ($_i = 0; $_i < $_plaintext_len; $_i+= '.$block_size.') {
+                            $in = $_xor;
+                            '.$encrypt_block.'
+                            $_xor = $in;
+                            $_ciphertext.= substr($_text, $_i, '.$block_size.') ^ $_xor;
+                        }
+                        $_key = $_xor;
+                    }
+                    if ($self->continuousBuffer) {
+                        $self->encryptIV = $_xor;
+                        if ($_start = $_plaintext_len % '.$block_size.') {
+                             $_buffer["xor"] = substr($_key, $_start) . $_buffer["xor"];
+                        }
+                    }
+                    return $_ciphertext;
+                    ';
+
+                $decrypt = $init_encrypt . '
+                    $_plaintext = "";
+                    $_ciphertext_len = strlen($_text);
+                    $_xor = $self->decryptIV;
+                    $_buffer = &$self->debuffer;
+
+                    if (strlen($_buffer["xor"])) {
+                        for ($_i = 0; $_i < $_ciphertext_len; $_i+= '.$block_size.') {
+                            $_block = substr($_text, $_i, '.$block_size.');
+                            if (strlen($_block) > strlen($_buffer["xor"])) {
+                                $in = $_xor;
+                                '.$encrypt_block.'
+                                $_xor = $in;
+                                $_buffer["xor"].= $_xor;
+                            }
+                            $_key = $self->_string_shift($_buffer["xor"], '.$block_size.');
+                            $_plaintext.= $_block ^ $_key;
+                        }
+                    } else {
+                        for ($_i = 0; $_i < $_ciphertext_len; $_i+= '.$block_size.') {
+                            $in = $_xor;
+                            '.$encrypt_block.'
+                            $_xor = $in;
+                            $_plaintext.= substr($_text, $_i, '.$block_size.') ^ $_xor;
+                        }
+                        $_key = $_xor;
+                    }
+                    if ($self->continuousBuffer) {
+                        $self->decryptIV = $_xor;
+                        if ($_start = $_ciphertext_len % '.$block_size.') {
+                             $_buffer["xor"] = substr($_key, $_start) . $_buffer["xor"];
+                        }
+                    }
+                    return $_plaintext;
+                    ';
+                break;
+            case self::MODE_STREAM:
+                $encrypt = $init_encrypt . '
+                    $_ciphertext = "";
+                    '.$encrypt_block.'
+                    return $_ciphertext;
+                    ';
+                $decrypt = $init_decrypt . '
+                    $_plaintext = "";
+                    '.$decrypt_block.'
+                    return $_plaintext;
+                    ';
+                break;
+            // case self::MODE_CBC:
+            default:
+                $encrypt = $init_encrypt . '
+                    $_ciphertext = "";
+                    $_plaintext_len = strlen($_text);
+
+                    $in = $self->encryptIV;
+
+                    for ($_i = 0; $_i < $_plaintext_len; $_i+= '.$block_size.') {
+                        $in = substr($_text, $_i, '.$block_size.') ^ $in;
+                        '.$encrypt_block.'
+                        $_ciphertext.= $in;
+                    }
+
+                    if ($self->continuousBuffer) {
+                        $self->encryptIV = $in;
+                    }
+
+                    return $_ciphertext;
+                    ';
+
+                $decrypt = $init_decrypt . '
+                    $_plaintext = "";
+                    $_text = str_pad($_text, strlen($_text) + ('.$block_size.' - strlen($_text) % '.$block_size.') % '.$block_size.', chr(0));
+                    $_ciphertext_len = strlen($_text);
+
+                    $_iv = $self->decryptIV;
+
+                    for ($_i = 0; $_i < $_ciphertext_len; $_i+= '.$block_size.') {
+                        $in = $_block = substr($_text, $_i, '.$block_size.');
+                        '.$decrypt_block.'
+                        $_plaintext.= $in ^ $_iv;
+                        $_iv = $_block;
+                    }
+
+                    if ($self->continuousBuffer) {
+                        $self->decryptIV = $_iv;
+                    }
+
+                    return $self->_unpad($_plaintext);
+                    ';
+                break;
+        }
+
+        // Create the $inline function and return its name as string. Ready to run!
+        return create_function('$_action, &$self, $_text', $init_crypt . 'if ($_action == "encrypt") { ' . $encrypt . ' } else { ' . $decrypt . ' }');
+    }
+
+    /**
+     * Holds the lambda_functions table (classwide)
+     *
+     * Each name of the lambda function, created from
+     * _setupInlineCrypt() && _createInlineCryptFunction()
+     * is stored, classwide (!), here for reusing.
+     *
+     * The string-based index of $function is a classwide
+     * unique value representing, at least, the $mode of
+     * operation (or more... depends of the optimizing level)
+     * for which $mode the lambda function was created.
+     *
+     * @access private
+     * @return array &$functions
+     */
+    function &_getLambdaFunctions()
+    {
+        static $functions = array();
+        return $functions;
+    }
+
+    /**
+     * Generates a digest from $bytes
+     *
+     * @see self::_setupInlineCrypt()
+     * @access private
+     * @param $bytes
+     * @return string
+     */
+    function _hashInlineCryptFunction($bytes)
+    {
+        if (!isset(self::$WHIRLPOOL_AVAILABLE)) {
+            self::$WHIRLPOOL_AVAILABLE = extension_loaded('hash') && in_array('whirlpool', hash_algos());
+        }
+
+        $result = '';
+        $hash = $bytes;
+
+        switch (true) {
+            case self::$WHIRLPOOL_AVAILABLE:
+                foreach (str_split($bytes, 64) as $t) {
+                    $hash = hash('whirlpool', $hash, true);
+                    $result .= $t ^ $hash;
+                }
+                return $result . hash('whirlpool', $hash, true);
+            default:
+                $len = strlen($bytes);
+                for ($i = 0; $i < $len; $i+=20) {
+                    $t = substr($bytes, $i, 20);
+                    $hash = pack('H*', sha1($hash));
+                    $result .= $t ^ $hash;
+                }
+                return $result . pack('H*', sha1($hash));
+        }
+    }
+}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/Blowfish.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/Blowfish.php
index 12250708..3949e812 100644
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/Blowfish.php
+++ b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/Blowfish.php
@@ -11,93 +11,12 @@
  *
  *  - {@link http://en.wikipedia.org/wiki/Blowfish_(cipher) Wikipedia description of Blowfish}
  *
- * # An overview of bcrypt vs Blowfish
- *
- * OpenSSH private keys use a customized version of bcrypt. Specifically, instead of
- * encrypting OrpheanBeholderScryDoubt 64 times OpenSSH's bcrypt variant encrypts
- * OxychromaticBlowfishSwatDynamite 64 times. so we can't use crypt().
- *
- * bcrypt is basically Blowfish but instead of performing the key expansion once it performs
- * the expansion 129 times for each round, with the first key expansion interleaving the salt
- * and password. This renders OpenSSL unusable and forces us to use a pure-PHP implementation
- * of blowfish.
- *
- * # phpseclib's four different _encryptBlock() implementations
- *
- * When using Blowfish as an encryption algorithm, _encryptBlock() is called 9 + 512 +
- * (the number of blocks in the plaintext) times.
- *
- * Each of the first 9 calls to _encryptBlock() modify the P-array. Each of the next 512
- * calls modify the S-boxes. The remaining _encryptBlock() calls operate on the plaintext to
- * produce the ciphertext. In the pure-PHP implementation of Blowfish these remaining
- * _encryptBlock() calls are highly optimized through the use of eval(). Among other things,
- * P-array lookups are eliminated by hard-coding the key-dependent P-array values, and thus we
- * have explained 2 of the 4 different _encryptBlock() implementations.
- *
- * With bcrypt things are a bit different. _encryptBlock() is called 1,079,296 times,
- * assuming 16 rounds (which is what OpenSSH's bcrypt defaults to). The eval()-optimized
- * _encryptBlock() isn't as beneficial because the P-array values are not constant. Well, they
- * are constant, but only for, at most, 777 _encryptBlock() calls, which is equivalent to ~6KB
- * of data. The average length of back to back _encryptBlock() calls with a fixed P-array is
- * 514.12, which is ~4KB of data. Creating an eval()-optimized _encryptBlock() has an upfront
- * cost, which is CPU dependent and is probably not going to be worth it for just ~4KB of
- * data. Conseqeuently, bcrypt does not benefit from the eval()-optimized _encryptBlock().
- *
- * The regular _encryptBlock() does unpack() and pack() on every call, as well, and that can
- * begin to add up after one million function calls.
- *
- * In theory, one might think that it might be beneficial to rewrite all block ciphers so
- * that, instead of passing strings to _encryptBlock(), you convert the string to an array of
- * integers and then pass successive subarrays of that array to _encryptBlock. This, however,
- * kills PHP's memory use. Like let's say you have a 1MB long string. After doing
- * $in = str_repeat('a', 1024 * 1024); PHP's memory utilization jumps up by ~1MB. After doing
- * $blocks = str_split($in, 4); it jumps up by an additional ~16MB. After
- * $blocks = array_map(fn($x) => unpack('N*', $x), $blocks); it jumps up by an additional
- * ~90MB, yielding a 106x increase in memory usage. Consequently, it bcrypt calls a different
- * _encryptBlock() then the regular Blowfish does. That said, the Blowfish _encryptBlock() is
- * basically just a thin wrapper around the bcrypt _encryptBlock(), so there's that.
- *
- * This explains 3 of the 4 _encryptBlock() implementations. the last _encryptBlock()
- * implementation can best be understood by doing Ctrl + F and searching for where
- * self::$use_reg_intval is defined.
- *
- * # phpseclib's three different _setupKey() implementations
- *
- * Every bcrypt round is the equivalent of encrypting 512KB of data. Since OpenSSH uses 16
- * rounds by default that's ~8MB of data that's essentially being encrypted whenever
- * you use bcrypt. That's a lot of data, however, bcrypt operates within tighter constraints
- * than regular Blowfish, so we can use that to our advantage. In particular, whereas Blowfish
- * supports variable length keys, in bcrypt, the initial "key" is the sha512 hash of the
- * password. sha512 hashes are 512 bits or 64 bytes long and thus the bcrypt keys are of a
- * fixed length whereas Blowfish keys are not of a fixed length.
- *
- * bcrypt actually has two different key expansion steps. The first one (expandstate) is
- * constantly XOR'ing every _encryptBlock() parameter against the salt prior _encryptBlock()'s
- * being called. The second one (expand0state) is more similar to Blowfish's _setupKey()
- * but it can still use the fixed length key optimization discussed above and can do away with
- * the pack() / unpack() calls.
- *
- * I suppose _setupKey() could be made to be a thin wrapper around expandstate() but idk it's
- * just a lot of work for very marginal benefits as _setupKey() is only called once for
- * regular Blowfish vs the 128 times it's called --per round-- with bcrypt.
- *
- * # blowfish + bcrypt in the same class
- *
- * Altho there's a lot of Blowfish code that bcrypt doesn't re-use, bcrypt does re-use the
- * initial S-boxes, the initial P-array and the int-only _encryptBlock() implementation.
- *
- * # Credit
- *
- * phpseclib's bcrypt implementation is based losely off of OpenSSH's implementation:
- *
- * https://github.com/openssh/openssh-portable/blob/master/openbsd-compat/bcrypt_pbkdf.c
- *
  * Here's a short example of how to use this library:
  * <code>
  * <?php
  *    include 'vendor/autoload.php';
  *
- *    $blowfish = new \phpseclib3\Crypt\Blowfish('ctr');
+ *    $blowfish = new \phpseclib\Crypt\Blowfish();
  *
  *    $blowfish->setKey('12345678901234567890123456789012');
  *
@@ -107,6 +26,8 @@
  * ?>
  * </code>
  *
+ * @category  Crypt
+ * @package   Blowfish
  * @author    Jim Wigginton <terrafrost@php.net>
  * @author    Hans-Juergen Petrich <petrich@tronic-media.com>
  * @copyright 2007 Jim Wigginton
@@ -114,50 +35,54 @@
  * @link      http://phpseclib.sourceforge.net
  */
 
-namespace phpseclib3\Crypt;
-
-use phpseclib3\Crypt\Common\BlockCipher;
+namespace phpseclib\Crypt;
 
 /**
  * Pure-PHP implementation of Blowfish.
  *
+ * @package Blowfish
  * @author  Jim Wigginton <terrafrost@php.net>
  * @author  Hans-Juergen Petrich <petrich@tronic-media.com>
+ * @access  public
  */
-class Blowfish extends BlockCipher
+class Blowfish extends Base
 {
     /**
      * Block Length of the cipher
      *
-     * @see \phpseclib3\Crypt\Common\SymmetricKey::block_size
+     * @see \phpseclib\Crypt\Base::block_size
      * @var int
+     * @access private
      */
-    protected $block_size = 8;
+    var $block_size = 8;
 
     /**
      * The mcrypt specific name of the cipher
      *
-     * @see \phpseclib3\Crypt\Common\SymmetricKey::cipher_name_mcrypt
+     * @see \phpseclib\Crypt\Base::cipher_name_mcrypt
      * @var string
+     * @access private
      */
-    protected $cipher_name_mcrypt = 'blowfish';
+    var $cipher_name_mcrypt = 'blowfish';
 
     /**
      * Optimizing value while CFB-encrypting
      *
-     * @see \phpseclib3\Crypt\Common\SymmetricKey::cfb_init_len
+     * @see \phpseclib\Crypt\Base::cfb_init_len
      * @var int
+     * @access private
      */
-    protected $cfb_init_len = 500;
+    var $cfb_init_len = 500;
 
     /**
      * The fixed subkeys boxes ($sbox0 - $sbox3) with 256 entries each
      *
      * S-Box 0
      *
+     * @access private
      * @var    array
      */
-    private static $sbox0 = [
+    var $sbox0 = array(
         0xd1310ba6, 0x98dfb5ac, 0x2ffd72db, 0xd01adfb7, 0xb8e1afed, 0x6a267e96, 0xba7c9045, 0xf12c7f99,
         0x24a19947, 0xb3916cf7, 0x0801f2e2, 0x858efc16, 0x636920d8, 0x71574e69, 0xa458fea3, 0xf4933d7e,
         0x0d95748f, 0x728eb658, 0x718bcd58, 0x82154aee, 0x7b54a41d, 0xc25a59b5, 0x9c30d539, 0x2af26013,
@@ -190,14 +115,15 @@ class Blowfish extends BlockCipher
         0x83260376, 0x6295cfa9, 0x11c81968, 0x4e734a41, 0xb3472dca, 0x7b14a94a, 0x1b510052, 0x9a532915,
         0xd60f573f, 0xbc9bc6e4, 0x2b60a476, 0x81e67400, 0x08ba6fb5, 0x571be91f, 0xf296ec6b, 0x2a0dd915,
         0xb6636521, 0xe7b9f9b6, 0xff34052e, 0xc5855664, 0x53b02d5d, 0xa99f8fa1, 0x08ba4799, 0x6e85076a
-    ];
+    );
 
     /**
      * S-Box 1
      *
+     * @access private
      * @var    array
      */
-    private static $sbox1 = [
+    var $sbox1 = array(
         0x4b7a70e9, 0xb5b32944, 0xdb75092e, 0xc4192623, 0xad6ea6b0, 0x49a7df7d, 0x9cee60b8, 0x8fedb266,
         0xecaa8c71, 0x699a17ff, 0x5664526c, 0xc2b19ee1, 0x193602a5, 0x75094c29, 0xa0591340, 0xe4183a3e,
         0x3f54989a, 0x5b429d65, 0x6b8fe4d6, 0x99f73fd6, 0xa1d29c07, 0xefe830f5, 0x4d2d38e6, 0xf0255dc1,
@@ -230,14 +156,15 @@ class Blowfish extends BlockCipher
         0xa6078084, 0x19f8509e, 0xe8efd855, 0x61d99735, 0xa969a7aa, 0xc50c06c2, 0x5a04abfc, 0x800bcadc,
         0x9e447a2e, 0xc3453484, 0xfdd56705, 0x0e1e9ec9, 0xdb73dbd3, 0x105588cd, 0x675fda79, 0xe3674340,
         0xc5c43465, 0x713e38d8, 0x3d28f89e, 0xf16dff20, 0x153e21e7, 0x8fb03d4a, 0xe6e39f2b, 0xdb83adf7
-    ];
+    );
 
     /**
      * S-Box 2
      *
+     * @access private
      * @var    array
      */
-    private static $sbox2 = [
+    var $sbox2 = array(
         0xe93d5a68, 0x948140f7, 0xf64c261c, 0x94692934, 0x411520f7, 0x7602d4f7, 0xbcf46b2e, 0xd4a20068,
         0xd4082471, 0x3320f46a, 0x43b7d4b7, 0x500061af, 0x1e39f62e, 0x97244546, 0x14214f74, 0xbf8b8840,
         0x4d95fc1d, 0x96b591af, 0x70f4ddd3, 0x66a02f45, 0xbfbc09ec, 0x03bd9785, 0x7fac6dd0, 0x31cb8504,
@@ -270,14 +197,15 @@ class Blowfish extends BlockCipher
         0x6f05e409, 0x4b7c0188, 0x39720a3d, 0x7c927c24, 0x86e3725f, 0x724d9db9, 0x1ac15bb4, 0xd39eb8fc,
         0xed545578, 0x08fca5b5, 0xd83d7cd3, 0x4dad0fc4, 0x1e50ef5e, 0xb161e6f8, 0xa28514d9, 0x6c51133c,
         0x6fd5c7e7, 0x56e14ec4, 0x362abfce, 0xddc6c837, 0xd79a3234, 0x92638212, 0x670efa8e, 0x406000e0
-    ];
+    );
 
     /**
      * S-Box 3
      *
+     * @access private
      * @var    array
      */
-    private static $sbox3 = [
+    var $sbox3 = array(
         0x3a39ce37, 0xd3faf5cf, 0xabc27737, 0x5ac52d1b, 0x5cb0679e, 0x4fa33742, 0xd3822740, 0x99bc9bbe,
         0xd5118e9d, 0xbf0f7315, 0xd62d1c7e, 0xc700c47b, 0xb78c1b6b, 0x21a19045, 0xb26eb1be, 0x6a366eb4,
         0x5748ab2f, 0xbc946e79, 0xc6a376d2, 0x6549c2c8, 0x530ff8ee, 0x468dde7d, 0xd5730a1d, 0x4cd04dc6,
@@ -310,18 +238,19 @@ class Blowfish extends BlockCipher
         0x53113ec0, 0x1640e3d3, 0x38abbd60, 0x2547adf0, 0xba38209c, 0xf746ce76, 0x77afa1c5, 0x20756060,
         0x85cbfe4e, 0x8ae88dd8, 0x7aaaf9b0, 0x4cf9aa7e, 0x1948c25c, 0x02fb8a8c, 0x01c36ae4, 0xd6ebe1f9,
         0x90d4f869, 0xa65cdea0, 0x3f09252d, 0xc208e69f, 0xb74e6132, 0xce77e25b, 0x578fdfe3, 0x3ac372e6
-    ];
+    );
 
     /**
      * P-Array consists of 18 32-bit subkeys
      *
      * @var array
+     * @access private
      */
-    private static $parray = [
+    var $parray = array(
         0x243f6a88, 0x85a308d3, 0x13198a2e, 0x03707344, 0xa4093822, 0x299f31d0,
         0x082efa98, 0xec4e6c89, 0x452821e6, 0x38d01377, 0xbe5466cf, 0x34e90c6c,
         0xc0ac29b7, 0xc97c50dd, 0x3f84d5b5, 0xb5470917, 0x9216d5d9, 0x8979fb1b
-    ];
+    );
 
     /**
      * The BCTX-working Array
@@ -329,117 +258,103 @@ class Blowfish extends BlockCipher
      * Holds the expanded key [p] and the key-depended s-boxes [sb]
      *
      * @var array
+     * @access private
      */
-    private $bctx;
+    var $bctx;
 
     /**
      * Holds the last used key
      *
      * @var array
+     * @access private
      */
-    private $kl;
+    var $kl;
 
     /**
      * The Key Length (in bytes)
-     * {@internal The max value is 256 / 8 = 32, the min value is 128 / 8 = 16.  Exists in conjunction with $Nk
+     *
+     * @see \phpseclib\Crypt\Base::setKeyLength()
+     * @var int
+     * @access private
+     * @internal The max value is 256 / 8 = 32, the min value is 128 / 8 = 16.  Exists in conjunction with $Nk
      *    because the encryption / decryption / key schedule creation requires this number and not $key_length.  We could
      *    derive this from $key_length or vice versa, but that'd mean we'd have to do multiple shift operations, so in lieu
-     *    of that, we'll just precompute it once.}
-     *
-     * @see \phpseclib3\Crypt\Common\SymmetricKey::setKeyLength()
-     * @var int
+     *    of that, we'll just precompute it once.
      */
-    protected $key_length = 16;
-
-    /**
-     * Default Constructor.
-     *
-     * @param string $mode
-     * @throws \InvalidArgumentException if an invalid / unsupported mode is provided
-     */
-    public function __construct($mode)
-    {
-        parent::__construct($mode);
-
-        if ($this->mode == self::MODE_STREAM) {
-            throw new \InvalidArgumentException('Block ciphers cannot be ran in stream mode');
-        }
-    }
+    var $key_length = 16;
 
     /**
      * Sets the key length.
      *
      * Key lengths can be between 32 and 448 bits.
      *
+     * @access public
      * @param int $length
      */
-    public function setKeyLength($length)
+    function setKeyLength($length)
     {
-        if ($length < 32 || $length > 448) {
-                throw new \LengthException('Key size of ' . $length . ' bits is not supported by this algorithm. Only keys of sizes between 32 and 448 bits are supported');
+        if ($length < 32) {
+            $this->key_length = 7;
+        } elseif ($length > 448) {
+            $this->key_length = 56;
+        } else {
+            $this->key_length = $length >> 3;
         }
 
-        $this->key_length = $length >> 3;
-
         parent::setKeyLength($length);
     }
 
     /**
      * Test for engine validity
      *
-     * This is mainly just a wrapper to set things up for \phpseclib3\Crypt\Common\SymmetricKey::isValidEngine()
+     * This is mainly just a wrapper to set things up for \phpseclib\Crypt\Base::isValidEngine()
      *
-     * @see \phpseclib3\Crypt\Common\SymmetricKey::isValidEngine()
+     * @see \phpseclib\Crypt\Base::isValidEngine()
      * @param int $engine
+     * @access public
      * @return bool
      */
-    protected function isValidEngineHelper($engine)
+    function isValidEngine($engine)
     {
         if ($engine == self::ENGINE_OPENSSL) {
-            if ($this->key_length < 16) {
-                return false;
-            }
-            // quoting https://www.openssl.org/news/openssl-3.0-notes.html, OpenSSL 3.0.1
-            // "Moved all variations of the EVP ciphers CAST5, BF, IDEA, SEED, RC2, RC4, RC5, and DES to the legacy provider"
-            // in theory openssl_get_cipher_methods() should catch this but, on GitHub Actions, at least, it does not
-            if (defined('OPENSSL_VERSION_TEXT') && version_compare(preg_replace('#OpenSSL (\d+\.\d+\.\d+) .*#', '$1', OPENSSL_VERSION_TEXT), '3.0.1', '>=')) {
+            if ($this->key_length != 16) {
                 return false;
             }
             $this->cipher_name_openssl_ecb = 'bf-ecb';
-            $this->cipher_name_openssl = 'bf-' . $this->openssl_translate_mode();
+            $this->cipher_name_openssl = 'bf-' . $this->_openssl_translate_mode();
         }
 
-        return parent::isValidEngineHelper($engine);
+        return parent::isValidEngine($engine);
     }
 
     /**
      * Setup the key (expansion)
      *
-     * @see \phpseclib3\Crypt\Common\SymmetricKey::_setupKey()
+     * @see \phpseclib\Crypt\Base::_setupKey()
+     * @access private
      */
-    protected function setupKey()
+    function _setupKey()
     {
         if (isset($this->kl['key']) && $this->key === $this->kl['key']) {
             // already expanded
             return;
         }
-        $this->kl = ['key' => $this->key];
+        $this->kl = array('key' => $this->key);
 
         /* key-expanding p[] and S-Box building sb[] */
-        $this->bctx = [
-            'p'  => [],
-            'sb' => [
-                self::$sbox0,
-                self::$sbox1,
-                self::$sbox2,
-                self::$sbox3
-            ]
-        ];
+        $this->bctx = array(
+            'p'  => array(),
+            'sb' => array(
+                $this->sbox0,
+                $this->sbox1,
+                $this->sbox2,
+                $this->sbox3
+            )
+        );
 
         // unpack binary string in unsigned chars
         $key  = array_values(unpack('C*', $this->key));
         $keyl = count($key);
-        // with bcrypt $keyl will always be 16 (because the key is the sha512 of the key you provide)
         for ($j = 0, $i = 0; $i < 18; ++$i) {
             // xor P1 with the first 32-bits of the key, xor P2 with the second 32-bits ...
             for ($data = 0, $k = 0; $k < 4; ++$k) {
@@ -448,471 +363,212 @@ class Blowfish extends BlockCipher
                     $j = 0;
                 }
             }
-            $this->bctx['p'][] = self::$parray[$i] ^ intval($data);
+            $this->bctx['p'][] = $this->parray[$i] ^ $data;
         }
 
         // encrypt the zero-string, replace P1 and P2 with the encrypted data,
         // encrypt P3 and P4 with the new P1 and P2, do it with all P-array and subkeys
         $data = "\0\0\0\0\0\0\0\0";
         for ($i = 0; $i < 18; $i += 2) {
-            list($l, $r) = array_values(unpack('N*', $data = $this->encryptBlock($data)));
+            list($l, $r) = array_values(unpack('N*', $data = $this->_encryptBlock($data)));
             $this->bctx['p'][$i    ] = $l;
             $this->bctx['p'][$i + 1] = $r;
         }
         for ($i = 0; $i < 4; ++$i) {
             for ($j = 0; $j < 256; $j += 2) {
-                list($l, $r) = array_values(unpack('N*', $data = $this->encryptBlock($data)));
+                list($l, $r) = array_values(unpack('N*', $data = $this->_encryptBlock($data)));
                 $this->bctx['sb'][$i][$j    ] = $l;
                 $this->bctx['sb'][$i][$j + 1] = $r;
             }
         }
     }
 
-    /**
-     * Initialize Static Variables
-     */
-    protected static function initialize_static_variables()
-    {
-        if (is_float(self::$sbox2[0])) {
-            self::$sbox0 = array_map('intval', self::$sbox0);
-            self::$sbox1 = array_map('intval', self::$sbox1);
-            self::$sbox2 = array_map('intval', self::$sbox2);
-            self::$sbox3 = array_map('intval', self::$sbox3);
-            self::$parray = array_map('intval', self::$parray);
-        }
-
-        parent::initialize_static_variables();
-    }
-
-    /**
-     * bcrypt
-     *
-     * @param string $sha2pass
-     * @param string $sha2salt
-     * @access private
-     * @return string
-     */
-    private static function bcrypt_hash($sha2pass, $sha2salt)
-    {
-        $p = self::$parray;
-        $sbox0 = self::$sbox0;
-        $sbox1 = self::$sbox1;
-        $sbox2 = self::$sbox2;
-        $sbox3 = self::$sbox3;
-
-        $cdata = array_values(unpack('N*', 'OxychromaticBlowfishSwatDynamite'));
-        $sha2pass = array_values(unpack('N*', $sha2pass));
-        $sha2salt = array_values(unpack('N*', $sha2salt));
-
-        self::expandstate($sha2salt, $sha2pass, $sbox0, $sbox1, $sbox2, $sbox3, $p);
-        for ($i = 0; $i < 64; $i++) {
-            self::expand0state($sha2salt, $sbox0, $sbox1, $sbox2, $sbox3, $p);
-            self::expand0state($sha2pass, $sbox0, $sbox1, $sbox2, $sbox3, $p);
-        }
-
-        for ($i = 0; $i < 64; $i++) {
-            for ($j = 0; $j < 8; $j += 2) { // count($cdata) == 8
-                list($cdata[$j], $cdata[$j + 1]) = self::encryptBlockHelperFast($cdata[$j], $cdata[$j + 1], $sbox0, $sbox1, $sbox2, $sbox3, $p);
-            }
-        }
-
-        return pack('L*', ...$cdata);
-    }
-
-    /**
-     * Performs OpenSSH-style bcrypt
-     *
-     * @param string $pass
-     * @param string $salt
-     * @param int $keylen
-     * @param int $rounds
-     * @access public
-     * @return string
-     */
-    public static function bcrypt_pbkdf($pass, $salt, $keylen, $rounds)
-    {
-        self::initialize_static_variables();
-
-        if (PHP_INT_SIZE == 4) {
-            throw new \RuntimeException('bcrypt is far too slow to be practical on 32-bit versions of PHP');
-        }
-
-        $sha2pass = hash('sha512', $pass, true);
-        $results = [];
-        $count = 1;
-        while (32 * count($results) < $keylen) {
-            $countsalt = $salt . pack('N', $count++);
-            $sha2salt = hash('sha512', $countsalt, true);
-            $out = $tmpout = self::bcrypt_hash($sha2pass, $sha2salt);
-            for ($i = 1; $i < $rounds; $i++) {
-                $sha2salt = hash('sha512', $tmpout, true);
-                $tmpout = self::bcrypt_hash($sha2pass, $sha2salt);
-                $out ^= $tmpout;
-            }
-            $results[] = $out;
-        }
-        $output = '';
-        for ($i = 0; $i < 32; $i++) {
-            foreach ($results as $result) {
-                $output .= $result[$i];
-            }
-        }
-        return substr($output, 0, $keylen);
-    }
-
-    /**
-     * Key expansion without salt
-     *
-     * @access private
-     * @param int[] $key
-     * @param int[] $sbox0
-     * @param int[] $sbox1
-     * @param int[] $sbox2
-     * @param int[] $sbox3
-     * @param int[] $p
-     * @see self::_bcrypt_hash()
-     */
-    private static function expand0state(array $key, array &$sbox0, array &$sbox1, array &$sbox2, array &$sbox3, array &$p)
-    {
-        // expand0state is basically the same thing as this:
-        //return self::expandstate(array_fill(0, 16, 0), $key);
-        // but this separate function eliminates a bunch of XORs and array lookups
-
-        $p = [
-            $p[0] ^ $key[0],
-            $p[1] ^ $key[1],
-            $p[2] ^ $key[2],
-            $p[3] ^ $key[3],
-            $p[4] ^ $key[4],
-            $p[5] ^ $key[5],
-            $p[6] ^ $key[6],
-            $p[7] ^ $key[7],
-            $p[8] ^ $key[8],
-            $p[9] ^ $key[9],
-            $p[10] ^ $key[10],
-            $p[11] ^ $key[11],
-            $p[12] ^ $key[12],
-            $p[13] ^ $key[13],
-            $p[14] ^ $key[14],
-            $p[15] ^ $key[15],
-            $p[16] ^ $key[0],
-            $p[17] ^ $key[1]
-        ];
-
-        // @codingStandardsIgnoreStart
-        list( $p[0],  $p[1]) = self::encryptBlockHelperFast(     0,      0, $sbox0, $sbox1, $sbox2, $sbox3, $p);
-        list( $p[2],  $p[3]) = self::encryptBlockHelperFast($p[ 0], $p[ 1], $sbox0, $sbox1, $sbox2, $sbox3, $p);
-        list( $p[4],  $p[5]) = self::encryptBlockHelperFast($p[ 2], $p[ 3], $sbox0, $sbox1, $sbox2, $sbox3, $p);
-        list( $p[6],  $p[7]) = self::encryptBlockHelperFast($p[ 4], $p[ 5], $sbox0, $sbox1, $sbox2, $sbox3, $p);
-        list( $p[8],  $p[9]) = self::encryptBlockHelperFast($p[ 6], $p[ 7], $sbox0, $sbox1, $sbox2, $sbox3, $p);
-        list($p[10], $p[11]) = self::encryptBlockHelperFast($p[ 8], $p[ 9], $sbox0, $sbox1, $sbox2, $sbox3, $p);
-        list($p[12], $p[13]) = self::encryptBlockHelperFast($p[10], $p[11], $sbox0, $sbox1, $sbox2, $sbox3, $p);
-        list($p[14], $p[15]) = self::encryptBlockHelperFast($p[12], $p[13], $sbox0, $sbox1, $sbox2, $sbox3, $p);
-        list($p[16], $p[17]) = self::encryptBlockHelperFast($p[14], $p[15], $sbox0, $sbox1, $sbox2, $sbox3, $p);
-        // @codingStandardsIgnoreEnd
-
-        list($sbox0[0], $sbox0[1]) = self::encryptBlockHelperFast($p[16], $p[17], $sbox0, $sbox1, $sbox2, $sbox3, $p);
-        for ($i = 2; $i < 256; $i += 2) {
-            list($sbox0[$i], $sbox0[$i + 1]) = self::encryptBlockHelperFast($sbox0[$i - 2], $sbox0[$i - 1], $sbox0, $sbox1, $sbox2, $sbox3, $p);
-        }
-
-        list($sbox1[0], $sbox1[1]) = self::encryptBlockHelperFast($sbox0[254], $sbox0[255], $sbox0, $sbox1, $sbox2, $sbox3, $p);
-        for ($i = 2; $i < 256; $i += 2) {
-            list($sbox1[$i], $sbox1[$i + 1]) = self::encryptBlockHelperFast($sbox1[$i - 2], $sbox1[$i - 1], $sbox0, $sbox1, $sbox2, $sbox3, $p);
-        }
-
-        list($sbox2[0], $sbox2[1]) = self::encryptBlockHelperFast($sbox1[254], $sbox1[255], $sbox0, $sbox1, $sbox2, $sbox3, $p);
-        for ($i = 2; $i < 256; $i += 2) {
-            list($sbox2[$i], $sbox2[$i + 1]) = self::encryptBlockHelperFast($sbox2[$i - 2], $sbox2[$i - 1], $sbox0, $sbox1, $sbox2, $sbox3, $p);
-        }
-
-        list($sbox3[0], $sbox3[1]) = self::encryptBlockHelperFast($sbox2[254], $sbox2[255], $sbox0, $sbox1, $sbox2, $sbox3, $p);
-        for ($i = 2; $i < 256; $i += 2) {
-            list($sbox3[$i], $sbox3[$i + 1]) = self::encryptBlockHelperFast($sbox3[$i - 2], $sbox3[$i - 1], $sbox0, $sbox1, $sbox2, $sbox3, $p);
-        }
-    }
-
-    /**
-     * Key expansion with salt
-     *
-     * @access private
-     * @param int[] $data
-     * @param int[] $key
-     * @param int[] $sbox0
-     * @param int[] $sbox1
-     * @param int[] $sbox2
-     * @param int[] $sbox3
-     * @param int[] $p
-     * @see self::_bcrypt_hash()
-     */
-    private static function expandstate(array $data, array $key, array &$sbox0, array &$sbox1, array &$sbox2, array &$sbox3, array &$p)
-    {
-        $p = [
-            $p[0] ^ $key[0],
-            $p[1] ^ $key[1],
-            $p[2] ^ $key[2],
-            $p[3] ^ $key[3],
-            $p[4] ^ $key[4],
-            $p[5] ^ $key[5],
-            $p[6] ^ $key[6],
-            $p[7] ^ $key[7],
-            $p[8] ^ $key[8],
-            $p[9] ^ $key[9],
-            $p[10] ^ $key[10],
-            $p[11] ^ $key[11],
-            $p[12] ^ $key[12],
-            $p[13] ^ $key[13],
-            $p[14] ^ $key[14],
-            $p[15] ^ $key[15],
-            $p[16] ^ $key[0],
-            $p[17] ^ $key[1]
-        ];
-
-        // @codingStandardsIgnoreStart
-        list( $p[0],  $p[1]) = self::encryptBlockHelperFast($data[ 0]         , $data[ 1]         , $sbox0, $sbox1, $sbox2, $sbox3, $p);
-        list( $p[2],  $p[3]) = self::encryptBlockHelperFast($data[ 2] ^ $p[ 0], $data[ 3] ^ $p[ 1], $sbox0, $sbox1, $sbox2, $sbox3, $p);
-        list( $p[4],  $p[5]) = self::encryptBlockHelperFast($data[ 4] ^ $p[ 2], $data[ 5] ^ $p[ 3], $sbox0, $sbox1, $sbox2, $sbox3, $p);
-        list( $p[6],  $p[7]) = self::encryptBlockHelperFast($data[ 6] ^ $p[ 4], $data[ 7] ^ $p[ 5], $sbox0, $sbox1, $sbox2, $sbox3, $p);
-        list( $p[8],  $p[9]) = self::encryptBlockHelperFast($data[ 8] ^ $p[ 6], $data[ 9] ^ $p[ 7], $sbox0, $sbox1, $sbox2, $sbox3, $p);
-        list($p[10], $p[11]) = self::encryptBlockHelperFast($data[10] ^ $p[ 8], $data[11] ^ $p[ 9], $sbox0, $sbox1, $sbox2, $sbox3, $p);
-        list($p[12], $p[13]) = self::encryptBlockHelperFast($data[12] ^ $p[10], $data[13] ^ $p[11], $sbox0, $sbox1, $sbox2, $sbox3, $p);
-        list($p[14], $p[15]) = self::encryptBlockHelperFast($data[14] ^ $p[12], $data[15] ^ $p[13], $sbox0, $sbox1, $sbox2, $sbox3, $p);
-        list($p[16], $p[17]) = self::encryptBlockHelperFast($data[ 0] ^ $p[14], $data[ 1] ^ $p[15], $sbox0, $sbox1, $sbox2, $sbox3, $p);
-        // @codingStandardsIgnoreEnd
-
-        list($sbox0[0], $sbox0[1]) = self::encryptBlockHelperFast($data[2] ^ $p[16], $data[3] ^ $p[17], $sbox0, $sbox1, $sbox2, $sbox3, $p);
-        for ($i = 2, $j = 4; $i < 256; $i += 2, $j = ($j + 2) % 16) { // instead of 16 maybe count($data) would be better?
-            list($sbox0[$i], $sbox0[$i + 1]) = self::encryptBlockHelperFast($data[$j] ^ $sbox0[$i - 2], $data[$j + 1] ^ $sbox0[$i - 1], $sbox0, $sbox1, $sbox2, $sbox3, $p);
-        }
-
-        list($sbox1[0], $sbox1[1]) = self::encryptBlockHelperFast($data[2] ^ $sbox0[254], $data[3] ^ $sbox0[255], $sbox0, $sbox1, $sbox2, $sbox3, $p);
-        for ($i = 2, $j = 4; $i < 256; $i += 2, $j = ($j + 2) % 16) {
-            list($sbox1[$i], $sbox1[$i + 1]) = self::encryptBlockHelperFast($data[$j] ^ $sbox1[$i - 2], $data[$j + 1] ^ $sbox1[$i - 1], $sbox0, $sbox1, $sbox2, $sbox3, $p);
-        }
-
-        list($sbox2[0], $sbox2[1]) = self::encryptBlockHelperFast($data[2] ^ $sbox1[254], $data[3] ^ $sbox1[255], $sbox0, $sbox1, $sbox2, $sbox3, $p);
-        for ($i = 2, $j = 4; $i < 256; $i += 2, $j = ($j + 2) % 16) {
-            list($sbox2[$i], $sbox2[$i + 1]) = self::encryptBlockHelperFast($data[$j] ^ $sbox2[$i - 2], $data[$j + 1] ^ $sbox2[$i - 1], $sbox0, $sbox1, $sbox2, $sbox3, $p);
-        }
-
-        list($sbox3[0], $sbox3[1]) = self::encryptBlockHelperFast($data[2] ^ $sbox2[254], $data[3] ^ $sbox2[255], $sbox0, $sbox1, $sbox2, $sbox3, $p);
-        for ($i = 2, $j = 4; $i < 256; $i += 2, $j = ($j + 2) % 16) {
-            list($sbox3[$i], $sbox3[$i + 1]) = self::encryptBlockHelperFast($data[$j] ^ $sbox3[$i - 2], $data[$j + 1] ^ $sbox3[$i - 1], $sbox0, $sbox1, $sbox2, $sbox3, $p);
-        }
-    }
-
     /**
      * Encrypts a block
      *
+     * @access private
      * @param string $in
      * @return string
      */
-    protected function encryptBlock($in)
+    function _encryptBlock($in)
     {
-        $p = $this->bctx['p'];
-        // extract($this->bctx['sb'], EXTR_PREFIX_ALL, 'sb'); // slower
-        $sb_0 = $this->bctx['sb'][0];
-        $sb_1 = $this->bctx['sb'][1];
-        $sb_2 = $this->bctx['sb'][2];
-        $sb_3 = $this->bctx['sb'][3];
+        $p = $this->bctx["p"];
+        // extract($this->bctx["sb"], EXTR_PREFIX_ALL, "sb"); // slower
+        $sb_0 = $this->bctx["sb"][0];
+        $sb_1 = $this->bctx["sb"][1];
+        $sb_2 = $this->bctx["sb"][2];
+        $sb_3 = $this->bctx["sb"][3];
 
-        $in = unpack('N*', $in);
+        $in = unpack("N*", $in);
         $l = $in[1];
         $r = $in[2];
 
-        list($r, $l) = PHP_INT_SIZE == 4 ?
-            self::encryptBlockHelperSlow($l, $r, $sb_0, $sb_1, $sb_2, $sb_3, $p) :
-            self::encryptBlockHelperFast($l, $r, $sb_0, $sb_1, $sb_2, $sb_3, $p);
+        for ($i = 0; $i < 16; $i+= 2) {
+            $l^= $p[$i];
+            $r^= ($sb_0[$l >> 24 & 0xff]  +
+                  $sb_1[$l >> 16 & 0xff]  ^
+                  $sb_2[$l >>  8 & 0xff]) +
+                  $sb_3[$l       & 0xff];
 
-        return pack("N*", $r, $l);
-    }
-
-    /**
-     * Fast helper function for block encryption
-     *
-     * @access private
-     * @param int $x0
-     * @param int $x1
-     * @param int[] $sbox0
-     * @param int[] $sbox1
-     * @param int[] $sbox2
-     * @param int[] $sbox3
-     * @param int[] $p
-     * @return int[]
-     */
-    private static function encryptBlockHelperFast($x0, $x1, array $sbox0, array $sbox1, array $sbox2, array $sbox3, array $p)
-    {
-        $x0 ^= $p[0];
-        $x1 ^= ((($sbox0[($x0 & 0xFF000000) >> 24] + $sbox1[($x0 & 0xFF0000) >> 16]) ^ $sbox2[($x0 & 0xFF00) >> 8]) + $sbox3[$x0 & 0xFF]) ^ $p[1];
-        $x0 ^= ((($sbox0[($x1 & 0xFF000000) >> 24] + $sbox1[($x1 & 0xFF0000) >> 16]) ^ $sbox2[($x1 & 0xFF00) >> 8]) + $sbox3[$x1 & 0xFF]) ^ $p[2];
-        $x1 ^= ((($sbox0[($x0 & 0xFF000000) >> 24] + $sbox1[($x0 & 0xFF0000) >> 16]) ^ $sbox2[($x0 & 0xFF00) >> 8]) + $sbox3[$x0 & 0xFF]) ^ $p[3];
-        $x0 ^= ((($sbox0[($x1 & 0xFF000000) >> 24] + $sbox1[($x1 & 0xFF0000) >> 16]) ^ $sbox2[($x1 & 0xFF00) >> 8]) + $sbox3[$x1 & 0xFF]) ^ $p[4];
-        $x1 ^= ((($sbox0[($x0 & 0xFF000000) >> 24] + $sbox1[($x0 & 0xFF0000) >> 16]) ^ $sbox2[($x0 & 0xFF00) >> 8]) + $sbox3[$x0 & 0xFF]) ^ $p[5];
-        $x0 ^= ((($sbox0[($x1 & 0xFF000000) >> 24] + $sbox1[($x1 & 0xFF0000) >> 16]) ^ $sbox2[($x1 & 0xFF00) >> 8]) + $sbox3[$x1 & 0xFF]) ^ $p[6];
-        $x1 ^= ((($sbox0[($x0 & 0xFF000000) >> 24] + $sbox1[($x0 & 0xFF0000) >> 16]) ^ $sbox2[($x0 & 0xFF00) >> 8]) + $sbox3[$x0 & 0xFF]) ^ $p[7];
-        $x0 ^= ((($sbox0[($x1 & 0xFF000000) >> 24] + $sbox1[($x1 & 0xFF0000) >> 16]) ^ $sbox2[($x1 & 0xFF00) >> 8]) + $sbox3[$x1 & 0xFF]) ^ $p[8];
-        $x1 ^= ((($sbox0[($x0 & 0xFF000000) >> 24] + $sbox1[($x0 & 0xFF0000) >> 16]) ^ $sbox2[($x0 & 0xFF00) >> 8]) + $sbox3[$x0 & 0xFF]) ^ $p[9];
-        $x0 ^= ((($sbox0[($x1 & 0xFF000000) >> 24] + $sbox1[($x1 & 0xFF0000) >> 16]) ^ $sbox2[($x1 & 0xFF00) >> 8]) + $sbox3[$x1 & 0xFF]) ^ $p[10];
-        $x1 ^= ((($sbox0[($x0 & 0xFF000000) >> 24] + $sbox1[($x0 & 0xFF0000) >> 16]) ^ $sbox2[($x0 & 0xFF00) >> 8]) + $sbox3[$x0 & 0xFF]) ^ $p[11];
-        $x0 ^= ((($sbox0[($x1 & 0xFF000000) >> 24] + $sbox1[($x1 & 0xFF0000) >> 16]) ^ $sbox2[($x1 & 0xFF00) >> 8]) + $sbox3[$x1 & 0xFF]) ^ $p[12];
-        $x1 ^= ((($sbox0[($x0 & 0xFF000000) >> 24] + $sbox1[($x0 & 0xFF0000) >> 16]) ^ $sbox2[($x0 & 0xFF00) >> 8]) + $sbox3[$x0 & 0xFF]) ^ $p[13];
-        $x0 ^= ((($sbox0[($x1 & 0xFF000000) >> 24] + $sbox1[($x1 & 0xFF0000) >> 16]) ^ $sbox2[($x1 & 0xFF00) >> 8]) + $sbox3[$x1 & 0xFF]) ^ $p[14];
-        $x1 ^= ((($sbox0[($x0 & 0xFF000000) >> 24] + $sbox1[($x0 & 0xFF0000) >> 16]) ^ $sbox2[($x0 & 0xFF00) >> 8]) + $sbox3[$x0 & 0xFF]) ^ $p[15];
-        $x0 ^= ((($sbox0[($x1 & 0xFF000000) >> 24] + $sbox1[($x1 & 0xFF0000) >> 16]) ^ $sbox2[($x1 & 0xFF00) >> 8]) + $sbox3[$x1 & 0xFF]) ^ $p[16];
-
-        return [$x1 & 0xFFFFFFFF ^ $p[17], $x0 & 0xFFFFFFFF];
-    }
-
-    /**
-     * Slow helper function for block encryption
-     *
-     * @access private
-     * @param int $x0
-     * @param int $x1
-     * @param int[] $sbox0
-     * @param int[] $sbox1
-     * @param int[] $sbox2
-     * @param int[] $sbox3
-     * @param int[] $p
-     * @return int[]
-     */
-    private static function encryptBlockHelperSlow($x0, $x1, array $sbox0, array $sbox1, array $sbox2, array $sbox3, array $p)
-    {
-        // -16777216 == intval(0xFF000000) on 32-bit PHP installs
-        $x0 ^= $p[0];
-        $x1 ^= self::safe_intval((self::safe_intval($sbox0[(($x0 & -16777216) >> 24) & 0xFF] + $sbox1[($x0 & 0xFF0000) >> 16]) ^ $sbox2[($x0 & 0xFF00) >> 8]) + $sbox3[$x0 & 0xFF]) ^ $p[1];
-        $x0 ^= self::safe_intval((self::safe_intval($sbox0[(($x1 & -16777216) >> 24) & 0xFF] + $sbox1[($x1 & 0xFF0000) >> 16]) ^ $sbox2[($x1 & 0xFF00) >> 8]) + $sbox3[$x1 & 0xFF]) ^ $p[2];
-        $x1 ^= self::safe_intval((self::safe_intval($sbox0[(($x0 & -16777216) >> 24) & 0xFF] + $sbox1[($x0 & 0xFF0000) >> 16]) ^ $sbox2[($x0 & 0xFF00) >> 8]) + $sbox3[$x0 & 0xFF]) ^ $p[3];
-        $x0 ^= self::safe_intval((self::safe_intval($sbox0[(($x1 & -16777216) >> 24) & 0xFF] + $sbox1[($x1 & 0xFF0000) >> 16]) ^ $sbox2[($x1 & 0xFF00) >> 8]) + $sbox3[$x1 & 0xFF]) ^ $p[4];
-        $x1 ^= self::safe_intval((self::safe_intval($sbox0[(($x0 & -16777216) >> 24) & 0xFF] + $sbox1[($x0 & 0xFF0000) >> 16]) ^ $sbox2[($x0 & 0xFF00) >> 8]) + $sbox3[$x0 & 0xFF]) ^ $p[5];
-        $x0 ^= self::safe_intval((self::safe_intval($sbox0[(($x1 & -16777216) >> 24) & 0xFF] + $sbox1[($x1 & 0xFF0000) >> 16]) ^ $sbox2[($x1 & 0xFF00) >> 8]) + $sbox3[$x1 & 0xFF]) ^ $p[6];
-        $x1 ^= self::safe_intval((self::safe_intval($sbox0[(($x0 & -16777216) >> 24) & 0xFF] + $sbox1[($x0 & 0xFF0000) >> 16]) ^ $sbox2[($x0 & 0xFF00) >> 8]) + $sbox3[$x0 & 0xFF]) ^ $p[7];
-        $x0 ^= self::safe_intval((self::safe_intval($sbox0[(($x1 & -16777216) >> 24) & 0xFF] + $sbox1[($x1 & 0xFF0000) >> 16]) ^ $sbox2[($x1 & 0xFF00) >> 8]) + $sbox3[$x1 & 0xFF]) ^ $p[8];
-        $x1 ^= self::safe_intval((self::safe_intval($sbox0[(($x0 & -16777216) >> 24) & 0xFF] + $sbox1[($x0 & 0xFF0000) >> 16]) ^ $sbox2[($x0 & 0xFF00) >> 8]) + $sbox3[$x0 & 0xFF]) ^ $p[9];
-        $x0 ^= self::safe_intval((self::safe_intval($sbox0[(($x1 & -16777216) >> 24) & 0xFF] + $sbox1[($x1 & 0xFF0000) >> 16]) ^ $sbox2[($x1 & 0xFF00) >> 8]) + $sbox3[$x1 & 0xFF]) ^ $p[10];
-        $x1 ^= self::safe_intval((self::safe_intval($sbox0[(($x0 & -16777216) >> 24) & 0xFF] + $sbox1[($x0 & 0xFF0000) >> 16]) ^ $sbox2[($x0 & 0xFF00) >> 8]) + $sbox3[$x0 & 0xFF]) ^ $p[11];
-        $x0 ^= self::safe_intval((self::safe_intval($sbox0[(($x1 & -16777216) >> 24) & 0xFF] + $sbox1[($x1 & 0xFF0000) >> 16]) ^ $sbox2[($x1 & 0xFF00) >> 8]) + $sbox3[$x1 & 0xFF]) ^ $p[12];
-        $x1 ^= self::safe_intval((self::safe_intval($sbox0[(($x0 & -16777216) >> 24) & 0xFF] + $sbox1[($x0 & 0xFF0000) >> 16]) ^ $sbox2[($x0 & 0xFF00) >> 8]) + $sbox3[$x0 & 0xFF]) ^ $p[13];
-        $x0 ^= self::safe_intval((self::safe_intval($sbox0[(($x1 & -16777216) >> 24) & 0xFF] + $sbox1[($x1 & 0xFF0000) >> 16]) ^ $sbox2[($x1 & 0xFF00) >> 8]) + $sbox3[$x1 & 0xFF]) ^ $p[14];
-        $x1 ^= self::safe_intval((self::safe_intval($sbox0[(($x0 & -16777216) >> 24) & 0xFF] + $sbox1[($x0 & 0xFF0000) >> 16]) ^ $sbox2[($x0 & 0xFF00) >> 8]) + $sbox3[$x0 & 0xFF]) ^ $p[15];
-        $x0 ^= self::safe_intval((self::safe_intval($sbox0[(($x1 & -16777216) >> 24) & 0xFF] + $sbox1[($x1 & 0xFF0000) >> 16]) ^ $sbox2[($x1 & 0xFF00) >> 8]) + $sbox3[$x1 & 0xFF]) ^ $p[16];
-
-        return [$x1 ^ $p[17], $x0];
+            $r^= $p[$i + 1];
+            $l^= ($sb_0[$r >> 24 & 0xff]  +
+                  $sb_1[$r >> 16 & 0xff]  ^
+                  $sb_2[$r >>  8 & 0xff]) +
+                  $sb_3[$r       & 0xff];
+        }
+        return pack("N*", $r ^ $p[17], $l ^ $p[16]);
     }
 
     /**
      * Decrypts a block
      *
+     * @access private
      * @param string $in
      * @return string
      */
-    protected function decryptBlock($in)
+    function _decryptBlock($in)
     {
-        $p = $this->bctx['p'];
-        $sb_0 = $this->bctx['sb'][0];
-        $sb_1 = $this->bctx['sb'][1];
-        $sb_2 = $this->bctx['sb'][2];
-        $sb_3 = $this->bctx['sb'][3];
+        $p = $this->bctx["p"];
+        $sb_0 = $this->bctx["sb"][0];
+        $sb_1 = $this->bctx["sb"][1];
+        $sb_2 = $this->bctx["sb"][2];
+        $sb_3 = $this->bctx["sb"][3];
 
-        $in = unpack('N*', $in);
+        $in = unpack("N*", $in);
         $l = $in[1];
         $r = $in[2];
 
-        for ($i = 17; $i > 2; $i -= 2) {
-            $l ^= $p[$i];
-            $r ^= self::safe_intval((self::safe_intval($sb_0[$l >> 24 & 0xff] + $sb_1[$l >> 16 & 0xff]) ^
+        for ($i = 17; $i > 2; $i-= 2) {
+            $l^= $p[$i];
+            $r^= ($sb_0[$l >> 24 & 0xff]  +
+                  $sb_1[$l >> 16 & 0xff]  ^
                   $sb_2[$l >>  8 & 0xff]) +
-                  $sb_3[$l       & 0xff]);
+                  $sb_3[$l       & 0xff];
 
-            $r ^= $p[$i - 1];
-            $l ^= self::safe_intval((self::safe_intval($sb_0[$r >> 24 & 0xff] + $sb_1[$r >> 16 & 0xff]) ^
+            $r^= $p[$i - 1];
+            $l^= ($sb_0[$r >> 24 & 0xff]  +
+                  $sb_1[$r >> 16 & 0xff]  ^
                   $sb_2[$r >>  8 & 0xff]) +
-                  $sb_3[$r       & 0xff]);
+                  $sb_3[$r       & 0xff];
         }
-        return pack('N*', $r ^ $p[0], $l ^ $p[1]);
+        return pack("N*", $r ^ $p[0], $l ^ $p[1]);
     }
 
     /**
      * Setup the performance-optimized function for de/encrypt()
      *
-     * @see \phpseclib3\Crypt\Common\SymmetricKey::_setupInlineCrypt()
+     * @see \phpseclib\Crypt\Base::_setupInlineCrypt()
+     * @access private
      */
-    protected function setupInlineCrypt()
+    function _setupInlineCrypt()
     {
-        $p = $this->bctx['p'];
-        $init_crypt = '
-            static $sb_0, $sb_1, $sb_2, $sb_3;
-            if (!$sb_0) {
-                $sb_0 = $this->bctx["sb"][0];
-                $sb_1 = $this->bctx["sb"][1];
-                $sb_2 = $this->bctx["sb"][2];
-                $sb_3 = $this->bctx["sb"][3];
+        $lambda_functions =& self::_getLambdaFunctions();
+
+        // We create max. 10 hi-optimized code for memory reason. Means: For each $key one ultra fast inline-crypt function.
+        // (Currently, for Blowfish, one generated $lambda_function cost on php5.5@32bit ~100kb unfreeable mem and ~180kb on php5.5@64bit)
+        // After that, we'll still create very fast optimized code but not the hi-ultimative code, for each $mode one.
+        $gen_hi_opt_code = (bool)(count($lambda_functions) < 10);
+
+        // Generation of a unique hash for our generated code
+        $code_hash = "Crypt_Blowfish, {$this->mode}";
+        if ($gen_hi_opt_code) {
+            $code_hash = str_pad($code_hash, 32) . $this->_hashInlineCryptFunction($this->key);
+        }
+
+        if (!isset($lambda_functions[$code_hash])) {
+            switch (true) {
+                case $gen_hi_opt_code:
+                    $p = $this->bctx['p'];
+                    $init_crypt = '
+                        static $sb_0, $sb_1, $sb_2, $sb_3;
+                        if (!$sb_0) {
+                            $sb_0 = $self->bctx["sb"][0];
+                            $sb_1 = $self->bctx["sb"][1];
+                            $sb_2 = $self->bctx["sb"][2];
+                            $sb_3 = $self->bctx["sb"][3];
+                        }
+                    ';
+                    break;
+                default:
+                    $p   = array();
+                    for ($i = 0; $i < 18; ++$i) {
+                        $p[] = '$p_' . $i;
+                    }
+                    $init_crypt = '
+                        list($sb_0, $sb_1, $sb_2, $sb_3) = $self->bctx["sb"];
+                        list(' . implode(',', $p) . ') = $self->bctx["p"];
+
+                    ';
             }
-        ';
 
-        $safeint = self::safe_intval_inline();
-
-        // Generating encrypt code:
-        $encrypt_block = '
-            $in = unpack("N*", $in);
-            $l = $in[1];
-            $r = $in[2];
-        ';
-        for ($i = 0; $i < 16; $i += 2) {
-            $encrypt_block .= '
-                $l^= ' . $p[$i] . ';
-                $r^= ' . sprintf($safeint, '(' . sprintf($safeint, '$sb_0[$l >> 24 & 0xff] + $sb_1[$l >> 16 & 0xff]') . ' ^
-                      $sb_2[$l >>  8 & 0xff]) +
-                      $sb_3[$l       & 0xff]') . ';
-
-                $r^= ' . $p[$i + 1] . ';
-                $l^= ' . sprintf($safeint, '(' . sprintf($safeint, '$sb_0[$r >> 24 & 0xff] + $sb_1[$r >> 16 & 0xff]') . '  ^
-                      $sb_2[$r >>  8 & 0xff]) +
-                      $sb_3[$r       & 0xff]') . ';
+            // Generating encrypt code:
+            $encrypt_block = '
+                $in = unpack("N*", $in);
+                $l = $in[1];
+                $r = $in[2];
             ';
-        }
-        $encrypt_block .= '
-            $in = pack("N*",
-                $r ^ ' . $p[17] . ',
-                $l ^ ' . $p[16] . '
-            );
-        ';
-         // Generating decrypt code:
-        $decrypt_block = '
-            $in = unpack("N*", $in);
-            $l = $in[1];
-            $r = $in[2];
-        ';
+            for ($i = 0; $i < 16; $i+= 2) {
+                $encrypt_block.= '
+                    $l^= ' . $p[$i] . ';
+                    $r^= ($sb_0[$l >> 24 & 0xff]  +
+                          $sb_1[$l >> 16 & 0xff]  ^
+                          $sb_2[$l >>  8 & 0xff]) +
+                          $sb_3[$l       & 0xff];
 
-        for ($i = 17; $i > 2; $i -= 2) {
-            $decrypt_block .= '
-                $l^= ' . $p[$i] . ';
-                $r^= ' . sprintf($safeint, '(' . sprintf($safeint, '$sb_0[$l >> 24 & 0xff] + $sb_1[$l >> 16 & 0xff]') . ' ^
-                      $sb_2[$l >>  8 & 0xff]) +
-                      $sb_3[$l       & 0xff]') . ';
-
-                $r^= ' . $p[$i - 1] . ';
-                $l^= ' . sprintf($safeint, '(' . sprintf($safeint, '$sb_0[$r >> 24 & 0xff] + $sb_1[$r >> 16 & 0xff]') . ' ^
-                      $sb_2[$r >>  8 & 0xff]) +
-                      $sb_3[$r       & 0xff]') . ';
+                    $r^= ' . $p[$i + 1] . ';
+                    $l^= ($sb_0[$r >> 24 & 0xff]  +
+                          $sb_1[$r >> 16 & 0xff]  ^
+                          $sb_2[$r >>  8 & 0xff]) +
+                          $sb_3[$r       & 0xff];
+                ';
+            }
+            $encrypt_block.= '
+                $in = pack("N*",
+                    $r ^ ' . $p[17] . ',
+                    $l ^ ' . $p[16] . '
+                );
             ';
-        }
 
-        $decrypt_block .= '
-            $in = pack("N*",
-                $r ^ ' . $p[0] . ',
-                $l ^ ' . $p[1] . '
+            // Generating decrypt code:
+            $decrypt_block = '
+                $in = unpack("N*", $in);
+                $l = $in[1];
+                $r = $in[2];
+            ';
+
+            for ($i = 17; $i > 2; $i-= 2) {
+                $decrypt_block.= '
+                    $l^= ' . $p[$i] . ';
+                    $r^= ($sb_0[$l >> 24 & 0xff]  +
+                          $sb_1[$l >> 16 & 0xff]  ^
+                          $sb_2[$l >>  8 & 0xff]) +
+                          $sb_3[$l       & 0xff];
+
+                    $r^= ' . $p[$i - 1] . ';
+                    $l^= ($sb_0[$r >> 24 & 0xff]  +
+                          $sb_1[$r >> 16 & 0xff]  ^
+                          $sb_2[$r >>  8 & 0xff]) +
+                          $sb_3[$r       & 0xff];
+                ';
+            }
+
+            $decrypt_block.= '
+                $in = pack("N*",
+                    $r ^ ' . $p[0] . ',
+                    $l ^ ' . $p[1] . '
+                );
+            ';
+
+            $lambda_functions[$code_hash] = $this->_createInlineCryptFunction(
+                array(
+                   'init_crypt'    => $init_crypt,
+                   'init_encrypt'  => '',
+                   'init_decrypt'  => '',
+                   'encrypt_block' => $encrypt_block,
+                   'decrypt_block' => $decrypt_block
+                )
             );
-        ';
-
-        $this->inline_crypt = $this->createInlineCryptFunction(
-            [
-               'init_crypt'    => $init_crypt,
-               'init_encrypt'  => '',
-               'init_decrypt'  => '',
-               'encrypt_block' => $encrypt_block,
-               'decrypt_block' => $decrypt_block
-            ]
-        );
+        }
+        $this->inline_crypt = $lambda_functions[$code_hash];
     }
 }
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/ChaCha20.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/ChaCha20.php
deleted file mode 100644
index b2691b5d..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/ChaCha20.php
+++ /dev/null
@@ -1,799 +0,0 @@
-<?php
-
-/**
- * Pure-PHP implementation of ChaCha20.
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2019 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\Crypt;
-
-use phpseclib3\Exception\BadDecryptionException;
-use phpseclib3\Exception\InsufficientSetupException;
-
-/**
- * Pure-PHP implementation of ChaCha20.
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-class ChaCha20 extends Salsa20
-{
-    /**
-     * The OpenSSL specific name of the cipher
-     *
-     * @var string
-     */
-    protected $cipher_name_openssl = 'chacha20';
-
-    /**
-     * Test for engine validity
-     *
-     * This is mainly just a wrapper to set things up for \phpseclib3\Crypt\Common\SymmetricKey::isValidEngine()
-     *
-     * @see \phpseclib3\Crypt\Common\SymmetricKey::__construct()
-     * @param int $engine
-     * @return bool
-     */
-    protected function isValidEngineHelper($engine)
-    {
-        switch ($engine) {
-            case self::ENGINE_LIBSODIUM:
-                // PHP 7.2.0 (30 Nov 2017) added support for libsodium
-
-                // we could probably make it so that if $this->counter == 0 then the first block would be done with either OpenSSL
-                // or PHP and then subsequent blocks would then be done with libsodium but idk - it's not a high priority atm
-
-                // we could also make it so that if $this->counter == 0 and $this->continuousBuffer then do the first string
-                // with libsodium and subsequent strings with openssl or pure-PHP but again not a high priority
-                return function_exists('sodium_crypto_aead_chacha20poly1305_ietf_encrypt') &&
-                       $this->key_length == 32 &&
-                       (($this->usePoly1305 && !isset($this->poly1305Key) && $this->counter == 0) || $this->counter == 1) &&
-                       !$this->continuousBuffer;
-            case self::ENGINE_OPENSSL:
-                // OpenSSL 1.1.0 (released 25 Aug 2016) added support for chacha20.
-                // PHP didn't support OpenSSL 1.1.0 until 7.0.19 (11 May 2017)
-
-                // if you attempt to provide openssl with a 128 bit key (as opposed to a 256 bit key) openssl will null
-                // pad the key to 256 bits and still use the expansion constant for 256-bit keys. the fact that
-                // openssl treats the IV as both the counter and nonce, however, let's us use openssl in continuous mode
-                // whereas libsodium does not
-                if ($this->key_length != 32) {
-                    return false;
-                }
-        }
-
-        return parent::isValidEngineHelper($engine);
-    }
-
-    /**
-     * Encrypts a message.
-     *
-     * @see \phpseclib3\Crypt\Common\SymmetricKey::decrypt()
-     * @see self::crypt()
-     * @param string $plaintext
-     * @return string $ciphertext
-     */
-    public function encrypt($plaintext)
-    {
-        $this->setup();
-
-        if ($this->engine == self::ENGINE_LIBSODIUM) {
-            return $this->encrypt_with_libsodium($plaintext);
-        }
-
-        return parent::encrypt($plaintext);
-    }
-
-    /**
-     * Decrypts a message.
-     *
-     * $this->decrypt($this->encrypt($plaintext)) == $this->encrypt($this->encrypt($plaintext)).
-     * At least if the continuous buffer is disabled.
-     *
-     * @see \phpseclib3\Crypt\Common\SymmetricKey::encrypt()
-     * @see self::crypt()
-     * @param string $ciphertext
-     * @return string $plaintext
-     */
-    public function decrypt($ciphertext)
-    {
-        $this->setup();
-
-        if ($this->engine == self::ENGINE_LIBSODIUM) {
-            return $this->decrypt_with_libsodium($ciphertext);
-        }
-
-        return parent::decrypt($ciphertext);
-    }
-
-    /**
-     * Encrypts a message with libsodium
-     *
-     * @see self::encrypt()
-     * @param string $plaintext
-     * @return string $text
-     */
-    private function encrypt_with_libsodium($plaintext)
-    {
-        $params = [$plaintext, $this->aad, $this->nonce, $this->key];
-        $ciphertext = strlen($this->nonce) == 8 ?
-            sodium_crypto_aead_chacha20poly1305_encrypt(...$params) :
-            sodium_crypto_aead_chacha20poly1305_ietf_encrypt(...$params);
-        if (!$this->usePoly1305) {
-            return substr($ciphertext, 0, strlen($plaintext));
-        }
-
-        $newciphertext = substr($ciphertext, 0, strlen($plaintext));
-
-        $this->newtag = $this->usingGeneratedPoly1305Key && strlen($this->nonce) == 12 ?
-            substr($ciphertext, strlen($plaintext)) :
-            $this->poly1305($newciphertext);
-
-        return $newciphertext;
-    }
-
-    /**
-     * Decrypts a message with libsodium
-     *
-     * @see self::decrypt()
-     * @param string $ciphertext
-     * @return string $text
-     */
-    private function decrypt_with_libsodium($ciphertext)
-    {
-        $params = [$ciphertext, $this->aad, $this->nonce, $this->key];
-
-        if (isset($this->poly1305Key)) {
-            if ($this->oldtag === false) {
-                throw new InsufficientSetupException('Authentication Tag has not been set');
-            }
-            if ($this->usingGeneratedPoly1305Key && strlen($this->nonce) == 12) {
-                $plaintext = sodium_crypto_aead_chacha20poly1305_ietf_decrypt(...$params);
-                $this->oldtag = false;
-                if ($plaintext === false) {
-                    throw new BadDecryptionException('Derived authentication tag and supplied authentication tag do not match');
-                }
-                return $plaintext;
-            }
-            $newtag = $this->poly1305($ciphertext);
-            if ($this->oldtag != substr($newtag, 0, strlen($this->oldtag))) {
-                $this->oldtag = false;
-                throw new BadDecryptionException('Derived authentication tag and supplied authentication tag do not match');
-            }
-            $this->oldtag = false;
-        }
-
-        $plaintext = strlen($this->nonce) == 8 ?
-            sodium_crypto_aead_chacha20poly1305_encrypt(...$params) :
-            sodium_crypto_aead_chacha20poly1305_ietf_encrypt(...$params);
-
-        return substr($plaintext, 0, strlen($ciphertext));
-    }
-
-    /**
-     * Sets the nonce.
-     *
-     * @param string $nonce
-     */
-    public function setNonce($nonce)
-    {
-        if (!is_string($nonce)) {
-            throw new \UnexpectedValueException('The nonce should be a string');
-        }
-
-        /*
-          from https://tools.ietf.org/html/rfc7539#page-7
-
-          "Note also that the original ChaCha had a 64-bit nonce and 64-bit
-           block count.  We have modified this here to be more consistent with
-           recommendations in Section 3.2 of [RFC5116]."
-         */
-        switch (strlen($nonce)) {
-            case 8:  // 64 bits
-            case 12: // 96 bits
-                break;
-            default:
-                throw new \LengthException('Nonce of size ' . strlen($nonce) . ' not supported by this algorithm. Only 64-bit nonces or 96-bit nonces are supported');
-        }
-
-        $this->nonce = $nonce;
-        $this->changed = true;
-        $this->setEngine();
-    }
-
-    /**
-     * Setup the self::ENGINE_INTERNAL $engine
-     *
-     * (re)init, if necessary, the internal cipher $engine
-     *
-     * _setup() will be called each time if $changed === true
-     * typically this happens when using one or more of following public methods:
-     *
-     * - setKey()
-     *
-     * - setNonce()
-     *
-     * - First run of encrypt() / decrypt() with no init-settings
-     *
-     * @see self::setKey()
-     * @see self::setNonce()
-     * @see self::disableContinuousBuffer()
-     */
-    protected function setup()
-    {
-        if (!$this->changed) {
-            return;
-        }
-
-        $this->enbuffer = $this->debuffer = ['ciphertext' => '', 'counter' => $this->counter];
-
-        $this->changed = $this->nonIVChanged = false;
-
-        if ($this->nonce === false) {
-            throw new InsufficientSetupException('No nonce has been defined');
-        }
-
-        if ($this->key === false) {
-            throw new InsufficientSetupException('No key has been defined');
-        }
-
-        if ($this->usePoly1305 && !isset($this->poly1305Key)) {
-            $this->usingGeneratedPoly1305Key = true;
-            if ($this->engine == self::ENGINE_LIBSODIUM) {
-                return;
-            }
-            $this->createPoly1305Key();
-        }
-
-        $key = $this->key;
-        if (strlen($key) == 16) {
-            $constant = 'expand 16-byte k';
-            $key .= $key;
-        } else {
-            $constant = 'expand 32-byte k';
-        }
-
-        $this->p1 = $constant . $key;
-        $this->p2 = $this->nonce;
-        if (strlen($this->nonce) == 8) {
-            $this->p2 = "\0\0\0\0" . $this->p2;
-        }
-    }
-
-    /**
-     * The quarterround function
-     *
-     * @param int $a
-     * @param int $b
-     * @param int $c
-     * @param int $d
-     */
-    protected static function quarterRound(&$a, &$b, &$c, &$d)
-    {
-        // in https://datatracker.ietf.org/doc/html/rfc7539#section-2.1 the addition,
-        // xor'ing and rotation are all on the same line so i'm keeping it on the same
-        // line here as well
-        // @codingStandardsIgnoreStart
-        $a+= $b; $d = self::leftRotate(intval($d) ^ intval($a), 16);
-        $c+= $d; $b = self::leftRotate(intval($b) ^ intval($c), 12);
-        $a+= $b; $d = self::leftRotate(intval($d) ^ intval($a), 8);
-        $c+= $d; $b = self::leftRotate(intval($b) ^ intval($c), 7);
-        // @codingStandardsIgnoreEnd
-    }
-
-    /**
-     * The doubleround function
-     *
-     * @param int $x0 (by reference)
-     * @param int $x1 (by reference)
-     * @param int $x2 (by reference)
-     * @param int $x3 (by reference)
-     * @param int $x4 (by reference)
-     * @param int $x5 (by reference)
-     * @param int $x6 (by reference)
-     * @param int $x7 (by reference)
-     * @param int $x8 (by reference)
-     * @param int $x9 (by reference)
-     * @param int $x10 (by reference)
-     * @param int $x11 (by reference)
-     * @param int $x12 (by reference)
-     * @param int $x13 (by reference)
-     * @param int $x14 (by reference)
-     * @param int $x15 (by reference)
-     */
-    protected static function doubleRound(&$x0, &$x1, &$x2, &$x3, &$x4, &$x5, &$x6, &$x7, &$x8, &$x9, &$x10, &$x11, &$x12, &$x13, &$x14, &$x15)
-    {
-        // columnRound
-        static::quarterRound($x0, $x4, $x8, $x12);
-        static::quarterRound($x1, $x5, $x9, $x13);
-        static::quarterRound($x2, $x6, $x10, $x14);
-        static::quarterRound($x3, $x7, $x11, $x15);
-        // rowRound
-        static::quarterRound($x0, $x5, $x10, $x15);
-        static::quarterRound($x1, $x6, $x11, $x12);
-        static::quarterRound($x2, $x7, $x8, $x13);
-        static::quarterRound($x3, $x4, $x9, $x14);
-    }
-
-    /**
-     * The Salsa20 hash function function
-     *
-     * On my laptop this loop unrolled / function dereferenced version of parent::salsa20 encrypts 1mb of text in
-     * 0.65s vs the 0.85s that it takes with the parent method.
-     *
-     * If we were free to assume that the host OS would always be 64-bits then the if condition in leftRotate could
-     * be eliminated and we could knock this done to 0.60s.
-     *
-     * For comparison purposes, RC4 takes 0.16s and AES in CTR mode with the Eval engine takes 0.48s.
-     * AES in CTR mode with the PHP engine takes 1.19s. Salsa20 / ChaCha20 do not benefit as much from the Eval
-     * approach due to the fact that there are a lot less variables to de-reference, fewer loops to unroll, etc
-     *
-     * @param string $x
-     */
-    protected static function salsa20($x)
-    {
-        list(, $x0, $x1, $x2, $x3, $x4, $x5, $x6, $x7, $x8, $x9, $x10, $x11, $x12, $x13, $x14, $x15) = unpack('V*', $x);
-        $z0 = $x0;
-        $z1 = $x1;
-        $z2 = $x2;
-        $z3 = $x3;
-        $z4 = $x4;
-        $z5 = $x5;
-        $z6 = $x6;
-        $z7 = $x7;
-        $z8 = $x8;
-        $z9 = $x9;
-        $z10 = $x10;
-        $z11 = $x11;
-        $z12 = $x12;
-        $z13 = $x13;
-        $z14 = $x14;
-        $z15 = $x15;
-
-        // @codingStandardsIgnoreStart
-        // columnRound
-        $x0+= $x4; $x12 = self::leftRotate(intval($x12) ^ intval($x0), 16);
-        $x8+= $x12; $x4 = self::leftRotate(intval($x4) ^ intval($x8), 12);
-        $x0+= $x4; $x12 = self::leftRotate(intval($x12) ^ intval($x0), 8);
-        $x8+= $x12; $x4 = self::leftRotate(intval($x4) ^ intval($x8), 7);
-
-        $x1+= $x5; $x13 = self::leftRotate(intval($x13) ^ intval($x1), 16);
-        $x9+= $x13; $x5 = self::leftRotate(intval($x5) ^ intval($x9), 12);
-        $x1+= $x5; $x13 = self::leftRotate(intval($x13) ^ intval($x1), 8);
-        $x9+= $x13; $x5 = self::leftRotate(intval($x5) ^ intval($x9), 7);
-
-        $x2+= $x6; $x14 = self::leftRotate(intval($x14) ^ intval($x2), 16);
-        $x10+= $x14; $x6 = self::leftRotate(intval($x6) ^ intval($x10), 12);
-        $x2+= $x6; $x14 = self::leftRotate(intval($x14) ^ intval($x2), 8);
-        $x10+= $x14; $x6 = self::leftRotate(intval($x6) ^ intval($x10), 7);
-
-        $x3+= $x7; $x15 = self::leftRotate(intval($x15) ^ intval($x3), 16);
-        $x11+= $x15; $x7 = self::leftRotate(intval($x7) ^ intval($x11), 12);
-        $x3+= $x7; $x15 = self::leftRotate(intval($x15) ^ intval($x3), 8);
-        $x11+= $x15; $x7 = self::leftRotate(intval($x7) ^ intval($x11), 7);
-
-        // rowRound
-        $x0+= $x5; $x15 = self::leftRotate(intval($x15) ^ intval($x0), 16);
-        $x10+= $x15; $x5 = self::leftRotate(intval($x5) ^ intval($x10), 12);
-        $x0+= $x5; $x15 = self::leftRotate(intval($x15) ^ intval($x0), 8);
-        $x10+= $x15; $x5 = self::leftRotate(intval($x5) ^ intval($x10), 7);
-
-        $x1+= $x6; $x12 = self::leftRotate(intval($x12) ^ intval($x1), 16);
-        $x11+= $x12; $x6 = self::leftRotate(intval($x6) ^ intval($x11), 12);
-        $x1+= $x6; $x12 = self::leftRotate(intval($x12) ^ intval($x1), 8);
-        $x11+= $x12; $x6 = self::leftRotate(intval($x6) ^ intval($x11), 7);
-
-        $x2+= $x7; $x13 = self::leftRotate(intval($x13) ^ intval($x2), 16);
-        $x8+= $x13; $x7 = self::leftRotate(intval($x7) ^ intval($x8), 12);
-        $x2+= $x7; $x13 = self::leftRotate(intval($x13) ^ intval($x2), 8);
-        $x8+= $x13; $x7 = self::leftRotate(intval($x7) ^ intval($x8), 7);
-
-        $x3+= $x4; $x14 = self::leftRotate(intval($x14) ^ intval($x3), 16);
-        $x9+= $x14; $x4 = self::leftRotate(intval($x4) ^ intval($x9), 12);
-        $x3+= $x4; $x14 = self::leftRotate(intval($x14) ^ intval($x3), 8);
-        $x9+= $x14; $x4 = self::leftRotate(intval($x4) ^ intval($x9), 7);
-
-        // columnRound
-        $x0+= $x4; $x12 = self::leftRotate(intval($x12) ^ intval($x0), 16);
-        $x8+= $x12; $x4 = self::leftRotate(intval($x4) ^ intval($x8), 12);
-        $x0+= $x4; $x12 = self::leftRotate(intval($x12) ^ intval($x0), 8);
-        $x8+= $x12; $x4 = self::leftRotate(intval($x4) ^ intval($x8), 7);
-
-        $x1+= $x5; $x13 = self::leftRotate(intval($x13) ^ intval($x1), 16);
-        $x9+= $x13; $x5 = self::leftRotate(intval($x5) ^ intval($x9), 12);
-        $x1+= $x5; $x13 = self::leftRotate(intval($x13) ^ intval($x1), 8);
-        $x9+= $x13; $x5 = self::leftRotate(intval($x5) ^ intval($x9), 7);
-
-        $x2+= $x6; $x14 = self::leftRotate(intval($x14) ^ intval($x2), 16);
-        $x10+= $x14; $x6 = self::leftRotate(intval($x6) ^ intval($x10), 12);
-        $x2+= $x6; $x14 = self::leftRotate(intval($x14) ^ intval($x2), 8);
-        $x10+= $x14; $x6 = self::leftRotate(intval($x6) ^ intval($x10), 7);
-
-        $x3+= $x7; $x15 = self::leftRotate(intval($x15) ^ intval($x3), 16);
-        $x11+= $x15; $x7 = self::leftRotate(intval($x7) ^ intval($x11), 12);
-        $x3+= $x7; $x15 = self::leftRotate(intval($x15) ^ intval($x3), 8);
-        $x11+= $x15; $x7 = self::leftRotate(intval($x7) ^ intval($x11), 7);
-
-        // rowRound
-        $x0+= $x5; $x15 = self::leftRotate(intval($x15) ^ intval($x0), 16);
-        $x10+= $x15; $x5 = self::leftRotate(intval($x5) ^ intval($x10), 12);
-        $x0+= $x5; $x15 = self::leftRotate(intval($x15) ^ intval($x0), 8);
-        $x10+= $x15; $x5 = self::leftRotate(intval($x5) ^ intval($x10), 7);
-
-        $x1+= $x6; $x12 = self::leftRotate(intval($x12) ^ intval($x1), 16);
-        $x11+= $x12; $x6 = self::leftRotate(intval($x6) ^ intval($x11), 12);
-        $x1+= $x6; $x12 = self::leftRotate(intval($x12) ^ intval($x1), 8);
-        $x11+= $x12; $x6 = self::leftRotate(intval($x6) ^ intval($x11), 7);
-
-        $x2+= $x7; $x13 = self::leftRotate(intval($x13) ^ intval($x2), 16);
-        $x8+= $x13; $x7 = self::leftRotate(intval($x7) ^ intval($x8), 12);
-        $x2+= $x7; $x13 = self::leftRotate(intval($x13) ^ intval($x2), 8);
-        $x8+= $x13; $x7 = self::leftRotate(intval($x7) ^ intval($x8), 7);
-
-        $x3+= $x4; $x14 = self::leftRotate(intval($x14) ^ intval($x3), 16);
-        $x9+= $x14; $x4 = self::leftRotate(intval($x4) ^ intval($x9), 12);
-        $x3+= $x4; $x14 = self::leftRotate(intval($x14) ^ intval($x3), 8);
-        $x9+= $x14; $x4 = self::leftRotate(intval($x4) ^ intval($x9), 7);
-
-        // columnRound
-        $x0+= $x4; $x12 = self::leftRotate(intval($x12) ^ intval($x0), 16);
-        $x8+= $x12; $x4 = self::leftRotate(intval($x4) ^ intval($x8), 12);
-        $x0+= $x4; $x12 = self::leftRotate(intval($x12) ^ intval($x0), 8);
-        $x8+= $x12; $x4 = self::leftRotate(intval($x4) ^ intval($x8), 7);
-
-        $x1+= $x5; $x13 = self::leftRotate(intval($x13) ^ intval($x1), 16);
-        $x9+= $x13; $x5 = self::leftRotate(intval($x5) ^ intval($x9), 12);
-        $x1+= $x5; $x13 = self::leftRotate(intval($x13) ^ intval($x1), 8);
-        $x9+= $x13; $x5 = self::leftRotate(intval($x5) ^ intval($x9), 7);
-
-        $x2+= $x6; $x14 = self::leftRotate(intval($x14) ^ intval($x2), 16);
-        $x10+= $x14; $x6 = self::leftRotate(intval($x6) ^ intval($x10), 12);
-        $x2+= $x6; $x14 = self::leftRotate(intval($x14) ^ intval($x2), 8);
-        $x10+= $x14; $x6 = self::leftRotate(intval($x6) ^ intval($x10), 7);
-
-        $x3+= $x7; $x15 = self::leftRotate(intval($x15) ^ intval($x3), 16);
-        $x11+= $x15; $x7 = self::leftRotate(intval($x7) ^ intval($x11), 12);
-        $x3+= $x7; $x15 = self::leftRotate(intval($x15) ^ intval($x3), 8);
-        $x11+= $x15; $x7 = self::leftRotate(intval($x7) ^ intval($x11), 7);
-
-        // rowRound
-        $x0+= $x5; $x15 = self::leftRotate(intval($x15) ^ intval($x0), 16);
-        $x10+= $x15; $x5 = self::leftRotate(intval($x5) ^ intval($x10), 12);
-        $x0+= $x5; $x15 = self::leftRotate(intval($x15) ^ intval($x0), 8);
-        $x10+= $x15; $x5 = self::leftRotate(intval($x5) ^ intval($x10), 7);
-
-        $x1+= $x6; $x12 = self::leftRotate(intval($x12) ^ intval($x1), 16);
-        $x11+= $x12; $x6 = self::leftRotate(intval($x6) ^ intval($x11), 12);
-        $x1+= $x6; $x12 = self::leftRotate(intval($x12) ^ intval($x1), 8);
-        $x11+= $x12; $x6 = self::leftRotate(intval($x6) ^ intval($x11), 7);
-
-        $x2+= $x7; $x13 = self::leftRotate(intval($x13) ^ intval($x2), 16);
-        $x8+= $x13; $x7 = self::leftRotate(intval($x7) ^ intval($x8), 12);
-        $x2+= $x7; $x13 = self::leftRotate(intval($x13) ^ intval($x2), 8);
-        $x8+= $x13; $x7 = self::leftRotate(intval($x7) ^ intval($x8), 7);
-
-        $x3+= $x4; $x14 = self::leftRotate(intval($x14) ^ intval($x3), 16);
-        $x9+= $x14; $x4 = self::leftRotate(intval($x4) ^ intval($x9), 12);
-        $x3+= $x4; $x14 = self::leftRotate(intval($x14) ^ intval($x3), 8);
-        $x9+= $x14; $x4 = self::leftRotate(intval($x4) ^ intval($x9), 7);
-
-        // columnRound
-        $x0+= $x4; $x12 = self::leftRotate(intval($x12) ^ intval($x0), 16);
-        $x8+= $x12; $x4 = self::leftRotate(intval($x4) ^ intval($x8), 12);
-        $x0+= $x4; $x12 = self::leftRotate(intval($x12) ^ intval($x0), 8);
-        $x8+= $x12; $x4 = self::leftRotate(intval($x4) ^ intval($x8), 7);
-
-        $x1+= $x5; $x13 = self::leftRotate(intval($x13) ^ intval($x1), 16);
-        $x9+= $x13; $x5 = self::leftRotate(intval($x5) ^ intval($x9), 12);
-        $x1+= $x5; $x13 = self::leftRotate(intval($x13) ^ intval($x1), 8);
-        $x9+= $x13; $x5 = self::leftRotate(intval($x5) ^ intval($x9), 7);
-
-        $x2+= $x6; $x14 = self::leftRotate(intval($x14) ^ intval($x2), 16);
-        $x10+= $x14; $x6 = self::leftRotate(intval($x6) ^ intval($x10), 12);
-        $x2+= $x6; $x14 = self::leftRotate(intval($x14) ^ intval($x2), 8);
-        $x10+= $x14; $x6 = self::leftRotate(intval($x6) ^ intval($x10), 7);
-
-        $x3+= $x7; $x15 = self::leftRotate(intval($x15) ^ intval($x3), 16);
-        $x11+= $x15; $x7 = self::leftRotate(intval($x7) ^ intval($x11), 12);
-        $x3+= $x7; $x15 = self::leftRotate(intval($x15) ^ intval($x3), 8);
-        $x11+= $x15; $x7 = self::leftRotate(intval($x7) ^ intval($x11), 7);
-
-        // rowRound
-        $x0+= $x5; $x15 = self::leftRotate(intval($x15) ^ intval($x0), 16);
-        $x10+= $x15; $x5 = self::leftRotate(intval($x5) ^ intval($x10), 12);
-        $x0+= $x5; $x15 = self::leftRotate(intval($x15) ^ intval($x0), 8);
-        $x10+= $x15; $x5 = self::leftRotate(intval($x5) ^ intval($x10), 7);
-
-        $x1+= $x6; $x12 = self::leftRotate(intval($x12) ^ intval($x1), 16);
-        $x11+= $x12; $x6 = self::leftRotate(intval($x6) ^ intval($x11), 12);
-        $x1+= $x6; $x12 = self::leftRotate(intval($x12) ^ intval($x1), 8);
-        $x11+= $x12; $x6 = self::leftRotate(intval($x6) ^ intval($x11), 7);
-
-        $x2+= $x7; $x13 = self::leftRotate(intval($x13) ^ intval($x2), 16);
-        $x8+= $x13; $x7 = self::leftRotate(intval($x7) ^ intval($x8), 12);
-        $x2+= $x7; $x13 = self::leftRotate(intval($x13) ^ intval($x2), 8);
-        $x8+= $x13; $x7 = self::leftRotate(intval($x7) ^ intval($x8), 7);
-
-        $x3+= $x4; $x14 = self::leftRotate(intval($x14) ^ intval($x3), 16);
-        $x9+= $x14; $x4 = self::leftRotate(intval($x4) ^ intval($x9), 12);
-        $x3+= $x4; $x14 = self::leftRotate(intval($x14) ^ intval($x3), 8);
-        $x9+= $x14; $x4 = self::leftRotate(intval($x4) ^ intval($x9), 7);
-
-        // columnRound
-        $x0+= $x4; $x12 = self::leftRotate(intval($x12) ^ intval($x0), 16);
-        $x8+= $x12; $x4 = self::leftRotate(intval($x4) ^ intval($x8), 12);
-        $x0+= $x4; $x12 = self::leftRotate(intval($x12) ^ intval($x0), 8);
-        $x8+= $x12; $x4 = self::leftRotate(intval($x4) ^ intval($x8), 7);
-
-        $x1+= $x5; $x13 = self::leftRotate(intval($x13) ^ intval($x1), 16);
-        $x9+= $x13; $x5 = self::leftRotate(intval($x5) ^ intval($x9), 12);
-        $x1+= $x5; $x13 = self::leftRotate(intval($x13) ^ intval($x1), 8);
-        $x9+= $x13; $x5 = self::leftRotate(intval($x5) ^ intval($x9), 7);
-
-        $x2+= $x6; $x14 = self::leftRotate(intval($x14) ^ intval($x2), 16);
-        $x10+= $x14; $x6 = self::leftRotate(intval($x6) ^ intval($x10), 12);
-        $x2+= $x6; $x14 = self::leftRotate(intval($x14) ^ intval($x2), 8);
-        $x10+= $x14; $x6 = self::leftRotate(intval($x6) ^ intval($x10), 7);
-
-        $x3+= $x7; $x15 = self::leftRotate(intval($x15) ^ intval($x3), 16);
-        $x11+= $x15; $x7 = self::leftRotate(intval($x7) ^ intval($x11), 12);
-        $x3+= $x7; $x15 = self::leftRotate(intval($x15) ^ intval($x3), 8);
-        $x11+= $x15; $x7 = self::leftRotate(intval($x7) ^ intval($x11), 7);
-
-        // rowRound
-        $x0+= $x5; $x15 = self::leftRotate(intval($x15) ^ intval($x0), 16);
-        $x10+= $x15; $x5 = self::leftRotate(intval($x5) ^ intval($x10), 12);
-        $x0+= $x5; $x15 = self::leftRotate(intval($x15) ^ intval($x0), 8);
-        $x10+= $x15; $x5 = self::leftRotate(intval($x5) ^ intval($x10), 7);
-
-        $x1+= $x6; $x12 = self::leftRotate(intval($x12) ^ intval($x1), 16);
-        $x11+= $x12; $x6 = self::leftRotate(intval($x6) ^ intval($x11), 12);
-        $x1+= $x6; $x12 = self::leftRotate(intval($x12) ^ intval($x1), 8);
-        $x11+= $x12; $x6 = self::leftRotate(intval($x6) ^ intval($x11), 7);
-
-        $x2+= $x7; $x13 = self::leftRotate(intval($x13) ^ intval($x2), 16);
-        $x8+= $x13; $x7 = self::leftRotate(intval($x7) ^ intval($x8), 12);
-        $x2+= $x7; $x13 = self::leftRotate(intval($x13) ^ intval($x2), 8);
-        $x8+= $x13; $x7 = self::leftRotate(intval($x7) ^ intval($x8), 7);
-
-        $x3+= $x4; $x14 = self::leftRotate(intval($x14) ^ intval($x3), 16);
-        $x9+= $x14; $x4 = self::leftRotate(intval($x4) ^ intval($x9), 12);
-        $x3+= $x4; $x14 = self::leftRotate(intval($x14) ^ intval($x3), 8);
-        $x9+= $x14; $x4 = self::leftRotate(intval($x4) ^ intval($x9), 7);
-
-        // columnRound
-        $x0+= $x4; $x12 = self::leftRotate(intval($x12) ^ intval($x0), 16);
-        $x8+= $x12; $x4 = self::leftRotate(intval($x4) ^ intval($x8), 12);
-        $x0+= $x4; $x12 = self::leftRotate(intval($x12) ^ intval($x0), 8);
-        $x8+= $x12; $x4 = self::leftRotate(intval($x4) ^ intval($x8), 7);
-
-        $x1+= $x5; $x13 = self::leftRotate(intval($x13) ^ intval($x1), 16);
-        $x9+= $x13; $x5 = self::leftRotate(intval($x5) ^ intval($x9), 12);
-        $x1+= $x5; $x13 = self::leftRotate(intval($x13) ^ intval($x1), 8);
-        $x9+= $x13; $x5 = self::leftRotate(intval($x5) ^ intval($x9), 7);
-
-        $x2+= $x6; $x14 = self::leftRotate(intval($x14) ^ intval($x2), 16);
-        $x10+= $x14; $x6 = self::leftRotate(intval($x6) ^ intval($x10), 12);
-        $x2+= $x6; $x14 = self::leftRotate(intval($x14) ^ intval($x2), 8);
-        $x10+= $x14; $x6 = self::leftRotate(intval($x6) ^ intval($x10), 7);
-
-        $x3+= $x7; $x15 = self::leftRotate(intval($x15) ^ intval($x3), 16);
-        $x11+= $x15; $x7 = self::leftRotate(intval($x7) ^ intval($x11), 12);
-        $x3+= $x7; $x15 = self::leftRotate(intval($x15) ^ intval($x3), 8);
-        $x11+= $x15; $x7 = self::leftRotate(intval($x7) ^ intval($x11), 7);
-
-        // rowRound
-        $x0+= $x5; $x15 = self::leftRotate(intval($x15) ^ intval($x0), 16);
-        $x10+= $x15; $x5 = self::leftRotate(intval($x5) ^ intval($x10), 12);
-        $x0+= $x5; $x15 = self::leftRotate(intval($x15) ^ intval($x0), 8);
-        $x10+= $x15; $x5 = self::leftRotate(intval($x5) ^ intval($x10), 7);
-
-        $x1+= $x6; $x12 = self::leftRotate(intval($x12) ^ intval($x1), 16);
-        $x11+= $x12; $x6 = self::leftRotate(intval($x6) ^ intval($x11), 12);
-        $x1+= $x6; $x12 = self::leftRotate(intval($x12) ^ intval($x1), 8);
-        $x11+= $x12; $x6 = self::leftRotate(intval($x6) ^ intval($x11), 7);
-
-        $x2+= $x7; $x13 = self::leftRotate(intval($x13) ^ intval($x2), 16);
-        $x8+= $x13; $x7 = self::leftRotate(intval($x7) ^ intval($x8), 12);
-        $x2+= $x7; $x13 = self::leftRotate(intval($x13) ^ intval($x2), 8);
-        $x8+= $x13; $x7 = self::leftRotate(intval($x7) ^ intval($x8), 7);
-
-        $x3+= $x4; $x14 = self::leftRotate(intval($x14) ^ intval($x3), 16);
-        $x9+= $x14; $x4 = self::leftRotate(intval($x4) ^ intval($x9), 12);
-        $x3+= $x4; $x14 = self::leftRotate(intval($x14) ^ intval($x3), 8);
-        $x9+= $x14; $x4 = self::leftRotate(intval($x4) ^ intval($x9), 7);
-
-        // columnRound
-        $x0+= $x4; $x12 = self::leftRotate(intval($x12) ^ intval($x0), 16);
-        $x8+= $x12; $x4 = self::leftRotate(intval($x4) ^ intval($x8), 12);
-        $x0+= $x4; $x12 = self::leftRotate(intval($x12) ^ intval($x0), 8);
-        $x8+= $x12; $x4 = self::leftRotate(intval($x4) ^ intval($x8), 7);
-
-        $x1+= $x5; $x13 = self::leftRotate(intval($x13) ^ intval($x1), 16);
-        $x9+= $x13; $x5 = self::leftRotate(intval($x5) ^ intval($x9), 12);
-        $x1+= $x5; $x13 = self::leftRotate(intval($x13) ^ intval($x1), 8);
-        $x9+= $x13; $x5 = self::leftRotate(intval($x5) ^ intval($x9), 7);
-
-        $x2+= $x6; $x14 = self::leftRotate(intval($x14) ^ intval($x2), 16);
-        $x10+= $x14; $x6 = self::leftRotate(intval($x6) ^ intval($x10), 12);
-        $x2+= $x6; $x14 = self::leftRotate(intval($x14) ^ intval($x2), 8);
-        $x10+= $x14; $x6 = self::leftRotate(intval($x6) ^ intval($x10), 7);
-
-        $x3+= $x7; $x15 = self::leftRotate(intval($x15) ^ intval($x3), 16);
-        $x11+= $x15; $x7 = self::leftRotate(intval($x7) ^ intval($x11), 12);
-        $x3+= $x7; $x15 = self::leftRotate(intval($x15) ^ intval($x3), 8);
-        $x11+= $x15; $x7 = self::leftRotate(intval($x7) ^ intval($x11), 7);
-
-        // rowRound
-        $x0+= $x5; $x15 = self::leftRotate(intval($x15) ^ intval($x0), 16);
-        $x10+= $x15; $x5 = self::leftRotate(intval($x5) ^ intval($x10), 12);
-        $x0+= $x5; $x15 = self::leftRotate(intval($x15) ^ intval($x0), 8);
-        $x10+= $x15; $x5 = self::leftRotate(intval($x5) ^ intval($x10), 7);
-
-        $x1+= $x6; $x12 = self::leftRotate(intval($x12) ^ intval($x1), 16);
-        $x11+= $x12; $x6 = self::leftRotate(intval($x6) ^ intval($x11), 12);
-        $x1+= $x6; $x12 = self::leftRotate(intval($x12) ^ intval($x1), 8);
-        $x11+= $x12; $x6 = self::leftRotate(intval($x6) ^ intval($x11), 7);
-
-        $x2+= $x7; $x13 = self::leftRotate(intval($x13) ^ intval($x2), 16);
-        $x8+= $x13; $x7 = self::leftRotate(intval($x7) ^ intval($x8), 12);
-        $x2+= $x7; $x13 = self::leftRotate(intval($x13) ^ intval($x2), 8);
-        $x8+= $x13; $x7 = self::leftRotate(intval($x7) ^ intval($x8), 7);
-
-        $x3+= $x4; $x14 = self::leftRotate(intval($x14) ^ intval($x3), 16);
-        $x9+= $x14; $x4 = self::leftRotate(intval($x4) ^ intval($x9), 12);
-        $x3+= $x4; $x14 = self::leftRotate(intval($x14) ^ intval($x3), 8);
-        $x9+= $x14; $x4 = self::leftRotate(intval($x4) ^ intval($x9), 7);
-
-        // columnRound
-        $x0+= $x4; $x12 = self::leftRotate(intval($x12) ^ intval($x0), 16);
-        $x8+= $x12; $x4 = self::leftRotate(intval($x4) ^ intval($x8), 12);
-        $x0+= $x4; $x12 = self::leftRotate(intval($x12) ^ intval($x0), 8);
-        $x8+= $x12; $x4 = self::leftRotate(intval($x4) ^ intval($x8), 7);
-
-        $x1+= $x5; $x13 = self::leftRotate(intval($x13) ^ intval($x1), 16);
-        $x9+= $x13; $x5 = self::leftRotate(intval($x5) ^ intval($x9), 12);
-        $x1+= $x5; $x13 = self::leftRotate(intval($x13) ^ intval($x1), 8);
-        $x9+= $x13; $x5 = self::leftRotate(intval($x5) ^ intval($x9), 7);
-
-        $x2+= $x6; $x14 = self::leftRotate(intval($x14) ^ intval($x2), 16);
-        $x10+= $x14; $x6 = self::leftRotate(intval($x6) ^ intval($x10), 12);
-        $x2+= $x6; $x14 = self::leftRotate(intval($x14) ^ intval($x2), 8);
-        $x10+= $x14; $x6 = self::leftRotate(intval($x6) ^ intval($x10), 7);
-
-        $x3+= $x7; $x15 = self::leftRotate(intval($x15) ^ intval($x3), 16);
-        $x11+= $x15; $x7 = self::leftRotate(intval($x7) ^ intval($x11), 12);
-        $x3+= $x7; $x15 = self::leftRotate(intval($x15) ^ intval($x3), 8);
-        $x11+= $x15; $x7 = self::leftRotate(intval($x7) ^ intval($x11), 7);
-
-        // rowRound
-        $x0+= $x5; $x15 = self::leftRotate(intval($x15) ^ intval($x0), 16);
-        $x10+= $x15; $x5 = self::leftRotate(intval($x5) ^ intval($x10), 12);
-        $x0+= $x5; $x15 = self::leftRotate(intval($x15) ^ intval($x0), 8);
-        $x10+= $x15; $x5 = self::leftRotate(intval($x5) ^ intval($x10), 7);
-
-        $x1+= $x6; $x12 = self::leftRotate(intval($x12) ^ intval($x1), 16);
-        $x11+= $x12; $x6 = self::leftRotate(intval($x6) ^ intval($x11), 12);
-        $x1+= $x6; $x12 = self::leftRotate(intval($x12) ^ intval($x1), 8);
-        $x11+= $x12; $x6 = self::leftRotate(intval($x6) ^ intval($x11), 7);
-
-        $x2+= $x7; $x13 = self::leftRotate(intval($x13) ^ intval($x2), 16);
-        $x8+= $x13; $x7 = self::leftRotate(intval($x7) ^ intval($x8), 12);
-        $x2+= $x7; $x13 = self::leftRotate(intval($x13) ^ intval($x2), 8);
-        $x8+= $x13; $x7 = self::leftRotate(intval($x7) ^ intval($x8), 7);
-
-        $x3+= $x4; $x14 = self::leftRotate(intval($x14) ^ intval($x3), 16);
-        $x9+= $x14; $x4 = self::leftRotate(intval($x4) ^ intval($x9), 12);
-        $x3+= $x4; $x14 = self::leftRotate(intval($x14) ^ intval($x3), 8);
-        $x9+= $x14; $x4 = self::leftRotate(intval($x4) ^ intval($x9), 7);
-
-        // columnRound
-        $x0+= $x4; $x12 = self::leftRotate(intval($x12) ^ intval($x0), 16);
-        $x8+= $x12; $x4 = self::leftRotate(intval($x4) ^ intval($x8), 12);
-        $x0+= $x4; $x12 = self::leftRotate(intval($x12) ^ intval($x0), 8);
-        $x8+= $x12; $x4 = self::leftRotate(intval($x4) ^ intval($x8), 7);
-
-        $x1+= $x5; $x13 = self::leftRotate(intval($x13) ^ intval($x1), 16);
-        $x9+= $x13; $x5 = self::leftRotate(intval($x5) ^ intval($x9), 12);
-        $x1+= $x5; $x13 = self::leftRotate(intval($x13) ^ intval($x1), 8);
-        $x9+= $x13; $x5 = self::leftRotate(intval($x5) ^ intval($x9), 7);
-
-        $x2+= $x6; $x14 = self::leftRotate(intval($x14) ^ intval($x2), 16);
-        $x10+= $x14; $x6 = self::leftRotate(intval($x6) ^ intval($x10), 12);
-        $x2+= $x6; $x14 = self::leftRotate(intval($x14) ^ intval($x2), 8);
-        $x10+= $x14; $x6 = self::leftRotate(intval($x6) ^ intval($x10), 7);
-
-        $x3+= $x7; $x15 = self::leftRotate(intval($x15) ^ intval($x3), 16);
-        $x11+= $x15; $x7 = self::leftRotate(intval($x7) ^ intval($x11), 12);
-        $x3+= $x7; $x15 = self::leftRotate(intval($x15) ^ intval($x3), 8);
-        $x11+= $x15; $x7 = self::leftRotate(intval($x7) ^ intval($x11), 7);
-
-        // rowRound
-        $x0+= $x5; $x15 = self::leftRotate(intval($x15) ^ intval($x0), 16);
-        $x10+= $x15; $x5 = self::leftRotate(intval($x5) ^ intval($x10), 12);
-        $x0+= $x5; $x15 = self::leftRotate(intval($x15) ^ intval($x0), 8);
-        $x10+= $x15; $x5 = self::leftRotate(intval($x5) ^ intval($x10), 7);
-
-        $x1+= $x6; $x12 = self::leftRotate(intval($x12) ^ intval($x1), 16);
-        $x11+= $x12; $x6 = self::leftRotate(intval($x6) ^ intval($x11), 12);
-        $x1+= $x6; $x12 = self::leftRotate(intval($x12) ^ intval($x1), 8);
-        $x11+= $x12; $x6 = self::leftRotate(intval($x6) ^ intval($x11), 7);
-
-        $x2+= $x7; $x13 = self::leftRotate(intval($x13) ^ intval($x2), 16);
-        $x8+= $x13; $x7 = self::leftRotate(intval($x7) ^ intval($x8), 12);
-        $x2+= $x7; $x13 = self::leftRotate(intval($x13) ^ intval($x2), 8);
-        $x8+= $x13; $x7 = self::leftRotate(intval($x7) ^ intval($x8), 7);
-
-        $x3+= $x4; $x14 = self::leftRotate(intval($x14) ^ intval($x3), 16);
-        $x9+= $x14; $x4 = self::leftRotate(intval($x4) ^ intval($x9), 12);
-        $x3+= $x4; $x14 = self::leftRotate(intval($x14) ^ intval($x3), 8);
-        $x9+= $x14; $x4 = self::leftRotate(intval($x4) ^ intval($x9), 7);
-
-        // columnRound
-        $x0+= $x4; $x12 = self::leftRotate(intval($x12) ^ intval($x0), 16);
-        $x8+= $x12; $x4 = self::leftRotate(intval($x4) ^ intval($x8), 12);
-        $x0+= $x4; $x12 = self::leftRotate(intval($x12) ^ intval($x0), 8);
-        $x8+= $x12; $x4 = self::leftRotate(intval($x4) ^ intval($x8), 7);
-
-        $x1+= $x5; $x13 = self::leftRotate(intval($x13) ^ intval($x1), 16);
-        $x9+= $x13; $x5 = self::leftRotate(intval($x5) ^ intval($x9), 12);
-        $x1+= $x5; $x13 = self::leftRotate(intval($x13) ^ intval($x1), 8);
-        $x9+= $x13; $x5 = self::leftRotate(intval($x5) ^ intval($x9), 7);
-
-        $x2+= $x6; $x14 = self::leftRotate(intval($x14) ^ intval($x2), 16);
-        $x10+= $x14; $x6 = self::leftRotate(intval($x6) ^ intval($x10), 12);
-        $x2+= $x6; $x14 = self::leftRotate(intval($x14) ^ intval($x2), 8);
-        $x10+= $x14; $x6 = self::leftRotate(intval($x6) ^ intval($x10), 7);
-
-        $x3+= $x7; $x15 = self::leftRotate(intval($x15) ^ intval($x3), 16);
-        $x11+= $x15; $x7 = self::leftRotate(intval($x7) ^ intval($x11), 12);
-        $x3+= $x7; $x15 = self::leftRotate(intval($x15) ^ intval($x3), 8);
-        $x11+= $x15; $x7 = self::leftRotate(intval($x7) ^ intval($x11), 7);
-
-        // rowRound
-        $x0+= $x5; $x15 = self::leftRotate(intval($x15) ^ intval($x0), 16);
-        $x10+= $x15; $x5 = self::leftRotate(intval($x5) ^ intval($x10), 12);
-        $x0+= $x5; $x15 = self::leftRotate(intval($x15) ^ intval($x0), 8);
-        $x10+= $x15; $x5 = self::leftRotate(intval($x5) ^ intval($x10), 7);
-
-        $x1+= $x6; $x12 = self::leftRotate(intval($x12) ^ intval($x1), 16);
-        $x11+= $x12; $x6 = self::leftRotate(intval($x6) ^ intval($x11), 12);
-        $x1+= $x6; $x12 = self::leftRotate(intval($x12) ^ intval($x1), 8);
-        $x11+= $x12; $x6 = self::leftRotate(intval($x6) ^ intval($x11), 7);
-
-        $x2+= $x7; $x13 = self::leftRotate(intval($x13) ^ intval($x2), 16);
-        $x8+= $x13; $x7 = self::leftRotate(intval($x7) ^ intval($x8), 12);
-        $x2+= $x7; $x13 = self::leftRotate(intval($x13) ^ intval($x2), 8);
-        $x8+= $x13; $x7 = self::leftRotate(intval($x7) ^ intval($x8), 7);
-
-        $x3+= $x4; $x14 = self::leftRotate(intval($x14) ^ intval($x3), 16);
-        $x9+= $x14; $x4 = self::leftRotate(intval($x4) ^ intval($x9), 12);
-        $x3+= $x4; $x14 = self::leftRotate(intval($x14) ^ intval($x3), 8);
-        $x9+= $x14; $x4 = self::leftRotate(intval($x4) ^ intval($x9), 7);
-        // @codingStandardsIgnoreEnd
-
-        $x0 += $z0;
-        $x1 += $z1;
-        $x2 += $z2;
-        $x3 += $z3;
-        $x4 += $z4;
-        $x5 += $z5;
-        $x6 += $z6;
-        $x7 += $z7;
-        $x8 += $z8;
-        $x9 += $z9;
-        $x10 += $z10;
-        $x11 += $z11;
-        $x12 += $z12;
-        $x13 += $z13;
-        $x14 += $z14;
-        $x15 += $z15;
-
-        return pack('V*', $x0, $x1, $x2, $x3, $x4, $x5, $x6, $x7, $x8, $x9, $x10, $x11, $x12, $x13, $x14, $x15);
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/Common/AsymmetricKey.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/Common/AsymmetricKey.php
deleted file mode 100644
index 09eb5b1b..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/Common/AsymmetricKey.php
+++ /dev/null
@@ -1,581 +0,0 @@
-<?php
-
-/**
- * Base Class for all asymmetric key ciphers
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\Crypt\Common;
-
-use phpseclib3\Crypt\DSA;
-use phpseclib3\Crypt\Hash;
-use phpseclib3\Crypt\RSA;
-use phpseclib3\Exception\NoKeyLoadedException;
-use phpseclib3\Exception\UnsupportedFormatException;
-use phpseclib3\Math\BigInteger;
-
-/**
- * Base Class for all asymmetric cipher classes
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class AsymmetricKey
-{
-    /**
-     * Precomputed Zero
-     *
-     * @var \phpseclib3\Math\BigInteger
-     */
-    protected static $zero;
-
-    /**
-     * Precomputed One
-     *
-     * @var \phpseclib3\Math\BigInteger
-     */
-    protected static $one;
-
-    /**
-     * Format of the loaded key
-     *
-     * @var string
-     */
-    protected $format;
-
-    /**
-     * Hash function
-     *
-     * @var \phpseclib3\Crypt\Hash
-     */
-    protected $hash;
-
-    /**
-     * HMAC function
-     *
-     * @var \phpseclib3\Crypt\Hash
-     */
-    private $hmac;
-
-    /**
-     * Supported plugins (lower case)
-     *
-     * @see self::initialize_static_variables()
-     * @var array
-     */
-    private static $plugins = [];
-
-    /**
-     * Invisible plugins
-     *
-     * @see self::initialize_static_variables()
-     * @var array
-     */
-    private static $invisiblePlugins = [];
-
-    /**
-     * Available Engines
-     *
-     * @var boolean[]
-     */
-    protected static $engines = [];
-
-    /**
-     * Key Comment
-     *
-     * @var null|string
-     */
-    private $comment;
-
-    /**
-     * @param string $type
-     * @return array|string
-     */
-    abstract public function toString($type, array $options = []);
-
-    /**
-     * The constructor
-     */
-    protected function __construct()
-    {
-        self::initialize_static_variables();
-
-        $this->hash = new Hash('sha256');
-        $this->hmac = new Hash('sha256');
-    }
-
-    /**
-     * Initialize static variables
-     */
-    protected static function initialize_static_variables()
-    {
-        if (!isset(self::$zero)) {
-            self::$zero = new BigInteger(0);
-            self::$one = new BigInteger(1);
-        }
-
-        self::loadPlugins('Keys');
-        if (static::ALGORITHM != 'RSA' && static::ALGORITHM != 'DH') {
-            self::loadPlugins('Signature');
-        }
-    }
-
-    /**
-     * Load the key
-     *
-     * @param string $key
-     * @param string $password optional
-     * @return \phpseclib3\Crypt\Common\PublicKey|\phpseclib3\Crypt\Common\PrivateKey
-     */
-    public static function load($key, $password = false)
-    {
-        self::initialize_static_variables();
-
-        $class = new \ReflectionClass(static::class);
-        if ($class->isFinal()) {
-            throw new \RuntimeException('load() should not be called from final classes (' . static::class . ')');
-        }
-
-        $components = false;
-        foreach (self::$plugins[static::ALGORITHM]['Keys'] as $format) {
-            if (isset(self::$invisiblePlugins[static::ALGORITHM]) && in_array($format, self::$invisiblePlugins[static::ALGORITHM])) {
-                continue;
-            }
-            try {
-                $components = $format::load($key, $password);
-            } catch (\Exception $e) {
-                $components = false;
-            }
-            if ($components !== false) {
-                break;
-            }
-        }
-
-        if ($components === false) {
-            throw new NoKeyLoadedException('Unable to read key');
-        }
-
-        $components['format'] = $format;
-        $components['secret'] = isset($components['secret']) ? $components['secret'] : '';
-        $comment = isset($components['comment']) ? $components['comment'] : null;
-        $new = static::onLoad($components);
-        $new->format = $format;
-        $new->comment = $comment;
-        return $new instanceof PrivateKey ?
-            $new->withPassword($password) :
-            $new;
-    }
-
-    /**
-     * Loads a private key
-     *
-     * @return PrivateKey
-     * @param string|array $key
-     * @param string $password optional
-     */
-    public static function loadPrivateKey($key, $password = '')
-    {
-        $key = self::load($key, $password);
-        if (!$key instanceof PrivateKey) {
-            throw new NoKeyLoadedException('The key that was loaded was not a private key');
-        }
-        return $key;
-    }
-
-    /**
-     * Loads a public key
-     *
-     * @return PublicKey
-     * @param string|array $key
-     */
-    public static function loadPublicKey($key)
-    {
-        $key = self::load($key);
-        if (!$key instanceof PublicKey) {
-            throw new NoKeyLoadedException('The key that was loaded was not a public key');
-        }
-        return $key;
-    }
-
-    /**
-     * Loads parameters
-     *
-     * @return AsymmetricKey
-     * @param string|array $key
-     */
-    public static function loadParameters($key)
-    {
-        $key = self::load($key);
-        if (!$key instanceof PrivateKey && !$key instanceof PublicKey) {
-            throw new NoKeyLoadedException('The key that was loaded was not a parameter');
-        }
-        return $key;
-    }
-
-    /**
-     * Load the key, assuming a specific format
-     *
-     * @param string $type
-     * @param string $key
-     * @param string $password optional
-     * @return static
-     */
-    public static function loadFormat($type, $key, $password = false)
-    {
-        self::initialize_static_variables();
-
-        $components = false;
-        $format = strtolower($type);
-        if (isset(self::$plugins[static::ALGORITHM]['Keys'][$format])) {
-            $format = self::$plugins[static::ALGORITHM]['Keys'][$format];
-            $components = $format::load($key, $password);
-        }
-
-        if ($components === false) {
-            throw new NoKeyLoadedException('Unable to read key');
-        }
-
-        $components['format'] = $format;
-        $components['secret'] = isset($components['secret']) ? $components['secret'] : '';
-
-        $new = static::onLoad($components);
-        $new->format = $format;
-        return $new instanceof PrivateKey ?
-            $new->withPassword($password) :
-            $new;
-    }
-
-    /**
-     * Loads a private key
-     *
-     * @return PrivateKey
-     * @param string $type
-     * @param string $key
-     * @param string $password optional
-     */
-    public static function loadPrivateKeyFormat($type, $key, $password = false)
-    {
-        $key = self::loadFormat($type, $key, $password);
-        if (!$key instanceof PrivateKey) {
-            throw new NoKeyLoadedException('The key that was loaded was not a private key');
-        }
-        return $key;
-    }
-
-    /**
-     * Loads a public key
-     *
-     * @return PublicKey
-     * @param string $type
-     * @param string $key
-     */
-    public static function loadPublicKeyFormat($type, $key)
-    {
-        $key = self::loadFormat($type, $key);
-        if (!$key instanceof PublicKey) {
-            throw new NoKeyLoadedException('The key that was loaded was not a public key');
-        }
-        return $key;
-    }
-
-    /**
-     * Loads parameters
-     *
-     * @return AsymmetricKey
-     * @param string $type
-     * @param string|array $key
-     */
-    public static function loadParametersFormat($type, $key)
-    {
-        $key = self::loadFormat($type, $key);
-        if (!$key instanceof PrivateKey && !$key instanceof PublicKey) {
-            throw new NoKeyLoadedException('The key that was loaded was not a parameter');
-        }
-        return $key;
-    }
-
-    /**
-     * Validate Plugin
-     *
-     * @param string $format
-     * @param string $type
-     * @param string $method optional
-     * @return mixed
-     */
-    protected static function validatePlugin($format, $type, $method = null)
-    {
-        $type = strtolower($type);
-        if (!isset(self::$plugins[static::ALGORITHM][$format][$type])) {
-            throw new UnsupportedFormatException("$type is not a supported format");
-        }
-        $type = self::$plugins[static::ALGORITHM][$format][$type];
-        if (isset($method) && !method_exists($type, $method)) {
-            throw new UnsupportedFormatException("$type does not implement $method");
-        }
-
-        return $type;
-    }
-
-    /**
-     * Load Plugins
-     *
-     * @param string $format
-     */
-    private static function loadPlugins($format)
-    {
-        if (!isset(self::$plugins[static::ALGORITHM][$format])) {
-            self::$plugins[static::ALGORITHM][$format] = [];
-            foreach (new \DirectoryIterator(__DIR__ . '/../' . static::ALGORITHM . '/Formats/' . $format . '/') as $file) {
-                if ($file->getExtension() != 'php') {
-                    continue;
-                }
-                $name = $file->getBasename('.php');
-                if ($name[0] == '.') {
-                    continue;
-                }
-                $type = 'phpseclib3\Crypt\\' . static::ALGORITHM . '\\Formats\\' . $format . '\\' . $name;
-                $reflect = new \ReflectionClass($type);
-                if ($reflect->isTrait()) {
-                    continue;
-                }
-                self::$plugins[static::ALGORITHM][$format][strtolower($name)] = $type;
-                if ($reflect->hasConstant('IS_INVISIBLE')) {
-                    self::$invisiblePlugins[static::ALGORITHM][] = $type;
-                }
-            }
-        }
-    }
-
-    /**
-     * Returns a list of supported formats.
-     *
-     * @return array
-     */
-    public static function getSupportedKeyFormats()
-    {
-        self::initialize_static_variables();
-
-        return self::$plugins[static::ALGORITHM]['Keys'];
-    }
-
-    /**
-     * Add a fileformat plugin
-     *
-     * The plugin needs to either already be loaded or be auto-loadable.
-     * Loading a plugin whose shortname overwrite an existing shortname will overwrite the old plugin.
-     *
-     * @see self::load()
-     * @param string $fullname
-     * @return bool
-     */
-    public static function addFileFormat($fullname)
-    {
-        self::initialize_static_variables();
-
-        if (class_exists($fullname)) {
-            $meta = new \ReflectionClass($fullname);
-            $shortname = $meta->getShortName();
-            self::$plugins[static::ALGORITHM]['Keys'][strtolower($shortname)] = $fullname;
-            if ($meta->hasConstant('IS_INVISIBLE')) {
-                self::$invisiblePlugins[static::ALGORITHM][] = strtolower($shortname);
-            }
-        }
-    }
-
-    /**
-     * Returns the format of the loaded key.
-     *
-     * If the key that was loaded wasn't in a valid or if the key was auto-generated
-     * with RSA::createKey() then this will throw an exception.
-     *
-     * @see self::load()
-     * @return mixed
-     */
-    public function getLoadedFormat()
-    {
-        if (empty($this->format)) {
-            throw new NoKeyLoadedException('This key was created with createKey - it was not loaded with load. Therefore there is no "loaded format"');
-        }
-
-        $meta = new \ReflectionClass($this->format);
-        return $meta->getShortName();
-    }
-
-    /**
-     * Returns the key's comment
-     *
-     * Not all key formats support comments. If you want to set a comment use toString()
-     *
-     * @return null|string
-     */
-    public function getComment()
-    {
-        return $this->comment;
-    }
-
-    /**
-     * Tests engine validity
-     *
-     */
-    public static function useBestEngine()
-    {
-        static::$engines = [
-            'PHP' => true,
-            'OpenSSL' => extension_loaded('openssl'),
-            // this test can be satisfied by either of the following:
-            // http://php.net/manual/en/book.sodium.php
-            // https://github.com/paragonie/sodium_compat
-            'libsodium' => function_exists('sodium_crypto_sign_keypair')
-        ];
-
-        return static::$engines;
-    }
-
-    /**
-     * Flag to use internal engine only (useful for unit testing)
-     *
-     */
-    public static function useInternalEngine()
-    {
-        static::$engines = [
-            'PHP' => true,
-            'OpenSSL' => false,
-            'libsodium' => false
-        ];
-    }
-
-    /**
-     * __toString() magic method
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->toString('PKCS8');
-    }
-
-    /**
-     * Determines which hashing function should be used
-     *
-     * @param string $hash
-     */
-    public function withHash($hash)
-    {
-        $new = clone $this;
-
-        $new->hash = new Hash($hash);
-        $new->hmac = new Hash($hash);
-
-        return $new;
-    }
-
-    /**
-     * Returns the hash algorithm currently being used
-     *
-     */
-    public function getHash()
-    {
-        return clone $this->hash;
-    }
-
-    /**
-     * Compute the pseudorandom k for signature generation,
-     * using the process specified for deterministic DSA.
-     *
-     * @param string $h1
-     * @return string
-     */
-    protected function computek($h1)
-    {
-        $v = str_repeat("\1", strlen($h1));
-
-        $k = str_repeat("\0", strlen($h1));
-
-        $x = $this->int2octets($this->x);
-        $h1 = $this->bits2octets($h1);
-
-        $this->hmac->setKey($k);
-        $k = $this->hmac->hash($v . "\0" . $x . $h1);
-        $this->hmac->setKey($k);
-        $v = $this->hmac->hash($v);
-        $k = $this->hmac->hash($v . "\1" . $x . $h1);
-        $this->hmac->setKey($k);
-        $v = $this->hmac->hash($v);
-
-        $qlen = $this->q->getLengthInBytes();
-
-        while (true) {
-            $t = '';
-            while (strlen($t) < $qlen) {
-                $v = $this->hmac->hash($v);
-                $t = $t . $v;
-            }
-            $k = $this->bits2int($t);
-
-            if (!$k->equals(self::$zero) && $k->compare($this->q) < 0) {
-                break;
-            }
-            $k = $this->hmac->hash($v . "\0");
-            $this->hmac->setKey($k);
-            $v = $this->hmac->hash($v);
-        }
-
-        return $k;
-    }
-
-    /**
-     * Integer to Octet String
-     *
-     * @param \phpseclib3\Math\BigInteger $v
-     * @return string
-     */
-    private function int2octets($v)
-    {
-        $out = $v->toBytes();
-        $rolen = $this->q->getLengthInBytes();
-        if (strlen($out) < $rolen) {
-            return str_pad($out, $rolen, "\0", STR_PAD_LEFT);
-        } elseif (strlen($out) > $rolen) {
-            return substr($out, -$rolen);
-        } else {
-            return $out;
-        }
-    }
-
-    /**
-     * Bit String to Integer
-     *
-     * @param string $in
-     * @return \phpseclib3\Math\BigInteger
-     */
-    protected function bits2int($in)
-    {
-        $v = new BigInteger($in, 256);
-        $vlen = strlen($in) << 3;
-        $qlen = $this->q->getLength();
-        if ($vlen > $qlen) {
-            return $v->bitwise_rightShift($vlen - $qlen);
-        }
-        return $v;
-    }
-
-    /**
-     * Bit String to Octet String
-     *
-     * @param string $in
-     * @return string
-     */
-    private function bits2octets($in)
-    {
-        $z1 = $this->bits2int($in);
-        $z2 = $z1->subtract($this->q);
-        return $z2->compare(self::$zero) < 0 ?
-            $this->int2octets($z1) :
-            $this->int2octets($z2);
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/Common/BlockCipher.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/Common/BlockCipher.php
deleted file mode 100644
index b2642be1..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/Common/BlockCipher.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-/**
- * Base Class for all block ciphers
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @author    Hans-Juergen Petrich <petrich@tronic-media.com>
- * @copyright 2007 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\Crypt\Common;
-
-/**
- * Base Class for all block cipher classes
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class BlockCipher extends SymmetricKey
-{
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/Common/Formats/Keys/JWK.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/Common/Formats/Keys/JWK.php
deleted file mode 100644
index 4c761b83..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/Common/Formats/Keys/JWK.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-
-/**
- * JSON Web Key (RFC7517) Handler
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2015 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\Crypt\Common\Formats\Keys;
-
-use phpseclib3\Common\Functions\Strings;
-
-/**
- * JSON Web Key Formatted Key Handler
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class JWK
-{
-    /**
-     * Break a public or private key down into its constituent components
-     *
-     * @param string $key
-     * @param string $password
-     * @return array
-     */
-    public static function load($key, $password = '')
-    {
-        if (!Strings::is_stringable($key)) {
-            throw new \UnexpectedValueException('Key should be a string - not a ' . gettype($key));
-        }
-
-        $key = preg_replace('#\s#', '', $key); // remove whitespace
-
-        if (PHP_VERSION_ID >= 73000) {
-            $key = json_decode($key, null, 512, JSON_THROW_ON_ERROR);
-        } else {
-            $key = json_decode($key);
-            if (!$key) {
-                throw new \RuntimeException('Unable to decode JSON');
-            }
-        }
-
-        if (isset($key->kty)) {
-            return $key;
-        }
-
-        if (count($key->keys) != 1) {
-            throw new \RuntimeException('Although the JWK key format supports multiple keys phpseclib does not');
-        }
-
-        return $key->keys[0];
-    }
-
-    /**
-     * Wrap a key appropriately
-     *
-     * @return string
-     */
-    protected static function wrapKey(array $key, array $options)
-    {
-        return json_encode(['keys' => [$key + $options]]);
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/Common/Formats/Keys/OpenSSH.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/Common/Formats/Keys/OpenSSH.php
deleted file mode 100644
index fe3d85bd..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/Common/Formats/Keys/OpenSSH.php
+++ /dev/null
@@ -1,220 +0,0 @@
-<?php
-
-/**
- * OpenSSH Key Handler
- *
- * PHP version 5
- *
- * Place in $HOME/.ssh/authorized_keys
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2015 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\Crypt\Common\Formats\Keys;
-
-use phpseclib3\Common\Functions\Strings;
-use phpseclib3\Crypt\AES;
-use phpseclib3\Crypt\Random;
-
-/**
- * OpenSSH Formatted RSA Key Handler
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class OpenSSH
-{
-    /**
-     * Default comment
-     *
-     * @var string
-     */
-    protected static $comment = 'phpseclib-generated-key';
-
-    /**
-     * Binary key flag
-     *
-     * @var bool
-     */
-    protected static $binary = false;
-
-    /**
-     * Sets the default comment
-     *
-     * @param string $comment
-     */
-    public static function setComment($comment)
-    {
-        self::$comment = str_replace(["\r", "\n"], '', $comment);
-    }
-
-    /**
-     * Break a public or private key down into its constituent components
-     *
-     * $type can be either ssh-dss or ssh-rsa
-     *
-     * @param string $key
-     * @param string $password
-     * @return array
-     */
-    public static function load($key, $password = '')
-    {
-        if (!Strings::is_stringable($key)) {
-            throw new \UnexpectedValueException('Key should be a string - not a ' . gettype($key));
-        }
-
-        // key format is described here:
-        // https://cvsweb.openbsd.org/cgi-bin/cvsweb/src/usr.bin/ssh/PROTOCOL.key?annotate=HEAD
-
-        if (strpos($key, 'BEGIN OPENSSH PRIVATE KEY') !== false) {
-            $key = preg_replace('#(?:^-.*?-[\r\n]*$)|\s#ms', '', $key);
-            $key = Strings::base64_decode($key);
-            $magic = Strings::shift($key, 15);
-            if ($magic != "openssh-key-v1\0") {
-                throw new \RuntimeException('Expected openssh-key-v1');
-            }
-            list($ciphername, $kdfname, $kdfoptions, $numKeys) = Strings::unpackSSH2('sssN', $key);
-            if ($numKeys != 1) {
-                // if we wanted to support multiple keys we could update PublicKeyLoader to preview what the # of keys
-                // would be; it'd then call Common\Keys\OpenSSH.php::load() and get the paddedKey. it'd then pass
-                // that to the appropriate key loading parser $numKey times or something
-                throw new \RuntimeException('Although the OpenSSH private key format supports multiple keys phpseclib does not');
-            }
-            switch ($ciphername) {
-                case 'none':
-                    break;
-                case 'aes256-ctr':
-                    if ($kdfname != 'bcrypt') {
-                        throw new \RuntimeException('Only the bcrypt kdf is supported (' . $kdfname . ' encountered)');
-                    }
-                    list($salt, $rounds) = Strings::unpackSSH2('sN', $kdfoptions);
-                    $crypto = new AES('ctr');
-                    //$crypto->setKeyLength(256);
-                    //$crypto->disablePadding();
-                    $crypto->setPassword($password, 'bcrypt', $salt, $rounds, 32);
-                    break;
-                default:
-                    throw new \RuntimeException('The only supported cipherse are: none, aes256-ctr (' . $ciphername . ' is being used)');
-            }
-
-            list($publicKey, $paddedKey) = Strings::unpackSSH2('ss', $key);
-            list($type) = Strings::unpackSSH2('s', $publicKey);
-            if (isset($crypto)) {
-                $paddedKey = $crypto->decrypt($paddedKey);
-            }
-            list($checkint1, $checkint2) = Strings::unpackSSH2('NN', $paddedKey);
-            // any leftover bytes in $paddedKey are for padding? but they should be sequential bytes. eg. 1, 2, 3, etc.
-            if ($checkint1 != $checkint2) {
-                throw new \RuntimeException('The two checkints do not match');
-            }
-            self::checkType($type);
-
-            return compact('type', 'publicKey', 'paddedKey');
-        }
-
-        $parts = explode(' ', $key, 3);
-
-        if (!isset($parts[1])) {
-            $key = base64_decode($parts[0]);
-            $comment = false;
-        } else {
-            $asciiType = $parts[0];
-            self::checkType($parts[0]);
-            $key = base64_decode($parts[1]);
-            $comment = isset($parts[2]) ? $parts[2] : false;
-        }
-        if ($key === false) {
-            throw new \UnexpectedValueException('Key should be a string - not a ' . gettype($key));
-        }
-
-        list($type) = Strings::unpackSSH2('s', $key);
-        self::checkType($type);
-        if (isset($asciiType) && $asciiType != $type) {
-            throw new \RuntimeException('Two different types of keys are claimed: ' . $asciiType . ' and ' . $type);
-        }
-        if (strlen($key) <= 4) {
-            throw new \UnexpectedValueException('Key appears to be malformed');
-        }
-
-        $publicKey = $key;
-
-        return compact('type', 'publicKey', 'comment');
-    }
-
-    /**
-     * Toggle between binary and printable keys
-     *
-     * Printable keys are what are generated by default. These are the ones that go in
-     * $HOME/.ssh/authorized_key.
-     *
-     * @param bool $enabled
-     */
-    public static function setBinaryOutput($enabled)
-    {
-        self::$binary = $enabled;
-    }
-
-    /**
-     * Checks to see if the type is valid
-     *
-     * @param string $candidate
-     */
-    private static function checkType($candidate)
-    {
-        if (!in_array($candidate, static::$types)) {
-            throw new \RuntimeException("The key type ($candidate) is not equal to: " . implode(',', static::$types));
-        }
-    }
-
-    /**
-     * Wrap a private key appropriately
-     *
-     * @param string $publicKey
-     * @param string $privateKey
-     * @param string $password
-     * @param array $options
-     * @return string
-     */
-    protected static function wrapPrivateKey($publicKey, $privateKey, $password, $options)
-    {
-        list(, $checkint) = unpack('N', Random::string(4));
-
-        $comment = isset($options['comment']) ? $options['comment'] : self::$comment;
-        $paddedKey = Strings::packSSH2('NN', $checkint, $checkint) .
-                     $privateKey .
-                     Strings::packSSH2('s', $comment);
-
-        $usesEncryption = !empty($password) && is_string($password);
-
-        /*
-           from http://tools.ietf.org/html/rfc4253#section-6 :
-
-           Note that the length of the concatenation of 'packet_length',
-           'padding_length', 'payload', and 'random padding' MUST be a multiple
-           of the cipher block size or 8, whichever is larger.
-         */
-        $blockSize = $usesEncryption ? 16 : 8;
-        $paddingLength = (($blockSize - 1) * strlen($paddedKey)) % $blockSize;
-        for ($i = 1; $i <= $paddingLength; $i++) {
-            $paddedKey .= chr($i);
-        }
-        if (!$usesEncryption) {
-            $key = Strings::packSSH2('sssNss', 'none', 'none', '', 1, $publicKey, $paddedKey);
-        } else {
-            $rounds = isset($options['rounds']) ? $options['rounds'] : 16;
-            $salt = Random::string(16);
-            $kdfoptions = Strings::packSSH2('sN', $salt, $rounds);
-            $crypto = new AES('ctr');
-            $crypto->setPassword($password, 'bcrypt', $salt, $rounds, 32);
-            $paddedKey = $crypto->encrypt($paddedKey);
-            $key = Strings::packSSH2('sssNss', 'aes256-ctr', 'bcrypt', $kdfoptions, 1, $publicKey, $paddedKey);
-        }
-        $key = "openssh-key-v1\0$key";
-
-        return "-----BEGIN OPENSSH PRIVATE KEY-----\n" .
-               chunk_split(Strings::base64_encode($key), 70, "\n") .
-               "-----END OPENSSH PRIVATE KEY-----\n";
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/Common/Formats/Keys/PKCS.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/Common/Formats/Keys/PKCS.php
deleted file mode 100644
index 0219400b..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/Common/Formats/Keys/PKCS.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-
-/**
- * PKCS Formatted Key Handler
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2015 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\Crypt\Common\Formats\Keys;
-
-/**
- * PKCS1 Formatted Key Handler
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class PKCS
-{
-    /**
-     * Auto-detect the format
-     */
-    const MODE_ANY = 0;
-    /**
-     * Require base64-encoded PEM's be supplied
-     */
-    const MODE_PEM = 1;
-    /**
-     * Require raw DER's be supplied
-     */
-    const MODE_DER = 2;
-    /**#@-*/
-
-    /**
-     * Is the key a base-64 encoded PEM, DER or should it be auto-detected?
-     *
-     * @var int
-     */
-    protected static $format = self::MODE_ANY;
-
-    /**
-     * Require base64-encoded PEM's be supplied
-     *
-     */
-    public static function requirePEM()
-    {
-        self::$format = self::MODE_PEM;
-    }
-
-    /**
-     * Require raw DER's be supplied
-     *
-     */
-    public static function requireDER()
-    {
-        self::$format = self::MODE_DER;
-    }
-
-    /**
-     * Accept any format and auto detect the format
-     *
-     * This is the default setting
-     *
-     */
-    public static function requireAny()
-    {
-        self::$format = self::MODE_ANY;
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/Common/Formats/Keys/PKCS1.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/Common/Formats/Keys/PKCS1.php
deleted file mode 100644
index 4c639c05..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/Common/Formats/Keys/PKCS1.php
+++ /dev/null
@@ -1,209 +0,0 @@
-<?php
-
-/**
- * PKCS1 Formatted Key Handler
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2015 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\Crypt\Common\Formats\Keys;
-
-use phpseclib3\Common\Functions\Strings;
-use phpseclib3\Crypt\AES;
-use phpseclib3\Crypt\DES;
-use phpseclib3\Crypt\Random;
-use phpseclib3\Crypt\TripleDES;
-use phpseclib3\Exception\UnsupportedAlgorithmException;
-use phpseclib3\File\ASN1;
-
-/**
- * PKCS1 Formatted Key Handler
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class PKCS1 extends PKCS
-{
-    /**
-     * Default encryption algorithm
-     *
-     * @var string
-     */
-    private static $defaultEncryptionAlgorithm = 'AES-128-CBC';
-
-    /**
-     * Sets the default encryption algorithm
-     *
-     * @param string $algo
-     */
-    public static function setEncryptionAlgorithm($algo)
-    {
-        self::$defaultEncryptionAlgorithm = $algo;
-    }
-
-    /**
-     * Returns the mode constant corresponding to the mode string
-     *
-     * @param string $mode
-     * @return int
-     * @throws \UnexpectedValueException if the block cipher mode is unsupported
-     */
-    private static function getEncryptionMode($mode)
-    {
-        switch ($mode) {
-            case 'CBC':
-            case 'ECB':
-            case 'CFB':
-            case 'OFB':
-            case 'CTR':
-                return $mode;
-        }
-        throw new \UnexpectedValueException('Unsupported block cipher mode of operation');
-    }
-
-    /**
-     * Returns a cipher object corresponding to a string
-     *
-     * @param string $algo
-     * @return string
-     * @throws \UnexpectedValueException if the encryption algorithm is unsupported
-     */
-    private static function getEncryptionObject($algo)
-    {
-        $modes = '(CBC|ECB|CFB|OFB|CTR)';
-        switch (true) {
-            case preg_match("#^AES-(128|192|256)-$modes$#", $algo, $matches):
-                $cipher = new AES(self::getEncryptionMode($matches[2]));
-                $cipher->setKeyLength($matches[1]);
-                return $cipher;
-            case preg_match("#^DES-EDE3-$modes$#", $algo, $matches):
-                return new TripleDES(self::getEncryptionMode($matches[1]));
-            case preg_match("#^DES-$modes$#", $algo, $matches):
-                return new DES(self::getEncryptionMode($matches[1]));
-            default:
-                throw new UnsupportedAlgorithmException($algo . ' is not a supported algorithm');
-        }
-    }
-
-    /**
-     * Generate a symmetric key for PKCS#1 keys
-     *
-     * @param string $password
-     * @param string $iv
-     * @param int $length
-     * @return string
-     */
-    private static function generateSymmetricKey($password, $iv, $length)
-    {
-        $symkey = '';
-        $iv = substr($iv, 0, 8);
-        while (strlen($symkey) < $length) {
-            $symkey .= md5($symkey . $password . $iv, true);
-        }
-        return substr($symkey, 0, $length);
-    }
-
-    /**
-     * Break a public or private key down into its constituent components
-     *
-     * @param string $key
-     * @param string $password optional
-     * @return array
-     */
-    protected static function load($key, $password)
-    {
-        if (!Strings::is_stringable($key)) {
-            throw new \UnexpectedValueException('Key should be a string - not a ' . gettype($key));
-        }
-
-        /* Although PKCS#1 proposes a format that public and private keys can use, encrypting them is
-           "outside the scope" of PKCS#1.  PKCS#1 then refers you to PKCS#12 and PKCS#15 if you're wanting to
-           protect private keys, however, that's not what OpenSSL* does.  OpenSSL protects private keys by adding
-           two new "fields" to the key - DEK-Info and Proc-Type.  These fields are discussed here:
-
-           http://tools.ietf.org/html/rfc1421#section-4.6.1.1
-           http://tools.ietf.org/html/rfc1421#section-4.6.1.3
-
-           DES-EDE3-CBC as an algorithm, however, is not discussed anywhere, near as I can tell.
-           DES-CBC and DES-EDE are discussed in RFC1423, however, DES-EDE3-CBC isn't, nor is its key derivation
-           function.  As is, the definitive authority on this encoding scheme isn't the IETF but rather OpenSSL's
-           own implementation.  ie. the implementation *is* the standard and any bugs that may exist in that
-           implementation are part of the standard, as well.
-
-           * OpenSSL is the de facto standard.  It's utilized by OpenSSH and other projects */
-        if (preg_match('#DEK-Info: (.+),(.+)#', $key, $matches)) {
-            $iv = Strings::hex2bin(trim($matches[2]));
-            // remove the Proc-Type / DEK-Info sections as they're no longer needed
-            $key = preg_replace('#^(?:Proc-Type|DEK-Info): .*#m', '', $key);
-            $ciphertext = ASN1::extractBER($key);
-            if ($ciphertext === false) {
-                $ciphertext = $key;
-            }
-            $crypto = self::getEncryptionObject($matches[1]);
-            $crypto->setKey(self::generateSymmetricKey($password, $iv, $crypto->getKeyLength() >> 3));
-            $crypto->setIV($iv);
-            $key = $crypto->decrypt($ciphertext);
-        } else {
-            if (self::$format != self::MODE_DER) {
-                $decoded = ASN1::extractBER($key);
-                if ($decoded !== false) {
-                    $key = $decoded;
-                } elseif (self::$format == self::MODE_PEM) {
-                    throw new \UnexpectedValueException('Expected base64-encoded PEM format but was unable to decode base64 text');
-                }
-            }
-        }
-
-        return $key;
-    }
-
-    /**
-     * Wrap a private key appropriately
-     *
-     * @param string $key
-     * @param string $type
-     * @param string $password
-     * @param array $options optional
-     * @return string
-     */
-    protected static function wrapPrivateKey($key, $type, $password, array $options = [])
-    {
-        if (empty($password) || !is_string($password)) {
-            return "-----BEGIN $type PRIVATE KEY-----\r\n" .
-                   chunk_split(Strings::base64_encode($key), 64) .
-                   "-----END $type PRIVATE KEY-----";
-        }
-
-        $encryptionAlgorithm = isset($options['encryptionAlgorithm']) ? $options['encryptionAlgorithm'] : self::$defaultEncryptionAlgorithm;
-
-        $cipher = self::getEncryptionObject($encryptionAlgorithm);
-        $iv = Random::string($cipher->getBlockLength() >> 3);
-        $cipher->setKey(self::generateSymmetricKey($password, $iv, $cipher->getKeyLength() >> 3));
-        $cipher->setIV($iv);
-        $iv = strtoupper(Strings::bin2hex($iv));
-        return "-----BEGIN $type PRIVATE KEY-----\r\n" .
-               "Proc-Type: 4,ENCRYPTED\r\n" .
-               "DEK-Info: " . $encryptionAlgorithm . ",$iv\r\n" .
-               "\r\n" .
-               chunk_split(Strings::base64_encode($cipher->encrypt($key)), 64) .
-               "-----END $type PRIVATE KEY-----";
-    }
-
-    /**
-     * Wrap a public key appropriately
-     *
-     * @param string $key
-     * @param string $type
-     * @return string
-     */
-    protected static function wrapPublicKey($key, $type)
-    {
-        return "-----BEGIN $type PUBLIC KEY-----\r\n" .
-               chunk_split(Strings::base64_encode($key), 64) .
-               "-----END $type PUBLIC KEY-----";
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/Common/Formats/Keys/PKCS8.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/Common/Formats/Keys/PKCS8.php
deleted file mode 100644
index 7aa55480..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/Common/Formats/Keys/PKCS8.php
+++ /dev/null
@@ -1,725 +0,0 @@
-<?php
-
-/**
- * PKCS#8 Formatted Key Handler
- *
- * PHP version 5
- *
- * Used by PHP's openssl_public_encrypt() and openssl's rsautl (when -pubin is set)
- *
- * Processes keys with the following headers:
- *
- * -----BEGIN ENCRYPTED PRIVATE KEY-----
- * -----BEGIN PRIVATE KEY-----
- * -----BEGIN PUBLIC KEY-----
- *
- * Analogous to ssh-keygen's pkcs8 format (as specified by -m). Although PKCS8
- * is specific to private keys it's basically creating a DER-encoded wrapper
- * for keys. This just extends that same concept to public keys (much like ssh-keygen)
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2015 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\Crypt\Common\Formats\Keys;
-
-use phpseclib3\Common\Functions\Strings;
-use phpseclib3\Crypt\AES;
-use phpseclib3\Crypt\DES;
-use phpseclib3\Crypt\Random;
-use phpseclib3\Crypt\RC2;
-use phpseclib3\Crypt\RC4;
-use phpseclib3\Crypt\TripleDES;
-use phpseclib3\Exception\InsufficientSetupException;
-use phpseclib3\Exception\UnsupportedAlgorithmException;
-use phpseclib3\File\ASN1;
-use phpseclib3\File\ASN1\Maps;
-
-/**
- * PKCS#8 Formatted Key Handler
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class PKCS8 extends PKCS
-{
-    /**
-     * Default encryption algorithm
-     *
-     * @var string
-     */
-    private static $defaultEncryptionAlgorithm = 'id-PBES2';
-
-    /**
-     * Default encryption scheme
-     *
-     * Only used when defaultEncryptionAlgorithm is id-PBES2
-     *
-     * @var string
-     */
-    private static $defaultEncryptionScheme = 'aes128-CBC-PAD';
-
-    /**
-     * Default PRF
-     *
-     * Only used when defaultEncryptionAlgorithm is id-PBES2
-     *
-     * @var string
-     */
-    private static $defaultPRF = 'id-hmacWithSHA256';
-
-    /**
-     * Default Iteration Count
-     *
-     * @var int
-     */
-    private static $defaultIterationCount = 2048;
-
-    /**
-     * OIDs loaded
-     *
-     * @var bool
-     */
-    private static $oidsLoaded = false;
-
-    /**
-     * Sets the default encryption algorithm
-     *
-     * @param string $algo
-     */
-    public static function setEncryptionAlgorithm($algo)
-    {
-        self::$defaultEncryptionAlgorithm = $algo;
-    }
-
-    /**
-     * Sets the default encryption algorithm for PBES2
-     *
-     * @param string $algo
-     */
-    public static function setEncryptionScheme($algo)
-    {
-        self::$defaultEncryptionScheme = $algo;
-    }
-
-    /**
-     * Sets the iteration count
-     *
-     * @param int $count
-     */
-    public static function setIterationCount($count)
-    {
-        self::$defaultIterationCount = $count;
-    }
-
-    /**
-     * Sets the PRF for PBES2
-     *
-     * @param string $algo
-     */
-    public static function setPRF($algo)
-    {
-        self::$defaultPRF = $algo;
-    }
-
-    /**
-     * Returns a SymmetricKey object based on a PBES1 $algo
-     *
-     * @return \phpseclib3\Crypt\Common\SymmetricKey
-     * @param string $algo
-     */
-    private static function getPBES1EncryptionObject($algo)
-    {
-        $algo = preg_match('#^pbeWith(?:MD2|MD5|SHA1|SHA)And(.*?)-CBC$#', $algo, $matches) ?
-            $matches[1] :
-            substr($algo, 13); // strlen('pbeWithSHAAnd') == 13
-
-        switch ($algo) {
-            case 'DES':
-                $cipher = new DES('cbc');
-                break;
-            case 'RC2':
-                $cipher = new RC2('cbc');
-                $cipher->setKeyLength(64);
-                break;
-            case '3-KeyTripleDES':
-                $cipher = new TripleDES('cbc');
-                break;
-            case '2-KeyTripleDES':
-                $cipher = new TripleDES('cbc');
-                $cipher->setKeyLength(128);
-                break;
-            case '128BitRC2':
-                $cipher = new RC2('cbc');
-                $cipher->setKeyLength(128);
-                break;
-            case '40BitRC2':
-                $cipher = new RC2('cbc');
-                $cipher->setKeyLength(40);
-                break;
-            case '128BitRC4':
-                $cipher = new RC4();
-                $cipher->setKeyLength(128);
-                break;
-            case '40BitRC4':
-                $cipher = new RC4();
-                $cipher->setKeyLength(40);
-                break;
-            default:
-                throw new UnsupportedAlgorithmException("$algo is not a supported algorithm");
-        }
-
-        return $cipher;
-    }
-
-    /**
-     * Returns a hash based on a PBES1 $algo
-     *
-     * @return string
-     * @param string $algo
-     */
-    private static function getPBES1Hash($algo)
-    {
-        if (preg_match('#^pbeWith(MD2|MD5|SHA1|SHA)And.*?-CBC$#', $algo, $matches)) {
-            return $matches[1] == 'SHA' ? 'sha1' : $matches[1];
-        }
-
-        return 'sha1';
-    }
-
-    /**
-     * Returns a KDF baesd on a PBES1 $algo
-     *
-     * @return string
-     * @param string $algo
-     */
-    private static function getPBES1KDF($algo)
-    {
-        switch ($algo) {
-            case 'pbeWithMD2AndDES-CBC':
-            case 'pbeWithMD2AndRC2-CBC':
-            case 'pbeWithMD5AndDES-CBC':
-            case 'pbeWithMD5AndRC2-CBC':
-            case 'pbeWithSHA1AndDES-CBC':
-            case 'pbeWithSHA1AndRC2-CBC':
-                return 'pbkdf1';
-        }
-
-        return 'pkcs12';
-    }
-
-    /**
-     * Returns a SymmetricKey object baesd on a PBES2 $algo
-     *
-     * @return SymmetricKey
-     * @param string $algo
-     */
-    private static function getPBES2EncryptionObject($algo)
-    {
-        switch ($algo) {
-            case 'desCBC':
-                $cipher = new DES('cbc');
-                break;
-            case 'des-EDE3-CBC':
-                $cipher = new TripleDES('cbc');
-                break;
-            case 'rc2CBC':
-                $cipher = new RC2('cbc');
-                // in theory this can be changed
-                $cipher->setKeyLength(128);
-                break;
-            case 'rc5-CBC-PAD':
-                throw new UnsupportedAlgorithmException('rc5-CBC-PAD is not supported for PBES2 PKCS#8 keys');
-            case 'aes128-CBC-PAD':
-            case 'aes192-CBC-PAD':
-            case 'aes256-CBC-PAD':
-                $cipher = new AES('cbc');
-                $cipher->setKeyLength(substr($algo, 3, 3));
-                break;
-            default:
-                throw new UnsupportedAlgorithmException("$algo is not supported");
-        }
-
-        return $cipher;
-    }
-
-    /**
-     * Initialize static variables
-     *
-     */
-    private static function initialize_static_variables()
-    {
-        if (!isset(static::$childOIDsLoaded)) {
-            throw new InsufficientSetupException('This class should not be called directly');
-        }
-
-        if (!static::$childOIDsLoaded) {
-            ASN1::loadOIDs(is_array(static::OID_NAME) ?
-                array_combine(static::OID_NAME, static::OID_VALUE) :
-                [static::OID_NAME => static::OID_VALUE]);
-            static::$childOIDsLoaded = true;
-        }
-        if (!self::$oidsLoaded) {
-            // from https://tools.ietf.org/html/rfc2898
-            ASN1::loadOIDs([
-               // PBES1 encryption schemes
-               'pbeWithMD2AndDES-CBC' => '1.2.840.113549.1.5.1',
-               'pbeWithMD2AndRC2-CBC' => '1.2.840.113549.1.5.4',
-               'pbeWithMD5AndDES-CBC' => '1.2.840.113549.1.5.3',
-               'pbeWithMD5AndRC2-CBC' => '1.2.840.113549.1.5.6',
-               'pbeWithSHA1AndDES-CBC' => '1.2.840.113549.1.5.10',
-               'pbeWithSHA1AndRC2-CBC' => '1.2.840.113549.1.5.11',
-
-               // from PKCS#12:
-               // https://tools.ietf.org/html/rfc7292
-               'pbeWithSHAAnd128BitRC4' => '1.2.840.113549.1.12.1.1',
-               'pbeWithSHAAnd40BitRC4' => '1.2.840.113549.1.12.1.2',
-               'pbeWithSHAAnd3-KeyTripleDES-CBC' => '1.2.840.113549.1.12.1.3',
-               'pbeWithSHAAnd2-KeyTripleDES-CBC' => '1.2.840.113549.1.12.1.4',
-               'pbeWithSHAAnd128BitRC2-CBC' => '1.2.840.113549.1.12.1.5',
-               'pbeWithSHAAnd40BitRC2-CBC' => '1.2.840.113549.1.12.1.6',
-
-               'id-PBKDF2' => '1.2.840.113549.1.5.12',
-               'id-PBES2' => '1.2.840.113549.1.5.13',
-               'id-PBMAC1' => '1.2.840.113549.1.5.14',
-
-               // from PKCS#5 v2.1:
-               // http://www.rsa.com/rsalabs/pkcs/files/h11302-wp-pkcs5v2-1-password-based-cryptography-standard.pdf
-               'id-hmacWithSHA1' => '1.2.840.113549.2.7',
-               'id-hmacWithSHA224' => '1.2.840.113549.2.8',
-               'id-hmacWithSHA256' => '1.2.840.113549.2.9',
-               'id-hmacWithSHA384' => '1.2.840.113549.2.10',
-               'id-hmacWithSHA512' => '1.2.840.113549.2.11',
-               'id-hmacWithSHA512-224' => '1.2.840.113549.2.12',
-               'id-hmacWithSHA512-256' => '1.2.840.113549.2.13',
-
-               'desCBC'       => '1.3.14.3.2.7',
-               'des-EDE3-CBC' => '1.2.840.113549.3.7',
-               'rc2CBC' => '1.2.840.113549.3.2',
-               'rc5-CBC-PAD' => '1.2.840.113549.3.9',
-
-               'aes128-CBC-PAD' => '2.16.840.1.101.3.4.1.2',
-               'aes192-CBC-PAD' => '2.16.840.1.101.3.4.1.22',
-               'aes256-CBC-PAD' => '2.16.840.1.101.3.4.1.42'
-            ]);
-            self::$oidsLoaded = true;
-        }
-    }
-
-    /**
-     * Break a public or private key down into its constituent components
-     *
-     * @param string $key
-     * @param string $password optional
-     * @return array
-     */
-    protected static function load($key, $password = '')
-    {
-        if (!Strings::is_stringable($key)) {
-            throw new \UnexpectedValueException('Key should be a string - not a ' . gettype($key));
-        }
-
-        $isPublic = strpos($key, 'PUBLIC') !== false;
-        $isPrivate = strpos($key, 'PRIVATE') !== false;
-
-        $decoded = self::preParse($key);
-
-        $meta = [];
-
-        $decrypted = ASN1::asn1map($decoded[0], Maps\EncryptedPrivateKeyInfo::MAP);
-        if (strlen($password) && is_array($decrypted)) {
-            $algorithm = $decrypted['encryptionAlgorithm']['algorithm'];
-            switch ($algorithm) {
-                // PBES1
-                case 'pbeWithMD2AndDES-CBC':
-                case 'pbeWithMD2AndRC2-CBC':
-                case 'pbeWithMD5AndDES-CBC':
-                case 'pbeWithMD5AndRC2-CBC':
-                case 'pbeWithSHA1AndDES-CBC':
-                case 'pbeWithSHA1AndRC2-CBC':
-                case 'pbeWithSHAAnd3-KeyTripleDES-CBC':
-                case 'pbeWithSHAAnd2-KeyTripleDES-CBC':
-                case 'pbeWithSHAAnd128BitRC2-CBC':
-                case 'pbeWithSHAAnd40BitRC2-CBC':
-                case 'pbeWithSHAAnd128BitRC4':
-                case 'pbeWithSHAAnd40BitRC4':
-                    $cipher = self::getPBES1EncryptionObject($algorithm);
-                    $hash = self::getPBES1Hash($algorithm);
-                    $kdf = self::getPBES1KDF($algorithm);
-
-                    $meta['meta']['algorithm'] = $algorithm;
-
-                    $temp = ASN1::decodeBER($decrypted['encryptionAlgorithm']['parameters']);
-                    if (!$temp) {
-                        throw new \RuntimeException('Unable to decode BER');
-                    }
-                    extract(ASN1::asn1map($temp[0], Maps\PBEParameter::MAP));
-                    $iterationCount = (int) $iterationCount->toString();
-                    $cipher->setPassword($password, $kdf, $hash, $salt, $iterationCount);
-                    $key = $cipher->decrypt($decrypted['encryptedData']);
-                    $decoded = ASN1::decodeBER($key);
-                    if (!$decoded) {
-                        throw new \RuntimeException('Unable to decode BER 2');
-                    }
-
-                    break;
-                case 'id-PBES2':
-                    $meta['meta']['algorithm'] = $algorithm;
-
-                    $temp = ASN1::decodeBER($decrypted['encryptionAlgorithm']['parameters']);
-                    if (!$temp) {
-                        throw new \RuntimeException('Unable to decode BER');
-                    }
-                    $temp = ASN1::asn1map($temp[0], Maps\PBES2params::MAP);
-                    extract($temp);
-
-                    $cipher = self::getPBES2EncryptionObject($encryptionScheme['algorithm']);
-                    $meta['meta']['cipher'] = $encryptionScheme['algorithm'];
-
-                    $temp = ASN1::decodeBER($decrypted['encryptionAlgorithm']['parameters']);
-                    if (!$temp) {
-                        throw new \RuntimeException('Unable to decode BER');
-                    }
-                    $temp = ASN1::asn1map($temp[0], Maps\PBES2params::MAP);
-                    extract($temp);
-
-                    if (!$cipher instanceof RC2) {
-                        $cipher->setIV($encryptionScheme['parameters']['octetString']);
-                    } else {
-                        $temp = ASN1::decodeBER($encryptionScheme['parameters']);
-                        if (!$temp) {
-                            throw new \RuntimeException('Unable to decode BER');
-                        }
-                        extract(ASN1::asn1map($temp[0], Maps\RC2CBCParameter::MAP));
-                        $effectiveKeyLength = (int) $rc2ParametersVersion->toString();
-                        switch ($effectiveKeyLength) {
-                            case 160:
-                                $effectiveKeyLength = 40;
-                                break;
-                            case 120:
-                                $effectiveKeyLength = 64;
-                                break;
-                            case 58:
-                                $effectiveKeyLength = 128;
-                                break;
-                            //default: // should be >= 256
-                        }
-                        $cipher->setIV($iv);
-                        $cipher->setKeyLength($effectiveKeyLength);
-                    }
-
-                    $meta['meta']['keyDerivationFunc'] = $keyDerivationFunc['algorithm'];
-                    switch ($keyDerivationFunc['algorithm']) {
-                        case 'id-PBKDF2':
-                            $temp = ASN1::decodeBER($keyDerivationFunc['parameters']);
-                            if (!$temp) {
-                                throw new \RuntimeException('Unable to decode BER');
-                            }
-                            $prf = ['algorithm' => 'id-hmacWithSHA1'];
-                            $params = ASN1::asn1map($temp[0], Maps\PBKDF2params::MAP);
-                            extract($params);
-                            $meta['meta']['prf'] = $prf['algorithm'];
-                            $hash = str_replace('-', '/', substr($prf['algorithm'], 11));
-                            $params = [
-                                $password,
-                                'pbkdf2',
-                                $hash,
-                                $salt,
-                                (int) $iterationCount->toString()
-                            ];
-                            if (isset($keyLength)) {
-                                $params[] = (int) $keyLength->toString();
-                            }
-                            $cipher->setPassword(...$params);
-                            $key = $cipher->decrypt($decrypted['encryptedData']);
-                            $decoded = ASN1::decodeBER($key);
-                            if (!$decoded) {
-                                throw new \RuntimeException('Unable to decode BER 3');
-                            }
-                            break;
-                        default:
-                            throw new UnsupportedAlgorithmException('Only PBKDF2 is supported for PBES2 PKCS#8 keys');
-                    }
-                    break;
-                case 'id-PBMAC1':
-                    //$temp = ASN1::decodeBER($decrypted['encryptionAlgorithm']['parameters']);
-                    //$value = ASN1::asn1map($temp[0], Maps\PBMAC1params::MAP);
-                    // since i can't find any implementation that does PBMAC1 it is unsupported
-                    throw new UnsupportedAlgorithmException('Only PBES1 and PBES2 PKCS#8 keys are supported.');
-                // at this point we'll assume that the key conforms to PublicKeyInfo
-            }
-        }
-
-        $private = ASN1::asn1map($decoded[0], Maps\OneAsymmetricKey::MAP);
-        if (is_array($private)) {
-            if ($isPublic) {
-                throw new \UnexpectedValueException('Human readable string claims public key but DER encoded string claims private key');
-            }
-
-            if (isset($private['privateKeyAlgorithm']['parameters']) && !$private['privateKeyAlgorithm']['parameters'] instanceof ASN1\Element && isset($decoded[0]['content'][1]['content'][1])) {
-                $temp = $decoded[0]['content'][1]['content'][1];
-                $private['privateKeyAlgorithm']['parameters'] = new ASN1\Element(substr($key, $temp['start'], $temp['length']));
-            }
-            if (is_array(static::OID_NAME)) {
-                if (!in_array($private['privateKeyAlgorithm']['algorithm'], static::OID_NAME)) {
-                    throw new UnsupportedAlgorithmException($private['privateKeyAlgorithm']['algorithm'] . ' is not a supported key type');
-                }
-            } else {
-                if ($private['privateKeyAlgorithm']['algorithm'] != static::OID_NAME) {
-                    throw new UnsupportedAlgorithmException('Only ' . static::OID_NAME . ' keys are supported; this is a ' . $private['privateKeyAlgorithm']['algorithm'] . ' key');
-                }
-            }
-            if (isset($private['publicKey'])) {
-                if ($private['publicKey'][0] != "\0") {
-                    throw new \UnexpectedValueException('The first byte of the public key should be null - not ' . bin2hex($private['publicKey'][0]));
-                }
-                $private['publicKey'] = substr($private['publicKey'], 1);
-            }
-            return $private + $meta;
-        }
-
-        // EncryptedPrivateKeyInfo and PublicKeyInfo have largely identical "signatures". the only difference
-        // is that the former has an octet string and the later has a bit string. the first byte of a bit
-        // string represents the number of bits in the last byte that are to be ignored but, currently,
-        // bit strings wanting a non-zero amount of bits trimmed are not supported
-        $public = ASN1::asn1map($decoded[0], Maps\PublicKeyInfo::MAP);
-
-        if (is_array($public)) {
-            if ($isPrivate) {
-                throw new \UnexpectedValueException('Human readable string claims private key but DER encoded string claims public key');
-            }
-
-            if ($public['publicKey'][0] != "\0") {
-                throw new \UnexpectedValueException('The first byte of the public key should be null - not ' . bin2hex($public['publicKey'][0]));
-            }
-            if (is_array(static::OID_NAME)) {
-                if (!in_array($public['publicKeyAlgorithm']['algorithm'], static::OID_NAME)) {
-                    throw new UnsupportedAlgorithmException($public['publicKeyAlgorithm']['algorithm'] . ' is not a supported key type');
-                }
-            } else {
-                if ($public['publicKeyAlgorithm']['algorithm'] != static::OID_NAME) {
-                    throw new UnsupportedAlgorithmException('Only ' . static::OID_NAME . ' keys are supported; this is a ' . $public['publicKeyAlgorithm']['algorithm'] . ' key');
-                }
-            }
-            if (isset($public['publicKeyAlgorithm']['parameters']) && !$public['publicKeyAlgorithm']['parameters'] instanceof ASN1\Element && isset($decoded[0]['content'][0]['content'][1])) {
-                $temp = $decoded[0]['content'][0]['content'][1];
-                $public['publicKeyAlgorithm']['parameters'] = new ASN1\Element(substr($key, $temp['start'], $temp['length']));
-            }
-            $public['publicKey'] = substr($public['publicKey'], 1);
-            return $public;
-        }
-
-        throw new \RuntimeException('Unable to parse using either OneAsymmetricKey or PublicKeyInfo ASN1 maps');
-    }
-
-    /**
-     * Wrap a private key appropriately
-     *
-     * @param string $key
-     * @param string $attr
-     * @param mixed $params
-     * @param string $password
-     * @param string $oid optional
-     * @param string $publicKey optional
-     * @param array $options optional
-     * @return string
-     */
-    protected static function wrapPrivateKey($key, $attr, $params, $password, $oid = null, $publicKey = '', array $options = [])
-    {
-        self::initialize_static_variables();
-
-        $key = [
-            'version' => 'v1',
-            'privateKeyAlgorithm' => [
-                'algorithm' => is_string(static::OID_NAME) ? static::OID_NAME : $oid
-             ],
-            'privateKey' => $key
-        ];
-        if ($oid != 'id-Ed25519' && $oid != 'id-Ed448') {
-            $key['privateKeyAlgorithm']['parameters'] = $params;
-        }
-        if (!empty($attr)) {
-            $key['attributes'] = $attr;
-        }
-        if (!empty($publicKey)) {
-            $key['version'] = 'v2';
-            $key['publicKey'] = $publicKey;
-        }
-        $key = ASN1::encodeDER($key, Maps\OneAsymmetricKey::MAP);
-        if (!empty($password) && is_string($password)) {
-            $salt = Random::string(8);
-
-            $iterationCount = isset($options['iterationCount']) ? $options['iterationCount'] : self::$defaultIterationCount;
-            $encryptionAlgorithm = isset($options['encryptionAlgorithm']) ? $options['encryptionAlgorithm'] : self::$defaultEncryptionAlgorithm;
-            $encryptionScheme = isset($options['encryptionScheme']) ? $options['encryptionScheme'] : self::$defaultEncryptionScheme;
-            $prf = isset($options['PRF']) ? $options['PRF'] : self::$defaultPRF;
-
-            if ($encryptionAlgorithm == 'id-PBES2') {
-                $crypto = self::getPBES2EncryptionObject($encryptionScheme);
-                $hash = str_replace('-', '/', substr($prf, 11));
-                $kdf = 'pbkdf2';
-                $iv = Random::string($crypto->getBlockLength() >> 3);
-
-                $PBKDF2params = [
-                    'salt' => $salt,
-                    'iterationCount' => $iterationCount,
-                    'prf' => ['algorithm' => $prf, 'parameters' => null]
-                ];
-                $PBKDF2params = ASN1::encodeDER($PBKDF2params, Maps\PBKDF2params::MAP);
-
-                if (!$crypto instanceof RC2) {
-                    $params = ['octetString' => $iv];
-                } else {
-                    $params = [
-                        'rc2ParametersVersion' => 58,
-                        'iv' => $iv
-                    ];
-                    $params = ASN1::encodeDER($params, Maps\RC2CBCParameter::MAP);
-                    $params = new ASN1\Element($params);
-                }
-
-                $params = [
-                    'keyDerivationFunc' => [
-                        'algorithm' => 'id-PBKDF2',
-                        'parameters' => new ASN1\Element($PBKDF2params)
-                    ],
-                    'encryptionScheme' => [
-                        'algorithm' => $encryptionScheme,
-                        'parameters' => $params
-                    ]
-                ];
-                $params = ASN1::encodeDER($params, Maps\PBES2params::MAP);
-
-                $crypto->setIV($iv);
-            } else {
-                $crypto = self::getPBES1EncryptionObject($encryptionAlgorithm);
-                $hash = self::getPBES1Hash($encryptionAlgorithm);
-                $kdf = self::getPBES1KDF($encryptionAlgorithm);
-
-                $params = [
-                    'salt' => $salt,
-                    'iterationCount' => $iterationCount
-                ];
-                $params = ASN1::encodeDER($params, Maps\PBEParameter::MAP);
-            }
-            $crypto->setPassword($password, $kdf, $hash, $salt, $iterationCount);
-            $key = $crypto->encrypt($key);
-
-            $key = [
-                'encryptionAlgorithm' => [
-                    'algorithm' => $encryptionAlgorithm,
-                    'parameters' => new ASN1\Element($params)
-                ],
-                'encryptedData' => $key
-            ];
-
-            $key = ASN1::encodeDER($key, Maps\EncryptedPrivateKeyInfo::MAP);
-
-            return "-----BEGIN ENCRYPTED PRIVATE KEY-----\r\n" .
-                   chunk_split(Strings::base64_encode($key), 64) .
-                   "-----END ENCRYPTED PRIVATE KEY-----";
-        }
-
-        return "-----BEGIN PRIVATE KEY-----\r\n" .
-               chunk_split(Strings::base64_encode($key), 64) .
-               "-----END PRIVATE KEY-----";
-    }
-
-    /**
-     * Wrap a public key appropriately
-     *
-     * @param string $key
-     * @param mixed $params
-     * @param string $oid
-     * @return string
-     */
-    protected static function wrapPublicKey($key, $params, $oid = null)
-    {
-        self::initialize_static_variables();
-
-        $key = [
-            'publicKeyAlgorithm' => [
-                'algorithm' => is_string(static::OID_NAME) ? static::OID_NAME : $oid
-            ],
-            'publicKey' => "\0" . $key
-        ];
-
-        if ($oid != 'id-Ed25519' && $oid != 'id-Ed448') {
-            $key['publicKeyAlgorithm']['parameters'] = $params;
-        }
-
-        $key = ASN1::encodeDER($key, Maps\PublicKeyInfo::MAP);
-
-        return "-----BEGIN PUBLIC KEY-----\r\n" .
-               chunk_split(Strings::base64_encode($key), 64) .
-               "-----END PUBLIC KEY-----";
-    }
-
-    /**
-     * Perform some preliminary parsing of the key
-     *
-     * @param string $key
-     * @return array
-     */
-    private static function preParse(&$key)
-    {
-        self::initialize_static_variables();
-
-        if (self::$format != self::MODE_DER) {
-            $decoded = ASN1::extractBER($key);
-            if ($decoded !== false) {
-                $key = $decoded;
-            } elseif (self::$format == self::MODE_PEM) {
-                throw new \UnexpectedValueException('Expected base64-encoded PEM format but was unable to decode base64 text');
-            }
-        }
-
-        $decoded = ASN1::decodeBER($key);
-        if (!$decoded) {
-            throw new \RuntimeException('Unable to decode BER');
-        }
-
-        return $decoded;
-    }
-
-    /**
-     * Returns the encryption parameters used by the key
-     *
-     * @param string $key
-     * @return array
-     */
-    public static function extractEncryptionAlgorithm($key)
-    {
-        if (!Strings::is_stringable($key)) {
-            throw new \UnexpectedValueException('Key should be a string - not a ' . gettype($key));
-        }
-
-        $decoded = self::preParse($key);
-
-        $r = ASN1::asn1map($decoded[0], ASN1\Maps\EncryptedPrivateKeyInfo::MAP);
-        if (!is_array($r)) {
-            throw new \RuntimeException('Unable to parse using EncryptedPrivateKeyInfo map');
-        }
-
-        if ($r['encryptionAlgorithm']['algorithm'] == 'id-PBES2') {
-            $decoded = ASN1::decodeBER($r['encryptionAlgorithm']['parameters']->element);
-            if (!$decoded) {
-                throw new \RuntimeException('Unable to decode BER');
-            }
-            $r['encryptionAlgorithm']['parameters'] = ASN1::asn1map($decoded[0], ASN1\Maps\PBES2params::MAP);
-
-            $kdf = &$r['encryptionAlgorithm']['parameters']['keyDerivationFunc'];
-            switch ($kdf['algorithm']) {
-                case 'id-PBKDF2':
-                    $decoded = ASN1::decodeBER($kdf['parameters']->element);
-                    if (!$decoded) {
-                        throw new \RuntimeException('Unable to decode BER');
-                    }
-                    $kdf['parameters'] = ASN1::asn1map($decoded[0], Maps\PBKDF2params::MAP);
-            }
-        }
-
-        return $r['encryptionAlgorithm'];
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/Common/Formats/Keys/PuTTY.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/Common/Formats/Keys/PuTTY.php
deleted file mode 100644
index 85da83a7..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/Common/Formats/Keys/PuTTY.php
+++ /dev/null
@@ -1,374 +0,0 @@
-<?php
-
-/**
- * PuTTY Formatted Key Handler
- *
- * See PuTTY's SSHPUBK.C and https://tartarus.org/~simon/putty-snapshots/htmldoc/AppendixC.html
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\Crypt\Common\Formats\Keys;
-
-use phpseclib3\Common\Functions\Strings;
-use phpseclib3\Crypt\AES;
-use phpseclib3\Crypt\Hash;
-use phpseclib3\Crypt\Random;
-use phpseclib3\Exception\UnsupportedAlgorithmException;
-
-/**
- * PuTTY Formatted Key Handler
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class PuTTY
-{
-    /**
-     * Default comment
-     *
-     * @var string
-     */
-    private static $comment = 'phpseclib-generated-key';
-
-    /**
-     * Default version
-     *
-     * @var int
-     */
-    private static $version = 2;
-
-    /**
-     * Sets the default comment
-     *
-     * @param string $comment
-     */
-    public static function setComment($comment)
-    {
-        self::$comment = str_replace(["\r", "\n"], '', $comment);
-    }
-
-    /**
-     * Sets the default version
-     *
-     * @param int $version
-     */
-    public static function setVersion($version)
-    {
-        if ($version != 2 && $version != 3) {
-            throw new \RuntimeException('Only supported versions are 2 and 3');
-        }
-        self::$version = $version;
-    }
-
-    /**
-     * Generate a symmetric key for PuTTY v2 keys
-     *
-     * @param string $password
-     * @param int $length
-     * @return string
-     */
-    private static function generateV2Key($password, $length)
-    {
-        $symkey = '';
-        $sequence = 0;
-        while (strlen($symkey) < $length) {
-            $temp = pack('Na*', $sequence++, $password);
-            $symkey .= Strings::hex2bin(sha1($temp));
-        }
-        return substr($symkey, 0, $length);
-    }
-
-    /**
-     * Generate a symmetric key for PuTTY v3 keys
-     *
-     * @param string $password
-     * @param string $flavour
-     * @param int $memory
-     * @param int $passes
-     * @param string $salt
-     * @return array
-     */
-    private static function generateV3Key($password, $flavour, $memory, $passes, $salt)
-    {
-        if (!function_exists('sodium_crypto_pwhash')) {
-            throw new \RuntimeException('sodium_crypto_pwhash needs to exist for Argon2 password hasing');
-        }
-
-        switch ($flavour) {
-            case 'Argon2i':
-                $flavour = SODIUM_CRYPTO_PWHASH_ALG_ARGON2I13;
-                break;
-            case 'Argon2id':
-                $flavour = SODIUM_CRYPTO_PWHASH_ALG_ARGON2ID13;
-                break;
-            default:
-                throw new UnsupportedAlgorithmException('Only Argon2i and Argon2id are supported');
-        }
-
-        $length = 80; // keylen + ivlen + mac_keylen
-        $temp = sodium_crypto_pwhash($length, $password, $salt, $passes, $memory << 10, $flavour);
-
-        $symkey = substr($temp, 0, 32);
-        $symiv = substr($temp, 32, 16);
-        $hashkey = substr($temp, -32);
-
-        return compact('symkey', 'symiv', 'hashkey');
-    }
-
-    /**
-     * Break a public or private key down into its constituent components
-     *
-     * @param string $key
-     * @param string $password
-     * @return array
-     */
-    public static function load($key, $password)
-    {
-        if (!Strings::is_stringable($key)) {
-            throw new \UnexpectedValueException('Key should be a string - not a ' . gettype($key));
-        }
-
-        if (strpos($key, 'BEGIN SSH2 PUBLIC KEY') !== false) {
-            $lines = preg_split('#[\r\n]+#', $key);
-            switch (true) {
-                case $lines[0] != '---- BEGIN SSH2 PUBLIC KEY ----':
-                    throw new \UnexpectedValueException('Key doesn\'t start with ---- BEGIN SSH2 PUBLIC KEY ----');
-                case $lines[count($lines) - 1] != '---- END SSH2 PUBLIC KEY ----':
-                    throw new \UnexpectedValueException('Key doesn\'t end with ---- END SSH2 PUBLIC KEY ----');
-            }
-            $lines = array_splice($lines, 1, -1);
-            $lines = array_map(function ($line) {
-                return rtrim($line, "\r\n");
-            }, $lines);
-            $data = $current = '';
-            $values = [];
-            $in_value = false;
-            foreach ($lines as $line) {
-                switch (true) {
-                    case preg_match('#^(.*?): (.*)#', $line, $match):
-                        $in_value = $line[strlen($line) - 1] == '\\';
-                        $current = strtolower($match[1]);
-                        $values[$current] = $in_value ? substr($match[2], 0, -1) : $match[2];
-                        break;
-                    case $in_value:
-                        $in_value = $line[strlen($line) - 1] == '\\';
-                        $values[$current] .= $in_value ? substr($line, 0, -1) : $line;
-                        break;
-                    default:
-                        $data .= $line;
-                }
-            }
-
-            $components = call_user_func([static::PUBLIC_HANDLER, 'load'], $data);
-            if ($components === false) {
-                throw new \UnexpectedValueException('Unable to decode public key');
-            }
-            $components += $values;
-            $components['comment'] = str_replace(['\\\\', '\"'], ['\\', '"'], $values['comment']);
-
-            return $components;
-        }
-
-        $components = [];
-
-        $key = preg_split('#\r\n|\r|\n#', trim($key));
-        if (Strings::shift($key[0], strlen('PuTTY-User-Key-File-')) != 'PuTTY-User-Key-File-') {
-            return false;
-        }
-        $version = (int) Strings::shift($key[0], 3); // should be either "2: " or "3: 0" prior to int casting
-        if ($version != 2 && $version != 3) {
-            throw new \RuntimeException('Only v2 and v3 PuTTY private keys are supported');
-        }
-        $components['type'] = $type = rtrim($key[0]);
-        if (!in_array($type, static::$types)) {
-            $error = count(static::$types) == 1 ?
-                'Only ' . static::$types[0] . ' keys are supported. ' :
-                '';
-            throw new UnsupportedAlgorithmException($error . 'This is an unsupported ' . $type . ' key');
-        }
-        $encryption = trim(preg_replace('#Encryption: (.+)#', '$1', $key[1]));
-        $components['comment'] = trim(preg_replace('#Comment: (.+)#', '$1', $key[2]));
-
-        $publicLength = trim(preg_replace('#Public-Lines: (\d+)#', '$1', $key[3]));
-        $public = Strings::base64_decode(implode('', array_map('trim', array_slice($key, 4, $publicLength))));
-
-        $source = Strings::packSSH2('ssss', $type, $encryption, $components['comment'], $public);
-
-        extract(unpack('Nlength', Strings::shift($public, 4)));
-        $newtype = Strings::shift($public, $length);
-        if ($newtype != $type) {
-            throw new \RuntimeException('The binary type does not match the human readable type field');
-        }
-
-        $components['public'] = $public;
-
-        switch ($version) {
-            case 3:
-                $hashkey = '';
-                break;
-            case 2:
-                $hashkey = 'putty-private-key-file-mac-key';
-        }
-
-        $offset = $publicLength + 4;
-        switch ($encryption) {
-            case 'aes256-cbc':
-                $crypto = new AES('cbc');
-                switch ($version) {
-                    case 3:
-                        $flavour = trim(preg_replace('#Key-Derivation: (.*)#', '$1', $key[$offset++]));
-                        $memory = trim(preg_replace('#Argon2-Memory: (\d+)#', '$1', $key[$offset++]));
-                        $passes = trim(preg_replace('#Argon2-Passes: (\d+)#', '$1', $key[$offset++]));
-                        $parallelism = trim(preg_replace('#Argon2-Parallelism: (\d+)#', '$1', $key[$offset++]));
-                        $salt = Strings::hex2bin(trim(preg_replace('#Argon2-Salt: ([0-9a-f]+)#', '$1', $key[$offset++])));
-
-                        extract(self::generateV3Key($password, $flavour, $memory, $passes, $salt));
-
-                        break;
-                    case 2:
-                        $symkey = self::generateV2Key($password, 32);
-                        $symiv = str_repeat("\0", $crypto->getBlockLength() >> 3);
-                        $hashkey .= $password;
-                }
-        }
-
-        switch ($version) {
-            case 3:
-                $hash = new Hash('sha256');
-                $hash->setKey($hashkey);
-                break;
-            case 2:
-                $hash = new Hash('sha1');
-                $hash->setKey(sha1($hashkey, true));
-        }
-
-        $privateLength = trim(preg_replace('#Private-Lines: (\d+)#', '$1', $key[$offset++]));
-        $private = Strings::base64_decode(implode('', array_map('trim', array_slice($key, $offset, $privateLength))));
-
-        if ($encryption != 'none') {
-            $crypto->setKey($symkey);
-            $crypto->setIV($symiv);
-            $crypto->disablePadding();
-            $private = $crypto->decrypt($private);
-        }
-
-        $source .= Strings::packSSH2('s', $private);
-
-        $hmac = trim(preg_replace('#Private-MAC: (.+)#', '$1', $key[$offset + $privateLength]));
-        $hmac = Strings::hex2bin($hmac);
-
-        if (!hash_equals($hash->hash($source), $hmac)) {
-            throw new \UnexpectedValueException('MAC validation error');
-        }
-
-        $components['private'] = $private;
-
-        return $components;
-    }
-
-    /**
-     * Wrap a private key appropriately
-     *
-     * @param string $public
-     * @param string $private
-     * @param string $type
-     * @param string $password
-     * @param array $options optional
-     * @return string
-     */
-    protected static function wrapPrivateKey($public, $private, $type, $password, array $options = [])
-    {
-        $encryption = (!empty($password) || is_string($password)) ? 'aes256-cbc' : 'none';
-        $comment = isset($options['comment']) ? $options['comment'] : self::$comment;
-        $version = isset($options['version']) ? $options['version'] : self::$version;
-
-        $key = "PuTTY-User-Key-File-$version: $type\r\n";
-        $key .= "Encryption: $encryption\r\n";
-        $key .= "Comment: $comment\r\n";
-
-        $public = Strings::packSSH2('s', $type) . $public;
-
-        $source = Strings::packSSH2('ssss', $type, $encryption, $comment, $public);
-
-        $public = Strings::base64_encode($public);
-        $key .= "Public-Lines: " . ((strlen($public) + 63) >> 6) . "\r\n";
-        $key .= chunk_split($public, 64);
-
-        if (empty($password) && !is_string($password)) {
-            $source .= Strings::packSSH2('s', $private);
-            switch ($version) {
-                case 3:
-                    $hash = new Hash('sha256');
-                    $hash->setKey('');
-                    break;
-                case 2:
-                    $hash = new Hash('sha1');
-                    $hash->setKey(sha1('putty-private-key-file-mac-key', true));
-            }
-        } else {
-            $private .= Random::string(16 - (strlen($private) & 15));
-            $source .= Strings::packSSH2('s', $private);
-            $crypto = new AES('cbc');
-
-            switch ($version) {
-                case 3:
-                    $salt = Random::string(16);
-                    $key .= "Key-Derivation: Argon2id\r\n";
-                    $key .= "Argon2-Memory: 8192\r\n";
-                    $key .= "Argon2-Passes: 13\r\n";
-                    $key .= "Argon2-Parallelism: 1\r\n";
-                    $key .= "Argon2-Salt: " . Strings::bin2hex($salt) . "\r\n";
-                    extract(self::generateV3Key($password, 'Argon2id', 8192, 13, $salt));
-
-                    $hash = new Hash('sha256');
-                    $hash->setKey($hashkey);
-
-                    break;
-                case 2:
-                    $symkey = self::generateV2Key($password, 32);
-                    $symiv = str_repeat("\0", $crypto->getBlockLength() >> 3);
-                    $hashkey = 'putty-private-key-file-mac-key' . $password;
-
-                    $hash = new Hash('sha1');
-                    $hash->setKey(sha1($hashkey, true));
-            }
-
-            $crypto->setKey($symkey);
-            $crypto->setIV($symiv);
-            $crypto->disablePadding();
-            $private = $crypto->encrypt($private);
-            $mac = $hash->hash($source);
-        }
-
-        $private = Strings::base64_encode($private);
-        $key .= 'Private-Lines: ' . ((strlen($private) + 63) >> 6) . "\r\n";
-        $key .= chunk_split($private, 64);
-        $key .= 'Private-MAC: ' . Strings::bin2hex($hash->hash($source)) . "\r\n";
-
-        return $key;
-    }
-
-    /**
-     * Wrap a public key appropriately
-     *
-     * This is basically the format described in RFC 4716 (https://tools.ietf.org/html/rfc4716)
-     *
-     * @param string $key
-     * @param string $type
-     * @return string
-     */
-    protected static function wrapPublicKey($key, $type)
-    {
-        $key = pack('Na*a*', strlen($type), $type, $key);
-        $key = "---- BEGIN SSH2 PUBLIC KEY ----\r\n" .
-               'Comment: "' . str_replace(['\\', '"'], ['\\\\', '\"'], self::$comment) . "\"\r\n" .
-               chunk_split(Strings::base64_encode($key), 64) .
-               '---- END SSH2 PUBLIC KEY ----';
-        return $key;
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/Common/Formats/Signature/Raw.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/Common/Formats/Signature/Raw.php
deleted file mode 100644
index ab8e7e46..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/Common/Formats/Signature/Raw.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-
-/**
- * Raw Signature Handler
- *
- * PHP version 5
- *
- * Handles signatures as arrays
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\Crypt\Common\Formats\Signature;
-
-use phpseclib3\Math\BigInteger;
-
-/**
- * Raw Signature Handler
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class Raw
-{
-    /**
-     * Loads a signature
-     *
-     * @param array $sig
-     * @return array|bool
-     */
-    public static function load($sig)
-    {
-        switch (true) {
-            case !is_array($sig):
-            case !isset($sig['r']) || !isset($sig['s']):
-            case !$sig['r'] instanceof BigInteger:
-            case !$sig['s'] instanceof BigInteger:
-                return false;
-        }
-
-        return [
-            'r' => $sig['r'],
-            's' => $sig['s']
-        ];
-    }
-
-    /**
-     * Returns a signature in the appropriate format
-     *
-     * @param \phpseclib3\Math\BigInteger $r
-     * @param \phpseclib3\Math\BigInteger $s
-     * @return string
-     */
-    public static function save(BigInteger $r, BigInteger $s)
-    {
-        return compact('r', 's');
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/Common/PrivateKey.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/Common/PrivateKey.php
deleted file mode 100644
index a6e1eb0b..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/Common/PrivateKey.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-/**
- * PrivateKey interface
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2009 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\Crypt\Common;
-
-/**
- * PrivateKey interface
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-interface PrivateKey
-{
-    public function sign($message);
-    //public function decrypt($ciphertext);
-    public function getPublicKey();
-    public function toString($type, array $options = []);
-
-    /**
-     * @param string|false $password
-     * @return mixed
-     */
-    public function withPassword($password = false);
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/Common/PublicKey.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/Common/PublicKey.php
deleted file mode 100644
index 48a5875b..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/Common/PublicKey.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-/**
- * PublicKey interface
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2009 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\Crypt\Common;
-
-/**
- * PublicKey interface
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-interface PublicKey
-{
-    public function verify($message, $signature);
-    //public function encrypt($plaintext);
-    public function toString($type, array $options = []);
-    public function getFingerprint($algorithm);
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/Common/StreamCipher.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/Common/StreamCipher.php
deleted file mode 100644
index 0e2d6f0c..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/Common/StreamCipher.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-
-/**
- * Base Class for all stream ciphers
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @author    Hans-Juergen Petrich <petrich@tronic-media.com>
- * @copyright 2007 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\Crypt\Common;
-
-/**
- * Base Class for all stream cipher classes
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class StreamCipher extends SymmetricKey
-{
-    /**
-     * Block Length of the cipher
-     *
-     * Stream ciphers do not have a block size
-     *
-     * @see \phpseclib3\Crypt\Common\SymmetricKey::block_size
-     * @var int
-     */
-    protected $block_size = 0;
-
-    /**
-     * Default Constructor.
-     *
-     * @see \phpseclib3\Crypt\Common\SymmetricKey::__construct()
-     * @return \phpseclib3\Crypt\Common\StreamCipher
-     */
-    public function __construct()
-    {
-        parent::__construct('stream');
-    }
-
-    /**
-     * Stream ciphers not use an IV
-     *
-     * @return bool
-     */
-    public function usesIV()
-    {
-        return false;
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/Common/SymmetricKey.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/Common/SymmetricKey.php
deleted file mode 100644
index 175508d4..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/Common/SymmetricKey.php
+++ /dev/null
@@ -1,3398 +0,0 @@
-<?php
-
-/**
- * Base Class for all \phpseclib3\Crypt\* cipher classes
- *
- * PHP version 5
- *
- * Internally for phpseclib developers:
- *  If you plan to add a new cipher class, please note following rules:
- *
- *  - The new \phpseclib3\Crypt\* cipher class should extend \phpseclib3\Crypt\Common\SymmetricKey
- *
- *  - Following methods are then required to be overridden/overloaded:
- *
- *    - encryptBlock()
- *
- *    - decryptBlock()
- *
- *    - setupKey()
- *
- *  - All other methods are optional to be overridden/overloaded
- *
- *  - Look at the source code of the current ciphers how they extend \phpseclib3\Crypt\Common\SymmetricKey
- *    and take one of them as a start up for the new cipher class.
- *
- *  - Please read all the other comments/notes/hints here also for each class var/method
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @author    Hans-Juergen Petrich <petrich@tronic-media.com>
- * @copyright 2007 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\Crypt\Common;
-
-use phpseclib3\Common\Functions\Strings;
-use phpseclib3\Crypt\Blowfish;
-use phpseclib3\Crypt\Hash;
-use phpseclib3\Exception\BadDecryptionException;
-use phpseclib3\Exception\BadModeException;
-use phpseclib3\Exception\InconsistentSetupException;
-use phpseclib3\Exception\InsufficientSetupException;
-use phpseclib3\Exception\UnsupportedAlgorithmException;
-use phpseclib3\Math\BigInteger;
-use phpseclib3\Math\BinaryField;
-use phpseclib3\Math\PrimeField;
-
-/**
- * Base Class for all \phpseclib3\Crypt\* cipher classes
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- * @author  Hans-Juergen Petrich <petrich@tronic-media.com>
- */
-abstract class SymmetricKey
-{
-    /**
-     * Encrypt / decrypt using the Counter mode.
-     *
-     * Set to -1 since that's what Crypt/Random.php uses to index the CTR mode.
-     *
-     * @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Counter_.28CTR.29
-     * @see \phpseclib3\Crypt\Common\SymmetricKey::encrypt()
-     * @see \phpseclib3\Crypt\Common\SymmetricKey::decrypt()
-     */
-    const MODE_CTR = -1;
-    /**
-     * Encrypt / decrypt using the Electronic Code Book mode.
-     *
-     * @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Electronic_codebook_.28ECB.29
-     * @see \phpseclib3\Crypt\Common\SymmetricKey::encrypt()
-     * @see \phpseclib3\Crypt\Common\SymmetricKey::decrypt()
-     */
-    const MODE_ECB = 1;
-    /**
-     * Encrypt / decrypt using the Code Book Chaining mode.
-     *
-     * @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Cipher-block_chaining_.28CBC.29
-     * @see \phpseclib3\Crypt\Common\SymmetricKey::encrypt()
-     * @see \phpseclib3\Crypt\Common\SymmetricKey::decrypt()
-     */
-    const MODE_CBC = 2;
-    /**
-     * Encrypt / decrypt using the Cipher Feedback mode.
-     *
-     * @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Cipher_feedback_.28CFB.29
-     * @see \phpseclib3\Crypt\Common\SymmetricKey::encrypt()
-     * @see \phpseclib3\Crypt\Common\SymmetricKey::decrypt()
-     */
-    const MODE_CFB = 3;
-    /**
-     * Encrypt / decrypt using the Cipher Feedback mode (8bit)
-     *
-     * @see \phpseclib3\Crypt\Common\SymmetricKey::encrypt()
-     * @see \phpseclib3\Crypt\Common\SymmetricKey::decrypt()
-     */
-    const MODE_CFB8 = 7;
-    /**
-     * Encrypt / decrypt using the Output Feedback mode (8bit)
-     *
-     * @see \phpseclib3\Crypt\Common\SymmetricKey::encrypt()
-     * @see \phpseclib3\Crypt\Common\SymmetricKey::decrypt()
-     */
-    const MODE_OFB8 = 8;
-    /**
-     * Encrypt / decrypt using the Output Feedback mode.
-     *
-     * @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Output_feedback_.28OFB.29
-     * @see \phpseclib3\Crypt\Common\SymmetricKey::encrypt()
-     * @see \phpseclib3\Crypt\Common\SymmetricKey::decrypt()
-     */
-    const MODE_OFB = 4;
-    /**
-     * Encrypt / decrypt using Galois/Counter mode.
-     *
-     * @link https://en.wikipedia.org/wiki/Galois/Counter_Mode
-     * @see \phpseclib3\Crypt\Common\SymmetricKey::encrypt()
-     * @see \phpseclib3\Crypt\Common\SymmetricKey::decrypt()
-     */
-    const MODE_GCM = 5;
-    /**
-     * Encrypt / decrypt using streaming mode.
-     *
-     * @see \phpseclib3\Crypt\Common\SymmetricKey::encrypt()
-     * @see \phpseclib3\Crypt\Common\SymmetricKey::decrypt()
-     */
-    const MODE_STREAM = 6;
-
-    /**
-     * Mode Map
-     *
-     * @see \phpseclib3\Crypt\Common\SymmetricKey::__construct()
-     */
-    const MODE_MAP = [
-        'ctr'    => self::MODE_CTR,
-        'ecb'    => self::MODE_ECB,
-        'cbc'    => self::MODE_CBC,
-        'cfb'    => self::MODE_CFB,
-        'cfb8'   => self::MODE_CFB8,
-        'ofb'    => self::MODE_OFB,
-        'ofb8'   => self::MODE_OFB8,
-        'gcm'    => self::MODE_GCM,
-        'stream' => self::MODE_STREAM
-    ];
-
-    /**
-     * Base value for the internal implementation $engine switch
-     *
-     * @see \phpseclib3\Crypt\Common\SymmetricKey::__construct()
-     */
-    const ENGINE_INTERNAL = 1;
-    /**
-     * Base value for the eval() implementation $engine switch
-     *
-     * @see \phpseclib3\Crypt\Common\SymmetricKey::__construct()
-     */
-    const ENGINE_EVAL = 2;
-    /**
-     * Base value for the mcrypt implementation $engine switch
-     *
-     * @see \phpseclib3\Crypt\Common\SymmetricKey::__construct()
-     */
-    const ENGINE_MCRYPT = 3;
-    /**
-     * Base value for the openssl implementation $engine switch
-     *
-     * @see \phpseclib3\Crypt\Common\SymmetricKey::__construct()
-     */
-    const ENGINE_OPENSSL = 4;
-    /**
-     * Base value for the libsodium implementation $engine switch
-     *
-     * @see \phpseclib3\Crypt\Common\SymmetricKey::__construct()
-     */
-    const ENGINE_LIBSODIUM = 5;
-    /**
-     * Base value for the openssl / gcm implementation $engine switch
-     *
-     * @see \phpseclib3\Crypt\Common\SymmetricKey::__construct()
-     */
-    const ENGINE_OPENSSL_GCM = 6;
-
-    /**
-     * Engine Reverse Map
-     *
-     * @see \phpseclib3\Crypt\Common\SymmetricKey::getEngine()
-     */
-    const ENGINE_MAP = [
-        self::ENGINE_INTERNAL    => 'PHP',
-        self::ENGINE_EVAL        => 'Eval',
-        self::ENGINE_MCRYPT      => 'mcrypt',
-        self::ENGINE_OPENSSL     => 'OpenSSL',
-        self::ENGINE_LIBSODIUM   => 'libsodium',
-        self::ENGINE_OPENSSL_GCM => 'OpenSSL (GCM)'
-    ];
-
-    /**
-     * The Encryption Mode
-     *
-     * @see self::__construct()
-     * @var int
-     */
-    protected $mode;
-
-    /**
-     * The Block Length of the block cipher
-     *
-     * @var int
-     */
-    protected $block_size = 16;
-
-    /**
-     * The Key
-     *
-     * @see self::setKey()
-     * @var string
-     */
-    protected $key = false;
-
-    /**
-     * HMAC Key
-     *
-     * @see self::setupGCM()
-     * @var ?string
-     */
-    protected $hKey = false;
-
-    /**
-     * The Initialization Vector
-     *
-     * @see self::setIV()
-     * @var string
-     */
-    protected $iv = false;
-
-    /**
-     * A "sliding" Initialization Vector
-     *
-     * @see self::enableContinuousBuffer()
-     * @see self::clearBuffers()
-     * @var string
-     */
-    protected $encryptIV;
-
-    /**
-     * A "sliding" Initialization Vector
-     *
-     * @see self::enableContinuousBuffer()
-     * @see self::clearBuffers()
-     * @var string
-     */
-    protected $decryptIV;
-
-    /**
-     * Continuous Buffer status
-     *
-     * @see self::enableContinuousBuffer()
-     * @var bool
-     */
-    protected $continuousBuffer = false;
-
-    /**
-     * Encryption buffer for CTR, OFB and CFB modes
-     *
-     * @see self::encrypt()
-     * @see self::clearBuffers()
-     * @var array
-     */
-    protected $enbuffer;
-
-    /**
-     * Decryption buffer for CTR, OFB and CFB modes
-     *
-     * @see self::decrypt()
-     * @see self::clearBuffers()
-     * @var array
-     */
-    protected $debuffer;
-
-    /**
-     * mcrypt resource for encryption
-     *
-     * The mcrypt resource can be recreated every time something needs to be created or it can be created just once.
-     * Since mcrypt operates in continuous mode, by default, it'll need to be recreated when in non-continuous mode.
-     *
-     * @see self::encrypt()
-     * @var resource
-     */
-    private $enmcrypt;
-
-    /**
-     * mcrypt resource for decryption
-     *
-     * The mcrypt resource can be recreated every time something needs to be created or it can be created just once.
-     * Since mcrypt operates in continuous mode, by default, it'll need to be recreated when in non-continuous mode.
-     *
-     * @see self::decrypt()
-     * @var resource
-     */
-    private $demcrypt;
-
-    /**
-     * Does the enmcrypt resource need to be (re)initialized?
-     *
-     * @see \phpseclib3\Crypt\Twofish::setKey()
-     * @see \phpseclib3\Crypt\Twofish::setIV()
-     * @var bool
-     */
-    private $enchanged = true;
-
-    /**
-     * Does the demcrypt resource need to be (re)initialized?
-     *
-     * @see \phpseclib3\Crypt\Twofish::setKey()
-     * @see \phpseclib3\Crypt\Twofish::setIV()
-     * @var bool
-     */
-    private $dechanged = true;
-
-    /**
-     * mcrypt resource for CFB mode
-     *
-     * mcrypt's CFB mode, in (and only in) buffered context,
-     * is broken, so phpseclib implements the CFB mode by it self,
-     * even when the mcrypt php extension is available.
-     *
-     * In order to do the CFB-mode work (fast) phpseclib
-     * use a separate ECB-mode mcrypt resource.
-     *
-     * @link http://phpseclib.sourceforge.net/cfb-demo.phps
-     * @see self::encrypt()
-     * @see self::decrypt()
-     * @see self::setupMcrypt()
-     * @var resource
-     */
-    private $ecb;
-
-    /**
-     * Optimizing value while CFB-encrypting
-     *
-     * Only relevant if $continuousBuffer enabled
-     * and $engine == self::ENGINE_MCRYPT
-     *
-     * It's faster to re-init $enmcrypt if
-     * $buffer bytes > $cfb_init_len than
-     * using the $ecb resource furthermore.
-     *
-     * This value depends of the chosen cipher
-     * and the time it would be needed for it's
-     * initialization [by mcrypt_generic_init()]
-     * which, typically, depends on the complexity
-     * on its internaly Key-expanding algorithm.
-     *
-     * @see self::encrypt()
-     * @var int
-     */
-    protected $cfb_init_len = 600;
-
-    /**
-     * Does internal cipher state need to be (re)initialized?
-     *
-     * @see self::setKey()
-     * @see self::setIV()
-     * @see self::disableContinuousBuffer()
-     * @var bool
-     */
-    protected $changed = true;
-
-    /**
-     * Does Eval engie need to be (re)initialized?
-     *
-     * @see self::setup()
-     * @var bool
-     */
-    protected $nonIVChanged = true;
-
-    /**
-     * Padding status
-     *
-     * @see self::enablePadding()
-     * @var bool
-     */
-    private $padding = true;
-
-    /**
-     * Is the mode one that is paddable?
-     *
-     * @see self::__construct()
-     * @var bool
-     */
-    private $paddable = false;
-
-    /**
-     * Holds which crypt engine internaly should be use,
-     * which will be determined automatically on __construct()
-     *
-     * Currently available $engines are:
-     * - self::ENGINE_LIBSODIUM   (very fast, php-extension: libsodium, extension_loaded('libsodium') required)
-     * - self::ENGINE_OPENSSL_GCM (very fast, php-extension: openssl, extension_loaded('openssl') required)
-     * - self::ENGINE_OPENSSL     (very fast, php-extension: openssl, extension_loaded('openssl') required)
-     * - self::ENGINE_MCRYPT      (fast, php-extension: mcrypt, extension_loaded('mcrypt') required)
-     * - self::ENGINE_EVAL        (medium, pure php-engine, no php-extension required)
-     * - self::ENGINE_INTERNAL    (slower, pure php-engine, no php-extension required)
-     *
-     * @see self::setEngine()
-     * @see self::encrypt()
-     * @see self::decrypt()
-     * @var int
-     */
-    protected $engine;
-
-    /**
-     * Holds the preferred crypt engine
-     *
-     * @see self::setEngine()
-     * @see self::setPreferredEngine()
-     * @var int
-     */
-    private $preferredEngine;
-
-    /**
-     * The mcrypt specific name of the cipher
-     *
-     * Only used if $engine == self::ENGINE_MCRYPT
-     *
-     * @link http://www.php.net/mcrypt_module_open
-     * @link http://www.php.net/mcrypt_list_algorithms
-     * @see self::setupMcrypt()
-     * @var string
-     */
-    protected $cipher_name_mcrypt;
-
-    /**
-     * The openssl specific name of the cipher
-     *
-     * Only used if $engine == self::ENGINE_OPENSSL
-     *
-     * @link http://www.php.net/openssl-get-cipher-methods
-     * @var string
-     */
-    protected $cipher_name_openssl;
-
-    /**
-     * The openssl specific name of the cipher in ECB mode
-     *
-     * If OpenSSL does not support the mode we're trying to use (CTR)
-     * it can still be emulated with ECB mode.
-     *
-     * @link http://www.php.net/openssl-get-cipher-methods
-     * @var string
-     */
-    protected $cipher_name_openssl_ecb;
-
-    /**
-     * The default salt used by setPassword()
-     *
-     * @see self::setPassword()
-     * @var string
-     */
-    private $password_default_salt = 'phpseclib/salt';
-
-    /**
-     * The name of the performance-optimized callback function
-     *
-     * Used by encrypt() / decrypt()
-     * only if $engine == self::ENGINE_INTERNAL
-     *
-     * @see self::encrypt()
-     * @see self::decrypt()
-     * @see self::setupInlineCrypt()
-     * @var Callback
-     */
-    protected $inline_crypt;
-
-    /**
-     * If OpenSSL can be used in ECB but not in CTR we can emulate CTR
-     *
-     * @see self::openssl_ctr_process()
-     * @var bool
-     */
-    private $openssl_emulate_ctr = false;
-
-    /**
-     * Don't truncate / null pad key
-     *
-     * @see self::clearBuffers()
-     * @var bool
-     */
-    private $skip_key_adjustment = false;
-
-    /**
-     * Has the key length explicitly been set or should it be derived from the key, itself?
-     *
-     * @see self::setKeyLength()
-     * @var bool
-     */
-    protected $explicit_key_length = false;
-
-    /**
-     * Hash subkey for GHASH
-     *
-     * @see self::setupGCM()
-     * @see self::ghash()
-     * @var BinaryField\Integer
-     */
-    private $h;
-
-    /**
-     * Additional authenticated data
-     *
-     * @var string
-     */
-    protected $aad = '';
-
-    /**
-     * Authentication Tag produced after a round of encryption
-     *
-     * @var string
-     */
-    protected $newtag = false;
-
-    /**
-     * Authentication Tag to be verified during decryption
-     *
-     * @var string
-     */
-    protected $oldtag = false;
-
-    /**
-     * GCM Binary Field
-     *
-     * @see self::__construct()
-     * @see self::ghash()
-     * @var BinaryField
-     */
-    private static $gcmField;
-
-    /**
-     * Poly1305 Prime Field
-     *
-     * @see self::enablePoly1305()
-     * @see self::poly1305()
-     * @var PrimeField
-     */
-    private static $poly1305Field;
-
-    /**
-     * Flag for using regular vs "safe" intval
-     *
-     * @see self::initialize_static_variables()
-     * @var boolean
-     */
-    protected static $use_reg_intval;
-
-    /**
-     * Poly1305 Key
-     *
-     * @see self::setPoly1305Key()
-     * @see self::poly1305()
-     * @var string
-     */
-    protected $poly1305Key;
-
-    /**
-     * Poly1305 Flag
-     *
-     * @see self::setPoly1305Key()
-     * @see self::enablePoly1305()
-     * @var boolean
-     */
-    protected $usePoly1305 = false;
-
-    /**
-     * The Original Initialization Vector
-     *
-     * GCM uses the nonce to build the IV but we want to be able to distinguish between nonce-derived
-     * IV's and user-set IV's
-     *
-     * @see self::setIV()
-     * @var string
-     */
-    private $origIV = false;
-
-    /**
-     * Nonce
-     *
-     * Only used with GCM. We could re-use setIV() but nonce's can be of a different length and
-     * toggling between GCM and other modes could be more complicated if we re-used setIV()
-     *
-     * @see self::setNonce()
-     * @var string
-     */
-    protected $nonce = false;
-
-    /**
-     * Default Constructor.
-     *
-     * $mode could be:
-     *
-     * - ecb
-     *
-     * - cbc
-     *
-     * - ctr
-     *
-     * - cfb
-     *
-     * - cfb8
-     *
-     * - ofb
-     *
-     * - ofb8
-     *
-     * - gcm
-     *
-     * @param string $mode
-     * @throws BadModeException if an invalid / unsupported mode is provided
-     */
-    public function __construct($mode)
-    {
-        $mode = strtolower($mode);
-        // necessary because of 5.6 compatibility; we can't do isset(self::MODE_MAP[$mode]) in 5.6
-        $map = self::MODE_MAP;
-        if (!isset($map[$mode])) {
-            throw new BadModeException('No valid mode has been specified');
-        }
-
-        $mode = self::MODE_MAP[$mode];
-
-        // $mode dependent settings
-        switch ($mode) {
-            case self::MODE_ECB:
-            case self::MODE_CBC:
-                $this->paddable = true;
-                break;
-            case self::MODE_CTR:
-            case self::MODE_CFB:
-            case self::MODE_CFB8:
-            case self::MODE_OFB:
-            case self::MODE_OFB8:
-            case self::MODE_STREAM:
-                $this->paddable = false;
-                break;
-            case self::MODE_GCM:
-                if ($this->block_size != 16) {
-                    throw new BadModeException('GCM is only valid for block ciphers with a block size of 128 bits');
-                }
-                if (!isset(self::$gcmField)) {
-                    self::$gcmField = new BinaryField(128, 7, 2, 1, 0);
-                }
-                $this->paddable = false;
-                break;
-            default:
-                throw new BadModeException('No valid mode has been specified');
-        }
-
-        $this->mode = $mode;
-
-        static::initialize_static_variables();
-    }
-
-    /**
-     * Initialize static variables
-     */
-    protected static function initialize_static_variables()
-    {
-        if (!isset(self::$use_reg_intval)) {
-            switch (true) {
-                // PHP_OS & "\xDF\xDF\xDF" == strtoupper(substr(PHP_OS, 0, 3)), but a lot faster
-                case (PHP_OS & "\xDF\xDF\xDF") === 'WIN':
-                case !function_exists('php_uname'):
-                case !is_string(php_uname('m')):
-                case (php_uname('m') & "\xDF\xDF\xDF") != 'ARM':
-                case defined('PHP_INT_SIZE') && PHP_INT_SIZE == 8:
-                    self::$use_reg_intval = true;
-                    break;
-                case (php_uname('m') & "\xDF\xDF\xDF") == 'ARM':
-                    switch (true) {
-                        /* PHP 7.0.0 introduced a bug that affected 32-bit ARM processors:
-
-                           https://github.com/php/php-src/commit/716da71446ebbd40fa6cf2cea8a4b70f504cc3cd
-
-                           altho the changelogs make no mention of it, this bug was fixed with this commit:
-
-                           https://github.com/php/php-src/commit/c1729272b17a1fe893d1a54e423d3b71470f3ee8
-
-                           affected versions of PHP are: 7.0.x, 7.1.0 - 7.1.23 and 7.2.0 - 7.2.11 */
-                        case PHP_VERSION_ID >= 70000 && PHP_VERSION_ID <= 70123:
-                        case PHP_VERSION_ID >= 70200 && PHP_VERSION_ID <= 70211:
-                            self::$use_reg_intval = false;
-                            break;
-                        default:
-                            self::$use_reg_intval = true;
-                    }
-            }
-        }
-    }
-
-    /**
-     * Sets the initialization vector.
-     *
-     * setIV() is not required when ecb or gcm modes are being used.
-     *
-     * {@internal Can be overwritten by a sub class, but does not have to be}
-     *
-     * @param string $iv
-     * @throws \LengthException if the IV length isn't equal to the block size
-     * @throws \BadMethodCallException if an IV is provided when one shouldn't be
-     */
-    public function setIV($iv)
-    {
-        if ($this->mode == self::MODE_ECB) {
-            throw new \BadMethodCallException('This mode does not require an IV.');
-        }
-
-        if ($this->mode == self::MODE_GCM) {
-            throw new \BadMethodCallException('Use setNonce instead');
-        }
-
-        if (!$this->usesIV()) {
-            throw new \BadMethodCallException('This algorithm does not use an IV.');
-        }
-
-        if (strlen($iv) != $this->block_size) {
-            throw new \LengthException('Received initialization vector of size ' . strlen($iv) . ', but size ' . $this->block_size . ' is required');
-        }
-
-        $this->iv = $this->origIV = $iv;
-        $this->changed = true;
-    }
-
-    /**
-     * Enables Poly1305 mode.
-     *
-     * Once enabled Poly1305 cannot be disabled.
-     *
-     * @throws \BadMethodCallException if Poly1305 is enabled whilst in GCM mode
-     */
-    public function enablePoly1305()
-    {
-        if ($this->mode == self::MODE_GCM) {
-            throw new \BadMethodCallException('Poly1305 cannot be used in GCM mode');
-        }
-
-        $this->usePoly1305 = true;
-    }
-
-    /**
-     * Enables Poly1305 mode.
-     *
-     * Once enabled Poly1305 cannot be disabled. If $key is not passed then an attempt to call createPoly1305Key
-     * will be made.
-     *
-     * @param string $key optional
-     * @throws \LengthException if the key isn't long enough
-     * @throws \BadMethodCallException if Poly1305 is enabled whilst in GCM mode
-     */
-    public function setPoly1305Key($key = null)
-    {
-        if ($this->mode == self::MODE_GCM) {
-            throw new \BadMethodCallException('Poly1305 cannot be used in GCM mode');
-        }
-
-        if (!is_string($key) || strlen($key) != 32) {
-            throw new \LengthException('The Poly1305 key must be 32 bytes long (256 bits)');
-        }
-
-        if (!isset(self::$poly1305Field)) {
-            // 2^130-5
-            self::$poly1305Field = new PrimeField(new BigInteger('3fffffffffffffffffffffffffffffffb', 16));
-        }
-
-        $this->poly1305Key = $key;
-        $this->usePoly1305 = true;
-    }
-
-    /**
-     * Sets the nonce.
-     *
-     * setNonce() is only required when gcm is used
-     *
-     * @param string $nonce
-     * @throws \BadMethodCallException if an nonce is provided when one shouldn't be
-     */
-    public function setNonce($nonce)
-    {
-        if ($this->mode != self::MODE_GCM) {
-            throw new \BadMethodCallException('Nonces are only used in GCM mode.');
-        }
-
-        $this->nonce = $nonce;
-        $this->setEngine();
-    }
-
-    /**
-     * Sets additional authenticated data
-     *
-     * setAAD() is only used by gcm or in poly1305 mode
-     *
-     * @param string $aad
-     * @throws \BadMethodCallException if mode isn't GCM or if poly1305 isn't being utilized
-     */
-    public function setAAD($aad)
-    {
-        if ($this->mode != self::MODE_GCM && !$this->usePoly1305) {
-            throw new \BadMethodCallException('Additional authenticated data is only utilized in GCM mode or with Poly1305');
-        }
-
-        $this->aad = $aad;
-    }
-
-    /**
-     * Returns whether or not the algorithm uses an IV
-     *
-     * @return bool
-     */
-    public function usesIV()
-    {
-        return $this->mode != self::MODE_GCM && $this->mode != self::MODE_ECB;
-    }
-
-    /**
-     * Returns whether or not the algorithm uses a nonce
-     *
-     * @return bool
-     */
-    public function usesNonce()
-    {
-        return $this->mode == self::MODE_GCM;
-    }
-
-    /**
-     * Returns the current key length in bits
-     *
-     * @return int
-     */
-    public function getKeyLength()
-    {
-        return $this->key_length << 3;
-    }
-
-    /**
-     * Returns the current block length in bits
-     *
-     * @return int
-     */
-    public function getBlockLength()
-    {
-        return $this->block_size << 3;
-    }
-
-    /**
-     * Returns the current block length in bytes
-     *
-     * @return int
-     */
-    public function getBlockLengthInBytes()
-    {
-        return $this->block_size;
-    }
-
-    /**
-     * Sets the key length.
-     *
-     * Keys with explicitly set lengths need to be treated accordingly
-     *
-     * @param int $length
-     */
-    public function setKeyLength($length)
-    {
-        $this->explicit_key_length = $length >> 3;
-
-        if (is_string($this->key) && strlen($this->key) != $this->explicit_key_length) {
-            $this->key = false;
-            throw new InconsistentSetupException('Key has already been set and is not ' . $this->explicit_key_length . ' bytes long');
-        }
-    }
-
-    /**
-     * Sets the key.
-     *
-     * The min/max length(s) of the key depends on the cipher which is used.
-     * If the key not fits the length(s) of the cipher it will paded with null bytes
-     * up to the closest valid key length.  If the key is more than max length,
-     * we trim the excess bits.
-     *
-     * If the key is not explicitly set, it'll be assumed to be all null bytes.
-     *
-     * {@internal Could, but not must, extend by the child Crypt_* class}
-     *
-     * @param string $key
-     */
-    public function setKey($key)
-    {
-        if ($this->explicit_key_length !== false && strlen($key) != $this->explicit_key_length) {
-            throw new InconsistentSetupException('Key length has already been set to ' . $this->explicit_key_length . ' bytes and this key is ' . strlen($key) . ' bytes');
-        }
-
-        $this->key = $key;
-        $this->key_length = strlen($key);
-        $this->setEngine();
-    }
-
-    /**
-     * Sets the password.
-     *
-     * Depending on what $method is set to, setPassword()'s (optional) parameters are as follows:
-     *     {@link http://en.wikipedia.org/wiki/PBKDF2 pbkdf2} or pbkdf1:
-     *         $hash, $salt, $count, $dkLen
-     *
-     *         Where $hash (default = sha1) currently supports the following hashes: see: Crypt/Hash.php
-     *     {@link https://en.wikipedia.org/wiki/Bcrypt bcypt}:
-     *         $salt, $rounds, $keylen
-     *
-     *         This is a modified version of bcrypt used by OpenSSH.
-     *
-     * {@internal Could, but not must, extend by the child Crypt_* class}
-     *
-     * @see Crypt/Hash.php
-     * @param string $password
-     * @param string $method
-     * @param int|string ...$func_args
-     * @throws \LengthException if pbkdf1 is being used and the derived key length exceeds the hash length
-     * @throws \RuntimeException if bcrypt is being used and a salt isn't provided
-     * @return bool
-     */
-    public function setPassword($password, $method = 'pbkdf2', ...$func_args)
-    {
-        $key = '';
-
-        $method = strtolower($method);
-        switch ($method) {
-            case 'bcrypt':
-                if (!isset($func_args[2])) {
-                    throw new \RuntimeException('A salt must be provided for bcrypt to work');
-                }
-
-                $salt = $func_args[0];
-
-                $rounds = isset($func_args[1]) ? $func_args[1] : 16;
-                $keylen = isset($func_args[2]) ? $func_args[2] : $this->key_length;
-
-                $key = Blowfish::bcrypt_pbkdf($password, $salt, $keylen + $this->block_size, $rounds);
-
-                $this->setKey(substr($key, 0, $keylen));
-                $this->setIV(substr($key, $keylen));
-
-                return true;
-            case 'pkcs12': // from https://tools.ietf.org/html/rfc7292#appendix-B.2
-            case 'pbkdf1':
-            case 'pbkdf2':
-                // Hash function
-                $hash = isset($func_args[0]) ? strtolower($func_args[0]) : 'sha1';
-                $hashObj = new Hash();
-                $hashObj->setHash($hash);
-
-                // WPA and WPA2 use the SSID as the salt
-                $salt = isset($func_args[1]) ? $func_args[1] : $this->password_default_salt;
-
-                // RFC2898#section-4.2 uses 1,000 iterations by default
-                // WPA and WPA2 use 4,096.
-                $count = isset($func_args[2]) ? $func_args[2] : 1000;
-
-                // Keylength
-                if (isset($func_args[3])) {
-                    if ($func_args[3] <= 0) {
-                        throw new \LengthException('Derived key length cannot be longer 0 or less');
-                    }
-                    $dkLen = $func_args[3];
-                } else {
-                    $key_length = $this->explicit_key_length !== false ? $this->explicit_key_length : $this->key_length;
-                    $dkLen = $method == 'pbkdf1' ? 2 * $key_length : $key_length;
-                }
-
-                switch (true) {
-                    case $method == 'pkcs12':
-                        /*
-                         In this specification, however, all passwords are created from
-                         BMPStrings with a NULL terminator.  This means that each character in
-                         the original BMPString is encoded in 2 bytes in big-endian format
-                         (most-significant byte first).  There are no Unicode byte order
-                         marks.  The 2 bytes produced from the last character in the BMPString
-                         are followed by 2 additional bytes with the value 0x00.
-
-                         -- https://tools.ietf.org/html/rfc7292#appendix-B.1
-                         */
-                        $password = "\0" . chunk_split($password, 1, "\0") . "\0";
-
-                        /*
-                         This standard specifies 3 different values for the ID byte mentioned
-                         above:
-
-                         1.  If ID=1, then the pseudorandom bits being produced are to be used
-                             as key material for performing encryption or decryption.
-
-                         2.  If ID=2, then the pseudorandom bits being produced are to be used
-                             as an IV (Initial Value) for encryption or decryption.
-
-                         3.  If ID=3, then the pseudorandom bits being produced are to be used
-                             as an integrity key for MACing.
-                         */
-                        // Construct a string, D (the "diversifier"), by concatenating v/8
-                        // copies of ID.
-                        $blockLength = $hashObj->getBlockLengthInBytes();
-                        $d1 = str_repeat(chr(1), $blockLength);
-                        $d2 = str_repeat(chr(2), $blockLength);
-                        $s = '';
-                        if (strlen($salt)) {
-                            while (strlen($s) < $blockLength) {
-                                $s .= $salt;
-                            }
-                        }
-                        $s = substr($s, 0, $blockLength);
-
-                        $p = '';
-                        if (strlen($password)) {
-                            while (strlen($p) < $blockLength) {
-                                $p .= $password;
-                            }
-                        }
-                        $p = substr($p, 0, $blockLength);
-
-                        $i = $s . $p;
-
-                        $this->setKey(self::pkcs12helper($dkLen, $hashObj, $i, $d1, $count));
-                        if ($this->usesIV()) {
-                            $this->setIV(self::pkcs12helper($this->block_size, $hashObj, $i, $d2, $count));
-                        }
-
-                        return true;
-                    case $method == 'pbkdf1':
-                        if ($dkLen > $hashObj->getLengthInBytes()) {
-                            throw new \LengthException('Derived key length cannot be longer than the hash length');
-                        }
-                        $t = $password . $salt;
-                        for ($i = 0; $i < $count; ++$i) {
-                            $t = $hashObj->hash($t);
-                        }
-                        $key = substr($t, 0, $dkLen);
-
-                        $this->setKey(substr($key, 0, $dkLen >> 1));
-                        if ($this->usesIV()) {
-                            $this->setIV(substr($key, $dkLen >> 1));
-                        }
-
-                        return true;
-                    case !in_array($hash, hash_algos()):
-                        $i = 1;
-                        $hashObj->setKey($password);
-                        while (strlen($key) < $dkLen) {
-                            $f = $u = $hashObj->hash($salt . pack('N', $i++));
-                            for ($j = 2; $j <= $count; ++$j) {
-                                $u = $hashObj->hash($u);
-                                $f ^= $u;
-                            }
-                            $key .= $f;
-                        }
-                        $key = substr($key, 0, $dkLen);
-                        break;
-                    default:
-                        $key = hash_pbkdf2($hash, $password, $salt, $count, $dkLen, true);
-                }
-                break;
-            default:
-                throw new UnsupportedAlgorithmException($method . ' is not a supported password hashing method');
-        }
-
-        $this->setKey($key);
-
-        return true;
-    }
-
-    /**
-     * PKCS#12 KDF Helper Function
-     *
-     * As discussed here:
-     *
-     * {@link https://tools.ietf.org/html/rfc7292#appendix-B}
-     *
-     * @see self::setPassword()
-     * @param int $n
-     * @param \phpseclib3\Crypt\Hash $hashObj
-     * @param string $i
-     * @param string $d
-     * @param int $count
-     * @return string $a
-     */
-    private static function pkcs12helper($n, $hashObj, $i, $d, $count)
-    {
-        static $one;
-        if (!isset($one)) {
-            $one = new BigInteger(1);
-        }
-
-        $blockLength = $hashObj->getBlockLength() >> 3;
-
-        $c = ceil($n / $hashObj->getLengthInBytes());
-        $a = '';
-        for ($j = 1; $j <= $c; $j++) {
-            $ai = $d . $i;
-            for ($k = 0; $k < $count; $k++) {
-                $ai = $hashObj->hash($ai);
-            }
-            $b = '';
-            while (strlen($b) < $blockLength) {
-                $b .= $ai;
-            }
-            $b = substr($b, 0, $blockLength);
-            $b = new BigInteger($b, 256);
-            $newi = '';
-            for ($k = 0; $k < strlen($i); $k += $blockLength) {
-                $temp = substr($i, $k, $blockLength);
-                $temp = new BigInteger($temp, 256);
-                $temp->setPrecision($blockLength << 3);
-                $temp = $temp->add($b);
-                $temp = $temp->add($one);
-                $newi .= $temp->toBytes(false);
-            }
-            $i = $newi;
-            $a .= $ai;
-        }
-
-        return substr($a, 0, $n);
-    }
-
-    /**
-     * Encrypts a message.
-     *
-     * $plaintext will be padded with additional bytes such that it's length is a multiple of the block size. Other cipher
-     * implementations may or may not pad in the same manner.  Other common approaches to padding and the reasons why it's
-     * necessary are discussed in the following
-     * URL:
-     *
-     * {@link http://www.di-mgt.com.au/cryptopad.html http://www.di-mgt.com.au/cryptopad.html}
-     *
-     * An alternative to padding is to, separately, send the length of the file.  This is what SSH, in fact, does.
-     * strlen($plaintext) will still need to be a multiple of the block size, however, arbitrary values can be added to make it that
-     * length.
-     *
-     * {@internal Could, but not must, extend by the child Crypt_* class}
-     *
-     * @see self::decrypt()
-     * @param string $plaintext
-     * @return string $ciphertext
-     */
-    public function encrypt($plaintext)
-    {
-        if ($this->paddable) {
-            $plaintext = $this->pad($plaintext);
-        }
-
-        $this->setup();
-
-        if ($this->mode == self::MODE_GCM) {
-            $oldIV = $this->iv;
-            Strings::increment_str($this->iv);
-            $cipher = new static('ctr');
-            $cipher->setKey($this->key);
-            $cipher->setIV($this->iv);
-            $ciphertext = $cipher->encrypt($plaintext);
-
-            $s = $this->ghash(
-                self::nullPad128($this->aad) .
-                self::nullPad128($ciphertext) .
-                self::len64($this->aad) .
-                self::len64($ciphertext)
-            );
-            $cipher->encryptIV = $this->iv = $this->encryptIV = $this->decryptIV = $oldIV;
-            $this->newtag = $cipher->encrypt($s);
-            return $ciphertext;
-        }
-
-        if (isset($this->poly1305Key)) {
-            $cipher = clone $this;
-            unset($cipher->poly1305Key);
-            $this->usePoly1305 = false;
-            $ciphertext = $cipher->encrypt($plaintext);
-            $this->newtag = $this->poly1305($ciphertext);
-            return $ciphertext;
-        }
-
-        if ($this->engine === self::ENGINE_OPENSSL) {
-            switch ($this->mode) {
-                case self::MODE_STREAM:
-                    return openssl_encrypt($plaintext, $this->cipher_name_openssl, $this->key, OPENSSL_RAW_DATA | OPENSSL_ZERO_PADDING);
-                case self::MODE_ECB:
-                    return openssl_encrypt($plaintext, $this->cipher_name_openssl, $this->key, OPENSSL_RAW_DATA | OPENSSL_ZERO_PADDING);
-                case self::MODE_CBC:
-                    $result = openssl_encrypt($plaintext, $this->cipher_name_openssl, $this->key, OPENSSL_RAW_DATA | OPENSSL_ZERO_PADDING, $this->encryptIV);
-                    if ($this->continuousBuffer) {
-                        $this->encryptIV = substr($result, -$this->block_size);
-                    }
-                    return $result;
-                case self::MODE_CTR:
-                    return $this->openssl_ctr_process($plaintext, $this->encryptIV, $this->enbuffer);
-                case self::MODE_CFB:
-                    // cfb loosely routines inspired by openssl's:
-                    // {@link http://cvs.openssl.org/fileview?f=openssl/crypto/modes/cfb128.c&v=1.3.2.2.2.1}
-                    $ciphertext = '';
-                    if ($this->continuousBuffer) {
-                        $iv = &$this->encryptIV;
-                        $pos = &$this->enbuffer['pos'];
-                    } else {
-                        $iv = $this->encryptIV;
-                        $pos = 0;
-                    }
-                    $len = strlen($plaintext);
-                    $i = 0;
-                    if ($pos) {
-                        $orig_pos = $pos;
-                        $max = $this->block_size - $pos;
-                        if ($len >= $max) {
-                            $i = $max;
-                            $len -= $max;
-                            $pos = 0;
-                        } else {
-                            $i = $len;
-                            $pos += $len;
-                            $len = 0;
-                        }
-                        // ie. $i = min($max, $len), $len-= $i, $pos+= $i, $pos%= $blocksize
-                        $ciphertext = substr($iv, $orig_pos) ^ $plaintext;
-                        $iv = substr_replace($iv, $ciphertext, $orig_pos, $i);
-                        $plaintext = substr($plaintext, $i);
-                    }
-
-                    $overflow = $len % $this->block_size;
-
-                    if ($overflow) {
-                        $ciphertext .= openssl_encrypt(substr($plaintext, 0, -$overflow) . str_repeat("\0", $this->block_size), $this->cipher_name_openssl, $this->key, OPENSSL_RAW_DATA | OPENSSL_ZERO_PADDING, $iv);
-                        $iv = Strings::pop($ciphertext, $this->block_size);
-
-                        $size = $len - $overflow;
-                        $block = $iv ^ substr($plaintext, -$overflow);
-                        $iv = substr_replace($iv, $block, 0, $overflow);
-                        $ciphertext .= $block;
-                        $pos = $overflow;
-                    } elseif ($len) {
-                        $ciphertext = openssl_encrypt($plaintext, $this->cipher_name_openssl, $this->key, OPENSSL_RAW_DATA | OPENSSL_ZERO_PADDING, $iv);
-                        $iv = substr($ciphertext, -$this->block_size);
-                    }
-
-                    return $ciphertext;
-                case self::MODE_CFB8:
-                    $ciphertext = openssl_encrypt($plaintext, $this->cipher_name_openssl, $this->key, OPENSSL_RAW_DATA | OPENSSL_ZERO_PADDING, $this->encryptIV);
-                    if ($this->continuousBuffer) {
-                        if (($len = strlen($ciphertext)) >= $this->block_size) {
-                            $this->encryptIV = substr($ciphertext, -$this->block_size);
-                        } else {
-                            $this->encryptIV = substr($this->encryptIV, $len - $this->block_size) . substr($ciphertext, -$len);
-                        }
-                    }
-                    return $ciphertext;
-                case self::MODE_OFB8:
-                    $ciphertext = '';
-                    $len = strlen($plaintext);
-                    $iv = $this->encryptIV;
-
-                    for ($i = 0; $i < $len; ++$i) {
-                        $xor = openssl_encrypt($iv, $this->cipher_name_openssl_ecb, $this->key, $this->openssl_options, $this->decryptIV);
-                        $ciphertext .= $plaintext[$i] ^ $xor;
-                        $iv = substr($iv, 1) . $xor[0];
-                    }
-
-                    if ($this->continuousBuffer) {
-                        $this->encryptIV = $iv;
-                    }
-                    break;
-                case self::MODE_OFB:
-                    return $this->openssl_ofb_process($plaintext, $this->encryptIV, $this->enbuffer);
-            }
-        }
-
-        if ($this->engine === self::ENGINE_MCRYPT) {
-            set_error_handler(function () {
-            });
-            if ($this->enchanged) {
-                mcrypt_generic_init($this->enmcrypt, $this->key, $this->getIV($this->encryptIV));
-                $this->enchanged = false;
-            }
-
-            // re: {@link http://phpseclib.sourceforge.net/cfb-demo.phps}
-            // using mcrypt's default handing of CFB the above would output two different things.  using phpseclib's
-            // rewritten CFB implementation the above outputs the same thing twice.
-            if ($this->mode == self::MODE_CFB && $this->continuousBuffer) {
-                $block_size = $this->block_size;
-                $iv = &$this->encryptIV;
-                $pos = &$this->enbuffer['pos'];
-                $len = strlen($plaintext);
-                $ciphertext = '';
-                $i = 0;
-                if ($pos) {
-                    $orig_pos = $pos;
-                    $max = $block_size - $pos;
-                    if ($len >= $max) {
-                        $i = $max;
-                        $len -= $max;
-                        $pos = 0;
-                    } else {
-                        $i = $len;
-                        $pos += $len;
-                        $len = 0;
-                    }
-                    $ciphertext = substr($iv, $orig_pos) ^ $plaintext;
-                    $iv = substr_replace($iv, $ciphertext, $orig_pos, $i);
-                    $this->enbuffer['enmcrypt_init'] = true;
-                }
-                if ($len >= $block_size) {
-                    if ($this->enbuffer['enmcrypt_init'] === false || $len > $this->cfb_init_len) {
-                        if ($this->enbuffer['enmcrypt_init'] === true) {
-                            mcrypt_generic_init($this->enmcrypt, $this->key, $iv);
-                            $this->enbuffer['enmcrypt_init'] = false;
-                        }
-                        $ciphertext .= mcrypt_generic($this->enmcrypt, substr($plaintext, $i, $len - $len % $block_size));
-                        $iv = substr($ciphertext, -$block_size);
-                        $len %= $block_size;
-                    } else {
-                        while ($len >= $block_size) {
-                            $iv = mcrypt_generic($this->ecb, $iv) ^ substr($plaintext, $i, $block_size);
-                            $ciphertext .= $iv;
-                            $len -= $block_size;
-                            $i += $block_size;
-                        }
-                    }
-                }
-
-                if ($len) {
-                    $iv = mcrypt_generic($this->ecb, $iv);
-                    $block = $iv ^ substr($plaintext, -$len);
-                    $iv = substr_replace($iv, $block, 0, $len);
-                    $ciphertext .= $block;
-                    $pos = $len;
-                }
-
-                restore_error_handler();
-
-                return $ciphertext;
-            }
-
-            $ciphertext = mcrypt_generic($this->enmcrypt, $plaintext);
-
-            if (!$this->continuousBuffer) {
-                mcrypt_generic_init($this->enmcrypt, $this->key, $this->getIV($this->encryptIV));
-            }
-
-            restore_error_handler();
-
-            return $ciphertext;
-        }
-
-        if ($this->engine === self::ENGINE_EVAL) {
-            $inline = $this->inline_crypt;
-            return $inline('encrypt', $plaintext);
-        }
-
-        $buffer = &$this->enbuffer;
-        $block_size = $this->block_size;
-        $ciphertext = '';
-        switch ($this->mode) {
-            case self::MODE_ECB:
-                for ($i = 0; $i < strlen($plaintext); $i += $block_size) {
-                    $ciphertext .= $this->encryptBlock(substr($plaintext, $i, $block_size));
-                }
-                break;
-            case self::MODE_CBC:
-                $xor = $this->encryptIV;
-                for ($i = 0; $i < strlen($plaintext); $i += $block_size) {
-                    $block = substr($plaintext, $i, $block_size);
-                    $block = $this->encryptBlock($block ^ $xor);
-                    $xor = $block;
-                    $ciphertext .= $block;
-                }
-                if ($this->continuousBuffer) {
-                    $this->encryptIV = $xor;
-                }
-                break;
-            case self::MODE_CTR:
-                $xor = $this->encryptIV;
-                if (strlen($buffer['ciphertext'])) {
-                    for ($i = 0; $i < strlen($plaintext); $i += $block_size) {
-                        $block = substr($plaintext, $i, $block_size);
-                        if (strlen($block) > strlen($buffer['ciphertext'])) {
-                            $buffer['ciphertext'] .= $this->encryptBlock($xor);
-                            Strings::increment_str($xor);
-                        }
-                        $key = Strings::shift($buffer['ciphertext'], $block_size);
-                        $ciphertext .= $block ^ $key;
-                    }
-                } else {
-                    for ($i = 0; $i < strlen($plaintext); $i += $block_size) {
-                        $block = substr($plaintext, $i, $block_size);
-                        $key = $this->encryptBlock($xor);
-                        Strings::increment_str($xor);
-                        $ciphertext .= $block ^ $key;
-                    }
-                }
-                if ($this->continuousBuffer) {
-                    $this->encryptIV = $xor;
-                    if ($start = strlen($plaintext) % $block_size) {
-                        $buffer['ciphertext'] = substr($key, $start) . $buffer['ciphertext'];
-                    }
-                }
-                break;
-            case self::MODE_CFB:
-                // cfb loosely routines inspired by openssl's:
-                // {@link http://cvs.openssl.org/fileview?f=openssl/crypto/modes/cfb128.c&v=1.3.2.2.2.1}
-                if ($this->continuousBuffer) {
-                    $iv = &$this->encryptIV;
-                    $pos = &$buffer['pos'];
-                } else {
-                    $iv = $this->encryptIV;
-                    $pos = 0;
-                }
-                $len = strlen($plaintext);
-                $i = 0;
-                if ($pos) {
-                    $orig_pos = $pos;
-                    $max = $block_size - $pos;
-                    if ($len >= $max) {
-                        $i = $max;
-                        $len -= $max;
-                        $pos = 0;
-                    } else {
-                        $i = $len;
-                        $pos += $len;
-                        $len = 0;
-                    }
-                    // ie. $i = min($max, $len), $len-= $i, $pos+= $i, $pos%= $blocksize
-                    $ciphertext = substr($iv, $orig_pos) ^ $plaintext;
-                    $iv = substr_replace($iv, $ciphertext, $orig_pos, $i);
-                }
-                while ($len >= $block_size) {
-                    $iv = $this->encryptBlock($iv) ^ substr($plaintext, $i, $block_size);
-                    $ciphertext .= $iv;
-                    $len -= $block_size;
-                    $i += $block_size;
-                }
-                if ($len) {
-                    $iv = $this->encryptBlock($iv);
-                    $block = $iv ^ substr($plaintext, $i);
-                    $iv = substr_replace($iv, $block, 0, $len);
-                    $ciphertext .= $block;
-                    $pos = $len;
-                }
-                break;
-            case self::MODE_CFB8:
-                $ciphertext = '';
-                $len = strlen($plaintext);
-                $iv = $this->encryptIV;
-
-                for ($i = 0; $i < $len; ++$i) {
-                    $ciphertext .= ($c = $plaintext[$i] ^ $this->encryptBlock($iv));
-                    $iv = substr($iv, 1) . $c;
-                }
-
-                if ($this->continuousBuffer) {
-                    if ($len >= $block_size) {
-                        $this->encryptIV = substr($ciphertext, -$block_size);
-                    } else {
-                        $this->encryptIV = substr($this->encryptIV, $len - $block_size) . substr($ciphertext, -$len);
-                    }
-                }
-                break;
-            case self::MODE_OFB8:
-                $ciphertext = '';
-                $len = strlen($plaintext);
-                $iv = $this->encryptIV;
-
-                for ($i = 0; $i < $len; ++$i) {
-                    $xor = $this->encryptBlock($iv);
-                    $ciphertext .= $plaintext[$i] ^ $xor;
-                    $iv = substr($iv, 1) . $xor[0];
-                }
-
-                if ($this->continuousBuffer) {
-                    $this->encryptIV = $iv;
-                }
-                break;
-            case self::MODE_OFB:
-                $xor = $this->encryptIV;
-                if (strlen($buffer['xor'])) {
-                    for ($i = 0; $i < strlen($plaintext); $i += $block_size) {
-                        $block = substr($plaintext, $i, $block_size);
-                        if (strlen($block) > strlen($buffer['xor'])) {
-                            $xor = $this->encryptBlock($xor);
-                            $buffer['xor'] .= $xor;
-                        }
-                        $key = Strings::shift($buffer['xor'], $block_size);
-                        $ciphertext .= $block ^ $key;
-                    }
-                } else {
-                    for ($i = 0; $i < strlen($plaintext); $i += $block_size) {
-                        $xor = $this->encryptBlock($xor);
-                        $ciphertext .= substr($plaintext, $i, $block_size) ^ $xor;
-                    }
-                    $key = $xor;
-                }
-                if ($this->continuousBuffer) {
-                    $this->encryptIV = $xor;
-                    if ($start = strlen($plaintext) % $block_size) {
-                        $buffer['xor'] = substr($key, $start) . $buffer['xor'];
-                    }
-                }
-                break;
-            case self::MODE_STREAM:
-                $ciphertext = $this->encryptBlock($plaintext);
-                break;
-        }
-
-        return $ciphertext;
-    }
-
-    /**
-     * Decrypts a message.
-     *
-     * If strlen($ciphertext) is not a multiple of the block size, null bytes will be added to the end of the string until
-     * it is.
-     *
-     * {@internal Could, but not must, extend by the child Crypt_* class}
-     *
-     * @see self::encrypt()
-     * @param string $ciphertext
-     * @return string $plaintext
-     * @throws \LengthException if we're inside a block cipher and the ciphertext length is not a multiple of the block size
-     */
-    public function decrypt($ciphertext)
-    {
-        if ($this->paddable && strlen($ciphertext) % $this->block_size) {
-            throw new \LengthException('The ciphertext length (' . strlen($ciphertext) . ') needs to be a multiple of the block size (' . $this->block_size . ')');
-        }
-        $this->setup();
-
-        if ($this->mode == self::MODE_GCM || isset($this->poly1305Key)) {
-            if ($this->oldtag === false) {
-                throw new InsufficientSetupException('Authentication Tag has not been set');
-            }
-
-            if (isset($this->poly1305Key)) {
-                $newtag = $this->poly1305($ciphertext);
-            } else {
-                $oldIV = $this->iv;
-                Strings::increment_str($this->iv);
-                $cipher = new static('ctr');
-                $cipher->setKey($this->key);
-                $cipher->setIV($this->iv);
-                $plaintext = $cipher->decrypt($ciphertext);
-
-                $s = $this->ghash(
-                    self::nullPad128($this->aad) .
-                    self::nullPad128($ciphertext) .
-                    self::len64($this->aad) .
-                    self::len64($ciphertext)
-                );
-                $cipher->encryptIV = $this->iv = $this->encryptIV = $this->decryptIV = $oldIV;
-                $newtag = $cipher->encrypt($s);
-            }
-            if ($this->oldtag != substr($newtag, 0, strlen($newtag))) {
-                $cipher = clone $this;
-                unset($cipher->poly1305Key);
-                $this->usePoly1305 = false;
-                $plaintext = $cipher->decrypt($ciphertext);
-                $this->oldtag = false;
-                throw new BadDecryptionException('Derived authentication tag and supplied authentication tag do not match');
-            }
-            $this->oldtag = false;
-            return $plaintext;
-        }
-
-        if ($this->engine === self::ENGINE_OPENSSL) {
-            switch ($this->mode) {
-                case self::MODE_STREAM:
-                    $plaintext = openssl_decrypt($ciphertext, $this->cipher_name_openssl, $this->key, OPENSSL_RAW_DATA | OPENSSL_ZERO_PADDING);
-                    break;
-                case self::MODE_ECB:
-                    $plaintext = openssl_decrypt($ciphertext, $this->cipher_name_openssl, $this->key, OPENSSL_RAW_DATA | OPENSSL_ZERO_PADDING);
-                    break;
-                case self::MODE_CBC:
-                    $offset = $this->block_size;
-                    $plaintext = openssl_decrypt($ciphertext, $this->cipher_name_openssl, $this->key, OPENSSL_RAW_DATA | OPENSSL_ZERO_PADDING, $this->decryptIV);
-                    if ($this->continuousBuffer) {
-                        $this->decryptIV = substr($ciphertext, -$offset, $this->block_size);
-                    }
-                    break;
-                case self::MODE_CTR:
-                    $plaintext = $this->openssl_ctr_process($ciphertext, $this->decryptIV, $this->debuffer);
-                    break;
-                case self::MODE_CFB:
-                    // cfb loosely routines inspired by openssl's:
-                    // {@link http://cvs.openssl.org/fileview?f=openssl/crypto/modes/cfb128.c&v=1.3.2.2.2.1}
-                    $plaintext = '';
-                    if ($this->continuousBuffer) {
-                        $iv = &$this->decryptIV;
-                        $pos = &$this->debuffer['pos'];
-                    } else {
-                        $iv = $this->decryptIV;
-                        $pos = 0;
-                    }
-                    $len = strlen($ciphertext);
-                    $i = 0;
-                    if ($pos) {
-                        $orig_pos = $pos;
-                        $max = $this->block_size - $pos;
-                        if ($len >= $max) {
-                            $i = $max;
-                            $len -= $max;
-                            $pos = 0;
-                        } else {
-                            $i = $len;
-                            $pos += $len;
-                            $len = 0;
-                        }
-                        // ie. $i = min($max, $len), $len-= $i, $pos+= $i, $pos%= $this->blocksize
-                        $plaintext = substr($iv, $orig_pos) ^ $ciphertext;
-                        $iv = substr_replace($iv, substr($ciphertext, 0, $i), $orig_pos, $i);
-                        $ciphertext = substr($ciphertext, $i);
-                    }
-                    $overflow = $len % $this->block_size;
-                    if ($overflow) {
-                        $plaintext .= openssl_decrypt(substr($ciphertext, 0, -$overflow), $this->cipher_name_openssl, $this->key, OPENSSL_RAW_DATA | OPENSSL_ZERO_PADDING, $iv);
-                        if ($len - $overflow) {
-                            $iv = substr($ciphertext, -$overflow - $this->block_size, -$overflow);
-                        }
-                        $iv = openssl_encrypt(str_repeat("\0", $this->block_size), $this->cipher_name_openssl, $this->key, OPENSSL_RAW_DATA | OPENSSL_ZERO_PADDING, $iv);
-                        $plaintext .= $iv ^ substr($ciphertext, -$overflow);
-                        $iv = substr_replace($iv, substr($ciphertext, -$overflow), 0, $overflow);
-                        $pos = $overflow;
-                    } elseif ($len) {
-                        $plaintext .= openssl_decrypt($ciphertext, $this->cipher_name_openssl, $this->key, OPENSSL_RAW_DATA | OPENSSL_ZERO_PADDING, $iv);
-                        $iv = substr($ciphertext, -$this->block_size);
-                    }
-                    break;
-                case self::MODE_CFB8:
-                    $plaintext = openssl_decrypt($ciphertext, $this->cipher_name_openssl, $this->key, OPENSSL_RAW_DATA | OPENSSL_ZERO_PADDING, $this->decryptIV);
-                    if ($this->continuousBuffer) {
-                        if (($len = strlen($ciphertext)) >= $this->block_size) {
-                            $this->decryptIV = substr($ciphertext, -$this->block_size);
-                        } else {
-                            $this->decryptIV = substr($this->decryptIV, $len - $this->block_size) . substr($ciphertext, -$len);
-                        }
-                    }
-                    break;
-                case self::MODE_OFB8:
-                    $plaintext = '';
-                    $len = strlen($ciphertext);
-                    $iv = $this->decryptIV;
-
-                    for ($i = 0; $i < $len; ++$i) {
-                        $xor = openssl_encrypt($iv, $this->cipher_name_openssl_ecb, $this->key, $this->openssl_options, $this->decryptIV);
-                        $plaintext .= $ciphertext[$i] ^ $xor;
-                        $iv = substr($iv, 1) . $xor[0];
-                    }
-
-                    if ($this->continuousBuffer) {
-                        $this->decryptIV = $iv;
-                    }
-                    break;
-                case self::MODE_OFB:
-                    $plaintext = $this->openssl_ofb_process($ciphertext, $this->decryptIV, $this->debuffer);
-            }
-
-            return $this->paddable ? $this->unpad($plaintext) : $plaintext;
-        }
-
-        if ($this->engine === self::ENGINE_MCRYPT) {
-            set_error_handler(function () {
-            });
-            $block_size = $this->block_size;
-            if ($this->dechanged) {
-                mcrypt_generic_init($this->demcrypt, $this->key, $this->getIV($this->decryptIV));
-                $this->dechanged = false;
-            }
-
-            if ($this->mode == self::MODE_CFB && $this->continuousBuffer) {
-                $iv = &$this->decryptIV;
-                $pos = &$this->debuffer['pos'];
-                $len = strlen($ciphertext);
-                $plaintext = '';
-                $i = 0;
-                if ($pos) {
-                    $orig_pos = $pos;
-                    $max = $block_size - $pos;
-                    if ($len >= $max) {
-                        $i = $max;
-                        $len -= $max;
-                        $pos = 0;
-                    } else {
-                        $i = $len;
-                        $pos += $len;
-                        $len = 0;
-                    }
-                    // ie. $i = min($max, $len), $len-= $i, $pos+= $i, $pos%= $blocksize
-                    $plaintext = substr($iv, $orig_pos) ^ $ciphertext;
-                    $iv = substr_replace($iv, substr($ciphertext, 0, $i), $orig_pos, $i);
-                }
-                if ($len >= $block_size) {
-                    $cb = substr($ciphertext, $i, $len - $len % $block_size);
-                    $plaintext .= mcrypt_generic($this->ecb, $iv . $cb) ^ $cb;
-                    $iv = substr($cb, -$block_size);
-                    $len %= $block_size;
-                }
-                if ($len) {
-                    $iv = mcrypt_generic($this->ecb, $iv);
-                    $plaintext .= $iv ^ substr($ciphertext, -$len);
-                    $iv = substr_replace($iv, substr($ciphertext, -$len), 0, $len);
-                    $pos = $len;
-                }
-
-                restore_error_handler();
-
-                return $plaintext;
-            }
-
-            $plaintext = mdecrypt_generic($this->demcrypt, $ciphertext);
-
-            if (!$this->continuousBuffer) {
-                mcrypt_generic_init($this->demcrypt, $this->key, $this->getIV($this->decryptIV));
-            }
-
-            restore_error_handler();
-
-            return $this->paddable ? $this->unpad($plaintext) : $plaintext;
-        }
-
-        if ($this->engine === self::ENGINE_EVAL) {
-            $inline = $this->inline_crypt;
-            return $inline('decrypt', $ciphertext);
-        }
-
-        $block_size = $this->block_size;
-
-        $buffer = &$this->debuffer;
-        $plaintext = '';
-        switch ($this->mode) {
-            case self::MODE_ECB:
-                for ($i = 0; $i < strlen($ciphertext); $i += $block_size) {
-                    $plaintext .= $this->decryptBlock(substr($ciphertext, $i, $block_size));
-                }
-                break;
-            case self::MODE_CBC:
-                $xor = $this->decryptIV;
-                for ($i = 0; $i < strlen($ciphertext); $i += $block_size) {
-                    $block = substr($ciphertext, $i, $block_size);
-                    $plaintext .= $this->decryptBlock($block) ^ $xor;
-                    $xor = $block;
-                }
-                if ($this->continuousBuffer) {
-                    $this->decryptIV = $xor;
-                }
-                break;
-            case self::MODE_CTR:
-                $xor = $this->decryptIV;
-                if (strlen($buffer['ciphertext'])) {
-                    for ($i = 0; $i < strlen($ciphertext); $i += $block_size) {
-                        $block = substr($ciphertext, $i, $block_size);
-                        if (strlen($block) > strlen($buffer['ciphertext'])) {
-                            $buffer['ciphertext'] .= $this->encryptBlock($xor);
-                            Strings::increment_str($xor);
-                        }
-                        $key = Strings::shift($buffer['ciphertext'], $block_size);
-                        $plaintext .= $block ^ $key;
-                    }
-                } else {
-                    for ($i = 0; $i < strlen($ciphertext); $i += $block_size) {
-                        $block = substr($ciphertext, $i, $block_size);
-                        $key = $this->encryptBlock($xor);
-                        Strings::increment_str($xor);
-                        $plaintext .= $block ^ $key;
-                    }
-                }
-                if ($this->continuousBuffer) {
-                    $this->decryptIV = $xor;
-                    if ($start = strlen($ciphertext) % $block_size) {
-                        $buffer['ciphertext'] = substr($key, $start) . $buffer['ciphertext'];
-                    }
-                }
-                break;
-            case self::MODE_CFB:
-                if ($this->continuousBuffer) {
-                    $iv = &$this->decryptIV;
-                    $pos = &$buffer['pos'];
-                } else {
-                    $iv = $this->decryptIV;
-                    $pos = 0;
-                }
-                $len = strlen($ciphertext);
-                $i = 0;
-                if ($pos) {
-                    $orig_pos = $pos;
-                    $max = $block_size - $pos;
-                    if ($len >= $max) {
-                        $i = $max;
-                        $len -= $max;
-                        $pos = 0;
-                    } else {
-                        $i = $len;
-                        $pos += $len;
-                        $len = 0;
-                    }
-                    // ie. $i = min($max, $len), $len-= $i, $pos+= $i, $pos%= $blocksize
-                    $plaintext = substr($iv, $orig_pos) ^ $ciphertext;
-                    $iv = substr_replace($iv, substr($ciphertext, 0, $i), $orig_pos, $i);
-                }
-                while ($len >= $block_size) {
-                    $iv = $this->encryptBlock($iv);
-                    $cb = substr($ciphertext, $i, $block_size);
-                    $plaintext .= $iv ^ $cb;
-                    $iv = $cb;
-                    $len -= $block_size;
-                    $i += $block_size;
-                }
-                if ($len) {
-                    $iv = $this->encryptBlock($iv);
-                    $plaintext .= $iv ^ substr($ciphertext, $i);
-                    $iv = substr_replace($iv, substr($ciphertext, $i), 0, $len);
-                    $pos = $len;
-                }
-                break;
-            case self::MODE_CFB8:
-                $plaintext = '';
-                $len = strlen($ciphertext);
-                $iv = $this->decryptIV;
-
-                for ($i = 0; $i < $len; ++$i) {
-                    $plaintext .= $ciphertext[$i] ^ $this->encryptBlock($iv);
-                    $iv = substr($iv, 1) . $ciphertext[$i];
-                }
-
-                if ($this->continuousBuffer) {
-                    if ($len >= $block_size) {
-                        $this->decryptIV = substr($ciphertext, -$block_size);
-                    } else {
-                        $this->decryptIV = substr($this->decryptIV, $len - $block_size) . substr($ciphertext, -$len);
-                    }
-                }
-                break;
-            case self::MODE_OFB8:
-                $plaintext = '';
-                $len = strlen($ciphertext);
-                $iv = $this->decryptIV;
-
-                for ($i = 0; $i < $len; ++$i) {
-                    $xor = $this->encryptBlock($iv);
-                    $plaintext .= $ciphertext[$i] ^ $xor;
-                    $iv = substr($iv, 1) . $xor[0];
-                }
-
-                if ($this->continuousBuffer) {
-                    $this->decryptIV = $iv;
-                }
-                break;
-            case self::MODE_OFB:
-                $xor = $this->decryptIV;
-                if (strlen($buffer['xor'])) {
-                    for ($i = 0; $i < strlen($ciphertext); $i += $block_size) {
-                        $block = substr($ciphertext, $i, $block_size);
-                        if (strlen($block) > strlen($buffer['xor'])) {
-                            $xor = $this->encryptBlock($xor);
-                            $buffer['xor'] .= $xor;
-                        }
-                        $key = Strings::shift($buffer['xor'], $block_size);
-                        $plaintext .= $block ^ $key;
-                    }
-                } else {
-                    for ($i = 0; $i < strlen($ciphertext); $i += $block_size) {
-                        $xor = $this->encryptBlock($xor);
-                        $plaintext .= substr($ciphertext, $i, $block_size) ^ $xor;
-                    }
-                    $key = $xor;
-                }
-                if ($this->continuousBuffer) {
-                    $this->decryptIV = $xor;
-                    if ($start = strlen($ciphertext) % $block_size) {
-                        $buffer['xor'] = substr($key, $start) . $buffer['xor'];
-                    }
-                }
-                break;
-            case self::MODE_STREAM:
-                $plaintext = $this->decryptBlock($ciphertext);
-                break;
-        }
-        return $this->paddable ? $this->unpad($plaintext) : $plaintext;
-    }
-
-    /**
-     * Get the authentication tag
-     *
-     * Only used in GCM or Poly1305 mode
-     *
-     * @see self::encrypt()
-     * @param int $length optional
-     * @return string
-     * @throws \LengthException if $length isn't of a sufficient length
-     * @throws \RuntimeException if GCM mode isn't being used
-     */
-    public function getTag($length = 16)
-    {
-        if ($this->mode != self::MODE_GCM && !$this->usePoly1305) {
-            throw new \BadMethodCallException('Authentication tags are only utilized in GCM mode or with Poly1305');
-        }
-
-        if ($this->newtag === false) {
-            throw new \BadMethodCallException('A tag can only be returned after a round of encryption has been performed');
-        }
-
-        // the tag is 128-bits. it can't be greater than 16 bytes because that's bigger than the tag is. if it
-        // were 0 you might as well be doing CTR and less than 4 provides minimal security that could be trivially
-        // easily brute forced.
-        // see https://nvlpubs.nist.gov/nistpubs/Legacy/SP/nistspecialpublication800-38d.pdf#page=36
-        // for more info
-        if ($length < 4 || $length > 16) {
-            throw new \LengthException('The authentication tag must be between 4 and 16 bytes long');
-        }
-
-        return $length == 16 ?
-            $this->newtag :
-            substr($this->newtag, 0, $length);
-    }
-
-    /**
-     * Sets the authentication tag
-     *
-     * Only used in GCM mode
-     *
-     * @see self::decrypt()
-     * @param string $tag
-     * @throws \LengthException if $length isn't of a sufficient length
-     * @throws \RuntimeException if GCM mode isn't being used
-     */
-    public function setTag($tag)
-    {
-        if ($this->usePoly1305 && !isset($this->poly1305Key) && method_exists($this, 'createPoly1305Key')) {
-            $this->createPoly1305Key();
-        }
-
-        if ($this->mode != self::MODE_GCM && !$this->usePoly1305) {
-            throw new \BadMethodCallException('Authentication tags are only utilized in GCM mode or with Poly1305');
-        }
-
-        $length = strlen($tag);
-        if ($length < 4 || $length > 16) {
-            throw new \LengthException('The authentication tag must be between 4 and 16 bytes long');
-        }
-        $this->oldtag = $tag;
-    }
-
-    /**
-     * Get the IV
-     *
-     * mcrypt requires an IV even if ECB is used
-     *
-     * @see self::encrypt()
-     * @see self::decrypt()
-     * @param string $iv
-     * @return string
-     */
-    protected function getIV($iv)
-    {
-        return $this->mode == self::MODE_ECB ? str_repeat("\0", $this->block_size) : $iv;
-    }
-
-    /**
-     * OpenSSL CTR Processor
-     *
-     * PHP's OpenSSL bindings do not operate in continuous mode so we'll wrap around it. Since the keystream
-     * for CTR is the same for both encrypting and decrypting this function is re-used by both SymmetricKey::encrypt()
-     * and SymmetricKey::decrypt(). Also, OpenSSL doesn't implement CTR for all of it's symmetric ciphers so this
-     * function will emulate CTR with ECB when necessary.
-     *
-     * @see self::encrypt()
-     * @see self::decrypt()
-     * @param string $plaintext
-     * @param string $encryptIV
-     * @param array $buffer
-     * @return string
-     */
-    private function openssl_ctr_process($plaintext, &$encryptIV, &$buffer)
-    {
-        $ciphertext = '';
-
-        $block_size = $this->block_size;
-        $key = $this->key;
-
-        if ($this->openssl_emulate_ctr) {
-            $xor = $encryptIV;
-            if (strlen($buffer['ciphertext'])) {
-                for ($i = 0; $i < strlen($plaintext); $i += $block_size) {
-                    $block = substr($plaintext, $i, $block_size);
-                    if (strlen($block) > strlen($buffer['ciphertext'])) {
-                        $buffer['ciphertext'] .= openssl_encrypt($xor, $this->cipher_name_openssl_ecb, $key, OPENSSL_RAW_DATA | OPENSSL_ZERO_PADDING);
-                    }
-                    Strings::increment_str($xor);
-                    $otp = Strings::shift($buffer['ciphertext'], $block_size);
-                    $ciphertext .= $block ^ $otp;
-                }
-            } else {
-                for ($i = 0; $i < strlen($plaintext); $i += $block_size) {
-                    $block = substr($plaintext, $i, $block_size);
-                    $otp = openssl_encrypt($xor, $this->cipher_name_openssl_ecb, $key, OPENSSL_RAW_DATA | OPENSSL_ZERO_PADDING);
-                    Strings::increment_str($xor);
-                    $ciphertext .= $block ^ $otp;
-                }
-            }
-            if ($this->continuousBuffer) {
-                $encryptIV = $xor;
-                if ($start = strlen($plaintext) % $block_size) {
-                    $buffer['ciphertext'] = substr($key, $start) . $buffer['ciphertext'];
-                }
-            }
-
-            return $ciphertext;
-        }
-
-        if (strlen($buffer['ciphertext'])) {
-            $ciphertext = $plaintext ^ Strings::shift($buffer['ciphertext'], strlen($plaintext));
-            $plaintext = substr($plaintext, strlen($ciphertext));
-
-            if (!strlen($plaintext)) {
-                return $ciphertext;
-            }
-        }
-
-        $overflow = strlen($plaintext) % $block_size;
-        if ($overflow) {
-            $plaintext2 = Strings::pop($plaintext, $overflow); // ie. trim $plaintext to a multiple of $block_size and put rest of $plaintext in $plaintext2
-            $encrypted = openssl_encrypt($plaintext . str_repeat("\0", $block_size), $this->cipher_name_openssl, $key, OPENSSL_RAW_DATA | OPENSSL_ZERO_PADDING, $encryptIV);
-            $temp = Strings::pop($encrypted, $block_size);
-            $ciphertext .= $encrypted . ($plaintext2 ^ $temp);
-            if ($this->continuousBuffer) {
-                $buffer['ciphertext'] = substr($temp, $overflow);
-                $encryptIV = $temp;
-            }
-        } elseif (!strlen($buffer['ciphertext'])) {
-            $ciphertext .= openssl_encrypt($plaintext . str_repeat("\0", $block_size), $this->cipher_name_openssl, $key, OPENSSL_RAW_DATA | OPENSSL_ZERO_PADDING, $encryptIV);
-            $temp = Strings::pop($ciphertext, $block_size);
-            if ($this->continuousBuffer) {
-                $encryptIV = $temp;
-            }
-        }
-        if ($this->continuousBuffer) {
-            $encryptIV = openssl_decrypt($encryptIV, $this->cipher_name_openssl_ecb, $key, OPENSSL_RAW_DATA | OPENSSL_ZERO_PADDING);
-            if ($overflow) {
-                Strings::increment_str($encryptIV);
-            }
-        }
-
-        return $ciphertext;
-    }
-
-    /**
-     * OpenSSL OFB Processor
-     *
-     * PHP's OpenSSL bindings do not operate in continuous mode so we'll wrap around it. Since the keystream
-     * for OFB is the same for both encrypting and decrypting this function is re-used by both SymmetricKey::encrypt()
-     * and SymmetricKey::decrypt().
-     *
-     * @see self::encrypt()
-     * @see self::decrypt()
-     * @param string $plaintext
-     * @param string $encryptIV
-     * @param array $buffer
-     * @return string
-     */
-    private function openssl_ofb_process($plaintext, &$encryptIV, &$buffer)
-    {
-        if (strlen($buffer['xor'])) {
-            $ciphertext = $plaintext ^ $buffer['xor'];
-            $buffer['xor'] = substr($buffer['xor'], strlen($ciphertext));
-            $plaintext = substr($plaintext, strlen($ciphertext));
-        } else {
-            $ciphertext = '';
-        }
-
-        $block_size = $this->block_size;
-
-        $len = strlen($plaintext);
-        $key = $this->key;
-        $overflow = $len % $block_size;
-
-        if (strlen($plaintext)) {
-            if ($overflow) {
-                $ciphertext .= openssl_encrypt(substr($plaintext, 0, -$overflow) . str_repeat("\0", $block_size), $this->cipher_name_openssl, $key, OPENSSL_RAW_DATA | OPENSSL_ZERO_PADDING, $encryptIV);
-                $xor = Strings::pop($ciphertext, $block_size);
-                if ($this->continuousBuffer) {
-                    $encryptIV = $xor;
-                }
-                $ciphertext .= Strings::shift($xor, $overflow) ^ substr($plaintext, -$overflow);
-                if ($this->continuousBuffer) {
-                    $buffer['xor'] = $xor;
-                }
-            } else {
-                $ciphertext = openssl_encrypt($plaintext, $this->cipher_name_openssl, $key, OPENSSL_RAW_DATA | OPENSSL_ZERO_PADDING, $encryptIV);
-                if ($this->continuousBuffer) {
-                    $encryptIV = substr($ciphertext, -$block_size) ^ substr($plaintext, -$block_size);
-                }
-            }
-        }
-
-        return $ciphertext;
-    }
-
-    /**
-     * phpseclib <-> OpenSSL Mode Mapper
-     *
-     * May need to be overwritten by classes extending this one in some cases
-     *
-     * @return string
-     */
-    protected function openssl_translate_mode()
-    {
-        switch ($this->mode) {
-            case self::MODE_ECB:
-                return 'ecb';
-            case self::MODE_CBC:
-                return 'cbc';
-            case self::MODE_CTR:
-            case self::MODE_GCM:
-                return 'ctr';
-            case self::MODE_CFB:
-                return 'cfb';
-            case self::MODE_CFB8:
-                return 'cfb8';
-            case self::MODE_OFB:
-                return 'ofb';
-        }
-    }
-
-    /**
-     * Pad "packets".
-     *
-     * Block ciphers working by encrypting between their specified [$this->]block_size at a time
-     * If you ever need to encrypt or decrypt something that isn't of the proper length, it becomes necessary to
-     * pad the input so that it is of the proper length.
-     *
-     * Padding is enabled by default.  Sometimes, however, it is undesirable to pad strings.  Such is the case in SSH,
-     * where "packets" are padded with random bytes before being encrypted.  Unpad these packets and you risk stripping
-     * away characters that shouldn't be stripped away. (SSH knows how many bytes are added because the length is
-     * transmitted separately)
-     *
-     * @see self::disablePadding()
-     */
-    public function enablePadding()
-    {
-        $this->padding = true;
-    }
-
-    /**
-     * Do not pad packets.
-     *
-     * @see self::enablePadding()
-     */
-    public function disablePadding()
-    {
-        $this->padding = false;
-    }
-
-    /**
-     * Treat consecutive "packets" as if they are a continuous buffer.
-     *
-     * Say you have a 32-byte plaintext $plaintext.  Using the default behavior, the two following code snippets
-     * will yield different outputs:
-     *
-     * <code>
-     *    echo $rijndael->encrypt(substr($plaintext,  0, 16));
-     *    echo $rijndael->encrypt(substr($plaintext, 16, 16));
-     * </code>
-     * <code>
-     *    echo $rijndael->encrypt($plaintext);
-     * </code>
-     *
-     * The solution is to enable the continuous buffer.  Although this will resolve the above discrepancy, it creates
-     * another, as demonstrated with the following:
-     *
-     * <code>
-     *    $rijndael->encrypt(substr($plaintext, 0, 16));
-     *    echo $rijndael->decrypt($rijndael->encrypt(substr($plaintext, 16, 16)));
-     * </code>
-     * <code>
-     *    echo $rijndael->decrypt($rijndael->encrypt(substr($plaintext, 16, 16)));
-     * </code>
-     *
-     * With the continuous buffer disabled, these would yield the same output.  With it enabled, they yield different
-     * outputs.  The reason is due to the fact that the initialization vector's change after every encryption /
-     * decryption round when the continuous buffer is enabled.  When it's disabled, they remain constant.
-     *
-     * Put another way, when the continuous buffer is enabled, the state of the \phpseclib3\Crypt\*() object changes after each
-     * encryption / decryption round, whereas otherwise, it'd remain constant.  For this reason, it's recommended that
-     * continuous buffers not be used.  They do offer better security and are, in fact, sometimes required (SSH uses them),
-     * however, they are also less intuitive and more likely to cause you problems.
-     *
-     * {@internal Could, but not must, extend by the child Crypt_* class}
-     *
-     * @see self::disableContinuousBuffer()
-     */
-    public function enableContinuousBuffer()
-    {
-        if ($this->mode == self::MODE_ECB) {
-            return;
-        }
-
-        if ($this->mode == self::MODE_GCM) {
-            throw new \BadMethodCallException('This mode does not run in continuous mode');
-        }
-
-        $this->continuousBuffer = true;
-
-        $this->setEngine();
-    }
-
-    /**
-     * Treat consecutive packets as if they are a discontinuous buffer.
-     *
-     * The default behavior.
-     *
-     * {@internal Could, but not must, extend by the child Crypt_* class}
-     *
-     * @see self::enableContinuousBuffer()
-     */
-    public function disableContinuousBuffer()
-    {
-        if ($this->mode == self::MODE_ECB) {
-            return;
-        }
-        if (!$this->continuousBuffer) {
-            return;
-        }
-
-        $this->continuousBuffer = false;
-
-        $this->setEngine();
-    }
-
-    /**
-     * Test for engine validity
-     *
-     * @see self::__construct()
-     * @param int $engine
-     * @return bool
-     */
-    protected function isValidEngineHelper($engine)
-    {
-        switch ($engine) {
-            case self::ENGINE_OPENSSL:
-                $this->openssl_emulate_ctr = false;
-                $result = $this->cipher_name_openssl &&
-                          extension_loaded('openssl');
-                if (!$result) {
-                    return false;
-                }
-
-                $methods = openssl_get_cipher_methods();
-                if (in_array($this->cipher_name_openssl, $methods)) {
-                    return true;
-                }
-                // not all of openssl's symmetric cipher's support ctr. for those
-                // that don't we'll emulate it
-                switch ($this->mode) {
-                    case self::MODE_CTR:
-                        if (in_array($this->cipher_name_openssl_ecb, $methods)) {
-                            $this->openssl_emulate_ctr = true;
-                            return true;
-                        }
-                }
-                return false;
-            case self::ENGINE_MCRYPT:
-                set_error_handler(function () {
-                });
-                $result = $this->cipher_name_mcrypt &&
-                          extension_loaded('mcrypt') &&
-                          in_array($this->cipher_name_mcrypt, mcrypt_list_algorithms());
-                restore_error_handler();
-                return $result;
-            case self::ENGINE_EVAL:
-                return method_exists($this, 'setupInlineCrypt');
-            case self::ENGINE_INTERNAL:
-                return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Test for engine validity
-     *
-     * @see self::__construct()
-     * @param string $engine
-     * @return bool
-     */
-    public function isValidEngine($engine)
-    {
-        static $reverseMap;
-        if (!isset($reverseMap)) {
-            $reverseMap = array_map('strtolower', self::ENGINE_MAP);
-            $reverseMap = array_flip($reverseMap);
-        }
-        $engine = strtolower($engine);
-        if (!isset($reverseMap[$engine])) {
-            return false;
-        }
-
-        return $this->isValidEngineHelper($reverseMap[$engine]);
-    }
-
-    /**
-     * Sets the preferred crypt engine
-     *
-     * Currently, $engine could be:
-     *
-     * - libsodium[very fast]
-     *
-     * - OpenSSL  [very fast]
-     *
-     * - mcrypt   [fast]
-     *
-     * - Eval     [slow]
-     *
-     * - PHP      [slowest]
-     *
-     * If the preferred crypt engine is not available the fastest available one will be used
-     *
-     * @see self::__construct()
-     * @param string $engine
-     */
-    public function setPreferredEngine($engine)
-    {
-        static $reverseMap;
-        if (!isset($reverseMap)) {
-            $reverseMap = array_map('strtolower', self::ENGINE_MAP);
-            $reverseMap = array_flip($reverseMap);
-        }
-        $engine = is_string($engine) ? strtolower($engine) : '';
-        $this->preferredEngine = isset($reverseMap[$engine]) ? $reverseMap[$engine] : self::ENGINE_LIBSODIUM;
-
-        $this->setEngine();
-    }
-
-    /**
-     * Returns the engine currently being utilized
-     *
-     * @see self::setEngine()
-     */
-    public function getEngine()
-    {
-        return self::ENGINE_MAP[$this->engine];
-    }
-
-    /**
-     * Sets the engine as appropriate
-     *
-     * @see self::__construct()
-     */
-    protected function setEngine()
-    {
-        $this->engine = null;
-
-        $candidateEngines = [
-            self::ENGINE_LIBSODIUM,
-            self::ENGINE_OPENSSL_GCM,
-            self::ENGINE_OPENSSL,
-            self::ENGINE_MCRYPT,
-            self::ENGINE_EVAL
-        ];
-        if (isset($this->preferredEngine)) {
-            $temp = [$this->preferredEngine];
-            $candidateEngines = array_merge(
-                $temp,
-                array_diff($candidateEngines, $temp)
-            );
-        }
-        foreach ($candidateEngines as $engine) {
-            if ($this->isValidEngineHelper($engine)) {
-                $this->engine = $engine;
-                break;
-            }
-        }
-        if (!$this->engine) {
-            $this->engine = self::ENGINE_INTERNAL;
-        }
-
-        if ($this->engine != self::ENGINE_MCRYPT && $this->enmcrypt) {
-            set_error_handler(function () {
-            });
-            // Closing the current mcrypt resource(s). _mcryptSetup() will, if needed,
-            // (re)open them with the module named in $this->cipher_name_mcrypt
-            mcrypt_module_close($this->enmcrypt);
-            mcrypt_module_close($this->demcrypt);
-            $this->enmcrypt = null;
-            $this->demcrypt = null;
-
-            if ($this->ecb) {
-                mcrypt_module_close($this->ecb);
-                $this->ecb = null;
-            }
-            restore_error_handler();
-        }
-
-        $this->changed = $this->nonIVChanged = true;
-    }
-
-    /**
-     * Encrypts a block
-     *
-     * Note: Must be extended by the child \phpseclib3\Crypt\* class
-     *
-     * @param string $in
-     * @return string
-     */
-    abstract protected function encryptBlock($in);
-
-    /**
-     * Decrypts a block
-     *
-     * Note: Must be extended by the child \phpseclib3\Crypt\* class
-     *
-     * @param string $in
-     * @return string
-     */
-    abstract protected function decryptBlock($in);
-
-    /**
-     * Setup the key (expansion)
-     *
-     * Only used if $engine == self::ENGINE_INTERNAL
-     *
-     * Note: Must extend by the child \phpseclib3\Crypt\* class
-     *
-     * @see self::setup()
-     */
-    abstract protected function setupKey();
-
-    /**
-     * Setup the self::ENGINE_INTERNAL $engine
-     *
-     * (re)init, if necessary, the internal cipher $engine and flush all $buffers
-     * Used (only) if $engine == self::ENGINE_INTERNAL
-     *
-     * _setup() will be called each time if $changed === true
-     * typically this happens when using one or more of following public methods:
-     *
-     * - setKey()
-     *
-     * - setIV()
-     *
-     * - disableContinuousBuffer()
-     *
-     * - First run of encrypt() / decrypt() with no init-settings
-     *
-     * {@internal setup() is always called before en/decryption.}
-     *
-     * {@internal Could, but not must, extend by the child Crypt_* class}
-     *
-     * @see self::setKey()
-     * @see self::setIV()
-     * @see self::disableContinuousBuffer()
-     */
-    protected function setup()
-    {
-        if (!$this->changed) {
-            return;
-        }
-
-        $this->changed = false;
-
-        if ($this->usePoly1305 && !isset($this->poly1305Key) && method_exists($this, 'createPoly1305Key')) {
-            $this->createPoly1305Key();
-        }
-
-        $this->enbuffer = $this->debuffer = ['ciphertext' => '', 'xor' => '', 'pos' => 0, 'enmcrypt_init' => true];
-        //$this->newtag = $this->oldtag = false;
-
-        if ($this->usesNonce()) {
-            if ($this->nonce === false) {
-                throw new InsufficientSetupException('No nonce has been defined');
-            }
-            if ($this->mode == self::MODE_GCM && !in_array($this->engine, [self::ENGINE_LIBSODIUM, self::ENGINE_OPENSSL_GCM])) {
-                $this->setupGCM();
-            }
-        } else {
-            $this->iv = $this->origIV;
-        }
-
-        if ($this->iv === false && !in_array($this->mode, [self::MODE_STREAM, self::MODE_ECB])) {
-            if ($this->mode != self::MODE_GCM || !in_array($this->engine, [self::ENGINE_LIBSODIUM, self::ENGINE_OPENSSL_GCM])) {
-                throw new InsufficientSetupException('No IV has been defined');
-            }
-        }
-
-        if ($this->key === false) {
-            throw new InsufficientSetupException('No key has been defined');
-        }
-
-        $this->encryptIV = $this->decryptIV = $this->iv;
-
-        switch ($this->engine) {
-            case self::ENGINE_MCRYPT:
-                $this->enchanged = $this->dechanged = true;
-
-                set_error_handler(function () {
-                });
-
-                if (!isset($this->enmcrypt)) {
-                    static $mcrypt_modes = [
-                        self::MODE_CTR    => 'ctr',
-                        self::MODE_ECB    => MCRYPT_MODE_ECB,
-                        self::MODE_CBC    => MCRYPT_MODE_CBC,
-                        self::MODE_CFB    => 'ncfb',
-                        self::MODE_CFB8   => MCRYPT_MODE_CFB,
-                        self::MODE_OFB    => MCRYPT_MODE_NOFB,
-                        self::MODE_OFB8   => MCRYPT_MODE_OFB,
-                        self::MODE_STREAM => MCRYPT_MODE_STREAM,
-                    ];
-
-                    $this->demcrypt = mcrypt_module_open($this->cipher_name_mcrypt, '', $mcrypt_modes[$this->mode], '');
-                    $this->enmcrypt = mcrypt_module_open($this->cipher_name_mcrypt, '', $mcrypt_modes[$this->mode], '');
-
-                    // we need the $ecb mcrypt resource (only) in MODE_CFB with enableContinuousBuffer()
-                    // to workaround mcrypt's broken ncfb implementation in buffered mode
-                    // see: {@link http://phpseclib.sourceforge.net/cfb-demo.phps}
-                    if ($this->mode == self::MODE_CFB) {
-                        $this->ecb = mcrypt_module_open($this->cipher_name_mcrypt, '', MCRYPT_MODE_ECB, '');
-                    }
-                } // else should mcrypt_generic_deinit be called?
-
-                if ($this->mode == self::MODE_CFB) {
-                    mcrypt_generic_init($this->ecb, $this->key, str_repeat("\0", $this->block_size));
-                }
-
-                restore_error_handler();
-
-                break;
-            case self::ENGINE_INTERNAL:
-                $this->setupKey();
-                break;
-            case self::ENGINE_EVAL:
-                if ($this->nonIVChanged) {
-                    $this->setupKey();
-                    $this->setupInlineCrypt();
-                }
-        }
-
-        $this->nonIVChanged = false;
-    }
-
-    /**
-     * Pads a string
-     *
-     * Pads a string using the RSA PKCS padding standards so that its length is a multiple of the blocksize.
-     * $this->block_size - (strlen($text) % $this->block_size) bytes are added, each of which is equal to
-     * chr($this->block_size - (strlen($text) % $this->block_size)
-     *
-     * If padding is disabled and $text is not a multiple of the blocksize, the string will be padded regardless
-     * and padding will, hence forth, be enabled.
-     *
-     * @see self::unpad()
-     * @param string $text
-     * @throws \LengthException if padding is disabled and the plaintext's length is not a multiple of the block size
-     * @return string
-     */
-    protected function pad($text)
-    {
-        $length = strlen($text);
-
-        if (!$this->padding) {
-            if ($length % $this->block_size == 0) {
-                return $text;
-            } else {
-                throw new \LengthException("The plaintext's length ($length) is not a multiple of the block size ({$this->block_size}). Try enabling padding.");
-            }
-        }
-
-        $pad = $this->block_size - ($length % $this->block_size);
-
-        return str_pad($text, $length + $pad, chr($pad));
-    }
-
-    /**
-     * Unpads a string.
-     *
-     * If padding is enabled and the reported padding length is invalid the encryption key will be assumed to be wrong
-     * and false will be returned.
-     *
-     * @see self::pad()
-     * @param string $text
-     * @throws \LengthException if the ciphertext's length is not a multiple of the block size
-     * @return string
-     */
-    protected function unpad($text)
-    {
-        if (!$this->padding) {
-            return $text;
-        }
-
-        $length = ord($text[strlen($text) - 1]);
-
-        if (!$length || $length > $this->block_size) {
-            throw new BadDecryptionException("The ciphertext has an invalid padding length ($length) compared to the block size ({$this->block_size})");
-        }
-
-        return substr($text, 0, -$length);
-    }
-
-    /**
-     * Setup the performance-optimized function for de/encrypt()
-     *
-     * Stores the created (or existing) callback function-name
-     * in $this->inline_crypt
-     *
-     * Internally for phpseclib developers:
-     *
-     *     _setupInlineCrypt() would be called only if:
-     *
-     *     - $this->engine === self::ENGINE_EVAL
-     *
-     *     - each time on _setup(), after(!) _setupKey()
-     *
-     *
-     *     This ensures that _setupInlineCrypt() has always a
-     *     full ready2go initializated internal cipher $engine state
-     *     where, for example, the keys already expanded,
-     *     keys/block_size calculated and such.
-     *
-     *     It is, each time if called, the responsibility of _setupInlineCrypt():
-     *
-     *     - to set $this->inline_crypt to a valid and fully working callback function
-     *       as a (faster) replacement for encrypt() / decrypt()
-     *
-     *     - NOT to create unlimited callback functions (for memory reasons!)
-     *       no matter how often _setupInlineCrypt() would be called. At some
-     *       point of amount they must be generic re-useable.
-     *
-     *     - the code of _setupInlineCrypt() it self,
-     *       and the generated callback code,
-     *       must be, in following order:
-     *       - 100% safe
-     *       - 100% compatible to encrypt()/decrypt()
-     *       - using only php5+ features/lang-constructs/php-extensions if
-     *         compatibility (down to php4) or fallback is provided
-     *       - readable/maintainable/understandable/commented and... not-cryptic-styled-code :-)
-     *       - >= 10% faster than encrypt()/decrypt() [which is, by the way,
-     *         the reason for the existence of _setupInlineCrypt() :-)]
-     *       - memory-nice
-     *       - short (as good as possible)
-     *
-     * Note: - _setupInlineCrypt() is using _createInlineCryptFunction() to create the full callback function code.
-     *       - In case of using inline crypting, _setupInlineCrypt() must extend by the child \phpseclib3\Crypt\* class.
-     *       - The following variable names are reserved:
-     *         - $_*  (all variable names prefixed with an underscore)
-     *         - $self (object reference to it self. Do not use $this, but $self instead)
-     *         - $in (the content of $in has to en/decrypt by the generated code)
-     *       - The callback function should not use the 'return' statement, but en/decrypt'ing the content of $in only
-     *
-     * {@internal If a Crypt_* class providing inline crypting it must extend _setupInlineCrypt()}
-     *
-     * @see self::setup()
-     * @see self::createInlineCryptFunction()
-     * @see self::encrypt()
-     * @see self::decrypt()
-     */
-    //protected function setupInlineCrypt();
-
-    /**
-     * Creates the performance-optimized function for en/decrypt()
-     *
-     * Internally for phpseclib developers:
-     *
-     *    _createInlineCryptFunction():
-     *
-     *    - merge the $cipher_code [setup'ed by _setupInlineCrypt()]
-     *      with the current [$this->]mode of operation code
-     *
-     *    - create the $inline function, which called by encrypt() / decrypt()
-     *      as its replacement to speed up the en/decryption operations.
-     *
-     *    - return the name of the created $inline callback function
-     *
-     *    - used to speed up en/decryption
-     *
-     *
-     *
-     *    The main reason why can speed up things [up to 50%] this way are:
-     *
-     *    - using variables more effective then regular.
-     *      (ie no use of expensive arrays but integers $k_0, $k_1 ...
-     *      or even, for example, the pure $key[] values hardcoded)
-     *
-     *    - avoiding 1000's of function calls of ie _encryptBlock()
-     *      but inlining the crypt operations.
-     *      in the mode of operation for() loop.
-     *
-     *    - full loop unroll the (sometimes key-dependent) rounds
-     *      avoiding this way ++$i counters and runtime-if's etc...
-     *
-     *    The basic code architectur of the generated $inline en/decrypt()
-     *    lambda function, in pseudo php, is:
-     *
-     *    <code>
-     *    +----------------------------------------------------------------------------------------------+
-     *    | callback $inline = create_function:                                                          |
-     *    | lambda_function_0001_crypt_ECB($action, $text)                                               |
-     *    | {                                                                                            |
-     *    |     INSERT PHP CODE OF:                                                                      |
-     *    |     $cipher_code['init_crypt'];                  // general init code.                       |
-     *    |                                                  // ie: $sbox'es declarations used for       |
-     *    |                                                  //     encrypt and decrypt'ing.             |
-     *    |                                                                                              |
-     *    |     switch ($action) {                                                                       |
-     *    |         case 'encrypt':                                                                      |
-     *    |             INSERT PHP CODE OF:                                                              |
-     *    |             $cipher_code['init_encrypt'];       // encrypt sepcific init code.               |
-     *    |                                                    ie: specified $key or $box                |
-     *    |                                                        declarations for encrypt'ing.         |
-     *    |                                                                                              |
-     *    |             foreach ($ciphertext) {                                                          |
-     *    |                 $in = $block_size of $ciphertext;                                            |
-     *    |                                                                                              |
-     *    |                 INSERT PHP CODE OF:                                                          |
-     *    |                 $cipher_code['encrypt_block'];  // encrypt's (string) $in, which is always:  |
-     *    |                                                 // strlen($in) == $this->block_size          |
-     *    |                                                 // here comes the cipher algorithm in action |
-     *    |                                                 // for encryption.                           |
-     *    |                                                 // $cipher_code['encrypt_block'] has to      |
-     *    |                                                 // encrypt the content of the $in variable   |
-     *    |                                                                                              |
-     *    |                 $plaintext .= $in;                                                           |
-     *    |             }                                                                                |
-     *    |             return $plaintext;                                                               |
-     *    |                                                                                              |
-     *    |         case 'decrypt':                                                                      |
-     *    |             INSERT PHP CODE OF:                                                              |
-     *    |             $cipher_code['init_decrypt'];       // decrypt sepcific init code                |
-     *    |                                                    ie: specified $key or $box                |
-     *    |                                                        declarations for decrypt'ing.         |
-     *    |             foreach ($plaintext) {                                                           |
-     *    |                 $in = $block_size of $plaintext;                                             |
-     *    |                                                                                              |
-     *    |                 INSERT PHP CODE OF:                                                          |
-     *    |                 $cipher_code['decrypt_block'];  // decrypt's (string) $in, which is always   |
-     *    |                                                 // strlen($in) == $this->block_size          |
-     *    |                                                 // here comes the cipher algorithm in action |
-     *    |                                                 // for decryption.                           |
-     *    |                                                 // $cipher_code['decrypt_block'] has to      |
-     *    |                                                 // decrypt the content of the $in variable   |
-     *    |                 $ciphertext .= $in;                                                          |
-     *    |             }                                                                                |
-     *    |             return $ciphertext;                                                              |
-     *    |     }                                                                                        |
-     *    | }                                                                                            |
-     *    +----------------------------------------------------------------------------------------------+
-     *    </code>
-     *
-     *    See also the \phpseclib3\Crypt\*::_setupInlineCrypt()'s for
-     *    productive inline $cipher_code's how they works.
-     *
-     *    Structure of:
-     *    <code>
-     *    $cipher_code = [
-     *        'init_crypt'    => (string) '', // optional
-     *        'init_encrypt'  => (string) '', // optional
-     *        'init_decrypt'  => (string) '', // optional
-     *        'encrypt_block' => (string) '', // required
-     *        'decrypt_block' => (string) ''  // required
-     *    ];
-     *    </code>
-     *
-     * @see self::setupInlineCrypt()
-     * @see self::encrypt()
-     * @see self::decrypt()
-     * @param array $cipher_code
-     * @return string (the name of the created callback function)
-     */
-    protected function createInlineCryptFunction($cipher_code)
-    {
-        $block_size = $this->block_size;
-
-        // optional
-        $init_crypt    = isset($cipher_code['init_crypt'])    ? $cipher_code['init_crypt']    : '';
-        $init_encrypt  = isset($cipher_code['init_encrypt'])  ? $cipher_code['init_encrypt']  : '';
-        $init_decrypt  = isset($cipher_code['init_decrypt'])  ? $cipher_code['init_decrypt']  : '';
-        // required
-        $encrypt_block = $cipher_code['encrypt_block'];
-        $decrypt_block = $cipher_code['decrypt_block'];
-
-        // Generating mode of operation inline code,
-        // merged with the $cipher_code algorithm
-        // for encrypt- and decryption.
-        switch ($this->mode) {
-            case self::MODE_ECB:
-                $encrypt = $init_encrypt . '
-                    $_ciphertext = "";
-                    $_plaintext_len = strlen($_text);
-
-                    for ($_i = 0; $_i < $_plaintext_len; $_i+= ' . $block_size . ') {
-                        $in = substr($_text, $_i, ' . $block_size . ');
-                        ' . $encrypt_block . '
-                        $_ciphertext.= $in;
-                    }
-
-                    return $_ciphertext;
-                    ';
-
-                $decrypt = $init_decrypt . '
-                    $_plaintext = "";
-                    $_text = str_pad($_text, strlen($_text) + (' . $block_size . ' - strlen($_text) % ' . $block_size . ') % ' . $block_size . ', chr(0));
-                    $_ciphertext_len = strlen($_text);
-
-                    for ($_i = 0; $_i < $_ciphertext_len; $_i+= ' . $block_size . ') {
-                        $in = substr($_text, $_i, ' . $block_size . ');
-                        ' . $decrypt_block . '
-                        $_plaintext.= $in;
-                    }
-
-                    return $this->unpad($_plaintext);
-                    ';
-                break;
-            case self::MODE_CTR:
-                $encrypt = $init_encrypt . '
-                    $_ciphertext = "";
-                    $_plaintext_len = strlen($_text);
-                    $_xor = $this->encryptIV;
-                    $_buffer = &$this->enbuffer;
-                    if (strlen($_buffer["ciphertext"])) {
-                        for ($_i = 0; $_i < $_plaintext_len; $_i+= ' . $block_size . ') {
-                            $_block = substr($_text, $_i, ' . $block_size . ');
-                            if (strlen($_block) > strlen($_buffer["ciphertext"])) {
-                                $in = $_xor;
-                                ' . $encrypt_block . '
-                                \phpseclib3\Common\Functions\Strings::increment_str($_xor);
-                                $_buffer["ciphertext"].= $in;
-                            }
-                            $_key = \phpseclib3\Common\Functions\Strings::shift($_buffer["ciphertext"], ' . $block_size . ');
-                            $_ciphertext.= $_block ^ $_key;
-                        }
-                    } else {
-                        for ($_i = 0; $_i < $_plaintext_len; $_i+= ' . $block_size . ') {
-                            $_block = substr($_text, $_i, ' . $block_size . ');
-                            $in = $_xor;
-                            ' . $encrypt_block . '
-                            \phpseclib3\Common\Functions\Strings::increment_str($_xor);
-                            $_key = $in;
-                            $_ciphertext.= $_block ^ $_key;
-                        }
-                    }
-                    if ($this->continuousBuffer) {
-                        $this->encryptIV = $_xor;
-                        if ($_start = $_plaintext_len % ' . $block_size . ') {
-                            $_buffer["ciphertext"] = substr($_key, $_start) . $_buffer["ciphertext"];
-                        }
-                    }
-
-                    return $_ciphertext;
-                ';
-
-                $decrypt = $init_encrypt . '
-                    $_plaintext = "";
-                    $_ciphertext_len = strlen($_text);
-                    $_xor = $this->decryptIV;
-                    $_buffer = &$this->debuffer;
-
-                    if (strlen($_buffer["ciphertext"])) {
-                        for ($_i = 0; $_i < $_ciphertext_len; $_i+= ' . $block_size . ') {
-                            $_block = substr($_text, $_i, ' . $block_size . ');
-                            if (strlen($_block) > strlen($_buffer["ciphertext"])) {
-                                $in = $_xor;
-                                ' . $encrypt_block . '
-                                \phpseclib3\Common\Functions\Strings::increment_str($_xor);
-                                $_buffer["ciphertext"].= $in;
-                            }
-                            $_key = \phpseclib3\Common\Functions\Strings::shift($_buffer["ciphertext"], ' . $block_size . ');
-                            $_plaintext.= $_block ^ $_key;
-                        }
-                    } else {
-                        for ($_i = 0; $_i < $_ciphertext_len; $_i+= ' . $block_size . ') {
-                            $_block = substr($_text, $_i, ' . $block_size . ');
-                            $in = $_xor;
-                            ' . $encrypt_block . '
-                            \phpseclib3\Common\Functions\Strings::increment_str($_xor);
-                            $_key = $in;
-                            $_plaintext.= $_block ^ $_key;
-                        }
-                    }
-                    if ($this->continuousBuffer) {
-                        $this->decryptIV = $_xor;
-                        if ($_start = $_ciphertext_len % ' . $block_size . ') {
-                            $_buffer["ciphertext"] = substr($_key, $_start) . $_buffer["ciphertext"];
-                        }
-                    }
-
-                    return $_plaintext;
-                    ';
-                break;
-            case self::MODE_CFB:
-                $encrypt = $init_encrypt . '
-                    $_ciphertext = "";
-                    $_buffer = &$this->enbuffer;
-
-                    if ($this->continuousBuffer) {
-                        $_iv = &$this->encryptIV;
-                        $_pos = &$_buffer["pos"];
-                    } else {
-                        $_iv = $this->encryptIV;
-                        $_pos = 0;
-                    }
-                    $_len = strlen($_text);
-                    $_i = 0;
-                    if ($_pos) {
-                        $_orig_pos = $_pos;
-                        $_max = ' . $block_size . ' - $_pos;
-                        if ($_len >= $_max) {
-                            $_i = $_max;
-                            $_len-= $_max;
-                            $_pos = 0;
-                        } else {
-                            $_i = $_len;
-                            $_pos+= $_len;
-                            $_len = 0;
-                        }
-                        $_ciphertext = substr($_iv, $_orig_pos) ^ $_text;
-                        $_iv = substr_replace($_iv, $_ciphertext, $_orig_pos, $_i);
-                    }
-                    while ($_len >= ' . $block_size . ') {
-                        $in = $_iv;
-                        ' . $encrypt_block . ';
-                        $_iv = $in ^ substr($_text, $_i, ' . $block_size . ');
-                        $_ciphertext.= $_iv;
-                        $_len-= ' . $block_size . ';
-                        $_i+= ' . $block_size . ';
-                    }
-                    if ($_len) {
-                        $in = $_iv;
-                        ' . $encrypt_block . '
-                        $_iv = $in;
-                        $_block = $_iv ^ substr($_text, $_i);
-                        $_iv = substr_replace($_iv, $_block, 0, $_len);
-                        $_ciphertext.= $_block;
-                        $_pos = $_len;
-                    }
-                    return $_ciphertext;
-                ';
-
-                $decrypt = $init_encrypt . '
-                    $_plaintext = "";
-                    $_buffer = &$this->debuffer;
-
-                    if ($this->continuousBuffer) {
-                        $_iv = &$this->decryptIV;
-                        $_pos = &$_buffer["pos"];
-                    } else {
-                        $_iv = $this->decryptIV;
-                        $_pos = 0;
-                    }
-                    $_len = strlen($_text);
-                    $_i = 0;
-                    if ($_pos) {
-                        $_orig_pos = $_pos;
-                        $_max = ' . $block_size . ' - $_pos;
-                        if ($_len >= $_max) {
-                            $_i = $_max;
-                            $_len-= $_max;
-                            $_pos = 0;
-                        } else {
-                            $_i = $_len;
-                            $_pos+= $_len;
-                            $_len = 0;
-                        }
-                        $_plaintext = substr($_iv, $_orig_pos) ^ $_text;
-                        $_iv = substr_replace($_iv, substr($_text, 0, $_i), $_orig_pos, $_i);
-                    }
-                    while ($_len >= ' . $block_size . ') {
-                        $in = $_iv;
-                        ' . $encrypt_block . '
-                        $_iv = $in;
-                        $cb = substr($_text, $_i, ' . $block_size . ');
-                        $_plaintext.= $_iv ^ $cb;
-                        $_iv = $cb;
-                        $_len-= ' . $block_size . ';
-                        $_i+= ' . $block_size . ';
-                    }
-                    if ($_len) {
-                        $in = $_iv;
-                        ' . $encrypt_block . '
-                        $_iv = $in;
-                        $_plaintext.= $_iv ^ substr($_text, $_i);
-                        $_iv = substr_replace($_iv, substr($_text, $_i), 0, $_len);
-                        $_pos = $_len;
-                    }
-
-                    return $_plaintext;
-                    ';
-                break;
-            case self::MODE_CFB8:
-                $encrypt = $init_encrypt . '
-                    $_ciphertext = "";
-                    $_len = strlen($_text);
-                    $_iv = $this->encryptIV;
-
-                    for ($_i = 0; $_i < $_len; ++$_i) {
-                        $in = $_iv;
-                        ' . $encrypt_block . '
-                        $_ciphertext .= ($_c = $_text[$_i] ^ $in);
-                        $_iv = substr($_iv, 1) . $_c;
-                    }
-
-                    if ($this->continuousBuffer) {
-                        if ($_len >= ' . $block_size . ') {
-                            $this->encryptIV = substr($_ciphertext, -' . $block_size . ');
-                        } else {
-                            $this->encryptIV = substr($this->encryptIV, $_len - ' . $block_size . ') . substr($_ciphertext, -$_len);
-                        }
-                    }
-
-                    return $_ciphertext;
-                    ';
-                $decrypt = $init_encrypt . '
-                    $_plaintext = "";
-                    $_len = strlen($_text);
-                    $_iv = $this->decryptIV;
-
-                    for ($_i = 0; $_i < $_len; ++$_i) {
-                        $in = $_iv;
-                        ' . $encrypt_block . '
-                        $_plaintext .= $_text[$_i] ^ $in;
-                        $_iv = substr($_iv, 1) . $_text[$_i];
-                    }
-
-                    if ($this->continuousBuffer) {
-                        if ($_len >= ' . $block_size . ') {
-                            $this->decryptIV = substr($_text, -' . $block_size . ');
-                        } else {
-                            $this->decryptIV = substr($this->decryptIV, $_len - ' . $block_size . ') . substr($_text, -$_len);
-                        }
-                    }
-
-                    return $_plaintext;
-                    ';
-                break;
-            case self::MODE_OFB8:
-                $encrypt = $init_encrypt . '
-                    $_ciphertext = "";
-                    $_len = strlen($_text);
-                    $_iv = $this->encryptIV;
-
-                    for ($_i = 0; $_i < $_len; ++$_i) {
-                        $in = $_iv;
-                        ' . $encrypt_block . '
-                        $_ciphertext.= $_text[$_i] ^ $in;
-                        $_iv = substr($_iv, 1) . $in[0];
-                    }
-
-                    if ($this->continuousBuffer) {
-                        $this->encryptIV = $_iv;
-                    }
-
-                    return $_ciphertext;
-                    ';
-                $decrypt = $init_encrypt . '
-                    $_plaintext = "";
-                    $_len = strlen($_text);
-                    $_iv = $this->decryptIV;
-
-                    for ($_i = 0; $_i < $_len; ++$_i) {
-                        $in = $_iv;
-                        ' . $encrypt_block . '
-                        $_plaintext.= $_text[$_i] ^ $in;
-                        $_iv = substr($_iv, 1) . $in[0];
-                    }
-
-                    if ($this->continuousBuffer) {
-                        $this->decryptIV = $_iv;
-                    }
-
-                    return $_plaintext;
-                    ';
-                break;
-            case self::MODE_OFB:
-                $encrypt = $init_encrypt . '
-                    $_ciphertext = "";
-                    $_plaintext_len = strlen($_text);
-                    $_xor = $this->encryptIV;
-                    $_buffer = &$this->enbuffer;
-
-                    if (strlen($_buffer["xor"])) {
-                        for ($_i = 0; $_i < $_plaintext_len; $_i+= ' . $block_size . ') {
-                            $_block = substr($_text, $_i, ' . $block_size . ');
-                            if (strlen($_block) > strlen($_buffer["xor"])) {
-                                $in = $_xor;
-                                ' . $encrypt_block . '
-                                $_xor = $in;
-                                $_buffer["xor"].= $_xor;
-                            }
-                            $_key = \phpseclib3\Common\Functions\Strings::shift($_buffer["xor"], ' . $block_size . ');
-                            $_ciphertext.= $_block ^ $_key;
-                        }
-                    } else {
-                        for ($_i = 0; $_i < $_plaintext_len; $_i+= ' . $block_size . ') {
-                            $in = $_xor;
-                            ' . $encrypt_block . '
-                            $_xor = $in;
-                            $_ciphertext.= substr($_text, $_i, ' . $block_size . ') ^ $_xor;
-                        }
-                        $_key = $_xor;
-                    }
-                    if ($this->continuousBuffer) {
-                        $this->encryptIV = $_xor;
-                        if ($_start = $_plaintext_len % ' . $block_size . ') {
-                             $_buffer["xor"] = substr($_key, $_start) . $_buffer["xor"];
-                        }
-                    }
-                    return $_ciphertext;
-                    ';
-
-                $decrypt = $init_encrypt . '
-                    $_plaintext = "";
-                    $_ciphertext_len = strlen($_text);
-                    $_xor = $this->decryptIV;
-                    $_buffer = &$this->debuffer;
-
-                    if (strlen($_buffer["xor"])) {
-                        for ($_i = 0; $_i < $_ciphertext_len; $_i+= ' . $block_size . ') {
-                            $_block = substr($_text, $_i, ' . $block_size . ');
-                            if (strlen($_block) > strlen($_buffer["xor"])) {
-                                $in = $_xor;
-                                ' . $encrypt_block . '
-                                $_xor = $in;
-                                $_buffer["xor"].= $_xor;
-                            }
-                            $_key = \phpseclib3\Common\Functions\Strings::shift($_buffer["xor"], ' . $block_size . ');
-                            $_plaintext.= $_block ^ $_key;
-                        }
-                    } else {
-                        for ($_i = 0; $_i < $_ciphertext_len; $_i+= ' . $block_size . ') {
-                            $in = $_xor;
-                            ' . $encrypt_block . '
-                            $_xor = $in;
-                            $_plaintext.= substr($_text, $_i, ' . $block_size . ') ^ $_xor;
-                        }
-                        $_key = $_xor;
-                    }
-                    if ($this->continuousBuffer) {
-                        $this->decryptIV = $_xor;
-                        if ($_start = $_ciphertext_len % ' . $block_size . ') {
-                             $_buffer["xor"] = substr($_key, $_start) . $_buffer["xor"];
-                        }
-                    }
-                    return $_plaintext;
-                    ';
-                break;
-            case self::MODE_STREAM:
-                $encrypt = $init_encrypt . '
-                    $_ciphertext = "";
-                    ' . $encrypt_block . '
-                    return $_ciphertext;
-                    ';
-                $decrypt = $init_decrypt . '
-                    $_plaintext = "";
-                    ' . $decrypt_block . '
-                    return $_plaintext;
-                    ';
-                break;
-            // case self::MODE_CBC:
-            default:
-                $encrypt = $init_encrypt . '
-                    $_ciphertext = "";
-                    $_plaintext_len = strlen($_text);
-
-                    $in = $this->encryptIV;
-
-                    for ($_i = 0; $_i < $_plaintext_len; $_i+= ' . $block_size . ') {
-                        $in = substr($_text, $_i, ' . $block_size . ') ^ $in;
-                        ' . $encrypt_block . '
-                        $_ciphertext.= $in;
-                    }
-
-                    if ($this->continuousBuffer) {
-                        $this->encryptIV = $in;
-                    }
-
-                    return $_ciphertext;
-                    ';
-
-                $decrypt = $init_decrypt . '
-                    $_plaintext = "";
-                    $_text = str_pad($_text, strlen($_text) + (' . $block_size . ' - strlen($_text) % ' . $block_size . ') % ' . $block_size . ', chr(0));
-                    $_ciphertext_len = strlen($_text);
-
-                    $_iv = $this->decryptIV;
-
-                    for ($_i = 0; $_i < $_ciphertext_len; $_i+= ' . $block_size . ') {
-                        $in = $_block = substr($_text, $_i, ' . $block_size . ');
-                        ' . $decrypt_block . '
-                        $_plaintext.= $in ^ $_iv;
-                        $_iv = $_block;
-                    }
-
-                    if ($this->continuousBuffer) {
-                        $this->decryptIV = $_iv;
-                    }
-
-                    return $this->unpad($_plaintext);
-                    ';
-                break;
-        }
-
-        // Before discrediting this, please read the following:
-        // @see https://github.com/phpseclib/phpseclib/issues/1293
-        // @see https://github.com/phpseclib/phpseclib/pull/1143
-        eval('$func = function ($_action, $_text) { ' . $init_crypt . 'if ($_action == "encrypt") { ' . $encrypt . ' } else { ' . $decrypt . ' }};');
-
-        return \Closure::bind($func, $this, static::class);
-    }
-
-    /**
-     * Convert float to int
-     *
-     * On ARM CPUs converting floats to ints doesn't always work
-     *
-     * @param string $x
-     * @return int
-     */
-    protected static function safe_intval($x)
-    {
-        if (is_int($x)) {
-            return $x;
-        }
-
-        if (self::$use_reg_intval) {
-            return PHP_INT_SIZE == 4 && PHP_VERSION_ID >= 80100 ? intval($x) : $x;
-        }
-
-        return (fmod($x, 0x80000000) & 0x7FFFFFFF) |
-            ((fmod(floor($x / 0x80000000), 2) & 1) << 31);
-    }
-
-    /**
-     * eval()'able string for in-line float to int
-     *
-     * @return string
-     */
-    protected static function safe_intval_inline()
-    {
-        if (self::$use_reg_intval) {
-            return PHP_INT_SIZE == 4 && PHP_VERSION_ID >= 80100 ? 'intval(%s)' : '%s';
-        }
-
-        $safeint = '(is_int($temp = %s) ? $temp : (fmod($temp, 0x80000000) & 0x7FFFFFFF) | ';
-        return $safeint . '((fmod(floor($temp / 0x80000000), 2) & 1) << 31))';
-    }
-
-    /**
-     * Sets up GCM parameters
-     *
-     * See steps 1-2 of https://nvlpubs.nist.gov/nistpubs/Legacy/SP/nistspecialpublication800-38d.pdf#page=23
-     * for more info
-     *
-     */
-    private function setupGCM()
-    {
-        // don't keep on re-calculating $this->h
-        if (!$this->h || $this->hKey != $this->key) {
-            $cipher = new static('ecb');
-            $cipher->setKey($this->key);
-            $cipher->disablePadding();
-
-            $this->h = self::$gcmField->newInteger(
-                Strings::switchEndianness($cipher->encrypt("\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"))
-            );
-            $this->hKey = $this->key;
-        }
-
-        if (strlen($this->nonce) == 12) {
-            $this->iv = $this->nonce . "\0\0\0\1";
-        } else {
-            $this->iv = $this->ghash(
-                self::nullPad128($this->nonce) . str_repeat("\0", 8) . self::len64($this->nonce)
-            );
-        }
-    }
-
-    /**
-     * Performs GHASH operation
-     *
-     * See https://nvlpubs.nist.gov/nistpubs/Legacy/SP/nistspecialpublication800-38d.pdf#page=20
-     * for more info
-     *
-     * @see self::decrypt()
-     * @see self::encrypt()
-     * @param string $x
-     * @return string
-     */
-    private function ghash($x)
-    {
-        $h = $this->h;
-        $y = ["\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"];
-        $x = str_split($x, 16);
-        $n = 0;
-        // the switchEndianness calls are necessary because the multiplication algorithm in BinaryField/Integer
-        // interprets strings as polynomials in big endian order whereas in GCM they're interpreted in little
-        // endian order per https://nvlpubs.nist.gov/nistpubs/Legacy/SP/nistspecialpublication800-38d.pdf#page=19.
-        // big endian order is what binary field elliptic curves use per http://www.secg.org/sec1-v2.pdf#page=18.
-
-        // we could switchEndianness here instead of in the while loop but doing so in the while loop seems like it
-        // might be slightly more performant
-        //$x = Strings::switchEndianness($x);
-        foreach ($x as $xn) {
-            $xn = Strings::switchEndianness($xn);
-            $t = $y[$n] ^ $xn;
-            $temp = self::$gcmField->newInteger($t);
-            $y[++$n] = $temp->multiply($h)->toBytes();
-            $y[$n] = substr($y[$n], 1);
-        }
-        $y[$n] = Strings::switchEndianness($y[$n]);
-        return $y[$n];
-    }
-
-    /**
-     * Returns the bit length of a string in a packed format
-     *
-     * @see self::decrypt()
-     * @see self::encrypt()
-     * @see self::setupGCM()
-     * @param string $str
-     * @return string
-     */
-    private static function len64($str)
-    {
-        return "\0\0\0\0" . pack('N', 8 * strlen($str));
-    }
-
-    /**
-     * NULL pads a string to be a multiple of 128
-     *
-     * @see self::decrypt()
-     * @see self::encrypt()
-     * @see self::setupGCM()
-     * @param string $str
-     * @return string
-     */
-    protected static function nullPad128($str)
-    {
-        $len = strlen($str);
-        return $str . str_repeat("\0", 16 * ceil($len / 16) - $len);
-    }
-
-    /**
-     * Calculates Poly1305 MAC
-     *
-     * On my system ChaCha20, with libsodium, takes 0.5s. With this custom Poly1305 implementation
-     * it takes 1.2s.
-     *
-     * @see self::decrypt()
-     * @see self::encrypt()
-     * @param string $text
-     * @return string
-     */
-    protected function poly1305($text)
-    {
-        $s = $this->poly1305Key; // strlen($this->poly1305Key) == 32
-        $r = Strings::shift($s, 16);
-        $r = strrev($r);
-        $r &= "\x0f\xff\xff\xfc\x0f\xff\xff\xfc\x0f\xff\xff\xfc\x0f\xff\xff\xff";
-        $s = strrev($s);
-
-        $r = self::$poly1305Field->newInteger(new BigInteger($r, 256));
-        $s = self::$poly1305Field->newInteger(new BigInteger($s, 256));
-        $a = self::$poly1305Field->newInteger(new BigInteger());
-
-        $blocks = str_split($text, 16);
-        foreach ($blocks as $block) {
-            $n = strrev($block . chr(1));
-            $n = self::$poly1305Field->newInteger(new BigInteger($n, 256));
-            $a = $a->add($n);
-            $a = $a->multiply($r);
-        }
-        $r = $a->toBigInteger()->add($s->toBigInteger());
-        $mask = "\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF";
-        return strrev($r->toBytes()) & $mask;
-    }
-
-    /**
-     * Return the mode
-     *
-     * You can do $obj instanceof AES or whatever to get the cipher but you can't do that to get the mode
-     *
-     * @return string
-     */
-    public function getMode()
-    {
-        return array_flip(self::MODE_MAP)[$this->mode];
-    }
-
-    /**
-     * Is the continuous buffer enabled?
-     *
-     * @return boolean
-     */
-    public function continuousBufferEnabled()
-    {
-        return $this->continuousBuffer;
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/Common/Traits/Fingerprint.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/Common/Traits/Fingerprint.php
deleted file mode 100644
index 9ca8926d..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/Common/Traits/Fingerprint.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-
-/**
- * Fingerprint Trait for Public Keys
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2015 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\Crypt\Common\Traits;
-
-use phpseclib3\Crypt\Hash;
-
-/**
- * Fingerprint Trait for Private Keys
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-trait Fingerprint
-{
-    /**
-     * Returns the public key's fingerprint
-     *
-     * The public key's fingerprint is returned, which is equivalent to running `ssh-keygen -lf rsa.pub`. If there is
-     * no public key currently loaded, false is returned.
-     * Example output (md5): "c1:b1:30:29:d7:b8:de:6c:97:77:10:d7:46:41:63:87" (as specified by RFC 4716)
-     *
-     * @param string $algorithm The hashing algorithm to be used. Valid options are 'md5' and 'sha256'. False is returned
-     * for invalid values.
-     * @return mixed
-     */
-    public function getFingerprint($algorithm = 'md5')
-    {
-        $type = self::validatePlugin('Keys', 'OpenSSH', 'savePublicKey');
-        if ($type === false) {
-            return false;
-        }
-        $key = $this->toString('OpenSSH', ['binary' => true]);
-        if ($key === false) {
-            return false;
-        }
-        switch ($algorithm) {
-            case 'sha256':
-                $hash = new Hash('sha256');
-                $base = base64_encode($hash->hash($key));
-                return substr($base, 0, strlen($base) - 1);
-            case 'md5':
-                return substr(chunk_split(md5($key), 2, ':'), 0, -1);
-            default:
-                return false;
-        }
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/Common/Traits/PasswordProtected.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/Common/Traits/PasswordProtected.php
deleted file mode 100644
index 0ac274e8..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/Common/Traits/PasswordProtected.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-/**
- * Password Protected Trait for Private Keys
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2015 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\Crypt\Common\Traits;
-
-/**
- * Password Protected Trait for Private Keys
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-trait PasswordProtected
-{
-    /**
-     * Password
-     *
-     * @var string|bool
-     */
-    private $password = false;
-
-    /**
-     * Sets the password
-     *
-     * Private keys can be encrypted with a password.  To unset the password, pass in the empty string or false.
-     * Or rather, pass in $password such that empty($password) && !is_string($password) is true.
-     *
-     * @see self::createKey()
-     * @see self::load()
-     * @param string|bool $password
-     */
-    public function withPassword($password = false)
-    {
-        $new = clone $this;
-        $new->password = $password;
-        return $new;
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/DES.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/DES.php
index 3b038300..51220469 100644
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/DES.php
+++ b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/DES.php
@@ -18,7 +18,7 @@
  * <?php
  *    include 'vendor/autoload.php';
  *
- *    $des = new \phpseclib3\Crypt\DES('ctr');
+ *    $des = new \phpseclib\Crypt\DES();
  *
  *    $des->setKey('abcdefgh');
  *
@@ -32,119 +32,120 @@
  * ?>
  * </code>
  *
+ * @category  Crypt
+ * @package   DES
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2007 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
  * @link      http://phpseclib.sourceforge.net
  */
 
-namespace phpseclib3\Crypt;
-
-use phpseclib3\Crypt\Common\BlockCipher;
-use phpseclib3\Exception\BadModeException;
+namespace phpseclib\Crypt;
 
 /**
  * Pure-PHP implementation of DES.
  *
+ * @package DES
  * @author  Jim Wigginton <terrafrost@php.net>
+ * @access  public
  */
-class DES extends BlockCipher
+class DES extends Base
 {
+    /**#@+
+     * @access private
+     * @see \phpseclib\Crypt\DES::_setupKey()
+     * @see \phpseclib\Crypt\DES::_processBlock()
+     */
     /**
      * Contains $keys[self::ENCRYPT]
-     *
-     * @see \phpseclib3\Crypt\DES::setupKey()
-     * @see \phpseclib3\Crypt\DES::processBlock()
      */
     const ENCRYPT = 0;
     /**
      * Contains $keys[self::DECRYPT]
-     *
-     * @see \phpseclib3\Crypt\DES::setupKey()
-     * @see \phpseclib3\Crypt\DES::processBlock()
      */
     const DECRYPT = 1;
+    /**#@-*/
 
     /**
      * Block Length of the cipher
      *
-     * @see \phpseclib3\Crypt\Common\SymmetricKey::block_size
+     * @see \phpseclib\Crypt\Base::block_size
      * @var int
+     * @access private
      */
-    protected $block_size = 8;
+    var $block_size = 8;
 
     /**
      * Key Length (in bytes)
      *
-     * @see \phpseclib3\Crypt\Common\SymmetricKey::setKeyLength()
+     * @see \phpseclib\Crypt\Base::setKeyLength()
      * @var int
+     * @access private
      */
-    protected $key_length = 8;
+    var $key_length = 8;
 
     /**
      * The mcrypt specific name of the cipher
      *
-     * @see \phpseclib3\Crypt\Common\SymmetricKey::cipher_name_mcrypt
+     * @see \phpseclib\Crypt\Base::cipher_name_mcrypt
      * @var string
+     * @access private
      */
-    protected $cipher_name_mcrypt = 'des';
+    var $cipher_name_mcrypt = 'des';
 
     /**
      * The OpenSSL names of the cipher / modes
      *
-     * @see \phpseclib3\Crypt\Common\SymmetricKey::openssl_mode_names
+     * @see \phpseclib\Crypt\Base::openssl_mode_names
      * @var array
+     * @access private
      */
-    protected $openssl_mode_names = [
+    var $openssl_mode_names = array(
         self::MODE_ECB => 'des-ecb',
         self::MODE_CBC => 'des-cbc',
         self::MODE_CFB => 'des-cfb',
         self::MODE_OFB => 'des-ofb'
         // self::MODE_CTR is undefined for DES
-    ];
+    );
 
     /**
      * Optimizing value while CFB-encrypting
      *
-     * @see \phpseclib3\Crypt\Common\SymmetricKey::cfb_init_len
+     * @see \phpseclib\Crypt\Base::cfb_init_len
      * @var int
+     * @access private
      */
-    protected $cfb_init_len = 500;
+    var $cfb_init_len = 500;
 
     /**
      * Switch for DES/3DES encryption
      *
      * Used only if $engine == self::ENGINE_INTERNAL
      *
-     * @see self::setupKey()
-     * @see self::processBlock()
+     * @see self::_setupKey()
+     * @see self::_processBlock()
      * @var int
+     * @access private
      */
-    protected $des_rounds = 1;
+    var $des_rounds = 1;
 
     /**
      * max possible size of $key
      *
      * @see self::setKey()
      * @var string
+     * @access private
      */
-    protected $key_length_max = 8;
+    var $key_length_max = 8;
 
     /**
      * The Key Schedule
      *
-     * @see self::setupKey()
+     * @see self::_setupKey()
      * @var array
+     * @access private
      */
-    private $keys;
-
-    /**
-     * Key Cache "key"
-     *
-     * @see self::setupKey()
-     * @var array
-     */
-    private $kl;
+    var $keys;
 
     /**
      * Shuffle table.
@@ -153,11 +154,12 @@ class DES extends BlockCipher
      * with each byte containing all bits in the same state as the
      * corresponding bit in the index value.
      *
-     * @see self::processBlock()
-     * @see self::setupKey()
+     * @see self::_processBlock()
+     * @see self::_setupKey()
      * @var array
+     * @access private
      */
-    protected static $shuffle = [
+    var $shuffle = array(
         "\x00\x00\x00\x00\x00\x00\x00\x00", "\x00\x00\x00\x00\x00\x00\x00\xFF",
         "\x00\x00\x00\x00\x00\x00\xFF\x00", "\x00\x00\x00\x00\x00\x00\xFF\xFF",
         "\x00\x00\x00\x00\x00\xFF\x00\x00", "\x00\x00\x00\x00\x00\xFF\x00\xFF",
@@ -286,7 +288,7 @@ class DES extends BlockCipher
         "\xFF\xFF\xFF\xFF\xFF\x00\xFF\x00", "\xFF\xFF\xFF\xFF\xFF\x00\xFF\xFF",
         "\xFF\xFF\xFF\xFF\xFF\xFF\x00\x00", "\xFF\xFF\xFF\xFF\xFF\xFF\x00\xFF",
         "\xFF\xFF\xFF\xFF\xFF\xFF\xFF\x00", "\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF"
-    ];
+    );
 
     /**
      * IP mapping helper table.
@@ -294,8 +296,9 @@ class DES extends BlockCipher
      * Indexing this table with each source byte performs the initial bit permutation.
      *
      * @var array
+     * @access private
      */
-    protected static $ipmap = [
+    var $ipmap = array(
         0x00, 0x10, 0x01, 0x11, 0x20, 0x30, 0x21, 0x31,
         0x02, 0x12, 0x03, 0x13, 0x22, 0x32, 0x23, 0x33,
         0x40, 0x50, 0x41, 0x51, 0x60, 0x70, 0x61, 0x71,
@@ -328,15 +331,16 @@ class DES extends BlockCipher
         0x8E, 0x9E, 0x8F, 0x9F, 0xAE, 0xBE, 0xAF, 0xBF,
         0xCC, 0xDC, 0xCD, 0xDD, 0xEC, 0xFC, 0xED, 0xFD,
         0xCE, 0xDE, 0xCF, 0xDF, 0xEE, 0xFE, 0xEF, 0xFF
-    ];
+    );
 
     /**
      * Inverse IP mapping helper table.
      * Indexing this table with a byte value reverses the bit order.
      *
      * @var array
+     * @access private
      */
-    protected static $invipmap = [
+    var $invipmap = array(
         0x00, 0x80, 0x40, 0xC0, 0x20, 0xA0, 0x60, 0xE0,
         0x10, 0x90, 0x50, 0xD0, 0x30, 0xB0, 0x70, 0xF0,
         0x08, 0x88, 0x48, 0xC8, 0x28, 0xA8, 0x68, 0xE8,
@@ -369,7 +373,7 @@ class DES extends BlockCipher
         0x17, 0x97, 0x57, 0xD7, 0x37, 0xB7, 0x77, 0xF7,
         0x0F, 0x8F, 0x4F, 0xCF, 0x2F, 0xAF, 0x6F, 0xEF,
         0x1F, 0x9F, 0x5F, 0xDF, 0x3F, 0xBF, 0x7F, 0xFF
-    ];
+    );
 
     /**
      * Pre-permuted S-box1
@@ -378,8 +382,9 @@ class DES extends BlockCipher
      * P table: concatenation can then be replaced by exclusive ORs.
      *
      * @var array
+     * @access private
      */
-    protected static $sbox1 = [
+    var $sbox1 = array(
         0x00808200, 0x00000000, 0x00008000, 0x00808202,
         0x00808002, 0x00008202, 0x00000002, 0x00008000,
         0x00000200, 0x00808200, 0x00808202, 0x00000200,
@@ -396,14 +401,15 @@ class DES extends BlockCipher
         0x00800002, 0x00000202, 0x00008202, 0x00808200,
         0x00000202, 0x00800200, 0x00800200, 0x00000000,
         0x00008002, 0x00008200, 0x00000000, 0x00808002
-    ];
+    );
 
     /**
      * Pre-permuted S-box2
      *
      * @var array
+     * @access private
      */
-    protected static $sbox2 = [
+    var $sbox2 = array(
         0x40084010, 0x40004000, 0x00004000, 0x00084010,
         0x00080000, 0x00000010, 0x40080010, 0x40004010,
         0x40000010, 0x40084010, 0x40084000, 0x40000000,
@@ -420,14 +426,15 @@ class DES extends BlockCipher
         0x00080010, 0x40004010, 0x40000010, 0x00080010,
         0x00084000, 0x00000000, 0x40004000, 0x00004010,
         0x40000000, 0x40080010, 0x40084010, 0x00084000
-    ];
+    );
 
     /**
      * Pre-permuted S-box3
      *
      * @var array
+     * @access private
      */
-    protected static $sbox3 = [
+    var $sbox3 = array(
         0x00000104, 0x04010100, 0x00000000, 0x04010004,
         0x04000100, 0x00000000, 0x00010104, 0x04000100,
         0x00010004, 0x04000004, 0x04000004, 0x00010000,
@@ -444,14 +451,15 @@ class DES extends BlockCipher
         0x00000004, 0x00010104, 0x00010100, 0x04000004,
         0x04010000, 0x04000104, 0x00000104, 0x04010000,
         0x00010104, 0x00000004, 0x04010004, 0x00010100
-    ];
+    );
 
     /**
      * Pre-permuted S-box4
      *
      * @var array
+     * @access private
      */
-    protected static $sbox4 = [
+    var $sbox4 = array(
         0x80401000, 0x80001040, 0x80001040, 0x00000040,
         0x00401040, 0x80400040, 0x80400000, 0x80001000,
         0x00000000, 0x00401000, 0x00401000, 0x80401040,
@@ -468,14 +476,15 @@ class DES extends BlockCipher
         0x80400000, 0x80001000, 0x00401040, 0x80400040,
         0x80001000, 0x00001040, 0x00400000, 0x80401000,
         0x00000040, 0x00400000, 0x00001000, 0x00401040
-    ];
+    );
 
     /**
      * Pre-permuted S-box5
      *
      * @var array
+     * @access private
      */
-    protected static $sbox5 = [
+    var $sbox5 = array(
         0x00000080, 0x01040080, 0x01040000, 0x21000080,
         0x00040000, 0x00000080, 0x20000000, 0x01040000,
         0x20040080, 0x00040000, 0x01000080, 0x20040080,
@@ -492,14 +501,15 @@ class DES extends BlockCipher
         0x01040000, 0x00000000, 0x20040000, 0x21000000,
         0x00040080, 0x01000080, 0x20000080, 0x00040000,
         0x00000000, 0x20040000, 0x01040080, 0x20000080
-    ];
+    );
 
     /**
      * Pre-permuted S-box6
      *
      * @var array
+     * @access private
      */
-    protected static $sbox6 = [
+    var $sbox6 = array(
         0x10000008, 0x10200000, 0x00002000, 0x10202008,
         0x10200000, 0x00000008, 0x10202008, 0x00200000,
         0x10002000, 0x00202008, 0x00200000, 0x10000008,
@@ -516,14 +526,15 @@ class DES extends BlockCipher
         0x00000008, 0x00002000, 0x10200000, 0x00202008,
         0x00002000, 0x00200008, 0x10002008, 0x00000000,
         0x10202000, 0x10000000, 0x00200008, 0x10002008
-    ];
+    );
 
     /**
      * Pre-permuted S-box7
      *
      * @var array
+     * @access private
      */
-    protected static $sbox7 = [
+    var $sbox7 = array(
         0x00100000, 0x02100001, 0x02000401, 0x00000000,
         0x00000400, 0x02000401, 0x00100401, 0x02100400,
         0x02100401, 0x00100000, 0x00000000, 0x02000001,
@@ -540,14 +551,15 @@ class DES extends BlockCipher
         0x00100400, 0x00000000, 0x00000001, 0x02100401,
         0x00000000, 0x00100401, 0x02100000, 0x00000400,
         0x02000001, 0x02000400, 0x00000400, 0x00100001
-    ];
+    );
 
     /**
      * Pre-permuted S-box8
      *
      * @var array
+     * @access private
      */
-    protected static $sbox8 = [
+    var $sbox8 = array(
         0x08000820, 0x00000800, 0x00020000, 0x08020820,
         0x08000000, 0x08000820, 0x00000020, 0x08000000,
         0x00020020, 0x08020000, 0x08020820, 0x00020800,
@@ -564,64 +576,51 @@ class DES extends BlockCipher
         0x08020000, 0x08000800, 0x08000820, 0x00000000,
         0x08020820, 0x00020800, 0x00020800, 0x00000820,
         0x00000820, 0x00020020, 0x08000000, 0x08020800
-    ];
-
-    /**
-     * Default Constructor.
-     *
-     * @param string $mode
-     * @throws BadModeException if an invalid / unsupported mode is provided
-     */
-    public function __construct($mode)
-    {
-        parent::__construct($mode);
-
-        if ($this->mode == self::MODE_STREAM) {
-            throw new BadModeException('Block ciphers cannot be ran in stream mode');
-        }
-    }
+    );
 
     /**
      * Test for engine validity
      *
-     * This is mainly just a wrapper to set things up for \phpseclib3\Crypt\Common\SymmetricKey::isValidEngine()
+     * This is mainly just a wrapper to set things up for \phpseclib\Crypt\Base::isValidEngine()
      *
-     * @see \phpseclib3\Crypt\Common\SymmetricKey::isValidEngine()
+     * @see \phpseclib\Crypt\Base::isValidEngine()
      * @param int $engine
+     * @access public
      * @return bool
      */
-    protected function isValidEngineHelper($engine)
+    function isValidEngine($engine)
     {
         if ($this->key_length_max == 8) {
             if ($engine == self::ENGINE_OPENSSL) {
-                // quoting https://www.openssl.org/news/openssl-3.0-notes.html, OpenSSL 3.0.1
-                // "Moved all variations of the EVP ciphers CAST5, BF, IDEA, SEED, RC2, RC4, RC5, and DES to the legacy provider"
-                // in theory openssl_get_cipher_methods() should catch this but, on GitHub Actions, at least, it does not
-                if (defined('OPENSSL_VERSION_TEXT') && version_compare(preg_replace('#OpenSSL (\d+\.\d+\.\d+) .*#', '$1', OPENSSL_VERSION_TEXT), '3.0.1', '>=')) {
-                    return false;
-                }
                 $this->cipher_name_openssl_ecb = 'des-ecb';
-                $this->cipher_name_openssl = 'des-' . $this->openssl_translate_mode();
+                $this->cipher_name_openssl = 'des-' . $this->_openssl_translate_mode();
             }
         }
 
-        return parent::isValidEngineHelper($engine);
+        return parent::isValidEngine($engine);
     }
 
     /**
      * Sets the key.
      *
-     * Keys must be 64-bits long or 8 bytes long.
+     * Keys can be of any length.  DES, itself, uses 64-bit keys (eg. strlen($key) == 8), however, we
+     * only use the first eight, if $key has more then eight characters in it, and pad $key with the
+     * null byte if it is less then eight characters long.
      *
      * DES also requires that every eighth bit be a parity bit, however, we'll ignore that.
      *
-     * @see \phpseclib3\Crypt\Common\SymmetricKey::setKey()
+     * If the key is not explicitly set, it'll be assumed to be all zero's.
+     *
+     * @see \phpseclib\Crypt\Base::setKey()
+     * @access public
      * @param string $key
      */
-    public function setKey($key)
+    function setKey($key)
     {
-        if (!($this instanceof TripleDES) && strlen($key) != 8) {
-            throw new \LengthException('Key of size ' . strlen($key) . ' not supported by this algorithm. Only keys of size 8 are supported');
+        // We check/cut here only up to max length of the key.
+        // Key padding to the proper length will be done in _setupKey()
+        if (strlen($key) > $this->key_length_max) {
+            $key = substr($key, 0, $this->key_length_max);
         }
 
         // Sets the key
@@ -631,29 +630,31 @@ class DES extends BlockCipher
     /**
      * Encrypts a block
      *
-     * @see \phpseclib3\Crypt\Common\SymmetricKey::encryptBlock()
-     * @see \phpseclib3\Crypt\Common\SymmetricKey::encrypt()
+     * @see \phpseclib\Crypt\Base::_encryptBlock()
+     * @see \phpseclib\Crypt\Base::encrypt()
      * @see self::encrypt()
+     * @access private
      * @param string $in
      * @return string
      */
-    protected function encryptBlock($in)
+    function _encryptBlock($in)
     {
-        return $this->processBlock($in, self::ENCRYPT);
+        return $this->_processBlock($in, self::ENCRYPT);
     }
 
     /**
      * Decrypts a block
      *
-     * @see \phpseclib3\Crypt\Common\SymmetricKey::decryptBlock()
-     * @see \phpseclib3\Crypt\Common\SymmetricKey::decrypt()
+     * @see \phpseclib\Crypt\Base::_decryptBlock()
+     * @see \phpseclib\Crypt\Base::decrypt()
      * @see self::decrypt()
+     * @access private
      * @param string $in
      * @return string
      */
-    protected function decryptBlock($in)
+    function _decryptBlock($in)
     {
-        return $this->processBlock($in, self::DECRYPT);
+        return $this->_processBlock($in, self::DECRYPT);
     }
 
     /**
@@ -663,28 +664,29 @@ class DES extends BlockCipher
      * {@link http://en.wikipedia.org/wiki/Image:Feistel.png Feistel.png} to get a general
      * idea of what this function does.
      *
-     * @see self::encryptBlock()
-     * @see self::decryptBlock()
+     * @see self::_encryptBlock()
+     * @see self::_decryptBlock()
+     * @access private
      * @param string $block
      * @param int $mode
      * @return string
      */
-    private function processBlock($block, $mode)
+    function _processBlock($block, $mode)
     {
         static $sbox1, $sbox2, $sbox3, $sbox4, $sbox5, $sbox6, $sbox7, $sbox8, $shuffleip, $shuffleinvip;
         if (!$sbox1) {
-            $sbox1 = array_map('intval', self::$sbox1);
-            $sbox2 = array_map('intval', self::$sbox2);
-            $sbox3 = array_map('intval', self::$sbox3);
-            $sbox4 = array_map('intval', self::$sbox4);
-            $sbox5 = array_map('intval', self::$sbox5);
-            $sbox6 = array_map('intval', self::$sbox6);
-            $sbox7 = array_map('intval', self::$sbox7);
-            $sbox8 = array_map('intval', self::$sbox8);
+            $sbox1 = array_map("intval", $this->sbox1);
+            $sbox2 = array_map("intval", $this->sbox2);
+            $sbox3 = array_map("intval", $this->sbox3);
+            $sbox4 = array_map("intval", $this->sbox4);
+            $sbox5 = array_map("intval", $this->sbox5);
+            $sbox6 = array_map("intval", $this->sbox6);
+            $sbox7 = array_map("intval", $this->sbox7);
+            $sbox8 = array_map("intval", $this->sbox8);
             /* Merge $shuffle with $[inv]ipmap */
             for ($i = 0; $i < 256; ++$i) {
-                $shuffleip[]    =  self::$shuffle[self::$ipmap[$i]];
-                $shuffleinvip[] =  self::$shuffle[self::$invipmap[$i]];
+                $shuffleip[]    =  $this->shuffle[$this->ipmap[$i]];
+                $shuffleinvip[] =  $this->shuffle[$this->invipmap[$i]];
             }
         }
 
@@ -693,7 +695,7 @@ class DES extends BlockCipher
 
         // Do the initial IP permutation.
         $t = unpack('Nl/Nr', $block);
-        list($l, $r) = [$t['l'], $t['r']];
+        list($l, $r) = array($t['l'], $t['r']);
         $block = ($shuffleip[ $r        & 0xFF] & "\x80\x80\x80\x80\x80\x80\x80\x80") |
                  ($shuffleip[($r >>  8) & 0xFF] & "\x40\x40\x40\x40\x40\x40\x40\x40") |
                  ($shuffleip[($r >> 16) & 0xFF] & "\x20\x20\x20\x20\x20\x20\x20\x20") |
@@ -705,7 +707,7 @@ class DES extends BlockCipher
 
         // Extract L0 and R0.
         $t = unpack('Nl/Nr', $block);
-        list($l, $r) = [$t['l'], $t['r']];
+        list($l, $r) = array($t['l'], $t['r']);
 
         for ($des_round = 0; $des_round < $this->des_rounds; ++$des_round) {
             // Perform the 16 steps.
@@ -747,21 +749,22 @@ class DES extends BlockCipher
     /**
      * Creates the key schedule
      *
-     * @see \phpseclib3\Crypt\Common\SymmetricKey::setupKey()
+     * @see \phpseclib\Crypt\Base::_setupKey()
+     * @access private
      */
-    protected function setupKey()
+    function _setupKey()
     {
         if (isset($this->kl['key']) && $this->key === $this->kl['key'] && $this->des_rounds === $this->kl['des_rounds']) {
             // already expanded
             return;
         }
-        $this->kl = ['key' => $this->key, 'des_rounds' => $this->des_rounds];
+        $this->kl = array('key' => $this->key, 'des_rounds' => $this->des_rounds);
 
-        static $shifts = [ // number of key bits shifted per round
+        static $shifts = array( // number of key bits shifted per round
             1, 1, 2, 2, 2, 2, 2, 2, 1, 2, 2, 2, 2, 2, 2, 1
-        ];
+        );
 
-        static $pc1map = [
+        static $pc1map = array(
             0x00, 0x00, 0x08, 0x08, 0x04, 0x04, 0x0C, 0x0C,
             0x02, 0x02, 0x0A, 0x0A, 0x06, 0x06, 0x0E, 0x0E,
             0x10, 0x10, 0x18, 0x18, 0x14, 0x14, 0x1C, 0x1C,
@@ -794,16 +797,16 @@ class DES extends BlockCipher
             0xE2, 0xE2, 0xEA, 0xEA, 0xE6, 0xE6, 0xEE, 0xEE,
             0xF0, 0xF0, 0xF8, 0xF8, 0xF4, 0xF4, 0xFC, 0xFC,
             0xF2, 0xF2, 0xFA, 0xFA, 0xF6, 0xF6, 0xFE, 0xFE
-        ];
+        );
 
         // Mapping tables for the PC-2 transformation.
-        static $pc2mapc1 = [
+        static $pc2mapc1 = array(
             0x00000000, 0x00000400, 0x00200000, 0x00200400,
             0x00000001, 0x00000401, 0x00200001, 0x00200401,
             0x02000000, 0x02000400, 0x02200000, 0x02200400,
             0x02000001, 0x02000401, 0x02200001, 0x02200401
-        ];
-        static $pc2mapc2 = [
+        );
+        static $pc2mapc2 = array(
             0x00000000, 0x00000800, 0x08000000, 0x08000800,
             0x00010000, 0x00010800, 0x08010000, 0x08010800,
             0x00000000, 0x00000800, 0x08000000, 0x08000800,
@@ -868,8 +871,8 @@ class DES extends BlockCipher
             0x01050110, 0x01050910, 0x09050110, 0x09050910,
             0x01040110, 0x01040910, 0x09040110, 0x09040910,
             0x01050110, 0x01050910, 0x09050110, 0x09050910
-        ];
-        static $pc2mapc3 = [
+        );
+        static $pc2mapc3 = array(
             0x00000000, 0x00000004, 0x00001000, 0x00001004,
             0x00000000, 0x00000004, 0x00001000, 0x00001004,
             0x10000000, 0x10000004, 0x10001000, 0x10001004,
@@ -934,8 +937,8 @@ class DES extends BlockCipher
             0x20080022, 0x20080026, 0x20081022, 0x20081026,
             0x30080022, 0x30080026, 0x30081022, 0x30081026,
             0x30080022, 0x30080026, 0x30081022, 0x30081026
-        ];
-        static $pc2mapc4 = [
+        );
+        static $pc2mapc4 = array(
             0x00000000, 0x00100000, 0x00000008, 0x00100008,
             0x00000200, 0x00100200, 0x00000208, 0x00100208,
             0x00000000, 0x00100000, 0x00000008, 0x00100008,
@@ -1000,14 +1003,14 @@ class DES extends BlockCipher
             0x04022200, 0x04122200, 0x04022208, 0x04122208,
             0x04022000, 0x04122000, 0x04022008, 0x04122008,
             0x04022200, 0x04122200, 0x04022208, 0x04122208
-        ];
-        static $pc2mapd1 = [
+        );
+        static $pc2mapd1 = array(
             0x00000000, 0x00000001, 0x08000000, 0x08000001,
             0x00200000, 0x00200001, 0x08200000, 0x08200001,
             0x00000002, 0x00000003, 0x08000002, 0x08000003,
             0x00200002, 0x00200003, 0x08200002, 0x08200003
-        ];
-        static $pc2mapd2 = [
+        );
+        static $pc2mapd2 = array(
             0x00000000, 0x00100000, 0x00000800, 0x00100800,
             0x00000000, 0x00100000, 0x00000800, 0x00100800,
             0x04000000, 0x04100000, 0x04000800, 0x04100800,
@@ -1072,8 +1075,8 @@ class DES extends BlockCipher
             0x00020204, 0x00120204, 0x00020A04, 0x00120A04,
             0x04020204, 0x04120204, 0x04020A04, 0x04120A04,
             0x04020204, 0x04120204, 0x04020A04, 0x04120A04
-        ];
-        static $pc2mapd3 = [
+        );
+        static $pc2mapd3 = array(
             0x00000000, 0x00010000, 0x02000000, 0x02010000,
             0x00000020, 0x00010020, 0x02000020, 0x02010020,
             0x00040000, 0x00050000, 0x02040000, 0x02050000,
@@ -1138,8 +1141,8 @@ class DES extends BlockCipher
             0x20002030, 0x20012030, 0x22002030, 0x22012030,
             0x20042010, 0x20052010, 0x22042010, 0x22052010,
             0x20042030, 0x20052030, 0x22042030, 0x22052030
-        ];
-        static $pc2mapd4 = [
+        );
+        static $pc2mapd4 = array(
             0x00000000, 0x00000400, 0x01000000, 0x01000400,
             0x00000000, 0x00000400, 0x01000000, 0x01000400,
             0x00000100, 0x00000500, 0x01000100, 0x01000500,
@@ -1204,33 +1207,33 @@ class DES extends BlockCipher
             0x10081008, 0x10081408, 0x11081008, 0x11081408,
             0x10081108, 0x10081508, 0x11081108, 0x11081508,
             0x10081108, 0x10081508, 0x11081108, 0x11081508
-        ];
+        );
 
-        $keys = [];
+        $keys = array();
         for ($des_round = 0; $des_round < $this->des_rounds; ++$des_round) {
             // pad the key and remove extra characters as appropriate.
             $key = str_pad(substr($this->key, $des_round * 8, 8), 8, "\0");
 
             // Perform the PC/1 transformation and compute C and D.
             $t = unpack('Nl/Nr', $key);
-            list($l, $r) = [$t['l'], $t['r']];
-            $key = (self::$shuffle[$pc1map[ $r        & 0xFF]] & "\x80\x80\x80\x80\x80\x80\x80\x00") |
-                   (self::$shuffle[$pc1map[($r >>  8) & 0xFF]] & "\x40\x40\x40\x40\x40\x40\x40\x00") |
-                   (self::$shuffle[$pc1map[($r >> 16) & 0xFF]] & "\x20\x20\x20\x20\x20\x20\x20\x00") |
-                   (self::$shuffle[$pc1map[($r >> 24) & 0xFF]] & "\x10\x10\x10\x10\x10\x10\x10\x00") |
-                   (self::$shuffle[$pc1map[ $l        & 0xFF]] & "\x08\x08\x08\x08\x08\x08\x08\x00") |
-                   (self::$shuffle[$pc1map[($l >>  8) & 0xFF]] & "\x04\x04\x04\x04\x04\x04\x04\x00") |
-                   (self::$shuffle[$pc1map[($l >> 16) & 0xFF]] & "\x02\x02\x02\x02\x02\x02\x02\x00") |
-                   (self::$shuffle[$pc1map[($l >> 24) & 0xFF]] & "\x01\x01\x01\x01\x01\x01\x01\x00");
+            list($l, $r) = array($t['l'], $t['r']);
+            $key = ($this->shuffle[$pc1map[ $r        & 0xFF]] & "\x80\x80\x80\x80\x80\x80\x80\x00") |
+                   ($this->shuffle[$pc1map[($r >>  8) & 0xFF]] & "\x40\x40\x40\x40\x40\x40\x40\x00") |
+                   ($this->shuffle[$pc1map[($r >> 16) & 0xFF]] & "\x20\x20\x20\x20\x20\x20\x20\x00") |
+                   ($this->shuffle[$pc1map[($r >> 24) & 0xFF]] & "\x10\x10\x10\x10\x10\x10\x10\x00") |
+                   ($this->shuffle[$pc1map[ $l        & 0xFF]] & "\x08\x08\x08\x08\x08\x08\x08\x00") |
+                   ($this->shuffle[$pc1map[($l >>  8) & 0xFF]] & "\x04\x04\x04\x04\x04\x04\x04\x00") |
+                   ($this->shuffle[$pc1map[($l >> 16) & 0xFF]] & "\x02\x02\x02\x02\x02\x02\x02\x00") |
+                   ($this->shuffle[$pc1map[($l >> 24) & 0xFF]] & "\x01\x01\x01\x01\x01\x01\x01\x00");
             $key = unpack('Nc/Nd', $key);
             $c = ( $key['c'] >> 4) & 0x0FFFFFFF;
             $d = (($key['d'] >> 4) & 0x0FFFFFF0) | ($key['c'] & 0x0F);
 
-            $keys[$des_round] = [
-                self::ENCRYPT => [],
+            $keys[$des_round] = array(
+                self::ENCRYPT => array(),
                 self::DECRYPT => array_fill(0, 32, 0)
-            ];
-            for ($i = 0, $ki = 31; $i < 16; ++$i, $ki -= 2) {
+            );
+            for ($i = 0, $ki = 31; $i < 16; ++$i, $ki-= 2) {
                 $c <<= $shifts[$i];
                 $c = ($c | ($c >> 28)) & 0x0FFFFFFF;
                 $d <<= $shifts[$i];
@@ -1243,9 +1246,9 @@ class DES extends BlockCipher
                       $pc2mapd3[($d >>  8) & 0xFF] | $pc2mapd4[ $d        & 0xFF];
 
                 // Reorder: odd bytes/even bytes. Push the result in key schedule.
-                $val1 = ( $cp        & intval(0xFF000000)) | (($cp <<  8) & 0x00FF0000) |
+                $val1 = ( $cp        & 0xFF000000) | (($cp <<  8) & 0x00FF0000) |
                         (($dp >> 16) & 0x0000FF00) | (($dp >>  8) & 0x000000FF);
-                $val2 = (($cp <<  8) & intval(0xFF000000)) | (($cp << 16) & 0x00FF0000) |
+                $val2 = (($cp <<  8) & 0xFF000000) | (($cp << 16) & 0x00FF0000) |
                         (($dp >>  8) & 0x0000FF00) | ( $dp        & 0x000000FF);
                 $keys[$des_round][self::ENCRYPT][       ] = $val1;
                 $keys[$des_round][self::DECRYPT][$ki - 1] = $val1;
@@ -1256,7 +1259,7 @@ class DES extends BlockCipher
 
         switch ($this->des_rounds) {
             case 3: // 3DES keys
-                $this->keys = [
+                $this->keys = array(
                     self::ENCRYPT => array_merge(
                         $keys[0][self::ENCRYPT],
                         $keys[1][self::DECRYPT],
@@ -1267,126 +1270,174 @@ class DES extends BlockCipher
                         $keys[1][self::ENCRYPT],
                         $keys[0][self::DECRYPT]
                     )
-                ];
+                );
                 break;
             // case 1: // DES keys
             default:
-                $this->keys = [
+                $this->keys = array(
                     self::ENCRYPT => $keys[0][self::ENCRYPT],
                     self::DECRYPT => $keys[0][self::DECRYPT]
-                ];
+                );
         }
     }
 
     /**
      * Setup the performance-optimized function for de/encrypt()
      *
-     * @see \phpseclib3\Crypt\Common\SymmetricKey::setupInlineCrypt()
+     * @see \phpseclib\Crypt\Base::_setupInlineCrypt()
+     * @access private
      */
-    protected function setupInlineCrypt()
+    function _setupInlineCrypt()
     {
+        $lambda_functions =& self::_getLambdaFunctions();
+
         // Engine configuration for:
         // -  DES ($des_rounds == 1) or
         // - 3DES ($des_rounds == 3)
         $des_rounds = $this->des_rounds;
 
-        $init_crypt = 'static $sbox1, $sbox2, $sbox3, $sbox4, $sbox5, $sbox6, $sbox7, $sbox8, $shuffleip, $shuffleinvip;
-            if (!$sbox1) {
-                $sbox1 = array_map("intval", self::$sbox1);
-                $sbox2 = array_map("intval", self::$sbox2);
-                $sbox3 = array_map("intval", self::$sbox3);
-                $sbox4 = array_map("intval", self::$sbox4);
-                $sbox5 = array_map("intval", self::$sbox5);
-                $sbox6 = array_map("intval", self::$sbox6);
-                $sbox7 = array_map("intval", self::$sbox7);
-                $sbox8 = array_map("intval", self::$sbox8);'
-                /* Merge $shuffle with $[inv]ipmap */ . '
-                for ($i = 0; $i < 256; ++$i) {
-                    $shuffleip[]    =  self::$shuffle[self::$ipmap[$i]];
-                    $shuffleinvip[] =  self::$shuffle[self::$invipmap[$i]];
-                }
-            }
-        ';
+        // We create max. 10 hi-optimized code for memory reason. Means: For each $key one ultra fast inline-crypt function.
+        // (Currently, for DES, one generated $lambda_function cost on php5.5@32bit ~135kb unfreeable mem and ~230kb on php5.5@64bit)
+        // (Currently, for TripleDES, one generated $lambda_function cost on php5.5@32bit ~240kb unfreeable mem and ~340kb on php5.5@64bit)
+        // After that, we'll still create very fast optimized code but not the hi-ultimative code, for each $mode one
+        $gen_hi_opt_code = (bool)( count($lambda_functions) < 10 );
 
-        $k = [
-            self::ENCRYPT => $this->keys[self::ENCRYPT],
-            self::DECRYPT => $this->keys[self::DECRYPT]
-        ];
-        $init_encrypt = '';
-        $init_decrypt = '';
-
-        // Creating code for en- and decryption.
-        $crypt_block = [];
-        foreach ([self::ENCRYPT, self::DECRYPT] as $c) {
-            /* Do the initial IP permutation. */
-            $crypt_block[$c] = '
-                $in = unpack("N*", $in);
-                $l  = $in[1];
-                $r  = $in[2];
-                $in = unpack("N*",
-                    ($shuffleip[ $r        & 0xFF] & "\x80\x80\x80\x80\x80\x80\x80\x80") |
-                    ($shuffleip[($r >>  8) & 0xFF] & "\x40\x40\x40\x40\x40\x40\x40\x40") |
-                    ($shuffleip[($r >> 16) & 0xFF] & "\x20\x20\x20\x20\x20\x20\x20\x20") |
-                    ($shuffleip[($r >> 24) & 0xFF] & "\x10\x10\x10\x10\x10\x10\x10\x10") |
-                    ($shuffleip[ $l        & 0xFF] & "\x08\x08\x08\x08\x08\x08\x08\x08") |
-                    ($shuffleip[($l >>  8) & 0xFF] & "\x04\x04\x04\x04\x04\x04\x04\x04") |
-                    ($shuffleip[($l >> 16) & 0xFF] & "\x02\x02\x02\x02\x02\x02\x02\x02") |
-                    ($shuffleip[($l >> 24) & 0xFF] & "\x01\x01\x01\x01\x01\x01\x01\x01")
-                );
-                ' . /* Extract L0 and R0 */ '
-                $l = $in[1];
-                $r = $in[2];
-            ';
-
-            $l = '$l';
-            $r = '$r';
-
-            // Perform DES or 3DES.
-            for ($ki = -1, $des_round = 0; $des_round < $des_rounds; ++$des_round) {
-                // Perform the 16 steps.
-                for ($i = 0; $i < 16; ++$i) {
-                    // start of "the Feistel (F) function" - see the following URL:
-                    // http://en.wikipedia.org/wiki/Image:Data_Encryption_Standard_InfoBox_Diagram.png
-                    // Merge key schedule.
-                    $crypt_block[$c] .= '
-                        $b1 = ((' . $r . ' >>  3) & 0x1FFFFFFF)  ^ (' . $r . ' << 29) ^ ' . $k[$c][++$ki] . ';
-                        $b2 = ((' . $r . ' >> 31) & 0x00000001)  ^ (' . $r . ' <<  1) ^ ' . $k[$c][++$ki] . ';' .
-                        /* S-box indexing. */
-                        $l . ' = $sbox1[($b1 >> 24) & 0x3F] ^ $sbox2[($b2 >> 24) & 0x3F] ^
-                                 $sbox3[($b1 >> 16) & 0x3F] ^ $sbox4[($b2 >> 16) & 0x3F] ^
-                                 $sbox5[($b1 >>  8) & 0x3F] ^ $sbox6[($b2 >>  8) & 0x3F] ^
-                                 $sbox7[ $b1        & 0x3F] ^ $sbox8[ $b2        & 0x3F] ^ ' . $l . ';
-                    ';
-                    // end of "the Feistel (F) function"
-
-                    // swap L & R
-                    list($l, $r) = [$r, $l];
-                }
-                list($l, $r) = [$r, $l];
-            }
-
-            // Perform the inverse IP permutation.
-            $crypt_block[$c] .= '$in =
-                ($shuffleinvip[($l >> 24) & 0xFF] & "\x80\x80\x80\x80\x80\x80\x80\x80") |
-                ($shuffleinvip[($r >> 24) & 0xFF] & "\x40\x40\x40\x40\x40\x40\x40\x40") |
-                ($shuffleinvip[($l >> 16) & 0xFF] & "\x20\x20\x20\x20\x20\x20\x20\x20") |
-                ($shuffleinvip[($r >> 16) & 0xFF] & "\x10\x10\x10\x10\x10\x10\x10\x10") |
-                ($shuffleinvip[($l >>  8) & 0xFF] & "\x08\x08\x08\x08\x08\x08\x08\x08") |
-                ($shuffleinvip[($r >>  8) & 0xFF] & "\x04\x04\x04\x04\x04\x04\x04\x04") |
-                ($shuffleinvip[ $l        & 0xFF] & "\x02\x02\x02\x02\x02\x02\x02\x02") |
-                ($shuffleinvip[ $r        & 0xFF] & "\x01\x01\x01\x01\x01\x01\x01\x01");
-            ';
+        // Generation of a unique hash for our generated code
+        $code_hash = "Crypt_DES, $des_rounds, {$this->mode}";
+        if ($gen_hi_opt_code) {
+            // For hi-optimized code, we create for each combination of
+            // $mode, $des_rounds and $this->key its own encrypt/decrypt function.
+            // After max 10 hi-optimized functions, we create generic
+            // (still very fast.. but not ultra) functions for each $mode/$des_rounds
+            // Currently 2 * 5 generic functions will be then max. possible.
+            $code_hash = str_pad($code_hash, 32) . $this->_hashInlineCryptFunction($this->key);
         }
 
-        // Creates the inline-crypt function
-        $this->inline_crypt = $this->createInlineCryptFunction(
-            [
-               'init_crypt'    => $init_crypt,
-               'init_encrypt'  => $init_encrypt,
-               'init_decrypt'  => $init_decrypt,
-               'encrypt_block' => $crypt_block[self::ENCRYPT],
-               'decrypt_block' => $crypt_block[self::DECRYPT]
-            ]
-        );
+        // Is there a re-usable $lambda_functions in there? If not, we have to create it.
+        if (!isset($lambda_functions[$code_hash])) {
+            // Init code for both, encrypt and decrypt.
+            $init_crypt = 'static $sbox1, $sbox2, $sbox3, $sbox4, $sbox5, $sbox6, $sbox7, $sbox8, $shuffleip, $shuffleinvip;
+                if (!$sbox1) {
+                    $sbox1 = array_map("intval", $self->sbox1);
+                    $sbox2 = array_map("intval", $self->sbox2);
+                    $sbox3 = array_map("intval", $self->sbox3);
+                    $sbox4 = array_map("intval", $self->sbox4);
+                    $sbox5 = array_map("intval", $self->sbox5);
+                    $sbox6 = array_map("intval", $self->sbox6);
+                    $sbox7 = array_map("intval", $self->sbox7);
+                    $sbox8 = array_map("intval", $self->sbox8);'
+                    /* Merge $shuffle with $[inv]ipmap */ . '
+                    for ($i = 0; $i < 256; ++$i) {
+                        $shuffleip[]    =  $self->shuffle[$self->ipmap[$i]];
+                        $shuffleinvip[] =  $self->shuffle[$self->invipmap[$i]];
+                    }
+                }
+            ';
+
+            switch (true) {
+                case $gen_hi_opt_code:
+                    // In Hi-optimized code mode, we use our [3]DES key schedule as hardcoded integers.
+                    // No futher initialisation of the $keys schedule is necessary.
+                    // That is the extra performance boost.
+                    $k = array(
+                        self::ENCRYPT => $this->keys[self::ENCRYPT],
+                        self::DECRYPT => $this->keys[self::DECRYPT]
+                    );
+                    $init_encrypt = '';
+                    $init_decrypt = '';
+                    break;
+                default:
+                    // In generic optimized code mode, we have to use, as the best compromise [currently],
+                    // our key schedule as $ke/$kd arrays. (with hardcoded indexes...)
+                    $k = array(
+                        self::ENCRYPT => array(),
+                        self::DECRYPT => array()
+                    );
+                    for ($i = 0, $c = count($this->keys[self::ENCRYPT]); $i < $c; ++$i) {
+                        $k[self::ENCRYPT][$i] = '$ke[' . $i . ']';
+                        $k[self::DECRYPT][$i] = '$kd[' . $i . ']';
+                    }
+                    $init_encrypt = '$ke = $self->keys[self::ENCRYPT];';
+                    $init_decrypt = '$kd = $self->keys[self::DECRYPT];';
+                    break;
+            }
+
+            // Creating code for en- and decryption.
+            $crypt_block = array();
+            foreach (array(self::ENCRYPT, self::DECRYPT) as $c) {
+                /* Do the initial IP permutation. */
+                $crypt_block[$c] = '
+                    $in = unpack("N*", $in);
+                    $l  = $in[1];
+                    $r  = $in[2];
+                    $in = unpack("N*",
+                        ($shuffleip[ $r        & 0xFF] & "\x80\x80\x80\x80\x80\x80\x80\x80") |
+                        ($shuffleip[($r >>  8) & 0xFF] & "\x40\x40\x40\x40\x40\x40\x40\x40") |
+                        ($shuffleip[($r >> 16) & 0xFF] & "\x20\x20\x20\x20\x20\x20\x20\x20") |
+                        ($shuffleip[($r >> 24) & 0xFF] & "\x10\x10\x10\x10\x10\x10\x10\x10") |
+                        ($shuffleip[ $l        & 0xFF] & "\x08\x08\x08\x08\x08\x08\x08\x08") |
+                        ($shuffleip[($l >>  8) & 0xFF] & "\x04\x04\x04\x04\x04\x04\x04\x04") |
+                        ($shuffleip[($l >> 16) & 0xFF] & "\x02\x02\x02\x02\x02\x02\x02\x02") |
+                        ($shuffleip[($l >> 24) & 0xFF] & "\x01\x01\x01\x01\x01\x01\x01\x01")
+                    );
+                    ' . /* Extract L0 and R0 */ '
+                    $l = $in[1];
+                    $r = $in[2];
+                ';
+
+                $l = '$l';
+                $r = '$r';
+
+                // Perform DES or 3DES.
+                for ($ki = -1, $des_round = 0; $des_round < $des_rounds; ++$des_round) {
+                    // Perform the 16 steps.
+                    for ($i = 0; $i < 16; ++$i) {
+                        // start of "the Feistel (F) function" - see the following URL:
+                        // http://en.wikipedia.org/wiki/Image:Data_Encryption_Standard_InfoBox_Diagram.png
+                        // Merge key schedule.
+                        $crypt_block[$c].= '
+                            $b1 = ((' . $r . ' >>  3) & 0x1FFFFFFF)  ^ (' . $r . ' << 29) ^ ' . $k[$c][++$ki] . ';
+                            $b2 = ((' . $r . ' >> 31) & 0x00000001)  ^ (' . $r . ' <<  1) ^ ' . $k[$c][++$ki] . ';' .
+                            /* S-box indexing. */
+                            $l . ' = $sbox1[($b1 >> 24) & 0x3F] ^ $sbox2[($b2 >> 24) & 0x3F] ^
+                                     $sbox3[($b1 >> 16) & 0x3F] ^ $sbox4[($b2 >> 16) & 0x3F] ^
+                                     $sbox5[($b1 >>  8) & 0x3F] ^ $sbox6[($b2 >>  8) & 0x3F] ^
+                                     $sbox7[ $b1        & 0x3F] ^ $sbox8[ $b2        & 0x3F] ^ ' . $l . ';
+                        ';
+                        // end of "the Feistel (F) function"
+
+                        // swap L & R
+                        list($l, $r) = array($r, $l);
+                    }
+                    list($l, $r) = array($r, $l);
+                }
+
+                // Perform the inverse IP permutation.
+                $crypt_block[$c].= '$in =
+                    ($shuffleinvip[($l >> 24) & 0xFF] & "\x80\x80\x80\x80\x80\x80\x80\x80") |
+                    ($shuffleinvip[($r >> 24) & 0xFF] & "\x40\x40\x40\x40\x40\x40\x40\x40") |
+                    ($shuffleinvip[($l >> 16) & 0xFF] & "\x20\x20\x20\x20\x20\x20\x20\x20") |
+                    ($shuffleinvip[($r >> 16) & 0xFF] & "\x10\x10\x10\x10\x10\x10\x10\x10") |
+                    ($shuffleinvip[($l >>  8) & 0xFF] & "\x08\x08\x08\x08\x08\x08\x08\x08") |
+                    ($shuffleinvip[($r >>  8) & 0xFF] & "\x04\x04\x04\x04\x04\x04\x04\x04") |
+                    ($shuffleinvip[ $l        & 0xFF] & "\x02\x02\x02\x02\x02\x02\x02\x02") |
+                    ($shuffleinvip[ $r        & 0xFF] & "\x01\x01\x01\x01\x01\x01\x01\x01");
+                ';
+            }
+
+            // Creates the inline-crypt function
+            $lambda_functions[$code_hash] = $this->_createInlineCryptFunction(
+                array(
+                   'init_crypt'    => $init_crypt,
+                   'init_encrypt'  => $init_encrypt,
+                   'init_decrypt'  => $init_decrypt,
+                   'encrypt_block' => $crypt_block[self::ENCRYPT],
+                   'decrypt_block' => $crypt_block[self::DECRYPT]
+                )
+            );
+        }
+
+        // Set the inline-crypt function as callback in: $this->inline_crypt
+        $this->inline_crypt = $lambda_functions[$code_hash];
     }
 }
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/DH.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/DH.php
deleted file mode 100644
index e1deaf08..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/DH.php
+++ /dev/null
@@ -1,405 +0,0 @@
-<?php
-
-/**
- * Pure-PHP (EC)DH implementation
- *
- * PHP version 5
- *
- * Here's an example of how to compute a shared secret with this library:
- * <code>
- * <?php
- * include 'vendor/autoload.php';
- *
- * $ourPrivate = \phpseclib3\Crypt\DH::createKey();
- * $secret = DH::computeSecret($ourPrivate, $theirPublic);
- *
- * ?>
- * </code>
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\Crypt;
-
-use phpseclib3\Crypt\Common\AsymmetricKey;
-use phpseclib3\Crypt\DH\Parameters;
-use phpseclib3\Crypt\DH\PrivateKey;
-use phpseclib3\Crypt\DH\PublicKey;
-use phpseclib3\Exception\NoKeyLoadedException;
-use phpseclib3\Exception\UnsupportedOperationException;
-use phpseclib3\Math\BigInteger;
-
-/**
- * Pure-PHP (EC)DH implementation
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class DH extends AsymmetricKey
-{
-    /**
-     * Algorithm Name
-     *
-     * @var string
-     */
-    const ALGORITHM = 'DH';
-
-    /**
-     * DH prime
-     *
-     * @var \phpseclib3\Math\BigInteger
-     */
-    protected $prime;
-
-    /**
-     * DH Base
-     *
-     * Prime divisor of p-1
-     *
-     * @var \phpseclib3\Math\BigInteger
-     */
-    protected $base;
-
-    /**
-     * Public Key
-     *
-     * @var \phpseclib3\Math\BigInteger
-     */
-    protected $publicKey;
-
-    /**
-     * Create DH parameters
-     *
-     * This method is a bit polymorphic. It can take any of the following:
-     *  - two BigInteger's (prime and base)
-     *  - an integer representing the size of the prime in bits (the base is assumed to be 2)
-     *  - a string (eg. diffie-hellman-group14-sha1)
-     *
-     * @return Parameters
-     */
-    public static function createParameters(...$args)
-    {
-        $class = new \ReflectionClass(static::class);
-        if ($class->isFinal()) {
-            throw new \RuntimeException('createParameters() should not be called from final classes (' . static::class . ')');
-        }
-
-        $params = new Parameters();
-        if (count($args) == 2 && $args[0] instanceof BigInteger && $args[1] instanceof BigInteger) {
-            //if (!$args[0]->isPrime()) {
-            //    throw new \InvalidArgumentException('The first parameter should be a prime number');
-            //}
-            $params->prime = $args[0];
-            $params->base = $args[1];
-            return $params;
-        } elseif (count($args) == 1 && is_numeric($args[0])) {
-            $params->prime = BigInteger::randomPrime($args[0]);
-            $params->base = new BigInteger(2);
-            return $params;
-        } elseif (count($args) != 1 || !is_string($args[0])) {
-            throw new \InvalidArgumentException('Valid parameters are either: two BigInteger\'s (prime and base), a single integer (the length of the prime; base is assumed to be 2) or a string');
-        }
-        switch ($args[0]) {
-            // see http://tools.ietf.org/html/rfc2409#section-6.2 and
-            // http://tools.ietf.org/html/rfc2412, appendex E
-            case 'diffie-hellman-group1-sha1':
-                $prime = 'FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD129024E088A67CC74' .
-                         '020BBEA63B139B22514A08798E3404DDEF9519B3CD3A431B302B0A6DF25F1437' .
-                         '4FE1356D6D51C245E485B576625E7EC6F44C42E9A637ED6B0BFF5CB6F406B7ED' .
-                         'EE386BFB5A899FA5AE9F24117C4B1FE649286651ECE65381FFFFFFFFFFFFFFFF';
-                break;
-            // see http://tools.ietf.org/html/rfc3526#section-3
-            case 'diffie-hellman-group14-sha1': // 2048-bit MODP Group
-            case 'diffie-hellman-group14-sha256':
-                $prime = 'FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD129024E088A67CC74' .
-                         '020BBEA63B139B22514A08798E3404DDEF9519B3CD3A431B302B0A6DF25F1437' .
-                         '4FE1356D6D51C245E485B576625E7EC6F44C42E9A637ED6B0BFF5CB6F406B7ED' .
-                         'EE386BFB5A899FA5AE9F24117C4B1FE649286651ECE45B3DC2007CB8A163BF05' .
-                         '98DA48361C55D39A69163FA8FD24CF5F83655D23DCA3AD961C62F356208552BB' .
-                         '9ED529077096966D670C354E4ABC9804F1746C08CA18217C32905E462E36CE3B' .
-                         'E39E772C180E86039B2783A2EC07A28FB5C55DF06F4C52C9DE2BCBF695581718' .
-                         '3995497CEA956AE515D2261898FA051015728E5A8AACAA68FFFFFFFFFFFFFFFF';
-                break;
-            // see https://tools.ietf.org/html/rfc3526#section-4
-            case 'diffie-hellman-group15-sha512': // 3072-bit MODP Group
-                $prime = 'FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD129024E088A67CC74' .
-                         '020BBEA63B139B22514A08798E3404DDEF9519B3CD3A431B302B0A6DF25F1437' .
-                         '4FE1356D6D51C245E485B576625E7EC6F44C42E9A637ED6B0BFF5CB6F406B7ED' .
-                         'EE386BFB5A899FA5AE9F24117C4B1FE649286651ECE45B3DC2007CB8A163BF05' .
-                         '98DA48361C55D39A69163FA8FD24CF5F83655D23DCA3AD961C62F356208552BB' .
-                         '9ED529077096966D670C354E4ABC9804F1746C08CA18217C32905E462E36CE3B' .
-                         'E39E772C180E86039B2783A2EC07A28FB5C55DF06F4C52C9DE2BCBF695581718' .
-                         '3995497CEA956AE515D2261898FA051015728E5A8AAAC42DAD33170D04507A33' .
-                         'A85521ABDF1CBA64ECFB850458DBEF0A8AEA71575D060C7DB3970F85A6E1E4C7' .
-                         'ABF5AE8CDB0933D71E8C94E04A25619DCEE3D2261AD2EE6BF12FFA06D98A0864' .
-                         'D87602733EC86A64521F2B18177B200CBBE117577A615D6C770988C0BAD946E2' .
-                         '08E24FA074E5AB3143DB5BFCE0FD108E4B82D120A93AD2CAFFFFFFFFFFFFFFFF';
-                break;
-            // see https://tools.ietf.org/html/rfc3526#section-5
-            case 'diffie-hellman-group16-sha512': // 4096-bit MODP Group
-                $prime = 'FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD129024E088A67CC74' .
-                         '020BBEA63B139B22514A08798E3404DDEF9519B3CD3A431B302B0A6DF25F1437' .
-                         '4FE1356D6D51C245E485B576625E7EC6F44C42E9A637ED6B0BFF5CB6F406B7ED' .
-                         'EE386BFB5A899FA5AE9F24117C4B1FE649286651ECE45B3DC2007CB8A163BF05' .
-                         '98DA48361C55D39A69163FA8FD24CF5F83655D23DCA3AD961C62F356208552BB' .
-                         '9ED529077096966D670C354E4ABC9804F1746C08CA18217C32905E462E36CE3B' .
-                         'E39E772C180E86039B2783A2EC07A28FB5C55DF06F4C52C9DE2BCBF695581718' .
-                         '3995497CEA956AE515D2261898FA051015728E5A8AAAC42DAD33170D04507A33' .
-                         'A85521ABDF1CBA64ECFB850458DBEF0A8AEA71575D060C7DB3970F85A6E1E4C7' .
-                         'ABF5AE8CDB0933D71E8C94E04A25619DCEE3D2261AD2EE6BF12FFA06D98A0864' .
-                         'D87602733EC86A64521F2B18177B200CBBE117577A615D6C770988C0BAD946E2' .
-                         '08E24FA074E5AB3143DB5BFCE0FD108E4B82D120A92108011A723C12A787E6D7' .
-                         '88719A10BDBA5B2699C327186AF4E23C1A946834B6150BDA2583E9CA2AD44CE8' .
-                         'DBBBC2DB04DE8EF92E8EFC141FBECAA6287C59474E6BC05D99B2964FA090C3A2' .
-                         '233BA186515BE7ED1F612970CEE2D7AFB81BDD762170481CD0069127D5B05AA9' .
-                         '93B4EA988D8FDDC186FFB7DC90A6C08F4DF435C934063199FFFFFFFFFFFFFFFF';
-                break;
-            // see https://tools.ietf.org/html/rfc3526#section-6
-            case 'diffie-hellman-group17-sha512': // 6144-bit MODP Group
-                $prime = 'FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD129024E088A67CC74' .
-                         '020BBEA63B139B22514A08798E3404DDEF9519B3CD3A431B302B0A6DF25F1437' .
-                         '4FE1356D6D51C245E485B576625E7EC6F44C42E9A637ED6B0BFF5CB6F406B7ED' .
-                         'EE386BFB5A899FA5AE9F24117C4B1FE649286651ECE45B3DC2007CB8A163BF05' .
-                         '98DA48361C55D39A69163FA8FD24CF5F83655D23DCA3AD961C62F356208552BB' .
-                         '9ED529077096966D670C354E4ABC9804F1746C08CA18217C32905E462E36CE3B' .
-                         'E39E772C180E86039B2783A2EC07A28FB5C55DF06F4C52C9DE2BCBF695581718' .
-                         '3995497CEA956AE515D2261898FA051015728E5A8AAAC42DAD33170D04507A33' .
-                         'A85521ABDF1CBA64ECFB850458DBEF0A8AEA71575D060C7DB3970F85A6E1E4C7' .
-                         'ABF5AE8CDB0933D71E8C94E04A25619DCEE3D2261AD2EE6BF12FFA06D98A0864' .
-                         'D87602733EC86A64521F2B18177B200CBBE117577A615D6C770988C0BAD946E2' .
-                         '08E24FA074E5AB3143DB5BFCE0FD108E4B82D120A92108011A723C12A787E6D7' .
-                         '88719A10BDBA5B2699C327186AF4E23C1A946834B6150BDA2583E9CA2AD44CE8' .
-                         'DBBBC2DB04DE8EF92E8EFC141FBECAA6287C59474E6BC05D99B2964FA090C3A2' .
-                         '233BA186515BE7ED1F612970CEE2D7AFB81BDD762170481CD0069127D5B05AA9' .
-                         '93B4EA988D8FDDC186FFB7DC90A6C08F4DF435C93402849236C3FAB4D27C7026' .
-                         'C1D4DCB2602646DEC9751E763DBA37BDF8FF9406AD9E530EE5DB382F413001AE' .
-                         'B06A53ED9027D831179727B0865A8918DA3EDBEBCF9B14ED44CE6CBACED4BB1B' .
-                         'DB7F1447E6CC254B332051512BD7AF426FB8F401378CD2BF5983CA01C64B92EC' .
-                         'F032EA15D1721D03F482D7CE6E74FEF6D55E702F46980C82B5A84031900B1C9E' .
-                         '59E7C97FBEC7E8F323A97A7E36CC88BE0F1D45B7FF585AC54BD407B22B4154AA' .
-                         'CC8F6D7EBF48E1D814CC5ED20F8037E0A79715EEF29BE32806A1D58BB7C5DA76' .
-                         'F550AA3D8A1FBFF0EB19CCB1A313D55CDA56C9EC2EF29632387FE8D76E3C0468' .
-                         '043E8F663F4860EE12BF2D5B0B7474D6E694F91E6DCC4024FFFFFFFFFFFFFFFF';
-                break;
-            // see https://tools.ietf.org/html/rfc3526#section-7
-            case 'diffie-hellman-group18-sha512': // 8192-bit MODP Group
-                $prime = 'FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD129024E088A67CC74' .
-                         '020BBEA63B139B22514A08798E3404DDEF9519B3CD3A431B302B0A6DF25F1437' .
-                         '4FE1356D6D51C245E485B576625E7EC6F44C42E9A637ED6B0BFF5CB6F406B7ED' .
-                         'EE386BFB5A899FA5AE9F24117C4B1FE649286651ECE45B3DC2007CB8A163BF05' .
-                         '98DA48361C55D39A69163FA8FD24CF5F83655D23DCA3AD961C62F356208552BB' .
-                         '9ED529077096966D670C354E4ABC9804F1746C08CA18217C32905E462E36CE3B' .
-                         'E39E772C180E86039B2783A2EC07A28FB5C55DF06F4C52C9DE2BCBF695581718' .
-                         '3995497CEA956AE515D2261898FA051015728E5A8AAAC42DAD33170D04507A33' .
-                         'A85521ABDF1CBA64ECFB850458DBEF0A8AEA71575D060C7DB3970F85A6E1E4C7' .
-                         'ABF5AE8CDB0933D71E8C94E04A25619DCEE3D2261AD2EE6BF12FFA06D98A0864' .
-                         'D87602733EC86A64521F2B18177B200CBBE117577A615D6C770988C0BAD946E2' .
-                         '08E24FA074E5AB3143DB5BFCE0FD108E4B82D120A92108011A723C12A787E6D7' .
-                         '88719A10BDBA5B2699C327186AF4E23C1A946834B6150BDA2583E9CA2AD44CE8' .
-                         'DBBBC2DB04DE8EF92E8EFC141FBECAA6287C59474E6BC05D99B2964FA090C3A2' .
-                         '233BA186515BE7ED1F612970CEE2D7AFB81BDD762170481CD0069127D5B05AA9' .
-                         '93B4EA988D8FDDC186FFB7DC90A6C08F4DF435C93402849236C3FAB4D27C7026' .
-                         'C1D4DCB2602646DEC9751E763DBA37BDF8FF9406AD9E530EE5DB382F413001AE' .
-                         'B06A53ED9027D831179727B0865A8918DA3EDBEBCF9B14ED44CE6CBACED4BB1B' .
-                         'DB7F1447E6CC254B332051512BD7AF426FB8F401378CD2BF5983CA01C64B92EC' .
-                         'F032EA15D1721D03F482D7CE6E74FEF6D55E702F46980C82B5A84031900B1C9E' .
-                         '59E7C97FBEC7E8F323A97A7E36CC88BE0F1D45B7FF585AC54BD407B22B4154AA' .
-                         'CC8F6D7EBF48E1D814CC5ED20F8037E0A79715EEF29BE32806A1D58BB7C5DA76' .
-                         'F550AA3D8A1FBFF0EB19CCB1A313D55CDA56C9EC2EF29632387FE8D76E3C0468' .
-                         '043E8F663F4860EE12BF2D5B0B7474D6E694F91E6DBE115974A3926F12FEE5E4' .
-                         '38777CB6A932DF8CD8BEC4D073B931BA3BC832B68D9DD300741FA7BF8AFC47ED' .
-                         '2576F6936BA424663AAB639C5AE4F5683423B4742BF1C978238F16CBE39D652D' .
-                         'E3FDB8BEFC848AD922222E04A4037C0713EB57A81A23F0C73473FC646CEA306B' .
-                         '4BCBC8862F8385DDFA9D4B7FA2C087E879683303ED5BDD3A062B3CF5B3A278A6' .
-                         '6D2A13F83F44F82DDF310EE074AB6A364597E899A0255DC164F31CC50846851D' .
-                         'F9AB48195DED7EA1B1D510BD7EE74D73FAF36BC31ECFA268359046F4EB879F92' .
-                         '4009438B481C6CD7889A002ED5EE382BC9190DA6FC026E479558E4475677E9AA' .
-                         '9E3050E2765694DFC81F56E880B96E7160C980DD98EDD3DFFFFFFFFFFFFFFFFF';
-                break;
-            default:
-                throw new \InvalidArgumentException('Invalid named prime provided');
-        }
-
-        $params->prime = new BigInteger($prime, 16);
-        $params->base = new BigInteger(2);
-
-        return $params;
-    }
-
-    /**
-     * Create public / private key pair.
-     *
-     * The rationale for the second parameter is described in http://tools.ietf.org/html/rfc4419#section-6.2 :
-     *
-     * "To increase the speed of the key exchange, both client and server may
-     *  reduce the size of their private exponents.  It should be at least
-     *  twice as long as the key material that is generated from the shared
-     *  secret.  For more details, see the paper by van Oorschot and Wiener
-     *  [VAN-OORSCHOT]."
-     *
-     * $length is in bits
-     *
-     * @param Parameters $params
-     * @param int $length optional
-     * @return DH\PrivateKey
-     */
-    public static function createKey(Parameters $params, $length = 0)
-    {
-        $class = new \ReflectionClass(static::class);
-        if ($class->isFinal()) {
-            throw new \RuntimeException('createKey() should not be called from final classes (' . static::class . ')');
-        }
-
-        $one = new BigInteger(1);
-        if ($length) {
-            $max = $one->bitwise_leftShift($length);
-            $max = $max->subtract($one);
-        } else {
-            $max = $params->prime->subtract($one);
-        }
-
-        $key = new PrivateKey();
-        $key->prime = $params->prime;
-        $key->base = $params->base;
-        $key->privateKey = BigInteger::randomRange($one, $max);
-        $key->publicKey = $key->base->powMod($key->privateKey, $key->prime);
-        return $key;
-    }
-
-    /**
-     * Compute Shared Secret
-     *
-     * @param PrivateKey|EC $private
-     * @param PublicKey|BigInteger|string $public
-     * @return mixed
-     */
-    public static function computeSecret($private, $public)
-    {
-        if ($private instanceof PrivateKey) { // DH\PrivateKey
-            switch (true) {
-                case $public instanceof PublicKey:
-                    if (!$private->prime->equals($public->prime) || !$private->base->equals($public->base)) {
-                        throw new \InvalidArgumentException('The public and private key do not share the same prime and / or base numbers');
-                    }
-                    return $public->publicKey->powMod($private->privateKey, $private->prime)->toBytes(true);
-                case is_string($public):
-                    $public = new BigInteger($public, -256);
-                    // fall-through
-                case $public instanceof BigInteger:
-                    return $public->powMod($private->privateKey, $private->prime)->toBytes(true);
-                default:
-                    throw new \InvalidArgumentException('$public needs to be an instance of DH\PublicKey, a BigInteger or a string');
-            }
-        }
-
-        if ($private instanceof EC\PrivateKey) {
-            switch (true) {
-                case $public instanceof EC\PublicKey:
-                    $public = $public->getEncodedCoordinates();
-                    // fall-through
-                case is_string($public):
-                    $point = $private->multiply($public);
-                    switch ($private->getCurve()) {
-                        case 'Curve25519':
-                        case 'Curve448':
-                            $secret = $point;
-                            break;
-                        default:
-                            // according to https://www.secg.org/sec1-v2.pdf#page=33 only X is returned
-                            $secret = substr($point, 1, (strlen($point) - 1) >> 1);
-                    }
-                    /*
-                    if (($secret[0] & "\x80") === "\x80") {
-                        $secret = "\0$secret";
-                    }
-                    */
-                    return $secret;
-                default:
-                    throw new \InvalidArgumentException('$public needs to be an instance of EC\PublicKey or a string (an encoded coordinate)');
-            }
-        }
-    }
-
-    /**
-     * Load the key
-     *
-     * @param string $key
-     * @param string $password optional
-     * @return AsymmetricKey
-     */
-    public static function load($key, $password = false)
-    {
-        try {
-            return EC::load($key, $password);
-        } catch (NoKeyLoadedException $e) {
-        }
-
-        return parent::load($key, $password);
-    }
-
-    /**
-     * OnLoad Handler
-     *
-     * @return bool
-     */
-    protected static function onLoad(array $components)
-    {
-        if (!isset($components['privateKey']) && !isset($components['publicKey'])) {
-            $new = new Parameters();
-        } else {
-            $new = isset($components['privateKey']) ?
-                new PrivateKey() :
-                new PublicKey();
-        }
-
-        $new->prime = $components['prime'];
-        $new->base = $components['base'];
-
-        if (isset($components['privateKey'])) {
-            $new->privateKey = $components['privateKey'];
-        }
-        if (isset($components['publicKey'])) {
-            $new->publicKey = $components['publicKey'];
-        }
-
-        return $new;
-    }
-
-    /**
-     * Determines which hashing function should be used
-     *
-     * @param string $hash
-     */
-    public function withHash($hash)
-    {
-        throw new UnsupportedOperationException('DH does not use a hash algorithm');
-    }
-
-    /**
-     * Returns the hash algorithm currently being used
-     *
-     */
-    public function getHash()
-    {
-        throw new UnsupportedOperationException('DH does not use a hash algorithm');
-    }
-
-    /**
-     * Returns the parameters
-     *
-     * A public / private key is only returned if the currently loaded "key" contains an x or y
-     * value.
-     *
-     * @see self::getPublicKey()
-     * @return mixed
-     */
-    public function getParameters()
-    {
-        $type = DH::validatePlugin('Keys', 'PKCS1', 'saveParameters');
-
-        $key = $type::saveParameters($this->prime, $this->base);
-        return DH::load($key, 'PKCS1');
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/DH/Formats/Keys/PKCS1.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/DH/Formats/Keys/PKCS1.php
deleted file mode 100644
index 65a0a5db..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/DH/Formats/Keys/PKCS1.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-
-/**
- * "PKCS1" Formatted EC Key Handler
- *
- * PHP version 5
- *
- * Processes keys with the following headers:
- *
- * -----BEGIN DH PARAMETERS-----
- *
- * Technically, PKCS1 is for RSA keys, only, but we're using PKCS1 to describe
- * DSA, whose format isn't really formally described anywhere, so might as well
- * use it to describe this, too.
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2015 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\Crypt\DH\Formats\Keys;
-
-use phpseclib3\Crypt\Common\Formats\Keys\PKCS1 as Progenitor;
-use phpseclib3\File\ASN1;
-use phpseclib3\File\ASN1\Maps;
-use phpseclib3\Math\BigInteger;
-
-/**
- * "PKCS1" Formatted DH Key Handler
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class PKCS1 extends Progenitor
-{
-    /**
-     * Break a public or private key down into its constituent components
-     *
-     * @param string $key
-     * @param string $password optional
-     * @return array
-     */
-    public static function load($key, $password = '')
-    {
-        $key = parent::load($key, $password);
-
-        $decoded = ASN1::decodeBER($key);
-        if (!$decoded) {
-            throw new \RuntimeException('Unable to decode BER');
-        }
-
-        $components = ASN1::asn1map($decoded[0], Maps\DHParameter::MAP);
-        if (!is_array($components)) {
-            throw new \RuntimeException('Unable to perform ASN1 mapping on parameters');
-        }
-
-        return $components;
-    }
-
-    /**
-     * Convert EC parameters to the appropriate format
-     *
-     * @return string
-     */
-    public static function saveParameters(BigInteger $prime, BigInteger $base, array $options = [])
-    {
-        $params = [
-            'prime' => $prime,
-            'base' => $base
-        ];
-        $params = ASN1::encodeDER($params, Maps\DHParameter::MAP);
-
-        return "-----BEGIN DH PARAMETERS-----\r\n" .
-               chunk_split(base64_encode($params), 64) .
-               "-----END DH PARAMETERS-----\r\n";
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/DH/Formats/Keys/PKCS8.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/DH/Formats/Keys/PKCS8.php
deleted file mode 100644
index c330a3c7..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/DH/Formats/Keys/PKCS8.php
+++ /dev/null
@@ -1,132 +0,0 @@
-<?php
-
-/**
- * PKCS#8 Formatted DH Key Handler
- *
- * PHP version 5
- *
- * Processes keys with the following headers:
- *
- * -----BEGIN ENCRYPTED PRIVATE KEY-----
- * -----BEGIN PRIVATE KEY-----
- * -----BEGIN PUBLIC KEY-----
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2015 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\Crypt\DH\Formats\Keys;
-
-use phpseclib3\Crypt\Common\Formats\Keys\PKCS8 as Progenitor;
-use phpseclib3\File\ASN1;
-use phpseclib3\File\ASN1\Maps;
-use phpseclib3\Math\BigInteger;
-
-/**
- * PKCS#8 Formatted DH Key Handler
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class PKCS8 extends Progenitor
-{
-    /**
-     * OID Name
-     *
-     * @var string
-     */
-    const OID_NAME = 'dhKeyAgreement';
-
-    /**
-     * OID Value
-     *
-     * @var string
-     */
-    const OID_VALUE = '1.2.840.113549.1.3.1';
-
-    /**
-     * Child OIDs loaded
-     *
-     * @var bool
-     */
-    protected static $childOIDsLoaded = false;
-
-    /**
-     * Break a public or private key down into its constituent components
-     *
-     * @param string $key
-     * @param string $password optional
-     * @return array
-     */
-    public static function load($key, $password = '')
-    {
-        $key = parent::load($key, $password);
-
-        $type = isset($key['privateKey']) ? 'privateKey' : 'publicKey';
-
-        $decoded = ASN1::decodeBER($key[$type . 'Algorithm']['parameters']->element);
-        if (empty($decoded)) {
-            throw new \RuntimeException('Unable to decode BER of parameters');
-        }
-        $components = ASN1::asn1map($decoded[0], Maps\DHParameter::MAP);
-        if (!is_array($components)) {
-            throw new \RuntimeException('Unable to perform ASN1 mapping on parameters');
-        }
-
-        $decoded = ASN1::decodeBER($key[$type]);
-        switch (true) {
-            case !isset($decoded):
-            case !isset($decoded[0]['content']):
-            case !$decoded[0]['content'] instanceof BigInteger:
-                throw new \RuntimeException('Unable to decode BER of parameters');
-        }
-        $components[$type] = $decoded[0]['content'];
-
-        return $components;
-    }
-
-    /**
-     * Convert a private key to the appropriate format.
-     *
-     * @param \phpseclib3\Math\BigInteger $prime
-     * @param \phpseclib3\Math\BigInteger $base
-     * @param \phpseclib3\Math\BigInteger $privateKey
-     * @param \phpseclib3\Math\BigInteger $publicKey
-     * @param string $password optional
-     * @param array $options optional
-     * @return string
-     */
-    public static function savePrivateKey(BigInteger $prime, BigInteger $base, BigInteger $privateKey, BigInteger $publicKey, $password = '', array $options = [])
-    {
-        $params = [
-            'prime' => $prime,
-            'base' => $base
-        ];
-        $params = ASN1::encodeDER($params, Maps\DHParameter::MAP);
-        $params = new ASN1\Element($params);
-        $key = ASN1::encodeDER($privateKey, ['type' => ASN1::TYPE_INTEGER]);
-        return self::wrapPrivateKey($key, [], $params, $password, null, '', $options);
-    }
-
-    /**
-     * Convert a public key to the appropriate format
-     *
-     * @param \phpseclib3\Math\BigInteger $prime
-     * @param \phpseclib3\Math\BigInteger $base
-     * @param \phpseclib3\Math\BigInteger $publicKey
-     * @param array $options optional
-     * @return string
-     */
-    public static function savePublicKey(BigInteger $prime, BigInteger $base, BigInteger $publicKey, array $options = [])
-    {
-        $params = [
-            'prime' => $prime,
-            'base' => $base
-        ];
-        $params = ASN1::encodeDER($params, Maps\DHParameter::MAP);
-        $params = new ASN1\Element($params);
-        $key = ASN1::encodeDER($publicKey, ['type' => ASN1::TYPE_INTEGER]);
-        return self::wrapPublicKey($key, $params);
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/DH/Parameters.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/DH/Parameters.php
deleted file mode 100644
index c0ded84c..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/DH/Parameters.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-/**
- * DH Parameters
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2015 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\Crypt\DH;
-
-use phpseclib3\Crypt\DH;
-
-/**
- * DH Parameters
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-final class Parameters extends DH
-{
-    /**
-     * Returns the parameters
-     *
-     * @param string $type
-     * @param array $options optional
-     * @return string
-     */
-    public function toString($type = 'PKCS1', array $options = [])
-    {
-        $type = self::validatePlugin('Keys', 'PKCS1', 'saveParameters');
-
-        return $type::saveParameters($this->prime, $this->base, $options);
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/DH/PrivateKey.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/DH/PrivateKey.php
deleted file mode 100644
index 737781f8..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/DH/PrivateKey.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-
-/**
- * DH Private Key
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2015 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\Crypt\DH;
-
-use phpseclib3\Crypt\Common;
-use phpseclib3\Crypt\DH;
-
-/**
- * DH Private Key
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-final class PrivateKey extends DH
-{
-    use Common\Traits\PasswordProtected;
-
-    /**
-     * Private Key
-     *
-     * @var \phpseclib3\Math\BigInteger
-     */
-    protected $privateKey;
-
-    /**
-     * Public Key
-     *
-     * @var \phpseclib3\Math\BigInteger
-     */
-    protected $publicKey;
-
-    /**
-     * Returns the public key
-     *
-     * @return DH\PublicKey
-     */
-    public function getPublicKey()
-    {
-        $type = self::validatePlugin('Keys', 'PKCS8', 'savePublicKey');
-
-        if (!isset($this->publicKey)) {
-            $this->publicKey = $this->base->powMod($this->privateKey, $this->prime);
-        }
-
-        $key = $type::savePublicKey($this->prime, $this->base, $this->publicKey);
-
-        return DH::loadFormat('PKCS8', $key);
-    }
-
-    /**
-     * Returns the private key
-     *
-     * @param string $type
-     * @param array $options optional
-     * @return string
-     */
-    public function toString($type, array $options = [])
-    {
-        $type = self::validatePlugin('Keys', $type, 'savePrivateKey');
-
-        if (!isset($this->publicKey)) {
-            $this->publicKey = $this->base->powMod($this->privateKey, $this->prime);
-        }
-
-        return $type::savePrivateKey($this->prime, $this->base, $this->privateKey, $this->publicKey, $this->password, $options);
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/DH/PublicKey.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/DH/PublicKey.php
deleted file mode 100644
index 87726a5a..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/DH/PublicKey.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-/**
- * DH Public Key
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2015 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\Crypt\DH;
-
-use phpseclib3\Crypt\Common;
-use phpseclib3\Crypt\DH;
-
-/**
- * DH Public Key
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-final class PublicKey extends DH
-{
-    use Common\Traits\Fingerprint;
-
-    /**
-     * Returns the public key
-     *
-     * @param string $type
-     * @param array $options optional
-     * @return string
-     */
-    public function toString($type, array $options = [])
-    {
-        $type = self::validatePlugin('Keys', $type, 'savePublicKey');
-
-        return $type::savePublicKey($this->prime, $this->base, $this->publicKey, $options);
-    }
-
-    /**
-     * Returns the public key as a BigInteger
-     *
-     * @return \phpseclib3\Math\BigInteger
-     */
-    public function toBigInteger()
-    {
-        return $this->publicKey;
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/DSA.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/DSA.php
deleted file mode 100644
index 0123c66c..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/DSA.php
+++ /dev/null
@@ -1,337 +0,0 @@
-<?php
-
-/**
- * Pure-PHP FIPS 186-4 compliant implementation of DSA.
- *
- * PHP version 5
- *
- * Here's an example of how to create signatures and verify signatures with this library:
- * <code>
- * <?php
- * include 'vendor/autoload.php';
- *
- * $private = \phpseclib3\Crypt\DSA::createKey();
- * $public = $private->getPublicKey();
- *
- * $plaintext = 'terrafrost';
- *
- * $signature = $private->sign($plaintext);
- *
- * echo $public->verify($plaintext, $signature) ? 'verified' : 'unverified';
- * ?>
- * </code>
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\Crypt;
-
-use phpseclib3\Crypt\Common\AsymmetricKey;
-use phpseclib3\Crypt\DSA\Parameters;
-use phpseclib3\Crypt\DSA\PrivateKey;
-use phpseclib3\Crypt\DSA\PublicKey;
-use phpseclib3\Exception\InsufficientSetupException;
-use phpseclib3\Math\BigInteger;
-
-/**
- * Pure-PHP FIPS 186-4 compliant implementation of DSA.
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class DSA extends AsymmetricKey
-{
-    /**
-     * Algorithm Name
-     *
-     * @var string
-     */
-    const ALGORITHM = 'DSA';
-
-    /**
-     * DSA Prime P
-     *
-     * @var \phpseclib3\Math\BigInteger
-     */
-    protected $p;
-
-    /**
-     * DSA Group Order q
-     *
-     * Prime divisor of p-1
-     *
-     * @var \phpseclib3\Math\BigInteger
-     */
-    protected $q;
-
-    /**
-     * DSA Group Generator G
-     *
-     * @var \phpseclib3\Math\BigInteger
-     */
-    protected $g;
-
-    /**
-     * DSA public key value y
-     *
-     * @var \phpseclib3\Math\BigInteger
-     */
-    protected $y;
-
-    /**
-     * Signature Format
-     *
-     * @var string
-     */
-    protected $sigFormat;
-
-    /**
-     * Signature Format (Short)
-     *
-     * @var string
-     */
-    protected $shortFormat;
-
-    /**
-     * Create DSA parameters
-     *
-     * @param int $L
-     * @param int $N
-     * @return \phpseclib3\Crypt\DSA|bool
-     */
-    public static function createParameters($L = 2048, $N = 224)
-    {
-        self::initialize_static_variables();
-
-        $class = new \ReflectionClass(static::class);
-        if ($class->isFinal()) {
-            throw new \RuntimeException('createParameters() should not be called from final classes (' . static::class . ')');
-        }
-
-        if (!isset(self::$engines['PHP'])) {
-            self::useBestEngine();
-        }
-
-        switch (true) {
-            case $N == 160:
-            /*
-              in FIPS 186-1 and 186-2 N was fixed at 160 whereas K had an upper bound of 1024.
-              RFC 4253 (SSH Transport Layer Protocol) references FIPS 186-2 and as such most
-              SSH DSA implementations only support keys with an N of 160.
-              puttygen let's you set the size of L (but not the size of N) and uses 2048 as the
-              default L value. that's not really compliant with any of the FIPS standards, however,
-              for the purposes of maintaining compatibility with puttygen, we'll support it
-            */
-            //case ($L >= 512 || $L <= 1024) && (($L & 0x3F) == 0) && $N == 160:
-            // FIPS 186-3 changed this as follows:
-            //case $L == 1024 && $N == 160:
-            case $L == 2048 && $N == 224:
-            case $L == 2048 && $N == 256:
-            case $L == 3072 && $N == 256:
-                break;
-            default:
-                throw new \InvalidArgumentException('Invalid values for N and L');
-        }
-
-        $two = new BigInteger(2);
-
-        $q = BigInteger::randomPrime($N);
-        $divisor = $q->multiply($two);
-
-        do {
-            $x = BigInteger::random($L);
-            list(, $c) = $x->divide($divisor);
-            $p = $x->subtract($c->subtract(self::$one));
-        } while ($p->getLength() != $L || !$p->isPrime());
-
-        $p_1 = $p->subtract(self::$one);
-        list($e) = $p_1->divide($q);
-
-        // quoting http://nvlpubs.nist.gov/nistpubs/FIPS/NIST.FIPS.186-4.pdf#page=50 ,
-        // "h could be obtained from a random number generator or from a counter that
-        //  changes after each use". PuTTY (sshdssg.c) starts h off at 1 and increments
-        // it on each loop. wikipedia says "commonly h = 2 is used" so we'll just do that
-        $h = clone $two;
-        while (true) {
-            $g = $h->powMod($e, $p);
-            if (!$g->equals(self::$one)) {
-                break;
-            }
-            $h = $h->add(self::$one);
-        }
-
-        $dsa = new Parameters();
-        $dsa->p = $p;
-        $dsa->q = $q;
-        $dsa->g = $g;
-
-        return $dsa;
-    }
-
-    /**
-     * Create public / private key pair.
-     *
-     * This method is a bit polymorphic. It can take a DSA/Parameters object, L / N as two distinct parameters or
-     * no parameters (at which point L and N will be generated with this method)
-     *
-     * Returns the private key, from which the publickey can be extracted
-     *
-     * @param int[] ...$args
-     * @return DSA\PrivateKey
-     */
-    public static function createKey(...$args)
-    {
-        self::initialize_static_variables();
-
-        $class = new \ReflectionClass(static::class);
-        if ($class->isFinal()) {
-            throw new \RuntimeException('createKey() should not be called from final classes (' . static::class . ')');
-        }
-
-        if (!isset(self::$engines['PHP'])) {
-            self::useBestEngine();
-        }
-
-        if (count($args) == 2 && is_int($args[0]) && is_int($args[1])) {
-            $params = self::createParameters($args[0], $args[1]);
-        } elseif (count($args) == 1 && $args[0] instanceof Parameters) {
-            $params = $args[0];
-        } elseif (!count($args)) {
-            $params = self::createParameters();
-        } else {
-            throw new InsufficientSetupException('Valid parameters are either two integers (L and N), a single DSA object or no parameters at all.');
-        }
-
-        $private = new PrivateKey();
-        $private->p = $params->p;
-        $private->q = $params->q;
-        $private->g = $params->g;
-
-        $private->x = BigInteger::randomRange(self::$one, $private->q->subtract(self::$one));
-        $private->y = $private->g->powMod($private->x, $private->p);
-
-        //$public = clone $private;
-        //unset($public->x);
-
-        return $private
-            ->withHash($params->hash->getHash())
-            ->withSignatureFormat($params->shortFormat);
-    }
-
-    /**
-     * OnLoad Handler
-     *
-     * @return bool
-     */
-    protected static function onLoad(array $components)
-    {
-        if (!isset(self::$engines['PHP'])) {
-            self::useBestEngine();
-        }
-
-        if (!isset($components['x']) && !isset($components['y'])) {
-            $new = new Parameters();
-        } elseif (isset($components['x'])) {
-            $new = new PrivateKey();
-            $new->x = $components['x'];
-        } else {
-            $new = new PublicKey();
-        }
-
-        $new->p = $components['p'];
-        $new->q = $components['q'];
-        $new->g = $components['g'];
-
-        if (isset($components['y'])) {
-            $new->y = $components['y'];
-        }
-
-        return $new;
-    }
-
-    /**
-     * Constructor
-     *
-     * PublicKey and PrivateKey objects can only be created from abstract RSA class
-     */
-    protected function __construct()
-    {
-        $this->sigFormat = self::validatePlugin('Signature', 'ASN1');
-        $this->shortFormat = 'ASN1';
-
-        parent::__construct();
-    }
-
-    /**
-     * Returns the key size
-     *
-     * More specifically, this L (the length of DSA Prime P) and N (the length of DSA Group Order q)
-     *
-     * @return array
-     */
-    public function getLength()
-    {
-        return ['L' => $this->p->getLength(), 'N' => $this->q->getLength()];
-    }
-
-    /**
-     * Returns the current engine being used
-     *
-     * @see self::useInternalEngine()
-     * @see self::useBestEngine()
-     * @return string
-     */
-    public function getEngine()
-    {
-        if (!isset(self::$engines['PHP'])) {
-            self::useBestEngine();
-        }
-        return self::$engines['OpenSSL'] && in_array($this->hash->getHash(), openssl_get_md_methods()) ?
-            'OpenSSL' : 'PHP';
-    }
-
-    /**
-     * Returns the parameters
-     *
-     * A public / private key is only returned if the currently loaded "key" contains an x or y
-     * value.
-     *
-     * @see self::getPublicKey()
-     * @return mixed
-     */
-    public function getParameters()
-    {
-        $type = self::validatePlugin('Keys', 'PKCS1', 'saveParameters');
-
-        $key = $type::saveParameters($this->p, $this->q, $this->g);
-        return DSA::load($key, 'PKCS1')
-            ->withHash($this->hash->getHash())
-            ->withSignatureFormat($this->shortFormat);
-    }
-
-    /**
-     * Determines the signature padding mode
-     *
-     * Valid values are: ASN1, SSH2, Raw
-     *
-     * @param string $format
-     */
-    public function withSignatureFormat($format)
-    {
-        $new = clone $this;
-        $new->shortFormat = $format;
-        $new->sigFormat = self::validatePlugin('Signature', $format);
-        return $new;
-    }
-
-    /**
-     * Returns the signature format currently being used
-     *
-     */
-    public function getSignatureFormat()
-    {
-        return $this->shortFormat;
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/DSA/Formats/Keys/OpenSSH.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/DSA/Formats/Keys/OpenSSH.php
deleted file mode 100644
index cc204fa9..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/DSA/Formats/Keys/OpenSSH.php
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-
-/**
- * OpenSSH Formatted DSA Key Handler
- *
- * PHP version 5
- *
- * Place in $HOME/.ssh/authorized_keys
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2015 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\Crypt\DSA\Formats\Keys;
-
-use phpseclib3\Common\Functions\Strings;
-use phpseclib3\Crypt\Common\Formats\Keys\OpenSSH as Progenitor;
-use phpseclib3\Math\BigInteger;
-
-/**
- * OpenSSH Formatted DSA Key Handler
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class OpenSSH extends Progenitor
-{
-    /**
-     * Supported Key Types
-     *
-     * @var array
-     */
-    protected static $types = ['ssh-dss'];
-
-    /**
-     * Break a public or private key down into its constituent components
-     *
-     * @param string $key
-     * @param string $password optional
-     * @return array
-     */
-    public static function load($key, $password = '')
-    {
-        $parsed = parent::load($key, $password);
-
-        if (isset($parsed['paddedKey'])) {
-            list($type) = Strings::unpackSSH2('s', $parsed['paddedKey']);
-            if ($type != $parsed['type']) {
-                throw new \RuntimeException("The public and private keys are not of the same type ($type vs $parsed[type])");
-            }
-
-            list($p, $q, $g, $y, $x, $comment) = Strings::unpackSSH2('i5s', $parsed['paddedKey']);
-
-            return compact('p', 'q', 'g', 'y', 'x', 'comment');
-        }
-
-        list($p, $q, $g, $y) = Strings::unpackSSH2('iiii', $parsed['publicKey']);
-
-        $comment = $parsed['comment'];
-
-        return compact('p', 'q', 'g', 'y', 'comment');
-    }
-
-    /**
-     * Convert a public key to the appropriate format
-     *
-     * @param \phpseclib3\Math\BigInteger $p
-     * @param \phpseclib3\Math\BigInteger $q
-     * @param \phpseclib3\Math\BigInteger $g
-     * @param \phpseclib3\Math\BigInteger $y
-     * @param array $options optional
-     * @return string
-     */
-    public static function savePublicKey(BigInteger $p, BigInteger $q, BigInteger $g, BigInteger $y, array $options = [])
-    {
-        if ($q->getLength() != 160) {
-            throw new \InvalidArgumentException('SSH only supports keys with an N (length of Group Order q) of 160');
-        }
-
-        // from <http://tools.ietf.org/html/rfc4253#page-15>:
-        // string    "ssh-dss"
-        // mpint     p
-        // mpint     q
-        // mpint     g
-        // mpint     y
-        $DSAPublicKey = Strings::packSSH2('siiii', 'ssh-dss', $p, $q, $g, $y);
-
-        if (isset($options['binary']) ? $options['binary'] : self::$binary) {
-            return $DSAPublicKey;
-        }
-
-        $comment = isset($options['comment']) ? $options['comment'] : self::$comment;
-        $DSAPublicKey = 'ssh-dss ' . base64_encode($DSAPublicKey) . ' ' . $comment;
-
-        return $DSAPublicKey;
-    }
-
-    /**
-     * Convert a private key to the appropriate format.
-     *
-     * @param \phpseclib3\Math\BigInteger $p
-     * @param \phpseclib3\Math\BigInteger $q
-     * @param \phpseclib3\Math\BigInteger $g
-     * @param \phpseclib3\Math\BigInteger $y
-     * @param \phpseclib3\Math\BigInteger $x
-     * @param string $password optional
-     * @param array $options optional
-     * @return string
-     */
-    public static function savePrivateKey(BigInteger $p, BigInteger $q, BigInteger $g, BigInteger $y, BigInteger $x, $password = '', array $options = [])
-    {
-        $publicKey = self::savePublicKey($p, $q, $g, $y, ['binary' => true]);
-        $privateKey = Strings::packSSH2('si5', 'ssh-dss', $p, $q, $g, $y, $x);
-
-        return self::wrapPrivateKey($publicKey, $privateKey, $password, $options);
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/DSA/Formats/Keys/PKCS1.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/DSA/Formats/Keys/PKCS1.php
deleted file mode 100644
index 52a04992..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/DSA/Formats/Keys/PKCS1.php
+++ /dev/null
@@ -1,143 +0,0 @@
-<?php
-
-/**
- * PKCS#1 Formatted DSA Key Handler
- *
- * PHP version 5
- *
- * Used by File/X509.php
- *
- * Processes keys with the following headers:
- *
- * -----BEGIN DSA PRIVATE KEY-----
- * -----BEGIN DSA PUBLIC KEY-----
- * -----BEGIN DSA PARAMETERS-----
- *
- * Analogous to ssh-keygen's pem format (as specified by -m)
- *
- * Also, technically, PKCS1 decribes RSA but I am not aware of a formal specification for DSA.
- * The DSA private key format seems to have been adapted from the RSA private key format so
- * we're just re-using that as the name.
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2015 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\Crypt\DSA\Formats\Keys;
-
-use phpseclib3\Common\Functions\Strings;
-use phpseclib3\Crypt\Common\Formats\Keys\PKCS1 as Progenitor;
-use phpseclib3\File\ASN1;
-use phpseclib3\File\ASN1\Maps;
-use phpseclib3\Math\BigInteger;
-
-/**
- * PKCS#1 Formatted DSA Key Handler
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class PKCS1 extends Progenitor
-{
-    /**
-     * Break a public or private key down into its constituent components
-     *
-     * @param string $key
-     * @param string $password optional
-     * @return array
-     */
-    public static function load($key, $password = '')
-    {
-        $key = parent::load($key, $password);
-
-        $decoded = ASN1::decodeBER($key);
-        if (!$decoded) {
-            throw new \RuntimeException('Unable to decode BER');
-        }
-
-        $key = ASN1::asn1map($decoded[0], Maps\DSAParams::MAP);
-        if (is_array($key)) {
-            return $key;
-        }
-
-        $key = ASN1::asn1map($decoded[0], Maps\DSAPrivateKey::MAP);
-        if (is_array($key)) {
-            return $key;
-        }
-
-        $key = ASN1::asn1map($decoded[0], Maps\DSAPublicKey::MAP);
-        if (is_array($key)) {
-            return $key;
-        }
-
-        throw new \RuntimeException('Unable to perform ASN1 mapping');
-    }
-
-    /**
-     * Convert DSA parameters to the appropriate format
-     *
-     * @param \phpseclib3\Math\BigInteger $p
-     * @param \phpseclib3\Math\BigInteger $q
-     * @param \phpseclib3\Math\BigInteger $g
-     * @return string
-     */
-    public static function saveParameters(BigInteger $p, BigInteger $q, BigInteger $g)
-    {
-        $key = [
-            'p' => $p,
-            'q' => $q,
-            'g' => $g
-        ];
-
-        $key = ASN1::encodeDER($key, Maps\DSAParams::MAP);
-
-        return "-----BEGIN DSA PARAMETERS-----\r\n" .
-               chunk_split(Strings::base64_encode($key), 64) .
-               "-----END DSA PARAMETERS-----\r\n";
-    }
-
-    /**
-     * Convert a private key to the appropriate format.
-     *
-     * @param \phpseclib3\Math\BigInteger $p
-     * @param \phpseclib3\Math\BigInteger $q
-     * @param \phpseclib3\Math\BigInteger $g
-     * @param \phpseclib3\Math\BigInteger $y
-     * @param \phpseclib3\Math\BigInteger $x
-     * @param string $password optional
-     * @param array $options optional
-     * @return string
-     */
-    public static function savePrivateKey(BigInteger $p, BigInteger $q, BigInteger $g, BigInteger $y, BigInteger $x, $password = '', array $options = [])
-    {
-        $key = [
-            'version' => 0,
-            'p' => $p,
-            'q' => $q,
-            'g' => $g,
-            'y' => $y,
-            'x' => $x
-        ];
-
-        $key = ASN1::encodeDER($key, Maps\DSAPrivateKey::MAP);
-
-        return self::wrapPrivateKey($key, 'DSA', $password, $options);
-    }
-
-    /**
-     * Convert a public key to the appropriate format
-     *
-     * @param \phpseclib3\Math\BigInteger $p
-     * @param \phpseclib3\Math\BigInteger $q
-     * @param \phpseclib3\Math\BigInteger $g
-     * @param \phpseclib3\Math\BigInteger $y
-     * @return string
-     */
-    public static function savePublicKey(BigInteger $p, BigInteger $q, BigInteger $g, BigInteger $y)
-    {
-        $key = ASN1::encodeDER($y, Maps\DSAPublicKey::MAP);
-
-        return self::wrapPublicKey($key, 'DSA');
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/DSA/Formats/Keys/PKCS8.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/DSA/Formats/Keys/PKCS8.php
deleted file mode 100644
index 004881e8..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/DSA/Formats/Keys/PKCS8.php
+++ /dev/null
@@ -1,146 +0,0 @@
-<?php
-
-/**
- * PKCS#8 Formatted DSA Key Handler
- *
- * PHP version 5
- *
- * Processes keys with the following headers:
- *
- * -----BEGIN ENCRYPTED PRIVATE KEY-----
- * -----BEGIN PRIVATE KEY-----
- * -----BEGIN PUBLIC KEY-----
- *
- * Analogous to ssh-keygen's pkcs8 format (as specified by -m). Although PKCS8
- * is specific to private keys it's basically creating a DER-encoded wrapper
- * for keys. This just extends that same concept to public keys (much like ssh-keygen)
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2015 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\Crypt\DSA\Formats\Keys;
-
-use phpseclib3\Crypt\Common\Formats\Keys\PKCS8 as Progenitor;
-use phpseclib3\File\ASN1;
-use phpseclib3\File\ASN1\Maps;
-use phpseclib3\Math\BigInteger;
-
-/**
- * PKCS#8 Formatted DSA Key Handler
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class PKCS8 extends Progenitor
-{
-    /**
-     * OID Name
-     *
-     * @var string
-     */
-    const OID_NAME = 'id-dsa';
-
-    /**
-     * OID Value
-     *
-     * @var string
-     */
-    const OID_VALUE = '1.2.840.10040.4.1';
-
-    /**
-     * Child OIDs loaded
-     *
-     * @var bool
-     */
-    protected static $childOIDsLoaded = false;
-
-    /**
-     * Break a public or private key down into its constituent components
-     *
-     * @param string $key
-     * @param string $password optional
-     * @return array
-     */
-    public static function load($key, $password = '')
-    {
-        $key = parent::load($key, $password);
-
-        $type = isset($key['privateKey']) ? 'privateKey' : 'publicKey';
-
-        $decoded = ASN1::decodeBER($key[$type . 'Algorithm']['parameters']->element);
-        if (!$decoded) {
-            throw new \RuntimeException('Unable to decode BER of parameters');
-        }
-        $components = ASN1::asn1map($decoded[0], Maps\DSAParams::MAP);
-        if (!is_array($components)) {
-            throw new \RuntimeException('Unable to perform ASN1 mapping on parameters');
-        }
-
-        $decoded = ASN1::decodeBER($key[$type]);
-        if (empty($decoded)) {
-            throw new \RuntimeException('Unable to decode BER');
-        }
-
-        $var = $type == 'privateKey' ? 'x' : 'y';
-        $components[$var] = ASN1::asn1map($decoded[0], Maps\DSAPublicKey::MAP);
-        if (!$components[$var] instanceof BigInteger) {
-            throw new \RuntimeException('Unable to perform ASN1 mapping');
-        }
-
-        if (isset($key['meta'])) {
-            $components['meta'] = $key['meta'];
-        }
-
-        return $components;
-    }
-
-    /**
-     * Convert a private key to the appropriate format.
-     *
-     * @param \phpseclib3\Math\BigInteger $p
-     * @param \phpseclib3\Math\BigInteger $q
-     * @param \phpseclib3\Math\BigInteger $g
-     * @param \phpseclib3\Math\BigInteger $y
-     * @param \phpseclib3\Math\BigInteger $x
-     * @param string $password optional
-     * @param array $options optional
-     * @return string
-     */
-    public static function savePrivateKey(BigInteger $p, BigInteger $q, BigInteger $g, BigInteger $y, BigInteger $x, $password = '', array $options = [])
-    {
-        $params = [
-            'p' => $p,
-            'q' => $q,
-            'g' => $g
-        ];
-        $params = ASN1::encodeDER($params, Maps\DSAParams::MAP);
-        $params = new ASN1\Element($params);
-        $key = ASN1::encodeDER($x, Maps\DSAPublicKey::MAP);
-        return self::wrapPrivateKey($key, [], $params, $password, null, '', $options);
-    }
-
-    /**
-     * Convert a public key to the appropriate format
-     *
-     * @param \phpseclib3\Math\BigInteger $p
-     * @param \phpseclib3\Math\BigInteger $q
-     * @param \phpseclib3\Math\BigInteger $g
-     * @param \phpseclib3\Math\BigInteger $y
-     * @param array $options optional
-     * @return string
-     */
-    public static function savePublicKey(BigInteger $p, BigInteger $q, BigInteger $g, BigInteger $y, array $options = [])
-    {
-        $params = [
-            'p' => $p,
-            'q' => $q,
-            'g' => $g
-        ];
-        $params = ASN1::encodeDER($params, Maps\DSAParams::MAP);
-        $params = new ASN1\Element($params);
-        $key = ASN1::encodeDER($y, Maps\DSAPublicKey::MAP);
-        return self::wrapPublicKey($key, $params);
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/DSA/Formats/Keys/PuTTY.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/DSA/Formats/Keys/PuTTY.php
deleted file mode 100644
index 177bfdd4..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/DSA/Formats/Keys/PuTTY.php
+++ /dev/null
@@ -1,109 +0,0 @@
-<?php
-
-/**
- * PuTTY Formatted DSA Key Handler
- *
- * puttygen does not generate DSA keys with an N of anything other than 160, however,
- * it can still load them and convert them. PuTTY will load them, too, but SSH servers
- * won't accept them. Since PuTTY formatted keys are primarily used with SSH this makes
- * keys with N > 160 kinda useless, hence this handlers not supporting such keys.
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2015 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\Crypt\DSA\Formats\Keys;
-
-use phpseclib3\Common\Functions\Strings;
-use phpseclib3\Crypt\Common\Formats\Keys\PuTTY as Progenitor;
-use phpseclib3\Math\BigInteger;
-
-/**
- * PuTTY Formatted DSA Key Handler
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class PuTTY extends Progenitor
-{
-    /**
-     * Public Handler
-     *
-     * @var string
-     */
-    const PUBLIC_HANDLER = 'phpseclib3\Crypt\DSA\Formats\Keys\OpenSSH';
-
-    /**
-     * Algorithm Identifier
-     *
-     * @var array
-     */
-    protected static $types = ['ssh-dss'];
-
-    /**
-     * Break a public or private key down into its constituent components
-     *
-     * @param string $key
-     * @param string $password optional
-     * @return array
-     */
-    public static function load($key, $password = '')
-    {
-        $components = parent::load($key, $password);
-        if (!isset($components['private'])) {
-            return $components;
-        }
-        extract($components);
-        unset($components['public'], $components['private']);
-
-        list($p, $q, $g, $y) = Strings::unpackSSH2('iiii', $public);
-        list($x) = Strings::unpackSSH2('i', $private);
-
-        return compact('p', 'q', 'g', 'y', 'x', 'comment');
-    }
-
-    /**
-     * Convert a private key to the appropriate format.
-     *
-     * @param \phpseclib3\Math\BigInteger $p
-     * @param \phpseclib3\Math\BigInteger $q
-     * @param \phpseclib3\Math\BigInteger $g
-     * @param \phpseclib3\Math\BigInteger $y
-     * @param \phpseclib3\Math\BigInteger $x
-     * @param string $password optional
-     * @param array $options optional
-     * @return string
-     */
-    public static function savePrivateKey(BigInteger $p, BigInteger $q, BigInteger $g, BigInteger $y, BigInteger $x, $password = false, array $options = [])
-    {
-        if ($q->getLength() != 160) {
-            throw new \InvalidArgumentException('SSH only supports keys with an N (length of Group Order q) of 160');
-        }
-
-        $public = Strings::packSSH2('iiii', $p, $q, $g, $y);
-        $private = Strings::packSSH2('i', $x);
-
-        return self::wrapPrivateKey($public, $private, 'ssh-dss', $password, $options);
-    }
-
-    /**
-     * Convert a public key to the appropriate format
-     *
-     * @param \phpseclib3\Math\BigInteger $p
-     * @param \phpseclib3\Math\BigInteger $q
-     * @param \phpseclib3\Math\BigInteger $g
-     * @param \phpseclib3\Math\BigInteger $y
-     * @return string
-     */
-    public static function savePublicKey(BigInteger $p, BigInteger $q, BigInteger $g, BigInteger $y)
-    {
-        if ($q->getLength() != 160) {
-            throw new \InvalidArgumentException('SSH only supports keys with an N (length of Group Order q) of 160');
-        }
-
-        return self::wrapPublicKey(Strings::packSSH2('iiii', $p, $q, $g, $y), 'ssh-dss');
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/DSA/Formats/Keys/Raw.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/DSA/Formats/Keys/Raw.php
deleted file mode 100644
index 201aa6f9..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/DSA/Formats/Keys/Raw.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-
-/**
- * Raw DSA Key Handler
- *
- * PHP version 5
- *
- * Reads and creates arrays as DSA keys
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2015 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\Crypt\DSA\Formats\Keys;
-
-use phpseclib3\Math\BigInteger;
-
-/**
- * Raw DSA Key Handler
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class Raw
-{
-    /**
-     * Break a public or private key down into its constituent components
-     *
-     * @param array $key
-     * @param string $password optional
-     * @return array
-     */
-    public static function load($key, $password = '')
-    {
-        if (!is_array($key)) {
-            throw new \UnexpectedValueException('Key should be a array - not a ' . gettype($key));
-        }
-
-        switch (true) {
-            case !isset($key['p']) || !isset($key['q']) || !isset($key['g']):
-            case !$key['p'] instanceof BigInteger:
-            case !$key['q'] instanceof BigInteger:
-            case !$key['g'] instanceof BigInteger:
-            case !isset($key['x']) && !isset($key['y']):
-            case isset($key['x']) && !$key['x'] instanceof BigInteger:
-            case isset($key['y']) && !$key['y'] instanceof BigInteger:
-                throw new \UnexpectedValueException('Key appears to be malformed');
-        }
-
-        $options = ['p' => 1, 'q' => 1, 'g' => 1, 'x' => 1, 'y' => 1];
-
-        return array_intersect_key($key, $options);
-    }
-
-    /**
-     * Convert a private key to the appropriate format.
-     *
-     * @param \phpseclib3\Math\BigInteger $p
-     * @param \phpseclib3\Math\BigInteger $q
-     * @param \phpseclib3\Math\BigInteger $g
-     * @param \phpseclib3\Math\BigInteger $y
-     * @param \phpseclib3\Math\BigInteger $x
-     * @param string $password optional
-     * @return string
-     */
-    public static function savePrivateKey(BigInteger $p, BigInteger $q, BigInteger $g, BigInteger $y, BigInteger $x, $password = '')
-    {
-        return compact('p', 'q', 'g', 'y', 'x');
-    }
-
-    /**
-     * Convert a public key to the appropriate format
-     *
-     * @param \phpseclib3\Math\BigInteger $p
-     * @param \phpseclib3\Math\BigInteger $q
-     * @param \phpseclib3\Math\BigInteger $g
-     * @param \phpseclib3\Math\BigInteger $y
-     * @return string
-     */
-    public static function savePublicKey(BigInteger $p, BigInteger $q, BigInteger $g, BigInteger $y)
-    {
-        return compact('p', 'q', 'g', 'y');
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/DSA/Formats/Keys/XML.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/DSA/Formats/Keys/XML.php
deleted file mode 100644
index fc363677..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/DSA/Formats/Keys/XML.php
+++ /dev/null
@@ -1,132 +0,0 @@
-<?php
-
-/**
- * XML Formatted DSA Key Handler
- *
- * While XKMS defines a private key format for RSA it does not do so for DSA. Quoting that standard:
- *
- * "[XKMS] does not specify private key parameters for the DSA signature algorithm since the algorithm only
- *  supports signature modes and so the application of server generated keys and key recovery is of limited
- *  value"
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2015 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\Crypt\DSA\Formats\Keys;
-
-use phpseclib3\Common\Functions\Strings;
-use phpseclib3\Exception\BadConfigurationException;
-use phpseclib3\Math\BigInteger;
-
-/**
- * XML Formatted DSA Key Handler
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class XML
-{
-    /**
-     * Break a public or private key down into its constituent components
-     *
-     * @param string $key
-     * @param string $password optional
-     * @return array
-     */
-    public static function load($key, $password = '')
-    {
-        if (!Strings::is_stringable($key)) {
-            throw new \UnexpectedValueException('Key should be a string - not a ' . gettype($key));
-        }
-
-        if (!class_exists('DOMDocument')) {
-            throw new BadConfigurationException('The dom extension is not setup correctly on this system');
-        }
-
-        $use_errors = libxml_use_internal_errors(true);
-
-        $dom = new \DOMDocument();
-        if (substr($key, 0, 5) != '<?xml') {
-            $key = '<xml>' . $key . '</xml>';
-        }
-        if (!$dom->loadXML($key)) {
-            libxml_use_internal_errors($use_errors);
-            throw new \UnexpectedValueException('Key does not appear to contain XML');
-        }
-        $xpath = new \DOMXPath($dom);
-        $keys = ['p', 'q', 'g', 'y', 'j', 'seed', 'pgencounter'];
-        foreach ($keys as $key) {
-            // $dom->getElementsByTagName($key) is case-sensitive
-            $temp = $xpath->query("//*[translate(local-name(), 'ABCDEFGHIJKLMNOPQRSTUVWXYZ','abcdefghijklmnopqrstuvwxyz')='$key']");
-            if (!$temp->length) {
-                continue;
-            }
-            $value = new BigInteger(Strings::base64_decode($temp->item(0)->nodeValue), 256);
-            switch ($key) {
-                case 'p': // a prime modulus meeting the [DSS] requirements
-                    // Parameters P, Q, and G can be public and common to a group of users. They might be known
-                    // from application context. As such, they are optional but P and Q must either both appear
-                    // or both be absent
-                    $components['p'] = $value;
-                    break;
-                case 'q': // an integer in the range 2**159 < Q < 2**160 which is a prime divisor of P-1
-                    $components['q'] = $value;
-                    break;
-                case 'g': // an integer with certain properties with respect to P and Q
-                    $components['g'] = $value;
-                    break;
-                case 'y': // G**X mod P (where X is part of the private key and not made public)
-                    $components['y'] = $value;
-                    // the remaining options do not do anything
-                case 'j': // (P - 1) / Q
-                    // Parameter J is available for inclusion solely for efficiency as it is calculatable from
-                    // P and Q
-                case 'seed': // a DSA prime generation seed
-                    // Parameters seed and pgenCounter are used in the DSA prime number generation algorithm
-                    // specified in [DSS]. As such, they are optional but must either both be present or both
-                    // be absent
-                case 'pgencounter': // a DSA prime generation counter
-            }
-        }
-
-        libxml_use_internal_errors($use_errors);
-
-        if (!isset($components['y'])) {
-            throw new \UnexpectedValueException('Key is missing y component');
-        }
-
-        switch (true) {
-            case !isset($components['p']):
-            case !isset($components['q']):
-            case !isset($components['g']):
-                return ['y' => $components['y']];
-        }
-
-        return $components;
-    }
-
-    /**
-     * Convert a public key to the appropriate format
-     *
-     * See https://www.w3.org/TR/xmldsig-core/#sec-DSAKeyValue
-     *
-     * @param \phpseclib3\Math\BigInteger $p
-     * @param \phpseclib3\Math\BigInteger $q
-     * @param \phpseclib3\Math\BigInteger $g
-     * @param \phpseclib3\Math\BigInteger $y
-     * @return string
-     */
-    public static function savePublicKey(BigInteger $p, BigInteger $q, BigInteger $g, BigInteger $y)
-    {
-        return "<DSAKeyValue>\r\n" .
-               '  <P>' . Strings::base64_encode($p->toBytes()) . "</P>\r\n" .
-               '  <Q>' . Strings::base64_encode($q->toBytes()) . "</Q>\r\n" .
-               '  <G>' . Strings::base64_encode($g->toBytes()) . "</G>\r\n" .
-               '  <Y>' . Strings::base64_encode($y->toBytes()) . "</Y>\r\n" .
-               '</DSAKeyValue>';
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/DSA/Formats/Signature/ASN1.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/DSA/Formats/Signature/ASN1.php
deleted file mode 100644
index df52beed..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/DSA/Formats/Signature/ASN1.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-
-/**
- * ASN1 Signature Handler
- *
- * PHP version 5
- *
- * Handles signatures in the format described in
- * https://tools.ietf.org/html/rfc3279#section-2.2.2
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\Crypt\DSA\Formats\Signature;
-
-use phpseclib3\File\ASN1 as Encoder;
-use phpseclib3\File\ASN1\Maps;
-use phpseclib3\Math\BigInteger;
-
-/**
- * ASN1 Signature Handler
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class ASN1
-{
-    /**
-     * Loads a signature
-     *
-     * @param string $sig
-     * @return array|bool
-     */
-    public static function load($sig)
-    {
-        if (!is_string($sig)) {
-            return false;
-        }
-
-        $decoded = Encoder::decodeBER($sig);
-        if (empty($decoded)) {
-            return false;
-        }
-        $components = Encoder::asn1map($decoded[0], Maps\DssSigValue::MAP);
-
-        return $components;
-    }
-
-    /**
-     * Returns a signature in the appropriate format
-     *
-     * @param \phpseclib3\Math\BigInteger $r
-     * @param \phpseclib3\Math\BigInteger $s
-     * @return string
-     */
-    public static function save(BigInteger $r, BigInteger $s)
-    {
-        return Encoder::encodeDER(compact('r', 's'), Maps\DssSigValue::MAP);
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/DSA/Formats/Signature/Raw.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/DSA/Formats/Signature/Raw.php
deleted file mode 100644
index 2657a2a8..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/DSA/Formats/Signature/Raw.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-/**
- * Raw DSA Signature Handler
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\Crypt\DSA\Formats\Signature;
-
-use phpseclib3\Crypt\Common\Formats\Signature\Raw as Progenitor;
-
-/**
- * Raw DSA Signature Handler
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class Raw extends Progenitor
-{
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/DSA/Formats/Signature/SSH2.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/DSA/Formats/Signature/SSH2.php
deleted file mode 100644
index dbfceabb..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/DSA/Formats/Signature/SSH2.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-
-/**
- * SSH2 Signature Handler
- *
- * PHP version 5
- *
- * Handles signatures in the format used by SSH2
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\Crypt\DSA\Formats\Signature;
-
-use phpseclib3\Common\Functions\Strings;
-use phpseclib3\Math\BigInteger;
-
-/**
- * SSH2 Signature Handler
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class SSH2
-{
-    /**
-     * Loads a signature
-     *
-     * @param string $sig
-     * @return mixed
-     */
-    public static function load($sig)
-    {
-        if (!is_string($sig)) {
-            return false;
-        }
-
-        $result = Strings::unpackSSH2('ss', $sig);
-        if ($result === false) {
-            return false;
-        }
-        list($type, $blob) = $result;
-        if ($type != 'ssh-dss' || strlen($blob) != 40) {
-            return false;
-        }
-
-        return [
-            'r' => new BigInteger(substr($blob, 0, 20), 256),
-            's' => new BigInteger(substr($blob, 20), 256)
-        ];
-    }
-
-    /**
-     * Returns a signature in the appropriate format
-     *
-     * @param \phpseclib3\Math\BigInteger $r
-     * @param \phpseclib3\Math\BigInteger $s
-     * @return string
-     */
-    public static function save(BigInteger $r, BigInteger $s)
-    {
-        if ($r->getLength() > 160 || $s->getLength() > 160) {
-            return false;
-        }
-        return Strings::packSSH2(
-            'ss',
-            'ssh-dss',
-            str_pad($r->toBytes(), 20, "\0", STR_PAD_LEFT) .
-            str_pad($s->toBytes(), 20, "\0", STR_PAD_LEFT)
-        );
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/DSA/Parameters.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/DSA/Parameters.php
deleted file mode 100644
index 84d16ba6..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/DSA/Parameters.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-/**
- * DSA Parameters
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2015 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\Crypt\DSA;
-
-use phpseclib3\Crypt\DSA;
-
-/**
- * DSA Parameters
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-final class Parameters extends DSA
-{
-    /**
-     * Returns the parameters
-     *
-     * @param string $type
-     * @param array $options optional
-     * @return string
-     */
-    public function toString($type = 'PKCS1', array $options = [])
-    {
-        $type = self::validatePlugin('Keys', 'PKCS1', 'saveParameters');
-
-        return $type::saveParameters($this->p, $this->q, $this->g, $options);
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/DSA/PrivateKey.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/DSA/PrivateKey.php
deleted file mode 100644
index 74d3e69e..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/DSA/PrivateKey.php
+++ /dev/null
@@ -1,152 +0,0 @@
-<?php
-
-/**
- * DSA Private Key
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2015 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\Crypt\DSA;
-
-use phpseclib3\Crypt\Common;
-use phpseclib3\Crypt\DSA;
-use phpseclib3\Crypt\DSA\Formats\Signature\ASN1 as ASN1Signature;
-use phpseclib3\Math\BigInteger;
-
-/**
- * DSA Private Key
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-final class PrivateKey extends DSA implements Common\PrivateKey
-{
-    use Common\Traits\PasswordProtected;
-
-    /**
-     * DSA secret exponent x
-     *
-     * @var \phpseclib3\Math\BigInteger
-     */
-    protected $x;
-
-    /**
-     * Returns the public key
-     *
-     * If you do "openssl rsa -in private.rsa -pubout -outform PEM" you get a PKCS8 formatted key
-     * that contains a publicKeyAlgorithm AlgorithmIdentifier and a publicKey BIT STRING.
-     * An AlgorithmIdentifier contains an OID and a parameters field. With RSA public keys this
-     * parameters field is NULL. With DSA PKCS8 public keys it is not - it contains the p, q and g
-     * variables. The publicKey BIT STRING contains, simply, the y variable. This can be verified
-     * by getting a DSA PKCS8 public key:
-     *
-     * "openssl dsa -in private.dsa -pubout -outform PEM"
-     *
-     * ie. just swap out rsa with dsa in the rsa command above.
-     *
-     * A PKCS1 public key corresponds to the publicKey portion of the PKCS8 key. In the case of RSA
-     * the publicKey portion /is/ the key. In the case of DSA it is not. You cannot verify a signature
-     * without the parameters and the PKCS1 DSA public key format does not include the parameters.
-     *
-     * @see self::getPrivateKey()
-     * @return mixed
-     */
-    public function getPublicKey()
-    {
-        $type = self::validatePlugin('Keys', 'PKCS8', 'savePublicKey');
-
-        if (!isset($this->y)) {
-            $this->y = $this->g->powMod($this->x, $this->p);
-        }
-
-        $key = $type::savePublicKey($this->p, $this->q, $this->g, $this->y);
-
-        return DSA::loadFormat('PKCS8', $key)
-            ->withHash($this->hash->getHash())
-            ->withSignatureFormat($this->shortFormat);
-    }
-
-    /**
-     * Create a signature
-     *
-     * @see self::verify()
-     * @param string $message
-     * @return mixed
-     */
-    public function sign($message)
-    {
-        $format = $this->sigFormat;
-
-        if (self::$engines['OpenSSL'] && in_array($this->hash->getHash(), openssl_get_md_methods())) {
-            $signature = '';
-            $result = openssl_sign($message, $signature, $this->toString('PKCS8'), $this->hash->getHash());
-
-            if ($result) {
-                if ($this->shortFormat == 'ASN1') {
-                    return $signature;
-                }
-
-                extract(ASN1Signature::load($signature));
-
-                return $format::save($r, $s);
-            }
-        }
-
-        $h = $this->hash->hash($message);
-        $h = $this->bits2int($h);
-
-        while (true) {
-            $k = BigInteger::randomRange(self::$one, $this->q->subtract(self::$one));
-            $r = $this->g->powMod($k, $this->p);
-            list(, $r) = $r->divide($this->q);
-            if ($r->equals(self::$zero)) {
-                continue;
-            }
-            $kinv = $k->modInverse($this->q);
-            $temp = $h->add($this->x->multiply($r));
-            $temp = $kinv->multiply($temp);
-            list(, $s) = $temp->divide($this->q);
-            if (!$s->equals(self::$zero)) {
-                break;
-            }
-        }
-
-        // the following is an RFC6979 compliant implementation of deterministic DSA
-        // it's unused because it's mainly intended for use when a good CSPRNG isn't
-        // available. if phpseclib's CSPRNG isn't good then even key generation is
-        // suspect
-        /*
-        $h1 = $this->hash->hash($message);
-        $k = $this->computek($h1);
-        $r = $this->g->powMod($k, $this->p);
-        list(, $r) = $r->divide($this->q);
-        $kinv = $k->modInverse($this->q);
-        $h1 = $this->bits2int($h1);
-        $temp = $h1->add($this->x->multiply($r));
-        $temp = $kinv->multiply($temp);
-        list(, $s) = $temp->divide($this->q);
-        */
-
-        return $format::save($r, $s);
-    }
-
-    /**
-     * Returns the private key
-     *
-     * @param string $type
-     * @param array $options optional
-     * @return string
-     */
-    public function toString($type, array $options = [])
-    {
-        $type = self::validatePlugin('Keys', $type, 'savePrivateKey');
-
-        if (!isset($this->y)) {
-            $this->y = $this->g->powMod($this->x, $this->p);
-        }
-
-        return $type::savePrivateKey($this->p, $this->q, $this->g, $this->y, $this->x, $this->password, $options);
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/DSA/PublicKey.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/DSA/PublicKey.php
deleted file mode 100644
index c14ffbdf..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/DSA/PublicKey.php
+++ /dev/null
@@ -1,86 +0,0 @@
-<?php
-
-/**
- * DSA Public Key
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2015 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\Crypt\DSA;
-
-use phpseclib3\Crypt\Common;
-use phpseclib3\Crypt\DSA;
-use phpseclib3\Crypt\DSA\Formats\Signature\ASN1 as ASN1Signature;
-
-/**
- * DSA Public Key
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-final class PublicKey extends DSA implements Common\PublicKey
-{
-    use Common\Traits\Fingerprint;
-
-    /**
-     * Verify a signature
-     *
-     * @see self::verify()
-     * @param string $message
-     * @param string $signature
-     * @return mixed
-     */
-    public function verify($message, $signature)
-    {
-        $format = $this->sigFormat;
-
-        $params = $format::load($signature);
-        if ($params === false || count($params) != 2) {
-            return false;
-        }
-        extract($params);
-
-        if (self::$engines['OpenSSL'] && in_array($this->hash->getHash(), openssl_get_md_methods())) {
-            $sig = $format != 'ASN1' ? ASN1Signature::save($r, $s) : $signature;
-
-            $result = openssl_verify($message, $sig, $this->toString('PKCS8'), $this->hash->getHash());
-
-            if ($result != -1) {
-                return (bool) $result;
-            }
-        }
-
-        $q_1 = $this->q->subtract(self::$one);
-        if (!$r->between(self::$one, $q_1) || !$s->between(self::$one, $q_1)) {
-            return false;
-        }
-
-        $w = $s->modInverse($this->q);
-        $h = $this->hash->hash($message);
-        $h = $this->bits2int($h);
-        list(, $u1) = $h->multiply($w)->divide($this->q);
-        list(, $u2) = $r->multiply($w)->divide($this->q);
-        $v1 = $this->g->powMod($u1, $this->p);
-        $v2 = $this->y->powMod($u2, $this->p);
-        list(, $v) = $v1->multiply($v2)->divide($this->p);
-        list(, $v) = $v->divide($this->q);
-
-        return $v->equals($r);
-    }
-
-    /**
-     * Returns the public key
-     *
-     * @param string $type
-     * @param array $options optional
-     * @return string
-     */
-    public function toString($type, array $options = [])
-    {
-        $type = self::validatePlugin('Keys', $type, 'savePublicKey');
-
-        return $type::savePublicKey($this->p, $this->q, $this->g, $this->y, $options);
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC.php
deleted file mode 100644
index 10b38254..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC.php
+++ /dev/null
@@ -1,480 +0,0 @@
-<?php
-
-/**
- * Pure-PHP implementation of EC.
- *
- * PHP version 5
- *
- * Here's an example of how to create signatures and verify signatures with this library:
- * <code>
- * <?php
- * include 'vendor/autoload.php';
- *
- * $private = \phpseclib3\Crypt\EC::createKey('secp256k1');
- * $public = $private->getPublicKey();
- *
- * $plaintext = 'terrafrost';
- *
- * $signature = $private->sign($plaintext);
- *
- * echo $public->verify($plaintext, $signature) ? 'verified' : 'unverified';
- * ?>
- * </code>
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\Crypt;
-
-use phpseclib3\Crypt\Common\AsymmetricKey;
-use phpseclib3\Crypt\EC\BaseCurves\Montgomery as MontgomeryCurve;
-use phpseclib3\Crypt\EC\BaseCurves\TwistedEdwards as TwistedEdwardsCurve;
-use phpseclib3\Crypt\EC\Curves\Curve25519;
-use phpseclib3\Crypt\EC\Curves\Ed25519;
-use phpseclib3\Crypt\EC\Curves\Ed448;
-use phpseclib3\Crypt\EC\Formats\Keys\PKCS1;
-use phpseclib3\Crypt\EC\Parameters;
-use phpseclib3\Crypt\EC\PrivateKey;
-use phpseclib3\Crypt\EC\PublicKey;
-use phpseclib3\Exception\UnsupportedAlgorithmException;
-use phpseclib3\Exception\UnsupportedCurveException;
-use phpseclib3\Exception\UnsupportedOperationException;
-use phpseclib3\File\ASN1;
-use phpseclib3\File\ASN1\Maps\ECParameters;
-use phpseclib3\Math\BigInteger;
-
-/**
- * Pure-PHP implementation of EC.
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class EC extends AsymmetricKey
-{
-    /**
-     * Algorithm Name
-     *
-     * @var string
-     */
-    const ALGORITHM = 'EC';
-
-    /**
-     * Public Key QA
-     *
-     * @var object[]
-     */
-    protected $QA;
-
-    /**
-     * Curve
-     *
-     * @var \phpseclib3\Crypt\EC\BaseCurves\Base
-     */
-    protected $curve;
-
-    /**
-     * Signature Format
-     *
-     * @var string
-     */
-    protected $format;
-
-    /**
-     * Signature Format (Short)
-     *
-     * @var string
-     */
-    protected $shortFormat;
-
-    /**
-     * Curve Name
-     *
-     * @var string
-     */
-    private $curveName;
-
-    /**
-     * Curve Order
-     *
-     * Used for deterministic ECDSA
-     *
-     * @var \phpseclib3\Math\BigInteger
-     */
-    protected $q;
-
-    /**
-     * Alias for the private key
-     *
-     * Used for deterministic ECDSA. AsymmetricKey expects $x. I don't like x because
-     * with x you have x * the base point yielding an (x, y)-coordinate that is the
-     * public key. But the x is different depending on which side of the equal sign
-     * you're on. It's less ambiguous if you do dA * base point = (x, y)-coordinate.
-     *
-     * @var \phpseclib3\Math\BigInteger
-     */
-    protected $x;
-
-    /**
-     * Context
-     *
-     * @var string
-     */
-    protected $context;
-
-    /**
-     * Signature Format
-     *
-     * @var string
-     */
-    protected $sigFormat;
-
-    /**
-     * Create public / private key pair.
-     *
-     * @param string $curve
-     * @return \phpseclib3\Crypt\EC\PrivateKey
-     */
-    public static function createKey($curve)
-    {
-        self::initialize_static_variables();
-
-        $class = new \ReflectionClass(static::class);
-        if ($class->isFinal()) {
-            throw new \RuntimeException('createKey() should not be called from final classes (' . static::class . ')');
-        }
-
-        if (!isset(self::$engines['PHP'])) {
-            self::useBestEngine();
-        }
-
-        $curve = strtolower($curve);
-        if (self::$engines['libsodium'] && $curve == 'ed25519' && function_exists('sodium_crypto_sign_keypair')) {
-            $kp = sodium_crypto_sign_keypair();
-
-            $privatekey = EC::loadFormat('libsodium', sodium_crypto_sign_secretkey($kp));
-            //$publickey = EC::loadFormat('libsodium', sodium_crypto_sign_publickey($kp));
-
-            $privatekey->curveName = 'Ed25519';
-            //$publickey->curveName = $curve;
-
-            return $privatekey;
-        }
-
-        $privatekey = new PrivateKey();
-
-        $curveName = $curve;
-        if (preg_match('#(?:^curve|^ed)\d+$#', $curveName)) {
-            $curveName = ucfirst($curveName);
-        } elseif (substr($curveName, 0, 10) == 'brainpoolp') {
-            $curveName = 'brainpoolP' . substr($curveName, 10);
-        }
-        $curve = '\phpseclib3\Crypt\EC\Curves\\' . $curveName;
-
-        if (!class_exists($curve)) {
-            throw new UnsupportedCurveException('Named Curve of ' . $curveName . ' is not supported');
-        }
-
-        $reflect = new \ReflectionClass($curve);
-        $curveName = $reflect->isFinal() ?
-            $reflect->getParentClass()->getShortName() :
-            $reflect->getShortName();
-
-        $curve = new $curve();
-        if ($curve instanceof TwistedEdwardsCurve) {
-            $arr = $curve->extractSecret(Random::string($curve instanceof Ed448 ? 57 : 32));
-            $privatekey->dA = $dA = $arr['dA'];
-            $privatekey->secret = $arr['secret'];
-        } else {
-            $privatekey->dA = $dA = $curve->createRandomMultiplier();
-        }
-        if ($curve instanceof Curve25519 && self::$engines['libsodium']) {
-            //$r = pack('H*', '0900000000000000000000000000000000000000000000000000000000000000');
-            //$QA = sodium_crypto_scalarmult($dA->toBytes(), $r);
-            $QA = sodium_crypto_box_publickey_from_secretkey($dA->toBytes());
-            $privatekey->QA = [$curve->convertInteger(new BigInteger(strrev($QA), 256))];
-        } else {
-            $privatekey->QA = $curve->multiplyPoint($curve->getBasePoint(), $dA);
-        }
-        $privatekey->curve = $curve;
-
-        //$publickey = clone $privatekey;
-        //unset($publickey->dA);
-        //unset($publickey->x);
-
-        $privatekey->curveName = $curveName;
-        //$publickey->curveName = $curveName;
-
-        if ($privatekey->curve instanceof TwistedEdwardsCurve) {
-            return $privatekey->withHash($curve::HASH);
-        }
-
-        return $privatekey;
-    }
-
-    /**
-     * OnLoad Handler
-     *
-     * @return bool
-     */
-    protected static function onLoad(array $components)
-    {
-        if (!isset(self::$engines['PHP'])) {
-            self::useBestEngine();
-        }
-
-        if (!isset($components['dA']) && !isset($components['QA'])) {
-            $new = new Parameters();
-            $new->curve = $components['curve'];
-            return $new;
-        }
-
-        $new = isset($components['dA']) ?
-            new PrivateKey() :
-            new PublicKey();
-        $new->curve = $components['curve'];
-        $new->QA = $components['QA'];
-
-        if (isset($components['dA'])) {
-            $new->dA = $components['dA'];
-            $new->secret = $components['secret'];
-        }
-
-        if ($new->curve instanceof TwistedEdwardsCurve) {
-            return $new->withHash($components['curve']::HASH);
-        }
-
-        return $new;
-    }
-
-    /**
-     * Constructor
-     *
-     * PublicKey and PrivateKey objects can only be created from abstract RSA class
-     */
-    protected function __construct()
-    {
-        $this->sigFormat = self::validatePlugin('Signature', 'ASN1');
-        $this->shortFormat = 'ASN1';
-
-        parent::__construct();
-    }
-
-    /**
-     * Returns the curve
-     *
-     * Returns a string if it's a named curve, an array if not
-     *
-     * @return string|array
-     */
-    public function getCurve()
-    {
-        if ($this->curveName) {
-            return $this->curveName;
-        }
-
-        if ($this->curve instanceof MontgomeryCurve) {
-            $this->curveName = $this->curve instanceof Curve25519 ? 'Curve25519' : 'Curve448';
-            return $this->curveName;
-        }
-
-        if ($this->curve instanceof TwistedEdwardsCurve) {
-            $this->curveName = $this->curve instanceof Ed25519 ? 'Ed25519' : 'Ed448';
-            return $this->curveName;
-        }
-
-        $params = $this->getParameters()->toString('PKCS8', ['namedCurve' => true]);
-        $decoded = ASN1::extractBER($params);
-        $decoded = ASN1::decodeBER($decoded);
-        $decoded = ASN1::asn1map($decoded[0], ECParameters::MAP);
-        if (isset($decoded['namedCurve'])) {
-            $this->curveName = $decoded['namedCurve'];
-            return $decoded['namedCurve'];
-        }
-
-        if (!$namedCurves) {
-            PKCS1::useSpecifiedCurve();
-        }
-
-        return $decoded;
-    }
-
-    /**
-     * Returns the key size
-     *
-     * Quoting https://tools.ietf.org/html/rfc5656#section-2,
-     *
-     * "The size of a set of elliptic curve domain parameters on a prime
-     *  curve is defined as the number of bits in the binary representation
-     *  of the field order, commonly denoted by p.  Size on a
-     *  characteristic-2 curve is defined as the number of bits in the binary
-     *  representation of the field, commonly denoted by m.  A set of
-     *  elliptic curve domain parameters defines a group of order n generated
-     *  by a base point P"
-     *
-     * @return int
-     */
-    public function getLength()
-    {
-        return $this->curve->getLength();
-    }
-
-    /**
-     * Returns the current engine being used
-     *
-     * @see self::useInternalEngine()
-     * @see self::useBestEngine()
-     * @return string
-     */
-    public function getEngine()
-    {
-        if (!isset(self::$engines['PHP'])) {
-            self::useBestEngine();
-        }
-        if ($this->curve instanceof TwistedEdwardsCurve) {
-            return $this->curve instanceof Ed25519 && self::$engines['libsodium'] && !isset($this->context) ?
-                'libsodium' : 'PHP';
-        }
-
-        return self::$engines['OpenSSL'] && in_array($this->hash->getHash(), openssl_get_md_methods()) ?
-            'OpenSSL' : 'PHP';
-    }
-
-    /**
-     * Returns the public key coordinates as a string
-     *
-     * Used by ECDH
-     *
-     * @return string
-     */
-    public function getEncodedCoordinates()
-    {
-        if ($this->curve instanceof MontgomeryCurve) {
-            return strrev($this->QA[0]->toBytes(true));
-        }
-        if ($this->curve instanceof TwistedEdwardsCurve) {
-            return $this->curve->encodePoint($this->QA);
-        }
-        return "\4" . $this->QA[0]->toBytes(true) . $this->QA[1]->toBytes(true);
-    }
-
-    /**
-     * Returns the parameters
-     *
-     * @see self::getPublicKey()
-     * @param string $type optional
-     * @return mixed
-     */
-    public function getParameters($type = 'PKCS1')
-    {
-        $type = self::validatePlugin('Keys', $type, 'saveParameters');
-
-        $key = $type::saveParameters($this->curve);
-
-        return EC::load($key, 'PKCS1')
-            ->withHash($this->hash->getHash())
-            ->withSignatureFormat($this->shortFormat);
-    }
-
-    /**
-     * Determines the signature padding mode
-     *
-     * Valid values are: ASN1, SSH2, Raw
-     *
-     * @param string $format
-     */
-    public function withSignatureFormat($format)
-    {
-        if ($this->curve instanceof MontgomeryCurve) {
-            throw new UnsupportedOperationException('Montgomery Curves cannot be used to create signatures');
-        }
-
-        $new = clone $this;
-        $new->shortFormat = $format;
-        $new->sigFormat = self::validatePlugin('Signature', $format);
-        return $new;
-    }
-
-    /**
-     * Returns the signature format currently being used
-     *
-     */
-    public function getSignatureFormat()
-    {
-        return $this->shortFormat;
-    }
-
-    /**
-     * Sets the context
-     *
-     * Used by Ed25519 / Ed448.
-     *
-     * @see self::sign()
-     * @see self::verify()
-     * @param string $context optional
-     */
-    public function withContext($context = null)
-    {
-        if (!$this->curve instanceof TwistedEdwardsCurve) {
-            throw new UnsupportedCurveException('Only Ed25519 and Ed448 support contexts');
-        }
-
-        $new = clone $this;
-        if (!isset($context)) {
-            $new->context = null;
-            return $new;
-        }
-        if (!is_string($context)) {
-            throw new \InvalidArgumentException('setContext expects a string');
-        }
-        if (strlen($context) > 255) {
-            throw new \LengthException('The context is supposed to be, at most, 255 bytes long');
-        }
-        $new->context = $context;
-        return $new;
-    }
-
-    /**
-     * Returns the signature format currently being used
-     *
-     */
-    public function getContext()
-    {
-        return $this->context;
-    }
-
-    /**
-     * Determines which hashing function should be used
-     *
-     * @param string $hash
-     */
-    public function withHash($hash)
-    {
-        if ($this->curve instanceof MontgomeryCurve) {
-            throw new UnsupportedOperationException('Montgomery Curves cannot be used to create signatures');
-        }
-        if ($this->curve instanceof Ed25519 && $hash != 'sha512') {
-            throw new UnsupportedAlgorithmException('Ed25519 only supports sha512 as a hash');
-        }
-        if ($this->curve instanceof Ed448 && $hash != 'shake256-912') {
-            throw new UnsupportedAlgorithmException('Ed448 only supports shake256 with a length of 114 bytes');
-        }
-
-        return parent::withHash($hash);
-    }
-
-    /**
-     * __toString() magic method
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        if ($this->curve instanceof MontgomeryCurve) {
-            return '';
-        }
-
-        return parent::__toString();
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/BaseCurves/Base.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/BaseCurves/Base.php
deleted file mode 100644
index dbc914be..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/BaseCurves/Base.php
+++ /dev/null
@@ -1,218 +0,0 @@
-<?php
-
-/**
- * Curve methods common to all curves
- *
- * PHP version 5 and 7
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2017 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://pear.php.net/package/Math_BigInteger
- */
-
-namespace phpseclib3\Crypt\EC\BaseCurves;
-
-use phpseclib3\Math\BigInteger;
-
-/**
- * Base
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class Base
-{
-    /**
-     * The Order
-     *
-     * @var BigInteger
-     */
-    protected $order;
-
-    /**
-     * Finite Field Integer factory
-     *
-     * @var \phpseclib3\Math\FiniteField\Integer
-     */
-    protected $factory;
-
-    /**
-     * Returns a random integer
-     *
-     * @return object
-     */
-    public function randomInteger()
-    {
-        return $this->factory->randomInteger();
-    }
-
-    /**
-     * Converts a BigInteger to a \phpseclib3\Math\FiniteField\Integer integer
-     *
-     * @return object
-     */
-    public function convertInteger(BigInteger $x)
-    {
-        return $this->factory->newInteger($x);
-    }
-
-    /**
-     * Returns the length, in bytes, of the modulo
-     *
-     * @return integer
-     */
-    public function getLengthInBytes()
-    {
-        return $this->factory->getLengthInBytes();
-    }
-
-    /**
-     * Returns the length, in bits, of the modulo
-     *
-     * @return integer
-     */
-    public function getLength()
-    {
-        return $this->factory->getLength();
-    }
-
-    /**
-     * Multiply a point on the curve by a scalar
-     *
-     * Uses the montgomery ladder technique as described here:
-     *
-     * https://en.wikipedia.org/wiki/Elliptic_curve_point_multiplication#Montgomery_ladder
-     * https://github.com/phpecc/phpecc/issues/16#issuecomment-59176772
-     *
-     * @return array
-     */
-    public function multiplyPoint(array $p, BigInteger $d)
-    {
-        $alreadyInternal = isset($p[2]);
-        $r = $alreadyInternal ?
-            [[], $p] :
-            [[], $this->convertToInternal($p)];
-
-        $d = $d->toBits();
-        for ($i = 0; $i < strlen($d); $i++) {
-            $d_i = (int) $d[$i];
-            $r[1 - $d_i] = $this->addPoint($r[0], $r[1]);
-            $r[$d_i] = $this->doublePoint($r[$d_i]);
-        }
-
-        return $alreadyInternal ? $r[0] : $this->convertToAffine($r[0]);
-    }
-
-    /**
-     * Creates a random scalar multiplier
-     *
-     * @return BigInteger
-     */
-    public function createRandomMultiplier()
-    {
-        static $one;
-        if (!isset($one)) {
-            $one = new BigInteger(1);
-        }
-
-        return BigInteger::randomRange($one, $this->order->subtract($one));
-    }
-
-    /**
-     * Performs range check
-     */
-    public function rangeCheck(BigInteger $x)
-    {
-        static $zero;
-        if (!isset($zero)) {
-            $zero = new BigInteger();
-        }
-
-        if (!isset($this->order)) {
-            throw new \RuntimeException('setOrder needs to be called before this method');
-        }
-        if ($x->compare($this->order) > 0 || $x->compare($zero) <= 0) {
-            throw new \RangeException('x must be between 1 and the order of the curve');
-        }
-    }
-
-    /**
-     * Sets the Order
-     */
-    public function setOrder(BigInteger $order)
-    {
-        $this->order = $order;
-    }
-
-    /**
-     * Returns the Order
-     *
-     * @return \phpseclib3\Math\BigInteger
-     */
-    public function getOrder()
-    {
-        return $this->order;
-    }
-
-    /**
-     * Use a custom defined modular reduction function
-     *
-     * @return object
-     */
-    public function setReduction(callable $func)
-    {
-        $this->factory->setReduction($func);
-    }
-
-    /**
-     * Returns the affine point
-     *
-     * @return object[]
-     */
-    public function convertToAffine(array $p)
-    {
-        return $p;
-    }
-
-    /**
-     * Converts an affine point to a jacobian coordinate
-     *
-     * @return object[]
-     */
-    public function convertToInternal(array $p)
-    {
-        return $p;
-    }
-
-    /**
-     * Negates a point
-     *
-     * @return object[]
-     */
-    public function negatePoint(array $p)
-    {
-        $temp = [
-            $p[0],
-            $p[1]->negate()
-        ];
-        if (isset($p[2])) {
-            $temp[] = $p[2];
-        }
-        return $temp;
-    }
-
-    /**
-     * Multiply and Add Points
-     *
-     * @return int[]
-     */
-    public function multiplyAddPoints(array $points, array $scalars)
-    {
-        $p1 = $this->convertToInternal($points[0]);
-        $p2 = $this->convertToInternal($points[1]);
-        $p1 = $this->multiplyPoint($p1, $scalars[0]);
-        $p2 = $this->multiplyPoint($p2, $scalars[1]);
-        $r = $this->addPoint($p1, $p2);
-        return $this->convertToAffine($r);
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/BaseCurves/Binary.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/BaseCurves/Binary.php
deleted file mode 100644
index 4fc6c70c..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/BaseCurves/Binary.php
+++ /dev/null
@@ -1,373 +0,0 @@
-<?php
-
-/**
- * Curves over y^2 + x*y = x^3 + a*x^2 + b
- *
- * These are curves used in SEC 2 over prime fields: http://www.secg.org/SEC2-Ver-1.0.pdf
- * The curve is a weierstrass curve with a[3] and a[2] set to 0.
- *
- * Uses Jacobian Coordinates for speed if able:
- *
- * https://en.wikipedia.org/wiki/Jacobian_curve
- * https://en.wikibooks.org/wiki/Cryptography/Prime_Curve/Jacobian_Coordinates
- *
- * PHP version 5 and 7
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2017 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://pear.php.net/package/Math_BigInteger
- */
-
-namespace phpseclib3\Crypt\EC\BaseCurves;
-
-use phpseclib3\Math\BigInteger;
-use phpseclib3\Math\BinaryField;
-use phpseclib3\Math\BinaryField\Integer as BinaryInteger;
-
-/**
- * Curves over y^2 + x*y = x^3 + a*x^2 + b
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-class Binary extends Base
-{
-    /**
-     * Binary Field Integer factory
-     *
-     * @var \phpseclib3\Math\BinaryField
-     */
-    protected $factory;
-
-    /**
-     * Cofficient for x^1
-     *
-     * @var object
-     */
-    protected $a;
-
-    /**
-     * Cofficient for x^0
-     *
-     * @var object
-     */
-    protected $b;
-
-    /**
-     * Base Point
-     *
-     * @var object
-     */
-    protected $p;
-
-    /**
-     * The number one over the specified finite field
-     *
-     * @var object
-     */
-    protected $one;
-
-    /**
-     * The modulo
-     *
-     * @var BigInteger
-     */
-    protected $modulo;
-
-    /**
-     * The Order
-     *
-     * @var BigInteger
-     */
-    protected $order;
-
-    /**
-     * Sets the modulo
-     */
-    public function setModulo(...$modulo)
-    {
-        $this->modulo = $modulo;
-        $this->factory = new BinaryField(...$modulo);
-
-        $this->one = $this->factory->newInteger("\1");
-    }
-
-    /**
-     * Set coefficients a and b
-     *
-     * @param string $a
-     * @param string $b
-     */
-    public function setCoefficients($a, $b)
-    {
-        if (!isset($this->factory)) {
-            throw new \RuntimeException('setModulo needs to be called before this method');
-        }
-        $this->a = $this->factory->newInteger(pack('H*', $a));
-        $this->b = $this->factory->newInteger(pack('H*', $b));
-    }
-
-    /**
-     * Set x and y coordinates for the base point
-     *
-     * @param string|BinaryInteger $x
-     * @param string|BinaryInteger $y
-     */
-    public function setBasePoint($x, $y)
-    {
-        switch (true) {
-            case !is_string($x) && !$x instanceof BinaryInteger:
-                throw new \UnexpectedValueException('Argument 1 passed to Binary::setBasePoint() must be a string or an instance of BinaryField\Integer');
-            case !is_string($y) && !$y instanceof BinaryInteger:
-                throw new \UnexpectedValueException('Argument 2 passed to Binary::setBasePoint() must be a string or an instance of BinaryField\Integer');
-        }
-        if (!isset($this->factory)) {
-            throw new \RuntimeException('setModulo needs to be called before this method');
-        }
-        $this->p = [
-            is_string($x) ? $this->factory->newInteger(pack('H*', $x)) : $x,
-            is_string($y) ? $this->factory->newInteger(pack('H*', $y)) : $y
-        ];
-    }
-
-    /**
-     * Retrieve the base point as an array
-     *
-     * @return array
-     */
-    public function getBasePoint()
-    {
-        if (!isset($this->factory)) {
-            throw new \RuntimeException('setModulo needs to be called before this method');
-        }
-        /*
-        if (!isset($this->p)) {
-            throw new \RuntimeException('setBasePoint needs to be called before this method');
-        }
-        */
-        return $this->p;
-    }
-
-    /**
-     * Adds two points on the curve
-     *
-     * @return FiniteField[]
-     */
-    public function addPoint(array $p, array $q)
-    {
-        if (!isset($this->factory)) {
-            throw new \RuntimeException('setModulo needs to be called before this method');
-        }
-
-        if (!count($p) || !count($q)) {
-            if (count($q)) {
-                return $q;
-            }
-            if (count($p)) {
-                return $p;
-            }
-            return [];
-        }
-
-        if (!isset($p[2]) || !isset($q[2])) {
-            throw new \RuntimeException('Affine coordinates need to be manually converted to "Jacobi" coordinates or vice versa');
-        }
-
-        if ($p[0]->equals($q[0])) {
-            return !$p[1]->equals($q[1]) ? [] : $this->doublePoint($p);
-        }
-
-        // formulas from http://hyperelliptic.org/EFD/g12o/auto-shortw-jacobian.html
-
-        list($x1, $y1, $z1) = $p;
-        list($x2, $y2, $z2) = $q;
-
-        $o1 = $z1->multiply($z1);
-        $b = $x2->multiply($o1);
-
-        if ($z2->equals($this->one)) {
-            $d = $y2->multiply($o1)->multiply($z1);
-            $e = $x1->add($b);
-            $f = $y1->add($d);
-            $z3 = $e->multiply($z1);
-            $h = $f->multiply($x2)->add($z3->multiply($y2));
-            $i = $f->add($z3);
-            $g = $z3->multiply($z3);
-            $p1 = $this->a->multiply($g);
-            $p2 = $f->multiply($i);
-            $p3 = $e->multiply($e)->multiply($e);
-            $x3 = $p1->add($p2)->add($p3);
-            $y3 = $i->multiply($x3)->add($g->multiply($h));
-
-            return [$x3, $y3, $z3];
-        }
-
-        $o2 = $z2->multiply($z2);
-        $a = $x1->multiply($o2);
-        $c = $y1->multiply($o2)->multiply($z2);
-        $d = $y2->multiply($o1)->multiply($z1);
-        $e = $a->add($b);
-        $f = $c->add($d);
-        $g = $e->multiply($z1);
-        $h = $f->multiply($x2)->add($g->multiply($y2));
-        $z3 = $g->multiply($z2);
-        $i = $f->add($z3);
-        $p1 = $this->a->multiply($z3->multiply($z3));
-        $p2 = $f->multiply($i);
-        $p3 = $e->multiply($e)->multiply($e);
-        $x3 = $p1->add($p2)->add($p3);
-        $y3 = $i->multiply($x3)->add($g->multiply($g)->multiply($h));
-
-        return [$x3, $y3, $z3];
-    }
-
-    /**
-     * Doubles a point on a curve
-     *
-     * @return FiniteField[]
-     */
-    public function doublePoint(array $p)
-    {
-        if (!isset($this->factory)) {
-            throw new \RuntimeException('setModulo needs to be called before this method');
-        }
-
-        if (!count($p)) {
-            return [];
-        }
-
-        if (!isset($p[2])) {
-            throw new \RuntimeException('Affine coordinates need to be manually converted to "Jacobi" coordinates or vice versa');
-        }
-
-        // formulas from http://hyperelliptic.org/EFD/g12o/auto-shortw-jacobian.html
-
-        list($x1, $y1, $z1) = $p;
-
-        $a = $x1->multiply($x1);
-        $b = $a->multiply($a);
-
-        if ($z1->equals($this->one)) {
-            $x3 = $b->add($this->b);
-            $z3 = clone $x1;
-            $p1 = $a->add($y1)->add($z3)->multiply($this->b);
-            $p2 = $a->add($y1)->multiply($b);
-            $y3 = $p1->add($p2);
-
-            return [$x3, $y3, $z3];
-        }
-
-        $c = $z1->multiply($z1);
-        $d = $c->multiply($c);
-        $x3 = $b->add($this->b->multiply($d->multiply($d)));
-        $z3 = $x1->multiply($c);
-        $p1 = $b->multiply($z3);
-        $p2 = $a->add($y1->multiply($z1))->add($z3)->multiply($x3);
-        $y3 = $p1->add($p2);
-
-        return [$x3, $y3, $z3];
-    }
-
-    /**
-     * Returns the X coordinate and the derived Y coordinate
-     *
-     * Not supported because it is covered by patents.
-     * Quoting https://www.openssl.org/docs/man1.1.0/apps/ecparam.html ,
-     *
-     * "Due to patent issues the compressed option is disabled by default for binary curves
-     *  and can be enabled by defining the preprocessor macro OPENSSL_EC_BIN_PT_COMP at
-     *  compile time."
-     *
-     * @return array
-     */
-    public function derivePoint($m)
-    {
-        throw new \RuntimeException('Point compression on binary finite field elliptic curves is not supported');
-    }
-
-    /**
-     * Tests whether or not the x / y values satisfy the equation
-     *
-     * @return boolean
-     */
-    public function verifyPoint(array $p)
-    {
-        list($x, $y) = $p;
-        $lhs = $y->multiply($y);
-        $lhs = $lhs->add($x->multiply($y));
-        $x2 = $x->multiply($x);
-        $x3 = $x2->multiply($x);
-        $rhs = $x3->add($this->a->multiply($x2))->add($this->b);
-
-        return $lhs->equals($rhs);
-    }
-
-    /**
-     * Returns the modulo
-     *
-     * @return \phpseclib3\Math\BigInteger
-     */
-    public function getModulo()
-    {
-        return $this->modulo;
-    }
-
-    /**
-     * Returns the a coefficient
-     *
-     * @return \phpseclib3\Math\PrimeField\Integer
-     */
-    public function getA()
-    {
-        return $this->a;
-    }
-
-    /**
-     * Returns the a coefficient
-     *
-     * @return \phpseclib3\Math\PrimeField\Integer
-     */
-    public function getB()
-    {
-        return $this->b;
-    }
-
-    /**
-     * Returns the affine point
-     *
-     * A Jacobian Coordinate is of the form (x, y, z).
-     * To convert a Jacobian Coordinate to an Affine Point
-     * you do (x / z^2, y / z^3)
-     *
-     * @return \phpseclib3\Math\PrimeField\Integer[]
-     */
-    public function convertToAffine(array $p)
-    {
-        if (!isset($p[2])) {
-            return $p;
-        }
-        list($x, $y, $z) = $p;
-        $z = $this->one->divide($z);
-        $z2 = $z->multiply($z);
-        return [
-            $x->multiply($z2),
-            $y->multiply($z2)->multiply($z)
-        ];
-    }
-
-    /**
-     * Converts an affine point to a jacobian coordinate
-     *
-     * @return \phpseclib3\Math\PrimeField\Integer[]
-     */
-    public function convertToInternal(array $p)
-    {
-        if (isset($p[2])) {
-            return $p;
-        }
-
-        $p[2] = clone $this->one;
-        $p['fresh'] = true;
-        return $p;
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/BaseCurves/KoblitzPrime.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/BaseCurves/KoblitzPrime.php
deleted file mode 100644
index d8492ebc..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/BaseCurves/KoblitzPrime.php
+++ /dev/null
@@ -1,335 +0,0 @@
-<?php
-
-/**
- * Generalized Koblitz Curves over y^2 = x^3 + b.
- *
- * According to http://www.secg.org/SEC2-Ver-1.0.pdf Koblitz curves are over the GF(2**m)
- * finite field. Both the $a$ and $b$ coefficients are either 0 or 1. However, SEC2
- * generalizes the definition to include curves over GF(P) "which possess an efficiently
- * computable endomorphism".
- *
- * For these generalized Koblitz curves $b$ doesn't have to be 0 or 1. Whether or not $a$
- * has any restrictions on it is unclear, however, for all the GF(P) Koblitz curves defined
- * in SEC2 v1.0 $a$ is $0$ so all of the methods defined herein will assume that it is.
- *
- * I suppose we could rename the $b$ coefficient to $a$, however, the documentation refers
- * to $b$ so we'll just keep it.
- *
- * If a later version of SEC2 comes out wherein some $a$ values are non-zero we can create a
- * new method for those. eg. KoblitzA1Prime.php or something.
- *
- * PHP version 5 and 7
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2017 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://pear.php.net/package/Math_BigInteger
- */
-
-namespace phpseclib3\Crypt\EC\BaseCurves;
-
-use phpseclib3\Math\BigInteger;
-use phpseclib3\Math\PrimeField;
-
-/**
- * Curves over y^2 = x^3 + b
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-class KoblitzPrime extends Prime
-{
-    /**
-     * Basis
-     *
-     * @var list<array{a: BigInteger, b: BigInteger}>
-     */
-    protected $basis;
-
-    /**
-     * Beta
-     *
-     * @var PrimeField\Integer
-     */
-    protected $beta;
-
-    // don't overwrite setCoefficients() with one that only accepts one parameter so that
-    // one might be able to switch between KoblitzPrime and Prime more easily (for benchmarking
-    // purposes).
-
-    /**
-     * Multiply and Add Points
-     *
-     * Uses a efficiently computable endomorphism to achieve a slight speedup
-     *
-     * Adapted from:
-     * https://github.com/indutny/elliptic/blob/725bd91/lib/elliptic/curve/short.js#L219
-     *
-     * @return int[]
-     */
-    public function multiplyAddPoints(array $points, array $scalars)
-    {
-        static $zero, $one, $two;
-        if (!isset($two)) {
-            $two = new BigInteger(2);
-            $one = new BigInteger(1);
-        }
-
-        if (!isset($this->beta)) {
-            // get roots
-            $inv = $this->one->divide($this->two)->negate();
-            $s = $this->three->negate()->squareRoot()->multiply($inv);
-            $betas = [
-                $inv->add($s),
-                $inv->subtract($s)
-            ];
-            $this->beta = $betas[0]->compare($betas[1]) < 0 ? $betas[0] : $betas[1];
-            //echo strtoupper($this->beta->toHex(true)) . "\n"; exit;
-        }
-
-        if (!isset($this->basis)) {
-            $factory = new PrimeField($this->order);
-            $tempOne = $factory->newInteger($one);
-            $tempTwo = $factory->newInteger($two);
-            $tempThree = $factory->newInteger(new BigInteger(3));
-
-            $inv = $tempOne->divide($tempTwo)->negate();
-            $s = $tempThree->negate()->squareRoot()->multiply($inv);
-
-            $lambdas = [
-                $inv->add($s),
-                $inv->subtract($s)
-            ];
-
-            $lhs = $this->multiplyPoint($this->p, $lambdas[0])[0];
-            $rhs = $this->p[0]->multiply($this->beta);
-            $lambda = $lhs->equals($rhs) ? $lambdas[0] : $lambdas[1];
-
-            $this->basis = static::extendedGCD($lambda->toBigInteger(), $this->order);
-            ///*
-            foreach ($this->basis as $basis) {
-                echo strtoupper($basis['a']->toHex(true)) . "\n";
-                echo strtoupper($basis['b']->toHex(true)) . "\n\n";
-            }
-            exit;
-            //*/
-        }
-
-        $npoints = $nscalars = [];
-        for ($i = 0; $i < count($points); $i++) {
-            $p = $points[$i];
-            $k = $scalars[$i]->toBigInteger();
-
-            // begin split
-            list($v1, $v2) = $this->basis;
-
-            $c1 = $v2['b']->multiply($k);
-            list($c1, $r) = $c1->divide($this->order);
-            if ($this->order->compare($r->multiply($two)) <= 0) {
-                $c1 = $c1->add($one);
-            }
-
-            $c2 = $v1['b']->negate()->multiply($k);
-            list($c2, $r) = $c2->divide($this->order);
-            if ($this->order->compare($r->multiply($two)) <= 0) {
-                $c2 = $c2->add($one);
-            }
-
-            $p1 = $c1->multiply($v1['a']);
-            $p2 = $c2->multiply($v2['a']);
-            $q1 = $c1->multiply($v1['b']);
-            $q2 = $c2->multiply($v2['b']);
-
-            $k1 = $k->subtract($p1)->subtract($p2);
-            $k2 = $q1->add($q2)->negate();
-            // end split
-
-            $beta = [
-                $p[0]->multiply($this->beta),
-                $p[1],
-                clone $this->one
-            ];
-
-            if (isset($p['naf'])) {
-                $beta['naf'] = array_map(function ($p) {
-                    return [
-                        $p[0]->multiply($this->beta),
-                        $p[1],
-                        clone $this->one
-                    ];
-                }, $p['naf']);
-                $beta['nafwidth'] = $p['nafwidth'];
-            }
-
-            if ($k1->isNegative()) {
-                $k1 = $k1->negate();
-                $p = $this->negatePoint($p);
-            }
-
-            if ($k2->isNegative()) {
-                $k2 = $k2->negate();
-                $beta = $this->negatePoint($beta);
-            }
-
-            $pos = 2 * $i;
-            $npoints[$pos] = $p;
-            $nscalars[$pos] = $this->factory->newInteger($k1);
-
-            $pos++;
-            $npoints[$pos] = $beta;
-            $nscalars[$pos] = $this->factory->newInteger($k2);
-        }
-
-        return parent::multiplyAddPoints($npoints, $nscalars);
-    }
-
-    /**
-     * Returns the numerator and denominator of the slope
-     *
-     * @return FiniteField[]
-     */
-    protected function doublePointHelper(array $p)
-    {
-        $numerator = $this->three->multiply($p[0])->multiply($p[0]);
-        $denominator = $this->two->multiply($p[1]);
-        return [$numerator, $denominator];
-    }
-
-    /**
-     * Doubles a jacobian coordinate on the curve
-     *
-     * See http://hyperelliptic.org/EFD/g1p/auto-shortw-jacobian-0.html#doubling-dbl-2009-l
-     *
-     * @return FiniteField[]
-     */
-    protected function jacobianDoublePoint(array $p)
-    {
-        list($x1, $y1, $z1) = $p;
-        $a = $x1->multiply($x1);
-        $b = $y1->multiply($y1);
-        $c = $b->multiply($b);
-        $d = $x1->add($b);
-        $d = $d->multiply($d)->subtract($a)->subtract($c)->multiply($this->two);
-        $e = $this->three->multiply($a);
-        $f = $e->multiply($e);
-        $x3 = $f->subtract($this->two->multiply($d));
-        $y3 = $e->multiply($d->subtract($x3))->subtract(
-            $this->eight->multiply($c)
-        );
-        $z3 = $this->two->multiply($y1)->multiply($z1);
-        return [$x3, $y3, $z3];
-    }
-
-    /**
-     * Doubles a "fresh" jacobian coordinate on the curve
-     *
-     * See http://hyperelliptic.org/EFD/g1p/auto-shortw-jacobian-0.html#doubling-mdbl-2007-bl
-     *
-     * @return FiniteField[]
-     */
-    protected function jacobianDoublePointMixed(array $p)
-    {
-        list($x1, $y1) = $p;
-        $xx = $x1->multiply($x1);
-        $yy = $y1->multiply($y1);
-        $yyyy = $yy->multiply($yy);
-        $s = $x1->add($yy);
-        $s = $s->multiply($s)->subtract($xx)->subtract($yyyy)->multiply($this->two);
-        $m = $this->three->multiply($xx);
-        $t = $m->multiply($m)->subtract($this->two->multiply($s));
-        $x3 = $t;
-        $y3 = $s->subtract($t);
-        $y3 = $m->multiply($y3)->subtract($this->eight->multiply($yyyy));
-        $z3 = $this->two->multiply($y1);
-        return [$x3, $y3, $z3];
-    }
-
-    /**
-     * Tests whether or not the x / y values satisfy the equation
-     *
-     * @return boolean
-     */
-    public function verifyPoint(array $p)
-    {
-        list($x, $y) = $p;
-        $lhs = $y->multiply($y);
-        $temp = $x->multiply($x)->multiply($x);
-        $rhs = $temp->add($this->b);
-
-        return $lhs->equals($rhs);
-    }
-
-    /**
-     * Calculates the parameters needed from the Euclidean algorithm as discussed at
-     * http://diamond.boisestate.edu/~liljanab/MATH308/GuideToECC.pdf#page=148
-     *
-     * @param BigInteger $u
-     * @param BigInteger $v
-     * @return BigInteger[]
-     */
-    protected static function extendedGCD(BigInteger $u, BigInteger $v)
-    {
-        $one = new BigInteger(1);
-        $zero = new BigInteger();
-
-        $a = clone $one;
-        $b = clone $zero;
-        $c = clone $zero;
-        $d = clone $one;
-
-        $stop = $v->bitwise_rightShift($v->getLength() >> 1);
-
-        $a1 = clone $zero;
-        $b1 = clone $zero;
-        $a2 = clone $zero;
-        $b2 = clone $zero;
-
-        $postGreatestIndex = 0;
-
-        while (!$v->equals($zero)) {
-            list($q) = $u->divide($v);
-
-            $temp = $u;
-            $u = $v;
-            $v = $temp->subtract($v->multiply($q));
-
-            $temp = $a;
-            $a = $c;
-            $c = $temp->subtract($a->multiply($q));
-
-            $temp = $b;
-            $b = $d;
-            $d = $temp->subtract($b->multiply($q));
-
-            if ($v->compare($stop) > 0) {
-                $a0 = $v;
-                $b0 = $c;
-            } else {
-                $postGreatestIndex++;
-            }
-
-            if ($postGreatestIndex == 1) {
-                $a1 = $v;
-                $b1 = $c->negate();
-            }
-
-            if ($postGreatestIndex == 2) {
-                $rhs = $a0->multiply($a0)->add($b0->multiply($b0));
-                $lhs = $v->multiply($v)->add($b->multiply($b));
-                if ($lhs->compare($rhs) <= 0) {
-                    $a2 = $a0;
-                    $b2 = $b0->negate();
-                } else {
-                    $a2 = $v;
-                    $b2 = $c->negate();
-                }
-
-                break;
-            }
-        }
-
-        return [
-            ['a' => $a1, 'b' => $b1],
-            ['a' => $a2, 'b' => $b2]
-        ];
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/BaseCurves/Montgomery.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/BaseCurves/Montgomery.php
deleted file mode 100644
index e3fa50b3..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/BaseCurves/Montgomery.php
+++ /dev/null
@@ -1,279 +0,0 @@
-<?php
-
-/**
- * Curves over y^2 = x^3 + a*x + x
- *
- * Technically, a Montgomery curve has a coefficient for y^2 but for Curve25519 and Curve448 that
- * coefficient is 1.
- *
- * Curve25519 and Curve448 do not make use of the y coordinate, which makes it unsuitable for use
- * with ECDSA / EdDSA. A few other differences between Curve25519 and Ed25519 are discussed at
- * https://crypto.stackexchange.com/a/43058/4520
- *
- * More info:
- *
- * https://en.wikipedia.org/wiki/Montgomery_curve
- *
- * PHP version 5 and 7
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2019 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://pear.php.net/package/Math_BigInteger
- */
-
-namespace phpseclib3\Crypt\EC\BaseCurves;
-
-use phpseclib3\Crypt\EC\Curves\Curve25519;
-use phpseclib3\Math\BigInteger;
-use phpseclib3\Math\PrimeField;
-use phpseclib3\Math\PrimeField\Integer as PrimeInteger;
-
-/**
- * Curves over y^2 = x^3 + a*x + x
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-class Montgomery extends Base
-{
-    /**
-     * Prime Field Integer factory
-     *
-     * @var \phpseclib3\Math\PrimeField
-     */
-    protected $factory;
-
-    /**
-     * Cofficient for x
-     *
-     * @var object
-     */
-    protected $a;
-
-    /**
-     * Constant used for point doubling
-     *
-     * @var object
-     */
-    protected $a24;
-
-    /**
-     * The Number Zero
-     *
-     * @var object
-     */
-    protected $zero;
-
-    /**
-     * The Number One
-     *
-     * @var object
-     */
-    protected $one;
-
-    /**
-     * Base Point
-     *
-     * @var object
-     */
-    protected $p;
-
-    /**
-     * The modulo
-     *
-     * @var BigInteger
-     */
-    protected $modulo;
-
-    /**
-     * The Order
-     *
-     * @var BigInteger
-     */
-    protected $order;
-
-    /**
-     * Sets the modulo
-     */
-    public function setModulo(BigInteger $modulo)
-    {
-        $this->modulo = $modulo;
-        $this->factory = new PrimeField($modulo);
-        $this->zero = $this->factory->newInteger(new BigInteger());
-        $this->one = $this->factory->newInteger(new BigInteger(1));
-    }
-
-    /**
-     * Set coefficients a
-     */
-    public function setCoefficients(BigInteger $a)
-    {
-        if (!isset($this->factory)) {
-            throw new \RuntimeException('setModulo needs to be called before this method');
-        }
-        $this->a = $this->factory->newInteger($a);
-        $two = $this->factory->newInteger(new BigInteger(2));
-        $four = $this->factory->newInteger(new BigInteger(4));
-        $this->a24 = $this->a->subtract($two)->divide($four);
-    }
-
-    /**
-     * Set x and y coordinates for the base point
-     *
-     * @param BigInteger|PrimeInteger $x
-     * @param BigInteger|PrimeInteger $y
-     * @return PrimeInteger[]
-     */
-    public function setBasePoint($x, $y)
-    {
-        switch (true) {
-            case !$x instanceof BigInteger && !$x instanceof PrimeInteger:
-                throw new \UnexpectedValueException('Argument 1 passed to Prime::setBasePoint() must be an instance of either BigInteger or PrimeField\Integer');
-            case !$y instanceof BigInteger && !$y instanceof PrimeInteger:
-                throw new \UnexpectedValueException('Argument 2 passed to Prime::setBasePoint() must be an instance of either BigInteger or PrimeField\Integer');
-        }
-        if (!isset($this->factory)) {
-            throw new \RuntimeException('setModulo needs to be called before this method');
-        }
-        $this->p = [
-            $x instanceof BigInteger ? $this->factory->newInteger($x) : $x,
-            $y instanceof BigInteger ? $this->factory->newInteger($y) : $y
-        ];
-    }
-
-    /**
-     * Retrieve the base point as an array
-     *
-     * @return array
-     */
-    public function getBasePoint()
-    {
-        if (!isset($this->factory)) {
-            throw new \RuntimeException('setModulo needs to be called before this method');
-        }
-        /*
-        if (!isset($this->p)) {
-            throw new \RuntimeException('setBasePoint needs to be called before this method');
-        }
-        */
-        return $this->p;
-    }
-
-    /**
-     * Doubles and adds a point on a curve
-     *
-     * See https://tools.ietf.org/html/draft-ietf-tls-curve25519-01#appendix-A.1.3
-     *
-     * @return FiniteField[][]
-     */
-    private function doubleAndAddPoint(array $p, array $q, PrimeInteger $x1)
-    {
-        if (!isset($this->factory)) {
-            throw new \RuntimeException('setModulo needs to be called before this method');
-        }
-
-        if (!count($p) || !count($q)) {
-            return [];
-        }
-
-        if (!isset($p[1])) {
-            throw new \RuntimeException('Affine coordinates need to be manually converted to XZ coordinates');
-        }
-
-        list($x2, $z2) = $p;
-        list($x3, $z3) = $q;
-
-        $a = $x2->add($z2);
-        $aa = $a->multiply($a);
-        $b = $x2->subtract($z2);
-        $bb = $b->multiply($b);
-        $e = $aa->subtract($bb);
-        $c = $x3->add($z3);
-        $d = $x3->subtract($z3);
-        $da = $d->multiply($a);
-        $cb = $c->multiply($b);
-        $temp = $da->add($cb);
-        $x5 = $temp->multiply($temp);
-        $temp = $da->subtract($cb);
-        $z5 = $x1->multiply($temp->multiply($temp));
-        $x4 = $aa->multiply($bb);
-        $temp = static::class == Curve25519::class ? $bb : $aa;
-        $z4 = $e->multiply($temp->add($this->a24->multiply($e)));
-
-        return [
-            [$x4, $z4],
-            [$x5, $z5]
-        ];
-    }
-
-    /**
-     * Multiply a point on the curve by a scalar
-     *
-     * Uses the montgomery ladder technique as described here:
-     *
-     * https://en.wikipedia.org/wiki/Elliptic_curve_point_multiplication#Montgomery_ladder
-     * https://github.com/phpecc/phpecc/issues/16#issuecomment-59176772
-     *
-     * @return array
-     */
-    public function multiplyPoint(array $p, BigInteger $d)
-    {
-        $p1 = [$this->one, $this->zero];
-        $alreadyInternal = isset($x[1]);
-        $p2 = $this->convertToInternal($p);
-        $x = $p[0];
-
-        $b = $d->toBits();
-        $b = str_pad($b, 256, '0', STR_PAD_LEFT);
-        for ($i = 0; $i < strlen($b); $i++) {
-            $b_i = (int) $b[$i];
-            if ($b_i) {
-                list($p2, $p1) = $this->doubleAndAddPoint($p2, $p1, $x);
-            } else {
-                list($p1, $p2) = $this->doubleAndAddPoint($p1, $p2, $x);
-            }
-        }
-
-        return $alreadyInternal ? $p1 : $this->convertToAffine($p1);
-    }
-
-    /**
-     * Converts an affine point to an XZ coordinate
-     *
-     * From https://hyperelliptic.org/EFD/g1p/auto-montgom-xz.html
-     *
-     * XZ coordinates represent x y as X Z satsfying the following equations:
-     *
-     *   x=X/Z
-     *
-     * @return \phpseclib3\Math\PrimeField\Integer[]
-     */
-    public function convertToInternal(array $p)
-    {
-        if (empty($p)) {
-            return [clone $this->zero, clone $this->one];
-        }
-
-        if (isset($p[1])) {
-            return $p;
-        }
-
-        $p[1] = clone $this->one;
-
-        return $p;
-    }
-
-    /**
-     * Returns the affine point
-     *
-     * @return \phpseclib3\Math\PrimeField\Integer[]
-     */
-    public function convertToAffine(array $p)
-    {
-        if (!isset($p[1])) {
-            return $p;
-        }
-        list($x, $z) = $p;
-        return [$x->divide($z)];
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/BaseCurves/Prime.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/BaseCurves/Prime.php
deleted file mode 100644
index 6250dfb0..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/BaseCurves/Prime.php
+++ /dev/null
@@ -1,785 +0,0 @@
-<?php
-
-/**
- * Curves over y^2 = x^3 + a*x + b
- *
- * These are curves used in SEC 2 over prime fields: http://www.secg.org/SEC2-Ver-1.0.pdf
- * The curve is a weierstrass curve with a[1], a[3] and a[2] set to 0.
- *
- * Uses Jacobian Coordinates for speed if able:
- *
- * https://en.wikipedia.org/wiki/Jacobian_curve
- * https://en.wikibooks.org/wiki/Cryptography/Prime_Curve/Jacobian_Coordinates
- *
- * PHP version 5 and 7
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2017 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://pear.php.net/package/Math_BigInteger
- */
-
-namespace phpseclib3\Crypt\EC\BaseCurves;
-
-use phpseclib3\Common\Functions\Strings;
-use phpseclib3\Math\BigInteger;
-use phpseclib3\Math\Common\FiniteField\Integer;
-use phpseclib3\Math\PrimeField;
-use phpseclib3\Math\PrimeField\Integer as PrimeInteger;
-
-/**
- * Curves over y^2 = x^3 + a*x + b
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-class Prime extends Base
-{
-    /**
-     * Prime Field Integer factory
-     *
-     * @var \phpseclib3\Math\PrimeFields
-     */
-    protected $factory;
-
-    /**
-     * Cofficient for x^1
-     *
-     * @var object
-     */
-    protected $a;
-
-    /**
-     * Cofficient for x^0
-     *
-     * @var object
-     */
-    protected $b;
-
-    /**
-     * Base Point
-     *
-     * @var object
-     */
-    protected $p;
-
-    /**
-     * The number one over the specified finite field
-     *
-     * @var object
-     */
-    protected $one;
-
-    /**
-     * The number two over the specified finite field
-     *
-     * @var object
-     */
-    protected $two;
-
-    /**
-     * The number three over the specified finite field
-     *
-     * @var object
-     */
-    protected $three;
-
-    /**
-     * The number four over the specified finite field
-     *
-     * @var object
-     */
-    protected $four;
-
-    /**
-     * The number eight over the specified finite field
-     *
-     * @var object
-     */
-    protected $eight;
-
-    /**
-     * The modulo
-     *
-     * @var BigInteger
-     */
-    protected $modulo;
-
-    /**
-     * The Order
-     *
-     * @var BigInteger
-     */
-    protected $order;
-
-    /**
-     * Sets the modulo
-     */
-    public function setModulo(BigInteger $modulo)
-    {
-        $this->modulo = $modulo;
-        $this->factory = new PrimeField($modulo);
-        $this->two = $this->factory->newInteger(new BigInteger(2));
-        $this->three = $this->factory->newInteger(new BigInteger(3));
-        // used by jacobian coordinates
-        $this->one = $this->factory->newInteger(new BigInteger(1));
-        $this->four = $this->factory->newInteger(new BigInteger(4));
-        $this->eight = $this->factory->newInteger(new BigInteger(8));
-    }
-
-    /**
-     * Set coefficients a and b
-     */
-    public function setCoefficients(BigInteger $a, BigInteger $b)
-    {
-        if (!isset($this->factory)) {
-            throw new \RuntimeException('setModulo needs to be called before this method');
-        }
-        $this->a = $this->factory->newInteger($a);
-        $this->b = $this->factory->newInteger($b);
-    }
-
-    /**
-     * Set x and y coordinates for the base point
-     *
-     * @param BigInteger|PrimeInteger $x
-     * @param BigInteger|PrimeInteger $y
-     * @return PrimeInteger[]
-     */
-    public function setBasePoint($x, $y)
-    {
-        switch (true) {
-            case !$x instanceof BigInteger && !$x instanceof PrimeInteger:
-                throw new \UnexpectedValueException('Argument 1 passed to Prime::setBasePoint() must be an instance of either BigInteger or PrimeField\Integer');
-            case !$y instanceof BigInteger && !$y instanceof PrimeInteger:
-                throw new \UnexpectedValueException('Argument 2 passed to Prime::setBasePoint() must be an instance of either BigInteger or PrimeField\Integer');
-        }
-        if (!isset($this->factory)) {
-            throw new \RuntimeException('setModulo needs to be called before this method');
-        }
-        $this->p = [
-            $x instanceof BigInteger ? $this->factory->newInteger($x) : $x,
-            $y instanceof BigInteger ? $this->factory->newInteger($y) : $y
-        ];
-    }
-
-    /**
-     * Retrieve the base point as an array
-     *
-     * @return array
-     */
-    public function getBasePoint()
-    {
-        if (!isset($this->factory)) {
-            throw new \RuntimeException('setModulo needs to be called before this method');
-        }
-        /*
-        if (!isset($this->p)) {
-            throw new \RuntimeException('setBasePoint needs to be called before this method');
-        }
-        */
-        return $this->p;
-    }
-
-    /**
-     * Adds two "fresh" jacobian form on the curve
-     *
-     * @return FiniteField[]
-     */
-    protected function jacobianAddPointMixedXY(array $p, array $q)
-    {
-        list($u1, $s1) = $p;
-        list($u2, $s2) = $q;
-        if ($u1->equals($u2)) {
-            if (!$s1->equals($s2)) {
-                return [];
-            } else {
-                return $this->doublePoint($p);
-            }
-        }
-        $h = $u2->subtract($u1);
-        $r = $s2->subtract($s1);
-        $h2 = $h->multiply($h);
-        $h3 = $h2->multiply($h);
-        $v = $u1->multiply($h2);
-        $x3 = $r->multiply($r)->subtract($h3)->subtract($v->multiply($this->two));
-        $y3 = $r->multiply(
-            $v->subtract($x3)
-        )->subtract(
-            $s1->multiply($h3)
-        );
-        return [$x3, $y3, $h];
-    }
-
-    /**
-     * Adds one "fresh" jacobian form on the curve
-     *
-     * The second parameter should be the "fresh" one
-     *
-     * @return FiniteField[]
-     */
-    protected function jacobianAddPointMixedX(array $p, array $q)
-    {
-        list($u1, $s1, $z1) = $p;
-        list($x2, $y2) = $q;
-
-        $z12 = $z1->multiply($z1);
-
-        $u2 = $x2->multiply($z12);
-        $s2 = $y2->multiply($z12->multiply($z1));
-        if ($u1->equals($u2)) {
-            if (!$s1->equals($s2)) {
-                return [];
-            } else {
-                return $this->doublePoint($p);
-            }
-        }
-        $h = $u2->subtract($u1);
-        $r = $s2->subtract($s1);
-        $h2 = $h->multiply($h);
-        $h3 = $h2->multiply($h);
-        $v = $u1->multiply($h2);
-        $x3 = $r->multiply($r)->subtract($h3)->subtract($v->multiply($this->two));
-        $y3 = $r->multiply(
-            $v->subtract($x3)
-        )->subtract(
-            $s1->multiply($h3)
-        );
-        $z3 = $h->multiply($z1);
-        return [$x3, $y3, $z3];
-    }
-
-    /**
-     * Adds two jacobian coordinates on the curve
-     *
-     * @return FiniteField[]
-     */
-    protected function jacobianAddPoint(array $p, array $q)
-    {
-        list($x1, $y1, $z1) = $p;
-        list($x2, $y2, $z2) = $q;
-
-        $z12 = $z1->multiply($z1);
-        $z22 = $z2->multiply($z2);
-
-        $u1 = $x1->multiply($z22);
-        $u2 = $x2->multiply($z12);
-        $s1 = $y1->multiply($z22->multiply($z2));
-        $s2 = $y2->multiply($z12->multiply($z1));
-        if ($u1->equals($u2)) {
-            if (!$s1->equals($s2)) {
-                return [];
-            } else {
-                return $this->doublePoint($p);
-            }
-        }
-        $h = $u2->subtract($u1);
-        $r = $s2->subtract($s1);
-        $h2 = $h->multiply($h);
-        $h3 = $h2->multiply($h);
-        $v = $u1->multiply($h2);
-        $x3 = $r->multiply($r)->subtract($h3)->subtract($v->multiply($this->two));
-        $y3 = $r->multiply(
-            $v->subtract($x3)
-        )->subtract(
-            $s1->multiply($h3)
-        );
-        $z3 = $h->multiply($z1)->multiply($z2);
-        return [$x3, $y3, $z3];
-    }
-
-    /**
-     * Adds two points on the curve
-     *
-     * @return FiniteField[]
-     */
-    public function addPoint(array $p, array $q)
-    {
-        if (!isset($this->factory)) {
-            throw new \RuntimeException('setModulo needs to be called before this method');
-        }
-
-        if (!count($p) || !count($q)) {
-            if (count($q)) {
-                return $q;
-            }
-            if (count($p)) {
-                return $p;
-            }
-            return [];
-        }
-
-        // use jacobian coordinates
-        if (isset($p[2]) && isset($q[2])) {
-            if (isset($p['fresh']) && isset($q['fresh'])) {
-                return $this->jacobianAddPointMixedXY($p, $q);
-            }
-            if (isset($p['fresh'])) {
-                return $this->jacobianAddPointMixedX($q, $p);
-            }
-            if (isset($q['fresh'])) {
-                return $this->jacobianAddPointMixedX($p, $q);
-            }
-            return $this->jacobianAddPoint($p, $q);
-        }
-
-        if (isset($p[2]) || isset($q[2])) {
-            throw new \RuntimeException('Affine coordinates need to be manually converted to Jacobi coordinates or vice versa');
-        }
-
-        if ($p[0]->equals($q[0])) {
-            if (!$p[1]->equals($q[1])) {
-                return [];
-            } else { // eg. doublePoint
-                list($numerator, $denominator) = $this->doublePointHelper($p);
-            }
-        } else {
-            $numerator = $q[1]->subtract($p[1]);
-            $denominator = $q[0]->subtract($p[0]);
-        }
-        $slope = $numerator->divide($denominator);
-        $x = $slope->multiply($slope)->subtract($p[0])->subtract($q[0]);
-        $y = $slope->multiply($p[0]->subtract($x))->subtract($p[1]);
-
-        return [$x, $y];
-    }
-
-    /**
-     * Returns the numerator and denominator of the slope
-     *
-     * @return FiniteField[]
-     */
-    protected function doublePointHelper(array $p)
-    {
-        $numerator = $this->three->multiply($p[0])->multiply($p[0])->add($this->a);
-        $denominator = $this->two->multiply($p[1]);
-        return [$numerator, $denominator];
-    }
-
-    /**
-     * Doubles a jacobian coordinate on the curve
-     *
-     * @return FiniteField[]
-     */
-    protected function jacobianDoublePoint(array $p)
-    {
-        list($x, $y, $z) = $p;
-        $x2 = $x->multiply($x);
-        $y2 = $y->multiply($y);
-        $z2 = $z->multiply($z);
-        $s = $this->four->multiply($x)->multiply($y2);
-        $m1 = $this->three->multiply($x2);
-        $m2 = $this->a->multiply($z2->multiply($z2));
-        $m = $m1->add($m2);
-        $x1 = $m->multiply($m)->subtract($this->two->multiply($s));
-        $y1 = $m->multiply($s->subtract($x1))->subtract(
-            $this->eight->multiply($y2->multiply($y2))
-        );
-        $z1 = $this->two->multiply($y)->multiply($z);
-        return [$x1, $y1, $z1];
-    }
-
-    /**
-     * Doubles a "fresh" jacobian coordinate on the curve
-     *
-     * @return FiniteField[]
-     */
-    protected function jacobianDoublePointMixed(array $p)
-    {
-        list($x, $y) = $p;
-        $x2 = $x->multiply($x);
-        $y2 = $y->multiply($y);
-        $s = $this->four->multiply($x)->multiply($y2);
-        $m1 = $this->three->multiply($x2);
-        $m = $m1->add($this->a);
-        $x1 = $m->multiply($m)->subtract($this->two->multiply($s));
-        $y1 = $m->multiply($s->subtract($x1))->subtract(
-            $this->eight->multiply($y2->multiply($y2))
-        );
-        $z1 = $this->two->multiply($y);
-        return [$x1, $y1, $z1];
-    }
-
-    /**
-     * Doubles a point on a curve
-     *
-     * @return FiniteField[]
-     */
-    public function doublePoint(array $p)
-    {
-        if (!isset($this->factory)) {
-            throw new \RuntimeException('setModulo needs to be called before this method');
-        }
-
-        if (!count($p)) {
-            return [];
-        }
-
-        // use jacobian coordinates
-        if (isset($p[2])) {
-            if (isset($p['fresh'])) {
-                return $this->jacobianDoublePointMixed($p);
-            }
-            return $this->jacobianDoublePoint($p);
-        }
-
-        list($numerator, $denominator) = $this->doublePointHelper($p);
-
-        $slope = $numerator->divide($denominator);
-
-        $x = $slope->multiply($slope)->subtract($p[0])->subtract($p[0]);
-        $y = $slope->multiply($p[0]->subtract($x))->subtract($p[1]);
-
-        return [$x, $y];
-    }
-
-    /**
-     * Returns the X coordinate and the derived Y coordinate
-     *
-     * @return array
-     */
-    public function derivePoint($m)
-    {
-        $y = ord(Strings::shift($m));
-        $x = new BigInteger($m, 256);
-        $xp = $this->convertInteger($x);
-        switch ($y) {
-            case 2:
-                $ypn = false;
-                break;
-            case 3:
-                $ypn = true;
-                break;
-            default:
-                throw new \RuntimeException('Coordinate not in recognized format');
-        }
-        $temp = $xp->multiply($this->a);
-        $temp = $xp->multiply($xp)->multiply($xp)->add($temp);
-        $temp = $temp->add($this->b);
-        $b = $temp->squareRoot();
-        if (!$b) {
-            throw new \RuntimeException('Unable to derive Y coordinate');
-        }
-        $bn = $b->isOdd();
-        $yp = $ypn == $bn ? $b : $b->negate();
-        return [$xp, $yp];
-    }
-
-    /**
-     * Tests whether or not the x / y values satisfy the equation
-     *
-     * @return boolean
-     */
-    public function verifyPoint(array $p)
-    {
-        list($x, $y) = $p;
-        $lhs = $y->multiply($y);
-        $temp = $x->multiply($this->a);
-        $temp = $x->multiply($x)->multiply($x)->add($temp);
-        $rhs = $temp->add($this->b);
-
-        return $lhs->equals($rhs);
-    }
-
-    /**
-     * Returns the modulo
-     *
-     * @return \phpseclib3\Math\BigInteger
-     */
-    public function getModulo()
-    {
-        return $this->modulo;
-    }
-
-    /**
-     * Returns the a coefficient
-     *
-     * @return \phpseclib3\Math\PrimeField\Integer
-     */
-    public function getA()
-    {
-        return $this->a;
-    }
-
-    /**
-     * Returns the a coefficient
-     *
-     * @return \phpseclib3\Math\PrimeField\Integer
-     */
-    public function getB()
-    {
-        return $this->b;
-    }
-
-    /**
-     * Multiply and Add Points
-     *
-     * Adapted from:
-     * https://github.com/indutny/elliptic/blob/725bd91/lib/elliptic/curve/base.js#L125
-     *
-     * @return int[]
-     */
-    public function multiplyAddPoints(array $points, array $scalars)
-    {
-        $length = count($points);
-
-        foreach ($points as &$point) {
-            $point = $this->convertToInternal($point);
-        }
-
-        $wnd = [$this->getNAFPoints($points[0], 7)];
-        $wndWidth = [isset($points[0]['nafwidth']) ? $points[0]['nafwidth'] : 7];
-        for ($i = 1; $i < $length; $i++) {
-            $wnd[] = $this->getNAFPoints($points[$i], 1);
-            $wndWidth[] = isset($points[$i]['nafwidth']) ? $points[$i]['nafwidth'] : 1;
-        }
-
-        $naf = [];
-
-        // comb all window NAFs
-
-        $max = 0;
-        for ($i = $length - 1; $i >= 1; $i -= 2) {
-            $a = $i - 1;
-            $b = $i;
-            if ($wndWidth[$a] != 1 || $wndWidth[$b] != 1) {
-                $naf[$a] = $scalars[$a]->getNAF($wndWidth[$a]);
-                $naf[$b] = $scalars[$b]->getNAF($wndWidth[$b]);
-                $max = max(count($naf[$a]), count($naf[$b]), $max);
-                continue;
-            }
-
-            $comb = [
-                $points[$a], // 1
-                null,        // 3
-                null,        // 5
-                $points[$b]  // 7
-            ];
-
-            $comb[1] = $this->addPoint($points[$a], $points[$b]);
-            $comb[2] = $this->addPoint($points[$a], $this->negatePoint($points[$b]));
-
-            $index = [
-                -3, /* -1 -1 */
-                -1, /* -1  0 */
-                -5, /* -1  1 */
-                -7, /*  0 -1 */
-                 0, /*  0 -1 */
-                 7, /*  0  1 */
-                 5, /*  1 -1 */
-                 1, /*  1  0 */
-                 3  /*  1  1 */
-            ];
-
-            $jsf = self::getJSFPoints($scalars[$a], $scalars[$b]);
-
-            $max = max(count($jsf[0]), $max);
-            if ($max > 0) {
-                $naf[$a] = array_fill(0, $max, 0);
-                $naf[$b] = array_fill(0, $max, 0);
-            } else {
-                $naf[$a] = [];
-                $naf[$b] = [];
-            }
-
-            for ($j = 0; $j < $max; $j++) {
-                $ja = isset($jsf[0][$j]) ? $jsf[0][$j] : 0;
-                $jb = isset($jsf[1][$j]) ? $jsf[1][$j] : 0;
-
-                $naf[$a][$j] = $index[3 * ($ja + 1) + $jb + 1];
-                $naf[$b][$j] = 0;
-                $wnd[$a] = $comb;
-            }
-        }
-
-        $acc = [];
-        $temp = [0, 0, 0, 0];
-        for ($i = $max; $i >= 0; $i--) {
-            $k = 0;
-            while ($i >= 0) {
-                $zero = true;
-                for ($j = 0; $j < $length; $j++) {
-                    $temp[$j] = isset($naf[$j][$i]) ? $naf[$j][$i] : 0;
-                    if ($temp[$j] != 0) {
-                        $zero = false;
-                    }
-                }
-                if (!$zero) {
-                    break;
-                }
-                $k++;
-                $i--;
-            }
-
-            if ($i >= 0) {
-                $k++;
-            }
-            while ($k--) {
-                $acc = $this->doublePoint($acc);
-            }
-
-            if ($i < 0) {
-                break;
-            }
-
-            for ($j = 0; $j < $length; $j++) {
-                $z = $temp[$j];
-                $p = null;
-                if ($z == 0) {
-                    continue;
-                }
-                $p = $z > 0 ?
-                    $wnd[$j][($z - 1) >> 1] :
-                    $this->negatePoint($wnd[$j][(-$z - 1) >> 1]);
-                $acc = $this->addPoint($acc, $p);
-            }
-        }
-
-        return $this->convertToAffine($acc);
-    }
-
-    /**
-     * Precomputes NAF points
-     *
-     * Adapted from:
-     * https://github.com/indutny/elliptic/blob/725bd91/lib/elliptic/curve/base.js#L351
-     *
-     * @return int[]
-     */
-    private function getNAFPoints(array $point, $wnd)
-    {
-        if (isset($point['naf'])) {
-            return $point['naf'];
-        }
-
-        $res = [$point];
-        $max = (1 << $wnd) - 1;
-        $dbl = $max == 1 ? null : $this->doublePoint($point);
-        for ($i = 1; $i < $max; $i++) {
-            $res[] = $this->addPoint($res[$i - 1], $dbl);
-        }
-
-        $point['naf'] = $res;
-
-        /*
-        $str = '';
-        foreach ($res as $re) {
-            $re[0] = bin2hex($re[0]->toBytes());
-            $re[1] = bin2hex($re[1]->toBytes());
-            $str.= "            ['$re[0]', '$re[1]'],\r\n";
-        }
-        file_put_contents('temp.txt', $str);
-        exit;
-        */
-
-        return $res;
-    }
-
-    /**
-     * Precomputes points in Joint Sparse Form
-     *
-     * Adapted from:
-     * https://github.com/indutny/elliptic/blob/725bd91/lib/elliptic/utils.js#L96
-     *
-     * @return int[]
-     */
-    private static function getJSFPoints(Integer $k1, Integer $k2)
-    {
-        static $three;
-        if (!isset($three)) {
-            $three = new BigInteger(3);
-        }
-
-        $jsf = [[], []];
-        $k1 = $k1->toBigInteger();
-        $k2 = $k2->toBigInteger();
-        $d1 = 0;
-        $d2 = 0;
-
-        while ($k1->compare(new BigInteger(-$d1)) > 0 || $k2->compare(new BigInteger(-$d2)) > 0) {
-            // first phase
-            $m14 = $k1->testBit(0) + 2 * $k1->testBit(1);
-            $m14 += $d1;
-            $m14 &= 3;
-
-            $m24 = $k2->testBit(0) + 2 * $k2->testBit(1);
-            $m24 += $d2;
-            $m24 &= 3;
-
-            if ($m14 == 3) {
-                $m14 = -1;
-            }
-            if ($m24 == 3) {
-                $m24 = -1;
-            }
-
-            $u1 = 0;
-            if ($m14 & 1) { // if $m14 is odd
-                $m8 = $k1->testBit(0) + 2 * $k1->testBit(1) + 4 * $k1->testBit(2);
-                $m8 += $d1;
-                $m8 &= 7;
-                $u1 = ($m8 == 3 || $m8 == 5) && $m24 == 2 ? -$m14 : $m14;
-            }
-            $jsf[0][] = $u1;
-
-            $u2 = 0;
-            if ($m24 & 1) { // if $m24 is odd
-                $m8 = $k2->testBit(0) + 2 * $k2->testBit(1) + 4 * $k2->testBit(2);
-                $m8 += $d2;
-                $m8 &= 7;
-                $u2 = ($m8 == 3 || $m8 == 5) && $m14 == 2 ? -$m24 : $m24;
-            }
-            $jsf[1][] = $u2;
-
-            // second phase
-            if (2 * $d1 == $u1 + 1) {
-                $d1 = 1 - $d1;
-            }
-            if (2 * $d2 == $u2 + 1) {
-                $d2 = 1 - $d2;
-            }
-            $k1 = $k1->bitwise_rightShift(1);
-            $k2 = $k2->bitwise_rightShift(1);
-        }
-
-        return $jsf;
-    }
-
-    /**
-     * Returns the affine point
-     *
-     * A Jacobian Coordinate is of the form (x, y, z).
-     * To convert a Jacobian Coordinate to an Affine Point
-     * you do (x / z^2, y / z^3)
-     *
-     * @return \phpseclib3\Math\PrimeField\Integer[]
-     */
-    public function convertToAffine(array $p)
-    {
-        if (!isset($p[2])) {
-            return $p;
-        }
-        list($x, $y, $z) = $p;
-        $z = $this->one->divide($z);
-        $z2 = $z->multiply($z);
-        return [
-            $x->multiply($z2),
-            $y->multiply($z2)->multiply($z)
-        ];
-    }
-
-    /**
-     * Converts an affine point to a jacobian coordinate
-     *
-     * @return \phpseclib3\Math\PrimeField\Integer[]
-     */
-    public function convertToInternal(array $p)
-    {
-        if (isset($p[2])) {
-            return $p;
-        }
-
-        $p[2] = clone $this->one;
-        $p['fresh'] = true;
-        return $p;
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/BaseCurves/TwistedEdwards.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/BaseCurves/TwistedEdwards.php
deleted file mode 100644
index 2521a4c0..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/BaseCurves/TwistedEdwards.php
+++ /dev/null
@@ -1,215 +0,0 @@
-<?php
-
-/**
- * Curves over a*x^2 + y^2 = 1 + d*x^2*y^2
- *
- * http://www.secg.org/SEC2-Ver-1.0.pdf provides for curves with custom parameters.
- * ie. the coefficients can be arbitrary set through specially formatted keys, etc.
- * As such, Prime.php is built very generically and it's not able to take full
- * advantage of curves with 0 coefficients to produce simplified point doubling,
- * point addition. Twisted Edwards curves, in contrast, do not have a way, currently,
- * to customize them. As such, we can omit the super generic stuff from this class
- * and let the named curves (Ed25519 and Ed448) define their own custom tailored
- * point addition and point doubling methods.
- *
- * More info:
- *
- * https://en.wikipedia.org/wiki/Twisted_Edwards_curve
- *
- * PHP version 5 and 7
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2017 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://pear.php.net/package/Math_BigInteger
- */
-
-namespace phpseclib3\Crypt\EC\BaseCurves;
-
-use phpseclib3\Math\BigInteger;
-use phpseclib3\Math\PrimeField;
-use phpseclib3\Math\PrimeField\Integer as PrimeInteger;
-
-/**
- * Curves over a*x^2 + y^2 = 1 + d*x^2*y^2
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-class TwistedEdwards extends Base
-{
-    /**
-     * The modulo
-     *
-     * @var BigInteger
-     */
-    protected $modulo;
-
-    /**
-     * Cofficient for x^2
-     *
-     * @var object
-     */
-    protected $a;
-
-    /**
-     * Cofficient for x^2*y^2
-     *
-     * @var object
-     */
-    protected $d;
-
-    /**
-     * Base Point
-     *
-     * @var object[]
-     */
-    protected $p;
-
-    /**
-     * The number zero over the specified finite field
-     *
-     * @var object
-     */
-    protected $zero;
-
-    /**
-     * The number one over the specified finite field
-     *
-     * @var object
-     */
-    protected $one;
-
-    /**
-     * The number two over the specified finite field
-     *
-     * @var object
-     */
-    protected $two;
-
-    /**
-     * Sets the modulo
-     */
-    public function setModulo(BigInteger $modulo)
-    {
-        $this->modulo = $modulo;
-        $this->factory = new PrimeField($modulo);
-        $this->zero = $this->factory->newInteger(new BigInteger(0));
-        $this->one = $this->factory->newInteger(new BigInteger(1));
-        $this->two = $this->factory->newInteger(new BigInteger(2));
-    }
-
-    /**
-     * Set coefficients a and b
-     */
-    public function setCoefficients(BigInteger $a, BigInteger $d)
-    {
-        if (!isset($this->factory)) {
-            throw new \RuntimeException('setModulo needs to be called before this method');
-        }
-        $this->a = $this->factory->newInteger($a);
-        $this->d = $this->factory->newInteger($d);
-    }
-
-    /**
-     * Set x and y coordinates for the base point
-     */
-    public function setBasePoint($x, $y)
-    {
-        switch (true) {
-            case !$x instanceof BigInteger && !$x instanceof PrimeInteger:
-                throw new \UnexpectedValueException('Argument 1 passed to Prime::setBasePoint() must be an instance of either BigInteger or PrimeField\Integer');
-            case !$y instanceof BigInteger && !$y instanceof PrimeInteger:
-                throw new \UnexpectedValueException('Argument 2 passed to Prime::setBasePoint() must be an instance of either BigInteger or PrimeField\Integer');
-        }
-        if (!isset($this->factory)) {
-            throw new \RuntimeException('setModulo needs to be called before this method');
-        }
-        $this->p = [
-            $x instanceof BigInteger ? $this->factory->newInteger($x) : $x,
-            $y instanceof BigInteger ? $this->factory->newInteger($y) : $y
-        ];
-    }
-
-    /**
-     * Returns the a coefficient
-     *
-     * @return \phpseclib3\Math\PrimeField\Integer
-     */
-    public function getA()
-    {
-        return $this->a;
-    }
-
-    /**
-     * Returns the a coefficient
-     *
-     * @return \phpseclib3\Math\PrimeField\Integer
-     */
-    public function getD()
-    {
-        return $this->d;
-    }
-
-    /**
-     * Retrieve the base point as an array
-     *
-     * @return array
-     */
-    public function getBasePoint()
-    {
-        if (!isset($this->factory)) {
-            throw new \RuntimeException('setModulo needs to be called before this method');
-        }
-        /*
-        if (!isset($this->p)) {
-            throw new \RuntimeException('setBasePoint needs to be called before this method');
-        }
-        */
-        return $this->p;
-    }
-
-    /**
-     * Returns the affine point
-     *
-     * @return \phpseclib3\Math\PrimeField\Integer[]
-     */
-    public function convertToAffine(array $p)
-    {
-        if (!isset($p[2])) {
-            return $p;
-        }
-        list($x, $y, $z) = $p;
-        $z = $this->one->divide($z);
-        return [
-            $x->multiply($z),
-            $y->multiply($z)
-        ];
-    }
-
-    /**
-     * Returns the modulo
-     *
-     * @return \phpseclib3\Math\BigInteger
-     */
-    public function getModulo()
-    {
-        return $this->modulo;
-    }
-
-    /**
-     * Tests whether or not the x / y values satisfy the equation
-     *
-     * @return boolean
-     */
-    public function verifyPoint(array $p)
-    {
-        list($x, $y) = $p;
-        $x2 = $x->multiply($x);
-        $y2 = $y->multiply($y);
-
-        $lhs = $this->a->multiply($x2)->add($y2);
-        $rhs = $this->d->multiply($x2)->multiply($y2)->add($this->one);
-
-        return $lhs->equals($rhs);
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/Curve25519.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/Curve25519.php
deleted file mode 100644
index 0f3f4d82..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/Curve25519.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-
-/**
- * Curve25519
- *
- * PHP version 5 and 7
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2019 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://pear.php.net/package/Math_BigInteger
- */
-
-namespace phpseclib3\Crypt\EC\Curves;
-
-use phpseclib3\Crypt\EC\BaseCurves\Montgomery;
-use phpseclib3\Math\BigInteger;
-
-class Curve25519 extends Montgomery
-{
-    public function __construct()
-    {
-        // 2^255 - 19
-        $this->setModulo(new BigInteger('7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFED', 16));
-        $this->a24 = $this->factory->newInteger(new BigInteger('121666'));
-        $this->p = [$this->factory->newInteger(new BigInteger(9))];
-        // 2^252 + 0x14def9dea2f79cd65812631a5cf5d3ed
-        $this->setOrder(new BigInteger('1000000000000000000000000000000014DEF9DEA2F79CD65812631A5CF5D3ED', 16));
-
-        /*
-        $this->setCoefficients(
-            new BigInteger('486662'), // a
-        );
-        $this->setBasePoint(
-            new BigInteger(9),
-            new BigInteger('14781619447589544791020593568409986887264606134616475288964881837755586237401')
-        );
-        */
-    }
-
-    /**
-     * Multiply a point on the curve by a scalar
-     *
-     * Modifies the scalar as described at https://tools.ietf.org/html/rfc7748#page-8
-     *
-     * @return array
-     */
-    public function multiplyPoint(array $p, BigInteger $d)
-    {
-        //$r = strrev(sodium_crypto_scalarmult($d->toBytes(), strrev($p[0]->toBytes())));
-        //return [$this->factory->newInteger(new BigInteger($r, 256))];
-
-        $d = $d->toBytes();
-        $d &= "\xF8" . str_repeat("\xFF", 30) . "\x7F";
-        $d = strrev($d);
-        $d |= "\x40";
-        $d = new BigInteger($d, -256);
-
-        return parent::multiplyPoint($p, $d);
-    }
-
-    /**
-     * Creates a random scalar multiplier
-     *
-     * @return BigInteger
-     */
-    public function createRandomMultiplier()
-    {
-        return BigInteger::random(256);
-    }
-
-    /**
-     * Performs range check
-     */
-    public function rangeCheck(BigInteger $x)
-    {
-        if ($x->getLength() > 256 || $x->isNegative()) {
-            throw new \RangeException('x must be a positive integer less than 256 bytes in length');
-        }
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/Curve448.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/Curve448.php
deleted file mode 100644
index f4a44231..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/Curve448.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-
-/**
- * Curve448
- *
- * PHP version 5 and 7
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2019 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://pear.php.net/package/Math_BigInteger
- */
-
-namespace phpseclib3\Crypt\EC\Curves;
-
-use phpseclib3\Crypt\EC\BaseCurves\Montgomery;
-use phpseclib3\Math\BigInteger;
-
-class Curve448 extends Montgomery
-{
-    public function __construct()
-    {
-        // 2^448 - 2^224 - 1
-        $this->setModulo(new BigInteger(
-            'FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE' .
-            'FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF',
-            16
-        ));
-        $this->a24 = $this->factory->newInteger(new BigInteger('39081'));
-        $this->p = [$this->factory->newInteger(new BigInteger(5))];
-        // 2^446 - 0x8335dc163bb124b65129c96fde933d8d723a70aadc873d6d54a7bb0d
-        $this->setOrder(new BigInteger(
-            '3FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF' .
-            '7CCA23E9C44EDB49AED63690216CC2728DC58F552378C292AB5844F3',
-            16
-        ));
-
-        /*
-        $this->setCoefficients(
-            new BigInteger('156326'), // a
-        );
-        $this->setBasePoint(
-            new BigInteger(5),
-            new BigInteger(
-                '355293926785568175264127502063783334808976399387714271831880898' .
-                '435169088786967410002932673765864550910142774147268105838985595290' .
-                '606362')
-        );
-        */
-    }
-
-    /**
-     * Multiply a point on the curve by a scalar
-     *
-     * Modifies the scalar as described at https://tools.ietf.org/html/rfc7748#page-8
-     *
-     * @return array
-     */
-    public function multiplyPoint(array $p, BigInteger $d)
-    {
-        //$r = strrev(sodium_crypto_scalarmult($d->toBytes(), strrev($p[0]->toBytes())));
-        //return [$this->factory->newInteger(new BigInteger($r, 256))];
-
-        $d = $d->toBytes();
-        $d[0] = $d[0] & "\xFC";
-        $d = strrev($d);
-        $d |= "\x80";
-        $d = new BigInteger($d, 256);
-
-        return parent::multiplyPoint($p, $d);
-    }
-
-    /**
-     * Creates a random scalar multiplier
-     *
-     * @return BigInteger
-     */
-    public function createRandomMultiplier()
-    {
-        return BigInteger::random(446);
-    }
-
-    /**
-     * Performs range check
-     */
-    public function rangeCheck(BigInteger $x)
-    {
-        if ($x->getLength() > 448 || $x->isNegative()) {
-            throw new \RangeException('x must be a positive integer less than 446 bytes in length');
-        }
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/Ed25519.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/Ed25519.php
deleted file mode 100644
index 9d3de684..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/Ed25519.php
+++ /dev/null
@@ -1,333 +0,0 @@
-<?php
-
-/**
- * Ed25519
- *
- * PHP version 5 and 7
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2017 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- */
-
-namespace phpseclib3\Crypt\EC\Curves;
-
-use phpseclib3\Crypt\EC\BaseCurves\TwistedEdwards;
-use phpseclib3\Crypt\Hash;
-use phpseclib3\Crypt\Random;
-use phpseclib3\Math\BigInteger;
-
-class Ed25519 extends TwistedEdwards
-{
-    const HASH = 'sha512';
-    /*
-      Per https://tools.ietf.org/html/rfc8032#page-6 EdDSA has several parameters, one of which is b:
-
-      2.   An integer b with 2^(b-1) > p.  EdDSA public keys have exactly b
-           bits, and EdDSA signatures have exactly 2*b bits.  b is
-           recommended to be a multiple of 8, so public key and signature
-           lengths are an integral number of octets.
-
-      SIZE corresponds to b
-    */
-    const SIZE = 32;
-
-    public function __construct()
-    {
-        // 2^255 - 19
-        $this->setModulo(new BigInteger('7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFED', 16));
-        $this->setCoefficients(
-            // -1
-            new BigInteger('7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEC', 16), // a
-            // -121665/121666
-            new BigInteger('52036CEE2B6FFE738CC740797779E89800700A4D4141D8AB75EB4DCA135978A3', 16)  // d
-        );
-        $this->setBasePoint(
-            new BigInteger('216936D3CD6E53FEC0A4E231FDD6DC5C692CC7609525A7B2C9562D608F25D51A', 16),
-            new BigInteger('6666666666666666666666666666666666666666666666666666666666666658', 16)
-        );
-        $this->setOrder(new BigInteger('1000000000000000000000000000000014DEF9DEA2F79CD65812631A5CF5D3ED', 16));
-        // algorithm 14.47 from http://cacr.uwaterloo.ca/hac/about/chap14.pdf#page=16
-        /*
-        $this->setReduction(function($x) {
-            $parts = $x->bitwise_split(255);
-            $className = $this->className;
-
-            if (count($parts) > 2) {
-                list(, $r) = $x->divide($className::$modulo);
-                return $r;
-            }
-
-            $zero = new BigInteger();
-            $c = new BigInteger(19);
-
-            switch (count($parts)) {
-                case 2:
-                    list($qi, $ri) = $parts;
-                    break;
-                case 1:
-                    $qi = $zero;
-                    list($ri) = $parts;
-                    break;
-                case 0:
-                    return $zero;
-            }
-            $r = $ri;
-
-            while ($qi->compare($zero) > 0) {
-                $temp = $qi->multiply($c)->bitwise_split(255);
-                if (count($temp) == 2) {
-                    list($qi, $ri) = $temp;
-                } else {
-                    $qi = $zero;
-                    list($ri) = $temp;
-                }
-                $r = $r->add($ri);
-            }
-
-            while ($r->compare($className::$modulo) > 0) {
-                $r = $r->subtract($className::$modulo);
-            }
-            return $r;
-        });
-        */
-    }
-
-    /**
-     * Recover X from Y
-     *
-     * Implements steps 2-4 at https://tools.ietf.org/html/rfc8032#section-5.1.3
-     *
-     * Used by EC\Keys\Common.php
-     *
-     * @param BigInteger $y
-     * @param boolean $sign
-     * @return object[]
-     */
-    public function recoverX(BigInteger $y, $sign)
-    {
-        $y = $this->factory->newInteger($y);
-
-        $y2 = $y->multiply($y);
-        $u = $y2->subtract($this->one);
-        $v = $this->d->multiply($y2)->add($this->one);
-        $x2 = $u->divide($v);
-        if ($x2->equals($this->zero)) {
-            if ($sign) {
-                throw new \RuntimeException('Unable to recover X coordinate (x2 = 0)');
-            }
-            return clone $this->zero;
-        }
-        // find the square root
-        /* we don't do $x2->squareRoot() because, quoting from
-           https://tools.ietf.org/html/rfc8032#section-5.1.1:
-
-           "For point decoding or "decompression", square roots modulo p are
-            needed.  They can be computed using the Tonelli-Shanks algorithm or
-            the special case for p = 5 (mod 8).  To find a square root of a,
-            first compute the candidate root x = a^((p+3)/8) (mod p)."
-         */
-        $exp = $this->getModulo()->add(new BigInteger(3));
-        $exp = $exp->bitwise_rightShift(3);
-        $x = $x2->pow($exp);
-
-        // If v x^2 = -u (mod p), set x <-- x * 2^((p-1)/4), which is a square root.
-        if (!$x->multiply($x)->subtract($x2)->equals($this->zero)) {
-            $temp = $this->getModulo()->subtract(new BigInteger(1));
-            $temp = $temp->bitwise_rightShift(2);
-            $temp = $this->two->pow($temp);
-            $x = $x->multiply($temp);
-            if (!$x->multiply($x)->subtract($x2)->equals($this->zero)) {
-                throw new \RuntimeException('Unable to recover X coordinate');
-            }
-        }
-        if ($x->isOdd() != $sign) {
-            $x = $x->negate();
-        }
-
-        return [$x, $y];
-    }
-
-    /**
-     * Extract Secret Scalar
-     *
-     * Implements steps 1-3 at https://tools.ietf.org/html/rfc8032#section-5.1.5
-     *
-     * Used by the various key handlers
-     *
-     * @param string $str
-     * @return array
-     */
-    public function extractSecret($str)
-    {
-        if (strlen($str) != 32) {
-            throw new \LengthException('Private Key should be 32-bytes long');
-        }
-        // 1.  Hash the 32-byte private key using SHA-512, storing the digest in
-        //     a 64-octet large buffer, denoted h.  Only the lower 32 bytes are
-        //     used for generating the public key.
-        $hash = new Hash('sha512');
-        $h = $hash->hash($str);
-        $h = substr($h, 0, 32);
-        // 2.  Prune the buffer: The lowest three bits of the first octet are
-        //     cleared, the highest bit of the last octet is cleared, and the
-        //     second highest bit of the last octet is set.
-        $h[0] = $h[0] & chr(0xF8);
-        $h = strrev($h);
-        $h[0] = ($h[0] & chr(0x3F)) | chr(0x40);
-        // 3.  Interpret the buffer as the little-endian integer, forming a
-        //     secret scalar s.
-        $dA = new BigInteger($h, 256);
-
-        return [
-            'dA' => $dA,
-            'secret' => $str
-        ];
-    }
-
-    /**
-     * Encode a point as a string
-     *
-     * @param array $point
-     * @return string
-     */
-    public function encodePoint($point)
-    {
-        list($x, $y) = $point;
-        $y = $y->toBytes();
-        $y[0] = $y[0] & chr(0x7F);
-        if ($x->isOdd()) {
-            $y[0] = $y[0] | chr(0x80);
-        }
-        $y = strrev($y);
-
-        return $y;
-    }
-
-    /**
-     * Creates a random scalar multiplier
-     *
-     * @return \phpseclib3\Math\PrimeField\Integer
-     */
-    public function createRandomMultiplier()
-    {
-        return $this->extractSecret(Random::string(32))['dA'];
-    }
-
-    /**
-     * Converts an affine point to an extended homogeneous coordinate
-     *
-     * From https://tools.ietf.org/html/rfc8032#section-5.1.4 :
-     *
-     * A point (x,y) is represented in extended homogeneous coordinates (X, Y, Z, T),
-     * with x = X/Z, y = Y/Z, x * y = T/Z.
-     *
-     * @return \phpseclib3\Math\PrimeField\Integer[]
-     */
-    public function convertToInternal(array $p)
-    {
-        if (empty($p)) {
-            return [clone $this->zero, clone $this->one, clone $this->one, clone $this->zero];
-        }
-
-        if (isset($p[2])) {
-            return $p;
-        }
-
-        $p[2] = clone $this->one;
-        $p[3] = $p[0]->multiply($p[1]);
-
-        return $p;
-    }
-
-    /**
-     * Doubles a point on a curve
-     *
-     * @return FiniteField[]
-     */
-    public function doublePoint(array $p)
-    {
-        if (!isset($this->factory)) {
-            throw new \RuntimeException('setModulo needs to be called before this method');
-        }
-
-        if (!count($p)) {
-            return [];
-        }
-
-        if (!isset($p[2])) {
-            throw new \RuntimeException('Affine coordinates need to be manually converted to "Jacobi" coordinates or vice versa');
-        }
-
-        // from https://tools.ietf.org/html/rfc8032#page-12
-
-        list($x1, $y1, $z1, $t1) = $p;
-
-        $a = $x1->multiply($x1);
-        $b = $y1->multiply($y1);
-        $c = $this->two->multiply($z1)->multiply($z1);
-        $h = $a->add($b);
-        $temp = $x1->add($y1);
-        $e = $h->subtract($temp->multiply($temp));
-        $g = $a->subtract($b);
-        $f = $c->add($g);
-
-        $x3 = $e->multiply($f);
-        $y3 = $g->multiply($h);
-        $t3 = $e->multiply($h);
-        $z3 = $f->multiply($g);
-
-        return [$x3, $y3, $z3, $t3];
-    }
-
-    /**
-     * Adds two points on the curve
-     *
-     * @return FiniteField[]
-     */
-    public function addPoint(array $p, array $q)
-    {
-        if (!isset($this->factory)) {
-            throw new \RuntimeException('setModulo needs to be called before this method');
-        }
-
-        if (!count($p) || !count($q)) {
-            if (count($q)) {
-                return $q;
-            }
-            if (count($p)) {
-                return $p;
-            }
-            return [];
-        }
-
-        if (!isset($p[2]) || !isset($q[2])) {
-            throw new \RuntimeException('Affine coordinates need to be manually converted to "Jacobi" coordinates or vice versa');
-        }
-
-        if ($p[0]->equals($q[0])) {
-            return !$p[1]->equals($q[1]) ? [] : $this->doublePoint($p);
-        }
-
-        // from https://tools.ietf.org/html/rfc8032#page-12
-
-        list($x1, $y1, $z1, $t1) = $p;
-        list($x2, $y2, $z2, $t2) = $q;
-
-        $a = $y1->subtract($x1)->multiply($y2->subtract($x2));
-        $b = $y1->add($x1)->multiply($y2->add($x2));
-        $c = $t1->multiply($this->two)->multiply($this->d)->multiply($t2);
-        $d = $z1->multiply($this->two)->multiply($z2);
-        $e = $b->subtract($a);
-        $f = $d->subtract($c);
-        $g = $d->add($c);
-        $h = $b->add($a);
-
-        $x3 = $e->multiply($f);
-        $y3 = $g->multiply($h);
-        $t3 = $e->multiply($h);
-        $z3 = $f->multiply($g);
-
-        return [$x3, $y3, $z3, $t3];
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/Ed448.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/Ed448.php
deleted file mode 100644
index 5451f909..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/Ed448.php
+++ /dev/null
@@ -1,273 +0,0 @@
-<?php
-
-/**
- * Ed448
- *
- * PHP version 5 and 7
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2017 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- */
-
-namespace phpseclib3\Crypt\EC\Curves;
-
-use phpseclib3\Crypt\EC\BaseCurves\TwistedEdwards;
-use phpseclib3\Crypt\Hash;
-use phpseclib3\Crypt\Random;
-use phpseclib3\Math\BigInteger;
-
-class Ed448 extends TwistedEdwards
-{
-    const HASH = 'shake256-912';
-    const SIZE = 57;
-
-    public function __construct()
-    {
-        // 2^448 - 2^224 - 1
-        $this->setModulo(new BigInteger(
-            'FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE' .
-            'FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF',
-            16
-        ));
-        $this->setCoefficients(
-            new BigInteger(1),
-            // -39081
-            new BigInteger('FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE' .
-                           'FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF6756', 16)
-        );
-        $this->setBasePoint(
-            new BigInteger('4F1970C66BED0DED221D15A622BF36DA9E146570470F1767EA6DE324' .
-                           'A3D3A46412AE1AF72AB66511433B80E18B00938E2626A82BC70CC05E', 16),
-            new BigInteger('693F46716EB6BC248876203756C9C7624BEA73736CA3984087789C1E' .
-                           '05A0C2D73AD3FF1CE67C39C4FDBD132C4ED7C8AD9808795BF230FA14', 16)
-        );
-        $this->setOrder(new BigInteger(
-            '3FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF' .
-            '7CCA23E9C44EDB49AED63690216CC2728DC58F552378C292AB5844F3',
-            16
-        ));
-    }
-
-    /**
-     * Recover X from Y
-     *
-     * Implements steps 2-4 at https://tools.ietf.org/html/rfc8032#section-5.2.3
-     *
-     * Used by EC\Keys\Common.php
-     *
-     * @param BigInteger $y
-     * @param boolean $sign
-     * @return object[]
-     */
-    public function recoverX(BigInteger $y, $sign)
-    {
-        $y = $this->factory->newInteger($y);
-
-        $y2 = $y->multiply($y);
-        $u = $y2->subtract($this->one);
-        $v = $this->d->multiply($y2)->subtract($this->one);
-        $x2 = $u->divide($v);
-        if ($x2->equals($this->zero)) {
-            if ($sign) {
-                throw new \RuntimeException('Unable to recover X coordinate (x2 = 0)');
-            }
-            return clone $this->zero;
-        }
-        // find the square root
-        $exp = $this->getModulo()->add(new BigInteger(1));
-        $exp = $exp->bitwise_rightShift(2);
-        $x = $x2->pow($exp);
-
-        if (!$x->multiply($x)->subtract($x2)->equals($this->zero)) {
-            throw new \RuntimeException('Unable to recover X coordinate');
-        }
-        if ($x->isOdd() != $sign) {
-            $x = $x->negate();
-        }
-
-        return [$x, $y];
-    }
-
-    /**
-     * Extract Secret Scalar
-     *
-     * Implements steps 1-3 at https://tools.ietf.org/html/rfc8032#section-5.2.5
-     *
-     * Used by the various key handlers
-     *
-     * @param string $str
-     * @return array
-     */
-    public function extractSecret($str)
-    {
-        if (strlen($str) != 57) {
-            throw new \LengthException('Private Key should be 57-bytes long');
-        }
-        // 1.  Hash the 57-byte private key using SHAKE256(x, 114), storing the
-        //     digest in a 114-octet large buffer, denoted h.  Only the lower 57
-        //     bytes are used for generating the public key.
-        $hash = new Hash('shake256-912');
-        $h = $hash->hash($str);
-        $h = substr($h, 0, 57);
-        // 2.  Prune the buffer: The two least significant bits of the first
-        //     octet are cleared, all eight bits the last octet are cleared, and
-        //     the highest bit of the second to last octet is set.
-        $h[0] = $h[0] & chr(0xFC);
-        $h = strrev($h);
-        $h[0] = "\0";
-        $h[1] = $h[1] | chr(0x80);
-        // 3.  Interpret the buffer as the little-endian integer, forming a
-        //     secret scalar s.
-        $dA = new BigInteger($h, 256);
-
-        return [
-            'dA' => $dA,
-            'secret' => $str
-        ];
-
-        $dA->secret = $str;
-        return $dA;
-    }
-
-    /**
-     * Encode a point as a string
-     *
-     * @param array $point
-     * @return string
-     */
-    public function encodePoint($point)
-    {
-        list($x, $y) = $point;
-        $y = "\0" . $y->toBytes();
-        if ($x->isOdd()) {
-            $y[0] = $y[0] | chr(0x80);
-        }
-        $y = strrev($y);
-
-        return $y;
-    }
-
-    /**
-     * Creates a random scalar multiplier
-     *
-     * @return \phpseclib3\Math\PrimeField\Integer
-     */
-    public function createRandomMultiplier()
-    {
-        return $this->extractSecret(Random::string(57))['dA'];
-    }
-
-    /**
-     * Converts an affine point to an extended homogeneous coordinate
-     *
-     * From https://tools.ietf.org/html/rfc8032#section-5.2.4 :
-     *
-     * A point (x,y) is represented in extended homogeneous coordinates (X, Y, Z, T),
-     * with x = X/Z, y = Y/Z, x * y = T/Z.
-     *
-     * @return \phpseclib3\Math\PrimeField\Integer[]
-     */
-    public function convertToInternal(array $p)
-    {
-        if (empty($p)) {
-            return [clone $this->zero, clone $this->one, clone $this->one];
-        }
-
-        if (isset($p[2])) {
-            return $p;
-        }
-
-        $p[2] = clone $this->one;
-
-        return $p;
-    }
-
-    /**
-     * Doubles a point on a curve
-     *
-     * @return FiniteField[]
-     */
-    public function doublePoint(array $p)
-    {
-        if (!isset($this->factory)) {
-            throw new \RuntimeException('setModulo needs to be called before this method');
-        }
-
-        if (!count($p)) {
-            return [];
-        }
-
-        if (!isset($p[2])) {
-            throw new \RuntimeException('Affine coordinates need to be manually converted to "Jacobi" coordinates or vice versa');
-        }
-
-        // from https://tools.ietf.org/html/rfc8032#page-18
-
-        list($x1, $y1, $z1) = $p;
-
-        $b = $x1->add($y1);
-        $b = $b->multiply($b);
-        $c = $x1->multiply($x1);
-        $d = $y1->multiply($y1);
-        $e = $c->add($d);
-        $h = $z1->multiply($z1);
-        $j = $e->subtract($this->two->multiply($h));
-
-        $x3 = $b->subtract($e)->multiply($j);
-        $y3 = $c->subtract($d)->multiply($e);
-        $z3 = $e->multiply($j);
-
-        return [$x3, $y3, $z3];
-    }
-
-    /**
-     * Adds two points on the curve
-     *
-     * @return FiniteField[]
-     */
-    public function addPoint(array $p, array $q)
-    {
-        if (!isset($this->factory)) {
-            throw new \RuntimeException('setModulo needs to be called before this method');
-        }
-
-        if (!count($p) || !count($q)) {
-            if (count($q)) {
-                return $q;
-            }
-            if (count($p)) {
-                return $p;
-            }
-            return [];
-        }
-
-        if (!isset($p[2]) || !isset($q[2])) {
-            throw new \RuntimeException('Affine coordinates need to be manually converted to "Jacobi" coordinates or vice versa');
-        }
-
-        if ($p[0]->equals($q[0])) {
-            return !$p[1]->equals($q[1]) ? [] : $this->doublePoint($p);
-        }
-
-        // from https://tools.ietf.org/html/rfc8032#page-17
-
-        list($x1, $y1, $z1) = $p;
-        list($x2, $y2, $z2) = $q;
-
-        $a = $z1->multiply($z2);
-        $b = $a->multiply($a);
-        $c = $x1->multiply($x2);
-        $d = $y1->multiply($y2);
-        $e = $this->d->multiply($c)->multiply($d);
-        $f = $b->subtract($e);
-        $g = $b->add($e);
-        $h = $x1->add($y1)->multiply($x2->add($y2));
-
-        $x3 = $a->multiply($f)->multiply($h->subtract($c)->subtract($d));
-        $y3 = $a->multiply($g)->multiply($d->subtract($c));
-        $z3 = $f->multiply($g);
-
-        return [$x3, $y3, $z3];
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/brainpoolP160r1.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/brainpoolP160r1.php
deleted file mode 100644
index 7bc2272a..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/brainpoolP160r1.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/**
- * brainpoolP160r1
- *
- * PHP version 5 and 7
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2017 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://pear.php.net/package/Math_BigInteger
- */
-
-namespace phpseclib3\Crypt\EC\Curves;
-
-use phpseclib3\Crypt\EC\BaseCurves\Prime;
-use phpseclib3\Math\BigInteger;
-
-class brainpoolP160r1 extends Prime
-{
-    public function __construct()
-    {
-        $this->setModulo(new BigInteger('E95E4A5F737059DC60DFC7AD95B3D8139515620F', 16));
-        $this->setCoefficients(
-            new BigInteger('340E7BE2A280EB74E2BE61BADA745D97E8F7C300', 16),
-            new BigInteger('1E589A8595423412134FAA2DBDEC95C8D8675E58', 16)
-        );
-        $this->setBasePoint(
-            new BigInteger('BED5AF16EA3F6A4F62938C4631EB5AF7BDBCDBC3', 16),
-            new BigInteger('1667CB477A1A8EC338F94741669C976316DA6321', 16)
-        );
-        $this->setOrder(new BigInteger('E95E4A5F737059DC60DF5991D45029409E60FC09', 16));
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/brainpoolP160t1.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/brainpoolP160t1.php
deleted file mode 100644
index ebfb29ae..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/brainpoolP160t1.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-/**
- * brainpoolP160t1
- *
- * This curve is a twisted version of brainpoolP160r1 with A = -3. With brainpool,
- * the curves ending in r1 are the "regular" curves and the curves ending in "t1"
- * are the twisted version of the r1 curves. Per https://tools.ietf.org/html/rfc5639#page-7
- * you can convert a point on an r1 curve to a point on a t1 curve thusly:
- *
- *     F(x,y) := (x*Z^2, y*Z^3)
- *
- * The advantage of A = -3 is that some of the point doubling and point addition can be
- * slightly optimized. See http://hyperelliptic.org/EFD/g1p/auto-shortw-projective-3.html
- * vs http://hyperelliptic.org/EFD/g1p/auto-shortw-projective.html for example.
- *
- * phpseclib does not currently take advantage of this optimization opportunity
- *
- * PHP version 5 and 7
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2017 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://pear.php.net/package/Math_BigInteger
- */
-
-namespace phpseclib3\Crypt\EC\Curves;
-
-use phpseclib3\Crypt\EC\BaseCurves\Prime;
-use phpseclib3\Math\BigInteger;
-
-class brainpoolP160t1 extends Prime
-{
-    public function __construct()
-    {
-        $this->setModulo(new BigInteger('E95E4A5F737059DC60DFC7AD95B3D8139515620F', 16));
-        $this->setCoefficients(
-            new BigInteger('E95E4A5F737059DC60DFC7AD95B3D8139515620C', 16), // eg. -3
-            new BigInteger('7A556B6DAE535B7B51ED2C4D7DAA7A0B5C55F380', 16)
-        );
-        $this->setBasePoint(
-            new BigInteger('B199B13B9B34EFC1397E64BAEB05ACC265FF2378', 16),
-            new BigInteger('ADD6718B7C7C1961F0991B842443772152C9E0AD', 16)
-        );
-        $this->setOrder(new BigInteger('E95E4A5F737059DC60DF5991D45029409E60FC09', 16));
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/brainpoolP192r1.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/brainpoolP192r1.php
deleted file mode 100644
index 6ec848bc..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/brainpoolP192r1.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/**
- * brainpoolP192r1
- *
- * PHP version 5 and 7
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2017 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://pear.php.net/package/Math_BigInteger
- */
-
-namespace phpseclib3\Crypt\EC\Curves;
-
-use phpseclib3\Crypt\EC\BaseCurves\Prime;
-use phpseclib3\Math\BigInteger;
-
-class brainpoolP192r1 extends Prime
-{
-    public function __construct()
-    {
-        $this->setModulo(new BigInteger('C302F41D932A36CDA7A3463093D18DB78FCE476DE1A86297', 16));
-        $this->setCoefficients(
-            new BigInteger('6A91174076B1E0E19C39C031FE8685C1CAE040E5C69A28EF', 16),
-            new BigInteger('469A28EF7C28CCA3DC721D044F4496BCCA7EF4146FBF25C9', 16)
-        );
-        $this->setBasePoint(
-            new BigInteger('C0A0647EAAB6A48753B033C56CB0F0900A2F5C4853375FD6', 16),
-            new BigInteger('14B690866ABD5BB88B5F4828C1490002E6773FA2FA299B8F', 16)
-        );
-        $this->setOrder(new BigInteger('C302F41D932A36CDA7A3462F9E9E916B5BE8F1029AC4ACC1', 16));
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/brainpoolP192t1.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/brainpoolP192t1.php
deleted file mode 100644
index e6a86bbd..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/brainpoolP192t1.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/**
- * brainpoolP192t1
- *
- * PHP version 5 and 7
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2017 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://pear.php.net/package/Math_BigInteger
- */
-
-namespace phpseclib3\Crypt\EC\Curves;
-
-use phpseclib3\Crypt\EC\BaseCurves\Prime;
-use phpseclib3\Math\BigInteger;
-
-class brainpoolP192t1 extends Prime
-{
-    public function __construct()
-    {
-        $this->setModulo(new BigInteger('C302F41D932A36CDA7A3463093D18DB78FCE476DE1A86297', 16));
-        $this->setCoefficients(
-            new BigInteger('C302F41D932A36CDA7A3463093D18DB78FCE476DE1A86294', 16), // eg. -3
-            new BigInteger('13D56FFAEC78681E68F9DEB43B35BEC2FB68542E27897B79', 16)
-        );
-        $this->setBasePoint(
-            new BigInteger('3AE9E58C82F63C30282E1FE7BBF43FA72C446AF6F4618129', 16),
-            new BigInteger('097E2C5667C2223A902AB5CA449D0084B7E5B3DE7CCC01C9', 16)
-        );
-        $this->setOrder(new BigInteger('C302F41D932A36CDA7A3462F9E9E916B5BE8F1029AC4ACC1', 16));
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/brainpoolP224r1.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/brainpoolP224r1.php
deleted file mode 100644
index 3d7d8726..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/brainpoolP224r1.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/**
- * brainpoolP224r1
- *
- * PHP version 5 and 7
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2017 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://pear.php.net/package/Math_BigInteger
- */
-
-namespace phpseclib3\Crypt\EC\Curves;
-
-use phpseclib3\Crypt\EC\BaseCurves\Prime;
-use phpseclib3\Math\BigInteger;
-
-class brainpoolP224r1 extends Prime
-{
-    public function __construct()
-    {
-        $this->setModulo(new BigInteger('D7C134AA264366862A18302575D1D787B09F075797DA89F57EC8C0FF', 16));
-        $this->setCoefficients(
-            new BigInteger('68A5E62CA9CE6C1C299803A6C1530B514E182AD8B0042A59CAD29F43', 16),
-            new BigInteger('2580F63CCFE44138870713B1A92369E33E2135D266DBB372386C400B', 16)
-        );
-        $this->setBasePoint(
-            new BigInteger('0D9029AD2C7E5CF4340823B2A87DC68C9E4CE3174C1E6EFDEE12C07D', 16),
-            new BigInteger('58AA56F772C0726F24C6B89E4ECDAC24354B9E99CAA3F6D3761402CD', 16)
-        );
-        $this->setOrder(new BigInteger('D7C134AA264366862A18302575D0FB98D116BC4B6DDEBCA3A5A7939F', 16));
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/brainpoolP224t1.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/brainpoolP224t1.php
deleted file mode 100644
index 3d4f9289..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/brainpoolP224t1.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/**
- * brainpoolP224t1
- *
- * PHP version 5 and 7
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2017 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://pear.php.net/package/Math_BigInteger
- */
-
-namespace phpseclib3\Crypt\EC\Curves;
-
-use phpseclib3\Crypt\EC\BaseCurves\Prime;
-use phpseclib3\Math\BigInteger;
-
-class brainpoolP224t1 extends Prime
-{
-    public function __construct()
-    {
-        $this->setModulo(new BigInteger('D7C134AA264366862A18302575D1D787B09F075797DA89F57EC8C0FF', 16));
-        $this->setCoefficients(
-            new BigInteger('D7C134AA264366862A18302575D1D787B09F075797DA89F57EC8C0FC', 16), // eg. -3
-            new BigInteger('4B337D934104CD7BEF271BF60CED1ED20DA14C08B3BB64F18A60888D', 16)
-        );
-        $this->setBasePoint(
-            new BigInteger('6AB1E344CE25FF3896424E7FFE14762ECB49F8928AC0C76029B4D580', 16),
-            new BigInteger('0374E9F5143E568CD23F3F4D7C0D4B1E41C8CC0D1C6ABD5F1A46DB4C', 16)
-        );
-        $this->setOrder(new BigInteger('D7C134AA264366862A18302575D0FB98D116BC4B6DDEBCA3A5A7939F', 16));
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/brainpoolP256r1.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/brainpoolP256r1.php
deleted file mode 100644
index 5780da76..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/brainpoolP256r1.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/**
- * brainpoolP256r1
- *
- * PHP version 5 and 7
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2017 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://pear.php.net/package/Math_BigInteger
- */
-
-namespace phpseclib3\Crypt\EC\Curves;
-
-use phpseclib3\Crypt\EC\BaseCurves\Prime;
-use phpseclib3\Math\BigInteger;
-
-class brainpoolP256r1 extends Prime
-{
-    public function __construct()
-    {
-        $this->setModulo(new BigInteger('A9FB57DBA1EEA9BC3E660A909D838D726E3BF623D52620282013481D1F6E5377', 16));
-        $this->setCoefficients(
-            new BigInteger('7D5A0975FC2C3057EEF67530417AFFE7FB8055C126DC5C6CE94A4B44F330B5D9', 16),
-            new BigInteger('26DC5C6CE94A4B44F330B5D9BBD77CBF958416295CF7E1CE6BCCDC18FF8C07B6', 16)
-        );
-        $this->setBasePoint(
-            new BigInteger('8BD2AEB9CB7E57CB2C4B482FFC81B7AFB9DE27E1E3BD23C23A4453BD9ACE3262', 16),
-            new BigInteger('547EF835C3DAC4FD97F8461A14611DC9C27745132DED8E545C1D54C72F046997', 16)
-        );
-        $this->setOrder(new BigInteger('A9FB57DBA1EEA9BC3E660A909D838D718C397AA3B561A6F7901E0E82974856A7', 16));
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/brainpoolP256t1.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/brainpoolP256t1.php
deleted file mode 100644
index 724d8b8f..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/brainpoolP256t1.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/**
- * brainpoolP256t1
- *
- * PHP version 5 and 7
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2017 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://pear.php.net/package/Math_BigInteger
- */
-
-namespace phpseclib3\Crypt\EC\Curves;
-
-use phpseclib3\Crypt\EC\BaseCurves\Prime;
-use phpseclib3\Math\BigInteger;
-
-class brainpoolP256t1 extends Prime
-{
-    public function __construct()
-    {
-        $this->setModulo(new BigInteger('A9FB57DBA1EEA9BC3E660A909D838D726E3BF623D52620282013481D1F6E5377', 16));
-        $this->setCoefficients(
-            new BigInteger('A9FB57DBA1EEA9BC3E660A909D838D726E3BF623D52620282013481D1F6E5374', 16), // eg. -3
-            new BigInteger('662C61C430D84EA4FE66A7733D0B76B7BF93EBC4AF2F49256AE58101FEE92B04', 16)
-        );
-        $this->setBasePoint(
-            new BigInteger('A3E8EB3CC1CFE7B7732213B23A656149AFA142C47AAFBC2B79A191562E1305F4', 16),
-            new BigInteger('2D996C823439C56D7F7B22E14644417E69BCB6DE39D027001DABE8F35B25C9BE', 16)
-        );
-        $this->setOrder(new BigInteger('A9FB57DBA1EEA9BC3E660A909D838D718C397AA3B561A6F7901E0E82974856A7', 16));
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/brainpoolP320r1.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/brainpoolP320r1.php
deleted file mode 100644
index 182e6227..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/brainpoolP320r1.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-/**
- * brainpoolP320r1
- *
- * PHP version 5 and 7
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2017 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://pear.php.net/package/Math_BigInteger
- */
-
-namespace phpseclib3\Crypt\EC\Curves;
-
-use phpseclib3\Crypt\EC\BaseCurves\Prime;
-use phpseclib3\Math\BigInteger;
-
-class brainpoolP320r1 extends Prime
-{
-    public function __construct()
-    {
-        $this->setModulo(new BigInteger('D35E472036BC4FB7E13C785ED201E065F98FCFA6F6F40DEF4F9' .
-                                        '2B9EC7893EC28FCD412B1F1B32E27', 16));
-        $this->setCoefficients(
-            new BigInteger('3EE30B568FBAB0F883CCEBD46D3F3BB8A2A73513F5EB79DA66190EB085FFA9F4' .
-                           '92F375A97D860EB4', 16),
-            new BigInteger('520883949DFDBC42D3AD198640688A6FE13F41349554B49ACC31DCCD88453981' .
-                           '6F5EB4AC8FB1F1A6', 16)
-        );
-        $this->setBasePoint(
-            new BigInteger('43BD7E9AFB53D8B85289BCC48EE5BFE6F20137D10A087EB6E7871E2A10A599C7' .
-                           '10AF8D0D39E20611', 16),
-            new BigInteger('14FDD05545EC1CC8AB4093247F77275E0743FFED117182EAA9C77877AAAC6AC7' .
-                           'D35245D1692E8EE1', 16)
-        );
-        $this->setOrder(new BigInteger('D35E472036BC4FB7E13C785ED201E065F98FCFA5B68F12A32D4' .
-                                       '82EC7EE8658E98691555B44C59311', 16));
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/brainpoolP320t1.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/brainpoolP320t1.php
deleted file mode 100644
index d5a620d8..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/brainpoolP320t1.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-/**
- * brainpoolP320t1
- *
- * PHP version 5 and 7
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2017 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://pear.php.net/package/Math_BigInteger
- */
-
-namespace phpseclib3\Crypt\EC\Curves;
-
-use phpseclib3\Crypt\EC\BaseCurves\Prime;
-use phpseclib3\Math\BigInteger;
-
-class brainpoolP320t1 extends Prime
-{
-    public function __construct()
-    {
-        $this->setModulo(new BigInteger('D35E472036BC4FB7E13C785ED201E065F98FCFA6F6F40DEF4F9' .
-                                        '2B9EC7893EC28FCD412B1F1B32E27', 16));
-        $this->setCoefficients(
-            new BigInteger('D35E472036BC4FB7E13C785ED201E065F98FCFA6F6F40DEF4F92B9EC7893EC28' .
-                           'FCD412B1F1B32E24', 16), // eg. -3
-            new BigInteger('A7F561E038EB1ED560B3D147DB782013064C19F27ED27C6780AAF77FB8A547CE' .
-                           'B5B4FEF422340353', 16)
-        );
-        $this->setBasePoint(
-            new BigInteger('925BE9FB01AFC6FB4D3E7D4990010F813408AB106C4F09CB7EE07868CC136FFF' .
-                           '3357F624A21BED52', 16),
-            new BigInteger('63BA3A7A27483EBF6671DBEF7ABB30EBEE084E58A0B077AD42A5A0989D1EE71B' .
-                           '1B9BC0455FB0D2C3', 16)
-        );
-        $this->setOrder(new BigInteger('D35E472036BC4FB7E13C785ED201E065F98FCFA5B68F12A32D4' .
-                                       '82EC7EE8658E98691555B44C59311', 16));
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/brainpoolP384r1.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/brainpoolP384r1.php
deleted file mode 100644
index a20b4b44..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/brainpoolP384r1.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-/**
- * brainpoolP384r1
- *
- * PHP version 5 and 7
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2017 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://pear.php.net/package/Math_BigInteger
- */
-
-namespace phpseclib3\Crypt\EC\Curves;
-
-use phpseclib3\Crypt\EC\BaseCurves\Prime;
-use phpseclib3\Math\BigInteger;
-
-class brainpoolP384r1 extends Prime
-{
-    public function __construct()
-    {
-        $this->setModulo(new BigInteger(
-            '8CB91E82A3386D280F5D6F7E50E641DF152F7109ED5456B412B1DA197FB71123ACD3A729901D1A7' .
-            '1874700133107EC53',
-            16
-        ));
-        $this->setCoefficients(
-            new BigInteger(
-                '7BC382C63D8C150C3C72080ACE05AFA0C2BEA28E4FB22787139165EFBA91F90F8AA5814A503' .
-                'AD4EB04A8C7DD22CE2826',
-                16
-            ),
-            new BigInteger(
-                '4A8C7DD22CE28268B39B55416F0447C2FB77DE107DCD2A62E880EA53EEB62D57CB4390295DB' .
-                'C9943AB78696FA504C11',
-                16
-            )
-        );
-        $this->setBasePoint(
-            new BigInteger(
-                '1D1C64F068CF45FFA2A63A81B7C13F6B8847A3E77EF14FE3DB7FCAFE0CBD10E8E826E03436D' .
-                '646AAEF87B2E247D4AF1E',
-                16
-            ),
-            new BigInteger(
-                '8ABE1D7520F9C2A45CB1EB8E95CFD55262B70B29FEEC5864E19C054FF99129280E464621779' .
-                '1811142820341263C5315',
-                16
-            )
-        );
-        $this->setOrder(new BigInteger(
-            '8CB91E82A3386D280F5D6F7E50E641DF152F7109ED5456B31F166E6CAC0425A7CF3AB6AF6B7FC31' .
-            '03B883202E9046565',
-            16
-        ));
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/brainpoolP384t1.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/brainpoolP384t1.php
deleted file mode 100644
index 366660e6..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/brainpoolP384t1.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-/**
- * brainpoolP384t1
- *
- * PHP version 5 and 7
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2017 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://pear.php.net/package/Math_BigInteger
- */
-
-namespace phpseclib3\Crypt\EC\Curves;
-
-use phpseclib3\Crypt\EC\BaseCurves\Prime;
-use phpseclib3\Math\BigInteger;
-
-class brainpoolP384t1 extends Prime
-{
-    public function __construct()
-    {
-        $this->setModulo(new BigInteger(
-            '8CB91E82A3386D280F5D6F7E50E641DF152F7109ED5456B412B1DA197FB71123ACD3A729901D1A7' .
-            '1874700133107EC53',
-            16
-        ));
-        $this->setCoefficients(
-            new BigInteger(
-                '8CB91E82A3386D280F5D6F7E50E641DF152F7109ED5456B412B1DA197FB71123ACD3A729901' .
-                'D1A71874700133107EC50',
-                16
-            ), // eg. -3
-            new BigInteger(
-                '7F519EADA7BDA81BD826DBA647910F8C4B9346ED8CCDC64E4B1ABD11756DCE1D2074AA263B8' .
-                '8805CED70355A33B471EE',
-                16
-            )
-        );
-        $this->setBasePoint(
-            new BigInteger(
-                '18DE98B02DB9A306F2AFCD7235F72A819B80AB12EBD653172476FECD462AABFFC4FF191B946' .
-                'A5F54D8D0AA2F418808CC',
-                16
-            ),
-            new BigInteger(
-                '25AB056962D30651A114AFD2755AD336747F93475B7A1FCA3B88F2B6A208CCFE469408584DC' .
-                '2B2912675BF5B9E582928',
-                16
-            )
-        );
-        $this->setOrder(new BigInteger(
-            '8CB91E82A3386D280F5D6F7E50E641DF152F7109ED5456B31F166E6CAC0425A7CF3AB6AF6B7FC31' .
-            '03B883202E9046565',
-            16
-        ));
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/brainpoolP512r1.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/brainpoolP512r1.php
deleted file mode 100644
index 5efe5e1a..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/brainpoolP512r1.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-/**
- * brainpoolP512r1
- *
- * PHP version 5 and 7
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2017 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://pear.php.net/package/Math_BigInteger
- */
-
-namespace phpseclib3\Crypt\EC\Curves;
-
-use phpseclib3\Crypt\EC\BaseCurves\Prime;
-use phpseclib3\Math\BigInteger;
-
-class brainpoolP512r1 extends Prime
-{
-    public function __construct()
-    {
-        $this->setModulo(new BigInteger(
-            'AADD9DB8DBE9C48B3FD4E6AE33C9FC07CB308DB3B3C9D20ED6639CCA703308717D4D9B009BC' .
-            '66842AECDA12AE6A380E62881FF2F2D82C68528AA6056583A48F3',
-            16
-        ));
-        $this->setCoefficients(
-            new BigInteger(
-                '7830A3318B603B89E2327145AC234CC594CBDD8D3DF91610A83441CAEA9863BC2DED5D5AA82' .
-                '53AA10A2EF1C98B9AC8B57F1117A72BF2C7B9E7C1AC4D77FC94CA',
-                16
-            ),
-            new BigInteger(
-                '3DF91610A83441CAEA9863BC2DED5D5AA8253AA10A2EF1C98B9AC8B57F1117A72BF2C7B9E7C' .
-                '1AC4D77FC94CADC083E67984050B75EBAE5DD2809BD638016F723',
-                16
-            )
-        );
-        $this->setBasePoint(
-            new BigInteger(
-                '81AEE4BDD82ED9645A21322E9C4C6A9385ED9F70B5D916C1B43B62EEF4D0098EFF3B1F78E2D' .
-                '0D48D50D1687B93B97D5F7C6D5047406A5E688B352209BCB9F822',
-                16
-            ),
-            new BigInteger(
-                '7DDE385D566332ECC0EABFA9CF7822FDF209F70024A57B1AA000C55B881F8111B2DCDE494A5' .
-                'F485E5BCA4BD88A2763AED1CA2B2FA8F0540678CD1E0F3AD80892',
-                16
-            )
-        );
-        $this->setOrder(new BigInteger(
-            'AADD9DB8DBE9C48B3FD4E6AE33C9FC07CB308DB3B3C9D20ED6639CCA70330870553E5C414CA' .
-            '92619418661197FAC10471DB1D381085DDADDB58796829CA90069',
-            16
-        ));
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/brainpoolP512t1.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/brainpoolP512t1.php
deleted file mode 100644
index 745863a6..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/brainpoolP512t1.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-/**
- * brainpoolP512t1
- *
- * PHP version 5 and 7
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2017 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://pear.php.net/package/Math_BigInteger
- */
-
-namespace phpseclib3\Crypt\EC\Curves;
-
-use phpseclib3\Crypt\EC\BaseCurves\Prime;
-use phpseclib3\Math\BigInteger;
-
-class brainpoolP512t1 extends Prime
-{
-    public function __construct()
-    {
-        $this->setModulo(new BigInteger(
-            'AADD9DB8DBE9C48B3FD4E6AE33C9FC07CB308DB3B3C9D20ED6639CCA703308717D4D9B009BC' .
-            '66842AECDA12AE6A380E62881FF2F2D82C68528AA6056583A48F3',
-            16
-        ));
-        $this->setCoefficients(
-            new BigInteger(
-                'AADD9DB8DBE9C48B3FD4E6AE33C9FC07CB308DB3B3C9D20ED6639CCA703308717D4D9B009BC' .
-                '66842AECDA12AE6A380E62881FF2F2D82C68528AA6056583A48F0',
-                16
-            ), // eg. -3
-            new BigInteger(
-                '7CBBBCF9441CFAB76E1890E46884EAE321F70C0BCB4981527897504BEC3E36A62BCDFA23049' .
-                '76540F6450085F2DAE145C22553B465763689180EA2571867423E',
-                16
-            )
-        );
-        $this->setBasePoint(
-            new BigInteger(
-                '640ECE5C12788717B9C1BA06CBC2A6FEBA85842458C56DDE9DB1758D39C0313D82BA51735CD' .
-                'B3EA499AA77A7D6943A64F7A3F25FE26F06B51BAA2696FA9035DA',
-                16
-            ),
-            new BigInteger(
-                '5B534BD595F5AF0FA2C892376C84ACE1BB4E3019B71634C01131159CAE03CEE9D9932184BEE' .
-                'F216BD71DF2DADF86A627306ECFF96DBB8BACE198B61E00F8B332',
-                16
-            )
-        );
-        $this->setOrder(new BigInteger(
-            'AADD9DB8DBE9C48B3FD4E6AE33C9FC07CB308DB3B3C9D20ED6639CCA70330870553E5C414CA' .
-            '92619418661197FAC10471DB1D381085DDADDB58796829CA90069',
-            16
-        ));
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/nistb233.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/nistb233.php
deleted file mode 100644
index bae12b06..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/nistb233.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-/**
- * nistb233
- *
- * PHP version 5 and 7
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2017 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://pear.php.net/package/Math_BigInteger
- */
-
-namespace phpseclib3\Crypt\EC\Curves;
-
-final class nistb233 extends sect233r1
-{
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/nistb409.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/nistb409.php
deleted file mode 100644
index a46153d3..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/nistb409.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-/**
- * nistb409
- *
- * PHP version 5 and 7
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2017 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://pear.php.net/package/Math_BigInteger
- */
-
-namespace phpseclib3\Crypt\EC\Curves;
-
-final class nistb409 extends sect409r1
-{
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/nistk163.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/nistk163.php
deleted file mode 100644
index 8b263761..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/nistk163.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-/**
- * nistk163
- *
- * PHP version 5 and 7
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2017 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://pear.php.net/package/Math_BigInteger
- */
-
-namespace phpseclib3\Crypt\EC\Curves;
-
-final class nistk163 extends sect163k1
-{
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/nistk233.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/nistk233.php
deleted file mode 100644
index 69e14138..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/nistk233.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-/**
- * nistk233
- *
- * PHP version 5 and 7
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2017 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://pear.php.net/package/Math_BigInteger
- */
-
-namespace phpseclib3\Crypt\EC\Curves;
-
-final class nistk233 extends sect233k1
-{
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/nistk283.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/nistk283.php
deleted file mode 100644
index 9e95f10e..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/nistk283.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-/**
- * sect283k1
- *
- * PHP version 5 and 7
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2017 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://pear.php.net/package/Math_BigInteger
- */
-
-namespace phpseclib3\Crypt\EC\Curves;
-
-final class nistk283 extends sect283k1
-{
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/nistk409.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/nistk409.php
deleted file mode 100644
index 06bd9af7..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/nistk409.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-/**
- * nistk409
- *
- * PHP version 5 and 7
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2017 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://pear.php.net/package/Math_BigInteger
- */
-
-namespace phpseclib3\Crypt\EC\Curves;
-
-final class nistk409 extends sect409k1
-{
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/nistp192.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/nistp192.php
deleted file mode 100644
index ddead3cf..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/nistp192.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-/**
- * nistp192
- *
- * PHP version 5 and 7
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2017 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://pear.php.net/package/Math_BigInteger
- */
-
-namespace phpseclib3\Crypt\EC\Curves;
-
-final class nistp192 extends secp192r1
-{
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/nistp224.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/nistp224.php
deleted file mode 100644
index 746571b4..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/nistp224.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-/**
- * nistp224
- *
- * PHP version 5 and 7
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2017 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://pear.php.net/package/Math_BigInteger
- */
-
-namespace phpseclib3\Crypt\EC\Curves;
-
-final class nistp224 extends secp224r1
-{
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/nistp256.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/nistp256.php
deleted file mode 100644
index a26c0f99..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/nistp256.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-/**
- * nistp256
- *
- * PHP version 5 and 7
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2017 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://pear.php.net/package/Math_BigInteger
- */
-
-namespace phpseclib3\Crypt\EC\Curves;
-
-final class nistp256 extends secp256r1
-{
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/nistp384.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/nistp384.php
deleted file mode 100644
index 1f20c02d..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/nistp384.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-/**
- * nistp384
- *
- * PHP version 5 and 7
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2017 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://pear.php.net/package/Math_BigInteger
- */
-
-namespace phpseclib3\Crypt\EC\Curves;
-
-final class nistp384 extends secp384r1
-{
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/nistp521.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/nistp521.php
deleted file mode 100644
index 86fa0508..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/nistp521.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-/**
- * nistp521
- *
- * PHP version 5 and 7
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2017 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://pear.php.net/package/Math_BigInteger
- */
-
-namespace phpseclib3\Crypt\EC\Curves;
-
-final class nistp521 extends secp521r1
-{
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/nistt571.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/nistt571.php
deleted file mode 100644
index 7908b38b..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/nistt571.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-/**
- * nistt571
- *
- * PHP version 5 and 7
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2017 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://pear.php.net/package/Math_BigInteger
- */
-
-namespace phpseclib3\Crypt\EC\Curves;
-
-final class nistt571 extends sect571k1
-{
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/prime192v1.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/prime192v1.php
deleted file mode 100644
index e9c13cd8..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/prime192v1.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-/**
- * prime192v1
- *
- * PHP version 5 and 7
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2017 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://pear.php.net/package/Math_BigInteger
- */
-
-namespace phpseclib3\Crypt\EC\Curves;
-
-final class prime192v1 extends secp192r1
-{
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/prime192v2.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/prime192v2.php
deleted file mode 100644
index e3e341f2..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/prime192v2.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/**
- * prime192v2
- *
- * PHP version 5 and 7
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2017 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://pear.php.net/package/Math_BigInteger
- */
-
-namespace phpseclib3\Crypt\EC\Curves;
-
-use phpseclib3\Crypt\EC\BaseCurves\Prime;
-use phpseclib3\Math\BigInteger;
-
-class prime192v2 extends Prime
-{
-    public function __construct()
-    {
-        $this->setModulo(new BigInteger('FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFF', 16));
-        $this->setCoefficients(
-            new BigInteger('FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFC', 16),
-            new BigInteger('CC22D6DFB95C6B25E49C0D6364A4E5980C393AA21668D953', 16)
-        );
-        $this->setBasePoint(
-            new BigInteger('EEA2BAE7E1497842F2DE7769CFE9C989C072AD696F48034A', 16),
-            new BigInteger('6574D11D69B6EC7A672BB82A083DF2F2B0847DE970B2DE15', 16)
-        );
-        $this->setOrder(new BigInteger('FFFFFFFFFFFFFFFFFFFFFFFE5FB1A724DC80418648D8DD31', 16));
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/prime192v3.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/prime192v3.php
deleted file mode 100644
index 1e97992d..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/prime192v3.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/**
- * prime192v3
- *
- * PHP version 5 and 7
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2017 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://pear.php.net/package/Math_BigInteger
- */
-
-namespace phpseclib3\Crypt\EC\Curves;
-
-use phpseclib3\Crypt\EC\BaseCurves\Prime;
-use phpseclib3\Math\BigInteger;
-
-class prime192v3 extends Prime
-{
-    public function __construct()
-    {
-        $this->setModulo(new BigInteger('FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFF', 16));
-        $this->setCoefficients(
-            new BigInteger('FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFC', 16),
-            new BigInteger('22123DC2395A05CAA7423DAECCC94760A7D462256BD56916', 16)
-        );
-        $this->setBasePoint(
-            new BigInteger('7D29778100C65A1DA1783716588DCE2B8B4AEE8E228F1896', 16),
-            new BigInteger('38A90F22637337334B49DCB66A6DC8F9978ACA7648A943B0', 16)
-        );
-        $this->setOrder(new BigInteger('FFFFFFFFFFFFFFFFFFFFFFFF7A62D031C83F4294F640EC13', 16));
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/prime239v1.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/prime239v1.php
deleted file mode 100644
index 084be9d7..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/prime239v1.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/**
- * prime239v1
- *
- * PHP version 5 and 7
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2017 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://pear.php.net/package/Math_BigInteger
- */
-
-namespace phpseclib3\Crypt\EC\Curves;
-
-use phpseclib3\Crypt\EC\BaseCurves\Prime;
-use phpseclib3\Math\BigInteger;
-
-class prime239v1 extends Prime
-{
-    public function __construct()
-    {
-        $this->setModulo(new BigInteger('7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFF', 16));
-        $this->setCoefficients(
-            new BigInteger('7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFC', 16),
-            new BigInteger('6B016C3BDCF18941D0D654921475CA71A9DB2FB27D1D37796185C2942C0A', 16)
-        );
-        $this->setBasePoint(
-            new BigInteger('0FFA963CDCA8816CCC33B8642BEDF905C3D358573D3F27FBBD3B3CB9AAAF', 16),
-            new BigInteger('7DEBE8E4E90A5DAE6E4054CA530BA04654B36818CE226B39FCCB7B02F1AE', 16)
-        );
-        $this->setOrder(new BigInteger('7FFFFFFFFFFFFFFFFFFFFFFF7FFFFF9E5E9A9F5D9071FBD1522688909D0B', 16));
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/prime239v2.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/prime239v2.php
deleted file mode 100644
index 21941b83..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/prime239v2.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/**
- * prime239v2
- *
- * PHP version 5 and 7
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2017 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://pear.php.net/package/Math_BigInteger
- */
-
-namespace phpseclib3\Crypt\EC\Curves;
-
-use phpseclib3\Crypt\EC\BaseCurves\Prime;
-use phpseclib3\Math\BigInteger;
-
-class prime239v2 extends Prime
-{
-    public function __construct()
-    {
-        $this->setModulo(new BigInteger('7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFF', 16));
-        $this->setCoefficients(
-            new BigInteger('7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFC', 16),
-            new BigInteger('617FAB6832576CBBFED50D99F0249C3FEE58B94BA0038C7AE84C8C832F2C', 16)
-        );
-        $this->setBasePoint(
-            new BigInteger('38AF09D98727705120C921BB5E9E26296A3CDCF2F35757A0EAFD87B830E7', 16),
-            new BigInteger('5B0125E4DBEA0EC7206DA0FC01D9B081329FB555DE6EF460237DFF8BE4BA', 16)
-        );
-        $this->setOrder(new BigInteger('7FFFFFFFFFFFFFFFFFFFFFFF800000CFA7E8594377D414C03821BC582063', 16));
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/prime239v3.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/prime239v3.php
deleted file mode 100644
index 78c50f06..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/prime239v3.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/**
- * prime239v3
- *
- * PHP version 5 and 7
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2017 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://pear.php.net/package/Math_BigInteger
- */
-
-namespace phpseclib3\Crypt\EC\Curves;
-
-use phpseclib3\Crypt\EC\BaseCurves\Prime;
-use phpseclib3\Math\BigInteger;
-
-class prime239v3 extends Prime
-{
-    public function __construct()
-    {
-        $this->setModulo(new BigInteger('7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFF', 16));
-        $this->setCoefficients(
-            new BigInteger('7FFFFFFFFFFFFFFFFFFFFFFF7FFFFFFFFFFF8000000000007FFFFFFFFFFC', 16),
-            new BigInteger('255705FA2A306654B1F4CB03D6A750A30C250102D4988717D9BA15AB6D3E', 16)
-        );
-        $this->setBasePoint(
-            new BigInteger('6768AE8E18BB92CFCF005C949AA2C6D94853D0E660BBF854B1C9505FE95A', 16),
-            new BigInteger('1607E6898F390C06BC1D552BAD226F3B6FCFE48B6E818499AF18E3ED6CF3', 16)
-        );
-        $this->setOrder(new BigInteger('7FFFFFFFFFFFFFFFFFFFFFFF7FFFFF975DEB41B3A6057C3C432146526551', 16));
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/prime256v1.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/prime256v1.php
deleted file mode 100644
index c72b22e8..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/prime256v1.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-/**
- * prime256v1
- *
- * PHP version 5 and 7
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2017 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://pear.php.net/package/Math_BigInteger
- */
-
-namespace phpseclib3\Crypt\EC\Curves;
-
-final class prime256v1 extends secp256r1
-{
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/secp112r1.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/secp112r1.php
deleted file mode 100644
index d1d3194b..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/secp112r1.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/**
- * secp112r1
- *
- * PHP version 5 and 7
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2017 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://pear.php.net/package/Math_BigInteger
- */
-
-namespace phpseclib3\Crypt\EC\Curves;
-
-use phpseclib3\Crypt\EC\BaseCurves\Prime;
-use phpseclib3\Math\BigInteger;
-
-class secp112r1 extends Prime
-{
-    public function __construct()
-    {
-        $this->setModulo(new BigInteger('DB7C2ABF62E35E668076BEAD208B', 16));
-        $this->setCoefficients(
-            new BigInteger('DB7C2ABF62E35E668076BEAD2088', 16),
-            new BigInteger('659EF8BA043916EEDE8911702B22', 16)
-        );
-        $this->setBasePoint(
-            new BigInteger('09487239995A5EE76B55F9C2F098', 16),
-            new BigInteger('A89CE5AF8724C0A23E0E0FF77500', 16)
-        );
-        $this->setOrder(new BigInteger('DB7C2ABF62E35E7628DFAC6561C5', 16));
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/secp112r2.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/secp112r2.php
deleted file mode 100644
index da44e7fd..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/secp112r2.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-/**
- * secp112r2
- *
- * PHP version 5 and 7
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2017 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://pear.php.net/package/Math_BigInteger
- */
-
-namespace phpseclib3\Crypt\EC\Curves;
-
-use phpseclib3\Crypt\EC\BaseCurves\Prime;
-use phpseclib3\Math\BigInteger;
-
-class secp112r2 extends Prime
-{
-    public function __construct()
-    {
-        // same modulo as secp112r1
-        $this->setModulo(new BigInteger('DB7C2ABF62E35E668076BEAD208B', 16));
-        $this->setCoefficients(
-            new BigInteger('6127C24C05F38A0AAAF65C0EF02C', 16),
-            new BigInteger('51DEF1815DB5ED74FCC34C85D709', 16)
-        );
-        $this->setBasePoint(
-            new BigInteger('4BA30AB5E892B4E1649DD0928643', 16),
-            new BigInteger('ADCD46F5882E3747DEF36E956E97', 16)
-        );
-        $this->setOrder(new BigInteger('36DF0AAFD8B8D7597CA10520D04B', 16));
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/secp128r1.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/secp128r1.php
deleted file mode 100644
index 34456bc0..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/secp128r1.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/**
- * secp128r1
- *
- * PHP version 5 and 7
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2017 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://pear.php.net/package/Math_BigInteger
- */
-
-namespace phpseclib3\Crypt\EC\Curves;
-
-use phpseclib3\Crypt\EC\BaseCurves\Prime;
-use phpseclib3\Math\BigInteger;
-
-class secp128r1 extends Prime
-{
-    public function __construct()
-    {
-        $this->setModulo(new BigInteger('FFFFFFFDFFFFFFFFFFFFFFFFFFFFFFFF', 16));
-        $this->setCoefficients(
-            new BigInteger('FFFFFFFDFFFFFFFFFFFFFFFFFFFFFFFC', 16),
-            new BigInteger('E87579C11079F43DD824993C2CEE5ED3', 16)
-        );
-        $this->setBasePoint(
-            new BigInteger('161FF7528B899B2D0C28607CA52C5B86', 16),
-            new BigInteger('CF5AC8395BAFEB13C02DA292DDED7A83', 16)
-        );
-        $this->setOrder(new BigInteger('FFFFFFFE0000000075A30D1B9038A115', 16));
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/secp128r2.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/secp128r2.php
deleted file mode 100644
index e102c340..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/secp128r2.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-/**
- * secp128r2
- *
- * PHP version 5 and 7
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2017 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://pear.php.net/package/Math_BigInteger
- */
-
-namespace phpseclib3\Crypt\EC\Curves;
-
-use phpseclib3\Crypt\EC\BaseCurves\Prime;
-use phpseclib3\Math\BigInteger;
-
-class secp128r2 extends Prime
-{
-    public function __construct()
-    {
-        // same as secp128r1
-        $this->setModulo(new BigInteger('FFFFFFFDFFFFFFFFFFFFFFFFFFFFFFFF', 16));
-        $this->setCoefficients(
-            new BigInteger('D6031998D1B3BBFEBF59CC9BBFF9AEE1', 16),
-            new BigInteger('5EEEFCA380D02919DC2C6558BB6D8A5D', 16)
-        );
-        $this->setBasePoint(
-            new BigInteger('7B6AA5D85E572983E6FB32A7CDEBC140', 16),
-            new BigInteger('27B6916A894D3AEE7106FE805FC34B44', 16)
-        );
-        $this->setOrder(new BigInteger('3FFFFFFF7FFFFFFFBE0024720613B5A3', 16));
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/secp160k1.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/secp160k1.php
deleted file mode 100644
index c6a33344..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/secp160k1.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-/**
- * secp160k1
- *
- * PHP version 5 and 7
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2017 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://pear.php.net/package/Math_BigInteger
- */
-
-namespace phpseclib3\Crypt\EC\Curves;
-
-use phpseclib3\Crypt\EC\BaseCurves\KoblitzPrime;
-use phpseclib3\Math\BigInteger;
-
-class secp160k1 extends KoblitzPrime
-{
-    public function __construct()
-    {
-        // same as secp160r2
-        $this->setModulo(new BigInteger('FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFAC73', 16));
-        $this->setCoefficients(
-            new BigInteger('0000000000000000000000000000000000000000', 16),
-            new BigInteger('0000000000000000000000000000000000000007', 16)
-        );
-        $this->setBasePoint(
-            new BigInteger('3B4C382CE37AA192A4019E763036F4F5DD4D7EBB', 16),
-            new BigInteger('938CF935318FDCED6BC28286531733C3F03C4FEE', 16)
-        );
-        $this->setOrder(new BigInteger('0100000000000000000001B8FA16DFAB9ACA16B6B3', 16));
-
-        $this->basis = [];
-        $this->basis[] = [
-            'a' => new BigInteger('0096341F1138933BC2F505', -16),
-            'b' => new BigInteger('FF6E9D0418C67BB8D5F562', -16)
-        ];
-        $this->basis[] = [
-            'a' => new BigInteger('01BDCB3A09AAAABEAFF4A8', -16),
-            'b' => new BigInteger('04D12329FF0EF498EA67', -16)
-        ];
-        $this->beta = $this->factory->newInteger(new BigInteger('645B7345A143464942CC46D7CF4D5D1E1E6CBB68', -16));
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/secp160r1.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/secp160r1.php
deleted file mode 100644
index af468774..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/secp160r1.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/**
- * secp160r1
- *
- * PHP version 5 and 7
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2017 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://pear.php.net/package/Math_BigInteger
- */
-
-namespace phpseclib3\Crypt\EC\Curves;
-
-use phpseclib3\Crypt\EC\BaseCurves\Prime;
-use phpseclib3\Math\BigInteger;
-
-class secp160r1 extends Prime
-{
-    public function __construct()
-    {
-        $this->setModulo(new BigInteger('FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF7FFFFFFF', 16));
-        $this->setCoefficients(
-            new BigInteger('FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF7FFFFFFC', 16),
-            new BigInteger('1C97BEFC54BD7A8B65ACF89F81D4D4ADC565FA45', 16)
-        );
-        $this->setBasePoint(
-            new BigInteger('4A96B5688EF573284664698968C38BB913CBFC82', 16),
-            new BigInteger('23A628553168947D59DCC912042351377AC5FB32', 16)
-        );
-        $this->setOrder(new BigInteger('0100000000000000000001F4C8F927AED3CA752257', 16));
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/secp160r2.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/secp160r2.php
deleted file mode 100644
index 9bd23d23..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/secp160r2.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-/**
- * secp160r2
- *
- * PHP version 5 and 7
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2017 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://pear.php.net/package/Math_BigInteger
- */
-
-namespace phpseclib3\Crypt\EC\Curves;
-
-use phpseclib3\Crypt\EC\BaseCurves\Prime;
-use phpseclib3\Math\BigInteger;
-
-class secp160r2 extends Prime
-{
-    public function __construct()
-    {
-        // same as secp160k1
-        $this->setModulo(new BigInteger('FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFAC73', 16));
-        $this->setCoefficients(
-            new BigInteger('FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFAC70', 16),
-            new BigInteger('B4E134D3FB59EB8BAB57274904664D5AF50388BA', 16)
-        );
-        $this->setBasePoint(
-            new BigInteger('52DCB034293A117E1F4FF11B30F7199D3144CE6D', 16),
-            new BigInteger('FEAFFEF2E331F296E071FA0DF9982CFEA7D43F2E', 16)
-        );
-        $this->setOrder(new BigInteger('0100000000000000000000351EE786A818F3A1A16B', 16));
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/secp192k1.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/secp192k1.php
deleted file mode 100644
index 79ff2e09..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/secp192k1.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-/**
- * secp192k1
- *
- * PHP version 5 and 7
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2017 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://pear.php.net/package/Math_BigInteger
- */
-
-namespace phpseclib3\Crypt\EC\Curves;
-
-use phpseclib3\Crypt\EC\BaseCurves\KoblitzPrime;
-use phpseclib3\Math\BigInteger;
-
-class secp192k1 extends KoblitzPrime
-{
-    public function __construct()
-    {
-        $this->setModulo(new BigInteger('FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFEE37', 16));
-        $this->setCoefficients(
-            new BigInteger('000000000000000000000000000000000000000000000000', 16),
-            new BigInteger('000000000000000000000000000000000000000000000003', 16)
-        );
-        $this->setBasePoint(
-            new BigInteger('DB4FF10EC057E9AE26B07D0280B7F4341DA5D1B1EAE06C7D', 16),
-            new BigInteger('9B2F2F6D9C5628A7844163D015BE86344082AA88D95E2F9D', 16)
-        );
-        $this->setOrder(new BigInteger('FFFFFFFFFFFFFFFFFFFFFFFE26F2FC170F69466A74DEFD8D', 16));
-
-        $this->basis = [];
-        $this->basis[] = [
-            'a' => new BigInteger('00B3FB3400DEC5C4ADCEB8655C', -16),
-            'b' => new BigInteger('8EE96418CCF4CFC7124FDA0F', -16)
-        ];
-        $this->basis[] = [
-            'a' => new BigInteger('01D90D03E8F096B9948B20F0A9', -16),
-            'b' => new BigInteger('42E49819ABBA9474E1083F6B', -16)
-        ];
-        $this->beta = $this->factory->newInteger(new BigInteger('447A96E6C647963E2F7809FEAAB46947F34B0AA3CA0BBA74', -16));
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/secp192r1.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/secp192r1.php
deleted file mode 100644
index 83ab1c70..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/secp192r1.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-
-/**
- * secp192r1
- *
- * This is the NIST P-192 curve
- *
- * PHP version 5 and 7
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2017 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://pear.php.net/package/Math_BigInteger
- */
-
-namespace phpseclib3\Crypt\EC\Curves;
-
-use phpseclib3\Crypt\EC\BaseCurves\Prime;
-use phpseclib3\Math\BigInteger;
-
-class secp192r1 extends Prime
-{
-    public function __construct()
-    {
-        $modulo = new BigInteger('FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFF', 16);
-        $this->setModulo($modulo);
-
-        // algorithm 2.27 from http://diamond.boisestate.edu/~liljanab/MATH308/GuideToECC.pdf#page=66
-        /* in theory this should be faster than regular modular reductions save for one small issue.
-           to convert to / from base-2**8 with BCMath you have to call bcmul() and bcdiv() a lot.
-           to convert to / from base-2**8 with PHP64 you have to call base256_rshift() a lot.
-           in short, converting to / from base-2**8 is pretty expensive and that expense is
-           enough to offset whatever else might be gained by a simplified reduction algorithm.
-           now, if PHP supported unsigned integers things might be different. no bit-shifting
-           would be required for the PHP engine and it'd be a lot faster. but as is, BigInteger
-           uses base-2**31 or base-2**26 depending on whether or not the system is has a 32-bit
-           or a 64-bit OS.
-        */
-        /*
-        $m_length = $this->getLengthInBytes();
-        $this->setReduction(function($c) use ($m_length) {
-            $cBytes = $c->toBytes();
-            $className = $this->className;
-
-            if (strlen($cBytes) > 2 * $m_length) {
-                list(, $r) = $c->divide($className::$modulo);
-                return $r;
-            }
-
-            $c = str_pad($cBytes, 48, "\0", STR_PAD_LEFT);
-            $c = array_reverse(str_split($c, 8));
-
-            $null = "\0\0\0\0\0\0\0\0";
-            $s1 = new BigInteger($c[2] . $c[1] . $c[0], 256);
-            $s2 = new BigInteger($null . $c[3] . $c[3], 256);
-            $s3 = new BigInteger($c[4] . $c[4] . $null, 256);
-            $s4 = new BigInteger($c[5] . $c[5] . $c[5], 256);
-
-            $r = $s1->add($s2)->add($s3)->add($s4);
-            while ($r->compare($className::$modulo) >= 0) {
-                $r = $r->subtract($className::$modulo);
-            }
-
-            return $r;
-        });
-        */
-
-        $this->setCoefficients(
-            new BigInteger('FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFC', 16),
-            new BigInteger('64210519E59C80E70FA7E9AB72243049FEB8DEECC146B9B1', 16)
-        );
-        $this->setBasePoint(
-            new BigInteger('188DA80EB03090F67CBF20EB43A18800F4FF0AFD82FF1012', 16),
-            new BigInteger('07192B95FFC8DA78631011ED6B24CDD573F977A11E794811', 16)
-        );
-        $this->setOrder(new BigInteger('FFFFFFFFFFFFFFFFFFFFFFFF99DEF836146BC9B1B4D22831', 16));
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/secp224k1.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/secp224k1.php
deleted file mode 100644
index 79a5c541..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/secp224k1.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-/**
- * secp224k1
- *
- * PHP version 5 and 7
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2017 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://pear.php.net/package/Math_BigInteger
- */
-
-namespace phpseclib3\Crypt\EC\Curves;
-
-use phpseclib3\Crypt\EC\BaseCurves\KoblitzPrime;
-use phpseclib3\Math\BigInteger;
-
-class secp224k1 extends KoblitzPrime
-{
-    public function __construct()
-    {
-        $this->setModulo(new BigInteger('FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFE56D', 16));
-        $this->setCoefficients(
-            new BigInteger('00000000000000000000000000000000000000000000000000000000', 16),
-            new BigInteger('00000000000000000000000000000000000000000000000000000005', 16)
-        );
-        $this->setBasePoint(
-            new BigInteger('A1455B334DF099DF30FC28A169A467E9E47075A90F7E650EB6B7A45C', 16),
-            new BigInteger('7E089FED7FBA344282CAFBD6F7E319F7C0B0BD59E2CA4BDB556D61A5', 16)
-        );
-        $this->setOrder(new BigInteger('010000000000000000000000000001DCE8D2EC6184CAF0A971769FB1F7', 16));
-
-        $this->basis = [];
-        $this->basis[] = [
-            'a' => new BigInteger('00B8ADF1378A6EB73409FA6C9C637D', -16),
-            'b' => new BigInteger('94730F82B358A3776A826298FA6F', -16)
-        ];
-        $this->basis[] = [
-            'a' => new BigInteger('01DCE8D2EC6184CAF0A972769FCC8B', -16),
-            'b' => new BigInteger('4D2100BA3DC75AAB747CCF355DEC', -16)
-        ];
-        $this->beta = $this->factory->newInteger(new BigInteger('01F178FFA4B17C89E6F73AECE2AAD57AF4C0A748B63C830947B27E04', -16));
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/secp224r1.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/secp224r1.php
deleted file mode 100644
index a9e474a3..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/secp224r1.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/**
- * secp224r1
- *
- * PHP version 5 and 7
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2017 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://pear.php.net/package/Math_BigInteger
- */
-
-namespace phpseclib3\Crypt\EC\Curves;
-
-use phpseclib3\Crypt\EC\BaseCurves\Prime;
-use phpseclib3\Math\BigInteger;
-
-class secp224r1 extends Prime
-{
-    public function __construct()
-    {
-        $this->setModulo(new BigInteger('FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000001', 16));
-        $this->setCoefficients(
-            new BigInteger('FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFFFFFFFFFE', 16),
-            new BigInteger('B4050A850C04B3ABF54132565044B0B7D7BFD8BA270B39432355FFB4', 16)
-        );
-        $this->setBasePoint(
-            new BigInteger('B70E0CBD6BB4BF7F321390B94A03C1D356C21122343280D6115C1D21', 16),
-            new BigInteger('BD376388B5F723FB4C22DFE6CD4375A05A07476444D5819985007E34', 16)
-        );
-        $this->setOrder(new BigInteger('FFFFFFFFFFFFFFFFFFFFFFFFFFFF16A2E0B8F03E13DD29455C5C2A3D', 16));
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/secp256k1.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/secp256k1.php
deleted file mode 100644
index 462e7a1c..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/secp256k1.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-/**
- * secp256k1
- *
- * This is the curve used in Bitcoin
- *
- * PHP version 5 and 7
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2017 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://pear.php.net/package/Math_BigInteger
- */
-
-namespace phpseclib3\Crypt\EC\Curves;
-
-//use phpseclib3\Crypt\EC\BaseCurves\Prime;
-use phpseclib3\Crypt\EC\BaseCurves\KoblitzPrime;
-use phpseclib3\Math\BigInteger;
-
-//class secp256k1 extends Prime
-class secp256k1 extends KoblitzPrime
-{
-    public function __construct()
-    {
-        $this->setModulo(new BigInteger('FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFC2F', 16));
-        $this->setCoefficients(
-            new BigInteger('0000000000000000000000000000000000000000000000000000000000000000', 16),
-            new BigInteger('0000000000000000000000000000000000000000000000000000000000000007', 16)
-        );
-        $this->setOrder(new BigInteger('FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEBAAEDCE6AF48A03BBFD25E8CD0364141', 16));
-        $this->setBasePoint(
-            new BigInteger('79BE667EF9DCBBAC55A06295CE870B07029BFCDB2DCE28D959F2815B16F81798', 16),
-            new BigInteger('483ADA7726A3C4655DA4FBFC0E1108A8FD17B448A68554199C47D08FFB10D4B8', 16)
-        );
-
-        $this->basis = [];
-        $this->basis[] = [
-            'a' => new BigInteger('3086D221A7D46BCDE86C90E49284EB15', -16),
-            'b' => new BigInteger('FF1BBC8129FEF177D790AB8056F5401B3D', -16)
-        ];
-        $this->basis[] = [
-            'a' => new BigInteger('114CA50F7A8E2F3F657C1108D9D44CFD8', -16),
-            'b' => new BigInteger('3086D221A7D46BCDE86C90E49284EB15', -16)
-        ];
-        $this->beta = $this->factory->newInteger(new BigInteger('7AE96A2B657C07106E64479EAC3434E99CF0497512F58995C1396C28719501EE', -16));
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/secp256r1.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/secp256r1.php
deleted file mode 100644
index 9003373c..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/secp256r1.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/**
- * secp256r1
- *
- * PHP version 5 and 7
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2017 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://pear.php.net/package/Math_BigInteger
- */
-
-namespace phpseclib3\Crypt\EC\Curves;
-
-use phpseclib3\Crypt\EC\BaseCurves\Prime;
-use phpseclib3\Math\BigInteger;
-
-class secp256r1 extends Prime
-{
-    public function __construct()
-    {
-        $this->setModulo(new BigInteger('FFFFFFFF00000001000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFF', 16));
-        $this->setCoefficients(
-            new BigInteger('FFFFFFFF00000001000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFC', 16),
-            new BigInteger('5AC635D8AA3A93E7B3EBBD55769886BC651D06B0CC53B0F63BCE3C3E27D2604B', 16)
-        );
-        $this->setBasePoint(
-            new BigInteger('6B17D1F2E12C4247F8BCE6E563A440F277037D812DEB33A0F4A13945D898C296', 16),
-            new BigInteger('4FE342E2FE1A7F9B8EE7EB4A7C0F9E162BCE33576B315ECECBB6406837BF51F5', 16)
-        );
-        $this->setOrder(new BigInteger('FFFFFFFF00000000FFFFFFFFFFFFFFFFBCE6FAADA7179E84F3B9CAC2FC632551', 16));
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/secp384r1.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/secp384r1.php
deleted file mode 100644
index 98764a34..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/secp384r1.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-
-/**
- * secp384r1
- *
- * PHP version 5 and 7
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2017 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://pear.php.net/package/Math_BigInteger
- */
-
-namespace phpseclib3\Crypt\EC\Curves;
-
-use phpseclib3\Crypt\EC\BaseCurves\Prime;
-use phpseclib3\Math\BigInteger;
-
-class secp384r1 extends Prime
-{
-    public function __construct()
-    {
-        $this->setModulo(new BigInteger(
-            'FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFF0000000000000000FFFFFFFF',
-            16
-        ));
-        $this->setCoefficients(
-            new BigInteger(
-                'FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEFFFFFFFF0000000000000000FFFFFFFC',
-                16
-            ),
-            new BigInteger(
-                'B3312FA7E23EE7E4988E056BE3F82D19181D9C6EFE8141120314088F5013875AC656398D8A2ED19D2A85C8EDD3EC2AEF',
-                16
-            )
-        );
-        $this->setBasePoint(
-            new BigInteger(
-                'AA87CA22BE8B05378EB1C71EF320AD746E1D3B628BA79B9859F741E082542A385502F25DBF55296C3A545E3872760AB7',
-                16
-            ),
-            new BigInteger(
-                '3617DE4A96262C6F5D9E98BF9292DC29F8F41DBD289A147CE9DA3113B5F0B8C00A60B1CE1D7E819D7A431D7C90EA0E5F',
-                16
-            )
-        );
-        $this->setOrder(new BigInteger(
-            'FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFC7634D81F4372DDF581A0DB248B0A77AECEC196ACCC52973',
-            16
-        ));
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/secp521r1.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/secp521r1.php
deleted file mode 100644
index b89a4ea7..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/secp521r1.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-
-/**
- * secp521r1
- *
- * PHP version 5 and 7
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2017 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://pear.php.net/package/Math_BigInteger
- */
-
-namespace phpseclib3\Crypt\EC\Curves;
-
-use phpseclib3\Crypt\EC\BaseCurves\Prime;
-use phpseclib3\Math\BigInteger;
-
-class secp521r1 extends Prime
-{
-    public function __construct()
-    {
-        $this->setModulo(new BigInteger('01FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF' .
-                                        'FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF' .
-                                        'FFFF', 16));
-        $this->setCoefficients(
-            new BigInteger('01FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF' .
-                           'FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF' .
-                           'FFFC', 16),
-            new BigInteger('0051953EB9618E1C9A1F929A21A0B68540EEA2DA725B99B315F3B8B489918EF1' .
-                           '09E156193951EC7E937B1652C0BD3BB1BF073573DF883D2C34F1EF451FD46B50' .
-                           '3F00', 16)
-        );
-        $this->setBasePoint(
-            new BigInteger('00C6858E06B70404E9CD9E3ECB662395B4429C648139053FB521F828AF606B4D' .
-                           '3DBAA14B5E77EFE75928FE1DC127A2FFA8DE3348B3C1856A429BF97E7E31C2E5' .
-                           'BD66', 16),
-            new BigInteger('011839296A789A3BC0045C8A5FB42C7D1BD998F54449579B446817AFBD17273E' .
-                           '662C97EE72995EF42640C550B9013FAD0761353C7086A272C24088BE94769FD1' .
-                           '6650', 16)
-        );
-        $this->setOrder(new BigInteger('01FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF' .
-                                       'FFFA51868783BF2F966B7FCC0148F709A5D03BB5C9B8899C47AEBB6FB71E9138' .
-                                       '6409', 16));
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/sect113r1.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/sect113r1.php
deleted file mode 100644
index 77ec7603..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/sect113r1.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/**
- * sect113r1
- *
- * PHP version 5 and 7
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2017 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://pear.php.net/package/Math_BigInteger
- */
-
-namespace phpseclib3\Crypt\EC\Curves;
-
-use phpseclib3\Crypt\EC\BaseCurves\Binary;
-use phpseclib3\Math\BigInteger;
-
-class sect113r1 extends Binary
-{
-    public function __construct()
-    {
-        $this->setModulo(113, 9, 0);
-        $this->setCoefficients(
-            '003088250CA6E7C7FE649CE85820F7',
-            '00E8BEE4D3E2260744188BE0E9C723'
-        );
-        $this->setBasePoint(
-            '009D73616F35F4AB1407D73562C10F',
-            '00A52830277958EE84D1315ED31886'
-        );
-        $this->setOrder(new BigInteger('0100000000000000D9CCEC8A39E56F', 16));
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/sect113r2.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/sect113r2.php
deleted file mode 100644
index 2185d60e..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/sect113r2.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/**
- * sect113r2
- *
- * PHP version 5 and 7
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2017 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://pear.php.net/package/Math_BigInteger
- */
-
-namespace phpseclib3\Crypt\EC\Curves;
-
-use phpseclib3\Crypt\EC\BaseCurves\Binary;
-use phpseclib3\Math\BigInteger;
-
-class sect113r2 extends Binary
-{
-    public function __construct()
-    {
-        $this->setModulo(113, 9, 0);
-        $this->setCoefficients(
-            '00689918DBEC7E5A0DD6DFC0AA55C7',
-            '0095E9A9EC9B297BD4BF36E059184F'
-        );
-        $this->setBasePoint(
-            '01A57A6A7B26CA5EF52FCDB8164797',
-            '00B3ADC94ED1FE674C06E695BABA1D'
-        );
-        $this->setOrder(new BigInteger('010000000000000108789B2496AF93', 16));
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/sect131r1.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/sect131r1.php
deleted file mode 100644
index 1365cb60..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/sect131r1.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/**
- * sect131r1
- *
- * PHP version 5 and 7
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2017 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://pear.php.net/package/Math_BigInteger
- */
-
-namespace phpseclib3\Crypt\EC\Curves;
-
-use phpseclib3\Crypt\EC\BaseCurves\Binary;
-use phpseclib3\Math\BigInteger;
-
-class sect131r1 extends Binary
-{
-    public function __construct()
-    {
-        $this->setModulo(131, 8, 3, 2, 0);
-        $this->setCoefficients(
-            '07A11B09A76B562144418FF3FF8C2570B8',
-            '0217C05610884B63B9C6C7291678F9D341'
-        );
-        $this->setBasePoint(
-            '0081BAF91FDF9833C40F9C181343638399',
-            '078C6E7EA38C001F73C8134B1B4EF9E150'
-        );
-        $this->setOrder(new BigInteger('0400000000000000023123953A9464B54D', 16));
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/sect131r2.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/sect131r2.php
deleted file mode 100644
index 93c11b2a..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/sect131r2.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/**
- * sect131r2
- *
- * PHP version 5 and 7
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2017 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://pear.php.net/package/Math_BigInteger
- */
-
-namespace phpseclib3\Crypt\EC\Curves;
-
-use phpseclib3\Crypt\EC\BaseCurves\Binary;
-use phpseclib3\Math\BigInteger;
-
-class sect131r2 extends Binary
-{
-    public function __construct()
-    {
-        $this->setModulo(131, 8, 3, 2, 0);
-        $this->setCoefficients(
-            '03E5A88919D7CAFCBF415F07C2176573B2',
-            '04B8266A46C55657AC734CE38F018F2192'
-        );
-        $this->setBasePoint(
-            '0356DCD8F2F95031AD652D23951BB366A8',
-            '0648F06D867940A5366D9E265DE9EB240F'
-        );
-        $this->setOrder(new BigInteger('0400000000000000016954A233049BA98F', 16));
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/sect163k1.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/sect163k1.php
deleted file mode 100644
index 3c8574bb..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/sect163k1.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/**
- * sect163k1
- *
- * PHP version 5 and 7
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2017 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://pear.php.net/package/Math_BigInteger
- */
-
-namespace phpseclib3\Crypt\EC\Curves;
-
-use phpseclib3\Crypt\EC\BaseCurves\Binary;
-use phpseclib3\Math\BigInteger;
-
-class sect163k1 extends Binary
-{
-    public function __construct()
-    {
-        $this->setModulo(163, 7, 6, 3, 0);
-        $this->setCoefficients(
-            '000000000000000000000000000000000000000001',
-            '000000000000000000000000000000000000000001'
-        );
-        $this->setBasePoint(
-            '02FE13C0537BBC11ACAA07D793DE4E6D5E5C94EEE8',
-            '0289070FB05D38FF58321F2E800536D538CCDAA3D9'
-        );
-        $this->setOrder(new BigInteger('04000000000000000000020108A2E0CC0D99F8A5EF', 16));
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/sect163r1.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/sect163r1.php
deleted file mode 100644
index 26afd87e..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/sect163r1.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/**
- * sect163r1
- *
- * PHP version 5 and 7
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2017 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://pear.php.net/package/Math_BigInteger
- */
-
-namespace phpseclib3\Crypt\EC\Curves;
-
-use phpseclib3\Crypt\EC\BaseCurves\Binary;
-use phpseclib3\Math\BigInteger;
-
-class sect163r1 extends Binary
-{
-    public function __construct()
-    {
-        $this->setModulo(163, 7, 6, 3, 0);
-        $this->setCoefficients(
-            '07B6882CAAEFA84F9554FF8428BD88E246D2782AE2',
-            '0713612DCDDCB40AAB946BDA29CA91F73AF958AFD9'
-        );
-        $this->setBasePoint(
-            '0369979697AB43897789566789567F787A7876A654',
-            '00435EDB42EFAFB2989D51FEFCE3C80988F41FF883'
-        );
-        $this->setOrder(new BigInteger('03FFFFFFFFFFFFFFFFFFFF48AAB689C29CA710279B', 16));
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/sect163r2.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/sect163r2.php
deleted file mode 100644
index 38f94661..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/sect163r2.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/**
- * sect163r2
- *
- * PHP version 5 and 7
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2017 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://pear.php.net/package/Math_BigInteger
- */
-
-namespace phpseclib3\Crypt\EC\Curves;
-
-use phpseclib3\Crypt\EC\BaseCurves\Binary;
-use phpseclib3\Math\BigInteger;
-
-class sect163r2 extends Binary
-{
-    public function __construct()
-    {
-        $this->setModulo(163, 7, 6, 3, 0);
-        $this->setCoefficients(
-            '000000000000000000000000000000000000000001',
-            '020A601907B8C953CA1481EB10512F78744A3205FD'
-        );
-        $this->setBasePoint(
-            '03F0EBA16286A2D57EA0991168D4994637E8343E36',
-            '00D51FBC6C71A0094FA2CDD545B11C5C0C797324F1'
-        );
-        $this->setOrder(new BigInteger('040000000000000000000292FE77E70C12A4234C33', 16));
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/sect193r1.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/sect193r1.php
deleted file mode 100644
index 951f261e..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/sect193r1.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/**
- * sect193r1
- *
- * PHP version 5 and 7
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2017 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://pear.php.net/package/Math_BigInteger
- */
-
-namespace phpseclib3\Crypt\EC\Curves;
-
-use phpseclib3\Crypt\EC\BaseCurves\Binary;
-use phpseclib3\Math\BigInteger;
-
-class sect193r1 extends Binary
-{
-    public function __construct()
-    {
-        $this->setModulo(193, 15, 0);
-        $this->setCoefficients(
-            '0017858FEB7A98975169E171F77B4087DE098AC8A911DF7B01',
-            '00FDFB49BFE6C3A89FACADAA7A1E5BBC7CC1C2E5D831478814'
-        );
-        $this->setBasePoint(
-            '01F481BC5F0FF84A74AD6CDF6FDEF4BF6179625372D8C0C5E1',
-            '0025E399F2903712CCF3EA9E3A1AD17FB0B3201B6AF7CE1B05'
-        );
-        $this->setOrder(new BigInteger('01000000000000000000000000C7F34A778F443ACC920EBA49', 16));
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/sect193r2.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/sect193r2.php
deleted file mode 100644
index e3ff47ac..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/sect193r2.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/**
- * sect193r2
- *
- * PHP version 5 and 7
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2017 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://pear.php.net/package/Math_BigInteger
- */
-
-namespace phpseclib3\Crypt\EC\Curves;
-
-use phpseclib3\Crypt\EC\BaseCurves\Binary;
-use phpseclib3\Math\BigInteger;
-
-class sect193r2 extends Binary
-{
-    public function __construct()
-    {
-        $this->setModulo(193, 15, 0);
-        $this->setCoefficients(
-            '0163F35A5137C2CE3EA6ED8667190B0BC43ECD69977702709B',
-            '00C9BB9E8927D4D64C377E2AB2856A5B16E3EFB7F61D4316AE'
-        );
-        $this->setBasePoint(
-            '00D9B67D192E0367C803F39E1A7E82CA14A651350AAE617E8F',
-            '01CE94335607C304AC29E7DEFBD9CA01F596F927224CDECF6C'
-        );
-        $this->setOrder(new BigInteger('010000000000000000000000015AAB561B005413CCD4EE99D5', 16));
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/sect233k1.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/sect233k1.php
deleted file mode 100644
index eea3f7ad..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/sect233k1.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/**
- * sect233k1
- *
- * PHP version 5 and 7
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2017 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://pear.php.net/package/Math_BigInteger
- */
-
-namespace phpseclib3\Crypt\EC\Curves;
-
-use phpseclib3\Crypt\EC\BaseCurves\Binary;
-use phpseclib3\Math\BigInteger;
-
-class sect233k1 extends Binary
-{
-    public function __construct()
-    {
-        $this->setModulo(233, 74, 0);
-        $this->setCoefficients(
-            '000000000000000000000000000000000000000000000000000000000000',
-            '000000000000000000000000000000000000000000000000000000000001'
-        );
-        $this->setBasePoint(
-            '017232BA853A7E731AF129F22FF4149563A419C26BF50A4C9D6EEFAD6126',
-            '01DB537DECE819B7F70F555A67C427A8CD9BF18AEB9B56E0C11056FAE6A3'
-        );
-        $this->setOrder(new BigInteger('8000000000000000000000000000069D5BB915BCD46EFB1AD5F173ABDF', 16));
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/sect233r1.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/sect233r1.php
deleted file mode 100644
index 68219f0e..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/sect233r1.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/**
- * sect233r1
- *
- * PHP version 5 and 7
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2017 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://pear.php.net/package/Math_BigInteger
- */
-
-namespace phpseclib3\Crypt\EC\Curves;
-
-use phpseclib3\Crypt\EC\BaseCurves\Binary;
-use phpseclib3\Math\BigInteger;
-
-class sect233r1 extends Binary
-{
-    public function __construct()
-    {
-        $this->setModulo(233, 74, 0);
-        $this->setCoefficients(
-            '000000000000000000000000000000000000000000000000000000000001',
-            '0066647EDE6C332C7F8C0923BB58213B333B20E9CE4281FE115F7D8F90AD'
-        );
-        $this->setBasePoint(
-            '00FAC9DFCBAC8313BB2139F1BB755FEF65BC391F8B36F8F8EB7371FD558B',
-            '01006A08A41903350678E58528BEBF8A0BEFF867A7CA36716F7E01F81052'
-        );
-        $this->setOrder(new BigInteger('01000000000000000000000000000013E974E72F8A6922031D2603CFE0D7', 16));
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/sect239k1.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/sect239k1.php
deleted file mode 100644
index 0e6994ba..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/sect239k1.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/**
- * sect239k1
- *
- * PHP version 5 and 7
- *
- * @author    Jim Wiggint  on <terrafrost@php.net>
- * @copyright 2017 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://pear.php.net/package/Math_BigInteger
- */
-
-namespace phpseclib3\Crypt\EC\Curves;
-
-use phpseclib3\Crypt\EC\BaseCurves\Binary;
-use phpseclib3\Math\BigInteger;
-
-class sect239k1 extends Binary
-{
-    public function __construct()
-    {
-        $this->setModulo(239, 158, 0);
-        $this->setCoefficients(
-            '000000000000000000000000000000000000000000000000000000000000',
-            '000000000000000000000000000000000000000000000000000000000001'
-        );
-        $this->setBasePoint(
-            '29A0B6A887A983E9730988A68727A8B2D126C44CC2CC7B2A6555193035DC',
-            '76310804F12E549BDB011C103089E73510ACB275FC312A5DC6B76553F0CA'
-        );
-        $this->setOrder(new BigInteger('2000000000000000000000000000005A79FEC67CB6E91F1C1DA800E478A5', 16));
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/sect283k1.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/sect283k1.php
deleted file mode 100644
index 279c24aa..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/sect283k1.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/**
- * sect283k1
- *
- * PHP version 5 and 7
- *
- * @author    Jim Wiggint  on <terrafrost@php.net>
- * @copyright 2017 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://pear.php.net/package/Math_BigInteger
- */
-
-namespace phpseclib3\Crypt\EC\Curves;
-
-use phpseclib3\Crypt\EC\BaseCurves\Binary;
-use phpseclib3\Math\BigInteger;
-
-class sect283k1 extends Binary
-{
-    public function __construct()
-    {
-        $this->setModulo(283, 12, 7, 5, 0);
-        $this->setCoefficients(
-            '000000000000000000000000000000000000000000000000000000000000000000000000',
-            '000000000000000000000000000000000000000000000000000000000000000000000001'
-        );
-        $this->setBasePoint(
-            '0503213F78CA44883F1A3B8162F188E553CD265F23C1567A16876913B0C2AC2458492836',
-            '01CCDA380F1C9E318D90F95D07E5426FE87E45C0E8184698E45962364E34116177DD2259'
-        );
-        $this->setOrder(new BigInteger('01FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE9AE2ED07577265DFF7F94451E061E163C61', 16));
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/sect283r1.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/sect283r1.php
deleted file mode 100644
index e44a6076..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/sect283r1.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/**
- * sect283r1
- *
- * PHP version 5 and 7
- *
- * @author    Jim Wiggint  on <terrafrost@php.net>
- * @copyright 2017 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://pear.php.net/package/Math_BigInteger
- */
-
-namespace phpseclib3\Crypt\EC\Curves;
-
-use phpseclib3\Crypt\EC\BaseCurves\Binary;
-use phpseclib3\Math\BigInteger;
-
-class sect283r1 extends Binary
-{
-    public function __construct()
-    {
-        $this->setModulo(283, 12, 7, 5, 0);
-        $this->setCoefficients(
-            '000000000000000000000000000000000000000000000000000000000000000000000001',
-            '027B680AC8B8596DA5A4AF8A19A0303FCA97FD7645309FA2A581485AF6263E313B79A2F5'
-        );
-        $this->setBasePoint(
-            '05F939258DB7DD90E1934F8C70B0DFEC2EED25B8557EAC9C80E2E198F8CDBECD86B12053',
-            '03676854FE24141CB98FE6D4B20D02B4516FF702350EDDB0826779C813F0DF45BE8112F4'
-        );
-        $this->setOrder(new BigInteger('03FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEF90399660FC938A90165B042A7CEFADB307', 16));
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/sect409k1.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/sect409k1.php
deleted file mode 100644
index 1fe329d8..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/sect409k1.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-/**
- * sect409k1
- *
- * PHP version 5 and 7
- *
- * @author    Jim Wiggint  on <terrafrost@php.net>
- * @copyright 2017 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://pear.php.net/package/Math_BigInteger
- */
-
-namespace phpseclib3\Crypt\EC\Curves;
-
-use phpseclib3\Crypt\EC\BaseCurves\Binary;
-use phpseclib3\Math\BigInteger;
-
-class sect409k1 extends Binary
-{
-    public function __construct()
-    {
-        $this->setModulo(409, 87, 0);
-        $this->setCoefficients(
-            '00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000',
-            '00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001'
-        );
-        $this->setBasePoint(
-            '0060F05F658F49C1AD3AB1890F7184210EFD0987E307C84C27ACCFB8F9F67CC2C460189EB5AAAA62EE222EB1B35540CFE9023746',
-            '01E369050B7C4E42ACBA1DACBF04299C3460782F918EA427E6325165E9EA10E3DA5F6C42E9C55215AA9CA27A5863EC48D8E0286B'
-        );
-        $this->setOrder(new BigInteger(
-            '7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE5F' .
-            '83B2D4EA20400EC4557D5ED3E3E7CA5B4B5C83B8E01E5FCF',
-            16
-        ));
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/sect409r1.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/sect409r1.php
deleted file mode 100644
index 3e209ef8..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/sect409r1.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-/**
- * sect409r1
- *
- * PHP version 5 and 7
- *
- * @author    Jim Wiggint  on <terrafrost@php.net>
- * @copyright 2017 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://pear.php.net/package/Math_BigInteger
- */
-
-namespace phpseclib3\Crypt\EC\Curves;
-
-use phpseclib3\Crypt\EC\BaseCurves\Binary;
-use phpseclib3\Math\BigInteger;
-
-class sect409r1 extends Binary
-{
-    public function __construct()
-    {
-        $this->setModulo(409, 87, 0);
-        $this->setCoefficients(
-            '00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001',
-            '0021A5C2C8EE9FEB5C4B9A753B7B476B7FD6422EF1F3DD674761FA99D6AC27C8A9A197B272822F6CD57A55AA4F50AE317B13545F'
-        );
-        $this->setBasePoint(
-            '015D4860D088DDB3496B0C6064756260441CDE4AF1771D4DB01FFE5B34E59703DC255A868A1180515603AEAB60794E54BB7996A7',
-            '0061B1CFAB6BE5F32BBFA78324ED106A7636B9C5A7BD198D0158AA4F5488D08F38514F1FDF4B4F40D2181B3681C364BA0273C706'
-        );
-        $this->setOrder(new BigInteger(
-            '010000000000000000000000000000000000000000000000000001E2' .
-            'AAD6A612F33307BE5FA47C3C9E052F838164CD37D9A21173',
-            16
-        ));
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/sect571k1.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/sect571k1.php
deleted file mode 100644
index 3c54eabd..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/sect571k1.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-/**
- * sect571k1
- *
- * PHP version 5 and 7
- *
- * @author    Jim Wiggint  on <terrafrost@php.net>
- * @copyright 2017 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://pear.php.net/package/Math_BigInteger
- */
-
-namespace phpseclib3\Crypt\EC\Curves;
-
-use phpseclib3\Crypt\EC\BaseCurves\Binary;
-use phpseclib3\Math\BigInteger;
-
-class sect571k1 extends Binary
-{
-    public function __construct()
-    {
-        $this->setModulo(571, 10, 5, 2, 0);
-        $this->setCoefficients(
-            '000000000000000000000000000000000000000000000000000000000000000000000000' .
-            '000000000000000000000000000000000000000000000000000000000000000000000000',
-            '000000000000000000000000000000000000000000000000000000000000000000000000' .
-            '000000000000000000000000000000000000000000000000000000000000000000000001'
-        );
-        $this->setBasePoint(
-            '026EB7A859923FBC82189631F8103FE4AC9CA2970012D5D46024804801841CA443709584' .
-            '93B205E647DA304DB4CEB08CBBD1BA39494776FB988B47174DCA88C7E2945283A01C8972',
-            '0349DC807F4FBF374F4AEADE3BCA95314DD58CEC9F307A54FFC61EFC006D8A2C9D4979C0' .
-            'AC44AEA74FBEBBB9F772AEDCB620B01A7BA7AF1B320430C8591984F601CD4C143EF1C7A3'
-        );
-        $this->setOrder(new BigInteger(
-            '020000000000000000000000000000000000000000000000000000000000000000000000' .
-            '131850E1F19A63E4B391A8DB917F4138B630D84BE5D639381E91DEB45CFE778F637C1001',
-            16
-        ));
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/sect571r1.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/sect571r1.php
deleted file mode 100644
index 172c1af9..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Curves/sect571r1.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-/**
- * sect571r1
- *
- * PHP version 5 and 7
- *
- * @author    Jim Wiggint  on <terrafrost@php.net>
- * @copyright 2017 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://pear.php.net/package/Math_BigInteger
- */
-
-namespace phpseclib3\Crypt\EC\Curves;
-
-use phpseclib3\Crypt\EC\BaseCurves\Binary;
-use phpseclib3\Math\BigInteger;
-
-class sect571r1 extends Binary
-{
-    public function __construct()
-    {
-        $this->setModulo(571, 10, 5, 2, 0);
-        $this->setCoefficients(
-            '000000000000000000000000000000000000000000000000000000000000000000000000' .
-            '000000000000000000000000000000000000000000000000000000000000000000000001',
-            '02F40E7E2221F295DE297117B7F3D62F5C6A97FFCB8CEFF1CD6BA8CE4A9A18AD84FFABBD' .
-            '8EFA59332BE7AD6756A66E294AFD185A78FF12AA520E4DE739BACA0C7FFEFF7F2955727A'
-        );
-        $this->setBasePoint(
-            '0303001D34B856296C16C0D40D3CD7750A93D1D2955FA80AA5F40FC8DB7B2ABDBDE53950' .
-            'F4C0D293CDD711A35B67FB1499AE60038614F1394ABFA3B4C850D927E1E7769C8EEC2D19',
-            '037BF27342DA639B6DCCFFFEB73D69D78C6C27A6009CBBCA1980F8533921E8A684423E43' .
-            'BAB08A576291AF8F461BB2A8B3531D2F0485C19B16E2F1516E23DD3C1A4827AF1B8AC15B'
-        );
-        $this->setOrder(new BigInteger(
-            '03FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF' .
-            'E661CE18FF55987308059B186823851EC7DD9CA1161DE93D5174D66E8382E9BB2FE84E47',
-            16
-        ));
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Formats/Keys/Common.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Formats/Keys/Common.php
deleted file mode 100644
index 63402b4a..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Formats/Keys/Common.php
+++ /dev/null
@@ -1,549 +0,0 @@
-<?php
-
-/**
- * Generic EC Key Parsing Helper functions
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2015 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\Crypt\EC\Formats\Keys;
-
-use phpseclib3\Common\Functions\Strings;
-use phpseclib3\Crypt\EC\BaseCurves\Base as BaseCurve;
-use phpseclib3\Crypt\EC\BaseCurves\Binary as BinaryCurve;
-use phpseclib3\Crypt\EC\BaseCurves\Prime as PrimeCurve;
-use phpseclib3\Crypt\EC\BaseCurves\TwistedEdwards as TwistedEdwardsCurve;
-use phpseclib3\Exception\UnsupportedCurveException;
-use phpseclib3\File\ASN1;
-use phpseclib3\File\ASN1\Maps;
-use phpseclib3\Math\BigInteger;
-
-/**
- * Generic EC Key Parsing Helper functions
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-trait Common
-{
-    /**
-     * Curve OIDs
-     *
-     * @var array
-     */
-    private static $curveOIDs = [];
-
-    /**
-     * Child OIDs loaded
-     *
-     * @var bool
-     */
-    protected static $childOIDsLoaded = false;
-
-    /**
-     * Use Named Curves
-     *
-     * @var bool
-     */
-    private static $useNamedCurves = true;
-
-    /**
-     * Initialize static variables
-     */
-    private static function initialize_static_variables()
-    {
-        if (empty(self::$curveOIDs)) {
-            // the sec* curves are from the standards for efficient cryptography group
-            // sect* curves are curves over binary finite fields
-            // secp* curves are curves over prime finite fields
-            // sec*r* curves are regular curves; sec*k* curves are koblitz curves
-            // brainpool*r* curves are regular prime finite field curves
-            // brainpool*t* curves are twisted versions of the brainpool*r* curves
-            self::$curveOIDs = [
-                'prime192v1' => '1.2.840.10045.3.1.1', // J.5.1, example 1 (aka secp192r1)
-                'prime192v2' => '1.2.840.10045.3.1.2', // J.5.1, example 2
-                'prime192v3' => '1.2.840.10045.3.1.3', // J.5.1, example 3
-                'prime239v1' => '1.2.840.10045.3.1.4', // J.5.2, example 1
-                'prime239v2' => '1.2.840.10045.3.1.5', // J.5.2, example 2
-                'prime239v3' => '1.2.840.10045.3.1.6', // J.5.2, example 3
-                'prime256v1' => '1.2.840.10045.3.1.7', // J.5.3, example 1 (aka secp256r1)
-
-                // https://tools.ietf.org/html/rfc5656#section-10
-                'nistp256' => '1.2.840.10045.3.1.7', // aka secp256r1
-                'nistp384' => '1.3.132.0.34', // aka secp384r1
-                'nistp521' => '1.3.132.0.35', // aka secp521r1
-
-                'nistk163' => '1.3.132.0.1', // aka sect163k1
-                'nistp192' => '1.2.840.10045.3.1.1', // aka secp192r1
-                'nistp224' => '1.3.132.0.33', // aka secp224r1
-                'nistk233' => '1.3.132.0.26', // aka sect233k1
-                'nistb233' => '1.3.132.0.27', // aka sect233r1
-                'nistk283' => '1.3.132.0.16', // aka sect283k1
-                'nistk409' => '1.3.132.0.36', // aka sect409k1
-                'nistb409' => '1.3.132.0.37', // aka sect409r1
-                'nistt571' => '1.3.132.0.38', // aka sect571k1
-
-                // from https://tools.ietf.org/html/rfc5915
-                'secp192r1' => '1.2.840.10045.3.1.1', // aka prime192v1
-                'sect163k1' => '1.3.132.0.1',
-                'sect163r2' => '1.3.132.0.15',
-                'secp224r1' => '1.3.132.0.33',
-                'sect233k1' => '1.3.132.0.26',
-                'sect233r1' => '1.3.132.0.27',
-                'secp256r1' => '1.2.840.10045.3.1.7', // aka prime256v1
-                'sect283k1' => '1.3.132.0.16',
-                'sect283r1' => '1.3.132.0.17',
-                'secp384r1' => '1.3.132.0.34',
-                'sect409k1' => '1.3.132.0.36',
-                'sect409r1' => '1.3.132.0.37',
-                'secp521r1' => '1.3.132.0.35',
-                'sect571k1' => '1.3.132.0.38',
-                'sect571r1' => '1.3.132.0.39',
-                // from http://www.secg.org/SEC2-Ver-1.0.pdf
-                'secp112r1' => '1.3.132.0.6',
-                'secp112r2' => '1.3.132.0.7',
-                'secp128r1' => '1.3.132.0.28',
-                'secp128r2' => '1.3.132.0.29',
-                'secp160k1' => '1.3.132.0.9',
-                'secp160r1' => '1.3.132.0.8',
-                'secp160r2' => '1.3.132.0.30',
-                'secp192k1' => '1.3.132.0.31',
-                'secp224k1' => '1.3.132.0.32',
-                'secp256k1' => '1.3.132.0.10',
-
-                'sect113r1' => '1.3.132.0.4',
-                'sect113r2' => '1.3.132.0.5',
-                'sect131r1' => '1.3.132.0.22',
-                'sect131r2' => '1.3.132.0.23',
-                'sect163r1' => '1.3.132.0.2',
-                'sect193r1' => '1.3.132.0.24',
-                'sect193r2' => '1.3.132.0.25',
-                'sect239k1' => '1.3.132.0.3',
-
-                // from http://citeseerx.ist.psu.edu/viewdoc/download?doi=10.1.1.202.2977&rep=rep1&type=pdf#page=36
-                /*
-                'c2pnb163v1' => '1.2.840.10045.3.0.1', // J.4.1, example 1
-                'c2pnb163v2' => '1.2.840.10045.3.0.2', // J.4.1, example 2
-                'c2pnb163v3' => '1.2.840.10045.3.0.3', // J.4.1, example 3
-                'c2pnb172w1' => '1.2.840.10045.3.0.4', // J.4.2, example 1
-                'c2tnb191v1' => '1.2.840.10045.3.0.5', // J.4.3, example 1
-                'c2tnb191v2' => '1.2.840.10045.3.0.6', // J.4.3, example 2
-                'c2tnb191v3' => '1.2.840.10045.3.0.7', // J.4.3, example 3
-                'c2onb191v4' => '1.2.840.10045.3.0.8', // J.4.3, example 4
-                'c2onb191v5' => '1.2.840.10045.3.0.9', // J.4.3, example 5
-                'c2pnb208w1' => '1.2.840.10045.3.0.10', // J.4.4, example 1
-                'c2tnb239v1' => '1.2.840.10045.3.0.11', // J.4.5, example 1
-                'c2tnb239v2' => '1.2.840.10045.3.0.12', // J.4.5, example 2
-                'c2tnb239v3' => '1.2.840.10045.3.0.13', // J.4.5, example 3
-                'c2onb239v4' => '1.2.840.10045.3.0.14', // J.4.5, example 4
-                'c2onb239v5' => '1.2.840.10045.3.0.15', // J.4.5, example 5
-                'c2pnb272w1' => '1.2.840.10045.3.0.16', // J.4.6, example 1
-                'c2pnb304w1' => '1.2.840.10045.3.0.17', // J.4.7, example 1
-                'c2tnb359v1' => '1.2.840.10045.3.0.18', // J.4.8, example 1
-                'c2pnb368w1' => '1.2.840.10045.3.0.19', // J.4.9, example 1
-                'c2tnb431r1' => '1.2.840.10045.3.0.20', // J.4.10, example 1
-                */
-
-                // http://www.ecc-brainpool.org/download/Domain-parameters.pdf
-                // https://tools.ietf.org/html/rfc5639
-                'brainpoolP160r1' => '1.3.36.3.3.2.8.1.1.1',
-                'brainpoolP160t1' => '1.3.36.3.3.2.8.1.1.2',
-                'brainpoolP192r1' => '1.3.36.3.3.2.8.1.1.3',
-                'brainpoolP192t1' => '1.3.36.3.3.2.8.1.1.4',
-                'brainpoolP224r1' => '1.3.36.3.3.2.8.1.1.5',
-                'brainpoolP224t1' => '1.3.36.3.3.2.8.1.1.6',
-                'brainpoolP256r1' => '1.3.36.3.3.2.8.1.1.7',
-                'brainpoolP256t1' => '1.3.36.3.3.2.8.1.1.8',
-                'brainpoolP320r1' => '1.3.36.3.3.2.8.1.1.9',
-                'brainpoolP320t1' => '1.3.36.3.3.2.8.1.1.10',
-                'brainpoolP384r1' => '1.3.36.3.3.2.8.1.1.11',
-                'brainpoolP384t1' => '1.3.36.3.3.2.8.1.1.12',
-                'brainpoolP512r1' => '1.3.36.3.3.2.8.1.1.13',
-                'brainpoolP512t1' => '1.3.36.3.3.2.8.1.1.14'
-            ];
-            ASN1::loadOIDs([
-                'prime-field' => '1.2.840.10045.1.1',
-                'characteristic-two-field' => '1.2.840.10045.1.2',
-                'characteristic-two-basis' => '1.2.840.10045.1.2.3',
-                // per http://www.secg.org/SEC1-Ver-1.0.pdf#page=84, gnBasis "not used here"
-                'gnBasis' => '1.2.840.10045.1.2.3.1', // NULL
-                'tpBasis' => '1.2.840.10045.1.2.3.2', // Trinomial
-                'ppBasis' => '1.2.840.10045.1.2.3.3'  // Pentanomial
-            ] + self::$curveOIDs);
-        }
-    }
-
-    /**
-     * Explicitly set the curve
-     *
-     * If the key contains an implicit curve phpseclib needs the curve
-     * to be explicitly provided
-     *
-     * @param \phpseclib3\Crypt\EC\BaseCurves\Base $curve
-     */
-    public static function setImplicitCurve(BaseCurve $curve)
-    {
-        self::$implicitCurve = $curve;
-    }
-
-    /**
-     * Returns an instance of \phpseclib3\Crypt\EC\BaseCurves\Base based
-     * on the curve parameters
-     *
-     * @param array $params
-     * @return \phpseclib3\Crypt\EC\BaseCurves\Base|false
-     */
-    protected static function loadCurveByParam(array $params)
-    {
-        if (count($params) > 1) {
-            throw new \RuntimeException('No parameters are present');
-        }
-        if (isset($params['namedCurve'])) {
-            $curve = '\phpseclib3\Crypt\EC\Curves\\' . $params['namedCurve'];
-            if (!class_exists($curve)) {
-                throw new UnsupportedCurveException('Named Curve of ' . $params['namedCurve'] . ' is not supported');
-            }
-            return new $curve();
-        }
-        if (isset($params['implicitCurve'])) {
-            if (!isset(self::$implicitCurve)) {
-                throw new \RuntimeException('Implicit curves can be provided by calling setImplicitCurve');
-            }
-            return self::$implicitCurve;
-        }
-        if (isset($params['specifiedCurve'])) {
-            $data = $params['specifiedCurve'];
-            switch ($data['fieldID']['fieldType']) {
-                case 'prime-field':
-                    $curve = new PrimeCurve();
-                    $curve->setModulo($data['fieldID']['parameters']);
-                    $curve->setCoefficients(
-                        new BigInteger($data['curve']['a'], 256),
-                        new BigInteger($data['curve']['b'], 256)
-                    );
-                    $point = self::extractPoint("\0" . $data['base'], $curve);
-                    $curve->setBasePoint(...$point);
-                    $curve->setOrder($data['order']);
-                    return $curve;
-                case 'characteristic-two-field':
-                    $curve = new BinaryCurve();
-                    $params = ASN1::decodeBER($data['fieldID']['parameters']);
-                    $params = ASN1::asn1map($params[0], Maps\Characteristic_two::MAP);
-                    $modulo = [(int) $params['m']->toString()];
-                    switch ($params['basis']) {
-                        case 'tpBasis':
-                            $modulo[] = (int) $params['parameters']->toString();
-                            break;
-                        case 'ppBasis':
-                            $temp = ASN1::decodeBER($params['parameters']);
-                            $temp = ASN1::asn1map($temp[0], Maps\Pentanomial::MAP);
-                            $modulo[] = (int) $temp['k3']->toString();
-                            $modulo[] = (int) $temp['k2']->toString();
-                            $modulo[] = (int) $temp['k1']->toString();
-                    }
-                    $modulo[] = 0;
-                    $curve->setModulo(...$modulo);
-                    $len = ceil($modulo[0] / 8);
-                    $curve->setCoefficients(
-                        Strings::bin2hex($data['curve']['a']),
-                        Strings::bin2hex($data['curve']['b'])
-                    );
-                    $point = self::extractPoint("\0" . $data['base'], $curve);
-                    $curve->setBasePoint(...$point);
-                    $curve->setOrder($data['order']);
-                    return $curve;
-                default:
-                    throw new UnsupportedCurveException('Field Type of ' . $data['fieldID']['fieldType'] . ' is not supported');
-            }
-        }
-        throw new \RuntimeException('No valid parameters are present');
-    }
-
-    /**
-     * Extract points from a string
-     *
-     * Supports both compressed and uncompressed points
-     *
-     * @param string $str
-     * @param \phpseclib3\Crypt\EC\BaseCurves\Base $curve
-     * @return object[]
-     */
-    public static function extractPoint($str, BaseCurve $curve)
-    {
-        if ($curve instanceof TwistedEdwardsCurve) {
-            // first step of point deciding as discussed at the following URL's:
-            // https://tools.ietf.org/html/rfc8032#section-5.1.3
-            // https://tools.ietf.org/html/rfc8032#section-5.2.3
-            $y = $str;
-            $y = strrev($y);
-            $sign = (bool) (ord($y[0]) & 0x80);
-            $y[0] = $y[0] & chr(0x7F);
-            $y = new BigInteger($y, 256);
-            if ($y->compare($curve->getModulo()) >= 0) {
-                throw new \RuntimeException('The Y coordinate should not be >= the modulo');
-            }
-            $point = $curve->recoverX($y, $sign);
-            if (!$curve->verifyPoint($point)) {
-                throw new \RuntimeException('Unable to verify that point exists on curve');
-            }
-            return $point;
-        }
-
-        // the first byte of a bit string represents the number of bits in the last byte that are to be ignored but,
-        // currently, bit strings wanting a non-zero amount of bits trimmed are not supported
-        if (($val = Strings::shift($str)) != "\0") {
-            throw new \UnexpectedValueException('extractPoint expects the first byte to be null - not ' . Strings::bin2hex($val));
-        }
-        if ($str == "\0") {
-            return [];
-        }
-
-        $keylen = strlen($str);
-        $order = $curve->getLengthInBytes();
-        // point compression is being used
-        if ($keylen == $order + 1) {
-            return $curve->derivePoint($str);
-        }
-
-        // point compression is not being used
-        if ($keylen == 2 * $order + 1) {
-            preg_match("#(.)(.{{$order}})(.{{$order}})#s", $str, $matches);
-            list(, $w, $x, $y) = $matches;
-            if ($w != "\4") {
-                throw new \UnexpectedValueException('The first byte of an uncompressed point should be 04 - not ' . Strings::bin2hex($val));
-            }
-            $point = [
-                $curve->convertInteger(new BigInteger($x, 256)),
-                $curve->convertInteger(new BigInteger($y, 256))
-            ];
-
-            if (!$curve->verifyPoint($point)) {
-                throw new \RuntimeException('Unable to verify that point exists on curve');
-            }
-
-            return $point;
-        }
-
-        throw new \UnexpectedValueException('The string representation of the points is not of an appropriate length');
-    }
-
-    /**
-     * Encode Parameters
-     *
-     * @todo Maybe at some point this could be moved to __toString() for each of the curves?
-     * @param \phpseclib3\Crypt\EC\BaseCurves\Base $curve
-     * @param bool $returnArray optional
-     * @param array $options optional
-     * @return string|false
-     */
-    private static function encodeParameters(BaseCurve $curve, $returnArray = false, array $options = [])
-    {
-        $useNamedCurves = isset($options['namedCurve']) ? $options['namedCurve'] : self::$useNamedCurves;
-
-        $reflect = new \ReflectionClass($curve);
-        $name = $reflect->getShortName();
-        if ($useNamedCurves) {
-            if (isset(self::$curveOIDs[$name])) {
-                if ($reflect->isFinal()) {
-                    $reflect = $reflect->getParentClass();
-                    $name = $reflect->getShortName();
-                }
-                return $returnArray ?
-                    ['namedCurve' => $name] :
-                    ASN1::encodeDER(['namedCurve' => $name], Maps\ECParameters::MAP);
-            }
-            foreach (new \DirectoryIterator(__DIR__ . '/../../Curves/') as $file) {
-                if ($file->getExtension() != 'php') {
-                    continue;
-                }
-                $testName = $file->getBasename('.php');
-                $class = 'phpseclib3\Crypt\EC\Curves\\' . $testName;
-                $reflect = new \ReflectionClass($class);
-                if ($reflect->isFinal()) {
-                    continue;
-                }
-                $candidate = new $class();
-                switch ($name) {
-                    case 'Prime':
-                        if (!$candidate instanceof PrimeCurve) {
-                            break;
-                        }
-                        if (!$candidate->getModulo()->equals($curve->getModulo())) {
-                            break;
-                        }
-                        if ($candidate->getA()->toBytes() != $curve->getA()->toBytes()) {
-                            break;
-                        }
-                        if ($candidate->getB()->toBytes() != $curve->getB()->toBytes()) {
-                            break;
-                        }
-
-                        list($candidateX, $candidateY) = $candidate->getBasePoint();
-                        list($curveX, $curveY) = $curve->getBasePoint();
-                        if ($candidateX->toBytes() != $curveX->toBytes()) {
-                            break;
-                        }
-                        if ($candidateY->toBytes() != $curveY->toBytes()) {
-                            break;
-                        }
-
-                        return $returnArray ?
-                            ['namedCurve' => $testName] :
-                            ASN1::encodeDER(['namedCurve' => $testName], Maps\ECParameters::MAP);
-                    case 'Binary':
-                        if (!$candidate instanceof BinaryCurve) {
-                            break;
-                        }
-                        if ($candidate->getModulo() != $curve->getModulo()) {
-                            break;
-                        }
-                        if ($candidate->getA()->toBytes() != $curve->getA()->toBytes()) {
-                            break;
-                        }
-                        if ($candidate->getB()->toBytes() != $curve->getB()->toBytes()) {
-                            break;
-                        }
-
-                        list($candidateX, $candidateY) = $candidate->getBasePoint();
-                        list($curveX, $curveY) = $curve->getBasePoint();
-                        if ($candidateX->toBytes() != $curveX->toBytes()) {
-                            break;
-                        }
-                        if ($candidateY->toBytes() != $curveY->toBytes()) {
-                            break;
-                        }
-
-                        return $returnArray ?
-                            ['namedCurve' => $testName] :
-                            ASN1::encodeDER(['namedCurve' => $testName], Maps\ECParameters::MAP);
-                }
-            }
-        }
-
-        $order = $curve->getOrder();
-        // we could try to calculate the order thusly:
-        // https://crypto.stackexchange.com/a/27914/4520
-        // https://en.wikipedia.org/wiki/Schoof%E2%80%93Elkies%E2%80%93Atkin_algorithm
-        if (!$order) {
-            throw new \RuntimeException('Specified Curves need the order to be specified');
-        }
-        $point = $curve->getBasePoint();
-        $x = $point[0]->toBytes();
-        $y = $point[1]->toBytes();
-
-        if ($curve instanceof PrimeCurve) {
-            /*
-             * valid versions are:
-             *
-             * ecdpVer1:
-             *   - neither the curve or the base point are generated verifiably randomly.
-             * ecdpVer2:
-             *   - curve and base point are generated verifiably at random and curve.seed is present
-             * ecdpVer3:
-             *   - base point is generated verifiably at random but curve is not. curve.seed is present
-             */
-            // other (optional) parameters can be calculated using the methods discused at
-            // https://crypto.stackexchange.com/q/28947/4520
-            $data = [
-                'version' => 'ecdpVer1',
-                'fieldID' => [
-                    'fieldType' => 'prime-field',
-                    'parameters' => $curve->getModulo()
-                ],
-                'curve' => [
-                    'a' => $curve->getA()->toBytes(),
-                    'b' => $curve->getB()->toBytes()
-                ],
-                'base' => "\4" . $x . $y,
-                'order' => $order
-            ];
-
-            return $returnArray ?
-                ['specifiedCurve' => $data] :
-                ASN1::encodeDER(['specifiedCurve' => $data], Maps\ECParameters::MAP);
-        }
-        if ($curve instanceof BinaryCurve) {
-            $modulo = $curve->getModulo();
-            $basis = count($modulo);
-            $m = array_shift($modulo);
-            array_pop($modulo); // the last parameter should always be 0
-            //rsort($modulo);
-            switch ($basis) {
-                case 3:
-                    $basis = 'tpBasis';
-                    $modulo = new BigInteger($modulo[0]);
-                    break;
-                case 5:
-                    $basis = 'ppBasis';
-                    // these should be in strictly ascending order (hence the commented out rsort above)
-                    $modulo = [
-                        'k1' => new BigInteger($modulo[2]),
-                        'k2' => new BigInteger($modulo[1]),
-                        'k3' => new BigInteger($modulo[0])
-                    ];
-                    $modulo = ASN1::encodeDER($modulo, Maps\Pentanomial::MAP);
-                    $modulo = new ASN1\Element($modulo);
-            }
-            $params = ASN1::encodeDER([
-                'm' => new BigInteger($m),
-                'basis' => $basis,
-                'parameters' => $modulo
-            ], Maps\Characteristic_two::MAP);
-            $params = new ASN1\Element($params);
-            $a = ltrim($curve->getA()->toBytes(), "\0");
-            if (!strlen($a)) {
-                $a = "\0";
-            }
-            $b = ltrim($curve->getB()->toBytes(), "\0");
-            if (!strlen($b)) {
-                $b = "\0";
-            }
-            $data = [
-                'version' => 'ecdpVer1',
-                'fieldID' => [
-                    'fieldType' => 'characteristic-two-field',
-                    'parameters' => $params
-                ],
-                'curve' => [
-                    'a' => $a,
-                    'b' => $b
-                ],
-                'base' => "\4" . $x . $y,
-                'order' => $order
-            ];
-
-            return $returnArray ?
-                ['specifiedCurve' => $data] :
-                ASN1::encodeDER(['specifiedCurve' => $data], Maps\ECParameters::MAP);
-        }
-
-        throw new UnsupportedCurveException('Curve cannot be serialized');
-    }
-
-    /**
-     * Use Specified Curve
-     *
-     * A specified curve has all the coefficients, the base points, etc, explicitely included.
-     * A specified curve is a more verbose way of representing a curve
-     */
-    public static function useSpecifiedCurve()
-    {
-        self::$useNamedCurves = false;
-    }
-
-    /**
-     * Use Named Curve
-     *
-     * A named curve does not include any parameters. It is up to the EC parameters to
-     * know what the coefficients, the base points, etc, are from the name of the curve.
-     * A named curve is a more concise way of representing a curve
-     */
-    public static function useNamedCurve()
-    {
-        self::$useNamedCurves = true;
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Formats/Keys/JWK.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Formats/Keys/JWK.php
deleted file mode 100644
index fd18a981..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Formats/Keys/JWK.php
+++ /dev/null
@@ -1,189 +0,0 @@
-<?php
-
-/**
- * JSON Web Key (RFC7517 / RFC8037) Formatted EC Handler
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2015 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\Crypt\EC\Formats\Keys;
-
-use phpseclib3\Common\Functions\Strings;
-use phpseclib3\Crypt\Common\Formats\Keys\JWK as Progenitor;
-use phpseclib3\Crypt\EC\BaseCurves\Base as BaseCurve;
-use phpseclib3\Crypt\EC\BaseCurves\TwistedEdwards as TwistedEdwardsCurve;
-use phpseclib3\Crypt\EC\Curves\Ed25519;
-use phpseclib3\Crypt\EC\Curves\secp256k1;
-use phpseclib3\Crypt\EC\Curves\secp256r1;
-use phpseclib3\Crypt\EC\Curves\secp384r1;
-use phpseclib3\Crypt\EC\Curves\secp521r1;
-use phpseclib3\Exception\UnsupportedCurveException;
-use phpseclib3\Math\BigInteger;
-
-/**
- * JWK Formatted EC Handler
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class JWK extends Progenitor
-{
-    use Common;
-
-    /**
-     * Break a public or private key down into its constituent components
-     *
-     * @param string $key
-     * @param string $password optional
-     * @return array
-     */
-    public static function load($key, $password = '')
-    {
-        $key = parent::load($key, $password);
-
-        switch ($key->kty) {
-            case 'EC':
-                switch ($key->crv) {
-                    case 'P-256':
-                    case 'P-384':
-                    case 'P-521':
-                    case 'secp256k1':
-                        break;
-                    default:
-                        throw new UnsupportedCurveException('Only P-256, P-384, P-521 and secp256k1 curves are accepted (' . $key->crv . ' provided)');
-                }
-                break;
-            case 'OKP':
-                switch ($key->crv) {
-                    case 'Ed25519':
-                    case 'Ed448':
-                        break;
-                    default:
-                        throw new UnsupportedCurveException('Only Ed25519 and Ed448 curves are accepted (' . $key->crv . ' provided)');
-                }
-                break;
-            default:
-                throw new \Exception('Only EC and OKP JWK keys are supported');
-        }
-
-        $curve = '\phpseclib3\Crypt\EC\Curves\\' . str_replace('P-', 'nistp', $key->crv);
-        $curve = new $curve();
-
-        if ($curve instanceof TwistedEdwardsCurve) {
-            $QA = self::extractPoint(Strings::base64url_decode($key->x), $curve);
-            if (!isset($key->d)) {
-                return compact('curve', 'QA');
-            }
-            $arr = $curve->extractSecret(Strings::base64url_decode($key->d));
-            return compact('curve', 'QA') + $arr;
-        }
-
-        $QA = [
-            $curve->convertInteger(new BigInteger(Strings::base64url_decode($key->x), 256)),
-            $curve->convertInteger(new BigInteger(Strings::base64url_decode($key->y), 256))
-        ];
-
-        if (!$curve->verifyPoint($QA)) {
-            throw new \RuntimeException('Unable to verify that point exists on curve');
-        }
-
-        if (!isset($key->d)) {
-            return compact('curve', 'QA');
-        }
-
-        $dA = new BigInteger(Strings::base64url_decode($key->d), 256);
-
-        $curve->rangeCheck($dA);
-
-        return compact('curve', 'dA', 'QA');
-    }
-
-    /**
-     * Returns the alias that corresponds to a curve
-     *
-     * @return string
-     */
-    private static function getAlias(BaseCurve $curve)
-    {
-        switch (true) {
-            case $curve instanceof secp256r1:
-                return 'P-256';
-            case $curve instanceof secp384r1:
-                return 'P-384';
-            case $curve instanceof secp521r1:
-                return 'P-521';
-            case $curve instanceof secp256k1:
-                return 'secp256k1';
-        }
-
-        $reflect = new \ReflectionClass($curve);
-        $curveName = $reflect->isFinal() ?
-            $reflect->getParentClass()->getShortName() :
-            $reflect->getShortName();
-        throw new UnsupportedCurveException("$curveName is not a supported curve");
-    }
-
-    /**
-     * Return the array superstructure for an EC public key
-     *
-     * @param \phpseclib3\Crypt\EC\BaseCurves\Base $curve
-     * @param \phpseclib3\Math\Common\FiniteField\Integer[] $publicKey
-     * @return array
-     */
-    private static function savePublicKeyHelper(BaseCurve $curve, array $publicKey)
-    {
-        if ($curve instanceof TwistedEdwardsCurve) {
-            return [
-                'kty' => 'OKP',
-                'crv' => $curve instanceof Ed25519 ? 'Ed25519' : 'Ed448',
-                'x' => Strings::base64url_encode($curve->encodePoint($publicKey))
-            ];
-        }
-
-        return [
-            'kty' => 'EC',
-            'crv' => self::getAlias($curve),
-            'x' => Strings::base64url_encode($publicKey[0]->toBytes()),
-            'y' => Strings::base64url_encode($publicKey[1]->toBytes())
-        ];
-    }
-
-    /**
-     * Convert an EC public key to the appropriate format
-     *
-     * @param \phpseclib3\Crypt\EC\BaseCurves\Base $curve
-     * @param \phpseclib3\Math\Common\FiniteField\Integer[] $publicKey
-     * @param array $options optional
-     * @return string
-     */
-    public static function savePublicKey(BaseCurve $curve, array $publicKey, array $options = [])
-    {
-        $key = self::savePublicKeyHelper($curve, $publicKey);
-
-        return self::wrapKey($key, $options);
-    }
-
-    /**
-     * Convert a private key to the appropriate format.
-     *
-     * @param \phpseclib3\Math\BigInteger $privateKey
-     * @param \phpseclib3\Crypt\EC\Curves\Ed25519 $curve
-     * @param \phpseclib3\Math\Common\FiniteField\Integer[] $publicKey
-     * @param string $secret optional
-     * @param string $password optional
-     * @param array $options optional
-     * @return string
-     */
-    public static function savePrivateKey(BigInteger $privateKey, BaseCurve $curve, array $publicKey, $secret = null, $password = '', array $options = [])
-    {
-        $key = self::savePublicKeyHelper($curve, $publicKey);
-        $key['d'] = $curve instanceof TwistedEdwardsCurve ? $secret : $privateKey->toBytes();
-        $key['d'] = Strings::base64url_encode($key['d']);
-
-        return self::wrapKey($key, $options);
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Formats/Keys/MontgomeryPrivate.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Formats/Keys/MontgomeryPrivate.php
deleted file mode 100644
index 5741b05a..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Formats/Keys/MontgomeryPrivate.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-
-/**
- * Montgomery Private Key Handler
- *
- * "Naked" Curve25519 private keys can pretty much be any sequence of random 32x bytes so unless
- * we have a "hidden" key handler pretty much every 32 byte string will be loaded as a curve25519
- * private key even if it probably isn't one by PublicKeyLoader.
- *
- * "Naked" Curve25519 public keys also a string of 32 bytes so distinguishing between a "naked"
- * curve25519 private key and a public key is nigh impossible, hence separate plugins for each
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2015 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\Crypt\EC\Formats\Keys;
-
-use phpseclib3\Crypt\EC\BaseCurves\Montgomery as MontgomeryCurve;
-use phpseclib3\Crypt\EC\Curves\Curve25519;
-use phpseclib3\Crypt\EC\Curves\Curve448;
-use phpseclib3\Exception\UnsupportedFormatException;
-use phpseclib3\Math\BigInteger;
-
-/**
- * Montgomery Curve Private Key Handler
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class MontgomeryPrivate
-{
-    /**
-     * Is invisible flag
-     *
-     */
-    const IS_INVISIBLE = true;
-
-    /**
-     * Break a public or private key down into its constituent components
-     *
-     * @param string $key
-     * @param string $password optional
-     * @return array
-     */
-    public static function load($key, $password = '')
-    {
-        switch (strlen($key)) {
-            case 32:
-                $curve = new Curve25519();
-                break;
-            case 56:
-                $curve = new Curve448();
-                break;
-            default:
-                throw new \LengthException('The only supported lengths are 32 and 56');
-        }
-
-        $components = ['curve' => $curve];
-        $components['dA'] = new BigInteger($key, 256);
-        $curve->rangeCheck($components['dA']);
-        // note that EC::getEncodedCoordinates does some additional "magic" (it does strrev on the result)
-        $components['QA'] = $components['curve']->multiplyPoint($components['curve']->getBasePoint(), $components['dA']);
-
-        return $components;
-    }
-
-    /**
-     * Convert an EC public key to the appropriate format
-     *
-     * @param \phpseclib3\Crypt\EC\BaseCurves\Montgomery $curve
-     * @param \phpseclib3\Math\Common\FiniteField\Integer[] $publicKey
-     * @return string
-     */
-    public static function savePublicKey(MontgomeryCurve $curve, array $publicKey)
-    {
-        return strrev($publicKey[0]->toBytes());
-    }
-
-    /**
-     * Convert a private key to the appropriate format.
-     *
-     * @param \phpseclib3\Math\BigInteger $privateKey
-     * @param \phpseclib3\Crypt\EC\BaseCurves\Montgomery $curve
-     * @param \phpseclib3\Math\Common\FiniteField\Integer[] $publicKey
-     * @param string $secret optional
-     * @param string $password optional
-     * @return string
-     */
-    public static function savePrivateKey(BigInteger $privateKey, MontgomeryCurve $curve, array $publicKey, $secret = null, $password = '')
-    {
-        if (!empty($password) && is_string($password)) {
-            throw new UnsupportedFormatException('MontgomeryPrivate private keys do not support encryption');
-        }
-
-        return $privateKey->toBytes();
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Formats/Keys/MontgomeryPublic.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Formats/Keys/MontgomeryPublic.php
deleted file mode 100644
index d1ad48a5..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Formats/Keys/MontgomeryPublic.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-
-/**
- * Montgomery Public Key Handler
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2015 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\Crypt\EC\Formats\Keys;
-
-use phpseclib3\Crypt\EC\BaseCurves\Montgomery as MontgomeryCurve;
-use phpseclib3\Crypt\EC\Curves\Curve25519;
-use phpseclib3\Crypt\EC\Curves\Curve448;
-use phpseclib3\Math\BigInteger;
-
-/**
- * Montgomery Public Key Handler
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class MontgomeryPublic
-{
-    /**
-     * Is invisible flag
-     *
-     */
-    const IS_INVISIBLE = true;
-
-    /**
-     * Break a public or private key down into its constituent components
-     *
-     * @param string $key
-     * @param string $password optional
-     * @return array
-     */
-    public static function load($key, $password = '')
-    {
-        switch (strlen($key)) {
-            case 32:
-                $curve = new Curve25519();
-                break;
-            case 56:
-                $curve = new Curve448();
-                break;
-            default:
-                throw new \LengthException('The only supported lengths are 32 and 56');
-        }
-
-        $components = ['curve' => $curve];
-        $components['QA'] = [$components['curve']->convertInteger(new BigInteger(strrev($key), 256))];
-
-        return $components;
-    }
-
-    /**
-     * Convert an EC public key to the appropriate format
-     *
-     * @param \phpseclib3\Crypt\EC\BaseCurves\Montgomery $curve
-     * @param \phpseclib3\Math\Common\FiniteField\Integer[] $publicKey
-     * @return string
-     */
-    public static function savePublicKey(MontgomeryCurve $curve, array $publicKey)
-    {
-        return strrev($publicKey[0]->toBytes());
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Formats/Keys/OpenSSH.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Formats/Keys/OpenSSH.php
deleted file mode 100644
index 2cd3e19d..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Formats/Keys/OpenSSH.php
+++ /dev/null
@@ -1,209 +0,0 @@
-<?php
-
-/**
- * OpenSSH Formatted EC Key Handler
- *
- * PHP version 5
- *
- * Place in $HOME/.ssh/authorized_keys
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2015 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\Crypt\EC\Formats\Keys;
-
-use phpseclib3\Common\Functions\Strings;
-use phpseclib3\Crypt\Common\Formats\Keys\OpenSSH as Progenitor;
-use phpseclib3\Crypt\EC\BaseCurves\Base as BaseCurve;
-use phpseclib3\Crypt\EC\Curves\Ed25519;
-use phpseclib3\Exception\UnsupportedCurveException;
-use phpseclib3\Math\BigInteger;
-
-/**
- * OpenSSH Formatted EC Key Handler
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class OpenSSH extends Progenitor
-{
-    use Common;
-
-    /**
-     * Supported Key Types
-     *
-     * @var array
-     */
-    protected static $types = [
-        'ecdsa-sha2-nistp256',
-        'ecdsa-sha2-nistp384',
-        'ecdsa-sha2-nistp521',
-        'ssh-ed25519'
-    ];
-
-    /**
-     * Break a public or private key down into its constituent components
-     *
-     * @param string $key
-     * @param string $password optional
-     * @return array
-     */
-    public static function load($key, $password = '')
-    {
-        $parsed = parent::load($key, $password);
-
-        if (isset($parsed['paddedKey'])) {
-            $paddedKey = $parsed['paddedKey'];
-            list($type) = Strings::unpackSSH2('s', $paddedKey);
-            if ($type != $parsed['type']) {
-                throw new \RuntimeException("The public and private keys are not of the same type ($type vs $parsed[type])");
-            }
-            if ($type == 'ssh-ed25519') {
-                list(, $key, $comment) = Strings::unpackSSH2('sss', $paddedKey);
-                $key = libsodium::load($key);
-                $key['comment'] = $comment;
-                return $key;
-            }
-            list($curveName, $publicKey, $privateKey, $comment) = Strings::unpackSSH2('ssis', $paddedKey);
-            $curve = self::loadCurveByParam(['namedCurve' => $curveName]);
-            $curve->rangeCheck($privateKey);
-            return [
-                'curve' => $curve,
-                'dA' => $privateKey,
-                'QA' => self::extractPoint("\0$publicKey", $curve),
-                'comment' => $comment
-            ];
-        }
-
-        if ($parsed['type'] == 'ssh-ed25519') {
-            if (Strings::shift($parsed['publicKey'], 4) != "\0\0\0\x20") {
-                throw new \RuntimeException('Length of ssh-ed25519 key should be 32');
-            }
-
-            $curve = new Ed25519();
-            $qa = self::extractPoint($parsed['publicKey'], $curve);
-        } else {
-            list($curveName, $publicKey) = Strings::unpackSSH2('ss', $parsed['publicKey']);
-            $curveName = '\phpseclib3\Crypt\EC\Curves\\' . $curveName;
-            $curve = new $curveName();
-
-            $qa = self::extractPoint("\0" . $publicKey, $curve);
-        }
-
-        return [
-            'curve' => $curve,
-            'QA' => $qa,
-            'comment' => $parsed['comment']
-        ];
-    }
-
-    /**
-     * Returns the alias that corresponds to a curve
-     *
-     * @return string
-     */
-    private static function getAlias(BaseCurve $curve)
-    {
-        self::initialize_static_variables();
-
-        $reflect = new \ReflectionClass($curve);
-        $name = $reflect->getShortName();
-
-        $oid = self::$curveOIDs[$name];
-        $aliases = array_filter(self::$curveOIDs, function ($v) use ($oid) {
-            return $v == $oid;
-        });
-        $aliases = array_keys($aliases);
-
-        for ($i = 0; $i < count($aliases); $i++) {
-            if (in_array('ecdsa-sha2-' . $aliases[$i], self::$types)) {
-                $alias = $aliases[$i];
-                break;
-            }
-        }
-
-        if (!isset($alias)) {
-            throw new UnsupportedCurveException($name . ' is not a curve that the OpenSSH plugin supports');
-        }
-
-        return $alias;
-    }
-
-    /**
-     * Convert an EC public key to the appropriate format
-     *
-     * @param \phpseclib3\Crypt\EC\BaseCurves\Base $curve
-     * @param \phpseclib3\Math\Common\FiniteField\Integer[] $publicKey
-     * @param array $options optional
-     * @return string
-     */
-    public static function savePublicKey(BaseCurve $curve, array $publicKey, array $options = [])
-    {
-        $comment = isset($options['comment']) ? $options['comment'] : self::$comment;
-
-        if ($curve instanceof Ed25519) {
-            $key = Strings::packSSH2('ss', 'ssh-ed25519', $curve->encodePoint($publicKey));
-
-            if (isset($options['binary']) ? $options['binary'] : self::$binary) {
-                return $key;
-            }
-
-            $key = 'ssh-ed25519 ' . base64_encode($key) . ' ' . $comment;
-            return $key;
-        }
-
-        $alias = self::getAlias($curve);
-
-        $points = "\4" . $publicKey[0]->toBytes() . $publicKey[1]->toBytes();
-        $key = Strings::packSSH2('sss', 'ecdsa-sha2-' . $alias, $alias, $points);
-
-        if (isset($options['binary']) ? $options['binary'] : self::$binary) {
-            return $key;
-        }
-
-        $key = 'ecdsa-sha2-' . $alias . ' ' . base64_encode($key) . ' ' . $comment;
-
-        return $key;
-    }
-
-    /**
-     * Convert a private key to the appropriate format.
-     *
-     * @param \phpseclib3\Math\BigInteger $privateKey
-     * @param \phpseclib3\Crypt\EC\Curves\Ed25519 $curve
-     * @param \phpseclib3\Math\Common\FiniteField\Integer[] $publicKey
-     * @param string $secret optional
-     * @param string $password optional
-     * @param array $options optional
-     * @return string
-     */
-    public static function savePrivateKey(BigInteger $privateKey, BaseCurve $curve, array $publicKey, $secret = null, $password = '', array $options = [])
-    {
-        if ($curve instanceof Ed25519) {
-            if (!isset($secret)) {
-                throw new \RuntimeException('Private Key does not have a secret set');
-            }
-            if (strlen($secret) != 32) {
-                throw new \RuntimeException('Private Key secret is not of the correct length');
-            }
-
-            $pubKey = $curve->encodePoint($publicKey);
-
-            $publicKey = Strings::packSSH2('ss', 'ssh-ed25519', $pubKey);
-            $privateKey = Strings::packSSH2('sss', 'ssh-ed25519', $pubKey, $secret . $pubKey);
-
-            return self::wrapPrivateKey($publicKey, $privateKey, $password, $options);
-        }
-
-        $alias = self::getAlias($curve);
-
-        $points = "\4" . $publicKey[0]->toBytes() . $publicKey[1]->toBytes();
-        $publicKey = self::savePublicKey($curve, $publicKey, ['binary' => true]);
-
-        $privateKey = Strings::packSSH2('sssi', 'ecdsa-sha2-' . $alias, $alias, $points, $privateKey);
-
-        return self::wrapPrivateKey($publicKey, $privateKey, $password, $options);
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Formats/Keys/PKCS1.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Formats/Keys/PKCS1.php
deleted file mode 100644
index 9f4b3300..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Formats/Keys/PKCS1.php
+++ /dev/null
@@ -1,194 +0,0 @@
-<?php
-
-/**
- * "PKCS1" (RFC5915) Formatted EC Key Handler
- *
- * PHP version 5
- *
- * Used by File/X509.php
- *
- * Processes keys with the following headers:
- *
- * -----BEGIN EC PRIVATE KEY-----
- * -----BEGIN EC PARAMETERS-----
- *
- * Technically, PKCS1 is for RSA keys, only, but we're using PKCS1 to describe
- * DSA, whose format isn't really formally described anywhere, so might as well
- * use it to describe this, too. PKCS1 is easier to remember than RFC5915, after
- * all. I suppose this could also be named IETF but idk
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2015 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\Crypt\EC\Formats\Keys;
-
-use phpseclib3\Common\Functions\Strings;
-use phpseclib3\Crypt\Common\Formats\Keys\PKCS1 as Progenitor;
-use phpseclib3\Crypt\EC\BaseCurves\Base as BaseCurve;
-use phpseclib3\Crypt\EC\BaseCurves\Montgomery as MontgomeryCurve;
-use phpseclib3\Crypt\EC\BaseCurves\TwistedEdwards as TwistedEdwardsCurve;
-use phpseclib3\Exception\UnsupportedCurveException;
-use phpseclib3\File\ASN1;
-use phpseclib3\File\ASN1\Maps;
-use phpseclib3\Math\BigInteger;
-
-/**
- * "PKCS1" (RFC5915) Formatted EC Key Handler
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class PKCS1 extends Progenitor
-{
-    use Common;
-
-    /**
-     * Break a public or private key down into its constituent components
-     *
-     * @param string $key
-     * @param string $password optional
-     * @return array
-     */
-    public static function load($key, $password = '')
-    {
-        self::initialize_static_variables();
-
-        if (!Strings::is_stringable($key)) {
-            throw new \UnexpectedValueException('Key should be a string - not a ' . gettype($key));
-        }
-
-        if (strpos($key, 'BEGIN EC PARAMETERS') && strpos($key, 'BEGIN EC PRIVATE KEY')) {
-            $components = [];
-
-            preg_match('#-*BEGIN EC PRIVATE KEY-*[^-]*-*END EC PRIVATE KEY-*#s', $key, $matches);
-            $decoded = parent::load($matches[0], $password);
-            $decoded = ASN1::decodeBER($decoded);
-            if (!$decoded) {
-                throw new \RuntimeException('Unable to decode BER');
-            }
-
-            $ecPrivate = ASN1::asn1map($decoded[0], Maps\ECPrivateKey::MAP);
-            if (!is_array($ecPrivate)) {
-                throw new \RuntimeException('Unable to perform ASN1 mapping');
-            }
-
-            if (isset($ecPrivate['parameters'])) {
-                $components['curve'] = self::loadCurveByParam($ecPrivate['parameters']);
-            }
-
-            preg_match('#-*BEGIN EC PARAMETERS-*[^-]*-*END EC PARAMETERS-*#s', $key, $matches);
-            $decoded = parent::load($matches[0], '');
-            $decoded = ASN1::decodeBER($decoded);
-            if (!$decoded) {
-                throw new \RuntimeException('Unable to decode BER');
-            }
-            $ecParams = ASN1::asn1map($decoded[0], Maps\ECParameters::MAP);
-            if (!is_array($ecParams)) {
-                throw new \RuntimeException('Unable to perform ASN1 mapping');
-            }
-            $ecParams = self::loadCurveByParam($ecParams);
-
-            // comparing $ecParams and $components['curve'] directly won't work because they'll have different Math\Common\FiniteField classes
-            // even if the modulo is the same
-            if (isset($components['curve']) && self::encodeParameters($ecParams, false, []) != self::encodeParameters($components['curve'], false, [])) {
-                throw new \RuntimeException('EC PARAMETERS does not correspond to EC PRIVATE KEY');
-            }
-
-            if (!isset($components['curve'])) {
-                $components['curve'] = $ecParams;
-            }
-
-            $components['dA'] = new BigInteger($ecPrivate['privateKey'], 256);
-            $components['curve']->rangeCheck($components['dA']);
-            $components['QA'] = isset($ecPrivate['publicKey']) ?
-                self::extractPoint($ecPrivate['publicKey'], $components['curve']) :
-                $components['curve']->multiplyPoint($components['curve']->getBasePoint(), $components['dA']);
-
-            return $components;
-        }
-
-        $key = parent::load($key, $password);
-
-        $decoded = ASN1::decodeBER($key);
-        if (!$decoded) {
-            throw new \RuntimeException('Unable to decode BER');
-        }
-
-        $key = ASN1::asn1map($decoded[0], Maps\ECParameters::MAP);
-        if (is_array($key)) {
-            return ['curve' => self::loadCurveByParam($key)];
-        }
-
-        $key = ASN1::asn1map($decoded[0], Maps\ECPrivateKey::MAP);
-        if (!is_array($key)) {
-            throw new \RuntimeException('Unable to perform ASN1 mapping');
-        }
-        if (!isset($key['parameters'])) {
-            throw new \RuntimeException('Key cannot be loaded without parameters');
-        }
-
-        $components = [];
-        $components['curve'] = self::loadCurveByParam($key['parameters']);
-        $components['dA'] = new BigInteger($key['privateKey'], 256);
-        $components['QA'] = isset($ecPrivate['publicKey']) ?
-            self::extractPoint($ecPrivate['publicKey'], $components['curve']) :
-            $components['curve']->multiplyPoint($components['curve']->getBasePoint(), $components['dA']);
-
-        return $components;
-    }
-
-    /**
-     * Convert EC parameters to the appropriate format
-     *
-     * @return string
-     */
-    public static function saveParameters(BaseCurve $curve, array $options = [])
-    {
-        self::initialize_static_variables();
-
-        if ($curve instanceof TwistedEdwardsCurve || $curve instanceof MontgomeryCurve) {
-            throw new UnsupportedCurveException('TwistedEdwards and Montgomery Curves are not supported');
-        }
-
-        $key = self::encodeParameters($curve, false, $options);
-
-        return "-----BEGIN EC PARAMETERS-----\r\n" .
-               chunk_split(Strings::base64_encode($key), 64) .
-               "-----END EC PARAMETERS-----\r\n";
-    }
-
-    /**
-     * Convert a private key to the appropriate format.
-     *
-     * @param \phpseclib3\Math\BigInteger $privateKey
-     * @param \phpseclib3\Crypt\EC\BaseCurves\Base $curve
-     * @param \phpseclib3\Math\Common\FiniteField\Integer[] $publicKey
-     * @param string $secret optional
-     * @param string $password optional
-     * @param array $options optional
-     * @return string
-     */
-    public static function savePrivateKey(BigInteger $privateKey, BaseCurve $curve, array $publicKey, $secret = null, $password = '', array $options = [])
-    {
-        self::initialize_static_variables();
-
-        if ($curve instanceof TwistedEdwardsCurve  || $curve instanceof MontgomeryCurve) {
-            throw new UnsupportedCurveException('TwistedEdwards Curves are not supported');
-        }
-
-        $publicKey = "\4" . $publicKey[0]->toBytes() . $publicKey[1]->toBytes();
-
-        $key = [
-            'version' => 'ecPrivkeyVer1',
-            'privateKey' => $privateKey->toBytes(),
-            'parameters' => new ASN1\Element(self::encodeParameters($curve)),
-            'publicKey' => "\0" . $publicKey
-        ];
-
-        $key = ASN1::encodeDER($key, Maps\ECPrivateKey::MAP);
-
-        return self::wrapPrivateKey($key, 'EC', $password, $options);
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Formats/Keys/PKCS8.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Formats/Keys/PKCS8.php
deleted file mode 100644
index 0ec7742f..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Formats/Keys/PKCS8.php
+++ /dev/null
@@ -1,234 +0,0 @@
-<?php
-
-/**
- * PKCS#8 Formatted EC Key Handler
- *
- * PHP version 5
- *
- * Processes keys with the following headers:
- *
- * -----BEGIN ENCRYPTED PRIVATE KEY-----
- * -----BEGIN PRIVATE KEY-----
- * -----BEGIN PUBLIC KEY-----
- *
- * Analogous to ssh-keygen's pkcs8 format (as specified by -m). Although PKCS8
- * is specific to private keys it's basically creating a DER-encoded wrapper
- * for keys. This just extends that same concept to public keys (much like ssh-keygen)
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2015 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\Crypt\EC\Formats\Keys;
-
-use phpseclib3\Crypt\Common\Formats\Keys\PKCS8 as Progenitor;
-use phpseclib3\Crypt\EC\BaseCurves\Base as BaseCurve;
-use phpseclib3\Crypt\EC\BaseCurves\Montgomery as MontgomeryCurve;
-use phpseclib3\Crypt\EC\BaseCurves\TwistedEdwards as TwistedEdwardsCurve;
-use phpseclib3\Crypt\EC\Curves\Ed25519;
-use phpseclib3\Crypt\EC\Curves\Ed448;
-use phpseclib3\Exception\UnsupportedCurveException;
-use phpseclib3\File\ASN1;
-use phpseclib3\File\ASN1\Maps;
-use phpseclib3\Math\BigInteger;
-
-/**
- * PKCS#8 Formatted EC Key Handler
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class PKCS8 extends Progenitor
-{
-    use Common;
-
-    /**
-     * OID Name
-     *
-     * @var array
-     */
-    const OID_NAME = ['id-ecPublicKey', 'id-Ed25519', 'id-Ed448'];
-
-    /**
-     * OID Value
-     *
-     * @var string
-     */
-    const OID_VALUE = ['1.2.840.10045.2.1', '1.3.101.112', '1.3.101.113'];
-
-    /**
-     * Break a public or private key down into its constituent components
-     *
-     * @param string $key
-     * @param string $password optional
-     * @return array
-     */
-    public static function load($key, $password = '')
-    {
-        // initialize_static_variables() is defined in both the trait and the parent class
-        // when it's defined in two places it's the traits one that's called
-        // the parent one is needed, as well, but the parent one is called by other methods
-        // in the parent class as needed and in the context of the parent it's the parent
-        // one that's called
-        self::initialize_static_variables();
-
-        $key = parent::load($key, $password);
-
-        $type = isset($key['privateKey']) ? 'privateKey' : 'publicKey';
-
-        switch ($key[$type . 'Algorithm']['algorithm']) {
-            case 'id-Ed25519':
-            case 'id-Ed448':
-                return self::loadEdDSA($key);
-        }
-
-        $decoded = ASN1::decodeBER($key[$type . 'Algorithm']['parameters']->element);
-        if (!$decoded) {
-            throw new \RuntimeException('Unable to decode BER');
-        }
-        $params = ASN1::asn1map($decoded[0], Maps\ECParameters::MAP);
-        if (!$params) {
-            throw new \RuntimeException('Unable to decode the parameters using Maps\ECParameters');
-        }
-
-        $components = [];
-        $components['curve'] = self::loadCurveByParam($params);
-
-        if ($type == 'publicKey') {
-            $components['QA'] = self::extractPoint("\0" . $key['publicKey'], $components['curve']);
-
-            return $components;
-        }
-
-        $decoded = ASN1::decodeBER($key['privateKey']);
-        if (!$decoded) {
-            throw new \RuntimeException('Unable to decode BER');
-        }
-        $key = ASN1::asn1map($decoded[0], Maps\ECPrivateKey::MAP);
-        if (isset($key['parameters']) && $params != $key['parameters']) {
-            throw new \RuntimeException('The PKCS8 parameter field does not match the private key parameter field');
-        }
-
-        $components['dA'] = new BigInteger($key['privateKey'], 256);
-        $components['curve']->rangeCheck($components['dA']);
-        $components['QA'] = isset($key['publicKey']) ?
-            self::extractPoint($key['publicKey'], $components['curve']) :
-            $components['curve']->multiplyPoint($components['curve']->getBasePoint(), $components['dA']);
-
-        return $components;
-    }
-
-    /**
-     * Break a public or private EdDSA key down into its constituent components
-     *
-     * @return array
-     */
-    private static function loadEdDSA(array $key)
-    {
-        $components = [];
-
-        if (isset($key['privateKey'])) {
-            $components['curve'] = $key['privateKeyAlgorithm']['algorithm'] == 'id-Ed25519' ? new Ed25519() : new Ed448();
-
-            // 0x04 == octet string
-            // 0x20 == length (32 bytes)
-            if (substr($key['privateKey'], 0, 2) != "\x04\x20") {
-                throw new \RuntimeException('The first two bytes of the private key field should be 0x0420');
-            }
-            $arr = $components['curve']->extractSecret(substr($key['privateKey'], 2));
-            $components['dA'] = $arr['dA'];
-            $components['secret'] = $arr['secret'];
-        }
-
-        if (isset($key['publicKey'])) {
-            if (!isset($components['curve'])) {
-                $components['curve'] = $key['publicKeyAlgorithm']['algorithm'] == 'id-Ed25519' ? new Ed25519() : new Ed448();
-            }
-
-            $components['QA'] = self::extractPoint($key['publicKey'], $components['curve']);
-        }
-
-        if (isset($key['privateKey']) && !isset($components['QA'])) {
-            $components['QA'] = $components['curve']->multiplyPoint($components['curve']->getBasePoint(), $components['dA']);
-        }
-
-        return $components;
-    }
-
-    /**
-     * Convert an EC public key to the appropriate format
-     *
-     * @param \phpseclib3\Crypt\EC\BaseCurves\Base $curve
-     * @param \phpseclib3\Math\Common\FiniteField\Integer[] $publicKey
-     * @param array $options optional
-     * @return string
-     */
-    public static function savePublicKey(BaseCurve $curve, array $publicKey, array $options = [])
-    {
-        self::initialize_static_variables();
-
-        if ($curve instanceof MontgomeryCurve) {
-            throw new UnsupportedCurveException('Montgomery Curves are not supported');
-        }
-
-        if ($curve instanceof TwistedEdwardsCurve) {
-            return self::wrapPublicKey(
-                $curve->encodePoint($publicKey),
-                null,
-                $curve instanceof Ed25519 ? 'id-Ed25519' : 'id-Ed448'
-            );
-        }
-
-        $params = new ASN1\Element(self::encodeParameters($curve, false, $options));
-
-        $key = "\4" . $publicKey[0]->toBytes() . $publicKey[1]->toBytes();
-
-        return self::wrapPublicKey($key, $params, 'id-ecPublicKey');
-    }
-
-    /**
-     * Convert a private key to the appropriate format.
-     *
-     * @param \phpseclib3\Math\BigInteger $privateKey
-     * @param \phpseclib3\Crypt\EC\BaseCurves\Base $curve
-     * @param \phpseclib3\Math\Common\FiniteField\Integer[] $publicKey
-     * @param string $secret optional
-     * @param string $password optional
-     * @param array $options optional
-     * @return string
-     */
-    public static function savePrivateKey(BigInteger $privateKey, BaseCurve $curve, array $publicKey, $secret = null, $password = '', array $options = [])
-    {
-        self::initialize_static_variables();
-
-        if ($curve instanceof MontgomeryCurve) {
-            throw new UnsupportedCurveException('Montgomery Curves are not supported');
-        }
-
-        if ($curve instanceof TwistedEdwardsCurve) {
-            return self::wrapPrivateKey(
-                "\x04\x20" . $secret,
-                [],
-                null,
-                $password,
-                $curve instanceof Ed25519 ? 'id-Ed25519' : 'id-Ed448'
-            );
-        }
-
-        $publicKey = "\4" . $publicKey[0]->toBytes() . $publicKey[1]->toBytes();
-
-        $params = new ASN1\Element(self::encodeParameters($curve, false, $options));
-
-        $key = [
-            'version' => 'ecPrivkeyVer1',
-            'privateKey' => $privateKey->toBytes(),
-            //'parameters' => $params,
-            'publicKey' => "\0" . $publicKey
-        ];
-
-        $key = ASN1::encodeDER($key, Maps\ECPrivateKey::MAP);
-
-        return self::wrapPrivateKey($key, [], $params, $password, 'id-ecPublicKey', '', $options);
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Formats/Keys/PuTTY.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Formats/Keys/PuTTY.php
deleted file mode 100644
index 866c883f..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Formats/Keys/PuTTY.php
+++ /dev/null
@@ -1,138 +0,0 @@
-<?php
-
-/**
- * PuTTY Formatted EC Key Handler
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2015 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\Crypt\EC\Formats\Keys;
-
-use phpseclib3\Common\Functions\Strings;
-use phpseclib3\Crypt\Common\Formats\Keys\PuTTY as Progenitor;
-use phpseclib3\Crypt\EC\BaseCurves\Base as BaseCurve;
-use phpseclib3\Crypt\EC\BaseCurves\TwistedEdwards as TwistedEdwardsCurve;
-use phpseclib3\Math\BigInteger;
-
-/**
- * PuTTY Formatted EC Key Handler
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class PuTTY extends Progenitor
-{
-    use Common;
-
-    /**
-     * Public Handler
-     *
-     * @var string
-     */
-    const PUBLIC_HANDLER = 'phpseclib3\Crypt\EC\Formats\Keys\OpenSSH';
-
-    /**
-     * Supported Key Types
-     *
-     * @var array
-     */
-    protected static $types = [
-        'ecdsa-sha2-nistp256',
-        'ecdsa-sha2-nistp384',
-        'ecdsa-sha2-nistp521',
-        'ssh-ed25519'
-    ];
-
-    /**
-     * Break a public or private key down into its constituent components
-     *
-     * @param string $key
-     * @param string $password optional
-     * @return array
-     */
-    public static function load($key, $password = '')
-    {
-        $components = parent::load($key, $password);
-        if (!isset($components['private'])) {
-            return $components;
-        }
-
-        $private = $components['private'];
-
-        $temp = Strings::base64_encode(Strings::packSSH2('s', $components['type']) . $components['public']);
-        $components = OpenSSH::load($components['type'] . ' ' . $temp . ' ' . $components['comment']);
-
-        if ($components['curve'] instanceof TwistedEdwardsCurve) {
-            if (Strings::shift($private, 4) != "\0\0\0\x20") {
-                throw new \RuntimeException('Length of ssh-ed25519 key should be 32');
-            }
-            $arr = $components['curve']->extractSecret($private);
-            $components['dA'] = $arr['dA'];
-            $components['secret'] = $arr['secret'];
-        } else {
-            list($components['dA']) = Strings::unpackSSH2('i', $private);
-            $components['curve']->rangeCheck($components['dA']);
-        }
-
-        return $components;
-    }
-
-    /**
-     * Convert a private key to the appropriate format.
-     *
-     * @param \phpseclib3\Math\BigInteger $privateKey
-     * @param \phpseclib3\Crypt\EC\BaseCurves\Base $curve
-     * @param \phpseclib3\Math\Common\FiniteField\Integer[] $publicKey
-     * @param string $secret optional
-     * @param string $password optional
-     * @param array $options optional
-     * @return string
-     */
-    public static function savePrivateKey(BigInteger $privateKey, BaseCurve $curve, array $publicKey, $secret = null, $password = false, array $options = [])
-    {
-        self::initialize_static_variables();
-
-        $public = explode(' ', OpenSSH::savePublicKey($curve, $publicKey));
-        $name = $public[0];
-        $public = Strings::base64_decode($public[1]);
-        list(, $length) = unpack('N', Strings::shift($public, 4));
-        Strings::shift($public, $length);
-
-        // PuTTY pads private keys with a null byte per the following:
-        // https://github.com/github/putty/blob/a3d14d77f566a41fc61dfdc5c2e0e384c9e6ae8b/sshecc.c#L1926
-        if (!$curve instanceof TwistedEdwardsCurve) {
-            $private = $privateKey->toBytes();
-            if (!(strlen($privateKey->toBits()) & 7)) {
-                $private = "\0$private";
-            }
-        }
-
-        $private = $curve instanceof TwistedEdwardsCurve ?
-            Strings::packSSH2('s', $secret) :
-            Strings::packSSH2('s', $private);
-
-        return self::wrapPrivateKey($public, $private, $name, $password, $options);
-    }
-
-    /**
-     * Convert an EC public key to the appropriate format
-     *
-     * @param \phpseclib3\Crypt\EC\BaseCurves\Base $curve
-     * @param \phpseclib3\Math\Common\FiniteField[] $publicKey
-     * @return string
-     */
-    public static function savePublicKey(BaseCurve $curve, array $publicKey)
-    {
-        $public = explode(' ', OpenSSH::savePublicKey($curve, $publicKey));
-        $type = $public[0];
-        $public = Strings::base64_decode($public[1]);
-        list(, $length) = unpack('N', Strings::shift($public, 4));
-        Strings::shift($public, $length);
-
-        return self::wrapPublicKey($public, $type);
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Formats/Keys/XML.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Formats/Keys/XML.php
deleted file mode 100644
index 27d9218f..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Formats/Keys/XML.php
+++ /dev/null
@@ -1,485 +0,0 @@
-<?php
-
-/**
- * XML Formatted EC Key Handler
- *
- * More info:
- *
- * https://www.w3.org/TR/xmldsig-core/#sec-ECKeyValue
- * http://en.wikipedia.org/wiki/XML_Signature
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2015 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\Crypt\EC\Formats\Keys;
-
-use phpseclib3\Common\Functions\Strings;
-use phpseclib3\Crypt\EC\BaseCurves\Base as BaseCurve;
-use phpseclib3\Crypt\EC\BaseCurves\Montgomery as MontgomeryCurve;
-use phpseclib3\Crypt\EC\BaseCurves\Prime as PrimeCurve;
-use phpseclib3\Crypt\EC\BaseCurves\TwistedEdwards as TwistedEdwardsCurve;
-use phpseclib3\Exception\BadConfigurationException;
-use phpseclib3\Exception\UnsupportedCurveException;
-use phpseclib3\Math\BigInteger;
-
-/**
- * XML Formatted EC Key Handler
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class XML
-{
-    use Common;
-
-    /**
-     * Default namespace
-     *
-     * @var string
-     */
-    private static $namespace;
-
-    /**
-     * Flag for using RFC4050 syntax
-     *
-     * @var bool
-     */
-    private static $rfc4050 = false;
-
-    /**
-     * Break a public or private key down into its constituent components
-     *
-     * @param string $key
-     * @param string $password optional
-     * @return array
-     */
-    public static function load($key, $password = '')
-    {
-        self::initialize_static_variables();
-
-        if (!Strings::is_stringable($key)) {
-            throw new \UnexpectedValueException('Key should be a string - not a ' . gettype($key));
-        }
-
-        if (!class_exists('DOMDocument')) {
-            throw new BadConfigurationException('The dom extension is not setup correctly on this system');
-        }
-
-        $use_errors = libxml_use_internal_errors(true);
-
-        $temp = self::isolateNamespace($key, 'http://www.w3.org/2009/xmldsig11#');
-        if ($temp) {
-            $key = $temp;
-        }
-
-        $temp = self::isolateNamespace($key, 'http://www.w3.org/2001/04/xmldsig-more#');
-        if ($temp) {
-            $key = $temp;
-        }
-
-        $dom = new \DOMDocument();
-        if (substr($key, 0, 5) != '<?xml') {
-            $key = '<xml>' . $key . '</xml>';
-        }
-
-        if (!$dom->loadXML($key)) {
-            libxml_use_internal_errors($use_errors);
-            throw new \UnexpectedValueException('Key does not appear to contain XML');
-        }
-        $xpath = new \DOMXPath($dom);
-        libxml_use_internal_errors($use_errors);
-        $curve = self::loadCurveByParam($xpath);
-
-        $pubkey = self::query($xpath, 'publickey', 'Public Key is not present');
-
-        $QA = self::query($xpath, 'ecdsakeyvalue')->length ?
-            self::extractPointRFC4050($xpath, $curve) :
-            self::extractPoint("\0" . $pubkey, $curve);
-
-        libxml_use_internal_errors($use_errors);
-
-        return compact('curve', 'QA');
-    }
-
-    /**
-     * Case-insensitive xpath query
-     *
-     * @param \DOMXPath $xpath
-     * @param string $name
-     * @param string $error optional
-     * @param bool $decode optional
-     * @return \DOMNodeList
-     */
-    private static function query(\DOMXPath $xpath, $name, $error = null, $decode = true)
-    {
-        $query = '/';
-        $names = explode('/', $name);
-        foreach ($names as $name) {
-            $query .= "/*[translate(local-name(), 'ABCDEFGHIJKLMNOPQRSTUVWXYZ','abcdefghijklmnopqrstuvwxyz')='$name']";
-        }
-        $result = $xpath->query($query);
-        if (!isset($error)) {
-            return $result;
-        }
-
-        if (!$result->length) {
-            throw new \RuntimeException($error);
-        }
-        return $decode ? self::decodeValue($result->item(0)->textContent) : $result->item(0)->textContent;
-    }
-
-    /**
-     * Finds the first element in the relevant namespace, strips the namespacing and returns the XML for that element.
-     *
-     * @param string $xml
-     * @param string $ns
-     */
-    private static function isolateNamespace($xml, $ns)
-    {
-        $dom = new \DOMDocument();
-        if (!$dom->loadXML($xml)) {
-            return false;
-        }
-        $xpath = new \DOMXPath($dom);
-        $nodes = $xpath->query("//*[namespace::*[.='$ns'] and not(../namespace::*[.='$ns'])]");
-        if (!$nodes->length) {
-            return false;
-        }
-        $node = $nodes->item(0);
-        $ns_name = $node->lookupPrefix($ns);
-        if ($ns_name) {
-            $node->removeAttributeNS($ns, $ns_name);
-        }
-        return $dom->saveXML($node);
-    }
-
-    /**
-     * Decodes the value
-     *
-     * @param string $value
-     */
-    private static function decodeValue($value)
-    {
-        return Strings::base64_decode(str_replace(["\r", "\n", ' ', "\t"], '', $value));
-    }
-
-    /**
-     * Extract points from an XML document
-     *
-     * @param \DOMXPath $xpath
-     * @param \phpseclib3\Crypt\EC\BaseCurves\Base $curve
-     * @return object[]
-     */
-    private static function extractPointRFC4050(\DOMXPath $xpath, BaseCurve $curve)
-    {
-        $x = self::query($xpath, 'publickey/x');
-        $y = self::query($xpath, 'publickey/y');
-        if (!$x->length || !$x->item(0)->hasAttribute('Value')) {
-            throw new \RuntimeException('Public Key / X coordinate not found');
-        }
-        if (!$y->length || !$y->item(0)->hasAttribute('Value')) {
-            throw new \RuntimeException('Public Key / Y coordinate not found');
-        }
-        $point = [
-            $curve->convertInteger(new BigInteger($x->item(0)->getAttribute('Value'))),
-            $curve->convertInteger(new BigInteger($y->item(0)->getAttribute('Value')))
-        ];
-        if (!$curve->verifyPoint($point)) {
-            throw new \RuntimeException('Unable to verify that point exists on curve');
-        }
-        return $point;
-    }
-
-    /**
-     * Returns an instance of \phpseclib3\Crypt\EC\BaseCurves\Base based
-     * on the curve parameters
-     *
-     * @param \DomXPath $xpath
-     * @return \phpseclib3\Crypt\EC\BaseCurves\Base|false
-     */
-    private static function loadCurveByParam(\DOMXPath $xpath)
-    {
-        $namedCurve = self::query($xpath, 'namedcurve');
-        if ($namedCurve->length == 1) {
-            $oid = $namedCurve->item(0)->getAttribute('URN');
-            $oid = preg_replace('#[^\d.]#', '', $oid);
-            $name = array_search($oid, self::$curveOIDs);
-            if ($name === false) {
-                throw new UnsupportedCurveException('Curve with OID of ' . $oid . ' is not supported');
-            }
-
-            $curve = '\phpseclib3\Crypt\EC\Curves\\' . $name;
-            if (!class_exists($curve)) {
-                throw new UnsupportedCurveException('Named Curve of ' . $name . ' is not supported');
-            }
-            return new $curve();
-        }
-
-        $params = self::query($xpath, 'explicitparams');
-        if ($params->length) {
-            return self::loadCurveByParamRFC4050($xpath);
-        }
-
-        $params = self::query($xpath, 'ecparameters');
-        if (!$params->length) {
-            throw new \RuntimeException('No parameters are present');
-        }
-
-        $fieldTypes = [
-            'prime-field' => ['fieldid/prime/p'],
-            'gnb' => ['fieldid/gnb/m'],
-            'tnb' => ['fieldid/tnb/k'],
-            'pnb' => ['fieldid/pnb/k1', 'fieldid/pnb/k2', 'fieldid/pnb/k3'],
-            'unknown' => []
-        ];
-
-        foreach ($fieldTypes as $type => $queries) {
-            foreach ($queries as $query) {
-                $result = self::query($xpath, $query);
-                if (!$result->length) {
-                    continue 2;
-                }
-                $param = preg_replace('#.*/#', '', $query);
-                $$param = self::decodeValue($result->item(0)->textContent);
-            }
-            break;
-        }
-
-        $a = self::query($xpath, 'curve/a', 'A coefficient is not present');
-        $b = self::query($xpath, 'curve/b', 'B coefficient is not present');
-        $base = self::query($xpath, 'base', 'Base point is not present');
-        $order = self::query($xpath, 'order', 'Order is not present');
-
-        switch ($type) {
-            case 'prime-field':
-                $curve = new PrimeCurve();
-                $curve->setModulo(new BigInteger($p, 256));
-                $curve->setCoefficients(
-                    new BigInteger($a, 256),
-                    new BigInteger($b, 256)
-                );
-                $point = self::extractPoint("\0" . $base, $curve);
-                $curve->setBasePoint(...$point);
-                $curve->setOrder(new BigInteger($order, 256));
-                return $curve;
-            case 'gnb':
-            case 'tnb':
-            case 'pnb':
-            default:
-                throw new UnsupportedCurveException('Field Type of ' . $type . ' is not supported');
-        }
-    }
-
-    /**
-     * Returns an instance of \phpseclib3\Crypt\EC\BaseCurves\Base based
-     * on the curve parameters
-     *
-     * @param \DomXPath $xpath
-     * @return \phpseclib3\Crypt\EC\BaseCurves\Base|false
-     */
-    private static function loadCurveByParamRFC4050(\DOMXPath $xpath)
-    {
-        $fieldTypes = [
-            'prime-field' => ['primefieldparamstype/p'],
-            'unknown' => []
-        ];
-
-        foreach ($fieldTypes as $type => $queries) {
-            foreach ($queries as $query) {
-                $result = self::query($xpath, $query);
-                if (!$result->length) {
-                    continue 2;
-                }
-                $param = preg_replace('#.*/#', '', $query);
-                $$param = $result->item(0)->textContent;
-            }
-            break;
-        }
-
-        $a = self::query($xpath, 'curveparamstype/a', 'A coefficient is not present', false);
-        $b = self::query($xpath, 'curveparamstype/b', 'B coefficient is not present', false);
-        $x = self::query($xpath, 'basepointparams/basepoint/ecpointtype/x', 'Base Point X is not present', false);
-        $y = self::query($xpath, 'basepointparams/basepoint/ecpointtype/y', 'Base Point Y is not present', false);
-        $order = self::query($xpath, 'order', 'Order is not present', false);
-
-        switch ($type) {
-            case 'prime-field':
-                $curve = new PrimeCurve();
-
-                $p = str_replace(["\r", "\n", ' ', "\t"], '', $p);
-                $curve->setModulo(new BigInteger($p));
-
-                $a = str_replace(["\r", "\n", ' ', "\t"], '', $a);
-                $b = str_replace(["\r", "\n", ' ', "\t"], '', $b);
-                $curve->setCoefficients(
-                    new BigInteger($a),
-                    new BigInteger($b)
-                );
-
-                $x = str_replace(["\r", "\n", ' ', "\t"], '', $x);
-                $y = str_replace(["\r", "\n", ' ', "\t"], '', $y);
-                $curve->setBasePoint(
-                    new BigInteger($x),
-                    new BigInteger($y)
-                );
-
-                $order = str_replace(["\r", "\n", ' ', "\t"], '', $order);
-                $curve->setOrder(new BigInteger($order));
-                return $curve;
-            default:
-                throw new UnsupportedCurveException('Field Type of ' . $type . ' is not supported');
-        }
-    }
-
-    /**
-     * Sets the namespace. dsig11 is the most common one.
-     *
-     * Set to null to unset. Used only for creating public keys.
-     *
-     * @param string $namespace
-     */
-    public static function setNamespace($namespace)
-    {
-        self::$namespace = $namespace;
-    }
-
-    /**
-     * Uses the XML syntax specified in https://tools.ietf.org/html/rfc4050
-     */
-    public static function enableRFC4050Syntax()
-    {
-        self::$rfc4050 = true;
-    }
-
-    /**
-     * Uses the XML syntax specified in https://www.w3.org/TR/xmldsig-core/#sec-ECParameters
-     */
-    public static function disableRFC4050Syntax()
-    {
-        self::$rfc4050 = false;
-    }
-
-    /**
-     * Convert a public key to the appropriate format
-     *
-     * @param \phpseclib3\Crypt\EC\BaseCurves\Base $curve
-     * @param \phpseclib3\Math\Common\FiniteField\Integer[] $publicKey
-     * @param array $options optional
-     * @return string
-     */
-    public static function savePublicKey(BaseCurve $curve, array $publicKey, array $options = [])
-    {
-        self::initialize_static_variables();
-
-        if ($curve instanceof TwistedEdwardsCurve || $curve instanceof MontgomeryCurve) {
-            throw new UnsupportedCurveException('TwistedEdwards and Montgomery Curves are not supported');
-        }
-
-        if (empty(static::$namespace)) {
-            $pre = $post = '';
-        } else {
-            $pre = static::$namespace . ':';
-            $post = ':' . static::$namespace;
-        }
-
-        if (self::$rfc4050) {
-            return '<' . $pre . 'ECDSAKeyValue xmlns' . $post . '="http://www.w3.org/2001/04/xmldsig-more#">' . "\r\n" .
-                   self::encodeXMLParameters($curve, $pre, $options) . "\r\n" .
-                   '<' . $pre . 'PublicKey>' . "\r\n" .
-                   '<' . $pre . 'X Value="' . $publicKey[0] . '" />' . "\r\n" .
-                   '<' . $pre . 'Y Value="' . $publicKey[1] . '" />' . "\r\n" .
-                   '</' . $pre . 'PublicKey>' . "\r\n" .
-                   '</' . $pre . 'ECDSAKeyValue>';
-        }
-
-        $publicKey = "\4" . $publicKey[0]->toBytes() . $publicKey[1]->toBytes();
-
-        return '<' . $pre . 'ECDSAKeyValue xmlns' . $post . '="http://www.w3.org/2009/xmldsig11#">' . "\r\n" .
-               self::encodeXMLParameters($curve, $pre, $options) . "\r\n" .
-               '<' . $pre . 'PublicKey>' . Strings::base64_encode($publicKey) . '</' . $pre . 'PublicKey>' . "\r\n" .
-               '</' . $pre . 'ECDSAKeyValue>';
-    }
-
-    /**
-     * Encode Parameters
-     *
-     * @param \phpseclib3\Crypt\EC\BaseCurves\Base $curve
-     * @param string $pre
-     * @param array $options optional
-     * @return string|false
-     */
-    private static function encodeXMLParameters(BaseCurve $curve, $pre, array $options = [])
-    {
-        $result = self::encodeParameters($curve, true, $options);
-
-        if (isset($result['namedCurve'])) {
-            $namedCurve = '<' . $pre . 'NamedCurve URI="urn:oid:' . self::$curveOIDs[$result['namedCurve']] . '" />';
-            return self::$rfc4050 ?
-                '<DomainParameters>' . str_replace('URI', 'URN', $namedCurve) . '</DomainParameters>' :
-                $namedCurve;
-        }
-
-        if (self::$rfc4050) {
-            $xml = '<' . $pre . 'ExplicitParams>' . "\r\n" .
-                  '<' . $pre . 'FieldParams>' . "\r\n";
-            $temp = $result['specifiedCurve'];
-            switch ($temp['fieldID']['fieldType']) {
-                case 'prime-field':
-                    $xml .= '<' . $pre . 'PrimeFieldParamsType>' . "\r\n" .
-                           '<' . $pre . 'P>' . $temp['fieldID']['parameters'] . '</' . $pre . 'P>' . "\r\n" .
-                           '</' . $pre . 'PrimeFieldParamsType>' . "\r\n";
-                    $a = $curve->getA();
-                    $b = $curve->getB();
-                    list($x, $y) = $curve->getBasePoint();
-                    break;
-                default:
-                    throw new UnsupportedCurveException('Field Type of ' . $temp['fieldID']['fieldType'] . ' is not supported');
-            }
-            $xml .= '</' . $pre . 'FieldParams>' . "\r\n" .
-                   '<' . $pre . 'CurveParamsType>' . "\r\n" .
-                   '<' . $pre . 'A>' . $a . '</' . $pre . 'A>' . "\r\n" .
-                   '<' . $pre . 'B>' . $b . '</' . $pre . 'B>' . "\r\n" .
-                   '</' . $pre . 'CurveParamsType>' . "\r\n" .
-                   '<' . $pre . 'BasePointParams>' . "\r\n" .
-                   '<' . $pre . 'BasePoint>' . "\r\n" .
-                   '<' . $pre . 'ECPointType>' . "\r\n" .
-                   '<' . $pre . 'X>' . $x . '</' . $pre . 'X>' . "\r\n" .
-                   '<' . $pre . 'Y>' . $y . '</' . $pre . 'Y>' . "\r\n" .
-                   '</' . $pre . 'ECPointType>' . "\r\n" .
-                   '</' . $pre . 'BasePoint>' . "\r\n" .
-                   '<' . $pre . 'Order>' . $curve->getOrder() . '</' . $pre . 'Order>' . "\r\n" .
-                   '</' . $pre . 'BasePointParams>' . "\r\n" .
-                   '</' . $pre . 'ExplicitParams>' . "\r\n";
-
-            return $xml;
-        }
-
-        if (isset($result['specifiedCurve'])) {
-            $xml = '<' . $pre . 'ECParameters>' . "\r\n" .
-                   '<' . $pre . 'FieldID>' . "\r\n";
-            $temp = $result['specifiedCurve'];
-            switch ($temp['fieldID']['fieldType']) {
-                case 'prime-field':
-                    $xml .= '<' . $pre . 'Prime>' . "\r\n" .
-                           '<' . $pre . 'P>' . Strings::base64_encode($temp['fieldID']['parameters']->toBytes()) . '</' . $pre . 'P>' . "\r\n" .
-                           '</' . $pre . 'Prime>' . "\r\n" ;
-                    break;
-                default:
-                    throw new UnsupportedCurveException('Field Type of ' . $temp['fieldID']['fieldType'] . ' is not supported');
-            }
-            $xml .= '</' . $pre . 'FieldID>' . "\r\n" .
-                   '<' . $pre . 'Curve>' . "\r\n" .
-                   '<' . $pre . 'A>' . Strings::base64_encode($temp['curve']['a']) . '</' . $pre . 'A>' . "\r\n" .
-                   '<' . $pre . 'B>' . Strings::base64_encode($temp['curve']['b']) . '</' . $pre . 'B>' . "\r\n" .
-                   '</' . $pre . 'Curve>' . "\r\n" .
-                   '<' . $pre . 'Base>' . Strings::base64_encode($temp['base']) . '</' . $pre . 'Base>' . "\r\n" .
-                   '<' . $pre . 'Order>' . Strings::base64_encode($temp['order']) . '</' . $pre . 'Order>' . "\r\n" .
-                   '</' . $pre . 'ECParameters>';
-            return $xml;
-        }
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Formats/Keys/libsodium.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Formats/Keys/libsodium.php
deleted file mode 100644
index 2be6ba59..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Formats/Keys/libsodium.php
+++ /dev/null
@@ -1,116 +0,0 @@
-<?php
-
-/**
- * libsodium Key Handler
- *
- * Different NaCl implementations store the key differently.
- * https://blog.mozilla.org/warner/2011/11/29/ed25519-keys/ elaborates.
- * libsodium appears to use the same format as SUPERCOP.
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2015 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\Crypt\EC\Formats\Keys;
-
-use phpseclib3\Crypt\EC\Curves\Ed25519;
-use phpseclib3\Exception\UnsupportedFormatException;
-use phpseclib3\Math\BigInteger;
-
-/**
- * libsodium Key Handler
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class libsodium
-{
-    use Common;
-
-    /**
-     * Is invisible flag
-     *
-     */
-    const IS_INVISIBLE = true;
-
-    /**
-     * Break a public or private key down into its constituent components
-     *
-     * @param string $key
-     * @param string $password optional
-     * @return array
-     */
-    public static function load($key, $password = '')
-    {
-        switch (strlen($key)) {
-            case 32:
-                $public = $key;
-                break;
-            case 64:
-                $private = substr($key, 0, 32);
-                $public = substr($key, -32);
-                break;
-            case 96:
-                $public = substr($key, -32);
-                if (substr($key, 32, 32) != $public) {
-                    throw new \RuntimeException('Keys with 96 bytes should have the 2nd and 3rd set of 32 bytes match');
-                }
-                $private = substr($key, 0, 32);
-                break;
-            default:
-                throw new \RuntimeException('libsodium keys need to either be 32 bytes long, 64 bytes long or 96 bytes long');
-        }
-
-        $curve = new Ed25519();
-        $components = ['curve' => $curve];
-        if (isset($private)) {
-            $arr = $curve->extractSecret($private);
-            $components['dA'] = $arr['dA'];
-            $components['secret'] = $arr['secret'];
-        }
-        $components['QA'] = isset($public) ?
-            self::extractPoint($public, $curve) :
-            $curve->multiplyPoint($curve->getBasePoint(), $components['dA']);
-
-        return $components;
-    }
-
-    /**
-     * Convert an EC public key to the appropriate format
-     *
-     * @param \phpseclib3\Crypt\EC\Curves\Ed25519 $curve
-     * @param \phpseclib3\Math\Common\FiniteField\Integer[] $publicKey
-     * @return string
-     */
-    public static function savePublicKey(Ed25519 $curve, array $publicKey)
-    {
-        return $curve->encodePoint($publicKey);
-    }
-
-    /**
-     * Convert a private key to the appropriate format.
-     *
-     * @param \phpseclib3\Math\BigInteger $privateKey
-     * @param \phpseclib3\Crypt\EC\Curves\Ed25519 $curve
-     * @param \phpseclib3\Math\Common\FiniteField\Integer[] $publicKey
-     * @param string $secret optional
-     * @param string $password optional
-     * @return string
-     */
-    public static function savePrivateKey(BigInteger $privateKey, Ed25519 $curve, array $publicKey, $secret = null, $password = '')
-    {
-        if (!isset($secret)) {
-            throw new \RuntimeException('Private Key does not have a secret set');
-        }
-        if (strlen($secret) != 32) {
-            throw new \RuntimeException('Private Key secret is not of the correct length');
-        }
-        if (!empty($password) && is_string($password)) {
-            throw new UnsupportedFormatException('libsodium private keys do not support encryption');
-        }
-        return $secret . $curve->encodePoint($publicKey);
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Formats/Signature/ASN1.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Formats/Signature/ASN1.php
deleted file mode 100644
index d2a80a14..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Formats/Signature/ASN1.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-
-/**
- * ASN1 Signature Handler
- *
- * PHP version 5
- *
- * Handles signatures in the format described in
- * https://tools.ietf.org/html/rfc3279#section-2.2.3
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\Crypt\EC\Formats\Signature;
-
-use phpseclib3\File\ASN1 as Encoder;
-use phpseclib3\File\ASN1\Maps\EcdsaSigValue;
-use phpseclib3\Math\BigInteger;
-
-/**
- * ASN1 Signature Handler
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class ASN1
-{
-    /**
-     * Loads a signature
-     *
-     * @param string $sig
-     * @return array
-     */
-    public static function load($sig)
-    {
-        if (!is_string($sig)) {
-            return false;
-        }
-
-        $decoded = Encoder::decodeBER($sig);
-        if (empty($decoded)) {
-            return false;
-        }
-        $components = Encoder::asn1map($decoded[0], EcdsaSigValue::MAP);
-
-        return $components;
-    }
-
-    /**
-     * Returns a signature in the appropriate format
-     *
-     * @param \phpseclib3\Math\BigInteger $r
-     * @param \phpseclib3\Math\BigInteger $s
-     * @return string
-     */
-    public static function save(BigInteger $r, BigInteger $s)
-    {
-        return Encoder::encodeDER(compact('r', 's'), EcdsaSigValue::MAP);
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Formats/Signature/IEEE.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Formats/Signature/IEEE.php
deleted file mode 100644
index 69139da4..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Formats/Signature/IEEE.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-
-/**
- * IEEE P1363 Signature Handler
- *
- * PHP version 5
- *
- * Handles signatures in the format described in
- * https://standards.ieee.org/ieee/1363/2049/ and
- * https://developer.mozilla.org/en-US/docs/Web/API/SubtleCrypto/sign#ecdsa
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\Crypt\EC\Formats\Signature;
-
-use phpseclib3\Math\BigInteger;
-
-/**
- * ASN1 Signature Handler
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class IEEE
-{
-    /**
-     * Loads a signature
-     *
-     * @param string $sig
-     * @return array
-     */
-    public static function load($sig)
-    {
-        if (!is_string($sig)) {
-            return false;
-        }
-
-        $len = strlen($sig);
-        if ($len & 1) {
-            return false;
-        }
-
-        $r = new BigInteger(substr($sig, 0, $len >> 1), 256);
-        $s = new BigInteger(substr($sig, $len >> 1), 256);
-
-        return compact('r', 's');
-    }
-
-    /**
-     * Returns a signature in the appropriate format
-     *
-     * @param \phpseclib3\Math\BigInteger $r
-     * @param \phpseclib3\Math\BigInteger $s
-     * @return string
-     */
-    public static function save(BigInteger $r, BigInteger $s)
-    {
-        $r = $r->toBytes();
-        $s = $s->toBytes();
-        $len = max(strlen($r), strlen($s));
-        return str_pad($r, $len, "\0", STR_PAD_LEFT) . str_pad($s, $len, "\0", STR_PAD_LEFT);
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Formats/Signature/Raw.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Formats/Signature/Raw.php
deleted file mode 100644
index 7e4b47fe..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Formats/Signature/Raw.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-/**
- * Raw EC Signature Handler
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\Crypt\EC\Formats\Signature;
-
-use phpseclib3\Crypt\Common\Formats\Signature\Raw as Progenitor;
-
-/**
- * Raw DSA Signature Handler
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class Raw extends Progenitor
-{
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Formats/Signature/SSH2.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Formats/Signature/SSH2.php
deleted file mode 100644
index e0644421..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Formats/Signature/SSH2.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-
-/**
- * SSH2 Signature Handler
- *
- * PHP version 5
- *
- * Handles signatures in the format used by SSH2
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\Crypt\EC\Formats\Signature;
-
-use phpseclib3\Common\Functions\Strings;
-use phpseclib3\Math\BigInteger;
-
-/**
- * SSH2 Signature Handler
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class SSH2
-{
-    /**
-     * Loads a signature
-     *
-     * @param string $sig
-     * @return mixed
-     */
-    public static function load($sig)
-    {
-        if (!is_string($sig)) {
-            return false;
-        }
-
-        $result = Strings::unpackSSH2('ss', $sig);
-        if ($result === false) {
-            return false;
-        }
-        list($type, $blob) = $result;
-        switch ($type) {
-            // see https://tools.ietf.org/html/rfc5656#section-3.1.2
-            case 'ecdsa-sha2-nistp256':
-            case 'ecdsa-sha2-nistp384':
-            case 'ecdsa-sha2-nistp521':
-                break;
-            default:
-                return false;
-        }
-
-        $result = Strings::unpackSSH2('ii', $blob);
-        if ($result === false) {
-            return false;
-        }
-
-        return [
-            'r' => $result[0],
-            's' => $result[1]
-        ];
-    }
-
-    /**
-     * Returns a signature in the appropriate format
-     *
-     * @param \phpseclib3\Math\BigInteger $r
-     * @param \phpseclib3\Math\BigInteger $s
-     * @param string $curve
-     * @return string
-     */
-    public static function save(BigInteger $r, BigInteger $s, $curve)
-    {
-        switch ($curve) {
-            case 'secp256r1':
-                $curve = 'nistp256';
-                break;
-            case 'secp384r1':
-                $curve = 'nistp384';
-                break;
-            case 'secp521r1':
-                $curve = 'nistp521';
-                break;
-            default:
-                return false;
-        }
-
-        $blob = Strings::packSSH2('ii', $r, $s);
-
-        return Strings::packSSH2('ss', 'ecdsa-sha2-' . $curve, $blob);
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Parameters.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Parameters.php
deleted file mode 100644
index c0ed64a8..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/Parameters.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-/**
- * EC Parameters
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2015 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\Crypt\EC;
-
-use phpseclib3\Crypt\EC;
-
-/**
- * EC Parameters
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-final class Parameters extends EC
-{
-    /**
-     * Returns the parameters
-     *
-     * @param string $type
-     * @param array $options optional
-     * @return string
-     */
-    public function toString($type = 'PKCS1', array $options = [])
-    {
-        $type = self::validatePlugin('Keys', 'PKCS1', 'saveParameters');
-
-        return $type::saveParameters($this->curve, $options);
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/PrivateKey.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/PrivateKey.php
deleted file mode 100644
index 59886961..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/PrivateKey.php
+++ /dev/null
@@ -1,256 +0,0 @@
-<?php
-
-/**
- * EC Private Key
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2015 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\Crypt\EC;
-
-use phpseclib3\Common\Functions\Strings;
-use phpseclib3\Crypt\Common;
-use phpseclib3\Crypt\EC;
-use phpseclib3\Crypt\EC\BaseCurves\Montgomery as MontgomeryCurve;
-use phpseclib3\Crypt\EC\BaseCurves\TwistedEdwards as TwistedEdwardsCurve;
-use phpseclib3\Crypt\EC\Curves\Curve25519;
-use phpseclib3\Crypt\EC\Curves\Ed25519;
-use phpseclib3\Crypt\EC\Formats\Keys\PKCS1;
-use phpseclib3\Crypt\EC\Formats\Signature\ASN1 as ASN1Signature;
-use phpseclib3\Crypt\Hash;
-use phpseclib3\Exception\UnsupportedOperationException;
-use phpseclib3\Math\BigInteger;
-
-/**
- * EC Private Key
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-final class PrivateKey extends EC implements Common\PrivateKey
-{
-    use Common\Traits\PasswordProtected;
-
-    /**
-     * Private Key dA
-     *
-     * sign() converts this to a BigInteger so one might wonder why this is a FiniteFieldInteger instead of
-     * a BigInteger. That's because a FiniteFieldInteger, when converted to a byte string, is null padded by
-     * a certain amount whereas a BigInteger isn't.
-     *
-     * @var object
-     */
-    protected $dA;
-
-    /**
-     * @var string
-     */
-    protected $secret;
-
-    /**
-     * Multiplies an encoded point by the private key
-     *
-     * Used by ECDH
-     *
-     * @param string $coordinates
-     * @return string
-     */
-    public function multiply($coordinates)
-    {
-        if ($this->curve instanceof MontgomeryCurve) {
-            if ($this->curve instanceof Curve25519 && self::$engines['libsodium']) {
-                return sodium_crypto_scalarmult($this->dA->toBytes(), $coordinates);
-            }
-
-            $point = [$this->curve->convertInteger(new BigInteger(strrev($coordinates), 256))];
-            $point = $this->curve->multiplyPoint($point, $this->dA);
-            return strrev($point[0]->toBytes(true));
-        }
-        if (!$this->curve instanceof TwistedEdwardsCurve) {
-            $coordinates = "\0$coordinates";
-        }
-        $point = PKCS1::extractPoint($coordinates, $this->curve);
-        $point = $this->curve->multiplyPoint($point, $this->dA);
-        if ($this->curve instanceof TwistedEdwardsCurve) {
-            return $this->curve->encodePoint($point);
-        }
-        if (empty($point)) {
-            throw new \RuntimeException('The infinity point is invalid');
-        }
-        return "\4" . $point[0]->toBytes(true) . $point[1]->toBytes(true);
-    }
-
-    /**
-     * Create a signature
-     *
-     * @see self::verify()
-     * @param string $message
-     * @return mixed
-     */
-    public function sign($message)
-    {
-        if ($this->curve instanceof MontgomeryCurve) {
-            throw new UnsupportedOperationException('Montgomery Curves cannot be used to create signatures');
-        }
-
-        $dA = $this->dA;
-        $order = $this->curve->getOrder();
-
-        $shortFormat = $this->shortFormat;
-        $format = $this->sigFormat;
-        if ($format === false) {
-            return false;
-        }
-
-        if ($this->curve instanceof TwistedEdwardsCurve) {
-            if ($this->curve instanceof Ed25519 && self::$engines['libsodium'] && !isset($this->context)) {
-                $result = sodium_crypto_sign_detached($message, $this->withPassword()->toString('libsodium'));
-                return $shortFormat == 'SSH2' ? Strings::packSSH2('ss', 'ssh-' . strtolower($this->getCurve()), $result) : $result;
-            }
-
-            // contexts (Ed25519ctx) are supported but prehashing (Ed25519ph) is not.
-            // quoting https://tools.ietf.org/html/rfc8032#section-8.5 ,
-            // "The Ed25519ph and Ed448ph variants ... SHOULD NOT be used"
-            $A = $this->curve->encodePoint($this->QA);
-            $curve = $this->curve;
-            $hash = new Hash($curve::HASH);
-
-            $secret = substr($hash->hash($this->secret), $curve::SIZE);
-
-            if ($curve instanceof Ed25519) {
-                $dom = !isset($this->context) ? '' :
-                    'SigEd25519 no Ed25519 collisions' . "\0" . chr(strlen($this->context)) . $this->context;
-            } else {
-                $context = isset($this->context) ? $this->context : '';
-                $dom = 'SigEd448' . "\0" . chr(strlen($context)) . $context;
-            }
-            // SHA-512(dom2(F, C) || prefix || PH(M))
-            $r = $hash->hash($dom . $secret . $message);
-            $r = strrev($r);
-            $r = new BigInteger($r, 256);
-            list(, $r) = $r->divide($order);
-            $R = $curve->multiplyPoint($curve->getBasePoint(), $r);
-            $R = $curve->encodePoint($R);
-            $k = $hash->hash($dom . $R . $A . $message);
-            $k = strrev($k);
-            $k = new BigInteger($k, 256);
-            list(, $k) = $k->divide($order);
-            $S = $k->multiply($dA)->add($r);
-            list(, $S) = $S->divide($order);
-            $S = str_pad(strrev($S->toBytes()), $curve::SIZE, "\0");
-            return $shortFormat == 'SSH2' ? Strings::packSSH2('ss', 'ssh-' . strtolower($this->getCurve()), $R . $S) : $R . $S;
-        }
-
-        if (self::$engines['OpenSSL'] && in_array($this->hash->getHash(), openssl_get_md_methods())) {
-            $signature = '';
-            // altho PHP's OpenSSL bindings only supported EC key creation in PHP 7.1 they've long
-            // supported signing / verification
-            // we use specified curves to avoid issues with OpenSSL possibly not supporting a given named curve;
-            // doing this may mean some curve-specific optimizations can't be used but idk if OpenSSL even
-            // has curve-specific optimizations
-            $result = openssl_sign($message, $signature, $this->withPassword()->toString('PKCS8', ['namedCurve' => false]), $this->hash->getHash());
-
-            if ($result) {
-                if ($shortFormat == 'ASN1') {
-                    return $signature;
-                }
-
-                extract(ASN1Signature::load($signature));
-
-                return $shortFormat == 'SSH2' ? $format::save($r, $s, $this->getCurve()) : $format::save($r, $s);
-            }
-        }
-
-        $e = $this->hash->hash($message);
-        $e = new BigInteger($e, 256);
-
-        $Ln = $this->hash->getLength() - $order->getLength();
-        $z = $Ln > 0 ? $e->bitwise_rightShift($Ln) : $e;
-
-        while (true) {
-            $k = BigInteger::randomRange(self::$one, $order->subtract(self::$one));
-            list($x, $y) = $this->curve->multiplyPoint($this->curve->getBasePoint(), $k);
-            $x = $x->toBigInteger();
-            list(, $r) = $x->divide($order);
-            if ($r->equals(self::$zero)) {
-                continue;
-            }
-            $kinv = $k->modInverse($order);
-            $temp = $z->add($dA->multiply($r));
-            $temp = $kinv->multiply($temp);
-            list(, $s) = $temp->divide($order);
-            if (!$s->equals(self::$zero)) {
-                break;
-            }
-        }
-
-        // the following is an RFC6979 compliant implementation of deterministic ECDSA
-        // it's unused because it's mainly intended for use when a good CSPRNG isn't
-        // available. if phpseclib's CSPRNG isn't good then even key generation is
-        // suspect
-        /*
-        // if this were actually being used it'd probably be better if this lived in load() and createKey()
-        $this->q = $this->curve->getOrder();
-        $dA = $this->dA->toBigInteger();
-        $this->x = $dA;
-
-        $h1 = $this->hash->hash($message);
-        $k = $this->computek($h1);
-        list($x, $y) = $this->curve->multiplyPoint($this->curve->getBasePoint(), $k);
-        $x = $x->toBigInteger();
-        list(, $r) = $x->divide($this->q);
-        $kinv = $k->modInverse($this->q);
-        $h1 = $this->bits2int($h1);
-        $temp = $h1->add($dA->multiply($r));
-        $temp = $kinv->multiply($temp);
-        list(, $s) = $temp->divide($this->q);
-        */
-
-        return $shortFormat == 'SSH2' ? $format::save($r, $s, $this->getCurve()) : $format::save($r, $s);
-    }
-
-    /**
-     * Returns the private key
-     *
-     * @param string $type
-     * @param array $options optional
-     * @return string
-     */
-    public function toString($type, array $options = [])
-    {
-        $type = self::validatePlugin('Keys', $type, 'savePrivateKey');
-
-        return $type::savePrivateKey($this->dA, $this->curve, $this->QA, $this->secret, $this->password, $options);
-    }
-
-    /**
-     * Returns the public key
-     *
-     * @see self::getPrivateKey()
-     * @return mixed
-     */
-    public function getPublicKey()
-    {
-        $format = 'PKCS8';
-        if ($this->curve instanceof MontgomeryCurve) {
-            $format = 'MontgomeryPublic';
-        }
-
-        $type = self::validatePlugin('Keys', $format, 'savePublicKey');
-
-        $key = $type::savePublicKey($this->curve, $this->QA);
-        $key = EC::loadFormat($format, $key);
-        if ($this->curve instanceof MontgomeryCurve) {
-            return $key;
-        }
-        $key = $key
-            ->withHash($this->hash->getHash())
-            ->withSignatureFormat($this->shortFormat);
-        if ($this->curve instanceof TwistedEdwardsCurve) {
-            $key = $key->withContext($this->context);
-        }
-        return $key;
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/PublicKey.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/PublicKey.php
deleted file mode 100644
index 4558ce34..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/EC/PublicKey.php
+++ /dev/null
@@ -1,172 +0,0 @@
-<?php
-
-/**
- * EC Public Key
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2015 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\Crypt\EC;
-
-use phpseclib3\Common\Functions\Strings;
-use phpseclib3\Crypt\Common;
-use phpseclib3\Crypt\EC;
-use phpseclib3\Crypt\EC\BaseCurves\Montgomery as MontgomeryCurve;
-use phpseclib3\Crypt\EC\BaseCurves\TwistedEdwards as TwistedEdwardsCurve;
-use phpseclib3\Crypt\EC\Curves\Ed25519;
-use phpseclib3\Crypt\EC\Formats\Keys\PKCS1;
-use phpseclib3\Crypt\EC\Formats\Signature\ASN1 as ASN1Signature;
-use phpseclib3\Crypt\Hash;
-use phpseclib3\Exception\UnsupportedOperationException;
-use phpseclib3\Math\BigInteger;
-
-/**
- * EC Public Key
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-final class PublicKey extends EC implements Common\PublicKey
-{
-    use Common\Traits\Fingerprint;
-
-    /**
-     * Verify a signature
-     *
-     * @see self::verify()
-     * @param string $message
-     * @param string $signature
-     * @return mixed
-     */
-    public function verify($message, $signature)
-    {
-        if ($this->curve instanceof MontgomeryCurve) {
-            throw new UnsupportedOperationException('Montgomery Curves cannot be used to create signatures');
-        }
-
-        $shortFormat = $this->shortFormat;
-        $format = $this->sigFormat;
-        if ($format === false) {
-            return false;
-        }
-
-        $order = $this->curve->getOrder();
-
-        if ($this->curve instanceof TwistedEdwardsCurve) {
-            if ($shortFormat == 'SSH2') {
-                list(, $signature) = Strings::unpackSSH2('ss', $signature);
-            }
-
-            if ($this->curve instanceof Ed25519 && self::$engines['libsodium'] && !isset($this->context)) {
-                return sodium_crypto_sign_verify_detached($signature, $message, $this->toString('libsodium'));
-            }
-
-            $curve = $this->curve;
-            if (strlen($signature) != 2 * $curve::SIZE) {
-                return false;
-            }
-
-            $R = substr($signature, 0, $curve::SIZE);
-            $S = substr($signature, $curve::SIZE);
-
-            try {
-                $R = PKCS1::extractPoint($R, $curve);
-                $R = $this->curve->convertToInternal($R);
-            } catch (\Exception $e) {
-                return false;
-            }
-
-            $S = strrev($S);
-            $S = new BigInteger($S, 256);
-
-            if ($S->compare($order) >= 0) {
-                return false;
-            }
-
-            $A = $curve->encodePoint($this->QA);
-
-            if ($curve instanceof Ed25519) {
-                $dom2 = !isset($this->context) ? '' :
-                    'SigEd25519 no Ed25519 collisions' . "\0" . chr(strlen($this->context)) . $this->context;
-            } else {
-                $context = isset($this->context) ? $this->context : '';
-                $dom2 = 'SigEd448' . "\0" . chr(strlen($context)) . $context;
-            }
-
-            $hash = new Hash($curve::HASH);
-            $k = $hash->hash($dom2 . substr($signature, 0, $curve::SIZE) . $A . $message);
-            $k = strrev($k);
-            $k = new BigInteger($k, 256);
-            list(, $k) = $k->divide($order);
-
-            $qa = $curve->convertToInternal($this->QA);
-
-            $lhs = $curve->multiplyPoint($curve->getBasePoint(), $S);
-            $rhs = $curve->multiplyPoint($qa, $k);
-            $rhs = $curve->addPoint($rhs, $R);
-            $rhs = $curve->convertToAffine($rhs);
-
-            return $lhs[0]->equals($rhs[0]) && $lhs[1]->equals($rhs[1]);
-        }
-
-        $params = $format::load($signature);
-        if ($params === false || count($params) != 2) {
-            return false;
-        }
-        extract($params);
-
-        if (self::$engines['OpenSSL'] && in_array($this->hash->getHash(), openssl_get_md_methods())) {
-            $sig = $format != 'ASN1' ? ASN1Signature::save($r, $s) : $signature;
-
-            $result = openssl_verify($message, $sig, $this->toString('PKCS8', ['namedCurve' => false]), $this->hash->getHash());
-
-            if ($result != -1) {
-                return (bool) $result;
-            }
-        }
-
-        $n_1 = $order->subtract(self::$one);
-        if (!$r->between(self::$one, $n_1) || !$s->between(self::$one, $n_1)) {
-            return false;
-        }
-
-        $e = $this->hash->hash($message);
-        $e = new BigInteger($e, 256);
-
-        $Ln = $this->hash->getLength() - $order->getLength();
-        $z = $Ln > 0 ? $e->bitwise_rightShift($Ln) : $e;
-
-        $w = $s->modInverse($order);
-        list(, $u1) = $z->multiply($w)->divide($order);
-        list(, $u2) = $r->multiply($w)->divide($order);
-
-        $u1 = $this->curve->convertInteger($u1);
-        $u2 = $this->curve->convertInteger($u2);
-
-        list($x1, $y1) = $this->curve->multiplyAddPoints(
-            [$this->curve->getBasePoint(), $this->QA],
-            [$u1, $u2]
-        );
-
-        $x1 = $x1->toBigInteger();
-        list(, $x1) = $x1->divide($order);
-
-        return $x1->equals($r);
-    }
-
-    /**
-     * Returns the public key
-     *
-     * @param string $type
-     * @param array $options optional
-     * @return string
-     */
-    public function toString($type, array $options = [])
-    {
-        $type = self::validatePlugin('Keys', $type, 'savePublicKey');
-
-        return $type::savePublicKey($this->curve, $this->QA, $options);
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/Hash.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/Hash.php
index 0e02544e..07665a16 100644
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/Hash.php
+++ b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/Hash.php
@@ -1,19 +1,26 @@
 <?php
 
 /**
- * Wrapper around hash() and hash_hmac() functions supporting truncated hashes
- * such as sha256-96.  Any hash algorithm returned by hash_algos() (and
- * truncated versions thereof) are supported.
+ * Pure-PHP implementations of keyed-hash message authentication codes (HMACs) and various cryptographic hashing functions.
  *
- * If {@link self::setKey() setKey()} is called, {@link self::hash() hash()} will
- * return the HMAC as opposed to the hash.
+ * Uses hash() or mhash() if available and an internal implementation, otherwise.  Currently supports the following:
+ *
+ * md2, md5, md5-96, sha1, sha1-96, sha256, sha256-96, sha384, and sha512, sha512-96
+ *
+ * If {@link self::setKey() setKey()} is called, {@link self::hash() hash()} will return the HMAC as opposed to
+ * the hash.  If no valid algorithm is provided, sha1 will be used.
+ *
+ * PHP version 5
+ *
+ * {@internal The variable names are the same as those in
+ * {@link http://tools.ietf.org/html/rfc2104#section-2 RFC2104}.}}
  *
  * Here's a short example of how to use this library:
  * <code>
  * <?php
  *    include 'vendor/autoload.php';
  *
- *    $hash = new \phpseclib3\Crypt\Hash('sha512');
+ *    $hash = new \phpseclib\Crypt\Hash('sha1');
  *
  *    $hash->setKey('abcdefg');
  *
@@ -21,186 +28,130 @@
  * ?>
  * </code>
  *
+ * @category  Crypt
+ * @package   Hash
  * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2015 Jim Wigginton
- * @author    Andreas Fischer <bantu@phpbb.com>
- * @copyright 2015 Andreas Fischer
+ * @copyright 2007 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
  * @link      http://phpseclib.sourceforge.net
  */
 
-namespace phpseclib3\Crypt;
+namespace phpseclib\Crypt;
 
-use phpseclib3\Common\Functions\Strings;
-use phpseclib3\Exception\InsufficientSetupException;
-use phpseclib3\Exception\UnsupportedAlgorithmException;
-use phpseclib3\Math\BigInteger;
-use phpseclib3\Math\PrimeField;
+use phpseclib\Math\BigInteger;
 
 /**
+ * Pure-PHP implementations of keyed-hash message authentication codes (HMACs) and various cryptographic hashing functions.
+ *
+ * @package Hash
  * @author  Jim Wigginton <terrafrost@php.net>
- * @author  Andreas Fischer <bantu@phpbb.com>
+ * @access  public
  */
 class Hash
 {
-    /**
-     * Padding Types
-     *
+    /**#@+
+     * @access private
+     * @see \phpseclib\Crypt\Hash::__construct()
      */
-    const PADDING_KECCAK = 1;
-
     /**
-     * Padding Types
-     *
+     * Toggles the internal implementation
      */
-    const PADDING_SHA3 = 2;
-
+    const MODE_INTERNAL = 1;
     /**
-     * Padding Types
-     *
+     * Toggles the mhash() implementation, which has been deprecated on PHP 5.3.0+.
      */
-    const PADDING_SHAKE = 3;
-
+    const MODE_MHASH = 2;
     /**
-     * Padding Type
-     *
-     * Only used by SHA3
-     *
-     * @var int
+     * Toggles the hash() implementation, which works on PHP 5.1.2+.
      */
-    private $paddingType = 0;
+    const MODE_HASH = 3;
+    /**#@-*/
 
     /**
      * Hash Parameter
      *
      * @see self::setHash()
      * @var int
+     * @access private
      */
-    private $hashParam;
+    var $hashParam;
+
+    /**
+     * Byte-length of compression blocks / key (Internal HMAC)
+     *
+     * @see self::setAlgorithm()
+     * @var int
+     * @access private
+     */
+    var $b;
 
     /**
      * Byte-length of hash output (Internal HMAC)
      *
      * @see self::setHash()
      * @var int
+     * @access private
      */
-    private $length;
+    var $l = false;
 
     /**
      * Hash Algorithm
      *
      * @see self::setHash()
      * @var string
+     * @access private
      */
-    private $algo;
+    var $hash;
 
     /**
      * Key
      *
      * @see self::setKey()
      * @var string
+     * @access private
      */
-    private $key = false;
-
-    /**
-     * Nonce
-     *
-     * @see self::setNonce()
-     * @var string
-     */
-    private $nonce = false;
-
-    /**
-     * Hash Parameters
-     *
-     * @var array
-     */
-    private $parameters = [];
-
-    /**
-     * Computed Key
-     *
-     * @see self::_computeKey()
-     * @var string
-     */
-    private $computedKey = false;
+    var $key = false;
 
     /**
      * Outer XOR (Internal HMAC)
      *
-     * Used only for sha512/*
-     *
-     * @see self::hash()
+     * @see self::setKey()
      * @var string
+     * @access private
      */
-    private $opad;
+    var $opad;
 
     /**
      * Inner XOR (Internal HMAC)
      *
-     * Used only for sha512/*
-     *
-     * @see self::hash()
+     * @see self::setKey()
      * @var string
+     * @access private
      */
-    private $ipad;
-
-    /**
-     * Recompute AES Key
-     *
-     * Used only for umac
-     *
-     * @see self::hash()
-     * @var boolean
-     */
-    private $recomputeAESKey;
-
-    /**
-     * umac cipher object
-     *
-     * @see self::hash()
-     * @var \phpseclib3\Crypt\AES
-     */
-    private $c;
-
-    /**
-     * umac pad
-     *
-     * @see self::hash()
-     * @var string
-     */
-    private $pad;
-
-    /**
-     * Block Size
-     *
-     * @var int
-     */
-    private $blockSize;
-
-    /**#@+
-     * UMAC variables
-     *
-     * @var PrimeField
-     */
-    private static $factory36;
-    private static $factory64;
-    private static $factory128;
-    private static $offset64;
-    private static $offset128;
-    private static $marker64;
-    private static $marker128;
-    private static $maxwordrange64;
-    private static $maxwordrange128;
-    /**#@-*/
+    var $ipad;
 
     /**
      * Default Constructor.
      *
      * @param string $hash
+     * @return \phpseclib\Crypt\Hash
+     * @access public
      */
-    public function __construct($hash = 'sha256')
+    function __construct($hash = 'sha1')
     {
+        if (!defined('CRYPT_HASH_MODE')) {
+            switch (true) {
+                case extension_loaded('hash'):
+                    define('CRYPT_HASH_MODE', self::MODE_HASH);
+                    break;
+                case extension_loaded('mhash'):
+                    define('CRYPT_HASH_MODE', self::MODE_MHASH);
+                    break;
+                default:
+                    define('CRYPT_HASH_MODE', self::MODE_INTERNAL);
+            }
+        }
+
         $this->setHash($hash);
     }
 
@@ -209,61 +160,12 @@ class Hash
      *
      * Keys can be of any length.
      *
+     * @access public
      * @param string $key
      */
-    public function setKey($key = false)
+    function setKey($key = false)
     {
         $this->key = $key;
-        $this->computeKey();
-        $this->recomputeAESKey = true;
-    }
-
-    /**
-     * Sets the nonce for UMACs
-     *
-     * Keys can be of any length.
-     *
-     * @param string $nonce
-     */
-    public function setNonce($nonce = false)
-    {
-        switch (true) {
-            case !is_string($nonce):
-            case strlen($nonce) > 0 && strlen($nonce) <= 16:
-                $this->recomputeAESKey = true;
-                $this->nonce = $nonce;
-                return;
-        }
-
-        throw new \LengthException('The nonce length must be between 1 and 16 bytes, inclusive');
-    }
-
-    /**
-     * Pre-compute the key used by the HMAC
-     *
-     * Quoting http://tools.ietf.org/html/rfc2104#section-2, "Applications that use keys longer than B bytes
-     * will first hash the key using H and then use the resultant L byte string as the actual key to HMAC."
-     *
-     * As documented in https://www.reddit.com/r/PHP/comments/9nct2l/symfonypolyfill_hash_pbkdf2_correct_fix_for/
-     * when doing an HMAC multiple times it's faster to compute the hash once instead of computing it during
-     * every call
-     *
-     */
-    private function computeKey()
-    {
-        if ($this->key === false) {
-            $this->computedKey = false;
-            return;
-        }
-
-        if (strlen($this->key) <= $this->getBlockLengthInBytes()) {
-            $this->computedKey = $this->key;
-            return;
-        }
-
-        $this->computedKey = is_array($this->algo) ?
-            call_user_func($this->algo, $this->key) :
-            hash($this->algo, $this->key, true);
     }
 
     /**
@@ -271,9 +173,10 @@ class Hash
      *
      * As set by the constructor or by the setHash() method.
      *
+     * @access public
      * @return string
      */
-    public function getHash()
+    function getHash()
     {
         return $this->hashParam;
     }
@@ -281,1027 +184,408 @@ class Hash
     /**
      * Sets the hash function.
      *
+     * @access public
      * @param string $hash
      */
-    public function setHash($hash)
+    function setHash($hash)
     {
         $this->hashParam = $hash = strtolower($hash);
         switch ($hash) {
-            case 'umac-32':
-            case 'umac-64':
-            case 'umac-96':
-            case 'umac-128':
-                $this->blockSize = 128;
-                $this->length = abs(substr($hash, -3)) >> 3;
-                $this->algo = 'umac';
-                return;
-            case 'md2-96':
             case 'md5-96':
             case 'sha1-96':
-            case 'sha224-96':
             case 'sha256-96':
-            case 'sha384-96':
             case 'sha512-96':
-            case 'sha512/224-96':
-            case 'sha512/256-96':
                 $hash = substr($hash, 0, -3);
-                $this->length = 12; // 96 / 8 = 12
+                $this->l = 12; // 96 / 8 = 12
                 break;
             case 'md2':
             case 'md5':
-                $this->length = 16;
+                $this->l = 16;
                 break;
             case 'sha1':
-                $this->length = 20;
+                $this->l = 20;
                 break;
-            case 'sha224':
-            case 'sha512/224':
-            case 'sha3-224':
-                $this->length = 28;
-                break;
-            case 'keccak256':
-                $this->paddingType = self::PADDING_KECCAK;
-                // fall-through
             case 'sha256':
-            case 'sha512/256':
-            case 'sha3-256':
-                $this->length = 32;
+                $this->l = 32;
                 break;
             case 'sha384':
-            case 'sha3-384':
-                $this->length = 48;
+                $this->l = 48;
                 break;
             case 'sha512':
-            case 'sha3-512':
-                $this->length = 64;
-                break;
-            default:
-                if (preg_match('#^(shake(?:128|256))-(\d+)$#', $hash, $matches)) {
-                    $this->paddingType = self::PADDING_SHAKE;
-                    $hash = $matches[1];
-                    $this->length = $matches[2] >> 3;
-                } else {
-                    throw new UnsupportedAlgorithmException(
-                        "$hash is not a supported algorithm"
-                    );
-                }
+                $this->l = 64;
         }
 
         switch ($hash) {
             case 'md2':
-            case 'md2-96':
-                $this->blockSize = 128;
+                $mode = CRYPT_HASH_MODE == self::MODE_HASH && in_array('md2', hash_algos()) ?
+                    self::MODE_HASH : self::MODE_INTERNAL;
                 break;
-            case 'md5-96':
-            case 'sha1-96':
-            case 'sha224-96':
-            case 'sha256-96':
-            case 'md5':
-            case 'sha1':
-            case 'sha224':
-            case 'sha256':
-                $this->blockSize = 512;
-                break;
-            case 'sha3-224':
-                $this->blockSize = 1152; // 1600 - 2*224
-                break;
-            case 'sha3-256':
-            case 'shake256':
-            case 'keccak256':
-                $this->blockSize = 1088; // 1600 - 2*256
-                break;
-            case 'sha3-384':
-                $this->blockSize = 832; // 1600 - 2*384
-                break;
-            case 'sha3-512':
-                $this->blockSize = 576; // 1600 - 2*512
-                break;
-            case 'shake128':
-                $this->blockSize = 1344; // 1600 - 2*128
+            case 'sha384':
+            case 'sha512':
+                $mode = CRYPT_HASH_MODE == self::MODE_MHASH ? self::MODE_INTERNAL : CRYPT_HASH_MODE;
                 break;
             default:
-                $this->blockSize = 1024;
+                $mode = CRYPT_HASH_MODE;
         }
 
-        if (in_array(substr($hash, 0, 5), ['sha3-', 'shake', 'kecca'])) {
-            // PHP 7.1.0 introduced support for "SHA3 fixed mode algorithms":
-            // http://php.net/ChangeLog-7.php#7.1.0
-            if (version_compare(PHP_VERSION, '7.1.0') < 0 || substr($hash, 0, 5) != 'sha3-') {
-                //preg_match('#(\d+)$#', $hash, $matches);
-                //$this->parameters['capacity'] = 2 * $matches[1]; // 1600 - $this->blockSize
-                //$this->parameters['rate'] = 1600 - $this->parameters['capacity']; // == $this->blockSize
-                if (!$this->paddingType) {
-                    $this->paddingType = self::PADDING_SHA3;
+        switch ($mode) {
+            case self::MODE_MHASH:
+                switch ($hash) {
+                    case 'md5':
+                        $this->hash = MHASH_MD5;
+                        break;
+                    case 'sha256':
+                        $this->hash = MHASH_SHA256;
+                        break;
+                    case 'sha1':
+                    default:
+                        $this->hash = MHASH_SHA1;
                 }
-                $this->parameters = [
-                    'capacity' => 1600 - $this->blockSize,
-                    'rate' => $this->blockSize,
-                    'length' => $this->length,
-                    'padding' => $this->paddingType
-                ];
-                $hash = ['phpseclib3\Crypt\Hash', PHP_INT_SIZE == 8 ? 'sha3_64' : 'sha3_32'];
-            }
-        }
-
-        if ($hash == 'sha512/224' || $hash == 'sha512/256') {
-            // PHP 7.1.0 introduced sha512/224 and sha512/256 support:
-            // http://php.net/ChangeLog-7.php#7.1.0
-            if (version_compare(PHP_VERSION, '7.1.0') < 0) {
-                // from http://csrc.nist.gov/publications/fips/fips180-4/fips-180-4.pdf#page=24
-                $initial = $hash == 'sha512/256' ?
-                    [
-                        '22312194FC2BF72C', '9F555FA3C84C64C2', '2393B86B6F53B151', '963877195940EABD',
-                        '96283EE2A88EFFE3', 'BE5E1E2553863992', '2B0199FC2C85B8AA', '0EB72DDC81C52CA2'
-                    ] :
-                    [
-                        '8C3D37C819544DA2', '73E1996689DCD4D6', '1DFAB7AE32FF9C82', '679DD514582F9FCF',
-                        '0F6D2B697BD44DA8', '77E36F7304C48942', '3F9D85A86A1D36C8', '1112E6AD91D692A1'
-                    ];
-                for ($i = 0; $i < 8; $i++) {
-                    $initial[$i] = new BigInteger($initial[$i], 16);
-                    $initial[$i]->setPrecision(64);
+                return;
+            case self::MODE_HASH:
+                switch ($hash) {
+                    case 'md5':
+                        $this->hash = 'md5';
+                        return;
+                    case 'md2':
+                    case 'sha256':
+                    case 'sha384':
+                    case 'sha512':
+                        $this->hash = $hash;
+                        return;
+                    case 'sha1':
+                    default:
+                        $this->hash = 'sha1';
                 }
-
-                $this->parameters = compact('initial');
-
-                $hash = ['phpseclib3\Crypt\Hash', 'sha512'];
-            }
+                return;
         }
 
-        if (is_array($hash)) {
-            $b = $this->blockSize >> 3;
-            $this->ipad = str_repeat(chr(0x36), $b);
-            $this->opad = str_repeat(chr(0x5C), $b);
+        switch ($hash) {
+            case 'md2':
+                $this->b = 16;
+                $this->hash = array($this, '_md2');
+                break;
+            case 'md5':
+                $this->b = 64;
+                $this->hash = array($this, '_md5');
+                break;
+            case 'sha256':
+                $this->b = 64;
+                $this->hash = array($this, '_sha256');
+                break;
+            case 'sha384':
+            case 'sha512':
+                $this->b = 128;
+                $this->hash = array($this, '_sha512');
+                break;
+            case 'sha1':
+            default:
+                $this->b = 64;
+                $this->hash = array($this, '_sha1');
         }
 
-        $this->algo = $hash;
-
-        $this->computeKey();
+        $this->ipad = str_repeat(chr(0x36), $this->b);
+        $this->opad = str_repeat(chr(0x5C), $this->b);
     }
 
     /**
-     * KDF: Key-Derivation Function
-     *
-     * The key-derivation function generates pseudorandom bits used to key the hash functions.
-     *
-     * @param int $index a non-negative integer less than 2^64
-     * @param int $numbytes a non-negative integer less than 2^64
-     * @return string string of length numbytes bytes
-     */
-    private function kdf($index, $numbytes)
-    {
-        $this->c->setIV(pack('N4', 0, $index, 0, 1));
-
-        return $this->c->encrypt(str_repeat("\0", $numbytes));
-    }
-
-    /**
-     * PDF Algorithm
-     *
-     * @return string string of length taglen bytes.
-     */
-    private function pdf()
-    {
-        $k = $this->key;
-        $nonce = $this->nonce;
-        $taglen = $this->length;
-
-        //
-        // Extract and zero low bit(s) of Nonce if needed
-        //
-        if ($taglen <= 8) {
-            $last = strlen($nonce) - 1;
-            $mask = $taglen == 4 ? "\3" : "\1";
-            $index = $nonce[$last] & $mask;
-            $nonce[$last] = $nonce[$last] ^ $index;
-        }
-
-        //
-        // Make Nonce BLOCKLEN bytes by appending zeroes if needed
-        //
-        $nonce = str_pad($nonce, 16, "\0");
-
-        //
-        // Generate subkey, encipher and extract indexed substring
-        //
-        $kp = $this->kdf(0, 16);
-        $c = new AES('ctr');
-        $c->disablePadding();
-        $c->setKey($kp);
-        $c->setIV($nonce);
-        $t = $c->encrypt("\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0");
-
-        // we could use ord() but per https://paragonie.com/blog/2016/06/constant-time-encoding-boring-cryptography-rfc-4648-and-you
-        // unpack() doesn't leak timing info
-        return $taglen <= 8 ?
-            substr($t, unpack('C', $index)[1] * $taglen, $taglen) :
-            substr($t, 0, $taglen);
-    }
-
-    /**
-     * UHASH Algorithm
-     *
-     * @param string $m string of length less than 2^67 bits.
-     * @param int $taglen the integer 4, 8, 12 or 16.
-     * @return string string of length taglen bytes.
-     */
-    private function uhash($m, $taglen)
-    {
-        //
-        // One internal iteration per 4 bytes of output
-        //
-        $iters = $taglen >> 2;
-
-        //
-        // Define total key needed for all iterations using KDF.
-        // L1Key reuses most key material between iterations.
-        //
-        //$L1Key  = $this->kdf(1, 1024 + ($iters - 1) * 16);
-        $L1Key  = $this->kdf(1, (1024 + ($iters - 1)) * 16);
-        $L2Key  = $this->kdf(2, $iters * 24);
-        $L3Key1 = $this->kdf(3, $iters * 64);
-        $L3Key2 = $this->kdf(4, $iters * 4);
-
-        //
-        // For each iteration, extract key and do three-layer hash.
-        // If bytelength(M) <= 1024, then skip L2-HASH.
-        //
-        $y = '';
-        for ($i = 0; $i < $iters; $i++) {
-            $L1Key_i  = substr($L1Key, $i * 16, 1024);
-            $L2Key_i  = substr($L2Key, $i * 24, 24);
-            $L3Key1_i = substr($L3Key1, $i * 64, 64);
-            $L3Key2_i = substr($L3Key2, $i * 4, 4);
-
-            $a = self::L1Hash($L1Key_i, $m);
-            $b = strlen($m) <= 1024 ? "\0\0\0\0\0\0\0\0$a" : self::L2Hash($L2Key_i, $a);
-            $c = self::L3Hash($L3Key1_i, $L3Key2_i, $b);
-            $y .= $c;
-        }
-
-        return $y;
-    }
-
-    /**
-     * L1-HASH Algorithm
-     *
-     * The first-layer hash breaks the message into 1024-byte chunks and
-     * hashes each with a function called NH.  Concatenating the results
-     * forms a string, which is up to 128 times shorter than the original.
-     *
-     * @param string $k string of length 1024 bytes.
-     * @param string $m string of length less than 2^67 bits.
-     * @return string string of length (8 * ceil(bitlength(M)/8192)) bytes.
-     */
-    private static function L1Hash($k, $m)
-    {
-        //
-        // Break M into 1024 byte chunks (final chunk may be shorter)
-        //
-        $m = str_split($m, 1024);
-
-        //
-        // For each chunk, except the last: endian-adjust, NH hash
-        // and add bit-length.  Use results to build Y.
-        //
-        $length = new BigInteger(1024 * 8);
-        $y = '';
-        for ($i = 0; $i < count($m) - 1; $i++) {
-            $m[$i] = pack('N*', ...unpack('V*', $m[$i])); // ENDIAN-SWAP
-            $y .= static::nh($k, $m[$i], $length);
-        }
-
-        //
-        // For the last chunk: pad to 32-byte boundary, endian-adjust,
-        // NH hash and add bit-length.  Concatenate the result to Y.
-        //
-        $length = count($m) ? strlen($m[$i]) : 0;
-        $pad = 32 - ($length % 32);
-        $pad = max(32, $length + $pad % 32);
-        $m[$i] = str_pad(isset($m[$i]) ? $m[$i] : '', $pad, "\0"); // zeropad
-        $m[$i] = pack('N*', ...unpack('V*', $m[$i])); // ENDIAN-SWAP
-
-        $y .= static::nh($k, $m[$i], new BigInteger($length * 8));
-
-        return $y;
-    }
-
-    /**
-     * NH Algorithm
-     *
-     * @param string $k string of length 1024 bytes.
-     * @param string $m string with length divisible by 32 bytes.
-     * @return string string of length 8 bytes.
-     */
-    private static function nh($k, $m, $length)
-    {
-        $toUInt32 = function ($x) {
-            $x = new BigInteger($x, 256);
-            $x->setPrecision(32);
-            return $x;
-        };
-
-        //
-        // Break M and K into 4-byte chunks
-        //
-        //$t = strlen($m) >> 2;
-        $m = str_split($m, 4);
-        $t = count($m);
-        $k = str_split($k, 4);
-        $k = array_pad(array_slice($k, 0, $t), $t, 0);
-
-        $m = array_map($toUInt32, $m);
-        $k = array_map($toUInt32, $k);
-
-        //
-        // Perform NH hash on the chunks, pairing words for multiplication
-        // which are 4 apart to accommodate vector-parallelism.
-        //
-        $y = new BigInteger();
-        $y->setPrecision(64);
-        $i = 0;
-        while ($i < $t) {
-            $temp = $m[$i]->add($k[$i]);
-            $temp->setPrecision(64);
-            $temp = $temp->multiply($m[$i + 4]->add($k[$i + 4]));
-            $y = $y->add($temp);
-
-            $temp = $m[$i + 1]->add($k[$i + 1]);
-            $temp->setPrecision(64);
-            $temp = $temp->multiply($m[$i + 5]->add($k[$i + 5]));
-            $y = $y->add($temp);
-
-            $temp = $m[$i + 2]->add($k[$i + 2]);
-            $temp->setPrecision(64);
-            $temp = $temp->multiply($m[$i + 6]->add($k[$i + 6]));
-            $y = $y->add($temp);
-
-            $temp = $m[$i + 3]->add($k[$i + 3]);
-            $temp->setPrecision(64);
-            $temp = $temp->multiply($m[$i + 7]->add($k[$i + 7]));
-            $y = $y->add($temp);
-
-            $i += 8;
-        }
-
-        return $y->add($length)->toBytes();
-    }
-
-    /**
-     * L2-HASH: Second-Layer Hash
-     *
-     * The second-layer rehashes the L1-HASH output using a polynomial hash
-     * called POLY.  If the L1-HASH output is long, then POLY is called once
-     * on a prefix of the L1-HASH output and called using different settings
-     * on the remainder.  (This two-step hashing of the L1-HASH output is
-     * needed only if the message length is greater than 16 megabytes.)
-     * Careful implementation of POLY is necessary to avoid a possible
-     * timing attack (see Section 6.6 for more information).
-     *
-     * @param string $k string of length 24 bytes.
-     * @param string $m string of length less than 2^64 bytes.
-     * @return string string of length 16 bytes.
-     */
-    private static function L2Hash($k, $m)
-    {
-        //
-        //  Extract keys and restrict to special key-sets
-        //
-        $k64 = $k & "\x01\xFF\xFF\xFF\x01\xFF\xFF\xFF";
-        $k64 = new BigInteger($k64, 256);
-        $k128 = substr($k, 8) & "\x01\xFF\xFF\xFF\x01\xFF\xFF\xFF\x01\xFF\xFF\xFF\x01\xFF\xFF\xFF";
-        $k128 = new BigInteger($k128, 256);
-
-        //
-        // If M is no more than 2^17 bytes, hash under 64-bit prime,
-        // otherwise, hash first 2^17 bytes under 64-bit prime and
-        // remainder under 128-bit prime.
-        //
-        if (strlen($m) <= 0x20000) { // 2^14 64-bit words
-            $y = self::poly(64, self::$maxwordrange64, $k64, $m);
-        } else {
-            $m_1 = substr($m, 0, 0x20000); // 1 << 17
-            $m_2 = substr($m, 0x20000) . "\x80";
-            $length = strlen($m_2);
-            $pad = 16 - ($length % 16);
-            $pad %= 16;
-            $m_2 = str_pad($m_2, $length + $pad, "\0"); // zeropad
-            $y = self::poly(64, self::$maxwordrange64, $k64, $m_1);
-            $y = str_pad($y, 16, "\0", STR_PAD_LEFT);
-            $y = self::poly(128, self::$maxwordrange128, $k128, $y . $m_2);
-        }
-
-        return str_pad($y, 16, "\0", STR_PAD_LEFT);
-    }
-
-    /**
-     * POLY Algorithm
-     *
-     * @param int $wordbits the integer 64 or 128.
-     * @param BigInteger $maxwordrange positive integer less than 2^wordbits.
-     * @param BigInteger $k integer in the range 0 ... prime(wordbits) - 1.
-     * @param string $m string with length divisible by (wordbits / 8) bytes.
-     * @return integer in the range 0 ... prime(wordbits) - 1.
-     */
-    private static function poly($wordbits, $maxwordrange, $k, $m)
-    {
-        //
-        // Define constants used for fixing out-of-range words
-        //
-        $wordbytes = $wordbits >> 3;
-        if ($wordbits == 128) {
-            $factory = self::$factory128;
-            $offset = self::$offset128;
-            $marker = self::$marker128;
-        } else {
-            $factory = self::$factory64;
-            $offset = self::$offset64;
-            $marker = self::$marker64;
-        }
-
-        $k = $factory->newInteger($k);
-
-        //
-        // Break M into chunks of length wordbytes bytes
-        //
-        $m_i = str_split($m, $wordbytes);
-
-        //
-        // Each input word m is compared with maxwordrange.  If not smaller
-        // then 'marker' and (m - offset), both in range, are hashed.
-        //
-        $y = $factory->newInteger(new BigInteger(1));
-        foreach ($m_i as $m) {
-            $m = $factory->newInteger(new BigInteger($m, 256));
-            if ($m->compare($maxwordrange) >= 0) {
-                $y = $k->multiply($y)->add($marker);
-                $y = $k->multiply($y)->add($m->subtract($offset));
-            } else {
-                $y = $k->multiply($y)->add($m);
-            }
-        }
-
-        return $y->toBytes();
-    }
-
-    /**
-     * L3-HASH: Third-Layer Hash
-     *
-     * The output from L2-HASH is 16 bytes long.  This final hash function
-     * hashes the 16-byte string to a fixed length of 4 bytes.
-     *
-     * @param string $k1 string of length 64 bytes.
-     * @param string $k2 string of length 4 bytes.
-     * @param string $m string of length 16 bytes.
-     * @return string string of length 4 bytes.
-     */
-    private static function L3Hash($k1, $k2, $m)
-    {
-        $factory = self::$factory36;
-
-        $y = $factory->newInteger(new BigInteger());
-        for ($i = 0; $i < 8; $i++) {
-            $m_i = $factory->newInteger(new BigInteger(substr($m, 2 * $i, 2), 256));
-            $k_i = $factory->newInteger(new BigInteger(substr($k1, 8 * $i, 8), 256));
-            $y = $y->add($m_i->multiply($k_i));
-        }
-        $y = str_pad(substr($y->toBytes(), -4), 4, "\0", STR_PAD_LEFT);
-        $y = $y ^ $k2;
-
-        return $y;
-    }
-
-    /**
-     * Compute the Hash / HMAC / UMAC.
+     * Compute the HMAC.
      *
+     * @access public
      * @param string $text
      * @return string
      */
-    public function hash($text)
+    function hash($text)
     {
-        $algo = $this->algo;
-        if ($algo == 'umac') {
-            if ($this->recomputeAESKey) {
-                if (!is_string($this->nonce)) {
-                    throw new InsufficientSetupException('No nonce has been set');
-                }
-                if (!is_string($this->key)) {
-                    throw new InsufficientSetupException('No key has been set');
-                }
-                if (strlen($this->key) != 16) {
-                    throw new \LengthException('Key must be 16 bytes long');
-                }
+        $mode = is_array($this->hash) ? self::MODE_INTERNAL : CRYPT_HASH_MODE;
 
-                if (!isset(self::$maxwordrange64)) {
-                    $one = new BigInteger(1);
+        if (!empty($this->key) || is_string($this->key)) {
+            switch ($mode) {
+                case self::MODE_MHASH:
+                    $output = mhash($this->hash, $text, $this->key);
+                    break;
+                case self::MODE_HASH:
+                    $output = hash_hmac($this->hash, $text, $this->key, true);
+                    break;
+                case self::MODE_INTERNAL:
+                    /* "Applications that use keys longer than B bytes will first hash the key using H and then use the
+                        resultant L byte string as the actual key to HMAC."
 
-                    $prime36 = new BigInteger("\x00\x00\x00\x0F\xFF\xFF\xFF\xFB", 256);
-                    self::$factory36 = new PrimeField($prime36);
+                        -- http://tools.ietf.org/html/rfc2104#section-2 */
+                    $key = strlen($this->key) > $this->b ? call_user_func($this->hash, $this->key) : $this->key;
 
-                    $prime64 = new BigInteger("\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xC5", 256);
-                    self::$factory64 = new PrimeField($prime64);
-
-                    $prime128 = new BigInteger("\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\xFF\x61", 256);
-                    self::$factory128 = new PrimeField($prime128);
-
-                    self::$offset64 = new BigInteger("\1\0\0\0\0\0\0\0\0", 256);
-                    self::$offset64 = self::$factory64->newInteger(self::$offset64->subtract($prime64));
-                    self::$offset128 = new BigInteger("\1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0", 256);
-                    self::$offset128 = self::$factory128->newInteger(self::$offset128->subtract($prime128));
-
-                    self::$marker64 = self::$factory64->newInteger($prime64->subtract($one));
-                    self::$marker128 = self::$factory128->newInteger($prime128->subtract($one));
-
-                    $maxwordrange64 = $one->bitwise_leftShift(64)->subtract($one->bitwise_leftShift(32));
-                    self::$maxwordrange64 = self::$factory64->newInteger($maxwordrange64);
-
-                    $maxwordrange128 = $one->bitwise_leftShift(128)->subtract($one->bitwise_leftShift(96));
-                    self::$maxwordrange128 = self::$factory128->newInteger($maxwordrange128);
-                }
-
-                $this->c = new AES('ctr');
-                $this->c->disablePadding();
-                $this->c->setKey($this->key);
-
-                $this->pad = $this->pdf();
-
-                $this->recomputeAESKey = false;
+                    $key    = str_pad($key, $this->b, chr(0));      // step 1
+                    $temp   = $this->ipad ^ $key;                   // step 2
+                    $temp  .= $text;                                // step 3
+                    $temp   = call_user_func($this->hash, $temp);   // step 4
+                    $output = $this->opad ^ $key;                   // step 5
+                    $output.= $temp;                                // step 6
+                    $output = call_user_func($this->hash, $output); // step 7
+            }
+        } else {
+            switch ($mode) {
+                case self::MODE_MHASH:
+                    $output = mhash($this->hash, $text);
+                    break;
+                case self::MODE_HASH:
+                    $output = hash($this->hash, $text, true);
+                    break;
+                case self::MODE_INTERNAL:
+                    $output = call_user_func($this->hash, $text);
             }
-
-            $hashedmessage = $this->uhash($text, $this->length);
-            return $hashedmessage ^ $this->pad;
         }
 
-        if (is_array($algo)) {
-            if (empty($this->key) || !is_string($this->key)) {
-                return substr($algo($text, ...array_values($this->parameters)), 0, $this->length);
-            }
-
-            // SHA3 HMACs are discussed at https://nvlpubs.nist.gov/nistpubs/FIPS/NIST.FIPS.202.pdf#page=30
-
-            $key    = str_pad($this->computedKey, $b, chr(0));
-            $temp   = $this->ipad ^ $key;
-            $temp  .= $text;
-            $temp   = substr($algo($temp, ...array_values($this->parameters)), 0, $this->length);
-            $output = $this->opad ^ $key;
-            $output .= $temp;
-            $output = $algo($output, ...array_values($this->parameters));
-
-            return substr($output, 0, $this->length);
-        }
-
-        $output = !empty($this->key) || is_string($this->key) ?
-            hash_hmac($algo, $text, $this->computedKey, true) :
-            hash($algo, $text, true);
-
-        return strlen($output) > $this->length
-            ? substr($output, 0, $this->length)
-            : $output;
-    }
-
-    /**
-     * Returns the hash length (in bits)
-     *
-     * @return int
-     */
-    public function getLength()
-    {
-        return $this->length << 3;
+        return substr($output, 0, $this->l);
     }
 
     /**
      * Returns the hash length (in bytes)
      *
+     * @access public
      * @return int
      */
-    public function getLengthInBytes()
+    function getLength()
     {
-        return $this->length;
+        return $this->l;
     }
 
     /**
-     * Returns the block length (in bits)
-     *
-     * @return int
-     */
-    public function getBlockLength()
-    {
-        return $this->blockSize;
-    }
-
-    /**
-     * Returns the block length (in bytes)
-     *
-     * @return int
-     */
-    public function getBlockLengthInBytes()
-    {
-        return $this->blockSize >> 3;
-    }
-
-    /**
-     * Pads SHA3 based on the mode
-     *
-     * @param int $padLength
-     * @param int $padType
-     * @return string
-     */
-    private static function sha3_pad($padLength, $padType)
-    {
-        switch ($padType) {
-            case self::PADDING_KECCAK:
-                $temp = chr(0x01) . str_repeat("\0", $padLength - 1);
-                $temp[$padLength - 1] = $temp[$padLength - 1] | chr(0x80);
-                return $temp;
-            case self::PADDING_SHAKE:
-                $temp = chr(0x1F) . str_repeat("\0", $padLength - 1);
-                $temp[$padLength - 1] = $temp[$padLength - 1] | chr(0x80);
-                return $temp;
-            //case self::PADDING_SHA3:
-            default:
-                // from https://nvlpubs.nist.gov/nistpubs/FIPS/NIST.FIPS.202.pdf#page=36
-                return $padLength == 1 ? chr(0x86) : chr(0x06) . str_repeat("\0", $padLength - 2) . chr(0x80);
-        }
-    }
-
-    /**
-     * Pure-PHP 32-bit implementation of SHA3
-     *
-     * Whereas BigInteger.php's 32-bit engine works on PHP 64-bit this 32-bit implementation
-     * of SHA3 will *not* work on PHP 64-bit. This is because this implementation
-     * employees bitwise NOTs and bitwise left shifts. And the round constants only work
-     * on 32-bit PHP. eg. dechex(-2147483648) returns 80000000 on 32-bit PHP and
-     * FFFFFFFF80000000 on 64-bit PHP. Sure, we could do bitwise ANDs but that would slow
-     * things down.
-     *
-     * SHA512 requires BigInteger to simulate 64-bit unsigned integers because SHA2 employees
-     * addition whereas SHA3 just employees bitwise operators. PHP64 only supports signed
-     * 64-bit integers, which complicates addition, whereas that limitation isn't an issue
-     * for SHA3.
-     *
-     * In https://ws680.nist.gov/publication/get_pdf.cfm?pub_id=919061#page=16 KECCAK[C] is
-     * defined as "the KECCAK instance with KECCAK-f[1600] as the underlying permutation and
-     * capacity c". This is relevant because, altho the KECCAK standard defines a mode
-     * (KECCAK-f[800]) designed for 32-bit machines that mode is incompatible with SHA3
-     *
-     * @param string $p
-     * @param int $c
-     * @param int $r
-     * @param int $d
-     * @param int $padType
-     */
-    private static function sha3_32($p, $c, $r, $d, $padType)
-    {
-        $block_size = $r >> 3;
-        $padLength = $block_size - (strlen($p) % $block_size);
-        $num_ints = $block_size >> 2;
-
-        $p .= static::sha3_pad($padLength, $padType);
-
-        $n = strlen($p) / $r; // number of blocks
-
-        $s = [
-            [[0, 0], [0, 0], [0, 0], [0, 0], [0, 0]],
-            [[0, 0], [0, 0], [0, 0], [0, 0], [0, 0]],
-            [[0, 0], [0, 0], [0, 0], [0, 0], [0, 0]],
-            [[0, 0], [0, 0], [0, 0], [0, 0], [0, 0]],
-            [[0, 0], [0, 0], [0, 0], [0, 0], [0, 0]]
-        ];
-
-        $p = str_split($p, $block_size);
-
-        foreach ($p as $pi) {
-            $pi = unpack('V*', $pi);
-            $x = $y = 0;
-            for ($i = 1; $i <= $num_ints; $i += 2) {
-                $s[$x][$y][0] ^= $pi[$i + 1];
-                $s[$x][$y][1] ^= $pi[$i];
-                if (++$y == 5) {
-                    $y = 0;
-                    $x++;
-                }
-            }
-            static::processSHA3Block32($s);
-        }
-
-        $z = '';
-        $i = $j = 0;
-        while (strlen($z) < $d) {
-            $z .= pack('V2', $s[$i][$j][1], $s[$i][$j++][0]);
-            if ($j == 5) {
-                $j = 0;
-                $i++;
-                if ($i == 5) {
-                    $i = 0;
-                    static::processSHA3Block32($s);
-                }
-            }
-        }
-
-        return $z;
-    }
-
-    /**
-     * 32-bit block processing method for SHA3
-     *
-     * @param array $s
-     */
-    private static function processSHA3Block32(&$s)
-    {
-        static $rotationOffsets = [
-            [ 0,  1, 62, 28, 27],
-            [36, 44,  6, 55, 20],
-            [ 3, 10, 43, 25, 39],
-            [41, 45, 15, 21,  8],
-            [18,  2, 61, 56, 14]
-        ];
-
-        // the standards give these constants in hexadecimal notation. it's tempting to want to use
-        // that same notation, here, however, we can't, because 0x80000000, on PHP32, is a positive
-        // float - not the negative int that we need to be in PHP32. so we use -2147483648 instead
-        static $roundConstants = [
-            [0, 1],
-            [0, 32898],
-            [-2147483648, 32906],
-            [-2147483648, -2147450880],
-            [0, 32907],
-            [0, -2147483647],
-            [-2147483648, -2147450751],
-            [-2147483648, 32777],
-            [0, 138],
-            [0, 136],
-            [0, -2147450871],
-            [0, -2147483638],
-            [0, -2147450741],
-            [-2147483648, 139],
-            [-2147483648, 32905],
-            [-2147483648, 32771],
-            [-2147483648, 32770],
-            [-2147483648, 128],
-            [0, 32778],
-            [-2147483648, -2147483638],
-            [-2147483648, -2147450751],
-            [-2147483648, 32896],
-            [0, -2147483647],
-            [-2147483648, -2147450872]
-        ];
-
-        for ($round = 0; $round < 24; $round++) {
-            // theta step
-            $parity = $rotated = [];
-            for ($i = 0; $i < 5; $i++) {
-                $parity[] = [
-                    $s[0][$i][0] ^ $s[1][$i][0] ^ $s[2][$i][0] ^ $s[3][$i][0] ^ $s[4][$i][0],
-                    $s[0][$i][1] ^ $s[1][$i][1] ^ $s[2][$i][1] ^ $s[3][$i][1] ^ $s[4][$i][1]
-                ];
-                $rotated[] = static::rotateLeft32($parity[$i], 1);
-            }
-
-            $temp = [
-                [$parity[4][0] ^ $rotated[1][0], $parity[4][1] ^ $rotated[1][1]],
-                [$parity[0][0] ^ $rotated[2][0], $parity[0][1] ^ $rotated[2][1]],
-                [$parity[1][0] ^ $rotated[3][0], $parity[1][1] ^ $rotated[3][1]],
-                [$parity[2][0] ^ $rotated[4][0], $parity[2][1] ^ $rotated[4][1]],
-                [$parity[3][0] ^ $rotated[0][0], $parity[3][1] ^ $rotated[0][1]]
-            ];
-            for ($i = 0; $i < 5; $i++) {
-                for ($j = 0; $j < 5; $j++) {
-                    $s[$i][$j][0] ^= $temp[$j][0];
-                    $s[$i][$j][1] ^= $temp[$j][1];
-                }
-            }
-
-            $st = $s;
-
-            // rho and pi steps
-            for ($i = 0; $i < 5; $i++) {
-                for ($j = 0; $j < 5; $j++) {
-                    $st[(2 * $i + 3 * $j) % 5][$j] = static::rotateLeft32($s[$j][$i], $rotationOffsets[$j][$i]);
-                }
-            }
-
-            // chi step
-            for ($i = 0; $i < 5; $i++) {
-                $s[$i][0] = [
-                    $st[$i][0][0] ^ (~$st[$i][1][0] & $st[$i][2][0]),
-                    $st[$i][0][1] ^ (~$st[$i][1][1] & $st[$i][2][1])
-                ];
-                $s[$i][1] = [
-                    $st[$i][1][0] ^ (~$st[$i][2][0] & $st[$i][3][0]),
-                    $st[$i][1][1] ^ (~$st[$i][2][1] & $st[$i][3][1])
-                ];
-                $s[$i][2] = [
-                    $st[$i][2][0] ^ (~$st[$i][3][0] & $st[$i][4][0]),
-                    $st[$i][2][1] ^ (~$st[$i][3][1] & $st[$i][4][1])
-                ];
-                $s[$i][3] = [
-                    $st[$i][3][0] ^ (~$st[$i][4][0] & $st[$i][0][0]),
-                    $st[$i][3][1] ^ (~$st[$i][4][1] & $st[$i][0][1])
-                ];
-                $s[$i][4] = [
-                    $st[$i][4][0] ^ (~$st[$i][0][0] & $st[$i][1][0]),
-                    $st[$i][4][1] ^ (~$st[$i][0][1] & $st[$i][1][1])
-                ];
-            }
-
-            // iota step
-            $s[0][0][0] ^= $roundConstants[$round][0];
-            $s[0][0][1] ^= $roundConstants[$round][1];
-        }
-    }
-
-    /**
-     * Rotate 32-bit int
-     *
-     * @param array $x
-     * @param int $shift
-     */
-    private static function rotateLeft32($x, $shift)
-    {
-        if ($shift < 32) {
-            list($hi, $lo) = $x;
-        } else {
-            $shift -= 32;
-            list($lo, $hi) = $x;
-        }
-
-        return [
-            ($hi << $shift) | (($lo >> (32 - $shift)) & (1 << $shift) - 1),
-            ($lo << $shift) | (($hi >> (32 - $shift)) & (1 << $shift) - 1)
-        ];
-    }
-
-    /**
-     * Pure-PHP 64-bit implementation of SHA3
-     *
-     * @param string $p
-     * @param int $c
-     * @param int $r
-     * @param int $d
-     * @param int $padType
-     */
-    private static function sha3_64($p, $c, $r, $d, $padType)
-    {
-        $block_size = $r >> 3;
-        $padLength = $block_size - (strlen($p) % $block_size);
-        $num_ints = $block_size >> 2;
-
-        $p .= static::sha3_pad($padLength, $padType);
-
-        $n = strlen($p) / $r; // number of blocks
-
-        $s = [
-            [0, 0, 0, 0, 0],
-            [0, 0, 0, 0, 0],
-            [0, 0, 0, 0, 0],
-            [0, 0, 0, 0, 0],
-            [0, 0, 0, 0, 0]
-        ];
-
-        $p = str_split($p, $block_size);
-
-        foreach ($p as $pi) {
-            $pi = unpack('P*', $pi);
-            $x = $y = 0;
-            foreach ($pi as $subpi) {
-                $s[$x][$y++] ^= $subpi;
-                if ($y == 5) {
-                    $y = 0;
-                    $x++;
-                }
-            }
-            static::processSHA3Block64($s);
-        }
-
-        $z = '';
-        $i = $j = 0;
-        while (strlen($z) < $d) {
-            $z .= pack('P', $s[$i][$j++]);
-            if ($j == 5) {
-                $j = 0;
-                $i++;
-                if ($i == 5) {
-                    $i = 0;
-                    static::processSHA3Block64($s);
-                }
-            }
-        }
-
-        return $z;
-    }
-
-    /**
-     * 64-bit block processing method for SHA3
-     *
-     * @param array $s
-     */
-    private static function processSHA3Block64(&$s)
-    {
-        static $rotationOffsets = [
-            [ 0,  1, 62, 28, 27],
-            [36, 44,  6, 55, 20],
-            [ 3, 10, 43, 25, 39],
-            [41, 45, 15, 21,  8],
-            [18,  2, 61, 56, 14]
-        ];
-
-        static $roundConstants = [
-            1,
-            32898,
-            -9223372036854742902,
-            -9223372034707259392,
-            32907,
-            2147483649,
-            -9223372034707259263,
-            -9223372036854743031,
-            138,
-            136,
-            2147516425,
-            2147483658,
-            2147516555,
-            -9223372036854775669,
-            -9223372036854742903,
-            -9223372036854743037,
-            -9223372036854743038,
-            -9223372036854775680,
-            32778,
-            -9223372034707292150,
-            -9223372034707259263,
-            -9223372036854742912,
-            2147483649,
-            -9223372034707259384
-        ];
-
-        for ($round = 0; $round < 24; $round++) {
-            // theta step
-            $parity = [];
-            for ($i = 0; $i < 5; $i++) {
-                $parity[] = $s[0][$i] ^ $s[1][$i] ^ $s[2][$i] ^ $s[3][$i] ^ $s[4][$i];
-            }
-            $temp = [
-                $parity[4] ^ static::rotateLeft64($parity[1], 1),
-                $parity[0] ^ static::rotateLeft64($parity[2], 1),
-                $parity[1] ^ static::rotateLeft64($parity[3], 1),
-                $parity[2] ^ static::rotateLeft64($parity[4], 1),
-                $parity[3] ^ static::rotateLeft64($parity[0], 1)
-            ];
-            for ($i = 0; $i < 5; $i++) {
-                for ($j = 0; $j < 5; $j++) {
-                    $s[$i][$j] ^= $temp[$j];
-                }
-            }
-
-            $st = $s;
-
-            // rho and pi steps
-            for ($i = 0; $i < 5; $i++) {
-                for ($j = 0; $j < 5; $j++) {
-                    $st[(2 * $i + 3 * $j) % 5][$j] = static::rotateLeft64($s[$j][$i], $rotationOffsets[$j][$i]);
-                }
-            }
-
-            // chi step
-            for ($i = 0; $i < 5; $i++) {
-                $s[$i] = [
-                    $st[$i][0] ^ (~$st[$i][1] & $st[$i][2]),
-                    $st[$i][1] ^ (~$st[$i][2] & $st[$i][3]),
-                    $st[$i][2] ^ (~$st[$i][3] & $st[$i][4]),
-                    $st[$i][3] ^ (~$st[$i][4] & $st[$i][0]),
-                    $st[$i][4] ^ (~$st[$i][0] & $st[$i][1])
-                ];
-            }
-
-            // iota step
-            $s[0][0] ^= $roundConstants[$round];
-        }
-    }
-
-    /**
-     * Rotate 64-bit int
-     *
-     * @param int $x
-     * @param int $shift
-     */
-    private static function rotateLeft64($x, $shift)
-    {
-        return ($x << $shift) | (($x >> (64 - $shift)) & ((1 << $shift) - 1));
-    }
-
-    /**
-     * Pure-PHP implementation of SHA512
+     * Wrapper for MD5
      *
+     * @access private
      * @param string $m
-     * @param array $hash
-     * @return string
      */
-    private static function sha512($m, $hash)
+    function _md5($m)
     {
-        static $k;
+        return pack('H*', md5($m));
+    }
+
+    /**
+     * Wrapper for SHA1
+     *
+     * @access private
+     * @param string $m
+     */
+    function _sha1($m)
+    {
+        return pack('H*', sha1($m));
+    }
+
+    /**
+     * Pure-PHP implementation of MD2
+     *
+     * See {@link http://tools.ietf.org/html/rfc1319 RFC1319}.
+     *
+     * @access private
+     * @param string $m
+     */
+    function _md2($m)
+    {
+        static $s = array(
+             41,  46,  67, 201, 162, 216, 124,   1,  61,  54,  84, 161, 236, 240, 6,
+             19,  98, 167,   5, 243, 192, 199, 115, 140, 152, 147,  43, 217, 188,
+             76, 130, 202,  30, 155,  87,  60, 253, 212, 224,  22, 103,  66, 111, 24,
+            138,  23, 229,  18, 190,  78, 196, 214, 218, 158, 222,  73, 160, 251,
+            245, 142, 187,  47, 238, 122, 169, 104, 121, 145,  21, 178,   7,  63,
+            148, 194,  16, 137,  11,  34,  95,  33, 128, 127,  93, 154,  90, 144, 50,
+             39,  53,  62, 204, 231, 191, 247, 151,   3, 255,  25,  48, 179,  72, 165,
+            181, 209, 215,  94, 146,  42, 172,  86, 170, 198,  79, 184,  56, 210,
+            150, 164, 125, 182, 118, 252, 107, 226, 156, 116,   4, 241,  69, 157,
+            112,  89, 100, 113, 135,  32, 134,  91, 207, 101, 230,  45, 168,   2, 27,
+             96,  37, 173, 174, 176, 185, 246,  28,  70,  97, 105,  52,  64, 126, 15,
+             85,  71, 163,  35, 221,  81, 175,  58, 195,  92, 249, 206, 186, 197,
+            234,  38,  44,  83,  13, 110, 133,  40, 132,   9, 211, 223, 205, 244, 65,
+            129,  77,  82, 106, 220,  55, 200, 108, 193, 171, 250,  36, 225, 123,
+              8,  12, 189, 177,  74, 120, 136, 149, 139, 227,  99, 232, 109, 233,
+            203, 213, 254,  59,   0,  29,  57, 242, 239, 183,  14, 102,  88, 208, 228,
+            166, 119, 114, 248, 235, 117,  75,  10,  49,  68,  80, 180, 143, 237,
+             31,  26, 219, 153, 141,  51, 159,  17, 131, 20
+        );
+
+        // Step 1. Append Padding Bytes
+        $pad = 16 - (strlen($m) & 0xF);
+        $m.= str_repeat(chr($pad), $pad);
+
+        $length = strlen($m);
+
+        // Step 2. Append Checksum
+        $c = str_repeat(chr(0), 16);
+        $l = chr(0);
+        for ($i = 0; $i < $length; $i+= 16) {
+            for ($j = 0; $j < 16; $j++) {
+                // RFC1319 incorrectly states that C[j] should be set to S[c xor L]
+                //$c[$j] = chr($s[ord($m[$i + $j] ^ $l)]);
+                // per <http://www.rfc-editor.org/errata_search.php?rfc=1319>, however, C[j] should be set to S[c xor L] xor C[j]
+                $c[$j] = chr($s[ord($m[$i + $j] ^ $l)] ^ ord($c[$j]));
+                $l = $c[$j];
+            }
+        }
+        $m.= $c;
+
+        $length+= 16;
+
+        // Step 3. Initialize MD Buffer
+        $x = str_repeat(chr(0), 48);
+
+        // Step 4. Process Message in 16-Byte Blocks
+        for ($i = 0; $i < $length; $i+= 16) {
+            for ($j = 0; $j < 16; $j++) {
+                $x[$j + 16] = $m[$i + $j];
+                $x[$j + 32] = $x[$j + 16] ^ $x[$j];
+            }
+            $t = chr(0);
+            for ($j = 0; $j < 18; $j++) {
+                for ($k = 0; $k < 48; $k++) {
+                    $x[$k] = $t = $x[$k] ^ chr($s[ord($t)]);
+                    //$t = $x[$k] = $x[$k] ^ chr($s[ord($t)]);
+                }
+                $t = chr(ord($t) + $j);
+            }
+        }
+
+        // Step 5. Output
+        return substr($x, 0, 16);
+    }
+
+    /**
+     * Pure-PHP implementation of SHA256
+     *
+     * See {@link http://en.wikipedia.org/wiki/SHA_hash_functions#SHA-256_.28a_SHA-2_variant.29_pseudocode SHA-256 (a SHA-2 variant) pseudocode - Wikipedia}.
+     *
+     * @access private
+     * @param string $m
+     */
+    function _sha256($m)
+    {
+        if (extension_loaded('suhosin')) {
+            return pack('H*', sha256($m));
+        }
+
+        // Initialize variables
+        $hash = array(
+            0x6a09e667, 0xbb67ae85, 0x3c6ef372, 0xa54ff53a, 0x510e527f, 0x9b05688c, 0x1f83d9ab, 0x5be0cd19
+        );
+        // Initialize table of round constants
+        // (first 32 bits of the fractional parts of the cube roots of the first 64 primes 2..311)
+        static $k = array(
+            0x428a2f98, 0x71374491, 0xb5c0fbcf, 0xe9b5dba5, 0x3956c25b, 0x59f111f1, 0x923f82a4, 0xab1c5ed5,
+            0xd807aa98, 0x12835b01, 0x243185be, 0x550c7dc3, 0x72be5d74, 0x80deb1fe, 0x9bdc06a7, 0xc19bf174,
+            0xe49b69c1, 0xefbe4786, 0x0fc19dc6, 0x240ca1cc, 0x2de92c6f, 0x4a7484aa, 0x5cb0a9dc, 0x76f988da,
+            0x983e5152, 0xa831c66d, 0xb00327c8, 0xbf597fc7, 0xc6e00bf3, 0xd5a79147, 0x06ca6351, 0x14292967,
+            0x27b70a85, 0x2e1b2138, 0x4d2c6dfc, 0x53380d13, 0x650a7354, 0x766a0abb, 0x81c2c92e, 0x92722c85,
+            0xa2bfe8a1, 0xa81a664b, 0xc24b8b70, 0xc76c51a3, 0xd192e819, 0xd6990624, 0xf40e3585, 0x106aa070,
+            0x19a4c116, 0x1e376c08, 0x2748774c, 0x34b0bcb5, 0x391c0cb3, 0x4ed8aa4a, 0x5b9cca4f, 0x682e6ff3,
+            0x748f82ee, 0x78a5636f, 0x84c87814, 0x8cc70208, 0x90befffa, 0xa4506ceb, 0xbef9a3f7, 0xc67178f2
+        );
+
+        // Pre-processing
+        $length = strlen($m);
+        // to round to nearest 56 mod 64, we'll add 64 - (length + (64 - 56)) % 64
+        $m.= str_repeat(chr(0), 64 - (($length + 8) & 0x3F));
+        $m[$length] = chr(0x80);
+        // we don't support hashing strings 512MB long
+        $m.= pack('N2', 0, $length << 3);
+
+        // Process the message in successive 512-bit chunks
+        $chunks = str_split($m, 64);
+        foreach ($chunks as $chunk) {
+            $w = array();
+            for ($i = 0; $i < 16; $i++) {
+                extract(unpack('Ntemp', $this->_string_shift($chunk, 4)));
+                $w[] = $temp;
+            }
+
+            // Extend the sixteen 32-bit words into sixty-four 32-bit words
+            for ($i = 16; $i < 64; $i++) {
+                // @codingStandardsIgnoreStart
+                $s0 = $this->_rightRotate($w[$i - 15],  7) ^
+                      $this->_rightRotate($w[$i - 15], 18) ^
+                      $this->_rightShift( $w[$i - 15],  3);
+                $s1 = $this->_rightRotate($w[$i - 2], 17) ^
+                      $this->_rightRotate($w[$i - 2], 19) ^
+                      $this->_rightShift( $w[$i - 2], 10);
+                // @codingStandardsIgnoreEnd
+                $w[$i] = $this->_add($w[$i - 16], $s0, $w[$i - 7], $s1);
+            }
+
+            // Initialize hash value for this chunk
+            list($a, $b, $c, $d, $e, $f, $g, $h) = $hash;
+
+            // Main loop
+            for ($i = 0; $i < 64; $i++) {
+                $s0 = $this->_rightRotate($a,  2) ^
+                      $this->_rightRotate($a, 13) ^
+                      $this->_rightRotate($a, 22);
+                $maj = ($a & $b) ^
+                       ($a & $c) ^
+                       ($b & $c);
+                $t2 = $this->_add($s0, $maj);
+
+                $s1 = $this->_rightRotate($e,  6) ^
+                      $this->_rightRotate($e, 11) ^
+                      $this->_rightRotate($e, 25);
+                $ch = ($e & $f) ^
+                      ($this->_not($e) & $g);
+                $t1 = $this->_add($h, $s1, $ch, $k[$i], $w[$i]);
+
+                $h = $g;
+                $g = $f;
+                $f = $e;
+                $e = $this->_add($d, $t1);
+                $d = $c;
+                $c = $b;
+                $b = $a;
+                $a = $this->_add($t1, $t2);
+            }
+
+            // Add this chunk's hash to result so far
+            $hash = array(
+                $this->_add($hash[0], $a),
+                $this->_add($hash[1], $b),
+                $this->_add($hash[2], $c),
+                $this->_add($hash[3], $d),
+                $this->_add($hash[4], $e),
+                $this->_add($hash[5], $f),
+                $this->_add($hash[6], $g),
+                $this->_add($hash[7], $h)
+            );
+        }
+
+        // Produce the final hash value (big-endian)
+        return pack('N8', $hash[0], $hash[1], $hash[2], $hash[3], $hash[4], $hash[5], $hash[6], $hash[7]);
+    }
+
+    /**
+     * Pure-PHP implementation of SHA384 and SHA512
+     *
+     * @access private
+     * @param string $m
+     */
+    function _sha512($m)
+    {
+        static $init384, $init512, $k;
 
         if (!isset($k)) {
+            // Initialize variables
+            $init384 = array( // initial values for SHA384
+                'cbbb9d5dc1059ed8', '629a292a367cd507', '9159015a3070dd17', '152fecd8f70e5939',
+                '67332667ffc00b31', '8eb44a8768581511', 'db0c2e0d64f98fa7', '47b5481dbefa4fa4'
+            );
+            $init512 = array( // initial values for SHA512
+                '6a09e667f3bcc908', 'bb67ae8584caa73b', '3c6ef372fe94f82b', 'a54ff53a5f1d36f1',
+                '510e527fade682d1', '9b05688c2b3e6c1f', '1f83d9abfb41bd6b', '5be0cd19137e2179'
+            );
+
+            for ($i = 0; $i < 8; $i++) {
+                $init384[$i] = new BigInteger($init384[$i], 16);
+                $init384[$i]->setPrecision(64);
+                $init512[$i] = new BigInteger($init512[$i], 16);
+                $init512[$i]->setPrecision(64);
+            }
+
             // Initialize table of round constants
             // (first 64 bits of the fractional parts of the cube roots of the first 80 primes 2..409)
-            $k = [
+            $k = array(
                 '428a2f98d728ae22', '7137449123ef65cd', 'b5c0fbcfec4d3b2f', 'e9b5dba58189dbbc',
                 '3956c25bf348b538', '59f111f1b605d019', '923f82a4af194f9b', 'ab1c5ed5da6d8118',
                 'd807aa98a3030242', '12835b0145706fbe', '243185be4ee4b28c', '550c7dc3d5ffb4e2',
@@ -1322,110 +606,112 @@ class Hash
                 '06f067aa72176fba', '0a637dc5a2c898a6', '113f9804bef90dae', '1b710b35131c471b',
                 '28db77f523047d84', '32caab7b40c72493', '3c9ebe0a15c9bebc', '431d67c49c100d4c',
                 '4cc5d4becb3e42b6', '597f299cfc657e2a', '5fcb6fab3ad6faec', '6c44198c4a475817'
-            ];
+            );
 
             for ($i = 0; $i < 80; $i++) {
                 $k[$i] = new BigInteger($k[$i], 16);
             }
         }
 
+        $hash = $this->l == 48 ? $init384 : $init512;
+
         // Pre-processing
         $length = strlen($m);
         // to round to nearest 112 mod 128, we'll add 128 - (length + (128 - 112)) % 128
-        $m .= str_repeat(chr(0), 128 - (($length + 16) & 0x7F));
+        $m.= str_repeat(chr(0), 128 - (($length + 16) & 0x7F));
         $m[$length] = chr(0x80);
         // we don't support hashing strings 512MB long
-        $m .= pack('N4', 0, 0, 0, $length << 3);
+        $m.= pack('N4', 0, 0, 0, $length << 3);
 
         // Process the message in successive 1024-bit chunks
         $chunks = str_split($m, 128);
         foreach ($chunks as $chunk) {
-            $w = [];
+            $w = array();
             for ($i = 0; $i < 16; $i++) {
-                $temp = new BigInteger(Strings::shift($chunk, 8), 256);
+                $temp = new BigInteger($this->_string_shift($chunk, 8), 256);
                 $temp->setPrecision(64);
                 $w[] = $temp;
             }
 
             // Extend the sixteen 32-bit words into eighty 32-bit words
             for ($i = 16; $i < 80; $i++) {
-                $temp = [
+                $temp = array(
                           $w[$i - 15]->bitwise_rightRotate(1),
                           $w[$i - 15]->bitwise_rightRotate(8),
                           $w[$i - 15]->bitwise_rightShift(7)
-                ];
+                );
                 $s0 = $temp[0]->bitwise_xor($temp[1]);
                 $s0 = $s0->bitwise_xor($temp[2]);
-                $temp = [
+                $temp = array(
                           $w[$i - 2]->bitwise_rightRotate(19),
                           $w[$i - 2]->bitwise_rightRotate(61),
                           $w[$i - 2]->bitwise_rightShift(6)
-                ];
+                );
                 $s1 = $temp[0]->bitwise_xor($temp[1]);
                 $s1 = $s1->bitwise_xor($temp[2]);
-                $w[$i] = clone $w[$i - 16];
+                $w[$i] = $w[$i - 16]->copy();
                 $w[$i] = $w[$i]->add($s0);
                 $w[$i] = $w[$i]->add($w[$i - 7]);
                 $w[$i] = $w[$i]->add($s1);
             }
 
             // Initialize hash value for this chunk
-            $a = clone $hash[0];
-            $b = clone $hash[1];
-            $c = clone $hash[2];
-            $d = clone $hash[3];
-            $e = clone $hash[4];
-            $f = clone $hash[5];
-            $g = clone $hash[6];
-            $h = clone $hash[7];
+            $a = $hash[0]->copy();
+            $b = $hash[1]->copy();
+            $c = $hash[2]->copy();
+            $d = $hash[3]->copy();
+            $e = $hash[4]->copy();
+            $f = $hash[5]->copy();
+            $g = $hash[6]->copy();
+            $h = $hash[7]->copy();
 
             // Main loop
             for ($i = 0; $i < 80; $i++) {
-                $temp = [
+                $temp = array(
                     $a->bitwise_rightRotate(28),
                     $a->bitwise_rightRotate(34),
                     $a->bitwise_rightRotate(39)
-                ];
+                );
                 $s0 = $temp[0]->bitwise_xor($temp[1]);
                 $s0 = $s0->bitwise_xor($temp[2]);
-                $temp = [
+                $temp = array(
                     $a->bitwise_and($b),
                     $a->bitwise_and($c),
                     $b->bitwise_and($c)
-                ];
+                );
                 $maj = $temp[0]->bitwise_xor($temp[1]);
                 $maj = $maj->bitwise_xor($temp[2]);
                 $t2 = $s0->add($maj);
 
-                $temp = [
+                $temp = array(
                     $e->bitwise_rightRotate(14),
                     $e->bitwise_rightRotate(18),
                     $e->bitwise_rightRotate(41)
-                ];
+                );
                 $s1 = $temp[0]->bitwise_xor($temp[1]);
                 $s1 = $s1->bitwise_xor($temp[2]);
-                $temp = [
+                $temp = array(
                     $e->bitwise_and($f),
                     $g->bitwise_and($e->bitwise_not())
-                ];
+                );
                 $ch = $temp[0]->bitwise_xor($temp[1]);
                 $t1 = $h->add($s1);
                 $t1 = $t1->add($ch);
                 $t1 = $t1->add($k[$i]);
                 $t1 = $t1->add($w[$i]);
 
-                $h = clone $g;
-                $g = clone $f;
-                $f = clone $e;
+                $h = $g->copy();
+                $g = $f->copy();
+                $f = $e->copy();
                 $e = $d->add($t1);
-                $d = clone $c;
-                $c = clone $b;
-                $b = clone $a;
+                $d = $c->copy();
+                $c = $b->copy();
+                $b = $a->copy();
                 $a = $t1->add($t2);
             }
 
             // Add this chunk's hash to result so far
-            $hash = [
+            $hash = array(
                 $hash[0]->add($a),
                 $hash[1]->add($b),
                 $hash[2]->add($c),
@@ -1434,22 +720,105 @@ class Hash
                 $hash[5]->add($f),
                 $hash[6]->add($g),
                 $hash[7]->add($h)
-            ];
+            );
         }
 
         // Produce the final hash value (big-endian)
-        // (\phpseclib3\Crypt\Hash::hash() trims the output for hashes but not for HMACs.  as such, we trim the output here)
+        // (\phpseclib\Crypt\Hash::hash() trims the output for hashes but not for HMACs.  as such, we trim the output here)
         $temp = $hash[0]->toBytes() . $hash[1]->toBytes() . $hash[2]->toBytes() . $hash[3]->toBytes() .
-                $hash[4]->toBytes() . $hash[5]->toBytes() . $hash[6]->toBytes() . $hash[7]->toBytes();
+                $hash[4]->toBytes() . $hash[5]->toBytes();
+        if ($this->l != 48) {
+            $temp.= $hash[6]->toBytes() . $hash[7]->toBytes();
+        }
 
         return $temp;
     }
 
     /**
-     *  __toString() magic method
+     * Right Rotate
+     *
+     * @access private
+     * @param int $int
+     * @param int $amt
+     * @see self::_sha256()
+     * @return int
      */
-    public function __toString()
+    function _rightRotate($int, $amt)
     {
-        return $this->getHash();
+        $invamt = 32 - $amt;
+        $mask = (1 << $invamt) - 1;
+        return (($int << $invamt) & 0xFFFFFFFF) | (($int >> $amt) & $mask);
+    }
+
+    /**
+     * Right Shift
+     *
+     * @access private
+     * @param int $int
+     * @param int $amt
+     * @see self::_sha256()
+     * @return int
+     */
+    function _rightShift($int, $amt)
+    {
+        $mask = (1 << (32 - $amt)) - 1;
+        return ($int >> $amt) & $mask;
+    }
+
+    /**
+     * Not
+     *
+     * @access private
+     * @param int $int
+     * @see self::_sha256()
+     * @return int
+     */
+    function _not($int)
+    {
+        return ~$int & 0xFFFFFFFF;
+    }
+
+    /**
+     * Add
+     *
+     * _sha256() adds multiple unsigned 32-bit integers.  Since PHP doesn't support unsigned integers and since the
+     * possibility of overflow exists, care has to be taken.  BigInteger could be used but this should be faster.
+     *
+     * @param int $...
+     * @return int
+     * @see self::_sha256()
+     * @access private
+     */
+    function _add()
+    {
+        static $mod;
+        if (!isset($mod)) {
+            $mod = pow(2, 32);
+        }
+
+        $result = 0;
+        $arguments = func_get_args();
+        foreach ($arguments as $argument) {
+            $result+= $argument < 0 ? ($argument & 0x7FFFFFFF) + 0x80000000 : $argument;
+        }
+
+        return fmod($result, $mod);
+    }
+
+    /**
+     * String Shift
+     *
+     * Inspired by array_shift
+     *
+     * @param string $string
+     * @param int $index
+     * @return string
+     * @access private
+     */
+    function _string_shift(&$string, $index = 1)
+    {
+        $substr = substr($string, 0, $index);
+        $string = substr($string, $index);
+        return $substr;
     }
 }
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/PublicKeyLoader.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/PublicKeyLoader.php
deleted file mode 100644
index 61afbaeb..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/PublicKeyLoader.php
+++ /dev/null
@@ -1,111 +0,0 @@
-<?php
-
-/**
- * PublicKeyLoader
- *
- * Returns a PublicKey or PrivateKey object.
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2009 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\Crypt;
-
-use phpseclib3\Crypt\Common\AsymmetricKey;
-use phpseclib3\Crypt\Common\PrivateKey;
-use phpseclib3\Crypt\Common\PublicKey;
-use phpseclib3\Exception\NoKeyLoadedException;
-use phpseclib3\File\X509;
-
-/**
- * PublicKeyLoader
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class PublicKeyLoader
-{
-    /**
-     * Loads a public or private key
-     *
-     * @return AsymmetricKey
-     * @param string|array $key
-     * @param string $password optional
-     */
-    public static function load($key, $password = false)
-    {
-        try {
-            return EC::load($key, $password);
-        } catch (NoKeyLoadedException $e) {
-        }
-
-        try {
-            return RSA::load($key, $password);
-        } catch (NoKeyLoadedException $e) {
-        }
-
-        try {
-            return DSA::load($key, $password);
-        } catch (NoKeyLoadedException $e) {
-        }
-
-        try {
-            $x509 = new X509();
-            $x509->loadX509($key);
-            $key = $x509->getPublicKey();
-            if ($key) {
-                return $key;
-            }
-        } catch (\Exception $e) {
-        }
-
-        throw new NoKeyLoadedException('Unable to read key');
-    }
-
-    /**
-     * Loads a private key
-     *
-     * @return PrivateKey
-     * @param string|array $key
-     * @param string $password optional
-     */
-    public static function loadPrivateKey($key, $password = false)
-    {
-        $key = self::load($key, $password);
-        if (!$key instanceof PrivateKey) {
-            throw new NoKeyLoadedException('The key that was loaded was not a private key');
-        }
-        return $key;
-    }
-
-    /**
-     * Loads a public key
-     *
-     * @return PublicKey
-     * @param string|array $key
-     */
-    public static function loadPublicKey($key)
-    {
-        $key = self::load($key);
-        if (!$key instanceof PublicKey) {
-            throw new NoKeyLoadedException('The key that was loaded was not a public key');
-        }
-        return $key;
-    }
-
-    /**
-     * Loads parameters
-     *
-     * @return AsymmetricKey
-     * @param string|array $key
-     */
-    public static function loadParameters($key)
-    {
-        $key = self::load($key);
-        if (!$key instanceof PrivateKey && !$key instanceof PublicKey) {
-            throw new NoKeyLoadedException('The key that was loaded was not a parameter');
-        }
-        return $key;
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/RC2.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/RC2.php
index 654c9064..e9cfa3f8 100644
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/RC2.php
+++ b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/RC2.php
@@ -16,7 +16,7 @@
  * <?php
  *    include 'vendor/autoload.php';
  *
- *    $rc2 = new \phpseclib3\Crypt\RC2('ctr');
+ *    $rc2 = new \phpseclib\Crypt\RC2();
  *
  *    $rc2->setKey('abcdefgh');
  *
@@ -26,105 +26,121 @@
  * ?>
  * </code>
  *
+ * @category Crypt
+ * @package  RC2
  * @author   Patrick Monnerat <pm@datasphere.ch>
  * @license  http://www.opensource.org/licenses/mit-license.html  MIT License
  * @link     http://phpseclib.sourceforge.net
  */
 
-namespace phpseclib3\Crypt;
-
-use phpseclib3\Crypt\Common\BlockCipher;
-use phpseclib3\Exception\BadModeException;
+namespace phpseclib\Crypt;
 
 /**
  * Pure-PHP implementation of RC2.
  *
+ * @package RC2
+ * @access  public
  */
-class RC2 extends BlockCipher
+class RC2 extends Base
 {
     /**
      * Block Length of the cipher
      *
-     * @see \phpseclib3\Crypt\Common\SymmetricKey::block_size
+     * @see \phpseclib\Crypt\Base::block_size
      * @var int
+     * @access private
      */
-    protected $block_size = 8;
+    var $block_size = 8;
 
     /**
      * The Key
      *
-     * @see \phpseclib3\Crypt\Common\SymmetricKey::key
+     * @see \phpseclib\Crypt\Base::key
      * @see self::setKey()
      * @var string
+     * @access private
      */
-    protected $key;
+    var $key;
 
     /**
      * The Original (unpadded) Key
      *
-     * @see \phpseclib3\Crypt\Common\SymmetricKey::key
+     * @see \phpseclib\Crypt\Base::key
      * @see self::setKey()
      * @see self::encrypt()
      * @see self::decrypt()
      * @var string
+     * @access private
      */
-    private $orig_key;
+    var $orig_key;
+
+    /**
+     * Don't truncate / null pad key
+     *
+     * @see \phpseclib\Crypt\Base::_clearBuffers()
+     * @var bool
+     * @access private
+     */
+    var $skip_key_adjustment = true;
 
     /**
      * Key Length (in bytes)
      *
-     * @see \phpseclib3\Crypt\RC2::setKeyLength()
+     * @see \phpseclib\Crypt\RC2::setKeyLength()
      * @var int
+     * @access private
      */
-    protected $key_length = 16; // = 128 bits
+    var $key_length = 16; // = 128 bits
 
     /**
      * The mcrypt specific name of the cipher
      *
-     * @see \phpseclib3\Crypt\Common\SymmetricKey::cipher_name_mcrypt
+     * @see \phpseclib\Crypt\Base::cipher_name_mcrypt
      * @var string
+     * @access private
      */
-    protected $cipher_name_mcrypt = 'rc2';
+    var $cipher_name_mcrypt = 'rc2';
 
     /**
      * Optimizing value while CFB-encrypting
      *
-     * @see \phpseclib3\Crypt\Common\SymmetricKey::cfb_init_len
+     * @see \phpseclib\Crypt\Base::cfb_init_len
      * @var int
+     * @access private
      */
-    protected $cfb_init_len = 500;
+    var $cfb_init_len = 500;
 
     /**
      * The key length in bits.
      *
-     * {@internal Should be in range [1..1024].}
-     *
-     * {@internal Changing this value after setting the key has no effect.}
-     *
      * @see self::setKeyLength()
      * @see self::setKey()
      * @var int
+     * @access private
+     * @internal Should be in range [1..1024].
+     * @internal Changing this value after setting the key has no effect.
      */
-    private $default_key_length = 1024;
+    var $default_key_length = 1024;
 
     /**
      * The key length in bits.
      *
-     * {@internal Should be in range [1..1024].}
-     *
      * @see self::isValidEnine()
      * @see self::setKey()
      * @var int
+     * @access private
+     * @internal Should be in range [1..1024].
      */
-    private $current_key_length;
+    var $current_key_length;
 
     /**
      * The Key Schedule
      *
-     * @see self::setupKey()
+     * @see self::_setupKey()
      * @var array
+     * @access private
      */
-    private $keys;
+    var $keys;
 
     /**
      * Key expansion randomization table.
@@ -132,8 +148,9 @@ class RC2 extends BlockCipher
      *
      * @see self::setKey()
      * @var array
+     * @access private
      */
-    private static $pitable = [
+    var $pitable = array(
         0xD9, 0x78, 0xF9, 0xC4, 0x19, 0xDD, 0xB5, 0xED,
         0x28, 0xE9, 0xFD, 0x79, 0x4A, 0xA0, 0xD8, 0x9D,
         0xC6, 0x7E, 0x37, 0x83, 0x2B, 0x76, 0x53, 0x8E,
@@ -198,15 +215,16 @@ class RC2 extends BlockCipher
         0xBB, 0x48, 0x0C, 0x5F, 0xB9, 0xB1, 0xCD, 0x2E,
         0xC5, 0xF3, 0xDB, 0x47, 0xE5, 0xA5, 0x9C, 0x77,
         0x0A, 0xA6, 0x20, 0x68, 0xFE, 0x7F, 0xC1, 0xAD
-    ];
+    );
 
     /**
      * Inverse key expansion randomization table.
      *
      * @see self::setKey()
      * @var array
+     * @access private
      */
-    private static $invpitable = [
+    var $invpitable = array(
         0xD1, 0xDA, 0xB9, 0x6F, 0x9C, 0xC8, 0x78, 0x66,
         0x80, 0x2C, 0xF8, 0x37, 0xEA, 0xE0, 0x62, 0xA4,
         0xCB, 0x71, 0x50, 0x27, 0x4B, 0x95, 0xD9, 0x20,
@@ -239,50 +257,30 @@ class RC2 extends BlockCipher
         0x81, 0x09, 0x82, 0x33, 0x9F, 0x07, 0x86, 0x75,
         0x38, 0x4E, 0x69, 0xF1, 0xAD, 0x23, 0x73, 0x87,
         0x70, 0x02, 0xC2, 0x1E, 0xB8, 0x0A, 0xFC, 0xE6
-    ];
-
-    /**
-     * Default Constructor.
-     *
-     * @param string $mode
-     * @throws \InvalidArgumentException if an invalid / unsupported mode is provided
-     */
-    public function __construct($mode)
-    {
-        parent::__construct($mode);
-
-        if ($this->mode == self::MODE_STREAM) {
-            throw new BadModeException('Block ciphers cannot be ran in stream mode');
-        }
-    }
+    );
 
     /**
      * Test for engine validity
      *
-     * This is mainly just a wrapper to set things up for \phpseclib3\Crypt\Common\SymmetricKey::isValidEngine()
+     * This is mainly just a wrapper to set things up for \phpseclib\Crypt\Base::isValidEngine()
      *
-     * @see \phpseclib3\Crypt\Common\SymmetricKey::__construct()
+     * @see \phpseclib\Crypt\Base::__construct()
      * @param int $engine
+     * @access public
      * @return bool
      */
-    protected function isValidEngineHelper($engine)
+    function isValidEngine($engine)
     {
         switch ($engine) {
             case self::ENGINE_OPENSSL:
                 if ($this->current_key_length != 128 || strlen($this->orig_key) < 16) {
                     return false;
                 }
-                // quoting https://www.openssl.org/news/openssl-3.0-notes.html, OpenSSL 3.0.1
-                // "Moved all variations of the EVP ciphers CAST5, BF, IDEA, SEED, RC2, RC4, RC5, and DES to the legacy provider"
-                // in theory openssl_get_cipher_methods() should catch this but, on GitHub Actions, at least, it does not
-                if (defined('OPENSSL_VERSION_TEXT') && version_compare(preg_replace('#OpenSSL (\d+\.\d+\.\d+) .*#', '$1', OPENSSL_VERSION_TEXT), '3.0.1', '>=')) {
-                    return false;
-                }
                 $this->cipher_name_openssl_ecb = 'rc2-ecb';
-                $this->cipher_name_openssl = 'rc2-' . $this->openssl_translate_mode();
+                $this->cipher_name_openssl = 'rc2-' . $this->_openssl_translate_mode();
         }
 
-        return parent::isValidEngineHelper($engine);
+        return parent::isValidEngine($engine);
     }
 
     /**
@@ -290,27 +288,32 @@ class RC2 extends BlockCipher
      *
      * Valid key lengths are 8 to 1024.
      * Calling this function after setting the key has no effect until the next
-     *  \phpseclib3\Crypt\RC2::setKey() call.
+     *  \phpseclib\Crypt\RC2::setKey() call.
      *
+     * @access public
      * @param int $length in bits
-     * @throws \LengthException if the key length isn't supported
      */
-    public function setKeyLength($length)
+    function setKeyLength($length)
     {
-        if ($length < 8 || $length > 1024) {
-            throw new \LengthException('Key size of ' . $length . ' bits is not supported by this algorithm. Only keys between 1 and 1024 bits, inclusive, are supported');
+        if ($length < 8) {
+            $this->default_key_length = 8;
+        } elseif ($length > 1024) {
+            $this->default_key_length = 128;
+        } else {
+            $this->default_key_length = $length;
         }
+        $this->current_key_length = $this->default_key_length;
 
-        $this->default_key_length = $this->current_key_length = $length;
-        $this->explicit_key_length = $length >> 3;
+        parent::setKeyLength($length);
     }
 
     /**
      * Returns the current key length
      *
+     * @access public
      * @return int
      */
-    public function getKeyLength()
+    function getKeyLength()
     {
         return $this->current_key_length;
     }
@@ -323,28 +326,26 @@ class RC2 extends BlockCipher
      * has more then 128 bytes in it, and set $key to a single null byte if
      * it is empty.
      *
-     * @see \phpseclib3\Crypt\Common\SymmetricKey::setKey()
+     * If the key is not explicitly set, it'll be assumed to be a single
+     * null byte.
+     *
+     * @see \phpseclib\Crypt\Base::setKey()
+     * @access public
      * @param string $key
-     * @param int|boolean $t1 optional Effective key length in bits.
-     * @throws \LengthException if the key length isn't supported
+     * @param int $t1 optional Effective key length in bits.
      */
-    public function setKey($key, $t1 = false)
+    function setKey($key, $t1 = 0)
     {
         $this->orig_key = $key;
 
-        if ($t1 === false) {
+        if ($t1 <= 0) {
             $t1 = $this->default_key_length;
+        } elseif ($t1 > 1024) {
+            $t1 = 1024;
         }
-
-        if ($t1 < 1 || $t1 > 1024) {
-            throw new \LengthException('Key size of ' . $length . ' bits is not supported by this algorithm. Only keys between 1 and 1024 bits, inclusive, are supported');
-        }
-
         $this->current_key_length = $t1;
-        if (strlen($key) < 1 || strlen($key) > 128) {
-            throw new \LengthException('Key of size ' . strlen($key) . ' not supported by this algorithm. Only keys of sizes between 8 and 1024 bits, inclusive, are supported');
-        }
-
+        // Key byte count should be 1..128.
+        $key = strlen($key) ? substr($key, 0, 128) : "\x00";
         $t = strlen($key);
 
         // The mcrypt RC2 implementation only supports effective key length
@@ -359,7 +360,7 @@ class RC2 extends BlockCipher
         $tm = 0xFF >> (8 * $t8 - $t1);
 
         // Expand key.
-        $pitable = self::$pitable;
+        $pitable = $this->pitable;
         for ($i = $t; $i < 128; $i++) {
             $l[$i] = $pitable[$l[$i - 1] + $l[$i - $t]];
         }
@@ -370,25 +371,23 @@ class RC2 extends BlockCipher
         }
 
         // Prepare the key for mcrypt.
-        $l[0] = self::$invpitable[$l[0]];
+        $l[0] = $this->invpitable[$l[0]];
         array_unshift($l, 'C*');
 
-        $this->key = pack(...$l);
-        $this->key_length = strlen($this->key);
-        $this->changed = $this->nonIVChanged = true;
-        $this->setEngine();
+        parent::setKey(call_user_func_array('pack', $l));
     }
 
     /**
      * Encrypts a message.
      *
-     * Mostly a wrapper for \phpseclib3\Crypt\Common\SymmetricKey::encrypt, with some additional OpenSSL handling code
+     * Mostly a wrapper for \phpseclib\Crypt\Base::encrypt, with some additional OpenSSL handling code
      *
      * @see self::decrypt()
+     * @access public
      * @param string $plaintext
      * @return string $ciphertext
      */
-    public function encrypt($plaintext)
+    function encrypt($plaintext)
     {
         if ($this->engine == self::ENGINE_OPENSSL) {
             $temp = $this->key;
@@ -404,13 +403,14 @@ class RC2 extends BlockCipher
     /**
      * Decrypts a message.
      *
-     * Mostly a wrapper for \phpseclib3\Crypt\Common\SymmetricKey::decrypt, with some additional OpenSSL handling code
+     * Mostly a wrapper for \phpseclib\Crypt\Base::decrypt, with some additional OpenSSL handling code
      *
      * @see self::encrypt()
+     * @access public
      * @param string $ciphertext
      * @return string $plaintext
      */
-    public function decrypt($ciphertext)
+    function decrypt($ciphertext)
     {
         if ($this->engine == self::ENGINE_OPENSSL) {
             $temp = $this->key;
@@ -426,17 +426,18 @@ class RC2 extends BlockCipher
     /**
      * Encrypts a block
      *
-     * @see \phpseclib3\Crypt\Common\SymmetricKey::encryptBlock()
-     * @see \phpseclib3\Crypt\Common\SymmetricKey::encrypt()
+     * @see \phpseclib\Crypt\Base::_encryptBlock()
+     * @see \phpseclib\Crypt\Base::encrypt()
+     * @access private
      * @param string $in
      * @return string
      */
-    protected function encryptBlock($in)
+    function _encryptBlock($in)
     {
         list($r0, $r1, $r2, $r3) = array_values(unpack('v*', $in));
         $keys = $this->keys;
         $limit = 20;
-        $actions = [$limit => 44, 44 => 64];
+        $actions = array($limit => 44, 44 => 64);
         $j = 0;
 
         for (;;) {
@@ -470,17 +471,18 @@ class RC2 extends BlockCipher
     /**
      * Decrypts a block
      *
-     * @see \phpseclib3\Crypt\Common\SymmetricKey::decryptBlock()
-     * @see \phpseclib3\Crypt\Common\SymmetricKey::decrypt()
+     * @see \phpseclib\Crypt\Base::_decryptBlock()
+     * @see \phpseclib\Crypt\Base::decrypt()
+     * @access private
      * @param string $in
      * @return string
      */
-    protected function decryptBlock($in)
+    function _decryptBlock($in)
     {
         list($r0, $r1, $r2, $r3) = array_values(unpack('v*', $in));
         $keys = $this->keys;
         $limit = 44;
-        $actions = [$limit => 20, 20 => 0];
+        $actions = array($limit => 20, 20 => 0);
         $j = 64;
 
         for (;;) {
@@ -512,20 +514,36 @@ class RC2 extends BlockCipher
     }
 
     /**
-     * Creates the key schedule
+     * Setup the \phpseclib\Crypt\Base::ENGINE_MCRYPT $engine
      *
-     * @see \phpseclib3\Crypt\Common\SymmetricKey::setupKey()
+     * @see \phpseclib\Crypt\Base::_setupMcrypt()
+     * @access private
      */
-    protected function setupKey()
+    function _setupMcrypt()
     {
         if (!isset($this->key)) {
             $this->setKey('');
         }
 
-        // Key has already been expanded in \phpseclib3\Crypt\RC2::setKey():
+        parent::_setupMcrypt();
+    }
+
+    /**
+     * Creates the key schedule
+     *
+     * @see \phpseclib\Crypt\Base::_setupKey()
+     * @access private
+     */
+    function _setupKey()
+    {
+        if (!isset($this->key)) {
+            $this->setKey('');
+        }
+
+        // Key has already been expanded in \phpseclib\Crypt\RC2::setKey():
         // Only the first value must be altered.
         $l = unpack('Ca/Cb/v*', $this->key);
-        array_unshift($l, self::$pitable[$l['a']] | ($l['b'] << 8));
+        array_unshift($l, $this->pitable[$l['a']] | ($l['b'] << 8));
         unset($l['a']);
         unset($l['b']);
         $this->keys = $l;
@@ -534,107 +552,137 @@ class RC2 extends BlockCipher
     /**
      * Setup the performance-optimized function for de/encrypt()
      *
-     * @see \phpseclib3\Crypt\Common\SymmetricKey::setupInlineCrypt()
+     * @see \phpseclib\Crypt\Base::_setupInlineCrypt()
+     * @access private
      */
-    protected function setupInlineCrypt()
+    function _setupInlineCrypt()
     {
-        // Init code for both, encrypt and decrypt.
-        $init_crypt = '$keys = $this->keys;';
+        $lambda_functions =& self::_getLambdaFunctions();
 
-        $keys = $this->keys;
+        // The first 10 generated $lambda_functions will use the $keys hardcoded as integers
+        // for the mixing rounds, for better inline crypt performance [~20% faster].
+        // But for memory reason we have to limit those ultra-optimized $lambda_functions to an amount of 10.
+        // (Currently, for Crypt_RC2, one generated $lambda_function cost on php5.5@32bit ~60kb unfreeable mem and ~100kb on php5.5@64bit)
+        $gen_hi_opt_code = (bool)(count($lambda_functions) < 10);
 
-        // $in is the current 8 bytes block which has to be en/decrypt
-        $encrypt_block = $decrypt_block = '
-            $in = unpack("v4", $in);
-            $r0 = $in[1];
-            $r1 = $in[2];
-            $r2 = $in[3];
-            $r3 = $in[4];
-        ';
+        // Generation of a unique hash for our generated code
+        $code_hash = "Crypt_RC2, {$this->mode}";
+        if ($gen_hi_opt_code) {
+            $code_hash = str_pad($code_hash, 32) . $this->_hashInlineCryptFunction($this->key);
+        }
 
-        // Create code for encryption.
-        $limit = 20;
-        $actions = [$limit => 44, 44 => 64];
-        $j = 0;
+        // Is there a re-usable $lambda_functions in there?
+        // If not, we have to create it.
+        if (!isset($lambda_functions[$code_hash])) {
+            // Init code for both, encrypt and decrypt.
+            $init_crypt = '$keys = $self->keys;';
 
-        for (;;) {
-            // Mixing round.
-            $encrypt_block .= '
-                $r0 = (($r0 + ' . $keys[$j++] . ' +
-                       ((($r1 ^ $r2) & $r3) ^ $r1)) & 0xFFFF) << 1;
-                $r0 |= $r0 >> 16;
-                $r1 = (($r1 + ' . $keys[$j++] . ' +
-                       ((($r2 ^ $r3) & $r0) ^ $r2)) & 0xFFFF) << 2;
-                $r1 |= $r1 >> 16;
-                $r2 = (($r2 + ' . $keys[$j++] . ' +
-                       ((($r3 ^ $r0) & $r1) ^ $r3)) & 0xFFFF) << 3;
-                $r2 |= $r2 >> 16;
-                $r3 = (($r3 + ' . $keys[$j++] . ' +
-                       ((($r0 ^ $r1) & $r2) ^ $r0)) & 0xFFFF) << 5;
-                $r3 |= $r3 >> 16;';
+            switch (true) {
+                case $gen_hi_opt_code:
+                    $keys = $this->keys;
+                default:
+                    $keys = array();
+                    foreach ($this->keys as $k => $v) {
+                        $keys[$k] = '$keys[' . $k . ']';
+                    }
+            }
 
-            if ($j === $limit) {
-                if ($limit === 64) {
-                    break;
-                }
+            // $in is the current 8 bytes block which has to be en/decrypt
+            $encrypt_block = $decrypt_block = '
+                $in = unpack("v4", $in);
+                $r0 = $in[1];
+                $r1 = $in[2];
+                $r2 = $in[3];
+                $r3 = $in[4];
+            ';
 
-                // Mashing round.
+            // Create code for encryption.
+            $limit = 20;
+            $actions = array($limit => 44, 44 => 64);
+            $j = 0;
+
+            for (;;) {
+                // Mixing round.
                 $encrypt_block .= '
-                    $r0 += $keys[$r3 & 0x3F];
-                    $r1 += $keys[$r0 & 0x3F];
-                    $r2 += $keys[$r1 & 0x3F];
-                    $r3 += $keys[$r2 & 0x3F];';
-                $limit = $actions[$limit];
-            }
-        }
+                    $r0 = (($r0 + ' . $keys[$j++] . ' +
+                           ((($r1 ^ $r2) & $r3) ^ $r1)) & 0xFFFF) << 1;
+                    $r0 |= $r0 >> 16;
+                    $r1 = (($r1 + ' . $keys[$j++] . ' +
+                           ((($r2 ^ $r3) & $r0) ^ $r2)) & 0xFFFF) << 2;
+                    $r1 |= $r1 >> 16;
+                    $r2 = (($r2 + ' . $keys[$j++] . ' +
+                           ((($r3 ^ $r0) & $r1) ^ $r3)) & 0xFFFF) << 3;
+                    $r2 |= $r2 >> 16;
+                    $r3 = (($r3 + ' . $keys[$j++] . ' +
+                           ((($r0 ^ $r1) & $r2) ^ $r0)) & 0xFFFF) << 5;
+                    $r3 |= $r3 >> 16;';
 
-        $encrypt_block .= '$in = pack("v4", $r0, $r1, $r2, $r3);';
+                if ($j === $limit) {
+                    if ($limit === 64) {
+                        break;
+                    }
 
-        // Create code for decryption.
-        $limit = 44;
-        $actions = [$limit => 20, 20 => 0];
-        $j = 64;
-
-        for (;;) {
-            // R-mixing round.
-            $decrypt_block .= '
-                $r3 = ($r3 | ($r3 << 16)) >> 5;
-                $r3 = ($r3 - ' . $keys[--$j] . ' -
-                       ((($r0 ^ $r1) & $r2) ^ $r0)) & 0xFFFF;
-                $r2 = ($r2 | ($r2 << 16)) >> 3;
-                $r2 = ($r2 - ' . $keys[--$j] . ' -
-                       ((($r3 ^ $r0) & $r1) ^ $r3)) & 0xFFFF;
-                $r1 = ($r1 | ($r1 << 16)) >> 2;
-                $r1 = ($r1 - ' . $keys[--$j] . ' -
-                       ((($r2 ^ $r3) & $r0) ^ $r2)) & 0xFFFF;
-                $r0 = ($r0 | ($r0 << 16)) >> 1;
-                $r0 = ($r0 - ' . $keys[--$j] . ' -
-                       ((($r1 ^ $r2) & $r3) ^ $r1)) & 0xFFFF;';
-
-            if ($j === $limit) {
-                if ($limit === 0) {
-                    break;
+                    // Mashing round.
+                    $encrypt_block .= '
+                        $r0 += $keys[$r3 & 0x3F];
+                        $r1 += $keys[$r0 & 0x3F];
+                        $r2 += $keys[$r1 & 0x3F];
+                        $r3 += $keys[$r2 & 0x3F];';
+                    $limit = $actions[$limit];
                 }
-
-                // R-mashing round.
-                $decrypt_block .= '
-                    $r3 = ($r3 - $keys[$r2 & 0x3F]) & 0xFFFF;
-                    $r2 = ($r2 - $keys[$r1 & 0x3F]) & 0xFFFF;
-                    $r1 = ($r1 - $keys[$r0 & 0x3F]) & 0xFFFF;
-                    $r0 = ($r0 - $keys[$r3 & 0x3F]) & 0xFFFF;';
-                $limit = $actions[$limit];
             }
+
+            $encrypt_block .= '$in = pack("v4", $r0, $r1, $r2, $r3);';
+
+            // Create code for decryption.
+            $limit = 44;
+            $actions = array($limit => 20, 20 => 0);
+            $j = 64;
+
+            for (;;) {
+                // R-mixing round.
+                $decrypt_block .= '
+                    $r3 = ($r3 | ($r3 << 16)) >> 5;
+                    $r3 = ($r3 - ' . $keys[--$j] . ' -
+                           ((($r0 ^ $r1) & $r2) ^ $r0)) & 0xFFFF;
+                    $r2 = ($r2 | ($r2 << 16)) >> 3;
+                    $r2 = ($r2 - ' . $keys[--$j] . ' -
+                           ((($r3 ^ $r0) & $r1) ^ $r3)) & 0xFFFF;
+                    $r1 = ($r1 | ($r1 << 16)) >> 2;
+                    $r1 = ($r1 - ' . $keys[--$j] . ' -
+                           ((($r2 ^ $r3) & $r0) ^ $r2)) & 0xFFFF;
+                    $r0 = ($r0 | ($r0 << 16)) >> 1;
+                    $r0 = ($r0 - ' . $keys[--$j] . ' -
+                           ((($r1 ^ $r2) & $r3) ^ $r1)) & 0xFFFF;';
+
+                if ($j === $limit) {
+                    if ($limit === 0) {
+                        break;
+                    }
+
+                    // R-mashing round.
+                    $decrypt_block .= '
+                        $r3 = ($r3 - $keys[$r2 & 0x3F]) & 0xFFFF;
+                        $r2 = ($r2 - $keys[$r1 & 0x3F]) & 0xFFFF;
+                        $r1 = ($r1 - $keys[$r0 & 0x3F]) & 0xFFFF;
+                        $r0 = ($r0 - $keys[$r3 & 0x3F]) & 0xFFFF;';
+                    $limit = $actions[$limit];
+                }
+            }
+
+            $decrypt_block .= '$in = pack("v4", $r0, $r1, $r2, $r3);';
+
+            // Creates the inline-crypt function
+            $lambda_functions[$code_hash] = $this->_createInlineCryptFunction(
+                array(
+                   'init_crypt'    => $init_crypt,
+                   'encrypt_block' => $encrypt_block,
+                   'decrypt_block' => $decrypt_block
+                )
+            );
         }
 
-        $decrypt_block .= '$in = pack("v4", $r0, $r1, $r2, $r3);';
-
-        // Creates the inline-crypt function
-        $this->inline_crypt = $this->createInlineCryptFunction(
-            [
-               'init_crypt'    => $init_crypt,
-               'encrypt_block' => $encrypt_block,
-               'decrypt_block' => $decrypt_block
-            ]
-        );
+        // Set the inline-crypt function as callback in: $this->inline_crypt
+        $this->inline_crypt = $lambda_functions[$code_hash];
     }
 }
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/RC4.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/RC4.php
index 5f3bff2c..1e768d7d 100644
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/RC4.php
+++ b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/RC4.php
@@ -20,7 +20,7 @@
  * <?php
  *    include 'vendor/autoload.php';
  *
- *    $rc4 = new \phpseclib3\Crypt\RC4();
+ *    $rc4 = new \phpseclib\Crypt\RC4();
  *
  *    $rc4->setKey('abcdefgh');
  *
@@ -34,90 +34,157 @@
  * ?>
  * </code>
  *
+ * @category  Crypt
+ * @package   RC4
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2007 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
  * @link      http://phpseclib.sourceforge.net
  */
 
-namespace phpseclib3\Crypt;
-
-use phpseclib3\Crypt\Common\StreamCipher;
+namespace phpseclib\Crypt;
 
 /**
  * Pure-PHP implementation of RC4.
  *
+ * @package RC4
  * @author  Jim Wigginton <terrafrost@php.net>
+ * @access  public
  */
-class RC4 extends StreamCipher
+class RC4 extends Base
 {
-    /**
-     * @see \phpseclib3\Crypt\RC4::_crypt()
-     */
+    /**#@+
+     * @access private
+     * @see \phpseclib\Crypt\RC4::_crypt()
+    */
     const ENCRYPT = 0;
+    const DECRYPT = 1;
+    /**#@-*/
 
     /**
-     * @see \phpseclib3\Crypt\RC4::_crypt()
+     * Block Length of the cipher
+     *
+     * RC4 is a stream cipher
+     * so we the block_size to 0
+     *
+     * @see \phpseclib\Crypt\Base::block_size
+     * @var int
+     * @access private
      */
-    const DECRYPT = 1;
+    var $block_size = 0;
 
     /**
      * Key Length (in bytes)
      *
-     * @see \phpseclib3\Crypt\RC4::setKeyLength()
+     * @see \phpseclib\Crypt\RC4::setKeyLength()
      * @var int
+     * @access private
      */
-    protected $key_length = 128; // = 1024 bits
+    var $key_length = 128; // = 1024 bits
 
     /**
      * The mcrypt specific name of the cipher
      *
-     * @see \phpseclib3\Crypt\Common\SymmetricKey::cipher_name_mcrypt
+     * @see \phpseclib\Crypt\Base::cipher_name_mcrypt
      * @var string
+     * @access private
      */
-    protected $cipher_name_mcrypt = 'arcfour';
+    var $cipher_name_mcrypt = 'arcfour';
+
+    /**
+     * Holds whether performance-optimized $inline_crypt() can/should be used.
+     *
+     * @see \phpseclib\Crypt\Base::inline_crypt
+     * @var mixed
+     * @access private
+     */
+    var $use_inline_crypt = false; // currently not available
 
     /**
      * The Key
      *
      * @see self::setKey()
      * @var string
+     * @access private
      */
-    protected $key;
+    var $key = "\0";
 
     /**
      * The Key Stream for decryption and encryption
      *
      * @see self::setKey()
      * @var array
+     * @access private
      */
-    private $stream;
+    var $stream;
+
+    /**
+     * Default Constructor.
+     *
+     * Determines whether or not the mcrypt extension should be used.
+     *
+     * @see \phpseclib\Crypt\Base::__construct()
+     * @return \phpseclib\Crypt\RC4
+     * @access public
+     */
+    function __construct()
+    {
+        parent::__construct(Base::MODE_STREAM);
+    }
 
     /**
      * Test for engine validity
      *
-     * This is mainly just a wrapper to set things up for \phpseclib3\Crypt\Common\SymmetricKey::isValidEngine()
+     * This is mainly just a wrapper to set things up for \phpseclib\Crypt\Base::isValidEngine()
      *
-     * @see \phpseclib3\Crypt\Common\SymmetricKey::__construct()
+     * @see \phpseclib\Crypt\Base::__construct()
      * @param int $engine
+     * @access public
      * @return bool
      */
-    protected function isValidEngineHelper($engine)
+    function isValidEngine($engine)
     {
-        if ($engine == self::ENGINE_OPENSSL) {
-            if ($this->continuousBuffer) {
-                return false;
-            }
-            // quoting https://www.openssl.org/news/openssl-3.0-notes.html, OpenSSL 3.0.1
-            // "Moved all variations of the EVP ciphers CAST5, BF, IDEA, SEED, RC2, RC4, RC5, and DES to the legacy provider"
-            // in theory openssl_get_cipher_methods() should catch this but, on GitHub Actions, at least, it does not
-            if (defined('OPENSSL_VERSION_TEXT') && version_compare(preg_replace('#OpenSSL (\d+\.\d+\.\d+) .*#', '$1', OPENSSL_VERSION_TEXT), '3.0.1', '>=')) {
-                return false;
-            }
-            $this->cipher_name_openssl = 'rc4-40';
+        switch ($engine) {
+            case Base::ENGINE_OPENSSL:
+                switch (strlen($this->key)) {
+                    case 5:
+                        $this->cipher_name_openssl = 'rc4-40';
+                        break;
+                    case 8:
+                        $this->cipher_name_openssl = 'rc4-64';
+                        break;
+                    case 16:
+                        $this->cipher_name_openssl = 'rc4';
+                        break;
+                    default:
+                        return false;
+                }
         }
 
-        return parent::isValidEngineHelper($engine);
+        return parent::isValidEngine($engine);
+    }
+
+    /**
+     * Dummy function.
+     *
+     * Some protocols, such as WEP, prepend an "initialization vector" to the key, effectively creating a new key [1].
+     * If you need to use an initialization vector in this manner, feel free to prepend it to the key, yourself, before
+     * calling setKey().
+     *
+     * [1] WEP's initialization vectors (IV's) are used in a somewhat insecure way.  Since, in that protocol,
+     * the IV's are relatively easy to predict, an attack described by
+     * {@link http://www.drizzle.com/~aboba/IEEE/rc4_ksaproc.pdf Scott Fluhrer, Itsik Mantin, and Adi Shamir}
+     * can be used to quickly guess at the rest of the key.  The following links elaborate:
+     *
+     * {@link http://www.rsa.com/rsalabs/node.asp?id=2009 http://www.rsa.com/rsalabs/node.asp?id=2009}
+     * {@link http://en.wikipedia.org/wiki/Related_key_attack http://en.wikipedia.org/wiki/Related_key_attack}
+     *
+     * @param string $iv
+     * @see self::setKey()
+     * @access public
+     */
+    function setIV($iv)
+    {
     }
 
     /**
@@ -125,51 +192,37 @@ class RC4 extends StreamCipher
      *
      * Keys can be between 1 and 256 bytes long.
      *
+     * @access public
      * @param int $length
-     * @throws \LengthException if the key length is invalid
      */
-    public function setKeyLength($length)
+    function setKeyLength($length)
     {
-        if ($length < 8 || $length > 2048) {
-            throw new \LengthException('Key size of ' . $length . ' bits is not supported by this algorithm. Only keys between 1 and 256 bytes are supported');
+        if ($length < 8) {
+            $this->key_length = 1;
+        } elseif ($length > 2048) {
+            $this->key_length = 256;
+        } else {
+            $this->key_length = $length >> 3;
         }
 
-        $this->key_length = $length >> 3;
-
         parent::setKeyLength($length);
     }
 
-    /**
-     * Sets the key length
-     *
-     * Keys can be between 1 and 256 bytes long.
-     *
-     * @param string $key
-     */
-    public function setKey($key)
-    {
-        $length = strlen($key);
-        if ($length < 1 || $length > 256) {
-            throw new \LengthException('Key size of ' . $length . ' bytes is not supported by RC4. Keys must be between 1 and 256 bytes long');
-        }
-
-        parent::setKey($key);
-    }
-
     /**
      * Encrypts a message.
      *
-     * @see \phpseclib3\Crypt\Common\SymmetricKey::decrypt()
-     * @see self::crypt()
+     * @see \phpseclib\Crypt\Base::decrypt()
+     * @see self::_crypt()
+     * @access public
      * @param string $plaintext
      * @return string $ciphertext
      */
-    public function encrypt($plaintext)
+    function encrypt($plaintext)
     {
-        if ($this->engine != self::ENGINE_INTERNAL) {
+        if ($this->engine != Base::ENGINE_INTERNAL) {
             return parent::encrypt($plaintext);
         }
-        return $this->crypt($plaintext, self::ENCRYPT);
+        return $this->_crypt($plaintext, self::ENCRYPT);
     }
 
     /**
@@ -178,25 +231,27 @@ class RC4 extends StreamCipher
      * $this->decrypt($this->encrypt($plaintext)) == $this->encrypt($this->encrypt($plaintext)).
      * At least if the continuous buffer is disabled.
      *
-     * @see \phpseclib3\Crypt\Common\SymmetricKey::encrypt()
-     * @see self::crypt()
+     * @see \phpseclib\Crypt\Base::encrypt()
+     * @see self::_crypt()
+     * @access public
      * @param string $ciphertext
      * @return string $plaintext
      */
-    public function decrypt($ciphertext)
+    function decrypt($ciphertext)
     {
-        if ($this->engine != self::ENGINE_INTERNAL) {
+        if ($this->engine != Base::ENGINE_INTERNAL) {
             return parent::decrypt($ciphertext);
         }
-        return $this->crypt($ciphertext, self::DECRYPT);
+        return $this->_crypt($ciphertext, self::DECRYPT);
     }
 
     /**
      * Encrypts a block
      *
+     * @access private
      * @param string $in
      */
-    protected function encryptBlock($in)
+    function _encryptBlock($in)
     {
         // RC4 does not utilize this method
     }
@@ -204,9 +259,10 @@ class RC4 extends StreamCipher
     /**
      * Decrypts a block
      *
+     * @access private
      * @param string $in
      */
-    protected function decryptBlock($in)
+    function _decryptBlock($in)
     {
         // RC4 does not utilize this method
     }
@@ -214,9 +270,10 @@ class RC4 extends StreamCipher
     /**
      * Setup the key (expansion)
      *
-     * @see \phpseclib3\Crypt\Common\SymmetricKey::_setupKey()
+     * @see \phpseclib\Crypt\Base::_setupKey()
+     * @access private
      */
-    protected function setupKey()
+    function _setupKey()
     {
         $key = $this->key;
         $keyLength = strlen($key);
@@ -229,12 +286,12 @@ class RC4 extends StreamCipher
             $keyStream[$j] = $temp;
         }
 
-        $this->stream = [];
-        $this->stream[self::DECRYPT] = $this->stream[self::ENCRYPT] = [
+        $this->stream = array();
+        $this->stream[self::DECRYPT] = $this->stream[self::ENCRYPT] = array(
             0, // index $i
             0, // index $j
             $keyStream
-        ];
+        );
     }
 
     /**
@@ -242,14 +299,16 @@ class RC4 extends StreamCipher
      *
      * @see self::encrypt()
      * @see self::decrypt()
+     * @access private
      * @param string $text
      * @param int $mode
      * @return string $text
      */
-    private function crypt($text, $mode)
+    function _crypt($text, $mode)
     {
         if ($this->changed) {
-            $this->setup();
+            $this->_setup();
+            $this->changed = false;
         }
 
         $stream = &$this->stream[$mode];
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/RSA.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/RSA.php
index 19dcfea3..ef508a43 100644
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/RSA.php
+++ b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/RSA.php
@@ -8,363 +8,651 @@
  * Here's an example of how to encrypt and decrypt text with this library:
  * <code>
  * <?php
- * include 'vendor/autoload.php';
+ *    include 'vendor/autoload.php';
  *
- * $private = \phpseclib3\Crypt\RSA::createKey();
- * $public = $private->getPublicKey();
+ *    $rsa = new \phpseclib\Crypt\RSA();
+ *    extract($rsa->createKey());
  *
- * $plaintext = 'terrafrost';
+ *    $plaintext = 'terrafrost';
  *
- * $ciphertext = $public->encrypt($plaintext);
+ *    $rsa->loadKey($privatekey);
+ *    $ciphertext = $rsa->encrypt($plaintext);
  *
- * echo $private->decrypt($ciphertext);
+ *    $rsa->loadKey($publickey);
+ *    echo $rsa->decrypt($ciphertext);
  * ?>
  * </code>
  *
  * Here's an example of how to create signatures and verify signatures with this library:
  * <code>
  * <?php
- * include 'vendor/autoload.php';
+ *    include 'vendor/autoload.php';
  *
- * $private = \phpseclib3\Crypt\RSA::createKey();
- * $public = $private->getPublicKey();
+ *    $rsa = new \phpseclib\Crypt\RSA();
+ *    extract($rsa->createKey());
  *
- * $plaintext = 'terrafrost';
+ *    $plaintext = 'terrafrost';
  *
- * $signature = $private->sign($plaintext);
+ *    $rsa->loadKey($privatekey);
+ *    $signature = $rsa->sign($plaintext);
  *
- * echo $public->verify($plaintext, $signature) ? 'verified' : 'unverified';
+ *    $rsa->loadKey($publickey);
+ *    echo $rsa->verify($plaintext, $signature) ? 'verified' : 'unverified';
  * ?>
  * </code>
  *
- * One thing to consider when using this: so phpseclib uses PSS mode by default.
- * Technically, id-RSASSA-PSS has a different key format than rsaEncryption. So
- * should phpseclib save to the id-RSASSA-PSS format by default or the
- * rsaEncryption format? For stand-alone keys I figure rsaEncryption is better
- * because SSH doesn't use PSS and idk how many SSH servers would be able to
- * decode an id-RSASSA-PSS key. For X.509 certificates the id-RSASSA-PSS
- * format is used by default (unless you change it up to use PKCS1 instead)
- *
+ * @category  Crypt
+ * @package   RSA
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2009 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
  * @link      http://phpseclib.sourceforge.net
  */
 
-namespace phpseclib3\Crypt;
+namespace phpseclib\Crypt;
 
-use phpseclib3\Crypt\Common\AsymmetricKey;
-use phpseclib3\Crypt\RSA\Formats\Keys\PSS;
-use phpseclib3\Crypt\RSA\PrivateKey;
-use phpseclib3\Crypt\RSA\PublicKey;
-use phpseclib3\Exception\InconsistentSetupException;
-use phpseclib3\Exception\UnsupportedAlgorithmException;
-use phpseclib3\Math\BigInteger;
+use phpseclib\Math\BigInteger;
 
 /**
  * Pure-PHP PKCS#1 compliant implementation of RSA.
  *
+ * @package RSA
  * @author  Jim Wigginton <terrafrost@php.net>
+ * @access  public
  */
-abstract class RSA extends AsymmetricKey
+class RSA
 {
-    /**
-     * Algorithm Name
-     *
-     * @var string
+    /**#@+
+     * @access public
+     * @see self::encrypt()
+     * @see self::decrypt()
      */
-    const ALGORITHM = 'RSA';
-
     /**
      * Use {@link http://en.wikipedia.org/wiki/Optimal_Asymmetric_Encryption_Padding Optimal Asymmetric Encryption Padding}
      * (OAEP) for encryption / decryption.
      *
-     * Uses sha256 by default
+     * Uses sha1 by default.
      *
      * @see self::setHash()
      * @see self::setMGFHash()
-     * @see self::encrypt()
-     * @see self::decrypt()
      */
     const ENCRYPTION_OAEP = 1;
-
     /**
      * Use PKCS#1 padding.
      *
-     * Although self::PADDING_OAEP / self::PADDING_PSS  offers more security, including PKCS#1 padding is necessary for purposes of backwards
+     * Although self::ENCRYPTION_OAEP offers more security, including PKCS#1 padding is necessary for purposes of backwards
      * compatibility with protocols (like SSH-1) written before OAEP's introduction.
-     *
-     * @see self::encrypt()
-     * @see self::decrypt()
      */
     const ENCRYPTION_PKCS1 = 2;
-
     /**
      * Do not use any padding
      *
      * Although this method is not recommended it can none-the-less sometimes be useful if you're trying to decrypt some legacy
      * stuff, if you're trying to diagnose why an encrypted message isn't decrypting, etc.
-     *
-     * @see self::encrypt()
-     * @see self::decrypt()
      */
-    const ENCRYPTION_NONE = 4;
+    const ENCRYPTION_NONE = 3;
+    /**#@-*/
 
+    /**#@+
+     * @access public
+     * @see self::sign()
+     * @see self::verify()
+     * @see self::setHash()
+    */
     /**
      * Use the Probabilistic Signature Scheme for signing
      *
-     * Uses sha256 and 0 as the salt length
+     * Uses sha1 by default.
      *
      * @see self::setSaltLength()
      * @see self::setMGFHash()
-     * @see self::setHash()
-     * @see self::sign()
-     * @see self::verify()
-     * @see self::setHash()
      */
-    const SIGNATURE_PSS = 16;
-
+    const SIGNATURE_PSS = 1;
     /**
-     * Use a relaxed version of PKCS#1 padding for signature verification
+     * Use the PKCS#1 scheme by default.
      *
-     * @see self::sign()
-     * @see self::verify()
-     * @see self::setHash()
+     * Although self::SIGNATURE_PSS offers more security, including PKCS#1 signing is necessary for purposes of backwards
+     * compatibility with protocols (like SSH-2) written before PSS's introduction.
      */
-    const SIGNATURE_RELAXED_PKCS1 = 32;
+    const SIGNATURE_PKCS1 = 2;
+    /**#@-*/
 
+    /**#@+
+     * @access private
+     * @see \phpseclib\Crypt\RSA::createKey()
+    */
     /**
-     * Use PKCS#1 padding for signature verification
+     * ASN1 Integer
+     */
+    const ASN1_INTEGER = 2;
+    /**
+     * ASN1 Bit String
+     */
+    const ASN1_BITSTRING = 3;
+    /**
+     * ASN1 Octet String
+     */
+    const ASN1_OCTETSTRING = 4;
+    /**
+     * ASN1 Object Identifier
+     */
+    const ASN1_OBJECT = 6;
+    /**
+     * ASN1 Sequence (with the constucted bit set)
+     */
+    const ASN1_SEQUENCE = 48;
+    /**#@-*/
+
+    /**#@+
+     * @access private
+     * @see \phpseclib\Crypt\RSA::__construct()
+    */
+    /**
+     * To use the pure-PHP implementation
+     */
+    const MODE_INTERNAL = 1;
+    /**
+     * To use the OpenSSL library
      *
-     * @see self::sign()
-     * @see self::verify()
-     * @see self::setHash()
+     * (if enabled; otherwise, the internal implementation will be used)
      */
-    const SIGNATURE_PKCS1 = 64;
+    const MODE_OPENSSL = 2;
+    /**#@-*/
+
+    /**#@+
+     * @access public
+     * @see \phpseclib\Crypt\RSA::createKey()
+     * @see \phpseclib\Crypt\RSA::setPrivateKeyFormat()
+    */
+    /**
+     * PKCS#1 formatted private key
+     *
+     * Used by OpenSSH
+     */
+    const PRIVATE_FORMAT_PKCS1 = 0;
+    /**
+     * PuTTY formatted private key
+     */
+    const PRIVATE_FORMAT_PUTTY = 1;
+    /**
+     * XML formatted private key
+     */
+    const PRIVATE_FORMAT_XML = 2;
+    /**
+     * PKCS#8 formatted private key
+     */
+    const PRIVATE_FORMAT_PKCS8 = 8;
+    /**#@-*/
+
+    /**#@+
+     * @access public
+     * @see \phpseclib\Crypt\RSA::createKey()
+     * @see \phpseclib\Crypt\RSA::setPublicKeyFormat()
+    */
+    /**
+     * Raw public key
+     *
+     * An array containing two \phpseclib\Math\BigInteger objects.
+     *
+     * The exponent can be indexed with any of the following:
+     *
+     * 0, e, exponent, publicExponent
+     *
+     * The modulus can be indexed with any of the following:
+     *
+     * 1, n, modulo, modulus
+     */
+    const PUBLIC_FORMAT_RAW = 3;
+    /**
+     * PKCS#1 formatted public key (raw)
+     *
+     * Used by File/X509.php
+     *
+     * Has the following header:
+     *
+     * -----BEGIN RSA PUBLIC KEY-----
+     *
+     * Analogous to ssh-keygen's pem format (as specified by -m)
+     */
+    const PUBLIC_FORMAT_PKCS1 = 4;
+    const PUBLIC_FORMAT_PKCS1_RAW = 4;
+    /**
+     * XML formatted public key
+     */
+    const PUBLIC_FORMAT_XML = 5;
+    /**
+     * OpenSSH formatted public key
+     *
+     * Place in $HOME/.ssh/authorized_keys
+     */
+    const PUBLIC_FORMAT_OPENSSH = 6;
+    /**
+     * PKCS#1 formatted public key (encapsulated)
+     *
+     * Used by PHP's openssl_public_encrypt() and openssl's rsautl (when -pubin is set)
+     *
+     * Has the following header:
+     *
+     * -----BEGIN PUBLIC KEY-----
+     *
+     * Analogous to ssh-keygen's pkcs8 format (as specified by -m). Although PKCS8
+     * is specific to private keys it's basically creating a DER-encoded wrapper
+     * for keys. This just extends that same concept to public keys (much like ssh-keygen)
+     */
+    const PUBLIC_FORMAT_PKCS8 = 7;
+    /**#@-*/
 
     /**
-     * Encryption padding mode
+     * Precomputed Zero
+     *
+     * @var \phpseclib\Math\BigInteger
+     * @access private
+     */
+    var $zero;
+
+    /**
+     * Precomputed One
+     *
+     * @var \phpseclib\Math\BigInteger
+     * @access private
+     */
+    var $one;
+
+    /**
+     * Private Key Format
      *
      * @var int
+     * @access private
      */
-    protected $encryptionPadding = self::ENCRYPTION_OAEP;
+    var $privateKeyFormat = self::PRIVATE_FORMAT_PKCS1;
 
     /**
-     * Signature padding mode
+     * Public Key Format
      *
      * @var int
+     * @access public
      */
-    protected $signaturePadding = self::SIGNATURE_PSS;
+    var $publicKeyFormat = self::PUBLIC_FORMAT_PKCS8;
+
+    /**
+     * Modulus (ie. n)
+     *
+     * @var \phpseclib\Math\BigInteger
+     * @access private
+     */
+    var $modulus;
+
+    /**
+     * Modulus length
+     *
+     * @var \phpseclib\Math\BigInteger
+     * @access private
+     */
+    var $k;
+
+    /**
+     * Exponent (ie. e or d)
+     *
+     * @var \phpseclib\Math\BigInteger
+     * @access private
+     */
+    var $exponent;
+
+    /**
+     * Primes for Chinese Remainder Theorem (ie. p and q)
+     *
+     * @var array
+     * @access private
+     */
+    var $primes;
+
+    /**
+     * Exponents for Chinese Remainder Theorem (ie. dP and dQ)
+     *
+     * @var array
+     * @access private
+     */
+    var $exponents;
+
+    /**
+     * Coefficients for Chinese Remainder Theorem (ie. qInv)
+     *
+     * @var array
+     * @access private
+     */
+    var $coefficients;
+
+    /**
+     * Hash name
+     *
+     * @var string
+     * @access private
+     */
+    var $hashName;
+
+    /**
+     * Hash function
+     *
+     * @var \phpseclib\Crypt\Hash
+     * @access private
+     */
+    var $hash;
 
     /**
      * Length of hash function output
      *
      * @var int
+     * @access private
      */
-    protected $hLen;
+    var $hLen;
 
     /**
      * Length of salt
      *
      * @var int
+     * @access private
      */
-    protected $sLen;
-
-    /**
-     * Label
-     *
-     * @var string
-     */
-    protected $label = '';
+    var $sLen;
 
     /**
      * Hash function for the Mask Generation Function
      *
-     * @var \phpseclib3\Crypt\Hash
+     * @var \phpseclib\Crypt\Hash
+     * @access private
      */
-    protected $mgfHash;
+    var $mgfHash;
 
     /**
      * Length of MGF hash function output
      *
      * @var int
+     * @access private
      */
-    protected $mgfHLen;
+    var $mgfHLen;
 
     /**
-     * Modulus (ie. n)
-     *
-     * @var \phpseclib3\Math\BigInteger
-     */
-    protected $modulus;
-
-    /**
-     * Modulus length
-     *
-     * @var \phpseclib3\Math\BigInteger
-     */
-    protected $k;
-
-    /**
-     * Exponent (ie. e or d)
-     *
-     * @var \phpseclib3\Math\BigInteger
-     */
-    protected $exponent;
-
-    /**
-     * Default public exponent
+     * Encryption mode
      *
      * @var int
-     * @link http://en.wikipedia.org/wiki/65537_%28number%29
+     * @access private
      */
-    private static $defaultExponent = 65537;
+    var $encryptionMode = self::ENCRYPTION_OAEP;
 
     /**
-     * Enable Blinding?
-     *
-     * @var bool
-     */
-    protected static $enableBlinding = true;
-
-    /**
-     * OpenSSL configuration file name.
-     *
-     * @see self::createKey()
-     * @var ?string
-     */
-    protected static $configFile;
-
-    /**
-     * Smallest Prime
-     *
-     * Per <http://cseweb.ucsd.edu/~hovav/dist/survey.pdf#page=5>, this number ought not result in primes smaller
-     * than 256 bits. As a consequence if the key you're trying to create is 1024 bits and you've set smallestPrime
-     * to 384 bits then you're going to get a 384 bit prime and a 640 bit prime (384 + 1024 % 384). At least if
-     * engine is set to self::ENGINE_INTERNAL. If Engine is set to self::ENGINE_OPENSSL then smallest Prime is
-     * ignored (ie. multi-prime RSA support is more intended as a way to speed up RSA key generation when there's
-     * a chance neither gmp nor OpenSSL are installed)
+     * Signature mode
      *
      * @var int
+     * @access private
      */
-    private static $smallestPrime = 4096;
+    var $signatureMode = self::SIGNATURE_PSS;
 
     /**
      * Public Exponent
      *
-     * @var \phpseclib3\Math\BigInteger
+     * @var mixed
+     * @access private
      */
-    protected $publicExponent;
+    var $publicExponent = false;
 
     /**
-     * Sets the public exponent for key generation
+     * Password
      *
-     * This will be 65537 unless changed.
-     *
-     * @param int $val
+     * @var string
+     * @access private
      */
-    public static function setExponent($val)
+    var $password = false;
+
+    /**
+     * Components
+     *
+     * For use with parsing XML formatted keys.  PHP's XML Parser functions use utilized - instead of PHP's DOM functions -
+     * because PHP's XML Parser functions work on PHP4 whereas PHP's DOM functions - although surperior - don't.
+     *
+     * @see self::_start_element_handler()
+     * @var array
+     * @access private
+     */
+    var $components = array();
+
+    /**
+     * Current String
+     *
+     * For use with parsing XML formatted keys.
+     *
+     * @see self::_character_handler()
+     * @see self::_stop_element_handler()
+     * @var mixed
+     * @access private
+     */
+    var $current;
+
+    /**
+     * OpenSSL configuration file name.
+     *
+     * Set to null to use system configuration file.
+     * @see self::createKey()
+     * @var mixed
+     * @Access public
+     */
+    var $configFile;
+
+    /**
+     * Public key comment field.
+     *
+     * @var string
+     * @access private
+     */
+    var $comment = 'phpseclib-generated-key';
+
+    /**
+     * The constructor
+     *
+     * If you want to make use of the openssl extension, you'll need to set the mode manually, yourself.  The reason
+     * \phpseclib\Crypt\RSA doesn't do it is because OpenSSL doesn't fail gracefully.  openssl_pkey_new(), in particular, requires
+     * openssl.cnf be present somewhere and, unfortunately, the only real way to find out is too late.
+     *
+     * @return \phpseclib\Crypt\RSA
+     * @access public
+     */
+    function __construct()
     {
-        self::$defaultExponent = $val;
+        $this->configFile = dirname(__FILE__) . '/../openssl.cnf';
+
+        if (!defined('CRYPT_RSA_MODE')) {
+            switch (true) {
+                // Math/BigInteger's openssl requirements are a little less stringent than Crypt/RSA's. in particular,
+                // Math/BigInteger doesn't require an openssl.cfg file whereas Crypt/RSA does. so if Math/BigInteger
+                // can't use OpenSSL it can be pretty trivially assumed, then, that Crypt/RSA can't either.
+                case defined('MATH_BIGINTEGER_OPENSSL_DISABLE'):
+                    define('CRYPT_RSA_MODE', self::MODE_INTERNAL);
+                    break;
+                case extension_loaded('openssl') && file_exists($this->configFile):
+                    // some versions of XAMPP have mismatched versions of OpenSSL which causes it not to work
+                    ob_start();
+                    @phpinfo();
+                    $content = ob_get_contents();
+                    ob_end_clean();
+
+                    preg_match_all('#OpenSSL (Header|Library) Version(.*)#im', $content, $matches);
+
+                    $versions = array();
+                    if (!empty($matches[1])) {
+                        for ($i = 0; $i < count($matches[1]); $i++) {
+                            $fullVersion = trim(str_replace('=>', '', strip_tags($matches[2][$i])));
+
+                            // Remove letter part in OpenSSL version
+                            if (!preg_match('/(\d+\.\d+\.\d+)/i', $fullVersion, $m)) {
+                                $versions[$matches[1][$i]] = $fullVersion;
+                            } else {
+                                $versions[$matches[1][$i]] = $m[0];
+                            }
+                        }
+                    }
+
+                    // it doesn't appear that OpenSSL versions were reported upon until PHP 5.3+
+                    switch (true) {
+                        case !isset($versions['Header']):
+                        case !isset($versions['Library']):
+                        case $versions['Header'] == $versions['Library']:
+                        case version_compare($versions['Header'], '1.0.0') >= 0 && version_compare($versions['Library'], '1.0.0') >= 0:
+                            define('CRYPT_RSA_MODE', self::MODE_OPENSSL);
+                            break;
+                        default:
+                            define('CRYPT_RSA_MODE', self::MODE_INTERNAL);
+                            define('MATH_BIGINTEGER_OPENSSL_DISABLE', true);
+                    }
+                    break;
+                default:
+                    define('CRYPT_RSA_MODE', self::MODE_INTERNAL);
+            }
+        }
+
+        $this->zero = new BigInteger();
+        $this->one = new BigInteger(1);
+
+        $this->hash = new Hash('sha1');
+        $this->hLen = $this->hash->getLength();
+        $this->hashName = 'sha1';
+        $this->mgfHash = new Hash('sha1');
+        $this->mgfHLen = $this->mgfHash->getLength();
     }
 
     /**
-     * Sets the smallest prime number in bits. Used for key generation
+     * Create public / private key pair
      *
-     * This will be 4096 unless changed.
+     * Returns an array with the following three elements:
+     *  - 'privatekey': The private key.
+     *  - 'publickey':  The public key.
+     *  - 'partialkey': A partially computed key (if the execution time exceeded $timeout).
+     *                  Will need to be passed back to \phpseclib\Crypt\RSA::createKey() as the third parameter for further processing.
      *
-     * @param int $val
-     */
-    public static function setSmallestPrime($val)
-    {
-        self::$smallestPrime = $val;
-    }
-
-    /**
-     * Sets the OpenSSL config file path
-     *
-     * Set to the empty string to use the default config file
-     *
-     * @param string $val
-     */
-    public static function setOpenSSLConfigPath($val)
-    {
-        self::$configFile = $val;
-    }
-
-    /**
-     * Create a private key
-     *
-     * The public key can be extracted from the private key
-     *
-     * @return RSA\PrivateKey
+     * @access public
      * @param int $bits
+     * @param int $timeout
+     * @param array $p
      */
-    public static function createKey($bits = 2048)
+    function createKey($bits = 1024, $timeout = false, $partial = array())
     {
-        self::initialize_static_variables();
-
-        $class = new \ReflectionClass(static::class);
-        if ($class->isFinal()) {
-            throw new \RuntimeException('createKey() should not be called from final classes (' . static::class . ')');
+        if (!defined('CRYPT_RSA_EXPONENT')) {
+            // http://en.wikipedia.org/wiki/65537_%28number%29
+            define('CRYPT_RSA_EXPONENT', '65537');
+        }
+        // per <http://cseweb.ucsd.edu/~hovav/dist/survey.pdf#page=5>, this number ought not result in primes smaller
+        // than 256 bits. as a consequence if the key you're trying to create is 1024 bits and you've set CRYPT_RSA_SMALLEST_PRIME
+        // to 384 bits then you're going to get a 384 bit prime and a 640 bit prime (384 + 1024 % 384). at least if
+        // CRYPT_RSA_MODE is set to self::MODE_INTERNAL. if CRYPT_RSA_MODE is set to self::MODE_OPENSSL then
+        // CRYPT_RSA_SMALLEST_PRIME is ignored (ie. multi-prime RSA support is more intended as a way to speed up RSA key
+        // generation when there's a chance neither gmp nor OpenSSL are installed)
+        if (!defined('CRYPT_RSA_SMALLEST_PRIME')) {
+            define('CRYPT_RSA_SMALLEST_PRIME', 4096);
         }
 
-        $regSize = $bits >> 1; // divide by two to see how many bits P and Q would be
-        if ($regSize > self::$smallestPrime) {
-            $num_primes = floor($bits / self::$smallestPrime);
-            $regSize = self::$smallestPrime;
-        } else {
-            $num_primes = 2;
-        }
+        // OpenSSL uses 65537 as the exponent and requires RSA keys be 384 bits minimum
+        if (CRYPT_RSA_MODE == self::MODE_OPENSSL && $bits >= 384 && CRYPT_RSA_EXPONENT == 65537) {
+            $config = array();
+            if (isset($this->configFile)) {
+                $config['config'] = $this->configFile;
+            }
+            $rsa = openssl_pkey_new(array('private_key_bits' => $bits) + $config);
+            openssl_pkey_export($rsa, $privatekey, null, $config);
+            $publickey = openssl_pkey_get_details($rsa);
+            $publickey = $publickey['key'];
 
-        if ($num_primes == 2 && $bits >= 384 && self::$defaultExponent == 65537) {
-            if (!isset(self::$engines['PHP'])) {
-                self::useBestEngine();
+            $privatekey = call_user_func_array(array($this, '_convertPrivateKey'), array_values($this->_parseKey($privatekey, self::PRIVATE_FORMAT_PKCS1)));
+            $publickey = call_user_func_array(array($this, '_convertPublicKey'), array_values($this->_parseKey($publickey, self::PUBLIC_FORMAT_PKCS1)));
+
+            // clear the buffer of error strings stemming from a minimalistic openssl.cnf
+            while (openssl_error_string() !== false) {
             }
 
-            // OpenSSL uses 65537 as the exponent and requires RSA keys be 384 bits minimum
-            if (self::$engines['OpenSSL']) {
-                $config = [];
-                if (self::$configFile) {
-                    $config['config'] = self::$configFile;
-                }
-                $rsa = openssl_pkey_new(['private_key_bits' => $bits] + $config);
-                openssl_pkey_export($rsa, $privatekeystr, null, $config);
-
-                // clear the buffer of error strings stemming from a minimalistic openssl.cnf
-                // https://github.com/php/php-src/issues/11054 talks about other errors this'll pick up
-                while (openssl_error_string() !== false) {
-                }
-
-                return RSA::load($privatekeystr);
-            }
+            return array(
+                'privatekey' => $privatekey,
+                'publickey' => $publickey,
+                'partialkey' => false
+            );
         }
 
         static $e;
         if (!isset($e)) {
-            $e = new BigInteger(self::$defaultExponent);
+            $e = new BigInteger(CRYPT_RSA_EXPONENT);
         }
 
-        $n = clone self::$one;
-        $exponents = $coefficients = $primes = [];
-        $lcm = [
-            'top' => clone self::$one,
-            'bottom' => false
-        ];
+        extract($this->_generateMinMax($bits));
+        $absoluteMin = $min;
+        $temp = $bits >> 1; // divide by two to see how many bits P and Q would be
+        if ($temp > CRYPT_RSA_SMALLEST_PRIME) {
+            $num_primes = floor($bits / CRYPT_RSA_SMALLEST_PRIME);
+            $temp = CRYPT_RSA_SMALLEST_PRIME;
+        } else {
+            $num_primes = 2;
+        }
+        extract($this->_generateMinMax($temp + $bits % $temp));
+        $finalMax = $max;
+        extract($this->_generateMinMax($temp));
+
+        $generator = new BigInteger();
+
+        $n = $this->one->copy();
+        if (!empty($partial)) {
+            extract(unserialize($partial));
+        } else {
+            $exponents = $coefficients = $primes = array();
+            $lcm = array(
+                'top' => $this->one->copy(),
+                'bottom' => false
+            );
+        }
+
+        $start = time();
+        $i0 = count($primes) + 1;
 
         do {
-            for ($i = 1; $i <= $num_primes; $i++) {
-                if ($i != $num_primes) {
-                    $primes[$i] = BigInteger::randomPrime($regSize);
+            for ($i = $i0; $i <= $num_primes; $i++) {
+                if ($timeout !== false) {
+                    $timeout-= time() - $start;
+                    $start = time();
+                    if ($timeout <= 0) {
+                        return array(
+                            'privatekey' => '',
+                            'publickey'  => '',
+                            'partialkey' => serialize(array(
+                                'primes' => $primes,
+                                'coefficients' => $coefficients,
+                                'lcm' => $lcm,
+                                'exponents' => $exponents
+                            ))
+                        );
+                    }
+                }
+
+                if ($i == $num_primes) {
+                    list($min, $temp) = $absoluteMin->divide($n);
+                    if (!$temp->equals($this->zero)) {
+                        $min = $min->add($this->one); // ie. ceil()
+                    }
+                    $primes[$i] = $generator->randomPrime($min, $finalMax, $timeout);
                 } else {
-                    extract(BigInteger::minMaxBits($bits));
-                    /** @var BigInteger $min
-                     *  @var BigInteger $max
-                     */
-                    list($min) = $min->divide($n);
-                    $min = $min->add(self::$one);
-                    list($max) = $max->divide($n);
-                    $primes[$i] = BigInteger::randomRangePrime($min, $max);
+                    $primes[$i] = $generator->randomPrime($min, $max, $timeout);
+                }
+
+                if ($primes[$i] === false) { // if we've reached the timeout
+                    if (count($primes) > 1) {
+                        $partialkey = '';
+                    } else {
+                        array_pop($primes);
+                        $partialkey = serialize(array(
+                            'primes' => $primes,
+                            'coefficients' => $coefficients,
+                            'lcm' => $lcm,
+                            'exponents' => $exponents
+                        ));
+                    }
+
+                    return array(
+                        'privatekey' => '',
+                        'publickey'  => '',
+                        'partialkey' => $partialkey
+                    );
                 }
 
                 // the first coefficient is calculated differently from the rest
@@ -375,27 +663,24 @@ abstract class RSA extends AsymmetricKey
 
                 $n = $n->multiply($primes[$i]);
 
-                $temp = $primes[$i]->subtract(self::$one);
+                $temp = $primes[$i]->subtract($this->one);
 
                 // textbook RSA implementations use Euler's totient function instead of the least common multiple.
                 // see http://en.wikipedia.org/wiki/Euler%27s_totient_function
                 $lcm['top'] = $lcm['top']->multiply($temp);
                 $lcm['bottom'] = $lcm['bottom'] === false ? $temp : $lcm['bottom']->gcd($temp);
+
+                $exponents[$i] = $e->modInverse($temp);
             }
 
             list($temp) = $lcm['top']->divide($lcm['bottom']);
             $gcd = $temp->gcd($e);
             $i0 = 1;
-        } while (!$gcd->equals(self::$one));
-
-        $coefficients[2] = $primes[2]->modInverse($primes[1]);
+        } while (!$gcd->equals($this->one));
 
         $d = $e->modInverse($temp);
 
-        foreach ($primes as $i => $prime) {
-            $temp = $prime->subtract(self::$one);
-            $exponents[$i] = $e->modInverse($temp);
-        }
+        $coefficients[2] = $primes[2]->modInverse($primes[1]);
 
         // from <http://tools.ietf.org/html/rfc3447#appendix-A.1.2>:
         // RSAPrivateKey ::= SEQUENCE {
@@ -410,99 +695,1350 @@ abstract class RSA extends AsymmetricKey
         //     coefficient       INTEGER,  -- (inverse of q) mod p
         //     otherPrimeInfos   OtherPrimeInfos OPTIONAL
         // }
-        $privatekey = new PrivateKey();
-        $privatekey->modulus = $n;
-        $privatekey->k = $bits >> 3;
-        $privatekey->publicExponent = $e;
-        $privatekey->exponent = $d;
-        $privatekey->primes = $primes;
-        $privatekey->exponents = $exponents;
-        $privatekey->coefficients = $coefficients;
 
-        /*
-        $publickey = new PublicKey;
-        $publickey->modulus = $n;
-        $publickey->k = $bits >> 3;
-        $publickey->exponent = $e;
-        $publickey->publicExponent = $e;
-        $publickey->isPublic = true;
-        */
-
-        return $privatekey;
+        return array(
+            'privatekey' => $this->_convertPrivateKey($n, $e, $d, $primes, $exponents, $coefficients),
+            'publickey'  => $this->_convertPublicKey($n, $e),
+            'partialkey' => false
+        );
     }
 
     /**
-     * OnLoad Handler
+     * Convert a private key to the appropriate format.
      *
+     * @access private
+     * @see self::setPrivateKeyFormat()
+     * @param string $RSAPrivateKey
+     * @return string
+     */
+    function _convertPrivateKey($n, $e, $d, $primes, $exponents, $coefficients)
+    {
+        $signed = $this->privateKeyFormat != self::PRIVATE_FORMAT_XML;
+        $num_primes = count($primes);
+        $raw = array(
+            'version' => $num_primes == 2 ? chr(0) : chr(1), // two-prime vs. multi
+            'modulus' => $n->toBytes($signed),
+            'publicExponent' => $e->toBytes($signed),
+            'privateExponent' => $d->toBytes($signed),
+            'prime1' => $primes[1]->toBytes($signed),
+            'prime2' => $primes[2]->toBytes($signed),
+            'exponent1' => $exponents[1]->toBytes($signed),
+            'exponent2' => $exponents[2]->toBytes($signed),
+            'coefficient' => $coefficients[2]->toBytes($signed)
+        );
+
+        // if the format in question does not support multi-prime rsa and multi-prime rsa was used,
+        // call _convertPublicKey() instead.
+        switch ($this->privateKeyFormat) {
+            case self::PRIVATE_FORMAT_XML:
+                if ($num_primes != 2) {
+                    return false;
+                }
+                return "<RSAKeyValue>\r\n" .
+                       '  <Modulus>' . base64_encode($raw['modulus']) . "</Modulus>\r\n" .
+                       '  <Exponent>' . base64_encode($raw['publicExponent']) . "</Exponent>\r\n" .
+                       '  <P>' . base64_encode($raw['prime1']) . "</P>\r\n" .
+                       '  <Q>' . base64_encode($raw['prime2']) . "</Q>\r\n" .
+                       '  <DP>' . base64_encode($raw['exponent1']) . "</DP>\r\n" .
+                       '  <DQ>' . base64_encode($raw['exponent2']) . "</DQ>\r\n" .
+                       '  <InverseQ>' . base64_encode($raw['coefficient']) . "</InverseQ>\r\n" .
+                       '  <D>' . base64_encode($raw['privateExponent']) . "</D>\r\n" .
+                       '</RSAKeyValue>';
+                break;
+            case self::PRIVATE_FORMAT_PUTTY:
+                if ($num_primes != 2) {
+                    return false;
+                }
+                $key = "PuTTY-User-Key-File-2: ssh-rsa\r\nEncryption: ";
+                $encryption = (!empty($this->password) || is_string($this->password)) ? 'aes256-cbc' : 'none';
+                $key.= $encryption;
+                $key.= "\r\nComment: " . $this->comment . "\r\n";
+                $public = pack(
+                    'Na*Na*Na*',
+                    strlen('ssh-rsa'),
+                    'ssh-rsa',
+                    strlen($raw['publicExponent']),
+                    $raw['publicExponent'],
+                    strlen($raw['modulus']),
+                    $raw['modulus']
+                );
+                $source = pack(
+                    'Na*Na*Na*Na*',
+                    strlen('ssh-rsa'),
+                    'ssh-rsa',
+                    strlen($encryption),
+                    $encryption,
+                    strlen($this->comment),
+                    $this->comment,
+                    strlen($public),
+                    $public
+                );
+                $public = base64_encode($public);
+                $key.= "Public-Lines: " . ((strlen($public) + 63) >> 6) . "\r\n";
+                $key.= chunk_split($public, 64);
+                $private = pack(
+                    'Na*Na*Na*Na*',
+                    strlen($raw['privateExponent']),
+                    $raw['privateExponent'],
+                    strlen($raw['prime1']),
+                    $raw['prime1'],
+                    strlen($raw['prime2']),
+                    $raw['prime2'],
+                    strlen($raw['coefficient']),
+                    $raw['coefficient']
+                );
+                if (empty($this->password) && !is_string($this->password)) {
+                    $source.= pack('Na*', strlen($private), $private);
+                    $hashkey = 'putty-private-key-file-mac-key';
+                } else {
+                    $private.= Random::string(16 - (strlen($private) & 15));
+                    $source.= pack('Na*', strlen($private), $private);
+                    $sequence = 0;
+                    $symkey = '';
+                    while (strlen($symkey) < 32) {
+                        $temp = pack('Na*', $sequence++, $this->password);
+                        $symkey.= pack('H*', sha1($temp));
+                    }
+                    $symkey = substr($symkey, 0, 32);
+                    $crypto = new AES();
+
+                    $crypto->setKey($symkey);
+                    $crypto->disablePadding();
+                    $private = $crypto->encrypt($private);
+                    $hashkey = 'putty-private-key-file-mac-key' . $this->password;
+                }
+
+                $private = base64_encode($private);
+                $key.= 'Private-Lines: ' . ((strlen($private) + 63) >> 6) . "\r\n";
+                $key.= chunk_split($private, 64);
+                $hash = new Hash('sha1');
+                $hash->setKey(pack('H*', sha1($hashkey)));
+                $key.= 'Private-MAC: ' . bin2hex($hash->hash($source)) . "\r\n";
+
+                return $key;
+            default: // eg. self::PRIVATE_FORMAT_PKCS1
+                $components = array();
+                foreach ($raw as $name => $value) {
+                    $components[$name] = pack('Ca*a*', self::ASN1_INTEGER, $this->_encodeLength(strlen($value)), $value);
+                }
+
+                $RSAPrivateKey = implode('', $components);
+
+                if ($num_primes > 2) {
+                    $OtherPrimeInfos = '';
+                    for ($i = 3; $i <= $num_primes; $i++) {
+                        // OtherPrimeInfos ::= SEQUENCE SIZE(1..MAX) OF OtherPrimeInfo
+                        //
+                        // OtherPrimeInfo ::= SEQUENCE {
+                        //     prime             INTEGER,  -- ri
+                        //     exponent          INTEGER,  -- di
+                        //     coefficient       INTEGER   -- ti
+                        // }
+                        $OtherPrimeInfo = pack('Ca*a*', self::ASN1_INTEGER, $this->_encodeLength(strlen($primes[$i]->toBytes(true))), $primes[$i]->toBytes(true));
+                        $OtherPrimeInfo.= pack('Ca*a*', self::ASN1_INTEGER, $this->_encodeLength(strlen($exponents[$i]->toBytes(true))), $exponents[$i]->toBytes(true));
+                        $OtherPrimeInfo.= pack('Ca*a*', self::ASN1_INTEGER, $this->_encodeLength(strlen($coefficients[$i]->toBytes(true))), $coefficients[$i]->toBytes(true));
+                        $OtherPrimeInfos.= pack('Ca*a*', self::ASN1_SEQUENCE, $this->_encodeLength(strlen($OtherPrimeInfo)), $OtherPrimeInfo);
+                    }
+                    $RSAPrivateKey.= pack('Ca*a*', self::ASN1_SEQUENCE, $this->_encodeLength(strlen($OtherPrimeInfos)), $OtherPrimeInfos);
+                }
+
+                $RSAPrivateKey = pack('Ca*a*', self::ASN1_SEQUENCE, $this->_encodeLength(strlen($RSAPrivateKey)), $RSAPrivateKey);
+
+                if ($this->privateKeyFormat == self::PRIVATE_FORMAT_PKCS8) {
+                    $rsaOID = pack('H*', '300d06092a864886f70d0101010500'); // hex version of MA0GCSqGSIb3DQEBAQUA
+                    $RSAPrivateKey = pack(
+                        'Ca*a*Ca*a*',
+                        self::ASN1_INTEGER,
+                        "\01\00",
+                        $rsaOID,
+                        4,
+                        $this->_encodeLength(strlen($RSAPrivateKey)),
+                        $RSAPrivateKey
+                    );
+                    $RSAPrivateKey = pack('Ca*a*', self::ASN1_SEQUENCE, $this->_encodeLength(strlen($RSAPrivateKey)), $RSAPrivateKey);
+                    if (!empty($this->password) || is_string($this->password)) {
+                        $salt = Random::string(8);
+                        $iterationCount = 2048;
+
+                        $crypto = new DES();
+                        $crypto->setPassword($this->password, 'pbkdf1', 'md5', $salt, $iterationCount);
+                        $RSAPrivateKey = $crypto->encrypt($RSAPrivateKey);
+
+                        $parameters = pack(
+                            'Ca*a*Ca*N',
+                            self::ASN1_OCTETSTRING,
+                            $this->_encodeLength(strlen($salt)),
+                            $salt,
+                            self::ASN1_INTEGER,
+                            $this->_encodeLength(4),
+                            $iterationCount
+                        );
+                        $pbeWithMD5AndDES_CBC = "\x2a\x86\x48\x86\xf7\x0d\x01\x05\x03";
+
+                        $encryptionAlgorithm = pack(
+                            'Ca*a*Ca*a*',
+                            self::ASN1_OBJECT,
+                            $this->_encodeLength(strlen($pbeWithMD5AndDES_CBC)),
+                            $pbeWithMD5AndDES_CBC,
+                            self::ASN1_SEQUENCE,
+                            $this->_encodeLength(strlen($parameters)),
+                            $parameters
+                        );
+
+                        $RSAPrivateKey = pack(
+                            'Ca*a*Ca*a*',
+                            self::ASN1_SEQUENCE,
+                            $this->_encodeLength(strlen($encryptionAlgorithm)),
+                            $encryptionAlgorithm,
+                            self::ASN1_OCTETSTRING,
+                            $this->_encodeLength(strlen($RSAPrivateKey)),
+                            $RSAPrivateKey
+                        );
+
+                        $RSAPrivateKey = pack('Ca*a*', self::ASN1_SEQUENCE, $this->_encodeLength(strlen($RSAPrivateKey)), $RSAPrivateKey);
+
+                        $RSAPrivateKey = "-----BEGIN ENCRYPTED PRIVATE KEY-----\r\n" .
+                                         chunk_split(base64_encode($RSAPrivateKey), 64) .
+                                         '-----END ENCRYPTED PRIVATE KEY-----';
+                    } else {
+                        $RSAPrivateKey = "-----BEGIN PRIVATE KEY-----\r\n" .
+                                         chunk_split(base64_encode($RSAPrivateKey), 64) .
+                                         '-----END PRIVATE KEY-----';
+                    }
+                    return $RSAPrivateKey;
+                }
+
+                if (!empty($this->password) || is_string($this->password)) {
+                    $iv = Random::string(8);
+                    $symkey = pack('H*', md5($this->password . $iv)); // symkey is short for symmetric key
+                    $symkey.= substr(pack('H*', md5($symkey . $this->password . $iv)), 0, 8);
+                    $des = new TripleDES();
+                    $des->setKey($symkey);
+                    $des->setIV($iv);
+                    $iv = strtoupper(bin2hex($iv));
+                    $RSAPrivateKey = "-----BEGIN RSA PRIVATE KEY-----\r\n" .
+                                     "Proc-Type: 4,ENCRYPTED\r\n" .
+                                     "DEK-Info: DES-EDE3-CBC,$iv\r\n" .
+                                     "\r\n" .
+                                     chunk_split(base64_encode($des->encrypt($RSAPrivateKey)), 64) .
+                                     '-----END RSA PRIVATE KEY-----';
+                } else {
+                    $RSAPrivateKey = "-----BEGIN RSA PRIVATE KEY-----\r\n" .
+                                     chunk_split(base64_encode($RSAPrivateKey), 64) .
+                                     '-----END RSA PRIVATE KEY-----';
+                }
+
+                return $RSAPrivateKey;
+        }
+    }
+
+    /**
+     * Convert a public key to the appropriate format
+     *
+     * @access private
+     * @see self::setPublicKeyFormat()
+     * @param string $RSAPrivateKey
+     * @return string
+     */
+    function _convertPublicKey($n, $e)
+    {
+        $signed = $this->publicKeyFormat != self::PUBLIC_FORMAT_XML;
+
+        $modulus = $n->toBytes($signed);
+        $publicExponent = $e->toBytes($signed);
+
+        switch ($this->publicKeyFormat) {
+            case self::PUBLIC_FORMAT_RAW:
+                return array('e' => $e->copy(), 'n' => $n->copy());
+            case self::PUBLIC_FORMAT_XML:
+                return "<RSAKeyValue>\r\n" .
+                       '  <Modulus>' . base64_encode($modulus) . "</Modulus>\r\n" .
+                       '  <Exponent>' . base64_encode($publicExponent) . "</Exponent>\r\n" .
+                       '</RSAKeyValue>';
+                break;
+            case self::PUBLIC_FORMAT_OPENSSH:
+                // from <http://tools.ietf.org/html/rfc4253#page-15>:
+                // string    "ssh-rsa"
+                // mpint     e
+                // mpint     n
+                $RSAPublicKey = pack('Na*Na*Na*', strlen('ssh-rsa'), 'ssh-rsa', strlen($publicExponent), $publicExponent, strlen($modulus), $modulus);
+                $RSAPublicKey = 'ssh-rsa ' . base64_encode($RSAPublicKey) . ' ' . $this->comment;
+
+                return $RSAPublicKey;
+            default: // eg. self::PUBLIC_FORMAT_PKCS1_RAW or self::PUBLIC_FORMAT_PKCS1
+                // from <http://tools.ietf.org/html/rfc3447#appendix-A.1.1>:
+                // RSAPublicKey ::= SEQUENCE {
+                //     modulus           INTEGER,  -- n
+                //     publicExponent    INTEGER   -- e
+                // }
+                $components = array(
+                    'modulus' => pack('Ca*a*', self::ASN1_INTEGER, $this->_encodeLength(strlen($modulus)), $modulus),
+                    'publicExponent' => pack('Ca*a*', self::ASN1_INTEGER, $this->_encodeLength(strlen($publicExponent)), $publicExponent)
+                );
+
+                $RSAPublicKey = pack(
+                    'Ca*a*a*',
+                    self::ASN1_SEQUENCE,
+                    $this->_encodeLength(strlen($components['modulus']) + strlen($components['publicExponent'])),
+                    $components['modulus'],
+                    $components['publicExponent']
+                );
+
+                if ($this->publicKeyFormat == self::PUBLIC_FORMAT_PKCS1_RAW) {
+                    $RSAPublicKey = "-----BEGIN RSA PUBLIC KEY-----\r\n" .
+                                    chunk_split(base64_encode($RSAPublicKey), 64) .
+                                    '-----END RSA PUBLIC KEY-----';
+                } else {
+                    // sequence(oid(1.2.840.113549.1.1.1), null)) = rsaEncryption.
+                    $rsaOID = pack('H*', '300d06092a864886f70d0101010500'); // hex version of MA0GCSqGSIb3DQEBAQUA
+                    $RSAPublicKey = chr(0) . $RSAPublicKey;
+                    $RSAPublicKey = chr(3) . $this->_encodeLength(strlen($RSAPublicKey)) . $RSAPublicKey;
+
+                    $RSAPublicKey = pack(
+                        'Ca*a*',
+                        self::ASN1_SEQUENCE,
+                        $this->_encodeLength(strlen($rsaOID . $RSAPublicKey)),
+                        $rsaOID . $RSAPublicKey
+                    );
+
+                    $RSAPublicKey = "-----BEGIN PUBLIC KEY-----\r\n" .
+                                     chunk_split(base64_encode($RSAPublicKey), 64) .
+                                     '-----END PUBLIC KEY-----';
+                }
+
+                return $RSAPublicKey;
+        }
+    }
+
+    /**
+     * Break a public or private key down into its constituant components
+     *
+     * @access private
+     * @see self::_convertPublicKey()
+     * @see self::_convertPrivateKey()
+     * @param string $key
+     * @param int $type
+     * @return array
+     */
+    function _parseKey($key, $type)
+    {
+        if ($type != self::PUBLIC_FORMAT_RAW && !is_string($key)) {
+            return false;
+        }
+
+        switch ($type) {
+            case self::PUBLIC_FORMAT_RAW:
+                if (!is_array($key)) {
+                    return false;
+                }
+                $components = array();
+                switch (true) {
+                    case isset($key['e']):
+                        $components['publicExponent'] = $key['e']->copy();
+                        break;
+                    case isset($key['exponent']):
+                        $components['publicExponent'] = $key['exponent']->copy();
+                        break;
+                    case isset($key['publicExponent']):
+                        $components['publicExponent'] = $key['publicExponent']->copy();
+                        break;
+                    case isset($key[0]):
+                        $components['publicExponent'] = $key[0]->copy();
+                }
+                switch (true) {
+                    case isset($key['n']):
+                        $components['modulus'] = $key['n']->copy();
+                        break;
+                    case isset($key['modulo']):
+                        $components['modulus'] = $key['modulo']->copy();
+                        break;
+                    case isset($key['modulus']):
+                        $components['modulus'] = $key['modulus']->copy();
+                        break;
+                    case isset($key[1]):
+                        $components['modulus'] = $key[1]->copy();
+                }
+                return isset($components['modulus']) && isset($components['publicExponent']) ? $components : false;
+            case self::PRIVATE_FORMAT_PKCS1:
+            case self::PRIVATE_FORMAT_PKCS8:
+            case self::PUBLIC_FORMAT_PKCS1:
+                /* Although PKCS#1 proposes a format that public and private keys can use, encrypting them is
+                   "outside the scope" of PKCS#1.  PKCS#1 then refers you to PKCS#12 and PKCS#15 if you're wanting to
+                   protect private keys, however, that's not what OpenSSL* does.  OpenSSL protects private keys by adding
+                   two new "fields" to the key - DEK-Info and Proc-Type.  These fields are discussed here:
+
+                   http://tools.ietf.org/html/rfc1421#section-4.6.1.1
+                   http://tools.ietf.org/html/rfc1421#section-4.6.1.3
+
+                   DES-EDE3-CBC as an algorithm, however, is not discussed anywhere, near as I can tell.
+                   DES-CBC and DES-EDE are discussed in RFC1423, however, DES-EDE3-CBC isn't, nor is its key derivation
+                   function.  As is, the definitive authority on this encoding scheme isn't the IETF but rather OpenSSL's
+                   own implementation.  ie. the implementation *is* the standard and any bugs that may exist in that
+                   implementation are part of the standard, as well.
+
+                   * OpenSSL is the de facto standard.  It's utilized by OpenSSH and other projects */
+                if (preg_match('#DEK-Info: (.+),(.+)#', $key, $matches)) {
+                    $iv = pack('H*', trim($matches[2]));
+                    $symkey = pack('H*', md5($this->password . substr($iv, 0, 8))); // symkey is short for symmetric key
+                    $symkey.= pack('H*', md5($symkey . $this->password . substr($iv, 0, 8)));
+                    // remove the Proc-Type / DEK-Info sections as they're no longer needed
+                    $key = preg_replace('#^(?:Proc-Type|DEK-Info): .*#m', '', $key);
+                    $ciphertext = $this->_extractBER($key);
+                    if ($ciphertext === false) {
+                        $ciphertext = $key;
+                    }
+                    switch ($matches[1]) {
+                        case 'AES-256-CBC':
+                            $crypto = new AES();
+                            break;
+                        case 'AES-128-CBC':
+                            $symkey = substr($symkey, 0, 16);
+                            $crypto = new AES();
+                            break;
+                        case 'DES-EDE3-CFB':
+                            $crypto = new TripleDES(Base::MODE_CFB);
+                            break;
+                        case 'DES-EDE3-CBC':
+                            $symkey = substr($symkey, 0, 24);
+                            $crypto = new TripleDES();
+                            break;
+                        case 'DES-CBC':
+                            $crypto = new DES();
+                            break;
+                        default:
+                            return false;
+                    }
+                    $crypto->setKey($symkey);
+                    $crypto->setIV($iv);
+                    $decoded = $crypto->decrypt($ciphertext);
+                } else {
+                    $decoded = $this->_extractBER($key);
+                }
+
+                if ($decoded !== false) {
+                    $key = $decoded;
+                }
+
+                $components = array();
+
+                if (ord($this->_string_shift($key)) != self::ASN1_SEQUENCE) {
+                    return false;
+                }
+                if ($this->_decodeLength($key) != strlen($key)) {
+                    return false;
+                }
+
+                $tag = ord($this->_string_shift($key));
+                /* intended for keys for which OpenSSL's asn1parse returns the following:
+
+                    0:d=0  hl=4 l= 631 cons: SEQUENCE
+                    4:d=1  hl=2 l=   1 prim:  INTEGER           :00
+                    7:d=1  hl=2 l=  13 cons:  SEQUENCE
+                    9:d=2  hl=2 l=   9 prim:   OBJECT            :rsaEncryption
+                   20:d=2  hl=2 l=   0 prim:   NULL
+                   22:d=1  hl=4 l= 609 prim:  OCTET STRING
+
+                   ie. PKCS8 keys*/
+
+                if ($tag == self::ASN1_INTEGER && substr($key, 0, 3) == "\x01\x00\x30") {
+                    $this->_string_shift($key, 3);
+                    $tag = self::ASN1_SEQUENCE;
+                }
+
+                if ($tag == self::ASN1_SEQUENCE) {
+                    $temp = $this->_string_shift($key, $this->_decodeLength($key));
+                    if (ord($this->_string_shift($temp)) != self::ASN1_OBJECT) {
+                        return false;
+                    }
+                    $length = $this->_decodeLength($temp);
+                    switch ($this->_string_shift($temp, $length)) {
+                        case "\x2a\x86\x48\x86\xf7\x0d\x01\x01\x01": // rsaEncryption
+                            break;
+                        case "\x2a\x86\x48\x86\xf7\x0d\x01\x05\x03": // pbeWithMD5AndDES-CBC
+                            /*
+                               PBEParameter ::= SEQUENCE {
+                                   salt OCTET STRING (SIZE(8)),
+                                   iterationCount INTEGER }
+                            */
+                            if (ord($this->_string_shift($temp)) != self::ASN1_SEQUENCE) {
+                                return false;
+                            }
+                            if ($this->_decodeLength($temp) != strlen($temp)) {
+                                return false;
+                            }
+                            $this->_string_shift($temp); // assume it's an octet string
+                            $salt = $this->_string_shift($temp, $this->_decodeLength($temp));
+                            if (ord($this->_string_shift($temp)) != self::ASN1_INTEGER) {
+                                return false;
+                            }
+                            $this->_decodeLength($temp);
+                            list(, $iterationCount) = unpack('N', str_pad($temp, 4, chr(0), STR_PAD_LEFT));
+                            $this->_string_shift($key); // assume it's an octet string
+                            $length = $this->_decodeLength($key);
+                            if (strlen($key) != $length) {
+                                return false;
+                            }
+
+                            $crypto = new DES();
+                            $crypto->setPassword($this->password, 'pbkdf1', 'md5', $salt, $iterationCount);
+                            $key = $crypto->decrypt($key);
+                            if ($key === false) {
+                                return false;
+                            }
+                            return $this->_parseKey($key, self::PRIVATE_FORMAT_PKCS1);
+                        default:
+                            return false;
+                    }
+                    /* intended for keys for which OpenSSL's asn1parse returns the following:
+
+                        0:d=0  hl=4 l= 290 cons: SEQUENCE
+                        4:d=1  hl=2 l=  13 cons:  SEQUENCE
+                        6:d=2  hl=2 l=   9 prim:   OBJECT            :rsaEncryption
+                       17:d=2  hl=2 l=   0 prim:   NULL
+                       19:d=1  hl=4 l= 271 prim:  BIT STRING */
+                    $tag = ord($this->_string_shift($key)); // skip over the BIT STRING / OCTET STRING tag
+                    $this->_decodeLength($key); // skip over the BIT STRING / OCTET STRING length
+                    // "The initial octet shall encode, as an unsigned binary integer wtih bit 1 as the least significant bit, the number of
+                    //  unused bits in the final subsequent octet. The number shall be in the range zero to seven."
+                    //  -- http://www.itu.int/ITU-T/studygroups/com17/languages/X.690-0207.pdf (section 8.6.2.2)
+                    if ($tag == self::ASN1_BITSTRING) {
+                        $this->_string_shift($key);
+                    }
+                    if (ord($this->_string_shift($key)) != self::ASN1_SEQUENCE) {
+                        return false;
+                    }
+                    if ($this->_decodeLength($key) != strlen($key)) {
+                        return false;
+                    }
+                    $tag = ord($this->_string_shift($key));
+                }
+                if ($tag != self::ASN1_INTEGER) {
+                    return false;
+                }
+
+                $length = $this->_decodeLength($key);
+                $temp = $this->_string_shift($key, $length);
+                if (strlen($temp) != 1 || ord($temp) > 2) {
+                    $components['modulus'] = new BigInteger($temp, 256);
+                    $this->_string_shift($key); // skip over self::ASN1_INTEGER
+                    $length = $this->_decodeLength($key);
+                    $components[$type == self::PUBLIC_FORMAT_PKCS1 ? 'publicExponent' : 'privateExponent'] = new BigInteger($this->_string_shift($key, $length), 256);
+
+                    return $components;
+                }
+                if (ord($this->_string_shift($key)) != self::ASN1_INTEGER) {
+                    return false;
+                }
+                $length = $this->_decodeLength($key);
+                $components['modulus'] = new BigInteger($this->_string_shift($key, $length), 256);
+                $this->_string_shift($key);
+                $length = $this->_decodeLength($key);
+                $components['publicExponent'] = new BigInteger($this->_string_shift($key, $length), 256);
+                $this->_string_shift($key);
+                $length = $this->_decodeLength($key);
+                $components['privateExponent'] = new BigInteger($this->_string_shift($key, $length), 256);
+                $this->_string_shift($key);
+                $length = $this->_decodeLength($key);
+                $components['primes'] = array(1 => new BigInteger($this->_string_shift($key, $length), 256));
+                $this->_string_shift($key);
+                $length = $this->_decodeLength($key);
+                $components['primes'][] = new BigInteger($this->_string_shift($key, $length), 256);
+                $this->_string_shift($key);
+                $length = $this->_decodeLength($key);
+                $components['exponents'] = array(1 => new BigInteger($this->_string_shift($key, $length), 256));
+                $this->_string_shift($key);
+                $length = $this->_decodeLength($key);
+                $components['exponents'][] = new BigInteger($this->_string_shift($key, $length), 256);
+                $this->_string_shift($key);
+                $length = $this->_decodeLength($key);
+                $components['coefficients'] = array(2 => new BigInteger($this->_string_shift($key, $length), 256));
+
+                if (!empty($key)) {
+                    if (ord($this->_string_shift($key)) != self::ASN1_SEQUENCE) {
+                        return false;
+                    }
+                    $this->_decodeLength($key);
+                    while (!empty($key)) {
+                        if (ord($this->_string_shift($key)) != self::ASN1_SEQUENCE) {
+                            return false;
+                        }
+                        $this->_decodeLength($key);
+                        $key = substr($key, 1);
+                        $length = $this->_decodeLength($key);
+                        $components['primes'][] = new BigInteger($this->_string_shift($key, $length), 256);
+                        $this->_string_shift($key);
+                        $length = $this->_decodeLength($key);
+                        $components['exponents'][] = new BigInteger($this->_string_shift($key, $length), 256);
+                        $this->_string_shift($key);
+                        $length = $this->_decodeLength($key);
+                        $components['coefficients'][] = new BigInteger($this->_string_shift($key, $length), 256);
+                    }
+                }
+
+                return $components;
+            case self::PUBLIC_FORMAT_OPENSSH:
+                $parts = explode(' ', $key, 3);
+
+                $key = isset($parts[1]) ? base64_decode($parts[1]) : false;
+                if ($key === false) {
+                    return false;
+                }
+
+                $comment = isset($parts[2]) ? $parts[2] : false;
+
+                $cleanup = substr($key, 0, 11) == "\0\0\0\7ssh-rsa";
+
+                if (strlen($key) <= 4) {
+                    return false;
+                }
+                extract(unpack('Nlength', $this->_string_shift($key, 4)));
+                $publicExponent = new BigInteger($this->_string_shift($key, $length), -256);
+                if (strlen($key) <= 4) {
+                    return false;
+                }
+                extract(unpack('Nlength', $this->_string_shift($key, 4)));
+                $modulus = new BigInteger($this->_string_shift($key, $length), -256);
+
+                if ($cleanup && strlen($key)) {
+                    if (strlen($key) <= 4) {
+                        return false;
+                    }
+                    extract(unpack('Nlength', $this->_string_shift($key, 4)));
+                    $realModulus = new BigInteger($this->_string_shift($key, $length), -256);
+                    return strlen($key) ? false : array(
+                        'modulus' => $realModulus,
+                        'publicExponent' => $modulus,
+                        'comment' => $comment
+                    );
+                } else {
+                    return strlen($key) ? false : array(
+                        'modulus' => $modulus,
+                        'publicExponent' => $publicExponent,
+                        'comment' => $comment
+                    );
+                }
+            // http://www.w3.org/TR/xmldsig-core/#sec-RSAKeyValue
+            // http://en.wikipedia.org/wiki/XML_Signature
+            case self::PRIVATE_FORMAT_XML:
+            case self::PUBLIC_FORMAT_XML:
+                $this->components = array();
+
+                $xml = xml_parser_create('UTF-8');
+                xml_set_object($xml, $this);
+                xml_set_element_handler($xml, '_start_element_handler', '_stop_element_handler');
+                xml_set_character_data_handler($xml, '_data_handler');
+                // add <xml></xml> to account for "dangling" tags like <BitStrength>...</BitStrength> that are sometimes added
+                if (!xml_parse($xml, '<xml>' . $key . '</xml>')) {
+                    return false;
+                }
+
+                return isset($this->components['modulus']) && isset($this->components['publicExponent']) ? $this->components : false;
+            // from PuTTY's SSHPUBK.C
+            case self::PRIVATE_FORMAT_PUTTY:
+                $components = array();
+                $key = preg_split('#\r\n|\r|\n#', $key);
+                $type = trim(preg_replace('#PuTTY-User-Key-File-2: (.+)#', '$1', $key[0]));
+                if ($type != 'ssh-rsa') {
+                    return false;
+                }
+                $encryption = trim(preg_replace('#Encryption: (.+)#', '$1', $key[1]));
+                $comment = trim(preg_replace('#Comment: (.+)#', '$1', $key[2]));
+
+                $publicLength = trim(preg_replace('#Public-Lines: (\d+)#', '$1', $key[3]));
+                $public = base64_decode(implode('', array_map('trim', array_slice($key, 4, $publicLength))));
+                $public = substr($public, 11);
+                extract(unpack('Nlength', $this->_string_shift($public, 4)));
+                $components['publicExponent'] = new BigInteger($this->_string_shift($public, $length), -256);
+                extract(unpack('Nlength', $this->_string_shift($public, 4)));
+                $components['modulus'] = new BigInteger($this->_string_shift($public, $length), -256);
+
+                $privateLength = trim(preg_replace('#Private-Lines: (\d+)#', '$1', $key[$publicLength + 4]));
+                $private = base64_decode(implode('', array_map('trim', array_slice($key, $publicLength + 5, $privateLength))));
+
+                switch ($encryption) {
+                    case 'aes256-cbc':
+                        $symkey = '';
+                        $sequence = 0;
+                        while (strlen($symkey) < 32) {
+                            $temp = pack('Na*', $sequence++, $this->password);
+                            $symkey.= pack('H*', sha1($temp));
+                        }
+                        $symkey = substr($symkey, 0, 32);
+                        $crypto = new AES();
+                }
+
+                if ($encryption != 'none') {
+                    $crypto->setKey($symkey);
+                    $crypto->disablePadding();
+                    $private = $crypto->decrypt($private);
+                    if ($private === false) {
+                        return false;
+                    }
+                }
+
+                extract(unpack('Nlength', $this->_string_shift($private, 4)));
+                if (strlen($private) < $length) {
+                    return false;
+                }
+                $components['privateExponent'] = new BigInteger($this->_string_shift($private, $length), -256);
+                extract(unpack('Nlength', $this->_string_shift($private, 4)));
+                if (strlen($private) < $length) {
+                    return false;
+                }
+                $components['primes'] = array(1 => new BigInteger($this->_string_shift($private, $length), -256));
+                extract(unpack('Nlength', $this->_string_shift($private, 4)));
+                if (strlen($private) < $length) {
+                    return false;
+                }
+                $components['primes'][] = new BigInteger($this->_string_shift($private, $length), -256);
+
+                $temp = $components['primes'][1]->subtract($this->one);
+                $components['exponents'] = array(1 => $components['publicExponent']->modInverse($temp));
+                $temp = $components['primes'][2]->subtract($this->one);
+                $components['exponents'][] = $components['publicExponent']->modInverse($temp);
+
+                extract(unpack('Nlength', $this->_string_shift($private, 4)));
+                if (strlen($private) < $length) {
+                    return false;
+                }
+                $components['coefficients'] = array(2 => new BigInteger($this->_string_shift($private, $length), -256));
+
+                return $components;
+        }
+    }
+
+    /**
+     * Returns the key size
+     *
+     * More specifically, this returns the size of the modulo in bits.
+     *
+     * @access public
+     * @return int
+     */
+    function getSize()
+    {
+        return !isset($this->modulus) ? 0 : strlen($this->modulus->toBits());
+    }
+
+    /**
+     * Start Element Handler
+     *
+     * Called by xml_set_element_handler()
+     *
+     * @access private
+     * @param resource $parser
+     * @param string $name
+     * @param array $attribs
+     */
+    function _start_element_handler($parser, $name, $attribs)
+    {
+        //$name = strtoupper($name);
+        switch ($name) {
+            case 'MODULUS':
+                $this->current = &$this->components['modulus'];
+                break;
+            case 'EXPONENT':
+                $this->current = &$this->components['publicExponent'];
+                break;
+            case 'P':
+                $this->current = &$this->components['primes'][1];
+                break;
+            case 'Q':
+                $this->current = &$this->components['primes'][2];
+                break;
+            case 'DP':
+                $this->current = &$this->components['exponents'][1];
+                break;
+            case 'DQ':
+                $this->current = &$this->components['exponents'][2];
+                break;
+            case 'INVERSEQ':
+                $this->current = &$this->components['coefficients'][2];
+                break;
+            case 'D':
+                $this->current = &$this->components['privateExponent'];
+        }
+        $this->current = '';
+    }
+
+    /**
+     * Stop Element Handler
+     *
+     * Called by xml_set_element_handler()
+     *
+     * @access private
+     * @param resource $parser
+     * @param string $name
+     */
+    function _stop_element_handler($parser, $name)
+    {
+        if (isset($this->current)) {
+            $this->current = new BigInteger(base64_decode($this->current), 256);
+            unset($this->current);
+        }
+    }
+
+    /**
+     * Data Handler
+     *
+     * Called by xml_set_character_data_handler()
+     *
+     * @access private
+     * @param resource $parser
+     * @param string $data
+     */
+    function _data_handler($parser, $data)
+    {
+        if (!isset($this->current) || is_object($this->current)) {
+            return;
+        }
+        $this->current.= trim($data);
+    }
+
+    /**
+     * Loads a public or private key
+     *
+     * Returns true on success and false on failure (ie. an incorrect password was provided or the key was malformed)
+     *
+     * @access public
+     * @param string $key
+     * @param int $type optional
+     */
+    function loadKey($key, $type = false)
+    {
+        if ($key instanceof RSA) {
+            $this->privateKeyFormat = $key->privateKeyFormat;
+            $this->publicKeyFormat = $key->publicKeyFormat;
+            $this->k = $key->k;
+            $this->hLen = $key->hLen;
+            $this->sLen = $key->sLen;
+            $this->mgfHLen = $key->mgfHLen;
+            $this->encryptionMode = $key->encryptionMode;
+            $this->signatureMode = $key->signatureMode;
+            $this->password = $key->password;
+            $this->configFile = $key->configFile;
+            $this->comment = $key->comment;
+
+            if (is_object($key->hash)) {
+                $this->hash = new Hash($key->hash->getHash());
+            }
+            if (is_object($key->mgfHash)) {
+                $this->mgfHash = new Hash($key->mgfHash->getHash());
+            }
+
+            if (is_object($key->modulus)) {
+                $this->modulus = $key->modulus->copy();
+            }
+            if (is_object($key->exponent)) {
+                $this->exponent = $key->exponent->copy();
+            }
+            if (is_object($key->publicExponent)) {
+                $this->publicExponent = $key->publicExponent->copy();
+            }
+
+            $this->primes = array();
+            $this->exponents = array();
+            $this->coefficients = array();
+
+            foreach ($this->primes as $prime) {
+                $this->primes[] = $prime->copy();
+            }
+            foreach ($this->exponents as $exponent) {
+                $this->exponents[] = $exponent->copy();
+            }
+            foreach ($this->coefficients as $coefficient) {
+                $this->coefficients[] = $coefficient->copy();
+            }
+
+            return true;
+        }
+
+        if ($type === false) {
+            $types = array(
+                self::PUBLIC_FORMAT_RAW,
+                self::PRIVATE_FORMAT_PKCS1,
+                self::PRIVATE_FORMAT_XML,
+                self::PRIVATE_FORMAT_PUTTY,
+                self::PUBLIC_FORMAT_OPENSSH
+            );
+            foreach ($types as $type) {
+                $components = $this->_parseKey($key, $type);
+                if ($components !== false) {
+                    break;
+                }
+            }
+        } else {
+            $components = $this->_parseKey($key, $type);
+        }
+
+        if ($components === false) {
+            return false;
+        }
+
+        if (isset($components['comment']) && $components['comment'] !== false) {
+            $this->comment = $components['comment'];
+        }
+        $this->modulus = $components['modulus'];
+        $this->k = strlen($this->modulus->toBytes());
+        $this->exponent = isset($components['privateExponent']) ? $components['privateExponent'] : $components['publicExponent'];
+        if (isset($components['primes'])) {
+            $this->primes = $components['primes'];
+            $this->exponents = $components['exponents'];
+            $this->coefficients = $components['coefficients'];
+            $this->publicExponent = $components['publicExponent'];
+        } else {
+            $this->primes = array();
+            $this->exponents = array();
+            $this->coefficients = array();
+            $this->publicExponent = false;
+        }
+
+        switch ($type) {
+            case self::PUBLIC_FORMAT_OPENSSH:
+            case self::PUBLIC_FORMAT_RAW:
+                $this->setPublicKey();
+                break;
+            case self::PRIVATE_FORMAT_PKCS1:
+                switch (true) {
+                    case strpos($key, '-BEGIN PUBLIC KEY-') !== false:
+                    case strpos($key, '-BEGIN RSA PUBLIC KEY-') !== false:
+                        $this->setPublicKey();
+                }
+        }
+
+        return true;
+    }
+
+    /**
+     * Sets the password
+     *
+     * Private keys can be encrypted with a password.  To unset the password, pass in the empty string or false.
+     * Or rather, pass in $password such that empty($password) && !is_string($password) is true.
+     *
+     * @see self::createKey()
+     * @see self::loadKey()
+     * @access public
+     * @param string $password
+     */
+    function setPassword($password = false)
+    {
+        $this->password = $password;
+    }
+
+    /**
+     * Defines the public key
+     *
+     * Some private key formats define the public exponent and some don't.  Those that don't define it are problematic when
+     * used in certain contexts.  For example, in SSH-2, RSA authentication works by sending the public key along with a
+     * message signed by the private key to the server.  The SSH-2 server looks the public key up in an index of public keys
+     * and if it's present then proceeds to verify the signature.  Problem is, if your private key doesn't include the public
+     * exponent this won't work unless you manually add the public exponent. phpseclib tries to guess if the key being used
+     * is the public key but in the event that it guesses incorrectly you might still want to explicitly set the key as being
+     * public.
+     *
+     * Do note that when a new key is loaded the index will be cleared.
+     *
+     * Returns true on success, false on failure
+     *
+     * @see self::getPublicKey()
+     * @access public
+     * @param string $key optional
+     * @param int $type optional
      * @return bool
      */
-    protected static function onLoad(array $components)
+    function setPublicKey($key = false, $type = false)
     {
-        $key = $components['isPublicKey'] ?
-            new PublicKey() :
-            new PrivateKey();
+        // if a public key has already been loaded return false
+        if (!empty($this->publicExponent)) {
+            return false;
+        }
 
-        $key->modulus = $components['modulus'];
-        $key->publicExponent = $components['publicExponent'];
-        $key->k = $key->modulus->getLengthInBytes();
+        if ($key === false && !empty($this->modulus)) {
+            $this->publicExponent = $this->exponent;
+            return true;
+        }
 
-        if ($components['isPublicKey'] || !isset($components['privateExponent'])) {
-            $key->exponent = $key->publicExponent;
+        if ($type === false) {
+            $types = array(
+                self::PUBLIC_FORMAT_RAW,
+                self::PUBLIC_FORMAT_PKCS1,
+                self::PUBLIC_FORMAT_XML,
+                self::PUBLIC_FORMAT_OPENSSH
+            );
+            foreach ($types as $type) {
+                $components = $this->_parseKey($key, $type);
+                if ($components !== false) {
+                    break;
+                }
+            }
         } else {
-            $key->privateExponent = $components['privateExponent'];
-            $key->exponent = $key->privateExponent;
-            $key->primes = $components['primes'];
-            $key->exponents = $components['exponents'];
-            $key->coefficients = $components['coefficients'];
+            $components = $this->_parseKey($key, $type);
         }
 
-        if ($components['format'] == PSS::class) {
-            // in the X509 world RSA keys are assumed to use PKCS1 padding by default. only if the key is
-            // explicitly a PSS key is the use of PSS assumed. phpseclib does not work like this. phpseclib
-            // uses PSS padding by default. it assumes the more secure method by default and altho it provides
-            // for the less secure PKCS1 method you have to go out of your way to use it. this is consistent
-            // with the latest trends in crypto. libsodium (NaCl) is actually a little more extreme in that
-            // not only does it defaults to the most secure methods - it doesn't even let you choose less
-            // secure methods
-            //$key = $key->withPadding(self::SIGNATURE_PSS);
-            if (isset($components['hash'])) {
-                $key = $key->withHash($components['hash']);
-            }
-            if (isset($components['MGFHash'])) {
-                $key = $key->withMGFHash($components['MGFHash']);
-            }
-            if (isset($components['saltLength'])) {
-                $key = $key->withSaltLength($components['saltLength']);
-            }
+        if ($components === false) {
+            return false;
         }
 
+        if (empty($this->modulus) || !$this->modulus->equals($components['modulus'])) {
+            $this->modulus = $components['modulus'];
+            $this->exponent = $this->publicExponent = $components['publicExponent'];
+            return true;
+        }
+
+        $this->publicExponent = $components['publicExponent'];
+
+        return true;
+    }
+
+    /**
+     * Defines the private key
+     *
+     * If phpseclib guessed a private key was a public key and loaded it as such it might be desirable to force
+     * phpseclib to treat the key as a private key. This function will do that.
+     *
+     * Do note that when a new key is loaded the index will be cleared.
+     *
+     * Returns true on success, false on failure
+     *
+     * @see self::getPublicKey()
+     * @access public
+     * @param string $key optional
+     * @param int $type optional
+     * @return bool
+     */
+    function setPrivateKey($key = false, $type = false)
+    {
+        if ($key === false && !empty($this->publicExponent)) {
+            $this->publicExponent = false;
+            return true;
+        }
+
+        $rsa = new RSA();
+        if (!$rsa->loadKey($key, $type)) {
+            return false;
+        }
+        $rsa->publicExponent = false;
+
+        // don't overwrite the old key if the new key is invalid
+        $this->loadKey($rsa);
+        return true;
+    }
+
+    /**
+     * Returns the public key
+     *
+     * The public key is only returned under two circumstances - if the private key had the public key embedded within it
+     * or if the public key was set via setPublicKey().  If the currently loaded key is supposed to be the public key this
+     * function won't return it since this library, for the most part, doesn't distinguish between public and private keys.
+     *
+     * @see self::getPublicKey()
+     * @access public
+     * @param string $key
+     * @param int $type optional
+     */
+    function getPublicKey($type = self::PUBLIC_FORMAT_PKCS8)
+    {
+        if (empty($this->modulus) || empty($this->publicExponent)) {
+            return false;
+        }
+
+        $oldFormat = $this->publicKeyFormat;
+        $this->publicKeyFormat = $type;
+        $temp = $this->_convertPublicKey($this->modulus, $this->publicExponent);
+        $this->publicKeyFormat = $oldFormat;
+        return $temp;
+    }
+
+    /**
+     * Returns the public key's fingerprint
+     *
+     * The public key's fingerprint is returned, which is equivalent to running `ssh-keygen -lf rsa.pub`. If there is
+     * no public key currently loaded, false is returned.
+     * Example output (md5): "c1:b1:30:29:d7:b8:de:6c:97:77:10:d7:46:41:63:87" (as specified by RFC 4716)
+     *
+     * @access public
+     * @param string $algorithm The hashing algorithm to be used. Valid options are 'md5' and 'sha256'. False is returned
+     * for invalid values.
+     * @return mixed
+     */
+    function getPublicKeyFingerprint($algorithm = 'md5')
+    {
+        if (empty($this->modulus) || empty($this->publicExponent)) {
+            return false;
+        }
+
+        $modulus = $this->modulus->toBytes(true);
+        $publicExponent = $this->publicExponent->toBytes(true);
+
+        $RSAPublicKey = pack('Na*Na*Na*', strlen('ssh-rsa'), 'ssh-rsa', strlen($publicExponent), $publicExponent, strlen($modulus), $modulus);
+
+        switch ($algorithm) {
+            case 'sha256':
+                $hash = new Hash('sha256');
+                $base = base64_encode($hash->hash($RSAPublicKey));
+                return substr($base, 0, strlen($base) - 1);
+            case 'md5':
+                return substr(chunk_split(md5($RSAPublicKey), 2, ':'), 0, -1);
+            default:
+                return false;
+        }
+    }
+
+    /**
+     * Returns the private key
+     *
+     * The private key is only returned if the currently loaded key contains the constituent prime numbers.
+     *
+     * @see self::getPublicKey()
+     * @access public
+     * @param string $key
+     * @param int $type optional
+     * @return mixed
+     */
+    function getPrivateKey($type = self::PUBLIC_FORMAT_PKCS1)
+    {
+        if (empty($this->primes)) {
+            return false;
+        }
+
+        $oldFormat = $this->privateKeyFormat;
+        $this->privateKeyFormat = $type;
+        $temp = $this->_convertPrivateKey($this->modulus, $this->publicExponent, $this->exponent, $this->primes, $this->exponents, $this->coefficients);
+        $this->privateKeyFormat = $oldFormat;
+        return $temp;
+    }
+
+    /**
+     * Returns a minimalistic private key
+     *
+     * Returns the private key without the prime number constituants.  Structurally identical to a public key that
+     * hasn't been set as the public key
+     *
+     * @see self::getPrivateKey()
+     * @access private
+     * @param string $key
+     * @param int $type optional
+     */
+    function _getPrivatePublicKey($mode = self::PUBLIC_FORMAT_PKCS8)
+    {
+        if (empty($this->modulus) || empty($this->exponent)) {
+            return false;
+        }
+
+        $oldFormat = $this->publicKeyFormat;
+        $this->publicKeyFormat = $mode;
+        $temp = $this->_convertPublicKey($this->modulus, $this->exponent);
+        $this->publicKeyFormat = $oldFormat;
+        return $temp;
+    }
+
+    /**
+     *  __toString() magic method
+     *
+     * @access public
+     * @return string
+     */
+    function __toString()
+    {
+        $key = $this->getPrivateKey($this->privateKeyFormat);
+        if ($key !== false) {
+            return $key;
+        }
+        $key = $this->_getPrivatePublicKey($this->publicKeyFormat);
+        return $key !== false ? $key : '';
+    }
+
+    /**
+     *  __clone() magic method
+     *
+     * @access public
+     * @return Crypt_RSA
+     */
+    function __clone()
+    {
+        $key = new RSA();
+        $key->loadKey($this);
         return $key;
     }
 
     /**
-     * Initialize static variables
+     * Generates the smallest and largest numbers requiring $bits bits
+     *
+     * @access private
+     * @param int $bits
+     * @return array
      */
-    protected static function initialize_static_variables()
+    function _generateMinMax($bits)
     {
-        if (!isset(self::$configFile)) {
-            self::$configFile = dirname(__FILE__) . '/../openssl.cnf';
+        $bytes = $bits >> 3;
+        $min = str_repeat(chr(0), $bytes);
+        $max = str_repeat(chr(0xFF), $bytes);
+        $msb = $bits & 7;
+        if ($msb) {
+            $min = chr(1 << ($msb - 1)) . $min;
+            $max = chr((1 << $msb) - 1) . $max;
+        } else {
+            $min[0] = chr(0x80);
         }
 
-        parent::initialize_static_variables();
+        return array(
+            'min' => new BigInteger($min, 256),
+            'max' => new BigInteger($max, 256)
+        );
     }
 
     /**
-     * Constructor
+     * DER-decode the length
      *
-     * PublicKey and PrivateKey objects can only be created from abstract RSA class
+     * DER supports lengths up to (2**8)**127, however, we'll only support lengths up to (2**8)**4.  See
+     * {@link http://itu.int/ITU-T/studygroups/com17/languages/X.690-0207.pdf#p=13 X.690 paragraph 8.1.3} for more information.
+     *
+     * @access private
+     * @param string $string
+     * @return int
      */
-    protected function __construct()
+    function _decodeLength(&$string)
     {
-        parent::__construct();
+        $length = ord($this->_string_shift($string));
+        if ($length & 0x80) { // definite length, long form
+            $length&= 0x7F;
+            $temp = $this->_string_shift($string, $length);
+            list(, $length) = unpack('N', substr(str_pad($temp, 4, chr(0), STR_PAD_LEFT), -4));
+        }
+        return $length;
+    }
 
-        $this->hLen = $this->hash->getLengthInBytes();
-        $this->mgfHash = new Hash('sha256');
-        $this->mgfHLen = $this->mgfHash->getLengthInBytes();
+    /**
+     * DER-encode the length
+     *
+     * DER supports lengths up to (2**8)**127, however, we'll only support lengths up to (2**8)**4.  See
+     * {@link http://itu.int/ITU-T/studygroups/com17/languages/X.690-0207.pdf#p=13 X.690 paragraph 8.1.3} for more information.
+     *
+     * @access private
+     * @param int $length
+     * @return string
+     */
+    function _encodeLength($length)
+    {
+        if ($length <= 0x7F) {
+            return chr($length);
+        }
+
+        $temp = ltrim(pack('N', $length), chr(0));
+        return pack('Ca*', 0x80 | strlen($temp), $temp);
+    }
+
+    /**
+     * String Shift
+     *
+     * Inspired by array_shift
+     *
+     * @param string $string
+     * @param int $index
+     * @return string
+     * @access private
+     */
+    function _string_shift(&$string, $index = 1)
+    {
+        $substr = substr($string, 0, $index);
+        $string = substr($string, $index);
+        return $substr;
+    }
+
+    /**
+     * Determines the private key format
+     *
+     * @see self::createKey()
+     * @access public
+     * @param int $format
+     */
+    function setPrivateKeyFormat($format)
+    {
+        $this->privateKeyFormat = $format;
+    }
+
+    /**
+     * Determines the public key format
+     *
+     * @see self::createKey()
+     * @access public
+     * @param int $format
+     */
+    function setPublicKeyFormat($format)
+    {
+        $this->publicKeyFormat = $format;
+    }
+
+    /**
+     * Determines which hashing function should be used
+     *
+     * Used with signature production / verification and (if the encryption mode is self::ENCRYPTION_OAEP) encryption and
+     * decryption.  If $hash isn't supported, sha1 is used.
+     *
+     * @access public
+     * @param string $hash
+     */
+    function setHash($hash)
+    {
+        // \phpseclib\Crypt\Hash supports algorithms that PKCS#1 doesn't support.  md5-96 and sha1-96, for example.
+        switch ($hash) {
+            case 'md2':
+            case 'md5':
+            case 'sha1':
+            case 'sha256':
+            case 'sha384':
+            case 'sha512':
+                $this->hash = new Hash($hash);
+                $this->hashName = $hash;
+                break;
+            default:
+                $this->hash = new Hash('sha1');
+                $this->hashName = 'sha1';
+        }
+        $this->hLen = $this->hash->getLength();
+    }
+
+    /**
+     * Determines which hashing function should be used for the mask generation function
+     *
+     * The mask generation function is used by self::ENCRYPTION_OAEP and self::SIGNATURE_PSS and although it's
+     * best if Hash and MGFHash are set to the same thing this is not a requirement.
+     *
+     * @access public
+     * @param string $hash
+     */
+    function setMGFHash($hash)
+    {
+        // \phpseclib\Crypt\Hash supports algorithms that PKCS#1 doesn't support.  md5-96 and sha1-96, for example.
+        switch ($hash) {
+            case 'md2':
+            case 'md5':
+            case 'sha1':
+            case 'sha256':
+            case 'sha384':
+            case 'sha512':
+                $this->mgfHash = new Hash($hash);
+                break;
+            default:
+                $this->mgfHash = new Hash('sha1');
+        }
+        $this->mgfHLen = $this->mgfHash->getLength();
+    }
+
+    /**
+     * Determines the salt length
+     *
+     * To quote from {@link http://tools.ietf.org/html/rfc3447#page-38 RFC3447#page-38}:
+     *
+     *    Typical salt lengths in octets are hLen (the length of the output
+     *    of the hash function Hash) and 0.
+     *
+     * @access public
+     * @param int $format
+     */
+    function setSaltLength($sLen)
+    {
+        $this->sLen = $sLen;
     }
 
     /**
@@ -510,18 +2046,17 @@ abstract class RSA extends AsymmetricKey
      *
      * See {@link http://tools.ietf.org/html/rfc3447#section-4.1 RFC3447#section-4.1}.
      *
-     * @param bool|\phpseclib3\Math\BigInteger $x
+     * @access private
+     * @param \phpseclib\Math\BigInteger $x
      * @param int $xLen
-     * @return bool|string
+     * @return string
      */
-    protected function i2osp($x, $xLen)
+    function _i2osp($x, $xLen)
     {
-        if ($x === false) {
-            return false;
-        }
         $x = $x->toBytes();
         if (strlen($x) > $xLen) {
-            throw new \OutOfRangeException('Resultant string length out of range');
+            user_error('Integer too large');
+            return false;
         }
         return str_pad($x, $xLen, chr(0), STR_PAD_LEFT);
     }
@@ -531,129 +2066,220 @@ abstract class RSA extends AsymmetricKey
      *
      * See {@link http://tools.ietf.org/html/rfc3447#section-4.2 RFC3447#section-4.2}.
      *
+     * @access private
      * @param string $x
-     * @return \phpseclib3\Math\BigInteger
+     * @return \phpseclib\Math\BigInteger
      */
-    protected function os2ip($x)
+    function _os2ip($x)
     {
         return new BigInteger($x, 256);
     }
 
     /**
-     * EMSA-PKCS1-V1_5-ENCODE
+     * Exponentiate with or without Chinese Remainder Theorem
      *
-     * See {@link http://tools.ietf.org/html/rfc3447#section-9.2 RFC3447#section-9.2}.
+     * See {@link http://tools.ietf.org/html/rfc3447#section-5.1.1 RFC3447#section-5.1.2}.
      *
-     * @param string $m
-     * @param int $emLen
-     * @throws \LengthException if the intended encoded message length is too short
-     * @return string
+     * @access private
+     * @param \phpseclib\Math\BigInteger $x
+     * @return \phpseclib\Math\BigInteger
      */
-    protected function emsa_pkcs1_v1_5_encode($m, $emLen)
+    function _exponentiate($x)
     {
-        $h = $this->hash->hash($m);
-
-        // see http://tools.ietf.org/html/rfc3447#page-43
-        switch ($this->hash->getHash()) {
-            case 'md2':
-                $t = "\x30\x20\x30\x0c\x06\x08\x2a\x86\x48\x86\xf7\x0d\x02\x02\x05\x00\x04\x10";
-                break;
-            case 'md5':
-                $t = "\x30\x20\x30\x0c\x06\x08\x2a\x86\x48\x86\xf7\x0d\x02\x05\x05\x00\x04\x10";
-                break;
-            case 'sha1':
-                $t = "\x30\x21\x30\x09\x06\x05\x2b\x0e\x03\x02\x1a\x05\x00\x04\x14";
-                break;
-            case 'sha256':
-                $t = "\x30\x31\x30\x0d\x06\x09\x60\x86\x48\x01\x65\x03\x04\x02\x01\x05\x00\x04\x20";
-                break;
-            case 'sha384':
-                $t = "\x30\x41\x30\x0d\x06\x09\x60\x86\x48\x01\x65\x03\x04\x02\x02\x05\x00\x04\x30";
-                break;
-            case 'sha512':
-                $t = "\x30\x51\x30\x0d\x06\x09\x60\x86\x48\x01\x65\x03\x04\x02\x03\x05\x00\x04\x40";
-                break;
-            // from https://www.emc.com/collateral/white-papers/h11300-pkcs-1v2-2-rsa-cryptography-standard-wp.pdf#page=40
-            case 'sha224':
-                $t = "\x30\x2d\x30\x0d\x06\x09\x60\x86\x48\x01\x65\x03\x04\x02\x04\x05\x00\x04\x1c";
-                break;
-            case 'sha512/224':
-                $t = "\x30\x2d\x30\x0d\x06\x09\x60\x86\x48\x01\x65\x03\x04\x02\x05\x05\x00\x04\x1c";
-                break;
-            case 'sha512/256':
-                $t = "\x30\x31\x30\x0d\x06\x09\x60\x86\x48\x01\x65\x03\x04\x02\x06\x05\x00\x04\x20";
-        }
-        $t .= $h;
-        $tLen = strlen($t);
-
-        if ($emLen < $tLen + 11) {
-            throw new \LengthException('Intended encoded message length too short');
+        switch (true) {
+            case empty($this->primes):
+            case $this->primes[1]->equals($this->zero):
+            case empty($this->coefficients):
+            case $this->coefficients[2]->equals($this->zero):
+            case empty($this->exponents):
+            case $this->exponents[1]->equals($this->zero):
+                return $x->modPow($this->exponent, $this->modulus);
         }
 
-        $ps = str_repeat(chr(0xFF), $emLen - $tLen - 3);
+        $num_primes = count($this->primes);
 
-        $em = "\0\1$ps\0$t";
+        if (defined('CRYPT_RSA_DISABLE_BLINDING')) {
+            $m_i = array(
+                1 => $x->modPow($this->exponents[1], $this->primes[1]),
+                2 => $x->modPow($this->exponents[2], $this->primes[2])
+            );
+            $h = $m_i[1]->subtract($m_i[2]);
+            $h = $h->multiply($this->coefficients[2]);
+            list(, $h) = $h->divide($this->primes[1]);
+            $m = $m_i[2]->add($h->multiply($this->primes[2]));
 
-        return $em;
+            $r = $this->primes[1];
+            for ($i = 3; $i <= $num_primes; $i++) {
+                $m_i = $x->modPow($this->exponents[$i], $this->primes[$i]);
+
+                $r = $r->multiply($this->primes[$i - 1]);
+
+                $h = $m_i->subtract($m);
+                $h = $h->multiply($this->coefficients[$i]);
+                list(, $h) = $h->divide($this->primes[$i]);
+
+                $m = $m->add($r->multiply($h));
+            }
+        } else {
+            $smallest = $this->primes[1];
+            for ($i = 2; $i <= $num_primes; $i++) {
+                if ($smallest->compare($this->primes[$i]) > 0) {
+                    $smallest = $this->primes[$i];
+                }
+            }
+
+            $one = new BigInteger(1);
+
+            $r = $one->random($one, $smallest->subtract($one));
+
+            $m_i = array(
+                1 => $this->_blind($x, $r, 1),
+                2 => $this->_blind($x, $r, 2)
+            );
+            $h = $m_i[1]->subtract($m_i[2]);
+            $h = $h->multiply($this->coefficients[2]);
+            list(, $h) = $h->divide($this->primes[1]);
+            $m = $m_i[2]->add($h->multiply($this->primes[2]));
+
+            $r = $this->primes[1];
+            for ($i = 3; $i <= $num_primes; $i++) {
+                $m_i = $this->_blind($x, $r, $i);
+
+                $r = $r->multiply($this->primes[$i - 1]);
+
+                $h = $m_i->subtract($m);
+                $h = $h->multiply($this->coefficients[$i]);
+                list(, $h) = $h->divide($this->primes[$i]);
+
+                $m = $m->add($r->multiply($h));
+            }
+        }
+
+        return $m;
     }
 
     /**
-     * EMSA-PKCS1-V1_5-ENCODE (without NULL)
+     * Performs RSA Blinding
      *
-     * Quoting https://tools.ietf.org/html/rfc8017#page-65,
+     * Protects against timing attacks by employing RSA Blinding.
+     * Returns $x->modPow($this->exponents[$i], $this->primes[$i])
      *
-     * "The parameters field associated with id-sha1, id-sha224, id-sha256,
-     *  id-sha384, id-sha512, id-sha512/224, and id-sha512/256 should
-     *  generally be omitted, but if present, it shall have a value of type
-     *  NULL"
-     *
-     * @param string $m
-     * @param int $emLen
-     * @return string
+     * @access private
+     * @param \phpseclib\Math\BigInteger $x
+     * @param \phpseclib\Math\BigInteger $r
+     * @param int $i
+     * @return \phpseclib\Math\BigInteger
      */
-    protected function emsa_pkcs1_v1_5_encode_without_null($m, $emLen)
+    function _blind($x, $r, $i)
     {
-        $h = $this->hash->hash($m);
+        $x = $x->multiply($r->modPow($this->publicExponent, $this->primes[$i]));
+        $x = $x->modPow($this->exponents[$i], $this->primes[$i]);
 
-        // see http://tools.ietf.org/html/rfc3447#page-43
-        switch ($this->hash->getHash()) {
-            case 'sha1':
-                $t = "\x30\x1f\x30\x07\x06\x05\x2b\x0e\x03\x02\x1a\x04\x14";
-                break;
-            case 'sha256':
-                $t = "\x30\x2f\x30\x0b\x06\x09\x60\x86\x48\x01\x65\x03\x04\x02\x01\x04\x20";
-                break;
-            case 'sha384':
-                $t = "\x30\x3f\x30\x0b\x06\x09\x60\x86\x48\x01\x65\x03\x04\x02\x02\x04\x30";
-                break;
-            case 'sha512':
-                $t = "\x30\x4f\x30\x0b\x06\x09\x60\x86\x48\x01\x65\x03\x04\x02\x03\x04\x40";
-                break;
-            // from https://www.emc.com/collateral/white-papers/h11300-pkcs-1v2-2-rsa-cryptography-standard-wp.pdf#page=40
-            case 'sha224':
-                $t = "\x30\x2b\x30\x0b\x06\x09\x60\x86\x48\x01\x65\x03\x04\x02\x04\x04\x1c";
-                break;
-            case 'sha512/224':
-                $t = "\x30\x2b\x30\x0b\x06\x09\x60\x86\x48\x01\x65\x03\x04\x02\x05\x04\x1c";
-                break;
-            case 'sha512/256':
-                $t = "\x30\x2f\x30\x0b\x06\x09\x60\x86\x48\x01\x65\x03\x04\x02\x06\x04\x20";
-                break;
-            default:
-                throw new UnsupportedAlgorithmException('md2 and md5 require NULLs');
-        }
-        $t .= $h;
-        $tLen = strlen($t);
+        $r = $r->modInverse($this->primes[$i]);
+        $x = $x->multiply($r);
+        list(, $x) = $x->divide($this->primes[$i]);
 
-        if ($emLen < $tLen + 11) {
-            throw new \LengthException('Intended encoded message length too short');
+        return $x;
+    }
+
+    /**
+     * Performs blinded RSA equality testing
+     *
+     * Protects against a particular type of timing attack described.
+     *
+     * See {@link http://codahale.com/a-lesson-in-timing-attacks/ A Lesson In Timing Attacks (or, Don't use MessageDigest.isEquals)}
+     *
+     * Thanks for the heads up singpolyma!
+     *
+     * @access private
+     * @param string $x
+     * @param string $y
+     * @return bool
+     */
+    function _equals($x, $y)
+    {
+        if (strlen($x) != strlen($y)) {
+            return false;
         }
 
-        $ps = str_repeat(chr(0xFF), $emLen - $tLen - 3);
+        $result = 0;
+        for ($i = 0; $i < strlen($x); $i++) {
+            $result |= ord($x[$i]) ^ ord($y[$i]);
+        }
 
-        $em = "\0\1$ps\0$t";
+        return $result == 0;
+    }
 
-        return $em;
+    /**
+     * RSAEP
+     *
+     * See {@link http://tools.ietf.org/html/rfc3447#section-5.1.1 RFC3447#section-5.1.1}.
+     *
+     * @access private
+     * @param \phpseclib\Math\BigInteger $m
+     * @return \phpseclib\Math\BigInteger
+     */
+    function _rsaep($m)
+    {
+        if ($m->compare($this->zero) < 0 || $m->compare($this->modulus) > 0) {
+            user_error('Message representative out of range');
+            return false;
+        }
+        return $this->_exponentiate($m);
+    }
+
+    /**
+     * RSADP
+     *
+     * See {@link http://tools.ietf.org/html/rfc3447#section-5.1.2 RFC3447#section-5.1.2}.
+     *
+     * @access private
+     * @param \phpseclib\Math\BigInteger $c
+     * @return \phpseclib\Math\BigInteger
+     */
+    function _rsadp($c)
+    {
+        if ($c->compare($this->zero) < 0 || $c->compare($this->modulus) > 0) {
+            user_error('Ciphertext representative out of range');
+            return false;
+        }
+        return $this->_exponentiate($c);
+    }
+
+    /**
+     * RSASP1
+     *
+     * See {@link http://tools.ietf.org/html/rfc3447#section-5.2.1 RFC3447#section-5.2.1}.
+     *
+     * @access private
+     * @param \phpseclib\Math\BigInteger $m
+     * @return \phpseclib\Math\BigInteger
+     */
+    function _rsasp1($m)
+    {
+        if ($m->compare($this->zero) < 0 || $m->compare($this->modulus) > 0) {
+            user_error('Message representative out of range');
+            return false;
+        }
+        return $this->_exponentiate($m);
+    }
+
+    /**
+     * RSAVP1
+     *
+     * See {@link http://tools.ietf.org/html/rfc3447#section-5.2.2 RFC3447#section-5.2.2}.
+     *
+     * @access private
+     * @param \phpseclib\Math\BigInteger $s
+     * @return \phpseclib\Math\BigInteger
+     */
+    function _rsavp1($s)
+    {
+        if ($s->compare($this->zero) < 0 || $s->compare($this->modulus) > 0) {
+            user_error('Signature representative out of range');
+            return false;
+        }
+        return $this->_exponentiate($s);
     }
 
     /**
@@ -661,11 +2287,12 @@ abstract class RSA extends AsymmetricKey
      *
      * See {@link http://tools.ietf.org/html/rfc3447#appendix-B.2.1 RFC3447#appendix-B.2.1}.
      *
+     * @access private
      * @param string $mgfSeed
-     * @param int $maskLen
+     * @param int $mgfLen
      * @return string
      */
-    protected function mgf1($mgfSeed, $maskLen)
+    function _mgf1($mgfSeed, $maskLen)
     {
         // if $maskLen would yield strings larger than 4GB, PKCS#1 suggests a "Mask too long" error be output.
 
@@ -673,262 +2300,745 @@ abstract class RSA extends AsymmetricKey
         $count = ceil($maskLen / $this->mgfHLen);
         for ($i = 0; $i < $count; $i++) {
             $c = pack('N', $i);
-            $t .= $this->mgfHash->hash($mgfSeed . $c);
+            $t.= $this->mgfHash->hash($mgfSeed . $c);
         }
 
         return substr($t, 0, $maskLen);
     }
 
     /**
-     * Returns the key size
+     * RSAES-OAEP-ENCRYPT
      *
-     * More specifically, this returns the size of the modulo in bits.
+     * See {@link http://tools.ietf.org/html/rfc3447#section-7.1.1 RFC3447#section-7.1.1} and
+     * {http://en.wikipedia.org/wiki/Optimal_Asymmetric_Encryption_Padding OAES}.
      *
-     * @return int
+     * @access private
+     * @param string $m
+     * @param string $l
+     * @return string
      */
-    public function getLength()
+    function _rsaes_oaep_encrypt($m, $l = '')
     {
-        return !isset($this->modulus) ? 0 : $this->modulus->getLength();
-    }
+        $mLen = strlen($m);
 
-    /**
-     * Determines which hashing function should be used
-     *
-     * Used with signature production / verification and (if the encryption mode is self::PADDING_OAEP) encryption and
-     * decryption.
-     *
-     * @param string $hash
-     */
-    public function withHash($hash)
-    {
-        $new = clone $this;
+        // Length checking
 
-        // \phpseclib3\Crypt\Hash supports algorithms that PKCS#1 doesn't support.  md5-96 and sha1-96, for example.
-        switch (strtolower($hash)) {
-            case 'md2':
-            case 'md5':
-            case 'sha1':
-            case 'sha256':
-            case 'sha384':
-            case 'sha512':
-            case 'sha224':
-            case 'sha512/224':
-            case 'sha512/256':
-                $new->hash = new Hash($hash);
-                break;
-            default:
-                throw new UnsupportedAlgorithmException(
-                    'The only supported hash algorithms are: md2, md5, sha1, sha256, sha384, sha512, sha224, sha512/224, sha512/256'
-                );
+        // if $l is larger than two million terrabytes and you're using sha1, PKCS#1 suggests a "Label too long" error
+        // be output.
+
+        if ($mLen > $this->k - 2 * $this->hLen - 2) {
+            user_error('Message too long');
+            return false;
         }
-        $new->hLen = $new->hash->getLengthInBytes();
 
-        return $new;
+        // EME-OAEP encoding
+
+        $lHash = $this->hash->hash($l);
+        $ps = str_repeat(chr(0), $this->k - $mLen - 2 * $this->hLen - 2);
+        $db = $lHash . $ps . chr(1) . $m;
+        $seed = Random::string($this->hLen);
+        $dbMask = $this->_mgf1($seed, $this->k - $this->hLen - 1);
+        $maskedDB = $db ^ $dbMask;
+        $seedMask = $this->_mgf1($maskedDB, $this->hLen);
+        $maskedSeed = $seed ^ $seedMask;
+        $em = chr(0) . $maskedSeed . $maskedDB;
+
+        // RSA encryption
+
+        $m = $this->_os2ip($em);
+        $c = $this->_rsaep($m);
+        $c = $this->_i2osp($c, $this->k);
+
+        // Output the ciphertext C
+
+        return $c;
     }
 
     /**
-     * Determines which hashing function should be used for the mask generation function
+     * RSAES-OAEP-DECRYPT
      *
-     * The mask generation function is used by self::PADDING_OAEP and self::PADDING_PSS and although it's
-     * best if Hash and MGFHash are set to the same thing this is not a requirement.
+     * See {@link http://tools.ietf.org/html/rfc3447#section-7.1.2 RFC3447#section-7.1.2}.  The fact that the error
+     * messages aren't distinguishable from one another hinders debugging, but, to quote from RFC3447#section-7.1.2:
      *
-     * @param string $hash
-     */
-    public function withMGFHash($hash)
-    {
-        $new = clone $this;
-
-        // \phpseclib3\Crypt\Hash supports algorithms that PKCS#1 doesn't support.  md5-96 and sha1-96, for example.
-        switch (strtolower($hash)) {
-            case 'md2':
-            case 'md5':
-            case 'sha1':
-            case 'sha256':
-            case 'sha384':
-            case 'sha512':
-            case 'sha224':
-            case 'sha512/224':
-            case 'sha512/256':
-                $new->mgfHash = new Hash($hash);
-                break;
-            default:
-                throw new UnsupportedAlgorithmException(
-                    'The only supported hash algorithms are: md2, md5, sha1, sha256, sha384, sha512, sha224, sha512/224, sha512/256'
-                );
-        }
-        $new->mgfHLen = $new->mgfHash->getLengthInBytes();
-
-        return $new;
-    }
-
-    /**
-     * Returns the MGF hash algorithm currently being used
+     *    Note.  Care must be taken to ensure that an opponent cannot
+     *    distinguish the different error conditions in Step 3.g, whether by
+     *    error message or timing, or, more generally, learn partial
+     *    information about the encoded message EM.  Otherwise an opponent may
+     *    be able to obtain useful information about the decryption of the
+     *    ciphertext C, leading to a chosen-ciphertext attack such as the one
+     *    observed by Manger [36].
      *
-     */
-    public function getMGFHash()
-    {
-        return clone $this->mgfHash;
-    }
-
-    /**
-     * Determines the salt length
-     *
-     * Used by RSA::PADDING_PSS
-     *
-     * To quote from {@link http://tools.ietf.org/html/rfc3447#page-38 RFC3447#page-38}:
-     *
-     *    Typical salt lengths in octets are hLen (the length of the output
-     *    of the hash function Hash) and 0.
-     *
-     * @param int $sLen
-     */
-    public function withSaltLength($sLen)
-    {
-        $new = clone $this;
-        $new->sLen = $sLen;
-        return $new;
-    }
-
-    /**
-     * Returns the salt length currently being used
-     *
-     */
-    public function getSaltLength()
-    {
-        return $this->sLen !== null ? $this->sLen : $this->hLen;
-    }
-
-    /**
-     * Determines the label
-     *
-     * Used by RSA::PADDING_OAEP
-     *
-     * To quote from {@link http://tools.ietf.org/html/rfc3447#page-17 RFC3447#page-17}:
+     * As for $l...  to quote from {@link http://tools.ietf.org/html/rfc3447#page-17 RFC3447#page-17}:
      *
      *    Both the encryption and the decryption operations of RSAES-OAEP take
      *    the value of a label L as input.  In this version of PKCS #1, L is
      *    the empty string; other uses of the label are outside the scope of
      *    this document.
      *
-     * @param string $label
-     */
-    public function withLabel($label)
-    {
-        $new = clone $this;
-        $new->label = $label;
-        return $new;
-    }
-
-    /**
-     * Returns the label currently being used
-     *
-     */
-    public function getLabel()
-    {
-        return $this->label;
-    }
-
-    /**
-     * Determines the padding modes
-     *
-     * Example: $key->withPadding(RSA::ENCRYPTION_PKCS1 | RSA::SIGNATURE_PKCS1);
-     *
-     * @param int $padding
-     */
-    public function withPadding($padding)
-    {
-        $masks = [
-            self::ENCRYPTION_OAEP,
-            self::ENCRYPTION_PKCS1,
-            self::ENCRYPTION_NONE
-        ];
-        $encryptedCount = 0;
-        $selected = 0;
-        foreach ($masks as $mask) {
-            if ($padding & $mask) {
-                $selected = $mask;
-                $encryptedCount++;
-            }
-        }
-        if ($encryptedCount > 1) {
-            throw new InconsistentSetupException('Multiple encryption padding modes have been selected; at most only one should be selected');
-        }
-        $encryptionPadding = $selected;
-
-        $masks = [
-            self::SIGNATURE_PSS,
-            self::SIGNATURE_RELAXED_PKCS1,
-            self::SIGNATURE_PKCS1
-        ];
-        $signatureCount = 0;
-        $selected = 0;
-        foreach ($masks as $mask) {
-            if ($padding & $mask) {
-                $selected = $mask;
-                $signatureCount++;
-            }
-        }
-        if ($signatureCount > 1) {
-            throw new InconsistentSetupException('Multiple signature padding modes have been selected; at most only one should be selected');
-        }
-        $signaturePadding = $selected;
-
-        $new = clone $this;
-        if ($encryptedCount) {
-            $new->encryptionPadding = $encryptionPadding;
-        }
-        if ($signatureCount) {
-            $new->signaturePadding = $signaturePadding;
-        }
-        return $new;
-    }
-
-    /**
-     * Returns the padding currently being used
-     *
-     */
-    public function getPadding()
-    {
-        return $this->signaturePadding | $this->encryptionPadding;
-    }
-
-    /**
-     * Returns the current engine being used
-     *
-     * OpenSSL is only used in this class (and it's subclasses) for key generation
-     * Even then it depends on the parameters you're using. It's not used for
-     * multi-prime RSA nor is it used if the key length is outside of the range
-     * supported by OpenSSL
-     *
-     * @see self::useInternalEngine()
-     * @see self::useBestEngine()
+     * @access private
+     * @param string $c
+     * @param string $l
      * @return string
      */
-    public function getEngine()
+    function _rsaes_oaep_decrypt($c, $l = '')
     {
-        if (!isset(self::$engines['PHP'])) {
-            self::useBestEngine();
+        // Length checking
+
+        // if $l is larger than two million terrabytes and you're using sha1, PKCS#1 suggests a "Label too long" error
+        // be output.
+
+        if (strlen($c) != $this->k || $this->k < 2 * $this->hLen + 2) {
+            user_error('Decryption error');
+            return false;
         }
-        return self::$engines['OpenSSL'] && self::$defaultExponent == 65537 ?
-            'OpenSSL' :
-            'PHP';
+
+        // RSA decryption
+
+        $c = $this->_os2ip($c);
+        $m = $this->_rsadp($c);
+        if ($m === false) {
+            user_error('Decryption error');
+            return false;
+        }
+        $em = $this->_i2osp($m, $this->k);
+
+        // EME-OAEP decoding
+
+        $lHash = $this->hash->hash($l);
+        $y = ord($em[0]);
+        $maskedSeed = substr($em, 1, $this->hLen);
+        $maskedDB = substr($em, $this->hLen + 1);
+        $seedMask = $this->_mgf1($maskedDB, $this->hLen);
+        $seed = $maskedSeed ^ $seedMask;
+        $dbMask = $this->_mgf1($seed, $this->k - $this->hLen - 1);
+        $db = $maskedDB ^ $dbMask;
+        $lHash2 = substr($db, 0, $this->hLen);
+        $m = substr($db, $this->hLen);
+        if ($lHash != $lHash2) {
+            user_error('Decryption error');
+            return false;
+        }
+        $m = ltrim($m, chr(0));
+        if (ord($m[0]) != 1) {
+            user_error('Decryption error');
+            return false;
+        }
+
+        // Output the message M
+
+        return substr($m, 1);
     }
 
     /**
-     * Enable RSA Blinding
+     * Raw Encryption / Decryption
      *
+     * Doesn't use padding and is not recommended.
+     *
+     * @access private
+     * @param string $m
+     * @return string
      */
-    public static function enableBlinding()
+    function _raw_encrypt($m)
     {
-        static::$enableBlinding = true;
+        $temp = $this->_os2ip($m);
+        $temp = $this->_rsaep($temp);
+        return  $this->_i2osp($temp, $this->k);
     }
 
     /**
-     * Disable RSA Blinding
+     * RSAES-PKCS1-V1_5-ENCRYPT
      *
+     * See {@link http://tools.ietf.org/html/rfc3447#section-7.2.1 RFC3447#section-7.2.1}.
+     *
+     * @access private
+     * @param string $m
+     * @return string
      */
-    public static function disableBlinding()
+    function _rsaes_pkcs1_v1_5_encrypt($m)
     {
-        static::$enableBlinding = false;
+        $mLen = strlen($m);
+
+        // Length checking
+
+        if ($mLen > $this->k - 11) {
+            user_error('Message too long');
+            return false;
+        }
+
+        // EME-PKCS1-v1_5 encoding
+
+        $psLen = $this->k - $mLen - 3;
+        $ps = '';
+        while (strlen($ps) != $psLen) {
+            $temp = Random::string($psLen - strlen($ps));
+            $temp = str_replace("\x00", '', $temp);
+            $ps.= $temp;
+        }
+        $type = 2;
+        // see the comments of _rsaes_pkcs1_v1_5_decrypt() to understand why this is being done
+        if (defined('CRYPT_RSA_PKCS15_COMPAT') && (!isset($this->publicExponent) || $this->exponent !== $this->publicExponent)) {
+            $type = 1;
+            // "The padding string PS shall consist of k-3-||D|| octets. ... for block type 01, they shall have value FF"
+            $ps = str_repeat("\xFF", $psLen);
+        }
+        $em = chr(0) . chr($type) . $ps . chr(0) . $m;
+
+        // RSA encryption
+        $m = $this->_os2ip($em);
+        $c = $this->_rsaep($m);
+        $c = $this->_i2osp($c, $this->k);
+
+        // Output the ciphertext C
+
+        return $c;
+    }
+
+    /**
+     * RSAES-PKCS1-V1_5-DECRYPT
+     *
+     * See {@link http://tools.ietf.org/html/rfc3447#section-7.2.2 RFC3447#section-7.2.2}.
+     *
+     * For compatibility purposes, this function departs slightly from the description given in RFC3447.
+     * The reason being that RFC2313#section-8.1 (PKCS#1 v1.5) states that ciphertext's encrypted by the
+     * private key should have the second byte set to either 0 or 1 and that ciphertext's encrypted by the
+     * public key should have the second byte set to 2.  In RFC3447 (PKCS#1 v2.1), the second byte is supposed
+     * to be 2 regardless of which key is used.  For compatibility purposes, we'll just check to make sure the
+     * second byte is 2 or less.  If it is, we'll accept the decrypted string as valid.
+     *
+     * As a consequence of this, a private key encrypted ciphertext produced with \phpseclib\Crypt\RSA may not decrypt
+     * with a strictly PKCS#1 v1.5 compliant RSA implementation.  Public key encrypted ciphertext's should but
+     * not private key encrypted ciphertext's.
+     *
+     * @access private
+     * @param string $c
+     * @return string
+     */
+    function _rsaes_pkcs1_v1_5_decrypt($c)
+    {
+        // Length checking
+
+        if (strlen($c) != $this->k) { // or if k < 11
+            user_error('Decryption error');
+            return false;
+        }
+
+        // RSA decryption
+
+        $c = $this->_os2ip($c);
+        $m = $this->_rsadp($c);
+
+        if ($m === false) {
+            user_error('Decryption error');
+            return false;
+        }
+        $em = $this->_i2osp($m, $this->k);
+
+        // EME-PKCS1-v1_5 decoding
+
+        if (ord($em[0]) != 0 || ord($em[1]) > 2) {
+            user_error('Decryption error');
+            return false;
+        }
+
+        $ps = substr($em, 2, strpos($em, chr(0), 2) - 2);
+        $m = substr($em, strlen($ps) + 3);
+
+        if (strlen($ps) < 8) {
+            user_error('Decryption error');
+            return false;
+        }
+
+        // Output M
+
+        return $m;
+    }
+
+    /**
+     * EMSA-PSS-ENCODE
+     *
+     * See {@link http://tools.ietf.org/html/rfc3447#section-9.1.1 RFC3447#section-9.1.1}.
+     *
+     * @access private
+     * @param string $m
+     * @param int $emBits
+     */
+    function _emsa_pss_encode($m, $emBits)
+    {
+        // if $m is larger than two million terrabytes and you're using sha1, PKCS#1 suggests a "Label too long" error
+        // be output.
+
+        $emLen = ($emBits + 1) >> 3; // ie. ceil($emBits / 8)
+        $sLen = $this->sLen !== null ? $this->sLen : $this->hLen;
+
+        $mHash = $this->hash->hash($m);
+        if ($emLen < $this->hLen + $sLen + 2) {
+            user_error('Encoding error');
+            return false;
+        }
+
+        $salt = Random::string($sLen);
+        $m2 = "\0\0\0\0\0\0\0\0" . $mHash . $salt;
+        $h = $this->hash->hash($m2);
+        $ps = str_repeat(chr(0), $emLen - $sLen - $this->hLen - 2);
+        $db = $ps . chr(1) . $salt;
+        $dbMask = $this->_mgf1($h, $emLen - $this->hLen - 1);
+        $maskedDB = $db ^ $dbMask;
+        $maskedDB[0] = ~chr(0xFF << ($emBits & 7)) & $maskedDB[0];
+        $em = $maskedDB . $h . chr(0xBC);
+
+        return $em;
+    }
+
+    /**
+     * EMSA-PSS-VERIFY
+     *
+     * See {@link http://tools.ietf.org/html/rfc3447#section-9.1.2 RFC3447#section-9.1.2}.
+     *
+     * @access private
+     * @param string $m
+     * @param string $em
+     * @param int $emBits
+     * @return string
+     */
+    function _emsa_pss_verify($m, $em, $emBits)
+    {
+        // if $m is larger than two million terrabytes and you're using sha1, PKCS#1 suggests a "Label too long" error
+        // be output.
+
+        $emLen = ($emBits + 1) >> 3; // ie. ceil($emBits / 8);
+        $sLen = $this->sLen !== null ? $this->sLen : $this->hLen;
+
+        $mHash = $this->hash->hash($m);
+        if ($emLen < $this->hLen + $sLen + 2) {
+            return false;
+        }
+
+        if ($em[strlen($em) - 1] != chr(0xBC)) {
+            return false;
+        }
+
+        $maskedDB = substr($em, 0, -$this->hLen - 1);
+        $h = substr($em, -$this->hLen - 1, $this->hLen);
+        $temp = chr(0xFF << ($emBits & 7));
+        if ((~$maskedDB[0] & $temp) != $temp) {
+            return false;
+        }
+        $dbMask = $this->_mgf1($h, $emLen - $this->hLen - 1);
+        $db = $maskedDB ^ $dbMask;
+        $db[0] = ~chr(0xFF << ($emBits & 7)) & $db[0];
+        $temp = $emLen - $this->hLen - $sLen - 2;
+        if (substr($db, 0, $temp) != str_repeat(chr(0), $temp) || ord($db[$temp]) != 1) {
+            return false;
+        }
+        $salt = substr($db, $temp + 1); // should be $sLen long
+        $m2 = "\0\0\0\0\0\0\0\0" . $mHash . $salt;
+        $h2 = $this->hash->hash($m2);
+        return $this->_equals($h, $h2);
+    }
+
+    /**
+     * RSASSA-PSS-SIGN
+     *
+     * See {@link http://tools.ietf.org/html/rfc3447#section-8.1.1 RFC3447#section-8.1.1}.
+     *
+     * @access private
+     * @param string $m
+     * @return string
+     */
+    function _rsassa_pss_sign($m)
+    {
+        // EMSA-PSS encoding
+
+        $em = $this->_emsa_pss_encode($m, 8 * $this->k - 1);
+
+        // RSA signature
+
+        $m = $this->_os2ip($em);
+        $s = $this->_rsasp1($m);
+        $s = $this->_i2osp($s, $this->k);
+
+        // Output the signature S
+
+        return $s;
+    }
+
+    /**
+     * RSASSA-PSS-VERIFY
+     *
+     * See {@link http://tools.ietf.org/html/rfc3447#section-8.1.2 RFC3447#section-8.1.2}.
+     *
+     * @access private
+     * @param string $m
+     * @param string $s
+     * @return string
+     */
+    function _rsassa_pss_verify($m, $s)
+    {
+        // Length checking
+
+        if (strlen($s) != $this->k) {
+            user_error('Invalid signature');
+            return false;
+        }
+
+        // RSA verification
+
+        $modBits = 8 * $this->k;
+
+        $s2 = $this->_os2ip($s);
+        $m2 = $this->_rsavp1($s2);
+        if ($m2 === false) {
+            user_error('Invalid signature');
+            return false;
+        }
+        $em = $this->_i2osp($m2, $modBits >> 3);
+        if ($em === false) {
+            user_error('Invalid signature');
+            return false;
+        }
+
+        // EMSA-PSS verification
+
+        return $this->_emsa_pss_verify($m, $em, $modBits - 1);
+    }
+
+    /**
+     * EMSA-PKCS1-V1_5-ENCODE
+     *
+     * See {@link http://tools.ietf.org/html/rfc3447#section-9.2 RFC3447#section-9.2}.
+     *
+     * @access private
+     * @param string $m
+     * @param int $emLen
+     * @return string
+     */
+    function _emsa_pkcs1_v1_5_encode($m, $emLen)
+    {
+        $h = $this->hash->hash($m);
+        if ($h === false) {
+            return false;
+        }
+
+        // see http://tools.ietf.org/html/rfc3447#page-43
+        switch ($this->hashName) {
+            case 'md2':
+                $t = pack('H*', '3020300c06082a864886f70d020205000410');
+                break;
+            case 'md5':
+                $t = pack('H*', '3020300c06082a864886f70d020505000410');
+                break;
+            case 'sha1':
+                $t = pack('H*', '3021300906052b0e03021a05000414');
+                break;
+            case 'sha256':
+                $t = pack('H*', '3031300d060960864801650304020105000420');
+                break;
+            case 'sha384':
+                $t = pack('H*', '3041300d060960864801650304020205000430');
+                break;
+            case 'sha512':
+                $t = pack('H*', '3051300d060960864801650304020305000440');
+        }
+        $t.= $h;
+        $tLen = strlen($t);
+
+        if ($emLen < $tLen + 11) {
+            user_error('Intended encoded message length too short');
+            return false;
+        }
+
+        $ps = str_repeat(chr(0xFF), $emLen - $tLen - 3);
+
+        $em = "\0\1$ps\0$t";
+
+        return $em;
+    }
+
+    /**
+     * RSASSA-PKCS1-V1_5-SIGN
+     *
+     * See {@link http://tools.ietf.org/html/rfc3447#section-8.2.1 RFC3447#section-8.2.1}.
+     *
+     * @access private
+     * @param string $m
+     * @return string
+     */
+    function _rsassa_pkcs1_v1_5_sign($m)
+    {
+        // EMSA-PKCS1-v1_5 encoding
+
+        $em = $this->_emsa_pkcs1_v1_5_encode($m, $this->k);
+        if ($em === false) {
+            user_error('RSA modulus too short');
+            return false;
+        }
+
+        // RSA signature
+
+        $m = $this->_os2ip($em);
+        $s = $this->_rsasp1($m);
+        $s = $this->_i2osp($s, $this->k);
+
+        // Output the signature S
+
+        return $s;
+    }
+
+    /**
+     * RSASSA-PKCS1-V1_5-VERIFY
+     *
+     * See {@link http://tools.ietf.org/html/rfc3447#section-8.2.2 RFC3447#section-8.2.2}.
+     *
+     * @access private
+     * @param string $m
+     * @return string
+     */
+    function _rsassa_pkcs1_v1_5_verify($m, $s)
+    {
+        // Length checking
+
+        if (strlen($s) != $this->k) {
+            user_error('Invalid signature');
+            return false;
+        }
+
+        // RSA verification
+
+        $s = $this->_os2ip($s);
+        $m2 = $this->_rsavp1($s);
+        if ($m2 === false) {
+            user_error('Invalid signature');
+            return false;
+        }
+        $em = $this->_i2osp($m2, $this->k);
+        if ($em === false) {
+            user_error('Invalid signature');
+            return false;
+        }
+
+        // EMSA-PKCS1-v1_5 encoding
+
+        $em2 = $this->_emsa_pkcs1_v1_5_encode($m, $this->k);
+        if ($em2 === false) {
+            user_error('RSA modulus too short');
+            return false;
+        }
+
+        // Compare
+        return $this->_equals($em, $em2);
+    }
+
+    /**
+     * Set Encryption Mode
+     *
+     * Valid values include self::ENCRYPTION_OAEP and self::ENCRYPTION_PKCS1.
+     *
+     * @access public
+     * @param int $mode
+     */
+    function setEncryptionMode($mode)
+    {
+        $this->encryptionMode = $mode;
+    }
+
+    /**
+     * Set Signature Mode
+     *
+     * Valid values include self::SIGNATURE_PSS and self::SIGNATURE_PKCS1
+     *
+     * @access public
+     * @param int $mode
+     */
+    function setSignatureMode($mode)
+    {
+        $this->signatureMode = $mode;
+    }
+
+    /**
+     * Set public key comment.
+     *
+     * @access public
+     * @param string $comment
+     */
+    function setComment($comment)
+    {
+        $this->comment = $comment;
+    }
+
+    /**
+     * Get public key comment.
+     *
+     * @access public
+     * @return string
+     */
+    function getComment()
+    {
+        return $this->comment;
+    }
+
+    /**
+     * Encryption
+     *
+     * Both self::ENCRYPTION_OAEP and self::ENCRYPTION_PKCS1 both place limits on how long $plaintext can be.
+     * If $plaintext exceeds those limits it will be broken up so that it does and the resultant ciphertext's will
+     * be concatenated together.
+     *
+     * @see self::decrypt()
+     * @access public
+     * @param string $plaintext
+     * @return string
+     */
+    function encrypt($plaintext)
+    {
+        switch ($this->encryptionMode) {
+            case self::ENCRYPTION_NONE:
+                $plaintext = str_split($plaintext, $this->k);
+                $ciphertext = '';
+                foreach ($plaintext as $m) {
+                    $ciphertext.= $this->_raw_encrypt($m);
+                }
+                return $ciphertext;
+            case self::ENCRYPTION_PKCS1:
+                $length = $this->k - 11;
+                if ($length <= 0) {
+                    return false;
+                }
+
+                $plaintext = str_split($plaintext, $length);
+                $ciphertext = '';
+                foreach ($plaintext as $m) {
+                    $ciphertext.= $this->_rsaes_pkcs1_v1_5_encrypt($m);
+                }
+                return $ciphertext;
+            //case self::ENCRYPTION_OAEP:
+            default:
+                $length = $this->k - 2 * $this->hLen - 2;
+                if ($length <= 0) {
+                    return false;
+                }
+
+                $plaintext = str_split($plaintext, $length);
+                $ciphertext = '';
+                foreach ($plaintext as $m) {
+                    $ciphertext.= $this->_rsaes_oaep_encrypt($m);
+                }
+                return $ciphertext;
+        }
+    }
+
+    /**
+     * Decryption
+     *
+     * @see self::encrypt()
+     * @access public
+     * @param string $plaintext
+     * @return string
+     */
+    function decrypt($ciphertext)
+    {
+        if ($this->k <= 0) {
+            return false;
+        }
+
+        $ciphertext = str_split($ciphertext, $this->k);
+        $ciphertext[count($ciphertext) - 1] = str_pad($ciphertext[count($ciphertext) - 1], $this->k, chr(0), STR_PAD_LEFT);
+
+        $plaintext = '';
+
+        switch ($this->encryptionMode) {
+            case self::ENCRYPTION_NONE:
+                $decrypt = '_raw_encrypt';
+                break;
+            case self::ENCRYPTION_PKCS1:
+                $decrypt = '_rsaes_pkcs1_v1_5_decrypt';
+                break;
+            //case self::ENCRYPTION_OAEP:
+            default:
+                $decrypt = '_rsaes_oaep_decrypt';
+        }
+
+        foreach ($ciphertext as $c) {
+            $temp = $this->$decrypt($c);
+            if ($temp === false) {
+                return false;
+            }
+            $plaintext.= $temp;
+        }
+
+        return $plaintext;
+    }
+
+    /**
+     * Create a signature
+     *
+     * @see self::verify()
+     * @access public
+     * @param string $message
+     * @return string
+     */
+    function sign($message)
+    {
+        if (empty($this->modulus) || empty($this->exponent)) {
+            return false;
+        }
+
+        switch ($this->signatureMode) {
+            case self::SIGNATURE_PKCS1:
+                return $this->_rsassa_pkcs1_v1_5_sign($message);
+            //case self::SIGNATURE_PSS:
+            default:
+                return $this->_rsassa_pss_sign($message);
+        }
+    }
+
+    /**
+     * Verifies a signature
+     *
+     * @see self::sign()
+     * @access public
+     * @param string $message
+     * @param string $signature
+     * @return bool
+     */
+    function verify($message, $signature)
+    {
+        if (empty($this->modulus) || empty($this->exponent)) {
+            return false;
+        }
+
+        switch ($this->signatureMode) {
+            case self::SIGNATURE_PKCS1:
+                return $this->_rsassa_pkcs1_v1_5_verify($message, $signature);
+            //case self::SIGNATURE_PSS:
+            default:
+                return $this->_rsassa_pss_verify($message, $signature);
+        }
+    }
+
+    /**
+     * Extract raw BER from Base64 encoding
+     *
+     * @access private
+     * @param string $str
+     * @return string
+     */
+    function _extractBER($str)
+    {
+        /* X.509 certs are assumed to be base64 encoded but sometimes they'll have additional things in them
+         * above and beyond the ceritificate.
+         * ie. some may have the following preceding the -----BEGIN CERTIFICATE----- line:
+         *
+         * Bag Attributes
+         *     localKeyID: 01 00 00 00
+         * subject=/O=organization/OU=org unit/CN=common name
+         * issuer=/O=organization/CN=common name
+         */
+        $temp = preg_replace('#.*?^-+[^-]+-+[\r\n ]*$#ms', '', $str, 1);
+        // remove the -----BEGIN CERTIFICATE----- and -----END CERTIFICATE----- stuff
+        $temp = preg_replace('#-+[^-]+-+#', '', $temp);
+        // remove new lines
+        $temp = str_replace(array("\r", "\n", ' '), '', $temp);
+        $temp = preg_match('#^[a-zA-Z\d/+]*={0,2}$#', $temp) ? base64_decode($temp) : false;
+        return $temp != false ? $temp : $str;
     }
 }
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/RSA/Formats/Keys/JWK.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/RSA/Formats/Keys/JWK.php
deleted file mode 100644
index 87f543de..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/RSA/Formats/Keys/JWK.php
+++ /dev/null
@@ -1,142 +0,0 @@
-<?php
-
-/**
- * JSON Web Key (RFC7517) Formatted RSA Handler
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2015 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\Crypt\RSA\Formats\Keys;
-
-use phpseclib3\Common\Functions\Strings;
-use phpseclib3\Crypt\Common\Formats\Keys\JWK as Progenitor;
-use phpseclib3\Math\BigInteger;
-
-/**
- * JWK Formatted RSA Handler
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class JWK extends Progenitor
-{
-    /**
-     * Break a public or private key down into its constituent components
-     *
-     * @param string $key
-     * @param string $password optional
-     * @return array
-     */
-    public static function load($key, $password = '')
-    {
-        $key = parent::load($key, $password);
-
-        if ($key->kty != 'RSA') {
-            throw new \RuntimeException('Only RSA JWK keys are supported');
-        }
-
-        $count = $publicCount = 0;
-        $vars = ['n', 'e', 'd', 'p', 'q', 'dp', 'dq', 'qi'];
-        foreach ($vars as $var) {
-            if (!isset($key->$var) || !is_string($key->$var)) {
-                continue;
-            }
-            $count++;
-            $value = new BigInteger(Strings::base64url_decode($key->$var), 256);
-            switch ($var) {
-                case 'n':
-                    $publicCount++;
-                    $components['modulus'] = $value;
-                    break;
-                case 'e':
-                    $publicCount++;
-                    $components['publicExponent'] = $value;
-                    break;
-                case 'd':
-                    $components['privateExponent'] = $value;
-                    break;
-                case 'p':
-                    $components['primes'][1] = $value;
-                    break;
-                case 'q':
-                    $components['primes'][2] = $value;
-                    break;
-                case 'dp':
-                    $components['exponents'][1] = $value;
-                    break;
-                case 'dq':
-                    $components['exponents'][2] = $value;
-                    break;
-                case 'qi':
-                    $components['coefficients'][2] = $value;
-            }
-        }
-
-        if ($count == count($vars)) {
-            return $components + ['isPublicKey' => false];
-        }
-
-        if ($count == 2 && $publicCount == 2) {
-            return $components + ['isPublicKey' => true];
-        }
-
-        throw new \UnexpectedValueException('Key does not have an appropriate number of RSA parameters');
-    }
-
-    /**
-     * Convert a private key to the appropriate format.
-     *
-     * @param \phpseclib3\Math\BigInteger $n
-     * @param \phpseclib3\Math\BigInteger $e
-     * @param \phpseclib3\Math\BigInteger $d
-     * @param array $primes
-     * @param array $exponents
-     * @param array $coefficients
-     * @param string $password optional
-     * @param array $options optional
-     * @return string
-     */
-    public static function savePrivateKey(BigInteger $n, BigInteger $e, BigInteger $d, array $primes, array $exponents, array $coefficients, $password = '', array $options = [])
-    {
-        if (count($primes) != 2) {
-            throw new \InvalidArgumentException('JWK does not support multi-prime RSA keys');
-        }
-
-        $key = [
-            'kty' => 'RSA',
-            'n' => Strings::base64url_encode($n->toBytes()),
-            'e' => Strings::base64url_encode($e->toBytes()),
-            'd' => Strings::base64url_encode($d->toBytes()),
-            'p' => Strings::base64url_encode($primes[1]->toBytes()),
-            'q' => Strings::base64url_encode($primes[2]->toBytes()),
-            'dp' => Strings::base64url_encode($exponents[1]->toBytes()),
-            'dq' => Strings::base64url_encode($exponents[2]->toBytes()),
-            'qi' => Strings::base64url_encode($coefficients[2]->toBytes())
-        ];
-
-        return self::wrapKey($key, $options);
-    }
-
-    /**
-     * Convert a public key to the appropriate format
-     *
-     * @param \phpseclib3\Math\BigInteger $n
-     * @param \phpseclib3\Math\BigInteger $e
-     * @param array $options optional
-     * @return string
-     */
-    public static function savePublicKey(BigInteger $n, BigInteger $e, array $options = [])
-    {
-        $key = [
-            'kty' => 'RSA',
-            'n' => Strings::base64url_encode($n->toBytes()),
-            'e' => Strings::base64url_encode($e->toBytes())
-        ];
-
-        return self::wrapKey($key, $options);
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/RSA/Formats/Keys/MSBLOB.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/RSA/Formats/Keys/MSBLOB.php
deleted file mode 100644
index e9a0c4f3..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/RSA/Formats/Keys/MSBLOB.php
+++ /dev/null
@@ -1,228 +0,0 @@
-<?php
-
-/**
- * Miccrosoft BLOB Formatted RSA Key Handler
- *
- * More info:
- *
- * https://msdn.microsoft.com/en-us/library/windows/desktop/aa375601(v=vs.85).aspx
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2015 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\Crypt\RSA\Formats\Keys;
-
-use phpseclib3\Common\Functions\Strings;
-use phpseclib3\Exception\UnsupportedFormatException;
-use phpseclib3\Math\BigInteger;
-
-/**
- * Microsoft BLOB Formatted RSA Key Handler
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class MSBLOB
-{
-    /**
-     * Public/Private Key Pair
-     *
-     */
-    const PRIVATEKEYBLOB = 0x7;
-    /**
-     * Public Key
-     *
-     */
-    const PUBLICKEYBLOB = 0x6;
-    /**
-     * Public Key
-     *
-     */
-    const PUBLICKEYBLOBEX = 0xA;
-    /**
-     * RSA public key exchange algorithm
-     *
-     */
-    const CALG_RSA_KEYX = 0x0000A400;
-    /**
-     * RSA public key exchange algorithm
-     *
-     */
-    const CALG_RSA_SIGN = 0x00002400;
-    /**
-     * Public Key
-     *
-     */
-    const RSA1 = 0x31415352;
-    /**
-     * Private Key
-     *
-     */
-    const RSA2 = 0x32415352;
-
-    /**
-     * Break a public or private key down into its constituent components
-     *
-     * @param string $key
-     * @param string $password optional
-     * @return array
-     */
-    public static function load($key, $password = '')
-    {
-        if (!Strings::is_stringable($key)) {
-            throw new \UnexpectedValueException('Key should be a string - not a ' . gettype($key));
-        }
-
-        $key = Strings::base64_decode($key);
-
-        if (!is_string($key)) {
-            throw new \UnexpectedValueException('Base64 decoding produced an error');
-        }
-        if (strlen($key) < 20) {
-            throw new \UnexpectedValueException('Key appears to be malformed');
-        }
-
-        // PUBLICKEYSTRUC  publickeystruc
-        // https://msdn.microsoft.com/en-us/library/windows/desktop/aa387453(v=vs.85).aspx
-        extract(unpack('atype/aversion/vreserved/Valgo', Strings::shift($key, 8)));
-        /**
-         * @var string $type
-         * @var string $version
-         * @var integer $reserved
-         * @var integer $algo
-         */
-        switch (ord($type)) {
-            case self::PUBLICKEYBLOB:
-            case self::PUBLICKEYBLOBEX:
-                $publickey = true;
-                break;
-            case self::PRIVATEKEYBLOB:
-                $publickey = false;
-                break;
-            default:
-                throw new \UnexpectedValueException('Key appears to be malformed');
-        }
-
-        $components = ['isPublicKey' => $publickey];
-
-        // https://msdn.microsoft.com/en-us/library/windows/desktop/aa375549(v=vs.85).aspx
-        switch ($algo) {
-            case self::CALG_RSA_KEYX:
-            case self::CALG_RSA_SIGN:
-                break;
-            default:
-                throw new \UnexpectedValueException('Key appears to be malformed');
-        }
-
-        // RSAPUBKEY rsapubkey
-        // https://msdn.microsoft.com/en-us/library/windows/desktop/aa387685(v=vs.85).aspx
-        // could do V for pubexp but that's unsigned 32-bit whereas some PHP installs only do signed 32-bit
-        extract(unpack('Vmagic/Vbitlen/a4pubexp', Strings::shift($key, 12)));
-        /**
-         * @var integer $magic
-         * @var integer $bitlen
-         * @var string $pubexp
-         */
-        switch ($magic) {
-            case self::RSA2:
-                $components['isPublicKey'] = false;
-                // fall-through
-            case self::RSA1:
-                break;
-            default:
-                throw new \UnexpectedValueException('Key appears to be malformed');
-        }
-
-        $baseLength = $bitlen / 16;
-        if (strlen($key) != 2 * $baseLength && strlen($key) != 9 * $baseLength) {
-            throw new \UnexpectedValueException('Key appears to be malformed');
-        }
-
-        $components[$components['isPublicKey'] ? 'publicExponent' : 'privateExponent'] = new BigInteger(strrev($pubexp), 256);
-        // BYTE modulus[rsapubkey.bitlen/8]
-        $components['modulus'] = new BigInteger(strrev(Strings::shift($key, $bitlen / 8)), 256);
-
-        if ($publickey) {
-            return $components;
-        }
-
-        $components['isPublicKey'] = false;
-
-        // BYTE prime1[rsapubkey.bitlen/16]
-        $components['primes'] = [1 => new BigInteger(strrev(Strings::shift($key, $bitlen / 16)), 256)];
-        // BYTE prime2[rsapubkey.bitlen/16]
-        $components['primes'][] = new BigInteger(strrev(Strings::shift($key, $bitlen / 16)), 256);
-        // BYTE exponent1[rsapubkey.bitlen/16]
-        $components['exponents'] = [1 => new BigInteger(strrev(Strings::shift($key, $bitlen / 16)), 256)];
-        // BYTE exponent2[rsapubkey.bitlen/16]
-        $components['exponents'][] = new BigInteger(strrev(Strings::shift($key, $bitlen / 16)), 256);
-        // BYTE coefficient[rsapubkey.bitlen/16]
-        $components['coefficients'] = [2 => new BigInteger(strrev(Strings::shift($key, $bitlen / 16)), 256)];
-        if (isset($components['privateExponent'])) {
-            $components['publicExponent'] = $components['privateExponent'];
-        }
-        // BYTE privateExponent[rsapubkey.bitlen/8]
-        $components['privateExponent'] = new BigInteger(strrev(Strings::shift($key, $bitlen / 8)), 256);
-
-        return $components;
-    }
-
-    /**
-     * Convert a private key to the appropriate format.
-     *
-     * @param \phpseclib3\Math\BigInteger $n
-     * @param \phpseclib3\Math\BigInteger $e
-     * @param \phpseclib3\Math\BigInteger $d
-     * @param array $primes
-     * @param array $exponents
-     * @param array $coefficients
-     * @param string $password optional
-     * @return string
-     */
-    public static function savePrivateKey(BigInteger $n, BigInteger $e, BigInteger $d, array $primes, array $exponents, array $coefficients, $password = '')
-    {
-        if (count($primes) != 2) {
-            throw new \InvalidArgumentException('MSBLOB does not support multi-prime RSA keys');
-        }
-
-        if (!empty($password) && is_string($password)) {
-            throw new UnsupportedFormatException('MSBLOB private keys do not support encryption');
-        }
-
-        $n = strrev($n->toBytes());
-        $e = str_pad(strrev($e->toBytes()), 4, "\0");
-        $key = pack('aavV', chr(self::PRIVATEKEYBLOB), chr(2), 0, self::CALG_RSA_KEYX);
-        $key .= pack('VVa*', self::RSA2, 8 * strlen($n), $e);
-        $key .= $n;
-        $key .= strrev($primes[1]->toBytes());
-        $key .= strrev($primes[2]->toBytes());
-        $key .= strrev($exponents[1]->toBytes());
-        $key .= strrev($exponents[2]->toBytes());
-        $key .= strrev($coefficients[2]->toBytes());
-        $key .= strrev($d->toBytes());
-
-        return Strings::base64_encode($key);
-    }
-
-    /**
-     * Convert a public key to the appropriate format
-     *
-     * @param \phpseclib3\Math\BigInteger $n
-     * @param \phpseclib3\Math\BigInteger $e
-     * @return string
-     */
-    public static function savePublicKey(BigInteger $n, BigInteger $e)
-    {
-        $n = strrev($n->toBytes());
-        $e = str_pad(strrev($e->toBytes()), 4, "\0");
-        $key = pack('aavV', chr(self::PUBLICKEYBLOB), chr(2), 0, self::CALG_RSA_KEYX);
-        $key .= pack('VVa*', self::RSA1, 8 * strlen($n), $e);
-        $key .= $n;
-
-        return Strings::base64_encode($key);
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/RSA/Formats/Keys/OpenSSH.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/RSA/Formats/Keys/OpenSSH.php
deleted file mode 100644
index 2367810a..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/RSA/Formats/Keys/OpenSSH.php
+++ /dev/null
@@ -1,132 +0,0 @@
-<?php
-
-/**
- * OpenSSH Formatted RSA Key Handler
- *
- * PHP version 5
- *
- * Place in $HOME/.ssh/authorized_keys
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2015 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\Crypt\RSA\Formats\Keys;
-
-use phpseclib3\Common\Functions\Strings;
-use phpseclib3\Crypt\Common\Formats\Keys\OpenSSH as Progenitor;
-use phpseclib3\Math\BigInteger;
-
-/**
- * OpenSSH Formatted RSA Key Handler
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class OpenSSH extends Progenitor
-{
-    /**
-     * Supported Key Types
-     *
-     * @var array
-     */
-    protected static $types = ['ssh-rsa'];
-
-    /**
-     * Break a public or private key down into its constituent components
-     *
-     * @param string $key
-     * @param string $password optional
-     * @return array
-     */
-    public static function load($key, $password = '')
-    {
-        static $one;
-        if (!isset($one)) {
-            $one = new BigInteger(1);
-        }
-
-        $parsed = parent::load($key, $password);
-
-        if (isset($parsed['paddedKey'])) {
-            list($type) = Strings::unpackSSH2('s', $parsed['paddedKey']);
-            if ($type != $parsed['type']) {
-                throw new \RuntimeException("The public and private keys are not of the same type ($type vs $parsed[type])");
-            }
-
-            $primes = $coefficients = [];
-
-            list(
-                $modulus,
-                $publicExponent,
-                $privateExponent,
-                $coefficients[2],
-                $primes[1],
-                $primes[2],
-                $comment,
-            ) = Strings::unpackSSH2('i6s', $parsed['paddedKey']);
-
-            $temp = $primes[1]->subtract($one);
-            $exponents = [1 => $publicExponent->modInverse($temp)];
-            $temp = $primes[2]->subtract($one);
-            $exponents[] = $publicExponent->modInverse($temp);
-
-            $isPublicKey = false;
-
-            return compact('publicExponent', 'modulus', 'privateExponent', 'primes', 'coefficients', 'exponents', 'comment', 'isPublicKey');
-        }
-
-        list($publicExponent, $modulus) = Strings::unpackSSH2('ii', $parsed['publicKey']);
-
-        return [
-            'isPublicKey' => true,
-            'modulus' => $modulus,
-            'publicExponent' => $publicExponent,
-            'comment' => $parsed['comment']
-        ];
-    }
-
-    /**
-     * Convert a public key to the appropriate format
-     *
-     * @param \phpseclib3\Math\BigInteger $n
-     * @param \phpseclib3\Math\BigInteger $e
-     * @param array $options optional
-     * @return string
-     */
-    public static function savePublicKey(BigInteger $n, BigInteger $e, array $options = [])
-    {
-        $RSAPublicKey = Strings::packSSH2('sii', 'ssh-rsa', $e, $n);
-
-        if (isset($options['binary']) ? $options['binary'] : self::$binary) {
-            return $RSAPublicKey;
-        }
-
-        $comment = isset($options['comment']) ? $options['comment'] : self::$comment;
-        $RSAPublicKey = 'ssh-rsa ' . base64_encode($RSAPublicKey) . ' ' . $comment;
-
-        return $RSAPublicKey;
-    }
-
-    /**
-     * Convert a private key to the appropriate format.
-     *
-     * @param \phpseclib3\Math\BigInteger $n
-     * @param \phpseclib3\Math\BigInteger $e
-     * @param \phpseclib3\Math\BigInteger $d
-     * @param array $primes
-     * @param array $exponents
-     * @param array $coefficients
-     * @param string $password optional
-     * @param array $options optional
-     * @return string
-     */
-    public static function savePrivateKey(BigInteger $n, BigInteger $e, BigInteger $d, array $primes, array $exponents, array $coefficients, $password = '', array $options = [])
-    {
-        $publicKey = self::savePublicKey($n, $e, ['binary' => true]);
-        $privateKey = Strings::packSSH2('si6', 'ssh-rsa', $n, $e, $d, $coefficients[2], $primes[1], $primes[2]);
-
-        return self::wrapPrivateKey($publicKey, $privateKey, $password, $options);
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/RSA/Formats/Keys/PKCS1.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/RSA/Formats/Keys/PKCS1.php
deleted file mode 100644
index 276c6024..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/RSA/Formats/Keys/PKCS1.php
+++ /dev/null
@@ -1,160 +0,0 @@
-<?php
-
-/**
- * PKCS#1 Formatted RSA Key Handler
- *
- * PHP version 5
- *
- * Used by File/X509.php
- *
- * Processes keys with the following headers:
- *
- * -----BEGIN RSA PRIVATE KEY-----
- * -----BEGIN RSA PUBLIC KEY-----
- *
- * Analogous to ssh-keygen's pem format (as specified by -m)
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2015 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\Crypt\RSA\Formats\Keys;
-
-use phpseclib3\Common\Functions\Strings;
-use phpseclib3\Crypt\Common\Formats\Keys\PKCS1 as Progenitor;
-use phpseclib3\File\ASN1;
-use phpseclib3\File\ASN1\Maps;
-use phpseclib3\Math\BigInteger;
-
-/**
- * PKCS#1 Formatted RSA Key Handler
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class PKCS1 extends Progenitor
-{
-    /**
-     * Break a public or private key down into its constituent components
-     *
-     * @param string $key
-     * @param string $password optional
-     * @return array
-     */
-    public static function load($key, $password = '')
-    {
-        if (!Strings::is_stringable($key)) {
-            throw new \UnexpectedValueException('Key should be a string - not a ' . gettype($key));
-        }
-
-        if (strpos($key, 'PUBLIC') !== false) {
-            $components = ['isPublicKey' => true];
-        } elseif (strpos($key, 'PRIVATE') !== false) {
-            $components = ['isPublicKey' => false];
-        } else {
-            $components = [];
-        }
-
-        $key = parent::load($key, $password);
-
-        $decoded = ASN1::decodeBER($key);
-        if (!$decoded) {
-            throw new \RuntimeException('Unable to decode BER');
-        }
-
-        $key = ASN1::asn1map($decoded[0], Maps\RSAPrivateKey::MAP);
-        if (is_array($key)) {
-            $components += [
-                'modulus' => $key['modulus'],
-                'publicExponent' => $key['publicExponent'],
-                'privateExponent' => $key['privateExponent'],
-                'primes' => [1 => $key['prime1'], $key['prime2']],
-                'exponents' => [1 => $key['exponent1'], $key['exponent2']],
-                'coefficients' => [2 => $key['coefficient']]
-            ];
-            if ($key['version'] == 'multi') {
-                foreach ($key['otherPrimeInfos'] as $primeInfo) {
-                    $components['primes'][] = $primeInfo['prime'];
-                    $components['exponents'][] = $primeInfo['exponent'];
-                    $components['coefficients'][] = $primeInfo['coefficient'];
-                }
-            }
-            if (!isset($components['isPublicKey'])) {
-                $components['isPublicKey'] = false;
-            }
-            return $components;
-        }
-
-        $key = ASN1::asn1map($decoded[0], Maps\RSAPublicKey::MAP);
-
-        if (!is_array($key)) {
-            throw new \RuntimeException('Unable to perform ASN1 mapping');
-        }
-
-        if (!isset($components['isPublicKey'])) {
-            $components['isPublicKey'] = true;
-        }
-
-        return $components + $key;
-    }
-
-    /**
-     * Convert a private key to the appropriate format.
-     *
-     * @param \phpseclib3\Math\BigInteger $n
-     * @param \phpseclib3\Math\BigInteger $e
-     * @param \phpseclib3\Math\BigInteger $d
-     * @param array $primes
-     * @param array $exponents
-     * @param array $coefficients
-     * @param string $password optional
-     * @param array $options optional
-     * @return string
-     */
-    public static function savePrivateKey(BigInteger $n, BigInteger $e, BigInteger $d, array $primes, array $exponents, array $coefficients, $password = '', array $options = [])
-    {
-        $num_primes = count($primes);
-        $key = [
-            'version' => $num_primes == 2 ? 'two-prime' : 'multi',
-            'modulus' => $n,
-            'publicExponent' => $e,
-            'privateExponent' => $d,
-            'prime1' => $primes[1],
-            'prime2' => $primes[2],
-            'exponent1' => $exponents[1],
-            'exponent2' => $exponents[2],
-            'coefficient' => $coefficients[2]
-        ];
-        for ($i = 3; $i <= $num_primes; $i++) {
-            $key['otherPrimeInfos'][] = [
-                'prime' => $primes[$i],
-                'exponent' => $exponents[$i],
-                'coefficient' => $coefficients[$i]
-            ];
-        }
-
-        $key = ASN1::encodeDER($key, Maps\RSAPrivateKey::MAP);
-
-        return self::wrapPrivateKey($key, 'RSA', $password, $options);
-    }
-
-    /**
-     * Convert a public key to the appropriate format
-     *
-     * @param \phpseclib3\Math\BigInteger $n
-     * @param \phpseclib3\Math\BigInteger $e
-     * @return string
-     */
-    public static function savePublicKey(BigInteger $n, BigInteger $e)
-    {
-        $key = [
-            'modulus' => $n,
-            'publicExponent' => $e
-        ];
-
-        $key = ASN1::encodeDER($key, Maps\RSAPublicKey::MAP);
-
-        return self::wrapPublicKey($key, 'RSA');
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/RSA/Formats/Keys/PKCS8.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/RSA/Formats/Keys/PKCS8.php
deleted file mode 100644
index 1eaac6ef..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/RSA/Formats/Keys/PKCS8.php
+++ /dev/null
@@ -1,122 +0,0 @@
-<?php
-
-/**
- * PKCS#8 Formatted RSA Key Handler
- *
- * PHP version 5
- *
- * Used by PHP's openssl_public_encrypt() and openssl's rsautl (when -pubin is set)
- *
- * Processes keys with the following headers:
- *
- * -----BEGIN ENCRYPTED PRIVATE KEY-----
- * -----BEGIN PRIVATE KEY-----
- * -----BEGIN PUBLIC KEY-----
- *
- * Analogous to ssh-keygen's pkcs8 format (as specified by -m). Although PKCS8
- * is specific to private keys it's basically creating a DER-encoded wrapper
- * for keys. This just extends that same concept to public keys (much like ssh-keygen)
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2015 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\Crypt\RSA\Formats\Keys;
-
-use phpseclib3\Crypt\Common\Formats\Keys\PKCS8 as Progenitor;
-use phpseclib3\File\ASN1;
-use phpseclib3\Math\BigInteger;
-
-/**
- * PKCS#8 Formatted RSA Key Handler
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class PKCS8 extends Progenitor
-{
-    /**
-     * OID Name
-     *
-     * @var string
-     */
-    const OID_NAME = 'rsaEncryption';
-
-    /**
-     * OID Value
-     *
-     * @var string
-     */
-    const OID_VALUE = '1.2.840.113549.1.1.1';
-
-    /**
-     * Child OIDs loaded
-     *
-     * @var bool
-     */
-    protected static $childOIDsLoaded = false;
-
-    /**
-     * Break a public or private key down into its constituent components
-     *
-     * @param string $key
-     * @param string $password optional
-     * @return array
-     */
-    public static function load($key, $password = '')
-    {
-        $key = parent::load($key, $password);
-
-        if (isset($key['privateKey'])) {
-            $components['isPublicKey'] = false;
-            $type = 'private';
-        } else {
-            $components['isPublicKey'] = true;
-            $type = 'public';
-        }
-
-        $result = $components + PKCS1::load($key[$type . 'Key']);
-
-        if (isset($key['meta'])) {
-            $result['meta'] = $key['meta'];
-        }
-
-        return $result;
-    }
-
-    /**
-     * Convert a private key to the appropriate format.
-     *
-     * @param \phpseclib3\Math\BigInteger $n
-     * @param \phpseclib3\Math\BigInteger $e
-     * @param \phpseclib3\Math\BigInteger $d
-     * @param array $primes
-     * @param array $exponents
-     * @param array $coefficients
-     * @param string $password optional
-     * @param array $options optional
-     * @return string
-     */
-    public static function savePrivateKey(BigInteger $n, BigInteger $e, BigInteger $d, array $primes, array $exponents, array $coefficients, $password = '', array $options = [])
-    {
-        $key = PKCS1::savePrivateKey($n, $e, $d, $primes, $exponents, $coefficients);
-        $key = ASN1::extractBER($key);
-        return self::wrapPrivateKey($key, [], null, $password, null, '', $options);
-    }
-
-    /**
-     * Convert a public key to the appropriate format
-     *
-     * @param \phpseclib3\Math\BigInteger $n
-     * @param \phpseclib3\Math\BigInteger $e
-     * @param array $options optional
-     * @return string
-     */
-    public static function savePublicKey(BigInteger $n, BigInteger $e, array $options = [])
-    {
-        $key = PKCS1::savePublicKey($n, $e);
-        $key = ASN1::extractBER($key);
-        return self::wrapPublicKey($key, null);
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/RSA/Formats/Keys/PSS.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/RSA/Formats/Keys/PSS.php
deleted file mode 100644
index ed75b9b7..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/RSA/Formats/Keys/PSS.php
+++ /dev/null
@@ -1,238 +0,0 @@
-<?php
-
-/**
- * PKCS#8 Formatted RSA-PSS Key Handler
- *
- * PHP version 5
- *
- * Used by PHP's openssl_public_encrypt() and openssl's rsautl (when -pubin is set)
- *
- * Processes keys with the following headers:
- *
- * -----BEGIN ENCRYPTED PRIVATE KEY-----
- * -----BEGIN PRIVATE KEY-----
- * -----BEGIN PUBLIC KEY-----
- *
- * Analogous to "openssl genpkey -algorithm rsa-pss".
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2015 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\Crypt\RSA\Formats\Keys;
-
-use phpseclib3\Common\Functions\Strings;
-use phpseclib3\Crypt\Common\Formats\Keys\PKCS8 as Progenitor;
-use phpseclib3\File\ASN1;
-use phpseclib3\File\ASN1\Maps;
-use phpseclib3\Math\BigInteger;
-
-/**
- * PKCS#8 Formatted RSA-PSS Key Handler
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class PSS extends Progenitor
-{
-    /**
-     * OID Name
-     *
-     * @var string
-     */
-    const OID_NAME = 'id-RSASSA-PSS';
-
-    /**
-     * OID Value
-     *
-     * @var string
-     */
-    const OID_VALUE = '1.2.840.113549.1.1.10';
-
-    /**
-     * OIDs loaded
-     *
-     * @var bool
-     */
-    private static $oidsLoaded = false;
-
-    /**
-     * Child OIDs loaded
-     *
-     * @var bool
-     */
-    protected static $childOIDsLoaded = false;
-
-    /**
-     * Initialize static variables
-     */
-    private static function initialize_static_variables()
-    {
-        if (!self::$oidsLoaded) {
-            ASN1::loadOIDs([
-                'md2' => '1.2.840.113549.2.2',
-                'md4' => '1.2.840.113549.2.4',
-                'md5' => '1.2.840.113549.2.5',
-                'id-sha1' => '1.3.14.3.2.26',
-                'id-sha256' => '2.16.840.1.101.3.4.2.1',
-                'id-sha384' => '2.16.840.1.101.3.4.2.2',
-                'id-sha512' => '2.16.840.1.101.3.4.2.3',
-                'id-sha224' => '2.16.840.1.101.3.4.2.4',
-                'id-sha512/224' => '2.16.840.1.101.3.4.2.5',
-                'id-sha512/256' => '2.16.840.1.101.3.4.2.6',
-
-                'id-mgf1' => '1.2.840.113549.1.1.8'
-            ]);
-            self::$oidsLoaded = true;
-        }
-    }
-
-    /**
-     * Break a public or private key down into its constituent components
-     *
-     * @param string $key
-     * @param string $password optional
-     * @return array
-     */
-    public static function load($key, $password = '')
-    {
-        self::initialize_static_variables();
-
-        if (!Strings::is_stringable($key)) {
-            throw new \UnexpectedValueException('Key should be a string - not a ' . gettype($key));
-        }
-
-        $components = ['isPublicKey' => strpos($key, 'PUBLIC') !== false];
-
-        $key = parent::load($key, $password);
-
-        $type = isset($key['privateKey']) ? 'private' : 'public';
-
-        $result = $components + PKCS1::load($key[$type . 'Key']);
-
-        if (isset($key[$type . 'KeyAlgorithm']['parameters'])) {
-            $decoded = ASN1::decodeBER($key[$type . 'KeyAlgorithm']['parameters']);
-            if ($decoded === false) {
-                throw new \UnexpectedValueException('Unable to decode parameters');
-            }
-            $params = ASN1::asn1map($decoded[0], Maps\RSASSA_PSS_params::MAP);
-        } else {
-            $params = [];
-        }
-
-        if (isset($params['maskGenAlgorithm']['parameters'])) {
-            $decoded = ASN1::decodeBER($params['maskGenAlgorithm']['parameters']);
-            if ($decoded === false) {
-                throw new \UnexpectedValueException('Unable to decode parameters');
-            }
-            $params['maskGenAlgorithm']['parameters'] = ASN1::asn1map($decoded[0], Maps\HashAlgorithm::MAP);
-        } else {
-            $params['maskGenAlgorithm'] = [
-                'algorithm' => 'id-mgf1',
-                'parameters' => ['algorithm' => 'id-sha1']
-            ];
-        }
-
-        if (!isset($params['hashAlgorithm']['algorithm'])) {
-            $params['hashAlgorithm']['algorithm'] = 'id-sha1';
-        }
-
-        $result['hash'] = str_replace('id-', '', $params['hashAlgorithm']['algorithm']);
-        $result['MGFHash'] = str_replace('id-', '', $params['maskGenAlgorithm']['parameters']['algorithm']);
-        if (isset($params['saltLength'])) {
-            $result['saltLength'] = (int) $params['saltLength']->toString();
-        }
-
-        if (isset($key['meta'])) {
-            $result['meta'] = $key['meta'];
-        }
-
-        return $result;
-    }
-
-    /**
-     * Convert a private key to the appropriate format.
-     *
-     * @param \phpseclib3\Math\BigInteger $n
-     * @param \phpseclib3\Math\BigInteger $e
-     * @param \phpseclib3\Math\BigInteger $d
-     * @param array $primes
-     * @param array $exponents
-     * @param array $coefficients
-     * @param string $password optional
-     * @param array $options optional
-     * @return string
-     */
-    public static function savePrivateKey(BigInteger $n, BigInteger $e, BigInteger $d, array $primes, array $exponents, array $coefficients, $password = '', array $options = [])
-    {
-        self::initialize_static_variables();
-
-        $key = PKCS1::savePrivateKey($n, $e, $d, $primes, $exponents, $coefficients);
-        $key = ASN1::extractBER($key);
-        $params = self::savePSSParams($options);
-        return self::wrapPrivateKey($key, [], $params, $password, null, '', $options);
-    }
-
-    /**
-     * Convert a public key to the appropriate format
-     *
-     * @param \phpseclib3\Math\BigInteger $n
-     * @param \phpseclib3\Math\BigInteger $e
-     * @param array $options optional
-     * @return string
-     */
-    public static function savePublicKey(BigInteger $n, BigInteger $e, array $options = [])
-    {
-        self::initialize_static_variables();
-
-        $key = PKCS1::savePublicKey($n, $e);
-        $key = ASN1::extractBER($key);
-        $params = self::savePSSParams($options);
-        return self::wrapPublicKey($key, $params);
-    }
-
-    /**
-     * Encodes PSS parameters
-     *
-     * @param array $options
-     * @return string
-     */
-    public static function savePSSParams(array $options)
-    {
-        /*
-         The trailerField field is an integer.  It provides
-         compatibility with IEEE Std 1363a-2004 [P1363A].  The value
-         MUST be 1, which represents the trailer field with hexadecimal
-         value 0xBC.  Other trailer fields, including the trailer field
-         composed of HashID concatenated with 0xCC that is specified in
-         IEEE Std 1363a, are not supported.  Implementations that
-         perform signature generation MUST omit the trailerField field,
-         indicating that the default trailer field value was used.
-         Implementations that perform signature validation MUST
-         recognize both a present trailerField field with value 1 and an
-         absent trailerField field.
-
-         source: https://tools.ietf.org/html/rfc4055#page-9
-        */
-        $params = [
-            'trailerField' => new BigInteger(1)
-        ];
-        if (isset($options['hash'])) {
-            $params['hashAlgorithm']['algorithm'] = 'id-' . $options['hash'];
-        }
-        if (isset($options['MGFHash'])) {
-            $temp = ['algorithm' => 'id-' . $options['MGFHash']];
-            $temp = ASN1::encodeDER($temp, Maps\HashAlgorithm::MAP);
-            $params['maskGenAlgorithm'] = [
-                'algorithm' => 'id-mgf1',
-                'parameters' => new ASN1\Element($temp)
-            ];
-        }
-        if (isset($options['saltLength'])) {
-            $params['saltLength'] = new BigInteger($options['saltLength']);
-        }
-
-        return new ASN1\Element(ASN1::encodeDER($params, Maps\RSASSA_PSS_params::MAP));
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/RSA/Formats/Keys/PuTTY.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/RSA/Formats/Keys/PuTTY.php
deleted file mode 100644
index fe35717b..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/RSA/Formats/Keys/PuTTY.php
+++ /dev/null
@@ -1,121 +0,0 @@
-<?php
-
-/**
- * PuTTY Formatted RSA Key Handler
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2015 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\Crypt\RSA\Formats\Keys;
-
-use phpseclib3\Common\Functions\Strings;
-use phpseclib3\Crypt\Common\Formats\Keys\PuTTY as Progenitor;
-use phpseclib3\Math\BigInteger;
-
-/**
- * PuTTY Formatted RSA Key Handler
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class PuTTY extends Progenitor
-{
-    /**
-     * Public Handler
-     *
-     * @var string
-     */
-    const PUBLIC_HANDLER = 'phpseclib3\Crypt\RSA\Formats\Keys\OpenSSH';
-
-    /**
-     * Algorithm Identifier
-     *
-     * @var array
-     */
-    protected static $types = ['ssh-rsa'];
-
-    /**
-     * Break a public or private key down into its constituent components
-     *
-     * @param string $key
-     * @param string $password optional
-     * @return array
-     */
-    public static function load($key, $password = '')
-    {
-        static $one;
-        if (!isset($one)) {
-            $one = new BigInteger(1);
-        }
-
-        $components = parent::load($key, $password);
-        if (!isset($components['private'])) {
-            return $components;
-        }
-        extract($components);
-        unset($components['public'], $components['private']);
-
-        $isPublicKey = false;
-
-        $result = Strings::unpackSSH2('ii', $public);
-        if ($result === false) {
-            throw new \UnexpectedValueException('Key appears to be malformed');
-        }
-        list($publicExponent, $modulus) = $result;
-
-        $result = Strings::unpackSSH2('iiii', $private);
-        if ($result === false) {
-            throw new \UnexpectedValueException('Key appears to be malformed');
-        }
-        $primes = $coefficients = [];
-        list($privateExponent, $primes[1], $primes[2], $coefficients[2]) = $result;
-
-        $temp = $primes[1]->subtract($one);
-        $exponents = [1 => $publicExponent->modInverse($temp)];
-        $temp = $primes[2]->subtract($one);
-        $exponents[] = $publicExponent->modInverse($temp);
-
-        return compact('publicExponent', 'modulus', 'privateExponent', 'primes', 'coefficients', 'exponents', 'comment', 'isPublicKey');
-    }
-
-    /**
-     * Convert a private key to the appropriate format.
-     *
-     * @param \phpseclib3\Math\BigInteger $n
-     * @param \phpseclib3\Math\BigInteger $e
-     * @param \phpseclib3\Math\BigInteger $d
-     * @param array $primes
-     * @param array $exponents
-     * @param array $coefficients
-     * @param string $password optional
-     * @param array $options optional
-     * @return string
-     */
-    public static function savePrivateKey(BigInteger $n, BigInteger $e, BigInteger $d, array $primes, array $exponents, array $coefficients, $password = '', array $options = [])
-    {
-        if (count($primes) != 2) {
-            throw new \InvalidArgumentException('PuTTY does not support multi-prime RSA keys');
-        }
-
-        $public =  Strings::packSSH2('ii', $e, $n);
-        $private = Strings::packSSH2('iiii', $d, $primes[1], $primes[2], $coefficients[2]);
-
-        return self::wrapPrivateKey($public, $private, 'ssh-rsa', $password, $options);
-    }
-
-    /**
-     * Convert a public key to the appropriate format
-     *
-     * @param \phpseclib3\Math\BigInteger $n
-     * @param \phpseclib3\Math\BigInteger $e
-     * @return string
-     */
-    public static function savePublicKey(BigInteger $n, BigInteger $e)
-    {
-        return self::wrapPublicKey(Strings::packSSH2('ii', $e, $n), 'ssh-rsa');
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/RSA/Formats/Keys/Raw.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/RSA/Formats/Keys/Raw.php
deleted file mode 100644
index db728784..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/RSA/Formats/Keys/Raw.php
+++ /dev/null
@@ -1,184 +0,0 @@
-<?php
-
-/**
- * Raw RSA Key Handler
- *
- * PHP version 5
- *
- * An array containing two \phpseclib3\Math\BigInteger objects.
- *
- * The exponent can be indexed with any of the following:
- *
- * 0, e, exponent, publicExponent
- *
- * The modulus can be indexed with any of the following:
- *
- * 1, n, modulo, modulus
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2015 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\Crypt\RSA\Formats\Keys;
-
-use phpseclib3\Math\BigInteger;
-
-/**
- * Raw RSA Key Handler
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class Raw
-{
-    /**
-     * Break a public or private key down into its constituent components
-     *
-     * @param string $key
-     * @param string $password optional
-     * @return array
-     */
-    public static function load($key, $password = '')
-    {
-        if (!is_array($key)) {
-            throw new \UnexpectedValueException('Key should be a array - not a ' . gettype($key));
-        }
-
-        $key = array_change_key_case($key, CASE_LOWER);
-
-        $components = ['isPublicKey' => false];
-
-        foreach (['e', 'exponent', 'publicexponent', 0, 'privateexponent', 'd'] as $index) {
-            if (isset($key[$index])) {
-                $components['publicExponent'] = $key[$index];
-                break;
-            }
-        }
-
-        foreach (['n', 'modulo', 'modulus', 1] as $index) {
-            if (isset($key[$index])) {
-                $components['modulus'] = $key[$index];
-                break;
-            }
-        }
-
-        if (!isset($components['publicExponent']) || !isset($components['modulus'])) {
-            throw new \UnexpectedValueException('Modulus / exponent not present');
-        }
-
-        if (isset($key['primes'])) {
-            $components['primes'] = $key['primes'];
-        } elseif (isset($key['p']) && isset($key['q'])) {
-            $indices = [
-                ['p', 'q'],
-                ['prime1', 'prime2']
-            ];
-            foreach ($indices as $index) {
-                list($i0, $i1) = $index;
-                if (isset($key[$i0]) && isset($key[$i1])) {
-                    $components['primes'] = [1 => $key[$i0], $key[$i1]];
-                }
-            }
-        }
-
-        if (isset($key['exponents'])) {
-            $components['exponents'] = $key['exponents'];
-        } else {
-            $indices = [
-                ['dp', 'dq'],
-                ['exponent1', 'exponent2']
-            ];
-            foreach ($indices as $index) {
-                list($i0, $i1) = $index;
-                if (isset($key[$i0]) && isset($key[$i1])) {
-                    $components['exponents'] = [1 => $key[$i0], $key[$i1]];
-                }
-            }
-        }
-
-        if (isset($key['coefficients'])) {
-            $components['coefficients'] = $key['coefficients'];
-        } else {
-            foreach (['inverseq', 'q\'', 'coefficient'] as $index) {
-                if (isset($key[$index])) {
-                    $components['coefficients'] = [2 => $key[$index]];
-                }
-            }
-        }
-
-        if (!isset($components['primes'])) {
-            $components['isPublicKey'] = true;
-            return $components;
-        }
-
-        if (!isset($components['exponents'])) {
-            $one = new BigInteger(1);
-            $temp = $components['primes'][1]->subtract($one);
-            $exponents = [1 => $components['publicExponent']->modInverse($temp)];
-            $temp = $components['primes'][2]->subtract($one);
-            $exponents[] = $components['publicExponent']->modInverse($temp);
-            $components['exponents'] = $exponents;
-        }
-
-        if (!isset($components['coefficients'])) {
-            $components['coefficients'] = [2 => $components['primes'][2]->modInverse($components['primes'][1])];
-        }
-
-        foreach (['privateexponent', 'd'] as $index) {
-            if (isset($key[$index])) {
-                $components['privateExponent'] = $key[$index];
-                break;
-            }
-        }
-
-        return $components;
-    }
-
-    /**
-     * Convert a private key to the appropriate format.
-     *
-     * @param \phpseclib3\Math\BigInteger $n
-     * @param \phpseclib3\Math\BigInteger $e
-     * @param \phpseclib3\Math\BigInteger $d
-     * @param array $primes
-     * @param array $exponents
-     * @param array $coefficients
-     * @param string $password optional
-     * @param array $options optional
-     * @return array
-     */
-    public static function savePrivateKey(BigInteger $n, BigInteger $e, BigInteger $d, array $primes, array $exponents, array $coefficients, $password = '', array $options = [])
-    {
-        if (!empty($password) && is_string($password)) {
-            throw new UnsupportedFormatException('Raw private keys do not support encryption');
-        }
-
-        return [
-            'e' => clone $e,
-            'n' => clone $n,
-            'd' => clone $d,
-            'primes' => array_map(function ($var) {
-                return clone $var;
-            }, $primes),
-            'exponents' => array_map(function ($var) {
-                return clone $var;
-            }, $exponents),
-            'coefficients' => array_map(function ($var) {
-                return clone $var;
-            }, $coefficients)
-        ];
-    }
-
-    /**
-     * Convert a public key to the appropriate format
-     *
-     * @param \phpseclib3\Math\BigInteger $n
-     * @param \phpseclib3\Math\BigInteger $e
-     * @return array
-     */
-    public static function savePublicKey(BigInteger $n, BigInteger $e)
-    {
-        return ['e' => clone $e, 'n' => clone $n];
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/RSA/Formats/Keys/XML.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/RSA/Formats/Keys/XML.php
deleted file mode 100644
index 280048cc..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/RSA/Formats/Keys/XML.php
+++ /dev/null
@@ -1,171 +0,0 @@
-<?php
-
-/**
- * XML Formatted RSA Key Handler
- *
- * More info:
- *
- * http://www.w3.org/TR/xmldsig-core/#sec-RSAKeyValue
- * http://www.w3.org/TR/xkms2/#XKMS_2_0_Paragraph_269
- * http://en.wikipedia.org/wiki/XML_Signature
- * http://en.wikipedia.org/wiki/XKMS
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2015 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\Crypt\RSA\Formats\Keys;
-
-use phpseclib3\Common\Functions\Strings;
-use phpseclib3\Exception\BadConfigurationException;
-use phpseclib3\Exception\UnsupportedFormatException;
-use phpseclib3\Math\BigInteger;
-
-/**
- * XML Formatted RSA Key Handler
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class XML
-{
-    /**
-     * Break a public or private key down into its constituent components
-     *
-     * @param string $key
-     * @param string $password optional
-     * @return array
-     */
-    public static function load($key, $password = '')
-    {
-        if (!Strings::is_stringable($key)) {
-            throw new \UnexpectedValueException('Key should be a string - not a ' . gettype($key));
-        }
-
-        if (!class_exists('DOMDocument')) {
-            throw new BadConfigurationException('The dom extension is not setup correctly on this system');
-        }
-
-        $components = [
-            'isPublicKey' => false,
-            'primes' => [],
-            'exponents' => [],
-            'coefficients' => []
-        ];
-
-        $use_errors = libxml_use_internal_errors(true);
-
-        $dom = new \DOMDocument();
-        if (substr($key, 0, 5) != '<?xml') {
-            $key = '<xml>' . $key . '</xml>';
-        }
-        if (!$dom->loadXML($key)) {
-            libxml_use_internal_errors($use_errors);
-            throw new \UnexpectedValueException('Key does not appear to contain XML');
-        }
-        $xpath = new \DOMXPath($dom);
-        $keys = ['modulus', 'exponent', 'p', 'q', 'dp', 'dq', 'inverseq', 'd'];
-        foreach ($keys as $key) {
-            // $dom->getElementsByTagName($key) is case-sensitive
-            $temp = $xpath->query("//*[translate(local-name(), 'ABCDEFGHIJKLMNOPQRSTUVWXYZ','abcdefghijklmnopqrstuvwxyz')='$key']");
-            if (!$temp->length) {
-                continue;
-            }
-            $value = new BigInteger(Strings::base64_decode($temp->item(0)->nodeValue), 256);
-            switch ($key) {
-                case 'modulus':
-                    $components['modulus'] = $value;
-                    break;
-                case 'exponent':
-                    $components['publicExponent'] = $value;
-                    break;
-                case 'p':
-                    $components['primes'][1] = $value;
-                    break;
-                case 'q':
-                    $components['primes'][2] = $value;
-                    break;
-                case 'dp':
-                    $components['exponents'][1] = $value;
-                    break;
-                case 'dq':
-                    $components['exponents'][2] = $value;
-                    break;
-                case 'inverseq':
-                    $components['coefficients'][2] = $value;
-                    break;
-                case 'd':
-                    $components['privateExponent'] = $value;
-            }
-        }
-
-        libxml_use_internal_errors($use_errors);
-
-        foreach ($components as $key => $value) {
-            if (is_array($value) && !count($value)) {
-                unset($components[$key]);
-            }
-        }
-
-        if (isset($components['modulus']) && isset($components['publicExponent'])) {
-            if (count($components) == 3) {
-                $components['isPublicKey'] = true;
-            }
-            return $components;
-        }
-
-        throw new \UnexpectedValueException('Modulus / exponent not present');
-    }
-
-    /**
-     * Convert a private key to the appropriate format.
-     *
-     * @param \phpseclib3\Math\BigInteger $n
-     * @param \phpseclib3\Math\BigInteger $e
-     * @param \phpseclib3\Math\BigInteger $d
-     * @param array $primes
-     * @param array $exponents
-     * @param array $coefficients
-     * @param string $password optional
-     * @return string
-     */
-    public static function savePrivateKey(BigInteger $n, BigInteger $e, BigInteger $d, array $primes, array $exponents, array $coefficients, $password = '')
-    {
-        if (count($primes) != 2) {
-            throw new \InvalidArgumentException('XML does not support multi-prime RSA keys');
-        }
-
-        if (!empty($password) && is_string($password)) {
-            throw new UnsupportedFormatException('XML private keys do not support encryption');
-        }
-
-        return "<RSAKeyPair>\r\n" .
-               '  <Modulus>' . Strings::base64_encode($n->toBytes()) . "</Modulus>\r\n" .
-               '  <Exponent>' . Strings::base64_encode($e->toBytes()) . "</Exponent>\r\n" .
-               '  <P>' . Strings::base64_encode($primes[1]->toBytes()) . "</P>\r\n" .
-               '  <Q>' . Strings::base64_encode($primes[2]->toBytes()) . "</Q>\r\n" .
-               '  <DP>' . Strings::base64_encode($exponents[1]->toBytes()) . "</DP>\r\n" .
-               '  <DQ>' . Strings::base64_encode($exponents[2]->toBytes()) . "</DQ>\r\n" .
-               '  <InverseQ>' . Strings::base64_encode($coefficients[2]->toBytes()) . "</InverseQ>\r\n" .
-               '  <D>' . Strings::base64_encode($d->toBytes()) . "</D>\r\n" .
-               '</RSAKeyPair>';
-    }
-
-    /**
-     * Convert a public key to the appropriate format
-     *
-     * @param \phpseclib3\Math\BigInteger $n
-     * @param \phpseclib3\Math\BigInteger $e
-     * @return string
-     */
-    public static function savePublicKey(BigInteger $n, BigInteger $e)
-    {
-        return "<RSAKeyValue>\r\n" .
-               '  <Modulus>' . Strings::base64_encode($n->toBytes()) . "</Modulus>\r\n" .
-               '  <Exponent>' . Strings::base64_encode($e->toBytes()) . "</Exponent>\r\n" .
-               '</RSAKeyValue>';
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/RSA/PrivateKey.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/RSA/PrivateKey.php
deleted file mode 100644
index 37dd09a4..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/RSA/PrivateKey.php
+++ /dev/null
@@ -1,530 +0,0 @@
-<?php
-
-/**
- * RSA Private Key
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2015 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\Crypt\RSA;
-
-use phpseclib3\Crypt\Common;
-use phpseclib3\Crypt\Random;
-use phpseclib3\Crypt\RSA;
-use phpseclib3\Crypt\RSA\Formats\Keys\PSS;
-use phpseclib3\Exception\UnsupportedFormatException;
-use phpseclib3\Math\BigInteger;
-
-/**
- * Raw RSA Key Handler
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-final class PrivateKey extends RSA implements Common\PrivateKey
-{
-    use Common\Traits\PasswordProtected;
-
-    /**
-     * Primes for Chinese Remainder Theorem (ie. p and q)
-     *
-     * @var array
-     */
-    protected $primes;
-
-    /**
-     * Exponents for Chinese Remainder Theorem (ie. dP and dQ)
-     *
-     * @var array
-     */
-    protected $exponents;
-
-    /**
-     * Coefficients for Chinese Remainder Theorem (ie. qInv)
-     *
-     * @var array
-     */
-    protected $coefficients;
-
-    /**
-     * Private Exponent
-     *
-     * @var \phpseclib3\Math\BigInteger
-     */
-    protected $privateExponent;
-
-    /**
-     * RSADP
-     *
-     * See {@link http://tools.ietf.org/html/rfc3447#section-5.1.2 RFC3447#section-5.1.2}.
-     *
-     * @return bool|\phpseclib3\Math\BigInteger
-     */
-    private function rsadp(BigInteger $c)
-    {
-        if ($c->compare(self::$zero) < 0 || $c->compare($this->modulus) > 0) {
-            throw new \OutOfRangeException('Ciphertext representative out of range');
-        }
-        return $this->exponentiate($c);
-    }
-
-    /**
-     * RSASP1
-     *
-     * See {@link http://tools.ietf.org/html/rfc3447#section-5.2.1 RFC3447#section-5.2.1}.
-     *
-     * @return bool|\phpseclib3\Math\BigInteger
-     */
-    private function rsasp1(BigInteger $m)
-    {
-        if ($m->compare(self::$zero) < 0 || $m->compare($this->modulus) > 0) {
-            throw new \OutOfRangeException('Signature representative out of range');
-        }
-        return $this->exponentiate($m);
-    }
-
-    /**
-     * Exponentiate
-     *
-     * @param \phpseclib3\Math\BigInteger $x
-     * @return \phpseclib3\Math\BigInteger
-     */
-    protected function exponentiate(BigInteger $x)
-    {
-        switch (true) {
-            case empty($this->primes):
-            case $this->primes[1]->equals(self::$zero):
-            case empty($this->coefficients):
-            case $this->coefficients[2]->equals(self::$zero):
-            case empty($this->exponents):
-            case $this->exponents[1]->equals(self::$zero):
-                return $x->modPow($this->exponent, $this->modulus);
-        }
-
-        $num_primes = count($this->primes);
-
-        if (!static::$enableBlinding) {
-            $m_i = [
-                1 => $x->modPow($this->exponents[1], $this->primes[1]),
-                2 => $x->modPow($this->exponents[2], $this->primes[2])
-            ];
-            $h = $m_i[1]->subtract($m_i[2]);
-            $h = $h->multiply($this->coefficients[2]);
-            list(, $h) = $h->divide($this->primes[1]);
-            $m = $m_i[2]->add($h->multiply($this->primes[2]));
-
-            $r = $this->primes[1];
-            for ($i = 3; $i <= $num_primes; $i++) {
-                $m_i = $x->modPow($this->exponents[$i], $this->primes[$i]);
-
-                $r = $r->multiply($this->primes[$i - 1]);
-
-                $h = $m_i->subtract($m);
-                $h = $h->multiply($this->coefficients[$i]);
-                list(, $h) = $h->divide($this->primes[$i]);
-
-                $m = $m->add($r->multiply($h));
-            }
-        } else {
-            $smallest = $this->primes[1];
-            for ($i = 2; $i <= $num_primes; $i++) {
-                if ($smallest->compare($this->primes[$i]) > 0) {
-                    $smallest = $this->primes[$i];
-                }
-            }
-
-            $r = BigInteger::randomRange(self::$one, $smallest->subtract(self::$one));
-
-            $m_i = [
-                1 => $this->blind($x, $r, 1),
-                2 => $this->blind($x, $r, 2)
-            ];
-            $h = $m_i[1]->subtract($m_i[2]);
-            $h = $h->multiply($this->coefficients[2]);
-            list(, $h) = $h->divide($this->primes[1]);
-            $m = $m_i[2]->add($h->multiply($this->primes[2]));
-
-            $r = $this->primes[1];
-            for ($i = 3; $i <= $num_primes; $i++) {
-                $m_i = $this->blind($x, $r, $i);
-
-                $r = $r->multiply($this->primes[$i - 1]);
-
-                $h = $m_i->subtract($m);
-                $h = $h->multiply($this->coefficients[$i]);
-                list(, $h) = $h->divide($this->primes[$i]);
-
-                $m = $m->add($r->multiply($h));
-            }
-        }
-
-        return $m;
-    }
-
-    /**
-     * Performs RSA Blinding
-     *
-     * Protects against timing attacks by employing RSA Blinding.
-     * Returns $x->modPow($this->exponents[$i], $this->primes[$i])
-     *
-     * @param \phpseclib3\Math\BigInteger $x
-     * @param \phpseclib3\Math\BigInteger $r
-     * @param int $i
-     * @return \phpseclib3\Math\BigInteger
-     */
-    private function blind(BigInteger $x, BigInteger $r, $i)
-    {
-        $x = $x->multiply($r->modPow($this->publicExponent, $this->primes[$i]));
-        $x = $x->modPow($this->exponents[$i], $this->primes[$i]);
-
-        $r = $r->modInverse($this->primes[$i]);
-        $x = $x->multiply($r);
-        list(, $x) = $x->divide($this->primes[$i]);
-
-        return $x;
-    }
-
-    /**
-     * EMSA-PSS-ENCODE
-     *
-     * See {@link http://tools.ietf.org/html/rfc3447#section-9.1.1 RFC3447#section-9.1.1}.
-     *
-     * @return string
-     * @param string $m
-     * @throws \RuntimeException on encoding error
-     * @param int $emBits
-     */
-    private function emsa_pss_encode($m, $emBits)
-    {
-        // if $m is larger than two million terrabytes and you're using sha1, PKCS#1 suggests a "Label too long" error
-        // be output.
-
-        $emLen = ($emBits + 1) >> 3; // ie. ceil($emBits / 8)
-        $sLen = $this->sLen !== null ? $this->sLen : $this->hLen;
-
-        $mHash = $this->hash->hash($m);
-        if ($emLen < $this->hLen + $sLen + 2) {
-            throw new \LengthException('RSA modulus too short');
-        }
-
-        $salt = Random::string($sLen);
-        $m2 = "\0\0\0\0\0\0\0\0" . $mHash . $salt;
-        $h = $this->hash->hash($m2);
-        $ps = str_repeat(chr(0), $emLen - $sLen - $this->hLen - 2);
-        $db = $ps . chr(1) . $salt;
-        $dbMask = $this->mgf1($h, $emLen - $this->hLen - 1); // ie. stlren($db)
-        $maskedDB = $db ^ $dbMask;
-        $maskedDB[0] = ~chr(0xFF << ($emBits & 7)) & $maskedDB[0];
-        $em = $maskedDB . $h . chr(0xBC);
-
-        return $em;
-    }
-
-    /**
-     * RSASSA-PSS-SIGN
-     *
-     * See {@link http://tools.ietf.org/html/rfc3447#section-8.1.1 RFC3447#section-8.1.1}.
-     *
-     * @param string $m
-     * @return bool|string
-     */
-    private function rsassa_pss_sign($m)
-    {
-        // EMSA-PSS encoding
-
-        $em = $this->emsa_pss_encode($m, 8 * $this->k - 1);
-
-        // RSA signature
-
-        $m = $this->os2ip($em);
-        $s = $this->rsasp1($m);
-        $s = $this->i2osp($s, $this->k);
-
-        // Output the signature S
-
-        return $s;
-    }
-
-    /**
-     * RSASSA-PKCS1-V1_5-SIGN
-     *
-     * See {@link http://tools.ietf.org/html/rfc3447#section-8.2.1 RFC3447#section-8.2.1}.
-     *
-     * @param string $m
-     * @throws \LengthException if the RSA modulus is too short
-     * @return bool|string
-     */
-    private function rsassa_pkcs1_v1_5_sign($m)
-    {
-        // EMSA-PKCS1-v1_5 encoding
-
-        // If the encoding operation outputs "intended encoded message length too short," output "RSA modulus
-        // too short" and stop.
-        try {
-            $em = $this->emsa_pkcs1_v1_5_encode($m, $this->k);
-        } catch (\LengthException $e) {
-            throw new \LengthException('RSA modulus too short');
-        }
-
-        // RSA signature
-
-        $m = $this->os2ip($em);
-        $s = $this->rsasp1($m);
-        $s = $this->i2osp($s, $this->k);
-
-        // Output the signature S
-
-        return $s;
-    }
-
-    /**
-     * Create a signature
-     *
-     * @see self::verify()
-     * @param string $message
-     * @return string
-     */
-    public function sign($message)
-    {
-        switch ($this->signaturePadding) {
-            case self::SIGNATURE_PKCS1:
-            case self::SIGNATURE_RELAXED_PKCS1:
-                return $this->rsassa_pkcs1_v1_5_sign($message);
-            //case self::SIGNATURE_PSS:
-            default:
-                return $this->rsassa_pss_sign($message);
-        }
-    }
-
-    /**
-     * RSAES-PKCS1-V1_5-DECRYPT
-     *
-     * See {@link http://tools.ietf.org/html/rfc3447#section-7.2.2 RFC3447#section-7.2.2}.
-     *
-     * @param string $c
-     * @return bool|string
-     */
-    private function rsaes_pkcs1_v1_5_decrypt($c)
-    {
-        // Length checking
-
-        if (strlen($c) != $this->k) { // or if k < 11
-            throw new \LengthException('Ciphertext representative too long');
-        }
-
-        // RSA decryption
-
-        $c = $this->os2ip($c);
-        $m = $this->rsadp($c);
-        $em = $this->i2osp($m, $this->k);
-
-        // EME-PKCS1-v1_5 decoding
-
-        if (ord($em[0]) != 0 || ord($em[1]) > 2) {
-            throw new \RuntimeException('Decryption error');
-        }
-
-        $ps = substr($em, 2, strpos($em, chr(0), 2) - 2);
-        $m = substr($em, strlen($ps) + 3);
-
-        if (strlen($ps) < 8) {
-            throw new \RuntimeException('Decryption error');
-        }
-
-        // Output M
-
-        return $m;
-    }
-
-    /**
-     * RSAES-OAEP-DECRYPT
-     *
-     * See {@link http://tools.ietf.org/html/rfc3447#section-7.1.2 RFC3447#section-7.1.2}.  The fact that the error
-     * messages aren't distinguishable from one another hinders debugging, but, to quote from RFC3447#section-7.1.2:
-     *
-     *    Note.  Care must be taken to ensure that an opponent cannot
-     *    distinguish the different error conditions in Step 3.g, whether by
-     *    error message or timing, or, more generally, learn partial
-     *    information about the encoded message EM.  Otherwise an opponent may
-     *    be able to obtain useful information about the decryption of the
-     *    ciphertext C, leading to a chosen-ciphertext attack such as the one
-     *    observed by Manger [36].
-     *
-     * @param string $c
-     * @return bool|string
-     */
-    private function rsaes_oaep_decrypt($c)
-    {
-        // Length checking
-
-        // if $l is larger than two million terrabytes and you're using sha1, PKCS#1 suggests a "Label too long" error
-        // be output.
-
-        if (strlen($c) != $this->k || $this->k < 2 * $this->hLen + 2) {
-            throw new \LengthException('Ciphertext representative too long');
-        }
-
-        // RSA decryption
-
-        $c = $this->os2ip($c);
-        $m = $this->rsadp($c);
-        $em = $this->i2osp($m, $this->k);
-
-        // EME-OAEP decoding
-
-        $lHash = $this->hash->hash($this->label);
-        $y = ord($em[0]);
-        $maskedSeed = substr($em, 1, $this->hLen);
-        $maskedDB = substr($em, $this->hLen + 1);
-        $seedMask = $this->mgf1($maskedDB, $this->hLen);
-        $seed = $maskedSeed ^ $seedMask;
-        $dbMask = $this->mgf1($seed, $this->k - $this->hLen - 1);
-        $db = $maskedDB ^ $dbMask;
-        $lHash2 = substr($db, 0, $this->hLen);
-        $m = substr($db, $this->hLen);
-        $hashesMatch = hash_equals($lHash, $lHash2);
-        $leadingZeros = 1;
-        $patternMatch = 0;
-        $offset = 0;
-        for ($i = 0; $i < strlen($m); $i++) {
-            $patternMatch |= $leadingZeros & ($m[$i] === "\1");
-            $leadingZeros &= $m[$i] === "\0";
-            $offset += $patternMatch ? 0 : 1;
-        }
-
-        // we do | instead of || to avoid https://en.wikipedia.org/wiki/Short-circuit_evaluation
-        // to protect against timing attacks
-        if (!$hashesMatch | !$patternMatch) {
-            throw new \RuntimeException('Decryption error');
-        }
-
-        // Output the message M
-
-        return substr($m, $offset + 1);
-    }
-
-    /**
-     * Raw Encryption / Decryption
-     *
-     * Doesn't use padding and is not recommended.
-     *
-     * @param string $m
-     * @return bool|string
-     * @throws \LengthException if strlen($m) > $this->k
-     */
-    private function raw_encrypt($m)
-    {
-        if (strlen($m) > $this->k) {
-            throw new \LengthException('Ciphertext representative too long');
-        }
-
-        $temp = $this->os2ip($m);
-        $temp = $this->rsadp($temp);
-        return  $this->i2osp($temp, $this->k);
-    }
-
-    /**
-     * Decryption
-     *
-     * @see self::encrypt()
-     * @param string $ciphertext
-     * @return bool|string
-     */
-    public function decrypt($ciphertext)
-    {
-        switch ($this->encryptionPadding) {
-            case self::ENCRYPTION_NONE:
-                return $this->raw_encrypt($ciphertext);
-            case self::ENCRYPTION_PKCS1:
-                return $this->rsaes_pkcs1_v1_5_decrypt($ciphertext);
-            //case self::ENCRYPTION_OAEP:
-            default:
-                return $this->rsaes_oaep_decrypt($ciphertext);
-        }
-    }
-
-    /**
-     * Returns the public key
-     *
-     * @return mixed
-     */
-    public function getPublicKey()
-    {
-        $type = self::validatePlugin('Keys', 'PKCS8', 'savePublicKey');
-        if (empty($this->modulus) || empty($this->publicExponent)) {
-            throw new \RuntimeException('Public key components not found');
-        }
-
-        $key = $type::savePublicKey($this->modulus, $this->publicExponent);
-        return RSA::loadFormat('PKCS8', $key)
-            ->withHash($this->hash->getHash())
-            ->withMGFHash($this->mgfHash->getHash())
-            ->withSaltLength($this->sLen)
-            ->withLabel($this->label)
-            ->withPadding($this->signaturePadding | $this->encryptionPadding);
-    }
-
-    /**
-     * Returns the private key
-     *
-     * @param string $type
-     * @param array $options optional
-     * @return string
-     */
-    public function toString($type, array $options = [])
-    {
-        $type = self::validatePlugin(
-            'Keys',
-            $type,
-            empty($this->primes) ? 'savePublicKey' : 'savePrivateKey'
-        );
-
-        if ($type == PSS::class) {
-            if ($this->signaturePadding == self::SIGNATURE_PSS) {
-                $options += [
-                    'hash' => $this->hash->getHash(),
-                    'MGFHash' => $this->mgfHash->getHash(),
-                    'saltLength' => $this->getSaltLength()
-                ];
-            } else {
-                throw new UnsupportedFormatException('The PSS format can only be used when the signature method has been explicitly set to PSS');
-            }
-        }
-
-        if (empty($this->primes)) {
-            return $type::savePublicKey($this->modulus, $this->exponent, $options);
-        }
-
-        return $type::savePrivateKey($this->modulus, $this->publicExponent, $this->exponent, $this->primes, $this->exponents, $this->coefficients, $this->password, $options);
-
-        /*
-        $key = $type::savePrivateKey($this->modulus, $this->publicExponent, $this->exponent, $this->primes, $this->exponents, $this->coefficients, $this->password, $options);
-        if ($key !== false || count($this->primes) == 2) {
-            return $key;
-        }
-
-        $nSize = $this->getSize() >> 1;
-
-        $primes = [1 => clone self::$one, clone self::$one];
-        $i = 1;
-        foreach ($this->primes as $prime) {
-            $primes[$i] = $primes[$i]->multiply($prime);
-            if ($primes[$i]->getLength() >= $nSize) {
-                $i++;
-            }
-        }
-
-        $exponents = [];
-        $coefficients = [2 => $primes[2]->modInverse($primes[1])];
-
-        foreach ($primes as $i => $prime) {
-            $temp = $prime->subtract(self::$one);
-            $exponents[$i] = $this->modulus->modInverse($temp);
-        }
-
-        return $type::savePrivateKey($this->modulus, $this->publicExponent, $this->exponent, $primes, $exponents, $coefficients, $this->password, $options);
-        */
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/RSA/PublicKey.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/RSA/PublicKey.php
deleted file mode 100644
index 58939a9f..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/RSA/PublicKey.php
+++ /dev/null
@@ -1,513 +0,0 @@
-<?php
-
-/**
- * RSA Public Key
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2015 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\Crypt\RSA;
-
-use phpseclib3\Common\Functions\Strings;
-use phpseclib3\Crypt\Common;
-use phpseclib3\Crypt\Hash;
-use phpseclib3\Crypt\Random;
-use phpseclib3\Crypt\RSA;
-use phpseclib3\Crypt\RSA\Formats\Keys\PSS;
-use phpseclib3\Exception\UnsupportedAlgorithmException;
-use phpseclib3\Exception\UnsupportedFormatException;
-use phpseclib3\File\ASN1;
-use phpseclib3\File\ASN1\Maps\DigestInfo;
-use phpseclib3\Math\BigInteger;
-
-/**
- * Raw RSA Key Handler
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-final class PublicKey extends RSA implements Common\PublicKey
-{
-    use Common\Traits\Fingerprint;
-
-    /**
-     * Exponentiate
-     *
-     * @param \phpseclib3\Math\BigInteger $x
-     * @return \phpseclib3\Math\BigInteger
-     */
-    private function exponentiate(BigInteger $x)
-    {
-        return $x->modPow($this->exponent, $this->modulus);
-    }
-
-    /**
-     * RSAVP1
-     *
-     * See {@link http://tools.ietf.org/html/rfc3447#section-5.2.2 RFC3447#section-5.2.2}.
-     *
-     * @param \phpseclib3\Math\BigInteger $s
-     * @return bool|\phpseclib3\Math\BigInteger
-     */
-    private function rsavp1($s)
-    {
-        if ($s->compare(self::$zero) < 0 || $s->compare($this->modulus) > 0) {
-            return false;
-        }
-        return $this->exponentiate($s);
-    }
-
-    /**
-     * RSASSA-PKCS1-V1_5-VERIFY
-     *
-     * See {@link http://tools.ietf.org/html/rfc3447#section-8.2.2 RFC3447#section-8.2.2}.
-     *
-     * @param string $m
-     * @param string $s
-     * @throws \LengthException if the RSA modulus is too short
-     * @return bool
-     */
-    private function rsassa_pkcs1_v1_5_verify($m, $s)
-    {
-        // Length checking
-
-        if (strlen($s) != $this->k) {
-            return false;
-        }
-
-        // RSA verification
-
-        $s = $this->os2ip($s);
-        $m2 = $this->rsavp1($s);
-        if ($m2 === false) {
-            return false;
-        }
-        $em = $this->i2osp($m2, $this->k);
-        if ($em === false) {
-            return false;
-        }
-
-        // EMSA-PKCS1-v1_5 encoding
-
-        $exception = false;
-
-        // If the encoding operation outputs "intended encoded message length too short," output "RSA modulus
-        // too short" and stop.
-        try {
-            $em2 = $this->emsa_pkcs1_v1_5_encode($m, $this->k);
-            $r1 = hash_equals($em, $em2);
-        } catch (\LengthException $e) {
-            $exception = true;
-        }
-
-        try {
-            $em3 = $this->emsa_pkcs1_v1_5_encode_without_null($m, $this->k);
-            $r2 = hash_equals($em, $em3);
-        } catch (\LengthException $e) {
-            $exception = true;
-        } catch (UnsupportedAlgorithmException $e) {
-            $r2 = false;
-        }
-
-        if ($exception) {
-            throw new \LengthException('RSA modulus too short');
-        }
-
-        // Compare
-        return $r1 || $r2;
-    }
-
-    /**
-     * RSASSA-PKCS1-V1_5-VERIFY (relaxed matching)
-     *
-     * Per {@link http://tools.ietf.org/html/rfc3447#page-43 RFC3447#page-43} PKCS1 v1.5
-     * specified the use BER encoding rather than DER encoding that PKCS1 v2.0 specified.
-     * This means that under rare conditions you can have a perfectly valid v1.5 signature
-     * that fails to validate with _rsassa_pkcs1_v1_5_verify(). PKCS1 v2.1 also recommends
-     * that if you're going to validate these types of signatures you "should indicate
-     * whether the underlying BER encoding is a DER encoding and hence whether the signature
-     * is valid with respect to the specification given in [PKCS1 v2.0+]". so if you do
-     * $rsa->getLastPadding() and get RSA::PADDING_RELAXED_PKCS1 back instead of
-     * RSA::PADDING_PKCS1... that means BER encoding was used.
-     *
-     * @param string $m
-     * @param string $s
-     * @return bool
-     */
-    private function rsassa_pkcs1_v1_5_relaxed_verify($m, $s)
-    {
-        // Length checking
-
-        if (strlen($s) != $this->k) {
-            return false;
-        }
-
-        // RSA verification
-
-        $s = $this->os2ip($s);
-        $m2 = $this->rsavp1($s);
-        if ($m2 === false) {
-            return false;
-        }
-        $em = $this->i2osp($m2, $this->k);
-        if ($em === false) {
-            return false;
-        }
-
-        if (Strings::shift($em, 2) != "\0\1") {
-            return false;
-        }
-
-        $em = ltrim($em, "\xFF");
-        if (Strings::shift($em) != "\0") {
-            return false;
-        }
-
-        $decoded = ASN1::decodeBER($em);
-        if (!is_array($decoded) || empty($decoded[0]) || strlen($em) > $decoded[0]['length']) {
-            return false;
-        }
-
-        static $oids;
-        if (!isset($oids)) {
-            $oids = [
-                'md2' => '1.2.840.113549.2.2',
-                'md4' => '1.2.840.113549.2.4', // from PKCS1 v1.5
-                'md5' => '1.2.840.113549.2.5',
-                'id-sha1' => '1.3.14.3.2.26',
-                'id-sha256' => '2.16.840.1.101.3.4.2.1',
-                'id-sha384' => '2.16.840.1.101.3.4.2.2',
-                'id-sha512' => '2.16.840.1.101.3.4.2.3',
-                // from PKCS1 v2.2
-                'id-sha224' => '2.16.840.1.101.3.4.2.4',
-                'id-sha512/224' => '2.16.840.1.101.3.4.2.5',
-                'id-sha512/256' => '2.16.840.1.101.3.4.2.6',
-            ];
-            ASN1::loadOIDs($oids);
-        }
-
-        $decoded = ASN1::asn1map($decoded[0], DigestInfo::MAP);
-        if (!isset($decoded) || $decoded === false) {
-            return false;
-        }
-
-        if (!isset($oids[$decoded['digestAlgorithm']['algorithm']])) {
-            return false;
-        }
-
-        if (isset($decoded['digestAlgorithm']['parameters']) && $decoded['digestAlgorithm']['parameters'] !== ['null' => '']) {
-            return false;
-        }
-
-        $hash = $decoded['digestAlgorithm']['algorithm'];
-        $hash = substr($hash, 0, 3) == 'id-' ?
-            substr($hash, 3) :
-            $hash;
-        $hash = new Hash($hash);
-        $em = $hash->hash($m);
-        $em2 = $decoded['digest'];
-
-        return hash_equals($em, $em2);
-    }
-
-    /**
-     * EMSA-PSS-VERIFY
-     *
-     * See {@link http://tools.ietf.org/html/rfc3447#section-9.1.2 RFC3447#section-9.1.2}.
-     *
-     * @param string $m
-     * @param string $em
-     * @param int $emBits
-     * @return string
-     */
-    private function emsa_pss_verify($m, $em, $emBits)
-    {
-        // if $m is larger than two million terrabytes and you're using sha1, PKCS#1 suggests a "Label too long" error
-        // be output.
-
-        $emLen = ($emBits + 7) >> 3; // ie. ceil($emBits / 8);
-        $sLen = $this->sLen !== null ? $this->sLen : $this->hLen;
-
-        $mHash = $this->hash->hash($m);
-        if ($emLen < $this->hLen + $sLen + 2) {
-            return false;
-        }
-
-        if ($em[strlen($em) - 1] != chr(0xBC)) {
-            return false;
-        }
-
-        $maskedDB = substr($em, 0, -$this->hLen - 1);
-        $h = substr($em, -$this->hLen - 1, $this->hLen);
-        $temp = chr(0xFF << ($emBits & 7));
-        if ((~$maskedDB[0] & $temp) != $temp) {
-            return false;
-        }
-        $dbMask = $this->mgf1($h, $emLen - $this->hLen - 1);
-        $db = $maskedDB ^ $dbMask;
-        $db[0] = ~chr(0xFF << ($emBits & 7)) & $db[0];
-        $temp = $emLen - $this->hLen - $sLen - 2;
-        if (substr($db, 0, $temp) != str_repeat(chr(0), $temp) || ord($db[$temp]) != 1) {
-            return false;
-        }
-        $salt = substr($db, $temp + 1); // should be $sLen long
-        $m2 = "\0\0\0\0\0\0\0\0" . $mHash . $salt;
-        $h2 = $this->hash->hash($m2);
-        return hash_equals($h, $h2);
-    }
-
-    /**
-     * RSASSA-PSS-VERIFY
-     *
-     * See {@link http://tools.ietf.org/html/rfc3447#section-8.1.2 RFC3447#section-8.1.2}.
-     *
-     * @param string $m
-     * @param string $s
-     * @return bool|string
-     */
-    private function rsassa_pss_verify($m, $s)
-    {
-        // Length checking
-
-        if (strlen($s) != $this->k) {
-            return false;
-        }
-
-        // RSA verification
-
-        $modBits = strlen($this->modulus->toBits());
-
-        $s2 = $this->os2ip($s);
-        $m2 = $this->rsavp1($s2);
-        $em = $this->i2osp($m2, $this->k);
-        if ($em === false) {
-            return false;
-        }
-
-        // EMSA-PSS verification
-
-        return $this->emsa_pss_verify($m, $em, $modBits - 1);
-    }
-
-    /**
-     * Verifies a signature
-     *
-     * @see self::sign()
-     * @param string $message
-     * @param string $signature
-     * @return bool
-     */
-    public function verify($message, $signature)
-    {
-        switch ($this->signaturePadding) {
-            case self::SIGNATURE_RELAXED_PKCS1:
-                return $this->rsassa_pkcs1_v1_5_relaxed_verify($message, $signature);
-            case self::SIGNATURE_PKCS1:
-                return $this->rsassa_pkcs1_v1_5_verify($message, $signature);
-            //case self::SIGNATURE_PSS:
-            default:
-                return $this->rsassa_pss_verify($message, $signature);
-        }
-    }
-
-    /**
-     * RSAES-PKCS1-V1_5-ENCRYPT
-     *
-     * See {@link http://tools.ietf.org/html/rfc3447#section-7.2.1 RFC3447#section-7.2.1}.
-     *
-     * @param string $m
-     * @param bool $pkcs15_compat optional
-     * @throws \LengthException if strlen($m) > $this->k - 11
-     * @return bool|string
-     */
-    private function rsaes_pkcs1_v1_5_encrypt($m, $pkcs15_compat = false)
-    {
-        $mLen = strlen($m);
-
-        // Length checking
-
-        if ($mLen > $this->k - 11) {
-            throw new \LengthException('Message too long');
-        }
-
-        // EME-PKCS1-v1_5 encoding
-
-        $psLen = $this->k - $mLen - 3;
-        $ps = '';
-        while (strlen($ps) != $psLen) {
-            $temp = Random::string($psLen - strlen($ps));
-            $temp = str_replace("\x00", '', $temp);
-            $ps .= $temp;
-        }
-        $type = 2;
-        $em = chr(0) . chr($type) . $ps . chr(0) . $m;
-
-        // RSA encryption
-        $m = $this->os2ip($em);
-        $c = $this->rsaep($m);
-        $c = $this->i2osp($c, $this->k);
-
-        // Output the ciphertext C
-
-        return $c;
-    }
-
-    /**
-     * RSAES-OAEP-ENCRYPT
-     *
-     * See {@link http://tools.ietf.org/html/rfc3447#section-7.1.1 RFC3447#section-7.1.1} and
-     * {http://en.wikipedia.org/wiki/Optimal_Asymmetric_Encryption_Padding OAES}.
-     *
-     * @param string $m
-     * @throws \LengthException if strlen($m) > $this->k - 2 * $this->hLen - 2
-     * @return string
-     */
-    private function rsaes_oaep_encrypt($m)
-    {
-        $mLen = strlen($m);
-
-        // Length checking
-
-        // if $l is larger than two million terrabytes and you're using sha1, PKCS#1 suggests a "Label too long" error
-        // be output.
-
-        if ($mLen > $this->k - 2 * $this->hLen - 2) {
-            throw new \LengthException('Message too long');
-        }
-
-        // EME-OAEP encoding
-
-        $lHash = $this->hash->hash($this->label);
-        $ps = str_repeat(chr(0), $this->k - $mLen - 2 * $this->hLen - 2);
-        $db = $lHash . $ps . chr(1) . $m;
-        $seed = Random::string($this->hLen);
-        $dbMask = $this->mgf1($seed, $this->k - $this->hLen - 1);
-        $maskedDB = $db ^ $dbMask;
-        $seedMask = $this->mgf1($maskedDB, $this->hLen);
-        $maskedSeed = $seed ^ $seedMask;
-        $em = chr(0) . $maskedSeed . $maskedDB;
-
-        // RSA encryption
-
-        $m = $this->os2ip($em);
-        $c = $this->rsaep($m);
-        $c = $this->i2osp($c, $this->k);
-
-        // Output the ciphertext C
-
-        return $c;
-    }
-
-    /**
-     * RSAEP
-     *
-     * See {@link http://tools.ietf.org/html/rfc3447#section-5.1.1 RFC3447#section-5.1.1}.
-     *
-     * @param \phpseclib3\Math\BigInteger $m
-     * @return bool|\phpseclib3\Math\BigInteger
-     */
-    private function rsaep($m)
-    {
-        if ($m->compare(self::$zero) < 0 || $m->compare($this->modulus) > 0) {
-            throw new \OutOfRangeException('Message representative out of range');
-        }
-        return $this->exponentiate($m);
-    }
-
-    /**
-     * Raw Encryption / Decryption
-     *
-     * Doesn't use padding and is not recommended.
-     *
-     * @param string $m
-     * @return bool|string
-     * @throws \LengthException if strlen($m) > $this->k
-     */
-    private function raw_encrypt($m)
-    {
-        if (strlen($m) > $this->k) {
-            throw new \LengthException('Message too long');
-        }
-
-        $temp = $this->os2ip($m);
-        $temp = $this->rsaep($temp);
-        return  $this->i2osp($temp, $this->k);
-    }
-
-    /**
-     * Encryption
-     *
-     * Both self::PADDING_OAEP and self::PADDING_PKCS1 both place limits on how long $plaintext can be.
-     * If $plaintext exceeds those limits it will be broken up so that it does and the resultant ciphertext's will
-     * be concatenated together.
-     *
-     * @see self::decrypt()
-     * @param string $plaintext
-     * @return bool|string
-     * @throws \LengthException if the RSA modulus is too short
-     */
-    public function encrypt($plaintext)
-    {
-        switch ($this->encryptionPadding) {
-            case self::ENCRYPTION_NONE:
-                return $this->raw_encrypt($plaintext);
-            case self::ENCRYPTION_PKCS1:
-                return $this->rsaes_pkcs1_v1_5_encrypt($plaintext);
-            //case self::ENCRYPTION_OAEP:
-            default:
-                return $this->rsaes_oaep_encrypt($plaintext);
-        }
-    }
-
-    /**
-     * Returns the public key
-     *
-     * The public key is only returned under two circumstances - if the private key had the public key embedded within it
-     * or if the public key was set via setPublicKey().  If the currently loaded key is supposed to be the public key this
-     * function won't return it since this library, for the most part, doesn't distinguish between public and private keys.
-     *
-     * @param string $type
-     * @param array $options optional
-     * @return mixed
-     */
-    public function toString($type, array $options = [])
-    {
-        $type = self::validatePlugin('Keys', $type, 'savePublicKey');
-
-        if ($type == PSS::class) {
-            if ($this->signaturePadding == self::SIGNATURE_PSS) {
-                $options += [
-                    'hash' => $this->hash->getHash(),
-                    'MGFHash' => $this->mgfHash->getHash(),
-                    'saltLength' => $this->getSaltLength()
-                ];
-            } else {
-                throw new UnsupportedFormatException('The PSS format can only be used when the signature method has been explicitly set to PSS');
-            }
-        }
-
-        return $type::savePublicKey($this->modulus, $this->publicExponent, $options);
-    }
-
-    /**
-     * Converts a public key to a private key
-     *
-     * @return RSA
-     */
-    public function asPrivateKey()
-    {
-        $new = new PrivateKey();
-        $new->exponent = $this->exponent;
-        $new->modulus = $this->modulus;
-        $new->k = $this->k;
-        $new->format = $this->format;
-        return $new
-            ->withHash($this->hash->getHash())
-            ->withMGFHash($this->mgfHash->getHash())
-            ->withSaltLength($this->sLen)
-            ->withLabel($this->label)
-            ->withPadding($this->signaturePadding | $this->encryptionPadding);
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/Random.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/Random.php
index f813a2ea..170d1c37 100644
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/Random.php
+++ b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/Random.php
@@ -10,24 +10,28 @@
  * <?php
  *    include 'vendor/autoload.php';
  *
- *    echo bin2hex(\phpseclib3\Crypt\Random::string(8));
+ *    echo bin2hex(\phpseclib\Crypt\Random::string(8));
  * ?>
  * </code>
  *
+ * @category  Crypt
+ * @package   Random
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2007 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
  * @link      http://phpseclib.sourceforge.net
  */
 
-namespace phpseclib3\Crypt;
+namespace phpseclib\Crypt;
 
 /**
  * Pure-PHP Random Number Generator
  *
+ * @package Random
  * @author  Jim Wigginton <terrafrost@php.net>
+ * @access  public
  */
-abstract class Random
+class Random
 {
     /**
      * Generate a random string.
@@ -37,26 +41,68 @@ abstract class Random
      * eg. for RSA key generation.
      *
      * @param int $length
-     * @throws \RuntimeException if a symmetric cipher is needed but not loaded
      * @return string
      */
-    public static function string($length)
+    static function string($length)
     {
-        if (!$length) {
-            return '';
+        if (version_compare(PHP_VERSION, '7.0.0', '>=')) {
+            try {
+                return \random_bytes($length);
+            } catch (\Throwable $e) {
+                // If a sufficient source of randomness is unavailable, random_bytes() will throw an
+                // object that implements the Throwable interface (Exception, TypeError, Error).
+                // We don't actually need to do anything here. The string() method should just continue
+                // as normal. Note, however, that if we don't have a sufficient source of randomness for
+                // random_bytes(), most of the other calls here will fail too, so we'll end up using
+                // the PHP implementation.
+            }
         }
 
-        try {
-            return random_bytes($length);
-        } catch (\Exception $e) {
-            // random_compat will throw an Exception, which in PHP 5 does not implement Throwable
-        } catch (\Throwable $e) {
-            // If a sufficient source of randomness is unavailable, random_bytes() will throw an
-            // object that implements the Throwable interface (Exception, TypeError, Error).
-            // We don't actually need to do anything here. The string() method should just continue
-            // as normal. Note, however, that if we don't have a sufficient source of randomness for
-            // random_bytes(), most of the other calls here will fail too, so we'll end up using
-            // the PHP implementation.
+        if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
+            // method 1. prior to PHP 5.3 this would call rand() on windows hence the function_exists('class_alias') call.
+            // ie. class_alias is a function that was introduced in PHP 5.3
+            if (extension_loaded('mcrypt') && function_exists('class_alias')) {
+                return mcrypt_create_iv($length);
+            }
+            // method 2. openssl_random_pseudo_bytes was introduced in PHP 5.3.0 but prior to PHP 5.3.4 there was,
+            // to quote <http://php.net/ChangeLog-5.php#5.3.4>, "possible blocking behavior". as of 5.3.4
+            // openssl_random_pseudo_bytes and mcrypt_create_iv do the exact same thing on Windows. ie. they both
+            // call php_win32_get_random_bytes():
+            //
+            // https://github.com/php/php-src/blob/7014a0eb6d1611151a286c0ff4f2238f92c120d6/ext/openssl/openssl.c#L5008
+            // https://github.com/php/php-src/blob/7014a0eb6d1611151a286c0ff4f2238f92c120d6/ext/mcrypt/mcrypt.c#L1392
+            //
+            // php_win32_get_random_bytes() is defined thusly:
+            //
+            // https://github.com/php/php-src/blob/7014a0eb6d1611151a286c0ff4f2238f92c120d6/win32/winutil.c#L80
+            //
+            // we're calling it, all the same, in the off chance that the mcrypt extension is not available
+            if (extension_loaded('openssl') && version_compare(PHP_VERSION, '5.3.4', '>=')) {
+                return openssl_random_pseudo_bytes($length);
+            }
+        } else {
+            // method 1. the fastest
+            if (extension_loaded('openssl')) {
+                return openssl_random_pseudo_bytes($length);
+            }
+            // method 2
+            static $fp = true;
+            if ($fp === true) {
+                // warning's will be output unles the error suppression operator is used. errors such as
+                // "open_basedir restriction in effect", "Permission denied", "No such file or directory", etc.
+                $fp = @fopen('/dev/urandom', 'rb');
+            }
+            if ($fp !== true && $fp !== false) { // surprisingly faster than !is_bool() or is_resource()
+                return fread($fp, $length);
+            }
+            // method 3. pretty much does the same thing as method 2 per the following url:
+            // https://github.com/php/php-src/blob/7014a0eb6d1611151a286c0ff4f2238f92c120d6/ext/mcrypt/mcrypt.c#L1391
+            // surprisingly slower than method 2. maybe that's because mcrypt_create_iv does a bunch of error checking that we're
+            // not doing. regardless, this'll only be called if this PHP script couldn't open /dev/urandom due to open_basedir
+            // restrictions or some such
+            if (extension_loaded('mcrypt')) {
+                return mcrypt_create_iv($length, MCRYPT_DEV_URANDOM);
+            }
         }
         // at this point we have no choice but to use a pure-PHP CSPRNG
 
@@ -69,11 +115,11 @@ abstract class Random
         // PHP isn't low level to be able to use those as sources and on a web server there's not likely
         // going to be a ton of keyboard or mouse action. web servers do have one thing that we can use
         // however, a ton of people visiting the website. obviously you don't want to base your seeding
-        // solely on parameters a potential attacker sends but (1) not everything in $_SERVER is controlled
+        // soley on parameters a potential attacker sends but (1) not everything in $_SERVER is controlled
         // by the user and (2) this isn't just looking at the data sent by the current user - it's based
         // on the data sent by all users. one user requests the page and a hash of their info is saved.
         // another user visits the page and the serialization of their data is utilized along with the
-        // server environment stuff and a hash of the previous http request data (which itself utilizes
+        // server envirnment stuff and a hash of the previous http request data (which itself utilizes
         // a hash of the session data before that). certainly an attacker should be assumed to have
         // full control over his own http requests. he, however, is not going to have control over
         // everyone's http requests.
@@ -93,17 +139,15 @@ abstract class Random
             session_cache_limiter('');
             session_start();
 
-            $v = (isset($_SERVER) ? self::safe_serialize($_SERVER) : '') .
-                 (isset($_POST) ? self::safe_serialize($_POST) : '') .
-                 (isset($_GET) ? self::safe_serialize($_GET) : '') .
-                 (isset($_COOKIE) ? self::safe_serialize($_COOKIE) : '') .
-                 // as of PHP 8.1 $GLOBALS can't be accessed by reference, which eliminates
-                 // the need for phpseclib_safe_serialize. see https://wiki.php.net/rfc/restrict_globals_usage
-                 // for more info
-                 (version_compare(PHP_VERSION, '8.1.0', '>=') ? serialize($GLOBALS) : self::safe_serialize($GLOBALS)) .
-                 self::safe_serialize($_SESSION) .
-                 self::safe_serialize($_OLD_SESSION);
-            $v = $seed = $_SESSION['seed'] = sha1($v, true);
+            $v = $seed = $_SESSION['seed'] = pack('H*', sha1(
+                (isset($_SERVER) ? phpseclib_safe_serialize($_SERVER) : '') .
+                (isset($_POST) ? phpseclib_safe_serialize($_POST) : '') .
+                (isset($_GET) ? phpseclib_safe_serialize($_GET) : '') .
+                (isset($_COOKIE) ? phpseclib_safe_serialize($_COOKIE) : '') .
+                phpseclib_safe_serialize($GLOBALS) .
+                phpseclib_safe_serialize($_SESSION) .
+                phpseclib_safe_serialize($_OLD_SESSION)
+            ));
             if (!isset($_SESSION['count'])) {
                 $_SESSION['count'] = 0;
             }
@@ -134,37 +178,38 @@ abstract class Random
             // http://tools.ietf.org/html/rfc4253#section-7.2
             //
             // see the is_string($crypto) part for an example of how to expand the keys
-            $key = sha1($seed . 'A', true);
-            $iv = sha1($seed . 'C', true);
+            $key = pack('H*', sha1($seed . 'A'));
+            $iv = pack('H*', sha1($seed . 'C'));
 
             // ciphers are used as per the nist.gov link below. also, see this link:
             //
             // http://en.wikipedia.org/wiki/Cryptographically_secure_pseudorandom_number_generator#Designs_based_on_cryptographic_primitives
             switch (true) {
-                case class_exists('\phpseclib3\Crypt\AES'):
-                    $crypto = new AES('ctr');
+                case class_exists('\phpseclib\Crypt\AES'):
+                    $crypto = new AES(Base::MODE_CTR);
                     break;
-                case class_exists('\phpseclib3\Crypt\Twofish'):
-                    $crypto = new Twofish('ctr');
+                case class_exists('\phpseclib\Crypt\Twofish'):
+                    $crypto = new Twofish(Base::MODE_CTR);
                     break;
-                case class_exists('\phpseclib3\Crypt\Blowfish'):
-                    $crypto = new Blowfish('ctr');
+                case class_exists('\phpseclib\Crypt\Blowfish'):
+                    $crypto = new Blowfish(Base::MODE_CTR);
                     break;
-                case class_exists('\phpseclib3\Crypt\TripleDES'):
-                    $crypto = new TripleDES('ctr');
+                case class_exists('\phpseclib\Crypt\TripleDES'):
+                    $crypto = new TripleDES(Base::MODE_CTR);
                     break;
-                case class_exists('\phpseclib3\Crypt\DES'):
-                    $crypto = new DES('ctr');
+                case class_exists('\phpseclib\Crypt\DES'):
+                    $crypto = new DES(Base::MODE_CTR);
                     break;
-                case class_exists('\phpseclib3\Crypt\RC4'):
+                case class_exists('\phpseclib\Crypt\RC4'):
                     $crypto = new RC4();
                     break;
                 default:
-                    throw new \RuntimeException(__CLASS__ . ' requires at least one symmetric cipher be loaded');
+                    user_error(__CLASS__ . ' requires at least one symmetric cipher be loaded');
+                    return false;
             }
 
-            $crypto->setKey(substr($key, 0, $crypto->getKeyLength() >> 3));
-            $crypto->setIV(substr($iv, 0, $crypto->getBlockLength() >> 3));
+            $crypto->setKey($key);
+            $crypto->setIV($iv);
             $crypto->enableContinuousBuffer();
         }
 
@@ -183,20 +228,23 @@ abstract class Random
             $i = $crypto->encrypt(microtime()); // strlen(microtime()) == 21
             $r = $crypto->encrypt($i ^ $v); // strlen($v) == 20
             $v = $crypto->encrypt($r ^ $i); // strlen($r) == 20
-            $result .= $r;
+            $result.= $r;
         }
-
         return substr($result, 0, $length);
     }
+}
 
+if (!function_exists('phpseclib_safe_serialize')) {
     /**
      * Safely serialize variables
      *
-     * If a class has a private __sleep() it'll emit a warning
-     * @return mixed
+     * If a class has a private __sleep() method it'll give a fatal error on PHP 5.2 and earlier.
+     * PHP 5.3 will emit a warning.
+     *
      * @param mixed $arr
+     * @access public
      */
-    private static function safe_serialize(&$arr)
+    function phpseclib_safe_serialize(&$arr)
     {
         if (is_object($arr)) {
             return '';
@@ -208,12 +256,12 @@ abstract class Random
         if (isset($arr['__phpseclib_marker'])) {
             return '';
         }
-        $safearr = [];
+        $safearr = array();
         $arr['__phpseclib_marker'] = true;
         foreach (array_keys($arr) as $key) {
             // do not recurse on the '__phpseclib_marker' key itself, for smaller memory usage
             if ($key !== '__phpseclib_marker') {
-                $safearr[$key] = self::safe_serialize($arr[$key]);
+                $safearr[$key] = phpseclib_safe_serialize($arr[$key]);
             }
         }
         unset($arr['__phpseclib_marker']);
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/Rijndael.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/Rijndael.php
index ff31f9c8..3648a197 100644
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/Rijndael.php
+++ b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/Rijndael.php
@@ -30,7 +30,7 @@
  * <?php
  *    include 'vendor/autoload.php';
  *
- *    $rijndael = new \phpseclib3\Crypt\Rijndael('ctr');
+ *    $rijndael = new \phpseclib\Crypt\Rijndael();
  *
  *    $rijndael->setKey('abcdefghijklmnop');
  *
@@ -44,136 +44,135 @@
  * ?>
  * </code>
  *
+ * @category  Crypt
+ * @package   Rijndael
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2008 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
  * @link      http://phpseclib.sourceforge.net
  */
 
-namespace phpseclib3\Crypt;
-
-use phpseclib3\Common\Functions\Strings;
-use phpseclib3\Crypt\Common\BlockCipher;
-use phpseclib3\Exception\BadDecryptionException;
-use phpseclib3\Exception\BadModeException;
-use phpseclib3\Exception\InconsistentSetupException;
-use phpseclib3\Exception\InsufficientSetupException;
+namespace phpseclib\Crypt;
 
 /**
  * Pure-PHP implementation of Rijndael.
  *
+ * @package Rijndael
  * @author  Jim Wigginton <terrafrost@php.net>
+ * @access  public
  */
-class Rijndael extends BlockCipher
+class Rijndael extends Base
 {
     /**
      * The mcrypt specific name of the cipher
      *
      * Mcrypt is useable for 128/192/256-bit $block_size/$key_length. For 160/224 not.
-     * \phpseclib3\Crypt\Rijndael determines automatically whether mcrypt is useable
+     * \phpseclib\Crypt\Rijndael determines automatically whether mcrypt is useable
      * or not for the current $block_size/$key_length.
      * In case of, $cipher_name_mcrypt will be set dynamically at run time accordingly.
      *
-     * @see \phpseclib3\Crypt\Common\SymmetricKey::cipher_name_mcrypt
-     * @see \phpseclib3\Crypt\Common\SymmetricKey::engine
+     * @see \phpseclib\Crypt\Base::cipher_name_mcrypt
+     * @see \phpseclib\Crypt\Base::engine
      * @see self::isValidEngine()
      * @var string
+     * @access private
      */
-    protected $cipher_name_mcrypt = 'rijndael-128';
+    var $cipher_name_mcrypt = 'rijndael-128';
+
+    /**
+     * The default salt used by setPassword()
+     *
+     * @see \phpseclib\Crypt\Base::password_default_salt
+     * @see \phpseclib\Crypt\Base::setPassword()
+     * @var string
+     * @access private
+     */
+    var $password_default_salt = 'phpseclib';
 
     /**
      * The Key Schedule
      *
-     * @see self::setup()
+     * @see self::_setup()
      * @var array
+     * @access private
      */
-    private $w;
+    var $w;
 
     /**
      * The Inverse Key Schedule
      *
-     * @see self::setup()
+     * @see self::_setup()
      * @var array
+     * @access private
      */
-    private $dw;
+    var $dw;
 
     /**
      * The Block Length divided by 32
      *
-     * {@internal The max value is 256 / 32 = 8, the min value is 128 / 32 = 4.  Exists in conjunction with $block_size
-     *    because the encryption / decryption / key schedule creation requires this number and not $block_size.  We could
-     *    derive this from $block_size or vice versa, but that'd mean we'd have to do multiple shift operations, so in lieu
-     *    of that, we'll just precompute it once.}
-     *
      * @see self::setBlockLength()
      * @var int
+     * @access private
+     * @internal The max value is 256 / 32 = 8, the min value is 128 / 32 = 4.  Exists in conjunction with $block_size
+     *    because the encryption / decryption / key schedule creation requires this number and not $block_size.  We could
+     *    derive this from $block_size or vice versa, but that'd mean we'd have to do multiple shift operations, so in lieu
+     *    of that, we'll just precompute it once.
      */
-    private $Nb = 4;
+    var $Nb = 4;
 
     /**
      * The Key Length (in bytes)
      *
-     * {@internal The max value is 256 / 8 = 32, the min value is 128 / 8 = 16.  Exists in conjunction with $Nk
-     *    because the encryption / decryption / key schedule creation requires this number and not $key_length.  We could
-     *    derive this from $key_length or vice versa, but that'd mean we'd have to do multiple shift operations, so in lieu
-     *    of that, we'll just precompute it once.}
-     *
      * @see self::setKeyLength()
      * @var int
+     * @access private
+     * @internal The max value is 256 / 8 = 32, the min value is 128 / 8 = 16.  Exists in conjunction with $Nk
+     *    because the encryption / decryption / key schedule creation requires this number and not $key_length.  We could
+     *    derive this from $key_length or vice versa, but that'd mean we'd have to do multiple shift operations, so in lieu
+     *    of that, we'll just precompute it once.
      */
-    protected $key_length = 16;
+    var $key_length = 16;
 
     /**
      * The Key Length divided by 32
      *
      * @see self::setKeyLength()
      * @var int
+     * @access private
      * @internal The max value is 256 / 32 = 8, the min value is 128 / 32 = 4
      */
-    private $Nk = 4;
+    var $Nk = 4;
 
     /**
      * The Number of Rounds
      *
-     * {@internal The max value is 14, the min value is 10.}
-     *
      * @var int
+     * @access private
+     * @internal The max value is 14, the min value is 10.
      */
-    private $Nr;
+    var $Nr;
 
     /**
      * Shift offsets
      *
      * @var array
+     * @access private
      */
-    private $c;
+    var $c;
 
     /**
      * Holds the last used key- and block_size information
      *
      * @var array
+     * @access private
      */
-    private $kl;
-
-    /**
-     * Default Constructor.
-     *
-     * @param string $mode
-     * @throws \InvalidArgumentException if an invalid / unsupported mode is provided
-     */
-    public function __construct($mode)
-    {
-        parent::__construct($mode);
-
-        if ($this->mode == self::MODE_STREAM) {
-            throw new BadModeException('Block ciphers cannot be ran in stream mode');
-        }
-    }
+    var $kl;
 
     /**
      * Sets the key length.
      *
-     * Valid key lengths are 128, 160, 192, 224, and 256.
+     * Valid key lengths are 128, 160, 192, 224, and 256.  If the length is less than 128, it will be rounded up to
+     * 128.  If the length is greater than 128 and invalid, it will be rounded down to the closest valid amount.
      *
      * Note: phpseclib extends Rijndael (and AES) for using 160- and 224-bit keys but they are officially not defined
      *       and the most (if not all) implementations are not able using 160/224-bit keys but round/pad them up to
@@ -186,111 +185,73 @@ class Rijndael extends BlockCipher
      *             the mcrypt php extension, even if available.
      *             This results then in slower encryption.
      *
-     * @throws \LengthException if the key length is invalid
+     * @access public
      * @param int $length
      */
-    public function setKeyLength($length)
+    function setKeyLength($length)
     {
-        switch ($length) {
-            case 128:
-            case 160:
-            case 192:
-            case 224:
-            case 256:
-                $this->key_length = $length >> 3;
+        switch (true) {
+            case $length <= 128:
+                $this->key_length = 16;
+                break;
+            case $length <= 160:
+                $this->key_length = 20;
+                break;
+            case $length <= 192:
+                $this->key_length = 24;
+                break;
+            case $length <= 224:
+                $this->key_length = 28;
                 break;
             default:
-                throw new \LengthException('Key size of ' . $length . ' bits is not supported by this algorithm. Only keys of sizes 128, 160, 192, 224 or 256 bits are supported');
+                $this->key_length = 32;
         }
 
         parent::setKeyLength($length);
     }
 
-    /**
-     * Sets the key.
-     *
-     * Rijndael supports five different key lengths
-     *
-     * @see setKeyLength()
-     * @param string $key
-     * @throws \LengthException if the key length isn't supported
-     */
-    public function setKey($key)
-    {
-        switch (strlen($key)) {
-            case 16:
-            case 20:
-            case 24:
-            case 28:
-            case 32:
-                break;
-            default:
-                throw new \LengthException('Key of size ' . strlen($key) . ' not supported by this algorithm. Only keys of sizes 16, 20, 24, 28 or 32 are supported');
-        }
-
-        parent::setKey($key);
-    }
-
     /**
      * Sets the block length
      *
-     * Valid block lengths are 128, 160, 192, 224, and 256.
+     * Valid block lengths are 128, 160, 192, 224, and 256.  If the length is less than 128, it will be rounded up to
+     * 128.  If the length is greater than 128 and invalid, it will be rounded down to the closest valid amount.
      *
+     * @access public
      * @param int $length
      */
-    public function setBlockLength($length)
+    function setBlockLength($length)
     {
-        switch ($length) {
-            case 128:
-            case 160:
-            case 192:
-            case 224:
-            case 256:
-                break;
-            default:
-                throw new \LengthException('Key size of ' . $length . ' bits is not supported by this algorithm. Only keys of sizes 128, 160, 192, 224 or 256 bits are supported');
+        $length >>= 5;
+        if ($length > 8) {
+            $length = 8;
+        } elseif ($length < 4) {
+            $length = 4;
         }
-
-        $this->Nb = $length >> 5;
-        $this->block_size = $length >> 3;
-        $this->changed = $this->nonIVChanged = true;
-        $this->setEngine();
+        $this->Nb = $length;
+        $this->block_size = $length << 2;
+        $this->changed = true;
+        $this->_setEngine();
     }
 
     /**
      * Test for engine validity
      *
-     * This is mainly just a wrapper to set things up for \phpseclib3\Crypt\Common\SymmetricKey::isValidEngine()
+     * This is mainly just a wrapper to set things up for \phpseclib\Crypt\Base::isValidEngine()
      *
-     * @see \phpseclib3\Crypt\Common\SymmetricKey::__construct()
+     * @see \phpseclib\Crypt\Base::__construct()
      * @param int $engine
+     * @access public
      * @return bool
      */
-    protected function isValidEngineHelper($engine)
+    function isValidEngine($engine)
     {
         switch ($engine) {
-            case self::ENGINE_LIBSODIUM:
-                return function_exists('sodium_crypto_aead_aes256gcm_is_available') &&
-                       sodium_crypto_aead_aes256gcm_is_available() &&
-                       $this->mode == self::MODE_GCM &&
-                       $this->key_length == 32 &&
-                       $this->nonce && strlen($this->nonce) == 12 &&
-                       $this->block_size == 16;
-            case self::ENGINE_OPENSSL_GCM:
-                if (!extension_loaded('openssl')) {
-                    return false;
-                }
-                $methods = openssl_get_cipher_methods();
-                return $this->mode == self::MODE_GCM &&
-                       version_compare(PHP_VERSION, '7.1.0', '>=') &&
-                       in_array('aes-' . $this->getKeyLength() . '-gcm', $methods) &&
-                       $this->block_size == 16;
             case self::ENGINE_OPENSSL:
                 if ($this->block_size != 16) {
                     return false;
                 }
                 $this->cipher_name_openssl_ecb = 'aes-' . ($this->key_length << 3) . '-ecb';
-                $this->cipher_name_openssl = 'aes-' . ($this->key_length << 3) . '-' . $this->openssl_translate_mode();
+                $this->cipher_name_openssl = 'aes-' . ($this->key_length << 3) . '-' . $this->_openssl_translate_mode();
                 break;
             case self::ENGINE_MCRYPT:
                 $this->cipher_name_mcrypt = 'rijndael-' . ($this->block_size << 3);
@@ -300,20 +261,21 @@ class Rijndael extends BlockCipher
                 }
         }
 
-        return parent::isValidEngineHelper($engine);
+        return parent::isValidEngine($engine);
     }
 
     /**
      * Encrypts a block
      *
+     * @access private
      * @param string $in
      * @return string
      */
-    protected function encryptBlock($in)
+    function _encryptBlock($in)
     {
         static $tables;
         if (empty($tables)) {
-            $tables = &$this->getTables();
+            $tables = &$this->_getTables();
         }
         $t0   = $tables[0];
         $t1   = $tables[1];
@@ -321,7 +283,7 @@ class Rijndael extends BlockCipher
         $t3   = $tables[3];
         $sbox = $tables[4];
 
-        $state = [];
+        $state = array();
         $words = unpack('N*', $in);
 
         $c = $this->c;
@@ -343,7 +305,7 @@ class Rijndael extends BlockCipher
         // equation (7.4.7) is supposed to use addition instead of subtraction, so we'll do that here, as well.
 
         // [1] http://fp.gladman.plus.com/cryptography_technology/rijndael/aes.spec.v316.pdf
-        $temp = [];
+        $temp = array();
         for ($round = 1; $round < $Nr; ++$round) {
             $i = 0; // $c[0] == 0
             $j = $c[1];
@@ -378,7 +340,7 @@ class Rijndael extends BlockCipher
         $k = $c[2];
         $l = $c[3];
         while ($i < $Nb) {
-            $temp[$i] = ($state[$i] & intval(0xFF000000)) ^
+            $temp[$i] = ($state[$i] & 0xFF000000) ^
                         ($state[$j] & 0x00FF0000) ^
                         ($state[$k] & 0x0000FF00) ^
                         ($state[$l] & 0x000000FF) ^
@@ -389,20 +351,32 @@ class Rijndael extends BlockCipher
             $l = ($l + 1) % $Nb;
         }
 
-        return pack('N*', ...$temp);
+        switch ($Nb) {
+            case 8:
+                return pack('N*', $temp[0], $temp[1], $temp[2], $temp[3], $temp[4], $temp[5], $temp[6], $temp[7]);
+            case 7:
+                return pack('N*', $temp[0], $temp[1], $temp[2], $temp[3], $temp[4], $temp[5], $temp[6]);
+            case 6:
+                return pack('N*', $temp[0], $temp[1], $temp[2], $temp[3], $temp[4], $temp[5]);
+            case 5:
+                return pack('N*', $temp[0], $temp[1], $temp[2], $temp[3], $temp[4]);
+            default:
+                return pack('N*', $temp[0], $temp[1], $temp[2], $temp[3]);
+        }
     }
 
     /**
      * Decrypts a block
      *
+     * @access private
      * @param string $in
      * @return string
      */
-    protected function decryptBlock($in)
+    function _decryptBlock($in)
     {
         static $invtables;
         if (empty($invtables)) {
-            $invtables = &$this->getInvTables();
+            $invtables = &$this->_getInvTables();
         }
         $dt0   = $invtables[0];
         $dt1   = $invtables[1];
@@ -410,7 +384,7 @@ class Rijndael extends BlockCipher
         $dt3   = $invtables[3];
         $isbox = $invtables[4];
 
-        $state = [];
+        $state = array();
         $words = unpack('N*', $in);
 
         $c  = $this->c;
@@ -424,7 +398,7 @@ class Rijndael extends BlockCipher
             $state[] = $word ^ $dw[++$wc];
         }
 
-        $temp = [];
+        $temp = array();
         for ($round = $Nr - 1; $round > 0; --$round) {
             $i = 0; // $c[0] == 0
             $j = $Nb - $c[1];
@@ -452,7 +426,7 @@ class Rijndael extends BlockCipher
         $l = $Nb - $c[3];
 
         while ($i < $Nb) {
-            $word = ($state[$i] & intval(0xFF000000)) |
+            $word = ($state[$i] & 0xFF000000) |
                     ($state[$j] & 0x00FF0000) |
                     ($state[$k] & 0x0000FF00) |
                     ($state[$l] & 0x000000FF);
@@ -467,75 +441,44 @@ class Rijndael extends BlockCipher
             $l = ($l + 1) % $Nb;
         }
 
-        return pack('N*', ...$temp);
-    }
-
-    /**
-     * Setup the self::ENGINE_INTERNAL $engine
-     *
-     * (re)init, if necessary, the internal cipher $engine and flush all $buffers
-     * Used (only) if $engine == self::ENGINE_INTERNAL
-     *
-     * _setup() will be called each time if $changed === true
-     * typically this happens when using one or more of following public methods:
-     *
-     * - setKey()
-     *
-     * - setIV()
-     *
-     * - disableContinuousBuffer()
-     *
-     * - First run of encrypt() / decrypt() with no init-settings
-     *
-     * {@internal setup() is always called before en/decryption.}
-     *
-     * {@internal Could, but not must, extend by the child Crypt_* class}
-     *
-     * @see self::setKey()
-     * @see self::setIV()
-     * @see self::disableContinuousBuffer()
-     */
-    protected function setup()
-    {
-        if (!$this->changed) {
-            return;
-        }
-
-        parent::setup();
-
-        if (is_string($this->iv) && strlen($this->iv) != $this->block_size) {
-            throw new InconsistentSetupException('The IV length (' . strlen($this->iv) . ') does not match the block size (' . $this->block_size . ')');
+        switch ($Nb) {
+            case 8:
+                return pack('N*', $temp[0], $temp[1], $temp[2], $temp[3], $temp[4], $temp[5], $temp[6], $temp[7]);
+            case 7:
+                return pack('N*', $temp[0], $temp[1], $temp[2], $temp[3], $temp[4], $temp[5], $temp[6]);
+            case 6:
+                return pack('N*', $temp[0], $temp[1], $temp[2], $temp[3], $temp[4], $temp[5]);
+            case 5:
+                return pack('N*', $temp[0], $temp[1], $temp[2], $temp[3], $temp[4]);
+            default:
+                return pack('N*', $temp[0], $temp[1], $temp[2], $temp[3]);
         }
     }
 
     /**
      * Setup the key (expansion)
      *
-     * @see \phpseclib3\Crypt\Common\SymmetricKey::setupKey()
+     * @see \phpseclib\Crypt\Base::_setupKey()
+     * @access private
      */
-    protected function setupKey()
+    function _setupKey()
     {
         // Each number in $rcon is equal to the previous number multiplied by two in Rijndael's finite field.
         // See http://en.wikipedia.org/wiki/Finite_field_arithmetic#Multiplicative_inverse
-        static $rcon;
-
-        if (!isset($rcon)) {
-            $rcon = [0,
-                0x01000000, 0x02000000, 0x04000000, 0x08000000, 0x10000000,
-                0x20000000, 0x40000000, 0x80000000, 0x1B000000, 0x36000000,
-                0x6C000000, 0xD8000000, 0xAB000000, 0x4D000000, 0x9A000000,
-                0x2F000000, 0x5E000000, 0xBC000000, 0x63000000, 0xC6000000,
-                0x97000000, 0x35000000, 0x6A000000, 0xD4000000, 0xB3000000,
-                0x7D000000, 0xFA000000, 0xEF000000, 0xC5000000, 0x91000000
-            ];
-            $rcon = array_map('intval', $rcon);
-        }
+        static $rcon = array(0,
+            0x01000000, 0x02000000, 0x04000000, 0x08000000, 0x10000000,
+            0x20000000, 0x40000000, 0x80000000, 0x1B000000, 0x36000000,
+            0x6C000000, 0xD8000000, 0xAB000000, 0x4D000000, 0x9A000000,
+            0x2F000000, 0x5E000000, 0xBC000000, 0x63000000, 0xC6000000,
+            0x97000000, 0x35000000, 0x6A000000, 0xD4000000, 0xB3000000,
+            0x7D000000, 0xFA000000, 0xEF000000, 0xC5000000, 0x91000000
+        );
 
         if (isset($this->kl['key']) && $this->key === $this->kl['key'] && $this->key_length === $this->kl['key_length'] && $this->block_size === $this->kl['block_size']) {
             // already expanded
             return;
         }
-        $this->kl = ['key' => $this->key, 'key_length' => $this->key_length, 'block_size' => $this->block_size];
+        $this->kl = array('key' => $this->key, 'key_length' => $this->key_length, 'block_size' => $this->block_size);
 
         $this->Nk = $this->key_length >> 2;
         // see Rijndael-ammended.pdf#page=44
@@ -549,13 +492,13 @@ class Rijndael extends BlockCipher
             case 4:
             case 5:
             case 6:
-                $this->c = [0, 1, 2, 3];
+                $this->c = array(0, 1, 2, 3);
                 break;
             case 7:
-                $this->c = [0, 1, 2, 4];
+                $this->c = array(0, 1, 2, 4);
                 break;
             case 8:
-                $this->c = [0, 1, 3, 4];
+                $this->c = array(0, 1, 3, 4);
         }
 
         $w = array_values(unpack('N*words', $this->key));
@@ -568,10 +511,10 @@ class Rijndael extends BlockCipher
                 // on a 32-bit machine, it's 32-bits, and on a 64-bit machine, it's 64-bits. on a 32-bit machine,
                 // 0xFFFFFFFF << 8 == 0xFFFFFF00, but on a 64-bit machine, it equals 0xFFFFFFFF00. as such, doing 'and'
                 // with 0xFFFFFFFF (or 0xFFFFFF00) on a 32-bit machine is unnecessary, but on a 64-bit machine, it is.
-                $temp = (($temp << 8) & intval(0xFFFFFF00)) | (($temp >> 24) & 0x000000FF); // rotWord
-                $temp = $this->subWord($temp) ^ $rcon[$i / $this->Nk];
+                $temp = (($temp << 8) & 0xFFFFFF00) | (($temp >> 24) & 0x000000FF); // rotWord
+                $temp = $this->_subWord($temp) ^ $rcon[$i / $this->Nk];
             } elseif ($this->Nk > 6 && $i % $this->Nk == 4) {
-                $temp = $this->subWord($temp);
+                $temp = $this->_subWord($temp);
             }
             $w[$i] = $w[$i - $this->Nk] ^ $temp;
         }
@@ -583,8 +526,8 @@ class Rijndael extends BlockCipher
         //        1. Apply the Key Expansion.
         //        2. Apply InvMixColumn to all Round Keys except the first and the last one."
         // also, see fips-197.pdf#page=27, "5.3.5 Equivalent Inverse Cipher"
-        list($dt0, $dt1, $dt2, $dt3) = $this->getInvTables();
-        $temp = $this->w = $this->dw = [];
+        list($dt0, $dt1, $dt2, $dt3) = $this->_getInvTables();
+        $temp = $this->w = $this->dw = array();
         for ($i = $row = $col = 0; $i < $length; $i++, $col++) {
             if ($col == $this->Nb) {
                 if ($row == 0) {
@@ -593,7 +536,7 @@ class Rijndael extends BlockCipher
                     // subWord + invMixColumn + invSubWord = invMixColumn
                     $j = 0;
                     while ($j < $this->Nb) {
-                        $dw = $this->subWord($this->w[$row][$j]);
+                        $dw = $this->_subWord($this->w[$row][$j]);
                         $temp[$j] = $dt0[$dw >> 24 & 0x000000FF] ^
                                     $dt1[$dw >> 16 & 0x000000FF] ^
                                     $dt2[$dw >>  8 & 0x000000FF] ^
@@ -628,14 +571,14 @@ class Rijndael extends BlockCipher
     /**
      * Performs S-Box substitutions
      *
-     * @return array
+     * @access private
      * @param int $word
      */
-    private function subWord($word)
+    function _subWord($word)
     {
         static $sbox;
         if (empty($sbox)) {
-            list(, , , , $sbox) = self::getTables();
+            list(, , , , $sbox) = $this->_getTables();
         }
 
         return  $sbox[$word       & 0x000000FF]        |
@@ -647,19 +590,20 @@ class Rijndael extends BlockCipher
     /**
      * Provides the mixColumns and sboxes tables
      *
-     * @see self::encryptBlock()
-     * @see self::setupInlineCrypt()
-     * @see self::subWord()
+     * @see self::_encryptBlock()
+     * @see self::_setupInlineCrypt()
+     * @see self::_subWord()
+     * @access private
      * @return array &$tables
      */
-    protected function &getTables()
+    function &_getTables()
     {
         static $tables;
         if (empty($tables)) {
             // according to <http://csrc.nist.gov/archive/aes/rijndael/Rijndael-ammended.pdf#page=19> (section 5.2.1),
             // precomputed tables can be used in the mixColumns phase. in that example, they're assigned t0...t3, so
             // those are the names we'll use.
-            $t3 = array_map('intval', [
+            $t3 = array_map('intval', array(
                 // with array_map('intval', ...) we ensure we have only int's and not
                 // some slower floats converted by php automatically on high values
                 0x6363A5C6, 0x7C7C84F8, 0x777799EE, 0x7B7B8DF6, 0xF2F20DFF, 0x6B6BBDD6, 0x6F6FB1DE, 0xC5C55491,
@@ -694,22 +638,22 @@ class Rijndael extends BlockCipher
                 0x9B9BB62D, 0x1E1E223C, 0x87879215, 0xE9E920C9, 0xCECE4987, 0x5555FFAA, 0x28287850, 0xDFDF7AA5,
                 0x8C8C8F03, 0xA1A1F859, 0x89898009, 0x0D0D171A, 0xBFBFDA65, 0xE6E631D7, 0x4242C684, 0x6868B8D0,
                 0x4141C382, 0x9999B029, 0x2D2D775A, 0x0F0F111E, 0xB0B0CB7B, 0x5454FCA8, 0xBBBBD66D, 0x16163A2C
-            ]);
+            ));
 
             foreach ($t3 as $t3i) {
-                $t0[] = (($t3i << 24) & intval(0xFF000000)) | (($t3i >>  8) & 0x00FFFFFF);
-                $t1[] = (($t3i << 16) & intval(0xFFFF0000)) | (($t3i >> 16) & 0x0000FFFF);
-                $t2[] = (($t3i <<  8) & intval(0xFFFFFF00)) | (($t3i >> 24) & 0x000000FF);
+                $t0[] = (($t3i << 24) & 0xFF000000) | (($t3i >>  8) & 0x00FFFFFF);
+                $t1[] = (($t3i << 16) & 0xFFFF0000) | (($t3i >> 16) & 0x0000FFFF);
+                $t2[] = (($t3i <<  8) & 0xFFFFFF00) | (($t3i >> 24) & 0x000000FF);
             }
 
-            $tables = [
+            $tables = array(
                 // The Precomputed mixColumns tables t0 - t3
                 $t0,
                 $t1,
                 $t2,
                 $t3,
                 // The SubByte S-Box
-                [
+                array(
                     0x63, 0x7C, 0x77, 0x7B, 0xF2, 0x6B, 0x6F, 0xC5, 0x30, 0x01, 0x67, 0x2B, 0xFE, 0xD7, 0xAB, 0x76,
                     0xCA, 0x82, 0xC9, 0x7D, 0xFA, 0x59, 0x47, 0xF0, 0xAD, 0xD4, 0xA2, 0xAF, 0x9C, 0xA4, 0x72, 0xC0,
                     0xB7, 0xFD, 0x93, 0x26, 0x36, 0x3F, 0xF7, 0xCC, 0x34, 0xA5, 0xE5, 0xF1, 0x71, 0xD8, 0x31, 0x15,
@@ -726,8 +670,8 @@ class Rijndael extends BlockCipher
                     0x70, 0x3E, 0xB5, 0x66, 0x48, 0x03, 0xF6, 0x0E, 0x61, 0x35, 0x57, 0xB9, 0x86, 0xC1, 0x1D, 0x9E,
                     0xE1, 0xF8, 0x98, 0x11, 0x69, 0xD9, 0x8E, 0x94, 0x9B, 0x1E, 0x87, 0xE9, 0xCE, 0x55, 0x28, 0xDF,
                     0x8C, 0xA1, 0x89, 0x0D, 0xBF, 0xE6, 0x42, 0x68, 0x41, 0x99, 0x2D, 0x0F, 0xB0, 0x54, 0xBB, 0x16
-                ]
-            ];
+                )
+            );
         }
         return $tables;
     }
@@ -735,16 +679,17 @@ class Rijndael extends BlockCipher
     /**
      * Provides the inverse mixColumns and inverse sboxes tables
      *
-     * @see self::decryptBlock()
-     * @see self::setupInlineCrypt()
-     * @see self::setupKey()
+     * @see self::_decryptBlock()
+     * @see self::_setupInlineCrypt()
+     * @see self::_setupKey()
+     * @access private
      * @return array &$tables
      */
-    protected function &getInvTables()
+    function &_getInvTables()
     {
         static $tables;
         if (empty($tables)) {
-            $dt3 = array_map('intval', [
+            $dt3 = array_map('intval', array(
                 0xF4A75051, 0x4165537E, 0x17A4C31A, 0x275E963A, 0xAB6BCB3B, 0x9D45F11F, 0xFA58ABAC, 0xE303934B,
                 0x30FA5520, 0x766DF6AD, 0xCC769188, 0x024C25F5, 0xE5D7FC4F, 0x2ACBD7C5, 0x35448026, 0x62A38FB5,
                 0xB15A49DE, 0xBA1B6725, 0xEA0E9845, 0xFEC0E15D, 0x2F7502C3, 0x4CF01281, 0x4697A38D, 0xD3F9C66B,
@@ -777,22 +722,22 @@ class Rijndael extends BlockCipher
                 0xD2DF599C, 0xF2733F55, 0x14CE7918, 0xC737BF73, 0xF7CDEA53, 0xFDAA5B5F, 0x3D6F14DF, 0x44DB8678,
                 0xAFF381CA, 0x68C43EB9, 0x24342C38, 0xA3405FC2, 0x1DC37216, 0xE2250CBC, 0x3C498B28, 0x0D9541FF,
                 0xA8017139, 0x0CB3DE08, 0xB4E49CD8, 0x56C19064, 0xCB84617B, 0x32B670D5, 0x6C5C7448, 0xB85742D0
-            ]);
+            ));
 
             foreach ($dt3 as $dt3i) {
-                $dt0[] = (($dt3i << 24) & intval(0xFF000000)) | (($dt3i >>  8) & 0x00FFFFFF);
-                $dt1[] = (($dt3i << 16) & intval(0xFFFF0000)) | (($dt3i >> 16) & 0x0000FFFF);
-                $dt2[] = (($dt3i <<  8) & intval(0xFFFFFF00)) | (($dt3i >> 24) & 0x000000FF);
+                $dt0[] = (($dt3i << 24) & 0xFF000000) | (($dt3i >>  8) & 0x00FFFFFF);
+                $dt1[] = (($dt3i << 16) & 0xFFFF0000) | (($dt3i >> 16) & 0x0000FFFF);
+                $dt2[] = (($dt3i <<  8) & 0xFFFFFF00) | (($dt3i >> 24) & 0x000000FF);
             };
 
-            $tables = [
+            $tables = array(
                 // The Precomputed inverse mixColumns tables dt0 - dt3
                 $dt0,
                 $dt1,
                 $dt2,
                 $dt3,
                 // The inverse SubByte S-Box
-                [
+                array(
                     0x52, 0x09, 0x6A, 0xD5, 0x30, 0x36, 0xA5, 0x38, 0xBF, 0x40, 0xA3, 0x9E, 0x81, 0xF3, 0xD7, 0xFB,
                     0x7C, 0xE3, 0x39, 0x82, 0x9B, 0x2F, 0xFF, 0x87, 0x34, 0x8E, 0x43, 0x44, 0xC4, 0xDE, 0xE9, 0xCB,
                     0x54, 0x7B, 0x94, 0x32, 0xA6, 0xC2, 0x23, 0x3D, 0xEE, 0x4C, 0x95, 0x0B, 0x42, 0xFA, 0xC3, 0x4E,
@@ -809,8 +754,8 @@ class Rijndael extends BlockCipher
                     0x60, 0x51, 0x7F, 0xA9, 0x19, 0xB5, 0x4A, 0x0D, 0x2D, 0xE5, 0x7A, 0x9F, 0x93, 0xC9, 0x9C, 0xEF,
                     0xA0, 0xE0, 0x3B, 0x4D, 0xAE, 0x2A, 0xF5, 0xB0, 0xC8, 0xEB, 0xBB, 0x3C, 0x83, 0x53, 0x99, 0x61,
                     0x17, 0x2B, 0x04, 0x7E, 0xBA, 0x77, 0xD6, 0x26, 0xE1, 0x69, 0x14, 0x63, 0x55, 0x21, 0x0C, 0x7D
-                ]
-            ];
+                )
+            );
         }
         return $tables;
     }
@@ -818,219 +763,174 @@ class Rijndael extends BlockCipher
     /**
      * Setup the performance-optimized function for de/encrypt()
      *
-     * @see \phpseclib3\Crypt\Common\SymmetricKey::setupInlineCrypt()
+     * @see \phpseclib\Crypt\Base::_setupInlineCrypt()
+     * @access private
      */
-    protected function setupInlineCrypt()
+    function _setupInlineCrypt()
     {
-        $w  = $this->w;
-        $dw = $this->dw;
-        $init_encrypt = '';
-        $init_decrypt = '';
+        // Note: _setupInlineCrypt() will be called only if $this->changed === true
+        // So here we are'nt under the same heavy timing-stress as we are in _de/encryptBlock() or de/encrypt().
+        // However...the here generated function- $code, stored as php callback in $this->inline_crypt, must work as fast as even possible.
 
-        $Nr = $this->Nr;
-        $Nb = $this->Nb;
-        $c  = $this->c;
+        $lambda_functions =& self::_getLambdaFunctions();
 
-        // Generating encrypt code:
-        $init_encrypt .= '
-            if (empty($tables)) {
-                $tables = &$this->getTables();
-            }
-            $t0   = $tables[0];
-            $t1   = $tables[1];
-            $t2   = $tables[2];
-            $t3   = $tables[3];
-            $sbox = $tables[4];
-        ';
+        // We create max. 10 hi-optimized code for memory reason. Means: For each $key one ultra fast inline-crypt function.
+        // (Currently, for Crypt_Rijndael/AES, one generated $lambda_function cost on php5.5@32bit ~80kb unfreeable mem and ~130kb on php5.5@64bit)
+        // After that, we'll still create very fast optimized code but not the hi-ultimative code, for each $mode one.
+        $gen_hi_opt_code = (bool)(count($lambda_functions) < 10);
 
-        $s  = 'e';
-        $e  = 's';
-        $wc = $Nb - 1;
-
-        // Preround: addRoundKey
-        $encrypt_block = '$in = unpack("N*", $in);' . "\n";
-        for ($i = 0; $i < $Nb; ++$i) {
-            $encrypt_block .= '$s' . $i . ' = $in[' . ($i + 1) . '] ^ ' . $w[++$wc] . ";\n";
+        // Generation of a uniqe hash for our generated code
+        $code_hash = "Crypt_Rijndael, {$this->mode}, {$this->Nr}, {$this->Nb}";
+        if ($gen_hi_opt_code) {
+            $code_hash = str_pad($code_hash, 32) . $this->_hashInlineCryptFunction($this->key);
         }
 
-        // Mainrounds: shiftRows + subWord + mixColumns + addRoundKey
-        for ($round = 1; $round < $Nr; ++$round) {
-            list($s, $e) = [$e, $s];
-            for ($i = 0; $i < $Nb; ++$i) {
-                $encrypt_block .=
-                    '$' . $e . $i . ' =
-                    $t0[($' . $s . $i                  . ' >> 24) & 0xff] ^
-                    $t1[($' . $s . (($i + $c[1]) % $Nb) . ' >> 16) & 0xff] ^
-                    $t2[($' . $s . (($i + $c[2]) % $Nb) . ' >>  8) & 0xff] ^
-                    $t3[ $' . $s . (($i + $c[3]) % $Nb) . '        & 0xff] ^
-                    ' . $w[++$wc] . ";\n";
-            }
-        }
-
-        // Finalround: subWord + shiftRows + addRoundKey
-        for ($i = 0; $i < $Nb; ++$i) {
-            $encrypt_block .=
-                '$' . $e . $i . ' =
-                 $sbox[ $' . $e . $i . '        & 0xff]        |
-                ($sbox[($' . $e . $i . ' >>  8) & 0xff] <<  8) |
-                ($sbox[($' . $e . $i . ' >> 16) & 0xff] << 16) |
-                ($sbox[($' . $e . $i . ' >> 24) & 0xff] << 24);' . "\n";
-        }
-        $encrypt_block .= '$in = pack("N*"' . "\n";
-        for ($i = 0; $i < $Nb; ++$i) {
-            $encrypt_block .= ',
-                ($' . $e . $i                  . ' & ' . ((int)0xFF000000) . ') ^
-                ($' . $e . (($i + $c[1]) % $Nb) . ' &         0x00FF0000   ) ^
-                ($' . $e . (($i + $c[2]) % $Nb) . ' &         0x0000FF00   ) ^
-                ($' . $e . (($i + $c[3]) % $Nb) . ' &         0x000000FF   ) ^
-                ' . $w[$i] . "\n";
-        }
-        $encrypt_block .= ');';
-
-        // Generating decrypt code:
-        $init_decrypt .= '
-            if (empty($invtables)) {
-                $invtables = &$this->getInvTables();
-            }
-            $dt0   = $invtables[0];
-            $dt1   = $invtables[1];
-            $dt2   = $invtables[2];
-            $dt3   = $invtables[3];
-            $isbox = $invtables[4];
-        ';
-
-        $s  = 'e';
-        $e  = 's';
-        $wc = $Nb - 1;
-
-        // Preround: addRoundKey
-        $decrypt_block = '$in = unpack("N*", $in);' . "\n";
-        for ($i = 0; $i < $Nb; ++$i) {
-            $decrypt_block .= '$s' . $i . ' = $in[' . ($i + 1) . '] ^ ' . $dw[++$wc] . ';' . "\n";
-        }
-
-        // Mainrounds: shiftRows + subWord + mixColumns + addRoundKey
-        for ($round = 1; $round < $Nr; ++$round) {
-            list($s, $e) = [$e, $s];
-            for ($i = 0; $i < $Nb; ++$i) {
-                $decrypt_block .=
-                    '$' . $e . $i . ' =
-                    $dt0[($' . $s . $i                        . ' >> 24) & 0xff] ^
-                    $dt1[($' . $s . (($Nb + $i - $c[1]) % $Nb) . ' >> 16) & 0xff] ^
-                    $dt2[($' . $s . (($Nb + $i - $c[2]) % $Nb) . ' >>  8) & 0xff] ^
-                    $dt3[ $' . $s . (($Nb + $i - $c[3]) % $Nb) . '        & 0xff] ^
-                    ' . $dw[++$wc] . ";\n";
-            }
-        }
-
-        // Finalround: subWord + shiftRows + addRoundKey
-        for ($i = 0; $i < $Nb; ++$i) {
-            $decrypt_block .=
-                '$' . $e . $i . ' =
-                 $isbox[ $' . $e . $i . '        & 0xff]        |
-                ($isbox[($' . $e . $i . ' >>  8) & 0xff] <<  8) |
-                ($isbox[($' . $e . $i . ' >> 16) & 0xff] << 16) |
-                ($isbox[($' . $e . $i . ' >> 24) & 0xff] << 24);' . "\n";
-        }
-        $decrypt_block .= '$in = pack("N*"' . "\n";
-        for ($i = 0; $i < $Nb; ++$i) {
-            $decrypt_block .= ',
-                ($' . $e . $i .                        ' & ' . ((int)0xFF000000) . ') ^
-                ($' . $e . (($Nb + $i - $c[1]) % $Nb) . ' &         0x00FF0000   ) ^
-                ($' . $e . (($Nb + $i - $c[2]) % $Nb) . ' &         0x0000FF00   ) ^
-                ($' . $e . (($Nb + $i - $c[3]) % $Nb) . ' &         0x000000FF   ) ^
-                ' . $dw[$i] . "\n";
-        }
-        $decrypt_block .= ');';
-
-        $this->inline_crypt = $this->createInlineCryptFunction(
-            [
-               'init_crypt'    => 'static $tables; static $invtables;',
-               'init_encrypt'  => $init_encrypt,
-               'init_decrypt'  => $init_decrypt,
-               'encrypt_block' => $encrypt_block,
-               'decrypt_block' => $decrypt_block
-            ]
-        );
-    }
-
-    /**
-     * Encrypts a message.
-     *
-     * @see self::decrypt()
-     * @see parent::encrypt()
-     * @param string $plaintext
-     * @return string
-     */
-    public function encrypt($plaintext)
-    {
-        $this->setup();
-
-        switch ($this->engine) {
-            case self::ENGINE_LIBSODIUM:
-                $this->newtag = sodium_crypto_aead_aes256gcm_encrypt($plaintext, $this->aad, $this->nonce, $this->key);
-                return Strings::shift($this->newtag, strlen($plaintext));
-            case self::ENGINE_OPENSSL_GCM:
-                return openssl_encrypt(
-                    $plaintext,
-                    'aes-' . $this->getKeyLength() . '-gcm',
-                    $this->key,
-                    OPENSSL_RAW_DATA,
-                    $this->nonce,
-                    $this->newtag,
-                    $this->aad
-                );
-        }
-
-        return parent::encrypt($plaintext);
-    }
-
-    /**
-     * Decrypts a message.
-     *
-     * @see self::encrypt()
-     * @see parent::decrypt()
-     * @param string $ciphertext
-     * @return string
-     */
-    public function decrypt($ciphertext)
-    {
-        $this->setup();
-
-        switch ($this->engine) {
-            case self::ENGINE_LIBSODIUM:
-                if ($this->oldtag === false) {
-                    throw new InsufficientSetupException('Authentication Tag has not been set');
-                }
-                if (strlen($this->oldtag) != 16) {
+        if (!isset($lambda_functions[$code_hash])) {
+            switch (true) {
+                case $gen_hi_opt_code:
+                    // The hi-optimized $lambda_functions will use the key-words hardcoded for better performance.
+                    $w  = $this->w;
+                    $dw = $this->dw;
+                    $init_encrypt = '';
+                    $init_decrypt = '';
                     break;
-                }
-                $plaintext = sodium_crypto_aead_aes256gcm_decrypt($ciphertext . $this->oldtag, $this->aad, $this->nonce, $this->key);
-                if ($plaintext === false) {
-                    $this->oldtag = false;
-                    throw new BadDecryptionException('Error decrypting ciphertext with libsodium');
-                }
-                return $plaintext;
-            case self::ENGINE_OPENSSL_GCM:
-                if ($this->oldtag === false) {
-                    throw new InsufficientSetupException('Authentication Tag has not been set');
-                }
-                $plaintext = openssl_decrypt(
-                    $ciphertext,
-                    'aes-' . $this->getKeyLength() . '-gcm',
-                    $this->key,
-                    OPENSSL_RAW_DATA,
-                    $this->nonce,
-                    $this->oldtag,
-                    $this->aad
-                );
-                if ($plaintext === false) {
-                    $this->oldtag = false;
-                    throw new BadDecryptionException('Error decrypting ciphertext with OpenSSL');
-                }
-                return $plaintext;
-        }
+                default:
+                    for ($i = 0, $cw = count($this->w); $i < $cw; ++$i) {
+                        $w[]  = '$w['  . $i . ']';
+                        $dw[] = '$dw[' . $i . ']';
+                    }
+                    $init_encrypt = '$w  = $self->w;';
+                    $init_decrypt = '$dw = $self->dw;';
+            }
 
-        return parent::decrypt($ciphertext);
+            $Nr = $this->Nr;
+            $Nb = $this->Nb;
+            $c  = $this->c;
+
+            // Generating encrypt code:
+            $init_encrypt.= '
+                static $tables;
+                if (empty($tables)) {
+                    $tables = &$self->_getTables();
+                }
+                $t0   = $tables[0];
+                $t1   = $tables[1];
+                $t2   = $tables[2];
+                $t3   = $tables[3];
+                $sbox = $tables[4];
+            ';
+
+            $s  = 'e';
+            $e  = 's';
+            $wc = $Nb - 1;
+
+            // Preround: addRoundKey
+            $encrypt_block = '$in = unpack("N*", $in);'."\n";
+            for ($i = 0; $i < $Nb; ++$i) {
+                $encrypt_block .= '$s'.$i.' = $in['.($i + 1).'] ^ '.$w[++$wc].";\n";
+            }
+
+            // Mainrounds: shiftRows + subWord + mixColumns + addRoundKey
+            for ($round = 1; $round < $Nr; ++$round) {
+                list($s, $e) = array($e, $s);
+                for ($i = 0; $i < $Nb; ++$i) {
+                    $encrypt_block.=
+                        '$'.$e.$i.' =
+                        $t0[($'.$s.$i                  .' >> 24) & 0xff] ^
+                        $t1[($'.$s.(($i + $c[1]) % $Nb).' >> 16) & 0xff] ^
+                        $t2[($'.$s.(($i + $c[2]) % $Nb).' >>  8) & 0xff] ^
+                        $t3[ $'.$s.(($i + $c[3]) % $Nb).'        & 0xff] ^
+                        '.$w[++$wc].";\n";
+                }
+            }
+
+            // Finalround: subWord + shiftRows + addRoundKey
+            for ($i = 0; $i < $Nb; ++$i) {
+                $encrypt_block.=
+                    '$'.$e.$i.' =
+                     $sbox[ $'.$e.$i.'        & 0xff]        |
+                    ($sbox[($'.$e.$i.' >>  8) & 0xff] <<  8) |
+                    ($sbox[($'.$e.$i.' >> 16) & 0xff] << 16) |
+                    ($sbox[($'.$e.$i.' >> 24) & 0xff] << 24);'."\n";
+            }
+            $encrypt_block .= '$in = pack("N*"'."\n";
+            for ($i = 0; $i < $Nb; ++$i) {
+                $encrypt_block.= ',
+                    ($'.$e.$i                  .' & '.((int)0xFF000000).') ^
+                    ($'.$e.(($i + $c[1]) % $Nb).' &         0x00FF0000   ) ^
+                    ($'.$e.(($i + $c[2]) % $Nb).' &         0x0000FF00   ) ^
+                    ($'.$e.(($i + $c[3]) % $Nb).' &         0x000000FF   ) ^
+                    '.$w[$i]."\n";
+            }
+            $encrypt_block .= ');';
+
+            // Generating decrypt code:
+            $init_decrypt.= '
+                static $invtables;
+                if (empty($invtables)) {
+                    $invtables = &$self->_getInvTables();
+                }
+                $dt0   = $invtables[0];
+                $dt1   = $invtables[1];
+                $dt2   = $invtables[2];
+                $dt3   = $invtables[3];
+                $isbox = $invtables[4];
+            ';
+
+            $s  = 'e';
+            $e  = 's';
+            $wc = $Nb - 1;
+
+            // Preround: addRoundKey
+            $decrypt_block = '$in = unpack("N*", $in);'."\n";
+            for ($i = 0; $i < $Nb; ++$i) {
+                $decrypt_block .= '$s'.$i.' = $in['.($i + 1).'] ^ '.$dw[++$wc].';'."\n";
+            }
+
+            // Mainrounds: shiftRows + subWord + mixColumns + addRoundKey
+            for ($round = 1; $round < $Nr; ++$round) {
+                list($s, $e) = array($e, $s);
+                for ($i = 0; $i < $Nb; ++$i) {
+                    $decrypt_block.=
+                        '$'.$e.$i.' =
+                        $dt0[($'.$s.$i                        .' >> 24) & 0xff] ^
+                        $dt1[($'.$s.(($Nb + $i - $c[1]) % $Nb).' >> 16) & 0xff] ^
+                        $dt2[($'.$s.(($Nb + $i - $c[2]) % $Nb).' >>  8) & 0xff] ^
+                        $dt3[ $'.$s.(($Nb + $i - $c[3]) % $Nb).'        & 0xff] ^
+                        '.$dw[++$wc].";\n";
+                }
+            }
+
+            // Finalround: subWord + shiftRows + addRoundKey
+            for ($i = 0; $i < $Nb; ++$i) {
+                $decrypt_block.=
+                    '$'.$e.$i.' =
+                     $isbox[ $'.$e.$i.'        & 0xff]        |
+                    ($isbox[($'.$e.$i.' >>  8) & 0xff] <<  8) |
+                    ($isbox[($'.$e.$i.' >> 16) & 0xff] << 16) |
+                    ($isbox[($'.$e.$i.' >> 24) & 0xff] << 24);'."\n";
+            }
+            $decrypt_block .= '$in = pack("N*"'."\n";
+            for ($i = 0; $i < $Nb; ++$i) {
+                $decrypt_block.= ',
+                    ($'.$e.$i.                        ' & '.((int)0xFF000000).') ^
+                    ($'.$e.(($Nb + $i - $c[1]) % $Nb).' &         0x00FF0000   ) ^
+                    ($'.$e.(($Nb + $i - $c[2]) % $Nb).' &         0x0000FF00   ) ^
+                    ($'.$e.(($Nb + $i - $c[3]) % $Nb).' &         0x000000FF   ) ^
+                    '.$dw[$i]."\n";
+            }
+            $decrypt_block .= ');';
+
+            $lambda_functions[$code_hash] = $this->_createInlineCryptFunction(
+                array(
+                   'init_crypt'    => '',
+                   'init_encrypt'  => $init_encrypt,
+                   'init_decrypt'  => $init_decrypt,
+                   'encrypt_block' => $encrypt_block,
+                   'decrypt_block' => $decrypt_block
+                )
+            );
+        }
+        $this->inline_crypt = $lambda_functions[$code_hash];
     }
 }
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/Salsa20.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/Salsa20.php
deleted file mode 100644
index 0a35f478..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/Salsa20.php
+++ /dev/null
@@ -1,526 +0,0 @@
-<?php
-
-/**
- * Pure-PHP implementation of Salsa20.
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2019 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\Crypt;
-
-use phpseclib3\Common\Functions\Strings;
-use phpseclib3\Crypt\Common\StreamCipher;
-use phpseclib3\Exception\BadDecryptionException;
-use phpseclib3\Exception\InsufficientSetupException;
-
-/**
- * Pure-PHP implementation of Salsa20.
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-class Salsa20 extends StreamCipher
-{
-    /**
-     * Part 1 of the state
-     *
-     * @var string|false
-     */
-    protected $p1 = false;
-
-    /**
-     * Part 2 of the state
-     *
-     * @var string|false
-     */
-    protected $p2 = false;
-
-    /**
-     * Key Length (in bytes)
-     *
-     * @var int
-     */
-    protected $key_length = 32; // = 256 bits
-
-    /**
-     * @see \phpseclib3\Crypt\Salsa20::crypt()
-     */
-    const ENCRYPT = 0;
-
-    /**
-     * @see \phpseclib3\Crypt\Salsa20::crypt()
-     */
-    const DECRYPT = 1;
-
-    /**
-     * Encryption buffer for continuous mode
-     *
-     * @var array
-     */
-    protected $enbuffer;
-
-    /**
-     * Decryption buffer for continuous mode
-     *
-     * @var array
-     */
-    protected $debuffer;
-
-    /**
-     * Counter
-     *
-     * @var int
-     */
-    protected $counter = 0;
-
-    /**
-     * Using Generated Poly1305 Key
-     *
-     * @var boolean
-     */
-    protected $usingGeneratedPoly1305Key = false;
-
-    /**
-     * Salsa20 uses a nonce
-     *
-     * @return bool
-     */
-    public function usesNonce()
-    {
-        return true;
-    }
-
-    /**
-     * Sets the key.
-     *
-     * @param string $key
-     * @throws \LengthException if the key length isn't supported
-     */
-    public function setKey($key)
-    {
-        switch (strlen($key)) {
-            case 16:
-            case 32:
-                break;
-            default:
-                throw new \LengthException('Key of size ' . strlen($key) . ' not supported by this algorithm. Only keys of sizes 16 or 32 are supported');
-        }
-
-        parent::setKey($key);
-    }
-
-    /**
-     * Sets the nonce.
-     *
-     * @param string $nonce
-     */
-    public function setNonce($nonce)
-    {
-        if (strlen($nonce) != 8) {
-            throw new \LengthException('Nonce of size ' . strlen($key) . ' not supported by this algorithm. Only an 64-bit nonce is supported');
-        }
-
-        $this->nonce = $nonce;
-        $this->changed = true;
-        $this->setEngine();
-    }
-
-    /**
-     * Sets the counter.
-     *
-     * @param int $counter
-     */
-    public function setCounter($counter)
-    {
-        $this->counter = $counter;
-        $this->setEngine();
-    }
-
-    /**
-     * Creates a Poly1305 key using the method discussed in RFC8439
-     *
-     * See https://tools.ietf.org/html/rfc8439#section-2.6.1
-     */
-    protected function createPoly1305Key()
-    {
-        if ($this->nonce === false) {
-            throw new InsufficientSetupException('No nonce has been defined');
-        }
-
-        if ($this->key === false) {
-            throw new InsufficientSetupException('No key has been defined');
-        }
-
-        $c = clone $this;
-        $c->setCounter(0);
-        $c->usePoly1305 = false;
-        $block = $c->encrypt(str_repeat("\0", 256));
-        $this->setPoly1305Key(substr($block, 0, 32));
-
-        if ($this->counter == 0) {
-            $this->counter++;
-        }
-    }
-
-    /**
-     * Setup the self::ENGINE_INTERNAL $engine
-     *
-     * (re)init, if necessary, the internal cipher $engine
-     *
-     * _setup() will be called each time if $changed === true
-     * typically this happens when using one or more of following public methods:
-     *
-     * - setKey()
-     *
-     * - setNonce()
-     *
-     * - First run of encrypt() / decrypt() with no init-settings
-     *
-     * @see self::setKey()
-     * @see self::setNonce()
-     * @see self::disableContinuousBuffer()
-     */
-    protected function setup()
-    {
-        if (!$this->changed) {
-            return;
-        }
-
-        $this->enbuffer = $this->debuffer = ['ciphertext' => '', 'counter' => $this->counter];
-
-        $this->changed = $this->nonIVChanged = false;
-
-        if ($this->nonce === false) {
-            throw new InsufficientSetupException('No nonce has been defined');
-        }
-
-        if ($this->key === false) {
-            throw new InsufficientSetupException('No key has been defined');
-        }
-
-        if ($this->usePoly1305 && !isset($this->poly1305Key)) {
-            $this->usingGeneratedPoly1305Key = true;
-            $this->createPoly1305Key();
-        }
-
-        $key = $this->key;
-        if (strlen($key) == 16) {
-            $constant = 'expand 16-byte k';
-            $key .= $key;
-        } else {
-            $constant = 'expand 32-byte k';
-        }
-
-        $this->p1 = substr($constant, 0, 4) .
-                    substr($key, 0, 16) .
-                    substr($constant, 4, 4) .
-                    $this->nonce .
-                    "\0\0\0\0";
-        $this->p2 = substr($constant, 8, 4) .
-                    substr($key, 16, 16) .
-                    substr($constant, 12, 4);
-    }
-
-    /**
-     * Setup the key (expansion)
-     */
-    protected function setupKey()
-    {
-        // Salsa20 does not utilize this method
-    }
-
-    /**
-     * Encrypts a message.
-     *
-     * @see \phpseclib3\Crypt\Common\SymmetricKey::decrypt()
-     * @see self::crypt()
-     * @param string $plaintext
-     * @return string $ciphertext
-     */
-    public function encrypt($plaintext)
-    {
-        $ciphertext = $this->crypt($plaintext, self::ENCRYPT);
-        if (isset($this->poly1305Key)) {
-            $this->newtag = $this->poly1305($ciphertext);
-        }
-        return $ciphertext;
-    }
-
-    /**
-     * Decrypts a message.
-     *
-     * $this->decrypt($this->encrypt($plaintext)) == $this->encrypt($this->encrypt($plaintext)).
-     * At least if the continuous buffer is disabled.
-     *
-     * @see \phpseclib3\Crypt\Common\SymmetricKey::encrypt()
-     * @see self::crypt()
-     * @param string $ciphertext
-     * @return string $plaintext
-     */
-    public function decrypt($ciphertext)
-    {
-        if (isset($this->poly1305Key)) {
-            if ($this->oldtag === false) {
-                throw new InsufficientSetupException('Authentication Tag has not been set');
-            }
-            $newtag = $this->poly1305($ciphertext);
-            if ($this->oldtag != substr($newtag, 0, strlen($this->oldtag))) {
-                $this->oldtag = false;
-                throw new BadDecryptionException('Derived authentication tag and supplied authentication tag do not match');
-            }
-            $this->oldtag = false;
-        }
-
-        return $this->crypt($ciphertext, self::DECRYPT);
-    }
-
-    /**
-     * Encrypts a block
-     *
-     * @param string $in
-     */
-    protected function encryptBlock($in)
-    {
-        // Salsa20 does not utilize this method
-    }
-
-    /**
-     * Decrypts a block
-     *
-     * @param string $in
-     */
-    protected function decryptBlock($in)
-    {
-        // Salsa20 does not utilize this method
-    }
-
-    /**
-     * Encrypts or decrypts a message.
-     *
-     * @see self::encrypt()
-     * @see self::decrypt()
-     * @param string $text
-     * @param int $mode
-     * @return string $text
-     */
-    private function crypt($text, $mode)
-    {
-        $this->setup();
-        if (!$this->continuousBuffer) {
-            if ($this->engine == self::ENGINE_OPENSSL) {
-                $iv = pack('V', $this->counter) . $this->p2;
-                return openssl_encrypt(
-                    $text,
-                    $this->cipher_name_openssl,
-                    $this->key,
-                    OPENSSL_RAW_DATA,
-                    $iv
-                );
-            }
-            $i = $this->counter;
-            $blocks = str_split($text, 64);
-            foreach ($blocks as &$block) {
-                $block ^= static::salsa20($this->p1 . pack('V', $i++) . $this->p2);
-            }
-
-            return implode('', $blocks);
-        }
-
-        if ($mode == self::ENCRYPT) {
-            $buffer = &$this->enbuffer;
-        } else {
-            $buffer = &$this->debuffer;
-        }
-        if (!strlen($buffer['ciphertext'])) {
-            $ciphertext = '';
-        } else {
-            $ciphertext = $text ^ Strings::shift($buffer['ciphertext'], strlen($text));
-            $text = substr($text, strlen($ciphertext));
-            if (!strlen($text)) {
-                return $ciphertext;
-            }
-        }
-
-        $overflow = strlen($text) % 64; // & 0x3F
-        if ($overflow) {
-            $text2 = Strings::pop($text, $overflow);
-            if ($this->engine == self::ENGINE_OPENSSL) {
-                $iv = pack('V', $buffer['counter']) . $this->p2;
-                // at this point $text should be a multiple of 64
-                $buffer['counter'] += (strlen($text) >> 6) + 1; // ie. divide by 64
-                $encrypted = openssl_encrypt(
-                    $text . str_repeat("\0", 64),
-                    $this->cipher_name_openssl,
-                    $this->key,
-                    OPENSSL_RAW_DATA,
-                    $iv
-                );
-                $temp = Strings::pop($encrypted, 64);
-            } else {
-                $blocks = str_split($text, 64);
-                if (strlen($text)) {
-                    foreach ($blocks as &$block) {
-                        $block ^= static::salsa20($this->p1 . pack('V', $buffer['counter']++) . $this->p2);
-                    }
-                }
-                $encrypted = implode('', $blocks);
-                $temp = static::salsa20($this->p1 . pack('V', $buffer['counter']++) . $this->p2);
-            }
-            $ciphertext .= $encrypted . ($text2 ^ $temp);
-            $buffer['ciphertext'] = substr($temp, $overflow);
-        } elseif (!strlen($buffer['ciphertext'])) {
-            if ($this->engine == self::ENGINE_OPENSSL) {
-                $iv = pack('V', $buffer['counter']) . $this->p2;
-                $buffer['counter'] += (strlen($text) >> 6);
-                $ciphertext .= openssl_encrypt(
-                    $text,
-                    $this->cipher_name_openssl,
-                    $this->key,
-                    OPENSSL_RAW_DATA,
-                    $iv
-                );
-            } else {
-                $blocks = str_split($text, 64);
-                foreach ($blocks as &$block) {
-                    $block ^= static::salsa20($this->p1 . pack('V', $buffer['counter']++) . $this->p2);
-                }
-                $ciphertext .= implode('', $blocks);
-            }
-        }
-
-        return $ciphertext;
-    }
-
-    /**
-     * Left Rotate
-     *
-     * @param int $x
-     * @param int $n
-     * @return int
-     */
-    protected static function leftRotate($x, $n)
-    {
-        if (PHP_INT_SIZE == 8) {
-            $r1 = $x << $n;
-            $r1 &= 0xFFFFFFFF;
-            $r2 = ($x & 0xFFFFFFFF) >> (32 - $n);
-        } else {
-            $x = (int) $x;
-            $r1 = $x << $n;
-            $r2 = $x >> (32 - $n);
-            $r2 &= (1 << $n) - 1;
-        }
-        return $r1 | $r2;
-    }
-
-    /**
-     * The quarterround function
-     *
-     * @param int $a
-     * @param int $b
-     * @param int $c
-     * @param int $d
-     */
-    protected static function quarterRound(&$a, &$b, &$c, &$d)
-    {
-        $b ^= self::leftRotate($a + $d, 7);
-        $c ^= self::leftRotate($b + $a, 9);
-        $d ^= self::leftRotate($c + $b, 13);
-        $a ^= self::leftRotate($d + $c, 18);
-    }
-
-    /**
-     * The doubleround function
-     *
-     * @param int $x0 (by reference)
-     * @param int $x1 (by reference)
-     * @param int $x2 (by reference)
-     * @param int $x3 (by reference)
-     * @param int $x4 (by reference)
-     * @param int $x5 (by reference)
-     * @param int $x6 (by reference)
-     * @param int $x7 (by reference)
-     * @param int $x8 (by reference)
-     * @param int $x9 (by reference)
-     * @param int $x10 (by reference)
-     * @param int $x11 (by reference)
-     * @param int $x12 (by reference)
-     * @param int $x13 (by reference)
-     * @param int $x14 (by reference)
-     * @param int $x15 (by reference)
-     */
-    protected static function doubleRound(&$x0, &$x1, &$x2, &$x3, &$x4, &$x5, &$x6, &$x7, &$x8, &$x9, &$x10, &$x11, &$x12, &$x13, &$x14, &$x15)
-    {
-        // columnRound
-        static::quarterRound($x0, $x4, $x8, $x12);
-        static::quarterRound($x5, $x9, $x13, $x1);
-        static::quarterRound($x10, $x14, $x2, $x6);
-        static::quarterRound($x15, $x3, $x7, $x11);
-        // rowRound
-        static::quarterRound($x0, $x1, $x2, $x3);
-        static::quarterRound($x5, $x6, $x7, $x4);
-        static::quarterRound($x10, $x11, $x8, $x9);
-        static::quarterRound($x15, $x12, $x13, $x14);
-    }
-
-    /**
-     * The Salsa20 hash function function
-     *
-     * @param string $x
-     */
-    protected static function salsa20($x)
-    {
-        $z = $x = unpack('V*', $x);
-        for ($i = 0; $i < 10; $i++) {
-            static::doubleRound($z[1], $z[2], $z[3], $z[4], $z[5], $z[6], $z[7], $z[8], $z[9], $z[10], $z[11], $z[12], $z[13], $z[14], $z[15], $z[16]);
-        }
-
-        for ($i = 1; $i <= 16; $i++) {
-            $x[$i] += $z[$i];
-        }
-
-        return pack('V*', ...$x);
-    }
-
-    /**
-     * Calculates Poly1305 MAC
-     *
-     * @see self::decrypt()
-     * @see self::encrypt()
-     * @param string $ciphertext
-     * @return string
-     */
-    protected function poly1305($ciphertext)
-    {
-        if (!$this->usingGeneratedPoly1305Key) {
-            return parent::poly1305($this->aad . $ciphertext);
-        } else {
-            /*
-            sodium_crypto_aead_chacha20poly1305_encrypt does not calculate the poly1305 tag
-            the same way sodium_crypto_aead_chacha20poly1305_ietf_encrypt does. you can see
-            how the latter encrypts it in Salsa20::encrypt(). here's how the former encrypts
-            it:
-
-            $this->newtag = $this->poly1305(
-                $this->aad .
-                pack('V', strlen($this->aad)) . "\0\0\0\0" .
-                $ciphertext .
-                pack('V', strlen($ciphertext)) . "\0\0\0\0"
-            );
-
-            phpseclib opts to use the IETF construction, even when the nonce is 64-bits
-            instead of 96-bits
-            */
-            return parent::poly1305(
-                self::nullPad128($this->aad) .
-                self::nullPad128($ciphertext) .
-                pack('V', strlen($this->aad)) . "\0\0\0\0" .
-                pack('V', strlen($ciphertext)) . "\0\0\0\0"
-            );
-        }
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/TripleDES.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/TripleDES.php
index 1ff5ed02..a2c41668 100644
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/TripleDES.php
+++ b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/TripleDES.php
@@ -12,7 +12,7 @@
  * <?php
  *    include 'vendor/autoload.php';
  *
- *    $des = new \phpseclib3\Crypt\TripleDES('ctr');
+ *    $des = new \phpseclib\Crypt\TripleDES();
  *
  *    $des->setKey('abcdefghijklmnopqrstuvwx');
  *
@@ -26,18 +26,22 @@
  * ?>
  * </code>
  *
+ * @category  Crypt
+ * @package   TripleDES
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2007 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
  * @link      http://phpseclib.sourceforge.net
  */
 
-namespace phpseclib3\Crypt;
+namespace phpseclib\Crypt;
 
 /**
  * Pure-PHP implementation of Triple DES.
  *
+ * @package TripleDES
  * @author  Jim Wigginton <terrafrost@php.net>
+ * @access  public
  */
 class TripleDES extends DES
 {
@@ -51,148 +55,161 @@ class TripleDES extends DES
     /**
      * Encrypt / decrypt using outer chaining
      *
-     * Outer chaining is used by SSH-2 and when the mode is set to \phpseclib3\Crypt\Common\BlockCipher::MODE_CBC.
+     * Outer chaining is used by SSH-2 and when the mode is set to \phpseclib\Crypt\Base::MODE_CBC.
      */
-    const MODE_CBC3 = self::MODE_CBC;
+    const MODE_CBC3 = Base::MODE_CBC;
 
     /**
      * Key Length (in bytes)
      *
-     * @see \phpseclib3\Crypt\TripleDES::setKeyLength()
+     * @see \phpseclib\Crypt\TripleDES::setKeyLength()
      * @var int
+     * @access private
      */
-    protected $key_length = 24;
+    var $key_length = 24;
+
+    /**
+     * The default salt used by setPassword()
+     *
+     * @see \phpseclib\Crypt\Base::password_default_salt
+     * @see \phpseclib\Crypt\Base::setPassword()
+     * @var string
+     * @access private
+     */
+    var $password_default_salt = 'phpseclib';
 
     /**
      * The mcrypt specific name of the cipher
      *
-     * @see \phpseclib3\Crypt\DES::cipher_name_mcrypt
-     * @see \phpseclib3\Crypt\Common\SymmetricKey::cipher_name_mcrypt
+     * @see \phpseclib\Crypt\DES::cipher_name_mcrypt
+     * @see \phpseclib\Crypt\Base::cipher_name_mcrypt
      * @var string
+     * @access private
      */
-    protected $cipher_name_mcrypt = 'tripledes';
+    var $cipher_name_mcrypt = 'tripledes';
 
     /**
      * Optimizing value while CFB-encrypting
      *
-     * @see \phpseclib3\Crypt\Common\SymmetricKey::cfb_init_len
+     * @see \phpseclib\Crypt\Base::cfb_init_len
      * @var int
+     * @access private
      */
-    protected $cfb_init_len = 750;
+    var $cfb_init_len = 750;
 
     /**
      * max possible size of $key
      *
      * @see self::setKey()
-     * @see \phpseclib3\Crypt\DES::setKey()
+     * @see \phpseclib\Crypt\DES::setKey()
      * @var string
+     * @access private
      */
-    protected $key_length_max = 24;
+    var $key_length_max = 24;
 
     /**
      * Internal flag whether using self::MODE_3CBC or not
      *
      * @var bool
+     * @access private
      */
-    private $mode_3cbc;
+    var $mode_3cbc;
 
     /**
-     * The \phpseclib3\Crypt\DES objects
+     * The \phpseclib\Crypt\DES objects
      *
      * Used only if $mode_3cbc === true
      *
      * @var array
+     * @access private
      */
-    private $des;
+    var $des;
 
     /**
      * Default Constructor.
      *
-     * Determines whether or not the mcrypt or OpenSSL extensions should be used.
+     * Determines whether or not the mcrypt extension should be used.
      *
      * $mode could be:
      *
-     * - ecb
+     * - \phpseclib\Crypt\Base::MODE_ECB
      *
-     * - cbc
+     * - \phpseclib\Crypt\Base::MODE_CBC
      *
-     * - ctr
+     * - \phpseclib\Crypt\Base::MODE_CTR
      *
-     * - cfb
+     * - \phpseclib\Crypt\Base::MODE_CFB
      *
-     * - ofb
+     * - \phpseclib\Crypt\Base::MODE_OFB
      *
-     * - 3cbc
+     * - \phpseclib\Crypt\TripleDES::MODE_3CBC
      *
-     * - cbc3 (same as cbc)
+     * If not explicitly set, \phpseclib\Crypt\Base::MODE_CBC will be used.
      *
-     * @see \phpseclib3\Crypt\DES::__construct()
-     * @see \phpseclib3\Crypt\Common\SymmetricKey::__construct()
-     * @param string $mode
+     * @see \phpseclib\Crypt\DES::__construct()
+     * @see \phpseclib\Crypt\Base::__construct()
+     * @param int $mode
+     * @access public
      */
-    public function __construct($mode)
+    function __construct($mode = Base::MODE_CBC)
     {
-        switch (strtolower($mode)) {
+        switch ($mode) {
             // In case of self::MODE_3CBC, we init as CRYPT_DES_MODE_CBC
             // and additional flag us internally as 3CBC
-            case '3cbc':
-                parent::__construct('cbc');
+            case self::MODE_3CBC:
+                parent::__construct(Base::MODE_CBC);
                 $this->mode_3cbc = true;
 
                 // This three $des'es will do the 3CBC work (if $key > 64bits)
-                $this->des = [
-                    new DES('cbc'),
-                    new DES('cbc'),
-                    new DES('cbc'),
-                ];
+                $this->des = array(
+                    new DES(Base::MODE_CBC),
+                    new DES(Base::MODE_CBC),
+                    new DES(Base::MODE_CBC),
+                );
 
-                // we're going to be doing the padding, ourselves, so disable it in the \phpseclib3\Crypt\DES objects
+                // we're going to be doing the padding, ourselves, so disable it in the \phpseclib\Crypt\DES objects
                 $this->des[0]->disablePadding();
                 $this->des[1]->disablePadding();
                 $this->des[2]->disablePadding();
                 break;
-            case 'cbc3':
-                $mode = 'cbc';
-                // fall-through
             // If not 3CBC, we init as usual
             default:
                 parent::__construct($mode);
-
-                if ($this->mode == self::MODE_STREAM) {
-                    throw new BadModeException('Block ciphers cannot be ran in stream mode');
-                }
         }
     }
 
     /**
      * Test for engine validity
      *
-     * This is mainly just a wrapper to set things up for \phpseclib3\Crypt\Common\SymmetricKey::isValidEngine()
+     * This is mainly just a wrapper to set things up for \phpseclib\Crypt\Base::isValidEngine()
      *
-     * @see \phpseclib3\Crypt\Common\SymmetricKey::__construct()
+     * @see \phpseclib\Crypt\Base::__construct()
      * @param int $engine
+     * @access public
      * @return bool
      */
-    protected function isValidEngineHelper($engine)
+    function isValidEngine($engine)
     {
         if ($engine == self::ENGINE_OPENSSL) {
             $this->cipher_name_openssl_ecb = 'des-ede3';
-            $mode = $this->openssl_translate_mode();
+            $mode = $this->_openssl_translate_mode();
             $this->cipher_name_openssl = $mode == 'ecb' ? 'des-ede3' : 'des-ede3-' . $mode;
         }
 
-        return parent::isValidEngineHelper($engine);
+        return parent::isValidEngine($engine);
     }
 
     /**
-     * Sets the initialization vector.
+     * Sets the initialization vector. (optional)
      *
-     * SetIV is not required when \phpseclib3\Crypt\Common\SymmetricKey::MODE_ECB is being used.
+     * SetIV is not required when \phpseclib\Crypt\Base::MODE_ECB is being used.  If not explicitly set, it'll be assumed
+     * to be all zero's.
      *
-     * @see \phpseclib3\Crypt\Common\SymmetricKey::setIV()
+     * @see \phpseclib\Crypt\Base::setIV()
+     * @access public
      * @param string $iv
      */
-    public function setIV($iv)
+    function setIV($iv)
     {
         parent::setIV($iv);
         if ($this->mode_3cbc) {
@@ -205,22 +222,24 @@ class TripleDES extends DES
     /**
      * Sets the key length.
      *
-     * Valid key lengths are 128 and 192 bits.
+     * Valid key lengths are 64, 128 and 192
      *
-     * If you want to use a 64-bit key use DES.php
-     *
-     * @see \phpseclib3\Crypt\Common\SymmetricKey:setKeyLength()
-     * @throws \LengthException if the key length is invalid
+     * @see \phpseclib\Crypt\Base:setKeyLength()
+     * @access public
      * @param int $length
      */
-    public function setKeyLength($length)
+    function setKeyLength($length)
     {
-        switch ($length) {
-            case 128:
-            case 192:
+        $length >>= 3;
+        switch (true) {
+            case $length <= 8:
+                $this->key_length = 8;
+                break;
+            case $length <= 16:
+                $this->key_length = 16;
                 break;
             default:
-                throw new \LengthException('Key size of ' . $length . ' bits is not supported by this algorithm. Only keys of sizes 128 or 192 bits are supported');
+                $this->key_length = 24;
         }
 
         parent::setKeyLength($length);
@@ -229,40 +248,38 @@ class TripleDES extends DES
     /**
      * Sets the key.
      *
-     * Triple DES can use 128-bit (eg. strlen($key) == 16) or 192-bit (eg. strlen($key) == 24) keys.
+     * Keys can be of any length.  Triple DES, itself, can use 128-bit (eg. strlen($key) == 16) or
+     * 192-bit (eg. strlen($key) == 24) keys.  This function pads and truncates $key as appropriate.
      *
      * DES also requires that every eighth bit be a parity bit, however, we'll ignore that.
      *
-     * @see \phpseclib3\Crypt\DES::setKey()
-     * @see \phpseclib3\Crypt\Common\SymmetricKey::setKey()
-     * @throws \LengthException if the key length is invalid
+     * If the key is not explicitly set, it'll be assumed to be all null bytes.
+     *
+     * @access public
+     * @see \phpseclib\Crypt\DES::setKey()
+     * @see \phpseclib\Crypt\Base::setKey()
      * @param string $key
      */
-    public function setKey($key)
+    function setKey($key)
     {
-        if ($this->explicit_key_length !== false && strlen($key) != $this->explicit_key_length) {
-            throw new \LengthException('Key length has already been set to ' . $this->explicit_key_length . ' bytes and this key is ' . strlen($key) . ' bytes');
+        $length = $this->explicit_key_length ? $this->key_length : strlen($key);
+        if ($length > 8) {
+            $key = str_pad(substr($key, 0, 24), 24, chr(0));
+            // if $key is between 64 and 128-bits, use the first 64-bits as the last, per this:
+            // http://php.net/function.mcrypt-encrypt#47973
+            $key = $length <= 16 ? substr_replace($key, substr($key, 0, 8), 16) : substr($key, 0, 24);
+        } else {
+            $key = str_pad($key, 8, chr(0));
         }
+        parent::setKey($key);
 
-        switch (strlen($key)) {
-            case 16:
-                $key .= substr($key, 0, 8);
-                break;
-            case 24:
-                break;
-            default:
-                throw new \LengthException('Key of size ' . strlen($key) . ' not supported by this algorithm. Only keys of sizes 16 or 24 are supported');
-        }
-
-        // copied from self::setKey()
-        $this->key = $key;
-        $this->key_length = strlen($key);
-        $this->changed = $this->nonIVChanged = true;
-        $this->setEngine();
-
-        if ($this->mode_3cbc) {
-            $this->des[0]->setKey(substr($key, 0, 8));
-            $this->des[1]->setKey(substr($key, 8, 8));
+        // And in case of self::MODE_3CBC:
+        // if key <= 64bits we not need the 3 $des to work,
+        // because we will then act as regular DES-CBC with just a <= 64bit key.
+        // So only if the key > 64bits (> 8 bytes) we will call setKey() for the 3 $des.
+        if ($this->mode_3cbc && $length > 8) {
+            $this->des[0]->setKey(substr($key,  0, 8));
+            $this->des[1]->setKey(substr($key,  8, 8));
             $this->des[2]->setKey(substr($key, 16, 8));
         }
     }
@@ -270,11 +287,12 @@ class TripleDES extends DES
     /**
      * Encrypts a message.
      *
-     * @see \phpseclib3\Crypt\Common\SymmetricKey::encrypt()
+     * @see \phpseclib\Crypt\Base::encrypt()
+     * @access public
      * @param string $plaintext
      * @return string $cipertext
      */
-    public function encrypt($plaintext)
+    function encrypt($plaintext)
     {
         // parent::en/decrypt() is able to do all the work for all modes and keylengths,
         // except for: self::MODE_3CBC (inner chaining CBC) with a key > 64bits
@@ -284,7 +302,7 @@ class TripleDES extends DES
             return $this->des[2]->encrypt(
                 $this->des[1]->decrypt(
                     $this->des[0]->encrypt(
-                        $this->pad($plaintext)
+                        $this->_pad($plaintext)
                     )
                 )
             );
@@ -296,14 +314,15 @@ class TripleDES extends DES
     /**
      * Decrypts a message.
      *
-     * @see \phpseclib3\Crypt\Common\SymmetricKey::decrypt()
+     * @see \phpseclib\Crypt\Base::decrypt()
+     * @access public
      * @param string $ciphertext
      * @return string $plaintext
      */
-    public function decrypt($ciphertext)
+    function decrypt($ciphertext)
     {
         if ($this->mode_3cbc && strlen($this->key) > 8) {
-            return $this->unpad(
+            return $this->_unpad(
                 $this->des[0]->decrypt(
                     $this->des[1]->encrypt(
                         $this->des[2]->decrypt(
@@ -346,15 +365,16 @@ class TripleDES extends DES
      * outputs.  The reason is due to the fact that the initialization vector's change after every encryption /
      * decryption round when the continuous buffer is enabled.  When it's disabled, they remain constant.
      *
-     * Put another way, when the continuous buffer is enabled, the state of the \phpseclib3\Crypt\DES() object changes after each
+     * Put another way, when the continuous buffer is enabled, the state of the \phpseclib\Crypt\DES() object changes after each
      * encryption / decryption round, whereas otherwise, it'd remain constant.  For this reason, it's recommended that
      * continuous buffers not be used.  They do offer better security and are, in fact, sometimes required (SSH uses them),
      * however, they are also less intuitive and more likely to cause you problems.
      *
-     * @see \phpseclib3\Crypt\Common\SymmetricKey::enableContinuousBuffer()
+     * @see \phpseclib\Crypt\Base::enableContinuousBuffer()
      * @see self::disableContinuousBuffer()
+     * @access public
      */
-    public function enableContinuousBuffer()
+    function enableContinuousBuffer()
     {
         parent::enableContinuousBuffer();
         if ($this->mode_3cbc) {
@@ -369,10 +389,11 @@ class TripleDES extends DES
      *
      * The default behavior.
      *
-     * @see \phpseclib3\Crypt\Common\SymmetricKey::disableContinuousBuffer()
+     * @see \phpseclib\Crypt\Base::disableContinuousBuffer()
      * @see self::enableContinuousBuffer()
+     * @access public
      */
-    public function disableContinuousBuffer()
+    function disableContinuousBuffer()
     {
         parent::disableContinuousBuffer();
         if ($this->mode_3cbc) {
@@ -385,10 +406,11 @@ class TripleDES extends DES
     /**
      * Creates the key schedule
      *
-     * @see \phpseclib3\Crypt\DES::setupKey()
-     * @see \phpseclib3\Crypt\Common\SymmetricKey::setupKey()
+     * @see \phpseclib\Crypt\DES::_setupKey()
+     * @see \phpseclib\Crypt\Base::_setupKey()
+     * @access private
      */
-    protected function setupKey()
+    function _setupKey()
     {
         switch (true) {
             // if $key <= 64bits we configure our internal pure-php cipher engine
@@ -403,27 +425,29 @@ class TripleDES extends DES
 
                 // (only) if 3CBC is used we have, of course, to setup the $des[0-2] keys also separately.
                 if ($this->mode_3cbc) {
-                    $this->des[0]->setupKey();
-                    $this->des[1]->setupKey();
-                    $this->des[2]->setupKey();
+                    $this->des[0]->_setupKey();
+                    $this->des[1]->_setupKey();
+                    $this->des[2]->_setupKey();
 
                     // because $des[0-2] will, now, do all the work we can return here
-                    // not need unnecessary stress parent::setupKey() with our, now unused, $key.
+                    // not need unnecessary stress parent::_setupKey() with our, now unused, $key.
                     return;
                 }
         }
         // setup our key
-        parent::setupKey();
+        parent::_setupKey();
     }
 
     /**
      * Sets the internal crypt engine
      *
-     * @see \phpseclib3\Crypt\Common\SymmetricKey::__construct()
-     * @see \phpseclib3\Crypt\Common\SymmetricKey::setPreferredEngine()
+     * @see \phpseclib\Crypt\Base::__construct()
+     * @see \phpseclib\Crypt\Base::setPreferredEngine()
      * @param int $engine
+     * @access public
+     * @return int
      */
-    public function setPreferredEngine($engine)
+    function setPreferredEngine($engine)
     {
         if ($this->mode_3cbc) {
             $this->des[0]->setPreferredEngine($engine);
@@ -431,6 +455,6 @@ class TripleDES extends DES
             $this->des[2]->setPreferredEngine($engine);
         }
 
-        parent::setPreferredEngine($engine);
+        return parent::setPreferredEngine($engine);
     }
 }
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/Twofish.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/Twofish.php
index bf765632..3dd4ea1d 100644
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/Twofish.php
+++ b/securemail/vendor/phpseclib/phpseclib/phpseclib/Crypt/Twofish.php
@@ -16,7 +16,7 @@
  * <?php
  *    include 'vendor/autoload.php';
  *
- *    $twofish = new \phpseclib3\Crypt\Twofish('ctr');
+ *    $twofish = new \phpseclib\Crypt\Twofish();
  *
  *    $twofish->setKey('12345678901234567890123456789012');
  *
@@ -26,6 +26,8 @@
  * ?>
  * </code>
  *
+ * @category  Crypt
+ * @package   Twofish
  * @author    Jim Wigginton <terrafrost@php.net>
  * @author    Hans-Juergen Petrich <petrich@tronic-media.com>
  * @copyright 2007 Jim Wigginton
@@ -33,41 +35,43 @@
  * @link      http://phpseclib.sourceforge.net
  */
 
-namespace phpseclib3\Crypt;
-
-use phpseclib3\Crypt\Common\BlockCipher;
-use phpseclib3\Exception\BadModeException;
+namespace phpseclib\Crypt;
 
 /**
  * Pure-PHP implementation of Twofish.
  *
+ * @package Twofish
  * @author  Jim Wigginton <terrafrost@php.net>
  * @author  Hans-Juergen Petrich <petrich@tronic-media.com>
+ * @access  public
  */
-class Twofish extends BlockCipher
+class Twofish extends Base
 {
     /**
      * The mcrypt specific name of the cipher
      *
-     * @see \phpseclib3\Crypt\Common\SymmetricKey::cipher_name_mcrypt
+     * @see \phpseclib\Crypt\Base::cipher_name_mcrypt
      * @var string
+     * @access private
      */
-    protected $cipher_name_mcrypt = 'twofish';
+    var $cipher_name_mcrypt = 'twofish';
 
     /**
      * Optimizing value while CFB-encrypting
      *
-     * @see \phpseclib3\Crypt\Common\SymmetricKey::cfb_init_len
+     * @see \phpseclib\Crypt\Base::cfb_init_len
      * @var int
+     * @access private
      */
-    protected $cfb_init_len = 800;
+    var $cfb_init_len = 800;
 
     /**
      * Q-Table
      *
      * @var array
+     * @access private
      */
-    private static $q0 = [
+    var $q0 = array(
         0xA9, 0x67, 0xB3, 0xE8, 0x04, 0xFD, 0xA3, 0x76,
         0x9A, 0x92, 0x80, 0x78, 0xE4, 0xDD, 0xD1, 0x38,
         0x0D, 0xC6, 0x35, 0x98, 0x18, 0xF7, 0xEC, 0x6C,
@@ -100,14 +104,15 @@ class Twofish extends BlockCipher
         0xC8, 0xA8, 0x2B, 0x40, 0xDC, 0xFE, 0x32, 0xA4,
         0xCA, 0x10, 0x21, 0xF0, 0xD3, 0x5D, 0x0F, 0x00,
         0x6F, 0x9D, 0x36, 0x42, 0x4A, 0x5E, 0xC1, 0xE0
-    ];
+    );
 
     /**
      * Q-Table
      *
      * @var array
+     * @access private
      */
-    private static $q1 = [
+    var $q1 = array(
         0x75, 0xF3, 0xC6, 0xF4, 0xDB, 0x7B, 0xFB, 0xC8,
         0x4A, 0xD3, 0xE6, 0x6B, 0x45, 0x7D, 0xE8, 0x4B,
         0xD6, 0x32, 0xD8, 0xFD, 0x37, 0x71, 0xF1, 0xE1,
@@ -140,14 +145,15 @@ class Twofish extends BlockCipher
         0x12, 0xA2, 0x0D, 0x52, 0xBB, 0x02, 0x2F, 0xA9,
         0xD7, 0x61, 0x1E, 0xB4, 0x50, 0x04, 0xF6, 0xC2,
         0x16, 0x25, 0x86, 0x56, 0x55, 0x09, 0xBE, 0x91
-    ];
+    );
 
     /**
      * M-Table
      *
      * @var array
+     * @access private
      */
-    private static $m0 = [
+    var $m0 = array(
         0xBCBC3275, 0xECEC21F3, 0x202043C6, 0xB3B3C9F4, 0xDADA03DB, 0x02028B7B, 0xE2E22BFB, 0x9E9EFAC8,
         0xC9C9EC4A, 0xD4D409D3, 0x18186BE6, 0x1E1E9F6B, 0x98980E45, 0xB2B2387D, 0xA6A6D2E8, 0x2626B74B,
         0x3C3C57D6, 0x93938A32, 0x8282EED8, 0x525298FD, 0x7B7BD437, 0xBBBB3771, 0x5B5B97F1, 0x474783E1,
@@ -180,14 +186,15 @@ class Twofish extends BlockCipher
         0xABABA212, 0x6F6F3EA2, 0xE6E6540D, 0xDBDBF252, 0x92927BBB, 0xB7B7B602, 0x6969CA2F, 0x3939D9A9,
         0xD3D30CD7, 0xA7A72361, 0xA2A2AD1E, 0xC3C399B4, 0x6C6C4450, 0x07070504, 0x04047FF6, 0x272746C2,
         0xACACA716, 0xD0D07625, 0x50501386, 0xDCDCF756, 0x84841A55, 0xE1E15109, 0x7A7A25BE, 0x1313EF91
-    ];
+    );
 
     /**
      * M-Table
      *
      * @var array
+     * @access private
      */
-    private static $m1 = [
+    var $m1 = array(
         0xA9D93939, 0x67901717, 0xB3719C9C, 0xE8D2A6A6, 0x04050707, 0xFD985252, 0xA3658080, 0x76DFE4E4,
         0x9A084545, 0x92024B4B, 0x80A0E0E0, 0x78665A5A, 0xE4DDAFAF, 0xDDB06A6A, 0xD1BF6363, 0x38362A2A,
         0x0D54E6E6, 0xC6432020, 0x3562CCCC, 0x98BEF2F2, 0x181E1212, 0xF724EBEB, 0xECD7A1A1, 0x6C774141,
@@ -220,14 +227,15 @@ class Twofish extends BlockCipher
         0xC8FA9E9E, 0xA882D6D6, 0x2BCF6E6E, 0x40507070, 0xDCEB8585, 0xFE750A0A, 0x328A9393, 0xA48DDFDF,
         0xCA4C2929, 0x10141C1C, 0x2173D7D7, 0xF0CCB4B4, 0xD309D4D4, 0x5D108A8A, 0x0FE25151, 0x00000000,
         0x6F9A1919, 0x9DE01A1A, 0x368F9494, 0x42E6C7C7, 0x4AECC9C9, 0x5EFDD2D2, 0xC1AB7F7F, 0xE0D8A8A8
-    ];
+    );
 
     /**
      * M-Table
      *
      * @var array
+     * @access private
      */
-    private static $m2 = [
+    var $m2 = array(
         0xBC75BC32, 0xECF3EC21, 0x20C62043, 0xB3F4B3C9, 0xDADBDA03, 0x027B028B, 0xE2FBE22B, 0x9EC89EFA,
         0xC94AC9EC, 0xD4D3D409, 0x18E6186B, 0x1E6B1E9F, 0x9845980E, 0xB27DB238, 0xA6E8A6D2, 0x264B26B7,
         0x3CD63C57, 0x9332938A, 0x82D882EE, 0x52FD5298, 0x7B377BD4, 0xBB71BB37, 0x5BF15B97, 0x47E14783,
@@ -260,14 +268,15 @@ class Twofish extends BlockCipher
         0xAB12ABA2, 0x6FA26F3E, 0xE60DE654, 0xDB52DBF2, 0x92BB927B, 0xB702B7B6, 0x692F69CA, 0x39A939D9,
         0xD3D7D30C, 0xA761A723, 0xA21EA2AD, 0xC3B4C399, 0x6C506C44, 0x07040705, 0x04F6047F, 0x27C22746,
         0xAC16ACA7, 0xD025D076, 0x50865013, 0xDC56DCF7, 0x8455841A, 0xE109E151, 0x7ABE7A25, 0x139113EF
-    ];
+    );
 
     /**
      * M-Table
      *
      * @var array
+     * @access private
      */
-    private static $m3 = [
+    var $m3 = array(
         0xD939A9D9, 0x90176790, 0x719CB371, 0xD2A6E8D2, 0x05070405, 0x9852FD98, 0x6580A365, 0xDFE476DF,
         0x08459A08, 0x024B9202, 0xA0E080A0, 0x665A7866, 0xDDAFE4DD, 0xB06ADDB0, 0xBF63D1BF, 0x362A3836,
         0x54E60D54, 0x4320C643, 0x62CC3562, 0xBEF298BE, 0x1E12181E, 0x24EBF724, 0xD7A1ECD7, 0x77416C77,
@@ -300,164 +309,120 @@ class Twofish extends BlockCipher
         0xFA9EC8FA, 0x82D6A882, 0xCF6E2BCF, 0x50704050, 0xEB85DCEB, 0x750AFE75, 0x8A93328A, 0x8DDFA48D,
         0x4C29CA4C, 0x141C1014, 0x73D72173, 0xCCB4F0CC, 0x09D4D309, 0x108A5D10, 0xE2510FE2, 0x00000000,
         0x9A196F9A, 0xE01A9DE0, 0x8F94368F, 0xE6C742E6, 0xECC94AEC, 0xFDD25EFD, 0xAB7FC1AB, 0xD8A8E0D8
-    ];
+    );
 
     /**
      * The Key Schedule Array
      *
      * @var array
+     * @access private
      */
-    private $K = [];
+    var $K = array();
 
     /**
      * The Key depended S-Table 0
      *
      * @var array
+     * @access private
      */
-    private $S0 = [];
+    var $S0 = array();
 
     /**
      * The Key depended S-Table 1
      *
      * @var array
+     * @access private
      */
-    private $S1 = [];
+    var $S1 = array();
 
     /**
      * The Key depended S-Table 2
      *
      * @var array
+     * @access private
      */
-    private $S2 = [];
+    var $S2 = array();
 
     /**
      * The Key depended S-Table 3
      *
      * @var array
+     * @access private
      */
-    private $S3 = [];
+    var $S3 = array();
 
     /**
      * Holds the last used key
      *
      * @var array
+     * @access private
      */
-    private $kl;
+    var $kl;
 
     /**
      * The Key Length (in bytes)
      *
      * @see Crypt_Twofish::setKeyLength()
      * @var int
+     * @access private
      */
-    protected $key_length = 16;
-
-    /**
-     * Default Constructor.
-     *
-     * @param string $mode
-     * @throws BadModeException if an invalid / unsupported mode is provided
-     */
-    public function __construct($mode)
-    {
-        parent::__construct($mode);
-
-        if ($this->mode == self::MODE_STREAM) {
-            throw new BadModeException('Block ciphers cannot be ran in stream mode');
-        }
-    }
-
-    /**
-     * Initialize Static Variables
-     */
-    protected static function initialize_static_variables()
-    {
-        if (is_float(self::$m3[0])) {
-            self::$m0 = array_map('intval', self::$m0);
-            self::$m1 = array_map('intval', self::$m1);
-            self::$m2 = array_map('intval', self::$m2);
-            self::$m3 = array_map('intval', self::$m3);
-            self::$q0 = array_map('intval', self::$q0);
-            self::$q1 = array_map('intval', self::$q1);
-        }
-
-        parent::initialize_static_variables();
-    }
+    var $key_length = 16;
 
     /**
      * Sets the key length.
      *
      * Valid key lengths are 128, 192 or 256 bits
      *
+     * @access public
      * @param int $length
      */
-    public function setKeyLength($length)
+    function setKeyLength($length)
     {
-        switch ($length) {
-            case 128:
-            case 192:
-            case 256:
+        switch (true) {
+            case $length <= 128:
+                $this->key_length = 16;
+                break;
+            case $length <= 192:
+                $this->key_length = 24;
                 break;
             default:
-                throw new \LengthException('Key of size ' . $length . ' not supported by this algorithm. Only keys of sizes 16, 24 or 32 supported');
+                $this->key_length = 32;
         }
 
         parent::setKeyLength($length);
     }
 
-    /**
-     * Sets the key.
-     *
-     * Rijndael supports five different key lengths
-     *
-     * @see setKeyLength()
-     * @param string $key
-     * @throws \LengthException if the key length isn't supported
-     */
-    public function setKey($key)
-    {
-        switch (strlen($key)) {
-            case 16:
-            case 24:
-            case 32:
-                break;
-            default:
-                throw new \LengthException('Key of size ' . strlen($key) . ' not supported by this algorithm. Only keys of sizes 16, 24 or 32 supported');
-        }
-
-        parent::setKey($key);
-    }
-
     /**
      * Setup the key (expansion)
      *
-     * @see \phpseclib3\Crypt\Common\SymmetricKey::_setupKey()
+     * @see \phpseclib\Crypt\Base::_setupKey()
+     * @access private
      */
-    protected function setupKey()
+    function _setupKey()
     {
         if (isset($this->kl['key']) && $this->key === $this->kl['key']) {
             // already expanded
             return;
         }
-        $this->kl = ['key' => $this->key];
+        $this->kl = array('key' => $this->key);
 
         /* Key expanding and generating the key-depended s-boxes */
         $le_longs = unpack('V*', $this->key);
         $key = unpack('C*', $this->key);
-        $m0 = self::$m0;
-        $m1 = self::$m1;
-        $m2 = self::$m2;
-        $m3 = self::$m3;
-        $q0 = self::$q0;
-        $q1 = self::$q1;
+        $m0 = $this->m0;
+        $m1 = $this->m1;
+        $m2 = $this->m2;
+        $m3 = $this->m3;
+        $q0 = $this->q0;
+        $q1 = $this->q1;
 
-        $K = $S0 = $S1 = $S2 = $S3 = [];
+        $K = $S0 = $S1 = $S2 = $S3 = array();
 
         switch (strlen($this->key)) {
             case 16:
-                list($s7, $s6, $s5, $s4) = $this->mdsrem($le_longs[1], $le_longs[2]);
-                list($s3, $s2, $s1, $s0) = $this->mdsrem($le_longs[3], $le_longs[4]);
-                for ($i = 0, $j = 1; $i < 40; $i += 2, $j += 2) {
+                list($s7, $s6, $s5, $s4) = $this->_mdsrem($le_longs[1], $le_longs[2]);
+                list($s3, $s2, $s1, $s0) = $this->_mdsrem($le_longs[3], $le_longs[4]);
+                for ($i = 0, $j = 1; $i < 40; $i+= 2, $j+= 2) {
                     $A = $m0[$q0[$q0[$i] ^ $key[ 9]] ^ $key[1]] ^
                          $m1[$q0[$q1[$i] ^ $key[10]] ^ $key[2]] ^
                          $m2[$q1[$q0[$i] ^ $key[11]] ^ $key[3]] ^
@@ -467,10 +432,8 @@ class Twofish extends BlockCipher
                          $m2[$q1[$q0[$j] ^ $key[15]] ^ $key[7]] ^
                          $m3[$q1[$q1[$j] ^ $key[16]] ^ $key[8]];
                     $B = ($B << 8) | ($B >> 24 & 0xff);
-                    $A = self::safe_intval($A + $B);
-                    $K[] = $A;
-                    $A = self::safe_intval($A + $B);
-                    $K[] = ($A << 9 | $A >> 23 & 0x1ff);
+                    $K[] = $A+= $B;
+                    $K[] = (($A+= $B) << 9 | $A >> 23 & 0x1ff);
                 }
                 for ($i = 0; $i < 256; ++$i) {
                     $S0[$i] = $m0[$q0[$q0[$i] ^ $s4] ^ $s0];
@@ -480,10 +443,10 @@ class Twofish extends BlockCipher
                 }
                 break;
             case 24:
-                list($sb, $sa, $s9, $s8) = $this->mdsrem($le_longs[1], $le_longs[2]);
-                list($s7, $s6, $s5, $s4) = $this->mdsrem($le_longs[3], $le_longs[4]);
-                list($s3, $s2, $s1, $s0) = $this->mdsrem($le_longs[5], $le_longs[6]);
-                for ($i = 0, $j = 1; $i < 40; $i += 2, $j += 2) {
+                list($sb, $sa, $s9, $s8) = $this->_mdsrem($le_longs[1], $le_longs[2]);
+                list($s7, $s6, $s5, $s4) = $this->_mdsrem($le_longs[3], $le_longs[4]);
+                list($s3, $s2, $s1, $s0) = $this->_mdsrem($le_longs[5], $le_longs[6]);
+                for ($i = 0, $j = 1; $i < 40; $i+= 2, $j+= 2) {
                     $A = $m0[$q0[$q0[$q1[$i] ^ $key[17]] ^ $key[ 9]] ^ $key[1]] ^
                          $m1[$q0[$q1[$q1[$i] ^ $key[18]] ^ $key[10]] ^ $key[2]] ^
                          $m2[$q1[$q0[$q0[$i] ^ $key[19]] ^ $key[11]] ^ $key[3]] ^
@@ -493,10 +456,8 @@ class Twofish extends BlockCipher
                          $m2[$q1[$q0[$q0[$j] ^ $key[23]] ^ $key[15]] ^ $key[7]] ^
                          $m3[$q1[$q1[$q0[$j] ^ $key[24]] ^ $key[16]] ^ $key[8]];
                     $B = ($B << 8) | ($B >> 24 & 0xff);
-                    $A = self::safe_intval($A + $B);
-                    $K[] = $A;
-                    $A = self::safe_intval($A + $B);
-                    $K[] = ($A << 9 | $A >> 23 & 0x1ff);
+                    $K[] = $A+= $B;
+                    $K[] = (($A+= $B) << 9 | $A >> 23 & 0x1ff);
                 }
                 for ($i = 0; $i < 256; ++$i) {
                     $S0[$i] = $m0[$q0[$q0[$q1[$i] ^ $s8] ^ $s4] ^ $s0];
@@ -506,11 +467,11 @@ class Twofish extends BlockCipher
                 }
                 break;
             default: // 32
-                list($sf, $se, $sd, $sc) = $this->mdsrem($le_longs[1], $le_longs[2]);
-                list($sb, $sa, $s9, $s8) = $this->mdsrem($le_longs[3], $le_longs[4]);
-                list($s7, $s6, $s5, $s4) = $this->mdsrem($le_longs[5], $le_longs[6]);
-                list($s3, $s2, $s1, $s0) = $this->mdsrem($le_longs[7], $le_longs[8]);
-                for ($i = 0, $j = 1; $i < 40; $i += 2, $j += 2) {
+                list($sf, $se, $sd, $sc) = $this->_mdsrem($le_longs[1], $le_longs[2]);
+                list($sb, $sa, $s9, $s8) = $this->_mdsrem($le_longs[3], $le_longs[4]);
+                list($s7, $s6, $s5, $s4) = $this->_mdsrem($le_longs[5], $le_longs[6]);
+                list($s3, $s2, $s1, $s0) = $this->_mdsrem($le_longs[7], $le_longs[8]);
+                for ($i = 0, $j = 1; $i < 40; $i+= 2, $j+= 2) {
                     $A = $m0[$q0[$q0[$q1[$q1[$i] ^ $key[25]] ^ $key[17]] ^ $key[ 9]] ^ $key[1]] ^
                          $m1[$q0[$q1[$q1[$q0[$i] ^ $key[26]] ^ $key[18]] ^ $key[10]] ^ $key[2]] ^
                          $m2[$q1[$q0[$q0[$q0[$i] ^ $key[27]] ^ $key[19]] ^ $key[11]] ^ $key[3]] ^
@@ -520,10 +481,8 @@ class Twofish extends BlockCipher
                          $m2[$q1[$q0[$q0[$q0[$j] ^ $key[31]] ^ $key[23]] ^ $key[15]] ^ $key[7]] ^
                          $m3[$q1[$q1[$q0[$q1[$j] ^ $key[32]] ^ $key[24]] ^ $key[16]] ^ $key[8]];
                     $B = ($B << 8) | ($B >> 24 & 0xff);
-                    $A = self::safe_intval($A + $B);
-                    $K[] = $A;
-                    $A = self::safe_intval($A + $B);
-                    $K[] = ($A << 9 | $A >> 23 & 0x1ff);
+                    $K[] = $A+= $B;
+                    $K[] = (($A+= $B) << 9 | $A >> 23 & 0x1ff);
                 }
                 for ($i = 0; $i < 256; ++$i) {
                     $S0[$i] = $m0[$q0[$q0[$q1[$q1[$i] ^ $sc] ^ $s8] ^ $s4] ^ $s0];
@@ -543,11 +502,12 @@ class Twofish extends BlockCipher
     /**
      * _mdsrem function using by the twofish cipher algorithm
      *
+     * @access private
      * @param string $A
      * @param string $B
      * @return array
      */
-    private function mdsrem($A, $B)
+    function _mdsrem($A, $B)
     {
         // No gain by unrolling this loop.
         for ($i = 0; $i < 8; ++$i) {
@@ -556,44 +516,45 @@ class Twofish extends BlockCipher
 
             // Shift the others up.
             $B = ($B << 8) | (0xff & ($A >> 24));
-            $A <<= 8;
+            $A<<= 8;
 
             $u = $t << 1;
 
             // Subtract the modular polynomial on overflow.
             if ($t & 0x80) {
-                $u ^= 0x14d;
+                $u^= 0x14d;
             }
 
             // Remove t * (a * x^2 + 1).
             $B ^= $t ^ ($u << 16);
 
             // Form u = a*t + t/a = t*(a + 1/a).
-            $u ^= 0x7fffffff & ($t >> 1);
+            $u^= 0x7fffffff & ($t >> 1);
 
             // Add the modular polynomial on underflow.
             if ($t & 0x01) {
-                $u ^= 0xa6 ;
+                $u^= 0xa6 ;
             }
 
             // Remove t * (a + 1/a) * (x^3 + x).
-            $B ^= ($u << 24) | ($u << 8);
+            $B^= ($u << 24) | ($u << 8);
         }
 
-        return [
+        return array(
             0xff & $B >> 24,
             0xff & $B >> 16,
             0xff & $B >>  8,
-            0xff & $B];
+            0xff & $B);
     }
 
     /**
      * Encrypts a block
      *
+     * @access private
      * @param string $in
      * @return string
      */
-    protected function encryptBlock($in)
+    function _encryptBlock($in)
     {
         $S0 = $this->S0;
         $S1 = $this->S1;
@@ -617,9 +578,9 @@ class Twofish extends BlockCipher
                   $S1[ $R1        & 0xff] ^
                   $S2[($R1 >>  8) & 0xff] ^
                   $S3[($R1 >> 16) & 0xff];
-            $R2 ^= self::safe_intval($t0 + $t1 + $K[++$ki]);
+            $R2^= $t0 + $t1 + $K[++$ki];
             $R2 = ($R2 >> 1 & 0x7fffffff) | ($R2 << 31);
-            $R3 = ((($R3 >> 31) & 1) | ($R3 << 1)) ^ self::safe_intval($t0 + ($t1 << 1) + $K[++$ki]);
+            $R3 = ((($R3 >> 31) & 1) | ($R3 << 1)) ^ ($t0 + ($t1 << 1) + $K[++$ki]);
 
             $t0 = $S0[ $R2        & 0xff] ^
                   $S1[($R2 >>  8) & 0xff] ^
@@ -629,9 +590,9 @@ class Twofish extends BlockCipher
                   $S1[ $R3        & 0xff] ^
                   $S2[($R3 >>  8) & 0xff] ^
                   $S3[($R3 >> 16) & 0xff];
-            $R0 ^= self::safe_intval($t0 + $t1 + $K[++$ki]);
+            $R0^= ($t0 + $t1 + $K[++$ki]);
             $R0 = ($R0 >> 1 & 0x7fffffff) | ($R0 << 31);
-            $R1 = ((($R1 >> 31) & 1) | ($R1 << 1)) ^ self::safe_intval($t0 + ($t1 << 1) + $K[++$ki]);
+            $R1 = ((($R1 >> 31) & 1) | ($R1 << 1)) ^ ($t0 + ($t1 << 1) + $K[++$ki]);
         }
 
         // @codingStandardsIgnoreStart
@@ -645,10 +606,11 @@ class Twofish extends BlockCipher
     /**
      * Decrypts a block
      *
+     * @access private
      * @param string $in
      * @return string
      */
-    protected function decryptBlock($in)
+    function _decryptBlock($in)
     {
         $S0 = $this->S0;
         $S1 = $this->S1;
@@ -672,9 +634,9 @@ class Twofish extends BlockCipher
                   $S1[$R1       & 0xff] ^
                   $S2[$R1 >>  8 & 0xff] ^
                   $S3[$R1 >> 16 & 0xff];
-            $R3 ^= self::safe_intval($t0 + ($t1 << 1) + $K[--$ki]);
+            $R3^= $t0 + ($t1 << 1) + $K[--$ki];
             $R3 = $R3 >> 1 & 0x7fffffff | $R3 << 31;
-            $R2 = ($R2 >> 31 & 0x1 | $R2 << 1) ^ self::safe_intval($t0 + $t1 + $K[--$ki]);
+            $R2 = ($R2 >> 31 & 0x1 | $R2 << 1) ^ ($t0 + $t1 + $K[--$ki]);
 
             $t0 = $S0[$R2       & 0xff] ^
                   $S1[$R2 >>  8 & 0xff] ^
@@ -684,9 +646,9 @@ class Twofish extends BlockCipher
                   $S1[$R3       & 0xff] ^
                   $S2[$R3 >>  8 & 0xff] ^
                   $S3[$R3 >> 16 & 0xff];
-            $R1 ^= self::safe_intval($t0 + ($t1 << 1) + $K[--$ki]);
+            $R1^= $t0 + ($t1 << 1) + $K[--$ki];
             $R1 = $R1 >> 1 & 0x7fffffff | $R1 << 31;
-            $R0 = ($R0 >> 31 & 0x1 | $R0 << 1) ^ self::safe_intval($t0 + $t1 + $K[--$ki]);
+            $R0 = ($R0 >> 31 & 0x1 | $R0 << 1) ^ ($t0 + $t1 + $K[--$ki]);
         }
 
         // @codingStandardsIgnoreStart
@@ -700,117 +662,147 @@ class Twofish extends BlockCipher
     /**
      * Setup the performance-optimized function for de/encrypt()
      *
-     * @see \phpseclib3\Crypt\Common\SymmetricKey::_setupInlineCrypt()
+     * @see \phpseclib\Crypt\Base::_setupInlineCrypt()
+     * @access private
      */
-    protected function setupInlineCrypt()
+    function _setupInlineCrypt()
     {
-        $K = $this->K;
-        $init_crypt = '
-            static $S0, $S1, $S2, $S3;
-            if (!$S0) {
-                for ($i = 0; $i < 256; ++$i) {
-                    $S0[] = (int)$this->S0[$i];
-                    $S1[] = (int)$this->S1[$i];
-                    $S2[] = (int)$this->S2[$i];
-                    $S3[] = (int)$this->S3[$i];
-                }
+        $lambda_functions =& self::_getLambdaFunctions();
+
+        // Max. 10 Ultra-Hi-optimized inline-crypt functions. After that, we'll (still) create very fast code, but not the ultimate fast one.
+        // (Currently, for Crypt_Twofish, one generated $lambda_function cost on php5.5@32bit ~140kb unfreeable mem and ~240kb on php5.5@64bit)
+        $gen_hi_opt_code = (bool)(count($lambda_functions) < 10);
+
+        // Generation of a unique hash for our generated code
+        $code_hash = "Crypt_Twofish, {$this->mode}";
+        if ($gen_hi_opt_code) {
+            $code_hash = str_pad($code_hash, 32) . $this->_hashInlineCryptFunction($this->key);
+        }
+
+        if (!isset($lambda_functions[$code_hash])) {
+            switch (true) {
+                case $gen_hi_opt_code:
+                    $K = $this->K;
+                    $init_crypt = '
+                        static $S0, $S1, $S2, $S3;
+                        if (!$S0) {
+                            for ($i = 0; $i < 256; ++$i) {
+                                $S0[] = (int)$self->S0[$i];
+                                $S1[] = (int)$self->S1[$i];
+                                $S2[] = (int)$self->S2[$i];
+                                $S3[] = (int)$self->S3[$i];
+                            }
+                        }
+                    ';
+                    break;
+                default:
+                    $K   = array();
+                    for ($i = 0; $i < 40; ++$i) {
+                        $K[] = '$K_' . $i;
+                    }
+                    $init_crypt = '
+                        $S0 = $self->S0;
+                        $S1 = $self->S1;
+                        $S2 = $self->S2;
+                        $S3 = $self->S3;
+                        list(' . implode(',', $K) . ') = $self->K;
+                    ';
             }
-        ';
 
-        $safeint = self::safe_intval_inline();
-
-        // Generating encrypt code:
-        $encrypt_block = '
-            $in = unpack("V4", $in);
-            $R0 = ' . $K[0] . ' ^ $in[1];
-            $R1 = ' . $K[1] . ' ^ $in[2];
-            $R2 = ' . $K[2] . ' ^ $in[3];
-            $R3 = ' . $K[3] . ' ^ $in[4];
-        ';
-        for ($ki = 7, $i = 0; $i < 8; ++$i) {
-            $encrypt_block .= '
-                $t0 = $S0[ $R0        & 0xff] ^
-                      $S1[($R0 >>  8) & 0xff] ^
-                      $S2[($R0 >> 16) & 0xff] ^
-                      $S3[($R0 >> 24) & 0xff];
-                $t1 = $S0[($R1 >> 24) & 0xff] ^
-                      $S1[ $R1        & 0xff] ^
-                      $S2[($R1 >>  8) & 0xff] ^
-                      $S3[($R1 >> 16) & 0xff];
-                    $R2^= ' . sprintf($safeint, '$t0 + $t1 + ' . $K[++$ki]) . ';
-                $R2 = ($R2 >> 1 & 0x7fffffff) | ($R2 << 31);
-                $R3 = ((($R3 >> 31) & 1) | ($R3 << 1)) ^ ' . sprintf($safeint, '($t0 + ($t1 << 1) + ' . $K[++$ki] . ')') . ';
-
-                $t0 = $S0[ $R2        & 0xff] ^
-                      $S1[($R2 >>  8) & 0xff] ^
-                      $S2[($R2 >> 16) & 0xff] ^
-                      $S3[($R2 >> 24) & 0xff];
-                $t1 = $S0[($R3 >> 24) & 0xff] ^
-                      $S1[ $R3        & 0xff] ^
-                      $S2[($R3 >>  8) & 0xff] ^
-                      $S3[($R3 >> 16) & 0xff];
-                $R0^= ' . sprintf($safeint, '($t0 + $t1 + ' . $K[++$ki] . ')') . ';
-                $R0 = ($R0 >> 1 & 0x7fffffff) | ($R0 << 31);
-                $R1 = ((($R1 >> 31) & 1) | ($R1 << 1)) ^ ' . sprintf($safeint, '($t0 + ($t1 << 1) + ' . $K[++$ki] . ')') . ';
+            // Generating encrypt code:
+            $encrypt_block = '
+                $in = unpack("V4", $in);
+                $R0 = '.$K[0].' ^ $in[1];
+                $R1 = '.$K[1].' ^ $in[2];
+                $R2 = '.$K[2].' ^ $in[3];
+                $R3 = '.$K[3].' ^ $in[4];
             ';
-        }
-        $encrypt_block .= '
-            $in = pack("V4", ' . $K[4] . ' ^ $R2,
-                             ' . $K[5] . ' ^ $R3,
-                             ' . $K[6] . ' ^ $R0,
-                             ' . $K[7] . ' ^ $R1);
-        ';
+            for ($ki = 7, $i = 0; $i < 8; ++$i) {
+                $encrypt_block.= '
+                    $t0 = $S0[ $R0        & 0xff] ^
+                          $S1[($R0 >>  8) & 0xff] ^
+                          $S2[($R0 >> 16) & 0xff] ^
+                          $S3[($R0 >> 24) & 0xff];
+                    $t1 = $S0[($R1 >> 24) & 0xff] ^
+                          $S1[ $R1        & 0xff] ^
+                          $S2[($R1 >>  8) & 0xff] ^
+                          $S3[($R1 >> 16) & 0xff];
+                    $R2^= ($t0 + $t1 + '.$K[++$ki].');
+                    $R2 = ($R2 >> 1 & 0x7fffffff) | ($R2 << 31);
+                    $R3 = ((($R3 >> 31) & 1) | ($R3 << 1)) ^ ($t0 + ($t1 << 1) + '.$K[++$ki].');
 
-        // Generating decrypt code:
-        $decrypt_block = '
-            $in = unpack("V4", $in);
-            $R0 = ' . $K[4] . ' ^ $in[1];
-            $R1 = ' . $K[5] . ' ^ $in[2];
-            $R2 = ' . $K[6] . ' ^ $in[3];
-            $R3 = ' . $K[7] . ' ^ $in[4];
-        ';
-        for ($ki = 40, $i = 0; $i < 8; ++$i) {
-            $decrypt_block .= '
-                $t0 = $S0[$R0       & 0xff] ^
-                      $S1[$R0 >>  8 & 0xff] ^
-                      $S2[$R0 >> 16 & 0xff] ^
-                      $S3[$R0 >> 24 & 0xff];
-                $t1 = $S0[$R1 >> 24 & 0xff] ^
-                      $S1[$R1       & 0xff] ^
-                      $S2[$R1 >>  8 & 0xff] ^
-                      $S3[$R1 >> 16 & 0xff];
-                $R3^= ' . sprintf($safeint, '$t0 + ($t1 << 1) + ' . $K[--$ki]) . ';
-                $R3 = $R3 >> 1 & 0x7fffffff | $R3 << 31;
-                $R2 = ($R2 >> 31 & 0x1 | $R2 << 1) ^ ' . sprintf($safeint, '($t0 + $t1 + ' . $K[--$ki] . ')') . ';
-
-                $t0 = $S0[$R2       & 0xff] ^
-                      $S1[$R2 >>  8 & 0xff] ^
-                      $S2[$R2 >> 16 & 0xff] ^
-                      $S3[$R2 >> 24 & 0xff];
-                $t1 = $S0[$R3 >> 24 & 0xff] ^
-                      $S1[$R3       & 0xff] ^
-                      $S2[$R3 >>  8 & 0xff] ^
-                      $S3[$R3 >> 16 & 0xff];
-                $R1^= ' . sprintf($safeint, '$t0 + ($t1 << 1) + ' . $K[--$ki]) . ';
-                $R1 = $R1 >> 1 & 0x7fffffff | $R1 << 31;
-                $R0 = ($R0 >> 31 & 0x1 | $R0 << 1) ^ ' . sprintf($safeint, '($t0 + $t1 + ' . $K[--$ki] . ')') . ';
+                    $t0 = $S0[ $R2        & 0xff] ^
+                          $S1[($R2 >>  8) & 0xff] ^
+                          $S2[($R2 >> 16) & 0xff] ^
+                          $S3[($R2 >> 24) & 0xff];
+                    $t1 = $S0[($R3 >> 24) & 0xff] ^
+                          $S1[ $R3        & 0xff] ^
+                          $S2[($R3 >>  8) & 0xff] ^
+                          $S3[($R3 >> 16) & 0xff];
+                    $R0^= ($t0 + $t1 + '.$K[++$ki].');
+                    $R0 = ($R0 >> 1 & 0x7fffffff) | ($R0 << 31);
+                    $R1 = ((($R1 >> 31) & 1) | ($R1 << 1)) ^ ($t0 + ($t1 << 1) + '.$K[++$ki].');
+                ';
+            }
+            $encrypt_block.= '
+                $in = pack("V4", '.$K[4].' ^ $R2,
+                                 '.$K[5].' ^ $R3,
+                                 '.$K[6].' ^ $R0,
+                                 '.$K[7].' ^ $R1);
             ';
-        }
-        $decrypt_block .= '
-            $in = pack("V4", ' . $K[0] . ' ^ $R2,
-                             ' . $K[1] . ' ^ $R3,
-                             ' . $K[2] . ' ^ $R0,
-                             ' . $K[3] . ' ^ $R1);
-        ';
 
-        $this->inline_crypt = $this->createInlineCryptFunction(
-            [
-               'init_crypt'    => $init_crypt,
-               'init_encrypt'  => '',
-               'init_decrypt'  => '',
-               'encrypt_block' => $encrypt_block,
-               'decrypt_block' => $decrypt_block
-            ]
-        );
+            // Generating decrypt code:
+            $decrypt_block = '
+                $in = unpack("V4", $in);
+                $R0 = '.$K[4].' ^ $in[1];
+                $R1 = '.$K[5].' ^ $in[2];
+                $R2 = '.$K[6].' ^ $in[3];
+                $R3 = '.$K[7].' ^ $in[4];
+            ';
+            for ($ki = 40, $i = 0; $i < 8; ++$i) {
+                $decrypt_block.= '
+                    $t0 = $S0[$R0       & 0xff] ^
+                          $S1[$R0 >>  8 & 0xff] ^
+                          $S2[$R0 >> 16 & 0xff] ^
+                          $S3[$R0 >> 24 & 0xff];
+                    $t1 = $S0[$R1 >> 24 & 0xff] ^
+                          $S1[$R1       & 0xff] ^
+                          $S2[$R1 >>  8 & 0xff] ^
+                          $S3[$R1 >> 16 & 0xff];
+                    $R3^= $t0 + ($t1 << 1) + '.$K[--$ki].';
+                    $R3 = $R3 >> 1 & 0x7fffffff | $R3 << 31;
+                    $R2 = ($R2 >> 31 & 0x1 | $R2 << 1) ^ ($t0 + $t1 + '.$K[--$ki].');
+
+                    $t0 = $S0[$R2       & 0xff] ^
+                          $S1[$R2 >>  8 & 0xff] ^
+                          $S2[$R2 >> 16 & 0xff] ^
+                          $S3[$R2 >> 24 & 0xff];
+                    $t1 = $S0[$R3 >> 24 & 0xff] ^
+                          $S1[$R3       & 0xff] ^
+                          $S2[$R3 >>  8 & 0xff] ^
+                          $S3[$R3 >> 16 & 0xff];
+                    $R1^= $t0 + ($t1 << 1) + '.$K[--$ki].';
+                    $R1 = $R1 >> 1 & 0x7fffffff | $R1 << 31;
+                    $R0 = ($R0 >> 31 & 0x1 | $R0 << 1) ^ ($t0 + $t1 + '.$K[--$ki].');
+                ';
+            }
+            $decrypt_block.= '
+                $in = pack("V4", '.$K[0].' ^ $R2,
+                                 '.$K[1].' ^ $R3,
+                                 '.$K[2].' ^ $R0,
+                                 '.$K[3].' ^ $R1);
+            ';
+
+            $lambda_functions[$code_hash] = $this->_createInlineCryptFunction(
+                array(
+                   'init_crypt'    => $init_crypt,
+                   'init_encrypt'  => '',
+                   'init_decrypt'  => '',
+                   'encrypt_block' => $encrypt_block,
+                   'decrypt_block' => $decrypt_block
+                )
+            );
+        }
+        $this->inline_crypt = $lambda_functions[$code_hash];
     }
 }
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Exception/BadConfigurationException.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Exception/BadConfigurationException.php
deleted file mode 100644
index 1aabcae0..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Exception/BadConfigurationException.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-/**
- * BadConfigurationException
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2015 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\Exception;
-
-/**
- * BadConfigurationException
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-class BadConfigurationException extends \RuntimeException
-{
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Exception/BadDecryptionException.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Exception/BadDecryptionException.php
deleted file mode 100644
index 88331dce..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Exception/BadDecryptionException.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-/**
- * BadDecryptionException
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2015 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\Exception;
-
-/**
- * BadDecryptionException
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-class BadDecryptionException extends \RuntimeException
-{
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Exception/BadModeException.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Exception/BadModeException.php
deleted file mode 100644
index 87689b22..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Exception/BadModeException.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-/**
- * BadModeException
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2015 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\Exception;
-
-/**
- * BadModeException
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-class BadModeException extends \RuntimeException
-{
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Exception/ConnectionClosedException.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Exception/ConnectionClosedException.php
deleted file mode 100644
index 6aaccbad..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Exception/ConnectionClosedException.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-/**
- * ConnectionClosedException
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2015 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\Exception;
-
-/**
- * ConnectionClosedException
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-class ConnectionClosedException extends \RuntimeException
-{
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Exception/FileNotFoundException.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Exception/FileNotFoundException.php
deleted file mode 100644
index 66e72709..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Exception/FileNotFoundException.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-/**
- * FileNotFoundException
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2015 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\Exception;
-
-/**
- * FileNotFoundException
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-class FileNotFoundException extends \RuntimeException
-{
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Exception/InconsistentSetupException.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Exception/InconsistentSetupException.php
deleted file mode 100644
index 23c38fb0..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Exception/InconsistentSetupException.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-/**
- * InconsistentSetupException
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2015 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\Exception;
-
-/**
- * InconsistentSetupException
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-class InconsistentSetupException extends \RuntimeException
-{
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Exception/InsufficientSetupException.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Exception/InsufficientSetupException.php
deleted file mode 100644
index 4f4114d7..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Exception/InsufficientSetupException.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-/**
- * InsufficientSetupException
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2015 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\Exception;
-
-/**
- * InsufficientSetupException
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-class InsufficientSetupException extends \RuntimeException
-{
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Exception/NoKeyLoadedException.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Exception/NoKeyLoadedException.php
deleted file mode 100644
index 7ec2fe9b..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Exception/NoKeyLoadedException.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-/**
- * NoKeyLoadedException
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2015 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\Exception;
-
-/**
- * NoKeyLoadedException
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-class NoKeyLoadedException extends \RuntimeException
-{
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Exception/NoSupportedAlgorithmsException.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Exception/NoSupportedAlgorithmsException.php
deleted file mode 100644
index b3ea8f38..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Exception/NoSupportedAlgorithmsException.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-/**
- * NoSupportedAlgorithmsException
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2015 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\Exception;
-
-/**
- * NoSupportedAlgorithmsException
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-class NoSupportedAlgorithmsException extends \RuntimeException
-{
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Exception/UnableToConnectException.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Exception/UnableToConnectException.php
deleted file mode 100644
index bfa005b4..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Exception/UnableToConnectException.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-/**
- * UnableToConnectException
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2015 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\Exception;
-
-/**
- * UnableToConnectException
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-class UnableToConnectException extends \RuntimeException
-{
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Exception/UnsupportedAlgorithmException.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Exception/UnsupportedAlgorithmException.php
deleted file mode 100644
index 210a9a5c..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Exception/UnsupportedAlgorithmException.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-/**
- * UnsupportedAlgorithmException
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2015 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\Exception;
-
-/**
- * UnsupportedAlgorithmException
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-class UnsupportedAlgorithmException extends \RuntimeException
-{
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Exception/UnsupportedCurveException.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Exception/UnsupportedCurveException.php
deleted file mode 100644
index 99152152..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Exception/UnsupportedCurveException.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-/**
- * UnsupportedCurveException
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2015 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\Exception;
-
-/**
- * UnsupportedCurveException
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-class UnsupportedCurveException extends \RuntimeException
-{
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Exception/UnsupportedFormatException.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Exception/UnsupportedFormatException.php
deleted file mode 100644
index e207d7e2..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Exception/UnsupportedFormatException.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-/**
- * UnsupportedFormatException
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2015 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\Exception;
-
-/**
- * UnsupportedFormatException
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-class UnsupportedFormatException extends \RuntimeException
-{
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Exception/UnsupportedOperationException.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Exception/UnsupportedOperationException.php
deleted file mode 100644
index 9a115444..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Exception/UnsupportedOperationException.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-/**
- * UnsupportedOperationException
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2015 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\Exception;
-
-/**
- * UnsupportedOperationException
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-class UnsupportedOperationException extends \RuntimeException
-{
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ANSI.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ANSI.php
index 5803a372..1f3eecb3 100644
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ANSI.php
+++ b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ANSI.php
@@ -5,23 +5,27 @@
  *
  * PHP version 5
  *
- * If you call read() in \phpseclib3\Net\SSH2 you may get {@link http://en.wikipedia.org/wiki/ANSI_escape_code ANSI escape codes} back.
+ * If you call read() in \phpseclib\Net\SSH2 you may get {@link http://en.wikipedia.org/wiki/ANSI_escape_code ANSI escape codes} back.
  * They'd look like chr(0x1B) . '[00m' or whatever (0x1B = ESC).  They tell a
  * {@link http://en.wikipedia.org/wiki/Terminal_emulator terminal emulator} how to format the characters, what
- * color to display them in, etc. \phpseclib3\File\ANSI is a {@link http://en.wikipedia.org/wiki/VT100 VT100} terminal emulator.
+ * color to display them in, etc. \phpseclib\File\ANSI is a {@link http://en.wikipedia.org/wiki/VT100 VT100} terminal emulator.
  *
+ * @category  File
+ * @package   ANSI
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2012 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
  * @link      http://phpseclib.sourceforge.net
  */
 
-namespace phpseclib3\File;
+namespace phpseclib\File;
 
 /**
  * Pure-PHP ANSI Decoder
  *
+ * @package ANSI
  * @author  Jim Wigginton <terrafrost@php.net>
+ * @access  public
  */
 class ANSI
 {
@@ -29,120 +33,137 @@ class ANSI
      * Max Width
      *
      * @var int
+     * @access private
      */
-    private $max_x;
+    var $max_x;
 
     /**
      * Max Height
      *
      * @var int
+     * @access private
      */
-    private $max_y;
+    var $max_y;
 
     /**
      * Max History
      *
      * @var int
+     * @access private
      */
-    private $max_history;
+    var $max_history;
 
     /**
      * History
      *
      * @var array
+     * @access private
      */
-    private $history;
+    var $history;
 
     /**
      * History Attributes
      *
      * @var array
+     * @access private
      */
-    private $history_attrs;
+    var $history_attrs;
 
     /**
      * Current Column
      *
      * @var int
+     * @access private
      */
-    private $x;
+    var $x;
 
     /**
      * Current Row
      *
      * @var int
+     * @access private
      */
-    private $y;
+    var $y;
 
     /**
      * Old Column
      *
      * @var int
+     * @access private
      */
-    private $old_x;
+    var $old_x;
 
     /**
      * Old Row
      *
      * @var int
+     * @access private
      */
-    private $old_y;
+    var $old_y;
 
     /**
      * An empty attribute cell
      *
      * @var object
+     * @access private
      */
-    private $base_attr_cell;
+    var $base_attr_cell;
 
     /**
      * The current attribute cell
      *
      * @var object
+     * @access private
      */
-    private $attr_cell;
+    var $attr_cell;
 
     /**
      * An empty attribute row
      *
      * @var array
+     * @access private
      */
-    private $attr_row;
+    var $attr_row;
 
     /**
      * The current screen text
      *
-     * @var list<string>
+     * @var array
+     * @access private
      */
-    private $screen;
+    var $screen;
 
     /**
      * The current screen attributes
      *
      * @var array
+     * @access private
      */
-    private $attrs;
+    var $attrs;
 
     /**
      * Current ANSI code
      *
      * @var string
+     * @access private
      */
-    private $ansi;
+    var $ansi;
 
     /**
      * Tokenization
      *
      * @var array
+     * @access private
      */
-    private $tokenization;
+    var $tokenization;
 
     /**
      * Default Constructor.
      *
-     * @return \phpseclib3\File\ANSI
+     * @return \phpseclib\File\ANSI
+     * @access public
      */
-    public function __construct()
+    function __construct()
     {
         $attr_cell = new \stdClass();
         $attr_cell->bold = false;
@@ -165,13 +186,14 @@ class ANSI
      *
      * @param int $x
      * @param int $y
+     * @access public
      */
-    public function setDimensions($x, $y)
+    function setDimensions($x, $y)
     {
         $this->max_x = $x - 1;
         $this->max_y = $y - 1;
         $this->x = $this->y = 0;
-        $this->history = $this->history_attrs = [];
+        $this->history = $this->history_attrs = array();
         $this->attr_row = array_fill(0, $this->max_x + 2, $this->base_attr_cell);
         $this->screen = array_fill(0, $this->max_y + 1, '');
         $this->attrs = array_fill(0, $this->max_y + 1, $this->attr_row);
@@ -181,9 +203,11 @@ class ANSI
     /**
      * Set the number of lines that should be logged past the terminal height
      *
-     * @param int $history
+     * @param int $x
+     * @param int $y
+     * @access public
      */
-    public function setHistory($history)
+    function setHistory($history)
     {
         $this->max_history = $history;
     }
@@ -192,8 +216,9 @@ class ANSI
      * Load a string
      *
      * @param string $source
+     * @access public
      */
-    public function loadString($source)
+    function loadString($source)
     {
         $this->setDimensions($this->max_x + 1, $this->max_y + 1);
         $this->appendString($source);
@@ -203,13 +228,14 @@ class ANSI
      * Appdend a string
      *
      * @param string $source
+     * @access public
      */
-    public function appendString($source)
+    function appendString($source)
     {
-        $this->tokenization = [''];
+        $this->tokenization = array('');
         for ($i = 0; $i < strlen($source); $i++) {
             if (strlen($this->ansi)) {
-                $this->ansi .= $source[$i];
+                $this->ansi.= $source[$i];
                 $chr = ord($source[$i]);
                 // http://en.wikipedia.org/wiki/ANSI_escape_code#Sequence_elements
                 // single character CSI's not currently supported
@@ -243,11 +269,10 @@ class ANSI
                             array_shift($this->history);
                             array_shift($this->history_attrs);
                         }
-                        // fall-through
                     case "\x1B[K": // Clear screen from cursor right
                         $this->screen[$this->y] = substr($this->screen[$this->y], 0, $this->x);
 
-                        array_splice($this->attrs[$this->y], $this->x + 1, $this->max_x - $this->x, array_fill($this->x, $this->max_x - ($this->x - 1), $this->base_attr_cell));
+                        array_splice($this->attrs[$this->y], $this->x + 1, $this->max_x - $this->x, array_fill($this->x, $this->max_x - $this->x - 1, $this->base_attr_cell));
                         break;
                     case "\x1B[2K": // Clear entire line
                         $this->screen[$this->y] = str_repeat(' ', $this->x);
@@ -258,31 +283,28 @@ class ANSI
                     case "\x1B(B": // set united states g0 character set
                         break;
                     case "\x1BE": // Move to next line
-                        $this->newLine();
+                        $this->_newLine();
                         $this->x = 0;
                         break;
                     default:
                         switch (true) {
                             case preg_match('#\x1B\[(\d+)B#', $this->ansi, $match): // Move cursor down n lines
                                 $this->old_y = $this->y;
-                                $this->y += (int) $match[1];
+                                $this->y+= $match[1];
                                 break;
                             case preg_match('#\x1B\[(\d+);(\d+)H#', $this->ansi, $match): // Move cursor to screen location v,h
                                 $this->old_x = $this->x;
                                 $this->old_y = $this->y;
                                 $this->x = $match[2] - 1;
-                                $this->y = (int) $match[1] - 1;
+                                $this->y = $match[1] - 1;
                                 break;
                             case preg_match('#\x1B\[(\d+)C#', $this->ansi, $match): // Move cursor right n lines
                                 $this->old_x = $this->x;
-                                $this->x += $match[1];
+                                $this->x+= $match[1];
                                 break;
                             case preg_match('#\x1B\[(\d+)D#', $this->ansi, $match): // Move cursor left n lines
                                 $this->old_x = $this->x;
-                                $this->x -= $match[1];
-                                if ($this->x < 0) {
-                                    $this->x = 0;
-                                }
+                                $this->x-= $match[1];
                                 break;
                             case preg_match('#\x1B\[(\d+);(\d+)r#', $this->ansi, $match): // Set top and bottom lines of a window
                                 break;
@@ -291,20 +313,19 @@ class ANSI
                                 $mods = explode(';', $match[1]);
                                 foreach ($mods as $mod) {
                                     switch ($mod) {
-                                        case '':
-                                        case '0': // Turn off character attributes
+                                        case 0: // Turn off character attributes
                                             $attr_cell = clone $this->base_attr_cell;
                                             break;
-                                        case '1': // Turn bold mode on
+                                        case 1: // Turn bold mode on
                                             $attr_cell->bold = true;
                                             break;
-                                        case '4': // Turn underline mode on
+                                        case 4: // Turn underline mode on
                                             $attr_cell->underline = true;
                                             break;
-                                        case '5': // Turn blinking mode on
+                                        case 5: // Turn blinking mode on
                                             $attr_cell->blink = true;
                                             break;
-                                        case '7': // Turn reverse video on
+                                        case 7: // Turn reverse video on
                                             $attr_cell->reverse = !$attr_cell->reverse;
                                             $temp = $attr_cell->background;
                                             $attr_cell->background = $attr_cell->foreground;
@@ -317,23 +338,23 @@ class ANSI
                                             $back = &$attr_cell->{ $attr_cell->reverse ? 'foreground' : 'background' };
                                             switch ($mod) {
                                                 // @codingStandardsIgnoreStart
-                                                case '30': $front = 'black'; break;
-                                                case '31': $front = 'red'; break;
-                                                case '32': $front = 'green'; break;
-                                                case '33': $front = 'yellow'; break;
-                                                case '34': $front = 'blue'; break;
-                                                case '35': $front = 'magenta'; break;
-                                                case '36': $front = 'cyan'; break;
-                                                case '37': $front = 'white'; break;
+                                                case 30: $front = 'black'; break;
+                                                case 31: $front = 'red'; break;
+                                                case 32: $front = 'green'; break;
+                                                case 33: $front = 'yellow'; break;
+                                                case 34: $front = 'blue'; break;
+                                                case 35: $front = 'magenta'; break;
+                                                case 36: $front = 'cyan'; break;
+                                                case 37: $front = 'white'; break;
 
-                                                case '40': $back = 'black'; break;
-                                                case '41': $back = 'red'; break;
-                                                case '42': $back = 'green'; break;
-                                                case '43': $back = 'yellow'; break;
-                                                case '44': $back = 'blue'; break;
-                                                case '45': $back = 'magenta'; break;
-                                                case '46': $back = 'cyan'; break;
-                                                case '47': $back = 'white'; break;
+                                                case 40: $back = 'black'; break;
+                                                case 41: $back = 'red'; break;
+                                                case 42: $back = 'green'; break;
+                                                case 43: $back = 'yellow'; break;
+                                                case 44: $back = 'blue'; break;
+                                                case 45: $back = 'magenta'; break;
+                                                case 46: $back = 'cyan'; break;
+                                                case 47: $back = 'white'; break;
                                                 // @codingStandardsIgnoreEnd
 
                                                 default:
@@ -352,13 +373,13 @@ class ANSI
                 continue;
             }
 
-            $this->tokenization[count($this->tokenization) - 1] .= $source[$i];
+            $this->tokenization[count($this->tokenization) - 1].= $source[$i];
             switch ($source[$i]) {
                 case "\r":
                     $this->x = 0;
                     break;
                 case "\n":
-                    $this->newLine();
+                    $this->_newLine();
                     break;
                 case "\x08": // backspace
                     if ($this->x) {
@@ -379,7 +400,7 @@ class ANSI
                     //if (!strlen($this->tokenization[count($this->tokenization) - 1])) {
                     //    array_pop($this->tokenization);
                     //}
-                    $this->ansi .= "\x1B";
+                    $this->ansi.= "\x1B";
                     break;
                 default:
                     $this->attrs[$this->y][$this->x] = clone $this->attr_cell;
@@ -395,7 +416,7 @@ class ANSI
 
                     if ($this->x > $this->max_x) {
                         $this->x = 0;
-                        $this->newLine();
+                        $this->y++;
                     } else {
                         $this->x++;
                     }
@@ -408,18 +429,19 @@ class ANSI
      *
      * Also update the $this->screen and $this->history buffers
      *
+     * @access private
      */
-    private function newLine()
+    function _newLine()
     {
         //if ($this->y < $this->max_y) {
         //    $this->y++;
         //}
 
         while ($this->y >= $this->max_y) {
-            $this->history = array_merge($this->history, [array_shift($this->screen)]);
+            $this->history = array_merge($this->history, array(array_shift($this->screen)));
             $this->screen[] = '';
 
-            $this->history_attrs = array_merge($this->history_attrs, [array_shift($this->attrs)]);
+            $this->history_attrs = array_merge($this->history_attrs, array(array_shift($this->attrs)));
             $this->attrs[] = $this->attr_row;
 
             if (count($this->history) >= $this->max_history) {
@@ -435,12 +457,10 @@ class ANSI
     /**
      * Returns the current coordinate without preformating
      *
-     * @param \stdClass $last_attr
-     * @param \stdClass $cur_attr
-     * @param string $char
+     * @access private
      * @return string
      */
-    private function processCoordinate(\stdClass $last_attr, \stdClass $cur_attr, $char)
+    function _processCoordinate($last_attr, $cur_attr, $char)
     {
         $output = '';
 
@@ -448,7 +468,7 @@ class ANSI
             $close = $open = '';
             if ($last_attr->foreground != $cur_attr->foreground) {
                 if ($cur_attr->foreground != 'white') {
-                    $open .= '<span style="color: ' . $cur_attr->foreground . '">';
+                    $open.= '<span style="color: ' . $cur_attr->foreground . '">';
                 }
                 if ($last_attr->foreground != 'white') {
                     $close = '</span>' . $close;
@@ -456,7 +476,7 @@ class ANSI
             }
             if ($last_attr->background != $cur_attr->background) {
                 if ($cur_attr->background != 'black') {
-                    $open .= '<span style="background: ' . $cur_attr->background . '">';
+                    $open.= '<span style="background: ' . $cur_attr->background . '">';
                 }
                 if ($last_attr->background != 'black') {
                     $close = '</span>' . $close;
@@ -464,29 +484,29 @@ class ANSI
             }
             if ($last_attr->bold != $cur_attr->bold) {
                 if ($cur_attr->bold) {
-                    $open .= '<b>';
+                    $open.= '<b>';
                 } else {
                     $close = '</b>' . $close;
                 }
             }
             if ($last_attr->underline != $cur_attr->underline) {
                 if ($cur_attr->underline) {
-                    $open .= '<u>';
+                    $open.= '<u>';
                 } else {
                     $close = '</u>' . $close;
                 }
             }
             if ($last_attr->blink != $cur_attr->blink) {
                 if ($cur_attr->blink) {
-                    $open .= '<blink>';
+                    $open.= '<blink>';
                 } else {
                     $close = '</blink>' . $close;
                 }
             }
-            $output .= $close . $open;
+            $output.= $close . $open;
         }
 
-        $output .= htmlspecialchars($char);
+        $output.= htmlspecialchars($char);
 
         return $output;
     }
@@ -494,56 +514,59 @@ class ANSI
     /**
      * Returns the current screen without preformating
      *
+     * @access private
      * @return string
      */
-    private function getScreenHelper()
+    function _getScreen()
     {
         $output = '';
         $last_attr = $this->base_attr_cell;
         for ($i = 0; $i <= $this->max_y; $i++) {
             for ($j = 0; $j <= $this->max_x; $j++) {
                 $cur_attr = $this->attrs[$i][$j];
-                $output .= $this->processCoordinate($last_attr, $cur_attr, isset($this->screen[$i][$j]) ? $this->screen[$i][$j] : '');
+                $output.= $this->_processCoordinate($last_attr, $cur_attr, isset($this->screen[$i][$j]) ? $this->screen[$i][$j] : '');
                 $last_attr = $this->attrs[$i][$j];
             }
-            $output .= "\r\n";
+            $output.= "\r\n";
         }
         $output = substr($output, 0, -2);
         // close any remaining open tags
-        $output .= $this->processCoordinate($last_attr, $this->base_attr_cell, '');
+        $output.= $this->_processCoordinate($last_attr, $this->base_attr_cell, '');
         return rtrim($output);
     }
 
     /**
      * Returns the current screen
      *
+     * @access public
      * @return string
      */
-    public function getScreen()
+    function getScreen()
     {
-        return '<pre width="' . ($this->max_x + 1) . '" style="color: white; background: black">' . $this->getScreenHelper() . '</pre>';
+        return '<pre width="' . ($this->max_x + 1) . '" style="color: white; background: black">' . $this->_getScreen() . '</pre>';
     }
 
     /**
      * Returns the current screen and the x previous lines
      *
+     * @access public
      * @return string
      */
-    public function getHistory()
+    function getHistory()
     {
         $scrollback = '';
         $last_attr = $this->base_attr_cell;
         for ($i = 0; $i < count($this->history); $i++) {
             for ($j = 0; $j <= $this->max_x + 1; $j++) {
                 $cur_attr = $this->history_attrs[$i][$j];
-                $scrollback .= $this->processCoordinate($last_attr, $cur_attr, isset($this->history[$i][$j]) ? $this->history[$i][$j] : '');
+                $scrollback.= $this->_processCoordinate($last_attr, $cur_attr, isset($this->history[$i][$j]) ? $this->history[$i][$j] : '');
                 $last_attr = $this->history_attrs[$i][$j];
             }
-            $scrollback .= "\r\n";
+            $scrollback.= "\r\n";
         }
         $base_attr_cell = $this->base_attr_cell;
         $this->base_attr_cell = $last_attr;
-        $scrollback .= $this->getScreen();
+        $scrollback.= $this->_getScreen();
         $this->base_attr_cell = $base_attr_cell;
 
         return '<pre width="' . ($this->max_x + 1) . '" style="color: white; background: black">' . $scrollback . '</span></pre>';
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1.php
index c4b06a56..8308645b 100644
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1.php
+++ b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1.php
@@ -9,38 +9,50 @@
  * utilized scheme is DER or the "Distinguished Encoding Rules".  PEM's are base64 encoded
  * DER blobs.
  *
- * \phpseclib3\File\ASN1 decodes and encodes DER formatted messages and places them in a semantic context.
+ * \phpseclib\File\ASN1 decodes and encodes DER formatted messages and places them in a semantic context.
  *
  * Uses the 1988 ASN.1 syntax.
  *
+ * @category  File
+ * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2012 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
  * @link      http://phpseclib.sourceforge.net
  */
 
-namespace phpseclib3\File;
+namespace phpseclib\File;
 
-use phpseclib3\Common\Functions\Strings;
-use phpseclib3\File\ASN1\Element;
-use phpseclib3\Math\BigInteger;
+use phpseclib\File\ASN1\Element;
+use phpseclib\Math\BigInteger;
 
 /**
  * Pure-PHP ASN.1 Parser
  *
+ * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
+ * @access  public
  */
-abstract class ASN1
+class ASN1
 {
-    // Tag Classes
-    // http://www.itu.int/ITU-T/studygroups/com17/languages/X.690-0207.pdf#page=12
+    /**#@+
+     * Tag Classes
+     *
+     * @access private
+     * @link http://www.itu.int/ITU-T/studygroups/com17/languages/X.690-0207.pdf#page=12
+     */
     const CLASS_UNIVERSAL        = 0;
     const CLASS_APPLICATION      = 1;
     const CLASS_CONTEXT_SPECIFIC = 2;
     const CLASS_PRIVATE          = 3;
+    /**#@-*/
 
-    // Tag Classes
-    // http://www.obj-sys.com/asn1tutorial/node124.html
+    /**#@+
+     * Tag Classes
+     *
+     * @access private
+     * @link http://www.obj-sys.com/asn1tutorial/node124.html
+    */
     const TYPE_BOOLEAN           = 1;
     const TYPE_INTEGER           = 2;
     const TYPE_BIT_STRING        = 3;
@@ -56,9 +68,13 @@ abstract class ASN1
     //const TYPE_RELATIVE_OID      = 13;
     const TYPE_SEQUENCE          = 16; // SEQUENCE OF
     const TYPE_SET               = 17; // SET OF
-
-    // More Tag Classes
-    // http://www.obj-sys.com/asn1tutorial/node10.html
+    /**#@-*/
+    /**#@+
+     * More Tag Classes
+     *
+     * @access private
+     * @link http://www.obj-sys.com/asn1tutorial/node10.html
+    */
     const TYPE_NUMERIC_STRING   = 18;
     const TYPE_PRINTABLE_STRING = 19;
     const TYPE_TELETEX_STRING   = 20; // T61String
@@ -72,34 +88,47 @@ abstract class ASN1
     const TYPE_UNIVERSAL_STRING = 28;
     //const TYPE_CHARACTER_STRING = 29;
     const TYPE_BMP_STRING       = 30;
+    /**#@-*/
 
-    // Tag Aliases
-    // These tags are kinda place holders for other tags.
+    /**#@+
+     * Tag Aliases
+     *
+     * These tags are kinda place holders for other tags.
+     *
+     * @access private
+    */
     const TYPE_CHOICE = -1;
     const TYPE_ANY    = -2;
+    /**#@-*/
 
     /**
-     * ASN.1 object identifiers
+     * ASN.1 object identifier
      *
      * @var array
+     * @access private
      * @link http://en.wikipedia.org/wiki/Object_identifier
      */
-    private static $oids = [];
-
-    /**
-     * ASN.1 object identifier reverse mapping
-     *
-     * @var array
-     */
-    private static $reverseOIDs = [];
+    var $oids = array();
 
     /**
      * Default date format
      *
      * @var string
+     * @access private
      * @link http://php.net/class.datetime
      */
-    private static $format = 'D, d M Y H:i:s O';
+    var $format = 'D, d M Y H:i:s O';
+
+    /**
+     * Default date format
+     *
+     * @var array
+     * @access private
+     * @see self::setTimeFormat()
+     * @see self::asn1map()
+     * @link http://php.net/class.datetime
+     */
+    var $encoded;
 
     /**
      * Filters
@@ -107,40 +136,22 @@ abstract class ASN1
      * If the mapping type is self::TYPE_ANY what do we actually encode it as?
      *
      * @var array
-     * @see self::encode_der()
+     * @access private
+     * @see self::_encode_der()
      */
-    private static $filters;
-
-    /**
-     * Current Location of most recent ASN.1 encode process
-     *
-     * Useful for debug purposes
-     *
-     * @var array
-     * @see self::encode_der()
-     */
-    private static $location;
-
-    /**
-     * DER Encoded String
-     *
-     * In case we need to create ASN1\Element object's..
-     *
-     * @var string
-     * @see self::decodeDER()
-     */
-    private static $encoded;
+    var $filters;
 
     /**
      * Type mapping table for the ANY type.
      *
-     * Structured or unknown types are mapped to a \phpseclib3\File\ASN1\Element.
+     * Structured or unknown types are mapped to a \phpseclib\File\ASN1\Element.
      * Unambiguous types get the direct mapping (int/real/bool).
      * Others are mapped as a choice, with an extra indexing level.
      *
      * @var array
+     * @access public
      */
-    const ANY_MAP = [
+    var $ANYmap = array(
         self::TYPE_BOOLEAN              => true,
         self::TYPE_INTEGER              => true,
         self::TYPE_BIT_STRING           => 'bitString',
@@ -163,7 +174,7 @@ abstract class ASN1
         self::TYPE_UNIVERSAL_STRING     => 'universalString',
         //self::TYPE_CHARACTER_STRING     => 'characterString',
         self::TYPE_BMP_STRING           => 'bmpString'
-    ];
+    );
 
     /**
      * String type to character size mapping table.
@@ -172,8 +183,9 @@ abstract class ASN1
      * size == 0 indicates variable length encoding.
      *
      * @var array
+     * @access public
      */
-    const STRING_TYPE_SIZE = [
+    var $stringTypeSize = array(
         self::TYPE_UTF8_STRING      => 0,
         self::TYPE_BMP_STRING       => 2,
         self::TYPE_UNIVERSAL_STRING => 4,
@@ -181,30 +193,26 @@ abstract class ASN1
         self::TYPE_TELETEX_STRING   => 1,
         self::TYPE_IA5_STRING       => 1,
         self::TYPE_VISIBLE_STRING   => 1,
-    ];
+    );
 
     /**
      * Parse BER-encoding
      *
      * Serves a similar purpose to openssl's asn1parse
      *
-     * @param Element|string $encoded
-     * @return ?array
+     * @param string $encoded
+     * @return array
+     * @access public
      */
-    public static function decodeBER($encoded)
+    function decodeBER($encoded)
     {
         if ($encoded instanceof Element) {
             $encoded = $encoded->element;
         }
 
-        self::$encoded = $encoded;
-
-        $decoded = self::decode_ber($encoded);
-        if ($decoded === false) {
-            return null;
-        }
-
-        return [$decoded];
+        $this->encoded = $encoded;
+        // encapsulate in an array for BC with the old decodeBER
+        return array($this->_decode_ber($encoded));
     }
 
     /**
@@ -217,17 +225,15 @@ abstract class ASN1
      * @param string $encoded
      * @param int $start
      * @param int $encoded_pos
-     * @return array|bool
+     * @return array
+     * @access private
      */
-    private static function decode_ber($encoded, $start = 0, $encoded_pos = 0)
+    function _decode_ber($encoded, $start = 0, $encoded_pos = 0)
     {
-        $current = ['start' => $start];
+        $current = array('start' => $start);
 
-        if (!isset($encoded[$encoded_pos])) {
-            return false;
-        }
         $type = ord($encoded[$encoded_pos++]);
-        $startOffset = 1;
+        $start++;
 
         $constructed = ($type >> 5) & 1;
 
@@ -236,28 +242,14 @@ abstract class ASN1
             $tag = 0;
             // process septets (since the eighth bit is ignored, it's not an octet)
             do {
-                if (!isset($encoded[$encoded_pos])) {
-                    return false;
-                }
-                $temp = ord($encoded[$encoded_pos++]);
-                $startOffset++;
-                $loop = $temp >> 7;
+                $loop = ord($encoded[0]) >> 7;
                 $tag <<= 7;
-                $temp &= 0x7F;
-                // "bits 7 to 1 of the first subsequent octet shall not all be zero"
-                if ($startOffset == 2 && $temp == 0) {
-                    return false;
-                }
-                $tag |= $temp;
+                $tag |= ord($encoded[$encoded_pos++]) & 0x7F;
+                $start++;
             } while ($loop);
         }
 
-        $start += $startOffset;
-
         // Length, as discussed in paragraph 8.1.3 of X.690-0207.pdf#page=13
-        if (!isset($encoded[$encoded_pos])) {
-            return false;
-        }
         $length = ord($encoded[$encoded_pos++]);
         $start++;
         if ($length == 0x80) { // indefinite length
@@ -267,16 +259,15 @@ abstract class ASN1
         } elseif ($length & 0x80) { // definite length, long form
             // technically, the long form of the length can be represented by up to 126 octets (bytes), but we'll only
             // support it up to four.
-            $length &= 0x7F;
+            $length&= 0x7F;
             $temp = substr($encoded, $encoded_pos, $length);
             $encoded_pos += $length;
             // tags of indefinte length don't really have a header length; this length includes the tag
-            $current += ['headerlength' => $length + 2];
-            $start += $length;
+            $current+= array('headerlength' => $length + 2);
+            $start+= $length;
             extract(unpack('Nlength', substr(str_pad($temp, 4, chr(0), STR_PAD_LEFT), -4)));
-            /** @var integer $length */
         } else {
-            $current += ['headerlength' => 2];
+            $current+= array('headerlength' => 2);
         }
 
         if ($length > (strlen($encoded) - $encoded_pos)) {
@@ -303,36 +294,33 @@ abstract class ASN1
             case self::CLASS_PRIVATE:
             case self::CLASS_CONTEXT_SPECIFIC:
                 if (!$constructed) {
-                    return [
+                    return array(
                         'type'     => $class,
                         'constant' => $tag,
                         'content'  => $content,
                         'length'   => $length + $start - $current['start']
-                    ] + $current;
+                    );
                 }
 
-                $newcontent = [];
+                $newcontent = array();
                 $remainingLength = $length;
                 while ($remainingLength > 0) {
-                    $temp = self::decode_ber($content, $start, $content_pos);
-                    if ($temp === false) {
-                        break;
-                    }
+                    $temp = $this->_decode_ber($content, $start, $content_pos);
                     $length = $temp['length'];
                     // end-of-content octets - see paragraph 8.1.5
                     if (substr($content, $content_pos + $length, 2) == "\0\0") {
-                        $length += 2;
-                        $start += $length;
+                        $length+= 2;
+                        $start+= $length;
                         $newcontent[] = $temp;
                         break;
                     }
-                    $start += $length;
-                    $remainingLength -= $length;
+                    $start+= $length;
+                    $remainingLength-= $length;
                     $newcontent[] = $temp;
                     $content_pos += $length;
                 }
 
-                return [
+                return array(
                     'type'     => $class,
                     'constant' => $tag,
                     // the array encapsulation is for BC with the old format
@@ -341,25 +329,22 @@ abstract class ASN1
                     // the absence of $content['headerlength'] is how we know if something is indefinite or not.
                     // technically, it could be defined to be 2 and then another indicator could be used but whatever.
                     'length'   => $start - $current['start']
-                ] + $current;
+                ) + $current;
         }
 
-        $current += ['type' => $tag];
+        $current+= array('type' => $tag);
 
         // decode UNIVERSAL tags
         switch ($tag) {
             case self::TYPE_BOOLEAN:
                 // "The contents octets shall consist of a single octet." -- paragraph 8.2.1
-                if ($constructed || strlen($content) != 1) {
-                    return false;
-                }
+                //if (strlen($content) != 1) {
+                //    return false;
+                //}
                 $current['content'] = (bool) ord($content[$content_pos]);
                 break;
             case self::TYPE_INTEGER:
             case self::TYPE_ENUMERATED:
-                if ($constructed) {
-                    return false;
-                }
                 $current['content'] = new BigInteger(substr($content, $content_pos), -256);
                 break;
             case self::TYPE_REAL: // not currently supported
@@ -371,23 +356,20 @@ abstract class ASN1
                 if (!$constructed) {
                     $current['content'] = substr($content, $content_pos);
                 } else {
-                    $temp = self::decode_ber($content, $start, $content_pos);
-                    if ($temp === false) {
-                        return false;
-                    }
-                    $length -= (strlen($content) - $content_pos);
+                    $temp = $this->_decode_ber($content, $start, $content_pos);
+                    $length-= (strlen($content) - $content_pos);
                     $last = count($temp) - 1;
                     for ($i = 0; $i < $last; $i++) {
                         // all subtags should be bit strings
-                        if ($temp[$i]['type'] != self::TYPE_BIT_STRING) {
-                            return false;
-                        }
-                        $current['content'] .= substr($temp[$i]['content'], 1);
+                        //if ($temp[$i]['type'] != self::TYPE_BIT_STRING) {
+                        //    return false;
+                        //}
+                        $current['content'].= substr($temp[$i]['content'], 1);
                     }
                     // all subtags should be bit strings
-                    if ($temp[$last]['type'] != self::TYPE_BIT_STRING) {
-                        return false;
-                    }
+                    //if ($temp[$last]['type'] != self::TYPE_BIT_STRING) {
+                    //    return false;
+                    //}
                     $current['content'] = $temp[$last]['content'][0] . $current['content'] . substr($temp[$i]['content'], 1);
                 }
                 break;
@@ -398,36 +380,30 @@ abstract class ASN1
                     $current['content'] = '';
                     $length = 0;
                     while (substr($content, $content_pos, 2) != "\0\0") {
-                        $temp = self::decode_ber($content, $length + $start, $content_pos);
-                        if ($temp === false) {
-                            return false;
-                        }
+                        $temp = $this->_decode_ber($content, $length + $start, $content_pos);
                         $content_pos += $temp['length'];
                         // all subtags should be octet strings
-                        if ($temp['type'] != self::TYPE_OCTET_STRING) {
-                            return false;
-                        }
-                        $current['content'] .= $temp['content'];
-                        $length += $temp['length'];
+                        //if ($temp['type'] != self::TYPE_OCTET_STRING) {
+                        //    return false;
+                        //}
+                        $current['content'].= $temp['content'];
+                        $length+= $temp['length'];
                     }
                     if (substr($content, $content_pos, 2) == "\0\0") {
-                        $length += 2; // +2 for the EOC
+                        $length+= 2; // +2 for the EOC
                     }
                 }
                 break;
             case self::TYPE_NULL:
                 // "The contents octets shall not contain any octets." -- paragraph 8.8.2
-                if ($constructed || strlen($content)) {
-                    return false;
-                }
+                //if (strlen($content)) {
+                //    return false;
+                //}
                 break;
             case self::TYPE_SEQUENCE:
             case self::TYPE_SET:
-                if (!$constructed) {
-                    return false;
-                }
                 $offset = 0;
-                $current['content'] = [];
+                $current['content'] = array();
                 $content_len = strlen($content);
                 while ($content_pos < $content_len) {
                     // if indefinite length construction was used and we have an end-of-content string next
@@ -436,23 +412,31 @@ abstract class ASN1
                         $length = $offset + 2; // +2 for the EOC
                         break 2;
                     }
-                    $temp = self::decode_ber($content, $start + $offset, $content_pos);
-                    if ($temp === false) {
-                        return false;
-                    }
+                    $temp = $this->_decode_ber($content, $start + $offset, $content_pos);
                     $content_pos += $temp['length'];
                     $current['content'][] = $temp;
-                    $offset += $temp['length'];
+                    $offset+= $temp['length'];
                 }
                 break;
             case self::TYPE_OBJECT_IDENTIFIER:
-                if ($constructed) {
-                    return false;
-                }
-                $current['content'] = self::decodeOID(substr($content, $content_pos));
-                if ($current['content'] === false) {
-                    return false;
+                $temp = ord($content[$content_pos++]);
+                $current['content'] = sprintf('%d.%d', floor($temp / 40), $temp % 40);
+                $valuen = 0;
+                // process septets
+                $content_len = strlen($content);
+                while ($content_pos < $content_len) {
+                    $temp = ord($content[$content_pos++]);
+                    $valuen <<= 7;
+                    $valuen |= $temp & 0x7F;
+                    if (~$temp & 0x80) {
+                        $current['content'].= ".$valuen";
+                        $valuen = 0;
+                    }
                 }
+                // the eighth bit of the last byte should not be 1
+                //if ($temp >> 7) {
+                //    return false;
+                //}
                 break;
             /* Each character string type shall be encoded as if it had been declared:
                [UNIVERSAL x] IMPLICIT OCTET STRING
@@ -482,26 +466,18 @@ abstract class ASN1
             case self::TYPE_UTF8_STRING:
                 // ????
             case self::TYPE_BMP_STRING:
-                if ($constructed) {
-                    return false;
-                }
                 $current['content'] = substr($content, $content_pos);
                 break;
             case self::TYPE_UTC_TIME:
             case self::TYPE_GENERALIZED_TIME:
-                if ($constructed) {
-                    return false;
-                }
-                $current['content'] = self::decodeTime(substr($content, $content_pos), $tag);
-                break;
+                $current['content'] = $this->_decodeTime(substr($content, $content_pos), $tag);
             default:
-                return false;
         }
 
-        $start += $length;
+        $start+= $length;
 
         // ie. length is the length of the full TLV encoding - it's not just the length of the value
-        return $current + ['length' => $start - $current['start']];
+        return $current + array('length' => $start - $current['start']);
     }
 
     /**
@@ -514,9 +490,10 @@ abstract class ASN1
      * @param array $decoded
      * @param array $mapping
      * @param array $special
-     * @return array|bool|Element|string|null
+     * @return array
+     * @access public
      */
-    public static function asn1map(array $decoded, $mapping, $special = [])
+    function asn1map($decoded, $mapping, $special = array())
     {
         if (isset($mapping['explicit']) && is_array($decoded['content'])) {
             $decoded = $decoded['content'][0];
@@ -525,13 +502,12 @@ abstract class ASN1
         switch (true) {
             case $mapping['type'] == self::TYPE_ANY:
                 $intype = $decoded['type'];
-                // !isset(self::ANY_MAP[$intype]) produces a fatal error on PHP 5.6
-                if (isset($decoded['constant']) || !array_key_exists($intype, self::ANY_MAP) || (ord(self::$encoded[$decoded['start']]) & 0x20)) {
-                    return new Element(substr(self::$encoded, $decoded['start'], $decoded['length']));
+                if (isset($decoded['constant']) || !isset($this->ANYmap[$intype]) || (ord($this->encoded[$decoded['start']]) & 0x20)) {
+                    return new Element(substr($this->encoded, $decoded['start'], $decoded['length']));
                 }
-                $inmap = self::ANY_MAP[$intype];
+                $inmap = $this->ANYmap[$intype];
                 if (is_string($inmap)) {
-                    return [$inmap => self::asn1map($decoded, ['type' => $intype] + $mapping, $special)];
+                    return array($inmap => $this->asn1map($decoded, array('type' => $intype) + $mapping, $special));
                 }
                 break;
             case $mapping['type'] == self::TYPE_CHOICE:
@@ -539,19 +515,19 @@ abstract class ASN1
                     switch (true) {
                         case isset($option['constant']) && $option['constant'] == $decoded['constant']:
                         case !isset($option['constant']) && $option['type'] == $decoded['type']:
-                            $value = self::asn1map($decoded, $option, $special);
+                            $value = $this->asn1map($decoded, $option, $special);
                             break;
                         case !isset($option['constant']) && $option['type'] == self::TYPE_CHOICE:
-                            $v = self::asn1map($decoded, $option, $special);
+                            $v = $this->asn1map($decoded, $option, $special);
                             if (isset($v)) {
                                 $value = $v;
                             }
                     }
                     if (isset($value)) {
                         if (isset($special[$key])) {
-                            $value = $special[$key]($value);
+                            $value = call_user_func($special[$key], $value);
                         }
-                        return [$key => $value];
+                        return array($key => $value);
                     }
                 }
                 return null;
@@ -577,13 +553,13 @@ abstract class ASN1
 
         switch ($decoded['type']) {
             case self::TYPE_SEQUENCE:
-                $map = [];
+                $map = array();
 
                 // ignore the min and max
                 if (isset($mapping['min']) && isset($mapping['max'])) {
                     $child = $mapping['children'];
                     foreach ($decoded['content'] as $content) {
-                        if (($map[] = self::asn1map($content, $child, $special)) === null) {
+                        if (($map[] = $this->asn1map($content, $child, $special)) === null) {
                             return null;
                         }
                     }
@@ -604,7 +580,7 @@ abstract class ASN1
                             $childClass = $tempClass = self::CLASS_UNIVERSAL;
                             $constant = null;
                             if (isset($temp['constant'])) {
-                                $tempClass = $temp['type'];
+                                $tempClass = isset($temp['class']) ? $temp['class'] : self::CLASS_CONTEXT_SPECIFIC;
                             }
                             if (isset($child['class'])) {
                                 $childClass = $child['class'];
@@ -619,43 +595,43 @@ abstract class ASN1
                                 $maymatch = $constant == $temp['constant'] && $childClass == $tempClass;
                             } else {
                                 // Can only match if no constant expected and type matches or is generic.
-                                $maymatch = !isset($child['constant']) && array_search($child['type'], [$temp['type'], self::TYPE_ANY, self::TYPE_CHOICE]) !== false;
+                                $maymatch = !isset($child['constant']) && array_search($child['type'], array($temp['type'], self::TYPE_ANY, self::TYPE_CHOICE)) !== false;
                             }
                         }
                     }
 
                     if ($maymatch) {
                         // Attempt submapping.
-                        $candidate = self::asn1map($temp, $child, $special);
+                        $candidate = $this->asn1map($temp, $child, $special);
                         $maymatch = $candidate !== null;
                     }
 
                     if ($maymatch) {
                         // Got the match: use it.
                         if (isset($special[$key])) {
-                            $candidate = $special[$key]($candidate);
+                            $candidate = call_user_func($special[$key], $candidate);
                         }
                         $map[$key] = $candidate;
                         $i++;
                     } elseif (isset($child['default'])) {
-                        $map[$key] = $child['default'];
+                        $map[$key] = $child['default']; // Use default.
                     } elseif (!isset($child['optional'])) {
                         return null; // Syntax error.
                     }
                 }
 
                 // Fail mapping if all input items have not been consumed.
-                return $i < $n ? null : $map;
+                return $i < $n ? null: $map;
 
             // the main diff between sets and sequences is the encapsulation of the foreach in another for loop
             case self::TYPE_SET:
-                $map = [];
+                $map = array();
 
                 // ignore the min and max
                 if (isset($mapping['min']) && isset($mapping['max'])) {
                     $child = $mapping['children'];
                     foreach ($decoded['content'] as $content) {
-                        if (($map[] = self::asn1map($content, $child, $special)) === null) {
+                        if (($map[] = $this->asn1map($content, $child, $special)) === null) {
                             return null;
                         }
                     }
@@ -667,7 +643,7 @@ abstract class ASN1
                     $temp = $decoded['content'][$i];
                     $tempClass = self::CLASS_UNIVERSAL;
                     if (isset($temp['constant'])) {
-                        $tempClass = $temp['type'];
+                        $tempClass = isset($temp['class']) ? $temp['class'] : self::CLASS_CONTEXT_SPECIFIC;
                     }
 
                     foreach ($mapping['children'] as $key => $child) {
@@ -691,13 +667,13 @@ abstract class ASN1
                                 $maymatch = $constant == $temp['constant'] && $childClass == $tempClass;
                             } else {
                                 // Can only match if no constant expected and type matches or is generic.
-                                $maymatch = !isset($child['constant']) && array_search($child['type'], [$temp['type'], self::TYPE_ANY, self::TYPE_CHOICE]) !== false;
+                                $maymatch = !isset($child['constant']) && array_search($child['type'], array($temp['type'], self::TYPE_ANY, self::TYPE_CHOICE)) !== false;
                             }
                         }
 
                         if ($maymatch) {
                             // Attempt submapping.
-                            $candidate = self::asn1map($temp, $child, $special);
+                            $candidate = $this->asn1map($temp, $child, $special);
                             $maymatch = $candidate !== null;
                         }
 
@@ -707,7 +683,7 @@ abstract class ASN1
 
                         // Got the match: use it.
                         if (isset($special[$key])) {
-                            $candidate = $special[$key]($candidate);
+                            $candidate = call_user_func($special[$key], $candidate);
                         }
                         $map[$key] = $candidate;
                         break;
@@ -725,20 +701,13 @@ abstract class ASN1
                 }
                 return $map;
             case self::TYPE_OBJECT_IDENTIFIER:
-                return isset(self::$oids[$decoded['content']]) ? self::$oids[$decoded['content']] : $decoded['content'];
+                return isset($this->oids[$decoded['content']]) ? $this->oids[$decoded['content']] : $decoded['content'];
             case self::TYPE_UTC_TIME:
             case self::TYPE_GENERALIZED_TIME:
-                // for explicitly tagged optional stuff
-                if (is_array($decoded['content'])) {
-                    $decoded['content'] = $decoded['content'][0]['content'];
+                if (isset($mapping['implicit'])) {
+                    $decoded['content'] = $this->_decodeTime($decoded['content'], $decoded['type']);
                 }
-                // for implicitly tagged optional stuff
-                // in theory, doing isset($mapping['implicit']) would work but malformed certs do exist
-                // in the wild that OpenSSL decodes without issue so we'll support them as well
-                if (!is_object($decoded['content'])) {
-                    $decoded['content'] = self::decodeTime($decoded['content'], $decoded['type']);
-                }
-                return $decoded['content'] ? $decoded['content']->format(self::$format) : false;
+                return @date($this->format, $decoded['content']);
             case self::TYPE_BIT_STRING:
                 if (isset($mapping['mapping'])) {
                     $offset = ord($decoded['content'][0]);
@@ -751,7 +720,7 @@ abstract class ASN1
                         therefore ensure that different semantics are not associated with such values which differ only in the number of trailing
                         0 bits."
                     */
-                    $bits = count($mapping['mapping']) == $size ? [] : array_fill(0, count($mapping['mapping']) - $size, false);
+                    $bits = count($mapping['mapping']) == $size ? array() : array_fill(0, count($mapping['mapping']) - $size, false);
                     for ($i = strlen($decoded['content']) - 1; $i > 0; $i--) {
                         $current = ord($decoded['content'][$i]);
                         for ($j = $offset; $j < 8; $j++) {
@@ -759,7 +728,7 @@ abstract class ASN1
                         }
                         $offset = 0;
                     }
-                    $values = [];
+                    $values = array();
                     $map = array_reverse($mapping['mapping']);
                     foreach ($map as $i => $value) {
                         if ($bits[$i]) {
@@ -768,12 +737,12 @@ abstract class ASN1
                     }
                     return $values;
                 }
-                // fall-through
             case self::TYPE_OCTET_STRING:
-                return $decoded['content'];
+                return base64_encode($decoded['content']);
             case self::TYPE_NULL:
                 return '';
             case self::TYPE_BOOLEAN:
+                return $decoded['content'];
             case self::TYPE_NUMERIC_STRING:
             case self::TYPE_PRINTABLE_STRING:
             case self::TYPE_TELETEX_STRING:
@@ -802,26 +771,6 @@ abstract class ASN1
         }
     }
 
-    /**
-     * DER-decode the length
-     *
-     * DER supports lengths up to (2**8)**127, however, we'll only support lengths up to (2**8)**4.  See
-     * {@link http://itu.int/ITU-T/studygroups/com17/languages/X.690-0207.pdf#p=13 X.690 paragraph 8.1.3} for more information.
-     *
-     * @param string $string
-     * @return int
-     */
-    public static function decodeLength(&$string)
-    {
-        $length = ord(Strings::shift($string));
-        if ($length & 0x80) { // definite length, long form
-            $length &= 0x7F;
-            $temp = Strings::shift($string, $length);
-            list(, $length) = unpack('N', substr(str_pad($temp, 4, chr(0), STR_PAD_LEFT), -4));
-        }
-        return $length;
-    }
-
     /**
      * ASN.1 Encode
      *
@@ -830,27 +779,28 @@ abstract class ASN1
      *
      * "Special" mappings can be applied via $special.
      *
-     * @param Element|string|array $source
-     * @param array $mapping
-     * @param array $special
+     * @param string $source
+     * @param string $mapping
+     * @param int $idx
      * @return string
+     * @access public
      */
-    public static function encodeDER($source, $mapping, $special = [])
+    function encodeDER($source, $mapping, $special = array())
     {
-        self::$location = [];
-        return self::encode_der($source, $mapping, null, $special);
+        $this->location = array();
+        return $this->_encode_der($source, $mapping, null, $special);
     }
 
     /**
      * ASN.1 Encode (Helper function)
      *
-     * @param Element|string|array|null $source
-     * @param array $mapping
+     * @param string $source
+     * @param string $mapping
      * @param int $idx
-     * @param array $special
      * @return string
+     * @access private
      */
-    private static function encode_der($source, array $mapping, $idx = null, array $special = [])
+    function _encode_der($source, $mapping, $idx = null, $special = array())
     {
         if ($source instanceof Element) {
             return $source->element;
@@ -863,9 +813,9 @@ abstract class ASN1
 
         if (isset($idx)) {
             if (isset($special[$idx])) {
-                $source = $special[$idx]($source);
+                $source = call_user_func($special[$idx], $source);
             }
-            self::$location[] = $idx;
+            $this->location[] = $idx;
         }
 
         $tag = $mapping['type'];
@@ -873,19 +823,19 @@ abstract class ASN1
         switch ($tag) {
             case self::TYPE_SET:    // Children order is not important, thus process in sequence.
             case self::TYPE_SEQUENCE:
-                $tag |= 0x20; // set the constructed bit
+                $tag|= 0x20; // set the constructed bit
 
                 // ignore the min and max
                 if (isset($mapping['min']) && isset($mapping['max'])) {
-                    $value = [];
+                    $value = array();
                     $child = $mapping['children'];
 
                     foreach ($source as $content) {
-                        $temp = self::encode_der($content, $child, null, $special);
+                        $temp = $this->_encode_der($content, $child, null, $special);
                         if ($temp === false) {
                             return false;
                         }
-                        $value[] = $temp;
+                        $value[]= $temp;
                     }
                     /* "The encodings of the component values of a set-of value shall appear in ascending order, the encodings being compared
                         as octet strings with the shorter components being padded at their trailing end with 0-octets.
@@ -895,7 +845,7 @@ abstract class ASN1
                     if ($mapping['type'] == self::TYPE_SET) {
                         sort($value);
                     }
-                    $value = implode('', $value);
+                    $value = implode($value, '');
                     break;
                 }
 
@@ -908,7 +858,7 @@ abstract class ASN1
                         continue;
                     }
 
-                    $temp = self::encode_der($source[$key], $child, $key, $special);
+                    $temp = $this->_encode_der($source[$key], $child, $key, $special);
                     if ($temp === false) {
                         return false;
                     }
@@ -932,13 +882,13 @@ abstract class ASN1
                          */
                         if (isset($child['explicit']) || $child['type'] == self::TYPE_CHOICE) {
                             $subtag = chr((self::CLASS_CONTEXT_SPECIFIC << 6) | 0x20 | $child['constant']);
-                            $temp = $subtag . self::encodeLength(strlen($temp)) . $temp;
+                            $temp = $subtag . $this->_encodeLength(strlen($temp)) . $temp;
                         } else {
                             $subtag = chr((self::CLASS_CONTEXT_SPECIFIC << 6) | (ord($temp[0]) & 0x20) | $child['constant']);
                             $temp = $subtag . substr($temp, 1);
                         }
                     }
-                    $value .= $temp;
+                    $value.= $temp;
                 }
                 break;
             case self::TYPE_CHOICE:
@@ -949,7 +899,7 @@ abstract class ASN1
                         continue;
                     }
 
-                    $temp = self::encode_der($source[$key], $child, $key, $special);
+                    $temp = $this->_encode_der($source[$key], $child, $key, $special);
                     if ($temp === false) {
                         return false;
                     }
@@ -966,7 +916,7 @@ abstract class ASN1
                     if (isset($child['constant'])) {
                         if (isset($child['explicit']) || $child['type'] == self::TYPE_CHOICE) {
                             $subtag = chr((self::CLASS_CONTEXT_SPECIFIC << 6) | 0x20 | $child['constant']);
-                            $temp = $subtag . self::encodeLength(strlen($temp)) . $temp;
+                            $temp = $subtag . $this->_encodeLength(strlen($temp)) . $temp;
                         } else {
                             $subtag = chr((self::CLASS_CONTEXT_SPECIFIC << 6) | (ord($temp[0]) & 0x20) | $child['constant']);
                             $temp = $subtag . substr($temp, 1);
@@ -975,7 +925,7 @@ abstract class ASN1
                 }
 
                 if (isset($idx)) {
-                    array_pop(self::$location);
+                    array_pop($this->location);
                 }
 
                 if ($temp && isset($mapping['cast'])) {
@@ -1005,12 +955,8 @@ abstract class ASN1
             case self::TYPE_UTC_TIME:
             case self::TYPE_GENERALIZED_TIME:
                 $format = $mapping['type'] == self::TYPE_UTC_TIME ? 'y' : 'Y';
-                $format .= 'mdHis';
-                // if $source does _not_ include timezone information within it then assume that the timezone is GMT
-                $date = new \DateTime($source, new \DateTimeZone('GMT'));
-                // if $source _does_ include timezone information within it then convert the time to GMT
-                $date->setTimezone(new \DateTimeZone('GMT'));
-                $value = $date->format($format) . 'Z';
+                $format.= 'mdHis';
+                $value = @gmdate($format, strtotime($source)) . 'Z';
                 break;
             case self::TYPE_BIT_STRING:
                 if (isset($mapping['mapping'])) {
@@ -1039,47 +985,66 @@ abstract class ASN1
                     $bits = implode('', array_pad($bits, $size + $offset + 1, 0));
                     $bytes = explode(' ', rtrim(chunk_split($bits, 8, ' ')));
                     foreach ($bytes as $byte) {
-                        $value .= chr(bindec($byte));
+                        $value.= chr(bindec($byte));
                     }
 
                     break;
                 }
-                // fall-through
             case self::TYPE_OCTET_STRING:
                 /* The initial octet shall encode, as an unsigned binary integer with bit 1 as the least significant bit,
                    the number of unused bits in the final subsequent octet. The number shall be in the range zero to seven.
 
                    -- http://www.itu.int/ITU-T/studygroups/com17/languages/X.690-0207.pdf#page=16 */
-                $value = $source;
+                $value = base64_decode($source);
                 break;
             case self::TYPE_OBJECT_IDENTIFIER:
-                $value = self::encodeOID($source);
+                $oid = preg_match('#(?:\d+\.)+#', $source) ? $source : array_search($source, $this->oids);
+                if ($oid === false) {
+                    user_error('Invalid OID');
+                    return false;
+                }
+                $value = '';
+                $parts = explode('.', $oid);
+                $value = chr(40 * $parts[0] + $parts[1]);
+                for ($i = 2; $i < count($parts); $i++) {
+                    $temp = '';
+                    if (!$parts[$i]) {
+                        $temp = "\0";
+                    } else {
+                        while ($parts[$i]) {
+                            $temp = chr(0x80 | ($parts[$i] & 0x7F)) . $temp;
+                            $parts[$i] >>= 7;
+                        }
+                        $temp[strlen($temp) - 1] = $temp[strlen($temp) - 1] & chr(0x7F);
+                    }
+                    $value.= $temp;
+                }
                 break;
             case self::TYPE_ANY:
-                $loc = self::$location;
+                $loc = $this->location;
                 if (isset($idx)) {
-                    array_pop(self::$location);
+                    array_pop($this->location);
                 }
 
                 switch (true) {
                     case !isset($source):
-                        return self::encode_der(null, ['type' => self::TYPE_NULL] + $mapping, null, $special);
+                        return $this->_encode_der(null, array('type' => self::TYPE_NULL) + $mapping, null, $special);
                     case is_int($source):
                     case $source instanceof BigInteger:
-                        return self::encode_der($source, ['type' => self::TYPE_INTEGER] + $mapping, null, $special);
+                        return $this->_encode_der($source, array('type' => self::TYPE_INTEGER) + $mapping, null, $special);
                     case is_float($source):
-                        return self::encode_der($source, ['type' => self::TYPE_REAL] + $mapping, null, $special);
+                        return $this->_encode_der($source, array('type' => self::TYPE_REAL) + $mapping, null, $special);
                     case is_bool($source):
-                        return self::encode_der($source, ['type' => self::TYPE_BOOLEAN] + $mapping, null, $special);
+                        return $this->_encode_der($source, array('type' => self::TYPE_BOOLEAN) + $mapping, null, $special);
                     case is_array($source) && count($source) == 1:
                         $typename = implode('', array_keys($source));
-                        $outtype = array_search($typename, self::ANY_MAP, true);
+                        $outtype = array_search($typename, $this->ANYmap, true);
                         if ($outtype !== false) {
-                            return self::encode_der($source[$typename], ['type' => $outtype] + $mapping, null, $special);
+                            return $this->_encode_der($source[$typename], array('type' => $outtype) + $mapping, null, $special);
                         }
                 }
 
-                $filters = self::$filters;
+                $filters = $this->filters;
                 foreach ($loc as $part) {
                     if (!isset($filters[$part])) {
                         $filters = false;
@@ -1088,9 +1053,10 @@ abstract class ASN1
                     $filters = $filters[$part];
                 }
                 if ($filters === false) {
-                    throw new \RuntimeException('No filters defined for ' . implode('/', $loc));
+                    user_error('No filters defined for ' . implode('/', $loc));
+                    return false;
                 }
-                return self::encode_der($source, $filters + $mapping, null, $special);
+                return $this->_encode_der($source, $filters + $mapping, null, $special);
             case self::TYPE_NULL:
                 $value = '';
                 break;
@@ -1111,137 +1077,44 @@ abstract class ASN1
                 $value = $source ? "\xFF" : "\x00";
                 break;
             default:
-                throw new \RuntimeException('Mapping provides no type definition for ' . implode('/', self::$location));
+                user_error('Mapping provides no type definition for ' . implode('/', $this->location));
+                return false;
         }
 
         if (isset($idx)) {
-            array_pop(self::$location);
+            array_pop($this->location);
         }
 
         if (isset($mapping['cast'])) {
             if (isset($mapping['explicit']) || $mapping['type'] == self::TYPE_CHOICE) {
-                $value = chr($tag) . self::encodeLength(strlen($value)) . $value;
+                $value = chr($tag) . $this->_encodeLength(strlen($value)) . $value;
                 $tag = ($mapping['class'] << 6) | 0x20 | $mapping['cast'];
             } else {
                 $tag = ($mapping['class'] << 6) | (ord($temp[0]) & 0x20) | $mapping['cast'];
             }
         }
 
-        return chr($tag) . self::encodeLength(strlen($value)) . $value;
+        return chr($tag) . $this->_encodeLength(strlen($value)) . $value;
     }
 
     /**
-     * BER-decode the OID
+     * DER-encode the length
      *
-     * Called by _decode_ber()
+     * DER supports lengths up to (2**8)**127, however, we'll only support lengths up to (2**8)**4.  See
+     * {@link http://itu.int/ITU-T/studygroups/com17/languages/X.690-0207.pdf#p=13 X.690 paragraph 8.1.3} for more information.
      *
-     * @param string $content
+     * @access private
+     * @param int $length
      * @return string
      */
-    public static function decodeOID($content)
+    function _encodeLength($length)
     {
-        static $eighty;
-        if (!$eighty) {
-            $eighty = new BigInteger(80);
+        if ($length <= 0x7F) {
+            return chr($length);
         }
 
-        $oid = [];
-        $pos = 0;
-        $len = strlen($content);
-        // see https://github.com/openjdk/jdk/blob/2deb318c9f047ec5a4b160d66a4b52f93688ec42/src/java.base/share/classes/sun/security/util/ObjectIdentifier.java#L55
-        if ($len > 4096) {
-            //throw new \RuntimeException("Object identifier size is limited to 4096 bytes ($len bytes present)");
-            return false;
-        }
-
-        if (ord($content[$len - 1]) & 0x80) {
-            return false;
-        }
-
-        $n = new BigInteger();
-        while ($pos < $len) {
-            $temp = ord($content[$pos++]);
-            $n = $n->bitwise_leftShift(7);
-            $n = $n->bitwise_or(new BigInteger($temp & 0x7F));
-            if (~$temp & 0x80) {
-                $oid[] = $n;
-                $n = new BigInteger();
-            }
-        }
-        $part1 = array_shift($oid);
-        $first = floor(ord($content[0]) / 40);
-        /*
-          "This packing of the first two object identifier components recognizes that only three values are allocated from the root
-           node, and at most 39 subsequent values from nodes reached by X = 0 and X = 1."
-
-          -- https://www.itu.int/ITU-T/studygroups/com17/languages/X.690-0207.pdf#page=22
-        */
-        if ($first <= 2) { // ie. 0 <= ord($content[0]) < 120 (0x78)
-            array_unshift($oid, ord($content[0]) % 40);
-            array_unshift($oid, $first);
-        } else {
-            array_unshift($oid, $part1->subtract($eighty));
-            array_unshift($oid, 2);
-        }
-
-        return implode('.', $oid);
-    }
-
-    /**
-     * DER-encode the OID
-     *
-     * Called by _encode_der()
-     *
-     * @param string $source
-     * @return string
-     */
-    public static function encodeOID($source)
-    {
-        static $mask, $zero, $forty;
-        if (!$mask) {
-            $mask = new BigInteger(0x7F);
-            $zero = new BigInteger();
-            $forty = new BigInteger(40);
-        }
-
-        if (!preg_match('#(?:\d+\.)+#', $source)) {
-            $oid = isset(self::$reverseOIDs[$source]) ? self::$reverseOIDs[$source] : false;
-        } else {
-            $oid = $source;
-        }
-        if ($oid === false) {
-            throw new \RuntimeException('Invalid OID');
-        }
-
-        $parts = explode('.', $oid);
-        $part1 = array_shift($parts);
-        $part2 = array_shift($parts);
-
-        $first = new BigInteger($part1);
-        $first = $first->multiply($forty);
-        $first = $first->add(new BigInteger($part2));
-
-        array_unshift($parts, $first->toString());
-
-        $value = '';
-        foreach ($parts as $part) {
-            if (!$part) {
-                $temp = "\0";
-            } else {
-                $temp = '';
-                $part = new BigInteger($part);
-                while (!$part->equals($zero)) {
-                    $submask = $part->bitwise_and($mask);
-                    $submask->setPrecision(8);
-                    $temp = (chr(0x80) | $submask->toBytes()) . $temp;
-                    $part = $part->bitwise_rightShift(7);
-                }
-                $temp[strlen($temp) - 1] = $temp[strlen($temp) - 1] & chr(0x7F);
-            }
-            $value .= $temp;
-        }
-
-        return $value;
+        $temp = ltrim(pack('N', $length), chr(0));
+        return pack('Ca*', 0x80 | strlen($temp), $temp);
     }
 
     /**
@@ -1249,11 +1122,12 @@ abstract class ASN1
      *
      * Called by _decode_ber() and in the case of implicit tags asn1map().
      *
+     * @access private
      * @param string $content
      * @param int $tag
-     * @return \DateTime|false
+     * @return string
      */
-    private static function decodeTime($content, $tag)
+    function _decodeTime($content, $tag)
     {
         /* UTCTime:
            http://tools.ietf.org/html/rfc5280#section-4.1.2.5.1
@@ -1263,32 +1137,33 @@ abstract class ASN1
            http://tools.ietf.org/html/rfc5280#section-4.1.2.5.2
            http://www.obj-sys.com/asn1tutorial/node14.html */
 
-        $format = 'YmdHis';
+        $pattern = $tag == self::TYPE_UTC_TIME ?
+            '#(..)(..)(..)(..)(..)(..)(.*)#' :
+            '#(....)(..)(..)(..)(..)(..).*([Z+-].*)$#';
+
+        preg_match($pattern, $content, $matches);
+
+        list(, $year, $month, $day, $hour, $minute, $second, $timezone) = $matches;
 
         if ($tag == self::TYPE_UTC_TIME) {
-            // https://www.itu.int/ITU-T/studygroups/com17/languages/X.690-0207.pdf#page=28 says "the seconds
-            // element shall always be present" but none-the-less I've seen X509 certs where it isn't and if the
-            // browsers parse it phpseclib ought to too
-            if (preg_match('#^(\d{10})(Z|[+-]\d{4})$#', $content, $matches)) {
-                $content = $matches[1] . '00' . $matches[2];
+            $year = $year >= 50 ? "19$year" : "20$year";
+        }
+
+        if ($timezone == 'Z') {
+            $mktime = 'gmmktime';
+            $timezone = 0;
+        } elseif (preg_match('#([+-])(\d\d)(\d\d)#', $timezone, $matches)) {
+            $mktime = 'gmmktime';
+            $timezone = 60 * $matches[3] + 3600 * $matches[2];
+            if ($matches[1] == '-') {
+                $timezone = -$timezone;
             }
-            $prefix = substr($content, 0, 2) >= 50 ? '19' : '20';
-            $content = $prefix . $content;
-        } elseif (strpos($content, '.') !== false) {
-            $format .= '.u';
+        } else {
+            $mktime = 'mktime';
+            $timezone = 0;
         }
 
-        if ($content[strlen($content) - 1] == 'Z') {
-            $content = substr($content, 0, -1) . '+0000';
-        }
-
-        if (strpos($content, '-') !== false || strpos($content, '+') !== false) {
-            $format .= 'O';
-        }
-
-        // error supression isn't necessary as of PHP 7.0:
-        // http://php.net/manual/en/migration70.other-changes.php
-        return @\DateTime::createFromFormat($format, $content);
+        return @$mktime($hour, $minute, $second, $month, $day, $year) + $timezone;
     }
 
     /**
@@ -1296,38 +1171,55 @@ abstract class ASN1
      *
      * Sets the time / date format for asn1map().
      *
+     * @access public
      * @param string $format
      */
-    public static function setTimeFormat($format)
+    function setTimeFormat($format)
     {
-        self::$format = $format;
+        $this->format = $format;
     }
 
     /**
      * Load OIDs
      *
      * Load the relevant OIDs for a particular ASN.1 semantic mapping.
-     * Previously loaded OIDs are retained.
      *
+     * @access public
      * @param array $oids
      */
-    public static function loadOIDs(array $oids)
+    function loadOIDs($oids)
     {
-        self::$reverseOIDs += $oids;
-        self::$oids = array_flip(self::$reverseOIDs);
+        $this->oids = $oids;
     }
 
     /**
-     * Set filters
+     * Load filters
      *
-     * See \phpseclib3\File\X509, etc, for an example.
-     * Previously loaded filters are not retained.
+     * See \phpseclib\File\X509, etc, for an example.
      *
+     * @access public
      * @param array $filters
      */
-    public static function setFilters(array $filters)
+    function loadFilters($filters)
     {
-        self::$filters = $filters;
+        $this->filters = $filters;
+    }
+
+    /**
+     * String Shift
+     *
+     * Inspired by array_shift
+     *
+     * @param string $string
+     * @param int $index
+     * @return string
+     * @access private
+     */
+    function _string_shift(&$string, $index = 1)
+    {
+        $substr = substr($string, 0, $index);
+        $string = substr($string, $index);
+        return $substr;
     }
 
     /**
@@ -1340,15 +1232,15 @@ abstract class ASN1
      * @param int $from
      * @param int $to
      * @return string
+     * @access public
      */
-    public static function convert($in, $from = self::TYPE_UTF8_STRING, $to = self::TYPE_UTF8_STRING)
+    function convert($in, $from = self::TYPE_UTF8_STRING, $to = self::TYPE_UTF8_STRING)
     {
-        // isset(self::STRING_TYPE_SIZE[$from] returns a fatal error on PHP 5.6
-        if (!array_key_exists($from, self::STRING_TYPE_SIZE) || !array_key_exists($to, self::STRING_TYPE_SIZE)) {
+        if (!isset($this->stringTypeSize[$from]) || !isset($this->stringTypeSize[$to])) {
             return false;
         }
-        $insize = self::STRING_TYPE_SIZE[$from];
-        $outsize = self::STRING_TYPE_SIZE[$to];
+        $insize = $this->stringTypeSize[$from];
+        $outsize = $this->stringTypeSize[$to];
         $inlength = strlen($in);
         $out = '';
 
@@ -1363,10 +1255,8 @@ abstract class ASN1
                 case $insize == 4:
                     $c = ($c << 8) | ord($in[$i++]);
                     $c = ($c << 8) | ord($in[$i++]);
-                    // fall-through
                 case $insize == 2:
                     $c = ($c << 8) | ord($in[$i++]);
-                    // fall-through
                 case $insize == 1:
                     break;
                 case ($c & 0x80) == 0x00:
@@ -1395,11 +1285,9 @@ abstract class ASN1
                     $c >>= 8;
                     $v .= chr($c & 0xFF);
                     $c >>= 8;
-                    // fall-through
                 case $outsize == 2:
                     $v .= chr($c & 0xFF);
                     $c >>= 8;
-                    // fall-through
                 case $outsize == 1:
                     $v .= chr($c & 0xFF);
                     $c >>= 8;
@@ -1407,28 +1295,23 @@ abstract class ASN1
                         return false;
                     }
                     break;
-                case ($c & (PHP_INT_SIZE == 8 ? 0x80000000 : (1 << 31))) != 0:
+                case ($c & 0x80000000) != 0:
                     return false;
                 case $c >= 0x04000000:
                     $v .= chr(0x80 | ($c & 0x3F));
                     $c = ($c >> 6) | 0x04000000;
-                    // fall-through
                 case $c >= 0x00200000:
                     $v .= chr(0x80 | ($c & 0x3F));
                     $c = ($c >> 6) | 0x00200000;
-                    // fall-through
                 case $c >= 0x00010000:
                     $v .= chr(0x80 | ($c & 0x3F));
                     $c = ($c >> 6) | 0x00010000;
-                    // fall-through
                 case $c >= 0x00000800:
                     $v .= chr(0x80 | ($c & 0x3F));
                     $c = ($c >> 6) | 0x00000800;
-                    // fall-through
                 case $c >= 0x00000080:
                     $v .= chr(0x80 | ($c & 0x3F));
                     $c = ($c >> 6) | 0x000000C0;
-                    // fall-through
                 default:
                     $v .= chr($c);
                     break;
@@ -1437,77 +1320,4 @@ abstract class ASN1
         }
         return $out;
     }
-
-    /**
-     * Extract raw BER from Base64 encoding
-     *
-     * @param string $str
-     * @return string
-     */
-    public static function extractBER($str)
-    {
-        /* X.509 certs are assumed to be base64 encoded but sometimes they'll have additional things in them
-         * above and beyond the ceritificate.
-         * ie. some may have the following preceding the -----BEGIN CERTIFICATE----- line:
-         *
-         * Bag Attributes
-         *     localKeyID: 01 00 00 00
-         * subject=/O=organization/OU=org unit/CN=common name
-         * issuer=/O=organization/CN=common name
-         */
-        if (strlen($str) > ini_get('pcre.backtrack_limit')) {
-            $temp = $str;
-        } else {
-            $temp = preg_replace('#.*?^-+[^-]+-+[\r\n ]*$#ms', '', $str, 1);
-            $temp = preg_replace('#-+END.*[\r\n ]*.*#ms', '', $temp, 1);
-        }
-        // remove new lines
-        $temp = str_replace(["\r", "\n", ' '], '', $temp);
-        // remove the -----BEGIN CERTIFICATE----- and -----END CERTIFICATE----- stuff
-        $temp = preg_replace('#^-+[^-]+-+|-+[^-]+-+$#', '', $temp);
-        $temp = preg_match('#^[a-zA-Z\d/+]*={0,2}$#', $temp) ? Strings::base64_decode($temp) : false;
-        return $temp != false ? $temp : $str;
-    }
-
-    /**
-     * DER-encode the length
-     *
-     * DER supports lengths up to (2**8)**127, however, we'll only support lengths up to (2**8)**4.  See
-     * {@link http://itu.int/ITU-T/studygroups/com17/languages/X.690-0207.pdf#p=13 X.690 paragraph 8.1.3} for more information.
-     *
-     * @param int $length
-     * @return string
-     */
-    public static function encodeLength($length)
-    {
-        if ($length <= 0x7F) {
-            return chr($length);
-        }
-
-        $temp = ltrim(pack('N', $length), chr(0));
-        return pack('Ca*', 0x80 | strlen($temp), $temp);
-    }
-
-    /**
-     * Returns the OID corresponding to a name
-     *
-     * What's returned in the associative array returned by loadX509() (or load*()) is either a name or an OID if
-     * no OID to name mapping is available. The problem with this is that what may be an unmapped OID in one version
-     * of phpseclib may not be unmapped in the next version, so apps that are looking at this OID may not be able
-     * to work from version to version.
-     *
-     * This method will return the OID if a name is passed to it and if no mapping is avialable it'll assume that
-     * what's being passed to it already is an OID and return that instead. A few examples.
-     *
-     * getOID('2.16.840.1.101.3.4.2.1') == '2.16.840.1.101.3.4.2.1'
-     * getOID('id-sha256') == '2.16.840.1.101.3.4.2.1'
-     * getOID('zzz') == 'zzz'
-     *
-     * @param string $name
-     * @return string
-     */
-    public static function getOID($name)
-    {
-        return isset(self::$reverseOIDs[$name]) ? self::$reverseOIDs[$name] : $name;
-    }
 }
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Element.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Element.php
index 6540b421..68246e2b 100644
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Element.php
+++ b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Element.php
@@ -1,25 +1,27 @@
 <?php
-
 /**
- * ASN.1 Raw Element
+ * Pure-PHP ASN.1 Parser
  *
  * PHP version 5
  *
+ * @category  File
+ * @package   ASN1
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2012 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
  * @link      http://phpseclib.sourceforge.net
  */
 
-namespace phpseclib3\File\ASN1;
+namespace phpseclib\File\ASN1;
 
 /**
- * ASN.1 Raw Element
+ * ASN.1 Element
  *
- * An ASN.1 ANY mapping will return an ASN1\Element object. Use of this object
- * will also bypass the normal encoding rules in ASN1::encodeDER()
+ * Bypass normal encoding rules in phpseclib\File\ASN1::encodeDER()
  *
+ * @package ASN1
  * @author  Jim Wigginton <terrafrost@php.net>
+ * @access  public
  */
 class Element
 {
@@ -27,16 +29,18 @@ class Element
      * Raw element value
      *
      * @var string
+     * @access private
      */
-    public $element;
+    var $element;
 
     /**
      * Constructor
      *
      * @param string $encoded
-     * @return \phpseclib3\File\ASN1\Element
+     * @return \phpseclib\File\ASN1\Element
+     * @access public
      */
-    public function __construct($encoded)
+    function __construct($encoded)
     {
         $this->element = $encoded;
     }
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/AccessDescription.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/AccessDescription.php
deleted file mode 100644
index 1cbc5a59..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/AccessDescription.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/**
- * AccessDescription
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * AccessDescription
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class AccessDescription
-{
-    const MAP = [
-        'type' => ASN1::TYPE_SEQUENCE,
-        'children' => [
-            'accessMethod' => ['type' => ASN1::TYPE_OBJECT_IDENTIFIER],
-            'accessLocation' => GeneralName::MAP
-        ]
-    ];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/AdministrationDomainName.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/AdministrationDomainName.php
deleted file mode 100644
index 04183a13..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/AdministrationDomainName.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-/**
- * AdministrationDomainName
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * AdministrationDomainName
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class AdministrationDomainName
-{
-    const MAP = [
-        'type' => ASN1::TYPE_CHOICE,
-        // if class isn't present it's assumed to be \phpseclib3\File\ASN1::CLASS_UNIVERSAL or
-        // (if constant is present) \phpseclib3\File\ASN1::CLASS_CONTEXT_SPECIFIC
-        'class' => ASN1::CLASS_APPLICATION,
-        'cast' => 2,
-        'children' => [
-            'numeric' => ['type' => ASN1::TYPE_NUMERIC_STRING],
-            'printable' => ['type' => ASN1::TYPE_PRINTABLE_STRING]
-        ]
-    ];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/AlgorithmIdentifier.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/AlgorithmIdentifier.php
deleted file mode 100644
index 0da7eb10..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/AlgorithmIdentifier.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-/**
- * AlgorithmIdentifier
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * AlgorithmIdentifier
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class AlgorithmIdentifier
-{
-    const MAP = [
-        'type' => ASN1::TYPE_SEQUENCE,
-        'children' => [
-            'algorithm' => ['type' => ASN1::TYPE_OBJECT_IDENTIFIER],
-            'parameters' => [
-                'type' => ASN1::TYPE_ANY,
-                'optional' => true
-            ]
-        ]
-    ];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/AnotherName.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/AnotherName.php
deleted file mode 100644
index d96c170b..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/AnotherName.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-/**
- * AnotherName
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * AnotherName
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class AnotherName
-{
-    const MAP = [
-        'type' => ASN1::TYPE_SEQUENCE,
-        'children' => [
-            'type-id' => ['type' => ASN1::TYPE_OBJECT_IDENTIFIER],
-            'value' => [
-                'type' => ASN1::TYPE_ANY,
-                'constant' => 0,
-                'optional' => true,
-                'explicit' => true
-            ]
-        ]
-    ];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/Attribute.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/Attribute.php
deleted file mode 100644
index 38a6aeef..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/Attribute.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-/**
- * Attribute
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * Attribute
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class Attribute
-{
-    const MAP = [
-        'type' => ASN1::TYPE_SEQUENCE,
-        'children' => [
-            'type' => AttributeType::MAP,
-            'value' => [
-                'type' => ASN1::TYPE_SET,
-                'min' => 1,
-                'max' => -1,
-                'children' => AttributeValue::MAP
-            ]
-        ]
-    ];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/AttributeType.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/AttributeType.php
deleted file mode 100644
index 5cbc2bcc..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/AttributeType.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-/**
- * AttributeType
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * AttributeType
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class AttributeType
-{
-    const MAP = ['type' => ASN1::TYPE_OBJECT_IDENTIFIER];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/AttributeTypeAndValue.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/AttributeTypeAndValue.php
deleted file mode 100644
index fe414f16..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/AttributeTypeAndValue.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/**
- * AttributeTypeAndValue
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * AttributeTypeAndValue
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class AttributeTypeAndValue
-{
-    const MAP = [
-        'type' => ASN1::TYPE_SEQUENCE,
-        'children' => [
-            'type' => AttributeType::MAP,
-            'value' => AttributeValue::MAP
-        ]
-    ];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/AttributeValue.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/AttributeValue.php
deleted file mode 100644
index 3b3b6d2e..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/AttributeValue.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-/**
- * AttributeValue
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * AttributeValue
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class AttributeValue
-{
-    const MAP = ['type' => ASN1::TYPE_ANY];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/Attributes.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/Attributes.php
deleted file mode 100644
index cd53ecfa..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/Attributes.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-/**
- * Attributes
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * Attributes
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class Attributes
-{
-    const MAP = [
-        'type' => ASN1::TYPE_SET,
-        'min' => 1,
-        'max' => -1,
-        'children' => Attribute::MAP
-    ];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/AuthorityInfoAccessSyntax.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/AuthorityInfoAccessSyntax.php
deleted file mode 100644
index 3e80a55d..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/AuthorityInfoAccessSyntax.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-/**
- * AuthorityInfoAccessSyntax
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * AuthorityInfoAccessSyntax
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class AuthorityInfoAccessSyntax
-{
-    const MAP = [
-        'type' => ASN1::TYPE_SEQUENCE,
-        'min' => 1,
-        'max' => -1,
-        'children' => AccessDescription::MAP
-    ];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/AuthorityKeyIdentifier.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/AuthorityKeyIdentifier.php
deleted file mode 100644
index e7ec5b28..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/AuthorityKeyIdentifier.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-/**
- * AuthorityKeyIdentifier
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * AuthorityKeyIdentifier
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class AuthorityKeyIdentifier
-{
-    const MAP = [
-        'type' => ASN1::TYPE_SEQUENCE,
-        'children' => [
-            'keyIdentifier' => [
-                'constant' => 0,
-                'optional' => true,
-                'implicit' => true
-            ] + KeyIdentifier::MAP,
-            'authorityCertIssuer' => [
-                'constant' => 1,
-                'optional' => true,
-                'implicit' => true
-            ] + GeneralNames::MAP,
-            'authorityCertSerialNumber' => [
-                'constant' => 2,
-                'optional' => true,
-                'implicit' => true
-            ] + CertificateSerialNumber::MAP
-        ]
-    ];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/BaseDistance.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/BaseDistance.php
deleted file mode 100644
index e59668ab..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/BaseDistance.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-/**
- * BaseDistance
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * BaseDistance
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class BaseDistance
-{
-    const MAP = ['type' => ASN1::TYPE_INTEGER];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/BasicConstraints.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/BasicConstraints.php
deleted file mode 100644
index 587ef1b0..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/BasicConstraints.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-/**
- * BasicConstraints
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * BasicConstraints
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class BasicConstraints
-{
-    const MAP = [
-        'type' => ASN1::TYPE_SEQUENCE,
-        'children' => [
-            'cA' => [
-                'type' => ASN1::TYPE_BOOLEAN,
-                'optional' => true,
-                'default' => false
-            ],
-            'pathLenConstraint' => [
-                'type' => ASN1::TYPE_INTEGER,
-                'optional' => true
-            ]
-        ]
-    ];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/BuiltInDomainDefinedAttribute.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/BuiltInDomainDefinedAttribute.php
deleted file mode 100644
index e81bc78e..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/BuiltInDomainDefinedAttribute.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/**
- * BuiltInDomainDefinedAttribute
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * BuiltInDomainDefinedAttribute
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class BuiltInDomainDefinedAttribute
-{
-    const MAP = [
-        'type' => ASN1::TYPE_SEQUENCE,
-        'children' => [
-            'type' => ['type' => ASN1::TYPE_PRINTABLE_STRING],
-            'value' => ['type' => ASN1::TYPE_PRINTABLE_STRING]
-        ]
-    ];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/BuiltInDomainDefinedAttributes.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/BuiltInDomainDefinedAttributes.php
deleted file mode 100644
index 471e88f9..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/BuiltInDomainDefinedAttributes.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-/**
- * BuiltInDomainDefinedAttributes
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * BuiltInDomainDefinedAttributes
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class BuiltInDomainDefinedAttributes
-{
-    const MAP = [
-        'type' => ASN1::TYPE_SEQUENCE,
-        'min' => 1,
-        'max' => 4, // ub-domain-defined-attributes
-        'children' => BuiltInDomainDefinedAttribute::MAP
-    ];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/BuiltInStandardAttributes.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/BuiltInStandardAttributes.php
deleted file mode 100644
index 752f400d..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/BuiltInStandardAttributes.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-
-/**
- * BuiltInStandardAttributes
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * BuiltInStandardAttributes
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class BuiltInStandardAttributes
-{
-    const MAP = [
-        'type' => ASN1::TYPE_SEQUENCE,
-        'children' => [
-            'country-name' => ['optional' => true] + CountryName::MAP,
-            'administration-domain-name' => ['optional' => true] + AdministrationDomainName::MAP,
-            'network-address' => [
-                'constant' => 0,
-                'optional' => true,
-                'implicit' => true
-            ] + NetworkAddress::MAP,
-            'terminal-identifier' => [
-                'constant' => 1,
-                'optional' => true,
-                'implicit' => true
-            ] + TerminalIdentifier::MAP,
-            'private-domain-name' => [
-                'constant' => 2,
-                'optional' => true,
-                'explicit' => true
-            ] + PrivateDomainName::MAP,
-            'organization-name' => [
-                'constant' => 3,
-                'optional' => true,
-                'implicit' => true
-            ] + OrganizationName::MAP,
-            'numeric-user-identifier' => [
-                'constant' => 4,
-                'optional' => true,
-                'implicit' => true
-            ] + NumericUserIdentifier::MAP,
-            'personal-name' => [
-                'constant' => 5,
-                'optional' => true,
-                'implicit' => true
-            ] + PersonalName::MAP,
-            'organizational-unit-names' => [
-                'constant' => 6,
-                'optional' => true,
-                'implicit' => true
-            ] + OrganizationalUnitNames::MAP
-        ]
-    ];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/CPSuri.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/CPSuri.php
deleted file mode 100644
index 56e58887..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/CPSuri.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-/**
- * CPSuri
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * CPSuri
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class CPSuri
-{
-    const MAP = ['type' => ASN1::TYPE_IA5_STRING];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/CRLDistributionPoints.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/CRLDistributionPoints.php
deleted file mode 100644
index 79860b2f..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/CRLDistributionPoints.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-/**
- * CRLDistributionPoints
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * CRLDistributionPoints
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class CRLDistributionPoints
-{
-    const MAP = [
-        'type' => ASN1::TYPE_SEQUENCE,
-        'min' => 1,
-        'max' => -1,
-        'children' => DistributionPoint::MAP
-    ];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/CRLNumber.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/CRLNumber.php
deleted file mode 100644
index f6cb9567..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/CRLNumber.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-/**
- * CRLNumber
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * CRLNumber
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class CRLNumber
-{
-    const MAP = ['type' => ASN1::TYPE_INTEGER];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/CRLReason.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/CRLReason.php
deleted file mode 100644
index d3736529..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/CRLReason.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-/**
- * CRLReason
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * CRLReason
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class CRLReason
-{
-    const MAP = [
-        'type' => ASN1::TYPE_ENUMERATED,
-        'mapping' => [
-            'unspecified',
-            'keyCompromise',
-            'cACompromise',
-            'affiliationChanged',
-            'superseded',
-            'cessationOfOperation',
-            'certificateHold',
-            // Value 7 is not used.
-            8 => 'removeFromCRL',
-            'privilegeWithdrawn',
-            'aACompromise'
-        ]
-    ];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/CertPolicyId.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/CertPolicyId.php
deleted file mode 100644
index d7e7776e..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/CertPolicyId.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-/**
- * CertPolicyId
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * CertPolicyId
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class CertPolicyId
-{
-    const MAP = ['type' => ASN1::TYPE_OBJECT_IDENTIFIER];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/Certificate.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/Certificate.php
deleted file mode 100644
index 01943a0d..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/Certificate.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-/**
- * Certificate
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * Certificate
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class Certificate
-{
-    const MAP = [
-        'type' => ASN1::TYPE_SEQUENCE,
-        'children' => [
-            'tbsCertificate' => TBSCertificate::MAP,
-            'signatureAlgorithm' => AlgorithmIdentifier::MAP,
-            'signature' => ['type' => ASN1::TYPE_BIT_STRING]
-        ]
-    ];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/CertificateIssuer.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/CertificateIssuer.php
deleted file mode 100644
index ccd68dde..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/CertificateIssuer.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-/**
- * CertificateIssuer
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-/**
- * CertificateIssuer
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class CertificateIssuer
-{
-    const MAP = GeneralNames::MAP;
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/CertificateList.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/CertificateList.php
deleted file mode 100644
index d54ed6d9..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/CertificateList.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-/**
- * CertificateList
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * CertificateList
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class CertificateList
-{
-    const MAP = [
-        'type' => ASN1::TYPE_SEQUENCE,
-        'children' => [
-            'tbsCertList' => TBSCertList::MAP,
-            'signatureAlgorithm' => AlgorithmIdentifier::MAP,
-            'signature' => ['type' => ASN1::TYPE_BIT_STRING]
-        ]
-    ];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/CertificatePolicies.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/CertificatePolicies.php
deleted file mode 100644
index ec0fa6b5..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/CertificatePolicies.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-/**
- * CertificatePolicies
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * CertificatePolicies
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class CertificatePolicies
-{
-    const MAP = [
-        'type' => ASN1::TYPE_SEQUENCE,
-        'min' => 1,
-        'max' => -1,
-        'children' => PolicyInformation::MAP
-    ];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/CertificateSerialNumber.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/CertificateSerialNumber.php
deleted file mode 100644
index 06ec944c..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/CertificateSerialNumber.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-/**
- * CertificateSerialNumber
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * CertificateSerialNumber
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class CertificateSerialNumber
-{
-    const MAP = ['type' => ASN1::TYPE_INTEGER];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/CertificationRequest.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/CertificationRequest.php
deleted file mode 100644
index 2da70ed6..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/CertificationRequest.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-/**
- * CertificationRequest
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * CertificationRequest
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class CertificationRequest
-{
-    const MAP = [
-        'type' => ASN1::TYPE_SEQUENCE,
-        'children' => [
-            'certificationRequestInfo' => CertificationRequestInfo::MAP,
-            'signatureAlgorithm' => AlgorithmIdentifier::MAP,
-            'signature' => ['type' => ASN1::TYPE_BIT_STRING]
-        ]
-    ];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/CertificationRequestInfo.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/CertificationRequestInfo.php
deleted file mode 100644
index ce6dc880..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/CertificationRequestInfo.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-/**
- * CertificationRequestInfo
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * CertificationRequestInfo
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class CertificationRequestInfo
-{
-    const MAP = [
-        'type' => ASN1::TYPE_SEQUENCE,
-        'children' => [
-            'version' => [
-                'type' => ASN1::TYPE_INTEGER,
-                'mapping' => ['v1']
-            ],
-            'subject' => Name::MAP,
-            'subjectPKInfo' => SubjectPublicKeyInfo::MAP,
-            'attributes' => [
-                'constant' => 0,
-                'optional' => true,
-                'implicit' => true
-            ] + Attributes::MAP,
-        ]
-    ];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/Characteristic_two.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/Characteristic_two.php
deleted file mode 100644
index 5bf59bb8..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/Characteristic_two.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-/**
- * Characteristic_two
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * Characteristic_two
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class Characteristic_two
-{
-    const MAP = [
-        'type' => ASN1::TYPE_SEQUENCE,
-        'children' => [
-            'm' => ['type' => ASN1::TYPE_INTEGER], // field size 2**m
-            'basis' => ['type' => ASN1::TYPE_OBJECT_IDENTIFIER],
-            'parameters' => [
-                'type' => ASN1::TYPE_ANY,
-                'optional' => true
-            ]
-        ]
-    ];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/CountryName.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/CountryName.php
deleted file mode 100644
index 737d844d..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/CountryName.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-/**
- * CountryName
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * CountryName
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class CountryName
-{
-    const MAP = [
-        'type' => ASN1::TYPE_CHOICE,
-        // if class isn't present it's assumed to be \phpseclib3\File\ASN1::CLASS_UNIVERSAL or
-        // (if constant is present) \phpseclib3\File\ASN1::CLASS_CONTEXT_SPECIFIC
-        'class' => ASN1::CLASS_APPLICATION,
-        'cast' => 1,
-        'children' => [
-            'x121-dcc-code' => ['type' => ASN1::TYPE_NUMERIC_STRING],
-            'iso-3166-alpha2-code' => ['type' => ASN1::TYPE_PRINTABLE_STRING]
-        ]
-    ];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/Curve.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/Curve.php
deleted file mode 100644
index 621f1035..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/Curve.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-/**
- * Curve
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * Curve
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class Curve
-{
-    const MAP = [
-        'type' => ASN1::TYPE_SEQUENCE,
-        'children' => [
-            'a' => FieldElement::MAP,
-            'b' => FieldElement::MAP,
-            'seed' => [
-                'type' => ASN1::TYPE_BIT_STRING,
-                'optional' => true
-            ]
-        ]
-    ];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/DHParameter.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/DHParameter.php
deleted file mode 100644
index 26863dbc..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/DHParameter.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-/**
- * DHParameter
- *
- * From: https://www.teletrust.de/fileadmin/files/oid/oid_pkcs-3v1-4.pdf#page=6
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * DHParameter
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class DHParameter
-{
-    const MAP = [
-        'type' => ASN1::TYPE_SEQUENCE,
-        'children' => [
-            'prime' => ['type' => ASN1::TYPE_INTEGER],
-            'base' => ['type' => ASN1::TYPE_INTEGER],
-            'privateValueLength' => [
-                'type' => ASN1::TYPE_INTEGER,
-                'optional' => true
-            ]
-        ]
-    ];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/DSAParams.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/DSAParams.php
deleted file mode 100644
index 7af397bb..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/DSAParams.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-/**
- * DSAParams
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * DSAParams
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class DSAParams
-{
-    const MAP = [
-        'type' => ASN1::TYPE_SEQUENCE,
-        'children' => [
-            'p' => ['type' => ASN1::TYPE_INTEGER],
-            'q' => ['type' => ASN1::TYPE_INTEGER],
-            'g' => ['type' => ASN1::TYPE_INTEGER]
-        ]
-    ];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/DSAPrivateKey.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/DSAPrivateKey.php
deleted file mode 100644
index d97cd023..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/DSAPrivateKey.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-/**
- * DSAPrivateKey
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * DSAPrivateKey
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class DSAPrivateKey
-{
-    const MAP = [
-        'type' => ASN1::TYPE_SEQUENCE,
-        'children' => [
-            'version' => ['type' => ASN1::TYPE_INTEGER],
-            'p' => ['type' => ASN1::TYPE_INTEGER],
-            'q' => ['type' => ASN1::TYPE_INTEGER],
-            'g' => ['type' => ASN1::TYPE_INTEGER],
-            'y' => ['type' => ASN1::TYPE_INTEGER],
-            'x' => ['type' => ASN1::TYPE_INTEGER]
-        ]
-    ];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/DSAPublicKey.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/DSAPublicKey.php
deleted file mode 100644
index f795747a..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/DSAPublicKey.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-/**
- * DSAPublicKey
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * DSAPublicKey
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class DSAPublicKey
-{
-    const MAP = ['type' => ASN1::TYPE_INTEGER];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/DigestInfo.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/DigestInfo.php
deleted file mode 100644
index b38ff3c4..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/DigestInfo.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/**
- * DigestInfo
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * DigestInfo
- *
- * from https://tools.ietf.org/html/rfc2898#appendix-A.3
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class DigestInfo
-{
-    const MAP = [
-        'type' => ASN1::TYPE_SEQUENCE,
-        'children' => [
-            'digestAlgorithm' => AlgorithmIdentifier::MAP,
-            'digest' => ['type' => ASN1::TYPE_OCTET_STRING]
-        ]
-    ];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/DirectoryString.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/DirectoryString.php
deleted file mode 100644
index 45218e3e..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/DirectoryString.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-/**
- * DirectoryString
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * DirectoryString
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class DirectoryString
-{
-    const MAP = [
-        'type' => ASN1::TYPE_CHOICE,
-        'children' => [
-            'teletexString' => ['type' => ASN1::TYPE_TELETEX_STRING],
-            'printableString' => ['type' => ASN1::TYPE_PRINTABLE_STRING],
-            'universalString' => ['type' => ASN1::TYPE_UNIVERSAL_STRING],
-            'utf8String' => ['type' => ASN1::TYPE_UTF8_STRING],
-            'bmpString' => ['type' => ASN1::TYPE_BMP_STRING]
-        ]
-    ];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/DisplayText.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/DisplayText.php
deleted file mode 100644
index a13e6a64..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/DisplayText.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/**
- * DisplayText
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * DisplayText
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class DisplayText
-{
-    const MAP = [
-        'type' => ASN1::TYPE_CHOICE,
-        'children' => [
-            'ia5String' => ['type' => ASN1::TYPE_IA5_STRING],
-            'visibleString' => ['type' => ASN1::TYPE_VISIBLE_STRING],
-            'bmpString' => ['type' => ASN1::TYPE_BMP_STRING],
-            'utf8String' => ['type' => ASN1::TYPE_UTF8_STRING]
-        ]
-    ];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/DistributionPoint.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/DistributionPoint.php
deleted file mode 100644
index 4d9af6b5..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/DistributionPoint.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-/**
- * DistributionPoint
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * DistributionPoint
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class DistributionPoint
-{
-    const MAP = [
-        'type' => ASN1::TYPE_SEQUENCE,
-        'children' => [
-            'distributionPoint' => [
-                'constant' => 0,
-                'optional' => true,
-                'explicit' => true
-            ] + DistributionPointName::MAP,
-            'reasons' => [
-                'constant' => 1,
-                'optional' => true,
-                'implicit' => true
-            ] + ReasonFlags::MAP,
-            'cRLIssuer' => [
-                'constant' => 2,
-                'optional' => true,
-                'implicit' => true
-            ] + GeneralNames::MAP
-        ]
-    ];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/DistributionPointName.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/DistributionPointName.php
deleted file mode 100644
index bc0cec8f..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/DistributionPointName.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-/**
- * DistributionPointName
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * DistributionPointName
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class DistributionPointName
-{
-    const MAP = [
-        'type' => ASN1::TYPE_CHOICE,
-        'children' => [
-            'fullName' => [
-                'constant' => 0,
-                'optional' => true,
-                'implicit' => true
-            ] + GeneralNames::MAP,
-            'nameRelativeToCRLIssuer' => [
-                'constant' => 1,
-                'optional' => true,
-                'implicit' => true
-            ] + RelativeDistinguishedName::MAP
-        ]
-    ];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/DssSigValue.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/DssSigValue.php
deleted file mode 100644
index 2af74088..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/DssSigValue.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/**
- * DssSigValue
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * DssSigValue
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class DssSigValue
-{
-    const MAP = [
-        'type' => ASN1::TYPE_SEQUENCE,
-        'children' => [
-            'r' => ['type' => ASN1::TYPE_INTEGER],
-            's' => ['type' => ASN1::TYPE_INTEGER]
-        ]
-    ];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/ECParameters.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/ECParameters.php
deleted file mode 100644
index f25f6faa..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/ECParameters.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-/**
- * ECParameters
- *
- * From: https://tools.ietf.org/html/rfc5915
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * ECParameters
- *
- *  ECParameters ::= CHOICE {
- *    namedCurve         OBJECT IDENTIFIER
- *    -- implicitCurve   NULL
- *    -- specifiedCurve  SpecifiedECDomain
- *  }
- *    -- implicitCurve and specifiedCurve MUST NOT be used in PKIX.
- *    -- Details for SpecifiedECDomain can be found in [X9.62].
- *    -- Any future additions to this CHOICE should be coordinated
- *    -- with ANSI X9.
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class ECParameters
-{
-    const MAP = [
-        'type' => ASN1::TYPE_CHOICE,
-        'children' => [
-            'namedCurve' => ['type' => ASN1::TYPE_OBJECT_IDENTIFIER],
-            'implicitCurve' => ['type' => ASN1::TYPE_NULL],
-            'specifiedCurve' => SpecifiedECDomain::MAP
-        ]
-    ];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/ECPoint.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/ECPoint.php
deleted file mode 100644
index fb11db83..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/ECPoint.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-/**
- * ECPoint
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * ECPoint
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class ECPoint
-{
-    const MAP = ['type' => ASN1::TYPE_OCTET_STRING];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/ECPrivateKey.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/ECPrivateKey.php
deleted file mode 100644
index 7454f387..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/ECPrivateKey.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-/**
- * ECPrivateKey
- *
- * From: https://tools.ietf.org/html/rfc5915
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * ECPrivateKey
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class ECPrivateKey
-{
-    const MAP = [
-        'type' => ASN1::TYPE_SEQUENCE,
-        'children' => [
-            'version' => [
-                'type' => ASN1::TYPE_INTEGER,
-                'mapping' => [1 => 'ecPrivkeyVer1']
-            ],
-            'privateKey' => ['type' => ASN1::TYPE_OCTET_STRING],
-            'parameters' => [
-                'constant' => 0,
-                'optional' => true,
-                'explicit' => true
-            ] + ECParameters::MAP,
-            'publicKey' => [
-                'type' => ASN1::TYPE_BIT_STRING,
-                'constant' => 1,
-                'optional' => true,
-                'explicit' => true
-            ]
-        ]
-    ];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/EDIPartyName.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/EDIPartyName.php
deleted file mode 100644
index ea7dcf19..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/EDIPartyName.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-/**
- * EDIPartyName
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * EDIPartyName
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class EDIPartyName
-{
-    const MAP = [
-        'type' => ASN1::TYPE_SEQUENCE,
-        'children' => [
-            'nameAssigner' => [
-                'constant' => 0,
-                'optional' => true,
-                'implicit' => true
-            ] + DirectoryString::MAP,
-            // partyName is technically required but \phpseclib3\File\ASN1 doesn't currently support non-optional constants and
-            // setting it to optional gets the job done in any event.
-            'partyName' => [
-                'constant' => 1,
-                'optional' => true,
-                'implicit' => true
-            ] + DirectoryString::MAP
-        ]
-    ];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/EcdsaSigValue.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/EcdsaSigValue.php
deleted file mode 100644
index 8ab9ff1e..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/EcdsaSigValue.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/**
- * EcdsaSigValue
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * EcdsaSigValue
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class EcdsaSigValue
-{
-    const MAP = [
-        'type' => ASN1::TYPE_SEQUENCE,
-        'children' => [
-            'r' => ['type' => ASN1::TYPE_INTEGER],
-            's' => ['type' => ASN1::TYPE_INTEGER]
-        ]
-    ];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/EncryptedData.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/EncryptedData.php
deleted file mode 100644
index 8d8739e1..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/EncryptedData.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-/**
- * EncryptedData
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * EncryptedData
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class EncryptedData
-{
-    const MAP = ['type' => ASN1::TYPE_OCTET_STRING];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/EncryptedPrivateKeyInfo.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/EncryptedPrivateKeyInfo.php
deleted file mode 100644
index 2c935676..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/EncryptedPrivateKeyInfo.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/**
- * EncryptedPrivateKeyInfo
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * EncryptedPrivateKeyInfo
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class EncryptedPrivateKeyInfo
-{
-    const MAP = [
-        'type' => ASN1::TYPE_SEQUENCE,
-        'children' => [
-            'encryptionAlgorithm' => AlgorithmIdentifier::MAP,
-            'encryptedData' => EncryptedData::MAP
-        ]
-    ];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/ExtKeyUsageSyntax.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/ExtKeyUsageSyntax.php
deleted file mode 100644
index f9bc5def..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/ExtKeyUsageSyntax.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-/**
- * ExtKeyUsageSyntax
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * ExtKeyUsageSyntax
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class ExtKeyUsageSyntax
-{
-    const MAP = [
-        'type' => ASN1::TYPE_SEQUENCE,
-        'min' => 1,
-        'max' => -1,
-        'children' => KeyPurposeId::MAP
-    ];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/Extension.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/Extension.php
deleted file mode 100644
index e32668fb..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/Extension.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-/**
- * Extension
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * Extension
- *
- * A certificate using system MUST reject the certificate if it encounters
- * a critical extension it does not recognize; however, a non-critical
- * extension may be ignored if it is not recognized.
- *
- * http://tools.ietf.org/html/rfc5280#section-4.2
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class Extension
-{
-    const MAP = [
-        'type' => ASN1::TYPE_SEQUENCE,
-        'children' => [
-            'extnId' => ['type' => ASN1::TYPE_OBJECT_IDENTIFIER],
-            'critical' => [
-                'type' => ASN1::TYPE_BOOLEAN,
-                'optional' => true,
-                'default' => false
-            ],
-            'extnValue' => ['type' => ASN1::TYPE_OCTET_STRING]
-        ]
-    ];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/ExtensionAttribute.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/ExtensionAttribute.php
deleted file mode 100644
index 565b36d3..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/ExtensionAttribute.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-/**
- * ExtensionAttribute
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * ExtensionAttribute
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class ExtensionAttribute
-{
-    const MAP = [
-        'type' => ASN1::TYPE_SEQUENCE,
-        'children' => [
-            'extension-attribute-type' => [
-                'type' => ASN1::TYPE_PRINTABLE_STRING,
-                'constant' => 0,
-                'optional' => true,
-                'implicit' => true
-            ],
-            'extension-attribute-value' => [
-                'type' => ASN1::TYPE_ANY,
-                'constant' => 1,
-                'optional' => true,
-                'explicit' => true
-            ]
-        ]
-    ];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/ExtensionAttributes.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/ExtensionAttributes.php
deleted file mode 100644
index a2e9bfae..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/ExtensionAttributes.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-/**
- * ExtensionAttributes
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * ExtensionAttributes
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class ExtensionAttributes
-{
-    const MAP = [
-        'type' => ASN1::TYPE_SET,
-        'min' => 1,
-        'max' => 256, // ub-extension-attributes
-        'children' => ExtensionAttribute::MAP
-    ];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/Extensions.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/Extensions.php
deleted file mode 100644
index 5015c976..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/Extensions.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-/**
- * Extensions
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * Extensions
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class Extensions
-{
-    const MAP = [
-        'type' => ASN1::TYPE_SEQUENCE,
-        'min' => 1,
-        // technically, it's MAX, but we'll assume anything < 0 is MAX
-        'max' => -1,
-        // if 'children' isn't an array then 'min' and 'max' must be defined
-        'children' => Extension::MAP
-    ];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/FieldElement.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/FieldElement.php
deleted file mode 100644
index 31734078..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/FieldElement.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-/**
- * FieldElement
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * FieldElement
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class FieldElement
-{
-    const MAP = ['type' => ASN1::TYPE_OCTET_STRING];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/FieldID.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/FieldID.php
deleted file mode 100644
index e32a9c03..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/FieldID.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-/**
- * FieldID
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * FieldID
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class FieldID
-{
-    const MAP = [
-        'type' => ASN1::TYPE_SEQUENCE,
-        'children' => [
-            'fieldType' => ['type' => ASN1::TYPE_OBJECT_IDENTIFIER],
-            'parameters' => [
-                'type' => ASN1::TYPE_ANY,
-                'optional' => true
-            ]
-        ]
-    ];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/GeneralName.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/GeneralName.php
deleted file mode 100644
index 57d86da8..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/GeneralName.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-
-/**
- * GeneralName
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * GeneralName
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class GeneralName
-{
-    const MAP = [
-        'type' => ASN1::TYPE_CHOICE,
-        'children' => [
-            'otherName' => [
-                'constant' => 0,
-                'optional' => true,
-                'implicit' => true
-            ] + AnotherName::MAP,
-            'rfc822Name' => [
-                'type' => ASN1::TYPE_IA5_STRING,
-                'constant' => 1,
-                'optional' => true,
-                'implicit' => true
-            ],
-            'dNSName' => [
-                'type' => ASN1::TYPE_IA5_STRING,
-                'constant' => 2,
-                'optional' => true,
-                'implicit' => true
-            ],
-            'x400Address' => [
-                'constant' => 3,
-                'optional' => true,
-                'implicit' => true
-            ] + ORAddress::MAP,
-            'directoryName' => [
-                'constant' => 4,
-                'optional' => true,
-                'explicit' => true
-            ] + Name::MAP,
-            'ediPartyName' => [
-                'constant' => 5,
-                'optional' => true,
-                'implicit' => true
-            ] + EDIPartyName::MAP,
-            'uniformResourceIdentifier' => [
-                'type' => ASN1::TYPE_IA5_STRING,
-                'constant' => 6,
-                'optional' => true,
-                'implicit' => true
-            ],
-            'iPAddress' => [
-                'type' => ASN1::TYPE_OCTET_STRING,
-                'constant' => 7,
-                'optional' => true,
-                'implicit' => true
-            ],
-            'registeredID' => [
-                'type' => ASN1::TYPE_OBJECT_IDENTIFIER,
-                'constant' => 8,
-                'optional' => true,
-                'implicit' => true
-            ]
-        ]
-    ];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/GeneralNames.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/GeneralNames.php
deleted file mode 100644
index 5d931532..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/GeneralNames.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-/**
- * GeneralNames
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * GeneralNames
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class GeneralNames
-{
-    const MAP = [
-        'type' => ASN1::TYPE_SEQUENCE,
-        'min' => 1,
-        'max' => -1,
-        'children' => GeneralName::MAP
-    ];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/GeneralSubtree.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/GeneralSubtree.php
deleted file mode 100644
index 5388db55..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/GeneralSubtree.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-/**
- * GeneralSubtree
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * GeneralSubtree
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class GeneralSubtree
-{
-    const MAP = [
-        'type' => ASN1::TYPE_SEQUENCE,
-        'children' => [
-            'base' => GeneralName::MAP,
-            'minimum' => [
-                'constant' => 0,
-                'optional' => true,
-                'implicit' => true,
-                'default' => '0'
-            ] + BaseDistance::MAP,
-            'maximum' => [
-                'constant' => 1,
-                'optional' => true,
-                'implicit' => true,
-            ] + BaseDistance::MAP
-        ]
-    ];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/GeneralSubtrees.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/GeneralSubtrees.php
deleted file mode 100644
index 27548cfe..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/GeneralSubtrees.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-/**
- * GeneralSubtrees
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * GeneralSubtrees
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class GeneralSubtrees
-{
-    const MAP = [
-        'type' => ASN1::TYPE_SEQUENCE,
-        'min' => 1,
-        'max' => -1,
-        'children' => GeneralSubtree::MAP
-    ];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/HashAlgorithm.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/HashAlgorithm.php
deleted file mode 100644
index deb13cab..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/HashAlgorithm.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-/**
- * HashAglorithm
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-/**
- * HashAglorithm
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class HashAlgorithm
-{
-    const MAP = AlgorithmIdentifier::MAP;
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/HoldInstructionCode.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/HoldInstructionCode.php
deleted file mode 100644
index 88d6ff3e..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/HoldInstructionCode.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-/**
- * HoldInstructionCode
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * HoldInstructionCode
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class HoldInstructionCode
-{
-    const MAP = ['type' => ASN1::TYPE_OBJECT_IDENTIFIER];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/InvalidityDate.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/InvalidityDate.php
deleted file mode 100644
index f34b5f72..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/InvalidityDate.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-/**
- * InvalidityDate
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * InvalidityDate
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class InvalidityDate
-{
-    const MAP = ['type' => ASN1::TYPE_GENERALIZED_TIME];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/IssuerAltName.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/IssuerAltName.php
deleted file mode 100644
index e9d03244..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/IssuerAltName.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-/**
- * IssuerAltName
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-/**
- * IssuerAltName
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class IssuerAltName
-{
-    const MAP = GeneralNames::MAP;
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/IssuingDistributionPoint.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/IssuingDistributionPoint.php
deleted file mode 100644
index 415996f5..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/IssuingDistributionPoint.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-
-/**
- * IssuingDistributionPoint
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * IssuingDistributionPoint
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class IssuingDistributionPoint
-{
-    const MAP = [
-        'type' => ASN1::TYPE_SEQUENCE,
-        'children' => [
-            'distributionPoint' => [
-                'constant' => 0,
-                'optional' => true,
-                'explicit' => true
-            ] + DistributionPointName::MAP,
-            'onlyContainsUserCerts' => [
-                'type' => ASN1::TYPE_BOOLEAN,
-                'constant' => 1,
-                'optional' => true,
-                'default' => false,
-                'implicit' => true
-            ],
-            'onlyContainsCACerts' => [
-                'type' => ASN1::TYPE_BOOLEAN,
-                'constant' => 2,
-                'optional' => true,
-                'default' => false,
-                'implicit' => true
-            ],
-            'onlySomeReasons' => [
-                'constant' => 3,
-                'optional' => true,
-                'implicit' => true
-            ] + ReasonFlags::MAP,
-            'indirectCRL' => [
-                'type' => ASN1::TYPE_BOOLEAN,
-                'constant' => 4,
-                'optional' => true,
-                'default' => false,
-                'implicit' => true
-            ],
-            'onlyContainsAttributeCerts' => [
-                'type' => ASN1::TYPE_BOOLEAN,
-                'constant' => 5,
-                'optional' => true,
-                'default' => false,
-                'implicit' => true
-            ]
-        ]
-    ];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/KeyIdentifier.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/KeyIdentifier.php
deleted file mode 100644
index 82a41519..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/KeyIdentifier.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-/**
- * KeyIdentifier
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * KeyIdentifier
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class KeyIdentifier
-{
-    const MAP = ['type' => ASN1::TYPE_OCTET_STRING];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/KeyPurposeId.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/KeyPurposeId.php
deleted file mode 100644
index b8509f19..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/KeyPurposeId.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-/**
- * KeyPurposeId
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * KeyPurposeId
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class KeyPurposeId
-{
-    const MAP = ['type' => ASN1::TYPE_OBJECT_IDENTIFIER];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/KeyUsage.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/KeyUsage.php
deleted file mode 100644
index 827ce033..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/KeyUsage.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-/**
- * KeyUsage
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * KeyUsage
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class KeyUsage
-{
-    const MAP = [
-        'type' => ASN1::TYPE_BIT_STRING,
-        'mapping' => [
-            'digitalSignature',
-            'nonRepudiation',
-            'keyEncipherment',
-            'dataEncipherment',
-            'keyAgreement',
-            'keyCertSign',
-            'cRLSign',
-            'encipherOnly',
-            'decipherOnly'
-        ]
-    ];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/MaskGenAlgorithm.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/MaskGenAlgorithm.php
deleted file mode 100644
index ea3f998b..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/MaskGenAlgorithm.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-/**
- * MaskGenAglorithm
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-/**
- * MaskGenAglorithm
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class MaskGenAlgorithm
-{
-    const MAP = AlgorithmIdentifier::MAP;
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/Name.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/Name.php
deleted file mode 100644
index a6a9009d..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/Name.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-/**
- * Name
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * Name
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class Name
-{
-    const MAP = [
-        'type' => ASN1::TYPE_CHOICE,
-        'children' => [
-            'rdnSequence' => RDNSequence::MAP
-        ]
-    ];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/NameConstraints.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/NameConstraints.php
deleted file mode 100644
index 80486f94..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/NameConstraints.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-/**
- * NameConstraints
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * NameConstraints
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class NameConstraints
-{
-    const MAP = [
-        'type' => ASN1::TYPE_SEQUENCE,
-        'children' => [
-            'permittedSubtrees' => [
-                'constant' => 0,
-                'optional' => true,
-                'implicit' => true
-            ] + GeneralSubtrees::MAP,
-            'excludedSubtrees' => [
-                'constant' => 1,
-                'optional' => true,
-                'implicit' => true
-            ] + GeneralSubtrees::MAP
-        ]
-    ];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/NetworkAddress.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/NetworkAddress.php
deleted file mode 100644
index 6c68df00..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/NetworkAddress.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-/**
- * NetworkAddress
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * NetworkAddress
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class NetworkAddress
-{
-    const MAP = ['type' => ASN1::TYPE_NUMERIC_STRING];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/NoticeReference.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/NoticeReference.php
deleted file mode 100644
index 9eec123a..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/NoticeReference.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-/**
- * NoticeReference
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * NoticeReference
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class NoticeReference
-{
-    const MAP = [
-        'type' => ASN1::TYPE_SEQUENCE,
-        'children' => [
-            'organization' => DisplayText::MAP,
-            'noticeNumbers' => [
-                'type' => ASN1::TYPE_SEQUENCE,
-                'min' => 1,
-                'max' => 200,
-                'children' => ['type' => ASN1::TYPE_INTEGER]
-            ]
-        ]
-    ];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/NumericUserIdentifier.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/NumericUserIdentifier.php
deleted file mode 100644
index 635a89dc..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/NumericUserIdentifier.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-/**
- * NumericUserIdentifier
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * NumericUserIdentifier
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class NumericUserIdentifier
-{
-    const MAP = ['type' => ASN1::TYPE_NUMERIC_STRING];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/ORAddress.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/ORAddress.php
deleted file mode 100644
index b853abe8..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/ORAddress.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-/**
- * ORAddress
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * ORAddress
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class ORAddress
-{
-    const MAP = [
-        'type' => ASN1::TYPE_SEQUENCE,
-        'children' => [
-            'built-in-standard-attributes' => BuiltInStandardAttributes::MAP,
-            'built-in-domain-defined-attributes' => ['optional' => true] + BuiltInDomainDefinedAttributes::MAP,
-            'extension-attributes' => ['optional' => true] + ExtensionAttributes::MAP
-        ]
-    ];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/OneAsymmetricKey.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/OneAsymmetricKey.php
deleted file mode 100644
index 59530248..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/OneAsymmetricKey.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-/**
- * OneAsymmetricKey
- *
- * See https://tools.ietf.org/html/rfc5958
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * OneAsymmetricKey
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class OneAsymmetricKey
-{
-    const MAP = [
-        'type' => ASN1::TYPE_SEQUENCE,
-        'children' => [
-            'version' => [
-                'type' => ASN1::TYPE_INTEGER,
-                'mapping' => ['v1', 'v2']
-            ],
-            'privateKeyAlgorithm' => AlgorithmIdentifier::MAP,
-            'privateKey' => PrivateKey::MAP,
-            'attributes' => [
-                'constant' => 0,
-                'optional' => true,
-                'implicit' => true
-            ] + Attributes::MAP,
-            'publicKey' => [
-                'constant' => 1,
-                'optional' => true,
-                'implicit' => true
-            ] + PublicKey::MAP
-        ]
-    ];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/OrganizationName.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/OrganizationName.php
deleted file mode 100644
index b5cc9491..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/OrganizationName.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-/**
- * OrganizationName
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * OrganizationName
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class OrganizationName
-{
-    const MAP = ['type' => ASN1::TYPE_PRINTABLE_STRING];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/OrganizationalUnitNames.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/OrganizationalUnitNames.php
deleted file mode 100644
index b3e57809..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/OrganizationalUnitNames.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-/**
- * OrganizationalUnitNames
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * OrganizationalUnitNames
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class OrganizationalUnitNames
-{
-    const MAP = [
-        'type' => ASN1::TYPE_SEQUENCE,
-        'min' => 1,
-        'max' => 4, // ub-organizational-units
-        'children' => ['type' => ASN1::TYPE_PRINTABLE_STRING]
-    ];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/OtherPrimeInfo.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/OtherPrimeInfo.php
deleted file mode 100644
index 5d565605..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/OtherPrimeInfo.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/**
- * OtherPrimeInfo
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * OtherPrimeInfo
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class OtherPrimeInfo
-{
-    // version must be multi if otherPrimeInfos present
-    const MAP = [
-        'type' => ASN1::TYPE_SEQUENCE,
-        'children' => [
-            'prime' => ['type' => ASN1::TYPE_INTEGER],      // ri
-            'exponent' => ['type' => ASN1::TYPE_INTEGER],   // di
-            'coefficient' => ['type' => ASN1::TYPE_INTEGER] // ti
-        ]
-    ];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/OtherPrimeInfos.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/OtherPrimeInfos.php
deleted file mode 100644
index 9802a808..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/OtherPrimeInfos.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/**
- * OtherPrimeInfos
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * OtherPrimeInfos
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class OtherPrimeInfos
-{
-    // version must be multi if otherPrimeInfos present
-    const MAP = [
-        'type' => ASN1::TYPE_SEQUENCE,
-        'min' => 1,
-        'max' => -1,
-        'children' => OtherPrimeInfo::MAP
-    ];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/PBEParameter.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/PBEParameter.php
deleted file mode 100644
index 8eb27cf6..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/PBEParameter.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/**
- * PBEParameter
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * PBEParameter
- *
- * from https://tools.ietf.org/html/rfc2898#appendix-A.3
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class PBEParameter
-{
-    const MAP = [
-        'type' => ASN1::TYPE_SEQUENCE,
-        'children' => [
-            'salt' => ['type' => ASN1::TYPE_OCTET_STRING],
-            'iterationCount' => ['type' => ASN1::TYPE_INTEGER]
-        ]
-    ];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/PBES2params.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/PBES2params.php
deleted file mode 100644
index bd31699f..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/PBES2params.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/**
- * PBES2params
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * PBES2params
- *
- * from https://tools.ietf.org/html/rfc2898#appendix-A.3
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class PBES2params
-{
-    const MAP = [
-        'type' => ASN1::TYPE_SEQUENCE,
-        'children' => [
-            'keyDerivationFunc' => AlgorithmIdentifier::MAP,
-            'encryptionScheme' => AlgorithmIdentifier::MAP
-        ]
-    ];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/PBKDF2params.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/PBKDF2params.php
deleted file mode 100644
index 2dafed9c..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/PBKDF2params.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-/**
- * PBKDF2params
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * PBKDF2params
- *
- * from https://tools.ietf.org/html/rfc2898#appendix-A.3
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class PBKDF2params
-{
-    const MAP = [
-        'type' => ASN1::TYPE_SEQUENCE,
-        'children' => [
-            // technically, this is a CHOICE in RFC2898 but the other "choice" is, currently, more of a placeholder
-            // in the RFC
-            'salt' => ['type' => ASN1::TYPE_OCTET_STRING],
-            'iterationCount' => ['type' => ASN1::TYPE_INTEGER],
-            'keyLength' => [
-                'type' => ASN1::TYPE_INTEGER,
-                'optional' => true
-            ],
-            'prf' => AlgorithmIdentifier::MAP + ['optional' => true]
-        ]
-    ];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/PBMAC1params.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/PBMAC1params.php
deleted file mode 100644
index 91319f58..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/PBMAC1params.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/**
- * PBMAC1params
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * PBMAC1params
- *
- * from https://tools.ietf.org/html/rfc2898#appendix-A.3
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class PBMAC1params
-{
-    const MAP = [
-        'type' => ASN1::TYPE_SEQUENCE,
-        'children' => [
-            'keyDerivationFunc' => AlgorithmIdentifier::MAP,
-            'messageAuthScheme' => AlgorithmIdentifier::MAP
-        ]
-    ];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/PKCS9String.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/PKCS9String.php
deleted file mode 100644
index 87d0862f..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/PKCS9String.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/**
- * PKCS9String
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * PKCS9String
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class PKCS9String
-{
-    const MAP = [
-        'type' => ASN1::TYPE_CHOICE,
-        'children' => [
-            'ia5String' => ['type' => ASN1::TYPE_IA5_STRING],
-            'directoryString' => DirectoryString::MAP
-        ]
-    ];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/Pentanomial.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/Pentanomial.php
deleted file mode 100644
index b8c8c02f..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/Pentanomial.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-/**
- * Pentanomial
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * Pentanomial
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class Pentanomial
-{
-    const MAP = [
-        'type' => ASN1::TYPE_SEQUENCE,
-        'children' => [
-            'k1' => ['type' => ASN1::TYPE_INTEGER], // k1 > 0
-            'k2' => ['type' => ASN1::TYPE_INTEGER], // k2 > k1
-            'k3' => ['type' => ASN1::TYPE_INTEGER], // k3 > h2
-        ]
-    ];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/PersonalName.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/PersonalName.php
deleted file mode 100644
index 14e2860e..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/PersonalName.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-
-/**
- * PersonalName
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * PersonalName
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class PersonalName
-{
-    const MAP = [
-        'type' => ASN1::TYPE_SET,
-        'children' => [
-            'surname' => [
-                'type' => ASN1::TYPE_PRINTABLE_STRING,
-                'constant' => 0,
-                'optional' => true,
-                'implicit' => true
-            ],
-            'given-name' => [
-                'type' => ASN1::TYPE_PRINTABLE_STRING,
-                'constant' => 1,
-                'optional' => true,
-                'implicit' => true
-            ],
-            'initials' => [
-                'type' => ASN1::TYPE_PRINTABLE_STRING,
-                'constant' => 2,
-                'optional' => true,
-                'implicit' => true
-            ],
-            'generation-qualifier' => [
-                'type' => ASN1::TYPE_PRINTABLE_STRING,
-                'constant' => 3,
-                'optional' => true,
-                'implicit' => true
-            ]
-        ]
-    ];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/PolicyInformation.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/PolicyInformation.php
deleted file mode 100644
index 1625d199..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/PolicyInformation.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-/**
- * PolicyInformation
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * PolicyInformation
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class PolicyInformation
-{
-    const MAP = [
-        'type' => ASN1::TYPE_SEQUENCE,
-        'children' => [
-            'policyIdentifier' => CertPolicyId::MAP,
-            'policyQualifiers' => [
-                'type' => ASN1::TYPE_SEQUENCE,
-                'min' => 0,
-                'max' => -1,
-                'optional' => true,
-                'children' => PolicyQualifierInfo::MAP
-            ]
-        ]
-    ];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/PolicyMappings.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/PolicyMappings.php
deleted file mode 100644
index d30b8523..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/PolicyMappings.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-/**
- * PolicyMappings
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * PolicyMappings
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class PolicyMappings
-{
-    const MAP = [
-        'type' => ASN1::TYPE_SEQUENCE,
-        'min' => 1,
-        'max' => -1,
-        'children' => [
-            'type' => ASN1::TYPE_SEQUENCE,
-            'children' => [
-                'issuerDomainPolicy' => CertPolicyId::MAP,
-                'subjectDomainPolicy' => CertPolicyId::MAP
-            ]
-        ]
-    ];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/PolicyQualifierId.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/PolicyQualifierId.php
deleted file mode 100644
index 7b7cd6a7..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/PolicyQualifierId.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-/**
- * PolicyQualifierId
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * PolicyQualifierId
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class PolicyQualifierId
-{
-    const MAP = ['type' => ASN1::TYPE_OBJECT_IDENTIFIER];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/PolicyQualifierInfo.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/PolicyQualifierInfo.php
deleted file mode 100644
index d227702e..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/PolicyQualifierInfo.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/**
- * PolicyQualifierInfo
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * PolicyQualifierInfo
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class PolicyQualifierInfo
-{
-    const MAP = [
-        'type' => ASN1::TYPE_SEQUENCE,
-        'children' => [
-            'policyQualifierId' => PolicyQualifierId::MAP,
-            'qualifier' => ['type' => ASN1::TYPE_ANY]
-        ]
-    ];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/PostalAddress.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/PostalAddress.php
deleted file mode 100644
index 142b309e..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/PostalAddress.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/**
- * PostalAddress
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * PostalAddress
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class PostalAddress
-{
-    const MAP = [
-        'type' => ASN1::TYPE_SEQUENCE,
-        'optional' => true,
-        'min' => 1,
-        'max' => -1,
-        'children' => DirectoryString::MAP
-    ];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/Prime_p.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/Prime_p.php
deleted file mode 100644
index 77430344..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/Prime_p.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-/**
- * Prime_p
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * Prime_p
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class Prime_p
-{
-    const MAP = ['type' => ASN1::TYPE_INTEGER];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/PrivateDomainName.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/PrivateDomainName.php
deleted file mode 100644
index 195dcaa5..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/PrivateDomainName.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/**
- * PrivateDomainName
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * PrivateDomainName
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class PrivateDomainName
-{
-    const MAP = [
-        'type' => ASN1::TYPE_CHOICE,
-        'children' => [
-            'numeric' => ['type' => ASN1::TYPE_NUMERIC_STRING],
-            'printable' => ['type' => ASN1::TYPE_PRINTABLE_STRING]
-        ]
-    ];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/PrivateKey.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/PrivateKey.php
deleted file mode 100644
index 3c895941..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/PrivateKey.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-/**
- * PrivateKey
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * PrivateKey
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class PrivateKey
-{
-    const MAP = ['type' => ASN1::TYPE_OCTET_STRING];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/PrivateKeyInfo.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/PrivateKeyInfo.php
deleted file mode 100644
index b440b78d..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/PrivateKeyInfo.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-/**
- * PrivateKeyInfo
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * PrivateKeyInfo
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class PrivateKeyInfo
-{
-    const MAP = [
-        'type' => ASN1::TYPE_SEQUENCE,
-        'children' => [
-            'version' => [
-                'type' => ASN1::TYPE_INTEGER,
-                'mapping' => ['v1']
-            ],
-            'privateKeyAlgorithm' => AlgorithmIdentifier::MAP,
-            'privateKey' => PrivateKey::MAP,
-            'attributes' => [
-                'constant' => 0,
-                'optional' => true,
-                'implicit' => true
-            ] + Attributes::MAP
-        ]
-    ];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/PrivateKeyUsagePeriod.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/PrivateKeyUsagePeriod.php
deleted file mode 100644
index 5b87036e..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/PrivateKeyUsagePeriod.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-/**
- * PrivateKeyUsagePeriod
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * PrivateKeyUsagePeriod
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class PrivateKeyUsagePeriod
-{
-    const MAP = [
-        'type' => ASN1::TYPE_SEQUENCE,
-        'children' => [
-            'notBefore' => [
-                'constant' => 0,
-                'optional' => true,
-                'implicit' => true,
-                'type' => ASN1::TYPE_GENERALIZED_TIME],
-            'notAfter' => [
-                'constant' => 1,
-                'optional' => true,
-                'implicit' => true,
-                'type' => ASN1::TYPE_GENERALIZED_TIME]
-        ]
-    ];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/PublicKey.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/PublicKey.php
deleted file mode 100644
index 48409204..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/PublicKey.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-/**
- * PublicKey
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * PublicKey
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class PublicKey
-{
-    const MAP = ['type' => ASN1::TYPE_BIT_STRING];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/PublicKeyAndChallenge.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/PublicKeyAndChallenge.php
deleted file mode 100644
index 432581e4..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/PublicKeyAndChallenge.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/**
- * PublicKeyAndChallenge
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * PublicKeyAndChallenge
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class PublicKeyAndChallenge
-{
-    const MAP = [
-        'type' => ASN1::TYPE_SEQUENCE,
-        'children' => [
-            'spki' => SubjectPublicKeyInfo::MAP,
-            'challenge' => ['type' => ASN1::TYPE_IA5_STRING]
-        ]
-    ];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/PublicKeyInfo.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/PublicKeyInfo.php
deleted file mode 100644
index b39a341f..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/PublicKeyInfo.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-/**
- * PublicKeyInfo
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * PublicKeyInfo
- *
- * this format is not formally defined anywhere but is none-the-less the form you
- * get when you do "openssl rsa -in private.pem -outform PEM -pubout"
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class PublicKeyInfo
-{
-    const MAP = [
-        'type' => ASN1::TYPE_SEQUENCE,
-        'children' => [
-            'publicKeyAlgorithm' => AlgorithmIdentifier::MAP,
-            'publicKey' => ['type' => ASN1::TYPE_BIT_STRING]
-        ]
-    ];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/RC2CBCParameter.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/RC2CBCParameter.php
deleted file mode 100644
index 48649abd..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/RC2CBCParameter.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-/**
- * RC2CBCParameter
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * RC2CBCParameter
- *
- * from https://tools.ietf.org/html/rfc2898#appendix-A.3
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class RC2CBCParameter
-{
-    const MAP = [
-        'type' => ASN1::TYPE_SEQUENCE,
-        'children' => [
-            'rc2ParametersVersion' => [
-                'type' => ASN1::TYPE_INTEGER,
-                'optional' => true
-            ],
-            'iv' => ['type' => ASN1::TYPE_OCTET_STRING]
-        ]
-    ];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/RDNSequence.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/RDNSequence.php
deleted file mode 100644
index 04b071c2..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/RDNSequence.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-/**
- * RDNSequence
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * RDNSequence
- *
- * In practice, RDNs containing multiple name-value pairs (called "multivalued RDNs") are rare,
- * but they can be useful at times when either there is no unique attribute in the entry or you
- * want to ensure that the entry's DN contains some useful identifying information.
- *
- * - https://www.opends.org/wiki/page/DefinitionRelativeDistinguishedName
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class RDNSequence
-{
-    const MAP = [
-        'type' => ASN1::TYPE_SEQUENCE,
-        // RDNSequence does not define a min or a max, which means it doesn't have one
-        'min' => 0,
-        'max' => -1,
-        'children' => RelativeDistinguishedName::MAP
-    ];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/RSAPrivateKey.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/RSAPrivateKey.php
deleted file mode 100644
index 8c19c658..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/RSAPrivateKey.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-/**
- * RSAPrivateKey
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * RSAPrivateKey
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class RSAPrivateKey
-{
-    // version must be multi if otherPrimeInfos present
-    const MAP = [
-        'type' => ASN1::TYPE_SEQUENCE,
-        'children' => [
-            'version' => [
-                'type' => ASN1::TYPE_INTEGER,
-                'mapping' => ['two-prime', 'multi']
-            ],
-            'modulus' => ['type' => ASN1::TYPE_INTEGER],         // n
-            'publicExponent' => ['type' => ASN1::TYPE_INTEGER],  // e
-            'privateExponent' => ['type' => ASN1::TYPE_INTEGER], // d
-            'prime1' => ['type' => ASN1::TYPE_INTEGER],          // p
-            'prime2' => ['type' => ASN1::TYPE_INTEGER],          // q
-            'exponent1' => ['type' => ASN1::TYPE_INTEGER],       // d mod (p-1)
-            'exponent2' => ['type' => ASN1::TYPE_INTEGER],       // d mod (q-1)
-            'coefficient' => ['type' => ASN1::TYPE_INTEGER],     // (inverse of q) mod p
-            'otherPrimeInfos' => OtherPrimeInfos::MAP + ['optional' => true]
-        ]
-    ];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/RSAPublicKey.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/RSAPublicKey.php
deleted file mode 100644
index b14c32c4..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/RSAPublicKey.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/**
- * RSAPublicKey
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * RSAPublicKey
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class RSAPublicKey
-{
-    const MAP = [
-        'type' => ASN1::TYPE_SEQUENCE,
-        'children' => [
-            'modulus' => ['type' => ASN1::TYPE_INTEGER],
-            'publicExponent' => ['type' => ASN1::TYPE_INTEGER]
-        ]
-    ];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/RSASSA_PSS_params.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/RSASSA_PSS_params.php
deleted file mode 100644
index 1a784bf4..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/RSASSA_PSS_params.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-/**
- * RSASSA_PSS_params
- *
- * As defined in https://tools.ietf.org/html/rfc4055#section-3.1
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * RSASSA_PSS_params
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class RSASSA_PSS_params
-{
-    const MAP = [
-        'type' => ASN1::TYPE_SEQUENCE,
-        'children' => [
-            'hashAlgorithm' => [
-                'constant' => 0,
-                'optional' => true,
-                'explicit' => true,
-                //'default'  => 'sha1Identifier'
-            ] + HashAlgorithm::MAP,
-            'maskGenAlgorithm' => [
-                'constant' => 1,
-                'optional' => true,
-                'explicit' => true,
-                //'default'  => 'mgf1SHA1Identifier'
-            ] + MaskGenAlgorithm::MAP,
-            'saltLength' => [
-                'type' => ASN1::TYPE_INTEGER,
-                'constant' => 2,
-                'optional' => true,
-                'explicit' => true,
-                'default' => 20
-            ],
-            'trailerField' => [
-                'type' => ASN1::TYPE_INTEGER,
-                'constant' => 3,
-                'optional' => true,
-                'explicit' => true,
-                'default' => 1
-            ]
-        ]
-    ];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/ReasonFlags.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/ReasonFlags.php
deleted file mode 100644
index 2e62fcdb..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/ReasonFlags.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-/**
- * ReasonFlags
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * ReasonFlags
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class ReasonFlags
-{
-    const MAP = [
-        'type' => ASN1::TYPE_BIT_STRING,
-        'mapping' => [
-            'unused',
-            'keyCompromise',
-            'cACompromise',
-            'affiliationChanged',
-            'superseded',
-            'cessationOfOperation',
-            'certificateHold',
-            'privilegeWithdrawn',
-            'aACompromise'
-        ]
-    ];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/RelativeDistinguishedName.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/RelativeDistinguishedName.php
deleted file mode 100644
index a0421f73..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/RelativeDistinguishedName.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-/**
- * RelativeDistinguishedName
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * RelativeDistinguishedName
- *
- * In practice, RDNs containing multiple name-value pairs (called "multivalued RDNs") are rare,
- * but they can be useful at times when either there is no unique attribute in the entry or you
- * want to ensure that the entry's DN contains some useful identifying information.
- *
- * - https://www.opends.org/wiki/page/DefinitionRelativeDistinguishedName
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class RelativeDistinguishedName
-{
-    const MAP = [
-        'type' => ASN1::TYPE_SET,
-        'min' => 1,
-        'max' => -1,
-        'children' => AttributeTypeAndValue::MAP
-    ];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/RevokedCertificate.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/RevokedCertificate.php
deleted file mode 100644
index ff759eb7..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/RevokedCertificate.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-/**
- * RevokedCertificate
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * RevokedCertificate
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class RevokedCertificate
-{
-    const MAP = [
-        'type' => ASN1::TYPE_SEQUENCE,
-        'children' => [
-            'userCertificate' => CertificateSerialNumber::MAP,
-            'revocationDate' => Time::MAP,
-            'crlEntryExtensions' => [
-                'optional' => true
-            ] + Extensions::MAP
-        ]
-    ];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/SignedPublicKeyAndChallenge.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/SignedPublicKeyAndChallenge.php
deleted file mode 100644
index 0f482a26..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/SignedPublicKeyAndChallenge.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-/**
- * SignedPublicKeyAndChallenge
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * SignedPublicKeyAndChallenge
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class SignedPublicKeyAndChallenge
-{
-    const MAP = [
-        'type' => ASN1::TYPE_SEQUENCE,
-        'children' => [
-            'publicKeyAndChallenge' => PublicKeyAndChallenge::MAP,
-            'signatureAlgorithm' => AlgorithmIdentifier::MAP,
-            'signature' => ['type' => ASN1::TYPE_BIT_STRING]
-        ]
-    ];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/SpecifiedECDomain.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/SpecifiedECDomain.php
deleted file mode 100644
index 7408a563..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/SpecifiedECDomain.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-/**
- * SpecifiedECDomain
- *
- * From: http://www.secg.org/sec1-v2.pdf#page=109
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * SpecifiedECDomain
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class SpecifiedECDomain
-{
-    const MAP = [
-        'type' => ASN1::TYPE_SEQUENCE,
-        'children' => [
-            'version' => [
-                'type' => ASN1::TYPE_INTEGER,
-                'mapping' => [1 => 'ecdpVer1', 'ecdpVer2', 'ecdpVer3']
-            ],
-            'fieldID' => FieldID::MAP,
-            'curve' => Curve::MAP,
-            'base' => ECPoint::MAP,
-            'order' => ['type' => ASN1::TYPE_INTEGER],
-            'cofactor' => [
-                'type' => ASN1::TYPE_INTEGER,
-                'optional' => true
-            ],
-            'hash' => ['optional' => true] + HashAlgorithm::MAP
-        ]
-    ];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/SubjectAltName.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/SubjectAltName.php
deleted file mode 100644
index 39138a94..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/SubjectAltName.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-/**
- * SubjectAltName
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-/**
- * SubjectAltName
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class SubjectAltName
-{
-    const MAP = GeneralNames::MAP;
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/SubjectDirectoryAttributes.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/SubjectDirectoryAttributes.php
deleted file mode 100644
index f2e206f6..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/SubjectDirectoryAttributes.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-/**
- * SubjectDirectoryAttributes
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * SubjectDirectoryAttributes
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class SubjectDirectoryAttributes
-{
-    const MAP = [
-        'type' => ASN1::TYPE_SEQUENCE,
-        'min' => 1,
-        'max' => -1,
-        'children' => Attribute::MAP
-    ];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/SubjectInfoAccessSyntax.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/SubjectInfoAccessSyntax.php
deleted file mode 100644
index 1ff241f7..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/SubjectInfoAccessSyntax.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-/**
- * SubjectInfoAccessSyntax
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * SubjectInfoAccessSyntax
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class SubjectInfoAccessSyntax
-{
-    const MAP = [
-        'type' => ASN1::TYPE_SEQUENCE,
-        'min' => 1,
-        'max' => -1,
-        'children' => AccessDescription::MAP
-    ];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/SubjectPublicKeyInfo.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/SubjectPublicKeyInfo.php
deleted file mode 100644
index 0d53d540..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/SubjectPublicKeyInfo.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/**
- * SubjectPublicKeyInfo
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * SubjectPublicKeyInfo
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class SubjectPublicKeyInfo
-{
-    const MAP = [
-        'type' => ASN1::TYPE_SEQUENCE,
-        'children' => [
-            'algorithm' => AlgorithmIdentifier::MAP,
-            'subjectPublicKey' => ['type' => ASN1::TYPE_BIT_STRING]
-        ]
-    ];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/TBSCertList.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/TBSCertList.php
deleted file mode 100644
index 49b3cfc5..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/TBSCertList.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-
-/**
- * TBSCertList
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * TBSCertList
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class TBSCertList
-{
-    const MAP = [
-        'type' => ASN1::TYPE_SEQUENCE,
-        'children' => [
-            'version' => [
-                'type' => ASN1::TYPE_INTEGER,
-                'mapping' => ['v1', 'v2', 'v3'],
-                'optional' => true,
-                'default' => 'v2'
-            ],
-            'signature' => AlgorithmIdentifier::MAP,
-            'issuer' => Name::MAP,
-            'thisUpdate' => Time::MAP,
-            'nextUpdate' => [
-                'optional' => true
-            ] + Time::MAP,
-            'revokedCertificates' => [
-                'type' => ASN1::TYPE_SEQUENCE,
-                'optional' => true,
-                'min' => 0,
-                'max' => -1,
-                'children' => RevokedCertificate::MAP
-            ],
-            'crlExtensions' => [
-                'constant' => 0,
-                'optional' => true,
-                'explicit' => true
-            ] + Extensions::MAP
-        ]
-    ];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/TBSCertificate.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/TBSCertificate.php
deleted file mode 100644
index 007360c9..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/TBSCertificate.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-
-/**
- * TBSCertificate
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * TBSCertificate
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class TBSCertificate
-{
-    // assert($TBSCertificate['children']['signature'] == $Certificate['children']['signatureAlgorithm'])
-    const MAP = [
-        'type' => ASN1::TYPE_SEQUENCE,
-        'children' => [
-            // technically, default implies optional, but we'll define it as being optional, none-the-less, just to
-            // reenforce that fact
-            'version' => [
-                'type' => ASN1::TYPE_INTEGER,
-                'constant' => 0,
-                'optional' => true,
-                'explicit' => true,
-                'mapping' => ['v1', 'v2', 'v3'],
-                'default' => 'v1'
-            ],
-            'serialNumber' => CertificateSerialNumber::MAP,
-            'signature' => AlgorithmIdentifier::MAP,
-            'issuer' => Name::MAP,
-            'validity' => Validity::MAP,
-            'subject' => Name::MAP,
-            'subjectPublicKeyInfo' => SubjectPublicKeyInfo::MAP,
-            // implicit means that the T in the TLV structure is to be rewritten, regardless of the type
-            'issuerUniqueID' => [
-                'constant' => 1,
-                'optional' => true,
-                'implicit' => true
-            ] + UniqueIdentifier::MAP,
-            'subjectUniqueID' => [
-                'constant' => 2,
-                'optional' => true,
-                'implicit' => true
-            ] + UniqueIdentifier::MAP,
-            // <http://tools.ietf.org/html/rfc2459#page-74> doesn't use the EXPLICIT keyword but if
-            // it's not IMPLICIT, it's EXPLICIT
-            'extensions' => [
-                'constant' => 3,
-                'optional' => true,
-                'explicit' => true
-            ] + Extensions::MAP
-        ]
-    ];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/TerminalIdentifier.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/TerminalIdentifier.php
deleted file mode 100644
index 7f6d9d2e..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/TerminalIdentifier.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-/**
- * TerminalIdentifier
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * TerminalIdentifier
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class TerminalIdentifier
-{
-    const MAP = ['type' => ASN1::TYPE_PRINTABLE_STRING];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/Time.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/Time.php
deleted file mode 100644
index 744ee704..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/Time.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/**
- * Time
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * Time
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class Time
-{
-    const MAP = [
-        'type' => ASN1::TYPE_CHOICE,
-        'children' => [
-            'utcTime' => ['type' => ASN1::TYPE_UTC_TIME],
-            'generalTime' => ['type' => ASN1::TYPE_GENERALIZED_TIME]
-        ]
-    ];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/Trinomial.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/Trinomial.php
deleted file mode 100644
index 33baa91e..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/Trinomial.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-/**
- * Trinomial
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * Trinomial
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class Trinomial
-{
-    const MAP = ['type' => ASN1::TYPE_INTEGER];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/UniqueIdentifier.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/UniqueIdentifier.php
deleted file mode 100644
index f4c954bb..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/UniqueIdentifier.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-/**
- * UniqueIdentifier
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * UniqueIdentifier
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class UniqueIdentifier
-{
-    const MAP = ['type' => ASN1::TYPE_BIT_STRING];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/UserNotice.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/UserNotice.php
deleted file mode 100644
index 98d527b7..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/UserNotice.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-/**
- * UserNotice
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * UserNotice
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class UserNotice
-{
-    const MAP = [
-        'type' => ASN1::TYPE_SEQUENCE,
-        'children' => [
-            'noticeRef' => [
-                'optional' => true,
-                'implicit' => true
-            ] + NoticeReference::MAP,
-            'explicitText' => [
-                'optional' => true,
-                'implicit' => true
-            ] + DisplayText::MAP
-        ]
-    ];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/Validity.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/Validity.php
deleted file mode 100644
index 8ef64cf5..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/Validity.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/**
- * Validity
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * Validity
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class Validity
-{
-    const MAP = [
-        'type' => ASN1::TYPE_SEQUENCE,
-        'children' => [
-            'notBefore' => Time::MAP,
-            'notAfter' => Time::MAP
-        ]
-    ];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/netscape_ca_policy_url.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/netscape_ca_policy_url.php
deleted file mode 100644
index 2ab15728..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/netscape_ca_policy_url.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-/**
- * netscape_ca_policy_url
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * netscape_ca_policy_url
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class netscape_ca_policy_url
-{
-    const MAP = ['type' => ASN1::TYPE_IA5_STRING];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/netscape_cert_type.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/netscape_cert_type.php
deleted file mode 100644
index 49e8da4b..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/netscape_cert_type.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-/**
- * netscape_cert_type
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * netscape_cert_type
- *
- * mapping is from <http://www.mozilla.org/projects/security/pki/nss/tech-notes/tn3.html>
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class netscape_cert_type
-{
-    const MAP = [
-        'type' => ASN1::TYPE_BIT_STRING,
-        'mapping' => [
-            'SSLClient',
-            'SSLServer',
-            'Email',
-            'ObjectSigning',
-            'Reserved',
-            'SSLCA',
-            'EmailCA',
-            'ObjectSigningCA'
-        ]
-    ];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/netscape_comment.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/netscape_comment.php
deleted file mode 100644
index d3ff4ddf..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/ASN1/Maps/netscape_comment.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-/**
- * netscape_comment
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2016 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\File\ASN1\Maps;
-
-use phpseclib3\File\ASN1;
-
-/**
- * netscape_comment
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class netscape_comment
-{
-    const MAP = ['type' => ASN1::TYPE_IA5_STRING];
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/X509.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/X509.php
index 5e2f073f..863d9e99 100644
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/File/X509.php
+++ b/securemail/vendor/phpseclib/phpseclib/phpseclib/File/X509.php
@@ -16,33 +16,28 @@
  * be encoded.  It can be encoded explicitly or left out all together.  This would effect the signature value and thus may invalidate the
  * the certificate all together unless the certificate is re-signed.
  *
+ * @category  File
+ * @package   X509
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2012 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
  * @link      http://phpseclib.sourceforge.net
  */
 
-namespace phpseclib3\File;
+namespace phpseclib\File;
 
-use phpseclib3\Common\Functions\Strings;
-use phpseclib3\Crypt\Common\PrivateKey;
-use phpseclib3\Crypt\Common\PublicKey;
-use phpseclib3\Crypt\DSA;
-use phpseclib3\Crypt\EC;
-use phpseclib3\Crypt\Hash;
-use phpseclib3\Crypt\PublicKeyLoader;
-use phpseclib3\Crypt\Random;
-use phpseclib3\Crypt\RSA;
-use phpseclib3\Crypt\RSA\Formats\Keys\PSS;
-use phpseclib3\Exception\UnsupportedAlgorithmException;
-use phpseclib3\File\ASN1\Element;
-use phpseclib3\File\ASN1\Maps;
-use phpseclib3\Math\BigInteger;
+use phpseclib\Crypt\Hash;
+use phpseclib\Crypt\Random;
+use phpseclib\Crypt\RSA;
+use phpseclib\File\ASN1\Element;
+use phpseclib\Math\BigInteger;
 
 /**
  * Pure-PHP X.509 Parser
  *
+ * @package X509
  * @author  Jim Wigginton <terrafrost@php.net>
+ * @access  public
  */
 class X509
 {
@@ -51,71 +46,59 @@ class X509
      *
      * Not really used anymore but retained all the same to suppress E_NOTICEs from old installs
      *
+     * @access public
      */
     const VALIDATE_SIGNATURE_BY_CA = 1;
 
+    /**#@+
+     * @access public
+     * @see \phpseclib\File\X509::getDN()
+    */
     /**
      * Return internal array representation
-     *
-     * @see \phpseclib3\File\X509::getDN()
      */
     const DN_ARRAY = 0;
     /**
      * Return string
-     *
-     * @see \phpseclib3\File\X509::getDN()
      */
     const DN_STRING = 1;
     /**
      * Return ASN.1 name string
-     *
-     * @see \phpseclib3\File\X509::getDN()
      */
     const DN_ASN1 = 2;
     /**
      * Return OpenSSL compatible array
-     *
-     * @see \phpseclib3\File\X509::getDN()
      */
     const DN_OPENSSL = 3;
     /**
      * Return canonical ASN.1 RDNs string
-     *
-     * @see \phpseclib3\File\X509::getDN()
      */
     const DN_CANON = 4;
     /**
      * Return name hash for file indexing
-     *
-     * @see \phpseclib3\File\X509::getDN()
      */
     const DN_HASH = 5;
+    /**#@-*/
 
+    /**#@+
+     * @access public
+     * @see \phpseclib\File\X509::saveX509()
+     * @see \phpseclib\File\X509::saveCSR()
+     * @see \phpseclib\File\X509::saveCRL()
+    */
     /**
      * Save as PEM
      *
      * ie. a base64-encoded PEM with a header and a footer
-     *
-     * @see \phpseclib3\File\X509::saveX509()
-     * @see \phpseclib3\File\X509::saveCSR()
-     * @see \phpseclib3\File\X509::saveCRL()
      */
     const FORMAT_PEM = 0;
     /**
      * Save as DER
-     *
-     * @see \phpseclib3\File\X509::saveX509()
-     * @see \phpseclib3\File\X509::saveCSR()
-     * @see \phpseclib3\File\X509::saveCRL()
      */
     const FORMAT_DER = 1;
     /**
      * Save as a SPKAC
      *
-     * @see \phpseclib3\File\X509::saveX509()
-     * @see \phpseclib3\File\X509::saveCSR()
-     * @see \phpseclib3\File\X509::saveCRL()
-     *
      * Only works on CSRs. Not currently supported.
      */
     const FORMAT_SPKAC = 2;
@@ -123,12 +106,9 @@ class X509
      * Auto-detect the format
      *
      * Used only by the load*() functions
-     *
-     * @see \phpseclib3\File\X509::saveX509()
-     * @see \phpseclib3\File\X509::saveCSR()
-     * @see \phpseclib3\File\X509::saveCRL()
      */
     const FORMAT_AUTO_DETECT = 3;
+    /**#@-*/
 
     /**
      * Attribute value disposition.
@@ -138,71 +118,163 @@ class X509
     const ATTR_APPEND = -2; // Add a value.
     const ATTR_REPLACE = -3; // Clear first, then add a value.
 
+    /**
+     * ASN.1 syntax for X.509 certificates
+     *
+     * @var array
+     * @access private
+     */
+    var $Certificate;
+
+    /**#@+
+     * ASN.1 syntax for various extensions
+     *
+     * @access private
+     */
+    var $DirectoryString;
+    var $PKCS9String;
+    var $AttributeValue;
+    var $Extensions;
+    var $KeyUsage;
+    var $ExtKeyUsageSyntax;
+    var $BasicConstraints;
+    var $KeyIdentifier;
+    var $CRLDistributionPoints;
+    var $AuthorityKeyIdentifier;
+    var $CertificatePolicies;
+    var $AuthorityInfoAccessSyntax;
+    var $SubjectAltName;
+    var $SubjectDirectoryAttributes;
+    var $PrivateKeyUsagePeriod;
+    var $IssuerAltName;
+    var $PolicyMappings;
+    var $NameConstraints;
+
+    var $CPSuri;
+    var $UserNotice;
+
+    var $netscape_cert_type;
+    var $netscape_comment;
+    var $netscape_ca_policy_url;
+
+    var $Name;
+    var $RelativeDistinguishedName;
+    var $CRLNumber;
+    var $CRLReason;
+    var $IssuingDistributionPoint;
+    var $InvalidityDate;
+    var $CertificateIssuer;
+    var $HoldInstructionCode;
+    var $SignedPublicKeyAndChallenge;
+    /**#@-*/
+
+    /**#@+
+     * ASN.1 syntax for various DN attributes
+     *
+     * @access private
+     */
+    var $PostalAddress;
+    /**#@-*/
+
+    /**
+     * ASN.1 syntax for Certificate Signing Requests (RFC2986)
+     *
+     * @var array
+     * @access private
+     */
+    var $CertificationRequest;
+
+    /**
+     * ASN.1 syntax for Certificate Revocation Lists (RFC5280)
+     *
+     * @var array
+     * @access private
+     */
+    var $CertificateList;
+
     /**
      * Distinguished Name
      *
      * @var array
+     * @access private
      */
-    private $dn;
+    var $dn;
 
     /**
      * Public key
      *
-     * @var string|PublicKey
+     * @var string
+     * @access private
      */
-    private $publicKey;
+    var $publicKey;
 
     /**
      * Private key
      *
-     * @var string|PrivateKey
+     * @var string
+     * @access private
      */
-    private $privateKey;
+    var $privateKey;
+
+    /**
+     * Object identifiers for X.509 certificates
+     *
+     * @var array
+     * @access private
+     * @link http://en.wikipedia.org/wiki/Object_identifier
+     */
+    var $oids;
 
     /**
      * The certificate authorities
      *
      * @var array
+     * @access private
      */
-    private $CAs = [];
+    var $CAs;
 
     /**
      * The currently loaded certificate
      *
      * @var array
+     * @access private
      */
-    private $currentCert;
+    var $currentCert;
 
     /**
      * The signature subject
      *
-     * There's no guarantee \phpseclib3\File\X509 is going to re-encode an X.509 cert in the same way it was originally
+     * There's no guarantee \phpseclib\File\X509 is going to re-encode an X.509 cert in the same way it was originally
      * encoded so we take save the portion of the original cert that the signature would have made for.
      *
      * @var string
+     * @access private
      */
-    private $signatureSubject;
+    var $signatureSubject;
 
     /**
      * Certificate Start Date
      *
      * @var string
+     * @access private
      */
-    private $startDate;
+    var $startDate;
 
     /**
      * Certificate End Date
      *
-     * @var string|Element
+     * @var string
+     * @access private
      */
-    private $endDate;
+    var $endDate;
 
     /**
      * Serial Number
      *
      * @var string
+     * @access private
      */
-    private $serialNumber;
+    var $serialNumber;
 
     /**
      * Key Identifier
@@ -211,213 +283,1148 @@ class X509
      * {@link http://tools.ietf.org/html/rfc5280#section-4.2.1.2 RFC5280#section-4.2.1.2}.
      *
      * @var string
+     * @access private
      */
-    private $currentKeyIdentifier;
+    var $currentKeyIdentifier;
 
     /**
      * CA Flag
      *
      * @var bool
+     * @access private
      */
-    private $caFlag = false;
+    var $caFlag = false;
 
     /**
      * SPKAC Challenge
      *
      * @var string
+     * @access private
      */
-    private $challenge;
-
-    /**
-     * @var array
-     */
-    private $extensionValues = [];
-
-    /**
-     * OIDs loaded
-     *
-     * @var bool
-     */
-    private static $oidsLoaded = false;
-
-    /**
-     * Recursion Limit
-     *
-     * @var int
-     */
-    private static $recur_limit = 5;
-
-    /**
-     * URL fetch flag
-     *
-     * @var bool
-     */
-    private static $disable_url_fetch = false;
-
-    /**
-     * @var array
-     */
-    private static $extensions = [];
-
-    /**
-     * @var ?array
-     */
-    private $ipAddresses = null;
-
-    /**
-     * @var ?array
-     */
-    private $domains = null;
+    var $challenge;
 
     /**
      * Default Constructor.
      *
-     * @return \phpseclib3\File\X509
+     * @return \phpseclib\File\X509
+     * @access public
      */
-    public function __construct()
+    function __construct()
     {
         // Explicitly Tagged Module, 1988 Syntax
         // http://tools.ietf.org/html/rfc5280#appendix-A.1
 
-        if (!self::$oidsLoaded) {
-            // OIDs from RFC5280 and those RFCs mentioned in RFC5280#section-4.1.1.2
-            ASN1::loadOIDs([
-                //'id-pkix' => '1.3.6.1.5.5.7',
-                //'id-pe' => '1.3.6.1.5.5.7.1',
-                //'id-qt' => '1.3.6.1.5.5.7.2',
-                //'id-kp' => '1.3.6.1.5.5.7.3',
-                //'id-ad' => '1.3.6.1.5.5.7.48',
-                'id-qt-cps' => '1.3.6.1.5.5.7.2.1',
-                'id-qt-unotice' => '1.3.6.1.5.5.7.2.2',
-                'id-ad-ocsp' => '1.3.6.1.5.5.7.48.1',
-                'id-ad-caIssuers' => '1.3.6.1.5.5.7.48.2',
-                'id-ad-timeStamping' => '1.3.6.1.5.5.7.48.3',
-                'id-ad-caRepository' => '1.3.6.1.5.5.7.48.5',
-                //'id-at' => '2.5.4',
-                'id-at-name' => '2.5.4.41',
-                'id-at-surname' => '2.5.4.4',
-                'id-at-givenName' => '2.5.4.42',
-                'id-at-initials' => '2.5.4.43',
-                'id-at-generationQualifier' => '2.5.4.44',
-                'id-at-commonName' => '2.5.4.3',
-                'id-at-localityName' => '2.5.4.7',
-                'id-at-stateOrProvinceName' => '2.5.4.8',
-                'id-at-organizationName' => '2.5.4.10',
-                'id-at-organizationalUnitName' => '2.5.4.11',
-                'id-at-title' => '2.5.4.12',
-                'id-at-description' => '2.5.4.13',
-                'id-at-dnQualifier' => '2.5.4.46',
-                'id-at-countryName' => '2.5.4.6',
-                'id-at-serialNumber' => '2.5.4.5',
-                'id-at-pseudonym' => '2.5.4.65',
-                'id-at-postalCode' => '2.5.4.17',
-                'id-at-streetAddress' => '2.5.4.9',
-                'id-at-uniqueIdentifier' => '2.5.4.45',
-                'id-at-role' => '2.5.4.72',
-                'id-at-postalAddress' => '2.5.4.16',
-                'jurisdictionOfIncorporationCountryName' => '1.3.6.1.4.1.311.60.2.1.3',
-                'jurisdictionOfIncorporationStateOrProvinceName' => '1.3.6.1.4.1.311.60.2.1.2',
-                'jurisdictionLocalityName' => '1.3.6.1.4.1.311.60.2.1.1',
-                'id-at-businessCategory' => '2.5.4.15',
+        $this->DirectoryString = array(
+            'type'     => ASN1::TYPE_CHOICE,
+            'children' => array(
+                'teletexString'   => array('type' => ASN1::TYPE_TELETEX_STRING),
+                'printableString' => array('type' => ASN1::TYPE_PRINTABLE_STRING),
+                'universalString' => array('type' => ASN1::TYPE_UNIVERSAL_STRING),
+                'utf8String'      => array('type' => ASN1::TYPE_UTF8_STRING),
+                'bmpString'       => array('type' => ASN1::TYPE_BMP_STRING)
+            )
+        );
 
-                //'id-domainComponent' => '0.9.2342.19200300.100.1.25',
-                //'pkcs-9' => '1.2.840.113549.1.9',
-                'pkcs-9-at-emailAddress' => '1.2.840.113549.1.9.1',
-                //'id-ce' => '2.5.29',
-                'id-ce-authorityKeyIdentifier' => '2.5.29.35',
-                'id-ce-subjectKeyIdentifier' => '2.5.29.14',
-                'id-ce-keyUsage' => '2.5.29.15',
-                'id-ce-privateKeyUsagePeriod' => '2.5.29.16',
-                'id-ce-certificatePolicies' => '2.5.29.32',
-                //'anyPolicy' => '2.5.29.32.0',
+        $this->PKCS9String = array(
+            'type'     => ASN1::TYPE_CHOICE,
+            'children' => array(
+                'ia5String'       => array('type' => ASN1::TYPE_IA5_STRING),
+                'directoryString' => $this->DirectoryString
+            )
+        );
 
-                'id-ce-policyMappings' => '2.5.29.33',
+        $this->AttributeValue = array('type' => ASN1::TYPE_ANY);
 
-                'id-ce-subjectAltName' => '2.5.29.17',
-                'id-ce-issuerAltName' => '2.5.29.18',
-                'id-ce-subjectDirectoryAttributes' => '2.5.29.9',
-                'id-ce-basicConstraints' => '2.5.29.19',
-                'id-ce-nameConstraints' => '2.5.29.30',
-                'id-ce-policyConstraints' => '2.5.29.36',
-                'id-ce-cRLDistributionPoints' => '2.5.29.31',
-                'id-ce-extKeyUsage' => '2.5.29.37',
-                //'anyExtendedKeyUsage' => '2.5.29.37.0',
-                'id-kp-serverAuth' => '1.3.6.1.5.5.7.3.1',
-                'id-kp-clientAuth' => '1.3.6.1.5.5.7.3.2',
-                'id-kp-codeSigning' => '1.3.6.1.5.5.7.3.3',
-                'id-kp-emailProtection' => '1.3.6.1.5.5.7.3.4',
-                'id-kp-timeStamping' => '1.3.6.1.5.5.7.3.8',
-                'id-kp-OCSPSigning' => '1.3.6.1.5.5.7.3.9',
-                'id-ce-inhibitAnyPolicy' => '2.5.29.54',
-                'id-ce-freshestCRL' => '2.5.29.46',
-                'id-pe-authorityInfoAccess' => '1.3.6.1.5.5.7.1.1',
-                'id-pe-subjectInfoAccess' => '1.3.6.1.5.5.7.1.11',
-                'id-ce-cRLNumber' => '2.5.29.20',
-                'id-ce-issuingDistributionPoint' => '2.5.29.28',
-                'id-ce-deltaCRLIndicator' => '2.5.29.27',
-                'id-ce-cRLReasons' => '2.5.29.21',
-                'id-ce-certificateIssuer' => '2.5.29.29',
-                'id-ce-holdInstructionCode' => '2.5.29.23',
-                //'holdInstruction' => '1.2.840.10040.2',
-                'id-holdinstruction-none' => '1.2.840.10040.2.1',
-                'id-holdinstruction-callissuer' => '1.2.840.10040.2.2',
-                'id-holdinstruction-reject' => '1.2.840.10040.2.3',
-                'id-ce-invalidityDate' => '2.5.29.24',
+        $AttributeType = array('type' => ASN1::TYPE_OBJECT_IDENTIFIER);
 
-                'rsaEncryption' => '1.2.840.113549.1.1.1',
-                'md2WithRSAEncryption' => '1.2.840.113549.1.1.2',
-                'md5WithRSAEncryption' => '1.2.840.113549.1.1.4',
-                'sha1WithRSAEncryption' => '1.2.840.113549.1.1.5',
-                'sha224WithRSAEncryption' => '1.2.840.113549.1.1.14',
-                'sha256WithRSAEncryption' => '1.2.840.113549.1.1.11',
-                'sha384WithRSAEncryption' => '1.2.840.113549.1.1.12',
-                'sha512WithRSAEncryption' => '1.2.840.113549.1.1.13',
+        $AttributeTypeAndValue = array(
+            'type'     => ASN1::TYPE_SEQUENCE,
+            'children' => array(
+                'type' => $AttributeType,
+                'value'=> $this->AttributeValue
+            )
+        );
 
-                'id-ecPublicKey' => '1.2.840.10045.2.1',
-                'ecdsa-with-SHA1' => '1.2.840.10045.4.1',
-                // from https://tools.ietf.org/html/rfc5758#section-3.2
-                'ecdsa-with-SHA224' => '1.2.840.10045.4.3.1',
-                'ecdsa-with-SHA256' => '1.2.840.10045.4.3.2',
-                'ecdsa-with-SHA384' => '1.2.840.10045.4.3.3',
-                'ecdsa-with-SHA512' => '1.2.840.10045.4.3.4',
+        /*
+        In practice, RDNs containing multiple name-value pairs (called "multivalued RDNs") are rare,
+        but they can be useful at times when either there is no unique attribute in the entry or you
+        want to ensure that the entry's DN contains some useful identifying information.
 
-                'id-dsa' => '1.2.840.10040.4.1',
-                'id-dsa-with-sha1' => '1.2.840.10040.4.3',
-                // from https://tools.ietf.org/html/rfc5758#section-3.1
-                'id-dsa-with-sha224' => '2.16.840.1.101.3.4.3.1',
-                'id-dsa-with-sha256' => '2.16.840.1.101.3.4.3.2',
+        - https://www.opends.org/wiki/page/DefinitionRelativeDistinguishedName
+        */
+        $this->RelativeDistinguishedName = array(
+            'type'     => ASN1::TYPE_SET,
+            'min'      => 1,
+            'max'      => -1,
+            'children' => $AttributeTypeAndValue
+        );
 
-                // from https://tools.ietf.org/html/rfc8410:
-                'id-Ed25519' => '1.3.101.112',
-                'id-Ed448' => '1.3.101.113',
+        // http://tools.ietf.org/html/rfc5280#section-4.1.2.4
+        $RDNSequence = array(
+            'type'     => ASN1::TYPE_SEQUENCE,
+            // RDNSequence does not define a min or a max, which means it doesn't have one
+            'min'      => 0,
+            'max'      => -1,
+            'children' => $this->RelativeDistinguishedName
+        );
 
-                'id-RSASSA-PSS' => '1.2.840.113549.1.1.10',
+        $this->Name = array(
+            'type'     => ASN1::TYPE_CHOICE,
+            'children' => array(
+                'rdnSequence' => $RDNSequence
+            )
+        );
 
-                //'id-sha224' => '2.16.840.1.101.3.4.2.4',
-                //'id-sha256' => '2.16.840.1.101.3.4.2.1',
-                //'id-sha384' => '2.16.840.1.101.3.4.2.2',
-                //'id-sha512' => '2.16.840.1.101.3.4.2.3',
-                //'id-GostR3411-94-with-GostR3410-94' => '1.2.643.2.2.4',
-                //'id-GostR3411-94-with-GostR3410-2001' => '1.2.643.2.2.3',
-                //'id-GostR3410-2001' => '1.2.643.2.2.20',
-                //'id-GostR3410-94' => '1.2.643.2.2.19',
-                // Netscape Object Identifiers from "Netscape Certificate Extensions"
-                'netscape' => '2.16.840.1.113730',
-                'netscape-cert-extension' => '2.16.840.1.113730.1',
-                'netscape-cert-type' => '2.16.840.1.113730.1.1',
-                'netscape-comment' => '2.16.840.1.113730.1.13',
-                'netscape-ca-policy-url' => '2.16.840.1.113730.1.8',
-                // the following are X.509 extensions not supported by phpseclib
-                'id-pe-logotype' => '1.3.6.1.5.5.7.1.12',
-                'entrustVersInfo' => '1.2.840.113533.7.65.0',
-                'verisignPrivate' => '2.16.840.1.113733.1.6.9',
-                // for Certificate Signing Requests
-                // see http://tools.ietf.org/html/rfc2985
-                'pkcs-9-at-unstructuredName' => '1.2.840.113549.1.9.2', // PKCS #9 unstructured name
-                'pkcs-9-at-challengePassword' => '1.2.840.113549.1.9.7', // Challenge password for certificate revocations
-                'pkcs-9-at-extensionRequest' => '1.2.840.113549.1.9.14' // Certificate extension request
-            ]);
-        }
+        // http://tools.ietf.org/html/rfc5280#section-4.1.1.2
+        $AlgorithmIdentifier = array(
+            'type'     => ASN1::TYPE_SEQUENCE,
+            'children' => array(
+                'algorithm'  => array('type' => ASN1::TYPE_OBJECT_IDENTIFIER),
+                'parameters' => array(
+                                    'type'     => ASN1::TYPE_ANY,
+                                    'optional' => true
+                                )
+            )
+        );
+
+        /*
+           A certificate using system MUST reject the certificate if it encounters
+           a critical extension it does not recognize; however, a non-critical
+           extension may be ignored if it is not recognized.
+
+           http://tools.ietf.org/html/rfc5280#section-4.2
+        */
+        $Extension = array(
+            'type'     => ASN1::TYPE_SEQUENCE,
+            'children' => array(
+                'extnId'   => array('type' => ASN1::TYPE_OBJECT_IDENTIFIER),
+                'critical' => array(
+                                  'type'     => ASN1::TYPE_BOOLEAN,
+                                  'optional' => true,
+                                  'default'  => false
+                              ),
+                'extnValue' => array('type' => ASN1::TYPE_OCTET_STRING)
+            )
+        );
+
+        $this->Extensions = array(
+            'type'     => ASN1::TYPE_SEQUENCE,
+            'min'      => 1,
+            // technically, it's MAX, but we'll assume anything < 0 is MAX
+            'max'      => -1,
+            // if 'children' isn't an array then 'min' and 'max' must be defined
+            'children' => $Extension
+        );
+
+        $SubjectPublicKeyInfo = array(
+            'type'     => ASN1::TYPE_SEQUENCE,
+            'children' => array(
+                'algorithm'        => $AlgorithmIdentifier,
+                'subjectPublicKey' => array('type' => ASN1::TYPE_BIT_STRING)
+            )
+        );
+
+        $UniqueIdentifier = array('type' => ASN1::TYPE_BIT_STRING);
+
+        $Time = array(
+            'type'     => ASN1::TYPE_CHOICE,
+            'children' => array(
+                'utcTime'     => array('type' => ASN1::TYPE_UTC_TIME),
+                'generalTime' => array('type' => ASN1::TYPE_GENERALIZED_TIME)
+            )
+        );
+
+        // http://tools.ietf.org/html/rfc5280#section-4.1.2.5
+        $Validity = array(
+            'type'     => ASN1::TYPE_SEQUENCE,
+            'children' => array(
+                'notBefore' => $Time,
+                'notAfter'  => $Time
+            )
+        );
+
+        $CertificateSerialNumber = array('type' => ASN1::TYPE_INTEGER);
+
+        $Version = array(
+            'type'    => ASN1::TYPE_INTEGER,
+            'mapping' => array('v1', 'v2', 'v3')
+        );
+
+        // assert($TBSCertificate['children']['signature'] == $Certificate['children']['signatureAlgorithm'])
+        $TBSCertificate = array(
+            'type'     => ASN1::TYPE_SEQUENCE,
+            'children' => array(
+                // technically, default implies optional, but we'll define it as being optional, none-the-less, just to
+                // reenforce that fact
+                'version'             => array(
+                                             'constant' => 0,
+                                             'optional' => true,
+                                             'explicit' => true,
+                                             'default'  => 'v1'
+                                         ) + $Version,
+                'serialNumber'         => $CertificateSerialNumber,
+                'signature'            => $AlgorithmIdentifier,
+                'issuer'               => $this->Name,
+                'validity'             => $Validity,
+                'subject'              => $this->Name,
+                'subjectPublicKeyInfo' => $SubjectPublicKeyInfo,
+                // implicit means that the T in the TLV structure is to be rewritten, regardless of the type
+                'issuerUniqueID'       => array(
+                                               'constant' => 1,
+                                               'optional' => true,
+                                               'implicit' => true
+                                           ) + $UniqueIdentifier,
+                'subjectUniqueID'       => array(
+                                               'constant' => 2,
+                                               'optional' => true,
+                                               'implicit' => true
+                                           ) + $UniqueIdentifier,
+                // <http://tools.ietf.org/html/rfc2459#page-74> doesn't use the EXPLICIT keyword but if
+                // it's not IMPLICIT, it's EXPLICIT
+                'extensions'            => array(
+                                               'constant' => 3,
+                                               'optional' => true,
+                                               'explicit' => true
+                                           ) + $this->Extensions
+            )
+        );
+
+        $this->Certificate = array(
+            'type'     => ASN1::TYPE_SEQUENCE,
+            'children' => array(
+                 'tbsCertificate'     => $TBSCertificate,
+                 'signatureAlgorithm' => $AlgorithmIdentifier,
+                 'signature'          => array('type' => ASN1::TYPE_BIT_STRING)
+            )
+        );
+
+        $this->KeyUsage = array(
+            'type'    => ASN1::TYPE_BIT_STRING,
+            'mapping' => array(
+                'digitalSignature',
+                'nonRepudiation',
+                'keyEncipherment',
+                'dataEncipherment',
+                'keyAgreement',
+                'keyCertSign',
+                'cRLSign',
+                'encipherOnly',
+                'decipherOnly'
+            )
+        );
+
+        $this->BasicConstraints = array(
+            'type'     => ASN1::TYPE_SEQUENCE,
+            'children' => array(
+                'cA'                => array(
+                                                 'type'     => ASN1::TYPE_BOOLEAN,
+                                                 'optional' => true,
+                                                 'default'  => false
+                                       ),
+                'pathLenConstraint' => array(
+                                                 'type' => ASN1::TYPE_INTEGER,
+                                                 'optional' => true
+                                       )
+            )
+        );
+
+        $this->KeyIdentifier = array('type' => ASN1::TYPE_OCTET_STRING);
+
+        $OrganizationalUnitNames = array(
+            'type'     => ASN1::TYPE_SEQUENCE,
+            'min'      => 1,
+            'max'      => 4, // ub-organizational-units
+            'children' => array('type' => ASN1::TYPE_PRINTABLE_STRING)
+        );
+
+        $PersonalName = array(
+            'type'     => ASN1::TYPE_SET,
+            'children' => array(
+                'surname'              => array(
+                                           'type' => ASN1::TYPE_PRINTABLE_STRING,
+                                           'constant' => 0,
+                                           'optional' => true,
+                                           'implicit' => true
+                                         ),
+                'given-name'           => array(
+                                           'type' => ASN1::TYPE_PRINTABLE_STRING,
+                                           'constant' => 1,
+                                           'optional' => true,
+                                           'implicit' => true
+                                         ),
+                'initials'             => array(
+                                           'type' => ASN1::TYPE_PRINTABLE_STRING,
+                                           'constant' => 2,
+                                           'optional' => true,
+                                           'implicit' => true
+                                         ),
+                'generation-qualifier' => array(
+                                           'type' => ASN1::TYPE_PRINTABLE_STRING,
+                                           'constant' => 3,
+                                           'optional' => true,
+                                           'implicit' => true
+                                         )
+            )
+        );
+
+        $NumericUserIdentifier = array('type' => ASN1::TYPE_NUMERIC_STRING);
+
+        $OrganizationName = array('type' => ASN1::TYPE_PRINTABLE_STRING);
+
+        $PrivateDomainName = array(
+            'type'     => ASN1::TYPE_CHOICE,
+            'children' => array(
+                'numeric'   => array('type' => ASN1::TYPE_NUMERIC_STRING),
+                'printable' => array('type' => ASN1::TYPE_PRINTABLE_STRING)
+            )
+        );
+
+        $TerminalIdentifier = array('type' => ASN1::TYPE_PRINTABLE_STRING);
+
+        $NetworkAddress = array('type' => ASN1::TYPE_NUMERIC_STRING);
+
+        $AdministrationDomainName = array(
+            'type'     => ASN1::TYPE_CHOICE,
+            // if class isn't present it's assumed to be \phpseclib\File\ASN1::CLASS_UNIVERSAL or
+            // (if constant is present) \phpseclib\File\ASN1::CLASS_CONTEXT_SPECIFIC
+            'class'    => ASN1::CLASS_APPLICATION,
+            'cast'     => 2,
+            'children' => array(
+                'numeric'   => array('type' => ASN1::TYPE_NUMERIC_STRING),
+                'printable' => array('type' => ASN1::TYPE_PRINTABLE_STRING)
+            )
+        );
+
+        $CountryName = array(
+            'type'     => ASN1::TYPE_CHOICE,
+            // if class isn't present it's assumed to be \phpseclib\File\ASN1::CLASS_UNIVERSAL or
+            // (if constant is present) \phpseclib\File\ASN1::CLASS_CONTEXT_SPECIFIC
+            'class'    => ASN1::CLASS_APPLICATION,
+            'cast'     => 1,
+            'children' => array(
+                'x121-dcc-code'        => array('type' => ASN1::TYPE_NUMERIC_STRING),
+                'iso-3166-alpha2-code' => array('type' => ASN1::TYPE_PRINTABLE_STRING)
+            )
+        );
+
+        $AnotherName = array(
+            'type'     => ASN1::TYPE_SEQUENCE,
+            'children' => array(
+                 'type-id' => array('type' => ASN1::TYPE_OBJECT_IDENTIFIER),
+                 'value'   => array(
+                                  'type' => ASN1::TYPE_ANY,
+                                  'constant' => 0,
+                                  'optional' => true,
+                                  'explicit' => true
+                              )
+            )
+        );
+
+        $ExtensionAttribute = array(
+            'type'     => ASN1::TYPE_SEQUENCE,
+            'children' => array(
+                 'extension-attribute-type'  => array(
+                                                    'type' => ASN1::TYPE_PRINTABLE_STRING,
+                                                    'constant' => 0,
+                                                    'optional' => true,
+                                                    'implicit' => true
+                                                ),
+                 'extension-attribute-value' => array(
+                                                    'type' => ASN1::TYPE_ANY,
+                                                    'constant' => 1,
+                                                    'optional' => true,
+                                                    'explicit' => true
+                                                )
+            )
+        );
+
+        $ExtensionAttributes = array(
+            'type'     => ASN1::TYPE_SET,
+            'min'      => 1,
+            'max'      => 256, // ub-extension-attributes
+            'children' => $ExtensionAttribute
+        );
+
+        $BuiltInDomainDefinedAttribute = array(
+            'type'     => ASN1::TYPE_SEQUENCE,
+            'children' => array(
+                 'type'  => array('type' => ASN1::TYPE_PRINTABLE_STRING),
+                 'value' => array('type' => ASN1::TYPE_PRINTABLE_STRING)
+            )
+        );
+
+        $BuiltInDomainDefinedAttributes = array(
+            'type'     => ASN1::TYPE_SEQUENCE,
+            'min'      => 1,
+            'max'      => 4, // ub-domain-defined-attributes
+            'children' => $BuiltInDomainDefinedAttribute
+        );
+
+        $BuiltInStandardAttributes =  array(
+            'type'     => ASN1::TYPE_SEQUENCE,
+            'children' => array(
+                'country-name'               => array('optional' => true) + $CountryName,
+                'administration-domain-name' => array('optional' => true) + $AdministrationDomainName,
+                'network-address'            => array(
+                                                 'constant' => 0,
+                                                 'optional' => true,
+                                                 'implicit' => true
+                                               ) + $NetworkAddress,
+                'terminal-identifier'        => array(
+                                                 'constant' => 1,
+                                                 'optional' => true,
+                                                 'implicit' => true
+                                               ) + $TerminalIdentifier,
+                'private-domain-name'        => array(
+                                                 'constant' => 2,
+                                                 'optional' => true,
+                                                 'explicit' => true
+                                               ) + $PrivateDomainName,
+                'organization-name'          => array(
+                                                 'constant' => 3,
+                                                 'optional' => true,
+                                                 'implicit' => true
+                                               ) + $OrganizationName,
+                'numeric-user-identifier'    => array(
+                                                 'constant' => 4,
+                                                 'optional' => true,
+                                                 'implicit' => true
+                                               ) + $NumericUserIdentifier,
+                'personal-name'              => array(
+                                                 'constant' => 5,
+                                                 'optional' => true,
+                                                 'implicit' => true
+                                               ) + $PersonalName,
+                'organizational-unit-names'  => array(
+                                                 'constant' => 6,
+                                                 'optional' => true,
+                                                 'implicit' => true
+                                               ) + $OrganizationalUnitNames
+            )
+        );
+
+        $ORAddress = array(
+            'type'     => ASN1::TYPE_SEQUENCE,
+            'children' => array(
+                 'built-in-standard-attributes'       => $BuiltInStandardAttributes,
+                 'built-in-domain-defined-attributes' => array('optional' => true) + $BuiltInDomainDefinedAttributes,
+                 'extension-attributes'               => array('optional' => true) + $ExtensionAttributes
+            )
+        );
+
+        $EDIPartyName = array(
+            'type'     => ASN1::TYPE_SEQUENCE,
+            'children' => array(
+                 'nameAssigner' => array(
+                                    'constant' => 0,
+                                    'optional' => true,
+                                    'implicit' => true
+                                ) + $this->DirectoryString,
+                 // partyName is technically required but \phpseclib\File\ASN1 doesn't currently support non-optional constants and
+                 // setting it to optional gets the job done in any event.
+                 'partyName'    => array(
+                                    'constant' => 1,
+                                    'optional' => true,
+                                    'implicit' => true
+                                ) + $this->DirectoryString
+            )
+        );
+
+        $GeneralName = array(
+            'type'     => ASN1::TYPE_CHOICE,
+            'children' => array(
+                'otherName'                 => array(
+                                                 'constant' => 0,
+                                                 'optional' => true,
+                                                 'implicit' => true
+                                               ) + $AnotherName,
+                'rfc822Name'                => array(
+                                                 'type' => ASN1::TYPE_IA5_STRING,
+                                                 'constant' => 1,
+                                                 'optional' => true,
+                                                 'implicit' => true
+                                               ),
+                'dNSName'                   => array(
+                                                 'type' => ASN1::TYPE_IA5_STRING,
+                                                 'constant' => 2,
+                                                 'optional' => true,
+                                                 'implicit' => true
+                                               ),
+                'x400Address'               => array(
+                                                 'constant' => 3,
+                                                 'optional' => true,
+                                                 'implicit' => true
+                                               ) + $ORAddress,
+                'directoryName'             => array(
+                                                 'constant' => 4,
+                                                 'optional' => true,
+                                                 'explicit' => true
+                                               ) + $this->Name,
+                'ediPartyName'              => array(
+                                                 'constant' => 5,
+                                                 'optional' => true,
+                                                 'implicit' => true
+                                               ) + $EDIPartyName,
+                'uniformResourceIdentifier' => array(
+                                                 'type' => ASN1::TYPE_IA5_STRING,
+                                                 'constant' => 6,
+                                                 'optional' => true,
+                                                 'implicit' => true
+                                               ),
+                'iPAddress'                 => array(
+                                                 'type' => ASN1::TYPE_OCTET_STRING,
+                                                 'constant' => 7,
+                                                 'optional' => true,
+                                                 'implicit' => true
+                                               ),
+                'registeredID'              => array(
+                                                 'type' => ASN1::TYPE_OBJECT_IDENTIFIER,
+                                                 'constant' => 8,
+                                                 'optional' => true,
+                                                 'implicit' => true
+                                               )
+            )
+        );
+
+        $GeneralNames = array(
+            'type'     => ASN1::TYPE_SEQUENCE,
+            'min'      => 1,
+            'max'      => -1,
+            'children' => $GeneralName
+        );
+
+        $this->IssuerAltName = $GeneralNames;
+
+        $ReasonFlags = array(
+            'type'    => ASN1::TYPE_BIT_STRING,
+            'mapping' => array(
+                'unused',
+                'keyCompromise',
+                'cACompromise',
+                'affiliationChanged',
+                'superseded',
+                'cessationOfOperation',
+                'certificateHold',
+                'privilegeWithdrawn',
+                'aACompromise'
+            )
+        );
+
+        $DistributionPointName = array(
+            'type'     => ASN1::TYPE_CHOICE,
+            'children' => array(
+                'fullName'                => array(
+                                                 'constant' => 0,
+                                                 'optional' => true,
+                                                 'implicit' => true
+                                       ) + $GeneralNames,
+                'nameRelativeToCRLIssuer' => array(
+                                                 'constant' => 1,
+                                                 'optional' => true,
+                                                 'implicit' => true
+                                       ) + $this->RelativeDistinguishedName
+            )
+        );
+
+        $DistributionPoint = array(
+            'type'     => ASN1::TYPE_SEQUENCE,
+            'children' => array(
+                'distributionPoint' => array(
+                                                 'constant' => 0,
+                                                 'optional' => true,
+                                                 'explicit' => true
+                                       ) + $DistributionPointName,
+                'reasons'           => array(
+                                                 'constant' => 1,
+                                                 'optional' => true,
+                                                 'implicit' => true
+                                       ) + $ReasonFlags,
+                'cRLIssuer'         => array(
+                                                 'constant' => 2,
+                                                 'optional' => true,
+                                                 'implicit' => true
+                                       ) + $GeneralNames
+            )
+        );
+
+        $this->CRLDistributionPoints = array(
+            'type'     => ASN1::TYPE_SEQUENCE,
+            'min'      => 1,
+            'max'      => -1,
+            'children' => $DistributionPoint
+        );
+
+        $this->AuthorityKeyIdentifier = array(
+            'type'     => ASN1::TYPE_SEQUENCE,
+            'children' => array(
+                'keyIdentifier'             => array(
+                                                 'constant' => 0,
+                                                 'optional' => true,
+                                                 'implicit' => true
+                                               ) + $this->KeyIdentifier,
+                'authorityCertIssuer'       => array(
+                                                 'constant' => 1,
+                                                 'optional' => true,
+                                                 'implicit' => true
+                                               ) + $GeneralNames,
+                'authorityCertSerialNumber' => array(
+                                                 'constant' => 2,
+                                                 'optional' => true,
+                                                 'implicit' => true
+                                               ) + $CertificateSerialNumber
+            )
+        );
+
+        $PolicyQualifierId = array('type' => ASN1::TYPE_OBJECT_IDENTIFIER);
+
+        $PolicyQualifierInfo = array(
+            'type'     => ASN1::TYPE_SEQUENCE,
+            'children' => array(
+                'policyQualifierId' => $PolicyQualifierId,
+                'qualifier'         => array('type' => ASN1::TYPE_ANY)
+            )
+        );
+
+        $CertPolicyId = array('type' => ASN1::TYPE_OBJECT_IDENTIFIER);
+
+        $PolicyInformation = array(
+            'type'     => ASN1::TYPE_SEQUENCE,
+            'children' => array(
+                'policyIdentifier' => $CertPolicyId,
+                'policyQualifiers' => array(
+                                          'type'     => ASN1::TYPE_SEQUENCE,
+                                          'min'      => 0,
+                                          'max'      => -1,
+                                          'optional' => true,
+                                          'children' => $PolicyQualifierInfo
+                                      )
+            )
+        );
+
+        $this->CertificatePolicies = array(
+            'type'     => ASN1::TYPE_SEQUENCE,
+            'min'      => 1,
+            'max'      => -1,
+            'children' => $PolicyInformation
+        );
+
+        $this->PolicyMappings = array(
+            'type'     => ASN1::TYPE_SEQUENCE,
+            'min'      => 1,
+            'max'      => -1,
+            'children' => array(
+                              'type'     => ASN1::TYPE_SEQUENCE,
+                              'children' => array(
+                                  'issuerDomainPolicy' => $CertPolicyId,
+                                  'subjectDomainPolicy' => $CertPolicyId
+                              )
+                       )
+        );
+
+        $KeyPurposeId = array('type' => ASN1::TYPE_OBJECT_IDENTIFIER);
+
+        $this->ExtKeyUsageSyntax = array(
+            'type'     => ASN1::TYPE_SEQUENCE,
+            'min'      => 1,
+            'max'      => -1,
+            'children' => $KeyPurposeId
+        );
+
+        $AccessDescription = array(
+            'type'     => ASN1::TYPE_SEQUENCE,
+            'children' => array(
+                'accessMethod'   => array('type' => ASN1::TYPE_OBJECT_IDENTIFIER),
+                'accessLocation' => $GeneralName
+            )
+        );
+
+        $this->AuthorityInfoAccessSyntax = array(
+            'type'     => ASN1::TYPE_SEQUENCE,
+            'min'      => 1,
+            'max'      => -1,
+            'children' => $AccessDescription
+        );
+
+        $this->SubjectAltName = $GeneralNames;
+
+        $this->PrivateKeyUsagePeriod = array(
+            'type'     => ASN1::TYPE_SEQUENCE,
+            'children' => array(
+                'notBefore' => array(
+                                                 'constant' => 0,
+                                                 'optional' => true,
+                                                 'implicit' => true,
+                                                 'type' => ASN1::TYPE_GENERALIZED_TIME),
+                'notAfter'  => array(
+                                                 'constant' => 1,
+                                                 'optional' => true,
+                                                 'implicit' => true,
+                                                 'type' => ASN1::TYPE_GENERALIZED_TIME)
+            )
+        );
+
+        $BaseDistance = array('type' => ASN1::TYPE_INTEGER);
+
+        $GeneralSubtree = array(
+            'type'     => ASN1::TYPE_SEQUENCE,
+            'children' => array(
+                'base'    => $GeneralName,
+                'minimum' => array(
+                                 'constant' => 0,
+                                 'optional' => true,
+                                 'implicit' => true,
+                                 'default' => new BigInteger(0)
+                             ) + $BaseDistance,
+                'maximum' => array(
+                                 'constant' => 1,
+                                 'optional' => true,
+                                 'implicit' => true,
+                             ) + $BaseDistance
+            )
+        );
+
+        $GeneralSubtrees = array(
+            'type'     => ASN1::TYPE_SEQUENCE,
+            'min'      => 1,
+            'max'      => -1,
+            'children' => $GeneralSubtree
+        );
+
+        $this->NameConstraints = array(
+            'type'     => ASN1::TYPE_SEQUENCE,
+            'children' => array(
+                'permittedSubtrees' => array(
+                                           'constant' => 0,
+                                           'optional' => true,
+                                           'implicit' => true
+                                       ) + $GeneralSubtrees,
+                'excludedSubtrees'  => array(
+                                           'constant' => 1,
+                                           'optional' => true,
+                                           'implicit' => true
+                                       ) + $GeneralSubtrees
+            )
+        );
+
+        $this->CPSuri = array('type' => ASN1::TYPE_IA5_STRING);
+
+        $DisplayText = array(
+            'type'     => ASN1::TYPE_CHOICE,
+            'children' => array(
+                'ia5String'     => array('type' => ASN1::TYPE_IA5_STRING),
+                'visibleString' => array('type' => ASN1::TYPE_VISIBLE_STRING),
+                'bmpString'     => array('type' => ASN1::TYPE_BMP_STRING),
+                'utf8String'    => array('type' => ASN1::TYPE_UTF8_STRING)
+            )
+        );
+
+        $NoticeReference = array(
+            'type'     => ASN1::TYPE_SEQUENCE,
+            'children' => array(
+                'organization'  => $DisplayText,
+                'noticeNumbers' => array(
+                                       'type'     => ASN1::TYPE_SEQUENCE,
+                                       'min'      => 1,
+                                       'max'      => 200,
+                                       'children' => array('type' => ASN1::TYPE_INTEGER)
+                                   )
+            )
+        );
+
+        $this->UserNotice = array(
+            'type'     => ASN1::TYPE_SEQUENCE,
+            'children' => array(
+                'noticeRef' => array(
+                                           'optional' => true,
+                                           'implicit' => true
+                                       ) + $NoticeReference,
+                'explicitText'  => array(
+                                           'optional' => true,
+                                           'implicit' => true
+                                       ) + $DisplayText
+            )
+        );
+
+        // mapping is from <http://www.mozilla.org/projects/security/pki/nss/tech-notes/tn3.html>
+        $this->netscape_cert_type = array(
+            'type'    => ASN1::TYPE_BIT_STRING,
+            'mapping' => array(
+                'SSLClient',
+                'SSLServer',
+                'Email',
+                'ObjectSigning',
+                'Reserved',
+                'SSLCA',
+                'EmailCA',
+                'ObjectSigningCA'
+            )
+        );
+
+        $this->netscape_comment = array('type' => ASN1::TYPE_IA5_STRING);
+        $this->netscape_ca_policy_url = array('type' => ASN1::TYPE_IA5_STRING);
+
+        // attribute is used in RFC2986 but we're using the RFC5280 definition
+
+        $Attribute = array(
+            'type'     => ASN1::TYPE_SEQUENCE,
+            'children' => array(
+                'type' => $AttributeType,
+                'value'=> array(
+                              'type'     => ASN1::TYPE_SET,
+                              'min'      => 1,
+                              'max'      => -1,
+                              'children' => $this->AttributeValue
+                          )
+            )
+        );
+
+        $this->SubjectDirectoryAttributes = array(
+            'type'     => ASN1::TYPE_SEQUENCE,
+            'min'      => 1,
+            'max'      => -1,
+            'children' => $Attribute
+        );
+
+        // adapted from <http://tools.ietf.org/html/rfc2986>
+
+        $Attributes = array(
+            'type'     => ASN1::TYPE_SET,
+            'min'      => 1,
+            'max'      => -1,
+            'children' => $Attribute
+        );
+
+        $CertificationRequestInfo = array(
+            'type'     => ASN1::TYPE_SEQUENCE,
+            'children' => array(
+                'version'       => array(
+                                       'type' => ASN1::TYPE_INTEGER,
+                                       'mapping' => array('v1')
+                                   ),
+                'subject'       => $this->Name,
+                'subjectPKInfo' => $SubjectPublicKeyInfo,
+                'attributes'    => array(
+                                       'constant' => 0,
+                                       'optional' => true,
+                                       'implicit' => true
+                                   ) + $Attributes,
+            )
+        );
+
+        $this->CertificationRequest = array(
+            'type'     => ASN1::TYPE_SEQUENCE,
+            'children' => array(
+                'certificationRequestInfo' => $CertificationRequestInfo,
+                'signatureAlgorithm'       => $AlgorithmIdentifier,
+                'signature'                => array('type' => ASN1::TYPE_BIT_STRING)
+            )
+        );
+
+        $RevokedCertificate = array(
+            'type'     => ASN1::TYPE_SEQUENCE,
+            'children' => array(
+                              'userCertificate'    => $CertificateSerialNumber,
+                              'revocationDate'     => $Time,
+                              'crlEntryExtensions' => array(
+                                                          'optional' => true
+                                                      ) + $this->Extensions
+                          )
+        );
+
+        $TBSCertList = array(
+            'type'     => ASN1::TYPE_SEQUENCE,
+            'children' => array(
+                'version'             => array(
+                                             'optional' => true,
+                                             'default'  => 'v1'
+                                         ) + $Version,
+                'signature'           => $AlgorithmIdentifier,
+                'issuer'              => $this->Name,
+                'thisUpdate'          => $Time,
+                'nextUpdate'          => array(
+                                             'optional' => true
+                                         ) + $Time,
+                'revokedCertificates' => array(
+                                             'type'     => ASN1::TYPE_SEQUENCE,
+                                             'optional' => true,
+                                             'min'      => 0,
+                                             'max'      => -1,
+                                             'children' => $RevokedCertificate
+                                         ),
+                'crlExtensions'       => array(
+                                             'constant' => 0,
+                                             'optional' => true,
+                                             'explicit' => true
+                                         ) + $this->Extensions
+            )
+        );
+
+        $this->CertificateList = array(
+            'type'     => ASN1::TYPE_SEQUENCE,
+            'children' => array(
+                'tbsCertList'        => $TBSCertList,
+                'signatureAlgorithm' => $AlgorithmIdentifier,
+                'signature'          => array('type' => ASN1::TYPE_BIT_STRING)
+            )
+        );
+
+        $this->CRLNumber = array('type' => ASN1::TYPE_INTEGER);
+
+        $this->CRLReason = array('type' => ASN1::TYPE_ENUMERATED,
+           'mapping' => array(
+                            'unspecified',
+                            'keyCompromise',
+                            'cACompromise',
+                            'affiliationChanged',
+                            'superseded',
+                            'cessationOfOperation',
+                            'certificateHold',
+                            // Value 7 is not used.
+                            8 => 'removeFromCRL',
+                            'privilegeWithdrawn',
+                            'aACompromise'
+            )
+        );
+
+        $this->IssuingDistributionPoint = array('type' => ASN1::TYPE_SEQUENCE,
+            'children' => array(
+                'distributionPoint'          => array(
+                                                    'constant' => 0,
+                                                    'optional' => true,
+                                                    'explicit' => true
+                                                ) + $DistributionPointName,
+                'onlyContainsUserCerts'      => array(
+                                                    'type'     => ASN1::TYPE_BOOLEAN,
+                                                    'constant' => 1,
+                                                    'optional' => true,
+                                                    'default'  => false,
+                                                    'implicit' => true
+                                                ),
+                'onlyContainsCACerts'        => array(
+                                                    'type'     => ASN1::TYPE_BOOLEAN,
+                                                    'constant' => 2,
+                                                    'optional' => true,
+                                                    'default'  => false,
+                                                    'implicit' => true
+                                                ),
+                'onlySomeReasons'           => array(
+                                                    'constant' => 3,
+                                                    'optional' => true,
+                                                    'implicit' => true
+                                                ) + $ReasonFlags,
+                'indirectCRL'               => array(
+                                                    'type'     => ASN1::TYPE_BOOLEAN,
+                                                    'constant' => 4,
+                                                    'optional' => true,
+                                                    'default'  => false,
+                                                    'implicit' => true
+                                                ),
+                'onlyContainsAttributeCerts' => array(
+                                                    'type'     => ASN1::TYPE_BOOLEAN,
+                                                    'constant' => 5,
+                                                    'optional' => true,
+                                                    'default'  => false,
+                                                    'implicit' => true
+                                                )
+                          )
+        );
+
+        $this->InvalidityDate = array('type' => ASN1::TYPE_GENERALIZED_TIME);
+
+        $this->CertificateIssuer = $GeneralNames;
+
+        $this->HoldInstructionCode = array('type' => ASN1::TYPE_OBJECT_IDENTIFIER);
+
+        $PublicKeyAndChallenge = array(
+            'type'     => ASN1::TYPE_SEQUENCE,
+            'children' => array(
+                'spki'      => $SubjectPublicKeyInfo,
+                'challenge' => array('type' => ASN1::TYPE_IA5_STRING)
+            )
+        );
+
+        $this->SignedPublicKeyAndChallenge = array(
+            'type'     => ASN1::TYPE_SEQUENCE,
+            'children' => array(
+                'publicKeyAndChallenge' => $PublicKeyAndChallenge,
+                'signatureAlgorithm'    => $AlgorithmIdentifier,
+                'signature'             => array('type' => ASN1::TYPE_BIT_STRING)
+            )
+        );
+
+        $this->PostalAddress = array(
+            'type'     => ASN1::TYPE_SEQUENCE,
+            'optional' => true,
+            'min'      => 1,
+            'max'      => -1,
+            'children' => $this->DirectoryString
+        );
+
+        // OIDs from RFC5280 and those RFCs mentioned in RFC5280#section-4.1.1.2
+        $this->oids = array(
+            '1.3.6.1.5.5.7' => 'id-pkix',
+            '1.3.6.1.5.5.7.1' => 'id-pe',
+            '1.3.6.1.5.5.7.2' => 'id-qt',
+            '1.3.6.1.5.5.7.3' => 'id-kp',
+            '1.3.6.1.5.5.7.48' => 'id-ad',
+            '1.3.6.1.5.5.7.2.1' => 'id-qt-cps',
+            '1.3.6.1.5.5.7.2.2' => 'id-qt-unotice',
+            '1.3.6.1.5.5.7.48.1' =>'id-ad-ocsp',
+            '1.3.6.1.5.5.7.48.2' => 'id-ad-caIssuers',
+            '1.3.6.1.5.5.7.48.3' => 'id-ad-timeStamping',
+            '1.3.6.1.5.5.7.48.5' => 'id-ad-caRepository',
+            '2.5.4' => 'id-at',
+            '2.5.4.41' => 'id-at-name',
+            '2.5.4.4' => 'id-at-surname',
+            '2.5.4.42' => 'id-at-givenName',
+            '2.5.4.43' => 'id-at-initials',
+            '2.5.4.44' => 'id-at-generationQualifier',
+            '2.5.4.3' => 'id-at-commonName',
+            '2.5.4.7' => 'id-at-localityName',
+            '2.5.4.8' => 'id-at-stateOrProvinceName',
+            '2.5.4.10' => 'id-at-organizationName',
+            '2.5.4.11' => 'id-at-organizationalUnitName',
+            '2.5.4.12' => 'id-at-title',
+            '2.5.4.13' => 'id-at-description',
+            '2.5.4.46' => 'id-at-dnQualifier',
+            '2.5.4.6' => 'id-at-countryName',
+            '2.5.4.5' => 'id-at-serialNumber',
+            '2.5.4.65' => 'id-at-pseudonym',
+            '2.5.4.17' => 'id-at-postalCode',
+            '2.5.4.9' => 'id-at-streetAddress',
+            '2.5.4.45' => 'id-at-uniqueIdentifier',
+            '2.5.4.72' => 'id-at-role',
+            '2.5.4.16' => 'id-at-postalAddress',
+
+            '0.9.2342.19200300.100.1.25' => 'id-domainComponent',
+            '1.2.840.113549.1.9' => 'pkcs-9',
+            '1.2.840.113549.1.9.1' => 'pkcs-9-at-emailAddress',
+            '2.5.29' => 'id-ce',
+            '2.5.29.35' => 'id-ce-authorityKeyIdentifier',
+            '2.5.29.14' => 'id-ce-subjectKeyIdentifier',
+            '2.5.29.15' => 'id-ce-keyUsage',
+            '2.5.29.16' => 'id-ce-privateKeyUsagePeriod',
+            '2.5.29.32' => 'id-ce-certificatePolicies',
+            '2.5.29.32.0' => 'anyPolicy',
+
+            '2.5.29.33' => 'id-ce-policyMappings',
+            '2.5.29.17' => 'id-ce-subjectAltName',
+            '2.5.29.18' => 'id-ce-issuerAltName',
+            '2.5.29.9' => 'id-ce-subjectDirectoryAttributes',
+            '2.5.29.19' => 'id-ce-basicConstraints',
+            '2.5.29.30' => 'id-ce-nameConstraints',
+            '2.5.29.36' => 'id-ce-policyConstraints',
+            '2.5.29.31' => 'id-ce-cRLDistributionPoints',
+            '2.5.29.37' => 'id-ce-extKeyUsage',
+            '2.5.29.37.0' => 'anyExtendedKeyUsage',
+            '1.3.6.1.5.5.7.3.1' => 'id-kp-serverAuth',
+            '1.3.6.1.5.5.7.3.2' => 'id-kp-clientAuth',
+            '1.3.6.1.5.5.7.3.3' => 'id-kp-codeSigning',
+            '1.3.6.1.5.5.7.3.4' => 'id-kp-emailProtection',
+            '1.3.6.1.5.5.7.3.8' => 'id-kp-timeStamping',
+            '1.3.6.1.5.5.7.3.9' => 'id-kp-OCSPSigning',
+            '2.5.29.54' => 'id-ce-inhibitAnyPolicy',
+            '2.5.29.46' => 'id-ce-freshestCRL',
+            '1.3.6.1.5.5.7.1.1' => 'id-pe-authorityInfoAccess',
+            '1.3.6.1.5.5.7.1.11' => 'id-pe-subjectInfoAccess',
+            '2.5.29.20' => 'id-ce-cRLNumber',
+            '2.5.29.28' => 'id-ce-issuingDistributionPoint',
+            '2.5.29.27' => 'id-ce-deltaCRLIndicator',
+            '2.5.29.21' => 'id-ce-cRLReasons',
+            '2.5.29.29' => 'id-ce-certificateIssuer',
+            '2.5.29.23' => 'id-ce-holdInstructionCode',
+            '1.2.840.10040.2' => 'holdInstruction',
+            '1.2.840.10040.2.1' => 'id-holdinstruction-none',
+            '1.2.840.10040.2.2' => 'id-holdinstruction-callissuer',
+            '1.2.840.10040.2.3' => 'id-holdinstruction-reject',
+            '2.5.29.24' => 'id-ce-invalidityDate',
+
+            '1.2.840.113549.2.2' => 'md2',
+            '1.2.840.113549.2.5' => 'md5',
+            '1.3.14.3.2.26' => 'id-sha1',
+            '1.2.840.10040.4.1' => 'id-dsa',
+            '1.2.840.10040.4.3' => 'id-dsa-with-sha1',
+            '1.2.840.113549.1.1' => 'pkcs-1',
+            '1.2.840.113549.1.1.1' => 'rsaEncryption',
+            '1.2.840.113549.1.1.2' => 'md2WithRSAEncryption',
+            '1.2.840.113549.1.1.4' => 'md5WithRSAEncryption',
+            '1.2.840.113549.1.1.5' => 'sha1WithRSAEncryption',
+            '1.2.840.10046.2.1' => 'dhpublicnumber',
+            '2.16.840.1.101.2.1.1.22' => 'id-keyExchangeAlgorithm',
+            '1.2.840.10045' => 'ansi-X9-62',
+            '1.2.840.10045.4' => 'id-ecSigType',
+            '1.2.840.10045.4.1' => 'ecdsa-with-SHA1',
+            '1.2.840.10045.1' => 'id-fieldType',
+            '1.2.840.10045.1.1' => 'prime-field',
+            '1.2.840.10045.1.2' => 'characteristic-two-field',
+            '1.2.840.10045.1.2.3' => 'id-characteristic-two-basis',
+            '1.2.840.10045.1.2.3.1' => 'gnBasis',
+            '1.2.840.10045.1.2.3.2' => 'tpBasis',
+            '1.2.840.10045.1.2.3.3' => 'ppBasis',
+            '1.2.840.10045.2' => 'id-publicKeyType',
+            '1.2.840.10045.2.1' => 'id-ecPublicKey',
+            '1.2.840.10045.3' => 'ellipticCurve',
+            '1.2.840.10045.3.0' => 'c-TwoCurve',
+            '1.2.840.10045.3.0.1' => 'c2pnb163v1',
+            '1.2.840.10045.3.0.2' => 'c2pnb163v2',
+            '1.2.840.10045.3.0.3' => 'c2pnb163v3',
+            '1.2.840.10045.3.0.4' => 'c2pnb176w1',
+            '1.2.840.10045.3.0.5' => 'c2pnb191v1',
+            '1.2.840.10045.3.0.6' => 'c2pnb191v2',
+            '1.2.840.10045.3.0.7' => 'c2pnb191v3',
+            '1.2.840.10045.3.0.8' => 'c2pnb191v4',
+            '1.2.840.10045.3.0.9' => 'c2pnb191v5',
+            '1.2.840.10045.3.0.10' => 'c2pnb208w1',
+            '1.2.840.10045.3.0.11' => 'c2pnb239v1',
+            '1.2.840.10045.3.0.12' => 'c2pnb239v2',
+            '1.2.840.10045.3.0.13' => 'c2pnb239v3',
+            '1.2.840.10045.3.0.14' => 'c2pnb239v4',
+            '1.2.840.10045.3.0.15' => 'c2pnb239v5',
+            '1.2.840.10045.3.0.16' => 'c2pnb272w1',
+            '1.2.840.10045.3.0.17' => 'c2pnb304w1',
+            '1.2.840.10045.3.0.18' => 'c2pnb359v1',
+            '1.2.840.10045.3.0.19' => 'c2pnb368w1',
+            '1.2.840.10045.3.0.20' => 'c2pnb431r1',
+            '1.2.840.10045.3.1' => 'primeCurve',
+            '1.2.840.10045.3.1.1' => 'prime192v1',
+            '1.2.840.10045.3.1.2' => 'prime192v2',
+            '1.2.840.10045.3.1.3' => 'prime192v3',
+            '1.2.840.10045.3.1.4' => 'prime239v1',
+            '1.2.840.10045.3.1.5' => 'prime239v2',
+            '1.2.840.10045.3.1.6' => 'prime239v3',
+            '1.2.840.10045.3.1.7' => 'prime256v1',
+            '1.2.840.113549.1.1.7' => 'id-RSAES-OAEP',
+            '1.2.840.113549.1.1.9' => 'id-pSpecified',
+            '1.2.840.113549.1.1.10' => 'id-RSASSA-PSS',
+            '1.2.840.113549.1.1.8' => 'id-mgf1',
+            '1.2.840.113549.1.1.14' => 'sha224WithRSAEncryption',
+            '1.2.840.113549.1.1.11' => 'sha256WithRSAEncryption',
+            '1.2.840.113549.1.1.12' => 'sha384WithRSAEncryption',
+            '1.2.840.113549.1.1.13' => 'sha512WithRSAEncryption',
+            '2.16.840.1.101.3.4.2.4' => 'id-sha224',
+            '2.16.840.1.101.3.4.2.1' => 'id-sha256',
+            '2.16.840.1.101.3.4.2.2' => 'id-sha384',
+            '2.16.840.1.101.3.4.2.3' => 'id-sha512',
+            '1.2.643.2.2.4' => 'id-GostR3411-94-with-GostR3410-94',
+            '1.2.643.2.2.3' => 'id-GostR3411-94-with-GostR3410-2001',
+            '1.2.643.2.2.20' => 'id-GostR3410-2001',
+            '1.2.643.2.2.19' => 'id-GostR3410-94',
+            // Netscape Object Identifiers from "Netscape Certificate Extensions"
+            '2.16.840.1.113730' => 'netscape',
+            '2.16.840.1.113730.1' => 'netscape-cert-extension',
+            '2.16.840.1.113730.1.1' => 'netscape-cert-type',
+            '2.16.840.1.113730.1.13' => 'netscape-comment',
+            '2.16.840.1.113730.1.8' => 'netscape-ca-policy-url',
+            // the following are X.509 extensions not supported by phpseclib
+            '1.3.6.1.5.5.7.1.12' => 'id-pe-logotype',
+            '1.2.840.113533.7.65.0' => 'entrustVersInfo',
+            '2.16.840.1.113733.1.6.9' => 'verisignPrivate',
+            // for Certificate Signing Requests
+            // see http://tools.ietf.org/html/rfc2985
+            '1.2.840.113549.1.9.2' => 'pkcs-9-at-unstructuredName', // PKCS #9 unstructured name
+            '1.2.840.113549.1.9.7' => 'pkcs-9-at-challengePassword', // Challenge password for certificate revocations
+            '1.2.840.113549.1.9.14' => 'pkcs-9-at-extensionRequest' // Certificate extension request
+        );
     }
 
     /**
@@ -425,11 +1432,12 @@ class X509
      *
      * Returns an associative array describing the X.509 cert or a false if the cert failed to load
      *
-     * @param array|string $cert
+     * @param string $cert
      * @param int $mode
+     * @access public
      * @return mixed
      */
-    public function loadX509($cert, $mode = self::FORMAT_AUTO_DETECT)
+    function loadX509($cert, $mode = self::FORMAT_AUTO_DETECT)
     {
         if (is_array($cert) && isset($cert['tbsCertificate'])) {
             unset($this->currentCert);
@@ -448,8 +1456,10 @@ class X509
             return $cert;
         }
 
+        $asn1 = new ASN1();
+
         if ($mode != self::FORMAT_DER) {
-            $newcert = ASN1::extractBER($cert);
+            $newcert = $this->_extractBER($cert);
             if ($mode == self::FORMAT_PEM && $cert == $newcert) {
                 return false;
             }
@@ -461,10 +1471,11 @@ class X509
             return false;
         }
 
-        $decoded = ASN1::decodeBER($cert);
+        $asn1->loadOIDs($this->oids);
+        $decoded = $asn1->decodeBER($cert);
 
-        if ($decoded) {
-            $x509 = ASN1::asn1map($decoded[0], Maps\Certificate::MAP);
+        if (!empty($decoded)) {
+            $x509 = $asn1->asn1map($decoded[0], $this->Certificate);
         }
         if (!isset($x509) || $x509 === false) {
             $this->currentCert = false;
@@ -473,18 +1484,14 @@ class X509
 
         $this->signatureSubject = substr($cert, $decoded[0]['content'][0]['start'], $decoded[0]['content'][0]['length']);
 
-        if ($this->isSubArrayValid($x509, 'tbsCertificate/extensions')) {
-            $this->mapInExtensions($x509, 'tbsCertificate/extensions');
+        if ($this->_isSubArrayValid($x509, 'tbsCertificate/extensions')) {
+            $this->_mapInExtensions($x509, 'tbsCertificate/extensions', $asn1);
         }
-        $this->mapInDNs($x509, 'tbsCertificate/issuer/rdnSequence');
-        $this->mapInDNs($x509, 'tbsCertificate/subject/rdnSequence');
+        $this->_mapInDNs($x509, 'tbsCertificate/issuer/rdnSequence', $asn1);
+        $this->_mapInDNs($x509, 'tbsCertificate/subject/rdnSequence', $asn1);
 
-        $key = $x509['tbsCertificate']['subjectPublicKeyInfo'];
-        $key = ASN1::encodeDER($key, Maps\SubjectPublicKeyInfo::MAP);
-        $x509['tbsCertificate']['subjectPublicKeyInfo']['subjectPublicKey'] =
-            "-----BEGIN PUBLIC KEY-----\r\n" .
-            chunk_split(base64_encode($key), 64) .
-            "-----END PUBLIC KEY-----";
+        $key = &$x509['tbsCertificate']['subjectPublicKeyInfo']['subjectPublicKey'];
+        $key = $this->_reformatKey($x509['tbsCertificate']['subjectPublicKeyInfo']['algorithm']['algorithm'], $key);
 
         $this->currentCert = $x509;
         $this->dn = $x509['tbsCertificate']['subject'];
@@ -500,9 +1507,10 @@ class X509
      *
      * @param array $cert
      * @param int $format optional
+     * @access public
      * @return string
      */
-    public function saveX509(array $cert, $format = self::FORMAT_PEM)
+    function saveX509($cert, $format = self::FORMAT_PEM)
     {
         if (!is_array($cert) || !isset($cert['tbsCertificate'])) {
             return false;
@@ -510,22 +1518,32 @@ class X509
 
         switch (true) {
             // "case !$a: case !$b: break; default: whatever();" is the same thing as "if ($a && $b) whatever()"
-            case !($algorithm = $this->subArray($cert, 'tbsCertificate/subjectPublicKeyInfo/algorithm/algorithm')):
+            case !($algorithm = $this->_subArray($cert, 'tbsCertificate/subjectPublicKeyInfo/algorithm/algorithm')):
             case is_object($cert['tbsCertificate']['subjectPublicKeyInfo']['subjectPublicKey']):
                 break;
             default:
-                $cert['tbsCertificate']['subjectPublicKeyInfo'] = new Element(
-                    base64_decode(preg_replace('#-.+-|[\r\n]#', '', $cert['tbsCertificate']['subjectPublicKeyInfo']['subjectPublicKey']))
-                );
+                switch ($algorithm) {
+                    case 'rsaEncryption':
+                        $cert['tbsCertificate']['subjectPublicKeyInfo']['subjectPublicKey']
+                            = base64_encode("\0" . base64_decode(preg_replace('#-.+-|[\r\n]#', '', $cert['tbsCertificate']['subjectPublicKeyInfo']['subjectPublicKey'])));
+                        /* "[For RSA keys] the parameters field MUST have ASN.1 type NULL for this algorithm identifier."
+                           -- https://tools.ietf.org/html/rfc3279#section-2.3.1
+
+                           given that and the fact that RSA keys appear ot be the only key type for which the parameters field can be blank,
+                           it seems like perhaps the ASN.1 description ought not say the parameters field is OPTIONAL, but whatever.
+                         */
+                        $cert['tbsCertificate']['subjectPublicKeyInfo']['algorithm']['parameters'] = null;
+                        // https://tools.ietf.org/html/rfc3279#section-2.2.1
+                        $cert['signatureAlgorithm']['parameters'] = null;
+                        $cert['tbsCertificate']['signature']['parameters'] = null;
+                }
         }
 
-        if ($algorithm == 'rsaEncryption') {
-            $cert['signatureAlgorithm']['parameters'] = null;
-            $cert['tbsCertificate']['signature']['parameters'] = null;
-        }
+        $asn1 = new ASN1();
+        $asn1->loadOIDs($this->oids);
 
-        $filters = [];
-        $type_utf8_string = ['type' => ASN1::TYPE_UTF8_STRING];
+        $filters = array();
+        $type_utf8_string = array('type' => ASN1::TYPE_UTF8_STRING);
         $filters['tbsCertificate']['signature']['parameters'] = $type_utf8_string;
         $filters['tbsCertificate']['signature']['issuer']['rdnSequence']['value'] = $type_utf8_string;
         $filters['tbsCertificate']['issuer']['rdnSequence']['value'] = $type_utf8_string;
@@ -537,31 +1555,27 @@ class X509
         $filters['distributionPoint']['fullName']['directoryName']['rdnSequence']['value'] = $type_utf8_string;
         $filters['directoryName']['rdnSequence']['value'] = $type_utf8_string;
 
-        foreach (self::$extensions as $extension) {
-            $filters['tbsCertificate']['extensions'][] = $extension;
-        }
-
-        /* in the case of policyQualifiers/qualifier, the type has to be \phpseclib3\File\ASN1::TYPE_IA5_STRING.
-           \phpseclib3\File\ASN1::TYPE_PRINTABLE_STRING will cause OpenSSL's X.509 parser to spit out random
+        /* in the case of policyQualifiers/qualifier, the type has to be \phpseclib\File\ASN1::TYPE_IA5_STRING.
+           \phpseclib\File\ASN1::TYPE_PRINTABLE_STRING will cause OpenSSL's X.509 parser to spit out random
            characters.
          */
         $filters['policyQualifiers']['qualifier']
-            = ['type' => ASN1::TYPE_IA5_STRING];
+            = array('type' => ASN1::TYPE_IA5_STRING);
 
-        ASN1::setFilters($filters);
+        $asn1->loadFilters($filters);
 
-        $this->mapOutExtensions($cert, 'tbsCertificate/extensions');
-        $this->mapOutDNs($cert, 'tbsCertificate/issuer/rdnSequence');
-        $this->mapOutDNs($cert, 'tbsCertificate/subject/rdnSequence');
+        $this->_mapOutExtensions($cert, 'tbsCertificate/extensions', $asn1);
+        $this->_mapOutDNs($cert, 'tbsCertificate/issuer/rdnSequence', $asn1);
+        $this->_mapOutDNs($cert, 'tbsCertificate/subject/rdnSequence', $asn1);
 
-        $cert = ASN1::encodeDER($cert, Maps\Certificate::MAP);
+        $cert = $asn1->encodeDER($cert, $this->Certificate);
 
         switch ($format) {
             case self::FORMAT_DER:
                 return $cert;
             // case self::FORMAT_PEM:
             default:
-                return "-----BEGIN CERTIFICATE-----\r\n" . chunk_split(Strings::base64_encode($cert), 64) . '-----END CERTIFICATE-----';
+                return "-----BEGIN CERTIFICATE-----\r\n" . chunk_split(base64_encode($cert), 64) . '-----END CERTIFICATE-----';
         }
     }
 
@@ -569,29 +1583,26 @@ class X509
      * Map extension values from octet string to extension-specific internal
      *   format.
      *
-     * @param array $root (by reference)
+     * @param array ref $root
      * @param string $path
+     * @param object $asn1
+     * @access private
      */
-    private function mapInExtensions(array &$root, $path)
+    function _mapInExtensions(&$root, $path, $asn1)
     {
-        $extensions = &$this->subArrayUnchecked($root, $path);
+        $extensions = &$this->_subArrayUnchecked($root, $path);
 
         if ($extensions) {
             for ($i = 0; $i < count($extensions); $i++) {
                 $id = $extensions[$i]['extnId'];
                 $value = &$extensions[$i]['extnValue'];
+                $value = base64_decode($value);
+                $decoded = $asn1->decodeBER($value);
                 /* [extnValue] contains the DER encoding of an ASN.1 value
                    corresponding to the extension type identified by extnID */
-                $map = $this->getMapping($id);
+                $map = $this->_getMapping($id);
                 if (!is_bool($map)) {
-                    $decoder = $id == 'id-ce-nameConstraints' ?
-                        [static::class, 'decodeNameConstraintIP'] :
-                        [static::class, 'decodeIP'];
-                    $decoded = ASN1::decodeBER($value);
-                    if (!$decoded) {
-                        continue;
-                    }
-                    $mapped = ASN1::asn1map($decoded[0], $map, ['iPAddress' => $decoder]);
+                    $mapped = $asn1->asn1map($decoded[0], $map, array('iPAddress' => array($this, '_decodeIP')));
                     $value = $mapped === false ? $decoded[0] : $mapped;
 
                     if ($id == 'id-ce-certificatePolicies') {
@@ -601,19 +1612,18 @@ class X509
                             }
                             for ($k = 0; $k < count($value[$j]['policyQualifiers']); $k++) {
                                 $subid = $value[$j]['policyQualifiers'][$k]['policyQualifierId'];
-                                $map = $this->getMapping($subid);
+                                $map = $this->_getMapping($subid);
                                 $subvalue = &$value[$j]['policyQualifiers'][$k]['qualifier'];
                                 if ($map !== false) {
-                                    $decoded = ASN1::decodeBER($subvalue);
-                                    if (!$decoded) {
-                                        continue;
-                                    }
-                                    $mapped = ASN1::asn1map($decoded[0], $map);
+                                    $decoded = $asn1->decodeBER($subvalue);
+                                    $mapped = $asn1->asn1map($decoded[0], $map);
                                     $subvalue = $mapped === false ? $decoded[0] : $mapped;
                                 }
                             }
                         }
                     }
+                } else {
+                    $value = base64_encode($value);
                 }
             }
         }
@@ -623,30 +1633,14 @@ class X509
      * Map extension values from extension-specific internal format to
      *   octet string.
      *
-     * @param array $root (by reference)
+     * @param array ref $root
      * @param string $path
+     * @param object $asn1
+     * @access private
      */
-    private function mapOutExtensions(array &$root, $path)
+    function _mapOutExtensions(&$root, $path, $asn1)
     {
-        $extensions = &$this->subArray($root, $path, !empty($this->extensionValues));
-
-        foreach ($this->extensionValues as $id => $data) {
-            extract($data);
-            $newext = [
-                'extnId' => $id,
-                'extnValue' => $value,
-                'critical' => $critical
-            ];
-            if ($replace) {
-                foreach ($extensions as $key => $value) {
-                    if ($value['extnId'] == $id) {
-                        $extensions[$key] = $newext;
-                        continue 2;
-                    }
-                }
-            }
-            $extensions[] = $newext;
-        }
+        $extensions = &$this->_subArray($root, $path);
 
         if (is_array($extensions)) {
             $size = count($extensions);
@@ -666,12 +1660,12 @@ class X509
                             }
                             for ($k = 0; $k < count($value[$j]['policyQualifiers']); $k++) {
                                 $subid = $value[$j]['policyQualifiers'][$k]['policyQualifierId'];
-                                $map = $this->getMapping($subid);
+                                $map = $this->_getMapping($subid);
                                 $subvalue = &$value[$j]['policyQualifiers'][$k]['qualifier'];
                                 if ($map !== false) {
-                                    // by default \phpseclib3\File\ASN1 will try to render qualifier as a \phpseclib3\File\ASN1::TYPE_IA5_STRING since it's
-                                    // actual type is \phpseclib3\File\ASN1::TYPE_ANY
-                                    $subvalue = new Element(ASN1::encodeDER($subvalue, $map));
+                                    // by default \phpseclib\File\ASN1 will try to render qualifier as a \phpseclib\File\ASN1::TYPE_IA5_STRING since it's
+                                    // actual type is \phpseclib\File\ASN1::TYPE_ANY
+                                    $subvalue = new Element($asn1->encodeDER($subvalue, $map));
                                 }
                             }
                         }
@@ -687,14 +1681,15 @@ class X509
 
                 /* [extnValue] contains the DER encoding of an ASN.1 value
                    corresponding to the extension type identified by extnID */
-                $map = $this->getMapping($id);
+                $map = $this->_getMapping($id);
                 if (is_bool($map)) {
                     if (!$map) {
-                        //user_error($id . ' is not a currently supported extension');
+                        user_error($id . ' is not a currently supported extension');
                         unset($extensions[$i]);
                     }
                 } else {
-                    $value = ASN1::encodeDER($value, $map, ['iPAddress' => [static::class, 'encodeIP']]);
+                    $temp = $asn1->encodeDER($value, $map, array('iPAddress' => array($this, '_encodeIP')));
+                    $value = base64_encode($temp);
                 }
             }
         }
@@ -704,37 +1699,36 @@ class X509
      * Map attribute values from ANY type to attribute-specific internal
      *   format.
      *
-     * @param array $root (by reference)
+     * @param array ref $root
      * @param string $path
+     * @param object $asn1
+     * @access private
      */
-    private function mapInAttributes(&$root, $path)
+    function _mapInAttributes(&$root, $path, $asn1)
     {
-        $attributes = &$this->subArray($root, $path);
+        $attributes = &$this->_subArray($root, $path);
 
         if (is_array($attributes)) {
             for ($i = 0; $i < count($attributes); $i++) {
                 $id = $attributes[$i]['type'];
                 /* $value contains the DER encoding of an ASN.1 value
                    corresponding to the attribute type identified by type */
-                $map = $this->getMapping($id);
+                $map = $this->_getMapping($id);
                 if (is_array($attributes[$i]['value'])) {
                     $values = &$attributes[$i]['value'];
                     for ($j = 0; $j < count($values); $j++) {
-                        $value = ASN1::encodeDER($values[$j], Maps\AttributeValue::MAP);
-                        $decoded = ASN1::decodeBER($value);
+                        $value = $asn1->encodeDER($values[$j], $this->AttributeValue);
+                        $decoded = $asn1->decodeBER($value);
                         if (!is_bool($map)) {
-                            if (!$decoded) {
-                                continue;
-                            }
-                            $mapped = ASN1::asn1map($decoded[0], $map);
+                            $mapped = $asn1->asn1map($decoded[0], $map);
                             if ($mapped !== false) {
                                 $values[$j] = $mapped;
                             }
-                            if ($id == 'pkcs-9-at-extensionRequest' && $this->isSubArrayValid($values, $j)) {
-                                $this->mapInExtensions($values, $j);
+                            if ($id == 'pkcs-9-at-extensionRequest' && $this->_isSubArrayValid($values, $j)) {
+                                $this->_mapInExtensions($values, $j, $asn1);
                             }
                         } elseif ($map) {
-                            $values[$j] = $value;
+                            $values[$j] = base64_encode($value);
                         }
                     }
                 }
@@ -746,12 +1740,14 @@ class X509
      * Map attribute values from attribute-specific internal format to
      *   ANY type.
      *
-     * @param array $root (by reference)
+     * @param array ref $root
      * @param string $path
+     * @param object $asn1
+     * @access private
      */
-    private function mapOutAttributes(&$root, $path)
+    function _mapOutAttributes(&$root, $path, $asn1)
     {
-        $attributes = &$this->subArray($root, $path);
+        $attributes = &$this->_subArray($root, $path);
 
         if (is_array($attributes)) {
             $size = count($attributes);
@@ -759,26 +1755,23 @@ class X509
                 /* [value] contains the DER encoding of an ASN.1 value
                    corresponding to the attribute type identified by type */
                 $id = $attributes[$i]['type'];
-                $map = $this->getMapping($id);
+                $map = $this->_getMapping($id);
                 if ($map === false) {
-                    //user_error($id . ' is not a currently supported attribute', E_USER_NOTICE);
+                    user_error($id . ' is not a currently supported attribute', E_USER_NOTICE);
                     unset($attributes[$i]);
                 } elseif (is_array($attributes[$i]['value'])) {
                     $values = &$attributes[$i]['value'];
                     for ($j = 0; $j < count($values); $j++) {
                         switch ($id) {
                             case 'pkcs-9-at-extensionRequest':
-                                $this->mapOutExtensions($values, $j);
+                                $this->_mapOutExtensions($values, $j, $asn1);
                                 break;
                         }
 
                         if (!is_bool($map)) {
-                            $temp = ASN1::encodeDER($values[$j], $map);
-                            $decoded = ASN1::decodeBER($temp);
-                            if (!$decoded) {
-                                continue;
-                            }
-                            $values[$j] = ASN1::asn1map($decoded[0], Maps\AttributeValue::MAP);
+                            $temp = $asn1->encodeDER($values[$j], $map);
+                            $decoded = $asn1->decodeBER($temp);
+                            $values[$j] = $asn1->asn1map($decoded[0], $this->AttributeValue);
                         }
                     }
                 }
@@ -790,12 +1783,14 @@ class X509
      * Map DN values from ANY type to DN-specific internal
      *   format.
      *
-     * @param array $root (by reference)
+     * @param array ref $root
      * @param string $path
+     * @param object $asn1
+     * @access private
      */
-    private function mapInDNs(array &$root, $path)
+    function _mapInDNs(&$root, $path, $asn1)
     {
-        $dns = &$this->subArray($root, $path);
+        $dns = &$this->_subArray($root, $path);
 
         if (is_array($dns)) {
             for ($i = 0; $i < count($dns); $i++) {
@@ -803,13 +1798,10 @@ class X509
                     $type = $dns[$i][$j]['type'];
                     $value = &$dns[$i][$j]['value'];
                     if (is_object($value) && $value instanceof Element) {
-                        $map = $this->getMapping($type);
+                        $map = $this->_getMapping($type);
                         if (!is_bool($map)) {
-                            $decoded = ASN1::decodeBER($value);
-                            if (!$decoded) {
-                                continue;
-                            }
-                            $value = ASN1::asn1map($decoded[0], $map);
+                            $decoded = $asn1->decodeBER($value);
+                            $value = $asn1->asn1map($decoded[0], $map);
                         }
                     }
                 }
@@ -821,12 +1813,14 @@ class X509
      * Map DN values from DN-specific internal format to
      *   ANY type.
      *
-     * @param array $root (by reference)
+     * @param array ref $root
      * @param string $path
+     * @param object $asn1
+     * @access private
      */
-    private function mapOutDNs(array &$root, $path)
+    function _mapOutDNs(&$root, $path, $asn1)
     {
-        $dns = &$this->subArray($root, $path);
+        $dns = &$this->_subArray($root, $path);
 
         if (is_array($dns)) {
             $size = count($dns);
@@ -838,9 +1832,9 @@ class X509
                         continue;
                     }
 
-                    $map = $this->getMapping($type);
+                    $map = $this->_getMapping($type);
                     if (!is_bool($map)) {
-                        $value = new Element(ASN1::encodeDER($value, $map));
+                        $value = new Element($asn1->encodeDER($value, $map));
                     }
                 }
             }
@@ -851,61 +1845,58 @@ class X509
      * Associate an extension ID to an extension mapping
      *
      * @param string $extnId
+     * @access private
      * @return mixed
      */
-    private function getMapping($extnId)
+    function _getMapping($extnId)
     {
-        if (!is_string($extnId)) { // eg. if it's a \phpseclib3\File\ASN1\Element object
+        if (!is_string($extnId)) { // eg. if it's a \phpseclib\File\ASN1\Element object
             return true;
         }
 
-        if (isset(self::$extensions[$extnId])) {
-            return self::$extensions[$extnId];
-        }
-
         switch ($extnId) {
             case 'id-ce-keyUsage':
-                return Maps\KeyUsage::MAP;
+                return $this->KeyUsage;
             case 'id-ce-basicConstraints':
-                return Maps\BasicConstraints::MAP;
+                return $this->BasicConstraints;
             case 'id-ce-subjectKeyIdentifier':
-                return Maps\KeyIdentifier::MAP;
+                return $this->KeyIdentifier;
             case 'id-ce-cRLDistributionPoints':
-                return Maps\CRLDistributionPoints::MAP;
+                return $this->CRLDistributionPoints;
             case 'id-ce-authorityKeyIdentifier':
-                return Maps\AuthorityKeyIdentifier::MAP;
+                return $this->AuthorityKeyIdentifier;
             case 'id-ce-certificatePolicies':
-                return Maps\CertificatePolicies::MAP;
+                return $this->CertificatePolicies;
             case 'id-ce-extKeyUsage':
-                return Maps\ExtKeyUsageSyntax::MAP;
+                return $this->ExtKeyUsageSyntax;
             case 'id-pe-authorityInfoAccess':
-                return Maps\AuthorityInfoAccessSyntax::MAP;
+                return $this->AuthorityInfoAccessSyntax;
             case 'id-ce-subjectAltName':
-                return Maps\SubjectAltName::MAP;
+                return $this->SubjectAltName;
             case 'id-ce-subjectDirectoryAttributes':
-                return Maps\SubjectDirectoryAttributes::MAP;
+                return $this->SubjectDirectoryAttributes;
             case 'id-ce-privateKeyUsagePeriod':
-                return Maps\PrivateKeyUsagePeriod::MAP;
+                return $this->PrivateKeyUsagePeriod;
             case 'id-ce-issuerAltName':
-                return Maps\IssuerAltName::MAP;
+                return $this->IssuerAltName;
             case 'id-ce-policyMappings':
-                return Maps\PolicyMappings::MAP;
+                return $this->PolicyMappings;
             case 'id-ce-nameConstraints':
-                return Maps\NameConstraints::MAP;
+                return $this->NameConstraints;
 
             case 'netscape-cert-type':
-                return Maps\netscape_cert_type::MAP;
+                return $this->netscape_cert_type;
             case 'netscape-comment':
-                return Maps\netscape_comment::MAP;
+                return $this->netscape_comment;
             case 'netscape-ca-policy-url':
-                return Maps\netscape_ca_policy_url::MAP;
+                return $this->netscape_ca_policy_url;
 
             // since id-qt-cps isn't a constructed type it will have already been decoded as a string by the time it gets
             // back around to asn1map() and we don't want it decoded again.
             //case 'id-qt-cps':
-            //    return Maps\CPSuri::MAP;
+            //    return $this->CPSuri;
             case 'id-qt-unotice':
-                return Maps\UserNotice::MAP;
+                return $this->UserNotice;
 
             // the following OIDs are unsupported but we don't want them to give notices when calling saveX509().
             case 'id-pe-logotype': // http://www.ietf.org/rfc/rfc3709.txt
@@ -916,41 +1907,35 @@ class X509
             // "SET Secure Electronic Transaction Specification"
             // http://www.maithean.com/docs/set_bk3.pdf
             case '2.23.42.7.0': // id-set-hashedRootKey
-            // "Certificate Transparency"
-            // https://tools.ietf.org/html/rfc6962
-            case '1.3.6.1.4.1.11129.2.4.2':
-            // "Qualified Certificate statements"
-            // https://tools.ietf.org/html/rfc3739#section-3.2.6
-            case '1.3.6.1.5.5.7.1.3':
                 return true;
 
             // CSR attributes
             case 'pkcs-9-at-unstructuredName':
-                return Maps\PKCS9String::MAP;
+                return $this->PKCS9String;
             case 'pkcs-9-at-challengePassword':
-                return Maps\DirectoryString::MAP;
+                return $this->DirectoryString;
             case 'pkcs-9-at-extensionRequest':
-                return Maps\Extensions::MAP;
+                return $this->Extensions;
 
             // CRL extensions.
             case 'id-ce-cRLNumber':
-                return Maps\CRLNumber::MAP;
+                return $this->CRLNumber;
             case 'id-ce-deltaCRLIndicator':
-                return Maps\CRLNumber::MAP;
+                return $this->CRLNumber;
             case 'id-ce-issuingDistributionPoint':
-                return Maps\IssuingDistributionPoint::MAP;
+                return $this->IssuingDistributionPoint;
             case 'id-ce-freshestCRL':
-                return Maps\CRLDistributionPoints::MAP;
+                return $this->CRLDistributionPoints;
             case 'id-ce-cRLReasons':
-                return Maps\CRLReason::MAP;
+                return $this->CRLReason;
             case 'id-ce-invalidityDate':
-                return Maps\InvalidityDate::MAP;
+                return $this->InvalidityDate;
             case 'id-ce-certificateIssuer':
-                return Maps\CertificateIssuer::MAP;
+                return $this->CertificateIssuer;
             case 'id-ce-holdInstructionCode':
-                return Maps\HoldInstructionCode::MAP;
+                return $this->HoldInstructionCode;
             case 'id-at-postalAddress':
-                return Maps\PostalAddress::MAP;
+                return $this->PostalAddress;
         }
 
         return false;
@@ -960,9 +1945,10 @@ class X509
      * Load an X.509 certificate as a certificate authority
      *
      * @param string $cert
+     * @access public
      * @return bool
      */
-    public function loadCA($cert)
+    function loadCA($cert)
     {
         $olddn = $this->dn;
         $oldcert = $this->currentCert;
@@ -1026,9 +2012,10 @@ class X509
      * not bar.foo.a.com. f*.com matches foo.com but not bar.com.
      *
      * @param string $url
+     * @access public
      * @return bool
      */
-    public function validateURL($url)
+    function validateURL($url)
     {
         if (!is_array($this->currentCert) || !isset($this->currentCert['tbsCertificate'])) {
             return false;
@@ -1040,41 +2027,38 @@ class X509
         }
 
         if ($names = $this->getExtension('id-ce-subjectAltName')) {
-            foreach ($names as $name) {
-                foreach ($name as $key => $value) {
-                    $value = preg_quote($value);
-                    $value = str_replace('\*', '[^.]*', $value);
-                    switch ($key) {
-                        case 'dNSName':
-                            /* From RFC2818 "HTTP over TLS":
+            foreach ($names as $key => $value) {
+                $value = str_replace(array('.', '*'), array('\.', '[^.]*'), $value);
+                switch ($key) {
+                    case 'dNSName':
+                        /* From RFC2818 "HTTP over TLS":
 
-                               If a subjectAltName extension of type dNSName is present, that MUST
-                               be used as the identity. Otherwise, the (most specific) Common Name
-                               field in the Subject field of the certificate MUST be used. Although
-                               the use of the Common Name is existing practice, it is deprecated and
-                               Certification Authorities are encouraged to use the dNSName instead. */
-                            if (preg_match('#^' . $value . '$#', $components['host'])) {
-                                return true;
-                            }
-                            break;
-                        case 'iPAddress':
-                            /* From RFC2818 "HTTP over TLS":
+                           If a subjectAltName extension of type dNSName is present, that MUST
+                           be used as the identity. Otherwise, the (most specific) Common Name
+                           field in the Subject field of the certificate MUST be used. Although
+                           the use of the Common Name is existing practice, it is deprecated and
+                           Certification Authorities are encouraged to use the dNSName instead. */
+                        if (preg_match('#^' . $value . '$#', $components['host'])) {
+                            return true;
+                        }
+                        break;
+                    case 'iPAddress':
+                        /* From RFC2818 "HTTP over TLS":
 
-                               In some cases, the URI is specified as an IP address rather than a
-                               hostname. In this case, the iPAddress subjectAltName must be present
-                               in the certificate and must exactly match the IP in the URI. */
-                            if (preg_match('#(?:\d{1-3}\.){4}#', $components['host'] . '.') && preg_match('#^' . $value . '$#', $components['host'])) {
-                                return true;
-                            }
-                    }
+                           In some cases, the URI is specified as an IP address rather than a
+                           hostname. In this case, the iPAddress subjectAltName must be present
+                           in the certificate and must exactly match the IP in the URI. */
+                        if (preg_match('#(?:\d{1-3}\.){4}#', $components['host'] . '.') && preg_match('#^' . $value . '$#', $components['host'])) {
+                            return true;
+                        }
                 }
             }
             return false;
         }
 
         if ($value = $this->getDNProp('id-at-commonName')) {
-            $value = str_replace(['.', '*'], ['\.', '[^.]*'], $value[0]);
-            return preg_match('#^' . $value . '$#', $components['host']) === 1;
+            $value = str_replace(array('.', '*'), array('\.', '[^.]*'), $value[0]);
+            return preg_match('#^' . $value . '$#', $components['host']);
         }
 
         return false;
@@ -1085,17 +2069,17 @@ class X509
      *
      * If $date isn't defined it is assumed to be the current date.
      *
-     * @param \DateTimeInterface|string $date optional
-     * @return bool
+     * @param int $date optional
+     * @access public
      */
-    public function validateDate($date = null)
+    function validateDate($date = null)
     {
         if (!is_array($this->currentCert) || !isset($this->currentCert['tbsCertificate'])) {
             return false;
         }
 
         if (!isset($date)) {
-            $date = new \DateTimeImmutable('now', new \DateTimeZone(@date_default_timezone_get()));
+            $date = time();
         }
 
         $notBefore = $this->currentCert['tbsCertificate']['validity']['notBefore'];
@@ -1104,130 +2088,12 @@ class X509
         $notAfter = $this->currentCert['tbsCertificate']['validity']['notAfter'];
         $notAfter = isset($notAfter['generalTime']) ? $notAfter['generalTime'] : $notAfter['utcTime'];
 
-        if (is_string($date)) {
-            $date = new \DateTimeImmutable($date, new \DateTimeZone(@date_default_timezone_get()));
+        switch (true) {
+            case $date < @strtotime($notBefore):
+            case $date > @strtotime($notAfter):
+                return false;
         }
 
-        $notBefore = new \DateTimeImmutable($notBefore, new \DateTimeZone(@date_default_timezone_get()));
-        $notAfter = new \DateTimeImmutable($notAfter, new \DateTimeZone(@date_default_timezone_get()));
-
-        return $date >= $notBefore && $date <= $notAfter;
-    }
-
-    /**
-     * Fetches a URL
-     *
-     * @param string $url
-     * @return bool|string
-     */
-    private static function fetchURL($url)
-    {
-        if (self::$disable_url_fetch) {
-            return false;
-        }
-
-        $parts = parse_url($url);
-        $data = '';
-        switch ($parts['scheme']) {
-            case 'http':
-                $fsock = @fsockopen($parts['host'], isset($parts['port']) ? $parts['port'] : 80);
-                if (!$fsock) {
-                    return false;
-                }
-                $path = $parts['path'];
-                if (isset($parts['query'])) {
-                    $path .= '?' . $parts['query'];
-                }
-                fputs($fsock, "GET $path HTTP/1.0\r\n");
-                fputs($fsock, "Host: $parts[host]\r\n\r\n");
-                $line = fgets($fsock, 1024);
-                if (strlen($line) < 3) {
-                    return false;
-                }
-                preg_match('#HTTP/1.\d (\d{3})#', $line, $temp);
-                if ($temp[1] != '200') {
-                    return false;
-                }
-
-                // skip the rest of the headers in the http response
-                while (!feof($fsock) && fgets($fsock, 1024) != "\r\n") {
-                }
-
-                while (!feof($fsock)) {
-                    $temp = fread($fsock, 1024);
-                    if ($temp === false) {
-                        return false;
-                    }
-                    $data .= $temp;
-                }
-
-                break;
-            //case 'ftp':
-            //case 'ldap':
-            //default:
-        }
-
-        return $data;
-    }
-
-    /**
-     * Validates an intermediate cert as identified via authority info access extension
-     *
-     * See https://tools.ietf.org/html/rfc4325 for more info
-     *
-     * @param bool $caonly
-     * @param int $count
-     * @return bool
-     */
-    private function testForIntermediate($caonly, $count)
-    {
-        $opts = $this->getExtension('id-pe-authorityInfoAccess');
-        if (!is_array($opts)) {
-            return false;
-        }
-        foreach ($opts as $opt) {
-            if ($opt['accessMethod'] == 'id-ad-caIssuers') {
-                // accessLocation is a GeneralName. GeneralName fields support stuff like email addresses, IP addresses, LDAP,
-                // etc, but we're only supporting URI's. URI's and LDAP are the only thing https://tools.ietf.org/html/rfc4325
-                // discusses
-                if (isset($opt['accessLocation']['uniformResourceIdentifier'])) {
-                    $url = $opt['accessLocation']['uniformResourceIdentifier'];
-                    break;
-                }
-            }
-        }
-
-        if (!isset($url)) {
-            return false;
-        }
-
-        $cert = static::fetchURL($url);
-        if (!is_string($cert)) {
-            return false;
-        }
-
-        $parent = new static();
-        $parent->CAs = $this->CAs;
-        /*
-         "Conforming applications that support HTTP or FTP for accessing
-          certificates MUST be able to accept .cer files and SHOULD be able
-          to accept .p7c files." -- https://tools.ietf.org/html/rfc4325
-
-         A .p7c file is 'a "certs-only" CMS message as specified in RFC 2797"
-
-         These are currently unsupported
-        */
-        if (!is_array($parent->loadX509($cert))) {
-            return false;
-        }
-
-        if (!$parent->validateSignatureCountable($caonly, ++$count)) {
-            return false;
-        }
-
-        $this->CAs[] = $parent->currentCert;
-        //$this->loadCA($cert);
-
         return true;
     }
 
@@ -1243,32 +2109,15 @@ class X509
      * The behavior of this function is inspired by {@link http://php.net/openssl-verify openssl_verify}.
      *
      * @param bool $caonly optional
+     * @access public
      * @return mixed
      */
-    public function validateSignature($caonly = true)
-    {
-        return $this->validateSignatureCountable($caonly, 0);
-    }
-
-    /**
-     * Validate a signature
-     *
-     * Performs said validation whilst keeping track of how many times validation method is called
-     *
-     * @param bool $caonly
-     * @param int $count
-     * @return mixed
-     */
-    private function validateSignatureCountable($caonly, $count)
+    function validateSignature($caonly = true)
     {
         if (!is_array($this->currentCert) || !isset($this->signatureSubject)) {
             return null;
         }
 
-        if ($count == self::$recur_limit) {
-            return false;
-        }
-
         /* TODO:
            "emailAddress attribute values are not case-sensitive (e.g., "subscriber@example.com" is the same as "SUBSCRIBER@EXAMPLE.COM")."
             -- http://tools.ietf.org/html/rfc5280#section-4.1.2.6
@@ -1285,8 +2134,7 @@ class X509
                         $subjectKeyID = $this->getExtension('id-ce-subjectKeyIdentifier');
                         switch (true) {
                             case !is_array($authorityKey):
-                            case !$subjectKeyID:
-                            case isset($authorityKey['keyIdentifier']) && $authorityKey['keyIdentifier'] === $subjectKeyID:
+                            case is_array($authorityKey) && isset($authorityKey['keyIdentifier']) && $authorityKey['keyIdentifier'] === $subjectKeyID:
                                 $signingCert = $this->currentCert; // working cert
                         }
                 }
@@ -1303,43 +2151,39 @@ class X509
                                 $subjectKeyID = $this->getExtension('id-ce-subjectKeyIdentifier', $ca);
                                 switch (true) {
                                     case !is_array($authorityKey):
-                                    case !$subjectKeyID:
-                                    case isset($authorityKey['keyIdentifier']) && $authorityKey['keyIdentifier'] === $subjectKeyID:
-                                        if (is_array($authorityKey) && isset($authorityKey['authorityCertSerialNumber']) && !$authorityKey['authorityCertSerialNumber']->equals($ca['tbsCertificate']['serialNumber'])) {
-                                            break 2; // serial mismatch - check other ca
-                                        }
+                                    case is_array($authorityKey) && isset($authorityKey['keyIdentifier']) && $authorityKey['keyIdentifier'] === $subjectKeyID:
                                         $signingCert = $ca; // working cert
                                         break 3;
                                 }
                         }
                     }
                     if (count($this->CAs) == $i && $caonly) {
-                        return $this->testForIntermediate($caonly, $count) && $this->validateSignature($caonly);
+                        return false;
                     }
                 } elseif (!isset($signingCert) || $caonly) {
-                    return $this->testForIntermediate($caonly, $count) && $this->validateSignature($caonly);
+                    return false;
                 }
-                return $this->validateSignatureHelper(
+                return $this->_validateSignature(
                     $signingCert['tbsCertificate']['subjectPublicKeyInfo']['algorithm']['algorithm'],
                     $signingCert['tbsCertificate']['subjectPublicKeyInfo']['subjectPublicKey'],
                     $this->currentCert['signatureAlgorithm']['algorithm'],
-                    substr($this->currentCert['signature'], 1),
+                    substr(base64_decode($this->currentCert['signature']), 1),
                     $this->signatureSubject
                 );
             case isset($this->currentCert['certificationRequestInfo']):
-                return $this->validateSignatureHelper(
+                return $this->_validateSignature(
                     $this->currentCert['certificationRequestInfo']['subjectPKInfo']['algorithm']['algorithm'],
                     $this->currentCert['certificationRequestInfo']['subjectPKInfo']['subjectPublicKey'],
                     $this->currentCert['signatureAlgorithm']['algorithm'],
-                    substr($this->currentCert['signature'], 1),
+                    substr(base64_decode($this->currentCert['signature']), 1),
                     $this->signatureSubject
                 );
             case isset($this->currentCert['publicKeyAndChallenge']):
-                return $this->validateSignatureHelper(
+                return $this->_validateSignature(
                     $this->currentCert['publicKeyAndChallenge']['spki']['algorithm']['algorithm'],
                     $this->currentCert['publicKeyAndChallenge']['spki']['subjectPublicKey'],
                     $this->currentCert['signatureAlgorithm']['algorithm'],
-                    substr($this->currentCert['signature'], 1),
+                    substr(base64_decode($this->currentCert['signature']), 1),
                     $this->signatureSubject
                 );
             case isset($this->currentCert['tbsCertList']):
@@ -1353,11 +2197,7 @@ class X509
                                 $subjectKeyID = $this->getExtension('id-ce-subjectKeyIdentifier', $ca);
                                 switch (true) {
                                     case !is_array($authorityKey):
-                                    case !$subjectKeyID:
-                                    case isset($authorityKey['keyIdentifier']) && $authorityKey['keyIdentifier'] === $subjectKeyID:
-                                        if (is_array($authorityKey) && isset($authorityKey['authorityCertSerialNumber']) && !$authorityKey['authorityCertSerialNumber']->equals($ca['tbsCertificate']['serialNumber'])) {
-                                            break 2; // serial mismatch - check other ca
-                                        }
+                                    case is_array($authorityKey) && isset($authorityKey['keyIdentifier']) && $authorityKey['keyIdentifier'] === $subjectKeyID:
                                         $signingCert = $ca; // working cert
                                         break 3;
                                 }
@@ -1367,11 +2207,11 @@ class X509
                 if (!isset($signingCert)) {
                     return false;
                 }
-                return $this->validateSignatureHelper(
+                return $this->_validateSignature(
                     $signingCert['tbsCertificate']['subjectPublicKeyInfo']['algorithm']['algorithm'],
                     $signingCert['tbsCertificate']['subjectPublicKeyInfo']['subjectPublicKey'],
                     $this->currentCert['signatureAlgorithm']['algorithm'],
-                    substr($this->currentCert['signature'], 1),
+                    substr(base64_decode($this->currentCert['signature']), 1),
                     $this->signatureSubject
                 );
             default:
@@ -1382,28 +2222,24 @@ class X509
     /**
      * Validates a signature
      *
-     * Returns true if the signature is verified and false if it is not correct.
-     * If the algorithms are unsupposed an exception is thrown.
+     * Returns true if the signature is verified, false if it is not correct or null on error
      *
      * @param string $publicKeyAlgorithm
      * @param string $publicKey
      * @param string $signatureAlgorithm
      * @param string $signature
      * @param string $signatureSubject
-     * @throws \phpseclib3\Exception\UnsupportedAlgorithmException if the algorithm is unsupported
-     * @return bool
+     * @access private
+     * @return int
      */
-    private function validateSignatureHelper($publicKeyAlgorithm, $publicKey, $signatureAlgorithm, $signature, $signatureSubject)
+    function _validateSignature($publicKeyAlgorithm, $publicKey, $signatureAlgorithm, $signature, $signatureSubject)
     {
         switch ($publicKeyAlgorithm) {
-            case 'id-RSASSA-PSS':
-                $key = RSA::loadFormat('PSS', $publicKey);
-                break;
             case 'rsaEncryption':
-                $key = RSA::loadFormat('PKCS8', $publicKey);
+                $rsa = new RSA();
+                $rsa->loadKey($publicKey);
+
                 switch ($signatureAlgorithm) {
-                    case 'id-RSASSA-PSS':
-                        break;
                     case 'md2WithRSAEncryption':
                     case 'md5WithRSAEncryption':
                     case 'sha1WithRSAEncryption':
@@ -1411,83 +2247,47 @@ class X509
                     case 'sha256WithRSAEncryption':
                     case 'sha384WithRSAEncryption':
                     case 'sha512WithRSAEncryption':
-                        $key = $key
-                            ->withHash(preg_replace('#WithRSAEncryption$#', '', $signatureAlgorithm))
-                            ->withPadding(RSA::SIGNATURE_PKCS1);
+                        $rsa->setHash(preg_replace('#WithRSAEncryption$#', '', $signatureAlgorithm));
+                        $rsa->setSignatureMode(RSA::SIGNATURE_PKCS1);
+                        if (!@$rsa->verify($signatureSubject, $signature)) {
+                            return false;
+                        }
                         break;
                     default:
-                        throw new UnsupportedAlgorithmException('Signature algorithm unsupported');
-                }
-                break;
-            case 'id-Ed25519':
-            case 'id-Ed448':
-                $key = EC::loadFormat('PKCS8', $publicKey);
-                break;
-            case 'id-ecPublicKey':
-                $key = EC::loadFormat('PKCS8', $publicKey);
-                switch ($signatureAlgorithm) {
-                    case 'ecdsa-with-SHA1':
-                    case 'ecdsa-with-SHA224':
-                    case 'ecdsa-with-SHA256':
-                    case 'ecdsa-with-SHA384':
-                    case 'ecdsa-with-SHA512':
-                        $key = $key
-                            ->withHash(preg_replace('#^ecdsa-with-#', '', strtolower($signatureAlgorithm)));
-                        break;
-                    default:
-                        throw new UnsupportedAlgorithmException('Signature algorithm unsupported');
-                }
-                break;
-            case 'id-dsa':
-                $key = DSA::loadFormat('PKCS8', $publicKey);
-                switch ($signatureAlgorithm) {
-                    case 'id-dsa-with-sha1':
-                    case 'id-dsa-with-sha224':
-                    case 'id-dsa-with-sha256':
-                        $key = $key
-                            ->withHash(preg_replace('#^id-dsa-with-#', '', strtolower($signatureAlgorithm)));
-                        break;
-                    default:
-                        throw new UnsupportedAlgorithmException('Signature algorithm unsupported');
+                        return null;
                 }
                 break;
             default:
-                throw new UnsupportedAlgorithmException('Public key algorithm unsupported');
+                return null;
         }
 
-        return $key->verify($signatureSubject, $signature);
+        return true;
     }
 
     /**
-     * Sets the recursion limit
+     * Reformat public keys
      *
-     * When validating a signature it may be necessary to download intermediate certs from URI's.
-     * An intermediate cert that linked to itself would result in an infinite loop so to prevent
-     * that we set a recursion limit. A negative number means that there is no recursion limit.
+     * Reformats a public key to a format supported by phpseclib (if applicable)
      *
-     * @param int $count
+     * @param string $algorithm
+     * @param string $key
+     * @access private
+     * @return string
      */
-    public static function setRecurLimit($count)
+    function _reformatKey($algorithm, $key)
     {
-        self::$recur_limit = $count;
-    }
-
-    /**
-     * Prevents URIs from being automatically retrieved
-     *
-     */
-    public static function disableURLFetch()
-    {
-        self::$disable_url_fetch = true;
-    }
-
-    /**
-     * Allows URIs to be automatically retrieved
-     *
-     */
-    public static function enableURLFetch()
-    {
-        self::$disable_url_fetch = false;
+        switch ($algorithm) {
+            case 'rsaEncryption':
+                return
+                    "-----BEGIN RSA PUBLIC KEY-----\r\n" .
+                    // subjectPublicKey is stored as a bit string in X.509 certs.  the first byte of a bit string represents how many bits
+                    // in the last byte should be ignored.  the following only supports non-zero stuff but as none of the X.509 certs Firefox
+                    // uses as a cert authority actually use a non-zero bit I think it's safe to assume that none do.
+                    chunk_split(base64_encode(substr(base64_decode($key), 1)), 64) .
+                    '-----END RSA PUBLIC KEY-----';
+            default:
+                return $key;
+        }
     }
 
     /**
@@ -1496,27 +2296,12 @@ class X509
      * Takes in a base64 encoded "blob" and returns a human readable IP address
      *
      * @param string $ip
+     * @access private
      * @return string
      */
-    public static function decodeIP($ip)
+    function _decodeIP($ip)
     {
-        return inet_ntop($ip);
-    }
-
-    /**
-     * Decodes an IP address in a name constraints extension
-     *
-     * Takes in a base64 encoded "blob" and returns a human readable IP address / mask
-     *
-     * @param string $ip
-     * @return array
-     */
-    public static function decodeNameConstraintIP($ip)
-    {
-        $size = strlen($ip) >> 1;
-        $mask = substr($ip, $size);
-        $ip = substr($ip, 0, $size);
-        return [inet_ntop($ip), inet_ntop($mask)];
+        return inet_ntop(base64_decode($ip));
     }
 
     /**
@@ -1524,39 +2309,25 @@ class X509
      *
      * Takes a human readable IP address into a base64-encoded "blob"
      *
-     * @param string|array $ip
+     * @param string $ip
+     * @access private
      * @return string
      */
-    public static function encodeIP($ip)
+    function _encodeIP($ip)
     {
-        return is_string($ip) ?
-            inet_pton($ip) :
-            inet_pton($ip[0]) . inet_pton($ip[1]);
+        return base64_encode(inet_pton($ip));
     }
 
     /**
      * "Normalizes" a Distinguished Name property
      *
      * @param string $propName
+     * @access private
      * @return mixed
      */
-    private function translateDNProp($propName)
+    function _translateDNProp($propName)
     {
         switch (strtolower($propName)) {
-            case 'jurisdictionofincorporationcountryname':
-            case 'jurisdictioncountryname':
-            case 'jurisdictionc':
-                return 'jurisdictionOfIncorporationCountryName';
-            case 'jurisdictionofincorporationstateorprovincename':
-            case 'jurisdictionstateorprovincename':
-            case 'jurisdictionst':
-                return 'jurisdictionOfIncorporationStateOrProvinceName';
-            case 'jurisdictionlocalityname':
-            case 'jurisdictionl':
-                return 'jurisdictionLocalityName';
-            case 'id-at-businesscategory':
-            case 'businesscategory':
-                return 'id-at-businessCategory';
             case 'id-at-countryname':
             case 'countryname':
             case 'c':
@@ -1645,28 +2416,29 @@ class X509
      * @param string $propName
      * @param mixed $propValue
      * @param string $type optional
+     * @access public
      * @return bool
      */
-    public function setDNProp($propName, $propValue, $type = 'utf8String')
+    function setDNProp($propName, $propValue, $type = 'utf8String')
     {
         if (empty($this->dn)) {
-            $this->dn = ['rdnSequence' => []];
+            $this->dn = array('rdnSequence' => array());
         }
 
-        if (($propName = $this->translateDNProp($propName)) === false) {
+        if (($propName = $this->_translateDNProp($propName)) === false) {
             return false;
         }
 
         foreach ((array) $propValue as $v) {
             if (!is_array($v) && isset($type)) {
-                $v = [$type => $v];
+                $v = array($type => $v);
             }
-            $this->dn['rdnSequence'][] = [
-                [
+            $this->dn['rdnSequence'][] = array(
+                array(
                     'type' => $propName,
-                    'value' => $v
-                ]
-            ];
+                    'value'=> $v
+                )
+            );
         }
 
         return true;
@@ -1676,14 +2448,15 @@ class X509
      * Remove Distinguished Name properties
      *
      * @param string $propName
+     * @access public
      */
-    public function removeDNProp($propName)
+    function removeDNProp($propName)
     {
         if (empty($this->dn)) {
             return;
         }
 
-        if (($propName = $this->translateDNProp($propName)) === false) {
+        if (($propName = $this->_translateDNProp($propName)) === false) {
             return;
         }
 
@@ -1696,10 +2469,6 @@ class X509
         }
 
         $dn = array_values($dn);
-        // fix for https://bugs.php.net/75433 affecting PHP 7.2
-        if (!isset($dn[0])) {
-            $dn = array_splice($dn, 0, 0);
-        }
     }
 
     /**
@@ -1709,8 +2478,9 @@ class X509
      * @param array $dn optional
      * @param bool $withType optional
      * @return mixed
+     * @access public
      */
-    public function getDNProp($propName, array $dn = null, $withType = false)
+    function getDNProp($propName, $dn = null, $withType = false)
     {
         if (!isset($dn)) {
             $dn = $this->dn;
@@ -1720,25 +2490,27 @@ class X509
             return false;
         }
 
-        if (($propName = $this->translateDNProp($propName)) === false) {
+        if (($propName = $this->_translateDNProp($propName)) === false) {
             return false;
         }
 
-        $filters = [];
-        $filters['value'] = ['type' => ASN1::TYPE_UTF8_STRING];
-        ASN1::setFilters($filters);
-        $this->mapOutDNs($dn, 'rdnSequence');
+        $asn1 = new ASN1();
+        $asn1->loadOIDs($this->oids);
+        $filters = array();
+        $filters['value'] = array('type' => ASN1::TYPE_UTF8_STRING);
+        $asn1->loadFilters($filters);
+        $this->_mapOutDNs($dn, 'rdnSequence', $asn1);
         $dn = $dn['rdnSequence'];
-        $result = [];
+        $result = array();
         for ($i = 0; $i < count($dn); $i++) {
             if ($dn[$i][0]['type'] == $propName) {
                 $v = $dn[$i][0]['value'];
                 if (!$withType) {
                     if (is_array($v)) {
                         foreach ($v as $type => $s) {
-                            $type = array_search($type, ASN1::ANY_MAP);
-                            if ($type !== false && array_key_exists($type, ASN1::STRING_TYPE_SIZE)) {
-                                $s = ASN1::convert($s, $type);
+                            $type = array_search($type, $asn1->ANYmap, true);
+                            if ($type !== false && isset($asn1->stringTypeSize[$type])) {
+                                $s = $asn1->convert($s, $type);
                                 if ($s !== false) {
                                     $v = $s;
                                     break;
@@ -1749,13 +2521,10 @@ class X509
                             $v = array_pop($v); // Always strip data type.
                         }
                     } elseif (is_object($v) && $v instanceof Element) {
-                        $map = $this->getMapping($propName);
+                        $map = $this->_getMapping($propName);
                         if (!is_bool($map)) {
-                            $decoded = ASN1::decodeBER($v);
-                            if (!$decoded) {
-                                return false;
-                            }
-                            $v = ASN1::asn1map($decoded[0], $map);
+                            $decoded = $asn1->decodeBER($v);
+                            $v = $asn1->asn1map($decoded[0], $map);
                         }
                     }
                 }
@@ -1772,9 +2541,10 @@ class X509
      * @param mixed $dn
      * @param bool $merge optional
      * @param string $type optional
+     * @access public
      * @return bool
      */
-    public function setDN($dn, $merge = false, $type = 'utf8String')
+    function setDN($dn, $merge = false, $type = 'utf8String')
     {
         if (!$merge) {
             $this->dn = null;
@@ -1797,7 +2567,7 @@ class X509
 
         // handles everything else
         $results = preg_split('#((?:^|, *|/)(?:C=|O=|OU=|CN=|L=|ST=|SN=|postalCode=|streetAddress=|emailAddress=|serialNumber=|organizationalUnitName=|title=|description=|role=|x500UniqueIdentifier=|postalAddress=))#', $dn, -1, PREG_SPLIT_DELIM_CAPTURE);
-        for ($i = 1; $i < count($results); $i += 2) {
+        for ($i = 1; $i < count($results); $i+=2) {
             $prop = trim($results[$i], ', =/');
             $value = $results[$i + 1];
             if (!$this->setDNProp($prop, $value, $type)) {
@@ -1813,9 +2583,10 @@ class X509
      *
      * @param mixed $format optional
      * @param array $dn optional
-     * @return array|bool|string
+     * @access public
+     * @return bool
      */
-    public function getDN($format = self::DN_ARRAY, array $dn = null)
+    function getDN($format = self::DN_ARRAY, $dn = null)
     {
         if (!isset($dn)) {
             $dn = isset($this->currentCert['tbsCertList']) ? $this->currentCert['tbsCertList']['issuer'] : $this->dn;
@@ -1825,28 +2596,32 @@ class X509
             case self::DN_ARRAY:
                 return $dn;
             case self::DN_ASN1:
-                $filters = [];
-                $filters['rdnSequence']['value'] = ['type' => ASN1::TYPE_UTF8_STRING];
-                ASN1::setFilters($filters);
-                $this->mapOutDNs($dn, 'rdnSequence');
-                return ASN1::encodeDER($dn, Maps\Name::MAP);
+                $asn1 = new ASN1();
+                $asn1->loadOIDs($this->oids);
+                $filters = array();
+                $filters['rdnSequence']['value'] = array('type' => ASN1::TYPE_UTF8_STRING);
+                $asn1->loadFilters($filters);
+                $this->_mapOutDNs($dn, 'rdnSequence', $asn1);
+                return $asn1->encodeDER($dn, $this->Name);
             case self::DN_CANON:
                 //  No SEQUENCE around RDNs and all string values normalized as
                 // trimmed lowercase UTF-8 with all spacing as one blank.
                 // constructed RDNs will not be canonicalized
-                $filters = [];
-                $filters['value'] = ['type' => ASN1::TYPE_UTF8_STRING];
-                ASN1::setFilters($filters);
+                $asn1 = new ASN1();
+                $asn1->loadOIDs($this->oids);
+                $filters = array();
+                $filters['value'] = array('type' => ASN1::TYPE_UTF8_STRING);
+                $asn1->loadFilters($filters);
                 $result = '';
-                $this->mapOutDNs($dn, 'rdnSequence');
+                $this->_mapOutDNs($dn, 'rdnSequence', $asn1);
                 foreach ($dn['rdnSequence'] as $rdn) {
                     foreach ($rdn as $i => $attr) {
                         $attr = &$rdn[$i];
                         if (is_array($attr['value'])) {
                             foreach ($attr['value'] as $type => $v) {
-                                $type = array_search($type, ASN1::ANY_MAP, true);
-                                if ($type !== false && array_key_exists($type, ASN1::STRING_TYPE_SIZE)) {
-                                    $v = ASN1::convert($v, $type);
+                                $type = array_search($type, $asn1->ANYmap, true);
+                                if ($type !== false && isset($asn1->stringTypeSize[$type])) {
+                                    $v = $asn1->convert($v, $type);
                                     if ($v !== false) {
                                         $v = preg_replace('/\s+/', ' ', $v);
                                         $attr['value'] = strtolower(trim($v));
@@ -1856,7 +2631,7 @@ class X509
                             }
                         }
                     }
-                    $result .= ASN1::encodeDER($rdn, Maps\RelativeDistinguishedName::MAP);
+                    $result .= $asn1->encodeDER($rdn, $this->RelativeDistinguishedName);
                 }
                 return $result;
             case self::DN_HASH:
@@ -1864,18 +2639,20 @@ class X509
                 $hash = new Hash('sha1');
                 $hash = $hash->hash($dn);
                 extract(unpack('Vhash', $hash));
-                return strtolower(Strings::bin2hex(pack('N', $hash)));
+                return strtolower(bin2hex(pack('N', $hash)));
         }
 
         // Default is to return a string.
         $start = true;
         $output = '';
 
-        $result = [];
-        $filters = [];
-        $filters['rdnSequence']['value'] = ['type' => ASN1::TYPE_UTF8_STRING];
-        ASN1::setFilters($filters);
-        $this->mapOutDNs($dn, 'rdnSequence');
+        $result = array();
+        $asn1 = new ASN1();
+        $asn1->loadOIDs($this->oids);
+        $filters = array();
+        $filters['rdnSequence']['value'] = array('type' => ASN1::TYPE_UTF8_STRING);
+        $asn1->loadFilters($filters);
+        $this->_mapOutDNs($dn, 'rdnSequence', $asn1);
 
         foreach ($dn['rdnSequence'] as $field) {
             $prop = $field[0]['type'];
@@ -1918,13 +2695,13 @@ class X509
             }
 
             if (!$start) {
-                $output .= $delim;
+                $output.= $delim;
             }
             if (is_array($value)) {
                 foreach ($value as $type => $v) {
-                    $type = array_search($type, ASN1::ANY_MAP, true);
-                    if ($type !== false && array_key_exists($type, ASN1::STRING_TYPE_SIZE)) {
-                        $v = ASN1::convert($v, $type);
+                    $type = array_search($type, $asn1->ANYmap, true);
+                    if ($type !== false && isset($asn1->stringTypeSize[$type])) {
+                        $v = $asn1->convert($v, $type);
                         if ($v !== false) {
                             $value = $v;
                             break;
@@ -1935,14 +2712,12 @@ class X509
                     $value = array_pop($value); // Always strip data type.
                 }
             } elseif (is_object($value) && $value instanceof Element) {
-                $callback = function ($x) {
-                    return '\x' . bin2hex($x[0]);
-                };
+                $callback = create_function('$x', 'return "\x" . bin2hex($x[0]);');
                 $value = strtoupper(preg_replace_callback('#[^\x20-\x7E]#', $callback, $value->element));
             }
-            $output .= $desc . '=' . $value;
+            $output.= $desc . '=' . $value;
             $result[$desc] = isset($result[$desc]) ?
-                array_merge((array) $result[$desc], [$value]) :
+                array_merge((array) $dn[$prop], array($value)) :
                 $value;
             $start = false;
         }
@@ -1954,9 +2729,10 @@ class X509
      * Get the Distinguished Name for a certificate/crl issuer
      *
      * @param int $format optional
+     * @access public
      * @return mixed
      */
-    public function getIssuerDN($format = self::DN_ARRAY)
+    function getIssuerDN($format = self::DN_ARRAY)
     {
         switch (true) {
             case !isset($this->currentCert) || !is_array($this->currentCert):
@@ -1975,9 +2751,10 @@ class X509
      * Alias of getDN()
      *
      * @param int $format optional
+     * @access public
      * @return mixed
      */
-    public function getSubjectDN($format = self::DN_ARRAY)
+    function getSubjectDN($format = self::DN_ARRAY)
     {
         switch (true) {
             case !empty($this->dn):
@@ -1998,9 +2775,10 @@ class X509
      *
      * @param string $propName
      * @param bool $withType optional
+     * @access public
      * @return mixed
      */
-    public function getIssuerDNProp($propName, $withType = false)
+    function getIssuerDNProp($propName, $withType = false)
     {
         switch (true) {
             case !isset($this->currentCert) || !is_array($this->currentCert):
@@ -2019,9 +2797,10 @@ class X509
      *
      * @param string $propName
      * @param bool $withType optional
+     * @access public
      * @return mixed
      */
-    public function getSubjectDNProp($propName, $withType = false)
+    function getSubjectDNProp($propName, $withType = false)
     {
         switch (true) {
             case !empty($this->dn):
@@ -2040,15 +2819,19 @@ class X509
     /**
      * Get the certificate chain for the current cert
      *
+     * @access public
      * @return mixed
      */
-    public function getChain()
+    function getChain()
     {
-        $chain = [$this->currentCert];
+        $chain = array($this->currentCert);
 
         if (!is_array($this->currentCert) || !isset($this->currentCert['tbsCertificate'])) {
             return false;
         }
+        if (empty($this->CAs)) {
+            return $chain;
+        }
         while (true) {
             $currentCert = $chain[count($chain) - 1];
             for ($i = 0; $i < count($this->CAs); $i++) {
@@ -2078,37 +2861,30 @@ class X509
         return $chain;
     }
 
-    /**
-     * Returns the current cert
-     *
-     * @return array|bool
-     */
-    public function &getCurrentCert()
-    {
-        return $this->currentCert;
-    }
-
     /**
      * Set public key
      *
-     * Key needs to be a \phpseclib3\Crypt\RSA object
+     * Key needs to be a \phpseclib\Crypt\RSA object
      *
-     * @param PublicKey $key
-     * @return void
+     * @param object $key
+     * @access public
+     * @return bool
      */
-    public function setPublicKey(PublicKey $key)
+    function setPublicKey($key)
     {
+        $key->setPublicKey();
         $this->publicKey = $key;
     }
 
     /**
      * Set private key
      *
-     * Key needs to be a \phpseclib3\Crypt\RSA object
+     * Key needs to be a \phpseclib\Crypt\RSA object
      *
-     * @param PrivateKey $key
+     * @param object $key
+     * @access public
      */
-    public function setPrivateKey(PrivateKey $key)
+    function setPrivateKey($key)
     {
         $this->privateKey = $key;
     }
@@ -2119,8 +2895,9 @@ class X509
      * Used for SPKAC CSR's
      *
      * @param string $challenge
+     * @access public
      */
-    public function setChallenge($challenge)
+    function setChallenge($challenge)
     {
         $this->challenge = $challenge;
     }
@@ -2128,24 +2905,20 @@ class X509
     /**
      * Gets the public key
      *
-     * Returns a \phpseclib3\Crypt\RSA object or a false.
+     * Returns a \phpseclib\Crypt\RSA object or a false.
      *
+     * @access public
      * @return mixed
      */
-    public function getPublicKey()
+    function getPublicKey()
     {
         if (isset($this->publicKey)) {
             return $this->publicKey;
         }
 
         if (isset($this->currentCert) && is_array($this->currentCert)) {
-            $paths = [
-                'tbsCertificate/subjectPublicKeyInfo',
-                'certificationRequestInfo/subjectPKInfo',
-                'publicKeyAndChallenge/spki'
-            ];
-            foreach ($paths as $path) {
-                $keyinfo = $this->subArray($this->currentCert, $path);
+            foreach (array('tbsCertificate/subjectPublicKeyInfo', 'certificationRequestInfo/subjectPKInfo') as $path) {
+                $keyinfo = $this->_subArray($this->currentCert, $path);
                 if (!empty($keyinfo)) {
                     break;
                 }
@@ -2158,29 +2931,26 @@ class X509
         $key = $keyinfo['subjectPublicKey'];
 
         switch ($keyinfo['algorithm']['algorithm']) {
-            case 'id-RSASSA-PSS':
-                return RSA::loadFormat('PSS', $key);
             case 'rsaEncryption':
-                return RSA::loadFormat('PKCS8', $key)->withPadding(RSA::SIGNATURE_PKCS1);
-            case 'id-ecPublicKey':
-            case 'id-Ed25519':
-            case 'id-Ed448':
-                return EC::loadFormat('PKCS8', $key);
-            case 'id-dsa':
-                return DSA::loadFormat('PKCS8', $key);
+                $publicKey = new RSA();
+                $publicKey->loadKey($key);
+                $publicKey->setPublicKey();
+                break;
+            default:
+                return false;
         }
 
-        return false;
+        return $publicKey;
     }
 
     /**
      * Load a Certificate Signing Request
      *
      * @param string $csr
-     * @param int $mode
+     * @access public
      * @return mixed
      */
-    public function loadCSR($csr, $mode = self::FORMAT_AUTO_DETECT)
+    function loadCSR($csr, $mode = self::FORMAT_AUTO_DETECT)
     {
         if (is_array($csr) && isset($csr['certificationRequestInfo'])) {
             unset($this->currentCert);
@@ -2197,8 +2967,10 @@ class X509
 
         // see http://tools.ietf.org/html/rfc2986
 
+        $asn1 = new ASN1();
+
         if ($mode != self::FORMAT_DER) {
-            $newcsr = ASN1::extractBER($csr);
+            $newcsr = $this->_extractBER($csr);
             if ($mode == self::FORMAT_PEM && $csr == $newcsr) {
                 return false;
             }
@@ -2211,39 +2983,44 @@ class X509
             return false;
         }
 
-        $decoded = ASN1::decodeBER($csr);
+        $asn1->loadOIDs($this->oids);
+        $decoded = $asn1->decodeBER($csr);
 
-        if (!$decoded) {
+        if (empty($decoded)) {
             $this->currentCert = false;
             return false;
         }
 
-        $csr = ASN1::asn1map($decoded[0], Maps\CertificationRequest::MAP);
+        $csr = $asn1->asn1map($decoded[0], $this->CertificationRequest);
         if (!isset($csr) || $csr === false) {
             $this->currentCert = false;
             return false;
         }
 
-        $this->mapInAttributes($csr, 'certificationRequestInfo/attributes');
-        $this->mapInDNs($csr, 'certificationRequestInfo/subject/rdnSequence');
+        $this->_mapInAttributes($csr, 'certificationRequestInfo/attributes', $asn1);
+        $this->_mapInDNs($csr, 'certificationRequestInfo/subject/rdnSequence', $asn1);
 
         $this->dn = $csr['certificationRequestInfo']['subject'];
 
         $this->signatureSubject = substr($orig, $decoded[0]['content'][0]['start'], $decoded[0]['content'][0]['length']);
 
-        $key = $csr['certificationRequestInfo']['subjectPKInfo'];
-        $key = ASN1::encodeDER($key, Maps\SubjectPublicKeyInfo::MAP);
-        $csr['certificationRequestInfo']['subjectPKInfo']['subjectPublicKey'] =
-            "-----BEGIN PUBLIC KEY-----\r\n" .
-            chunk_split(base64_encode($key), 64) .
-            "-----END PUBLIC KEY-----";
+        $algorithm = &$csr['certificationRequestInfo']['subjectPKInfo']['algorithm']['algorithm'];
+        $key = &$csr['certificationRequestInfo']['subjectPKInfo']['subjectPublicKey'];
+        $key = $this->_reformatKey($algorithm, $key);
+
+        switch ($algorithm) {
+            case 'rsaEncryption':
+                $this->publicKey = new RSA();
+                $this->publicKey->loadKey($key);
+                $this->publicKey->setPublicKey();
+                break;
+            default:
+                $this->publicKey = null;
+        }
 
         $this->currentKeyIdentifier = null;
         $this->currentCert = $csr;
 
-        $this->publicKey = null;
-        $this->publicKey = $this->getPublicKey();
-
         return $csr;
     }
 
@@ -2252,40 +3029,50 @@ class X509
      *
      * @param array $csr
      * @param int $format optional
+     * @access public
      * @return string
      */
-    public function saveCSR(array $csr, $format = self::FORMAT_PEM)
+    function saveCSR($csr, $format = self::FORMAT_PEM)
     {
         if (!is_array($csr) || !isset($csr['certificationRequestInfo'])) {
             return false;
         }
 
         switch (true) {
-            case !($algorithm = $this->subArray($csr, 'certificationRequestInfo/subjectPKInfo/algorithm/algorithm')):
+            case !($algorithm = $this->_subArray($csr, 'certificationRequestInfo/subjectPKInfo/algorithm/algorithm')):
             case is_object($csr['certificationRequestInfo']['subjectPKInfo']['subjectPublicKey']):
                 break;
             default:
-                $csr['certificationRequestInfo']['subjectPKInfo'] = new Element(
-                    base64_decode(preg_replace('#-.+-|[\r\n]#', '', $csr['certificationRequestInfo']['subjectPKInfo']['subjectPublicKey']))
-                );
+                switch ($algorithm) {
+                    case 'rsaEncryption':
+                        $csr['certificationRequestInfo']['subjectPKInfo']['subjectPublicKey']
+                            = base64_encode("\0" . base64_decode(preg_replace('#-.+-|[\r\n]#', '', $csr['certificationRequestInfo']['subjectPKInfo']['subjectPublicKey'])));
+                        $csr['certificationRequestInfo']['subjectPKInfo']['algorithm']['parameters'] = null;
+                        $csr['signatureAlgorithm']['parameters'] = null;
+                        $csr['certificationRequestInfo']['signature']['parameters'] = null;
+                }
         }
 
-        $filters = [];
+        $asn1 = new ASN1();
+
+        $asn1->loadOIDs($this->oids);
+
+        $filters = array();
         $filters['certificationRequestInfo']['subject']['rdnSequence']['value']
-            = ['type' => ASN1::TYPE_UTF8_STRING];
+            = array('type' => ASN1::TYPE_UTF8_STRING);
 
-        ASN1::setFilters($filters);
+        $asn1->loadFilters($filters);
 
-        $this->mapOutDNs($csr, 'certificationRequestInfo/subject/rdnSequence');
-        $this->mapOutAttributes($csr, 'certificationRequestInfo/attributes');
-        $csr = ASN1::encodeDER($csr, Maps\CertificationRequest::MAP);
+        $this->_mapOutDNs($csr, 'certificationRequestInfo/subject/rdnSequence', $asn1);
+        $this->_mapOutAttributes($csr, 'certificationRequestInfo/attributes', $asn1);
+        $csr = $asn1->encodeDER($csr, $this->CertificationRequest);
 
         switch ($format) {
             case self::FORMAT_DER:
                 return $csr;
             // case self::FORMAT_PEM:
             default:
-                return "-----BEGIN CERTIFICATE REQUEST-----\r\n" . chunk_split(Strings::base64_encode($csr), 64) . '-----END CERTIFICATE REQUEST-----';
+                return "-----BEGIN CERTIFICATE REQUEST-----\r\n" . chunk_split(base64_encode($csr), 64) . '-----END CERTIFICATE REQUEST-----';
         }
     }
 
@@ -2296,10 +3083,11 @@ class X509
      *
      * https://developer.mozilla.org/en-US/docs/HTML/Element/keygen
      *
-     * @param string $spkac
+     * @param string $csr
+     * @access public
      * @return mixed
      */
-    public function loadSPKAC($spkac)
+    function loadSPKAC($spkac)
     {
         if (is_array($spkac) && isset($spkac['publicKeyAndChallenge'])) {
             unset($this->currentCert);
@@ -2311,9 +3099,11 @@ class X509
 
         // see http://www.w3.org/html/wg/drafts/html/master/forms.html#signedpublickeyandchallenge
 
+        $asn1 = new ASN1();
+
         // OpenSSL produces SPKAC's that are preceded by the string SPKAC=
         $temp = preg_replace('#(?:SPKAC=)|[ \r\n\\\]#', '', $spkac);
-        $temp = preg_match('#^[a-zA-Z\d/+]*={0,2}$#', $temp) ? Strings::base64_decode($temp) : false;
+        $temp = preg_match('#^[a-zA-Z\d/+]*={0,2}$#', $temp) ? base64_decode($temp) : false;
         if ($temp != false) {
             $spkac = $temp;
         }
@@ -2324,63 +3114,74 @@ class X509
             return false;
         }
 
-        $decoded = ASN1::decodeBER($spkac);
+        $asn1->loadOIDs($this->oids);
+        $decoded = $asn1->decodeBER($spkac);
 
-        if (!$decoded) {
+        if (empty($decoded)) {
             $this->currentCert = false;
             return false;
         }
 
-        $spkac = ASN1::asn1map($decoded[0], Maps\SignedPublicKeyAndChallenge::MAP);
+        $spkac = $asn1->asn1map($decoded[0], $this->SignedPublicKeyAndChallenge);
 
-        if (!isset($spkac) || !is_array($spkac)) {
+        if (!isset($spkac) || $spkac === false) {
             $this->currentCert = false;
             return false;
         }
 
         $this->signatureSubject = substr($orig, $decoded[0]['content'][0]['start'], $decoded[0]['content'][0]['length']);
 
-        $key = $spkac['publicKeyAndChallenge']['spki'];
-        $key = ASN1::encodeDER($key, Maps\SubjectPublicKeyInfo::MAP);
-        $spkac['publicKeyAndChallenge']['spki']['subjectPublicKey'] =
-            "-----BEGIN PUBLIC KEY-----\r\n" .
-            chunk_split(base64_encode($key), 64) .
-            "-----END PUBLIC KEY-----";
+        $algorithm = &$spkac['publicKeyAndChallenge']['spki']['algorithm']['algorithm'];
+        $key = &$spkac['publicKeyAndChallenge']['spki']['subjectPublicKey'];
+        $key = $this->_reformatKey($algorithm, $key);
+
+        switch ($algorithm) {
+            case 'rsaEncryption':
+                $this->publicKey = new RSA();
+                $this->publicKey->loadKey($key);
+                $this->publicKey->setPublicKey();
+                break;
+            default:
+                $this->publicKey = null;
+        }
 
         $this->currentKeyIdentifier = null;
         $this->currentCert = $spkac;
 
-        $this->publicKey = null;
-        $this->publicKey = $this->getPublicKey();
-
         return $spkac;
     }
 
     /**
      * Save a SPKAC CSR request
      *
-     * @param array $spkac
+     * @param array $csr
      * @param int $format optional
+     * @access public
      * @return string
      */
-    public function saveSPKAC(array $spkac, $format = self::FORMAT_PEM)
+    function saveSPKAC($spkac, $format = self::FORMAT_PEM)
     {
         if (!is_array($spkac) || !isset($spkac['publicKeyAndChallenge'])) {
             return false;
         }
 
-        $algorithm = $this->subArray($spkac, 'publicKeyAndChallenge/spki/algorithm/algorithm');
+        $algorithm = $this->_subArray($spkac, 'publicKeyAndChallenge/spki/algorithm/algorithm');
         switch (true) {
             case !$algorithm:
             case is_object($spkac['publicKeyAndChallenge']['spki']['subjectPublicKey']):
                 break;
             default:
-                $spkac['publicKeyAndChallenge']['spki'] = new Element(
-                    base64_decode(preg_replace('#-.+-|[\r\n]#', '', $spkac['publicKeyAndChallenge']['spki']['subjectPublicKey']))
-                );
+                switch ($algorithm) {
+                    case 'rsaEncryption':
+                        $spkac['publicKeyAndChallenge']['spki']['subjectPublicKey']
+                            = base64_encode("\0" . base64_decode(preg_replace('#-.+-|[\r\n]#', '', $spkac['publicKeyAndChallenge']['spki']['subjectPublicKey'])));
+                }
         }
 
-        $spkac = ASN1::encodeDER($spkac, Maps\SignedPublicKeyAndChallenge::MAP);
+        $asn1 = new ASN1();
+
+        $asn1->loadOIDs($this->oids);
+        $spkac = $asn1->encodeDER($spkac, $this->SignedPublicKeyAndChallenge);
 
         switch ($format) {
             case self::FORMAT_DER:
@@ -2389,7 +3190,7 @@ class X509
             default:
                 // OpenSSL's implementation of SPKAC requires the SPKAC be preceded by SPKAC= and since there are pretty much
                 // no other SPKAC decoders phpseclib will use that same format
-                return 'SPKAC=' . Strings::base64_encode($spkac);
+                return 'SPKAC=' . base64_encode($spkac);
         }
     }
 
@@ -2397,10 +3198,10 @@ class X509
      * Load a Certificate Revocation List
      *
      * @param string $crl
-     * @param int $mode
+     * @access public
      * @return mixed
      */
-    public function loadCRL($crl, $mode = self::FORMAT_AUTO_DETECT)
+    function loadCRL($crl, $mode = self::FORMAT_AUTO_DETECT)
     {
         if (is_array($crl) && isset($crl['tbsCertList'])) {
             $this->currentCert = $crl;
@@ -2408,8 +3209,10 @@ class X509
             return $crl;
         }
 
+        $asn1 = new ASN1();
+
         if ($mode != self::FORMAT_DER) {
-            $newcrl = ASN1::extractBER($crl);
+            $newcrl = $this->_extractBER($crl);
             if ($mode == self::FORMAT_PEM && $crl == $newcrl) {
                 return false;
             }
@@ -2422,14 +3225,15 @@ class X509
             return false;
         }
 
-        $decoded = ASN1::decodeBER($crl);
+        $asn1->loadOIDs($this->oids);
+        $decoded = $asn1->decodeBER($crl);
 
-        if (!$decoded) {
+        if (empty($decoded)) {
             $this->currentCert = false;
             return false;
         }
 
-        $crl = ASN1::asn1map($decoded[0], Maps\CertificateList::MAP);
+        $crl = $asn1->asn1map($decoded[0], $this->CertificateList);
         if (!isset($crl) || $crl === false) {
             $this->currentCert = false;
             return false;
@@ -2437,17 +3241,17 @@ class X509
 
         $this->signatureSubject = substr($orig, $decoded[0]['content'][0]['start'], $decoded[0]['content'][0]['length']);
 
-        $this->mapInDNs($crl, 'tbsCertList/issuer/rdnSequence');
-        if ($this->isSubArrayValid($crl, 'tbsCertList/crlExtensions')) {
-            $this->mapInExtensions($crl, 'tbsCertList/crlExtensions');
+        $this->_mapInDNs($crl, 'tbsCertList/issuer/rdnSequence', $asn1);
+        if ($this->_isSubArrayValid($crl, 'tbsCertList/crlExtensions')) {
+            $this->_mapInExtensions($crl, 'tbsCertList/crlExtensions', $asn1);
         }
-        if ($this->isSubArrayValid($crl, 'tbsCertList/revokedCertificates')) {
-            $rclist_ref = &$this->subArrayUnchecked($crl, 'tbsCertList/revokedCertificates');
+        if ($this->_isSubArrayValid($crl, 'tbsCertList/revokedCertificates')) {
+            $rclist_ref = &$this->_subArrayUnchecked($crl, 'tbsCertList/revokedCertificates');
             if ($rclist_ref) {
                 $rclist = $crl['tbsCertList']['revokedCertificates'];
                 foreach ($rclist as $i => $extension) {
-                    if ($this->isSubArrayValid($rclist, "$i/crlEntryExtensions")) {
-                        $this->mapInExtensions($rclist_ref, "$i/crlEntryExtensions");
+                    if ($this->_isSubArrayValid($rclist, "$i/crlEntryExtensions", $asn1)) {
+                        $this->_mapInExtensions($rclist_ref, "$i/crlEntryExtensions", $asn1);
                     }
                 }
             }
@@ -2464,51 +3268,56 @@ class X509
      *
      * @param array $crl
      * @param int $format optional
+     * @access public
      * @return string
      */
-    public function saveCRL(array $crl, $format = self::FORMAT_PEM)
+    function saveCRL($crl, $format = self::FORMAT_PEM)
     {
         if (!is_array($crl) || !isset($crl['tbsCertList'])) {
             return false;
         }
 
-        $filters = [];
+        $asn1 = new ASN1();
+
+        $asn1->loadOIDs($this->oids);
+
+        $filters = array();
         $filters['tbsCertList']['issuer']['rdnSequence']['value']
-            = ['type' => ASN1::TYPE_UTF8_STRING];
+            = array('type' => ASN1::TYPE_UTF8_STRING);
         $filters['tbsCertList']['signature']['parameters']
-            = ['type' => ASN1::TYPE_UTF8_STRING];
+            = array('type' => ASN1::TYPE_UTF8_STRING);
         $filters['signatureAlgorithm']['parameters']
-            = ['type' => ASN1::TYPE_UTF8_STRING];
+            = array('type' => ASN1::TYPE_UTF8_STRING);
 
         if (empty($crl['tbsCertList']['signature']['parameters'])) {
             $filters['tbsCertList']['signature']['parameters']
-                = ['type' => ASN1::TYPE_NULL];
+                = array('type' => ASN1::TYPE_NULL);
         }
 
         if (empty($crl['signatureAlgorithm']['parameters'])) {
             $filters['signatureAlgorithm']['parameters']
-                = ['type' => ASN1::TYPE_NULL];
+                = array('type' => ASN1::TYPE_NULL);
         }
 
-        ASN1::setFilters($filters);
+        $asn1->loadFilters($filters);
 
-        $this->mapOutDNs($crl, 'tbsCertList/issuer/rdnSequence');
-        $this->mapOutExtensions($crl, 'tbsCertList/crlExtensions');
-        $rclist = &$this->subArray($crl, 'tbsCertList/revokedCertificates');
+        $this->_mapOutDNs($crl, 'tbsCertList/issuer/rdnSequence', $asn1);
+        $this->_mapOutExtensions($crl, 'tbsCertList/crlExtensions', $asn1);
+        $rclist = &$this->_subArray($crl, 'tbsCertList/revokedCertificates');
         if (is_array($rclist)) {
             foreach ($rclist as $i => $extension) {
-                $this->mapOutExtensions($rclist, "$i/crlEntryExtensions");
+                $this->_mapOutExtensions($rclist, "$i/crlEntryExtensions", $asn1);
             }
         }
 
-        $crl = ASN1::encodeDER($crl, Maps\CertificateList::MAP);
+        $crl = $asn1->encodeDER($crl, $this->CertificateList);
 
         switch ($format) {
             case self::FORMAT_DER:
                 return $crl;
             // case self::FORMAT_PEM:
             default:
-                return "-----BEGIN X509 CRL-----\r\n" . chunk_split(Strings::base64_encode($crl), 64) . '-----END X509 CRL-----';
+                return "-----BEGIN X509 CRL-----\r\n" . chunk_split(base64_encode($crl), 64) . '-----END X509 CRL-----';
         }
     }
 
@@ -2521,19 +3330,16 @@ class X509
      * by choosing utcTime iff year of date given is before 2050 and generalTime else.
      *
      * @param string $date in format date('D, d M Y H:i:s O')
-     * @return array|Element
+     * @access private
+     * @return array
      */
-    private function timeField($date)
+    function _timeField($date)
     {
-        if ($date instanceof Element) {
-            return $date;
-        }
-        $dateObj = new \DateTimeImmutable($date, new \DateTimeZone('GMT'));
-        $year = $dateObj->format('Y'); // the same way ASN1.php parses this
+        $year = @gmdate("Y", @strtotime($date)); // the same way ASN1.php parses this
         if ($year < 2050) {
-            return ['utcTime' => $date];
+            return array('utcTime' => $date);
         } else {
-            return ['generalTime' => $date];
+            return array('generalTime' => $date);
         }
     }
 
@@ -2544,32 +3350,35 @@ class X509
      * $subject can be either an existing X.509 cert (if you want to resign it),
      * a CSR or something with the DN and public key explicitly set.
      *
+     * @param \phpseclib\File\X509 $issuer
+     * @param \phpseclib\File\X509 $subject
+     * @param string $signatureAlgorithm optional
+     * @access public
      * @return mixed
      */
-    public function sign(X509 $issuer, X509 $subject)
+    function sign($issuer, $subject, $signatureAlgorithm = 'sha1WithRSAEncryption')
     {
         if (!is_object($issuer->privateKey) || empty($issuer->dn)) {
             return false;
         }
 
-        if (isset($subject->publicKey) && !($subjectPublicKey = $subject->formatSubjectPublicKey())) {
+        if (isset($subject->publicKey) && !($subjectPublicKey = $subject->_formatSubjectPublicKey())) {
             return false;
         }
 
         $currentCert = isset($this->currentCert) ? $this->currentCert : null;
-        $signatureSubject = isset($this->signatureSubject) ? $this->signatureSubject : null;
-        $signatureAlgorithm = self::identifySignatureAlgorithm($issuer->privateKey);
+        $signatureSubject = isset($this->signatureSubject) ? $this->signatureSubject: null;
 
         if (isset($subject->currentCert) && is_array($subject->currentCert) && isset($subject->currentCert['tbsCertificate'])) {
             $this->currentCert = $subject->currentCert;
-            $this->currentCert['tbsCertificate']['signature'] = $signatureAlgorithm;
-            $this->currentCert['signatureAlgorithm'] = $signatureAlgorithm;
+            $this->currentCert['tbsCertificate']['signature']['algorithm'] = $signatureAlgorithm;
+            $this->currentCert['signatureAlgorithm']['algorithm'] = $signatureAlgorithm;
 
             if (!empty($this->startDate)) {
-                $this->currentCert['tbsCertificate']['validity']['notBefore'] = $this->timeField($this->startDate);
+                $this->currentCert['tbsCertificate']['validity']['notBefore'] = $this->_timeField($this->startDate);
             }
             if (!empty($this->endDate)) {
-                $this->currentCert['tbsCertificate']['validity']['notAfter'] = $this->timeField($this->endDate);
+                $this->currentCert['tbsCertificate']['validity']['notAfter'] = $this->_timeField($this->endDate);
             }
             if (!empty($this->serialNumber)) {
                 $this->currentCert['tbsCertificate']['serialNumber'] = $this->serialNumber;
@@ -2591,12 +3400,8 @@ class X509
                 return false;
             }
 
-            $startDate = new \DateTimeImmutable('now', new \DateTimeZone(@date_default_timezone_get()));
-            $startDate = !empty($this->startDate) ? $this->startDate : $startDate->format('D, d M Y H:i:s O');
-
-            $endDate = new \DateTimeImmutable('+1 year', new \DateTimeZone(@date_default_timezone_get()));
-            $endDate = !empty($this->endDate) ? $this->endDate : $endDate->format('D, d M Y H:i:s O');
-
+            $startDate = !empty($this->startDate) ? $this->startDate : @date('D, d M Y H:i:s O');
+            $endDate = !empty($this->endDate) ? $this->endDate : @date('D, d M Y H:i:s O', strtotime('+1 year'));
             /* "The serial number MUST be a positive integer"
                "Conforming CAs MUST NOT use serialNumber values longer than 20 octets."
                 -- https://tools.ietf.org/html/rfc5280#section-4.1.2.2
@@ -2608,23 +3413,23 @@ class X509
                 $this->serialNumber :
                 new BigInteger(Random::string(20) & ("\x7F" . str_repeat("\xFF", 19)), 256);
 
-            $this->currentCert = [
+            $this->currentCert = array(
                 'tbsCertificate' =>
-                    [
+                    array(
                         'version' => 'v3',
-                        'serialNumber' => $serialNumber, // $this->setSerialNumber()
-                        'signature' => $signatureAlgorithm,
+                        'serialNumber' => $serialNumber, // $this->setserialNumber()
+                        'signature' => array('algorithm' => $signatureAlgorithm),
                         'issuer' => false, // this is going to be overwritten later
-                        'validity' => [
-                            'notBefore' => $this->timeField($startDate), // $this->setStartDate()
-                            'notAfter' => $this->timeField($endDate)   // $this->setEndDate()
-                        ],
+                        'validity' => array(
+                            'notBefore' => $this->_timeField($startDate), // $this->setStartDate()
+                            'notAfter' => $this->_timeField($endDate)   // $this->setEndDate()
+                        ),
                         'subject' => $subject->dn,
                         'subjectPublicKeyInfo' => $subjectPublicKey
-                    ],
-                    'signatureAlgorithm' => $signatureAlgorithm,
+                    ),
+                    'signatureAlgorithm' => array('algorithm' => $signatureAlgorithm),
                     'signature'          => false // this is going to be overwritten later
-            ];
+            );
 
             // Copy extensions from CSR.
             $csrexts = $subject->getAttribute('pkcs-9-at-extensionRequest', 0);
@@ -2637,14 +3442,14 @@ class X509
         $this->currentCert['tbsCertificate']['issuer'] = $issuer->dn;
 
         if (isset($issuer->currentKeyIdentifier)) {
-            $this->setExtension('id-ce-authorityKeyIdentifier', [
+            $this->setExtension('id-ce-authorityKeyIdentifier', array(
                     //'authorityCertIssuer' => array(
                     //    array(
                     //        'directoryName' => $issuer->dn
                     //    )
                     //),
                     'keyIdentifier' => $issuer->currentKeyIdentifier
-                ]);
+                ));
             //$extensions = &$this->currentCert['tbsCertificate']['extensions'];
             //if (isset($issuer->serialNumber)) {
             //    $extensions[count($extensions) - 1]['authorityCertSerialNumber'] = $issuer->serialNumber;
@@ -2656,18 +3461,18 @@ class X509
             $this->setExtension('id-ce-subjectKeyIdentifier', $subject->currentKeyIdentifier);
         }
 
-        $altName = [];
+        $altName = array();
 
-        if (isset($subject->domains) && count($subject->domains)) {
-            $altName = array_map(['\phpseclib3\File\X509', 'dnsName'], $subject->domains);
+        if (isset($subject->domains) && count($subject->domains) > 1) {
+            $altName = array_map(array('X509', '_dnsName'), $subject->domains);
         }
 
         if (isset($subject->ipAddresses) && count($subject->ipAddresses)) {
             // should an IP address appear as the CN if no domain name is specified? idk
             //$ips = count($subject->domains) ? $subject->ipAddresses : array_slice($subject->ipAddresses, 1);
-            $ipAddresses = [];
+            $ipAddresses = array();
             foreach ($subject->ipAddresses as $ipAddress) {
-                $encoded = $subject->ipAddress($ipAddress);
+                $encoded = $subject->_ipAddress($ipAddress);
                 if ($encoded !== false) {
                     $ipAddresses[] = $encoded;
                 }
@@ -2684,37 +3489,36 @@ class X509
         if ($this->caFlag) {
             $keyUsage = $this->getExtension('id-ce-keyUsage');
             if (!$keyUsage) {
-                $keyUsage = [];
+                $keyUsage = array();
             }
 
             $this->setExtension(
                 'id-ce-keyUsage',
-                array_values(array_unique(array_merge($keyUsage, ['cRLSign', 'keyCertSign'])))
+                array_values(array_unique(array_merge($keyUsage, array('cRLSign', 'keyCertSign'))))
             );
 
             $basicConstraints = $this->getExtension('id-ce-basicConstraints');
             if (!$basicConstraints) {
-                $basicConstraints = [];
+                $basicConstraints = array();
             }
 
             $this->setExtension(
                 'id-ce-basicConstraints',
-                array_merge(['cA' => true], $basicConstraints),
+                array_unique(array_merge(array('cA' => true), $basicConstraints)),
                 true
             );
 
             if (!isset($subject->currentKeyIdentifier)) {
-                $this->setExtension('id-ce-subjectKeyIdentifier', $this->computeKeyIdentifier($this->currentCert), false, false);
+                $this->setExtension('id-ce-subjectKeyIdentifier', base64_encode($this->computeKeyIdentifier($this->currentCert)), false, false);
             }
         }
 
         // resync $this->signatureSubject
-        // save $tbsCertificate in case there are any \phpseclib3\File\ASN1\Element objects in it
+        // save $tbsCertificate in case there are any \phpseclib\File\ASN1\Element objects in it
         $tbsCertificate = $this->currentCert['tbsCertificate'];
         $this->loadX509($this->saveX509($this->currentCert));
 
-        $result = $this->currentCert;
-        $this->currentCert['signature'] = $result['signature'] = "\0" . $issuer->privateKey->sign($this->signatureSubject);
+        $result = $this->_sign($issuer->privateKey, $signatureAlgorithm);
         $result['tbsCertificate'] = $tbsCertificate;
 
         $this->currentCert = $currentCert;
@@ -2726,49 +3530,53 @@ class X509
     /**
      * Sign a CSR
      *
+     * @access public
      * @return mixed
      */
-    public function signCSR()
+    function signCSR($signatureAlgorithm = 'sha1WithRSAEncryption')
     {
         if (!is_object($this->privateKey) || empty($this->dn)) {
             return false;
         }
 
         $origPublicKey = $this->publicKey;
-        $this->publicKey = $this->privateKey->getPublicKey();
-        $publicKey = $this->formatSubjectPublicKey();
+        $class = get_class($this->privateKey);
+        $this->publicKey = new $class();
+        $this->publicKey->loadKey($this->privateKey->getPublicKey());
+        $this->publicKey->setPublicKey();
+        if (!($publicKey = $this->_formatSubjectPublicKey())) {
+            return false;
+        }
         $this->publicKey = $origPublicKey;
 
         $currentCert = isset($this->currentCert) ? $this->currentCert : null;
-        $signatureSubject = isset($this->signatureSubject) ? $this->signatureSubject : null;
-        $signatureAlgorithm = self::identifySignatureAlgorithm($this->privateKey);
+        $signatureSubject = isset($this->signatureSubject) ? $this->signatureSubject: null;
 
         if (isset($this->currentCert) && is_array($this->currentCert) && isset($this->currentCert['certificationRequestInfo'])) {
-            $this->currentCert['signatureAlgorithm'] = $signatureAlgorithm;
+            $this->currentCert['signatureAlgorithm']['algorithm'] = $signatureAlgorithm;
             if (!empty($this->dn)) {
                 $this->currentCert['certificationRequestInfo']['subject'] = $this->dn;
             }
             $this->currentCert['certificationRequestInfo']['subjectPKInfo'] = $publicKey;
         } else {
-            $this->currentCert = [
+            $this->currentCert = array(
                 'certificationRequestInfo' =>
-                    [
+                    array(
                         'version' => 'v1',
                         'subject' => $this->dn,
                         'subjectPKInfo' => $publicKey
-                    ],
-                    'signatureAlgorithm' => $signatureAlgorithm,
+                    ),
+                    'signatureAlgorithm' => array('algorithm' => $signatureAlgorithm),
                     'signature'          => false // this is going to be overwritten later
-            ];
+            );
         }
 
         // resync $this->signatureSubject
-        // save $certificationRequestInfo in case there are any \phpseclib3\File\ASN1\Element objects in it
+        // save $certificationRequestInfo in case there are any \phpseclib\File\ASN1\Element objects in it
         $certificationRequestInfo = $this->currentCert['certificationRequestInfo'];
         $this->loadCSR($this->saveCSR($this->currentCert));
 
-        $result = $this->currentCert;
-        $this->currentCert['signature'] = $result['signature'] = "\0" . $this->privateKey->sign($this->signatureSubject);
+        $result = $this->_sign($this->privateKey, $signatureAlgorithm);
         $result['certificationRequestInfo'] = $certificationRequestInfo;
 
         $this->currentCert = $currentCert;
@@ -2780,35 +3588,41 @@ class X509
     /**
      * Sign a SPKAC
      *
+     * @access public
      * @return mixed
      */
-    public function signSPKAC()
+    function signSPKAC($signatureAlgorithm = 'sha1WithRSAEncryption')
     {
         if (!is_object($this->privateKey)) {
             return false;
         }
 
         $origPublicKey = $this->publicKey;
-        $this->publicKey = $this->privateKey->getPublicKey();
-        $publicKey = $this->formatSubjectPublicKey();
+        $class = get_class($this->privateKey);
+        $this->publicKey = new $class();
+        $this->publicKey->loadKey($this->privateKey->getPublicKey());
+        $this->publicKey->setPublicKey();
+        $publicKey = $this->_formatSubjectPublicKey();
+        if (!$publicKey) {
+            return false;
+        }
         $this->publicKey = $origPublicKey;
 
         $currentCert = isset($this->currentCert) ? $this->currentCert : null;
-        $signatureSubject = isset($this->signatureSubject) ? $this->signatureSubject : null;
-        $signatureAlgorithm = self::identifySignatureAlgorithm($this->privateKey);
+        $signatureSubject = isset($this->signatureSubject) ? $this->signatureSubject: null;
 
         // re-signing a SPKAC seems silly but since everything else supports re-signing why not?
         if (isset($this->currentCert) && is_array($this->currentCert) && isset($this->currentCert['publicKeyAndChallenge'])) {
-            $this->currentCert['signatureAlgorithm'] = $signatureAlgorithm;
+            $this->currentCert['signatureAlgorithm']['algorithm'] = $signatureAlgorithm;
             $this->currentCert['publicKeyAndChallenge']['spki'] = $publicKey;
             if (!empty($this->challenge)) {
                 // the bitwise AND ensures that the output is a valid IA5String
                 $this->currentCert['publicKeyAndChallenge']['challenge'] = $this->challenge & str_repeat("\x7F", strlen($this->challenge));
             }
         } else {
-            $this->currentCert = [
+            $this->currentCert = array(
                 'publicKeyAndChallenge' =>
-                    [
+                    array(
                         'spki' => $publicKey,
                         // quoting <https://developer.mozilla.org/en-US/docs/Web/HTML/Element/keygen>,
                         // "A challenge string that is submitted along with the public key. Defaults to an empty string if not specified."
@@ -2816,19 +3630,18 @@ class X509
                         // we could alternatively do this instead if we ignored the specs:
                         // Random::string(8) & str_repeat("\x7F", 8)
                         'challenge' => !empty($this->challenge) ? $this->challenge : ''
-                    ],
-                    'signatureAlgorithm' => $signatureAlgorithm,
+                    ),
+                    'signatureAlgorithm' => array('algorithm' => $signatureAlgorithm),
                     'signature'          => false // this is going to be overwritten later
-            ];
+            );
         }
 
         // resync $this->signatureSubject
-        // save $publicKeyAndChallenge in case there are any \phpseclib3\File\ASN1\Element objects in it
+        // save $publicKeyAndChallenge in case there are any \phpseclib\File\ASN1\Element objects in it
         $publicKeyAndChallenge = $this->currentCert['publicKeyAndChallenge'];
         $this->loadSPKAC($this->saveSPKAC($this->currentCert));
 
-        $result = $this->currentCert;
-        $this->currentCert['signature'] = $result['signature'] = "\0" . $this->privateKey->sign($this->signatureSubject);
+        $result = $this->_sign($this->privateKey, $signatureAlgorithm);
         $result['publicKeyAndChallenge'] = $publicKeyAndChallenge;
 
         $this->currentCert = $currentCert;
@@ -2842,9 +3655,13 @@ class X509
      *
      * $issuer's private key needs to be loaded.
      *
+     * @param \phpseclib\File\X509 $issuer
+     * @param \phpseclib\File\X509 $crl
+     * @param string $signatureAlgorithm optional
+     * @access public
      * @return mixed
      */
-    public function signCRL(X509 $issuer, X509 $crl)
+    function signCRL($issuer, $crl, $signatureAlgorithm = 'sha1WithRSAEncryption')
     {
         if (!is_object($issuer->privateKey) || empty($issuer->dn)) {
             return false;
@@ -2852,35 +3669,32 @@ class X509
 
         $currentCert = isset($this->currentCert) ? $this->currentCert : null;
         $signatureSubject = isset($this->signatureSubject) ? $this->signatureSubject : null;
-        $signatureAlgorithm = self::identifySignatureAlgorithm($issuer->privateKey);
-
-        $thisUpdate = new \DateTimeImmutable('now', new \DateTimeZone(@date_default_timezone_get()));
-        $thisUpdate = !empty($this->startDate) ? $this->startDate : $thisUpdate->format('D, d M Y H:i:s O');
+        $thisUpdate = !empty($this->startDate) ? $this->startDate : @date('D, d M Y H:i:s O');
 
         if (isset($crl->currentCert) && is_array($crl->currentCert) && isset($crl->currentCert['tbsCertList'])) {
             $this->currentCert = $crl->currentCert;
-            $this->currentCert['tbsCertList']['signature'] = $signatureAlgorithm;
-            $this->currentCert['signatureAlgorithm'] = $signatureAlgorithm;
+            $this->currentCert['tbsCertList']['signature']['algorithm'] = $signatureAlgorithm;
+            $this->currentCert['signatureAlgorithm']['algorithm'] = $signatureAlgorithm;
         } else {
-            $this->currentCert = [
+            $this->currentCert = array(
                 'tbsCertList' =>
-                    [
+                    array(
                         'version' => 'v2',
-                        'signature' => $signatureAlgorithm,
+                        'signature' => array('algorithm' => $signatureAlgorithm),
                         'issuer' => false, // this is going to be overwritten later
-                        'thisUpdate' => $this->timeField($thisUpdate) // $this->setStartDate()
-                    ],
-                    'signatureAlgorithm' => $signatureAlgorithm,
+                        'thisUpdate' => $this->_timeField($thisUpdate) // $this->setStartDate()
+                    ),
+                    'signatureAlgorithm' => array('algorithm' => $signatureAlgorithm),
                     'signature'          => false // this is going to be overwritten later
-            ];
+            );
         }
 
         $tbsCertList = &$this->currentCert['tbsCertList'];
         $tbsCertList['issuer'] = $issuer->dn;
-        $tbsCertList['thisUpdate'] = $this->timeField($thisUpdate);
+        $tbsCertList['thisUpdate'] = $this->_timeField($thisUpdate);
 
         if (!empty($this->endDate)) {
-            $tbsCertList['nextUpdate'] = $this->timeField($this->endDate); // $this->setEndDate()
+            $tbsCertList['nextUpdate'] = $this->_timeField($this->endDate); // $this->setEndDate()
         } else {
             unset($tbsCertList['nextUpdate']);
         }
@@ -2925,14 +3739,14 @@ class X509
             }
 
             if (isset($issuer->currentKeyIdentifier)) {
-                $this->setExtension('id-ce-authorityKeyIdentifier', [
+                $this->setExtension('id-ce-authorityKeyIdentifier', array(
                         //'authorityCertIssuer' => array(
-                        //    ]
+                        //    array(
                         //        'directoryName' => $issuer->dn
-                        //    ]
+                        //    )
                         //),
                         'keyIdentifier' => $issuer->currentKeyIdentifier
-                    ]);
+                    ));
                 //$extensions = &$tbsCertList['crlExtensions'];
                 //if (isset($issuer->serialNumber)) {
                 //    $extensions[count($extensions) - 1]['authorityCertSerialNumber'] = $issuer->serialNumber;
@@ -2954,12 +3768,11 @@ class X509
         unset($tbsCertList);
 
         // resync $this->signatureSubject
-        // save $tbsCertList in case there are any \phpseclib3\File\ASN1\Element objects in it
+        // save $tbsCertList in case there are any \phpseclib\File\ASN1\Element objects in it
         $tbsCertList = $this->currentCert['tbsCertList'];
         $this->loadCRL($this->saveCRL($this->currentCert));
 
-        $result = $this->currentCert;
-        $this->currentCert['signature'] = $result['signature'] = "\0" . $issuer->privateKey->sign($this->signatureSubject);
+        $result = $this->_sign($issuer->privateKey, $signatureAlgorithm);
         $result['tbsCertList'] = $tbsCertList;
 
         $this->currentCert = $currentCert;
@@ -2969,85 +3782,54 @@ class X509
     }
 
     /**
-     * Identify signature algorithm from key settings
+     * X.509 certificate signing helper function.
      *
-     * @param PrivateKey $key
-     * @throws \phpseclib3\Exception\UnsupportedAlgorithmException if the algorithm is unsupported
-     * @return array
+     * @param object $key
+     * @param \phpseclib\File\X509 $subject
+     * @param string $signatureAlgorithm
+     * @access public
+     * @return mixed
      */
-    private static function identifySignatureAlgorithm(PrivateKey $key)
+    function _sign($key, $signatureAlgorithm)
     {
         if ($key instanceof RSA) {
-            if ($key->getPadding() & RSA::SIGNATURE_PSS) {
-                $r = PSS::load($key->withPassword()->toString('PSS'));
-                return [
-                    'algorithm' => 'id-RSASSA-PSS',
-                    'parameters' => PSS::savePSSParams($r)
-                ];
+            switch ($signatureAlgorithm) {
+                case 'md2WithRSAEncryption':
+                case 'md5WithRSAEncryption':
+                case 'sha1WithRSAEncryption':
+                case 'sha224WithRSAEncryption':
+                case 'sha256WithRSAEncryption':
+                case 'sha384WithRSAEncryption':
+                case 'sha512WithRSAEncryption':
+                    $key->setHash(preg_replace('#WithRSAEncryption$#', '', $signatureAlgorithm));
+                    $key->setSignatureMode(RSA::SIGNATURE_PKCS1);
+
+                    $this->currentCert['signature'] = base64_encode("\0" . $key->sign($this->signatureSubject));
+                    return $this->currentCert;
             }
-            switch ($key->getHash()) {
-                case 'md2':
-                case 'md5':
-                case 'sha1':
-                case 'sha224':
-                case 'sha256':
-                case 'sha384':
-                case 'sha512':
-                    return ['algorithm' => $key->getHash() . 'WithRSAEncryption'];
-            }
-            throw new UnsupportedAlgorithmException('The only supported hash algorithms for RSA are: md2, md5, sha1, sha224, sha256, sha384, sha512');
         }
 
-        if ($key instanceof DSA) {
-            switch ($key->getHash()) {
-                case 'sha1':
-                case 'sha224':
-                case 'sha256':
-                    return ['algorithm' => 'id-dsa-with-' . $key->getHash()];
-            }
-            throw new UnsupportedAlgorithmException('The only supported hash algorithms for DSA are: sha1, sha224, sha256');
-        }
-
-        if ($key instanceof EC) {
-            switch ($key->getCurve()) {
-                case 'Ed25519':
-                case 'Ed448':
-                    return ['algorithm' => 'id-' . $key->getCurve()];
-            }
-            switch ($key->getHash()) {
-                case 'sha1':
-                case 'sha224':
-                case 'sha256':
-                case 'sha384':
-                case 'sha512':
-                    return ['algorithm' => 'ecdsa-with-' . strtoupper($key->getHash())];
-            }
-            throw new UnsupportedAlgorithmException('The only supported hash algorithms for EC are: sha1, sha224, sha256, sha384, sha512');
-        }
-
-        throw new UnsupportedAlgorithmException('The only supported public key classes are: RSA, DSA, EC');
+        return false;
     }
 
     /**
      * Set certificate start date
      *
-     * @param \DateTimeInterface|string $date
+     * @param string $date
+     * @access public
      */
-    public function setStartDate($date)
+    function setStartDate($date)
     {
-        if (!is_object($date) || !($date instanceof \DateTimeInterface)) {
-            $date = new \DateTimeImmutable($date, new \DateTimeZone(@date_default_timezone_get()));
-        }
-
-        $this->startDate = $date->format('D, d M Y H:i:s O');
+        $this->startDate = @date('D, d M Y H:i:s O', @strtotime($date));
     }
 
     /**
      * Set certificate end date
      *
-     * @param \DateTimeInterface|string $date
+     * @param string $date
+     * @access public
      */
-    public function setEndDate($date)
+    function setEndDate($date)
     {
         /*
           To indicate that a certificate has no well-defined expiration date,
@@ -3056,16 +3838,13 @@ class X509
 
           -- http://tools.ietf.org/html/rfc5280#section-4.1.2.5
         */
-        if (is_string($date) && strtolower($date) === 'lifetime') {
+        if (strtolower($date) == 'lifetime') {
             $temp = '99991231235959Z';
-            $temp = chr(ASN1::TYPE_GENERALIZED_TIME) . ASN1::encodeLength(strlen($temp)) . $temp;
+            $asn1 = new ASN1();
+            $temp = chr(ASN1::TYPE_GENERALIZED_TIME) . $asn1->_encodeLength(strlen($temp)) . $temp;
             $this->endDate = new Element($temp);
         } else {
-            if (!is_object($date) || !($date instanceof \DateTimeInterface)) {
-                $date = new \DateTimeImmutable($date, new \DateTimeZone(@date_default_timezone_get()));
-            }
-
-            $this->endDate = $date->format('D, d M Y H:i:s O');
+            $this->endDate = @date('D, d M Y H:i:s O', @strtotime($date));
         }
     }
 
@@ -3073,9 +3852,10 @@ class X509
      * Set Serial Number
      *
      * @param string $serial
-     * @param int $base optional
+     * @param $base optional
+     * @access public
      */
-    public function setSerialNumber($serial, $base = -256)
+    function setSerialNumber($serial, $base = -256)
     {
         $this->serialNumber = new BigInteger($serial, $base);
     }
@@ -3083,8 +3863,9 @@ class X509
     /**
      * Turns the certificate into a certificate authority
      *
+     * @access public
      */
-    public function makeCA()
+    function makeCA()
     {
         $this->caFlag = true;
     }
@@ -3099,8 +3880,9 @@ class X509
      * @param array $root
      * @param string $path
      * @return boolean
+     * @access private
      */
-    private function isSubArrayValid(array $root, $path)
+    function _isSubArrayValid($root, $path)
     {
         if (!is_array($root)) {
             return false;
@@ -3134,9 +3916,10 @@ class X509
      * @param array $root
      * @param string $path  absolute path with / as component separator
      * @param bool $create optional
+     * @access private
      * @return array|false
      */
-    private function &subArrayUnchecked(array &$root, $path, $create = false)
+    function &_subArrayUnchecked(&$root, $path, $create = false)
     {
         $false = false;
 
@@ -3146,7 +3929,7 @@ class X509
                     return $false;
                 }
 
-                $root[$i] = [];
+                $root[$i] = array();
             }
 
             $root = &$root[$i];
@@ -3161,9 +3944,10 @@ class X509
      * @param array $root
      * @param string $path  absolute path with / as component separator
      * @param bool $create optional
+     * @access private
      * @return array|false
      */
-    private function &subArray(array &$root = null, $path, $create = false)
+    function &_subArray(&$root, $path, $create = false)
     {
         $false = false;
 
@@ -3181,7 +3965,7 @@ class X509
                     return $false;
                 }
 
-                $root[$i] = [];
+                $root[$i] = array();
             }
 
             $root = &$root[$i];
@@ -3196,9 +3980,10 @@ class X509
      * @param array $root
      * @param string $path optional absolute path with / as component separator
      * @param bool $create optional
+     * @access private
      * @return array|false
      */
-    private function &extensions(array &$root = null, $path = null, $create = false)
+    function &_extensions(&$root, $path = null, $create = false)
     {
         if (!isset($root)) {
             $root = $this->currentCert;
@@ -3216,7 +4001,7 @@ class X509
                 break;
             case isset($root['certificationRequestInfo']):
                 $pth = 'certificationRequestInfo/attributes';
-                $attributes = &$this->subArray($root, $pth, $create);
+                $attributes = &$this->_subArray($root, $pth, $create);
 
                 if (is_array($attributes)) {
                     foreach ($attributes as $key => $value) {
@@ -3227,14 +4012,14 @@ class X509
                     }
                     if ($create) {
                         $key = count($attributes);
-                        $attributes[] = ['type' => 'pkcs-9-at-extensionRequest', 'value' => []];
+                        $attributes[] = array('type' => 'pkcs-9-at-extensionRequest', 'value' => array());
                         $path = "$pth/$key/value/0";
                     }
                 }
                 break;
         }
 
-        $extensions = &$this->subArray($root, $path, $create);
+        $extensions = &$this->_subArray($root, $path, $create);
 
         if (!is_array($extensions)) {
             $false = false;
@@ -3249,11 +4034,12 @@ class X509
      *
      * @param string $id
      * @param string $path optional
+     * @access private
      * @return bool
      */
-    private function removeExtensionHelper($id, $path = null)
+    function _removeExtension($id, $path = null)
     {
-        $extensions = &$this->extensions($this->currentCert, $path);
+        $extensions = &$this->_extensions($this->currentCert, $path);
 
         if (!is_array($extensions)) {
             return false;
@@ -3268,10 +4054,6 @@ class X509
         }
 
         $extensions = array_values($extensions);
-        // fix for https://bugs.php.net/75433 affecting PHP 7.2
-        if (!isset($extensions[0])) {
-            $extensions = array_splice($extensions, 0, 0);
-        }
         return $result;
     }
 
@@ -3283,11 +4065,12 @@ class X509
      * @param string $id
      * @param array $cert optional
      * @param string $path optional
+     * @access private
      * @return mixed
      */
-    private function getExtensionHelper($id, array $cert = null, $path = null)
+    function _getExtension($id, $cert = null, $path = null)
     {
-        $extensions = $this->extensions($cert, $path);
+        $extensions = $this->_extensions($cert, $path);
 
         if (!is_array($extensions)) {
             return false;
@@ -3307,12 +4090,13 @@ class X509
      *
      * @param array $cert optional
      * @param string $path optional
+     * @access private
      * @return array
      */
-    private function getExtensionsHelper(array $cert = null, $path = null)
+    function _getExtensions($cert = null, $path = null)
     {
-        $exts = $this->extensions($cert, $path);
-        $extensions = [];
+        $exts = $this->_extensions($cert, $path);
+        $extensions = array();
 
         if (is_array($exts)) {
             foreach ($exts as $extension) {
@@ -3331,17 +4115,18 @@ class X509
      * @param bool $critical optional
      * @param bool $replace optional
      * @param string $path optional
+     * @access private
      * @return bool
      */
-    private function setExtensionHelper($id, $value, $critical = false, $replace = true, $path = null)
+    function _setExtension($id, $value, $critical = false, $replace = true, $path = null)
     {
-        $extensions = &$this->extensions($this->currentCert, $path, true);
+        $extensions = &$this->_extensions($this->currentCert, $path, true);
 
         if (!is_array($extensions)) {
             return false;
         }
 
-        $newext = ['extnId'  => $id, 'critical' => $critical, 'extnValue' => $value];
+        $newext = array('extnId'  => $id, 'critical' => $critical, 'extnValue' => $value);
 
         foreach ($extensions as $key => $value) {
             if ($value['extnId'] == $id) {
@@ -3362,11 +4147,12 @@ class X509
      * Remove a certificate, CSR or CRL Extension
      *
      * @param string $id
+     * @access public
      * @return bool
      */
-    public function removeExtension($id)
+    function removeExtension($id)
     {
-        return $this->removeExtensionHelper($id);
+        return $this->_removeExtension($id);
     }
 
     /**
@@ -3376,24 +4162,24 @@ class X509
      *
      * @param string $id
      * @param array $cert optional
-     * @param string $path
+     * @access public
      * @return mixed
      */
-    public function getExtension($id, array $cert = null, $path = null)
+    function getExtension($id, $cert = null)
     {
-        return $this->getExtensionHelper($id, $cert, $path);
+        return $this->_getExtension($id, $cert);
     }
 
     /**
      * Returns a list of all extensions in use in certificate, CSR or CRL
      *
      * @param array $cert optional
-     * @param string $path optional
+     * @access public
      * @return array
      */
-    public function getExtensions(array $cert = null, $path = null)
+    function getExtensions($cert = null)
     {
-        return $this->getExtensionsHelper($cert, $path);
+        return $this->_getExtensions($cert);
     }
 
     /**
@@ -3403,11 +4189,12 @@ class X509
      * @param mixed $value
      * @param bool $critical optional
      * @param bool $replace optional
+     * @access public
      * @return bool
      */
-    public function setExtension($id, $value, $critical = false, $replace = true)
+    function setExtension($id, $value, $critical = false, $replace = true)
     {
-        return $this->setExtensionHelper($id, $value, $critical, $replace);
+        return $this->_setExtension($id, $value, $critical, $replace);
     }
 
     /**
@@ -3415,11 +4202,12 @@ class X509
      *
      * @param string $id
      * @param int $disposition optional
+     * @access public
      * @return bool
      */
-    public function removeAttribute($id, $disposition = self::ATTR_ALL)
+    function removeAttribute($id, $disposition = self::ATTR_ALL)
     {
-        $attributes = &$this->subArray($this->currentCert, 'certificationRequestInfo/attributes');
+        $attributes = &$this->_subArray($this->currentCert, 'certificationRequestInfo/attributes');
 
         if (!is_array($attributes)) {
             return false;
@@ -3465,15 +4253,16 @@ class X509
      * @param string $id
      * @param int $disposition optional
      * @param array $csr optional
+     * @access public
      * @return mixed
      */
-    public function getAttribute($id, $disposition = self::ATTR_ALL, array $csr = null)
+    function getAttribute($id, $disposition = self::ATTR_ALL, $csr = null)
     {
         if (empty($csr)) {
             $csr = $this->currentCert;
         }
 
-        $attributes = $this->subArray($csr, 'certificationRequestInfo/attributes');
+        $attributes = $this->_subArray($csr, 'certificationRequestInfo/attributes');
 
         if (!is_array($attributes)) {
             return false;
@@ -3504,16 +4293,17 @@ class X509
      * Returns a list of all CSR attributes in use
      *
      * @param array $csr optional
+     * @access public
      * @return array
      */
-    public function getAttributes(array $csr = null)
+    function getAttributes($csr = null)
     {
         if (empty($csr)) {
             $csr = $this->currentCert;
         }
 
-        $attributes = $this->subArray($csr, 'certificationRequestInfo/attributes');
-        $attrs = [];
+        $attributes = $this->_subArray($csr, 'certificationRequestInfo/attributes');
+        $attrs = array();
 
         if (is_array($attributes)) {
             foreach ($attributes as $attribute) {
@@ -3529,12 +4319,13 @@ class X509
      *
      * @param string $id
      * @param mixed $value
-     * @param int $disposition optional
+     * @param bool $disposition optional
+     * @access public
      * @return bool
      */
-    public function setAttribute($id, $value, $disposition = self::ATTR_ALL)
+    function setAttribute($id, $value, $disposition = self::ATTR_ALL)
     {
-        $attributes = &$this->subArray($this->currentCert, 'certificationRequestInfo/attributes', true);
+        $attributes = &$this->_subArray($this->currentCert, 'certificationRequestInfo/attributes', true);
 
         if (!is_array($attributes)) {
             return false;
@@ -3543,7 +4334,6 @@ class X509
         switch ($disposition) {
             case self::ATTR_REPLACE:
                 $disposition = self::ATTR_APPEND;
-                // fall-through
             case self::ATTR_ALL:
                 $this->removeAttribute($id);
                 break;
@@ -3573,7 +4363,7 @@ class X509
                 $attributes[$last]['value'][] = $value;
                 break;
             default:
-                $attributes[] = ['type' => $id, 'value' => $disposition == self::ATTR_ALL ? $value : [$value]];
+                $attributes[] = array('type' => $id, 'value' => $disposition == self::ATTR_ALL ? $value: array($value));
                 break;
         }
 
@@ -3586,13 +4376,14 @@ class X509
      * This is used by the id-ce-authorityKeyIdentifier and the id-ce-subjectKeyIdentifier extensions.
      *
      * @param string $value
+     * @access public
      */
-    public function setKeyIdentifier($value)
+    function setKeyIdentifier($value)
     {
         if (empty($value)) {
             unset($this->currentKeyIdentifier);
         } else {
-            $this->currentKeyIdentifier = $value;
+            $this->currentKeyIdentifier = base64_encode($value);
         }
     }
 
@@ -3604,16 +4395,17 @@ class X509
      * recommended methods (4.2.1.2 RFC 3280).
      * Highly polymorphic: try to accept all possible forms of key:
      * - Key object
-     * - \phpseclib3\File\X509 object with public or private key defined
+     * - \phpseclib\File\X509 object with public or private key defined
      * - Certificate or CSR array
-     * - \phpseclib3\File\ASN1\Element object
+     * - \phpseclib\File\ASN1\Element object
      * - PEM or DER string
      *
      * @param mixed $key optional
      * @param int $method optional
+     * @access public
      * @return string binary key identifier
      */
-    public function computeKeyIdentifier($key = null, $method = 1)
+    function computeKeyIdentifier($key = null, $method = 1)
     {
         if (is_null($key)) {
             $key = $this;
@@ -3630,20 +4422,25 @@ class X509
                 return false;
             case $key instanceof Element:
                 // Assume the element is a bitstring-packed key.
-                $decoded = ASN1::decodeBER($key->element);
-                if (!$decoded) {
+                $asn1 = new ASN1();
+                $decoded = $asn1->decodeBER($key->element);
+                if (empty($decoded)) {
                     return false;
                 }
-                $raw = ASN1::asn1map($decoded[0], ['type' => ASN1::TYPE_BIT_STRING]);
+                $raw = $asn1->asn1map($decoded[0], array('type' => ASN1::TYPE_BIT_STRING));
                 if (empty($raw)) {
                     return false;
                 }
+                $raw = base64_decode($raw);
                 // If the key is private, compute identifier from its corresponding public key.
-                $key = PublicKeyLoader::load($raw);
-                if ($key instanceof PrivateKey) {  // If private.
+                $key = new RSA();
+                if (!$key->loadKey($raw)) {
+                    return false;   // Not an unencrypted RSA key.
+                }
+                if ($key->getPrivateKey() !== false) {  // If private.
                     return $this->computeKeyIdentifier($key, $method);
                 }
-                $key = $raw; // Is a public key.
+                $key = $raw;    // Is a public key.
                 break;
             case $key instanceof X509:
                 if (isset($key->publicKey)) {
@@ -3656,13 +4453,13 @@ class X509
                     return $this->computeKeyIdentifier($key->currentCert, $method);
                 }
                 return false;
-            default: // Should be a key object (i.e.: \phpseclib3\Crypt\RSA).
-                $key = $key->getPublicKey();
+            default: // Should be a key object (i.e.: \phpseclib\Crypt\RSA).
+                $key = $key->getPublicKey(RSA::PUBLIC_FORMAT_PKCS1);
                 break;
         }
 
         // If in PEM format, convert to binary.
-        $key = ASN1::extractBER($key);
+        $key = $this->_extractBER($key);
 
         // Now we have the key string: compute its sha-1 sum.
         $hash = new Hash('sha1');
@@ -3679,39 +4476,33 @@ class X509
     /**
      * Format a public key as appropriate
      *
-     * @return array|false
+     * @access private
+     * @return array
      */
-    private function formatSubjectPublicKey()
+    function _formatSubjectPublicKey()
     {
-        $format = $this->publicKey instanceof RSA && ($this->publicKey->getPadding() & RSA::SIGNATURE_PSS) ?
-            'PSS' :
-            'PKCS8';
-
-        $publicKey = base64_decode(preg_replace('#-.+-|[\r\n]#', '', $this->publicKey->toString($format)));
-
-        $decoded = ASN1::decodeBER($publicKey);
-        if (!$decoded) {
-            return false;
-        }
-        $mapped = ASN1::asn1map($decoded[0], Maps\SubjectPublicKeyInfo::MAP);
-        if (!is_array($mapped)) {
-            return false;
+        if ($this->publicKey instanceof RSA) {
+            // the following two return statements do the same thing. i dunno.. i just prefer the later for some reason.
+            // the former is a good example of how to do fuzzing on the public key
+            //return new Element(base64_decode(preg_replace('#-.+-|[\r\n]#', '', $this->publicKey->getPublicKey())));
+            return array(
+                'algorithm' => array('algorithm' => 'rsaEncryption'),
+                'subjectPublicKey' => $this->publicKey->getPublicKey(RSA::PUBLIC_FORMAT_PKCS1)
+            );
         }
 
-        $mapped['subjectPublicKey'] = $this->publicKey->toString($format);
-
-        return $mapped;
+        return false;
     }
 
     /**
      * Set the domain name's which the cert is to be valid for
      *
-     * @param mixed ...$domains
-     * @return void
+     * @access public
+     * @return array
      */
-    public function setDomain(...$domains)
+    function setDomain()
     {
-        $this->domains = $domains;
+        $this->domains = func_get_args();
         $this->removeDNProp('id-at-commonName');
         $this->setDNProp('id-at-commonName', $this->domains[0]);
     }
@@ -3719,11 +4510,12 @@ class X509
     /**
      * Set the IP Addresses's which the cert is to be valid for
      *
-     * @param mixed[] ...$ipAddresses
+     * @access public
+     * @param string $ipAddress optional
      */
-    public function setIPAddress(...$ipAddresses)
+    function setIPAddress()
     {
-        $this->ipAddresses = $ipAddresses;
+        $this->ipAddresses = func_get_args();
         /*
         if (!isset($this->domains)) {
             $this->removeDNProp('id-at-commonName');
@@ -3735,12 +4527,13 @@ class X509
     /**
      * Helper function to build domain array
      *
+     * @access private
      * @param string $domain
      * @return array
      */
-    private static function dnsName($domain)
+    function _dnsName($domain)
     {
-        return ['dNSName' => $domain];
+        return array('dNSName' => $domain);
     }
 
     /**
@@ -3748,12 +4541,13 @@ class X509
      *
      * (IPv6 is not currently supported)
      *
+     * @access private
      * @param string $address
      * @return array
      */
-    private function iPAddress($address)
+    function _iPAddress($address)
     {
-        return ['iPAddress' => $address];
+        return array('iPAddress' => $address);
     }
 
     /**
@@ -3762,9 +4556,10 @@ class X509
      * @param array $rclist
      * @param string $serial
      * @param bool $create optional
+     * @access private
      * @return int|false
      */
-    private function revokedCertificate(array &$rclist, $serial, $create = false)
+    function _revokedCertificate(&$rclist, $serial, $create = false)
     {
         $serial = new BigInteger($serial);
 
@@ -3779,9 +4574,8 @@ class X509
         }
 
         $i = count($rclist);
-        $revocationDate = new \DateTimeImmutable('now', new \DateTimeZone(@date_default_timezone_get()));
-        $rclist[] = ['userCertificate' => $serial,
-                          'revocationDate'  => $this->timeField($revocationDate->format('D, d M Y H:i:s O'))];
+        $rclist[] = array('userCertificate' => $serial,
+                          'revocationDate'  => $this->_timeField(@date('D, d M Y H:i:s O')));
         return $i;
     }
 
@@ -3790,16 +4584,17 @@ class X509
      *
      * @param string $serial
      * @param string $date optional
+     * @access public
      * @return bool
      */
-    public function revoke($serial, $date = null)
+    function revoke($serial, $date = null)
     {
         if (isset($this->currentCert['tbsCertList'])) {
-            if (is_array($rclist = &$this->subArray($this->currentCert, 'tbsCertList/revokedCertificates', true))) {
-                if ($this->revokedCertificate($rclist, $serial) === false) { // If not yet revoked
-                    if (($i = $this->revokedCertificate($rclist, $serial, true)) !== false) {
+            if (is_array($rclist = &$this->_subArray($this->currentCert, 'tbsCertList/revokedCertificates', true))) {
+                if ($this->_revokedCertificate($rclist, $serial) === false) { // If not yet revoked
+                    if (($i = $this->_revokedCertificate($rclist, $serial, true)) !== false) {
                         if (!empty($date)) {
-                            $rclist[$i]['revocationDate'] = $this->timeField($date);
+                            $rclist[$i]['revocationDate'] = $this->_timeField($date);
                         }
 
                         return true;
@@ -3815,12 +4610,13 @@ class X509
      * Unrevoke a certificate.
      *
      * @param string $serial
+     * @access public
      * @return bool
      */
-    public function unrevoke($serial)
+    function unrevoke($serial)
     {
-        if (is_array($rclist = &$this->subArray($this->currentCert, 'tbsCertList/revokedCertificates'))) {
-            if (($i = $this->revokedCertificate($rclist, $serial)) !== false) {
+        if (is_array($rclist = &$this->_subArray($this->currentCert, 'tbsCertList/revokedCertificates'))) {
+            if (($i = $this->_revokedCertificate($rclist, $serial)) !== false) {
                 unset($rclist[$i]);
                 $rclist = array_values($rclist);
                 return true;
@@ -3834,12 +4630,13 @@ class X509
      * Get a revoked certificate.
      *
      * @param string $serial
+     * @access public
      * @return mixed
      */
-    public function getRevoked($serial)
+    function getRevoked($serial)
     {
-        if (is_array($rclist = $this->subArray($this->currentCert, 'tbsCertList/revokedCertificates'))) {
-            if (($i = $this->revokedCertificate($rclist, $serial)) !== false) {
+        if (is_array($rclist = $this->_subArray($this->currentCert, 'tbsCertList/revokedCertificates'))) {
+            if (($i = $this->_revokedCertificate($rclist, $serial)) !== false) {
                 return $rclist[$i];
             }
         }
@@ -3851,9 +4648,10 @@ class X509
      * List revoked certificates
      *
      * @param array $crl optional
-     * @return array|bool
+     * @access public
+     * @return array
      */
-    public function listRevoked(array $crl = null)
+    function listRevoked($crl = null)
     {
         if (!isset($crl)) {
             $crl = $this->currentCert;
@@ -3863,9 +4661,9 @@ class X509
             return false;
         }
 
-        $result = [];
+        $result = array();
 
-        if (is_array($rclist = $this->subArray($crl, 'tbsCertList/revokedCertificates'))) {
+        if (is_array($rclist = $this->_subArray($crl, 'tbsCertList/revokedCertificates'))) {
             foreach ($rclist as $rc) {
                 $result[] = $rc['userCertificate']->toString();
             }
@@ -3879,13 +4677,14 @@ class X509
      *
      * @param string $serial
      * @param string $id
+     * @access public
      * @return bool
      */
-    public function removeRevokedCertificateExtension($serial, $id)
+    function removeRevokedCertificateExtension($serial, $id)
     {
-        if (is_array($rclist = &$this->subArray($this->currentCert, 'tbsCertList/revokedCertificates'))) {
-            if (($i = $this->revokedCertificate($rclist, $serial)) !== false) {
-                return $this->removeExtensionHelper($id, "tbsCertList/revokedCertificates/$i/crlEntryExtensions");
+        if (is_array($rclist = &$this->_subArray($this->currentCert, 'tbsCertList/revokedCertificates'))) {
+            if (($i = $this->_revokedCertificate($rclist, $serial)) !== false) {
+                return $this->_removeExtension($id, "tbsCertList/revokedCertificates/$i/crlEntryExtensions");
             }
         }
 
@@ -3900,17 +4699,18 @@ class X509
      * @param string $serial
      * @param string $id
      * @param array $crl optional
+     * @access public
      * @return mixed
      */
-    public function getRevokedCertificateExtension($serial, $id, array $crl = null)
+    function getRevokedCertificateExtension($serial, $id, $crl = null)
     {
         if (!isset($crl)) {
             $crl = $this->currentCert;
         }
 
-        if (is_array($rclist = $this->subArray($crl, 'tbsCertList/revokedCertificates'))) {
-            if (($i = $this->revokedCertificate($rclist, $serial)) !== false) {
-                return $this->getExtension($id, $crl, "tbsCertList/revokedCertificates/$i/crlEntryExtensions");
+        if (is_array($rclist = $this->_subArray($crl, 'tbsCertList/revokedCertificates'))) {
+            if (($i = $this->_revokedCertificate($rclist, $serial)) !== false) {
+                return $this->_getExtension($id, $crl,  "tbsCertList/revokedCertificates/$i/crlEntryExtensions");
             }
         }
 
@@ -3922,17 +4722,18 @@ class X509
      *
      * @param string $serial
      * @param array $crl optional
-     * @return array|bool
+     * @access public
+     * @return array
      */
-    public function getRevokedCertificateExtensions($serial, array $crl = null)
+    function getRevokedCertificateExtensions($serial, $crl = null)
     {
         if (!isset($crl)) {
             $crl = $this->currentCert;
         }
 
-        if (is_array($rclist = $this->subArray($crl, 'tbsCertList/revokedCertificates'))) {
-            if (($i = $this->revokedCertificate($rclist, $serial)) !== false) {
-                return $this->getExtensions($crl, "tbsCertList/revokedCertificates/$i/crlEntryExtensions");
+        if (is_array($rclist = $this->_subArray($crl, 'tbsCertList/revokedCertificates'))) {
+            if (($i = $this->_revokedCertificate($rclist, $serial)) !== false) {
+                return $this->_getExtensions($crl, "tbsCertList/revokedCertificates/$i/crlEntryExtensions");
             }
         }
 
@@ -3947,14 +4748,15 @@ class X509
      * @param mixed $value
      * @param bool $critical optional
      * @param bool $replace optional
+     * @access public
      * @return bool
      */
-    public function setRevokedCertificateExtension($serial, $id, $value, $critical = false, $replace = true)
+    function setRevokedCertificateExtension($serial, $id, $value, $critical = false, $replace = true)
     {
         if (isset($this->currentCert['tbsCertList'])) {
-            if (is_array($rclist = &$this->subArray($this->currentCert, 'tbsCertList/revokedCertificates', true))) {
-                if (($i = $this->revokedCertificate($rclist, $serial, true)) !== false) {
-                    return $this->setExtensionHelper($id, $value, $critical, $replace, "tbsCertList/revokedCertificates/$i/crlEntryExtensions");
+            if (is_array($rclist = &$this->_subArray($this->currentCert, 'tbsCertList/revokedCertificates', true))) {
+                if (($i = $this->_revokedCertificate($rclist, $serial, true)) !== false) {
+                    return $this->_setExtension($id, $value, $critical, $replace, "tbsCertList/revokedCertificates/$i/crlEntryExtensions");
                 }
             }
         }
@@ -3963,44 +4765,56 @@ class X509
     }
 
     /**
-     * Register the mapping for a custom/unsupported extension.
+     * Extract raw BER from Base64 encoding
      *
-     * @param string $id
-     * @param array $mapping
+     * @access private
+     * @param string $str
+     * @return string
      */
-    public static function registerExtension($id, array $mapping)
+    function _extractBER($str)
     {
-        if (isset(self::$extensions[$id]) && self::$extensions[$id] !== $mapping) {
-            throw new \RuntimeException(
-                'Extension ' . $id . ' has already been defined with a different mapping.'
-            );
+        /* X.509 certs are assumed to be base64 encoded but sometimes they'll have additional things in them
+         * above and beyond the ceritificate.
+         * ie. some may have the following preceding the -----BEGIN CERTIFICATE----- line:
+         *
+         * Bag Attributes
+         *     localKeyID: 01 00 00 00
+         * subject=/O=organization/OU=org unit/CN=common name
+         * issuer=/O=organization/CN=common name
+         */
+        $temp = preg_replace('#.*?^-+[^-]+-+[\r\n ]*$#ms', '', $str, 1);
+        // remove the -----BEGIN CERTIFICATE----- and -----END CERTIFICATE----- stuff
+        $temp = preg_replace('#-+[^-]+-+#', '', $temp);
+        // remove new lines
+        $temp = str_replace(array("\r", "\n", ' '), '', $temp);
+        $temp = preg_match('#^[a-zA-Z\d/+]*={0,2}$#', $temp) ? base64_decode($temp) : false;
+        return $temp != false ? $temp : $str;
+    }
+
+    /**
+     * Returns the OID corresponding to a name
+     *
+     * What's returned in the associative array returned by loadX509() (or load*()) is either a name or an OID if
+     * no OID to name mapping is available. The problem with this is that what may be an unmapped OID in one version
+     * of phpseclib may not be unmapped in the next version, so apps that are looking at this OID may not be able
+     * to work from version to version.
+     *
+     * This method will return the OID if a name is passed to it and if no mapping is avialable it'll assume that
+     * what's being passed to it already is an OID and return that instead. A few examples.
+     *
+     * getOID('2.16.840.1.101.3.4.2.1') == '2.16.840.1.101.3.4.2.1'
+     * getOID('id-sha256') == '2.16.840.1.101.3.4.2.1'
+     * getOID('zzz') == 'zzz'
+     *
+     * @access public
+     * @return string
+     */
+    function getOID($name)
+    {
+        static $reverseMap;
+        if (!isset($reverseMap)) {
+            $reverseMap = array_flip($this->oids);
         }
-
-        self::$extensions[$id] = $mapping;
-    }
-
-    /**
-     * Register the mapping for a custom/unsupported extension.
-     *
-     * @param string $id
-     *
-     * @return array|null
-     */
-    public static function getRegisteredExtension($id)
-    {
-        return isset(self::$extensions[$id]) ? self::$extensions[$id] : null;
-    }
-
-    /**
-     * Register the mapping for a custom/unsupported extension.
-     *
-     * @param string $id
-     * @param mixed $value
-     * @param bool $critical
-     * @param bool $replace
-     */
-    public function setExtensionValue($id, $value, $critical = false, $replace = false)
-    {
-        $this->extensionValues[$id] = compact('critical', 'replace', 'value');
+        return isset($reverseMap[$name]) ? $reverseMap[$name] : $name;
     }
 }
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger.php
index 67d4788f..4b13d7c6 100644
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger.php
+++ b/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger.php
@@ -6,13 +6,33 @@
  * Supports base-2, base-10, base-16, and base-256 numbers.  Uses the GMP or BCMath extensions, if available,
  * and an internal implementation, otherwise.
  *
- * PHP version 5 and 7
+ * PHP version 5
+ *
+ * {@internal (all DocBlock comments regarding implementation - such as the one that follows - refer to the
+ * {@link self::MODE_INTERNAL self::MODE_INTERNAL} mode)
+ *
+ * BigInteger uses base-2**26 to perform operations such as multiplication and division and
+ * base-2**52 (ie. two base 2**26 digits) to perform addition and subtraction.  Because the largest possible
+ * value when multiplying two base-2**26 numbers together is a base-2**52 number, double precision floating
+ * point numbers - numbers that should be supported on most hardware and whose significand is 53 bits - are
+ * used.  As a consequence, bitwise operators such as >> and << cannot be used, nor can the modulo operator %,
+ * which only supports integers.  Although this fact will slow this library down, the fact that such a high
+ * base is being used should more than compensate.
+ *
+ * Numbers are stored in {@link http://en.wikipedia.org/wiki/Endianness little endian} format.  ie.
+ * (new \phpseclib\Math\BigInteger(pow(2, 26)))->value = array(0, 1)
+ *
+ * Useful resources are as follows:
+ *
+ *  - {@link http://www.cacr.math.uwaterloo.ca/hac/about/chap14.pdf Handbook of Applied Cryptography (HAC)}
+ *  - {@link http://math.libtomcrypt.com/files/tommath.pdf Multi-Precision Math (MPM)}
+ *  - Java's BigInteger classes.  See /j2se/src/share/classes/java/math in jdk-1_5_0-src-jrl.zip
  *
  * Here's an example of how to use this library:
  * <code>
  * <?php
- *    $a = new \phpseclib3\Math\BigInteger(2);
- *    $b = new \phpseclib3\Math\BigInteger(3);
+ *    $a = new \phpseclib\Math\BigInteger(2);
+ *    $b = new \phpseclib\Math\BigInteger(3);
  *
  *    $c = $a->add($b);
  *
@@ -20,141 +40,194 @@
  * ?>
  * </code>
  *
+ * @category  Math
+ * @package   BigInteger
  * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2017 Jim Wigginton
+ * @copyright 2006 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://pear.php.net/package/Math_BigInteger
  */
 
-namespace phpseclib3\Math;
+namespace phpseclib\Math;
 
-use phpseclib3\Exception\BadConfigurationException;
-use phpseclib3\Math\BigInteger\Engines\Engine;
+use phpseclib\Crypt\Random;
 
 /**
  * Pure-PHP arbitrary precision integer arithmetic library. Supports base-2, base-10, base-16, and base-256
  * numbers.
  *
+ * @package BigInteger
  * @author  Jim Wigginton <terrafrost@php.net>
+ * @access  public
  */
-class BigInteger implements \JsonSerializable
+class BigInteger
 {
-    /**
-     * Main Engine
+    /**#@+
+     * Reduction constants
      *
-     * @var class-string<Engine>
+     * @access private
+     * @see BigInteger::_reduce()
      */
-    private static $mainEngine;
+    /**
+     * @see BigInteger::_montgomery()
+     * @see BigInteger::_prepMontgomery()
+     */
+    const MONTGOMERY = 0;
+    /**
+     * @see BigInteger::_barrett()
+     */
+    const BARRETT = 1;
+    /**
+     * @see BigInteger::_mod2()
+     */
+    const POWEROF2 = 2;
+    /**
+     * @see BigInteger::_remainder()
+     */
+    const CLASSIC = 3;
+    /**
+     * @see BigInteger::__clone()
+     */
+    const NONE = 4;
+    /**#@-*/
+
+    /**#@+
+     * Array constants
+     *
+     * Rather than create a thousands and thousands of new BigInteger objects in repeated function calls to add() and
+     * multiply() or whatever, we'll just work directly on arrays, taking them in as parameters and returning them.
+     *
+     * @access private
+    */
+    /**
+     * $result[self::VALUE] contains the value.
+     */
+    const VALUE = 0;
+    /**
+     * $result[self::SIGN] contains the sign.
+     */
+    const SIGN = 1;
+    /**#@-*/
+
+    /**#@+
+     * @access private
+     * @see BigInteger::_montgomery()
+     * @see BigInteger::_barrett()
+    */
+    /**
+     * Cache constants
+     *
+     * $cache[self::VARIABLE] tells us whether or not the cached data is still valid.
+     */
+    const VARIABLE = 0;
+    /**
+     * $cache[self::DATA] contains the cached data.
+     */
+    const DATA = 1;
+    /**#@-*/
+
+    /**#@+
+     * Mode constants.
+     *
+     * @access private
+     * @see BigInteger::__construct()
+    */
+    /**
+     * To use the pure-PHP implementation
+     */
+    const MODE_INTERNAL = 1;
+    /**
+     * To use the BCMath library
+     *
+     * (if enabled; otherwise, the internal implementation will be used)
+     */
+    const MODE_BCMATH = 2;
+    /**
+     * To use the GMP library
+     *
+     * (if present; otherwise, either the BCMath or the internal implementation will be used)
+     */
+    const MODE_GMP = 3;
+    /**#@-*/
 
     /**
-     * Selected Engines
+     * Karatsuba Cutoff
      *
-     * @var list<string>
+     * At what point do we switch between Karatsuba multiplication and schoolbook long multiplication?
+     *
+     * @access private
      */
-    private static $engines;
+    const KARATSUBA_CUTOFF = 25;
+
+    /**#@+
+     * Static properties used by the pure-PHP implementation.
+     *
+     * @see __construct()
+     */
+    protected static $base;
+    protected static $baseFull;
+    protected static $maxDigit;
+    protected static $msb;
 
     /**
-     * The actual BigInteger object
-     *
-     * @var object
+     * $max10 in greatest $max10Len satisfying
+     * $max10 = 10**$max10Len <= 2**$base.
      */
-    private $value;
+    protected static $max10;
+
+    /**
+     * $max10Len in greatest $max10Len satisfying
+     * $max10 = 10**$max10Len <= 2**$base.
+     */
+    protected static $max10Len;
+    protected static $maxDigit2;
+    /**#@-*/
+
+    /**
+     * Holds the BigInteger's value.
+     *
+     * @var array
+     * @access private
+     */
+    var $value;
+
+    /**
+     * Holds the BigInteger's magnitude.
+     *
+     * @var bool
+     * @access private
+     */
+    var $is_negative = false;
+
+    /**
+     * Precision
+     *
+     * @see self::setPrecision()
+     * @access private
+     */
+    var $precision = -1;
+
+    /**
+     * Precision Bitmask
+     *
+     * @see self::setPrecision()
+     * @access private
+     */
+    var $bitmask = false;
 
     /**
      * Mode independent value used for serialization.
      *
+     * If the bcmath or gmp extensions are installed $this->value will be a non-serializable resource, hence the need for
+     * a variable that'll be serializable regardless of whether or not extensions are being used.  Unlike $this->value,
+     * however, $this->hex is only calculated when $this->__sleep() is called.
+     *
      * @see self::__sleep()
      * @see self::__wakeup()
      * @var string
+     * @access private
      */
-    private $hex;
-
-    /**
-     * Precision (used only for serialization)
-     *
-     * @see self::__sleep()
-     * @see self::__wakeup()
-     * @var int
-     */
-    private $precision;
-
-    /**
-     * Sets engine type.
-     *
-     * Throws an exception if the type is invalid
-     *
-     * @param string $main
-     * @param list<string> $modexps optional
-     * @return void
-     */
-    public static function setEngine($main, array $modexps = ['DefaultEngine'])
-    {
-        self::$engines = [];
-
-        $fqmain = 'phpseclib3\\Math\\BigInteger\\Engines\\' . $main;
-        if (!class_exists($fqmain) || !method_exists($fqmain, 'isValidEngine')) {
-            throw new \InvalidArgumentException("$main is not a valid engine");
-        }
-        if (!$fqmain::isValidEngine()) {
-            throw new BadConfigurationException("$main is not setup correctly on this system");
-        }
-        /** @var class-string<Engine> $fqmain */
-        self::$mainEngine = $fqmain;
-
-        $found = false;
-        foreach ($modexps as $modexp) {
-            try {
-                $fqmain::setModExpEngine($modexp);
-                $found = true;
-                break;
-            } catch (\Exception $e) {
-            }
-        }
-
-        if (!$found) {
-            throw new BadConfigurationException("No valid modular exponentiation engine found for $main");
-        }
-
-        self::$engines = [$main, $modexp];
-    }
-
-    /**
-     * Returns the engine type
-     *
-     * @return string[]
-     */
-    public static function getEngine()
-    {
-        self::initialize_static_variables();
-
-        return self::$engines;
-    }
-
-    /**
-     * Initialize static variables
-     */
-    private static function initialize_static_variables()
-    {
-        if (!isset(self::$mainEngine)) {
-            $engines = [
-                ['GMP', ['DefaultEngine']],
-                ['PHP64', ['OpenSSL']],
-                ['BCMath', ['OpenSSL']],
-                ['PHP32', ['OpenSSL']],
-                ['PHP64', ['DefaultEngine']],
-                ['PHP32', ['DefaultEngine']]
-            ];
-
-            foreach ($engines as $engine) {
-                try {
-                    self::setEngine($engine[0], $engine[1]);
-                    return;
-                } catch (\Exception $e) {
-                }
-            }
-
-            throw new \UnexpectedValueException('No valid BigInteger found. This is only possible when JIT is enabled on Windows and neither the GMP or BCMath extensions are available so either disable JIT or install GMP / BCMath');
-        }
-    }
+    var $hex;
 
     /**
      * Converts base-2, base-10, base-16, and binary strings (base-256) to BigIntegers.
@@ -162,71 +235,389 @@ class BigInteger implements \JsonSerializable
      * If the second parameter - $base - is negative, then it will be assumed that the number's are encoded using
      * two's compliment.  The sole exception to this is -10, which is treated the same as 10 is.
      *
-     * @param string|int|BigInteger\Engines\Engine $x Base-10 number or base-$base number if $base set.
+     * Here's an example:
+     * <code>
+     * <?php
+     *    $a = new \phpseclib\Math\BigInteger('0x32', 16); // 50 in base-16
+     *
+     *    echo $a->toString(); // outputs 50
+     * ?>
+     * </code>
+     *
+     * @param $x base-10 number or base-$base number if $base set.
      * @param int $base
+     * @return \phpseclib\Math\BigInteger
+     * @access public
      */
-    public function __construct($x = 0, $base = 10)
+    function __construct($x = 0, $base = 10)
     {
-        self::initialize_static_variables();
-
-        if ($x instanceof self::$mainEngine) {
-            $this->value = clone $x;
-        } elseif ($x instanceof BigInteger\Engines\Engine) {
-            $this->value = new static("$x");
-            $this->value->setPrecision($x->getPrecision());
-        } else {
-            $this->value = new self::$mainEngine($x, $base);
+        if (!defined('MATH_BIGINTEGER_MODE')) {
+            switch (true) {
+                case extension_loaded('gmp'):
+                    define('MATH_BIGINTEGER_MODE', self::MODE_GMP);
+                    break;
+                case extension_loaded('bcmath'):
+                    define('MATH_BIGINTEGER_MODE', self::MODE_BCMATH);
+                    break;
+                default:
+                    define('MATH_BIGINTEGER_MODE', self::MODE_INTERNAL);
+            }
         }
-    }
 
-    /**
-     * Converts a BigInteger to a base-10 number.
-     *
-     * @return string
-     */
-    public function toString()
-    {
-        return $this->value->toString();
-    }
+        if (extension_loaded('openssl') && !defined('MATH_BIGINTEGER_OPENSSL_DISABLE') && !defined('MATH_BIGINTEGER_OPENSSL_ENABLED')) {
+            // some versions of XAMPP have mismatched versions of OpenSSL which causes it not to work
+            ob_start();
+            @phpinfo();
+            $content = ob_get_contents();
+            ob_end_clean();
 
-    /**
-     *  __toString() magic method
-     */
-    public function __toString()
-    {
-        return (string)$this->value;
-    }
+            preg_match_all('#OpenSSL (Header|Library) Version(.*)#im', $content, $matches);
 
-    /**
-     *  __debugInfo() magic method
-     *
-     * Will be called, automatically, when print_r() or var_dump() are called
-     */
-    public function __debugInfo()
-    {
-        return $this->value->__debugInfo();
+            $versions = array();
+            if (!empty($matches[1])) {
+                for ($i = 0; $i < count($matches[1]); $i++) {
+                    $fullVersion = trim(str_replace('=>', '', strip_tags($matches[2][$i])));
+
+                    // Remove letter part in OpenSSL version
+                    if (!preg_match('/(\d+\.\d+\.\d+)/i', $fullVersion, $m)) {
+                        $versions[$matches[1][$i]] = $fullVersion;
+                    } else {
+                        $versions[$matches[1][$i]] = $m[0];
+                    }
+                }
+            }
+
+            // it doesn't appear that OpenSSL versions were reported upon until PHP 5.3+
+            switch (true) {
+                case !isset($versions['Header']):
+                case !isset($versions['Library']):
+                case $versions['Header'] == $versions['Library']:
+                case version_compare($versions['Header'], '1.0.0') >= 0 && version_compare($versions['Library'], '1.0.0') >= 0:
+                    define('MATH_BIGINTEGER_OPENSSL_ENABLED', true);
+                    break;
+                default:
+                    define('MATH_BIGINTEGER_OPENSSL_DISABLE', true);
+            }
+        }
+
+        if (!defined('PHP_INT_SIZE')) {
+            define('PHP_INT_SIZE', 4);
+        }
+
+        if (empty(self::$base) && MATH_BIGINTEGER_MODE == self::MODE_INTERNAL) {
+            switch (PHP_INT_SIZE) {
+                case 8: // use 64-bit integers if int size is 8 bytes
+                    self::$base      = 31;
+                    self::$baseFull  = 0x80000000;
+                    self::$maxDigit  = 0x7FFFFFFF;
+                    self::$msb       = 0x40000000;
+                    self::$max10     = 1000000000;
+                    self::$max10Len  = 9;
+                    self::$maxDigit2 = pow(2, 62);
+                    break;
+                //case 4: // use 64-bit floats if int size is 4 bytes
+                default:
+                    self::$base      = 26;
+                    self::$baseFull  = 0x4000000;
+                    self::$maxDigit  = 0x3FFFFFF;
+                    self::$msb       = 0x2000000;
+                    self::$max10     = 10000000;
+                    self::$max10Len  = 7;
+                    self::$maxDigit2 = pow(2, 52); // pow() prevents truncation
+            }
+        }
+
+        switch (MATH_BIGINTEGER_MODE) {
+            case self::MODE_GMP:
+                switch (true) {
+                    case is_resource($x) && get_resource_type($x) == 'GMP integer':
+                    // PHP 5.6 switched GMP from using resources to objects
+                    case $x instanceof \GMP:
+                        $this->value = $x;
+                        return;
+                }
+                $this->value = gmp_init(0);
+                break;
+            case self::MODE_BCMATH:
+                $this->value = '0';
+                break;
+            default:
+                $this->value = array();
+        }
+
+        // '0' counts as empty() but when the base is 256 '0' is equal to ord('0') or 48
+        // '0' is the only value like this per http://php.net/empty
+        if (empty($x) && (abs($base) != 256 || $x !== '0')) {
+            return;
+        }
+
+        switch ($base) {
+            case -256:
+                if (ord($x[0]) & 0x80) {
+                    $x = ~$x;
+                    $this->is_negative = true;
+                }
+            case 256:
+                switch (MATH_BIGINTEGER_MODE) {
+                    case self::MODE_GMP:
+                        $sign = $this->is_negative ? '-' : '';
+                        $this->value = gmp_init($sign . '0x' . bin2hex($x));
+                        break;
+                    case self::MODE_BCMATH:
+                        // round $len to the nearest 4 (thanks, DavidMJ!)
+                        $len = (strlen($x) + 3) & 0xFFFFFFFC;
+
+                        $x = str_pad($x, $len, chr(0), STR_PAD_LEFT);
+
+                        for ($i = 0; $i < $len; $i+= 4) {
+                            $this->value = bcmul($this->value, '4294967296', 0); // 4294967296 == 2**32
+                            $this->value = bcadd($this->value, 0x1000000 * ord($x[$i]) + ((ord($x[$i + 1]) << 16) | (ord($x[$i + 2]) << 8) | ord($x[$i + 3])), 0);
+                        }
+
+                        if ($this->is_negative) {
+                            $this->value = '-' . $this->value;
+                        }
+
+                        break;
+                    // converts a base-2**8 (big endian / msb) number to base-2**26 (little endian / lsb)
+                    default:
+                        while (strlen($x)) {
+                            $this->value[] = $this->_bytes2int($this->_base256_rshift($x, self::$base));
+                        }
+                }
+
+                if ($this->is_negative) {
+                    if (MATH_BIGINTEGER_MODE != self::MODE_INTERNAL) {
+                        $this->is_negative = false;
+                    }
+                    $temp = $this->add(new static('-1'));
+                    $this->value = $temp->value;
+                }
+                break;
+            case 16:
+            case -16:
+                if ($base > 0 && $x[0] == '-') {
+                    $this->is_negative = true;
+                    $x = substr($x, 1);
+                }
+
+                $x = preg_replace('#^(?:0x)?([A-Fa-f0-9]*).*#', '$1', $x);
+
+                $is_negative = false;
+                if ($base < 0 && hexdec($x[0]) >= 8) {
+                    $this->is_negative = $is_negative = true;
+                    $x = bin2hex(~pack('H*', $x));
+                }
+
+                switch (MATH_BIGINTEGER_MODE) {
+                    case self::MODE_GMP:
+                        $temp = $this->is_negative ? '-0x' . $x : '0x' . $x;
+                        $this->value = gmp_init($temp);
+                        $this->is_negative = false;
+                        break;
+                    case self::MODE_BCMATH:
+                        $x = (strlen($x) & 1) ? '0' . $x : $x;
+                        $temp = new static(pack('H*', $x), 256);
+                        $this->value = $this->is_negative ? '-' . $temp->value : $temp->value;
+                        $this->is_negative = false;
+                        break;
+                    default:
+                        $x = (strlen($x) & 1) ? '0' . $x : $x;
+                        $temp = new static(pack('H*', $x), 256);
+                        $this->value = $temp->value;
+                }
+
+                if ($is_negative) {
+                    $temp = $this->add(new static('-1'));
+                    $this->value = $temp->value;
+                }
+                break;
+            case 10:
+            case -10:
+                // (?<!^)(?:-).*: find any -'s that aren't at the beginning and then any characters that follow that
+                // (?<=^|-)0*: find any 0's that are preceded by the start of the string or by a - (ie. octals)
+                // [^-0-9].*: find any non-numeric characters and then any characters that follow that
+                $x = preg_replace('#(?<!^)(?:-).*|(?<=^|-)0*|[^-0-9].*#', '', $x);
+
+                switch (MATH_BIGINTEGER_MODE) {
+                    case self::MODE_GMP:
+                        $this->value = gmp_init($x);
+                        break;
+                    case self::MODE_BCMATH:
+                        // explicitly casting $x to a string is necessary, here, since doing $x[0] on -1 yields different
+                        // results then doing it on '-1' does (modInverse does $x[0])
+                        $this->value = $x === '-' ? '0' : (string) $x;
+                        break;
+                    default:
+                        $temp = new static();
+
+                        $multiplier = new static();
+                        $multiplier->value = array(self::$max10);
+
+                        if ($x[0] == '-') {
+                            $this->is_negative = true;
+                            $x = substr($x, 1);
+                        }
+
+                        $x = str_pad($x, strlen($x) + ((self::$max10Len - 1) * strlen($x)) % self::$max10Len, 0, STR_PAD_LEFT);
+                        while (strlen($x)) {
+                            $temp = $temp->multiply($multiplier);
+                            $temp = $temp->add(new static($this->_int2bytes(substr($x, 0, self::$max10Len)), 256));
+                            $x = substr($x, self::$max10Len);
+                        }
+
+                        $this->value = $temp->value;
+                }
+                break;
+            case 2: // base-2 support originally implemented by Lluis Pamies - thanks!
+            case -2:
+                if ($base > 0 && $x[0] == '-') {
+                    $this->is_negative = true;
+                    $x = substr($x, 1);
+                }
+
+                $x = preg_replace('#^([01]*).*#', '$1', $x);
+                $x = str_pad($x, strlen($x) + (3 * strlen($x)) % 4, 0, STR_PAD_LEFT);
+
+                $str = '0x';
+                while (strlen($x)) {
+                    $part = substr($x, 0, 4);
+                    $str.= dechex(bindec($part));
+                    $x = substr($x, 4);
+                }
+
+                if ($this->is_negative) {
+                    $str = '-' . $str;
+                }
+
+                $temp = new static($str, 8 * $base); // ie. either -16 or +16
+                $this->value = $temp->value;
+                $this->is_negative = $temp->is_negative;
+
+                break;
+            default:
+                // base not supported, so we'll let $this == 0
+        }
     }
 
     /**
      * Converts a BigInteger to a byte string (eg. base-256).
      *
-     * @param bool $twos_compliment
-     * @return string
-     */
-    public function toBytes($twos_compliment = false)
-    {
-        return $this->value->toBytes($twos_compliment);
-    }
-
-    /**
-     * Converts a BigInteger to a hex string (eg. base-16).
+     * Negative numbers are saved as positive numbers, unless $twos_compliment is set to true, at which point, they're
+     * saved as two's compliment.
+     *
+     * Here's an example:
+     * <code>
+     * <?php
+     *    $a = new \phpseclib\Math\BigInteger('65');
+     *
+     *    echo $a->toBytes(); // outputs chr(65)
+     * ?>
+     * </code>
      *
      * @param bool $twos_compliment
      * @return string
+     * @access public
+     * @internal Converts a base-2**26 number to base-2**8
      */
-    public function toHex($twos_compliment = false)
+    function toBytes($twos_compliment = false)
     {
-        return $this->value->toHex($twos_compliment);
+        if ($twos_compliment) {
+            $comparison = $this->compare(new static());
+            if ($comparison == 0) {
+                return $this->precision > 0 ? str_repeat(chr(0), ($this->precision + 1) >> 3) : '';
+            }
+
+            $temp = $comparison < 0 ? $this->add(new static(1)) : $this->copy();
+            $bytes = $temp->toBytes();
+
+            if (empty($bytes)) { // eg. if the number we're trying to convert is -1
+                $bytes = chr(0);
+            }
+
+            if (ord($bytes[0]) & 0x80) {
+                $bytes = chr(0) . $bytes;
+            }
+
+            return $comparison < 0 ? ~$bytes : $bytes;
+        }
+
+        switch (MATH_BIGINTEGER_MODE) {
+            case self::MODE_GMP:
+                if (gmp_cmp($this->value, gmp_init(0)) == 0) {
+                    return $this->precision > 0 ? str_repeat(chr(0), ($this->precision + 1) >> 3) : '';
+                }
+
+                $temp = gmp_strval(gmp_abs($this->value), 16);
+                $temp = (strlen($temp) & 1) ? '0' . $temp : $temp;
+                $temp = pack('H*', $temp);
+
+                return $this->precision > 0 ?
+                    substr(str_pad($temp, $this->precision >> 3, chr(0), STR_PAD_LEFT), -($this->precision >> 3)) :
+                    ltrim($temp, chr(0));
+            case self::MODE_BCMATH:
+                if ($this->value === '0') {
+                    return $this->precision > 0 ? str_repeat(chr(0), ($this->precision + 1) >> 3) : '';
+                }
+
+                $value = '';
+                $current = $this->value;
+
+                if ($current[0] == '-') {
+                    $current = substr($current, 1);
+                }
+
+                while (bccomp($current, '0', 0) > 0) {
+                    $temp = bcmod($current, '16777216');
+                    $value = chr($temp >> 16) . chr($temp >> 8) . chr($temp) . $value;
+                    $current = bcdiv($current, '16777216', 0);
+                }
+
+                return $this->precision > 0 ?
+                    substr(str_pad($value, $this->precision >> 3, chr(0), STR_PAD_LEFT), -($this->precision >> 3)) :
+                    ltrim($value, chr(0));
+        }
+
+        if (!count($this->value)) {
+            return $this->precision > 0 ? str_repeat(chr(0), ($this->precision + 1) >> 3) : '';
+        }
+        $result = $this->_int2bytes($this->value[count($this->value) - 1]);
+
+        $temp = $this->copy();
+
+        for ($i = count($temp->value) - 2; $i >= 0; --$i) {
+            $temp->_base256_lshift($result, self::$base);
+            $result = $result | str_pad($temp->_int2bytes($temp->value[$i]), strlen($result), chr(0), STR_PAD_LEFT);
+        }
+
+        return $this->precision > 0 ?
+            str_pad(substr($result, -(($this->precision + 7) >> 3)), ($this->precision + 7) >> 3, chr(0), STR_PAD_LEFT) :
+            $result;
+    }
+
+    /**
+     * Converts a BigInteger to a hex string (eg. base-16)).
+     *
+     * Negative numbers are saved as positive numbers, unless $twos_compliment is set to true, at which point, they're
+     * saved as two's compliment.
+     *
+     * Here's an example:
+     * <code>
+     * <?php
+     *    $a = new \phpseclib\Math\BigInteger('65');
+     *
+     *    echo $a->toHex(); // outputs '41'
+     * ?>
+     * </code>
+     *
+     * @param bool $twos_compliment
+     * @return string
+     * @access public
+     * @internal Converts a base-2**26 number to base-2**8
+     */
+    function toHex($twos_compliment = false)
+    {
+        return bin2hex($this->toBytes($twos_compliment));
     }
 
     /**
@@ -235,45 +626,755 @@ class BigInteger implements \JsonSerializable
      * Negative numbers are saved as positive numbers, unless $twos_compliment is set to true, at which point, they're
      * saved as two's compliment.
      *
+     * Here's an example:
+     * <code>
+     * <?php
+     *    $a = new \phpseclib\Math\BigInteger('65');
+     *
+     *    echo $a->toBits(); // outputs '1000001'
+     * ?>
+     * </code>
+     *
      * @param bool $twos_compliment
      * @return string
+     * @access public
+     * @internal Converts a base-2**26 number to base-2**2
      */
-    public function toBits($twos_compliment = false)
+    function toBits($twos_compliment = false)
     {
-        return $this->value->toBits($twos_compliment);
+        $hex = $this->toHex($twos_compliment);
+        $bits = '';
+        for ($i = strlen($hex) - 8, $start = strlen($hex) & 7; $i >= $start; $i-=8) {
+            $bits = str_pad(decbin(hexdec(substr($hex, $i, 8))), 32, '0', STR_PAD_LEFT) . $bits;
+        }
+        if ($start) { // hexdec('') == 0
+            $bits = str_pad(decbin(hexdec(substr($hex, 0, $start))), 8, '0', STR_PAD_LEFT) . $bits;
+        }
+        $result = $this->precision > 0 ? substr($bits, -$this->precision) : ltrim($bits, '0');
+
+        if ($twos_compliment && $this->compare(new static()) > 0 && $this->precision <= 0) {
+            return '0' . $result;
+        }
+
+        return $result;
+    }
+
+    /**
+     * Converts a BigInteger to a base-10 number.
+     *
+     * Here's an example:
+     * <code>
+     * <?php
+     *    $a = new \phpseclib\Math\BigInteger('50');
+     *
+     *    echo $a->toString(); // outputs 50
+     * ?>
+     * </code>
+     *
+     * @return string
+     * @access public
+     * @internal Converts a base-2**26 number to base-10**7 (which is pretty much base-10)
+     */
+    function toString()
+    {
+        switch (MATH_BIGINTEGER_MODE) {
+            case self::MODE_GMP:
+                return gmp_strval($this->value);
+            case self::MODE_BCMATH:
+                if ($this->value === '0') {
+                    return '0';
+                }
+
+                return ltrim($this->value, '0');
+        }
+
+        if (!count($this->value)) {
+            return '0';
+        }
+
+        $temp = $this->copy();
+        $temp->is_negative = false;
+
+        $divisor = new static();
+        $divisor->value = array(self::$max10);
+        $result = '';
+        while (count($temp->value)) {
+            list($temp, $mod) = $temp->divide($divisor);
+            $result = str_pad(isset($mod->value[0]) ? $mod->value[0] : '', self::$max10Len, '0', STR_PAD_LEFT) . $result;
+        }
+        $result = ltrim($result, '0');
+        if (empty($result)) {
+            $result = '0';
+        }
+
+        if ($this->is_negative) {
+            $result = '-' . $result;
+        }
+
+        return $result;
+    }
+
+    /**
+     * Copy an object
+     *
+     * PHP5 passes objects by reference while PHP4 passes by value.  As such, we need a function to guarantee
+     * that all objects are passed by value, when appropriate.  More information can be found here:
+     *
+     * {@link http://php.net/language.oop5.basic#51624}
+     *
+     * @access public
+     * @see self::__clone()
+     * @return \phpseclib\Math\BigInteger
+     */
+    function copy()
+    {
+        $temp = new static();
+        $temp->value = $this->value;
+        $temp->is_negative = $this->is_negative;
+        $temp->precision = $this->precision;
+        $temp->bitmask = $this->bitmask;
+        return $temp;
+    }
+
+    /**
+     *  __toString() magic method
+     *
+     * Will be called, automatically, if you're supporting just PHP5.  If you're supporting PHP4, you'll need to call
+     * toString().
+     *
+     * @access public
+     * @internal Implemented per a suggestion by Techie-Michael - thanks!
+     */
+    function __toString()
+    {
+        return $this->toString();
+    }
+
+    /**
+     * __clone() magic method
+     *
+     * Although you can call BigInteger::__toString() directly in PHP5, you cannot call BigInteger::__clone() directly
+     * in PHP5.  You can in PHP4 since it's not a magic method, but in PHP5, you have to call it by using the PHP5
+     * only syntax of $y = clone $x.  As such, if you're trying to write an application that works on both PHP4 and
+     * PHP5, call BigInteger::copy(), instead.
+     *
+     * @access public
+     * @see self::copy()
+     * @return \phpseclib\Math\BigInteger
+     */
+    function __clone()
+    {
+        return $this->copy();
+    }
+
+    /**
+     *  __sleep() magic method
+     *
+     * Will be called, automatically, when serialize() is called on a BigInteger object.
+     *
+     * @see self::__wakeup()
+     * @access public
+     */
+    function __sleep()
+    {
+        $this->hex = $this->toHex(true);
+        $vars = array('hex');
+        if ($this->precision > 0) {
+            $vars[] = 'precision';
+        }
+        return $vars;
+    }
+
+    /**
+     *  __wakeup() magic method
+     *
+     * Will be called, automatically, when unserialize() is called on a BigInteger object.
+     *
+     * @see self::__sleep()
+     * @access public
+     */
+    function __wakeup()
+    {
+        $temp = new static($this->hex, -16);
+        $this->value = $temp->value;
+        $this->is_negative = $temp->is_negative;
+        if ($this->precision > 0) {
+            // recalculate $this->bitmask
+            $this->setPrecision($this->precision);
+        }
+    }
+
+    /**
+     *  __debugInfo() magic method
+     *
+     * Will be called, automatically, when print_r() or var_dump() are called
+     *
+     * @access public
+     */
+    function __debugInfo()
+    {
+        $opts = array();
+        switch (MATH_BIGINTEGER_MODE) {
+            case self::MODE_GMP:
+                $engine = 'gmp';
+                break;
+            case self::MODE_BCMATH:
+                $engine = 'bcmath';
+                break;
+            case self::MODE_INTERNAL:
+                $engine = 'internal';
+                $opts[] = PHP_INT_SIZE == 8 ? '64-bit' : '32-bit';
+        }
+        if (MATH_BIGINTEGER_MODE != self::MODE_GMP && defined('MATH_BIGINTEGER_OPENSSL_ENABLED')) {
+            $opts[] = 'OpenSSL';
+        }
+        if (!empty($opts)) {
+            $engine.= ' (' . implode($opts, ', ') . ')';
+        }
+        return array(
+            'value' => '0x' . $this->toHex(true),
+            'engine' => $engine
+        );
     }
 
     /**
      * Adds two BigIntegers.
      *
-     * @param BigInteger $y
-     * @return BigInteger
+     * Here's an example:
+     * <code>
+     * <?php
+     *    $a = new \phpseclib\Math\BigInteger('10');
+     *    $b = new \phpseclib\Math\BigInteger('20');
+     *
+     *    $c = $a->add($b);
+     *
+     *    echo $c->toString(); // outputs 30
+     * ?>
+     * </code>
+     *
+     * @param \phpseclib\Math\BigInteger $y
+     * @return \phpseclib\Math\BigInteger
+     * @access public
+     * @internal Performs base-2**52 addition
      */
-    public function add(BigInteger $y)
+    function add($y)
     {
-        return new static($this->value->add($y->value));
+        switch (MATH_BIGINTEGER_MODE) {
+            case self::MODE_GMP:
+                $temp = new static();
+                $temp->value = gmp_add($this->value, $y->value);
+
+                return $this->_normalize($temp);
+            case self::MODE_BCMATH:
+                $temp = new static();
+                $temp->value = bcadd($this->value, $y->value, 0);
+
+                return $this->_normalize($temp);
+        }
+
+        $temp = $this->_add($this->value, $this->is_negative, $y->value, $y->is_negative);
+
+        $result = new static();
+        $result->value = $temp[self::VALUE];
+        $result->is_negative = $temp[self::SIGN];
+
+        return $this->_normalize($result);
+    }
+
+    /**
+     * Performs addition.
+     *
+     * @param array $x_value
+     * @param bool $x_negative
+     * @param array $y_value
+     * @param bool $y_negative
+     * @return array
+     * @access private
+     */
+    function _add($x_value, $x_negative, $y_value, $y_negative)
+    {
+        $x_size = count($x_value);
+        $y_size = count($y_value);
+
+        if ($x_size == 0) {
+            return array(
+                self::VALUE => $y_value,
+                self::SIGN => $y_negative
+            );
+        } elseif ($y_size == 0) {
+            return array(
+                self::VALUE => $x_value,
+                self::SIGN => $x_negative
+            );
+        }
+
+        // subtract, if appropriate
+        if ($x_negative != $y_negative) {
+            if ($x_value == $y_value) {
+                return array(
+                    self::VALUE => array(),
+                    self::SIGN => false
+                );
+            }
+
+            $temp = $this->_subtract($x_value, false, $y_value, false);
+            $temp[self::SIGN] = $this->_compare($x_value, false, $y_value, false) > 0 ?
+                                          $x_negative : $y_negative;
+
+            return $temp;
+        }
+
+        if ($x_size < $y_size) {
+            $size = $x_size;
+            $value = $y_value;
+        } else {
+            $size = $y_size;
+            $value = $x_value;
+        }
+
+        $value[count($value)] = 0; // just in case the carry adds an extra digit
+
+        $carry = 0;
+        for ($i = 0, $j = 1; $j < $size; $i+=2, $j+=2) {
+            $sum = $x_value[$j] * self::$baseFull + $x_value[$i] + $y_value[$j] * self::$baseFull + $y_value[$i] + $carry;
+            $carry = $sum >= self::$maxDigit2; // eg. floor($sum / 2**52); only possible values (in any base) are 0 and 1
+            $sum = $carry ? $sum - self::$maxDigit2 : $sum;
+
+            $temp = self::$base === 26 ? intval($sum / 0x4000000) : ($sum >> 31);
+
+            $value[$i] = (int) ($sum - self::$baseFull * $temp); // eg. a faster alternative to fmod($sum, 0x4000000)
+            $value[$j] = $temp;
+        }
+
+        if ($j == $size) { // ie. if $y_size is odd
+            $sum = $x_value[$i] + $y_value[$i] + $carry;
+            $carry = $sum >= self::$baseFull;
+            $value[$i] = $carry ? $sum - self::$baseFull : $sum;
+            ++$i; // ie. let $i = $j since we've just done $value[$i]
+        }
+
+        if ($carry) {
+            for (; $value[$i] == self::$maxDigit; ++$i) {
+                $value[$i] = 0;
+            }
+            ++$value[$i];
+        }
+
+        return array(
+            self::VALUE => $this->_trim($value),
+            self::SIGN => $x_negative
+        );
     }
 
     /**
      * Subtracts two BigIntegers.
      *
-     * @param BigInteger $y
-     * @return BigInteger
+     * Here's an example:
+     * <code>
+     * <?php
+     *    $a = new \phpseclib\Math\BigInteger('10');
+     *    $b = new \phpseclib\Math\BigInteger('20');
+     *
+     *    $c = $a->subtract($b);
+     *
+     *    echo $c->toString(); // outputs -10
+     * ?>
+     * </code>
+     *
+     * @param \phpseclib\Math\BigInteger $y
+     * @return \phpseclib\Math\BigInteger
+     * @access public
+     * @internal Performs base-2**52 subtraction
      */
-    public function subtract(BigInteger $y)
+    function subtract($y)
     {
-        return new static($this->value->subtract($y->value));
+        switch (MATH_BIGINTEGER_MODE) {
+            case self::MODE_GMP:
+                $temp = new static();
+                $temp->value = gmp_sub($this->value, $y->value);
+
+                return $this->_normalize($temp);
+            case self::MODE_BCMATH:
+                $temp = new static();
+                $temp->value = bcsub($this->value, $y->value, 0);
+
+                return $this->_normalize($temp);
+        }
+
+        $temp = $this->_subtract($this->value, $this->is_negative, $y->value, $y->is_negative);
+
+        $result = new static();
+        $result->value = $temp[self::VALUE];
+        $result->is_negative = $temp[self::SIGN];
+
+        return $this->_normalize($result);
+    }
+
+    /**
+     * Performs subtraction.
+     *
+     * @param array $x_value
+     * @param bool $x_negative
+     * @param array $y_value
+     * @param bool $y_negative
+     * @return array
+     * @access private
+     */
+    function _subtract($x_value, $x_negative, $y_value, $y_negative)
+    {
+        $x_size = count($x_value);
+        $y_size = count($y_value);
+
+        if ($x_size == 0) {
+            return array(
+                self::VALUE => $y_value,
+                self::SIGN => !$y_negative
+            );
+        } elseif ($y_size == 0) {
+            return array(
+                self::VALUE => $x_value,
+                self::SIGN => $x_negative
+            );
+        }
+
+        // add, if appropriate (ie. -$x - +$y or +$x - -$y)
+        if ($x_negative != $y_negative) {
+            $temp = $this->_add($x_value, false, $y_value, false);
+            $temp[self::SIGN] = $x_negative;
+
+            return $temp;
+        }
+
+        $diff = $this->_compare($x_value, $x_negative, $y_value, $y_negative);
+
+        if (!$diff) {
+            return array(
+                self::VALUE => array(),
+                self::SIGN => false
+            );
+        }
+
+        // switch $x and $y around, if appropriate.
+        if ((!$x_negative && $diff < 0) || ($x_negative && $diff > 0)) {
+            $temp = $x_value;
+            $x_value = $y_value;
+            $y_value = $temp;
+
+            $x_negative = !$x_negative;
+
+            $x_size = count($x_value);
+            $y_size = count($y_value);
+        }
+
+        // at this point, $x_value should be at least as big as - if not bigger than - $y_value
+
+        $carry = 0;
+        for ($i = 0, $j = 1; $j < $y_size; $i+=2, $j+=2) {
+            $sum = $x_value[$j] * self::$baseFull + $x_value[$i] - $y_value[$j] * self::$baseFull - $y_value[$i] - $carry;
+            $carry = $sum < 0; // eg. floor($sum / 2**52); only possible values (in any base) are 0 and 1
+            $sum = $carry ? $sum + self::$maxDigit2 : $sum;
+
+            $temp = self::$base === 26 ? intval($sum / 0x4000000) : ($sum >> 31);
+
+            $x_value[$i] = (int) ($sum - self::$baseFull * $temp);
+            $x_value[$j] = $temp;
+        }
+
+        if ($j == $y_size) { // ie. if $y_size is odd
+            $sum = $x_value[$i] - $y_value[$i] - $carry;
+            $carry = $sum < 0;
+            $x_value[$i] = $carry ? $sum + self::$baseFull : $sum;
+            ++$i;
+        }
+
+        if ($carry) {
+            for (; !$x_value[$i]; ++$i) {
+                $x_value[$i] = self::$maxDigit;
+            }
+            --$x_value[$i];
+        }
+
+        return array(
+            self::VALUE => $this->_trim($x_value),
+            self::SIGN => $x_negative
+        );
     }
 
     /**
      * Multiplies two BigIntegers
      *
-     * @param BigInteger $x
-     * @return BigInteger
+     * Here's an example:
+     * <code>
+     * <?php
+     *    $a = new \phpseclib\Math\BigInteger('10');
+     *    $b = new \phpseclib\Math\BigInteger('20');
+     *
+     *    $c = $a->multiply($b);
+     *
+     *    echo $c->toString(); // outputs 200
+     * ?>
+     * </code>
+     *
+     * @param \phpseclib\Math\BigInteger $x
+     * @return \phpseclib\Math\BigInteger
+     * @access public
      */
-    public function multiply(BigInteger $x)
+    function multiply($x)
     {
-        return new static($this->value->multiply($x->value));
+        switch (MATH_BIGINTEGER_MODE) {
+            case self::MODE_GMP:
+                $temp = new static();
+                $temp->value = gmp_mul($this->value, $x->value);
+
+                return $this->_normalize($temp);
+            case self::MODE_BCMATH:
+                $temp = new static();
+                $temp->value = bcmul($this->value, $x->value, 0);
+
+                return $this->_normalize($temp);
+        }
+
+        $temp = $this->_multiply($this->value, $this->is_negative, $x->value, $x->is_negative);
+
+        $product = new static();
+        $product->value = $temp[self::VALUE];
+        $product->is_negative = $temp[self::SIGN];
+
+        return $this->_normalize($product);
+    }
+
+    /**
+     * Performs multiplication.
+     *
+     * @param array $x_value
+     * @param bool $x_negative
+     * @param array $y_value
+     * @param bool $y_negative
+     * @return array
+     * @access private
+     */
+    function _multiply($x_value, $x_negative, $y_value, $y_negative)
+    {
+        //if ( $x_value == $y_value ) {
+        //    return array(
+        //        self::VALUE => $this->_square($x_value),
+        //        self::SIGN => $x_sign != $y_value
+        //    );
+        //}
+
+        $x_length = count($x_value);
+        $y_length = count($y_value);
+
+        if (!$x_length || !$y_length) { // a 0 is being multiplied
+            return array(
+                self::VALUE => array(),
+                self::SIGN => false
+            );
+        }
+
+        return array(
+            self::VALUE => min($x_length, $y_length) < 2 * self::KARATSUBA_CUTOFF ?
+                $this->_trim($this->_regularMultiply($x_value, $y_value)) :
+                $this->_trim($this->_karatsuba($x_value, $y_value)),
+            self::SIGN => $x_negative != $y_negative
+        );
+    }
+
+    /**
+     * Performs long multiplication on two BigIntegers
+     *
+     * Modeled after 'multiply' in MutableBigInteger.java.
+     *
+     * @param array $x_value
+     * @param array $y_value
+     * @return array
+     * @access private
+     */
+    function _regularMultiply($x_value, $y_value)
+    {
+        $x_length = count($x_value);
+        $y_length = count($y_value);
+
+        if (!$x_length || !$y_length) { // a 0 is being multiplied
+            return array();
+        }
+
+        if ($x_length < $y_length) {
+            $temp = $x_value;
+            $x_value = $y_value;
+            $y_value = $temp;
+
+            $x_length = count($x_value);
+            $y_length = count($y_value);
+        }
+
+        $product_value = $this->_array_repeat(0, $x_length + $y_length);
+
+        // the following for loop could be removed if the for loop following it
+        // (the one with nested for loops) initially set $i to 0, but
+        // doing so would also make the result in one set of unnecessary adds,
+        // since on the outermost loops first pass, $product->value[$k] is going
+        // to always be 0
+
+        $carry = 0;
+
+        for ($j = 0; $j < $x_length; ++$j) { // ie. $i = 0
+            $temp = $x_value[$j] * $y_value[0] + $carry; // $product_value[$k] == 0
+            $carry = self::$base === 26 ? intval($temp / 0x4000000) : ($temp >> 31);
+            $product_value[$j] = (int) ($temp - self::$baseFull * $carry);
+        }
+
+        $product_value[$j] = $carry;
+
+        // the above for loop is what the previous comment was talking about.  the
+        // following for loop is the "one with nested for loops"
+        for ($i = 1; $i < $y_length; ++$i) {
+            $carry = 0;
+
+            for ($j = 0, $k = $i; $j < $x_length; ++$j, ++$k) {
+                $temp = $product_value[$k] + $x_value[$j] * $y_value[$i] + $carry;
+                $carry = self::$base === 26 ? intval($temp / 0x4000000) : ($temp >> 31);
+                $product_value[$k] = (int) ($temp - self::$baseFull * $carry);
+            }
+
+            $product_value[$k] = $carry;
+        }
+
+        return $product_value;
+    }
+
+    /**
+     * Performs Karatsuba multiplication on two BigIntegers
+     *
+     * See {@link http://en.wikipedia.org/wiki/Karatsuba_algorithm Karatsuba algorithm} and
+     * {@link http://math.libtomcrypt.com/files/tommath.pdf#page=120 MPM 5.2.3}.
+     *
+     * @param array $x_value
+     * @param array $y_value
+     * @return array
+     * @access private
+     */
+    function _karatsuba($x_value, $y_value)
+    {
+        $m = min(count($x_value) >> 1, count($y_value) >> 1);
+
+        if ($m < self::KARATSUBA_CUTOFF) {
+            return $this->_regularMultiply($x_value, $y_value);
+        }
+
+        $x1 = array_slice($x_value, $m);
+        $x0 = array_slice($x_value, 0, $m);
+        $y1 = array_slice($y_value, $m);
+        $y0 = array_slice($y_value, 0, $m);
+
+        $z2 = $this->_karatsuba($x1, $y1);
+        $z0 = $this->_karatsuba($x0, $y0);
+
+        $z1 = $this->_add($x1, false, $x0, false);
+        $temp = $this->_add($y1, false, $y0, false);
+        $z1 = $this->_karatsuba($z1[self::VALUE], $temp[self::VALUE]);
+        $temp = $this->_add($z2, false, $z0, false);
+        $z1 = $this->_subtract($z1, false, $temp[self::VALUE], false);
+
+        $z2 = array_merge(array_fill(0, 2 * $m, 0), $z2);
+        $z1[self::VALUE] = array_merge(array_fill(0, $m, 0), $z1[self::VALUE]);
+
+        $xy = $this->_add($z2, false, $z1[self::VALUE], $z1[self::SIGN]);
+        $xy = $this->_add($xy[self::VALUE], $xy[self::SIGN], $z0, false);
+
+        return $xy[self::VALUE];
+    }
+
+    /**
+     * Performs squaring
+     *
+     * @param array $x
+     * @return array
+     * @access private
+     */
+    function _square($x = false)
+    {
+        return count($x) < 2 * self::KARATSUBA_CUTOFF ?
+            $this->_trim($this->_baseSquare($x)) :
+            $this->_trim($this->_karatsubaSquare($x));
+    }
+
+    /**
+     * Performs traditional squaring on two BigIntegers
+     *
+     * Squaring can be done faster than multiplying a number by itself can be.  See
+     * {@link http://www.cacr.math.uwaterloo.ca/hac/about/chap14.pdf#page=7 HAC 14.2.4} /
+     * {@link http://math.libtomcrypt.com/files/tommath.pdf#page=141 MPM 5.3} for more information.
+     *
+     * @param array $value
+     * @return array
+     * @access private
+     */
+    function _baseSquare($value)
+    {
+        if (empty($value)) {
+            return array();
+        }
+        $square_value = $this->_array_repeat(0, 2 * count($value));
+
+        for ($i = 0, $max_index = count($value) - 1; $i <= $max_index; ++$i) {
+            $i2 = $i << 1;
+
+            $temp = $square_value[$i2] + $value[$i] * $value[$i];
+            $carry = self::$base === 26 ? intval($temp / 0x4000000) : ($temp >> 31);
+            $square_value[$i2] = (int) ($temp - self::$baseFull * $carry);
+
+            // note how we start from $i+1 instead of 0 as we do in multiplication.
+            for ($j = $i + 1, $k = $i2 + 1; $j <= $max_index; ++$j, ++$k) {
+                $temp = $square_value[$k] + 2 * $value[$j] * $value[$i] + $carry;
+                $carry = self::$base === 26 ? intval($temp / 0x4000000) : ($temp >> 31);
+                $square_value[$k] = (int) ($temp - self::$baseFull * $carry);
+            }
+
+            // the following line can yield values larger 2**15.  at this point, PHP should switch
+            // over to floats.
+            $square_value[$i + $max_index + 1] = $carry;
+        }
+
+        return $square_value;
+    }
+
+    /**
+     * Performs Karatsuba "squaring" on two BigIntegers
+     *
+     * See {@link http://en.wikipedia.org/wiki/Karatsuba_algorithm Karatsuba algorithm} and
+     * {@link http://math.libtomcrypt.com/files/tommath.pdf#page=151 MPM 5.3.4}.
+     *
+     * @param array $value
+     * @return array
+     * @access private
+     */
+    function _karatsubaSquare($value)
+    {
+        $m = count($value) >> 1;
+
+        if ($m < self::KARATSUBA_CUTOFF) {
+            return $this->_baseSquare($value);
+        }
+
+        $x1 = array_slice($value, $m);
+        $x0 = array_slice($value, 0, $m);
+
+        $z2 = $this->_karatsubaSquare($x1);
+        $z0 = $this->_karatsubaSquare($x0);
+
+        $z1 = $this->_add($x1, false, $x0, false);
+        $z1 = $this->_karatsubaSquare($z1[self::VALUE]);
+        $temp = $this->_add($z2, false, $z0, false);
+        $z1 = $this->_subtract($z1, false, $temp[self::VALUE], false);
+
+        $z2 = array_merge(array_fill(0, 2 * $m, 0), $z2);
+        $z1[self::VALUE] = array_merge(array_fill(0, $m, 0), $z1[self::VALUE]);
+
+        $xx = $this->_add($z2, false, $z1[self::VALUE], $z1[self::SIGN]);
+        $xx = $this->_add($xx[self::VALUE], $xx[self::SIGN], $z0, false);
+
+        return $xx[self::VALUE];
     }
 
     /**
@@ -287,8 +1388,8 @@ class BigInteger implements \JsonSerializable
      * Here's an example:
      * <code>
      * <?php
-     *    $a = new \phpseclib3\Math\BigInteger('10');
-     *    $b = new \phpseclib3\Math\BigInteger('20');
+     *    $a = new \phpseclib\Math\BigInteger('10');
+     *    $b = new \phpseclib\Math\BigInteger('20');
      *
      *    list($quotient, $remainder) = $a->divide($b);
      *
@@ -298,16 +1399,1013 @@ class BigInteger implements \JsonSerializable
      * ?>
      * </code>
      *
-     * @param BigInteger $y
-     * @return BigInteger[]
+     * @param \phpseclib\Math\BigInteger $y
+     * @return array
+     * @access public
+     * @internal This function is based off of {@link http://www.cacr.math.uwaterloo.ca/hac/about/chap14.pdf#page=9 HAC 14.20}.
      */
-    public function divide(BigInteger $y)
+    function divide($y)
     {
-        list($q, $r) = $this->value->divide($y->value);
-        return [
-            new static($q),
-            new static($r)
-        ];
+        switch (MATH_BIGINTEGER_MODE) {
+            case self::MODE_GMP:
+                $quotient = new static();
+                $remainder = new static();
+
+                list($quotient->value, $remainder->value) = gmp_div_qr($this->value, $y->value);
+
+                if (gmp_sign($remainder->value) < 0) {
+                    $remainder->value = gmp_add($remainder->value, gmp_abs($y->value));
+                }
+
+                return array($this->_normalize($quotient), $this->_normalize($remainder));
+            case self::MODE_BCMATH:
+                $quotient = new static();
+                $remainder = new static();
+
+                $quotient->value = bcdiv($this->value, $y->value, 0);
+                $remainder->value = bcmod($this->value, $y->value);
+
+                if ($remainder->value[0] == '-') {
+                    $remainder->value = bcadd($remainder->value, $y->value[0] == '-' ? substr($y->value, 1) : $y->value, 0);
+                }
+
+                return array($this->_normalize($quotient), $this->_normalize($remainder));
+        }
+
+        if (count($y->value) == 1) {
+            list($q, $r) = $this->_divide_digit($this->value, $y->value[0]);
+            $quotient = new static();
+            $remainder = new static();
+            $quotient->value = $q;
+            $remainder->value = array($r);
+            $quotient->is_negative = $this->is_negative != $y->is_negative;
+            return array($this->_normalize($quotient), $this->_normalize($remainder));
+        }
+
+        static $zero;
+        if (!isset($zero)) {
+            $zero = new static();
+        }
+
+        $x = $this->copy();
+        $y = $y->copy();
+
+        $x_sign = $x->is_negative;
+        $y_sign = $y->is_negative;
+
+        $x->is_negative = $y->is_negative = false;
+
+        $diff = $x->compare($y);
+
+        if (!$diff) {
+            $temp = new static();
+            $temp->value = array(1);
+            $temp->is_negative = $x_sign != $y_sign;
+            return array($this->_normalize($temp), $this->_normalize(new static()));
+        }
+
+        if ($diff < 0) {
+            // if $x is negative, "add" $y.
+            if ($x_sign) {
+                $x = $y->subtract($x);
+            }
+            return array($this->_normalize(new static()), $this->_normalize($x));
+        }
+
+        // normalize $x and $y as described in HAC 14.23 / 14.24
+        $msb = $y->value[count($y->value) - 1];
+        for ($shift = 0; !($msb & self::$msb); ++$shift) {
+            $msb <<= 1;
+        }
+        $x->_lshift($shift);
+        $y->_lshift($shift);
+        $y_value = &$y->value;
+
+        $x_max = count($x->value) - 1;
+        $y_max = count($y->value) - 1;
+
+        $quotient = new static();
+        $quotient_value = &$quotient->value;
+        $quotient_value = $this->_array_repeat(0, $x_max - $y_max + 1);
+
+        static $temp, $lhs, $rhs;
+        if (!isset($temp)) {
+            $temp = new static();
+            $lhs =  new static();
+            $rhs =  new static();
+        }
+        $temp_value = &$temp->value;
+        $rhs_value =  &$rhs->value;
+
+        // $temp = $y << ($x_max - $y_max-1) in base 2**26
+        $temp_value = array_merge($this->_array_repeat(0, $x_max - $y_max), $y_value);
+
+        while ($x->compare($temp) >= 0) {
+            // calculate the "common residue"
+            ++$quotient_value[$x_max - $y_max];
+            $x = $x->subtract($temp);
+            $x_max = count($x->value) - 1;
+        }
+
+        for ($i = $x_max; $i >= $y_max + 1; --$i) {
+            $x_value = &$x->value;
+            $x_window = array(
+                isset($x_value[$i]) ? $x_value[$i] : 0,
+                isset($x_value[$i - 1]) ? $x_value[$i - 1] : 0,
+                isset($x_value[$i - 2]) ? $x_value[$i - 2] : 0
+            );
+            $y_window = array(
+                $y_value[$y_max],
+                ($y_max > 0) ? $y_value[$y_max - 1] : 0
+            );
+
+            $q_index = $i - $y_max - 1;
+            if ($x_window[0] == $y_window[0]) {
+                $quotient_value[$q_index] = self::$maxDigit;
+            } else {
+                $quotient_value[$q_index] = $this->_safe_divide(
+                    $x_window[0] * self::$baseFull + $x_window[1],
+                    $y_window[0]
+                );
+            }
+
+            $temp_value = array($y_window[1], $y_window[0]);
+
+            $lhs->value = array($quotient_value[$q_index]);
+            $lhs = $lhs->multiply($temp);
+
+            $rhs_value = array($x_window[2], $x_window[1], $x_window[0]);
+
+            while ($lhs->compare($rhs) > 0) {
+                --$quotient_value[$q_index];
+
+                $lhs->value = array($quotient_value[$q_index]);
+                $lhs = $lhs->multiply($temp);
+            }
+
+            $adjust = $this->_array_repeat(0, $q_index);
+            $temp_value = array($quotient_value[$q_index]);
+            $temp = $temp->multiply($y);
+            $temp_value = &$temp->value;
+            $temp_value = array_merge($adjust, $temp_value);
+
+            $x = $x->subtract($temp);
+
+            if ($x->compare($zero) < 0) {
+                $temp_value = array_merge($adjust, $y_value);
+                $x = $x->add($temp);
+
+                --$quotient_value[$q_index];
+            }
+
+            $x_max = count($x_value) - 1;
+        }
+
+        // unnormalize the remainder
+        $x->_rshift($shift);
+
+        $quotient->is_negative = $x_sign != $y_sign;
+
+        // calculate the "common residue", if appropriate
+        if ($x_sign) {
+            $y->_rshift($shift);
+            $x = $y->subtract($x);
+        }
+
+        return array($this->_normalize($quotient), $this->_normalize($x));
+    }
+
+    /**
+     * Divides a BigInteger by a regular integer
+     *
+     * abc / x = a00 / x + b0 / x + c / x
+     *
+     * @param array $dividend
+     * @param array $divisor
+     * @return array
+     * @access private
+     */
+    function _divide_digit($dividend, $divisor)
+    {
+        $carry = 0;
+        $result = array();
+
+        for ($i = count($dividend) - 1; $i >= 0; --$i) {
+            $temp = self::$baseFull * $carry + $dividend[$i];
+            $result[$i] = $this->_safe_divide($temp, $divisor);
+            $carry = (int) ($temp - $divisor * $result[$i]);
+        }
+
+        return array($result, $carry);
+    }
+
+    /**
+     * Performs modular exponentiation.
+     *
+     * Here's an example:
+     * <code>
+     * <?php
+     *    $a = new \phpseclib\Math\BigInteger('10');
+     *    $b = new \phpseclib\Math\BigInteger('20');
+     *    $c = new \phpseclib\Math\BigInteger('30');
+     *
+     *    $c = $a->modPow($b, $c);
+     *
+     *    echo $c->toString(); // outputs 10
+     * ?>
+     * </code>
+     *
+     * @param \phpseclib\Math\BigInteger $e
+     * @param \phpseclib\Math\BigInteger $n
+     * @return \phpseclib\Math\BigInteger
+     * @access public
+     * @internal The most naive approach to modular exponentiation has very unreasonable requirements, and
+     *    and although the approach involving repeated squaring does vastly better, it, too, is impractical
+     *    for our purposes.  The reason being that division - by far the most complicated and time-consuming
+     *    of the basic operations (eg. +,-,*,/) - occurs multiple times within it.
+     *
+     *    Modular reductions resolve this issue.  Although an individual modular reduction takes more time
+     *    then an individual division, when performed in succession (with the same modulo), they're a lot faster.
+     *
+     *    The two most commonly used modular reductions are Barrett and Montgomery reduction.  Montgomery reduction,
+     *    although faster, only works when the gcd of the modulo and of the base being used is 1.  In RSA, when the
+     *    base is a power of two, the modulo - a product of two primes - is always going to have a gcd of 1 (because
+     *    the product of two odd numbers is odd), but what about when RSA isn't used?
+     *
+     *    In contrast, Barrett reduction has no such constraint.  As such, some bigint implementations perform a
+     *    Barrett reduction after every operation in the modpow function.  Others perform Barrett reductions when the
+     *    modulo is even and Montgomery reductions when the modulo is odd.  BigInteger.java's modPow method, however,
+     *    uses a trick involving the Chinese Remainder Theorem to factor the even modulo into two numbers - one odd and
+     *    the other, a power of two - and recombine them, later.  This is the method that this modPow function uses.
+     *    {@link http://islab.oregonstate.edu/papers/j34monex.pdf Montgomery Reduction with Even Modulus} elaborates.
+     */
+    function modPow($e, $n)
+    {
+        $n = $this->bitmask !== false && $this->bitmask->compare($n) < 0 ? $this->bitmask : $n->abs();
+
+        if ($e->compare(new static()) < 0) {
+            $e = $e->abs();
+
+            $temp = $this->modInverse($n);
+            if ($temp === false) {
+                return false;
+            }
+
+            return $this->_normalize($temp->modPow($e, $n));
+        }
+
+        if (MATH_BIGINTEGER_MODE == self::MODE_GMP) {
+            $temp = new static();
+            $temp->value = gmp_powm($this->value, $e->value, $n->value);
+
+            return $this->_normalize($temp);
+        }
+
+        if ($this->compare(new static()) < 0 || $this->compare($n) > 0) {
+            list(, $temp) = $this->divide($n);
+            return $temp->modPow($e, $n);
+        }
+
+        if (defined('MATH_BIGINTEGER_OPENSSL_ENABLED')) {
+            $components = array(
+                'modulus' => $n->toBytes(true),
+                'publicExponent' => $e->toBytes(true)
+            );
+
+            $components = array(
+                'modulus' => pack('Ca*a*', 2, $this->_encodeASN1Length(strlen($components['modulus'])), $components['modulus']),
+                'publicExponent' => pack('Ca*a*', 2, $this->_encodeASN1Length(strlen($components['publicExponent'])), $components['publicExponent'])
+            );
+
+            $RSAPublicKey = pack(
+                'Ca*a*a*',
+                48,
+                $this->_encodeASN1Length(strlen($components['modulus']) + strlen($components['publicExponent'])),
+                $components['modulus'],
+                $components['publicExponent']
+            );
+
+            $rsaOID = pack('H*', '300d06092a864886f70d0101010500'); // hex version of MA0GCSqGSIb3DQEBAQUA
+            $RSAPublicKey = chr(0) . $RSAPublicKey;
+            $RSAPublicKey = chr(3) . $this->_encodeASN1Length(strlen($RSAPublicKey)) . $RSAPublicKey;
+
+            $encapsulated = pack(
+                'Ca*a*',
+                48,
+                $this->_encodeASN1Length(strlen($rsaOID . $RSAPublicKey)),
+                $rsaOID . $RSAPublicKey
+            );
+
+            $RSAPublicKey = "-----BEGIN PUBLIC KEY-----\r\n" .
+                             chunk_split(base64_encode($encapsulated)) .
+                             '-----END PUBLIC KEY-----';
+
+            $plaintext = str_pad($this->toBytes(), strlen($n->toBytes(true)) - 1, "\0", STR_PAD_LEFT);
+
+            if (openssl_public_encrypt($plaintext, $result, $RSAPublicKey, OPENSSL_NO_PADDING)) {
+                return new static($result, 256);
+            }
+        }
+
+        if (MATH_BIGINTEGER_MODE == self::MODE_BCMATH) {
+            $temp = new static();
+            $temp->value = bcpowmod($this->value, $e->value, $n->value, 0);
+
+            return $this->_normalize($temp);
+        }
+
+        if (empty($e->value)) {
+            $temp = new static();
+            $temp->value = array(1);
+            return $this->_normalize($temp);
+        }
+
+        if ($e->value == array(1)) {
+            list(, $temp) = $this->divide($n);
+            return $this->_normalize($temp);
+        }
+
+        if ($e->value == array(2)) {
+            $temp = new static();
+            $temp->value = $this->_square($this->value);
+            list(, $temp) = $temp->divide($n);
+            return $this->_normalize($temp);
+        }
+
+        return $this->_normalize($this->_slidingWindow($e, $n, self::BARRETT));
+
+        // the following code, although not callable, can be run independently of the above code
+        // although the above code performed better in my benchmarks the following could might
+        // perform better under different circumstances. in lieu of deleting it it's just been
+        // made uncallable
+
+        // is the modulo odd?
+        if ($n->value[0] & 1) {
+            return $this->_normalize($this->_slidingWindow($e, $n, self::MONTGOMERY));
+        }
+        // if it's not, it's even
+
+        // find the lowest set bit (eg. the max pow of 2 that divides $n)
+        for ($i = 0; $i < count($n->value); ++$i) {
+            if ($n->value[$i]) {
+                $temp = decbin($n->value[$i]);
+                $j = strlen($temp) - strrpos($temp, '1') - 1;
+                $j+= 26 * $i;
+                break;
+            }
+        }
+        // at this point, 2^$j * $n/(2^$j) == $n
+
+        $mod1 = $n->copy();
+        $mod1->_rshift($j);
+        $mod2 = new static();
+        $mod2->value = array(1);
+        $mod2->_lshift($j);
+
+        $part1 = ($mod1->value != array(1)) ? $this->_slidingWindow($e, $mod1, self::MONTGOMERY) : new static();
+        $part2 = $this->_slidingWindow($e, $mod2, self::POWEROF2);
+
+        $y1 = $mod2->modInverse($mod1);
+        $y2 = $mod1->modInverse($mod2);
+
+        $result = $part1->multiply($mod2);
+        $result = $result->multiply($y1);
+
+        $temp = $part2->multiply($mod1);
+        $temp = $temp->multiply($y2);
+
+        $result = $result->add($temp);
+        list(, $result) = $result->divide($n);
+
+        return $this->_normalize($result);
+    }
+
+    /**
+     * Performs modular exponentiation.
+     *
+     * Alias for modPow().
+     *
+     * @param \phpseclib\Math\BigInteger $e
+     * @param \phpseclib\Math\BigInteger $n
+     * @return \phpseclib\Math\BigInteger
+     * @access public
+     */
+    function powMod($e, $n)
+    {
+        return $this->modPow($e, $n);
+    }
+
+    /**
+     * Sliding Window k-ary Modular Exponentiation
+     *
+     * Based on {@link http://www.cacr.math.uwaterloo.ca/hac/about/chap14.pdf#page=27 HAC 14.85} /
+     * {@link http://math.libtomcrypt.com/files/tommath.pdf#page=210 MPM 7.7}.  In a departure from those algorithims,
+     * however, this function performs a modular reduction after every multiplication and squaring operation.
+     * As such, this function has the same preconditions that the reductions being used do.
+     *
+     * @param \phpseclib\Math\BigInteger $e
+     * @param \phpseclib\Math\BigInteger $n
+     * @param int $mode
+     * @return \phpseclib\Math\BigInteger
+     * @access private
+     */
+    function _slidingWindow($e, $n, $mode)
+    {
+        static $window_ranges = array(7, 25, 81, 241, 673, 1793); // from BigInteger.java's oddModPow function
+        //static $window_ranges = array(0, 7, 36, 140, 450, 1303, 3529); // from MPM 7.3.1
+
+        $e_value = $e->value;
+        $e_length = count($e_value) - 1;
+        $e_bits = decbin($e_value[$e_length]);
+        for ($i = $e_length - 1; $i >= 0; --$i) {
+            $e_bits.= str_pad(decbin($e_value[$i]), self::$base, '0', STR_PAD_LEFT);
+        }
+
+        $e_length = strlen($e_bits);
+
+        // calculate the appropriate window size.
+        // $window_size == 3 if $window_ranges is between 25 and 81, for example.
+        for ($i = 0, $window_size = 1; $i < count($window_ranges) && $e_length > $window_ranges[$i]; ++$window_size, ++$i) {
+        }
+
+        $n_value = $n->value;
+
+        // precompute $this^0 through $this^$window_size
+        $powers = array();
+        $powers[1] = $this->_prepareReduce($this->value, $n_value, $mode);
+        $powers[2] = $this->_squareReduce($powers[1], $n_value, $mode);
+
+        // we do every other number since substr($e_bits, $i, $j+1) (see below) is supposed to end
+        // in a 1.  ie. it's supposed to be odd.
+        $temp = 1 << ($window_size - 1);
+        for ($i = 1; $i < $temp; ++$i) {
+            $i2 = $i << 1;
+            $powers[$i2 + 1] = $this->_multiplyReduce($powers[$i2 - 1], $powers[2], $n_value, $mode);
+        }
+
+        $result = array(1);
+        $result = $this->_prepareReduce($result, $n_value, $mode);
+
+        for ($i = 0; $i < $e_length;) {
+            if (!$e_bits[$i]) {
+                $result = $this->_squareReduce($result, $n_value, $mode);
+                ++$i;
+            } else {
+                for ($j = $window_size - 1; $j > 0; --$j) {
+                    if (!empty($e_bits[$i + $j])) {
+                        break;
+                    }
+                }
+
+                // eg. the length of substr($e_bits, $i, $j + 1)
+                for ($k = 0; $k <= $j; ++$k) {
+                    $result = $this->_squareReduce($result, $n_value, $mode);
+                }
+
+                $result = $this->_multiplyReduce($result, $powers[bindec(substr($e_bits, $i, $j + 1))], $n_value, $mode);
+
+                $i += $j + 1;
+            }
+        }
+
+        $temp = new static();
+        $temp->value = $this->_reduce($result, $n_value, $mode);
+
+        return $temp;
+    }
+
+    /**
+     * Modular reduction
+     *
+     * For most $modes this will return the remainder.
+     *
+     * @see self::_slidingWindow()
+     * @access private
+     * @param array $x
+     * @param array $n
+     * @param int $mode
+     * @return array
+     */
+    function _reduce($x, $n, $mode)
+    {
+        switch ($mode) {
+            case self::MONTGOMERY:
+                return $this->_montgomery($x, $n);
+            case self::BARRETT:
+                return $this->_barrett($x, $n);
+            case self::POWEROF2:
+                $lhs = new static();
+                $lhs->value = $x;
+                $rhs = new static();
+                $rhs->value = $n;
+                return $x->_mod2($n);
+            case self::CLASSIC:
+                $lhs = new static();
+                $lhs->value = $x;
+                $rhs = new static();
+                $rhs->value = $n;
+                list(, $temp) = $lhs->divide($rhs);
+                return $temp->value;
+            case self::NONE:
+                return $x;
+            default:
+                // an invalid $mode was provided
+        }
+    }
+
+    /**
+     * Modular reduction preperation
+     *
+     * @see self::_slidingWindow()
+     * @access private
+     * @param array $x
+     * @param array $n
+     * @param int $mode
+     * @return array
+     */
+    function _prepareReduce($x, $n, $mode)
+    {
+        if ($mode == self::MONTGOMERY) {
+            return $this->_prepMontgomery($x, $n);
+        }
+        return $this->_reduce($x, $n, $mode);
+    }
+
+    /**
+     * Modular multiply
+     *
+     * @see self::_slidingWindow()
+     * @access private
+     * @param array $x
+     * @param array $y
+     * @param array $n
+     * @param int $mode
+     * @return array
+     */
+    function _multiplyReduce($x, $y, $n, $mode)
+    {
+        if ($mode == self::MONTGOMERY) {
+            return $this->_montgomeryMultiply($x, $y, $n);
+        }
+        $temp = $this->_multiply($x, false, $y, false);
+        return $this->_reduce($temp[self::VALUE], $n, $mode);
+    }
+
+    /**
+     * Modular square
+     *
+     * @see self::_slidingWindow()
+     * @access private
+     * @param array $x
+     * @param array $n
+     * @param int $mode
+     * @return array
+     */
+    function _squareReduce($x, $n, $mode)
+    {
+        if ($mode == self::MONTGOMERY) {
+            return $this->_montgomeryMultiply($x, $x, $n);
+        }
+        return $this->_reduce($this->_square($x), $n, $mode);
+    }
+
+    /**
+     * Modulos for Powers of Two
+     *
+     * Calculates $x%$n, where $n = 2**$e, for some $e.  Since this is basically the same as doing $x & ($n-1),
+     * we'll just use this function as a wrapper for doing that.
+     *
+     * @see self::_slidingWindow()
+     * @access private
+     * @param \phpseclib\Math\BigInteger
+     * @return \phpseclib\Math\BigInteger
+     */
+    function _mod2($n)
+    {
+        $temp = new static();
+        $temp->value = array(1);
+        return $this->bitwise_and($n->subtract($temp));
+    }
+
+    /**
+     * Barrett Modular Reduction
+     *
+     * See {@link http://www.cacr.math.uwaterloo.ca/hac/about/chap14.pdf#page=14 HAC 14.3.3} /
+     * {@link http://math.libtomcrypt.com/files/tommath.pdf#page=165 MPM 6.2.5} for more information.  Modified slightly,
+     * so as not to require negative numbers (initially, this script didn't support negative numbers).
+     *
+     * Employs "folding", as described at
+     * {@link http://www.cosic.esat.kuleuven.be/publications/thesis-149.pdf#page=66 thesis-149.pdf#page=66}.  To quote from
+     * it, "the idea [behind folding] is to find a value x' such that x (mod m) = x' (mod m), with x' being smaller than x."
+     *
+     * Unfortunately, the "Barrett Reduction with Folding" algorithm described in thesis-149.pdf is not, as written, all that
+     * usable on account of (1) its not using reasonable radix points as discussed in
+     * {@link http://math.libtomcrypt.com/files/tommath.pdf#page=162 MPM 6.2.2} and (2) the fact that, even with reasonable
+     * radix points, it only works when there are an even number of digits in the denominator.  The reason for (2) is that
+     * (x >> 1) + (x >> 1) != x / 2 + x / 2.  If x is even, they're the same, but if x is odd, they're not.  See the in-line
+     * comments for details.
+     *
+     * @see self::_slidingWindow()
+     * @access private
+     * @param array $n
+     * @param array $m
+     * @return array
+     */
+    function _barrett($n, $m)
+    {
+        static $cache = array(
+            self::VARIABLE => array(),
+            self::DATA => array()
+        );
+
+        $m_length = count($m);
+
+        // if ($this->_compare($n, $this->_square($m)) >= 0) {
+        if (count($n) > 2 * $m_length) {
+            $lhs = new static();
+            $rhs = new static();
+            $lhs->value = $n;
+            $rhs->value = $m;
+            list(, $temp) = $lhs->divide($rhs);
+            return $temp->value;
+        }
+
+        // if (m.length >> 1) + 2 <= m.length then m is too small and n can't be reduced
+        if ($m_length < 5) {
+            return $this->_regularBarrett($n, $m);
+        }
+
+        // n = 2 * m.length
+
+        if (($key = array_search($m, $cache[self::VARIABLE])) === false) {
+            $key = count($cache[self::VARIABLE]);
+            $cache[self::VARIABLE][] = $m;
+
+            $lhs = new static();
+            $lhs_value = &$lhs->value;
+            $lhs_value = $this->_array_repeat(0, $m_length + ($m_length >> 1));
+            $lhs_value[] = 1;
+            $rhs = new static();
+            $rhs->value = $m;
+
+            list($u, $m1) = $lhs->divide($rhs);
+            $u = $u->value;
+            $m1 = $m1->value;
+
+            $cache[self::DATA][] = array(
+                'u' => $u, // m.length >> 1 (technically (m.length >> 1) + 1)
+                'm1'=> $m1 // m.length
+            );
+        } else {
+            extract($cache[self::DATA][$key]);
+        }
+
+        $cutoff = $m_length + ($m_length >> 1);
+        $lsd = array_slice($n, 0, $cutoff); // m.length + (m.length >> 1)
+        $msd = array_slice($n, $cutoff);    // m.length >> 1
+        $lsd = $this->_trim($lsd);
+        $temp = $this->_multiply($msd, false, $m1, false);
+        $n = $this->_add($lsd, false, $temp[self::VALUE], false); // m.length + (m.length >> 1) + 1
+
+        if ($m_length & 1) {
+            return $this->_regularBarrett($n[self::VALUE], $m);
+        }
+
+        // (m.length + (m.length >> 1) + 1) - (m.length - 1) == (m.length >> 1) + 2
+        $temp = array_slice($n[self::VALUE], $m_length - 1);
+        // if even: ((m.length >> 1) + 2) + (m.length >> 1) == m.length + 2
+        // if odd:  ((m.length >> 1) + 2) + (m.length >> 1) == (m.length - 1) + 2 == m.length + 1
+        $temp = $this->_multiply($temp, false, $u, false);
+        // if even: (m.length + 2) - ((m.length >> 1) + 1) = m.length - (m.length >> 1) + 1
+        // if odd:  (m.length + 1) - ((m.length >> 1) + 1) = m.length - (m.length >> 1)
+        $temp = array_slice($temp[self::VALUE], ($m_length >> 1) + 1);
+        // if even: (m.length - (m.length >> 1) + 1) + m.length = 2 * m.length - (m.length >> 1) + 1
+        // if odd:  (m.length - (m.length >> 1)) + m.length     = 2 * m.length - (m.length >> 1)
+        $temp = $this->_multiply($temp, false, $m, false);
+
+        // at this point, if m had an odd number of digits, we'd be subtracting a 2 * m.length - (m.length >> 1) digit
+        // number from a m.length + (m.length >> 1) + 1 digit number.  ie. there'd be an extra digit and the while loop
+        // following this comment would loop a lot (hence our calling _regularBarrett() in that situation).
+
+        $result = $this->_subtract($n[self::VALUE], false, $temp[self::VALUE], false);
+
+        while ($this->_compare($result[self::VALUE], $result[self::SIGN], $m, false) >= 0) {
+            $result = $this->_subtract($result[self::VALUE], $result[self::SIGN], $m, false);
+        }
+
+        return $result[self::VALUE];
+    }
+
+    /**
+     * (Regular) Barrett Modular Reduction
+     *
+     * For numbers with more than four digits BigInteger::_barrett() is faster.  The difference between that and this
+     * is that this function does not fold the denominator into a smaller form.
+     *
+     * @see self::_slidingWindow()
+     * @access private
+     * @param array $x
+     * @param array $n
+     * @return array
+     */
+    function _regularBarrett($x, $n)
+    {
+        static $cache = array(
+            self::VARIABLE => array(),
+            self::DATA => array()
+        );
+
+        $n_length = count($n);
+
+        if (count($x) > 2 * $n_length) {
+            $lhs = new static();
+            $rhs = new static();
+            $lhs->value = $x;
+            $rhs->value = $n;
+            list(, $temp) = $lhs->divide($rhs);
+            return $temp->value;
+        }
+
+        if (($key = array_search($n, $cache[self::VARIABLE])) === false) {
+            $key = count($cache[self::VARIABLE]);
+            $cache[self::VARIABLE][] = $n;
+            $lhs = new static();
+            $lhs_value = &$lhs->value;
+            $lhs_value = $this->_array_repeat(0, 2 * $n_length);
+            $lhs_value[] = 1;
+            $rhs = new static();
+            $rhs->value = $n;
+            list($temp, ) = $lhs->divide($rhs); // m.length
+            $cache[self::DATA][] = $temp->value;
+        }
+
+        // 2 * m.length - (m.length - 1) = m.length + 1
+        $temp = array_slice($x, $n_length - 1);
+        // (m.length + 1) + m.length = 2 * m.length + 1
+        $temp = $this->_multiply($temp, false, $cache[self::DATA][$key], false);
+        // (2 * m.length + 1) - (m.length - 1) = m.length + 2
+        $temp = array_slice($temp[self::VALUE], $n_length + 1);
+
+        // m.length + 1
+        $result = array_slice($x, 0, $n_length + 1);
+        // m.length + 1
+        $temp = $this->_multiplyLower($temp, false, $n, false, $n_length + 1);
+        // $temp == array_slice($temp->_multiply($temp, false, $n, false)->value, 0, $n_length + 1)
+
+        if ($this->_compare($result, false, $temp[self::VALUE], $temp[self::SIGN]) < 0) {
+            $corrector_value = $this->_array_repeat(0, $n_length + 1);
+            $corrector_value[count($corrector_value)] = 1;
+            $result = $this->_add($result, false, $corrector_value, false);
+            $result = $result[self::VALUE];
+        }
+
+        // at this point, we're subtracting a number with m.length + 1 digits from another number with m.length + 1 digits
+        $result = $this->_subtract($result, false, $temp[self::VALUE], $temp[self::SIGN]);
+        while ($this->_compare($result[self::VALUE], $result[self::SIGN], $n, false) > 0) {
+            $result = $this->_subtract($result[self::VALUE], $result[self::SIGN], $n, false);
+        }
+
+        return $result[self::VALUE];
+    }
+
+    /**
+     * Performs long multiplication up to $stop digits
+     *
+     * If you're going to be doing array_slice($product->value, 0, $stop), some cycles can be saved.
+     *
+     * @see self::_regularBarrett()
+     * @param array $x_value
+     * @param bool $x_negative
+     * @param array $y_value
+     * @param bool $y_negative
+     * @param int $stop
+     * @return array
+     * @access private
+     */
+    function _multiplyLower($x_value, $x_negative, $y_value, $y_negative, $stop)
+    {
+        $x_length = count($x_value);
+        $y_length = count($y_value);
+
+        if (!$x_length || !$y_length) { // a 0 is being multiplied
+            return array(
+                self::VALUE => array(),
+                self::SIGN => false
+            );
+        }
+
+        if ($x_length < $y_length) {
+            $temp = $x_value;
+            $x_value = $y_value;
+            $y_value = $temp;
+
+            $x_length = count($x_value);
+            $y_length = count($y_value);
+        }
+
+        $product_value = $this->_array_repeat(0, $x_length + $y_length);
+
+        // the following for loop could be removed if the for loop following it
+        // (the one with nested for loops) initially set $i to 0, but
+        // doing so would also make the result in one set of unnecessary adds,
+        // since on the outermost loops first pass, $product->value[$k] is going
+        // to always be 0
+
+        $carry = 0;
+
+        for ($j = 0; $j < $x_length; ++$j) { // ie. $i = 0, $k = $i
+            $temp = $x_value[$j] * $y_value[0] + $carry; // $product_value[$k] == 0
+            $carry = self::$base === 26 ? intval($temp / 0x4000000) : ($temp >> 31);
+            $product_value[$j] = (int) ($temp - self::$baseFull * $carry);
+        }
+
+        if ($j < $stop) {
+            $product_value[$j] = $carry;
+        }
+
+        // the above for loop is what the previous comment was talking about.  the
+        // following for loop is the "one with nested for loops"
+
+        for ($i = 1; $i < $y_length; ++$i) {
+            $carry = 0;
+
+            for ($j = 0, $k = $i; $j < $x_length && $k < $stop; ++$j, ++$k) {
+                $temp = $product_value[$k] + $x_value[$j] * $y_value[$i] + $carry;
+                $carry = self::$base === 26 ? intval($temp / 0x4000000) : ($temp >> 31);
+                $product_value[$k] = (int) ($temp - self::$baseFull * $carry);
+            }
+
+            if ($k < $stop) {
+                $product_value[$k] = $carry;
+            }
+        }
+
+        return array(
+            self::VALUE => $this->_trim($product_value),
+            self::SIGN => $x_negative != $y_negative
+        );
+    }
+
+    /**
+     * Montgomery Modular Reduction
+     *
+     * ($x->_prepMontgomery($n))->_montgomery($n) yields $x % $n.
+     * {@link http://math.libtomcrypt.com/files/tommath.pdf#page=170 MPM 6.3} provides insights on how this can be
+     * improved upon (basically, by using the comba method).  gcd($n, 2) must be equal to one for this function
+     * to work correctly.
+     *
+     * @see self::_prepMontgomery()
+     * @see self::_slidingWindow()
+     * @access private
+     * @param array $x
+     * @param array $n
+     * @return array
+     */
+    function _montgomery($x, $n)
+    {
+        static $cache = array(
+            self::VARIABLE => array(),
+            self::DATA => array()
+        );
+
+        if (($key = array_search($n, $cache[self::VARIABLE])) === false) {
+            $key = count($cache[self::VARIABLE]);
+            $cache[self::VARIABLE][] = $x;
+            $cache[self::DATA][] = $this->_modInverse67108864($n);
+        }
+
+        $k = count($n);
+
+        $result = array(self::VALUE => $x);
+
+        for ($i = 0; $i < $k; ++$i) {
+            $temp = $result[self::VALUE][$i] * $cache[self::DATA][$key];
+            $temp = $temp - self::$baseFull * (self::$base === 26 ? intval($temp / 0x4000000) : ($temp >> 31));
+            $temp = $this->_regularMultiply(array($temp), $n);
+            $temp = array_merge($this->_array_repeat(0, $i), $temp);
+            $result = $this->_add($result[self::VALUE], false, $temp, false);
+        }
+
+        $result[self::VALUE] = array_slice($result[self::VALUE], $k);
+
+        if ($this->_compare($result, false, $n, false) >= 0) {
+            $result = $this->_subtract($result[self::VALUE], false, $n, false);
+        }
+
+        return $result[self::VALUE];
+    }
+
+    /**
+     * Montgomery Multiply
+     *
+     * Interleaves the montgomery reduction and long multiplication algorithms together as described in
+     * {@link http://www.cacr.math.uwaterloo.ca/hac/about/chap14.pdf#page=13 HAC 14.36}
+     *
+     * @see self::_prepMontgomery()
+     * @see self::_montgomery()
+     * @access private
+     * @param array $x
+     * @param array $y
+     * @param array $m
+     * @return array
+     */
+    function _montgomeryMultiply($x, $y, $m)
+    {
+        $temp = $this->_multiply($x, false, $y, false);
+        return $this->_montgomery($temp[self::VALUE], $m);
+
+        // the following code, although not callable, can be run independently of the above code
+        // although the above code performed better in my benchmarks the following could might
+        // perform better under different circumstances. in lieu of deleting it it's just been
+        // made uncallable
+
+        static $cache = array(
+            self::VARIABLE => array(),
+            self::DATA => array()
+        );
+
+        if (($key = array_search($m, $cache[self::VARIABLE])) === false) {
+            $key = count($cache[self::VARIABLE]);
+            $cache[self::VARIABLE][] = $m;
+            $cache[self::DATA][] = $this->_modInverse67108864($m);
+        }
+
+        $n = max(count($x), count($y), count($m));
+        $x = array_pad($x, $n, 0);
+        $y = array_pad($y, $n, 0);
+        $m = array_pad($m, $n, 0);
+        $a = array(self::VALUE => $this->_array_repeat(0, $n + 1));
+        for ($i = 0; $i < $n; ++$i) {
+            $temp = $a[self::VALUE][0] + $x[$i] * $y[0];
+            $temp = $temp - self::$baseFull * (self::$base === 26 ? intval($temp / 0x4000000) : ($temp >> 31));
+            $temp = $temp * $cache[self::DATA][$key];
+            $temp = $temp - self::$baseFull * (self::$base === 26 ? intval($temp / 0x4000000) : ($temp >> 31));
+            $temp = $this->_add($this->_regularMultiply(array($x[$i]), $y), false, $this->_regularMultiply(array($temp), $m), false);
+            $a = $this->_add($a[self::VALUE], false, $temp[self::VALUE], false);
+            $a[self::VALUE] = array_slice($a[self::VALUE], 1);
+        }
+        if ($this->_compare($a[self::VALUE], false, $m, false) >= 0) {
+            $a = $this->_subtract($a[self::VALUE], false, $m, false);
+        }
+        return $a[self::VALUE];
+    }
+
+    /**
+     * Prepare a number for use in Montgomery Modular Reductions
+     *
+     * @see self::_montgomery()
+     * @see self::_slidingWindow()
+     * @access private
+     * @param array $x
+     * @param array $n
+     * @return array
+     */
+    function _prepMontgomery($x, $n)
+    {
+        $lhs = new static();
+        $lhs->value = array_merge($this->_array_repeat(0, count($n)), $x);
+        $rhs = new static();
+        $rhs->value = $n;
+
+        list(, $temp) = $lhs->divide($rhs);
+        return $temp->value;
+    }
+
+    /**
+     * Modular Inverse of a number mod 2**26 (eg. 67108864)
+     *
+     * Based off of the bnpInvDigit function implemented and justified in the following URL:
+     *
+     * {@link http://www-cs-students.stanford.edu/~tjw/jsbn/jsbn.js}
+     *
+     * The following URL provides more info:
+     *
+     * {@link http://groups.google.com/group/sci.crypt/msg/7a137205c1be7d85}
+     *
+     * As for why we do all the bitmasking...  strange things can happen when converting from floats to ints. For
+     * instance, on some computers, var_dump((int) -4294967297) yields int(-1) and on others, it yields
+     * int(-2147483648).  To avoid problems stemming from this, we use bitmasks to guarantee that ints aren't
+     * auto-converted to floats.  The outermost bitmask is present because without it, there's no guarantee that
+     * the "residue" returned would be the so-called "common residue".  We use fmod, in the last step, because the
+     * maximum possible $x is 26 bits and the maximum $result is 16 bits.  Thus, we have to be able to handle up to
+     * 40 bits, which only 64-bit floating points will support.
+     *
+     * Thanks to Pedro Gimeno Fortea for input!
+     *
+     * @see self::_montgomery()
+     * @access private
+     * @param array $x
+     * @return int
+     */
+    function _modInverse67108864($x) // 2**26 == 67,108,864
+    {
+        $x = -$x[0];
+        $result = $x & 0x3; // x**-1 mod 2**2
+        $result = ($result * (2 - $x * $result)) & 0xF; // x**-1 mod 2**4
+        $result = ($result * (2 - ($x & 0xFF) * $result))  & 0xFF; // x**-1 mod 2**8
+        $result = ($result * ((2 - ($x & 0xFFFF) * $result) & 0xFFFF)) & 0xFFFF; // x**-1 mod 2**16
+        $result = fmod($result * (2 - fmod($x * $result, self::$baseFull)), self::$baseFull); // x**-1 mod 2**26
+        return $result & self::$maxDigit;
     }
 
     /**
@@ -315,35 +2413,198 @@ class BigInteger implements \JsonSerializable
      *
      * Say you have (30 mod 17 * x mod 17) mod 17 == 1.  x can be found using modular inverses.
      *
-     * @param BigInteger $n
-     * @return BigInteger
+     * Here's an example:
+     * <code>
+     * <?php
+     *    $a = new \phpseclib\Math\BigInteger(30);
+     *    $b = new \phpseclib\Math\BigInteger(17);
+     *
+     *    $c = $a->modInverse($b);
+     *    echo $c->toString(); // outputs 4
+     *
+     *    echo "\r\n";
+     *
+     *    $d = $a->multiply($c);
+     *    list(, $d) = $d->divide($b);
+     *    echo $d; // outputs 1 (as per the definition of modular inverse)
+     * ?>
+     * </code>
+     *
+     * @param \phpseclib\Math\BigInteger $n
+     * @return \phpseclib\Math\BigInteger|false
+     * @access public
+     * @internal See {@link http://www.cacr.math.uwaterloo.ca/hac/about/chap14.pdf#page=21 HAC 14.64} for more information.
      */
-    public function modInverse(BigInteger $n)
+    function modInverse($n)
     {
-        return new static($this->value->modInverse($n->value));
+        switch (MATH_BIGINTEGER_MODE) {
+            case self::MODE_GMP:
+                $temp = new static();
+                $temp->value = gmp_invert($this->value, $n->value);
+
+                return ($temp->value === false) ? false : $this->_normalize($temp);
+        }
+
+        static $zero, $one;
+        if (!isset($zero)) {
+            $zero = new static();
+            $one = new static(1);
+        }
+
+        // $x mod -$n == $x mod $n.
+        $n = $n->abs();
+
+        if ($this->compare($zero) < 0) {
+            $temp = $this->abs();
+            $temp = $temp->modInverse($n);
+            return $this->_normalize($n->subtract($temp));
+        }
+
+        extract($this->extendedGCD($n));
+
+        if (!$gcd->equals($one)) {
+            return false;
+        }
+
+        $x = $x->compare($zero) < 0 ? $x->add($n) : $x;
+
+        return $this->compare($zero) < 0 ? $this->_normalize($n->subtract($x)) : $this->_normalize($x);
     }
 
     /**
-     * Calculates modular inverses.
+     * Calculates the greatest common divisor and Bezout's identity.
      *
-     * Say you have (30 mod 17 * x mod 17) mod 17 == 1.  x can be found using modular inverses.
+     * Say you have 693 and 609.  The GCD is 21.  Bezout's identity states that there exist integers x and y such that
+     * 693*x + 609*y == 21.  In point of fact, there are actually an infinite number of x and y combinations and which
+     * combination is returned is dependent upon which mode is in use.  See
+     * {@link http://en.wikipedia.org/wiki/B%C3%A9zout%27s_identity Bezout's identity - Wikipedia} for more information.
      *
-     * @param BigInteger $n
-     * @return BigInteger[]
+     * Here's an example:
+     * <code>
+     * <?php
+     *    $a = new \phpseclib\Math\BigInteger(693);
+     *    $b = new \phpseclib\Math\BigInteger(609);
+     *
+     *    extract($a->extendedGCD($b));
+     *
+     *    echo $gcd->toString() . "\r\n"; // outputs 21
+     *    echo $a->toString() * $x->toString() + $b->toString() * $y->toString(); // outputs 21
+     * ?>
+     * </code>
+     *
+     * @param \phpseclib\Math\BigInteger $n
+     * @return \phpseclib\Math\BigInteger
+     * @access public
+     * @internal Calculates the GCD using the binary xGCD algorithim described in
+     *    {@link http://www.cacr.math.uwaterloo.ca/hac/about/chap14.pdf#page=19 HAC 14.61}.  As the text above 14.61 notes,
+     *    the more traditional algorithim requires "relatively costly multiple-precision divisions".
      */
-    public function extendedGCD(BigInteger $n)
+    function extendedGCD($n)
     {
-        extract($this->value->extendedGCD($n->value));
-        /**
-         * @var BigInteger $gcd
-         * @var BigInteger $x
-         * @var BigInteger $y
-         */
-        return [
-            'gcd' => new static($gcd),
-            'x' => new static($x),
-            'y' => new static($y)
-        ];
+        switch (MATH_BIGINTEGER_MODE) {
+            case self::MODE_GMP:
+                extract(gmp_gcdext($this->value, $n->value));
+
+                return array(
+                    'gcd' => $this->_normalize(new static($g)),
+                    'x'   => $this->_normalize(new static($s)),
+                    'y'   => $this->_normalize(new static($t))
+                );
+            case self::MODE_BCMATH:
+                // it might be faster to use the binary xGCD algorithim here, as well, but (1) that algorithim works
+                // best when the base is a power of 2 and (2) i don't think it'd make much difference, anyway.  as is,
+                // the basic extended euclidean algorithim is what we're using.
+
+                $u = $this->value;
+                $v = $n->value;
+
+                $a = '1';
+                $b = '0';
+                $c = '0';
+                $d = '1';
+
+                while (bccomp($v, '0', 0) != 0) {
+                    $q = bcdiv($u, $v, 0);
+
+                    $temp = $u;
+                    $u = $v;
+                    $v = bcsub($temp, bcmul($v, $q, 0), 0);
+
+                    $temp = $a;
+                    $a = $c;
+                    $c = bcsub($temp, bcmul($a, $q, 0), 0);
+
+                    $temp = $b;
+                    $b = $d;
+                    $d = bcsub($temp, bcmul($b, $q, 0), 0);
+                }
+
+                return array(
+                    'gcd' => $this->_normalize(new static($u)),
+                    'x'   => $this->_normalize(new static($a)),
+                    'y'   => $this->_normalize(new static($b))
+                );
+        }
+
+        $y = $n->copy();
+        $x = $this->copy();
+        $g = new static();
+        $g->value = array(1);
+
+        while (!(($x->value[0] & 1)|| ($y->value[0] & 1))) {
+            $x->_rshift(1);
+            $y->_rshift(1);
+            $g->_lshift(1);
+        }
+
+        $u = $x->copy();
+        $v = $y->copy();
+
+        $a = new static();
+        $b = new static();
+        $c = new static();
+        $d = new static();
+
+        $a->value = $d->value = $g->value = array(1);
+        $b->value = $c->value = array();
+
+        while (!empty($u->value)) {
+            while (!($u->value[0] & 1)) {
+                $u->_rshift(1);
+                if ((!empty($a->value) && ($a->value[0] & 1)) || (!empty($b->value) && ($b->value[0] & 1))) {
+                    $a = $a->add($y);
+                    $b = $b->subtract($x);
+                }
+                $a->_rshift(1);
+                $b->_rshift(1);
+            }
+
+            while (!($v->value[0] & 1)) {
+                $v->_rshift(1);
+                if ((!empty($d->value) && ($d->value[0] & 1)) || (!empty($c->value) && ($c->value[0] & 1))) {
+                    $c = $c->add($y);
+                    $d = $d->subtract($x);
+                }
+                $c->_rshift(1);
+                $d->_rshift(1);
+            }
+
+            if ($u->compare($v) >= 0) {
+                $u = $u->subtract($v);
+                $a = $a->subtract($c);
+                $b = $b->subtract($d);
+            } else {
+                $v = $v->subtract($u);
+                $c = $c->subtract($a);
+                $d = $d->subtract($b);
+            }
+        }
+
+        return array(
+            'gcd' => $this->_normalize($g->multiply($v)),
+            'x'   => $this->_normalize($c),
+            'y'   => $this->_normalize($d)
+        );
     }
 
     /**
@@ -351,22 +2612,136 @@ class BigInteger implements \JsonSerializable
      *
      * Say you have 693 and 609.  The GCD is 21.
      *
-     * @param BigInteger $n
-     * @return BigInteger
+     * Here's an example:
+     * <code>
+     * <?php
+     *    $a = new \phpseclib\Math\BigInteger(693);
+     *    $b = new \phpseclib\Math\BigInteger(609);
+     *
+     *    $gcd = a->extendedGCD($b);
+     *
+     *    echo $gcd->toString() . "\r\n"; // outputs 21
+     * ?>
+     * </code>
+     *
+     * @param \phpseclib\Math\BigInteger $n
+     * @return \phpseclib\Math\BigInteger
+     * @access public
      */
-    public function gcd(BigInteger $n)
+    function gcd($n)
     {
-        return new static($this->value->gcd($n->value));
+        extract($this->extendedGCD($n));
+        return $gcd;
     }
 
     /**
      * Absolute value.
      *
-     * @return BigInteger
+     * @return \phpseclib\Math\BigInteger
+     * @access public
      */
-    public function abs()
+    function abs()
     {
-        return new static($this->value->abs());
+        $temp = new static();
+
+        switch (MATH_BIGINTEGER_MODE) {
+            case self::MODE_GMP:
+                $temp->value = gmp_abs($this->value);
+                break;
+            case self::MODE_BCMATH:
+                $temp->value = (bccomp($this->value, '0', 0) < 0) ? substr($this->value, 1) : $this->value;
+                break;
+            default:
+                $temp->value = $this->value;
+        }
+
+        return $temp;
+    }
+
+    /**
+     * Compares two numbers.
+     *
+     * Although one might think !$x->compare($y) means $x != $y, it, in fact, means the opposite.  The reason for this is
+     * demonstrated thusly:
+     *
+     * $x  > $y: $x->compare($y)  > 0
+     * $x  < $y: $x->compare($y)  < 0
+     * $x == $y: $x->compare($y) == 0
+     *
+     * Note how the same comparison operator is used.  If you want to test for equality, use $x->equals($y).
+     *
+     * @param \phpseclib\Math\BigInteger $y
+     * @return int < 0 if $this is less than $y; > 0 if $this is greater than $y, and 0 if they are equal.
+     * @access public
+     * @see self::equals()
+     * @internal Could return $this->subtract($x), but that's not as fast as what we do do.
+     */
+    function compare($y)
+    {
+        switch (MATH_BIGINTEGER_MODE) {
+            case self::MODE_GMP:
+                return gmp_cmp($this->value, $y->value);
+            case self::MODE_BCMATH:
+                return bccomp($this->value, $y->value, 0);
+        }
+
+        return $this->_compare($this->value, $this->is_negative, $y->value, $y->is_negative);
+    }
+
+    /**
+     * Compares two numbers.
+     *
+     * @param array $x_value
+     * @param bool $x_negative
+     * @param array $y_value
+     * @param bool $y_negative
+     * @return int
+     * @see self::compare()
+     * @access private
+     */
+    function _compare($x_value, $x_negative, $y_value, $y_negative)
+    {
+        if ($x_negative != $y_negative) {
+            return (!$x_negative && $y_negative) ? 1 : -1;
+        }
+
+        $result = $x_negative ? -1 : 1;
+
+        if (count($x_value) != count($y_value)) {
+            return (count($x_value) > count($y_value)) ? $result : -$result;
+        }
+        $size = max(count($x_value), count($y_value));
+
+        $x_value = array_pad($x_value, $size, 0);
+        $y_value = array_pad($y_value, $size, 0);
+
+        for ($i = count($x_value) - 1; $i >= 0; --$i) {
+            if ($x_value[$i] != $y_value[$i]) {
+                return ($x_value[$i] > $y_value[$i]) ? $result : -$result;
+            }
+        }
+
+        return 0;
+    }
+
+    /**
+     * Tests the equality of two numbers.
+     *
+     * If you need to see if one number is greater than or less than another number, use BigInteger::compare()
+     *
+     * @param \phpseclib\Math\BigInteger $x
+     * @return bool
+     * @access public
+     * @see self::compare()
+     */
+    function equals($x)
+    {
+        switch (MATH_BIGINTEGER_MODE) {
+            case self::MODE_GMP:
+                return gmp_cmp($this->value, $x->value) == 0;
+            default:
+                return $this->value === $x->value && $this->is_negative == $x->is_negative;
+        }
     }
 
     /**
@@ -376,182 +2751,179 @@ class BigInteger implements \JsonSerializable
      * shift, not, and rotates.
      *
      * @param int $bits
+     * @access public
      */
-    public function setPrecision($bits)
+    function setPrecision($bits)
     {
-        $this->value->setPrecision($bits);
-    }
-
-    /**
-     * Get Precision
-     *
-     * Returns the precision if it exists, false if it doesn't
-     *
-     * @return int|bool
-     */
-    public function getPrecision()
-    {
-        return $this->value->getPrecision();
-    }
-
-    /**
-     * Serialize
-     *
-     * Will be called, automatically, when serialize() is called on a BigInteger object.
-     *
-     * __sleep() / __wakeup() have been around since PHP 4.0
-     *
-     * \Serializable was introduced in PHP 5.1 and deprecated in PHP 8.1:
-     * https://wiki.php.net/rfc/phase_out_serializable
-     *
-     * __serialize() / __unserialize() were introduced in PHP 7.4:
-     * https://wiki.php.net/rfc/custom_object_serialization
-     *
-     * @return array
-     */
-    public function __sleep()
-    {
-        $this->hex = $this->toHex(true);
-        $vars = ['hex'];
-        if ($this->getPrecision() > 0) {
-            $vars[] = 'precision';
+        $this->precision = $bits;
+        if (MATH_BIGINTEGER_MODE != self::MODE_BCMATH) {
+            $this->bitmask = new static(chr((1 << ($bits & 0x7)) - 1) . str_repeat(chr(0xFF), $bits >> 3), 256);
+        } else {
+            $this->bitmask = new static(bcpow('2', $bits, 0));
         }
-        return $vars;
-    }
 
-    /**
-     * Serialize
-     *
-     * Will be called, automatically, when unserialize() is called on a BigInteger object.
-     */
-    public function __wakeup()
-    {
-        $temp = new static($this->hex, -16);
+        $temp = $this->_normalize($this);
         $this->value = $temp->value;
-        if ($this->precision > 0) {
-            // recalculate $this->bitmask
-            $this->setPrecision($this->precision);
-        }
-    }
-
-    /**
-     * JSON Serialize
-     *
-     * Will be called, automatically, when json_encode() is called on a BigInteger object.
-     *
-     * @return array{hex: string, precision?: int]
-     */
-    #[\ReturnTypeWillChange]
-    public function jsonSerialize()
-    {
-        $result = ['hex' => $this->toHex(true)];
-        if ($this->precision > 0) {
-            $result['precision'] = $this->getPrecision();
-        }
-        return $result;
-    }
-
-    /**
-     * Performs modular exponentiation.
-     *
-     * @param BigInteger $e
-     * @param BigInteger $n
-     * @return BigInteger
-     */
-    public function powMod(BigInteger $e, BigInteger $n)
-    {
-        return new static($this->value->powMod($e->value, $n->value));
-    }
-
-    /**
-     * Performs modular exponentiation.
-     *
-     * @param BigInteger $e
-     * @param BigInteger $n
-     * @return BigInteger
-     */
-    public function modPow(BigInteger $e, BigInteger $n)
-    {
-        return new static($this->value->modPow($e->value, $n->value));
-    }
-
-    /**
-     * Compares two numbers.
-     *
-     * Although one might think !$x->compare($y) means $x != $y, it, in fact, means the opposite.  The reason for this
-     * is demonstrated thusly:
-     *
-     * $x  > $y: $x->compare($y)  > 0
-     * $x  < $y: $x->compare($y)  < 0
-     * $x == $y: $x->compare($y) == 0
-     *
-     * Note how the same comparison operator is used.  If you want to test for equality, use $x->equals($y).
-     *
-     * {@internal Could return $this->subtract($x), but that's not as fast as what we do do.}
-     *
-     * @param BigInteger $y
-     * @return int in case < 0 if $this is less than $y; > 0 if $this is greater than $y, and 0 if they are equal.
-     * @see self::equals()
-     */
-    public function compare(BigInteger $y)
-    {
-        return $this->value->compare($y->value);
-    }
-
-    /**
-     * Tests the equality of two numbers.
-     *
-     * If you need to see if one number is greater than or less than another number, use BigInteger::compare()
-     *
-     * @param BigInteger $x
-     * @return bool
-     */
-    public function equals(BigInteger $x)
-    {
-        return $this->value->equals($x->value);
-    }
-
-    /**
-     * Logical Not
-     *
-     * @return BigInteger
-     */
-    public function bitwise_not()
-    {
-        return new static($this->value->bitwise_not());
     }
 
     /**
      * Logical And
      *
-     * @param BigInteger $x
-     * @return BigInteger
+     * @param \phpseclib\Math\BigInteger $x
+     * @access public
+     * @internal Implemented per a request by Lluis Pamies i Juarez <lluis _a_ pamies.cat>
+     * @return \phpseclib\Math\BigInteger
      */
-    public function bitwise_and(BigInteger $x)
+    function bitwise_and($x)
     {
-        return new static($this->value->bitwise_and($x->value));
+        switch (MATH_BIGINTEGER_MODE) {
+            case self::MODE_GMP:
+                $temp = new static();
+                $temp->value = gmp_and($this->value, $x->value);
+
+                return $this->_normalize($temp);
+            case self::MODE_BCMATH:
+                $left = $this->toBytes();
+                $right = $x->toBytes();
+
+                $length = max(strlen($left), strlen($right));
+
+                $left = str_pad($left, $length, chr(0), STR_PAD_LEFT);
+                $right = str_pad($right, $length, chr(0), STR_PAD_LEFT);
+
+                return $this->_normalize(new static($left & $right, 256));
+        }
+
+        $result = $this->copy();
+
+        $length = min(count($x->value), count($this->value));
+
+        $result->value = array_slice($result->value, 0, $length);
+
+        for ($i = 0; $i < $length; ++$i) {
+            $result->value[$i]&= $x->value[$i];
+        }
+
+        return $this->_normalize($result);
     }
 
     /**
      * Logical Or
      *
-     * @param BigInteger $x
-     * @return BigInteger
+     * @param \phpseclib\Math\BigInteger $x
+     * @access public
+     * @internal Implemented per a request by Lluis Pamies i Juarez <lluis _a_ pamies.cat>
+     * @return \phpseclib\Math\BigInteger
      */
-    public function bitwise_or(BigInteger $x)
+    function bitwise_or($x)
     {
-        return new static($this->value->bitwise_or($x->value));
+        switch (MATH_BIGINTEGER_MODE) {
+            case self::MODE_GMP:
+                $temp = new static();
+                $temp->value = gmp_or($this->value, $x->value);
+
+                return $this->_normalize($temp);
+            case self::MODE_BCMATH:
+                $left = $this->toBytes();
+                $right = $x->toBytes();
+
+                $length = max(strlen($left), strlen($right));
+
+                $left = str_pad($left, $length, chr(0), STR_PAD_LEFT);
+                $right = str_pad($right, $length, chr(0), STR_PAD_LEFT);
+
+                return $this->_normalize(new static($left | $right, 256));
+        }
+
+        $length = max(count($this->value), count($x->value));
+        $result = $this->copy();
+        $result->value = array_pad($result->value, $length, 0);
+        $x->value = array_pad($x->value, $length, 0);
+
+        for ($i = 0; $i < $length; ++$i) {
+            $result->value[$i]|= $x->value[$i];
+        }
+
+        return $this->_normalize($result);
     }
 
     /**
-     * Logical Exclusive Or
+     * Logical Exclusive-Or
      *
-     * @param BigInteger $x
-     * @return BigInteger
+     * @param \phpseclib\Math\BigInteger $x
+     * @access public
+     * @internal Implemented per a request by Lluis Pamies i Juarez <lluis _a_ pamies.cat>
+     * @return \phpseclib\Math\BigInteger
      */
-    public function bitwise_xor(BigInteger $x)
+    function bitwise_xor($x)
     {
-        return new static($this->value->bitwise_xor($x->value));
+        switch (MATH_BIGINTEGER_MODE) {
+            case self::MODE_GMP:
+                $temp = new static();
+                $temp->value = gmp_xor($this->value, $x->value);
+
+                return $this->_normalize($temp);
+            case self::MODE_BCMATH:
+                $left = $this->toBytes();
+                $right = $x->toBytes();
+
+                $length = max(strlen($left), strlen($right));
+
+                $left = str_pad($left, $length, chr(0), STR_PAD_LEFT);
+                $right = str_pad($right, $length, chr(0), STR_PAD_LEFT);
+
+                return $this->_normalize(new static($left ^ $right, 256));
+        }
+
+        $length = max(count($this->value), count($x->value));
+        $result = $this->copy();
+        $result->value = array_pad($result->value, $length, 0);
+        $x->value = array_pad($x->value, $length, 0);
+
+        for ($i = 0; $i < $length; ++$i) {
+            $result->value[$i]^= $x->value[$i];
+        }
+
+        return $this->_normalize($result);
+    }
+
+    /**
+     * Logical Not
+     *
+     * @access public
+     * @internal Implemented per a request by Lluis Pamies i Juarez <lluis _a_ pamies.cat>
+     * @return \phpseclib\Math\BigInteger
+     */
+    function bitwise_not()
+    {
+        // calculuate "not" without regard to $this->precision
+        // (will always result in a smaller number.  ie. ~1 isn't 1111 1110 - it's 0)
+        $temp = $this->toBytes();
+        if ($temp == '') {
+            return '';
+        }
+        $pre_msb = decbin(ord($temp[0]));
+        $temp = ~$temp;
+        $msb = decbin(ord($temp[0]));
+        if (strlen($msb) == 8) {
+            $msb = substr($msb, strpos($msb, '0'));
+        }
+        $temp[0] = chr(bindec($msb));
+
+        // see if we need to add extra leading 1's
+        $current_bits = strlen($pre_msb) + 8 * strlen($temp) - 8;
+        $new_bits = $this->precision - $current_bits;
+        if ($new_bits <= 0) {
+            return $this->_normalize(new static($temp, 256));
+        }
+
+        // generate as many leading 1's as we need to.
+        $leading_ones = chr((1 << ($new_bits & 0x7)) - 1) . str_repeat(chr(0xFF), $new_bits >> 3);
+        $this->_base256_lshift($leading_ones, $current_bits);
+
+        $temp = str_pad($temp, strlen($leading_ones), chr(0), STR_PAD_LEFT);
+
+        return $this->_normalize(new static($leading_ones | $temp, 256));
     }
 
     /**
@@ -560,11 +2932,36 @@ class BigInteger implements \JsonSerializable
      * Shifts BigInteger's by $shift bits, effectively dividing by 2**$shift.
      *
      * @param int $shift
-     * @return BigInteger
+     * @return \phpseclib\Math\BigInteger
+     * @access public
+     * @internal The only version that yields any speed increases is the internal version.
      */
-    public function bitwise_rightShift($shift)
+    function bitwise_rightShift($shift)
     {
-        return new static($this->value->bitwise_rightShift($shift));
+        $temp = new static();
+
+        switch (MATH_BIGINTEGER_MODE) {
+            case self::MODE_GMP:
+                static $two;
+
+                if (!isset($two)) {
+                    $two = gmp_init('2');
+                }
+
+                $temp->value = gmp_div_q($this->value, gmp_pow($two, $shift));
+
+                break;
+            case self::MODE_BCMATH:
+                $temp->value = bcdiv($this->value, bcpow('2', $shift, 0), 0);
+
+                break;
+            default: // could just replace _lshift with this, but then all _lshift() calls would need to be rewritten
+                     // and I don't want to do that...
+                $temp->value = $this->value;
+                $temp->_rshift($shift);
+        }
+
+        return $this->_normalize($temp);
     }
 
     /**
@@ -573,11 +2970,36 @@ class BigInteger implements \JsonSerializable
      * Shifts BigInteger's by $shift bits, effectively multiplying by 2**$shift.
      *
      * @param int $shift
-     * @return BigInteger
+     * @return \phpseclib\Math\BigInteger
+     * @access public
+     * @internal The only version that yields any speed increases is the internal version.
      */
-    public function bitwise_leftShift($shift)
+    function bitwise_leftShift($shift)
     {
-        return new static($this->value->bitwise_leftShift($shift));
+        $temp = new static();
+
+        switch (MATH_BIGINTEGER_MODE) {
+            case self::MODE_GMP:
+                static $two;
+
+                if (!isset($two)) {
+                    $two = gmp_init('2');
+                }
+
+                $temp->value = gmp_mul($this->value, gmp_pow($two, $shift));
+
+                break;
+            case self::MODE_BCMATH:
+                $temp->value = bcmul($this->value, bcpow('2', $shift, 0), 0);
+
+                break;
+            default: // could just replace _rshift with this, but then all _lshift() calls would need to be rewritten
+                     // and I don't want to do that...
+                $temp->value = $this->value;
+                $temp->_lshift($shift);
+        }
+
+        return $this->_normalize($temp);
     }
 
     /**
@@ -586,11 +3008,43 @@ class BigInteger implements \JsonSerializable
      * Instead of the top x bits being dropped they're appended to the shifted bit string.
      *
      * @param int $shift
-     * @return BigInteger
+     * @return \phpseclib\Math\BigInteger
+     * @access public
      */
-    public function bitwise_leftRotate($shift)
+    function bitwise_leftRotate($shift)
     {
-        return new static($this->value->bitwise_leftRotate($shift));
+        $bits = $this->toBytes();
+
+        if ($this->precision > 0) {
+            $precision = $this->precision;
+            if (MATH_BIGINTEGER_MODE == self::MODE_BCMATH) {
+                $mask = $this->bitmask->subtract(new static(1));
+                $mask = $mask->toBytes();
+            } else {
+                $mask = $this->bitmask->toBytes();
+            }
+        } else {
+            $temp = ord($bits[0]);
+            for ($i = 0; $temp >> $i; ++$i) {
+            }
+            $precision = 8 * strlen($bits) - 8 + $i;
+            $mask = chr((1 << ($precision & 0x7)) - 1) . str_repeat(chr(0xFF), $precision >> 3);
+        }
+
+        if ($shift < 0) {
+            $shift+= $precision;
+        }
+        $shift%= $precision;
+
+        if (!$shift) {
+            return $this->copy();
+        }
+
+        $left = $this->bitwise_leftShift($shift);
+        $left = $left->bitwise_and(new static($mask, 256));
+        $right = $this->bitwise_rightShift($precision - $shift);
+        $result = MATH_BIGINTEGER_MODE != self::MODE_BCMATH ? $left->bitwise_or($right) : $left->add($right);
+        return $this->_normalize($result);
     }
 
     /**
@@ -599,118 +3053,255 @@ class BigInteger implements \JsonSerializable
      * Instead of the bottom x bits being dropped they're prepended to the shifted bit string.
      *
      * @param int $shift
-     * @return BigInteger
+     * @return \phpseclib\Math\BigInteger
+     * @access public
      */
-    public function bitwise_rightRotate($shift)
+    function bitwise_rightRotate($shift)
     {
-        return new static($this->value->bitwise_rightRotate($shift));
+        return $this->bitwise_leftRotate(-$shift);
     }
 
     /**
-     * Returns the smallest and largest n-bit number
+     * Generates a random BigInteger
      *
-     * @param int $bits
-     * @return BigInteger[]
+     * Byte length is equal to $length. Uses \phpseclib\Crypt\Random if it's loaded and mt_rand if it's not.
+     *
+     * @param int $length
+     * @return \phpseclib\Math\BigInteger
+     * @access private
      */
-    public static function minMaxBits($bits)
+    function _random_number_helper($size)
     {
-        self::initialize_static_variables();
+        if (class_exists('\phpseclib\Crypt\Random')) {
+            $random = Random::string($size);
+        } else {
+            $random = '';
 
-        $class = self::$mainEngine;
-        extract($class::minMaxBits($bits));
-        /** @var BigInteger $min
-         * @var BigInteger $max
-         */
-        return [
-            'min' => new static($min),
-            'max' => new static($max)
-        ];
+            if ($size & 1) {
+                $random.= chr(mt_rand(0, 255));
+            }
+
+            $blocks = $size >> 1;
+            for ($i = 0; $i < $blocks; ++$i) {
+                // mt_rand(-2147483648, 0x7FFFFFFF) always produces -2147483648 on some systems
+                $random.= pack('n', mt_rand(0, 0xFFFF));
+            }
+        }
+
+        return new static($random, 256);
     }
 
     /**
-     * Return the size of a BigInteger in bits
-     *
-     * @return int
-     */
-    public function getLength()
-    {
-        return $this->value->getLength();
-    }
-
-    /**
-     * Return the size of a BigInteger in bytes
-     *
-     * @return int
-     */
-    public function getLengthInBytes()
-    {
-        return $this->value->getLengthInBytes();
-    }
-
-    /**
-     * Generates a random number of a certain size
-     *
-     * Bit length is equal to $size
-     *
-     * @param int $size
-     * @return BigInteger
-     */
-    public static function random($size)
-    {
-        self::initialize_static_variables();
-
-        $class = self::$mainEngine;
-        return new static($class::random($size));
-    }
-
-    /**
-     * Generates a random prime number of a certain size
-     *
-     * Bit length is equal to $size
-     *
-     * @param int $size
-     * @return BigInteger
-     */
-    public static function randomPrime($size)
-    {
-        self::initialize_static_variables();
-
-        $class = self::$mainEngine;
-        return new static($class::randomPrime($size));
-    }
-
-    /**
-     * Generate a random prime number between a range
-     *
-     * If there's not a prime within the given range, false will be returned.
-     *
-     * @param BigInteger $min
-     * @param BigInteger $max
-     * @return false|BigInteger
-     */
-    public static function randomRangePrime(BigInteger $min, BigInteger $max)
-    {
-        $class = self::$mainEngine;
-        return new static($class::randomRangePrime($min->value, $max->value));
-    }
-
-    /**
-     * Generate a random number between a range
+     * Generate a random number
      *
      * Returns a random number between $min and $max where $min and $max
      * can be defined using one of the two methods:
      *
-     * BigInteger::randomRange($min, $max)
-     * BigInteger::randomRange($max, $min)
+     * $min->random($max)
+     * $max->random($min)
      *
-     * @param BigInteger $min
-     * @param BigInteger $max
-     * @return BigInteger
+     * @param \phpseclib\Math\BigInteger $arg1
+     * @param \phpseclib\Math\BigInteger $arg2
+     * @return \phpseclib\Math\BigInteger
+     * @access public
+     * @internal The API for creating random numbers used to be $a->random($min, $max), where $a was a BigInteger object.
+     *           That method is still supported for BC purposes.
      */
-    public static function randomRange(BigInteger $min, BigInteger $max)
+    function random($arg1, $arg2 = false)
     {
-        $class = self::$mainEngine;
-        return new static($class::randomRange($min->value, $max->value));
+        if ($arg1 === false) {
+            return false;
+        }
+
+        if ($arg2 === false) {
+            $max = $arg1;
+            $min = $this;
+        } else {
+            $min = $arg1;
+            $max = $arg2;
+        }
+
+        $compare = $max->compare($min);
+
+        if (!$compare) {
+            return $this->_normalize($min);
+        } elseif ($compare < 0) {
+            // if $min is bigger then $max, swap $min and $max
+            $temp = $max;
+            $max = $min;
+            $min = $temp;
+        }
+
+        static $one;
+        if (!isset($one)) {
+            $one = new static(1);
+        }
+
+        $max = $max->subtract($min->subtract($one));
+        $size = strlen(ltrim($max->toBytes(), chr(0)));
+
+        /*
+            doing $random % $max doesn't work because some numbers will be more likely to occur than others.
+            eg. if $max is 140 and $random's max is 255 then that'd mean both $random = 5 and $random = 145
+            would produce 5 whereas the only value of random that could produce 139 would be 139. ie.
+            not all numbers would be equally likely. some would be more likely than others.
+
+            creating a whole new random number until you find one that is within the range doesn't work
+            because, for sufficiently small ranges, the likelihood that you'd get a number within that range
+            would be pretty small. eg. with $random's max being 255 and if your $max being 1 the probability
+            would be pretty high that $random would be greater than $max.
+
+            phpseclib works around this using the technique described here:
+
+            http://crypto.stackexchange.com/questions/5708/creating-a-small-number-from-a-cryptographically-secure-random-string
+        */
+        $random_max = new static(chr(1) . str_repeat("\0", $size), 256);
+        $random = $this->_random_number_helper($size);
+
+        list($max_multiple) = $random_max->divide($max);
+        $max_multiple = $max_multiple->multiply($max);
+
+        while ($random->compare($max_multiple) >= 0) {
+            $random = $random->subtract($max_multiple);
+            $random_max = $random_max->subtract($max_multiple);
+            $random = $random->bitwise_leftShift(8);
+            $random = $random->add($this->_random_number_helper(1));
+            $random_max = $random_max->bitwise_leftShift(8);
+            list($max_multiple) = $random_max->divide($max);
+            $max_multiple = $max_multiple->multiply($max);
+        }
+        list(, $random) = $random->divide($max);
+
+        return $this->_normalize($random->add($min));
+    }
+
+    /**
+     * Generate a random prime number.
+     *
+     * If there's not a prime within the given range, false will be returned.
+     * If more than $timeout seconds have elapsed, give up and return false.
+     *
+     * @param \phpseclib\Math\BigInteger $arg1
+     * @param \phpseclib\Math\BigInteger $arg2
+     * @param int $timeout
+     * @return Math_BigInteger|false
+     * @access public
+     * @internal See {@link http://www.cacr.math.uwaterloo.ca/hac/about/chap4.pdf#page=15 HAC 4.44}.
+     */
+    function randomPrime($arg1, $arg2 = false, $timeout = false)
+    {
+        if ($arg1 === false) {
+            return false;
+        }
+
+        if ($arg2 === false) {
+            $max = $arg1;
+            $min = $this;
+        } else {
+            $min = $arg1;
+            $max = $arg2;
+        }
+
+        $compare = $max->compare($min);
+
+        if (!$compare) {
+            return $min->isPrime() ? $min : false;
+        } elseif ($compare < 0) {
+            // if $min is bigger then $max, swap $min and $max
+            $temp = $max;
+            $max = $min;
+            $min = $temp;
+        }
+
+        static $one, $two;
+        if (!isset($one)) {
+            $one = new static(1);
+            $two = new static(2);
+        }
+
+        $start = time();
+
+        $x = $this->random($min, $max);
+
+        // gmp_nextprime() requires PHP 5 >= 5.2.0 per <http://php.net/gmp-nextprime>.
+        if (MATH_BIGINTEGER_MODE == self::MODE_GMP && extension_loaded('gmp')) {
+            $p = new static();
+            $p->value = gmp_nextprime($x->value);
+
+            if ($p->compare($max) <= 0) {
+                return $p;
+            }
+
+            if (!$min->equals($x)) {
+                $x = $x->subtract($one);
+            }
+
+            return $x->randomPrime($min, $x);
+        }
+
+        if ($x->equals($two)) {
+            return $x;
+        }
+
+        $x->_make_odd();
+        if ($x->compare($max) > 0) {
+            // if $x > $max then $max is even and if $min == $max then no prime number exists between the specified range
+            if ($min->equals($max)) {
+                return false;
+            }
+            $x = $min->copy();
+            $x->_make_odd();
+        }
+
+        $initial_x = $x->copy();
+
+        while (true) {
+            if ($timeout !== false && time() - $start > $timeout) {
+                return false;
+            }
+
+            if ($x->isPrime()) {
+                return $x;
+            }
+
+            $x = $x->add($two);
+
+            if ($x->compare($max) > 0) {
+                $x = $min->copy();
+                if ($x->equals($two)) {
+                    return $x;
+                }
+                $x->_make_odd();
+            }
+
+            if ($x->equals($initial_x)) {
+                return false;
+            }
+        }
+    }
+
+    /**
+     * Make the current number odd
+     *
+     * If the current number is odd it'll be unchanged.  If it's even, one will be added to it.
+     *
+     * @see self::randomPrime()
+     * @access private
+     */
+    function _make_odd()
+    {
+        switch (MATH_BIGINTEGER_MODE) {
+            case self::MODE_GMP:
+                gmp_setbit($this->value, 0);
+                break;
+            case self::MODE_BCMATH:
+                if ($this->value[strlen($this->value) - 1] % 2 == 0) {
+                    $this->value = bcadd($this->value, '1');
+                }
+                break;
+            default:
+                $this->value[0] |= 1;
+        }
     }
 
     /**
@@ -720,173 +3311,445 @@ class BigInteger implements \JsonSerializable
      * $t parameter is distributability.  BigInteger::randomPrime() can be distributed across multiple pageloads
      * on a website instead of just one.
      *
-     * @param int|bool $t
+     * @param \phpseclib\Math\BigInteger $t
      * @return bool
+     * @access public
+     * @internal Uses the
+     *     {@link http://en.wikipedia.org/wiki/Miller%E2%80%93Rabin_primality_test Miller-Rabin primality test}.  See
+     *     {@link http://www.cacr.math.uwaterloo.ca/hac/about/chap4.pdf#page=8 HAC 4.24}.
      */
-    public function isPrime($t = false)
+    function isPrime($t = false)
     {
-        return $this->value->isPrime($t);
+        $length = strlen($this->toBytes());
+
+        if (!$t) {
+            // see HAC 4.49 "Note (controlling the error probability)"
+            // @codingStandardsIgnoreStart
+                 if ($length >= 163) { $t =  2; } // floor(1300 / 8)
+            else if ($length >= 106) { $t =  3; } // floor( 850 / 8)
+            else if ($length >= 81 ) { $t =  4; } // floor( 650 / 8)
+            else if ($length >= 68 ) { $t =  5; } // floor( 550 / 8)
+            else if ($length >= 56 ) { $t =  6; } // floor( 450 / 8)
+            else if ($length >= 50 ) { $t =  7; } // floor( 400 / 8)
+            else if ($length >= 43 ) { $t =  8; } // floor( 350 / 8)
+            else if ($length >= 37 ) { $t =  9; } // floor( 300 / 8)
+            else if ($length >= 31 ) { $t = 12; } // floor( 250 / 8)
+            else if ($length >= 25 ) { $t = 15; } // floor( 200 / 8)
+            else if ($length >= 18 ) { $t = 18; } // floor( 150 / 8)
+            else                     { $t = 27; }
+            // @codingStandardsIgnoreEnd
+        }
+
+        // ie. gmp_testbit($this, 0)
+        // ie. isEven() or !isOdd()
+        switch (MATH_BIGINTEGER_MODE) {
+            case self::MODE_GMP:
+                return gmp_prob_prime($this->value, $t) != 0;
+            case self::MODE_BCMATH:
+                if ($this->value === '2') {
+                    return true;
+                }
+                if ($this->value[strlen($this->value) - 1] % 2 == 0) {
+                    return false;
+                }
+                break;
+            default:
+                if ($this->value == array(2)) {
+                    return true;
+                }
+                if (~$this->value[0] & 1) {
+                    return false;
+                }
+        }
+
+        static $primes, $zero, $one, $two;
+
+        if (!isset($primes)) {
+            $primes = array(
+                3,    5,    7,    11,   13,   17,   19,   23,   29,   31,   37,   41,   43,   47,   53,   59,
+                61,   67,   71,   73,   79,   83,   89,   97,   101,  103,  107,  109,  113,  127,  131,  137,
+                139,  149,  151,  157,  163,  167,  173,  179,  181,  191,  193,  197,  199,  211,  223,  227,
+                229,  233,  239,  241,  251,  257,  263,  269,  271,  277,  281,  283,  293,  307,  311,  313,
+                317,  331,  337,  347,  349,  353,  359,  367,  373,  379,  383,  389,  397,  401,  409,  419,
+                421,  431,  433,  439,  443,  449,  457,  461,  463,  467,  479,  487,  491,  499,  503,  509,
+                521,  523,  541,  547,  557,  563,  569,  571,  577,  587,  593,  599,  601,  607,  613,  617,
+                619,  631,  641,  643,  647,  653,  659,  661,  673,  677,  683,  691,  701,  709,  719,  727,
+                733,  739,  743,  751,  757,  761,  769,  773,  787,  797,  809,  811,  821,  823,  827,  829,
+                839,  853,  857,  859,  863,  877,  881,  883,  887,  907,  911,  919,  929,  937,  941,  947,
+                953,  967,  971,  977,  983,  991,  997
+            );
+
+            if (MATH_BIGINTEGER_MODE != self::MODE_INTERNAL) {
+                for ($i = 0; $i < count($primes); ++$i) {
+                    $primes[$i] = new static($primes[$i]);
+                }
+            }
+
+            $zero = new static();
+            $one = new static(1);
+            $two = new static(2);
+        }
+
+        if ($this->equals($one)) {
+            return false;
+        }
+
+        // see HAC 4.4.1 "Random search for probable primes"
+        if (MATH_BIGINTEGER_MODE != self::MODE_INTERNAL) {
+            foreach ($primes as $prime) {
+                list(, $r) = $this->divide($prime);
+                if ($r->equals($zero)) {
+                    return $this->equals($prime);
+                }
+            }
+        } else {
+            $value = $this->value;
+            foreach ($primes as $prime) {
+                list(, $r) = $this->_divide_digit($value, $prime);
+                if (!$r) {
+                    return count($value) == 1 && $value[0] == $prime;
+                }
+            }
+        }
+
+        $n   = $this->copy();
+        $n_1 = $n->subtract($one);
+        $n_2 = $n->subtract($two);
+
+        $r = $n_1->copy();
+        $r_value = $r->value;
+        // ie. $s = gmp_scan1($n, 0) and $r = gmp_div_q($n, gmp_pow(gmp_init('2'), $s));
+        if (MATH_BIGINTEGER_MODE == self::MODE_BCMATH) {
+            $s = 0;
+            // if $n was 1, $r would be 0 and this would be an infinite loop, hence our $this->equals($one) check earlier
+            while ($r->value[strlen($r->value) - 1] % 2 == 0) {
+                $r->value = bcdiv($r->value, '2', 0);
+                ++$s;
+            }
+        } else {
+            for ($i = 0, $r_length = count($r_value); $i < $r_length; ++$i) {
+                $temp = ~$r_value[$i] & 0xFFFFFF;
+                for ($j = 1; ($temp >> $j) & 1; ++$j) {
+                }
+                if ($j != 25) {
+                    break;
+                }
+            }
+            $s = 26 * $i + $j - 1;
+            $r->_rshift($s);
+        }
+
+        for ($i = 0; $i < $t; ++$i) {
+            $a = $this->random($two, $n_2);
+            $y = $a->modPow($r, $n);
+
+            if (!$y->equals($one) && !$y->equals($n_1)) {
+                for ($j = 1; $j < $s && !$y->equals($n_1); ++$j) {
+                    $y = $y->modPow($two, $n);
+                    if ($y->equals($one)) {
+                        return false;
+                    }
+                }
+
+                if (!$y->equals($n_1)) {
+                    return false;
+                }
+            }
+        }
+        return true;
     }
 
     /**
-     * Calculates the nth root of a biginteger.
+     * Logical Left Shift
      *
-     * Returns the nth root of a positive biginteger, where n defaults to 2
+     * Shifts BigInteger's by $shift bits.
      *
-     * @param int $n optional
-     * @return BigInteger
+     * @param int $shift
+     * @access private
      */
-    public function root($n = 2)
+    function _lshift($shift)
     {
-        return new static($this->value->root($n));
+        if ($shift == 0) {
+            return;
+        }
+
+        $num_digits = (int) ($shift / self::$base);
+        $shift %= self::$base;
+        $shift = 1 << $shift;
+
+        $carry = 0;
+
+        for ($i = 0; $i < count($this->value); ++$i) {
+            $temp = $this->value[$i] * $shift + $carry;
+            $carry = self::$base === 26 ? intval($temp / 0x4000000) : ($temp >> 31);
+            $this->value[$i] = (int) ($temp - $carry * self::$baseFull);
+        }
+
+        if ($carry) {
+            $this->value[count($this->value)] = $carry;
+        }
+
+        while ($num_digits--) {
+            array_unshift($this->value, 0);
+        }
     }
 
     /**
-     * Performs exponentiation.
+     * Logical Right Shift
      *
-     * @param BigInteger $n
-     * @return BigInteger
-     */
-    public function pow(BigInteger $n)
-    {
-        return new static($this->value->pow($n->value));
-    }
-
-    /**
-     * Return the minimum BigInteger between an arbitrary number of BigIntegers.
+     * Shifts BigInteger's by $shift bits.
      *
-     * @param BigInteger ...$nums
-     * @return BigInteger
+     * @param int $shift
+     * @access private
      */
-    public static function min(BigInteger ...$nums)
+    function _rshift($shift)
     {
-        $class = self::$mainEngine;
-        $nums = array_map(function ($num) {
-            return $num->value;
-        }, $nums);
-        return new static($class::min(...$nums));
+        if ($shift == 0) {
+            return;
+        }
+
+        $num_digits = (int) ($shift / self::$base);
+        $shift %= self::$base;
+        $carry_shift = self::$base - $shift;
+        $carry_mask = (1 << $shift) - 1;
+
+        if ($num_digits) {
+            $this->value = array_slice($this->value, $num_digits);
+        }
+
+        $carry = 0;
+
+        for ($i = count($this->value) - 1; $i >= 0; --$i) {
+            $temp = $this->value[$i] >> $shift | $carry;
+            $carry = ($this->value[$i] & $carry_mask) << $carry_shift;
+            $this->value[$i] = $temp;
+        }
+
+        $this->value = $this->_trim($this->value);
     }
 
     /**
-     * Return the maximum BigInteger between an arbitrary number of BigIntegers.
+     * Normalize
      *
-     * @param BigInteger ...$nums
-     * @return BigInteger
-     */
-    public static function max(BigInteger ...$nums)
-    {
-        $class = self::$mainEngine;
-        $nums = array_map(function ($num) {
-            return $num->value;
-        }, $nums);
-        return new static($class::max(...$nums));
-    }
-
-    /**
-     * Tests BigInteger to see if it is between two integers, inclusive
+     * Removes leading zeros and truncates (if necessary) to maintain the appropriate precision
      *
-     * @param BigInteger $min
-     * @param BigInteger $max
-     * @return bool
+     * @param \phpseclib\Math\BigInteger
+     * @return \phpseclib\Math\BigInteger
+     * @see self::_trim()
+     * @access private
      */
-    public function between(BigInteger $min, BigInteger $max)
+    function _normalize($result)
     {
-        return $this->value->between($min->value, $max->value);
+        $result->precision = $this->precision;
+        $result->bitmask = $this->bitmask;
+
+        switch (MATH_BIGINTEGER_MODE) {
+            case self::MODE_GMP:
+                if ($this->bitmask !== false) {
+                    $result->value = gmp_and($result->value, $result->bitmask->value);
+                }
+
+                return $result;
+            case self::MODE_BCMATH:
+                if (!empty($result->bitmask->value)) {
+                    $result->value = bcmod($result->value, $result->bitmask->value);
+                }
+
+                return $result;
+        }
+
+        $value = &$result->value;
+
+        if (!count($value)) {
+            return $result;
+        }
+
+        $value = $this->_trim($value);
+
+        if (!empty($result->bitmask->value)) {
+            $length = min(count($value), count($this->bitmask->value));
+            $value = array_slice($value, 0, $length);
+
+            for ($i = 0; $i < $length; ++$i) {
+                $value[$i] = $value[$i] & $this->bitmask->value[$i];
+            }
+        }
+
+        return $result;
     }
 
     /**
-     * Clone
-     */
-    public function __clone()
-    {
-        $this->value = clone $this->value;
-    }
-
-    /**
-     * Is Odd?
+     * Trim
      *
-     * @return bool
+     * Removes leading zeros
+     *
+     * @param array $value
+     * @return \phpseclib\Math\BigInteger
+     * @access private
      */
-    public function isOdd()
+    function _trim($value)
     {
-        return $this->value->isOdd();
+        for ($i = count($value) - 1; $i >= 0; --$i) {
+            if ($value[$i]) {
+                break;
+            }
+            unset($value[$i]);
+        }
+
+        return $value;
     }
 
     /**
-     * Tests if a bit is set
+     * Array Repeat
+     *
+     * @param $input Array
+     * @param $multiplier mixed
+     * @return array
+     * @access private
+     */
+    function _array_repeat($input, $multiplier)
+    {
+        return ($multiplier) ? array_fill(0, $multiplier, $input) : array();
+    }
+
+    /**
+     * Logical Left Shift
+     *
+     * Shifts binary strings $shift bits, essentially multiplying by 2**$shift.
+     *
+     * @param $x String
+     * @param $shift Integer
+     * @return string
+     * @access private
+     */
+    function _base256_lshift(&$x, $shift)
+    {
+        if ($shift == 0) {
+            return;
+        }
+
+        $num_bytes = $shift >> 3; // eg. floor($shift/8)
+        $shift &= 7; // eg. $shift % 8
+
+        $carry = 0;
+        for ($i = strlen($x) - 1; $i >= 0; --$i) {
+            $temp = ord($x[$i]) << $shift | $carry;
+            $x[$i] = chr($temp);
+            $carry = $temp >> 8;
+        }
+        $carry = ($carry != 0) ? chr($carry) : '';
+        $x = $carry . $x . str_repeat(chr(0), $num_bytes);
+    }
+
+    /**
+     * Logical Right Shift
+     *
+     * Shifts binary strings $shift bits, essentially dividing by 2**$shift and returning the remainder.
+     *
+     * @param $x String
+     * @param $shift Integer
+     * @return string
+     * @access private
+     */
+    function _base256_rshift(&$x, $shift)
+    {
+        if ($shift == 0) {
+            $x = ltrim($x, chr(0));
+            return '';
+        }
+
+        $num_bytes = $shift >> 3; // eg. floor($shift/8)
+        $shift &= 7; // eg. $shift % 8
+
+        $remainder = '';
+        if ($num_bytes) {
+            $start = $num_bytes > strlen($x) ? -strlen($x) : -$num_bytes;
+            $remainder = substr($x, $start);
+            $x = substr($x, 0, -$num_bytes);
+        }
+
+        $carry = 0;
+        $carry_shift = 8 - $shift;
+        for ($i = 0; $i < strlen($x); ++$i) {
+            $temp = (ord($x[$i]) >> $shift) | $carry;
+            $carry = (ord($x[$i]) << $carry_shift) & 0xFF;
+            $x[$i] = chr($temp);
+        }
+        $x = ltrim($x, chr(0));
+
+        $remainder = chr($carry >> $carry_shift) . $remainder;
+
+        return ltrim($remainder, chr(0));
+    }
+
+    // one quirk about how the following functions are implemented is that PHP defines N to be an unsigned long
+    // at 32-bits, while java's longs are 64-bits.
+
+    /**
+     * Converts 32-bit integers to bytes.
      *
      * @param int $x
-     * @return bool
+     * @return string
+     * @access private
      */
-    public function testBit($x)
+    function _int2bytes($x)
     {
-        return $this->value->testBit($x);
+        return ltrim(pack('N', $x), chr(0));
     }
 
     /**
-     * Is Negative?
+     * Converts bytes to 32-bit integers
      *
-     * @return bool
+     * @param string $x
+     * @return int
+     * @access private
      */
-    public function isNegative()
+    function _bytes2int($x)
     {
-        return $this->value->isNegative();
+        $temp = unpack('Nint', str_pad($x, 4, chr(0), STR_PAD_LEFT));
+        return $temp['int'];
     }
 
     /**
-     * Negate
+     * DER-encode an integer
      *
-     * Given $k, returns -$k
+     * The ability to DER-encode integers is needed to create RSA public keys for use with OpenSSL
      *
-     * @return BigInteger
+     * @see self::modPow()
+     * @access private
+     * @param int $length
+     * @return string
      */
-    public function negate()
+    function _encodeASN1Length($length)
     {
-        return new static($this->value->negate());
+        if ($length <= 0x7F) {
+            return chr($length);
+        }
+
+        $temp = ltrim(pack('N', $length), chr(0));
+        return pack('Ca*', 0x80 | strlen($temp), $temp);
     }
 
     /**
-     * Scan for 1 and right shift by that amount
+     * Single digit division
      *
-     * ie. $s = gmp_scan1($n, 0) and $r = gmp_div_q($n, gmp_pow(gmp_init('2'), $s));
+     * Even if int64 is being used the division operator will return a float64 value
+     * if the dividend is not evenly divisible by the divisor. Since a float64 doesn't
+     * have the precision of int64 this is a problem so, when int64 is being used,
+     * we'll guarantee that the dividend is divisible by first subtracting the remainder.
      *
-     * @param BigInteger $r
+     * @access private
+     * @param int $x
+     * @param int $y
      * @return int
      */
-    public static function scan1divide(BigInteger $r)
+    function _safe_divide($x, $y)
     {
-        $class = self::$mainEngine;
-        return $class::scan1divide($r->value);
-    }
+        if (self::$base === 26) {
+            return (int) ($x / $y);
+        }
 
-    /**
-     * Create Recurring Modulo Function
-     *
-     * Sometimes it may be desirable to do repeated modulos with the same number outside of
-     * modular exponentiation
-     *
-     * @return callable
-     */
-    public function createRecurringModuloFunction()
-    {
-        $func = $this->value->createRecurringModuloFunction();
-        return function (BigInteger $x) use ($func) {
-            return new static($func($x->value));
-        };
-    }
-
-    /**
-     * Bitwise Split
-     *
-     * Splits BigInteger's into chunks of $split bits
-     *
-     * @param int $split
-     * @return BigInteger[]
-     */
-    public function bitwise_split($split)
-    {
-        return array_map(function ($val) {
-            return new static($val);
-        }, $this->value->bitwise_split($split));
+        // self::$base === 31
+        return ($x - ($x % $y)) / $y;
     }
 }
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger/Engines/BCMath.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger/Engines/BCMath.php
deleted file mode 100644
index 7c5ca9fb..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger/Engines/BCMath.php
+++ /dev/null
@@ -1,697 +0,0 @@
-<?php
-
-/**
- * BCMath BigInteger Engine
- *
- * PHP version 5 and 7
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2017 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://pear.php.net/package/Math_BigInteger
- */
-
-namespace phpseclib3\Math\BigInteger\Engines;
-
-use phpseclib3\Common\Functions\Strings;
-use phpseclib3\Exception\BadConfigurationException;
-
-/**
- * BCMath Engine.
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-class BCMath extends Engine
-{
-    /**
-     * Can Bitwise operations be done fast?
-     *
-     * @see parent::bitwise_leftRotate()
-     * @see parent::bitwise_rightRotate()
-     */
-    const FAST_BITWISE = false;
-
-    /**
-     * Engine Directory
-     *
-     * @see parent::setModExpEngine
-     */
-    const ENGINE_DIR = 'BCMath';
-
-    /**
-     * Test for engine validity
-     *
-     * @return bool
-     * @see parent::__construct()
-     */
-    public static function isValidEngine()
-    {
-        return extension_loaded('bcmath');
-    }
-
-    /**
-     * Default constructor
-     *
-     * @param mixed $x integer Base-10 number or base-$base number if $base set.
-     * @param int $base
-     * @see parent::__construct()
-     */
-    public function __construct($x = 0, $base = 10)
-    {
-        if (!isset(static::$isValidEngine[static::class])) {
-            static::$isValidEngine[static::class] = self::isValidEngine();
-        }
-        if (!static::$isValidEngine[static::class]) {
-            throw new BadConfigurationException('BCMath is not setup correctly on this system');
-        }
-
-        $this->value = '0';
-
-        parent::__construct($x, $base);
-    }
-
-    /**
-     * Initialize a BCMath BigInteger Engine instance
-     *
-     * @param int $base
-     * @see parent::__construct()
-     */
-    protected function initialize($base)
-    {
-        switch (abs($base)) {
-            case 256:
-                // round $len to the nearest 4
-                $len = (strlen($this->value) + 3) & ~3;
-
-                $x = str_pad($this->value, $len, chr(0), STR_PAD_LEFT);
-
-                $this->value = '0';
-                for ($i = 0; $i < $len; $i += 4) {
-                    $this->value = bcmul($this->value, '4294967296', 0); // 4294967296 == 2**32
-                    $this->value = bcadd(
-                        $this->value,
-                        0x1000000 * ord($x[$i]) + ((ord($x[$i + 1]) << 16) | (ord(
-                            $x[$i + 2]
-                        ) << 8) | ord($x[$i + 3])),
-                        0
-                    );
-                }
-
-                if ($this->is_negative) {
-                    $this->value = '-' . $this->value;
-                }
-                break;
-            case 16:
-                $x = (strlen($this->value) & 1) ? '0' . $this->value : $this->value;
-                $temp = new self(Strings::hex2bin($x), 256);
-                $this->value = $this->is_negative ? '-' . $temp->value : $temp->value;
-                $this->is_negative = false;
-                break;
-            case 10:
-                // explicitly casting $x to a string is necessary, here, since doing $x[0] on -1 yields different
-                // results then doing it on '-1' does (modInverse does $x[0])
-                $this->value = $this->value === '-' ? '0' : (string)$this->value;
-        }
-    }
-
-    /**
-     * Converts a BigInteger to a base-10 number.
-     *
-     * @return string
-     */
-    public function toString()
-    {
-        if ($this->value === '0') {
-            return '0';
-        }
-
-        return ltrim($this->value, '0');
-    }
-
-    /**
-     * Converts a BigInteger to a byte string (eg. base-256).
-     *
-     * @param bool $twos_compliment
-     * @return string
-     */
-    public function toBytes($twos_compliment = false)
-    {
-        if ($twos_compliment) {
-            return $this->toBytesHelper();
-        }
-
-        $value = '';
-        $current = $this->value;
-
-        if ($current[0] == '-') {
-            $current = substr($current, 1);
-        }
-
-        while (bccomp($current, '0', 0) > 0) {
-            $temp = bcmod($current, '16777216');
-            $value = chr($temp >> 16) . chr($temp >> 8) . chr($temp) . $value;
-            $current = bcdiv($current, '16777216', 0);
-        }
-
-        return $this->precision > 0 ?
-            substr(str_pad($value, $this->precision >> 3, chr(0), STR_PAD_LEFT), -($this->precision >> 3)) :
-            ltrim($value, chr(0));
-    }
-
-    /**
-     * Adds two BigIntegers.
-     *
-     * @param BCMath $y
-     * @return BCMath
-     */
-    public function add(BCMath $y)
-    {
-        $temp = new self();
-        $temp->value = bcadd($this->value, $y->value);
-
-        return $this->normalize($temp);
-    }
-
-    /**
-     * Subtracts two BigIntegers.
-     *
-     * @param BCMath $y
-     * @return BCMath
-     */
-    public function subtract(BCMath $y)
-    {
-        $temp = new self();
-        $temp->value = bcsub($this->value, $y->value);
-
-        return $this->normalize($temp);
-    }
-
-    /**
-     * Multiplies two BigIntegers.
-     *
-     * @param BCMath $x
-     * @return BCMath
-     */
-    public function multiply(BCMath $x)
-    {
-        $temp = new self();
-        $temp->value = bcmul($this->value, $x->value);
-
-        return $this->normalize($temp);
-    }
-
-    /**
-     * Divides two BigIntegers.
-     *
-     * Returns an array whose first element contains the quotient and whose second element contains the
-     * "common residue".  If the remainder would be positive, the "common residue" and the remainder are the
-     * same.  If the remainder would be negative, the "common residue" is equal to the sum of the remainder
-     * and the divisor (basically, the "common residue" is the first positive modulo).
-     *
-     * @param BCMath $y
-     * @return array{static, static}
-     */
-    public function divide(BCMath $y)
-    {
-        $quotient = new self();
-        $remainder = new self();
-
-        $quotient->value = bcdiv($this->value, $y->value, 0);
-        $remainder->value = bcmod($this->value, $y->value);
-
-        if ($remainder->value[0] == '-') {
-            $remainder->value = bcadd($remainder->value, $y->value[0] == '-' ? substr($y->value, 1) : $y->value, 0);
-        }
-
-        return [$this->normalize($quotient), $this->normalize($remainder)];
-    }
-
-    /**
-     * Calculates modular inverses.
-     *
-     * Say you have (30 mod 17 * x mod 17) mod 17 == 1.  x can be found using modular inverses.
-     *
-     * @param BCMath $n
-     * @return false|BCMath
-     */
-    public function modInverse(BCMath $n)
-    {
-        return $this->modInverseHelper($n);
-    }
-
-    /**
-     * Calculates the greatest common divisor and Bezout's identity.
-     *
-     * Say you have 693 and 609.  The GCD is 21.  Bezout's identity states that there exist integers x and y such that
-     * 693*x + 609*y == 21.  In point of fact, there are actually an infinite number of x and y combinations and which
-     * combination is returned is dependent upon which mode is in use.  See
-     * {@link http://en.wikipedia.org/wiki/B%C3%A9zout%27s_identity Bezout's identity - Wikipedia} for more information.
-     *
-     * @param BCMath $n
-     * @return array{gcd: static, x: static, y: static}
-     */
-    public function extendedGCD(BCMath $n)
-    {
-        // it might be faster to use the binary xGCD algorithim here, as well, but (1) that algorithim works
-        // best when the base is a power of 2 and (2) i don't think it'd make much difference, anyway.  as is,
-        // the basic extended euclidean algorithim is what we're using.
-
-        $u = $this->value;
-        $v = $n->value;
-
-        $a = '1';
-        $b = '0';
-        $c = '0';
-        $d = '1';
-
-        while (bccomp($v, '0', 0) != 0) {
-            $q = bcdiv($u, $v, 0);
-
-            $temp = $u;
-            $u = $v;
-            $v = bcsub($temp, bcmul($v, $q, 0), 0);
-
-            $temp = $a;
-            $a = $c;
-            $c = bcsub($temp, bcmul($a, $q, 0), 0);
-
-            $temp = $b;
-            $b = $d;
-            $d = bcsub($temp, bcmul($b, $q, 0), 0);
-        }
-
-        return [
-            'gcd' => $this->normalize(new static($u)),
-            'x' => $this->normalize(new static($a)),
-            'y' => $this->normalize(new static($b))
-        ];
-    }
-
-    /**
-     * Calculates the greatest common divisor
-     *
-     * Say you have 693 and 609.  The GCD is 21.
-     *
-     * @param BCMath $n
-     * @return BCMath
-     */
-    public function gcd(BCMath $n)
-    {
-        extract($this->extendedGCD($n));
-        /** @var BCMath $gcd */
-        return $gcd;
-    }
-
-    /**
-     * Absolute value.
-     *
-     * @return BCMath
-     */
-    public function abs()
-    {
-        $temp = new static();
-        $temp->value = strlen($this->value) && $this->value[0] == '-' ?
-            substr($this->value, 1) :
-            $this->value;
-
-        return $temp;
-    }
-
-    /**
-     * Logical And
-     *
-     * @param BCMath $x
-     * @return BCMath
-     */
-    public function bitwise_and(BCMath $x)
-    {
-        return $this->bitwiseAndHelper($x);
-    }
-
-    /**
-     * Logical Or
-     *
-     * @param BCMath $x
-     * @return BCMath
-     */
-    public function bitwise_or(BCMath $x)
-    {
-        return $this->bitwiseXorHelper($x);
-    }
-
-    /**
-     * Logical Exclusive Or
-     *
-     * @param BCMath $x
-     * @return BCMath
-     */
-    public function bitwise_xor(BCMath $x)
-    {
-        return $this->bitwiseXorHelper($x);
-    }
-
-    /**
-     * Logical Right Shift
-     *
-     * Shifts BigInteger's by $shift bits, effectively dividing by 2**$shift.
-     *
-     * @param int $shift
-     * @return BCMath
-     */
-    public function bitwise_rightShift($shift)
-    {
-        $temp = new static();
-        $temp->value = bcdiv($this->value, bcpow('2', $shift, 0), 0);
-
-        return $this->normalize($temp);
-    }
-
-    /**
-     * Logical Left Shift
-     *
-     * Shifts BigInteger's by $shift bits, effectively multiplying by 2**$shift.
-     *
-     * @param int $shift
-     * @return BCMath
-     */
-    public function bitwise_leftShift($shift)
-    {
-        $temp = new static();
-        $temp->value = bcmul($this->value, bcpow('2', $shift, 0), 0);
-
-        return $this->normalize($temp);
-    }
-
-    /**
-     * Compares two numbers.
-     *
-     * Although one might think !$x->compare($y) means $x != $y, it, in fact, means the opposite.  The reason for this
-     * is demonstrated thusly:
-     *
-     * $x  > $y: $x->compare($y)  > 0
-     * $x  < $y: $x->compare($y)  < 0
-     * $x == $y: $x->compare($y) == 0
-     *
-     * Note how the same comparison operator is used.  If you want to test for equality, use $x->equals($y).
-     *
-     * {@internal Could return $this->subtract($x), but that's not as fast as what we do do.}
-     *
-     * @param BCMath $y
-     * @return int in case < 0 if $this is less than $y; > 0 if $this is greater than $y, and 0 if they are equal.
-     * @see self::equals()
-     */
-    public function compare(BCMath $y)
-    {
-        return bccomp($this->value, $y->value, 0);
-    }
-
-    /**
-     * Tests the equality of two numbers.
-     *
-     * If you need to see if one number is greater than or less than another number, use BigInteger::compare()
-     *
-     * @param BCMath $x
-     * @return bool
-     */
-    public function equals(BCMath $x)
-    {
-        return $this->value == $x->value;
-    }
-
-    /**
-     * Performs modular exponentiation.
-     *
-     * @param BCMath $e
-     * @param BCMath $n
-     * @return BCMath
-     */
-    public function modPow(BCMath $e, BCMath $n)
-    {
-        return $this->powModOuter($e, $n);
-    }
-
-    /**
-     * Performs modular exponentiation.
-     *
-     * Alias for modPow().
-     *
-     * @param BCMath $e
-     * @param BCMath $n
-     * @return BCMath
-     */
-    public function powMod(BCMath $e, BCMath $n)
-    {
-        return $this->powModOuter($e, $n);
-    }
-
-    /**
-     * Performs modular exponentiation.
-     *
-     * @param BCMath $e
-     * @param BCMath $n
-     * @return BCMath
-     */
-    protected function powModInner(BCMath $e, BCMath $n)
-    {
-        try {
-            $class = static::$modexpEngine[static::class];
-            return $class::powModHelper($this, $e, $n, static::class);
-        } catch (\Exception $err) {
-            return BCMath\DefaultEngine::powModHelper($this, $e, $n, static::class);
-        }
-    }
-
-    /**
-     * Normalize
-     *
-     * Removes leading zeros and truncates (if necessary) to maintain the appropriate precision
-     *
-     * @param BCMath $result
-     * @return BCMath
-     */
-    protected function normalize(BCMath $result)
-    {
-        $result->precision = $this->precision;
-        $result->bitmask = $this->bitmask;
-
-        if ($result->bitmask !== false) {
-            $result->value = bcmod($result->value, $result->bitmask->value);
-        }
-
-        return $result;
-    }
-
-    /**
-     * Generate a random prime number between a range
-     *
-     * If there's not a prime within the given range, false will be returned.
-     *
-     * @param BCMath $min
-     * @param BCMath $max
-     * @return false|BCMath
-     */
-    public static function randomRangePrime(BCMath $min, BCMath $max)
-    {
-        return self::randomRangePrimeOuter($min, $max);
-    }
-
-    /**
-     * Generate a random number between a range
-     *
-     * Returns a random number between $min and $max where $min and $max
-     * can be defined using one of the two methods:
-     *
-     * BigInteger::randomRange($min, $max)
-     * BigInteger::randomRange($max, $min)
-     *
-     * @param BCMath $min
-     * @param BCMath $max
-     * @return BCMath
-     */
-    public static function randomRange(BCMath $min, BCMath $max)
-    {
-        return self::randomRangeHelper($min, $max);
-    }
-
-    /**
-     * Make the current number odd
-     *
-     * If the current number is odd it'll be unchanged.  If it's even, one will be added to it.
-     *
-     * @see self::randomPrime()
-     */
-    protected function make_odd()
-    {
-        if (!$this->isOdd()) {
-            $this->value = bcadd($this->value, '1');
-        }
-    }
-
-    /**
-     * Test the number against small primes.
-     *
-     * @see self::isPrime()
-     */
-    protected function testSmallPrimes()
-    {
-        if ($this->value === '1') {
-            return false;
-        }
-        if ($this->value === '2') {
-            return true;
-        }
-        if ($this->value[strlen($this->value) - 1] % 2 == 0) {
-            return false;
-        }
-
-        $value = $this->value;
-
-        foreach (self::PRIMES as $prime) {
-            $r = bcmod($this->value, $prime);
-            if ($r == '0') {
-                return $this->value == $prime;
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * Scan for 1 and right shift by that amount
-     *
-     * ie. $s = gmp_scan1($n, 0) and $r = gmp_div_q($n, gmp_pow(gmp_init('2'), $s));
-     *
-     * @param BCMath $r
-     * @return int
-     * @see self::isPrime()
-     */
-    public static function scan1divide(BCMath $r)
-    {
-        $r_value = &$r->value;
-        $s = 0;
-        // if $n was 1, $r would be 0 and this would be an infinite loop, hence our $this->equals(static::$one[static::class]) check earlier
-        while ($r_value[strlen($r_value) - 1] % 2 == 0) {
-            $r_value = bcdiv($r_value, '2', 0);
-            ++$s;
-        }
-
-        return $s;
-    }
-
-    /**
-     * Performs exponentiation.
-     *
-     * @param BCMath $n
-     * @return BCMath
-     */
-    public function pow(BCMath $n)
-    {
-        $temp = new self();
-        $temp->value = bcpow($this->value, $n->value);
-
-        return $this->normalize($temp);
-    }
-
-    /**
-     * Return the minimum BigInteger between an arbitrary number of BigIntegers.
-     *
-     * @param BCMath ...$nums
-     * @return BCMath
-     */
-    public static function min(BCMath ...$nums)
-    {
-        return self::minHelper($nums);
-    }
-
-    /**
-     * Return the maximum BigInteger between an arbitrary number of BigIntegers.
-     *
-     * @param BCMath ...$nums
-     * @return BCMath
-     */
-    public static function max(BCMath ...$nums)
-    {
-        return self::maxHelper($nums);
-    }
-
-    /**
-     * Tests BigInteger to see if it is between two integers, inclusive
-     *
-     * @param BCMath $min
-     * @param BCMath $max
-     * @return bool
-     */
-    public function between(BCMath $min, BCMath $max)
-    {
-        return $this->compare($min) >= 0 && $this->compare($max) <= 0;
-    }
-
-    /**
-     * Set Bitmask
-     *
-     * @param int $bits
-     * @return Engine
-     * @see self::setPrecision()
-     */
-    protected static function setBitmask($bits)
-    {
-        $temp = parent::setBitmask($bits);
-        return $temp->add(static::$one[static::class]);
-    }
-
-    /**
-     * Is Odd?
-     *
-     * @return bool
-     */
-    public function isOdd()
-    {
-        return $this->value[strlen($this->value) - 1] % 2 == 1;
-    }
-
-    /**
-     * Tests if a bit is set
-     *
-     * @return bool
-     */
-    public function testBit($x)
-    {
-        return bccomp(
-            bcmod($this->value, bcpow('2', $x + 1, 0)),
-            bcpow('2', $x, 0),
-            0
-        ) >= 0;
-    }
-
-    /**
-     * Is Negative?
-     *
-     * @return bool
-     */
-    public function isNegative()
-    {
-        return strlen($this->value) && $this->value[0] == '-';
-    }
-
-    /**
-     * Negate
-     *
-     * Given $k, returns -$k
-     *
-     * @return BCMath
-     */
-    public function negate()
-    {
-        $temp = clone $this;
-
-        if (!strlen($temp->value)) {
-            return $temp;
-        }
-
-        $temp->value = $temp->value[0] == '-' ?
-            substr($this->value, 1) :
-            '-' . $this->value;
-
-        return $temp;
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger/Engines/BCMath/Base.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger/Engines/BCMath/Base.php
deleted file mode 100644
index fe21e041..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger/Engines/BCMath/Base.php
+++ /dev/null
@@ -1,110 +0,0 @@
-<?php
-
-/**
- * Modular Exponentiation Engine
- *
- * PHP version 5 and 7
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2017 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://pear.php.net/package/Math_BigInteger
- */
-
-namespace phpseclib3\Math\BigInteger\Engines\BCMath;
-
-use phpseclib3\Math\BigInteger\Engines\BCMath;
-
-/**
- * Sliding Window Exponentiation Engine
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class Base extends BCMath
-{
-    /**
-     * Cache constants
-     *
-     * $cache[self::VARIABLE] tells us whether or not the cached data is still valid.
-     *
-     */
-    const VARIABLE = 0;
-    /**
-     * $cache[self::DATA] contains the cached data.
-     *
-     */
-    const DATA = 1;
-
-    /**
-     * Test for engine validity
-     *
-     * @return bool
-     */
-    public static function isValidEngine()
-    {
-        return static::class != __CLASS__;
-    }
-
-    /**
-     * Performs modular exponentiation.
-     *
-     * @param BCMath $x
-     * @param BCMath $e
-     * @param BCMath $n
-     * @param string $class
-     * @return BCMath
-     */
-    protected static function powModHelper(BCMath $x, BCMath $e, BCMath $n, $class)
-    {
-        if (empty($e->value)) {
-            $temp = new $class();
-            $temp->value = '1';
-            return $x->normalize($temp);
-        }
-
-        return $x->normalize(static::slidingWindow($x, $e, $n, $class));
-    }
-
-    /**
-     * Modular reduction preparation
-     *
-     * @param string $x
-     * @param string $n
-     * @param string $class
-     * @see self::slidingWindow()
-     * @return string
-     */
-    protected static function prepareReduce($x, $n, $class)
-    {
-        return static::reduce($x, $n);
-    }
-
-    /**
-     * Modular multiply
-     *
-     * @param string $x
-     * @param string $y
-     * @param string $n
-     * @param string $class
-     * @see self::slidingWindow()
-     * @return string
-     */
-    protected static function multiplyReduce($x, $y, $n, $class)
-    {
-        return static::reduce(bcmul($x, $y), $n);
-    }
-
-    /**
-     * Modular square
-     *
-     * @param string $x
-     * @param string $n
-     * @param string $class
-     * @see self::slidingWindow()
-     * @return string
-     */
-    protected static function squareReduce($x, $n, $class)
-    {
-        return static::reduce(bcmul($x, $x), $n);
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger/Engines/BCMath/BuiltIn.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger/Engines/BCMath/BuiltIn.php
deleted file mode 100644
index b7ca8a2c..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger/Engines/BCMath/BuiltIn.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-/**
- * Built-In BCMath Modular Exponentiation Engine
- *
- * PHP version 5 and 7
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2017 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://pear.php.net/package/Math_BigInteger
- */
-
-namespace phpseclib3\Math\BigInteger\Engines\BCMath;
-
-use phpseclib3\Math\BigInteger\Engines\BCMath;
-
-/**
- * Built-In BCMath Modular Exponentiation Engine
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class BuiltIn extends BCMath
-{
-    /**
-     * Performs modular exponentiation.
-     *
-     * @param BCMath $x
-     * @param BCMath $e
-     * @param BCMath $n
-     * @return BCMath
-     */
-    protected static function powModHelper(BCMath $x, BCMath $e, BCMath $n)
-    {
-        $temp = new BCMath();
-        $temp->value = bcpowmod($x->value, $e->value, $n->value);
-
-        return $x->normalize($temp);
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger/Engines/BCMath/DefaultEngine.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger/Engines/BCMath/DefaultEngine.php
deleted file mode 100644
index b2d9fa95..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger/Engines/BCMath/DefaultEngine.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-/**
- * BCMath Default Modular Exponentiation Engine
- *
- * PHP version 5 and 7
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2017 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://pear.php.net/package/Math_BigInteger
- */
-
-namespace phpseclib3\Math\BigInteger\Engines\BCMath;
-
-use phpseclib3\Math\BigInteger\Engines\BCMath\Reductions\Barrett;
-
-/**
- * PHP Default Modular Exponentiation Engine
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class DefaultEngine extends Barrett
-{
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger/Engines/BCMath/OpenSSL.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger/Engines/BCMath/OpenSSL.php
deleted file mode 100644
index aed94942..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger/Engines/BCMath/OpenSSL.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-/**
- * OpenSSL Modular Exponentiation Engine
- *
- * PHP version 5 and 7
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2017 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://pear.php.net/package/Math_BigInteger
- */
-
-namespace phpseclib3\Math\BigInteger\Engines\BCMath;
-
-use phpseclib3\Math\BigInteger\Engines\OpenSSL as Progenitor;
-
-/**
- * OpenSSL Modular Exponentiation Engine
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class OpenSSL extends Progenitor
-{
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger/Engines/BCMath/Reductions/Barrett.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger/Engines/BCMath/Reductions/Barrett.php
deleted file mode 100644
index 0fb7eaeb..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger/Engines/BCMath/Reductions/Barrett.php
+++ /dev/null
@@ -1,187 +0,0 @@
-<?php
-
-/**
- * BCMath Barrett Modular Exponentiation Engine
- *
- * PHP version 5 and 7
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2017 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://pear.php.net/package/Math_BigInteger
- */
-
-namespace phpseclib3\Math\BigInteger\Engines\BCMath\Reductions;
-
-use phpseclib3\Math\BigInteger\Engines\BCMath\Base;
-
-/**
- * PHP Barrett Modular Exponentiation Engine
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class Barrett extends Base
-{
-    /**
-     * Cache constants
-     *
-     * $cache[self::VARIABLE] tells us whether or not the cached data is still valid.
-     *
-     */
-    const VARIABLE = 0;
-    /**
-     * $cache[self::DATA] contains the cached data.
-     *
-     */
-    const DATA = 1;
-
-    /**
-     * Barrett Modular Reduction
-     *
-     * See {@link http://www.cacr.math.uwaterloo.ca/hac/about/chap14.pdf#page=14 HAC 14.3.3} /
-     * {@link http://math.libtomcrypt.com/files/tommath.pdf#page=165 MPM 6.2.5} for more information.  Modified slightly,
-     * so as not to require negative numbers (initially, this script didn't support negative numbers).
-     *
-     * Employs "folding", as described at
-     * {@link http://www.cosic.esat.kuleuven.be/publications/thesis-149.pdf#page=66 thesis-149.pdf#page=66}.  To quote from
-     * it, "the idea [behind folding] is to find a value x' such that x (mod m) = x' (mod m), with x' being smaller than x."
-     *
-     * Unfortunately, the "Barrett Reduction with Folding" algorithm described in thesis-149.pdf is not, as written, all that
-     * usable on account of (1) its not using reasonable radix points as discussed in
-     * {@link http://math.libtomcrypt.com/files/tommath.pdf#page=162 MPM 6.2.2} and (2) the fact that, even with reasonable
-     * radix points, it only works when there are an even number of digits in the denominator.  The reason for (2) is that
-     * (x >> 1) + (x >> 1) != x / 2 + x / 2.  If x is even, they're the same, but if x is odd, they're not.  See the in-line
-     * comments for details.
-     *
-     * @param string $n
-     * @param string $m
-     * @return string
-     */
-    protected static function reduce($n, $m)
-    {
-        static $cache = [
-            self::VARIABLE => [],
-            self::DATA => []
-        ];
-
-        $m_length = strlen($m);
-
-        if (strlen($n) > 2 * $m_length) {
-            return bcmod($n, $m);
-        }
-
-        // if (m.length >> 1) + 2 <= m.length then m is too small and n can't be reduced
-        if ($m_length < 5) {
-            return self::regularBarrett($n, $m);
-        }
-        // n = 2 * m.length
-
-        if (($key = array_search($m, $cache[self::VARIABLE])) === false) {
-            $key = count($cache[self::VARIABLE]);
-            $cache[self::VARIABLE][] = $m;
-
-            $lhs = '1' . str_repeat('0', $m_length + ($m_length >> 1));
-            $u = bcdiv($lhs, $m, 0);
-            $m1 = bcsub($lhs, bcmul($u, $m));
-
-            $cache[self::DATA][] = [
-                'u' => $u, // m.length >> 1 (technically (m.length >> 1) + 1)
-                'm1' => $m1 // m.length
-            ];
-        } else {
-            extract($cache[self::DATA][$key]);
-        }
-
-        $cutoff = $m_length + ($m_length >> 1);
-
-        $lsd = substr($n, -$cutoff);
-        $msd = substr($n, 0, -$cutoff);
-
-        $temp = bcmul($msd, $m1); // m.length + (m.length >> 1)
-        $n = bcadd($lsd, $temp); // m.length + (m.length >> 1) + 1 (so basically we're adding two same length numbers)
-        //if ($m_length & 1) {
-        //    return self::regularBarrett($n, $m);
-        //}
-
-        // (m.length + (m.length >> 1) + 1) - (m.length - 1) == (m.length >> 1) + 2
-        $temp = substr($n, 0, -$m_length + 1);
-        // if even: ((m.length >> 1) + 2) + (m.length >> 1) == m.length + 2
-        // if odd:  ((m.length >> 1) + 2) + (m.length >> 1) == (m.length - 1) + 2 == m.length + 1
-        $temp = bcmul($temp, $u);
-        // if even: (m.length + 2) - ((m.length >> 1) + 1) = m.length - (m.length >> 1) + 1
-        // if odd:  (m.length + 1) - ((m.length >> 1) + 1) = m.length - (m.length >> 1)
-        $temp = substr($temp, 0, -($m_length >> 1) - 1);
-        // if even: (m.length - (m.length >> 1) + 1) + m.length = 2 * m.length - (m.length >> 1) + 1
-        // if odd:  (m.length - (m.length >> 1)) + m.length     = 2 * m.length - (m.length >> 1)
-        $temp = bcmul($temp, $m);
-
-        // at this point, if m had an odd number of digits, we'd be subtracting a 2 * m.length - (m.length >> 1) digit
-        // number from a m.length + (m.length >> 1) + 1 digit number.  ie. there'd be an extra digit and the while loop
-        // following this comment would loop a lot (hence our calling _regularBarrett() in that situation).
-
-        $result = bcsub($n, $temp);
-
-        //if (bccomp($result, '0') < 0) {
-        if ($result[0] == '-') {
-            $temp = '1' . str_repeat('0', $m_length + 1);
-            $result = bcadd($result, $temp);
-        }
-
-        while (bccomp($result, $m) >= 0) {
-            $result = bcsub($result, $m);
-        }
-
-        return $result;
-    }
-
-    /**
-     * (Regular) Barrett Modular Reduction
-     *
-     * For numbers with more than four digits BigInteger::_barrett() is faster.  The difference between that and this
-     * is that this function does not fold the denominator into a smaller form.
-     *
-     * @param string $x
-     * @param string $n
-     * @return string
-     */
-    private static function regularBarrett($x, $n)
-    {
-        static $cache = [
-            self::VARIABLE => [],
-            self::DATA => []
-        ];
-
-        $n_length = strlen($n);
-
-        if (strlen($x) > 2 * $n_length) {
-            return bcmod($x, $n);
-        }
-
-        if (($key = array_search($n, $cache[self::VARIABLE])) === false) {
-            $key = count($cache[self::VARIABLE]);
-            $cache[self::VARIABLE][] = $n;
-            $lhs = '1' . str_repeat('0', 2 * $n_length);
-            $cache[self::DATA][] = bcdiv($lhs, $n, 0);
-        }
-
-        $temp = substr($x, 0, -$n_length + 1);
-        $temp = bcmul($temp, $cache[self::DATA][$key]);
-        $temp = substr($temp, 0, -$n_length - 1);
-
-        $r1 = substr($x, -$n_length - 1);
-        $r2 = substr(bcmul($temp, $n), -$n_length - 1);
-        $result = bcsub($r1, $r2);
-
-        //if (bccomp($result, '0') < 0) {
-        if ($result[0] == '-') {
-            $q = '1' . str_repeat('0', $n_length + 1);
-            $result = bcadd($result, $q);
-        }
-
-        while (bccomp($result, $n) >= 0) {
-            $result = bcsub($result, $n);
-        }
-
-        return $result;
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger/Engines/BCMath/Reductions/EvalBarrett.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger/Engines/BCMath/Reductions/EvalBarrett.php
deleted file mode 100644
index e033ba57..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger/Engines/BCMath/Reductions/EvalBarrett.php
+++ /dev/null
@@ -1,108 +0,0 @@
-<?php
-
-/**
- * BCMath Dynamic Barrett Modular Exponentiation Engine
- *
- * PHP version 5 and 7
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2017 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://pear.php.net/package/Math_BigInteger
- */
-
-namespace phpseclib3\Math\BigInteger\Engines\BCMath\Reductions;
-
-use phpseclib3\Math\BigInteger\Engines\BCMath;
-use phpseclib3\Math\BigInteger\Engines\BCMath\Base;
-
-/**
- * PHP Barrett Modular Exponentiation Engine
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class EvalBarrett extends Base
-{
-    /**
-     * Custom Reduction Function
-     *
-     * @see self::generateCustomReduction
-     */
-    private static $custom_reduction;
-
-    /**
-     * Barrett Modular Reduction
-     *
-     * This calls a dynamically generated loop unrolled function that's specific to a given modulo.
-     * Array lookups are avoided as are if statements testing for how many bits the host OS supports, etc.
-     *
-     * @param string $n
-     * @param string $m
-     * @return string
-     */
-    protected static function reduce($n, $m)
-    {
-        $inline = self::$custom_reduction;
-        return $inline($n);
-    }
-
-    /**
-     * Generate Custom Reduction
-     *
-     * @param BCMath $m
-     * @param string $class
-     * @return callable|void
-     */
-    protected static function generateCustomReduction(BCMath $m, $class)
-    {
-        $m_length = strlen($m);
-
-        if ($m_length < 5) {
-            $code = 'return bcmod($x, $n);';
-            eval('$func = function ($n) { ' . $code . '};');
-            self::$custom_reduction = $func;
-            return;
-        }
-
-        $lhs = '1' . str_repeat('0', $m_length + ($m_length >> 1));
-        $u = bcdiv($lhs, $m, 0);
-        $m1 = bcsub($lhs, bcmul($u, $m));
-
-        $cutoff = $m_length + ($m_length >> 1);
-
-        $m = "'$m'";
-        $u = "'$u'";
-        $m1 = "'$m1'";
-
-        $code = '
-            $lsd = substr($n, -' . $cutoff . ');
-            $msd = substr($n, 0, -' . $cutoff . ');
-
-            $temp = bcmul($msd, ' . $m1 . ');
-            $n = bcadd($lsd, $temp);
-
-            $temp = substr($n, 0, ' . (-$m_length + 1) . ');
-            $temp = bcmul($temp, ' . $u . ');
-            $temp = substr($temp, 0, ' . (-($m_length >> 1) - 1) . ');
-            $temp = bcmul($temp, ' . $m . ');
-
-            $result = bcsub($n, $temp);
-
-            if ($result[0] == \'-\') {
-                $temp = \'1' . str_repeat('0', $m_length + 1) . '\';
-                $result = bcadd($result, $temp);
-            }
-
-            while (bccomp($result, ' . $m . ') >= 0) {
-                $result = bcsub($result, ' . $m . ');
-            }
-
-            return $result;';
-
-        eval('$func = function ($n) { ' . $code . '};');
-
-        self::$custom_reduction = $func;
-
-        return $func;
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger/Engines/Engine.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger/Engines/Engine.php
deleted file mode 100644
index 474abe10..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger/Engines/Engine.php
+++ /dev/null
@@ -1,1299 +0,0 @@
-<?php
-
-/**
- * Base BigInteger Engine
- *
- * PHP version 5 and 7
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2017 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://pear.php.net/package/Math_BigInteger
- */
-
-namespace phpseclib3\Math\BigInteger\Engines;
-
-use phpseclib3\Common\Functions\Strings;
-use phpseclib3\Crypt\Random;
-use phpseclib3\Exception\BadConfigurationException;
-use phpseclib3\Math\BigInteger;
-
-/**
- * Base Engine.
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class Engine implements \JsonSerializable
-{
-    /* final protected */ const PRIMES = [
-        3,   5,   7,   11,  13,  17,  19,  23,  29,  31,  37,  41,  43,  47,  53,  59,
-        61,  67,  71,  73,  79,  83,  89,  97,  101, 103, 107, 109, 113, 127, 131, 137,
-        139, 149, 151, 157, 163, 167, 173, 179, 181, 191, 193, 197, 199, 211, 223, 227,
-        229, 233, 239, 241, 251, 257, 263, 269, 271, 277, 281, 283, 293, 307, 311, 313,
-        317, 331, 337, 347, 349, 353, 359, 367, 373, 379, 383, 389, 397, 401, 409, 419,
-        421, 431, 433, 439, 443, 449, 457, 461, 463, 467, 479, 487, 491, 499, 503, 509,
-        521, 523, 541, 547, 557, 563, 569, 571, 577, 587, 593, 599, 601, 607, 613, 617,
-        619, 631, 641, 643, 647, 653, 659, 661, 673, 677, 683, 691, 701, 709, 719, 727,
-        733, 739, 743, 751, 757, 761, 769, 773, 787, 797, 809, 811, 821, 823, 827, 829,
-        839, 853, 857, 859, 863, 877, 881, 883, 887, 907, 911, 919, 929, 937, 941, 947,
-        953, 967, 971, 977, 983, 991, 997,
-    ];
-
-    /**
-     * BigInteger(0)
-     *
-     * @var array<class-string<static>, static>
-     */
-    protected static $zero = [];
-
-    /**
-     * BigInteger(1)
-     *
-     * @var array<class-string<static>, static>
-     */
-    protected static $one  = [];
-
-    /**
-     * BigInteger(2)
-     *
-     * @var array<class-string<static>, static>
-     */
-    protected static $two = [];
-
-    /**
-     * Modular Exponentiation Engine
-     *
-     * @var array<class-string<static>, class-string<static>>
-     */
-    protected static $modexpEngine;
-
-    /**
-     * Engine Validity Flag
-     *
-     * @var array<class-string<static>, bool>
-     */
-    protected static $isValidEngine;
-
-    /**
-     * Holds the BigInteger's value
-     *
-     * @var \GMP|string|array|int
-     */
-    protected $value;
-
-    /**
-     * Holds the BigInteger's sign
-     *
-     * @var bool
-     */
-    protected $is_negative;
-
-    /**
-     * Precision
-     *
-     * @see static::setPrecision()
-     * @var int
-     */
-    protected $precision = -1;
-
-    /**
-     * Precision Bitmask
-     *
-     * @see static::setPrecision()
-     * @var static|false
-     */
-    protected $bitmask = false;
-
-    /**
-     * Recurring Modulo Function
-     *
-     * @var callable
-     */
-    protected $reduce;
-
-    /**
-     * Mode independent value used for serialization.
-     *
-     * @see self::__sleep()
-     * @see self::__wakeup()
-     * @var string
-     */
-    protected $hex;
-
-    /**
-     * Default constructor
-     *
-     * @param int|numeric-string $x integer Base-10 number or base-$base number if $base set.
-     * @param int $base
-     */
-    public function __construct($x = 0, $base = 10)
-    {
-        if (!array_key_exists(static::class, static::$zero)) {
-            static::$zero[static::class] = null; // Placeholder to prevent infinite loop.
-            static::$zero[static::class] = new static(0);
-            static::$one[static::class] = new static(1);
-            static::$two[static::class] = new static(2);
-        }
-
-        // '0' counts as empty() but when the base is 256 '0' is equal to ord('0') or 48
-        // '0' is the only value like this per http://php.net/empty
-        if (empty($x) && (abs($base) != 256 || $x !== '0')) {
-            return;
-        }
-
-        switch ($base) {
-            case -256:
-            case 256:
-                if ($base == -256 && (ord($x[0]) & 0x80)) {
-                    $this->value = ~$x;
-                    $this->is_negative = true;
-                } else {
-                    $this->value = $x;
-                    $this->is_negative = false;
-                }
-
-                $this->initialize($base);
-
-                if ($this->is_negative) {
-                    $temp = $this->add(new static('-1'));
-                    $this->value = $temp->value;
-                }
-                break;
-            case -16:
-            case 16:
-                if ($base > 0 && $x[0] == '-') {
-                    $this->is_negative = true;
-                    $x = substr($x, 1);
-                }
-
-                $x = preg_replace('#^(?:0x)?([A-Fa-f0-9]*).*#s', '$1', $x);
-
-                $is_negative = false;
-                if ($base < 0 && hexdec($x[0]) >= 8) {
-                    $this->is_negative = $is_negative = true;
-                    $x = Strings::bin2hex(~Strings::hex2bin($x));
-                }
-
-                $this->value = $x;
-                $this->initialize($base);
-
-                if ($is_negative) {
-                    $temp = $this->add(new static('-1'));
-                    $this->value = $temp->value;
-                }
-                break;
-            case -10:
-            case 10:
-                // (?<!^)(?:-).*: find any -'s that aren't at the beginning and then any characters that follow that
-                // (?<=^|-)0*: find any 0's that are preceded by the start of the string or by a - (ie. octals)
-                // [^-0-9].*: find any non-numeric characters and then any characters that follow that
-                $this->value = preg_replace('#(?<!^)(?:-).*|(?<=^|-)0*|[^-0-9].*#s', '', $x);
-                if (!strlen($this->value) || $this->value == '-') {
-                    $this->value = '0';
-                }
-                $this->initialize($base);
-                break;
-            case -2:
-            case 2:
-                if ($base > 0 && $x[0] == '-') {
-                    $this->is_negative = true;
-                    $x = substr($x, 1);
-                }
-
-                $x = preg_replace('#^([01]*).*#s', '$1', $x);
-
-                $temp = new static(Strings::bits2bin($x), 128 * $base); // ie. either -16 or +16
-                $this->value = $temp->value;
-                if ($temp->is_negative) {
-                    $this->is_negative = true;
-                }
-
-                break;
-            default:
-                // base not supported, so we'll let $this == 0
-        }
-    }
-
-    /**
-     * Sets engine type.
-     *
-     * Throws an exception if the type is invalid
-     *
-     * @param class-string<Engine> $engine
-     */
-    public static function setModExpEngine($engine)
-    {
-        $fqengine = '\\phpseclib3\\Math\\BigInteger\\Engines\\' . static::ENGINE_DIR . '\\' . $engine;
-        if (!class_exists($fqengine) || !method_exists($fqengine, 'isValidEngine')) {
-            throw new \InvalidArgumentException("$engine is not a valid engine");
-        }
-        if (!$fqengine::isValidEngine()) {
-            throw new BadConfigurationException("$engine is not setup correctly on this system");
-        }
-        static::$modexpEngine[static::class] = $fqengine;
-    }
-
-    /**
-     * Converts a BigInteger to a byte string (eg. base-256).
-     *
-     * Negative numbers are saved as positive numbers, unless $twos_compliment is set to true, at which point, they're
-     * saved as two's compliment.
-     * @return string
-     */
-    protected function toBytesHelper()
-    {
-        $comparison = $this->compare(new static());
-        if ($comparison == 0) {
-            return $this->precision > 0 ? str_repeat(chr(0), ($this->precision + 1) >> 3) : '';
-        }
-
-        $temp = $comparison < 0 ? $this->add(new static(1)) : $this;
-        $bytes = $temp->toBytes();
-
-        if (!strlen($bytes)) { // eg. if the number we're trying to convert is -1
-            $bytes = chr(0);
-        }
-
-        if (ord($bytes[0]) & 0x80) {
-            $bytes = chr(0) . $bytes;
-        }
-
-        return $comparison < 0 ? ~$bytes : $bytes;
-    }
-
-    /**
-     * Converts a BigInteger to a hex string (eg. base-16).
-     *
-     * @param bool $twos_compliment
-     * @return string
-     */
-    public function toHex($twos_compliment = false)
-    {
-        return Strings::bin2hex($this->toBytes($twos_compliment));
-    }
-
-    /**
-     * Converts a BigInteger to a bit string (eg. base-2).
-     *
-     * Negative numbers are saved as positive numbers, unless $twos_compliment is set to true, at which point, they're
-     * saved as two's compliment.
-     *
-     * @param bool $twos_compliment
-     * @return string
-     */
-    public function toBits($twos_compliment = false)
-    {
-        $hex = $this->toBytes($twos_compliment);
-        $bits = Strings::bin2bits($hex);
-
-        $result = $this->precision > 0 ? substr($bits, -$this->precision) : ltrim($bits, '0');
-
-        if ($twos_compliment && $this->compare(new static()) > 0 && $this->precision <= 0) {
-            return '0' . $result;
-        }
-
-        return $result;
-    }
-
-    /**
-     * Calculates modular inverses.
-     *
-     * Say you have (30 mod 17 * x mod 17) mod 17 == 1.  x can be found using modular inverses.
-     *
-     * {@internal See {@link http://www.cacr.math.uwaterloo.ca/hac/about/chap14.pdf#page=21 HAC 14.64} for more information.}
-     *
-     * @param Engine $n
-     * @return static|false
-     */
-    protected function modInverseHelper(Engine $n)
-    {
-        // $x mod -$n == $x mod $n.
-        $n = $n->abs();
-
-        if ($this->compare(static::$zero[static::class]) < 0) {
-            $temp = $this->abs();
-            $temp = $temp->modInverse($n);
-            return $this->normalize($n->subtract($temp));
-        }
-
-        extract($this->extendedGCD($n));
-        /**
-         * @var Engine $gcd
-         * @var Engine $x
-         */
-
-        if (!$gcd->equals(static::$one[static::class])) {
-            return false;
-        }
-
-        $x = $x->compare(static::$zero[static::class]) < 0 ? $x->add($n) : $x;
-
-        return $this->compare(static::$zero[static::class]) < 0 ? $this->normalize($n->subtract($x)) : $this->normalize($x);
-    }
-
-    /**
-     * Serialize
-     *
-     * Will be called, automatically, when serialize() is called on a BigInteger object.
-     *
-     * @return array
-     */
-    public function __sleep()
-    {
-        $this->hex = $this->toHex(true);
-        $vars = ['hex'];
-        if ($this->precision > 0) {
-            $vars[] = 'precision';
-        }
-        return $vars;
-    }
-
-    /**
-     * Serialize
-     *
-     * Will be called, automatically, when unserialize() is called on a BigInteger object.
-     *
-     * @return void
-     */
-    public function __wakeup()
-    {
-        $temp = new static($this->hex, -16);
-        $this->value = $temp->value;
-        $this->is_negative = $temp->is_negative;
-        if ($this->precision > 0) {
-            // recalculate $this->bitmask
-            $this->setPrecision($this->precision);
-        }
-    }
-
-    /**
-     * JSON Serialize
-     *
-     * Will be called, automatically, when json_encode() is called on a BigInteger object.
-     *
-     * @return array{hex: string, precision?: int]
-     */
-    #[\ReturnTypeWillChange]
-    public function jsonSerialize()
-    {
-        $result = ['hex' => $this->toHex(true)];
-        if ($this->precision > 0) {
-            $result['precision'] = $this->precision;
-        }
-        return $result;
-    }
-
-    /**
-     * Converts a BigInteger to a base-10 number.
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->toString();
-    }
-
-    /**
-     *  __debugInfo() magic method
-     *
-     * Will be called, automatically, when print_r() or var_dump() are called
-     *
-     * @return array
-     */
-    public function __debugInfo()
-    {
-        $result = [
-            'value' => '0x' . $this->toHex(true),
-            'engine' => basename(static::class)
-        ];
-        return $this->precision > 0 ? $result + ['precision' => $this->precision] : $result;
-    }
-
-    /**
-     * Set Precision
-     *
-     * Some bitwise operations give different results depending on the precision being used.  Examples include left
-     * shift, not, and rotates.
-     *
-     * @param int $bits
-     */
-    public function setPrecision($bits)
-    {
-        if ($bits < 1) {
-            $this->precision = -1;
-            $this->bitmask = false;
-
-            return;
-        }
-        $this->precision = $bits;
-        $this->bitmask = static::setBitmask($bits);
-
-        $temp = $this->normalize($this);
-        $this->value = $temp->value;
-    }
-
-    /**
-     * Get Precision
-     *
-     * Returns the precision if it exists, -1 if it doesn't
-     *
-     * @return int
-     */
-    public function getPrecision()
-    {
-        return $this->precision;
-    }
-
-    /**
-     * Set Bitmask
-     * @return static
-     * @param int $bits
-     * @see self::setPrecision()
-     */
-    protected static function setBitmask($bits)
-    {
-        return new static(chr((1 << ($bits & 0x7)) - 1) . str_repeat(chr(0xFF), $bits >> 3), 256);
-    }
-
-    /**
-     * Logical Not
-     *
-     * @return Engine|string
-     */
-    public function bitwise_not()
-    {
-        // calculuate "not" without regard to $this->precision
-        // (will always result in a smaller number.  ie. ~1 isn't 1111 1110 - it's 0)
-        $temp = $this->toBytes();
-        if ($temp == '') {
-            return $this->normalize(static::$zero[static::class]);
-        }
-        $pre_msb = decbin(ord($temp[0]));
-        $temp = ~$temp;
-        $msb = decbin(ord($temp[0]));
-        if (strlen($msb) == 8) {
-            $msb = substr($msb, strpos($msb, '0'));
-        }
-        $temp[0] = chr(bindec($msb));
-
-        // see if we need to add extra leading 1's
-        $current_bits = strlen($pre_msb) + 8 * strlen($temp) - 8;
-        $new_bits = $this->precision - $current_bits;
-        if ($new_bits <= 0) {
-            return $this->normalize(new static($temp, 256));
-        }
-
-        // generate as many leading 1's as we need to.
-        $leading_ones = chr((1 << ($new_bits & 0x7)) - 1) . str_repeat(chr(0xFF), $new_bits >> 3);
-
-        self::base256_lshift($leading_ones, $current_bits);
-
-        $temp = str_pad($temp, strlen($leading_ones), chr(0), STR_PAD_LEFT);
-
-        return $this->normalize(new static($leading_ones | $temp, 256));
-    }
-
-    /**
-     * Logical Left Shift
-     *
-     * Shifts binary strings $shift bits, essentially multiplying by 2**$shift.
-     *
-     * @param string $x
-     * @param int $shift
-     * @return void
-     */
-    protected static function base256_lshift(&$x, $shift)
-    {
-        if ($shift == 0) {
-            return;
-        }
-
-        $num_bytes = $shift >> 3; // eg. floor($shift/8)
-        $shift &= 7; // eg. $shift % 8
-
-        $carry = 0;
-        for ($i = strlen($x) - 1; $i >= 0; --$i) {
-            $temp = ord($x[$i]) << $shift | $carry;
-            $x[$i] = chr($temp);
-            $carry = $temp >> 8;
-        }
-        $carry = ($carry != 0) ? chr($carry) : '';
-        $x = $carry . $x . str_repeat(chr(0), $num_bytes);
-    }
-
-    /**
-     * Logical Left Rotate
-     *
-     * Instead of the top x bits being dropped they're appended to the shifted bit string.
-     *
-     * @param int $shift
-     * @return Engine
-     */
-    public function bitwise_leftRotate($shift)
-    {
-        $bits = $this->toBytes();
-
-        if ($this->precision > 0) {
-            $precision = $this->precision;
-            if (static::FAST_BITWISE) {
-                $mask = $this->bitmask->toBytes();
-            } else {
-                $mask = $this->bitmask->subtract(new static(1));
-                $mask = $mask->toBytes();
-            }
-        } else {
-            $temp = ord($bits[0]);
-            for ($i = 0; $temp >> $i; ++$i) {
-            }
-            $precision = 8 * strlen($bits) - 8 + $i;
-            $mask = chr((1 << ($precision & 0x7)) - 1) . str_repeat(chr(0xFF), $precision >> 3);
-        }
-
-        if ($shift < 0) {
-            $shift += $precision;
-        }
-        $shift %= $precision;
-
-        if (!$shift) {
-            return clone $this;
-        }
-
-        $left = $this->bitwise_leftShift($shift);
-        $left = $left->bitwise_and(new static($mask, 256));
-        $right = $this->bitwise_rightShift($precision - $shift);
-        $result = static::FAST_BITWISE ? $left->bitwise_or($right) : $left->add($right);
-        return $this->normalize($result);
-    }
-
-    /**
-     * Logical Right Rotate
-     *
-     * Instead of the bottom x bits being dropped they're prepended to the shifted bit string.
-     *
-     * @param int $shift
-     * @return Engine
-     */
-    public function bitwise_rightRotate($shift)
-    {
-        return $this->bitwise_leftRotate(-$shift);
-    }
-
-    /**
-     * Returns the smallest and largest n-bit number
-     *
-     * @param int $bits
-     * @return array{min: static, max: static}
-     */
-    public static function minMaxBits($bits)
-    {
-        $bytes = $bits >> 3;
-        $min = str_repeat(chr(0), $bytes);
-        $max = str_repeat(chr(0xFF), $bytes);
-        $msb = $bits & 7;
-        if ($msb) {
-            $min = chr(1 << ($msb - 1)) . $min;
-            $max = chr((1 << $msb) - 1) . $max;
-        } else {
-            $min[0] = chr(0x80);
-        }
-        return [
-            'min' => new static($min, 256),
-            'max' => new static($max, 256)
-        ];
-    }
-
-    /**
-     * Return the size of a BigInteger in bits
-     *
-     * @return int
-     */
-    public function getLength()
-    {
-        return strlen($this->toBits());
-    }
-
-    /**
-     * Return the size of a BigInteger in bytes
-     *
-     * @return int
-     */
-    public function getLengthInBytes()
-    {
-        return (int) ceil($this->getLength() / 8);
-    }
-
-    /**
-     * Performs some pre-processing for powMod
-     *
-     * @param Engine $e
-     * @param Engine $n
-     * @return static|false
-     */
-    protected function powModOuter(Engine $e, Engine $n)
-    {
-        $n = $this->bitmask !== false && $this->bitmask->compare($n) < 0 ? $this->bitmask : $n->abs();
-
-        if ($e->compare(new static()) < 0) {
-            $e = $e->abs();
-
-            $temp = $this->modInverse($n);
-            if ($temp === false) {
-                return false;
-            }
-
-            return $this->normalize($temp->powModInner($e, $n));
-        }
-
-        if ($this->compare($n) > 0) {
-            list(, $temp) = $this->divide($n);
-            return $temp->powModInner($e, $n);
-        }
-
-        return $this->powModInner($e, $n);
-    }
-
-    /**
-     * Sliding Window k-ary Modular Exponentiation
-     *
-     * Based on {@link http://www.cacr.math.uwaterloo.ca/hac/about/chap14.pdf#page=27 HAC 14.85} /
-     * {@link http://math.libtomcrypt.com/files/tommath.pdf#page=210 MPM 7.7}.  In a departure from those algorithims,
-     * however, this function performs a modular reduction after every multiplication and squaring operation.
-     * As such, this function has the same preconditions that the reductions being used do.
-     *
-     * @template T of Engine
-     * @param Engine $x
-     * @param Engine $e
-     * @param Engine $n
-     * @param class-string<T> $class
-     * @return T
-     */
-    protected static function slidingWindow(Engine $x, Engine $e, Engine $n, $class)
-    {
-        static $window_ranges = [7, 25, 81, 241, 673, 1793]; // from BigInteger.java's oddModPow function
-        //static $window_ranges = [0, 7, 36, 140, 450, 1303, 3529]; // from MPM 7.3.1
-
-        $e_bits = $e->toBits();
-        $e_length = strlen($e_bits);
-
-        // calculate the appropriate window size.
-        // $window_size == 3 if $window_ranges is between 25 and 81, for example.
-        for ($i = 0, $window_size = 1; $i < count($window_ranges) && $e_length > $window_ranges[$i]; ++$window_size, ++$i) {
-        }
-
-        $n_value = $n->value;
-
-        if (method_exists(static::class, 'generateCustomReduction')) {
-            static::generateCustomReduction($n, $class);
-        }
-
-        // precompute $this^0 through $this^$window_size
-        $powers = [];
-        $powers[1] = static::prepareReduce($x->value, $n_value, $class);
-        $powers[2] = static::squareReduce($powers[1], $n_value, $class);
-
-        // we do every other number since substr($e_bits, $i, $j+1) (see below) is supposed to end
-        // in a 1.  ie. it's supposed to be odd.
-        $temp = 1 << ($window_size - 1);
-        for ($i = 1; $i < $temp; ++$i) {
-            $i2 = $i << 1;
-            $powers[$i2 + 1] = static::multiplyReduce($powers[$i2 - 1], $powers[2], $n_value, $class);
-        }
-
-        $result = new $class(1);
-        $result = static::prepareReduce($result->value, $n_value, $class);
-
-        for ($i = 0; $i < $e_length;) {
-            if (!$e_bits[$i]) {
-                $result = static::squareReduce($result, $n_value, $class);
-                ++$i;
-            } else {
-                for ($j = $window_size - 1; $j > 0; --$j) {
-                    if (!empty($e_bits[$i + $j])) {
-                        break;
-                    }
-                }
-
-                // eg. the length of substr($e_bits, $i, $j + 1)
-                for ($k = 0; $k <= $j; ++$k) {
-                    $result = static::squareReduce($result, $n_value, $class);
-                }
-
-                $result = static::multiplyReduce($result, $powers[bindec(substr($e_bits, $i, $j + 1))], $n_value, $class);
-
-                $i += $j + 1;
-            }
-        }
-
-        $temp = new $class();
-        $temp->value = static::reduce($result, $n_value, $class);
-
-        return $temp;
-    }
-
-    /**
-     * Generates a random number of a certain size
-     *
-     * Bit length is equal to $size
-     *
-     * @param int $size
-     * @return Engine
-     */
-    public static function random($size)
-    {
-        extract(static::minMaxBits($size));
-        /**
-         * @var BigInteger $min
-         * @var BigInteger $max
-         */
-        return static::randomRange($min, $max);
-    }
-
-    /**
-     * Generates a random prime number of a certain size
-     *
-     * Bit length is equal to $size
-     *
-     * @param int $size
-     * @return Engine
-     */
-    public static function randomPrime($size)
-    {
-        extract(static::minMaxBits($size));
-        /**
-         * @var static $min
-         * @var static $max
-         */
-        return static::randomRangePrime($min, $max);
-    }
-
-    /**
-     * Performs some pre-processing for randomRangePrime
-     *
-     * @param Engine $min
-     * @param Engine $max
-     * @return static|false
-     */
-    protected static function randomRangePrimeOuter(Engine $min, Engine $max)
-    {
-        $compare = $max->compare($min);
-
-        if (!$compare) {
-            return $min->isPrime() ? $min : false;
-        } elseif ($compare < 0) {
-            // if $min is bigger then $max, swap $min and $max
-            $temp = $max;
-            $max = $min;
-            $min = $temp;
-        }
-
-        $length = $max->getLength();
-        if ($length > 8196) {
-            throw new \RuntimeException("Generation of random prime numbers larger than 8196 has been disabled ($length)");
-        }
-
-        $x = static::randomRange($min, $max);
-
-        return static::randomRangePrimeInner($x, $min, $max);
-    }
-
-    /**
-     * Generate a random number between a range
-     *
-     * Returns a random number between $min and $max where $min and $max
-     * can be defined using one of the two methods:
-     *
-     * BigInteger::randomRange($min, $max)
-     * BigInteger::randomRange($max, $min)
-     *
-     * @param Engine $min
-     * @param Engine $max
-     * @return Engine
-     */
-    protected static function randomRangeHelper(Engine $min, Engine $max)
-    {
-        $compare = $max->compare($min);
-
-        if (!$compare) {
-            return $min;
-        } elseif ($compare < 0) {
-            // if $min is bigger then $max, swap $min and $max
-            $temp = $max;
-            $max = $min;
-            $min = $temp;
-        }
-
-        if (!isset(static::$one[static::class])) {
-            static::$one[static::class] = new static(1);
-        }
-
-        $max = $max->subtract($min->subtract(static::$one[static::class]));
-
-        $size = strlen(ltrim($max->toBytes(), chr(0)));
-
-        /*
-            doing $random % $max doesn't work because some numbers will be more likely to occur than others.
-            eg. if $max is 140 and $random's max is 255 then that'd mean both $random = 5 and $random = 145
-            would produce 5 whereas the only value of random that could produce 139 would be 139. ie.
-            not all numbers would be equally likely. some would be more likely than others.
-
-            creating a whole new random number until you find one that is within the range doesn't work
-            because, for sufficiently small ranges, the likelihood that you'd get a number within that range
-            would be pretty small. eg. with $random's max being 255 and if your $max being 1 the probability
-            would be pretty high that $random would be greater than $max.
-
-            phpseclib works around this using the technique described here:
-
-            http://crypto.stackexchange.com/questions/5708/creating-a-small-number-from-a-cryptographically-secure-random-string
-        */
-        $random_max = new static(chr(1) . str_repeat("\0", $size), 256);
-        $random = new static(Random::string($size), 256);
-
-        list($max_multiple) = $random_max->divide($max);
-        $max_multiple = $max_multiple->multiply($max);
-
-        while ($random->compare($max_multiple) >= 0) {
-            $random = $random->subtract($max_multiple);
-            $random_max = $random_max->subtract($max_multiple);
-            $random = $random->bitwise_leftShift(8);
-            $random = $random->add(new static(Random::string(1), 256));
-            $random_max = $random_max->bitwise_leftShift(8);
-            list($max_multiple) = $random_max->divide($max);
-            $max_multiple = $max_multiple->multiply($max);
-        }
-        list(, $random) = $random->divide($max);
-
-        return $random->add($min);
-    }
-
-    /**
-     * Performs some post-processing for randomRangePrime
-     *
-     * @param Engine $x
-     * @param Engine $min
-     * @param Engine $max
-     * @return static|false
-     */
-    protected static function randomRangePrimeInner(Engine $x, Engine $min, Engine $max)
-    {
-        if (!isset(static::$two[static::class])) {
-            static::$two[static::class] = new static('2');
-        }
-
-        $x->make_odd();
-        if ($x->compare($max) > 0) {
-            // if $x > $max then $max is even and if $min == $max then no prime number exists between the specified range
-            if ($min->equals($max)) {
-                return false;
-            }
-            $x = clone $min;
-            $x->make_odd();
-        }
-
-        $initial_x = clone $x;
-
-        while (true) {
-            if ($x->isPrime()) {
-                return $x;
-            }
-
-            $x = $x->add(static::$two[static::class]);
-
-            if ($x->compare($max) > 0) {
-                $x = clone $min;
-                if ($x->equals(static::$two[static::class])) {
-                    return $x;
-                }
-                $x->make_odd();
-            }
-
-            if ($x->equals($initial_x)) {
-                return false;
-            }
-        }
-    }
-
-    /**
-     * Sets the $t parameter for primality testing
-     *
-     * @return int
-     */
-    protected function setupIsPrime()
-    {
-        $length = $this->getLengthInBytes();
-
-        // see HAC 4.49 "Note (controlling the error probability)"
-        // @codingStandardsIgnoreStart
-             if ($length >= 163) { $t =  2; } // floor(1300 / 8)
-        else if ($length >= 106) { $t =  3; } // floor( 850 / 8)
-        else if ($length >= 81 ) { $t =  4; } // floor( 650 / 8)
-        else if ($length >= 68 ) { $t =  5; } // floor( 550 / 8)
-        else if ($length >= 56 ) { $t =  6; } // floor( 450 / 8)
-        else if ($length >= 50 ) { $t =  7; } // floor( 400 / 8)
-        else if ($length >= 43 ) { $t =  8; } // floor( 350 / 8)
-        else if ($length >= 37 ) { $t =  9; } // floor( 300 / 8)
-        else if ($length >= 31 ) { $t = 12; } // floor( 250 / 8)
-        else if ($length >= 25 ) { $t = 15; } // floor( 200 / 8)
-        else if ($length >= 18 ) { $t = 18; } // floor( 150 / 8)
-        else                     { $t = 27; }
-        // @codingStandardsIgnoreEnd
-
-        return $t;
-    }
-
-    /**
-     * Tests Primality
-     *
-     * Uses the {@link http://en.wikipedia.org/wiki/Miller%E2%80%93Rabin_primality_test Miller-Rabin primality test}.
-     * See {@link http://www.cacr.math.uwaterloo.ca/hac/about/chap4.pdf#page=8 HAC 4.24} for more info.
-     *
-     * @param int $t
-     * @return bool
-     */
-    protected function testPrimality($t)
-    {
-        if (!$this->testSmallPrimes()) {
-            return false;
-        }
-
-        $n   = clone $this;
-        $n_1 = $n->subtract(static::$one[static::class]);
-        $n_2 = $n->subtract(static::$two[static::class]);
-
-        $r = clone $n_1;
-        $s = static::scan1divide($r);
-
-        for ($i = 0; $i < $t; ++$i) {
-            $a = static::randomRange(static::$two[static::class], $n_2);
-            $y = $a->modPow($r, $n);
-
-            if (!$y->equals(static::$one[static::class]) && !$y->equals($n_1)) {
-                for ($j = 1; $j < $s && !$y->equals($n_1); ++$j) {
-                    $y = $y->modPow(static::$two[static::class], $n);
-                    if ($y->equals(static::$one[static::class])) {
-                        return false;
-                    }
-                }
-
-                if (!$y->equals($n_1)) {
-                    return false;
-                }
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * Checks a numer to see if it's prime
-     *
-     * Assuming the $t parameter is not set, this function has an error rate of 2**-80.  The main motivation for the
-     * $t parameter is distributability.  BigInteger::randomPrime() can be distributed across multiple pageloads
-     * on a website instead of just one.
-     *
-     * @param int|bool $t
-     * @return bool
-     */
-    public function isPrime($t = false)
-    {
-        // OpenSSL limits RSA keys to 16384 bits. The length of an RSA key is equal to the length of the modulo, which is
-        // produced by multiplying the primes p and q by one another. The largest number two 8196 bit primes can produce is
-        // a 16384 bit number so, basically, 8196 bit primes are the largest OpenSSL will generate and if that's the largest
-        // that it'll generate it also stands to reason that that's the largest you'll be able to test primality on
-        $length = $this->getLength();
-        if ($length > 8196) {
-            throw new \RuntimeException("Primality testing is not supported for numbers larger than 8196 bits ($length)");
-        }
-
-        if (!$t) {
-            $t = $this->setupIsPrime();
-        }
-        return $this->testPrimality($t);
-    }
-
-    /**
-     * Performs a few preliminary checks on root
-     *
-     * @param int $n
-     * @return Engine
-     */
-    protected function rootHelper($n)
-    {
-        if ($n < 1) {
-            return clone static::$zero[static::class];
-        } // we want positive exponents
-        if ($this->compare(static::$one[static::class]) < 0) {
-            return clone static::$zero[static::class];
-        } // we want positive numbers
-        if ($this->compare(static::$two[static::class]) < 0) {
-            return clone static::$one[static::class];
-        } // n-th root of 1 or 2 is 1
-
-        return $this->rootInner($n);
-    }
-
-    /**
-     * Calculates the nth root of a biginteger.
-     *
-     * Returns the nth root of a positive biginteger, where n defaults to 2
-     *
-     * {@internal This function is based off of {@link http://mathforum.org/library/drmath/view/52605.html this page} and {@link http://stackoverflow.com/questions/11242920/calculating-nth-root-with-bcmath-in-php this stackoverflow question}.}
-     *
-     * @param int $n
-     * @return Engine
-     */
-    protected function rootInner($n)
-    {
-        $n = new static($n);
-
-        // g is our guess number
-        $g = static::$two[static::class];
-        // while (g^n < num) g=g*2
-        while ($g->pow($n)->compare($this) < 0) {
-            $g = $g->multiply(static::$two[static::class]);
-        }
-        // if (g^n==num) num is a power of 2, we're lucky, end of job
-        // == 0 bccomp(bcpow($g, $n), $n->value)==0
-        if ($g->pow($n)->equals($this) > 0) {
-            $root = $g;
-            return $this->normalize($root);
-        }
-
-        // if we're here num wasn't a power of 2 :(
-        $og = $g; // og means original guess and here is our upper bound
-        $g = $g->divide(static::$two[static::class])[0]; // g is set to be our lower bound
-        $step = $og->subtract($g)->divide(static::$two[static::class])[0]; // step is the half of upper bound - lower bound
-        $g = $g->add($step); // we start at lower bound + step , basically in the middle of our interval
-
-        // while step>1
-
-        while ($step->compare(static::$one[static::class]) == 1) {
-            $guess = $g->pow($n);
-            $step = $step->divide(static::$two[static::class])[0];
-            $comp = $guess->compare($this); // compare our guess with real number
-            switch ($comp) {
-                case -1: // if guess is lower we add the new step
-                    $g = $g->add($step);
-                    break;
-                case 1: // if guess is higher we sub the new step
-                    $g = $g->subtract($step);
-                    break;
-                case 0: // if guess is exactly the num we're done, we return the value
-                    $root = $g;
-                    break 2;
-            }
-        }
-
-        if ($comp == 1) {
-            $g = $g->subtract($step);
-        }
-
-        // whatever happened, g is the closest guess we can make so return it
-        $root = $g;
-
-        return $this->normalize($root);
-    }
-
-    /**
-     * Calculates the nth root of a biginteger.
-     *
-     * @param int $n
-     * @return Engine
-     */
-    public function root($n = 2)
-    {
-        return $this->rootHelper($n);
-    }
-
-    /**
-     * Return the minimum BigInteger between an arbitrary number of BigIntegers.
-     *
-     * @param array $nums
-     * @return Engine
-     */
-    protected static function minHelper(array $nums)
-    {
-        if (count($nums) == 1) {
-            return $nums[0];
-        }
-        $min = $nums[0];
-        for ($i = 1; $i < count($nums); $i++) {
-            $min = $min->compare($nums[$i]) > 0 ? $nums[$i] : $min;
-        }
-        return $min;
-    }
-
-    /**
-     * Return the minimum BigInteger between an arbitrary number of BigIntegers.
-     *
-     * @param array $nums
-     * @return Engine
-     */
-    protected static function maxHelper(array $nums)
-    {
-        if (count($nums) == 1) {
-            return $nums[0];
-        }
-        $max = $nums[0];
-        for ($i = 1; $i < count($nums); $i++) {
-            $max = $max->compare($nums[$i]) < 0 ? $nums[$i] : $max;
-        }
-        return $max;
-    }
-
-    /**
-     * Create Recurring Modulo Function
-     *
-     * Sometimes it may be desirable to do repeated modulos with the same number outside of
-     * modular exponentiation
-     *
-     * @return callable
-     */
-    public function createRecurringModuloFunction()
-    {
-        $class = static::class;
-
-        $fqengine = !method_exists(static::$modexpEngine[static::class], 'reduce') ?
-            '\\phpseclib3\\Math\\BigInteger\\Engines\\' . static::ENGINE_DIR . '\\DefaultEngine' :
-            static::$modexpEngine[static::class];
-        if (method_exists($fqengine, 'generateCustomReduction')) {
-            $func = $fqengine::generateCustomReduction($this, static::class);
-            return eval('return function(' . static::class . ' $x) use ($func, $class) {
-                $r = new $class();
-                $r->value = $func($x->value);
-                return $r;
-            };');
-        }
-        $n = $this->value;
-        return eval('return function(' . static::class . ' $x) use ($n, $fqengine, $class) {
-            $r = new $class();
-            $r->value = $fqengine::reduce($x->value, $n, $class);
-            return $r;
-        };');
-    }
-
-    /**
-     * Calculates the greatest common divisor and Bezout's identity.
-     *
-     * @param Engine $n
-     * @return array{gcd: Engine, x: Engine, y: Engine}
-     */
-    protected function extendedGCDHelper(Engine $n)
-    {
-        $u = clone $this;
-        $v = clone $n;
-
-        $one = new static(1);
-        $zero = new static();
-
-        $a = clone $one;
-        $b = clone $zero;
-        $c = clone $zero;
-        $d = clone $one;
-
-        while (!$v->equals($zero)) {
-            list($q) = $u->divide($v);
-
-            $temp = $u;
-            $u = $v;
-            $v = $temp->subtract($v->multiply($q));
-
-            $temp = $a;
-            $a = $c;
-            $c = $temp->subtract($a->multiply($q));
-
-            $temp = $b;
-            $b = $d;
-            $d = $temp->subtract($b->multiply($q));
-        }
-
-        return [
-            'gcd' => $u,
-            'x' => $a,
-            'y' => $b
-        ];
-    }
-
-    /**
-     * Bitwise Split
-     *
-     * Splits BigInteger's into chunks of $split bits
-     *
-     * @param int $split
-     * @return Engine[]
-     */
-    public function bitwise_split($split)
-    {
-        if ($split < 1) {
-            throw new \RuntimeException('Offset must be greater than 1');
-        }
-
-        $mask = static::$one[static::class]->bitwise_leftShift($split)->subtract(static::$one[static::class]);
-
-        $num = clone $this;
-
-        $vals = [];
-        while (!$num->equals(static::$zero[static::class])) {
-            $vals[] = $num->bitwise_and($mask);
-            $num = $num->bitwise_rightShift($split);
-        }
-
-        return array_reverse($vals);
-    }
-
-    /**
-     * Logical And
-     *
-     * @param Engine $x
-     * @return Engine
-     */
-    protected function bitwiseAndHelper(Engine $x)
-    {
-        $left = $this->toBytes(true);
-        $right = $x->toBytes(true);
-
-        $length = max(strlen($left), strlen($right));
-
-        $left = str_pad($left, $length, chr(0), STR_PAD_LEFT);
-        $right = str_pad($right, $length, chr(0), STR_PAD_LEFT);
-
-        return $this->normalize(new static($left & $right, -256));
-    }
-
-    /**
-     * Logical Or
-     *
-     * @param Engine $x
-     * @return Engine
-     */
-    protected function bitwiseOrHelper(Engine $x)
-    {
-        $left = $this->toBytes(true);
-        $right = $x->toBytes(true);
-
-        $length = max(strlen($left), strlen($right));
-
-        $left = str_pad($left, $length, chr(0), STR_PAD_LEFT);
-        $right = str_pad($right, $length, chr(0), STR_PAD_LEFT);
-
-        return $this->normalize(new static($left | $right, -256));
-    }
-
-    /**
-     * Logical Exclusive Or
-     *
-     * @param Engine $x
-     * @return Engine
-     */
-    protected function bitwiseXorHelper(Engine $x)
-    {
-        $left = $this->toBytes(true);
-        $right = $x->toBytes(true);
-
-        $length = max(strlen($left), strlen($right));
-
-
-        $left = str_pad($left, $length, chr(0), STR_PAD_LEFT);
-        $right = str_pad($right, $length, chr(0), STR_PAD_LEFT);
-        return $this->normalize(new static($left ^ $right, -256));
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger/Engines/GMP.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger/Engines/GMP.php
deleted file mode 100644
index f6163629..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger/Engines/GMP.php
+++ /dev/null
@@ -1,694 +0,0 @@
-<?php
-
-/**
- * GMP BigInteger Engine
- *
- * PHP version 5 and 7
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2017 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://pear.php.net/package/Math_BigInteger
- */
-
-namespace phpseclib3\Math\BigInteger\Engines;
-
-use phpseclib3\Exception\BadConfigurationException;
-
-/**
- * GMP Engine.
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-class GMP extends Engine
-{
-    /**
-     * Can Bitwise operations be done fast?
-     *
-     * @see parent::bitwise_leftRotate()
-     * @see parent::bitwise_rightRotate()
-     */
-    const FAST_BITWISE = true;
-
-    /**
-     * Engine Directory
-     *
-     * @see parent::setModExpEngine
-     */
-    const ENGINE_DIR = 'GMP';
-
-    /**
-     * Test for engine validity
-     *
-     * @return bool
-     * @see parent::__construct()
-     */
-    public static function isValidEngine()
-    {
-        return extension_loaded('gmp');
-    }
-
-    /**
-     * Default constructor
-     *
-     * @param mixed $x integer Base-10 number or base-$base number if $base set.
-     * @param int $base
-     * @see parent::__construct()
-     */
-    public function __construct($x = 0, $base = 10)
-    {
-        if (!isset(static::$isValidEngine[static::class])) {
-            static::$isValidEngine[static::class] = self::isValidEngine();
-        }
-        if (!static::$isValidEngine[static::class]) {
-            throw new BadConfigurationException('GMP is not setup correctly on this system');
-        }
-
-        if ($x instanceof \GMP) {
-            $this->value = $x;
-            return;
-        }
-
-        $this->value = gmp_init(0);
-
-        parent::__construct($x, $base);
-    }
-
-    /**
-     * Initialize a GMP BigInteger Engine instance
-     *
-     * @param int $base
-     * @see parent::__construct()
-     */
-    protected function initialize($base)
-    {
-        switch (abs($base)) {
-            case 256:
-                $this->value = gmp_import($this->value);
-                if ($this->is_negative) {
-                    $this->value = -$this->value;
-                }
-                break;
-            case 16:
-                $temp = $this->is_negative ? '-0x' . $this->value : '0x' . $this->value;
-                $this->value = gmp_init($temp);
-                break;
-            case 10:
-                $this->value = gmp_init(isset($this->value) ? $this->value : '0');
-        }
-    }
-
-    /**
-     * Converts a BigInteger to a base-10 number.
-     *
-     * @return string
-     */
-    public function toString()
-    {
-        return (string)$this->value;
-    }
-
-    /**
-     * Converts a BigInteger to a bit string (eg. base-2).
-     *
-     * Negative numbers are saved as positive numbers, unless $twos_compliment is set to true, at which point, they're
-     * saved as two's compliment.
-     *
-     * @param bool $twos_compliment
-     * @return string
-     */
-    public function toBits($twos_compliment = false)
-    {
-        $hex = $this->toHex($twos_compliment);
-
-        $bits = gmp_strval(gmp_init($hex, 16), 2);
-
-        if ($this->precision > 0) {
-            $bits = substr($bits, -$this->precision);
-        }
-
-        if ($twos_compliment && $this->compare(new static()) > 0 && $this->precision <= 0) {
-            return '0' . $bits;
-        }
-
-        return $bits;
-    }
-
-    /**
-     * Converts a BigInteger to a byte string (eg. base-256).
-     *
-     * @param bool $twos_compliment
-     * @return string
-     */
-    public function toBytes($twos_compliment = false)
-    {
-        if ($twos_compliment) {
-            return $this->toBytesHelper();
-        }
-
-        if (gmp_cmp($this->value, gmp_init(0)) == 0) {
-            return $this->precision > 0 ? str_repeat(chr(0), ($this->precision + 1) >> 3) : '';
-        }
-
-        $temp = gmp_export($this->value);
-
-        return $this->precision > 0 ?
-            substr(str_pad($temp, $this->precision >> 3, chr(0), STR_PAD_LEFT), -($this->precision >> 3)) :
-            ltrim($temp, chr(0));
-    }
-
-    /**
-     * Adds two BigIntegers.
-     *
-     * @param GMP $y
-     * @return GMP
-     */
-    public function add(GMP $y)
-    {
-        $temp = new self();
-        $temp->value = $this->value + $y->value;
-
-        return $this->normalize($temp);
-    }
-
-    /**
-     * Subtracts two BigIntegers.
-     *
-     * @param GMP $y
-     * @return GMP
-     */
-    public function subtract(GMP $y)
-    {
-        $temp = new self();
-        $temp->value = $this->value - $y->value;
-
-        return $this->normalize($temp);
-    }
-
-    /**
-     * Multiplies two BigIntegers.
-     *
-     * @param GMP $x
-     * @return GMP
-     */
-    public function multiply(GMP $x)
-    {
-        $temp = new self();
-        $temp->value = $this->value * $x->value;
-
-        return $this->normalize($temp);
-    }
-
-    /**
-     * Divides two BigIntegers.
-     *
-     * Returns an array whose first element contains the quotient and whose second element contains the
-     * "common residue".  If the remainder would be positive, the "common residue" and the remainder are the
-     * same.  If the remainder would be negative, the "common residue" is equal to the sum of the remainder
-     * and the divisor (basically, the "common residue" is the first positive modulo).
-     *
-     * @param GMP $y
-     * @return array{GMP, GMP}
-     */
-    public function divide(GMP $y)
-    {
-        $quotient = new self();
-        $remainder = new self();
-
-        list($quotient->value, $remainder->value) = gmp_div_qr($this->value, $y->value);
-
-        if (gmp_sign($remainder->value) < 0) {
-            $remainder->value = $remainder->value + gmp_abs($y->value);
-        }
-
-        return [$this->normalize($quotient), $this->normalize($remainder)];
-    }
-
-    /**
-     * Compares two numbers.
-     *
-     * Although one might think !$x->compare($y) means $x != $y, it, in fact, means the opposite.  The reason for this
-     * is demonstrated thusly:
-     *
-     * $x  > $y: $x->compare($y)  > 0
-     * $x  < $y: $x->compare($y)  < 0
-     * $x == $y: $x->compare($y) == 0
-     *
-     * Note how the same comparison operator is used.  If you want to test for equality, use $x->equals($y).
-     *
-     * {@internal Could return $this->subtract($x), but that's not as fast as what we do do.}
-     *
-     * @param GMP $y
-     * @return int in case < 0 if $this is less than $y; > 0 if $this is greater than $y, and 0 if they are equal.
-     * @see self::equals()
-     */
-    public function compare(GMP $y)
-    {
-        $r = gmp_cmp($this->value, $y->value);
-        if ($r < -1) {
-            $r = -1;
-        }
-        if ($r > 1) {
-            $r = 1;
-        }
-        return $r;
-    }
-
-    /**
-     * Tests the equality of two numbers.
-     *
-     * If you need to see if one number is greater than or less than another number, use BigInteger::compare()
-     *
-     * @param GMP $x
-     * @return bool
-     */
-    public function equals(GMP $x)
-    {
-        return $this->value == $x->value;
-    }
-
-    /**
-     * Calculates modular inverses.
-     *
-     * Say you have (30 mod 17 * x mod 17) mod 17 == 1.  x can be found using modular inverses.
-     *
-     * @param GMP $n
-     * @return false|GMP
-     */
-    public function modInverse(GMP $n)
-    {
-        $temp = new self();
-        $temp->value = gmp_invert($this->value, $n->value);
-
-        return $temp->value === false ? false : $this->normalize($temp);
-    }
-
-    /**
-     * Calculates the greatest common divisor and Bezout's identity.
-     *
-     * Say you have 693 and 609.  The GCD is 21.  Bezout's identity states that there exist integers x and y such that
-     * 693*x + 609*y == 21.  In point of fact, there are actually an infinite number of x and y combinations and which
-     * combination is returned is dependent upon which mode is in use.  See
-     * {@link http://en.wikipedia.org/wiki/B%C3%A9zout%27s_identity Bezout's identity - Wikipedia} for more information.
-     *
-     * @param GMP $n
-     * @return GMP[]
-     */
-    public function extendedGCD(GMP $n)
-    {
-        extract(gmp_gcdext($this->value, $n->value));
-
-        return [
-            'gcd' => $this->normalize(new self($g)),
-            'x' => $this->normalize(new self($s)),
-            'y' => $this->normalize(new self($t))
-        ];
-    }
-
-    /**
-     * Calculates the greatest common divisor
-     *
-     * Say you have 693 and 609.  The GCD is 21.
-     *
-     * @param GMP $n
-     * @return GMP
-     */
-    public function gcd(GMP $n)
-    {
-        $r = gmp_gcd($this->value, $n->value);
-        return $this->normalize(new self($r));
-    }
-
-    /**
-     * Absolute value.
-     *
-     * @return GMP
-     */
-    public function abs()
-    {
-        $temp = new self();
-        $temp->value = gmp_abs($this->value);
-
-        return $temp;
-    }
-
-    /**
-     * Logical And
-     *
-     * @param GMP $x
-     * @return GMP
-     */
-    public function bitwise_and(GMP $x)
-    {
-        $temp = new self();
-        $temp->value = $this->value & $x->value;
-
-        return $this->normalize($temp);
-    }
-
-    /**
-     * Logical Or
-     *
-     * @param GMP $x
-     * @return GMP
-     */
-    public function bitwise_or(GMP $x)
-    {
-        $temp = new self();
-        $temp->value = $this->value | $x->value;
-
-        return $this->normalize($temp);
-    }
-
-    /**
-     * Logical Exclusive Or
-     *
-     * @param GMP $x
-     * @return GMP
-     */
-    public function bitwise_xor(GMP $x)
-    {
-        $temp = new self();
-        $temp->value = $this->value ^ $x->value;
-
-        return $this->normalize($temp);
-    }
-
-    /**
-     * Logical Right Shift
-     *
-     * Shifts BigInteger's by $shift bits, effectively dividing by 2**$shift.
-     *
-     * @param int $shift
-     * @return GMP
-     */
-    public function bitwise_rightShift($shift)
-    {
-        // 0xFFFFFFFF >> 2 == -1 (on 32-bit systems)
-        // gmp_init('0xFFFFFFFF') >> 2 == gmp_init('0x3FFFFFFF')
-
-        $temp = new self();
-        $temp->value = $this->value >> $shift;
-
-        return $this->normalize($temp);
-    }
-
-    /**
-     * Logical Left Shift
-     *
-     * Shifts BigInteger's by $shift bits, effectively multiplying by 2**$shift.
-     *
-     * @param int $shift
-     * @return GMP
-     */
-    public function bitwise_leftShift($shift)
-    {
-        $temp = new self();
-        $temp->value = $this->value << $shift;
-
-        return $this->normalize($temp);
-    }
-
-    /**
-     * Performs modular exponentiation.
-     *
-     * @param GMP $e
-     * @param GMP $n
-     * @return GMP
-     */
-    public function modPow(GMP $e, GMP $n)
-    {
-        return $this->powModOuter($e, $n);
-    }
-
-    /**
-     * Performs modular exponentiation.
-     *
-     * Alias for modPow().
-     *
-     * @param GMP $e
-     * @param GMP $n
-     * @return GMP
-     */
-    public function powMod(GMP $e, GMP $n)
-    {
-        return $this->powModOuter($e, $n);
-    }
-
-    /**
-     * Performs modular exponentiation.
-     *
-     * @param GMP $e
-     * @param GMP $n
-     * @return GMP
-     */
-    protected function powModInner(GMP $e, GMP $n)
-    {
-        $class = static::$modexpEngine[static::class];
-        return $class::powModHelper($this, $e, $n);
-    }
-
-    /**
-     * Normalize
-     *
-     * Removes leading zeros and truncates (if necessary) to maintain the appropriate precision
-     *
-     * @param GMP $result
-     * @return GMP
-     */
-    protected function normalize(GMP $result)
-    {
-        $result->precision = $this->precision;
-        $result->bitmask = $this->bitmask;
-
-        if ($result->bitmask !== false) {
-            $flip = $result->value < 0;
-            if ($flip) {
-                $result->value = -$result->value;
-            }
-            $result->value = $result->value & $result->bitmask->value;
-            if ($flip) {
-                $result->value = -$result->value;
-            }
-        }
-
-        return $result;
-    }
-
-    /**
-     * Performs some post-processing for randomRangePrime
-     *
-     * @param Engine $x
-     * @param Engine $min
-     * @param Engine $max
-     * @return GMP
-     */
-    protected static function randomRangePrimeInner(Engine $x, Engine $min, Engine $max)
-    {
-        $p = gmp_nextprime($x->value);
-
-        if ($p <= $max->value) {
-            return new self($p);
-        }
-
-        if ($min->value != $x->value) {
-            $x = new self($x->value - 1);
-        }
-
-        return self::randomRangePrime($min, $x);
-    }
-
-    /**
-     * Generate a random prime number between a range
-     *
-     * If there's not a prime within the given range, false will be returned.
-     *
-     * @param GMP $min
-     * @param GMP $max
-     * @return false|GMP
-     */
-    public static function randomRangePrime(GMP $min, GMP $max)
-    {
-        return self::randomRangePrimeOuter($min, $max);
-    }
-
-    /**
-     * Generate a random number between a range
-     *
-     * Returns a random number between $min and $max where $min and $max
-     * can be defined using one of the two methods:
-     *
-     * BigInteger::randomRange($min, $max)
-     * BigInteger::randomRange($max, $min)
-     *
-     * @param GMP $min
-     * @param GMP $max
-     * @return GMP
-     */
-    public static function randomRange(GMP $min, GMP $max)
-    {
-        return self::randomRangeHelper($min, $max);
-    }
-
-    /**
-     * Make the current number odd
-     *
-     * If the current number is odd it'll be unchanged.  If it's even, one will be added to it.
-     *
-     * @see self::randomPrime()
-     */
-    protected function make_odd()
-    {
-        gmp_setbit($this->value, 0);
-    }
-
-    /**
-     * Tests Primality
-     *
-     * @param int $t
-     * @return bool
-     */
-    protected function testPrimality($t)
-    {
-        return gmp_prob_prime($this->value, $t) != 0;
-    }
-
-    /**
-     * Calculates the nth root of a biginteger.
-     *
-     * Returns the nth root of a positive biginteger, where n defaults to 2
-     *
-     * @param int $n
-     * @return GMP
-     */
-    protected function rootInner($n)
-    {
-        $root = new self();
-        $root->value = gmp_root($this->value, $n);
-        return $this->normalize($root);
-    }
-
-    /**
-     * Performs exponentiation.
-     *
-     * @param GMP $n
-     * @return GMP
-     */
-    public function pow(GMP $n)
-    {
-        $temp = new self();
-        $temp->value = $this->value ** $n->value;
-
-        return $this->normalize($temp);
-    }
-
-    /**
-     * Return the minimum BigInteger between an arbitrary number of BigIntegers.
-     *
-     * @param GMP ...$nums
-     * @return GMP
-     */
-    public static function min(GMP ...$nums)
-    {
-        return self::minHelper($nums);
-    }
-
-    /**
-     * Return the maximum BigInteger between an arbitrary number of BigIntegers.
-     *
-     * @param GMP ...$nums
-     * @return GMP
-     */
-    public static function max(GMP ...$nums)
-    {
-        return self::maxHelper($nums);
-    }
-
-    /**
-     * Tests BigInteger to see if it is between two integers, inclusive
-     *
-     * @param GMP $min
-     * @param GMP $max
-     * @return bool
-     */
-    public function between(GMP $min, GMP $max)
-    {
-        return $this->compare($min) >= 0 && $this->compare($max) <= 0;
-    }
-
-    /**
-     * Create Recurring Modulo Function
-     *
-     * Sometimes it may be desirable to do repeated modulos with the same number outside of
-     * modular exponentiation
-     *
-     * @return callable
-     */
-    public function createRecurringModuloFunction()
-    {
-        $temp = $this->value;
-        return function (GMP $x) use ($temp) {
-            return new GMP($x->value % $temp);
-        };
-    }
-
-    /**
-     * Scan for 1 and right shift by that amount
-     *
-     * ie. $s = gmp_scan1($n, 0) and $r = gmp_div_q($n, gmp_pow(gmp_init('2'), $s));
-     *
-     * @param GMP $r
-     * @return int
-     */
-    public static function scan1divide(GMP $r)
-    {
-        $s = gmp_scan1($r->value, 0);
-        $r->value >>= $s;
-        return $s;
-    }
-
-    /**
-     * Is Odd?
-     *
-     * @return bool
-     */
-    public function isOdd()
-    {
-        return gmp_testbit($this->value, 0);
-    }
-
-    /**
-     * Tests if a bit is set
-     *
-     * @return bool
-     */
-    public function testBit($x)
-    {
-        return gmp_testbit($this->value, $x);
-    }
-
-    /**
-     * Is Negative?
-     *
-     * @return bool
-     */
-    public function isNegative()
-    {
-        return gmp_sign($this->value) == -1;
-    }
-
-    /**
-     * Negate
-     *
-     * Given $k, returns -$k
-     *
-     * @return GMP
-     */
-    public function negate()
-    {
-        $temp = clone $this;
-        $temp->value = -$this->value;
-
-        return $temp;
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger/Engines/GMP/DefaultEngine.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger/Engines/GMP/DefaultEngine.php
deleted file mode 100644
index bc219fbe..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger/Engines/GMP/DefaultEngine.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-/**
- * GMP Modular Exponentiation Engine
- *
- * PHP version 5 and 7
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2017 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://pear.php.net/package/Math_BigInteger
- */
-
-namespace phpseclib3\Math\BigInteger\Engines\GMP;
-
-use phpseclib3\Math\BigInteger\Engines\GMP;
-
-/**
- * GMP Modular Exponentiation Engine
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class DefaultEngine extends GMP
-{
-    /**
-     * Performs modular exponentiation.
-     *
-     * @param GMP $x
-     * @param GMP $e
-     * @param GMP $n
-     * @return GMP
-     */
-    protected static function powModHelper(GMP $x, GMP $e, GMP $n)
-    {
-        $temp = new GMP();
-        $temp->value = gmp_powm($x->value, $e->value, $n->value);
-
-        return $x->normalize($temp);
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger/Engines/OpenSSL.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger/Engines/OpenSSL.php
deleted file mode 100644
index e33a9f19..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger/Engines/OpenSSL.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-
-/**
- * OpenSSL Modular Exponentiation Engine
- *
- * PHP version 5 and 7
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2017 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://pear.php.net/package/Math_BigInteger
- */
-
-namespace phpseclib3\Math\BigInteger\Engines;
-
-use phpseclib3\Crypt\RSA\Formats\Keys\PKCS8;
-use phpseclib3\Math\BigInteger;
-
-/**
- * OpenSSL Modular Exponentiation Engine
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class OpenSSL
-{
-    /**
-     * Test for engine validity
-     *
-     * @return bool
-     */
-    public static function isValidEngine()
-    {
-        return extension_loaded('openssl') && static::class != __CLASS__;
-    }
-
-    /**
-     * Performs modular exponentiation.
-     *
-     * @param Engine $x
-     * @param Engine $e
-     * @param Engine $n
-     * @return Engine
-     */
-    public static function powModHelper(Engine $x, Engine $e, Engine $n)
-    {
-        if ($n->getLengthInBytes() < 31 || $n->getLengthInBytes() > 16384) {
-            throw new \OutOfRangeException('Only modulo between 31 and 16384 bits are accepted');
-        }
-
-        $key = PKCS8::savePublicKey(
-            new BigInteger($n),
-            new BigInteger($e)
-        );
-
-        $plaintext = str_pad($x->toBytes(), $n->getLengthInBytes(), "\0", STR_PAD_LEFT);
-
-        // this is easily prone to failure. if the modulo is a multiple of 2 or 3 or whatever it
-        // won't work and you'll get a "failure: error:0906D06C:PEM routines:PEM_read_bio:no start line"
-        // error. i suppose, for even numbers, we could do what PHP\Montgomery.php does, but then what
-        // about odd numbers divisible by 3, by 5, etc?
-        if (!openssl_public_encrypt($plaintext, $result, $key, OPENSSL_NO_PADDING)) {
-            throw new \UnexpectedValueException(openssl_error_string());
-        }
-
-        $class = get_class($x);
-        return new $class($result, 256);
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger/Engines/PHP.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger/Engines/PHP.php
deleted file mode 100644
index 2d895952..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger/Engines/PHP.php
+++ /dev/null
@@ -1,1357 +0,0 @@
-<?php
-
-/**
- * Pure-PHP BigInteger Engine
- *
- * PHP version 5 and 7
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2017 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://pear.php.net/package/Math_BigInteger
- */
-
-namespace phpseclib3\Math\BigInteger\Engines;
-
-use phpseclib3\Common\Functions\Strings;
-use phpseclib3\Exception\BadConfigurationException;
-
-/**
- * Pure-PHP Engine.
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class PHP extends Engine
-{
-    /**#@+
-     * Array constants
-     *
-     * Rather than create a thousands and thousands of new BigInteger objects in repeated function calls to add() and
-     * multiply() or whatever, we'll just work directly on arrays, taking them in as parameters and returning them.
-     *
-     */
-    /**
-     * $result[self::VALUE] contains the value.
-     */
-    const VALUE = 0;
-    /**
-     * $result[self::SIGN] contains the sign.
-     */
-    const SIGN = 1;
-    /**#@-*/
-
-    /**
-     * Karatsuba Cutoff
-     *
-     * At what point do we switch between Karatsuba multiplication and schoolbook long multiplication?
-     *
-     */
-    const KARATSUBA_CUTOFF = 25;
-
-    /**
-     * Can Bitwise operations be done fast?
-     *
-     * @see parent::bitwise_leftRotate()
-     * @see parent::bitwise_rightRotate()
-     */
-    const FAST_BITWISE = true;
-
-    /**
-     * Engine Directory
-     *
-     * @see parent::setModExpEngine
-     */
-    const ENGINE_DIR = 'PHP';
-
-    /**
-     * Default constructor
-     *
-     * @param mixed $x integer Base-10 number or base-$base number if $base set.
-     * @param int $base
-     * @return PHP
-     * @see parent::__construct()
-     */
-    public function __construct($x = 0, $base = 10)
-    {
-        if (!isset(static::$isValidEngine[static::class])) {
-            static::$isValidEngine[static::class] = static::isValidEngine();
-        }
-        if (!static::$isValidEngine[static::class]) {
-            throw new BadConfigurationException(static::class . ' is not setup correctly on this system');
-        }
-
-        $this->value = [];
-        parent::__construct($x, $base);
-    }
-
-    /**
-     * Initialize a PHP BigInteger Engine instance
-     *
-     * @param int $base
-     * @see parent::__construct()
-     */
-    protected function initialize($base)
-    {
-        switch (abs($base)) {
-            case 16:
-                $x = (strlen($this->value) & 1) ? '0' . $this->value : $this->value;
-                $temp = new static(Strings::hex2bin($x), 256);
-                $this->value = $temp->value;
-                break;
-            case 10:
-                $temp = new static();
-
-                $multiplier = new static();
-                $multiplier->value = [static::MAX10];
-
-                $x = $this->value;
-
-                if ($x[0] == '-') {
-                    $this->is_negative = true;
-                    $x = substr($x, 1);
-                }
-
-                $x = str_pad(
-                    $x,
-                    strlen($x) + ((static::MAX10LEN - 1) * strlen($x)) % static::MAX10LEN,
-                    0,
-                    STR_PAD_LEFT
-                );
-                while (strlen($x)) {
-                    $temp = $temp->multiply($multiplier);
-                    $temp = $temp->add(new static($this->int2bytes(substr($x, 0, static::MAX10LEN)), 256));
-                    $x = substr($x, static::MAX10LEN);
-                }
-
-                $this->value = $temp->value;
-        }
-    }
-
-    /**
-     * Pads strings so that unpack may be used on them
-     *
-     * @param string $str
-     * @return string
-     */
-    protected function pad($str)
-    {
-        $length = strlen($str);
-
-        $pad = 4 - (strlen($str) % 4);
-
-        return str_pad($str, $length + $pad, "\0", STR_PAD_LEFT);
-    }
-
-    /**
-     * Converts a BigInteger to a base-10 number.
-     *
-     * @return string
-     */
-    public function toString()
-    {
-        if (!count($this->value)) {
-            return '0';
-        }
-
-        $temp = clone $this;
-        $temp->bitmask = false;
-        $temp->is_negative = false;
-
-        $divisor = new static();
-        $divisor->value = [static::MAX10];
-        $result = '';
-        while (count($temp->value)) {
-            list($temp, $mod) = $temp->divide($divisor);
-            $result = str_pad(
-                isset($mod->value[0]) ? $mod->value[0] : '',
-                static::MAX10LEN,
-                '0',
-                STR_PAD_LEFT
-            ) . $result;
-        }
-        $result = ltrim($result, '0');
-        if (empty($result)) {
-            $result = '0';
-        }
-
-        if ($this->is_negative) {
-            $result = '-' . $result;
-        }
-
-        return $result;
-    }
-
-    /**
-     * Converts a BigInteger to a byte string (eg. base-256).
-     *
-     * @param bool $twos_compliment
-     * @return string
-     */
-    public function toBytes($twos_compliment = false)
-    {
-        if ($twos_compliment) {
-            return $this->toBytesHelper();
-        }
-
-        if (!count($this->value)) {
-            return $this->precision > 0 ? str_repeat(chr(0), ($this->precision + 1) >> 3) : '';
-        }
-
-        $result = $this->bitwise_small_split(8);
-        $result = implode('', array_map('chr', $result));
-
-        return $this->precision > 0 ?
-            str_pad(
-                substr($result, -(($this->precision + 7) >> 3)),
-                ($this->precision + 7) >> 3,
-                chr(0),
-                STR_PAD_LEFT
-            ) :
-            $result;
-    }
-
-    /**
-     * Performs addition.
-     *
-     * @param array $x_value
-     * @param bool $x_negative
-     * @param array $y_value
-     * @param bool $y_negative
-     * @return array
-     */
-    protected static function addHelper(array $x_value, $x_negative, array $y_value, $y_negative)
-    {
-        $x_size = count($x_value);
-        $y_size = count($y_value);
-
-        if ($x_size == 0) {
-            return [
-                self::VALUE => $y_value,
-                self::SIGN => $y_negative
-            ];
-        } elseif ($y_size == 0) {
-            return [
-                self::VALUE => $x_value,
-                self::SIGN => $x_negative
-            ];
-        }
-
-        // subtract, if appropriate
-        if ($x_negative != $y_negative) {
-            if ($x_value == $y_value) {
-                return [
-                    self::VALUE => [],
-                    self::SIGN => false
-                ];
-            }
-
-            $temp = self::subtractHelper($x_value, false, $y_value, false);
-            $temp[self::SIGN] = self::compareHelper($x_value, false, $y_value, false) > 0 ?
-                $x_negative : $y_negative;
-
-            return $temp;
-        }
-
-        if ($x_size < $y_size) {
-            $size = $x_size;
-            $value = $y_value;
-        } else {
-            $size = $y_size;
-            $value = $x_value;
-        }
-
-        $value[count($value)] = 0; // just in case the carry adds an extra digit
-
-        $carry = 0;
-        for ($i = 0, $j = 1; $j < $size; $i += 2, $j += 2) {
-            //$sum = $x_value[$j] * static::BASE_FULL + $x_value[$i] + $y_value[$j] * static::BASE_FULL + $y_value[$i] + $carry;
-            $sum = ($x_value[$j] + $y_value[$j]) * static::BASE_FULL + $x_value[$i] + $y_value[$i] + $carry;
-            $carry = $sum >= static::MAX_DIGIT2; // eg. floor($sum / 2**52); only possible values (in any base) are 0 and 1
-            $sum = $carry ? $sum - static::MAX_DIGIT2 : $sum;
-
-            $temp = static::BASE === 26 ? intval($sum / 0x4000000) : ($sum >> 31);
-
-            $value[$i] = (int)($sum - static::BASE_FULL * $temp); // eg. a faster alternative to fmod($sum, 0x4000000)
-            $value[$j] = $temp;
-        }
-
-        if ($j == $size) { // ie. if $y_size is odd
-            $sum = $x_value[$i] + $y_value[$i] + $carry;
-            $carry = $sum >= static::BASE_FULL;
-            $value[$i] = $carry ? $sum - static::BASE_FULL : $sum;
-            ++$i; // ie. let $i = $j since we've just done $value[$i]
-        }
-
-        if ($carry) {
-            for (; $value[$i] == static::MAX_DIGIT; ++$i) {
-                $value[$i] = 0;
-            }
-            ++$value[$i];
-        }
-
-        return [
-            self::VALUE => self::trim($value),
-            self::SIGN => $x_negative
-        ];
-    }
-
-    /**
-     * Performs subtraction.
-     *
-     * @param array $x_value
-     * @param bool $x_negative
-     * @param array $y_value
-     * @param bool $y_negative
-     * @return array
-     */
-    public static function subtractHelper(array $x_value, $x_negative, array $y_value, $y_negative)
-    {
-        $x_size = count($x_value);
-        $y_size = count($y_value);
-
-        if ($x_size == 0) {
-            return [
-                self::VALUE => $y_value,
-                self::SIGN => !$y_negative
-            ];
-        } elseif ($y_size == 0) {
-            return [
-                self::VALUE => $x_value,
-                self::SIGN => $x_negative
-            ];
-        }
-
-        // add, if appropriate (ie. -$x - +$y or +$x - -$y)
-        if ($x_negative != $y_negative) {
-            $temp = self::addHelper($x_value, false, $y_value, false);
-            $temp[self::SIGN] = $x_negative;
-
-            return $temp;
-        }
-
-        $diff = self::compareHelper($x_value, $x_negative, $y_value, $y_negative);
-
-        if (!$diff) {
-            return [
-                self::VALUE => [],
-                self::SIGN => false
-            ];
-        }
-
-        // switch $x and $y around, if appropriate.
-        if ((!$x_negative && $diff < 0) || ($x_negative && $diff > 0)) {
-            $temp = $x_value;
-            $x_value = $y_value;
-            $y_value = $temp;
-
-            $x_negative = !$x_negative;
-
-            $x_size = count($x_value);
-            $y_size = count($y_value);
-        }
-
-        // at this point, $x_value should be at least as big as - if not bigger than - $y_value
-
-        $carry = 0;
-        for ($i = 0, $j = 1; $j < $y_size; $i += 2, $j += 2) {
-            $sum = ($x_value[$j] - $y_value[$j]) * static::BASE_FULL + $x_value[$i] - $y_value[$i] - $carry;
-
-            $carry = $sum < 0; // eg. floor($sum / 2**52); only possible values (in any base) are 0 and 1
-            $sum = $carry ? $sum + static::MAX_DIGIT2 : $sum;
-
-            $temp = static::BASE === 26 ? intval($sum / 0x4000000) : ($sum >> 31);
-
-            $x_value[$i] = (int)($sum - static::BASE_FULL * $temp);
-            $x_value[$j] = $temp;
-        }
-
-        if ($j == $y_size) { // ie. if $y_size is odd
-            $sum = $x_value[$i] - $y_value[$i] - $carry;
-            $carry = $sum < 0;
-            $x_value[$i] = $carry ? $sum + static::BASE_FULL : $sum;
-            ++$i;
-        }
-
-        if ($carry) {
-            for (; !$x_value[$i]; ++$i) {
-                $x_value[$i] = static::MAX_DIGIT;
-            }
-            --$x_value[$i];
-        }
-
-        return [
-            self::VALUE => self::trim($x_value),
-            self::SIGN => $x_negative
-        ];
-    }
-
-    /**
-     * Performs multiplication.
-     *
-     * @param array $x_value
-     * @param bool $x_negative
-     * @param array $y_value
-     * @param bool $y_negative
-     * @return array
-     */
-    protected static function multiplyHelper(array $x_value, $x_negative, array $y_value, $y_negative)
-    {
-        //if ( $x_value == $y_value ) {
-        //    return [
-        //        self::VALUE => self::square($x_value),
-        //        self::SIGN => $x_sign != $y_value
-        //    ];
-        //}
-
-        $x_length = count($x_value);
-        $y_length = count($y_value);
-
-        if (!$x_length || !$y_length) { // a 0 is being multiplied
-            return [
-                self::VALUE => [],
-                self::SIGN => false
-            ];
-        }
-
-        return [
-            self::VALUE => min($x_length, $y_length) < 2 * self::KARATSUBA_CUTOFF ?
-                self::trim(self::regularMultiply($x_value, $y_value)) :
-                self::trim(self::karatsuba($x_value, $y_value)),
-            self::SIGN => $x_negative != $y_negative
-        ];
-    }
-
-    /**
-     * Performs Karatsuba multiplication on two BigIntegers
-     *
-     * See {@link http://en.wikipedia.org/wiki/Karatsuba_algorithm Karatsuba algorithm} and
-     * {@link http://math.libtomcrypt.com/files/tommath.pdf#page=120 MPM 5.2.3}.
-     *
-     * @param array $x_value
-     * @param array $y_value
-     * @return array
-     */
-    private static function karatsuba(array $x_value, array $y_value)
-    {
-        $m = min(count($x_value) >> 1, count($y_value) >> 1);
-
-        if ($m < self::KARATSUBA_CUTOFF) {
-            return self::regularMultiply($x_value, $y_value);
-        }
-
-        $x1 = array_slice($x_value, $m);
-        $x0 = array_slice($x_value, 0, $m);
-        $y1 = array_slice($y_value, $m);
-        $y0 = array_slice($y_value, 0, $m);
-
-        $z2 = self::karatsuba($x1, $y1);
-        $z0 = self::karatsuba($x0, $y0);
-
-        $z1 = self::addHelper($x1, false, $x0, false);
-        $temp = self::addHelper($y1, false, $y0, false);
-        $z1 = self::karatsuba($z1[self::VALUE], $temp[self::VALUE]);
-        $temp = self::addHelper($z2, false, $z0, false);
-        $z1 = self::subtractHelper($z1, false, $temp[self::VALUE], false);
-
-        $z2 = array_merge(array_fill(0, 2 * $m, 0), $z2);
-        $z1[self::VALUE] = array_merge(array_fill(0, $m, 0), $z1[self::VALUE]);
-
-        $xy = self::addHelper($z2, false, $z1[self::VALUE], $z1[self::SIGN]);
-        $xy = self::addHelper($xy[self::VALUE], $xy[self::SIGN], $z0, false);
-
-        return $xy[self::VALUE];
-    }
-
-    /**
-     * Performs long multiplication on two BigIntegers
-     *
-     * Modeled after 'multiply' in MutableBigInteger.java.
-     *
-     * @param array $x_value
-     * @param array $y_value
-     * @return array
-     */
-    protected static function regularMultiply(array $x_value, array $y_value)
-    {
-        $x_length = count($x_value);
-        $y_length = count($y_value);
-
-        if (!$x_length || !$y_length) { // a 0 is being multiplied
-            return [];
-        }
-
-        $product_value = self::array_repeat(0, $x_length + $y_length);
-
-        // the following for loop could be removed if the for loop following it
-        // (the one with nested for loops) initially set $i to 0, but
-        // doing so would also make the result in one set of unnecessary adds,
-        // since on the outermost loops first pass, $product->value[$k] is going
-        // to always be 0
-
-        $carry = 0;
-        for ($j = 0; $j < $x_length; ++$j) { // ie. $i = 0
-            $temp = $x_value[$j] * $y_value[0] + $carry; // $product_value[$k] == 0
-            $carry = static::BASE === 26 ? intval($temp / 0x4000000) : ($temp >> 31);
-            $product_value[$j] = (int)($temp - static::BASE_FULL * $carry);
-        }
-
-        $product_value[$j] = $carry;
-
-        // the above for loop is what the previous comment was talking about.  the
-        // following for loop is the "one with nested for loops"
-        for ($i = 1; $i < $y_length; ++$i) {
-            $carry = 0;
-
-            for ($j = 0, $k = $i; $j < $x_length; ++$j, ++$k) {
-                $temp = $product_value[$k] + $x_value[$j] * $y_value[$i] + $carry;
-                $carry = static::BASE === 26 ? intval($temp / 0x4000000) : ($temp >> 31);
-                $product_value[$k] = (int)($temp - static::BASE_FULL * $carry);
-            }
-
-            $product_value[$k] = $carry;
-        }
-
-        return $product_value;
-    }
-
-    /**
-     * Divides two BigIntegers.
-     *
-     * Returns an array whose first element contains the quotient and whose second element contains the
-     * "common residue".  If the remainder would be positive, the "common residue" and the remainder are the
-     * same.  If the remainder would be negative, the "common residue" is equal to the sum of the remainder
-     * and the divisor (basically, the "common residue" is the first positive modulo).
-     *
-     * @return array{static, static}
-     * @internal This function is based off of
-     *     {@link http://www.cacr.math.uwaterloo.ca/hac/about/chap14.pdf#page=9 HAC 14.20}.
-     */
-    protected function divideHelper(PHP $y)
-    {
-        if (count($y->value) == 1) {
-            list($q, $r) = $this->divide_digit($this->value, $y->value[0]);
-            $quotient = new static();
-            $remainder = new static();
-            $quotient->value = $q;
-            $remainder->value = [$r];
-            $quotient->is_negative = $this->is_negative != $y->is_negative;
-            return [$this->normalize($quotient), $this->normalize($remainder)];
-        }
-
-        $x = clone $this;
-        $y = clone $y;
-
-        $x_sign = $x->is_negative;
-        $y_sign = $y->is_negative;
-
-        $x->is_negative = $y->is_negative = false;
-
-        $diff = $x->compare($y);
-
-        if (!$diff) {
-            $temp = new static();
-            $temp->value = [1];
-            $temp->is_negative = $x_sign != $y_sign;
-            return [$this->normalize($temp), $this->normalize(static::$zero[static::class])];
-        }
-
-        if ($diff < 0) {
-            // if $x is negative, "add" $y.
-            if ($x_sign) {
-                $x = $y->subtract($x);
-            }
-            return [$this->normalize(static::$zero[static::class]), $this->normalize($x)];
-        }
-
-        // normalize $x and $y as described in HAC 14.23 / 14.24
-        $msb = $y->value[count($y->value) - 1];
-        for ($shift = 0; !($msb & static::MSB); ++$shift) {
-            $msb <<= 1;
-        }
-        $x->lshift($shift);
-        $y->lshift($shift);
-        $y_value = &$y->value;
-
-        $x_max = count($x->value) - 1;
-        $y_max = count($y->value) - 1;
-
-        $quotient = new static();
-        $quotient_value = &$quotient->value;
-        $quotient_value = self::array_repeat(0, $x_max - $y_max + 1);
-
-        static $temp, $lhs, $rhs;
-        if (!isset($temp)) {
-            $temp = new static();
-            $lhs = new static();
-            $rhs = new static();
-        }
-        if (static::class != get_class($temp)) {
-            $temp = new static();
-            $lhs = new static();
-            $rhs = new static();
-        }
-        $temp_value = &$temp->value;
-        $rhs_value =  &$rhs->value;
-
-        // $temp = $y << ($x_max - $y_max-1) in base 2**26
-        $temp_value = array_merge(self::array_repeat(0, $x_max - $y_max), $y_value);
-
-        while ($x->compare($temp) >= 0) {
-            // calculate the "common residue"
-            ++$quotient_value[$x_max - $y_max];
-            $x = $x->subtract($temp);
-            $x_max = count($x->value) - 1;
-        }
-
-        for ($i = $x_max; $i >= $y_max + 1; --$i) {
-            $x_value = &$x->value;
-            $x_window = [
-                isset($x_value[$i]) ? $x_value[$i] : 0,
-                isset($x_value[$i - 1]) ? $x_value[$i - 1] : 0,
-                isset($x_value[$i - 2]) ? $x_value[$i - 2] : 0
-            ];
-            $y_window = [
-                $y_value[$y_max],
-                ($y_max > 0) ? $y_value[$y_max - 1] : 0
-            ];
-
-            $q_index = $i - $y_max - 1;
-            if ($x_window[0] == $y_window[0]) {
-                $quotient_value[$q_index] = static::MAX_DIGIT;
-            } else {
-                $quotient_value[$q_index] = self::safe_divide(
-                    $x_window[0] * static::BASE_FULL + $x_window[1],
-                    $y_window[0]
-                );
-            }
-
-            $temp_value = [$y_window[1], $y_window[0]];
-
-            $lhs->value = [$quotient_value[$q_index]];
-            $lhs = $lhs->multiply($temp);
-
-            $rhs_value = [$x_window[2], $x_window[1], $x_window[0]];
-
-            while ($lhs->compare($rhs) > 0) {
-                --$quotient_value[$q_index];
-
-                $lhs->value = [$quotient_value[$q_index]];
-                $lhs = $lhs->multiply($temp);
-            }
-
-            $adjust = self::array_repeat(0, $q_index);
-            $temp_value = [$quotient_value[$q_index]];
-            $temp = $temp->multiply($y);
-            $temp_value = &$temp->value;
-            if (count($temp_value)) {
-                $temp_value = array_merge($adjust, $temp_value);
-            }
-
-            $x = $x->subtract($temp);
-
-            if ($x->compare(static::$zero[static::class]) < 0) {
-                $temp_value = array_merge($adjust, $y_value);
-                $x = $x->add($temp);
-
-                --$quotient_value[$q_index];
-            }
-
-            $x_max = count($x_value) - 1;
-        }
-
-        // unnormalize the remainder
-        $x->rshift($shift);
-
-        $quotient->is_negative = $x_sign != $y_sign;
-
-        // calculate the "common residue", if appropriate
-        if ($x_sign) {
-            $y->rshift($shift);
-            $x = $y->subtract($x);
-        }
-
-        return [$this->normalize($quotient), $this->normalize($x)];
-    }
-
-    /**
-     * Divides a BigInteger by a regular integer
-     *
-     * abc / x = a00 / x + b0 / x + c / x
-     *
-     * @param array $dividend
-     * @param int $divisor
-     * @return array
-     */
-    private static function divide_digit(array $dividend, $divisor)
-    {
-        $carry = 0;
-        $result = [];
-
-        for ($i = count($dividend) - 1; $i >= 0; --$i) {
-            $temp = static::BASE_FULL * $carry + $dividend[$i];
-            $result[$i] = self::safe_divide($temp, $divisor);
-            $carry = (int)($temp - $divisor * $result[$i]);
-        }
-
-        return [$result, $carry];
-    }
-
-    /**
-     * Single digit division
-     *
-     * Even if int64 is being used the division operator will return a float64 value
-     * if the dividend is not evenly divisible by the divisor. Since a float64 doesn't
-     * have the precision of int64 this is a problem so, when int64 is being used,
-     * we'll guarantee that the dividend is divisible by first subtracting the remainder.
-     *
-     * @param int $x
-     * @param int $y
-     * @return int
-     */
-    private static function safe_divide($x, $y)
-    {
-        if (static::BASE === 26) {
-            return (int)($x / $y);
-        }
-
-        // static::BASE === 31
-        /** @var int */
-        return ($x - ($x % $y)) / $y;
-    }
-
-    /**
-     * Convert an array / boolean to a PHP BigInteger object
-     *
-     * @param array $arr
-     * @return static
-     */
-    protected function convertToObj(array $arr)
-    {
-        $result = new static();
-        $result->value = $arr[self::VALUE];
-        $result->is_negative = $arr[self::SIGN];
-
-        return $this->normalize($result);
-    }
-
-    /**
-     * Normalize
-     *
-     * Removes leading zeros and truncates (if necessary) to maintain the appropriate precision
-     *
-     * @param PHP $result
-     * @return static
-     */
-    protected function normalize(PHP $result)
-    {
-        $result->precision = $this->precision;
-        $result->bitmask = $this->bitmask;
-
-        $value = &$result->value;
-
-        if (!count($value)) {
-            $result->is_negative = false;
-            return $result;
-        }
-
-        $value = static::trim($value);
-
-        if (!empty($result->bitmask->value)) {
-            $length = min(count($value), count($result->bitmask->value));
-            $value = array_slice($value, 0, $length);
-
-            for ($i = 0; $i < $length; ++$i) {
-                $value[$i] = $value[$i] & $result->bitmask->value[$i];
-            }
-
-            $value = static::trim($value);
-        }
-
-        return $result;
-    }
-
-    /**
-     * Compares two numbers.
-     *
-     * @param array $x_value
-     * @param bool $x_negative
-     * @param array $y_value
-     * @param bool $y_negative
-     * @return int
-     * @see static::compare()
-     */
-    protected static function compareHelper(array $x_value, $x_negative, array $y_value, $y_negative)
-    {
-        if ($x_negative != $y_negative) {
-            return (!$x_negative && $y_negative) ? 1 : -1;
-        }
-
-        $result = $x_negative ? -1 : 1;
-
-        if (count($x_value) != count($y_value)) {
-            return (count($x_value) > count($y_value)) ? $result : -$result;
-        }
-        $size = max(count($x_value), count($y_value));
-
-        $x_value = array_pad($x_value, $size, 0);
-        $y_value = array_pad($y_value, $size, 0);
-
-        for ($i = count($x_value) - 1; $i >= 0; --$i) {
-            if ($x_value[$i] != $y_value[$i]) {
-                return ($x_value[$i] > $y_value[$i]) ? $result : -$result;
-            }
-        }
-
-        return 0;
-    }
-
-    /**
-     * Absolute value.
-     *
-     * @return PHP
-     */
-    public function abs()
-    {
-        $temp = new static();
-        $temp->value = $this->value;
-
-        return $temp;
-    }
-
-    /**
-     * Trim
-     *
-     * Removes leading zeros
-     *
-     * @param list<static> $value
-     * @return list<static>
-     */
-    protected static function trim(array $value)
-    {
-        for ($i = count($value) - 1; $i >= 0; --$i) {
-            if ($value[$i]) {
-                break;
-            }
-            unset($value[$i]);
-        }
-
-        return $value;
-    }
-
-    /**
-     * Logical Right Shift
-     *
-     * Shifts BigInteger's by $shift bits, effectively dividing by 2**$shift.
-     *
-     * @param int $shift
-     * @return PHP
-     */
-    public function bitwise_rightShift($shift)
-    {
-        $temp = new static();
-
-        // could just replace lshift with this, but then all lshift() calls would need to be rewritten
-        // and I don't want to do that...
-        $temp->value = $this->value;
-        $temp->rshift($shift);
-
-        return $this->normalize($temp);
-    }
-
-    /**
-     * Logical Left Shift
-     *
-     * Shifts BigInteger's by $shift bits, effectively multiplying by 2**$shift.
-     *
-     * @param int $shift
-     * @return PHP
-     */
-    public function bitwise_leftShift($shift)
-    {
-        $temp = new static();
-        // could just replace _rshift with this, but then all _lshift() calls would need to be rewritten
-        // and I don't want to do that...
-        $temp->value = $this->value;
-        $temp->lshift($shift);
-
-        return $this->normalize($temp);
-    }
-
-    /**
-     * Converts 32-bit integers to bytes.
-     *
-     * @param int $x
-     * @return string
-     */
-    private static function int2bytes($x)
-    {
-        return ltrim(pack('N', $x), chr(0));
-    }
-
-    /**
-     * Array Repeat
-     *
-     * @param int $input
-     * @param int $multiplier
-     * @return array
-     */
-    protected static function array_repeat($input, $multiplier)
-    {
-        return $multiplier ? array_fill(0, $multiplier, $input) : [];
-    }
-
-    /**
-     * Logical Left Shift
-     *
-     * Shifts BigInteger's by $shift bits.
-     *
-     * @param int $shift
-     */
-    protected function lshift($shift)
-    {
-        if ($shift == 0) {
-            return;
-        }
-
-        $num_digits = (int)($shift / static::BASE);
-        $shift %= static::BASE;
-        $shift = 1 << $shift;
-
-        $carry = 0;
-
-        for ($i = 0; $i < count($this->value); ++$i) {
-            $temp = $this->value[$i] * $shift + $carry;
-            $carry = static::BASE === 26 ? intval($temp / 0x4000000) : ($temp >> 31);
-            $this->value[$i] = (int)($temp - $carry * static::BASE_FULL);
-        }
-
-        if ($carry) {
-            $this->value[count($this->value)] = $carry;
-        }
-
-        while ($num_digits--) {
-            array_unshift($this->value, 0);
-        }
-    }
-
-    /**
-     * Logical Right Shift
-     *
-     * Shifts BigInteger's by $shift bits.
-     *
-     * @param int $shift
-     */
-    protected function rshift($shift)
-    {
-        if ($shift == 0) {
-            return;
-        }
-
-        $num_digits = (int)($shift / static::BASE);
-        $shift %= static::BASE;
-        $carry_shift = static::BASE - $shift;
-        $carry_mask = (1 << $shift) - 1;
-
-        if ($num_digits) {
-            $this->value = array_slice($this->value, $num_digits);
-        }
-
-        $carry = 0;
-
-        for ($i = count($this->value) - 1; $i >= 0; --$i) {
-            $temp = $this->value[$i] >> $shift | $carry;
-            $carry = ($this->value[$i] & $carry_mask) << $carry_shift;
-            $this->value[$i] = $temp;
-        }
-
-        $this->value = static::trim($this->value);
-    }
-
-    /**
-     * Performs modular exponentiation.
-     *
-     * @param PHP $e
-     * @param PHP $n
-     * @return PHP
-     */
-    protected function powModInner(PHP $e, PHP $n)
-    {
-        try {
-            $class = static::$modexpEngine[static::class];
-            return $class::powModHelper($this, $e, $n, static::class);
-        } catch (\Exception $err) {
-            return PHP\DefaultEngine::powModHelper($this, $e, $n, static::class);
-        }
-    }
-
-    /**
-     * Performs squaring
-     *
-     * @param list<static> $x
-     * @return list<static>
-     */
-    protected static function square(array $x)
-    {
-        return count($x) < 2 * self::KARATSUBA_CUTOFF ?
-            self::trim(self::baseSquare($x)) :
-            self::trim(self::karatsubaSquare($x));
-    }
-
-    /**
-     * Performs traditional squaring on two BigIntegers
-     *
-     * Squaring can be done faster than multiplying a number by itself can be.  See
-     * {@link http://www.cacr.math.uwaterloo.ca/hac/about/chap14.pdf#page=7 HAC 14.2.4} /
-     * {@link http://math.libtomcrypt.com/files/tommath.pdf#page=141 MPM 5.3} for more information.
-     *
-     * @param array $value
-     * @return array
-     */
-    protected static function baseSquare(array $value)
-    {
-        if (empty($value)) {
-            return [];
-        }
-        $square_value = self::array_repeat(0, 2 * count($value));
-
-        for ($i = 0, $max_index = count($value) - 1; $i <= $max_index; ++$i) {
-            $i2 = $i << 1;
-
-            $temp = $square_value[$i2] + $value[$i] * $value[$i];
-            $carry = static::BASE === 26 ? intval($temp / 0x4000000) : ($temp >> 31);
-            $square_value[$i2] = (int)($temp - static::BASE_FULL * $carry);
-
-            // note how we start from $i+1 instead of 0 as we do in multiplication.
-            for ($j = $i + 1, $k = $i2 + 1; $j <= $max_index; ++$j, ++$k) {
-                $temp = $square_value[$k] + 2 * $value[$j] * $value[$i] + $carry;
-                $carry = static::BASE === 26 ? intval($temp / 0x4000000) : ($temp >> 31);
-                $square_value[$k] = (int)($temp - static::BASE_FULL * $carry);
-            }
-
-            // the following line can yield values larger 2**15.  at this point, PHP should switch
-            // over to floats.
-            $square_value[$i + $max_index + 1] = $carry;
-        }
-
-        return $square_value;
-    }
-
-    /**
-     * Performs Karatsuba "squaring" on two BigIntegers
-     *
-     * See {@link http://en.wikipedia.org/wiki/Karatsuba_algorithm Karatsuba algorithm} and
-     * {@link http://math.libtomcrypt.com/files/tommath.pdf#page=151 MPM 5.3.4}.
-     *
-     * @param array $value
-     * @return array
-     */
-    protected static function karatsubaSquare(array $value)
-    {
-        $m = count($value) >> 1;
-
-        if ($m < self::KARATSUBA_CUTOFF) {
-            return self::baseSquare($value);
-        }
-
-        $x1 = array_slice($value, $m);
-        $x0 = array_slice($value, 0, $m);
-
-        $z2 = self::karatsubaSquare($x1);
-        $z0 = self::karatsubaSquare($x0);
-
-        $z1 = self::addHelper($x1, false, $x0, false);
-        $z1 = self::karatsubaSquare($z1[self::VALUE]);
-        $temp = self::addHelper($z2, false, $z0, false);
-        $z1 = self::subtractHelper($z1, false, $temp[self::VALUE], false);
-
-        $z2 = array_merge(array_fill(0, 2 * $m, 0), $z2);
-        $z1[self::VALUE] = array_merge(array_fill(0, $m, 0), $z1[self::VALUE]);
-
-        $xx = self::addHelper($z2, false, $z1[self::VALUE], $z1[self::SIGN]);
-        $xx = self::addHelper($xx[self::VALUE], $xx[self::SIGN], $z0, false);
-
-        return $xx[self::VALUE];
-    }
-
-    /**
-     * Make the current number odd
-     *
-     * If the current number is odd it'll be unchanged.  If it's even, one will be added to it.
-     *
-     * @see self::randomPrime()
-     */
-    protected function make_odd()
-    {
-        $this->value[0] |= 1;
-    }
-
-    /**
-     * Test the number against small primes.
-     *
-     * @see self::isPrime()
-     */
-    protected function testSmallPrimes()
-    {
-        if ($this->value == [1]) {
-            return false;
-        }
-        if ($this->value == [2]) {
-            return true;
-        }
-        if (~$this->value[0] & 1) {
-            return false;
-        }
-
-        $value = $this->value;
-        foreach (static::PRIMES as $prime) {
-            list(, $r) = self::divide_digit($value, $prime);
-            if (!$r) {
-                return count($value) == 1 && $value[0] == $prime;
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * Scan for 1 and right shift by that amount
-     *
-     * ie. $s = gmp_scan1($n, 0) and $r = gmp_div_q($n, gmp_pow(gmp_init('2'), $s));
-     *
-     * @param PHP $r
-     * @return int
-     * @see self::isPrime()
-     */
-    public static function scan1divide(PHP $r)
-    {
-        $r_value = &$r->value;
-        for ($i = 0, $r_length = count($r_value); $i < $r_length; ++$i) {
-            $temp = ~$r_value[$i] & static::MAX_DIGIT;
-            for ($j = 1; ($temp >> $j) & 1; ++$j) {
-            }
-            if ($j <= static::BASE) {
-                break;
-            }
-        }
-        $s = static::BASE * $i + $j;
-        $r->rshift($s);
-        return $s;
-    }
-
-    /**
-     * Performs exponentiation.
-     *
-     * @param PHP $n
-     * @return PHP
-     */
-    protected function powHelper(PHP $n)
-    {
-        if ($n->compare(static::$zero[static::class]) == 0) {
-            return new static(1);
-        } // n^0 = 1
-
-        $temp = clone $this;
-        while (!$n->equals(static::$one[static::class])) {
-            $temp = $temp->multiply($this);
-            $n = $n->subtract(static::$one[static::class]);
-        }
-
-        return $temp;
-    }
-
-    /**
-     * Is Odd?
-     *
-     * @return bool
-     */
-    public function isOdd()
-    {
-        return (bool)($this->value[0] & 1);
-    }
-
-    /**
-     * Tests if a bit is set
-     *
-     * @return bool
-     */
-    public function testBit($x)
-    {
-        $digit = (int) floor($x / static::BASE);
-        $bit = $x % static::BASE;
-
-        if (!isset($this->value[$digit])) {
-            return false;
-        }
-
-        return (bool)($this->value[$digit] & (1 << $bit));
-    }
-
-    /**
-     * Is Negative?
-     *
-     * @return bool
-     */
-    public function isNegative()
-    {
-        return $this->is_negative;
-    }
-
-    /**
-     * Negate
-     *
-     * Given $k, returns -$k
-     *
-     * @return static
-     */
-    public function negate()
-    {
-        $temp = clone $this;
-        $temp->is_negative = !$temp->is_negative;
-
-        return $temp;
-    }
-
-    /**
-     * Bitwise Split
-     *
-     * Splits BigInteger's into chunks of $split bits
-     *
-     * @param int $split
-     * @return list<static>
-     */
-    public function bitwise_split($split)
-    {
-        if ($split < 1) {
-            throw new \RuntimeException('Offset must be greater than 1');
-        }
-
-        $width = (int)($split / static::BASE);
-        if (!$width) {
-            $arr = $this->bitwise_small_split($split);
-            return array_map(function ($digit) {
-                $temp = new static();
-                $temp->value = $digit != 0 ? [$digit] : [];
-                return $temp;
-            }, $arr);
-        }
-
-        $vals = [];
-        $val = $this->value;
-
-        $i = $overflow = 0;
-        $len = count($val);
-        while ($i < $len) {
-            $digit = [];
-            if (!$overflow) {
-                $digit = array_slice($val, $i, $width);
-                $i += $width;
-                $overflow = $split % static::BASE;
-                if ($overflow) {
-                    $mask = (1 << $overflow) - 1;
-                    $temp = isset($val[$i]) ? $val[$i] : 0;
-                    $digit[] = $temp & $mask;
-                }
-            } else {
-                $remaining = static::BASE - $overflow;
-                $tempsplit = $split - $remaining;
-                $tempwidth = (int)($tempsplit / static::BASE + 1);
-                $digit = array_slice($val, $i, $tempwidth);
-                $i += $tempwidth;
-                $tempoverflow = $tempsplit % static::BASE;
-                if ($tempoverflow) {
-                    $tempmask = (1 << $tempoverflow) - 1;
-                    $temp = isset($val[$i]) ? $val[$i] : 0;
-                    $digit[] = $temp & $tempmask;
-                }
-                $newbits = 0;
-                for ($j = count($digit) - 1; $j >= 0; $j--) {
-                    $temp = $digit[$j] & $mask;
-                    $digit[$j] = ($digit[$j] >> $overflow) | ($newbits << $remaining);
-                    $newbits = $temp;
-                }
-                $overflow = $tempoverflow;
-                $mask = $tempmask;
-            }
-            $temp = new static();
-            $temp->value = static::trim($digit);
-            $vals[] = $temp;
-        }
-
-        return array_reverse($vals);
-    }
-
-    /**
-     * Bitwise Split where $split < static::BASE
-     *
-     * @param int $split
-     * @return list<int>
-     */
-    private function bitwise_small_split($split)
-    {
-        $vals = [];
-        $val = $this->value;
-
-        $mask = (1 << $split) - 1;
-
-        $i = $overflow = 0;
-        $len = count($val);
-        $val[] = 0;
-        $remaining = static::BASE;
-        while ($i != $len) {
-            $digit = $val[$i] & $mask;
-            $val[$i] >>= $split;
-            if (!$overflow) {
-                $remaining -= $split;
-                $overflow = $split <= $remaining ? 0 : $split - $remaining;
-
-                if (!$remaining) {
-                    $i++;
-                    $remaining = static::BASE;
-                    $overflow = 0;
-                }
-            } elseif (++$i != $len) {
-                $tempmask = (1 << $overflow) - 1;
-                $digit |= ($val[$i] & $tempmask) << $remaining;
-                $val[$i] >>= $overflow;
-                $remaining = static::BASE - $overflow;
-                $overflow = $split <= $remaining ? 0 : $split - $remaining;
-            }
-
-            $vals[] = $digit;
-        }
-
-        while ($vals[count($vals) - 1] == 0) {
-            unset($vals[count($vals) - 1]);
-        }
-
-        return array_reverse($vals);
-    }
-
-    /**
-     * @return bool
-     */
-    protected static function testJITOnWindows()
-    {
-        // see https://github.com/php/php-src/issues/11917
-        if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN' && function_exists('opcache_get_status') && PHP_VERSION_ID < 80213 && !defined('PHPSECLIB_ALLOW_JIT')) {
-            $status = opcache_get_status();
-            if ($status && isset($status['jit']) && $status['jit']['enabled'] && $status['jit']['on']) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Return the size of a BigInteger in bits
-     *
-     * @return int
-     */
-    public function getLength()
-    {
-        $max = count($this->value) - 1;
-        return $max != -1 ?
-            $max * static::BASE + intval(ceil(log($this->value[$max] + 1, 2))) :
-            0;
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger/Engines/PHP/Base.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger/Engines/PHP/Base.php
deleted file mode 100644
index 40f64bd1..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger/Engines/PHP/Base.php
+++ /dev/null
@@ -1,143 +0,0 @@
-<?php
-
-/**
- * PHP Modular Exponentiation Engine
- *
- * PHP version 5 and 7
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2017 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://pear.php.net/package/Math_BigInteger
- */
-
-namespace phpseclib3\Math\BigInteger\Engines\PHP;
-
-use phpseclib3\Math\BigInteger\Engines\PHP;
-
-/**
- * PHP Modular Exponentiation Engine
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class Base extends PHP
-{
-    /**
-     * Cache constants
-     *
-     * $cache[self::VARIABLE] tells us whether or not the cached data is still valid.
-     *
-     */
-    const VARIABLE = 0;
-    /**
-     * $cache[self::DATA] contains the cached data.
-     *
-     */
-    const DATA = 1;
-
-    /**
-     * Test for engine validity
-     *
-     * @return bool
-     */
-    public static function isValidEngine()
-    {
-        return static::class != __CLASS__;
-    }
-
-    /**
-     * Performs modular exponentiation.
-     *
-     * The most naive approach to modular exponentiation has very unreasonable requirements, and
-     * and although the approach involving repeated squaring does vastly better, it, too, is impractical
-     * for our purposes.  The reason being that division - by far the most complicated and time-consuming
-     * of the basic operations (eg. +,-,*,/) - occurs multiple times within it.
-     *
-     * Modular reductions resolve this issue.  Although an individual modular reduction takes more time
-     * then an individual division, when performed in succession (with the same modulo), they're a lot faster.
-     *
-     * The two most commonly used modular reductions are Barrett and Montgomery reduction.  Montgomery reduction,
-     * although faster, only works when the gcd of the modulo and of the base being used is 1.  In RSA, when the
-     * base is a power of two, the modulo - a product of two primes - is always going to have a gcd of 1 (because
-     * the product of two odd numbers is odd), but what about when RSA isn't used?
-     *
-     * In contrast, Barrett reduction has no such constraint.  As such, some bigint implementations perform a
-     * Barrett reduction after every operation in the modpow function.  Others perform Barrett reductions when the
-     * modulo is even and Montgomery reductions when the modulo is odd.  BigInteger.java's modPow method, however,
-     * uses a trick involving the Chinese Remainder Theorem to factor the even modulo into two numbers - one odd and
-     * the other, a power of two - and recombine them, later.  This is the method that this modPow function uses.
-     * {@link http://islab.oregonstate.edu/papers/j34monex.pdf Montgomery Reduction with Even Modulus} elaborates.
-     *
-     * @param PHP $x
-     * @param PHP $e
-     * @param PHP $n
-     * @param string $class
-     * @return PHP
-     */
-    protected static function powModHelper(PHP $x, PHP $e, PHP $n, $class)
-    {
-        if (empty($e->value)) {
-            $temp = new $class();
-            $temp->value = [1];
-            return $x->normalize($temp);
-        }
-
-        if ($e->value == [1]) {
-            list(, $temp) = $x->divide($n);
-            return $x->normalize($temp);
-        }
-
-        if ($e->value == [2]) {
-            $temp = new $class();
-            $temp->value = $class::square($x->value);
-            list(, $temp) = $temp->divide($n);
-            return $x->normalize($temp);
-        }
-
-        return $x->normalize(static::slidingWindow($x, $e, $n, $class));
-    }
-
-    /**
-     * Modular reduction preparation
-     *
-     * @param array $x
-     * @param array $n
-     * @param string $class
-     * @see self::slidingWindow()
-     * @return array
-     */
-    protected static function prepareReduce(array $x, array $n, $class)
-    {
-        return static::reduce($x, $n, $class);
-    }
-
-    /**
-     * Modular multiply
-     *
-     * @param array $x
-     * @param array $y
-     * @param array $n
-     * @param string $class
-     * @see self::slidingWindow()
-     * @return array
-     */
-    protected static function multiplyReduce(array $x, array $y, array $n, $class)
-    {
-        $temp = $class::multiplyHelper($x, false, $y, false);
-        return static::reduce($temp[self::VALUE], $n, $class);
-    }
-
-    /**
-     * Modular square
-     *
-     * @param array $x
-     * @param array $n
-     * @param string $class
-     * @see self::slidingWindow()
-     * @return array
-     */
-    protected static function squareReduce(array $x, array $n, $class)
-    {
-        return static::reduce($class::square($x), $n, $class);
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger/Engines/PHP/DefaultEngine.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger/Engines/PHP/DefaultEngine.php
deleted file mode 100644
index 6d33532e..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger/Engines/PHP/DefaultEngine.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-/**
- * PHP Default Modular Exponentiation Engine
- *
- * PHP version 5 and 7
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2017 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://pear.php.net/package/Math_BigInteger
- */
-
-namespace phpseclib3\Math\BigInteger\Engines\PHP;
-
-use phpseclib3\Math\BigInteger\Engines\PHP\Reductions\EvalBarrett;
-
-/**
- * PHP Default Modular Exponentiation Engine
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class DefaultEngine extends EvalBarrett
-{
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger/Engines/PHP/Montgomery.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger/Engines/PHP/Montgomery.php
deleted file mode 100644
index 09f825f9..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger/Engines/PHP/Montgomery.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-
-/**
- * PHP Montgomery Modular Exponentiation Engine
- *
- * PHP version 5 and 7
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2017 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://pear.php.net/package/Math_BigInteger
- */
-
-namespace phpseclib3\Math\BigInteger\Engines\PHP;
-
-use phpseclib3\Math\BigInteger\Engines\Engine;
-use phpseclib3\Math\BigInteger\Engines\PHP;
-use phpseclib3\Math\BigInteger\Engines\PHP\Reductions\PowerOfTwo;
-
-/**
- * PHP Montgomery Modular Exponentiation Engine
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class Montgomery extends Base
-{
-    /**
-     * Test for engine validity
-     *
-     * @return bool
-     */
-    public static function isValidEngine()
-    {
-        return static::class != __CLASS__;
-    }
-
-    /**
-     * Performs modular exponentiation.
-     *
-     * @template T of Engine
-     * @param Engine $x
-     * @param Engine $e
-     * @param Engine $n
-     * @param class-string<T> $class
-     * @return T
-     */
-    protected static function slidingWindow(Engine $x, Engine $e, Engine $n, $class)
-    {
-        // is the modulo odd?
-        if ($n->value[0] & 1) {
-            return parent::slidingWindow($x, $e, $n, $class);
-        }
-        // if it's not, it's even
-
-        // find the lowest set bit (eg. the max pow of 2 that divides $n)
-        for ($i = 0; $i < count($n->value); ++$i) {
-            if ($n->value[$i]) {
-                $temp = decbin($n->value[$i]);
-                $j = strlen($temp) - strrpos($temp, '1') - 1;
-                $j += $class::BASE * $i;
-                break;
-            }
-        }
-        // at this point, 2^$j * $n/(2^$j) == $n
-
-        $mod1 = clone $n;
-        $mod1->rshift($j);
-        $mod2 = new $class();
-        $mod2->value = [1];
-        $mod2->lshift($j);
-
-        $part1 = $mod1->value != [1] ? parent::slidingWindow($x, $e, $mod1, $class) : new $class();
-        $part2 = PowerOfTwo::slidingWindow($x, $e, $mod2, $class);
-
-        $y1 = $mod2->modInverse($mod1);
-        $y2 = $mod1->modInverse($mod2);
-
-        $result = $part1->multiply($mod2);
-        $result = $result->multiply($y1);
-
-        $temp = $part2->multiply($mod1);
-        $temp = $temp->multiply($y2);
-
-        $result = $result->add($temp);
-        list(, $result) = $result->divide($n);
-
-        return $result;
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger/Engines/PHP/OpenSSL.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger/Engines/PHP/OpenSSL.php
deleted file mode 100644
index eddd25e2..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger/Engines/PHP/OpenSSL.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-/**
- * OpenSSL Modular Exponentiation Engine
- *
- * PHP version 5 and 7
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2017 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://pear.php.net/package/Math_BigInteger
- */
-
-namespace phpseclib3\Math\BigInteger\Engines\PHP;
-
-use phpseclib3\Math\BigInteger\Engines\OpenSSL as Progenitor;
-
-/**
- * OpenSSL Modular Exponentiation Engine
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class OpenSSL extends Progenitor
-{
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger/Engines/PHP/Reductions/Barrett.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger/Engines/PHP/Reductions/Barrett.php
deleted file mode 100644
index 3518d76f..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger/Engines/PHP/Reductions/Barrett.php
+++ /dev/null
@@ -1,281 +0,0 @@
-<?php
-
-/**
- * PHP Barrett Modular Exponentiation Engine
- *
- * PHP version 5 and 7
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2017 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://pear.php.net/package/Math_BigInteger
- */
-
-namespace phpseclib3\Math\BigInteger\Engines\PHP\Reductions;
-
-use phpseclib3\Math\BigInteger\Engines\PHP;
-use phpseclib3\Math\BigInteger\Engines\PHP\Base;
-
-/**
- * PHP Barrett Modular Exponentiation Engine
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class Barrett extends Base
-{
-    /**
-     * Barrett Modular Reduction
-     *
-     * See {@link http://www.cacr.math.uwaterloo.ca/hac/about/chap14.pdf#page=14 HAC 14.3.3} /
-     * {@link http://math.libtomcrypt.com/files/tommath.pdf#page=165 MPM 6.2.5} for more information.  Modified slightly,
-     * so as not to require negative numbers (initially, this script didn't support negative numbers).
-     *
-     * Employs "folding", as described at
-     * {@link http://www.cosic.esat.kuleuven.be/publications/thesis-149.pdf#page=66 thesis-149.pdf#page=66}.  To quote from
-     * it, "the idea [behind folding] is to find a value x' such that x (mod m) = x' (mod m), with x' being smaller than x."
-     *
-     * Unfortunately, the "Barrett Reduction with Folding" algorithm described in thesis-149.pdf is not, as written, all that
-     * usable on account of (1) its not using reasonable radix points as discussed in
-     * {@link http://math.libtomcrypt.com/files/tommath.pdf#page=162 MPM 6.2.2} and (2) the fact that, even with reasonable
-     * radix points, it only works when there are an even number of digits in the denominator.  The reason for (2) is that
-     * (x >> 1) + (x >> 1) != x / 2 + x / 2.  If x is even, they're the same, but if x is odd, they're not.  See the in-line
-     * comments for details.
-     *
-     * @param array $n
-     * @param array $m
-     * @param class-string<PHP> $class
-     * @return array
-     */
-    protected static function reduce(array $n, array $m, $class)
-    {
-        static $cache = [
-            self::VARIABLE => [],
-            self::DATA => []
-        ];
-
-        $m_length = count($m);
-
-        // if (self::compareHelper($n, $static::square($m)) >= 0) {
-        if (count($n) > 2 * $m_length) {
-            $lhs = new $class();
-            $rhs = new $class();
-            $lhs->value = $n;
-            $rhs->value = $m;
-            list(, $temp) = $lhs->divide($rhs);
-            return $temp->value;
-        }
-
-        // if (m.length >> 1) + 2 <= m.length then m is too small and n can't be reduced
-        if ($m_length < 5) {
-            return self::regularBarrett($n, $m, $class);
-        }
-        // n = 2 * m.length
-
-        if (($key = array_search($m, $cache[self::VARIABLE])) === false) {
-            $key = count($cache[self::VARIABLE]);
-            $cache[self::VARIABLE][] = $m;
-
-            $lhs = new $class();
-            $lhs_value = &$lhs->value;
-            $lhs_value = self::array_repeat(0, $m_length + ($m_length >> 1));
-            $lhs_value[] = 1;
-            $rhs = new $class();
-            $rhs->value = $m;
-
-            list($u, $m1) = $lhs->divide($rhs);
-            $u = $u->value;
-            $m1 = $m1->value;
-
-            $cache[self::DATA][] = [
-                'u' => $u, // m.length >> 1 (technically (m.length >> 1) + 1)
-                'm1' => $m1 // m.length
-            ];
-        } else {
-            extract($cache[self::DATA][$key]);
-        }
-
-        $cutoff = $m_length + ($m_length >> 1);
-        $lsd = array_slice($n, 0, $cutoff); // m.length + (m.length >> 1)
-        $msd = array_slice($n, $cutoff);    // m.length >> 1
-
-        $lsd = self::trim($lsd);
-        $temp = $class::multiplyHelper($msd, false, $m1, false); // m.length + (m.length >> 1)
-        $n = $class::addHelper($lsd, false, $temp[self::VALUE], false); // m.length + (m.length >> 1) + 1 (so basically we're adding two same length numbers)
-        //if ($m_length & 1) {
-        //    return self::regularBarrett($n[self::VALUE], $m, $class);
-        //}
-
-        // (m.length + (m.length >> 1) + 1) - (m.length - 1) == (m.length >> 1) + 2
-        $temp = array_slice($n[self::VALUE], $m_length - 1);
-        // if even: ((m.length >> 1) + 2) + (m.length >> 1) == m.length + 2
-        // if odd:  ((m.length >> 1) + 2) + (m.length >> 1) == (m.length - 1) + 2 == m.length + 1
-        $temp = $class::multiplyHelper($temp, false, $u, false);
-        // if even: (m.length + 2) - ((m.length >> 1) + 1) = m.length - (m.length >> 1) + 1
-        // if odd:  (m.length + 1) - ((m.length >> 1) + 1) = m.length - (m.length >> 1)
-        $temp = array_slice($temp[self::VALUE], ($m_length >> 1) + 1);
-        // if even: (m.length - (m.length >> 1) + 1) + m.length = 2 * m.length - (m.length >> 1) + 1
-        // if odd:  (m.length - (m.length >> 1)) + m.length     = 2 * m.length - (m.length >> 1)
-        $temp = $class::multiplyHelper($temp, false, $m, false);
-
-        // at this point, if m had an odd number of digits, we'd be subtracting a 2 * m.length - (m.length >> 1) digit
-        // number from a m.length + (m.length >> 1) + 1 digit number.  ie. there'd be an extra digit and the while loop
-        // following this comment would loop a lot (hence our calling _regularBarrett() in that situation).
-
-        $result = $class::subtractHelper($n[self::VALUE], false, $temp[self::VALUE], false);
-
-        while (self::compareHelper($result[self::VALUE], $result[self::SIGN], $m, false) >= 0) {
-            $result = $class::subtractHelper($result[self::VALUE], $result[self::SIGN], $m, false);
-        }
-
-        return $result[self::VALUE];
-    }
-
-    /**
-     * (Regular) Barrett Modular Reduction
-     *
-     * For numbers with more than four digits BigInteger::_barrett() is faster.  The difference between that and this
-     * is that this function does not fold the denominator into a smaller form.
-     *
-     * @param array $x
-     * @param array $n
-     * @param string $class
-     * @return array
-     */
-    private static function regularBarrett(array $x, array $n, $class)
-    {
-        static $cache = [
-            self::VARIABLE => [],
-            self::DATA => []
-        ];
-
-        $n_length = count($n);
-
-        if (count($x) > 2 * $n_length) {
-            $lhs = new $class();
-            $rhs = new $class();
-            $lhs->value = $x;
-            $rhs->value = $n;
-            list(, $temp) = $lhs->divide($rhs);
-            return $temp->value;
-        }
-
-        if (($key = array_search($n, $cache[self::VARIABLE])) === false) {
-            $key = count($cache[self::VARIABLE]);
-            $cache[self::VARIABLE][] = $n;
-            $lhs = new $class();
-            $lhs_value = &$lhs->value;
-            $lhs_value = self::array_repeat(0, 2 * $n_length);
-            $lhs_value[] = 1;
-            $rhs = new $class();
-            $rhs->value = $n;
-            list($temp, ) = $lhs->divide($rhs); // m.length
-            $cache[self::DATA][] = $temp->value;
-        }
-
-        // 2 * m.length - (m.length - 1) = m.length + 1
-        $temp = array_slice($x, $n_length - 1);
-        // (m.length + 1) + m.length = 2 * m.length + 1
-        $temp = $class::multiplyHelper($temp, false, $cache[self::DATA][$key], false);
-        // (2 * m.length + 1) - (m.length - 1) = m.length + 2
-        $temp = array_slice($temp[self::VALUE], $n_length + 1);
-
-        // m.length + 1
-        $result = array_slice($x, 0, $n_length + 1);
-        // m.length + 1
-        $temp = self::multiplyLower($temp, false, $n, false, $n_length + 1, $class);
-        // $temp == array_slice($class::regularMultiply($temp, false, $n, false)->value, 0, $n_length + 1)
-
-        if (self::compareHelper($result, false, $temp[self::VALUE], $temp[self::SIGN]) < 0) {
-            $corrector_value = self::array_repeat(0, $n_length + 1);
-            $corrector_value[count($corrector_value)] = 1;
-            $result = $class::addHelper($result, false, $corrector_value, false);
-            $result = $result[self::VALUE];
-        }
-
-        // at this point, we're subtracting a number with m.length + 1 digits from another number with m.length + 1 digits
-        $result = $class::subtractHelper($result, false, $temp[self::VALUE], $temp[self::SIGN]);
-        while (self::compareHelper($result[self::VALUE], $result[self::SIGN], $n, false) > 0) {
-            $result = $class::subtractHelper($result[self::VALUE], $result[self::SIGN], $n, false);
-        }
-
-        return $result[self::VALUE];
-    }
-
-    /**
-     * Performs long multiplication up to $stop digits
-     *
-     * If you're going to be doing array_slice($product->value, 0, $stop), some cycles can be saved.
-     *
-     * @see self::regularBarrett()
-     * @param array $x_value
-     * @param bool $x_negative
-     * @param array $y_value
-     * @param bool $y_negative
-     * @param int $stop
-     * @param string $class
-     * @return array
-     */
-    private static function multiplyLower(array $x_value, $x_negative, array $y_value, $y_negative, $stop, $class)
-    {
-        $x_length = count($x_value);
-        $y_length = count($y_value);
-
-        if (!$x_length || !$y_length) { // a 0 is being multiplied
-            return [
-                self::VALUE => [],
-                self::SIGN => false
-            ];
-        }
-
-        if ($x_length < $y_length) {
-            $temp = $x_value;
-            $x_value = $y_value;
-            $y_value = $temp;
-
-            $x_length = count($x_value);
-            $y_length = count($y_value);
-        }
-
-        $product_value = self::array_repeat(0, $x_length + $y_length);
-
-        // the following for loop could be removed if the for loop following it
-        // (the one with nested for loops) initially set $i to 0, but
-        // doing so would also make the result in one set of unnecessary adds,
-        // since on the outermost loops first pass, $product->value[$k] is going
-        // to always be 0
-
-        $carry = 0;
-
-        for ($j = 0; $j < $x_length; ++$j) { // ie. $i = 0, $k = $i
-            $temp = $x_value[$j] * $y_value[0] + $carry; // $product_value[$k] == 0
-            $carry = $class::BASE === 26 ? intval($temp / 0x4000000) : ($temp >> 31);
-            $product_value[$j] = (int) ($temp - $class::BASE_FULL * $carry);
-        }
-
-        if ($j < $stop) {
-            $product_value[$j] = $carry;
-        }
-
-        // the above for loop is what the previous comment was talking about.  the
-        // following for loop is the "one with nested for loops"
-
-        for ($i = 1; $i < $y_length; ++$i) {
-            $carry = 0;
-
-            for ($j = 0, $k = $i; $j < $x_length && $k < $stop; ++$j, ++$k) {
-                $temp = $product_value[$k] + $x_value[$j] * $y_value[$i] + $carry;
-                $carry = $class::BASE === 26 ? intval($temp / 0x4000000) : ($temp >> 31);
-                $product_value[$k] = (int) ($temp - $class::BASE_FULL * $carry);
-            }
-
-            if ($k < $stop) {
-                $product_value[$k] = $carry;
-            }
-        }
-
-        return [
-            self::VALUE => self::trim($product_value),
-            self::SIGN => $x_negative != $y_negative
-        ];
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger/Engines/PHP/Reductions/Classic.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger/Engines/PHP/Reductions/Classic.php
deleted file mode 100644
index 54f3b863..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger/Engines/PHP/Reductions/Classic.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-/**
- * PHP Classic Modular Exponentiation Engine
- *
- * PHP version 5 and 7
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2017 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://pear.php.net/package/Math_BigInteger
- */
-
-namespace phpseclib3\Math\BigInteger\Engines\PHP\Reductions;
-
-use phpseclib3\Math\BigInteger\Engines\PHP\Base;
-
-/**
- * PHP Classic Modular Exponentiation Engine
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class Classic extends Base
-{
-    /**
-     * Regular Division
-     *
-     * @param array $x
-     * @param array $n
-     * @param string $class
-     * @return array
-     */
-    protected static function reduce(array $x, array $n, $class)
-    {
-        $lhs = new $class();
-        $lhs->value = $x;
-        $rhs = new $class();
-        $rhs->value = $n;
-        list(, $temp) = $lhs->divide($rhs);
-        return $temp->value;
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger/Engines/PHP/Reductions/EvalBarrett.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger/Engines/PHP/Reductions/EvalBarrett.php
deleted file mode 100644
index 2f943317..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger/Engines/PHP/Reductions/EvalBarrett.php
+++ /dev/null
@@ -1,484 +0,0 @@
-<?php
-
-/**
- * PHP Dynamic Barrett Modular Exponentiation Engine
- *
- * PHP version 5 and 7
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2017 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://pear.php.net/package/Math_BigInteger
- */
-
-namespace phpseclib3\Math\BigInteger\Engines\PHP\Reductions;
-
-use phpseclib3\Math\BigInteger\Engines\PHP;
-use phpseclib3\Math\BigInteger\Engines\PHP\Base;
-
-/**
- * PHP Dynamic Barrett Modular Exponentiation Engine
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class EvalBarrett extends Base
-{
-    /**
-     * Custom Reduction Function
-     *
-     * @see self::generateCustomReduction
-     */
-    private static $custom_reduction;
-
-    /**
-     * Barrett Modular Reduction
-     *
-     * This calls a dynamically generated loop unrolled function that's specific to a given modulo.
-     * Array lookups are avoided as are if statements testing for how many bits the host OS supports, etc.
-     *
-     * @param array $n
-     * @param array $m
-     * @param string $class
-     * @return array
-     */
-    protected static function reduce(array $n, array $m, $class)
-    {
-        $inline = self::$custom_reduction;
-        return $inline($n);
-    }
-
-    /**
-     * Generate Custom Reduction
-     *
-     * @param PHP $m
-     * @param string $class
-     * @return callable
-     */
-    protected static function generateCustomReduction(PHP $m, $class)
-    {
-        $m_length = count($m->value);
-
-        if ($m_length < 5) {
-            $code = '
-                $lhs = new ' . $class . '();
-                $lhs->value = $x;
-                $rhs = new ' . $class . '();
-                $rhs->value = [' .
-                implode(',', array_map(self::class . '::float2string', $m->value)) . '];
-                list(, $temp) = $lhs->divide($rhs);
-                return $temp->value;
-            ';
-            eval('$func = function ($x) { ' . $code . '};');
-            self::$custom_reduction = $func;
-            //self::$custom_reduction = \Closure::bind($func, $m, $class);
-            return $func;
-        }
-
-        $lhs = new $class();
-        $lhs_value = &$lhs->value;
-
-        $lhs_value = self::array_repeat(0, $m_length + ($m_length >> 1));
-        $lhs_value[] = 1;
-        $rhs = new $class();
-
-        list($u, $m1) = $lhs->divide($m);
-
-        if ($class::BASE != 26) {
-            $u = $u->value;
-        } else {
-            $lhs_value = self::array_repeat(0, 2 * $m_length);
-            $lhs_value[] = 1;
-            $rhs = new $class();
-
-            list($u) = $lhs->divide($m);
-            $u = $u->value;
-        }
-
-        $m = $m->value;
-        $m1 = $m1->value;
-
-        $cutoff = count($m) + (count($m) >> 1);
-
-        $code = '
-            if (count($n) > ' . (2 * count($m)) . ') {
-                $lhs = new ' . $class . '();
-                $rhs = new ' . $class . '();
-                $lhs->value = $n;
-                $rhs->value = [' .
-                implode(',', array_map(self::class . '::float2string', $m)) . '];
-                list(, $temp) = $lhs->divide($rhs);
-                return $temp->value;
-            }
-
-            $lsd = array_slice($n, 0, ' . $cutoff . ');
-            $msd = array_slice($n, ' . $cutoff . ');';
-
-        $code .= self::generateInlineTrim('msd');
-        $code .= self::generateInlineMultiply('msd', $m1, 'temp', $class);
-        $code .= self::generateInlineAdd('lsd', 'temp', 'n', $class);
-
-        $code .= '$temp = array_slice($n, ' . (count($m) - 1) . ');';
-        $code .= self::generateInlineMultiply('temp', $u, 'temp2', $class);
-        $code .= self::generateInlineTrim('temp2');
-
-        $code .= $class::BASE == 26 ?
-            '$temp = array_slice($temp2, ' . (count($m) + 1) . ');' :
-            '$temp = array_slice($temp2, ' . ((count($m) >> 1) + 1) . ');';
-        $code .= self::generateInlineMultiply('temp', $m, 'temp2', $class);
-        $code .= self::generateInlineTrim('temp2');
-
-        /*
-        if ($class::BASE == 26) {
-            $code.= '$n = array_slice($n, 0, ' . (count($m) + 1) . ');
-                     $temp2 = array_slice($temp2, 0, ' . (count($m) + 1) . ');';
-        }
-        */
-
-        $code .= self::generateInlineSubtract2('n', 'temp2', 'temp', $class);
-
-        $subcode = self::generateInlineSubtract1('temp', $m, 'temp2', $class);
-        $subcode .= '$temp = $temp2;';
-
-        $code .= self::generateInlineCompare($m, 'temp', $subcode);
-
-        $code .= 'return $temp;';
-
-        eval('$func = function ($n) { ' . $code . '};');
-
-        self::$custom_reduction = $func;
-
-        return $func;
-
-        //self::$custom_reduction = \Closure::bind($func, $m, $class);
-    }
-
-    /**
-     * Inline Trim
-     *
-     * Removes leading zeros
-     *
-     * @param string $name
-     * @return string
-     */
-    private static function generateInlineTrim($name)
-    {
-        return '
-            for ($i = count($' . $name . ') - 1; $i >= 0; --$i) {
-                if ($' . $name . '[$i]) {
-                    break;
-                }
-                unset($' . $name . '[$i]);
-            }';
-    }
-
-    /**
-     * Inline Multiply (unknown, known)
-     *
-     * @param string $input
-     * @param array $arr
-     * @param string $output
-     * @param string $class
-     * @return string
-     */
-    private static function generateInlineMultiply($input, array $arr, $output, $class)
-    {
-        if (!count($arr)) {
-            return 'return [];';
-        }
-
-        $regular = '
-            $length = count($' . $input . ');
-            if (!$length) {
-                $' . $output . ' = [];
-            }else{
-            $' . $output . ' = array_fill(0, $length + ' . count($arr) . ', 0);
-            $carry = 0;';
-
-        for ($i = 0; $i < count($arr); $i++) {
-            $regular .= '
-                $subtemp = $' . $input . '[0] * ' . $arr[$i];
-            $regular .= $i ? ' + $carry;' : ';';
-
-            $regular .= '$carry = ';
-            $regular .= $class::BASE === 26 ?
-            'intval($subtemp / 0x4000000);' :
-            '$subtemp >> 31;';
-            $regular .=
-            '$' . $output . '[' . $i . '] = ';
-            if ($class::BASE === 26) {
-                $regular .= '(int) (';
-            }
-            $regular .= '$subtemp - ' . $class::BASE_FULL . ' * $carry';
-            $regular .= $class::BASE === 26 ? ');' : ';';
-        }
-
-        $regular .= '$' . $output . '[' . count($arr) . '] = $carry;';
-
-        $regular .= '
-            for ($i = 1; $i < $length; ++$i) {';
-
-        for ($j = 0; $j < count($arr); $j++) {
-            $regular .= $j ? '$k++;' : '$k = $i;';
-            $regular .= '
-                $subtemp = $' . $output . '[$k] + $' . $input . '[$i] * ' . $arr[$j];
-            $regular .= $j ? ' + $carry;' : ';';
-
-            $regular .= '$carry = ';
-            $regular .= $class::BASE === 26 ?
-                'intval($subtemp / 0x4000000);' :
-                '$subtemp >> 31;';
-            $regular .=
-                '$' . $output . '[$k] = ';
-            if ($class::BASE === 26) {
-                $regular .= '(int) (';
-            }
-            $regular .= '$subtemp - ' . $class::BASE_FULL . ' * $carry';
-            $regular .= $class::BASE === 26 ? ');' : ';';
-        }
-
-        $regular .= '$' . $output . '[++$k] = $carry; $carry = 0;';
-
-        $regular .= '}}';
-
-        //if (count($arr) < 2 * self::KARATSUBA_CUTOFF) {
-        //}
-
-        return $regular;
-    }
-
-    /**
-     * Inline Addition
-     *
-     * @param string $x
-     * @param string $y
-     * @param string $result
-     * @param string $class
-     * @return string
-     */
-    private static function generateInlineAdd($x, $y, $result, $class)
-    {
-        $code = '
-            $length = max(count($' . $x . '), count($' . $y . '));
-            $' . $result . ' = array_pad($' . $x . ', $length + 1, 0);
-            $_' . $y . ' = array_pad($' . $y . ', $length, 0);
-            $carry = 0;
-            for ($i = 0, $j = 1; $j < $length; $i+=2, $j+=2) {
-                $sum = ($' . $result . '[$j] + $_' . $y . '[$j]) * ' . $class::BASE_FULL . '
-                           + $' . $result . '[$i] + $_' . $y . '[$i] +
-                           $carry;
-                $carry = $sum >= ' . self::float2string($class::MAX_DIGIT2) . ';
-                $sum = $carry ? $sum - ' . self::float2string($class::MAX_DIGIT2) . ' : $sum;';
-
-            $code .= $class::BASE === 26 ?
-                '$upper = intval($sum / 0x4000000); $' . $result . '[$i] = (int) ($sum - ' . $class::BASE_FULL . ' * $upper);' :
-                '$upper = $sum >> 31; $' . $result . '[$i] = $sum - ' . $class::BASE_FULL . ' * $upper;';
-            $code .= '
-                $' . $result . '[$j] = $upper;
-            }
-            if ($j == $length) {
-                $sum = $' . $result . '[$i] + $_' . $y . '[$i] + $carry;
-                $carry = $sum >= ' . self::float2string($class::BASE_FULL) . ';
-                $' . $result . '[$i] = $carry ? $sum - ' . self::float2string($class::BASE_FULL) . ' : $sum;
-                ++$i;
-            }
-            if ($carry) {
-                for (; $' . $result . '[$i] == ' . $class::MAX_DIGIT . '; ++$i) {
-                    $' . $result . '[$i] = 0;
-                }
-                ++$' . $result . '[$i];
-            }';
-            $code .= self::generateInlineTrim($result);
-
-            return $code;
-    }
-
-    /**
-     * Inline Subtraction 2
-     *
-     * For when $known is more digits than $unknown. This is the harder use case to optimize for.
-     *
-     * @param string $known
-     * @param string $unknown
-     * @param string $result
-     * @param string $class
-     * @return string
-     */
-    private static function generateInlineSubtract2($known, $unknown, $result, $class)
-    {
-        $code = '
-            $' . $result . ' = $' . $known . ';
-            $carry = 0;
-            $size = count($' . $unknown . ');
-            for ($i = 0, $j = 1; $j < $size; $i+= 2, $j+= 2) {
-                $sum = ($' . $known . '[$j] - $' . $unknown . '[$j]) * ' . $class::BASE_FULL . ' + $' . $known . '[$i]
-                    - $' . $unknown . '[$i]
-                    - $carry;
-                $carry = $sum < 0;
-                if ($carry) {
-                    $sum+= ' . self::float2string($class::MAX_DIGIT2) . ';
-                }
-                $subtemp = ';
-        $code .= $class::BASE === 26 ?
-            'intval($sum / 0x4000000);' :
-            '$sum >> 31;';
-        $code .= '$' . $result . '[$i] = ';
-        if ($class::BASE === 26) {
-            $code .= '(int) (';
-        }
-        $code .= '$sum - ' . $class::BASE_FULL . ' * $subtemp';
-        if ($class::BASE === 26) {
-            $code .= ')';
-        }
-        $code .= ';
-                $' . $result . '[$j] = $subtemp;
-            }
-            if ($j == $size) {
-                $sum = $' . $known . '[$i] - $' . $unknown . '[$i] - $carry;
-                $carry = $sum < 0;
-                $' . $result . '[$i] = $carry ? $sum + ' . $class::BASE_FULL . ' : $sum;
-                ++$i;
-            }
-
-            if ($carry) {
-                for (; !$' . $result . '[$i]; ++$i) {
-                    $' . $result . '[$i] = ' . $class::MAX_DIGIT . ';
-                }
-                --$' . $result . '[$i];
-            }';
-
-        $code .= self::generateInlineTrim($result);
-
-        return $code;
-    }
-
-    /**
-     * Inline Subtraction 1
-     *
-     * For when $unknown is more digits than $known. This is the easier use case to optimize for.
-     *
-     * @param string $unknown
-     * @param array $known
-     * @param string $result
-     * @param string $class
-     * @return string
-     */
-    private static function generateInlineSubtract1($unknown, array $known, $result, $class)
-    {
-        $code = '$' . $result . ' = $' . $unknown . ';';
-        for ($i = 0, $j = 1; $j < count($known); $i += 2, $j += 2) {
-            $code .= '$sum = $' . $unknown . '[' . $j . '] * ' . $class::BASE_FULL . ' + $' . $unknown . '[' . $i . '] - ';
-            $code .= self::float2string($known[$j] * $class::BASE_FULL + $known[$i]);
-            if ($i != 0) {
-                $code .= ' - $carry';
-            }
-
-            $code .= ';
-                if ($carry = $sum < 0) {
-                    $sum+= ' . self::float2string($class::MAX_DIGIT2) . ';
-                }
-                $subtemp = ';
-            $code .= $class::BASE === 26 ?
-                'intval($sum / 0x4000000);' :
-                '$sum >> 31;';
-            $code .= '
-                $' . $result . '[' . $i . '] = ';
-            if ($class::BASE === 26) {
-                $code .= ' (int) (';
-            }
-            $code .= '$sum - ' . $class::BASE_FULL . ' * $subtemp';
-            if ($class::BASE === 26) {
-                $code .= ')';
-            }
-            $code .= ';
-                $' . $result . '[' . $j . '] = $subtemp;';
-        }
-
-        $code .= '$i = ' . $i . ';';
-
-        if ($j == count($known)) {
-            $code .= '
-                $sum = $' . $unknown . '[' . $i . '] - ' . $known[$i] . ' - $carry;
-                $carry = $sum < 0;
-                $' . $result . '[' . $i . '] = $carry ? $sum + ' . $class::BASE_FULL . ' : $sum;
-                ++$i;';
-        }
-
-        $code .= '
-            if ($carry) {
-                for (; !$' . $result . '[$i]; ++$i) {
-                    $' . $result . '[$i] = ' . $class::MAX_DIGIT . ';
-                }
-                --$' . $result . '[$i];
-            }';
-        $code .= self::generateInlineTrim($result);
-
-        return $code;
-    }
-
-    /**
-     * Inline Comparison
-     *
-     * If $unknown >= $known then loop
-     *
-     * @param array $known
-     * @param string $unknown
-     * @param string $subcode
-     * @return string
-     */
-    private static function generateInlineCompare(array $known, $unknown, $subcode)
-    {
-        $uniqid = uniqid();
-        $code = 'loop_' . $uniqid . ':
-            $clength = count($' . $unknown . ');
-            switch (true) {
-                case $clength < ' . count($known) . ':
-                    goto end_' . $uniqid . ';
-                case $clength > ' . count($known) . ':';
-        for ($i = count($known) - 1; $i >= 0; $i--) {
-            $code .= '
-                case $' . $unknown . '[' . $i . '] > ' . $known[$i] . ':
-                    goto subcode_' . $uniqid . ';
-                case $' . $unknown . '[' . $i . '] < ' . $known[$i] . ':
-                    goto end_' . $uniqid . ';';
-        }
-        $code .= '
-                default:
-                    // do subcode
-            }
-
-            subcode_' . $uniqid . ':' . $subcode . '
-            goto loop_' . $uniqid . ';
-
-            end_' . $uniqid . ':';
-
-        return $code;
-    }
-
-    /**
-     * Convert a float to a string
-     *
-     * If you do echo floatval(pow(2, 52)) you'll get 4.6116860184274E+18. It /can/ be displayed without a loss of
-     * precision but displayed in this way there will be precision loss, hence the need for this method.
-     *
-     * @param int|float $num
-     * @return string
-     */
-    private static function float2string($num)
-    {
-        if (!is_float($num)) {
-            return (string) $num;
-        }
-
-        if ($num < 0) {
-            return '-' . self::float2string(abs($num));
-        }
-
-        $temp = '';
-        while ($num) {
-            $temp = fmod($num, 10) . $temp;
-            $num = floor($num / 10);
-        }
-
-        return $temp;
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger/Engines/PHP/Reductions/Montgomery.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger/Engines/PHP/Reductions/Montgomery.php
deleted file mode 100644
index a34035e7..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger/Engines/PHP/Reductions/Montgomery.php
+++ /dev/null
@@ -1,126 +0,0 @@
-<?php
-
-/**
- * PHP Montgomery Modular Exponentiation Engine
- *
- * PHP version 5 and 7
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2017 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://pear.php.net/package/Math_BigInteger
- */
-
-namespace phpseclib3\Math\BigInteger\Engines\PHP\Reductions;
-
-use phpseclib3\Math\BigInteger\Engines\PHP\Montgomery as Progenitor;
-
-/**
- * PHP Montgomery Modular Exponentiation Engine
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class Montgomery extends Progenitor
-{
-    /**
-     * Prepare a number for use in Montgomery Modular Reductions
-     *
-     * @param array $x
-     * @param array $n
-     * @param string $class
-     * @return array
-     */
-    protected static function prepareReduce(array $x, array $n, $class)
-    {
-        $lhs = new $class();
-        $lhs->value = array_merge(self::array_repeat(0, count($n)), $x);
-        $rhs = new $class();
-        $rhs->value = $n;
-
-        list(, $temp) = $lhs->divide($rhs);
-        return $temp->value;
-    }
-
-    /**
-     * Montgomery Multiply
-     *
-     * Interleaves the montgomery reduction and long multiplication algorithms together as described in
-     * {@link http://www.cacr.math.uwaterloo.ca/hac/about/chap14.pdf#page=13 HAC 14.36}
-     *
-     * @param array $x
-     * @param array $n
-     * @param string $class
-     * @return array
-     */
-    protected static function reduce(array $x, array $n, $class)
-    {
-        static $cache = [
-            self::VARIABLE => [],
-            self::DATA => []
-        ];
-
-        if (($key = array_search($n, $cache[self::VARIABLE])) === false) {
-            $key = count($cache[self::VARIABLE]);
-            $cache[self::VARIABLE][] = $x;
-            $cache[self::DATA][] = self::modInverse67108864($n, $class);
-        }
-
-        $k = count($n);
-
-        $result = [self::VALUE => $x];
-
-        for ($i = 0; $i < $k; ++$i) {
-            $temp = $result[self::VALUE][$i] * $cache[self::DATA][$key];
-            $temp = $temp - $class::BASE_FULL * ($class::BASE === 26 ? intval($temp / 0x4000000) : ($temp >> 31));
-            $temp = $class::regularMultiply([$temp], $n);
-            $temp = array_merge(self::array_repeat(0, $i), $temp);
-            $result = $class::addHelper($result[self::VALUE], false, $temp, false);
-        }
-
-        $result[self::VALUE] = array_slice($result[self::VALUE], $k);
-
-        if (self::compareHelper($result, false, $n, false) >= 0) {
-            $result = $class::subtractHelper($result[self::VALUE], false, $n, false);
-        }
-
-        return $result[self::VALUE];
-    }
-
-    /**
-     * Modular Inverse of a number mod 2**26 (eg. 67108864)
-     *
-     * Based off of the bnpInvDigit function implemented and justified in the following URL:
-     *
-     * {@link http://www-cs-students.stanford.edu/~tjw/jsbn/jsbn.js}
-     *
-     * The following URL provides more info:
-     *
-     * {@link http://groups.google.com/group/sci.crypt/msg/7a137205c1be7d85}
-     *
-     * As for why we do all the bitmasking...  strange things can happen when converting from floats to ints. For
-     * instance, on some computers, var_dump((int) -4294967297) yields int(-1) and on others, it yields
-     * int(-2147483648).  To avoid problems stemming from this, we use bitmasks to guarantee that ints aren't
-     * auto-converted to floats.  The outermost bitmask is present because without it, there's no guarantee that
-     * the "residue" returned would be the so-called "common residue".  We use fmod, in the last step, because the
-     * maximum possible $x is 26 bits and the maximum $result is 16 bits.  Thus, we have to be able to handle up to
-     * 40 bits, which only 64-bit floating points will support.
-     *
-     * Thanks to Pedro Gimeno Fortea for input!
-     *
-     * @param array $x
-     * @param string $class
-     * @return int
-     */
-    protected static function modInverse67108864(array $x, $class) // 2**26 == 67,108,864
-    {
-        $x = -$x[0];
-        $result = $x & 0x3; // x**-1 mod 2**2
-        $result = ($result * (2 - $x * $result)) & 0xF; // x**-1 mod 2**4
-        $result = ($result * (2 - ($x & 0xFF) * $result))  & 0xFF; // x**-1 mod 2**8
-        $result = ($result * ((2 - ($x & 0xFFFF) * $result) & 0xFFFF)) & 0xFFFF; // x**-1 mod 2**16
-        $result = $class::BASE == 26 ?
-            fmod($result * (2 - fmod($x * $result, $class::BASE_FULL)), $class::BASE_FULL) : // x**-1 mod 2**26
-            ($result * (2 - ($x * $result) % $class::BASE_FULL)) % $class::BASE_FULL;
-        return $result & $class::MAX_DIGIT;
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger/Engines/PHP/Reductions/MontgomeryMult.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger/Engines/PHP/Reductions/MontgomeryMult.php
deleted file mode 100644
index 4fed3c3f..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger/Engines/PHP/Reductions/MontgomeryMult.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-
-/**
- * PHP Montgomery Modular Exponentiation Engine with interleaved multiplication
- *
- * PHP version 5 and 7
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2017 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://pear.php.net/package/Math_BigInteger
- */
-
-namespace phpseclib3\Math\BigInteger\Engines\PHP\Reductions;
-
-use phpseclib3\Math\BigInteger\Engines\PHP;
-
-/**
- * PHP Montgomery Modular Exponentiation Engine with interleaved multiplication
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class MontgomeryMult extends Montgomery
-{
-    /**
-     * Montgomery Multiply
-     *
-     * Interleaves the montgomery reduction and long multiplication algorithms together as described in
-     * {@link http://www.cacr.math.uwaterloo.ca/hac/about/chap14.pdf#page=13 HAC 14.36}
-     *
-     * @see self::_prepMontgomery()
-     * @see self::_montgomery()
-     * @param array $x
-     * @param array $y
-     * @param array $m
-     * @param class-string<PHP> $class
-     * @return array
-     */
-    public static function multiplyReduce(array $x, array $y, array $m, $class)
-    {
-        // the following code, although not callable, can be run independently of the above code
-        // although the above code performed better in my benchmarks the following could might
-        // perform better under different circumstances. in lieu of deleting it it's just been
-        // made uncallable
-
-        static $cache = [
-            self::VARIABLE => [],
-            self::DATA => []
-        ];
-
-        if (($key = array_search($m, $cache[self::VARIABLE])) === false) {
-            $key = count($cache[self::VARIABLE]);
-            $cache[self::VARIABLE][] = $m;
-            $cache[self::DATA][] = self::modInverse67108864($m, $class);
-        }
-
-        $n = max(count($x), count($y), count($m));
-        $x = array_pad($x, $n, 0);
-        $y = array_pad($y, $n, 0);
-        $m = array_pad($m, $n, 0);
-        $a = [self::VALUE => self::array_repeat(0, $n + 1)];
-        for ($i = 0; $i < $n; ++$i) {
-            $temp = $a[self::VALUE][0] + $x[$i] * $y[0];
-            $temp = $temp - $class::BASE_FULL * ($class::BASE === 26 ? intval($temp / 0x4000000) : ($temp >> 31));
-            $temp = $temp * $cache[self::DATA][$key];
-            $temp = $temp - $class::BASE_FULL * ($class::BASE === 26 ? intval($temp / 0x4000000) : ($temp >> 31));
-            $temp = $class::addHelper($class::regularMultiply([$x[$i]], $y), false, $class::regularMultiply([$temp], $m), false);
-            $a = $class::addHelper($a[self::VALUE], false, $temp[self::VALUE], false);
-            $a[self::VALUE] = array_slice($a[self::VALUE], 1);
-        }
-        if (self::compareHelper($a[self::VALUE], false, $m, false) >= 0) {
-            $a = $class::subtractHelper($a[self::VALUE], false, $m, false);
-        }
-        return $a[self::VALUE];
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger/Engines/PHP/Reductions/PowerOfTwo.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger/Engines/PHP/Reductions/PowerOfTwo.php
deleted file mode 100644
index 9da133a1..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger/Engines/PHP/Reductions/PowerOfTwo.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-
-/**
- * PHP Power of Two Modular Exponentiation Engine
- *
- * PHP version 5 and 7
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2017 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://pear.php.net/package/Math_BigInteger
- */
-
-namespace phpseclib3\Math\BigInteger\Engines\PHP\Reductions;
-
-use phpseclib3\Math\BigInteger\Engines\PHP\Base;
-
-/**
- * PHP Power Of Two Modular Exponentiation Engine
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class PowerOfTwo extends Base
-{
-    /**
-     * Prepare a number for use in Montgomery Modular Reductions
-     *
-     * @param array $x
-     * @param array $n
-     * @param string $class
-     * @return array
-     */
-    protected static function prepareReduce(array $x, array $n, $class)
-    {
-        return self::reduce($x, $n, $class);
-    }
-
-    /**
-     * Power Of Two Reduction
-     *
-     * @param array $x
-     * @param array $n
-     * @param string $class
-     * @return array
-     */
-    protected static function reduce(array $x, array $n, $class)
-    {
-        $lhs = new $class();
-        $lhs->value = $x;
-        $rhs = new $class();
-        $rhs->value = $n;
-
-        $temp = new $class();
-        $temp->value = [1];
-
-        $result = $lhs->bitwise_and($rhs->subtract($temp));
-        return $result->value;
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger/Engines/PHP32.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger/Engines/PHP32.php
deleted file mode 100644
index 3a775e7d..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger/Engines/PHP32.php
+++ /dev/null
@@ -1,371 +0,0 @@
-<?php
-
-/**
- * Pure-PHP 32-bit BigInteger Engine
- *
- * PHP version 5 and 7
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2017 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://pear.php.net/package/Math_BigInteger
- */
-
-namespace phpseclib3\Math\BigInteger\Engines;
-
-/**
- * Pure-PHP 32-bit Engine.
- *
- * Uses 64-bit floats if int size is 4 bits
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-class PHP32 extends PHP
-{
-    // Constants used by PHP.php
-    const BASE = 26;
-    const BASE_FULL = 0x4000000;
-    const MAX_DIGIT = 0x3FFFFFF;
-    const MSB = 0x2000000;
-
-    /**
-     * MAX10 in greatest MAX10LEN satisfying
-     * MAX10 = 10**MAX10LEN <= 2**BASE.
-     */
-    const MAX10 = 10000000;
-
-    /**
-     * MAX10LEN in greatest MAX10LEN satisfying
-     * MAX10 = 10**MAX10LEN <= 2**BASE.
-     */
-    const MAX10LEN = 7;
-    const MAX_DIGIT2 = 4503599627370496;
-
-    /**
-     * Initialize a PHP32 BigInteger Engine instance
-     *
-     * @param int $base
-     * @see parent::initialize()
-     */
-    protected function initialize($base)
-    {
-        if ($base != 256 && $base != -256) {
-            return parent::initialize($base);
-        }
-
-        $val = $this->value;
-        $this->value = [];
-        $vals = &$this->value;
-        $i = strlen($val);
-        if (!$i) {
-            return;
-        }
-
-        while (true) {
-            $i -= 4;
-            if ($i < 0) {
-                if ($i == -4) {
-                    break;
-                }
-                $val = substr($val, 0, 4 + $i);
-                $val = str_pad($val, 4, "\0", STR_PAD_LEFT);
-                if ($val == "\0\0\0\0") {
-                    break;
-                }
-                $i = 0;
-            }
-            list(, $digit) = unpack('N', substr($val, $i, 4));
-            if ($digit < 0) {
-                $digit += 0xFFFFFFFF + 1;
-            }
-            $step = count($vals) & 3;
-            if ($step) {
-                $digit = (int) floor($digit / pow(2, 2 * $step));
-            }
-            if ($step != 3) {
-                $digit = (int) fmod($digit, static::BASE_FULL);
-                $i++;
-            }
-            $vals[] = $digit;
-        }
-        while (end($vals) === 0) {
-            array_pop($vals);
-        }
-        reset($vals);
-    }
-
-    /**
-     * Test for engine validity
-     *
-     * @see parent::__construct()
-     * @return bool
-     */
-    public static function isValidEngine()
-    {
-        return PHP_INT_SIZE >= 4 && !self::testJITOnWindows();
-    }
-
-    /**
-     * Adds two BigIntegers.
-     *
-     * @param PHP32 $y
-     * @return PHP32
-     */
-    public function add(PHP32 $y)
-    {
-        $temp = self::addHelper($this->value, $this->is_negative, $y->value, $y->is_negative);
-
-        return $this->convertToObj($temp);
-    }
-
-    /**
-     * Subtracts two BigIntegers.
-     *
-     * @param PHP32 $y
-     * @return PHP32
-     */
-    public function subtract(PHP32 $y)
-    {
-        $temp = self::subtractHelper($this->value, $this->is_negative, $y->value, $y->is_negative);
-
-        return $this->convertToObj($temp);
-    }
-
-    /**
-     * Multiplies two BigIntegers.
-     *
-     * @param PHP32 $y
-     * @return PHP32
-     */
-    public function multiply(PHP32 $y)
-    {
-        $temp = self::multiplyHelper($this->value, $this->is_negative, $y->value, $y->is_negative);
-
-        return $this->convertToObj($temp);
-    }
-
-    /**
-     * Divides two BigIntegers.
-     *
-     * Returns an array whose first element contains the quotient and whose second element contains the
-     * "common residue".  If the remainder would be positive, the "common residue" and the remainder are the
-     * same.  If the remainder would be negative, the "common residue" is equal to the sum of the remainder
-     * and the divisor (basically, the "common residue" is the first positive modulo).
-     *
-     * @param PHP32 $y
-     * @return array{PHP32, PHP32}
-     */
-    public function divide(PHP32 $y)
-    {
-        return $this->divideHelper($y);
-    }
-
-    /**
-     * Calculates modular inverses.
-     *
-     * Say you have (30 mod 17 * x mod 17) mod 17 == 1.  x can be found using modular inverses.
-     * @param PHP32 $n
-     * @return false|PHP32
-     */
-    public function modInverse(PHP32 $n)
-    {
-        return $this->modInverseHelper($n);
-    }
-
-    /**
-     * Calculates modular inverses.
-     *
-     * Say you have (30 mod 17 * x mod 17) mod 17 == 1.  x can be found using modular inverses.
-     * @param PHP32 $n
-     * @return PHP32[]
-     */
-    public function extendedGCD(PHP32 $n)
-    {
-        return $this->extendedGCDHelper($n);
-    }
-
-    /**
-     * Calculates the greatest common divisor
-     *
-     * Say you have 693 and 609.  The GCD is 21.
-     *
-     * @param PHP32 $n
-     * @return PHP32
-     */
-    public function gcd(PHP32 $n)
-    {
-        return $this->extendedGCD($n)['gcd'];
-    }
-
-    /**
-     * Logical And
-     *
-     * @param PHP32 $x
-     * @return PHP32
-     */
-    public function bitwise_and(PHP32 $x)
-    {
-        return $this->bitwiseAndHelper($x);
-    }
-
-    /**
-     * Logical Or
-     *
-     * @param PHP32 $x
-     * @return PHP32
-     */
-    public function bitwise_or(PHP32 $x)
-    {
-        return $this->bitwiseOrHelper($x);
-    }
-
-    /**
-     * Logical Exclusive Or
-     *
-     * @param PHP32 $x
-     * @return PHP32
-     */
-    public function bitwise_xor(PHP32 $x)
-    {
-        return $this->bitwiseXorHelper($x);
-    }
-
-    /**
-     * Compares two numbers.
-     *
-     * Although one might think !$x->compare($y) means $x != $y, it, in fact, means the opposite.  The reason for this is
-     * demonstrated thusly:
-     *
-     * $x  > $y: $x->compare($y)  > 0
-     * $x  < $y: $x->compare($y)  < 0
-     * $x == $y: $x->compare($y) == 0
-     *
-     * Note how the same comparison operator is used.  If you want to test for equality, use $x->equals($y).
-     *
-     * {@internal Could return $this->subtract($x), but that's not as fast as what we do do.}
-     *
-     * @param PHP32 $y
-     * @return int in case < 0 if $this is less than $y; > 0 if $this is greater than $y, and 0 if they are equal.
-     * @see self::equals()
-     */
-    public function compare(PHP32 $y)
-    {
-        return $this->compareHelper($this->value, $this->is_negative, $y->value, $y->is_negative);
-    }
-
-    /**
-     * Tests the equality of two numbers.
-     *
-     * If you need to see if one number is greater than or less than another number, use BigInteger::compare()
-     *
-     * @param PHP32 $x
-     * @return bool
-     */
-    public function equals(PHP32 $x)
-    {
-        return $this->value === $x->value && $this->is_negative == $x->is_negative;
-    }
-
-    /**
-     * Performs modular exponentiation.
-     *
-     * @param PHP32 $e
-     * @param PHP32 $n
-     * @return PHP32
-     */
-    public function modPow(PHP32 $e, PHP32 $n)
-    {
-        return $this->powModOuter($e, $n);
-    }
-
-    /**
-     * Performs modular exponentiation.
-     *
-     * Alias for modPow().
-     *
-     * @param PHP32 $e
-     * @param PHP32 $n
-     * @return PHP32
-     */
-    public function powMod(PHP32 $e, PHP32 $n)
-    {
-        return $this->powModOuter($e, $n);
-    }
-
-    /**
-     * Generate a random prime number between a range
-     *
-     * If there's not a prime within the given range, false will be returned.
-     *
-     * @param PHP32 $min
-     * @param PHP32 $max
-     * @return false|PHP32
-     */
-    public static function randomRangePrime(PHP32 $min, PHP32 $max)
-    {
-        return self::randomRangePrimeOuter($min, $max);
-    }
-
-    /**
-     * Generate a random number between a range
-     *
-     * Returns a random number between $min and $max where $min and $max
-     * can be defined using one of the two methods:
-     *
-     * BigInteger::randomRange($min, $max)
-     * BigInteger::randomRange($max, $min)
-     *
-     * @param PHP32 $min
-     * @param PHP32 $max
-     * @return PHP32
-     */
-    public static function randomRange(PHP32 $min, PHP32 $max)
-    {
-        return self::randomRangeHelper($min, $max);
-    }
-
-    /**
-     * Performs exponentiation.
-     *
-     * @param PHP32 $n
-     * @return PHP32
-     */
-    public function pow(PHP32 $n)
-    {
-        return $this->powHelper($n);
-    }
-
-    /**
-     * Return the minimum BigInteger between an arbitrary number of BigIntegers.
-     *
-     * @param PHP32 ...$nums
-     * @return PHP32
-     */
-    public static function min(PHP32 ...$nums)
-    {
-        return self::minHelper($nums);
-    }
-
-    /**
-     * Return the maximum BigInteger between an arbitrary number of BigIntegers.
-     *
-     * @param PHP32 ...$nums
-     * @return PHP32
-     */
-    public static function max(PHP32 ...$nums)
-    {
-        return self::maxHelper($nums);
-    }
-
-    /**
-     * Tests BigInteger to see if it is between two integers, inclusive
-     *
-     * @param PHP32 $min
-     * @param PHP32 $max
-     * @return bool
-     */
-    public function between(PHP32 $min, PHP32 $max)
-    {
-        return $this->compare($min) >= 0 && $this->compare($max) <= 0;
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger/Engines/PHP64.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger/Engines/PHP64.php
deleted file mode 100644
index 70a2e173..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/BigInteger/Engines/PHP64.php
+++ /dev/null
@@ -1,372 +0,0 @@
-<?php
-
-/**
- * Pure-PHP 64-bit BigInteger Engine
- *
- * PHP version 5 and 7
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2017 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://pear.php.net/package/Math_BigInteger
- */
-
-namespace phpseclib3\Math\BigInteger\Engines;
-
-/**
- * Pure-PHP 64-bit Engine.
- *
- * Uses 64-bit integers if int size is 8 bits
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-class PHP64 extends PHP
-{
-    // Constants used by PHP.php
-    const BASE = 31;
-    const BASE_FULL = 0x80000000;
-    const MAX_DIGIT = 0x7FFFFFFF;
-    const MSB = 0x40000000;
-
-    /**
-     * MAX10 in greatest MAX10LEN satisfying
-     * MAX10 = 10**MAX10LEN <= 2**BASE.
-     */
-    const MAX10 = 1000000000;
-
-    /**
-     * MAX10LEN in greatest MAX10LEN satisfying
-     * MAX10 = 10**MAX10LEN <= 2**BASE.
-     */
-    const MAX10LEN = 9;
-    const MAX_DIGIT2 = 4611686018427387904;
-
-    /**
-     * Initialize a PHP64 BigInteger Engine instance
-     *
-     * @param int $base
-     * @see parent::initialize()
-     */
-    protected function initialize($base)
-    {
-        if ($base != 256 && $base != -256) {
-            return parent::initialize($base);
-        }
-
-        $val = $this->value;
-        $this->value = [];
-        $vals = &$this->value;
-        $i = strlen($val);
-        if (!$i) {
-            return;
-        }
-
-        while (true) {
-            $i -= 4;
-            if ($i < 0) {
-                if ($i == -4) {
-                    break;
-                }
-                $val = substr($val, 0, 4 + $i);
-                $val = str_pad($val, 4, "\0", STR_PAD_LEFT);
-                if ($val == "\0\0\0\0") {
-                    break;
-                }
-                $i = 0;
-            }
-            list(, $digit) = unpack('N', substr($val, $i, 4));
-            $step = count($vals) & 7;
-            if (!$step) {
-                $digit &= static::MAX_DIGIT;
-                $i++;
-            } else {
-                $shift = 8 - $step;
-                $digit >>= $shift;
-                $shift = 32 - $shift;
-                $digit &= (1 << $shift) - 1;
-                $temp = $i > 0 ? ord($val[$i - 1]) : 0;
-                $digit |= ($temp << $shift) & 0x7F000000;
-            }
-            $vals[] = $digit;
-        }
-        while (end($vals) === 0) {
-            array_pop($vals);
-        }
-        reset($vals);
-    }
-
-    /**
-     * Test for engine validity
-     *
-     * @see parent::__construct()
-     * @return bool
-     */
-    public static function isValidEngine()
-    {
-        return PHP_INT_SIZE >= 8 && !self::testJITOnWindows();
-    }
-
-    /**
-     * Adds two BigIntegers.
-     *
-     * @param PHP64 $y
-     * @return PHP64
-     */
-    public function add(PHP64 $y)
-    {
-        $temp = self::addHelper($this->value, $this->is_negative, $y->value, $y->is_negative);
-
-        return $this->convertToObj($temp);
-    }
-
-    /**
-     * Subtracts two BigIntegers.
-     *
-     * @param PHP64 $y
-     * @return PHP64
-     */
-    public function subtract(PHP64 $y)
-    {
-        $temp = self::subtractHelper($this->value, $this->is_negative, $y->value, $y->is_negative);
-
-        return $this->convertToObj($temp);
-    }
-
-    /**
-     * Multiplies two BigIntegers.
-     *
-     * @param PHP64 $y
-     * @return PHP64
-     */
-    public function multiply(PHP64 $y)
-    {
-        $temp = self::multiplyHelper($this->value, $this->is_negative, $y->value, $y->is_negative);
-
-        return $this->convertToObj($temp);
-    }
-
-    /**
-     * Divides two BigIntegers.
-     *
-     * Returns an array whose first element contains the quotient and whose second element contains the
-     * "common residue".  If the remainder would be positive, the "common residue" and the remainder are the
-     * same.  If the remainder would be negative, the "common residue" is equal to the sum of the remainder
-     * and the divisor (basically, the "common residue" is the first positive modulo).
-     *
-     * @param PHP64 $y
-     * @return array{PHP64, PHP64}
-     */
-    public function divide(PHP64 $y)
-    {
-        return $this->divideHelper($y);
-    }
-
-    /**
-     * Calculates modular inverses.
-     *
-     * Say you have (30 mod 17 * x mod 17) mod 17 == 1.  x can be found using modular inverses.
-     * @param PHP64 $n
-     * @return false|PHP64
-     */
-    public function modInverse(PHP64 $n)
-    {
-        return $this->modInverseHelper($n);
-    }
-
-    /**
-     * Calculates modular inverses.
-     *
-     * Say you have (30 mod 17 * x mod 17) mod 17 == 1.  x can be found using modular inverses.
-     * @param PHP64 $n
-     * @return PHP64[]
-     */
-    public function extendedGCD(PHP64 $n)
-    {
-        return $this->extendedGCDHelper($n);
-    }
-
-    /**
-     * Calculates the greatest common divisor
-     *
-     * Say you have 693 and 609.  The GCD is 21.
-     *
-     * @param PHP64 $n
-     * @return PHP64
-     */
-    public function gcd(PHP64 $n)
-    {
-        return $this->extendedGCD($n)['gcd'];
-    }
-
-    /**
-     * Logical And
-     *
-     * @param PHP64 $x
-     * @return PHP64
-     */
-    public function bitwise_and(PHP64 $x)
-    {
-        return $this->bitwiseAndHelper($x);
-    }
-
-    /**
-     * Logical Or
-     *
-     * @param PHP64 $x
-     * @return PHP64
-     */
-    public function bitwise_or(PHP64 $x)
-    {
-        return $this->bitwiseOrHelper($x);
-    }
-
-    /**
-     * Logical Exclusive Or
-     *
-     * @param PHP64 $x
-     * @return PHP64
-     */
-    public function bitwise_xor(PHP64 $x)
-    {
-        return $this->bitwiseXorHelper($x);
-    }
-
-    /**
-     * Compares two numbers.
-     *
-     * Although one might think !$x->compare($y) means $x != $y, it, in fact, means the opposite.  The reason for this is
-     * demonstrated thusly:
-     *
-     * $x  > $y: $x->compare($y)  > 0
-     * $x  < $y: $x->compare($y)  < 0
-     * $x == $y: $x->compare($y) == 0
-     *
-     * Note how the same comparison operator is used.  If you want to test for equality, use $x->equals($y).
-     *
-     * {@internal Could return $this->subtract($x), but that's not as fast as what we do do.}
-     *
-     * @param PHP64 $y
-     * @return int in case < 0 if $this is less than $y; > 0 if $this is greater than $y, and 0 if they are equal.
-     * @see self::equals()
-     */
-    public function compare(PHP64 $y)
-    {
-        return parent::compareHelper($this->value, $this->is_negative, $y->value, $y->is_negative);
-    }
-
-    /**
-     * Tests the equality of two numbers.
-     *
-     * If you need to see if one number is greater than or less than another number, use BigInteger::compare()
-     *
-     * @param PHP64 $x
-     * @return bool
-     */
-    public function equals(PHP64 $x)
-    {
-        return $this->value === $x->value && $this->is_negative == $x->is_negative;
-    }
-
-    /**
-     * Performs modular exponentiation.
-     *
-     * @param PHP64 $e
-     * @param PHP64 $n
-     * @return PHP64
-     */
-    public function modPow(PHP64 $e, PHP64 $n)
-    {
-        return $this->powModOuter($e, $n);
-    }
-
-    /**
-     * Performs modular exponentiation.
-     *
-     * Alias for modPow().
-     *
-     * @param PHP64 $e
-     * @param PHP64 $n
-     * @return PHP64|false
-     */
-    public function powMod(PHP64 $e, PHP64 $n)
-    {
-        return $this->powModOuter($e, $n);
-    }
-
-    /**
-     * Generate a random prime number between a range
-     *
-     * If there's not a prime within the given range, false will be returned.
-     *
-     * @param PHP64 $min
-     * @param PHP64 $max
-     * @return false|PHP64
-     */
-    public static function randomRangePrime(PHP64 $min, PHP64 $max)
-    {
-        return self::randomRangePrimeOuter($min, $max);
-    }
-
-    /**
-     * Generate a random number between a range
-     *
-     * Returns a random number between $min and $max where $min and $max
-     * can be defined using one of the two methods:
-     *
-     * BigInteger::randomRange($min, $max)
-     * BigInteger::randomRange($max, $min)
-     *
-     * @param PHP64 $min
-     * @param PHP64 $max
-     * @return PHP64
-     */
-    public static function randomRange(PHP64 $min, PHP64 $max)
-    {
-        return self::randomRangeHelper($min, $max);
-    }
-
-    /**
-     * Performs exponentiation.
-     *
-     * @param PHP64 $n
-     * @return PHP64
-     */
-    public function pow(PHP64 $n)
-    {
-        return $this->powHelper($n);
-    }
-
-    /**
-     * Return the minimum BigInteger between an arbitrary number of BigIntegers.
-     *
-     * @param PHP64 ...$nums
-     * @return PHP64
-     */
-    public static function min(PHP64 ...$nums)
-    {
-        return self::minHelper($nums);
-    }
-
-    /**
-     * Return the maximum BigInteger between an arbitrary number of BigIntegers.
-     *
-     * @param PHP64 ...$nums
-     * @return PHP64
-     */
-    public static function max(PHP64 ...$nums)
-    {
-        return self::maxHelper($nums);
-    }
-
-    /**
-     * Tests BigInteger to see if it is between two integers, inclusive
-     *
-     * @param PHP64 $min
-     * @param PHP64 $max
-     * @return bool
-     */
-    public function between(PHP64 $min, PHP64 $max)
-    {
-        return $this->compare($min) >= 0 && $this->compare($max) <= 0;
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/BinaryField.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/BinaryField.php
deleted file mode 100644
index 5da8c937..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/BinaryField.php
+++ /dev/null
@@ -1,203 +0,0 @@
-<?php
-
-/**
- * Binary Finite Fields
- *
- * Utilizes the factory design pattern
- *
- * PHP version 5 and 7
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2017 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- */
-
-namespace phpseclib3\Math;
-
-use phpseclib3\Common\Functions\Strings;
-use phpseclib3\Math\BinaryField\Integer;
-use phpseclib3\Math\Common\FiniteField;
-
-/**
- * Binary Finite Fields
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-class BinaryField extends FiniteField
-{
-    /**
-     * Instance Counter
-     *
-     * @var int
-     */
-    private static $instanceCounter = 0;
-
-    /**
-     * Keeps track of current instance
-     *
-     * @var int
-     */
-    protected $instanceID;
-
-    /** @var BigInteger */
-    private $randomMax;
-
-    /**
-     * Default constructor
-     */
-    public function __construct(...$indices)
-    {
-        $m = array_shift($indices);
-        if ($m > 571) {
-            /* sect571r1 and sect571k1 are the largest binary curves that https://www.secg.org/sec2-v2.pdf defines
-               altho theoretically there may be legit reasons to use binary finite fields with larger degrees
-               imposing a limit on the maximum size is both reasonable and precedented. in particular,
-               http://tools.ietf.org/html/rfc4253#section-6.1 (The Secure Shell (SSH) Transport Layer Protocol) says
-               "implementations SHOULD check that the packet length is reasonable in order for the implementation to
-                avoid denial of service and/or buffer overflow attacks" */
-            throw new \OutOfBoundsException('Degrees larger than 571 are not supported');
-        }
-        $val = str_repeat('0', $m) . '1';
-        foreach ($indices as $index) {
-            $val[$index] = '1';
-        }
-        $modulo = static::base2ToBase256(strrev($val));
-
-        $mStart = 2 * $m - 2;
-        $t = ceil($m / 8);
-        $finalMask = chr((1 << ($m % 8)) - 1);
-        if ($finalMask == "\0") {
-            $finalMask = "\xFF";
-        }
-        $bitLen = $mStart + 1;
-        $pad = ceil($bitLen / 8);
-        $h = $bitLen & 7;
-        $h = $h ? 8 - $h : 0;
-
-        $r = rtrim(substr($val, 0, -1), '0');
-        $u = [static::base2ToBase256(strrev($r))];
-        for ($i = 1; $i < 8; $i++) {
-            $u[] = static::base2ToBase256(strrev(str_repeat('0', $i) . $r));
-        }
-
-        // implements algorithm 2.40 (in section 2.3.5) in "Guide to Elliptic Curve Cryptography"
-        // with W = 8
-        $reduce = function ($c) use ($u, $mStart, $m, $t, $finalMask, $pad, $h) {
-            $c = str_pad($c, $pad, "\0", STR_PAD_LEFT);
-            for ($i = $mStart; $i >= $m;) {
-                $g = $h >> 3;
-                $mask = $h & 7;
-                $mask = $mask ? 1 << (7 - $mask) : 0x80;
-                for (; $mask > 0; $mask >>= 1, $i--, $h++) {
-                    if (ord($c[$g]) & $mask) {
-                        $temp = $i - $m;
-                        $j = $temp >> 3;
-                        $k = $temp & 7;
-                        $t1 = $j ? substr($c, 0, -$j) : $c;
-                        $length = strlen($t1);
-                        if ($length) {
-                            $t2 = str_pad($u[$k], $length, "\0", STR_PAD_LEFT);
-                            $temp = $t1 ^ $t2;
-                            $c = $j ? substr_replace($c, $temp, 0, $length) : $temp;
-                        }
-                    }
-                }
-            }
-            $c = substr($c, -$t);
-            if (strlen($c) == $t) {
-                $c[0] = $c[0] & $finalMask;
-            }
-            return ltrim($c, "\0");
-        };
-
-        $this->instanceID = self::$instanceCounter++;
-        Integer::setModulo($this->instanceID, $modulo);
-        Integer::setRecurringModuloFunction($this->instanceID, $reduce);
-
-        $this->randomMax = new BigInteger($modulo, 2);
-    }
-
-    /**
-     * Returns an instance of a dynamically generated PrimeFieldInteger class
-     *
-     * @param string $num
-     * @return Integer
-     */
-    public function newInteger($num)
-    {
-        return new Integer($this->instanceID, $num instanceof BigInteger ? $num->toBytes() : $num);
-    }
-
-    /**
-     * Returns an integer on the finite field between one and the prime modulo
-     *
-     * @return Integer
-     */
-    public function randomInteger()
-    {
-        static $one;
-        if (!isset($one)) {
-            $one = new BigInteger(1);
-        }
-
-        return new Integer($this->instanceID, BigInteger::randomRange($one, $this->randomMax)->toBytes());
-    }
-
-    /**
-     * Returns the length of the modulo in bytes
-     *
-     * @return int
-     */
-    public function getLengthInBytes()
-    {
-        return strlen(Integer::getModulo($this->instanceID));
-    }
-
-    /**
-     * Returns the length of the modulo in bits
-     *
-     * @return int
-     */
-    public function getLength()
-    {
-        return strlen(Integer::getModulo($this->instanceID)) << 3;
-    }
-
-    /**
-     * Converts a base-2 string to a base-256 string
-     *
-     * @param string $x
-     * @param int|null $size
-     * @return string
-     */
-    public static function base2ToBase256($x, $size = null)
-    {
-        $str = Strings::bits2bin($x);
-
-        $pad = strlen($x) >> 3;
-        if (strlen($x) & 3) {
-            $pad++;
-        }
-        $str = str_pad($str, $pad, "\0", STR_PAD_LEFT);
-        if (isset($size)) {
-            $str = str_pad($str, $size, "\0", STR_PAD_LEFT);
-        }
-
-        return $str;
-    }
-
-    /**
-     * Converts a base-256 string to a base-2 string
-     *
-     * @param string $x
-     * @return string
-     */
-    public static function base256ToBase2($x)
-    {
-        if (function_exists('gmp_import')) {
-            return gmp_strval(gmp_import($x), 2);
-        }
-
-        return Strings::bin2bits($x);
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/BinaryField/Integer.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/BinaryField/Integer.php
deleted file mode 100644
index 8e880589..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/BinaryField/Integer.php
+++ /dev/null
@@ -1,516 +0,0 @@
-<?php
-
-/**
- * Binary Finite Fields
- *
- * In a binary finite field numbers are actually polynomial equations. If you
- * represent the number as a sequence of bits you get a sequence of 1's or 0's.
- * These 1's or 0's represent the coefficients of the x**n, where n is the
- * location of the given bit. When you add numbers over a binary finite field
- * the result should have a coefficient of 1 or 0 as well. Hence addition
- * and subtraction become the same operation as XOR.
- * eg. 1 + 1 + 1 == 3 % 2 == 1 or 0 - 1 == -1 % 2 == 1
- *
- * PHP version 5 and 7
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2017 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- */
-
-namespace phpseclib3\Math\BinaryField;
-
-use phpseclib3\Common\Functions\Strings;
-use phpseclib3\Math\BigInteger;
-use phpseclib3\Math\BinaryField;
-use phpseclib3\Math\Common\FiniteField\Integer as Base;
-
-/**
- * Binary Finite Fields
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-class Integer extends Base
-{
-    /**
-     * Holds the BinaryField's value
-     *
-     * @var string
-     */
-    protected $value;
-
-    /**
-     * Keeps track of current instance
-     *
-     * @var int
-     */
-    protected $instanceID;
-
-    /**
-     * Holds the PrimeField's modulo
-     *
-     * @var array<int, string>
-     */
-    protected static $modulo;
-
-    /**
-     * Holds a pre-generated function to perform modulo reductions
-     *
-     * @var callable[]
-     */
-    protected static $reduce;
-
-    /**
-     * Default constructor
-     */
-    public function __construct($instanceID, $num = '')
-    {
-        $this->instanceID = $instanceID;
-        if (!strlen($num)) {
-            $this->value = '';
-        } else {
-            $reduce = static::$reduce[$instanceID];
-            $this->value = $reduce($num);
-        }
-    }
-
-    /**
-     * Set the modulo for a given instance
-     * @param int $instanceID
-     * @param string $modulo
-     */
-    public static function setModulo($instanceID, $modulo)
-    {
-        static::$modulo[$instanceID] = $modulo;
-    }
-
-    /**
-     * Set the modulo for a given instance
-     */
-    public static function setRecurringModuloFunction($instanceID, callable $function)
-    {
-        static::$reduce[$instanceID] = $function;
-    }
-
-    /**
-     * Tests a parameter to see if it's of the right instance
-     *
-     * Throws an exception if the incorrect class is being utilized
-     */
-    private static function checkInstance(self $x, self $y)
-    {
-        if ($x->instanceID != $y->instanceID) {
-            throw new \UnexpectedValueException('The instances of the two BinaryField\Integer objects do not match');
-        }
-    }
-
-    /**
-     * Tests the equality of two numbers.
-     *
-     * @return bool
-     */
-    public function equals(self $x)
-    {
-        static::checkInstance($this, $x);
-
-        return $this->value == $x->value;
-    }
-
-    /**
-     * Compares two numbers.
-     *
-     * @return int
-     */
-    public function compare(self $x)
-    {
-        static::checkInstance($this, $x);
-
-        $a = $this->value;
-        $b = $x->value;
-
-        $length = max(strlen($a), strlen($b));
-
-        $a = str_pad($a, $length, "\0", STR_PAD_LEFT);
-        $b = str_pad($b, $length, "\0", STR_PAD_LEFT);
-
-        return strcmp($a, $b);
-    }
-
-    /**
-     * Returns the degree of the polynomial
-     *
-     * @param string $x
-     * @return int
-     */
-    private static function deg($x)
-    {
-        $x = ltrim($x, "\0");
-        $xbit = decbin(ord($x[0]));
-        $xlen = $xbit == '0' ? 0 : strlen($xbit);
-        $len = strlen($x);
-        if (!$len) {
-            return -1;
-        }
-        return 8 * strlen($x) - 9 + $xlen;
-    }
-
-    /**
-     * Perform polynomial division
-     *
-     * @return string[]
-     * @link https://en.wikipedia.org/wiki/Polynomial_greatest_common_divisor#Euclidean_division
-     */
-    private static function polynomialDivide($x, $y)
-    {
-        // in wikipedia's description of the algorithm, lc() is the leading coefficient. over a binary field that's
-        // always going to be 1.
-
-        $q = chr(0);
-        $d = static::deg($y);
-        $r = $x;
-        while (($degr = static::deg($r)) >= $d) {
-            $s = '1' . str_repeat('0', $degr - $d);
-            $s = BinaryField::base2ToBase256($s);
-            $length = max(strlen($s), strlen($q));
-            $q = !isset($q) ? $s :
-                str_pad($q, $length, "\0", STR_PAD_LEFT) ^
-                str_pad($s, $length, "\0", STR_PAD_LEFT);
-            $s = static::polynomialMultiply($s, $y);
-            $length = max(strlen($r), strlen($s));
-            $r = str_pad($r, $length, "\0", STR_PAD_LEFT) ^
-                 str_pad($s, $length, "\0", STR_PAD_LEFT);
-        }
-
-        return [ltrim($q, "\0"), ltrim($r, "\0")];
-    }
-
-    /**
-     * Perform polynomial multiplation in the traditional way
-     *
-     * @return string
-     * @link https://en.wikipedia.org/wiki/Finite_field_arithmetic#Multiplication
-     */
-    private static function regularPolynomialMultiply($x, $y)
-    {
-        $precomputed = [ltrim($x, "\0")];
-        $x = strrev(BinaryField::base256ToBase2($x));
-        $y = strrev(BinaryField::base256ToBase2($y));
-        if (strlen($x) == strlen($y)) {
-            $length = strlen($x);
-        } else {
-            $length = max(strlen($x), strlen($y));
-            $x = str_pad($x, $length, '0');
-            $y = str_pad($y, $length, '0');
-        }
-        $result = str_repeat('0', 2 * $length - 1);
-        $result = BinaryField::base2ToBase256($result);
-        $size = strlen($result);
-        $x = strrev($x);
-
-        // precompute left shift 1 through 7
-        for ($i = 1; $i < 8; $i++) {
-            $precomputed[$i] = BinaryField::base2ToBase256($x . str_repeat('0', $i));
-        }
-        for ($i = 0; $i < strlen($y); $i++) {
-            if ($y[$i] == '1') {
-                $temp = $precomputed[$i & 7] . str_repeat("\0", $i >> 3);
-                $result ^= str_pad($temp, $size, "\0", STR_PAD_LEFT);
-            }
-        }
-
-        return $result;
-    }
-
-    /**
-     * Perform polynomial multiplation
-     *
-     * Uses karatsuba multiplication to reduce x-bit multiplications to a series of 32-bit multiplications
-     *
-     * @return string
-     * @link https://en.wikipedia.org/wiki/Karatsuba_algorithm
-     */
-    private static function polynomialMultiply($x, $y)
-    {
-        if (strlen($x) == strlen($y)) {
-            $length = strlen($x);
-        } else {
-            $length = max(strlen($x), strlen($y));
-            $x = str_pad($x, $length, "\0", STR_PAD_LEFT);
-            $y = str_pad($y, $length, "\0", STR_PAD_LEFT);
-        }
-
-        switch (true) {
-            case PHP_INT_SIZE == 8 && $length <= 4:
-                return $length != 4 ?
-                    self::subMultiply(str_pad($x, 4, "\0", STR_PAD_LEFT), str_pad($y, 4, "\0", STR_PAD_LEFT)) :
-                    self::subMultiply($x, $y);
-            case PHP_INT_SIZE == 4 || $length > 32:
-                return self::regularPolynomialMultiply($x, $y);
-        }
-
-        $m = $length >> 1;
-
-        $x1 = substr($x, 0, -$m);
-        $x0 = substr($x, -$m);
-        $y1 = substr($y, 0, -$m);
-        $y0 = substr($y, -$m);
-
-        $z2 = self::polynomialMultiply($x1, $y1);
-        $z0 = self::polynomialMultiply($x0, $y0);
-        $z1 = self::polynomialMultiply(
-            self::subAdd2($x1, $x0),
-            self::subAdd2($y1, $y0)
-        );
-
-        $z1 = self::subAdd3($z1, $z2, $z0);
-
-        $xy = self::subAdd3(
-            $z2 . str_repeat("\0", 2 * $m),
-            $z1 . str_repeat("\0", $m),
-            $z0
-        );
-
-        return ltrim($xy, "\0");
-    }
-
-    /**
-     * Perform polynomial multiplication on 2x 32-bit numbers, returning
-     * a 64-bit number
-     *
-     * @param string $x
-     * @param string $y
-     * @return string
-     * @link https://www.bearssl.org/constanttime.html#ghash-for-gcm
-     */
-    private static function subMultiply($x, $y)
-    {
-        $x = unpack('N', $x)[1];
-        $y = unpack('N', $y)[1];
-
-        $x0 = $x & 0x11111111;
-        $x1 = $x & 0x22222222;
-        $x2 = $x & 0x44444444;
-        $x3 = $x & 0x88888888;
-
-        $y0 = $y & 0x11111111;
-        $y1 = $y & 0x22222222;
-        $y2 = $y & 0x44444444;
-        $y3 = $y & 0x88888888;
-
-        $z0 = ($x0 * $y0) ^ ($x1 * $y3) ^ ($x2 * $y2) ^ ($x3 * $y1);
-        $z1 = ($x0 * $y1) ^ ($x1 * $y0) ^ ($x2 * $y3) ^ ($x3 * $y2);
-        $z2 = ($x0 * $y2) ^ ($x1 * $y1) ^ ($x2 * $y0) ^ ($x3 * $y3);
-        $z3 = ($x0 * $y3) ^ ($x1 * $y2) ^ ($x2 * $y1) ^ ($x3 * $y0);
-
-        $z0 &= 0x1111111111111111;
-        $z1 &= 0x2222222222222222;
-        $z2 &= 0x4444444444444444;
-        $z3 &= -8608480567731124088; // 0x8888888888888888 gets interpreted as a float
-
-        $z = $z0 | $z1 | $z2 | $z3;
-
-        return pack('J', $z);
-    }
-
-    /**
-     * Adds two numbers
-     *
-     * @param string $x
-     * @param string $y
-     * @return string
-     */
-    private static function subAdd2($x, $y)
-    {
-        $length = max(strlen($x), strlen($y));
-        $x = str_pad($x, $length, "\0", STR_PAD_LEFT);
-        $y = str_pad($y, $length, "\0", STR_PAD_LEFT);
-        return $x ^ $y;
-    }
-
-    /**
-     * Adds three numbers
-     *
-     * @param string $x
-     * @param string $y
-     * @return string
-     */
-    private static function subAdd3($x, $y, $z)
-    {
-        $length = max(strlen($x), strlen($y), strlen($z));
-        $x = str_pad($x, $length, "\0", STR_PAD_LEFT);
-        $y = str_pad($y, $length, "\0", STR_PAD_LEFT);
-        $z = str_pad($z, $length, "\0", STR_PAD_LEFT);
-        return $x ^ $y ^ $z;
-    }
-
-    /**
-     * Adds two BinaryFieldIntegers.
-     *
-     * @return static
-     */
-    public function add(self $y)
-    {
-        static::checkInstance($this, $y);
-
-        $length = strlen(static::$modulo[$this->instanceID]);
-
-        $x = str_pad($this->value, $length, "\0", STR_PAD_LEFT);
-        $y = str_pad($y->value, $length, "\0", STR_PAD_LEFT);
-
-        return new static($this->instanceID, $x ^ $y);
-    }
-
-    /**
-     * Subtracts two BinaryFieldIntegers.
-     *
-     * @return static
-     */
-    public function subtract(self $x)
-    {
-        return $this->add($x);
-    }
-
-    /**
-     * Multiplies two BinaryFieldIntegers.
-     *
-     * @return static
-     */
-    public function multiply(self $y)
-    {
-        static::checkInstance($this, $y);
-
-        return new static($this->instanceID, static::polynomialMultiply($this->value, $y->value));
-    }
-
-    /**
-     * Returns the modular inverse of a BinaryFieldInteger
-     *
-     * @return static
-     */
-    public function modInverse()
-    {
-        $remainder0 = static::$modulo[$this->instanceID];
-        $remainder1 = $this->value;
-
-        if ($remainder1 == '') {
-            return new static($this->instanceID);
-        }
-
-        $aux0 = "\0";
-        $aux1 = "\1";
-        while ($remainder1 != "\1") {
-            list($q, $r) = static::polynomialDivide($remainder0, $remainder1);
-            $remainder0 = $remainder1;
-            $remainder1 = $r;
-            // the auxiliary in row n is given by the sum of the auxiliary in
-            // row n-2 and the product of the quotient and the auxiliary in row
-            // n-1
-            $temp = static::polynomialMultiply($aux1, $q);
-            $aux = str_pad($aux0, strlen($temp), "\0", STR_PAD_LEFT) ^
-                   str_pad($temp, strlen($aux0), "\0", STR_PAD_LEFT);
-            $aux0 = $aux1;
-            $aux1 = $aux;
-        }
-
-        $temp = new static($this->instanceID);
-        $temp->value = ltrim($aux1, "\0");
-        return $temp;
-    }
-
-    /**
-     * Divides two PrimeFieldIntegers.
-     *
-     * @return static
-     */
-    public function divide(self $x)
-    {
-        static::checkInstance($this, $x);
-
-        $x = $x->modInverse();
-        return $this->multiply($x);
-    }
-
-    /**
-     * Negate
-     *
-     * A negative number can be written as 0-12. With modulos, 0 is the same thing as the modulo
-     * so 0-12 is the same thing as modulo-12
-     *
-     * @return object
-     */
-    public function negate()
-    {
-        $x = str_pad($this->value, strlen(static::$modulo[$this->instanceID]), "\0", STR_PAD_LEFT);
-
-        return new static($this->instanceID, $x ^ static::$modulo[$this->instanceID]);
-    }
-
-    /**
-     * Returns the modulo
-     *
-     * @return string
-     */
-    public static function getModulo($instanceID)
-    {
-        return static::$modulo[$instanceID];
-    }
-
-    /**
-     * Converts an Integer to a byte string (eg. base-256).
-     *
-     * @return string
-     */
-    public function toBytes()
-    {
-        return str_pad($this->value, strlen(static::$modulo[$this->instanceID]), "\0", STR_PAD_LEFT);
-    }
-
-    /**
-     * Converts an Integer to a hex string (eg. base-16).
-     *
-     * @return string
-     */
-    public function toHex()
-    {
-        return Strings::bin2hex($this->toBytes());
-    }
-
-    /**
-     * Converts an Integer to a bit string (eg. base-2).
-     *
-     * @return string
-     */
-    public function toBits()
-    {
-        //return str_pad(BinaryField::base256ToBase2($this->value), strlen(static::$modulo[$this->instanceID]), '0', STR_PAD_LEFT);
-        return BinaryField::base256ToBase2($this->value);
-    }
-
-    /**
-     * Converts an Integer to a BigInteger
-     *
-     * @return string
-     */
-    public function toBigInteger()
-    {
-        return new BigInteger($this->value, 256);
-    }
-
-    /**
-     *  __toString() magic method
-     *
-     */
-    public function __toString()
-    {
-        return (string) $this->toBigInteger();
-    }
-
-    /**
-     *  __debugInfo() magic method
-     *
-     */
-    public function __debugInfo()
-    {
-        return ['value' => $this->toHex()];
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/Common/FiniteField.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/Common/FiniteField.php
deleted file mode 100644
index 2ea5f485..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/Common/FiniteField.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-
-/**
- * Finite Fields Base Class
- *
- * PHP version 5 and 7
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2017 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- */
-
-namespace phpseclib3\Math\Common;
-
-/**
- * Finite Fields
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class FiniteField
-{
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/Common/FiniteField/Integer.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/Common/FiniteField/Integer.php
deleted file mode 100644
index 3c959e94..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/Common/FiniteField/Integer.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-/**
- * Finite Field Integer Base Class
- *
- * PHP version 5 and 7
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2017 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- */
-
-namespace phpseclib3\Math\Common\FiniteField;
-
-/**
- * Finite Field Integer
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-abstract class Integer implements \JsonSerializable
-{
-    /**
-     * JSON Serialize
-     *
-     * Will be called, automatically, when json_encode() is called on a BigInteger object.
-     *
-     * PHP Serialize isn't supported because unserializing would require the factory be
-     * serialized as well and that just sounds like too much
-     *
-     * @return array{hex: string}
-     */
-    #[\ReturnTypeWillChange]
-    public function jsonSerialize()
-    {
-        return ['hex' => $this->toHex(true)];
-    }
-
-    /**
-     * Converts an Integer to a hex string (eg. base-16).
-     *
-     * @return string
-     */
-    abstract public function toHex();
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/PrimeField.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/PrimeField.php
deleted file mode 100644
index 1a0667f0..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/PrimeField.php
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-
-/**
- * Prime Finite Fields
- *
- * Utilizes the factory design pattern
- *
- * PHP version 5 and 7
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2017 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://pear.php.net/package/Math_BigInteger
- */
-
-namespace phpseclib3\Math;
-
-use phpseclib3\Math\Common\FiniteField;
-use phpseclib3\Math\PrimeField\Integer;
-
-/**
- * Prime Finite Fields
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-class PrimeField extends FiniteField
-{
-    /**
-     * Instance Counter
-     *
-     * @var int
-     */
-    private static $instanceCounter = 0;
-
-    /**
-     * Keeps track of current instance
-     *
-     * @var int
-     */
-    protected $instanceID;
-
-    /**
-     * Default constructor
-     */
-    public function __construct(BigInteger $modulo)
-    {
-        if (!$modulo->isPrime()) {
-            throw new \UnexpectedValueException('PrimeField requires a prime number be passed to the constructor');
-        }
-
-        $this->instanceID = self::$instanceCounter++;
-        Integer::setModulo($this->instanceID, $modulo);
-        Integer::setRecurringModuloFunction($this->instanceID, $modulo->createRecurringModuloFunction());
-    }
-
-    /**
-     * Use a custom defined modular reduction function
-     *
-     * @return void
-     */
-    public function setReduction(\Closure $func)
-    {
-        $this->reduce = $func->bindTo($this, $this);
-    }
-
-    /**
-     * Returns an instance of a dynamically generated PrimeFieldInteger class
-     *
-     * @return Integer
-     */
-    public function newInteger(BigInteger $num)
-    {
-        return new Integer($this->instanceID, $num);
-    }
-
-    /**
-     * Returns an integer on the finite field between one and the prime modulo
-     *
-     * @return Integer
-     */
-    public function randomInteger()
-    {
-        static $one;
-        if (!isset($one)) {
-            $one = new BigInteger(1);
-        }
-
-        return new Integer($this->instanceID, BigInteger::randomRange($one, Integer::getModulo($this->instanceID)));
-    }
-
-    /**
-     * Returns the length of the modulo in bytes
-     *
-     * @return int
-     */
-    public function getLengthInBytes()
-    {
-        return Integer::getModulo($this->instanceID)->getLengthInBytes();
-    }
-
-    /**
-     * Returns the length of the modulo in bits
-     *
-     * @return int
-     */
-    public function getLength()
-    {
-        return Integer::getModulo($this->instanceID)->getLength();
-    }
-
-    /**
-     *  Destructor
-     */
-    public function __destruct()
-    {
-        Integer::cleanupCache($this->instanceID);
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/PrimeField/Integer.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/PrimeField/Integer.php
deleted file mode 100644
index 1bd7aaf0..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Math/PrimeField/Integer.php
+++ /dev/null
@@ -1,419 +0,0 @@
-<?php
-
-/**
- * Prime Finite Fields
- *
- * PHP version 5 and 7
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2017 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- */
-
-namespace phpseclib3\Math\PrimeField;
-
-use phpseclib3\Common\Functions\Strings;
-use phpseclib3\Math\BigInteger;
-use phpseclib3\Math\Common\FiniteField\Integer as Base;
-
-/**
- * Prime Finite Fields
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-class Integer extends Base
-{
-    /**
-     * Holds the PrimeField's value
-     *
-     * @var BigInteger
-     */
-    protected $value;
-
-    /**
-     * Keeps track of current instance
-     *
-     * @var int
-     */
-    protected $instanceID;
-
-    /**
-     * Holds the PrimeField's modulo
-     *
-     * @var array<int, BigInteger>
-     */
-    protected static $modulo;
-
-    /**
-     * Holds a pre-generated function to perform modulo reductions
-     *
-     * @var array<int, callable(BigInteger):BigInteger>
-     */
-    protected static $reduce;
-
-    /**
-     * Zero
-     *
-     * @var BigInteger
-     */
-    protected static $zero;
-
-    /**
-     * Default constructor
-     *
-     * @param int $instanceID
-     */
-    public function __construct($instanceID, BigInteger $num = null)
-    {
-        $this->instanceID = $instanceID;
-        if (!isset($num)) {
-            $this->value = clone static::$zero[static::class];
-        } else {
-            $reduce = static::$reduce[$instanceID];
-            $this->value = $reduce($num);
-        }
-    }
-
-    /**
-     * Set the modulo for a given instance
-     *
-     * @param int $instanceID
-     * @return void
-     */
-    public static function setModulo($instanceID, BigInteger $modulo)
-    {
-        static::$modulo[$instanceID] = $modulo;
-    }
-
-    /**
-     * Set the modulo for a given instance
-     *
-     * @param int $instanceID
-     * @return void
-     */
-    public static function setRecurringModuloFunction($instanceID, callable $function)
-    {
-        static::$reduce[$instanceID] = $function;
-        if (!isset(static::$zero[static::class])) {
-            static::$zero[static::class] = new BigInteger();
-        }
-    }
-
-    /**
-     * Delete the modulo for a given instance
-     */
-    public static function cleanupCache($instanceID)
-    {
-        unset(static::$modulo[$instanceID]);
-        unset(static::$reduce[$instanceID]);
-    }
-
-    /**
-     * Returns the modulo
-     *
-     * @param int $instanceID
-     * @return BigInteger
-     */
-    public static function getModulo($instanceID)
-    {
-        return static::$modulo[$instanceID];
-    }
-
-    /**
-     * Tests a parameter to see if it's of the right instance
-     *
-     * Throws an exception if the incorrect class is being utilized
-     *
-     * @return void
-     */
-    public static function checkInstance(self $x, self $y)
-    {
-        if ($x->instanceID != $y->instanceID) {
-            throw new \UnexpectedValueException('The instances of the two PrimeField\Integer objects do not match');
-        }
-    }
-
-    /**
-     * Tests the equality of two numbers.
-     *
-     * @return bool
-     */
-    public function equals(self $x)
-    {
-        static::checkInstance($this, $x);
-
-        return $this->value->equals($x->value);
-    }
-
-    /**
-     * Compares two numbers.
-     *
-     * @return int
-     */
-    public function compare(self $x)
-    {
-        static::checkInstance($this, $x);
-
-        return $this->value->compare($x->value);
-    }
-
-    /**
-     * Adds two PrimeFieldIntegers.
-     *
-     * @return static
-     */
-    public function add(self $x)
-    {
-        static::checkInstance($this, $x);
-
-        $temp = new static($this->instanceID);
-        $temp->value = $this->value->add($x->value);
-        if ($temp->value->compare(static::$modulo[$this->instanceID]) >= 0) {
-            $temp->value = $temp->value->subtract(static::$modulo[$this->instanceID]);
-        }
-
-        return $temp;
-    }
-
-    /**
-     * Subtracts two PrimeFieldIntegers.
-     *
-     * @return static
-     */
-    public function subtract(self $x)
-    {
-        static::checkInstance($this, $x);
-
-        $temp = new static($this->instanceID);
-        $temp->value = $this->value->subtract($x->value);
-        if ($temp->value->isNegative()) {
-            $temp->value = $temp->value->add(static::$modulo[$this->instanceID]);
-        }
-
-        return $temp;
-    }
-
-    /**
-     * Multiplies two PrimeFieldIntegers.
-     *
-     * @return static
-     */
-    public function multiply(self $x)
-    {
-        static::checkInstance($this, $x);
-
-        return new static($this->instanceID, $this->value->multiply($x->value));
-    }
-
-    /**
-     * Divides two PrimeFieldIntegers.
-     *
-     * @return static
-     */
-    public function divide(self $x)
-    {
-        static::checkInstance($this, $x);
-
-        $denominator = $x->value->modInverse(static::$modulo[$this->instanceID]);
-        return new static($this->instanceID, $this->value->multiply($denominator));
-    }
-
-    /**
-     * Performs power operation on a PrimeFieldInteger.
-     *
-     * @return static
-     */
-    public function pow(BigInteger $x)
-    {
-        $temp = new static($this->instanceID);
-        $temp->value = $this->value->powMod($x, static::$modulo[$this->instanceID]);
-
-        return $temp;
-    }
-
-    /**
-     * Calculates the square root
-     *
-     * @link https://en.wikipedia.org/wiki/Tonelli%E2%80%93Shanks_algorithm
-     * @return static|false
-     */
-    public function squareRoot()
-    {
-        static $one, $two;
-        if (!isset($one)) {
-            $one = new BigInteger(1);
-            $two = new BigInteger(2);
-        }
-        $reduce = static::$reduce[$this->instanceID];
-        $p_1 = static::$modulo[$this->instanceID]->subtract($one);
-        $q = clone $p_1;
-        $s = BigInteger::scan1divide($q);
-        list($pow) = $p_1->divide($two);
-        for ($z = $one; !$z->equals(static::$modulo[$this->instanceID]); $z = $z->add($one)) {
-            $temp = $z->powMod($pow, static::$modulo[$this->instanceID]);
-            if ($temp->equals($p_1)) {
-                break;
-            }
-        }
-
-        $m = new BigInteger($s);
-        $c = $z->powMod($q, static::$modulo[$this->instanceID]);
-        $t = $this->value->powMod($q, static::$modulo[$this->instanceID]);
-        list($temp) = $q->add($one)->divide($two);
-        $r = $this->value->powMod($temp, static::$modulo[$this->instanceID]);
-
-        while (!$t->equals($one)) {
-            for ($i = clone $one; $i->compare($m) < 0; $i = $i->add($one)) {
-                if ($t->powMod($two->pow($i), static::$modulo[$this->instanceID])->equals($one)) {
-                    break;
-                }
-            }
-
-            if ($i->compare($m) == 0) {
-                return false;
-            }
-            $b = $c->powMod($two->pow($m->subtract($i)->subtract($one)), static::$modulo[$this->instanceID]);
-            $m = $i;
-            $c = $reduce($b->multiply($b));
-            $t = $reduce($t->multiply($c));
-            $r = $reduce($r->multiply($b));
-        }
-
-        return new static($this->instanceID, $r);
-    }
-
-    /**
-     * Is Odd?
-     *
-     * @return bool
-     */
-    public function isOdd()
-    {
-        return $this->value->isOdd();
-    }
-
-    /**
-     * Negate
-     *
-     * A negative number can be written as 0-12. With modulos, 0 is the same thing as the modulo
-     * so 0-12 is the same thing as modulo-12
-     *
-     * @return static
-     */
-    public function negate()
-    {
-        return new static($this->instanceID, static::$modulo[$this->instanceID]->subtract($this->value));
-    }
-
-    /**
-     * Converts an Integer to a byte string (eg. base-256).
-     *
-     * @return string
-     */
-    public function toBytes()
-    {
-        if (isset(static::$modulo[$this->instanceID])) {
-            $length = static::$modulo[$this->instanceID]->getLengthInBytes();
-            return str_pad($this->value->toBytes(), $length, "\0", STR_PAD_LEFT);
-        }
-        return $this->value->toBytes();
-    }
-
-    /**
-     * Converts an Integer to a hex string (eg. base-16).
-     *
-     * @return string
-     */
-    public function toHex()
-    {
-        return Strings::bin2hex($this->toBytes());
-    }
-
-    /**
-     * Converts an Integer to a bit string (eg. base-2).
-     *
-     * @return string
-     */
-    public function toBits()
-    {
-        // return $this->value->toBits();
-        static $length;
-        if (!isset($length)) {
-            $length = static::$modulo[$this->instanceID]->getLength();
-        }
-
-        return str_pad($this->value->toBits(), $length, '0', STR_PAD_LEFT);
-    }
-
-    /**
-     * Returns the w-ary non-adjacent form (wNAF)
-     *
-     * @param int $w optional
-     * @return array<int, int>
-     */
-    public function getNAF($w = 1)
-    {
-        $w++;
-
-        $mask = new BigInteger((1 << $w) - 1);
-        $sub = new BigInteger(1 << $w);
-        //$sub = new BigInteger(1 << ($w - 1));
-        $d = $this->toBigInteger();
-        $d_i = [];
-
-        $i = 0;
-        while ($d->compare(static::$zero[static::class]) > 0) {
-            if ($d->isOdd()) {
-                // start mods
-
-                $bigInteger = $d->testBit($w - 1) ?
-                    $d->bitwise_and($mask)->subtract($sub) :
-                    //$sub->subtract($d->bitwise_and($mask)) :
-                    $d->bitwise_and($mask);
-                // end mods
-                $d = $d->subtract($bigInteger);
-                $d_i[$i] = (int) $bigInteger->toString();
-            } else {
-                $d_i[$i] = 0;
-            }
-            $shift = !$d->equals(static::$zero[static::class]) && $d->bitwise_and($mask)->equals(static::$zero[static::class]) ? $w : 1; // $w or $w + 1?
-            $d = $d->bitwise_rightShift($shift);
-            while (--$shift > 0) {
-                $d_i[++$i] = 0;
-            }
-            $i++;
-        }
-
-        return $d_i;
-    }
-
-    /**
-     * Converts an Integer to a BigInteger
-     *
-     * @return BigInteger
-     */
-    public function toBigInteger()
-    {
-        return clone $this->value;
-    }
-
-    /**
-     *  __toString() magic method
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return (string) $this->value;
-    }
-
-    /**
-     *  __debugInfo() magic method
-     *
-     * @return array
-     */
-    public function __debugInfo()
-    {
-        return ['value' => $this->toHex()];
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Net/SCP.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Net/SCP.php
new file mode 100644
index 00000000..8784b543
--- /dev/null
+++ b/securemail/vendor/phpseclib/phpseclib/phpseclib/Net/SCP.php
@@ -0,0 +1,334 @@
+<?php
+
+/**
+ * Pure-PHP implementation of SCP.
+ *
+ * PHP version 5
+ *
+ * The API for this library is modeled after the API from PHP's {@link http://php.net/book.ftp FTP extension}.
+ *
+ * Here's a short example of how to use this library:
+ * <code>
+ * <?php
+ *    include 'vendor/autoload.php';
+ *
+ *    $ssh = new \phpseclib\Net\SSH2('www.domain.tld');
+ *    if (!$ssh->login('username', 'password')) {
+ *        exit('bad login');
+ *    }
+ *    $scp = new \phpseclib\Net\SCP($ssh);
+ *
+ *    $scp->put('abcd', str_repeat('x', 1024*1024));
+ * ?>
+ * </code>
+ *
+ * @category  Net
+ * @package   SCP
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2010 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+namespace phpseclib\Net;
+
+/**
+ * Pure-PHP implementations of SCP.
+ *
+ * @package SCP
+ * @author  Jim Wigginton <terrafrost@php.net>
+ * @access  public
+ */
+class SCP
+{
+    /**#@+
+     * @access public
+     * @see \phpseclib\Net\SCP::put()
+     */
+    /**
+     * Reads data from a local file.
+     */
+    const SOURCE_LOCAL_FILE = 1;
+    /**
+     * Reads data from a string.
+     */
+    const SOURCE_STRING = 2;
+    /**#@-*/
+
+    /**#@+
+     * @access private
+     * @see \phpseclib\Net\SCP::_send()
+     * @see \phpseclib\Net\SCP::_receive()
+    */
+    /**
+     * SSH1 is being used.
+     */
+    const MODE_SSH1 = 1;
+    /**
+     * SSH2 is being used.
+     */
+    const MODE_SSH2 =  2;
+    /**#@-*/
+
+    /**
+     * SSH Object
+     *
+     * @var object
+     * @access private
+     */
+    var $ssh;
+
+    /**
+     * Packet Size
+     *
+     * @var int
+     * @access private
+     */
+    var $packet_size;
+
+    /**
+     * Mode
+     *
+     * @var int
+     * @access private
+     */
+    var $mode;
+
+    /**
+     * Default Constructor.
+     *
+     * Connects to an SSH server
+     *
+     * @param \phpseclib\Net\SSH1|\phpseclin\Net\SSH2 $ssh
+     * @return \phpseclib\Net\SCP
+     * @access public
+     */
+    function __construct($ssh)
+    {
+        if ($ssh instanceof SSH2) {
+            $this->mode = self::MODE_SSH2;
+        } elseif ($ssh instanceof SSH1) {
+            $this->packet_size = 50000;
+            $this->mode = self::MODE_SSH1;
+        } else {
+            return;
+        }
+
+        $this->ssh = $ssh;
+    }
+
+    /**
+     * Uploads a file to the SCP server.
+     *
+     * By default, \phpseclib\Net\SCP::put() does not read from the local filesystem.  $data is dumped directly into $remote_file.
+     * So, for example, if you set $data to 'filename.ext' and then do \phpseclib\Net\SCP::get(), you will get a file, twelve bytes
+     * long, containing 'filename.ext' as its contents.
+     *
+     * Setting $mode to self::SOURCE_LOCAL_FILE will change the above behavior.  With self::SOURCE_LOCAL_FILE, $remote_file will
+     * contain as many bytes as filename.ext does on your local filesystem.  If your filename.ext is 1MB then that is how
+     * large $remote_file will be, as well.
+     *
+     * Currently, only binary mode is supported.  As such, if the line endings need to be adjusted, you will need to take
+     * care of that, yourself.
+     *
+     * @param string $remote_file
+     * @param string $data
+     * @param int $mode
+     * @param callable $callback
+     * @return bool
+     * @access public
+     */
+    function put($remote_file, $data, $mode = self::SOURCE_STRING, $callback = null)
+    {
+        if (!isset($this->ssh)) {
+            return false;
+        }
+
+        if (!$this->ssh->exec('scp -t ' . escapeshellarg($remote_file), false)) { // -t = to
+            return false;
+        }
+
+        $temp = $this->_receive();
+        if ($temp !== chr(0)) {
+            return false;
+        }
+
+        if ($this->mode == self::MODE_SSH2) {
+            $this->packet_size = $this->ssh->packet_size_client_to_server[SSH2::CHANNEL_EXEC] - 4;
+        }
+
+        $remote_file = basename($remote_file);
+
+        if ($mode == self::SOURCE_STRING) {
+            $size = strlen($data);
+        } else {
+            if (!is_file($data)) {
+                user_error("$data is not a valid file", E_USER_NOTICE);
+                return false;
+            }
+
+            $fp = @fopen($data, 'rb');
+            if (!$fp) {
+                return false;
+            }
+            $size = filesize($data);
+        }
+
+        $this->_send('C0644 ' . $size . ' ' . $remote_file . "\n");
+
+        $temp = $this->_receive();
+        if ($temp !== chr(0)) {
+            return false;
+        }
+
+        $sent = 0;
+        while ($sent < $size) {
+            $temp = $mode & self::SOURCE_STRING ? substr($data, $sent, $this->packet_size) : fread($fp, $this->packet_size);
+            $this->_send($temp);
+            $sent+= strlen($temp);
+
+            if (is_callable($callback)) {
+                call_user_func($callback, $sent);
+            }
+        }
+        $this->_close();
+
+        if ($mode != self::SOURCE_STRING) {
+            fclose($fp);
+        }
+
+        return true;
+    }
+
+    /**
+     * Downloads a file from the SCP server.
+     *
+     * Returns a string containing the contents of $remote_file if $local_file is left undefined or a boolean false if
+     * the operation was unsuccessful.  If $local_file is defined, returns true or false depending on the success of the
+     * operation
+     *
+     * @param string $remote_file
+     * @param string $local_file
+     * @return mixed
+     * @access public
+     */
+    function get($remote_file, $local_file = false)
+    {
+        if (!isset($this->ssh)) {
+            return false;
+        }
+
+        if (!$this->ssh->exec('scp -f ' . escapeshellarg($remote_file), false)) { // -f = from
+            return false;
+        }
+
+        $this->_send("\0");
+
+        if (!preg_match('#(?<perms>[^ ]+) (?<size>\d+) (?<name>.+)#', rtrim($this->_receive()), $info)) {
+            return false;
+        }
+
+        $this->_send("\0");
+
+        $size = 0;
+
+        if ($local_file !== false) {
+            $fp = @fopen($local_file, 'wb');
+            if (!$fp) {
+                return false;
+            }
+        }
+
+        $content = '';
+        while ($size < $info['size']) {
+            $data = $this->_receive();
+            // SCP usually seems to split stuff out into 16k chunks
+            $size+= strlen($data);
+
+            if ($local_file === false) {
+                $content.= $data;
+            } else {
+                fputs($fp, $data);
+            }
+        }
+
+        $this->_close();
+
+        if ($local_file !== false) {
+            fclose($fp);
+            return true;
+        }
+
+        return $content;
+    }
+
+    /**
+     * Sends a packet to an SSH server
+     *
+     * @param string $data
+     * @access private
+     */
+    function _send($data)
+    {
+        switch ($this->mode) {
+            case self::MODE_SSH2:
+                $this->ssh->_send_channel_packet(SSH2::CHANNEL_EXEC, $data);
+                break;
+            case self::MODE_SSH1:
+                $data = pack('CNa*', NET_SSH1_CMSG_STDIN_DATA, strlen($data), $data);
+                $this->ssh->_send_binary_packet($data);
+        }
+    }
+
+    /**
+     * Receives a packet from an SSH server
+     *
+     * @return string
+     * @access private
+     */
+    function _receive()
+    {
+        switch ($this->mode) {
+            case self::MODE_SSH2:
+                return $this->ssh->_get_channel_packet(SSH2::CHANNEL_EXEC, true);
+            case self::MODE_SSH1:
+                if (!$this->ssh->bitmap) {
+                    return false;
+                }
+                while (true) {
+                    $response = $this->ssh->_get_binary_packet();
+                    switch ($response[SSH1::RESPONSE_TYPE]) {
+                        case NET_SSH1_SMSG_STDOUT_DATA:
+                            extract(unpack('Nlength', $response[SSH1::RESPONSE_DATA]));
+                            return $this->ssh->_string_shift($response[SSH1::RESPONSE_DATA], $length);
+                        case NET_SSH1_SMSG_STDERR_DATA:
+                            break;
+                        case NET_SSH1_SMSG_EXITSTATUS:
+                            $this->ssh->_send_binary_packet(chr(NET_SSH1_CMSG_EXIT_CONFIRMATION));
+                            fclose($this->ssh->fsock);
+                            $this->ssh->bitmap = 0;
+                            return false;
+                        default:
+                            user_error('Unknown packet received', E_USER_NOTICE);
+                            return false;
+                    }
+                }
+        }
+    }
+
+    /**
+     * Closes the connection to an SSH server
+     *
+     * @access private
+     */
+    function _close()
+    {
+        switch ($this->mode) {
+            case self::MODE_SSH2:
+                $this->ssh->_close_channel(SSH2::CHANNEL_EXEC, true);
+                break;
+            case self::MODE_SSH1:
+                $this->ssh->disconnect();
+        }
+    }
+}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Net/SFTP.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Net/SFTP.php
index 144ef795..053ad3b7 100644
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Net/SFTP.php
+++ b/securemail/vendor/phpseclib/phpseclib/phpseclib/Net/SFTP.php
@@ -5,7 +5,9 @@
  *
  * PHP version 5
  *
- * Supports SFTPv2/3/4/5/6. Defaults to v3.
+ * Currently only supports SFTPv2 and v3, which, according to wikipedia.org, "is the most widely used version,
+ * implemented by the popular OpenSSH SFTP server".  If you want SFTPv4/5/6 support, provide me with access
+ * to an SFTPv4/5/6 server.
  *
  * The API for this library is modeled after the API from PHP's {@link http://php.net/book.ftp FTP extension}.
  *
@@ -14,7 +16,7 @@
  * <?php
  *    include 'vendor/autoload.php';
  *
- *    $sftp = new \phpseclib3\Net\SFTP('www.domain.tld');
+ *    $sftp = new \phpseclib\Net\SFTP('www.domain.tld');
  *    if (!$sftp->login('username', 'password')) {
  *        exit('Login Failed');
  *    }
@@ -25,66 +27,63 @@
  * ?>
  * </code>
  *
+ * @category  Net
+ * @package   SFTP
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2009 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
  * @link      http://phpseclib.sourceforge.net
  */
 
-namespace phpseclib3\Net;
-
-use phpseclib3\Common\Functions\Strings;
-use phpseclib3\Exception\FileNotFoundException;
+namespace phpseclib\Net;
 
 /**
  * Pure-PHP implementations of SFTP.
  *
+ * @package SFTP
  * @author  Jim Wigginton <terrafrost@php.net>
+ * @access  public
  */
 class SFTP extends SSH2
 {
     /**
      * SFTP channel constant
      *
-     * \phpseclib3\Net\SSH2::exec() uses 0 and \phpseclib3\Net\SSH2::read() / \phpseclib3\Net\SSH2::write() use 1.
+     * \phpseclib\Net\SSH2::exec() uses 0 and \phpseclib\Net\SSH2::read() / \phpseclib\Net\SSH2::write() use 1.
      *
-     * @see \phpseclib3\Net\SSH2::send_channel_packet()
-     * @see \phpseclib3\Net\SSH2::get_channel_packet()
+     * @see \phpseclib\Net\SSH2::_send_channel_packet()
+     * @see \phpseclib\Net\SSH2::_get_channel_packet()
+     * @access private
      */
     const CHANNEL = 0x100;
 
+    /**#@+
+     * @access public
+     * @see \phpseclib\Net\SFTP::put()
+    */
     /**
      * Reads data from a local file.
-     *
-     * @see \phpseclib3\Net\SFTP::put()
      */
     const SOURCE_LOCAL_FILE = 1;
     /**
      * Reads data from a string.
-     *
-     * @see \phpseclib3\Net\SFTP::put()
      */
     // this value isn't really used anymore but i'm keeping it reserved for historical reasons
     const SOURCE_STRING = 2;
     /**
      * Reads data from callback:
      * function callback($length) returns string to proceed, null for EOF
-     *
-     * @see \phpseclib3\Net\SFTP::put()
      */
     const SOURCE_CALLBACK = 16;
     /**
      * Resumes an upload
-     *
-     * @see \phpseclib3\Net\SFTP::put()
      */
     const RESUME = 4;
     /**
      * Append a local file to an already existing remote file
-     *
-     * @see \phpseclib3\Net\SFTP::put()
      */
     const RESUME_START = 8;
+    /**#@-*/
 
     /**
      * Packet Types
@@ -93,7 +92,7 @@ class SFTP extends SSH2
      * @var array
      * @access private
      */
-    private static $packet_types = [];
+    var $packet_types = array();
 
     /**
      * Status Codes
@@ -102,19 +101,7 @@ class SFTP extends SSH2
      * @var array
      * @access private
      */
-    private static $status_codes = [];
-
-    /** @var array<int, string> */
-    private static $attributes;
-
-    /** @var array<int, string> */
-    private static $open_flags;
-
-    /** @var array<int, string> */
-    private static $open_flags5;
-
-    /** @var array<int, string> */
-    private static $file_types;
+    var $status_codes = array();
 
     /**
      * The Request ID
@@ -122,10 +109,11 @@ class SFTP extends SSH2
      * The request ID exists in the off chance that a packet is sent out-of-order.  Of course, this library doesn't support
      * concurrent actions, so it's somewhat academic, here.
      *
-     * @var boolean
+     * @var int
      * @see self::_send_sftp_packet()
+     * @access private
      */
-    private $use_request_id = false;
+    var $request_id = false;
 
     /**
      * The Packet Type
@@ -135,115 +123,74 @@ class SFTP extends SSH2
      *
      * @var int
      * @see self::_get_sftp_packet()
+     * @access private
      */
-    private $packet_type = -1;
+    var $packet_type = -1;
 
     /**
      * Packet Buffer
      *
      * @var string
      * @see self::_get_sftp_packet()
+     * @access private
      */
-    private $packet_buffer = '';
+    var $packet_buffer = '';
 
     /**
      * Extensions supported by the server
      *
      * @var array
      * @see self::_initChannel()
+     * @access private
      */
-    private $extensions = [];
+    var $extensions = array();
 
     /**
      * Server SFTP version
      *
      * @var int
      * @see self::_initChannel()
+     * @access private
      */
-    private $version;
-
-    /**
-     * Default Server SFTP version
-     *
-     * @var int
-     * @see self::_initChannel()
-     */
-    private $defaultVersion;
-
-    /**
-     * Preferred SFTP version
-     *
-     * @var int
-     * @see self::_initChannel()
-     */
-    private $preferredVersion = 3;
+    var $version;
 
     /**
      * Current working directory
      *
-     * @var string|bool
-     * @see self::realpath()
+     * @var string
+     * @see self::_realpath()
      * @see self::chdir()
+     * @access private
      */
-    private $pwd = false;
+    var $pwd = false;
 
     /**
      * Packet Type Log
      *
      * @see self::getLog()
      * @var array
+     * @access private
      */
-    private $packet_type_log = [];
+    var $packet_type_log = array();
 
     /**
      * Packet Log
      *
      * @see self::getLog()
      * @var array
+     * @access private
      */
-    private $packet_log = [];
-
-    /**
-     * Real-time log file pointer
-     *
-     * @see self::_append_log()
-     * @var resource|closed-resource
-     */
-    private $realtime_log_file;
-
-    /**
-     * Real-time log file size
-     *
-     * @see self::_append_log()
-     * @var int
-     */
-    private $realtime_log_size;
-
-    /**
-     * Real-time log file wrap boolean
-     *
-     * @see self::_append_log()
-     * @var bool
-     */
-    private $realtime_log_wrap;
-
-    /**
-     * Current log size
-     *
-     * Should never exceed self::LOG_MAX_SIZE
-     *
-     * @var int
-     */
-    private $log_size;
+    var $packet_log = array();
 
     /**
      * Error information
      *
      * @see self::getSFTPErrors()
      * @see self::getLastSFTPError()
-     * @var array
+     * @var string
+     * @access private
      */
-    private $sftp_errors = [];
+    var $sftp_errors = array();
 
     /**
      * Stat Cache
@@ -255,17 +202,19 @@ class SFTP extends SSH2
      * @see self::_remove_from_stat_cache()
      * @see self::_query_stat_cache()
      * @var array
+     * @access private
      */
-    private $stat_cache = [];
+    var $stat_cache = array();
 
     /**
      * Max SFTP Packet Size
      *
      * @see self::__construct()
      * @see self::get()
-     * @var int
+     * @var array
+     * @access private
      */
-    private $max_sftp_packet;
+    var $max_sftp_packet;
 
     /**
      * Stat Cache Flag
@@ -273,8 +222,9 @@ class SFTP extends SSH2
      * @see self::disableStatCache()
      * @see self::enableStatCache()
      * @var bool
+     * @access private
      */
-    private $use_stat_cache = true;
+    var $use_stat_cache = true;
 
     /**
      * Sort Options
@@ -282,289 +232,205 @@ class SFTP extends SSH2
      * @see self::_comparator()
      * @see self::setListOrder()
      * @var array
+     * @access private
      */
-    protected $sortOptions = [];
-
-    /**
-     * Canonicalization Flag
-     *
-     * Determines whether or not paths should be canonicalized before being
-     * passed on to the remote server.
-     *
-     * @see self::enablePathCanonicalization()
-     * @see self::disablePathCanonicalization()
-     * @see self::realpath()
-     * @var bool
-     */
-    private $canonicalize_paths = true;
-
-    /**
-     * Request Buffers
-     *
-     * @see self::_get_sftp_packet()
-     * @var array
-     */
-    private $requestBuffer = [];
-
-    /**
-     * Preserve timestamps on file downloads / uploads
-     *
-     * @see self::get()
-     * @see self::put()
-     * @var bool
-     */
-    private $preserveTime = false;
-
-    /**
-     * Arbitrary Length Packets Flag
-     *
-     * Determines whether or not packets of any length should be allowed,
-     * in cases where the server chooses the packet length (such as
-     * directory listings). By default, packets are only allowed to be
-     * 256 * 1024 bytes (SFTP_MAX_MSG_LENGTH from OpenSSH's sftp-common.h)
-     *
-     * @see self::enableArbitraryLengthPackets()
-     * @see self::_get_sftp_packet()
-     * @var bool
-     */
-    private $allow_arbitrary_length_packets = false;
-
-    /**
-     * Was the last packet due to the channels being closed or not?
-     *
-     * @see self::get()
-     * @see self::get_sftp_packet()
-     * @var bool
-     */
-    private $channel_close = false;
-
-    /**
-     * Has the SFTP channel been partially negotiated?
-     *
-     * @var bool
-     */
-    private $partial_init = false;
+    var $sortOptions = array();
 
     /**
      * Default Constructor.
      *
      * Connects to an SFTP server
      *
-     * $host can either be a string, representing the host, or a stream resource.
-     *
-     * @param mixed $host
+     * @param string $host
      * @param int $port
      * @param int $timeout
+     * @return \phpseclib\Net\SFTP
+     * @access public
      */
-    public function __construct($host, $port = 22, $timeout = 10)
+    function __construct($host, $port = 22, $timeout = 10)
     {
         parent::__construct($host, $port, $timeout);
 
         $this->max_sftp_packet = 1 << 15;
 
-        if (empty(self::$packet_types)) {
-            self::$packet_types = [
-                1  => 'NET_SFTP_INIT',
-                2  => 'NET_SFTP_VERSION',
-                3  => 'NET_SFTP_OPEN',
-                4  => 'NET_SFTP_CLOSE',
-                5  => 'NET_SFTP_READ',
-                6  => 'NET_SFTP_WRITE',
-                7  => 'NET_SFTP_LSTAT',
-                9  => 'NET_SFTP_SETSTAT',
-                10 => 'NET_SFTP_FSETSTAT',
-                11 => 'NET_SFTP_OPENDIR',
-                12 => 'NET_SFTP_READDIR',
-                13 => 'NET_SFTP_REMOVE',
-                14 => 'NET_SFTP_MKDIR',
-                15 => 'NET_SFTP_RMDIR',
-                16 => 'NET_SFTP_REALPATH',
-                17 => 'NET_SFTP_STAT',
-                18 => 'NET_SFTP_RENAME',
-                19 => 'NET_SFTP_READLINK',
-                20 => 'NET_SFTP_SYMLINK',
-                21 => 'NET_SFTP_LINK',
+        $this->packet_types = array(
+            1  => 'NET_SFTP_INIT',
+            2  => 'NET_SFTP_VERSION',
+            /* the format of SSH_FXP_OPEN changed between SFTPv4 and SFTPv5+:
+                   SFTPv5+: http://tools.ietf.org/html/draft-ietf-secsh-filexfer-13#section-8.1.1
+               pre-SFTPv5 : http://tools.ietf.org/html/draft-ietf-secsh-filexfer-04#section-6.3 */
+            3  => 'NET_SFTP_OPEN',
+            4  => 'NET_SFTP_CLOSE',
+            5  => 'NET_SFTP_READ',
+            6  => 'NET_SFTP_WRITE',
+            7  => 'NET_SFTP_LSTAT',
+            9  => 'NET_SFTP_SETSTAT',
+            11 => 'NET_SFTP_OPENDIR',
+            12 => 'NET_SFTP_READDIR',
+            13 => 'NET_SFTP_REMOVE',
+            14 => 'NET_SFTP_MKDIR',
+            15 => 'NET_SFTP_RMDIR',
+            16 => 'NET_SFTP_REALPATH',
+            17 => 'NET_SFTP_STAT',
+            /* the format of SSH_FXP_RENAME changed between SFTPv4 and SFTPv5+:
+                   SFTPv5+: http://tools.ietf.org/html/draft-ietf-secsh-filexfer-13#section-8.3
+               pre-SFTPv5 : http://tools.ietf.org/html/draft-ietf-secsh-filexfer-04#section-6.5 */
+            18 => 'NET_SFTP_RENAME',
+            19 => 'NET_SFTP_READLINK',
+            20 => 'NET_SFTP_SYMLINK',
 
-                101 => 'NET_SFTP_STATUS',
-                102 => 'NET_SFTP_HANDLE',
-                103 => 'NET_SFTP_DATA',
-                104 => 'NET_SFTP_NAME',
-                105 => 'NET_SFTP_ATTRS',
+            101=> 'NET_SFTP_STATUS',
+            102=> 'NET_SFTP_HANDLE',
+            /* the format of SSH_FXP_NAME changed between SFTPv3 and SFTPv4+:
+                   SFTPv4+: http://tools.ietf.org/html/draft-ietf-secsh-filexfer-13#section-9.4
+               pre-SFTPv4 : http://tools.ietf.org/html/draft-ietf-secsh-filexfer-02#section-7 */
+            103=> 'NET_SFTP_DATA',
+            104=> 'NET_SFTP_NAME',
+            105=> 'NET_SFTP_ATTRS',
 
-                200 => 'NET_SFTP_EXTENDED'
-            ];
-            self::$status_codes = [
-                0 => 'NET_SFTP_STATUS_OK',
-                1 => 'NET_SFTP_STATUS_EOF',
-                2 => 'NET_SFTP_STATUS_NO_SUCH_FILE',
-                3 => 'NET_SFTP_STATUS_PERMISSION_DENIED',
-                4 => 'NET_SFTP_STATUS_FAILURE',
-                5 => 'NET_SFTP_STATUS_BAD_MESSAGE',
-                6 => 'NET_SFTP_STATUS_NO_CONNECTION',
-                7 => 'NET_SFTP_STATUS_CONNECTION_LOST',
-                8 => 'NET_SFTP_STATUS_OP_UNSUPPORTED',
-                9 => 'NET_SFTP_STATUS_INVALID_HANDLE',
-                10 => 'NET_SFTP_STATUS_NO_SUCH_PATH',
-                11 => 'NET_SFTP_STATUS_FILE_ALREADY_EXISTS',
-                12 => 'NET_SFTP_STATUS_WRITE_PROTECT',
-                13 => 'NET_SFTP_STATUS_NO_MEDIA',
-                14 => 'NET_SFTP_STATUS_NO_SPACE_ON_FILESYSTEM',
-                15 => 'NET_SFTP_STATUS_QUOTA_EXCEEDED',
-                16 => 'NET_SFTP_STATUS_UNKNOWN_PRINCIPAL',
-                17 => 'NET_SFTP_STATUS_LOCK_CONFLICT',
-                18 => 'NET_SFTP_STATUS_DIR_NOT_EMPTY',
-                19 => 'NET_SFTP_STATUS_NOT_A_DIRECTORY',
-                20 => 'NET_SFTP_STATUS_INVALID_FILENAME',
-                21 => 'NET_SFTP_STATUS_LINK_LOOP',
-                22 => 'NET_SFTP_STATUS_CANNOT_DELETE',
-                23 => 'NET_SFTP_STATUS_INVALID_PARAMETER',
-                24 => 'NET_SFTP_STATUS_FILE_IS_A_DIRECTORY',
-                25 => 'NET_SFTP_STATUS_BYTE_RANGE_LOCK_CONFLICT',
-                26 => 'NET_SFTP_STATUS_BYTE_RANGE_LOCK_REFUSED',
-                27 => 'NET_SFTP_STATUS_DELETE_PENDING',
-                28 => 'NET_SFTP_STATUS_FILE_CORRUPT',
-                29 => 'NET_SFTP_STATUS_OWNER_INVALID',
-                30 => 'NET_SFTP_STATUS_GROUP_INVALID',
-                31 => 'NET_SFTP_STATUS_NO_MATCHING_BYTE_RANGE_LOCK'
-            ];
-            // http://tools.ietf.org/html/draft-ietf-secsh-filexfer-13#section-7.1
-            // the order, in this case, matters quite a lot - see \phpseclib3\Net\SFTP::_parseAttributes() to understand why
-            self::$attributes = [
-                0x00000001 => 'NET_SFTP_ATTR_SIZE',
-                0x00000002 => 'NET_SFTP_ATTR_UIDGID',          // defined in SFTPv3, removed in SFTPv4+
-                0x00000080 => 'NET_SFTP_ATTR_OWNERGROUP',      // defined in SFTPv4+
-                0x00000004 => 'NET_SFTP_ATTR_PERMISSIONS',
-                0x00000008 => 'NET_SFTP_ATTR_ACCESSTIME',
-                0x00000010 => 'NET_SFTP_ATTR_CREATETIME',      // SFTPv4+
-                0x00000020 => 'NET_SFTP_ATTR_MODIFYTIME',
-                0x00000040 => 'NET_SFTP_ATTR_ACL',
-                0x00000100 => 'NET_SFTP_ATTR_SUBSECOND_TIMES',
-                0x00000200 => 'NET_SFTP_ATTR_BITS',            // SFTPv5+
-                0x00000400 => 'NET_SFTP_ATTR_ALLOCATION_SIZE', // SFTPv6+
-                0x00000800 => 'NET_SFTP_ATTR_TEXT_HINT',
-                0x00001000 => 'NET_SFTP_ATTR_MIME_TYPE',
-                0x00002000 => 'NET_SFTP_ATTR_LINK_COUNT',
-                0x00004000 => 'NET_SFTP_ATTR_UNTRANSLATED_NAME',
-                0x00008000 => 'NET_SFTP_ATTR_CTIME',
-                // 0x80000000 will yield a floating point on 32-bit systems and converting floating points to integers
-                // yields inconsistent behavior depending on how php is compiled.  so we left shift -1 (which, in
-                // two's compliment, consists of all 1 bits) by 31.  on 64-bit systems this'll yield 0xFFFFFFFF80000000.
-                // that's not a problem, however, and 'anded' and a 32-bit number, as all the leading 1 bits are ignored.
-                (PHP_INT_SIZE == 4 ? (-1 << 31) : 0x80000000) => 'NET_SFTP_ATTR_EXTENDED'
-            ];
-            // http://tools.ietf.org/html/draft-ietf-secsh-filexfer-04#section-6.3
-            // the flag definitions change somewhat in SFTPv5+.  if SFTPv5+ support is added to this library, maybe name
-            // the array for that $this->open5_flags and similarly alter the constant names.
-            self::$open_flags = [
-                0x00000001 => 'NET_SFTP_OPEN_READ',
-                0x00000002 => 'NET_SFTP_OPEN_WRITE',
-                0x00000004 => 'NET_SFTP_OPEN_APPEND',
-                0x00000008 => 'NET_SFTP_OPEN_CREATE',
-                0x00000010 => 'NET_SFTP_OPEN_TRUNCATE',
-                0x00000020 => 'NET_SFTP_OPEN_EXCL',
-                0x00000040 => 'NET_SFTP_OPEN_TEXT' // defined in SFTPv4
-            ];
-            // SFTPv5+ changed the flags up:
-            // https://datatracker.ietf.org/doc/html/draft-ietf-secsh-filexfer-13#section-8.1.1.3
-            self::$open_flags5 = [
-                // when SSH_FXF_ACCESS_DISPOSITION is a 3 bit field that controls how the file is opened
-                0x00000000 => 'NET_SFTP_OPEN_CREATE_NEW',
-                0x00000001 => 'NET_SFTP_OPEN_CREATE_TRUNCATE',
-                0x00000002 => 'NET_SFTP_OPEN_OPEN_EXISTING',
-                0x00000003 => 'NET_SFTP_OPEN_OPEN_OR_CREATE',
-                0x00000004 => 'NET_SFTP_OPEN_TRUNCATE_EXISTING',
-                // the rest of the flags are not supported
-                0x00000008 => 'NET_SFTP_OPEN_APPEND_DATA', // "the offset field of SS_FXP_WRITE requests is ignored"
-                0x00000010 => 'NET_SFTP_OPEN_APPEND_DATA_ATOMIC',
-                0x00000020 => 'NET_SFTP_OPEN_TEXT_MODE',
-                0x00000040 => 'NET_SFTP_OPEN_BLOCK_READ',
-                0x00000080 => 'NET_SFTP_OPEN_BLOCK_WRITE',
-                0x00000100 => 'NET_SFTP_OPEN_BLOCK_DELETE',
-                0x00000200 => 'NET_SFTP_OPEN_BLOCK_ADVISORY',
-                0x00000400 => 'NET_SFTP_OPEN_NOFOLLOW',
-                0x00000800 => 'NET_SFTP_OPEN_DELETE_ON_CLOSE',
-                0x00001000 => 'NET_SFTP_OPEN_ACCESS_AUDIT_ALARM_INFO',
-                0x00002000 => 'NET_SFTP_OPEN_ACCESS_BACKUP',
-                0x00004000 => 'NET_SFTP_OPEN_BACKUP_STREAM',
-                0x00008000 => 'NET_SFTP_OPEN_OVERRIDE_OWNER',
-            ];
-            // http://tools.ietf.org/html/draft-ietf-secsh-filexfer-04#section-5.2
-            // see \phpseclib3\Net\SFTP::_parseLongname() for an explanation
-            self::$file_types = [
-                1 => 'NET_SFTP_TYPE_REGULAR',
-                2 => 'NET_SFTP_TYPE_DIRECTORY',
-                3 => 'NET_SFTP_TYPE_SYMLINK',
-                4 => 'NET_SFTP_TYPE_SPECIAL',
-                5 => 'NET_SFTP_TYPE_UNKNOWN',
-                // the following types were first defined for use in SFTPv5+
-                // http://tools.ietf.org/html/draft-ietf-secsh-filexfer-05#section-5.2
-                6 => 'NET_SFTP_TYPE_SOCKET',
-                7 => 'NET_SFTP_TYPE_CHAR_DEVICE',
-                8 => 'NET_SFTP_TYPE_BLOCK_DEVICE',
-                9 => 'NET_SFTP_TYPE_FIFO'
-            ];
-            self::define_array(
-                self::$packet_types,
-                self::$status_codes,
-                self::$attributes,
-                self::$open_flags,
-                self::$open_flags5,
-                self::$file_types
-            );
-        }
+            200=> 'NET_SFTP_EXTENDED'
+        );
+        $this->status_codes = array(
+            0 => 'NET_SFTP_STATUS_OK',
+            1 => 'NET_SFTP_STATUS_EOF',
+            2 => 'NET_SFTP_STATUS_NO_SUCH_FILE',
+            3 => 'NET_SFTP_STATUS_PERMISSION_DENIED',
+            4 => 'NET_SFTP_STATUS_FAILURE',
+            5 => 'NET_SFTP_STATUS_BAD_MESSAGE',
+            6 => 'NET_SFTP_STATUS_NO_CONNECTION',
+            7 => 'NET_SFTP_STATUS_CONNECTION_LOST',
+            8 => 'NET_SFTP_STATUS_OP_UNSUPPORTED',
+            9 => 'NET_SFTP_STATUS_INVALID_HANDLE',
+            10 => 'NET_SFTP_STATUS_NO_SUCH_PATH',
+            11 => 'NET_SFTP_STATUS_FILE_ALREADY_EXISTS',
+            12 => 'NET_SFTP_STATUS_WRITE_PROTECT',
+            13 => 'NET_SFTP_STATUS_NO_MEDIA',
+            14 => 'NET_SFTP_STATUS_NO_SPACE_ON_FILESYSTEM',
+            15 => 'NET_SFTP_STATUS_QUOTA_EXCEEDED',
+            16 => 'NET_SFTP_STATUS_UNKNOWN_PRINCIPAL',
+            17 => 'NET_SFTP_STATUS_LOCK_CONFLICT',
+            18 => 'NET_SFTP_STATUS_DIR_NOT_EMPTY',
+            19 => 'NET_SFTP_STATUS_NOT_A_DIRECTORY',
+            20 => 'NET_SFTP_STATUS_INVALID_FILENAME',
+            21 => 'NET_SFTP_STATUS_LINK_LOOP',
+            22 => 'NET_SFTP_STATUS_CANNOT_DELETE',
+            23 => 'NET_SFTP_STATUS_INVALID_PARAMETER',
+            24 => 'NET_SFTP_STATUS_FILE_IS_A_DIRECTORY',
+            25 => 'NET_SFTP_STATUS_BYTE_RANGE_LOCK_CONFLICT',
+            26 => 'NET_SFTP_STATUS_BYTE_RANGE_LOCK_REFUSED',
+            27 => 'NET_SFTP_STATUS_DELETE_PENDING',
+            28 => 'NET_SFTP_STATUS_FILE_CORRUPT',
+            29 => 'NET_SFTP_STATUS_OWNER_INVALID',
+            30 => 'NET_SFTP_STATUS_GROUP_INVALID',
+            31 => 'NET_SFTP_STATUS_NO_MATCHING_BYTE_RANGE_LOCK'
+        );
+        // http://tools.ietf.org/html/draft-ietf-secsh-filexfer-13#section-7.1
+        // the order, in this case, matters quite a lot - see \phpseclib\Net\SFTP::_parseAttributes() to understand why
+        $this->attributes = array(
+            0x00000001 => 'NET_SFTP_ATTR_SIZE',
+            0x00000002 => 'NET_SFTP_ATTR_UIDGID', // defined in SFTPv3, removed in SFTPv4+
+            0x00000004 => 'NET_SFTP_ATTR_PERMISSIONS',
+            0x00000008 => 'NET_SFTP_ATTR_ACCESSTIME',
+            // 0x80000000 will yield a floating point on 32-bit systems and converting floating points to integers
+            // yields inconsistent behavior depending on how php is compiled.  so we left shift -1 (which, in
+            // two's compliment, consists of all 1 bits) by 31.  on 64-bit systems this'll yield 0xFFFFFFFF80000000.
+            // that's not a problem, however, and 'anded' and a 32-bit number, as all the leading 1 bits are ignored.
+              -1 << 31 => 'NET_SFTP_ATTR_EXTENDED'
+        );
+        // http://tools.ietf.org/html/draft-ietf-secsh-filexfer-04#section-6.3
+        // the flag definitions change somewhat in SFTPv5+.  if SFTPv5+ support is added to this library, maybe name
+        // the array for that $this->open5_flags and similarly alter the constant names.
+        $this->open_flags = array(
+            0x00000001 => 'NET_SFTP_OPEN_READ',
+            0x00000002 => 'NET_SFTP_OPEN_WRITE',
+            0x00000004 => 'NET_SFTP_OPEN_APPEND',
+            0x00000008 => 'NET_SFTP_OPEN_CREATE',
+            0x00000010 => 'NET_SFTP_OPEN_TRUNCATE',
+            0x00000020 => 'NET_SFTP_OPEN_EXCL'
+        );
+        // http://tools.ietf.org/html/draft-ietf-secsh-filexfer-04#section-5.2
+        // see \phpseclib\Net\SFTP::_parseLongname() for an explanation
+        $this->file_types = array(
+            1 => 'NET_SFTP_TYPE_REGULAR',
+            2 => 'NET_SFTP_TYPE_DIRECTORY',
+            3 => 'NET_SFTP_TYPE_SYMLINK',
+            4 => 'NET_SFTP_TYPE_SPECIAL',
+            5 => 'NET_SFTP_TYPE_UNKNOWN',
+            // the followin types were first defined for use in SFTPv5+
+            // http://tools.ietf.org/html/draft-ietf-secsh-filexfer-05#section-5.2
+            6 => 'NET_SFTP_TYPE_SOCKET',
+            7 => 'NET_SFTP_TYPE_CHAR_DEVICE',
+            8 => 'NET_SFTP_TYPE_BLOCK_DEVICE',
+            9 => 'NET_SFTP_TYPE_FIFO'
+        );
+        $this->_define_array(
+            $this->packet_types,
+            $this->status_codes,
+            $this->attributes,
+            $this->open_flags,
+            $this->file_types
+        );
 
         if (!defined('NET_SFTP_QUEUE_SIZE')) {
-            define('NET_SFTP_QUEUE_SIZE', 32);
-        }
-        if (!defined('NET_SFTP_UPLOAD_QUEUE_SIZE')) {
-            define('NET_SFTP_UPLOAD_QUEUE_SIZE', 1024);
+            define('NET_SFTP_QUEUE_SIZE', 50);
         }
     }
 
     /**
-     * Check a few things before SFTP functions are called
+     * Login
      *
+     * @param string $username
+     * @param string $password
      * @return bool
+     * @access public
      */
-    private function precheck()
+    function login($username)
     {
-        if (!($this->bitmap & SSH2::MASK_LOGIN)) {
+        $args = func_get_args();
+        if (!call_user_func_array(array(&$this, '_login'), $args)) {
             return false;
         }
 
-        if ($this->pwd === false) {
-            return $this->init_sftp_connection();
-        }
+        $this->window_size_server_to_client[self::CHANNEL] = $this->window_size;
 
-        return true;
-    }
+        $packet = pack(
+            'CNa*N3',
+            NET_SSH2_MSG_CHANNEL_OPEN,
+            strlen('session'),
+            'session',
+            self::CHANNEL,
+            $this->window_size,
+            0x4000
+        );
 
-    /**
-     * Partially initialize an SFTP connection
-     *
-     * @throws \UnexpectedValueException on receipt of unexpected packets
-     * @return bool
-     */
-    private function partial_init_sftp_connection()
-    {
-        $response = $this->open_channel(self::CHANNEL, true);
-        if ($response === true && $this->isTimeout()) {
+        if (!$this->_send_binary_packet($packet)) {
             return false;
         }
 
-        $packet = Strings::packSSH2(
-            'CNsbs',
+        $this->channel_status[self::CHANNEL] = NET_SSH2_MSG_CHANNEL_OPEN;
+
+        $response = $this->_get_channel_packet(self::CHANNEL);
+        if ($response === false) {
+            return false;
+        }
+
+        $packet = pack(
+            'CNNa*CNa*',
             NET_SSH2_MSG_CHANNEL_REQUEST,
             $this->server_channels[self::CHANNEL],
+            strlen('subsystem'),
             'subsystem',
-            true,
+            1,
+            strlen('sftp'),
             'sftp'
         );
-        $this->send_binary_packet($packet);
+        if (!$this->_send_binary_packet($packet)) {
+            return false;
+        }
 
         $this->channel_status[self::CHANNEL] = NET_SSH2_MSG_CHANNEL_REQUEST;
 
-        $response = $this->get_channel_packet(self::CHANNEL, true);
+        $response = $this->_get_channel_packet(self::CHANNEL);
         if ($response === false) {
             // from PuTTY's psftp.exe
             $command = "test -x /usr/lib/sftp-server && exec /usr/lib/sftp-server\n" .
@@ -572,58 +438,65 @@ class SFTP extends SSH2
                        "exec sftp-server";
             // we don't do $this->exec($command, false) because exec() operates on a different channel and plus the SSH_MSG_CHANNEL_OPEN that exec() does
             // is redundant
-            $packet = Strings::packSSH2(
-                'CNsCs',
+            $packet = pack(
+                'CNNa*CNa*',
                 NET_SSH2_MSG_CHANNEL_REQUEST,
                 $this->server_channels[self::CHANNEL],
+                strlen('exec'),
                 'exec',
                 1,
+                strlen($command),
                 $command
             );
-            $this->send_binary_packet($packet);
+            if (!$this->_send_binary_packet($packet)) {
+                return false;
+            }
 
             $this->channel_status[self::CHANNEL] = NET_SSH2_MSG_CHANNEL_REQUEST;
 
-            $response = $this->get_channel_packet(self::CHANNEL, true);
+            $response = $this->_get_channel_packet(self::CHANNEL);
             if ($response === false) {
                 return false;
             }
-        } elseif ($response === true && $this->isTimeout()) {
-            return false;
         }
 
         $this->channel_status[self::CHANNEL] = NET_SSH2_MSG_CHANNEL_DATA;
-        $this->send_sftp_packet(NET_SFTP_INIT, "\0\0\0\3");
 
-        $response = $this->get_sftp_packet();
-        if ($this->packet_type != NET_SFTP_VERSION) {
-            throw new \UnexpectedValueException('Expected NET_SFTP_VERSION. '
-                                              . 'Got packet type: ' . $this->packet_type);
+        if (!$this->_send_sftp_packet(NET_SFTP_INIT, "\0\0\0\3")) {
+            return false;
         }
 
-        $this->use_request_id = true;
+        $response = $this->_get_sftp_packet();
+        if ($this->packet_type != NET_SFTP_VERSION) {
+            user_error('Expected SSH_FXP_VERSION');
+            return false;
+        }
 
-        list($this->defaultVersion) = Strings::unpackSSH2('N', $response);
+        extract(unpack('Nversion', $this->_string_shift($response, 4)));
+        $this->version = $version;
         while (!empty($response)) {
-            list($key, $value) = Strings::unpackSSH2('ss', $response);
+            extract(unpack('Nlength', $this->_string_shift($response, 4)));
+            $key = $this->_string_shift($response, $length);
+            extract(unpack('Nlength', $this->_string_shift($response, 4)));
+            $value = $this->_string_shift($response, $length);
             $this->extensions[$key] = $value;
         }
 
-        $this->partial_init = true;
-
-        return true;
-    }
-
-    /**
-     * (Re)initializes the SFTP channel
-     *
-     * @return bool
-     */
-    private function init_sftp_connection()
-    {
-        if (!$this->partial_init && !$this->partial_init_sftp_connection()) {
-            return false;
+        /*
+         SFTPv4+ defines a 'newline' extension.  SFTPv3 seems to have unofficial support for it via 'newline@vandyke.com',
+         however, I'm not sure what 'newline@vandyke.com' is supposed to do (the fact that it's unofficial means that it's
+         not in the official SFTPv3 specs) and 'newline@vandyke.com' / 'newline' are likely not drop-in substitutes for
+         one another due to the fact that 'newline' comes with a SSH_FXF_TEXT bitmask whereas it seems unlikely that
+         'newline@vandyke.com' would.
+        */
+        /*
+        if (isset($this->extensions['newline@vandyke.com'])) {
+            $this->extensions['newline'] = $this->extensions['newline@vandyke.com'];
+            unset($this->extensions['newline@vandyke.com']);
         }
+        */
+
+        $this->request_id = 1;
 
         /*
          A Note on SFTPv4/5/6 support:
@@ -645,70 +518,20 @@ class SFTP extends SSH2
          So what do you do if you have a client whose initial SSH_FXP_INIT packet says it implements v3 and
          a server whose initial SSH_FXP_VERSION reply says it implements v4 and only v4?  If it only implements
          v4, the "versions" extension is likely not going to have been sent so version re-negotiation as discussed
-         in draft-ietf-secsh-filexfer-13 would be quite impossible.  As such, what \phpseclib3\Net\SFTP would do is close the
+         in draft-ietf-secsh-filexfer-13 would be quite impossible.  As such, what \phpseclib\Net\SFTP would do is close the
          channel and reopen it with a new and updated SSH_FXP_INIT packet.
         */
-        $this->version = $this->defaultVersion;
-        if (isset($this->extensions['versions']) && (!$this->preferredVersion || $this->preferredVersion != $this->version)) {
-            $versions = explode(',', $this->extensions['versions']);
-            $supported = [6, 5, 4];
-            if ($this->preferredVersion) {
-                $supported = array_diff($supported, [$this->preferredVersion]);
-                array_unshift($supported, $this->preferredVersion);
-            }
-            foreach ($supported as $ver) {
-                if (in_array($ver, $versions)) {
-                    if ($ver === $this->version) {
-                        break;
-                    }
-                    $this->version = (int) $ver;
-                    $packet = Strings::packSSH2('ss', 'version-select', "$ver");
-                    $this->send_sftp_packet(NET_SFTP_EXTENDED, $packet);
-                    $response = $this->get_sftp_packet();
-                    if ($this->packet_type != NET_SFTP_STATUS) {
-                        throw new \UnexpectedValueException('Expected NET_SFTP_STATUS. '
-                            . 'Got packet type: ' . $this->packet_type);
-                    }
-                    list($status) = Strings::unpackSSH2('N', $response);
-                    if ($status != NET_SFTP_STATUS_OK) {
-                        $this->logError($response, $status);
-                        throw new \UnexpectedValueException('Expected NET_SFTP_STATUS_OK. '
-                            . ' Got ' . $status);
-                    }
-                    break;
-                }
-            }
+        switch ($this->version) {
+            case 2:
+            case 3:
+                break;
+            default:
+                return false;
         }
 
-        /*
-         SFTPv4+ defines a 'newline' extension.  SFTPv3 seems to have unofficial support for it via 'newline@vandyke.com',
-         however, I'm not sure what 'newline@vandyke.com' is supposed to do (the fact that it's unofficial means that it's
-         not in the official SFTPv3 specs) and 'newline@vandyke.com' / 'newline' are likely not drop-in substitutes for
-         one another due to the fact that 'newline' comes with a SSH_FXF_TEXT bitmask whereas it seems unlikely that
-         'newline@vandyke.com' would.
-        */
-        /*
-        if (isset($this->extensions['newline@vandyke.com'])) {
-            $this->extensions['newline'] = $this->extensions['newline@vandyke.com'];
-            unset($this->extensions['newline@vandyke.com']);
-        }
-        */
-        if ($this->version < 2 || $this->version > 6) {
-            return false;
-        }
+        $this->pwd = $this->_realpath('.');
 
-        $this->pwd = true;
-        try {
-            $this->pwd = $this->realpath('.');
-        } catch (\UnexpectedValueException $e) {
-            if (!$this->canonicalize_paths) {
-                throw $e;
-            }
-            $this->canonicalize_paths = false;
-            $this->reset_connection(NET_SSH2_DISCONNECT_CONNECTION_LOST);
-        }
-
-        $this->update_stat_cache($this->pwd, []);
+        $this->_update_stat_cache($this->pwd, array());
 
         return true;
     }
@@ -716,8 +539,9 @@ class SFTP extends SSH2
     /**
      * Disable the stat cache
      *
+     * @access public
      */
-    public function disableStatCache()
+    function disableStatCache()
     {
         $this->use_stat_cache = false;
     }
@@ -725,8 +549,9 @@ class SFTP extends SSH2
     /**
      * Enable the stat cache
      *
+     * @access public
      */
-    public function enableStatCache()
+    function enableStatCache()
     {
         $this->use_stat_cache = true;
     }
@@ -734,61 +559,21 @@ class SFTP extends SSH2
     /**
      * Clear the stat cache
      *
+     * @access public
      */
-    public function clearStatCache()
+    function clearStatCache()
     {
-        $this->stat_cache = [];
-    }
-
-    /**
-     * Enable path canonicalization
-     *
-     */
-    public function enablePathCanonicalization()
-    {
-        $this->canonicalize_paths = true;
-    }
-
-    /**
-     * Disable path canonicalization
-     *
-     * If this is enabled then $sftp->pwd() will not return the canonicalized absolute path
-     *
-     */
-    public function disablePathCanonicalization()
-    {
-        $this->canonicalize_paths = false;
-    }
-
-    /**
-     * Enable arbitrary length packets
-     *
-     */
-    public function enableArbitraryLengthPackets()
-    {
-        $this->allow_arbitrary_length_packets = true;
-    }
-
-    /**
-     * Disable arbitrary length packets
-     *
-     */
-    public function disableArbitraryLengthPackets()
-    {
-        $this->allow_arbitrary_length_packets = false;
+        $this->stat_cache = array();
     }
 
     /**
      * Returns the current directory name
      *
-     * @return string|bool
+     * @return mixed
+     * @access public
      */
-    public function pwd()
+    function pwd()
     {
-        if (!$this->precheck()) {
-            return false;
-        }
-
         return $this->pwd;
     }
 
@@ -797,99 +582,82 @@ class SFTP extends SSH2
      *
      * @param string $response
      * @param int $status
+     * @access public
      */
-    private function logError($response, $status = -1)
+    function _logError($response, $status = -1)
     {
         if ($status == -1) {
-            list($status) = Strings::unpackSSH2('N', $response);
+            extract(unpack('Nstatus', $this->_string_shift($response, 4)));
         }
 
-        $error = self::$status_codes[$status];
+        $error = $this->status_codes[$status];
 
         if ($this->version > 2) {
-            list($message) = Strings::unpackSSH2('s', $response);
-            $this->sftp_errors[] = "$error: $message";
+            extract(unpack('Nlength', $this->_string_shift($response, 4)));
+            $this->sftp_errors[] = $error . ': ' . $this->_string_shift($response, $length);
         } else {
             $this->sftp_errors[] = $error;
         }
     }
 
+    /**
+     * Returns canonicalized absolute pathname
+     *
+     * realpath() expands all symbolic links and resolves references to '/./', '/../' and extra '/' characters in the input
+     * path and returns the canonicalized absolute pathname.
+     *
+     * @param string $path
+     * @return mixed
+     * @access public
+     */
+    function realpath($path)
+    {
+        return $this->_realpath($path);
+    }
+
     /**
      * Canonicalize the Server-Side Path Name
      *
      * SFTP doesn't provide a mechanism by which the current working directory can be changed, so we'll emulate it.  Returns
      * the absolute (canonicalized) path.
      *
-     * If canonicalize_paths has been disabled using disablePathCanonicalization(), $path is returned as-is.
-     *
      * @see self::chdir()
-     * @see self::disablePathCanonicalization()
      * @param string $path
-     * @throws \UnexpectedValueException on receipt of unexpected packets
      * @return mixed
+     * @access private
      */
-    public function realpath($path)
+    function _realpath($path)
     {
-        if ($this->precheck() === false) {
-            return false;
-        }
-
-        if (!$this->canonicalize_paths) {
-            if ($this->pwd === true) {
-                return '.';
-            }
-            if (!strlen($path) || $path[0] != '/') {
-                $path = $this->pwd . '/' . $path;
-            }
-            $parts = explode('/', $path);
-            $afterPWD = $beforePWD = [];
-            foreach ($parts as $part) {
-                switch ($part) {
-                    //case '': // some SFTP servers /require/ double /'s. see https://github.com/phpseclib/phpseclib/pull/1137
-                    case '.':
-                        break;
-                    case '..':
-                        if (!empty($afterPWD)) {
-                            array_pop($afterPWD);
-                        } else {
-                            $beforePWD[] = '..';
-                        }
-                        break;
-                    default:
-                        $afterPWD[] = $part;
-                }
-            }
-            $beforePWD = count($beforePWD) ? implode('/', $beforePWD) : '.';
-            return $beforePWD . '/' . implode('/', $afterPWD);
-        }
-
-        if ($this->pwd === true) {
+        if ($this->pwd === false) {
             // http://tools.ietf.org/html/draft-ietf-secsh-filexfer-13#section-8.9
-            $this->send_sftp_packet(NET_SFTP_REALPATH, Strings::packSSH2('s', $path));
+            if (!$this->_send_sftp_packet(NET_SFTP_REALPATH, pack('Na*', strlen($path), $path))) {
+                return false;
+            }
 
-            $response = $this->get_sftp_packet();
+            $response = $this->_get_sftp_packet();
             switch ($this->packet_type) {
                 case NET_SFTP_NAME:
                     // although SSH_FXP_NAME is implemented differently in SFTPv3 than it is in SFTPv4+, the following
                     // should work on all SFTP versions since the only part of the SSH_FXP_NAME packet the following looks
                     // at is the first part and that part is defined the same in SFTP versions 3 through 6.
-                    list(, $filename) = Strings::unpackSSH2('Ns', $response);
-                    return $filename;
+                    $this->_string_shift($response, 4); // skip over the count - it should be 1, anyway
+                    extract(unpack('Nlength', $this->_string_shift($response, 4)));
+                    return $this->_string_shift($response, $length);
                 case NET_SFTP_STATUS:
-                    $this->logError($response);
+                    $this->_logError($response);
                     return false;
                 default:
-                    throw new \UnexpectedValueException('Expected NET_SFTP_NAME or NET_SFTP_STATUS. '
-                                                      . 'Got packet type: ' . $this->packet_type);
+                    user_error('Expected SSH_FXP_NAME or SSH_FXP_STATUS');
+                    return false;
             }
         }
 
-        if (!strlen($path) || $path[0] != '/') {
+        if ($path[0] != '/') {
             $path = $this->pwd . '/' . $path;
         }
 
         $path = explode('/', $path);
-        $new = [];
+        $new = array();
         foreach ($path as $dir) {
             if (!strlen($dir)) {
                 continue;
@@ -897,7 +665,6 @@ class SFTP extends SSH2
             switch ($dir) {
                 case '..':
                     array_pop($new);
-                    // fall-through
                 case '.':
                     break;
                 default:
@@ -912,12 +679,12 @@ class SFTP extends SSH2
      * Changes the current directory
      *
      * @param string $dir
-     * @throws \UnexpectedValueException on receipt of unexpected packets
      * @return bool
+     * @access public
      */
-    public function chdir($dir)
+    function chdir($dir)
     {
-        if (!$this->precheck()) {
+        if (!($this->bitmap & SSH2::MASK_LOGIN)) {
             return false;
         }
 
@@ -926,13 +693,13 @@ class SFTP extends SSH2
             $dir = './';
         // suffix a slash if needed
         } elseif ($dir[strlen($dir) - 1] != '/') {
-            $dir .= '/';
+            $dir.= '/';
         }
 
-        $dir = $this->realpath($dir);
+        $dir = $this->_realpath($dir);
 
         // confirm that $dir is, in fact, a valid directory
-        if ($this->use_stat_cache && is_array($this->query_stat_cache($dir))) {
+        if ($this->use_stat_cache && is_array($this->_query_stat_cache($dir))) {
             $this->pwd = $dir;
             return true;
         }
@@ -942,27 +709,29 @@ class SFTP extends SSH2
         // the file's uid / gid match the currently logged in user's uid / gid but how there's no easy
         // way to get those with SFTP
 
-        $this->send_sftp_packet(NET_SFTP_OPENDIR, Strings::packSSH2('s', $dir));
+        if (!$this->_send_sftp_packet(NET_SFTP_OPENDIR, pack('Na*', strlen($dir), $dir))) {
+            return false;
+        }
 
-        // see \phpseclib3\Net\SFTP::nlist() for a more thorough explanation of the following
-        $response = $this->get_sftp_packet();
+        // see \phpseclib\Net\SFTP::nlist() for a more thorough explanation of the following
+        $response = $this->_get_sftp_packet();
         switch ($this->packet_type) {
             case NET_SFTP_HANDLE:
                 $handle = substr($response, 4);
                 break;
             case NET_SFTP_STATUS:
-                $this->logError($response);
+                $this->_logError($response);
                 return false;
             default:
-                throw new \UnexpectedValueException('Expected NET_SFTP_HANDLE or NET_SFTP_STATUS' .
-                                                    'Got packet type: ' . $this->packet_type);
+                user_error('Expected SSH_FXP_HANDLE or SSH_FXP_STATUS');
+                return false;
         }
 
-        if (!$this->close_handle($handle)) {
+        if (!$this->_close_handle($handle)) {
             return false;
         }
 
-        $this->update_stat_cache($dir, []);
+        $this->_update_stat_cache($dir, array());
 
         $this->pwd = $dir;
         return true;
@@ -973,11 +742,12 @@ class SFTP extends SSH2
      *
      * @param string $dir
      * @param bool $recursive
-     * @return array|false
+     * @return mixed
+     * @access public
      */
-    public function nlist($dir = '.', $recursive = false)
+    function nlist($dir = '.', $recursive = false)
     {
-        return $this->nlist_helper($dir, $recursive, '');
+        return $this->_nlist_helper($dir, $recursive, '');
     }
 
     /**
@@ -986,31 +756,27 @@ class SFTP extends SSH2
      * @param string $dir
      * @param bool $recursive
      * @param string $relativeDir
-     * @return array|false
+     * @return mixed
+     * @access private
      */
-    private function nlist_helper($dir, $recursive, $relativeDir)
+    function _nlist_helper($dir, $recursive, $relativeDir)
     {
-        $files = $this->readlist($dir, false);
-
-        // If we get an int back, then that is an "unexpected" status.
-        // We do not have a file list, so return false.
-        if (is_int($files)) {
-            return false;
-        }
+        $files = $this->_list($dir, false);
 
         if (!$recursive || $files === false) {
             return $files;
         }
 
-        $result = [];
+        $result = array();
         foreach ($files as $value) {
             if ($value == '.' || $value == '..') {
-                $result[] = $relativeDir . $value;
+                if ($relativeDir == '') {
+                    $result[] = $value;
+                }
                 continue;
             }
-            if (is_array($this->query_stat_cache($this->realpath($dir . '/' . $value)))) {
-                $temp = $this->nlist_helper($dir . '/' . $value, true, $relativeDir . $value . '/');
-                $temp = is_array($temp) ? $temp : [];
+            if (is_array($this->_query_stat_cache($this->_realpath($dir . '/' . $value)))) {
+                $temp = $this->_nlist_helper($dir . '/' . $value, true, $relativeDir . $value . '/');
                 $result = array_merge($result, $temp);
             } else {
                 $result[] = $relativeDir . $value;
@@ -1025,18 +791,12 @@ class SFTP extends SSH2
      *
      * @param string $dir
      * @param bool $recursive
-     * @return array|false
+     * @return mixed
+     * @access public
      */
-    public function rawlist($dir = '.', $recursive = false)
+    function rawlist($dir = '.', $recursive = false)
     {
-        $files = $this->readlist($dir, true);
-
-        // If we get an int back, then that is an "unexpected" status.
-        // We do not have a file list, so return false.
-        if (is_int($files)) {
-            return false;
-        }
-
+        $files = $this->_list($dir, true);
         if (!$recursive || $files === false) {
             return $files;
         }
@@ -1048,17 +808,7 @@ class SFTP extends SSH2
                 unset($files[$key]);
                 continue;
             }
-            $is_directory = false;
-            if ($key != '.' && $key != '..') {
-                if ($this->use_stat_cache) {
-                    $is_directory = is_array($this->query_stat_cache($this->realpath($dir . '/' . $key)));
-                } else {
-                    $stat = $this->lstat($dir . '/' . $key);
-                    $is_directory = $stat && $stat['type'] === NET_SFTP_TYPE_DIRECTORY;
-                }
-            }
-
-            if ($is_directory) {
+            if ($key != '.' && $key != '..' && is_array($this->_query_stat_cache($this->_realpath($dir . '/' . $key)))) {
                 $depth++;
                 $files[$key] = $this->rawlist($dir . '/' . $key, true);
                 $depth--;
@@ -1075,24 +825,26 @@ class SFTP extends SSH2
      *
      * @param string $dir
      * @param bool $raw
-     * @return array|false
-     * @throws \UnexpectedValueException on receipt of unexpected packets
+     * @return mixed
+     * @access private
      */
-    private function readlist($dir, $raw = true)
+    function _list($dir, $raw = true)
     {
-        if (!$this->precheck()) {
+        if (!($this->bitmap & SSH2::MASK_LOGIN)) {
             return false;
         }
 
-        $dir = $this->realpath($dir . '/');
+        $dir = $this->_realpath($dir . '/');
         if ($dir === false) {
             return false;
         }
 
         // http://tools.ietf.org/html/draft-ietf-secsh-filexfer-13#section-8.1.2
-        $this->send_sftp_packet(NET_SFTP_OPENDIR, Strings::packSSH2('s', $dir));
+        if (!$this->_send_sftp_packet(NET_SFTP_OPENDIR, pack('Na*', strlen($dir), $dir))) {
+            return false;
+        }
 
-        $response = $this->get_sftp_packet();
+        $response = $this->_get_sftp_packet();
         switch ($this->packet_type) {
             case NET_SFTP_HANDLE:
                 // http://tools.ietf.org/html/draft-ietf-secsh-filexfer-13#section-9.2
@@ -1102,79 +854,78 @@ class SFTP extends SSH2
                 break;
             case NET_SFTP_STATUS:
                 // presumably SSH_FX_NO_SUCH_FILE or SSH_FX_PERMISSION_DENIED
-                list($status) = Strings::unpackSSH2('N', $response);
-                $this->logError($response, $status);
-                return $status;
+                $this->_logError($response);
+                return false;
             default:
-                throw new \UnexpectedValueException('Expected NET_SFTP_HANDLE or NET_SFTP_STATUS. '
-                                                  . 'Got packet type: ' . $this->packet_type);
+                user_error('Expected SSH_FXP_HANDLE or SSH_FXP_STATUS');
+                return false;
         }
 
-        $this->update_stat_cache($dir, []);
+        $this->_update_stat_cache($dir, array());
 
-        $contents = [];
+        $contents = array();
         while (true) {
             // http://tools.ietf.org/html/draft-ietf-secsh-filexfer-13#section-8.2.2
             // why multiple SSH_FXP_READDIR packets would be sent when the response to a single one can span arbitrarily many
             // SSH_MSG_CHANNEL_DATA messages is not known to me.
-            $this->send_sftp_packet(NET_SFTP_READDIR, Strings::packSSH2('s', $handle));
+            if (!$this->_send_sftp_packet(NET_SFTP_READDIR, pack('Na*', strlen($handle), $handle))) {
+                return false;
+            }
 
-            $response = $this->get_sftp_packet();
+            $response = $this->_get_sftp_packet();
             switch ($this->packet_type) {
                 case NET_SFTP_NAME:
-                    list($count) = Strings::unpackSSH2('N', $response);
+                    extract(unpack('Ncount', $this->_string_shift($response, 4)));
                     for ($i = 0; $i < $count; $i++) {
-                        list($shortname) = Strings::unpackSSH2('s', $response);
-                        // SFTPv4 "removed the long filename from the names structure-- it can now be
-                        //         built from information available in the attrs structure."
-                        if ($this->version < 4) {
-                            list($longname) = Strings::unpackSSH2('s', $response);
-                        }
-                        $attributes = $this->parseAttributes($response);
-                        if (!isset($attributes['type']) && $this->version < 4) {
-                            $fileType = $this->parseLongname($longname);
+                        extract(unpack('Nlength', $this->_string_shift($response, 4)));
+                        $shortname = $this->_string_shift($response, $length);
+                        extract(unpack('Nlength', $this->_string_shift($response, 4)));
+                        $longname = $this->_string_shift($response, $length);
+                        $attributes = $this->_parseAttributes($response);
+                        if (!isset($attributes['type'])) {
+                            $fileType = $this->_parseLongname($longname);
                             if ($fileType) {
                                 $attributes['type'] = $fileType;
                             }
                         }
-                        $contents[$shortname] = $attributes + ['filename' => $shortname];
+                        $contents[$shortname] = $attributes + array('filename' => $shortname);
 
                         if (isset($attributes['type']) && $attributes['type'] == NET_SFTP_TYPE_DIRECTORY && ($shortname != '.' && $shortname != '..')) {
-                            $this->update_stat_cache($dir . '/' . $shortname, []);
+                            $this->_update_stat_cache($dir . '/' . $shortname, array());
                         } else {
                             if ($shortname == '..') {
-                                $temp = $this->realpath($dir . '/..') . '/.';
+                                $temp = $this->_realpath($dir . '/..') . '/.';
                             } else {
                                 $temp = $dir . '/' . $shortname;
                             }
-                            $this->update_stat_cache($temp, (object) ['lstat' => $attributes]);
+                            $this->_update_stat_cache($temp, (object) array('lstat' => $attributes));
                         }
                         // SFTPv6 has an optional boolean end-of-list field, but we'll ignore that, since the
                         // final SSH_FXP_STATUS packet should tell us that, already.
                     }
                     break;
                 case NET_SFTP_STATUS:
-                    list($status) = Strings::unpackSSH2('N', $response);
+                    extract(unpack('Nstatus', $this->_string_shift($response, 4)));
                     if ($status != NET_SFTP_STATUS_EOF) {
-                        $this->logError($response, $status);
-                        return $status;
+                        $this->_logError($response, $status);
+                        return false;
                     }
                     break 2;
                 default:
-                    throw new \UnexpectedValueException('Expected NET_SFTP_NAME or NET_SFTP_STATUS. '
-                                                      . 'Got packet type: ' . $this->packet_type);
+                    user_error('Expected SSH_FXP_NAME or SSH_FXP_STATUS');
+                    return false;
             }
         }
 
-        if (!$this->close_handle($handle)) {
+        if (!$this->_close_handle($handle)) {
             return false;
         }
 
         if (count($this->sortOptions)) {
-            uasort($contents, [&$this, 'comparator']);
+            uasort($contents, array(&$this, '_comparator'));
         }
 
-        return $raw ? $contents : array_map('strval', array_keys($contents));
+        return $raw ? $contents : array_keys($contents);
     }
 
     /**
@@ -1185,8 +936,9 @@ class SFTP extends SSH2
      * @param array $a
      * @param array $b
      * @return int
+     * @access private
      */
-    private function comparator(array $a, array $b)
+    function _comparator($a, $b)
     {
         switch (true) {
             case $a['filename'] === '.' || $b['filename'] === '.':
@@ -1227,10 +979,10 @@ class SFTP extends SSH2
                         return $order === SORT_DESC ? -$result : $result;
                     }
                     break;
+                case 'permissions':
                 case 'mode':
-                    $a[$sort] &= 07777;
-                    $b[$sort] &= 07777;
-                    // fall-through
+                    $a[$sort]&= 07777;
+                    $b[$sort]&= 07777;
                 default:
                     if ($a[$sort] === $b[$sort]) {
                         break;
@@ -1258,30 +1010,54 @@ class SFTP extends SSH2
      * $sftp->setListOrder();
      *    Don't do any sort of sorting
      *
-     * @param string ...$args
+     * @access public
      */
-    public function setListOrder(...$args)
+    function setListOrder()
     {
-        $this->sortOptions = [];
+        $this->sortOptions = array();
+        $args = func_get_args();
         if (empty($args)) {
             return;
         }
         $len = count($args) & 0x7FFFFFFE;
-        for ($i = 0; $i < $len; $i += 2) {
+        for ($i = 0; $i < $len; $i+=2) {
             $this->sortOptions[$args[$i]] = $args[$i + 1];
         }
         if (!count($this->sortOptions)) {
-            $this->sortOptions = ['bogus' => true];
+            $this->sortOptions = array('bogus' => true);
         }
     }
 
+    /**
+     * Returns the file size, in bytes, or false, on failure
+     *
+     * Files larger than 4GB will show up as being exactly 4GB.
+     *
+     * @param string $filename
+     * @return mixed
+     * @access public
+     */
+    function size($filename)
+    {
+        if (!($this->bitmap & SSH2::MASK_LOGIN)) {
+            return false;
+        }
+
+        $result = $this->stat($filename);
+        if ($result === false) {
+            return false;
+        }
+        return isset($result['size']) ? $result['size'] : -1;
+    }
+
     /**
      * Save files / directories to cache
      *
      * @param string $path
      * @param mixed $value
+     * @access private
      */
-    private function update_stat_cache($path, $value)
+    function _update_stat_cache($path, $value)
     {
         if ($this->use_stat_cache === false) {
             return;
@@ -1297,13 +1073,13 @@ class SFTP extends SSH2
             //  1. a file was deleted and changed to a directory behind phpseclib's back
             //  2. it's a symlink. when lstat is done it's unclear what it's a symlink to
             if (is_object($temp)) {
-                $temp = [];
+                $temp = array();
             }
             if (!isset($temp[$dir])) {
-                $temp[$dir] = [];
+                $temp[$dir] = array();
             }
             if ($i === $max) {
-                if (is_object($temp[$dir]) && is_object($value)) {
+                if (is_object($temp[$dir])) {
                     if (!isset($value->stat) && isset($temp[$dir]->stat)) {
                         $value->stat = $temp[$dir]->stat;
                     }
@@ -1323,17 +1099,15 @@ class SFTP extends SSH2
      *
      * @param string $path
      * @return bool
+     * @access private
      */
-    private function remove_from_stat_cache($path)
+    function _remove_from_stat_cache($path)
     {
         $dirs = explode('/', preg_replace('#^/|/(?=/)|/$#', '', $path));
 
         $temp = &$this->stat_cache;
         $max = count($dirs) - 1;
         foreach ($dirs as $i => $dir) {
-            if (!is_array($temp)) {
-                return false;
-            }
             if ($i === $max) {
                 unset($temp[$dir]);
                 return true;
@@ -1350,18 +1124,16 @@ class SFTP extends SSH2
      *
      * Mainly used by file_exists
      *
-     * @param string $path
+     * @param string $dir
      * @return mixed
+     * @access private
      */
-    private function query_stat_cache($path)
+    function _query_stat_cache($path)
     {
         $dirs = explode('/', preg_replace('#^/|/(?=/)|/$#', '', $path));
 
         $temp = &$this->stat_cache;
         foreach ($dirs as $dir) {
-            if (!is_array($temp)) {
-                return null;
-            }
             if (!isset($temp[$dir])) {
                 return null;
             }
@@ -1376,21 +1148,22 @@ class SFTP extends SSH2
      * Returns an array on success and false otherwise.
      *
      * @param string $filename
-     * @return array|false
+     * @return mixed
+     * @access public
      */
-    public function stat($filename)
+    function stat($filename)
     {
-        if (!$this->precheck()) {
+        if (!($this->bitmap & SSH2::MASK_LOGIN)) {
             return false;
         }
 
-        $filename = $this->realpath($filename);
+        $filename = $this->_realpath($filename);
         if ($filename === false) {
             return false;
         }
 
         if ($this->use_stat_cache) {
-            $result = $this->query_stat_cache($filename);
+            $result = $this->_query_stat_cache($filename);
             if (is_array($result) && isset($result['.']) && isset($result['.']->stat)) {
                 return $result['.']->stat;
             }
@@ -1399,16 +1172,16 @@ class SFTP extends SSH2
             }
         }
 
-        $stat = $this->stat_helper($filename, NET_SFTP_STAT);
+        $stat = $this->_stat($filename, NET_SFTP_STAT);
         if ($stat === false) {
-            $this->remove_from_stat_cache($filename);
+            $this->_remove_from_stat_cache($filename);
             return false;
         }
         if (isset($stat['type'])) {
             if ($stat['type'] == NET_SFTP_TYPE_DIRECTORY) {
-                $filename .= '/.';
+                $filename.= '/.';
             }
-            $this->update_stat_cache($filename, (object) ['stat' => $stat]);
+            $this->_update_stat_cache($filename, (object) array('stat' => $stat));
             return $stat;
         }
 
@@ -1419,9 +1192,9 @@ class SFTP extends SSH2
         $this->pwd = $pwd;
 
         if ($stat['type'] == NET_SFTP_TYPE_DIRECTORY) {
-            $filename .= '/.';
+            $filename.= '/.';
         }
-        $this->update_stat_cache($filename, (object) ['stat' => $stat]);
+        $this->_update_stat_cache($filename, (object) array('stat' => $stat));
 
         return $stat;
     }
@@ -1432,21 +1205,22 @@ class SFTP extends SSH2
      * Returns an array on success and false otherwise.
      *
      * @param string $filename
-     * @return array|false
+     * @return mixed
+     * @access public
      */
-    public function lstat($filename)
+    function lstat($filename)
     {
-        if (!$this->precheck()) {
+        if (!($this->bitmap & SSH2::MASK_LOGIN)) {
             return false;
         }
 
-        $filename = $this->realpath($filename);
+        $filename = $this->_realpath($filename);
         if ($filename === false) {
             return false;
         }
 
         if ($this->use_stat_cache) {
-            $result = $this->query_stat_cache($filename);
+            $result = $this->_query_stat_cache($filename);
             if (is_array($result) && isset($result['.']) && isset($result['.']->lstat)) {
                 return $result['.']->lstat;
             }
@@ -1455,24 +1229,24 @@ class SFTP extends SSH2
             }
         }
 
-        $lstat = $this->stat_helper($filename, NET_SFTP_LSTAT);
+        $lstat = $this->_stat($filename, NET_SFTP_LSTAT);
         if ($lstat === false) {
-            $this->remove_from_stat_cache($filename);
+            $this->_remove_from_stat_cache($filename);
             return false;
         }
         if (isset($lstat['type'])) {
             if ($lstat['type'] == NET_SFTP_TYPE_DIRECTORY) {
-                $filename .= '/.';
+                $filename.= '/.';
             }
-            $this->update_stat_cache($filename, (object) ['lstat' => $lstat]);
+            $this->_update_stat_cache($filename, (object) array('lstat' => $lstat));
             return $lstat;
         }
 
-        $stat = $this->stat_helper($filename, NET_SFTP_STAT);
+        $stat = $this->_stat($filename, NET_SFTP_STAT);
 
         if ($lstat != $stat) {
-            $lstat = array_merge($lstat, ['type' => NET_SFTP_TYPE_SYMLINK]);
-            $this->update_stat_cache($filename, (object) ['lstat' => $lstat]);
+            $lstat = array_merge($lstat, array('type' => NET_SFTP_TYPE_SYMLINK));
+            $this->_update_stat_cache($filename, (object) array('lstat' => $lstat));
             return $stat;
         }
 
@@ -1483,9 +1257,9 @@ class SFTP extends SSH2
         $this->pwd = $pwd;
 
         if ($lstat['type'] == NET_SFTP_TYPE_DIRECTORY) {
-            $filename .= '/.';
+            $filename.= '/.';
         }
-        $this->update_stat_cache($filename, (object) ['lstat' => $lstat]);
+        $this->_update_stat_cache($filename, (object) array('lstat' => $lstat));
 
         return $lstat;
     }
@@ -1493,31 +1267,33 @@ class SFTP extends SSH2
     /**
      * Returns general information about a file or symbolic link
      *
-     * Determines information without calling \phpseclib3\Net\SFTP::realpath().
+     * Determines information without calling \phpseclib\Net\SFTP::_realpath().
      * The second parameter can be either NET_SFTP_STAT or NET_SFTP_LSTAT.
      *
      * @param string $filename
      * @param int $type
-     * @throws \UnexpectedValueException on receipt of unexpected packets
-     * @return array|false
+     * @return mixed
+     * @access private
      */
-    private function stat_helper($filename, $type)
+    function _stat($filename, $type)
     {
         // SFTPv4+ adds an additional 32-bit integer field - flags - to the following:
-        $packet = Strings::packSSH2('s', $filename);
-        $this->send_sftp_packet($type, $packet);
+        $packet = pack('Na*', strlen($filename), $filename);
+        if (!$this->_send_sftp_packet($type, $packet)) {
+            return false;
+        }
 
-        $response = $this->get_sftp_packet();
+        $response = $this->_get_sftp_packet();
         switch ($this->packet_type) {
             case NET_SFTP_ATTRS:
-                return $this->parseAttributes($response);
+                return $this->_parseAttributes($response);
             case NET_SFTP_STATUS:
-                $this->logError($response);
+                $this->_logError($response);
                 return false;
         }
 
-        throw new \UnexpectedValueException('Expected NET_SFTP_ATTRS or NET_SFTP_STATUS. '
-                                          . 'Got packet type: ' . $this->packet_type);
+        user_error('Expected SSH_FXP_ATTRS or SSH_FXP_STATUS');
+        return false;
     }
 
     /**
@@ -1526,12 +1302,13 @@ class SFTP extends SSH2
      * @param string $filename
      * @param int $new_size
      * @return bool
+     * @access public
      */
-    public function truncate($filename, $new_size)
+    function truncate($filename, $new_size)
     {
-        $attr = Strings::packSSH2('NQ', NET_SFTP_ATTR_SIZE, $new_size);
+        $attr = pack('N3', NET_SFTP_ATTR_SIZE, $new_size / 4294967296, $new_size); // 4294967296 == 0x100000000 == 1<<32
 
-        return $this->setstat($filename, $attr, false);
+        return $this->_setstat($filename, $attr, false);
     }
 
     /**
@@ -1542,16 +1319,16 @@ class SFTP extends SSH2
      * @param string $filename
      * @param int $time
      * @param int $atime
-     * @throws \UnexpectedValueException on receipt of unexpected packets
      * @return bool
+     * @access public
      */
-    public function touch($filename, $time = null, $atime = null)
+    function touch($filename, $time = null, $atime = null)
     {
-        if (!$this->precheck()) {
+        if (!($this->bitmap & SSH2::MASK_LOGIN)) {
             return false;
         }
 
-        $filename = $this->realpath($filename);
+        $filename = $this->_realpath($filename);
         if ($filename === false) {
             return false;
         }
@@ -1563,102 +1340,64 @@ class SFTP extends SSH2
             $atime = $time;
         }
 
-        $attr = $this->version < 4 ?
-            pack('N3', NET_SFTP_ATTR_ACCESSTIME, $atime, $time) :
-            Strings::packSSH2('NQ2', NET_SFTP_ATTR_ACCESSTIME | NET_SFTP_ATTR_MODIFYTIME, $atime, $time);
-
-        $packet = Strings::packSSH2('s', $filename);
-        $packet .= $this->version >= 5 ?
-            pack('N2', 0, NET_SFTP_OPEN_OPEN_EXISTING) :
-            pack('N', NET_SFTP_OPEN_WRITE | NET_SFTP_OPEN_CREATE | NET_SFTP_OPEN_EXCL);
-        $packet .= $attr;
-
-        $this->send_sftp_packet(NET_SFTP_OPEN, $packet);
-
-        $response = $this->get_sftp_packet();
-        switch ($this->packet_type) {
-            case NET_SFTP_HANDLE:
-                return $this->close_handle(substr($response, 4));
-            case NET_SFTP_STATUS:
-                $this->logError($response);
-                break;
-            default:
-                throw new \UnexpectedValueException('Expected NET_SFTP_HANDLE or NET_SFTP_STATUS. '
-                                                  . 'Got packet type: ' . $this->packet_type);
+        $flags = NET_SFTP_OPEN_WRITE | NET_SFTP_OPEN_CREATE | NET_SFTP_OPEN_EXCL;
+        $attr = pack('N3', NET_SFTP_ATTR_ACCESSTIME, $time, $atime);
+        $packet = pack('Na*Na*', strlen($filename), $filename, $flags, $attr);
+        if (!$this->_send_sftp_packet(NET_SFTP_OPEN, $packet)) {
+            return false;
         }
 
-        return $this->setstat($filename, $attr, false);
+        $response = $this->_get_sftp_packet();
+        switch ($this->packet_type) {
+            case NET_SFTP_HANDLE:
+                return $this->_close_handle(substr($response, 4));
+            case NET_SFTP_STATUS:
+                $this->_logError($response);
+                break;
+            default:
+                user_error('Expected SSH_FXP_HANDLE or SSH_FXP_STATUS');
+                return false;
+        }
+
+        return $this->_setstat($filename, $attr, false);
     }
 
     /**
      * Changes file or directory owner
      *
-     * $uid should be an int for SFTPv3 and a string for SFTPv4+. Ideally the string
-     * would be of the form "user@dns_domain" but it does not need to be.
-     * `$sftp->getSupportedVersions()['version']` will return the specific version
-     * that's being used.
-     *
      * Returns true on success or false on error.
      *
      * @param string $filename
-     * @param int|string $uid
+     * @param int $uid
      * @param bool $recursive
      * @return bool
+     * @access public
      */
-    public function chown($filename, $uid, $recursive = false)
+    function chown($filename, $uid, $recursive = false)
     {
-        /*
-         quoting <https://datatracker.ietf.org/doc/html/draft-ietf-secsh-filexfer-13#section-7.5>,
+        // quoting from <http://www.kernel.org/doc/man-pages/online/pages/man2/chown.2.html>,
+        // "if the owner or group is specified as -1, then that ID is not changed"
+        $attr = pack('N3', NET_SFTP_ATTR_UIDGID, $uid, -1);
 
-         "To avoid a representation that is tied to a particular underlying
-          implementation at the client or server, the use of UTF-8 strings has
-          been chosen.  The string should be of the form "user@dns_domain".
-          This will allow for a client and server that do not use the same
-          local representation the ability to translate to a common syntax that
-          can be interpreted by both.  In the case where there is no
-          translation available to the client or server, the attribute value
-          must be constructed without the "@"."
-
-         phpseclib _could_ auto append the dns_domain to $uid BUT what if it shouldn't
-         have one? phpseclib would have no way of knowing so rather than guess phpseclib
-         will just use whatever value the user provided
-       */
-
-        $attr = $this->version < 4 ?
-            // quoting <http://www.kernel.org/doc/man-pages/online/pages/man2/chown.2.html>,
-            // "if the owner or group is specified as -1, then that ID is not changed"
-            pack('N3', NET_SFTP_ATTR_UIDGID, $uid, -1) :
-            // quoting <https://datatracker.ietf.org/doc/html/draft-ietf-secsh-filexfer-13#section-7.5>,
-            // "If either the owner or group field is zero length, the field should be
-            //  considered absent, and no change should be made to that specific field
-            //  during a modification operation"
-            Strings::packSSH2('Nss', NET_SFTP_ATTR_OWNERGROUP, $uid, '');
-
-        return $this->setstat($filename, $attr, $recursive);
+        return $this->_setstat($filename, $attr, $recursive);
     }
 
     /**
      * Changes file or directory group
      *
-     * $gid should be an int for SFTPv3 and a string for SFTPv4+. Ideally the string
-     * would be of the form "user@dns_domain" but it does not need to be.
-     * `$sftp->getSupportedVersions()['version']` will return the specific version
-     * that's being used.
-     *
      * Returns true on success or false on error.
      *
      * @param string $filename
-     * @param int|string $gid
+     * @param int $gid
      * @param bool $recursive
      * @return bool
+     * @access public
      */
-    public function chgrp($filename, $gid, $recursive = false)
+    function chgrp($filename, $gid, $recursive = false)
     {
-        $attr = $this->version < 4 ?
-            pack('N3', NET_SFTP_ATTR_UIDGID, -1, $gid) :
-            Strings::packSSH2('Nss', NET_SFTP_ATTR_OWNERGROUP, '', $gid);
+        $attr = pack('N3', NET_SFTP_ATTR_UIDGID, -1, $gid);
 
-        return $this->setstat($filename, $attr, $recursive);
+        return $this->_setstat($filename, $attr, $recursive);
     }
 
     /**
@@ -1670,10 +1409,10 @@ class SFTP extends SSH2
      * @param int $mode
      * @param string $filename
      * @param bool $recursive
-     * @throws \UnexpectedValueException on receipt of unexpected packets
      * @return mixed
+     * @access public
      */
-    public function chmod($mode, $filename, $recursive = false)
+    function chmod($mode, $filename, $recursive = false)
     {
         if (is_string($mode) && is_int($filename)) {
             $temp = $mode;
@@ -1682,32 +1421,34 @@ class SFTP extends SSH2
         }
 
         $attr = pack('N2', NET_SFTP_ATTR_PERMISSIONS, $mode & 07777);
-        if (!$this->setstat($filename, $attr, $recursive)) {
+        if (!$this->_setstat($filename, $attr, $recursive)) {
             return false;
         }
         if ($recursive) {
             return true;
         }
 
-        $filename = $this->realpath($filename);
+        $filename = $this->_realPath($filename);
         // rather than return what the permissions *should* be, we'll return what they actually are.  this will also
         // tell us if the file actually exists.
         // incidentally, SFTPv4+ adds an additional 32-bit integer field - flags - to the following:
         $packet = pack('Na*', strlen($filename), $filename);
-        $this->send_sftp_packet(NET_SFTP_STAT, $packet);
+        if (!$this->_send_sftp_packet(NET_SFTP_STAT, $packet)) {
+            return false;
+        }
 
-        $response = $this->get_sftp_packet();
+        $response = $this->_get_sftp_packet();
         switch ($this->packet_type) {
             case NET_SFTP_ATTRS:
-                $attrs = $this->parseAttributes($response);
-                return $attrs['mode'];
+                $attrs = $this->_parseAttributes($response);
+                return $attrs['permissions'];
             case NET_SFTP_STATUS:
-                $this->logError($response);
+                $this->_logError($response);
                 return false;
         }
 
-        throw new \UnexpectedValueException('Expected NET_SFTP_ATTRS or NET_SFTP_STATUS. '
-                                          . 'Got packet type: ' . $this->packet_type);
+        user_error('Expected SSH_FXP_ATTRS or SSH_FXP_STATUS');
+        return false;
     }
 
     /**
@@ -1716,34 +1457,34 @@ class SFTP extends SSH2
      * @param string $filename
      * @param string $attr
      * @param bool $recursive
-     * @throws \UnexpectedValueException on receipt of unexpected packets
      * @return bool
+     * @access private
      */
-    private function setstat($filename, $attr, $recursive)
+    function _setstat($filename, $attr, $recursive)
     {
-        if (!$this->precheck()) {
+        if (!($this->bitmap & SSH2::MASK_LOGIN)) {
             return false;
         }
 
-        $filename = $this->realpath($filename);
+        $filename = $this->_realpath($filename);
         if ($filename === false) {
             return false;
         }
 
-        $this->remove_from_stat_cache($filename);
+        $this->_remove_from_stat_cache($filename);
 
         if ($recursive) {
             $i = 0;
-            $result = $this->setstat_recursive($filename, $attr, $i);
-            $this->read_put_responses($i);
+            $result = $this->_setstat_recursive($filename, $attr, $i);
+            $this->_read_put_responses($i);
             return $result;
         }
 
-        $packet = Strings::packSSH2('s', $filename);
-        $packet .= $this->version >= 4 ?
-            pack('a*Ca*', substr($attr, 0, 4), NET_SFTP_TYPE_UNKNOWN, substr($attr, 4)) :
-            $attr;
-        $this->send_sftp_packet(NET_SFTP_SETSTAT, $packet);
+        // SFTPv4+ has an additional byte field - type - that would need to be sent, as well. setting it to
+        // SSH_FILEXFER_TYPE_UNKNOWN might work. if not, we'd have to do an SSH_FXP_STAT before doing an SSH_FXP_SETSTAT.
+        if (!$this->_send_sftp_packet(NET_SFTP_SETSTAT, pack('Na*a*', strlen($filename), $filename, $attr))) {
+            return false;
+        }
 
         /*
          "Because some systems must use separate system calls to set various attributes, it is possible that a failure
@@ -1752,15 +1493,15 @@ class SFTP extends SSH2
 
           -- http://tools.ietf.org/html/draft-ietf-secsh-filexfer-13#section-8.6
         */
-        $response = $this->get_sftp_packet();
+        $response = $this->_get_sftp_packet();
         if ($this->packet_type != NET_SFTP_STATUS) {
-            throw new \UnexpectedValueException('Expected NET_SFTP_STATUS. '
-                                              . 'Got packet type: ' . $this->packet_type);
+            user_error('Expected SSH_FXP_STATUS');
+            return false;
         }
 
-        list($status) = Strings::unpackSSH2('N', $response);
+        extract(unpack('Nstatus', $this->_string_shift($response, 4)));
         if ($status != NET_SFTP_STATUS_OK) {
-            $this->logError($response, $status);
+            $this->_logError($response, $status);
             return false;
         }
 
@@ -1776,17 +1517,18 @@ class SFTP extends SSH2
      * @param string $attr
      * @param int $i
      * @return bool
+     * @access private
      */
-    private function setstat_recursive($path, $attr, &$i)
+    function _setstat_recursive($path, $attr, &$i)
     {
-        if (!$this->read_put_responses($i)) {
+        if (!$this->_read_put_responses($i)) {
             return false;
         }
         $i = 0;
-        $entries = $this->readlist($path, true);
+        $entries = $this->_list($path, true);
 
-        if ($entries === false || is_int($entries)) {
-            return $this->setstat($path, $attr, false);
+        if ($entries === false) {
+            return $this->_setstat($path, $attr, false);
         }
 
         // normally $entries would have at least . and .. but it might not if the directories
@@ -1803,20 +1545,18 @@ class SFTP extends SSH2
 
             $temp = $path . '/' . $filename;
             if ($props['type'] == NET_SFTP_TYPE_DIRECTORY) {
-                if (!$this->setstat_recursive($temp, $attr, $i)) {
+                if (!$this->_setstat_recursive($temp, $attr, $i)) {
                     return false;
                 }
             } else {
-                $packet = Strings::packSSH2('s', $temp);
-                $packet .= $this->version >= 4 ?
-                    pack('Ca*', NET_SFTP_TYPE_UNKNOWN, $attr) :
-                    $attr;
-                $this->send_sftp_packet(NET_SFTP_SETSTAT, $packet);
+                if (!$this->_send_sftp_packet(NET_SFTP_SETSTAT, pack('Na*a*', strlen($temp), $temp, $attr))) {
+                    return false;
+                }
 
                 $i++;
 
                 if ($i >= NET_SFTP_QUEUE_SIZE) {
-                    if (!$this->read_put_responses($i)) {
+                    if (!$this->_read_put_responses($i)) {
                         return false;
                     }
                     $i = 0;
@@ -1824,16 +1564,14 @@ class SFTP extends SSH2
             }
         }
 
-        $packet = Strings::packSSH2('s', $path);
-        $packet .= $this->version >= 4 ?
-            pack('Ca*', NET_SFTP_TYPE_UNKNOWN, $attr) :
-            $attr;
-        $this->send_sftp_packet(NET_SFTP_SETSTAT, $packet);
+        if (!$this->_send_sftp_packet(NET_SFTP_SETSTAT, pack('Na*a*', strlen($path), $path, $attr))) {
+            return false;
+        }
 
         $i++;
 
         if ($i >= NET_SFTP_QUEUE_SIZE) {
-            if (!$this->read_put_responses($i)) {
+            if (!$this->_read_put_responses($i)) {
                 return false;
             }
             $i = 0;
@@ -1846,40 +1584,41 @@ class SFTP extends SSH2
      * Return the target of a symbolic link
      *
      * @param string $link
-     * @throws \UnexpectedValueException on receipt of unexpected packets
      * @return mixed
+     * @access public
      */
-    public function readlink($link)
+    function readlink($link)
     {
-        if (!$this->precheck()) {
+        if (!($this->bitmap & SSH2::MASK_LOGIN)) {
             return false;
         }
 
-        $link = $this->realpath($link);
+        $link = $this->_realpath($link);
 
-        $this->send_sftp_packet(NET_SFTP_READLINK, Strings::packSSH2('s', $link));
+        if (!$this->_send_sftp_packet(NET_SFTP_READLINK, pack('Na*', strlen($link), $link))) {
+            return false;
+        }
 
-        $response = $this->get_sftp_packet();
+        $response = $this->_get_sftp_packet();
         switch ($this->packet_type) {
             case NET_SFTP_NAME:
                 break;
             case NET_SFTP_STATUS:
-                $this->logError($response);
+                $this->_logError($response);
                 return false;
             default:
-                throw new \UnexpectedValueException('Expected NET_SFTP_NAME or NET_SFTP_STATUS. '
-                                                  . 'Got packet type: ' . $this->packet_type);
+                user_error('Expected SSH_FXP_NAME or SSH_FXP_STATUS');
+                return false;
         }
 
-        list($count) = Strings::unpackSSH2('N', $response);
+        extract(unpack('Ncount', $this->_string_shift($response, 4)));
         // the file isn't a symlink
         if (!$count) {
             return false;
         }
 
-        list($filename) = Strings::unpackSSH2('s', $response);
-
-        return $filename;
+        extract(unpack('Nlength', $this->_string_shift($response, 4)));
+        return $this->_string_shift($response, $length);
     }
 
     /**
@@ -1889,59 +1628,32 @@ class SFTP extends SSH2
      *
      * @param string $target
      * @param string $link
-     * @throws \UnexpectedValueException on receipt of unexpected packets
      * @return bool
+     * @access public
      */
-    public function symlink($target, $link)
+    function symlink($target, $link)
     {
-        if (!$this->precheck()) {
+        if (!($this->bitmap & SSH2::MASK_LOGIN)) {
             return false;
         }
 
-        //$target = $this->realpath($target);
-        $link = $this->realpath($link);
+        //$target = $this->_realpath($target);
+        $link = $this->_realpath($link);
 
-        /* quoting https://datatracker.ietf.org/doc/html/draft-ietf-secsh-filexfer-09#section-12.1 :
-
-           Changed the SYMLINK packet to be LINK and give it the ability to
-           create hard links.  Also change it's packet number because many
-           implementation implemented SYMLINK with the arguments reversed.
-           Hopefully the new argument names make it clear which way is which.
-        */
-        if ($this->version == 6) {
-            $type = NET_SFTP_LINK;
-            $packet = Strings::packSSH2('ssC', $link, $target, 1);
-        } else {
-            $type = NET_SFTP_SYMLINK;
-            /* quoting http://bxr.su/OpenBSD/usr.bin/ssh/PROTOCOL#347 :
-
-               3.1. sftp: Reversal of arguments to SSH_FXP_SYMLINK
-
-               When OpenSSH's sftp-server was implemented, the order of the arguments
-               to the SSH_FXP_SYMLINK method was inadvertently reversed. Unfortunately,
-               the reversal was not noticed until the server was widely deployed. Since
-               fixing this to follow the specification would cause incompatibility, the
-               current order was retained. For correct operation, clients should send
-               SSH_FXP_SYMLINK as follows:
-
-                   uint32      id
-                   string      targetpath
-                   string      linkpath */
-            $packet = substr($this->server_identifier, 0, 15) == 'SSH-2.0-OpenSSH' ?
-                Strings::packSSH2('ss', $target, $link) :
-                Strings::packSSH2('ss', $link, $target);
+        $packet = pack('Na*Na*', strlen($target), $target, strlen($link), $link);
+        if (!$this->_send_sftp_packet(NET_SFTP_SYMLINK, $packet)) {
+            return false;
         }
-        $this->send_sftp_packet($type, $packet);
 
-        $response = $this->get_sftp_packet();
+        $response = $this->_get_sftp_packet();
         if ($this->packet_type != NET_SFTP_STATUS) {
-            throw new \UnexpectedValueException('Expected NET_SFTP_STATUS. '
-                                              . 'Got packet type: ' . $this->packet_type);
+            user_error('Expected SSH_FXP_STATUS');
+            return false;
         }
 
-        list($status) = Strings::unpackSSH2('N', $response);
+        extract(unpack('Nstatus', $this->_string_shift($response, 4)));
         if ($status != NET_SFTP_STATUS_OK) {
-            $this->logError($response, $status);
+            $this->_logError($response, $status);
             return false;
         }
 
@@ -1952,17 +1664,19 @@ class SFTP extends SSH2
      * Creates a directory.
      *
      * @param string $dir
-     * @param int $mode
-     * @param bool $recursive
      * @return bool
+     * @access public
      */
-    public function mkdir($dir, $mode = -1, $recursive = false)
+    function mkdir($dir, $mode = -1, $recursive = false)
     {
-        if (!$this->precheck()) {
+        if (!($this->bitmap & SSH2::MASK_LOGIN)) {
             return false;
         }
 
-        $dir = $this->realpath($dir);
+        $dir = $this->_realpath($dir);
+        // by not providing any permissions, hopefully the server will use the logged in users umask - their
+        // default permissions.
+        $attr = $mode == -1 ? "\0\0\0\0" : pack('N2', NET_SFTP_ATTR_PERMISSIONS, $mode & 07777);
 
         if ($recursive) {
             $dirs = explode('/', preg_replace('#/(?=/)|/$#', '', $dir));
@@ -1973,40 +1687,37 @@ class SFTP extends SSH2
             for ($i = 0; $i < count($dirs); $i++) {
                 $temp = array_slice($dirs, 0, $i + 1);
                 $temp = implode('/', $temp);
-                $result = $this->mkdir_helper($temp, $mode);
+                $result = $this->_mkdir_helper($temp, $attr);
             }
             return $result;
         }
 
-        return $this->mkdir_helper($dir, $mode);
+        return $this->_mkdir_helper($dir, $attr);
     }
 
     /**
      * Helper function for directory creation
      *
      * @param string $dir
-     * @param int $mode
      * @return bool
+     * @access private
      */
-    private function mkdir_helper($dir, $mode)
+    function _mkdir_helper($dir, $attr)
     {
-        // send SSH_FXP_MKDIR without any attributes (that's what the \0\0\0\0 is doing)
-        $this->send_sftp_packet(NET_SFTP_MKDIR, Strings::packSSH2('s', $dir) . "\0\0\0\0");
-
-        $response = $this->get_sftp_packet();
-        if ($this->packet_type != NET_SFTP_STATUS) {
-            throw new \UnexpectedValueException('Expected NET_SFTP_STATUS. '
-                                              . 'Got packet type: ' . $this->packet_type);
-        }
-
-        list($status) = Strings::unpackSSH2('N', $response);
-        if ($status != NET_SFTP_STATUS_OK) {
-            $this->logError($response, $status);
+        if (!$this->_send_sftp_packet(NET_SFTP_MKDIR, pack('Na*a*', strlen($dir), $dir, $attr))) {
             return false;
         }
 
-        if ($mode !== -1) {
-            $this->chmod($mode, $dir);
+        $response = $this->_get_sftp_packet();
+        if ($this->packet_type != NET_SFTP_STATUS) {
+            user_error('Expected SSH_FXP_STATUS');
+            return false;
+        }
+
+        extract(unpack('Nstatus', $this->_string_shift($response, 4)));
+        if ($status != NET_SFTP_STATUS_OK) {
+            $this->_logError($response, $status);
+            return false;
         }
 
         return true;
@@ -2016,40 +1727,42 @@ class SFTP extends SSH2
      * Removes a directory.
      *
      * @param string $dir
-     * @throws \UnexpectedValueException on receipt of unexpected packets
      * @return bool
+     * @access public
      */
-    public function rmdir($dir)
+    function rmdir($dir)
     {
-        if (!$this->precheck()) {
+        if (!($this->bitmap & SSH2::MASK_LOGIN)) {
             return false;
         }
 
-        $dir = $this->realpath($dir);
+        $dir = $this->_realpath($dir);
         if ($dir === false) {
             return false;
         }
 
-        $this->send_sftp_packet(NET_SFTP_RMDIR, Strings::packSSH2('s', $dir));
-
-        $response = $this->get_sftp_packet();
-        if ($this->packet_type != NET_SFTP_STATUS) {
-            throw new \UnexpectedValueException('Expected NET_SFTP_STATUS. '
-                                              . 'Got packet type: ' . $this->packet_type);
-        }
-
-        list($status) = Strings::unpackSSH2('N', $response);
-        if ($status != NET_SFTP_STATUS_OK) {
-            // presumably SSH_FX_NO_SUCH_FILE or SSH_FX_PERMISSION_DENIED?
-            $this->logError($response, $status);
+        if (!$this->_send_sftp_packet(NET_SFTP_RMDIR, pack('Na*', strlen($dir), $dir))) {
             return false;
         }
 
-        $this->remove_from_stat_cache($dir);
+        $response = $this->_get_sftp_packet();
+        if ($this->packet_type != NET_SFTP_STATUS) {
+            user_error('Expected SSH_FXP_STATUS');
+            return false;
+        }
+
+        extract(unpack('Nstatus', $this->_string_shift($response, 4)));
+        if ($status != NET_SFTP_STATUS_OK) {
+            // presumably SSH_FX_NO_SUCH_FILE or SSH_FX_PERMISSION_DENIED?
+            $this->_logError($response, $status);
+            return false;
+        }
+
+        $this->_remove_from_stat_cache($dir);
         // the following will do a soft delete, which would be useful if you deleted a file
         // and then tried to do a stat on the deleted file. the above, in contrast, does
         // a hard delete
-        //$this->update_stat_cache($dir, false);
+        //$this->_update_stat_cache($dir, false);
 
         return true;
     }
@@ -2057,16 +1770,15 @@ class SFTP extends SSH2
     /**
      * Uploads a file to the SFTP server.
      *
-     * By default, \phpseclib3\Net\SFTP::put() does not read from the local filesystem.  $data is dumped directly into $remote_file.
-     * So, for example, if you set $data to 'filename.ext' and then do \phpseclib3\Net\SFTP::get(), you will get a file, twelve bytes
+     * By default, \phpseclib\Net\SFTP::put() does not read from the local filesystem.  $data is dumped directly into $remote_file.
+     * So, for example, if you set $data to 'filename.ext' and then do \phpseclib\Net\SFTP::get(), you will get a file, twelve bytes
      * long, containing 'filename.ext' as its contents.
      *
      * Setting $mode to self::SOURCE_LOCAL_FILE will change the above behavior.  With self::SOURCE_LOCAL_FILE, $remote_file will
      * contain as many bytes as filename.ext does on your local filesystem.  If your filename.ext is 1MB then that is how
      * large $remote_file will be, as well.
      *
-     * Setting $mode to self::SOURCE_CALLBACK will use $data as callback function, which gets only one parameter -- number
-     * of bytes to return, and returns a string if there is some data or null if there is no more data
+     * Setting $mode to self::SOURCE_CALLBACK will use $data as callback function, which gets only one parameter -- number of bytes to return, and returns a string if there is some data or null if there is no more data
      *
      * If $data is a resource then it'll be used as a resource instead.
      *
@@ -2090,75 +1802,61 @@ class SFTP extends SSH2
      *
      * Setting $local_start to > 0 or $mode | self::RESUME_START doesn't do anything unless $mode | self::SOURCE_LOCAL_FILE.
      *
-     * {@internal ASCII mode for SFTPv4/5/6 can be supported by adding a new function - \phpseclib3\Net\SFTP::setMode().}
-     *
      * @param string $remote_file
      * @param string|resource $data
      * @param int $mode
      * @param int $start
      * @param int $local_start
      * @param callable|null $progressCallback
-     * @throws \UnexpectedValueException on receipt of unexpected packets
-     * @throws \BadFunctionCallException if you're uploading via a callback and the callback function is invalid
-     * @throws \phpseclib3\Exception\FileNotFoundException if you're uploading via a file and the file doesn't exist
      * @return bool
+     * @access public
+     * @internal ASCII mode for SFTPv4/5/6 can be supported by adding a new function - \phpseclib\Net\SFTP::setMode().
      */
-    public function put($remote_file, $data, $mode = self::SOURCE_STRING, $start = -1, $local_start = -1, $progressCallback = null)
+    function put($remote_file, $data, $mode = self::SOURCE_STRING, $start = -1, $local_start = -1, $progressCallback = null)
     {
-        if (!$this->precheck()) {
+        if (!($this->bitmap & SSH2::MASK_LOGIN)) {
             return false;
         }
 
-        $remote_file = $this->realpath($remote_file);
+        $remote_file = $this->_realpath($remote_file);
         if ($remote_file === false) {
             return false;
         }
 
-        $this->remove_from_stat_cache($remote_file);
+        $this->_remove_from_stat_cache($remote_file);
 
-        if ($this->version >= 5) {
-            $flags = NET_SFTP_OPEN_OPEN_OR_CREATE;
-        } else {
-            $flags = NET_SFTP_OPEN_WRITE | NET_SFTP_OPEN_CREATE;
-            // according to the SFTP specs, NET_SFTP_OPEN_APPEND should "force all writes to append data at the end of the file."
-            // in practice, it doesn't seem to do that.
-            //$flags|= ($mode & self::RESUME) ? NET_SFTP_OPEN_APPEND : NET_SFTP_OPEN_TRUNCATE;
-        }
+        $flags = NET_SFTP_OPEN_WRITE | NET_SFTP_OPEN_CREATE;
+        // according to the SFTP specs, NET_SFTP_OPEN_APPEND should "force all writes to append data at the end of the file."
+        // in practice, it doesn't seem to do that.
+        //$flags|= ($mode & self::RESUME) ? NET_SFTP_OPEN_APPEND : NET_SFTP_OPEN_TRUNCATE;
 
         if ($start >= 0) {
             $offset = $start;
-        } elseif ($mode & (self::RESUME | self::RESUME_START)) {
+        } elseif ($mode & self::RESUME) {
             // if NET_SFTP_OPEN_APPEND worked as it should _size() wouldn't need to be called
-            $stat = $this->stat($remote_file);
-            $offset = $stat !== false && $stat['size'] ? $stat['size'] : 0;
+            $size = $this->size($remote_file);
+            $offset = $size !== false ? $size : 0;
         } else {
             $offset = 0;
-            if ($this->version >= 5) {
-                $flags = NET_SFTP_OPEN_CREATE_TRUNCATE;
-            } else {
-                $flags |= NET_SFTP_OPEN_TRUNCATE;
-            }
+            $flags|= NET_SFTP_OPEN_TRUNCATE;
         }
 
-        $this->remove_from_stat_cache($remote_file);
+        $packet = pack('Na*N2', strlen($remote_file), $remote_file, $flags, 0);
+        if (!$this->_send_sftp_packet(NET_SFTP_OPEN, $packet)) {
+            return false;
+        }
 
-        $packet = Strings::packSSH2('s', $remote_file);
-        $packet .= $this->version >= 5 ?
-            pack('N3', 0, $flags, 0) :
-            pack('N2', $flags, 0);
-        $this->send_sftp_packet(NET_SFTP_OPEN, $packet);
-
-        $response = $this->get_sftp_packet();
+        $response = $this->_get_sftp_packet();
         switch ($this->packet_type) {
             case NET_SFTP_HANDLE:
                 $handle = substr($response, 4);
                 break;
             case NET_SFTP_STATUS:
-                $this->logError($response);
+                $this->_logError($response);
                 return false;
             default:
-                throw new \UnexpectedValueException('Expected NET_SFTP_HANDLE or NET_SFTP_STATUS. '
-                                                  . 'Got packet type: ' . $this->packet_type);
+                user_error('Expected SSH_FXP_HANDLE or SSH_FXP_STATUS');
+                return false;
         }
 
         // http://tools.ietf.org/html/draft-ietf-secsh-filexfer-13#section-8.2.3
@@ -2166,25 +1864,19 @@ class SFTP extends SSH2
         switch (true) {
             case $mode & self::SOURCE_CALLBACK:
                 if (!is_callable($data)) {
-                    throw new \BadFunctionCallException("\$data should be is_callable() if you specify SOURCE_CALLBACK flag");
+                    user_error("\$data should be is_callable() if you specify SOURCE_CALLBACK flag");
                 }
                 $dataCallback = $data;
                 // do nothing
                 break;
             case is_resource($data):
                 $mode = $mode & ~self::SOURCE_LOCAL_FILE;
-                $info = stream_get_meta_data($data);
-                if (isset($info['wrapper_type']) && $info['wrapper_type'] == 'PHP' && $info['stream_type'] == 'Input') {
-                    $fp = fopen('php://memory', 'w+');
-                    stream_copy_to_stream($data, $fp);
-                    rewind($fp);
-                } else {
-                    $fp = $data;
-                }
+                $fp = $data;
                 break;
             case $mode & self::SOURCE_LOCAL_FILE:
                 if (!is_file($data)) {
-                    throw new FileNotFoundException("$data is not a valid file");
+                    user_error("$data is not a valid file");
+                    return false;
                 }
                 $fp = @fopen($data, 'rb');
                 if (!$fp) {
@@ -2194,14 +1886,11 @@ class SFTP extends SSH2
 
         if (isset($fp)) {
             $stat = fstat($fp);
-            $size = !empty($stat) ? $stat['size'] : 0;
+            $size = $stat['size'];
 
             if ($local_start >= 0) {
                 fseek($fp, $local_start);
-                $size -= $local_start;
-            } elseif ($mode & self::RESUME) {
-                fseek($fp, $offset);
-                $size -= $offset;
+                $size-= $local_start;
             }
         } elseif ($dataCallback) {
             $size = 0;
@@ -2212,13 +1901,13 @@ class SFTP extends SSH2
         $sent = 0;
         $size = $size < 0 ? ($size & 0x7FFFFFFF) + 0x80000000 : $size;
 
-        $sftp_packet_size = $this->max_sftp_packet;
-        // make the SFTP packet be exactly the SFTP packet size by including the bytes in the NET_SFTP_WRITE packets "header"
-        $sftp_packet_size -= strlen($handle) + 25;
-        $i = $j = 0;
+        $sftp_packet_size = 4096; // PuTTY uses 4096
+        // make the SFTP packet be exactly 4096 bytes by including the bytes in the NET_SFTP_WRITE packets "header"
+        $sftp_packet_size-= strlen($handle) + 25;
+        $i = 0;
         while ($dataCallback || ($size === 0 || $sent < $size)) {
             if ($dataCallback) {
-                $temp = $dataCallback($sftp_packet_size);
+                $temp = call_user_func($dataCallback, $sftp_packet_size);
                 if (is_null($temp)) {
                     break;
                 }
@@ -2231,23 +1920,21 @@ class SFTP extends SSH2
 
             $subtemp = $offset + $sent;
             $packet = pack('Na*N3a*', strlen($handle), $handle, $subtemp / 4294967296, $subtemp, strlen($temp), $temp);
-            try {
-                $this->send_sftp_packet(NET_SFTP_WRITE, $packet, $j);
-            } catch (\Exception $e) {
+            if (!$this->_send_sftp_packet(NET_SFTP_WRITE, $packet)) {
                 if ($mode & self::SOURCE_LOCAL_FILE) {
                     fclose($fp);
                 }
-                throw $e;
+                return false;
             }
-            $sent += strlen($temp);
+            $sent+= strlen($temp);
             if (is_callable($progressCallback)) {
-                $progressCallback($sent);
+                call_user_func($progressCallback, $sent);
             }
 
             $i++;
-            $j++;
-            if ($i == NET_SFTP_UPLOAD_QUEUE_SIZE) {
-                if (!$this->read_put_responses($i)) {
+
+            if ($i == NET_SFTP_QUEUE_SIZE) {
+                if (!$this->_read_put_responses($i)) {
                     $i = 0;
                     break;
                 }
@@ -2255,33 +1942,19 @@ class SFTP extends SSH2
             }
         }
 
-        $result = $this->close_handle($handle);
-
-        if (!$this->read_put_responses($i)) {
+        if (!$this->_read_put_responses($i)) {
             if ($mode & self::SOURCE_LOCAL_FILE) {
                 fclose($fp);
             }
-            $this->close_handle($handle);
+            $this->_close_handle($handle);
             return false;
         }
 
-        if ($mode & SFTP::SOURCE_LOCAL_FILE) {
-            if (isset($fp) && is_resource($fp)) {
-                fclose($fp);
-            }
-
-            if ($this->preserveTime) {
-                $stat = stat($data);
-                $attr = $this->version < 4 ?
-                    pack('N3', NET_SFTP_ATTR_ACCESSTIME, $stat['atime'], $stat['mtime']) :
-                    Strings::packSSH2('NQ2', NET_SFTP_ATTR_ACCESSTIME | NET_SFTP_ATTR_MODIFYTIME, $stat['atime'], $stat['mtime']);
-                if (!$this->setstat($remote_file, $attr, false)) {
-                    throw new \RuntimeException('Error setting file time');
-                }
-            }
+        if ($mode & self::SOURCE_LOCAL_FILE) {
+            fclose($fp);
         }
 
-        return $result;
+        return $this->_close_handle($handle);
     }
 
     /**
@@ -2292,20 +1965,20 @@ class SFTP extends SSH2
      *
      * @param int $i
      * @return bool
-     * @throws \UnexpectedValueException on receipt of unexpected packets
+     * @access private
      */
-    private function read_put_responses($i)
+    function _read_put_responses($i)
     {
         while ($i--) {
-            $response = $this->get_sftp_packet();
+            $response = $this->_get_sftp_packet();
             if ($this->packet_type != NET_SFTP_STATUS) {
-                throw new \UnexpectedValueException('Expected NET_SFTP_STATUS. '
-                                                  . 'Got packet type: ' . $this->packet_type);
+                user_error('Expected SSH_FXP_STATUS');
+                return false;
             }
 
-            list($status) = Strings::unpackSSH2('N', $response);
+            extract(unpack('Nstatus', $this->_string_shift($response, 4)));
             if ($status != NET_SFTP_STATUS_OK) {
-                $this->logError($response, $status);
+                $this->_logError($response, $status);
                 break;
             }
         }
@@ -2318,23 +1991,25 @@ class SFTP extends SSH2
      *
      * @param string $handle
      * @return bool
-     * @throws \UnexpectedValueException on receipt of unexpected packets
+     * @access private
      */
-    private function close_handle($handle)
+    function _close_handle($handle)
     {
-        $this->send_sftp_packet(NET_SFTP_CLOSE, pack('Na*', strlen($handle), $handle));
+        if (!$this->_send_sftp_packet(NET_SFTP_CLOSE, pack('Na*', strlen($handle), $handle))) {
+            return false;
+        }
 
         // "The client MUST release all resources associated with the handle regardless of the status."
         //  -- http://tools.ietf.org/html/draft-ietf-secsh-filexfer-13#section-8.1.3
-        $response = $this->get_sftp_packet();
+        $response = $this->_get_sftp_packet();
         if ($this->packet_type != NET_SFTP_STATUS) {
-            throw new \UnexpectedValueException('Expected NET_SFTP_STATUS. '
-                                              . 'Got packet type: ' . $this->packet_type);
+            user_error('Expected SSH_FXP_STATUS');
+            return false;
         }
 
-        list($status) = Strings::unpackSSH2('N', $response);
+        extract(unpack('Nstatus', $this->_string_shift($response, 4)));
         if ($status != NET_SFTP_STATUS_OK) {
-            $this->logError($response, $status);
+            $this->_logError($response, $status);
             return false;
         }
 
@@ -2351,41 +2026,39 @@ class SFTP extends SSH2
      * $offset and $length can be used to download files in chunks.
      *
      * @param string $remote_file
-     * @param string|bool|resource|callable $local_file
+     * @param string $local_file
      * @param int $offset
      * @param int $length
-     * @param callable|null $progressCallback
-     * @throws \UnexpectedValueException on receipt of unexpected packets
-     * @return string|bool
+     * @return mixed
+     * @access public
      */
-    public function get($remote_file, $local_file = false, $offset = 0, $length = -1, $progressCallback = null)
+    function get($remote_file, $local_file = false, $offset = 0, $length = -1)
     {
-        if (!$this->precheck()) {
+        if (!($this->bitmap & SSH2::MASK_LOGIN)) {
             return false;
         }
 
-        $remote_file = $this->realpath($remote_file);
+        $remote_file = $this->_realpath($remote_file);
         if ($remote_file === false) {
             return false;
         }
 
-        $packet = Strings::packSSH2('s', $remote_file);
-        $packet .= $this->version >= 5 ?
-            pack('N3', 0, NET_SFTP_OPEN_OPEN_EXISTING, 0) :
-            pack('N2', NET_SFTP_OPEN_READ, 0);
-        $this->send_sftp_packet(NET_SFTP_OPEN, $packet);
+        $packet = pack('Na*N2', strlen($remote_file), $remote_file, NET_SFTP_OPEN_READ, 0);
+        if (!$this->_send_sftp_packet(NET_SFTP_OPEN, $packet)) {
+            return false;
+        }
 
-        $response = $this->get_sftp_packet();
+        $response = $this->_get_sftp_packet();
         switch ($this->packet_type) {
             case NET_SFTP_HANDLE:
                 $handle = substr($response, 4);
                 break;
             case NET_SFTP_STATUS: // presumably SSH_FX_NO_SUCH_FILE or SSH_FX_PERMISSION_DENIED
-                $this->logError($response);
+                $this->_logError($response);
                 return false;
             default:
-                throw new \UnexpectedValueException('Expected NET_SFTP_HANDLE or NET_SFTP_STATUS. '
-                                                  . 'Got packet type: ' . $this->packet_type);
+                user_error('Expected SSH_FXP_HANDLE or SSH_FXP_STATUS');
+                return false;
         }
 
         if (is_resource($local_file)) {
@@ -2394,7 +2067,7 @@ class SFTP extends SSH2
             $res_offset = $stat['size'];
         } else {
             $res_offset = 0;
-            if ($local_file !== false && !is_callable($local_file)) {
+            if ($local_file !== false) {
                 $fp = fopen($local_file, 'wb');
                 if (!$fp) {
                     return false;
@@ -2404,7 +2077,7 @@ class SFTP extends SSH2
             }
         }
 
-        $fclose_check = $local_file !== false && !is_callable($local_file) && !is_resource($local_file);
+        $fclose_check = $local_file !== false && !is_resource($local_file);
 
         $start = $offset;
         $read = 0;
@@ -2416,17 +2089,15 @@ class SFTP extends SSH2
 
                 $packet_size = $length > 0 ? min($this->max_sftp_packet, $length - $read) : $this->max_sftp_packet;
 
-                $packet = Strings::packSSH2('sN3', $handle, $tempoffset / 4294967296, $tempoffset, $packet_size);
-                try {
-                    $this->send_sftp_packet(NET_SFTP_READ, $packet, $i);
-                } catch (\Exception $e) {
+                $packet = pack('Na*N3', strlen($handle), $handle, $tempoffset / 4294967296, $tempoffset, $packet_size);
+                if (!$this->_send_sftp_packet(NET_SFTP_READ, $packet)) {
                     if ($fclose_check) {
                         fclose($fp);
                     }
-                    throw $e;
+                    return false;
                 }
                 $packet = null;
-                $read += $packet_size;
+                $read+= $packet_size;
                 $i++;
             }
 
@@ -2434,52 +2105,38 @@ class SFTP extends SSH2
                 break;
             }
 
-            $packets_sent = $i - 1;
-
             $clear_responses = false;
             while ($i > 0) {
                 $i--;
 
                 if ($clear_responses) {
-                    $this->get_sftp_packet($packets_sent - $i);
+                    $this->_get_sftp_packet();
                     continue;
                 } else {
-                    $response = $this->get_sftp_packet($packets_sent - $i);
+                    $response = $this->_get_sftp_packet();
                 }
 
                 switch ($this->packet_type) {
                     case NET_SFTP_DATA:
                         $temp = substr($response, 4);
-                        $offset += strlen($temp);
+                        $offset+= strlen($temp);
                         if ($local_file === false) {
-                            $content .= $temp;
-                        } elseif (is_callable($local_file)) {
-                            $local_file($temp);
+                            $content.= $temp;
                         } else {
                             fputs($fp, $temp);
                         }
-                        if (is_callable($progressCallback)) {
-                            call_user_func($progressCallback, $offset);
-                        }
                         $temp = null;
                         break;
                     case NET_SFTP_STATUS:
                         // could, in theory, return false if !strlen($content) but we'll hold off for the time being
-                        $this->logError($response);
+                        $this->_logError($response);
                         $clear_responses = true; // don't break out of the loop yet, so we can read the remaining responses
                         break;
                     default:
                         if ($fclose_check) {
                             fclose($fp);
                         }
-                        if ($this->channel_close) {
-                            $this->partial_init = false;
-                            $this->init_sftp_connection();
-                            return false;
-                        } else {
-                            throw new \UnexpectedValueException('Expected NET_SFTP_DATA or NET_SFTP_STATUS. '
-                                                              . 'Got packet type: ' . $this->packet_type);
-                        }
+                        user_error('Expected SSH_FX_DATA or SSH_FXP_STATUS');
                 }
                 $response = null;
             }
@@ -2489,16 +2146,19 @@ class SFTP extends SSH2
             }
         }
 
-        if ($fclose_check) {
-            fclose($fp);
-
-            if ($this->preserveTime) {
-                $stat = $this->stat($remote_file);
-                touch($local_file, $stat['mtime'], $stat['atime']);
+        if ($length > 0 && $length <= $offset - $start) {
+            if ($local_file === false) {
+                $content = substr($content, 0, $length);
+            } else {
+                ftruncate($fp, $length + $res_offset);
             }
         }
 
-        if (!$this->close_handle($handle)) {
+        if ($fclose_check) {
+            fclose($fp);
+        }
+
+        if (!$this->_close_handle($handle)) {
             return false;
         }
 
@@ -2512,52 +2172,44 @@ class SFTP extends SSH2
      * @param string $path
      * @param bool $recursive
      * @return bool
-     * @throws \UnexpectedValueException on receipt of unexpected packets
+     * @access public
      */
-    public function delete($path, $recursive = true)
+    function delete($path, $recursive = true)
     {
-        if (!$this->precheck()) {
+        if (!($this->bitmap & SSH2::MASK_LOGIN)) {
             return false;
         }
 
-        if (is_object($path)) {
-            // It's an object. Cast it as string before we check anything else.
-            $path = (string) $path;
-        }
-
-        if (!is_string($path) || $path == '') {
-            return false;
-        }
-
-        $path = $this->realpath($path);
+        $path = $this->_realpath($path);
         if ($path === false) {
             return false;
         }
 
         // http://tools.ietf.org/html/draft-ietf-secsh-filexfer-13#section-8.3
-        $this->send_sftp_packet(NET_SFTP_REMOVE, pack('Na*', strlen($path), $path));
+        if (!$this->_send_sftp_packet(NET_SFTP_REMOVE, pack('Na*', strlen($path), $path))) {
+            return false;
+        }
 
-        $response = $this->get_sftp_packet();
+        $response = $this->_get_sftp_packet();
         if ($this->packet_type != NET_SFTP_STATUS) {
-            throw new \UnexpectedValueException('Expected NET_SFTP_STATUS. '
-                                              . 'Got packet type: ' . $this->packet_type);
+            user_error('Expected SSH_FXP_STATUS');
+            return false;
         }
 
         // if $status isn't SSH_FX_OK it's probably SSH_FX_NO_SUCH_FILE or SSH_FX_PERMISSION_DENIED
-        list($status) = Strings::unpackSSH2('N', $response);
+        extract(unpack('Nstatus', $this->_string_shift($response, 4)));
         if ($status != NET_SFTP_STATUS_OK) {
-            $this->logError($response, $status);
+            $this->_logError($response, $status);
             if (!$recursive) {
                 return false;
             }
-
             $i = 0;
-            $result = $this->delete_recursive($path, $i);
-            $this->read_put_responses($i);
+            $result = $this->_delete_recursive($path, $i);
+            $this->_read_put_responses($i);
             return $result;
         }
 
-        $this->remove_from_stat_cache($path);
+        $this->_remove_from_stat_cache($path);
 
         return true;
     }
@@ -2570,26 +2222,22 @@ class SFTP extends SSH2
      * @param string $path
      * @param int $i
      * @return bool
+     * @access private
      */
-    private function delete_recursive($path, &$i)
+    function _delete_recursive($path, &$i)
     {
-        if (!$this->read_put_responses($i)) {
+        if (!$this->_read_put_responses($i)) {
             return false;
         }
         $i = 0;
-        $entries = $this->readlist($path, true);
+        $entries = $this->_list($path, true);
 
-        // The folder does not exist at all, so we cannot delete it.
-        if ($entries === NET_SFTP_STATUS_NO_SUCH_FILE) {
+        // normally $entries would have at least . and .. but it might not if the directories
+        // permissions didn't allow reading
+        if (empty($entries)) {
             return false;
         }
 
-        // Normally $entries would have at least . and .. but it might not if the directories
-        // permissions didn't allow reading. If this happens then default to an empty list of files.
-        if ($entries === false || is_int($entries)) {
-            $entries = [];
-        }
-
         unset($entries['.'], $entries['..']);
         foreach ($entries as $filename => $props) {
             if (!isset($props['type'])) {
@@ -2598,17 +2246,19 @@ class SFTP extends SSH2
 
             $temp = $path . '/' . $filename;
             if ($props['type'] == NET_SFTP_TYPE_DIRECTORY) {
-                if (!$this->delete_recursive($temp, $i)) {
+                if (!$this->_delete_recursive($temp, $i)) {
                     return false;
                 }
             } else {
-                $this->send_sftp_packet(NET_SFTP_REMOVE, Strings::packSSH2('s', $temp));
-                $this->remove_from_stat_cache($temp);
+                if (!$this->_send_sftp_packet(NET_SFTP_REMOVE, pack('Na*', strlen($temp), $temp))) {
+                    return false;
+                }
+                $this->_remove_from_stat_cache($temp);
 
                 $i++;
 
                 if ($i >= NET_SFTP_QUEUE_SIZE) {
-                    if (!$this->read_put_responses($i)) {
+                    if (!$this->_read_put_responses($i)) {
                         return false;
                     }
                     $i = 0;
@@ -2616,13 +2266,15 @@ class SFTP extends SSH2
             }
         }
 
-        $this->send_sftp_packet(NET_SFTP_RMDIR, Strings::packSSH2('s', $path));
-        $this->remove_from_stat_cache($path);
+        if (!$this->_send_sftp_packet(NET_SFTP_RMDIR, pack('Na*', strlen($path), $path))) {
+            return false;
+        }
+        $this->_remove_from_stat_cache($path);
 
         $i++;
 
         if ($i >= NET_SFTP_QUEUE_SIZE) {
-            if (!$this->read_put_responses($i)) {
+            if (!$this->_read_put_responses($i)) {
                 return false;
             }
             $i = 0;
@@ -2636,17 +2288,14 @@ class SFTP extends SSH2
      *
      * @param string $path
      * @return bool
+     * @access public
      */
-    public function file_exists($path)
+    function file_exists($path)
     {
         if ($this->use_stat_cache) {
-            if (!$this->precheck()) {
-                return false;
-            }
+            $path = $this->_realpath($path);
 
-            $path = $this->realpath($path);
-
-            $result = $this->query_stat_cache($path);
+            $result = $this->_query_stat_cache($path);
 
             if (isset($result)) {
                 // return true if $result is an array or if it's an stdClass object
@@ -2662,10 +2311,11 @@ class SFTP extends SSH2
      *
      * @param string $path
      * @return bool
+     * @access public
      */
-    public function is_dir($path)
+    function is_dir($path)
     {
-        $result = $this->get_stat_cache_prop($path, 'type');
+        $result = $this->_get_stat_cache_prop($path, 'type');
         if ($result === false) {
             return false;
         }
@@ -2677,10 +2327,11 @@ class SFTP extends SSH2
      *
      * @param string $path
      * @return bool
+     * @access public
      */
-    public function is_file($path)
+    function is_file($path)
     {
-        $result = $this->get_stat_cache_prop($path, 'type');
+        $result = $this->_get_stat_cache_prop($path, 'type');
         if ($result === false) {
             return false;
         }
@@ -2692,10 +2343,11 @@ class SFTP extends SSH2
      *
      * @param string $path
      * @return bool
+     * @access public
      */
-    public function is_link($path)
+    function is_link($path)
     {
-        $result = $this->get_lstat_cache_prop($path, 'type');
+        $result = $this->_get_lstat_cache_prop($path, 'type');
         if ($result === false) {
             return false;
         }
@@ -2707,25 +2359,26 @@ class SFTP extends SSH2
      *
      * @param string $path
      * @return bool
+     * @access public
      */
-    public function is_readable($path)
+    function is_readable($path)
     {
-        if (!$this->precheck()) {
+        $path = $this->_realpath($path);
+
+        $packet = pack('Na*N2', strlen($path), $path, NET_SFTP_OPEN_READ, 0);
+        if (!$this->_send_sftp_packet(NET_SFTP_OPEN, $packet)) {
             return false;
         }
 
-        $packet = Strings::packSSH2('sNN', $this->realpath($path), NET_SFTP_OPEN_READ, 0);
-        $this->send_sftp_packet(NET_SFTP_OPEN, $packet);
-
-        $response = $this->get_sftp_packet();
+        $response = $this->_get_sftp_packet();
         switch ($this->packet_type) {
             case NET_SFTP_HANDLE:
                 return true;
             case NET_SFTP_STATUS: // presumably SSH_FX_NO_SUCH_FILE or SSH_FX_PERMISSION_DENIED
                 return false;
             default:
-                throw new \UnexpectedValueException('Expected NET_SFTP_HANDLE or NET_SFTP_STATUS. '
-                                                  . 'Got packet type: ' . $this->packet_type);
+                user_error('Expected SSH_FXP_HANDLE or SSH_FXP_STATUS');
+                return false;
         }
     }
 
@@ -2734,25 +2387,26 @@ class SFTP extends SSH2
      *
      * @param string $path
      * @return bool
+     * @access public
      */
-    public function is_writable($path)
+    function is_writable($path)
     {
-        if (!$this->precheck()) {
+        $path = $this->_realpath($path);
+
+        $packet = pack('Na*N2', strlen($path), $path, NET_SFTP_OPEN_WRITE, 0);
+        if (!$this->_send_sftp_packet(NET_SFTP_OPEN, $packet)) {
             return false;
         }
 
-        $packet = Strings::packSSH2('sNN', $this->realpath($path), NET_SFTP_OPEN_WRITE, 0);
-        $this->send_sftp_packet(NET_SFTP_OPEN, $packet);
-
-        $response = $this->get_sftp_packet();
+        $response = $this->_get_sftp_packet();
         switch ($this->packet_type) {
             case NET_SFTP_HANDLE:
                 return true;
             case NET_SFTP_STATUS: // presumably SSH_FX_NO_SUCH_FILE or SSH_FX_PERMISSION_DENIED
                 return false;
             default:
-                throw new \UnexpectedValueException('Expected SSH_FXP_HANDLE or SSH_FXP_STATUS. '
-                                                  . 'Got packet type: ' . $this->packet_type);
+                user_error('Expected SSH_FXP_HANDLE or SSH_FXP_STATUS');
+                return false;
         }
     }
 
@@ -2763,8 +2417,9 @@ class SFTP extends SSH2
      *
      * @param string $path
      * @return bool
+     * @access public
      */
-    public function is_writeable($path)
+    function is_writeable($path)
     {
         return $this->is_writable($path);
     }
@@ -2774,10 +2429,11 @@ class SFTP extends SSH2
      *
      * @param string $path
      * @return mixed
+     * @access public
      */
-    public function fileatime($path)
+    function fileatime($path)
     {
-        return $this->get_stat_cache_prop($path, 'atime');
+        return $this->_get_stat_cache_prop($path, 'atime');
     }
 
     /**
@@ -2785,10 +2441,11 @@ class SFTP extends SSH2
      *
      * @param string $path
      * @return mixed
+     * @access public
      */
-    public function filemtime($path)
+    function filemtime($path)
     {
-        return $this->get_stat_cache_prop($path, 'mtime');
+        return $this->_get_stat_cache_prop($path, 'mtime');
     }
 
     /**
@@ -2796,10 +2453,11 @@ class SFTP extends SSH2
      *
      * @param string $path
      * @return mixed
+     * @access public
      */
-    public function fileperms($path)
+    function fileperms($path)
     {
-        return $this->get_stat_cache_prop($path, 'mode');
+        return $this->_get_stat_cache_prop($path, 'permissions');
     }
 
     /**
@@ -2807,10 +2465,11 @@ class SFTP extends SSH2
      *
      * @param string $path
      * @return mixed
+     * @access public
      */
-    public function fileowner($path)
+    function fileowner($path)
     {
-        return $this->get_stat_cache_prop($path, 'uid');
+        return $this->_get_stat_cache_prop($path, 'uid');
     }
 
     /**
@@ -2818,54 +2477,35 @@ class SFTP extends SSH2
      *
      * @param string $path
      * @return mixed
+     * @access public
      */
-    public function filegroup($path)
+    function filegroup($path)
     {
-        return $this->get_stat_cache_prop($path, 'gid');
-    }
-
-    /**
-     * Recursively go through rawlist() output to get the total filesize
-     *
-     * @return int
-     */
-    private static function recursiveFilesize(array $files)
-    {
-        $size = 0;
-        foreach ($files as $name => $file) {
-            if ($name == '.' || $name == '..') {
-                continue;
-            }
-            $size += is_array($file) ?
-                self::recursiveFilesize($file) :
-                $file->size;
-        }
-        return $size;
+        return $this->_get_stat_cache_prop($path, 'gid');
     }
 
     /**
      * Gets file size
      *
      * @param string $path
-     * @param bool $recursive
      * @return mixed
+     * @access public
      */
-    public function filesize($path, $recursive = false)
+    function filesize($path)
     {
-        return !$recursive || $this->filetype($path) != 'dir' ?
-            $this->get_stat_cache_prop($path, 'size') :
-            self::recursiveFilesize($this->rawlist($path, true));
+        return $this->_get_stat_cache_prop($path, 'size');
     }
 
     /**
      * Gets file type
      *
      * @param string $path
-     * @return string|false
+     * @return mixed
+     * @access public
      */
-    public function filetype($path)
+    function filetype($path)
     {
-        $type = $this->get_stat_cache_prop($path, 'type');
+        $type = $this->_get_stat_cache_prop($path, 'type');
         if ($type === false) {
             return false;
         }
@@ -2896,10 +2536,11 @@ class SFTP extends SSH2
      * @param string $path
      * @param string $prop
      * @return mixed
+     * @access private
      */
-    private function get_stat_cache_prop($path, $prop)
+    function _get_stat_cache_prop($path, $prop)
     {
-        return $this->get_xstat_cache_prop($path, $prop, 'stat');
+        return $this->_get_xstat_cache_prop($path, $prop, 'stat');
     }
 
     /**
@@ -2910,10 +2551,11 @@ class SFTP extends SSH2
      * @param string $path
      * @param string $prop
      * @return mixed
+     * @access private
      */
-    private function get_lstat_cache_prop($path, $prop)
+    function _get_lstat_cache_prop($path, $prop)
     {
-        return $this->get_xstat_cache_prop($path, $prop, 'lstat');
+        return $this->_get_xstat_cache_prop($path, $prop, 'lstat');
     }
 
     /**
@@ -2923,19 +2565,15 @@ class SFTP extends SSH2
      *
      * @param string $path
      * @param string $prop
-     * @param string $type
      * @return mixed
+     * @access private
      */
-    private function get_xstat_cache_prop($path, $prop, $type)
+    function _get_xstat_cache_prop($path, $prop, $type)
     {
-        if (!$this->precheck()) {
-            return false;
-        }
-
         if ($this->use_stat_cache) {
-            $path = $this->realpath($path);
+            $path = $this->_realpath($path);
 
-            $result = $this->query_stat_cache($path);
+            $result = $this->_query_stat_cache($path);
 
             if (is_object($result) && isset($result->$type)) {
                 return $result->{$type}[$prop];
@@ -2952,85 +2590,53 @@ class SFTP extends SSH2
     }
 
     /**
-     * Renames a file or a directory on the SFTP server.
-     *
-     * If the file already exists this will return false
+     * Renames a file or a directory on the SFTP server
      *
      * @param string $oldname
      * @param string $newname
      * @return bool
-     * @throws \UnexpectedValueException on receipt of unexpected packets
+     * @access public
      */
-    public function rename($oldname, $newname)
+    function rename($oldname, $newname)
     {
-        if (!$this->precheck()) {
+        if (!($this->bitmap & SSH2::MASK_LOGIN)) {
             return false;
         }
 
-        $oldname = $this->realpath($oldname);
-        $newname = $this->realpath($newname);
+        $oldname = $this->_realpath($oldname);
+        $newname = $this->_realpath($newname);
         if ($oldname === false || $newname === false) {
             return false;
         }
 
         // http://tools.ietf.org/html/draft-ietf-secsh-filexfer-13#section-8.3
-        $packet = Strings::packSSH2('ss', $oldname, $newname);
-        if ($this->version >= 5) {
-            /* quoting https://datatracker.ietf.org/doc/html/draft-ietf-secsh-filexfer-05#section-6.5 ,
-
-               'flags' is 0 or a combination of:
-
-                   SSH_FXP_RENAME_OVERWRITE  0x00000001
-                   SSH_FXP_RENAME_ATOMIC     0x00000002
-                   SSH_FXP_RENAME_NATIVE     0x00000004
-
-               (none of these are currently supported) */
-            $packet .= "\0\0\0\0";
+        $packet = pack('Na*Na*', strlen($oldname), $oldname, strlen($newname), $newname);
+        if (!$this->_send_sftp_packet(NET_SFTP_RENAME, $packet)) {
+            return false;
         }
-        $this->send_sftp_packet(NET_SFTP_RENAME, $packet);
 
-        $response = $this->get_sftp_packet();
+        $response = $this->_get_sftp_packet();
         if ($this->packet_type != NET_SFTP_STATUS) {
-            throw new \UnexpectedValueException('Expected NET_SFTP_STATUS. '
-                                              . 'Got packet type: ' . $this->packet_type);
+            user_error('Expected SSH_FXP_STATUS');
+            return false;
         }
 
         // if $status isn't SSH_FX_OK it's probably SSH_FX_NO_SUCH_FILE or SSH_FX_PERMISSION_DENIED
-        list($status) = Strings::unpackSSH2('N', $response);
+        extract(unpack('Nstatus', $this->_string_shift($response, 4)));
         if ($status != NET_SFTP_STATUS_OK) {
-            $this->logError($response, $status);
+            $this->_logError($response, $status);
             return false;
         }
 
         // don't move the stat cache entry over since this operation could very well change the
         // atime and mtime attributes
-        //$this->update_stat_cache($newname, $this->query_stat_cache($oldname));
-        $this->remove_from_stat_cache($oldname);
-        $this->remove_from_stat_cache($newname);
+        //$this->_update_stat_cache($newname, $this->_query_stat_cache($oldname));
+        $this->_remove_from_stat_cache($oldname);
+        $this->_remove_from_stat_cache($newname);
 
         return true;
     }
 
-    /**
-     * Parse Time
-     *
-     * See '7.7.  Times' of draft-ietf-secsh-filexfer-13 for more info.
-     *
-     * @param string $key
-     * @param int $flags
-     * @param string $response
-     * @return array
-     */
-    private function parseTime($key, $flags, &$response)
-    {
-        $attr = [];
-        list($attr[$key]) = Strings::unpackSSH2('Q', $response);
-        if ($flags & NET_SFTP_ATTR_SUBSECOND_TIMES) {
-            list($attr[$key . '-nseconds']) = Strings::unpackSSH2('N', $response);
-        }
-        return $attr;
-    }
-
     /**
      * Parse Attributes
      *
@@ -3038,139 +2644,47 @@ class SFTP extends SSH2
      *
      * @param string $response
      * @return array
+     * @access private
      */
-    protected function parseAttributes(&$response)
+    function _parseAttributes(&$response)
     {
-        if ($this->version >= 4) {
-            list($flags, $attr['type']) = Strings::unpackSSH2('NC', $response);
-        } else {
-            list($flags) = Strings::unpackSSH2('N', $response);
-        }
-
-        foreach (self::$attributes as $key => $value) {
+        $attr = array();
+        extract(unpack('Nflags', $this->_string_shift($response, 4)));
+        // SFTPv4+ have a type field (a byte) that follows the above flag field
+        foreach ($this->attributes as $key => $value) {
             switch ($flags & $key) {
-                case NET_SFTP_ATTR_UIDGID:
-                    if ($this->version > 3) {
-                        continue 2;
-                    }
-                    break;
-                case NET_SFTP_ATTR_CREATETIME:
-                case NET_SFTP_ATTR_MODIFYTIME:
-                case NET_SFTP_ATTR_ACL:
-                case NET_SFTP_ATTR_OWNERGROUP:
-                case NET_SFTP_ATTR_SUBSECOND_TIMES:
-                    if ($this->version < 4) {
-                        continue 2;
-                    }
-                    break;
-                case NET_SFTP_ATTR_BITS:
-                    if ($this->version < 5) {
-                        continue 2;
-                    }
-                    break;
-                case NET_SFTP_ATTR_ALLOCATION_SIZE:
-                case NET_SFTP_ATTR_TEXT_HINT:
-                case NET_SFTP_ATTR_MIME_TYPE:
-                case NET_SFTP_ATTR_LINK_COUNT:
-                case NET_SFTP_ATTR_UNTRANSLATED_NAME:
-                case NET_SFTP_ATTR_CTIME:
-                    if ($this->version < 6) {
-                        continue 2;
-                    }
-            }
-            switch ($flags & $key) {
-                case NET_SFTP_ATTR_SIZE:             // 0x00000001
+                case NET_SFTP_ATTR_SIZE: // 0x00000001
                     // The size attribute is defined as an unsigned 64-bit integer.
                     // The following will use floats on 32-bit platforms, if necessary.
                     // As can be seen in the BigInteger class, floats are generally
                     // IEEE 754 binary64 "double precision" on such platforms and
                     // as such can represent integers of at least 2^50 without loss
                     // of precision. Interpreted in filesize, 2^50 bytes = 1024 TiB.
-                    list($attr['size']) = Strings::unpackSSH2('Q', $response);
+                    $attr['size'] = hexdec(bin2hex($this->_string_shift($response, 8)));
                     break;
                 case NET_SFTP_ATTR_UIDGID: // 0x00000002 (SFTPv3 only)
-                    list($attr['uid'], $attr['gid']) = Strings::unpackSSH2('NN', $response);
+                    $attr+= unpack('Nuid/Ngid', $this->_string_shift($response, 8));
                     break;
                 case NET_SFTP_ATTR_PERMISSIONS: // 0x00000004
-                    list($attr['mode']) = Strings::unpackSSH2('N', $response);
-                    $fileType = $this->parseMode($attr['mode']);
-                    if ($this->version < 4 && $fileType !== false) {
-                        $attr += ['type' => $fileType];
+                    $attr+= unpack('Npermissions', $this->_string_shift($response, 4));
+                    // mode == permissions; permissions was the original array key and is retained for bc purposes.
+                    // mode was added because that's the more industry standard terminology
+                    $attr+= array('mode' => $attr['permissions']);
+                    $fileType = $this->_parseMode($attr['permissions']);
+                    if ($fileType !== false) {
+                        $attr+= array('type' => $fileType);
                     }
                     break;
                 case NET_SFTP_ATTR_ACCESSTIME: // 0x00000008
-                    if ($this->version >= 4) {
-                        $attr += $this->parseTime('atime', $flags, $response);
-                        break;
-                    }
-                    list($attr['atime'], $attr['mtime']) = Strings::unpackSSH2('NN', $response);
-                    break;
-                case NET_SFTP_ATTR_CREATETIME:       // 0x00000010 (SFTPv4+)
-                    $attr += $this->parseTime('createtime', $flags, $response);
-                    break;
-                case NET_SFTP_ATTR_MODIFYTIME:       // 0x00000020
-                    $attr += $this->parseTime('mtime', $flags, $response);
-                    break;
-                case NET_SFTP_ATTR_ACL:              // 0x00000040
-                    // access control list
-                    // see https://datatracker.ietf.org/doc/html/draft-ietf-secsh-filexfer-04#section-5.7
-                    // currently unsupported
-                    list($count) = Strings::unpackSSH2('N', $response);
-                    for ($i = 0; $i < $count; $i++) {
-                        list($type, $flag, $mask, $who) = Strings::unpackSSH2('N3s', $result);
-                    }
-                    break;
-                case NET_SFTP_ATTR_OWNERGROUP:       // 0x00000080
-                    list($attr['owner'], $attr['$group']) = Strings::unpackSSH2('ss', $response);
-                    break;
-                case NET_SFTP_ATTR_SUBSECOND_TIMES:  // 0x00000100
-                    break;
-                case NET_SFTP_ATTR_BITS:             // 0x00000200 (SFTPv5+)
-                    // see https://datatracker.ietf.org/doc/html/draft-ietf-secsh-filexfer-05#section-5.8
-                    // currently unsupported
-                    // tells if you file is:
-                    // readonly, system, hidden, case inensitive, archive, encrypted, compressed, sparse
-                    // append only, immutable, sync
-                    list($attrib_bits, $attrib_bits_valid) = Strings::unpackSSH2('N2', $response);
-                    // if we were actually gonna implement the above it ought to be
-                    // $attr['attrib-bits'] and $attr['attrib-bits-valid']
-                    // eg. - instead of _
-                    break;
-                case NET_SFTP_ATTR_ALLOCATION_SIZE:  // 0x00000400 (SFTPv6+)
-                    // see https://datatracker.ietf.org/doc/html/draft-ietf-secsh-filexfer-13#section-7.4
-                    // represents the number of bytes that the file consumes on the disk. will
-                    // usually be larger than the 'size' field
-                    list($attr['allocation-size']) = Strings::unpackSSH2('Q', $response);
-                    break;
-                case NET_SFTP_ATTR_TEXT_HINT:        // 0x00000800
-                    // https://datatracker.ietf.org/doc/html/draft-ietf-secsh-filexfer-13#section-7.10
-                    // currently unsupported
-                    // tells if file is "known text", "guessed text", "known binary", "guessed binary"
-                    list($text_hint) = Strings::unpackSSH2('C', $response);
-                    // the above should be $attr['text-hint']
-                    break;
-                case NET_SFTP_ATTR_MIME_TYPE:        // 0x00001000
-                    // see https://datatracker.ietf.org/doc/html/draft-ietf-secsh-filexfer-13#section-7.11
-                    list($attr['mime-type']) = Strings::unpackSSH2('s', $response);
-                    break;
-                case NET_SFTP_ATTR_LINK_COUNT:       // 0x00002000
-                    // see https://datatracker.ietf.org/doc/html/draft-ietf-secsh-filexfer-13#section-7.12
-                    list($attr['link-count']) = Strings::unpackSSH2('N', $response);
-                    break;
-                case NET_SFTP_ATTR_UNTRANSLATED_NAME:// 0x00004000
-                    // see https://datatracker.ietf.org/doc/html/draft-ietf-secsh-filexfer-13#section-7.13
-                    list($attr['untranslated-name']) = Strings::unpackSSH2('s', $response);
-                    break;
-                case NET_SFTP_ATTR_CTIME:            // 0x00008000
-                    // 'ctime' contains the last time the file attributes were changed.  The
-                    // exact meaning of this field depends on the server.
-                    $attr += $this->parseTime('ctime', $flags, $response);
+                    $attr+= unpack('Natime/Nmtime', $this->_string_shift($response, 8));
                     break;
                 case NET_SFTP_ATTR_EXTENDED: // 0x80000000
-                    list($count) = Strings::unpackSSH2('N', $response);
+                    extract(unpack('Ncount', $this->_string_shift($response, 4)));
                     for ($i = 0; $i < $count; $i++) {
-                        list($key, $value) = Strings::unpackSSH2('ss', $response);
-                        $attr[$key] = $value;
+                        extract(unpack('Nlength', $this->_string_shift($response, 4)));
+                        $key = $this->_string_shift($response, $length);
+                        extract(unpack('Nlength', $this->_string_shift($response, 4)));
+                        $attr[$key] = $this->_string_shift($response, $length);
                     }
             }
         }
@@ -3184,8 +2698,9 @@ class SFTP extends SSH2
      *
      * @param int $mode
      * @return int
+     * @access private
      */
-    private function parseMode($mode)
+    function _parseMode($mode)
     {
         // values come from http://lxr.free-electrons.com/source/include/uapi/linux/stat.h#L12
         // see, also, http://linux.die.net/man/2/stat
@@ -3230,8 +2745,9 @@ class SFTP extends SSH2
      *
      * @param string $longname
      * @return mixed
+     * @access private
      */
-    private function parseLongname($longname)
+    function _parseLongname($longname)
     {
         // http://en.wikipedia.org/wiki/Unix_file_types
         // http://en.wikipedia.org/wiki/Filesystem_permissions#Notation_of_traditional_Unix_permissions
@@ -3258,44 +2774,37 @@ class SFTP extends SSH2
      *
      * @param int $type
      * @param string $data
-     * @param int $request_id
      * @see self::_get_sftp_packet()
-     * @see self::send_channel_packet()
-     * @return void
+     * @see self::_send_channel_packet()
+     * @return bool
+     * @access private
      */
-    private function send_sftp_packet($type, $data, $request_id = 1)
+    function _send_sftp_packet($type, $data)
     {
-        // in SSH2.php the timeout is cumulative per function call. eg. exec() will
-        // timeout after 10s. but for SFTP.php it's cumulative per packet
-        $this->curTimeout = $this->timeout;
+        $packet = $this->request_id !== false ?
+            pack('NCNa*', strlen($data) + 5, $type, $this->request_id, $data) :
+            pack('NCa*',  strlen($data) + 1, $type, $data);
 
-        $packet = $this->use_request_id ?
-            pack('NCNa*', strlen($data) + 5, $type, $request_id, $data) :
-            pack('NCa*', strlen($data) + 1, $type, $data);
-
-        $start = microtime(true);
-        $this->send_channel_packet(self::CHANNEL, $packet);
-        $stop = microtime(true);
+        $start = strtok(microtime(), ' ') + strtok(''); // http://php.net/microtime#61838
+        $result = $this->_send_channel_packet(self::CHANNEL, $packet);
+        $stop = strtok(microtime(), ' ') + strtok('');
 
         if (defined('NET_SFTP_LOGGING')) {
-            $packet_type = '-> ' . self::$packet_types[$type] .
+            $packet_type = '-> ' . $this->packet_types[$type] .
                            ' (' . round($stop - $start, 4) . 's)';
-            $this->append_log($packet_type, $data);
+            if (NET_SFTP_LOGGING == NET_SFTP_LOG_REALTIME) {
+                echo "<pre>\r\n" . $this->_format_log(array($data), array($packet_type)) . "\r\n</pre>\r\n";
+                flush();
+                ob_flush();
+            } else {
+                $this->packet_type_log[] = $packet_type;
+                if (NET_SFTP_LOGGING == NET_SFTP_LOG_COMPLEX) {
+                    $this->packet_log[] = $data;
+                }
+            }
         }
-    }
 
-    /**
-     * Resets a connection for re-use
-     *
-     * @param int $reason
-     */
-    protected function reset_connection($reason)
-    {
-        parent::reset_connection($reason);
-        $this->use_request_id = false;
-        $this->pwd = false;
-        $this->requestBuffer = [];
-        $this->partial_init = false;
+        return $result;
     }
 
     /**
@@ -3309,158 +2818,113 @@ class SFTP extends SSH2
      *
      * @see self::_send_sftp_packet()
      * @return string
+     * @access private
      */
-    private function get_sftp_packet($request_id = null)
+    function _get_sftp_packet()
     {
-        $this->channel_close = false;
+        $this->curTimeout = false;
 
-        if (isset($request_id) && isset($this->requestBuffer[$request_id])) {
-            $this->packet_type = $this->requestBuffer[$request_id]['packet_type'];
-            $temp = $this->requestBuffer[$request_id]['packet'];
-            unset($this->requestBuffer[$request_id]);
-            return $temp;
-        }
-
-        // in SSH2.php the timeout is cumulative per function call. eg. exec() will
-        // timeout after 10s. but for SFTP.php it's cumulative per packet
-        $this->curTimeout = $this->timeout;
-
-        $start = microtime(true);
+        $start = strtok(microtime(), ' ') + strtok(''); // http://php.net/microtime#61838
 
         // SFTP packet length
         while (strlen($this->packet_buffer) < 4) {
-            $temp = $this->get_channel_packet(self::CHANNEL, true);
-            if ($temp === true) {
-                if ($this->channel_status[self::CHANNEL] === NET_SSH2_MSG_CHANNEL_CLOSE) {
-                    $this->channel_close = true;
-                }
+            $temp = $this->_get_channel_packet(self::CHANNEL);
+            if (is_bool($temp)) {
                 $this->packet_type = false;
                 $this->packet_buffer = '';
                 return false;
             }
-            $this->packet_buffer .= $temp;
+            $this->packet_buffer.= $temp;
         }
-        if (strlen($this->packet_buffer) < 4) {
-            throw new \RuntimeException('Packet is too small');
-        }
-        extract(unpack('Nlength', Strings::shift($this->packet_buffer, 4)));
-        /** @var integer $length */
-
+        extract(unpack('Nlength', $this->_string_shift($this->packet_buffer, 4)));
         $tempLength = $length;
-        $tempLength -= strlen($this->packet_buffer);
-
-        // 256 * 1024 is what SFTP_MAX_MSG_LENGTH is set to in OpenSSH's sftp-common.h
-        if (!$this->allow_arbitrary_length_packets && !$this->use_request_id && $tempLength > 256 * 1024) {
-            throw new \RuntimeException('Invalid Size');
-        }
+        $tempLength-= strlen($this->packet_buffer);
 
         // SFTP packet type and data payload
         while ($tempLength > 0) {
-            $temp = $this->get_channel_packet(self::CHANNEL, true);
-            if ($temp === true) {
-                if ($this->channel_status[self::CHANNEL] === NET_SSH2_MSG_CHANNEL_CLOSE) {
-                    $this->channel_close = true;
-                }
+            $temp = $this->_get_channel_packet(self::CHANNEL);
+            if (is_bool($temp)) {
                 $this->packet_type = false;
                 $this->packet_buffer = '';
                 return false;
             }
-            $this->packet_buffer .= $temp;
-            $tempLength -= strlen($temp);
+            $this->packet_buffer.= $temp;
+            $tempLength-= strlen($temp);
         }
 
-        $stop = microtime(true);
+        $stop = strtok(microtime(), ' ') + strtok('');
 
-        $this->packet_type = ord(Strings::shift($this->packet_buffer));
+        $this->packet_type = ord($this->_string_shift($this->packet_buffer));
 
-        if ($this->use_request_id) {
-            extract(unpack('Npacket_id', Strings::shift($this->packet_buffer, 4))); // remove the request id
-            $length -= 5; // account for the request id and the packet type
+        if ($this->request_id !== false) {
+            $this->_string_shift($this->packet_buffer, 4); // remove the request id
+            $length-= 5; // account for the request id and the packet type
         } else {
-            $length -= 1; // account for the packet type
+            $length-= 1; // account for the packet type
         }
 
-        $packet = Strings::shift($this->packet_buffer, $length);
+        $packet = $this->_string_shift($this->packet_buffer, $length);
 
         if (defined('NET_SFTP_LOGGING')) {
-            $packet_type = '<- ' . self::$packet_types[$this->packet_type] .
+            $packet_type = '<- ' . $this->packet_types[$this->packet_type] .
                            ' (' . round($stop - $start, 4) . 's)';
-            $this->append_log($packet_type, $packet);
-        }
-
-        if (isset($request_id) && $this->use_request_id && $packet_id != $request_id) {
-            $this->requestBuffer[$packet_id] = [
-                'packet_type' => $this->packet_type,
-                'packet' => $packet
-            ];
-            return $this->get_sftp_packet($request_id);
+            if (NET_SFTP_LOGGING == NET_SFTP_LOG_REALTIME) {
+                echo "<pre>\r\n" . $this->_format_log(array($packet), array($packet_type)) . "\r\n</pre>\r\n";
+                flush();
+                ob_flush();
+            } else {
+                $this->packet_type_log[] = $packet_type;
+                if (NET_SFTP_LOGGING == NET_SFTP_LOG_COMPLEX) {
+                    $this->packet_log[] = $packet;
+                }
+            }
         }
 
         return $packet;
     }
 
-    /**
-     * Logs data packets
-     *
-     * Makes sure that only the last 1MB worth of packets will be logged
-     *
-     * @param string $message_number
-     * @param string $message
-     */
-    private function append_log($message_number, $message)
-    {
-        $this->append_log_helper(
-            NET_SFTP_LOGGING,
-            $message_number,
-            $message,
-            $this->packet_type_log,
-            $this->packet_log,
-            $this->log_size,
-            $this->realtime_log_file,
-            $this->realtime_log_wrap,
-            $this->realtime_log_size
-        );
-    }
-
     /**
      * Returns a log of the packets that have been sent and received.
      *
-     * Returns a string if NET_SFTP_LOGGING == self::LOG_COMPLEX, an array if NET_SFTP_LOGGING == self::LOG_SIMPLE and false if !defined('NET_SFTP_LOGGING')
+     * Returns a string if NET_SFTP_LOGGING == NET_SFTP_LOG_COMPLEX, an array if NET_SFTP_LOGGING == NET_SFTP_LOG_SIMPLE and false if !defined('NET_SFTP_LOGGING')
      *
-     * @return array|string|false
+     * @access public
+     * @return string or Array
      */
-    public function getSFTPLog()
+    function getSFTPLog()
     {
         if (!defined('NET_SFTP_LOGGING')) {
             return false;
         }
 
         switch (NET_SFTP_LOGGING) {
-            case self::LOG_COMPLEX:
-                return $this->format_log($this->packet_log, $this->packet_type_log);
+            case NET_SFTP_LOG_COMPLEX:
+                return $this->_format_log($this->packet_log, $this->packet_type_log);
                 break;
-            //case self::LOG_SIMPLE:
+            //case NET_SFTP_LOG_SIMPLE:
             default:
                 return $this->packet_type_log;
         }
     }
 
     /**
-     * Returns all errors on the SFTP layer
+     * Returns all errors
      *
-     * @return array
+     * @return string
+     * @access public
      */
-    public function getSFTPErrors()
+    function getSFTPErrors()
     {
         return $this->sftp_errors;
     }
 
     /**
-     * Returns the last error on the SFTP layer
+     * Returns the last error
      *
      * @return string
+     * @access public
      */
-    public function getLastSFTPError()
+    function getLastSFTPError()
     {
         return count($this->sftp_errors) ? $this->sftp_errors[count($this->sftp_errors) - 1] : '';
     }
@@ -3469,79 +2933,27 @@ class SFTP extends SSH2
      * Get supported SFTP versions
      *
      * @return array
+     * @access public
      */
-    public function getSupportedVersions()
+    function getSupportedVersions()
     {
-        if (!($this->bitmap & SSH2::MASK_LOGIN)) {
-            return false;
-        }
-
-        if (!$this->partial_init) {
-            $this->partial_init_sftp_connection();
-        }
-
-        $temp = ['version' => $this->defaultVersion];
+        $temp = array('version' => $this->version);
         if (isset($this->extensions['versions'])) {
             $temp['extensions'] = $this->extensions['versions'];
         }
         return $temp;
     }
 
-    /**
-     * Get supported SFTP versions
-     *
-     * @return int|false
-     */
-    public function getNegotiatedVersion()
-    {
-        if (!$this->precheck()) {
-            return false;
-        }
-
-        return $this->version;
-    }
-
-    /**
-     * Set preferred version
-     *
-     * If you're preferred version isn't supported then the highest supported
-     * version of SFTP will be utilized. Set to null or false or int(0) to
-     * unset the preferred version
-     *
-     * @param int $version
-     */
-    public function setPreferredVersion($version)
-    {
-        $this->preferredVersion = $version;
-    }
-
     /**
      * Disconnect
      *
      * @param int $reason
-     * @return false
+     * @return bool
+     * @access private
      */
-    protected function disconnect_helper($reason)
+    function _disconnect($reason)
     {
         $this->pwd = false;
-        return parent::disconnect_helper($reason);
-    }
-
-    /**
-     * Enable Date Preservation
-     *
-     */
-    public function enableDatePreservation()
-    {
-        $this->preserveTime = true;
-    }
-
-    /**
-     * Disable Date Preservation
-     *
-     */
-    public function disableDatePreservation()
-    {
-        $this->preserveTime = false;
+        parent::_disconnect($reason);
     }
 }
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Net/SFTP/Stream.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Net/SFTP/Stream.php
index 24047b4b..08d726ca 100644
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Net/SFTP/Stream.php
+++ b/securemail/vendor/phpseclib/phpseclib/phpseclib/Net/SFTP/Stream.php
@@ -7,22 +7,25 @@
  *
  * PHP version 5
  *
+ * @category  Net
+ * @package   SFTP
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2013 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
  * @link      http://phpseclib.sourceforge.net
  */
 
-namespace phpseclib3\Net\SFTP;
+namespace phpseclib\Net\SFTP;
 
-use phpseclib3\Crypt\Common\PrivateKey;
-use phpseclib3\Net\SFTP;
-use phpseclib3\Net\SSH2;
+use phpseclib\Crypt\RSA;
+use phpseclib\Net\SFTP;
 
 /**
  * SFTP Stream Wrapper
  *
+ * @package SFTP
  * @author  Jim Wigginton <terrafrost@php.net>
+ * @access  public
  */
 class Stream
 {
@@ -33,80 +36,90 @@ class Stream
      *
      * @var array
      */
-    public static $instances;
+    static $instances;
 
     /**
      * SFTP instance
      *
      * @var object
+     * @access private
      */
-    private $sftp;
+    var $sftp;
 
     /**
      * Path
      *
      * @var string
+     * @access private
      */
-    private $path;
+    var $path;
 
     /**
      * Mode
      *
      * @var string
+     * @access private
      */
-    private $mode;
+    var $mode;
 
     /**
      * Position
      *
      * @var int
+     * @access private
      */
-    private $pos;
+    var $pos;
 
     /**
      * Size
      *
      * @var int
+     * @access private
      */
-    private $size;
+    var $size;
 
     /**
      * Directory entries
      *
      * @var array
+     * @access private
      */
-    private $entries;
+    var $entries;
 
     /**
      * EOF flag
      *
      * @var bool
+     * @access private
      */
-    private $eof;
+    var $eof;
 
     /**
      * Context resource
      *
-     * Technically this needs to be publicly accessible so PHP can set it directly
+     * Technically this needs to be publically accessible so PHP can set it directly
      *
      * @var resource
+     * @access public
      */
-    public $context;
+    var $context;
 
     /**
      * Notification callback function
      *
      * @var callable
+     * @access public
      */
-    private $notification;
+    var $notification;
 
     /**
      * Registers this class as a URL wrapper.
      *
      * @param string $protocol The wrapper name to be registered.
      * @return bool True on success, false otherwise.
+     * @access public
      */
-    public static function register($protocol = 'sftp')
+    static function register($protocol = 'sftp')
     {
         if (in_array($protocol, stream_get_wrappers(), true)) {
             return false;
@@ -117,8 +130,9 @@ class Stream
     /**
      * The Constructor
      *
+     * @access public
      */
-    public function __construct()
+    function __construct()
     {
         if (defined('NET_SFTP_STREAM_LOGGING')) {
             echo "__construct()\r\n";
@@ -135,20 +149,21 @@ class Stream
      *
      * @param string $path
      * @return string
+     * @access private
      */
-    protected function parse_path($path)
+    function _parse_path($path)
     {
         $orig = $path;
-        extract(parse_url($path) + ['port' => 22]);
+        extract(parse_url($path) + array('port' => 22));
         if (isset($query)) {
-            $path .= '?' . $query;
+            $path.= '?' . $query;
         } elseif (preg_match('/(\?|\?#)$/', $orig)) {
-            $path .= '?';
+            $path.= '?';
         }
         if (isset($fragment)) {
-            $path .= '#' . $fragment;
+            $path.= '#' . $fragment;
         } elseif ($orig[strlen($orig) - 1] == '#') {
-            $path .= '#';
+            $path.= '#';
         }
 
         if (!isset($host)) {
@@ -162,12 +177,13 @@ class Stream
             }
         }
 
-        if (preg_match('/^{[a-z0-9]+}$/i', $host)) {
-            $host = SSH2::getConnectionByResourceId($host);
-            if ($host === false) {
+        if ($host[0] == '$') {
+            $host = substr($host, 1);
+            global $$host;
+            if (($$host instanceof SFTP) === false) {
                 return false;
             }
-            $this->sftp = $host;
+            $this->sftp = $$host;
         } else {
             if (isset($this->context)) {
                 $context = stream_context_get_options($this->context);
@@ -188,7 +204,7 @@ class Stream
             if (isset($context[$scheme]['password'])) {
                 $pass = $context[$scheme]['password'];
             }
-            if (isset($context[$scheme]['privkey']) && $context[$scheme]['privkey'] instanceof PrivateKey) {
+            if (isset($context[$scheme]['privkey']) && $context[$scheme]['privkey'] instanceof RSA) {
                 $pass = $context[$scheme]['privkey'];
             }
 
@@ -196,7 +212,7 @@ class Stream
                 return false;
             }
 
-            // casting $pass to a string is necessary in the event that it's a \phpseclib3\Crypt\RSA object
+            // casting $pass to a string is necessary in the event that it's a \phpseclib\Crypt\RSA object
             if (isset(self::$instances[$host][$port][$user][(string) $pass])) {
                 $this->sftp = self::$instances[$host][$port][$user][(string) $pass];
             } else {
@@ -239,17 +255,18 @@ class Stream
      * @param int $options
      * @param string $opened_path
      * @return bool
+     * @access public
      */
-    private function _stream_open($path, $mode, $options, &$opened_path)
+    function _stream_open($path, $mode, $options, &$opened_path)
     {
-        $path = $this->parse_path($path);
+        $path = $this->_parse_path($path);
 
         if ($path === false) {
             return false;
         }
         $this->path = $path;
 
-        $this->size = $this->sftp->filesize($path);
+        $this->size = $this->sftp->size($path);
         $this->mode = preg_replace('#[bt]$#', '', $mode);
         $this->eof = false;
 
@@ -280,8 +297,9 @@ class Stream
      *
      * @param int $count
      * @return mixed
+     * @access public
      */
-    private function _stream_read($count)
+    function _stream_read($count)
     {
         switch ($this->mode) {
             case 'w':
@@ -311,7 +329,7 @@ class Stream
             $this->eof = true;
             return false;
         }
-        $this->pos += strlen($result);
+        $this->pos+= strlen($result);
 
         return $result;
     }
@@ -320,9 +338,10 @@ class Stream
      * Write to stream
      *
      * @param string $data
-     * @return int|false
+     * @return mixed
+     * @access public
      */
-    private function _stream_write($data)
+    function _stream_write($data)
     {
         switch ($this->mode) {
             case 'r':
@@ -342,7 +361,7 @@ class Stream
         if ($result === false) {
             return false;
         }
-        $this->pos += strlen($data);
+        $this->pos+= strlen($data);
         if ($this->pos > $this->size) {
             $this->size = $this->pos;
         }
@@ -354,8 +373,9 @@ class Stream
      * Retrieve the current position of a stream
      *
      * @return int
+     * @access public
      */
-    private function _stream_tell()
+    function _stream_tell()
     {
         return $this->pos;
     }
@@ -371,8 +391,9 @@ class Stream
      * will return false. do fread($fp, 1) and feof() will then return true.
      *
      * @return bool
+     * @access public
      */
-    private function _stream_eof()
+    function _stream_eof()
     {
         return $this->eof;
     }
@@ -383,20 +404,21 @@ class Stream
      * @param int $offset
      * @param int $whence
      * @return bool
+     * @access public
      */
-    private function _stream_seek($offset, $whence)
+    function _stream_seek($offset, $whence)
     {
         switch ($whence) {
             case SEEK_SET:
-                if ($offset < 0) {
+                if ($offset >= $this->size || $offset < 0) {
                     return false;
                 }
                 break;
             case SEEK_CUR:
-                $offset += $this->pos;
+                $offset+= $this->pos;
                 break;
             case SEEK_END:
-                $offset += $this->size;
+                $offset+= $this->size;
         }
 
         $this->pos = $offset;
@@ -411,10 +433,11 @@ class Stream
      * @param int $option
      * @param mixed $var
      * @return bool
+     * @access public
      */
-    private function _stream_metadata($path, $option, $var)
+    function _stream_metadata($path, $option, $var)
     {
-        $path = $this->parse_path($path);
+        $path = $this->_parse_path($path);
         if ($path === false) {
             return false;
         }
@@ -424,9 +447,7 @@ class Stream
         //     and https://github.com/php/php-src/blob/master/main/php_streams.h#L592
         switch ($option) {
             case 1: // PHP_STREAM_META_TOUCH
-                $time = isset($var[0]) ? $var[0] : null;
-                $atime = isset($var[1]) ? $var[1] : null;
-                return $this->sftp->touch($path, $time, $atime);
+                return $this->sftp->touch($path, $var[0], $var[1]);
             case 2: // PHP_STREAM_OWNER_NAME
             case 3: // PHP_STREAM_GROUP_NAME
                 return false;
@@ -444,8 +465,9 @@ class Stream
      *
      * @param int $cast_as
      * @return resource
+     * @access public
      */
-    private function _stream_cast($cast_as)
+    function _stream_cast($cast_as)
     {
         return $this->sftp->fsock;
     }
@@ -455,8 +477,9 @@ class Stream
      *
      * @param int $operation
      * @return bool
+     * @access public
      */
-    private function _stream_lock($operation)
+    function _stream_lock($operation)
     {
         return false;
     }
@@ -465,14 +488,15 @@ class Stream
      * Renames a file or directory
      *
      * Attempts to rename oldname to newname, moving it between directories if necessary.
-     * If newname exists, it will be overwritten.  This is a departure from what \phpseclib3\Net\SFTP
+     * If newname exists, it will be overwritten.  This is a departure from what \phpseclib\Net\SFTP
      * does.
      *
      * @param string $path_from
      * @param string $path_to
      * @return bool
+     * @access public
      */
-    private function _rename($path_from, $path_to)
+    function _rename($path_from, $path_to)
     {
         $path1 = parse_url($path_from);
         $path2 = parse_url($path_to);
@@ -481,7 +505,7 @@ class Stream
             return false;
         }
 
-        $path_from = $this->parse_path($path_from);
+        $path_from = $this->_parse_path($path_from);
         $path_to = parse_url($path_to);
         if ($path_from === false) {
             return false;
@@ -522,10 +546,11 @@ class Stream
      * @param string $path
      * @param int $options
      * @return bool
+     * @access public
      */
-    private function _dir_opendir($path, $options)
+    function _dir_opendir($path, $options)
     {
-        $path = $this->parse_path($path);
+        $path = $this->_parse_path($path);
         if ($path === false) {
             return false;
         }
@@ -538,8 +563,9 @@ class Stream
      * Read entry from directory handle
      *
      * @return mixed
+     * @access public
      */
-    private function _dir_readdir()
+    function _dir_readdir()
     {
         if (isset($this->entries[$this->pos])) {
             return $this->entries[$this->pos++];
@@ -551,8 +577,9 @@ class Stream
      * Rewind directory handle
      *
      * @return bool
+     * @access public
      */
-    private function _dir_rewinddir()
+    function _dir_rewinddir()
     {
         $this->pos = 0;
         return true;
@@ -562,8 +589,9 @@ class Stream
      * Close directory handle
      *
      * @return bool
+     * @access public
      */
-    private function _dir_closedir()
+    function _dir_closedir()
     {
         return true;
     }
@@ -577,10 +605,11 @@ class Stream
      * @param int $mode
      * @param int $options
      * @return bool
+     * @access public
      */
-    private function _mkdir($path, $mode, $options)
+    function _mkdir($path, $mode, $options)
     {
-        $path = $this->parse_path($path);
+        $path = $this->_parse_path($path);
         if ($path === false) {
             return false;
         }
@@ -597,12 +626,14 @@ class Stream
      * $options. What does 8 correspond to?
      *
      * @param string $path
+     * @param int $mode
      * @param int $options
      * @return bool
+     * @access public
      */
-    private function _rmdir($path, $options)
+    function _rmdir($path, $options)
     {
-        $path = $this->parse_path($path);
+        $path = $this->_parse_path($path);
         if ($path === false) {
             return false;
         }
@@ -613,11 +644,12 @@ class Stream
     /**
      * Flushes the output
      *
-     * See <http://php.net/fflush>. Always returns true because \phpseclib3\Net\SFTP doesn't cache stuff before writing
+     * See <http://php.net/fflush>. Always returns true because \phpseclib\Net\SFTP doesn't cache stuff before writing
      *
      * @return bool
+     * @access public
      */
-    private function _stream_flush()
+    function _stream_flush()
     {
         return true;
     }
@@ -626,8 +658,9 @@ class Stream
      * Retrieve information about a file resource
      *
      * @return mixed
+     * @access public
      */
-    private function _stream_stat()
+    function _stream_stat()
     {
         $results = $this->sftp->stat($this->path);
         if ($results === false) {
@@ -641,10 +674,11 @@ class Stream
      *
      * @param string $path
      * @return bool
+     * @access public
      */
-    private function _unlink($path)
+    function _unlink($path)
     {
-        $path = $this->parse_path($path);
+        $path = $this->_parse_path($path);
         if ($path === false) {
             return false;
         }
@@ -655,17 +689,18 @@ class Stream
     /**
      * Retrieve information about a file
      *
-     * Ignores the STREAM_URL_STAT_QUIET flag because the entirety of \phpseclib3\Net\SFTP\Stream is quiet by default
+     * Ignores the STREAM_URL_STAT_QUIET flag because the entirety of \phpseclib\Net\SFTP\Stream is quiet by default
      * might be worthwhile to reconstruct bits 12-16 (ie. the file type) if mode doesn't have them but we'll
      * cross that bridge when and if it's reached
      *
      * @param string $path
      * @param int $flags
      * @return mixed
+     * @access public
      */
-    private function _url_stat($path, $flags)
+    function _url_stat($path, $flags)
     {
-        $path = $this->parse_path($path);
+        $path = $this->_parse_path($path);
         if ($path === false) {
             return false;
         }
@@ -683,8 +718,9 @@ class Stream
      *
      * @param int $new_size
      * @return bool
+     * @access public
      */
-    private function _stream_truncate($new_size)
+    function _stream_truncate($new_size)
     {
         if (!$this->sftp->truncate($this->path, $new_size)) {
             return false;
@@ -700,14 +736,15 @@ class Stream
      * Change stream options
      *
      * STREAM_OPTION_WRITE_BUFFER isn't supported for the same reason stream_flush isn't.
-     * The other two aren't supported because of limitations in \phpseclib3\Net\SFTP.
+     * The other two aren't supported because of limitations in \phpseclib\Net\SFTP.
      *
      * @param int $option
      * @param int $arg1
      * @param int $arg2
      * @return bool
+     * @access public
      */
-    private function _stream_set_option($option, $arg1, $arg2)
+    function _stream_set_option($option, $arg1, $arg2)
     {
         return false;
     }
@@ -715,8 +752,9 @@ class Stream
     /**
      * Close an resource
      *
+     * @access public
      */
-    private function _stream_close()
+    function _stream_close()
     {
     }
 
@@ -730,11 +768,12 @@ class Stream
      * If NET_SFTP_STREAM_LOGGING is defined all calls will be output on the screen and then (regardless of whether or not
      * NET_SFTP_STREAM_LOGGING is enabled) the parameters will be passed through to the appropriate method.
      *
-     * @param string $name
-     * @param array $arguments
+     * @param string
+     * @param array
      * @return mixed
+     * @access public
      */
-    public function __call($name, array $arguments)
+    function __call($name, $arguments)
     {
         if (defined('NET_SFTP_STREAM_LOGGING')) {
             echo $name . '(';
@@ -751,6 +790,6 @@ class Stream
         if (!method_exists($this, $name)) {
             return false;
         }
-        return $this->$name(...$arguments);
+        return call_user_func_array(array($this, $name), $arguments);
     }
 }
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Net/SSH1.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Net/SSH1.php
new file mode 100644
index 00000000..cc108a94
--- /dev/null
+++ b/securemail/vendor/phpseclib/phpseclib/phpseclib/Net/SSH1.php
@@ -0,0 +1,1614 @@
+<?php
+
+/**
+ * Pure-PHP implementation of SSHv1.
+ *
+ * PHP version 5
+ *
+ * Here's a short example of how to use this library:
+ * <code>
+ * <?php
+ *    include 'vendor/autoload.php';
+ *
+ *    $ssh = new \phpseclib\Net\SSH1('www.domain.tld');
+ *    if (!$ssh->login('username', 'password')) {
+ *        exit('Login Failed');
+ *    }
+ *
+ *    echo $ssh->exec('ls -la');
+ * ?>
+ * </code>
+ *
+ * Here's another short example:
+ * <code>
+ * <?php
+ *    include 'vendor/autoload.php';
+ *
+ *    $ssh = new \phpseclib\Net\SSH1('www.domain.tld');
+ *    if (!$ssh->login('username', 'password')) {
+ *        exit('Login Failed');
+ *    }
+ *
+ *    echo $ssh->read('username@username:~$');
+ *    $ssh->write("ls -la\n");
+ *    echo $ssh->read('username@username:~$');
+ * ?>
+ * </code>
+ *
+ * More information on the SSHv1 specification can be found by reading
+ * {@link http://www.snailbook.com/docs/protocol-1.5.txt protocol-1.5.txt}.
+ *
+ * @category  Net
+ * @package   SSH1
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2007 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+namespace phpseclib\Net;
+
+use phpseclib\Crypt\DES;
+use phpseclib\Crypt\Random;
+use phpseclib\Crypt\TripleDES;
+use phpseclib\Math\BigInteger;
+
+/**
+ * Pure-PHP implementation of SSHv1.
+ *
+ * @package SSH1
+ * @author  Jim Wigginton <terrafrost@php.net>
+ * @access  public
+ */
+class SSH1
+{
+    /**#@+
+     * Encryption Methods
+     *
+     * @see \phpseclib\Net\SSH1::getSupportedCiphers()
+     * @access public
+     */
+    /**
+     * No encryption
+     *
+     * Not supported.
+     */
+    const CIPHER_NONE = 0;
+    /**
+     * IDEA in CFB mode
+     *
+     * Not supported.
+     */
+    const CIPHER_IDEA = 1;
+    /**
+     * DES in CBC mode
+     */
+    const CIPHER_DES = 2;
+    /**
+     * Triple-DES in CBC mode
+     *
+     * All implementations are required to support this
+     */
+    const CIPHER_3DES = 3;
+    /**
+     * TRI's Simple Stream encryption CBC
+     *
+     * Not supported nor is it defined in the official SSH1 specs.  OpenSSH, however, does define it (see cipher.h),
+     * although it doesn't use it (see cipher.c)
+     */
+    const CIPHER_BROKEN_TSS = 4;
+    /**
+     * RC4
+     *
+     * Not supported.
+     *
+     * @internal According to the SSH1 specs:
+     *
+     *        "The first 16 bytes of the session key are used as the key for
+     *         the server to client direction.  The remaining 16 bytes are used
+     *         as the key for the client to server direction.  This gives
+     *         independent 128-bit keys for each direction."
+     *
+     *     This library currently only supports encryption when the same key is being used for both directions.  This is
+     *     because there's only one $crypto object.  Two could be added ($encrypt and $decrypt, perhaps).
+     */
+    const CIPHER_RC4 = 5;
+    /**
+     * Blowfish
+     *
+     * Not supported nor is it defined in the official SSH1 specs.  OpenSSH, however, defines it (see cipher.h) and
+     * uses it (see cipher.c)
+     */
+    const CIPHER_BLOWFISH = 6;
+    /**#@-*/
+
+    /**#@+
+     * Authentication Methods
+     *
+     * @see \phpseclib\Net\SSH1::getSupportedAuthentications()
+     * @access public
+    */
+    /**
+     * .rhosts or /etc/hosts.equiv
+     */
+    const AUTH_RHOSTS = 1;
+    /**
+     * pure RSA authentication
+     */
+    const AUTH_RSA = 2;
+    /**
+     * password authentication
+     *
+     * This is the only method that is supported by this library.
+     */
+    const AUTH_PASSWORD = 3;
+    /**
+     * .rhosts with RSA host authentication
+     */
+    const AUTH_RHOSTS_RSA = 4;
+    /**#@-*/
+
+    /**#@+
+     * Terminal Modes
+     *
+     * @link http://3sp.com/content/developer/maverick-net/docs/Maverick.SSH.PseudoTerminalModesMembers.html
+     * @access private
+    */
+    const TTY_OP_END = 0;
+    /**#@-*/
+
+    /**
+     * The Response Type
+     *
+     * @see \phpseclib\Net\SSH1::_get_binary_packet()
+     * @access private
+     */
+    const RESPONSE_TYPE = 1;
+
+    /**
+     * The Response Data
+     *
+     * @see \phpseclib\Net\SSH1::_get_binary_packet()
+     * @access private
+     */
+    const RESPONSE_DATA = 2;
+
+    /**#@+
+     * Execution Bitmap Masks
+     *
+     * @see \phpseclib\Net\SSH1::bitmap
+     * @access private
+    */
+    const MASK_CONSTRUCTOR = 0x00000001;
+    const MASK_CONNECTED   = 0x00000002;
+    const MASK_LOGIN       = 0x00000004;
+    const MASK_SHELL       = 0x00000008;
+    /**#@-*/
+
+    /**#@+
+     * @access public
+     * @see \phpseclib\Net\SSH1::getLog()
+    */
+    /**
+     * Returns the message numbers
+     */
+    const LOG_SIMPLE = 1;
+    /**
+     * Returns the message content
+     */
+    const LOG_COMPLEX = 2;
+    /**
+     * Outputs the content real-time
+     */
+    const LOG_REALTIME = 3;
+    /**
+     * Dumps the content real-time to a file
+     */
+    const LOG_REALTIME_FILE = 4;
+    /**#@-*/
+
+    /**#@+
+     * @access public
+     * @see \phpseclib\Net\SSH1::read()
+    */
+    /**
+     * Returns when a string matching $expect exactly is found
+     */
+    const READ_SIMPLE = 1;
+    /**
+     * Returns when a string matching the regular expression $expect is found
+     */
+    const READ_REGEX = 2;
+    /**#@-*/
+
+    /**
+     * The SSH identifier
+     *
+     * @var string
+     * @access private
+     */
+    var $identifier = 'SSH-1.5-phpseclib';
+
+    /**
+     * The Socket Object
+     *
+     * @var object
+     * @access private
+     */
+    var $fsock;
+
+    /**
+     * The cryptography object
+     *
+     * @var object
+     * @access private
+     */
+    var $crypto = false;
+
+    /**
+     * Execution Bitmap
+     *
+     * The bits that are set represent functions that have been called already.  This is used to determine
+     * if a requisite function has been successfully executed.  If not, an error should be thrown.
+     *
+     * @var int
+     * @access private
+     */
+    var $bitmap = 0;
+
+    /**
+     * The Server Key Public Exponent
+     *
+     * Logged for debug purposes
+     *
+     * @see self::getServerKeyPublicExponent()
+     * @var string
+     * @access private
+     */
+    var $server_key_public_exponent;
+
+    /**
+     * The Server Key Public Modulus
+     *
+     * Logged for debug purposes
+     *
+     * @see self::getServerKeyPublicModulus()
+     * @var string
+     * @access private
+     */
+    var $server_key_public_modulus;
+
+    /**
+     * The Host Key Public Exponent
+     *
+     * Logged for debug purposes
+     *
+     * @see self::getHostKeyPublicExponent()
+     * @var string
+     * @access private
+     */
+    var $host_key_public_exponent;
+
+    /**
+     * The Host Key Public Modulus
+     *
+     * Logged for debug purposes
+     *
+     * @see self::getHostKeyPublicModulus()
+     * @var string
+     * @access private
+     */
+    var $host_key_public_modulus;
+
+    /**
+     * Supported Ciphers
+     *
+     * Logged for debug purposes
+     *
+     * @see self::getSupportedCiphers()
+     * @var array
+     * @access private
+     */
+    var $supported_ciphers = array(
+        self::CIPHER_NONE       => 'No encryption',
+        self::CIPHER_IDEA       => 'IDEA in CFB mode',
+        self::CIPHER_DES        => 'DES in CBC mode',
+        self::CIPHER_3DES       => 'Triple-DES in CBC mode',
+        self::CIPHER_BROKEN_TSS => 'TRI\'s Simple Stream encryption CBC',
+        self::CIPHER_RC4        => 'RC4',
+        self::CIPHER_BLOWFISH   => 'Blowfish'
+    );
+
+    /**
+     * Supported Authentications
+     *
+     * Logged for debug purposes
+     *
+     * @see self::getSupportedAuthentications()
+     * @var array
+     * @access private
+     */
+    var $supported_authentications = array(
+        self::AUTH_RHOSTS     => '.rhosts or /etc/hosts.equiv',
+        self::AUTH_RSA        => 'pure RSA authentication',
+        self::AUTH_PASSWORD   => 'password authentication',
+        self::AUTH_RHOSTS_RSA => '.rhosts with RSA host authentication'
+    );
+
+    /**
+     * Server Identification
+     *
+     * @see self::getServerIdentification()
+     * @var string
+     * @access private
+     */
+    var $server_identification = '';
+
+    /**
+     * Protocol Flags
+     *
+     * @see self::__construct()
+     * @var array
+     * @access private
+     */
+    var $protocol_flags = array();
+
+    /**
+     * Protocol Flag Log
+     *
+     * @see self::getLog()
+     * @var array
+     * @access private
+     */
+    var $protocol_flag_log = array();
+
+    /**
+     * Message Log
+     *
+     * @see self::getLog()
+     * @var array
+     * @access private
+     */
+    var $message_log = array();
+
+    /**
+     * Real-time log file pointer
+     *
+     * @see self::_append_log()
+     * @var resource
+     * @access private
+     */
+    var $realtime_log_file;
+
+    /**
+     * Real-time log file size
+     *
+     * @see self::_append_log()
+     * @var int
+     * @access private
+     */
+    var $realtime_log_size;
+
+    /**
+     * Real-time log file wrap boolean
+     *
+     * @see self::_append_log()
+     * @var bool
+     * @access private
+     */
+    var $realtime_log_wrap;
+
+    /**
+     * Interactive Buffer
+     *
+     * @see self::read()
+     * @var array
+     * @access private
+     */
+    var $interactiveBuffer = '';
+
+    /**
+     * Timeout
+     *
+     * @see self::setTimeout()
+     * @access private
+     */
+    var $timeout;
+
+    /**
+     * Current Timeout
+     *
+     * @see self::_get_channel_packet()
+     * @access private
+     */
+    var $curTimeout;
+
+    /**
+     * Log Boundary
+     *
+     * @see self::_format_log()
+     * @access private
+     */
+    var $log_boundary = ':';
+
+    /**
+     * Log Long Width
+     *
+     * @see self::_format_log()
+     * @access private
+     */
+    var $log_long_width = 65;
+
+    /**
+     * Log Short Width
+     *
+     * @see self::_format_log()
+     * @access private
+     */
+    var $log_short_width = 16;
+
+    /**
+     * Hostname
+     *
+     * @see self::__construct()
+     * @see self::_connect()
+     * @var string
+     * @access private
+     */
+    var $host;
+
+    /**
+     * Port Number
+     *
+     * @see self::__construct()
+     * @see self::_connect()
+     * @var int
+     * @access private
+     */
+    var $port;
+
+    /**
+     * Timeout for initial connection
+     *
+     * Set by the constructor call. Calling setTimeout() is optional. If it's not called functions like
+     * exec() won't timeout unless some PHP setting forces it too. The timeout specified in the constructor,
+     * however, is non-optional. There will be a timeout, whether or not you set it. If you don't it'll be
+     * 10 seconds. It is used by fsockopen() in that function.
+     *
+     * @see self::__construct()
+     * @see self::_connect()
+     * @var int
+     * @access private
+     */
+    var $connectionTimeout;
+
+    /**
+     * Default cipher
+     *
+     * @see self::__construct()
+     * @see self::_connect()
+     * @var int
+     * @access private
+     */
+    var $cipher;
+
+    /**
+     * Default Constructor.
+     *
+     * Connects to an SSHv1 server
+     *
+     * @param string $host
+     * @param int $port
+     * @param int $timeout
+     * @param int $cipher
+     * @return \phpseclib\Net\SSH1
+     * @access public
+     */
+    function __construct($host, $port = 22, $timeout = 10, $cipher = self::CIPHER_3DES)
+    {
+        $this->protocol_flags = array(
+            1  => 'NET_SSH1_MSG_DISCONNECT',
+            2  => 'NET_SSH1_SMSG_PUBLIC_KEY',
+            3  => 'NET_SSH1_CMSG_SESSION_KEY',
+            4  => 'NET_SSH1_CMSG_USER',
+            9  => 'NET_SSH1_CMSG_AUTH_PASSWORD',
+            10 => 'NET_SSH1_CMSG_REQUEST_PTY',
+            12 => 'NET_SSH1_CMSG_EXEC_SHELL',
+            13 => 'NET_SSH1_CMSG_EXEC_CMD',
+            14 => 'NET_SSH1_SMSG_SUCCESS',
+            15 => 'NET_SSH1_SMSG_FAILURE',
+            16 => 'NET_SSH1_CMSG_STDIN_DATA',
+            17 => 'NET_SSH1_SMSG_STDOUT_DATA',
+            18 => 'NET_SSH1_SMSG_STDERR_DATA',
+            19 => 'NET_SSH1_CMSG_EOF',
+            20 => 'NET_SSH1_SMSG_EXITSTATUS',
+            33 => 'NET_SSH1_CMSG_EXIT_CONFIRMATION'
+        );
+
+        $this->_define_array($this->protocol_flags);
+
+        $this->host = $host;
+        $this->port = $port;
+        $this->connectionTimeout = $timeout;
+        $this->cipher = $cipher;
+    }
+
+    /**
+     * Connect to an SSHv1 server
+     *
+     * @return bool
+     * @access private
+     */
+    function _connect()
+    {
+        $this->fsock = @fsockopen($this->host, $this->port, $errno, $errstr, $this->connectionTimeout);
+        if (!$this->fsock) {
+            user_error(rtrim("Cannot connect to {$this->host}:{$this->port}. Error $errno. $errstr"));
+            return false;
+        }
+
+        $this->server_identification = $init_line = fgets($this->fsock, 255);
+
+        if (defined('NET_SSH1_LOGGING')) {
+            $this->_append_log('<-', $this->server_identification);
+            $this->_append_log('->', $this->identifier . "\r\n");
+        }
+
+        if (!preg_match('#SSH-([0-9\.]+)-(.+)#', $init_line, $parts)) {
+            user_error('Can only connect to SSH servers');
+            return false;
+        }
+        if ($parts[1][0] != 1) {
+            user_error("Cannot connect to SSH $parts[1] servers");
+            return false;
+        }
+
+        fputs($this->fsock, $this->identifier."\r\n");
+
+        $response = $this->_get_binary_packet();
+        if ($response[self::RESPONSE_TYPE] != NET_SSH1_SMSG_PUBLIC_KEY) {
+            user_error('Expected SSH_SMSG_PUBLIC_KEY');
+            return false;
+        }
+
+        $anti_spoofing_cookie = $this->_string_shift($response[self::RESPONSE_DATA], 8);
+
+        $this->_string_shift($response[self::RESPONSE_DATA], 4);
+
+        $temp = unpack('nlen', $this->_string_shift($response[self::RESPONSE_DATA], 2));
+        $server_key_public_exponent = new BigInteger($this->_string_shift($response[self::RESPONSE_DATA], ceil($temp['len'] / 8)), 256);
+        $this->server_key_public_exponent = $server_key_public_exponent;
+
+        $temp = unpack('nlen', $this->_string_shift($response[self::RESPONSE_DATA], 2));
+        $server_key_public_modulus = new BigInteger($this->_string_shift($response[self::RESPONSE_DATA], ceil($temp['len'] / 8)), 256);
+        $this->server_key_public_modulus = $server_key_public_modulus;
+
+        $this->_string_shift($response[self::RESPONSE_DATA], 4);
+
+        $temp = unpack('nlen', $this->_string_shift($response[self::RESPONSE_DATA], 2));
+        $host_key_public_exponent = new BigInteger($this->_string_shift($response[self::RESPONSE_DATA], ceil($temp['len'] / 8)), 256);
+        $this->host_key_public_exponent = $host_key_public_exponent;
+
+        $temp = unpack('nlen', $this->_string_shift($response[self::RESPONSE_DATA], 2));
+        $host_key_public_modulus = new BigInteger($this->_string_shift($response[self::RESPONSE_DATA], ceil($temp['len'] / 8)), 256);
+        $this->host_key_public_modulus = $host_key_public_modulus;
+
+        $this->_string_shift($response[self::RESPONSE_DATA], 4);
+
+        // get a list of the supported ciphers
+        extract(unpack('Nsupported_ciphers_mask', $this->_string_shift($response[self::RESPONSE_DATA], 4)));
+        foreach ($this->supported_ciphers as $mask => $name) {
+            if (($supported_ciphers_mask & (1 << $mask)) == 0) {
+                unset($this->supported_ciphers[$mask]);
+            }
+        }
+
+        // get a list of the supported authentications
+        extract(unpack('Nsupported_authentications_mask', $this->_string_shift($response[self::RESPONSE_DATA], 4)));
+        foreach ($this->supported_authentications as $mask => $name) {
+            if (($supported_authentications_mask & (1 << $mask)) == 0) {
+                unset($this->supported_authentications[$mask]);
+            }
+        }
+
+        $session_id = pack('H*', md5($host_key_public_modulus->toBytes() . $server_key_public_modulus->toBytes() . $anti_spoofing_cookie));
+
+        $session_key = Random::string(32);
+        $double_encrypted_session_key = $session_key ^ str_pad($session_id, 32, chr(0));
+
+        if ($server_key_public_modulus->compare($host_key_public_modulus) < 0) {
+            $double_encrypted_session_key = $this->_rsa_crypt(
+                $double_encrypted_session_key,
+                array(
+                    $server_key_public_exponent,
+                    $server_key_public_modulus
+                )
+            );
+            $double_encrypted_session_key = $this->_rsa_crypt(
+                $double_encrypted_session_key,
+                array(
+                    $host_key_public_exponent,
+                    $host_key_public_modulus
+                )
+            );
+        } else {
+            $double_encrypted_session_key = $this->_rsa_crypt(
+                $double_encrypted_session_key,
+                array(
+                    $host_key_public_exponent,
+                    $host_key_public_modulus
+                )
+            );
+            $double_encrypted_session_key = $this->_rsa_crypt(
+                $double_encrypted_session_key,
+                array(
+                    $server_key_public_exponent,
+                    $server_key_public_modulus
+                )
+            );
+        }
+
+        $cipher = isset($this->supported_ciphers[$this->cipher]) ? $this->cipher : self::CIPHER_3DES;
+        $data = pack('C2a*na*N', NET_SSH1_CMSG_SESSION_KEY, $cipher, $anti_spoofing_cookie, 8 * strlen($double_encrypted_session_key), $double_encrypted_session_key, 0);
+
+        if (!$this->_send_binary_packet($data)) {
+            user_error('Error sending SSH_CMSG_SESSION_KEY');
+            return false;
+        }
+
+        switch ($cipher) {
+            //case self::CIPHER_NONE:
+            //    $this->crypto = new \phpseclib\Crypt\Null();
+            //    break;
+            case self::CIPHER_DES:
+                $this->crypto = new DES();
+                $this->crypto->disablePadding();
+                $this->crypto->enableContinuousBuffer();
+                $this->crypto->setKey(substr($session_key, 0,  8));
+                break;
+            case self::CIPHER_3DES:
+                $this->crypto = new TripleDES(TripleDES::MODE_3CBC);
+                $this->crypto->disablePadding();
+                $this->crypto->enableContinuousBuffer();
+                $this->crypto->setKey(substr($session_key, 0, 24));
+                break;
+            //case self::CIPHER_RC4:
+            //    $this->crypto = new RC4();
+            //    $this->crypto->enableContinuousBuffer();
+            //    $this->crypto->setKey(substr($session_key, 0,  16));
+            //    break;
+        }
+
+        $response = $this->_get_binary_packet();
+
+        if ($response[self::RESPONSE_TYPE] != NET_SSH1_SMSG_SUCCESS) {
+            user_error('Expected SSH_SMSG_SUCCESS');
+            return false;
+        }
+
+        $this->bitmap = self::MASK_CONNECTED;
+
+        return true;
+    }
+
+    /**
+     * Login
+     *
+     * @param string $username
+     * @param string $password
+     * @return bool
+     * @access public
+     */
+    function login($username, $password = '')
+    {
+        if (!($this->bitmap & self::MASK_CONSTRUCTOR)) {
+            $this->bitmap |= self::MASK_CONSTRUCTOR;
+            if (!$this->_connect()) {
+                return false;
+            }
+        }
+
+        if (!($this->bitmap & self::MASK_CONNECTED)) {
+            return false;
+        }
+
+        $data = pack('CNa*', NET_SSH1_CMSG_USER, strlen($username), $username);
+
+        if (!$this->_send_binary_packet($data)) {
+            user_error('Error sending SSH_CMSG_USER');
+            return false;
+        }
+
+        $response = $this->_get_binary_packet();
+
+        if ($response === true) {
+            return false;
+        }
+        if ($response[self::RESPONSE_TYPE] == NET_SSH1_SMSG_SUCCESS) {
+            $this->bitmap |= self::MASK_LOGIN;
+            return true;
+        } elseif ($response[self::RESPONSE_TYPE] != NET_SSH1_SMSG_FAILURE) {
+            user_error('Expected SSH_SMSG_SUCCESS or SSH_SMSG_FAILURE');
+            return false;
+        }
+
+        $data = pack('CNa*', NET_SSH1_CMSG_AUTH_PASSWORD, strlen($password), $password);
+
+        if (!$this->_send_binary_packet($data)) {
+            user_error('Error sending SSH_CMSG_AUTH_PASSWORD');
+            return false;
+        }
+
+        // remove the username and password from the last logged packet
+        if (defined('NET_SSH1_LOGGING') && NET_SSH1_LOGGING == self::LOG_COMPLEX) {
+            $data = pack('CNa*', NET_SSH1_CMSG_AUTH_PASSWORD, strlen('password'), 'password');
+            $this->message_log[count($this->message_log) - 1] = $data;
+        }
+
+        $response = $this->_get_binary_packet();
+
+        if ($response === true) {
+            return false;
+        }
+        if ($response[self::RESPONSE_TYPE] == NET_SSH1_SMSG_SUCCESS) {
+            $this->bitmap |= self::MASK_LOGIN;
+            return true;
+        } elseif ($response[self::RESPONSE_TYPE] == NET_SSH1_SMSG_FAILURE) {
+            return false;
+        } else {
+            user_error('Expected SSH_SMSG_SUCCESS or SSH_SMSG_FAILURE');
+            return false;
+        }
+    }
+
+    /**
+     * Set Timeout
+     *
+     * $ssh->exec('ping 127.0.0.1'); on a Linux host will never return and will run indefinitely.  setTimeout() makes it so it'll timeout.
+     * Setting $timeout to false or 0 will mean there is no timeout.
+     *
+     * @param mixed $timeout
+     */
+    function setTimeout($timeout)
+    {
+        $this->timeout = $this->curTimeout = $timeout;
+    }
+
+    /**
+     * Executes a command on a non-interactive shell, returns the output, and quits.
+     *
+     * An SSH1 server will close the connection after a command has been executed on a non-interactive shell.  SSH2
+     * servers don't, however, this isn't an SSH2 client.  The way this works, on the server, is by initiating a
+     * shell with the -s option, as discussed in the following links:
+     *
+     * {@link http://www.faqs.org/docs/bashman/bashref_65.html http://www.faqs.org/docs/bashman/bashref_65.html}
+     * {@link http://www.faqs.org/docs/bashman/bashref_62.html http://www.faqs.org/docs/bashman/bashref_62.html}
+     *
+     * To execute further commands, a new \phpseclib\Net\SSH1 object will need to be created.
+     *
+     * Returns false on failure and the output, otherwise.
+     *
+     * @see self::interactiveRead()
+     * @see self::interactiveWrite()
+     * @param string $cmd
+     * @return mixed
+     * @access public
+     */
+    function exec($cmd, $block = true)
+    {
+        if (!($this->bitmap & self::MASK_LOGIN)) {
+            user_error('Operation disallowed prior to login()');
+            return false;
+        }
+
+        $data = pack('CNa*', NET_SSH1_CMSG_EXEC_CMD, strlen($cmd), $cmd);
+
+        if (!$this->_send_binary_packet($data)) {
+            user_error('Error sending SSH_CMSG_EXEC_CMD');
+            return false;
+        }
+
+        if (!$block) {
+            return true;
+        }
+
+        $output = '';
+        $response = $this->_get_binary_packet();
+
+        if ($response !== false) {
+            do {
+                $output.= substr($response[self::RESPONSE_DATA], 4);
+                $response = $this->_get_binary_packet();
+            } while (is_array($response) && $response[self::RESPONSE_TYPE] != NET_SSH1_SMSG_EXITSTATUS);
+        }
+
+        $data = pack('C', NET_SSH1_CMSG_EXIT_CONFIRMATION);
+
+        // i don't think it's really all that important if this packet gets sent or not.
+        $this->_send_binary_packet($data);
+
+        fclose($this->fsock);
+
+        // reset the execution bitmap - a new \phpseclib\Net\SSH1 object needs to be created.
+        $this->bitmap = 0;
+
+        return $output;
+    }
+
+    /**
+     * Creates an interactive shell
+     *
+     * @see self::interactiveRead()
+     * @see self::interactiveWrite()
+     * @return bool
+     * @access private
+     */
+    function _initShell()
+    {
+        // connect using the sample parameters in protocol-1.5.txt.
+        // according to wikipedia.org's entry on text terminals, "the fundamental type of application running on a text
+        // terminal is a command line interpreter or shell".  thus, opening a terminal session to run the shell.
+        $data = pack('CNa*N4C', NET_SSH1_CMSG_REQUEST_PTY, strlen('vt100'), 'vt100', 24, 80, 0, 0, self::TTY_OP_END);
+
+        if (!$this->_send_binary_packet($data)) {
+            user_error('Error sending SSH_CMSG_REQUEST_PTY');
+            return false;
+        }
+
+        $response = $this->_get_binary_packet();
+
+        if ($response === true) {
+            return false;
+        }
+        if ($response[self::RESPONSE_TYPE] != NET_SSH1_SMSG_SUCCESS) {
+            user_error('Expected SSH_SMSG_SUCCESS');
+            return false;
+        }
+
+        $data = pack('C', NET_SSH1_CMSG_EXEC_SHELL);
+
+        if (!$this->_send_binary_packet($data)) {
+            user_error('Error sending SSH_CMSG_EXEC_SHELL');
+            return false;
+        }
+
+        $this->bitmap |= self::MASK_SHELL;
+
+        //stream_set_blocking($this->fsock, 0);
+
+        return true;
+    }
+
+    /**
+     * Inputs a command into an interactive shell.
+     *
+     * @see self::interactiveWrite()
+     * @param string $cmd
+     * @return bool
+     * @access public
+     */
+    function write($cmd)
+    {
+        return $this->interactiveWrite($cmd);
+    }
+
+    /**
+     * Returns the output of an interactive shell when there's a match for $expect
+     *
+     * $expect can take the form of a string literal or, if $mode == self::READ__REGEX,
+     * a regular expression.
+     *
+     * @see self::write()
+     * @param string $expect
+     * @param int $mode
+     * @return bool
+     * @access public
+     */
+    function read($expect, $mode = self::READ__SIMPLE)
+    {
+        if (!($this->bitmap & self::MASK_LOGIN)) {
+            user_error('Operation disallowed prior to login()');
+            return false;
+        }
+
+        if (!($this->bitmap & self::MASK_SHELL) && !$this->_initShell()) {
+            user_error('Unable to initiate an interactive shell session');
+            return false;
+        }
+
+        $match = $expect;
+        while (true) {
+            if ($mode == self::READ__REGEX) {
+                preg_match($expect, $this->interactiveBuffer, $matches);
+                $match = isset($matches[0]) ? $matches[0] : '';
+            }
+            $pos = strlen($match) ? strpos($this->interactiveBuffer, $match) : false;
+            if ($pos !== false) {
+                return $this->_string_shift($this->interactiveBuffer, $pos + strlen($match));
+            }
+            $response = $this->_get_binary_packet();
+
+            if ($response === true) {
+                return $this->_string_shift($this->interactiveBuffer, strlen($this->interactiveBuffer));
+            }
+            $this->interactiveBuffer.= substr($response[self::RESPONSE_DATA], 4);
+        }
+    }
+
+    /**
+     * Inputs a command into an interactive shell.
+     *
+     * @see self::interactiveRead()
+     * @param string $cmd
+     * @return bool
+     * @access public
+     */
+    function interactiveWrite($cmd)
+    {
+        if (!($this->bitmap & self::MASK_LOGIN)) {
+            user_error('Operation disallowed prior to login()');
+            return false;
+        }
+
+        if (!($this->bitmap & self::MASK_SHELL) && !$this->_initShell()) {
+            user_error('Unable to initiate an interactive shell session');
+            return false;
+        }
+
+        $data = pack('CNa*', NET_SSH1_CMSG_STDIN_DATA, strlen($cmd), $cmd);
+
+        if (!$this->_send_binary_packet($data)) {
+            user_error('Error sending SSH_CMSG_STDIN');
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Returns the output of an interactive shell when no more output is available.
+     *
+     * Requires PHP 4.3.0 or later due to the use of the stream_select() function.  If you see stuff like
+     * "^[[00m", you're seeing ANSI escape codes.  According to
+     * {@link http://support.microsoft.com/kb/101875 How to Enable ANSI.SYS in a Command Window}, "Windows NT
+     * does not support ANSI escape sequences in Win32 Console applications", so if you're a Windows user,
+     * there's not going to be much recourse.
+     *
+     * @see self::interactiveRead()
+     * @return string
+     * @access public
+     */
+    function interactiveRead()
+    {
+        if (!($this->bitmap & self::MASK_LOGIN)) {
+            user_error('Operation disallowed prior to login()');
+            return false;
+        }
+
+        if (!($this->bitmap & self::MASK_SHELL) && !$this->_initShell()) {
+            user_error('Unable to initiate an interactive shell session');
+            return false;
+        }
+
+        $read = array($this->fsock);
+        $write = $except = null;
+        if (stream_select($read, $write, $except, 0)) {
+            $response = $this->_get_binary_packet();
+            return substr($response[self::RESPONSE_DATA], 4);
+        } else {
+            return '';
+        }
+    }
+
+    /**
+     * Disconnect
+     *
+     * @access public
+     */
+    function disconnect()
+    {
+        $this->_disconnect();
+    }
+
+    /**
+     * Destructor.
+     *
+     * Will be called, automatically, if you're supporting just PHP5.  If you're supporting PHP4, you'll need to call
+     * disconnect().
+     *
+     * @access public
+     */
+    function __destruct()
+    {
+        $this->_disconnect();
+    }
+
+    /**
+     * Disconnect
+     *
+     * @param string $msg
+     * @access private
+     */
+    function _disconnect($msg = 'Client Quit')
+    {
+        if ($this->bitmap) {
+            $data = pack('C', NET_SSH1_CMSG_EOF);
+            $this->_send_binary_packet($data);
+            /*
+            $response = $this->_get_binary_packet();
+            if ($response === true) {
+                $response = array(self::RESPONSE_TYPE => -1);
+            }
+            switch ($response[self::RESPONSE_TYPE]) {
+                case NET_SSH1_SMSG_EXITSTATUS:
+                    $data = pack('C', NET_SSH1_CMSG_EXIT_CONFIRMATION);
+                    break;
+                default:
+                    $data = pack('CNa*', NET_SSH1_MSG_DISCONNECT, strlen($msg), $msg);
+            }
+            */
+            $data = pack('CNa*', NET_SSH1_MSG_DISCONNECT, strlen($msg), $msg);
+
+            $this->_send_binary_packet($data);
+            fclose($this->fsock);
+            $this->bitmap = 0;
+        }
+    }
+
+    /**
+     * Gets Binary Packets
+     *
+     * See 'The Binary Packet Protocol' of protocol-1.5.txt for more info.
+     *
+     * Also, this function could be improved upon by adding detection for the following exploit:
+     * http://www.securiteam.com/securitynews/5LP042K3FY.html
+     *
+     * @see self::_send_binary_packet()
+     * @return array
+     * @access private
+     */
+    function _get_binary_packet()
+    {
+        if (feof($this->fsock)) {
+            //user_error('connection closed prematurely');
+            return false;
+        }
+
+        if ($this->curTimeout) {
+            $read = array($this->fsock);
+            $write = $except = null;
+
+            $start = strtok(microtime(), ' ') + strtok(''); // http://php.net/microtime#61838
+            $sec = floor($this->curTimeout);
+            $usec = 1000000 * ($this->curTimeout - $sec);
+            // on windows this returns a "Warning: Invalid CRT parameters detected" error
+            if (!@stream_select($read, $write, $except, $sec, $usec) && !count($read)) {
+                //$this->_disconnect('Timeout');
+                return true;
+            }
+            $elapsed = strtok(microtime(), ' ') + strtok('') - $start;
+            $this->curTimeout-= $elapsed;
+        }
+
+        $start = strtok(microtime(), ' ') + strtok(''); // http://php.net/microtime#61838
+        $temp = unpack('Nlength', fread($this->fsock, 4));
+
+        $padding_length = 8 - ($temp['length'] & 7);
+        $length = $temp['length'] + $padding_length;
+        $raw = '';
+
+        while ($length > 0) {
+            $temp = fread($this->fsock, $length);
+            $raw.= $temp;
+            $length-= strlen($temp);
+        }
+        $stop = strtok(microtime(), ' ') + strtok('');
+
+        if (strlen($raw) && $this->crypto !== false) {
+            $raw = $this->crypto->decrypt($raw);
+        }
+
+        $padding = substr($raw, 0, $padding_length);
+        $type = $raw[$padding_length];
+        $data = substr($raw, $padding_length + 1, -4);
+
+        $temp = unpack('Ncrc', substr($raw, -4));
+
+        //if ( $temp['crc'] != $this->_crc($padding . $type . $data) ) {
+        //    user_error('Bad CRC in packet from server');
+        //    return false;
+        //}
+
+        $type = ord($type);
+
+        if (defined('NET_SSH1_LOGGING')) {
+            $temp = isset($this->protocol_flags[$type]) ? $this->protocol_flags[$type] : 'UNKNOWN';
+            $temp = '<- ' . $temp .
+                    ' (' . round($stop - $start, 4) . 's)';
+            $this->_append_log($temp, $data);
+        }
+
+        return array(
+            self::RESPONSE_TYPE => $type,
+            self::RESPONSE_DATA => $data
+        );
+    }
+
+    /**
+     * Sends Binary Packets
+     *
+     * Returns true on success, false on failure.
+     *
+     * @see self::_get_binary_packet()
+     * @param string $data
+     * @return bool
+     * @access private
+     */
+    function _send_binary_packet($data)
+    {
+        if (feof($this->fsock)) {
+            //user_error('connection closed prematurely');
+            return false;
+        }
+
+        $length = strlen($data) + 4;
+
+        $padding = Random::string(8 - ($length & 7));
+
+        $orig = $data;
+        $data = $padding . $data;
+        $data.= pack('N', $this->_crc($data));
+
+        if ($this->crypto !== false) {
+            $data = $this->crypto->encrypt($data);
+        }
+
+        $packet = pack('Na*', $length, $data);
+
+        $start = strtok(microtime(), ' ') + strtok(''); // http://php.net/microtime#61838
+        $result = strlen($packet) == fputs($this->fsock, $packet);
+        $stop = strtok(microtime(), ' ') + strtok('');
+
+        if (defined('NET_SSH1_LOGGING')) {
+            $temp = isset($this->protocol_flags[ord($orig[0])]) ? $this->protocol_flags[ord($orig[0])] : 'UNKNOWN';
+            $temp = '-> ' . $temp .
+                    ' (' . round($stop - $start, 4) . 's)';
+            $this->_append_log($temp, $orig);
+        }
+
+        return $result;
+    }
+
+    /**
+     * Cyclic Redundancy Check (CRC)
+     *
+     * PHP's crc32 function is implemented slightly differently than the one that SSH v1 uses, so
+     * we've reimplemented it. A more detailed discussion of the differences can be found after
+     * $crc_lookup_table's initialization.
+     *
+     * @see self::_get_binary_packet()
+     * @see self::_send_binary_packet()
+     * @param string $data
+     * @return int
+     * @access private
+     */
+    function _crc($data)
+    {
+        static $crc_lookup_table = array(
+            0x00000000, 0x77073096, 0xEE0E612C, 0x990951BA,
+            0x076DC419, 0x706AF48F, 0xE963A535, 0x9E6495A3,
+            0x0EDB8832, 0x79DCB8A4, 0xE0D5E91E, 0x97D2D988,
+            0x09B64C2B, 0x7EB17CBD, 0xE7B82D07, 0x90BF1D91,
+            0x1DB71064, 0x6AB020F2, 0xF3B97148, 0x84BE41DE,
+            0x1ADAD47D, 0x6DDDE4EB, 0xF4D4B551, 0x83D385C7,
+            0x136C9856, 0x646BA8C0, 0xFD62F97A, 0x8A65C9EC,
+            0x14015C4F, 0x63066CD9, 0xFA0F3D63, 0x8D080DF5,
+            0x3B6E20C8, 0x4C69105E, 0xD56041E4, 0xA2677172,
+            0x3C03E4D1, 0x4B04D447, 0xD20D85FD, 0xA50AB56B,
+            0x35B5A8FA, 0x42B2986C, 0xDBBBC9D6, 0xACBCF940,
+            0x32D86CE3, 0x45DF5C75, 0xDCD60DCF, 0xABD13D59,
+            0x26D930AC, 0x51DE003A, 0xC8D75180, 0xBFD06116,
+            0x21B4F4B5, 0x56B3C423, 0xCFBA9599, 0xB8BDA50F,
+            0x2802B89E, 0x5F058808, 0xC60CD9B2, 0xB10BE924,
+            0x2F6F7C87, 0x58684C11, 0xC1611DAB, 0xB6662D3D,
+            0x76DC4190, 0x01DB7106, 0x98D220BC, 0xEFD5102A,
+            0x71B18589, 0x06B6B51F, 0x9FBFE4A5, 0xE8B8D433,
+            0x7807C9A2, 0x0F00F934, 0x9609A88E, 0xE10E9818,
+            0x7F6A0DBB, 0x086D3D2D, 0x91646C97, 0xE6635C01,
+            0x6B6B51F4, 0x1C6C6162, 0x856530D8, 0xF262004E,
+            0x6C0695ED, 0x1B01A57B, 0x8208F4C1, 0xF50FC457,
+            0x65B0D9C6, 0x12B7E950, 0x8BBEB8EA, 0xFCB9887C,
+            0x62DD1DDF, 0x15DA2D49, 0x8CD37CF3, 0xFBD44C65,
+            0x4DB26158, 0x3AB551CE, 0xA3BC0074, 0xD4BB30E2,
+            0x4ADFA541, 0x3DD895D7, 0xA4D1C46D, 0xD3D6F4FB,
+            0x4369E96A, 0x346ED9FC, 0xAD678846, 0xDA60B8D0,
+            0x44042D73, 0x33031DE5, 0xAA0A4C5F, 0xDD0D7CC9,
+            0x5005713C, 0x270241AA, 0xBE0B1010, 0xC90C2086,
+            0x5768B525, 0x206F85B3, 0xB966D409, 0xCE61E49F,
+            0x5EDEF90E, 0x29D9C998, 0xB0D09822, 0xC7D7A8B4,
+            0x59B33D17, 0x2EB40D81, 0xB7BD5C3B, 0xC0BA6CAD,
+            0xEDB88320, 0x9ABFB3B6, 0x03B6E20C, 0x74B1D29A,
+            0xEAD54739, 0x9DD277AF, 0x04DB2615, 0x73DC1683,
+            0xE3630B12, 0x94643B84, 0x0D6D6A3E, 0x7A6A5AA8,
+            0xE40ECF0B, 0x9309FF9D, 0x0A00AE27, 0x7D079EB1,
+            0xF00F9344, 0x8708A3D2, 0x1E01F268, 0x6906C2FE,
+            0xF762575D, 0x806567CB, 0x196C3671, 0x6E6B06E7,
+            0xFED41B76, 0x89D32BE0, 0x10DA7A5A, 0x67DD4ACC,
+            0xF9B9DF6F, 0x8EBEEFF9, 0x17B7BE43, 0x60B08ED5,
+            0xD6D6A3E8, 0xA1D1937E, 0x38D8C2C4, 0x4FDFF252,
+            0xD1BB67F1, 0xA6BC5767, 0x3FB506DD, 0x48B2364B,
+            0xD80D2BDA, 0xAF0A1B4C, 0x36034AF6, 0x41047A60,
+            0xDF60EFC3, 0xA867DF55, 0x316E8EEF, 0x4669BE79,
+            0xCB61B38C, 0xBC66831A, 0x256FD2A0, 0x5268E236,
+            0xCC0C7795, 0xBB0B4703, 0x220216B9, 0x5505262F,
+            0xC5BA3BBE, 0xB2BD0B28, 0x2BB45A92, 0x5CB36A04,
+            0xC2D7FFA7, 0xB5D0CF31, 0x2CD99E8B, 0x5BDEAE1D,
+            0x9B64C2B0, 0xEC63F226, 0x756AA39C, 0x026D930A,
+            0x9C0906A9, 0xEB0E363F, 0x72076785, 0x05005713,
+            0x95BF4A82, 0xE2B87A14, 0x7BB12BAE, 0x0CB61B38,
+            0x92D28E9B, 0xE5D5BE0D, 0x7CDCEFB7, 0x0BDBDF21,
+            0x86D3D2D4, 0xF1D4E242, 0x68DDB3F8, 0x1FDA836E,
+            0x81BE16CD, 0xF6B9265B, 0x6FB077E1, 0x18B74777,
+            0x88085AE6, 0xFF0F6A70, 0x66063BCA, 0x11010B5C,
+            0x8F659EFF, 0xF862AE69, 0x616BFFD3, 0x166CCF45,
+            0xA00AE278, 0xD70DD2EE, 0x4E048354, 0x3903B3C2,
+            0xA7672661, 0xD06016F7, 0x4969474D, 0x3E6E77DB,
+            0xAED16A4A, 0xD9D65ADC, 0x40DF0B66, 0x37D83BF0,
+            0xA9BCAE53, 0xDEBB9EC5, 0x47B2CF7F, 0x30B5FFE9,
+            0xBDBDF21C, 0xCABAC28A, 0x53B39330, 0x24B4A3A6,
+            0xBAD03605, 0xCDD70693, 0x54DE5729, 0x23D967BF,
+            0xB3667A2E, 0xC4614AB8, 0x5D681B02, 0x2A6F2B94,
+            0xB40BBE37, 0xC30C8EA1, 0x5A05DF1B, 0x2D02EF8D
+        );
+
+        // For this function to yield the same output as PHP's crc32 function, $crc would have to be
+        // set to 0xFFFFFFFF, initially - not 0x00000000 as it currently is.
+        $crc = 0x00000000;
+        $length = strlen($data);
+
+        for ($i=0; $i<$length; $i++) {
+            // We AND $crc >> 8 with 0x00FFFFFF because we want the eight newly added bits to all
+            // be zero.  PHP, unfortunately, doesn't always do this.  0x80000000 >> 8, as an example,
+            // yields 0xFF800000 - not 0x00800000.  The following link elaborates:
+            // http://www.php.net/manual/en/language.operators.bitwise.php#57281
+            $crc = (($crc >> 8) & 0x00FFFFFF) ^ $crc_lookup_table[($crc & 0xFF) ^ ord($data[$i])];
+        }
+
+        // In addition to having to set $crc to 0xFFFFFFFF, initially, the return value must be XOR'd with
+        // 0xFFFFFFFF for this function to return the same thing that PHP's crc32 function would.
+        return $crc;
+    }
+
+    /**
+     * String Shift
+     *
+     * Inspired by array_shift
+     *
+     * @param string $string
+     * @param int $index
+     * @return string
+     * @access private
+     */
+    function _string_shift(&$string, $index = 1)
+    {
+        $substr = substr($string, 0, $index);
+        $string = substr($string, $index);
+        return $substr;
+    }
+
+    /**
+     * RSA Encrypt
+     *
+     * Returns mod(pow($m, $e), $n), where $n should be the product of two (large) primes $p and $q and where $e
+     * should be a number with the property that gcd($e, ($p - 1) * ($q - 1)) == 1.  Could just make anything that
+     * calls this call modexp, instead, but I think this makes things clearer, maybe...
+     *
+     * @see self::__construct()
+     * @param BigInteger $m
+     * @param array $key
+     * @return BigInteger
+     * @access private
+     */
+    function _rsa_crypt($m, $key)
+    {
+        /*
+        $rsa = new RSA();
+        $rsa->loadKey($key, RSA::PUBLIC_FORMAT_RAW);
+        $rsa->setEncryptionMode(RSA::ENCRYPTION_PKCS1);
+        return $rsa->encrypt($m);
+        */
+
+        // To quote from protocol-1.5.txt:
+        // The most significant byte (which is only partial as the value must be
+        // less than the public modulus, which is never a power of two) is zero.
+        //
+        // The next byte contains the value 2 (which stands for public-key
+        // encrypted data in the PKCS standard [PKCS#1]).  Then, there are non-
+        // zero random bytes to fill any unused space, a zero byte, and the data
+        // to be encrypted in the least significant bytes, the last byte of the
+        // data in the least significant byte.
+
+        // Presumably the part of PKCS#1 they're refering to is "Section 7.2.1 Encryption Operation",
+        // under "7.2 RSAES-PKCS1-v1.5" and "7 Encryption schemes" of the following URL:
+        // ftp://ftp.rsasecurity.com/pub/pkcs/pkcs-1/pkcs-1v2-1.pdf
+        $modulus = $key[1]->toBytes();
+        $length = strlen($modulus) - strlen($m) - 3;
+        $random = '';
+        while (strlen($random) != $length) {
+            $block = Random::string($length - strlen($random));
+            $block = str_replace("\x00", '', $block);
+            $random.= $block;
+        }
+        $temp = chr(0) . chr(2) . $random . chr(0) . $m;
+
+        $m = new BigInteger($temp, 256);
+        $m = $m->modPow($key[0], $key[1]);
+
+        return $m->toBytes();
+    }
+
+    /**
+     * Define Array
+     *
+     * Takes any number of arrays whose indices are integers and whose values are strings and defines a bunch of
+     * named constants from it, using the value as the name of the constant and the index as the value of the constant.
+     * If any of the constants that would be defined already exists, none of the constants will be defined.
+     *
+     * @param array $array
+     * @access private
+     */
+    function _define_array()
+    {
+        $args = func_get_args();
+        foreach ($args as $arg) {
+            foreach ($arg as $key => $value) {
+                if (!defined($value)) {
+                    define($value, $key);
+                } else {
+                    break 2;
+                }
+            }
+        }
+    }
+
+    /**
+     * Returns a log of the packets that have been sent and received.
+     *
+     * Returns a string if NET_SSH1_LOGGING == self::LOG_COMPLEX, an array if NET_SSH1_LOGGING == self::LOG_SIMPLE and false if !defined('NET_SSH1_LOGGING')
+     *
+     * @access public
+     * @return array|false|string
+     */
+    function getLog()
+    {
+        if (!defined('NET_SSH1_LOGGING')) {
+            return false;
+        }
+
+        switch (NET_SSH1_LOGGING) {
+            case self::LOG_SIMPLE:
+                return $this->message_number_log;
+                break;
+            case self::LOG_COMPLEX:
+                return $this->_format_log($this->message_log, $this->protocol_flags_log);
+                break;
+            default:
+                return false;
+        }
+    }
+
+    /**
+     * Formats a log for printing
+     *
+     * @param array $message_log
+     * @param array $message_number_log
+     * @access private
+     * @return string
+     */
+    function _format_log($message_log, $message_number_log)
+    {
+        $output = '';
+        for ($i = 0; $i < count($message_log); $i++) {
+            $output.= $message_number_log[$i] . "\r\n";
+            $current_log = $message_log[$i];
+            $j = 0;
+            do {
+                if (strlen($current_log)) {
+                    $output.= str_pad(dechex($j), 7, '0', STR_PAD_LEFT) . '0  ';
+                }
+                $fragment = $this->_string_shift($current_log, $this->log_short_width);
+                $hex = substr(preg_replace_callback('#.#s', array($this, '_format_log_helper'), $fragment), strlen($this->log_boundary));
+                // replace non ASCII printable characters with dots
+                // http://en.wikipedia.org/wiki/ASCII#ASCII_printable_characters
+                // also replace < with a . since < messes up the output on web browsers
+                $raw = preg_replace('#[^\x20-\x7E]|<#', '.', $fragment);
+                $output.= str_pad($hex, $this->log_long_width - $this->log_short_width, ' ') . $raw . "\r\n";
+                $j++;
+            } while (strlen($current_log));
+            $output.= "\r\n";
+        }
+
+        return $output;
+    }
+
+    /**
+     * Helper function for _format_log
+     *
+     * For use with preg_replace_callback()
+     *
+     * @param array $matches
+     * @access private
+     * @return string
+     */
+    function _format_log_helper($matches)
+    {
+        return $this->log_boundary . str_pad(dechex(ord($matches[0])), 2, '0', STR_PAD_LEFT);
+    }
+
+    /**
+     * Return the server key public exponent
+     *
+     * Returns, by default, the base-10 representation.  If $raw_output is set to true, returns, instead,
+     * the raw bytes.  This behavior is similar to PHP's md5() function.
+     *
+     * @param bool $raw_output
+     * @return string
+     * @access public
+     */
+    function getServerKeyPublicExponent($raw_output = false)
+    {
+        return $raw_output ? $this->server_key_public_exponent->toBytes() : $this->server_key_public_exponent->toString();
+    }
+
+    /**
+     * Return the server key public modulus
+     *
+     * Returns, by default, the base-10 representation.  If $raw_output is set to true, returns, instead,
+     * the raw bytes.  This behavior is similar to PHP's md5() function.
+     *
+     * @param bool $raw_output
+     * @return string
+     * @access public
+     */
+    function getServerKeyPublicModulus($raw_output = false)
+    {
+        return $raw_output ? $this->server_key_public_modulus->toBytes() : $this->server_key_public_modulus->toString();
+    }
+
+    /**
+     * Return the host key public exponent
+     *
+     * Returns, by default, the base-10 representation.  If $raw_output is set to true, returns, instead,
+     * the raw bytes.  This behavior is similar to PHP's md5() function.
+     *
+     * @param bool $raw_output
+     * @return string
+     * @access public
+     */
+    function getHostKeyPublicExponent($raw_output = false)
+    {
+        return $raw_output ? $this->host_key_public_exponent->toBytes() : $this->host_key_public_exponent->toString();
+    }
+
+    /**
+     * Return the host key public modulus
+     *
+     * Returns, by default, the base-10 representation.  If $raw_output is set to true, returns, instead,
+     * the raw bytes.  This behavior is similar to PHP's md5() function.
+     *
+     * @param bool $raw_output
+     * @return string
+     * @access public
+     */
+    function getHostKeyPublicModulus($raw_output = false)
+    {
+        return $raw_output ? $this->host_key_public_modulus->toBytes() : $this->host_key_public_modulus->toString();
+    }
+
+    /**
+     * Return a list of ciphers supported by SSH1 server.
+     *
+     * Just because a cipher is supported by an SSH1 server doesn't mean it's supported by this library. If $raw_output
+     * is set to true, returns, instead, an array of constants.  ie. instead of array('Triple-DES in CBC mode'), you'll
+     * get array(self::CIPHER_3DES).
+     *
+     * @param bool $raw_output
+     * @return array
+     * @access public
+     */
+    function getSupportedCiphers($raw_output = false)
+    {
+        return $raw_output ? array_keys($this->supported_ciphers) : array_values($this->supported_ciphers);
+    }
+
+    /**
+     * Return a list of authentications supported by SSH1 server.
+     *
+     * Just because a cipher is supported by an SSH1 server doesn't mean it's supported by this library. If $raw_output
+     * is set to true, returns, instead, an array of constants.  ie. instead of array('password authentication'), you'll
+     * get array(self::AUTH_PASSWORD).
+     *
+     * @param bool $raw_output
+     * @return array
+     * @access public
+     */
+    function getSupportedAuthentications($raw_output = false)
+    {
+        return $raw_output ? array_keys($this->supported_authentications) : array_values($this->supported_authentications);
+    }
+
+    /**
+     * Return the server identification.
+     *
+     * @return string
+     * @access public
+     */
+    function getServerIdentification()
+    {
+        return rtrim($this->server_identification);
+    }
+
+    /**
+     * Logs data packets
+     *
+     * Makes sure that only the last 1MB worth of packets will be logged
+     *
+     * @param string $data
+     * @access private
+     */
+    function _append_log($protocol_flags, $message)
+    {
+        switch (NET_SSH1_LOGGING) {
+            // useful for benchmarks
+            case self::LOG_SIMPLE:
+                $this->protocol_flags_log[] = $protocol_flags;
+                break;
+            // the most useful log for SSH1
+            case self::LOG_COMPLEX:
+                $this->protocol_flags_log[] = $protocol_flags;
+                $this->_string_shift($message);
+                $this->log_size+= strlen($message);
+                $this->message_log[] = $message;
+                while ($this->log_size > self::LOG_MAX_SIZE) {
+                    $this->log_size-= strlen(array_shift($this->message_log));
+                    array_shift($this->protocol_flags_log);
+                }
+                break;
+            // dump the output out realtime; packets may be interspersed with non packets,
+            // passwords won't be filtered out and select other packets may not be correctly
+            // identified
+            case self::LOG_REALTIME:
+                echo "<pre>\r\n" . $this->_format_log(array($message), array($protocol_flags)) . "\r\n</pre>\r\n";
+                @flush();
+                @ob_flush();
+                break;
+            // basically the same thing as self::LOG_REALTIME with the caveat that self::LOG_REALTIME_FILE
+            // needs to be defined and that the resultant log file will be capped out at self::LOG_MAX_SIZE.
+            // the earliest part of the log file is denoted by the first <<< START >>> and is not going to necessarily
+            // at the beginning of the file
+            case self::LOG_REALTIME_FILE:
+                if (!isset($this->realtime_log_file)) {
+                    // PHP doesn't seem to like using constants in fopen()
+                    $filename = self::LOG_REALTIME_FILE;
+                    $fp = fopen($filename, 'w');
+                    $this->realtime_log_file = $fp;
+                }
+                if (!is_resource($this->realtime_log_file)) {
+                    break;
+                }
+                $entry = $this->_format_log(array($message), array($protocol_flags));
+                if ($this->realtime_log_wrap) {
+                    $temp = "<<< START >>>\r\n";
+                    $entry.= $temp;
+                    fseek($this->realtime_log_file, ftell($this->realtime_log_file) - strlen($temp));
+                }
+                $this->realtime_log_size+= strlen($entry);
+                if ($this->realtime_log_size > self::LOG_MAX_SIZE) {
+                    fseek($this->realtime_log_file, 0);
+                    $this->realtime_log_size = strlen($entry);
+                    $this->realtime_log_wrap = true;
+                }
+                fputs($this->realtime_log_file, $entry);
+        }
+    }
+}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/Net/SSH2.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/Net/SSH2.php
index eee2e108..11580755 100644
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/Net/SSH2.php
+++ b/securemail/vendor/phpseclib/phpseclib/phpseclib/Net/SSH2.php
@@ -10,7 +10,7 @@
  * <?php
  *    include 'vendor/autoload.php';
  *
- *    $ssh = new \phpseclib3\Net\SSH2('www.domain.tld');
+ *    $ssh = new \phpseclib\Net\SSH2('www.domain.tld');
  *    if (!$ssh->login('username', 'password')) {
  *        exit('Login Failed');
  *    }
@@ -24,9 +24,11 @@
  * <?php
  *    include 'vendor/autoload.php';
  *
- *    $key = \phpseclib3\Crypt\PublicKeyLoader::load('...', '(optional) password');
+ *    $key = new \phpseclib\Crypt\RSA();
+ *    //$key->setPassword('whatever');
+ *    $key->loadKey(file_get_contents('privatekey'));
  *
- *    $ssh = new \phpseclib3\Net\SSH2('www.domain.tld');
+ *    $ssh = new \phpseclib\Net\SSH2('www.domain.tld');
  *    if (!$ssh->login('username', $key)) {
  *        exit('Login Failed');
  *    }
@@ -37,104 +39,83 @@
  * ?>
  * </code>
  *
+ * @category  Net
+ * @package   SSH2
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2007 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
  * @link      http://phpseclib.sourceforge.net
  */
 
-namespace phpseclib3\Net;
+namespace phpseclib\Net;
 
-use phpseclib3\Common\Functions\Strings;
-use phpseclib3\Crypt\Blowfish;
-use phpseclib3\Crypt\ChaCha20;
-use phpseclib3\Crypt\Common\AsymmetricKey;
-use phpseclib3\Crypt\Common\PrivateKey;
-use phpseclib3\Crypt\Common\PublicKey;
-use phpseclib3\Crypt\Common\SymmetricKey;
-use phpseclib3\Crypt\DH;
-use phpseclib3\Crypt\DSA;
-use phpseclib3\Crypt\EC;
-use phpseclib3\Crypt\Hash;
-use phpseclib3\Crypt\Random;
-use phpseclib3\Crypt\RC4;
-use phpseclib3\Crypt\Rijndael;
-use phpseclib3\Crypt\RSA;
-use phpseclib3\Crypt\TripleDES; // Used to do Diffie-Hellman key exchange and DSA/RSA signature verification.
-use phpseclib3\Crypt\Twofish;
-use phpseclib3\Exception\ConnectionClosedException;
-use phpseclib3\Exception\InsufficientSetupException;
-use phpseclib3\Exception\NoSupportedAlgorithmsException;
-use phpseclib3\Exception\UnableToConnectException;
-use phpseclib3\Exception\UnsupportedAlgorithmException;
-use phpseclib3\Exception\UnsupportedCurveException;
-use phpseclib3\Math\BigInteger;
-use phpseclib3\System\SSH\Agent;
+use phpseclib\Crypt\Base;
+use phpseclib\Crypt\Blowfish;
+use phpseclib\Crypt\Hash;
+use phpseclib\Crypt\Random;
+use phpseclib\Crypt\RC4;
+use phpseclib\Crypt\Rijndael;
+use phpseclib\Crypt\RSA;
+use phpseclib\Crypt\TripleDES;
+use phpseclib\Crypt\Twofish;
+use phpseclib\Math\BigInteger; // Used to do Diffie-Hellman key exchange and DSA/RSA signature verification.
+use phpseclib\System\SSH\Agent;
 
 /**
  * Pure-PHP implementation of SSHv2.
  *
+ * @package SSH2
  * @author  Jim Wigginton <terrafrost@php.net>
+ * @access  public
  */
 class SSH2
 {
     /**#@+
-     * Compression Types
+     * Execution Bitmap Masks
      *
+     * @see \phpseclib\Net\SSH2::bitmap
+     * @access private
      */
-    /**
-     * No compression
-     */
-    const NET_SSH2_COMPRESSION_NONE = 1;
-    /**
-     * zlib compression
-     */
-    const NET_SSH2_COMPRESSION_ZLIB = 2;
-    /**
-     * zlib@openssh.com
-     */
-    const NET_SSH2_COMPRESSION_ZLIB_AT_OPENSSH = 3;
-    /**#@-*/
-
-    // Execution Bitmap Masks
     const MASK_CONSTRUCTOR   = 0x00000001;
     const MASK_CONNECTED     = 0x00000002;
     const MASK_LOGIN_REQ     = 0x00000004;
     const MASK_LOGIN         = 0x00000008;
     const MASK_SHELL         = 0x00000010;
     const MASK_WINDOW_ADJUST = 0x00000020;
+    /**#@-*/
 
-    /*
+    /**#@+
      * Channel constants
      *
      * RFC4254 refers not to client and server channels but rather to sender and recipient channels.  we don't refer
      * to them in that way because RFC4254 toggles the meaning. the client sends a SSH_MSG_CHANNEL_OPEN message with
      * a sender channel and the server sends a SSH_MSG_CHANNEL_OPEN_CONFIRMATION in response, with a sender and a
-     * recipient channel.  at first glance, you might conclude that SSH_MSG_CHANNEL_OPEN_CONFIRMATION's sender channel
-     * would be the same thing as SSH_MSG_CHANNEL_OPEN's sender channel, but it's not, per this snippet:
+     * recepient channel.  at first glance, you might conclude that SSH_MSG_CHANNEL_OPEN_CONFIRMATION's sender channel
+     * would be the same thing as SSH_MSG_CHANNEL_OPEN's sender channel, but it's not, per this snipet:
      *     The 'recipient channel' is the channel number given in the original
      *     open request, and 'sender channel' is the channel number allocated by
      *     the other side.
      *
-     * @see \phpseclib3\Net\SSH2::send_channel_packet()
-     * @see \phpseclib3\Net\SSH2::get_channel_packet()
-     */
-    const CHANNEL_EXEC          = 1; // PuTTy uses 0x100
-    const CHANNEL_SHELL         = 2;
-    const CHANNEL_SUBSYSTEM     = 3;
-    const CHANNEL_AGENT_FORWARD = 4;
-    const CHANNEL_KEEP_ALIVE    = 5;
+     * @see \phpseclib\Net\SSH2::_send_channel_packet()
+     * @see \phpseclib\Net\SSH2::_get_channel_packet()
+     * @access private
+    */
+    const CHANNEL_EXEC          = 0; // PuTTy uses 0x100
+    const CHANNEL_SHELL         = 1;
+    const CHANNEL_SUBSYSTEM     = 2;
+    const CHANNEL_AGENT_FORWARD = 3;
+    /**#@-*/
 
+    /**#@+
+     * @access public
+     * @see \phpseclib\Net\SSH2::getLog()
+    */
     /**
      * Returns the message numbers
-     *
-     * @see \phpseclib3\Net\SSH2::getLog()
      */
     const LOG_SIMPLE = 1;
     /**
      * Returns the message content
-     *
-     * @see \phpseclib3\Net\SSH2::getLog()
      */
     const LOG_COMPLEX = 2;
     /**
@@ -145,52 +126,41 @@ class SSH2
      * Dumps the content real-time to a file
      */
     const LOG_REALTIME_FILE = 4;
-    /**
-     * Outputs the message numbers real-time
-     */
-    const LOG_SIMPLE_REALTIME = 5;
-    /**
-     * Make sure that the log never gets larger than this
-     *
-     * @see \phpseclib3\Net\SSH2::getLog()
-     */
-    const LOG_MAX_SIZE = 1048576; // 1024 * 1024
+    /**#@-*/
 
+    /**#@+
+     * @access public
+     * @see \phpseclib\Net\SSH2::read()
+    */
     /**
      * Returns when a string matching $expect exactly is found
-     *
-     * @see \phpseclib3\Net\SSH2::read()
      */
     const READ_SIMPLE = 1;
     /**
      * Returns when a string matching the regular expression $expect is found
-     *
-     * @see \phpseclib3\Net\SSH2::read()
      */
     const READ_REGEX = 2;
     /**
-     * Returns whenever a data packet is received.
-     *
-     * Some data packets may only contain a single character so it may be necessary
-     * to call read() multiple times when using this option
-     *
-     * @see \phpseclib3\Net\SSH2::read()
+     * Make sure that the log never gets larger than this
      */
-    const READ_NEXT = 3;
+    const LOG_MAX_SIZE = 1048576; // 1024 * 1024
+    /**#@-*/
 
     /**
      * The SSH identifier
      *
      * @var string
+     * @access private
      */
-    private $identifier;
+    var $identifier;
 
     /**
      * The Socket Object
      *
-     * @var resource|closed-resource|null
+     * @var object
+     * @access private
      */
-    public $fsock;
+    var $fsock;
 
     /**
      * Execution Bitmap
@@ -199,157 +169,145 @@ class SSH2
      * if a requisite function has been successfully executed.  If not, an error should be thrown.
      *
      * @var int
+     * @access private
      */
-    protected $bitmap = 0;
+    var $bitmap = 0;
 
     /**
      * Error information
      *
      * @see self::getErrors()
      * @see self::getLastError()
-     * @var array
+     * @var string
+     * @access private
      */
-    private $errors = [];
+    var $errors = array();
 
     /**
      * Server Identifier
      *
      * @see self::getServerIdentification()
-     * @var string|false
+     * @var array|false
+     * @access private
      */
-    protected $server_identifier = false;
+    var $server_identifier = false;
 
     /**
      * Key Exchange Algorithms
      *
      * @see self::getKexAlgorithims()
      * @var array|false
+     * @access private
      */
-    private $kex_algorithms = false;
-
-    /**
-     * Key Exchange Algorithm
-     *
-     * @see self::getMethodsNegotiated()
-     * @var string|false
-     */
-    private $kex_algorithm = false;
+    var $kex_algorithms = false;
 
     /**
      * Minimum Diffie-Hellman Group Bit Size in RFC 4419 Key Exchange Methods
      *
      * @see self::_key_exchange()
      * @var int
+     * @access private
      */
-    private $kex_dh_group_size_min = 1536;
+    var $kex_dh_group_size_min = 1536;
 
     /**
      * Preferred Diffie-Hellman Group Bit Size in RFC 4419 Key Exchange Methods
      *
      * @see self::_key_exchange()
      * @var int
+     * @access private
      */
-    private $kex_dh_group_size_preferred = 2048;
+    var $kex_dh_group_size_preferred = 2048;
 
     /**
      * Maximum Diffie-Hellman Group Bit Size in RFC 4419 Key Exchange Methods
      *
      * @see self::_key_exchange()
      * @var int
+     * @access private
      */
-    private $kex_dh_group_size_max = 4096;
+    var $kex_dh_group_size_max = 4096;
 
     /**
      * Server Host Key Algorithms
      *
      * @see self::getServerHostKeyAlgorithms()
      * @var array|false
+     * @access private
      */
-    private $server_host_key_algorithms = false;
-
-    /**
-     * Supported Private Key Algorithms
-     *
-     * In theory this should be the same as the Server Host Key Algorithms but, in practice,
-     * some servers (eg. Azure) will support rsa-sha2-512 as a server host key algorithm but
-     * not a private key algorithm
-     *
-     * @see self::privatekey_login()
-     * @var array|false
-     */
-    private $supported_private_key_algorithms = false;
+    var $server_host_key_algorithms = false;
 
     /**
      * Encryption Algorithms: Client to Server
      *
      * @see self::getEncryptionAlgorithmsClient2Server()
      * @var array|false
+     * @access private
      */
-    private $encryption_algorithms_client_to_server = false;
+    var $encryption_algorithms_client_to_server = false;
 
     /**
      * Encryption Algorithms: Server to Client
      *
      * @see self::getEncryptionAlgorithmsServer2Client()
      * @var array|false
+     * @access private
      */
-    private $encryption_algorithms_server_to_client = false;
+    var $encryption_algorithms_server_to_client = false;
 
     /**
      * MAC Algorithms: Client to Server
      *
      * @see self::getMACAlgorithmsClient2Server()
      * @var array|false
+     * @access private
      */
-    private $mac_algorithms_client_to_server = false;
+    var $mac_algorithms_client_to_server = false;
 
     /**
      * MAC Algorithms: Server to Client
      *
      * @see self::getMACAlgorithmsServer2Client()
      * @var array|false
+     * @access private
      */
-    private $mac_algorithms_server_to_client = false;
+    var $mac_algorithms_server_to_client = false;
 
     /**
      * Compression Algorithms: Client to Server
      *
      * @see self::getCompressionAlgorithmsClient2Server()
      * @var array|false
+     * @access private
      */
-    private $compression_algorithms_client_to_server = false;
+    var $compression_algorithms_client_to_server = false;
 
     /**
      * Compression Algorithms: Server to Client
      *
      * @see self::getCompressionAlgorithmsServer2Client()
      * @var array|false
+     * @access private
      */
-    private $compression_algorithms_server_to_client = false;
+    var $compression_algorithms_server_to_client = false;
 
     /**
      * Languages: Server to Client
      *
      * @see self::getLanguagesServer2Client()
      * @var array|false
+     * @access private
      */
-    private $languages_server_to_client = false;
+    var $languages_server_to_client = false;
 
     /**
      * Languages: Client to Server
      *
      * @see self::getLanguagesClient2Server()
      * @var array|false
+     * @access private
      */
-    private $languages_client_to_server = false;
-
-    /**
-     * Preferred Algorithms
-     *
-     * @see self::setPreferredAlgorithms()
-     * @var array
-     */
-    private $preferred = [];
+    var $languages_client_to_server = false;
 
     /**
      * Block Size for Server to Client Encryption
@@ -364,8 +322,9 @@ class SSH2
      * @see self::__construct()
      * @see self::_send_binary_packet()
      * @var int
+     * @access private
      */
-    private $encrypt_block_size = 8;
+    var $encrypt_block_size = 8;
 
     /**
      * Block Size for Client to Server Encryption
@@ -373,134 +332,45 @@ class SSH2
      * @see self::__construct()
      * @see self::_get_binary_packet()
      * @var int
+     * @access private
      */
-    private $decrypt_block_size = 8;
+    var $decrypt_block_size = 8;
 
     /**
      * Server to Client Encryption Object
      *
      * @see self::_get_binary_packet()
-     * @var SymmetricKey|false
-     */
-    private $decrypt = false;
-
-    /**
-     * Decryption Algorithm Name
-     *
-     * @var string|null
-     */
-    private $decryptName;
-
-    /**
-     * Decryption Invocation Counter
-     *
-     * Used by GCM
-     *
-     * @var string|null
-     */
-    private $decryptInvocationCounter;
-
-    /**
-     * Fixed Part of Nonce
-     *
-     * Used by GCM
-     *
-     * @var string|null
-     */
-    private $decryptFixedPart;
-
-    /**
-     * Server to Client Length Encryption Object
-     *
-     * @see self::_get_binary_packet()
      * @var object
+     * @access private
      */
-    private $lengthDecrypt = false;
+    var $decrypt = false;
 
     /**
      * Client to Server Encryption Object
      *
      * @see self::_send_binary_packet()
-     * @var SymmetricKey|false
-     */
-    private $encrypt = false;
-
-    /**
-     * Encryption Algorithm Name
-     *
-     * @var string|null
-     */
-    private $encryptName;
-
-    /**
-     * Encryption Invocation Counter
-     *
-     * Used by GCM
-     *
-     * @var string|null
-     */
-    private $encryptInvocationCounter;
-
-    /**
-     * Fixed Part of Nonce
-     *
-     * Used by GCM
-     *
-     * @var string|null
-     */
-    private $encryptFixedPart;
-
-    /**
-     * Client to Server Length Encryption Object
-     *
-     * @see self::_send_binary_packet()
      * @var object
+     * @access private
      */
-    private $lengthEncrypt = false;
+    var $encrypt = false;
 
     /**
      * Client to Server HMAC Object
      *
      * @see self::_send_binary_packet()
      * @var object
+     * @access private
      */
-    private $hmac_create = false;
-
-    /**
-     * Client to Server HMAC Name
-     *
-     * @var string|false
-     */
-    private $hmac_create_name;
-
-    /**
-     * Client to Server ETM
-     *
-     * @var int|false
-     */
-    private $hmac_create_etm;
+    var $hmac_create = false;
 
     /**
      * Server to Client HMAC Object
      *
      * @see self::_get_binary_packet()
      * @var object
+     * @access private
      */
-    private $hmac_check = false;
-
-    /**
-     * Server to Client HMAC Name
-     *
-     * @var string|false
-     */
-    private $hmac_check_name;
-
-    /**
-     * Server to Client ETM
-     *
-     * @var int|false
-     */
-    private $hmac_check_etm;
+    var $hmac_check = false;
 
     /**
      * Size of server to client HMAC
@@ -511,16 +381,18 @@ class SSH2
      *
      * @see self::_get_binary_packet()
      * @var int
+     * @access private
      */
-    private $hmac_size = false;
+    var $hmac_size = false;
 
     /**
      * Server Public Host Key
      *
      * @see self::getServerPublicHostKey()
      * @var string
+     * @access private
      */
-    private $server_public_host_key;
+    var $server_public_host_key;
 
     /**
      * Session identifier
@@ -533,8 +405,9 @@ class SSH2
      *
      * @see self::_key_exchange()
      * @var string
+     * @access private
      */
-    private $session_id = false;
+    var $session_id = false;
 
     /**
      * Exchange hash
@@ -543,8 +416,9 @@ class SSH2
      *
      * @see self::_key_exchange()
      * @var string
+     * @access private
      */
-    private $exchange_hash = false;
+    var $exchange_hash = false;
 
     /**
      * Message Numbers
@@ -553,7 +427,7 @@ class SSH2
      * @var array
      * @access private
      */
-    private static $message_numbers = [];
+    var $message_numbers = array();
 
     /**
      * Disconnection Message 'reason codes' defined in RFC4253
@@ -562,7 +436,7 @@ class SSH2
      * @var array
      * @access private
      */
-    private static $disconnect_reasons = [];
+    var $disconnect_reasons = array();
 
     /**
      * SSH_MSG_CHANNEL_OPEN_FAILURE 'reason codes', defined in RFC4254
@@ -571,7 +445,7 @@ class SSH2
      * @var array
      * @access private
      */
-    private static $channel_open_failure_reasons = [];
+    var $channel_open_failure_reasons = array();
 
     /**
      * Terminal Modes
@@ -581,7 +455,7 @@ class SSH2
      * @var array
      * @access private
      */
-    private static $terminal_modes = [];
+    var $terminal_modes = array();
 
     /**
      * SSH_MSG_CHANNEL_EXTENDED_DATA's data_type_codes
@@ -591,7 +465,7 @@ class SSH2
      * @var array
      * @access private
      */
-    private static $channel_extended_data_type_codes = [];
+    var $channel_extended_data_type_codes = array();
 
     /**
      * Send Sequence Number
@@ -600,8 +474,9 @@ class SSH2
      *
      * @see self::_send_binary_packet()
      * @var int
+     * @access private
      */
-    private $send_seq_no = 0;
+    var $send_seq_no = 0;
 
     /**
      * Get Sequence Number
@@ -610,19 +485,21 @@ class SSH2
      *
      * @see self::_get_binary_packet()
      * @var int
+     * @access private
      */
-    private $get_seq_no = 0;
+    var $get_seq_no = 0;
 
     /**
      * Server Channels
      *
      * Maps client channels to server channels
      *
-     * @see self::get_channel_packet()
+     * @see self::_get_channel_packet()
      * @see self::exec()
      * @var array
+     * @access private
      */
-    protected $server_channels = [];
+    var $server_channels = array();
 
     /**
      * Channel Buffers
@@ -630,55 +507,52 @@ class SSH2
      * If a client requests a packet from one channel but receives two packets from another those packets should
      * be placed in a buffer
      *
-     * @see self::get_channel_packet()
+     * @see self::_get_channel_packet()
      * @see self::exec()
      * @var array
+     * @access private
      */
-    private $channel_buffers = [];
+    var $channel_buffers = array();
 
     /**
      * Channel Status
      *
      * Contains the type of the last sent message
      *
-     * @see self::get_channel_packet()
+     * @see self::_get_channel_packet()
      * @var array
+     * @access private
      */
-    protected $channel_status = [];
-
-    /**
-     * The identifier of the interactive channel which was opened most recently
-     *
-     * @see self::getInteractiveChannelId()
-     * @var int
-     */
-    private $channel_id_last_interactive = 0;
+    var $channel_status = array();
 
     /**
      * Packet Size
      *
      * Maximum packet size indexed by channel
      *
-     * @see self::send_channel_packet()
+     * @see self::_send_channel_packet()
      * @var array
+     * @access private
      */
-    private $packet_size_client_to_server = [];
+    var $packet_size_client_to_server = array();
 
     /**
      * Message Number Log
      *
      * @see self::getLog()
      * @var array
+     * @access private
      */
-    private $message_number_log = [];
+    var $message_number_log = array();
 
     /**
      * Message Log
      *
      * @see self::getLog()
      * @var array
+     * @access private
      */
-    private $message_log = [];
+    var $message_log = array();
 
     /**
      * The Window Size
@@ -686,43 +560,33 @@ class SSH2
      * Bytes the other party can send before it must wait for the window to be adjusted (0x7FFFFFFF = 2GB)
      *
      * @var int
-     * @see self::send_channel_packet()
-     * @see self::exec()
-     */
-    protected $window_size = 0x7FFFFFFF;
-
-    /**
-     * What we resize the window to
-     *
-     * When PuTTY resizes the window it doesn't add an additional 0x7FFFFFFF bytes - it adds 0x40000000 bytes.
-     * Some SFTP clients (GoAnywhere) don't support adding 0x7FFFFFFF to the window size after the fact so
-     * we'll just do what PuTTY does
-     *
-     * @var int
      * @see self::_send_channel_packet()
      * @see self::exec()
+     * @access private
      */
-    private $window_resize = 0x40000000;
+    var $window_size = 0x7FFFFFFF;
 
     /**
      * Window size, server to client
      *
      * Window size indexed by channel
      *
-     * @see self::send_channel_packet()
+     * @see self::_send_channel_packet()
      * @var array
+     * @access private
      */
-    protected $window_size_server_to_client = [];
+    var $window_size_server_to_client = array();
 
     /**
      * Window size, client to server
      *
      * Window size indexed by channel
      *
-     * @see self::get_channel_packet()
+     * @see self::_get_channel_packet()
      * @var array
+     * @access private
      */
-    private $window_size_client_to_server = [];
+    var $window_size_client_to_server = array();
 
     /**
      * Server signature
@@ -731,8 +595,9 @@ class SSH2
      *
      * @see self::getServerPublicHostKey()
      * @var string
+     * @access private
      */
-    private $signature = '';
+    var $signature = '';
 
     /**
      * Server signature format
@@ -741,16 +606,18 @@ class SSH2
      *
      * @see self::getServerPublicHostKey()
      * @var string
+     * @access private
      */
-    private $signature_format = '';
+    var $signature_format = '';
 
     /**
      * Interactive Buffer
      *
      * @see self::read()
-     * @var string
+     * @var array
+     * @access private
      */
-    private $interactiveBuffer = '';
+    var $interactiveBuffer = '';
 
     /**
      * Current log size
@@ -760,113 +627,135 @@ class SSH2
      * @see self::_send_binary_packet()
      * @see self::_get_binary_packet()
      * @var int
+     * @access private
      */
-    private $log_size;
+    var $log_size;
 
     /**
      * Timeout
      *
      * @see self::setTimeout()
+     * @access private
      */
-    protected $timeout;
+    var $timeout;
 
     /**
      * Current Timeout
      *
-     * @see self::get_channel_packet()
+     * @see self::_get_channel_packet()
+     * @access private
      */
-    protected $curTimeout;
-
-    /**
-     * Keep Alive Interval
-     *
-     * @see self::setKeepAlive()
-     */
-    private $keepAlive;
+    var $curTimeout;
 
     /**
      * Real-time log file pointer
      *
      * @see self::_append_log()
-     * @var resource|closed-resource
+     * @var resource
+     * @access private
      */
-    private $realtime_log_file;
+    var $realtime_log_file;
 
     /**
      * Real-time log file size
      *
      * @see self::_append_log()
      * @var int
+     * @access private
      */
-    private $realtime_log_size;
+    var $realtime_log_size;
 
     /**
      * Has the signature been validated?
      *
      * @see self::getServerPublicHostKey()
      * @var bool
+     * @access private
      */
-    private $signature_validated = false;
+    var $signature_validated = false;
 
     /**
      * Real-time log file wrap boolean
      *
      * @see self::_append_log()
-     * @var bool
+     * @access private
      */
-    private $realtime_log_wrap;
+    var $realtime_log_wrap;
 
     /**
      * Flag to suppress stderr from output
      *
      * @see self::enableQuietMode()
+     * @access private
      */
-    private $quiet_mode = false;
+    var $quiet_mode = false;
 
     /**
      * Time of first network activity
      *
-     * @var float
+     * @var int
+     * @access private
      */
-    private $last_packet;
+    var $last_packet;
 
     /**
      * Exit status returned from ssh if any
      *
      * @var int
+     * @access private
      */
-    private $exit_status;
+    var $exit_status;
 
     /**
      * Flag to request a PTY when using exec()
      *
      * @var bool
      * @see self::enablePTY()
+     * @access private
      */
-    private $request_pty = false;
+    var $request_pty = false;
+
+    /**
+     * Flag set while exec() is running when using enablePTY()
+     *
+     * @var bool
+     * @access private
+     */
+    var $in_request_pty_exec = false;
+
+    /**
+     * Flag set after startSubsystem() is called
+     *
+     * @var bool
+     * @access private
+     */
+    var $in_subsystem;
 
     /**
      * Contents of stdError
      *
      * @var string
+     * @access private
      */
-    private $stdErrorLog;
+    var $stdErrorLog;
 
     /**
      * The Last Interactive Response
      *
      * @see self::_keyboard_interactive_process()
      * @var string
+     * @access private
      */
-    private $last_interactive_response = '';
+    var $last_interactive_response = '';
 
     /**
      * Keyboard Interactive Request / Responses
      *
      * @see self::_keyboard_interactive_process()
      * @var array
+     * @access private
      */
-    private $keyboard_requests_responses = [];
+    var $keyboard_requests_responses = array();
 
     /**
      * Banner Message
@@ -877,40 +766,45 @@ class SSH2
      * @see self::_filter()
      * @see self::getBannerMessage()
      * @var string
+     * @access private
      */
-    private $banner_message = '';
+    var $banner_message = '';
 
     /**
      * Did read() timeout or return normally?
      *
      * @see self::isTimeout()
      * @var bool
+     * @access private
      */
-    private $is_timeout = false;
+    var $is_timeout = false;
 
     /**
      * Log Boundary
      *
      * @see self::_format_log()
      * @var string
+     * @access private
      */
-    private $log_boundary = ':';
+    var $log_boundary = ':';
 
     /**
      * Log Long Width
      *
      * @see self::_format_log()
      * @var int
+     * @access private
      */
-    private $log_long_width = 65;
+    var $log_long_width = 65;
 
     /**
      * Log Short Width
      *
      * @see self::_format_log()
      * @var int
+     * @access private
      */
-    private $log_short_width = 16;
+    var $log_short_width = 16;
 
     /**
      * Hostname
@@ -918,8 +812,9 @@ class SSH2
      * @see self::__construct()
      * @see self::_connect()
      * @var string
+     * @access private
      */
-    private $host;
+    var $host;
 
     /**
      * Port Number
@@ -927,8 +822,9 @@ class SSH2
      * @see self::__construct()
      * @see self::_connect()
      * @var int
+     * @access private
      */
-    private $port;
+    var $port;
 
     /**
      * Number of columns for terminal window size
@@ -937,8 +833,9 @@ class SSH2
      * @see self::setWindowColumns()
      * @see self::setWindowSize()
      * @var int
+     * @access private
      */
-    private $windowColumns = 80;
+    var $windowColumns = 80;
 
     /**
      * Number of columns for terminal window size
@@ -947,8 +844,9 @@ class SSH2
      * @see self::setWindowRows()
      * @see self::setWindowSize()
      * @var int
+     * @access private
      */
-    private $windowRows = 24;
+    var $windowRows = 24;
 
     /**
      * Crypto Engine
@@ -956,276 +854,120 @@ class SSH2
      * @see self::setCryptoEngine()
      * @see self::_key_exchange()
      * @var int
+     * @access private
      */
-    private static $crypto_engine = false;
+    var $crypto_engine = false;
 
     /**
      * A System_SSH_Agent for use in the SSH2 Agent Forwarding scenario
      *
-     * @var Agent
+     * @var System_SSH_Agent
+     * @access private
      */
-    private $agent;
-
-    /**
-     * Connection storage to replicates ssh2 extension functionality:
-     * {@link http://php.net/manual/en/wrappers.ssh2.php#refsect1-wrappers.ssh2-examples}
-     *
-     * @var array<string, SSH2|\WeakReference<SSH2>>
-     */
-    private static $connections;
-
-    /**
-     * Send the identification string first?
-     *
-     * @var bool
-     */
-    private $send_id_string_first = true;
-
-    /**
-     * Send the key exchange initiation packet first?
-     *
-     * @var bool
-     */
-    private $send_kex_first = true;
-
-    /**
-     * Some versions of OpenSSH incorrectly calculate the key size
-     *
-     * @var bool
-     */
-    private $bad_key_size_fix = false;
-
-    /**
-     * Should we try to re-connect to re-establish keys?
-     *
-     * @var bool
-     */
-    private $retry_connect = false;
-
-    /**
-     * Binary Packet Buffer
-     *
-     * @var string|false
-     */
-    private $binary_packet_buffer = false;
-
-    /**
-     * Preferred Signature Format
-     *
-     * @var string|false
-     */
-    protected $preferred_signature_format = false;
-
-    /**
-     * Authentication Credentials
-     *
-     * @var array
-     */
-    protected $auth = [];
-
-    /**
-     * Terminal
-     *
-     * @var string
-     */
-    private $term = 'vt100';
-
-    /**
-     * The authentication methods that may productively continue authentication.
-     *
-     * @see https://tools.ietf.org/html/rfc4252#section-5.1
-     * @var array|null
-     */
-    private $auth_methods_to_continue = null;
-
-    /**
-     * Compression method
-     *
-     * @var int
-     */
-    private $compress = self::NET_SSH2_COMPRESSION_NONE;
-
-    /**
-     * Decompression method
-     *
-     * @var int
-     */
-    private $decompress = self::NET_SSH2_COMPRESSION_NONE;
-
-    /**
-     * Compression context
-     *
-     * @var resource|false|null
-     */
-    private $compress_context;
-
-    /**
-     * Decompression context
-     *
-     * @var resource|object
-     */
-    private $decompress_context;
-
-    /**
-     * Regenerate Compression Context
-     *
-     * @var bool
-     */
-    private $regenerate_compression_context = false;
-
-    /**
-     * Regenerate Decompression Context
-     *
-     * @var bool
-     */
-    private $regenerate_decompression_context = false;
-
-    /**
-     * Smart multi-factor authentication flag
-     *
-     * @var bool
-     */
-    private $smartMFA = true;
-
-    /**
-     * How many channels are currently opened
-     *
-     * @var int
-     */
-    private $channelCount = 0;
-
-    /**
-     * Does the server support multiple channels? If not then error out
-     * when multiple channels are attempted to be opened
-     *
-     * @var bool
-     */
-    private $errorOnMultipleChannels;
-
-    /**
-     * Terrapin Countermeasure
-     *
-     * "During initial KEX, terminate the connection if any unexpected or out-of-sequence packet is received"
-     * -- https://github.com/openssh/openssh-portable/commit/1edb00c58f8a6875fad6a497aa2bacf37f9e6cd5
-     *
-     * @var int
-     */
-    private $extra_packets;
+    var $agent;
 
     /**
      * Default Constructor.
      *
      * $host can either be a string, representing the host, or a stream resource.
-     * If $host is a stream resource then $port doesn't do anything, altho $timeout
-     * still will be used
      *
      * @param mixed $host
      * @param int $port
      * @param int $timeout
      * @see self::login()
+     * @return \phpseclib\Net\SSH2
+     * @access public
      */
-    public function __construct($host, $port = 22, $timeout = 10)
+    function __construct($host, $port = 22, $timeout = 10)
     {
-        if (empty(self::$message_numbers)) {
-            self::$message_numbers = [
-                1 => 'NET_SSH2_MSG_DISCONNECT',
-                2 => 'NET_SSH2_MSG_IGNORE',
-                3 => 'NET_SSH2_MSG_UNIMPLEMENTED',
-                4 => 'NET_SSH2_MSG_DEBUG',
-                5 => 'NET_SSH2_MSG_SERVICE_REQUEST',
-                6 => 'NET_SSH2_MSG_SERVICE_ACCEPT',
-                7 => 'NET_SSH2_MSG_EXT_INFO', // RFC 8308
-                20 => 'NET_SSH2_MSG_KEXINIT',
-                21 => 'NET_SSH2_MSG_NEWKEYS',
-                30 => 'NET_SSH2_MSG_KEXDH_INIT',
-                31 => 'NET_SSH2_MSG_KEXDH_REPLY',
-                50 => 'NET_SSH2_MSG_USERAUTH_REQUEST',
-                51 => 'NET_SSH2_MSG_USERAUTH_FAILURE',
-                52 => 'NET_SSH2_MSG_USERAUTH_SUCCESS',
-                53 => 'NET_SSH2_MSG_USERAUTH_BANNER',
+        $this->message_numbers = array(
+            1 => 'NET_SSH2_MSG_DISCONNECT',
+            2 => 'NET_SSH2_MSG_IGNORE',
+            3 => 'NET_SSH2_MSG_UNIMPLEMENTED',
+            4 => 'NET_SSH2_MSG_DEBUG',
+            5 => 'NET_SSH2_MSG_SERVICE_REQUEST',
+            6 => 'NET_SSH2_MSG_SERVICE_ACCEPT',
+            20 => 'NET_SSH2_MSG_KEXINIT',
+            21 => 'NET_SSH2_MSG_NEWKEYS',
+            30 => 'NET_SSH2_MSG_KEXDH_INIT',
+            31 => 'NET_SSH2_MSG_KEXDH_REPLY',
+            50 => 'NET_SSH2_MSG_USERAUTH_REQUEST',
+            51 => 'NET_SSH2_MSG_USERAUTH_FAILURE',
+            52 => 'NET_SSH2_MSG_USERAUTH_SUCCESS',
+            53 => 'NET_SSH2_MSG_USERAUTH_BANNER',
 
-                80 => 'NET_SSH2_MSG_GLOBAL_REQUEST',
-                81 => 'NET_SSH2_MSG_REQUEST_SUCCESS',
-                82 => 'NET_SSH2_MSG_REQUEST_FAILURE',
-                90 => 'NET_SSH2_MSG_CHANNEL_OPEN',
-                91 => 'NET_SSH2_MSG_CHANNEL_OPEN_CONFIRMATION',
-                92 => 'NET_SSH2_MSG_CHANNEL_OPEN_FAILURE',
-                93 => 'NET_SSH2_MSG_CHANNEL_WINDOW_ADJUST',
-                94 => 'NET_SSH2_MSG_CHANNEL_DATA',
-                95 => 'NET_SSH2_MSG_CHANNEL_EXTENDED_DATA',
-                96 => 'NET_SSH2_MSG_CHANNEL_EOF',
-                97 => 'NET_SSH2_MSG_CHANNEL_CLOSE',
-                98 => 'NET_SSH2_MSG_CHANNEL_REQUEST',
-                99 => 'NET_SSH2_MSG_CHANNEL_SUCCESS',
-                100 => 'NET_SSH2_MSG_CHANNEL_FAILURE'
-            ];
-            self::$disconnect_reasons = [
-                1 => 'NET_SSH2_DISCONNECT_HOST_NOT_ALLOWED_TO_CONNECT',
-                2 => 'NET_SSH2_DISCONNECT_PROTOCOL_ERROR',
-                3 => 'NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED',
-                4 => 'NET_SSH2_DISCONNECT_RESERVED',
-                5 => 'NET_SSH2_DISCONNECT_MAC_ERROR',
-                6 => 'NET_SSH2_DISCONNECT_COMPRESSION_ERROR',
-                7 => 'NET_SSH2_DISCONNECT_SERVICE_NOT_AVAILABLE',
-                8 => 'NET_SSH2_DISCONNECT_PROTOCOL_VERSION_NOT_SUPPORTED',
-                9 => 'NET_SSH2_DISCONNECT_HOST_KEY_NOT_VERIFIABLE',
-                10 => 'NET_SSH2_DISCONNECT_CONNECTION_LOST',
-                11 => 'NET_SSH2_DISCONNECT_BY_APPLICATION',
-                12 => 'NET_SSH2_DISCONNECT_TOO_MANY_CONNECTIONS',
-                13 => 'NET_SSH2_DISCONNECT_AUTH_CANCELLED_BY_USER',
-                14 => 'NET_SSH2_DISCONNECT_NO_MORE_AUTH_METHODS_AVAILABLE',
-                15 => 'NET_SSH2_DISCONNECT_ILLEGAL_USER_NAME'
-            ];
-            self::$channel_open_failure_reasons = [
-                1 => 'NET_SSH2_OPEN_ADMINISTRATIVELY_PROHIBITED'
-            ];
-            self::$terminal_modes = [
-                0 => 'NET_SSH2_TTY_OP_END'
-            ];
-            self::$channel_extended_data_type_codes = [
-                1 => 'NET_SSH2_EXTENDED_DATA_STDERR'
-            ];
+            80 => 'NET_SSH2_MSG_GLOBAL_REQUEST',
+            81 => 'NET_SSH2_MSG_REQUEST_SUCCESS',
+            82 => 'NET_SSH2_MSG_REQUEST_FAILURE',
+            90 => 'NET_SSH2_MSG_CHANNEL_OPEN',
+            91 => 'NET_SSH2_MSG_CHANNEL_OPEN_CONFIRMATION',
+            92 => 'NET_SSH2_MSG_CHANNEL_OPEN_FAILURE',
+            93 => 'NET_SSH2_MSG_CHANNEL_WINDOW_ADJUST',
+            94 => 'NET_SSH2_MSG_CHANNEL_DATA',
+            95 => 'NET_SSH2_MSG_CHANNEL_EXTENDED_DATA',
+            96 => 'NET_SSH2_MSG_CHANNEL_EOF',
+            97 => 'NET_SSH2_MSG_CHANNEL_CLOSE',
+            98 => 'NET_SSH2_MSG_CHANNEL_REQUEST',
+            99 => 'NET_SSH2_MSG_CHANNEL_SUCCESS',
+            100 => 'NET_SSH2_MSG_CHANNEL_FAILURE'
+        );
+        $this->disconnect_reasons = array(
+            1 => 'NET_SSH2_DISCONNECT_HOST_NOT_ALLOWED_TO_CONNECT',
+            2 => 'NET_SSH2_DISCONNECT_PROTOCOL_ERROR',
+            3 => 'NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED',
+            4 => 'NET_SSH2_DISCONNECT_RESERVED',
+            5 => 'NET_SSH2_DISCONNECT_MAC_ERROR',
+            6 => 'NET_SSH2_DISCONNECT_COMPRESSION_ERROR',
+            7 => 'NET_SSH2_DISCONNECT_SERVICE_NOT_AVAILABLE',
+            8 => 'NET_SSH2_DISCONNECT_PROTOCOL_VERSION_NOT_SUPPORTED',
+            9 => 'NET_SSH2_DISCONNECT_HOST_KEY_NOT_VERIFIABLE',
+            10 => 'NET_SSH2_DISCONNECT_CONNECTION_LOST',
+            11 => 'NET_SSH2_DISCONNECT_BY_APPLICATION',
+            12 => 'NET_SSH2_DISCONNECT_TOO_MANY_CONNECTIONS',
+            13 => 'NET_SSH2_DISCONNECT_AUTH_CANCELLED_BY_USER',
+            14 => 'NET_SSH2_DISCONNECT_NO_MORE_AUTH_METHODS_AVAILABLE',
+            15 => 'NET_SSH2_DISCONNECT_ILLEGAL_USER_NAME'
+        );
+        $this->channel_open_failure_reasons = array(
+            1 => 'NET_SSH2_OPEN_ADMINISTRATIVELY_PROHIBITED'
+        );
+        $this->terminal_modes = array(
+            0 => 'NET_SSH2_TTY_OP_END'
+        );
+        $this->channel_extended_data_type_codes = array(
+            1 => 'NET_SSH2_EXTENDED_DATA_STDERR'
+        );
 
-            self::define_array(
-                self::$message_numbers,
-                self::$disconnect_reasons,
-                self::$channel_open_failure_reasons,
-                self::$terminal_modes,
-                self::$channel_extended_data_type_codes,
-                [60 => 'NET_SSH2_MSG_USERAUTH_PASSWD_CHANGEREQ'],
-                [60 => 'NET_SSH2_MSG_USERAUTH_PK_OK'],
-                [60 => 'NET_SSH2_MSG_USERAUTH_INFO_REQUEST',
-                      61 => 'NET_SSH2_MSG_USERAUTH_INFO_RESPONSE'],
-                // RFC 4419 - diffie-hellman-group-exchange-sha{1,256}
-                [30 => 'NET_SSH2_MSG_KEXDH_GEX_REQUEST_OLD',
-                      31 => 'NET_SSH2_MSG_KEXDH_GEX_GROUP',
-                      32 => 'NET_SSH2_MSG_KEXDH_GEX_INIT',
-                      33 => 'NET_SSH2_MSG_KEXDH_GEX_REPLY',
-                      34 => 'NET_SSH2_MSG_KEXDH_GEX_REQUEST'],
-                // RFC 5656 - Elliptic Curves (for curve25519-sha256@libssh.org)
-                [30 => 'NET_SSH2_MSG_KEX_ECDH_INIT',
-                      31 => 'NET_SSH2_MSG_KEX_ECDH_REPLY']
-            );
-        }
-
-        /**
-         * Typehint is required due to a bug in Psalm: https://github.com/vimeo/psalm/issues/7508
-         * @var \WeakReference<SSH2>|SSH2
-         */
-        self::$connections[$this->getResourceId()] = class_exists('WeakReference')
-            ? \WeakReference::create($this)
-            : $this;
-
-        $this->timeout = $timeout;
+        $this->_define_array(
+            $this->message_numbers,
+            $this->disconnect_reasons,
+            $this->channel_open_failure_reasons,
+            $this->terminal_modes,
+            $this->channel_extended_data_type_codes,
+            array(60 => 'NET_SSH2_MSG_USERAUTH_PASSWD_CHANGEREQ'),
+            array(60 => 'NET_SSH2_MSG_USERAUTH_PK_OK'),
+            array(60 => 'NET_SSH2_MSG_USERAUTH_INFO_REQUEST',
+                  61 => 'NET_SSH2_MSG_USERAUTH_INFO_RESPONSE'),
+            // RFC 4419 - diffie-hellman-group-exchange-sha{1,256}
+            array(30 => 'NET_SSH2_MSG_KEXDH_GEX_REQUEST_OLD',
+                  31 => 'NET_SSH2_MSG_KEXDH_GEX_GROUP',
+                  32 => 'NET_SSH2_MSG_KEXDH_GEX_INIT',
+                  33 => 'NET_SSH2_MSG_KEXDH_GEX_REPLY',
+                  34 => 'NET_SSH2_MSG_KEXDH_GEX_REQUEST'),
+            // RFC 5656 - Elliptic Curves (for curve25519-sha256@libssh.org)
+            array(30 => 'NET_SSH2_MSG_KEX_ECDH_INIT',
+                  31 => 'NET_SSH2_MSG_KEX_ECDH_REPLY')
+        );
 
         if (is_resource($host)) {
             $this->fsock = $host;
             return;
         }
 
-        if (Strings::is_stringable($host)) {
+        if (is_string($host)) {
             $this->host = $host;
             $this->port = $port;
+            $this->timeout = $timeout;
         }
     }
 
@@ -1233,103 +975,26 @@ class SSH2
      * Set Crypto Engine Mode
      *
      * Possible $engine values:
-     * OpenSSL, mcrypt, Eval, PHP
+     * CRYPT_MODE_INTERNAL, CRYPT_MODE_MCRYPT
      *
      * @param int $engine
+     * @access private
      */
-    public static function setCryptoEngine($engine)
+    function setCryptoEngine($engine)
     {
-        self::$crypto_engine = $engine;
-    }
-
-    /**
-     * Send Identification String First
-     *
-     * https://tools.ietf.org/html/rfc4253#section-4.2 says "when the connection has been established,
-     * both sides MUST send an identification string". It does not say which side sends it first. In
-     * theory it shouldn't matter but it is a fact of life that some SSH servers are simply buggy
-     *
-     */
-    public function sendIdentificationStringFirst()
-    {
-        $this->send_id_string_first = true;
-    }
-
-    /**
-     * Send Identification String Last
-     *
-     * https://tools.ietf.org/html/rfc4253#section-4.2 says "when the connection has been established,
-     * both sides MUST send an identification string". It does not say which side sends it first. In
-     * theory it shouldn't matter but it is a fact of life that some SSH servers are simply buggy
-     *
-     */
-    public function sendIdentificationStringLast()
-    {
-        $this->send_id_string_first = false;
-    }
-
-    /**
-     * Send SSH_MSG_KEXINIT First
-     *
-     * https://tools.ietf.org/html/rfc4253#section-7.1 says "key exchange begins by each sending
-     * sending the [SSH_MSG_KEXINIT] packet". It does not say which side sends it first. In theory
-     * it shouldn't matter but it is a fact of life that some SSH servers are simply buggy
-     *
-     */
-    public function sendKEXINITFirst()
-    {
-        $this->send_kex_first = true;
-    }
-
-    /**
-     * Send SSH_MSG_KEXINIT Last
-     *
-     * https://tools.ietf.org/html/rfc4253#section-7.1 says "key exchange begins by each sending
-     * sending the [SSH_MSG_KEXINIT] packet". It does not say which side sends it first. In theory
-     * it shouldn't matter but it is a fact of life that some SSH servers are simply buggy
-     *
-     */
-    public function sendKEXINITLast()
-    {
-        $this->send_kex_first = false;
-    }
-
-    /**
-     * stream_select wrapper
-     *
-     * Quoting https://stackoverflow.com/a/14262151/569976,
-     * "The general approach to `EINTR` is to simply handle the error and retry the operation again"
-     *
-     * This wrapper does that loop
-     */
-    private static function stream_select(&$read, &$write, &$except, $seconds, $microseconds = null)
-    {
-        $remaining = $seconds + $microseconds / 1000000;
-        $start = microtime(true);
-        while (true) {
-            $result = @stream_select($read, $write, $except, $seconds, $microseconds);
-            if ($result !== false) {
-                return $result;
-            }
-            $elapsed = microtime(true) - $start;
-            $seconds = (int) ($remaining - floor($elapsed));
-            $microseconds = (int) (1000000 * ($remaining - $seconds));
-            if ($elapsed >= $remaining) {
-                return false;
-            }
-        }
+        $this->crypto_engine = $engine;
     }
 
     /**
      * Connect to an SSHv2 server
      *
-     * @throws \UnexpectedValueException on receipt of unexpected packets
-     * @throws \RuntimeException on other errors
+     * @return bool
+     * @access private
      */
-    private function connect()
+    function _connect()
     {
         if ($this->bitmap & self::MASK_CONSTRUCTOR) {
-            return;
+            return false;
         }
 
         $this->bitmap |= self::MASK_CONSTRUCTOR;
@@ -1340,30 +1005,22 @@ class SSH2
 
         if (!is_resource($this->fsock)) {
             $start = microtime(true);
-            // with stream_select a timeout of 0 means that no timeout takes place;
-            // with fsockopen a timeout of 0 means that you instantly timeout
-            // to resolve this incompatibility a timeout of 100,000 will be used for fsockopen if timeout is 0
-            $this->fsock = @fsockopen($this->host, $this->port, $errno, $errstr, $this->curTimeout == 0 ? 100000 : $this->curTimeout);
+            $this->fsock = @fsockopen($this->host, $this->port, $errno, $errstr, $this->curTimeout);
             if (!$this->fsock) {
                 $host = $this->host . ':' . $this->port;
-                throw new UnableToConnectException(rtrim("Cannot connect to $host. Error $errno. $errstr"));
+                user_error(rtrim("Cannot connect to $host. Error $errno. $errstr"));
+                return false;
             }
             $elapsed = microtime(true) - $start;
 
-            if ($this->curTimeout) {
-                $this->curTimeout -= $elapsed;
-                if ($this->curTimeout < 0) {
-                    throw new \RuntimeException('Connection timed out whilst attempting to open socket connection');
-                }
+            $this->curTimeout-= $elapsed;
+
+            if ($this->curTimeout <= 0) {
+                $this->is_timeout = true;
+                return false;
             }
         }
 
-        $this->identifier = $this->generate_identifier();
-
-        if ($this->send_id_string_first) {
-            fputs($this->fsock, $this->identifier . "\r\n");
-        }
-
         /* According to the SSH2 specs,
 
           "The server MAY send other lines of data before sending the version
@@ -1377,29 +1034,30 @@ class SSH2
             while (true) {
                 if ($this->curTimeout) {
                     if ($this->curTimeout < 0) {
-                        throw new \RuntimeException('Connection timed out whilst receiving server identification string');
+                        $this->is_timeout = true;
+                        return false;
                     }
-                    $read = [$this->fsock];
+                    $read = array($this->fsock);
                     $write = $except = null;
                     $start = microtime(true);
-                    $sec = (int) floor($this->curTimeout);
-                    $usec = (int) (1000000 * ($this->curTimeout - $sec));
-                    if (static::stream_select($read, $write, $except, $sec, $usec) === false) {
-                        throw new \RuntimeException('Connection timed out whilst receiving server identification string');
+                    $sec = floor($this->curTimeout);
+                    $usec = 1000000 * ($this->curTimeout - $sec);
+                    // on windows this returns a "Warning: Invalid CRT parameters detected" error
+                    // the !count() is done as a workaround for <https://bugs.php.net/42682>
+                    if (!@stream_select($read, $write, $except, $sec, $usec) && !count($read)) {
+                        $this->is_timeout = true;
+                        return false;
                     }
                     $elapsed = microtime(true) - $start;
-                    $this->curTimeout -= $elapsed;
+                    $this->curTimeout-= $elapsed;
                 }
 
                 $temp = stream_get_line($this->fsock, 255, "\n");
-                if ($temp === false) {
-                    throw new \RuntimeException('Error reading from socket');
-                }
                 if (strlen($temp) == 255) {
                     continue;
                 }
 
-                $line .= "$temp\n";
+                $line.= "$temp\n";
 
                 // quoting RFC4253, "Implementers who wish to maintain
                 // compatibility with older, undocumented versions of this protocol may
@@ -1414,63 +1072,51 @@ class SSH2
                 break;
             }
 
-            $data .= $line;
+            $data.= $line;
         }
 
         if (feof($this->fsock)) {
-            $this->bitmap = 0;
-            throw new ConnectionClosedException('Connection closed by server');
+            user_error('Connection closed by server');
+            return false;
         }
 
         $extra = $matches[1];
 
+        $this->identifier = $this->_generate_identifier();
+
         if (defined('NET_SSH2_LOGGING')) {
-            $this->append_log('<-', $matches[0]);
-            $this->append_log('->', $this->identifier . "\r\n");
+            $this->_append_log('<-', $matches[0]);
+            $this->_append_log('->', $this->identifier . "\r\n");
         }
 
         $this->server_identifier = trim($temp, "\r\n");
         if (strlen($extra)) {
-            $this->errors[] = $data;
+            $this->errors[] = utf8_decode($data);
         }
 
-        if (version_compare($matches[3], '1.99', '<')) {
-            $this->bitmap = 0;
-            throw new UnableToConnectException("Cannot connect to SSH $matches[3] servers");
+        if ($matches[3] != '1.99' && $matches[3] != '2.0') {
+            user_error("Cannot connect to SSH $matches[3] servers");
+            return false;
         }
 
-        // Ubuntu's OpenSSH from 5.8 to 6.9 didn't work with multiple channels. see
-        // https://bugs.launchpad.net/ubuntu/+source/openssh/+bug/1334916 for more info.
-        // https://lists.ubuntu.com/archives/oneiric-changes/2011-July/005772.html discusses
-        // when consolekit was incorporated.
-        // https://marc.info/?l=openssh-unix-dev&m=163409903417589&w=2 discusses some of the
-        // issues with how Ubuntu incorporated consolekit
-        $pattern = '#^SSH-2\.0-OpenSSH_([\d.]+)[^ ]* Ubuntu-.*$#';
-        $match = preg_match($pattern, $this->server_identifier, $matches);
-        $match = $match && version_compare('5.8', $matches[1], '<=');
-        $match = $match && version_compare('6.9', $matches[1], '>=');
-        $this->errorOnMultipleChannels = $match;
+        fputs($this->fsock, $this->identifier . "\r\n");
 
-        if (!$this->send_id_string_first) {
-            fputs($this->fsock, $this->identifier . "\r\n");
+        $response = $this->_get_binary_packet();
+        if ($response === false) {
+            user_error('Connection closed by server');
+            return false;
         }
 
-        if (!$this->send_kex_first) {
-            $response = $this->get_binary_packet();
-
-            if (is_bool($response) || !strlen($response) || ord($response[0]) != NET_SSH2_MSG_KEXINIT) {
-                $this->bitmap = 0;
-                throw new \UnexpectedValueException('Expected SSH_MSG_KEXINIT');
-            }
-
-            $this->key_exchange($response);
+        if (ord($response[0]) != NET_SSH2_MSG_KEXINIT) {
+            user_error('Expected SSH_MSG_KEXINIT');
+            return false;
         }
 
-        if ($this->send_kex_first) {
-            $this->key_exchange();
+        if (!$this->_key_exchange($response)) {
+            return false;
         }
 
-        $this->bitmap |= self::MASK_CONNECTED;
+        $this->bitmap|= self::MASK_CONNECTED;
 
         return true;
     }
@@ -1480,14 +1126,15 @@ class SSH2
      *
      * You should overwrite this method in your own class if you want to use another identifier
      *
+     * @access protected
      * @return string
      */
-    private function generate_identifier()
+    function _generate_identifier()
     {
-        $identifier = 'SSH-2.0-phpseclib_3.0';
+        $identifier = 'SSH-2.0-phpseclib_2.0';
 
-        $ext = [];
-        if (extension_loaded('sodium')) {
+        $ext = array();
+        if (extension_loaded('libsodium')) {
             $ext[] = 'libsodium';
         }
 
@@ -1513,3385 +1160,37 @@ class SSH2
     /**
      * Key Exchange
      *
-     * @return bool
-     * @param string|bool $kexinit_payload_server optional
-     * @throws \UnexpectedValueException on receipt of unexpected packets
-     * @throws \RuntimeException on other errors
-     * @throws \phpseclib3\Exception\NoSupportedAlgorithmsException when none of the algorithms phpseclib has loaded are compatible
+     * @param string $kexinit_payload_server
+     * @access private
      */
-    private function key_exchange($kexinit_payload_server = false)
+    function _key_exchange($kexinit_payload_server)
     {
-        $preferred = $this->preferred;
-        $send_kex = true;
-
-        $kex_algorithms = isset($preferred['kex']) ?
-            $preferred['kex'] :
-            SSH2::getSupportedKEXAlgorithms();
-        $server_host_key_algorithms = isset($preferred['hostkey']) ?
-            $preferred['hostkey'] :
-            SSH2::getSupportedHostKeyAlgorithms();
-        $s2c_encryption_algorithms = isset($preferred['server_to_client']['crypt']) ?
-            $preferred['server_to_client']['crypt'] :
-            SSH2::getSupportedEncryptionAlgorithms();
-        $c2s_encryption_algorithms = isset($preferred['client_to_server']['crypt']) ?
-            $preferred['client_to_server']['crypt'] :
-            SSH2::getSupportedEncryptionAlgorithms();
-        $s2c_mac_algorithms = isset($preferred['server_to_client']['mac']) ?
-            $preferred['server_to_client']['mac'] :
-            SSH2::getSupportedMACAlgorithms();
-        $c2s_mac_algorithms = isset($preferred['client_to_server']['mac']) ?
-            $preferred['client_to_server']['mac'] :
-            SSH2::getSupportedMACAlgorithms();
-        $s2c_compression_algorithms = isset($preferred['server_to_client']['comp']) ?
-            $preferred['server_to_client']['comp'] :
-            SSH2::getSupportedCompressionAlgorithms();
-        $c2s_compression_algorithms = isset($preferred['client_to_server']['comp']) ?
-            $preferred['client_to_server']['comp'] :
-            SSH2::getSupportedCompressionAlgorithms();
-
-        $kex_algorithms = array_merge($kex_algorithms, ['ext-info-c', 'kex-strict-c-v00@openssh.com']);
-
-        // some SSH servers have buggy implementations of some of the above algorithms
-        switch (true) {
-            case $this->server_identifier == 'SSH-2.0-SSHD':
-            case substr($this->server_identifier, 0, 13) == 'SSH-2.0-DLINK':
-                if (!isset($preferred['server_to_client']['mac'])) {
-                    $s2c_mac_algorithms = array_values(array_diff(
-                        $s2c_mac_algorithms,
-                        ['hmac-sha1-96', 'hmac-md5-96']
-                    ));
-                }
-                if (!isset($preferred['client_to_server']['mac'])) {
-                    $c2s_mac_algorithms = array_values(array_diff(
-                        $c2s_mac_algorithms,
-                        ['hmac-sha1-96', 'hmac-md5-96']
-                    ));
-                }
-                break;
-            case substr($this->server_identifier, 0, 24) == 'SSH-2.0-TurboFTP_SERVER_':
-                if (!isset($preferred['server_to_client']['crypt'])) {
-                    $s2c_encryption_algorithms = array_values(array_diff(
-                        $s2c_encryption_algorithms,
-                        ['aes128-gcm@openssh.com', 'aes256-gcm@openssh.com']
-                    ));
-                }
-                if (!isset($preferred['client_to_server']['crypt'])) {
-                    $c2s_encryption_algorithms = array_values(array_diff(
-                        $c2s_encryption_algorithms,
-                        ['aes128-gcm@openssh.com', 'aes256-gcm@openssh.com']
-                    ));
-                }
-        }
-
-        $client_cookie = Random::string(16);
-
-        $kexinit_payload_client = pack('Ca*', NET_SSH2_MSG_KEXINIT, $client_cookie);
-        $kexinit_payload_client .= Strings::packSSH2(
-            'L10bN',
-            $kex_algorithms,
-            $server_host_key_algorithms,
-            $c2s_encryption_algorithms,
-            $s2c_encryption_algorithms,
-            $c2s_mac_algorithms,
-            $s2c_mac_algorithms,
-            $c2s_compression_algorithms,
-            $s2c_compression_algorithms,
-            [], // language, client to server
-            [], // language, server to client
-            false, // first_kex_packet_follows
-            0 // reserved for future extension
-        );
-
-        if ($kexinit_payload_server === false) {
-            $this->send_binary_packet($kexinit_payload_client);
-
-            $this->extra_packets = 0;
-            $kexinit_payload_server = $this->get_binary_packet();
-
-            if (
-                is_bool($kexinit_payload_server)
-                || !strlen($kexinit_payload_server)
-                || ord($kexinit_payload_server[0]) != NET_SSH2_MSG_KEXINIT
-            ) {
-                $this->disconnect_helper(NET_SSH2_DISCONNECT_PROTOCOL_ERROR);
-                throw new \UnexpectedValueException('Expected SSH_MSG_KEXINIT');
-            }
-
-            $send_kex = false;
-        }
-
-        $response = $kexinit_payload_server;
-        Strings::shift($response, 1); // skip past the message number (it should be SSH_MSG_KEXINIT)
-        $server_cookie = Strings::shift($response, 16);
-
-        list(
-            $this->kex_algorithms,
-            $this->server_host_key_algorithms,
-            $this->encryption_algorithms_client_to_server,
-            $this->encryption_algorithms_server_to_client,
-            $this->mac_algorithms_client_to_server,
-            $this->mac_algorithms_server_to_client,
-            $this->compression_algorithms_client_to_server,
-            $this->compression_algorithms_server_to_client,
-            $this->languages_client_to_server,
-            $this->languages_server_to_client,
-            $first_kex_packet_follows
-        ) = Strings::unpackSSH2('L10C', $response);
-        if (in_array('kex-strict-s-v00@openssh.com', $this->kex_algorithms)) {
-            if ($this->session_id === false && $this->extra_packets) {
-                throw new \UnexpectedValueException('Possible Terrapin Attack detected');
-            }
-        }
-
-        $this->supported_private_key_algorithms = $this->server_host_key_algorithms;
-
-        if ($send_kex) {
-            $this->send_binary_packet($kexinit_payload_client);
-        }
-
-        // we need to decide upon the symmetric encryption algorithms before we do the diffie-hellman key exchange
-
-        // we don't initialize any crypto-objects, yet - we do that, later. for now, we need the lengths to make the
-        // diffie-hellman key exchange as fast as possible
-        $decrypt = self::array_intersect_first($s2c_encryption_algorithms, $this->encryption_algorithms_server_to_client);
-        $decryptKeyLength = $this->encryption_algorithm_to_key_size($decrypt);
-        if ($decryptKeyLength === null) {
-            $this->disconnect_helper(NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED);
-            throw new NoSupportedAlgorithmsException('No compatible server to client encryption algorithms found');
-        }
-
-        $encrypt = self::array_intersect_first($c2s_encryption_algorithms, $this->encryption_algorithms_client_to_server);
-        $encryptKeyLength = $this->encryption_algorithm_to_key_size($encrypt);
-        if ($encryptKeyLength === null) {
-            $this->disconnect_helper(NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED);
-            throw new NoSupportedAlgorithmsException('No compatible client to server encryption algorithms found');
-        }
-
-        // through diffie-hellman key exchange a symmetric key is obtained
-        $this->kex_algorithm = self::array_intersect_first($kex_algorithms, $this->kex_algorithms);
-        if ($this->kex_algorithm === false) {
-            $this->disconnect_helper(NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED);
-            throw new NoSupportedAlgorithmsException('No compatible key exchange algorithms found');
-        }
-
-        $server_host_key_algorithm = self::array_intersect_first($server_host_key_algorithms, $this->server_host_key_algorithms);
-        if ($server_host_key_algorithm === false) {
-            $this->disconnect_helper(NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED);
-            throw new NoSupportedAlgorithmsException('No compatible server host key algorithms found');
-        }
-
-        $mac_algorithm_out = self::array_intersect_first($c2s_mac_algorithms, $this->mac_algorithms_client_to_server);
-        if ($mac_algorithm_out === false) {
-            $this->disconnect_helper(NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED);
-            throw new NoSupportedAlgorithmsException('No compatible client to server message authentication algorithms found');
-        }
-
-        $mac_algorithm_in = self::array_intersect_first($s2c_mac_algorithms, $this->mac_algorithms_server_to_client);
-        if ($mac_algorithm_in === false) {
-            $this->disconnect_helper(NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED);
-            throw new NoSupportedAlgorithmsException('No compatible server to client message authentication algorithms found');
-        }
-
-        $compression_map = [
-            'none' => self::NET_SSH2_COMPRESSION_NONE,
-            'zlib' => self::NET_SSH2_COMPRESSION_ZLIB,
-            'zlib@openssh.com' => self::NET_SSH2_COMPRESSION_ZLIB_AT_OPENSSH
-        ];
-
-        $compression_algorithm_in = self::array_intersect_first($s2c_compression_algorithms, $this->compression_algorithms_server_to_client);
-        if ($compression_algorithm_in === false) {
-            $this->disconnect_helper(NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED);
-            throw new NoSupportedAlgorithmsException('No compatible server to client compression algorithms found');
-        }
-        $this->decompress = $compression_map[$compression_algorithm_in];
-
-        $compression_algorithm_out = self::array_intersect_first($c2s_compression_algorithms, $this->compression_algorithms_client_to_server);
-        if ($compression_algorithm_out === false) {
-            $this->disconnect_helper(NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED);
-            throw new NoSupportedAlgorithmsException('No compatible client to server compression algorithms found');
-        }
-        $this->compress = $compression_map[$compression_algorithm_out];
-
-        switch ($this->kex_algorithm) {
-            case 'diffie-hellman-group15-sha512':
-            case 'diffie-hellman-group16-sha512':
-            case 'diffie-hellman-group17-sha512':
-            case 'diffie-hellman-group18-sha512':
-            case 'ecdh-sha2-nistp521':
-                $kexHash = new Hash('sha512');
-                break;
-            case 'ecdh-sha2-nistp384':
-                $kexHash = new Hash('sha384');
-                break;
-            case 'diffie-hellman-group-exchange-sha256':
-            case 'diffie-hellman-group14-sha256':
-            case 'ecdh-sha2-nistp256':
-            case 'curve25519-sha256@libssh.org':
-            case 'curve25519-sha256':
-                $kexHash = new Hash('sha256');
-                break;
-            default:
-                $kexHash = new Hash('sha1');
-        }
-
-        // Only relevant in diffie-hellman-group-exchange-sha{1,256}, otherwise empty.
-
-        $exchange_hash_rfc4419 = '';
-
-        if (strpos($this->kex_algorithm, 'curve25519-sha256') === 0 || strpos($this->kex_algorithm, 'ecdh-sha2-nistp') === 0) {
-            $curve = strpos($this->kex_algorithm, 'curve25519-sha256') === 0 ?
-                'Curve25519' :
-                substr($this->kex_algorithm, 10);
-            $ourPrivate = EC::createKey($curve);
-            $ourPublicBytes = $ourPrivate->getPublicKey()->getEncodedCoordinates();
-            $clientKexInitMessage = 'NET_SSH2_MSG_KEX_ECDH_INIT';
-            $serverKexReplyMessage = 'NET_SSH2_MSG_KEX_ECDH_REPLY';
-        } else {
-            if (strpos($this->kex_algorithm, 'diffie-hellman-group-exchange') === 0) {
-                $dh_group_sizes_packed = pack(
-                    'NNN',
-                    $this->kex_dh_group_size_min,
-                    $this->kex_dh_group_size_preferred,
-                    $this->kex_dh_group_size_max
-                );
-                $packet = pack(
-                    'Ca*',
-                    NET_SSH2_MSG_KEXDH_GEX_REQUEST,
-                    $dh_group_sizes_packed
-                );
-                $this->send_binary_packet($packet);
-                $this->updateLogHistory('UNKNOWN (34)', 'NET_SSH2_MSG_KEXDH_GEX_REQUEST');
-
-                $response = $this->get_binary_packet();
-
-                list($type, $primeBytes, $gBytes) = Strings::unpackSSH2('Css', $response);
-                if ($type != NET_SSH2_MSG_KEXDH_GEX_GROUP) {
-                    $this->disconnect_helper(NET_SSH2_DISCONNECT_PROTOCOL_ERROR);
-                    throw new \UnexpectedValueException('Expected SSH_MSG_KEX_DH_GEX_GROUP');
-                }
-                $this->updateLogHistory('NET_SSH2_MSG_KEXDH_REPLY', 'NET_SSH2_MSG_KEXDH_GEX_GROUP');
-                $prime = new BigInteger($primeBytes, -256);
-                $g = new BigInteger($gBytes, -256);
-
-                $exchange_hash_rfc4419 = $dh_group_sizes_packed . Strings::packSSH2(
-                    'ss',
-                    $primeBytes,
-                    $gBytes
-                );
-
-                $params = DH::createParameters($prime, $g);
-                $clientKexInitMessage = 'NET_SSH2_MSG_KEXDH_GEX_INIT';
-                $serverKexReplyMessage = 'NET_SSH2_MSG_KEXDH_GEX_REPLY';
-            } else {
-                $params = DH::createParameters($this->kex_algorithm);
-                $clientKexInitMessage = 'NET_SSH2_MSG_KEXDH_INIT';
-                $serverKexReplyMessage = 'NET_SSH2_MSG_KEXDH_REPLY';
-            }
-
-            $keyLength = min($kexHash->getLengthInBytes(), max($encryptKeyLength, $decryptKeyLength));
-
-            $ourPrivate = DH::createKey($params, 16 * $keyLength); // 2 * 8 * $keyLength
-            $ourPublic = $ourPrivate->getPublicKey()->toBigInteger();
-            $ourPublicBytes = $ourPublic->toBytes(true);
-        }
-
-        $data = pack('CNa*', constant($clientKexInitMessage), strlen($ourPublicBytes), $ourPublicBytes);
-
-        $this->send_binary_packet($data);
-
-        switch ($clientKexInitMessage) {
-            case 'NET_SSH2_MSG_KEX_ECDH_INIT':
-                $this->updateLogHistory('NET_SSH2_MSG_KEXDH_INIT', 'NET_SSH2_MSG_KEX_ECDH_INIT');
-                break;
-            case 'NET_SSH2_MSG_KEXDH_GEX_INIT':
-                $this->updateLogHistory('UNKNOWN (32)', 'NET_SSH2_MSG_KEXDH_GEX_INIT');
-        }
-
-        $response = $this->get_binary_packet();
-
-        list(
-            $type,
-            $server_public_host_key,
-            $theirPublicBytes,
-            $this->signature
-        ) = Strings::unpackSSH2('Csss', $response);
-
-        if ($type != constant($serverKexReplyMessage)) {
-            $this->disconnect_helper(NET_SSH2_DISCONNECT_PROTOCOL_ERROR);
-            throw new \UnexpectedValueException("Expected $serverKexReplyMessage");
-        }
-        switch ($serverKexReplyMessage) {
-            case 'NET_SSH2_MSG_KEX_ECDH_REPLY':
-                $this->updateLogHistory('NET_SSH2_MSG_KEXDH_REPLY', 'NET_SSH2_MSG_KEX_ECDH_REPLY');
-                break;
-            case 'NET_SSH2_MSG_KEXDH_GEX_REPLY':
-                $this->updateLogHistory('UNKNOWN (33)', 'NET_SSH2_MSG_KEXDH_GEX_REPLY');
-        }
-
-        $this->server_public_host_key = $server_public_host_key;
-        list($public_key_format) = Strings::unpackSSH2('s', $server_public_host_key);
-        if (strlen($this->signature) < 4) {
-            throw new \LengthException('The signature needs at least four bytes');
-        }
-        $temp = unpack('Nlength', substr($this->signature, 0, 4));
-        $this->signature_format = substr($this->signature, 4, $temp['length']);
-
-        $keyBytes = DH::computeSecret($ourPrivate, $theirPublicBytes);
-        if (($keyBytes & "\xFF\x80") === "\x00\x00") {
-            $keyBytes = substr($keyBytes, 1);
-        } elseif (($keyBytes[0] & "\x80") === "\x80") {
-            $keyBytes = "\0$keyBytes";
-        }
-
-        $this->exchange_hash = Strings::packSSH2(
-            's5',
-            $this->identifier,
-            $this->server_identifier,
-            $kexinit_payload_client,
-            $kexinit_payload_server,
-            $this->server_public_host_key
-        );
-        $this->exchange_hash .= $exchange_hash_rfc4419;
-        $this->exchange_hash .= Strings::packSSH2(
-            's3',
-            $ourPublicBytes,
-            $theirPublicBytes,
-            $keyBytes
-        );
-
-        $this->exchange_hash = $kexHash->hash($this->exchange_hash);
-
-        if ($this->session_id === false) {
-            $this->session_id = $this->exchange_hash;
-        }
-
-        switch ($server_host_key_algorithm) {
-            case 'rsa-sha2-256':
-            case 'rsa-sha2-512':
-            //case 'ssh-rsa':
-                $expected_key_format = 'ssh-rsa';
-                break;
-            default:
-                $expected_key_format = $server_host_key_algorithm;
-        }
-        if ($public_key_format != $expected_key_format || $this->signature_format != $server_host_key_algorithm) {
-            switch (true) {
-                case $this->signature_format == $server_host_key_algorithm:
-                case $server_host_key_algorithm != 'rsa-sha2-256' && $server_host_key_algorithm != 'rsa-sha2-512':
-                case $this->signature_format != 'ssh-rsa':
-                    $this->disconnect_helper(NET_SSH2_DISCONNECT_HOST_KEY_NOT_VERIFIABLE);
-                    throw new \RuntimeException('Server Host Key Algorithm Mismatch (' . $this->signature_format . ' vs ' . $server_host_key_algorithm . ')');
-            }
-        }
-
-        $packet = pack('C', NET_SSH2_MSG_NEWKEYS);
-        $this->send_binary_packet($packet);
-
-        $response = $this->get_binary_packet();
-
-        if ($response === false) {
-            $this->disconnect_helper(NET_SSH2_DISCONNECT_CONNECTION_LOST);
-            throw new ConnectionClosedException('Connection closed by server');
-        }
-
-        list($type) = Strings::unpackSSH2('C', $response);
-        if ($type != NET_SSH2_MSG_NEWKEYS) {
-            $this->disconnect_helper(NET_SSH2_DISCONNECT_PROTOCOL_ERROR);
-            throw new \UnexpectedValueException('Expected SSH_MSG_NEWKEYS');
-        }
-
-        if (in_array('kex-strict-s-v00@openssh.com', $this->kex_algorithms)) {
-            $this->get_seq_no = $this->send_seq_no = 0;
-        }
-
-        $keyBytes = pack('Na*', strlen($keyBytes), $keyBytes);
-
-        $this->encrypt = self::encryption_algorithm_to_crypt_instance($encrypt);
-        if ($this->encrypt) {
-            if (self::$crypto_engine) {
-                $this->encrypt->setPreferredEngine(self::$crypto_engine);
-            }
-            if ($this->encrypt->getBlockLengthInBytes()) {
-                $this->encrypt_block_size = $this->encrypt->getBlockLengthInBytes();
-            }
-            $this->encrypt->disablePadding();
-
-            if ($this->encrypt->usesIV()) {
-                $iv = $kexHash->hash($keyBytes . $this->exchange_hash . 'A' . $this->session_id);
-                while ($this->encrypt_block_size > strlen($iv)) {
-                    $iv .= $kexHash->hash($keyBytes . $this->exchange_hash . $iv);
-                }
-                $this->encrypt->setIV(substr($iv, 0, $this->encrypt_block_size));
-            }
-
-            switch ($encrypt) {
-                case 'aes128-gcm@openssh.com':
-                case 'aes256-gcm@openssh.com':
-                    $nonce = $kexHash->hash($keyBytes . $this->exchange_hash . 'A' . $this->session_id);
-                    $this->encryptFixedPart = substr($nonce, 0, 4);
-                    $this->encryptInvocationCounter = substr($nonce, 4, 8);
-                    // fall-through
-                case 'chacha20-poly1305@openssh.com':
-                    break;
-                default:
-                    $this->encrypt->enableContinuousBuffer();
-            }
-
-            $key = $kexHash->hash($keyBytes . $this->exchange_hash . 'C' . $this->session_id);
-            while ($encryptKeyLength > strlen($key)) {
-                $key .= $kexHash->hash($keyBytes . $this->exchange_hash . $key);
-            }
-            switch ($encrypt) {
-                case 'chacha20-poly1305@openssh.com':
-                    $encryptKeyLength = 32;
-                    $this->lengthEncrypt = self::encryption_algorithm_to_crypt_instance($encrypt);
-                    $this->lengthEncrypt->setKey(substr($key, 32, 32));
-            }
-            $this->encrypt->setKey(substr($key, 0, $encryptKeyLength));
-            $this->encryptName = $encrypt;
-        }
-
-        $this->decrypt = self::encryption_algorithm_to_crypt_instance($decrypt);
-        if ($this->decrypt) {
-            if (self::$crypto_engine) {
-                $this->decrypt->setPreferredEngine(self::$crypto_engine);
-            }
-            if ($this->decrypt->getBlockLengthInBytes()) {
-                $this->decrypt_block_size = $this->decrypt->getBlockLengthInBytes();
-            }
-            $this->decrypt->disablePadding();
-
-            if ($this->decrypt->usesIV()) {
-                $iv = $kexHash->hash($keyBytes . $this->exchange_hash . 'B' . $this->session_id);
-                while ($this->decrypt_block_size > strlen($iv)) {
-                    $iv .= $kexHash->hash($keyBytes . $this->exchange_hash . $iv);
-                }
-                $this->decrypt->setIV(substr($iv, 0, $this->decrypt_block_size));
-            }
-
-            switch ($decrypt) {
-                case 'aes128-gcm@openssh.com':
-                case 'aes256-gcm@openssh.com':
-                    // see https://tools.ietf.org/html/rfc5647#section-7.1
-                    $nonce = $kexHash->hash($keyBytes . $this->exchange_hash . 'B' . $this->session_id);
-                    $this->decryptFixedPart = substr($nonce, 0, 4);
-                    $this->decryptInvocationCounter = substr($nonce, 4, 8);
-                    // fall-through
-                case 'chacha20-poly1305@openssh.com':
-                    break;
-                default:
-                    $this->decrypt->enableContinuousBuffer();
-            }
-
-            $key = $kexHash->hash($keyBytes . $this->exchange_hash . 'D' . $this->session_id);
-            while ($decryptKeyLength > strlen($key)) {
-                $key .= $kexHash->hash($keyBytes . $this->exchange_hash . $key);
-            }
-            switch ($decrypt) {
-                case 'chacha20-poly1305@openssh.com':
-                    $decryptKeyLength = 32;
-                    $this->lengthDecrypt = self::encryption_algorithm_to_crypt_instance($decrypt);
-                    $this->lengthDecrypt->setKey(substr($key, 32, 32));
-            }
-            $this->decrypt->setKey(substr($key, 0, $decryptKeyLength));
-            $this->decryptName = $decrypt;
-        }
-
-        /* The "arcfour128" algorithm is the RC4 cipher, as described in
-           [SCHNEIER], using a 128-bit key.  The first 1536 bytes of keystream
-           generated by the cipher MUST be discarded, and the first byte of the
-           first encrypted packet MUST be encrypted using the 1537th byte of
-           keystream.
-
-           -- http://tools.ietf.org/html/rfc4345#section-4 */
-        if ($encrypt == 'arcfour128' || $encrypt == 'arcfour256') {
-            $this->encrypt->encrypt(str_repeat("\0", 1536));
-        }
-        if ($decrypt == 'arcfour128' || $decrypt == 'arcfour256') {
-            $this->decrypt->decrypt(str_repeat("\0", 1536));
-        }
-
-        if (!$this->encrypt->usesNonce()) {
-            list($this->hmac_create, $createKeyLength) = self::mac_algorithm_to_hash_instance($mac_algorithm_out);
-        } else {
-            $this->hmac_create = new \stdClass();
-            $this->hmac_create_name = $mac_algorithm_out;
-            //$mac_algorithm_out = 'none';
-            $createKeyLength = 0;
-        }
-
-        if ($this->hmac_create instanceof Hash) {
-            $key = $kexHash->hash($keyBytes . $this->exchange_hash . 'E' . $this->session_id);
-            while ($createKeyLength > strlen($key)) {
-                $key .= $kexHash->hash($keyBytes . $this->exchange_hash . $key);
-            }
-            $this->hmac_create->setKey(substr($key, 0, $createKeyLength));
-            $this->hmac_create_name = $mac_algorithm_out;
-            $this->hmac_create_etm = preg_match('#-etm@openssh\.com$#', $mac_algorithm_out);
-        }
-
-        if (!$this->decrypt->usesNonce()) {
-            list($this->hmac_check, $checkKeyLength) = self::mac_algorithm_to_hash_instance($mac_algorithm_in);
-            $this->hmac_size = $this->hmac_check->getLengthInBytes();
-        } else {
-            $this->hmac_check = new \stdClass();
-            $this->hmac_check_name = $mac_algorithm_in;
-            //$mac_algorithm_in = 'none';
-            $checkKeyLength = 0;
-            $this->hmac_size = 0;
-        }
-
-        if ($this->hmac_check instanceof Hash) {
-            $key = $kexHash->hash($keyBytes . $this->exchange_hash . 'F' . $this->session_id);
-            while ($checkKeyLength > strlen($key)) {
-                $key .= $kexHash->hash($keyBytes . $this->exchange_hash . $key);
-            }
-            $this->hmac_check->setKey(substr($key, 0, $checkKeyLength));
-            $this->hmac_check_name = $mac_algorithm_in;
-            $this->hmac_check_etm = preg_match('#-etm@openssh\.com$#', $mac_algorithm_in);
-        }
-
-        $this->regenerate_compression_context = $this->regenerate_decompression_context = true;
-
-        return true;
-    }
-
-    /**
-     * Maps an encryption algorithm name to the number of key bytes.
-     *
-     * @param string $algorithm Name of the encryption algorithm
-     * @return int|null Number of bytes as an integer or null for unknown
-     */
-    private function encryption_algorithm_to_key_size($algorithm)
-    {
-        if ($this->bad_key_size_fix && self::bad_algorithm_candidate($algorithm)) {
-            return 16;
-        }
-
-        switch ($algorithm) {
-            case 'none':
-                return 0;
-            case 'aes128-gcm@openssh.com':
-            case 'aes128-cbc':
-            case 'aes128-ctr':
-            case 'arcfour':
-            case 'arcfour128':
-            case 'blowfish-cbc':
-            case 'blowfish-ctr':
-            case 'twofish128-cbc':
-            case 'twofish128-ctr':
-                return 16;
-            case '3des-cbc':
-            case '3des-ctr':
-            case 'aes192-cbc':
-            case 'aes192-ctr':
-            case 'twofish192-cbc':
-            case 'twofish192-ctr':
-                return 24;
-            case 'aes256-gcm@openssh.com':
-            case 'aes256-cbc':
-            case 'aes256-ctr':
-            case 'arcfour256':
-            case 'twofish-cbc':
-            case 'twofish256-cbc':
-            case 'twofish256-ctr':
-                return 32;
-            case 'chacha20-poly1305@openssh.com':
-                return 64;
-        }
-        return null;
-    }
-
-    /**
-     * Maps an encryption algorithm name to an instance of a subclass of
-     * \phpseclib3\Crypt\Common\SymmetricKey.
-     *
-     * @param string $algorithm Name of the encryption algorithm
-     * @return SymmetricKey|null
-     */
-    private static function encryption_algorithm_to_crypt_instance($algorithm)
-    {
-        switch ($algorithm) {
-            case '3des-cbc':
-                return new TripleDES('cbc');
-            case '3des-ctr':
-                return new TripleDES('ctr');
-            case 'aes256-cbc':
-            case 'aes192-cbc':
-            case 'aes128-cbc':
-                return new Rijndael('cbc');
-            case 'aes256-ctr':
-            case 'aes192-ctr':
-            case 'aes128-ctr':
-                return new Rijndael('ctr');
-            case 'blowfish-cbc':
-                return new Blowfish('cbc');
-            case 'blowfish-ctr':
-                return new Blowfish('ctr');
-            case 'twofish128-cbc':
-            case 'twofish192-cbc':
-            case 'twofish256-cbc':
-            case 'twofish-cbc':
-                return new Twofish('cbc');
-            case 'twofish128-ctr':
-            case 'twofish192-ctr':
-            case 'twofish256-ctr':
-                return new Twofish('ctr');
-            case 'arcfour':
-            case 'arcfour128':
-            case 'arcfour256':
-                return new RC4();
-            case 'aes128-gcm@openssh.com':
-            case 'aes256-gcm@openssh.com':
-                return new Rijndael('gcm');
-            case 'chacha20-poly1305@openssh.com':
-                return new ChaCha20();
-        }
-        return null;
-    }
-
-    /**
-     * Maps an encryption algorithm name to an instance of a subclass of
-     * \phpseclib3\Crypt\Hash.
-     *
-     * @param string $algorithm Name of the encryption algorithm
-     * @return array{Hash, int}|null
-     */
-    private static function mac_algorithm_to_hash_instance($algorithm)
-    {
-        switch ($algorithm) {
-            case 'umac-64@openssh.com':
-            case 'umac-64-etm@openssh.com':
-                return [new Hash('umac-64'), 16];
-            case 'umac-128@openssh.com':
-            case 'umac-128-etm@openssh.com':
-                return [new Hash('umac-128'), 16];
-            case 'hmac-sha2-512':
-            case 'hmac-sha2-512-etm@openssh.com':
-                return [new Hash('sha512'), 64];
-            case 'hmac-sha2-256':
-            case 'hmac-sha2-256-etm@openssh.com':
-                return [new Hash('sha256'), 32];
-            case 'hmac-sha1':
-            case 'hmac-sha1-etm@openssh.com':
-                return [new Hash('sha1'), 20];
-            case 'hmac-sha1-96':
-                return [new Hash('sha1-96'), 20];
-            case 'hmac-md5':
-                return [new Hash('md5'), 16];
-            case 'hmac-md5-96':
-                return [new Hash('md5-96'), 16];
-        }
-    }
-
-    /*
-     * Tests whether or not proposed algorithm has a potential for issues
-     *
-     * @link https://www.chiark.greenend.org.uk/~sgtatham/putty/wishlist/ssh2-aesctr-openssh.html
-     * @link https://bugzilla.mindrot.org/show_bug.cgi?id=1291
-     * @param string $algorithm Name of the encryption algorithm
-     * @return bool
-     */
-    private static function bad_algorithm_candidate($algorithm)
-    {
-        switch ($algorithm) {
-            case 'arcfour256':
-            case 'aes192-ctr':
-            case 'aes256-ctr':
-                return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Login
-     *
-     * The $password parameter can be a plaintext password, a \phpseclib3\Crypt\RSA|EC|DSA object, a \phpseclib3\System\SSH\Agent object or an array
-     *
-     * @param string $username
-     * @param string|PrivateKey|array[]|Agent|null ...$args
-     * @return bool
-     * @see self::_login()
-     */
-    public function login($username, ...$args)
-    {
-        if (!$this->retry_connect) {
-            $this->auth[] = func_get_args();
-        }
-
-        // try logging with 'none' as an authentication method first since that's what
-        // PuTTY does
-        if (substr($this->server_identifier, 0, 15) != 'SSH-2.0-CoreFTP' && $this->auth_methods_to_continue === null) {
-            if ($this->sublogin($username)) {
-                return true;
-            }
-            if (!count($args)) {
-                return false;
-            }
-        }
-        return $this->sublogin($username, ...$args);
-    }
-
-    /**
-     * Login Helper
-     *
-     * @param string $username
-     * @param string|PrivateKey|array[]|Agent|null ...$args
-     * @return bool
-     * @see self::_login_helper()
-     */
-    protected function sublogin($username, ...$args)
-    {
-        if (!($this->bitmap & self::MASK_CONSTRUCTOR)) {
-            $this->connect();
-        }
-
-        if (empty($args)) {
-            return $this->login_helper($username);
-        }
-
-        foreach ($args as $arg) {
-            switch (true) {
-                case $arg instanceof PublicKey:
-                    throw new \UnexpectedValueException('A PublicKey object was passed to the login method instead of a PrivateKey object');
-                case $arg instanceof PrivateKey:
-                case $arg instanceof Agent:
-                case is_array($arg):
-                case Strings::is_stringable($arg):
-                    break;
-                default:
-                    throw new \UnexpectedValueException('$password needs to either be an instance of \phpseclib3\Crypt\Common\PrivateKey, \System\SSH\Agent, an array or a string');
-            }
-        }
-
-        while (count($args)) {
-            if (!$this->auth_methods_to_continue || !$this->smartMFA) {
-                $newargs = $args;
-                $args = [];
-            } else {
-                $newargs = [];
-                foreach ($this->auth_methods_to_continue as $method) {
-                    switch ($method) {
-                        case 'publickey':
-                            foreach ($args as $key => $arg) {
-                                if ($arg instanceof PrivateKey || $arg instanceof Agent) {
-                                    $newargs[] = $arg;
-                                    unset($args[$key]);
-                                    break;
-                                }
-                            }
-                            break;
-                        case 'keyboard-interactive':
-                            $hasArray = $hasString = false;
-                            foreach ($args as $arg) {
-                                if ($hasArray || is_array($arg)) {
-                                    $hasArray = true;
-                                    break;
-                                }
-                                if ($hasString || Strings::is_stringable($arg)) {
-                                    $hasString = true;
-                                    break;
-                                }
-                            }
-                            if ($hasArray && $hasString) {
-                                foreach ($args as $key => $arg) {
-                                    if (is_array($arg)) {
-                                        $newargs[] = $arg;
-                                        break 2;
-                                    }
-                                }
-                            }
-                            // fall-through
-                        case 'password':
-                            foreach ($args as $key => $arg) {
-                                $newargs[] = $arg;
-                                unset($args[$key]);
-                                break;
-                            }
-                    }
-                }
-            }
-
-            if (!count($newargs)) {
-                return false;
-            }
-
-            foreach ($newargs as $arg) {
-                if ($this->login_helper($username, $arg)) {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Login Helper
-     *
-     * {@internal It might be worthwhile, at some point, to protect against {@link http://tools.ietf.org/html/rfc4251#section-9.3.9 traffic analysis}
-     *           by sending dummy SSH_MSG_IGNORE messages.}
-     *
-     * @param string $username
-     * @param string|AsymmetricKey|array[]|Agent|null ...$args
-     * @return bool
-     * @throws \UnexpectedValueException on receipt of unexpected packets
-     * @throws \RuntimeException on other errors
-     */
-    private function login_helper($username, $password = null)
-    {
-        if (!($this->bitmap & self::MASK_CONNECTED)) {
-            return false;
-        }
-
-        if (!($this->bitmap & self::MASK_LOGIN_REQ)) {
-            $packet = Strings::packSSH2('Cs', NET_SSH2_MSG_SERVICE_REQUEST, 'ssh-userauth');
-            $this->send_binary_packet($packet);
-
-            try {
-                $response = $this->get_binary_packet();
-            } catch (\Exception $e) {
-                if ($this->retry_connect) {
-                    $this->retry_connect = false;
-                    $this->connect();
-                    return $this->login_helper($username, $password);
-                }
-                $this->disconnect_helper(NET_SSH2_DISCONNECT_CONNECTION_LOST);
-                throw $e;
-            }
-
-            list($type) = Strings::unpackSSH2('C', $response);
-
-            if ($type == NET_SSH2_MSG_EXT_INFO) {
-                list($nr_extensions) = Strings::unpackSSH2('N', $response);
-                for ($i = 0; $i < $nr_extensions; $i++) {
-                    list($extension_name, $extension_value) = Strings::unpackSSH2('ss', $response);
-                    if ($extension_name == 'server-sig-algs') {
-                        $this->supported_private_key_algorithms = explode(',', $extension_value);
-                    }
-                }
-
-                $response = $this->get_binary_packet();
-                list($type) = Strings::unpackSSH2('C', $response);
-            }
-
-            list($service) = Strings::unpackSSH2('s', $response);
-
-            if ($type != NET_SSH2_MSG_SERVICE_ACCEPT || $service != 'ssh-userauth') {
-                $this->disconnect_helper(NET_SSH2_DISCONNECT_PROTOCOL_ERROR);
-                throw new \UnexpectedValueException('Expected SSH_MSG_SERVICE_ACCEPT');
-            }
-            $this->bitmap |= self::MASK_LOGIN_REQ;
-        }
-
-        if (strlen($this->last_interactive_response)) {
-            return !Strings::is_stringable($password) && !is_array($password) ? false : $this->keyboard_interactive_process($password);
-        }
-
-        if ($password instanceof PrivateKey) {
-            return $this->privatekey_login($username, $password);
-        }
-
-        if ($password instanceof Agent) {
-            return $this->ssh_agent_login($username, $password);
-        }
-
-        if (is_array($password)) {
-            if ($this->keyboard_interactive_login($username, $password)) {
-                $this->bitmap |= self::MASK_LOGIN;
-                return true;
-            }
-            return false;
-        }
-
-        if (!isset($password)) {
-            $packet = Strings::packSSH2(
-                'Cs3',
-                NET_SSH2_MSG_USERAUTH_REQUEST,
-                $username,
-                'ssh-connection',
-                'none'
-            );
-
-            $this->send_binary_packet($packet);
-
-            $response = $this->get_binary_packet();
-
-            list($type) = Strings::unpackSSH2('C', $response);
-            switch ($type) {
-                case NET_SSH2_MSG_USERAUTH_SUCCESS:
-                    $this->bitmap |= self::MASK_LOGIN;
-                    return true;
-                case NET_SSH2_MSG_USERAUTH_FAILURE:
-                    list($auth_methods) = Strings::unpackSSH2('L', $response);
-                    $this->auth_methods_to_continue = $auth_methods;
-                    // fall-through
-                default:
-                    return false;
-            }
-        }
-
-        $packet = Strings::packSSH2(
-            'Cs3bs',
-            NET_SSH2_MSG_USERAUTH_REQUEST,
-            $username,
-            'ssh-connection',
-            'password',
-            false,
-            $password
-        );
-
-        // remove the username and password from the logged packet
-        if (!defined('NET_SSH2_LOGGING')) {
-            $logged = null;
-        } else {
-            $logged = Strings::packSSH2(
-                'Cs3bs',
-                NET_SSH2_MSG_USERAUTH_REQUEST,
-                $username,
-                'ssh-connection',
-                'password',
-                false,
-                'password'
-            );
-        }
-
-        $this->send_binary_packet($packet, $logged);
-
-        $response = $this->get_binary_packet();
-        if ($response === false) {
-            return false;
-        }
-        list($type) = Strings::unpackSSH2('C', $response);
-        switch ($type) {
-            case NET_SSH2_MSG_USERAUTH_PASSWD_CHANGEREQ: // in theory, the password can be changed
-                $this->updateLogHistory('UNKNOWN (60)', 'NET_SSH2_MSG_USERAUTH_PASSWD_CHANGEREQ');
-
-                list($message) = Strings::unpackSSH2('s', $response);
-                $this->errors[] = 'SSH_MSG_USERAUTH_PASSWD_CHANGEREQ: ' . $message;
-
-                return $this->disconnect_helper(NET_SSH2_DISCONNECT_AUTH_CANCELLED_BY_USER);
-            case NET_SSH2_MSG_USERAUTH_FAILURE:
-                // can we use keyboard-interactive authentication?  if not then either the login is bad or the server employees
-                // multi-factor authentication
-                list($auth_methods, $partial_success) = Strings::unpackSSH2('Lb', $response);
-                $this->auth_methods_to_continue = $auth_methods;
-                if (!$partial_success && in_array('keyboard-interactive', $auth_methods)) {
-                    if ($this->keyboard_interactive_login($username, $password)) {
-                        $this->bitmap |= self::MASK_LOGIN;
-                        return true;
-                    }
-                    return false;
-                }
-                return false;
-            case NET_SSH2_MSG_USERAUTH_SUCCESS:
-                $this->bitmap |= self::MASK_LOGIN;
-                return true;
-        }
-
-        return false;
-    }
-
-    /**
-     * Login via keyboard-interactive authentication
-     *
-     * See {@link http://tools.ietf.org/html/rfc4256 RFC4256} for details.  This is not a full-featured keyboard-interactive authenticator.
-     *
-     * @param string $username
-     * @param string|array $password
-     * @return bool
-     */
-    private function keyboard_interactive_login($username, $password)
-    {
-        $packet = Strings::packSSH2(
-            'Cs5',
-            NET_SSH2_MSG_USERAUTH_REQUEST,
-            $username,
-            'ssh-connection',
-            'keyboard-interactive',
-            '', // language tag
-            '' // submethods
-        );
-        $this->send_binary_packet($packet);
-
-        return $this->keyboard_interactive_process($password);
-    }
-
-    /**
-     * Handle the keyboard-interactive requests / responses.
-     *
-     * @param string|array ...$responses
-     * @return bool
-     * @throws \RuntimeException on connection error
-     */
-    private function keyboard_interactive_process(...$responses)
-    {
-        if (strlen($this->last_interactive_response)) {
-            $response = $this->last_interactive_response;
-        } else {
-            $orig = $response = $this->get_binary_packet();
-        }
-
-        list($type) = Strings::unpackSSH2('C', $response);
-        switch ($type) {
-            case NET_SSH2_MSG_USERAUTH_INFO_REQUEST:
-                list(
-                    , // name; may be empty
-                    , // instruction; may be empty
-                    , // language tag; may be empty
-                    $num_prompts
-                ) = Strings::unpackSSH2('s3N', $response);
-
-                for ($i = 0; $i < count($responses); $i++) {
-                    if (is_array($responses[$i])) {
-                        foreach ($responses[$i] as $key => $value) {
-                            $this->keyboard_requests_responses[$key] = $value;
-                        }
-                        unset($responses[$i]);
-                    }
-                }
-                $responses = array_values($responses);
-
-                if (isset($this->keyboard_requests_responses)) {
-                    for ($i = 0; $i < $num_prompts; $i++) {
-                        list(
-                            $prompt, // prompt - ie. "Password: "; must not be empty
-                            // echo
-                        ) = Strings::unpackSSH2('sC', $response);
-                        foreach ($this->keyboard_requests_responses as $key => $value) {
-                            if (substr($prompt, 0, strlen($key)) == $key) {
-                                $responses[] = $value;
-                                break;
-                            }
-                        }
-                    }
-                }
-
-                // see http://tools.ietf.org/html/rfc4256#section-3.2
-                if (strlen($this->last_interactive_response)) {
-                    $this->last_interactive_response = '';
-                } else {
-                    $this->updateLogHistory('UNKNOWN (60)', 'NET_SSH2_MSG_USERAUTH_INFO_REQUEST');
-                }
-
-                if (!count($responses) && $num_prompts) {
-                    $this->last_interactive_response = $orig;
-                    return false;
-                }
-
-                /*
-                   After obtaining the requested information from the user, the client
-                   MUST respond with an SSH_MSG_USERAUTH_INFO_RESPONSE message.
-                */
-                // see http://tools.ietf.org/html/rfc4256#section-3.4
-                $packet = $logged = pack('CN', NET_SSH2_MSG_USERAUTH_INFO_RESPONSE, count($responses));
-                for ($i = 0; $i < count($responses); $i++) {
-                    $packet .= Strings::packSSH2('s', $responses[$i]);
-                    $logged .= Strings::packSSH2('s', 'dummy-answer');
-                }
-
-                $this->send_binary_packet($packet, $logged);
-
-                $this->updateLogHistory('UNKNOWN (61)', 'NET_SSH2_MSG_USERAUTH_INFO_RESPONSE');
-
-                /*
-                   After receiving the response, the server MUST send either an
-                   SSH_MSG_USERAUTH_SUCCESS, SSH_MSG_USERAUTH_FAILURE, or another
-                   SSH_MSG_USERAUTH_INFO_REQUEST message.
-                */
-                // maybe phpseclib should force close the connection after x request / responses?  unless something like that is done
-                // there could be an infinite loop of request / responses.
-                return $this->keyboard_interactive_process();
-            case NET_SSH2_MSG_USERAUTH_SUCCESS:
-                return true;
-            case NET_SSH2_MSG_USERAUTH_FAILURE:
-                list($auth_methods) = Strings::unpackSSH2('L', $response);
-                $this->auth_methods_to_continue = $auth_methods;
-                return false;
-        }
-
-        return false;
-    }
-
-    /**
-     * Login with an ssh-agent provided key
-     *
-     * @param string $username
-     * @param \phpseclib3\System\SSH\Agent $agent
-     * @return bool
-     */
-    private function ssh_agent_login($username, Agent $agent)
-    {
-        $this->agent = $agent;
-        $keys = $agent->requestIdentities();
-        foreach ($keys as $key) {
-            if ($this->privatekey_login($username, $key)) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * Login with an RSA private key
-     *
-     * {@internal It might be worthwhile, at some point, to protect against {@link http://tools.ietf.org/html/rfc4251#section-9.3.9 traffic analysis}
-     *           by sending dummy SSH_MSG_IGNORE messages.}
-     *
-     * @param string $username
-     * @param \phpseclib3\Crypt\Common\PrivateKey $privatekey
-     * @return bool
-     * @throws \RuntimeException on connection error
-     */
-    private function privatekey_login($username, PrivateKey $privatekey)
-    {
-        $publickey = $privatekey->getPublicKey();
-
-        if ($publickey instanceof RSA) {
-            $privatekey = $privatekey->withPadding(RSA::SIGNATURE_PKCS1);
-            $algos = ['rsa-sha2-256', 'rsa-sha2-512', 'ssh-rsa'];
-            if (isset($this->preferred['hostkey'])) {
-                $algos = array_intersect($algos, $this->preferred['hostkey']);
-            }
-            $algo = self::array_intersect_first($algos, $this->supported_private_key_algorithms);
-            switch ($algo) {
-                case 'rsa-sha2-512':
-                    $hash = 'sha512';
-                    $signatureType = 'rsa-sha2-512';
-                    break;
-                case 'rsa-sha2-256':
-                    $hash = 'sha256';
-                    $signatureType = 'rsa-sha2-256';
-                    break;
-                //case 'ssh-rsa':
-                default:
-                    $hash = 'sha1';
-                    $signatureType = 'ssh-rsa';
-            }
-        } elseif ($publickey instanceof EC) {
-            $privatekey = $privatekey->withSignatureFormat('SSH2');
-            $curveName = $privatekey->getCurve();
-            switch ($curveName) {
-                case 'Ed25519':
-                    $hash = 'sha512';
-                    $signatureType = 'ssh-ed25519';
-                    break;
-                case 'secp256r1': // nistp256
-                    $hash = 'sha256';
-                    $signatureType = 'ecdsa-sha2-nistp256';
-                    break;
-                case 'secp384r1': // nistp384
-                    $hash = 'sha384';
-                    $signatureType = 'ecdsa-sha2-nistp384';
-                    break;
-                case 'secp521r1': // nistp521
-                    $hash = 'sha512';
-                    $signatureType = 'ecdsa-sha2-nistp521';
-                    break;
-                default:
-                    if (is_array($curveName)) {
-                        throw new UnsupportedCurveException('Specified Curves are not supported by SSH2');
-                    }
-                    throw new UnsupportedCurveException('Named Curve of ' . $curveName . ' is not supported by phpseclib3\'s SSH2 implementation');
-            }
-        } elseif ($publickey instanceof DSA) {
-            $privatekey = $privatekey->withSignatureFormat('SSH2');
-            $hash = 'sha1';
-            $signatureType = 'ssh-dss';
-        } else {
-            throw new UnsupportedAlgorithmException('Please use either an RSA key, an EC one or a DSA key');
-        }
-
-        $publickeyStr = $publickey->toString('OpenSSH', ['binary' => true]);
-
-        $part1 = Strings::packSSH2(
-            'Csss',
-            NET_SSH2_MSG_USERAUTH_REQUEST,
-            $username,
-            'ssh-connection',
-            'publickey'
-        );
-        $part2 = Strings::packSSH2('ss', $signatureType, $publickeyStr);
-
-        $packet = $part1 . chr(0) . $part2;
-        $this->send_binary_packet($packet);
-
-        $response = $this->get_binary_packet();
-
-        list($type) = Strings::unpackSSH2('C', $response);
-        switch ($type) {
-            case NET_SSH2_MSG_USERAUTH_FAILURE:
-                list($auth_methods) = Strings::unpackSSH2('L', $response);
-                if (in_array('publickey', $auth_methods) && substr($signatureType, 0, 9) == 'rsa-sha2-') {
-                    $this->supported_private_key_algorithms = array_diff($this->supported_private_key_algorithms, ['rsa-sha2-256', 'rsa-sha2-512']);
-                    return $this->privatekey_login($username, $privatekey);
-                }
-                $this->auth_methods_to_continue = $auth_methods;
-                $this->errors[] = 'SSH_MSG_USERAUTH_FAILURE';
-                return false;
-            case NET_SSH2_MSG_USERAUTH_PK_OK:
-                // we'll just take it on faith that the public key blob and the public key algorithm name are as
-                // they should be
-                $this->updateLogHistory('UNKNOWN (60)', 'NET_SSH2_MSG_USERAUTH_PK_OK');
-                break;
-            case NET_SSH2_MSG_USERAUTH_SUCCESS:
-                $this->bitmap |= self::MASK_LOGIN;
-                return true;
-            default:
-                $this->disconnect_helper(NET_SSH2_DISCONNECT_BY_APPLICATION);
-                throw new ConnectionClosedException('Unexpected response to publickey authentication pt 1');
-        }
-
-        $packet = $part1 . chr(1) . $part2;
-        $privatekey = $privatekey->withHash($hash);
-        $signature = $privatekey->sign(Strings::packSSH2('s', $this->session_id) . $packet);
-        if ($publickey instanceof RSA) {
-            $signature = Strings::packSSH2('ss', $signatureType, $signature);
-        }
-        $packet .= Strings::packSSH2('s', $signature);
-
-        $this->send_binary_packet($packet);
-
-        $response = $this->get_binary_packet();
-
-        list($type) = Strings::unpackSSH2('C', $response);
-        switch ($type) {
-            case NET_SSH2_MSG_USERAUTH_FAILURE:
-                // either the login is bad or the server employs multi-factor authentication
-                list($auth_methods) = Strings::unpackSSH2('L', $response);
-                $this->auth_methods_to_continue = $auth_methods;
-                return false;
-            case NET_SSH2_MSG_USERAUTH_SUCCESS:
-                $this->bitmap |= self::MASK_LOGIN;
-                return true;
-        }
-
-        $this->disconnect_helper(NET_SSH2_DISCONNECT_BY_APPLICATION);
-        throw new ConnectionClosedException('Unexpected response to publickey authentication pt 2');
-    }
-
-    /**
-     * Return the currently configured timeout
-     *
-     * @return int
-     */
-    public function getTimeout()
-    {
-        return $this->timeout;
-    }
-
-    /**
-     * Set Timeout
-     *
-     * $ssh->exec('ping 127.0.0.1'); on a Linux host will never return and will run indefinitely.  setTimeout() makes it so it'll timeout.
-     * Setting $timeout to false or 0 will mean there is no timeout.
-     *
-     * @param mixed $timeout
-     */
-    public function setTimeout($timeout)
-    {
-        $this->timeout = $this->curTimeout = $timeout;
-    }
-
-    /**
-     * Set Keep Alive
-     *
-     * Sends an SSH2_MSG_IGNORE message every x seconds, if x is a positive non-zero number.
-     *
-     * @param int $interval
-     */
-    public function setKeepAlive($interval)
-    {
-        $this->keepAlive = $interval;
-    }
-
-    /**
-     * Get the output from stdError
-     *
-     */
-    public function getStdError()
-    {
-        return $this->stdErrorLog;
-    }
-
-    /**
-     * Execute Command
-     *
-     * If $callback is set to false then \phpseclib3\Net\SSH2::get_channel_packet(self::CHANNEL_EXEC) will need to be called manually.
-     * In all likelihood, this is not a feature you want to be taking advantage of.
-     *
-     * @param string $command
-     * @return string|bool
-     * @psalm-return ($callback is callable ? bool : string|bool)
-     * @throws \RuntimeException on connection error
-     */
-    public function exec($command, callable $callback = null)
-    {
-        $this->curTimeout = $this->timeout;
-        $this->is_timeout = false;
-        $this->stdErrorLog = '';
-
-        if (!$this->isAuthenticated()) {
-            return false;
-        }
-
-        //if ($this->isPTYOpen()) {
-        //    throw new \RuntimeException('If you want to run multiple exec()\'s you will need to disable (and re-enable if appropriate) a PTY for each one.');
-        //}
-
-        $this->open_channel(self::CHANNEL_EXEC);
-
-        if ($this->request_pty === true) {
-            $terminal_modes = pack('C', NET_SSH2_TTY_OP_END);
-            $packet = Strings::packSSH2(
-                'CNsCsN4s',
-                NET_SSH2_MSG_CHANNEL_REQUEST,
-                $this->server_channels[self::CHANNEL_EXEC],
-                'pty-req',
-                1,
-                $this->term,
-                $this->windowColumns,
-                $this->windowRows,
-                0,
-                0,
-                $terminal_modes
-            );
-
-            $this->send_binary_packet($packet);
-
-            $this->channel_status[self::CHANNEL_EXEC] = NET_SSH2_MSG_CHANNEL_REQUEST;
-            if (!$this->get_channel_packet(self::CHANNEL_EXEC)) {
-                $this->disconnect_helper(NET_SSH2_DISCONNECT_BY_APPLICATION);
-                throw new \RuntimeException('Unable to request pseudo-terminal');
-            }
-        }
-
-        // sending a pty-req SSH_MSG_CHANNEL_REQUEST message is unnecessary and, in fact, in most cases, slows things
-        // down.  the one place where it might be desirable is if you're doing something like \phpseclib3\Net\SSH2::exec('ping localhost &').
-        // with a pty-req SSH_MSG_CHANNEL_REQUEST, exec() will return immediately and the ping process will then
-        // then immediately terminate.  without such a request exec() will loop indefinitely.  the ping process won't end but
-        // neither will your script.
-
-        // although, in theory, the size of SSH_MSG_CHANNEL_REQUEST could exceed the maximum packet size established by
-        // SSH_MSG_CHANNEL_OPEN_CONFIRMATION, RFC4254#section-5.1 states that the "maximum packet size" refers to the
-        // "maximum size of an individual data packet". ie. SSH_MSG_CHANNEL_DATA.  RFC4254#section-5.2 corroborates.
-        $packet = Strings::packSSH2(
-            'CNsCs',
-            NET_SSH2_MSG_CHANNEL_REQUEST,
-            $this->server_channels[self::CHANNEL_EXEC],
-            'exec',
-            1,
-            $command
-        );
-        $this->send_binary_packet($packet);
-
-        $this->channel_status[self::CHANNEL_EXEC] = NET_SSH2_MSG_CHANNEL_REQUEST;
-
-        if (!$this->get_channel_packet(self::CHANNEL_EXEC)) {
-            return false;
-        }
-
-        $this->channel_status[self::CHANNEL_EXEC] = NET_SSH2_MSG_CHANNEL_DATA;
-
-        if ($this->request_pty === true) {
-            $this->channel_id_last_interactive = self::CHANNEL_EXEC;
-            return true;
-        }
-
-        $output = '';
-        while (true) {
-            $temp = $this->get_channel_packet(self::CHANNEL_EXEC);
-            switch (true) {
-                case $temp === true:
-                    return is_callable($callback) ? true : $output;
-                case $temp === false:
-                    return false;
-                default:
-                    if (is_callable($callback)) {
-                        if ($callback($temp) === true) {
-                            $this->close_channel(self::CHANNEL_EXEC);
-                            return true;
-                        }
-                    } else {
-                        $output .= $temp;
-                    }
-            }
-        }
-    }
-
-    /**
-     * How many channels are currently open?
-     *
-     * @return int
-     */
-    public function getOpenChannelCount()
-    {
-        return $this->channelCount;
-    }
-
-    /**
-     * Opens a channel
-     *
-     * @param string $channel
-     * @param bool $skip_extended
-     * @return bool
-     */
-    protected function open_channel($channel, $skip_extended = false)
-    {
-        if (isset($this->channel_status[$channel]) && $this->channel_status[$channel] != NET_SSH2_MSG_CHANNEL_CLOSE) {
-            throw new \RuntimeException('Please close the channel (' . $channel . ') before trying to open it again');
-        }
-
-        $this->channelCount++;
-
-        if ($this->channelCount > 1 && $this->errorOnMultipleChannels) {
-            throw new \RuntimeException("Ubuntu's OpenSSH from 5.8 to 6.9 doesn't work with multiple channels");
-        }
-
-        // RFC4254 defines the (client) window size as "bytes the other party can send before it must wait for the window to
-        // be adjusted".  0x7FFFFFFF is, at 2GB, the max size.  technically, it should probably be decremented, but,
-        // honestly, if you're transferring more than 2GB, you probably shouldn't be using phpseclib, anyway.
-        // see http://tools.ietf.org/html/rfc4254#section-5.2 for more info
-        $this->window_size_server_to_client[$channel] = $this->window_size;
-        // 0x8000 is the maximum max packet size, per http://tools.ietf.org/html/rfc4253#section-6.1, although since PuTTy
-        // uses 0x4000, that's what will be used here, as well.
-        $packet_size = 0x4000;
-
-        $packet = Strings::packSSH2(
-            'CsN3',
-            NET_SSH2_MSG_CHANNEL_OPEN,
-            'session',
-            $channel,
-            $this->window_size_server_to_client[$channel],
-            $packet_size
-        );
-
-        $this->send_binary_packet($packet);
-
-        $this->channel_status[$channel] = NET_SSH2_MSG_CHANNEL_OPEN;
-
-        return $this->get_channel_packet($channel, $skip_extended);
-    }
-
-    /**
-     * Creates an interactive shell
-     *
-     * Returns bool(true) if the shell was opened.
-     * Returns bool(false) if the shell was already open.
-     *
-     * @see self::isShellOpen()
-     * @see self::read()
-     * @see self::write()
-     * @return bool
-     * @throws InsufficientSetupException if not authenticated
-     * @throws \UnexpectedValueException on receipt of unexpected packets
-     * @throws \RuntimeException on other errors
-     */
-    public function openShell()
-    {
-        if (!$this->isAuthenticated()) {
-            throw new InsufficientSetupException('Operation disallowed prior to login()');
-        }
-
-        $this->open_channel(self::CHANNEL_SHELL);
-
-        $terminal_modes = pack('C', NET_SSH2_TTY_OP_END);
-        $packet = Strings::packSSH2(
-            'CNsbsN4s',
-            NET_SSH2_MSG_CHANNEL_REQUEST,
-            $this->server_channels[self::CHANNEL_SHELL],
-            'pty-req',
-            true, // want reply
-            $this->term,
-            $this->windowColumns,
-            $this->windowRows,
-            0,
-            0,
-            $terminal_modes
-        );
-
-        $this->send_binary_packet($packet);
-
-        $this->channel_status[self::CHANNEL_SHELL] = NET_SSH2_MSG_CHANNEL_REQUEST;
-
-        if (!$this->get_channel_packet(self::CHANNEL_SHELL)) {
-            throw new \RuntimeException('Unable to request pty');
-        }
-
-        $packet = Strings::packSSH2(
-            'CNsb',
-            NET_SSH2_MSG_CHANNEL_REQUEST,
-            $this->server_channels[self::CHANNEL_SHELL],
-            'shell',
-            true // want reply
-        );
-        $this->send_binary_packet($packet);
-
-        $response = $this->get_channel_packet(self::CHANNEL_SHELL);
-        if ($response === false) {
-            throw new \RuntimeException('Unable to request shell');
-        }
-
-        $this->channel_status[self::CHANNEL_SHELL] = NET_SSH2_MSG_CHANNEL_DATA;
-
-        $this->channel_id_last_interactive = self::CHANNEL_SHELL;
-
-        $this->bitmap |= self::MASK_SHELL;
-
-        return true;
-    }
-
-    /**
-     * Return the channel to be used with read(), write(), and reset(), if none were specified
-     * @deprecated for lack of transparency in intended channel target, to be potentially replaced
-     *             with method which guarantees open-ness of all yielded channels and throws
-     *             error for multiple open channels
-     * @see self::read()
-     * @see self::write()
-     * @return int
-     */
-    private function get_interactive_channel()
-    {
-        switch (true) {
-            case $this->is_channel_status_data(self::CHANNEL_SUBSYSTEM):
-                return self::CHANNEL_SUBSYSTEM;
-            case $this->is_channel_status_data(self::CHANNEL_EXEC):
-                return self::CHANNEL_EXEC;
-            default:
-                return self::CHANNEL_SHELL;
-        }
-    }
-
-    /**
-     * Indicates the DATA status on the given channel
-     *
-     * @param int $channel The channel number to evaluate
-     * @return bool
-     */
-    private function is_channel_status_data($channel)
-    {
-        return isset($this->channel_status[$channel]) && $this->channel_status[$channel] == NET_SSH2_MSG_CHANNEL_DATA;
-    }
-
-    /**
-     * Return an available open channel
-     *
-     * @return int
-     */
-    private function get_open_channel()
-    {
-        $channel = self::CHANNEL_EXEC;
-        do {
-            if (isset($this->channel_status[$channel]) && $this->channel_status[$channel] == NET_SSH2_MSG_CHANNEL_OPEN) {
-                return $channel;
-            }
-        } while ($channel++ < self::CHANNEL_SUBSYSTEM);
-
-        return false;
-    }
-
-    /**
-     * Request agent forwarding of remote server
-     *
-     * @return bool
-     */
-    public function requestAgentForwarding()
-    {
-        $request_channel = $this->get_open_channel();
-        if ($request_channel === false) {
-            return false;
-        }
-
-        $packet = Strings::packSSH2(
-            'CNsC',
-            NET_SSH2_MSG_CHANNEL_REQUEST,
-            $this->server_channels[$request_channel],
-            'auth-agent-req@openssh.com',
-            1
-        );
-
-        $this->channel_status[$request_channel] = NET_SSH2_MSG_CHANNEL_REQUEST;
-
-        $this->send_binary_packet($packet);
-
-        if (!$this->get_channel_packet($request_channel)) {
-            return false;
-        }
-
-        $this->channel_status[$request_channel] = NET_SSH2_MSG_CHANNEL_OPEN;
-
-        return true;
-    }
-
-    /**
-     * Returns the output of an interactive shell
-     *
-     * Returns when there's a match for $expect, which can take the form of a string literal or,
-     * if $mode == self::READ_REGEX, a regular expression.
-     *
-     * If not specifying a channel, an open interactive channel will be selected, or, if there are
-     * no open channels, an interactive shell will be created. If there are multiple open
-     * interactive channels, a legacy behavior will apply in which channel selection prioritizes
-     * an active subsystem, the exec pty, and, lastly, the shell. If using multiple interactive
-     * channels, callers are discouraged from relying on this legacy behavior and should specify
-     * the intended channel.
-     *
-     * @see self::write()
-     * @param string $expect
-     * @param int $mode One of the self::READ_* constants
-     * @param int|null $channel Channel id returned by self::getInteractiveChannelId()
-     * @return string|bool|null
-     * @throws \RuntimeException on connection error
-     * @throws InsufficientSetupException on unexpected channel status, possibly due to closure
-     */
-    public function read($expect = '', $mode = self::READ_SIMPLE, $channel = null)
-    {
-        if (!$this->isAuthenticated()) {
-            throw new InsufficientSetupException('Operation disallowed prior to login()');
-        }
-
-        $this->curTimeout = $this->timeout;
-        $this->is_timeout = false;
-
-        if ($channel === null) {
-            $channel = $this->get_interactive_channel();
-        }
-
-        if (!$this->is_channel_status_data($channel) && empty($this->channel_buffers[$channel])) {
-            if ($channel != self::CHANNEL_SHELL) {
-                throw new InsufficientSetupException('Data is not available on channel');
-            } elseif (!$this->openShell()) {
-                throw new \RuntimeException('Unable to initiate an interactive shell session');
-            }
-        }
-
-        if ($mode == self::READ_NEXT) {
-            return $this->get_channel_packet($channel);
-        }
-
-        $match = $expect;
-        while (true) {
-            if ($mode == self::READ_REGEX) {
-                preg_match($expect, substr($this->interactiveBuffer, -1024), $matches);
-                $match = isset($matches[0]) ? $matches[0] : '';
-            }
-            $pos = strlen($match) ? strpos($this->interactiveBuffer, $match) : false;
-            if ($pos !== false) {
-                return Strings::shift($this->interactiveBuffer, $pos + strlen($match));
-            }
-            $response = $this->get_channel_packet($channel);
-            if ($response === true) {
-                return Strings::shift($this->interactiveBuffer, strlen($this->interactiveBuffer));
-            }
-
-            $this->interactiveBuffer .= $response;
-        }
-    }
-
-    /**
-     * Inputs a command into an interactive shell.
-     *
-     * If not specifying a channel, an open interactive channel will be selected, or, if there are
-     * no open channels, an interactive shell will be created. If there are multiple open
-     * interactive channels, a legacy behavior will apply in which channel selection prioritizes
-     * an active subsystem, the exec pty, and, lastly, the shell. If using multiple interactive
-     * channels, callers are discouraged from relying on this legacy behavior and should specify
-     * the intended channel.
-     *
-     * @see SSH2::read()
-     * @param string $cmd
-     * @param int|null $channel Channel id returned by self::getInteractiveChannelId()
-     * @return void
-     * @throws \RuntimeException on connection error
-     * @throws InsufficientSetupException on unexpected channel status, possibly due to closure
-     */
-    public function write($cmd, $channel = null)
-    {
-        if (!$this->isAuthenticated()) {
-            throw new InsufficientSetupException('Operation disallowed prior to login()');
-        }
-
-        if ($channel === null) {
-            $channel = $this->get_interactive_channel();
-        }
-
-        if (!$this->is_channel_status_data($channel)) {
-            if ($channel != self::CHANNEL_SHELL) {
-                throw new InsufficientSetupException('Data is not available on channel');
-            } elseif (!$this->openShell()) {
-                throw new \RuntimeException('Unable to initiate an interactive shell session');
-            }
-        }
-
-        $this->send_channel_packet($channel, $cmd);
-    }
-
-    /**
-     * Start a subsystem.
-     *
-     * Right now only one subsystem at a time is supported. To support multiple subsystem's stopSubsystem() could accept
-     * a string that contained the name of the subsystem, but at that point, only one subsystem of each type could be opened.
-     * To support multiple subsystem's of the same name maybe it'd be best if startSubsystem() generated a new channel id and
-     * returns that and then that that was passed into stopSubsystem() but that'll be saved for a future date and implemented
-     * if there's sufficient demand for such a feature.
-     *
-     * @see self::stopSubsystem()
-     * @param string $subsystem
-     * @return bool
-     */
-    public function startSubsystem($subsystem)
-    {
-        $this->open_channel(self::CHANNEL_SUBSYSTEM);
-
-        $packet = Strings::packSSH2(
-            'CNsCs',
-            NET_SSH2_MSG_CHANNEL_REQUEST,
-            $this->server_channels[self::CHANNEL_SUBSYSTEM],
-            'subsystem',
-            1,
-            $subsystem
-        );
-        $this->send_binary_packet($packet);
-
-        $this->channel_status[self::CHANNEL_SUBSYSTEM] = NET_SSH2_MSG_CHANNEL_REQUEST;
-
-        if (!$this->get_channel_packet(self::CHANNEL_SUBSYSTEM)) {
-            return false;
-        }
-
-        $this->channel_status[self::CHANNEL_SUBSYSTEM] = NET_SSH2_MSG_CHANNEL_DATA;
-
-        $this->channel_id_last_interactive = self::CHANNEL_SUBSYSTEM;
-
-        return true;
-    }
-
-    /**
-     * Stops a subsystem.
-     *
-     * @see self::startSubsystem()
-     * @return bool
-     */
-    public function stopSubsystem()
-    {
-        if ($this->isInteractiveChannelOpen(self::CHANNEL_SUBSYSTEM)) {
-            $this->close_channel(self::CHANNEL_SUBSYSTEM);
-        }
-        return true;
-    }
-
-    /**
-     * Closes a channel
-     *
-     * If read() timed out you might want to just close the channel and have it auto-restart on the next read() call
-     *
-     * If not specifying a channel, an open interactive channel will be selected. If there are
-     * multiple open interactive channels, a legacy behavior will apply in which channel selection
-     * prioritizes an active subsystem, the exec pty, and, lastly, the shell. If using multiple
-     * interactive channels, callers are discouraged from relying on this legacy behavior and
-     * should specify the intended channel.
-     *
-     * @param int|null $channel Channel id returned by self::getInteractiveChannelId()
-     * @return void
-     */
-    public function reset($channel = null)
-    {
-        if ($channel === null) {
-            $channel = $this->get_interactive_channel();
-        }
-        if ($this->isInteractiveChannelOpen($channel)) {
-            $this->close_channel($channel);
-        }
-    }
-
-    /**
-     * Is timeout?
-     *
-     * Did exec() or read() return because they timed out or because they encountered the end?
-     *
-     */
-    public function isTimeout()
-    {
-        return $this->is_timeout;
-    }
-
-    /**
-     * Disconnect
-     *
-     */
-    public function disconnect()
-    {
-        $this->disconnect_helper(NET_SSH2_DISCONNECT_BY_APPLICATION);
-        if (isset($this->realtime_log_file) && is_resource($this->realtime_log_file)) {
-            fclose($this->realtime_log_file);
-        }
-        unset(self::$connections[$this->getResourceId()]);
-    }
-
-    /**
-     * Destructor.
-     *
-     * Will be called, automatically, if you're supporting just PHP5.  If you're supporting PHP4, you'll need to call
-     * disconnect().
-     *
-     */
-    public function __destruct()
-    {
-        $this->disconnect();
-    }
-
-    /**
-     * Is the connection still active?
-     *
-     * $level has 3x possible values:
-     * 0 (default): phpseclib takes a passive approach to see if the connection is still active by calling feof()
-     *    on the socket
-     * 1: phpseclib takes an active approach to see if the connection is still active by sending an SSH_MSG_IGNORE
-     *    packet that doesn't require a response
-     * 2: phpseclib takes an active approach to see if the connection is still active by sending an SSH_MSG_CHANNEL_OPEN
-     *    packet and imediately trying to close that channel. some routers, in particular, however, will only let you
-     *    open one channel, so this approach could yield false positives
-     *
-     * @param int $level
-     * @return bool
-     */
-    public function isConnected($level = 0)
-    {
-        if (!is_int($level) || $level < 0 || $level > 2) {
-            throw new \InvalidArgumentException('$level must be 0, 1 or 2');
-        }
-
-        if ($level == 0) {
-            return ($this->bitmap & self::MASK_CONNECTED) && is_resource($this->fsock) && !feof($this->fsock);
-        }
-        try {
-            if ($level == 1) {
-                $this->send_binary_packet(pack('CN', NET_SSH2_MSG_IGNORE, 0));
-            } else {
-                $this->open_channel(self::CHANNEL_KEEP_ALIVE);
-                $this->close_channel(self::CHANNEL_KEEP_ALIVE);
-            }
-            return true;
-        } catch (\Exception $e) {
-            return false;
-        }
-    }
-
-    /**
-     * Have you successfully been logged in?
-     *
-     * @return bool
-     */
-    public function isAuthenticated()
-    {
-        return (bool) ($this->bitmap & self::MASK_LOGIN);
-    }
-
-    /**
-     * Is the interactive shell active?
-     *
-     * @return bool
-     */
-    public function isShellOpen()
-    {
-        return $this->isInteractiveChannelOpen(self::CHANNEL_SHELL);
-    }
-
-    /**
-     * Is the exec pty active?
-     *
-     * @return bool
-     */
-    public function isPTYOpen()
-    {
-        return $this->isInteractiveChannelOpen(self::CHANNEL_EXEC);
-    }
-
-    /**
-     * Is the given interactive channel active?
-     *
-     * @param int $channel Channel id returned by self::getInteractiveChannelId()
-     * @return bool
-     */
-    public function isInteractiveChannelOpen($channel)
-    {
-        return $this->isAuthenticated() && $this->is_channel_status_data($channel);
-    }
-
-    /**
-     * Returns a channel identifier, presently of the last interactive channel opened, regardless of current status.
-     * Returns 0 if no interactive channel has been opened.
-     *
-     * @see self::isInteractiveChannelOpen()
-     * @return int
-     */
-    public function getInteractiveChannelId()
-    {
-        return $this->channel_id_last_interactive;
-    }
-
-    /**
-     * Pings a server connection, or tries to reconnect if the connection has gone down
-     *
-     * Inspired by http://php.net/manual/en/mysqli.ping.php
-     *
-     * @return bool
-     */
-    public function ping()
-    {
-        if (!$this->isAuthenticated()) {
-            if (!empty($this->auth)) {
-                return $this->reconnect();
-            }
-            return false;
-        }
-
-        try {
-            $this->open_channel(self::CHANNEL_KEEP_ALIVE);
-        } catch (\RuntimeException $e) {
-            return $this->reconnect();
-        }
-
-        $this->close_channel(self::CHANNEL_KEEP_ALIVE);
-        return true;
-    }
-
-    /**
-     * In situ reconnect method
-     *
-     * @return boolean
-     */
-    private function reconnect()
-    {
-        $this->reset_connection(NET_SSH2_DISCONNECT_CONNECTION_LOST);
-        $this->retry_connect = true;
-        $this->connect();
-        foreach ($this->auth as $auth) {
-            $result = $this->login(...$auth);
-        }
-        return $result;
-    }
-
-    /**
-     * Resets a connection for re-use
-     *
-     * @param int $reason
-     */
-    protected function reset_connection($reason)
-    {
-        $this->disconnect_helper($reason);
-        $this->decrypt = $this->encrypt = false;
-        $this->decrypt_block_size = $this->encrypt_block_size = 8;
-        $this->hmac_check = $this->hmac_create = false;
-        $this->hmac_size = false;
-        $this->session_id = false;
-        $this->retry_connect = true;
-        $this->get_seq_no = $this->send_seq_no = 0;
-        $this->channel_status = [];
-        $this->channel_id_last_interactive = 0;
-    }
-
-    /**
-     * Gets Binary Packets
-     *
-     * See '6. Binary Packet Protocol' of rfc4253 for more info.
-     *
-     * @see self::_send_binary_packet()
-     * @param bool $skip_channel_filter
-     * @return bool|string
-     */
-    private function get_binary_packet($skip_channel_filter = false)
-    {
-        if ($skip_channel_filter) {
-            if (!is_resource($this->fsock)) {
-                throw new \InvalidArgumentException('fsock is not a resource.');
-            }
-            $read = [$this->fsock];
-            $write = $except = null;
-
-            if (!$this->curTimeout) {
-                if ($this->keepAlive <= 0) {
-                    static::stream_select($read, $write, $except, null);
-                } else {
-                    if (!static::stream_select($read, $write, $except, $this->keepAlive)) {
-                        $this->send_binary_packet(pack('CN', NET_SSH2_MSG_IGNORE, 0));
-                        return $this->get_binary_packet(true);
-                    }
-                }
-            } else {
-                if ($this->curTimeout < 0) {
-                    $this->is_timeout = true;
-                    return true;
-                }
-
-                $start = microtime(true);
-
-                if ($this->keepAlive > 0 && $this->keepAlive < $this->curTimeout) {
-                    if (!static::stream_select($read, $write, $except, $this->keepAlive)) {
-                        $this->send_binary_packet(pack('CN', NET_SSH2_MSG_IGNORE, 0));
-                        $elapsed = microtime(true) - $start;
-                        $this->curTimeout -= $elapsed;
-                        return $this->get_binary_packet(true);
-                    }
-                    $elapsed = microtime(true) - $start;
-                    $this->curTimeout -= $elapsed;
-                }
-
-                $sec = (int) floor($this->curTimeout);
-                $usec = (int) (1000000 * ($this->curTimeout - $sec));
-
-                // this can return a "stream_select(): unable to select [4]: Interrupted system call" error
-                if (!static::stream_select($read, $write, $except, $sec, $usec)) {
-                    $this->is_timeout = true;
-                    return true;
-                }
-                $elapsed = microtime(true) - $start;
-                $this->curTimeout -= $elapsed;
-            }
-        }
-
-        if (!is_resource($this->fsock) || feof($this->fsock)) {
-            $this->bitmap = 0;
-            $str = 'Connection closed (by server) prematurely';
-            if (isset($elapsed)) {
-                $str .= ' ' . $elapsed . 's';
-            }
-            throw new ConnectionClosedException($str);
-        }
-
-        $start = microtime(true);
-        if ($this->curTimeout) {
-            $sec = (int) floor($this->curTimeout);
-            $usec = (int) (1000000 * ($this->curTimeout - $sec));
-            stream_set_timeout($this->fsock, $sec, $usec);
-        }
-        $raw = stream_get_contents($this->fsock, $this->decrypt_block_size);
-
-        if (!strlen($raw)) {
-            $this->bitmap = 0;
-            throw new ConnectionClosedException('No data received from server');
-        }
-
-        if ($this->decrypt) {
-            switch ($this->decryptName) {
-                case 'aes128-gcm@openssh.com':
-                case 'aes256-gcm@openssh.com':
-                    $this->decrypt->setNonce(
-                        $this->decryptFixedPart .
-                        $this->decryptInvocationCounter
-                    );
-                    Strings::increment_str($this->decryptInvocationCounter);
-                    $this->decrypt->setAAD($temp = Strings::shift($raw, 4));
-                    extract(unpack('Npacket_length', $temp));
-                    /**
-                     * @var integer $packet_length
-                     */
-
-                    $raw .= $this->read_remaining_bytes($packet_length - $this->decrypt_block_size + 4);
-                    $stop = microtime(true);
-                    $tag = stream_get_contents($this->fsock, $this->decrypt_block_size);
-                    $this->decrypt->setTag($tag);
-                    $raw = $this->decrypt->decrypt($raw);
-                    $raw = $temp . $raw;
-                    $remaining_length = 0;
-                    break;
-                case 'chacha20-poly1305@openssh.com':
-                    // This should be impossible, but we are checking anyway to narrow the type for Psalm.
-                    if (!($this->decrypt instanceof ChaCha20)) {
-                        throw new \LogicException('$this->decrypt is not a ' . ChaCha20::class);
-                    }
-
-                    $nonce = pack('N2', 0, $this->get_seq_no);
-
-                    $this->lengthDecrypt->setNonce($nonce);
-                    $temp = $this->lengthDecrypt->decrypt($aad = Strings::shift($raw, 4));
-                    extract(unpack('Npacket_length', $temp));
-                    /**
-                     * @var integer $packet_length
-                     */
-
-                    $raw .= $this->read_remaining_bytes($packet_length - $this->decrypt_block_size + 4);
-                    $stop = microtime(true);
-                    $tag = stream_get_contents($this->fsock, 16);
-
-                    $this->decrypt->setNonce($nonce);
-                    $this->decrypt->setCounter(0);
-                    // this is the same approach that's implemented in Salsa20::createPoly1305Key()
-                    // but we don't want to use the same AEAD construction that RFC8439 describes
-                    // for ChaCha20-Poly1305 so we won't rely on it (see Salsa20::poly1305())
-                    $this->decrypt->setPoly1305Key(
-                        $this->decrypt->encrypt(str_repeat("\0", 32))
-                    );
-                    $this->decrypt->setAAD($aad);
-                    $this->decrypt->setCounter(1);
-                    $this->decrypt->setTag($tag);
-                    $raw = $this->decrypt->decrypt($raw);
-                    $raw = $temp . $raw;
-                    $remaining_length = 0;
-                    break;
-                default:
-                    if (!$this->hmac_check instanceof Hash || !$this->hmac_check_etm) {
-                        $raw = $this->decrypt->decrypt($raw);
-                        break;
-                    }
-                    extract(unpack('Npacket_length', $temp = Strings::shift($raw, 4)));
-                    /**
-                     * @var integer $packet_length
-                     */
-                    $raw .= $this->read_remaining_bytes($packet_length - $this->decrypt_block_size + 4);
-                    $stop = microtime(true);
-                    $encrypted = $temp . $raw;
-                    $raw = $temp . $this->decrypt->decrypt($raw);
-                    $remaining_length = 0;
-            }
-        }
-
-        if (strlen($raw) < 5) {
-            $this->bitmap = 0;
-            throw new \RuntimeException('Plaintext is too short');
-        }
-        extract(unpack('Npacket_length/Cpadding_length', Strings::shift($raw, 5)));
-        /**
-         * @var integer $packet_length
-         * @var integer $padding_length
-         */
-
-        if (!isset($remaining_length)) {
-            $remaining_length = $packet_length + 4 - $this->decrypt_block_size;
-        }
-
-        $buffer = $this->read_remaining_bytes($remaining_length);
-
-        if (!isset($stop)) {
-            $stop = microtime(true);
-        }
-        if (strlen($buffer)) {
-            $raw .= $this->decrypt ? $this->decrypt->decrypt($buffer) : $buffer;
-        }
-
-        $payload = Strings::shift($raw, $packet_length - $padding_length - 1);
-        $padding = Strings::shift($raw, $padding_length); // should leave $raw empty
-
-        if ($this->hmac_check instanceof Hash) {
-            $hmac = stream_get_contents($this->fsock, $this->hmac_size);
-            if ($hmac === false || strlen($hmac) != $this->hmac_size) {
-                $this->disconnect_helper(NET_SSH2_DISCONNECT_MAC_ERROR);
-                throw new \RuntimeException('Error reading socket');
-            }
-
-            $reconstructed = !$this->hmac_check_etm ?
-                pack('NCa*', $packet_length, $padding_length, $payload . $padding) :
-                $encrypted;
-            if (($this->hmac_check->getHash() & "\xFF\xFF\xFF\xFF") == 'umac') {
-                $this->hmac_check->setNonce("\0\0\0\0" . pack('N', $this->get_seq_no));
-                if ($hmac != $this->hmac_check->hash($reconstructed)) {
-                    $this->disconnect_helper(NET_SSH2_DISCONNECT_MAC_ERROR);
-                    throw new \RuntimeException('Invalid UMAC');
-                }
-            } else {
-                if ($hmac != $this->hmac_check->hash(pack('Na*', $this->get_seq_no, $reconstructed))) {
-                    $this->disconnect_helper(NET_SSH2_DISCONNECT_MAC_ERROR);
-                    throw new \RuntimeException('Invalid HMAC');
-                }
-            }
-        }
-
-        switch ($this->decompress) {
-            case self::NET_SSH2_COMPRESSION_ZLIB_AT_OPENSSH:
-                if (!$this->isAuthenticated()) {
-                    break;
-                }
-                // fall-through
-            case self::NET_SSH2_COMPRESSION_ZLIB:
-                if ($this->regenerate_decompression_context) {
-                    $this->regenerate_decompression_context = false;
-
-                    $cmf = ord($payload[0]);
-                    $cm = $cmf & 0x0F;
-                    if ($cm != 8) { // deflate
-                        user_error("Only CM = 8 ('deflate') is supported ($cm)");
-                    }
-                    $cinfo = ($cmf & 0xF0) >> 4;
-                    if ($cinfo > 7) {
-                        user_error("CINFO above 7 is not allowed ($cinfo)");
-                    }
-                    $windowSize = 1 << ($cinfo + 8);
-
-                    $flg = ord($payload[1]);
-                    //$fcheck = $flg && 0x0F;
-                    if ((($cmf << 8) | $flg) % 31) {
-                        user_error('fcheck failed');
-                    }
-                    $fdict = boolval($flg & 0x20);
-                    $flevel = ($flg & 0xC0) >> 6;
-
-                    $this->decompress_context = inflate_init(ZLIB_ENCODING_RAW, ['window' => $cinfo + 8]);
-                    $payload = substr($payload, 2);
-                }
-                if ($this->decompress_context) {
-                    $payload = inflate_add($this->decompress_context, $payload, ZLIB_PARTIAL_FLUSH);
-                }
-        }
-
-        $this->get_seq_no++;
-
-        if (defined('NET_SSH2_LOGGING')) {
-            $current = microtime(true);
-            $message_number = isset(self::$message_numbers[ord($payload[0])]) ? self::$message_numbers[ord($payload[0])] : 'UNKNOWN (' . ord($payload[0]) . ')';
-            $message_number = '<- ' . $message_number .
-                              ' (since last: ' . round($current - $this->last_packet, 4) . ', network: ' . round($stop - $start, 4) . 's)';
-            $this->append_log($message_number, $payload);
-            $this->last_packet = $current;
-        }
-
-        return $this->filter($payload, $skip_channel_filter);
-    }
-
-    /**
-     * Read Remaining Bytes
-     *
-     * @see self::get_binary_packet()
-     * @param int $remaining_length
-     * @return string
-     */
-    private function read_remaining_bytes($remaining_length)
-    {
-        if (!$remaining_length) {
-            return '';
-        }
-
-        $adjustLength = false;
-        if ($this->decrypt) {
-            switch (true) {
-                case $this->decryptName == 'aes128-gcm@openssh.com':
-                case $this->decryptName == 'aes256-gcm@openssh.com':
-                case $this->decryptName == 'chacha20-poly1305@openssh.com':
-                case $this->hmac_check instanceof Hash && $this->hmac_check_etm:
-                    $remaining_length += $this->decrypt_block_size - 4;
-                    $adjustLength = true;
-            }
-        }
-
-        // quoting <http://tools.ietf.org/html/rfc4253#section-6.1>,
-        // "implementations SHOULD check that the packet length is reasonable"
-        // PuTTY uses 0x9000 as the actual max packet size and so to shall we
-        // don't do this when GCM mode is used since GCM mode doesn't encrypt the length
-        if ($remaining_length < -$this->decrypt_block_size || $remaining_length > 0x9000 || $remaining_length % $this->decrypt_block_size != 0) {
-            if (!$this->bad_key_size_fix && self::bad_algorithm_candidate($this->decrypt ? $this->decryptName : '') && !($this->bitmap & SSH2::MASK_LOGIN)) {
-                $this->bad_key_size_fix = true;
-                $this->reset_connection(NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED);
-                return false;
-            }
-            throw new \RuntimeException('Invalid size');
-        }
-
-        if ($adjustLength) {
-            $remaining_length -= $this->decrypt_block_size - 4;
-        }
-
-        $buffer = '';
-        while ($remaining_length > 0) {
-            $temp = stream_get_contents($this->fsock, $remaining_length);
-            if ($temp === false || feof($this->fsock)) {
-                $this->disconnect_helper(NET_SSH2_DISCONNECT_CONNECTION_LOST);
-                throw new \RuntimeException('Error reading from socket');
-            }
-            $buffer .= $temp;
-            $remaining_length -= strlen($temp);
-        }
-
-        return $buffer;
-    }
-
-    /**
-     * Filter Binary Packets
-     *
-     * Because some binary packets need to be ignored...
-     *
-     * @see self::_get_binary_packet()
-     * @param string $payload
-     * @param bool $skip_channel_filter
-     * @return string|bool
-     */
-    private function filter($payload, $skip_channel_filter)
-    {
-        switch (ord($payload[0])) {
-            case NET_SSH2_MSG_DISCONNECT:
-                Strings::shift($payload, 1);
-                list($reason_code, $message) = Strings::unpackSSH2('Ns', $payload);
-                $this->errors[] = 'SSH_MSG_DISCONNECT: ' . self::$disconnect_reasons[$reason_code] . "\r\n$message";
-                $this->bitmap = 0;
-                return false;
-            case NET_SSH2_MSG_IGNORE:
-                $this->extra_packets++;
-                $payload = $this->get_binary_packet($skip_channel_filter);
-                break;
-            case NET_SSH2_MSG_DEBUG:
-                $this->extra_packets++;
-                Strings::shift($payload, 2); // second byte is "always_display"
-                list($message) = Strings::unpackSSH2('s', $payload);
-                $this->errors[] = "SSH_MSG_DEBUG: $message";
-                $payload = $this->get_binary_packet($skip_channel_filter);
-                break;
-            case NET_SSH2_MSG_UNIMPLEMENTED:
-                return false;
-            case NET_SSH2_MSG_KEXINIT:
-                // this is here for key re-exchanges after the initial key exchange
-                if ($this->session_id !== false) {
-                    if (!$this->key_exchange($payload)) {
-                        $this->bitmap = 0;
-                        return false;
-                    }
-                    $payload = $this->get_binary_packet($skip_channel_filter);
-                }
-        }
-
-        // see http://tools.ietf.org/html/rfc4252#section-5.4; only called when the encryption has been activated and when we haven't already logged in
-        if (($this->bitmap & self::MASK_CONNECTED) && !$this->isAuthenticated() && !is_bool($payload) && ord($payload[0]) == NET_SSH2_MSG_USERAUTH_BANNER) {
-            Strings::shift($payload, 1);
-            list($this->banner_message) = Strings::unpackSSH2('s', $payload);
-            $payload = $this->get_binary_packet();
-        }
-
-        // only called when we've already logged in
-        if (($this->bitmap & self::MASK_CONNECTED) && $this->isAuthenticated()) {
-            if (is_bool($payload)) {
-                return $payload;
-            }
-
-            switch (ord($payload[0])) {
-                case NET_SSH2_MSG_CHANNEL_REQUEST:
-                    if (strlen($payload) == 31) {
-                        extract(unpack('cpacket_type/Nchannel/Nlength', $payload));
-                        if (substr($payload, 9, $length) == 'keepalive@openssh.com' && isset($this->server_channels[$channel])) {
-                            if (ord(substr($payload, 9 + $length))) { // want reply
-                                $this->send_binary_packet(pack('CN', NET_SSH2_MSG_CHANNEL_SUCCESS, $this->server_channels[$channel]));
-                            }
-                            $payload = $this->get_binary_packet($skip_channel_filter);
-                        }
-                    }
-                    break;
-                case NET_SSH2_MSG_CHANNEL_DATA:
-                case NET_SSH2_MSG_CHANNEL_EXTENDED_DATA:
-                case NET_SSH2_MSG_CHANNEL_CLOSE:
-                case NET_SSH2_MSG_CHANNEL_EOF:
-                    if (!$skip_channel_filter && !empty($this->server_channels)) {
-                        $this->binary_packet_buffer = $payload;
-                        $this->get_channel_packet(true);
-                        $payload = $this->get_binary_packet();
-                    }
-                    break;
-                case NET_SSH2_MSG_GLOBAL_REQUEST: // see http://tools.ietf.org/html/rfc4254#section-4
-                    Strings::shift($payload, 1);
-                    list($request_name) = Strings::unpackSSH2('s', $payload);
-                    $this->errors[] = "SSH_MSG_GLOBAL_REQUEST: $request_name";
-
-                    try {
-                        $this->send_binary_packet(pack('C', NET_SSH2_MSG_REQUEST_FAILURE));
-                    } catch (\RuntimeException $e) {
-                        return $this->disconnect_helper(NET_SSH2_DISCONNECT_BY_APPLICATION);
-                    }
-
-                    $payload = $this->get_binary_packet($skip_channel_filter);
-                    break;
-                case NET_SSH2_MSG_CHANNEL_OPEN: // see http://tools.ietf.org/html/rfc4254#section-5.1
-                    Strings::shift($payload, 1);
-                    list($data, $server_channel) = Strings::unpackSSH2('sN', $payload);
-                    switch ($data) {
-                        case 'auth-agent':
-                        case 'auth-agent@openssh.com':
-                            if (isset($this->agent)) {
-                                $new_channel = self::CHANNEL_AGENT_FORWARD;
-
-                                list(
-                                    $remote_window_size,
-                                    $remote_maximum_packet_size
-                                ) = Strings::unpackSSH2('NN', $payload);
-
-                                $this->packet_size_client_to_server[$new_channel] = $remote_window_size;
-                                $this->window_size_server_to_client[$new_channel] = $remote_maximum_packet_size;
-                                $this->window_size_client_to_server[$new_channel] = $this->window_size;
-
-                                $packet_size = 0x4000;
-
-                                $packet = pack(
-                                    'CN4',
-                                    NET_SSH2_MSG_CHANNEL_OPEN_CONFIRMATION,
-                                    $server_channel,
-                                    $new_channel,
-                                    $packet_size,
-                                    $packet_size
-                                );
-
-                                $this->server_channels[$new_channel] = $server_channel;
-                                $this->channel_status[$new_channel] = NET_SSH2_MSG_CHANNEL_OPEN_CONFIRMATION;
-                                $this->send_binary_packet($packet);
-                            }
-                            break;
-                        default:
-                            $packet = Strings::packSSH2(
-                                'CN2ss',
-                                NET_SSH2_MSG_CHANNEL_OPEN_FAILURE,
-                                $server_channel,
-                                NET_SSH2_OPEN_ADMINISTRATIVELY_PROHIBITED,
-                                '', // description
-                                '' // language tag
-                            );
-
-                            try {
-                                $this->send_binary_packet($packet);
-                            } catch (\RuntimeException $e) {
-                                return $this->disconnect_helper(NET_SSH2_DISCONNECT_BY_APPLICATION);
-                            }
-                    }
-
-                    $payload = $this->get_binary_packet($skip_channel_filter);
-                    break;
-                case NET_SSH2_MSG_CHANNEL_WINDOW_ADJUST:
-                    Strings::shift($payload, 1);
-                    list($channel, $window_size) = Strings::unpackSSH2('NN', $payload);
-
-                    $this->window_size_client_to_server[$channel] += $window_size;
-
-                    $payload = ($this->bitmap & self::MASK_WINDOW_ADJUST) ? true : $this->get_binary_packet($skip_channel_filter);
-            }
-        }
-
-        return $payload;
-    }
-
-    /**
-     * Enable Quiet Mode
-     *
-     * Suppress stderr from output
-     *
-     */
-    public function enableQuietMode()
-    {
-        $this->quiet_mode = true;
-    }
-
-    /**
-     * Disable Quiet Mode
-     *
-     * Show stderr in output
-     *
-     */
-    public function disableQuietMode()
-    {
-        $this->quiet_mode = false;
-    }
-
-    /**
-     * Returns whether Quiet Mode is enabled or not
-     *
-     * @see self::enableQuietMode()
-     * @see self::disableQuietMode()
-     * @return bool
-     */
-    public function isQuietModeEnabled()
-    {
-        return $this->quiet_mode;
-    }
-
-    /**
-     * Enable request-pty when using exec()
-     *
-     */
-    public function enablePTY()
-    {
-        $this->request_pty = true;
-    }
-
-    /**
-     * Disable request-pty when using exec()
-     *
-     */
-    public function disablePTY()
-    {
-        if ($this->isPTYOpen()) {
-            $this->close_channel(self::CHANNEL_EXEC);
-        }
-        $this->request_pty = false;
-    }
-
-    /**
-     * Returns whether request-pty is enabled or not
-     *
-     * @see self::enablePTY()
-     * @see self::disablePTY()
-     * @return bool
-     */
-    public function isPTYEnabled()
-    {
-        return $this->request_pty;
-    }
-
-    /**
-     * Gets channel data
-     *
-     * Returns the data as a string. bool(true) is returned if:
-     *
-     * - the server closes the channel
-     * - if the connection times out
-     * - if the channel status is CHANNEL_OPEN and the response was CHANNEL_OPEN_CONFIRMATION
-     * - if the channel status is CHANNEL_REQUEST and the response was CHANNEL_SUCCESS
-     * - if the channel status is CHANNEL_CLOSE and the response was CHANNEL_CLOSE
-     *
-     * bool(false) is returned if:
-     *
-     * - if the channel status is CHANNEL_REQUEST and the response was CHANNEL_FAILURE
-     *
-     * @param int $client_channel
-     * @param bool $skip_extended
-     * @return mixed
-     * @throws \RuntimeException on connection error
-     */
-    protected function get_channel_packet($client_channel, $skip_extended = false)
-    {
-        if (!empty($this->channel_buffers[$client_channel])) {
-            switch ($this->channel_status[$client_channel]) {
-                case NET_SSH2_MSG_CHANNEL_REQUEST:
-                    foreach ($this->channel_buffers[$client_channel] as $i => $packet) {
-                        switch (ord($packet[0])) {
-                            case NET_SSH2_MSG_CHANNEL_SUCCESS:
-                            case NET_SSH2_MSG_CHANNEL_FAILURE:
-                                unset($this->channel_buffers[$client_channel][$i]);
-                                return substr($packet, 1);
-                        }
-                    }
-                    break;
-                default:
-                    return substr(array_shift($this->channel_buffers[$client_channel]), 1);
-            }
-        }
-
-        while (true) {
-            if ($this->binary_packet_buffer !== false) {
-                $response = $this->binary_packet_buffer;
-                $this->binary_packet_buffer = false;
-            } else {
-                $response = $this->get_binary_packet(true);
-                if ($response === true && $this->is_timeout) {
-                    if ($client_channel == self::CHANNEL_EXEC && !$this->request_pty) {
-                        $this->close_channel($client_channel);
-                    }
-                    return true;
-                }
-                if ($response === false) {
-                    $this->disconnect_helper(NET_SSH2_DISCONNECT_CONNECTION_LOST);
-                    throw new ConnectionClosedException('Connection closed by server');
-                }
-            }
-
-            if ($client_channel == -1 && $response === true) {
-                return true;
-            }
-            list($type, $channel) = Strings::unpackSSH2('CN', $response);
-
-            // will not be setup yet on incoming channel open request
-            if (isset($channel) && isset($this->channel_status[$channel]) && isset($this->window_size_server_to_client[$channel])) {
-                $this->window_size_server_to_client[$channel] -= strlen($response);
-
-                // resize the window, if appropriate
-                if ($this->window_size_server_to_client[$channel] < 0) {
-                // PuTTY does something more analogous to the following:
-                //if ($this->window_size_server_to_client[$channel] < 0x3FFFFFFF) {
-                    $packet = pack('CNN', NET_SSH2_MSG_CHANNEL_WINDOW_ADJUST, $this->server_channels[$channel], $this->window_resize);
-                    $this->send_binary_packet($packet);
-                    $this->window_size_server_to_client[$channel] += $this->window_resize;
-                }
-
-                switch ($type) {
-                    case NET_SSH2_MSG_CHANNEL_EXTENDED_DATA:
-                        /*
-                        if ($client_channel == self::CHANNEL_EXEC) {
-                            $this->send_channel_packet($client_channel, chr(0));
-                        }
-                        */
-                        // currently, there's only one possible value for $data_type_code: NET_SSH2_EXTENDED_DATA_STDERR
-                        list($data_type_code, $data) = Strings::unpackSSH2('Ns', $response);
-                        $this->stdErrorLog .= $data;
-                        if ($skip_extended || $this->quiet_mode) {
-                            continue 2;
-                        }
-                        if ($client_channel == $channel && $this->channel_status[$channel] == NET_SSH2_MSG_CHANNEL_DATA) {
-                            return $data;
-                        }
-                        $this->channel_buffers[$channel][] = chr($type) . $data;
-
-                        continue 2;
-                    case NET_SSH2_MSG_CHANNEL_REQUEST:
-                        if ($this->channel_status[$channel] == NET_SSH2_MSG_CHANNEL_CLOSE) {
-                            continue 2;
-                        }
-                        list($value) = Strings::unpackSSH2('s', $response);
-                        switch ($value) {
-                            case 'exit-signal':
-                                list(
-                                    , // FALSE
-                                    $signal_name,
-                                    , // core dumped
-                                    $error_message
-                                ) = Strings::unpackSSH2('bsbs', $response);
-
-                                $this->errors[] = "SSH_MSG_CHANNEL_REQUEST (exit-signal): $signal_name";
-                                if (strlen($error_message)) {
-                                    $this->errors[count($this->errors) - 1] .= "\r\n$error_message";
-                                }
-
-                                $this->send_binary_packet(pack('CN', NET_SSH2_MSG_CHANNEL_EOF, $this->server_channels[$client_channel]));
-                                $this->send_binary_packet(pack('CN', NET_SSH2_MSG_CHANNEL_CLOSE, $this->server_channels[$channel]));
-
-                                $this->channel_status[$channel] = NET_SSH2_MSG_CHANNEL_EOF;
-
-                                continue 3;
-                            case 'exit-status':
-                                list(, $this->exit_status) = Strings::unpackSSH2('CN', $response);
-
-                                // "The client MAY ignore these messages."
-                                // -- http://tools.ietf.org/html/rfc4254#section-6.10
-
-                                continue 3;
-                            default:
-                                // "Some systems may not implement signals, in which case they SHOULD ignore this message."
-                                //  -- http://tools.ietf.org/html/rfc4254#section-6.9
-                                continue 3;
-                        }
-                }
-
-                switch ($this->channel_status[$channel]) {
-                    case NET_SSH2_MSG_CHANNEL_OPEN:
-                        switch ($type) {
-                            case NET_SSH2_MSG_CHANNEL_OPEN_CONFIRMATION:
-                                list(
-                                    $this->server_channels[$channel],
-                                    $window_size,
-                                    $this->packet_size_client_to_server[$channel]
-                                ) = Strings::unpackSSH2('NNN', $response);
-
-                                if ($window_size < 0) {
-                                    $window_size &= 0x7FFFFFFF;
-                                    $window_size += 0x80000000;
-                                }
-                                $this->window_size_client_to_server[$channel] = $window_size;
-                                $result = $client_channel == $channel ? true : $this->get_channel_packet($client_channel, $skip_extended);
-                                $this->on_channel_open();
-                                return $result;
-                            case NET_SSH2_MSG_CHANNEL_OPEN_FAILURE:
-                                $this->disconnect_helper(NET_SSH2_DISCONNECT_BY_APPLICATION);
-                                throw new \RuntimeException('Unable to open channel');
-                            default:
-                                if ($client_channel == $channel) {
-                                    $this->disconnect_helper(NET_SSH2_DISCONNECT_BY_APPLICATION);
-                                    throw new \RuntimeException('Unexpected response to open request');
-                                }
-                                return $this->get_channel_packet($client_channel, $skip_extended);
-                        }
-                        break;
-                    case NET_SSH2_MSG_CHANNEL_REQUEST:
-                        switch ($type) {
-                            case NET_SSH2_MSG_CHANNEL_SUCCESS:
-                                return true;
-                            case NET_SSH2_MSG_CHANNEL_FAILURE:
-                                return false;
-                            case NET_SSH2_MSG_CHANNEL_DATA:
-                                list($data) = Strings::unpackSSH2('s', $response);
-                                $this->channel_buffers[$channel][] = chr($type) . $data;
-                                return $this->get_channel_packet($client_channel, $skip_extended);
-                            default:
-                                $this->disconnect_helper(NET_SSH2_DISCONNECT_BY_APPLICATION);
-                                throw new \RuntimeException('Unable to fulfill channel request');
-                        }
-                    case NET_SSH2_MSG_CHANNEL_CLOSE:
-                        if ($client_channel == $channel && $type == NET_SSH2_MSG_CHANNEL_CLOSE) {
-                            return true;
-                        }
-                        return $this->get_channel_packet($client_channel, $skip_extended);
-                }
-            }
-
-            // ie. $this->channel_status[$channel] == NET_SSH2_MSG_CHANNEL_DATA
-
-            switch ($type) {
-                case NET_SSH2_MSG_CHANNEL_DATA:
-                    /*
-                    if ($channel == self::CHANNEL_EXEC) {
-                        // SCP requires null packets, such as this, be sent.  further, in the case of the ssh.com SSH server
-                        // this actually seems to make things twice as fast.  more to the point, the message right after
-                        // SSH_MSG_CHANNEL_DATA (usually SSH_MSG_IGNORE) won't block for as long as it would have otherwise.
-                        // in OpenSSH it slows things down but only by a couple thousandths of a second.
-                        $this->send_channel_packet($channel, chr(0));
-                    }
-                    */
-                    list($data) = Strings::unpackSSH2('s', $response);
-
-                    if ($channel == self::CHANNEL_AGENT_FORWARD) {
-                        $agent_response = $this->agent->forwardData($data);
-                        if (!is_bool($agent_response)) {
-                            $this->send_channel_packet($channel, $agent_response);
-                        }
-                        break;
-                    }
-
-                    if ($client_channel == $channel) {
-                        return $data;
-                    }
-                    $this->channel_buffers[$channel][] = chr($type) . $data;
-                    break;
-                case NET_SSH2_MSG_CHANNEL_CLOSE:
-                    $this->curTimeout = 5;
-
-                    $this->close_channel_bitmap($channel);
-
-                    if ($this->channel_status[$channel] != NET_SSH2_MSG_CHANNEL_EOF) {
-                        $this->send_binary_packet(pack('CN', NET_SSH2_MSG_CHANNEL_CLOSE, $this->server_channels[$channel]));
-                    }
-
-                    $this->channel_status[$channel] = NET_SSH2_MSG_CHANNEL_CLOSE;
-                    $this->channelCount--;
-
-                    if ($client_channel == $channel) {
-                        return true;
-                    }
-                    // fall-through
-                case NET_SSH2_MSG_CHANNEL_EOF:
-                    break;
-                default:
-                    $this->disconnect_helper(NET_SSH2_DISCONNECT_BY_APPLICATION);
-                    throw new \RuntimeException("Error reading channel data ($type)");
-            }
-        }
-    }
-
-    /**
-     * Sends Binary Packets
-     *
-     * See '6. Binary Packet Protocol' of rfc4253 for more info.
-     *
-     * @param string $data
-     * @param string $logged
-     * @see self::_get_binary_packet()
-     * @return void
-     */
-    protected function send_binary_packet($data, $logged = null)
-    {
-        if (!is_resource($this->fsock) || feof($this->fsock)) {
-            $this->bitmap = 0;
-            throw new ConnectionClosedException('Connection closed prematurely');
-        }
-
-        if (!isset($logged)) {
-            $logged = $data;
-        }
-
-        switch ($this->compress) {
-            case self::NET_SSH2_COMPRESSION_ZLIB_AT_OPENSSH:
-                if (!$this->isAuthenticated()) {
-                    break;
-                }
-                // fall-through
-            case self::NET_SSH2_COMPRESSION_ZLIB:
-                if (!$this->regenerate_compression_context) {
-                    $header = '';
-                } else {
-                    $this->regenerate_compression_context = false;
-                    $this->compress_context = deflate_init(ZLIB_ENCODING_RAW, ['window' => 15]);
-                    $header = "\x78\x9C";
-                }
-                if ($this->compress_context) {
-                    $data = $header . deflate_add($this->compress_context, $data, ZLIB_PARTIAL_FLUSH);
-                }
-        }
-
-        // 4 (packet length) + 1 (padding length) + 4 (minimal padding amount) == 9
-        $packet_length = strlen($data) + 9;
-        if ($this->encrypt && $this->encrypt->usesNonce()) {
-            $packet_length -= 4;
-        }
-        // round up to the nearest $this->encrypt_block_size
-        $packet_length += (($this->encrypt_block_size - 1) * $packet_length) % $this->encrypt_block_size;
-        // subtracting strlen($data) is obvious - subtracting 5 is necessary because of packet_length and padding_length
-        $padding_length = $packet_length - strlen($data) - 5;
-        switch (true) {
-            case $this->encrypt && $this->encrypt->usesNonce():
-            case $this->hmac_create instanceof Hash && $this->hmac_create_etm:
-                $padding_length += 4;
-                $packet_length += 4;
-        }
-
-        $padding = Random::string($padding_length);
-
-        // we subtract 4 from packet_length because the packet_length field isn't supposed to include itself
-        $packet = pack('NCa*', $packet_length - 4, $padding_length, $data . $padding);
-
-        $hmac = '';
-        if ($this->hmac_create instanceof Hash && !$this->hmac_create_etm) {
-            if (($this->hmac_create->getHash() & "\xFF\xFF\xFF\xFF") == 'umac') {
-                $this->hmac_create->setNonce("\0\0\0\0" . pack('N', $this->send_seq_no));
-                $hmac = $this->hmac_create->hash($packet);
-            } else {
-                $hmac = $this->hmac_create->hash(pack('Na*', $this->send_seq_no, $packet));
-            }
-        }
-
-        if ($this->encrypt) {
-            switch ($this->encryptName) {
-                case 'aes128-gcm@openssh.com':
-                case 'aes256-gcm@openssh.com':
-                    $this->encrypt->setNonce(
-                        $this->encryptFixedPart .
-                        $this->encryptInvocationCounter
-                    );
-                    Strings::increment_str($this->encryptInvocationCounter);
-                    $this->encrypt->setAAD($temp = ($packet & "\xFF\xFF\xFF\xFF"));
-                    $packet = $temp . $this->encrypt->encrypt(substr($packet, 4));
-                    break;
-                case 'chacha20-poly1305@openssh.com':
-                    // This should be impossible, but we are checking anyway to narrow the type for Psalm.
-                    if (!($this->encrypt instanceof ChaCha20)) {
-                        throw new \LogicException('$this->encrypt is not a ' . ChaCha20::class);
-                    }
-
-                    $nonce = pack('N2', 0, $this->send_seq_no);
-
-                    $this->encrypt->setNonce($nonce);
-                    $this->lengthEncrypt->setNonce($nonce);
-
-                    $length = $this->lengthEncrypt->encrypt($packet & "\xFF\xFF\xFF\xFF");
-
-                    $this->encrypt->setCounter(0);
-                    // this is the same approach that's implemented in Salsa20::createPoly1305Key()
-                    // but we don't want to use the same AEAD construction that RFC8439 describes
-                    // for ChaCha20-Poly1305 so we won't rely on it (see Salsa20::poly1305())
-                    $this->encrypt->setPoly1305Key(
-                        $this->encrypt->encrypt(str_repeat("\0", 32))
-                    );
-                    $this->encrypt->setAAD($length);
-                    $this->encrypt->setCounter(1);
-                    $packet = $length . $this->encrypt->encrypt(substr($packet, 4));
-                    break;
-                default:
-                    $packet = $this->hmac_create instanceof Hash && $this->hmac_create_etm ?
-                        ($packet & "\xFF\xFF\xFF\xFF") . $this->encrypt->encrypt(substr($packet, 4)) :
-                        $this->encrypt->encrypt($packet);
-            }
-        }
-
-        if ($this->hmac_create instanceof Hash && $this->hmac_create_etm) {
-            if (($this->hmac_create->getHash() & "\xFF\xFF\xFF\xFF") == 'umac') {
-                $this->hmac_create->setNonce("\0\0\0\0" . pack('N', $this->send_seq_no));
-                $hmac = $this->hmac_create->hash($packet);
-            } else {
-                $hmac = $this->hmac_create->hash(pack('Na*', $this->send_seq_no, $packet));
-            }
-        }
-
-        $this->send_seq_no++;
-
-        $packet .= $this->encrypt && $this->encrypt->usesNonce() ? $this->encrypt->getTag() : $hmac;
-
-        $start = microtime(true);
-        $sent = @fputs($this->fsock, $packet);
-        $stop = microtime(true);
-
-        if (defined('NET_SSH2_LOGGING')) {
-            $current = microtime(true);
-            $message_number = isset(self::$message_numbers[ord($logged[0])]) ? self::$message_numbers[ord($logged[0])] : 'UNKNOWN (' . ord($logged[0]) . ')';
-            $message_number = '-> ' . $message_number .
-                              ' (since last: ' . round($current - $this->last_packet, 4) . ', network: ' . round($stop - $start, 4) . 's)';
-            $this->append_log($message_number, $logged);
-            $this->last_packet = $current;
-        }
-
-        if (strlen($packet) != $sent) {
-            $this->bitmap = 0;
-            $message = $sent === false ?
-                'Unable to write ' . strlen($packet) . ' bytes' :
-                "Only $sent of " . strlen($packet) . " bytes were sent";
-            throw new \RuntimeException($message);
-        }
-    }
-
-    /**
-     * Logs data packets
-     *
-     * Makes sure that only the last 1MB worth of packets will be logged
-     *
-     * @param string $message_number
-     * @param string $message
-     */
-    private function append_log($message_number, $message)
-    {
-        $this->append_log_helper(
-            NET_SSH2_LOGGING,
-            $message_number,
-            $message,
-            $this->message_number_log,
-            $this->message_log,
-            $this->log_size,
-            $this->realtime_log_file,
-            $this->realtime_log_wrap,
-            $this->realtime_log_size
-        );
-    }
-
-    /**
-     * Logs data packet helper
-     *
-     * @param int $constant
-     * @param string $message_number
-     * @param string $message
-     * @param array &$message_number_log
-     * @param array &$message_log
-     * @param int &$log_size
-     * @param resource &$realtime_log_file
-     * @param bool &$realtime_log_wrap
-     * @param int &$realtime_log_size
-     */
-    protected function append_log_helper($constant, $message_number, $message, array &$message_number_log, array &$message_log, &$log_size, &$realtime_log_file, &$realtime_log_wrap, &$realtime_log_size)
-    {
-        // remove the byte identifying the message type from all but the first two messages (ie. the identification strings)
-        if (strlen($message_number) > 2) {
-            Strings::shift($message);
-        }
-
-        switch ($constant) {
-            // useful for benchmarks
-            case self::LOG_SIMPLE:
-                $message_number_log[] = $message_number;
-                break;
-            case self::LOG_SIMPLE_REALTIME:
-                echo $message_number;
-                echo PHP_SAPI == 'cli' ? "\r\n" : '<br>';
-                @flush();
-                @ob_flush();
-                break;
-            // the most useful log for SSH2
-            case self::LOG_COMPLEX:
-                $message_number_log[] = $message_number;
-                $log_size += strlen($message);
-                $message_log[] = $message;
-                while ($log_size > self::LOG_MAX_SIZE) {
-                    $log_size -= strlen(array_shift($message_log));
-                    array_shift($message_number_log);
-                }
-                break;
-            // dump the output out realtime; packets may be interspersed with non packets,
-            // passwords won't be filtered out and select other packets may not be correctly
-            // identified
-            case self::LOG_REALTIME:
-                switch (PHP_SAPI) {
-                    case 'cli':
-                        $start = $stop = "\r\n";
-                        break;
-                    default:
-                        $start = '<pre>';
-                        $stop = '</pre>';
-                }
-                echo $start . $this->format_log([$message], [$message_number]) . $stop;
-                @flush();
-                @ob_flush();
-                break;
-            // basically the same thing as self::LOG_REALTIME with the caveat that NET_SSH2_LOG_REALTIME_FILENAME
-            // needs to be defined and that the resultant log file will be capped out at self::LOG_MAX_SIZE.
-            // the earliest part of the log file is denoted by the first <<< START >>> and is not going to necessarily
-            // at the beginning of the file
-            case self::LOG_REALTIME_FILE:
-                if (!isset($realtime_log_file)) {
-                    // PHP doesn't seem to like using constants in fopen()
-                    $filename = NET_SSH2_LOG_REALTIME_FILENAME;
-                    $fp = fopen($filename, 'w');
-                    $realtime_log_file = $fp;
-                }
-                if (!is_resource($realtime_log_file)) {
-                    break;
-                }
-                $entry = $this->format_log([$message], [$message_number]);
-                if ($realtime_log_wrap) {
-                    $temp = "<<< START >>>\r\n";
-                    $entry .= $temp;
-                    fseek($realtime_log_file, ftell($realtime_log_file) - strlen($temp));
-                }
-                $realtime_log_size += strlen($entry);
-                if ($realtime_log_size > self::LOG_MAX_SIZE) {
-                    fseek($realtime_log_file, 0);
-                    $realtime_log_size = strlen($entry);
-                    $realtime_log_wrap = true;
-                }
-                fputs($realtime_log_file, $entry);
-        }
-    }
-
-    /**
-     * Sends channel data
-     *
-     * Spans multiple SSH_MSG_CHANNEL_DATAs if appropriate
-     *
-     * @param int $client_channel
-     * @param string $data
-     * @return void
-     */
-    protected function send_channel_packet($client_channel, $data)
-    {
-        while (strlen($data)) {
-            if (!$this->window_size_client_to_server[$client_channel]) {
-                $this->bitmap ^= self::MASK_WINDOW_ADJUST;
-                // using an invalid channel will let the buffers be built up for the valid channels
-                $this->get_channel_packet(-1);
-                $this->bitmap ^= self::MASK_WINDOW_ADJUST;
-            }
-
-            /* The maximum amount of data allowed is determined by the maximum
-               packet size for the channel, and the current window size, whichever
-               is smaller.
-                 -- http://tools.ietf.org/html/rfc4254#section-5.2 */
-            $max_size = min(
-                $this->packet_size_client_to_server[$client_channel],
-                $this->window_size_client_to_server[$client_channel]
-            );
-
-            $temp = Strings::shift($data, $max_size);
-            $packet = Strings::packSSH2(
-                'CNs',
-                NET_SSH2_MSG_CHANNEL_DATA,
-                $this->server_channels[$client_channel],
-                $temp
-            );
-            $this->window_size_client_to_server[$client_channel] -= strlen($temp);
-            $this->send_binary_packet($packet);
-        }
-    }
-
-    /**
-     * Closes and flushes a channel
-     *
-     * \phpseclib3\Net\SSH2 doesn't properly close most channels.  For exec() channels are normally closed by the server
-     * and for SFTP channels are presumably closed when the client disconnects.  This functions is intended
-     * for SCP more than anything.
-     *
-     * @param int $client_channel
-     * @param bool $want_reply
-     * @return void
-     */
-    private function close_channel($client_channel, $want_reply = false)
-    {
-        // see http://tools.ietf.org/html/rfc4254#section-5.3
-
-        $this->send_binary_packet(pack('CN', NET_SSH2_MSG_CHANNEL_EOF, $this->server_channels[$client_channel]));
-
-        if (!$want_reply) {
-            $this->send_binary_packet(pack('CN', NET_SSH2_MSG_CHANNEL_CLOSE, $this->server_channels[$client_channel]));
-        }
-
-        $this->channel_status[$client_channel] = NET_SSH2_MSG_CHANNEL_CLOSE;
-        $this->channelCount--;
-
-        $this->curTimeout = 5;
-
-        while (!is_bool($this->get_channel_packet($client_channel))) {
-        }
-
-        if ($want_reply) {
-            $this->send_binary_packet(pack('CN', NET_SSH2_MSG_CHANNEL_CLOSE, $this->server_channels[$client_channel]));
-        }
-
-        $this->close_channel_bitmap($client_channel);
-    }
-
-    /**
-     * Maintains execution state bitmap in response to channel closure
-     *
-     * @param int $client_channel The channel number to maintain closure status of
-     * @return void
-     */
-    private function close_channel_bitmap($client_channel)
-    {
-        switch ($client_channel) {
-            case self::CHANNEL_SHELL:
-                // Shell status has been maintained in the bitmap for backwards
-                //  compatibility sake, but can be removed going forward
-                if ($this->bitmap & self::MASK_SHELL) {
-                    $this->bitmap &= ~self::MASK_SHELL;
-                }
-                break;
-        }
-    }
-
-    /**
-     * Disconnect
-     *
-     * @param int $reason
-     * @return false
-     */
-    protected function disconnect_helper($reason)
-    {
-        if ($this->bitmap & self::MASK_CONNECTED) {
-            $data = Strings::packSSH2('CNss', NET_SSH2_MSG_DISCONNECT, $reason, '', '');
-            try {
-                $this->send_binary_packet($data);
-            } catch (\Exception $e) {
-            }
-        }
-
-        $this->bitmap = 0;
-        if (is_resource($this->fsock) && get_resource_type($this->fsock) === 'stream') {
-            fclose($this->fsock);
-        }
-
-        return false;
-    }
-
-    /**
-     * Define Array
-     *
-     * Takes any number of arrays whose indices are integers and whose values are strings and defines a bunch of
-     * named constants from it, using the value as the name of the constant and the index as the value of the constant.
-     * If any of the constants that would be defined already exists, none of the constants will be defined.
-     *
-     * @param mixed[] ...$args
-     * @access protected
-     */
-    protected static function define_array(...$args)
-    {
-        foreach ($args as $arg) {
-            foreach ($arg as $key => $value) {
-                if (!defined($value)) {
-                    define($value, $key);
-                } else {
-                    break 2;
-                }
-            }
-        }
-    }
-
-    /**
-     * Returns a log of the packets that have been sent and received.
-     *
-     * Returns a string if NET_SSH2_LOGGING == self::LOG_COMPLEX, an array if NET_SSH2_LOGGING == self::LOG_SIMPLE and false if !defined('NET_SSH2_LOGGING')
-     *
-     * @return array|false|string
-     */
-    public function getLog()
-    {
-        if (!defined('NET_SSH2_LOGGING')) {
-            return false;
-        }
-
-        switch (NET_SSH2_LOGGING) {
-            case self::LOG_SIMPLE:
-                return $this->message_number_log;
-            case self::LOG_COMPLEX:
-                $log = $this->format_log($this->message_log, $this->message_number_log);
-                return PHP_SAPI == 'cli' ? $log : '<pre>' . $log . '</pre>';
-            default:
-                return false;
-        }
-    }
-
-    /**
-     * Formats a log for printing
-     *
-     * @param array $message_log
-     * @param array $message_number_log
-     * @return string
-     */
-    protected function format_log(array $message_log, array $message_number_log)
-    {
-        $output = '';
-        for ($i = 0; $i < count($message_log); $i++) {
-            $output .= $message_number_log[$i] . "\r\n";
-            $current_log = $message_log[$i];
-            $j = 0;
-            do {
-                if (strlen($current_log)) {
-                    $output .= str_pad(dechex($j), 7, '0', STR_PAD_LEFT) . '0  ';
-                }
-                $fragment = Strings::shift($current_log, $this->log_short_width);
-                $hex = substr(preg_replace_callback('#.#s', function ($matches) {
-                    return $this->log_boundary . str_pad(dechex(ord($matches[0])), 2, '0', STR_PAD_LEFT);
-                }, $fragment), strlen($this->log_boundary));
-                // replace non ASCII printable characters with dots
-                // http://en.wikipedia.org/wiki/ASCII#ASCII_printable_characters
-                // also replace < with a . since < messes up the output on web browsers
-                $raw = preg_replace('#[^\x20-\x7E]|<#', '.', $fragment);
-                $output .= str_pad($hex, $this->log_long_width - $this->log_short_width, ' ') . $raw . "\r\n";
-                $j++;
-            } while (strlen($current_log));
-            $output .= "\r\n";
-        }
-
-        return $output;
-    }
-
-    /**
-     * Helper function for agent->on_channel_open()
-     *
-     * Used when channels are created to inform agent
-     * of said channel opening. Must be called after
-     * channel open confirmation received
-     *
-     */
-    private function on_channel_open()
-    {
-        if (isset($this->agent)) {
-            $this->agent->registerChannelOpen($this);
-        }
-    }
-
-    /**
-     * Returns the first value of the intersection of two arrays or false if
-     * the intersection is empty. The order is defined by the first parameter.
-     *
-     * @param array $array1
-     * @param array $array2
-     * @return mixed False if intersection is empty, else intersected value.
-     */
-    private static function array_intersect_first(array $array1, array $array2)
-    {
-        foreach ($array1 as $value) {
-            if (in_array($value, $array2)) {
-                return $value;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Returns all errors / debug messages on the SSH layer
-     *
-     * If you are looking for messages from the SFTP layer, please see SFTP::getSFTPErrors()
-     *
-     * @return string[]
-     */
-    public function getErrors()
-    {
-        return $this->errors;
-    }
-
-    /**
-     * Returns the last error received on the SSH layer
-     *
-     * If you are looking for messages from the SFTP layer, please see SFTP::getLastSFTPError()
-     *
-     * @return string
-     */
-    public function getLastError()
-    {
-        $count = count($this->errors);
-
-        if ($count > 0) {
-            return $this->errors[$count - 1];
-        }
-    }
-
-    /**
-     * Return the server identification.
-     *
-     * @return string|false
-     */
-    public function getServerIdentification()
-    {
-        $this->connect();
-
-        return $this->server_identifier;
-    }
-
-    /**
-     * Returns a list of algorithms the server supports
-     *
-     * @return array
-     */
-    public function getServerAlgorithms()
-    {
-        $this->connect();
-
-        return [
-            'kex' => $this->kex_algorithms,
-            'hostkey' => $this->server_host_key_algorithms,
-            'client_to_server' => [
-                'crypt' => $this->encryption_algorithms_client_to_server,
-                'mac' => $this->mac_algorithms_client_to_server,
-                'comp' => $this->compression_algorithms_client_to_server,
-                'lang' => $this->languages_client_to_server
-            ],
-            'server_to_client' => [
-                'crypt' => $this->encryption_algorithms_server_to_client,
-                'mac' => $this->mac_algorithms_server_to_client,
-                'comp' => $this->compression_algorithms_server_to_client,
-                'lang' => $this->languages_server_to_client
-            ]
-        ];
-    }
-
-    /**
-     * Returns a list of KEX algorithms that phpseclib supports
-     *
-     * @return array
-     */
-    public static function getSupportedKEXAlgorithms()
-    {
-        $kex_algorithms = [
+        $kex_algorithms = array(
             // Elliptic Curve Diffie-Hellman Key Agreement (ECDH) using
             // Curve25519. See doc/curve25519-sha256@libssh.org.txt in the
             // libssh repository for more information.
-            'curve25519-sha256',
             'curve25519-sha256@libssh.org',
 
-            'ecdh-sha2-nistp256', // RFC 5656
-            'ecdh-sha2-nistp384', // RFC 5656
-            'ecdh-sha2-nistp521', // RFC 5656
-
-            'diffie-hellman-group-exchange-sha256',// RFC 4419
-            'diffie-hellman-group-exchange-sha1',  // RFC 4419
-
             // Diffie-Hellman Key Agreement (DH) using integer modulo prime
             // groups.
-            'diffie-hellman-group14-sha256',
-            'diffie-hellman-group14-sha1', // REQUIRED
-            'diffie-hellman-group15-sha512',
-            'diffie-hellman-group16-sha512',
-            'diffie-hellman-group17-sha512',
-            'diffie-hellman-group18-sha512',
-
             'diffie-hellman-group1-sha1', // REQUIRED
-        ];
+            'diffie-hellman-group14-sha1', // REQUIRED
+            'diffie-hellman-group-exchange-sha1', // RFC 4419
+            'diffie-hellman-group-exchange-sha256', // RFC 4419
+        );
+        if (!function_exists('\\Sodium\\library_version_major')) {
+            $kex_algorithms = array_diff(
+                $kex_algorithms,
+                array('curve25519-sha256@libssh.org')
+            );
+        }
 
-        return $kex_algorithms;
-    }
-
-    /**
-     * Returns a list of host key algorithms that phpseclib supports
-     *
-     * @return array
-     */
-    public static function getSupportedHostKeyAlgorithms()
-    {
-        return [
-            'ssh-ed25519', // https://tools.ietf.org/html/draft-ietf-curdle-ssh-ed25519-02
-            'ecdsa-sha2-nistp256', // RFC 5656
-            'ecdsa-sha2-nistp384', // RFC 5656
-            'ecdsa-sha2-nistp521', // RFC 5656
-            'rsa-sha2-256', // RFC 8332
-            'rsa-sha2-512', // RFC 8332
+        $server_host_key_algorithms = array(
             'ssh-rsa', // RECOMMENDED  sign   Raw RSA Key
             'ssh-dss'  // REQUIRED     sign   Raw DSS Key
-        ];
-    }
-
-    /**
-     * Returns a list of symmetric key algorithms that phpseclib supports
-     *
-     * @return array
-     */
-    public static function getSupportedEncryptionAlgorithms()
-    {
-        $algos = [
-            // from <https://tools.ietf.org/html/rfc5647>:
-            'aes128-gcm@openssh.com',
-            'aes256-gcm@openssh.com',
+        );
 
+        $encryption_algorithms = array(
             // from <http://tools.ietf.org/html/rfc4345#section-4>:
             'arcfour256',
             'arcfour128',
@@ -4903,16 +1202,6 @@ class SSH2
             'aes192-ctr',     // RECOMMENDED       AES with 192-bit key
             'aes256-ctr',     // RECOMMENDED       AES with 256-bit key
 
-            // from <https://github.com/openssh/openssh-portable/blob/001aa55/PROTOCOL.chacha20poly1305>:
-            // one of the big benefits of chacha20-poly1305 is speed. the problem is...
-            // libsodium doesn't generate the poly1305 keys in the way ssh does and openssl's PHP bindings don't even
-            // seem to support poly1305 currently. so even if libsodium or openssl are being used for the chacha20
-            // part, pure-PHP has to be used for the poly1305 part and that's gonna cause a big slow down.
-            // speed-wise it winds up being faster to use AES (when openssl or mcrypt are available) and some HMAC
-            // (which is always gonna be super fast to compute thanks to the hash extension, which
-            // "is bundled and compiled into PHP by default")
-            'chacha20-poly1305@openssh.com',
-
             'twofish128-ctr', // OPTIONAL          Twofish in SDCTR mode, with 128-bit key
             'twofish192-ctr', // OPTIONAL          Twofish with 192-bit key
             'twofish256-ctr', // OPTIONAL          Twofish with 256-bit key
@@ -4934,234 +1223,2738 @@ class SSH2
             '3des-ctr',       // RECOMMENDED       Three-key 3DES in SDCTR mode
 
             '3des-cbc',       // REQUIRED          three-key 3DES in CBC mode
+                //'none'         // OPTIONAL          no encryption; NOT RECOMMENDED
+        );
 
-             //'none'           // OPTIONAL          no encryption; NOT RECOMMENDED
-        ];
-
-        if (self::$crypto_engine) {
-            $engines = [self::$crypto_engine];
-        } else {
-            $engines = [
-                'libsodium',
-                'OpenSSL (GCM)',
-                'OpenSSL',
-                'mcrypt',
-                'Eval',
-                'PHP'
-            ];
+        if (extension_loaded('openssl') && !extension_loaded('mcrypt')) {
+            // OpenSSL does not support arcfour256 in any capacity and arcfour128 / arcfour support is limited to
+            // instances that do not use continuous buffers
+            $encryption_algorithms = array_diff(
+                $encryption_algorithms,
+                array('arcfour256', 'arcfour128', 'arcfour')
+            );
         }
 
-        $ciphers = [];
-
-        foreach ($engines as $engine) {
-            foreach ($algos as $algo) {
-                $obj = self::encryption_algorithm_to_crypt_instance($algo);
-                if ($obj instanceof Rijndael) {
-                    $obj->setKeyLength(preg_replace('#[^\d]#', '', $algo));
-                }
-                switch ($algo) {
-                    case 'chacha20-poly1305@openssh.com':
-                    case 'arcfour128':
-                    case 'arcfour256':
-                        if ($engine != 'Eval') {
-                            continue 2;
-                        }
-                        break;
-                    case 'aes128-gcm@openssh.com':
-                    case 'aes256-gcm@openssh.com':
-                        if ($engine == 'OpenSSL') {
-                            continue 2;
-                        }
-                        $obj->setNonce('dummydummydu');
-                }
-                if ($obj->isValidEngine($engine)) {
-                    $algos = array_diff($algos, [$algo]);
-                    $ciphers[] = $algo;
-                }
-            }
+        if (class_exists('\phpseclib\Crypt\RC4') === false) {
+            $encryption_algorithms = array_diff(
+                $encryption_algorithms,
+                array('arcfour256', 'arcfour128', 'arcfour')
+            );
         }
+        if (class_exists('\phpseclib\Crypt\Rijndael') === false) {
+            $encryption_algorithms = array_diff(
+                $encryption_algorithms,
+                array('aes128-ctr', 'aes192-ctr', 'aes256-ctr', 'aes128-cbc', 'aes192-cbc', 'aes256-cbc')
+            );
+        }
+        if (class_exists('\phpseclib\Crypt\Twofish') === false) {
+            $encryption_algorithms = array_diff(
+                $encryption_algorithms,
+                array('twofish128-ctr', 'twofish192-ctr', 'twofish256-ctr', 'twofish128-cbc', 'twofish192-cbc', 'twofish256-cbc', 'twofish-cbc')
+            );
+        }
+        if (class_exists('\phpseclib\Crypt\Blowfish') === false) {
+            $encryption_algorithms = array_diff(
+                $encryption_algorithms,
+                array('blowfish-ctr', 'blowfish-cbc')
+            );
+        }
+        if (class_exists('\phpseclib\Crypt\TripleDES') === false) {
+            $encryption_algorithms = array_diff(
+                $encryption_algorithms,
+                array('3des-ctr', '3des-cbc')
+            );
+        }
+        $encryption_algorithms = array_values($encryption_algorithms);
 
-        return $ciphers;
-    }
-
-    /**
-     * Returns a list of MAC algorithms that phpseclib supports
-     *
-     * @return array
-     */
-    public static function getSupportedMACAlgorithms()
-    {
-        return [
-            'hmac-sha2-256-etm@openssh.com',
-            'hmac-sha2-512-etm@openssh.com',
-            'umac-64-etm@openssh.com',
-            'umac-128-etm@openssh.com',
-            'hmac-sha1-etm@openssh.com',
-
+        $mac_algorithms = array(
             // from <http://www.ietf.org/rfc/rfc6668.txt>:
             'hmac-sha2-256',// RECOMMENDED     HMAC-SHA256 (digest length = key length = 32)
-            'hmac-sha2-512',// OPTIONAL        HMAC-SHA512 (digest length = key length = 64)
-
-            // from <https://tools.ietf.org/html/draft-miller-secsh-umac-01>:
-            'umac-64@openssh.com',
-            'umac-128@openssh.com',
 
             'hmac-sha1-96', // RECOMMENDED     first 96 bits of HMAC-SHA1 (digest length = 12, key length = 20)
             'hmac-sha1',    // REQUIRED        HMAC-SHA1 (digest length = key length = 20)
             'hmac-md5-96',  // OPTIONAL        first 96 bits of HMAC-MD5 (digest length = 12, key length = 16)
             'hmac-md5',     // OPTIONAL        HMAC-MD5 (digest length = key length = 16)
             //'none'          // OPTIONAL        no MAC; NOT RECOMMENDED
-        ];
-    }
+        );
 
-    /**
-     * Returns a list of compression algorithms that phpseclib supports
-     *
-     * @return array
-     */
-    public static function getSupportedCompressionAlgorithms()
-    {
-        $algos = ['none']; // REQUIRED        no compression
-        if (function_exists('deflate_init')) {
-            $algos[] = 'zlib@openssh.com'; // https://datatracker.ietf.org/doc/html/draft-miller-secsh-compression-delayed
-            $algos[] = 'zlib';
+        $compression_algorithms = array(
+            'none'   // REQUIRED        no compression
+            //'zlib' // OPTIONAL        ZLIB (LZ77) compression
+        );
+
+        // some SSH servers have buggy implementations of some of the above algorithms
+        switch ($this->server_identifier) {
+            case 'SSH-2.0-SSHD':
+                $mac_algorithms = array_values(array_diff(
+                    $mac_algorithms,
+                    array('hmac-sha1-96', 'hmac-md5-96')
+                ));
         }
-        return $algos;
+
+        $str_kex_algorithms = implode(',', $kex_algorithms);
+        $str_server_host_key_algorithms = implode(',', $server_host_key_algorithms);
+        $encryption_algorithms_server_to_client = $encryption_algorithms_client_to_server = implode(',', $encryption_algorithms);
+        $mac_algorithms_server_to_client = $mac_algorithms_client_to_server = implode(',', $mac_algorithms);
+        $compression_algorithms_server_to_client = $compression_algorithms_client_to_server = implode(',', $compression_algorithms);
+
+        $client_cookie = Random::string(16);
+
+        $response = $kexinit_payload_server;
+        $this->_string_shift($response, 1); // skip past the message number (it should be SSH_MSG_KEXINIT)
+        $server_cookie = $this->_string_shift($response, 16);
+
+        $temp = unpack('Nlength', $this->_string_shift($response, 4));
+        $this->kex_algorithms = explode(',', $this->_string_shift($response, $temp['length']));
+
+        $temp = unpack('Nlength', $this->_string_shift($response, 4));
+        $this->server_host_key_algorithms = explode(',', $this->_string_shift($response, $temp['length']));
+
+        $temp = unpack('Nlength', $this->_string_shift($response, 4));
+        $this->encryption_algorithms_client_to_server = explode(',', $this->_string_shift($response, $temp['length']));
+
+        $temp = unpack('Nlength', $this->_string_shift($response, 4));
+        $this->encryption_algorithms_server_to_client = explode(',', $this->_string_shift($response, $temp['length']));
+
+        $temp = unpack('Nlength', $this->_string_shift($response, 4));
+        $this->mac_algorithms_client_to_server = explode(',', $this->_string_shift($response, $temp['length']));
+
+        $temp = unpack('Nlength', $this->_string_shift($response, 4));
+        $this->mac_algorithms_server_to_client = explode(',', $this->_string_shift($response, $temp['length']));
+
+        $temp = unpack('Nlength', $this->_string_shift($response, 4));
+        $this->compression_algorithms_client_to_server = explode(',', $this->_string_shift($response, $temp['length']));
+
+        $temp = unpack('Nlength', $this->_string_shift($response, 4));
+        $this->compression_algorithms_server_to_client = explode(',', $this->_string_shift($response, $temp['length']));
+
+        $temp = unpack('Nlength', $this->_string_shift($response, 4));
+        $this->languages_client_to_server = explode(',', $this->_string_shift($response, $temp['length']));
+
+        $temp = unpack('Nlength', $this->_string_shift($response, 4));
+        $this->languages_server_to_client = explode(',', $this->_string_shift($response, $temp['length']));
+
+        extract(unpack('Cfirst_kex_packet_follows', $this->_string_shift($response, 1)));
+        $first_kex_packet_follows = $first_kex_packet_follows != 0;
+
+        // the sending of SSH2_MSG_KEXINIT could go in one of two places.  this is the second place.
+        $kexinit_payload_client = pack(
+            'Ca*Na*Na*Na*Na*Na*Na*Na*Na*Na*Na*CN',
+            NET_SSH2_MSG_KEXINIT,
+            $client_cookie,
+            strlen($str_kex_algorithms),
+            $str_kex_algorithms,
+            strlen($str_server_host_key_algorithms),
+            $str_server_host_key_algorithms,
+            strlen($encryption_algorithms_client_to_server),
+            $encryption_algorithms_client_to_server,
+            strlen($encryption_algorithms_server_to_client),
+            $encryption_algorithms_server_to_client,
+            strlen($mac_algorithms_client_to_server),
+            $mac_algorithms_client_to_server,
+            strlen($mac_algorithms_server_to_client),
+            $mac_algorithms_server_to_client,
+            strlen($compression_algorithms_client_to_server),
+            $compression_algorithms_client_to_server,
+            strlen($compression_algorithms_server_to_client),
+            $compression_algorithms_server_to_client,
+            0,
+            '',
+            0,
+            '',
+            0,
+            0
+        );
+
+        if (!$this->_send_binary_packet($kexinit_payload_client)) {
+            return false;
+        }
+        // here ends the second place.
+
+        // we need to decide upon the symmetric encryption algorithms before we do the diffie-hellman key exchange
+        // we don't initialize any crypto-objects, yet - we do that, later. for now, we need the lengths to make the
+        // diffie-hellman key exchange as fast as possible
+        $decrypt = $this->_array_intersect_first($encryption_algorithms, $this->encryption_algorithms_server_to_client);
+        $decryptKeyLength = $this->_encryption_algorithm_to_key_size($decrypt);
+        if ($decryptKeyLength === null) {
+            user_error('No compatible server to client encryption algorithms found');
+            return $this->_disconnect(NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED);
+        }
+
+        $encrypt = $this->_array_intersect_first($encryption_algorithms, $this->encryption_algorithms_client_to_server);
+        $encryptKeyLength = $this->_encryption_algorithm_to_key_size($encrypt);
+        if ($encryptKeyLength === null) {
+            user_error('No compatible client to server encryption algorithms found');
+            return $this->_disconnect(NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED);
+        }
+
+        // through diffie-hellman key exchange a symmetric key is obtained
+        $kex_algorithm = $this->_array_intersect_first($kex_algorithms, $this->kex_algorithms);
+        if ($kex_algorithm === false) {
+            user_error('No compatible key exchange algorithms found');
+            return $this->_disconnect(NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED);
+        }
+
+        // Only relevant in diffie-hellman-group-exchange-sha{1,256}, otherwise empty.
+        $exchange_hash_rfc4419 = '';
+
+        if ($kex_algorithm === 'curve25519-sha256@libssh.org') {
+            $x = Random::string(32);
+            $eBytes = \Sodium\crypto_box_publickey_from_secretkey($x);
+            $clientKexInitMessage = NET_SSH2_MSG_KEX_ECDH_INIT;
+            $serverKexReplyMessage = NET_SSH2_MSG_KEX_ECDH_REPLY;
+            $kexHash = new Hash('sha256');
+        } else {
+            if (strpos($kex_algorithm, 'diffie-hellman-group-exchange') === 0) {
+                $dh_group_sizes_packed = pack(
+                    'NNN',
+                    $this->kex_dh_group_size_min,
+                    $this->kex_dh_group_size_preferred,
+                    $this->kex_dh_group_size_max
+                );
+                $packet = pack(
+                    'Ca*',
+                    NET_SSH2_MSG_KEXDH_GEX_REQUEST,
+                    $dh_group_sizes_packed
+                );
+                if (!$this->_send_binary_packet($packet)) {
+                    return false;
+                }
+
+                $response = $this->_get_binary_packet();
+                if ($response === false) {
+                    user_error('Connection closed by server');
+                    return false;
+                }
+                extract(unpack('Ctype', $this->_string_shift($response, 1)));
+                if ($type != NET_SSH2_MSG_KEXDH_GEX_GROUP) {
+                    user_error('Expected SSH_MSG_KEX_DH_GEX_GROUP');
+                    return false;
+                }
+
+                extract(unpack('NprimeLength', $this->_string_shift($response, 4)));
+                $primeBytes = $this->_string_shift($response, $primeLength);
+                $prime = new BigInteger($primeBytes, -256);
+
+                extract(unpack('NgLength', $this->_string_shift($response, 4)));
+                $gBytes = $this->_string_shift($response, $gLength);
+                $g = new BigInteger($gBytes, -256);
+
+                $exchange_hash_rfc4419 = pack(
+                    'a*Na*Na*',
+                    $dh_group_sizes_packed,
+                    $primeLength,
+                    $primeBytes,
+                    $gLength,
+                    $gBytes
+                );
+
+                $clientKexInitMessage = NET_SSH2_MSG_KEXDH_GEX_INIT;
+                $serverKexReplyMessage = NET_SSH2_MSG_KEXDH_GEX_REPLY;
+            } else {
+                switch ($kex_algorithm) {
+                    // see http://tools.ietf.org/html/rfc2409#section-6.2 and
+                    // http://tools.ietf.org/html/rfc2412, appendex E
+                    case 'diffie-hellman-group1-sha1':
+                        $prime = 'FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD129024E088A67CC74' .
+                                '020BBEA63B139B22514A08798E3404DDEF9519B3CD3A431B302B0A6DF25F1437' .
+                                '4FE1356D6D51C245E485B576625E7EC6F44C42E9A637ED6B0BFF5CB6F406B7ED' .
+                                'EE386BFB5A899FA5AE9F24117C4B1FE649286651ECE65381FFFFFFFFFFFFFFFF';
+                        break;
+                    // see http://tools.ietf.org/html/rfc3526#section-3
+                    case 'diffie-hellman-group14-sha1':
+                        $prime = 'FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD129024E088A67CC74' .
+                                '020BBEA63B139B22514A08798E3404DDEF9519B3CD3A431B302B0A6DF25F1437' .
+                                '4FE1356D6D51C245E485B576625E7EC6F44C42E9A637ED6B0BFF5CB6F406B7ED' .
+                                'EE386BFB5A899FA5AE9F24117C4B1FE649286651ECE45B3DC2007CB8A163BF05' .
+                                '98DA48361C55D39A69163FA8FD24CF5F83655D23DCA3AD961C62F356208552BB' .
+                                '9ED529077096966D670C354E4ABC9804F1746C08CA18217C32905E462E36CE3B' .
+                                'E39E772C180E86039B2783A2EC07A28FB5C55DF06F4C52C9DE2BCBF695581718' .
+                                '3995497CEA956AE515D2261898FA051015728E5A8AACAA68FFFFFFFFFFFFFFFF';
+                        break;
+                }
+                // For both diffie-hellman-group1-sha1 and diffie-hellman-group14-sha1
+                // the generator field element is 2 (decimal) and the hash function is sha1.
+                $g = new BigInteger(2);
+                $prime = new BigInteger($prime, 16);
+                $clientKexInitMessage = NET_SSH2_MSG_KEXDH_INIT;
+                $serverKexReplyMessage = NET_SSH2_MSG_KEXDH_REPLY;
+            }
+
+            switch ($kex_algorithm) {
+                case 'diffie-hellman-group-exchange-sha256':
+                    $kexHash = new Hash('sha256');
+                    break;
+                default:
+                    $kexHash = new Hash('sha1');
+            }
+
+            /* To increase the speed of the key exchange, both client and server may
+            reduce the size of their private exponents.  It should be at least
+            twice as long as the key material that is generated from the shared
+            secret.  For more details, see the paper by van Oorschot and Wiener
+            [VAN-OORSCHOT].
+
+            -- http://tools.ietf.org/html/rfc4419#section-6.2 */
+            $one = new BigInteger(1);
+            $keyLength = min($kexHash->getLength(), max($encryptKeyLength, $decryptKeyLength));
+            $max = $one->bitwise_leftShift(16 * $keyLength); // 2 * 8 * $keyLength
+            $max = $max->subtract($one);
+
+            $x = $one->random($one, $max);
+            $e = $g->modPow($x, $prime);
+
+            $eBytes = $e->toBytes(true);
+        }
+        $data = pack('CNa*', $clientKexInitMessage, strlen($eBytes), $eBytes);
+
+        if (!$this->_send_binary_packet($data)) {
+            user_error('Connection closed by server');
+            return false;
+        }
+
+        $response = $this->_get_binary_packet();
+        if ($response === false) {
+            user_error('Connection closed by server');
+            return false;
+        }
+        extract(unpack('Ctype', $this->_string_shift($response, 1)));
+
+        if ($type != $serverKexReplyMessage) {
+            user_error('Expected SSH_MSG_KEXDH_REPLY');
+            return false;
+        }
+
+        $temp = unpack('Nlength', $this->_string_shift($response, 4));
+        $this->server_public_host_key = $server_public_host_key = $this->_string_shift($response, $temp['length']);
+
+        $temp = unpack('Nlength', $this->_string_shift($server_public_host_key, 4));
+        $public_key_format = $this->_string_shift($server_public_host_key, $temp['length']);
+
+        $temp = unpack('Nlength', $this->_string_shift($response, 4));
+        $fBytes = $this->_string_shift($response, $temp['length']);
+
+        $temp = unpack('Nlength', $this->_string_shift($response, 4));
+        $this->signature = $this->_string_shift($response, $temp['length']);
+
+        $temp = unpack('Nlength', $this->_string_shift($this->signature, 4));
+        $this->signature_format = $this->_string_shift($this->signature, $temp['length']);
+
+        if ($kex_algorithm === 'curve25519-sha256@libssh.org') {
+            if (strlen($fBytes) !== 32) {
+                user_error('Received curve25519 public key of invalid length.');
+                return false;
+            }
+            $key = new BigInteger(\Sodium\crypto_scalarmult($x, $fBytes), 256);
+            \Sodium\memzero($x);
+        } else {
+            $f = new BigInteger($fBytes, -256);
+            $key = $f->modPow($x, $prime);
+        }
+        $keyBytes = $key->toBytes(true);
+
+        $this->exchange_hash = pack(
+            'Na*Na*Na*Na*Na*a*Na*Na*Na*',
+            strlen($this->identifier),
+            $this->identifier,
+            strlen($this->server_identifier),
+            $this->server_identifier,
+            strlen($kexinit_payload_client),
+            $kexinit_payload_client,
+            strlen($kexinit_payload_server),
+            $kexinit_payload_server,
+            strlen($this->server_public_host_key),
+            $this->server_public_host_key,
+            $exchange_hash_rfc4419,
+            strlen($eBytes),
+            $eBytes,
+            strlen($fBytes),
+            $fBytes,
+            strlen($keyBytes),
+            $keyBytes
+        );
+
+        $this->exchange_hash = $kexHash->hash($this->exchange_hash);
+
+        if ($this->session_id === false) {
+            $this->session_id = $this->exchange_hash;
+        }
+
+        $server_host_key_algorithm = $this->_array_intersect_first($server_host_key_algorithms, $this->server_host_key_algorithms);
+        if ($server_host_key_algorithm === false) {
+            user_error('No compatible server host key algorithms found');
+            return $this->_disconnect(NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED);
+        }
+
+        if ($public_key_format != $server_host_key_algorithm || $this->signature_format != $server_host_key_algorithm) {
+            user_error('Server Host Key Algorithm Mismatch');
+            return $this->_disconnect(NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED);
+        }
+
+        $packet = pack(
+            'C',
+            NET_SSH2_MSG_NEWKEYS
+        );
+
+        if (!$this->_send_binary_packet($packet)) {
+            return false;
+        }
+
+        $response = $this->_get_binary_packet();
+
+        if ($response === false) {
+            user_error('Connection closed by server');
+            return false;
+        }
+
+        extract(unpack('Ctype', $this->_string_shift($response, 1)));
+
+        if ($type != NET_SSH2_MSG_NEWKEYS) {
+            user_error('Expected SSH_MSG_NEWKEYS');
+            return false;
+        }
+
+        $keyBytes = pack('Na*', strlen($keyBytes), $keyBytes);
+
+        $this->encrypt = $this->_encryption_algorithm_to_crypt_instance($encrypt);
+        if ($this->encrypt) {
+            if ($this->crypto_engine) {
+                $this->encrypt->setEngine($this->crypto_engine);
+            }
+            if ($this->encrypt->block_size) {
+                $this->encrypt_block_size = $this->encrypt->block_size;
+            }
+            $this->encrypt->enableContinuousBuffer();
+            $this->encrypt->disablePadding();
+
+            $iv = $kexHash->hash($keyBytes . $this->exchange_hash . 'A' . $this->session_id);
+            while ($this->encrypt_block_size > strlen($iv)) {
+                $iv.= $kexHash->hash($keyBytes . $this->exchange_hash . $iv);
+            }
+            $this->encrypt->setIV(substr($iv, 0, $this->encrypt_block_size));
+
+            $key = $kexHash->hash($keyBytes . $this->exchange_hash . 'C' . $this->session_id);
+            while ($encryptKeyLength > strlen($key)) {
+                $key.= $kexHash->hash($keyBytes . $this->exchange_hash . $key);
+            }
+            $this->encrypt->setKey(substr($key, 0, $encryptKeyLength));
+        }
+
+        $this->decrypt = $this->_encryption_algorithm_to_crypt_instance($decrypt);
+        if ($this->decrypt) {
+            if ($this->crypto_engine) {
+                $this->decrypt->setEngine($this->crypto_engine);
+            }
+            if ($this->decrypt->block_size) {
+                $this->decrypt_block_size = $this->decrypt->block_size;
+            }
+            $this->decrypt->enableContinuousBuffer();
+            $this->decrypt->disablePadding();
+
+            $iv = $kexHash->hash($keyBytes . $this->exchange_hash . 'B' . $this->session_id);
+            while ($this->decrypt_block_size > strlen($iv)) {
+                $iv.= $kexHash->hash($keyBytes . $this->exchange_hash . $iv);
+            }
+            $this->decrypt->setIV(substr($iv, 0, $this->decrypt_block_size));
+
+            $key = $kexHash->hash($keyBytes . $this->exchange_hash . 'D' . $this->session_id);
+            while ($decryptKeyLength > strlen($key)) {
+                $key.= $kexHash->hash($keyBytes . $this->exchange_hash . $key);
+            }
+            $this->decrypt->setKey(substr($key, 0, $decryptKeyLength));
+        }
+
+        /* The "arcfour128" algorithm is the RC4 cipher, as described in
+           [SCHNEIER], using a 128-bit key.  The first 1536 bytes of keystream
+           generated by the cipher MUST be discarded, and the first byte of the
+           first encrypted packet MUST be encrypted using the 1537th byte of
+           keystream.
+
+           -- http://tools.ietf.org/html/rfc4345#section-4 */
+        if ($encrypt == 'arcfour128' || $encrypt == 'arcfour256') {
+            $this->encrypt->encrypt(str_repeat("\0", 1536));
+        }
+        if ($decrypt == 'arcfour128' || $decrypt == 'arcfour256') {
+            $this->decrypt->decrypt(str_repeat("\0", 1536));
+        }
+
+        $mac_algorithm = $this->_array_intersect_first($mac_algorithms, $this->mac_algorithms_client_to_server);
+        if ($mac_algorithm === false) {
+            user_error('No compatible client to server message authentication algorithms found');
+            return $this->_disconnect(NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED);
+        }
+
+        $createKeyLength = 0; // ie. $mac_algorithm == 'none'
+        switch ($mac_algorithm) {
+            case 'hmac-sha2-256':
+                $this->hmac_create = new Hash('sha256');
+                $createKeyLength = 32;
+                break;
+            case 'hmac-sha1':
+                $this->hmac_create = new Hash('sha1');
+                $createKeyLength = 20;
+                break;
+            case 'hmac-sha1-96':
+                $this->hmac_create = new Hash('sha1-96');
+                $createKeyLength = 20;
+                break;
+            case 'hmac-md5':
+                $this->hmac_create = new Hash('md5');
+                $createKeyLength = 16;
+                break;
+            case 'hmac-md5-96':
+                $this->hmac_create = new Hash('md5-96');
+                $createKeyLength = 16;
+        }
+
+        $mac_algorithm = $this->_array_intersect_first($mac_algorithms, $this->mac_algorithms_server_to_client);
+        if ($mac_algorithm === false) {
+            user_error('No compatible server to client message authentication algorithms found');
+            return $this->_disconnect(NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED);
+        }
+
+        $checkKeyLength = 0;
+        $this->hmac_size = 0;
+        switch ($mac_algorithm) {
+            case 'hmac-sha2-256':
+                $this->hmac_check = new Hash('sha256');
+                $checkKeyLength = 32;
+                $this->hmac_size = 32;
+                break;
+            case 'hmac-sha1':
+                $this->hmac_check = new Hash('sha1');
+                $checkKeyLength = 20;
+                $this->hmac_size = 20;
+                break;
+            case 'hmac-sha1-96':
+                $this->hmac_check = new Hash('sha1-96');
+                $checkKeyLength = 20;
+                $this->hmac_size = 12;
+                break;
+            case 'hmac-md5':
+                $this->hmac_check = new Hash('md5');
+                $checkKeyLength = 16;
+                $this->hmac_size = 16;
+                break;
+            case 'hmac-md5-96':
+                $this->hmac_check = new Hash('md5-96');
+                $checkKeyLength = 16;
+                $this->hmac_size = 12;
+        }
+
+        $key = $kexHash->hash($keyBytes . $this->exchange_hash . 'E' . $this->session_id);
+        while ($createKeyLength > strlen($key)) {
+            $key.= $kexHash->hash($keyBytes . $this->exchange_hash . $key);
+        }
+        $this->hmac_create->setKey(substr($key, 0, $createKeyLength));
+
+        $key = $kexHash->hash($keyBytes . $this->exchange_hash . 'F' . $this->session_id);
+        while ($checkKeyLength > strlen($key)) {
+            $key.= $kexHash->hash($keyBytes . $this->exchange_hash . $key);
+        }
+        $this->hmac_check->setKey(substr($key, 0, $checkKeyLength));
+
+        $compression_algorithm = $this->_array_intersect_first($compression_algorithms, $this->compression_algorithms_server_to_client);
+        if ($compression_algorithm === false) {
+            user_error('No compatible server to client compression algorithms found');
+            return $this->_disconnect(NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED);
+        }
+        $this->decompress = $compression_algorithm == 'zlib';
+
+        $compression_algorithm = $this->_array_intersect_first($compression_algorithms, $this->compression_algorithms_client_to_server);
+        if ($compression_algorithm === false) {
+            user_error('No compatible client to server compression algorithms found');
+            return $this->_disconnect(NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED);
+        }
+        $this->compress = $compression_algorithm == 'zlib';
+
+        return true;
     }
 
     /**
-     * Return list of negotiated algorithms
+     * Maps an encryption algorithm name to the number of key bytes.
      *
-     * Uses the same format as https://www.php.net/ssh2-methods-negotiated
-     *
-     * @return array
+     * @param string $algorithm Name of the encryption algorithm
+     * @return int|null Number of bytes as an integer or null for unknown
+     * @access private
      */
-    public function getAlgorithmsNegotiated()
+    function _encryption_algorithm_to_key_size($algorithm)
     {
-        $this->connect();
-
-        $compression_map = [
-            self::NET_SSH2_COMPRESSION_NONE => 'none',
-            self::NET_SSH2_COMPRESSION_ZLIB => 'zlib',
-            self::NET_SSH2_COMPRESSION_ZLIB_AT_OPENSSH => 'zlib@openssh.com'
-        ];
-
-        return [
-            'kex' => $this->kex_algorithm,
-            'hostkey' => $this->signature_format,
-            'client_to_server' => [
-                'crypt' => $this->encryptName,
-                'mac' => $this->hmac_create_name,
-                'comp' => $compression_map[$this->compress],
-            ],
-            'server_to_client' => [
-                'crypt' => $this->decryptName,
-                'mac' => $this->hmac_check_name,
-                'comp' => $compression_map[$this->decompress],
-            ]
-        ];
+        switch ($algorithm) {
+            case 'none':
+                return 0;
+            case 'aes128-cbc':
+            case 'aes128-ctr':
+            case 'arcfour':
+            case 'arcfour128':
+            case 'blowfish-cbc':
+            case 'blowfish-ctr':
+            case 'twofish128-cbc':
+            case 'twofish128-ctr':
+                return 16;
+            case '3des-cbc':
+            case '3des-ctr':
+            case 'aes192-cbc':
+            case 'aes192-ctr':
+            case 'twofish192-cbc':
+            case 'twofish192-ctr':
+                return 24;
+            case 'aes256-cbc':
+            case 'aes256-ctr':
+            case 'arcfour256':
+            case 'twofish-cbc':
+            case 'twofish256-cbc':
+            case 'twofish256-ctr':
+                return 32;
+        }
+        return null;
     }
 
     /**
-     * Force multiple channels (even if phpseclib has decided to disable them)
+     * Maps an encryption algorithm name to an instance of a subclass of
+     * \phpseclib\Crypt\Base.
+     *
+     * @param string $algorithm Name of the encryption algorithm
+     * @return mixed Instance of \phpseclib\Crypt\Base or null for unknown
+     * @access private
      */
-    public function forceMultipleChannels()
+    function _encryption_algorithm_to_crypt_instance($algorithm)
     {
-        $this->errorOnMultipleChannels = false;
+        switch ($algorithm) {
+            case '3des-cbc':
+                return new TripleDES();
+            case '3des-ctr':
+                return new TripleDES(Base::MODE_CTR);
+            case 'aes256-cbc':
+            case 'aes192-cbc':
+            case 'aes128-cbc':
+                return new Rijndael();
+            case 'aes256-ctr':
+            case 'aes192-ctr':
+            case 'aes128-ctr':
+                return new Rijndael(Base::MODE_CTR);
+            case 'blowfish-cbc':
+                return new Blowfish();
+            case 'blowfish-ctr':
+                return new Blowfish(Base::MODE_CTR);
+            case 'twofish128-cbc':
+            case 'twofish192-cbc':
+            case 'twofish256-cbc':
+            case 'twofish-cbc':
+                return new Twofish();
+            case 'twofish128-ctr':
+            case 'twofish192-ctr':
+            case 'twofish256-ctr':
+                return new Twofish(Base::MODE_CTR);
+            case 'arcfour':
+            case 'arcfour128':
+            case 'arcfour256':
+                return new RC4();
+        }
+        return null;
     }
 
     /**
-     * Allows you to set the terminal
+     * Login
      *
-     * @param string $term
+     * The $password parameter can be a plaintext password, a \phpseclib\Crypt\RSA object or an array
+     *
+     * @param string $username
+     * @param mixed $password
+     * @param mixed $...
+     * @return bool
+     * @see self::_login()
+     * @access public
      */
-    public function setTerminal($term)
+    function login($username)
     {
-        $this->term = $term;
+        $args = func_get_args();
+        return call_user_func_array(array(&$this, '_login'), $args);
     }
 
     /**
-     * Accepts an associative array with up to four parameters as described at
-     * <https://www.php.net/manual/en/function.ssh2-connect.php>
+     * Login Helper
      *
-     * @param array $methods
+     * @param string $username
+     * @param mixed $password
+     * @param mixed $...
+     * @return bool
+     * @see self::_login_helper()
+     * @access private
      */
-    public function setPreferredAlgorithms(array $methods)
+    function _login($username)
     {
-        $preferred = $methods;
+        if (!($this->bitmap & self::MASK_CONSTRUCTOR)) {
+            if (!$this->_connect()) {
+                return false;
+            }
+        }
 
-        if (isset($preferred['kex'])) {
-            $preferred['kex'] = array_intersect(
-                $preferred['kex'],
-                static::getSupportedKEXAlgorithms()
+        $args = array_slice(func_get_args(), 1);
+        if (empty($args)) {
+            return $this->_login_helper($username);
+        }
+
+        foreach ($args as $arg) {
+            if ($this->_login_helper($username, $arg)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Login Helper
+     *
+     * @param string $username
+     * @param string $password
+     * @return bool
+     * @access private
+     * @internal It might be worthwhile, at some point, to protect against {@link http://tools.ietf.org/html/rfc4251#section-9.3.9 traffic analysis}
+     *           by sending dummy SSH_MSG_IGNORE messages.
+     */
+    function _login_helper($username, $password = null)
+    {
+        if (!($this->bitmap & self::MASK_CONNECTED)) {
+            return false;
+        }
+
+        if (!($this->bitmap & self::MASK_LOGIN_REQ)) {
+            $packet = pack(
+                'CNa*',
+                NET_SSH2_MSG_SERVICE_REQUEST,
+                strlen('ssh-userauth'),
+                'ssh-userauth'
+            );
+
+            if (!$this->_send_binary_packet($packet)) {
+                return false;
+            }
+
+            $response = $this->_get_binary_packet();
+            if ($response === false) {
+                user_error('Connection closed by server');
+                return false;
+            }
+
+            extract(unpack('Ctype', $this->_string_shift($response, 1)));
+
+            if ($type != NET_SSH2_MSG_SERVICE_ACCEPT) {
+                user_error('Expected SSH_MSG_SERVICE_ACCEPT');
+                return false;
+            }
+            $this->bitmap |= self::MASK_LOGIN_REQ;
+        }
+
+        if (strlen($this->last_interactive_response)) {
+            return !is_string($password) && !is_array($password) ? false : $this->_keyboard_interactive_process($password);
+        }
+
+        if ($password instanceof RSA) {
+            return $this->_privatekey_login($username, $password);
+        } elseif ($password instanceof Agent) {
+            return $this->_ssh_agent_login($username, $password);
+        }
+
+        if (is_array($password)) {
+            if ($this->_keyboard_interactive_login($username, $password)) {
+                $this->bitmap |= self::MASK_LOGIN;
+                return true;
+            }
+            return false;
+        }
+
+        if (!isset($password)) {
+            $packet = pack(
+                'CNa*Na*Na*',
+                NET_SSH2_MSG_USERAUTH_REQUEST,
+                strlen($username),
+                $username,
+                strlen('ssh-connection'),
+                'ssh-connection',
+                strlen('none'),
+                'none'
+            );
+
+            if (!$this->_send_binary_packet($packet)) {
+                return false;
+            }
+
+            $response = $this->_get_binary_packet();
+            if ($response === false) {
+                user_error('Connection closed by server');
+                return false;
+            }
+
+            extract(unpack('Ctype', $this->_string_shift($response, 1)));
+
+            switch ($type) {
+                case NET_SSH2_MSG_USERAUTH_SUCCESS:
+                    $this->bitmap |= self::MASK_LOGIN;
+                    return true;
+                //case NET_SSH2_MSG_USERAUTH_FAILURE:
+                default:
+                    return false;
+            }
+        }
+
+        $packet = pack(
+            'CNa*Na*Na*CNa*',
+            NET_SSH2_MSG_USERAUTH_REQUEST,
+            strlen($username),
+            $username,
+            strlen('ssh-connection'),
+            'ssh-connection',
+            strlen('password'),
+            'password',
+            0,
+            strlen($password),
+            $password
+        );
+
+        // remove the username and password from the logged packet
+        if (!defined('NET_SSH2_LOGGING')) {
+            $logged = null;
+        } else {
+            $logged = pack(
+                'CNa*Na*Na*CNa*',
+                NET_SSH2_MSG_USERAUTH_REQUEST,
+                strlen('username'),
+                'username',
+                strlen('ssh-connection'),
+                'ssh-connection',
+                strlen('password'),
+                'password',
+                0,
+                strlen('password'),
+                'password'
             );
         }
 
-        if (isset($preferred['hostkey'])) {
-            $preferred['hostkey'] = array_intersect(
-                $preferred['hostkey'],
-                static::getSupportedHostKeyAlgorithms()
+        if (!$this->_send_binary_packet($packet, $logged)) {
+            return false;
+        }
+
+        $response = $this->_get_binary_packet();
+        if ($response === false) {
+            user_error('Connection closed by server');
+            return false;
+        }
+
+        extract(unpack('Ctype', $this->_string_shift($response, 1)));
+
+        switch ($type) {
+            case NET_SSH2_MSG_USERAUTH_PASSWD_CHANGEREQ: // in theory, the password can be changed
+                if (defined('NET_SSH2_LOGGING')) {
+                    $this->message_number_log[count($this->message_number_log) - 1] = 'NET_SSH2_MSG_USERAUTH_PASSWD_CHANGEREQ';
+                }
+                extract(unpack('Nlength', $this->_string_shift($response, 4)));
+                $this->errors[] = 'SSH_MSG_USERAUTH_PASSWD_CHANGEREQ: ' . utf8_decode($this->_string_shift($response, $length));
+                return $this->_disconnect(NET_SSH2_DISCONNECT_AUTH_CANCELLED_BY_USER);
+            case NET_SSH2_MSG_USERAUTH_FAILURE:
+                // can we use keyboard-interactive authentication?  if not then either the login is bad or the server employees
+                // multi-factor authentication
+                extract(unpack('Nlength', $this->_string_shift($response, 4)));
+                $auth_methods = explode(',', $this->_string_shift($response, $length));
+                extract(unpack('Cpartial_success', $this->_string_shift($response, 1)));
+                $partial_success = $partial_success != 0;
+
+                if (!$partial_success && in_array('keyboard-interactive', $auth_methods)) {
+                    if ($this->_keyboard_interactive_login($username, $password)) {
+                        $this->bitmap |= self::MASK_LOGIN;
+                        return true;
+                    }
+                    return false;
+                }
+                return false;
+            case NET_SSH2_MSG_USERAUTH_SUCCESS:
+                $this->bitmap |= self::MASK_LOGIN;
+                return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Login via keyboard-interactive authentication
+     *
+     * See {@link http://tools.ietf.org/html/rfc4256 RFC4256} for details.  This is not a full-featured keyboard-interactive authenticator.
+     *
+     * @param string $username
+     * @param string $password
+     * @return bool
+     * @access private
+     */
+    function _keyboard_interactive_login($username, $password)
+    {
+        $packet = pack(
+            'CNa*Na*Na*Na*Na*',
+            NET_SSH2_MSG_USERAUTH_REQUEST,
+            strlen($username),
+            $username,
+            strlen('ssh-connection'),
+            'ssh-connection',
+            strlen('keyboard-interactive'),
+            'keyboard-interactive',
+            0,
+            '',
+            0,
+            ''
+        );
+
+        if (!$this->_send_binary_packet($packet)) {
+            return false;
+        }
+
+        return $this->_keyboard_interactive_process($password);
+    }
+
+    /**
+     * Handle the keyboard-interactive requests / responses.
+     *
+     * @param string $responses...
+     * @return bool
+     * @access private
+     */
+    function _keyboard_interactive_process()
+    {
+        $responses = func_get_args();
+
+        if (strlen($this->last_interactive_response)) {
+            $response = $this->last_interactive_response;
+        } else {
+            $orig = $response = $this->_get_binary_packet();
+            if ($response === false) {
+                user_error('Connection closed by server');
+                return false;
+            }
+        }
+
+        extract(unpack('Ctype', $this->_string_shift($response, 1)));
+
+        switch ($type) {
+            case NET_SSH2_MSG_USERAUTH_INFO_REQUEST:
+                extract(unpack('Nlength', $this->_string_shift($response, 4)));
+                $this->_string_shift($response, $length); // name; may be empty
+                extract(unpack('Nlength', $this->_string_shift($response, 4)));
+                $this->_string_shift($response, $length); // instruction; may be empty
+                extract(unpack('Nlength', $this->_string_shift($response, 4)));
+                $this->_string_shift($response, $length); // language tag; may be empty
+                extract(unpack('Nnum_prompts', $this->_string_shift($response, 4)));
+
+                for ($i = 0; $i < count($responses); $i++) {
+                    if (is_array($responses[$i])) {
+                        foreach ($responses[$i] as $key => $value) {
+                            $this->keyboard_requests_responses[$key] = $value;
+                        }
+                        unset($responses[$i]);
+                    }
+                }
+                $responses = array_values($responses);
+
+                if (isset($this->keyboard_requests_responses)) {
+                    for ($i = 0; $i < $num_prompts; $i++) {
+                        extract(unpack('Nlength', $this->_string_shift($response, 4)));
+                        // prompt - ie. "Password: "; must not be empty
+                        $prompt = $this->_string_shift($response, $length);
+                        //$echo = $this->_string_shift($response) != chr(0);
+                        foreach ($this->keyboard_requests_responses as $key => $value) {
+                            if (substr($prompt, 0, strlen($key)) == $key) {
+                                $responses[] = $value;
+                                break;
+                            }
+                        }
+                    }
+                }
+
+                // see http://tools.ietf.org/html/rfc4256#section-3.2
+                if (strlen($this->last_interactive_response)) {
+                    $this->last_interactive_response = '';
+                } elseif (defined('NET_SSH2_LOGGING')) {
+                    $this->message_number_log[count($this->message_number_log) - 1] = str_replace(
+                        'UNKNOWN',
+                        'NET_SSH2_MSG_USERAUTH_INFO_REQUEST',
+                        $this->message_number_log[count($this->message_number_log) - 1]
+                    );
+                }
+
+                if (!count($responses) && $num_prompts) {
+                    $this->last_interactive_response = $orig;
+                    return false;
+                }
+
+                /*
+                   After obtaining the requested information from the user, the client
+                   MUST respond with an SSH_MSG_USERAUTH_INFO_RESPONSE message.
+                */
+                // see http://tools.ietf.org/html/rfc4256#section-3.4
+                $packet = $logged = pack('CN', NET_SSH2_MSG_USERAUTH_INFO_RESPONSE, count($responses));
+                for ($i = 0; $i < count($responses); $i++) {
+                    $packet.= pack('Na*', strlen($responses[$i]), $responses[$i]);
+                    $logged.= pack('Na*', strlen('dummy-answer'), 'dummy-answer');
+                }
+
+                if (!$this->_send_binary_packet($packet, $logged)) {
+                    return false;
+                }
+
+                if (defined('NET_SSH2_LOGGING') && NET_SSH2_LOGGING == self::LOG_COMPLEX) {
+                    $this->message_number_log[count($this->message_number_log) - 1] = str_replace(
+                        'UNKNOWN',
+                        'NET_SSH2_MSG_USERAUTH_INFO_RESPONSE',
+                        $this->message_number_log[count($this->message_number_log) - 1]
+                    );
+                }
+
+                /*
+                   After receiving the response, the server MUST send either an
+                   SSH_MSG_USERAUTH_SUCCESS, SSH_MSG_USERAUTH_FAILURE, or another
+                   SSH_MSG_USERAUTH_INFO_REQUEST message.
+                */
+                // maybe phpseclib should force close the connection after x request / responses?  unless something like that is done
+                // there could be an infinite loop of request / responses.
+                return $this->_keyboard_interactive_process();
+            case NET_SSH2_MSG_USERAUTH_SUCCESS:
+                return true;
+            case NET_SSH2_MSG_USERAUTH_FAILURE:
+                return false;
+        }
+
+        return false;
+    }
+
+    /**
+     * Login with an ssh-agent provided key
+     *
+     * @param string $username
+     * @param \phpseclib\System\SSH\Agent $agent
+     * @return bool
+     * @access private
+     */
+    function _ssh_agent_login($username, $agent)
+    {
+        $this->agent = $agent;
+        $keys = $agent->requestIdentities();
+        foreach ($keys as $key) {
+            if ($this->_privatekey_login($username, $key)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Login with an RSA private key
+     *
+     * @param string $username
+     * @param \phpseclib\Crypt\RSA $password
+     * @return bool
+     * @access private
+     * @internal It might be worthwhile, at some point, to protect against {@link http://tools.ietf.org/html/rfc4251#section-9.3.9 traffic analysis}
+     *           by sending dummy SSH_MSG_IGNORE messages.
+     */
+    function _privatekey_login($username, $privatekey)
+    {
+        // see http://tools.ietf.org/html/rfc4253#page-15
+        $publickey = $privatekey->getPublicKey(RSA::PUBLIC_FORMAT_RAW);
+        if ($publickey === false) {
+            return false;
+        }
+
+        $publickey = array(
+            'e' => $publickey['e']->toBytes(true),
+            'n' => $publickey['n']->toBytes(true)
+        );
+        $publickey = pack(
+            'Na*Na*Na*',
+            strlen('ssh-rsa'),
+            'ssh-rsa',
+            strlen($publickey['e']),
+            $publickey['e'],
+            strlen($publickey['n']),
+            $publickey['n']
+        );
+
+        $part1 = pack(
+            'CNa*Na*Na*',
+            NET_SSH2_MSG_USERAUTH_REQUEST,
+            strlen($username),
+            $username,
+            strlen('ssh-connection'),
+            'ssh-connection',
+            strlen('publickey'),
+            'publickey'
+        );
+        $part2 = pack('Na*Na*', strlen('ssh-rsa'), 'ssh-rsa', strlen($publickey), $publickey);
+
+        $packet = $part1 . chr(0) . $part2;
+        if (!$this->_send_binary_packet($packet)) {
+            return false;
+        }
+
+        $response = $this->_get_binary_packet();
+        if ($response === false) {
+            user_error('Connection closed by server');
+            return false;
+        }
+
+        extract(unpack('Ctype', $this->_string_shift($response, 1)));
+
+        switch ($type) {
+            case NET_SSH2_MSG_USERAUTH_FAILURE:
+                extract(unpack('Nlength', $this->_string_shift($response, 4)));
+                $this->errors[] = 'SSH_MSG_USERAUTH_FAILURE: ' . $this->_string_shift($response, $length);
+                return false;
+            case NET_SSH2_MSG_USERAUTH_PK_OK:
+                // we'll just take it on faith that the public key blob and the public key algorithm name are as
+                // they should be
+                if (defined('NET_SSH2_LOGGING') && NET_SSH2_LOGGING == self::LOG_COMPLEX) {
+                    $this->message_number_log[count($this->message_number_log) - 1] = str_replace(
+                        'UNKNOWN',
+                        'NET_SSH2_MSG_USERAUTH_PK_OK',
+                        $this->message_number_log[count($this->message_number_log) - 1]
+                    );
+                }
+        }
+
+        $packet = $part1 . chr(1) . $part2;
+        $privatekey->setSignatureMode(RSA::SIGNATURE_PKCS1);
+        $signature = $privatekey->sign(pack('Na*a*', strlen($this->session_id), $this->session_id, $packet));
+        $signature = pack('Na*Na*', strlen('ssh-rsa'), 'ssh-rsa', strlen($signature), $signature);
+        $packet.= pack('Na*', strlen($signature), $signature);
+
+        if (!$this->_send_binary_packet($packet)) {
+            return false;
+        }
+
+        $response = $this->_get_binary_packet();
+        if ($response === false) {
+            user_error('Connection closed by server');
+            return false;
+        }
+
+        extract(unpack('Ctype', $this->_string_shift($response, 1)));
+
+        switch ($type) {
+            case NET_SSH2_MSG_USERAUTH_FAILURE:
+                // either the login is bad or the server employs multi-factor authentication
+                return false;
+            case NET_SSH2_MSG_USERAUTH_SUCCESS:
+                $this->bitmap |= self::MASK_LOGIN;
+                return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * Set Timeout
+     *
+     * $ssh->exec('ping 127.0.0.1'); on a Linux host will never return and will run indefinitely.  setTimeout() makes it so it'll timeout.
+     * Setting $timeout to false or 0 will mean there is no timeout.
+     *
+     * @param mixed $timeout
+     * @access public
+     */
+    function setTimeout($timeout)
+    {
+        $this->timeout = $this->curTimeout = $timeout;
+    }
+
+    /**
+     * Get the output from stdError
+     *
+     * @access public
+     */
+    function getStdError()
+    {
+        return $this->stdErrorLog;
+    }
+
+    /**
+     * Execute Command
+     *
+     * If $callback is set to false then \phpseclib\Net\SSH2::_get_channel_packet(self::CHANNEL_EXEC) will need to be called manually.
+     * In all likelihood, this is not a feature you want to be taking advantage of.
+     *
+     * @param string $command
+     * @param Callback $callback
+     * @return string
+     * @access public
+     */
+    function exec($command, $callback = null)
+    {
+        $this->curTimeout = $this->timeout;
+        $this->is_timeout = false;
+        $this->stdErrorLog = '';
+
+        if (!($this->bitmap & self::MASK_LOGIN)) {
+            return false;
+        }
+
+        // RFC4254 defines the (client) window size as "bytes the other party can send before it must wait for the window to
+        // be adjusted".  0x7FFFFFFF is, at 2GB, the max size.  technically, it should probably be decremented, but,
+        // honestly, if you're transferring more than 2GB, you probably shouldn't be using phpseclib, anyway.
+        // see http://tools.ietf.org/html/rfc4254#section-5.2 for more info
+        $this->window_size_server_to_client[self::CHANNEL_EXEC] = $this->window_size;
+        // 0x8000 is the maximum max packet size, per http://tools.ietf.org/html/rfc4253#section-6.1, although since PuTTy
+        // uses 0x4000, that's what will be used here, as well.
+        $packet_size = 0x4000;
+
+        $packet = pack(
+            'CNa*N3',
+            NET_SSH2_MSG_CHANNEL_OPEN,
+            strlen('session'),
+            'session',
+            self::CHANNEL_EXEC,
+            $this->window_size_server_to_client[self::CHANNEL_EXEC],
+            $packet_size
+        );
+
+        if (!$this->_send_binary_packet($packet)) {
+            return false;
+        }
+
+        $this->channel_status[self::CHANNEL_EXEC] = NET_SSH2_MSG_CHANNEL_OPEN;
+
+        $response = $this->_get_channel_packet(self::CHANNEL_EXEC);
+        if ($response === false) {
+            return false;
+        }
+
+        if ($this->request_pty === true) {
+            $terminal_modes = pack('C', NET_SSH2_TTY_OP_END);
+            $packet = pack(
+                'CNNa*CNa*N5a*',
+                NET_SSH2_MSG_CHANNEL_REQUEST,
+                $this->server_channels[self::CHANNEL_EXEC],
+                strlen('pty-req'),
+                'pty-req',
+                1,
+                strlen('vt100'),
+                'vt100',
+                $this->windowColumns,
+                $this->windowRows,
+                0,
+                0,
+                strlen($terminal_modes),
+                $terminal_modes
             );
+
+            if (!$this->_send_binary_packet($packet)) {
+                return false;
+            }
+
+            $response = $this->_get_binary_packet();
+            if ($response === false) {
+                user_error('Connection closed by server');
+                return false;
+            }
+
+            list(, $type) = unpack('C', $this->_string_shift($response, 1));
+
+            switch ($type) {
+                case NET_SSH2_MSG_CHANNEL_SUCCESS:
+                    break;
+                case NET_SSH2_MSG_CHANNEL_FAILURE:
+                default:
+                    user_error('Unable to request pseudo-terminal');
+                    return $this->_disconnect(NET_SSH2_DISCONNECT_BY_APPLICATION);
+            }
+            $this->in_request_pty_exec = true;
         }
 
-        $keys = ['client_to_server', 'server_to_client'];
-        foreach ($keys as $key) {
-            if (isset($preferred[$key])) {
-                $a = &$preferred[$key];
-                if (isset($a['crypt'])) {
-                    $a['crypt'] = array_intersect(
-                        $a['crypt'],
-                        static::getSupportedEncryptionAlgorithms()
-                    );
-                }
-                if (isset($a['comp'])) {
-                    $a['comp'] = array_intersect(
-                        $a['comp'],
-                        static::getSupportedCompressionAlgorithms()
-                    );
-                }
-                if (isset($a['mac'])) {
-                    $a['mac'] = array_intersect(
-                        $a['mac'],
-                        static::getSupportedMACAlgorithms()
-                    );
-                }
+        // sending a pty-req SSH_MSG_CHANNEL_REQUEST message is unnecessary and, in fact, in most cases, slows things
+        // down.  the one place where it might be desirable is if you're doing something like \phpseclib\Net\SSH2::exec('ping localhost &').
+        // with a pty-req SSH_MSG_CHANNEL_REQUEST, exec() will return immediately and the ping process will then
+        // then immediately terminate.  without such a request exec() will loop indefinitely.  the ping process won't end but
+        // neither will your script.
+
+        // although, in theory, the size of SSH_MSG_CHANNEL_REQUEST could exceed the maximum packet size established by
+        // SSH_MSG_CHANNEL_OPEN_CONFIRMATION, RFC4254#section-5.1 states that the "maximum packet size" refers to the
+        // "maximum size of an individual data packet". ie. SSH_MSG_CHANNEL_DATA.  RFC4254#section-5.2 corroborates.
+        $packet = pack(
+            'CNNa*CNa*',
+            NET_SSH2_MSG_CHANNEL_REQUEST,
+            $this->server_channels[self::CHANNEL_EXEC],
+            strlen('exec'),
+            'exec',
+            1,
+            strlen($command),
+            $command
+        );
+        if (!$this->_send_binary_packet($packet)) {
+            return false;
+        }
+
+        $this->channel_status[self::CHANNEL_EXEC] = NET_SSH2_MSG_CHANNEL_REQUEST;
+
+        $response = $this->_get_channel_packet(self::CHANNEL_EXEC);
+        if ($response === false) {
+            return false;
+        }
+
+        $this->channel_status[self::CHANNEL_EXEC] = NET_SSH2_MSG_CHANNEL_DATA;
+
+        if ($callback === false || $this->in_request_pty_exec) {
+            return true;
+        }
+
+        $output = '';
+        while (true) {
+            $temp = $this->_get_channel_packet(self::CHANNEL_EXEC);
+            switch (true) {
+                case $temp === true:
+                    return is_callable($callback) ? true : $output;
+                case $temp === false:
+                    return false;
+                default:
+                    if (is_callable($callback)) {
+                        if (call_user_func($callback, $temp) === true) {
+                            $this->_close_channel(self::CHANNEL_EXEC);
+                            return true;
+                        }
+                    } else {
+                        $output.= $temp;
+                    }
+            }
+        }
+    }
+
+    /**
+     * Creates an interactive shell
+     *
+     * @see self::read()
+     * @see self::write()
+     * @return bool
+     * @access private
+     */
+    function _initShell()
+    {
+        if ($this->in_request_pty_exec === true) {
+            return true;
+        }
+
+        $this->window_size_server_to_client[self::CHANNEL_SHELL] = $this->window_size;
+        $packet_size = 0x4000;
+
+        $packet = pack(
+            'CNa*N3',
+            NET_SSH2_MSG_CHANNEL_OPEN,
+            strlen('session'),
+            'session',
+            self::CHANNEL_SHELL,
+            $this->window_size_server_to_client[self::CHANNEL_SHELL],
+            $packet_size
+        );
+
+        if (!$this->_send_binary_packet($packet)) {
+            return false;
+        }
+
+        $this->channel_status[self::CHANNEL_SHELL] = NET_SSH2_MSG_CHANNEL_OPEN;
+
+        $response = $this->_get_channel_packet(self::CHANNEL_SHELL);
+        if ($response === false) {
+            return false;
+        }
+
+        $terminal_modes = pack('C', NET_SSH2_TTY_OP_END);
+        $packet = pack(
+            'CNNa*CNa*N5a*',
+            NET_SSH2_MSG_CHANNEL_REQUEST,
+            $this->server_channels[self::CHANNEL_SHELL],
+            strlen('pty-req'),
+            'pty-req',
+            1,
+            strlen('vt100'),
+            'vt100',
+            $this->windowColumns,
+            $this->windowRows,
+            0,
+            0,
+            strlen($terminal_modes),
+            $terminal_modes
+        );
+
+        if (!$this->_send_binary_packet($packet)) {
+            return false;
+        }
+
+        $response = $this->_get_binary_packet();
+        if ($response === false) {
+            user_error('Connection closed by server');
+            return false;
+        }
+
+        list(, $type) = unpack('C', $this->_string_shift($response, 1));
+
+        switch ($type) {
+            case NET_SSH2_MSG_CHANNEL_SUCCESS:
+            // if a pty can't be opened maybe commands can still be executed
+            case NET_SSH2_MSG_CHANNEL_FAILURE:
+                break;
+            default:
+                user_error('Unable to request pseudo-terminal');
+                return $this->_disconnect(NET_SSH2_DISCONNECT_BY_APPLICATION);
+        }
+
+        $packet = pack(
+            'CNNa*C',
+            NET_SSH2_MSG_CHANNEL_REQUEST,
+            $this->server_channels[self::CHANNEL_SHELL],
+            strlen('shell'),
+            'shell',
+            1
+        );
+        if (!$this->_send_binary_packet($packet)) {
+            return false;
+        }
+
+        $this->channel_status[self::CHANNEL_SHELL] = NET_SSH2_MSG_CHANNEL_REQUEST;
+
+        $response = $this->_get_channel_packet(self::CHANNEL_SHELL);
+        if ($response === false) {
+            return false;
+        }
+
+        $this->channel_status[self::CHANNEL_SHELL] = NET_SSH2_MSG_CHANNEL_DATA;
+
+        $this->bitmap |= self::MASK_SHELL;
+
+        return true;
+    }
+
+    /**
+     * Return the channel to be used with read() / write()
+     *
+     * @see self::read()
+     * @see self::write()
+     * @return int
+     * @access public
+     */
+    function _get_interactive_channel()
+    {
+        switch (true) {
+            case $this->in_subsystem:
+                return self::CHANNEL_SUBSYSTEM;
+            case $this->in_request_pty_exec:
+                return self::CHANNEL_EXEC;
+            default:
+                return self::CHANNEL_SHELL;
+        }
+    }
+
+    /**
+     * Return an available open channel
+     *
+     * @return int
+     * @access public
+     */
+    function _get_open_channel()
+    {
+        $channel = self::CHANNEL_EXEC;
+        do {
+            if (isset($this->channel_status[$channel]) && $this->channel_status[$channel] == NET_SSH2_MSG_CHANNEL_OPEN) {
+                return $channel;
+            }
+        } while ($channel++ < self::CHANNEL_SUBSYSTEM);
+
+        return false;
+    }
+
+    /**
+     * Returns the output of an interactive shell
+     *
+     * Returns when there's a match for $expect, which can take the form of a string literal or,
+     * if $mode == self::READ_REGEX, a regular expression.
+     *
+     * @see self::write()
+     * @param string $expect
+     * @param int $mode
+     * @return string
+     * @access public
+     */
+    function read($expect = '', $mode = self::READ_SIMPLE)
+    {
+        $this->curTimeout = $this->timeout;
+        $this->is_timeout = false;
+
+        if (!($this->bitmap & self::MASK_LOGIN)) {
+            user_error('Operation disallowed prior to login()');
+            return false;
+        }
+
+        if (!($this->bitmap & self::MASK_SHELL) && !$this->_initShell()) {
+            user_error('Unable to initiate an interactive shell session');
+            return false;
+        }
+
+        $channel = $this->_get_interactive_channel();
+
+        $match = $expect;
+        while (true) {
+            if ($mode == self::READ_REGEX) {
+                preg_match($expect, substr($this->interactiveBuffer, -1024), $matches);
+                $match = isset($matches[0]) ? $matches[0] : '';
+            }
+            $pos = strlen($match) ? strpos($this->interactiveBuffer, $match) : false;
+            if ($pos !== false) {
+                return $this->_string_shift($this->interactiveBuffer, $pos + strlen($match));
+            }
+            $response = $this->_get_channel_packet($channel);
+            if (is_bool($response)) {
+                $this->in_request_pty_exec = false;
+                return $response ? $this->_string_shift($this->interactiveBuffer, strlen($this->interactiveBuffer)) : false;
+            }
+
+            $this->interactiveBuffer.= $response;
+        }
+    }
+
+    /**
+     * Inputs a command into an interactive shell.
+     *
+     * @see self::read()
+     * @param string $cmd
+     * @return bool
+     * @access public
+     */
+    function write($cmd)
+    {
+        if (!($this->bitmap & self::MASK_LOGIN)) {
+            user_error('Operation disallowed prior to login()');
+            return false;
+        }
+
+        if (!($this->bitmap & self::MASK_SHELL) && !$this->_initShell()) {
+            user_error('Unable to initiate an interactive shell session');
+            return false;
+        }
+
+        return $this->_send_channel_packet($this->_get_interactive_channel(), $cmd);
+    }
+
+    /**
+     * Start a subsystem.
+     *
+     * Right now only one subsystem at a time is supported. To support multiple subsystem's stopSubsystem() could accept
+     * a string that contained the name of the subsystem, but at that point, only one subsystem of each type could be opened.
+     * To support multiple subsystem's of the same name maybe it'd be best if startSubsystem() generated a new channel id and
+     * returns that and then that that was passed into stopSubsystem() but that'll be saved for a future date and implemented
+     * if there's sufficient demand for such a feature.
+     *
+     * @see self::stopSubsystem()
+     * @param string $subsystem
+     * @return bool
+     * @access public
+     */
+    function startSubsystem($subsystem)
+    {
+        $this->window_size_server_to_client[self::CHANNEL_SUBSYSTEM] = $this->window_size;
+
+        $packet = pack(
+            'CNa*N3',
+            NET_SSH2_MSG_CHANNEL_OPEN,
+            strlen('session'),
+            'session',
+            self::CHANNEL_SUBSYSTEM,
+            $this->window_size,
+            0x4000
+        );
+
+        if (!$this->_send_binary_packet($packet)) {
+            return false;
+        }
+
+        $this->channel_status[self::CHANNEL_SUBSYSTEM] = NET_SSH2_MSG_CHANNEL_OPEN;
+
+        $response = $this->_get_channel_packet(self::CHANNEL_SUBSYSTEM);
+        if ($response === false) {
+            return false;
+        }
+
+        $packet = pack(
+            'CNNa*CNa*',
+            NET_SSH2_MSG_CHANNEL_REQUEST,
+            $this->server_channels[self::CHANNEL_SUBSYSTEM],
+            strlen('subsystem'),
+            'subsystem',
+            1,
+            strlen($subsystem),
+            $subsystem
+        );
+        if (!$this->_send_binary_packet($packet)) {
+            return false;
+        }
+
+        $this->channel_status[self::CHANNEL_SUBSYSTEM] = NET_SSH2_MSG_CHANNEL_REQUEST;
+
+        $response = $this->_get_channel_packet(self::CHANNEL_SUBSYSTEM);
+
+        if ($response === false) {
+            return false;
+        }
+
+        $this->channel_status[self::CHANNEL_SUBSYSTEM] = NET_SSH2_MSG_CHANNEL_DATA;
+
+        $this->bitmap |= self::MASK_SHELL;
+        $this->in_subsystem = true;
+
+        return true;
+    }
+
+    /**
+     * Stops a subsystem.
+     *
+     * @see self::startSubsystem()
+     * @return bool
+     * @access public
+     */
+    function stopSubsystem()
+    {
+        $this->in_subsystem = false;
+        $this->_close_channel(self::CHANNEL_SUBSYSTEM);
+        return true;
+    }
+
+    /**
+     * Closes a channel
+     *
+     * If read() timed out you might want to just close the channel and have it auto-restart on the next read() call
+     *
+     * @access public
+     */
+    function reset()
+    {
+        $this->_close_channel($this->_get_interactive_channel());
+    }
+
+    /**
+     * Is timeout?
+     *
+     * Did exec() or read() return because they timed out or because they encountered the end?
+     *
+     * @access public
+     */
+    function isTimeout()
+    {
+        return $this->is_timeout;
+    }
+
+    /**
+     * Disconnect
+     *
+     * @access public
+     */
+    function disconnect()
+    {
+        $this->_disconnect(NET_SSH2_DISCONNECT_BY_APPLICATION);
+        if (isset($this->realtime_log_file) && is_resource($this->realtime_log_file)) {
+            fclose($this->realtime_log_file);
+        }
+    }
+
+    /**
+     * Destructor.
+     *
+     * Will be called, automatically, if you're supporting just PHP5.  If you're supporting PHP4, you'll need to call
+     * disconnect().
+     *
+     * @access public
+     */
+    function __destruct()
+    {
+        $this->disconnect();
+    }
+
+    /**
+     * Is the connection still active?
+     *
+     * @return bool
+     * @access public
+     */
+    function isConnected()
+    {
+        return (bool) ($this->bitmap & self::MASK_CONNECTED);
+    }
+
+    /**
+     * Have you successfully been logged in?
+     *
+     * @return bool
+     * @access public
+     */
+    function isAuthenticated()
+    {
+        return (bool) ($this->bitmap & self::MASK_LOGIN);
+    }
+
+    /**
+     * Gets Binary Packets
+     *
+     * See '6. Binary Packet Protocol' of rfc4253 for more info.
+     *
+     * @see self::_send_binary_packet()
+     * @return string
+     * @access private
+     */
+    function _get_binary_packet()
+    {
+        if (!is_resource($this->fsock) || feof($this->fsock)) {
+            user_error('Connection closed prematurely');
+            $this->bitmap = 0;
+            return false;
+        }
+
+        $start = microtime(true);
+        $raw = stream_get_contents($this->fsock, $this->decrypt_block_size);
+
+        if (!strlen($raw)) {
+            return '';
+        }
+
+        if ($this->decrypt !== false) {
+            $raw = $this->decrypt->decrypt($raw);
+        }
+        if ($raw === false) {
+            user_error('Unable to decrypt content');
+            return false;
+        }
+
+        extract(unpack('Npacket_length/Cpadding_length', $this->_string_shift($raw, 5)));
+
+        $remaining_length = $packet_length + 4 - $this->decrypt_block_size;
+
+        // quoting <http://tools.ietf.org/html/rfc4253#section-6.1>,
+        // "implementations SHOULD check that the packet length is reasonable"
+        // PuTTY uses 0x9000 as the actual max packet size and so to shall we
+        if ($remaining_length < -$this->decrypt_block_size || $remaining_length > 0x9000 || $remaining_length % $this->decrypt_block_size != 0) {
+            user_error('Invalid size');
+            return false;
+        }
+
+        $buffer = '';
+        while ($remaining_length > 0) {
+            $temp = stream_get_contents($this->fsock, $remaining_length);
+            if ($temp === false || feof($this->fsock)) {
+                user_error('Error reading from socket');
+                $this->bitmap = 0;
+                return false;
+            }
+            $buffer.= $temp;
+            $remaining_length-= strlen($temp);
+        }
+        $stop = microtime(true);
+        if (strlen($buffer)) {
+            $raw.= $this->decrypt !== false ? $this->decrypt->decrypt($buffer) : $buffer;
+        }
+
+        $payload = $this->_string_shift($raw, $packet_length - $padding_length - 1);
+        $padding = $this->_string_shift($raw, $padding_length); // should leave $raw empty
+
+        if ($this->hmac_check !== false) {
+            $hmac = stream_get_contents($this->fsock, $this->hmac_size);
+            if ($hmac === false || strlen($hmac) != $this->hmac_size) {
+                user_error('Error reading socket');
+                $this->bitmap = 0;
+                return false;
+            } elseif ($hmac != $this->hmac_check->hash(pack('NNCa*', $this->get_seq_no, $packet_length, $padding_length, $payload . $padding))) {
+                user_error('Invalid HMAC');
+                return false;
             }
         }
 
-        $keys = [
-            'kex',
-            'hostkey',
-            'client_to_server/crypt',
-            'client_to_server/comp',
-            'client_to_server/mac',
-            'server_to_client/crypt',
-            'server_to_client/comp',
-            'server_to_client/mac',
-        ];
-        foreach ($keys as $key) {
-            $p = $preferred;
-            $m = $methods;
+        //if ($this->decompress) {
+        //    $payload = gzinflate(substr($payload, 2));
+        //}
 
-            $subkeys = explode('/', $key);
-            foreach ($subkeys as $subkey) {
-                if (!isset($p[$subkey])) {
-                    continue 2;
+        $this->get_seq_no++;
+
+        if (defined('NET_SSH2_LOGGING')) {
+            $current = microtime(true);
+            $message_number = isset($this->message_numbers[ord($payload[0])]) ? $this->message_numbers[ord($payload[0])] : 'UNKNOWN (' . ord($payload[0]) . ')';
+            $message_number = '<- ' . $message_number .
+                              ' (since last: ' . round($current - $this->last_packet, 4) . ', network: ' . round($stop - $start, 4) . 's)';
+            $this->_append_log($message_number, $payload);
+            $this->last_packet = $current;
+        }
+
+        return $this->_filter($payload);
+    }
+
+    /**
+     * Filter Binary Packets
+     *
+     * Because some binary packets need to be ignored...
+     *
+     * @see self::_get_binary_packet()
+     * @return string
+     * @access private
+     */
+    function _filter($payload)
+    {
+        switch (ord($payload[0])) {
+            case NET_SSH2_MSG_DISCONNECT:
+                $this->_string_shift($payload, 1);
+                extract(unpack('Nreason_code/Nlength', $this->_string_shift($payload, 8)));
+                $this->errors[] = 'SSH_MSG_DISCONNECT: ' . $this->disconnect_reasons[$reason_code] . "\r\n" . utf8_decode($this->_string_shift($payload, $length));
+                $this->bitmap = 0;
+                return false;
+            case NET_SSH2_MSG_IGNORE:
+                $payload = $this->_get_binary_packet();
+                break;
+            case NET_SSH2_MSG_DEBUG:
+                $this->_string_shift($payload, 2);
+                extract(unpack('Nlength', $this->_string_shift($payload, 4)));
+                $this->errors[] = 'SSH_MSG_DEBUG: ' . utf8_decode($this->_string_shift($payload, $length));
+                $payload = $this->_get_binary_packet();
+                break;
+            case NET_SSH2_MSG_UNIMPLEMENTED:
+                return false;
+            case NET_SSH2_MSG_KEXINIT:
+                if ($this->session_id !== false) {
+                    if (!$this->_key_exchange($payload)) {
+                        $this->bitmap = 0;
+                        return false;
+                    }
+                    $payload = $this->_get_binary_packet();
                 }
-                $p = $p[$subkey];
-                $m = $m[$subkey];
-            }
+        }
 
-            if (count($p) != count($m)) {
-                $diff = array_diff($m, $p);
-                $msg = count($diff) == 1 ?
-                    ' is not a supported algorithm' :
-                    ' are not supported algorithms';
-                throw new UnsupportedAlgorithmException(implode(', ', $diff) . $msg);
+        // see http://tools.ietf.org/html/rfc4252#section-5.4; only called when the encryption has been activated and when we haven't already logged in
+        if (($this->bitmap & self::MASK_CONNECTED) && !($this->bitmap & self::MASK_LOGIN) && ord($payload[0]) == NET_SSH2_MSG_USERAUTH_BANNER) {
+            $this->_string_shift($payload, 1);
+            extract(unpack('Nlength', $this->_string_shift($payload, 4)));
+            $this->banner_message = utf8_decode($this->_string_shift($payload, $length));
+            $payload = $this->_get_binary_packet();
+        }
+
+        // only called when we've already logged in
+        if (($this->bitmap & self::MASK_CONNECTED) && ($this->bitmap & self::MASK_LOGIN)) {
+            switch (ord($payload[0])) {
+                case NET_SSH2_MSG_GLOBAL_REQUEST: // see http://tools.ietf.org/html/rfc4254#section-4
+                    extract(unpack('Nlength', $this->_string_shift($payload, 4)));
+                    $this->errors[] = 'SSH_MSG_GLOBAL_REQUEST: ' . $this->_string_shift($payload, $length);
+
+                    if (!$this->_send_binary_packet(pack('C', NET_SSH2_MSG_REQUEST_FAILURE))) {
+                        return $this->_disconnect(NET_SSH2_DISCONNECT_BY_APPLICATION);
+                    }
+
+                    $payload = $this->_get_binary_packet();
+                    break;
+                case NET_SSH2_MSG_CHANNEL_OPEN: // see http://tools.ietf.org/html/rfc4254#section-5.1
+                    $this->_string_shift($payload, 1);
+                    extract(unpack('Nlength', $this->_string_shift($payload, 4)));
+                    $data = $this->_string_shift($payload, $length);
+                    extract(unpack('Nserver_channel', $this->_string_shift($payload, 4)));
+                    switch ($data) {
+                        case 'auth-agent':
+                        case 'auth-agent@openssh.com':
+                            if (isset($this->agent)) {
+                                $new_channel = self::CHANNEL_AGENT_FORWARD;
+
+                                extract(unpack('Nremote_window_size', $this->_string_shift($payload, 4)));
+                                extract(unpack('Nremote_maximum_packet_size', $this->_string_shift($payload, 4)));
+
+                                $this->packet_size_client_to_server[$new_channel] = $remote_window_size;
+                                $this->window_size_server_to_client[$new_channel] = $remote_maximum_packet_size;
+                                $this->window_size_client_to_server[$new_channel] = $this->window_size;
+
+                                $packet_size = 0x4000;
+
+                                $packet = pack(
+                                    'CN4',
+                                    NET_SSH2_MSG_CHANNEL_OPEN_CONFIRMATION,
+                                    $server_channel,
+                                    $new_channel,
+                                    $packet_size,
+                                    $packet_size
+                                );
+
+                                $this->server_channels[$new_channel] = $server_channel;
+                                $this->channel_status[$new_channel] = NET_SSH2_MSG_CHANNEL_OPEN_CONFIRMATION;
+                                if (!$this->_send_binary_packet($packet)) {
+                                    return false;
+                                }
+                            }
+                            break;
+                        default:
+                            $packet = pack(
+                                'CN3a*Na*',
+                                NET_SSH2_MSG_REQUEST_FAILURE,
+                                $server_channel,
+                                NET_SSH2_OPEN_ADMINISTRATIVELY_PROHIBITED,
+                                0,
+                                '',
+                                0,
+                                ''
+                            );
+
+                            if (!$this->_send_binary_packet($packet)) {
+                                return $this->_disconnect(NET_SSH2_DISCONNECT_BY_APPLICATION);
+                            }
+                    }
+                    $payload = $this->_get_binary_packet();
+                    break;
+                case NET_SSH2_MSG_CHANNEL_WINDOW_ADJUST:
+                    $this->_string_shift($payload, 1);
+                    extract(unpack('Nchannel', $this->_string_shift($payload, 4)));
+                    extract(unpack('Nwindow_size', $this->_string_shift($payload, 4)));
+                    $this->window_size_client_to_server[$channel]+= $window_size;
+
+                    $payload = ($this->bitmap & self::MASK_WINDOW_ADJUST) ? true : $this->_get_binary_packet();
             }
         }
 
-        $this->preferred = $preferred;
+        return $payload;
+    }
+
+    /**
+     * Enable Quiet Mode
+     *
+     * Suppress stderr from output
+     *
+     * @access public
+     */
+    function enableQuietMode()
+    {
+        $this->quiet_mode = true;
+    }
+
+    /**
+     * Disable Quiet Mode
+     *
+     * Show stderr in output
+     *
+     * @access public
+     */
+    function disableQuietMode()
+    {
+        $this->quiet_mode = false;
+    }
+
+    /**
+     * Returns whether Quiet Mode is enabled or not
+     *
+     * @see self::enableQuietMode()
+     * @see self::disableQuietMode()
+     * @access public
+     * @return bool
+     */
+    function isQuietModeEnabled()
+    {
+        return $this->quiet_mode;
+    }
+
+    /**
+     * Enable request-pty when using exec()
+     *
+     * @access public
+     */
+    function enablePTY()
+    {
+        $this->request_pty = true;
+    }
+
+    /**
+     * Disable request-pty when using exec()
+     *
+     * @access public
+     */
+    function disablePTY()
+    {
+        $this->request_pty = false;
+    }
+
+    /**
+     * Returns whether request-pty is enabled or not
+     *
+     * @see self::enablePTY()
+     * @see self::disablePTY()
+     * @access public
+     * @return bool
+     */
+    function isPTYEnabled()
+    {
+        return $this->request_pty;
+    }
+
+    /**
+     * Gets channel data
+     *
+     * Returns the data as a string if it's available and false if not.
+     *
+     * @param $client_channel
+     * @return mixed
+     * @access private
+     */
+    function _get_channel_packet($client_channel, $skip_extended = false)
+    {
+        if (!empty($this->channel_buffers[$client_channel])) {
+            return array_shift($this->channel_buffers[$client_channel]);
+        }
+
+        while (true) {
+            if ($this->curTimeout) {
+                if ($this->curTimeout < 0) {
+                    $this->is_timeout = true;
+                    return true;
+                }
+
+                $read = array($this->fsock);
+                $write = $except = null;
+
+                $start = microtime(true);
+                $sec = floor($this->curTimeout);
+                $usec = 1000000 * ($this->curTimeout - $sec);
+                // on windows this returns a "Warning: Invalid CRT parameters detected" error
+                if (!@stream_select($read, $write, $except, $sec, $usec) && !count($read)) {
+                    $this->is_timeout = true;
+                    return true;
+                }
+                $elapsed = microtime(true) - $start;
+                $this->curTimeout-= $elapsed;
+            }
+
+            $response = $this->_get_binary_packet();
+            if ($response === false) {
+                user_error('Connection closed by server');
+                return false;
+            }
+            if ($client_channel == -1 && $response === true) {
+                return true;
+            }
+            if (!strlen($response)) {
+                return '';
+            }
+
+            extract(unpack('Ctype', $this->_string_shift($response, 1)));
+
+            if ($type == NET_SSH2_MSG_CHANNEL_OPEN) {
+                extract(unpack('Nlength', $this->_string_shift($response, 4)));
+            } else {
+                extract(unpack('Nchannel', $this->_string_shift($response, 4)));
+            }
+
+            // will not be setup yet on incoming channel open request
+            if (isset($channel) && isset($this->channel_status[$channel]) && isset($this->window_size_server_to_client[$channel])) {
+                $this->window_size_server_to_client[$channel]-= strlen($response);
+
+                // resize the window, if appropriate
+                if ($this->window_size_server_to_client[$channel] < 0) {
+                    $packet = pack('CNN', NET_SSH2_MSG_CHANNEL_WINDOW_ADJUST, $this->server_channels[$channel], $this->window_size);
+                    if (!$this->_send_binary_packet($packet)) {
+                        return false;
+                    }
+                    $this->window_size_server_to_client[$channel]+= $this->window_size;
+                }
+
+                switch ($this->channel_status[$channel]) {
+                    case NET_SSH2_MSG_CHANNEL_OPEN:
+                        switch ($type) {
+                            case NET_SSH2_MSG_CHANNEL_OPEN_CONFIRMATION:
+                                extract(unpack('Nserver_channel', $this->_string_shift($response, 4)));
+                                $this->server_channels[$channel] = $server_channel;
+                                extract(unpack('Nwindow_size', $this->_string_shift($response, 4)));
+                                if ($window_size < 0) {
+                                    $window_size&= 0x7FFFFFFF;
+                                    $window_size+= 0x80000000;
+                                }
+                                $this->window_size_client_to_server[$channel] = $window_size;
+                                $temp = unpack('Npacket_size_client_to_server', $this->_string_shift($response, 4));
+                                $this->packet_size_client_to_server[$channel] = $temp['packet_size_client_to_server'];
+                                $result = $client_channel == $channel ? true : $this->_get_channel_packet($client_channel, $skip_extended);
+                                $this->_on_channel_open();
+                                return $result;
+                            //case NET_SSH2_MSG_CHANNEL_OPEN_FAILURE:
+                            default:
+                                user_error('Unable to open channel');
+                                return $this->_disconnect(NET_SSH2_DISCONNECT_BY_APPLICATION);
+                        }
+                        break;
+                    case NET_SSH2_MSG_CHANNEL_REQUEST:
+                        switch ($type) {
+                            case NET_SSH2_MSG_CHANNEL_SUCCESS:
+                                return true;
+                            case NET_SSH2_MSG_CHANNEL_FAILURE:
+                                return false;
+                            default:
+                                user_error('Unable to fulfill channel request');
+                                return $this->_disconnect(NET_SSH2_DISCONNECT_BY_APPLICATION);
+                        }
+                    case NET_SSH2_MSG_CHANNEL_CLOSE:
+                        return $type == NET_SSH2_MSG_CHANNEL_CLOSE ? true : $this->_get_channel_packet($client_channel, $skip_extended);
+                }
+            }
+
+            // ie. $this->channel_status[$channel] == NET_SSH2_MSG_CHANNEL_DATA
+
+            switch ($type) {
+                case NET_SSH2_MSG_CHANNEL_DATA:
+                    /*
+                    if ($channel == self::CHANNEL_EXEC) {
+                        // SCP requires null packets, such as this, be sent.  further, in the case of the ssh.com SSH server
+                        // this actually seems to make things twice as fast.  more to the point, the message right after
+                        // SSH_MSG_CHANNEL_DATA (usually SSH_MSG_IGNORE) won't block for as long as it would have otherwise.
+                        // in OpenSSH it slows things down but only by a couple thousandths of a second.
+                        $this->_send_channel_packet($channel, chr(0));
+                    }
+                    */
+                    extract(unpack('Nlength', $this->_string_shift($response, 4)));
+                    $data = $this->_string_shift($response, $length);
+
+                    if ($channel == self::CHANNEL_AGENT_FORWARD) {
+                        $agent_response = $this->agent->_forward_data($data);
+                        if (!is_bool($agent_response)) {
+                            $this->_send_channel_packet($channel, $agent_response);
+                        }
+                        break;
+                    }
+
+                    if ($client_channel == $channel) {
+                        return $data;
+                    }
+                    if (!isset($this->channel_buffers[$channel])) {
+                        $this->channel_buffers[$channel] = array();
+                    }
+                    $this->channel_buffers[$channel][] = $data;
+                    break;
+                case NET_SSH2_MSG_CHANNEL_EXTENDED_DATA:
+                    /*
+                    if ($client_channel == self::CHANNEL_EXEC) {
+                        $this->_send_channel_packet($client_channel, chr(0));
+                    }
+                    */
+                    // currently, there's only one possible value for $data_type_code: NET_SSH2_EXTENDED_DATA_STDERR
+                    extract(unpack('Ndata_type_code/Nlength', $this->_string_shift($response, 8)));
+                    $data = $this->_string_shift($response, $length);
+                    $this->stdErrorLog.= $data;
+                    if ($skip_extended || $this->quiet_mode) {
+                        break;
+                    }
+                    if ($client_channel == $channel) {
+                        return $data;
+                    }
+                    if (!isset($this->channel_buffers[$channel])) {
+                        $this->channel_buffers[$channel] = array();
+                    }
+                    $this->channel_buffers[$channel][] = $data;
+                    break;
+                case NET_SSH2_MSG_CHANNEL_REQUEST:
+                    extract(unpack('Nlength', $this->_string_shift($response, 4)));
+                    $value = $this->_string_shift($response, $length);
+                    switch ($value) {
+                        case 'exit-signal':
+                            $this->_string_shift($response, 1);
+                            extract(unpack('Nlength', $this->_string_shift($response, 4)));
+                            $this->errors[] = 'SSH_MSG_CHANNEL_REQUEST (exit-signal): ' . $this->_string_shift($response, $length);
+                            $this->_string_shift($response, 1);
+                            extract(unpack('Nlength', $this->_string_shift($response, 4)));
+                            if ($length) {
+                                $this->errors[count($this->errors)].= "\r\n" . $this->_string_shift($response, $length);
+                            }
+
+                            $this->_send_binary_packet(pack('CN', NET_SSH2_MSG_CHANNEL_EOF, $this->server_channels[$client_channel]));
+                            $this->_send_binary_packet(pack('CN', NET_SSH2_MSG_CHANNEL_CLOSE, $this->server_channels[$channel]));
+
+                            $this->channel_status[$channel] = NET_SSH2_MSG_CHANNEL_EOF;
+
+                            break;
+                        case 'exit-status':
+                            extract(unpack('Cfalse/Nexit_status', $this->_string_shift($response, 5)));
+                            $this->exit_status = $exit_status;
+
+                            // "The client MAY ignore these messages."
+                            // -- http://tools.ietf.org/html/rfc4254#section-6.10
+
+                            break;
+                        default:
+                            // "Some systems may not implement signals, in which case they SHOULD ignore this message."
+                            //  -- http://tools.ietf.org/html/rfc4254#section-6.9
+                            break;
+                    }
+                    break;
+                case NET_SSH2_MSG_CHANNEL_CLOSE:
+                    $this->curTimeout = 0;
+
+                    if ($this->bitmap & self::MASK_SHELL) {
+                        $this->bitmap&= ~self::MASK_SHELL;
+                    }
+                    if ($this->channel_status[$channel] != NET_SSH2_MSG_CHANNEL_EOF) {
+                        $this->_send_binary_packet(pack('CN', NET_SSH2_MSG_CHANNEL_CLOSE, $this->server_channels[$channel]));
+                    }
+
+                    $this->channel_status[$channel] = NET_SSH2_MSG_CHANNEL_CLOSE;
+                    if ($client_channel == $channel) {
+                        return true;
+                    }
+                case NET_SSH2_MSG_CHANNEL_EOF:
+                    break;
+                default:
+                    user_error('Error reading channel data');
+                    return $this->_disconnect(NET_SSH2_DISCONNECT_BY_APPLICATION);
+            }
+        }
+    }
+
+    /**
+     * Sends Binary Packets
+     *
+     * See '6. Binary Packet Protocol' of rfc4253 for more info.
+     *
+     * @param string $data
+     * @param string $logged
+     * @see self::_get_binary_packet()
+     * @return bool
+     * @access private
+     */
+    function _send_binary_packet($data, $logged = null)
+    {
+        if (!is_resource($this->fsock) || feof($this->fsock)) {
+            user_error('Connection closed prematurely');
+            $this->bitmap = 0;
+            return false;
+        }
+
+        //if ($this->compress) {
+        //    // the -4 removes the checksum:
+        //    // http://php.net/function.gzcompress#57710
+        //    $data = substr(gzcompress($data), 0, -4);
+        //}
+
+        // 4 (packet length) + 1 (padding length) + 4 (minimal padding amount) == 9
+        $packet_length = strlen($data) + 9;
+        // round up to the nearest $this->encrypt_block_size
+        $packet_length+= (($this->encrypt_block_size - 1) * $packet_length) % $this->encrypt_block_size;
+        // subtracting strlen($data) is obvious - subtracting 5 is necessary because of packet_length and padding_length
+        $padding_length = $packet_length - strlen($data) - 5;
+        $padding = Random::string($padding_length);
+
+        // we subtract 4 from packet_length because the packet_length field isn't supposed to include itself
+        $packet = pack('NCa*', $packet_length - 4, $padding_length, $data . $padding);
+
+        $hmac = $this->hmac_create !== false ? $this->hmac_create->hash(pack('Na*', $this->send_seq_no, $packet)) : '';
+        $this->send_seq_no++;
+
+        if ($this->encrypt !== false) {
+            $packet = $this->encrypt->encrypt($packet);
+        }
+
+        $packet.= $hmac;
+
+        $start = microtime(true);
+        $result = strlen($packet) == fputs($this->fsock, $packet);
+        $stop = microtime(true);
+
+        if (defined('NET_SSH2_LOGGING')) {
+            $current = microtime(true);
+            $message_number = isset($this->message_numbers[ord($data[0])]) ? $this->message_numbers[ord($data[0])] : 'UNKNOWN (' . ord($data[0]) . ')';
+            $message_number = '-> ' . $message_number .
+                              ' (since last: ' . round($current - $this->last_packet, 4) . ', network: ' . round($stop - $start, 4) . 's)';
+            $this->_append_log($message_number, isset($logged) ? $logged : $data);
+            $this->last_packet = $current;
+        }
+
+        return $result;
+    }
+
+    /**
+     * Logs data packets
+     *
+     * Makes sure that only the last 1MB worth of packets will be logged
+     *
+     * @param string $data
+     * @access private
+     */
+    function _append_log($message_number, $message)
+    {
+        // remove the byte identifying the message type from all but the first two messages (ie. the identification strings)
+        if (strlen($message_number) > 2) {
+            $this->_string_shift($message);
+        }
+
+        switch (NET_SSH2_LOGGING) {
+            // useful for benchmarks
+            case self::LOG_SIMPLE:
+                $this->message_number_log[] = $message_number;
+                break;
+            // the most useful log for SSH2
+            case self::LOG_COMPLEX:
+                $this->message_number_log[] = $message_number;
+                $this->log_size+= strlen($message);
+                $this->message_log[] = $message;
+                while ($this->log_size > self::LOG_MAX_SIZE) {
+                    $this->log_size-= strlen(array_shift($this->message_log));
+                    array_shift($this->message_number_log);
+                }
+                break;
+            // dump the output out realtime; packets may be interspersed with non packets,
+            // passwords won't be filtered out and select other packets may not be correctly
+            // identified
+            case self::LOG_REALTIME:
+                switch (PHP_SAPI) {
+                    case 'cli':
+                        $start = $stop = "\r\n";
+                        break;
+                    default:
+                        $start = '<pre>';
+                        $stop = '</pre>';
+                }
+                echo $start . $this->_format_log(array($message), array($message_number)) . $stop;
+                @flush();
+                @ob_flush();
+                break;
+            // basically the same thing as self::LOG_REALTIME with the caveat that self::LOG_REALTIME_FILE
+            // needs to be defined and that the resultant log file will be capped out at self::LOG_MAX_SIZE.
+            // the earliest part of the log file is denoted by the first <<< START >>> and is not going to necessarily
+            // at the beginning of the file
+            case self::LOG_REALTIME_FILE:
+                if (!isset($this->realtime_log_file)) {
+                    // PHP doesn't seem to like using constants in fopen()
+                    $filename = self::LOG_REALTIME_FILENAME;
+                    $fp = fopen($filename, 'w');
+                    $this->realtime_log_file = $fp;
+                }
+                if (!is_resource($this->realtime_log_file)) {
+                    break;
+                }
+                $entry = $this->_format_log(array($message), array($message_number));
+                if ($this->realtime_log_wrap) {
+                    $temp = "<<< START >>>\r\n";
+                    $entry.= $temp;
+                    fseek($this->realtime_log_file, ftell($this->realtime_log_file) - strlen($temp));
+                }
+                $this->realtime_log_size+= strlen($entry);
+                if ($this->realtime_log_size > self::LOG_MAX_SIZE) {
+                    fseek($this->realtime_log_file, 0);
+                    $this->realtime_log_size = strlen($entry);
+                    $this->realtime_log_wrap = true;
+                }
+                fputs($this->realtime_log_file, $entry);
+        }
+    }
+
+    /**
+     * Sends channel data
+     *
+     * Spans multiple SSH_MSG_CHANNEL_DATAs if appropriate
+     *
+     * @param int $client_channel
+     * @param string $data
+     * @return bool
+     * @access private
+     */
+    function _send_channel_packet($client_channel, $data)
+    {
+        while (strlen($data)) {
+            if (!$this->window_size_client_to_server[$client_channel]) {
+                $this->bitmap^= self::MASK_WINDOW_ADJUST;
+                // using an invalid channel will let the buffers be built up for the valid channels
+                $this->_get_channel_packet(-1);
+                $this->bitmap^= self::MASK_WINDOW_ADJUST;
+            }
+
+            /* The maximum amount of data allowed is determined by the maximum
+               packet size for the channel, and the current window size, whichever
+               is smaller.
+                 -- http://tools.ietf.org/html/rfc4254#section-5.2 */
+            $max_size = min(
+                $this->packet_size_client_to_server[$client_channel],
+                $this->window_size_client_to_server[$client_channel]
+            );
+
+            $temp = $this->_string_shift($data, $max_size);
+            $packet = pack(
+                'CN2a*',
+                NET_SSH2_MSG_CHANNEL_DATA,
+                $this->server_channels[$client_channel],
+                strlen($temp),
+                $temp
+            );
+            $this->window_size_client_to_server[$client_channel]-= strlen($temp);
+            if (!$this->_send_binary_packet($packet)) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Closes and flushes a channel
+     *
+     * \phpseclib\Net\SSH2 doesn't properly close most channels.  For exec() channels are normally closed by the server
+     * and for SFTP channels are presumably closed when the client disconnects.  This functions is intended
+     * for SCP more than anything.
+     *
+     * @param int $client_channel
+     * @param bool $want_reply
+     * @return bool
+     * @access private
+     */
+    function _close_channel($client_channel, $want_reply = false)
+    {
+        // see http://tools.ietf.org/html/rfc4254#section-5.3
+
+        $this->_send_binary_packet(pack('CN', NET_SSH2_MSG_CHANNEL_EOF, $this->server_channels[$client_channel]));
+
+        if (!$want_reply) {
+            $this->_send_binary_packet(pack('CN', NET_SSH2_MSG_CHANNEL_CLOSE, $this->server_channels[$client_channel]));
+        }
+
+        $this->channel_status[$client_channel] = NET_SSH2_MSG_CHANNEL_CLOSE;
+
+        $this->curTimeout = 0;
+
+        while (!is_bool($this->_get_channel_packet($client_channel))) {
+        }
+
+        if ($want_reply) {
+            $this->_send_binary_packet(pack('CN', NET_SSH2_MSG_CHANNEL_CLOSE, $this->server_channels[$client_channel]));
+        }
+
+        if ($this->bitmap & self::MASK_SHELL) {
+            $this->bitmap&= ~self::MASK_SHELL;
+        }
+    }
+
+    /**
+     * Disconnect
+     *
+     * @param int $reason
+     * @return bool
+     * @access private
+     */
+    function _disconnect($reason)
+    {
+        if ($this->bitmap & self::MASK_CONNECTED) {
+            $data = pack('CNNa*Na*', NET_SSH2_MSG_DISCONNECT, $reason, 0, '', 0, '');
+            $this->_send_binary_packet($data);
+            $this->bitmap = 0;
+            fclose($this->fsock);
+            return false;
+        }
+    }
+
+    /**
+     * String Shift
+     *
+     * Inspired by array_shift
+     *
+     * @param string $string
+     * @param int $index
+     * @return string
+     * @access private
+     */
+    function _string_shift(&$string, $index = 1)
+    {
+        $substr = substr($string, 0, $index);
+        $string = substr($string, $index);
+        return $substr;
+    }
+
+    /**
+     * Define Array
+     *
+     * Takes any number of arrays whose indices are integers and whose values are strings and defines a bunch of
+     * named constants from it, using the value as the name of the constant and the index as the value of the constant.
+     * If any of the constants that would be defined already exists, none of the constants will be defined.
+     *
+     * @param array $array
+     * @access private
+     */
+    function _define_array()
+    {
+        $args = func_get_args();
+        foreach ($args as $arg) {
+            foreach ($arg as $key => $value) {
+                if (!defined($value)) {
+                    define($value, $key);
+                } else {
+                    break 2;
+                }
+            }
+        }
+    }
+
+    /**
+     * Returns a log of the packets that have been sent and received.
+     *
+     * Returns a string if NET_SSH2_LOGGING == self::LOG_COMPLEX, an array if NET_SSH2_LOGGING == self::LOG_SIMPLE and false if !defined('NET_SSH2_LOGGING')
+     *
+     * @access public
+     * @return array|false|string
+     */
+    function getLog()
+    {
+        if (!defined('NET_SSH2_LOGGING')) {
+            return false;
+        }
+
+        switch (NET_SSH2_LOGGING) {
+            case self::LOG_SIMPLE:
+                return $this->message_number_log;
+                break;
+            case self::LOG_COMPLEX:
+                return $this->_format_log($this->message_log, $this->message_number_log);
+                break;
+            default:
+                return false;
+        }
+    }
+
+    /**
+     * Formats a log for printing
+     *
+     * @param array $message_log
+     * @param array $message_number_log
+     * @access private
+     * @return string
+     */
+    function _format_log($message_log, $message_number_log)
+    {
+        $output = '';
+        for ($i = 0; $i < count($message_log); $i++) {
+            $output.= $message_number_log[$i] . "\r\n";
+            $current_log = $message_log[$i];
+            $j = 0;
+            do {
+                if (strlen($current_log)) {
+                    $output.= str_pad(dechex($j), 7, '0', STR_PAD_LEFT) . '0  ';
+                }
+                $fragment = $this->_string_shift($current_log, $this->log_short_width);
+                $hex = substr(preg_replace_callback('#.#s', array($this, '_format_log_helper'), $fragment), strlen($this->log_boundary));
+                // replace non ASCII printable characters with dots
+                // http://en.wikipedia.org/wiki/ASCII#ASCII_printable_characters
+                // also replace < with a . since < messes up the output on web browsers
+                $raw = preg_replace('#[^\x20-\x7E]|<#', '.', $fragment);
+                $output.= str_pad($hex, $this->log_long_width - $this->log_short_width, ' ') . $raw . "\r\n";
+                $j++;
+            } while (strlen($current_log));
+            $output.= "\r\n";
+        }
+
+        return $output;
+    }
+
+    /**
+     * Helper function for _format_log
+     *
+     * For use with preg_replace_callback()
+     *
+     * @param array $matches
+     * @access private
+     * @return string
+     */
+    function _format_log_helper($matches)
+    {
+        return $this->log_boundary . str_pad(dechex(ord($matches[0])), 2, '0', STR_PAD_LEFT);
+    }
+
+    /**
+     * Helper function for agent->_on_channel_open()
+     *
+     * Used when channels are created to inform agent
+     * of said channel opening. Must be called after
+     * channel open confirmation received
+     *
+     * @access private
+     */
+    function _on_channel_open()
+    {
+        if (isset($this->agent)) {
+            $this->agent->_on_channel_open($this);
+        }
+    }
+
+    /**
+     * Returns the first value of the intersection of two arrays or false if
+     * the intersection is empty. The order is defined by the first parameter.
+     *
+     * @param array $array1
+     * @param array $array2
+     * @return mixed False if intersection is empty, else intersected value.
+     * @access private
+     */
+    function _array_intersect_first($array1, $array2)
+    {
+        foreach ($array1 as $value) {
+            if (in_array($value, $array2)) {
+                return $value;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Returns all errors
+     *
+     * @return string[]
+     * @access public
+     */
+    function getErrors()
+    {
+        return $this->errors;
+    }
+
+    /**
+     * Returns the last error
+     *
+     * @return string
+     * @access public
+     */
+    function getLastError()
+    {
+        $count = count($this->errors);
+
+        if ($count > 0) {
+            return $this->errors[$count - 1];
+        }
+    }
+
+    /**
+     * Return the server identification.
+     *
+     * @return string
+     * @access public
+     */
+    function getServerIdentification()
+    {
+        $this->_connect();
+
+        return $this->server_identifier;
+    }
+
+    /**
+     * Return a list of the key exchange algorithms the server supports.
+     *
+     * @return array
+     * @access public
+     */
+    function getKexAlgorithms()
+    {
+        $this->_connect();
+
+        return $this->kex_algorithms;
+    }
+
+    /**
+     * Return a list of the host key (public key) algorithms the server supports.
+     *
+     * @return array
+     * @access public
+     */
+    function getServerHostKeyAlgorithms()
+    {
+        $this->_connect();
+
+        return $this->server_host_key_algorithms;
+    }
+
+    /**
+     * Return a list of the (symmetric key) encryption algorithms the server supports, when receiving stuff from the client.
+     *
+     * @return array
+     * @access public
+     */
+    function getEncryptionAlgorithmsClient2Server()
+    {
+        $this->_connect();
+
+        return $this->encryption_algorithms_client_to_server;
+    }
+
+    /**
+     * Return a list of the (symmetric key) encryption algorithms the server supports, when sending stuff to the client.
+     *
+     * @return array
+     * @access public
+     */
+    function getEncryptionAlgorithmsServer2Client()
+    {
+        $this->_connect();
+
+        return $this->encryption_algorithms_server_to_client;
+    }
+
+    /**
+     * Return a list of the MAC algorithms the server supports, when receiving stuff from the client.
+     *
+     * @return array
+     * @access public
+     */
+    function getMACAlgorithmsClient2Server()
+    {
+        $this->_connect();
+
+        return $this->mac_algorithms_client_to_server;
+    }
+
+    /**
+     * Return a list of the MAC algorithms the server supports, when sending stuff to the client.
+     *
+     * @return array
+     * @access public
+     */
+    function getMACAlgorithmsServer2Client()
+    {
+        $this->_connect();
+
+        return $this->mac_algorithms_server_to_client;
+    }
+
+    /**
+     * Return a list of the compression algorithms the server supports, when receiving stuff from the client.
+     *
+     * @return array
+     * @access public
+     */
+    function getCompressionAlgorithmsClient2Server()
+    {
+        $this->_connect();
+
+        return $this->compression_algorithms_client_to_server;
+    }
+
+    /**
+     * Return a list of the compression algorithms the server supports, when sending stuff to the client.
+     *
+     * @return array
+     * @access public
+     */
+    function getCompressionAlgorithmsServer2Client()
+    {
+        $this->_connect();
+
+        return $this->compression_algorithms_server_to_client;
+    }
+
+    /**
+     * Return a list of the languages the server supports, when sending stuff to the client.
+     *
+     * @return array
+     * @access public
+     */
+    function getLanguagesServer2Client()
+    {
+        $this->_connect();
+
+        return $this->languages_server_to_client;
+    }
+
+    /**
+     * Return a list of the languages the server supports, when receiving stuff from the client.
+     *
+     * @return array
+     * @access public
+     */
+    function getLanguagesClient2Server()
+    {
+        $this->_connect();
+
+        return $this->languages_client_to_server;
     }
 
     /**
@@ -5171,8 +3964,9 @@ class SSH2
      * authentication may be relevant for getting legal protection."
      *
      * @return string
+     * @access public
      */
-    public function getBannerMessage()
+    function getBannerMessage()
     {
         return $this->banner_message;
     }
@@ -5183,95 +3977,151 @@ class SSH2
      * Caching this the first time you connect to a server and checking the result on subsequent connections
      * is recommended.  Returns false if the server signature is not signed correctly with the public host key.
      *
-     * @return string|false
-     * @throws \RuntimeException on badly formatted keys
-     * @throws \phpseclib3\Exception\NoSupportedAlgorithmsException when the key isn't in a supported format
+     * @return mixed
+     * @access public
      */
-    public function getServerPublicHostKey()
+    function getServerPublicHostKey()
     {
         if (!($this->bitmap & self::MASK_CONSTRUCTOR)) {
-            $this->connect();
+            if (!$this->_connect()) {
+                return false;
+            }
         }
 
         $signature = $this->signature;
-        $server_public_host_key = base64_encode($this->server_public_host_key);
+        $server_public_host_key = $this->server_public_host_key;
+
+        extract(unpack('Nlength', $this->_string_shift($server_public_host_key, 4)));
+        $this->_string_shift($server_public_host_key, $length);
 
         if ($this->signature_validated) {
             return $this->bitmap ?
-                $this->signature_format . ' ' . $server_public_host_key :
+                $this->signature_format . ' ' . base64_encode($this->server_public_host_key) :
                 false;
         }
 
         $this->signature_validated = true;
 
         switch ($this->signature_format) {
-            case 'ssh-ed25519':
-            case 'ecdsa-sha2-nistp256':
-            case 'ecdsa-sha2-nistp384':
-            case 'ecdsa-sha2-nistp521':
-                $key = EC::loadFormat('OpenSSH', $server_public_host_key)
-                    ->withSignatureFormat('SSH2');
-                switch ($this->signature_format) {
-                    case 'ssh-ed25519':
-                        $hash = 'sha512';
-                        break;
-                    case 'ecdsa-sha2-nistp256':
-                        $hash = 'sha256';
-                        break;
-                    case 'ecdsa-sha2-nistp384':
-                        $hash = 'sha384';
-                        break;
-                    case 'ecdsa-sha2-nistp521':
-                        $hash = 'sha512';
-                }
-                $key = $key->withHash($hash);
-                break;
             case 'ssh-dss':
-                $key = DSA::loadFormat('OpenSSH', $server_public_host_key)
-                    ->withSignatureFormat('SSH2')
-                    ->withHash('sha1');
+                $zero = new BigInteger();
+
+                $temp = unpack('Nlength', $this->_string_shift($server_public_host_key, 4));
+                $p = new BigInteger($this->_string_shift($server_public_host_key, $temp['length']), -256);
+
+                $temp = unpack('Nlength', $this->_string_shift($server_public_host_key, 4));
+                $q = new BigInteger($this->_string_shift($server_public_host_key, $temp['length']), -256);
+
+                $temp = unpack('Nlength', $this->_string_shift($server_public_host_key, 4));
+                $g = new BigInteger($this->_string_shift($server_public_host_key, $temp['length']), -256);
+
+                $temp = unpack('Nlength', $this->_string_shift($server_public_host_key, 4));
+                $y = new BigInteger($this->_string_shift($server_public_host_key, $temp['length']), -256);
+
+                /* The value for 'dss_signature_blob' is encoded as a string containing
+                   r, followed by s (which are 160-bit integers, without lengths or
+                   padding, unsigned, and in network byte order). */
+                $temp = unpack('Nlength', $this->_string_shift($signature, 4));
+                if ($temp['length'] != 40) {
+                    user_error('Invalid signature');
+                    return $this->_disconnect(NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED);
+                }
+
+                $r = new BigInteger($this->_string_shift($signature, 20), 256);
+                $s = new BigInteger($this->_string_shift($signature, 20), 256);
+
+                switch (true) {
+                    case $r->equals($zero):
+                    case $r->compare($q) >= 0:
+                    case $s->equals($zero):
+                    case $s->compare($q) >= 0:
+                        user_error('Invalid signature');
+                        return $this->_disconnect(NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED);
+                }
+
+                $w = $s->modInverse($q);
+
+                $u1 = $w->multiply(new BigInteger(sha1($this->exchange_hash), 16));
+                list(, $u1) = $u1->divide($q);
+
+                $u2 = $w->multiply($r);
+                list(, $u2) = $u2->divide($q);
+
+                $g = $g->modPow($u1, $p);
+                $y = $y->modPow($u2, $p);
+
+                $v = $g->multiply($y);
+                list(, $v) = $v->divide($p);
+                list(, $v) = $v->divide($q);
+
+                if (!$v->equals($r)) {
+                    user_error('Bad server signature');
+                    return $this->_disconnect(NET_SSH2_DISCONNECT_HOST_KEY_NOT_VERIFIABLE);
+                }
+
                 break;
             case 'ssh-rsa':
-            case 'rsa-sha2-256':
-            case 'rsa-sha2-512':
-                // could be ssh-rsa, rsa-sha2-256, rsa-sha2-512
-                // we don't check here because we already checked in key_exchange
-                // some signatures have the type embedded within the message and some don't
-                list(, $signature) = Strings::unpackSSH2('ss', $signature);
+                $temp = unpack('Nlength', $this->_string_shift($server_public_host_key, 4));
+                $e = new BigInteger($this->_string_shift($server_public_host_key, $temp['length']), -256);
 
-                $key = RSA::loadFormat('OpenSSH', $server_public_host_key)
-                    ->withPadding(RSA::SIGNATURE_PKCS1);
-                switch ($this->signature_format) {
-                    case 'rsa-sha2-512':
-                        $hash = 'sha512';
-                        break;
-                    case 'rsa-sha2-256':
-                        $hash = 'sha256';
-                        break;
-                    //case 'ssh-rsa':
-                    default:
-                        $hash = 'sha1';
+                $temp = unpack('Nlength', $this->_string_shift($server_public_host_key, 4));
+                $rawN = $this->_string_shift($server_public_host_key, $temp['length']);
+                $n = new BigInteger($rawN, -256);
+                $nLength = strlen(ltrim($rawN, "\0"));
+
+                /*
+                $temp = unpack('Nlength', $this->_string_shift($signature, 4));
+                $signature = $this->_string_shift($signature, $temp['length']);
+
+                $rsa = new RSA();
+                $rsa->setSignatureMode(RSA::SIGNATURE_PKCS1);
+                $rsa->loadKey(array('e' => $e, 'n' => $n), RSA::PUBLIC_FORMAT_RAW);
+                if (!$rsa->verify($this->exchange_hash, $signature)) {
+                    user_error('Bad server signature');
+                    return $this->_disconnect(NET_SSH2_DISCONNECT_HOST_KEY_NOT_VERIFIABLE);
+                }
+                */
+
+                $temp = unpack('Nlength', $this->_string_shift($signature, 4));
+                $s = new BigInteger($this->_string_shift($signature, $temp['length']), 256);
+
+                // validate an RSA signature per "8.2 RSASSA-PKCS1-v1_5", "5.2.2 RSAVP1", and "9.1 EMSA-PSS" in the
+                // following URL:
+                // ftp://ftp.rsasecurity.com/pub/pkcs/pkcs-1/pkcs-1v2-1.pdf
+
+                // also, see SSHRSA.c (rsa2_verifysig) in PuTTy's source.
+
+                if ($s->compare(new BigInteger()) < 0 || $s->compare($n->subtract(new BigInteger(1))) > 0) {
+                    user_error('Invalid signature');
+                    return $this->_disconnect(NET_SSH2_DISCONNECT_KEY_EXCHANGE_FAILED);
+                }
+
+                $s = $s->modPow($e, $n);
+                $s = $s->toBytes();
+
+                $h = pack('N4H*', 0x00302130, 0x0906052B, 0x0E03021A, 0x05000414, sha1($this->exchange_hash));
+                $h = chr(0x01) . str_repeat(chr(0xFF), $nLength - 2 - strlen($h)) . $h;
+
+                if ($s != $h) {
+                    user_error('Bad server signature');
+                    return $this->_disconnect(NET_SSH2_DISCONNECT_HOST_KEY_NOT_VERIFIABLE);
                 }
-                $key = $key->withHash($hash);
                 break;
             default:
-                $this->disconnect_helper(NET_SSH2_DISCONNECT_HOST_KEY_NOT_VERIFIABLE);
-                throw new NoSupportedAlgorithmsException('Unsupported signature format');
+                user_error('Unsupported signature format');
+                return $this->_disconnect(NET_SSH2_DISCONNECT_HOST_KEY_NOT_VERIFIABLE);
         }
 
-        if (!$key->verify($this->exchange_hash, $signature)) {
-            return $this->disconnect_helper(NET_SSH2_DISCONNECT_HOST_KEY_NOT_VERIFIABLE);
-        };
-
-        return $this->signature_format . ' ' . $server_public_host_key;
+        return $this->signature_format . ' ' . base64_encode($this->server_public_host_key);
     }
 
     /**
      * Returns the exit status of an SSH command or false.
      *
      * @return false|int
+     * @access public
      */
-    public function getExitStatus()
+    function getExitStatus()
     {
         if (is_null($this->exit_status)) {
             return false;
@@ -5283,8 +4133,9 @@ class SSH2
      * Returns the number of columns for the terminal window size.
      *
      * @return int
+     * @access public
      */
-    public function getWindowColumns()
+    function getWindowColumns()
     {
         return $this->windowColumns;
     }
@@ -5293,8 +4144,9 @@ class SSH2
      * Returns the number of rows for the terminal window size.
      *
      * @return int
+     * @access public
      */
-    public function getWindowRows()
+    function getWindowRows()
     {
         return $this->windowRows;
     }
@@ -5303,8 +4155,9 @@ class SSH2
      * Sets the number of columns for the terminal window size.
      *
      * @param int $value
+     * @access public
      */
-    public function setWindowColumns($value)
+    function setWindowColumns($value)
     {
         $this->windowColumns = $value;
     }
@@ -5313,8 +4166,9 @@ class SSH2
      * Sets the number of rows for the terminal window size.
      *
      * @param int $value
+     * @access public
      */
-    public function setWindowRows($value)
+    function setWindowRows($value)
     {
         $this->windowRows = $value;
     }
@@ -5324,113 +4178,11 @@ class SSH2
      *
      * @param int $columns
      * @param int $rows
+     * @access public
      */
-    public function setWindowSize($columns = 80, $rows = 24)
+    function setWindowSize($columns = 80, $rows = 24)
     {
         $this->windowColumns = $columns;
         $this->windowRows = $rows;
     }
-
-    /**
-     * To String Magic Method
-     *
-     * @return string
-     */
-    #[\ReturnTypeWillChange]
-    public function __toString()
-    {
-        return $this->getResourceId();
-    }
-
-    /**
-     * Get Resource ID
-     *
-     * We use {} because that symbols should not be in URL according to
-     * {@link http://tools.ietf.org/html/rfc3986#section-2 RFC}.
-     * It will safe us from any conflicts, because otherwise regexp will
-     * match all alphanumeric domains.
-     *
-     * @return string
-     */
-    public function getResourceId()
-    {
-        return '{' . spl_object_hash($this) . '}';
-    }
-
-    /**
-     * Return existing connection
-     *
-     * @param string $id
-     *
-     * @return bool|SSH2 will return false if no such connection
-     */
-    public static function getConnectionByResourceId($id)
-    {
-        if (isset(self::$connections[$id])) {
-            return self::$connections[$id] instanceof \WeakReference ? self::$connections[$id]->get() : self::$connections[$id];
-        }
-        return false;
-    }
-
-    /**
-     * Return all excising connections
-     *
-     * @return array<string, SSH2>
-     */
-    public static function getConnections()
-    {
-        if (!class_exists('WeakReference')) {
-            /** @var array<string, SSH2> */
-            return self::$connections;
-        }
-        $temp = [];
-        foreach (self::$connections as $key => $ref) {
-            $temp[$key] = $ref->get();
-        }
-        return $temp;
-    }
-
-    /*
-     * Update packet types in log history
-     *
-     * @param string $old
-     * @param string $new
-     */
-    private function updateLogHistory($old, $new)
-    {
-        if (defined('NET_SSH2_LOGGING') && NET_SSH2_LOGGING == self::LOG_COMPLEX) {
-            $this->message_number_log[count($this->message_number_log) - 1] = str_replace(
-                $old,
-                $new,
-                $this->message_number_log[count($this->message_number_log) - 1]
-            );
-        }
-    }
-
-    /**
-     * Return the list of authentication methods that may productively continue authentication.
-     *
-     * @see https://tools.ietf.org/html/rfc4252#section-5.1
-     * @return array|null
-     */
-    public function getAuthMethodsToContinue()
-    {
-        return $this->auth_methods_to_continue;
-    }
-
-    /**
-     * Enables "smart" multi-factor authentication (MFA)
-     */
-    public function enableSmartMFA()
-    {
-        $this->smartMFA = true;
-    }
-
-    /**
-     * Disables "smart" multi-factor authentication (MFA)
-     */
-    public function disableSmartMFA()
-    {
-        $this->smartMFA = false;
-    }
 }
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/System/SSH/Agent.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/System/SSH/Agent.php
index 26ca3227..a4ff0549 100644
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/System/SSH/Agent.php
+++ b/securemail/vendor/phpseclib/phpseclib/phpseclib/System/SSH/Agent.php
@@ -3,8 +3,6 @@
 /**
  * Pure-PHP ssh-agent client.
  *
- * {@internal See http://api.libssh.org/rfc/PROTOCOL.agent}
- *
  * PHP version 5
  *
  * Here are some examples of how to use this library:
@@ -12,9 +10,9 @@
  * <?php
  *    include 'vendor/autoload.php';
  *
- *    $agent = new \phpseclib3\System\SSH\Agent();
+ *    $agent = new \phpseclib\System\SSH\Agent();
  *
- *    $ssh = new \phpseclib3\Net\SSH2('www.domain.tld');
+ *    $ssh = new \phpseclib\Net\SSH2('www.domain.tld');
  *    if (!$ssh->login('username', $agent)) {
  *        exit('Login Failed');
  *    }
@@ -24,34 +22,36 @@
  * ?>
  * </code>
  *
+ * @category  System
+ * @package   SSH\Agent
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2014 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
  * @link      http://phpseclib.sourceforge.net
+ * @internal  See http://api.libssh.org/rfc/PROTOCOL.agent
  */
 
-namespace phpseclib3\System\SSH;
+namespace phpseclib\System\SSH;
 
-use phpseclib3\Common\Functions\Strings;
-use phpseclib3\Crypt\PublicKeyLoader;
-use phpseclib3\Crypt\RSA;
-use phpseclib3\Exception\BadConfigurationException;
-use phpseclib3\Net\SSH2;
-use phpseclib3\System\SSH\Agent\Identity;
+use phpseclib\Crypt\RSA;
+use phpseclib\System\SSH\Agent\Identity;
 
 /**
  * Pure-PHP ssh-agent client identity factory
  *
- * requestIdentities() method pumps out \phpseclib3\System\SSH\Agent\Identity objects
+ * requestIdentities() method pumps out \phpseclib\System\SSH\Agent\Identity objects
  *
+ * @package SSH\Agent
  * @author  Jim Wigginton <terrafrost@php.net>
+ * @access  internal
  */
 class Agent
 {
-    use Common\Traits\ReadBytes;
-
-    // Message numbers
-
+    /**#@+
+     * Message numbers
+     *
+     * @access private
+     */
     // to request SSH1 keys you have to use SSH_AGENTC_REQUEST_RSA_IDENTITIES (1)
     const SSH_AGENTC_REQUEST_IDENTITIES = 11;
     // this is the SSH2 response; the SSH1 response is SSH_AGENT_RSA_IDENTITIES_ANSWER (2).
@@ -60,15 +60,20 @@ class Agent
     const SSH_AGENTC_SIGN_REQUEST = 13;
     // the SSH1 response is SSH_AGENT_RSA_RESPONSE (4)
     const SSH_AGENT_SIGN_RESPONSE = 14;
+    /**#@-*/
 
-    // Agent forwarding status
-
+    /**@+
+     * Agent forwarding status
+     *
+     * @access private
+     */
     // no forwarding requested and not active
     const FORWARD_NONE = 0;
     // request agent forwarding when opportune
     const FORWARD_REQUEST = 1;
     // forwarding has been request and is active
     const FORWARD_ACTIVE = 2;
+    /**#@-*/
 
     /**
      * Unused
@@ -79,70 +84,56 @@ class Agent
      * Socket Resource
      *
      * @var resource
+     * @access private
      */
-    private $fsock;
+    var $fsock;
 
     /**
      * Agent forwarding status
      *
-     * @var int
+     * @access private
      */
-    private $forward_status = self::FORWARD_NONE;
+    var $forward_status = self::FORWARD_NONE;
 
     /**
      * Buffer for accumulating forwarded authentication
      * agent data arriving on SSH data channel destined
      * for agent unix socket
      *
-     * @var string
+     * @access private
      */
-    private $socket_buffer = '';
+    var $socket_buffer = '';
 
     /**
      * Tracking the number of bytes we are expecting
      * to arrive for the agent socket on the SSH data
      * channel
-     *
-     * @var int
      */
-    private $expected_bytes = 0;
+    var $expected_bytes = 0;
 
     /**
      * Default Constructor
      *
-     * @return \phpseclib3\System\SSH\Agent
-     * @throws \phpseclib3\Exception\BadConfigurationException if SSH_AUTH_SOCK cannot be found
-     * @throws \RuntimeException on connection errors
+     * @return \phpseclib\System\SSH\Agent
+     * @access public
      */
-    public function __construct($address = null)
+    function __construct()
     {
-        if (!$address) {
-            switch (true) {
-                case isset($_SERVER['SSH_AUTH_SOCK']):
-                    $address = $_SERVER['SSH_AUTH_SOCK'];
-                    break;
-                case isset($_ENV['SSH_AUTH_SOCK']):
-                    $address = $_ENV['SSH_AUTH_SOCK'];
-                    break;
-                default:
-                    throw new BadConfigurationException('SSH_AUTH_SOCK not found');
-            }
+        switch (true) {
+            case isset($_SERVER['SSH_AUTH_SOCK']):
+                $address = $_SERVER['SSH_AUTH_SOCK'];
+                break;
+            case isset($_ENV['SSH_AUTH_SOCK']):
+                $address = $_ENV['SSH_AUTH_SOCK'];
+                break;
+            default:
+                user_error('SSH_AUTH_SOCK not found');
+                return false;
         }
 
-        if (in_array('unix', stream_get_transports())) {
-            $this->fsock = fsockopen('unix://' . $address, 0, $errno, $errstr);
-            if (!$this->fsock) {
-                throw new \RuntimeException("Unable to connect to ssh-agent (Error $errno: $errstr)");
-            }
-        } else {
-            if (substr($address, 0, 9) != '\\\\.\\pipe\\' || strpos(substr($address, 9), '\\') !== false) {
-                throw new \RuntimeException('Address is not formatted as a named pipe should be');
-            }
-
-            $this->fsock = fopen($address, 'r+b');
-            if (!$this->fsock) {
-                throw new \RuntimeException('Unable to open address');
-            }
+        $this->fsock = fsockopen('unix://' . $address, 0, $errno, $errstr);
+        if (!$this->fsock) {
+            user_error("Unable to connect to ssh-agent (Error $errno: $errstr)");
         }
     }
 
@@ -150,49 +141,54 @@ class Agent
      * Request Identities
      *
      * See "2.5.2 Requesting a list of protocol 2 keys"
-     * Returns an array containing zero or more \phpseclib3\System\SSH\Agent\Identity objects
+     * Returns an array containing zero or more \phpseclib\System\SSH\Agent\Identity objects
      *
      * @return array
-     * @throws \RuntimeException on receipt of unexpected packets
+     * @access public
      */
-    public function requestIdentities()
+    function requestIdentities()
     {
         if (!$this->fsock) {
-            return [];
+            return array();
         }
 
         $packet = pack('NC', 1, self::SSH_AGENTC_REQUEST_IDENTITIES);
         if (strlen($packet) != fputs($this->fsock, $packet)) {
-            throw new \RuntimeException('Connection closed while requesting identities');
+            user_error('Connection closed while requesting identities');
         }
 
-        $length = current(unpack('N', $this->readBytes(4)));
-        $packet = $this->readBytes($length);
-
-        list($type, $keyCount) = Strings::unpackSSH2('CN', $packet);
+        $length = current(unpack('N', fread($this->fsock, 4)));
+        $type = ord(fread($this->fsock, 1));
         if ($type != self::SSH_AGENT_IDENTITIES_ANSWER) {
-            throw new \RuntimeException('Unable to request identities');
+            user_error('Unable to request identities');
         }
 
-        $identities = [];
+        $identities = array();
+        $keyCount = current(unpack('N', fread($this->fsock, 4)));
         for ($i = 0; $i < $keyCount; $i++) {
-            list($key_blob, $comment) = Strings::unpackSSH2('ss', $packet);
-            $temp = $key_blob;
-            list($key_type) = Strings::unpackSSH2('s', $temp);
+            $length = current(unpack('N', fread($this->fsock, 4)));
+            $key_blob = fread($this->fsock, $length);
+            $key_str = 'ssh-rsa ' . base64_encode($key_blob);
+            $length = current(unpack('N', fread($this->fsock, 4)));
+            if ($length) {
+                $key_str.= ' ' . fread($this->fsock, $length);
+            }
+            $length = current(unpack('N', substr($key_blob, 0, 4)));
+            $key_type = substr($key_blob, 4, $length);
             switch ($key_type) {
                 case 'ssh-rsa':
+                    $key = new RSA();
+                    $key->loadKey($key_str);
+                    break;
                 case 'ssh-dss':
-                case 'ssh-ed25519':
-                case 'ecdsa-sha2-nistp256':
-                case 'ecdsa-sha2-nistp384':
-                case 'ecdsa-sha2-nistp521':
-                    $key = PublicKeyLoader::load($key_type . ' ' . base64_encode($key_blob));
+                    // not currently supported
+                    break;
             }
             // resources are passed by reference by default
             if (isset($key)) {
-                $identity = (new Identity($this->fsock))
-                    ->withPublicKey($key)
-                    ->withPublicKeyBlob($key_blob);
+                $identity = new Identity($this->fsock);
+                $identity->setPublicKey($key);
+                $identity->setPublicKeyBlob($key_blob);
                 $identities[] = $identity;
                 unset($key);
             }
@@ -205,9 +201,11 @@ class Agent
      * Signal that agent forwarding should
      * be requested when a channel is opened
      *
-     * @return void
+     * @param Net_SSH2 $ssh
+     * @return bool
+     * @access public
      */
-    public function startSSHForwarding()
+    function startSSHForwarding($ssh)
     {
         if ($this->forward_status == self::FORWARD_NONE) {
             $this->forward_status = self::FORWARD_REQUEST;
@@ -217,15 +215,38 @@ class Agent
     /**
      * Request agent forwarding of remote server
      *
-     * @param \phpseclib3\Net\SSH2 $ssh
+     * @param Net_SSH2 $ssh
      * @return bool
+     * @access private
      */
-    private function request_forwarding(SSH2 $ssh)
+    function _request_forwarding($ssh)
     {
-        if (!$ssh->requestAgentForwarding()) {
+        $request_channel = $ssh->_get_open_channel();
+        if ($request_channel === false) {
             return false;
         }
 
+        $packet = pack(
+            'CNNa*C',
+            NET_SSH2_MSG_CHANNEL_REQUEST,
+            $ssh->server_channels[$request_channel],
+            strlen('auth-agent-req@openssh.com'),
+            'auth-agent-req@openssh.com',
+            1
+        );
+
+        $ssh->channel_status[$request_channel] = NET_SSH2_MSG_CHANNEL_REQUEST;
+
+        if (!$ssh->_send_binary_packet($packet)) {
+            return false;
+        }
+
+        $response = $ssh->_get_channel_packet($request_channel);
+        if ($response === false) {
+            return false;
+        }
+
+        $ssh->channel_status[$request_channel] = NET_SSH2_MSG_CHANNEL_OPEN;
         $this->forward_status = self::FORWARD_ACTIVE;
 
         return true;
@@ -238,12 +259,13 @@ class Agent
      * open to give the SSH Agent an opportunity
      * to take further action. i.e. request agent forwarding
      *
-     * @param \phpseclib3\Net\SSH2 $ssh
+     * @param Net_SSH2 $ssh
+     * @access private
      */
-    public function registerChannelOpen(SSH2 $ssh)
+    function _on_channel_open($ssh)
     {
         if ($this->forward_status == self::FORWARD_REQUEST) {
-            $this->request_forwarding($ssh);
+            $this->_request_forwarding($ssh);
         }
     }
 
@@ -251,13 +273,13 @@ class Agent
      * Forward data to SSH Agent and return data reply
      *
      * @param string $data
-     * @return string Data from SSH Agent
-     * @throws \RuntimeException on connection errors
+     * @return data from SSH Agent
+     * @access private
      */
-    public function forwardData($data)
+    function _forward_data($data)
     {
         if ($this->expected_bytes > 0) {
-            $this->socket_buffer .= $data;
+            $this->socket_buffer.= $data;
             $this->expected_bytes -= strlen($data);
         } else {
             $agent_data_bytes = current(unpack('N', $data));
@@ -270,15 +292,15 @@ class Agent
         }
 
         if (strlen($this->socket_buffer) != fwrite($this->fsock, $this->socket_buffer)) {
-            throw new \RuntimeException('Connection closed attempting to forward data to SSH agent');
+            user_error('Connection closed attempting to forward data to SSH agent');
         }
 
         $this->socket_buffer = '';
         $this->expected_bytes = 0;
 
-        $agent_reply_bytes = current(unpack('N', $this->readBytes(4)));
+        $agent_reply_bytes = current(unpack('N', fread($this->fsock, 4)));
 
-        $agent_reply_data = $this->readBytes($agent_reply_bytes);
+        $agent_reply_data = fread($this->fsock, $agent_reply_bytes);
         $agent_reply_data = current(unpack('a*', $agent_reply_data));
 
         return pack('Na*', $agent_reply_bytes, $agent_reply_data);
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/System/SSH/Agent/Identity.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/System/SSH/Agent/Identity.php
index 653e8ea5..b8cc6cde 100644
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/System/SSH/Agent/Identity.php
+++ b/securemail/vendor/phpseclib/phpseclib/phpseclib/System/SSH/Agent/Identity.php
@@ -1,102 +1,72 @@
 <?php
-
 /**
  * Pure-PHP ssh-agent client.
  *
- * {@internal See http://api.libssh.org/rfc/PROTOCOL.agent}
- *
  * PHP version 5
  *
+ * @category  System
+ * @package   SSH\Agent
  * @author    Jim Wigginton <terrafrost@php.net>
  * @copyright 2009 Jim Wigginton
  * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
  * @link      http://phpseclib.sourceforge.net
+ * @internal  See http://api.libssh.org/rfc/PROTOCOL.agent
  */
 
-namespace phpseclib3\System\SSH\Agent;
+namespace phpseclib\System\SSH\Agent;
 
-use phpseclib3\Common\Functions\Strings;
-use phpseclib3\Crypt\Common\PrivateKey;
-use phpseclib3\Crypt\Common\PublicKey;
-use phpseclib3\Crypt\DSA;
-use phpseclib3\Crypt\EC;
-use phpseclib3\Crypt\RSA;
-use phpseclib3\Exception\UnsupportedAlgorithmException;
-use phpseclib3\System\SSH\Agent;
-use phpseclib3\System\SSH\Common\Traits\ReadBytes;
+use phpseclib\System\SSH\Agent;
 
 /**
  * Pure-PHP ssh-agent client identity object
  *
- * Instantiation should only be performed by \phpseclib3\System\SSH\Agent class.
- * This could be thought of as implementing an interface that phpseclib3\Crypt\RSA
+ * Instantiation should only be performed by \phpseclib\System\SSH\Agent class.
+ * This could be thought of as implementing an interface that phpseclib\Crypt\RSA
  * implements. ie. maybe a Net_SSH_Auth_PublicKey interface or something.
  * The methods in this interface would be getPublicKey and sign since those are the
  * methods phpseclib looks for to perform public key authentication.
  *
+ * @package SSH\Agent
  * @author  Jim Wigginton <terrafrost@php.net>
- * @internal
+ * @access  internal
  */
-class Identity implements PrivateKey
+class Identity
 {
-    use ReadBytes;
-
-    // Signature Flags
-    // See https://tools.ietf.org/html/draft-miller-ssh-agent-00#section-5.3
-    const SSH_AGENT_RSA2_256 = 2;
-    const SSH_AGENT_RSA2_512 = 4;
-
     /**
      * Key Object
      *
-     * @var PublicKey
+     * @var \phpseclib\Crypt\RSA
+     * @access private
      * @see self::getPublicKey()
      */
-    private $key;
+    var $key;
 
     /**
      * Key Blob
      *
      * @var string
+     * @access private
      * @see self::sign()
      */
-    private $key_blob;
+    var $key_blob;
 
     /**
      * Socket Resource
      *
      * @var resource
+     * @access private
      * @see self::sign()
      */
-    private $fsock;
-
-    /**
-     * Signature flags
-     *
-     * @var int
-     * @see self::sign()
-     * @see self::setHash()
-     */
-    private $flags = 0;
-
-    /**
-     * Curve Aliases
-     *
-     * @var array
-     */
-    private static $curveAliases = [
-        'secp256r1' => 'nistp256',
-        'secp384r1' => 'nistp384',
-        'secp521r1' => 'nistp521',
-        'Ed25519' => 'Ed25519'
-    ];
+    var $fsock;
 
     /**
      * Default Constructor.
      *
      * @param resource $fsock
+     * @return \phpseclib\System\SSH\Agent\Identity
+     * @access private
      */
-    public function __construct($fsock)
+    function __construct($fsock)
     {
         $this->fsock = $fsock;
     }
@@ -104,36 +74,29 @@ class Identity implements PrivateKey
     /**
      * Set Public Key
      *
-     * Called by \phpseclib3\System\SSH\Agent::requestIdentities()
+     * Called by \phpseclib\System\SSH\Agent::requestIdentities()
      *
-     * @param \phpseclib3\Crypt\Common\PublicKey $key
+     * @param \phpseclib\Crypt\RSA $key
+     * @access private
      */
-    public function withPublicKey(PublicKey $key)
+    function setPublicKey($key)
     {
-        if ($key instanceof EC) {
-            if (is_array($key->getCurve()) || !isset(self::$curveAliases[$key->getCurve()])) {
-                throw new UnsupportedAlgorithmException('The only supported curves are nistp256, nistp384, nistp512 and Ed25519');
-            }
-        }
-
-        $new = clone $this;
-        $new->key = $key;
-        return $new;
+        $this->key = $key;
+        $this->key->setPublicKey();
     }
 
     /**
      * Set Public Key
      *
-     * Called by \phpseclib3\System\SSH\Agent::requestIdentities(). The key blob could be extracted from $this->key
+     * Called by \phpseclib\System\SSH\Agent::requestIdentities(). The key blob could be extracted from $this->key
      * but this saves a small amount of computation.
      *
      * @param string $key_blob
+     * @access private
      */
-    public function withPublicKeyBlob($key_blob)
+    function setPublicKeyBlob($key_blob)
     {
-        $new = clone $this;
-        $new->key_blob = $key_blob;
-        return $new;
+        $this->key_blob = $key_blob;
     }
 
     /**
@@ -141,116 +104,26 @@ class Identity implements PrivateKey
      *
      * Wrapper for $this->key->getPublicKey()
      *
-     * @param string $type optional
+     * @param int $format optional
      * @return mixed
+     * @access public
      */
-    public function getPublicKey($type = 'PKCS8')
+    function getPublicKey($format = null)
     {
-        return $this->key;
+        return !isset($format) ? $this->key->getPublicKey() : $this->key->getPublicKey($format);
     }
 
     /**
-     * Sets the hash
+     * Set Signature Mode
      *
-     * @param string $hash
+     * Doesn't do anything as ssh-agent doesn't let you pick and choose the signature mode. ie.
+     * ssh-agent's only supported mode is \phpseclib\Crypt\RSA::SIGNATURE_PKCS1
+     *
+     * @param int $mode
+     * @access public
      */
-    public function withHash($hash)
+    function setSignatureMode($mode)
     {
-        $new = clone $this;
-
-        $hash = strtolower($hash);
-
-        if ($this->key instanceof RSA) {
-            $new->flags = 0;
-            switch ($hash) {
-                case 'sha1':
-                    break;
-                case 'sha256':
-                    $new->flags = self::SSH_AGENT_RSA2_256;
-                    break;
-                case 'sha512':
-                    $new->flags = self::SSH_AGENT_RSA2_512;
-                    break;
-                default:
-                    throw new UnsupportedAlgorithmException('The only supported hashes for RSA are sha1, sha256 and sha512');
-            }
-        }
-        if ($this->key instanceof EC) {
-            switch ($this->key->getCurve()) {
-                case 'secp256r1':
-                    $expectedHash = 'sha256';
-                    break;
-                case 'secp384r1':
-                    $expectedHash = 'sha384';
-                    break;
-                //case 'secp521r1':
-                //case 'Ed25519':
-                default:
-                    $expectedHash = 'sha512';
-            }
-            if ($hash != $expectedHash) {
-                throw new UnsupportedAlgorithmException('The only supported hash for ' . self::$curveAliases[$this->key->getCurve()] . ' is ' . $expectedHash);
-            }
-        }
-        if ($this->key instanceof DSA) {
-            if ($hash != 'sha1') {
-                throw new UnsupportedAlgorithmException('The only supported hash for DSA is sha1');
-            }
-        }
-        return $new;
-    }
-
-    /**
-     * Sets the padding
-     *
-     * Only PKCS1 padding is supported
-     *
-     * @param string $padding
-     */
-    public function withPadding($padding)
-    {
-        if (!$this->key instanceof RSA) {
-            throw new UnsupportedAlgorithmException('Only RSA keys support padding');
-        }
-        if ($padding != RSA::SIGNATURE_PKCS1 && $padding != RSA::SIGNATURE_RELAXED_PKCS1) {
-            throw new UnsupportedAlgorithmException('ssh-agent can only create PKCS1 signatures');
-        }
-        return $this;
-    }
-
-    /**
-     * Determines the signature padding mode
-     *
-     * Valid values are: ASN1, SSH2, Raw
-     *
-     * @param string $format
-     */
-    public function withSignatureFormat($format)
-    {
-        if ($this->key instanceof RSA) {
-            throw new UnsupportedAlgorithmException('Only DSA and EC keys support signature format setting');
-        }
-        if ($format != 'SSH2') {
-            throw new UnsupportedAlgorithmException('Only SSH2-formatted signatures are currently supported');
-        }
-
-        return $this;
-    }
-
-    /**
-     * Returns the curve
-     *
-     * Returns a string if it's a named curve, an array if not
-     *
-     * @return string|array
-     */
-    public function getCurve()
-    {
-        if (!$this->key instanceof EC) {
-            throw new UnsupportedAlgorithmException('Only EC keys have curves');
-        }
-
-        return $this->key->getCurve();
     }
 
     /**
@@ -260,61 +133,26 @@ class Identity implements PrivateKey
      *
      * @param string $message
      * @return string
-     * @throws \RuntimeException on connection errors
-     * @throws \phpseclib3\Exception\UnsupportedAlgorithmException if the algorithm is unsupported
+     * @access public
      */
-    public function sign($message)
+    function sign($message)
     {
         // the last parameter (currently 0) is for flags and ssh-agent only defines one flag (for ssh-dss): SSH_AGENT_OLD_SIGNATURE
-        $packet = Strings::packSSH2(
-            'CssN',
-            Agent::SSH_AGENTC_SIGN_REQUEST,
-            $this->key_blob,
-            $message,
-            $this->flags
-        );
-        $packet = Strings::packSSH2('s', $packet);
+        $packet = pack('CNa*Na*N', Agent::SSH_AGENTC_SIGN_REQUEST, strlen($this->key_blob), $this->key_blob, strlen($message), $message, 0);
+        $packet = pack('Na*', strlen($packet), $packet);
         if (strlen($packet) != fputs($this->fsock, $packet)) {
-            throw new \RuntimeException('Connection closed during signing');
+            user_error('Connection closed during signing');
         }
 
-        $length = current(unpack('N', $this->readBytes(4)));
-        $packet = $this->readBytes($length);
-
-        list($type, $signature_blob) = Strings::unpackSSH2('Cs', $packet);
+        $length = current(unpack('N', fread($this->fsock, 4)));
+        $type = ord(fread($this->fsock, 1));
         if ($type != Agent::SSH_AGENT_SIGN_RESPONSE) {
-            throw new \RuntimeException('Unable to retrieve signature');
+            user_error('Unable to retrieve signature');
         }
 
-        if (!$this->key instanceof RSA) {
-            return $signature_blob;
-        }
-
-        list($type, $signature_blob) = Strings::unpackSSH2('ss', $signature_blob);
-
-        return $signature_blob;
-    }
-
-    /**
-     * Returns the private key
-     *
-     * @param string $type
-     * @param array $options optional
-     * @return string
-     */
-    public function toString($type, array $options = [])
-    {
-        throw new \RuntimeException('ssh-agent does not provide a mechanism to get the private key');
-    }
-
-    /**
-     * Sets the password
-     *
-     * @param string|bool $password
-     * @return never
-     */
-    public function withPassword($password = false)
-    {
-        throw new \RuntimeException('ssh-agent does not provide a mechanism to get the private key');
+        $signature_blob = fread($this->fsock, $length - 1);
+        // the only other signature format defined - ssh-dss - is the same length as ssh-rsa
+        // the + 12 is for the other various SSH added length fields
+        return substr($signature_blob, strlen('ssh-rsa') + 12);
     }
 }
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/System/SSH/Common/Traits/ReadBytes.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/System/SSH/Common/Traits/ReadBytes.php
deleted file mode 100644
index 6fd032bd..00000000
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/System/SSH/Common/Traits/ReadBytes.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-/**
- * ReadBytes trait
- *
- * PHP version 5
- *
- * @author    Jim Wigginton <terrafrost@php.net>
- * @copyright 2015 Jim Wigginton
- * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
- * @link      http://phpseclib.sourceforge.net
- */
-
-namespace phpseclib3\System\SSH\Common\Traits;
-
-/**
- * ReadBytes trait
- *
- * @author  Jim Wigginton <terrafrost@php.net>
- */
-trait ReadBytes
-{
-    /**
-     * Read data
-     *
-     * @param int $length
-     * @throws \RuntimeException on connection errors
-     */
-    public function readBytes($length)
-    {
-        $temp = fread($this->fsock, $length);
-        if (strlen($temp) != $length) {
-            throw new \RuntimeException("Expected $length bytes; got " . strlen($temp));
-        }
-        return $temp;
-    }
-}
diff --git a/securemail/vendor/phpseclib/phpseclib/phpseclib/bootstrap.php b/securemail/vendor/phpseclib/phpseclib/phpseclib/bootstrap.php
index 517106c3..0da0999f 100644
--- a/securemail/vendor/phpseclib/phpseclib/phpseclib/bootstrap.php
+++ b/securemail/vendor/phpseclib/phpseclib/phpseclib/bootstrap.php
@@ -1,20 +1,14 @@
 <?php
-
 /**
  * Bootstrapping File for phpseclib
  *
- * composer isn't a requirement for phpseclib 2.0 but this file isn't really required
- * either. it's a bonus for those using composer but if you're not phpseclib will
- * still work
- *
  * @license http://www.opensource.org/licenses/mit-license.html MIT License
  */
 
 if (extension_loaded('mbstring')) {
     // 2 - MB_OVERLOAD_STRING
-    // mbstring.func_overload is deprecated in php 7.2 and removed in php 8.0.
-    if (version_compare(PHP_VERSION, '8.0.0') < 0 && ini_get('mbstring.func_overload') & 2) {
-        throw new UnexpectedValueException(
+    if (ini_get('mbstring.func_overload') & 2) {
+        throw new \UnexpectedValueException(
             'Overloading of string functions using mbstring.func_overload ' .
             'is not supported by phpseclib.'
         );
diff --git a/securemail/vendor/singpolyma/openpgp-php/.github/FUNDING.yml b/securemail/vendor/singpolyma/openpgp-php/.github/FUNDING.yml
deleted file mode 100644
index ba2e0ffe..00000000
--- a/securemail/vendor/singpolyma/openpgp-php/.github/FUNDING.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-github: singpolyma
-liberapay: singpolyma
-patreon: singpolyma
diff --git a/securemail/vendor/singpolyma/openpgp-php/.gitignore b/securemail/vendor/singpolyma/openpgp-php/.gitignore
index 695f3365..e48cc98d 100644
--- a/securemail/vendor/singpolyma/openpgp-php/.gitignore
+++ b/securemail/vendor/singpolyma/openpgp-php/.gitignore
@@ -2,7 +2,3 @@
 .tmp
 pkg
 tmp
-composer.lock
-.phpunit.result.cache
-.idea
-vendor/
diff --git a/securemail/vendor/singpolyma/openpgp-php/.travis.dhall b/securemail/vendor/singpolyma/openpgp-php/.travis.dhall
deleted file mode 100644
index 06ce0354..00000000
--- a/securemail/vendor/singpolyma/openpgp-php/.travis.dhall
+++ /dev/null
@@ -1,30 +0,0 @@
-let Prelude = https://prelude.dhall-lang.org/v17.0.0/package.dhall
-let phpseclib = \(max: Natural) -> \(filter: (Natural -> Bool)) ->
-	Prelude.List.map Natural Text
-		(\(m: Natural) -> "PHPSECLIB='2.0.${Prelude.Natural.show m}'")
-		(Prelude.List.filter Natural filter (Prelude.Natural.enumerate max))
-let Exclusion = { php: Text, env: Text }
-in
-{
-	language = "php",
-	php = [
-		"7.3",
-		"7.4",
-		"8.0"
-	],
-	dist = "xenial",
-	env = [
-		"PHPSECLIB='^2.0 !=2.0.8'"
-	] # (phpseclib 28 (\(m: Natural) -> Prelude.Bool.not (Prelude.Natural.equal m 8))
-	),
-	matrix = {
-		exclude = Prelude.List.concatMap Text Exclusion (\(php: Text) ->
-			Prelude.List.map Text Exclusion (\(env: Text) ->
-				{ php = php, env = env }
-			) (phpseclib 7 (\(_: Natural) -> True))
-		) ["7.3", "7.4", "8.0"],
-		fast_finish = True
-	},
-	before_script = ''
-	sed -i "s/\"phpseclib\/phpseclib\": \"[^\"]*/\"phpseclib\/phpseclib\": \"$PHPSECLIB/" composer.json && composer install --prefer-source''
-}
diff --git a/securemail/vendor/singpolyma/openpgp-php/.travis.yml b/securemail/vendor/singpolyma/openpgp-php/.travis.yml
index 00fc4eb0..3829874e 100644
--- a/securemail/vendor/singpolyma/openpgp-php/.travis.yml
+++ b/securemail/vendor/singpolyma/openpgp-php/.travis.yml
@@ -1,82 +1,18 @@
-# Code generated by dhall-to-yaml.  DO NOT EDIT.
-before_script: "sed -i \"s/\\\"phpseclib\\/phpseclib\\\": \\\"[^\\\"]*/\\\"phpseclib\\/phpseclib\\\": \\\"$PHPSECLIB/\" composer.json && composer install --prefer-source"
-dist: xenial
-env:
-- "PHPSECLIB='^2.0 !=2.0.8'"
-- "PHPSECLIB='2.0.0'"
-- "PHPSECLIB='2.0.1'"
-- "PHPSECLIB='2.0.2'"
-- "PHPSECLIB='2.0.3'"
-- "PHPSECLIB='2.0.4'"
-- "PHPSECLIB='2.0.5'"
-- "PHPSECLIB='2.0.6'"
-- "PHPSECLIB='2.0.7'"
-- "PHPSECLIB='2.0.9'"
-- "PHPSECLIB='2.0.10'"
-- "PHPSECLIB='2.0.11'"
-- "PHPSECLIB='2.0.12'"
-- "PHPSECLIB='2.0.13'"
-- "PHPSECLIB='2.0.14'"
-- "PHPSECLIB='2.0.15'"
-- "PHPSECLIB='2.0.16'"
-- "PHPSECLIB='2.0.17'"
-- "PHPSECLIB='2.0.18'"
-- "PHPSECLIB='2.0.19'"
-- "PHPSECLIB='2.0.20'"
-- "PHPSECLIB='2.0.21'"
-- "PHPSECLIB='2.0.22'"
-- "PHPSECLIB='2.0.23'"
-- "PHPSECLIB='2.0.24'"
-- "PHPSECLIB='2.0.25'"
-- "PHPSECLIB='2.0.26'"
-- "PHPSECLIB='2.0.27'"
 language: php
-matrix:
-  exclude:
-  - env: "PHPSECLIB='2.0.0'"
-    php: '7.3'
-  - env: "PHPSECLIB='2.0.1'"
-    php: '7.3'
-  - env: "PHPSECLIB='2.0.2'"
-    php: '7.3'
-  - env: "PHPSECLIB='2.0.3'"
-    php: '7.3'
-  - env: "PHPSECLIB='2.0.4'"
-    php: '7.3'
-  - env: "PHPSECLIB='2.0.5'"
-    php: '7.3'
-  - env: "PHPSECLIB='2.0.6'"
-    php: '7.3'
-  - env: "PHPSECLIB='2.0.0'"
-    php: '7.4'
-  - env: "PHPSECLIB='2.0.1'"
-    php: '7.4'
-  - env: "PHPSECLIB='2.0.2'"
-    php: '7.4'
-  - env: "PHPSECLIB='2.0.3'"
-    php: '7.4'
-  - env: "PHPSECLIB='2.0.4'"
-    php: '7.4'
-  - env: "PHPSECLIB='2.0.5'"
-    php: '7.4'
-  - env: "PHPSECLIB='2.0.6'"
-    php: '7.4'
-  - env: "PHPSECLIB='2.0.0'"
-    php: '8.0'
-  - env: "PHPSECLIB='2.0.1'"
-    php: '8.0'
-  - env: "PHPSECLIB='2.0.2'"
-    php: '8.0'
-  - env: "PHPSECLIB='2.0.3'"
-    php: '8.0'
-  - env: "PHPSECLIB='2.0.4'"
-    php: '8.0'
-  - env: "PHPSECLIB='2.0.5'"
-    php: '8.0'
-  - env: "PHPSECLIB='2.0.6'"
-    php: '8.0'
-  fast_finish: true
 php:
-- '7.3'
-- '7.4'
-- '8.0'
+  - 5.3
+  - 5.4
+  - 5.5
+  - 5.6
+  - 7.0
+  - hhvm
+#  - nightly
+
+env:
+  - PHPSECLIB="2.0.0"
+  - PHPSECLIB="2.0.1"
+  - PHPSECLIB="2.0.2"
+  - PHPSECLIB="2.0.3"
+  - PHPSECLIB="2.0.4"
+
+before_script: 'sed -i "s/\"phpseclib\/phpseclib\": \"[^\"]*/\"phpseclib\/phpseclib\": \"$PHPSECLIB/" composer.json && composer install --prefer-source --dev'
diff --git a/securemail/vendor/singpolyma/openpgp-php/README.md b/securemail/vendor/singpolyma/openpgp-php/README.md
index 3e164e90..099f520a 100644
--- a/securemail/vendor/singpolyma/openpgp-php/README.md
+++ b/securemail/vendor/singpolyma/openpgp-php/README.md
@@ -1,14 +1,11 @@
-[![Build Status](https://travis-ci.org/singpolyma/openpgp-php.svg?branch=master)](https://travis-ci.org/singpolyma/openpgp-php)
-
 OpenPGP.php: OpenPGP for PHP
 ============================
 
 This is a pure-PHP implementation of the OpenPGP Message Format (RFC 4880).
 
-* <https://github.com/singpolyma/openpgp-php>
+* <http://github.com/bendiken/openpgp-php>
 
-About OpenPGP
--------------
+### About OpenPGP
 
 OpenPGP is the most widely-used e-mail encryption standard in the world. It
 is defined by the OpenPGP Working Group of the Internet Engineering Task
@@ -16,8 +13,8 @@ Force (IETF) Proposed Standard RFC 4880. The OpenPGP standard was originally
 derived from PGP (Pretty Good Privacy), first created by Phil Zimmermann in
 1991.
 
-* <https://tools.ietf.org/html/rfc4880>
-* <https://www.openpgp.org/>
+* <http://tools.ietf.org/html/rfc4880>
+* <http://www.openpgp.org/>
 
 Features
 --------
@@ -25,49 +22,37 @@ Features
 * Encodes and decodes ASCII-armored OpenPGP messages.
 * Parses OpenPGP messages into their constituent packets.
   * Supports both old-format (PGP 2.6.x) and new-format (RFC 4880) packets.
-* Helper class for verifying, signing, encrypting, and decrypting messages <http://phpseclib.sourceforge.net>
-* Helper class for encrypting and decrypting messages and keys using <http://phpseclib.sourceforge.net>
-  * openssl or mcrypt required for CAST5 encryption and decryption
-
-Bugs, Feature Requests, Patches
--------------------------------
-
-This project is primarily maintained by a single volunteer with many other
-things vying for their attention, please be patient.
-
-Bugs, feature request, pull requests, patches, and general discussion may
-be submitted publicly via email to: dev@singpolyma.net
-
-Github users may alternately submit on the web there.
+* Helper class for verifying, signing, encrypting, and decrypting messages using Crypt_RSA from <http://phpseclib.sourceforge.net>
+* Helper class for encrypting and decrypting messages and keys using Crypt_AES and Crypt_TripleDES from <http://phpseclib.sourceforge.net>
 
 Users
 -----
 
 OpenPGP.php is currently being used in the following projects:
 
+* <https://drupal.org/project/openpgp>
 * <https://wordpress.org/plugins/wp-pgp-encrypted-emails/>
-* [Passbolt API](https://github.com/passbolt/passbolt_api)
 
 Download
 --------
 
 To get a local working copy of the development repository, do:
 
-    git clone https://github.com/singpolyma/openpgp-php.git
+    % git clone git://github.com/bendiken/openpgp-php.git
 
 Alternatively, you can download the latest development version as a tarball
 as follows:
 
-    wget https://github.com/singpolyma/openpgp-php/tarball/master
+    % wget http://github.com/bendiken/openpgp-php/tarball/master
 
 Authors
 -------
 
-* [Arto Bendiken](mailto:arto.bendiken@gmail.com) (Original author) - <http://ar.to/>
-* [Stephen Paul Weber](mailto:singpolyma@singpolyma.net) (Maintainer) - <https://singpolyma.net/>
+* [Arto Bendiken](mailto:arto.bendiken@gmail.com) - <http://ar.to/>
+* [Stephen Paul Weber](mailto:singpolyma@singpolyma.net) - <http://singpolyma.net/>
 
 License
 -------
 
 OpenPGP.php is free and unencumbered public domain software. For more
-information, see <https://unlicense.org/> or the accompanying UNLICENSE file.
+information, see <http://unlicense.org/> or the accompanying UNLICENSE file.
diff --git a/securemail/vendor/singpolyma/openpgp-php/composer.json b/securemail/vendor/singpolyma/openpgp-php/composer.json
index c7c1011d..6acc8c46 100644
--- a/securemail/vendor/singpolyma/openpgp-php/composer.json
+++ b/securemail/vendor/singpolyma/openpgp-php/composer.json
@@ -13,15 +13,10 @@
     }
   ],
   "require": {
-    "php": "^5.6 || ^7.0 || ^8.0",
-    "phpseclib/phpseclib": "^3.0.14"
+    "phpseclib/phpseclib": ">=2.0.0 <=2.0.4"
   },
   "require-dev": {
-    "phpunit/phpunit": "^9.0"
-  },
-  "suggest": {
-    "ext-mcrypt": "required if you use encryption cast5",
-    "ext-openssl": "required if you use encryption cast5"
+    "phpunit/phpunit": "~4.0"
   },
   "autoload": {
     "classmap": ["lib/"]
diff --git a/securemail/vendor/singpolyma/openpgp-php/examples/README.md b/securemail/vendor/singpolyma/openpgp-php/examples/README.md
deleted file mode 100644
index 3f3c3b39..00000000
--- a/securemail/vendor/singpolyma/openpgp-php/examples/README.md
+++ /dev/null
@@ -1,22 +0,0 @@
-OpenPGP.php Examples
-====================
-
-The scripts in this folder show how to use this library to perform various tasks
-such as [generating a new key](keygen.php), [signing a message](sign.php), and
-[verifying a message](verify.php) that has been signed.
-
-To use these examples, make sure [`phpseclib`](http://phpseclib.sourceforge.net/) is available. You can install it
-using [Composer](https://getcomposer.org/):
-
-```sh
-git clone https://github.com/singpolyma/openpgp-php.git # Clone the repository.
-cd openpgp-php
-composer install # Use Composer to install the requirements.
-```
-
-Once Composer has installed the requirements, run the examples using PHP:
-
-```sh
-# Generate a new OpenPGP key; see the `keygen.php` file for parameters.
-php ./examples/keygen.php > mykey.gpg
-```
diff --git a/securemail/vendor/singpolyma/openpgp-php/examples/armorEncryptSignCompress.php b/securemail/vendor/singpolyma/openpgp-php/examples/armorEncryptSignCompress.php
deleted file mode 100644
index 59d5af40..00000000
--- a/securemail/vendor/singpolyma/openpgp-php/examples/armorEncryptSignCompress.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-@include_once dirname(__FILE__).'/../vendor/autoload.php';
-require_once dirname(__FILE__).'/../lib/openpgp.php';
-require_once dirname(__FILE__).'/../lib/openpgp_crypt_rsa.php';
-
-$recipientPublicKey = OpenPGP_Message::parse(OpenPGP::unarmor(file_get_contents('public.asc'), 'PGP PUBLIC KEY BLOCK'));
-
-$encryptedPrivateKey = OpenPGP_Message::parse(OpenPGP::unarmor(file_get_contents('sekret.asc'), 'PGP PRIVATE KEY BLOCK'));
-$privateKeyPassphrase = 'test';
-$key = OpenPGP_Crypt_Symmetric::decryptSecretKey($privateKeyPassphrase, $encryptedPrivateKey[0]);
-
-$signer = new OpenPGP_Crypt_RSA($key);
-$data = new OpenPGP_LiteralDataPacket("some text\n", ['format' => 'u']);
-$signed = $signer->sign($data);
-
-$compressed = new OpenPGP_CompressedDataPacket($signed);
-$encrypted = OpenPGP_Crypt_Symmetric::encrypt([$recipientPublicKey, $key], new OpenPGP_Message([$compressed]));
-
-echo OpenPGP::enarmor($encrypted->to_bytes(), 'PGP MESSAGE');
-
-
diff --git a/securemail/vendor/singpolyma/openpgp-php/examples/clearsign.php b/securemail/vendor/singpolyma/openpgp-php/examples/clearsign.php
index 1445fa7a..686af02f 100644
--- a/securemail/vendor/singpolyma/openpgp-php/examples/clearsign.php
+++ b/securemail/vendor/singpolyma/openpgp-php/examples/clearsign.php
@@ -1,6 +1,5 @@
 <?php
 
-@include_once dirname(__FILE__).'/../vendor/autoload.php';
 require_once dirname(__FILE__).'/../lib/openpgp.php';
 require_once dirname(__FILE__).'/../lib/openpgp_crypt_rsa.php';
 
@@ -28,3 +27,5 @@ echo "-----BEGIN PGP SIGNED MESSAGE-----\nHash: SHA256\n\n";
 // trailing whitespace to lines.
 echo preg_replace("/^-/", "- -",  $packets[0]->data)."\n";
 echo OpenPGP::enarmor($packets[1][0]->to_bytes(), "PGP SIGNATURE");
+
+?>
diff --git a/securemail/vendor/singpolyma/openpgp-php/examples/deASCIIdeCrypt.php b/securemail/vendor/singpolyma/openpgp-php/examples/deASCIIdeCrypt.php
index 0326ba6c..9ab6cdd2 100644
--- a/securemail/vendor/singpolyma/openpgp-php/examples/deASCIIdeCrypt.php
+++ b/securemail/vendor/singpolyma/openpgp-php/examples/deASCIIdeCrypt.php
@@ -3,7 +3,6 @@
 // USAGE: php examples/deASCIIdeCrypt.php secretkey.asc password message.asc
 // This will fail if the algo on key or message is not 3DES or AES
 
-@include_once dirname(__FILE__).'/../vendor/autoload.php';
 require_once dirname(__FILE__).'/../lib/openpgp.php';
 require_once dirname(__FILE__).'/../lib/openpgp_crypt_rsa.php';
 require_once dirname(__FILE__).'/../lib/openpgp_crypt_symmetric.php';
diff --git a/securemail/vendor/singpolyma/openpgp-php/examples/encryptDecrypt.php b/securemail/vendor/singpolyma/openpgp-php/examples/encryptDecrypt.php
index b9c1a520..7804967f 100644
--- a/securemail/vendor/singpolyma/openpgp-php/examples/encryptDecrypt.php
+++ b/securemail/vendor/singpolyma/openpgp-php/examples/encryptDecrypt.php
@@ -1,6 +1,5 @@
 <?php
 
-@include_once dirname(__FILE__).'/../vendor/autoload.php';
 require_once dirname(__FILE__).'/../lib/openpgp.php';
 require_once dirname(__FILE__).'/../lib/openpgp_crypt_rsa.php';
 require_once dirname(__FILE__).'/../lib/openpgp_crypt_symmetric.php';
diff --git a/securemail/vendor/singpolyma/openpgp-php/examples/keygen.php b/securemail/vendor/singpolyma/openpgp-php/examples/keygen.php
index 4741ce15..1bc03afd 100644
--- a/securemail/vendor/singpolyma/openpgp-php/examples/keygen.php
+++ b/securemail/vendor/singpolyma/openpgp-php/examples/keygen.php
@@ -1,24 +1,19 @@
 <?php
 
-use phpseclib3\Crypt\RSA;
-use phpseclib3\Crypt\RSA\Formats\Keys\PKCS1;
-
-@include_once dirname(__FILE__).'/../vendor/autoload.php';
 require_once dirname(__FILE__).'/../lib/openpgp.php';
 require_once dirname(__FILE__).'/../lib/openpgp_crypt_rsa.php';
 
-$privateKey = RSA::createKey(512);
-$publickey = $privateKey->getPublicKey();
-
-$privateKeyComponents = PKCS1::load($privateKey->toString('PKCS1'));
+$rsa = new \phpseclib\Crypt\RSA();
+$k = $rsa->createKey(512);
+$rsa->loadKey($k['privatekey']);
 
 $nkey = new OpenPGP_SecretKeyPacket(array(
-   'n' => $privateKeyComponents["modulus"]->toBytes(),
-   'e' => $privateKeyComponents["publicExponent"]->toBytes(),
-   'd' => $privateKeyComponents["privateExponent"]->toBytes(),
-   'p' => $privateKeyComponents["primes"][1]->toBytes(),
-   'q' => $privateKeyComponents["primes"][2]->toBytes(),
-   'u' => $privateKeyComponents["coefficients"][2]->toBytes()
+   'n' => $rsa->modulus->toBytes(),
+   'e' => $rsa->publicExponent->toBytes(),
+   'd' => $rsa->exponent->toBytes(),
+   'p' => $rsa->primes[2]->toBytes(),
+   'q' => $rsa->primes[1]->toBytes(),
+   'u' => $rsa->coefficients[2]->toBytes()
 ));
 
 $uid = new OpenPGP_UserIDPacket('Test <test@example.com>');
diff --git a/securemail/vendor/singpolyma/openpgp-php/examples/keygenEncrypted.php b/securemail/vendor/singpolyma/openpgp-php/examples/keygenEncrypted.php
deleted file mode 100644
index d560ee0a..00000000
--- a/securemail/vendor/singpolyma/openpgp-php/examples/keygenEncrypted.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-use phpseclib3\Crypt\RSA;
-use phpseclib3\Crypt\RSA\Formats\Keys\PKCS1;
-
-@include_once dirname(__FILE__).'/../vendor/autoload.php';
-require_once dirname(__FILE__).'/../lib/openpgp.php';
-require_once dirname(__FILE__).'/../lib/openpgp_crypt_rsa.php';
-require_once dirname(__FILE__).'/../lib/openpgp_crypt_symmetric.php';
-
-$privateKey = RSA::createKey(512);
-$publickey = $privateKey->getPublicKey();
-
-$privateKeyComponents = PKCS1::load($privateKey->toString('PKCS1'));
-
-$nkey = new OpenPGP_SecretKeyPacket(array(
-   'n' => $privateKeyComponents["modulus"]->toBytes(),
-   'e' => $privateKeyComponents["publicExponent"]->toBytes(),
-   'd' => $privateKeyComponents["privateExponent"]->toBytes(),
-   'p' => $privateKeyComponents["primes"][1]->toBytes(),
-   'q' => $privateKeyComponents["primes"][2]->toBytes(),
-   'u' => $privateKeyComponents["coefficients"][2]->toBytes()
-));
-
-$uid = new OpenPGP_UserIDPacket('Test <test@example.com>');
-
-$wkey = new OpenPGP_Crypt_RSA($nkey);
-$m = $wkey->sign_key_userid(array($nkey, $uid));
-$m[0] = OpenPGP_Crypt_Symmetric::encryptSecretKey("password", $nkey);
-
-// Serialize encrypted private key
-print $m->to_bytes();
diff --git a/securemail/vendor/singpolyma/openpgp-php/examples/keygenSubkeys.php b/securemail/vendor/singpolyma/openpgp-php/examples/keygenSubkeys.php
deleted file mode 100644
index 90905956..00000000
--- a/securemail/vendor/singpolyma/openpgp-php/examples/keygenSubkeys.php
+++ /dev/null
@@ -1,116 +0,0 @@
-<?php
-
-use phpseclib3\Crypt\RSA;
-use phpseclib3\Crypt\RSA\Formats\Keys\PKCS1;
-
-@include_once dirname(__FILE__).'/../vendor/autoload.php';
-require_once dirname(__FILE__).'/../lib/openpgp.php';
-require_once dirname(__FILE__).'/../lib/openpgp_crypt_rsa.php';
-
-// Key length: 512, 1024, 2048, 3072, 4096
-$key_length = 512;
-
-// Generate a master signing key
-$privateKey = RSA::createKey(512);
-$privateKeyComponents = PKCS1::load($privateKey->toString('PKCS1'));
-
-$nkey = new OpenPGP_SecretKeyPacket(array(
-   'n' => $privateKeyComponents["modulus"]->toBytes(),
-   'e' => $privateKeyComponents["publicExponent"]->toBytes(),
-   'd' => $privateKeyComponents["privateExponent"]->toBytes(),
-   'p' => $privateKeyComponents["primes"][1]->toBytes(),
-   'q' => $privateKeyComponents["primes"][2]->toBytes(),
-   'u' => $privateKeyComponents["coefficients"][2]->toBytes()
-));
-
-// Start assembling packets for our eventual OpenPGP_Message
-$packets = array($nkey);
-
-$wkey = new OpenPGP_Crypt_RSA($nkey);
-$fingerprint = $wkey->key()->fingerprint;
-$key = $wkey->private_key();
-$key = $key->withHash('sha256');
-$keyid = substr($fingerprint, -16);
-
-// Add multiple UID packets and signatures
-
-$uids = array(
-	new OpenPGP_UserIDPacket('Support', '', 'support@example.com'),
-	new OpenPGP_UserIDPacket('Security', '', 'security@example.com'),
-);
-
-foreach($uids as $uid) {
-	// Append the UID packet
-	$packets[] = $uid;
-	
-	$sig = new OpenPGP_SignaturePacket(new OpenPGP_Message(array($nkey, $uid)), 'RSA', 'SHA256');
-	$sig->signature_type = 0x13;
-	$sig->hashed_subpackets[] = new OpenPGP_SignaturePacket_KeyFlagsPacket(array(0x01 | 0x02)); // Certify + sign bits
-	$sig->hashed_subpackets[] = new OpenPGP_SignaturePacket_IssuerPacket($keyid);
-	$m = $wkey->sign_key_userid(array($nkey, $uid, $sig));
-	
-	// Append the UID signature from the master key
-	$packets[] = $m->packets[2];
-}
-
-// Generate an encryption subkey
-
-$rsa_subkey = RSA::createKey(512);
-$privateKeyComponents = PKCS1::load($rsa_subkey->toString('PKCS1'));
-
-$subkey = new OpenPGP_SecretKeyPacket(array(
-   'n' => $privateKeyComponents["modulus"]->toBytes(),
-   'e' => $privateKeyComponents["publicExponent"]->toBytes(),
-   'd' => $privateKeyComponents["privateExponent"]->toBytes(),
-   'p' => $privateKeyComponents["primes"][2]->toBytes(),
-   'q' => $privateKeyComponents["primes"][1]->toBytes(),
-   'u' => $privateKeyComponents["coefficients"][2]->toBytes()
-));
-
-// Append the encryption subkey
-$packets[] = $subkey;
-
-$sub_wkey = new OpenPGP_Crypt_RSA($subkey);
-
-/*
- * Sign the encryption subkey with the master key
- *
- * OpenPGP_SignaturePacket assumes any message starting with an
- * OpenPGP_PublicKeyPacket is followed by a OpenPGP_UserIDPacket. We need
- * to pass `null` in the constructor and generate the `->data` ourselves.
- */
-$sub_sig = new OpenPGP_SignaturePacket(null, 'RSA', 'SHA256');
-$sub_sig->signature_type = 0x18;
-$sub_sig->hashed_subpackets[] = new OpenPGP_SignaturePacket_SignatureCreationTimePacket(time());
-$sub_sig->hashed_subpackets[] = new OpenPGP_SignaturePacket_KeyFlagsPacket(array(0x0C)); // Encrypt bits
-$sub_sig->hashed_subpackets[] = new OpenPGP_SignaturePacket_IssuerPacket($keyid);
-$sub_sig->data = implode('', $nkey->fingerprint_material()) . implode('', $subkey->fingerprint_material());
-$sub_sig->sign_data(array('RSA' => array('SHA256' => function($data) use($key) {return array($key->sign($data));})));
-
-// Append the subkey signature
-$packets[] = $sub_sig;
-
-// Build the OpenPGP_Message for the secret key from our packets
-$m = new OpenPGP_Message($packets);
-
-// Serialize the private key
-print $m->to_bytes();
-
-// Clone a public key message from the secret key
-$pubm = clone($m);
-
-// Convert the private key packets to public so we only export public data
-// (n+e in RSA)
-foreach($pubm as $idx => $p) {
-	if($p instanceof OpenPGP_SecretSubkeyPacket) {
-		$pubm[$idx] = new OpenPGP_PublicSubkeyPacket($p);
-	} else if($p instanceof OpenPGP_SecretKeyPacket) {
-		$pubm[$idx] = new OpenPGP_PublicKeyPacket($p);
-	}
-}
-
-// Serialize the public key
-$public_bytes = $pubm->to_bytes();
-
-// Note: If using PHP 7.4 CLI, disable deprecated warnings:
-// php -d error_reporting="E_ALL & ~E_DEPRECATED" examples/keygenSubkeys.php > mykey.gpg
diff --git a/securemail/vendor/singpolyma/openpgp-php/examples/sign.php b/securemail/vendor/singpolyma/openpgp-php/examples/sign.php
index fcffc597..5e68d642 100644
--- a/securemail/vendor/singpolyma/openpgp-php/examples/sign.php
+++ b/securemail/vendor/singpolyma/openpgp-php/examples/sign.php
@@ -1,6 +1,5 @@
 <?php
 
-@include_once dirname(__FILE__).'/../vendor/autoload.php';
 require_once dirname(__FILE__).'/../lib/openpgp.php';
 require_once dirname(__FILE__).'/../lib/openpgp_crypt_rsa.php';
 
@@ -19,3 +18,5 @@ $m = $sign->sign($data);
 
 /* Output the raw message bytes to STDOUT */
 echo $m->to_bytes();
+
+?>
diff --git a/securemail/vendor/singpolyma/openpgp-php/examples/verify.php b/securemail/vendor/singpolyma/openpgp-php/examples/verify.php
index b5cf5b4e..86501996 100644
--- a/securemail/vendor/singpolyma/openpgp-php/examples/verify.php
+++ b/securemail/vendor/singpolyma/openpgp-php/examples/verify.php
@@ -1,6 +1,5 @@
 <?php
 
-@include_once dirname(__FILE__).'/../vendor/autoload.php';
 require_once dirname(__FILE__).'/../lib/openpgp.php';
 require_once dirname(__FILE__).'/../lib/openpgp_crypt_rsa.php';
 
@@ -15,3 +14,5 @@ $verify = new OpenPGP_Crypt_RSA($wkey);
 
 /* Dump verification information to STDOUT */
 var_dump($verify->verify($m));
+
+?>
diff --git a/securemail/vendor/singpolyma/openpgp-php/lib/openpgp.php b/securemail/vendor/singpolyma/openpgp-php/lib/openpgp.php
index 9c4bf12e..dc659d79 100644
--- a/securemail/vendor/singpolyma/openpgp-php/lib/openpgp.php
+++ b/securemail/vendor/singpolyma/openpgp-php/lib/openpgp.php
@@ -5,7 +5,7 @@
  * (RFC 4880).
  *
  * @package OpenPGP
- * @version 0.6.0
+ * @version 0.3.0
  * @author  Arto Bendiken <arto.bendiken@gmail.com>
  * @author  Stephen Paul Weber <singpolyma@singpolyma.net>
  * @see     http://github.com/bendiken/openpgp-php
@@ -18,8 +18,6 @@
  * @see http://tools.ietf.org/html/rfc4880
  */
 class OpenPGP {
-  const VERSION = array(0, 6, 0);
-
   /**
    * @see http://tools.ietf.org/html/rfc4880#section-6
    * @see http://tools.ietf.org/html/rfc4880#section-6.2
@@ -30,7 +28,7 @@ class OpenPGP {
     foreach ($headers as $key => $value) {
       $text .= $key . ': ' . (string)$value . "\n";
     }
-    $text .= "\n" . wordwrap(base64_encode($data), 76, "\n", true);
+    $text .= "\n" . base64_encode($data);
     $text .= "\n".'=' . base64_encode(substr(pack('N', self::crc24($data)), 1)) . "\n";
     $text .= self::footer($marker) . "\n";
     return $text;
@@ -44,15 +42,9 @@ class OpenPGP {
     $header = self::header($header);
     $text = str_replace(array("\r\n", "\r"), array("\n", ''), $text);
     if (($pos1 = strpos($text, $header)) !== FALSE &&
-        ($pos1 = strpos($text, "\n\n", $pos1 += strlen($header))) !== FALSE) {
-      $pos2 = strpos($text, "\n=", $pos1 += 2);
-      if ($pos2 === FALSE) {
-        trigger_error("Invalid ASCII armor, missing CRC");
-        $pos2 = strpos($text, "-----END");
-        if ($pos2 === FALSE) return NULL;
-      }
-      $text = substr($text, $pos1, $pos2 - $pos1);
-      return base64_decode($text, true);
+        ($pos1 = strpos($text, "\n\n", $pos1 += strlen($header))) !== FALSE &&
+        ($pos2 = strpos($text, "\n=", $pos1 += 2)) !== FALSE) {
+      return base64_decode($text = substr($text, $pos1, $pos2 - $pos1));
     }
   }
 
@@ -130,20 +122,20 @@ class OpenPGP_S2K {
 
   static function parse(&$input) {
     $s2k = new OpenPGP_S2k();
-    switch($s2k->type = ord($input[0])) {
+    switch($s2k->type = ord($input{0})) {
       case 0:
-        $s2k->hash_algorithm = ord($input[1]);
+        $s2k->hash_algorithm = ord($input{1});
         $input = substr($input, 2);
         break;
       case 1:
-        $s2k->hash_algorithm = ord($input[1]);
+        $s2k->hash_algorithm = ord($input{1});
         $s2k->salt = substr($input, 2, 8);
         $input = substr($input, 10);
         break;
       case 3:
-        $s2k->hash_algorithm = ord($input[1]);
+        $s2k->hash_algorithm = ord($input{1});
         $s2k->salt = substr($input, 2, 8);
-        $s2k->count = OpenPGP::decode_s2k_count(ord($input[10]));
+        $s2k->count = OpenPGP::decode_s2k_count(ord($input{10}));
         $input = substr($input, 11);
         break;
     }
@@ -158,12 +150,10 @@ class OpenPGP_S2K {
         $bytes .= chr($this->hash_algorithm);
         break;
       case 1:
-        if(strlen($this->salt) != 8) throw new Exception("Invalid salt length");
         $bytes .= chr($this->hash_algorithm);
         $bytes .= $this->salt;
         break;
       case 3:
-        if(strlen($this->salt) != 8) throw new Exception("Invalid salt length");
         $bytes .= chr($this->hash_algorithm);
         $bytes .= $this->salt;
         $bytes .= chr(OpenPGP::encode_s2k_count($this->count));
@@ -337,7 +327,7 @@ class OpenPGP_Message implements IteratorAggregate, ArrayAccess {
 
   /**
    * Function to extract verified signatures
-   * $verifiers is an array of callbacks formatted like array('RSA' => CALLBACK) or array('RSA' => array('SHA256' => CALLBACK)) that take two parameters: raw message and signature packet
+   * $verifiers is an array of callbacks formatted like array('RSA' => array('SHA256' => CALLBACK)) that take two parameters: raw message and signature packet
    */
   function verified_signatures($verifiers) {
     $signed = $this->signatures();
@@ -348,8 +338,7 @@ class OpenPGP_Message implements IteratorAggregate, ArrayAccess {
       $vsigs = array();
 
       foreach($signatures as $sig) {
-        $verifier = $verifiers[$sig->key_algorithm_name()];
-        if(is_array($verifier)) $verifier = $verifier[$sig->hash_algorithm_name()];
+        $verifier = $verifiers[$sig->key_algorithm_name()][$sig->hash_algorithm_name()];
         if($verifier && $this->verify_one($verifier, $sign, $sig)) {
           $vsigs[] = $sig;
         }
@@ -380,34 +369,24 @@ class OpenPGP_Message implements IteratorAggregate, ArrayAccess {
 
   // IteratorAggregate interface
 
-  // function getIterator(): \Traversable { // when php 5 support is dropped
-  #[\ReturnTypeWillChange]
   function getIterator() {
     return new ArrayIterator($this->packets);
   }
 
   // ArrayAccess interface
 
-  // function offsetExists($offset): bool // when php 5 support is dropped
-  #[\ReturnTypeWillChange]
   function offsetExists($offset) {
     return isset($this->packets[$offset]);
   }
 
-  // function offsetGet($offset): mixed // when php 7.4 support is dropped
-  #[\ReturnTypeWillChange]
   function offsetGet($offset) {
     return $this->packets[$offset];
   }
 
-  // function offsetSet($offset, $value): void // when php 5 support is dropped
-  #[\ReturnTypeWillChange]
   function offsetSet($offset, $value) {
-    is_null($offset) ? $this->packets[] = $value : $this->packets[$offset] = $value;
+    return is_null($offset) ? $this->packets[] = $value : $this->packets[$offset] = $value;
   }
 
-  // function offsetUnset($offset): void // when php 5 support is dropped
-  #[\ReturnTypeWillChange]
   function offsetUnset($offset) {
     unset($this->packets[$offset]);
   }
@@ -432,7 +411,7 @@ class OpenPGP_Packet {
 
   /**
    * Parses an OpenPGP packet.
-   *
+   * 
    * Partial body lengths based on https://github.com/toofishes/python-pgpdump/blob/master/pgpdump/packet.py
    *
    * @see http://tools.ietf.org/html/rfc4880#section-4.2
@@ -570,11 +549,11 @@ class OpenPGP_Packet {
    */
   function read_unpacked($count, $format) {
     $unpacked = unpack($format, $this->read_bytes($count));
-    return is_array($unpacked) ? reset($unpacked) : NULL;
+    return reset($unpacked);
   }
 
   function read_byte() {
-    return !is_null($bytes = $this->read_bytes()) ? $bytes[0] : NULL;
+    return ($bytes = $this->read_bytes()) ? $bytes[0] : NULL;
   }
 
   function read_bytes($count = 1) {
@@ -630,7 +609,7 @@ class OpenPGP_AsymmetricSessionKeyPacket extends OpenPGP_Packet {
         $rawkeyid = $this->read_bytes(8);
         $this->keyid = '';
         for($i = 0; $i < strlen($rawkeyid); $i++) { // Store KeyID in Hex
-          $this->keyid .= sprintf('%02X',ord($rawkeyid[$i]));
+          $this->keyid .= sprintf('%02X',ord($rawkeyid{$i}));
         }
 
         $this->key_algorithm = ord($this->read_byte());
@@ -646,7 +625,7 @@ class OpenPGP_AsymmetricSessionKeyPacket extends OpenPGP_Packet {
     $bytes = chr($this->version);
 
     for($i = 0; $i < strlen($this->keyid); $i += 2) {
-      $bytes .= chr(hexdec($this->keyid[$i].$this->keyid[$i+1]));
+      $bytes .= chr(hexdec($this->keyid{$i}.$this->keyid{$i+1}));
     }
 
     $bytes .= chr($this->key_algorithm);
@@ -706,15 +685,13 @@ class OpenPGP_SignaturePacket extends OpenPGP_Packet {
     switch($this->version = ord($this->read_byte())) {
       case 2:
       case 3:
-        if(ord($this->read_byte()) != 5) {
-          throw new Exception("Invalid version 2 or 3 SignaturePacket");
-        }
+        assert(ord($this->read_byte()) == 5);
         $this->signature_type = ord($this->read_byte());
         $creation_time = $this->read_timestamp();
         $keyid = $this->read_bytes(8);
         $keyidHex = '';
         for($i = 0; $i < strlen($keyid); $i++) { // Store KeyID in Hex
-          $keyidHex .= sprintf('%02X',ord($keyid[$i]));
+          $keyidHex .= sprintf('%02X',ord($keyid{$i}));
         }
 
         $this->hashed_subpackets = array();
@@ -791,7 +768,7 @@ class OpenPGP_SignaturePacket extends OpenPGP_Packet {
         foreach((array)$this->unhashed_subpackets as $p) {
           if($p instanceof OpenPGP_SignaturePacket_IssuerPacket) {
             for($i = 0; $i < strlen($p->data); $i += 2) {
-              $body .= chr(hexdec($p->data[$i].$p->data[$i+1]));
+              $body .= chr(hexdec($p->data{$i}.$p->data{$i+1}));
             }
             break;
           }
@@ -998,8 +975,8 @@ class OpenPGP_SignaturePacket_ExportableCertificationPacket extends OpenPGP_Sign
 
 class OpenPGP_SignaturePacket_TrustSignaturePacket extends OpenPGP_SignaturePacket_Subpacket {
   function read() {
-    $this->depth = ord($this->input[0]);
-    $this->trust = ord($this->input[1]);
+    $this->depth = ord($this->input{0});
+    $this->trust = ord($this->input{1});
   }
 
   function body() {
@@ -1075,7 +1052,7 @@ class OpenPGP_SignaturePacket_RevocationKeyPacket extends OpenPGP_SignaturePacke
     $bytes .= chr($this->key_algorithm);
 
     for($i = 0; $i < strlen($this->fingerprint); $i += 2) {
-      $bytes .= chr(hexdec($this->fingerprint[$i].$this->fingerprint[$i+1]));
+      $bytes .= chr(hexdec($this->fingerprint{$i}.$this->fingerprint{$i+1}));
     }
 
     return $bytes;
@@ -1095,7 +1072,7 @@ class OpenPGP_SignaturePacket_IssuerPacket extends OpenPGP_SignaturePacket_Subpa
   function body() {
     $bytes = '';
     for($i = 0; $i < strlen($this->data); $i += 2) {
-      $bytes .= chr(hexdec($this->data[$i].$this->data[$i+1]));
+      $bytes .= chr(hexdec($this->data{$i}.$this->data{$i+1}));
     }
     return $bytes;
   }
@@ -1328,7 +1305,7 @@ class OpenPGP_OnePassSignaturePacket extends OpenPGP_Packet {
   function body() {
     $body = chr($this->version).chr($this->signature_type).chr($this->hash_algorithm).chr($this->key_algorithm);
     for($i = 0; $i < strlen($this->key_id); $i += 2) {
-      $body .= chr(hexdec($this->key_id[$i].$this->key_id[$i+1]));
+      $body .= chr(hexdec($this->key_id{$i}.$this->key_id{$i+1}));
     }
     $body .= chr((int)$this->nested);
     return $body;
@@ -1388,9 +1365,6 @@ class OpenPGP_PublicKeyPacket extends OpenPGP_Packet {
         if(strtoupper($p->issuer()) == $keyid16) {
           $sigs[] = $p;
         } else {
-          if(!is_array($p->hashed_subpackets)) {
-              break;
-          }
           foreach(array_merge($p->hashed_subpackets, $p->unhashed_subpackets) as $s) {
             if($s instanceof OpenPGP_SignaturePacket_EmbeddedSignaturePacket && strtoupper($s->issuer()) == $keyid16) {
               $sigs[] = $p;
@@ -1438,14 +1412,7 @@ class OpenPGP_PublicKeyPacket extends OpenPGP_Packet {
    */
   function read_key_material() {
     foreach (self::$key_fields[$this->algorithm] as $field) {
-      if (strlen($field) == 1) {
-        $this->key[$field] = $this->read_mpi();
-      } else if ($field == 'oid') {
-        $len = ord($this->read_byte());
-        $this->key[$field] = $this->read_bytes($len);
-      } else {
-        $this->key[$field] = ord($this->read_byte());
-      }
+      $this->key[$field] = $this->read_mpi();
     }
     $this->key_id = substr($this->fingerprint(), -8);
   }
@@ -1455,8 +1422,8 @@ class OpenPGP_PublicKeyPacket extends OpenPGP_Packet {
       case 3:
         $material = array();
         foreach (self::$key_fields[$this->algorithm] as $i) {
-            $material[] = pack('n', OpenPGP::bitlength($this->key[$i]));
-            $material[] = $this->key[$i];
+          $material[] = pack('n', OpenPGP::bitlength($this->key[$i]));
+          $material[] = $this->key[$i];
         }
         return $material;
       case 4:
@@ -1467,15 +1434,8 @@ class OpenPGP_PublicKeyPacket extends OpenPGP_Packet {
         );
         $material = array();
         foreach (self::$key_fields[$this->algorithm] as $i) {
-          if (strlen($i) == 1) {
-            $material[] = pack('n', OpenPGP::bitlength($this->key[$i]));
-            $material[] = $this->key[$i];
-          } else if ($i == 'oid') {
-            $material[] = chr(strlen($this->key[$i]));
-            $material[] = $this->key[$i];
-          } else {
-            $material[] = chr($this->key[$i]);
-          }
+          $material[] = pack('n', OpenPGP::bitlength($this->key[$i]));
+          $material[] = $this->key[$i];
         }
         $material = implode('', $material);
         $head[1] = pack('n', 6 + strlen($material));
@@ -1513,12 +1473,9 @@ class OpenPGP_PublicKeyPacket extends OpenPGP_Packet {
   }
 
   static $key_fields = array(
-     1 => array('n', 'e'),
-    16 => array('p', 'g', 'y'),
-    17 => array('p', 'q', 'g', 'y'),
-    18 => array('oid', 'p', 'len', 'future', 'hash', 'algorithm'),
-    19 => array('oid', 'p'),
-    22 => array('oid', 'p')
+     1 => array('n', 'e'),           // RSA
+    16 => array('p', 'g', 'y'),      // ELG-E
+    17 => array('p', 'q', 'g', 'y'), // DSA
   );
 
   static $algorithms = array(
@@ -1529,8 +1486,7 @@ class OpenPGP_PublicKeyPacket extends OpenPGP_Packet {
       17 => 'DSA',
       18 => 'ECC',
       19 => 'ECDSA',
-      21 => 'DH',
-      22 => 'EdDSA'
+      21 => 'DH'
     );
 
 }
@@ -1580,9 +1536,6 @@ class OpenPGP_SecretKeyPacket extends OpenPGP_PublicKeyPacket {
      3 => array('d', 'p', 'q', 'u'), // RSA-S
     16 => array('x'),                // ELG-E
     17 => array('x'),                // DSA
-    18 => array('x'),                // ECDH
-    19 => array('x'),                // ECDSA
-    22 => array('x'),                // EdDSA
   );
 
   function key_from_input() {
@@ -1641,13 +1594,6 @@ class OpenPGP_CompressedDataPacket extends OpenPGP_Packet implements IteratorAgg
   public $algorithm;
   /* see http://tools.ietf.org/html/rfc4880#section-9.3 */
   static $algorithms = array(0 => 'Uncompressed', 1 => 'ZIP', 2 => 'ZLIB', 3 => 'BZip2');
-
-  function __construct($m=NULL, $algorithm=1) {
-    parent::__construct();
-    $this->algorithm = $algorithm;
-    $this->data = $m ? $m : new OpenPGP_Message();
-  }
-
   function read() {
     $this->algorithm = ord($this->read_byte());
     $this->data = $this->read_bytes($this->length);
@@ -1691,33 +1637,25 @@ class OpenPGP_CompressedDataPacket extends OpenPGP_Packet implements IteratorAgg
   }
 
   // IteratorAggregate interface
-  // function getIterator(): \Traversable { // when PHP 5 support is dropped
-  #[\ReturnTypeWillChange]
+
   function getIterator() {
     return new ArrayIterator($this->data->packets);
   }
 
   // ArrayAccess interface
-  // function offsetExists($offset): bool {  // when PHP 5 support is dropped
-  #[\ReturnTypeWillChange]
+
   function offsetExists($offset) {
     return isset($this->data[$offset]);
   }
 
-  // function offsetGet($offset): mixed { // when PHP 7 support is dropped
-  #[\ReturnTypeWillChange]
   function offsetGet($offset) {
     return $this->data[$offset];
   }
 
-  // function offsetSet($offset, $value): void { // when PHP 5 support is dropped
-  #[\ReturnTypeWillChange]
   function offsetSet($offset, $value) {
-    is_null($offset) ? $this->data[] = $value : $this->data[$offset] = $value;
+    return is_null($offset) ? $this->data[] = $value : $this->data[$offset] = $value;
   }
 
-  #[\ReturnTypeWillChange]
-  // function offsetUnset($offset): void { // PHP 5 support is dropped
   function offsetUnset($offset) {
     unset($this->data[$offset]);
   }
diff --git a/securemail/vendor/singpolyma/openpgp-php/lib/openpgp_crypt_rsa.php b/securemail/vendor/singpolyma/openpgp-php/lib/openpgp_crypt_rsa.php
index 8d9c10f0..bce11e18 100644
--- a/securemail/vendor/singpolyma/openpgp-php/lib/openpgp_crypt_rsa.php
+++ b/securemail/vendor/singpolyma/openpgp-php/lib/openpgp_crypt_rsa.php
@@ -7,10 +7,8 @@
  */
 
 // From http://phpseclib.sourceforge.net/
-use phpseclib3\Crypt\PublicKeyLoader;
-use phpseclib3\Crypt\RSA as Crypt_RSA;
-use phpseclib3\Crypt\RSA\PublicKey;
-use phpseclib3\Math\BigInteger as Math_BigInteger;
+use phpseclib\Crypt\RSA as Crypt_RSA;
+use phpseclib\Math\BigInteger as Math_BigInteger;
 
 define('CRYPT_RSA_ENCRYPTION_PKCS1', Crypt_RSA::ENCRYPTION_PKCS1);
 define('CRYPT_RSA_SIGNATURE_PKCS1', Crypt_RSA::SIGNATURE_PKCS1);
@@ -63,7 +61,7 @@ class OpenPGP_Crypt_RSA {
       $verifier = function($m, $s) use($self) {
         $key = $self->public_key($s->issuer());
         if(!$key) return false;
-        $key = $key->withHash(strtolower($s->hash_algorithm_name()));
+        $key->setHash(strtolower($s->hash_algorithm_name()));
         return $key->verify($m, reset($s->data));
       };
     } else {
@@ -77,7 +75,7 @@ class OpenPGP_Crypt_RSA {
           $key = $packet->public_key($s->issuer());
         }
         if(!$key) return false;
-        $key = $key->withHash(strtolower($s->hash_algorithm_name()));
+        $key->setHash(strtolower($s->hash_algorithm_name()));
         return $key->verify($m, reset($s->data));
       };
     }
@@ -125,7 +123,7 @@ class OpenPGP_Crypt_RSA {
       if(!$keyid) $keyid = substr($key->key()->fingerprint, -16, 16);
       $key = $key->private_key($keyid);
     }
-    $key = $key->withHash(strtolower($hash));
+    $key->setHash(strtolower($hash));
 
     $sig = new OpenPGP_SignaturePacket($message, 'RSA', strtoupper($hash));
     $sig->hashed_subpackets[] = new OpenPGP_SignaturePacket_IssuerPacket($keyid);
@@ -147,7 +145,7 @@ class OpenPGP_Crypt_RSA {
     if(!$key || !$packet) return NULL; // Missing some data
 
     if(!$keyid) $keyid = substr($this->key->fingerprint, -16);
-    $key = $key->withHash(strtolower($hash));
+    $key->setHash(strtolower($hash));
 
     $sig = NULL;
     foreach($packet as $p) {
@@ -184,10 +182,8 @@ class OpenPGP_Crypt_RSA {
       $keys = new self($keys);
     }
 
-    $session_key = NULL;
     foreach($message as $p) {
       if($p instanceof OpenPGP_AsymmetricSessionKeyPacket) {
-        $session_key = $p;
         if($keys instanceof Crypt_RSA) {
           $sk = self::try_decrypt_session($keys, substr($p->encrypted_data, 2));
         } else if(strlen(str_replace('0', '', $p->keyid)) < 1) {
@@ -207,81 +203,63 @@ class OpenPGP_Crypt_RSA {
       }
     }
 
-    if (!$session_key) throw new Exception("Not an asymmetrically encrypted message");
-
     return NULL; /* Failed */
   }
 
   static function try_decrypt_session($key, $edata) {
-    $key = $key->withPadding(CRYPT_RSA_ENCRYPTION_PKCS1 | CRYPT_RSA_SIGNATURE_PKCS1);
-    try {
-        $data = $key->decrypt($edata);
-    } catch (\RuntimeException $e) {
-        return NULL;
-    }
-
-    if(!$data) return NULL;
+    $key->setEncryptionMode(CRYPT_RSA_ENCRYPTION_PKCS1);
+    $data = $key->decrypt($edata);
     $sk = substr($data, 1, strlen($data)-3);
     $chk = unpack('n', substr($data, -2));
     $chk = reset($chk);
 
     $sk_chk = 0;
     for($i = 0; $i < strlen($sk); $i++) {
-      $sk_chk = ($sk_chk + ord($sk[$i])) % 65536;
+      $sk_chk = ($sk_chk + ord($sk{$i})) % 65536;
     }
 
     if($sk_chk != $chk) return NULL;
-    return array(ord($data[0]), $sk);
+    return array(ord($data{0}), $sk);
   }
 
   static function crypt_rsa_key($mod, $exp, $hash='SHA256') {
-    return Crypt_RSA::loadPublicKey([
-        'e' => new Math_BigInteger($exp, 256),
-        'n' => new Math_BigInteger($mod, 256),
-    ])
-        ->withPadding(CRYPT_RSA_SIGNATURE_PKCS1 | CRYPT_RSA_ENCRYPTION_PKCS1)
-        ->withHash(strtolower($hash));
+    $rsa = new Crypt_RSA();
+    $rsa->setSignatureMode(CRYPT_RSA_SIGNATURE_PKCS1);
+    $rsa->setHash(strtolower($hash));
+    $rsa->modulus = new Math_BigInteger($mod, 256);
+    $rsa->k = strlen($rsa->modulus->toBytes());
+    $rsa->exponent = new Math_BigInteger($exp, 256);
+    $rsa->setPublicKey();
+    return $rsa;
   }
 
   static function convert_key($packet, $private=false) {
     if(!is_object($packet)) $packet = OpenPGP_Message::parse($packet);
     if($packet instanceof OpenPGP_Message) $packet = $packet[0];
 
+    $mod = $packet->key['n'];
     $exp = $packet->key['e'];
     if($private) $exp = $packet->key['d'];
     if(!$exp) return NULL; // Packet doesn't have needed data
 
-    /**
-     * @see https://github.com/phpseclib/phpseclib/issues/1113
-     * Primes and coefficients now use BigIntegers.
-     **/
+    $rsa = self::crypt_rsa_key($mod, $exp);
 
     if($private) {
-        // Invert p and q to make u work out as q'
-        $rawKey = [
-            'e' => new Math_BigInteger($packet->key['e'], 256),
-            'n' => new Math_BigInteger($packet->key['n'], 256),
-            'd' => new Math_BigInteger($packet->key['d'], 256),
-            'q' => new Math_BigInteger($packet->key['p'], 256),
-            'p' => new Math_BigInteger($packet->key['q'], 256),
-        ];
-        if (array_key_exists('u', $packet->key)) {
-            // possible keys for 'u': https://github.com/phpseclib/phpseclib/blob/master/phpseclib/Crypt/RSA/Formats/Keys/Raw.php#L108
-            $rawKey['inerseq'] = new Math_BigInteger($packet->key['u'], 256);
-        }
-
-        return publickeyloader::loadPrivateKey($rawKey)
-            ->withPadding(CRYPT_RSA_SIGNATURE_PKCS1 | CRYPT_RSA_ENCRYPTION_PKCS1)
-            ->withHash('sha256');
-    } else {
-
-        return publickeyloader::loadPublicKey([
-            'e' => new Math_BigInteger($packet->key['e'], 256),
-            'n' => new Math_BigInteger($packet->key['n'], 256),
-        ])
-            ->withPadding(CRYPT_RSA_SIGNATURE_PKCS1 | CRYPT_RSA_ENCRYPTION_PKCS1)
-            ->withHash('sha256');
+        /**
+         * @see https://github.com/phpseclib/phpseclib/issues/1113
+         * Primes and coefficients now use BigIntegers.
+         **/
+        //set the primes
+        if($packet->key['p'] && $packet->key['q'])
+            $rsa->primes = array(
+                1 => new Math_BigInteger($packet->key['p'], 256),
+                2 => new Math_BigInteger($packet->key['q'], 256)
+            );
+        // set the coefficients
+        if($packet->key['u']) $rsa->coefficients = array(2 => new Math_BigInteger($packet->key['u'], 256));
     }
+
+    return $rsa;
   }
 
   static function convert_public_key($packet) {
diff --git a/securemail/vendor/singpolyma/openpgp-php/lib/openpgp_crypt_symmetric.php b/securemail/vendor/singpolyma/openpgp-php/lib/openpgp_crypt_symmetric.php
index 17ef96a4..844c53b2 100644
--- a/securemail/vendor/singpolyma/openpgp-php/lib/openpgp_crypt_symmetric.php
+++ b/securemail/vendor/singpolyma/openpgp-php/lib/openpgp_crypt_symmetric.php
@@ -1,15 +1,15 @@
 <?php
 
-use phpseclib3\Crypt\AES as Crypt_AES;
-use phpseclib3\Crypt\Blowfish as Crypt_Blowfish;
-use phpseclib3\Crypt\TripleDES as Crypt_TripleDES;
-use phpseclib3\Crypt\Twofish as Crypt_Twofish;
-use phpseclib3\Crypt\Random;
+use phpseclib\Crypt\TripleDES as Crypt_TripleDES;
+use phpseclib\Crypt\AES as Crypt_AES;
+use phpseclib\Crypt\Random;
+
+define('CRYPT_DES_MODE_CFB', Crypt_TripleDES::MODE_CFB);
+define('CRYPT_AES_MODE_CFB', Crypt_AES::MODE_CFB);
 
 require_once dirname(__FILE__).'/openpgp.php';
 @include_once dirname(__FILE__).'/openpgp_crypt_rsa.php';
 @include_once dirname(__FILE__).'/openpgp_mcrypt_wrapper.php';
-@include_once dirname(__FILE__).'/openpgp_openssl_wrapper.php';
 
 class OpenPGP_Crypt_Symmetric {
   public static function encrypt($passphrases_and_keys, $message, $symmetric_algorithm=9) {
@@ -34,12 +34,13 @@ class OpenPGP_Crypt_Symmetric {
       if($pass instanceof OpenPGP_PublicKeyPacket) {
         if(!in_array($pass->algorithm, array(1,2,3))) throw new Exception("Only RSA keys are supported.");
         $crypt_rsa = new OpenPGP_Crypt_RSA($pass);
-        $rsa = $crypt_rsa->public_key()->withPadding(CRYPT_RSA_ENCRYPTION_PKCS1 | CRYPT_RSA_SIGNATURE_PKCS1);
+        $rsa = $crypt_rsa->public_key();
+        $rsa->setEncryptionMode(CRYPT_RSA_ENCRYPTION_PKCS1);
         $esk = $rsa->encrypt(chr($symmetric_algorithm) . $key . pack('n', self::checksum($key)));
         $esk = pack('n', OpenPGP::bitlength($esk)) . $esk;
         array_unshift($encrypted, new OpenPGP_AsymmetricSessionKeyPacket($pass->algorithm, $pass->fingerprint(), $esk));
       } else if(is_string($pass)) {
-        $s2k = new OpenPGP_S2K(Random::string(8));
+        $s2k = new OpenPGP_S2K(Random::string(10));
         $cipher->setKey($s2k->make_key($pass, $key_bytes));
         $esk = $cipher->encrypt(chr($symmetric_algorithm) . $key);
         array_unshift($encrypted, new OpenPGP_SymmetricSessionKeyPacket($s2k, $esk, $symmetric_algorithm));
@@ -61,7 +62,7 @@ class OpenPGP_Crypt_Symmetric {
 
           $padAmount = $key_block_bytes - (strlen($p->encrypted_data) % $key_block_bytes);
           $data = substr($cipher->decrypt($p->encrypted_data . str_repeat("\0", $padAmount)), 0, strlen($p->encrypted_data));
-          $decrypted = self::decryptPacket($epacket, ord($data[0]), substr($data, 1));
+          $decrypted = self::decryptPacket($epacket, ord($data{0}), substr($data, 1));
         } else {
           list($cipher, $key_bytes, $key_block_bytes) = self::getCipher($p->symmetric_algorithm);
           $decrypted = self::decryptPacket($epacket, $p->symmetric_algorithm, $p->s2k->make_key($pass, $key_bytes));
@@ -74,31 +75,6 @@ class OpenPGP_Crypt_Symmetric {
     return NULL; /* If we get here, we failed */
   }
 
-  public static function encryptSecretKey($pass, $packet, $symmetric_algorithm=9) {
-    $packet = clone $packet; // Do not mutate original
-    $packet->s2k_useage = 254;
-    $packet->symmetric_algorithm = $symmetric_algorithm;
-
-    list($cipher, $key_bytes, $key_block_bytes) = self::getCipher($packet->symmetric_algorithm);
-    if(!$cipher) throw new Exception("Unsupported cipher");
-
-    $material = '';
-    foreach(OpenPGP_SecretKeyPacket::$secret_key_fields[$packet->algorithm] as $field) {
-      $f = $packet->key[$field];
-      $material .= pack('n', OpenPGP::bitlength($f)) . $f;
-      unset($packet->key[$field]);
-    }
-    $material .= hash('sha1', $material, true);
-
-    $iv = Random::string($key_block_bytes);
-    if(!$packet->s2k) $packet->s2k = new OpenPGP_S2K(Random::string(8));
-    $cipher->setKey($packet->s2k->make_key($pass, $key_bytes));
-    $cipher->setIV($iv);
-    $packet->encrypted_data = $iv . $cipher->encrypt($material);
-
-    return $packet;
-  }
-
   public static function decryptSecretKey($pass, $packet) {
     $packet = clone $packet; // Do not mutate orinigal
 
@@ -121,7 +97,6 @@ class OpenPGP_Crypt_Symmetric {
       if($chk != $mkChk) return NULL;
     }
 
-    $packet->s2k = NULL;
     $packet->s2k_useage = 0;
     $packet->symmetric_algorithm = 0;
     $packet->encrypted_data = NULL;
@@ -170,58 +145,35 @@ class OpenPGP_Crypt_Symmetric {
 
   public static function getCipher($algo) {
     $cipher = NULL;
-
-    // https://datatracker.ietf.org/doc/html/rfc4880#section-13.9
-    // "   1.  The feedback register (FR) is set to the IV, which is all zeros."
     switch($algo) {
-    case NULL:
-      case 0:
-        throw new Exception("Data is already unencrypted");
       case 2:
-        $cipher = new Crypt_TripleDES('cfb');
-        $cipher->setIV(str_repeat(pack('x'), 8));
-        $key_bytes = 24;
-        $key_block_bytes = 8;
+          $cipher = new Crypt_TripleDES(CRYPT_DES_MODE_CFB);
+          $key_bytes = 24;
+          $key_block_bytes = 8;
         break;
       case 3:
-        if(class_exists('OpenSSLWrapper')) {
-          $cipher = new OpenSSLWrapper("CAST5-CFB");
-        } else if(defined('MCRYPT_CAST_128')) {
+        if(defined('MCRYPT_CAST_128')) {
           $cipher = new MCryptWrapper(MCRYPT_CAST_128);
+        } else {
+          throw new Exception("Unsupported cipher: you must have mcrypt installed to use CAST5");
         }
         break;
-      case 4:
-        $cipher = new Crypt_Blowfish('cfb');
-        $cipher->setIV(str_repeat(pack('x'), 8));
-        $key_bytes = 16;
-        $key_block_bytes = 8;
-        break;
       case 7:
-        $cipher = new Crypt_AES('cfb');
-        $cipher->setKeyLength(128);
-        $cipher->setIV(str_repeat(pack('x'), 16));
+          $cipher = new Crypt_AES(CRYPT_AES_MODE_CFB);
+          $cipher->setKeyLength(128);
         break;
       case 8:
-        $cipher = new Crypt_AES('cfb');
-        $cipher->setKeyLength(192);
-        $cipher->setIV(str_repeat(pack('x'), 16));
+          $cipher = new Crypt_AES(CRYPT_AES_MODE_CFB);
+          $cipher->setKeyLength(192);
         break;
       case 9:
-        $cipher = new Crypt_AES('cfb');
-        $cipher->setKeyLength(256);
-        $cipher->setIV(str_repeat(pack('x'), 16));
-        break;
-      case 10:
-        $cipher = new Crypt_Twofish('cfb');
-        $cipher->setIV(str_repeat(pack('x'), 16));
-        $key_bytes = 32;
+          $cipher = new Crypt_AES(CRYPT_AES_MODE_CFB);
+          $cipher->setKeyLength(256);
         break;
     }
     if(!$cipher) return array(NULL, NULL, NULL); // Unsupported cipher
-
-
-    if(!isset($key_bytes)) $key_bytes = $cipher->getKeyLength() >> 3;
-    if(!isset($key_block_bytes)) $key_block_bytes = $cipher->getBlockLengthInBytes();
+    if(!isset($key_bytes)) $key_bytes = isset($cipher->key_size)?$cipher->key_size:$cipher->key_length;
+    if(!isset($key_block_bytes)) $key_block_bytes = $cipher->block_size;
     return array($cipher, $key_bytes, $key_block_bytes);
   }
 
@@ -235,7 +187,7 @@ class OpenPGP_Crypt_Symmetric {
   public static function checksum($s) {
     $mkChk = 0;
     for($i = 0; $i < strlen($s); $i++) {
-      $mkChk = ($mkChk + ord($s[$i])) % 65536;
+      $mkChk = ($mkChk + ord($s{$i})) % 65536;
     }
     return $mkChk;
   }
diff --git a/securemail/vendor/singpolyma/openpgp-php/lib/openpgp_mcrypt_wrapper.php b/securemail/vendor/singpolyma/openpgp-php/lib/openpgp_mcrypt_wrapper.php
index 65fc145a..10307006 100644
--- a/securemail/vendor/singpolyma/openpgp-php/lib/openpgp_mcrypt_wrapper.php
+++ b/securemail/vendor/singpolyma/openpgp-php/lib/openpgp_mcrypt_wrapper.php
@@ -12,15 +12,6 @@ if(function_exists('mcrypt_encrypt') && defined('MCRYPT_MODE_CFB')) {
       $this->iv = str_repeat("\0", mcrypt_get_iv_size($cipher, 'ncfb'));
     }
 
-    function getBlockLengthInBytes()
-    {
-        return $this->block_size;
-    }
-
-    function getKeyLength() {
-        return $this->key_size << 3;
-    }
-
     function setKey($key) {
       $this->key = $key;
     }
diff --git a/securemail/vendor/singpolyma/openpgp-php/lib/openpgp_openssl_wrapper.php b/securemail/vendor/singpolyma/openpgp-php/lib/openpgp_openssl_wrapper.php
deleted file mode 100644
index 7ebbb782..00000000
--- a/securemail/vendor/singpolyma/openpgp-php/lib/openpgp_openssl_wrapper.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-if(function_exists('openssl_encrypt')) {
-  class OpenSSLWrapper {
-    public $cipher, $key, $iv, $key_size, $block_size;
-
-
-    function __construct($cipher) {
-      if($cipher != "CAST5-CFB") throw Exception("OpenSSLWrapper is only used for CAST5 right now");
-
-      $this->cipher = $cipher;
-      $this->key_size = 16;
-      $this->block_size = 8;
-      $this->iv = str_repeat("\0", 8);
-    }
-
-    function getBlockLengthInBytes()
-    {
-        return $this->block_size;
-    }
-
-    function getKeyLength() {
-        return $this->key_size << 3;
-    }
-
-    function setKey($key) {
-      $this->key = $key;
-    }
-
-    function setIV($iv) {
-      $this->iv = $iv;
-    }
-
-    function encrypt($data) {
-      return openssl_encrypt($data, $this->cipher, $this->key, OPENSSL_RAW_DATA|OPENSSL_ZERO_PADDING, $this->iv);
-    }
-
-    function decrypt($data) {
-      return openssl_decrypt($data, $this->cipher, $this->key, OPENSSL_RAW_DATA|OPENSSL_ZERO_PADDING, $this->iv);
-    }
-  }
-}
diff --git a/securemail/vendor/singpolyma/openpgp-php/lib/openpgp_sodium.php b/securemail/vendor/singpolyma/openpgp-php/lib/openpgp_sodium.php
deleted file mode 100644
index 08a95dbf..00000000
--- a/securemail/vendor/singpolyma/openpgp-php/lib/openpgp_sodium.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-function sodium_make_verifier($pk) {
-  return function($m, $s) use ($pk) {
-    if($pk instanceof OpenPGP_Message) {
-      foreach($pk as $p) {
-        if($p instanceof OpenPGP_PublicKeyPacket) {
-          if(substr($p->fingerprint, strlen($s->issuer())*-1) == $s->issuer()) {
-            $pk = $p;
-            break;
-          }
-        }
-      }
-    }
-
-    if ($pk->algorithm != 22) throw new Exception("Only EdDSA supported");
-    if (bin2hex($pk->key['oid']) != '2b06010401da470f01') throw new Exception("Only ed25519 supported");
-    return sodium_crypto_sign_verify_detached(
-      implode($s->data),
-      hash($s->hash_algorithm_name(), $m, true),
-      substr($pk->key['p'], 1)
-    );
-  };
-}
\ No newline at end of file
diff --git a/securemail/vendor/singpolyma/openpgp-php/phpunit.xml b/securemail/vendor/singpolyma/openpgp-php/phpunit.xml
index bb865205..a38403e1 100644
--- a/securemail/vendor/singpolyma/openpgp-php/phpunit.xml
+++ b/securemail/vendor/singpolyma/openpgp-php/phpunit.xml
@@ -8,10 +8,6 @@
       <file>tests/suite.php</file>
     </testsuite>
 
-    <testsuite name="Signature">
-      <file>tests/suite.php</file>
-    </testsuite>
-
     <testsuite name="MessageVerification">
       <file>tests/phpseclib_suite.php</file>
     </testsuite>
@@ -27,9 +23,5 @@
     <testsuite name="Encryption">
       <file>tests/phpseclib_suite.php</file>
     </testsuite>
-
-    <testsuite name="SodiumMessageVerification">
-      <file>tests/sodium_suite.php</file>
-    </testsuite>
   </testsuites>
 </phpunit>
diff --git a/securemail/vendor/singpolyma/openpgp-php/tests/data/000079-002.sig b/securemail/vendor/singpolyma/openpgp-php/tests/data/000079-002.sig
deleted file mode 100644
index d5a51b9c..00000000
Binary files a/securemail/vendor/singpolyma/openpgp-php/tests/data/000079-002.sig and /dev/null differ
diff --git a/securemail/vendor/singpolyma/openpgp-php/tests/data/000080-006.public_key b/securemail/vendor/singpolyma/openpgp-php/tests/data/000080-006.public_key
deleted file mode 100644
index dce135cb..00000000
Binary files a/securemail/vendor/singpolyma/openpgp-php/tests/data/000080-006.public_key and /dev/null differ
diff --git a/securemail/vendor/singpolyma/openpgp-php/tests/data/000081-002.sig b/securemail/vendor/singpolyma/openpgp-php/tests/data/000081-002.sig
deleted file mode 100644
index e428a87c..00000000
Binary files a/securemail/vendor/singpolyma/openpgp-php/tests/data/000081-002.sig and /dev/null differ
diff --git a/securemail/vendor/singpolyma/openpgp-php/tests/data/000082-006.public_key b/securemail/vendor/singpolyma/openpgp-php/tests/data/000082-006.public_key
deleted file mode 100644
index f521febd..00000000
Binary files a/securemail/vendor/singpolyma/openpgp-php/tests/data/000082-006.public_key and /dev/null differ
diff --git a/securemail/vendor/singpolyma/openpgp-php/tests/data/000083-002.sig b/securemail/vendor/singpolyma/openpgp-php/tests/data/000083-002.sig
deleted file mode 100644
index ecff87f8..00000000
Binary files a/securemail/vendor/singpolyma/openpgp-php/tests/data/000083-002.sig and /dev/null differ
diff --git a/securemail/vendor/singpolyma/openpgp-php/tests/data/ed25519.public_key b/securemail/vendor/singpolyma/openpgp-php/tests/data/ed25519.public_key
deleted file mode 100644
index eda21e4c..00000000
Binary files a/securemail/vendor/singpolyma/openpgp-php/tests/data/ed25519.public_key and /dev/null differ
diff --git a/securemail/vendor/singpolyma/openpgp-php/tests/data/ed25519.secret_key b/securemail/vendor/singpolyma/openpgp-php/tests/data/ed25519.secret_key
deleted file mode 100644
index acfbdf58..00000000
Binary files a/securemail/vendor/singpolyma/openpgp-php/tests/data/ed25519.secret_key and /dev/null differ
diff --git a/securemail/vendor/singpolyma/openpgp-php/tests/data/ed25519.sig b/securemail/vendor/singpolyma/openpgp-php/tests/data/ed25519.sig
deleted file mode 100644
index 7c585a85..00000000
Binary files a/securemail/vendor/singpolyma/openpgp-php/tests/data/ed25519.sig and /dev/null differ
diff --git a/securemail/vendor/singpolyma/openpgp-php/tests/data/symmetric-blowfish.gpg b/securemail/vendor/singpolyma/openpgp-php/tests/data/symmetric-blowfish.gpg
deleted file mode 100644
index 0dda30c9..00000000
--- a/securemail/vendor/singpolyma/openpgp-php/tests/data/symmetric-blowfish.gpg
+++ /dev/null
@@ -1 +0,0 @@
-�
��h��ϳ��fu�h���s��������_VF�4�
\ No newline at end of file
diff --git a/securemail/vendor/singpolyma/openpgp-php/tests/data/symmetric-twofish.gpg b/securemail/vendor/singpolyma/openpgp-php/tests/data/symmetric-twofish.gpg
deleted file mode 100644
index 14255d8d..00000000
--- a/securemail/vendor/singpolyma/openpgp-php/tests/data/symmetric-twofish.gpg
+++ /dev/null
@@ -1,3 +0,0 @@
-�

-c�І�����9
=����]�Tf�A�c�v��e�k���ʲ���n}%.�l��u�?\��I
-�[��bl�
\ No newline at end of file
diff --git a/securemail/vendor/singpolyma/openpgp-php/tests/phpseclib_suite.php b/securemail/vendor/singpolyma/openpgp-php/tests/phpseclib_suite.php
index a31ab0df..0f6ae30f 100644
--- a/securemail/vendor/singpolyma/openpgp-php/tests/phpseclib_suite.php
+++ b/securemail/vendor/singpolyma/openpgp-php/tests/phpseclib_suite.php
@@ -1,5 +1,4 @@
 <?php
-use PHPUnit\Framework\TestCase;
 
 /* The tests which require phpseclib */
 
@@ -7,7 +6,7 @@ require_once dirname(__FILE__).'/../lib/openpgp.php';
 require_once dirname(__FILE__).'/../lib/openpgp_crypt_rsa.php';
 require_once dirname(__FILE__).'/../lib/openpgp_crypt_symmetric.php';
 
-class MessageVerification extends TestCase {
+class MessageVerification extends PHPUnit_Framework_TestCase {
   public function oneMessageRSA($pkey, $path) {
     $pkeyM = OpenPGP_Message::parse(file_get_contents(dirname(__FILE__) . '/data/' . $pkey));
     $m = OpenPGP_Message::parse(file_get_contents(dirname(__FILE__) . '/data/' . $path));
@@ -52,7 +51,7 @@ class MessageVerification extends TestCase {
 }
 
 
-class KeyVerification extends TestCase {
+class KeyVerification extends PHPUnit_Framework_TestCase {
   public function oneKeyRSA($path) {
     $m = OpenPGP_Message::parse(file_get_contents(dirname(__FILE__) . '/data/' . $path));
     $verify = new OpenPGP_Crypt_RSA($m);
@@ -64,19 +63,8 @@ class KeyVerification extends TestCase {
   }
 }
 
-abstract class LibTestCase extends TestCase {
-  public function assertCast5Support() {
-    if(in_array('mcrypt', get_loaded_extensions())) {
-       return;
-    }
-    if(in_array('cast5-cfb', openssl_get_cipher_methods()) || in_array('CAST5-CFB', openssl_get_cipher_methods())) {
-      return;
-    }
-    $this->markTestSkipped('Not supported');
-  }
-}
 
-class Decryption extends LibTestCase {
+class Decryption extends PHPUnit_Framework_TestCase {
   public function oneSymmetric($pass, $cnt, $path) {
     $m = OpenPGP_Message::parse(file_get_contents(dirname(__FILE__) . '/data/' . $path));
     $m2 = OpenPGP_Crypt_Symmetric::decryptSymmetric($pass, $m);
@@ -88,27 +76,16 @@ class Decryption extends LibTestCase {
     }
   }
 
-  public function testDecrypt3DES() {
-    $this->oneSymmetric("hello", "PGP\n", "symmetric-3des.gpg");
-  }
-
-  public function testDecryptCAST5() { // Requires mcrypt or openssl
-    $this->assertCast5Support();
-    $this->oneSymmetric("hello", "PGP\n", "symmetric-cast5.gpg");
-  }
-
-  public function testDecryptBlowfish() {
-    $this->oneSymmetric("hello", "PGP\n", "symmetric-blowfish.gpg");
-  }
-
   public function testDecryptAES() {
     $this->oneSymmetric("hello", "PGP\n", "symmetric-aes.gpg");
   }
 
-  public function testDecryptTwofish() {
-    if(OpenPGP_Crypt_Symmetric::getCipher(10)[0]) {
-      $this->oneSymmetric("hello", "PGP\n", "symmetric-twofish.gpg");
-    }
+  public function testDecrypt3DES() {
+    $this->oneSymmetric("hello", "PGP\n", "symmetric-3des.gpg");
+  }
+
+  public function testDecryptCAST5() { // Requires mcrypt
+    $this->oneSymmetric("hello", "PGP\n", "symmetric-cast5.gpg");
   }
 
   public function testDecryptSessionKey() {
@@ -132,90 +109,25 @@ class Decryption extends LibTestCase {
     }
   }
 
-  public function testDecryptRoundtrip() {
-    $m = new OpenPGP_Message(array(new OpenPGP_LiteralDataPacket("hello\n")));
-    $key = OpenPGP_Message::parse(file_get_contents(dirname(__FILE__) . '/data/helloKey.gpg'));
-    $em = OpenPGP_Crypt_Symmetric::encrypt($key, $m);
-
-    foreach($key as $packet) {
-	   if(!($packet instanceof OpenPGP_SecretKeyPacket)) continue;
-      $decryptor = new OpenPGP_Crypt_RSA($packet);
-      $m2 = $decryptor->decrypt($em);
-
-      foreach($m2 as $p) {
-        if($p instanceof OpenPGP_LiteralDataPacket) {
-          $this->assertEquals($p->data, "hello\n");
-        }
-      }
-    }
-  }
-
   public function testDecryptSecretKey() {
     $key = OpenPGP_Message::parse(file_get_contents(dirname(__FILE__) . '/data/encryptedSecretKey.gpg'));
     $skey = OpenPGP_Crypt_Symmetric::decryptSecretKey("hello", $key[0]);
     $this->assertSame(!!$skey, true);
   }
-
-  public function testEncryptSecretKeyRoundtrip() {
-    $key = OpenPGP_Message::parse(file_get_contents(dirname(__FILE__) . '/data/helloKey.gpg'));
-    $enkey = OpenPGP_Crypt_Symmetric::encryptSecretKey("password", $key[0]);
-    $skey = OpenPGP_Crypt_Symmetric::decryptSecretKey("password", $enkey);
-    $this->assertEquals($key[0], $skey);
-  }
-
-  public function testAlreadyDecryptedSecretKey() {
-    $this->expectException(Exception::class);
-    $this->expectExceptionMessage("Data is already unencrypted");
-    $key = OpenPGP_Message::parse(file_get_contents(dirname(__FILE__) . '/data/helloKey.gpg'));
-    OpenPGP_Crypt_Symmetric::decryptSecretKey("hello", $key[0]);
-  }
 }
 
-class Encryption extends LibTestCase {
-  public function oneSymmetric($algorithm) {
+class Encryption extends PHPUnit_Framework_TestCase {
+  public function testEncryptSymmetric() {
     $data = new OpenPGP_LiteralDataPacket('This is text.', array('format' => 'u', 'filename' => 'stuff.txt'));
-    $encrypted = OpenPGP_Crypt_Symmetric::encrypt('secret', new OpenPGP_Message(array($data)), $algorithm);
-    $encrypted = OpenPGP_Message::parse($encrypted->to_bytes());
+    $encrypted = OpenPGP_Crypt_Symmetric::encrypt('secret', new OpenPGP_Message(array($data)));
     $decrypted = OpenPGP_Crypt_Symmetric::decryptSymmetric('secret', $encrypted);
     $this->assertEquals($decrypted[0]->data, 'This is text.');
   }
 
-  public function testEncryptSymmetric3DES() {
-    $this->oneSymmetric(2);
-  }
-
-  public function testEncryptSymmetricCAST5() {
-    $this->assertCast5Support();
-    $this->oneSymmetric(3);
-  }
-
-  public function testEncryptSymmetricBlowfish() {
-    $this->oneSymmetric(4);
-  }
-
-  public function testEncryptSymmetricAES128() {
-    $this->oneSymmetric(7);
-  }
-
-  public function testEncryptSymmetricAES192() {
-    $this->oneSymmetric(8);
-  }
-
-  public function testEncryptSymmetricAES256() {
-    $this->oneSymmetric(9);
-  }
-
-  public function testEncryptSymmetricTwofish() {
-    if(OpenPGP_Crypt_Symmetric::getCipher(10)[0]) {
-      $this->oneSymmetric(10);
-    }
-  }
-
   public function testEncryptAsymmetric() {
     $key = OpenPGP_Message::parse(file_get_contents(dirname(__FILE__) . '/data/helloKey.gpg'));
     $data = new OpenPGP_LiteralDataPacket('This is text.', array('format' => 'u', 'filename' => 'stuff.txt'));
     $encrypted = OpenPGP_Crypt_Symmetric::encrypt($key, new OpenPGP_Message(array($data)));
-    $encrypted = OpenPGP_Message::parse($encrypted->to_bytes());
     $decryptor = new OpenPGP_Crypt_RSA($key);
     $decrypted = $decryptor->decrypt($encrypted);
     $this->assertEquals($decrypted[0]->data, 'This is text.');
diff --git a/securemail/vendor/singpolyma/openpgp-php/tests/sodium_suite.php b/securemail/vendor/singpolyma/openpgp-php/tests/sodium_suite.php
deleted file mode 100644
index 22f5d551..00000000
--- a/securemail/vendor/singpolyma/openpgp-php/tests/sodium_suite.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-use PHPUnit\Framework\TestCase;
-
-/* The tests which require phpseclib */
-
-require_once dirname(__FILE__).'/../lib/openpgp.php';
-require_once dirname(__FILE__).'/../lib/openpgp_sodium.php';
-
-class SodiumMessageVerification extends TestCase {
-  public function oneMessageEdDSA($pkey, $path) {
-    $pkeyM = OpenPGP_Message::parse(file_get_contents(dirname(__FILE__) . '/data/' . $pkey));
-    $m = OpenPGP_Message::parse(file_get_contents(dirname(__FILE__) . '/data/' . $path));
-    $verify = sodium_make_verifier($pkeyM);
-    $this->assertSame($m->verified_signatures(array('EdDSA' => $verify)), $m->signatures());
-  }
-
-  public function tested25519() {
-    $this->oneMessageEdDSA('ed25519.public_key', 'ed25519.sig');
-  }
-}
diff --git a/securemail/vendor/singpolyma/openpgp-php/tests/suite.php b/securemail/vendor/singpolyma/openpgp-php/tests/suite.php
index fbd6f3bb..1752d0b6 100644
--- a/securemail/vendor/singpolyma/openpgp-php/tests/suite.php
+++ b/securemail/vendor/singpolyma/openpgp-php/tests/suite.php
@@ -1,9 +1,8 @@
 <?php
-use PHPUnit\Framework\TestCase;
 
 require_once dirname(__FILE__).'/../lib/openpgp.php';
 
-class Serialization extends TestCase {
+class Serialization extends PHPUnit_Framework_TestCase {
   public function oneSerialization($path) {
     $in = OpenPGP_Message::parse(file_get_contents(dirname(__FILE__) . '/data/' . $path));
     $mid = $in->to_bytes();
@@ -15,354 +14,355 @@ class Serialization extends TestCase {
     $this->oneSerialization("000001-006.public_key");
   }
 
+  
   public function test000002013user_id() {
     $this->oneSerialization("000002-013.user_id");
   }
-
+  
   public function test000003002sig() {
     $this->oneSerialization("000003-002.sig");
   }
-
+  
   public function test000004012ring_trust() {
     $this->oneSerialization("000004-012.ring_trust");
   }
-
+  
   public function test000005002sig() {
     $this->oneSerialization("000005-002.sig");
   }
-
+  
   public function test000006012ring_trust() {
     $this->oneSerialization("000006-012.ring_trust");
   }
-
+  
   public function test000007002sig() {
     $this->oneSerialization("000007-002.sig");
   }
-
+  
   public function test000008012ring_trust() {
     $this->oneSerialization("000008-012.ring_trust");
   }
-
+  
   public function test000009002sig() {
     $this->oneSerialization("000009-002.sig");
   }
-
+  
   public function test000010012ring_trust() {
     $this->oneSerialization("000010-012.ring_trust");
   }
-
+  
   public function test000011002sig() {
     $this->oneSerialization("000011-002.sig");
   }
-
+  
   public function test000012012ring_trust() {
     $this->oneSerialization("000012-012.ring_trust");
   }
-
+  
   public function test000013014public_subkey() {
     $this->oneSerialization("000013-014.public_subkey");
   }
-
+  
   public function test000014002sig() {
     $this->oneSerialization("000014-002.sig");
   }
-
+  
   public function test000015012ring_trust() {
     $this->oneSerialization("000015-012.ring_trust");
   }
-
+  
   public function test000016006public_key() {
     $this->oneSerialization("000016-006.public_key");
   }
-
+  
   public function test000017002sig() {
     $this->oneSerialization("000017-002.sig");
   }
-
+  
   public function test000018012ring_trust() {
     $this->oneSerialization("000018-012.ring_trust");
   }
-
+  
   public function test000019013user_id() {
     $this->oneSerialization("000019-013.user_id");
   }
-
+  
   public function test000020002sig() {
     $this->oneSerialization("000020-002.sig");
   }
-
+  
   public function test000021012ring_trust() {
     $this->oneSerialization("000021-012.ring_trust");
   }
-
+  
   public function test000022002sig() {
     $this->oneSerialization("000022-002.sig");
   }
-
+  
   public function test000023012ring_trust() {
     $this->oneSerialization("000023-012.ring_trust");
   }
-
+  
   public function test000024014public_subkey() {
     $this->oneSerialization("000024-014.public_subkey");
   }
-
+  
   public function test000025002sig() {
     $this->oneSerialization("000025-002.sig");
   }
-
+  
   public function test000026012ring_trust() {
     $this->oneSerialization("000026-012.ring_trust");
   }
-
+  
   public function test000027006public_key() {
     $this->oneSerialization("000027-006.public_key");
   }
-
+  
   public function test000028002sig() {
     $this->oneSerialization("000028-002.sig");
   }
-
+  
   public function test000029012ring_trust() {
     $this->oneSerialization("000029-012.ring_trust");
   }
-
+  
   public function test000030013user_id() {
     $this->oneSerialization("000030-013.user_id");
   }
-
+  
   public function test000031002sig() {
     $this->oneSerialization("000031-002.sig");
   }
-
+  
   public function test000032012ring_trust() {
     $this->oneSerialization("000032-012.ring_trust");
   }
-
+  
   public function test000033002sig() {
     $this->oneSerialization("000033-002.sig");
   }
-
+  
   public function test000034012ring_trust() {
     $this->oneSerialization("000034-012.ring_trust");
   }
-
+  
   public function test000035006public_key() {
     $this->oneSerialization("000035-006.public_key");
   }
-
+  
   public function test000036013user_id() {
     $this->oneSerialization("000036-013.user_id");
   }
-
+  
   public function test000037002sig() {
     $this->oneSerialization("000037-002.sig");
   }
-
+  
   public function test000038012ring_trust() {
     $this->oneSerialization("000038-012.ring_trust");
   }
-
+  
   public function test000039002sig() {
     $this->oneSerialization("000039-002.sig");
   }
-
+  
   public function test000040012ring_trust() {
     $this->oneSerialization("000040-012.ring_trust");
   }
-
+  
   public function test000041017attribute() {
     $this->oneSerialization("000041-017.attribute");
   }
-
+  
   public function test000042002sig() {
     $this->oneSerialization("000042-002.sig");
   }
-
+  
   public function test000043012ring_trust() {
     $this->oneSerialization("000043-012.ring_trust");
   }
-
+  
   public function test000044014public_subkey() {
     $this->oneSerialization("000044-014.public_subkey");
   }
-
+  
   public function test000045002sig() {
     $this->oneSerialization("000045-002.sig");
   }
-
+  
   public function test000046012ring_trust() {
     $this->oneSerialization("000046-012.ring_trust");
   }
-
+  
   public function test000047005secret_key() {
     $this->oneSerialization("000047-005.secret_key");
   }
-
+  
   public function test000048013user_id() {
     $this->oneSerialization("000048-013.user_id");
   }
-
+  
   public function test000049002sig() {
     $this->oneSerialization("000049-002.sig");
   }
-
+  
   public function test000050012ring_trust() {
     $this->oneSerialization("000050-012.ring_trust");
   }
-
+  
   public function test000051007secret_subkey() {
     $this->oneSerialization("000051-007.secret_subkey");
   }
-
+  
   public function test000052002sig() {
     $this->oneSerialization("000052-002.sig");
   }
-
+  
   public function test000053012ring_trust() {
     $this->oneSerialization("000053-012.ring_trust");
   }
-
+  
   public function test000054005secret_key() {
     $this->oneSerialization("000054-005.secret_key");
   }
-
+  
   public function test000055002sig() {
     $this->oneSerialization("000055-002.sig");
   }
-
+  
   public function test000056012ring_trust() {
     $this->oneSerialization("000056-012.ring_trust");
   }
-
+  
   public function test000057013user_id() {
     $this->oneSerialization("000057-013.user_id");
   }
-
+  
   public function test000058002sig() {
     $this->oneSerialization("000058-002.sig");
   }
-
+  
   public function test000059012ring_trust() {
     $this->oneSerialization("000059-012.ring_trust");
   }
-
+  
   public function test000060007secret_subkey() {
     $this->oneSerialization("000060-007.secret_subkey");
   }
-
+  
   public function test000061002sig() {
     $this->oneSerialization("000061-002.sig");
   }
-
+  
   public function test000062012ring_trust() {
     $this->oneSerialization("000062-012.ring_trust");
   }
-
+  
   public function test000063005secret_key() {
     $this->oneSerialization("000063-005.secret_key");
   }
-
+  
   public function test000064002sig() {
     $this->oneSerialization("000064-002.sig");
   }
-
+  
   public function test000065012ring_trust() {
     $this->oneSerialization("000065-012.ring_trust");
   }
-
+  
   public function test000066013user_id() {
     $this->oneSerialization("000066-013.user_id");
   }
-
+  
   public function test000067002sig() {
     $this->oneSerialization("000067-002.sig");
   }
-
+  
   public function test000068012ring_trust() {
     $this->oneSerialization("000068-012.ring_trust");
   }
-
+  
   public function test000069005secret_key() {
     $this->oneSerialization("000069-005.secret_key");
   }
-
+  
   public function test000070013user_id() {
     $this->oneSerialization("000070-013.user_id");
   }
-
+  
   public function test000071002sig() {
     $this->oneSerialization("000071-002.sig");
   }
-
+  
   public function test000072012ring_trust() {
     $this->oneSerialization("000072-012.ring_trust");
   }
-
+  
   public function test000073017attribute() {
     $this->oneSerialization("000073-017.attribute");
   }
-
+  
   public function test000074002sig() {
     $this->oneSerialization("000074-002.sig");
   }
-
+  
   public function test000075012ring_trust() {
     $this->oneSerialization("000075-012.ring_trust");
   }
-
+  
   public function test000076007secret_subkey() {
     $this->oneSerialization("000076-007.secret_subkey");
   }
-
+  
   public function test000077002sig() {
     $this->oneSerialization("000077-002.sig");
   }
-
+  
   public function test000078012ring_trust() {
     $this->oneSerialization("000078-012.ring_trust");
   }
-
+  
   public function test002182002sig() {
     $this->oneSerialization("002182-002.sig");
   }
-
+  
   public function testpubringgpg() {
     $this->oneSerialization("pubring.gpg");
   }
-
+  
   public function testsecringgpg() {
     $this->oneSerialization("secring.gpg");
   }
-
+  
   public function testcompressedsiggpg() {
     $this->oneSerialization("compressedsig.gpg");
   }
-
+  
   public function testcompressedsigzlibgpg() {
     $this->oneSerialization("compressedsig-zlib.gpg");
   }
-
+  
   public function testcompressedsigbzip2gpg() {
     $this->oneSerialization("compressedsig-bzip2.gpg");
   }
-
+  
   public function testonepass_sig() {
     $this->oneSerialization("onepass_sig");
   }
-
+  
   public function testsymmetrically_encrypted() {
     $this->oneSerialization("symmetrically_encrypted");
   }
-
+  
   public function testuncompressedopsdsagpg() {
     $this->oneSerialization("uncompressed-ops-dsa.gpg");
   }
-
+  
   public function testuncompressedopsdsasha384txtgpg() {
     $this->oneSerialization("uncompressed-ops-dsa-sha384.txt.gpg");
   }
-
+  
   public function testuncompressedopsrsagpg() {
     $this->oneSerialization("uncompressed-ops-rsa.gpg");
   }
@@ -374,17 +374,9 @@ class Serialization extends TestCase {
   public function testSymmetricNoMDC() {
     $this->oneSerialization("symmetric-no-mdc.gpg");
   }
-
-  public function tested25519_public() {
-    $this->oneSerialization("ed25519.public_key");
-  }
-
-  public function tested25519_secret() {
-    $this->oneSerialization("ed25519.secret_key");
-  }
 }
 
-class Fingerprint extends TestCase {
+class Fingerprint extends PHPUnit_Framework_TestCase {
   public function oneFingerprint($path, $kf) {
     $m = OpenPGP_Message::parse(file_get_contents(dirname(__FILE__) . '/data/' . $path));
     $this->assertEquals($m[0]->fingerprint(), $kf);
@@ -405,47 +397,4 @@ class Fingerprint extends TestCase {
   public function test000035006public_key() {
     $this->oneFingerprint("000035-006.public_key", "CB7933459F59C70DF1C3FBEEDEDC3ECF689AF56D");
   }
-
-  public function test000080006public_key() {
-    $this->oneFingerprint("000080-006.public_key", "AEDA0C4468AE265E8B7CCA1C3047D4A7B15467AB");
-  }
-
-  public function test000082006public_key() {
-    $this->oneFingerprint("000082-006.public_key", "589D7E6884A9235BBE821D35BD7BA7BC5547FD09");
-  }
-
-  public function tested25519() {
-    $this->oneFingerprint("ed25519.public_key", "88771946427EC2E24569C1D86208BE2B78C27E94");
-  }
 }
-
-class Signature extends TestCase {
-  public function oneIssuer($path, $kf) {
-    $m = OpenPGP_Message::parse(file_get_contents(dirname(__FILE__) . '/data/' . $path));
-    $this->assertEquals($m[0]->issuer(), $kf);
-  }
-
-  public function test000079002sig() {
-    $this->oneIssuer("000079-002.sig", "C25059FA8730BC38");
-  }
-
-  public function test000081002sig() {
-    $this->oneIssuer("000081-002.sig", "6B799484725130FE");
-  }
-
-  public function test000083002sig() {
-    $this->oneIssuer("000083-002.sig", "BD7BA7BC5547FD09");
-  }
-}
-
-class Armor extends TestCase {
-  public function testRoundTrip() {
-    $bytes = "abcd\0\xff";
-    $this->assertEquals($bytes, OpenPGP::unarmor(OpenPGP::enarmor($bytes), 'MESSAGE'));
-  }
-
-  public function testInvalidBase64() {
-    $input = OpenPGP::header('MESSAGE') . "\n\nY~WJjZAD/\n=PE3Q\n" . OpenPGP::footer('MESSAGE');
-    $this->assertEquals(false, OpenPGP::unarmor($input, 'MESSAGE'));
-  }
-}
\ No newline at end of file
diff --git a/showmore/lang/C/messages.po b/showmore/lang/C/messages.po
index 17b9b17c..63891ead 100644
--- a/showmore/lang/C/messages.po
+++ b/showmore/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:16-0500\n"
+"POT-Creation-Date: 2018-04-01 11:11-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,18 +17,26 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: showmore.php:37
-msgid "Enable Show More"
-msgstr ""
-
-#: showmore.php:38
-msgid "Cutting posts after how many characters"
-msgstr ""
-
-#: showmore.php:43
+#: showmore.php:41 showmore.php:45
 msgid "\"Show more\" Settings"
 msgstr ""
 
-#: showmore.php:119
+#: showmore.php:50
+msgid "Enable Show More"
+msgstr ""
+
+#: showmore.php:53
+msgid "Cutting posts after how much characters"
+msgstr ""
+
+#: showmore.php:57
+msgid "Save Settings"
+msgstr ""
+
+#: showmore.php:74
+msgid "Show More Settings saved."
+msgstr ""
+
+#: showmore.php:134
 msgid "show more"
 msgstr ""
diff --git a/showmore/lang/ar/messages.po b/showmore/lang/ar/messages.po
deleted file mode 100644
index 0d6f0851..00000000
--- a/showmore/lang/ar/messages.po
+++ /dev/null
@@ -1,37 +0,0 @@
-# ADDON showmore
-# Copyright (C)
-# This file is distributed under the same license as the Friendica showmore addon package.
-# 
-# 
-# Translators:
-# ButterflyOfFire, 2022
-# Farida Khalaf <faridakhalaf@hotmail.com>, 2021
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:16-0500\n"
-"PO-Revision-Date: 2014-06-23 12:37+0000\n"
-"Last-Translator: ButterflyOfFire, 2022\n"
-"Language-Team: Arabic (http://www.transifex.com/Friendica/friendica/language/ar/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ar\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-
-#: showmore.php:37
-msgid "Enable Show More"
-msgstr ""
-
-#: showmore.php:38
-msgid "Cutting posts after how many characters"
-msgstr ""
-
-#: showmore.php:43
-msgid "\"Show more\" Settings"
-msgstr ""
-
-#: showmore.php:119
-msgid "show more"
-msgstr "اعرض المزيد"
diff --git a/showmore/lang/ar/strings.php b/showmore/lang/ar/strings.php
deleted file mode 100644
index 665294c1..00000000
--- a/showmore/lang/ar/strings.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_ar")) {
-function string_plural_select_ar($n){
-	$n = intval($n);
-	if ($n==0) { return 0; } else if ($n==1) { return 1; } else if ($n==2) { return 2; } else if ($n%100>=3 && $n%100<=10) { return 3; } else if ($n%100>=11 && $n%100<=99) { return 4; } else  { return 5; }
-}}
-$a->strings['show more'] = 'اعرض المزيد';
diff --git a/showmore/lang/cs/strings.php b/showmore/lang/cs/strings.php
index cfe0e8c0..1b82b570 100644
--- a/showmore/lang/cs/strings.php
+++ b/showmore/lang/cs/strings.php
@@ -3,11 +3,12 @@
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
 	$n = intval($n);
-	if (($n == 1 && $n % 1 == 0)) { return 0; } else if (($n >= 2 && $n <= 4 && $n % 1 == 0)) { return 1; } else if (($n % 1 != 0 )) { return 2; } else  { return 3; }
+	return ($n == 1 && $n % 1 == 0) ? 0 : ($n >= 2 && $n <= 4 && $n % 1 == 0) ? 1: ($n % 1 != 0 ) ? 2 : 3;;
 }}
-$a->strings['"Show more" Settings'] = 'Nastavení "Show more"';
-$a->strings['Enable Show More'] = 'Povolit Show more';
-$a->strings['Cutting posts after how much characters'] = 'Oříznout příspěvky po zadaném množství znaků';
-$a->strings['Save Settings'] = 'Uložit nastavení';
-$a->strings['Show More Settings saved.'] = 'Nastavení "Show more" uložena.';
-$a->strings['show more'] = 'zobrazit více';
+;
+$a->strings["\"Show more\" Settings"] = "Nastavení \"Show more\"";
+$a->strings["Enable Show More"] = "Povolit Show more";
+$a->strings["Cutting posts after how much characters"] = "Oříznout příspěvky po zadaném množství znaků";
+$a->strings["Save Settings"] = "Uložit nastavení";
+$a->strings["Show More Settings saved."] = "Nastavení \"Show more\" uložena.";
+$a->strings["show more"] = "zobrazit více";
diff --git a/showmore/lang/da-dk/messages.po b/showmore/lang/da-dk/messages.po
deleted file mode 100644
index 0c9cb46c..00000000
--- a/showmore/lang/da-dk/messages.po
+++ /dev/null
@@ -1,36 +0,0 @@
-# ADDON showmore
-# Copyright (C)
-# This file is distributed under the same license as the Friendica showmore addon package.
-# 
-# 
-# Translators:
-# Anton <dev@atjn.dk>, 2022
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:16-0500\n"
-"PO-Revision-Date: 2014-06-23 12:37+0000\n"
-"Last-Translator: Anton <dev@atjn.dk>, 2022\n"
-"Language-Team: Danish (Denmark) (http://www.transifex.com/Friendica/friendica/language/da_DK/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: da_DK\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: showmore.php:37
-msgid "Enable Show More"
-msgstr "Aktivér Vis mere"
-
-#: showmore.php:38
-msgid "Cutting posts after how many characters"
-msgstr "Afskærer opslag efter hvor mange tegn"
-
-#: showmore.php:43
-msgid "\"Show more\" Settings"
-msgstr "\"Vis mere\" Indstillinger"
-
-#: showmore.php:119
-msgid "show more"
-msgstr "vis mere"
diff --git a/showmore/lang/da-dk/strings.php b/showmore/lang/da-dk/strings.php
deleted file mode 100644
index 2c3bb054..00000000
--- a/showmore/lang/da-dk/strings.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_da_dk")) {
-function string_plural_select_da_dk($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Enable Show More'] = 'Aktivér Vis mere';
-$a->strings['Cutting posts after how many characters'] = 'Afskærer opslag efter hvor mange tegn';
-$a->strings['"Show more" Settings'] = '"Vis mere" Indstillinger';
-$a->strings['show more'] = 'vis mere';
diff --git a/showmore/lang/de/messages.po b/showmore/lang/de/messages.po
index 74dd3bd2..9affc172 100644
--- a/showmore/lang/de/messages.po
+++ b/showmore/lang/de/messages.po
@@ -5,34 +5,41 @@
 # 
 # Translators:
 # Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2014-2015
-# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2018,2022
-# Ulf Rompe <transifex.com@rompe.org>, 2019
+# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:16-0500\n"
-"PO-Revision-Date: 2014-06-23 12:37+0000\n"
-"Last-Translator: Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2018,2022\n"
-"Language-Team: German (http://app.transifex.com/Friendica/friendica/language/de/)\n"
+"POT-Creation-Date: 2018-04-01 11:11-0400\n"
+"PO-Revision-Date: 2018-04-07 05:34+0000\n"
+"Last-Translator: Tobias Diekershoff <tobias.diekershoff@gmx.net>\n"
+"Language-Team: German (http://www.transifex.com/Friendica/friendica/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: showmore.php:37
+#: showmore.php:41 showmore.php:45
+msgid "\"Show more\" Settings"
+msgstr "\"Mehr zeigen\" Einstellungen"
+
+#: showmore.php:50
 msgid "Enable Show More"
 msgstr "Aktiviere \"Mehr zeigen\""
 
-#: showmore.php:38
-msgid "Cutting posts after how many characters"
-msgstr "Schneide Beiträge nach dieser Menge von Zeichen ab"
+#: showmore.php:53
+msgid "Cutting posts after how much characters"
+msgstr "Begrenze Beiträge nach einer bestimmten Anzahl an Buchstaben"
 
-#: showmore.php:43
-msgid "\"Show more\" Settings"
-msgstr "\"Mehr zeigen\"-Einstellungen"
+#: showmore.php:57
+msgid "Save Settings"
+msgstr "Einstellungen speichern"
 
-#: showmore.php:119
+#: showmore.php:74
+msgid "Show More Settings saved."
+msgstr "\"Mehr zeigen\" Einstellungen gesichert."
+
+#: showmore.php:134
 msgid "show more"
 msgstr "mehr anzeigen"
diff --git a/showmore/lang/de/strings.php b/showmore/lang/de/strings.php
index 66fd15e8..f4df3488 100644
--- a/showmore/lang/de/strings.php
+++ b/showmore/lang/de/strings.php
@@ -2,10 +2,12 @@
 
 if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Enable Show More'] = 'Aktiviere "Mehr zeigen"';
-$a->strings['Cutting posts after how many characters'] = 'Schneide Beiträge nach dieser Menge von Zeichen ab';
-$a->strings['"Show more" Settings'] = '"Mehr zeigen"-Einstellungen';
-$a->strings['show more'] = 'mehr anzeigen';
+;
+$a->strings["\"Show more\" Settings"] = "\"Mehr zeigen\" Einstellungen";
+$a->strings["Enable Show More"] = "Aktiviere \"Mehr zeigen\"";
+$a->strings["Cutting posts after how much characters"] = "Begrenze Beiträge nach einer bestimmten Anzahl an Buchstaben";
+$a->strings["Save Settings"] = "Einstellungen speichern";
+$a->strings["Show More Settings saved."] = "\"Mehr zeigen\" Einstellungen gesichert.";
+$a->strings["show more"] = "mehr anzeigen";
diff --git a/showmore/lang/en-gb/strings.php b/showmore/lang/en-gb/strings.php
index 3ac0f753..87f88ef5 100644
--- a/showmore/lang/en-gb/strings.php
+++ b/showmore/lang/en-gb/strings.php
@@ -2,12 +2,12 @@
 
 if(! function_exists("string_plural_select_en_gb")) {
 function string_plural_select_en_gb($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['"Show more" Settings'] = 'Show More';
-$a->strings['Enable Show More'] = 'Enable this addon?';
-$a->strings['Cutting posts after how much characters'] = 'Cutting posts after how many characters';
-$a->strings['Save Settings'] = 'Save settings';
-$a->strings['Show More Settings saved.'] = 'Show More Settings saved.';
-$a->strings['show more'] = 'show more';
+;
+$a->strings["\"Show more\" Settings"] = "Show More";
+$a->strings["Enable Show More"] = "Enable this addon?";
+$a->strings["Cutting posts after how much characters"] = "Cutting posts after how many characters";
+$a->strings["Save Settings"] = "Save settings";
+$a->strings["Show More Settings saved."] = "Show More Settings saved.";
+$a->strings["show more"] = "show more";
diff --git a/showmore/lang/es/messages.po b/showmore/lang/es/messages.po
index d7f09108..56744631 100644
--- a/showmore/lang/es/messages.po
+++ b/showmore/lang/es/messages.po
@@ -5,14 +5,13 @@
 # 
 # Translators:
 # Albert, 2016
-# Senex Petrovic <javierruizo@hotmail.com>, 2021
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2021-04-06 02:08+0000\n"
-"Last-Translator: Senex Petrovic <javierruizo@hotmail.com>\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2016-11-17 22:32+0000\n"
+"Last-Translator: Albert\n"
 "Language-Team: Spanish (http://www.transifex.com/Friendica/friendica/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,22 +19,26 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: showmore.php:35 showmore.php:39
+#: showmore.php:38
 msgid "\"Show more\" Settings"
 msgstr "Ajustes de \"Mostrar más\""
 
-#: showmore.php:44
+#: showmore.php:41
 msgid "Enable Show More"
 msgstr "Habilitar Mostrar Más"
 
-#: showmore.php:47
+#: showmore.php:44
 msgid "Cutting posts after how much characters"
 msgstr "Cortar entradas después de tantos carácteres"
 
-#: showmore.php:51
-msgid "Save Settings"
-msgstr "Guardar ajustes"
+#: showmore.php:48
+msgid "Submit"
+msgstr "Enviar"
 
-#: showmore.php:129
+#: showmore.php:65
+msgid "Show More Settings saved."
+msgstr "Ajustes de Mostrar Más guardados."
+
+#: showmore.php:119
 msgid "show more"
 msgstr "mostrar más"
diff --git a/showmore/lang/es/strings.php b/showmore/lang/es/strings.php
index 04b11c8d..16ceaf56 100644
--- a/showmore/lang/es/strings.php
+++ b/showmore/lang/es/strings.php
@@ -2,11 +2,12 @@
 
 if(! function_exists("string_plural_select_es")) {
 function string_plural_select_es($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['"Show more" Settings'] = 'Ajustes de "Mostrar más"';
-$a->strings['Enable Show More'] = 'Habilitar Mostrar Más';
-$a->strings['Cutting posts after how much characters'] = 'Cortar entradas después de tantos carácteres';
-$a->strings['Save Settings'] = 'Guardar ajustes';
-$a->strings['show more'] = 'mostrar más';
+;
+$a->strings["\"Show more\" Settings"] = "Ajustes de \"Mostrar más\"";
+$a->strings["Enable Show More"] = "Habilitar Mostrar Más";
+$a->strings["Cutting posts after how much characters"] = "Cortar entradas después de tantos carácteres";
+$a->strings["Submit"] = "Enviar";
+$a->strings["Show More Settings saved."] = "Ajustes de Mostrar Más guardados.";
+$a->strings["show more"] = "mostrar más";
diff --git a/showmore/lang/et/messages.po b/showmore/lang/et/messages.po
deleted file mode 100644
index cb6d8af1..00000000
--- a/showmore/lang/et/messages.po
+++ /dev/null
@@ -1,44 +0,0 @@
-# ADDON showmore
-# Copyright (C)
-# This file is distributed under the same license as the Friendica showmore addon package.
-# 
-# 
-# Translators:
-# Rain Hawk, 2019
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-04-01 11:11-0400\n"
-"PO-Revision-Date: 2019-12-22 00:47+0000\n"
-"Last-Translator: Rain Hawk\n"
-"Language-Team: Estonian (http://www.transifex.com/Friendica/friendica/language/et/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: et\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: showmore.php:41 showmore.php:45
-msgid "\"Show more\" Settings"
-msgstr "Näita rohkem sätteid"
-
-#: showmore.php:50
-msgid "Enable Show More"
-msgstr "Võimalda Näita Rohkem"
-
-#: showmore.php:53
-msgid "Cutting posts after how much characters"
-msgstr "Lõika postitus peale kuimitut karakterit"
-
-#: showmore.php:57
-msgid "Save Settings"
-msgstr "Salvesta sätted"
-
-#: showmore.php:74
-msgid "Show More Settings saved."
-msgstr "Näita Rohkem sätted salvesatud."
-
-#: showmore.php:134
-msgid "show more"
-msgstr "näita rohkem"
diff --git a/showmore/lang/et/strings.php b/showmore/lang/et/strings.php
deleted file mode 100644
index cd8e815f..00000000
--- a/showmore/lang/et/strings.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_et")) {
-function string_plural_select_et($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['"Show more" Settings'] = 'Näita rohkem sätteid';
-$a->strings['Enable Show More'] = 'Võimalda Näita Rohkem';
-$a->strings['Cutting posts after how much characters'] = 'Lõika postitus peale kuimitut karakterit';
-$a->strings['Save Settings'] = 'Salvesta sätted';
-$a->strings['Show More Settings saved.'] = 'Näita Rohkem sätted salvesatud.';
-$a->strings['show more'] = 'näita rohkem';
diff --git a/showmore/lang/fi-fi/strings.php b/showmore/lang/fi-fi/strings.php
index dfa6f745..b6c771b8 100644
--- a/showmore/lang/fi-fi/strings.php
+++ b/showmore/lang/fi-fi/strings.php
@@ -2,11 +2,12 @@
 
 if(! function_exists("string_plural_select_fi_fi")) {
 function string_plural_select_fi_fi($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['"Show more" Settings'] = 'Show more -asetukset';
-$a->strings['Enable Show More'] = 'Ota Show More käyttöön';
-$a->strings['Save Settings'] = 'Tallenna asetukset';
-$a->strings['Show More Settings saved.'] = 'Show More -asetukset tallennettu';
-$a->strings['show more'] = 'näytä lisää';
+;
+$a->strings["\"Show more\" Settings"] = "Show more -asetukset";
+$a->strings["Enable Show More"] = "Ota Show More käyttöön";
+$a->strings["Cutting posts after how much characters"] = "";
+$a->strings["Save Settings"] = "Tallenna asetukset";
+$a->strings["Show More Settings saved."] = "Show More -asetukset tallennettu";
+$a->strings["show more"] = "näytä lisää";
diff --git a/showmore/lang/fr/messages.po b/showmore/lang/fr/messages.po
deleted file mode 100644
index 83bca182..00000000
--- a/showmore/lang/fr/messages.po
+++ /dev/null
@@ -1,38 +0,0 @@
-# ADDON showmore
-# Copyright (C)
-# This file is distributed under the same license as the Friendica showmore addon package.
-# 
-# 
-# Translators:
-# Nicolas Derive, 2022
-# StefOfficiel <pichard.stephane@free.fr>, 2015
-# Vincent Vindarel <vindarel@mailz.org>, 2018
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:16-0500\n"
-"PO-Revision-Date: 2014-06-23 12:37+0000\n"
-"Last-Translator: Nicolas Derive, 2022\n"
-"Language-Team: French (http://www.transifex.com/Friendica/friendica/language/fr/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: fr\n"
-"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
-
-#: showmore.php:37
-msgid "Enable Show More"
-msgstr "Activer \"Voir Plus\""
-
-#: showmore.php:38
-msgid "Cutting posts after how many characters"
-msgstr "Tronquer les publications après combien de caractères"
-
-#: showmore.php:43
-msgid "\"Show more\" Settings"
-msgstr "Paramètres de \"Show more\" (\"Voir plus\")"
-
-#: showmore.php:119
-msgid "show more"
-msgstr "voir plus"
diff --git a/showmore/lang/fr/strings.php b/showmore/lang/fr/strings.php
index bbba5c07..9560c0ef 100644
--- a/showmore/lang/fr/strings.php
+++ b/showmore/lang/fr/strings.php
@@ -1,11 +1,8 @@
-<?php
-
-if(! function_exists("string_plural_select_fr")) {
-function string_plural_select_fr($n){
-	$n = intval($n);
-	if (($n == 0 || $n == 1)) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
-}}
-$a->strings['Enable Show More'] = 'Activer "Voir Plus"';
-$a->strings['Cutting posts after how many characters'] = 'Tronquer les publications après combien de caractères';
-$a->strings['"Show more" Settings'] = 'Paramètres de "Show more" ("Voir plus")';
-$a->strings['show more'] = 'voir plus';
+<?php
+
+$a->strings["\"Show more\" Settings"] = "Réglages de \"Show more\"";
+$a->strings["Enable Show More"] = "Activer \"Show more\"";
+$a->strings["Cutting posts after how much characters"] = "Coupure après combien de caractères";
+$a->strings["Submit"] = "Envoyer";
+$a->strings["Show More Settings saved."] = "Réglages \"Show more\" sauvés.";
+$a->strings["show more"] = "montrer plus";
diff --git a/showmore/lang/hu/messages.po b/showmore/lang/hu/messages.po
deleted file mode 100644
index 001eb0ec..00000000
--- a/showmore/lang/hu/messages.po
+++ /dev/null
@@ -1,36 +0,0 @@
-# ADDON showmore
-# Copyright (C)
-# This file is distributed under the same license as the Friendica showmore addon package.
-# 
-# 
-# Translators:
-# Balázs Úr, 2020-2021
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:16-0500\n"
-"PO-Revision-Date: 2014-06-23 12:37+0000\n"
-"Last-Translator: Balázs Úr, 2020-2021\n"
-"Language-Team: Hungarian (http://www.transifex.com/Friendica/friendica/language/hu/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: hu\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: showmore.php:37
-msgid "Enable Show More"
-msgstr "Több megjelenítésének engedélyezése"
-
-#: showmore.php:38
-msgid "Cutting posts after how many characters"
-msgstr "Bejegyzések levágása ennyi karakter után"
-
-#: showmore.php:43
-msgid "\"Show more\" Settings"
-msgstr "„Több megjelenítése” beállításai"
-
-#: showmore.php:119
-msgid "show more"
-msgstr "több megjelenítése"
diff --git a/showmore/lang/hu/strings.php b/showmore/lang/hu/strings.php
deleted file mode 100644
index 7917d322..00000000
--- a/showmore/lang/hu/strings.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_hu")) {
-function string_plural_select_hu($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Enable Show More'] = 'Több megjelenítésének engedélyezése';
-$a->strings['Cutting posts after how many characters'] = 'Bejegyzések levágása ennyi karakter után';
-$a->strings['"Show more" Settings'] = '„Több megjelenítése” beállításai';
-$a->strings['show more'] = 'több megjelenítése';
diff --git a/showmore/lang/it/messages.po b/showmore/lang/it/messages.po
index e1a917cb..dd619e49 100644
--- a/showmore/lang/it/messages.po
+++ b/showmore/lang/it/messages.po
@@ -5,33 +5,40 @@
 # 
 # Translators:
 # fabrixxm <fabrix.xm@gmail.com>, 2014-2015,2018
-# Sylke Vicious <silkevicious@gmail.com>, 2023
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:16-0500\n"
-"PO-Revision-Date: 2014-06-23 12:37+0000\n"
-"Last-Translator: Sylke Vicious <silkevicious@gmail.com>, 2023\n"
-"Language-Team: Italian (http://app.transifex.com/Friendica/friendica/language/it/)\n"
+"POT-Creation-Date: 2018-04-01 11:11-0400\n"
+"PO-Revision-Date: 2018-05-28 09:04+0000\n"
+"Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n"
+"Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: it\n"
-"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: showmore.php:37
-msgid "Enable Show More"
-msgstr "Abilita \"Mostra altro\""
-
-#: showmore.php:38
-msgid "Cutting posts after how many characters"
-msgstr "Taglia messaggi dopo quanti caratteri"
-
-#: showmore.php:43
+#: showmore.php:41 showmore.php:45
 msgid "\"Show more\" Settings"
 msgstr "Impostazioni \"Mostra altro\""
 
-#: showmore.php:119
+#: showmore.php:50
+msgid "Enable Show More"
+msgstr "Abilita \"Mostra altro\""
+
+#: showmore.php:53
+msgid "Cutting posts after how much characters"
+msgstr "Dopo quanti caratteri tagliare il messaggio"
+
+#: showmore.php:57
+msgid "Save Settings"
+msgstr "Salva Impostazioni"
+
+#: showmore.php:74
+msgid "Show More Settings saved."
+msgstr "Impostazioni \"Mostra altro\" salvate."
+
+#: showmore.php:134
 msgid "show more"
 msgstr "mostra di più"
diff --git a/showmore/lang/it/strings.php b/showmore/lang/it/strings.php
index ead3ddcb..c6ed91bf 100644
--- a/showmore/lang/it/strings.php
+++ b/showmore/lang/it/strings.php
@@ -3,9 +3,12 @@
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
 	$n = intval($n);
-	if ($n == 1) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
+	return ($n != 1);;
 }}
-$a->strings['Enable Show More'] = 'Abilita "Mostra altro"';
-$a->strings['Cutting posts after how many characters'] = 'Taglia messaggi dopo quanti caratteri';
-$a->strings['"Show more" Settings'] = 'Impostazioni "Mostra altro"';
-$a->strings['show more'] = 'mostra di più';
+;
+$a->strings["\"Show more\" Settings"] = "Impostazioni \"Mostra altro\"";
+$a->strings["Enable Show More"] = "Abilita \"Mostra altro\"";
+$a->strings["Cutting posts after how much characters"] = "Dopo quanti caratteri tagliare il messaggio";
+$a->strings["Save Settings"] = "Salva Impostazioni";
+$a->strings["Show More Settings saved."] = "Impostazioni \"Mostra altro\" salvate.";
+$a->strings["show more"] = "mostra di più";
diff --git a/showmore/lang/nl/strings.php b/showmore/lang/nl/strings.php
index 37f1e9e5..f65d2a0e 100644
--- a/showmore/lang/nl/strings.php
+++ b/showmore/lang/nl/strings.php
@@ -3,9 +3,12 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['"Show more" Settings'] = '"Toon meer" instellingen';
-$a->strings['Enable Show More'] = 'Toon meer inschakelen';
-$a->strings['Save Settings'] = 'Instellingen opslaan';
-$a->strings['Show More Settings saved.'] = 'Toon meer instellingen opgeslagen.';
+;
+$a->strings["\"Show more\" Settings"] = "\"Toon meer\" instellingen";
+$a->strings["Enable Show More"] = "Toon meer inschakelen";
+$a->strings["Cutting posts after how much characters"] = "";
+$a->strings["Save Settings"] = "Instellingen opslaan";
+$a->strings["Show More Settings saved."] = "Toon meer instellingen opgeslagen.";
+$a->strings["show more"] = "";
diff --git a/showmore/lang/pl/messages.po b/showmore/lang/pl/messages.po
index 80313357..39e66c54 100644
--- a/showmore/lang/pl/messages.po
+++ b/showmore/lang/pl/messages.po
@@ -4,15 +4,14 @@
 # 
 # 
 # Translators:
-# Piotr Strębski <strebski@gmail.com>, 2022
-# Waldemar Stoczkowski, 2018
+# Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:16-0500\n"
-"PO-Revision-Date: 2014-06-23 12:37+0000\n"
-"Last-Translator: Piotr Strębski <strebski@gmail.com>, 2022\n"
+"POT-Creation-Date: 2018-04-01 11:11-0400\n"
+"PO-Revision-Date: 2018-08-04 11:01+0000\n"
+"Last-Translator: Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.com/Friendica/friendica/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,18 +19,26 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
-#: showmore.php:37
-msgid "Enable Show More"
-msgstr "Włącz Pokaż więcej"
-
-#: showmore.php:38
-msgid "Cutting posts after how many characters"
-msgstr "Cięcie wpisów po określonej ilości znaków"
-
-#: showmore.php:43
+#: showmore.php:41 showmore.php:45
 msgid "\"Show more\" Settings"
 msgstr "Ustawienia \"Pokaż więcej\""
 
-#: showmore.php:119
+#: showmore.php:50
+msgid "Enable Show More"
+msgstr "Włącz Pokaż więcej"
+
+#: showmore.php:53
+msgid "Cutting posts after how much characters"
+msgstr "Cięcie postów po ilości znaków"
+
+#: showmore.php:57
+msgid "Save Settings"
+msgstr "Zapisz ustawienia"
+
+#: showmore.php:74
+msgid "Show More Settings saved."
+msgstr "Zapisano ustawienia Pokaż więcej."
+
+#: showmore.php:134
 msgid "show more"
 msgstr "pokaż więcej"
diff --git a/showmore/lang/pl/strings.php b/showmore/lang/pl/strings.php
index 18c990ef..eca7dd85 100644
--- a/showmore/lang/pl/strings.php
+++ b/showmore/lang/pl/strings.php
@@ -3,9 +3,12 @@
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
 	$n = intval($n);
-	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
+	return ($n==1 ? 0 : ($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14) ? 1 : $n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14) ? 2 : 3);;
 }}
-$a->strings['Enable Show More'] = 'Włącz Pokaż więcej';
-$a->strings['Cutting posts after how many characters'] = 'Cięcie wpisów po określonej ilości znaków';
-$a->strings['"Show more" Settings'] = 'Ustawienia "Pokaż więcej"';
-$a->strings['show more'] = 'pokaż więcej';
+;
+$a->strings["\"Show more\" Settings"] = "Ustawienia \"Pokaż więcej\"";
+$a->strings["Enable Show More"] = "Włącz Pokaż więcej";
+$a->strings["Cutting posts after how much characters"] = "Cięcie postów po ilości znaków";
+$a->strings["Save Settings"] = "Zapisz ustawienia";
+$a->strings["Show More Settings saved."] = "Zapisano ustawienia Pokaż więcej.";
+$a->strings["show more"] = "pokaż więcej";
diff --git a/showmore/lang/pt-br/strings.php b/showmore/lang/pt-br/strings.php
index 8d3e481b..05f2b070 100644
--- a/showmore/lang/pt-br/strings.php
+++ b/showmore/lang/pt-br/strings.php
@@ -2,12 +2,12 @@
 
 if(! function_exists("string_plural_select_pt_br")) {
 function string_plural_select_pt_br($n){
-	$n = intval($n);
-	return intval($n > 1);
+	return ($n > 1);;
 }}
-$a->strings['"Show more" Settings'] = 'Configurações de "Mostrar mais"';
-$a->strings['Enable Show More'] = 'Habilitar Mostrar Mais';
-$a->strings['Cutting posts after how much characters'] = 'Cortar as publicações depois de quantos caracteres';
-$a->strings['Submit'] = 'Enviar';
-$a->strings['Show More Settings saved.'] = 'As configurações de Mostrar Mais foram salvas.';
-$a->strings['show more'] = 'mostrar mais';
+;
+$a->strings["\"Show more\" Settings"] = "Configurações de \"Mostrar mais\"";
+$a->strings["Enable Show More"] = "Habilitar Mostrar Mais";
+$a->strings["Cutting posts after how much characters"] = "Cortar as publicações depois de quantos caracteres";
+$a->strings["Submit"] = "Enviar";
+$a->strings["Show More Settings saved."] = "As configurações de Mostrar Mais foram salvas.";
+$a->strings["show more"] = "mostrar mais";
diff --git a/showmore/lang/ro/strings.php b/showmore/lang/ro/strings.php
index 3fb881de..a7c11992 100644
--- a/showmore/lang/ro/strings.php
+++ b/showmore/lang/ro/strings.php
@@ -2,12 +2,12 @@
 
 if(! function_exists("string_plural_select_ro")) {
 function string_plural_select_ro($n){
-	$n = intval($n);
-	if ($n==1) { return 0; } else if ((($n%100>19)||(($n%100==0)&&($n!=0)))) { return 2; } else  { return 1; }
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
 }}
-$a->strings['"Show more" Settings'] = 'Configurări "Afișează mai mult"';
-$a->strings['Enable Show More'] = 'Activare Afișează mai mult';
-$a->strings['Cutting posts after how much characters'] = 'Trunchiere postări, după câte caractere';
-$a->strings['Save Settings'] = 'Salvare Configurări';
-$a->strings['Show More Settings saved.'] = 'Configurările Afișează mai mult, au fost salvate';
-$a->strings['show more'] = 'afișează mai mult';
+;
+$a->strings["\"Show more\" Settings"] = "Configurări \"Afișează mai mult\"";
+$a->strings["Enable Show More"] = "Activare Afișează mai mult";
+$a->strings["Cutting posts after how much characters"] = "Trunchiere postări, după câte caractere";
+$a->strings["Save Settings"] = "Salvare Configurări";
+$a->strings["Show More Settings saved."] = "Configurările Afișează mai mult, au fost salvate";
+$a->strings["show more"] = "afișează mai mult";
diff --git a/showmore/lang/ru/messages.po b/showmore/lang/ru/messages.po
deleted file mode 100644
index 650269b2..00000000
--- a/showmore/lang/ru/messages.po
+++ /dev/null
@@ -1,36 +0,0 @@
-# ADDON showmore
-# Copyright (C)
-# This file is distributed under the same license as the Friendica showmore addon package.
-# 
-# 
-# Translators:
-# Alexander An <ravnina@gmail.com>, 2020,2023
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:16-0500\n"
-"PO-Revision-Date: 2014-06-23 12:37+0000\n"
-"Last-Translator: Alexander An <ravnina@gmail.com>, 2020,2023\n"
-"Language-Team: Russian (http://app.transifex.com/Friendica/friendica/language/ru/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ru\n"
-"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
-
-#: showmore.php:37
-msgid "Enable Show More"
-msgstr "Включить \"показать ещё\""
-
-#: showmore.php:38
-msgid "Cutting posts after how many characters"
-msgstr "Обрезать записи после превышения этого числа символов"
-
-#: showmore.php:43
-msgid "\"Show more\" Settings"
-msgstr "Настройки \"показать ещё\""
-
-#: showmore.php:119
-msgid "show more"
-msgstr "показать ещё"
diff --git a/showmore/lang/ru/strings.php b/showmore/lang/ru/strings.php
index a12af848..0111afed 100644
--- a/showmore/lang/ru/strings.php
+++ b/showmore/lang/ru/strings.php
@@ -1,11 +1,8 @@
-<?php
-
-if(! function_exists("string_plural_select_ru")) {
-function string_plural_select_ru($n){
-	$n = intval($n);
-	if ($n%10==1 && $n%100!=11) { return 0; } else if ($n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14)) { return 1; } else if ($n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)) { return 2; } else  { return 3; }
-}}
-$a->strings['Enable Show More'] = 'Включить "показать ещё"';
-$a->strings['Cutting posts after how many characters'] = 'Обрезать записи после превышения этого числа символов';
-$a->strings['"Show more" Settings'] = 'Настройки "показать ещё"';
-$a->strings['show more'] = 'показать ещё';
+<?php
+
+$a->strings["\"Show more\" Settings"] = "";
+$a->strings["Enable Show More"] = "Включить Показать больше";
+$a->strings["Cutting posts after how much characters"] = "Обрезание сообщения после превывения числа символов";
+$a->strings["Submit"] = "Подтвердить";
+$a->strings["Show More Settings saved."] = "";
+$a->strings["show more"] = "показать больше";
diff --git a/showmore/lang/sv/messages.po b/showmore/lang/sv/messages.po
deleted file mode 100644
index c30b676a..00000000
--- a/showmore/lang/sv/messages.po
+++ /dev/null
@@ -1,36 +0,0 @@
-# ADDON showmore
-# Copyright (C)
-# This file is distributed under the same license as the Friendica showmore addon package.
-# 
-# 
-# Translators:
-# Kristoffer Grundström <lovaren@gmail.com>, 2022
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:16-0500\n"
-"PO-Revision-Date: 2022-01-16 00:52+0000\n"
-"Last-Translator: Kristoffer Grundström <lovaren@gmail.com>\n"
-"Language-Team: Swedish (http://www.transifex.com/Friendica/friendica/language/sv/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: sv\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: showmore.php:37
-msgid "Enable Show More"
-msgstr ""
-
-#: showmore.php:38
-msgid "Cutting posts after how many characters"
-msgstr ""
-
-#: showmore.php:43
-msgid "\"Show more\" Settings"
-msgstr ""
-
-#: showmore.php:119
-msgid "show more"
-msgstr "visa mer"
diff --git a/showmore/lang/sv/strings.php b/showmore/lang/sv/strings.php
index e02cda42..3ec569a7 100644
--- a/showmore/lang/sv/strings.php
+++ b/showmore/lang/sv/strings.php
@@ -1,8 +1,3 @@
-<?php
-
-if(! function_exists("string_plural_select_sv")) {
-function string_plural_select_sv($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['show more'] = 'visa mer';
+<?php
+
+$a->strings["Submit"] = "Spara";
diff --git a/showmore/lang/zh-cn/strings.php b/showmore/lang/zh-cn/strings.php
index 4339be44..dc840894 100644
--- a/showmore/lang/zh-cn/strings.php
+++ b/showmore/lang/zh-cn/strings.php
@@ -3,11 +3,12 @@
 if(! function_exists("string_plural_select_zh_cn")) {
 function string_plural_select_zh_cn($n){
 	$n = intval($n);
-	return intval(0);
+	return 0;;
 }}
-$a->strings['"Show more" Settings'] = '“显示更多”设置';
-$a->strings['Enable Show More'] = '启用显示更多功能';
-$a->strings['Cutting posts after how much characters'] = '在多少字之后切断原文';
-$a->strings['Save Settings'] = '保存设置';
-$a->strings['Show More Settings saved.'] = '显示更多功能设置已保存。';
-$a->strings['show more'] = '显示更多';
+;
+$a->strings["\"Show more\" Settings"] = "“显示更多”设置";
+$a->strings["Enable Show More"] = "启用显示更多功能";
+$a->strings["Cutting posts after how much characters"] = "在多少字之后切断原文";
+$a->strings["Save Settings"] = "保存设置";
+$a->strings["Show More Settings saved."] = "显示更多功能设置已保存。";
+$a->strings["show more"] = "显示更多";
diff --git a/showmore/showmore.php b/showmore/showmore.php
index 8e85925a..f7bb0c50 100644
--- a/showmore/showmore.php
+++ b/showmore/showmore.php
@@ -7,11 +7,9 @@
  *         based upon NSFW from Mike Macgirvin <http://macgirvin.com/profile/mike>
  *
  */
-
-use Friendica\App;
 use Friendica\Core\Hook;
-use Friendica\Core\Renderer;
-use Friendica\DI;
+use Friendica\Core\L10n;
+use Friendica\Core\PConfig;
 use Friendica\Util\Strings;
 
 function showmore_install()
@@ -21,41 +19,62 @@ function showmore_install()
 	Hook::register('addon_settings_post', 'addon/showmore/showmore.php', 'showmore_addon_settings_post');
 }
 
-function showmore_addon_settings(array &$data)
+function showmore_uninstall()
 {
-	if (!DI::userSession()->getLocalUserId()) {
+	Hook::unregister('prepare_body', 'addon/showmore/showmore.php', 'showmore_prepare_body');
+	Hook::unregister('addon_settings', 'addon/showmore/showmore.php', 'showmore_addon_settings');
+	Hook::unregister('addon_settings_post', 'addon/showmore/showmore.php', 'showmore_addon_settings_post');
+}
+
+function showmore_addon_settings(&$a, &$s)
+{
+	if (!local_user()) {
 		return;
 	}
 
-	DI::page()->registerStylesheet(__DIR__ . '/showmore.css', 'all');
+	/* Add our stylesheet to the page so we can make our settings look nice */
 
-	$enabled = !DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'showmore', 'disable');
-	$chars   = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'showmore', 'chars', 1100);
+	$a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="'.$a->getBaseURL().'/addon/showmore/showmore.css'.'" media="all"/>'."\r\n";
 
-	$t    = Renderer::getMarkupTemplate('settings.tpl', 'addon/showmore/');
-	$html = Renderer::replaceMacros($t, [
-		'$enabled' => ['showmore-enable', DI::l10n()->t('Enable Show More'), $enabled],
-		'$chars'   => ['showmore-chars', DI::l10n()->t('Cutting posts after how many characters'), $chars],
-	]);
+	$enable_checked = (intval(PConfig::get(local_user(), 'showmore', 'disable')) ? '' : ' checked="checked"');
+	$chars = PConfig::get(local_user(), 'showmore', 'chars', 1100);
 
-	$data = [
-		'addon' => 'showmore',
-		'title' => DI::l10n()->t('"Show more" Settings'),
-		'html'  => $html,
-	];
+	$s .= '<span id="settings_showmore_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_showmore_expanded\'); openClose(\'settings_showmore_inflated\');">';
+	$s .= '<h3>' . L10n::t('"Show more" Settings').'</h3>';
+	$s .= '</span>';
+	$s .= '<div id="settings_showmore_expanded" class="settings-block" style="display: none;">';
+	$s .= '<span class="fakelink" onclick="openClose(\'settings_showmore_expanded\'); openClose(\'settings_showmore_inflated\');">';
+	$s .= '<h3>' . L10n::t('"Show more" Settings').'</h3>';
+	$s .= '</span>';
+
+	$s .= '<div id="showmore-wrapper">';
+
+	$s .= '<label id="showmore-enable-label" for="showmore-enable">'.L10n::t('Enable Show More').'</label>';
+	$s .= '<input id="showmore-enable" type="checkbox" name="showmore-enable" value="1"'.$enable_checked.' />';
+	$s .= '<div class="clear"></div>';
+	$s .= '<label id="showmore-label" for="showmore-chars">'.L10n::t('Cutting posts after how much characters').' </label>';
+	$s .= '<input id="showmore-words" type="text" name="showmore-chars" value="'.$chars.'" />';
+	$s .= '</div><div class="clear"></div>';
+
+	$s .= '<div class="settings-submit-wrapper" ><input type="submit" id="showmore-submit" name="showmore-submit" class="settings-submit" value="' . L10n::t('Save Settings') . '" /></div>';
+//	$s .= '<div class="showmore-desc">' . L10n::t('Use /expression/ to provide regular expressions') . '</div>';
+	$s .= '</div>';
+
+	return;
 }
 
-function showmore_addon_settings_post(array &$b)
+function showmore_addon_settings_post(&$a, &$b)
 {
-	if (!DI::userSession()->getLocalUserId()) {
+	if (!local_user()) {
 		return;
 	}
 
 	if (!empty($_POST['showmore-submit'])) {
-		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'showmore', 'chars', trim($_POST['showmore-chars']));
+		PConfig::set(local_user(), 'showmore', 'chars', trim($_POST['showmore-chars']));
 		$enable = (!empty($_POST['showmore-enable']) ? intval($_POST['showmore-enable']) : 0);
 		$disable = 1-$enable;
-		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'showmore', 'disable', $disable);
+		PConfig::set(local_user(), 'showmore', 'disable', $disable);
+		info(L10n::t('Show More Settings saved.') . EOL);
 	}
 }
 
@@ -71,9 +90,8 @@ function get_body_length($body)
 	// We need to get rid of hidden tags (display: none)
 
 	// Get rid of the warning. It would be better to have some valid html as input
-	$doc = new DOMDocument();
-	@$doc->loadHTML($body);
-	$xpath = new DOMXPath($doc);
+	$dom = @DomDocument::loadHTML($body);
+	$xpath = new DOMXPath($dom);
 
 	/*
 	 * Checking any possible syntax of the style attribute with xpath is impossible
@@ -87,24 +105,24 @@ function get_body_length($body)
 		}
 	}
 	// Now we can get the body of our HTML DomDocument, it contains only what is visible
-	$string = $doc->saveHTML();
+	$string = $dom->saveHTML();
 
 	$string = strip_tags($string);
 	return strlen($string);
 }
 
-function showmore_prepare_body(&$hook_data)
+function showmore_prepare_body(\Friendica\App $a, &$hook_data)
 {
 	// No combination with content filters
 	if (!empty($hook_data['filter_reasons'])) {
 		return;
 	}
 
-	if (DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'showmore', 'disable')) {
+	if (PConfig::get(local_user(), 'showmore', 'disable')) {
 		return;
 	}
 
-	$chars = (int) DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'showmore', 'chars', 1100);
+	$chars = (int) PConfig::get(local_user(), 'showmore', 'chars', 1100);
 
 	if (get_body_length($hook_data['html']) > $chars) {
 		$found = true;
@@ -115,9 +133,9 @@ function showmore_prepare_body(&$hook_data)
 
 	if ($found) {
 		$rnd = Strings::getRandomHex(8);
-		$hook_data['html'] = '<span id="showmore-teaser-' . $rnd . '" class="showmore-teaser" style="display: block;" aria-hidden="true" dir="auto">' . $shortened . " " .
-			'<span id="showmore-wrap-' . $rnd . '" style="white-space:nowrap;" class="showmore-wrap fakelink" onclick="openClose(\'showmore-' . $rnd . '\'); openClose(\'showmore-teaser-' . $rnd . '\');">' . DI::l10n()->t('show more') . '</span></span>' .
-			'<div id="showmore-' . $rnd . '" class="showmore-content" style="display: none;" aria-hidden="false" dir="auto">' . $hook_data['html'] . '</div>';
+		$hook_data['html'] = '<span id="showmore-teaser-' . $rnd . '" class="showmore-teaser" style="display: block;">' . $shortened . " " .
+			'<span id="showmore-wrap-' . $rnd . '" style="white-space:nowrap;" class="showmore-wrap fakelink" onclick="openClose(\'showmore-' . $rnd . '\'); openClose(\'showmore-teaser-' . $rnd . '\');" >' . L10n::t('show more') . '</span></span>' .
+			'<div id="showmore-' . $rnd . '" class="showmore-content" style="display: none;">' . $hook_data['html'] . '</div>';
 	}
 }
 
diff --git a/showmore/templates/settings.tpl b/showmore/templates/settings.tpl
deleted file mode 100644
index b1887d62..00000000
--- a/showmore/templates/settings.tpl
+++ /dev/null
@@ -1,3 +0,0 @@
-<p>{{$info}}</p>
-{{include file="field_checkbox.tpl" field=$enabled}}
-{{include file="field_input.tpl" field=$chars}}
diff --git a/showmore_dyn/lang/C/messages.po b/showmore_dyn/lang/C/messages.po
deleted file mode 100644
index 81dec184..00000000
--- a/showmore_dyn/lang/C/messages.po
+++ /dev/null
@@ -1,36 +0,0 @@
-# ADDON showmore_dyn
-# Copyright (C) 
-# This file is distributed under the same license as the Friendica showmore_dyn addon package.
-# 
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:16-0500\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: showmore_dyn.php:59
-msgid "Limit Height"
-msgstr ""
-
-#: showmore_dyn.php:59
-msgid ""
-"The maximal pixel height of posts before the Show More link is added, 0 to "
-"disable"
-msgstr ""
-
-#: showmore_dyn.php:64
-msgid "Show More Dynamic"
-msgstr ""
-
-#: showmore_dyn.php:72
-msgid "Show more..."
-msgstr ""
diff --git a/showmore_dyn/showmore_dyn.css b/showmore_dyn/showmore_dyn.css
deleted file mode 100644
index 250d95c6..00000000
--- a/showmore_dyn/showmore_dyn.css
+++ /dev/null
@@ -1,37 +0,0 @@
-.wall-item-body-toggle {
-	width: 100%;
-	text-align: center;
-	background-image: linear-gradient(rgba(0, 0, 0, 0), #f6f6f6);
-	cursor: pointer;
-	height: 50px;
-	position: absolute;
-	top: auto;
-	bottom: 0;
-	z-index: 9;
-	left: 0;
-	display: none;
-}
-
-.wall-item-body-toggle-text {
-	width: 100%;
-	position: absolute;
-	top: auto;
-	bottom: 0;
-	z-index: 12;
-	left: 0;
-	text-shadow: 0 0 5px #f6f6f6;
-	font-weight: bold;
-	background: none !important;
-	border: none;
-	padding: 0 !important;
-	cursor: pointer;
-}
-
-.wall-item-body-toggle-text:hover {
-	text-decoration: underline;
-}
-
-.wall-item-body {
-	position: relative;
-	width: 100%;
-}
diff --git a/showmore_dyn/showmore_dyn.js b/showmore_dyn/showmore_dyn.js
deleted file mode 100644
index 74803d2d..00000000
--- a/showmore_dyn/showmore_dyn.js
+++ /dev/null
@@ -1,90 +0,0 @@
-var nextBodyIdx = 0;
-
-$(document).ready(function() {
-	loc = window.location.pathname;
-	if (loc.startsWith('/display')) {
-		return;
-	}
-
-	if (postLimitHeight) {
-		$('head').append('<style type="text/css">.limit-height{max-height: ' + postLimitHeight + 'px; overflow: hidden; }</style>');
-		handleNewWallItemBodies();
-
-		document.addEventListener('postprocess_liveupdate', function() {
-			handleNewWallItemBodies();
-		});
-	}
-});
-
-function handleNewWallItemBodies() {
-	$('.wall-item-body:not(.showmore-done)').each(function() {
-		var $el = $(this);
-		$el.addClass('showmore-done');
-		if ($el.has('button.content-filter-button').length > 0) {
-			$el.removeClass('limitable');
-			return;
-		}
-
-		if (!$el.attr("id")) {
-			$el.attr("id", nextBodyIdx++);
-		}
-		addHeightToggleHandler($el);
-		var limited = processHeightLimit($el);
-
-		if (!limited) {
-			var mutationObserver = new MutationObserver(function() {
-				var limited = processHeightLimit($el);
-				if (limited) {
-					mutationObserver.disconnect()
-				}
-			});
-			mutationObserver.observe($el[0], {
-				attributes: true,
-				characterData: true,
-				childList: true,
-				subtree: true,
-				attributeOldValue: true,
-				characterDataOldValue: true
-			});
-
-			$el.imagesLoaded().then(function() {
-				processHeightLimit($el);
-			});
-		}
-	});
-}
-
-function addHeightToggleHandler($item) {
-	var itemId = parseInt($item.attr("id").replace("wall-item-body-", ""));
-	$item.data("item-id", itemId);
-	var toggleId = "wall-item-body-toggle-" + itemId;
-
-	$item.append('<div class="wall-item-body-toggle" data-item-id="' + itemId + '" id="' + toggleId + '" ><button type="button" class="wall-item-body-toggle-text">' + showmore_dyn_showmore_linktext + '</button></div>');
-	$item.addClass("limitable limit-height");
-
-	var $toggle = $("#" + toggleId);
-	$toggle.show();
-	$toggle.click(function(el) {
-		$item.toggleClass("limit-height");
-		$(this).hide();
-		$item.removeClass("limitable");
-	});
-}
-
-function processHeightLimit($item) {
-	if (!$item.hasClass("limitable")) {
-		return false;
-	}
-
-	var itemId = $item.data("item-id");
-	var $toggle = $("#wall-item-body-toggle-" + itemId);
-	if ($item.height() < postLimitHeight) {
-		$item.removeClass("limit-height");
-		$toggle.hide();
-		return false;
-	} else {
-		$item.addClass("limit-height");
-		$toggle.show();
-		return true;
-	}
-}
diff --git a/showmore_dyn/showmore_dyn.php b/showmore_dyn/showmore_dyn.php
deleted file mode 100644
index 7cb64bcc..00000000
--- a/showmore_dyn/showmore_dyn.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-/**
- * Name: Showmore Dynamic
- * Description: Dynamically limits height of posts
- * Version: 1.0
- * Author: Christian Wiwie
- *
- */
-
-use Friendica\App;
-use Friendica\Core\Hook;
-use Friendica\Core\L10n;
-use Friendica\Core\Logger;
-use Friendica\Core\Renderer;
-use Friendica\Database\DBA;
-use Friendica\DI;
-
-function showmore_dyn_install()
-{
-	Hook::register('page_end',  __FILE__, 'showmore_dyn_script');
-	Hook::register('head', __FILE__, 'showmore_dyn_head');
-	Hook::register('footer', __FILE__, 'showmore_dyn_footer');
-	Hook::register('addon_settings',  __FILE__, 'showmore_dyn_settings');
-	Hook::register('addon_settings_post',  __FILE__, 'showmore_dyn_settings_post');
-}
-
-function showmore_dyn_head(string &$body)
-{
-	DI::page()->registerStylesheet(__DIR__ . '/showmore_dyn.css');
-}
-
-function showmore_dyn_footer(string &$body)
-{
-	DI::page()->registerFooterScript(__DIR__ . '/showmore_dyn.js');
-}
-
-function showmore_dyn_settings_post()
-{
-	if(!DI::userSession()->getLocalUserId()) {
-		return;
-	}
-
-	if (isset($_POST['showmore_dyn-submit'])) {
-		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'showmore_dyn', 'limitHeight', $_POST['limitHeight'] ?? 0);
-	}
-}
-
-function showmore_dyn_settings(array &$data)
-{
-	if(!DI::userSession()->getLocalUserId()) {
-		return;
-	}
-
-	$limitHeight = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'showmore_dyn', 'limitHeight', 250);
-	DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'showmore_dyn', 'limitHeight', $limitHeight);
-
-	$t = Renderer::getMarkupTemplate('settings.tpl', 'addon/showmore_dyn/');
-	$html = Renderer::replaceMacros($t, [
-		'$limitHeight' => ['limitHeight', DI::l10n()->t('Limit Height'), $limitHeight, DI::l10n()->t('The maximal pixel height of posts before the Show More link is added, 0 to disable'), '', '', 'number'],
-	]);
-
-	$data = [
-		'addon' => 'showmore_dyn',
-		'title' => DI::l10n()->t('Show More Dynamic'),
-		'html'  => $html,
-	];
-}
-
-function showmore_dyn_script()
-{
-	$limitHeight = intval(DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'showmore_dyn', 'limitHeight', 250));
-	$showmore_dyn_showmore_linktext = DI::l10n()->t('Show more...');
-	DI::page()['htmlhead'] .= <<<EOT
-<script>
-	var postLimitHeight = $limitHeight;
-	var showmore_dyn_showmore_linktext = "$showmore_dyn_showmore_linktext";
-</script>
-EOT;
-}
diff --git a/showmore_dyn/templates/settings.tpl b/showmore_dyn/templates/settings.tpl
deleted file mode 100644
index a6a283ad..00000000
--- a/showmore_dyn/templates/settings.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{{include file="field_input.tpl" field=$limitHeight}}
diff --git a/smiley_pack/icons/animals/bee.gif b/smiley_pack/icons/animals/bee.gif
index 7cb6c34b..206c2e3e 100644
Binary files a/smiley_pack/icons/animals/bee.gif and b/smiley_pack/icons/animals/bee.gif differ
diff --git a/smiley_pack/icons/animals/bigspider.gif b/smiley_pack/icons/animals/bigspider.gif
index 2edde3fd..bc43debd 100644
Binary files a/smiley_pack/icons/animals/bigspider.gif and b/smiley_pack/icons/animals/bigspider.gif differ
diff --git a/smiley_pack/icons/animals/bunny.gif b/smiley_pack/icons/animals/bunny.gif
index d57745b6..402b2b31 100644
Binary files a/smiley_pack/icons/animals/bunny.gif and b/smiley_pack/icons/animals/bunny.gif differ
diff --git a/smiley_pack/icons/animals/bunnyflowers.gif b/smiley_pack/icons/animals/bunnyflowers.gif
index 381b937a..6d665e2c 100644
Binary files a/smiley_pack/icons/animals/bunnyflowers.gif and b/smiley_pack/icons/animals/bunnyflowers.gif differ
diff --git a/smiley_pack/icons/animals/cat.gif b/smiley_pack/icons/animals/cat.gif
index 34e81be3..a612c476 100644
Binary files a/smiley_pack/icons/animals/cat.gif and b/smiley_pack/icons/animals/cat.gif differ
diff --git a/smiley_pack/icons/animals/chick.gif b/smiley_pack/icons/animals/chick.gif
index bdf08639..6bcddcd8 100644
Binary files a/smiley_pack/icons/animals/chick.gif and b/smiley_pack/icons/animals/chick.gif differ
diff --git a/smiley_pack/icons/animals/cow.gif b/smiley_pack/icons/animals/cow.gif
index fff9168e..3f94cfa6 100644
Binary files a/smiley_pack/icons/animals/cow.gif and b/smiley_pack/icons/animals/cow.gif differ
diff --git a/smiley_pack/icons/animals/crab.gif b/smiley_pack/icons/animals/crab.gif
index 5d930b93..db5b8ce3 100644
Binary files a/smiley_pack/icons/animals/crab.gif and b/smiley_pack/icons/animals/crab.gif differ
diff --git a/smiley_pack/icons/animals/dog.gif b/smiley_pack/icons/animals/dog.gif
index ac02eabf..7b28477b 100644
Binary files a/smiley_pack/icons/animals/dog.gif and b/smiley_pack/icons/animals/dog.gif differ
diff --git a/smiley_pack/icons/animals/dolphin.gif b/smiley_pack/icons/animals/dolphin.gif
index 7419f764..672ebd72 100644
Binary files a/smiley_pack/icons/animals/dolphin.gif and b/smiley_pack/icons/animals/dolphin.gif differ
diff --git a/smiley_pack/icons/animals/dragonfly.gif b/smiley_pack/icons/animals/dragonfly.gif
index 4d3b1f6b..566e95c2 100644
Binary files a/smiley_pack/icons/animals/dragonfly.gif and b/smiley_pack/icons/animals/dragonfly.gif differ
diff --git a/smiley_pack/icons/animals/elephant.gif b/smiley_pack/icons/animals/elephant.gif
index efe8a6df..4311e97d 100644
Binary files a/smiley_pack/icons/animals/elephant.gif and b/smiley_pack/icons/animals/elephant.gif differ
diff --git a/smiley_pack/icons/animals/fish.gif b/smiley_pack/icons/animals/fish.gif
index 3cccc0be..3a7a584b 100644
Binary files a/smiley_pack/icons/animals/fish.gif and b/smiley_pack/icons/animals/fish.gif differ
diff --git a/smiley_pack/icons/animals/frog.gif b/smiley_pack/icons/animals/frog.gif
index 5e503258..85e4b56e 100644
Binary files a/smiley_pack/icons/animals/frog.gif and b/smiley_pack/icons/animals/frog.gif differ
diff --git a/smiley_pack/icons/animals/hamster.gif b/smiley_pack/icons/animals/hamster.gif
index 81fd118d..96c7323c 100644
Binary files a/smiley_pack/icons/animals/hamster.gif and b/smiley_pack/icons/animals/hamster.gif differ
diff --git a/smiley_pack/icons/animals/horse.gif b/smiley_pack/icons/animals/horse.gif
index f85cabc4..9103abfa 100644
Binary files a/smiley_pack/icons/animals/horse.gif and b/smiley_pack/icons/animals/horse.gif differ
diff --git a/smiley_pack/icons/animals/monkey.gif b/smiley_pack/icons/animals/monkey.gif
index a2d3ff5b..b9b338d2 100644
Binary files a/smiley_pack/icons/animals/monkey.gif and b/smiley_pack/icons/animals/monkey.gif differ
diff --git a/smiley_pack/icons/animals/pig.gif b/smiley_pack/icons/animals/pig.gif
index 973f5b1e..bdc68e83 100644
Binary files a/smiley_pack/icons/animals/pig.gif and b/smiley_pack/icons/animals/pig.gif differ
diff --git a/smiley_pack/icons/animals/sheep.gif b/smiley_pack/icons/animals/sheep.gif
index 3f7ec99c..8fafc11d 100644
Binary files a/smiley_pack/icons/animals/sheep.gif and b/smiley_pack/icons/animals/sheep.gif differ
diff --git a/smiley_pack/icons/animals/snail.gif b/smiley_pack/icons/animals/snail.gif
index 50d4dbf5..3bdb44cb 100644
Binary files a/smiley_pack/icons/animals/snail.gif and b/smiley_pack/icons/animals/snail.gif differ
diff --git a/smiley_pack/icons/babies/babycot.gif b/smiley_pack/icons/babies/babycot.gif
index ec040828..750f6df1 100644
Binary files a/smiley_pack/icons/babies/babycot.gif and b/smiley_pack/icons/babies/babycot.gif differ
diff --git a/smiley_pack/icons/babies/pregnant.gif b/smiley_pack/icons/babies/pregnant.gif
index 2795c1ad..d97f4768 100644
Binary files a/smiley_pack/icons/babies/pregnant.gif and b/smiley_pack/icons/babies/pregnant.gif differ
diff --git a/smiley_pack/icons/babies/stork.gif b/smiley_pack/icons/babies/stork.gif
index 91633907..de2371d6 100644
Binary files a/smiley_pack/icons/babies/stork.gif and b/smiley_pack/icons/babies/stork.gif differ
diff --git a/smiley_pack/icons/ccc/ccc.gif b/smiley_pack/icons/ccc/ccc.gif
deleted file mode 100644
index 2a50f84a..00000000
Binary files a/smiley_pack/icons/ccc/ccc.gif and /dev/null differ
diff --git a/smiley_pack/icons/commercial/spotify.gif b/smiley_pack/icons/commercial/spotify.gif
deleted file mode 100644
index b5f10b77..00000000
Binary files a/smiley_pack/icons/commercial/spotify.gif and /dev/null differ
diff --git a/smiley_pack/icons/commercial/twitch.gif b/smiley_pack/icons/commercial/twitch.gif
deleted file mode 100644
index 657a9dea..00000000
Binary files a/smiley_pack/icons/commercial/twitch.gif and /dev/null differ
diff --git a/smiley_pack/icons/commercial/twitter.gif b/smiley_pack/icons/commercial/twitter.gif
deleted file mode 100644
index 942a0536..00000000
Binary files a/smiley_pack/icons/commercial/twitter.gif and /dev/null differ
diff --git a/smiley_pack/icons/commercial/youtube.gif b/smiley_pack/icons/commercial/youtube.gif
deleted file mode 100644
index f4b9b6a3..00000000
Binary files a/smiley_pack/icons/commercial/youtube.gif and /dev/null differ
diff --git a/smiley_pack/icons/confused/dazed.gif b/smiley_pack/icons/confused/dazed.gif
index f9777dac..f5e7ec26 100644
Binary files a/smiley_pack/icons/confused/dazed.gif and b/smiley_pack/icons/confused/dazed.gif differ
diff --git a/smiley_pack/icons/confused/shrug.gif b/smiley_pack/icons/confused/shrug.gif
index e451f663..df56f507 100644
Binary files a/smiley_pack/icons/confused/shrug.gif and b/smiley_pack/icons/confused/shrug.gif differ
diff --git a/smiley_pack/icons/cool/affro.gif b/smiley_pack/icons/cool/affro.gif
index 1e70f58f..f06166b8 100644
Binary files a/smiley_pack/icons/cool/affro.gif and b/smiley_pack/icons/cool/affro.gif differ
diff --git a/smiley_pack/icons/cool/cool.gif b/smiley_pack/icons/cool/cool.gif
index 6aff41d5..05ba9f13 100644
Binary files a/smiley_pack/icons/cool/cool.gif and b/smiley_pack/icons/cool/cool.gif differ
diff --git a/smiley_pack/icons/devilangel/blondedevil.gif b/smiley_pack/icons/devilangel/blondedevil.gif
index ec1fe1c8..09e7e682 100644
Binary files a/smiley_pack/icons/devilangel/blondedevil.gif and b/smiley_pack/icons/devilangel/blondedevil.gif differ
diff --git a/smiley_pack/icons/devilangel/catdevil.gif b/smiley_pack/icons/devilangel/catdevil.gif
index ce01c43b..269d719b 100644
Binary files a/smiley_pack/icons/devilangel/catdevil.gif and b/smiley_pack/icons/devilangel/catdevil.gif differ
diff --git a/smiley_pack/icons/devilangel/cherub.gif b/smiley_pack/icons/devilangel/cherub.gif
index 209a75d3..40872e03 100644
Binary files a/smiley_pack/icons/devilangel/cherub.gif and b/smiley_pack/icons/devilangel/cherub.gif differ
diff --git a/smiley_pack/icons/devilangel/daseesaw.gif b/smiley_pack/icons/devilangel/daseesaw.gif
index 14a386da..1c04b2ee 100644
Binary files a/smiley_pack/icons/devilangel/daseesaw.gif and b/smiley_pack/icons/devilangel/daseesaw.gif differ
diff --git a/smiley_pack/icons/devilangel/devil.gif b/smiley_pack/icons/devilangel/devil.gif
index 8e510205..2b567972 100644
Binary files a/smiley_pack/icons/devilangel/devil.gif and b/smiley_pack/icons/devilangel/devil.gif differ
diff --git a/smiley_pack/icons/devilangel/saint.gif b/smiley_pack/icons/devilangel/saint.gif
index 04863e3d..52c22c48 100644
Binary files a/smiley_pack/icons/devilangel/saint.gif and b/smiley_pack/icons/devilangel/saint.gif differ
diff --git a/smiley_pack/icons/devilangel/turnevil.gif b/smiley_pack/icons/devilangel/turnevil.gif
index 112edffa..1490c0f7 100644
Binary files a/smiley_pack/icons/devilangel/turnevil.gif and b/smiley_pack/icons/devilangel/turnevil.gif differ
diff --git a/smiley_pack/icons/diaspora.gif b/smiley_pack/icons/diaspora.gif
deleted file mode 100644
index 82971986..00000000
Binary files a/smiley_pack/icons/diaspora.gif and /dev/null differ
diff --git a/smiley_pack/icons/disgust/fartblush.gif b/smiley_pack/icons/disgust/fartblush.gif
index 66861942..4160a1fc 100644
Binary files a/smiley_pack/icons/disgust/fartblush.gif and b/smiley_pack/icons/disgust/fartblush.gif differ
diff --git a/smiley_pack/icons/disgust/fartinbed.gif b/smiley_pack/icons/disgust/fartinbed.gif
index 89e550cb..55536499 100644
Binary files a/smiley_pack/icons/disgust/fartinbed.gif and b/smiley_pack/icons/disgust/fartinbed.gif differ
diff --git a/smiley_pack/icons/disgust/toilet.gif b/smiley_pack/icons/disgust/toilet.gif
index 28abbe7e..092d7ca4 100644
Binary files a/smiley_pack/icons/disgust/toilet.gif and b/smiley_pack/icons/disgust/toilet.gif differ
diff --git a/smiley_pack/icons/disgust/vomit.gif b/smiley_pack/icons/disgust/vomit.gif
index 72ae6374..6e7e727a 100644
Binary files a/smiley_pack/icons/disgust/vomit.gif and b/smiley_pack/icons/disgust/vomit.gif differ
diff --git a/smiley_pack/icons/drink/tea.gif b/smiley_pack/icons/drink/tea.gif
index fa6bcb51..474b9894 100644
Binary files a/smiley_pack/icons/drink/tea.gif and b/smiley_pack/icons/drink/tea.gif differ
diff --git a/smiley_pack/icons/drool/drool.gif b/smiley_pack/icons/drool/drool.gif
index c6d20226..4093df65 100644
Binary files a/smiley_pack/icons/drool/drool.gif and b/smiley_pack/icons/drool/drool.gif differ
diff --git a/smiley_pack/icons/fantasy/alienmonster.gif b/smiley_pack/icons/fantasy/alienmonster.gif
index f43c7af5..e0ca7f65 100644
Binary files a/smiley_pack/icons/fantasy/alienmonster.gif and b/smiley_pack/icons/fantasy/alienmonster.gif differ
diff --git a/smiley_pack/icons/fantasy/dinosaur.gif b/smiley_pack/icons/fantasy/dinosaur.gif
index e8343cb3..e8c625c3 100644
Binary files a/smiley_pack/icons/fantasy/dinosaur.gif and b/smiley_pack/icons/fantasy/dinosaur.gif differ
diff --git a/smiley_pack/icons/fantasy/dragon.gif b/smiley_pack/icons/fantasy/dragon.gif
index 498c921c..fd28fbf1 100644
Binary files a/smiley_pack/icons/fantasy/dragon.gif and b/smiley_pack/icons/fantasy/dragon.gif differ
diff --git a/smiley_pack/icons/fantasy/dragonwhelp.gif b/smiley_pack/icons/fantasy/dragonwhelp.gif
index b9881721..dbc45559 100644
Binary files a/smiley_pack/icons/fantasy/dragonwhelp.gif and b/smiley_pack/icons/fantasy/dragonwhelp.gif differ
diff --git a/smiley_pack/icons/fantasy/ghost.gif b/smiley_pack/icons/fantasy/ghost.gif
index 279b5012..4c5d85d8 100644
Binary files a/smiley_pack/icons/fantasy/ghost.gif and b/smiley_pack/icons/fantasy/ghost.gif differ
diff --git a/smiley_pack/icons/fediverse/ap.gif b/smiley_pack/icons/fediverse/ap.gif
deleted file mode 100644
index f37cff59..00000000
Binary files a/smiley_pack/icons/fediverse/ap.gif and /dev/null differ
diff --git a/smiley_pack/icons/fediverse/diaspora.gif b/smiley_pack/icons/fediverse/diaspora.gif
deleted file mode 100644
index 82971986..00000000
Binary files a/smiley_pack/icons/fediverse/diaspora.gif and /dev/null differ
diff --git a/smiley_pack/icons/fediverse/friendica.gif b/smiley_pack/icons/fediverse/friendica.gif
deleted file mode 100644
index 45c50e87..00000000
Binary files a/smiley_pack/icons/fediverse/friendica.gif and /dev/null differ
diff --git a/smiley_pack/icons/fediverse/hubzilla.gif b/smiley_pack/icons/fediverse/hubzilla.gif
deleted file mode 100644
index 88a3b7fd..00000000
Binary files a/smiley_pack/icons/fediverse/hubzilla.gif and /dev/null differ
diff --git a/smiley_pack/icons/fediverse/mastodon.gif b/smiley_pack/icons/fediverse/mastodon.gif
deleted file mode 100644
index 89645037..00000000
Binary files a/smiley_pack/icons/fediverse/mastodon.gif and /dev/null differ
diff --git a/smiley_pack/icons/fediverse/misskey.gif b/smiley_pack/icons/fediverse/misskey.gif
deleted file mode 100644
index 84982750..00000000
Binary files a/smiley_pack/icons/fediverse/misskey.gif and /dev/null differ
diff --git a/smiley_pack/icons/fediverse/nextcloud.gif b/smiley_pack/icons/fediverse/nextcloud.gif
deleted file mode 100644
index fa81b764..00000000
Binary files a/smiley_pack/icons/fediverse/nextcloud.gif and /dev/null differ
diff --git a/smiley_pack/icons/fediverse/pixelfed.gif b/smiley_pack/icons/fediverse/pixelfed.gif
deleted file mode 100644
index da5c1e97..00000000
Binary files a/smiley_pack/icons/fediverse/pixelfed.gif and /dev/null differ
diff --git a/smiley_pack/icons/fediverse/pleroma.gif b/smiley_pack/icons/fediverse/pleroma.gif
deleted file mode 100644
index 7be5eca4..00000000
Binary files a/smiley_pack/icons/fediverse/pleroma.gif and /dev/null differ
diff --git a/smiley_pack/icons/fight/2guns.gif b/smiley_pack/icons/fight/2guns.gif
index b9c9a1a2..9e1b6638 100644
Binary files a/smiley_pack/icons/fight/2guns.gif and b/smiley_pack/icons/fight/2guns.gif differ
diff --git a/smiley_pack/icons/fight/acid.gif b/smiley_pack/icons/fight/acid.gif
index 3c79979a..fa55f674 100644
Binary files a/smiley_pack/icons/fight/acid.gif and b/smiley_pack/icons/fight/acid.gif differ
diff --git a/smiley_pack/icons/fight/alienfight.gif b/smiley_pack/icons/fight/alienfight.gif
index e8b83c02..9d5e8792 100644
Binary files a/smiley_pack/icons/fight/alienfight.gif and b/smiley_pack/icons/fight/alienfight.gif differ
diff --git a/smiley_pack/icons/fight/bfg.gif b/smiley_pack/icons/fight/bfg.gif
index 8532df8e..c2ba9d06 100644
Binary files a/smiley_pack/icons/fight/bfg.gif and b/smiley_pack/icons/fight/bfg.gif differ
diff --git a/smiley_pack/icons/fight/bowman.gif b/smiley_pack/icons/fight/bowman.gif
index cbcd5278..2f1f8f05 100644
Binary files a/smiley_pack/icons/fight/bowman.gif and b/smiley_pack/icons/fight/bowman.gif differ
diff --git a/smiley_pack/icons/fight/chainsaw.gif b/smiley_pack/icons/fight/chainsaw.gif
index c328a1b0..71f757c3 100644
Binary files a/smiley_pack/icons/fight/chainsaw.gif and b/smiley_pack/icons/fight/chainsaw.gif differ
diff --git a/smiley_pack/icons/fight/crossbow.gif b/smiley_pack/icons/fight/crossbow.gif
index 38b184fe..20874f3c 100644
Binary files a/smiley_pack/icons/fight/crossbow.gif and b/smiley_pack/icons/fight/crossbow.gif differ
diff --git a/smiley_pack/icons/fight/gangs.gif b/smiley_pack/icons/fight/gangs.gif
index 657a040a..fe8e4cfd 100644
Binary files a/smiley_pack/icons/fight/gangs.gif and b/smiley_pack/icons/fight/gangs.gif differ
diff --git a/smiley_pack/icons/fight/hammersplat.gif b/smiley_pack/icons/fight/hammersplat.gif
index 69d39bb9..95bd5409 100644
Binary files a/smiley_pack/icons/fight/hammersplat.gif and b/smiley_pack/icons/fight/hammersplat.gif differ
diff --git a/smiley_pack/icons/fight/lasergun.gif b/smiley_pack/icons/fight/lasergun.gif
index 01c92c34..f3f82cbd 100644
Binary files a/smiley_pack/icons/fight/lasergun.gif and b/smiley_pack/icons/fight/lasergun.gif differ
diff --git a/smiley_pack/icons/fight/machinegun.gif b/smiley_pack/icons/fight/machinegun.gif
index 79c02ccf..1cff5cc5 100644
Binary files a/smiley_pack/icons/fight/machinegun.gif and b/smiley_pack/icons/fight/machinegun.gif differ
diff --git a/smiley_pack/icons/fight/marine.gif b/smiley_pack/icons/fight/marine.gif
index 5f62f33e..88fd2e09 100644
Binary files a/smiley_pack/icons/fight/marine.gif and b/smiley_pack/icons/fight/marine.gif differ
diff --git a/smiley_pack/icons/fight/sabre.gif b/smiley_pack/icons/fight/sabre.gif
index a970e813..e6239682 100644
Binary files a/smiley_pack/icons/fight/sabre.gif and b/smiley_pack/icons/fight/sabre.gif differ
diff --git a/smiley_pack/icons/fight/samurai.gif b/smiley_pack/icons/fight/samurai.gif
index e711651f..8b24385b 100644
Binary files a/smiley_pack/icons/fight/samurai.gif and b/smiley_pack/icons/fight/samurai.gif differ
diff --git a/smiley_pack/icons/fight/tank.gif b/smiley_pack/icons/fight/tank.gif
index 24af1682..f1d969dd 100644
Binary files a/smiley_pack/icons/fight/tank.gif and b/smiley_pack/icons/fight/tank.gif differ
diff --git a/smiley_pack/icons/fight/viking.gif b/smiley_pack/icons/fight/viking.gif
index 96502afa..4908eddb 100644
Binary files a/smiley_pack/icons/fight/viking.gif and b/smiley_pack/icons/fight/viking.gif differ
diff --git a/smiley_pack/icons/food/apple.gif b/smiley_pack/icons/food/apple.gif
index 44454a16..969d4ca8 100644
Binary files a/smiley_pack/icons/food/apple.gif and b/smiley_pack/icons/food/apple.gif differ
diff --git a/smiley_pack/icons/food/banana.gif b/smiley_pack/icons/food/banana.gif
index 27ddd3e0..d990d19d 100644
Binary files a/smiley_pack/icons/food/banana.gif and b/smiley_pack/icons/food/banana.gif differ
diff --git a/smiley_pack/icons/food/broccoli.gif b/smiley_pack/icons/food/broccoli.gif
index 87867f4a..f379889c 100644
Binary files a/smiley_pack/icons/food/broccoli.gif and b/smiley_pack/icons/food/broccoli.gif differ
diff --git a/smiley_pack/icons/food/carrot.gif b/smiley_pack/icons/food/carrot.gif
index 25130d46..387b94c1 100644
Binary files a/smiley_pack/icons/food/carrot.gif and b/smiley_pack/icons/food/carrot.gif differ
diff --git a/smiley_pack/icons/food/cooking.gif b/smiley_pack/icons/food/cooking.gif
index eca2bac8..e62fea06 100644
Binary files a/smiley_pack/icons/food/cooking.gif and b/smiley_pack/icons/food/cooking.gif differ
diff --git a/smiley_pack/icons/food/fryegg.gif b/smiley_pack/icons/food/fryegg.gif
index 3cfd06ec..bd1b4ff0 100644
Binary files a/smiley_pack/icons/food/fryegg.gif and b/smiley_pack/icons/food/fryegg.gif differ
diff --git a/smiley_pack/icons/food/popcorn.gif b/smiley_pack/icons/food/popcorn.gif
index 95e098d5..b0ea6976 100644
Binary files a/smiley_pack/icons/food/popcorn.gif and b/smiley_pack/icons/food/popcorn.gif differ
diff --git a/smiley_pack/icons/food/tomato.gif b/smiley_pack/icons/food/tomato.gif
index b860b13a..0e3daddb 100644
Binary files a/smiley_pack/icons/food/tomato.gif and b/smiley_pack/icons/food/tomato.gif differ
diff --git a/smiley_pack/icons/friendica.gif b/smiley_pack/icons/friendica.gif
deleted file mode 100644
index 45c50e87..00000000
Binary files a/smiley_pack/icons/friendica.gif and /dev/null differ
diff --git a/smiley_pack/icons/happy/tearsofjoy.gif b/smiley_pack/icons/happy/tearsofjoy.gif
index 10a5a825..5de31171 100644
Binary files a/smiley_pack/icons/happy/tearsofjoy.gif and b/smiley_pack/icons/happy/tearsofjoy.gif differ
diff --git a/smiley_pack/icons/hubzilla.gif b/smiley_pack/icons/hubzilla.gif
deleted file mode 100644
index 1a942621..00000000
Binary files a/smiley_pack/icons/hubzilla.gif and /dev/null differ
diff --git a/smiley_pack/icons/laugh/loltv.gif b/smiley_pack/icons/laugh/loltv.gif
index 4b7c5736..3de6f778 100644
Binary files a/smiley_pack/icons/laugh/loltv.gif and b/smiley_pack/icons/laugh/loltv.gif differ
diff --git a/smiley_pack/icons/laugh/rofl.gif b/smiley_pack/icons/laugh/rofl.gif
index 3e5ac047..a3bb03d6 100644
Binary files a/smiley_pack/icons/laugh/rofl.gif and b/smiley_pack/icons/laugh/rofl.gif differ
diff --git a/smiley_pack/icons/love/iloveyou.gif b/smiley_pack/icons/love/iloveyou.gif
index 63560131..7007515b 100644
Binary files a/smiley_pack/icons/love/iloveyou.gif and b/smiley_pack/icons/love/iloveyou.gif differ
diff --git a/smiley_pack/icons/love/inlove.gif b/smiley_pack/icons/love/inlove.gif
index 2108e935..30357af2 100644
Binary files a/smiley_pack/icons/love/inlove.gif and b/smiley_pack/icons/love/inlove.gif differ
diff --git a/smiley_pack/icons/love/love.gif b/smiley_pack/icons/love/love.gif
index eb5a09dd..d8f0d5ba 100644
Binary files a/smiley_pack/icons/love/love.gif and b/smiley_pack/icons/love/love.gif differ
diff --git a/smiley_pack/icons/love/lovebear.gif b/smiley_pack/icons/love/lovebear.gif
index 36f9efbe..d13fd185 100644
Binary files a/smiley_pack/icons/love/lovebear.gif and b/smiley_pack/icons/love/lovebear.gif differ
diff --git a/smiley_pack/icons/love/loveheart.gif b/smiley_pack/icons/love/loveheart.gif
index 784cbd5a..541220a9 100644
Binary files a/smiley_pack/icons/love/loveheart.gif and b/smiley_pack/icons/love/loveheart.gif differ
diff --git a/smiley_pack/icons/mastodon.gif b/smiley_pack/icons/mastodon.gif
deleted file mode 100644
index 89645037..00000000
Binary files a/smiley_pack/icons/mastodon.gif and /dev/null differ
diff --git a/smiley_pack/icons/misskey.gif b/smiley_pack/icons/misskey.gif
deleted file mode 100644
index fe2bee93..00000000
Binary files a/smiley_pack/icons/misskey.gif and /dev/null differ
diff --git a/smiley_pack/icons/music/dj.gif b/smiley_pack/icons/music/dj.gif
index 0c2dc0e7..66bc075f 100644
Binary files a/smiley_pack/icons/music/dj.gif and b/smiley_pack/icons/music/dj.gif differ
diff --git a/smiley_pack/icons/music/drums.gif b/smiley_pack/icons/music/drums.gif
index 2afa0db9..27215f4d 100644
Binary files a/smiley_pack/icons/music/drums.gif and b/smiley_pack/icons/music/drums.gif differ
diff --git a/smiley_pack/icons/music/elvis.gif b/smiley_pack/icons/music/elvis.gif
index 6d8ad999..ebcdcccc 100644
Binary files a/smiley_pack/icons/music/elvis.gif and b/smiley_pack/icons/music/elvis.gif differ
diff --git a/smiley_pack/icons/music/guitar.gif b/smiley_pack/icons/music/guitar.gif
index 9622b50b..11eccdd0 100644
Binary files a/smiley_pack/icons/music/guitar.gif and b/smiley_pack/icons/music/guitar.gif differ
diff --git a/smiley_pack/icons/music/violin.gif b/smiley_pack/icons/music/violin.gif
index 99e2c46f..53592d6e 100644
Binary files a/smiley_pack/icons/music/violin.gif and b/smiley_pack/icons/music/violin.gif differ
diff --git a/smiley_pack/icons/nextcloud.gif b/smiley_pack/icons/nextcloud.gif
deleted file mode 100644
index fa81b764..00000000
Binary files a/smiley_pack/icons/nextcloud.gif and /dev/null differ
diff --git a/smiley_pack/icons/oldcore/headbang.gif b/smiley_pack/icons/oldcore/headbang.gif
index c2844029..91ccb8bb 100644
Binary files a/smiley_pack/icons/oldcore/headbang.gif and b/smiley_pack/icons/oldcore/headbang.gif differ
diff --git a/smiley_pack/icons/oldcore/shaka.gif b/smiley_pack/icons/oldcore/shaka.gif
index 5e91d96f..e5d7b703 100644
Binary files a/smiley_pack/icons/oldcore/shaka.gif and b/smiley_pack/icons/oldcore/shaka.gif differ
diff --git a/smiley_pack/icons/pixelfed.gif b/smiley_pack/icons/pixelfed.gif
deleted file mode 100644
index da5c1e97..00000000
Binary files a/smiley_pack/icons/pixelfed.gif and /dev/null differ
diff --git a/smiley_pack/icons/pleroma.gif b/smiley_pack/icons/pleroma.gif
deleted file mode 100644
index 7be5eca4..00000000
Binary files a/smiley_pack/icons/pleroma.gif and /dev/null differ
diff --git a/smiley_pack/icons/respect/hailking.gif b/smiley_pack/icons/respect/hailking.gif
index 2d533763..07551e50 100644
Binary files a/smiley_pack/icons/respect/hailking.gif and b/smiley_pack/icons/respect/hailking.gif differ
diff --git a/smiley_pack/icons/sad/prisoner.gif b/smiley_pack/icons/sad/prisoner.gif
index 3c16c3eb..f2c3181d 100644
Binary files a/smiley_pack/icons/sad/prisoner.gif and b/smiley_pack/icons/sad/prisoner.gif differ
diff --git a/smiley_pack/icons/sad/sigh.gif b/smiley_pack/icons/sad/sigh.gif
index cc384aca..68602266 100644
Binary files a/smiley_pack/icons/sad/sigh.gif and b/smiley_pack/icons/sad/sigh.gif differ
diff --git a/smiley_pack/icons/smoking/smoking.gif b/smiley_pack/icons/smoking/smoking.gif
index 93059638..77720b17 100644
Binary files a/smiley_pack/icons/smoking/smoking.gif and b/smiley_pack/icons/smoking/smoking.gif differ
diff --git a/smiley_pack/icons/sport/archery.gif b/smiley_pack/icons/sport/archery.gif
index 2e6a7c20..8b4b9f62 100644
Binary files a/smiley_pack/icons/sport/archery.gif and b/smiley_pack/icons/sport/archery.gif differ
diff --git a/smiley_pack/icons/sport/bowling.gif b/smiley_pack/icons/sport/bowling.gif
index f91936eb..0f8300c9 100644
Binary files a/smiley_pack/icons/sport/bowling.gif and b/smiley_pack/icons/sport/bowling.gif differ
diff --git a/smiley_pack/icons/sport/cycling.gif b/smiley_pack/icons/sport/cycling.gif
index 762e5748..332081e8 100644
Binary files a/smiley_pack/icons/sport/cycling.gif and b/smiley_pack/icons/sport/cycling.gif differ
diff --git a/smiley_pack/icons/sport/darts.gif b/smiley_pack/icons/sport/darts.gif
index 3c004715..09fb6ea9 100644
Binary files a/smiley_pack/icons/sport/darts.gif and b/smiley_pack/icons/sport/darts.gif differ
diff --git a/smiley_pack/icons/sport/fencing.gif b/smiley_pack/icons/sport/fencing.gif
index 24fe999c..a4ec5cd3 100644
Binary files a/smiley_pack/icons/sport/fencing.gif and b/smiley_pack/icons/sport/fencing.gif differ
diff --git a/smiley_pack/icons/sport/football.gif b/smiley_pack/icons/sport/football.gif
index 5e344746..c9fa6c5e 100644
Binary files a/smiley_pack/icons/sport/football.gif and b/smiley_pack/icons/sport/football.gif differ
diff --git a/smiley_pack/icons/sport/golf.gif b/smiley_pack/icons/sport/golf.gif
index 31762064..179fc52d 100644
Binary files a/smiley_pack/icons/sport/golf.gif and b/smiley_pack/icons/sport/golf.gif differ
diff --git a/smiley_pack/icons/sport/horseriding.gif b/smiley_pack/icons/sport/horseriding.gif
index 9eb717b8..13ca4503 100644
Binary files a/smiley_pack/icons/sport/horseriding.gif and b/smiley_pack/icons/sport/horseriding.gif differ
diff --git a/smiley_pack/icons/sport/juggling.gif b/smiley_pack/icons/sport/juggling.gif
index 541a0a52..1a2eb60b 100644
Binary files a/smiley_pack/icons/sport/juggling.gif and b/smiley_pack/icons/sport/juggling.gif differ
diff --git a/smiley_pack/icons/sport/skipping.gif b/smiley_pack/icons/sport/skipping.gif
index 94045234..f63270b1 100644
Binary files a/smiley_pack/icons/sport/skipping.gif and b/smiley_pack/icons/sport/skipping.gif differ
diff --git a/smiley_pack/icons/sport/snooker.gif b/smiley_pack/icons/sport/snooker.gif
index d5ad7260..fa2e6a84 100644
Binary files a/smiley_pack/icons/sport/snooker.gif and b/smiley_pack/icons/sport/snooker.gif differ
diff --git a/smiley_pack/icons/sport/surfing.gif b/smiley_pack/icons/sport/surfing.gif
index 2ed2b77a..b75d74b9 100644
Binary files a/smiley_pack/icons/sport/surfing.gif and b/smiley_pack/icons/sport/surfing.gif differ
diff --git a/smiley_pack/icons/sport/tennis.gif b/smiley_pack/icons/sport/tennis.gif
index b4164107..36e47bf9 100644
Binary files a/smiley_pack/icons/sport/tennis.gif and b/smiley_pack/icons/sport/tennis.gif differ
diff --git a/smiley_pack/icons/tired/countsheep.gif b/smiley_pack/icons/tired/countsheep.gif
index 849eddfb..815b090f 100644
Binary files a/smiley_pack/icons/tired/countsheep.gif and b/smiley_pack/icons/tired/countsheep.gif differ
diff --git a/smiley_pack/icons/tired/hammock.gif b/smiley_pack/icons/tired/hammock.gif
index 4192de66..8639dd32 100644
Binary files a/smiley_pack/icons/tired/hammock.gif and b/smiley_pack/icons/tired/hammock.gif differ
diff --git a/smiley_pack/icons/tired/yawn.gif b/smiley_pack/icons/tired/yawn.gif
index 21f374a5..d4514801 100644
Binary files a/smiley_pack/icons/tired/yawn.gif and b/smiley_pack/icons/tired/yawn.gif differ
diff --git a/smiley_pack/lang/C/messages.po b/smiley_pack/lang/C/messages.po
new file mode 100644
index 00000000..e69de29b
diff --git a/smiley_pack/lang/smiley_pack_es/smiley_pack_es.php b/smiley_pack/lang/smiley_pack_es/smiley_pack_es.php
index 38b208da..febdd41c 100644
--- a/smiley_pack/lang/smiley_pack_es/smiley_pack_es.php
+++ b/smiley_pack/lang/smiley_pack_es/smiley_pack_es.php
@@ -6,16 +6,19 @@
  * Author: Thomas Willingham (based on Mike Macgirvin's Adult Smile template) 
  * All smileys from sites offering them as Public Domain
  */
-
-use Friendica\App;
 use Friendica\Core\Hook;
-use Friendica\DI;
 
 function smiley_pack_es_install() {
 	Hook::register('smilie', 'addon/smiley_pack_es/smiley_pack_es.php', 'smiley_pack_smilies_es');
 }
 
-function smiley_pack_smilies_es(array &$b) {
+function smiley_pack_es_uninstall() {
+	Hook::unregister('smilie', 'addon/smiley_pack_es/smiley_pack_es.php', 'smiley_pack_smilies');
+}
+
+ 
+
+function smiley_pack_smilies_es(&$a,&$b) {
 
 #Smileys are split into various directories by the intended range of emotions.  This is in case we get too big and need to modularise things.  We can then cut and paste the right lines, move the right directory, and just change the name of the addon to happy_smilies or whatever.
 
@@ -27,459 +30,459 @@ function smiley_pack_smilies_es(array &$b) {
 #Animal smileys.
 
 	$b['texts'][] = ':conejitoflores';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/bunnyflowers.gif' . '" alt="' . ':conejitoflores' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/bunnyflowers.gif' . '" alt="' . ':conejitoflores' . '" />';
 
 	$b['texts'][] = ':pollito';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/chick.gif' . '" alt="' . ':pollito' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/chick.gif' . '" alt="' . ':pollito' . '" />';
 
 	$b['texts'][] = ':abeja';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/bee.gif' . '" alt="' . ':abeja' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/bee.gif' . '" alt="' . ':abeja' . '" />';
 
 	$b['texts'][] = ':mariquita';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/ladybird.gif' . '" alt="' . ':mariquita' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/ladybird.gif' . '" alt="' . ':mariquita' . '" />';
 
 	$b['texts'][] = ':araña';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/bigspider.gif' . '" alt="' . ':araña' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/bigspider.gif' . '" alt="' . ':araña' . '" />';
 
 	$b['texts'][] = ':gato';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/cat.gif' . '" alt="' . ':gato' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/cat.gif' . '" alt="' . ':gato' . '" />';
 
 	$b['texts'][] = ':conejito';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/bunny.gif' . '" alt="' . ':conejito' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/bunny.gif' . '" alt="' . ':conejito' . '" />';
 
 	$b['texts'][] = ':vaca';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/cow.gif' . '" alt="' . ':vaca' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/cow.gif' . '" alt="' . ':vaca' . '" />';
     
 	$b['texts'][] = ':cangrejo';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/crab.gif' . '" alt="' . ':cangrejo' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/crab.gif' . '" alt="' . ':cangrejo' . '" />';
 
 	$b['texts'][] = ':delfín';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/dolphin.gif' . '" alt="' . ':delfín' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/dolphin.gif' . '" alt="' . ':delfín' . '" />';
 
 	$b['texts'][] = ':libélula';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/dragonfly.gif' . '" alt="' . ':libélula' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/dragonfly.gif' . '" alt="' . ':libélula' . '" />';
 
 	$b['texts'][] = ':rana';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/frog.gif' . '" alt="' . ':rana' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/frog.gif' . '" alt="' . ':rana' . '" />';
 
 	$b['texts'][] = ':hamster';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/hamster.gif' . '" alt="' . ':hamster' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/hamster.gif' . '" alt="' . ':hamster' . '" />';
 
 	$b['texts'][] = ':mono';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/monkey.gif' . '" alt="' . ':mono' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/monkey.gif' . '" alt="' . ':mono' . '" />';
 
 	$b['texts'][] = ':caballo';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/horse.gif' . '" alt="' . ':caballo' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/horse.gif' . '" alt="' . ':caballo' . '" />';
   
 	$b['texts'][] = ':loro';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/parrot.gif' . '" alt="' . ':loro' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/parrot.gif' . '" alt="' . ':loro' . '" />';
 
 	$b['texts'][] = ':tux';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/tux.gif' . '" alt="' . ':tux' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/tux.gif' . '" alt="' . ':tux' . '" />';
 
 	$b['texts'][] = ':caracol';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/snail.gif' . '" alt="' . ':caracol' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/snail.gif' . '" alt="' . ':caracol' . '" />';
 
 	$b['texts'][] = ':oveja';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/sheep.gif' . '" alt="' . ':oveja' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/sheep.gif' . '" alt="' . ':oveja' . '" />';
 
 	$b['texts'][] = ':perro';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/dog.gif' . '" alt="' . ':perro' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/dog.gif' . '" alt="' . ':perro' . '" />';
 
 	$b['texts'][] = ':elefante';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/elephant.gif' . '" alt="' . ':elefante' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/elephant.gif' . '" alt="' . ':elefante' . '" />';
 
 	$b['texts'][] = ':pez';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/fish.gif' . '" alt="' . ':pez' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/fish.gif' . '" alt="' . ':pez' . '" />';
 
 	$b['texts'][] = ':jirafa';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/giraffe.gif' . '" alt="' . ':jirafa' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/giraffe.gif' . '" alt="' . ':jirafa' . '" />';
 
 	$b['texts'][] = ':cerdo';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/pig.gif' . '" alt="' . ':cerdo' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/pig.gif' . '" alt="' . ':cerdo' . '" />';
 
 
 
 #Baby Smileys
 
 	$b['texts'][] = ':bebé';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/babies/baby.gif' . '" alt="' . ':bebé' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/babies/baby.gif' . '" alt="' . ':bebé' . '" />';
 
 	$b['texts'][] = ':cuna';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/babies/babycot.gif' . '" alt="' . ':cuna' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/babies/babycot.gif' . '" alt="' . ':cuna' . '" />';
 	
 
 	$b['texts'][] = ':embarazada';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/babies/pregnant.gif' . '" alt="' . ':embarazada' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/babies/pregnant.gif' . '" alt="' . ':embarazada' . '" />';
 
 	$b['texts'][] = ':cigüeña';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/babies/stork.gif' . '" alt="' . ':cigüeña' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/babies/stork.gif' . '" alt="' . ':cigüeña' . '" />';
 
 
 #Confused Smileys	
 	$b['texts'][] = ':confundido';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/confused/confused.gif' . '" alt="' . ':confundido' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/confused/confused.gif' . '" alt="' . ':confundido' . '" />';
     
 	$b['texts'][] = ':encogehombros';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/confused/shrug.gif' . '" alt="' . ':encogehombros' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/confused/shrug.gif' . '" alt="' . ':encogehombros' . '" />';
 
 	$b['texts'][] = ':estúpido';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/confused/stupid.gif' . '" alt="' . ':estúpido' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/confused/stupid.gif' . '" alt="' . ':estúpido' . '" />';
 
 	$b['texts'][] = ':aturdidp';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/confused/dazed.gif' . '" alt="' . ':aturdid' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/confused/dazed.gif' . '" alt="' . ':aturdid' . '" />';
 
 
 #Cool Smileys
 
 	$b['texts'][] = ':afro';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/cool/affro.gif' . '" alt="' . ':afro' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/cool/affro.gif' . '" alt="' . ':afro' . '" />';
 
 	$b['texts'][] = ':guay';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/cool/cool.gif' . '" alt="' . ':guay' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/cool/cool.gif' . '" alt="' . ':guay' . '" />';
 
 #Devil/Angel Smileys
 
 	$b['texts'][] = ':ángel';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/devilangel/angel.gif' . '" alt="' . ':ángel' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/devilangel/angel.gif' . '" alt="' . ':ángel' . '" />';
 
 	$b['texts'][] = ':querubín';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/devilangel/cherub.gif' . '" alt="' . ':querubín' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/devilangel/cherub.gif' . '" alt="' . ':querubín' . '" />';
 
 	$b['texts'][] = ':ángeldemonio';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/devilangel/blondedevil.gif' . '" alt="' . ':ángeldemonio' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/devilangel/blondedevil.gif' . '" alt="' . ':ángeldemonio' . '" />';
 
 	$b['texts'][] = ':gatodemonio';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/devilangel/catdevil.gif' . '" alt="' . ':gatodemonio' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/devilangel/catdevil.gif' . '" alt="' . ':gatodemonio' . '" />';
 
 	$b['texts'][] = ':diabólico';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/devilangel/devil.gif' . '" alt="' . ':diabólico' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/devilangel/devil.gif' . '" alt="' . ':diabólico' . '" />';
 	
 	$b['texts'][] = ':adbalancín';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/devilangel/daseesaw.gif' . '" alt="' . ':adbalancín' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/devilangel/daseesaw.gif' . '" alt="' . ':adbalancín' . '" />';
 
 	$b['texts'][] = ':vuelvedemonio';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/devilangel/turnevil.gif' . '" alt="' . ':vuelvedemonio' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/devilangel/turnevil.gif' . '" alt="' . ':vuelvedemonio' . '" />';
 	
 	$b['texts'][] = ':santo';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/devilangel/saint.gif' . '" alt="' . ':santo' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/devilangel/saint.gif' . '" alt="' . ':santo' . '" />';
 
 	$b['texts'][] = ':tumba';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/devilangel/graveside.gif' . '" alt="' . ':tumba' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/devilangel/graveside.gif' . '" alt="' . ':tumba' . '" />';
 
 #Unpleasent smileys.
 
 	$b['texts'][] = ':retrete';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/disgust/toilet.gif' . '" alt="' . ':retrete' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/disgust/toilet.gif' . '" alt="' . ':retrete' . '" />';
 
 	$b['texts'][] = ':pedoencama';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/disgust/fartinbed.gif' . '" alt="' . ':pedoencama' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/disgust/fartinbed.gif' . '" alt="' . ':pedoencama' . '" />';
 
 	$b['texts'][] = ':vómito';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/disgust/vomit.gif' . '" alt="' . ':vómito' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/disgust/vomit.gif' . '" alt="' . ':vómito' . '" />';
 
 	$b['texts'][] = ':pedosonrojo';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/disgust/fartblush.gif' . '" alt="' . ':pedosonrojo' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/disgust/fartblush.gif' . '" alt="' . ':pedosonrojo' . '" />';
 
 #Drinks
 
 	$b['texts'][] = ':té';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/drink/tea.gif' . '" alt="' . ':té' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/drink/tea.gif' . '" alt="' . ':té' . '" />';
 
 	$b['texts'][] = ':baba';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/drool/drool.gif' . '" alt="' . ':baba' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/drool/drool.gif' . '" alt="' . ':baba' . '" />';
 
 #Sad smileys
 
 	$b['texts'][] = ':llorar';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/sad/crying.png' . '" alt="' . ':llorar' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sad/crying.png' . '" alt="' . ':llorar' . '" />';
 
 	$b['texts'][] = ':prisonero';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/sad/prisoner.gif' . '" alt="' . ':prisonero' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sad/prisoner.gif' . '" alt="' . ':prisonero' . '" />';
 
 	$b['texts'][] = ':suspiro';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/sad/sigh.gif' . '" alt="' . ':suspiro' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sad/sigh.gif' . '" alt="' . ':suspiro' . '" />';
 
 #Smoking - only one smiley in here, maybe it needs moving elsewhere?
 
 	$b['texts'][] = ':fumar';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/smoking/smoking.gif' . '" alt="' . ':fumar' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/smoking/smoking.gif' . '" alt="' . ':fumar' . '" />';
 
 #Sport smileys
 
 	$b['texts'][] = ':baloncesto';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/sport/basketball.gif' . '" alt="' . ':baloncesto' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/basketball.gif' . '" alt="' . ':baloncesto' . '" />';
 
 	$b['texts'][] = ':bolos';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/sport/bowling.gif' . '" alt="' . ':bolos' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/bowling.gif' . '" alt="' . ':bolos' . '" />';
 
 	$b['texts'][] = ':enbici';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/sport/cycling.gif' . '" alt="' . ':enbici' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/cycling.gif' . '" alt="' . ':enbici' . '" />';
 
 	$b['texts'][] = ':dardos';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/sport/darts.gif' . '" alt="' . ':dardos' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/darts.gif' . '" alt="' . ':dardos' . '" />';
 
 	$b['texts'][] = ':esgrima';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/sport/fencing.gif' . '" alt="' . ':esgrima' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/fencing.gif' . '" alt="' . ':esgrima' . '" />';
 
 	$b['texts'][] = ':golf';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/sport/golf.gif' . '" alt="' . ':golf' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/golf.gif' . '" alt="' . ':golf' . '" />';
 
 	$b['texts'][] = ':malabares';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/sport/juggling.gif' . '" alt="' . ':malabares' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/juggling.gif' . '" alt="' . ':malabares' . '" />';
 
 	$b['texts'][] = ':comba';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/sport/skipping.gif' . '" alt="' . ':comba' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/skipping.gif' . '" alt="' . ':comba' . '" />';
 
 	$b['texts'][] = ':tiroconarco';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/sport/archery.gif' . '" alt="' . ':tiroconarco' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/archery.gif' . '" alt="' . ':tiroconarco' . '" />';
 
 	$b['texts'][] = ':fútbol';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/sport/football.gif' . '" alt="' . ':fútbol' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/football.gif' . '" alt="' . ':fútbol' . '" />';
 
 	$b['texts'][] = ':surf';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/sport/surfing.gif' . '" alt="' . ':surf' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/surfing.gif' . '" alt="' . ':surf' . '" />';
 
 	$b['texts'][] = ':billar';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/sport/snooker.gif' . '" alt="' . ':billar' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/snooker.gif' . '" alt="' . ':billar' . '" />';
   
 	$b['texts'][] = ':tenis';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/sport/tennis.gif' . '" alt="' . ':tenis' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/tennis.gif' . '" alt="' . ':tenis' . '" />';
 
 	$b['texts'][] = ':acaballo';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/sport/horseriding.gif' . '" alt="' . ':acaballo' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/horseriding.gif' . '" alt="' . ':acaballo' . '" />';
 
 #Love smileys
 
 	$b['texts'][] = ':tequiero';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/love/iloveyou.gif' . '" alt="' . ':tequiero' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/love/iloveyou.gif' . '" alt="' . ':tequiero' . '" />';
 
 	$b['texts'][] = ':enamorada';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/love/inlove.gif' . '" alt="' . ':enamorada' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/love/inlove.gif' . '" alt="' . ':enamorada' . '" />';
 
 	$b['texts'][] = ':amor';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/love/love.gif' . '" alt="' . ':amor' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/love/love.gif' . '" alt="' . ':amor' . '" />';
 
 	$b['texts'][] = ':osoamoroso';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/love/lovebear.gif' . '" alt="' . ':osoamoroso' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/love/lovebear.gif' . '" alt="' . ':osoamoroso' . '" />';
 
 	$b['texts'][] = ':camaamor';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/love/lovebed.gif' . '" alt="' . ':camaamor' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/love/lovebed.gif' . '" alt="' . ':camaamor' . '" />';
 
 	$b['texts'][] = ':corazónamor';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/love/loveheart.gif' . '" alt="' . ':corazónamor' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/love/loveheart.gif' . '" alt="' . ':corazónamor' . '" />';
 
 #Tired/Sleep smileys
 
 	$b['texts'][] = ':contandoovejas';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/tired/countsheep.gif' . '" alt="' . ':contandoovejas' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/tired/countsheep.gif' . '" alt="' . ':contandoovejas' . '" />';
 
 	$b['texts'][] = ':hamaca';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/tired/hammock.gif' . '" alt="' . ':hamaca' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/tired/hammock.gif' . '" alt="' . ':hamaca' . '" />';
 
 	$b['texts'][] = ':almohada';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/tired/pillow.gif' . '" alt="' . ':almohada' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/tired/pillow.gif' . '" alt="' . ':almohada' . '" />';
 
 	$b['texts'][] = ':bostezo';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/tired/yawn.gif' . '" alt="' . ':bostezo' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/tired/yawn.gif' . '" alt="' . ':bostezo' . '" />';
 
 #Fight/Flame/Violent smileys
 
 	$b['texts'][] = ':pistolas';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fight/2guns.gif' . '" alt="' . ':pistolas' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/2guns.gif' . '" alt="' . ':pistolas' . '" />';
 
 	$b['texts'][] = ':peleamarciano';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fight/alienfight.gif' . '" alt="' . ':peleamarciano' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/alienfight.gif' . '" alt="' . ':peleamarciano' . '" />';
 
 	$b['texts'][] = ':alfa';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fight/alpha.png' . '" alt="' . ':alfa' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/alpha.png' . '" alt="' . ':alfa' . '" />';
 
 	$b['texts'][] = ':ejército';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fight/army.gif' . '" alt="' . ':ejército' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/army.gif' . '" alt="' . ':ejército' . '" />';
 
 	$b['texts'][] = ':cabezaflecha';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fight/arrowhead.gif' . '" alt="' . ':cabezaflecha' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/arrowhead.gif' . '" alt="' . ':cabezaflecha' . '" />';
 
 	$b['texts'][] = ':bfg';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fight/bfg.gif' . '" alt="' . ':bfg' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/bfg.gif' . '" alt="' . ':bfg' . '" />';
 
 	$b['texts'][] = ':arquero';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fight/bowman.gif' . '" alt="' . ':arquero' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/bowman.gif' . '" alt="' . ':arquero' . '" />';
 
 	$b['texts'][] = ':motosierra';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fight/chainsaw.gif' . '" alt="' . ':motosierra' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/chainsaw.gif' . '" alt="' . ':motosierra' . '" />';
 
 	$b['texts'][] = ':ballesta';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fight/crossbow.gif' . '" alt="' . ':ballesta' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/crossbow.gif' . '" alt="' . ':ballesta' . '" />';
 
 	$b['texts'][] = ':cruzado';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fight/crusader.gif' . '" alt="' . ':cruzado' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/crusader.gif' . '" alt="' . ':cruzado' . '" />';
 
 	$b['texts'][] = ':muerto';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fight/dead.gif' . '" alt="' . ':muerto' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/dead.gif' . '" alt="' . ':muerto' . '" />';
 
 	$b['texts'][] = ':martillazo';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fight/hammersplat.gif' . '" alt="' . ':martillazo' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/hammersplat.gif' . '" alt="' . ':martillazo' . '" />';
 
 	$b['texts'][] = ':pistolalaser';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fight/lasergun.gif' . '" alt="' . ':pistolalaser' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/lasergun.gif' . '" alt="' . ':pistolalaser' . '" />';
 
 	$b['texts'][] = ':metralleta';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fight/machinegun.gif' . '" alt="' . ':metralleta' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/machinegun.gif' . '" alt="' . ':metralleta' . '" />';
 
 	$b['texts'][] = ':marine';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fight/marine.gif' . '" alt="' . ':marine' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/marine.gif' . '" alt="' . ':marine' . '" />';
 
 	$b['texts'][] = ':sable';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fight/sabre.gif' . '" alt="' . ':sable' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/sabre.gif' . '" alt="' . ':sable' . '" />';
 
 	$b['texts'][] = ':tanque';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fight/tank.gif' . '" alt="' . ':tanque' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/tank.gif' . '" alt="' . ':tanque' . '" />';
 
 	$b['texts'][] = ':vikingo';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fight/viking.gif' . '" alt="' . ':vikingo' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/viking.gif' . '" alt="' . ':vikingo' . '" />';
 
 	$b['texts'][] = ':bandas';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fight/gangs.gif' . '" alt="' . ':bandas' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/gangs.gif' . '" alt="' . ':bandas' . '" />';
 
 	$b['texts'][] = ':ácido';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fight/acid.gif' . '" alt="' . ':ácido' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/acid.gif' . '" alt="' . ':ácido' . '" />';
 
 #Fantasy smileys - monsters and dragons fantasy.  The other type of fantasy belongs in adult smileys
 
 	$b['texts'][] = ':alien';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fantasy/alienmonster.gif' . '" alt="' . ':alien' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fantasy/alienmonster.gif' . '" alt="' . ':alien' . '" />';
 
 	$b['texts'][] = ':bárbaro';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fantasy/barbarian.gif' . '" alt="' . ':bárbaro' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fantasy/barbarian.gif' . '" alt="' . ':bárbaro' . '" />';
 
 	$b['texts'][] = ':dinosaurio';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fantasy/dinosaur.gif' . '" alt="' . ':dinosaurio' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fantasy/dinosaur.gif' . '" alt="' . ':dinosaurio' . '" />';
 
 	$b['texts'][] = ':dragón';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fantasy/dragon.gif' . '" alt="' . ':dragón' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fantasy/dragon.gif' . '" alt="' . ':dragón' . '" />';
 
 	$b['texts'][] = ':draco';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fantasy/dragonwhelp.gif' . '" alt="' . ':draco' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fantasy/dragonwhelp.gif' . '" alt="' . ':draco' . '" />';
 
 	$b['texts'][] = ':fantasma';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fantasy/ghost.gif' . '" alt="' . ':fantasma' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fantasy/ghost.gif' . '" alt="' . ':fantasma' . '" />';
 
 	$b['texts'][] = ':momia';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fantasy/mummy.gif' . '" alt="' . ':momia' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fantasy/mummy.gif' . '" alt="' . ':momia' . '" />';
 
 #Food smileys
 
 	$b['texts'][] = ':mazana';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/food/apple.gif' . '" alt="' . ':mazana' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/food/apple.gif' . '" alt="' . ':mazana' . '" />';
 
 	$b['texts'][] = ':brócoli';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/food/broccoli.gif' . '" alt="' . ':brócoli' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/food/broccoli.gif' . '" alt="' . ':brócoli' . '" />';
 
 	$b['texts'][] = ':pastel';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/food/cake.gif' . '" alt="' . ':pastel' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/food/cake.gif' . '" alt="' . ':pastel' . '" />';
 
 	$b['texts'][] = ':zanahoria';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/food/carrot.gif' . '" alt="' . ':zanahoria' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/food/carrot.gif' . '" alt="' . ':zanahoria' . '" />';
 
 	$b['texts'][] = ':palomitas';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/food/popcorn.gif' . '" alt="' . ':palomitas' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/food/popcorn.gif' . '" alt="' . ':palomitas' . '" />';
 
 	$b['texts'][] = ':tomate';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/food/tomato.gif' . '" alt="' . ':tomate' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/food/tomato.gif' . '" alt="' . ':tomate' . '" />';
 
 	$b['texts'][] = ':plátano';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/food/banana.gif' . '" alt="' . ':plátano' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/food/banana.gif' . '" alt="' . ':plátano' . '" />';
 
 	$b['texts'][] = ':cocinar';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/food/cooking.gif' . '" alt="' . ':cocinar' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/food/cooking.gif' . '" alt="' . ':cocinar' . '" />';
 
 	$b['texts'][] = ':huevofrito';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/food/fryegg.gif' . '" alt="' . ':huevofrito' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/food/fryegg.gif' . '" alt="' . ':huevofrito' . '" />';
 
 #Happy smileys
 
 	$b['texts'][] = ':cloud9';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/happy/cloud9.gif' . '" alt="' . ':cloud9' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/happy/cloud9.gif' . '" alt="' . ':cloud9' . '" />';
 
 	$b['texts'][] = ':tearsofjoy';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/happy/tearsofjoy.gif' . '" alt="' . ':tearsofjoy' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/happy/tearsofjoy.gif' . '" alt="' . ':tearsofjoy' . '" />';
 
 #Repsect smileys
 
 	$b['texts'][] = ':reverencia';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/respect/bow.gif' . '" alt="' . ':reverencia' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/respect/bow.gif' . '" alt="' . ':reverencia' . '" />';
 
 	$b['texts'][] = ':bravo';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/respect/bravo.gif' . '" alt="' . ':bravo' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/respect/bravo.gif' . '" alt="' . ':bravo' . '" />';
 
 	$b['texts'][] = ':vivaelrey';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/respect/hailking.gif' . '" alt="' . ':vivaelrey' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/respect/hailking.gif' . '" alt="' . ':vivaelrey' . '" />';
 
 	$b['texts'][] = ':número1';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/respect/number1.gif' . '" alt="' . ':número1' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/respect/number1.gif' . '" alt="' . ':número1' . '" />';
 
 #Laugh smileys
 
 	$b['texts'][] = ':jajaja';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/laugh/hahaha.gif' . '" alt="' . ':jajaja' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/laugh/hahaha.gif' . '" alt="' . ':jajaja' . '" />';
 
 	$b['texts'][] = ':jajatv';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/laugh/loltv.gif' . '" alt="' . ':jajatv' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/laugh/loltv.gif' . '" alt="' . ':jajatv' . '" />';
 
 	$b['texts'][] = ':meparto';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/laugh/rofl.gif' . '" alt="' . ':meparto' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/laugh/rofl.gif' . '" alt="' . ':meparto' . '" />';
 
 #Music smileys
 
 	$b['texts'][] = ':dj';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/music/dj.gif' . '" alt="' . ':dj' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/music/dj.gif' . '" alt="' . ':dj' . '" />';
 
 	$b['texts'][] = ':batería';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/music/drums.gif' . '" alt="' . ':batería' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/music/drums.gif' . '" alt="' . ':batería' . '" />';
 
 	$b['texts'][] = ':elvis';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/music/elvis.gif' . '" alt="' . ':elivs' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/music/elvis.gif' . '" alt="' . ':elivs' . '" />';
 
 	$b['texts'][] = ':guitarra';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/music/guitar.gif' . '" alt="' . ':guitarra' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/music/guitar.gif' . '" alt="' . ':guitarra' . '" />';
 
 	$b['texts'][] = ':trompeta';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/music/trumpet.gif' . '" alt="' . ':trompeta' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/music/trumpet.gif' . '" alt="' . ':trompeta' . '" />';
 
 	$b['texts'][] = ':violín';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/music/violin.gif' . '" alt="' . ':violín' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/music/violin.gif' . '" alt="' . ':violín' . '" />';
 
 #Smileys that used to be in core
 
 	$b['texts'][] = ':cabezagolpe';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/oldcore/headbang.gif' . '" alt="' . ':cabezagolpe' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/oldcore/headbang.gif' . '" alt="' . ':cabezagolpe' . '" />';
 
 		$b['texts'][] = ':barba';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/oldcore/beard.png' . '" alt="' . ':barba' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/oldcore/beard.png' . '" alt="' . ':barba' . '" />';
 
 	$b['texts'][] = ':barbablanca';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/oldcore/whitebeard.png' . '" alt="' . ':barbablanca' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/oldcore/whitebeard.png' . '" alt="' . ':barbablanca' . '" />';
 
 	$b['texts'][] = ':saludosurf';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/oldcore/shaka.gif' . '" alt="' . ':saludosurf' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/oldcore/shaka.gif' . '" alt="' . ':saludosurf' . '" />';
 
 	$b['texts'][] = ':\\.../';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/oldcore/shaka.gif' . '" alt="' . ':\\.../' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/oldcore/shaka.gif' . '" alt="' . ':\\.../' . '" />';
 
 	$b['texts'][] = ':\\ooo/';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/oldcore/shaka.gif' . '" alt="' . ':\\ooo/' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/oldcore/shaka.gif' . '" alt="' . ':\\ooo/' . '" />';
 
 	$b['texts'][] = ':cabezamesa';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/oldcore/headbang.gif' . '" alt="' . ':cabezamesa' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/oldcore/headbang.gif' . '" alt="' . ':cabezamesa' . '" />';
 
 #These two are still in core, so oldcore isn't strictly right, but we don't want too many directories
 
 	$b['texts'][] = ':-d';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/oldcore/laughing.gif' . '" alt="' . ':-d' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/oldcore/laughing.gif' . '" alt="' . ':-d' . '" />';
 
 	$b['texts'][] = ':-o';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/oldcore/surprised.gif' . '" alt="' . ':-o' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/oldcore/surprised.gif' . '" alt="' . ':-o' . '" />';
 
 
 
diff --git a/smiley_pack/lang/smiley_pack_fr/smiley_pack_fr.php b/smiley_pack/lang/smiley_pack_fr/smiley_pack_fr.php
index 63cf613e..5f10a5b1 100644
--- a/smiley_pack/lang/smiley_pack_fr/smiley_pack_fr.php
+++ b/smiley_pack/lang/smiley_pack_fr/smiley_pack_fr.php
@@ -3,23 +3,24 @@
  * Name: Smiley Pack (Français)
  * Description: Pack of smileys that make master too AOLish.
  * Version: 1.01
- * Author: Thomas Willingham (based on Mike Macgirvin's Adult Smile template)
+ * Author: Thomas Willingham (based on Mike Macgirvin's Adult Smile template) 
  * All smileys from sites offering them as Public Domain
- *
- *
+ * 
+ * 
  */
-
-use Friendica\App;
 use Friendica\Core\Hook;
-use Friendica\DI;
 
-function smiley_pack_fr_install()
-{
+function smiley_pack_fr_install() {
 	Hook::register('smilie', 'addon/smiley_pack_fr/smiley_pack_fr.php', 'smiley_pack_fr_smilies');
 }
 
-function smiley_pack_fr_smilies(array &$b)
-{
+function smiley_pack_fr_uninstall() {
+	Hook::unregister('smilie', 'addon/smiley_pack_fr/smiley_pack_fr.php', 'smiley_pack_fr_smilies');
+}
+
+ 
+
+function smiley_pack_fr_smilies(&$a,&$b) {
 
 #Smileys are split into various directories by the intended range of emotions.  This is in case we get too big and need to modularise things.  We can then cut and paste the right lines, move the right directory, and just change the name of the addon to happy_smilies or whatever.
 
@@ -31,377 +32,378 @@ function smiley_pack_fr_smilies(array &$b)
 #Animal smileys.
 
 	$b['texts'][] = ':fleurslapin';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/bunnyflowers.gif' . '" alt="' . ':fleurslapin' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/bunnyflowers.gif' . '" alt="' . ':fleurslapin' . '" />';
 
 	$b['texts'][] = ':poussin';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/chick.gif' . '" alt="' . ':poussin' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/chick.gif' . '" alt="' . ':poussin' . '" />';
 
 	$b['texts'][] = ':bourdon';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/bee.gif' . '" alt="' . ':bourdon' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/bee.gif' . '" alt="' . ':bourdon' . '" />';
 
 	$b['texts'][] = ':coccinelle';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/ladybird.gif' . '" alt="' . ':coccinelle' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/ladybird.gif' . '" alt="' . ':coccinelle' . '" />';
 
 	$b['texts'][] = ':araignée';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/bigspider.gif' . '" alt="' . ':araignée' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/bigspider.gif' . '" alt="' . ':araignée' . '" />';
 
 	$b['texts'][] = ':chat';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/cat.gif' . '" alt="' . ':chat' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/cat.gif' . '" alt="' . ':chat' . '" />';
 
 	$b['texts'][] = ':lapin';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/bunny.gif' . '" alt="' . ':lapin' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/bunny.gif' . '" alt="' . ':lapin' . '" />';
 
 	$b['texts'][] = ':poussin';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/chick.gif' . '" alt="' . ':poussin' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/chick.gif' . '" alt="' . ':poussin' . '" />';
 
 	$b['texts'][] = ':vache';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/cow.gif' . '" alt="' . ':vache' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/cow.gif' . '" alt="' . ':vache' . '" />';
     
 	$b['texts'][] = ':crabe';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/crab.gif' . '" alt="' . ':crabe' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/crab.gif' . '" alt="' . ':crabe' . '" />';
 
 	$b['texts'][] = ':dauphin';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/dolphin.gif' . '" alt="' . ':dauphin' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/dolphin.gif' . '" alt="' . ':dauphin' . '" />';
 
 	$b['texts'][] = ':libellule';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/dragonfly.gif' . '" alt="' . ':libellule' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/dragonfly.gif' . '" alt="' . ':libellule' . '" />';
 
 	$b['texts'][] = ':grenouille';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/frog.gif' . '" alt="' . ':grenouille' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/frog.gif' . '" alt="' . ':grenouille' . '" />';
 
 	$b['texts'][] = ':singe';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/monkey.gif' . '" alt="' . ':singe' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/monkey.gif' . '" alt="' . ':singe' . '" />';
 
 	$b['texts'][] = ':cheval';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/horse.gif' . '" alt="' . ':cheval' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/horse.gif' . '" alt="' . ':cheval' . '" />';
   
 	$b['texts'][] = ':perroquet';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/parrot.gif' . '" alt="' . ':perroquet' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/parrot.gif' . '" alt="' . ':perroquet' . '" />';
 
 	$b['texts'][] = ':escargot';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/snail.gif' . '" alt="' . ':escargot' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/snail.gif' . '" alt="' . ':escargot' . '" />';
 
 	$b['texts'][] = ':mouton';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/sheep.gif' . '" alt="' . ':mouton' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/sheep.gif' . '" alt="' . ':mouton' . '" />';
 
 	$b['texts'][] = ':chien';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/dog.gif' . '" alt="' . ':chien' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/dog.gif' . '" alt="' . ':chien' . '" />';
 
 	$b['texts'][] = ':éléphant';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/elephant.gif' . '" alt="' . ':éléphant' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/elephant.gif' . '" alt="' . ':éléphant' . '" />';
 
 	$b['texts'][] = ':poisson';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/fish.gif' . '" alt="' . ':poisson' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/fish.gif' . '" alt="' . ':poisson' . '" />';
 
 	$b['texts'][] = ':girafe';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/giraffe.gif' . '" alt="' . ':girafe' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/giraffe.gif' . '" alt="' . ':girafe' . '" />';
 
 	$b['texts'][] = ':cochon';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/pig.gif' . '" alt="' . ':cochon' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/pig.gif' . '" alt="' . ':cochon' . '" />';
 
 
 
 #Baby Smileys
 
 	$b['texts'][] = ':bébé';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/babies/baby.gif' . '" alt="' . ':bébé' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/babies/baby.gif' . '" alt="' . ':bébé' . '" />';
 
 	$b['texts'][] = ':litbébé';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/babies/babycot.gif' . '" alt="' . ':litbébé' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/babies/babycot.gif' . '" alt="' . ':litbébé' . '" />';
 	
 
 	$b['texts'][] = ':enceinte';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/babies/pregnant.gif' . '" alt="' . ':enceinte' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/babies/pregnant.gif' . '" alt="' . ':enceinte' . '" />';
 
 	$b['texts'][] = ':cigogne';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/babies/stork.gif' . '" alt="' . ':cigogne' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/babies/stork.gif' . '" alt="' . ':cigogne' . '" />';
 
 
 #Confused Smileys	
 	$b['texts'][] = ':paumé';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/confused/confused.gif' . '" alt="' . ':paumé' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/confused/confused.gif' . '" alt="' . ':paumé' . '" />';
     
 	$b['texts'][] = ':hausseépaules';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/confused/shrug.gif' . '" alt="' . ':hausseépaules' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/confused/shrug.gif' . '" alt="' . ':hausseépaules' . '" />';
 
 	$b['texts'][] = ':stupide';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/confused/stupid.gif' . '" alt="' . ':stupide' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/confused/stupid.gif' . '" alt="' . ':stupide' . '" />';
 
 	$b['texts'][] = ':hébété';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/confused/dazed.gif' . '" alt="' . ':hébété' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/confused/dazed.gif' . '" alt="' . ':hébété' . '" />';
 
 
 #Cool Smileys
 
 	$b['texts'][] = ':afro';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/cool/affro.gif' . '" alt="' . ':afro' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/cool/affro.gif' . '" alt="' . ':afro' . '" />';
 
 #Devil/Angel Smileys
 
 	$b['texts'][] = ':ange';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/devilangel/angel.gif' . '" alt="' . ':ange' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/devilangel/angel.gif' . '" alt="' . ':ange' . '" />';
 
 	$b['texts'][] = ':chérubin';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/devilangel/cherub.gif' . '" alt="' . ':chérubin' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/devilangel/cherub.gif' . '" alt="' . ':chérubin' . '" />';
 
 	$b['texts'][] = ':démonange';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/devilangel/blondedevil.gif' . '" alt="' . ':démonange' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/devilangel/blondedevil.gif' . '" alt="' . ':démonange' . '" />';
 
 	$b['texts'][] = ':diablechat';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/devilangel/catdevil.gif' . '" alt="' . ':diablechat' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/devilangel/catdevil.gif' . '" alt="' . ':diablechat' . '" />';
 
 	$b['texts'][] = ':démoniaque';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/devilangel/devil.gif' . '" alt="' . ':démoniaque' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/devilangel/devil.gif' . '" alt="' . ':démoniaque' . '" />';
 	
 	$b['texts'][] = ':bascule';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/devilangel/daseesaw.gif' . '" alt="' . ':bascule' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/devilangel/daseesaw.gif' . '" alt="' . ':bascule' . '" />';
 
 	$b['texts'][] = ':possédé';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/devilangel/turnevil.gif' . '" alt="' . ':possédé' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/devilangel/turnevil.gif' . '" alt="' . ':possédé' . '" />';
 	
 	$b['texts'][] = ':tombe';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/devilangel/graveside.gif' . '" alt="' . ':tombe' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/devilangel/graveside.gif' . '" alt="' . ':tombe' . '" />';
 
 #Unpleasent smileys.
 
 	$b['texts'][] = ':toilettes';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/disgust/toilet.gif' . '" alt="' . ':toilettes' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/disgust/toilet.gif' . '" alt="' . ':toilettes' . '" />';
 
 	$b['texts'][] = ':pèteaulit';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/disgust/fartinbed.gif' . '" alt="' . ':pèteaulit' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/disgust/fartinbed.gif' . '" alt="' . ':pèteaulit' . '" />';
 
 	$b['texts'][] = ':pet';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/disgust/fartblush.gif' . '" alt="' . ':pet' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/disgust/fartblush.gif' . '" alt="' . ':pet' . '" />';
 
 #Drinks
 
 	$b['texts'][] = ':thé';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/drink/tea.gif' . '" alt="' . ':thé' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/drink/tea.gif' . '" alt="' . ':thé' . '" />';
 
 	$b['texts'][] = ':salive';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/drool/drool.gif' . '" alt="' . ':salive' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/drool/drool.gif' . '" alt="' . ':salive' . '" />';
 
 #Sad smileys
 
 	$b['texts'][] = ':pleure';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/sad/crying.png' . '" alt="' . ':pleure' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sad/crying.png' . '" alt="' . ':pleure' . '" />';
 
 	$b['texts'][] = ':prisonnier';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/sad/prisoner.gif' . '" alt="' . ':prisonnier' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sad/prisoner.gif' . '" alt="' . ':prisonnier' . '" />';
 
 	$b['texts'][] = ':soupir';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/sad/sigh.gif' . '" alt="' . ':soupir' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sad/sigh.gif' . '" alt="' . ':soupir' . '" />';
 
 #Smoking - only one smiley in here, maybe it needs moving elsewhere?
 
 	$b['texts'][] = ':fume';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/smoking/smoking.gif' . '" alt="' . ':fume' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/smoking/smoking.gif' . '" alt="' . ':fume' . '" />';
 
 #Sport smileys
 
 	$b['texts'][] = ':basket';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/sport/basketball.gif' . '" alt="' . ':basket' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/basketball.gif' . '" alt="' . ':basket' . '" />';
 
 	$b['texts'][] = ':vélo';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/sport/cycling.gif' . '" alt="' . ':vélo' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/cycling.gif' . '" alt="' . ':vélo' . '" />';
 
 	$b['texts'][] = ':fléchettes';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/sport/darts.gif' . '" alt="' . ':fléchettes' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/darts.gif' . '" alt="' . ':fléchettes' . '" />';
 
 	$b['texts'][] = ':escrime';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/sport/fencing.gif' . '" alt="' . ':escrime' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/fencing.gif' . '" alt="' . ':escrime' . '" />';
 
 	$b['texts'][] = ':jonglage';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/sport/juggling.gif' . '" alt="' . ':jonglage' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/juggling.gif' . '" alt="' . ':jonglage' . '" />';
 
 	$b['texts'][] = ':sautàlacorde';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/sport/skipping.gif' . '" alt="' . ':sautàlacorde' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/skipping.gif' . '" alt="' . ':sautàlacorde' . '" />';
 
 	$b['texts'][] = ':arc';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/sport/archery.gif' . '" alt="' . ':arc' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/archery.gif' . '" alt="' . ':arc' . '" />';
 
 	$b['texts'][] = ':surf';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/sport/surfing.gif' . '" alt="' . ':surf' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/surfing.gif' . '" alt="' . ':surf' . '" />';
 
 	$b['texts'][] = ':billard';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/sport/snooker.gif' . '" alt="' . ':billard' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/snooker.gif' . '" alt="' . ':billard' . '" />';
   
 	$b['texts'][] = ':équitation';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/sport/horseriding.gif' . '" alt="' . ':équitation' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/horseriding.gif' . '" alt="' . ':équitation' . '" />';
 
 #Love smileys
 
 	$b['texts'][] = ':jetaime';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/love/iloveyou.gif' . '" alt="' . ':jetaime' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/love/iloveyou.gif' . '" alt="' . ':jetaime' . '" />';
 
 	$b['texts'][] = ':amoureux';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/love/inlove.gif' . '" alt="' . ':amoureux' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/love/inlove.gif' . '" alt="' . ':amoureux' . '" />';
 
 	$b['texts'][] = ':oursamour';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/love/lovebear.gif' . '" alt="' . ':oursamour' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/love/lovebear.gif' . '" alt="' . ':oursamour' . '" />';
 
 	$b['texts'][] = ':amourlit';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/love/lovebed.gif' . '" alt="' . ':amourlit' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/love/lovebed.gif' . '" alt="' . ':amourlit' . '" />';
 
 	$b['texts'][] = ':coeur';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/love/loveheart.gif' . '" alt="' . ':coeur' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/love/loveheart.gif' . '" alt="' . ':coeur' . '" />';
 
 #Tired/Sleep smileys
 
 	$b['texts'][] = ':comptemoutons';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/tired/countsheep.gif' . '" alt="' . ':comptemoutons' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/tired/countsheep.gif' . '" alt="' . ':comptemoutons' . '" />';
 
 	$b['texts'][] = ':hamac';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/tired/hammock.gif' . '" alt="' . ':hamac' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/tired/hammock.gif' . '" alt="' . ':hamac' . '" />';
 
 	$b['texts'][] = ':oreiller';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/tired/pillow.gif' . '" alt="' . ':oreiller' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/tired/pillow.gif' . '" alt="' . ':oreiller' . '" />';
 
 	$b['texts'][] = ':bâille';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/tired/yawn.gif' . '" alt="' . ':bâille' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/tired/yawn.gif' . '" alt="' . ':bâille' . '" />';
 
 #Fight/Flame/Violent smileys
 
 	$b['texts'][] = ':2pistolets';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fight/2guns.gif' . '" alt="' . ':2pistolets' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/2guns.gif' . '" alt="' . ':2pistolets' . '" />';
 
 	$b['texts'][] = ':combatalien';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fight/alienfight.gif' . '" alt="' . ':combatalien' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/alienfight.gif' . '" alt="' . ':combatalien' . '" />';
 
 	$b['texts'][] = ':armée';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fight/army.gif' . '" alt="' . ':armée' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/army.gif' . '" alt="' . ':armée' . '" />';
 
 	$b['texts'][] = ':flèche';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fight/arrowhead.gif' . '" alt="' . ':flèche' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/arrowhead.gif' . '" alt="' . ':flèche' . '" />';
 
 	$b['texts'][] = ':bfg';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fight/bfg.gif' . '" alt="' . ':bfg' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/bfg.gif' . '" alt="' . ':bfg' . '" />';
 
 	$b['texts'][] = ':archer';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fight/bowman.gif' . '" alt="' . ':archer' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/bowman.gif' . '" alt="' . ':archer' . '" />';
 
 	$b['texts'][] = ':tronçonneuse';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fight/chainsaw.gif' . '" alt="' . ':tronçonneuse' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/chainsaw.gif' . '" alt="' . ':tronçonneuse' . '" />';
 
 	$b['texts'][] = ':arbalète';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fight/crossbow.gif' . '" alt="' . ':arbalète' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/crossbow.gif' . '" alt="' . ':arbalète' . '" />';
 
 	$b['texts'][] = ':croisé';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fight/crusader.gif' . '" alt="' . ':croisé' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/crusader.gif' . '" alt="' . ':croisé' . '" />';
 
 	$b['texts'][] = ':mort';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fight/dead.gif' . '" alt="' . ':mort' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/dead.gif' . '" alt="' . ':mort' . '" />';
 
 	$b['texts'][] = ':marteau';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fight/hammersplat.gif' . '" alt="' . ':marteau' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/hammersplat.gif' . '" alt="' . ':marteau' . '" />';
 
 	$b['texts'][] = ':pistoletlaser';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fight/lasergun.gif' . '" alt="' . ':pistoletlaser' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/lasergun.gif' . '" alt="' . ':pistoletlaser' . '" />';
 
 	$b['texts'][] = ':mitrailleuse';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fight/machinegun.gif' . '" alt="' . ':mitrailleuse' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/machinegun.gif' . '" alt="' . ':mitrailleuse' . '" />';
 
 	$b['texts'][] = ':acide';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fight/acid.gif' . '" alt="' . ':acide' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/acid.gif' . '" alt="' . ':acide' . '" />';
 
 #Fantasy smileys - monsters and dragons fantasy.  The other type of fantasy belongs in adult smileys
 
 	$b['texts'][] = ':monstrealien';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fantasy/alienmonster.gif' . '" alt="' . ':monstrealien' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fantasy/alienmonster.gif' . '" alt="' . ':monstrealien' . '" />';
 
 	$b['texts'][] = ':barbare';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fantasy/barbarian.gif' . '" alt="' . ':barbare' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fantasy/barbarian.gif' . '" alt="' . ':barbare' . '" />';
 
 	$b['texts'][] = ':dinosaure';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fantasy/dinosaur.gif' . '" alt="' . ':dinosaure' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fantasy/dinosaur.gif' . '" alt="' . ':dinosaure' . '" />';
 
 	$b['texts'][] = ':petitdragon';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fantasy/dragonwhelp.gif' . '" alt="' . ':petitdragon' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fantasy/dragonwhelp.gif' . '" alt="' . ':petitdragon' . '" />';
 
 	$b['texts'][] = ':fantôme';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fantasy/ghost.gif' . '" alt="' . ':fantôme' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fantasy/ghost.gif' . '" alt="' . ':fantôme' . '" />';
 
 	$b['texts'][] = ':momie';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fantasy/mummy.gif' . '" alt="' . ':momie' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fantasy/mummy.gif' . '" alt="' . ':momie' . '" />';
 
 #Food smileys
 
 	$b['texts'][] = ':pomme';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/food/apple.gif' . '" alt="' . ':pomme' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/food/apple.gif' . '" alt="' . ':pomme' . '" />';
 
 	$b['texts'][] = ':brocoli';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/food/broccoli.gif' . '" alt="' . ':brocoli' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/food/broccoli.gif' . '" alt="' . ':brocoli' . '" />';
 
 	$b['texts'][] = ':gâteau';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/food/cake.gif' . '" alt="' . ':gâteau' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/food/cake.gif' . '" alt="' . ':gâteau' . '" />';
 
 	$b['texts'][] = ':carotte';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/food/carrot.gif' . '" alt="' . ':carotte' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/food/carrot.gif' . '" alt="' . ':carotte' . '" />';
 
 	$b['texts'][] = '~popcorn';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/food/popcorn.gif' . '" alt="' . '~popcorn' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/food/popcorn.gif' . '" alt="' . '~popcorn' . '" />';
 
 	$b['texts'][] = ':tomate';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/food/tomato.gif' . '" alt="' . ':tomate' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/food/tomato.gif' . '" alt="' . ':tomate' . '" />';
 
 	$b['texts'][] = ':banane';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/food/banana.gif' . '" alt="' . ':banane' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/food/banana.gif' . '" alt="' . ':banane' . '" />';
 
 	$b['texts'][] = ':cuisine';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/food/cooking.gif' . '" alt="' . ':cuisine' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/food/cooking.gif' . '" alt="' . ':cuisine' . '" />';
 
 	$b['texts'][] = ':oeufauplat';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/food/fryegg.gif' . '" alt="' . ':oeufauplat' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/food/fryegg.gif' . '" alt="' . ':oeufauplat' . '" />';
 
 #Happy smileys
 
 	$b['texts'][] = ':nuage';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/happy/cloud9.gif' . '" alt="' . ':nuage' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/happy/cloud9.gif' . '" alt="' . ':nuage' . '" />';
 
 	$b['texts'][] = ':larmesdejoie';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/happy/tearsofjoy.gif' . '" alt="' . ':larmesdejoie' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/happy/tearsofjoy.gif' . '" alt="' . ':larmesdejoie' . '" />';
 
 #Repsect smileys
 
 	$b['texts'][] = ':courbette';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/respect/bow.gif' . '" alt="' . ':courbette' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/respect/bow.gif' . '" alt="' . ':courbette' . '" />';
 
 	$b['texts'][] = ':bravo';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/respect/bravo.gif' . '" alt="' . ':bravo' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/respect/bravo.gif' . '" alt="' . ':bravo' . '" />';
 
 	$b['texts'][] = ':viveleroi';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/respect/hailking.gif' . '" alt="' . ':viveleroi' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/respect/hailking.gif' . '" alt="' . ':viveleroi' . '" />';
 
 	$b['texts'][] = ':numéro1';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/respect/number1.gif' . '" alt="' . ':numéro1' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/respect/number1.gif' . '" alt="' . ':numéro1' . '" />';
 
 #Laugh smileys
 
 #Music smileys
 
 	$b['texts'][] = ':batterie';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/music/drums.gif' . '" alt="' . ':batterie' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/music/drums.gif' . '" alt="' . ':batterie' . '" />';
 
 	$b['texts'][] = ':guitare';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/music/guitar.gif' . '" alt="' . ':guitare' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/music/guitar.gif' . '" alt="' . ':guitare' . '" />';
 
 	$b['texts'][] = ':trompette';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/music/trumpet.gif' . '" alt="' . ':trompette' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/music/trumpet.gif' . '" alt="' . ':trompette' . '" />';
 
 	$b['texts'][] = ':violon';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/music/violin.gif' . '" alt="' . ':violon' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/music/violin.gif' . '" alt="' . ':violon' . '" />';
 
 #Smileys that used to be in core
 
 	$b['texts'][] = ':cognetête';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/oldcore/headbang.gif' . '" alt="' . ':cognetête' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/oldcore/headbang.gif' . '" alt="' . ':cognetête' . '" />';
 
-	$b['texts'][] = ':barbu';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/oldcore/beard.png' . '" alt="' . ':barbu' . '" />';
+		$b['texts'][] = ':barbu';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/oldcore/beard.png' . '" alt="' . ':barbu' . '" />';
 
 	$b['texts'][] = ':barbeblanche';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/oldcore/whitebeard.png' . '" alt="' . ':barbeblanche' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/oldcore/whitebeard.png' . '" alt="' . ':barbeblanche' . '" />';
 
 	$b['texts'][] = ':tête';
-	$b['icons'][] = '<img src="' . DI::baseUrl() . '/addon/smiley_pack/icons/oldcore/headbang.gif' . '" alt="' . ':tête' . '" />';
+	$b['icons'][] = '<img src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/oldcore/headbang.gif' . '" alt="' . ':tête' . '" />';
+
 }
diff --git a/smiley_pack/smiley_pack.php b/smiley_pack/smiley_pack.php
index 4361b2f5..607f3557 100644
--- a/smiley_pack/smiley_pack.php
+++ b/smiley_pack/smiley_pack.php
@@ -2,22 +2,25 @@
 /*
  * Name: Smiley Pack
  * Description: Pack of smileys that make master too AOLish.
- * Version: 1.05
- * Author: Thomas Willingham (based on Mike Macgirvin's Adult Smile template)
- * Author: Matthias Ebers <https://loma.ml/profile/one>
+ * Version: 1.04
+ * Author: Thomas Willingham (based on Mike Macgirvin's Adult Smile template) 
  * All smileys from sites offering them as Public Domain
  */
 
-use Friendica\App;
 use Friendica\Core\Hook;
-use Friendica\DI;
 
 function smiley_pack_install() {
 	Hook::register('smilie', 'addon/smiley_pack/smiley_pack.php', 'smiley_pack_smilies');
 }
 
-function smiley_pack_smilies(array &$b)
-{
+function smiley_pack_uninstall() {
+	Hook::unregister('smilie', 'addon/smiley_pack/smiley_pack.php', 'smiley_pack_smilies');
+}
+
+ 
+
+function smiley_pack_smilies(&$a,&$b) {
+
 #Smileys are split into various directories by the intended range of emotions.  This is in case we get too big and need to modularise things.  We can then cut and paste the right lines, move the right directory, and just change the name of the addon to happy_smilies or whatever.
 
 #Be careful with invocation strings.  If you have a smiley called foo, and another called foobar, typing :foobar will call foo.  Avoid this with clever naming, using ~ instead of : 
@@ -27,516 +30,467 @@ function smiley_pack_smilies(array &$b)
 
 #Animal smileys.
 
-	$b['texts'][] = ':bunnyflowers:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/bunnyflowers.gif' . '" alt="' . ':bunnyflowers:' . '" />';
+	$b['texts'][] = ':bunnyflowers';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/bunnyflowers.gif' . '" alt="' . ':bunnyflowers' . '" />';
 
-	$b['texts'][] = ':chick:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/chick.gif' . '" alt="' . ':chick:' . '" />';
+	$b['texts'][] = ':chick';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/chick.gif' . '" alt="' . ':chick' . '" />';
 
-	$b['texts'][] = ':bumblebee:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/bee.gif' . '" alt="' . ':bee:' . '" />';
+	$b['texts'][] = ':bumblebee';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/bee.gif' . '" alt="' . ':bee' . '" />';
 
-	$b['texts'][] = ':ladybird:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/ladybird.gif' . '" alt="' . ':ladybird:' . '" />';
+	$b['texts'][] = ':ladybird';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/ladybird.gif' . '" alt="' . ':ladybird' . '" />';
 
-	$b['texts'][] = ':bigspider:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/bigspider.gif' . '" alt="' . ':bigspider:' . '" />';
+	$b['texts'][] = ':bigspider';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/bigspider.gif' . '" alt="' . ':bigspider' . '" />';
 
-	$b['texts'][] = ':cat:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/cat.gif' . '" alt="' . ':cat:' . '" />';
+	$b['texts'][] = ':cat';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/cat.gif' . '" alt="' . ':cat' . '" />';
 
-	$b['texts'][] = ':bunny:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/bunny.gif' . '" alt="' . ':bunny:' . '" />';
+	$b['texts'][] = ':bunny';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/bunny.gif' . '" alt="' . ':bunny' . '" />';
 
-	$b['texts'][] = ':cow:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/cow.gif' . '" alt="' . ':cow:' . '" />';
+	$b['texts'][] = ':cow';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/cow.gif' . '" alt="' . ':cow' . '" />';
     
-	$b['texts'][] = ':crab:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/crab.gif' . '" alt="' . ':crab:' . '" />';
+	$b['texts'][] = ':crab';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/crab.gif' . '" alt="' . ':crab' . '" />';
 
-	$b['texts'][] = ':dolphin:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/dolphin.gif' . '" alt="' . ':dolphin:' . '" />';
+	$b['texts'][] = ':dolphin';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/dolphin.gif' . '" alt="' . ':dolphin' . '" />';
 
-	$b['texts'][] = ':dragonfly:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/dragonfly.gif' . '" alt="' . ':dragonfly:' . '" />';
+	$b['texts'][] = ':dragonfly';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/dragonfly.gif' . '" alt="' . ':dragonfly' . '" />';
 
-	$b['texts'][] = ':frog:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/frog.gif' . '" alt="' . ':frog:' . '" />';
+	$b['texts'][] = ':frog';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/frog.gif' . '" alt="' . ':frog' . '" />';
 
-	$b['texts'][] = ':hamster:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/hamster.gif' . '" alt="' . ':hamster:' . '" />';
+	$b['texts'][] = ':hamster';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/hamster.gif' . '" alt="' . ':hamster' . '" />';
 
-	$b['texts'][] = ':monkey:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/monkey.gif' . '" alt="' . ':monkey:' . '" />';
+	$b['texts'][] = ':monkey';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/monkey.gif' . '" alt="' . ':monkey' . '" />';
 
-	$b['texts'][] = ':horse:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/horse.gif' . '" alt="' . ':horse:' . '" />';
+	$b['texts'][] = ':horse';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/horse.gif' . '" alt="' . ':horse' . '" />';
   
-	$b['texts'][] = ':parrot:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/parrot.gif' . '" alt="' . ':parrot:' . '" />';
+	$b['texts'][] = ':parrot';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/parrot.gif' . '" alt="' . ':parrot' . '" />';
 
-	$b['texts'][] = ':tux:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/tux.gif' . '" alt="' . ':tux:' . '" />';
+	$b['texts'][] = ':tux';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/tux.gif' . '" alt="' . ':tux' . '" />';
 
-	$b['texts'][] = ':snail:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/snail.gif' . '" alt="' . ':snail:' . '" />';
+	$b['texts'][] = ':snail';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/snail.gif' . '" alt="' . ':snail' . '" />';
 
-	$b['texts'][] = ':sheep:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/sheep.gif' . '" alt="' . ':sheep:' . '" />';
+	$b['texts'][] = ':sheep';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/sheep.gif' . '" alt="' . ':sheep' . '" />';
 
-	$b['texts'][] = ':dog:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/dog.gif' . '" alt="' . ':dog:' . '" />';
+	$b['texts'][] = ':dog';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/dog.gif' . '" alt="' . ':dog' . '" />';
 
-	$b['texts'][] = ':elephant:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/elephant.gif' . '" alt="' . ':elephant:' . '" />';
+	$b['texts'][] = ':elephant';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/elephant.gif' . '" alt="' . ':elephant' . '" />';
 
-	$b['texts'][] = ':fish:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/fish.gif' . '" alt="' . ':fish:' . '" />';
+	$b['texts'][] = ':fish';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/fish.gif' . '" alt="' . ':fish' . '" />';
 
-	$b['texts'][] = ':giraffe:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/giraffe.gif' . '" alt="' . ':giraffe:' . '" />';
+	$b['texts'][] = ':giraffe';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/giraffe.gif' . '" alt="' . ':giraffe' . '" />';
 
-	$b['texts'][] = ':pig:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/animals/pig.gif' . '" alt="' . ':pig:' . '" />';
+	$b['texts'][] = ':pig';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/animals/pig.gif' . '" alt="' . ':pig' . '" />';
 
 
 
 #Baby Smileys
 
-	$b['texts'][] = ':baby:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/babies/baby.gif' . '" alt="' . ':baby:' . '" />';
+	$b['texts'][] = ':baby';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/babies/baby.gif' . '" alt="' . ':baby' . '" />';
 
-	$b['texts'][] = ':babycot:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/babies/babycot.gif' . '" alt="' . ':babycot:' . '" />';
+	$b['texts'][] = ':babycot';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/babies/babycot.gif' . '" alt="' . ':babycot' . '" />';
 	
 
-	$b['texts'][] = ':pregnant:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/babies/pregnant.gif' . '" alt="' . ':pregnant:' . '" />';
+	$b['texts'][] = ':pregnant';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/babies/pregnant.gif' . '" alt="' . ':pregnant' . '" />';
 
-	$b['texts'][] = ':stork:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/babies/stork.gif' . '" alt="' . ':stork:' . '" />';
+	$b['texts'][] = ':stork';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/babies/stork.gif' . '" alt="' . ':stork' . '" />';
 
 
 #Confused Smileys	
-	$b['texts'][] = ':confused:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/confused/confused.gif' . '" alt="' . ':confused:' . '" />';
+	$b['texts'][] = ':confused';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/confused/confused.gif' . '" alt="' . ':confused' . '" />';
     
-	$b['texts'][] = ':shrug:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/confused/shrug.gif' . '" alt="' . ':shrug:' . '" />';
+	$b['texts'][] = ':shrug';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/confused/shrug.gif' . '" alt="' . ':shrug' . '" />';
 
-	$b['texts'][] = ':stupid:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/confused/stupid.gif' . '" alt="' . ':stupid:' . '" />';
+	$b['texts'][] = ':stupid';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/confused/stupid.gif' . '" alt="' . ':stupid' . '" />';
 
-	$b['texts'][] = ':dazed:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/confused/dazed.gif' . '" alt="' . ':dazed:' . '" />';
+	$b['texts'][] = ':dazed';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/confused/dazed.gif' . '" alt="' . ':dazed' . '" />';
 
 
 #Cool Smileys
 
-	$b['texts'][] = ':affro:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/cool/affro.gif' . '" alt="' . ':affro:' . '" />';
+	$b['texts'][] = ':affro';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/cool/affro.gif' . '" alt="' . ':affro' . '" />';
 
 #Devil/Angel Smileys
 
-	$b['texts'][] = ':angel:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/devilangel/angel.gif' . '" alt="' . ':angel:' . '" />';
+	$b['texts'][] = ':angel';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/devilangel/angel.gif' . '" alt="' . ':angel' . '" />';
 
-	$b['texts'][] = ':cherub:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/devilangel/cherub.gif' . '" alt="' . ':cherub:' . '" />';
+	$b['texts'][] = ':cherub';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/devilangel/cherub.gif' . '" alt="' . ':cherub' . '" />';
 
-	$b['texts'][] = ':devilangel:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/devilangel/blondedevil.gif' . '" alt="' . ':devilangel:' . '" />';
+	$b['texts'][] = ':devilangel';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/devilangel/blondedevil.gif' . '" alt="' . ':devilangel' . '" />';
 
-	$b['texts'][] = ':catdevil:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/devilangel/catdevil.gif' . '" alt="' . ':catdevil:' . '" />';
+	$b['texts'][] = ':catdevil';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/devilangel/catdevil.gif' . '" alt="' . ':catdevil' . '" />';
 
-	$b['texts'][] = ':devillish:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/devilangel/devil.gif' . '" alt="' . ':devillish:' . '" />';
+	$b['texts'][] = ':devillish';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/devilangel/devil.gif' . '" alt="' . ':devillish' . '" />';
 	
-	$b['texts'][] = ':daseesaw:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/devilangel/daseesaw.gif' . '" alt="' . ':daseesaw:' . '" />';
+	$b['texts'][] = ':daseesaw';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/devilangel/daseesaw.gif' . '" alt="' . ':daseesaw' . '" />';
 
-	$b['texts'][] = ':turnevil:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/devilangel/turnevil.gif' . '" alt="' . ':turnevil:' . '" />';
+	$b['texts'][] = ':turnevil';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/devilangel/turnevil.gif' . '" alt="' . ':turnevil' . '" />';
 	
-	$b['texts'][] = ':saint:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/devilangel/saint.gif' . '" alt="' . ':saint:' . '" />';
+	$b['texts'][] = ':saint';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/devilangel/saint.gif' . '" alt="' . ':saint' . '" />';
 
-	$b['texts'][] = ':graveside:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/devilangel/graveside.gif' . '" alt="' . ':graveside:' . '" />';
+	$b['texts'][] = ':graveside';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/devilangel/graveside.gif' . '" alt="' . ':graveside' . '" />';
 
 #Unpleasent smileys.
 
-	$b['texts'][] = ':toilet:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/disgust/toilet.gif' . '" alt="' . ':toilet:' . '" />';
+	$b['texts'][] = ':toilet';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/disgust/toilet.gif' . '" alt="' . ':toilet' . '" />';
 
-	$b['texts'][] = ':fartinbed:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/disgust/fartinbed.gif' . '" alt="' . ':fartinbed:' . '" />';
+	$b['texts'][] = ':fartinbed';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/disgust/fartinbed.gif' . '" alt="' . ':fartinbed' . '" />';
 
-	$b['texts'][] = ':fartblush:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/disgust/fartblush.gif' . '" alt="' . ':fartblush:' . '" />';
+	$b['texts'][] = ':fartblush';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/disgust/fartblush.gif' . '" alt="' . ':fartblush' . '" />';
 
 #Drinks
 
-	$b['texts'][] = ':tea:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/drink/tea.gif' . '" alt="' . ':tea:' . '" />';
+	$b['texts'][] = ':tea';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/drink/tea.gif' . '" alt="' . ':tea' . '" />';
 
-	$b['texts'][] = ':drool:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/drool/drool.gif' . '" alt="' . ':drool:' . '" />';
+	$b['texts'][] = ':drool';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/drool/drool.gif' . '" alt="' . ':drool' . '" />';
 
 #Sad smileys
 
-	$b['texts'][] = ':crying:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/sad/crying.png' . '" alt="' . ':crying:' . '" />';
+	$b['texts'][] = ':crying';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sad/crying.png' . '" alt="' . ':crying' . '" />';
 
-	$b['texts'][] = ':prisoner:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/sad/prisoner.gif' . '" alt="' . ':prisoner:' . '" />';
+	$b['texts'][] = ':prisoner';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sad/prisoner.gif' . '" alt="' . ':prisoner' . '" />';
 
-	$b['texts'][] = ':sigh:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/sad/sigh.gif' . '" alt="' . ':sigh:' . '" />';
+	$b['texts'][] = ':sigh';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sad/sigh.gif' . '" alt="' . ':sigh' . '" />';
 
 #Smoking - only one smiley in here, maybe it needs moving elsewhere?
 
-	$b['texts'][] = ':smoking:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/smoking/smoking.gif' . '" alt="' . ':smoking:' . '" />';
+	$b['texts'][] = ':smoking';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/smoking/smoking.gif' . '" alt="' . ':smoking' . '" />';
 
 #Sport smileys
 
-	$b['texts'][] = ':basketball:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/sport/basketball.gif' . '" alt="' . ':basketball:' . '" />';
+	$b['texts'][] = ':basketball';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/basketball.gif' . '" alt="' . ':basketball' . '" />';
 
 	$b['texts'][] = '~bowling';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/sport/bowling.gif' . '" alt="' . '~bowling' . '" />';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/bowling.gif' . '" alt="' . '~bowling' . '" />';
 
-	$b['texts'][] = ':cycling:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/sport/cycling.gif' . '" alt="' . ':cycling:' . '" />';
+	$b['texts'][] = ':cycling';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/cycling.gif' . '" alt="' . ':cycling' . '" />';
 
-	$b['texts'][] = ':darts:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/sport/darts.gif' . '" alt="' . ':darts:' . '" />';
+	$b['texts'][] = ':darts';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/darts.gif' . '" alt="' . ':darts' . '" />';
 
-	$b['texts'][] = ':fencing:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/sport/fencing.gif' . '" alt="' . ':fencing:' . '" />';
+	$b['texts'][] = ':fencing';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/fencing.gif' . '" alt="' . ':fencing' . '" />';
 
-	$b['texts'][] = ':juggling:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/sport/juggling.gif' . '" alt="' . ':juggling:' . '" />';
+	$b['texts'][] = ':juggling';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/juggling.gif' . '" alt="' . ':juggling' . '" />';
 
-	$b['texts'][] = ':skipping:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/sport/skipping.gif' . '" alt="' . ':skipping:' . '" />';
+	$b['texts'][] = ':skipping';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/skipping.gif' . '" alt="' . ':skipping' . '" />';
 
-	$b['texts'][] = ':archery:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/sport/archery.gif' . '" alt="' . ':archery:' . '" />';
+	$b['texts'][] = ':archery';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/archery.gif' . '" alt="' . ':archery' . '" />';
 
-	$b['texts'][] = ':surfing:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/sport/surfing.gif' . '" alt="' . ':surfing:' . '" />';
+	$b['texts'][] = ':surfing';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/surfing.gif' . '" alt="' . ':surfing' . '" />';
 
-	$b['texts'][] = ':snooker:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/sport/snooker.gif' . '" alt="' . ':snooker:' . '" />';
+	$b['texts'][] = ':snooker';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/snooker.gif' . '" alt="' . ':snooker' . '" />';
   
-	$b['texts'][] = ':horseriding:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/sport/horseriding.gif' . '" alt="' . ':horseriding:' . '" />';
+	$b['texts'][] = ':horseriding';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/horseriding.gif' . '" alt="' . ':horseriding' . '" />';
 
 #Love smileys
 
-	$b['texts'][] = ':iloveyou:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/love/iloveyou.gif' . '" alt="' . ':iloveyou:' . '" />';
+	$b['texts'][] = ':iloveyou';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/love/iloveyou.gif' . '" alt="' . ':iloveyou' . '" />';
 
-	$b['texts'][] = ':inlove:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/love/inlove.gif' . '" alt="' . ':inlove:' . '" />';
+	$b['texts'][] = ':inlove';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/love/inlove.gif' . '" alt="' . ':inlove' . '" />';
 
 	$b['texts'][] = '~love';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/love/love.gif' . '" alt="' . ':love' . '" />';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/love/love.gif' . '" alt="' . ':love' . '" />';
 
-	$b['texts'][] = ':lovebear:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/love/lovebear.gif' . '" alt="' . ':lovebear:' . '" />';
+	$b['texts'][] = ':lovebear';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/love/lovebear.gif' . '" alt="' . ':lovebear' . '" />';
 
-	$b['texts'][] = ':lovebed:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/love/lovebed.gif' . '" alt="' . ':lovebed:' . '" />';
+	$b['texts'][] = ':lovebed';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/love/lovebed.gif' . '" alt="' . ':lovebed' . '" />';
 
-	$b['texts'][] = ':loveheart:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/love/loveheart.gif' . '" alt="' . ':loveheart:' . '" />';
+	$b['texts'][] = ':loveheart';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/love/loveheart.gif' . '" alt="' . ':loveheart' . '" />';
 
 #Tired/Sleep smileys
 
 	$b['texts'][] = ':countsheep';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/tired/countsheep.gif' . '" alt="' . ':countsheep:' . '" />';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/tired/countsheep.gif' . '" alt="' . ':countsheep' . '" />';
 
-	$b['texts'][] = ':hammock:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/tired/hammock.gif' . '" alt="' . ':hammock:' . '" />';
+	$b['texts'][] = ':hammock';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/tired/hammock.gif' . '" alt="' . ':hammock' . '" />';
 
-	$b['texts'][] = ':pillow:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/tired/pillow.gif' . '" alt="' . ':pillow:' . '" />';
+	$b['texts'][] = ':pillow';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/tired/pillow.gif' . '" alt="' . ':pillow' . '" />';
 
-	$b['texts'][] = ':yawn:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/tired/yawn.gif' . '" alt="' . ':yawn:' . '" />';
+	$b['texts'][] = ':yawn';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/tired/yawn.gif' . '" alt="' . ':yawn' . '" />';
 
 #Fight/Flame/Violent smileys
 
-	$b['texts'][] = ':2guns:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fight/2guns.gif' . '" alt="' . ':2guns:' . '" />';
+	$b['texts'][] = ':2guns';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/2guns.gif' . '" alt="' . ':2guns' . '" />';
 
 	$b['texts'][] = ':alienfight';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fight/alienfight.gif' . '" alt="' . ':alienfight' . '" />';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/alienfight.gif' . '" alt="' . ':alienfight' . '" />';
 
-	$b['texts'][] = ':army:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fight/army.gif' . '" alt="' . ':army:' . '" />';
+	$b['texts'][] = ':army';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/army.gif' . '" alt="' . ':army' . '" />';
 
-	$b['texts'][] = ':arrowhead:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fight/arrowhead.gif' . '" alt="' . ':arrowhead:' . '" />';
+	$b['texts'][] = ':arrowhead';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/arrowhead.gif' . '" alt="' . ':arrowhead' . '" />';
 
-	$b['texts'][] = ':bfg:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fight/bfg.gif' . '" alt="' . ':bfg:' . '" />';
+	$b['texts'][] = ':bfg';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/bfg.gif' . '" alt="' . ':bfg' . '" />';
 
-	$b['texts'][] = ':bowman:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fight/bowman.gif' . '" alt="' . ':bowman:' . '" />';
+	$b['texts'][] = ':bowman';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/bowman.gif' . '" alt="' . ':bowman' . '" />';
 
-	$b['texts'][] = ':chainsaw:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fight/chainsaw.gif' . '" alt="' . ':chainsaw:' . '" />';
+	$b['texts'][] = ':chainsaw';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/chainsaw.gif' . '" alt="' . ':chainsaw' . '" />';
 
-	$b['texts'][] = ':crossbow:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fight/crossbow.gif' . '" alt="' . ':crossbow:' . '" />';
+	$b['texts'][] = ':crossbow';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/crossbow.gif' . '" alt="' . ':crossbow' . '" />';
 
-	$b['texts'][] = ':crusader:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fight/crusader.gif' . '" alt="' . ':crusader:' . '" />';
+	$b['texts'][] = ':crusader';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/crusader.gif' . '" alt="' . ':crusader' . '" />';
 
-	$b['texts'][] = ':dead:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fight/dead.gif' . '" alt="' . ':dead:' . '" />';
+	$b['texts'][] = ':dead';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/dead.gif' . '" alt="' . ':dead' . '" />';
 
-	$b['texts'][] = ':hammersplat:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fight/hammersplat.gif' . '" alt="' . ':hammersplat:' . '" />';
+	$b['texts'][] = ':hammersplat';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/hammersplat.gif' . '" alt="' . ':hammersplat' . '" />';
 
-	$b['texts'][] = ':lasergun:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fight/lasergun.gif' . '" alt="' . ':lasergun:' . '" />';
+	$b['texts'][] = ':lasergun';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/lasergun.gif' . '" alt="' . ':lasergun' . '" />';
 
-	$b['texts'][] = ':machinegun:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fight/machinegun.gif' . '" alt="' . ':machinegun:' . '" />';
+	$b['texts'][] = ':machinegun';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/machinegun.gif' . '" alt="' . ':machinegun' . '" />';
 
-	$b['texts'][] = ':acid:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fight/acid.gif' . '" alt="' . ':acid:' . '" />';
+	$b['texts'][] = ':acid';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/acid.gif' . '" alt="' . ':acid' . '" />';
 
 #Fantasy smileys - monsters and dragons fantasy.  The other type of fantasy belongs in adult smileys
 
-	$b['texts'][] = ':alienmonster:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fantasy/alienmonster.gif' . '" alt="' . ':alienmonster:' . '" />';
+	$b['texts'][] = ':alienmonster';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fantasy/alienmonster.gif' . '" alt="' . ':alienmonster' . '" />';
 
-	$b['texts'][] = ':barbarian:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fantasy/barbarian.gif' . '" alt="' . ':barbarian:' . '" />';
+	$b['texts'][] = ':barbarian';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fantasy/barbarian.gif' . '" alt="' . ':barbarian' . '" />';
 
-	$b['texts'][] = ':dinosaur:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fantasy/dinosaur.gif' . '" alt="' . ':dinosaur:' . '" />';
+	$b['texts'][] = ':dinosaur';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fantasy/dinosaur.gif' . '" alt="' . ':dinosaur' . '" />';
 
-	$b['texts'][] = ':dragon:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fantasy/dragon.gif' . '" alt="' . ':dragon:' . '" />';
+	$b['texts'][] = ':dragon';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fantasy/dragon.gif' . '" alt="' . ':dragon' . '" />';
 
-	$b['texts'][] = ':draco:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fantasy/dragonwhelp.gif' . '" alt="' . ':draco:' . '" />';
+	$b['texts'][] = ':draco';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fantasy/dragonwhelp.gif' . '" alt="' . ':draco' . '" />';
 
-	$b['texts'][] = ':ghost:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fantasy/ghost.gif' . '" alt="' . ':ghost:' . '" />';
+	$b['texts'][] = ':ghost';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fantasy/ghost.gif' . '" alt="' . ':ghost' . '" />';
 
-	$b['texts'][] = ':mummy:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fantasy/mummy.gif' . '" alt="' . ':mummy:' . '" />';
+	$b['texts'][] = ':mummy';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fantasy/mummy.gif' . '" alt="' . ':mummy' . '" />';
 
 #Food smileys
 
-	$b['texts'][] = ':apple:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/food/apple.gif' . '" alt="' . ':apple:' . '" />';
+	$b['texts'][] = ':apple';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/food/apple.gif' . '" alt="' . ':apple' . '" />';
 
-	$b['texts'][] = ':broccoli:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/food/broccoli.gif' . '" alt="' . ':brocolli:' . '" />';
+	$b['texts'][] = ':broccoli';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/food/broccoli.gif' . '" alt="' . ':brocolli' . '" />';
 
-	$b['texts'][] = ':cake:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/food/cake.gif' . '" alt="' . ':cake:' . '" />';
+	$b['texts'][] = ':cake';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/food/cake.gif' . '" alt="' . ':cake' . '" />';
 
-	$b['texts'][] = ':carrot:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/food/carrot.gif' . '" alt="' . ':carrot:' . '" />';
+	$b['texts'][] = ':carrot';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/food/carrot.gif' . '" alt="' . ':carrot' . '" />';
 
-	$b['texts'][] = ':popcorn:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/food/popcorn.gif' . '" alt="' . ':popcorn:' . '" />';
+	$b['texts'][] = ':popcorn';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/food/popcorn.gif' . '" alt="' . ':popcorn' . '" />';
 
-	$b['texts'][] = ':tomato:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/food/tomato.gif' . '" alt="' . ':tomato:' . '" />';
+	$b['texts'][] = ':tomato';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/food/tomato.gif' . '" alt="' . ':tomato' . '" />';
 
-	$b['texts'][] = ':banana:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/food/banana.gif' . '" alt="' . ':banana:' . '" />';
+	$b['texts'][] = ':banana';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/food/banana.gif' . '" alt="' . ':banana' . '" />';
 
-	$b['texts'][] = ':cooking:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/food/cooking.gif' . '" alt="' . ':cooking:' . '" />';
+	$b['texts'][] = ':cooking';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/food/cooking.gif' . '" alt="' . ':cooking' . '" />';
 
-	$b['texts'][] = ':fryegg:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/food/fryegg.gif' . '" alt="' . ':fryegg:' . '" />';
+	$b['texts'][] = ':fryegg';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/food/fryegg.gif' . '" alt="' . ':fryegg' . '" />';
 
-	$b['texts'][] = ':birthdaycake:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/food/birthdaycake.gif' . '" alt="' . ':birthdaycake:' . '" />';
+	$b['texts'][] = ':birthdaycake';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/food/birthdaycake.gif' . '" alt="' . ':birthdaycake' . '" />';
 
 #Happy smileys
 
-	$b['texts'][] = ':cloud9:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/happy/cloud9.gif' . '" alt="' . ':cloud9:' . '" />';
+	$b['texts'][] = ':cloud9';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/happy/cloud9.gif' . '" alt="' . ':cloud9' . '" />';
 
-	$b['texts'][] = ':tearsofjoy:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/happy/tearsofjoy.gif' . '" alt="' . ':tearsofjoy:' . '" />';
+	$b['texts'][] = ':tearsofjoy';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/happy/tearsofjoy.gif' . '" alt="' . ':tearsofjoy' . '" />';
 
 #Repsect smileys
 
-	$b['texts'][] = ':bow:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/respect/bow.gif' . '" alt="' . ':bow:' . '" />';
+	$b['texts'][] = ':bow';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/respect/bow.gif' . '" alt="' . ':bow' . '" />';
 
-	$b['texts'][] = ':bravo:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/respect/bravo.gif' . '" alt="' . ':bravo:' . '" />';
+	$b['texts'][] = ':bravo';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/respect/bravo.gif' . '" alt="' . ':bravo' . '" />';
 
-	$b['texts'][] = ':hailking:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/respect/hailking.gif' . '" alt="' . ':hailking:' . '" />';
+	$b['texts'][] = ':hailking';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/respect/hailking.gif' . '" alt="' . ':hailking' . '" />';
 
-	$b['texts'][] = ':number1:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/respect/number1.gif' . '" alt="' . ':number1:' . '" />';
+	$b['texts'][] = ':number1';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/respect/number1.gif' . '" alt="' . ':number1' . '" />';
 
 #Laugh smileys
 
-	$b['texts'][] = ':hahaha:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/laugh/hahaha.gif' . '" alt="' . ':hahaha:' . '" />';
+	$b['texts'][] = ':hahaha';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/laugh/hahaha.gif' . '" alt="' . ':hahaha' . '" />';
 
-	$b['texts'][] = ':loltv:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/laugh/loltv.gif' . '" alt="' . ':loltv:' . '" />';
+	$b['texts'][] = ':loltv';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/laugh/loltv.gif' . '" alt="' . ':loltv' . '" />';
 
-	$b['texts'][] = ':rofl:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/laugh/rofl.gif' . '" alt="' . ':rofl:' . '" />';
+	$b['texts'][] = ':rofl';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/laugh/rofl.gif' . '" alt="' . ':rofl' . '" />';
 
 #Music smileys
 
-	$b['texts'][] = ':drums:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/music/drums.gif' . '" alt="' . ':drums:' . '" />';
+	$b['texts'][] = ':drums';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/music/drums.gif' . '" alt="' . ':drums' . '" />';
 
 
-	$b['texts'][] = ':guitar:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/music/guitar.gif' . '" alt="' . ':guitar:' . '" />';
+	$b['texts'][] = ':guitar';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/music/guitar.gif' . '" alt="' . ':guitar' . '" />';
 
-	$b['texts'][] = ':trumpet:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/music/trumpet.gif' . '" alt="' . ':trumpet:' . '" />';
+	$b['texts'][] = ':trumpet';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/music/trumpet.gif' . '" alt="' . ':trumpet' . '" />';
 
 #Smileys that used to be in core
 
-	$b['texts'][] = ':headbang:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/oldcore/headbang.gif' . '" alt="' . ':headbang:' . '" />';
+	$b['texts'][] = ':headbang';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/oldcore/headbang.gif' . '" alt="' . ':headbang' . '" />';
 
-		$b['texts'][] = ':beard:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/oldcore/beard.png' . '" alt="' . ':beard:' . '" />';
+		$b['texts'][] = ':beard';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/oldcore/beard.png' . '" alt="' . ':beard' . '" />';
 
-	$b['texts'][] = ':whitebeard:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/oldcore/whitebeard.png' . '" alt="' . ':whitebeard:' . '" />';
+	$b['texts'][] = ':whitebeard';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/oldcore/whitebeard.png' . '" alt="' . ':whitebeard' . '" />';
 
-	$b['texts'][] = ':shaka:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/oldcore/shaka.gif' . '" alt="' . ':shaka:' . '" />';
+	$b['texts'][] = ':shaka';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/oldcore/shaka.gif' . '" alt="' . ':shaka' . '" />';
 
 	$b['texts'][] = ':\\.../';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/oldcore/shaka.gif' . '" alt="' . ':\\.../' . '" />';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/oldcore/shaka.gif' . '" alt="' . ':\\.../' . '" />';
 
 	$b['texts'][] = ':\\ooo/';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/oldcore/shaka.gif' . '" alt="' . ':\\ooo/' . '" />';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/oldcore/shaka.gif' . '" alt="' . ':\\ooo/' . '" />';
 
-	$b['texts'][] = ':headdesk:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/oldcore/headbang.gif' . '" alt="' . ':headdesk:' . '" />';
+	$b['texts'][] = ':headdesk';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/oldcore/headbang.gif' . '" alt="' . ':headdesk' . '" />';
 
 #These two are still in core, so oldcore isn't strictly right, but we don't want too many directories
 
 	$b['texts'][] = ':-d';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/oldcore/laughing.gif' . '" alt="' . ':-d' . '" />';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/oldcore/laughing.gif' . '" alt="' . ':-d' . '" />';
 
 	$b['texts'][] = ':-o';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/oldcore/surprised.gif' . '" alt="' . ':-o' . '" />';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/oldcore/surprised.gif' . '" alt="' . ':-o' . '" />';
 
 # Regex killers - stick these at the bottom so they appear at the end of the English and 
 # at the start of $OtherLanguage.
 
-	$b['texts'][] = ':cool:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/cool/cool.gif' . '" alt="' . ':cool:' . '" />';
+	$b['texts'][] = ':cool';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/cool/cool.gif' . '" alt="' . ':cool' . '" />';
 
-	$b['texts'][] = ':vomit:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/disgust/vomit.gif' . '" alt="' . ':vomit:' . '" />';
+	$b['texts'][] = ':vomit';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/disgust/vomit.gif' . '" alt="' . ':vomit' . '" />';
 
-	$b['texts'][] = ':golf:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/sport/golf.gif' . '" alt="' . ':golf:' . '" />';
+	$b['texts'][] = ':golf';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/golf.gif' . '" alt="' . ':golf' . '" />';
 	
-	$b['texts'][] = ':football:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/sport/football.gif' . '" alt="' . ':football:' . '" />';
+	$b['texts'][] = ':football';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/football.gif' . '" alt="' . ':football' . '" />';
 
-	$b['texts'][] = ':tennis:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/sport/tennis.gif' . '" alt="' . ':tennis:' . '" />';
+	$b['texts'][] = ':tennis';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/sport/tennis.gif' . '" alt="' . ':tennis' . '" />';
 
-	$b['texts'][] = ':alpha:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fight/alpha.png' . '" alt="' . ':alpha:' . '" />';
+	$b['texts'][] = ':alpha';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/alpha.png' . '" alt="' . ':alpha' . '" />';
 
-	$b['texts'][] = ':marine:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fight/marine.gif' . '" alt="' . ':marine:' . '" />';
+	$b['texts'][] = ':marine';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/marine.gif' . '" alt="' . ':marine' . '" />';
 
-	$b['texts'][] = ':sabre:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fight/sabre.gif' . '" alt="' . ':sabre:' . '" />';
+	$b['texts'][] = ':sabre';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/sabre.gif' . '" alt="' . ':sabre' . '" />';
 
-	$b['texts'][] = ':tank:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fight/tank.gif' . '" alt="' . ':tank:' . '" />';
+	$b['texts'][] = ':tank';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/tank.gif' . '" alt="' . ':tank' . '" />';
 
-	$b['texts'][] = ':viking:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fight/viking.gif' . '" alt="' . ':viking:' . '" />';
+	$b['texts'][] = ':viking';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/viking.gif' . '" alt="' . ':viking' . '" />';
 
-	$b['texts'][] = ':gangs:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fight/gangs.gif' . '" alt="' . ':gangs:' . '" />';
+	$b['texts'][] = ':gangs';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/fight/gangs.gif' . '" alt="' . ':gangs' . '" />';
 
 
-	$b['texts'][] = ':dj:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/music/dj.gif' . '" alt="' . ':dj:' . '" />';
+	$b['texts'][] = ':dj';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/music/dj.gif' . '" alt="' . ':dj' . '" />';
 
 
-	$b['texts'][] = ':elvis:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/music/elvis.gif' . '" alt="' . ':elivs:' . '" />';
+	$b['texts'][] = ':elvis';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/music/elvis.gif' . '" alt="' . ':elivs' . '" />';
 
-	$b['texts'][] = ':violin:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/music/violin.gif' . '" alt="' . ':violin:' . '" />';
-
-# New Gif Emoji (@one@loma.ml)
-# Fediverse
-
-	$b['texts'][] = ':friendica:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fediverse/friendica.gif' . '" alt="' . ':friendica:' . '" />';
-	
-	$b['texts'][] = ':mastodon:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fediverse/mastodon.gif' . '" alt="' . ':mastodon:' . '" />';
-	
-	$b['texts'][] = ':pleroma:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fediverse/pleroma.gif' . '" alt="' . ':pleroma:' . '" />';
-	
-	$b['texts'][] = ':misskey:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fediverse/misskey.gif' . '" alt="' . ':misskey:' . '" />';
-	
-	$b['texts'][] = ':diaspora:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fediverse/diaspora.gif' . '" alt="' . ':diaspora:' . '" />';
-	
-	$b['texts'][] = ':hubzilla:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fediverse/hubzilla.gif' . '" alt="' . ':hubzilla:' . '" />';
-	
-	$b['texts'][] = ':pixelfed:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fediverse/pixelfed.gif' . '" alt="' . ':pixelfeed:' . '" />';
-	
-	$b['texts'][] = ':nextcloud:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fediverse/nextcloud.gif' . '" alt="' . ':nextcloud:' . '" />';
-	
-	$b['texts'][] = ':activitypub:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/fediverse/ap.gif' . '" alt="' . ':activitypub:' . '" />';
-	
-# ccc
-
-	$b['texts'][] = ':ccc event:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/ccc/ccc.gif' . '" alt="' . ':ccc event:' . '" />';
-	
-# Commercial
-
-	$b['texts'][] = ':youtube:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/commercial/youtube.gif' . '" alt="' . ':youtube:' . '" />';
-	
-	$b['texts'][] = ':spotify:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/commercial/spotify.gif' . '" alt="' . ':spotify:' . '" />';
-		
-	$b['texts'][] = ':twitter:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/commercial/twitter.gif' . '" alt="' . ':twitter:' . '" />';
-			
-	$b['texts'][] = ':twitch:';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smiley_pack/icons/commercial/twitch.gif' . '" alt="' . ':twitch:' . '" />';
+	$b['texts'][] = ':violin';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smiley_pack/icons/music/violin.gif' . '" alt="' . ':violin' . '" />';
 }
diff --git a/smileybutton/lang/C/messages.po b/smileybutton/lang/C/messages.po
index e69de29b..7c32045e 100644
--- a/smileybutton/lang/C/messages.po
+++ b/smileybutton/lang/C/messages.po
@@ -0,0 +1,34 @@
+# ADDON smileybutton
+# Copyright (C) 
+# This file is distributed under the same license as the Friendica smileybutton addon package.
+# 
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-23 14:45+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: smileybutton.php:269
+msgid "Smileybutton settings"
+msgstr ""
+
+#: smileybutton.php:272
+msgid "You can hide the button and show the smilies directly."
+msgstr ""
+
+#: smileybutton.php:274
+msgid "Hide the button"
+msgstr ""
+
+#: smileybutton.php:281
+msgid "Save Settings"
+msgstr ""
diff --git a/smileybutton/lang/ar/messages.po b/smileybutton/lang/ar/messages.po
deleted file mode 100644
index fc427365..00000000
--- a/smileybutton/lang/ar/messages.po
+++ /dev/null
@@ -1,36 +0,0 @@
-# ADDON smileybutton
-# Copyright (C)
-# This file is distributed under the same license as the Friendica smileybutton addon package.
-# 
-# 
-# Translators:
-# Farida Khalaf <faridakhalaf@hotmail.com>, 2021
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-06-23 14:45+0200\n"
-"PO-Revision-Date: 2021-02-21 18:46+0000\n"
-"Last-Translator: Farida Khalaf <faridakhalaf@hotmail.com>\n"
-"Language-Team: Arabic (http://www.transifex.com/Friendica/friendica/language/ar/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ar\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-
-#: smileybutton.php:269
-msgid "Smileybutton settings"
-msgstr "إعدادات ذر الرموز التعبيرية"
-
-#: smileybutton.php:272
-msgid "You can hide the button and show the smilies directly."
-msgstr "يمكنك إخفاء الزر وإظهار الرموز التعبيرية مباشرة."
-
-#: smileybutton.php:274
-msgid "Hide the button"
-msgstr "إخفاء الذر"
-
-#: smileybutton.php:281
-msgid "Save Settings"
-msgstr "حفظ الإعدادات"
diff --git a/smileybutton/lang/ar/strings.php b/smileybutton/lang/ar/strings.php
deleted file mode 100644
index 2353a594..00000000
--- a/smileybutton/lang/ar/strings.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_ar")) {
-function string_plural_select_ar($n){
-	$n = intval($n);
-	if ($n==0) { return 0; } else if ($n==1) { return 1; } else if ($n==2) { return 2; } else if ($n%100>=3 && $n%100<=10) { return 3; } else if ($n%100>=11 && $n%100<=99) { return 4; } else  { return 5; }
-}}
-$a->strings['Smileybutton settings'] = 'إعدادات ذر الرموز التعبيرية';
-$a->strings['You can hide the button and show the smilies directly.'] = 'يمكنك إخفاء الزر وإظهار الرموز التعبيرية مباشرة.';
-$a->strings['Hide the button'] = 'إخفاء الذر';
-$a->strings['Save Settings'] = 'حفظ الإعدادات';
diff --git a/smileybutton/lang/bg/messages.po b/smileybutton/lang/bg/messages.po
deleted file mode 100644
index 119eaade..00000000
--- a/smileybutton/lang/bg/messages.po
+++ /dev/null
@@ -1,36 +0,0 @@
-# ADDON smileybutton
-# Copyright (C)
-# This file is distributed under the same license as the Friendica smileybutton addon package.
-# 
-# 
-# Translators:
-# Rafael Kalachev <kalachev.rafael@gmail.com>, 2021
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-06-23 14:45+0200\n"
-"PO-Revision-Date: 2021-01-14 07:24+0000\n"
-"Last-Translator: Rafael Kalachev <kalachev.rafael@gmail.com>\n"
-"Language-Team: Bulgarian (http://www.transifex.com/Friendica/friendica/language/bg/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: bg\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: smileybutton.php:269
-msgid "Smileybutton settings"
-msgstr "Настройки на бутона с усмивки."
-
-#: smileybutton.php:272
-msgid "You can hide the button and show the smilies directly."
-msgstr "Можете да скриете бутона и да покажете усмивките директно."
-
-#: smileybutton.php:274
-msgid "Hide the button"
-msgstr "Скрий бутона"
-
-#: smileybutton.php:281
-msgid "Save Settings"
-msgstr "Запази настройките"
diff --git a/smileybutton/lang/bg/strings.php b/smileybutton/lang/bg/strings.php
deleted file mode 100644
index 92f4d0d6..00000000
--- a/smileybutton/lang/bg/strings.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_bg")) {
-function string_plural_select_bg($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Smileybutton settings'] = 'Настройки на бутона с усмивки.';
-$a->strings['You can hide the button and show the smilies directly.'] = 'Можете да скриете бутона и да покажете усмивките директно.';
-$a->strings['Hide the button'] = 'Скрий бутона';
-$a->strings['Save Settings'] = 'Запази настройките';
diff --git a/smileybutton/lang/cs/messages.po b/smileybutton/lang/cs/messages.po
index b3e000e4..71059896 100644
--- a/smileybutton/lang/cs/messages.po
+++ b/smileybutton/lang/cs/messages.po
@@ -4,25 +4,24 @@
 # 
 # 
 # Translators:
-# Aditoo, 2018
-# michal_s <msupler@gmail.com>, 2014
+# Michal Šupler <msupler@gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-06-23 14:45+0200\n"
-"PO-Revision-Date: 2014-06-23 12:45+0000\n"
-"Last-Translator: Aditoo, 2018\n"
-"Language-Team: Czech (http://app.transifex.com/Friendica/friendica/language/cs/)\n"
+"PO-Revision-Date: 2014-07-28 18:15+0000\n"
+"Last-Translator: Michal Šupler <msupler@gmail.com>\n"
+"Language-Team: Czech (http://www.transifex.com/projects/p/friendica/language/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: cs\n"
-"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #: smileybutton.php:269
 msgid "Smileybutton settings"
-msgstr "Nastavení Smileybutton"
+msgstr "Smileybutton nastavení"
 
 #: smileybutton.php:272
 msgid "You can hide the button and show the smilies directly."
diff --git a/smileybutton/lang/cs/strings.php b/smileybutton/lang/cs/strings.php
index 61be9078..e66f3401 100644
--- a/smileybutton/lang/cs/strings.php
+++ b/smileybutton/lang/cs/strings.php
@@ -2,10 +2,10 @@
 
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
-	$n = intval($n);
-	if (($n == 1 && $n % 1 == 0)) { return 0; } else if (($n >= 2 && $n <= 4 && $n % 1 == 0)) { return 1; } else if (($n % 1 != 0 )) { return 2; } else  { return 3; }
+	return ($n==1) ? 0 : ($n>=2 && $n<=4) ? 1 : 2;;
 }}
-$a->strings['Smileybutton settings'] = 'Nastavení Smileybutton';
-$a->strings['You can hide the button and show the smilies directly.'] = 'Můžete skrýt tlačítko a zobrazit rovnou smajlíky.';
-$a->strings['Hide the button'] = 'Skrýt tlačítko';
-$a->strings['Save Settings'] = 'Uložit Nastavení';
+;
+$a->strings["Smileybutton settings"] = "Smileybutton nastavení";
+$a->strings["You can hide the button and show the smilies directly."] = "Můžete skrýt tlačítko a zobrazit rovnou smajlíky.";
+$a->strings["Hide the button"] = "Skrýt tlačítko";
+$a->strings["Save Settings"] = "Uložit Nastavení";
diff --git a/smileybutton/lang/da-dk/messages.po b/smileybutton/lang/da-dk/messages.po
deleted file mode 100644
index 4d2caafe..00000000
--- a/smileybutton/lang/da-dk/messages.po
+++ /dev/null
@@ -1,36 +0,0 @@
-# ADDON smileybutton
-# Copyright (C)
-# This file is distributed under the same license as the Friendica smileybutton addon package.
-# 
-# 
-# Translators:
-# Anton <dev@atjn.dk>, 2022
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-06-23 14:45+0200\n"
-"PO-Revision-Date: 2014-06-23 12:45+0000\n"
-"Last-Translator: Anton <dev@atjn.dk>, 2022\n"
-"Language-Team: Danish (Denmark) (http://www.transifex.com/Friendica/friendica/language/da_DK/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: da_DK\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: smileybutton.php:269
-msgid "Smileybutton settings"
-msgstr "Smileyknap Indstillinger"
-
-#: smileybutton.php:272
-msgid "You can hide the button and show the smilies directly."
-msgstr "Du kan skjule knappen og vise smileyerne direkte."
-
-#: smileybutton.php:274
-msgid "Hide the button"
-msgstr "Skjul knappen"
-
-#: smileybutton.php:281
-msgid "Save Settings"
-msgstr "Gem indstillinger"
diff --git a/smileybutton/lang/da-dk/strings.php b/smileybutton/lang/da-dk/strings.php
deleted file mode 100644
index 2e53e67a..00000000
--- a/smileybutton/lang/da-dk/strings.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_da_dk")) {
-function string_plural_select_da_dk($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Smileybutton settings'] = 'Smileyknap Indstillinger';
-$a->strings['You can hide the button and show the smilies directly.'] = 'Du kan skjule knappen og vise smileyerne direkte.';
-$a->strings['Hide the button'] = 'Skjul knappen';
-$a->strings['Save Settings'] = 'Gem indstillinger';
diff --git a/smileybutton/lang/de/messages.po b/smileybutton/lang/de/messages.po
index 3d98c0f7..e38f72ae 100644
--- a/smileybutton/lang/de/messages.po
+++ b/smileybutton/lang/de/messages.po
@@ -4,16 +4,15 @@
 # 
 # 
 # Translators:
-# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2014
-# Ulf Rompe <transifex.com@rompe.org>, 2019
+# bavatar <tobias.diekershoff@gmx.net>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-06-23 14:45+0200\n"
-"PO-Revision-Date: 2014-06-23 12:45+0000\n"
-"Last-Translator: Ulf Rompe <transifex.com@rompe.org>, 2019\n"
-"Language-Team: German (http://app.transifex.com/Friendica/friendica/language/de/)\n"
+"PO-Revision-Date: 2014-10-02 14:43+0000\n"
+"Last-Translator: bavatar <tobias.diekershoff@gmx.net>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/friendica/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -22,11 +21,11 @@ msgstr ""
 
 #: smileybutton.php:269
 msgid "Smileybutton settings"
-msgstr "Smileybutton-Einstellungen"
+msgstr "Smileybutton Einstellungen"
 
 #: smileybutton.php:272
 msgid "You can hide the button and show the smilies directly."
-msgstr "Du kannst den Button verbergen und die Smileys direkt anzeigen."
+msgstr "Du kannst den Button verbergen und die Smilys direkt anzeigen."
 
 #: smileybutton.php:274
 msgid "Hide the button"
diff --git a/smileybutton/lang/de/strings.php b/smileybutton/lang/de/strings.php
index f8699fab..8abea8e5 100644
--- a/smileybutton/lang/de/strings.php
+++ b/smileybutton/lang/de/strings.php
@@ -2,10 +2,10 @@
 
 if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Smileybutton settings'] = 'Smileybutton-Einstellungen';
-$a->strings['You can hide the button and show the smilies directly.'] = 'Du kannst den Button verbergen und die Smileys direkt anzeigen.';
-$a->strings['Hide the button'] = 'Button verbergen';
-$a->strings['Save Settings'] = 'Einstellungen speichern';
+;
+$a->strings["Smileybutton settings"] = "Smileybutton Einstellungen";
+$a->strings["You can hide the button and show the smilies directly."] = "Du kannst den Button verbergen und die Smilys direkt anzeigen.";
+$a->strings["Hide the button"] = "Button verbergen";
+$a->strings["Save Settings"] = "Einstellungen speichern";
diff --git a/smileybutton/lang/es/strings.php b/smileybutton/lang/es/strings.php
index d5ed2213..96a6cc10 100644
--- a/smileybutton/lang/es/strings.php
+++ b/smileybutton/lang/es/strings.php
@@ -2,10 +2,10 @@
 
 if(! function_exists("string_plural_select_es")) {
 function string_plural_select_es($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Smileybutton settings'] = 'Ajustes de Smileybutton';
-$a->strings['You can hide the button and show the smilies directly.'] = 'Puede ocultar el botón y mostrar los emoticonos directamente.';
-$a->strings['Hide the button'] = 'Ocultar el botón';
-$a->strings['Save Settings'] = 'Guardar Ajustes';
+;
+$a->strings["Smileybutton settings"] = "Ajustes de Smileybutton";
+$a->strings["You can hide the button and show the smilies directly."] = "Puede ocultar el botón y mostrar los emoticonos directamente.";
+$a->strings["Hide the button"] = "Ocultar el botón";
+$a->strings["Save Settings"] = "Guardar Ajustes";
diff --git a/smileybutton/lang/et/messages.po b/smileybutton/lang/et/messages.po
deleted file mode 100644
index 2f910e35..00000000
--- a/smileybutton/lang/et/messages.po
+++ /dev/null
@@ -1,36 +0,0 @@
-# ADDON smileybutton
-# Copyright (C)
-# This file is distributed under the same license as the Friendica smileybutton addon package.
-# 
-# 
-# Translators:
-# Rain Hawk, 2019
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-06-23 14:45+0200\n"
-"PO-Revision-Date: 2019-11-30 14:52+0000\n"
-"Last-Translator: Rain Hawk\n"
-"Language-Team: Estonian (http://www.transifex.com/Friendica/friendica/language/et/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: et\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: smileybutton.php:269
-msgid "Smileybutton settings"
-msgstr "SmileyNupu sätted"
-
-#: smileybutton.php:272
-msgid "You can hide the button and show the smilies directly."
-msgstr "Saad peita nupu ja näidata smailisid otse"
-
-#: smileybutton.php:274
-msgid "Hide the button"
-msgstr "Peida nupp"
-
-#: smileybutton.php:281
-msgid "Save Settings"
-msgstr "Salvesta sätted"
diff --git a/smileybutton/lang/et/strings.php b/smileybutton/lang/et/strings.php
deleted file mode 100644
index 5ffccbbd..00000000
--- a/smileybutton/lang/et/strings.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_et")) {
-function string_plural_select_et($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Smileybutton settings'] = 'SmileyNupu sätted';
-$a->strings['You can hide the button and show the smilies directly.'] = 'Saad peita nupu ja näidata smailisid otse';
-$a->strings['Hide the button'] = 'Peida nupp';
-$a->strings['Save Settings'] = 'Salvesta sätted';
diff --git a/smileybutton/lang/fi-fi/strings.php b/smileybutton/lang/fi-fi/strings.php
index 116dcb98..f131c9cf 100644
--- a/smileybutton/lang/fi-fi/strings.php
+++ b/smileybutton/lang/fi-fi/strings.php
@@ -2,9 +2,10 @@
 
 if(! function_exists("string_plural_select_fi_fi")) {
 function string_plural_select_fi_fi($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Smileybutton settings'] = 'Smileybutton -asetukset';
-$a->strings['Hide the button'] = 'Piilota nappi';
-$a->strings['Save Settings'] = 'Tallenna asetukset';
+;
+$a->strings["Smileybutton settings"] = "Smileybutton -asetukset";
+$a->strings["You can hide the button and show the smilies directly."] = "";
+$a->strings["Hide the button"] = "Piilota nappi";
+$a->strings["Save Settings"] = "Tallenna asetukset";
diff --git a/smileybutton/lang/fr/messages.po b/smileybutton/lang/fr/messages.po
deleted file mode 100644
index e5bce84e..00000000
--- a/smileybutton/lang/fr/messages.po
+++ /dev/null
@@ -1,38 +0,0 @@
-# ADDON smileybutton
-# Copyright (C)
-# This file is distributed under the same license as the Friendica smileybutton addon package.
-# 
-# 
-# Translators:
-# ButterflyOfFire, 2020
-# Hypolite Petovan <hypolite@mrpetovan.com>, 2022
-# StefOfficiel <pichard.stephane@free.fr>, 2015
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-06-23 14:45+0200\n"
-"PO-Revision-Date: 2014-06-23 12:45+0000\n"
-"Last-Translator: Hypolite Petovan <hypolite@mrpetovan.com>, 2022\n"
-"Language-Team: French (http://www.transifex.com/Friendica/friendica/language/fr/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: fr\n"
-"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
-
-#: smileybutton.php:269
-msgid "Smileybutton settings"
-msgstr "Paramètres du bouton des Smileys"
-
-#: smileybutton.php:272
-msgid "You can hide the button and show the smilies directly."
-msgstr "Vous pouvez cacher le bouton et montrer les smilies directement."
-
-#: smileybutton.php:274
-msgid "Hide the button"
-msgstr "Cacher le bouton"
-
-#: smileybutton.php:281
-msgid "Save Settings"
-msgstr "Enregistrer les paramètres"
diff --git a/smileybutton/lang/fr/strings.php b/smileybutton/lang/fr/strings.php
deleted file mode 100644
index a5b75801..00000000
--- a/smileybutton/lang/fr/strings.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_fr")) {
-function string_plural_select_fr($n){
-	$n = intval($n);
-	if (($n == 0 || $n == 1)) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
-}}
-$a->strings['Smileybutton settings'] = 'Paramètres du bouton des Smileys';
-$a->strings['You can hide the button and show the smilies directly.'] = 'Vous pouvez cacher le bouton et montrer les smilies directement.';
-$a->strings['Hide the button'] = 'Cacher le bouton';
-$a->strings['Save Settings'] = 'Enregistrer les paramètres';
diff --git a/smileybutton/lang/hu/messages.po b/smileybutton/lang/hu/messages.po
deleted file mode 100644
index 202a959f..00000000
--- a/smileybutton/lang/hu/messages.po
+++ /dev/null
@@ -1,36 +0,0 @@
-# ADDON smileybutton
-# Copyright (C)
-# This file is distributed under the same license as the Friendica smileybutton addon package.
-# 
-# 
-# Translators:
-# Balázs Úr, 2020-2021
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-06-23 14:45+0200\n"
-"PO-Revision-Date: 2014-06-23 12:45+0000\n"
-"Last-Translator: Balázs Úr, 2020-2021\n"
-"Language-Team: Hungarian (http://app.transifex.com/Friendica/friendica/language/hu/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: hu\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: smileybutton.php:269
-msgid "Smileybutton settings"
-msgstr "Hangulatjelgomb beállításai"
-
-#: smileybutton.php:272
-msgid "You can hide the button and show the smilies directly."
-msgstr "Elrejtheti a gombot és közvetlenül megjelenítheti a hangulatjeleket."
-
-#: smileybutton.php:274
-msgid "Hide the button"
-msgstr "A gomb elrejtése"
-
-#: smileybutton.php:281
-msgid "Save Settings"
-msgstr "Beállítások mentése"
diff --git a/smileybutton/lang/hu/strings.php b/smileybutton/lang/hu/strings.php
deleted file mode 100644
index 492be41f..00000000
--- a/smileybutton/lang/hu/strings.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_hu")) {
-function string_plural_select_hu($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Smileybutton settings'] = 'Hangulatjelgomb beállításai';
-$a->strings['You can hide the button and show the smilies directly.'] = 'Elrejtheti a gombot és közvetlenül megjelenítheti a hangulatjeleket.';
-$a->strings['Hide the button'] = 'A gomb elrejtése';
-$a->strings['Save Settings'] = 'Beállítások mentése';
diff --git a/smileybutton/lang/it/messages.po b/smileybutton/lang/it/messages.po
new file mode 100644
index 00000000..1a1f20de
--- /dev/null
+++ b/smileybutton/lang/it/messages.po
@@ -0,0 +1,36 @@
+# ADDON smileybutton
+# Copyright (C)
+# This file is distributed under the same license as the Friendica smileybutton addon package.
+# 
+# 
+# Translators:
+# fabrixxm <fabrix.xm@gmail.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-23 14:45+0200\n"
+"PO-Revision-Date: 2017-09-20 06:08+0000\n"
+"Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n"
+"Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: it\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: smileybutton.php:269
+msgid "Smileybutton settings"
+msgstr "Impostazioni \"Bottone faccine\""
+
+#: smileybutton.php:272
+msgid "You can hide the button and show the smilies directly."
+msgstr "Puoi nascondere il bottone e mostrare le faccine direttamente."
+
+#: smileybutton.php:274
+msgid "Hide the button"
+msgstr "Nascondi il bottone"
+
+#: smileybutton.php:281
+msgid "Save Settings"
+msgstr "Salva Impostazioni"
diff --git a/smileybutton/lang/it/strings.php b/smileybutton/lang/it/strings.php
index 766bf048..c3edc703 100644
--- a/smileybutton/lang/it/strings.php
+++ b/smileybutton/lang/it/strings.php
@@ -2,10 +2,10 @@
 
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
-	$n = intval($n);
-	if ($n == 1) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
+	return ($n != 1);;
 }}
-$a->strings['Smileybutton settings'] = 'Impostazioni "Bottone faccine"';
-$a->strings['You can hide the button and show the smilies directly.'] = 'Puoi nascondere il bottone e mostrare le faccine direttamente.';
-$a->strings['Hide the button'] = 'Nascondi il bottone';
-$a->strings['Save Settings'] = 'Salva Impostazioni';
+;
+$a->strings["Smileybutton settings"] = "Impostazioni \"Bottone faccine\"";
+$a->strings["You can hide the button and show the smilies directly."] = "Puoi nascondere il bottone e mostrare le faccine direttamente.";
+$a->strings["Hide the button"] = "Nascondi il bottone";
+$a->strings["Save Settings"] = "Salva Impostazioni";
diff --git a/smileybutton/lang/nl/strings.php b/smileybutton/lang/nl/strings.php
index 15c91554..19a76fd4 100644
--- a/smileybutton/lang/nl/strings.php
+++ b/smileybutton/lang/nl/strings.php
@@ -3,7 +3,10 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Smileybutton settings'] = 'Smileybutton instellingen';
-$a->strings['Save Settings'] = 'Instellingen opslaan';
+;
+$a->strings["Smileybutton settings"] = "Smileybutton instellingen";
+$a->strings["You can hide the button and show the smilies directly."] = "";
+$a->strings["Hide the button"] = "";
+$a->strings["Save Settings"] = "Instellingen opslaan";
diff --git a/smileybutton/lang/pl/messages.po b/smileybutton/lang/pl/messages.po
index 79791140..467c5705 100644
--- a/smileybutton/lang/pl/messages.po
+++ b/smileybutton/lang/pl/messages.po
@@ -4,14 +4,14 @@
 # 
 # 
 # Translators:
-# Waldemar Stoczkowski, 2018
+# Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-06-23 14:45+0200\n"
-"PO-Revision-Date: 2014-06-23 12:45+0000\n"
-"Last-Translator: Waldemar Stoczkowski, 2018\n"
+"PO-Revision-Date: 2018-08-04 10:17+0000\n"
+"Last-Translator: Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.com/Friendica/friendica/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/smileybutton/lang/pl/strings.php b/smileybutton/lang/pl/strings.php
index 29480bcf..9741c36f 100644
--- a/smileybutton/lang/pl/strings.php
+++ b/smileybutton/lang/pl/strings.php
@@ -3,9 +3,10 @@
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
 	$n = intval($n);
-	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
+	return ($n==1 ? 0 : ($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14) ? 1 : $n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14) ? 2 : 3);;
 }}
-$a->strings['Smileybutton settings'] = 'Ustawienia Przycisku Buźka';
-$a->strings['You can hide the button and show the smilies directly.'] = 'Możesz ukryć przycisk i bezpośrednio pokazać emotikony.';
-$a->strings['Hide the button'] = 'Ukryj przycisk';
-$a->strings['Save Settings'] = 'Zapisz ustawienia';
+;
+$a->strings["Smileybutton settings"] = "Ustawienia Przycisku Buźka";
+$a->strings["You can hide the button and show the smilies directly."] = "Możesz ukryć przycisk i bezpośrednio pokazać emotikony.";
+$a->strings["Hide the button"] = "Ukryj przycisk";
+$a->strings["Save Settings"] = "Zapisz ustawienia";
diff --git a/smileybutton/lang/ro/strings.php b/smileybutton/lang/ro/strings.php
index 25385086..2a330a47 100644
--- a/smileybutton/lang/ro/strings.php
+++ b/smileybutton/lang/ro/strings.php
@@ -2,10 +2,10 @@
 
 if(! function_exists("string_plural_select_ro")) {
 function string_plural_select_ro($n){
-	$n = intval($n);
-	if ($n==1) { return 0; } else if ((($n%100>19)||(($n%100==0)&&($n!=0)))) { return 2; } else  { return 1; }
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
 }}
-$a->strings['Smileybutton settings'] = 'Configurări Smileybutton';
-$a->strings['You can hide the button and show the smilies directly.'] = 'Puteți ascunde butonul şi afișa emoticoanele direct.';
-$a->strings['Hide the button'] = 'Ascundeţi butonul';
-$a->strings['Save Settings'] = 'Salvare Configurări';
+;
+$a->strings["Smileybutton settings"] = "Configurări Smileybutton";
+$a->strings["You can hide the button and show the smilies directly."] = "Puteți ascunde butonul şi afișa emoticoanele direct.";
+$a->strings["Hide the button"] = "Ascundeţi butonul";
+$a->strings["Save Settings"] = "Salvare Configurări";
diff --git a/smileybutton/lang/sv/messages.po b/smileybutton/lang/sv/messages.po
deleted file mode 100644
index 1d46a4cf..00000000
--- a/smileybutton/lang/sv/messages.po
+++ /dev/null
@@ -1,36 +0,0 @@
-# ADDON smileybutton
-# Copyright (C)
-# This file is distributed under the same license as the Friendica smileybutton addon package.
-# 
-# 
-# Translators:
-# Kristoffer Grundström <lovaren@gmail.com>, 2022
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-06-23 14:45+0200\n"
-"PO-Revision-Date: 2022-01-16 00:52+0000\n"
-"Last-Translator: Kristoffer Grundström <lovaren@gmail.com>\n"
-"Language-Team: Swedish (http://www.transifex.com/Friendica/friendica/language/sv/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: sv\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: smileybutton.php:269
-msgid "Smileybutton settings"
-msgstr ""
-
-#: smileybutton.php:272
-msgid "You can hide the button and show the smilies directly."
-msgstr ""
-
-#: smileybutton.php:274
-msgid "Hide the button"
-msgstr "Göm knappen"
-
-#: smileybutton.php:281
-msgid "Save Settings"
-msgstr "Spara inställningar"
diff --git a/smileybutton/lang/sv/strings.php b/smileybutton/lang/sv/strings.php
deleted file mode 100644
index 783808c6..00000000
--- a/smileybutton/lang/sv/strings.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_sv")) {
-function string_plural_select_sv($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Hide the button'] = 'Göm knappen';
-$a->strings['Save Settings'] = 'Spara inställningar';
diff --git a/smileybutton/lang/zh-cn/strings.php b/smileybutton/lang/zh-cn/strings.php
index 1373582e..1fd0c133 100644
--- a/smileybutton/lang/zh-cn/strings.php
+++ b/smileybutton/lang/zh-cn/strings.php
@@ -3,9 +3,10 @@
 if(! function_exists("string_plural_select_zh_cn")) {
 function string_plural_select_zh_cn($n){
 	$n = intval($n);
-	return intval(0);
+	return 0;;
 }}
-$a->strings['Smileybutton settings'] = '表情按钮设置';
-$a->strings['You can hide the button and show the smilies directly.'] = '您可以隐藏按钮并直接显示表情符号。';
-$a->strings['Hide the button'] = '隐藏按钮';
-$a->strings['Save Settings'] = '保存设置';
+;
+$a->strings["Smileybutton settings"] = "表情按钮设置";
+$a->strings["You can hide the button and show the smilies directly."] = "您可以隐藏按钮并直接显示表情符号。";
+$a->strings["Hide the button"] = "隐藏按钮";
+$a->strings["Save Settings"] = "保存设置";
diff --git a/smileybutton/smileybutton.php b/smileybutton/smileybutton.php
index 1df717b7..593eed8b 100644
--- a/smileybutton/smileybutton.php
+++ b/smileybutton/smileybutton.php
@@ -2,34 +2,47 @@
 /**
  * Name: Smileybutton
  * Description: Adds a smileybutton to the Inputbox
- * Version: 1.0
+ * Version: 0.2
  * Author: Johannes Schwab <https://friendica.jschwab.org/profile/ddorian>
- * Maintainer: Hypolite Petovan <https://friendica.mrpetovan.com/profile/hypolite>
  */
-
-use Friendica\App;
 use Friendica\Core\Hook;
-use Friendica\DI;
+use Friendica\Core\Logger;
 
-function smileybutton_install()
-{
+function smileybutton_install() {
 	//Register hooks
-	Hook::register('jot_tool', 'addon/smileybutton/smileybutton.php', 'smileybutton_jot_tool');
+	Hook::register('jot_tool', 'addon/smileybutton/smileybutton.php', 'show_button');
+
+	Logger::log("installed smileybutton");
 }
 
-function smileybutton_jot_tool(string &$body)
-{
+
+function smileybutton_uninstall() {
+	//Delet registered hooks
+	Hook::unregister('jot_tool',    'addon/smileybutton/smileybutton.php', 'show_button');
+
+	Logger::log("removed smileybutton");
+}
+
+
+
+function show_button(Friendica\App $a, &$b) {
 	// Disable if theme is quattro
-	if (DI::app()->getCurrentTheme() == 'quattro') {
+	// TODO add style for quattro
+	if ($a->getCurrentTheme() == 'quattro')
 		return;
-	}
 
-	// Disable for mobile because they have a smiley key of their own
-	if (DI::mode()->isMobile() || DI::mode()->isMobile()) {
+	// Disable for mobile because most mobiles have a smiley key for ther own
+	if ($a->is_mobile || $a->is_tablet)
 		return;
-	}
 
-	$texts = [
+	/**
+	 *
+ 	 * I have copied this from /include/text.php, removed doubles
+	 * and escaped them.
+	 *
+	 */
+
+	$texts =  [
 		'&lt;3',
 		'&lt;/3',
 		':-)',
@@ -41,82 +54,84 @@ function smileybutton_jot_tool(string &$body)
 		':-O',
 		'\\\\o/',
 		'O_o',
-		':\'(',
-		':-!',
-		':-/',
-		':-[',
-		'8-)',
+		":\'(",
+		":-!",
+		":-/",
+		":-[",
+		"8-)",
 		':beer',
 		':coffee',
 		':facepalm',
 		':like',
 		':dislike',
-		'~friendica',
-		'red#',
+                '~friendica',
+                'red#'
+
 	];
 
 	$icons = [
-		'<img class="smiley" src="' . DI::baseUrl() . '/images/smiley-heart.gif" alt="<3" />',
-		'<img class="smiley" src="' . DI::baseUrl() . '/images/smiley-brokenheart.gif" alt="</3" />',
-		'<img class="smiley" src="' . DI::baseUrl() . '/images/smiley-smile.gif" alt=":-)" />',
-		'<img class="smiley" src="' . DI::baseUrl() . '/images/smiley-wink.gif" alt=";-)" />',
-		'<img class="smiley" src="' . DI::baseUrl() . '/images/smiley-frown.gif" alt=":-(" />',
-		'<img class="smiley" src="' . DI::baseUrl() . '/images/smiley-tongue-out.gif" alt=":-P" />',
-		'<img class="smiley" src="' . DI::baseUrl() . '/images/smiley-kiss.gif" alt=":-X" />',
-		'<img class="smiley" src="' . DI::baseUrl() . '/images/smiley-laughing.gif" alt=":-D" />',
-		'<img class="smiley" src="' . DI::baseUrl() . '/images/smiley-surprised.gif" alt=":-O" />',
-		'<img class="smiley" src="' . DI::baseUrl() . '/images/smiley-thumbsup.gif" alt="\\o/" />',
-		'<img class="smiley" src="' . DI::baseUrl() . '/images/smiley-Oo.gif" alt="O_o" />',
-		'<img class="smiley" src="' . DI::baseUrl() . '/images/smiley-cry.gif" alt=":\'(" />',
-		'<img class="smiley" src="' . DI::baseUrl() . '/images/smiley-foot-in-mouth.gif" alt=":-!" />',
-		'<img class="smiley" src="' . DI::baseUrl() . '/images/smiley-undecided.gif" alt=":-/" />',
-		'<img class="smiley" src="' . DI::baseUrl() . '/images/smiley-embarassed.gif" alt=":-[" />',
-		'<img class="smiley" src="' . DI::baseUrl() . '/images/smiley-cool.gif" alt="8-)" />',
-		'<img class="smiley" src="' . DI::baseUrl() . '/images/beer_mug.gif" alt=":beer" />',
-		'<img class="smiley" src="' . DI::baseUrl() . '/images/coffee.gif" alt=":coffee" />',
-		'<img class="smiley" src="' . DI::baseUrl() . '/images/smiley-facepalm.gif" alt=":facepalm" />',
-		'<img class="smiley" src="' . DI::baseUrl() . '/images/like.gif" alt=":like" />',
-		'<img class="smiley" src="' . DI::baseUrl() . '/images/dislike.gif" alt=":dislike" />',
-		'<img class="smiley" src="' . DI::baseUrl() . '/images/friendica-16.png" alt="~friendica" />',
-		'<img class="smiley" src="' . DI::baseUrl() . '/images/rhash-16.png" alt="red" />'
+		'<img class="smiley" src="' . $a->getBaseURL() . '/images/smiley-heart.gif" alt="<3" />',
+		'<img class="smiley" src="' . $a->getBaseURL() . '/images/smiley-brokenheart.gif" alt="</3" />',
+		'<img class="smiley" src="' . $a->getBaseURL() . '/images/smiley-smile.gif" alt=":-)" />',
+		'<img class="smiley" src="' . $a->getBaseURL() . '/images/smiley-wink.gif" alt=";-)" />',
+		'<img class="smiley" src="' . $a->getBaseURL() . '/images/smiley-frown.gif" alt=":-(" />',
+		'<img class="smiley" src="' . $a->getBaseURL() . '/images/smiley-tongue-out.gif" alt=":-P" />',
+		'<img class="smiley" src="' . $a->getBaseURL() . '/images/smiley-kiss.gif" alt=":-X" />',
+		'<img class="smiley" src="' . $a->getBaseURL() . '/images/smiley-laughing.gif" alt=":-D" />',
+		'<img class="smiley" src="' . $a->getBaseURL() . '/images/smiley-surprised.gif" alt=":-O" />',
+		'<img class="smiley" src="' . $a->getBaseURL() . '/images/smiley-thumbsup.gif" alt="\\o/" />',
+		'<img class="smiley" src="' . $a->getBaseURL() . '/images/smiley-Oo.gif" alt="O_o" />',
+		'<img class="smiley" src="' . $a->getBaseURL() . '/images/smiley-cry.gif" alt=":\'(" />',
+		'<img class="smiley" src="' . $a->getBaseURL() . '/images/smiley-foot-in-mouth.gif" alt=":-!" />',
+		'<img class="smiley" src="' . $a->getBaseURL() . '/images/smiley-undecided.gif" alt=":-/" />',
+		'<img class="smiley" src="' . $a->getBaseURL() . '/images/smiley-embarassed.gif" alt=":-[" />',
+		'<img class="smiley" src="' . $a->getBaseURL() . '/images/smiley-cool.gif" alt="8-)" />',
+		'<img class="smiley" src="' . $a->getBaseURL() . '/images/beer_mug.gif" alt=":beer" />',
+		'<img class="smiley" src="' . $a->getBaseURL() . '/images/coffee.gif" alt=":coffee" />',
+		'<img class="smiley" src="' . $a->getBaseURL() . '/images/smiley-facepalm.gif" alt=":facepalm" />',
+		'<img class="smiley" src="' . $a->getBaseURL() . '/images/like.gif" alt=":like" />',
+		'<img class="smiley" src="' . $a->getBaseURL() . '/images/dislike.gif" alt=":dislike" />',
+		'<img class="smiley" src="' . $a->getBaseURL() . '/images/friendica-16.png" alt="~friendica" />',
+		'<img class="smiley" src="' . $a->getBaseURL() . '/images/rhash-16.png" alt="red" />'
 	];
 
 	// Call hooks to get aditional smileies from other addons
-	$params = ['texts' => $texts, 'icons' => $icons, 'string' => '']; //changed
+	$params = ['texts' => $texts, 'icons' => $icons, 'string' => ""]; //changed
 	Hook::callAll('smilie', $params);
 
 	//Generate html for smiley list
-	$s = '<table class="smiley-preview"><tr>';
-	for ($x = 0; $x < count($params['texts']); $x++) {
+	$s = "<table class=\"smiley-preview\"><tr>\n\t";
+	for($x = 0; $x < count($params['texts']); $x ++) {
 		$icon = $params['icons'][$x];
-		$s .= '<td onclick="smileybutton_addsmiley(\'' . $params['texts'][$x] . '\')">' . $icon . '</td>';
-		if (($x + 1) % (floor(sqrt(count($params['texts']))) + 1) == 0) {
-			$s .= '</tr><tr>';
+		$icon = str_replace('/>', 'onclick="smileybutton_addsmiley(\'' . $params['texts'][$x] . '\')"/>', $icon);
+		$icon = str_replace('class="smiley"', 'class="smiley_preview"', $icon);
+		$s .= "<td>" . $icon . "</td>";
+		if (($x+1) % (sqrt(count($params['texts']))+1) == 0) {
+			$s .= "</tr>\n\t<tr>";
 		}
 	}
-	$s .= '</tr></table>';
+	$s .= "\t</tr></table>";
 
 	//Add css to header
-	$css_file = __DIR__ . '/view/' . DI::app()->getCurrentTheme() . '.css';
-	if (!file_exists($css_file)) {
-		$css_file = __DIR__ . '/view/default.css';
-	}
+	$css_file = 'addon/smileybutton/view/' . $a->getCurrentTheme() . '.css';
+	if (! file_exists($css_file))
+		$css_file = 'addon/smileybutton/view/default.css';
+	$css_url = $a->getBaseURL().'/'.$css_file;
+
+	$a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="'.$css_url.'" media="all" />'."\r\n";
 
-	DI::page()->registerStylesheet($css_file);
 
 	//Get the correct image for the theme
-	$image = 'addon/smileybutton/view/' . DI::app()->getCurrentTheme() . '.png';
-	if (!file_exists($image)) {
+	$image = 'addon/smileybutton/view/' . $a->getCurrentTheme() . '.png';
+	if (! file_exists($image))
 		$image = 'addon/smileybutton/view/default.png';
-	}
-
-	$image_url = DI::baseUrl() . '/' . $image;
+	$image_url = $a->getBaseURL().'/'.$image;
 
 	//Add the hmtl and script to the page
-	$body = <<< EOT
-	<div id="profile-smiley-wrapper">
-		<button type="button" class="btn btn-link smiley_button" onclick="toggle_smileybutton()"><img src="$image_url" alt="smiley"></button>
-		<div id="smileybutton">
+	$b = <<< EOT
+	<div id="profile-smiley-wrapper" style="display: block;" >
+		<img src="$image_url" class="smiley_button" onclick="toggle_smileybutton()" alt="smiley">
+		<div id="smileybutton" style="display:none;">
 		$s
 		</div>
 	</div>
@@ -134,11 +149,18 @@ function smileybutton_jot_tool(string &$body)
 		}
 
 		function smileybutton_addsmiley(text) {
-			var v = $("#profile-jot-text").val();
-			v = v + text;
-			$("#profile-jot-text").val(v).focus();
+			if(plaintext == "none") {
+				var v = $("#profile-jot-text").val();
+				v = v + text;
+				$("#profile-jot-text").val(v);
+				$("#profile-jot-text").focus();
+			} else {
+				var v = tinymce.activeEditor.getContent();
+				v = v + text;
+				tinymce.activeEditor.setContent(v);
+				tinymce.activeEditor.focus();
+			}
 		}
 	</script>
 EOT;
 }
-
diff --git a/smileybutton/view/default.css b/smileybutton/view/default.css
index 5fd60928..16120360 100644
--- a/smileybutton/view/default.css
+++ b/smileybutton/view/default.css
@@ -1,17 +1,9 @@
-#profile-smiley-wrapper {
-	display: block;
-}
-
-#smileybutton {
-	display: none;
-}
-
-.smiley_button > img {
+img.smiley_button {
 	height: 18px;
 	width: 18px;
 }
 
-table.smiley-preview img.smiley {
+img.smiley_preview {
 	max-height: 25px;
 	max-width: 25px;
 }
@@ -19,7 +11,3 @@ table.smiley-preview img.smiley {
 table.smiley-preview {
 	border: 1px solid #AAAAAA;
 }
-
-table.smiley-preview td {
-	cursor: pointer;
-}
diff --git a/smileybutton/view/default.svg b/smileybutton/view/default.svg
index 35872bdf..c39e68df 100644
--- a/smileybutton/view/default.svg
+++ b/smileybutton/view/default.svg
@@ -1 +1,99 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" id="svg2985" width="32" height="32" version="1.1"><metadata id="metadata2990"/><g id="layer1"><path style="fill:none;stroke:#000;stroke-width:2.15448809;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" id="path2993" d="m 32.952894,14.585868 a 16.119234,13.752699 0 1 1 -32.23846796,0 16.119234,13.752699 0 1 1 32.23846796,0 z" transform="matrix(0.92563207,0,0,1.0849129,0.41822445,0.17560338)"/><path style="fill:#000;fill-opacity:1;stroke:none" id="path3771" d="m 9.8233565,7.9774284 a 1.294897,1.2502453 0 1 1 -2.5897939,0 1.294897,1.2502453 0 1 1 2.5897939,0 z" transform="matrix(1.9306555,0,0,1.9996075,-5.9655177,-5.3517257)"/><path style="fill:#000;fill-opacity:1;fill-rule:nonzero;stroke:none" id="path3773" d="m 22.32581,8.6025515 a 1.65211,1.6074584 0 1 1 -3.30422,0 1.65211,1.6074584 0 1 1 3.30422,0 z" transform="matrix(1.5132165,0,0,1.5552502,-9.7837844,-2.7791198)"/><path style="fill:none;stroke:#000;stroke-width:2.0389359;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" id="path3775" d="M 25.362788,24.185449 A 10.761041,8.1265945 0 0 1 5.4615288,24.21241" transform="matrix(0.95177919,0,0,1.176954,1.5530282,-8.5017657)"/></g></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32px"
+   height="32px"
+   id="svg2985"
+   version="1.1"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="Neues Dokument 2">
+  <defs
+     id="defs2987" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1"
+     inkscape:cx="16.357213"
+     inkscape:cy="16"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1280"
+     inkscape:window-height="975"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata2990">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <path
+       sodipodi:type="arc"
+       style="fill:none;stroke:#000000;stroke-width:2.15448809;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="path2993"
+       sodipodi:cx="16.83366"
+       sodipodi:cy="14.585868"
+       sodipodi:rx="16.119234"
+       sodipodi:ry="13.752699"
+       d="m 32.952894,14.585868 a 16.119234,13.752699 0 1 1 -32.23846796,0 16.119234,13.752699 0 1 1 32.23846796,0 z"
+       transform="matrix(0.92563207,0,0,1.0849129,0.41822445,0.17560338)" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#000000;fill-opacity:1;stroke:none"
+       id="path3771"
+       sodipodi:cx="8.5284595"
+       sodipodi:cy="7.9774284"
+       sodipodi:rx="1.294897"
+       sodipodi:ry="1.2502453"
+       d="m 9.8233565,7.9774284 a 1.294897,1.2502453 0 1 1 -2.5897939,0 1.294897,1.2502453 0 1 1 2.5897939,0 z"
+       transform="matrix(1.9306555,0,0,1.9996075,-5.9655177,-5.3517257)" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none"
+       id="path3773"
+       sodipodi:cx="20.6737"
+       sodipodi:cy="8.6025515"
+       sodipodi:rx="1.65211"
+       sodipodi:ry="1.6074584"
+       d="m 22.32581,8.6025515 a 1.65211,1.6074584 0 1 1 -3.30422,0 1.65211,1.6074584 0 1 1 3.30422,0 z"
+       transform="matrix(1.5132165,0,0,1.5552502,-9.7837844,-2.7791198)" />
+    <path
+       sodipodi:type="arc"
+       style="fill:none;stroke:#000000;stroke-width:2.0389359;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="path3775"
+       sodipodi:cx="15.404809"
+       sodipodi:cy="21.105005"
+       sodipodi:rx="10.761041"
+       sodipodi:ry="8.1265945"
+       d="M 25.362788,24.185449 A 10.761041,8.1265945 0 0 1 5.4615288,24.21241"
+       sodipodi:start="0.38877722"
+       sodipodi:end="2.7492276"
+       transform="matrix(0.95177919,0,0,1.176954,1.5530282,-8.5017657)"
+       sodipodi:open="true" />
+  </g>
+</svg>
diff --git a/smileybutton/view/duepuntozero.css b/smileybutton/view/duepuntozero.css
index 92ff4eba..0f4ef4ae 100644
--- a/smileybutton/view/duepuntozero.css
+++ b/smileybutton/view/duepuntozero.css
@@ -1,26 +1,14 @@
-#profile-smiley-wrapper {
-	display: block;
-}
-
-#smileybutton {
-	display: none;
-}
-
-.smiley_button {
+img.smiley_button {
 	height: 18px;
 	width: 18px;
 	position: relative;
 	left: 285px;
 	top: -45px;
-	padding: 0;
-	border: 0;
-	background: none;
 }
 
-table.smiley-preview img.smiley {
+img.smiley_preview {
 	max-height: 25px;
 	max-width: 25px;
-	cursor: pointer;
 }
 
 table.smiley-preview {
@@ -31,7 +19,3 @@ table.smiley-preview {
 	left: 285px;
 	top: -36px;
 }
-
-table.smiley-preview td {
-	cursor: pointer;
-}
diff --git a/smileybutton/view/frio.css b/smileybutton/view/frio.css
deleted file mode 100644
index dce84826..00000000
--- a/smileybutton/view/frio.css
+++ /dev/null
@@ -1,31 +0,0 @@
-#profile-smiley-wrapper {
-	display: block;
-}
-
-#smileybutton {
-	display: none;
-}
-
-.smiley_button > img {
-	height: 14px;
-	width: 14px;
-}
-
-table.smiley-preview img.smiley {
-	max-height: 25px;
-	max-width: 25px;
-}
-
-table.smiley-preview {
-	border: 1px solid #AAAAAA;
-}
-
-table.smiley-preview td {
-	cursor: pointer;
-}
-
-#profile-smiley-wrapper > .btn-link {
-	position: relative;
-	display: block;
-	padding: 10px 15px;
-}
diff --git a/smileybutton/view/frost.css b/smileybutton/view/frost.css
new file mode 100644
index 00000000..42e18f05
--- /dev/null
+++ b/smileybutton/view/frost.css
@@ -0,0 +1,21 @@
+img.smiley_button {
+	height: 25;
+	width: 25px;
+	position: relative;
+	left: 335px;
+	top: -45px;
+}
+
+img.smiley_preview {
+	max-height: 25px;
+	max-width: 25px;
+}
+
+table.smiley-preview {
+	border: 1px solid #AAAAAA;
+	-moz-border-radius: 3px;
+	border-radius: 3px;
+	position: relative;
+	left: 285px;
+	top: -36px;
+}
diff --git a/smileybutton/view/frost.png b/smileybutton/view/frost.png
new file mode 100644
index 00000000..6ad02a18
Binary files /dev/null and b/smileybutton/view/frost.png differ
diff --git a/smileybutton/view/smoothly.css b/smileybutton/view/smoothly.css
index 2f30799f..14ed961a 100644
--- a/smileybutton/view/smoothly.css
+++ b/smileybutton/view/smoothly.css
@@ -1,12 +1,4 @@
-#profile-smiley-wrapper {
-	display: block;
-}
-
-#smileybutton {
-	display: none;
-}
-
-.smiley_button > img {
+img.smiley_button {
 	height: 22px;
 	width: 22px;
 	position: relative;
@@ -16,10 +8,9 @@
 	border-radius: 0px;
 }
 
-table.smiley-preview img.smiley {
+img.smiley_preview {
 	max-height: 25px;
 	max-width: 25px;
-	cursor: pointer;
 }
 
 table.smiley-preview {
@@ -28,7 +19,3 @@ table.smiley-preview {
 	border-radius: 5px;
 	margin: 5px;
 }
-
-table.smiley-preview td {
-	cursor: pointer;
-}
diff --git a/smileybutton/view/smoothly.svg b/smileybutton/view/smoothly.svg
index 1eaa4da3..8f5d26a2 100644
--- a/smileybutton/view/smoothly.svg
+++ b/smileybutton/view/smoothly.svg
@@ -1 +1,112 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" id="svg2985" width="32" height="32" version="1.1"><metadata id="metadata2990"/><g id="layer1"><g id="g5904" transform="matrix(0.8125,0,0,0.81026768,3,3.0687774)"><path id="path2993" d="m 32.952894,14.585868 c 0,7.595406 -7.216827,13.752699 -16.119234,13.752699 -8.902407,0 -16.11923396,-6.157293 -16.11923396,-13.752699 0,-7.595406 7.21682696,-13.75269902 16.11923396,-13.75269902 8.902407,0 16.119234,6.15729302 16.119234,13.75269902 z" transform="matrix(0.92563207,0,0,1.0849129,0.41822445,0.17560338)" style="fill:none;stroke:#000;stroke-width:2.15448809;stroke-miterlimit:4;stroke-opacity:.49803922;stroke-dasharray:none"/><path id="path3771" d="m 9.8233565,7.9774284 c 0,0.6904915 -0.5797451,1.2502454 -1.294897,1.2502454 -0.7151518,0 -1.2948969,-0.5597539 -1.2948969,-1.2502454 0,-0.6904914 0.5797451,-1.2502453 1.2948969,-1.2502453 0.7151519,0 1.294897,0.5597539 1.294897,1.2502453 z" transform="matrix(1.9306555,0,0,1.9996075,-5.9655177,-5.3517257)" style="fill:#000;fill-opacity:.49659867;stroke:none"/><path id="path3773" d="m 22.32581,8.6025515 c 0,0.8877747 -0.739675,1.6074585 -1.65211,1.6074585 -0.912435,0 -1.65211,-0.7196838 -1.65211,-1.6074585 0,-0.8877748 0.739675,-1.6074584 1.65211,-1.6074584 0.912435,0 1.65211,0.7196836 1.65211,1.6074584 z" transform="matrix(1.5132165,0,0,1.5552502,-9.7837844,-2.7791198)" style="fill:#000;fill-opacity:.49659867;fill-rule:nonzero;stroke:none"/><path id="path3775" d="m 25.362788,24.185449 c -2.252797,4.153255 -8.537389,6.140972 -14.037029,4.43969 C 8.6700503,27.80361 6.5588981,26.215006 5.4615288,24.21241" transform="matrix(0.95177919,0,0,1.176954,1.5530282,-8.5017657)" style="fill:none;stroke:#000;stroke-width:2.0389359;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:.49803922;stroke-dasharray:none"/></g><rect style="fill:none;stroke:#000;stroke-width:1.19347739;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:.28469753;stroke-dasharray:none;stroke-dashoffset:0" id="rect5910" width="30.807" height="30.807" x=".597" y=".597" rx="2.5" ry="2.5"/></g></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32px"
+   height="32px"
+   id="svg2985"
+   version="1.1"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="smoothly.svg">
+  <defs
+     id="defs2987" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="7"
+     inkscape:cx="13.500067"
+     inkscape:cy="16"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="819"
+     inkscape:window-height="542"
+     inkscape:window-x="390"
+     inkscape:window-y="299"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata2990">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <g
+       id="g5904"
+       transform="matrix(0.8125,0,0,0.81026768,3,3.0687774)">
+      <path
+         transform="matrix(0.92563207,0,0,1.0849129,0.41822445,0.17560338)"
+         d="m 32.952894,14.585868 c 0,7.595406 -7.216827,13.752699 -16.119234,13.752699 -8.902407,0 -16.11923396,-6.157293 -16.11923396,-13.752699 0,-7.595406 7.21682696,-13.75269902 16.11923396,-13.75269902 8.902407,0 16.119234,6.15729302 16.119234,13.75269902 z"
+         sodipodi:ry="13.752699"
+         sodipodi:rx="16.119234"
+         sodipodi:cy="14.585868"
+         sodipodi:cx="16.83366"
+         id="path2993"
+         style="fill:none;stroke:#000000;stroke-width:2.15448809;stroke-miterlimit:4;stroke-opacity:0.49803922;stroke-dasharray:none"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(1.9306555,0,0,1.9996075,-5.9655177,-5.3517257)"
+         d="m 9.8233565,7.9774284 c 0,0.6904915 -0.5797451,1.2502454 -1.294897,1.2502454 -0.7151518,0 -1.2948969,-0.5597539 -1.2948969,-1.2502454 0,-0.6904914 0.5797451,-1.2502453 1.2948969,-1.2502453 0.7151519,0 1.294897,0.5597539 1.294897,1.2502453 z"
+         sodipodi:ry="1.2502453"
+         sodipodi:rx="1.294897"
+         sodipodi:cy="7.9774284"
+         sodipodi:cx="8.5284595"
+         id="path3771"
+         style="fill:#000000;fill-opacity:0.49659867;stroke:none"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(1.5132165,0,0,1.5552502,-9.7837844,-2.7791198)"
+         d="m 22.32581,8.6025515 c 0,0.8877747 -0.739675,1.6074585 -1.65211,1.6074585 -0.912435,0 -1.65211,-0.7196838 -1.65211,-1.6074585 0,-0.8877748 0.739675,-1.6074584 1.65211,-1.6074584 0.912435,0 1.65211,0.7196836 1.65211,1.6074584 z"
+         sodipodi:ry="1.6074584"
+         sodipodi:rx="1.65211"
+         sodipodi:cy="8.6025515"
+         sodipodi:cx="20.6737"
+         id="path3773"
+         style="fill:#000000;fill-opacity:0.49659867;fill-rule:nonzero;stroke:none"
+         sodipodi:type="arc" />
+      <path
+         sodipodi:open="true"
+         transform="matrix(0.95177919,0,0,1.176954,1.5530282,-8.5017657)"
+         sodipodi:end="2.7492276"
+         sodipodi:start="0.38877722"
+         d="m 25.362788,24.185449 c -2.252797,4.153255 -8.537389,6.140972 -14.037029,4.43969 C 8.6700503,27.80361 6.5588981,26.215006 5.4615288,24.21241"
+         sodipodi:ry="8.1265945"
+         sodipodi:rx="10.761041"
+         sodipodi:cy="21.105005"
+         sodipodi:cx="15.404809"
+         id="path3775"
+         style="fill:none;stroke:#000000;stroke-width:2.0389359;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:0.49803922;stroke-dasharray:none"
+         sodipodi:type="arc" />
+    </g>
+    <rect
+       style="fill:none;stroke:#000000;stroke-width:1.19347739;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:0.28469753;stroke-dasharray:none;stroke-dashoffset:0"
+       id="rect5910"
+       width="30.806522"
+       height="30.806522"
+       x="0.5967387"
+       y="0.5967381"
+       rx="2.5"
+       ry="2.5" />
+  </g>
+</svg>
diff --git a/smileybutton/view/vier.css b/smileybutton/view/vier.css
index 5862759b..4f237800 100644
--- a/smileybutton/view/vier.css
+++ b/smileybutton/view/vier.css
@@ -1,49 +1,15 @@
-#profile-smiley-wrapper {
-	float: left;
-	margin-left: 15px;
-	cursor: pointer;
-	height: 10px;
-	display: inline-block;
-}
-
-#profile-smiley-wrapper .btn {
-	padding: 0;
-	margin: 0;
-	border: 0;
-	background: none;
-	width: 20px;
-	height: 20px;
-	line-height: inherit;
-	display: inline-block;
-	overflow: hidden;
-	padding: 1px;
-	color: #999;
-	vertical-align: text-top;
-}
-
-#smileybutton {
-	position: absolute;
-	z-index: 99;
-	display: none;
-}
-
-.smiley_button > img {
+img.smiley_button {
 	height: 18px;
 	width: 18px;
 	margin-right: 18px;
 }
 
-table.smiley-preview {
-	background-color: #FFF;
-	box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
-}
-
-table.smiley-preview img.smiley {
+img.smiley_preview {
 	max-height: 25px;
 	max-width: 25px;
-	cursor: pointer;
 }
 
-table.smiley-preview td {
-	cursor: pointer;
+table.smiley-preview {
+	border: 1px solid #999999;
+	margin-left: 10px;
 }
diff --git a/smileybutton/view/vier.svg b/smileybutton/view/vier.svg
index c4d9fb61..4b86d960 100644
--- a/smileybutton/view/vier.svg
+++ b/smileybutton/view/vier.svg
@@ -1 +1,99 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg" id="svg2985" width="32" height="32" version="1.1"><metadata id="metadata2990"/><g id="layer1"><path style="fill:none;stroke:#000;stroke-width:2.15448809000000008;stroke-miterlimit:4;stroke-opacity:.49803922;stroke-dasharray:none" id="path2993" d="m 32.952894,14.585868 a 16.119234,13.752699 0 1 1 -32.23846796,0 16.119234,13.752699 0 1 1 32.23846796,0 z" transform="matrix(0.92563207,0,0,1.0849129,0.41822445,0.17560338)"/><path style="fill:#000;fill-opacity:.49659863;stroke:none" id="path3771" d="m 9.8233565,7.9774284 a 1.294897,1.2502453 0 1 1 -2.5897939,0 1.294897,1.2502453 0 1 1 2.5897939,0 z" transform="matrix(1.9306555,0,0,1.9996075,-5.9655177,-5.3517257)"/><path style="fill:#000;fill-opacity:.49659863;fill-rule:nonzero;stroke:none" id="path3773" d="m 22.32581,8.6025515 a 1.65211,1.6074584 0 1 1 -3.30422,0 1.65211,1.6074584 0 1 1 3.30422,0 z" transform="matrix(1.5132165,0,0,1.5552502,-9.7837844,-2.7791198)"/><path style="fill:none;stroke:#000;stroke-width:2.0389358999999998;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:.49803922;stroke-dasharray:none" id="path3775" d="M 25.362788,24.185449 A 10.761041,8.1265945 0 0 1 5.4615288,24.21241" transform="matrix(0.95177919,0,0,1.176954,1.5530282,-8.5017657)"/></g></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32px"
+   height="32px"
+   id="svg2985"
+   version="1.1"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="default.svg">
+  <defs
+     id="defs2987" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.75"
+     inkscape:cx="172.35721"
+     inkscape:cy="16"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="570"
+     inkscape:window-height="433"
+     inkscape:window-x="640"
+     inkscape:window-y="287"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata2990">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <path
+       sodipodi:type="arc"
+       style="fill:none;stroke:#000000;stroke-width:2.15448809000000008;stroke-miterlimit:4;stroke-opacity:0.49803922;stroke-dasharray:none"
+       id="path2993"
+       sodipodi:cx="16.83366"
+       sodipodi:cy="14.585868"
+       sodipodi:rx="16.119234"
+       sodipodi:ry="13.752699"
+       d="m 32.952894,14.585868 a 16.119234,13.752699 0 1 1 -32.23846796,0 16.119234,13.752699 0 1 1 32.23846796,0 z"
+       transform="matrix(0.92563207,0,0,1.0849129,0.41822445,0.17560338)" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#000000;fill-opacity:0.49659863;stroke:none"
+       id="path3771"
+       sodipodi:cx="8.5284595"
+       sodipodi:cy="7.9774284"
+       sodipodi:rx="1.294897"
+       sodipodi:ry="1.2502453"
+       d="m 9.8233565,7.9774284 a 1.294897,1.2502453 0 1 1 -2.5897939,0 1.294897,1.2502453 0 1 1 2.5897939,0 z"
+       transform="matrix(1.9306555,0,0,1.9996075,-5.9655177,-5.3517257)" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#000000;fill-opacity:0.49659863;fill-rule:nonzero;stroke:none"
+       id="path3773"
+       sodipodi:cx="20.6737"
+       sodipodi:cy="8.6025515"
+       sodipodi:rx="1.65211"
+       sodipodi:ry="1.6074584"
+       d="m 22.32581,8.6025515 a 1.65211,1.6074584 0 1 1 -3.30422,0 1.65211,1.6074584 0 1 1 3.30422,0 z"
+       transform="matrix(1.5132165,0,0,1.5552502,-9.7837844,-2.7791198)" />
+    <path
+       sodipodi:type="arc"
+       style="fill:none;stroke:#000000;stroke-width:2.03893589999999980;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:0.49803922;stroke-dasharray:none"
+       id="path3775"
+       sodipodi:cx="15.404809"
+       sodipodi:cy="21.105005"
+       sodipodi:rx="10.761041"
+       sodipodi:ry="8.1265945"
+       d="M 25.362788,24.185449 A 10.761041,8.1265945 0 0 1 5.4615288,24.21241"
+       sodipodi:start="0.38877722"
+       sodipodi:end="2.7492276"
+       transform="matrix(0.95177919,0,0,1.176954,1.5530282,-8.5017657)"
+       sodipodi:open="true" />
+  </g>
+</svg>
diff --git a/smilies_adult/icons/bong.gif b/smilies_adult/icons/bong.gif
index 16137140..2d06a652 100644
Binary files a/smilies_adult/icons/bong.gif and b/smilies_adult/icons/bong.gif differ
diff --git a/smilies_adult/icons/drunk.gif b/smilies_adult/icons/drunk.gif
index 59e687e1..1e433b12 100644
Binary files a/smilies_adult/icons/drunk.gif and b/smilies_adult/icons/drunk.gif differ
diff --git a/smilies_adult/icons/sperm.gif b/smilies_adult/icons/sperm.gif
index 1ecf3824..6ba92190 100644
Binary files a/smilies_adult/icons/sperm.gif and b/smilies_adult/icons/sperm.gif differ
diff --git a/smilies_adult/lang/C/messages.po b/smilies_adult/lang/C/messages.po
new file mode 100644
index 00000000..e69de29b
diff --git a/smilies_adult/smilies_adult.php b/smilies_adult/smilies_adult.php
index e8af21e1..c0095923 100644
--- a/smilies_adult/smilies_adult.php
+++ b/smilies_adult/smilies_adult.php
@@ -8,32 +8,36 @@
  * This is a template for how to extend the "smily" code.
  * 
  */
-
-use Friendica\App;
 use Friendica\Core\Hook;
-use Friendica\DI;
 
 function smilies_adult_install() {
 	Hook::register('smilie', 'addon/smilies_adult/smilies_adult.php', 'smilies_adult_smilies');
 }
 
-function smilies_adult_smilies(array &$b)
-{
+function smilies_adult_uninstall() {
+	Hook::unregister('smilie', 'addon/smilies_adult/smilies_adult.php', 'smilies_adult_smilies');
+}
+
+ 
+
+function smilies_adult_smilies(&$a,&$b) {
+
 	$b['texts'][] = '(o)(o)';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smilies_adult/icons/tits.gif' . '" alt="' . '(o)(o)' . '" />';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smilies_adult/icons/tits.gif' . '" alt="' . '(o)(o)' . '" />';
 
 	$b['texts'][] = '(.)(.)';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smilies_adult/icons/tits.gif' . '" alt="' . '(.)(.)' . '" />';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smilies_adult/icons/tits.gif' . '" alt="' . '(.)(.)' . '" />';
 
 	$b['texts'][] = ':bong';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smilies_adult/icons/bong.gif' . '" alt="' . ':bong' . '" />';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smilies_adult/icons/bong.gif' . '" alt="' . ':bong' . '" />';
 
 	$b['texts'][] = ':sperm';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smilies_adult/icons/sperm.gif' . '" alt="' . ':sperm' . '" />';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smilies_adult/icons/sperm.gif' . '" alt="' . ':sperm' . '" />';
 
 	$b['texts'][] = ':drunk';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smilies_adult/icons/drunk.gif' . '" alt="' . ':drunk' . '" />';
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smilies_adult/icons/drunk.gif' . '" alt="' . ':drunk' . '" />';
 
 	$b['texts'][] = ':finger';
-	$b['icons'][] = '<img class="smiley" src="' . DI::baseUrl() . '/addon/smilies_adult/icons/finger.gif' . '" alt="' . ':finger' . '" />';
-}
+	$b['icons'][] = '<img class="smiley" src="' . $a->getBaseURL() . '/addon/smilies_adult/icons/finger.gif' . '" alt="' . ':finger' . '" />';
+
+}
\ No newline at end of file
diff --git a/sniper/100x100.gif b/sniper/100x100.gif
new file mode 100644
index 00000000..33708302
Binary files /dev/null and b/sniper/100x100.gif differ
diff --git a/sniper/100x100.jpg b/sniper/100x100.jpg
new file mode 100644
index 00000000..002ea22b
Binary files /dev/null and b/sniper/100x100.jpg differ
diff --git a/sniper/100x75.jpg b/sniper/100x75.jpg
new file mode 100644
index 00000000..94d9462c
Binary files /dev/null and b/sniper/100x75.jpg differ
diff --git a/sniper/100x80.jpg b/sniper/100x80.jpg
new file mode 100644
index 00000000..0734ed15
Binary files /dev/null and b/sniper/100x80.jpg differ
diff --git a/sniper/120x90hotshotsniper.jpg b/sniper/120x90hotshotsniper.jpg
new file mode 100644
index 00000000..96ec1a97
Binary files /dev/null and b/sniper/120x90hotshotsniper.jpg differ
diff --git a/sniper/125x125.jpg b/sniper/125x125.jpg
new file mode 100644
index 00000000..7fd9e10d
Binary files /dev/null and b/sniper/125x125.jpg differ
diff --git a/sniper/140x90.jpg b/sniper/140x90.jpg
new file mode 100644
index 00000000..b2d4f1d3
Binary files /dev/null and b/sniper/140x90.jpg differ
diff --git a/sniper/150x150.jpg b/sniper/150x150.jpg
new file mode 100644
index 00000000..606d5f4c
Binary files /dev/null and b/sniper/150x150.jpg differ
diff --git a/sniper/160x86.gif b/sniper/160x86.gif
new file mode 100644
index 00000000..da72f3e9
Binary files /dev/null and b/sniper/160x86.gif differ
diff --git a/sniper/180x135.jpg b/sniper/180x135.jpg
new file mode 100644
index 00000000..3cf2fa0a
Binary files /dev/null and b/sniper/180x135.jpg differ
diff --git a/sniper/250x180.jpg b/sniper/250x180.jpg
new file mode 100644
index 00000000..6afb6342
Binary files /dev/null and b/sniper/250x180.jpg differ
diff --git a/sniper/300x200.jpg b/sniper/300x200.jpg
new file mode 100644
index 00000000..90aaefe4
Binary files /dev/null and b/sniper/300x200.jpg differ
diff --git a/sniper/300x300.jpg b/sniper/300x300.jpg
new file mode 100644
index 00000000..9edc48f7
Binary files /dev/null and b/sniper/300x300.jpg differ
diff --git a/sniper/32x32.jpg b/sniper/32x32.jpg
new file mode 100644
index 00000000..8e5eb4a6
Binary files /dev/null and b/sniper/32x32.jpg differ
diff --git a/sniper/335x185.jpg b/sniper/335x185.jpg
new file mode 100644
index 00000000..15d2e768
Binary files /dev/null and b/sniper/335x185.jpg differ
diff --git a/sniper/60x60.jpg b/sniper/60x60.jpg
new file mode 100644
index 00000000..760c9a47
Binary files /dev/null and b/sniper/60x60.jpg differ
diff --git a/sniper/64x64.gif b/sniper/64x64.gif
new file mode 100644
index 00000000..cbb89e66
Binary files /dev/null and b/sniper/64x64.gif differ
diff --git a/sniper/70x45.jpg b/sniper/70x45.jpg
new file mode 100644
index 00000000..64c1aae0
Binary files /dev/null and b/sniper/70x45.jpg differ
diff --git a/sniper/70x60.jpg b/sniper/70x60.jpg
new file mode 100644
index 00000000..7415a0d2
Binary files /dev/null and b/sniper/70x60.jpg differ
diff --git a/sniper/73x80.jpg b/sniper/73x80.jpg
new file mode 100644
index 00000000..c1d5f993
Binary files /dev/null and b/sniper/73x80.jpg differ
diff --git a/sniper/75x57.jpg b/sniper/75x57.jpg
new file mode 100644
index 00000000..a0dd0bc7
Binary files /dev/null and b/sniper/75x57.jpg differ
diff --git a/sniper/80x60.jpg b/sniper/80x60.jpg
new file mode 100644
index 00000000..69a06a39
Binary files /dev/null and b/sniper/80x60.jpg differ
diff --git a/sniper/80x70.jpg b/sniper/80x70.jpg
new file mode 100644
index 00000000..a906d7cc
Binary files /dev/null and b/sniper/80x70.jpg differ
diff --git a/sniper/80x80hotshotsniper.jpg b/sniper/80x80hotshotsniper.jpg
new file mode 100644
index 00000000..65e5a41c
Binary files /dev/null and b/sniper/80x80hotshotsniper.jpg differ
diff --git a/sniper/81x67.jpg b/sniper/81x67.jpg
new file mode 100644
index 00000000..757f4b01
Binary files /dev/null and b/sniper/81x67.jpg differ
diff --git a/sniper/description_etc.txt b/sniper/description_etc.txt
new file mode 100644
index 00000000..bda05ff5
--- /dev/null
+++ b/sniper/description_etc.txt
@@ -0,0 +1,11 @@
+Description:
+
+Shoot the targets with your sniper rifle!
+
+Instructions:
+
+Use your mouse to aim and shoot. Press R or Shift to Reload Press Space to use your Scope.
+
+Dimensions:
+
+620x480
\ No newline at end of file
diff --git a/sniper/hotshotsniper.html b/sniper/hotshotsniper.html
new file mode 100644
index 00000000..8a39b0b0
--- /dev/null
+++ b/sniper/hotshotsniper.html
@@ -0,0 +1,15 @@
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+<title>hotshotsniper</title>
+</head>
+<body bgcolor="#000000">
+<!--url's used in the movie-->
+<!--text used in the movie-->
+<!-- saved from url=(0013)about:internet -->
+<object classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" codebase="http://fpdownload.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=8,0,0,0" width="620" height="480" id="hotshotsniper" align="middle">
+<param name="allowScriptAccess" value="sameDomain" />
+<param name="movie" value="hotshotsniper.swf" /><param name="quality" value="high" /><param name="bgcolor" value="#000000" /><embed src="hotshotsniper.swf" quality="high" bgcolor="#000000" width="620" height="480" name="hotshotsniper" align="middle" allowScriptAccess="sameDomain" type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/go/getflashplayer" />
+</object>
+</body>
+</html>
diff --git a/sniper/hotshotsniper.swf b/sniper/hotshotsniper.swf
new file mode 100644
index 00000000..b03284a6
Binary files /dev/null and b/sniper/hotshotsniper.swf differ
diff --git a/sniper/lang/C/messages.po b/sniper/lang/C/messages.po
new file mode 100644
index 00000000..e69de29b
diff --git a/sniper/sniper.php b/sniper/sniper.php
new file mode 100644
index 00000000..72300838
--- /dev/null
+++ b/sniper/sniper.php
@@ -0,0 +1,42 @@
+<?php
+
+/**
+ * Demo addon for adding various types of Flash games to Friendica.
+ * In this case we're using "Hot Shot Sniper" by FlashGames247
+ *
+ * Name: Sniper
+ * Description: Basic demonstration of flash game addons for Friendica
+ * Version: 1.0
+ * Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
+ */
+use Friendica\Core\Hook;
+
+function sniper_install() {
+    Hook::register('app_menu', 'addon/sniper/sniper.php', 'sniper_app_menu');
+}
+
+function sniper_uninstall() {
+    Hook::unregister('app_menu', 'addon/sniper/sniper.php', 'sniper_app_menu');
+
+}
+
+function sniper_app_menu($a,&$b) {
+    $b['app_menu'][] = '<div class="app-title"><a href="sniper">Hot Shot Sniper</a></div>';
+}
+
+
+function sniper_module() {}
+
+function sniper_content(&$a) {
+
+$baseurl = $a->getBaseURL() . '/addon/sniper';
+
+$o .= <<< EOT
+<object classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" codebase="http://fpdownload.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=8,0,0,0" width="620" height="480" id="hotshotsniper" align="middle">
+<param name="allowScriptAccess" value="sameDomain" />
+<param name="movie" value="$baseurl/hotshotsniper.swf" /><param name="quality" value="high" /><param name="bgcolor" value="#000000" /><embed src="$baseurl/hotshotsniper.swf" quality="high" bgcolor="#000000" width="620" height="480" name="hotshotsniper" align="middle" allowScriptAccess="sameDomain" type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/go/getflashplayer" />
+</object>
+EOT;
+
+return $o;
+}
diff --git a/startpage/lang/C/messages.po b/startpage/lang/C/messages.po
index 8a011403..4c2b8a1d 100644
--- a/startpage/lang/C/messages.po
+++ b/startpage/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:16-0500\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,14 +17,18 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: startpage.php:70
+#: startpage.php:83
+msgid "Startpage Settings"
+msgstr ""
+
+#: startpage.php:85
 msgid "Home page to load after login  - leave blank for profile wall"
 msgstr ""
 
-#: startpage.php:70
-msgid "Examples: \"network\" or \"notifications/system\""
+#: startpage.php:88
+msgid "Examples: &quot;network&quot; or &quot;notifications/system&quot;"
 msgstr ""
 
-#: startpage.php:75
-msgid "Startpage"
+#: startpage.php:92
+msgid "Submit"
 msgstr ""
diff --git a/startpage/lang/ar/messages.po b/startpage/lang/ar/messages.po
deleted file mode 100644
index 85a1106e..00000000
--- a/startpage/lang/ar/messages.po
+++ /dev/null
@@ -1,36 +0,0 @@
-# ADDON startpage
-# Copyright (C)
-# This file is distributed under the same license as the Friendica startpage addon package.
-# 
-# 
-# Translators:
-# Farida Khalaf <faridakhalaf@hotmail.com>, 2021
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2021-02-20 05:31+0000\n"
-"Last-Translator: Farida Khalaf <faridakhalaf@hotmail.com>\n"
-"Language-Team: Arabic (http://www.transifex.com/Friendica/friendica/language/ar/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ar\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-
-#: startpage.php:74 startpage.php:78
-msgid "Startpage"
-msgstr "بدأ الصفحة"
-
-#: startpage.php:81
-msgid "Home page to load after login  - leave blank for profile wall"
-msgstr "الصفحة الرئيسية للتحميل بعد تسجيل الدخول - اتركها فارغة لصفحة الملف الشخصي"
-
-#: startpage.php:84
-msgid "Examples: &quot;network&quot; or &quot;notifications/system&quot;"
-msgstr "أمثلة: &quot;network&quot; or &quot;notifications/system&quot;"
-
-#: startpage.php:88
-msgid "Save Settings"
-msgstr "حفظ الإعدادات"
diff --git a/startpage/lang/ar/strings.php b/startpage/lang/ar/strings.php
deleted file mode 100644
index 85d75556..00000000
--- a/startpage/lang/ar/strings.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_ar")) {
-function string_plural_select_ar($n){
-	$n = intval($n);
-	if ($n==0) { return 0; } else if ($n==1) { return 1; } else if ($n==2) { return 2; } else if ($n%100>=3 && $n%100<=10) { return 3; } else if ($n%100>=11 && $n%100<=99) { return 4; } else  { return 5; }
-}}
-$a->strings['Startpage'] = 'بدأ الصفحة';
-$a->strings['Home page to load after login  - leave blank for profile wall'] = 'الصفحة الرئيسية للتحميل بعد تسجيل الدخول - اتركها فارغة لصفحة الملف الشخصي';
-$a->strings['Examples: &quot;network&quot; or &quot;notifications/system&quot;'] = 'أمثلة: &quot;network&quot; or &quot;notifications/system&quot;';
-$a->strings['Save Settings'] = 'حفظ الإعدادات';
diff --git a/startpage/lang/cs/strings.php b/startpage/lang/cs/strings.php
index f13a1374..c0f19438 100644
--- a/startpage/lang/cs/strings.php
+++ b/startpage/lang/cs/strings.php
@@ -3,9 +3,10 @@
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
 	$n = intval($n);
-	if (($n == 1 && $n % 1 == 0)) { return 0; } else if (($n >= 2 && $n <= 4 && $n % 1 == 0)) { return 1; } else if (($n % 1 != 0 )) { return 2; } else  { return 3; }
+	return ($n == 1 && $n % 1 == 0) ? 0 : ($n >= 2 && $n <= 4 && $n % 1 == 0) ? 1: ($n % 1 != 0 ) ? 2 : 3;;
 }}
-$a->strings['Startpage Settings'] = 'Nastavení startovní stránky';
-$a->strings['Home page to load after login  - leave blank for profile wall'] = 'Domovská stránka k načtení po přihlášení  - pro profilovou zeď ponechejte prázdné';
-$a->strings['Examples: &quot;network&quot; or &quot;notifications/system&quot;'] = 'Příklady: &quot;network&quot; nebo &quot;notifications/system&quot;';
-$a->strings['Submit'] = 'Odeslat';
+;
+$a->strings["Startpage Settings"] = "Nastavení startovní stránky";
+$a->strings["Home page to load after login  - leave blank for profile wall"] = "Domovská stránka k načtení po přihlášení  - pro profilovou zeď ponechejte prázdné";
+$a->strings["Examples: &quot;network&quot; or &quot;notifications/system&quot;"] = "Příklady: &quot;network&quot; nebo &quot;notifications/system&quot;";
+$a->strings["Submit"] = "Odeslat";
diff --git a/startpage/lang/da-dk/messages.po b/startpage/lang/da-dk/messages.po
deleted file mode 100644
index 2d7419e0..00000000
--- a/startpage/lang/da-dk/messages.po
+++ /dev/null
@@ -1,32 +0,0 @@
-# ADDON startpage
-# Copyright (C)
-# This file is distributed under the same license as the Friendica startpage addon package.
-# 
-# 
-# Translators:
-# Anton <dev@atjn.dk>, 2022
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:16-0500\n"
-"PO-Revision-Date: 2014-06-23 12:51+0000\n"
-"Last-Translator: Anton <dev@atjn.dk>, 2022\n"
-"Language-Team: Danish (Denmark) (http://www.transifex.com/Friendica/friendica/language/da_DK/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: da_DK\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: startpage.php:70
-msgid "Home page to load after login  - leave blank for profile wall"
-msgstr "Den side som skal vises efter login - efterlad blank for profilvæggen"
-
-#: startpage.php:70
-msgid "Examples: \"network\" or \"notifications/system\""
-msgstr "Eksempler: \"network\" eller \"notifications/system\""
-
-#: startpage.php:75
-msgid "Startpage"
-msgstr "Startside"
diff --git a/startpage/lang/da-dk/strings.php b/startpage/lang/da-dk/strings.php
deleted file mode 100644
index 916c21c3..00000000
--- a/startpage/lang/da-dk/strings.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_da_dk")) {
-function string_plural_select_da_dk($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Home page to load after login  - leave blank for profile wall'] = 'Den side som skal vises efter login - efterlad blank for profilvæggen';
-$a->strings['Examples: "network" or "notifications/system"'] = 'Eksempler: "network" eller "notifications/system"';
-$a->strings['Startpage'] = 'Startside';
diff --git a/startpage/lang/de/messages.po b/startpage/lang/de/messages.po
index f8b4ddbc..17a9bc8f 100644
--- a/startpage/lang/de/messages.po
+++ b/startpage/lang/de/messages.po
@@ -4,30 +4,33 @@
 # 
 # 
 # Translators:
-# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2014-2015
-# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2021-2022
+# bavatar <tobias.diekershoff@gmx.net>, 2014-2015
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:16-0500\n"
-"PO-Revision-Date: 2014-06-23 12:51+0000\n"
-"Last-Translator: Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2021-2022\n"
-"Language-Team: German (http://app.transifex.com/Friendica/friendica/language/de/)\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2015-07-26 10:56+0000\n"
+"Last-Translator: bavatar <tobias.diekershoff@gmx.net>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/friendica/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: startpage.php:70
+#: startpage.php:83
+msgid "Startpage Settings"
+msgstr "Startseiten-Einstellungen"
+
+#: startpage.php:85
 msgid "Home page to load after login  - leave blank for profile wall"
 msgstr "Seite, die nach dem Anmelden geladen werden soll. Leer = Pinnwand"
 
-#: startpage.php:70
-msgid "Examples: \"network\" or \"notifications/system\""
-msgstr "Beispiele: \"network\" oder \"notifications/system\""
+#: startpage.php:88
+msgid "Examples: &quot;network&quot; or &quot;notifications/system&quot;"
+msgstr "Beispiele: network, notifications/system"
 
-#: startpage.php:75
-msgid "Startpage"
-msgstr "Startpage"
+#: startpage.php:92
+msgid "Submit"
+msgstr "Senden"
diff --git a/startpage/lang/de/strings.php b/startpage/lang/de/strings.php
index c9c59d8b..326b58ce 100644
--- a/startpage/lang/de/strings.php
+++ b/startpage/lang/de/strings.php
@@ -2,9 +2,10 @@
 
 if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Home page to load after login  - leave blank for profile wall'] = 'Seite, die nach dem Anmelden geladen werden soll. Leer = Pinnwand';
-$a->strings['Examples: "network" or "notifications/system"'] = 'Beispiele: "network" oder "notifications/system"';
-$a->strings['Startpage'] = 'Startpage';
+;
+$a->strings["Startpage Settings"] = "Startseiten-Einstellungen";
+$a->strings["Home page to load after login  - leave blank for profile wall"] = "Seite, die nach dem Anmelden geladen werden soll. Leer = Pinnwand";
+$a->strings["Examples: &quot;network&quot; or &quot;notifications/system&quot;"] = "Beispiele: network, notifications/system";
+$a->strings["Submit"] = "Senden";
diff --git a/startpage/lang/es/messages.po b/startpage/lang/es/messages.po
index df56d227..a2e75db5 100644
--- a/startpage/lang/es/messages.po
+++ b/startpage/lang/es/messages.po
@@ -5,14 +5,13 @@
 # 
 # Translators:
 # Albert, 2016
-# Senex Petrovic <javierruizo@hotmail.com>, 2021
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2021-04-06 02:09+0000\n"
-"Last-Translator: Senex Petrovic <javierruizo@hotmail.com>\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2016-11-17 22:39+0000\n"
+"Last-Translator: Albert\n"
 "Language-Team: Spanish (http://www.transifex.com/Friendica/friendica/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,18 +19,18 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: startpage.php:74 startpage.php:78
-msgid "Startpage"
-msgstr "Página de Inicio"
+#: startpage.php:83
+msgid "Startpage Settings"
+msgstr "Ajustes de Startpage"
 
-#: startpage.php:81
+#: startpage.php:85
 msgid "Home page to load after login  - leave blank for profile wall"
 msgstr "Página principal a cargar tras el acceso - dejar en blanco para el muro de perfil"
 
-#: startpage.php:84
+#: startpage.php:88
 msgid "Examples: &quot;network&quot; or &quot;notifications/system&quot;"
 msgstr "Ejemplos: &quot;network&quot; o &quot;notifications/system&quot;"
 
-#: startpage.php:88
-msgid "Save Settings"
-msgstr "Guardar ajustes"
+#: startpage.php:92
+msgid "Submit"
+msgstr "Enviar"
diff --git a/startpage/lang/es/strings.php b/startpage/lang/es/strings.php
index 8ffdc38f..bbd8aedd 100644
--- a/startpage/lang/es/strings.php
+++ b/startpage/lang/es/strings.php
@@ -2,10 +2,10 @@
 
 if(! function_exists("string_plural_select_es")) {
 function string_plural_select_es($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Startpage'] = 'Página de Inicio';
-$a->strings['Home page to load after login  - leave blank for profile wall'] = 'Página principal a cargar tras el acceso - dejar en blanco para el muro de perfil';
-$a->strings['Examples: &quot;network&quot; or &quot;notifications/system&quot;'] = 'Ejemplos: &quot;network&quot; o &quot;notifications/system&quot;';
-$a->strings['Save Settings'] = 'Guardar ajustes';
+;
+$a->strings["Startpage Settings"] = "Ajustes de Startpage";
+$a->strings["Home page to load after login  - leave blank for profile wall"] = "Página principal a cargar tras el acceso - dejar en blanco para el muro de perfil";
+$a->strings["Examples: &quot;network&quot; or &quot;notifications/system&quot;"] = "Ejemplos: &quot;network&quot; o &quot;notifications/system&quot;";
+$a->strings["Submit"] = "Enviar";
diff --git a/startpage/lang/fi-fi/strings.php b/startpage/lang/fi-fi/strings.php
index 709bfa3d..53c954ab 100644
--- a/startpage/lang/fi-fi/strings.php
+++ b/startpage/lang/fi-fi/strings.php
@@ -2,8 +2,10 @@
 
 if(! function_exists("string_plural_select_fi_fi")) {
 function string_plural_select_fi_fi($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Startpage Settings'] = 'Startpage -asetukset';
-$a->strings['Submit'] = 'Lähetä';
+;
+$a->strings["Startpage Settings"] = "Startpage -asetukset";
+$a->strings["Home page to load after login  - leave blank for profile wall"] = "";
+$a->strings["Examples: &quot;network&quot; or &quot;notifications/system&quot;"] = "";
+$a->strings["Submit"] = "Lähetä";
diff --git a/startpage/lang/fr/messages.po b/startpage/lang/fr/messages.po
index 92447421..b7c02a19 100644
--- a/startpage/lang/fr/messages.po
+++ b/startpage/lang/fr/messages.po
@@ -4,32 +4,33 @@
 # 
 # 
 # Translators:
-# Hypolite Petovan <hypolite@mrpetovan.com>, 2022
-# Nicolas Derive, 2022
-# ea1cd8241cb389ffb6f92bc6891eff5d_dc12308 <70dced5587d47e18d88f9298024d96f8_93383>, 2015
-# Vincent Vindarel <vindarel@mailz.org>, 2018
+# Nicola Spanti <translations@nicola-spanti.info>, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:16-0500\n"
-"PO-Revision-Date: 2014-06-23 12:51+0000\n"
-"Last-Translator: Nicolas Derive, 2022\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2015-08-30 17:20+0000\n"
+"Last-Translator: Nicola Spanti <translations@nicola-spanti.info>\n"
 "Language-Team: French (http://www.transifex.com/Friendica/friendica/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fr\n"
-"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: startpage.php:70
+#: startpage.php:83
+msgid "Startpage Settings"
+msgstr "Paramètres de Startpage"
+
+#: startpage.php:85
 msgid "Home page to load after login  - leave blank for profile wall"
-msgstr "Page d'accueil à charger après authentification - laisser ce champ vide pour charger votre mur"
+msgstr ""
 
-#: startpage.php:70
-msgid "Examples: \"network\" or \"notifications/system\""
-msgstr "Exemples : \"network\" ou \"notifications/system\""
+#: startpage.php:88
+msgid "Examples: &quot;network&quot; or &quot;notifications/system&quot;"
+msgstr ""
 
-#: startpage.php:75
-msgid "Startpage"
-msgstr "Startpage"
+#: startpage.php:92
+msgid "Submit"
+msgstr "Envoyer"
diff --git a/startpage/lang/fr/strings.php b/startpage/lang/fr/strings.php
index 757ca26a..d3d3f9b9 100644
--- a/startpage/lang/fr/strings.php
+++ b/startpage/lang/fr/strings.php
@@ -2,9 +2,10 @@
 
 if(! function_exists("string_plural_select_fr")) {
 function string_plural_select_fr($n){
-	$n = intval($n);
-	if (($n == 0 || $n == 1)) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
+	return ($n > 1);;
 }}
-$a->strings['Home page to load after login  - leave blank for profile wall'] = 'Page d\'accueil à charger après authentification - laisser ce champ vide pour charger votre mur';
-$a->strings['Examples: "network" or "notifications/system"'] = 'Exemples : "network" ou "notifications/system"';
-$a->strings['Startpage'] = 'Startpage';
+;
+$a->strings["Startpage Settings"] = "Paramètres de Startpage";
+$a->strings["Home page to load after login  - leave blank for profile wall"] = "";
+$a->strings["Examples: &quot;network&quot; or &quot;notifications/system&quot;"] = "";
+$a->strings["Submit"] = "Envoyer";
diff --git a/startpage/lang/hu/messages.po b/startpage/lang/hu/messages.po
deleted file mode 100644
index be4382be..00000000
--- a/startpage/lang/hu/messages.po
+++ /dev/null
@@ -1,33 +0,0 @@
-# ADDON startpage
-# Copyright (C)
-# This file is distributed under the same license as the Friendica startpage addon package.
-# 
-# 
-# Translators:
-# Balázs Úr, 2020-2021
-# Kastal András <kastal@gmail.com>, 2018
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:16-0500\n"
-"PO-Revision-Date: 2014-06-23 12:51+0000\n"
-"Last-Translator: Balázs Úr, 2020-2021\n"
-"Language-Team: Hungarian (http://www.transifex.com/Friendica/friendica/language/hu/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: hu\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: startpage.php:70
-msgid "Home page to load after login  - leave blank for profile wall"
-msgstr "Betöltendő kezdőoldal bejelentkezés után – hagyja üresen a profilfalhoz"
-
-#: startpage.php:70
-msgid "Examples: \"network\" or \"notifications/system\""
-msgstr "Példák: „network” vagy „notifications/system”"
-
-#: startpage.php:75
-msgid "Startpage"
-msgstr "Kezdőlap"
diff --git a/startpage/lang/hu/strings.php b/startpage/lang/hu/strings.php
deleted file mode 100644
index 36e6655b..00000000
--- a/startpage/lang/hu/strings.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_hu")) {
-function string_plural_select_hu($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Home page to load after login  - leave blank for profile wall'] = 'Betöltendő kezdőoldal bejelentkezés után – hagyja üresen a profilfalhoz';
-$a->strings['Examples: "network" or "notifications/system"'] = 'Példák: „network” vagy „notifications/system”';
-$a->strings['Startpage'] = 'Kezdőlap';
diff --git a/startpage/lang/is/strings.php b/startpage/lang/is/strings.php
index 81df5d94..afd3d84a 100644
--- a/startpage/lang/is/strings.php
+++ b/startpage/lang/is/strings.php
@@ -3,9 +3,10 @@
 if(! function_exists("string_plural_select_is")) {
 function string_plural_select_is($n){
 	$n = intval($n);
-	return intval($n % 10 != 1 || $n % 100 == 11);
+	return ($n % 10 != 1 || $n % 100 == 11);;
 }}
-$a->strings['Startpage Settings'] = 'Stillingar upphafssíðu';
-$a->strings['Home page to load after login  - leave blank for profile wall'] = 'Heimasíða sem á að hlaða inn eftir innskráningu - skilja eftir autt til að fá forsíðu notanda';
-$a->strings['Examples: &quot;network&quot; or &quot;notifications/system&quot;'] = 'Dæmi: &quot;netkerfi&quot; eða &quot;tilkynningar/kerfi&quot;';
-$a->strings['Submit'] = 'Senda inn';
+;
+$a->strings["Startpage Settings"] = "Stillingar upphafssíðu";
+$a->strings["Home page to load after login  - leave blank for profile wall"] = "Heimasíða sem á að hlaða inn eftir innskráningu - skilja eftir autt til að fá forsíðu notanda";
+$a->strings["Examples: &quot;network&quot; or &quot;notifications/system&quot;"] = "Dæmi: &quot;netkerfi&quot; eða &quot;tilkynningar/kerfi&quot;";
+$a->strings["Submit"] = "Senda inn";
diff --git a/startpage/lang/it/messages.po b/startpage/lang/it/messages.po
index efabb8f0..3d572900 100644
--- a/startpage/lang/it/messages.po
+++ b/startpage/lang/it/messages.po
@@ -5,29 +5,32 @@
 # 
 # Translators:
 # fabrixxm <fabrix.xm@gmail.com>, 2014-2015
-# Sylke Vicious <silkevicious@gmail.com>, 2021,2023
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:16-0500\n"
-"PO-Revision-Date: 2014-06-23 12:51+0000\n"
-"Last-Translator: Sylke Vicious <silkevicious@gmail.com>, 2021,2023\n"
-"Language-Team: Italian (http://app.transifex.com/Friendica/friendica/language/it/)\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2017-09-20 06:08+0000\n"
+"Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n"
+"Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: it\n"
-"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: startpage.php:70
+#: startpage.php:83
+msgid "Startpage Settings"
+msgstr "Impostazioni Startpage"
+
+#: startpage.php:85
 msgid "Home page to load after login  - leave blank for profile wall"
 msgstr "Home page da caricare dopo il login - lasciare in bianco per la bacheca"
 
-#: startpage.php:70
-msgid "Examples: \"network\" or \"notifications/system\""
-msgstr "Esempi: \"rete\" o \"notifiche/sistema\""
+#: startpage.php:88
+msgid "Examples: &quot;network&quot; or &quot;notifications/system&quot;"
+msgstr "Esempi: &quot;network&quot; or &quot;notifications/system&quot;"
 
-#: startpage.php:75
-msgid "Startpage"
-msgstr "Pagina iniziale"
+#: startpage.php:92
+msgid "Submit"
+msgstr "Invia"
diff --git a/startpage/lang/it/strings.php b/startpage/lang/it/strings.php
index 111a2abb..0226f923 100644
--- a/startpage/lang/it/strings.php
+++ b/startpage/lang/it/strings.php
@@ -2,9 +2,10 @@
 
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
-	$n = intval($n);
-	if ($n == 1) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
+	return ($n != 1);;
 }}
-$a->strings['Home page to load after login  - leave blank for profile wall'] = 'Home page da caricare dopo il login - lasciare in bianco per la bacheca';
-$a->strings['Examples: "network" or "notifications/system"'] = 'Esempi: "rete" o "notifiche/sistema"';
-$a->strings['Startpage'] = 'Pagina iniziale';
+;
+$a->strings["Startpage Settings"] = "Impostazioni Startpage";
+$a->strings["Home page to load after login  - leave blank for profile wall"] = "Home page da caricare dopo il login - lasciare in bianco per la bacheca";
+$a->strings["Examples: &quot;network&quot; or &quot;notifications/system&quot;"] = "Esempi: &quot;network&quot; or &quot;notifications/system&quot;";
+$a->strings["Submit"] = "Invia";
diff --git a/startpage/lang/nl/strings.php b/startpage/lang/nl/strings.php
index f50ae057..6521128b 100644
--- a/startpage/lang/nl/strings.php
+++ b/startpage/lang/nl/strings.php
@@ -3,6 +3,10 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Startpage Settings'] = 'Startpagina instellingen';
+;
+$a->strings["Startpage Settings"] = "Startpagina instellingen";
+$a->strings["Home page to load after login  - leave blank for profile wall"] = "";
+$a->strings["Examples: &quot;network&quot; or &quot;notifications/system&quot;"] = "";
+$a->strings["Submit"] = "";
diff --git a/startpage/lang/pl/messages.po b/startpage/lang/pl/messages.po
index e3fac55d..f6c05c3a 100644
--- a/startpage/lang/pl/messages.po
+++ b/startpage/lang/pl/messages.po
@@ -4,15 +4,14 @@
 # 
 # 
 # Translators:
-# Piotr Strębski <strebski@gmail.com>, 2022
-# Waldemar Stoczkowski, 2018
+# Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:16-0500\n"
-"PO-Revision-Date: 2014-06-23 12:51+0000\n"
-"Last-Translator: Piotr Strębski <strebski@gmail.com>, 2022\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2018-04-18 20:55+0000\n"
+"Last-Translator: Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.com/Friendica/friendica/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,14 +19,18 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
-#: startpage.php:70
+#: startpage.php:83
+msgid "Startpage Settings"
+msgstr "Ustawienia strony startowej"
+
+#: startpage.php:85
 msgid "Home page to load after login  - leave blank for profile wall"
-msgstr "Strona główna do wczytania po zalogowaniu - pozostaw puste pole dla strony profilowej"
+msgstr "Strona główna do załadowania po zalogowaniu - pozostaw puste pole dla strony profilowej"
 
-#: startpage.php:70
-msgid "Examples: \"network\" or \"notifications/system\""
-msgstr "Przykłady: \"network\" lub \"notifications/system\""
+#: startpage.php:88
+msgid "Examples: &quot;network&quot; or &quot;notifications/system&quot;"
+msgstr "Przykłady: &quot;network&quot; lub &quot;notifications/system&quot; albo &quot;profile/Nazwa profilu&quot;"
 
-#: startpage.php:75
-msgid "Startpage"
-msgstr "Strona startowa"
+#: startpage.php:92
+msgid "Submit"
+msgstr "Prześlij"
diff --git a/startpage/lang/pl/strings.php b/startpage/lang/pl/strings.php
index 9f89c067..e0b868ba 100644
--- a/startpage/lang/pl/strings.php
+++ b/startpage/lang/pl/strings.php
@@ -2,9 +2,10 @@
 
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
-	$n = intval($n);
-	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
+	return ($n==1 ? 0 : ($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14) ? 1 : $n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14) ? 2 : 3);;
 }}
-$a->strings['Home page to load after login  - leave blank for profile wall'] = 'Strona główna do wczytania po zalogowaniu - pozostaw puste pole dla strony profilowej';
-$a->strings['Examples: "network" or "notifications/system"'] = 'Przykłady: "network" lub "notifications/system"';
-$a->strings['Startpage'] = 'Strona startowa';
+;
+$a->strings["Startpage Settings"] = "Ustawienia strony startowej";
+$a->strings["Home page to load after login  - leave blank for profile wall"] = "Strona główna do załadowania po zalogowaniu - pozostaw puste pole dla strony profilowej";
+$a->strings["Examples: &quot;network&quot; or &quot;notifications/system&quot;"] = "Przykłady: &quot;network&quot; lub &quot;notifications/system&quot; albo &quot;profile/Nazwa profilu&quot;";
+$a->strings["Submit"] = "Prześlij";
diff --git a/startpage/lang/ro/strings.php b/startpage/lang/ro/strings.php
index b67757d8..701b5f9a 100644
--- a/startpage/lang/ro/strings.php
+++ b/startpage/lang/ro/strings.php
@@ -2,10 +2,10 @@
 
 if(! function_exists("string_plural_select_ro")) {
 function string_plural_select_ro($n){
-	$n = intval($n);
-	if ($n==1) { return 0; } else if ((($n%100>19)||(($n%100==0)&&($n!=0)))) { return 2; } else  { return 1; }
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
 }}
-$a->strings['Startpage'] = 'Startpage';
-$a->strings['Home page to load after login  - leave blank for profile wall'] = 'Pagina de întâmpinare ce va fi încărcată după autentificare - lăsați necompletat pentru perete de profil';
-$a->strings['Examples: &quot;network&quot; or &quot;notifications/system&quot;'] = 'Exemple: &quot;rețea&quot; sau &quot;notificări/sistem&quot;';
-$a->strings['Save Settings'] = 'Salvare Configurări';
+;
+$a->strings["Startpage"] = "Startpage";
+$a->strings["Home page to load after login  - leave blank for profile wall"] = "Pagina de întâmpinare ce va fi încărcată după autentificare - lăsați necompletat pentru perete de profil";
+$a->strings["Examples: &quot;network&quot; or &quot;notifications/system&quot;"] = "Exemple: &quot;rețea&quot; sau &quot;notificări/sistem&quot;";
+$a->strings["Save Settings"] = "Salvare Configurări";
diff --git a/startpage/lang/ru/messages.po b/startpage/lang/ru/messages.po
deleted file mode 100644
index 6c2a0852..00000000
--- a/startpage/lang/ru/messages.po
+++ /dev/null
@@ -1,32 +0,0 @@
-# ADDON startpage
-# Copyright (C)
-# This file is distributed under the same license as the Friendica startpage addon package.
-# 
-# 
-# Translators:
-# Alexander An <ravnina@gmail.com>, 2022
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:16-0500\n"
-"PO-Revision-Date: 2014-06-23 12:51+0000\n"
-"Last-Translator: Alexander An <ravnina@gmail.com>, 2022\n"
-"Language-Team: Russian (http://www.transifex.com/Friendica/friendica/language/ru/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ru\n"
-"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
-
-#: startpage.php:70
-msgid "Home page to load after login  - leave blank for profile wall"
-msgstr "Стартовая страница, которая будет загружаться после логина. Оставьте пустым для загрузки страницы профиля."
-
-#: startpage.php:70
-msgid "Examples: \"network\" or \"notifications/system\""
-msgstr "Примеры: \"network\" или \"notifications/system\""
-
-#: startpage.php:75
-msgid "Startpage"
-msgstr "Стартовая страница"
diff --git a/startpage/lang/ru/strings.php b/startpage/lang/ru/strings.php
index 0a48afaf..361b40b3 100644
--- a/startpage/lang/ru/strings.php
+++ b/startpage/lang/ru/strings.php
@@ -1,10 +1,6 @@
-<?php
-
-if(! function_exists("string_plural_select_ru")) {
-function string_plural_select_ru($n){
-	$n = intval($n);
-	if ($n%10==1 && $n%100!=11) { return 0; } else if ($n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14)) { return 1; } else if ($n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)) { return 2; } else  { return 3; }
-}}
-$a->strings['Home page to load after login  - leave blank for profile wall'] = 'Стартовая страница, которая будет загружаться после логина. Оставьте пустым для загрузки страницы профиля.';
-$a->strings['Examples: "network" or "notifications/system"'] = 'Примеры: "network" или "notifications/system"';
-$a->strings['Startpage'] = 'Стартовая страница';
+<?php
+
+$a->strings["Startpage Settings"] = "";
+$a->strings["Home page to load after login  - leave blank for profile wall"] = "";
+$a->strings["Examples: &quot;network&quot; or &quot;notifications/system&quot;"] = "";
+$a->strings["Submit"] = "Подтвердить";
diff --git a/startpage/lang/sv/messages.po b/startpage/lang/sv/messages.po
deleted file mode 100644
index 4790e37a..00000000
--- a/startpage/lang/sv/messages.po
+++ /dev/null
@@ -1,31 +0,0 @@
-# ADDON startpage
-# Copyright (C)
-# This file is distributed under the same license as the Friendica startpage addon package.
-# 
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:16-0500\n"
-"PO-Revision-Date: 2021-12-22 15:27+0000\n"
-"Last-Translator: Transifex Bot <>\n"
-"Language-Team: Swedish (http://www.transifex.com/Friendica/friendica/language/sv/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: sv\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: startpage.php:70
-msgid "Home page to load after login  - leave blank for profile wall"
-msgstr ""
-
-#: startpage.php:70
-msgid "Examples: \"network\" or \"notifications/system\""
-msgstr ""
-
-#: startpage.php:75
-msgid "Startpage"
-msgstr ""
diff --git a/startpage/lang/sv/strings.php b/startpage/lang/sv/strings.php
index 72e9772f..3ec569a7 100644
--- a/startpage/lang/sv/strings.php
+++ b/startpage/lang/sv/strings.php
@@ -1,7 +1,3 @@
-<?php
-
-if(! function_exists("string_plural_select_sv")) {
-function string_plural_select_sv($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
+<?php
+
+$a->strings["Submit"] = "Spara";
diff --git a/startpage/lang/zh-cn/strings.php b/startpage/lang/zh-cn/strings.php
index 5cf45d11..45d71c36 100644
--- a/startpage/lang/zh-cn/strings.php
+++ b/startpage/lang/zh-cn/strings.php
@@ -3,7 +3,10 @@
 if(! function_exists("string_plural_select_zh_cn")) {
 function string_plural_select_zh_cn($n){
 	$n = intval($n);
-	return intval(0);
+	return 0;;
 }}
-$a->strings['Startpage Settings'] = '首页设置';
-$a->strings['Submit'] = '提交';
+;
+$a->strings["Startpage Settings"] = "首页设置";
+$a->strings["Home page to load after login  - leave blank for profile wall"] = "";
+$a->strings["Examples: &quot;network&quot; or &quot;notifications/system&quot;"] = "";
+$a->strings["Submit"] = "提交";
diff --git a/startpage/startpage.css b/startpage/startpage.css
new file mode 100644
index 00000000..e78be7ec
--- /dev/null
+++ b/startpage/startpage.css
@@ -0,0 +1,16 @@
+
+
+
+#startpage-page-label {
+	float: left;
+	width: 200px;
+	margin-bottom: 25px;
+}
+
+#startpage-page {
+	float: left;
+}
+
+#startpage-desc {
+	margin-bottom: 10px;
+}
diff --git a/startpage/startpage.php b/startpage/startpage.php
index e4d80c0c..0971818f 100644
--- a/startpage/startpage.php
+++ b/startpage/startpage.php
@@ -6,11 +6,10 @@
  * Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
  *
  */
-
-use Friendica\App;
 use Friendica\Core\Hook;
-use Friendica\Core\Renderer;
-use Friendica\DI;
+use Friendica\Core\L10n;
+use Friendica\Core\PConfig;
+use Friendica\Core\System;
 
 function startpage_install() {
 	Hook::register('home_init', 'addon/startpage/startpage.php', 'startpage_home_init');
@@ -18,16 +17,24 @@ function startpage_install() {
 	Hook::register('addon_settings_post', 'addon/startpage/startpage.php', 'startpage_settings_post');
 }
 
-function startpage_home_init($b)
+function startpage_uninstall()
 {
-	if (!DI::userSession()->getLocalUserId()) {
+	Hook::unregister('home_init', 'addon/startpage/startpage.php', 'startpage_home_init');
+	Hook::unregister('addon_settings', 'addon/startpage/startpage.php', 'startpage_settings');
+	Hook::unregister('addon_settings_post', 'addon/startpage/startpage.php', 'startpage_settings_post');
+}
+
+function startpage_home_init($a, $b)
+{
+	if (!local_user()) {
 		return;
 	}
 
-	$page = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'startpage', 'startpage');
-	if ($page) {
-		DI::baseUrl()->redirect($page);
+	$page = PConfig::get(local_user(), 'startpage', 'startpage');
+	if (strlen($page)) {
+		$a->internalRedirect($page);
 	}
+	return;
 }
 
 /**
@@ -39,14 +46,14 @@ function startpage_home_init($b)
  *
  */
 
-function startpage_settings_post($post)
+function startpage_settings_post($a, $post)
 {
-	if (!DI::userSession()->getLocalUserId()) {
+	if (!local_user()) {
 		return;
 	}
 
 	if (!empty($_POST['startpage-submit'])) {
-		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'startpage', 'startpage', strip_tags(trim($_POST['startpage'])));
+		PConfig::set(local_user(), 'startpage', 'startpage', strip_tags(trim($_POST['startpage'])));
 	}
 }
 
@@ -56,22 +63,36 @@ function startpage_settings_post($post)
  * Add our own settings info to the page.
  *
  */
-function startpage_settings(array &$data)
+function startpage_settings(&$a, &$s)
 {
-	if (!DI::userSession()->getLocalUserId()) {
+	if (!local_user()) {
 		return;
 	}
 
-	$startpage = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'startpage', 'startpage');
+	/* Add our stylesheet to the page so we can make our settings look nice */
 
-	$t    = Renderer::getMarkupTemplate('settings.tpl', 'addon/startpage/');
-	$html = Renderer::replaceMacros($t, [
-		'$startpage' => ['startpage', DI::l10n()->t('Home page to load after login  - leave blank for profile wall'), $startpage, DI::l10n()->t('Examples: "network" or "notifications/system"')],
-	]);
+	$a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->getBaseURL() . '/addon/startpage/startpage.css' . '" media="all" />' . "\r\n";
 
-	$data = [
-		'addon' => 'startpage',
-		'title' => DI::l10n()->t('Startpage'),
-		'html'  => $html,
-	];
+	/* Get the current state of our config variable */
+
+	$page = PConfig::get(local_user(), 'startpage', 'startpage');
+
+	/* Add some HTML to the existing form */
+
+	$s .= '<span id="settings_startpage_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_startpage_expanded\'); openClose(\'settings_startpage_inflated\');">';
+	$s .= '<h3>' . L10n::t('Startpage') . '</h3>';
+	$s .= '</span>';
+	$s .= '<div id="settings_startpage_expanded" class="settings-block" style="display: none;">';
+	$s .= '<span class="fakelink" onclick="openClose(\'settings_startpage_expanded\'); openClose(\'settings_startpage_inflated\');">';
+	$s .= '<h3>' . L10n::t('Startpage') . '</h3>';
+	$s .= '</span>';
+	$s .= '<div id="startpage-page-wrapper">';
+	$s .= '<label id="startpage-page-label" for="startpage-page">' . L10n::t('Home page to load after login  - leave blank for profile wall') . '</label>';
+	$s .= '<input id="startpage-page" type="text" name="startpage" value="' . $page . '" />';
+	$s .= '</div><div class="clear"></div>';
+	$s .= '<div id="startpage-desc">' . L10n::t('Examples: &quot;network&quot; or &quot;notifications/system&quot;') . '</div>';
+
+	/* provide a submit button */
+
+	$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="startpage-submit" class="settings-submit" value="' . L10n::t('Save Settings') . '" /></div></div>';
 }
diff --git a/startpage/templates/settings.tpl b/startpage/templates/settings.tpl
deleted file mode 100644
index 7078a83a..00000000
--- a/startpage/templates/settings.tpl
+++ /dev/null
@@ -1 +0,0 @@
-{{include file="field_input.tpl" field=$startpage}}
diff --git a/statusnet/lang/C/messages.po b/statusnet/lang/C/messages.po
index 9c6f07a8..4c762b48 100644
--- a/statusnet/lang/C/messages.po
+++ b/statusnet/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-12-21 22:32+0000\n"
+"POT-Creation-Date: 2015-07-27 07:21+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,70 +17,70 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: statusnet.php:76
+#: statusnet.php:151
 msgid "Post to GNU Social"
 msgstr ""
 
-#: statusnet.php:122
+#: statusnet.php:196
 msgid ""
 "Please contact your site administrator.<br />The provided API URL is not "
 "valid."
 msgstr ""
 
-#: statusnet.php:150
+#: statusnet.php:225
 msgid "We could not contact the GNU Social API with the Path you entered."
 msgstr ""
 
-#: statusnet.php:208 statusnet.php:489
-msgid "Save Settings"
+#: statusnet.php:259
+msgid "GNU Social settings updated."
 msgstr ""
 
-#: statusnet.php:220
-#, php-format
-msgid "Currently connected to: <a href=\"%s\" target=\"_statusnet\">%s</a>"
+#: statusnet.php:294 statusnet.php:298
+msgid "GNU Social Import/Export/Mirror"
 msgstr ""
 
-#: statusnet.php:225
-msgid ""
-"<strong>Note</strong>: Due your privacy settings (<em>Hide your profile "
-"details from unknown viewers?</em>) the link potentially included in public "
-"postings relayed to GNU Social will lead the visitor to a blank page "
-"informing the visitor that the access to your profile has been restricted."
-msgstr ""
-
-#: statusnet.php:228
-msgid "Clear OAuth configuration"
-msgstr ""
-
-#: statusnet.php:240
-msgid "Cancel GNU Social Connection"
-msgstr ""
-
-#: statusnet.php:247
+#: statusnet.php:313
 msgid "Globally Available GNU Social OAuthKeys"
 msgstr ""
 
-#: statusnet.php:248
+#: statusnet.php:314
 msgid ""
 "There are preconfigured OAuth key pairs for some GNU Social servers "
 "available. If you are using one of them, please use these credentials. If "
 "not feel free to connect to any other GNU Social instance (see below)."
 msgstr ""
 
-#: statusnet.php:249
+#: statusnet.php:320 statusnet.php:337 statusnet.php:364 statusnet.php:371
+#: statusnet.php:416 statusnet.php:699
+msgid "Save Settings"
+msgstr ""
+
+#: statusnet.php:322
 msgid "Provide your own OAuth Credentials"
 msgstr ""
 
-#: statusnet.php:250
+#: statusnet.php:323
 msgid ""
 "No consumer key pair for GNU Social found. Register your Friendica Account "
-"as a desktop application on your GNU Social account, copy the consumer key "
-"pair here and enter the API base root.<br />Before you register your own "
-"OAuth key pair ask the administrator if there is already a key pair for this "
-"Friendica installation at your favorite GNU Social installation."
+"as an desktop client on your GNU Social account, copy the consumer key pair "
+"here and enter the API base root.<br />Before you register your own OAuth "
+"key pair ask the administrator if there is already a key pair for this "
+"Friendica installation at your favorited GNU Social installation."
 msgstr ""
 
-#: statusnet.php:251
+#: statusnet.php:325
+msgid "OAuth Consumer Key"
+msgstr ""
+
+#: statusnet.php:328
+msgid "OAuth Consumer Secret"
+msgstr ""
+
+#: statusnet.php:331 statusnet.php:679 statusnet.php:691
+msgid "Base API Path (remember the trailing /)"
+msgstr ""
+
+#: statusnet.php:356
 msgid ""
 "To connect to your GNU Social account click the button below to get a "
 "security code from GNU Social which you have to copy into the input box "
@@ -88,62 +88,86 @@ msgid ""
 "posted to GNU Social."
 msgstr ""
 
-#: statusnet.php:252
+#: statusnet.php:357
 msgid "Log in with GNU Social"
 msgstr ""
 
-#: statusnet.php:253
-msgid "Cancel Connection Process"
-msgstr ""
-
-#: statusnet.php:254
-#, php-format
-msgid "Current GNU Social API is: %s"
-msgstr ""
-
-#: statusnet.php:271
-msgid "OAuth Consumer Key"
-msgstr ""
-
-#: statusnet.php:272
-msgid "OAuth Consumer Secret"
-msgstr ""
-
-#: statusnet.php:274 statusnet.php:469 statusnet.php:481
-msgid "Base API Path (remember the trailing /)"
-msgstr ""
-
-#: statusnet.php:275
+#: statusnet.php:359
 msgid "Copy the security code from GNU Social here"
 msgstr ""
 
-#: statusnet.php:277
-msgid "Allow posting to GNU Social"
+#: statusnet.php:365
+msgid "Cancel Connection Process"
 msgstr ""
 
-#: statusnet.php:277
+#: statusnet.php:367
+msgid "Current GNU Social API is"
+msgstr ""
+
+#: statusnet.php:368
+msgid "Cancel GNU Social Connection"
+msgstr ""
+
+#: statusnet.php:379
+msgid "Currently connected to: "
+msgstr ""
+
+#: statusnet.php:380
 msgid ""
 "If enabled all your <strong>public</strong> postings can be posted to the "
 "associated GNU Social account. You can choose to do so by default (here) or "
 "for every posting separately in the posting options when writing the entry."
 msgstr ""
 
-#: statusnet.php:278
-msgid "Post to GNU Social by default"
+#: statusnet.php:382
+msgid ""
+"<strong>Note</strong>: Due your privacy settings (<em>Hide your profile "
+"details from unknown viewers?</em>) the link potentially included in public "
+"postings relayed to GNU Social will lead the visitor to a blank page "
+"informing the visitor that the access to your profile has been restricted."
 msgstr ""
 
-#: statusnet.php:283
-msgid "GNU Social Import/Export/Mirror"
+#: statusnet.php:385
+msgid "Allow posting to GNU Social"
 msgstr ""
 
-#: statusnet.php:480
+#: statusnet.php:388
+msgid "Send public postings to GNU Social by default"
+msgstr ""
+
+#: statusnet.php:392
+msgid ""
+"Mirror all posts from GNU Social that are no replies or repeated messages"
+msgstr ""
+
+#: statusnet.php:398
+msgid "Import the remote timeline"
+msgstr ""
+
+#: statusnet.php:402
+msgid "Disabled"
+msgstr ""
+
+#: statusnet.php:403
+msgid "Full Timeline"
+msgstr ""
+
+#: statusnet.php:404
+msgid "Only Mentions"
+msgstr ""
+
+#: statusnet.php:413
+msgid "Clear OAuth configuration"
+msgstr ""
+
+#: statusnet.php:690
 msgid "Site name"
 msgstr ""
 
-#: statusnet.php:482
+#: statusnet.php:692
 msgid "Consumer Secret"
 msgstr ""
 
-#: statusnet.php:483
+#: statusnet.php:693
 msgid "Consumer Key"
 msgstr ""
diff --git a/statusnet/lang/ar/messages.po b/statusnet/lang/ar/messages.po
deleted file mode 100644
index 89352f37..00000000
--- a/statusnet/lang/ar/messages.po
+++ /dev/null
@@ -1,152 +0,0 @@
-# ADDON statusnet
-# Copyright (C)
-# This file is distributed under the same license as the Friendica statusnet addon package.
-# 
-# 
-# Translators:
-# ButterflyOfFire, 2022
-# Farida Khalaf <faridakhalaf@hotmail.com>, 2021
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-12-21 22:32+0000\n"
-"PO-Revision-Date: 2014-06-23 12:54+0000\n"
-"Last-Translator: ButterflyOfFire, 2022\n"
-"Language-Team: Arabic (http://app.transifex.com/Friendica/friendica/language/ar/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ar\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-
-#: statusnet.php:76
-msgid "Post to GNU Social"
-msgstr ""
-
-#: statusnet.php:122
-msgid ""
-"Please contact your site administrator.<br />The provided API URL is not "
-"valid."
-msgstr ""
-
-#: statusnet.php:150
-msgid "We could not contact the GNU Social API with the Path you entered."
-msgstr ""
-
-#: statusnet.php:208 statusnet.php:489
-msgid "Save Settings"
-msgstr "حفظ الإعدادات"
-
-#: statusnet.php:220
-#, php-format
-msgid "Currently connected to: <a href=\"%s\" target=\"_statusnet\">%s</a>"
-msgstr ""
-
-#: statusnet.php:225
-msgid ""
-"<strong>Note</strong>: Due your privacy settings (<em>Hide your profile "
-"details from unknown viewers?</em>) the link potentially included in public "
-"postings relayed to GNU Social will lead the visitor to a blank page "
-"informing the visitor that the access to your profile has been restricted."
-msgstr ""
-
-#: statusnet.php:228
-msgid "Clear OAuth configuration"
-msgstr ""
-
-#: statusnet.php:240
-msgid "Cancel GNU Social Connection"
-msgstr ""
-
-#: statusnet.php:247
-msgid "Globally Available GNU Social OAuthKeys"
-msgstr ""
-
-#: statusnet.php:248
-msgid ""
-"There are preconfigured OAuth key pairs for some GNU Social servers "
-"available. If you are using one of them, please use these credentials. If "
-"not feel free to connect to any other GNU Social instance (see below)."
-msgstr ""
-
-#: statusnet.php:249
-msgid "Provide your own OAuth Credentials"
-msgstr ""
-
-#: statusnet.php:250
-msgid ""
-"No consumer key pair for GNU Social found. Register your Friendica Account "
-"as a desktop application on your GNU Social account, copy the consumer key "
-"pair here and enter the API base root.<br />Before you register your own "
-"OAuth key pair ask the administrator if there is already a key pair for this"
-" Friendica installation at your favorite GNU Social installation."
-msgstr ""
-
-#: statusnet.php:251
-msgid ""
-"To connect to your GNU Social account click the button below to get a "
-"security code from GNU Social which you have to copy into the input box "
-"below and submit the form. Only your <strong>public</strong> posts will be "
-"posted to GNU Social."
-msgstr ""
-
-#: statusnet.php:252
-msgid "Log in with GNU Social"
-msgstr ""
-
-#: statusnet.php:253
-msgid "Cancel Connection Process"
-msgstr ""
-
-#: statusnet.php:254
-#, php-format
-msgid "Current GNU Social API is: %s"
-msgstr ""
-
-#: statusnet.php:271
-msgid "OAuth Consumer Key"
-msgstr ""
-
-#: statusnet.php:272
-msgid "OAuth Consumer Secret"
-msgstr ""
-
-#: statusnet.php:274 statusnet.php:469 statusnet.php:481
-msgid "Base API Path (remember the trailing /)"
-msgstr ""
-
-#: statusnet.php:275
-msgid "Copy the security code from GNU Social here"
-msgstr ""
-
-#: statusnet.php:277
-msgid "Allow posting to GNU Social"
-msgstr ""
-
-#: statusnet.php:277
-msgid ""
-"If enabled all your <strong>public</strong> postings can be posted to the "
-"associated GNU Social account. You can choose to do so by default (here) or "
-"for every posting separately in the posting options when writing the entry."
-msgstr ""
-
-#: statusnet.php:278
-msgid "Post to GNU Social by default"
-msgstr ""
-
-#: statusnet.php:283
-msgid "GNU Social Import/Export/Mirror"
-msgstr ""
-
-#: statusnet.php:480
-msgid "Site name"
-msgstr "اسم الموقع"
-
-#: statusnet.php:482
-msgid "Consumer Secret"
-msgstr ""
-
-#: statusnet.php:483
-msgid "Consumer Key"
-msgstr ""
diff --git a/statusnet/lang/ar/strings.php b/statusnet/lang/ar/strings.php
deleted file mode 100644
index 8fa1ef3e..00000000
--- a/statusnet/lang/ar/strings.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_ar")) {
-function string_plural_select_ar($n){
-	$n = intval($n);
-	if ($n==0) { return 0; } else if ($n==1) { return 1; } else if ($n==2) { return 2; } else if ($n%100>=3 && $n%100<=10) { return 3; } else if ($n%100>=11 && $n%100<=99) { return 4; } else  { return 5; }
-}}
-$a->strings['Save Settings'] = 'حفظ الإعدادات';
-$a->strings['Site name'] = 'اسم الموقع';
diff --git a/statusnet/lang/cs/messages.po b/statusnet/lang/cs/messages.po
index 6ed2d9b2..851164df 100644
--- a/statusnet/lang/cs/messages.po
+++ b/statusnet/lang/cs/messages.po
@@ -11,80 +11,80 @@ msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-12-21 22:32+0000\n"
-"PO-Revision-Date: 2014-06-23 12:54+0000\n"
-"Last-Translator: Aditoo, 2018\n"
-"Language-Team: Czech (http://app.transifex.com/Friendica/friendica/language/cs/)\n"
+"POT-Creation-Date: 2015-07-27 07:21+0200\n"
+"PO-Revision-Date: 2018-06-14 14:47+0000\n"
+"Last-Translator: Aditoo\n"
+"Language-Team: Czech (http://www.transifex.com/Friendica/friendica/language/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: cs\n"
 "Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
 
-#: statusnet.php:76
+#: statusnet.php:151
 msgid "Post to GNU Social"
 msgstr "Poslat na GNU social"
 
-#: statusnet.php:122
+#: statusnet.php:196
 msgid ""
 "Please contact your site administrator.<br />The provided API URL is not "
 "valid."
 msgstr "Obraťte se na administratora webu.<br />Poskytnutý odkaz na API není platný."
 
-#: statusnet.php:150
+#: statusnet.php:225
 msgid "We could not contact the GNU Social API with the Path you entered."
 msgstr "Nemohli jsme kontaktovat API GNU social pomocí cesty, kterou jste zadal/a."
 
-#: statusnet.php:208 statusnet.php:489
-msgid "Save Settings"
-msgstr "Uložit nastavení"
+#: statusnet.php:259
+msgid "GNU Social settings updated."
+msgstr "Nastavení pro GNU social aktualizována."
 
-#: statusnet.php:220
-#, php-format
-msgid "Currently connected to: <a href=\"%s\" target=\"_statusnet\">%s</a>"
-msgstr ""
+#: statusnet.php:294 statusnet.php:298
+msgid "GNU Social Import/Export/Mirror"
+msgstr "Import/export/zrcadlení GNU social"
 
-#: statusnet.php:225
-msgid ""
-"<strong>Note</strong>: Due your privacy settings (<em>Hide your profile "
-"details from unknown viewers?</em>) the link potentially included in public "
-"postings relayed to GNU Social will lead the visitor to a blank page "
-"informing the visitor that the access to your profile has been restricted."
-msgstr "<strong>Poznámka</strong>: Kvůli vašim nastavením o soukromí (<em>Skrýt Vaše profilové detaily před neznámými návštěvníky?</em>), odkaz potenciálně obsažen ve veřejných příspěvcích přeposílaných na GNU social zavedou návštěvníky na prázdnou stránku informující návštěvníky, že přístup na Váš profil byl zakázán."
-
-#: statusnet.php:228
-msgid "Clear OAuth configuration"
-msgstr "Vymazat konfiguraci OAuth"
-
-#: statusnet.php:240
-msgid "Cancel GNU Social Connection"
-msgstr "Zrušit spojení s GNU social"
-
-#: statusnet.php:247
+#: statusnet.php:313
 msgid "Globally Available GNU Social OAuthKeys"
 msgstr "Globálně dostupné OAuth klíče pro GNU"
 
-#: statusnet.php:248
+#: statusnet.php:314
 msgid ""
 "There are preconfigured OAuth key pairs for some GNU Social servers "
 "available. If you are using one of them, please use these credentials. If "
 "not feel free to connect to any other GNU Social instance (see below)."
 msgstr "Jsou dostupné předkonfigurované páry klíčů OAuth pro některé servery GNU social. Pokud některý z nich používáte, prosím používejte tyto kredenciály. Pokud ne, můžete se klidně připojit k jakékoliv jiné instanci GNU social (viz dole)."
 
-#: statusnet.php:249
+#: statusnet.php:320 statusnet.php:337 statusnet.php:364 statusnet.php:371
+#: statusnet.php:416 statusnet.php:699
+msgid "Save Settings"
+msgstr "Uložit nastavení"
+
+#: statusnet.php:322
 msgid "Provide your own OAuth Credentials"
 msgstr "Uveďte své vlastní OAuth přihlašovací údaje"
 
-#: statusnet.php:250
+#: statusnet.php:323
 msgid ""
 "No consumer key pair for GNU Social found. Register your Friendica Account "
-"as a desktop application on your GNU Social account, copy the consumer key "
-"pair here and enter the API base root.<br />Before you register your own "
-"OAuth key pair ask the administrator if there is already a key pair for this"
-" Friendica installation at your favorite GNU Social installation."
-msgstr ""
+"as an desktop client on your GNU Social account, copy the consumer key pair "
+"here and enter the API base root.<br />Before you register your own OAuth "
+"key pair ask the administrator if there is already a key pair for this "
+"Friendica installation at your favorited GNU Social installation."
+msgstr "Nenalezen žádný pár klíčů pro GNU social. Registrujte svůj účet Friendica na Vašem účtu GNU social jako desktopový klient, zkopírujte sem pár klíčů consumer key a zadejte kořenovou složku API.<br />Dříve, než si zaregistrujete Váš vlastní pár klíčů, se zeptejte administrátora, jestli již na Vaší oblíbené instalaci GNU social existuje pár klíčů pro tuto instalaci Friendica."
 
-#: statusnet.php:251
+#: statusnet.php:325
+msgid "OAuth Consumer Key"
+msgstr "OAuth Consumer Key"
+
+#: statusnet.php:328
+msgid "OAuth Consumer Secret"
+msgstr "OAuth Consumer Secret"
+
+#: statusnet.php:331 statusnet.php:679 statusnet.php:691
+msgid "Base API Path (remember the trailing /)"
+msgstr "Cesta k Base API  (nezapomeňte na koncové /)"
+
+#: statusnet.php:356
 msgid ""
 "To connect to your GNU Social account click the button below to get a "
 "security code from GNU Social which you have to copy into the input box "
@@ -92,62 +92,86 @@ msgid ""
 "posted to GNU Social."
 msgstr "Pro připojení k Vašemu účtu na GNU social klikněte na tlačítko níže. Obdržíte bezpečnostní kód od GNU social, ten musíte zkopírovat do vyplňovacího pole níže a odeslat formulář. Pouze Vaše <strong>veřejné</strong> příspěvky budou odesílány na GNU social."
 
-#: statusnet.php:252
+#: statusnet.php:357
 msgid "Log in with GNU Social"
 msgstr "Přihlásit se pomocí GNU social"
 
-#: statusnet.php:253
-msgid "Cancel Connection Process"
-msgstr "Zrušit připojování"
-
-#: statusnet.php:254
-#, php-format
-msgid "Current GNU Social API is: %s"
-msgstr ""
-
-#: statusnet.php:271
-msgid "OAuth Consumer Key"
-msgstr "OAuth Consumer Key"
-
-#: statusnet.php:272
-msgid "OAuth Consumer Secret"
-msgstr "OAuth Consumer Secret"
-
-#: statusnet.php:274 statusnet.php:469 statusnet.php:481
-msgid "Base API Path (remember the trailing /)"
-msgstr "Cesta k Base API  (nezapomeňte na koncové /)"
-
-#: statusnet.php:275
+#: statusnet.php:359
 msgid "Copy the security code from GNU Social here"
 msgstr "Zde překopírujte váš bezpečnostní kód z GNU social"
 
-#: statusnet.php:277
-msgid "Allow posting to GNU Social"
-msgstr "Povolit posílání příspěvků na GNU social"
+#: statusnet.php:365
+msgid "Cancel Connection Process"
+msgstr "Zrušit připojování"
 
-#: statusnet.php:277
+#: statusnet.php:367
+msgid "Current GNU Social API is"
+msgstr "Aktuální API GNU social je:"
+
+#: statusnet.php:368
+msgid "Cancel GNU Social Connection"
+msgstr "Zrušit spojení s GNU social"
+
+#: statusnet.php:379
+msgid "Currently connected to: "
+msgstr "Aktuálně jste připojen/a k:"
+
+#: statusnet.php:380
 msgid ""
 "If enabled all your <strong>public</strong> postings can be posted to the "
 "associated GNU Social account. You can choose to do so by default (here) or "
 "for every posting separately in the posting options when writing the entry."
 msgstr "Je-li povoleno, všechny Vaše <strong>veřejné</strong> příspěvky mohou být zasílány na související účet na GNU social. Můžete si vybrat, zda-li toto bude výchozí nastavení (zde), nebo budete mít možnost si vybrat požadované chování při psaní každého příspěvku."
 
-#: statusnet.php:278
-msgid "Post to GNU Social by default"
-msgstr ""
+#: statusnet.php:382
+msgid ""
+"<strong>Note</strong>: Due your privacy settings (<em>Hide your profile "
+"details from unknown viewers?</em>) the link potentially included in public "
+"postings relayed to GNU Social will lead the visitor to a blank page "
+"informing the visitor that the access to your profile has been restricted."
+msgstr "<strong>Poznámka</strong>: Kvůli vašim nastavením o soukromí (<em>Skrýt Vaše profilové detaily před neznámými návštěvníky?</em>), odkaz potenciálně obsažen ve veřejných příspěvcích přeposílaných na GNU social zavedou návštěvníky na prázdnou stránku informující návštěvníky, že přístup na Váš profil byl zakázán."
 
-#: statusnet.php:283
-msgid "GNU Social Import/Export/Mirror"
-msgstr "Import/export/zrcadlení GNU social"
+#: statusnet.php:385
+msgid "Allow posting to GNU Social"
+msgstr "Povolit posílání příspěvků na GNU social"
 
-#: statusnet.php:480
+#: statusnet.php:388
+msgid "Send public postings to GNU Social by default"
+msgstr "Ve výchozím stavu posílat veřejné příspěvky na GNU social"
+
+#: statusnet.php:392
+msgid ""
+"Mirror all posts from GNU Social that are no replies or repeated messages"
+msgstr "Zrcadlit všechny příspěvky z GNU social, které nejsou odpovědi nebo zopakované zprávy"
+
+#: statusnet.php:398
+msgid "Import the remote timeline"
+msgstr "Importovat vzdálenou časovou osu"
+
+#: statusnet.php:402
+msgid "Disabled"
+msgstr "Zakázáno"
+
+#: statusnet.php:403
+msgid "Full Timeline"
+msgstr "Plná časová osa"
+
+#: statusnet.php:404
+msgid "Only Mentions"
+msgstr "Pouze zmínky"
+
+#: statusnet.php:413
+msgid "Clear OAuth configuration"
+msgstr "Vymazat konfiguraci OAuth"
+
+#: statusnet.php:690
 msgid "Site name"
 msgstr "Název webu"
 
-#: statusnet.php:482
+#: statusnet.php:692
 msgid "Consumer Secret"
 msgstr "Consumer Secret"
 
-#: statusnet.php:483
+#: statusnet.php:693
 msgid "Consumer Key"
 msgstr "Consumer Key"
diff --git a/statusnet/lang/cs/strings.php b/statusnet/lang/cs/strings.php
index 991901c3..3bf9180d 100644
--- a/statusnet/lang/cs/strings.php
+++ b/statusnet/lang/cs/strings.php
@@ -3,28 +3,39 @@
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
 	$n = intval($n);
-	if (($n == 1 && $n % 1 == 0)) { return 0; } else if (($n >= 2 && $n <= 4 && $n % 1 == 0)) { return 1; } else if (($n % 1 != 0 )) { return 2; } else  { return 3; }
+	return ($n == 1 && $n % 1 == 0) ? 0 : ($n >= 2 && $n <= 4 && $n % 1 == 0) ? 1: ($n % 1 != 0 ) ? 2 : 3;;
 }}
-$a->strings['Post to GNU Social'] = 'Poslat na GNU social';
-$a->strings['Please contact your site administrator.<br />The provided API URL is not valid.'] = 'Obraťte se na administratora webu.<br />Poskytnutý odkaz na API není platný.';
-$a->strings['We could not contact the GNU Social API with the Path you entered.'] = 'Nemohli jsme kontaktovat API GNU social pomocí cesty, kterou jste zadal/a.';
-$a->strings['Save Settings'] = 'Uložit nastavení';
-$a->strings['<strong>Note</strong>: Due your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to GNU Social will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted.'] = '<strong>Poznámka</strong>: Kvůli vašim nastavením o soukromí (<em>Skrýt Vaše profilové detaily před neznámými návštěvníky?</em>), odkaz potenciálně obsažen ve veřejných příspěvcích přeposílaných na GNU social zavedou návštěvníky na prázdnou stránku informující návštěvníky, že přístup na Váš profil byl zakázán.';
-$a->strings['Clear OAuth configuration'] = 'Vymazat konfiguraci OAuth';
-$a->strings['Cancel GNU Social Connection'] = 'Zrušit spojení s GNU social';
-$a->strings['Globally Available GNU Social OAuthKeys'] = 'Globálně dostupné OAuth klíče pro GNU';
-$a->strings['There are preconfigured OAuth key pairs for some GNU Social servers available. If you are using one of them, please use these credentials. If not feel free to connect to any other GNU Social instance (see below).'] = 'Jsou dostupné předkonfigurované páry klíčů OAuth pro některé servery GNU social. Pokud některý z nich používáte, prosím používejte tyto kredenciály. Pokud ne, můžete se klidně připojit k jakékoliv jiné instanci GNU social (viz dole).';
-$a->strings['Provide your own OAuth Credentials'] = 'Uveďte své vlastní OAuth přihlašovací údaje';
-$a->strings['To connect to your GNU Social account click the button below to get a security code from GNU Social which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to GNU Social.'] = 'Pro připojení k Vašemu účtu na GNU social klikněte na tlačítko níže. Obdržíte bezpečnostní kód od GNU social, ten musíte zkopírovat do vyplňovacího pole níže a odeslat formulář. Pouze Vaše <strong>veřejné</strong> příspěvky budou odesílány na GNU social.';
-$a->strings['Log in with GNU Social'] = 'Přihlásit se pomocí GNU social';
-$a->strings['Cancel Connection Process'] = 'Zrušit připojování';
-$a->strings['OAuth Consumer Key'] = 'OAuth Consumer Key';
-$a->strings['OAuth Consumer Secret'] = 'OAuth Consumer Secret';
-$a->strings['Base API Path (remember the trailing /)'] = 'Cesta k Base API  (nezapomeňte na koncové /)';
-$a->strings['Copy the security code from GNU Social here'] = 'Zde překopírujte váš bezpečnostní kód z GNU social';
-$a->strings['Allow posting to GNU Social'] = 'Povolit posílání příspěvků na GNU social';
-$a->strings['If enabled all your <strong>public</strong> postings can be posted to the associated GNU Social account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry.'] = 'Je-li povoleno, všechny Vaše <strong>veřejné</strong> příspěvky mohou být zasílány na související účet na GNU social. Můžete si vybrat, zda-li toto bude výchozí nastavení (zde), nebo budete mít možnost si vybrat požadované chování při psaní každého příspěvku.';
-$a->strings['GNU Social Import/Export/Mirror'] = 'Import/export/zrcadlení GNU social';
-$a->strings['Site name'] = 'Název webu';
-$a->strings['Consumer Secret'] = 'Consumer Secret';
-$a->strings['Consumer Key'] = 'Consumer Key';
+;
+$a->strings["Post to GNU Social"] = "Poslat na GNU social";
+$a->strings["Please contact your site administrator.<br />The provided API URL is not valid."] = "Obraťte se na administratora webu.<br />Poskytnutý odkaz na API není platný.";
+$a->strings["We could not contact the GNU Social API with the Path you entered."] = "Nemohli jsme kontaktovat API GNU social pomocí cesty, kterou jste zadal/a.";
+$a->strings["GNU Social settings updated."] = "Nastavení pro GNU social aktualizována.";
+$a->strings["GNU Social Import/Export/Mirror"] = "Import/export/zrcadlení GNU social";
+$a->strings["Globally Available GNU Social OAuthKeys"] = "Globálně dostupné OAuth klíče pro GNU";
+$a->strings["There are preconfigured OAuth key pairs for some GNU Social servers available. If you are using one of them, please use these credentials. If not feel free to connect to any other GNU Social instance (see below)."] = "Jsou dostupné předkonfigurované páry klíčů OAuth pro některé servery GNU social. Pokud některý z nich používáte, prosím používejte tyto kredenciály. Pokud ne, můžete se klidně připojit k jakékoliv jiné instanci GNU social (viz dole).";
+$a->strings["Save Settings"] = "Uložit nastavení";
+$a->strings["Provide your own OAuth Credentials"] = "Uveďte své vlastní OAuth přihlašovací údaje";
+$a->strings["No consumer key pair for GNU Social found. Register your Friendica Account as an desktop client on your GNU Social account, copy the consumer key pair here and enter the API base root.<br />Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendica installation at your favorited GNU Social installation."] = "Nenalezen žádný pár klíčů pro GNU social. Registrujte svůj účet Friendica na Vašem účtu GNU social jako desktopový klient, zkopírujte sem pár klíčů consumer key a zadejte kořenovou složku API.<br />Dříve, než si zaregistrujete Váš vlastní pár klíčů, se zeptejte administrátora, jestli již na Vaší oblíbené instalaci GNU social existuje pár klíčů pro tuto instalaci Friendica.";
+$a->strings["OAuth Consumer Key"] = "OAuth Consumer Key";
+$a->strings["OAuth Consumer Secret"] = "OAuth Consumer Secret";
+$a->strings["Base API Path (remember the trailing /)"] = "Cesta k Base API  (nezapomeňte na koncové /)";
+$a->strings["To connect to your GNU Social account click the button below to get a security code from GNU Social which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to GNU Social."] = "Pro připojení k Vašemu účtu na GNU social klikněte na tlačítko níže. Obdržíte bezpečnostní kód od GNU social, ten musíte zkopírovat do vyplňovacího pole níže a odeslat formulář. Pouze Vaše <strong>veřejné</strong> příspěvky budou odesílány na GNU social.";
+$a->strings["Log in with GNU Social"] = "Přihlásit se pomocí GNU social";
+$a->strings["Copy the security code from GNU Social here"] = "Zde překopírujte váš bezpečnostní kód z GNU social";
+$a->strings["Cancel Connection Process"] = "Zrušit připojování";
+$a->strings["Current GNU Social API is"] = "Aktuální API GNU social je:";
+$a->strings["Cancel GNU Social Connection"] = "Zrušit spojení s GNU social";
+$a->strings["Currently connected to: "] = "Aktuálně jste připojen/a k:";
+$a->strings["If enabled all your <strong>public</strong> postings can be posted to the associated GNU Social account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "Je-li povoleno, všechny Vaše <strong>veřejné</strong> příspěvky mohou být zasílány na související účet na GNU social. Můžete si vybrat, zda-li toto bude výchozí nastavení (zde), nebo budete mít možnost si vybrat požadované chování při psaní každého příspěvku.";
+$a->strings["<strong>Note</strong>: Due your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to GNU Social will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "<strong>Poznámka</strong>: Kvůli vašim nastavením o soukromí (<em>Skrýt Vaše profilové detaily před neznámými návštěvníky?</em>), odkaz potenciálně obsažen ve veřejných příspěvcích přeposílaných na GNU social zavedou návštěvníky na prázdnou stránku informující návštěvníky, že přístup na Váš profil byl zakázán.";
+$a->strings["Allow posting to GNU Social"] = "Povolit posílání příspěvků na GNU social";
+$a->strings["Send public postings to GNU Social by default"] = "Ve výchozím stavu posílat veřejné příspěvky na GNU social";
+$a->strings["Mirror all posts from GNU Social that are no replies or repeated messages"] = "Zrcadlit všechny příspěvky z GNU social, které nejsou odpovědi nebo zopakované zprávy";
+$a->strings["Import the remote timeline"] = "Importovat vzdálenou časovou osu";
+$a->strings["Disabled"] = "Zakázáno";
+$a->strings["Full Timeline"] = "Plná časová osa";
+$a->strings["Only Mentions"] = "Pouze zmínky";
+$a->strings["Clear OAuth configuration"] = "Vymazat konfiguraci OAuth";
+$a->strings["Site name"] = "Název webu";
+$a->strings["Consumer Secret"] = "Consumer Secret";
+$a->strings["Consumer Key"] = "Consumer Key";
diff --git a/statusnet/lang/da-dk/messages.po b/statusnet/lang/da-dk/messages.po
deleted file mode 100644
index f088f811..00000000
--- a/statusnet/lang/da-dk/messages.po
+++ /dev/null
@@ -1,174 +0,0 @@
-# ADDON statusnet
-# Copyright (C)
-# This file is distributed under the same license as the Friendica statusnet addon package.
-# 
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:17-0500\n"
-"PO-Revision-Date: 2014-06-23 12:54+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Danish (Denmark) (http://www.transifex.com/Friendica/friendica/language/da_DK/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: da_DK\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: statusnet.php:97
-msgid "Post to GNU Social"
-msgstr ""
-
-#: statusnet.php:148
-msgid ""
-"Please contact your site administrator.<br />The provided API URL is not "
-"valid."
-msgstr ""
-
-#: statusnet.php:176
-msgid "We could not contact the GNU Social API with the Path you entered."
-msgstr ""
-
-#: statusnet.php:243 statusnet.php:656
-msgid "Save Settings"
-msgstr ""
-
-#: statusnet.php:255
-#, php-format
-msgid "Currently connected to: <a href=\"%s\" target=\"_statusnet\">%s</a>"
-msgstr ""
-
-#: statusnet.php:260
-msgid ""
-"<strong>Note</strong>: Due your privacy settings (<em>Hide your profile "
-"details from unknown viewers?</em>) the link potentially included in public "
-"postings relayed to GNU Social will lead the visitor to a blank page "
-"informing the visitor that the access to your profile has been restricted."
-msgstr ""
-
-#: statusnet.php:263
-msgid "Clear OAuth configuration"
-msgstr ""
-
-#: statusnet.php:275
-msgid "Cancel GNU Social Connection"
-msgstr ""
-
-#: statusnet.php:283
-msgid "Globally Available GNU Social OAuthKeys"
-msgstr ""
-
-#: statusnet.php:284
-msgid ""
-"There are preconfigured OAuth key pairs for some GNU Social servers "
-"available. If you are using one of them, please use these credentials. If "
-"not feel free to connect to any other GNU Social instance (see below)."
-msgstr ""
-
-#: statusnet.php:285
-msgid "Provide your own OAuth Credentials"
-msgstr ""
-
-#: statusnet.php:286
-msgid ""
-"No consumer key pair for GNU Social found. Register your Friendica Account "
-"as a desktop application on your GNU Social account, copy the consumer key "
-"pair here and enter the API base root.<br />Before you register your own "
-"OAuth key pair ask the administrator if there is already a key pair for this"
-" Friendica installation at your favorite GNU Social installation."
-msgstr ""
-
-#: statusnet.php:287
-msgid ""
-"To connect to your GNU Social account click the button below to get a "
-"security code from GNU Social which you have to copy into the input box "
-"below and submit the form. Only your <strong>public</strong> posts will be "
-"posted to GNU Social."
-msgstr ""
-
-#: statusnet.php:288
-msgid "Log in with GNU Social"
-msgstr ""
-
-#: statusnet.php:289
-msgid "Cancel Connection Process"
-msgstr ""
-
-#: statusnet.php:290
-#, php-format
-msgid "Current GNU Social API is: %s"
-msgstr ""
-
-#: statusnet.php:307
-msgid "OAuth Consumer Key"
-msgstr ""
-
-#: statusnet.php:308
-msgid "OAuth Consumer Secret"
-msgstr ""
-
-#: statusnet.php:310 statusnet.php:636 statusnet.php:648
-msgid "Base API Path (remember the trailing /)"
-msgstr ""
-
-#: statusnet.php:311
-msgid "Copy the security code from GNU Social here"
-msgstr ""
-
-#: statusnet.php:313
-msgid "Allow posting to GNU Social"
-msgstr ""
-
-#: statusnet.php:313
-msgid ""
-"If enabled all your <strong>public</strong> postings can be posted to the "
-"associated GNU Social account. You can choose to do so by default (here) or "
-"for every posting separately in the posting options when writing the entry."
-msgstr ""
-
-#: statusnet.php:314
-msgid "Post to GNU Social by default"
-msgstr ""
-
-#: statusnet.php:315
-msgid "Mirror all public posts"
-msgstr ""
-
-#: statusnet.php:316
-msgid "Automatically create contacts"
-msgstr ""
-
-#: statusnet.php:317
-msgid "Import the remote timeline"
-msgstr ""
-
-#: statusnet.php:318
-msgid "Disabled"
-msgstr "Slået fra"
-
-#: statusnet.php:319
-msgid "Full Timeline"
-msgstr ""
-
-#: statusnet.php:320
-msgid "Only Mentions"
-msgstr ""
-
-#: statusnet.php:326
-msgid "GNU Social Import/Export/Mirror"
-msgstr ""
-
-#: statusnet.php:647
-msgid "Site name"
-msgstr ""
-
-#: statusnet.php:649
-msgid "Consumer Secret"
-msgstr ""
-
-#: statusnet.php:650
-msgid "Consumer Key"
-msgstr ""
diff --git a/statusnet/lang/da-dk/strings.php b/statusnet/lang/da-dk/strings.php
deleted file mode 100644
index a728ce79..00000000
--- a/statusnet/lang/da-dk/strings.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_da_dk")) {
-function string_plural_select_da_dk($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Disabled'] = 'Slået fra';
diff --git a/statusnet/lang/de/messages.po b/statusnet/lang/de/messages.po
index 2b92005f..fbf74fe9 100644
--- a/statusnet/lang/de/messages.po
+++ b/statusnet/lang/de/messages.po
@@ -6,87 +6,86 @@
 # Translators:
 # Andreas H., 2014-2015
 # Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2015
-# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2016,2022
-# Ulf Rompe <transifex.com@rompe.org>, 2019
+# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2016
 # Vinzenz Vietzke <vinz@vinzv.de>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-12-21 22:32+0000\n"
-"PO-Revision-Date: 2014-06-23 12:54+0000\n"
-"Last-Translator: Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2016,2022\n"
-"Language-Team: German (http://app.transifex.com/Friendica/friendica/language/de/)\n"
+"POT-Creation-Date: 2015-07-27 07:21+0200\n"
+"PO-Revision-Date: 2018-10-28 11:54+0000\n"
+"Last-Translator: Vinzenz Vietzke <vinz@vinzv.de>\n"
+"Language-Team: German (http://www.transifex.com/Friendica/friendica/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: statusnet.php:76
+#: statusnet.php:151
 msgid "Post to GNU Social"
 msgstr "Auf GNU Social veröffentlichen"
 
-#: statusnet.php:122
+#: statusnet.php:196
 msgid ""
 "Please contact your site administrator.<br />The provided API URL is not "
 "valid."
 msgstr "Bitte kontaktiere den Administrator der Seite.<br />Die gegebene API URL ist nicht gültig."
 
-#: statusnet.php:150
+#: statusnet.php:225
 msgid "We could not contact the GNU Social API with the Path you entered."
 msgstr "Die GNU Social-API konnte mit dem angegebenen Pfad nicht erreicht werden."
 
-#: statusnet.php:208 statusnet.php:489
-msgid "Save Settings"
-msgstr "Einstellungen speichern"
+#: statusnet.php:259
+msgid "GNU Social settings updated."
+msgstr "GNU Social Einstellungen aktualisiert."
 
-#: statusnet.php:220
-#, php-format
-msgid "Currently connected to: <a href=\"%s\" target=\"_statusnet\">%s</a>"
-msgstr "Derzeit verbunden mit: <a href=\"%s\" target=\"_statusnet\">%s</a>"
+#: statusnet.php:294 statusnet.php:298
+msgid "GNU Social Import/Export/Mirror"
+msgstr "GNU Social Import/Export/Spiegeln"
 
-#: statusnet.php:225
-msgid ""
-"<strong>Note</strong>: Due your privacy settings (<em>Hide your profile "
-"details from unknown viewers?</em>) the link potentially included in public "
-"postings relayed to GNU Social will lead the visitor to a blank page "
-"informing the visitor that the access to your profile has been restricted."
-msgstr "<strong>Hinweis</strong>: Aufgrund deiner Privatsphären-Einstellungen (<em>Profil-Details vor unbekannten Betrachtern verbergen?</em>) wird der Link, der eventuell an deinen GNU Social-Beitrag angehängt wird, um auf den Originalbeitrag zu verweisen, den Betrachter auf eine leere Seite führen, die ihn darüber informiert, dass der Zugriff eingeschränkt wurde."
-
-#: statusnet.php:228
-msgid "Clear OAuth configuration"
-msgstr "OAuth-Konfiguration löschen"
-
-#: statusnet.php:240
-msgid "Cancel GNU Social Connection"
-msgstr "Verbindung zum GNU Social-Server abbrechen"
-
-#: statusnet.php:247
+#: statusnet.php:313
 msgid "Globally Available GNU Social OAuthKeys"
-msgstr "Verfügbare OAuth-Schlüssel für GNU Social"
+msgstr "Verfügbare OAuth Schlüssel für GNU Social"
 
-#: statusnet.php:248
+#: statusnet.php:314
 msgid ""
 "There are preconfigured OAuth key pairs for some GNU Social servers "
 "available. If you are using one of them, please use these credentials. If "
 "not feel free to connect to any other GNU Social instance (see below)."
-msgstr "Für einige GNU Social-Server sind voreingestellte OAuth-Schlüsselpaare verfügbar. Solltest du einen dieser Server benutzen, dann verwende bitte diese Schlüssel. Falls nicht, stelle stattdessen eine Verbindung zu irgendeinem anderen StatusNet-Server her (siehe unten)."
+msgstr "Für einige GNU Social Server sind voreingestellte OAuth Schlüsselpaare verfügbar. Solltest du einen dieser Server benutzen, dann verwende bitte diese Schlüssel. Falls nicht, stelle stattdessen eine Verbindung zu irgendeinem anderen StatusNet Server her (siehe unten)."
 
-#: statusnet.php:249
+#: statusnet.php:320 statusnet.php:337 statusnet.php:364 statusnet.php:371
+#: statusnet.php:416 statusnet.php:699
+msgid "Save Settings"
+msgstr "Einstellungen speichern"
+
+#: statusnet.php:322
 msgid "Provide your own OAuth Credentials"
-msgstr "Eigene OAuth-Schlüssel eintragen"
+msgstr "Eigene OAuth Schlüssel eintragen"
 
-#: statusnet.php:250
+#: statusnet.php:323
 msgid ""
 "No consumer key pair for GNU Social found. Register your Friendica Account "
-"as a desktop application on your GNU Social account, copy the consumer key "
-"pair here and enter the API base root.<br />Before you register your own "
-"OAuth key pair ask the administrator if there is already a key pair for this"
-" Friendica installation at your favorite GNU Social installation."
-msgstr "Kein Consumer-Schlüsselpaar für GNU Social gefunden. Registriere deinen Friendica-Account als Desktop-Client bei deinem GNU Social-Account, kopiere das Consumer-Schlüsselpaar hierher und gib die API-URL ein.<br />Bevor du dein eigenes Consumer-Schlüsselpaar registrierst, frage den Administrator dieses Friendica-Servers, ob schon ein Schlüsselpaar für diesen Friendica-Server auf diesem GNU Social-Server existiert."
+"as an desktop client on your GNU Social account, copy the consumer key pair "
+"here and enter the API base root.<br />Before you register your own OAuth "
+"key pair ask the administrator if there is already a key pair for this "
+"Friendica installation at your favorited GNU Social installation."
+msgstr "Kein Consumer-Schlüsselpaar für GNU Social gefunden. Registriere deinen Friendica-Account als Desktop-Client bei deinem GNU Social Account, kopiere das Consumer-Schlüsselpaar hierher und gib die API-URL ein.<br />Bevor du dein eigenes Consumer-Schlüsselpaar registrierst, frage den Administrator dieses Friendica-Servers, ob schon ein Schlüsselpaar für diesen Friendica-Server auf diesem GNU Social-Server existiert."
 
-#: statusnet.php:251
+#: statusnet.php:325
+msgid "OAuth Consumer Key"
+msgstr "OAuth Consumer Key"
+
+#: statusnet.php:328
+msgid "OAuth Consumer Secret"
+msgstr "OAuth Consumer Secret"
+
+#: statusnet.php:331 statusnet.php:679 statusnet.php:691
+msgid "Base API Path (remember the trailing /)"
+msgstr "Basis-URL der StatusNet API (vergiss den abschließenden / nicht)"
+
+#: statusnet.php:356
 msgid ""
 "To connect to your GNU Social account click the button below to get a "
 "security code from GNU Social which you have to copy into the input box "
@@ -94,62 +93,86 @@ msgid ""
 "posted to GNU Social."
 msgstr "Um dein Konto mit einem GNU Social-Konto zu verknüpfen, klicke den Button an, um einen Sicherheitscode von GNU Social zu erhalten, und kopiere diesen in das Eingabefeld weiter unten. Es werden ausschließlich deine <strong>öffentlichen</strong> Nachrichten an GNU Social gesendet."
 
-#: statusnet.php:252
+#: statusnet.php:357
 msgid "Log in with GNU Social"
 msgstr "Bei GNU Social anmelden"
 
-#: statusnet.php:253
-msgid "Cancel Connection Process"
-msgstr "Verbindungsprozess abbrechen"
-
-#: statusnet.php:254
-#, php-format
-msgid "Current GNU Social API is: %s"
-msgstr "Derzeitige GNU Social-API-URL lautet %s"
-
-#: statusnet.php:271
-msgid "OAuth Consumer Key"
-msgstr "OAuth Consumer Key"
-
-#: statusnet.php:272
-msgid "OAuth Consumer Secret"
-msgstr "OAuth Consumer Secret"
-
-#: statusnet.php:274 statusnet.php:469 statusnet.php:481
-msgid "Base API Path (remember the trailing /)"
-msgstr "Basis-URL der StatusNet-API (vergiss den abschließenden / nicht)"
-
-#: statusnet.php:275
+#: statusnet.php:359
 msgid "Copy the security code from GNU Social here"
 msgstr "Kopiere den Sicherheitscode von GNU social hier hin"
 
-#: statusnet.php:277
-msgid "Allow posting to GNU Social"
-msgstr "Veröffentlichung bei GNU Social erlauben"
+#: statusnet.php:365
+msgid "Cancel Connection Process"
+msgstr "Verbindungsprozess abbrechen"
 
-#: statusnet.php:277
+#: statusnet.php:367
+msgid "Current GNU Social API is"
+msgstr "Derzeitige GNU Social-API-URL lautet"
+
+#: statusnet.php:368
+msgid "Cancel GNU Social Connection"
+msgstr "Verbindung zum GNU Social Server abbrechen"
+
+#: statusnet.php:379
+msgid "Currently connected to: "
+msgstr "Momentan verbunden mit: "
+
+#: statusnet.php:380
 msgid ""
 "If enabled all your <strong>public</strong> postings can be posted to the "
 "associated GNU Social account. You can choose to do so by default (here) or "
 "for every posting separately in the posting options when writing the entry."
 msgstr "Wenn aktiviert, können all deine <strong>öffentlichen</strong> Einträge auf dem verbundenen GNU Social-Konto veröffentlicht werden. Du kannst das (hier) als Standardverhalten einstellen oder beim Schreiben eines Beitrags in den Beitragsoptionen festlegen."
 
-#: statusnet.php:278
-msgid "Post to GNU Social by default"
-msgstr "Standardmäßig bei GNU Social veröffentlichen"
+#: statusnet.php:382
+msgid ""
+"<strong>Note</strong>: Due your privacy settings (<em>Hide your profile "
+"details from unknown viewers?</em>) the link potentially included in public "
+"postings relayed to GNU Social will lead the visitor to a blank page "
+"informing the visitor that the access to your profile has been restricted."
+msgstr "<strong>Hinweis</strong>: Aufgrund deiner Privatsphären-Einstellungen (<em>Profil-Details vor unbekannten Betrachtern verbergen?</em>) wird der Link, der eventuell an deinen GNU Social-Beitrag angehängt wird, um auf den Originalbeitrag zu verweisen, den Betrachter auf eine leere Seite führen, die ihn darüber informiert, dass der Zugriff eingeschränkt wurde."
 
-#: statusnet.php:283
-msgid "GNU Social Import/Export/Mirror"
-msgstr "GNU Social-Import/Export/Spiegeln"
+#: statusnet.php:385
+msgid "Allow posting to GNU Social"
+msgstr "Veröffentlichung bei GNU Social erlauben"
 
-#: statusnet.php:480
+#: statusnet.php:388
+msgid "Send public postings to GNU Social by default"
+msgstr "Veröffentliche öffentliche Beiträge standardmäßig bei GNU Social"
+
+#: statusnet.php:392
+msgid ""
+"Mirror all posts from GNU Social that are no replies or repeated messages"
+msgstr "Spiegle alle Beiträge von GNU Social die keine Antworten oder wiederholten Nachrichten sind"
+
+#: statusnet.php:398
+msgid "Import the remote timeline"
+msgstr "Importiere die entfernte Zeitleiste"
+
+#: statusnet.php:402
+msgid "Disabled"
+msgstr "Deaktiviert"
+
+#: statusnet.php:403
+msgid "Full Timeline"
+msgstr "Komplette Timeline"
+
+#: statusnet.php:404
+msgid "Only Mentions"
+msgstr "Nur Erwähnungen"
+
+#: statusnet.php:413
+msgid "Clear OAuth configuration"
+msgstr "OAuth Konfiguration löschen"
+
+#: statusnet.php:690
 msgid "Site name"
 msgstr "Seitenname"
 
-#: statusnet.php:482
+#: statusnet.php:692
 msgid "Consumer Secret"
 msgstr "Consumer Secret"
 
-#: statusnet.php:483
+#: statusnet.php:693
 msgid "Consumer Key"
 msgstr "Consumer Key"
diff --git a/statusnet/lang/de/strings.php b/statusnet/lang/de/strings.php
index a35e425c..2c2873fa 100644
--- a/statusnet/lang/de/strings.php
+++ b/statusnet/lang/de/strings.php
@@ -3,32 +3,39 @@
 if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Post to GNU Social'] = 'Auf GNU Social veröffentlichen';
-$a->strings['Please contact your site administrator.<br />The provided API URL is not valid.'] = 'Bitte kontaktiere den Administrator der Seite.<br />Die gegebene API URL ist nicht gültig.';
-$a->strings['We could not contact the GNU Social API with the Path you entered.'] = 'Die GNU Social-API konnte mit dem angegebenen Pfad nicht erreicht werden.';
-$a->strings['Save Settings'] = 'Einstellungen speichern';
-$a->strings['Currently connected to: <a href="%s" target="_statusnet">%s</a>'] = 'Derzeit verbunden mit: <a href="%s" target="_statusnet">%s</a>';
-$a->strings['<strong>Note</strong>: Due your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to GNU Social will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted.'] = '<strong>Hinweis</strong>: Aufgrund deiner Privatsphären-Einstellungen (<em>Profil-Details vor unbekannten Betrachtern verbergen?</em>) wird der Link, der eventuell an deinen GNU Social-Beitrag angehängt wird, um auf den Originalbeitrag zu verweisen, den Betrachter auf eine leere Seite führen, die ihn darüber informiert, dass der Zugriff eingeschränkt wurde.';
-$a->strings['Clear OAuth configuration'] = 'OAuth-Konfiguration löschen';
-$a->strings['Cancel GNU Social Connection'] = 'Verbindung zum GNU Social-Server abbrechen';
-$a->strings['Globally Available GNU Social OAuthKeys'] = 'Verfügbare OAuth-Schlüssel für GNU Social';
-$a->strings['There are preconfigured OAuth key pairs for some GNU Social servers available. If you are using one of them, please use these credentials. If not feel free to connect to any other GNU Social instance (see below).'] = 'Für einige GNU Social-Server sind voreingestellte OAuth-Schlüsselpaare verfügbar. Solltest du einen dieser Server benutzen, dann verwende bitte diese Schlüssel. Falls nicht, stelle stattdessen eine Verbindung zu irgendeinem anderen StatusNet-Server her (siehe unten).';
-$a->strings['Provide your own OAuth Credentials'] = 'Eigene OAuth-Schlüssel eintragen';
-$a->strings['No consumer key pair for GNU Social found. Register your Friendica Account as a desktop application on your GNU Social account, copy the consumer key pair here and enter the API base root.<br />Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendica installation at your favorite GNU Social installation.'] = 'Kein Consumer-Schlüsselpaar für GNU Social gefunden. Registriere deinen Friendica-Account als Desktop-Client bei deinem GNU Social-Account, kopiere das Consumer-Schlüsselpaar hierher und gib die API-URL ein.<br />Bevor du dein eigenes Consumer-Schlüsselpaar registrierst, frage den Administrator dieses Friendica-Servers, ob schon ein Schlüsselpaar für diesen Friendica-Server auf diesem GNU Social-Server existiert.';
-$a->strings['To connect to your GNU Social account click the button below to get a security code from GNU Social which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to GNU Social.'] = 'Um dein Konto mit einem GNU Social-Konto zu verknüpfen, klicke den Button an, um einen Sicherheitscode von GNU Social zu erhalten, und kopiere diesen in das Eingabefeld weiter unten. Es werden ausschließlich deine <strong>öffentlichen</strong> Nachrichten an GNU Social gesendet.';
-$a->strings['Log in with GNU Social'] = 'Bei GNU Social anmelden';
-$a->strings['Cancel Connection Process'] = 'Verbindungsprozess abbrechen';
-$a->strings['Current GNU Social API is: %s'] = 'Derzeitige GNU Social-API-URL lautet %s';
-$a->strings['OAuth Consumer Key'] = 'OAuth Consumer Key';
-$a->strings['OAuth Consumer Secret'] = 'OAuth Consumer Secret';
-$a->strings['Base API Path (remember the trailing /)'] = 'Basis-URL der StatusNet-API (vergiss den abschließenden / nicht)';
-$a->strings['Copy the security code from GNU Social here'] = 'Kopiere den Sicherheitscode von GNU social hier hin';
-$a->strings['Allow posting to GNU Social'] = 'Veröffentlichung bei GNU Social erlauben';
-$a->strings['If enabled all your <strong>public</strong> postings can be posted to the associated GNU Social account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry.'] = 'Wenn aktiviert, können all deine <strong>öffentlichen</strong> Einträge auf dem verbundenen GNU Social-Konto veröffentlicht werden. Du kannst das (hier) als Standardverhalten einstellen oder beim Schreiben eines Beitrags in den Beitragsoptionen festlegen.';
-$a->strings['Post to GNU Social by default'] = 'Standardmäßig bei GNU Social veröffentlichen';
-$a->strings['GNU Social Import/Export/Mirror'] = 'GNU Social-Import/Export/Spiegeln';
-$a->strings['Site name'] = 'Seitenname';
-$a->strings['Consumer Secret'] = 'Consumer Secret';
-$a->strings['Consumer Key'] = 'Consumer Key';
+;
+$a->strings["Post to GNU Social"] = "Auf GNU Social veröffentlichen";
+$a->strings["Please contact your site administrator.<br />The provided API URL is not valid."] = "Bitte kontaktiere den Administrator der Seite.<br />Die gegebene API URL ist nicht gültig.";
+$a->strings["We could not contact the GNU Social API with the Path you entered."] = "Die GNU Social-API konnte mit dem angegebenen Pfad nicht erreicht werden.";
+$a->strings["GNU Social settings updated."] = "GNU Social Einstellungen aktualisiert.";
+$a->strings["GNU Social Import/Export/Mirror"] = "GNU Social Import/Export/Spiegeln";
+$a->strings["Globally Available GNU Social OAuthKeys"] = "Verfügbare OAuth Schlüssel für GNU Social";
+$a->strings["There are preconfigured OAuth key pairs for some GNU Social servers available. If you are using one of them, please use these credentials. If not feel free to connect to any other GNU Social instance (see below)."] = "Für einige GNU Social Server sind voreingestellte OAuth Schlüsselpaare verfügbar. Solltest du einen dieser Server benutzen, dann verwende bitte diese Schlüssel. Falls nicht, stelle stattdessen eine Verbindung zu irgendeinem anderen StatusNet Server her (siehe unten).";
+$a->strings["Save Settings"] = "Einstellungen speichern";
+$a->strings["Provide your own OAuth Credentials"] = "Eigene OAuth Schlüssel eintragen";
+$a->strings["No consumer key pair for GNU Social found. Register your Friendica Account as an desktop client on your GNU Social account, copy the consumer key pair here and enter the API base root.<br />Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendica installation at your favorited GNU Social installation."] = "Kein Consumer-Schlüsselpaar für GNU Social gefunden. Registriere deinen Friendica-Account als Desktop-Client bei deinem GNU Social Account, kopiere das Consumer-Schlüsselpaar hierher und gib die API-URL ein.<br />Bevor du dein eigenes Consumer-Schlüsselpaar registrierst, frage den Administrator dieses Friendica-Servers, ob schon ein Schlüsselpaar für diesen Friendica-Server auf diesem GNU Social-Server existiert.";
+$a->strings["OAuth Consumer Key"] = "OAuth Consumer Key";
+$a->strings["OAuth Consumer Secret"] = "OAuth Consumer Secret";
+$a->strings["Base API Path (remember the trailing /)"] = "Basis-URL der StatusNet API (vergiss den abschließenden / nicht)";
+$a->strings["To connect to your GNU Social account click the button below to get a security code from GNU Social which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to GNU Social."] = "Um dein Konto mit einem GNU Social-Konto zu verknüpfen, klicke den Button an, um einen Sicherheitscode von GNU Social zu erhalten, und kopiere diesen in das Eingabefeld weiter unten. Es werden ausschließlich deine <strong>öffentlichen</strong> Nachrichten an GNU Social gesendet.";
+$a->strings["Log in with GNU Social"] = "Bei GNU Social anmelden";
+$a->strings["Copy the security code from GNU Social here"] = "Kopiere den Sicherheitscode von GNU social hier hin";
+$a->strings["Cancel Connection Process"] = "Verbindungsprozess abbrechen";
+$a->strings["Current GNU Social API is"] = "Derzeitige GNU Social-API-URL lautet";
+$a->strings["Cancel GNU Social Connection"] = "Verbindung zum GNU Social Server abbrechen";
+$a->strings["Currently connected to: "] = "Momentan verbunden mit: ";
+$a->strings["If enabled all your <strong>public</strong> postings can be posted to the associated GNU Social account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "Wenn aktiviert, können all deine <strong>öffentlichen</strong> Einträge auf dem verbundenen GNU Social-Konto veröffentlicht werden. Du kannst das (hier) als Standardverhalten einstellen oder beim Schreiben eines Beitrags in den Beitragsoptionen festlegen.";
+$a->strings["<strong>Note</strong>: Due your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to GNU Social will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "<strong>Hinweis</strong>: Aufgrund deiner Privatsphären-Einstellungen (<em>Profil-Details vor unbekannten Betrachtern verbergen?</em>) wird der Link, der eventuell an deinen GNU Social-Beitrag angehängt wird, um auf den Originalbeitrag zu verweisen, den Betrachter auf eine leere Seite führen, die ihn darüber informiert, dass der Zugriff eingeschränkt wurde.";
+$a->strings["Allow posting to GNU Social"] = "Veröffentlichung bei GNU Social erlauben";
+$a->strings["Send public postings to GNU Social by default"] = "Veröffentliche öffentliche Beiträge standardmäßig bei GNU Social";
+$a->strings["Mirror all posts from GNU Social that are no replies or repeated messages"] = "Spiegle alle Beiträge von GNU Social die keine Antworten oder wiederholten Nachrichten sind";
+$a->strings["Import the remote timeline"] = "Importiere die entfernte Zeitleiste";
+$a->strings["Disabled"] = "Deaktiviert";
+$a->strings["Full Timeline"] = "Komplette Timeline";
+$a->strings["Only Mentions"] = "Nur Erwähnungen";
+$a->strings["Clear OAuth configuration"] = "OAuth Konfiguration löschen";
+$a->strings["Site name"] = "Seitenname";
+$a->strings["Consumer Secret"] = "Consumer Secret";
+$a->strings["Consumer Key"] = "Consumer Key";
diff --git a/statusnet/lang/es/messages.po b/statusnet/lang/es/messages.po
index 8ab9a31b..bf9cdcc6 100644
--- a/statusnet/lang/es/messages.po
+++ b/statusnet/lang/es/messages.po
@@ -9,80 +9,80 @@ msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-12-21 22:32+0000\n"
-"PO-Revision-Date: 2014-06-23 12:54+0000\n"
-"Last-Translator: Albert, 2016\n"
-"Language-Team: Spanish (http://app.transifex.com/Friendica/friendica/language/es/)\n"
+"POT-Creation-Date: 2015-07-27 07:21+0200\n"
+"PO-Revision-Date: 2016-11-17 23:07+0000\n"
+"Last-Translator: Albert\n"
+"Language-Team: Spanish (http://www.transifex.com/Friendica/friendica/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: es\n"
-"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: statusnet.php:76
+#: statusnet.php:151
 msgid "Post to GNU Social"
 msgstr "Publicar en GNU Social"
 
-#: statusnet.php:122
+#: statusnet.php:196
 msgid ""
 "Please contact your site administrator.<br />The provided API URL is not "
 "valid."
 msgstr "Por favor contacte con el administrador de su página.<br />La URL de API provista no es válida."
 
-#: statusnet.php:150
+#: statusnet.php:225
 msgid "We could not contact the GNU Social API with the Path you entered."
 msgstr "No pudimos contactar con la API de GNU Social con el Camino que introdujo."
 
-#: statusnet.php:208 statusnet.php:489
-msgid "Save Settings"
-msgstr "Guardar Ajustes"
+#: statusnet.php:259
+msgid "GNU Social settings updated."
+msgstr "Ajustes de GNU Social actualizados."
 
-#: statusnet.php:220
-#, php-format
-msgid "Currently connected to: <a href=\"%s\" target=\"_statusnet\">%s</a>"
-msgstr ""
+#: statusnet.php:294 statusnet.php:298
+msgid "GNU Social Import/Export/Mirror"
+msgstr "Importar/Exportar/Reflejar GNU Social"
 
-#: statusnet.php:225
-msgid ""
-"<strong>Note</strong>: Due your privacy settings (<em>Hide your profile "
-"details from unknown viewers?</em>) the link potentially included in public "
-"postings relayed to GNU Social will lead the visitor to a blank page "
-"informing the visitor that the access to your profile has been restricted."
-msgstr "<strong>Nota</strong>: Debido a sus ajustes de privacidad (<em>?Ocultar los detalles de su perfil a espectadores desconocidos?</em>) el enlace potencialmente incluído en publicaciones públicas transmitidas a GNU Social llevarán al visitante a una página en blanco informándole de que el acceso a su perfil ha sido restringido."
-
-#: statusnet.php:228
-msgid "Clear OAuth configuration"
-msgstr "Limpiar la configuración de OAuth"
-
-#: statusnet.php:240
-msgid "Cancel GNU Social Connection"
-msgstr "Cancelar la conexión a GNU Social"
-
-#: statusnet.php:247
+#: statusnet.php:313
 msgid "Globally Available GNU Social OAuthKeys"
 msgstr "Disponible globalmente GNU Social OAuthKeys"
 
-#: statusnet.php:248
+#: statusnet.php:314
 msgid ""
 "There are preconfigured OAuth key pairs for some GNU Social servers "
 "available. If you are using one of them, please use these credentials. If "
 "not feel free to connect to any other GNU Social instance (see below)."
 msgstr "Hay pares de clave preconfigurados OAuth para algunos servidores disponibles de GNU Social. Si está utilizando uno de ellos, por favor utilice estas credenciales. Si no se siente libre de conectar a alguna otra instancia de GNU Social (vea abajo)."
 
-#: statusnet.php:249
+#: statusnet.php:320 statusnet.php:337 statusnet.php:364 statusnet.php:371
+#: statusnet.php:416 statusnet.php:699
+msgid "Save Settings"
+msgstr "Guardar Ajustes"
+
+#: statusnet.php:322
 msgid "Provide your own OAuth Credentials"
 msgstr "Proveer sus propias credenciales de OAuth"
 
-#: statusnet.php:250
+#: statusnet.php:323
 msgid ""
 "No consumer key pair for GNU Social found. Register your Friendica Account "
-"as a desktop application on your GNU Social account, copy the consumer key "
-"pair here and enter the API base root.<br />Before you register your own "
-"OAuth key pair ask the administrator if there is already a key pair for this"
-" Friendica installation at your favorite GNU Social installation."
-msgstr ""
+"as an desktop client on your GNU Social account, copy the consumer key pair "
+"here and enter the API base root.<br />Before you register your own OAuth "
+"key pair ask the administrator if there is already a key pair for this "
+"Friendica installation at your favorited GNU Social installation."
+msgstr "No se encontró el par de claves de consumidor para GNU Social. Registre su cuenta de Friendica como un cliente de escritorio en su cuenta de GNU, copie el par de claves aquí e introduzca el origen de la API.<br />Antes de qeu registre su propio par de claves de OAuth pregunte al administrador si ya hay un par de claves para esta instalación de Friendica en su instalación de GNU Social favorita."
 
-#: statusnet.php:251
+#: statusnet.php:325
+msgid "OAuth Consumer Key"
+msgstr "Clave de Consumidor de OAuth"
+
+#: statusnet.php:328
+msgid "OAuth Consumer Secret"
+msgstr "Secreto de Consumidor de OAuth"
+
+#: statusnet.php:331 statusnet.php:679 statusnet.php:691
+msgid "Base API Path (remember the trailing /)"
+msgstr "Camino Base de API (Recordar la cola /)"
+
+#: statusnet.php:356
 msgid ""
 "To connect to your GNU Social account click the button below to get a "
 "security code from GNU Social which you have to copy into the input box "
@@ -90,62 +90,86 @@ msgid ""
 "posted to GNU Social."
 msgstr "Para conectarse a su cuenta GNU Social click en el botón de abajo para obtener un código de seguridad de GNU Social que puede copiar en la caja de abajo y enviar el formulario. Sólo sus entradas <strong>públicas</strong> se publicarán en GNU Social."
 
-#: statusnet.php:252
+#: statusnet.php:357
 msgid "Log in with GNU Social"
 msgstr "Acceder a GNU Social"
 
-#: statusnet.php:253
-msgid "Cancel Connection Process"
-msgstr "Cancelar el Proceso de Conexión"
-
-#: statusnet.php:254
-#, php-format
-msgid "Current GNU Social API is: %s"
-msgstr ""
-
-#: statusnet.php:271
-msgid "OAuth Consumer Key"
-msgstr "Clave de Consumidor de OAuth"
-
-#: statusnet.php:272
-msgid "OAuth Consumer Secret"
-msgstr "Secreto de Consumidor de OAuth"
-
-#: statusnet.php:274 statusnet.php:469 statusnet.php:481
-msgid "Base API Path (remember the trailing /)"
-msgstr "Camino Base de API (Recordar la cola /)"
-
-#: statusnet.php:275
+#: statusnet.php:359
 msgid "Copy the security code from GNU Social here"
 msgstr "Copiar el código de seguridad de GNU Social aquí"
 
-#: statusnet.php:277
-msgid "Allow posting to GNU Social"
-msgstr "Permitir publicar en GNU Social"
+#: statusnet.php:365
+msgid "Cancel Connection Process"
+msgstr "Cancelar el Proceso de Conexión"
 
-#: statusnet.php:277
+#: statusnet.php:367
+msgid "Current GNU Social API is"
+msgstr "API de GNU Social actual"
+
+#: statusnet.php:368
+msgid "Cancel GNU Social Connection"
+msgstr "Cancelar la conexión a GNU Social"
+
+#: statusnet.php:379
+msgid "Currently connected to: "
+msgstr "Actualmente conectado a:"
+
+#: statusnet.php:380
 msgid ""
 "If enabled all your <strong>public</strong> postings can be posted to the "
 "associated GNU Social account. You can choose to do so by default (here) or "
 "for every posting separately in the posting options when writing the entry."
 msgstr "Si está habilitado, todas sus publicaciones <strong>públicas</strong> pueden publicarse en la cuenta asociada de GNU Social. Puede elegir hacer eso por defecto (aquí) o por cada publicación por separado en las opciones de publicación mientras escribe la entrada."
 
-#: statusnet.php:278
-msgid "Post to GNU Social by default"
-msgstr ""
+#: statusnet.php:382
+msgid ""
+"<strong>Note</strong>: Due your privacy settings (<em>Hide your profile "
+"details from unknown viewers?</em>) the link potentially included in public "
+"postings relayed to GNU Social will lead the visitor to a blank page "
+"informing the visitor that the access to your profile has been restricted."
+msgstr "<strong>Nota</strong>: Debido a sus ajustes de privacidad (<em>?Ocultar los detalles de su perfil a espectadores desconocidos?</em>) el enlace potencialmente incluído en publicaciones públicas transmitidas a GNU Social llevarán al visitante a una página en blanco informándole de que el acceso a su perfil ha sido restringido."
 
-#: statusnet.php:283
-msgid "GNU Social Import/Export/Mirror"
-msgstr "Importar/Exportar/Reflejar GNU Social"
+#: statusnet.php:385
+msgid "Allow posting to GNU Social"
+msgstr "Permitir publicar en GNU Social"
 
-#: statusnet.php:480
+#: statusnet.php:388
+msgid "Send public postings to GNU Social by default"
+msgstr "Enviar las publicaciones públicas a GNU Social por defecto"
+
+#: statusnet.php:392
+msgid ""
+"Mirror all posts from GNU Social that are no replies or repeated messages"
+msgstr "Reflejar todas las entradas de GNU Social que no son respuestas o mensajes repetidos"
+
+#: statusnet.php:398
+msgid "Import the remote timeline"
+msgstr "Importar la línea de tiempo remota"
+
+#: statusnet.php:402
+msgid "Disabled"
+msgstr "Deshabilitado"
+
+#: statusnet.php:403
+msgid "Full Timeline"
+msgstr "Línea de Tiempo completa"
+
+#: statusnet.php:404
+msgid "Only Mentions"
+msgstr "Sólo Menciones"
+
+#: statusnet.php:413
+msgid "Clear OAuth configuration"
+msgstr "Limpiar la configuración de OAuth"
+
+#: statusnet.php:690
 msgid "Site name"
 msgstr "Nombre de la página"
 
-#: statusnet.php:482
+#: statusnet.php:692
 msgid "Consumer Secret"
 msgstr "Secreto de Consumidor"
 
-#: statusnet.php:483
+#: statusnet.php:693
 msgid "Consumer Key"
 msgstr "Clave de Consumidor"
diff --git a/statusnet/lang/es/strings.php b/statusnet/lang/es/strings.php
index 50df793a..d33fa0fd 100644
--- a/statusnet/lang/es/strings.php
+++ b/statusnet/lang/es/strings.php
@@ -2,29 +2,39 @@
 
 if(! function_exists("string_plural_select_es")) {
 function string_plural_select_es($n){
-	$n = intval($n);
-	if ($n == 1) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
+	return ($n != 1);;
 }}
-$a->strings['Post to GNU Social'] = 'Publicar en GNU Social';
-$a->strings['Please contact your site administrator.<br />The provided API URL is not valid.'] = 'Por favor contacte con el administrador de su página.<br />La URL de API provista no es válida.';
-$a->strings['We could not contact the GNU Social API with the Path you entered.'] = 'No pudimos contactar con la API de GNU Social con el Camino que introdujo.';
-$a->strings['Save Settings'] = 'Guardar Ajustes';
-$a->strings['<strong>Note</strong>: Due your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to GNU Social will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted.'] = '<strong>Nota</strong>: Debido a sus ajustes de privacidad (<em>?Ocultar los detalles de su perfil a espectadores desconocidos?</em>) el enlace potencialmente incluído en publicaciones públicas transmitidas a GNU Social llevarán al visitante a una página en blanco informándole de que el acceso a su perfil ha sido restringido.';
-$a->strings['Clear OAuth configuration'] = 'Limpiar la configuración de OAuth';
-$a->strings['Cancel GNU Social Connection'] = 'Cancelar la conexión a GNU Social';
-$a->strings['Globally Available GNU Social OAuthKeys'] = 'Disponible globalmente GNU Social OAuthKeys';
-$a->strings['There are preconfigured OAuth key pairs for some GNU Social servers available. If you are using one of them, please use these credentials. If not feel free to connect to any other GNU Social instance (see below).'] = 'Hay pares de clave preconfigurados OAuth para algunos servidores disponibles de GNU Social. Si está utilizando uno de ellos, por favor utilice estas credenciales. Si no se siente libre de conectar a alguna otra instancia de GNU Social (vea abajo).';
-$a->strings['Provide your own OAuth Credentials'] = 'Proveer sus propias credenciales de OAuth';
-$a->strings['To connect to your GNU Social account click the button below to get a security code from GNU Social which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to GNU Social.'] = 'Para conectarse a su cuenta GNU Social click en el botón de abajo para obtener un código de seguridad de GNU Social que puede copiar en la caja de abajo y enviar el formulario. Sólo sus entradas <strong>públicas</strong> se publicarán en GNU Social.';
-$a->strings['Log in with GNU Social'] = 'Acceder a GNU Social';
-$a->strings['Cancel Connection Process'] = 'Cancelar el Proceso de Conexión';
-$a->strings['OAuth Consumer Key'] = 'Clave de Consumidor de OAuth';
-$a->strings['OAuth Consumer Secret'] = 'Secreto de Consumidor de OAuth';
-$a->strings['Base API Path (remember the trailing /)'] = 'Camino Base de API (Recordar la cola /)';
-$a->strings['Copy the security code from GNU Social here'] = 'Copiar el código de seguridad de GNU Social aquí';
-$a->strings['Allow posting to GNU Social'] = 'Permitir publicar en GNU Social';
-$a->strings['If enabled all your <strong>public</strong> postings can be posted to the associated GNU Social account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry.'] = 'Si está habilitado, todas sus publicaciones <strong>públicas</strong> pueden publicarse en la cuenta asociada de GNU Social. Puede elegir hacer eso por defecto (aquí) o por cada publicación por separado en las opciones de publicación mientras escribe la entrada.';
-$a->strings['GNU Social Import/Export/Mirror'] = 'Importar/Exportar/Reflejar GNU Social';
-$a->strings['Site name'] = 'Nombre de la página';
-$a->strings['Consumer Secret'] = 'Secreto de Consumidor';
-$a->strings['Consumer Key'] = 'Clave de Consumidor';
+;
+$a->strings["Post to GNU Social"] = "Publicar en GNU Social";
+$a->strings["Please contact your site administrator.<br />The provided API URL is not valid."] = "Por favor contacte con el administrador de su página.<br />La URL de API provista no es válida.";
+$a->strings["We could not contact the GNU Social API with the Path you entered."] = "No pudimos contactar con la API de GNU Social con el Camino que introdujo.";
+$a->strings["GNU Social settings updated."] = "Ajustes de GNU Social actualizados.";
+$a->strings["GNU Social Import/Export/Mirror"] = "Importar/Exportar/Reflejar GNU Social";
+$a->strings["Globally Available GNU Social OAuthKeys"] = "Disponible globalmente GNU Social OAuthKeys";
+$a->strings["There are preconfigured OAuth key pairs for some GNU Social servers available. If you are using one of them, please use these credentials. If not feel free to connect to any other GNU Social instance (see below)."] = "Hay pares de clave preconfigurados OAuth para algunos servidores disponibles de GNU Social. Si está utilizando uno de ellos, por favor utilice estas credenciales. Si no se siente libre de conectar a alguna otra instancia de GNU Social (vea abajo).";
+$a->strings["Save Settings"] = "Guardar Ajustes";
+$a->strings["Provide your own OAuth Credentials"] = "Proveer sus propias credenciales de OAuth";
+$a->strings["No consumer key pair for GNU Social found. Register your Friendica Account as an desktop client on your GNU Social account, copy the consumer key pair here and enter the API base root.<br />Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendica installation at your favorited GNU Social installation."] = "No se encontró el par de claves de consumidor para GNU Social. Registre su cuenta de Friendica como un cliente de escritorio en su cuenta de GNU, copie el par de claves aquí e introduzca el origen de la API.<br />Antes de qeu registre su propio par de claves de OAuth pregunte al administrador si ya hay un par de claves para esta instalación de Friendica en su instalación de GNU Social favorita.";
+$a->strings["OAuth Consumer Key"] = "Clave de Consumidor de OAuth";
+$a->strings["OAuth Consumer Secret"] = "Secreto de Consumidor de OAuth";
+$a->strings["Base API Path (remember the trailing /)"] = "Camino Base de API (Recordar la cola /)";
+$a->strings["To connect to your GNU Social account click the button below to get a security code from GNU Social which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to GNU Social."] = "Para conectarse a su cuenta GNU Social click en el botón de abajo para obtener un código de seguridad de GNU Social que puede copiar en la caja de abajo y enviar el formulario. Sólo sus entradas <strong>públicas</strong> se publicarán en GNU Social.";
+$a->strings["Log in with GNU Social"] = "Acceder a GNU Social";
+$a->strings["Copy the security code from GNU Social here"] = "Copiar el código de seguridad de GNU Social aquí";
+$a->strings["Cancel Connection Process"] = "Cancelar el Proceso de Conexión";
+$a->strings["Current GNU Social API is"] = "API de GNU Social actual";
+$a->strings["Cancel GNU Social Connection"] = "Cancelar la conexión a GNU Social";
+$a->strings["Currently connected to: "] = "Actualmente conectado a:";
+$a->strings["If enabled all your <strong>public</strong> postings can be posted to the associated GNU Social account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "Si está habilitado, todas sus publicaciones <strong>públicas</strong> pueden publicarse en la cuenta asociada de GNU Social. Puede elegir hacer eso por defecto (aquí) o por cada publicación por separado en las opciones de publicación mientras escribe la entrada.";
+$a->strings["<strong>Note</strong>: Due your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to GNU Social will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "<strong>Nota</strong>: Debido a sus ajustes de privacidad (<em>?Ocultar los detalles de su perfil a espectadores desconocidos?</em>) el enlace potencialmente incluído en publicaciones públicas transmitidas a GNU Social llevarán al visitante a una página en blanco informándole de que el acceso a su perfil ha sido restringido.";
+$a->strings["Allow posting to GNU Social"] = "Permitir publicar en GNU Social";
+$a->strings["Send public postings to GNU Social by default"] = "Enviar las publicaciones públicas a GNU Social por defecto";
+$a->strings["Mirror all posts from GNU Social that are no replies or repeated messages"] = "Reflejar todas las entradas de GNU Social que no son respuestas o mensajes repetidos";
+$a->strings["Import the remote timeline"] = "Importar la línea de tiempo remota";
+$a->strings["Disabled"] = "Deshabilitado";
+$a->strings["Full Timeline"] = "Línea de Tiempo completa";
+$a->strings["Only Mentions"] = "Sólo Menciones";
+$a->strings["Clear OAuth configuration"] = "Limpiar la configuración de OAuth";
+$a->strings["Site name"] = "Nombre de la página";
+$a->strings["Consumer Secret"] = "Secreto de Consumidor";
+$a->strings["Consumer Key"] = "Clave de Consumidor";
diff --git a/statusnet/lang/fi-fi/strings.php b/statusnet/lang/fi-fi/strings.php
index a32e57d1..2dc699ea 100644
--- a/statusnet/lang/fi-fi/strings.php
+++ b/statusnet/lang/fi-fi/strings.php
@@ -3,22 +3,39 @@
 if(! function_exists("string_plural_select_fi_fi")) {
 function string_plural_select_fi_fi($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Post to GNU Social'] = 'Lähetä GNU Socialiin';
-$a->strings['Please contact your site administrator.<br />The provided API URL is not valid.'] = 'Ota yhteyttä sivuston ylläpitäjään.<br />API URL-osoite on virheellinen.';
-$a->strings['GNU Social settings updated.'] = 'GNU Social -asetukset päivitetty.';
-$a->strings['GNU Social Import/Export/Mirror'] = 'GNU social tuonti/vienti/peili';
-$a->strings['Save Settings'] = 'Tallenna asetukset';
-$a->strings['OAuth Consumer Key'] = 'OAuth kuluttajan avain';
-$a->strings['OAuth Consumer Secret'] = 'OAuth kuluttajasalaisuus';
-$a->strings['Log in with GNU Social'] = 'Kirjaudu sisään GNU socialilla';
-$a->strings['Allow posting to GNU Social'] = 'Salli julkaisut GNU socialiin';
-$a->strings['Send public postings to GNU Social by default'] = 'Lähetä oletuksena kaikki julkiset julkaisut GNU socialiin';
-$a->strings['Mirror all posts from GNU Social that are no replies or repeated messages'] = 'Peilaa kaikki julkaisut GNU socialista jotka eivät ole vastauksia tai toistettuja viestejä';
-$a->strings['Import the remote timeline'] = 'Tuo etäaikajana';
-$a->strings['Disabled'] = 'Poistettu käytöstä';
-$a->strings['Full Timeline'] = 'Koko aikajana';
-$a->strings['Site name'] = 'Sivuston nimi';
-$a->strings['Consumer Secret'] = 'Kuluttajasalaisuus';
-$a->strings['Consumer Key'] = 'Kuluttajan avain';
+;
+$a->strings["Post to GNU Social"] = "Lähetä GNU Socialiin";
+$a->strings["Please contact your site administrator.<br />The provided API URL is not valid."] = "Ota yhteyttä sivuston ylläpitäjään.<br />API URL-osoite on virheellinen.";
+$a->strings["We could not contact the GNU Social API with the Path you entered."] = "";
+$a->strings["GNU Social settings updated."] = "GNU Social -asetukset päivitetty.";
+$a->strings["GNU Social Import/Export/Mirror"] = "GNU social tuonti/vienti/peili";
+$a->strings["Globally Available GNU Social OAuthKeys"] = "";
+$a->strings["There are preconfigured OAuth key pairs for some GNU Social servers available. If you are using one of them, please use these credentials. If not feel free to connect to any other GNU Social instance (see below)."] = "";
+$a->strings["Save Settings"] = "Tallenna asetukset";
+$a->strings["Provide your own OAuth Credentials"] = "";
+$a->strings["No consumer key pair for GNU Social found. Register your Friendica Account as an desktop client on your GNU Social account, copy the consumer key pair here and enter the API base root.<br />Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendica installation at your favorited GNU Social installation."] = "";
+$a->strings["OAuth Consumer Key"] = "OAuth kuluttajan avain";
+$a->strings["OAuth Consumer Secret"] = "OAuth kuluttajasalaisuus";
+$a->strings["Base API Path (remember the trailing /)"] = "";
+$a->strings["To connect to your GNU Social account click the button below to get a security code from GNU Social which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to GNU Social."] = "";
+$a->strings["Log in with GNU Social"] = "Kirjaudu sisään GNU socialilla";
+$a->strings["Copy the security code from GNU Social here"] = "";
+$a->strings["Cancel Connection Process"] = "";
+$a->strings["Current GNU Social API is"] = "";
+$a->strings["Cancel GNU Social Connection"] = "";
+$a->strings["Currently connected to: "] = "";
+$a->strings["If enabled all your <strong>public</strong> postings can be posted to the associated GNU Social account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "";
+$a->strings["<strong>Note</strong>: Due your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to GNU Social will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "";
+$a->strings["Allow posting to GNU Social"] = "Salli julkaisut GNU socialiin";
+$a->strings["Send public postings to GNU Social by default"] = "Lähetä oletuksena kaikki julkiset julkaisut GNU socialiin";
+$a->strings["Mirror all posts from GNU Social that are no replies or repeated messages"] = "Peilaa kaikki julkaisut GNU socialista jotka eivät ole vastauksia tai toistettuja viestejä";
+$a->strings["Import the remote timeline"] = "Tuo etäaikajana";
+$a->strings["Disabled"] = "Poistettu käytöstä";
+$a->strings["Full Timeline"] = "Koko aikajana";
+$a->strings["Only Mentions"] = "";
+$a->strings["Clear OAuth configuration"] = "";
+$a->strings["Site name"] = "Sivuston nimi";
+$a->strings["Consumer Secret"] = "Kuluttajasalaisuus";
+$a->strings["Consumer Key"] = "Kuluttajan avain";
diff --git a/statusnet/lang/fr/messages.po b/statusnet/lang/fr/messages.po
index b9623537..b73d7d90 100644
--- a/statusnet/lang/fr/messages.po
+++ b/statusnet/lang/fr/messages.po
@@ -5,150 +5,172 @@
 # 
 # Translators:
 # Damien Goutte-Gattat <damien+transifex@incenp.org>, 2015
-# Hypolite Petovan <hypolite@mrpetovan.com>, 2022
-# Nicolas Derive, 2022
-# ea1cd8241cb389ffb6f92bc6891eff5d_dc12308 <70dced5587d47e18d88f9298024d96f8_93383>, 2015
+# Nicola Spanti <translations@nicola-spanti.info>, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-12-21 22:32+0000\n"
-"PO-Revision-Date: 2014-06-23 12:54+0000\n"
-"Last-Translator: Nicolas Derive, 2022\n"
-"Language-Team: French (http://app.transifex.com/Friendica/friendica/language/fr/)\n"
+"POT-Creation-Date: 2015-07-27 07:21+0200\n"
+"PO-Revision-Date: 2015-12-12 11:28+0000\n"
+"Last-Translator: Damien Goutte-Gattat <damien+transifex@incenp.org>\n"
+"Language-Team: French (http://www.transifex.com/Friendica/friendica/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fr\n"
-"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: statusnet.php:76
+#: statusnet.php:151
 msgid "Post to GNU Social"
 msgstr "Publier sur GNU Social"
 
-#: statusnet.php:122
+#: statusnet.php:196
 msgid ""
 "Please contact your site administrator.<br />The provided API URL is not "
 "valid."
 msgstr "Merci de contacter l'administrateur du site.<br />L'URL d'API fournie est invalide."
 
-#: statusnet.php:150
-msgid "We could not contact the GNU Social API with the Path you entered."
-msgstr "Impossible de se connecter à l'API GNU Social avec le chemin indiqué."
-
-#: statusnet.php:208 statusnet.php:489
-msgid "Save Settings"
-msgstr "Sauvegarder les paramètres"
-
-#: statusnet.php:220
-#, php-format
-msgid "Currently connected to: <a href=\"%s\" target=\"_statusnet\">%s</a>"
-msgstr "Actuellement connecté à : <a href=\"%s\" target=\"_statusnet\">%s</a>"
-
 #: statusnet.php:225
-msgid ""
-"<strong>Note</strong>: Due your privacy settings (<em>Hide your profile "
-"details from unknown viewers?</em>) the link potentially included in public "
-"postings relayed to GNU Social will lead the visitor to a blank page "
-"informing the visitor that the access to your profile has been restricted."
-msgstr "<strong>Note</strong>: En lien avec vos paramètres de confidentialité (<em>Masquer vos détails de profil de visiteurs inconnus ?</em>) le lien potentiellement inclus dans vos publications publiques relayées à GNU Social emmèneront le visiteur à une page blanche l'informant que l'accès à votre profil a été restreint."
+msgid "We could not contact the GNU Social API with the Path you entered."
+msgstr ""
 
-#: statusnet.php:228
-msgid "Clear OAuth configuration"
-msgstr "Effacer la configuration OAuth"
+#: statusnet.php:259
+msgid "GNU Social settings updated."
+msgstr "Paramètres du GNU Social mis à jour."
 
-#: statusnet.php:240
-msgid "Cancel GNU Social Connection"
-msgstr "Annuler la connexion à GNU Social"
+#: statusnet.php:294 statusnet.php:298
+msgid "GNU Social Import/Export/Mirror"
+msgstr ""
 
-#: statusnet.php:247
+#: statusnet.php:313
 msgid "Globally Available GNU Social OAuthKeys"
-msgstr "Clés OAuth de GNU Social disponibles globalement"
+msgstr ""
 
-#: statusnet.php:248
+#: statusnet.php:314
 msgid ""
 "There are preconfigured OAuth key pairs for some GNU Social servers "
 "available. If you are using one of them, please use these credentials. If "
 "not feel free to connect to any other GNU Social instance (see below)."
-msgstr "Il y a des paires des clés OAuth préconfigurées disponibles pour certains serveurs GNU Social. Si vous utilisez l'une d'elles, merci d'utiliser ces identifiants. Si non, soyez libre de vous connecter à n'importe quelle autre instance GNU Social (voir ci-dessous)."
+msgstr ""
 
-#: statusnet.php:249
+#: statusnet.php:320 statusnet.php:337 statusnet.php:364 statusnet.php:371
+#: statusnet.php:416 statusnet.php:699
+msgid "Save Settings"
+msgstr "Sauvegarder les paramètres"
+
+#: statusnet.php:322
 msgid "Provide your own OAuth Credentials"
-msgstr "Fournissez vos propres identifiants OAuth"
+msgstr ""
 
-#: statusnet.php:250
+#: statusnet.php:323
 msgid ""
 "No consumer key pair for GNU Social found. Register your Friendica Account "
-"as a desktop application on your GNU Social account, copy the consumer key "
-"pair here and enter the API base root.<br />Before you register your own "
-"OAuth key pair ask the administrator if there is already a key pair for this"
-" Friendica installation at your favorite GNU Social installation."
-msgstr "Aucune paire de clés cliente pour GNU Social n'a été trouvée. Enregistrez votre compte Friendica comme une application de bureau sur votre compte GNU Social, copiez la paire de clés cliente ici et saisissez la racine de base de l'API. <br />Avant d'enregistrer votre propre paire de clés, demandez à l'administrateur si il y a déjà une paire de clés pour cette installation de Friendica sur votre installation GNU Social favorite."
+"as an desktop client on your GNU Social account, copy the consumer key pair "
+"here and enter the API base root.<br />Before you register your own OAuth "
+"key pair ask the administrator if there is already a key pair for this "
+"Friendica installation at your favorited GNU Social installation."
+msgstr ""
 
-#: statusnet.php:251
+#: statusnet.php:325
+msgid "OAuth Consumer Key"
+msgstr ""
+
+#: statusnet.php:328
+msgid "OAuth Consumer Secret"
+msgstr ""
+
+#: statusnet.php:331 statusnet.php:679 statusnet.php:691
+msgid "Base API Path (remember the trailing /)"
+msgstr ""
+
+#: statusnet.php:356
 msgid ""
 "To connect to your GNU Social account click the button below to get a "
 "security code from GNU Social which you have to copy into the input box "
 "below and submit the form. Only your <strong>public</strong> posts will be "
 "posted to GNU Social."
-msgstr "Pour vous connecter à votre compte GNU Social, cliquez sur le bouton ci-dessous pour obtenir un code de sécurité de GNU Social, que vous devrez copier dans le champ de saisie ci-dessous, puis validez le formulaire. Seules vos publications <strong>publiques</strong> seront relayées sur GNU Social."
+msgstr ""
 
-#: statusnet.php:252
+#: statusnet.php:357
 msgid "Log in with GNU Social"
 msgstr "Se connecter avec GNU Social"
 
-#: statusnet.php:253
-msgid "Cancel Connection Process"
-msgstr "Annuler le processus de connexion"
-
-#: statusnet.php:254
-#, php-format
-msgid "Current GNU Social API is: %s"
-msgstr "L'API GNU Social actuelle est : %s"
-
-#: statusnet.php:271
-msgid "OAuth Consumer Key"
-msgstr "Clé d'Utilisateur OAuth"
-
-#: statusnet.php:272
-msgid "OAuth Consumer Secret"
-msgstr "Secret d'Utilisateur OAuth"
-
-#: statusnet.php:274 statusnet.php:469 statusnet.php:481
-msgid "Base API Path (remember the trailing /)"
-msgstr "Chemin de base de l'API (n'oubliez pas le / final)"
-
-#: statusnet.php:275
+#: statusnet.php:359
 msgid "Copy the security code from GNU Social here"
 msgstr "Coller le code de sécurité de GNU Social ici"
 
-#: statusnet.php:277
-msgid "Allow posting to GNU Social"
-msgstr "Autoriser la publication sur GNU Social"
+#: statusnet.php:365
+msgid "Cancel Connection Process"
+msgstr ""
 
-#: statusnet.php:277
+#: statusnet.php:367
+msgid "Current GNU Social API is"
+msgstr "L'API actuelle de GNU Social est"
+
+#: statusnet.php:368
+msgid "Cancel GNU Social Connection"
+msgstr ""
+
+#: statusnet.php:379
+msgid "Currently connected to: "
+msgstr "Actuellement connecté à :"
+
+#: statusnet.php:380
 msgid ""
 "If enabled all your <strong>public</strong> postings can be posted to the "
 "associated GNU Social account. You can choose to do so by default (here) or "
 "for every posting separately in the posting options when writing the entry."
-msgstr "Si activé, toutes vos publications <strong>publiques</strong> pourront être relayées sur le compte GNU Social associé. Vous pouvez choisir de faire cela par défaut (ici) ou individuellement pour chaque publication dans les options de publications au moment ou vous la créez."
+msgstr ""
 
-#: statusnet.php:278
-msgid "Post to GNU Social by default"
-msgstr "Publier sur GNU Social par défaut"
+#: statusnet.php:382
+msgid ""
+"<strong>Note</strong>: Due your privacy settings (<em>Hide your profile "
+"details from unknown viewers?</em>) the link potentially included in public "
+"postings relayed to GNU Social will lead the visitor to a blank page "
+"informing the visitor that the access to your profile has been restricted."
+msgstr ""
 
-#: statusnet.php:283
-msgid "GNU Social Import/Export/Mirror"
-msgstr "Import/Export/Miroir GNU Social"
+#: statusnet.php:385
+msgid "Allow posting to GNU Social"
+msgstr "Autoriser la publication sur GNU Social"
 
-#: statusnet.php:480
+#: statusnet.php:388
+msgid "Send public postings to GNU Social by default"
+msgstr ""
+
+#: statusnet.php:392
+msgid ""
+"Mirror all posts from GNU Social that are no replies or repeated messages"
+msgstr ""
+
+#: statusnet.php:398
+msgid "Import the remote timeline"
+msgstr ""
+
+#: statusnet.php:402
+msgid "Disabled"
+msgstr "Désactiver"
+
+#: statusnet.php:403
+msgid "Full Timeline"
+msgstr "Timeline complète"
+
+#: statusnet.php:404
+msgid "Only Mentions"
+msgstr ""
+
+#: statusnet.php:413
+msgid "Clear OAuth configuration"
+msgstr ""
+
+#: statusnet.php:690
 msgid "Site name"
 msgstr "Nom du site"
 
-#: statusnet.php:482
+#: statusnet.php:692
 msgid "Consumer Secret"
-msgstr "Secret d'Utilisateur"
+msgstr ""
 
-#: statusnet.php:483
+#: statusnet.php:693
 msgid "Consumer Key"
-msgstr "Clé d'Utilisateur"
+msgstr ""
diff --git a/statusnet/lang/fr/strings.php b/statusnet/lang/fr/strings.php
index 0809548f..c70d012c 100644
--- a/statusnet/lang/fr/strings.php
+++ b/statusnet/lang/fr/strings.php
@@ -2,33 +2,39 @@
 
 if(! function_exists("string_plural_select_fr")) {
 function string_plural_select_fr($n){
-	$n = intval($n);
-	if (($n == 0 || $n == 1)) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
+	return ($n > 1);;
 }}
-$a->strings['Post to GNU Social'] = 'Publier sur GNU Social';
-$a->strings['Please contact your site administrator.<br />The provided API URL is not valid.'] = 'Merci de contacter l\'administrateur du site.<br />L\'URL d\'API fournie est invalide.';
-$a->strings['We could not contact the GNU Social API with the Path you entered.'] = 'Impossible de se connecter à l\'API GNU Social avec le chemin indiqué.';
-$a->strings['Save Settings'] = 'Sauvegarder les paramètres';
-$a->strings['Currently connected to: <a href="%s" target="_statusnet">%s</a>'] = 'Actuellement connecté à : <a href="%s" target="_statusnet">%s</a>';
-$a->strings['<strong>Note</strong>: Due your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to GNU Social will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted.'] = '<strong>Note</strong>: En lien avec vos paramètres de confidentialité (<em>Masquer vos détails de profil de visiteurs inconnus ?</em>) le lien potentiellement inclus dans vos publications publiques relayées à GNU Social emmèneront le visiteur à une page blanche l\'informant que l\'accès à votre profil a été restreint.';
-$a->strings['Clear OAuth configuration'] = 'Effacer la configuration OAuth';
-$a->strings['Cancel GNU Social Connection'] = 'Annuler la connexion à GNU Social';
-$a->strings['Globally Available GNU Social OAuthKeys'] = 'Clés OAuth de GNU Social disponibles globalement';
-$a->strings['There are preconfigured OAuth key pairs for some GNU Social servers available. If you are using one of them, please use these credentials. If not feel free to connect to any other GNU Social instance (see below).'] = 'Il y a des paires des clés OAuth préconfigurées disponibles pour certains serveurs GNU Social. Si vous utilisez l\'une d\'elles, merci d\'utiliser ces identifiants. Si non, soyez libre de vous connecter à n\'importe quelle autre instance GNU Social (voir ci-dessous).';
-$a->strings['Provide your own OAuth Credentials'] = 'Fournissez vos propres identifiants OAuth';
-$a->strings['No consumer key pair for GNU Social found. Register your Friendica Account as a desktop application on your GNU Social account, copy the consumer key pair here and enter the API base root.<br />Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendica installation at your favorite GNU Social installation.'] = 'Aucune paire de clés cliente pour GNU Social n\'a été trouvée. Enregistrez votre compte Friendica comme une application de bureau sur votre compte GNU Social, copiez la paire de clés cliente ici et saisissez la racine de base de l\'API. <br />Avant d\'enregistrer votre propre paire de clés, demandez à l\'administrateur si il y a déjà une paire de clés pour cette installation de Friendica sur votre installation GNU Social favorite.';
-$a->strings['To connect to your GNU Social account click the button below to get a security code from GNU Social which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to GNU Social.'] = 'Pour vous connecter à votre compte GNU Social, cliquez sur le bouton ci-dessous pour obtenir un code de sécurité de GNU Social, que vous devrez copier dans le champ de saisie ci-dessous, puis validez le formulaire. Seules vos publications <strong>publiques</strong> seront relayées sur GNU Social.';
-$a->strings['Log in with GNU Social'] = 'Se connecter avec GNU Social';
-$a->strings['Cancel Connection Process'] = 'Annuler le processus de connexion';
-$a->strings['Current GNU Social API is: %s'] = 'L\'API GNU Social actuelle est : %s';
-$a->strings['OAuth Consumer Key'] = 'Clé d\'Utilisateur OAuth';
-$a->strings['OAuth Consumer Secret'] = 'Secret d\'Utilisateur OAuth';
-$a->strings['Base API Path (remember the trailing /)'] = 'Chemin de base de l\'API (n\'oubliez pas le / final)';
-$a->strings['Copy the security code from GNU Social here'] = 'Coller le code de sécurité de GNU Social ici';
-$a->strings['Allow posting to GNU Social'] = 'Autoriser la publication sur GNU Social';
-$a->strings['If enabled all your <strong>public</strong> postings can be posted to the associated GNU Social account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry.'] = 'Si activé, toutes vos publications <strong>publiques</strong> pourront être relayées sur le compte GNU Social associé. Vous pouvez choisir de faire cela par défaut (ici) ou individuellement pour chaque publication dans les options de publications au moment ou vous la créez.';
-$a->strings['Post to GNU Social by default'] = 'Publier sur GNU Social par défaut';
-$a->strings['GNU Social Import/Export/Mirror'] = 'Import/Export/Miroir GNU Social';
-$a->strings['Site name'] = 'Nom du site';
-$a->strings['Consumer Secret'] = 'Secret d\'Utilisateur';
-$a->strings['Consumer Key'] = 'Clé d\'Utilisateur';
+;
+$a->strings["Post to GNU Social"] = "Publier sur GNU Social";
+$a->strings["Please contact your site administrator.<br />The provided API URL is not valid."] = "Merci de contacter l'administrateur du site.<br />L'URL d'API fournie est invalide.";
+$a->strings["We could not contact the GNU Social API with the Path you entered."] = "";
+$a->strings["GNU Social settings updated."] = "Paramètres du GNU Social mis à jour.";
+$a->strings["GNU Social Import/Export/Mirror"] = "";
+$a->strings["Globally Available GNU Social OAuthKeys"] = "";
+$a->strings["There are preconfigured OAuth key pairs for some GNU Social servers available. If you are using one of them, please use these credentials. If not feel free to connect to any other GNU Social instance (see below)."] = "";
+$a->strings["Save Settings"] = "Sauvegarder les paramètres";
+$a->strings["Provide your own OAuth Credentials"] = "";
+$a->strings["No consumer key pair for GNU Social found. Register your Friendica Account as an desktop client on your GNU Social account, copy the consumer key pair here and enter the API base root.<br />Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendica installation at your favorited GNU Social installation."] = "";
+$a->strings["OAuth Consumer Key"] = "";
+$a->strings["OAuth Consumer Secret"] = "";
+$a->strings["Base API Path (remember the trailing /)"] = "";
+$a->strings["To connect to your GNU Social account click the button below to get a security code from GNU Social which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to GNU Social."] = "";
+$a->strings["Log in with GNU Social"] = "Se connecter avec GNU Social";
+$a->strings["Copy the security code from GNU Social here"] = "Coller le code de sécurité de GNU Social ici";
+$a->strings["Cancel Connection Process"] = "";
+$a->strings["Current GNU Social API is"] = "L'API actuelle de GNU Social est";
+$a->strings["Cancel GNU Social Connection"] = "";
+$a->strings["Currently connected to: "] = "Actuellement connecté à :";
+$a->strings["If enabled all your <strong>public</strong> postings can be posted to the associated GNU Social account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "";
+$a->strings["<strong>Note</strong>: Due your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to GNU Social will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "";
+$a->strings["Allow posting to GNU Social"] = "Autoriser la publication sur GNU Social";
+$a->strings["Send public postings to GNU Social by default"] = "";
+$a->strings["Mirror all posts from GNU Social that are no replies or repeated messages"] = "";
+$a->strings["Import the remote timeline"] = "";
+$a->strings["Disabled"] = "Désactiver";
+$a->strings["Full Timeline"] = "Timeline complète";
+$a->strings["Only Mentions"] = "";
+$a->strings["Clear OAuth configuration"] = "";
+$a->strings["Site name"] = "Nom du site";
+$a->strings["Consumer Secret"] = "";
+$a->strings["Consumer Key"] = "";
diff --git a/statusnet/lang/hu/messages.po b/statusnet/lang/hu/messages.po
deleted file mode 100644
index 4d54bc6a..00000000
--- a/statusnet/lang/hu/messages.po
+++ /dev/null
@@ -1,151 +0,0 @@
-# ADDON statusnet
-# Copyright (C)
-# This file is distributed under the same license as the Friendica statusnet addon package.
-# 
-# 
-# Translators:
-# Balázs Úr, 2020-2021
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-12-21 22:32+0000\n"
-"PO-Revision-Date: 2014-06-23 12:54+0000\n"
-"Last-Translator: Balázs Úr, 2020-2021\n"
-"Language-Team: Hungarian (http://app.transifex.com/Friendica/friendica/language/hu/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: hu\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: statusnet.php:76
-msgid "Post to GNU Social"
-msgstr "Beküldés a GNU Socialra"
-
-#: statusnet.php:122
-msgid ""
-"Please contact your site administrator.<br />The provided API URL is not "
-"valid."
-msgstr "Vegye fel a kapcsolatot az oldal adminisztrátorával.<br />A megadott API URL nem érvényes."
-
-#: statusnet.php:150
-msgid "We could not contact the GNU Social API with the Path you entered."
-msgstr "Nem tudtunk kapcsolatba lépni a GNU Social API-val azon az útvonalon, amelyet megadott."
-
-#: statusnet.php:208 statusnet.php:489
-msgid "Save Settings"
-msgstr "Beállítások mentése"
-
-#: statusnet.php:220
-#, php-format
-msgid "Currently connected to: <a href=\"%s\" target=\"_statusnet\">%s</a>"
-msgstr "Jelenleg ehhez kapcsolódott: <a href=\"%s\" target=\"_statusnet\">%s</a>"
-
-#: statusnet.php:225
-msgid ""
-"<strong>Note</strong>: Due your privacy settings (<em>Hide your profile "
-"details from unknown viewers?</em>) the link potentially included in public "
-"postings relayed to GNU Social will lead the visitor to a blank page "
-"informing the visitor that the access to your profile has been restricted."
-msgstr "<strong>Megjegyzés</strong>: az adatvédelmi beállításai miatt (<em>Elrejti a profilja részleteit az ismeretlen megtekintők elől?</em>) a GNU Socialra továbbított nyilvános beküldésekben vélhetően tartalmazott hivatkozás a látogatót egy üres oldalra fogja vezetni, amely arról tájékoztatja a látogatót, hogy a profiljához való hozzáférés korlátozva lett."
-
-#: statusnet.php:228
-msgid "Clear OAuth configuration"
-msgstr "OAuth beállítás törlése"
-
-#: statusnet.php:240
-msgid "Cancel GNU Social Connection"
-msgstr "GNU Social kapcsolódás megszakítása"
-
-#: statusnet.php:247
-msgid "Globally Available GNU Social OAuthKeys"
-msgstr "Globálisan elérhető GNU Social OAuth-kulcsok"
-
-#: statusnet.php:248
-msgid ""
-"There are preconfigured OAuth key pairs for some GNU Social servers "
-"available. If you are using one of them, please use these credentials. If "
-"not feel free to connect to any other GNU Social instance (see below)."
-msgstr "Előre beállított OAuth-kulcspárok érhetők el néhány GNU Social kiszolgálóhoz. Ha ezek egyikét használja, akkor használja ezeket a hitelesítési adatokat. Ha nem használja, akkor nyugodtan kapcsolódjon bármely egyéb GNU Social példányhoz (lásd lent)."
-
-#: statusnet.php:249
-msgid "Provide your own OAuth Credentials"
-msgstr "Adja meg a saját OAuth hitelesítési adatait"
-
-#: statusnet.php:250
-msgid ""
-"No consumer key pair for GNU Social found. Register your Friendica Account "
-"as a desktop application on your GNU Social account, copy the consumer key "
-"pair here and enter the API base root.<br />Before you register your own "
-"OAuth key pair ask the administrator if there is already a key pair for this"
-" Friendica installation at your favorite GNU Social installation."
-msgstr "Nem találhatók felhasználói kulcspárok a GNU Socialhoz. Regisztrálja a Friendica fiókját asztali alkalmazásként a GNU Social fiókjánál, másolja be a felhasználói kulcspárt ide, és adja meg az API alapgyökerét.<br />Mielőtt saját OAuth kulcspárt regisztrálna, kérdezze meg az adminisztrátort, hogy van-e már kulcspár ehhez a Friendica telepítéshez a kedvenc GNU Social telepítésénél."
-
-#: statusnet.php:251
-msgid ""
-"To connect to your GNU Social account click the button below to get a "
-"security code from GNU Social which you have to copy into the input box "
-"below and submit the form. Only your <strong>public</strong> posts will be "
-"posted to GNU Social."
-msgstr "A GNU Social fiókhoz való kapcsolódáshoz kattintson a lenti gombra, hogy megkapja a biztonsági kódot a GNU Socialtól, amelyet a lenti beviteli mezőbe kell bemásolnia, majd el kell küldenie az űrlapot. Csak a <strong>nyilvános</strong> bejegyzései lesznek beküldve a GNU Socialra."
-
-#: statusnet.php:252
-msgid "Log in with GNU Social"
-msgstr "Bejelentkezés GNU Social használatával"
-
-#: statusnet.php:253
-msgid "Cancel Connection Process"
-msgstr "Kapcsolódási folyamat megszakítása"
-
-#: statusnet.php:254
-#, php-format
-msgid "Current GNU Social API is: %s"
-msgstr "A jelenlegi GNU Social API: %s"
-
-#: statusnet.php:271
-msgid "OAuth Consumer Key"
-msgstr "OAuth felhasználói kulcs"
-
-#: statusnet.php:272
-msgid "OAuth Consumer Secret"
-msgstr "OAuth felhasználói titok"
-
-#: statusnet.php:274 statusnet.php:469 statusnet.php:481
-msgid "Base API Path (remember the trailing /)"
-msgstr "Alap API útvonal (ne felejtse el a záró / karaktert)"
-
-#: statusnet.php:275
-msgid "Copy the security code from GNU Social here"
-msgstr "Másolja be ide a GNU Socialtól származó biztonsági kódot"
-
-#: statusnet.php:277
-msgid "Allow posting to GNU Social"
-msgstr "Beküldés engedélyezése a GNU Socialra"
-
-#: statusnet.php:277
-msgid ""
-"If enabled all your <strong>public</strong> postings can be posted to the "
-"associated GNU Social account. You can choose to do so by default (here) or "
-"for every posting separately in the posting options when writing the entry."
-msgstr "Ha engedélyezve van, akkor az összes <strong>nyilvános</strong> beküldés beküldhető a hozzárendelt GNU Social fiókba. Kiválaszthatja, hogy ezt alapértelmezetten szeretné-e (itt), vagy minden egyes beküldésnél különállóan a beküldési beállításokban, amikor megírja a bejegyzést."
-
-#: statusnet.php:278
-msgid "Post to GNU Social by default"
-msgstr "Beküldés a GNU Socialra alapértelmezetten"
-
-#: statusnet.php:283
-msgid "GNU Social Import/Export/Mirror"
-msgstr "GNU Social importálás, exportálás vagy tükrözés"
-
-#: statusnet.php:480
-msgid "Site name"
-msgstr "Oldal neve"
-
-#: statusnet.php:482
-msgid "Consumer Secret"
-msgstr "Felhasználói titok"
-
-#: statusnet.php:483
-msgid "Consumer Key"
-msgstr "Felhasználói kulcs"
diff --git a/statusnet/lang/hu/strings.php b/statusnet/lang/hu/strings.php
deleted file mode 100644
index b1fe1550..00000000
--- a/statusnet/lang/hu/strings.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_hu")) {
-function string_plural_select_hu($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Post to GNU Social'] = 'Beküldés a GNU Socialra';
-$a->strings['Please contact your site administrator.<br />The provided API URL is not valid.'] = 'Vegye fel a kapcsolatot az oldal adminisztrátorával.<br />A megadott API URL nem érvényes.';
-$a->strings['We could not contact the GNU Social API with the Path you entered.'] = 'Nem tudtunk kapcsolatba lépni a GNU Social API-val azon az útvonalon, amelyet megadott.';
-$a->strings['Save Settings'] = 'Beállítások mentése';
-$a->strings['Currently connected to: <a href="%s" target="_statusnet">%s</a>'] = 'Jelenleg ehhez kapcsolódott: <a href="%s" target="_statusnet">%s</a>';
-$a->strings['<strong>Note</strong>: Due your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to GNU Social will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted.'] = '<strong>Megjegyzés</strong>: az adatvédelmi beállításai miatt (<em>Elrejti a profilja részleteit az ismeretlen megtekintők elől?</em>) a GNU Socialra továbbított nyilvános beküldésekben vélhetően tartalmazott hivatkozás a látogatót egy üres oldalra fogja vezetni, amely arról tájékoztatja a látogatót, hogy a profiljához való hozzáférés korlátozva lett.';
-$a->strings['Clear OAuth configuration'] = 'OAuth beállítás törlése';
-$a->strings['Cancel GNU Social Connection'] = 'GNU Social kapcsolódás megszakítása';
-$a->strings['Globally Available GNU Social OAuthKeys'] = 'Globálisan elérhető GNU Social OAuth-kulcsok';
-$a->strings['There are preconfigured OAuth key pairs for some GNU Social servers available. If you are using one of them, please use these credentials. If not feel free to connect to any other GNU Social instance (see below).'] = 'Előre beállított OAuth-kulcspárok érhetők el néhány GNU Social kiszolgálóhoz. Ha ezek egyikét használja, akkor használja ezeket a hitelesítési adatokat. Ha nem használja, akkor nyugodtan kapcsolódjon bármely egyéb GNU Social példányhoz (lásd lent).';
-$a->strings['Provide your own OAuth Credentials'] = 'Adja meg a saját OAuth hitelesítési adatait';
-$a->strings['No consumer key pair for GNU Social found. Register your Friendica Account as a desktop application on your GNU Social account, copy the consumer key pair here and enter the API base root.<br />Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendica installation at your favorite GNU Social installation.'] = 'Nem találhatók felhasználói kulcspárok a GNU Socialhoz. Regisztrálja a Friendica fiókját asztali alkalmazásként a GNU Social fiókjánál, másolja be a felhasználói kulcspárt ide, és adja meg az API alapgyökerét.<br />Mielőtt saját OAuth kulcspárt regisztrálna, kérdezze meg az adminisztrátort, hogy van-e már kulcspár ehhez a Friendica telepítéshez a kedvenc GNU Social telepítésénél.';
-$a->strings['To connect to your GNU Social account click the button below to get a security code from GNU Social which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to GNU Social.'] = 'A GNU Social fiókhoz való kapcsolódáshoz kattintson a lenti gombra, hogy megkapja a biztonsági kódot a GNU Socialtól, amelyet a lenti beviteli mezőbe kell bemásolnia, majd el kell küldenie az űrlapot. Csak a <strong>nyilvános</strong> bejegyzései lesznek beküldve a GNU Socialra.';
-$a->strings['Log in with GNU Social'] = 'Bejelentkezés GNU Social használatával';
-$a->strings['Cancel Connection Process'] = 'Kapcsolódási folyamat megszakítása';
-$a->strings['Current GNU Social API is: %s'] = 'A jelenlegi GNU Social API: %s';
-$a->strings['OAuth Consumer Key'] = 'OAuth felhasználói kulcs';
-$a->strings['OAuth Consumer Secret'] = 'OAuth felhasználói titok';
-$a->strings['Base API Path (remember the trailing /)'] = 'Alap API útvonal (ne felejtse el a záró / karaktert)';
-$a->strings['Copy the security code from GNU Social here'] = 'Másolja be ide a GNU Socialtól származó biztonsági kódot';
-$a->strings['Allow posting to GNU Social'] = 'Beküldés engedélyezése a GNU Socialra';
-$a->strings['If enabled all your <strong>public</strong> postings can be posted to the associated GNU Social account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry.'] = 'Ha engedélyezve van, akkor az összes <strong>nyilvános</strong> beküldés beküldhető a hozzárendelt GNU Social fiókba. Kiválaszthatja, hogy ezt alapértelmezetten szeretné-e (itt), vagy minden egyes beküldésnél különállóan a beküldési beállításokban, amikor megírja a bejegyzést.';
-$a->strings['Post to GNU Social by default'] = 'Beküldés a GNU Socialra alapértelmezetten';
-$a->strings['GNU Social Import/Export/Mirror'] = 'GNU Social importálás, exportálás vagy tükrözés';
-$a->strings['Site name'] = 'Oldal neve';
-$a->strings['Consumer Secret'] = 'Felhasználói titok';
-$a->strings['Consumer Key'] = 'Felhasználói kulcs';
diff --git a/statusnet/lang/is/messages.po b/statusnet/lang/is/messages.po
index fbf4e25d..512c6560 100644
--- a/statusnet/lang/is/messages.po
+++ b/statusnet/lang/is/messages.po
@@ -9,80 +9,80 @@ msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-12-21 22:32+0000\n"
-"PO-Revision-Date: 2014-06-23 12:54+0000\n"
-"Last-Translator: Sveinn í Felli <sv1@fellsnet.is>, 2018\n"
-"Language-Team: Icelandic (http://app.transifex.com/Friendica/friendica/language/is/)\n"
+"POT-Creation-Date: 2015-07-27 07:21+0200\n"
+"PO-Revision-Date: 2018-05-24 10:00+0000\n"
+"Last-Translator: Sveinn í Felli <sv1@fellsnet.is>\n"
+"Language-Team: Icelandic (http://www.transifex.com/Friendica/friendica/language/is/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: is\n"
 "Plural-Forms: nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);\n"
 
-#: statusnet.php:76
+#: statusnet.php:151
 msgid "Post to GNU Social"
 msgstr "Senda á GNU Social"
 
-#: statusnet.php:122
+#: statusnet.php:196
 msgid ""
 "Please contact your site administrator.<br />The provided API URL is not "
 "valid."
 msgstr "Hafðu samband við kerfisstjóra.<br />Uppgefin API-slóð er ógild."
 
-#: statusnet.php:150
+#: statusnet.php:225
 msgid "We could not contact the GNU Social API with the Path you entered."
 msgstr "Ekki náðist í GNU Social API með slóðinni sem þú gafst upp."
 
-#: statusnet.php:208 statusnet.php:489
-msgid "Save Settings"
-msgstr "Vista stillingar"
+#: statusnet.php:259
+msgid "GNU Social settings updated."
+msgstr "Stillingar GNU Social uppfærðar."
 
-#: statusnet.php:220
-#, php-format
-msgid "Currently connected to: <a href=\"%s\" target=\"_statusnet\">%s</a>"
+#: statusnet.php:294 statusnet.php:298
+msgid "GNU Social Import/Export/Mirror"
 msgstr ""
 
-#: statusnet.php:225
-msgid ""
-"<strong>Note</strong>: Due your privacy settings (<em>Hide your profile "
-"details from unknown viewers?</em>) the link potentially included in public "
-"postings relayed to GNU Social will lead the visitor to a blank page "
-"informing the visitor that the access to your profile has been restricted."
-msgstr ""
-
-#: statusnet.php:228
-msgid "Clear OAuth configuration"
-msgstr "Hreinsa OAuth stillingar"
-
-#: statusnet.php:240
-msgid "Cancel GNU Social Connection"
-msgstr "Hætta við GNU Social tengingu"
-
-#: statusnet.php:247
+#: statusnet.php:313
 msgid "Globally Available GNU Social OAuthKeys"
 msgstr "Víðværir OAuth-lyklar GNU Social eru til taks"
 
-#: statusnet.php:248
+#: statusnet.php:314
 msgid ""
 "There are preconfigured OAuth key pairs for some GNU Social servers "
 "available. If you are using one of them, please use these credentials. If "
 "not feel free to connect to any other GNU Social instance (see below)."
 msgstr "Það eru forstillt OAuth-lyklapör í sumum GNU Social þjónum.  Ef þú ert að nota slíkt par, notaðu þá þau auðkenni. Ef ekki þá er þér frjálst að tengjast hvaða öðrum GNU Social þjónum (sjá fyrir neðan)."
 
-#: statusnet.php:249
+#: statusnet.php:320 statusnet.php:337 statusnet.php:364 statusnet.php:371
+#: statusnet.php:416 statusnet.php:699
+msgid "Save Settings"
+msgstr "Vista stillingar"
+
+#: statusnet.php:322
 msgid "Provide your own OAuth Credentials"
 msgstr "Gefðu upp eigin OAuth auðkenni"
 
-#: statusnet.php:250
+#: statusnet.php:323
 msgid ""
 "No consumer key pair for GNU Social found. Register your Friendica Account "
-"as a desktop application on your GNU Social account, copy the consumer key "
-"pair here and enter the API base root.<br />Before you register your own "
-"OAuth key pair ask the administrator if there is already a key pair for this"
-" Friendica installation at your favorite GNU Social installation."
+"as an desktop client on your GNU Social account, copy the consumer key pair "
+"here and enter the API base root.<br />Before you register your own OAuth "
+"key pair ask the administrator if there is already a key pair for this "
+"Friendica installation at your favorited GNU Social installation."
 msgstr ""
 
-#: statusnet.php:251
+#: statusnet.php:325
+msgid "OAuth Consumer Key"
+msgstr "OAuth-lykill notanda"
+
+#: statusnet.php:328
+msgid "OAuth Consumer Secret"
+msgstr "OAuth-leyniorð notanda"
+
+#: statusnet.php:331 statusnet.php:679 statusnet.php:691
+msgid "Base API Path (remember the trailing /)"
+msgstr "Grunn API-slóð (muna eftir / í endann)"
+
+#: statusnet.php:356
 msgid ""
 "To connect to your GNU Social account click the button below to get a "
 "security code from GNU Social which you have to copy into the input box "
@@ -90,62 +90,86 @@ msgid ""
 "posted to GNU Social."
 msgstr "Til að tengjast GNU Social notandaaðgangnum ýttu á hnappinn hér fyrir neðan, þá fæst öryggislykill frá GNU Social sem þarf að afrita í svæðið fyrir neðan og senda inn. Aðeins <strong>opinberar</strong> færslur munu flæða yfir á GNU Social."
 
-#: statusnet.php:252
+#: statusnet.php:357
 msgid "Log in with GNU Social"
 msgstr "Skrá inn með GNU Social"
 
-#: statusnet.php:253
-msgid "Cancel Connection Process"
-msgstr "Hætta við tengiferli"
-
-#: statusnet.php:254
-#, php-format
-msgid "Current GNU Social API is: %s"
-msgstr ""
-
-#: statusnet.php:271
-msgid "OAuth Consumer Key"
-msgstr "OAuth-lykill notanda"
-
-#: statusnet.php:272
-msgid "OAuth Consumer Secret"
-msgstr "OAuth-leyniorð notanda"
-
-#: statusnet.php:274 statusnet.php:469 statusnet.php:481
-msgid "Base API Path (remember the trailing /)"
-msgstr "Grunn API-slóð (muna eftir / í endann)"
-
-#: statusnet.php:275
+#: statusnet.php:359
 msgid "Copy the security code from GNU Social here"
 msgstr "Afrita öryggislykil frá GNU Social hingað"
 
-#: statusnet.php:277
-msgid "Allow posting to GNU Social"
-msgstr "Leyfa sendingu færslna til GNU Social"
+#: statusnet.php:365
+msgid "Cancel Connection Process"
+msgstr "Hætta við tengiferli"
 
-#: statusnet.php:277
+#: statusnet.php:367
+msgid "Current GNU Social API is"
+msgstr "Núverandi GNU Social API er"
+
+#: statusnet.php:368
+msgid "Cancel GNU Social Connection"
+msgstr "Hætta við GNU Social tengingu"
+
+#: statusnet.php:379
+msgid "Currently connected to: "
+msgstr "Núna tengdur við:"
+
+#: statusnet.php:380
 msgid ""
 "If enabled all your <strong>public</strong> postings can be posted to the "
 "associated GNU Social account. You can choose to do so by default (here) or "
 "for every posting separately in the posting options when writing the entry."
 msgstr "Ef virkt þá geta allar <strong>opinberu</strong> stöðu meldingarnar þínar verið birtar á tengdri GNU Social síðu. Þú getur valið að gera þetta sjálfvirkt (hér) eða fyrir hvern póst í senn þegar hann er skrifaður."
 
-#: statusnet.php:278
-msgid "Post to GNU Social by default"
+#: statusnet.php:382
+msgid ""
+"<strong>Note</strong>: Due your privacy settings (<em>Hide your profile "
+"details from unknown viewers?</em>) the link potentially included in public "
+"postings relayed to GNU Social will lead the visitor to a blank page "
+"informing the visitor that the access to your profile has been restricted."
 msgstr ""
 
-#: statusnet.php:283
-msgid "GNU Social Import/Export/Mirror"
+#: statusnet.php:385
+msgid "Allow posting to GNU Social"
+msgstr "Leyfa sendingu færslna til GNU Social"
+
+#: statusnet.php:388
+msgid "Send public postings to GNU Social by default"
+msgstr "Sjálfgefið senda opinberar færslur á GNU Social"
+
+#: statusnet.php:392
+msgid ""
+"Mirror all posts from GNU Social that are no replies or repeated messages"
 msgstr ""
 
-#: statusnet.php:480
+#: statusnet.php:398
+msgid "Import the remote timeline"
+msgstr "Flytja inn fjartengdu tímalínuna"
+
+#: statusnet.php:402
+msgid "Disabled"
+msgstr "Slökkt"
+
+#: statusnet.php:403
+msgid "Full Timeline"
+msgstr "Öll tímalínan"
+
+#: statusnet.php:404
+msgid "Only Mentions"
+msgstr ""
+
+#: statusnet.php:413
+msgid "Clear OAuth configuration"
+msgstr "Hreinsa OAuth stillingar"
+
+#: statusnet.php:690
 msgid "Site name"
 msgstr "Heiti vefsvæðis"
 
-#: statusnet.php:482
+#: statusnet.php:692
 msgid "Consumer Secret"
 msgstr "Leyniorð notanda"
 
-#: statusnet.php:483
+#: statusnet.php:693
 msgid "Consumer Key"
 msgstr "Lykill notanda"
diff --git a/statusnet/lang/is/strings.php b/statusnet/lang/is/strings.php
index 18a3b8b6..367b40bb 100644
--- a/statusnet/lang/is/strings.php
+++ b/statusnet/lang/is/strings.php
@@ -3,26 +3,39 @@
 if(! function_exists("string_plural_select_is")) {
 function string_plural_select_is($n){
 	$n = intval($n);
-	return intval($n % 10 != 1 || $n % 100 == 11);
+	return ($n % 10 != 1 || $n % 100 == 11);;
 }}
-$a->strings['Post to GNU Social'] = 'Senda á GNU Social';
-$a->strings['Please contact your site administrator.<br />The provided API URL is not valid.'] = 'Hafðu samband við kerfisstjóra.<br />Uppgefin API-slóð er ógild.';
-$a->strings['We could not contact the GNU Social API with the Path you entered.'] = 'Ekki náðist í GNU Social API með slóðinni sem þú gafst upp.';
-$a->strings['Save Settings'] = 'Vista stillingar';
-$a->strings['Clear OAuth configuration'] = 'Hreinsa OAuth stillingar';
-$a->strings['Cancel GNU Social Connection'] = 'Hætta við GNU Social tengingu';
-$a->strings['Globally Available GNU Social OAuthKeys'] = 'Víðværir OAuth-lyklar GNU Social eru til taks';
-$a->strings['There are preconfigured OAuth key pairs for some GNU Social servers available. If you are using one of them, please use these credentials. If not feel free to connect to any other GNU Social instance (see below).'] = 'Það eru forstillt OAuth-lyklapör í sumum GNU Social þjónum.  Ef þú ert að nota slíkt par, notaðu þá þau auðkenni. Ef ekki þá er þér frjálst að tengjast hvaða öðrum GNU Social þjónum (sjá fyrir neðan).';
-$a->strings['Provide your own OAuth Credentials'] = 'Gefðu upp eigin OAuth auðkenni';
-$a->strings['To connect to your GNU Social account click the button below to get a security code from GNU Social which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to GNU Social.'] = 'Til að tengjast GNU Social notandaaðgangnum ýttu á hnappinn hér fyrir neðan, þá fæst öryggislykill frá GNU Social sem þarf að afrita í svæðið fyrir neðan og senda inn. Aðeins <strong>opinberar</strong> færslur munu flæða yfir á GNU Social.';
-$a->strings['Log in with GNU Social'] = 'Skrá inn með GNU Social';
-$a->strings['Cancel Connection Process'] = 'Hætta við tengiferli';
-$a->strings['OAuth Consumer Key'] = 'OAuth-lykill notanda';
-$a->strings['OAuth Consumer Secret'] = 'OAuth-leyniorð notanda';
-$a->strings['Base API Path (remember the trailing /)'] = 'Grunn API-slóð (muna eftir / í endann)';
-$a->strings['Copy the security code from GNU Social here'] = 'Afrita öryggislykil frá GNU Social hingað';
-$a->strings['Allow posting to GNU Social'] = 'Leyfa sendingu færslna til GNU Social';
-$a->strings['If enabled all your <strong>public</strong> postings can be posted to the associated GNU Social account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry.'] = 'Ef virkt þá geta allar <strong>opinberu</strong> stöðu meldingarnar þínar verið birtar á tengdri GNU Social síðu. Þú getur valið að gera þetta sjálfvirkt (hér) eða fyrir hvern póst í senn þegar hann er skrifaður.';
-$a->strings['Site name'] = 'Heiti vefsvæðis';
-$a->strings['Consumer Secret'] = 'Leyniorð notanda';
-$a->strings['Consumer Key'] = 'Lykill notanda';
+;
+$a->strings["Post to GNU Social"] = "Senda á GNU Social";
+$a->strings["Please contact your site administrator.<br />The provided API URL is not valid."] = "Hafðu samband við kerfisstjóra.<br />Uppgefin API-slóð er ógild.";
+$a->strings["We could not contact the GNU Social API with the Path you entered."] = "Ekki náðist í GNU Social API með slóðinni sem þú gafst upp.";
+$a->strings["GNU Social settings updated."] = "Stillingar GNU Social uppfærðar.";
+$a->strings["GNU Social Import/Export/Mirror"] = "";
+$a->strings["Globally Available GNU Social OAuthKeys"] = "Víðværir OAuth-lyklar GNU Social eru til taks";
+$a->strings["There are preconfigured OAuth key pairs for some GNU Social servers available. If you are using one of them, please use these credentials. If not feel free to connect to any other GNU Social instance (see below)."] = "Það eru forstillt OAuth-lyklapör í sumum GNU Social þjónum.  Ef þú ert að nota slíkt par, notaðu þá þau auðkenni. Ef ekki þá er þér frjálst að tengjast hvaða öðrum GNU Social þjónum (sjá fyrir neðan).";
+$a->strings["Save Settings"] = "Vista stillingar";
+$a->strings["Provide your own OAuth Credentials"] = "Gefðu upp eigin OAuth auðkenni";
+$a->strings["No consumer key pair for GNU Social found. Register your Friendica Account as an desktop client on your GNU Social account, copy the consumer key pair here and enter the API base root.<br />Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendica installation at your favorited GNU Social installation."] = "";
+$a->strings["OAuth Consumer Key"] = "OAuth-lykill notanda";
+$a->strings["OAuth Consumer Secret"] = "OAuth-leyniorð notanda";
+$a->strings["Base API Path (remember the trailing /)"] = "Grunn API-slóð (muna eftir / í endann)";
+$a->strings["To connect to your GNU Social account click the button below to get a security code from GNU Social which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to GNU Social."] = "Til að tengjast GNU Social notandaaðgangnum ýttu á hnappinn hér fyrir neðan, þá fæst öryggislykill frá GNU Social sem þarf að afrita í svæðið fyrir neðan og senda inn. Aðeins <strong>opinberar</strong> færslur munu flæða yfir á GNU Social.";
+$a->strings["Log in with GNU Social"] = "Skrá inn með GNU Social";
+$a->strings["Copy the security code from GNU Social here"] = "Afrita öryggislykil frá GNU Social hingað";
+$a->strings["Cancel Connection Process"] = "Hætta við tengiferli";
+$a->strings["Current GNU Social API is"] = "Núverandi GNU Social API er";
+$a->strings["Cancel GNU Social Connection"] = "Hætta við GNU Social tengingu";
+$a->strings["Currently connected to: "] = "Núna tengdur við:";
+$a->strings["If enabled all your <strong>public</strong> postings can be posted to the associated GNU Social account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "Ef virkt þá geta allar <strong>opinberu</strong> stöðu meldingarnar þínar verið birtar á tengdri GNU Social síðu. Þú getur valið að gera þetta sjálfvirkt (hér) eða fyrir hvern póst í senn þegar hann er skrifaður.";
+$a->strings["<strong>Note</strong>: Due your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to GNU Social will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "";
+$a->strings["Allow posting to GNU Social"] = "Leyfa sendingu færslna til GNU Social";
+$a->strings["Send public postings to GNU Social by default"] = "Sjálfgefið senda opinberar færslur á GNU Social";
+$a->strings["Mirror all posts from GNU Social that are no replies or repeated messages"] = "";
+$a->strings["Import the remote timeline"] = "Flytja inn fjartengdu tímalínuna";
+$a->strings["Disabled"] = "Slökkt";
+$a->strings["Full Timeline"] = "Öll tímalínan";
+$a->strings["Only Mentions"] = "";
+$a->strings["Clear OAuth configuration"] = "Hreinsa OAuth stillingar";
+$a->strings["Site name"] = "Heiti vefsvæðis";
+$a->strings["Consumer Secret"] = "Leyniorð notanda";
+$a->strings["Consumer Key"] = "Lykill notanda";
diff --git a/statusnet/lang/it/messages.po b/statusnet/lang/it/messages.po
index 6cc89fc9..c2c3404f 100644
--- a/statusnet/lang/it/messages.po
+++ b/statusnet/lang/it/messages.po
@@ -5,85 +5,84 @@
 # 
 # Translators:
 # fabrixxm <fabrix.xm@gmail.com>, 2014-2015
-# Sylke Vicious <silkevicious@gmail.com>, 2020,2023
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-12-21 22:32+0000\n"
-"PO-Revision-Date: 2014-06-23 12:54+0000\n"
-"Last-Translator: Sylke Vicious <silkevicious@gmail.com>, 2020,2023\n"
-"Language-Team: Italian (http://app.transifex.com/Friendica/friendica/language/it/)\n"
+"POT-Creation-Date: 2015-07-27 07:21+0200\n"
+"PO-Revision-Date: 2017-09-20 06:08+0000\n"
+"Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n"
+"Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: it\n"
-"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: statusnet.php:76
+#: statusnet.php:151
 msgid "Post to GNU Social"
 msgstr "Invia a GNU Social"
 
-#: statusnet.php:122
+#: statusnet.php:196
 msgid ""
 "Please contact your site administrator.<br />The provided API URL is not "
 "valid."
 msgstr "Contatta l'amministratore del sito.<br/>L'URL delle API fornito non è valido."
 
-#: statusnet.php:150
+#: statusnet.php:225
 msgid "We could not contact the GNU Social API with the Path you entered."
 msgstr "Non possiamo conttattare le API di GNU Social con il percorso che hai inserito."
 
-#: statusnet.php:208 statusnet.php:489
-msgid "Save Settings"
-msgstr "Salva Impostazioni"
+#: statusnet.php:259
+msgid "GNU Social settings updated."
+msgstr "Impostazioni di GNU Social aggiornate."
 
-#: statusnet.php:220
-#, php-format
-msgid "Currently connected to: <a href=\"%s\" target=\"_statusnet\">%s</a>"
-msgstr "Attualmente connesso a: <a href=\"%s\" target=\"_statusnet\">%s</a>"
+#: statusnet.php:294 statusnet.php:298
+msgid "GNU Social Import/Export/Mirror"
+msgstr "Esporta/Importa/Clona GNU Social"
 
-#: statusnet.php:225
-msgid ""
-"<strong>Note</strong>: Due your privacy settings (<em>Hide your profile "
-"details from unknown viewers?</em>) the link potentially included in public "
-"postings relayed to GNU Social will lead the visitor to a blank page "
-"informing the visitor that the access to your profile has been restricted."
-msgstr "<strong>Nota</strong>: A causa delle tue impostazioni di privacy(<em>Nascondi i dettagli del tuo profilo ai visitatori sconosciuti?</em>) il collegamento potenzialmente incluso nei messaggi pubblici inviati a GNU Social porterà i visitatori a una pagina bianca con una nota che li informa che l'accesso al tuo profilo è stato limitato."
-
-#: statusnet.php:228
-msgid "Clear OAuth configuration"
-msgstr "Rimuovi la configurazione OAuth"
-
-#: statusnet.php:240
-msgid "Cancel GNU Social Connection"
-msgstr "Annulla la connessione a GNU Social"
-
-#: statusnet.php:247
+#: statusnet.php:313
 msgid "Globally Available GNU Social OAuthKeys"
 msgstr "OAuthKeys globali di GNU Social"
 
-#: statusnet.php:248
+#: statusnet.php:314
 msgid ""
 "There are preconfigured OAuth key pairs for some GNU Social servers "
 "available. If you are using one of them, please use these credentials. If "
 "not feel free to connect to any other GNU Social instance (see below)."
 msgstr "Esistono coppie di chiavi OAuth precofigurate per alcuni server GNU Social. Se usi uno di questi server, per favore scegli queste credenziali. Altrimenti sei libero di collegarti a un'altra installazione di GNU Social (vedi sotto)."
 
-#: statusnet.php:249
+#: statusnet.php:320 statusnet.php:337 statusnet.php:364 statusnet.php:371
+#: statusnet.php:416 statusnet.php:699
+msgid "Save Settings"
+msgstr "Salva Impostazioni"
+
+#: statusnet.php:322
 msgid "Provide your own OAuth Credentials"
 msgstr "Fornisci le tue credenziali OAuth"
 
-#: statusnet.php:250
+#: statusnet.php:323
 msgid ""
 "No consumer key pair for GNU Social found. Register your Friendica Account "
-"as a desktop application on your GNU Social account, copy the consumer key "
-"pair here and enter the API base root.<br />Before you register your own "
-"OAuth key pair ask the administrator if there is already a key pair for this"
-" Friendica installation at your favorite GNU Social installation."
-msgstr "Coppia di chiavi consumer per GNU Social non trovata. Registra il tuo Account Friendica come applicazione desktop nel tuo account GNU Social, copia la coppia di chiavi consumer qui e inserisci il percorso delle API.<br />Prima di registrare una tua coppia di chiavi OAuth chiedi all'amministratore se esiste già una coppia di chiavi tra questa installazione Friendica e l'installazione GNU Social."
+"as an desktop client on your GNU Social account, copy the consumer key pair "
+"here and enter the API base root.<br />Before you register your own OAuth "
+"key pair ask the administrator if there is already a key pair for this "
+"Friendica installation at your favorited GNU Social installation."
+msgstr "Nessuna coppia di chiavi consumer trovate per GNU Social. Registra il tuo account Friendica come un client desktop nel tuo account GNU Social, copia la coppia di chiavi consumer qui e inserisci l'url base delle API.<br/>Prima di registrare la tua coppia di chiavi OAuth, chiedi all'amministratore se esiste già una coppia di chiavi per questo sito Friendica presso la tua installazione GNU Social preferita."
 
-#: statusnet.php:251
+#: statusnet.php:325
+msgid "OAuth Consumer Key"
+msgstr "OAuth Consumer Key"
+
+#: statusnet.php:328
+msgid "OAuth Consumer Secret"
+msgstr "OAuth Consumer Secret"
+
+#: statusnet.php:331 statusnet.php:679 statusnet.php:691
+msgid "Base API Path (remember the trailing /)"
+msgstr "Indirizzo di base per le API (ricorda la / alla fine)"
+
+#: statusnet.php:356
 msgid ""
 "To connect to your GNU Social account click the button below to get a "
 "security code from GNU Social which you have to copy into the input box "
@@ -91,62 +90,86 @@ msgid ""
 "posted to GNU Social."
 msgstr "Per collegare il tuo account GNU Social, clicca sul bottone per ottenere un codice di sicurezza da GNU Social, che dovrai copiare nel box sottostante e poi inviare la form. Solo i tuoi messaggi <strong>pubblici</strong> saranno inviati a GNU Social."
 
-#: statusnet.php:252
+#: statusnet.php:357
 msgid "Log in with GNU Social"
 msgstr "Accedi con GNU Social"
 
-#: statusnet.php:253
-msgid "Cancel Connection Process"
-msgstr "Annulla il processo di connessione"
-
-#: statusnet.php:254
-#, php-format
-msgid "Current GNU Social API is: %s"
-msgstr "La API attuale di GNU Social è: %s"
-
-#: statusnet.php:271
-msgid "OAuth Consumer Key"
-msgstr "OAuth Consumer Key"
-
-#: statusnet.php:272
-msgid "OAuth Consumer Secret"
-msgstr "OAuth Consumer Secret"
-
-#: statusnet.php:274 statusnet.php:469 statusnet.php:481
-msgid "Base API Path (remember the trailing /)"
-msgstr "Indirizzo di base per le API (ricorda la / alla fine)"
-
-#: statusnet.php:275
+#: statusnet.php:359
 msgid "Copy the security code from GNU Social here"
 msgstr "Copia il codice di sicurezza da GNU Social qui"
 
-#: statusnet.php:277
-msgid "Allow posting to GNU Social"
-msgstr "Permetti l'invio a GNU Social"
+#: statusnet.php:365
+msgid "Cancel Connection Process"
+msgstr "Annulla il processo di connessione"
 
-#: statusnet.php:277
+#: statusnet.php:367
+msgid "Current GNU Social API is"
+msgstr "Le API GNU Social correnti sono"
+
+#: statusnet.php:368
+msgid "Cancel GNU Social Connection"
+msgstr "Annulla la connessione a GNU Social"
+
+#: statusnet.php:379
+msgid "Currently connected to: "
+msgstr "Al momento connesso con:"
+
+#: statusnet.php:380
 msgid ""
 "If enabled all your <strong>public</strong> postings can be posted to the "
 "associated GNU Social account. You can choose to do so by default (here) or "
 "for every posting separately in the posting options when writing the entry."
 msgstr "Se abilitato tutti i tuoi messaggi <strong>pubblici</strong> possono essere inviati all'account GNU Social associato. Puoi scegliere di farlo sempre (qui) o ogni volta che invii, nelle impostazioni di privacy del messaggio."
 
-#: statusnet.php:278
-msgid "Post to GNU Social by default"
-msgstr "Pubblica su GNU Social per impostazione predefinita"
+#: statusnet.php:382
+msgid ""
+"<strong>Note</strong>: Due your privacy settings (<em>Hide your profile "
+"details from unknown viewers?</em>) the link potentially included in public "
+"postings relayed to GNU Social will lead the visitor to a blank page "
+"informing the visitor that the access to your profile has been restricted."
+msgstr "<strong>Nota</strong>: A causa delle tue impostazioni di privacy(<em>Nascondi i dettagli del tuo profilo ai visitatori sconosciuti?</em>) il link potenzialmente incluse nei messaggi pubblici inviati a GNU Social porterà i visitatori a una pagina bianca con una nota che li informa che l'accesso al tuo profilo è stato limitato."
 
-#: statusnet.php:283
-msgid "GNU Social Import/Export/Mirror"
-msgstr "Esporta/Importa/Clona GNU Social"
+#: statusnet.php:385
+msgid "Allow posting to GNU Social"
+msgstr "Permetti l'invio a GNU Social"
 
-#: statusnet.php:480
+#: statusnet.php:388
+msgid "Send public postings to GNU Social by default"
+msgstr "Invia sempre i messaggi pubblici a GNU Social"
+
+#: statusnet.php:392
+msgid ""
+"Mirror all posts from GNU Social that are no replies or repeated messages"
+msgstr "Clona tutti i messaggi da GNU Social che non sono risposte o messaggi ripetuti"
+
+#: statusnet.php:398
+msgid "Import the remote timeline"
+msgstr "Importa la timeline remota"
+
+#: statusnet.php:402
+msgid "Disabled"
+msgstr "Disabilitato"
+
+#: statusnet.php:403
+msgid "Full Timeline"
+msgstr "Timeline completa"
+
+#: statusnet.php:404
+msgid "Only Mentions"
+msgstr "Solo menzioni"
+
+#: statusnet.php:413
+msgid "Clear OAuth configuration"
+msgstr "Rimuovi la configurazione OAuth"
+
+#: statusnet.php:690
 msgid "Site name"
 msgstr "Nome del sito"
 
-#: statusnet.php:482
+#: statusnet.php:692
 msgid "Consumer Secret"
 msgstr "Consumer Secret"
 
-#: statusnet.php:483
+#: statusnet.php:693
 msgid "Consumer Key"
 msgstr "Consumer Key"
diff --git a/statusnet/lang/it/strings.php b/statusnet/lang/it/strings.php
index 309f8bb2..e9677684 100644
--- a/statusnet/lang/it/strings.php
+++ b/statusnet/lang/it/strings.php
@@ -2,33 +2,39 @@
 
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
-	$n = intval($n);
-	if ($n == 1) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
+	return ($n != 1);;
 }}
-$a->strings['Post to GNU Social'] = 'Invia a GNU Social';
-$a->strings['Please contact your site administrator.<br />The provided API URL is not valid.'] = 'Contatta l\'amministratore del sito.<br/>L\'URL delle API fornito non è valido.';
-$a->strings['We could not contact the GNU Social API with the Path you entered.'] = 'Non possiamo conttattare le API di GNU Social con il percorso che hai inserito.';
-$a->strings['Save Settings'] = 'Salva Impostazioni';
-$a->strings['Currently connected to: <a href="%s" target="_statusnet">%s</a>'] = 'Attualmente connesso a: <a href="%s" target="_statusnet">%s</a>';
-$a->strings['<strong>Note</strong>: Due your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to GNU Social will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted.'] = '<strong>Nota</strong>: A causa delle tue impostazioni di privacy(<em>Nascondi i dettagli del tuo profilo ai visitatori sconosciuti?</em>) il collegamento potenzialmente incluso nei messaggi pubblici inviati a GNU Social porterà i visitatori a una pagina bianca con una nota che li informa che l\'accesso al tuo profilo è stato limitato.';
-$a->strings['Clear OAuth configuration'] = 'Rimuovi la configurazione OAuth';
-$a->strings['Cancel GNU Social Connection'] = 'Annulla la connessione a GNU Social';
-$a->strings['Globally Available GNU Social OAuthKeys'] = 'OAuthKeys globali di GNU Social';
-$a->strings['There are preconfigured OAuth key pairs for some GNU Social servers available. If you are using one of them, please use these credentials. If not feel free to connect to any other GNU Social instance (see below).'] = 'Esistono coppie di chiavi OAuth precofigurate per alcuni server GNU Social. Se usi uno di questi server, per favore scegli queste credenziali. Altrimenti sei libero di collegarti a un\'altra installazione di GNU Social (vedi sotto).';
-$a->strings['Provide your own OAuth Credentials'] = 'Fornisci le tue credenziali OAuth';
-$a->strings['No consumer key pair for GNU Social found. Register your Friendica Account as a desktop application on your GNU Social account, copy the consumer key pair here and enter the API base root.<br />Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendica installation at your favorite GNU Social installation.'] = 'Coppia di chiavi consumer per GNU Social non trovata. Registra il tuo Account Friendica come applicazione desktop nel tuo account GNU Social, copia la coppia di chiavi consumer qui e inserisci il percorso delle API.<br />Prima di registrare una tua coppia di chiavi OAuth chiedi all\'amministratore se esiste già una coppia di chiavi tra questa installazione Friendica e l\'installazione GNU Social.';
-$a->strings['To connect to your GNU Social account click the button below to get a security code from GNU Social which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to GNU Social.'] = 'Per collegare il tuo account GNU Social, clicca sul bottone per ottenere un codice di sicurezza da GNU Social, che dovrai copiare nel box sottostante e poi inviare la form. Solo i tuoi messaggi <strong>pubblici</strong> saranno inviati a GNU Social.';
-$a->strings['Log in with GNU Social'] = 'Accedi con GNU Social';
-$a->strings['Cancel Connection Process'] = 'Annulla il processo di connessione';
-$a->strings['Current GNU Social API is: %s'] = 'La API attuale di GNU Social è: %s';
-$a->strings['OAuth Consumer Key'] = 'OAuth Consumer Key';
-$a->strings['OAuth Consumer Secret'] = 'OAuth Consumer Secret';
-$a->strings['Base API Path (remember the trailing /)'] = 'Indirizzo di base per le API (ricorda la / alla fine)';
-$a->strings['Copy the security code from GNU Social here'] = 'Copia il codice di sicurezza da GNU Social qui';
-$a->strings['Allow posting to GNU Social'] = 'Permetti l\'invio a GNU Social';
-$a->strings['If enabled all your <strong>public</strong> postings can be posted to the associated GNU Social account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry.'] = 'Se abilitato tutti i tuoi messaggi <strong>pubblici</strong> possono essere inviati all\'account GNU Social associato. Puoi scegliere di farlo sempre (qui) o ogni volta che invii, nelle impostazioni di privacy del messaggio.';
-$a->strings['Post to GNU Social by default'] = 'Pubblica su GNU Social per impostazione predefinita';
-$a->strings['GNU Social Import/Export/Mirror'] = 'Esporta/Importa/Clona GNU Social';
-$a->strings['Site name'] = 'Nome del sito';
-$a->strings['Consumer Secret'] = 'Consumer Secret';
-$a->strings['Consumer Key'] = 'Consumer Key';
+;
+$a->strings["Post to GNU Social"] = "Invia a GNU Social";
+$a->strings["Please contact your site administrator.<br />The provided API URL is not valid."] = "Contatta l'amministratore del sito.<br/>L'URL delle API fornito non è valido.";
+$a->strings["We could not contact the GNU Social API with the Path you entered."] = "Non possiamo conttattare le API di GNU Social con il percorso che hai inserito.";
+$a->strings["GNU Social settings updated."] = "Impostazioni di GNU Social aggiornate.";
+$a->strings["GNU Social Import/Export/Mirror"] = "Esporta/Importa/Clona GNU Social";
+$a->strings["Globally Available GNU Social OAuthKeys"] = "OAuthKeys globali di GNU Social";
+$a->strings["There are preconfigured OAuth key pairs for some GNU Social servers available. If you are using one of them, please use these credentials. If not feel free to connect to any other GNU Social instance (see below)."] = "Esistono coppie di chiavi OAuth precofigurate per alcuni server GNU Social. Se usi uno di questi server, per favore scegli queste credenziali. Altrimenti sei libero di collegarti a un'altra installazione di GNU Social (vedi sotto).";
+$a->strings["Save Settings"] = "Salva Impostazioni";
+$a->strings["Provide your own OAuth Credentials"] = "Fornisci le tue credenziali OAuth";
+$a->strings["No consumer key pair for GNU Social found. Register your Friendica Account as an desktop client on your GNU Social account, copy the consumer key pair here and enter the API base root.<br />Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendica installation at your favorited GNU Social installation."] = "Nessuna coppia di chiavi consumer trovate per GNU Social. Registra il tuo account Friendica come un client desktop nel tuo account GNU Social, copia la coppia di chiavi consumer qui e inserisci l'url base delle API.<br/>Prima di registrare la tua coppia di chiavi OAuth, chiedi all'amministratore se esiste già una coppia di chiavi per questo sito Friendica presso la tua installazione GNU Social preferita.";
+$a->strings["OAuth Consumer Key"] = "OAuth Consumer Key";
+$a->strings["OAuth Consumer Secret"] = "OAuth Consumer Secret";
+$a->strings["Base API Path (remember the trailing /)"] = "Indirizzo di base per le API (ricorda la / alla fine)";
+$a->strings["To connect to your GNU Social account click the button below to get a security code from GNU Social which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to GNU Social."] = "Per collegare il tuo account GNU Social, clicca sul bottone per ottenere un codice di sicurezza da GNU Social, che dovrai copiare nel box sottostante e poi inviare la form. Solo i tuoi messaggi <strong>pubblici</strong> saranno inviati a GNU Social.";
+$a->strings["Log in with GNU Social"] = "Accedi con GNU Social";
+$a->strings["Copy the security code from GNU Social here"] = "Copia il codice di sicurezza da GNU Social qui";
+$a->strings["Cancel Connection Process"] = "Annulla il processo di connessione";
+$a->strings["Current GNU Social API is"] = "Le API GNU Social correnti sono";
+$a->strings["Cancel GNU Social Connection"] = "Annulla la connessione a GNU Social";
+$a->strings["Currently connected to: "] = "Al momento connesso con:";
+$a->strings["If enabled all your <strong>public</strong> postings can be posted to the associated GNU Social account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "Se abilitato tutti i tuoi messaggi <strong>pubblici</strong> possono essere inviati all'account GNU Social associato. Puoi scegliere di farlo sempre (qui) o ogni volta che invii, nelle impostazioni di privacy del messaggio.";
+$a->strings["<strong>Note</strong>: Due your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to GNU Social will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "<strong>Nota</strong>: A causa delle tue impostazioni di privacy(<em>Nascondi i dettagli del tuo profilo ai visitatori sconosciuti?</em>) il link potenzialmente incluse nei messaggi pubblici inviati a GNU Social porterà i visitatori a una pagina bianca con una nota che li informa che l'accesso al tuo profilo è stato limitato.";
+$a->strings["Allow posting to GNU Social"] = "Permetti l'invio a GNU Social";
+$a->strings["Send public postings to GNU Social by default"] = "Invia sempre i messaggi pubblici a GNU Social";
+$a->strings["Mirror all posts from GNU Social that are no replies or repeated messages"] = "Clona tutti i messaggi da GNU Social che non sono risposte o messaggi ripetuti";
+$a->strings["Import the remote timeline"] = "Importa la timeline remota";
+$a->strings["Disabled"] = "Disabilitato";
+$a->strings["Full Timeline"] = "Timeline completa";
+$a->strings["Only Mentions"] = "Solo menzioni";
+$a->strings["Clear OAuth configuration"] = "Rimuovi la configurazione OAuth";
+$a->strings["Site name"] = "Nome del sito";
+$a->strings["Consumer Secret"] = "Consumer Secret";
+$a->strings["Consumer Key"] = "Consumer Key";
diff --git a/statusnet/lang/nl/messages.po b/statusnet/lang/nl/messages.po
index 0537d80b..e3d82e6e 100644
--- a/statusnet/lang/nl/messages.po
+++ b/statusnet/lang/nl/messages.po
@@ -9,80 +9,80 @@ msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-12-21 22:32+0000\n"
-"PO-Revision-Date: 2014-06-23 12:54+0000\n"
-"Last-Translator: Jeroen De Meerleer <me@jeroened.be>, 2018\n"
-"Language-Team: Dutch (http://app.transifex.com/Friendica/friendica/language/nl/)\n"
+"POT-Creation-Date: 2015-07-27 07:21+0200\n"
+"PO-Revision-Date: 2018-08-24 13:56+0000\n"
+"Last-Translator: Jeroen De Meerleer <me@jeroened.be>\n"
+"Language-Team: Dutch (http://www.transifex.com/Friendica/friendica/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: statusnet.php:76
+#: statusnet.php:151
 msgid "Post to GNU Social"
 msgstr "Post naar GNU Social"
 
-#: statusnet.php:122
+#: statusnet.php:196
 msgid ""
 "Please contact your site administrator.<br />The provided API URL is not "
 "valid."
 msgstr ""
 
-#: statusnet.php:150
+#: statusnet.php:225
 msgid "We could not contact the GNU Social API with the Path you entered."
 msgstr ""
 
-#: statusnet.php:208 statusnet.php:489
-msgid "Save Settings"
-msgstr "Instellingen opslaan"
+#: statusnet.php:259
+msgid "GNU Social settings updated."
+msgstr "GNU Social instellingen opgeslagen"
 
-#: statusnet.php:220
-#, php-format
-msgid "Currently connected to: <a href=\"%s\" target=\"_statusnet\">%s</a>"
-msgstr ""
+#: statusnet.php:294 statusnet.php:298
+msgid "GNU Social Import/Export/Mirror"
+msgstr "GNU Social Import/Exporteren/Spiegelen"
 
-#: statusnet.php:225
-msgid ""
-"<strong>Note</strong>: Due your privacy settings (<em>Hide your profile "
-"details from unknown viewers?</em>) the link potentially included in public "
-"postings relayed to GNU Social will lead the visitor to a blank page "
-"informing the visitor that the access to your profile has been restricted."
-msgstr ""
-
-#: statusnet.php:228
-msgid "Clear OAuth configuration"
-msgstr ""
-
-#: statusnet.php:240
-msgid "Cancel GNU Social Connection"
-msgstr ""
-
-#: statusnet.php:247
+#: statusnet.php:313
 msgid "Globally Available GNU Social OAuthKeys"
 msgstr ""
 
-#: statusnet.php:248
+#: statusnet.php:314
 msgid ""
 "There are preconfigured OAuth key pairs for some GNU Social servers "
 "available. If you are using one of them, please use these credentials. If "
 "not feel free to connect to any other GNU Social instance (see below)."
 msgstr ""
 
-#: statusnet.php:249
+#: statusnet.php:320 statusnet.php:337 statusnet.php:364 statusnet.php:371
+#: statusnet.php:416 statusnet.php:699
+msgid "Save Settings"
+msgstr "Instellingen opslaan"
+
+#: statusnet.php:322
 msgid "Provide your own OAuth Credentials"
 msgstr ""
 
-#: statusnet.php:250
+#: statusnet.php:323
 msgid ""
 "No consumer key pair for GNU Social found. Register your Friendica Account "
-"as a desktop application on your GNU Social account, copy the consumer key "
-"pair here and enter the API base root.<br />Before you register your own "
-"OAuth key pair ask the administrator if there is already a key pair for this"
-" Friendica installation at your favorite GNU Social installation."
+"as an desktop client on your GNU Social account, copy the consumer key pair "
+"here and enter the API base root.<br />Before you register your own OAuth "
+"key pair ask the administrator if there is already a key pair for this "
+"Friendica installation at your favorited GNU Social installation."
 msgstr ""
 
-#: statusnet.php:251
+#: statusnet.php:325
+msgid "OAuth Consumer Key"
+msgstr ""
+
+#: statusnet.php:328
+msgid "OAuth Consumer Secret"
+msgstr ""
+
+#: statusnet.php:331 statusnet.php:679 statusnet.php:691
+msgid "Base API Path (remember the trailing /)"
+msgstr ""
+
+#: statusnet.php:356
 msgid ""
 "To connect to your GNU Social account click the button below to get a "
 "security code from GNU Social which you have to copy into the input box "
@@ -90,62 +90,86 @@ msgid ""
 "posted to GNU Social."
 msgstr ""
 
-#: statusnet.php:252
+#: statusnet.php:357
 msgid "Log in with GNU Social"
 msgstr ""
 
-#: statusnet.php:253
-msgid "Cancel Connection Process"
-msgstr ""
-
-#: statusnet.php:254
-#, php-format
-msgid "Current GNU Social API is: %s"
-msgstr ""
-
-#: statusnet.php:271
-msgid "OAuth Consumer Key"
-msgstr ""
-
-#: statusnet.php:272
-msgid "OAuth Consumer Secret"
-msgstr ""
-
-#: statusnet.php:274 statusnet.php:469 statusnet.php:481
-msgid "Base API Path (remember the trailing /)"
-msgstr ""
-
-#: statusnet.php:275
+#: statusnet.php:359
 msgid "Copy the security code from GNU Social here"
 msgstr ""
 
-#: statusnet.php:277
-msgid "Allow posting to GNU Social"
-msgstr "Plaatsen op GNU Social toestaan"
+#: statusnet.php:365
+msgid "Cancel Connection Process"
+msgstr ""
 
-#: statusnet.php:277
+#: statusnet.php:367
+msgid "Current GNU Social API is"
+msgstr ""
+
+#: statusnet.php:368
+msgid "Cancel GNU Social Connection"
+msgstr ""
+
+#: statusnet.php:379
+msgid "Currently connected to: "
+msgstr ""
+
+#: statusnet.php:380
 msgid ""
 "If enabled all your <strong>public</strong> postings can be posted to the "
 "associated GNU Social account. You can choose to do so by default (here) or "
 "for every posting separately in the posting options when writing the entry."
 msgstr ""
 
-#: statusnet.php:278
-msgid "Post to GNU Social by default"
+#: statusnet.php:382
+msgid ""
+"<strong>Note</strong>: Due your privacy settings (<em>Hide your profile "
+"details from unknown viewers?</em>) the link potentially included in public "
+"postings relayed to GNU Social will lead the visitor to a blank page "
+"informing the visitor that the access to your profile has been restricted."
 msgstr ""
 
-#: statusnet.php:283
-msgid "GNU Social Import/Export/Mirror"
-msgstr "GNU Social Import/Exporteren/Spiegelen"
+#: statusnet.php:385
+msgid "Allow posting to GNU Social"
+msgstr "Plaatsen op GNU Social toestaan"
 
-#: statusnet.php:480
+#: statusnet.php:388
+msgid "Send public postings to GNU Social by default"
+msgstr "Verzend publieke berichten naar GNU Social als standaard instellen"
+
+#: statusnet.php:392
+msgid ""
+"Mirror all posts from GNU Social that are no replies or repeated messages"
+msgstr ""
+
+#: statusnet.php:398
+msgid "Import the remote timeline"
+msgstr ""
+
+#: statusnet.php:402
+msgid "Disabled"
+msgstr "Uitgeschakeld"
+
+#: statusnet.php:403
+msgid "Full Timeline"
+msgstr ""
+
+#: statusnet.php:404
+msgid "Only Mentions"
+msgstr ""
+
+#: statusnet.php:413
+msgid "Clear OAuth configuration"
+msgstr ""
+
+#: statusnet.php:690
 msgid "Site name"
 msgstr ""
 
-#: statusnet.php:482
+#: statusnet.php:692
 msgid "Consumer Secret"
 msgstr ""
 
-#: statusnet.php:483
+#: statusnet.php:693
 msgid "Consumer Key"
 msgstr ""
diff --git a/statusnet/lang/nl/strings.php b/statusnet/lang/nl/strings.php
index 038d2ac5..b8c05579 100644
--- a/statusnet/lang/nl/strings.php
+++ b/statusnet/lang/nl/strings.php
@@ -3,9 +3,39 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Post to GNU Social'] = 'Post naar GNU Social';
-$a->strings['Save Settings'] = 'Instellingen opslaan';
-$a->strings['Allow posting to GNU Social'] = 'Plaatsen op GNU Social toestaan';
-$a->strings['GNU Social Import/Export/Mirror'] = 'GNU Social Import/Exporteren/Spiegelen';
+;
+$a->strings["Post to GNU Social"] = "Post naar GNU Social";
+$a->strings["Please contact your site administrator.<br />The provided API URL is not valid."] = "";
+$a->strings["We could not contact the GNU Social API with the Path you entered."] = "";
+$a->strings["GNU Social settings updated."] = "GNU Social instellingen opgeslagen";
+$a->strings["GNU Social Import/Export/Mirror"] = "GNU Social Import/Exporteren/Spiegelen";
+$a->strings["Globally Available GNU Social OAuthKeys"] = "";
+$a->strings["There are preconfigured OAuth key pairs for some GNU Social servers available. If you are using one of them, please use these credentials. If not feel free to connect to any other GNU Social instance (see below)."] = "";
+$a->strings["Save Settings"] = "Instellingen opslaan";
+$a->strings["Provide your own OAuth Credentials"] = "";
+$a->strings["No consumer key pair for GNU Social found. Register your Friendica Account as an desktop client on your GNU Social account, copy the consumer key pair here and enter the API base root.<br />Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendica installation at your favorited GNU Social installation."] = "";
+$a->strings["OAuth Consumer Key"] = "";
+$a->strings["OAuth Consumer Secret"] = "";
+$a->strings["Base API Path (remember the trailing /)"] = "";
+$a->strings["To connect to your GNU Social account click the button below to get a security code from GNU Social which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to GNU Social."] = "";
+$a->strings["Log in with GNU Social"] = "";
+$a->strings["Copy the security code from GNU Social here"] = "";
+$a->strings["Cancel Connection Process"] = "";
+$a->strings["Current GNU Social API is"] = "";
+$a->strings["Cancel GNU Social Connection"] = "";
+$a->strings["Currently connected to: "] = "";
+$a->strings["If enabled all your <strong>public</strong> postings can be posted to the associated GNU Social account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "";
+$a->strings["<strong>Note</strong>: Due your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to GNU Social will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "";
+$a->strings["Allow posting to GNU Social"] = "Plaatsen op GNU Social toestaan";
+$a->strings["Send public postings to GNU Social by default"] = "Verzend publieke berichten naar GNU Social als standaard instellen";
+$a->strings["Mirror all posts from GNU Social that are no replies or repeated messages"] = "";
+$a->strings["Import the remote timeline"] = "";
+$a->strings["Disabled"] = "Uitgeschakeld";
+$a->strings["Full Timeline"] = "";
+$a->strings["Only Mentions"] = "";
+$a->strings["Clear OAuth configuration"] = "";
+$a->strings["Site name"] = "";
+$a->strings["Consumer Secret"] = "";
+$a->strings["Consumer Key"] = "";
diff --git a/statusnet/lang/pl/messages.po b/statusnet/lang/pl/messages.po
index 0f0fa1db..2de973ed 100644
--- a/statusnet/lang/pl/messages.po
+++ b/statusnet/lang/pl/messages.po
@@ -5,86 +5,85 @@
 # 
 # Translators:
 # TORminator <dominik+foss@danelski.pl>, 2014
-# Piotr Strębski <strebski@gmail.com>, 2022
-# Waldemar Stoczkowski, 2018
+# Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-12-21 22:32+0000\n"
-"PO-Revision-Date: 2014-06-23 12:54+0000\n"
-"Last-Translator: Piotr Strębski <strebski@gmail.com>, 2022\n"
-"Language-Team: Polish (http://app.transifex.com/Friendica/friendica/language/pl/)\n"
+"POT-Creation-Date: 2015-07-27 07:21+0200\n"
+"PO-Revision-Date: 2018-08-04 12:18+0000\n"
+"Last-Translator: Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>\n"
+"Language-Team: Polish (http://www.transifex.com/Friendica/friendica/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pl\n"
 "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
-#: statusnet.php:76
+#: statusnet.php:151
 msgid "Post to GNU Social"
 msgstr "Opublikuj w GNU Social"
 
-#: statusnet.php:122
+#: statusnet.php:196
 msgid ""
 "Please contact your site administrator.<br />The provided API URL is not "
 "valid."
 msgstr "Skontaktuj się z administratorem witryny. <br />Podany adres URL interfejsu API jest nieprawidłowy."
 
-#: statusnet.php:150
+#: statusnet.php:225
 msgid "We could not contact the GNU Social API with the Path you entered."
 msgstr "Nie mogliśmy skontaktować się z GNU Social API z wprowadzoną ścieżką."
 
-#: statusnet.php:208 statusnet.php:489
-msgid "Save Settings"
-msgstr "Zapisz ustawienia"
+#: statusnet.php:259
+msgid "GNU Social settings updated."
+msgstr "Zaktualizowano ustawienia społeczności GNU."
 
-#: statusnet.php:220
-#, php-format
-msgid "Currently connected to: <a href=\"%s\" target=\"_statusnet\">%s</a>"
-msgstr "Obecnie połączony z: <a href=\"%s\" target=\"_statusnet\">%s</a>"
+#: statusnet.php:294 statusnet.php:298
+msgid "GNU Social Import/Export/Mirror"
+msgstr "GNU Social Import/Export/Mirror"
 
-#: statusnet.php:225
-msgid ""
-"<strong>Note</strong>: Due your privacy settings (<em>Hide your profile "
-"details from unknown viewers?</em>) the link potentially included in public "
-"postings relayed to GNU Social will lead the visitor to a blank page "
-"informing the visitor that the access to your profile has been restricted."
-msgstr "<strong>Uwaga</strong>: Ze względu na ustawienia prywatności (<em>Ukryć szczegóły Twojego profilu, przed nieznanymi użytkownikami?</em>) link potencjalnie zawarty w publicznych komentarzach do Twitter doprowadzi użytkownika do pustej strony informowania odwiedzających, że dostęp do Twojego profilu został ograniczony."
-
-#: statusnet.php:228
-msgid "Clear OAuth configuration"
-msgstr "Wyczyść konfigurację OAuth"
-
-#: statusnet.php:240
-msgid "Cancel GNU Social Connection"
-msgstr "Anuluj połaczenie z GNU Social"
-
-#: statusnet.php:247
+#: statusnet.php:313
 msgid "Globally Available GNU Social OAuthKeys"
 msgstr "Globalnie dostępne GNU Social OAuthKeys"
 
-#: statusnet.php:248
+#: statusnet.php:314
 msgid ""
 "There are preconfigured OAuth key pairs for some GNU Social servers "
 "available. If you are using one of them, please use these credentials. If "
 "not feel free to connect to any other GNU Social instance (see below)."
 msgstr "Istnieją wstępnie skonfigurowane pary kluczy OAuth dla niektórych serwerów społecznościowych GNU. Jeśli używasz jednego z nich, użyj tych poświadczeń. Jeśli nie, możesz połączyć się z dowolną inną instancją społecznościową GNU (patrz poniżej)."
 
-#: statusnet.php:249
+#: statusnet.php:320 statusnet.php:337 statusnet.php:364 statusnet.php:371
+#: statusnet.php:416 statusnet.php:699
+msgid "Save Settings"
+msgstr "Zapisz ustawienia"
+
+#: statusnet.php:322
 msgid "Provide your own OAuth Credentials"
 msgstr "Podaj własne dane uwierzytelniające OAuth"
 
-#: statusnet.php:250
+#: statusnet.php:323
 msgid ""
 "No consumer key pair for GNU Social found. Register your Friendica Account "
-"as a desktop application on your GNU Social account, copy the consumer key "
-"pair here and enter the API base root.<br />Before you register your own "
-"OAuth key pair ask the administrator if there is already a key pair for this"
-" Friendica installation at your favorite GNU Social installation."
-msgstr "Nie znaleziono pary kluczy konsumenckich dla GNU Social. Zarejestruj swoje konto Friendica jako aplikację komputerową na swoim koncie GNU Social, skopiuj tutaj parę kluczy klienta i wprowadź podstawowy root API.<br />Przed zarejestrowaniem własnej pary kluczy OAuth zapytaj administratora, czy istnieje już para kluczy dla tej instalacji Friendica pod adresem Twojej ulubionej instalacji GNU Social."
+"as an desktop client on your GNU Social account, copy the consumer key pair "
+"here and enter the API base root.<br />Before you register your own OAuth "
+"key pair ask the administrator if there is already a key pair for this "
+"Friendica installation at your favorited GNU Social installation."
+msgstr "Nie znaleziono pary kluczy konsumenta dla GNU Social. Zarejestruj swoje konto Friendica jako klienta komputerowego na koncie GNU Social, skopiuj tutaj parę kluczy konsumenta i wprowadź podstawową bazę interfejsu API.<br /> Zanim zarejestrujesz swoją własną parę kluczy OAuth, zapytaj administratora, czy istnieje już para kluczy do instalacji tej aplikacji na stronie Twoja ulubiona instalacja społecznościowa GNU."
 
-#: statusnet.php:251
+#: statusnet.php:325
+msgid "OAuth Consumer Key"
+msgstr "Klucz klienta OAuth"
+
+#: statusnet.php:328
+msgid "OAuth Consumer Secret"
+msgstr "Tajny klucz klienta OAuth"
+
+#: statusnet.php:331 statusnet.php:679 statusnet.php:691
+msgid "Base API Path (remember the trailing /)"
+msgstr "Podstawowa ścieżka interfejsu API (pamiętaj na końcu /)"
+
+#: statusnet.php:356
 msgid ""
 "To connect to your GNU Social account click the button below to get a "
 "security code from GNU Social which you have to copy into the input box "
@@ -92,62 +91,86 @@ msgid ""
 "posted to GNU Social."
 msgstr "Aby połączyć się z kontem społecznościowym GNU, kliknij przycisk poniżej, aby uzyskać kod bezpieczeństwa z GNU Social, który musisz skopiować do poniższego pola wprowadzania i przesłać formularz. Tylko twoje <strong>publiczne</strong> posty będą publikowane w GNU Social."
 
-#: statusnet.php:252
+#: statusnet.php:357
 msgid "Log in with GNU Social"
 msgstr "Zaloguj się za pomocą GNU Social"
 
-#: statusnet.php:253
-msgid "Cancel Connection Process"
-msgstr "Anuluj proces połączenia"
-
-#: statusnet.php:254
-#, php-format
-msgid "Current GNU Social API is: %s"
-msgstr "Obecne API GNU Social to: %s"
-
-#: statusnet.php:271
-msgid "OAuth Consumer Key"
-msgstr "Klucz klienta OAuth"
-
-#: statusnet.php:272
-msgid "OAuth Consumer Secret"
-msgstr "Tajny klucz klienta OAuth"
-
-#: statusnet.php:274 statusnet.php:469 statusnet.php:481
-msgid "Base API Path (remember the trailing /)"
-msgstr "Podstawowa ścieżka interfejsu API (pamiętaj na końcu /)"
-
-#: statusnet.php:275
+#: statusnet.php:359
 msgid "Copy the security code from GNU Social here"
 msgstr "Skopiuj tutaj kod bezpieczeństwa z GNU Social"
 
-#: statusnet.php:277
-msgid "Allow posting to GNU Social"
-msgstr "Zezwalaj na publikowanie w GNU Social"
+#: statusnet.php:365
+msgid "Cancel Connection Process"
+msgstr "Anuluj proces połączenia"
 
-#: statusnet.php:277
+#: statusnet.php:367
+msgid "Current GNU Social API is"
+msgstr "Obecne API GNU Social to"
+
+#: statusnet.php:368
+msgid "Cancel GNU Social Connection"
+msgstr "Anuluj GNU Social Connection"
+
+#: statusnet.php:379
+msgid "Currently connected to: "
+msgstr "Obecnie podłączony do:"
+
+#: statusnet.php:380
 msgid ""
 "If enabled all your <strong>public</strong> postings can be posted to the "
 "associated GNU Social account. You can choose to do so by default (here) or "
 "for every posting separately in the posting options when writing the entry."
 msgstr "Jeśli ta opcja jest włączona, wszystkie twoje <strong>publiczne</strong> ogłoszenia mogą zostać wysłane na powiązane konto społecznościowe GNU. Możesz to zrobić domyślnie (tutaj) lub dla każdego komentarza osobno w opcjach komentarza podczas pisania wpisu."
 
-#: statusnet.php:278
-msgid "Post to GNU Social by default"
-msgstr "Publikuj domyślnie w GNU Social"
+#: statusnet.php:382
+msgid ""
+"<strong>Note</strong>: Due your privacy settings (<em>Hide your profile "
+"details from unknown viewers?</em>) the link potentially included in public "
+"postings relayed to GNU Social will lead the visitor to a blank page "
+"informing the visitor that the access to your profile has been restricted."
+msgstr "<strong>Uwaga</strong>: Ze względu na ustawienia prywatności (<em>Ukryć szczegóły Twojego profilu, przed nieznanymi użytkownikami?</em>) link potencjalnie zawarty w publicznych komentarzach do Twitter doprowadzi użytkownika do pustej strony informowania odwiedzających, że dostęp do Twojego profilu został ograniczony."
 
-#: statusnet.php:283
-msgid "GNU Social Import/Export/Mirror"
-msgstr "GNU Social Import/Export/Mirror"
+#: statusnet.php:385
+msgid "Allow posting to GNU Social"
+msgstr "Zezwalaj na publikowanie w GNU Social"
 
-#: statusnet.php:480
+#: statusnet.php:388
+msgid "Send public postings to GNU Social by default"
+msgstr "Domyślnie wysyłaj publiczne ogłoszenia do GNU Social"
+
+#: statusnet.php:392
+msgid ""
+"Mirror all posts from GNU Social that are no replies or repeated messages"
+msgstr "Odblokuj wszystkie posty z GNU Social, które nie są odpowiedziami lub powtarzającymi się wiadomościami"
+
+#: statusnet.php:398
+msgid "Import the remote timeline"
+msgstr "Zaimportuj na zdalnej oś czasu"
+
+#: statusnet.php:402
+msgid "Disabled"
+msgstr "Wyłącz"
+
+#: statusnet.php:403
+msgid "Full Timeline"
+msgstr "Pełna oś czasu"
+
+#: statusnet.php:404
+msgid "Only Mentions"
+msgstr "Tylko wzmianki"
+
+#: statusnet.php:413
+msgid "Clear OAuth configuration"
+msgstr "Wyczyść konfigurację OAuth"
+
+#: statusnet.php:690
 msgid "Site name"
 msgstr "Nazwa strony"
 
-#: statusnet.php:482
+#: statusnet.php:692
 msgid "Consumer Secret"
 msgstr "Tajny klucz klienta"
 
-#: statusnet.php:483
+#: statusnet.php:693
 msgid "Consumer Key"
 msgstr "Klucz klienta"
diff --git a/statusnet/lang/pl/strings.php b/statusnet/lang/pl/strings.php
index 53b38655..c8d2513b 100644
--- a/statusnet/lang/pl/strings.php
+++ b/statusnet/lang/pl/strings.php
@@ -3,32 +3,39 @@
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
 	$n = intval($n);
-	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
+	return ($n==1 ? 0 : ($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14) ? 1 : $n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14) ? 2 : 3);;
 }}
-$a->strings['Post to GNU Social'] = 'Opublikuj w GNU Social';
-$a->strings['Please contact your site administrator.<br />The provided API URL is not valid.'] = 'Skontaktuj się z administratorem witryny. <br />Podany adres URL interfejsu API jest nieprawidłowy.';
-$a->strings['We could not contact the GNU Social API with the Path you entered.'] = 'Nie mogliśmy skontaktować się z GNU Social API z wprowadzoną ścieżką.';
-$a->strings['Save Settings'] = 'Zapisz ustawienia';
-$a->strings['Currently connected to: <a href="%s" target="_statusnet">%s</a>'] = 'Obecnie połączony z: <a href="%s" target="_statusnet">%s</a>';
-$a->strings['<strong>Note</strong>: Due your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to GNU Social will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted.'] = '<strong>Uwaga</strong>: Ze względu na ustawienia prywatności (<em>Ukryć szczegóły Twojego profilu, przed nieznanymi użytkownikami?</em>) link potencjalnie zawarty w publicznych komentarzach do Twitter doprowadzi użytkownika do pustej strony informowania odwiedzających, że dostęp do Twojego profilu został ograniczony.';
-$a->strings['Clear OAuth configuration'] = 'Wyczyść konfigurację OAuth';
-$a->strings['Cancel GNU Social Connection'] = 'Anuluj połaczenie z GNU Social';
-$a->strings['Globally Available GNU Social OAuthKeys'] = 'Globalnie dostępne GNU Social OAuthKeys';
-$a->strings['There are preconfigured OAuth key pairs for some GNU Social servers available. If you are using one of them, please use these credentials. If not feel free to connect to any other GNU Social instance (see below).'] = 'Istnieją wstępnie skonfigurowane pary kluczy OAuth dla niektórych serwerów społecznościowych GNU. Jeśli używasz jednego z nich, użyj tych poświadczeń. Jeśli nie, możesz połączyć się z dowolną inną instancją społecznościową GNU (patrz poniżej).';
-$a->strings['Provide your own OAuth Credentials'] = 'Podaj własne dane uwierzytelniające OAuth';
-$a->strings['No consumer key pair for GNU Social found. Register your Friendica Account as a desktop application on your GNU Social account, copy the consumer key pair here and enter the API base root.<br />Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendica installation at your favorite GNU Social installation.'] = 'Nie znaleziono pary kluczy konsumenckich dla GNU Social. Zarejestruj swoje konto Friendica jako aplikację komputerową na swoim koncie GNU Social, skopiuj tutaj parę kluczy klienta i wprowadź podstawowy root API.<br />Przed zarejestrowaniem własnej pary kluczy OAuth zapytaj administratora, czy istnieje już para kluczy dla tej instalacji Friendica pod adresem Twojej ulubionej instalacji GNU Social.';
-$a->strings['To connect to your GNU Social account click the button below to get a security code from GNU Social which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to GNU Social.'] = 'Aby połączyć się z kontem społecznościowym GNU, kliknij przycisk poniżej, aby uzyskać kod bezpieczeństwa z GNU Social, który musisz skopiować do poniższego pola wprowadzania i przesłać formularz. Tylko twoje <strong>publiczne</strong> posty będą publikowane w GNU Social.';
-$a->strings['Log in with GNU Social'] = 'Zaloguj się za pomocą GNU Social';
-$a->strings['Cancel Connection Process'] = 'Anuluj proces połączenia';
-$a->strings['Current GNU Social API is: %s'] = 'Obecne API GNU Social to: %s';
-$a->strings['OAuth Consumer Key'] = 'Klucz klienta OAuth';
-$a->strings['OAuth Consumer Secret'] = 'Tajny klucz klienta OAuth';
-$a->strings['Base API Path (remember the trailing /)'] = 'Podstawowa ścieżka interfejsu API (pamiętaj na końcu /)';
-$a->strings['Copy the security code from GNU Social here'] = 'Skopiuj tutaj kod bezpieczeństwa z GNU Social';
-$a->strings['Allow posting to GNU Social'] = 'Zezwalaj na publikowanie w GNU Social';
-$a->strings['If enabled all your <strong>public</strong> postings can be posted to the associated GNU Social account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry.'] = 'Jeśli ta opcja jest włączona, wszystkie twoje <strong>publiczne</strong> ogłoszenia mogą zostać wysłane na powiązane konto społecznościowe GNU. Możesz to zrobić domyślnie (tutaj) lub dla każdego komentarza osobno w opcjach komentarza podczas pisania wpisu.';
-$a->strings['Post to GNU Social by default'] = 'Publikuj domyślnie w GNU Social';
-$a->strings['GNU Social Import/Export/Mirror'] = 'GNU Social Import/Export/Mirror';
-$a->strings['Site name'] = 'Nazwa strony';
-$a->strings['Consumer Secret'] = 'Tajny klucz klienta';
-$a->strings['Consumer Key'] = 'Klucz klienta';
+;
+$a->strings["Post to GNU Social"] = "Opublikuj w GNU Social";
+$a->strings["Please contact your site administrator.<br />The provided API URL is not valid."] = "Skontaktuj się z administratorem witryny. <br />Podany adres URL interfejsu API jest nieprawidłowy.";
+$a->strings["We could not contact the GNU Social API with the Path you entered."] = "Nie mogliśmy skontaktować się z GNU Social API z wprowadzoną ścieżką.";
+$a->strings["GNU Social settings updated."] = "Zaktualizowano ustawienia społeczności GNU.";
+$a->strings["GNU Social Import/Export/Mirror"] = "GNU Social Import/Export/Mirror";
+$a->strings["Globally Available GNU Social OAuthKeys"] = "Globalnie dostępne GNU Social OAuthKeys";
+$a->strings["There are preconfigured OAuth key pairs for some GNU Social servers available. If you are using one of them, please use these credentials. If not feel free to connect to any other GNU Social instance (see below)."] = "Istnieją wstępnie skonfigurowane pary kluczy OAuth dla niektórych serwerów społecznościowych GNU. Jeśli używasz jednego z nich, użyj tych poświadczeń. Jeśli nie, możesz połączyć się z dowolną inną instancją społecznościową GNU (patrz poniżej).";
+$a->strings["Save Settings"] = "Zapisz ustawienia";
+$a->strings["Provide your own OAuth Credentials"] = "Podaj własne dane uwierzytelniające OAuth";
+$a->strings["No consumer key pair for GNU Social found. Register your Friendica Account as an desktop client on your GNU Social account, copy the consumer key pair here and enter the API base root.<br />Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendica installation at your favorited GNU Social installation."] = "Nie znaleziono pary kluczy konsumenta dla GNU Social. Zarejestruj swoje konto Friendica jako klienta komputerowego na koncie GNU Social, skopiuj tutaj parę kluczy konsumenta i wprowadź podstawową bazę interfejsu API.<br /> Zanim zarejestrujesz swoją własną parę kluczy OAuth, zapytaj administratora, czy istnieje już para kluczy do instalacji tej aplikacji na stronie Twoja ulubiona instalacja społecznościowa GNU.";
+$a->strings["OAuth Consumer Key"] = "Klucz klienta OAuth";
+$a->strings["OAuth Consumer Secret"] = "Tajny klucz klienta OAuth";
+$a->strings["Base API Path (remember the trailing /)"] = "Podstawowa ścieżka interfejsu API (pamiętaj na końcu /)";
+$a->strings["To connect to your GNU Social account click the button below to get a security code from GNU Social which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to GNU Social."] = "Aby połączyć się z kontem społecznościowym GNU, kliknij przycisk poniżej, aby uzyskać kod bezpieczeństwa z GNU Social, który musisz skopiować do poniższego pola wprowadzania i przesłać formularz. Tylko twoje <strong>publiczne</strong> posty będą publikowane w GNU Social.";
+$a->strings["Log in with GNU Social"] = "Zaloguj się za pomocą GNU Social";
+$a->strings["Copy the security code from GNU Social here"] = "Skopiuj tutaj kod bezpieczeństwa z GNU Social";
+$a->strings["Cancel Connection Process"] = "Anuluj proces połączenia";
+$a->strings["Current GNU Social API is"] = "Obecne API GNU Social to";
+$a->strings["Cancel GNU Social Connection"] = "Anuluj GNU Social Connection";
+$a->strings["Currently connected to: "] = "Obecnie podłączony do:";
+$a->strings["If enabled all your <strong>public</strong> postings can be posted to the associated GNU Social account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "Jeśli ta opcja jest włączona, wszystkie twoje <strong>publiczne</strong> ogłoszenia mogą zostać wysłane na powiązane konto społecznościowe GNU. Możesz to zrobić domyślnie (tutaj) lub dla każdego komentarza osobno w opcjach komentarza podczas pisania wpisu.";
+$a->strings["<strong>Note</strong>: Due your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to GNU Social will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "<strong>Uwaga</strong>: Ze względu na ustawienia prywatności (<em>Ukryć szczegóły Twojego profilu, przed nieznanymi użytkownikami?</em>) link potencjalnie zawarty w publicznych komentarzach do Twitter doprowadzi użytkownika do pustej strony informowania odwiedzających, że dostęp do Twojego profilu został ograniczony.";
+$a->strings["Allow posting to GNU Social"] = "Zezwalaj na publikowanie w GNU Social";
+$a->strings["Send public postings to GNU Social by default"] = "Domyślnie wysyłaj publiczne ogłoszenia do GNU Social";
+$a->strings["Mirror all posts from GNU Social that are no replies or repeated messages"] = "Odblokuj wszystkie posty z GNU Social, które nie są odpowiedziami lub powtarzającymi się wiadomościami";
+$a->strings["Import the remote timeline"] = "Zaimportuj na zdalnej oś czasu";
+$a->strings["Disabled"] = "Wyłącz";
+$a->strings["Full Timeline"] = "Pełna oś czasu";
+$a->strings["Only Mentions"] = "Tylko wzmianki";
+$a->strings["Clear OAuth configuration"] = "Wyczyść konfigurację OAuth";
+$a->strings["Site name"] = "Nazwa strony";
+$a->strings["Consumer Secret"] = "Tajny klucz klienta";
+$a->strings["Consumer Key"] = "Klucz klienta";
diff --git a/statusnet/lang/pt-br/strings.php b/statusnet/lang/pt-br/strings.php
index a97f632d..951322a0 100644
--- a/statusnet/lang/pt-br/strings.php
+++ b/statusnet/lang/pt-br/strings.php
@@ -2,13 +2,39 @@
 
 if(! function_exists("string_plural_select_pt_br")) {
 function string_plural_select_pt_br($n){
-	$n = intval($n);
-	return intval($n > 1);
+	return ($n > 1);;
 }}
-$a->strings['Post to GNU Social'] = 'Publicar no GNU Social';
-$a->strings['GNU Social settings updated.'] = 'As configurações do GNU Social foram atualizadas.';
-$a->strings['Save Settings'] = 'Salvar Configurações';
-$a->strings['Log in with GNU Social'] = 'Entrar com o GNU Social';
-$a->strings['Allow posting to GNU Social'] = 'Permitir a publicação no GNU Social';
-$a->strings['Send public postings to GNU Social by default'] = 'Publicar posts públicos no GNU Social por padrão';
-$a->strings['Import the remote timeline'] = 'Importar a linha do tempo remota';
+;
+$a->strings["Post to GNU Social"] = "Publicar no GNU Social";
+$a->strings["Please contact your site administrator.<br />The provided API URL is not valid."] = "";
+$a->strings["We could not contact the GNU Social API with the Path you entered."] = "";
+$a->strings["GNU Social settings updated."] = "As configurações do GNU Social foram atualizadas.";
+$a->strings["GNU Social Import/Export/Mirror"] = "";
+$a->strings["Globally Available GNU Social OAuthKeys"] = "";
+$a->strings["There are preconfigured OAuth key pairs for some GNU Social servers available. If you are using one of them, please use these credentials. If not feel free to connect to any other GNU Social instance (see below)."] = "";
+$a->strings["Save Settings"] = "Salvar Configurações";
+$a->strings["Provide your own OAuth Credentials"] = "";
+$a->strings["No consumer key pair for GNU Social found. Register your Friendica Account as an desktop client on your GNU Social account, copy the consumer key pair here and enter the API base root.<br />Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendica installation at your favorited GNU Social installation."] = "";
+$a->strings["OAuth Consumer Key"] = "";
+$a->strings["OAuth Consumer Secret"] = "";
+$a->strings["Base API Path (remember the trailing /)"] = "";
+$a->strings["To connect to your GNU Social account click the button below to get a security code from GNU Social which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to GNU Social."] = "";
+$a->strings["Log in with GNU Social"] = "Entrar com o GNU Social";
+$a->strings["Copy the security code from GNU Social here"] = "";
+$a->strings["Cancel Connection Process"] = "";
+$a->strings["Current GNU Social API is"] = "";
+$a->strings["Cancel GNU Social Connection"] = "";
+$a->strings["Currently connected to: "] = "";
+$a->strings["If enabled all your <strong>public</strong> postings can be posted to the associated GNU Social account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "";
+$a->strings["<strong>Note</strong>: Due your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to GNU Social will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "";
+$a->strings["Allow posting to GNU Social"] = "Permitir a publicação no GNU Social";
+$a->strings["Send public postings to GNU Social by default"] = "Publicar posts públicos no GNU Social por padrão";
+$a->strings["Mirror all posts from GNU Social that are no replies or repeated messages"] = "";
+$a->strings["Import the remote timeline"] = "Importar a linha do tempo remota";
+$a->strings["Disabled"] = "";
+$a->strings["Full Timeline"] = "";
+$a->strings["Only Mentions"] = "";
+$a->strings["Clear OAuth configuration"] = "";
+$a->strings["Site name"] = "";
+$a->strings["Consumer Secret"] = "";
+$a->strings["Consumer Key"] = "";
diff --git a/statusnet/lang/ro/strings.php b/statusnet/lang/ro/strings.php
index c3778216..c5a8fff8 100644
--- a/statusnet/lang/ro/strings.php
+++ b/statusnet/lang/ro/strings.php
@@ -2,38 +2,38 @@
 
 if(! function_exists("string_plural_select_ro")) {
 function string_plural_select_ro($n){
-	$n = intval($n);
-	if ($n==1) { return 0; } else if ((($n%100>19)||(($n%100==0)&&($n!=0)))) { return 2; } else  { return 1; }
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
 }}
-$a->strings['Post to StatusNet'] = 'Postați pe StatusNet';
-$a->strings['Please contact your site administrator.<br />The provided API URL is not valid.'] = 'Vă rugăm să vă contactați administratorul de site. <br />URL-ul API furnizat, nu este valid.';
-$a->strings['We could not contact the StatusNet API with the Path you entered.'] = 'Nu am putut conecta API pentru StatusNet la Calea pe care ați introdus-o.';
-$a->strings['StatusNet settings updated.'] = 'Configurările StatusNet au fost actualizate.';
-$a->strings['StatusNet Import/Export/Mirror'] = 'Import/Export/Clonare StatusNet';
-$a->strings['Globally Available StatusNet OAuthKeys'] = 'Cheile OAuthKeys StatusNet Disponibile Global';
-$a->strings['There are preconfigured OAuth key pairs for some StatusNet servers available. If you are useing one of them, please use these credentials. If not feel free to connect to any other StatusNet instance (see below).'] = 'Acolo sunt preconfigurate perechile de chei OAuthKeys pentru anumite servere StatusNet disponibile. Dacă folosiți una dintre ele, vă rugăm să utilizați aceste acreditive. Dacă nu, vă puteți conecta la orice altă instanță StatusNet (vedeți mai jos).';
-$a->strings['Save Settings'] = 'Salvare Configurări';
-$a->strings['Provide your own OAuth Credentials'] = 'Furnizați propriile dvs. Acreditive OAuth';
-$a->strings['No consumer key pair for StatusNet found. Register your Friendica Account as an desktop client on your StatusNet account, copy the consumer key pair here and enter the API base root.<br />Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendica installation at your favorited StatusNet installation.'] = 'Nici o pereche de chei de utilizator pentru StatusNet, nu fost găsită. Înregistrați-vă Contul Friendica, ca și client  desktop, pe contul dvs. StatusNet, copiați aici pereche de chei de utilizator, şi introduceți rădăcina-bazei API. <br />Înainte să vă înregistrați propria pereche de chei OAuth, întrebați administratorul dacă nu există deja o pereche de chei, pentru această instalare Friendica, conectată la instalarea dvs. favorită StatusNet.';
-$a->strings['OAuth Consumer Key'] = 'Cheia Utilizatorului OAuth';
-$a->strings['OAuth Consumer Secret'] = 'Cheia Secretă a Utilizatorului OAuth';
-$a->strings['Base API Path (remember the trailing /)'] = 'Cale-Bază API (nu uitați de slash /)';
-$a->strings['StatusNet application name'] = 'Numele Aplicației StatusNet';
-$a->strings['To connect to your StatusNet account click the button below to get a security code from StatusNet which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to StatusNet.'] = 'Pentru a vă conecta la contul dvs. StatusNet apăsați pe butonul de mai jos pentru a obține un cod de securitate de la StatusNet, pe care va trebui să îl copiați în caseta de introducere mai jos şi trimiteți formularul. Numai postările dvs.<strong>publice</strong> vor fi postate pe StatusNet.';
-$a->strings['Log in with StatusNet'] = 'Autentificare cu StatusNet';
-$a->strings['Copy the security code from StatusNet here'] = 'Copiați aici codul de securitate din StatusNet';
-$a->strings['Cancel Connection Process'] = 'Anulare Proces de Conectare';
-$a->strings['Current StatusNet API is'] = 'Cheia API StatusNet Curentă este';
-$a->strings['Cancel StatusNet Connection'] = 'Anulare Conectare StatusNet';
-$a->strings['Currently connected to: '] = 'Conectat curent la:';
-$a->strings['If enabled all your <strong>public</strong> postings can be posted to the associated StatusNet account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry.'] = 'Dacă activați, toate postările dvs. <strong>publice</strong> pot fi publicate în contul StatusNet asociat. Puteți face acest lucru, implicit (aici), sau pentru fiecare postare separată, prin opțiunile de postare atunci când compuneți un mesaj.';
-$a->strings['<strong>Note</strong>: Due your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to StatusNet will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted.'] = '<strong>Notă</strong>: Datorită configurărilor de confidenţialitate (<em>Se ascund detaliile profilului dvs. de vizitatorii necunoscuți?</em>), legătura potențial inclusă în postările publice transmise către StatusNet, va conduce vizitatorul la o pagină goală, informându-l pe vizitator că accesul la profilul dvs. a fost restricţionat.';
-$a->strings['Allow posting to StatusNet'] = 'Permite postarea pe StatusNet';
-$a->strings['Send public postings to StatusNet by default'] = 'Trimite postările publice pe StatusNet, ca și implicit';
-$a->strings['Mirror all posts from statusnet that are no replies or repeated messages'] = 'Clonează toate postările, din StatusNet, care nu sunt răspunsuri sau mesaje repetate';
-$a->strings['Import the remote timeline'] = 'Importare cronologie la distanță';
-$a->strings['Clear OAuth configuration'] = 'Ștergeți configurările OAuth ';
-$a->strings['Site name'] = 'Numele saitului';
-$a->strings['Consumer Secret'] = 'Cheia Secretă a Utilizatorului';
-$a->strings['Consumer Key'] = 'Cheia Utilizatorului';
-$a->strings['Application name'] = 'Numele aplicației';
+;
+$a->strings["Post to StatusNet"] = "Postați pe StatusNet";
+$a->strings["Please contact your site administrator.<br />The provided API URL is not valid."] = "Vă rugăm să vă contactați administratorul de site. <br />URL-ul API furnizat, nu este valid.";
+$a->strings["We could not contact the StatusNet API with the Path you entered."] = "Nu am putut conecta API pentru StatusNet la Calea pe care ați introdus-o.";
+$a->strings["StatusNet settings updated."] = "Configurările StatusNet au fost actualizate.";
+$a->strings["StatusNet Import/Export/Mirror"] = "Import/Export/Clonare StatusNet";
+$a->strings["Globally Available StatusNet OAuthKeys"] = "Cheile OAuthKeys StatusNet Disponibile Global";
+$a->strings["There are preconfigured OAuth key pairs for some StatusNet servers available. If you are useing one of them, please use these credentials. If not feel free to connect to any other StatusNet instance (see below)."] = "Acolo sunt preconfigurate perechile de chei OAuthKeys pentru anumite servere StatusNet disponibile. Dacă folosiți una dintre ele, vă rugăm să utilizați aceste acreditive. Dacă nu, vă puteți conecta la orice altă instanță StatusNet (vedeți mai jos).";
+$a->strings["Save Settings"] = "Salvare Configurări";
+$a->strings["Provide your own OAuth Credentials"] = "Furnizați propriile dvs. Acreditive OAuth";
+$a->strings["No consumer key pair for StatusNet found. Register your Friendica Account as an desktop client on your StatusNet account, copy the consumer key pair here and enter the API base root.<br />Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendica installation at your favorited StatusNet installation."] = "Nici o pereche de chei de utilizator pentru StatusNet, nu fost găsită. Înregistrați-vă Contul Friendica, ca și client  desktop, pe contul dvs. StatusNet, copiați aici pereche de chei de utilizator, şi introduceți rădăcina-bazei API. <br />Înainte să vă înregistrați propria pereche de chei OAuth, întrebați administratorul dacă nu există deja o pereche de chei, pentru această instalare Friendica, conectată la instalarea dvs. favorită StatusNet.";
+$a->strings["OAuth Consumer Key"] = "Cheia Utilizatorului OAuth";
+$a->strings["OAuth Consumer Secret"] = "Cheia Secretă a Utilizatorului OAuth";
+$a->strings["Base API Path (remember the trailing /)"] = "Cale-Bază API (nu uitați de slash /)";
+$a->strings["StatusNet application name"] = "Numele Aplicației StatusNet";
+$a->strings["To connect to your StatusNet account click the button below to get a security code from StatusNet which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to StatusNet."] = "Pentru a vă conecta la contul dvs. StatusNet apăsați pe butonul de mai jos pentru a obține un cod de securitate de la StatusNet, pe care va trebui să îl copiați în caseta de introducere mai jos şi trimiteți formularul. Numai postările dvs.<strong>publice</strong> vor fi postate pe StatusNet.";
+$a->strings["Log in with StatusNet"] = "Autentificare cu StatusNet";
+$a->strings["Copy the security code from StatusNet here"] = "Copiați aici codul de securitate din StatusNet";
+$a->strings["Cancel Connection Process"] = "Anulare Proces de Conectare";
+$a->strings["Current StatusNet API is"] = "Cheia API StatusNet Curentă este";
+$a->strings["Cancel StatusNet Connection"] = "Anulare Conectare StatusNet";
+$a->strings["Currently connected to: "] = "Conectat curent la:";
+$a->strings["If enabled all your <strong>public</strong> postings can be posted to the associated StatusNet account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "Dacă activați, toate postările dvs. <strong>publice</strong> pot fi publicate în contul StatusNet asociat. Puteți face acest lucru, implicit (aici), sau pentru fiecare postare separată, prin opțiunile de postare atunci când compuneți un mesaj.";
+$a->strings["<strong>Note</strong>: Due your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to StatusNet will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "<strong>Notă</strong>: Datorită configurărilor de confidenţialitate (<em>Se ascund detaliile profilului dvs. de vizitatorii necunoscuți?</em>), legătura potențial inclusă în postările publice transmise către StatusNet, va conduce vizitatorul la o pagină goală, informându-l pe vizitator că accesul la profilul dvs. a fost restricţionat.";
+$a->strings["Allow posting to StatusNet"] = "Permite postarea pe StatusNet";
+$a->strings["Send public postings to StatusNet by default"] = "Trimite postările publice pe StatusNet, ca și implicit";
+$a->strings["Mirror all posts from statusnet that are no replies or repeated messages"] = "Clonează toate postările, din StatusNet, care nu sunt răspunsuri sau mesaje repetate";
+$a->strings["Import the remote timeline"] = "Importare cronologie la distanță";
+$a->strings["Clear OAuth configuration"] = "Ștergeți configurările OAuth ";
+$a->strings["Site name"] = "Numele saitului";
+$a->strings["Consumer Secret"] = "Cheia Secretă a Utilizatorului";
+$a->strings["Consumer Key"] = "Cheia Utilizatorului";
+$a->strings["Application name"] = "Numele aplicației";
diff --git a/statusnet/lang/sv/messages.po b/statusnet/lang/sv/messages.po
deleted file mode 100644
index 0c0b4807..00000000
--- a/statusnet/lang/sv/messages.po
+++ /dev/null
@@ -1,151 +0,0 @@
-# ADDON statusnet
-# Copyright (C)
-# This file is distributed under the same license as the Friendica statusnet addon package.
-# 
-# 
-# Translators:
-# Kristoffer Grundström <lovaren@gmail.com>, 2022
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-12-21 22:32+0000\n"
-"PO-Revision-Date: 2014-06-23 12:54+0000\n"
-"Last-Translator: Kristoffer Grundström <lovaren@gmail.com>, 2022\n"
-"Language-Team: Swedish (http://app.transifex.com/Friendica/friendica/language/sv/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: sv\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: statusnet.php:76
-msgid "Post to GNU Social"
-msgstr ""
-
-#: statusnet.php:122
-msgid ""
-"Please contact your site administrator.<br />The provided API URL is not "
-"valid."
-msgstr ""
-
-#: statusnet.php:150
-msgid "We could not contact the GNU Social API with the Path you entered."
-msgstr ""
-
-#: statusnet.php:208 statusnet.php:489
-msgid "Save Settings"
-msgstr "Spara inställningar"
-
-#: statusnet.php:220
-#, php-format
-msgid "Currently connected to: <a href=\"%s\" target=\"_statusnet\">%s</a>"
-msgstr ""
-
-#: statusnet.php:225
-msgid ""
-"<strong>Note</strong>: Due your privacy settings (<em>Hide your profile "
-"details from unknown viewers?</em>) the link potentially included in public "
-"postings relayed to GNU Social will lead the visitor to a blank page "
-"informing the visitor that the access to your profile has been restricted."
-msgstr ""
-
-#: statusnet.php:228
-msgid "Clear OAuth configuration"
-msgstr ""
-
-#: statusnet.php:240
-msgid "Cancel GNU Social Connection"
-msgstr ""
-
-#: statusnet.php:247
-msgid "Globally Available GNU Social OAuthKeys"
-msgstr ""
-
-#: statusnet.php:248
-msgid ""
-"There are preconfigured OAuth key pairs for some GNU Social servers "
-"available. If you are using one of them, please use these credentials. If "
-"not feel free to connect to any other GNU Social instance (see below)."
-msgstr ""
-
-#: statusnet.php:249
-msgid "Provide your own OAuth Credentials"
-msgstr ""
-
-#: statusnet.php:250
-msgid ""
-"No consumer key pair for GNU Social found. Register your Friendica Account "
-"as a desktop application on your GNU Social account, copy the consumer key "
-"pair here and enter the API base root.<br />Before you register your own "
-"OAuth key pair ask the administrator if there is already a key pair for this"
-" Friendica installation at your favorite GNU Social installation."
-msgstr ""
-
-#: statusnet.php:251
-msgid ""
-"To connect to your GNU Social account click the button below to get a "
-"security code from GNU Social which you have to copy into the input box "
-"below and submit the form. Only your <strong>public</strong> posts will be "
-"posted to GNU Social."
-msgstr ""
-
-#: statusnet.php:252
-msgid "Log in with GNU Social"
-msgstr "Logga in med GNU Social"
-
-#: statusnet.php:253
-msgid "Cancel Connection Process"
-msgstr ""
-
-#: statusnet.php:254
-#, php-format
-msgid "Current GNU Social API is: %s"
-msgstr ""
-
-#: statusnet.php:271
-msgid "OAuth Consumer Key"
-msgstr ""
-
-#: statusnet.php:272
-msgid "OAuth Consumer Secret"
-msgstr ""
-
-#: statusnet.php:274 statusnet.php:469 statusnet.php:481
-msgid "Base API Path (remember the trailing /)"
-msgstr ""
-
-#: statusnet.php:275
-msgid "Copy the security code from GNU Social here"
-msgstr ""
-
-#: statusnet.php:277
-msgid "Allow posting to GNU Social"
-msgstr ""
-
-#: statusnet.php:277
-msgid ""
-"If enabled all your <strong>public</strong> postings can be posted to the "
-"associated GNU Social account. You can choose to do so by default (here) or "
-"for every posting separately in the posting options when writing the entry."
-msgstr ""
-
-#: statusnet.php:278
-msgid "Post to GNU Social by default"
-msgstr ""
-
-#: statusnet.php:283
-msgid "GNU Social Import/Export/Mirror"
-msgstr ""
-
-#: statusnet.php:480
-msgid "Site name"
-msgstr "Namn på sidan"
-
-#: statusnet.php:482
-msgid "Consumer Secret"
-msgstr "Kundhemlighet"
-
-#: statusnet.php:483
-msgid "Consumer Key"
-msgstr "Kundnyckel"
diff --git a/statusnet/lang/sv/strings.php b/statusnet/lang/sv/strings.php
index e0a09d78..9b3fac7f 100644
--- a/statusnet/lang/sv/strings.php
+++ b/statusnet/lang/sv/strings.php
@@ -1,12 +1,14 @@
-<?php
-
-if(! function_exists("string_plural_select_sv")) {
-function string_plural_select_sv($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Save Settings'] = 'Spara inställningar';
-$a->strings['Log in with GNU Social'] = 'Logga in med GNU Social';
-$a->strings['Site name'] = 'Namn på sidan';
-$a->strings['Consumer Secret'] = 'Kundhemlighet';
-$a->strings['Consumer Key'] = 'Kundnyckel';
+<?php
+
+$a->strings["Post to StatusNet"] = "L&auml;gg in p&aring; StatusNet";
+$a->strings["StatusNet Posting Settings"] = "Inst&auml;llningar f&ouml;r inl&auml;gg p&aring; StatusNet";
+$a->strings["Submit"] = "Spara";
+$a->strings["No consumer key pair for StatusNet found. Register your Friendica Account as an desktop client on your StatusNet account, copy the consumer key pair here and enter the API base root.<br />Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendica installation at your favorited StatusNet installation."] = "No consumer key pair for StatusNet found. Register your Friendica Account as an desktop client on your StatusNet account, copy the consumer key pair here and enter the API base root.<br />Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendica installation at your favorited StatusNet installation.";
+$a->strings["OAuth Consumer Key"] = "OAuth Consumer Key";
+$a->strings["OAuth Consumer Secret"] = "OAuth Consumer Secret";
+$a->strings["Base API Path (remember the trailing /)"] = "Base API Path (remember the trailing /)";
+$a->strings["To connect to your StatusNet account click the button below to get a security code from StatusNet which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to StatusNet."] = "To connect to your StatusNet account click the button below to get a security code from StatusNet which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to StatusNet.";
+$a->strings["Log in with StatusNet"] = "Logga in med StatusNet";
+$a->strings["Copy the security code from StatusNet here"] = "Ange s&auml;kerhetskoden fr&aring;n StatusNet h&auml;r";
+$a->strings["Currently connected to: "] = "Ansluten till: ";
+$a->strings["Clear OAuth configuration"] = "Clear OAuth configuration";
diff --git a/statusnet/library/codebirdsn.php b/statusnet/library/codebirdsn.php
index 020c69c4..cba5f936 100644
--- a/statusnet/library/codebirdsn.php
+++ b/statusnet/library/codebirdsn.php
@@ -2,8 +2,6 @@
 
 namespace CodebirdSN;
 
-use Friendica\Core\System;
-
 /**
  * A Twitter library in PHP.
  *
@@ -822,7 +820,7 @@ class CodebirdSN
                 }
 
 		// To-Do
-		$tempfile = tempnam(System::getTempPath(), "mimecheck");
+		$tempfile = tempnam(get_temppath(), "mimecheck");
 		file_put_contents($tempfile, $data);
 		$mime = image_type_to_mime_type(exif_imagetype($tempfile));
 		unlink($tempfile);
@@ -1055,3 +1053,5 @@ class CodebirdSN
         return $parsed;
     }
 }
+
+?>
diff --git a/statusnet/library/statusnetoauth.php b/statusnet/library/statusnetoauth.php
index c9bb0163..27d91638 100644
--- a/statusnet/library/statusnetoauth.php
+++ b/statusnet/library/statusnetoauth.php
@@ -1,107 +1,104 @@
-<?php
-
-use Friendica\DI;
-
-require_once __DIR__ . DIRECTORY_SEPARATOR . 'twitteroauth.php';
-
-/*
- * We have to alter the TwitterOAuth class a little bit to work with any GNU Social
- * installation abroad. Basically it's only make the API path variable and be happy.
- *
- * Thank you guys for the Twitter compatible API!
- */
-class StatusNetOAuth extends TwitterOAuth
-{
-	function get_maxlength()
-	{
-		$config = $this->get($this->host . 'statusnet/config.json');
-		if (empty($config)) {
-			return 0;
-		}
-		return $config->site->textlimit;
-	}
-
-	function accessTokenURL()
-	{
-		return $this->host . 'oauth/access_token';
-	}
-
-	function authenticateURL()
-	{
-		return $this->host . 'oauth/authenticate';
-	}
-
-	function authorizeURL()
-	{
-		return $this->host . 'oauth/authorize';
-	}
-
-	function requestTokenURL()
-	{
-		return $this->host . 'oauth/request_token';
-	}
-
-	function __construct($apipath, $consumer_key, $consumer_secret, $oauth_token = NULL, $oauth_token_secret = NULL)
-	{
-		parent::__construct($consumer_key, $consumer_secret, $oauth_token, $oauth_token_secret);
-		$this->host = $apipath;
-	}
-
-	/**
-	 * Make an HTTP request
-	 *
-	 * Copied here from the TwitterOAuth library and complemented by applying the proxy settings of Friendica
-	 *
-	 * @param string $method
-	 * @param string $host
-	 * @param string $path
-	 * @param array  $parameters
-	 *
-	 * @return array|object API results
-	 */
-	function http($url, $method, $postfields = NULL)
-	{
-		$this->http_info = [];
-		$ci = curl_init();
-		/* Curl settings */
-		$prx = DI::config()->get('system', 'proxy');
-		if (strlen($prx)) {
-			curl_setopt($ci, CURLOPT_HTTPPROXYTUNNEL, 1);
-			curl_setopt($ci, CURLOPT_PROXY, $prx);
-			$prxusr = DI::config()->get('system', 'proxyuser');
-			if (strlen($prxusr)) {
-				curl_setopt($ci, CURLOPT_PROXYUSERPWD, $prxusr);
-			}
-		}
-		curl_setopt($ci, CURLOPT_USERAGENT, $this->useragent);
-		curl_setopt($ci, CURLOPT_CONNECTTIMEOUT, $this->connecttimeout);
-		curl_setopt($ci, CURLOPT_TIMEOUT, $this->timeout);
-		curl_setopt($ci, CURLOPT_RETURNTRANSFER, TRUE);
-		curl_setopt($ci, CURLOPT_HTTPHEADER, ['Expect:']);
-		curl_setopt($ci, CURLOPT_SSL_VERIFYPEER, $this->ssl_verifypeer);
-		curl_setopt($ci, CURLOPT_HEADERFUNCTION, [$this, 'getHeader']);
-		curl_setopt($ci, CURLOPT_HEADER, FALSE);
-
-		switch ($method) {
-			case 'POST':
-				curl_setopt($ci, CURLOPT_POST, TRUE);
-				if (!empty($postfields)) {
-					curl_setopt($ci, CURLOPT_POSTFIELDS, $postfields);
-				}
-				break;
-			case 'DELETE':
-				curl_setopt($ci, CURLOPT_CUSTOMREQUEST, 'DELETE');
-				if (!empty($postfields)) {
-					$url = "{$url}?{$postfields}";
-				}
-		}
-
-		curl_setopt($ci, CURLOPT_URL, $url);
-		$response = curl_exec($ci);
-		$this->http_code = curl_getinfo($ci, CURLINFO_HTTP_CODE);
-		$this->http_info = array_merge($this->http_info, curl_getinfo($ci));
-		$this->url = $url;
-		curl_close($ci);
-		return $response;
-	}
-}
+<?php
+
+use Friendica\Core\Config;
+
+require_once __DIR__ . DIRECTORY_SEPARATOR . 'twitteroauth.php';
+
+/*
+ * We have to alter the TwitterOAuth class a little bit to work with any GNU Social
+ * installation abroad. Basically it's only make the API path variable and be happy.
+ *
+ * Thank you guys for the Twitter compatible API!
+ */
+class StatusNetOAuth extends TwitterOAuth
+{
+	function get_maxlength()
+	{
+		$config = $this->get($this->host . 'statusnet/config.json');
+		return $config->site->textlimit;
+	}
+
+	function accessTokenURL()
+	{
+		return $this->host . 'oauth/access_token';
+	}
+
+	function authenticateURL()
+	{
+		return $this->host . 'oauth/authenticate';
+	}
+
+	function authorizeURL()
+	{
+		return $this->host . 'oauth/authorize';
+	}
+
+	function requestTokenURL()
+	{
+		return $this->host . 'oauth/request_token';
+	}
+
+	function __construct($apipath, $consumer_key, $consumer_secret, $oauth_token = NULL, $oauth_token_secret = NULL)
+	{
+		parent::__construct($consumer_key, $consumer_secret, $oauth_token, $oauth_token_secret);
+		$this->host = $apipath;
+	}
+
+	/**
+	 * Make an HTTP request
+	 *
+	 * Copied here from the TwitterOAuth library and complemented by applying the proxy settings of Friendica
+	 *
+	 * @param string $method
+	 * @param string $host
+	 * @param string $path
+	 * @param array  $parameters
+	 *
+	 * @return array|object API results
+	 */
+	function http($url, $method, $postfields = NULL)
+	{
+		$this->http_info = [];
+		$ci = curl_init();
+		/* Curl settings */
+		$prx = Config::get('system', 'proxy');
+		if (strlen($prx)) {
+			curl_setopt($ci, CURLOPT_HTTPPROXYTUNNEL, 1);
+			curl_setopt($ci, CURLOPT_PROXY, $prx);
+			$prxusr = Config::get('system', 'proxyuser');
+			if (strlen($prxusr)) {
+				curl_setopt($ci, CURLOPT_PROXYUSERPWD, $prxusr);
+			}
+		}
+		curl_setopt($ci, CURLOPT_USERAGENT, $this->useragent);
+		curl_setopt($ci, CURLOPT_CONNECTTIMEOUT, $this->connecttimeout);
+		curl_setopt($ci, CURLOPT_TIMEOUT, $this->timeout);
+		curl_setopt($ci, CURLOPT_RETURNTRANSFER, TRUE);
+		curl_setopt($ci, CURLOPT_HTTPHEADER, ['Expect:']);
+		curl_setopt($ci, CURLOPT_SSL_VERIFYPEER, $this->ssl_verifypeer);
+		curl_setopt($ci, CURLOPT_HEADERFUNCTION, [$this, 'getHeader']);
+		curl_setopt($ci, CURLOPT_HEADER, FALSE);
+
+		switch ($method) {
+			case 'POST':
+				curl_setopt($ci, CURLOPT_POST, TRUE);
+				if (!empty($postfields)) {
+					curl_setopt($ci, CURLOPT_POSTFIELDS, $postfields);
+				}
+				break;
+			case 'DELETE':
+				curl_setopt($ci, CURLOPT_CUSTOMREQUEST, 'DELETE');
+				if (!empty($postfields)) {
+					$url = "{$url}?{$postfields}";
+				}
+		}
+
+		curl_setopt($ci, CURLOPT_URL, $url);
+		$response = curl_exec($ci);
+		$this->http_code = curl_getinfo($ci, CURLINFO_HTTP_CODE);
+		$this->http_info = array_merge($this->http_info, curl_getinfo($ci));
+		$this->url = $url;
+		curl_close($ci);
+		return $response;
+	}
+}
diff --git a/statusnet/library/twitteroauth.php b/statusnet/library/twitteroauth.php
index b33b5f9d..bf56fc01 100644
--- a/statusnet/library/twitteroauth.php
+++ b/statusnet/library/twitteroauth.php
@@ -8,17 +8,15 @@
  * Version 0.2.0 kept for compatibility purpose with StatusNetOAuth
  */
 
-use Friendica\Security\OAuth1\OAuthConsumer;
-use Friendica\Security\OAuth1\OAuthRequest;
-use Friendica\Security\OAuth1\Signature\OAuthSignatureMethod_HMAC_SHA1;
-use Friendica\Security\OAuth1\OAuthToken;
-use Friendica\Security\OAuth1\OAuthUtil;
-
 /**
  * Twitter OAuth class
  */
 class TwitterOAuth
 {
+	/* Contains the last HTTP status code returned. */
+	public $http_code;
+	/* Contains the last API call. */
+	public $url;
 	/* Set up the API root URL. */
 	public $host = "https://api.twitter.com/1.1/";
 	/* Set timeout default. */
@@ -27,34 +25,17 @@ class TwitterOAuth
 	public $connecttimeout = 30;
 	/* Verify SSL Cert. */
 	public $ssl_verifypeer = FALSE;
-	/* Response format. */
+	/* Respons format. */
 	public $format = 'json';
 	/* Decode returned json data. */
 	public $decode_json = TRUE;
-	/* Set the useragent. */
+	/* Contains the last HTTP headers returned. */
+	public $http_info;
+	/* Set the useragnet. */
 	public $useragent = 'TwitterOAuth v0.2.0-beta2';
 
-	/* Contains the last HTTP status code returned. */
-	public $http_code;
-	/* Contains the last API call. */
-	public $url;
-	/**
-	 * Contains the last HTTP headers returned.
-	 * @var array
-	 */
-	public $http_header;
-	/**
-	 * Contains the last HTTP request info
-	 * @var string
-	 */
-	public $http_info;
-
-	/** @var OAuthToken */
-	private $token;
-	/** @var OAuthConsumer */
-	private $consumer;
-	/** @var \Friendica\Security\OAuth1\Signature\OAuthSignatureMethod_HMAC_SHA1 */
-	private $sha1_method;
+	/* Immediately retry the API call if the response was not successful. */
+	//public $retry = TRUE;
 
 	/**
 	 * Set API URLS
@@ -79,49 +60,60 @@ class TwitterOAuth
 		return 'https://api.twitter.com/oauth/request_token';
 	}
 
-	function __construct($consumer_key, $consumer_secret, $oauth_token = null, $oauth_token_secret = null)
+	/**
+	 * Debug helpers
+	 */
+	function lastStatusCode()
+	{
+		return $this->http_status;
+	}
+
+	function lastAPICall()
+	{
+		return $this->last_api_call;
+	}
+
+	/**
+	 * construct TwitterOAuth object
+	 */
+	function __construct($consumer_key, $consumer_secret, $oauth_token = NULL, $oauth_token_secret = NULL)
 	{
 		$this->sha1_method = new OAuthSignatureMethod_HMAC_SHA1();
 		$this->consumer = new OAuthConsumer($consumer_key, $consumer_secret);
 		if (!empty($oauth_token) && !empty($oauth_token_secret)) {
-			$this->token = new OAuthToken($oauth_token, $oauth_token_secret);
+			$this->token = new OAuthConsumer($oauth_token, $oauth_token_secret);
 		} else {
-			$this->token = null;
+			$this->token = NULL;
 		}
 	}
 
 	/**
-	 * Get a request_token
+	 * Get a request_token from Twitter
 	 *
-	 * @param callback $oauth_callback
-	 * @return array
+	 * @returns a key/value array containing oauth_token and oauth_token_secret
 	 */
-	function getRequestToken($oauth_callback = null)
+	function getRequestToken($oauth_callback = NULL)
 	{
-		$parameters = [];
+		$parameters = array();
 		if (!empty($oauth_callback)) {
 			$parameters['oauth_callback'] = $oauth_callback;
 		}
-
 		$request = $this->oAuthRequest($this->requestTokenURL(), 'GET', $parameters);
 		$token = OAuthUtil::parse_parameters($request);
-		$this->token = new OAuthToken($token['oauth_token'], $token['oauth_token_secret']);
+		$this->token = new OAuthConsumer($token['oauth_token'], $token['oauth_token_secret']);
 		return $token;
 	}
 
 	/**
 	 * Get the authorize URL
 	 *
-	 * @param array $token
-	 * @param bool $sign_in_with_tumblr
-	 * @return string
+	 * @returns a string
 	 */
 	function getAuthorizeURL($token, $sign_in_with_twitter = TRUE)
 	{
 		if (is_array($token)) {
 			$token = $token['oauth_token'];
 		}
-
 		if (empty($sign_in_with_twitter)) {
 			return $this->authorizeURL() . "?oauth_token={$token}";
 		} else {
@@ -133,32 +125,27 @@ class TwitterOAuth
 	 * Exchange request token and secret for an access token and
 	 * secret, to sign API calls.
 	 *
-	 * @param bool $oauth_verifier
-	 * @return array ("oauth_token" => "the-access-token",
+	 * @returns array("oauth_token" => "the-access-token",
 	 *                "oauth_token_secret" => "the-access-secret",
 	 *                "user_id" => "9436992",
 	 *                "screen_name" => "abraham")
 	 */
 	function getAccessToken($oauth_verifier = FALSE)
 	{
-		$parameters = [];
+		$parameters = array();
 		if (!empty($oauth_verifier)) {
 			$parameters['oauth_verifier'] = $oauth_verifier;
 		}
-
 		$request = $this->oAuthRequest($this->accessTokenURL(), 'GET', $parameters);
 		$token = OAuthUtil::parse_parameters($request);
-		$this->token = new OAuthToken($token['oauth_token'], $token['oauth_token_secret']);
-
+		$this->token = new OAuthConsumer($token['oauth_token'], $token['oauth_token_secret']);
 		return $token;
 	}
 
 	/**
 	 * One time exchange of username and password for access token and secret.
 	 *
-	 * @param string $username
-	 * @param string $password
-	 * @return array ("oauth_token" => "the-access-token",
+	 * @returns array("oauth_token" => "the-access-token",
 	 *                "oauth_token_secret" => "the-access-secret",
 	 *                "user_id" => "9436992",
 	 *                "screen_name" => "abraham",
@@ -166,83 +153,61 @@ class TwitterOAuth
 	 */
 	function getXAuthToken($username, $password)
 	{
-		$parameters = [];
+		$parameters = array();
 		$parameters['x_auth_username'] = $username;
 		$parameters['x_auth_password'] = $password;
 		$parameters['x_auth_mode'] = 'client_auth';
 		$request = $this->oAuthRequest($this->accessTokenURL(), 'POST', $parameters);
 		$token = OAuthUtil::parse_parameters($request);
-		$this->token = new OAuthToken($token['oauth_token'], $token['oauth_token_secret']);
-
+		$this->token = new OAuthConsumer($token['oauth_token'], $token['oauth_token_secret']);
 		return $token;
 	}
 
 	/**
 	 * GET wrapper for oAuthRequest.
-	 *
-	 * @param string $url
-	 * @param array $parameters
-	 * @return mixed|string
 	 */
-	function get($url, $parameters = [])
+	function get($url, $parameters = array())
 	{
 		$response = $this->oAuthRequest($url, 'GET', $parameters);
 		if ($this->format === 'json' && $this->decode_json) {
 			return json_decode($response);
 		}
-
 		return $response;
 	}
 
 	/**
 	 * POST wrapper for oAuthRequest.
-	 *
-	 * @param string $url
-	 * @param array $parameters
-	 * @return mixed|string
 	 */
-	function post($url, $parameters = [])
+	function post($url, $parameters = array())
 	{
 		$response = $this->oAuthRequest($url, 'POST', $parameters);
 		if ($this->format === 'json' && $this->decode_json) {
 			return json_decode($response);
 		}
-
 		return $response;
 	}
 
 	/**
 	 * DELETE wrapper for oAuthReqeust.
-	 *
-	 * @param string $url
-	 * @param array $parameters
-	 * @return mixed|string
 	 */
-	function delete($url, $parameters = [])
+	function delete($url, $parameters = array())
 	{
 		$response = $this->oAuthRequest($url, 'DELETE', $parameters);
 		if ($this->format === 'json' && $this->decode_json) {
 			return json_decode($response);
 		}
-
 		return $response;
 	}
 
 	/**
 	 * Format and sign an OAuth / API request
-	 *
-	 * @param string $url
-	 * @param string $method
-	 * @param array $parameters
-	 * @return mixed|string
 	 */
 	function oAuthRequest($url, $method, $parameters)
 	{
 		if (strrpos($url, 'https://') !== 0 && strrpos($url, 'http://') !== 0) {
 			$url = "{$this->host}{$url}.{$this->format}";
 		}
-
-		$request = OAuthRequest::from_consumer_and_token($this->consumer, $method, $url, $parameters, $this->token);
+		$request = OAuthRequest::from_consumer_and_token($this->consumer, $this->token, $method, $url, $parameters);
 		$request->sign_request($this->sha1_method, $this->consumer, $this->token);
 		switch ($method) {
 			case 'GET':
@@ -257,14 +222,11 @@ class TwitterOAuth
 	/**
 	 * Make an HTTP request
 	 *
-	 * @param string $url
-	 * @param string $method
-	 * @param mixed  $postfields
-	 * @return string API results
+	 * @return API results
 	 */
-	function http($url, $method, $postfields = null)
+	function http($url, $method, $postfields = NULL)
 	{
-		$this->http_info = [];
+		$this->http_info = array();
 		$ci = curl_init();
 		/* Curl settings */
 		curl_setopt($ci, CURLOPT_USERAGENT, $this->useragent);
@@ -296,16 +258,11 @@ class TwitterOAuth
 		$this->http_info = array_merge($this->http_info, curl_getinfo($ci));
 		$this->url = $url;
 		curl_close($ci);
-
 		return $response;
 	}
 
 	/**
 	 * Get the header info to store.
-	 *
-	 * @param resource $ch
-	 * @param string $header
-	 * @return int
 	 */
 	function getHeader($ch, $header)
 	{
@@ -315,7 +272,6 @@ class TwitterOAuth
 			$value = trim(substr($header, $i + 2));
 			$this->http_header[$key] = $value;
 		}
-
 		return strlen($header);
 	}
 }
diff --git a/statusnet/statusnet.css b/statusnet/statusnet.css
index 21f4733f..f50d9c05 100644
--- a/statusnet/statusnet.css
+++ b/statusnet/statusnet.css
@@ -10,3 +10,62 @@
 	height: 52px;
 	vertical-align: middle;
 }
+#statusnet-disconnect-label {
+	float: left;
+	width: 250px;
+	margin-bottom: 25px;
+}
+#statusnet-disconnect {
+	float: left;
+}
+
+#statusnet-default-label,
+#statusnet-applicationname-label,
+#statusnet-sendtaglinks-label,
+#statusnet-shortening-label, 
+#statusnet-mirror-label,
+#statusnet-import-label,
+#statusnet-create_user-label,
+#statusnet-pin-label,
+#statusnet-enable-label {
+	float: left;
+	width: 250px;
+	margin-bottom: 5px;
+}
+
+#statusnet-checkbox {
+	float: left;
+}
+
+#statusnet-pin {
+	float: left;
+}
+
+
+#statusnet-consumerkey-label {
+	float: left;
+	width: 250px;
+	margin-bottom: 8px;
+}
+#statusnet-consumerkey {
+	float: left;
+	margin-bottom: 8px;
+}
+#statusnet-consumersecret-label {
+	float: left;
+	width: 250px;
+	margin-bottom: 8px;
+}
+#statusnet-consumersecret {
+	float: left;
+	margin-bottom: 8px;
+}
+#statusnet-baseapi-label {
+	float: left;
+	width: 250px;
+	margin-bottom: 25px;
+}
+#statusnet-baseapi {
+	float: left;
+	margin-bottom: 8px;
+}
diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php
index f0372852..fee8fd82 100644
--- a/statusnet/statusnet.php
+++ b/statusnet/statusnet.php
@@ -39,16 +39,27 @@ require_once __DIR__ . DIRECTORY_SEPARATOR . 'library' . DIRECTORY_SEPARATOR . '
 
 use CodebirdSN\CodebirdSN;
 use Friendica\App;
+use Friendica\Content\OEmbed;
+use Friendica\Content\Text\HTML;
 use Friendica\Content\Text\Plaintext;
+use Friendica\Core\Config;
 use Friendica\Core\Hook;
+use Friendica\Core\L10n;
 use Friendica\Core\Logger;
+use Friendica\Core\PConfig;
+use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
-use Friendica\Core\System;
 use Friendica\Database\DBA;
-use Friendica\DI;
+use Friendica\Model\Contact;
+use Friendica\Model\Group;
 use Friendica\Model\Item;
-use Friendica\Model\Post;
+use Friendica\Model\ItemContent;
+use Friendica\Model\Photo;
 use Friendica\Model\User;
+use Friendica\Protocol\Activity;
+use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Network;
+use Friendica\Util\Strings;
 
 function statusnet_install()
 {
@@ -59,48 +70,81 @@ function statusnet_install()
 	Hook::register('hook_fork', 'addon/statusnet/statusnet.php', 'statusnet_hook_fork');
 	Hook::register('post_local', 'addon/statusnet/statusnet.php', 'statusnet_post_local');
 	Hook::register('jot_networks', 'addon/statusnet/statusnet.php', 'statusnet_jot_nets');
-	Logger::notice('installed GNU Social');
+	Hook::register('cron', 'addon/statusnet/statusnet.php', 'statusnet_cron');
+	Hook::register('prepare_body', 'addon/statusnet/statusnet.php', 'statusnet_prepare_body');
+	Hook::register('check_item_notification', 'addon/statusnet/statusnet.php', 'statusnet_check_item_notification');
+	Logger::log("installed GNU Social");
 }
 
-function statusnet_jot_nets(array &$jotnets_fields)
+function statusnet_uninstall()
 {
-	if (!DI::userSession()->getLocalUserId()) {
+	Hook::unregister('connector_settings', 'addon/statusnet/statusnet.php', 'statusnet_settings');
+	Hook::unregister('connector_settings_post', 'addon/statusnet/statusnet.php', 'statusnet_settings_post');
+	Hook::unregister('notifier_normal', 'addon/statusnet/statusnet.php', 'statusnet_post_hook');
+	Hook::unregister('hook_fork', 'addon/statusnet/statusnet.php', 'statusnet_hook_fork');
+	Hook::unregister('post_local', 'addon/statusnet/statusnet.php', 'statusnet_post_local');
+	Hook::unregister('jot_networks', 'addon/statusnet/statusnet.php', 'statusnet_jot_nets');
+	Hook::unregister('cron', 'addon/statusnet/statusnet.php', 'statusnet_cron');
+	Hook::unregister('prepare_body', 'addon/statusnet/statusnet.php', 'statusnet_prepare_body');
+	Hook::unregister('check_item_notification', 'addon/statusnet/statusnet.php', 'statusnet_check_item_notification');
+
+	// old setting - remove only
+	Hook::unregister('post_local_end', 'addon/statusnet/statusnet.php', 'statusnet_post_hook');
+	Hook::unregister('addon_settings', 'addon/statusnet/statusnet.php', 'statusnet_settings');
+	Hook::unregister('addon_settings_post', 'addon/statusnet/statusnet.php', 'statusnet_settings_post');
+}
+
+function statusnet_check_item_notification(App $a, &$notification_data)
+{
+	if (PConfig::get($notification_data["uid"], 'statusnet', 'post')) {
+		$notification_data["profiles"][] = PConfig::get($notification_data["uid"], 'statusnet', 'own_url');
+	}
+}
+
+function statusnet_jot_nets(App $a, array &$jotnets_fields)
+{
+	if (!local_user()) {
 		return;
 	}
 
-	if (DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'statusnet', 'post')) {
+	if (PConfig::get(local_user(), 'statusnet', 'post')) {
 		$jotnets_fields[] = [
 			'type' => 'checkbox',
 			'field' => [
 				'statusnet_enable',
-				DI::l10n()->t('Post to GNU Social'),
-				DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'statusnet', 'post_by_default')
+				L10n::t('Post to GNU Social'),
+				PConfig::get(local_user(), 'statusnet', 'post_by_default')
 			]
 		];
 	}
 }
 
-function statusnet_settings_post($post)
+function statusnet_settings_post(App $a, $post)
 {
-	if (!DI::userSession()->getLocalUserId()) {
+	if (!local_user()) {
 		return;
 	}
 	// don't check GNU Social settings if GNU Social submit button is not clicked
-	if (empty($_POST['statusnet-submit']) && empty($_POST['statusnet-disconnect'])) {
+	if (empty($_POST['statusnet-submit'])) {
 		return;
 	}
 
-	if (!empty($_POST['statusnet-disconnect'])) {
+	if (isset($_POST['statusnet-disconnect'])) {
 		/*		 * *
-		 * if the GNU Social-disconnect button is clicked, clear the GNU Social configuration
+		 * if the GNU Social-disconnect checkbox is set, clear the GNU Social configuration
 		 */
-		DI::pConfig()->delete(DI::userSession()->getLocalUserId(), 'statusnet', 'consumerkey');
-		DI::pConfig()->delete(DI::userSession()->getLocalUserId(), 'statusnet', 'consumersecret');
-		DI::pConfig()->delete(DI::userSession()->getLocalUserId(), 'statusnet', 'post');
-		DI::pConfig()->delete(DI::userSession()->getLocalUserId(), 'statusnet', 'post_by_default');
-		DI::pConfig()->delete(DI::userSession()->getLocalUserId(), 'statusnet', 'oauthtoken');
-		DI::pConfig()->delete(DI::userSession()->getLocalUserId(), 'statusnet', 'oauthsecret');
-		DI::pConfig()->delete(DI::userSession()->getLocalUserId(), 'statusnet', 'baseapi');
+		PConfig::delete(local_user(), 'statusnet', 'consumerkey');
+		PConfig::delete(local_user(), 'statusnet', 'consumersecret');
+		PConfig::delete(local_user(), 'statusnet', 'post');
+		PConfig::delete(local_user(), 'statusnet', 'post_by_default');
+		PConfig::delete(local_user(), 'statusnet', 'oauthtoken');
+		PConfig::delete(local_user(), 'statusnet', 'oauthsecret');
+		PConfig::delete(local_user(), 'statusnet', 'baseapi');
+		PConfig::delete(local_user(), 'statusnet', 'lastid');
+		PConfig::delete(local_user(), 'statusnet', 'mirror_posts');
+		PConfig::delete(local_user(), 'statusnet', 'import');
+		PConfig::delete(local_user(), 'statusnet', 'create_user');
+		PConfig::delete(local_user(), 'statusnet', 'own_url');
 	} else {
 		if (isset($_POST['statusnet-preconf-apiurl'])) {
 			/*			 * *
@@ -108,187 +152,252 @@ function statusnet_settings_post($post)
 			 * use them. All the data are available in the global config.
 			 * Check the API Url never the less and blame the admin if it's not working ^^
 			 */
-			$globalsn = DI::config()->get('statusnet', 'sites');
+			$globalsn = Config::get('statusnet', 'sites');
 			foreach ($globalsn as $asn) {
 				if ($asn['apiurl'] == $_POST['statusnet-preconf-apiurl']) {
 					$apibase = $asn['apiurl'];
-					$c = DI::httpClient()->fetch($apibase . 'statusnet/version.xml');
+					$c = Network::fetchUrl($apibase . 'statusnet/version.xml');
 					if (strlen($c) > 0) {
-						DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'statusnet', 'consumerkey', $asn['consumerkey']);
-						DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'statusnet', 'consumersecret', $asn['consumersecret']);
-						DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'statusnet', 'baseapi', $asn['apiurl']);
-						//DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'statusnet', 'application_name', $asn['applicationname'] );
+						PConfig::set(local_user(), 'statusnet', 'consumerkey', $asn['consumerkey']);
+						PConfig::set(local_user(), 'statusnet', 'consumersecret', $asn['consumersecret']);
+						PConfig::set(local_user(), 'statusnet', 'baseapi', $asn['apiurl']);
+						//PConfig::set(local_user(), 'statusnet', 'application_name', $asn['applicationname'] );
 					} else {
-						DI::sysmsg()->addNotice(DI::l10n()->t('Please contact your site administrator.<br />The provided API URL is not valid.') . '<br />' . $asn['apiurl']);
+						notice(L10n::t('Please contact your site administrator.<br />The provided API URL is not valid.') . EOL . $asn['apiurl'] . EOL);
 					}
 				}
 			}
+			$a->internalRedirect('settings/connectors');
 		} else {
 			if (isset($_POST['statusnet-consumersecret'])) {
 				//  check if we can reach the API of the GNU Social server
 				//  we'll check the API Version for that, if we don't get one we'll try to fix the path but will
 				//  resign quickly after this one try to fix the path ;-)
 				$apibase = $_POST['statusnet-baseapi'];
-				$c = DI::httpClient()->fetch($apibase . 'statusnet/version.xml');
+				$c = Network::fetchUrl($apibase . 'statusnet/version.xml');
 				if (strlen($c) > 0) {
 					//  ok the API path is correct, let's save the settings
-					DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'statusnet', 'consumerkey', $_POST['statusnet-consumerkey']);
-					DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'statusnet', 'consumersecret', $_POST['statusnet-consumersecret']);
-					DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'statusnet', 'baseapi', $apibase);
-					//DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'statusnet', 'application_name', $_POST['statusnet-applicationname'] );
+					PConfig::set(local_user(), 'statusnet', 'consumerkey', $_POST['statusnet-consumerkey']);
+					PConfig::set(local_user(), 'statusnet', 'consumersecret', $_POST['statusnet-consumersecret']);
+					PConfig::set(local_user(), 'statusnet', 'baseapi', $apibase);
+					//PConfig::set(local_user(), 'statusnet', 'application_name', $_POST['statusnet-applicationname'] );
 				} else {
 					//  the API path is not correct, maybe missing trailing / ?
 					$apibase = $apibase . '/';
-					$c = DI::httpClient()->fetch($apibase . 'statusnet/version.xml');
+					$c = Network::fetchUrl($apibase . 'statusnet/version.xml');
 					if (strlen($c) > 0) {
 						//  ok the API path is now correct, let's save the settings
-						DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'statusnet', 'consumerkey', $_POST['statusnet-consumerkey']);
-						DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'statusnet', 'consumersecret', $_POST['statusnet-consumersecret']);
-						DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'statusnet', 'baseapi', $apibase);
+						PConfig::set(local_user(), 'statusnet', 'consumerkey', $_POST['statusnet-consumerkey']);
+						PConfig::set(local_user(), 'statusnet', 'consumersecret', $_POST['statusnet-consumersecret']);
+						PConfig::set(local_user(), 'statusnet', 'baseapi', $apibase);
 					} else {
 						//  still not the correct API base, let's do noting
-						DI::sysmsg()->addNotice(DI::l10n()->t('We could not contact the GNU Social API with the Path you entered.'));
+						notice(L10n::t('We could not contact the GNU Social API with the Path you entered.') . EOL);
 					}
 				}
+				$a->internalRedirect('settings/connectors');
 			} else {
 				if (isset($_POST['statusnet-pin'])) {
 					//  if the user supplied us with a PIN from GNU Social, let the magic of OAuth happen
-					$api = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'statusnet', 'baseapi');
-					$ckey = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'statusnet', 'consumerkey');
-					$csecret = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'statusnet', 'consumersecret');
+					$api = PConfig::get(local_user(), 'statusnet', 'baseapi');
+					$ckey = PConfig::get(local_user(), 'statusnet', 'consumerkey');
+					$csecret = PConfig::get(local_user(), 'statusnet', 'consumersecret');
 					//  the token and secret for which the PIN was generated were hidden in the settings
 					//  form as token and token2, we need a new connection to GNU Social using these token
 					//  and secret to request a Access Token with the PIN
 					$connection = new StatusNetOAuth($api, $ckey, $csecret, $_POST['statusnet-token'], $_POST['statusnet-token2']);
 					$token = $connection->getAccessToken($_POST['statusnet-pin']);
 					//  ok, now that we have the Access Token, save them in the user config
-					DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'statusnet', 'oauthtoken', $token['oauth_token']);
-					DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'statusnet', 'oauthsecret', $token['oauth_token_secret']);
-					DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'statusnet', 'post', 1);
-					DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'statusnet', 'post_taglinks', 1);
+					PConfig::set(local_user(), 'statusnet', 'oauthtoken', $token['oauth_token']);
+					PConfig::set(local_user(), 'statusnet', 'oauthsecret', $token['oauth_token_secret']);
+					PConfig::set(local_user(), 'statusnet', 'post', 1);
+					PConfig::set(local_user(), 'statusnet', 'post_taglinks', 1);
 					//  reload the Addon Settings page, if we don't do it see Bug #42
+					$a->internalRedirect('settings/connectors');
 				} else {
 					//  if no PIN is supplied in the POST variables, the user has changed the setting
 					//  to post a dent for every new __public__ posting to the wall
-					DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'statusnet', 'post', intval($_POST['statusnet-enable']));
-					DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'statusnet', 'post_by_default', intval($_POST['statusnet-default']));
+					PConfig::set(local_user(), 'statusnet', 'post', intval($_POST['statusnet-enable']));
+					PConfig::set(local_user(), 'statusnet', 'post_by_default', intval($_POST['statusnet-default']));
+					PConfig::set(local_user(), 'statusnet', 'mirror_posts', intval($_POST['statusnet-mirror']));
+					PConfig::set(local_user(), 'statusnet', 'import', intval($_POST['statusnet-import']));
+					PConfig::set(local_user(), 'statusnet', 'create_user', intval($_POST['statusnet-create_user']));
+
+					if (!intval($_POST['statusnet-mirror']))
+						PConfig::delete(local_user(), 'statusnet', 'lastid');
+
+					info(L10n::t('GNU Social settings updated.') . EOL);
 				}
 			}
 		}
 	}
 }
 
-function statusnet_settings(array &$data)
+function statusnet_settings(App $a, &$s)
 {
-	if (!DI::userSession()->getLocalUserId()) {
+	if (!local_user()) {
 		return;
 	}
-
-	DI::page()->registerStylesheet(__DIR__ . '/statusnet.css', 'all');
-
+	$a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->getBaseURL() . '/addon/statusnet/statusnet.css' . '" media="all" />' . "\r\n";
 	/*	 * *
 	 * 1) Check that we have a base api url and a consumer key & secret
 	 * 2) If no OAuthtoken & stuff is present, generate button to get some
 	 *    allow the user to cancel the connection process at this step
 	 * 3) Checkbox for "Send public notices (respect size limitation)
 	 */
-	$baseapi     = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'statusnet', 'baseapi');
-	$ckey        = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'statusnet', 'consumerkey');
-	$csecret     = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'statusnet', 'consumersecret');
-	$otoken      = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'statusnet', 'oauthtoken');
-	$osecret     = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'statusnet', 'oauthsecret');
-	$enabled     = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'statusnet', 'post', false);
-	$def_enabled = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'statusnet', 'post_by_default', false);
+	$api     = PConfig::get(local_user(), 'statusnet', 'baseapi');
+	$ckey    = PConfig::get(local_user(), 'statusnet', 'consumerkey');
+	$csecret = PConfig::get(local_user(), 'statusnet', 'consumersecret');
+	$otoken  = PConfig::get(local_user(), 'statusnet', 'oauthtoken');
+	$osecret = PConfig::get(local_user(), 'statusnet', 'oauthsecret');
+	$enabled = PConfig::get(local_user(), 'statusnet', 'post');
+	$checked = (($enabled) ? ' checked="checked" ' : '');
+	$defenabled = PConfig::get(local_user(), 'statusnet', 'post_by_default');
+	$defchecked = (($defenabled) ? ' checked="checked" ' : '');
+	$mirrorenabled = PConfig::get(local_user(), 'statusnet', 'mirror_posts');
+	$mirrorchecked = (($mirrorenabled) ? ' checked="checked" ' : '');
+	$import = PConfig::get(local_user(), 'statusnet', 'import');
+	$importselected = ["", "", ""];
+	$importselected[$import] = ' selected="selected"';
+	//$importenabled = PConfig::get(local_user(),'statusnet','import');
+	//$importchecked = (($importenabled) ? ' checked="checked" ' : '');
+	$create_userenabled = PConfig::get(local_user(), 'statusnet', 'create_user');
+	$create_userchecked = (($create_userenabled) ? ' checked="checked" ' : '');
 
-	// Radio button list to select existing application credentials
-	$sites = array_map(function ($site) {
-		return ['statusnet-preconf-apiurl', $site['sitename'], $site['apiurl']];
-	}, DI::config()->get('statusnet', 'sites', []));
+	$css = (($enabled) ? '' : '-disabled');
 
-	$submit = ['statusnet-submit' => DI::l10n()->t('Save Settings')];
+	$s .= '<span id="settings_statusnet_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_statusnet_expanded\'); openClose(\'settings_statusnet_inflated\');">';
+	$s .= '<img class="connector' . $css . '" src="images/gnusocial.png" /><h3 class="connector">' . L10n::t('GNU Social Import/Export/Mirror') . '</h3>';
+	$s .= '</span>';
+	$s .= '<div id="settings_statusnet_expanded" class="settings-block" style="display: none;">';
+	$s .= '<span class="fakelink" onclick="openClose(\'settings_statusnet_expanded\'); openClose(\'settings_statusnet_inflated\');">';
+	$s .= '<img class="connector' . $css . '" src="images/gnusocial.png" /><h3 class="connector">' . L10n::t('GNU Social Import/Export/Mirror') . '</h3>';
+	$s .= '</span>';
 
-	if ($ckey && $csecret) {
-		if ($otoken && $osecret) {
-			/*			 * *
-			 *  we have an OAuth key / secret pair for the user
-			 *  so let's give a chance to disable the postings to GNU Social
-			 */
-			$connection = new StatusNetOAuth($baseapi, $ckey, $csecret, $otoken, $osecret);
-			$account    = $connection->get('account/verify_credentials');
-
-			if (!empty($account)) {
-				$connected_account = DI::l10n()->t('Currently connected to: <a href="%s" target="_statusnet">%s</a>', $account->statusnet_profile_url, $account->screen_name);
+	if ((!$ckey) && (!$csecret)) {
+		/*		 * *
+		 * no consumer keys
+		 */
+		$globalsn = Config::get('statusnet', 'sites');
+		/*		 * *
+		 * lets check if we have one or more globally configured GNU Social
+		 * server OAuth credentials in the configuration. If so offer them
+		 * with a little explanation to the user as choice - otherwise
+		 * ignore this option entirely.
+		 */
+		if (!$globalsn == null) {
+			$s .= '<h4>' . L10n::t('Globally Available GNU Social OAuthKeys') . '</h4>';
+			$s .= '<p>' . L10n::t("There are preconfigured OAuth key pairs for some GNU Social servers available. If you are using one of them, please use these credentials. If not feel free to connect to any other GNU Social instance \x28see below\x29.") . '</p>';
+			$s .= '<div id="statusnet-preconf-wrapper">';
+			foreach ($globalsn as $asn) {
+				$s .= '<input type="radio" name="statusnet-preconf-apiurl" value="' . $asn['apiurl'] . '">' . $asn['sitename'] . '<br />';
 			}
-
-			$user = User::getById(DI::userSession()->getLocalUserId());
-			if ($user['hidewall']) {
-				$privacy_warning = DI::l10n()->t('<strong>Note</strong>: Due your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to GNU Social will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted.');
-			}
-
-			$submit['statusnet-disconnect'] = DI::l10n()->t('Clear OAuth configuration');
-		} else {
+			$s .= '<p></p><div class="clear"></div></div>';
+			$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="statusnet-submit" class="settings-submit" value="' . L10n::t('Save Settings') . '" /></div>';
+		}
+		$s .= '<h4>' . L10n::t('Provide your own OAuth Credentials') . '</h4>';
+		$s .= '<p>' . L10n::t('No consumer key pair for GNU Social found. Register your Friendica Account as an desktop client on your GNU Social account, copy the consumer key pair here and enter the API base root.<br />Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendica installation at your favorited GNU Social installation.') . '</p>';
+		$s .= '<div id="statusnet-consumer-wrapper">';
+		$s .= '<label id="statusnet-consumerkey-label" for="statusnet-consumerkey">' . L10n::t('OAuth Consumer Key') . '</label>';
+		$s .= '<input id="statusnet-consumerkey" type="text" name="statusnet-consumerkey" size="35" /><br />';
+		$s .= '<div class="clear"></div>';
+		$s .= '<label id="statusnet-consumersecret-label" for="statusnet-consumersecret">' . L10n::t('OAuth Consumer Secret') . '</label>';
+		$s .= '<input id="statusnet-consumersecret" type="text" name="statusnet-consumersecret" size="35" /><br />';
+		$s .= '<div class="clear"></div>';
+		$s .= '<label id="statusnet-baseapi-label" for="statusnet-baseapi">' . L10n::t("Base API Path \x28remember the trailing /\x29") . '</label>';
+		$s .= '<input id="statusnet-baseapi" type="text" name="statusnet-baseapi" size="35" /><br />';
+		$s .= '<div class="clear"></div>';
+		//$s .= '<label id="statusnet-applicationname-label" for="statusnet-applicationname">'.L10n::t('GNU Socialapplication name').'</label>';
+		//$s .= '<input id="statusnet-applicationname" type="text" name="statusnet-applicationname" size="35" /><br />';
+		$s .= '<p></p><div class="clear"></div>';
+		$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="statusnet-submit" class="settings-submit" value="' . L10n::t('Save Settings') . '" /></div>';
+		$s .= '</div>';
+	} else {
+		/*		 * *
+		 * ok we have a consumer key pair now look into the OAuth stuff
+		 */
+		if ((!$otoken) && (!$osecret)) {
 			/*			 * *
 			 * the user has not yet connected the account to GNU Social
 			 * get a temporary OAuth key/secret pair and display a button with
 			 * which the user can request a PIN to connect the account to a
 			 * account at GNU Social
 			 */
-			$connection    = new StatusNetOAuth($baseapi, $ckey, $csecret);
+			$connection = new StatusNetOAuth($api, $ckey, $csecret);
 			$request_token = $connection->getRequestToken('oob');
-			$authorize_url = $connection->getAuthorizeURL($request_token['oauth_token'], false);
+			$token = $request_token['oauth_token'];
+			/*			 * *
+			 *  make some nice form
+			 */
+			$s .= '<p>' . L10n::t('To connect to your GNU Social account click the button below to get a security code from GNU Social which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to GNU Social.') . '</p>';
+			$s .= '<a href="' . $connection->getAuthorizeURL($token, False) . '" target="_statusnet"><img src="addon/statusnet/signinwithstatusnet.png" alt="' . L10n::t('Log in with GNU Social') . '"></a>';
+			$s .= '<div id="statusnet-pin-wrapper">';
+			$s .= '<label id="statusnet-pin-label" for="statusnet-pin">' . L10n::t('Copy the security code from GNU Social here') . '</label>';
+			$s .= '<input id="statusnet-pin" type="text" name="statusnet-pin" />';
+			$s .= '<input id="statusnet-token" type="hidden" name="statusnet-token" value="' . $token . '" />';
+			$s .= '<input id="statusnet-token2" type="hidden" name="statusnet-token2" value="' . $request_token['oauth_token_secret'] . '" />';
+			$s .= '</div><div class="clear"></div>';
+			$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="statusnet-submit" class="settings-submit" value="' . L10n::t('Save Settings') . '" /></div>';
+			$s .= '<h4>' . L10n::t('Cancel Connection Process') . '</h4>';
+			$s .= '<div id="statusnet-cancel-wrapper">';
+			$s .= '<p>' . L10n::t('Current GNU Social API is') . ': ' . $api . '</p>';
+			$s .= '<label id="statusnet-cancel-label" for="statusnet-cancel">' . L10n::t('Cancel GNU Social Connection') . '</label>';
+			$s .= '<input id="statusnet-cancel" type="checkbox" name="statusnet-disconnect" value="1" />';
+			$s .= '</div><div class="clear"></div>';
+			$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="statusnet-submit" class="settings-submit" value="' . L10n::t('Save Settings') . '" /></div>';
+		} else {
+			/*			 * *
+			 *  we have an OAuth key / secret pair for the user
+			 *  so let's give a chance to disable the postings to GNU Social
+			 */
+			$connection = new StatusNetOAuth($api, $ckey, $csecret, $otoken, $osecret);
+			$details = $connection->get('account/verify_credentials');
+			if (!empty($details)) {
+				$s .= '<div id="statusnet-info" ><img id="statusnet-avatar" src="' . $details->profile_image_url . '" /><p id="statusnet-info-block">' . L10n::t('Currently connected to: ') . '<a href="' . $details->statusnet_profile_url . '" target="_statusnet">' . $details->screen_name . '</a><br /><em>' . $details->description . '</em></p></div>';
+			}
+			$s .= '<p>' . L10n::t('If enabled all your <strong>public</strong> postings can be posted to the associated GNU Social account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry.') . '</p>';
+			if ($a->user['hidewall']) {
+				$s .= '<p>' . L10n::t('<strong>Note</strong>: Due your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to GNU Social will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted.') . '</p>';
+			}
+			$s .= '<div id="statusnet-enable-wrapper">';
+			$s .= '<label id="statusnet-enable-label" for="statusnet-checkbox">' . L10n::t('Allow posting to GNU Social') . '</label>';
+			$s .= '<input id="statusnet-checkbox" type="checkbox" name="statusnet-enable" value="1" ' . $checked . '/>';
+			$s .= '<div class="clear"></div>';
+			$s .= '<label id="statusnet-default-label" for="statusnet-default">' . L10n::t('Send public postings to GNU Social by default') . '</label>';
+			$s .= '<input id="statusnet-default" type="checkbox" name="statusnet-default" value="1" ' . $defchecked . '/>';
+			$s .= '<div class="clear"></div>';
 
-			$submit['statusnet-disconnect'] = DI::l10n()->t('Cancel GNU Social Connection');
+			$s .= '<label id="statusnet-mirror-label" for="statusnet-mirror">' . L10n::t('Mirror all posts from GNU Social that are no replies or repeated messages') . '</label>';
+			$s .= '<input id="statusnet-mirror" type="checkbox" name="statusnet-mirror" value="1" ' . $mirrorchecked . '/>';
+
+			$s .= '<div class="clear"></div>';
+			$s .= '</div>';
+
+			$s .= '<label id="statusnet-import-label" for="statusnet-import">' . L10n::t('Import the remote timeline') . '</label>';
+			//$s .= '<input id="statusnet-import" type="checkbox" name="statusnet-import" value="1" '. $importchecked . '/>';
+
+			$s .= '<select name="statusnet-import" id="statusnet-import" />';
+			$s .= '<option value="0" ' . $importselected[0] . '>' . L10n::t("Disabled") . '</option>';
+			$s .= '<option value="1" ' . $importselected[1] . '>' . L10n::t("Full Timeline") . '</option>';
+			$s .= '<option value="2" ' . $importselected[2] . '>' . L10n::t("Only Mentions") . '</option>';
+			$s .= '</select>';
+			$s .= '<div class="clear"></div>';
+			/*
+			  $s .= '<label id="statusnet-create_user-label" for="statusnet-create_user">'.L10n::t('Automatically create contacts').'</label>';
+			  $s .= '<input id="statusnet-create_user" type="checkbox" name="statusnet-create_user" value="1" '. $create_userchecked . '/>';
+			  $s .= '<div class="clear"></div>';
+			 */
+			$s .= '<div id="statusnet-disconnect-wrapper">';
+			$s .= '<label id="statusnet-disconnect-label" for="statusnet-disconnect">' . L10n::t('Clear OAuth configuration') . '</label>';
+			$s .= '<input id="statusnet-disconnect" type="checkbox" name="statusnet-disconnect" value="1" />';
+			$s .= '</div><div class="clear"></div>';
+			$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="statusnet-submit" class="settings-submit" value="' . L10n::t('Save Settings') . '" /></div>';
 		}
 	}
-
-	$t    = Renderer::getMarkupTemplate('connector_settings.tpl', 'addon/statusnet/');
-	$html = Renderer::replaceMacros($t, [
-		'$l10n' => [
-			'global_title'      => DI::l10n()->t('Globally Available GNU Social OAuthKeys'),
-			'global_info'       => DI::l10n()->t(DI::l10n()->t('There are preconfigured OAuth key pairs for some GNU Social servers available. If you are using one of them, please use these credentials. If not feel free to connect to any other GNU Social instance (see below).')),
-			'credentials_title' => DI::l10n()->t('Provide your own OAuth Credentials'),
-			'credentials_info'  => DI::l10n()->t('No consumer key pair for GNU Social found. Register your Friendica Account as a desktop application on your GNU Social account, copy the consumer key pair here and enter the API base root.<br />Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendica installation at your favorite GNU Social installation.'),
-			'oauth_info'        => DI::l10n()->t('To connect to your GNU Social account click the button below to get a security code from GNU Social which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to GNU Social.'),
-			'oauth_alt'         => DI::l10n()->t('Log in with GNU Social'),
-			'oauth_cancel'      => DI::l10n()->t('Cancel Connection Process'),
-			'oauth_api'         => DI::l10n()->t('Current GNU Social API is: %s', $baseapi),
-			'connected_account' => $connected_account ?? '',
-			'privacy_warning'   => $privacy_warning ?? '',
-		],
-
-		'$ckey'    => $ckey,
-		'$csecret' => $csecret,
-		'$otoken'  => $otoken,
-		'$osecret' => $osecret,
-		'$sites'   => $sites,
-
-		'$authorize_url' => $authorize_url ?? '',
-		'$request_token' => $request_token ?? null,
-		'$account'       => $account ?? null,
-
-		'$authenticate_url' => DI::baseUrl() . '/statusnet/connect',
-
-		'$consumerkey'    => ['statusnet-consumerkey', DI::l10n()->t('OAuth Consumer Key'), '', '', false, ' size="35'],
-		'$consumersecret' => ['statusnet-consumersecret', DI::l10n()->t('OAuth Consumer Secret'), '', '', false, ' size="35'],
-
-		'$baseapi' => ['statusnet-baseapi', DI::l10n()->t('Base API Path (remember the trailing /)'), '', '', false, ' size="35'],
-		'$pin'     => ['statusnet-pin', DI::l10n()->t('Copy the security code from GNU Social here')],
-
-		'$enable'      => ['statusnet-enabled', DI::l10n()->t('Allow posting to GNU Social'), $enabled, DI::l10n()->t('If enabled all your <strong>public</strong> postings can be posted to the associated GNU Social account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry.')],
-		'$default'     => ['statusnet-default', DI::l10n()->t('Post to GNU Social by default'), $def_enabled],
-	]);
-
-	$data = [
-		'connector' => 'statusnet',
-		'title'     => DI::l10n()->t('GNU Social Import/Export/Mirror'),
-		'image'     => 'images/gnusocial.png',
-		'enabled'   => $enabled,
-		'html'      => $html,
-		'submit'    => $submit,
-	];
+	$s .= '</div><div class="clear"></div>';
 }
 
-function statusnet_hook_fork(array &$b)
+function statusnet_hook_fork(App $a, array &$b)
 {
 	if ($b['name'] != 'notifier_normal') {
 		return;
@@ -296,27 +405,54 @@ function statusnet_hook_fork(array &$b)
 
 	$post = $b['data'];
 
-	if ($post['deleted'] || ($post['created'] !== $post['edited']) || strpos($post['postopts'] ?? '', 'statusnet') === false || ($post['parent'] != $post['id']) || $post['private']) {
+	// Deleting and editing is not supported by the addon
+	if ($post['deleted'] || ($post['created'] !== $post['edited'])) {
 		$b['execute'] = false;
 		return;
 	}
+
+	// if post comes from GNU Social don't send it back
+	if ($post['extid'] == Protocol::STATUSNET) {
+		$b['execute'] = false;
+		return;
+	}
+
+	if ($post['app'] == 'StatusNet') {
+		$b['execute'] = false;
+		return;
+	}
+
+	if (PConfig::get($post['uid'], 'statusnet', 'import')) {
+		// Don't fork if it isn't a reply to a GNU Social post
+		if (($post['parent'] != $post['id']) && !Item::exists(['id' => $post['parent'], 'network' => Protocol::STATUSNET])) {
+			Logger::log('No GNU Social parent found for item ' . $post['id']);
+			$b['execute'] = false;
+			return;
+		}
+	} else {
+		// Comments are never exported when we don't import the GNU Social timeline
+		if (!strstr($post['postopts'], 'statusnet') || ($post['parent'] != $post['id']) || $post['private']) {
+			$b['execute'] = false;
+			return;
+		}
+	}
 }
 
-function statusnet_post_local(array &$b)
+function statusnet_post_local(App $a, &$b)
 {
 	if ($b['edit']) {
 		return;
 	}
 
-	if (!DI::userSession()->getLocalUserId() || (DI::userSession()->getLocalUserId() != $b['uid'])) {
+	if (!local_user() || (local_user() != $b['uid'])) {
 		return;
 	}
 
-	$statusnet_post = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'statusnet', 'post');
+	$statusnet_post = PConfig::get(local_user(), 'statusnet', 'post');
 	$statusnet_enable = (($statusnet_post && !empty($_REQUEST['statusnet_enable'])) ? intval($_REQUEST['statusnet_enable']) : 0);
 
 	// if API is used, default to the chosen settings
-	if ($b['api_source'] && intval(DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'statusnet', 'post_by_default'))) {
+	if ($b['api_source'] && intval(PConfig::get(local_user(), 'statusnet', 'post_by_default'))) {
 		$statusnet_enable = 1;
 	}
 
@@ -331,73 +467,168 @@ function statusnet_post_local(array &$b)
 	$b['postopts'] .= 'statusnet';
 }
 
-function statusnet_post_hook(array &$b)
+function statusnet_action(App $a, $uid, $pid, $action)
+{
+	$api = PConfig::get($uid, 'statusnet', 'baseapi');
+	$ckey = PConfig::get($uid, 'statusnet', 'consumerkey');
+	$csecret = PConfig::get($uid, 'statusnet', 'consumersecret');
+	$otoken = PConfig::get($uid, 'statusnet', 'oauthtoken');
+	$osecret = PConfig::get($uid, 'statusnet', 'oauthsecret');
+
+	$connection = new StatusNetOAuth($api, $ckey, $csecret, $otoken, $osecret);
+
+	Logger::log("statusnet_action '" . $action . "' ID: " . $pid, Logger::DATA);
+
+	switch ($action) {
+		case "delete":
+			$result = $connection->post("statuses/destroy/" . $pid);
+			break;
+		case "like":
+			$result = $connection->post("favorites/create/" . $pid);
+			break;
+		case "unlike":
+			$result = $connection->post("favorites/destroy/" . $pid);
+			break;
+	}
+	Logger::log("statusnet_action '" . $action . "' send, result: " . print_r($result, true), Logger::DEBUG);
+}
+
+function statusnet_post_hook(App $a, &$b)
 {
 	/**
 	 * Post to GNU Social
 	 */
-	if ($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited'])) {
-		return;
+	if (!PConfig::get($b["uid"], 'statusnet', 'import')) {
+		if ($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited']))
+			return;
 	}
 
-	$b['body'] = Post\Media::addAttachmentsToBody($b['uri-id'], DI::contentItem()->addSharedPost($b));
-
-	$api = DI::pConfig()->get($b['uid'], 'statusnet', 'baseapi');
+	$api = PConfig::get($b["uid"], 'statusnet', 'baseapi');
 	$hostname = preg_replace("=https?://([\w\.]*)/.*=ism", "$1", $api);
 
-	if ($b['private'] || !strstr($b['postopts'], 'statusnet')) {
+	if ($b['parent'] != $b['id']) {
+		Logger::log("statusnet_post_hook: parameter " . print_r($b, true), Logger::DATA);
+
+		// Looking if its a reply to a GNU Social post
+		$hostlength = strlen($hostname) + 2;
+		if ((substr($b["parent-uri"], 0, $hostlength) != $hostname . "::") && (substr($b["extid"], 0, $hostlength) != $hostname . "::") && (substr($b["thr-parent"], 0, $hostlength) != $hostname . "::")) {
+			Logger::log("statusnet_post_hook: no GNU Social post " . $b["parent"]);
+			return;
+		}
+
+		$condition = ['uri' => $b["thr-parent"], 'uid' => $b["uid"]];
+		$orig_post = Item::selectFirst(['author-link', 'uri'], $condition);
+		if (!DBA::isResult($orig_post)) {
+			Logger::log("statusnet_post_hook: no parent found " . $b["thr-parent"]);
+			return;
+		} else {
+			$iscomment = true;
+		}
+
+		$nick = preg_replace("=https?://(.*)/(.*)=ism", "$2", $orig_post["author-link"]);
+
+		$nickname = "@[url=" . $orig_post["author-link"] . "]" . $nick . "[/url]";
+		$nicknameplain = "@" . $nick;
+
+		Logger::log("statusnet_post_hook: comparing " . $nickname . " and " . $nicknameplain . " with " . $b["body"], Logger::DEBUG);
+		if ((strpos($b["body"], $nickname) === false) && (strpos($b["body"], $nicknameplain) === false)) {
+			$b["body"] = $nickname . " " . $b["body"];
+		}
+
+		Logger::log("statusnet_post_hook: parent found " . print_r($orig_post, true), Logger::DEBUG);
+	} else {
+		$iscomment = false;
+
+		if ($b['private'] || !strstr($b['postopts'], 'statusnet')) {
+			return;
+		}
+
+		// Dont't post if the post doesn't belong to us.
+		// This is a check for forum postings
+		$self = DBA::selectFirst('contact', ['id'], ['uid' => $b['uid'], 'self' => true]);
+		if ($b['contact-id'] != $self['id']) {
+			return;
+		}
+	}
+
+	if (($b['verb'] == Activity::POST) && $b['deleted']) {
+		statusnet_action($a, $b["uid"], substr($orig_post["uri"], $hostlength), "delete");
+	}
+
+	if ($b['verb'] == Activity::LIKE) {
+		Logger::log("statusnet_post_hook: parameter 2 " . substr($b["thr-parent"], $hostlength), Logger::DEBUG);
+		if ($b['deleted'])
+			statusnet_action($a, $b["uid"], substr($b["thr-parent"], $hostlength), "unlike");
+		else
+			statusnet_action($a, $b["uid"], substr($b["thr-parent"], $hostlength), "like");
 		return;
 	}
 
-	// Dont't post if the post doesn't belong to us.
-	// This is a check for group postings
-	$self = DBA::selectFirst('contact', ['id'], ['uid' => $b['uid'], 'self' => true]);
-	if ($b['contact-id'] != $self['id']) {
+	if ($b['deleted'] || ($b['created'] !== $b['edited'])) {
 		return;
 	}
 
-	Logger::notice('GNU Socialpost invoked');
+	// if posts comes from GNU Social don't send it back
+	if ($b['extid'] == Protocol::STATUSNET) {
+		return;
+	}
 
-	DI::pConfig()->load($b['uid'], 'statusnet');
+	if ($b['app'] == "StatusNet") {
+		return;
+	}
 
-	$api     = DI::pConfig()->get($b['uid'], 'statusnet', 'baseapi');
-	$ckey    = DI::pConfig()->get($b['uid'], 'statusnet', 'consumerkey');
-	$csecret = DI::pConfig()->get($b['uid'], 'statusnet', 'consumersecret');
-	$otoken  = DI::pConfig()->get($b['uid'], 'statusnet', 'oauthtoken');
-	$osecret = DI::pConfig()->get($b['uid'], 'statusnet', 'oauthsecret');
+	Logger::log('GNU Socialpost invoked');
+
+	PConfig::load($b['uid'], 'statusnet');
+
+	$api     = PConfig::get($b['uid'], 'statusnet', 'baseapi');
+	$ckey    = PConfig::get($b['uid'], 'statusnet', 'consumerkey');
+	$csecret = PConfig::get($b['uid'], 'statusnet', 'consumersecret');
+	$otoken  = PConfig::get($b['uid'], 'statusnet', 'oauthtoken');
+	$osecret = PConfig::get($b['uid'], 'statusnet', 'oauthsecret');
 
 	if ($ckey && $csecret && $otoken && $osecret) {
+		// If it's a repeated message from GNU Social then do a native retweet and exit
+		if (statusnet_is_retweet($a, $b['uid'], $b['body'])) {
+			return;
+		}
+
 		$dent = new StatusNetOAuth($api, $ckey, $csecret, $otoken, $osecret);
 		$max_char = $dent->get_maxlength(); // max. length for a dent
 
-		DI::pConfig()->set($b['uid'], 'statusnet', 'max_char', $max_char);
+		PConfig::set($b['uid'], 'statusnet', 'max_char', $max_char);
 
-		$tempfile = '';
-		$msgarr = Plaintext::getPost($b, $max_char, true, 7);
-		$msg = $msgarr['text'];
+		$tempfile = "";
+		$msgarr = ItemContent::getPlaintextPost($b, $max_char, true, 7);
+		$msg = $msgarr["text"];
 
-		if (($msg == '') && isset($msgarr['title']))
-			$msg = Plaintext::shorten($msgarr['title'], $max_char - 50, $b['uid']);
+		if (($msg == "") && isset($msgarr["title"]))
+			$msg = Plaintext::shorten($msgarr["title"], $max_char - 50);
 
-		$image = '';
+		$image = "";
 
-		if (isset($msgarr['url']) && ($msgarr['type'] != 'photo')) {
-			$msg .= " \n" . $msgarr['url'];
-		} elseif (isset($msgarr['image']) && ($msgarr['type'] != 'video')) {
-			$image = $msgarr['image'];
+		if (isset($msgarr["url"]) && ($msgarr["type"] != "photo")) {
+			$msg .= " \n" . $msgarr["url"];
+		} elseif (isset($msgarr["image"]) && ($msgarr["type"] != "video")) {
+			$image = $msgarr["image"];
 		}
 
-		if ($image != '') {
-			$img_str = DI::httpClient()->fetch($image);
-			$tempfile = tempnam(System::getTempPath(), 'cache');
+		if ($image != "") {
+			$img_str = Network::fetchUrl($image);
+			$tempfile = tempnam(get_temppath(), "cache");
 			file_put_contents($tempfile, $img_str);
-			$postdata = ['status' => $msg, 'media[]' => $tempfile];
+			$postdata = ["status" => $msg, "media[]" => $tempfile];
 		} else {
-			$postdata = ['status' => $msg];
+			$postdata = ["status" => $msg];
 		}
 
 		// and now send it :-)
 		if (strlen($msg)) {
+			if ($iscomment) {
+				$postdata["in_reply_to_status_id"] = substr($orig_post["uri"], $hostlength);
+				Logger::log('statusnet_post send reply ' . print_r($postdata, true), Logger::DEBUG);
+			}
+
 			// New code that is able to post pictures
 			require_once __DIR__ . DIRECTORY_SEPARATOR . 'library' . DIRECTORY_SEPARATOR . 'codebirdsn.php';
 			$cb = CodebirdSN::getInstance();
@@ -406,27 +637,27 @@ function statusnet_post_hook(array &$b)
 			$cb->setToken($otoken, $osecret);
 			$result = $cb->statuses_update($postdata);
 			//$result = $dent->post('statuses/update', $postdata);
-			Logger::info('statusnet_post send, result: ' . print_r($result, true) .
-				"\nmessage: " . $msg . "\nOriginal post: " . print_r($b, true) . "\nPost Data: " . print_r($postdata, true));
+			Logger::log('statusnet_post send, result: ' . print_r($result, true) .
+				"\nmessage: " . $msg . "\nOriginal post: " . print_r($b, true) . "\nPost Data: " . print_r($postdata, true), Logger::DEBUG);
 
 			if (!empty($result->source)) {
-				DI::pConfig()->set($b['uid'], 'statusnet', 'application_name', strip_tags($result->source));
+				PConfig::set($b["uid"], "statusnet", "application_name", strip_tags($result->source));
 			}
 
 			if (!empty($result->error)) {
-				Logger::notice('Send to GNU Social failed: "' . $result->error . '"');
+				Logger::log('Send to GNU Social failed: "' . $result->error . '"');
 			} elseif ($iscomment) {
-				Logger::notice('statusnet_post: Update extid ' . $result->id . ' for post id ' . $b['id']);
-				Item::update(['extid' => $hostname . '::' . $result->id, 'body' => $result->text], ['id' => $b['id']]);
+				Logger::log('statusnet_post: Update extid ' . $result->id . " for post id " . $b['id']);
+				Item::update(['extid' => $hostname . "::" . $result->id, 'body' => $result->text], ['id' => $b['id']]);
 			}
 		}
-		if ($tempfile != '') {
+		if ($tempfile != "") {
 			unlink($tempfile);
 		}
 	}
 }
 
-function statusnet_addon_admin_post()
+function statusnet_addon_admin_post(App $a)
 {
 	$sites = [];
 
@@ -439,10 +670,10 @@ function statusnet_addon_admin_post()
 		$secret = trim($_POST['secret'][$id]);
 		$key = trim($_POST['key'][$id]);
 		//$applicationname = (!empty($_POST['applicationname']) ? Strings::escapeTags(trim($_POST['applicationname'][$id])):'');
-		if ($sitename != '' &&
-			$apiurl != '' &&
-			$secret != '' &&
-			$key != '' &&
+		if ($sitename != "" &&
+			$apiurl != "" &&
+			$secret != "" &&
+			$key != "" &&
 			empty($_POST['delete'][$id])) {
 
 			$sites[] = [
@@ -455,18 +686,18 @@ function statusnet_addon_admin_post()
 		}
 	}
 
-	$sites = DI::config()->set('statusnet', 'sites', $sites);
+	$sites = Config::set('statusnet', 'sites', $sites);
 }
 
-function statusnet_addon_admin(string &$o)
+function statusnet_addon_admin(App $a, &$o)
 {
-	$sites = DI::config()->get('statusnet', 'sites');
+	$sites = Config::get('statusnet', 'sites');
 	$sitesform = [];
 	if (is_array($sites)) {
 		foreach ($sites as $id => $s) {
 			$sitesform[] = [
 				'sitename' => ["sitename[$id]", "Site name", $s['sitename'], ""],
-				'apiurl' => ["apiurl[$id]", "Api url", $s['apiurl'], DI::l10n()->t("Base API Path \x28remember the trailing /\x29")],
+				'apiurl' => ["apiurl[$id]", "Api url", $s['apiurl'], L10n::t("Base API Path \x28remember the trailing /\x29")],
 				'secret' => ["secret[$id]", "Secret", $s['consumersecret'], ""],
 				'key' => ["key[$id]", "Key", $s['consumerkey'], ""],
 				//'applicationname' => Array("applicationname[$id]", "Application name", $s['applicationname'], ""),
@@ -477,16 +708,930 @@ function statusnet_addon_admin(string &$o)
 	/* empty form to add new site */
 	$id = count($sitesform);
 	$sitesform[] = [
-		'sitename' => ["sitename[$id]", DI::l10n()->t("Site name"), "", ""],
-		'apiurl' => ["apiurl[$id]", "Api url", "", DI::l10n()->t("Base API Path \x28remember the trailing /\x29")],
-		'secret' => ["secret[$id]", DI::l10n()->t("Consumer Secret"), "", ""],
-		'key' => ["key[$id]", DI::l10n()->t("Consumer Key"), "", ""],
-		//'applicationname' => Array("applicationname[$id]", DI::l10n()->t("Application name"), "", ""),
+		'sitename' => ["sitename[$id]", L10n::t("Site name"), "", ""],
+		'apiurl' => ["apiurl[$id]", "Api url", "", L10n::t("Base API Path \x28remember the trailing /\x29")],
+		'secret' => ["secret[$id]", L10n::t("Consumer Secret"), "", ""],
+		'key' => ["key[$id]", L10n::t("Consumer Key"), "", ""],
+		//'applicationname' => Array("applicationname[$id]", L10n::t("Application name"), "", ""),
 	];
 
-	$t = Renderer::getMarkupTemplate('admin.tpl', 'addon/statusnet/');
+	$t = Renderer::getMarkupTemplate("admin.tpl", "addon/statusnet/");
 	$o = Renderer::replaceMacros($t, [
-		'$submit' => DI::l10n()->t('Save Settings'),
+		'$submit' => L10n::t('Save Settings'),
 		'$sites' => $sitesform,
 	]);
 }
+
+function statusnet_prepare_body(App $a, &$b)
+{
+	if ($b["item"]["network"] != Protocol::STATUSNET) {
+		return;
+	}
+
+	if ($b["preview"]) {
+		$max_char = PConfig::get(local_user(), 'statusnet', 'max_char');
+		if (intval($max_char) == 0) {
+			$max_char = 140;
+		}
+
+		$item = $b["item"];
+		$item["plink"] = $a->getBaseURL() . "/display/" . $item["guid"];
+
+		$condition = ['uri' => $item["thr-parent"], 'uid' => local_user()];
+		$orig_post = Item::selectFirst(['author-link', 'uri'], $condition);
+		if (DBA::isResult($orig_post)) {
+			$nick = preg_replace("=https?://(.*)/(.*)=ism", "$2", $orig_post["author-link"]);
+
+			$nickname = "@[url=" . $orig_post["author-link"] . "]" . $nick . "[/url]";
+			$nicknameplain = "@" . $nick;
+
+			if ((strpos($item["body"], $nickname) === false) && (strpos($item["body"], $nicknameplain) === false)) {
+				$item["body"] = $nickname . " " . $item["body"];
+			}
+		}
+
+		$msgarr = ItemContent::getPlaintextPost($item, $max_char, true, 7);
+		$msg = $msgarr["text"];
+
+		if (isset($msgarr["url"]) && ($msgarr["type"] != "photo")) {
+			$msg .= " " . $msgarr["url"];
+		}
+
+		if (isset($msgarr["image"])) {
+			$msg .= " " . $msgarr["image"];
+		}
+
+		$b['html'] = nl2br(htmlspecialchars($msg));
+	}
+}
+
+function statusnet_cron(App $a, $b)
+{
+	$last = Config::get('statusnet', 'last_poll');
+
+	$poll_interval = intval(Config::get('statusnet', 'poll_interval'));
+	if (!$poll_interval) {
+		$poll_interval = STATUSNET_DEFAULT_POLL_INTERVAL;
+	}
+
+	if ($last) {
+		$next = $last + ($poll_interval * 60);
+		if ($next > time()) {
+			Logger::log('statusnet: poll intervall not reached');
+			return;
+		}
+	}
+	Logger::log('statusnet: cron_start');
+
+	$r = q("SELECT * FROM `pconfig` WHERE `cat` = 'statusnet' AND `k` = 'mirror_posts' AND `v` = '1' ORDER BY RAND() ");
+	if (DBA::isResult($r)) {
+		foreach ($r as $rr) {
+			Logger::log('statusnet: fetching for user ' . $rr['uid']);
+			statusnet_fetchtimeline($a, $rr['uid']);
+		}
+	}
+
+	$abandon_days = intval(Config::get('system', 'account_abandon_days'));
+	if ($abandon_days < 1) {
+		$abandon_days = 0;
+	}
+
+	$abandon_limit = date(DateTimeFormat::MYSQL, time() - $abandon_days * 86400);
+
+	$r = q("SELECT * FROM `pconfig` WHERE `cat` = 'statusnet' AND `k` = 'import' AND `v` ORDER BY RAND()");
+	if (DBA::isResult($r)) {
+		foreach ($r as $rr) {
+			if ($abandon_days != 0) {
+				$user = q("SELECT `login_date` FROM `user` WHERE uid=%d AND `login_date` >= '%s'", $rr['uid'], $abandon_limit);
+				if (!DBA::isResult($user)) {
+					Logger::log('abandoned account: timeline from user ' . $rr['uid'] . ' will not be imported');
+					continue;
+				}
+			}
+
+			Logger::log('statusnet: importing timeline from user ' . $rr['uid']);
+			statusnet_fetchhometimeline($a, $rr["uid"], $rr["v"]);
+		}
+	}
+
+	Logger::log('statusnet: cron_end');
+
+	Config::set('statusnet', 'last_poll', time());
+}
+
+function statusnet_fetchtimeline(App $a, $uid)
+{
+	$ckey    = PConfig::get($uid, 'statusnet', 'consumerkey');
+	$csecret = PConfig::get($uid, 'statusnet', 'consumersecret');
+	$api     = PConfig::get($uid, 'statusnet', 'baseapi');
+	$otoken  = PConfig::get($uid, 'statusnet', 'oauthtoken');
+	$osecret = PConfig::get($uid, 'statusnet', 'oauthsecret');
+	$lastid  = PConfig::get($uid, 'statusnet', 'lastid');
+
+	require_once 'mod/item.php';
+	//  get the application name for the SN app
+	//  1st try personal config, then system config and fallback to the
+	//  hostname of the node if neither one is set.
+	$application_name = PConfig::get($uid, 'statusnet', 'application_name');
+	if ($application_name == "") {
+		$application_name = Config::get('statusnet', 'application_name');
+	}
+	if ($application_name == "") {
+		$application_name = $a->getHostName();
+	}
+
+	$connection = new StatusNetOAuth($api, $ckey, $csecret, $otoken, $osecret);
+
+	$parameters = ["exclude_replies" => true, "trim_user" => true, "contributor_details" => false, "include_rts" => false];
+
+	$first_time = ($lastid == "");
+
+	if ($lastid <> "") {
+		$parameters["since_id"] = $lastid;
+	}
+
+	$items = $connection->get('statuses/user_timeline', $parameters);
+
+	if (!is_array($items)) {
+		return;
+	}
+
+	$posts = array_reverse($items);
+
+	if (count($posts)) {
+		foreach ($posts as $post) {
+			if ($post->id > $lastid)
+				$lastid = $post->id;
+
+			if ($first_time) {
+				continue;
+			}
+
+			if ($post->source == "activity") {
+				continue;
+			}
+
+			if (!empty($post->retweeted_status)) {
+				continue;
+			}
+
+			if ($post->in_reply_to_status_id != "") {
+				continue;
+			}
+
+			if (!stristr($post->source, $application_name)) {
+				$_SESSION["authenticated"] = true;
+				$_SESSION["uid"] = $uid;
+
+				unset($_REQUEST);
+				$_REQUEST["api_source"] = true;
+				$_REQUEST["profile_uid"] = $uid;
+				//$_REQUEST["source"] = "StatusNet";
+				$_REQUEST["source"] = $post->source;
+				$_REQUEST["extid"] = Protocol::STATUSNET;
+
+				if (isset($post->id)) {
+					$_REQUEST['message_id'] = Item::newURI($uid, Protocol::STATUSNET . ":" . $post->id);
+				}
+
+				//$_REQUEST["date"] = $post->created_at;
+
+				$_REQUEST["title"] = "";
+
+				$_REQUEST["body"] = add_page_info_to_body($post->text, true);
+				if (is_string($post->place->name)) {
+					$_REQUEST["location"] = $post->place->name;
+				}
+
+				if (is_string($post->place->full_name)) {
+					$_REQUEST["location"] = $post->place->full_name;
+				}
+
+				if (is_array($post->geo->coordinates)) {
+					$_REQUEST["coord"] = $post->geo->coordinates[0] . " " . $post->geo->coordinates[1];
+				}
+
+				if (is_array($post->coordinates->coordinates)) {
+					$_REQUEST["coord"] = $post->coordinates->coordinates[1] . " " . $post->coordinates->coordinates[0];
+				}
+
+				//print_r($_REQUEST);
+				if ($_REQUEST["body"] != "") {
+					Logger::log('statusnet: posting for user ' . $uid);
+
+					item_post($a);
+				}
+			}
+		}
+	}
+	PConfig::set($uid, 'statusnet', 'lastid', $lastid);
+}
+
+function statusnet_address($contact)
+{
+	$hostname = Strings::normaliseLink($contact->statusnet_profile_url);
+	$nickname = $contact->screen_name;
+
+	$hostname = preg_replace("=https?://([\w\.]*)/.*=ism", "$1", $contact->statusnet_profile_url);
+
+	$address = $contact->screen_name . "@" . $hostname;
+
+	return $address;
+}
+
+function statusnet_fetch_contact($uid, $contact, $create_user)
+{
+	if (empty($contact->statusnet_profile_url)) {
+		return -1;
+	}
+
+	$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `alias` = '%s' AND `network` = '%s'LIMIT 1", intval($uid), DBA::escape(Strings::normaliseLink($contact->statusnet_profile_url)), DBA::escape(Protocol::STATUSNET));
+
+	if (!DBA::isResult($r) && !$create_user) {
+		return 0;
+	}
+
+	if (DBA::isResult($r) && ($r[0]["readonly"] || $r[0]["blocked"])) {
+		Logger::log("statusnet_fetch_contact: Contact '" . $r[0]["nick"] . "' is blocked or readonly.", Logger::DEBUG);
+		return -1;
+	}
+
+	if (!DBA::isResult($r)) {
+		// create contact record
+		q("INSERT INTO `contact` ( `uid`, `created`, `url`, `nurl`, `addr`, `alias`, `notify`, `poll`,
+					`name`, `nick`, `photo`, `network`, `rel`, `priority`,
+					`location`, `about`, `writable`, `blocked`, `readonly`, `pending` )
+					VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d, '%s', '%s', %d, 0, 0, 0 ) ",
+			intval($uid),
+			DBA::escape(DateTimeFormat::utcNow()),
+			DBA::escape($contact->statusnet_profile_url),
+			DBA::escape(Strings::normaliseLink($contact->statusnet_profile_url)),
+			DBA::escape(statusnet_address($contact)),
+			DBA::escape(Strings::normaliseLink($contact->statusnet_profile_url)),
+			DBA::escape(''),
+			DBA::escape(''),
+			DBA::escape($contact->name),
+			DBA::escape($contact->screen_name),
+			DBA::escape($contact->profile_image_url),
+			DBA::escape(Protocol::STATUSNET),
+			intval(Contact::FRIEND),
+			intval(1),
+			DBA::escape($contact->location),
+			DBA::escape($contact->description),
+			intval(1)
+		);
+
+		$r = q("SELECT * FROM `contact` WHERE `alias` = '%s' AND `uid` = %d AND `network` = '%s' LIMIT 1",
+			DBA::escape($contact->statusnet_profile_url),
+			intval($uid),
+			DBA::escape(Protocol::STATUSNET));
+
+		if (!DBA::isResult($r)) {
+			return false;
+		}
+
+		$contact_id = $r[0]['id'];
+
+		Group::addMember(User::getDefaultGroup($uid), $contact_id);
+
+		$photos = Photo::importProfilePhoto($contact->profile_image_url, $uid, $contact_id);
+
+		q("UPDATE `contact` SET `photo` = '%s',
+					`thumb` = '%s',
+					`micro` = '%s',
+					`avatar-date` = '%s'
+				WHERE `id` = %d",
+			DBA::escape($photos[0]),
+			DBA::escape($photos[1]),
+			DBA::escape($photos[2]),
+			DBA::escape(DateTimeFormat::utcNow()),
+			intval($contact_id)
+		);
+	} else {
+		// update profile photos once every two weeks as we have no notification of when they change.
+		//$update_photo = (($r[0]['avatar-date'] < DateTimeFormat::convert('now -2 days', '', '', )) ? true : false);
+		$update_photo = ($r[0]['avatar-date'] < DateTimeFormat::utc('now -12 hours'));
+
+		// check that we have all the photos, this has been known to fail on occasion
+		if ((!$r[0]['photo']) || (!$r[0]['thumb']) || (!$r[0]['micro']) || ($update_photo)) {
+			Logger::log("statusnet_fetch_contact: Updating contact " . $contact->screen_name, Logger::DEBUG);
+
+			$photos = Photo::importProfilePhoto($contact->profile_image_url, $uid, $r[0]['id']);
+
+			q("UPDATE `contact` SET `photo` = '%s',
+						`thumb` = '%s',
+						`micro` = '%s',
+						`name-date` = '%s',
+						`uri-date` = '%s',
+						`avatar-date` = '%s',
+						`url` = '%s',
+						`nurl` = '%s',
+						`addr` = '%s',
+						`name` = '%s',
+						`nick` = '%s',
+						`location` = '%s',
+						`about` = '%s'
+					WHERE `id` = %d",
+				DBA::escape($photos[0]),
+				DBA::escape($photos[1]),
+				DBA::escape($photos[2]),
+				DBA::escape(DateTimeFormat::utcNow()),
+				DBA::escape(DateTimeFormat::utcNow()),
+				DBA::escape(DateTimeFormat::utcNow()),
+				DBA::escape($contact->statusnet_profile_url),
+				DBA::escape(Strings::normaliseLink($contact->statusnet_profile_url)),
+				DBA::escape(statusnet_address($contact)),
+				DBA::escape($contact->name),
+				DBA::escape($contact->screen_name),
+				DBA::escape($contact->location),
+				DBA::escape($contact->description),
+				intval($r[0]['id'])
+			);
+		}
+	}
+
+	return $r[0]["id"];
+}
+
+function statusnet_fetchuser(App $a, $uid, $screen_name = "", $user_id = "")
+{
+	$ckey    = PConfig::get($uid, 'statusnet', 'consumerkey');
+	$csecret = PConfig::get($uid, 'statusnet', 'consumersecret');
+	$api     = PConfig::get($uid, 'statusnet', 'baseapi');
+	$otoken  = PConfig::get($uid, 'statusnet', 'oauthtoken');
+	$osecret = PConfig::get($uid, 'statusnet', 'oauthsecret');
+
+	require_once __DIR__ . DIRECTORY_SEPARATOR . 'library' . DIRECTORY_SEPARATOR . 'codebirdsn.php';
+
+	$cb = CodebirdSN::getInstance();
+	$cb->setConsumerKey($ckey, $csecret);
+	$cb->setToken($otoken, $osecret);
+
+	$r = q("SELECT * FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1",
+		intval($uid));
+
+	if (DBA::isResult($r)) {
+		$self = $r[0];
+	} else {
+		return;
+	}
+
+	$parameters = [];
+
+	if ($screen_name != "") {
+		$parameters["screen_name"] = $screen_name;
+	}
+
+	if ($user_id != "") {
+		$parameters["user_id"] = $user_id;
+	}
+
+	// Fetching user data
+	$user = $cb->users_show($parameters);
+
+	if (!is_object($user)) {
+		return;
+	}
+
+	$contact_id = statusnet_fetch_contact($uid, $user, true);
+
+	return $contact_id;
+}
+
+function statusnet_createpost(App $a, $uid, $post, $self, $create_user, $only_existing_contact)
+{
+	Logger::log("statusnet_createpost: start", Logger::DEBUG);
+
+	$api = PConfig::get($uid, 'statusnet', 'baseapi');
+	$hostname = preg_replace("=https?://([\w\.]*)/.*=ism", "$1", $api);
+
+	$postarray = [];
+	$postarray['network'] = Protocol::STATUSNET;
+	$postarray['uid'] = $uid;
+	$postarray['wall'] = 0;
+
+	if (!empty($post->retweeted_status)) {
+		$content = $post->retweeted_status;
+		statusnet_fetch_contact($uid, $content->user, false);
+	} else {
+		$content = $post;
+	}
+
+	$postarray['uri'] = $hostname . "::" . $content->id;
+
+	if (Item::exists(['extid' => $postarray['uri'], 'uid' => $uid])) {
+		return [];
+	}
+
+	$contactid = 0;
+
+	if (!empty($content->in_reply_to_status_id)) {
+
+		$parent = $hostname . "::" . $content->in_reply_to_status_id;
+
+		$fields = ['uri', 'parent-uri', 'parent'];
+		$item = Item::selectFirst($fields, ['uri' => $parent, 'uid' => $uid]);
+
+		if (!DBA::isResult($item)) {
+			$item = Item::selectFirst($fields, ['extid' => $parent, 'uid' => $uid]);
+		}
+
+		if (DBA::isResult($item)) {
+			$postarray['thr-parent'] = $item['uri'];
+			$postarray['parent-uri'] = $item['parent-uri'];
+			$postarray['parent'] = $item['parent'];
+			$postarray['object-type'] = Activity\ObjectType::COMMENT;
+		} else {
+			$postarray['thr-parent'] = $postarray['uri'];
+			$postarray['parent-uri'] = $postarray['uri'];
+			$postarray['object-type'] = Activity\ObjectType::NOTE;
+		}
+
+		// Is it me?
+		$own_url = PConfig::get($uid, 'statusnet', 'own_url');
+
+		if ($content->user->id == $own_url) {
+			$r = q("SELECT * FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1",
+				intval($uid));
+
+			if (DBA::isResult($r)) {
+				$contactid = $r[0]["id"];
+
+				$postarray['owner-name'] = $r[0]["name"];
+				$postarray['owner-link'] = $r[0]["url"];
+				$postarray['owner-avatar'] = $r[0]["photo"];
+			} else {
+				return [];
+			}
+		}
+		// Don't create accounts of people who just comment something
+		$create_user = false;
+	} else {
+		$postarray['parent-uri'] = $postarray['uri'];
+		$postarray['object-type'] = Activity\ObjectType::NOTE;
+	}
+
+	if ($contactid == 0) {
+		$contactid = statusnet_fetch_contact($uid, $post->user, $create_user);
+		$postarray['owner-name'] = $post->user->name;
+		$postarray['owner-link'] = $post->user->statusnet_profile_url;
+		$postarray['owner-avatar'] = $post->user->profile_image_url;
+	}
+	if (($contactid == 0) && !$only_existing_contact) {
+		$contactid = $self['id'];
+	} elseif ($contactid <= 0) {
+		return [];
+	}
+
+	$postarray['contact-id'] = $contactid;
+
+	$postarray['verb'] = Activity::POST;
+
+	$postarray['author-name'] = $content->user->name;
+	$postarray['author-link'] = $content->user->statusnet_profile_url;
+	$postarray['author-avatar'] = $content->user->profile_image_url;
+
+	// To-Do: Maybe unreliable? Can the api be entered without trailing "/"?
+	$hostname = str_replace("/api/", "/notice/", PConfig::get($uid, 'statusnet', 'baseapi'));
+
+	$postarray['plink'] = $hostname . $content->id;
+	$postarray['app'] = strip_tags($content->source);
+
+	if ($content->user->protected) {
+		$postarray['private'] = 1;
+		$postarray['allow_cid'] = '<' . $self['id'] . '>';
+	}
+
+	$postarray['body'] = HTML::toBBCode($content->statusnet_html);
+
+	$converted = statusnet_convertmsg($a, $postarray['body'], false);
+	$postarray['body'] = $converted["body"];
+	$postarray['tag'] = $converted["tags"];
+
+	$postarray['created'] = DateTimeFormat::utc($content->created_at);
+	$postarray['edited'] = DateTimeFormat::utc($content->created_at);
+
+	if (!empty($content->place->name)) {
+		$postarray["location"] = $content->place->name;
+	}
+
+	if (!empty($content->place->full_name)) {
+		$postarray["location"] = $content->place->full_name;
+	}
+
+	if (!empty($content->geo->coordinates)) {
+		$postarray["coord"] = $content->geo->coordinates[0] . " " . $content->geo->coordinates[1];
+	}
+
+	if (!empty($content->coordinates->coordinates)) {
+		$postarray["coord"] = $content->coordinates->coordinates[1] . " " . $content->coordinates->coordinates[0];
+	}
+
+	Logger::log("statusnet_createpost: end", Logger::DEBUG);
+
+	return $postarray;
+}
+
+function statusnet_fetchhometimeline(App $a, $uid, $mode = 1)
+{
+	$conversations = [];
+
+	$ckey    = PConfig::get($uid, 'statusnet', 'consumerkey');
+	$csecret = PConfig::get($uid, 'statusnet', 'consumersecret');
+	$api     = PConfig::get($uid, 'statusnet', 'baseapi');
+	$otoken  = PConfig::get($uid, 'statusnet', 'oauthtoken');
+	$osecret = PConfig::get($uid, 'statusnet', 'oauthsecret');
+	$create_user = PConfig::get($uid, 'statusnet', 'create_user');
+
+	// "create_user" is deactivated, since currently you cannot add users manually by now
+	$create_user = true;
+
+	Logger::log("statusnet_fetchhometimeline: Fetching for user " . $uid, Logger::DEBUG);
+
+	$connection = new StatusNetOAuth($api, $ckey, $csecret, $otoken, $osecret);
+
+	$own_contact = statusnet_fetch_own_contact($a, $uid);
+
+	if (empty($own_contact)) {
+		return;
+	}
+
+	$r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
+		intval($own_contact),
+		intval($uid));
+
+	if (DBA::isResult($r)) {
+		$nick = $r[0]["nick"];
+	} else {
+		Logger::log("statusnet_fetchhometimeline: Own GNU Social contact not found for user " . $uid, Logger::DEBUG);
+		return;
+	}
+
+	$r = q("SELECT * FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1",
+		intval($uid));
+
+	if (DBA::isResult($r)) {
+		$self = $r[0];
+	} else {
+		Logger::log("statusnet_fetchhometimeline: Own contact not found for user " . $uid, Logger::DEBUG);
+		return;
+	}
+
+	$u = q("SELECT * FROM user WHERE uid = %d LIMIT 1",
+		intval($uid));
+	if (!DBA::isResult($u)) {
+		Logger::log("statusnet_fetchhometimeline: Own user not found for user " . $uid, Logger::DEBUG);
+		return;
+	}
+
+	$parameters = ["exclude_replies" => false, "trim_user" => false, "contributor_details" => true, "include_rts" => true];
+	//$parameters["count"] = 200;
+
+	if ($mode == 1) {
+		// Fetching timeline
+		$lastid = PConfig::get($uid, 'statusnet', 'lasthometimelineid');
+		//$lastid = 1;
+
+		$first_time = ($lastid == "");
+
+		if ($lastid != "") {
+			$parameters["since_id"] = $lastid;
+		}
+
+		$items = $connection->get('statuses/home_timeline', $parameters);
+
+		if (!is_array($items)) {
+			if (is_object($items) && isset($items->error)) {
+				$errormsg = $items->error;
+			} elseif (is_object($items)) {
+				$errormsg = print_r($items, true);
+			} elseif (is_string($items) || is_float($items) || is_int($items)) {
+				$errormsg = $items;
+			} else {
+				$errormsg = "Unknown error";
+			}
+
+			Logger::log("statusnet_fetchhometimeline: Error fetching home timeline: " . $errormsg, Logger::DEBUG);
+			return;
+		}
+
+		$posts = array_reverse($items);
+
+		Logger::log("statusnet_fetchhometimeline: Fetching timeline for user " . $uid . " " . sizeof($posts) . " items", Logger::DEBUG);
+
+		if (count($posts)) {
+			foreach ($posts as $post) {
+
+				if ($post->id > $lastid) {
+					$lastid = $post->id;
+				}
+
+				if ($first_time) {
+					continue;
+				}
+
+				if (isset($post->statusnet_conversation_id)) {
+					if (!isset($conversations[$post->statusnet_conversation_id])) {
+						statusnet_complete_conversation($a, $uid, $self, $create_user, $nick, $post->statusnet_conversation_id);
+						$conversations[$post->statusnet_conversation_id] = $post->statusnet_conversation_id;
+					}
+				} else {
+					$postarray = statusnet_createpost($a, $uid, $post, $self, $create_user, true);
+
+					if (trim($postarray['body']) == "") {
+						continue;
+					}
+
+					$item = Item::insert($postarray);
+					$postarray["id"] = $item;
+
+					Logger::log('statusnet_fetchhometimeline: User ' . $self["nick"] . ' posted home timeline item ' . $item);
+				}
+			}
+		}
+		PConfig::set($uid, 'statusnet', 'lasthometimelineid', $lastid);
+	}
+
+	// Fetching mentions
+	$lastid = PConfig::get($uid, 'statusnet', 'lastmentionid');
+	$first_time = ($lastid == "");
+
+	if ($lastid != "") {
+		$parameters["since_id"] = $lastid;
+	}
+
+	$items = $connection->get('statuses/mentions_timeline', $parameters);
+
+	if (!is_array($items)) {
+		Logger::log("statusnet_fetchhometimeline: Error fetching mentions: " . print_r($items, true), Logger::DEBUG);
+		return;
+	}
+
+	$posts = array_reverse($items);
+
+	Logger::log("statusnet_fetchhometimeline: Fetching mentions for user " . $uid . " " . sizeof($posts) . " items", Logger::DEBUG);
+
+	if (count($posts)) {
+		foreach ($posts as $post) {
+			if ($post->id > $lastid) {
+				$lastid = $post->id;
+			}
+
+			if ($first_time) {
+				continue;
+			}
+
+			$postarray = statusnet_createpost($a, $uid, $post, $self, false, false);
+
+			if (isset($post->statusnet_conversation_id)) {
+				if (!isset($conversations[$post->statusnet_conversation_id])) {
+					statusnet_complete_conversation($a, $uid, $self, $create_user, $nick, $post->statusnet_conversation_id);
+					$conversations[$post->statusnet_conversation_id] = $post->statusnet_conversation_id;
+				}
+			} else {
+				if (trim($postarray['body']) == "") {
+					continue;
+				}
+
+				$item = Item::insert($postarray);
+
+				Logger::log('statusnet_fetchhometimeline: User ' . $self["nick"] . ' posted mention timeline item ' . $item);
+			}
+		}
+	}
+
+	PConfig::set($uid, 'statusnet', 'lastmentionid', $lastid);
+}
+
+function statusnet_complete_conversation(App $a, $uid, $self, $create_user, $nick, $conversation)
+{
+	$ckey    = PConfig::get($uid, 'statusnet', 'consumerkey');
+	$csecret = PConfig::get($uid, 'statusnet', 'consumersecret');
+	$api     = PConfig::get($uid, 'statusnet', 'baseapi');
+	$otoken  = PConfig::get($uid, 'statusnet', 'oauthtoken');
+	$osecret = PConfig::get($uid, 'statusnet', 'oauthsecret');
+	$own_url = PConfig::get($uid, 'statusnet', 'own_url');
+
+	$connection = new StatusNetOAuth($api, $ckey, $csecret, $otoken, $osecret);
+
+	$parameters["count"] = 200;
+
+	$items = $connection->get('statusnet/conversation/' . $conversation, $parameters);
+	if (is_array($items)) {
+		$posts = array_reverse($items);
+
+		foreach ($posts as $post) {
+			$postarray = statusnet_createpost($a, $uid, $post, $self, false, false);
+
+			if (empty($postarray['body'])) {
+				continue;
+			}
+
+			$item = Item::insert($postarray);
+			$postarray["id"] = $item;
+
+			Logger::log('statusnet_complete_conversation: User ' . $self["nick"] . ' posted home timeline item ' . $item);
+		}
+	}
+}
+
+function statusnet_convertmsg(App $a, $body, $no_tags = false)
+{
+	$body = preg_replace("=\[url\=https?://([0-9]*).([0-9]*).([0-9]*).([0-9]*)/([0-9]*)\](.*?)\[\/url\]=ism", "$1.$2.$3.$4/$5", $body);
+
+	$URLSearchString = "^\[\]";
+	$links = preg_match_all("/[^!#@]\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", $body, $matches, PREG_SET_ORDER);
+
+	$footer = "";
+	$footerurl = "";
+	$footerlink = "";
+	$type = "";
+
+	if ($links) {
+		foreach ($matches AS $match) {
+			$search = "[url=" . $match[1] . "]" . $match[2] . "[/url]";
+
+			Logger::log("statusnet_convertmsg: expanding url " . $match[1], Logger::DEBUG);
+
+			$expanded_url = Network::finalUrl($match[1]);
+
+			Logger::log("statusnet_convertmsg: fetching data for " . $expanded_url, Logger::DEBUG);
+
+			$oembed_data = OEmbed::fetchURL($expanded_url, true);
+
+			Logger::log("statusnet_convertmsg: fetching data: done", Logger::DEBUG);
+
+			if ($type == "") {
+				$type = $oembed_data->type;
+			}
+
+			if ($oembed_data->type == "video") {
+				//$body = str_replace($search, "[video]".$expanded_url."[/video]", $body);
+				$type = $oembed_data->type;
+				$footerurl = $expanded_url;
+				$footerlink = "[url=" . $expanded_url . "]" . $expanded_url . "[/url]";
+
+				$body = str_replace($search, $footerlink, $body);
+			} elseif (($oembed_data->type == "photo") && isset($oembed_data->url)) {
+				$body = str_replace($search, "[url=" . $expanded_url . "][img]" . $oembed_data->url . "[/img][/url]", $body);
+			} elseif ($oembed_data->type != "link") {
+				$body = str_replace($search, "[url=" . $expanded_url . "]" . $expanded_url . "[/url]", $body);
+			} else {
+				$img_str = Network::fetchUrl($expanded_url, true, 4);
+
+				$tempfile = tempnam(get_temppath(), "cache");
+				file_put_contents($tempfile, $img_str);
+				$mime = mime_content_type($tempfile);
+				unlink($tempfile);
+
+				if (substr($mime, 0, 6) == "image/") {
+					$type = "photo";
+					$body = str_replace($search, "[img]" . $expanded_url . "[/img]", $body);
+				} else {
+					$type = $oembed_data->type;
+					$footerurl = $expanded_url;
+					$footerlink = "[url=" . $expanded_url . "]" . $expanded_url . "[/url]";
+
+					$body = str_replace($search, $footerlink, $body);
+				}
+			}
+		}
+
+		if ($footerurl != "") {
+			$footer = add_page_info($footerurl);
+		}
+
+		if (($footerlink != "") && (trim($footer) != "")) {
+			$removedlink = trim(str_replace($footerlink, "", $body));
+
+			if (($removedlink == "") || strstr($body, $removedlink)) {
+				$body = $removedlink;
+			}
+
+			$body .= $footer;
+		}
+	}
+
+	if ($no_tags) {
+		return ["body" => $body, "tags" => ""];
+	}
+
+	$str_tags = '';
+
+	$cnt = preg_match_all("/([!#@])\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", $body, $matches, PREG_SET_ORDER);
+	if ($cnt) {
+		foreach ($matches as $mtch) {
+			if (strlen($str_tags)) {
+				$str_tags .= ',';
+			}
+
+			if ($mtch[1] == "#") {
+				// Replacing the hash tags that are directed to the GNU Social server with internal links
+				$snhash = "#[url=" . $mtch[2] . "]" . $mtch[3] . "[/url]";
+				$frdchash = '#[url=' . $a->getBaseURL() . '/search?tag=' . $mtch[3] . ']' . $mtch[3] . '[/url]';
+				$body = str_replace($snhash, $frdchash, $body);
+
+				$str_tags .= $frdchash;
+			} else {
+				$str_tags .= "@[url=" . $mtch[2] . "]" . $mtch[3] . "[/url]";
+			}
+			// To-Do:
+			// There is a problem with links with to GNU Social groups, so these links are stored with "@" like friendica groups
+			//$str_tags .= $mtch[1]."[url=".$mtch[2]."]".$mtch[3]."[/url]";
+		}
+	}
+
+	return ["body" => $body, "tags" => $str_tags];
+}
+
+function statusnet_fetch_own_contact(App $a, $uid)
+{
+	$ckey    = PConfig::get($uid, 'statusnet', 'consumerkey');
+	$csecret = PConfig::get($uid, 'statusnet', 'consumersecret');
+	$api     = PConfig::get($uid, 'statusnet', 'baseapi');
+	$otoken  = PConfig::get($uid, 'statusnet', 'oauthtoken');
+	$osecret = PConfig::get($uid, 'statusnet', 'oauthsecret');
+	$own_url = PConfig::get($uid, 'statusnet', 'own_url');
+
+	$contact_id = 0;
+
+	if ($own_url == "") {
+		$connection = new StatusNetOAuth($api, $ckey, $csecret, $otoken, $osecret);
+
+		// Fetching user data
+		$user = $connection->get('account/verify_credentials');
+
+		if (empty($user)) {
+			return false;
+		}
+
+		PConfig::set($uid, 'statusnet', 'own_url', Strings::normaliseLink($user->statusnet_profile_url));
+
+		$contact_id = statusnet_fetch_contact($uid, $user, true);
+	} else {
+		$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `alias` = '%s' LIMIT 1",
+			intval($uid), DBA::escape($own_url));
+		if (DBA::isResult($r)) {
+			$contact_id = $r[0]["id"];
+		} else {
+			PConfig::delete($uid, 'statusnet', 'own_url');
+		}
+	}
+	return $contact_id;
+}
+
+function statusnet_is_retweet(App $a, $uid, $body)
+{
+	$body = trim($body);
+
+	// Skip if it isn't a pure repeated messages
+	// Does it start with a share?
+	if (strpos($body, "[share") > 0) {
+		return false;
+	}
+
+	// Does it end with a share?
+	if (strlen($body) > (strrpos($body, "[/share]") + 8)) {
+		return false;
+	}
+
+	$attributes = preg_replace("/\[share(.*?)\]\s?(.*?)\s?\[\/share\]\s?/ism", "$1", $body);
+	// Skip if there is no shared message in there
+	if ($body == $attributes) {
+		return false;
+	}
+
+	$link = "";
+	preg_match("/link='(.*?)'/ism", $attributes, $matches);
+	if (!empty($matches[1])) {
+		$link = $matches[1];
+	}
+
+	preg_match('/link="(.*?)"/ism', $attributes, $matches);
+	if (!empty($matches[1])) {
+		$link = $matches[1];
+	}
+
+	$ckey    = PConfig::get($uid, 'statusnet', 'consumerkey');
+	$csecret = PConfig::get($uid, 'statusnet', 'consumersecret');
+	$api     = PConfig::get($uid, 'statusnet', 'baseapi');
+	$otoken  = PConfig::get($uid, 'statusnet', 'oauthtoken');
+	$osecret = PConfig::get($uid, 'statusnet', 'oauthsecret');
+	$hostname = preg_replace("=https?://([\w\.]*)/.*=ism", "$1", $api);
+
+	$id = preg_replace("=https?://" . $hostname . "/notice/(.*)=ism", "$1", $link);
+
+	if ($id == $link) {
+		return false;
+	}
+
+	Logger::log('statusnet_is_retweet: Retweeting id ' . $id . ' for user ' . $uid, Logger::DEBUG);
+
+	$connection = new StatusNetOAuth($api, $ckey, $csecret, $otoken, $osecret);
+
+	$result = $connection->post('statuses/retweet/' . $id);
+
+	Logger::log('statusnet_is_retweet: result ' . print_r($result, true), Logger::DEBUG);
+
+	return isset($result->id);
+}
diff --git a/statusnet/templates/connector_settings.tpl b/statusnet/templates/connector_settings.tpl
deleted file mode 100644
index 7856aef7..00000000
--- a/statusnet/templates/connector_settings.tpl
+++ /dev/null
@@ -1,47 +0,0 @@
-{{if $ckey && $csecret}}
-	{{if $otoken && $osecret}}
-		{{if $account}}
-			<div id="statusnet-info">
-				<img id="statusnet-avatar" src="{{$account->profile_image_url}}" />
-				<p id="statusnet-info-block">
-					{{$l10n.connected_account nofilter}}<br />
-					<em>{{$account->description}}</em>
-				</p>
-			</div>
-		{{/if}}
-        {{include file="field_checkbox.tpl" field=$enable}}
-		<p>{{$l10n.connected_public nofilter}}</p>
-		{{if $l10n.privacy_warning}}
-			<p>{{$l10n.privacy_warning nofilter}}</p>
-        {{/if}}
-
-		{{include file="field_checkbox.tpl" field=$default}}
-	{{else}}
-		<p>{{$l10n.oauth_info}}</p>
-		<a href="{{$authorize_url}}" target="_statusnet"><img src="addon/statusnet/signinwithstatusnet.png" alt="{{$l10n.oauth_alt}}"></a>
-		<div id="statusnet-pin-wrapper">
-			<input id="statusnet-token" type="hidden" name="statusnet-token" value="{{$request_token.oauth_token}}" />
-			<input id="statusnet-token2" type="hidden" name="statusnet-token2" value="{{$request_token.oauth_token_secret}}" />
-			{{include file="field_input.tpl" field=$pin}}
-		</div>
-
-        <p>{{$l10n.oauth_api}}</p>
-	{{/if}}
-{{else}}
-	{{if $sites}}
-		<h4>{{$l10n.global_title}}</h4>
-		<p>{{$l10n.global_info}}</p>
-		<div id="statusnet-preconf-wrapper">
-		{{foreach $sites as $site}}
-			{{include file="field_radio.tpl" field=$site}}
-		{{/foreach}}
-		</div>
-	{{/if}}
-	<h4>{{$l10n.credentials_title}}</h4>
-	<p>{{$l10n.credentials_info nofilter}}</p>
-	<div id="statusnet-consumer-wrapper">
-        {{include file="field_input.tpl" field=$consumerkey}}
-        {{include file="field_input.tpl" field=$consumersecret}}
-        {{include file="field_input.tpl" field=$baseapi}}
-	</div>
-{{/if}}
\ No newline at end of file
diff --git a/superblock/lang/C/messages.po b/superblock/lang/C/messages.po
new file mode 100644
index 00000000..a96d43ec
--- /dev/null
+++ b/superblock/lang/C/messages.po
@@ -0,0 +1,42 @@
+# ADDON superblock
+# Copyright (C) 
+# This file is distributed under the same license as the Friendica superblock addon package.
+# 
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-08-17 10:25+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: superblock.php:47 superblock.php:51
+msgid "Superblock"
+msgstr ""
+
+#: superblock.php:54
+msgid "Comma separated profile URLS to block"
+msgstr ""
+
+#: superblock.php:58
+msgid "Save Settings"
+msgstr ""
+
+#: superblock.php:71
+msgid "SUPERBLOCK Settings saved."
+msgstr ""
+
+#: superblock.php:144
+msgid "Block Completely"
+msgstr ""
+
+#: superblock.php:165
+msgid "superblock settings updated"
+msgstr ""
diff --git a/superblock/lang/ca/strings.php b/superblock/lang/ca/strings.php
new file mode 100644
index 00000000..5587acd2
--- /dev/null
+++ b/superblock/lang/ca/strings.php
@@ -0,0 +1,10 @@
+<?php
+
+$a->strings["\"Blockem\" Settings"] = "Configuració de \"Bloqueig\"";
+$a->strings["Comma separated profile URLS to block"] = "URLS dels perfils a bloquejar, separats per comes";
+$a->strings["Submit"] = "Enviar";
+$a->strings["BLOCKEM Settings saved."] = "Guardada la configuració de BLOQUEIG.";
+$a->strings["Blocked %s - Click to open/close"] = "Bloquejar %s - Clica per obrir/tancar";
+$a->strings["Unblock Author"] = "Desbloquejar Autor";
+$a->strings["Block Author"] = "Bloquejar Autor";
+$a->strings["blockem settings updated"] = "Actualitzar la Configuració de bloqueig";
diff --git a/superblock/lang/cs/messages.po b/superblock/lang/cs/messages.po
new file mode 100644
index 00000000..da74f389
--- /dev/null
+++ b/superblock/lang/cs/messages.po
@@ -0,0 +1,46 @@
+# ADDON superblock
+# Copyright (C)
+# This file is distributed under the same license as the Friendica superblock addon package.
+# 
+# 
+# Translators:
+# Aditoo, 2018
+# Aditoo, 2018
+# michal_s <msupler@gmail.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-08-17 10:25+0200\n"
+"PO-Revision-Date: 2018-08-18 12:27+0000\n"
+"Last-Translator: Aditoo\n"
+"Language-Team: Czech (http://www.transifex.com/Friendica/friendica/language/cs/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
+
+#: superblock.php:47 superblock.php:51
+msgid "Superblock"
+msgstr "Superblock"
+
+#: superblock.php:54
+msgid "Comma separated profile URLS to block"
+msgstr "Čárkou oddělené URL adresy profilů určených k ignorování"
+
+#: superblock.php:58
+msgid "Save Settings"
+msgstr "Uložit nastavení"
+
+#: superblock.php:71
+msgid "SUPERBLOCK Settings saved."
+msgstr "Nastavení SUPERBLOCK uložena"
+
+#: superblock.php:144
+msgid "Block Completely"
+msgstr "Zablokovat úplně"
+
+#: superblock.php:165
+msgid "superblock settings updated"
+msgstr "nastavení superblock aktualizována"
diff --git a/superblock/lang/cs/strings.php b/superblock/lang/cs/strings.php
new file mode 100644
index 00000000..32acaf8b
--- /dev/null
+++ b/superblock/lang/cs/strings.php
@@ -0,0 +1,14 @@
+<?php
+
+if(! function_exists("string_plural_select_cs")) {
+function string_plural_select_cs($n){
+	$n = intval($n);
+	return ($n == 1 && $n % 1 == 0) ? 0 : ($n >= 2 && $n <= 4 && $n % 1 == 0) ? 1: ($n % 1 != 0 ) ? 2 : 3;;
+}}
+;
+$a->strings["Superblock"] = "Superblock";
+$a->strings["Comma separated profile URLS to block"] = "Čárkou oddělené URL adresy profilů určených k ignorování";
+$a->strings["Save Settings"] = "Uložit nastavení";
+$a->strings["SUPERBLOCK Settings saved."] = "Nastavení SUPERBLOCK uložena";
+$a->strings["Block Completely"] = "Zablokovat úplně";
+$a->strings["superblock settings updated"] = "nastavení superblock aktualizována";
diff --git a/superblock/lang/de/messages.po b/superblock/lang/de/messages.po
new file mode 100644
index 00000000..3cb6ff2c
--- /dev/null
+++ b/superblock/lang/de/messages.po
@@ -0,0 +1,46 @@
+# ADDON superblock
+# Copyright (C)
+# This file is distributed under the same license as the Friendica superblock addon package.
+# 
+# 
+# Translators:
+# Andreas H., 2018
+# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2014-2015
+# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2017-2018
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-08-17 10:25+0200\n"
+"PO-Revision-Date: 2018-08-20 14:24+0000\n"
+"Last-Translator: Tobias Diekershoff <tobias.diekershoff@gmx.net>\n"
+"Language-Team: German (http://www.transifex.com/Friendica/friendica/language/de/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: superblock.php:47 superblock.php:51
+msgid "Superblock"
+msgstr "Superblock"
+
+#: superblock.php:54
+msgid "Comma separated profile URLS to block"
+msgstr "Profil-URLs, die geblockt werden sollen (durch Kommas getrennt)"
+
+#: superblock.php:58
+msgid "Save Settings"
+msgstr "Einstellungen speichern"
+
+#: superblock.php:71
+msgid "SUPERBLOCK Settings saved."
+msgstr "Superblock Einstellungen gespeichert"
+
+#: superblock.php:144
+msgid "Block Completely"
+msgstr "Vollständig blockieren"
+
+#: superblock.php:165
+msgid "superblock settings updated"
+msgstr "Superblock Einstellungen aktualisiert"
diff --git a/superblock/lang/de/strings.php b/superblock/lang/de/strings.php
new file mode 100644
index 00000000..5fb3cb2c
--- /dev/null
+++ b/superblock/lang/de/strings.php
@@ -0,0 +1,14 @@
+<?php
+
+if(! function_exists("string_plural_select_de")) {
+function string_plural_select_de($n){
+	$n = intval($n);
+	return ($n != 1);;
+}}
+;
+$a->strings["Superblock"] = "Superblock";
+$a->strings["Comma separated profile URLS to block"] = "Profil-URLs, die geblockt werden sollen (durch Kommas getrennt)";
+$a->strings["Save Settings"] = "Einstellungen speichern";
+$a->strings["SUPERBLOCK Settings saved."] = "Superblock Einstellungen gespeichert";
+$a->strings["Block Completely"] = "Vollständig blockieren";
+$a->strings["superblock settings updated"] = "Superblock Einstellungen aktualisiert";
diff --git a/superblock/lang/en-gb/messages.po b/superblock/lang/en-gb/messages.po
new file mode 100644
index 00000000..473eea86
--- /dev/null
+++ b/superblock/lang/en-gb/messages.po
@@ -0,0 +1,45 @@
+# ADDON superblock
+# Copyright (C)
+# This file is distributed under the same license as the Friendica superblock addon package.
+# 
+# 
+# Translators:
+# Andy H3 <andy@hubup.pro>, 2019
+# Kris, 2018
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-08-17 10:25+0200\n"
+"PO-Revision-Date: 2019-06-05 14:43+0000\n"
+"Last-Translator: Andy H3 <andy@hubup.pro>\n"
+"Language-Team: English (United Kingdom) (http://www.transifex.com/Friendica/friendica/language/en_GB/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en_GB\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: superblock.php:47 superblock.php:51
+msgid "Superblock"
+msgstr "Superblock"
+
+#: superblock.php:54
+msgid "Comma separated profile URLS to block"
+msgstr "Profile URLs to block (separated by commas)"
+
+#: superblock.php:58
+msgid "Save Settings"
+msgstr "Save settings"
+
+#: superblock.php:71
+msgid "SUPERBLOCK Settings saved."
+msgstr "Superblock settings saved."
+
+#: superblock.php:144
+msgid "Block Completely"
+msgstr "Block completely"
+
+#: superblock.php:165
+msgid "superblock settings updated"
+msgstr "Superblock settings updated"
diff --git a/superblock/lang/en-gb/strings.php b/superblock/lang/en-gb/strings.php
new file mode 100644
index 00000000..e269b37d
--- /dev/null
+++ b/superblock/lang/en-gb/strings.php
@@ -0,0 +1,14 @@
+<?php
+
+if(! function_exists("string_plural_select_en_gb")) {
+function string_plural_select_en_gb($n){
+	$n = intval($n);
+	return ($n != 1);;
+}}
+;
+$a->strings["Superblock"] = "Superblock";
+$a->strings["Comma separated profile URLS to block"] = "Profile URLs to block (separated by commas)";
+$a->strings["Save Settings"] = "Save settings";
+$a->strings["SUPERBLOCK Settings saved."] = "Superblock settings saved.";
+$a->strings["Block Completely"] = "Block completely";
+$a->strings["superblock settings updated"] = "Superblock settings updated";
diff --git a/superblock/lang/en-us/messages.po b/superblock/lang/en-us/messages.po
new file mode 100644
index 00000000..c184cba8
--- /dev/null
+++ b/superblock/lang/en-us/messages.po
@@ -0,0 +1,44 @@
+# ADDON superblock
+# Copyright (C)
+# This file is distributed under the same license as the Friendica superblock addon package.
+# 
+# 
+# Translators:
+# R C <miqrogroove@gmail.com>, 2018
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-04-21 08:45+0200\n"
+"PO-Revision-Date: 2018-06-13 02:39+0000\n"
+"Last-Translator: R C <miqrogroove@gmail.com>\n"
+"Language-Team: English (United States) (http://www.transifex.com/Friendica/friendica/language/en_US/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en_US\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: superblock.php:53 superblock.php:57
+msgid "\"Superblock\""
+msgstr ""
+
+#: superblock.php:60
+msgid "Comma separated profile URLS to block"
+msgstr "Comma-separated profile URLs to block"
+
+#: superblock.php:64
+msgid "Save Settings"
+msgstr ""
+
+#: superblock.php:76
+msgid "SUPERBLOCK Settings saved."
+msgstr ""
+
+#: superblock.php:148
+msgid "Block Completely"
+msgstr ""
+
+#: superblock.php:168
+msgid "superblock settings updated"
+msgstr ""
diff --git a/superblock/lang/en-us/strings.php b/superblock/lang/en-us/strings.php
new file mode 100644
index 00000000..31906bb6
--- /dev/null
+++ b/superblock/lang/en-us/strings.php
@@ -0,0 +1,14 @@
+<?php
+
+if(! function_exists("string_plural_select_en_us")) {
+function string_plural_select_en_us($n){
+	$n = intval($n);
+	return ($n != 1);;
+}}
+;
+$a->strings["\"Superblock\""] = "";
+$a->strings["Comma separated profile URLS to block"] = "Comma-separated profile URLs to block";
+$a->strings["Save Settings"] = "";
+$a->strings["SUPERBLOCK Settings saved."] = "";
+$a->strings["Block Completely"] = "";
+$a->strings["superblock settings updated"] = "";
diff --git a/superblock/lang/eo/strings.php b/superblock/lang/eo/strings.php
new file mode 100644
index 00000000..b6116507
--- /dev/null
+++ b/superblock/lang/eo/strings.php
@@ -0,0 +1,10 @@
+<?php
+
+$a->strings["\"Blockem\" Settings"] = "\"Blockem\" Agordoj";
+$a->strings["Comma separated profile URLS to block"] = "Blokotaj URL adresoj, disigita per komo";
+$a->strings["Submit"] = "Sendi";
+$a->strings["BLOCKEM Settings saved."] = "Konservis Agordojn de BLOCKEM.";
+$a->strings["Blocked %s - Click to open/close"] = "%s blokita - Klaku por malfermi/fermi";
+$a->strings["Unblock Author"] = "Malbloki Aŭtoron";
+$a->strings["Block Author"] = "Bloki Aŭtoron";
+$a->strings["blockem settings updated"] = "Ĝisdatigis la blockem agordojn";
diff --git a/superblock/lang/es/messages.po b/superblock/lang/es/messages.po
new file mode 100644
index 00000000..3bbdeb90
--- /dev/null
+++ b/superblock/lang/es/messages.po
@@ -0,0 +1,45 @@
+# ADDON superblock
+# Copyright (C)
+# This file is distributed under the same license as the Friendica superblock addon package.
+# 
+# 
+# Translators:
+# Albert, 2016-2017
+# juanman <juanma@gnutn.org.ar>, 2017
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-04-21 08:45+0200\n"
+"PO-Revision-Date: 2017-10-26 18:00+0000\n"
+"Last-Translator: Albert\n"
+"Language-Team: Spanish (http://www.transifex.com/Friendica/friendica/language/es/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: superblock.php:53 superblock.php:57
+msgid "\"Superblock\""
+msgstr "«Superbloque»"
+
+#: superblock.php:60
+msgid "Comma separated profile URLS to block"
+msgstr "Perfil de URLS a bloque separado por comas"
+
+#: superblock.php:64
+msgid "Save Settings"
+msgstr "Guardar configuración"
+
+#: superblock.php:76
+msgid "SUPERBLOCK Settings saved."
+msgstr "Ajustes de SUPERBLOQUE guardados."
+
+#: superblock.php:148
+msgid "Block Completely"
+msgstr "Bloquear completamente"
+
+#: superblock.php:168
+msgid "superblock settings updated"
+msgstr "ajustes de superbloque actualizados"
diff --git a/superblock/lang/es/strings.php b/superblock/lang/es/strings.php
new file mode 100644
index 00000000..1b40975f
--- /dev/null
+++ b/superblock/lang/es/strings.php
@@ -0,0 +1,13 @@
+<?php
+
+if(! function_exists("string_plural_select_es")) {
+function string_plural_select_es($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["\"Superblock\""] = "«Superbloque»";
+$a->strings["Comma separated profile URLS to block"] = "Perfil de URLS a bloque separado por comas";
+$a->strings["Save Settings"] = "Guardar configuración";
+$a->strings["SUPERBLOCK Settings saved."] = "Ajustes de SUPERBLOQUE guardados.";
+$a->strings["Block Completely"] = "Bloquear completamente";
+$a->strings["superblock settings updated"] = "ajustes de superbloque actualizados";
diff --git a/superblock/lang/fi-fi/messages.po b/superblock/lang/fi-fi/messages.po
new file mode 100644
index 00000000..6b673e09
--- /dev/null
+++ b/superblock/lang/fi-fi/messages.po
@@ -0,0 +1,45 @@
+# ADDON superblock
+# Copyright (C)
+# This file is distributed under the same license as the Friendica superblock addon package.
+# 
+# 
+# Translators:
+# Kris, 2018
+# Kris, 2018
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-04-21 08:45+0200\n"
+"PO-Revision-Date: 2018-04-16 16:00+0000\n"
+"Last-Translator: Kris\n"
+"Language-Team: Finnish (Finland) (http://www.transifex.com/Friendica/friendica/language/fi_FI/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fi_FI\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: superblock.php:53 superblock.php:57
+msgid "\"Superblock\""
+msgstr "\"Superblock\""
+
+#: superblock.php:60
+msgid "Comma separated profile URLS to block"
+msgstr "Estettävien profiilien URL-osoitteet pilkulla erotettuina"
+
+#: superblock.php:64
+msgid "Save Settings"
+msgstr "Tallenna asetukset"
+
+#: superblock.php:76
+msgid "SUPERBLOCK Settings saved."
+msgstr "Superblock -asetukset tallennettu."
+
+#: superblock.php:148
+msgid "Block Completely"
+msgstr "Estä kokonaan"
+
+#: superblock.php:168
+msgid "superblock settings updated"
+msgstr "superblock -asetukset päivitetty"
diff --git a/superblock/lang/fi-fi/strings.php b/superblock/lang/fi-fi/strings.php
new file mode 100644
index 00000000..f96ee65b
--- /dev/null
+++ b/superblock/lang/fi-fi/strings.php
@@ -0,0 +1,13 @@
+<?php
+
+if(! function_exists("string_plural_select_fi_fi")) {
+function string_plural_select_fi_fi($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["\"Superblock\""] = "\"Superblock\"";
+$a->strings["Comma separated profile URLS to block"] = "Estettävien profiilien URL-osoitteet pilkulla erotettuina";
+$a->strings["Save Settings"] = "Tallenna asetukset";
+$a->strings["SUPERBLOCK Settings saved."] = "Superblock -asetukset tallennettu.";
+$a->strings["Block Completely"] = "Estä kokonaan";
+$a->strings["superblock settings updated"] = "superblock -asetukset päivitetty";
diff --git a/superblock/lang/fr/strings.php b/superblock/lang/fr/strings.php
new file mode 100644
index 00000000..b9f31180
--- /dev/null
+++ b/superblock/lang/fr/strings.php
@@ -0,0 +1,10 @@
+<?php
+
+$a->strings["\"Blockem\" Settings"] = "Réglages de Blockem";
+$a->strings["Comma separated profile URLS to block"] = "Liste d'URLS de profils à bloquer, séparés par des virgules";
+$a->strings["Submit"] = "Envoyer";
+$a->strings["BLOCKEM Settings saved."] = "Réglages Blockem sauvés.";
+$a->strings["Blocked %s - Click to open/close"] = "Bloqué %s - Cliquez pour ouvrir/fermer";
+$a->strings["Unblock Author"] = "Débloquer l'auteur";
+$a->strings["Block Author"] = "Bloquer l'auteur";
+$a->strings["blockem settings updated"] = "Réglages blockem sauvés";
diff --git a/superblock/lang/is/strings.php b/superblock/lang/is/strings.php
new file mode 100644
index 00000000..3075c457
--- /dev/null
+++ b/superblock/lang/is/strings.php
@@ -0,0 +1,10 @@
+<?php
+
+$a->strings["\"Blockem\" Settings"] = "\"Blockem\" stillingar";
+$a->strings["Comma separated profile URLS to block"] = "Banna lista af forsíðum (komma á milli)";
+$a->strings["Submit"] = "Senda inn";
+$a->strings["BLOCKEM Settings saved."] = "BLOCKEM stillingar vistaðar.";
+$a->strings["Blocked %s - Click to open/close"] = "%s sett í straff - Smella til að taka úr/setja á";
+$a->strings["Unblock Author"] = "Leyfa notanda";
+$a->strings["Block Author"] = "Banna notanda";
+$a->strings["blockem settings updated"] = "";
diff --git a/superblock/lang/it/messages.po b/superblock/lang/it/messages.po
new file mode 100644
index 00000000..7ae6de27
--- /dev/null
+++ b/superblock/lang/it/messages.po
@@ -0,0 +1,44 @@
+# ADDON superblock
+# Copyright (C)
+# This file is distributed under the same license as the Friendica superblock addon package.
+# 
+# 
+# Translators:
+# fabrixxm <fabrix.xm@gmail.com>, 2014-2015,2017,2019
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-08-17 10:25+0200\n"
+"PO-Revision-Date: 2019-03-11 14:21+0000\n"
+"Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n"
+"Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: it\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: superblock.php:47 superblock.php:51
+msgid "Superblock"
+msgstr "Superblock"
+
+#: superblock.php:54
+msgid "Comma separated profile URLS to block"
+msgstr "Lista, separata da virgola, di indirizzi di profili da bloccare"
+
+#: superblock.php:58
+msgid "Save Settings"
+msgstr "Salva Impostazioni"
+
+#: superblock.php:71
+msgid "SUPERBLOCK Settings saved."
+msgstr "Impostazioni \"Superblocco\" salvate."
+
+#: superblock.php:144
+msgid "Block Completely"
+msgstr "Blocca Completamente"
+
+#: superblock.php:165
+msgid "superblock settings updated"
+msgstr "impostazioni \"superblocco\" aggiornate."
diff --git a/superblock/lang/it/strings.php b/superblock/lang/it/strings.php
new file mode 100644
index 00000000..97274895
--- /dev/null
+++ b/superblock/lang/it/strings.php
@@ -0,0 +1,14 @@
+<?php
+
+if(! function_exists("string_plural_select_it")) {
+function string_plural_select_it($n){
+	$n = intval($n);
+	return ($n != 1);;
+}}
+;
+$a->strings["Superblock"] = "Superblock";
+$a->strings["Comma separated profile URLS to block"] = "Lista, separata da virgola, di indirizzi di profili da bloccare";
+$a->strings["Save Settings"] = "Salva Impostazioni";
+$a->strings["SUPERBLOCK Settings saved."] = "Impostazioni \"Superblocco\" salvate.";
+$a->strings["Block Completely"] = "Blocca Completamente";
+$a->strings["superblock settings updated"] = "impostazioni \"superblocco\" aggiornate.";
diff --git a/superblock/lang/nb-no/strings.php b/superblock/lang/nb-no/strings.php
new file mode 100644
index 00000000..0dd6660d
--- /dev/null
+++ b/superblock/lang/nb-no/strings.php
@@ -0,0 +1,10 @@
+<?php
+
+$a->strings["\"Blockem\" Settings"] = "";
+$a->strings["Comma separated profile URLS to block"] = "";
+$a->strings["Submit"] = "Lagre";
+$a->strings["BLOCKEM Settings saved."] = "";
+$a->strings["Blocked %s - Click to open/close"] = "";
+$a->strings["Unblock Author"] = "";
+$a->strings["Block Author"] = "";
+$a->strings["blockem settings updated"] = "";
diff --git a/superblock/lang/nl/messages.po b/superblock/lang/nl/messages.po
new file mode 100644
index 00000000..4f19d88d
--- /dev/null
+++ b/superblock/lang/nl/messages.po
@@ -0,0 +1,44 @@
+# ADDON superblock
+# Copyright (C)
+# This file is distributed under the same license as the Friendica superblock addon package.
+# 
+# 
+# Translators:
+# Jeroen De Meerleer <me@jeroened.be>, 2018
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-08-17 10:25+0200\n"
+"PO-Revision-Date: 2018-08-24 13:51+0000\n"
+"Last-Translator: Jeroen De Meerleer <me@jeroened.be>\n"
+"Language-Team: Dutch (http://www.transifex.com/Friendica/friendica/language/nl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: superblock.php:47 superblock.php:51
+msgid "Superblock"
+msgstr "Superblock"
+
+#: superblock.php:54
+msgid "Comma separated profile URLS to block"
+msgstr ""
+
+#: superblock.php:58
+msgid "Save Settings"
+msgstr "Instellingen opslaan"
+
+#: superblock.php:71
+msgid "SUPERBLOCK Settings saved."
+msgstr "SUPERBLOCK instellingen opgeslagen"
+
+#: superblock.php:144
+msgid "Block Completely"
+msgstr ""
+
+#: superblock.php:165
+msgid "superblock settings updated"
+msgstr "Superblock instellingen opgeslagen"
diff --git a/superblock/lang/nl/strings.php b/superblock/lang/nl/strings.php
new file mode 100644
index 00000000..d66e7b9e
--- /dev/null
+++ b/superblock/lang/nl/strings.php
@@ -0,0 +1,14 @@
+<?php
+
+if(! function_exists("string_plural_select_nl")) {
+function string_plural_select_nl($n){
+	$n = intval($n);
+	return ($n != 1);;
+}}
+;
+$a->strings["Superblock"] = "Superblock";
+$a->strings["Comma separated profile URLS to block"] = "";
+$a->strings["Save Settings"] = "Instellingen opslaan";
+$a->strings["SUPERBLOCK Settings saved."] = "SUPERBLOCK instellingen opgeslagen";
+$a->strings["Block Completely"] = "";
+$a->strings["superblock settings updated"] = "Superblock instellingen opgeslagen";
diff --git a/superblock/lang/pl/messages.po b/superblock/lang/pl/messages.po
new file mode 100644
index 00000000..b6a9e17e
--- /dev/null
+++ b/superblock/lang/pl/messages.po
@@ -0,0 +1,44 @@
+# ADDON superblock
+# Copyright (C)
+# This file is distributed under the same license as the Friendica superblock addon package.
+# 
+# 
+# Translators:
+# Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>, 2018
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-08-17 10:25+0200\n"
+"PO-Revision-Date: 2018-08-20 13:45+0000\n"
+"Last-Translator: Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>\n"
+"Language-Team: Polish (http://www.transifex.com/Friendica/friendica/language/pl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pl\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
+
+#: superblock.php:47 superblock.php:51
+msgid "Superblock"
+msgstr "Superblock"
+
+#: superblock.php:54
+msgid "Comma separated profile URLS to block"
+msgstr "Oddzielone przecinkami adresy URL profilu do zablokowania"
+
+#: superblock.php:58
+msgid "Save Settings"
+msgstr "Zapisz ustawienia"
+
+#: superblock.php:71
+msgid "SUPERBLOCK Settings saved."
+msgstr "SUPERBLOCK Zapisano ustawienia."
+
+#: superblock.php:144
+msgid "Block Completely"
+msgstr "Całkowicie zablokuj"
+
+#: superblock.php:165
+msgid "superblock settings updated"
+msgstr "zaktualizowano ustawienia superblock"
diff --git a/superblock/lang/pl/strings.php b/superblock/lang/pl/strings.php
new file mode 100644
index 00000000..e06891e0
--- /dev/null
+++ b/superblock/lang/pl/strings.php
@@ -0,0 +1,14 @@
+<?php
+
+if(! function_exists("string_plural_select_pl")) {
+function string_plural_select_pl($n){
+	$n = intval($n);
+	return ($n==1 ? 0 : ($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14) ? 1 : $n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14) ? 2 : 3);;
+}}
+;
+$a->strings["Superblock"] = "Superblock";
+$a->strings["Comma separated profile URLS to block"] = "Oddzielone przecinkami adresy URL profilu do zablokowania";
+$a->strings["Save Settings"] = "Zapisz ustawienia";
+$a->strings["SUPERBLOCK Settings saved."] = "SUPERBLOCK Zapisano ustawienia.";
+$a->strings["Block Completely"] = "Całkowicie zablokuj";
+$a->strings["superblock settings updated"] = "zaktualizowano ustawienia superblock";
diff --git a/superblock/lang/pt-br/messages.po b/superblock/lang/pt-br/messages.po
new file mode 100644
index 00000000..578f62b3
--- /dev/null
+++ b/superblock/lang/pt-br/messages.po
@@ -0,0 +1,53 @@
+# ADDON blockem
+# Copyright (C)
+# This file is distributed under the same license as the Friendica blockem addon package.
+# 
+# 
+# Translators:
+# Beatriz Vital <vitalb@riseup.net>, 2016
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2016-08-16 12:51+0000\n"
+"Last-Translator: Beatriz Vital <vitalb@riseup.net>\n"
+"Language-Team: Portuguese (Brazil) (http://www.transifex.com/Friendica/friendica/language/pt_BR/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pt_BR\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: blockem.php:51
+msgid "\"Blockem\" Settings"
+msgstr "Configurações do \"Blockem\""
+
+#: blockem.php:53
+msgid "Comma separated profile URLS to block"
+msgstr "URLs de perfis a serem bloqueados, separados por vírgulas"
+
+#: blockem.php:57
+msgid "Submit"
+msgstr "Enviar"
+
+#: blockem.php:70
+msgid "BLOCKEM Settings saved."
+msgstr "As configurações do Blockem foram salvas."
+
+#: blockem.php:105
+#, php-format
+msgid "Blocked %s - Click to open/close"
+msgstr "Bloqueou %s - Clique para abrir/fechar"
+
+#: blockem.php:160
+msgid "Unblock Author"
+msgstr "Desbloquear autor"
+
+#: blockem.php:162
+msgid "Block Author"
+msgstr "Bloquear autor"
+
+#: blockem.php:194
+msgid "blockem settings updated"
+msgstr "As configurações do Blockem foram atualizadas."
diff --git a/superblock/lang/pt-br/strings.php b/superblock/lang/pt-br/strings.php
new file mode 100644
index 00000000..34c9f2e0
--- /dev/null
+++ b/superblock/lang/pt-br/strings.php
@@ -0,0 +1,15 @@
+<?php
+
+if(! function_exists("string_plural_select_pt_br")) {
+function string_plural_select_pt_br($n){
+	return ($n > 1);;
+}}
+;
+$a->strings["\"Blockem\" Settings"] = "Configurações do \"Blockem\"";
+$a->strings["Comma separated profile URLS to block"] = "URLs de perfis a serem bloqueados, separados por vírgulas";
+$a->strings["Submit"] = "Enviar";
+$a->strings["BLOCKEM Settings saved."] = "As configurações do Blockem foram salvas.";
+$a->strings["Blocked %s - Click to open/close"] = "Bloqueou %s - Clique para abrir/fechar";
+$a->strings["Unblock Author"] = "Desbloquear autor";
+$a->strings["Block Author"] = "Bloquear autor";
+$a->strings["blockem settings updated"] = "As configurações do Blockem foram atualizadas.";
diff --git a/superblock/lang/ro/messages.po b/superblock/lang/ro/messages.po
new file mode 100644
index 00000000..1959c7d0
--- /dev/null
+++ b/superblock/lang/ro/messages.po
@@ -0,0 +1,43 @@
+# ADDON superblock
+# Copyright (C)
+# This file is distributed under the same license as the Friendica superblock addon package.
+# 
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-06-23 14:45+0200\n"
+"PO-Revision-Date: 2014-07-08 12:08+0000\n"
+"Last-Translator: Arian - Cazare Muncitori <arianserv@gmail.com>\n"
+"Language-Team: Romanian (Romania) (http://www.transifex.com/projects/p/friendica/language/ro_RO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ro_RO\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
+
+#: superblock.php:52
+msgid "\"Superblock\" Settings"
+msgstr "Configurări \"Superblock\""
+
+#: superblock.php:54
+msgid "Comma separated profile URLS to block"
+msgstr "Adresele URL de profil, de blocat, separate prin virgulă"
+
+#: superblock.php:58
+msgid "Save Settings"
+msgstr "Salvare Configurări"
+
+#: superblock.php:71
+msgid "SUPERBLOCK Settings saved."
+msgstr "Configurările SUPERBLOCK au fost salvate."
+
+#: superblock.php:143
+msgid "Block Completely"
+msgstr "Blocare Completă"
+
+#: superblock.php:163
+msgid "superblock settings updated"
+msgstr "Configurările superblock au fost actualizate"
diff --git a/superblock/lang/ro/strings.php b/superblock/lang/ro/strings.php
new file mode 100644
index 00000000..ee0dfee0
--- /dev/null
+++ b/superblock/lang/ro/strings.php
@@ -0,0 +1,13 @@
+<?php
+
+if(! function_exists("string_plural_select_ro")) {
+function string_plural_select_ro($n){
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+}}
+;
+$a->strings["\"Superblock\" Settings"] = "Configurări \"Superblock\"";
+$a->strings["Comma separated profile URLS to block"] = "Adresele URL de profil, de blocat, separate prin virgulă";
+$a->strings["Save Settings"] = "Salvare Configurări";
+$a->strings["SUPERBLOCK Settings saved."] = "Configurările SUPERBLOCK au fost salvate.";
+$a->strings["Block Completely"] = "Blocare Completă";
+$a->strings["superblock settings updated"] = "Configurările superblock au fost actualizate";
diff --git a/superblock/lang/ru/strings.php b/superblock/lang/ru/strings.php
new file mode 100644
index 00000000..7617b865
--- /dev/null
+++ b/superblock/lang/ru/strings.php
@@ -0,0 +1,10 @@
+<?php
+
+$a->strings["\"Blockem\" Settings"] = "\"Blockem\" настройки";
+$a->strings["Comma separated profile URLS to block"] = "URLS, которые заблокировать (список через запятую)";
+$a->strings["Submit"] = "Подтвердить";
+$a->strings["BLOCKEM Settings saved."] = "BLOCKEM-Настройки сохранены.";
+$a->strings["Blocked %s - Click to open/close"] = "Заблокированные %s - Нажмите, чтобы открыть/закрыть";
+$a->strings["Unblock Author"] = "";
+$a->strings["Block Author"] = "Блокировать Автора";
+$a->strings["blockem settings updated"] = "\"Blockem\" настройки обновлены";
diff --git a/superblock/lang/sv/strings.php b/superblock/lang/sv/strings.php
new file mode 100644
index 00000000..3ec569a7
--- /dev/null
+++ b/superblock/lang/sv/strings.php
@@ -0,0 +1,3 @@
+<?php
+
+$a->strings["Submit"] = "Spara";
diff --git a/superblock/lang/zh-cn/strings.php b/superblock/lang/zh-cn/strings.php
new file mode 100644
index 00000000..3a3dfaeb
--- /dev/null
+++ b/superblock/lang/zh-cn/strings.php
@@ -0,0 +1,10 @@
+<?php
+
+$a->strings["\"Blockem\" Settings"] = "「Blockem」配置";
+$a->strings["Comma separated profile URLS to block"] = "逗号分简介URL为栏";
+$a->strings["Submit"] = "提交";
+$a->strings["BLOCKEM Settings saved."] = "「Blockem」配置保存了。";
+$a->strings["Blocked %s - Click to open/close"] = "%s拦了－点击为开关";
+$a->strings["Unblock Author"] = "不拦作家";
+$a->strings["Block Author"] = "拦作家";
+$a->strings["blockem settings updated"] = "blockem设置更新了";
diff --git a/superblock/superblock.css b/superblock/superblock.css
new file mode 100644
index 00000000..368355bd
--- /dev/null
+++ b/superblock/superblock.css
@@ -0,0 +1,18 @@
+
+#superblock-label {
+	float: left;
+	width: 300px;
+	margin-top: 10px;
+}
+
+#superblock-words {
+	float: left;
+	margin-top: 10px;
+	width: 400px;
+	height: 150px;
+}
+
+#superblock-submit {
+	margin-top: 15px;
+}
+
diff --git a/superblock/superblock.php b/superblock/superblock.php
new file mode 100644
index 00000000..da4260d0
--- /dev/null
+++ b/superblock/superblock.php
@@ -0,0 +1,168 @@
+<?php
+/**
+ * Name: superblock
+ * Description: block people
+ * Version: 1.0
+ * Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
+ *
+ */
+use Friendica\Core\Hook;
+use Friendica\Core\L10n;
+use Friendica\Core\PConfig;
+use Friendica\Util\Strings;
+
+function superblock_install()
+{
+	Hook::register('addon_settings', 'addon/superblock/superblock.php', 'superblock_addon_settings');
+	Hook::register('addon_settings_post', 'addon/superblock/superblock.php', 'superblock_addon_settings_post');
+	Hook::register('conversation_start', 'addon/superblock/superblock.php', 'superblock_conversation_start');
+	Hook::register('item_photo_menu', 'addon/superblock/superblock.php', 'superblock_item_photo_menu');
+	Hook::register('enotify_store', 'addon/superblock/superblock.php', 'superblock_enotify_store');
+}
+
+function superblock_uninstall()
+{
+	Hook::unregister('addon_settings', 'addon/superblock/superblock.php', 'superblock_addon_settings');
+	Hook::unregister('addon_settings_post', 'addon/superblock/superblock.php', 'superblock_addon_settings_post');
+	Hook::unregister('conversation_start', 'addon/superblock/superblock.php', 'superblock_conversation_start');
+	Hook::unregister('item_photo_menu', 'addon/superblock/superblock.php', 'superblock_item_photo_menu');
+	Hook::unregister('enotify_store', 'addon/superblock/superblock.php', 'superblock_enotify_store');
+}
+
+function superblock_addon_settings(&$a, &$s)
+{
+	if (!local_user()) {
+		return;
+	}
+
+	/* Add our stylesheet to the page so we can make our settings look nice */
+
+	$a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->getBaseURL() . '/addon/superblock/superblock.css' . '" media="all" />' . "\r\n";
+
+	$words = PConfig::get(local_user(), 'system', 'blocked');
+	if (!$words) {
+		$words = '';
+	}
+
+	$s .= '<span id="settings_superblock_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_superblock_expanded\'); openClose(\'settings_superblock_inflated\');">';
+	$s .= '<h3>' . L10n::t('Superblock') . '</h3>';
+	$s .= '</span>';
+	$s .= '<div id="settings_superblock_expanded" class="settings-block" style="display: none;">';
+	$s .= '<span class="fakelink" onclick="openClose(\'settings_superblock_expanded\'); openClose(\'settings_superblock_inflated\');">';
+	$s .= '<h3>' . L10n::t('Superblock') . '</h3>';
+	$s .= '</span>';
+	$s .= '<div id="superblock-wrapper">';
+	$s .= '<label id="superblock-label" for="superblock-words">' . L10n::t('Comma separated profile URLS to block') . ' </label>';
+	$s .= '<textarea id="superblock-words" type="text" name="superblock-words" >' . htmlspecialchars($words) . '</textarea>';
+	$s .= '</div><div class="clear"></div>';
+
+	$s .= '<div class="settings-submit-wrapper" ><input type="submit" id="superblock-submit" name="superblock-submit" class="settings-submit" value="' . L10n::t('Save Settings') . '" /></div></div>';
+
+	return;
+}
+
+function superblock_addon_settings_post(&$a, &$b)
+{
+	if (!local_user()) {
+		return;
+	}
+
+	if (!empty($_POST['superblock-submit'])) {
+		PConfig::set(local_user(), 'system', 'blocked',trim($_POST['superblock-words']));
+		info(L10n::t('SUPERBLOCK Settings saved.') . EOL);
+	}
+}
+
+function superblock_enotify_store(&$a,&$b) {
+
+	$words = PConfig::get($b['uid'], 'system', 'blocked');
+	if ($words) {
+		$arr = explode(',', $words);
+	} else {
+		return;
+	}
+
+	$found = false;
+	if (count($arr)) {
+		foreach ($arr as $word) {
+			if (!strlen(trim($word))) {
+				continue;
+			}
+
+			if (Strings::compareLink($b['url'], $word)) {
+				$found = true;
+				break;
+			}
+		}
+	}
+	if ($found) {
+		$b['abort'] = true;
+	}
+}
+
+
+function superblock_conversation_start(&$a, &$b)
+{
+	if (!local_user()) {
+		return;
+	}
+
+	$words = PConfig::get(local_user(), 'system', 'blocked');
+	if ($words) {
+		$a->data['superblock'] = explode(',', $words);
+	}
+	$a->page['htmlhead'] .= <<< EOT
+
+<script>
+function superblockBlock(author) {
+	$.get('superblock?block=' +author, function(data) {
+		location.reload(true);
+	});
+}
+</script>
+
+EOT;
+
+}
+
+function superblock_item_photo_menu(&$a, &$b)
+{
+	if (!local_user() || $b['item']['self']) {
+		return;
+	}
+
+	$blocked = false;
+	$author = $b['item']['author-link'];
+	if (!empty($a->data['superblock'])) {
+		foreach ($a->data['superblock'] as $bloke) {
+			if (Strings::compareLink($bloke, $author)) {
+				$blocked = true;
+				break;
+			}
+		}
+	}
+
+	$b['menu'][L10n::t('Block Completely')] = 'javascript:superblockBlock(\'' . $author . '\'); return false;';
+}
+
+function superblock_module() {}
+
+
+function superblock_init(&$a)
+{
+	if (!local_user()) {
+		return;
+	}
+
+	$words = PConfig::get(local_user(), 'system', 'blocked');
+
+	if (array_key_exists('block', $_GET) && $_GET['block']) {
+		if (strlen($words))
+			$words .= ',';
+		$words .= trim($_GET['block']);
+	}
+
+	PConfig::set(local_user(), 'system', 'blocked', $words);
+	info(L10n::t('superblock settings updated') . EOL );
+	exit();
+}
diff --git a/tesseract/README.md b/tesseract/README.md
deleted file mode 100644
index d0b5eee2..00000000
--- a/tesseract/README.md
+++ /dev/null
@@ -1 +0,0 @@
-To make the addon work, you have to install the tesseract-ocr command line tool.
\ No newline at end of file
diff --git a/tesseract/composer.json b/tesseract/composer.json
deleted file mode 100644
index 2a0937c0..00000000
--- a/tesseract/composer.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "require": {
-        "thiagoalessio/tesseract_ocr": "^2.13"
-    }
-}
diff --git a/tesseract/composer.lock b/tesseract/composer.lock
deleted file mode 100644
index 036868e7..00000000
--- a/tesseract/composer.lock
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-    "_readme": [
-        "This file locks the dependencies of your project to a known state",
-        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
-        "This file is @generated automatically"
-    ],
-    "content-hash": "778b5479cb5d2b31b57f40473a87f8eb",
-    "packages": [
-        {
-            "name": "thiagoalessio/tesseract_ocr",
-            "version": "2.13.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/thiagoalessio/tesseract-ocr-for-php.git",
-                "reference": "232a8cb9d571992f9bd1e263f2f6909cf6c173a1"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/thiagoalessio/tesseract-ocr-for-php/zipball/232a8cb9d571992f9bd1e263f2f6909cf6c173a1",
-                "reference": "232a8cb9d571992f9bd1e263f2f6909cf6c173a1",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.3 || ^7.0 || ^8.0"
-            },
-            "require-dev": {
-                "phpunit/php-code-coverage": "^2.2.4 || ^9.0.0"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "thiagoalessio\\TesseractOCR\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "thiagoalessio",
-                    "email": "thiagoalessio@me.com"
-                }
-            ],
-            "description": "A wrapper to work with Tesseract OCR inside PHP.",
-            "keywords": [
-                "OCR",
-                "Tesseract",
-                "text recognition"
-            ],
-            "time": "2023-10-05T21:14:48+00:00"
-        }
-    ],
-    "packages-dev": [],
-    "aliases": [],
-    "minimum-stability": "stable",
-    "stability-flags": [],
-    "prefer-stable": false,
-    "prefer-lowest": false,
-    "platform": [],
-    "platform-dev": [],
-    "platform-overrides": {
-        "php": "7.2"
-    },
-    "plugin-api-version": "1.1.0"
-}
diff --git a/tesseract/tesseract.php b/tesseract/tesseract.php
deleted file mode 100644
index b3e1feb6..00000000
--- a/tesseract/tesseract.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
- * Name: Tesseract OCR
- * Description: Use OCR to get text from images
- * Version: 0.1
- * Author: Michael Vogel <http://pirati.ca/profile/heluecht>
- */
-
-use Friendica\Core\Hook;
-use Friendica\Core\Logger;
-use Friendica\Core\System;
-use thiagoalessio\TesseractOCR\TesseractOCR;
-
-require_once __DIR__ . DIRECTORY_SEPARATOR . 'vendor' . DIRECTORY_SEPARATOR . 'autoload.php';
-
-function tesseract_install()
-{
-	Hook::register('ocr-detection', __FILE__, 'tesseract_ocr_detection');
-
-	Logger::notice('installed tesseract');
-}
-
-function tesseract_ocr_detection(&$media)
-{
-	$ocr = new TesseractOCR();
-	try {
-		$languages = $ocr->availableLanguages();
-		if ($languages) {
-			$ocr->lang(implode('+', $languages));
-		}
-		$ocr->tempDir(System::getTempPath());
-		$ocr->imageData($media['img_str'], strlen($media['img_str']));
-		$media['description'] = $ocr->run();
-	} catch (\Throwable $th) {
-		Logger::info('Error calling TesseractOCR', ['message' => $th->getMessage()]);
-	}			
-}
diff --git a/tesseract/vendor/autoload.php b/tesseract/vendor/autoload.php
deleted file mode 100644
index 1238ecea..00000000
--- a/tesseract/vendor/autoload.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-// autoload.php @generated by Composer
-
-require_once __DIR__ . '/composer/autoload_real.php';
-
-return ComposerAutoloaderInit695d781792f754383aa61632167d066e::getLoader();
diff --git a/tesseract/vendor/composer/ClassLoader.php b/tesseract/vendor/composer/ClassLoader.php
deleted file mode 100644
index 03b9bb9c..00000000
--- a/tesseract/vendor/composer/ClassLoader.php
+++ /dev/null
@@ -1,445 +0,0 @@
-<?php
-
-/*
- * This file is part of Composer.
- *
- * (c) Nils Adermann <naderman@naderman.de>
- *     Jordi Boggiano <j.boggiano@seld.be>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Composer\Autoload;
-
-/**
- * ClassLoader implements a PSR-0, PSR-4 and classmap class loader.
- *
- *     $loader = new \Composer\Autoload\ClassLoader();
- *
- *     // register classes with namespaces
- *     $loader->add('Symfony\Component', __DIR__.'/component');
- *     $loader->add('Symfony',           __DIR__.'/framework');
- *
- *     // activate the autoloader
- *     $loader->register();
- *
- *     // to enable searching the include path (eg. for PEAR packages)
- *     $loader->setUseIncludePath(true);
- *
- * In this example, if you try to use a class in the Symfony\Component
- * namespace or one of its children (Symfony\Component\Console for instance),
- * the autoloader will first look for the class under the component/
- * directory, and it will then fallback to the framework/ directory if not
- * found before giving up.
- *
- * This class is loosely based on the Symfony UniversalClassLoader.
- *
- * @author Fabien Potencier <fabien@symfony.com>
- * @author Jordi Boggiano <j.boggiano@seld.be>
- * @see    http://www.php-fig.org/psr/psr-0/
- * @see    http://www.php-fig.org/psr/psr-4/
- */
-class ClassLoader
-{
-    // PSR-4
-    private $prefixLengthsPsr4 = array();
-    private $prefixDirsPsr4 = array();
-    private $fallbackDirsPsr4 = array();
-
-    // PSR-0
-    private $prefixesPsr0 = array();
-    private $fallbackDirsPsr0 = array();
-
-    private $useIncludePath = false;
-    private $classMap = array();
-    private $classMapAuthoritative = false;
-    private $missingClasses = array();
-    private $apcuPrefix;
-
-    public function getPrefixes()
-    {
-        if (!empty($this->prefixesPsr0)) {
-            return call_user_func_array('array_merge', array_values($this->prefixesPsr0));
-        }
-
-        return array();
-    }
-
-    public function getPrefixesPsr4()
-    {
-        return $this->prefixDirsPsr4;
-    }
-
-    public function getFallbackDirs()
-    {
-        return $this->fallbackDirsPsr0;
-    }
-
-    public function getFallbackDirsPsr4()
-    {
-        return $this->fallbackDirsPsr4;
-    }
-
-    public function getClassMap()
-    {
-        return $this->classMap;
-    }
-
-    /**
-     * @param array $classMap Class to filename map
-     */
-    public function addClassMap(array $classMap)
-    {
-        if ($this->classMap) {
-            $this->classMap = array_merge($this->classMap, $classMap);
-        } else {
-            $this->classMap = $classMap;
-        }
-    }
-
-    /**
-     * Registers a set of PSR-0 directories for a given prefix, either
-     * appending or prepending to the ones previously set for this prefix.
-     *
-     * @param string       $prefix  The prefix
-     * @param array|string $paths   The PSR-0 root directories
-     * @param bool         $prepend Whether to prepend the directories
-     */
-    public function add($prefix, $paths, $prepend = false)
-    {
-        if (!$prefix) {
-            if ($prepend) {
-                $this->fallbackDirsPsr0 = array_merge(
-                    (array) $paths,
-                    $this->fallbackDirsPsr0
-                );
-            } else {
-                $this->fallbackDirsPsr0 = array_merge(
-                    $this->fallbackDirsPsr0,
-                    (array) $paths
-                );
-            }
-
-            return;
-        }
-
-        $first = $prefix[0];
-        if (!isset($this->prefixesPsr0[$first][$prefix])) {
-            $this->prefixesPsr0[$first][$prefix] = (array) $paths;
-
-            return;
-        }
-        if ($prepend) {
-            $this->prefixesPsr0[$first][$prefix] = array_merge(
-                (array) $paths,
-                $this->prefixesPsr0[$first][$prefix]
-            );
-        } else {
-            $this->prefixesPsr0[$first][$prefix] = array_merge(
-                $this->prefixesPsr0[$first][$prefix],
-                (array) $paths
-            );
-        }
-    }
-
-    /**
-     * Registers a set of PSR-4 directories for a given namespace, either
-     * appending or prepending to the ones previously set for this namespace.
-     *
-     * @param string       $prefix  The prefix/namespace, with trailing '\\'
-     * @param array|string $paths   The PSR-4 base directories
-     * @param bool         $prepend Whether to prepend the directories
-     *
-     * @throws \InvalidArgumentException
-     */
-    public function addPsr4($prefix, $paths, $prepend = false)
-    {
-        if (!$prefix) {
-            // Register directories for the root namespace.
-            if ($prepend) {
-                $this->fallbackDirsPsr4 = array_merge(
-                    (array) $paths,
-                    $this->fallbackDirsPsr4
-                );
-            } else {
-                $this->fallbackDirsPsr4 = array_merge(
-                    $this->fallbackDirsPsr4,
-                    (array) $paths
-                );
-            }
-        } elseif (!isset($this->prefixDirsPsr4[$prefix])) {
-            // Register directories for a new namespace.
-            $length = strlen($prefix);
-            if ('\\' !== $prefix[$length - 1]) {
-                throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
-            }
-            $this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length;
-            $this->prefixDirsPsr4[$prefix] = (array) $paths;
-        } elseif ($prepend) {
-            // Prepend directories for an already registered namespace.
-            $this->prefixDirsPsr4[$prefix] = array_merge(
-                (array) $paths,
-                $this->prefixDirsPsr4[$prefix]
-            );
-        } else {
-            // Append directories for an already registered namespace.
-            $this->prefixDirsPsr4[$prefix] = array_merge(
-                $this->prefixDirsPsr4[$prefix],
-                (array) $paths
-            );
-        }
-    }
-
-    /**
-     * Registers a set of PSR-0 directories for a given prefix,
-     * replacing any others previously set for this prefix.
-     *
-     * @param string       $prefix The prefix
-     * @param array|string $paths  The PSR-0 base directories
-     */
-    public function set($prefix, $paths)
-    {
-        if (!$prefix) {
-            $this->fallbackDirsPsr0 = (array) $paths;
-        } else {
-            $this->prefixesPsr0[$prefix[0]][$prefix] = (array) $paths;
-        }
-    }
-
-    /**
-     * Registers a set of PSR-4 directories for a given namespace,
-     * replacing any others previously set for this namespace.
-     *
-     * @param string       $prefix The prefix/namespace, with trailing '\\'
-     * @param array|string $paths  The PSR-4 base directories
-     *
-     * @throws \InvalidArgumentException
-     */
-    public function setPsr4($prefix, $paths)
-    {
-        if (!$prefix) {
-            $this->fallbackDirsPsr4 = (array) $paths;
-        } else {
-            $length = strlen($prefix);
-            if ('\\' !== $prefix[$length - 1]) {
-                throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
-            }
-            $this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length;
-            $this->prefixDirsPsr4[$prefix] = (array) $paths;
-        }
-    }
-
-    /**
-     * Turns on searching the include path for class files.
-     *
-     * @param bool $useIncludePath
-     */
-    public function setUseIncludePath($useIncludePath)
-    {
-        $this->useIncludePath = $useIncludePath;
-    }
-
-    /**
-     * Can be used to check if the autoloader uses the include path to check
-     * for classes.
-     *
-     * @return bool
-     */
-    public function getUseIncludePath()
-    {
-        return $this->useIncludePath;
-    }
-
-    /**
-     * Turns off searching the prefix and fallback directories for classes
-     * that have not been registered with the class map.
-     *
-     * @param bool $classMapAuthoritative
-     */
-    public function setClassMapAuthoritative($classMapAuthoritative)
-    {
-        $this->classMapAuthoritative = $classMapAuthoritative;
-    }
-
-    /**
-     * Should class lookup fail if not found in the current class map?
-     *
-     * @return bool
-     */
-    public function isClassMapAuthoritative()
-    {
-        return $this->classMapAuthoritative;
-    }
-
-    /**
-     * APCu prefix to use to cache found/not-found classes, if the extension is enabled.
-     *
-     * @param string|null $apcuPrefix
-     */
-    public function setApcuPrefix($apcuPrefix)
-    {
-        $this->apcuPrefix = function_exists('apcu_fetch') && filter_var(ini_get('apc.enabled'), FILTER_VALIDATE_BOOLEAN) ? $apcuPrefix : null;
-    }
-
-    /**
-     * The APCu prefix in use, or null if APCu caching is not enabled.
-     *
-     * @return string|null
-     */
-    public function getApcuPrefix()
-    {
-        return $this->apcuPrefix;
-    }
-
-    /**
-     * Registers this instance as an autoloader.
-     *
-     * @param bool $prepend Whether to prepend the autoloader or not
-     */
-    public function register($prepend = false)
-    {
-        spl_autoload_register(array($this, 'loadClass'), true, $prepend);
-    }
-
-    /**
-     * Unregisters this instance as an autoloader.
-     */
-    public function unregister()
-    {
-        spl_autoload_unregister(array($this, 'loadClass'));
-    }
-
-    /**
-     * Loads the given class or interface.
-     *
-     * @param  string    $class The name of the class
-     * @return bool|null True if loaded, null otherwise
-     */
-    public function loadClass($class)
-    {
-        if ($file = $this->findFile($class)) {
-            includeFile($file);
-
-            return true;
-        }
-    }
-
-    /**
-     * Finds the path to the file where the class is defined.
-     *
-     * @param string $class The name of the class
-     *
-     * @return string|false The path if found, false otherwise
-     */
-    public function findFile($class)
-    {
-        // class map lookup
-        if (isset($this->classMap[$class])) {
-            return $this->classMap[$class];
-        }
-        if ($this->classMapAuthoritative || isset($this->missingClasses[$class])) {
-            return false;
-        }
-        if (null !== $this->apcuPrefix) {
-            $file = apcu_fetch($this->apcuPrefix.$class, $hit);
-            if ($hit) {
-                return $file;
-            }
-        }
-
-        $file = $this->findFileWithExtension($class, '.php');
-
-        // Search for Hack files if we are running on HHVM
-        if (false === $file && defined('HHVM_VERSION')) {
-            $file = $this->findFileWithExtension($class, '.hh');
-        }
-
-        if (null !== $this->apcuPrefix) {
-            apcu_add($this->apcuPrefix.$class, $file);
-        }
-
-        if (false === $file) {
-            // Remember that this class does not exist.
-            $this->missingClasses[$class] = true;
-        }
-
-        return $file;
-    }
-
-    private function findFileWithExtension($class, $ext)
-    {
-        // PSR-4 lookup
-        $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR) . $ext;
-
-        $first = $class[0];
-        if (isset($this->prefixLengthsPsr4[$first])) {
-            $subPath = $class;
-            while (false !== $lastPos = strrpos($subPath, '\\')) {
-                $subPath = substr($subPath, 0, $lastPos);
-                $search = $subPath . '\\';
-                if (isset($this->prefixDirsPsr4[$search])) {
-                    $pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1);
-                    foreach ($this->prefixDirsPsr4[$search] as $dir) {
-                        if (file_exists($file = $dir . $pathEnd)) {
-                            return $file;
-                        }
-                    }
-                }
-            }
-        }
-
-        // PSR-4 fallback dirs
-        foreach ($this->fallbackDirsPsr4 as $dir) {
-            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4)) {
-                return $file;
-            }
-        }
-
-        // PSR-0 lookup
-        if (false !== $pos = strrpos($class, '\\')) {
-            // namespaced class name
-            $logicalPathPsr0 = substr($logicalPathPsr4, 0, $pos + 1)
-                . strtr(substr($logicalPathPsr4, $pos + 1), '_', DIRECTORY_SEPARATOR);
-        } else {
-            // PEAR-like class name
-            $logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR) . $ext;
-        }
-
-        if (isset($this->prefixesPsr0[$first])) {
-            foreach ($this->prefixesPsr0[$first] as $prefix => $dirs) {
-                if (0 === strpos($class, $prefix)) {
-                    foreach ($dirs as $dir) {
-                        if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
-                            return $file;
-                        }
-                    }
-                }
-            }
-        }
-
-        // PSR-0 fallback dirs
-        foreach ($this->fallbackDirsPsr0 as $dir) {
-            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
-                return $file;
-            }
-        }
-
-        // PSR-0 include paths.
-        if ($this->useIncludePath && $file = stream_resolve_include_path($logicalPathPsr0)) {
-            return $file;
-        }
-
-        return false;
-    }
-}
-
-/**
- * Scope isolated include.
- *
- * Prevents access to $this/self from included files.
- */
-function includeFile($file)
-{
-    include $file;
-}
diff --git a/tesseract/vendor/composer/LICENSE b/tesseract/vendor/composer/LICENSE
deleted file mode 100644
index f27399a0..00000000
--- a/tesseract/vendor/composer/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-
-Copyright (c) Nils Adermann, Jordi Boggiano
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is furnished
-to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
diff --git a/tesseract/vendor/composer/autoload_classmap.php b/tesseract/vendor/composer/autoload_classmap.php
deleted file mode 100644
index 7a91153b..00000000
--- a/tesseract/vendor/composer/autoload_classmap.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-// autoload_classmap.php @generated by Composer
-
-$vendorDir = dirname(dirname(__FILE__));
-$baseDir = dirname($vendorDir);
-
-return array(
-);
diff --git a/tesseract/vendor/composer/autoload_namespaces.php b/tesseract/vendor/composer/autoload_namespaces.php
deleted file mode 100644
index b7fc0125..00000000
--- a/tesseract/vendor/composer/autoload_namespaces.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-// autoload_namespaces.php @generated by Composer
-
-$vendorDir = dirname(dirname(__FILE__));
-$baseDir = dirname($vendorDir);
-
-return array(
-);
diff --git a/tesseract/vendor/composer/autoload_psr4.php b/tesseract/vendor/composer/autoload_psr4.php
deleted file mode 100644
index 80779c77..00000000
--- a/tesseract/vendor/composer/autoload_psr4.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-// autoload_psr4.php @generated by Composer
-
-$vendorDir = dirname(dirname(__FILE__));
-$baseDir = dirname($vendorDir);
-
-return array(
-    'thiagoalessio\\TesseractOCR\\' => array($vendorDir . '/thiagoalessio/tesseract_ocr/src'),
-);
diff --git a/tesseract/vendor/composer/autoload_real.php b/tesseract/vendor/composer/autoload_real.php
deleted file mode 100644
index 10af9c56..00000000
--- a/tesseract/vendor/composer/autoload_real.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-
-// autoload_real.php @generated by Composer
-
-class ComposerAutoloaderInit695d781792f754383aa61632167d066e
-{
-    private static $loader;
-
-    public static function loadClassLoader($class)
-    {
-        if ('Composer\Autoload\ClassLoader' === $class) {
-            require __DIR__ . '/ClassLoader.php';
-        }
-    }
-
-    /**
-     * @return \Composer\Autoload\ClassLoader
-     */
-    public static function getLoader()
-    {
-        if (null !== self::$loader) {
-            return self::$loader;
-        }
-
-        spl_autoload_register(array('ComposerAutoloaderInit695d781792f754383aa61632167d066e', 'loadClassLoader'), true, true);
-        self::$loader = $loader = new \Composer\Autoload\ClassLoader();
-        spl_autoload_unregister(array('ComposerAutoloaderInit695d781792f754383aa61632167d066e', 'loadClassLoader'));
-
-        $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
-        if ($useStaticLoader) {
-            require_once __DIR__ . '/autoload_static.php';
-
-            call_user_func(\Composer\Autoload\ComposerStaticInit695d781792f754383aa61632167d066e::getInitializer($loader));
-        } else {
-            $map = require __DIR__ . '/autoload_namespaces.php';
-            foreach ($map as $namespace => $path) {
-                $loader->set($namespace, $path);
-            }
-
-            $map = require __DIR__ . '/autoload_psr4.php';
-            foreach ($map as $namespace => $path) {
-                $loader->setPsr4($namespace, $path);
-            }
-
-            $classMap = require __DIR__ . '/autoload_classmap.php';
-            if ($classMap) {
-                $loader->addClassMap($classMap);
-            }
-        }
-
-        $loader->register(true);
-
-        return $loader;
-    }
-}
diff --git a/tesseract/vendor/composer/autoload_static.php b/tesseract/vendor/composer/autoload_static.php
deleted file mode 100644
index 59b66053..00000000
--- a/tesseract/vendor/composer/autoload_static.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-
-// autoload_static.php @generated by Composer
-
-namespace Composer\Autoload;
-
-class ComposerStaticInit695d781792f754383aa61632167d066e
-{
-    public static $prefixLengthsPsr4 = array (
-        't' => 
-        array (
-            'thiagoalessio\\TesseractOCR\\' => 27,
-        ),
-    );
-
-    public static $prefixDirsPsr4 = array (
-        'thiagoalessio\\TesseractOCR\\' => 
-        array (
-            0 => __DIR__ . '/..' . '/thiagoalessio/tesseract_ocr/src',
-        ),
-    );
-
-    public static function getInitializer(ClassLoader $loader)
-    {
-        return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInit695d781792f754383aa61632167d066e::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInit695d781792f754383aa61632167d066e::$prefixDirsPsr4;
-
-        }, null, ClassLoader::class);
-    }
-}
diff --git a/tesseract/vendor/composer/installed.json b/tesseract/vendor/composer/installed.json
deleted file mode 100644
index 70bcc01c..00000000
--- a/tesseract/vendor/composer/installed.json
+++ /dev/null
@@ -1,48 +0,0 @@
-[
-    {
-        "name": "thiagoalessio/tesseract_ocr",
-        "version": "2.13.0",
-        "version_normalized": "2.13.0.0",
-        "source": {
-            "type": "git",
-            "url": "https://github.com/thiagoalessio/tesseract-ocr-for-php.git",
-            "reference": "232a8cb9d571992f9bd1e263f2f6909cf6c173a1"
-        },
-        "dist": {
-            "type": "zip",
-            "url": "https://api.github.com/repos/thiagoalessio/tesseract-ocr-for-php/zipball/232a8cb9d571992f9bd1e263f2f6909cf6c173a1",
-            "reference": "232a8cb9d571992f9bd1e263f2f6909cf6c173a1",
-            "shasum": ""
-        },
-        "require": {
-            "php": "^5.3 || ^7.0 || ^8.0"
-        },
-        "require-dev": {
-            "phpunit/php-code-coverage": "^2.2.4 || ^9.0.0"
-        },
-        "time": "2023-10-05T21:14:48+00:00",
-        "type": "library",
-        "installation-source": "dist",
-        "autoload": {
-            "psr-4": {
-                "thiagoalessio\\TesseractOCR\\": "src/"
-            }
-        },
-        "notification-url": "https://packagist.org/downloads/",
-        "license": [
-            "MIT"
-        ],
-        "authors": [
-            {
-                "name": "thiagoalessio",
-                "email": "thiagoalessio@me.com"
-            }
-        ],
-        "description": "A wrapper to work with Tesseract OCR inside PHP.",
-        "keywords": [
-            "OCR",
-            "Tesseract",
-            "text recognition"
-        ]
-    }
-]
diff --git a/tesseract/vendor/thiagoalessio/tesseract_ocr/.appveyor.yml b/tesseract/vendor/thiagoalessio/tesseract_ocr/.appveyor.yml
deleted file mode 100644
index 1debc1a1..00000000
--- a/tesseract/vendor/thiagoalessio/tesseract_ocr/.appveyor.yml
+++ /dev/null
@@ -1,14 +0,0 @@
----
-build: false
-
-install:
-  - ps: Set-Service wuauserv -StartupType Manual
-  - choco install php
-  - choco install capture2text --version 3.9
-  - choco install composer
-  - refreshenv
-  - cd %APPVEYOR_BUILD_FOLDER%
-  - composer install
-
-test_script:
-  - php tests\run.php unit e2e
diff --git a/tesseract/vendor/thiagoalessio/tesseract_ocr/MIT-LICENSE b/tesseract/vendor/thiagoalessio/tesseract_ocr/MIT-LICENSE
deleted file mode 100644
index 448104d6..00000000
--- a/tesseract/vendor/thiagoalessio/tesseract_ocr/MIT-LICENSE
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (c) 2012-2021 Thiago Alessio Pereira
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/tesseract/vendor/thiagoalessio/tesseract_ocr/README.md b/tesseract/vendor/thiagoalessio/tesseract_ocr/README.md
deleted file mode 100644
index b828344c..00000000
--- a/tesseract/vendor/thiagoalessio/tesseract_ocr/README.md
+++ /dev/null
@@ -1,508 +0,0 @@
-<img src="https://thiagoalessio.github.io/tesseract-ocr-for-php/images/logo.png" alt="Tesseract OCR for PHP" align="right" width="320px"/>
-
-# Tesseract OCR for PHP
-
-A wrapper to work with Tesseract OCR inside PHP.
-
-[![CI][ci_badge]][ci]
-[![AppVeyor][appveyor_badge]][appveyor]
-[![Codacy][codacy_badge]][codacy]
-[![Test Coverage][test_coverage_badge]][test_coverage]
-<br/>
-[![Latest Stable Version][stable_version_badge]][packagist]
-[![Total Downloads][total_downloads_badge]][packagist]
-[![Monthly Downloads][monthly_downloads_badge]][packagist]
-
-## Installation
-
-Via [Composer][]:
-
-    $ composer require thiagoalessio/tesseract_ocr
-
-:bangbang: **This library depends on [Tesseract OCR][], version _3.02_ or later.**
-
-<br/>
-
-### ![][windows_icon] Note for Windows users
-
-There are [many ways][tesseract_installation_on_windows] to install
-[Tesseract OCR][] on your system, but if you just want something quick to
-get up and running, I recommend installing the [Capture2Text][] package with
-[Chocolatey][].
-
-    choco install capture2text --version 3.9
-
-:warning: Recent versions of [Capture2Text][] stopped shipping the `tesseract` binary.
-
-<br/>
-
-### ![][macos_icon] Note for macOS users
-
-With [MacPorts][] you can install support for individual languages, like so:
-
-    $ sudo port install tesseract-<langcode>
-
-But that is not possible with [Homebrew][]. It comes only with **English** support
-by default, so if you intend to use it for other language, the quickest solution
-is to install them all:
-
-    $ brew install tesseract tesseract-lang
-
-<br/>
-
-## Usage
-
-### Basic usage
-
-<img align="right" width="50%" title="The quick brown fox jumps over the lazy dog." src="./tests/EndToEnd/images/text.png"/>
-
-```php
-use thiagoalessio\TesseractOCR\TesseractOCR;
-echo (new TesseractOCR('text.png'))
-    ->run();
-```
-
-```
-The quick brown fox
-jumps over
-the lazy dog.
-```
-
-<br/>
-
-### Other languages
-
-<img align="right" width="50%" title="Bülowstraße" src="./tests/EndToEnd/images/german.png"/>
-
-```php
-use thiagoalessio\TesseractOCR\TesseractOCR;
-echo (new TesseractOCR('german.png'))
-    ->lang('deu')
-    ->run();
-```
-
-```
-Bülowstraße
-```
-
-<br/>
-
-### Multiple languages
-
-<img align="right" width="50%" title="I eat すし y Pollo" src="./tests/EndToEnd/images/mixed-languages.png"/>
-
-```php
-use thiagoalessio\TesseractOCR\TesseractOCR;
-echo (new TesseractOCR('mixed-languages.png'))
-    ->lang('eng', 'jpn', 'spa')
-    ->run();
-```
-
-```
-I eat すし y Pollo
-```
-
-<br/>
-
-### Inducing recognition
-
-<img align="right" width="50%" title="8055" src="./tests/EndToEnd/images/8055.png"/>
-
-```php
-use thiagoalessio\TesseractOCR\TesseractOCR;
-echo (new TesseractOCR('8055.png'))
-    ->allowlist(range('A', 'Z'))
-    ->run();
-```
-
-```
-BOSS
-```
-
-<br/>
-
-### Breaking CAPTCHAs
-
-Yes, I know some of you might want to use this library for the *noble* purpose
-of breaking CAPTCHAs, so please take a look at this comment:
-
-<https://github.com/thiagoalessio/tesseract-ocr-for-php/issues/91#issuecomment-342290510>
-
-## API
-
-### run
-
-Executes a `tesseract` command, optionally receiving an integer as `timeout`,
-in case you experience stalled tesseract processes.
-
-```php
-$ocr = new TesseractOCR();
-$ocr->run();
-```
-```php
-$ocr = new TesseractOCR();
-$timeout = 500;
-$ocr->run($timeout);
-```
-
-### image
-
-Define the path of an image to be recognized by `tesseract`.
-
-```php
-$ocr = new TesseractOCR();
-$ocr->image('/path/to/image.png');
-$ocr->run();
-```
-
-### imageData
-
-Set the image to be recognized by `tesseract` from a string, with its size.
-This can be useful when dealing with files that are already loaded in memory.
-You can easily retrieve the image data and size of an image object :
-```php
-//Using Imagick
-$data = $img->getImageBlob();
-$size = $img->getImageLength();
-//Using GD
-ob_start();
-// Note that you can use any format supported by tesseract
-imagepng($img, null, 0);
-$size = ob_get_length();
-$data = ob_get_clean();
-
-$ocr = new TesseractOCR();
-$ocr->imageData($data, $size);
-$ocr->run();
-```
-
-### executable
-
-Define a custom location of the `tesseract` executable,
-if by any reason it is not present in the `$PATH`.
-
-```php
-echo (new TesseractOCR('img.png'))
-    ->executable('/path/to/tesseract')
-    ->run();
-```
-
-### version
-
-Returns the current version of `tesseract`.
-
-```php
-echo (new TesseractOCR())->version();
-```
-
-### availableLanguages
-
-Returns a list of available languages/scripts.
-
-```php
-foreach((new TesseractOCR())->availableLanguages() as $lang) echo $lang;
-```
-
-__More info:__ <https://github.com/tesseract-ocr/tesseract/blob/master/doc/tesseract.1.asc#languages-and-scripts>
-
-### tessdataDir
-
-Specify a custom location for the tessdata directory.
-
-```php
-echo (new TesseractOCR('img.png'))
-    ->tessdataDir('/path')
-    ->run();
-```
-
-### userWords
-
-Specify the location of user words file.
-
-This is a plain text file containing a list of words that you want to be
-considered as a normal dictionary words by `tesseract`.
-
-Useful when dealing with contents that contain technical terminology, jargon,
-etc.
-
-```
-$ cat /path/to/user-words.txt
-foo
-bar
-```
-
-```php
-echo (new TesseractOCR('img.png'))
-    ->userWords('/path/to/user-words.txt')
-    ->run();
-```
-
-### userPatterns
-
-Specify the location of user patterns file.
-
-If the contents you are dealing with have known patterns, this option can help
-a lot tesseract's recognition accuracy.
-
-```
-$ cat /path/to/user-patterns.txt'
-1-\d\d\d-GOOG-441
-www.\n\\\*.com
-```
-
-```php
-echo (new TesseractOCR('img.png'))
-    ->userPatterns('/path/to/user-patterns.txt')
-    ->run();
-```
-
-### lang
-
-Define one or more languages to be used during the recognition.
-A complete list of available languages can be found at:
-<https://github.com/tesseract-ocr/tesseract/blob/master/doc/tesseract.1.asc#languages>
-
-__Tip from [@daijiale][]:__ Use the combination `->lang('chi_sim', 'chi_tra')`
-for proper recognition of Chinese.
-
-```php
- echo (new TesseractOCR('img.png'))
-     ->lang('lang1', 'lang2', 'lang3')
-     ->run();
-```
-
-### psm
-
-Specify the Page Segmentation Method, which instructs `tesseract` how to
-interpret the given image.
-
-__More info:__ <https://github.com/tesseract-ocr/tesseract/wiki/ImproveQuality#page-segmentation-method>
-
-```php
-echo (new TesseractOCR('img.png'))
-    ->psm(6)
-    ->run();
-```
-
-### oem
-
-Specify the OCR Engine Mode. (see `tesseract --help-oem`)
-
-```php
-echo (new TesseractOCR('img.png'))
-    ->oem(2)
-    ->run();
-```
-
-### dpi
-
-Specify the image DPI. It is useful if your image does not contain this information in its metadata.
-
-```php
-echo (new TesseractOCR('img.png'))
-    ->dpi(300)
-    ->run();
-```
-
-### allowlist
-
-This is a shortcut for `->config('tessedit_char_whitelist', 'abcdef....')`.
-
-```php
-echo (new TesseractOCR('img.png'))
-    ->allowlist(range('a', 'z'), range(0, 9), '-_@')
-    ->run();
-```
-
-### configFile
-
-Specify a config file to be used. It can either be the path to your own
-config file or the name of one of the predefined config files:
-<https://github.com/tesseract-ocr/tesseract/tree/master/tessdata/configs>
-
-```php
-echo (new TesseractOCR('img.png'))
-    ->configFile('hocr')
-    ->run();
-```
-
-### setOutputFile
-
-Specify an Outputfile to be used. Be aware: If you set an outputfile then
-the option `withoutTempFiles` is ignored.
-Tempfiles are written (and deleted) even if `withoutTempFiles = true`.
-
-In combination with `configFile` you are able to get the `hocr`, `tsv` or
-`pdf` files.
-
-```php
-echo (new TesseractOCR('img.png'))
-    ->configFile('pdf')
-    ->setOutputFile('/PATH_TO_MY_OUTPUTFILE/searchable.pdf')
-    ->run();
-```
-
-### digits
-
-Shortcut for `->configFile('digits')`.
-
-```php
-echo (new TesseractOCR('img.png'))
-    ->digits()
-    ->run();
-```
-
-### hocr
-
-Shortcut for `->configFile('hocr')`.
-
-```php
-echo (new TesseractOCR('img.png'))
-    ->hocr()
-    ->run();
-```
-
-### pdf
-
-Shortcut for `->configFile('pdf')`.
-
-```php
-echo (new TesseractOCR('img.png'))
-    ->pdf()
-    ->run();
-```
-
-### quiet
-
-Shortcut for `->configFile('quiet')`.
-
-```php
-echo (new TesseractOCR('img.png'))
-    ->quiet()
-    ->run();
-```
-
-### tsv
-
-Shortcut for `->configFile('tsv')`.
-
-```php
-echo (new TesseractOCR('img.png'))
-    ->tsv()
-    ->run();
-```
-
-### txt
-
-Shortcut for `->configFile('txt')`.
-
-```php
-echo (new TesseractOCR('img.png'))
-    ->txt()
-    ->run();
-```
-
-### tempDir
-
-Define a custom directory to store temporary files generated by tesseract.
-Make sure the directory actually exists and the user running `php` is allowed
-to write in there.
-
-```php
-echo (new TesseractOCR('img.png'))
-    ->tempDir('./my/custom/temp/dir')
-    ->run();
-```
-
-### withoutTempFiles
-
-Specify that `tesseract` should output the recognized text without writing to temporary files.
-The data is gathered from the standard output of `tesseract` instead.
-
-```php
-echo (new TesseractOCR('img.png'))
-    ->withoutTempFiles()
-    ->run();
-```
-
-### Other options
-
-Any configuration option offered by Tesseract can be used like that:
-
-```php
-echo (new TesseractOCR('img.png'))
-    ->config('config_var', 'value')
-    ->config('other_config_var', 'other value')
-    ->run();
-```
-
-Or like that:
-
-```php
-echo (new TesseractOCR('img.png'))
-    ->configVar('value')
-    ->otherConfigVar('other value')
-    ->run();
-```
-
-__More info:__ <https://github.com/tesseract-ocr/tesseract/wiki/ControlParams>
-
-### Thread-limit
-
-Sometimes, it may be useful to limit the number of threads that tesseract is
-allowed to use (e.g. in [this case](https://github.com/tesseract-ocr/tesseract/issues/898)).
-Set the maxmium number of threads as param for the `run` function:
-
-```php
-echo (new TesseractOCR('img.png'))
-    ->threadLimit(1)
-    ->run();
-```
-
-## How to contribute
-
-You can contribute to this project by:
-
-* Opening an [Issue][] if you found a bug or wish to propose a new feature;
-* Placing a [Pull Request][] with code that fix a bug, missing/wrong documentation
-  or implement a new feature;
-
-Just make sure you take a look at our [Code of Conduct][] and [Contributing][]
-instructions.
-
-## License
-
-tesseract-ocr-for-php is released under the [MIT License][].
-
-
-<h2></h2><p align="center"><sub>Made with <sub><a href="#"><img src="https://thiagoalessio.github.io/tesseract-ocr-for-php/images/heart.svg" alt="love" width="14px"/></a></sub> in Berlin</sub></p>
-
-[ci_badge]: https://github.com/thiagoalessio/tesseract-ocr-for-php/workflows/CI/badge.svg?event=push&branch=main
-[ci]: https://github.com/thiagoalessio/tesseract-ocr-for-php/actions?query=workflow%3ACI
-[appveyor_badge]: https://ci.appveyor.com/api/projects/status/xwy5ls0798iwcim3/branch/main?svg=true
-[appveyor]: https://ci.appveyor.com/project/thiagoalessio/tesseract-ocr-for-php/branch/main
-[codacy_badge]: https://app.codacy.com/project/badge/Grade/a81aa10012874f23a57df5b492d835f2
-[codacy]: https://www.codacy.com/gh/thiagoalessio/tesseract-ocr-for-php/dashboard
-[test_coverage_badge]: https://codecov.io/gh/thiagoalessio/tesseract-ocr-for-php/branch/main/graph/badge.svg?token=Y0VnrqiSIf
-[test_coverage]: https://codecov.io/gh/thiagoalessio/tesseract-ocr-for-php
-[stable_version_badge]: https://img.shields.io/packagist/v/thiagoalessio/tesseract_ocr.svg
-[packagist]: https://packagist.org/packages/thiagoalessio/tesseract_ocr
-[total_downloads_badge]: https://img.shields.io/packagist/dt/thiagoalessio/tesseract_ocr.svg
-[monthly_downloads_badge]: https://img.shields.io/packagist/dm/thiagoalessio/tesseract_ocr.svg
-[Tesseract OCR]: https://github.com/tesseract-ocr/tesseract
-[Composer]: http://getcomposer.org/
-[windows_icon]: https://thiagoalessio.github.io/tesseract-ocr-for-php/images/windows-18.svg
-[macos_icon]: https://thiagoalessio.github.io/tesseract-ocr-for-php/images/apple-18.svg
-[tesseract_installation_on_windows]: https://github.com/tesseract-ocr/tesseract/wiki#windows
-[Capture2Text]: https://chocolatey.org/packages/capture2text
-[Chocolatey]: https://chocolatey.org
-[MacPorts]: https://www.macports.org
-[Homebrew]: https://brew.sh
-[@daijiale]: https://github.com/daijiale
-[HOCR]: https://github.com/tesseract-ocr/tesseract/wiki/Command-Line-Usage#hocr-output
-[TSV]: https://github.com/tesseract-ocr/tesseract/wiki/Command-Line-Usage#tsv-output-currently-available-in-305-dev-in-master-branch-on-github
-[Issue]: https://github.com/thiagoalessio/tesseract-ocr-for-php/issues
-[Pull Request]: https://github.com/thiagoalessio/tesseract-ocr-for-php/pulls
-[Code of Conduct]: https://github.com/thiagoalessio/tesseract-ocr-for-php/blob/main/.github/CODE_OF_CONDUCT.md
-[Contributing]: https://github.com/thiagoalessio/tesseract-ocr-for-php/blob/main/.github/CONTRIBUTING.md
-[MIT License]: https://github.com/thiagoalessio/tesseract-ocr-for-php/blob/main/MIT-LICENSE
diff --git a/tesseract/vendor/thiagoalessio/tesseract_ocr/codecov.yml b/tesseract/vendor/thiagoalessio/tesseract_ocr/codecov.yml
deleted file mode 100644
index 8fd4c921..00000000
--- a/tesseract/vendor/thiagoalessio/tesseract_ocr/codecov.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-fixes:
-- "/home/runner/work/tesseract-ocr-for-php/tesseract-ocr-for-php/::"
-- "/Users/runner/work/tesseract-ocr-for-php/tesseract-ocr-for-php/::"
-- "C:\\projects\\tesseract-ocr-for-php\\::"
diff --git a/tesseract/vendor/thiagoalessio/tesseract_ocr/composer.json b/tesseract/vendor/thiagoalessio/tesseract_ocr/composer.json
deleted file mode 100644
index 9a07e6d5..00000000
--- a/tesseract/vendor/thiagoalessio/tesseract_ocr/composer.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-	"name": "thiagoalessio/tesseract_ocr",
-	"description": "A wrapper to work with Tesseract OCR inside PHP.",
-	"version": "2.13.0",
-	"type": "library",
-	"keywords": ["Tesseract", "OCR", "text recognition"],
-	"license": "MIT",
-	"authors": [
-		{
-			"name": "thiagoalessio",
-			"email": "thiagoalessio@me.com"
-		}
-	],
-	"support": {
-		"issues": "https://github.com/thiagoalessio/tesseract-ocr-for-php/issues",
-		"irc": "irc://irc.freenode.net/tesseract-ocr-for-php",
-		"source": "https://github.com/thiagoalessio/tesseract-ocr-for-php"
-	},
-	"require": {
-		"php": "^5.3 || ^7.0 || ^8.0"
-	},
-	"require-dev": {
-		"phpunit/php-code-coverage": "^2.2.4 || ^9.0.0"
-	},
-	"autoload": {
-		"psr-4": {
-			"thiagoalessio\\TesseractOCR\\": "src/"
-		}
-	},
-	"autoload-dev": {
-		"psr-4": {
-			"thiagoalessio\\TesseractOCR\\Tests\\": "tests/"
-		}
-	}
-}
diff --git a/tesseract/vendor/thiagoalessio/tesseract_ocr/src/Command.php b/tesseract/vendor/thiagoalessio/tesseract_ocr/src/Command.php
deleted file mode 100644
index ad123e82..00000000
--- a/tesseract/vendor/thiagoalessio/tesseract_ocr/src/Command.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php namespace thiagoalessio\TesseractOCR;
-
-class Command
-{
-	public $executable = 'tesseract';
-	public $useFileAsInput = true;
-	public $useFileAsOutput = true;
-	public $options = array();
-	public $configFile;
-	public $tempDir;
-	public $threadLimit;
-	public $image;
-	public $imageSize;
-	private $outputFile;
-
-	public function __construct($image=null, $outputFile=null)
-	{
-		$this->image = $image;
-		$this->outputFile = $outputFile;
-	}
-
-	public function build() { return "$this"; }
-
-	public function __toString()
-	{
-		$cmd = array();
-		if ($this->threadLimit) $cmd[] = "OMP_THREAD_LIMIT={$this->threadLimit}";
-		$cmd[] = self::escape($this->executable);
-		$cmd[] = $this->useFileAsInput ? self::escape($this->image) : "-";
-		$cmd[] = $this->useFileAsOutput ? self::escape($this->getOutputFile(false)) : "-";
-
-		$version = $this->getTesseractVersion();
-
-		foreach ($this->options as $option) {
-			$cmd[] = is_callable($option) ? $option($version) : "$option";
-		}
-		if ($this->configFile) $cmd[] = $this->configFile;
-
-		return join(' ', $cmd);
-	}
-
-	public function getOutputFile($withExt=true)
-	{
-		if (!$this->outputFile)
-			$this->outputFile = $this->getTempDir()
-				.DIRECTORY_SEPARATOR
-				.basename(tempnam($this->getTempDir(), 'ocr'));
-		if (!$withExt) return $this->outputFile;
-
-		$hasCustomExt = array('hocr', 'tsv', 'pdf');
-		$ext = in_array($this->configFile, $hasCustomExt) ? $this->configFile : 'txt';
-		return "{$this->outputFile}.{$ext}";
-	}
-
-	public function getTempDir()
-	{
-		return $this->tempDir ?: sys_get_temp_dir();
-	}
-
-	public function getTesseractVersion()
-	{
-		exec(self::escape($this->executable).' --version 2>&1', $output);
-		$outputParts = explode(' ', $output[0]);
-		return $outputParts[1];
-	}
-
-	public function getAvailableLanguages()
-	{
-		exec(self::escape($this->executable) . ' --list-langs 2>&1', $output);
-		array_shift($output);
-		sort($output);
-		return $output;
-	}
-
-	public static function escape($str)
-	{
-		$charlist = strtoupper(substr(PHP_OS, 0, 3)) == 'WIN' ? '$"`' : '$"\\`';
-		return '"'.addcslashes($str, $charlist).'"';
-	}
-}
diff --git a/tesseract/vendor/thiagoalessio/tesseract_ocr/src/FeatureNotAvailableException.php b/tesseract/vendor/thiagoalessio/tesseract_ocr/src/FeatureNotAvailableException.php
deleted file mode 100644
index 12264f5c..00000000
--- a/tesseract/vendor/thiagoalessio/tesseract_ocr/src/FeatureNotAvailableException.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-namespace thiagoalessio\TesseractOCR;
-
-class FeatureNotAvailableException extends TesseractOcrException
-{
-}
diff --git a/tesseract/vendor/thiagoalessio/tesseract_ocr/src/FriendlyErrors.php b/tesseract/vendor/thiagoalessio/tesseract_ocr/src/FriendlyErrors.php
deleted file mode 100644
index 93c7caa9..00000000
--- a/tesseract/vendor/thiagoalessio/tesseract_ocr/src/FriendlyErrors.php
+++ /dev/null
@@ -1,120 +0,0 @@
-<?php namespace thiagoalessio\TesseractOCR;
-
-class FriendlyErrors
-{
-	public static function checkImagePath($image)
-	{
-		if (file_exists($image)) return;
-
-		$currentDir = __DIR__;
-		$msg = array();
-		$msg[] = "Error! The image \"$image\" was not found.";
-		$msg[] = '';
-		$msg[] = "The current __DIR__ is $currentDir";
-		$msg = join(PHP_EOL, $msg);
-
-		throw new ImageNotFoundException($msg);
-	}
-
-	public static function checkTesseractPresence($executable)
-	{
-		if (file_exists($executable)) return;
-
-		$cmd = stripos(PHP_OS, 'win') === 0
-			? 'where.exe '.Command::escape($executable).' > NUL 2>&1'
-			: 'type '.Command::escape($executable).' > /dev/null 2>&1';
-		system($cmd, $exitCode);
-
-		if ($exitCode == 0) return;
-
-		$currentPath = getenv('PATH');
-		$msg = array();
-		$msg[] = "Error! The command \"$executable\" was not found.";
-		$msg[] = '';
-		$msg[] = 'Make sure you have Tesseract OCR installed on your system:';
-		$msg[] = 'https://github.com/tesseract-ocr/tesseract';
-		$msg[] = '';
-		$msg[] = "The current \$PATH is $currentPath";
-		$msg = join(PHP_EOL, $msg);
-
-		throw new TesseractNotFoundException($msg);
-	}
-
-	public static function checkCommandExecution($command, $stdout, $stderr)
-	{
-		if ($command->useFileAsOutput) {
-		    $file = $command->getOutputFile();
-		    if (file_exists($file) && filesize($file) > 0)  return;
-		}
-
-		if (!$command->useFileAsOutput && $stdout) {
-			return;
-		}
-
-		$msg = array();
-		$msg[] = 'Error! The command did not produce any output.';
-		$msg[] = '';
-		$msg[] = 'Generated command:';
-		$msg[] = "$command";
-		$msg[] = '';
-		$msg[] = 'Returned message:';
-		$arrayStderr = explode(PHP_EOL, $stderr);
-		array_pop($arrayStderr);
-		$msg = array_merge($msg, $arrayStderr);
-		$msg = join(PHP_EOL, $msg);
-
-		throw new UnsuccessfulCommandException($msg);
-	}
-
-	public static function checkProcessCreation($processHandle, $command)
-	{
-		if ($processHandle !== FALSE) return;
-
-		$msg = array();
-		$msg[] = 'Error! The command could not be launched.';
-		$msg[] = '';
-		$msg[] = 'Generated command:';
-		$msg[] = "$command";
-		$msg = join(PHP_EOL, $msg);
-
-		throw new UnsuccessfulCommandException($msg);
-	}
-
-	public static function checkTesseractVersion($expected, $action, $command)
-	{
-		$actual = $command->getTesseractVersion();
-
-		if ($actual[0] === 'v')
-			$actual = substr($actual, 1);
-
-		if (version_compare($actual, $expected, ">=")) return;
-
-		$msg = array();
-		$msg[] = "Error! $action is not available this tesseract version";
-		$msg[] = "Required version is $expected, actual version is $actual";
-		$msg[] = '';
-		$msg[] = 'Generated command:';
-		$msg[] = "$command";
-		$msg = join(PHP_EOL, $msg);
-
-		throw new FeatureNotAvailableException($msg);
-	}
-
-	public static function checkWritePermissions($path)
-	{
-		if (!is_dir(dirname($path))) mkdir(dirname($path));
-		$writableDirectory = is_writable(dirname($path));
-		$writableFile = true;
-		if (file_exists($path)) $writableFile = is_writable($path);
-		if ($writableFile && $writableDirectory) return;
-
-		$msg = array();
-		$msg[] = "Error! No permission to write to $path";
-		$msg[] = "Make sure you have the right outputFile and permissions "
-			."to write to the folder";
-		$msg[] = '';
-		$msg = join(PHP_EOL, $msg);
-
-		throw new NoWritePermissionsForOutputFile($msg);
-	}
-}
diff --git a/tesseract/vendor/thiagoalessio/tesseract_ocr/src/ImageNotFoundException.php b/tesseract/vendor/thiagoalessio/tesseract_ocr/src/ImageNotFoundException.php
deleted file mode 100644
index 2ba7df64..00000000
--- a/tesseract/vendor/thiagoalessio/tesseract_ocr/src/ImageNotFoundException.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-namespace thiagoalessio\TesseractOCR;
-
-class ImageNotFoundException extends TesseractOcrException
-{
-}
diff --git a/tesseract/vendor/thiagoalessio/tesseract_ocr/src/NoWritePermissionsForOutputFile.php b/tesseract/vendor/thiagoalessio/tesseract_ocr/src/NoWritePermissionsForOutputFile.php
deleted file mode 100644
index 792a44e2..00000000
--- a/tesseract/vendor/thiagoalessio/tesseract_ocr/src/NoWritePermissionsForOutputFile.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-namespace thiagoalessio\TesseractOCR;
-
-class NoWritePermissionsForOutputFile extends TesseractOcrException
-{
-}
diff --git a/tesseract/vendor/thiagoalessio/tesseract_ocr/src/Option.php b/tesseract/vendor/thiagoalessio/tesseract_ocr/src/Option.php
deleted file mode 100644
index f39782e5..00000000
--- a/tesseract/vendor/thiagoalessio/tesseract_ocr/src/Option.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php namespace thiagoalessio\TesseractOCR;
-
-class Option
-{
-	public static function psm($psm)
-	{
-		return function($version) use ($psm) {
-			$version = preg_replace('/^v/', '', $version);
-			return (version_compare($version, 4, '>=') ? '-' : '')."-psm $psm";
-		};
-	}
-
-	public static function oem($oem)
-	{
-		return function($version) use ($oem) {
-			Option::checkMinVersion('3.05', $version, 'oem');
-			return "--oem $oem";
-		};
-	}
-
-	public static function dpi($dpi)
-	{
-		return function() use ($dpi) {
-			return "--dpi $dpi";
-		};
-	}
-
-	public static function userWords($path)
-	{
-		return function($version) use ($path) {
-			Option::checkMinVersion('3.04', $version, 'user-words');
-			return '--user-words "'.addcslashes($path, '\\"').'"';
-		};
-	}
-
-	public static function userPatterns($path)
-	{
-		return function($version) use ($path) {
-			Option::checkMinVersion('3.04', $version, 'user-patterns');
-			return '--user-patterns "'.addcslashes($path, '\\"').'"';
-		};
-	}
-
-	public static function tessdataDir($path)
-	{
-		return function() use ($path) {
-			return '--tessdata-dir "'.addcslashes($path, '\\"').'"';
-		};
-	}
-
-	public static function lang()
-	{
-		$languages = func_get_args();
-		return function() use ($languages) {
-			return '-l '.join('+', $languages);
-		};
-	}
-
-	public static function config($var, $value)
-	{
-		return function() use($var, $value) {
-			$snakeCase = function($str) {
-				return strtolower(preg_replace('/([A-Z])+/', '_$1', $str));
-			};
-			$pair = $snakeCase($var).'='.$value;
-			return '-c "'.addcslashes($pair, '\\"').'"';
-		};
-	}
-
-	public static function checkMinVersion($minVersion, $currVersion, $option)
-	{
-		$minVersion = preg_replace('/^v/', '', $minVersion);
-		$currVersion = preg_replace('/^v/', '', $currVersion);
-		if (!version_compare($currVersion, $minVersion, '<')) return;
-		$msg = "$option option is only available on Tesseract $minVersion or later.";
-		$msg.= PHP_EOL."Your version of Tesseract is $currVersion";
-		throw new \Exception($msg);
-	}
-}
diff --git a/tesseract/vendor/thiagoalessio/tesseract_ocr/src/Process.php b/tesseract/vendor/thiagoalessio/tesseract_ocr/src/Process.php
deleted file mode 100644
index 38460eb0..00000000
--- a/tesseract/vendor/thiagoalessio/tesseract_ocr/src/Process.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php namespace thiagoalessio\TesseractOCR;
-
-class Process {
-
-    private $stdin;
-    private $stdout;
-    private $stderr;
-    private $handle;
-    private $startTime;
-
-    public function __construct($command)
-    {
-        $this->startTime = microtime(true);
-        $streamDescriptors = [
-            array("pipe", "r"),
-            array("pipe", "w"),
-            array("pipe", "w")
-        ];
-        $this->handle = proc_open($command, $streamDescriptors, $pipes, NULL, NULL, ["bypass_shell" => true]);
-        list($this->stdin, $this->stdout, $this->stderr) = $pipes;
-
-        FriendlyErrors::checkProcessCreation($this->handle, $command);
-
-        //This is can avoid deadlock on some cases (when stderr buffer is filled up before writing to stdout and vice-versa)
-        stream_set_blocking($this->stdout, 0);
-        stream_set_blocking($this->stderr, 0);
-    }
-
-    public function write($data, $len)
-    {
-        $total = 0;
-        do
-        {
-            $res = fwrite($this->stdin, substr($data, $total));
-        } while($res && $total += $res < $len);
-        return $total === $len;
-    }
-
-
-    public function wait($timeout = 0)
-    {
-        $running = true;
-        $data = ["out" => "", "err" => ""];
-        while (($running === true) && !$this->hasTimedOut($timeout))
-        {
-            $data["out"] .= fread($this->stdout, 8192);
-            $data["err"] .= fread($this->stderr, 8192);
-            $procInfo = proc_get_status($this->handle);
-            $running = $procInfo["running"];
-            if ($running) {
-                usleep(1000); // Sleep 1ms to yield CPU time
-            }
-        }
-        return $data;
-    }
-
-    public function close()
-    {
-        $this->closeStream($this->stdin);
-        $this->closeStream($this->stdout);
-        $this->closeStream($this->stderr);
-        return proc_close($this->handle);
-    }
-
-    public function closeStdin()
-    {
-        $this->closeStream($this->stdin);
-    }
-
-    private function hasTimedOut($timeout)
-    {
-        return (($timeout > 0) &&  ($this->startTime + $timeout < microtime(true)));    
-    }
-    
-    private function closeStream(&$stream)
-    {
-        if ($stream !== NULL)
-        {
-            fclose($stream);
-            $stream = NULL;
-        }
-    }
-}
diff --git a/tesseract/vendor/thiagoalessio/tesseract_ocr/src/TesseractNotFoundException.php b/tesseract/vendor/thiagoalessio/tesseract_ocr/src/TesseractNotFoundException.php
deleted file mode 100644
index 7b7f0c1e..00000000
--- a/tesseract/vendor/thiagoalessio/tesseract_ocr/src/TesseractNotFoundException.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-namespace thiagoalessio\TesseractOCR;
-
-class TesseractNotFoundException extends TesseractOcrException
-{
-}
diff --git a/tesseract/vendor/thiagoalessio/tesseract_ocr/src/TesseractOCR.php b/tesseract/vendor/thiagoalessio/tesseract_ocr/src/TesseractOCR.php
deleted file mode 100644
index 343e8ae8..00000000
--- a/tesseract/vendor/thiagoalessio/tesseract_ocr/src/TesseractOCR.php
+++ /dev/null
@@ -1,181 +0,0 @@
-<?php namespace thiagoalessio\TesseractOCR;
-
-use thiagoalessio\TesseractOCR\Command;
-use thiagoalessio\TesseractOCR\Option;
-use thiagoalessio\TesseractOCR\FriendlyErrors;
-
-class TesseractOCR
-{
-	public $command;
-	private $outputFile = null;
-
-	public function __construct($image=null, $command=null)
-	{
-		$this->command = $command ?: new Command;
-		$this->image("$image");
-	}
-
-	public function run($timeout = 0)
-	{
-		try {
-			if ($this->outputFile !== null) {
-				FriendlyErrors::checkWritePermissions($this->outputFile);
-				$this->command->useFileAsOutput = true;
-			}
-
-			FriendlyErrors::checkTesseractPresence($this->command->executable);
-			if ($this->command->useFileAsInput) {
-				FriendlyErrors::checkImagePath($this->command->image);
-			}
-
-			$process = new Process("{$this->command}");
-
-			if (!$this->command->useFileAsInput) {
-				$process->write($this->command->image, $this->command->imageSize);
-				$process->closeStdin();
-			}
-			$output = $process->wait($timeout);
-
-			FriendlyErrors::checkCommandExecution($this->command, $output["out"], $output["err"]);
-		}
-		catch (TesseractOcrException $e) {
-			if ($this->command->useFileAsOutput) $this->cleanTempFiles();
-			throw $e;
-		}
-
-		if ($this->command->useFileAsOutput) {
-			$text = file_get_contents($this->command->getOutputFile());
-
-			if ($this->outputFile !== null) {
-				rename($this->command->getOutputFile(), $this->outputFile);
-			}
-
-			$this->cleanTempFiles();
-		}
-		else
-			$text = $output["out"];
-
-		return trim($text, " \t\n\r\0\x0A\x0B\x0C");
-	}
-
-	public function imageData($image, $size)
-	{
-		FriendlyErrors::checkTesseractVersion("3.03-rc1", "Reading image data from stdin", $this->command);
-		$this->command->useFileAsInput = false;
-		$this->command->image = $image;
-		$this->command->imageSize = $size;
-		return $this;
-	}
-
-	public function withoutTempFiles()
-	{
-		FriendlyErrors::checkTesseractVersion("3.03-rc1", "Writing to stdout (without using temp files)", $this->command);
-		$this->command->useFileAsOutput = false;
-		return $this;
-	}
-
-	public function image($image)
-	{
-		$this->command->image = $image;
-		return $this;
-	}
-
-	public function executable($executable)
-	{
-		FriendlyErrors::checkTesseractPresence($executable);
-		$this->command->executable = $executable;
-		return $this;
-	}
-
-	public function configFile($configFile)
-	{
-		$this->command->configFile = $configFile;
-		return $this;
-	}
-
-	public function tempDir($tempDir)
-	{
-		$this->command->tempDir = $tempDir;
-		return $this;
-	}
-
-	public function threadLimit($limit)
-	{
-		$this->command->threadLimit = $limit;
-		return $this;
-	}
-
-	// @deprecated
-	public function format($fmt) { return $this->configFile($fmt); }
-
-	public function setOutputFile($path) {
-		$this->outputFile = $path;
-		return $this;
-	}
-
-	public function allowlist()
-	{
-		$concat = function ($arg) { return is_array($arg) ? join('', $arg) : $arg; };
-		$allowlist = join('', array_map($concat, func_get_args()));
-		$this->command->options[] = Option::config('tessedit_char_whitelist', $allowlist);
-		return $this;
-	}
-
-	public function whitelist()
-	{
-		$warningMsg = 'Notice: whitelist is deprecated, use allowlist instead.';
-		trigger_error($warningMsg, E_USER_NOTICE);
-
-		$concat = function ($arg) { return is_array($arg) ? join('', $arg) : $arg; };
-		$allowlist = join('', array_map($concat, func_get_args()));
-		return $this->allowlist($allowlist);
-	}
-
-	public function version()
-	{
-		return $this->command->getTesseractVersion();
-	}
-
-	public function availableLanguages()
-	{
-		return $this->command->getAvailableLanguages();
-	}
-
-	public function __call($method, $args)
-	{
-		if ($this->isConfigFile($method)) return $this->configFile($method);
-		if ($this->isOption($method)) {
-			$option = $this->getOptionClassName().'::'.$method;
-			$this->command->options[] = call_user_func_array($option, $args);
-			return $this;
-		}
-		$arg = empty($args) ? null : $args[0];
-		$this->command->options[] = Option::config($method, $arg);
-		return $this;
-	}
-
-	private function isConfigFile($name)
-	{
-		return in_array($name, array('digits', 'hocr', 'pdf', 'quiet', 'tsv', 'txt'));
-	}
-
-	private function isOption($name)
-	{
-		return in_array($name, get_class_methods($this->getOptionClassName()));
-	}
-
-	private function getOptionClassName()
-	{
-		return __NAMESPACE__.'\\Option';
-	}
-
-	private function cleanTempFiles()
-	{
-		if (file_exists($this->command->getOutputFile(false))) {
-			unlink($this->command->getOutputFile(false));
-		}
-		if (file_exists($this->command->getOutputFile(true))) {
-			unlink($this->command->getOutputFile(true));
-		}
-	}
-}
diff --git a/tesseract/vendor/thiagoalessio/tesseract_ocr/src/TesseractOcrException.php b/tesseract/vendor/thiagoalessio/tesseract_ocr/src/TesseractOcrException.php
deleted file mode 100644
index 8c078616..00000000
--- a/tesseract/vendor/thiagoalessio/tesseract_ocr/src/TesseractOcrException.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-namespace thiagoalessio\TesseractOCR;
-
-abstract class TesseractOcrException extends \Exception
-{
-}
diff --git a/tesseract/vendor/thiagoalessio/tesseract_ocr/src/UnsuccessfulCommandException.php b/tesseract/vendor/thiagoalessio/tesseract_ocr/src/UnsuccessfulCommandException.php
deleted file mode 100644
index 201b3524..00000000
--- a/tesseract/vendor/thiagoalessio/tesseract_ocr/src/UnsuccessfulCommandException.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-namespace thiagoalessio\TesseractOCR;
-
-class UnsuccessfulCommandException extends TesseractOcrException
-{
-}
diff --git a/testdrive/README.md b/testdrive/README.md
index 675f64e2..59512aef 100644
--- a/testdrive/README.md
+++ b/testdrive/README.md
@@ -6,14 +6,12 @@ Testdrive is a Friendica addon which implements automatic account expiration so
 
 When an account is created on the site, it is given a hard expiration date of
 
-	return [
-		'testdrive' => [
-			'expiredays' => 30,
-		],
-	];
+	'testdrive' => [
+		'expiredays' => 30,
+	],
 
-Set this in your `config/testdrive.config.php` file to allow a 30-day test drive period.
-By default, no expiration period is defined in case the addon is activated accidentally.
+Set this in your `config/addon.config.php` file to allow a 30 day test drive period.
+By default no expiration period is defined in case the addon is activated accidentally.
 
 There is no opportunity to extend an expired account using this addon.
 Expiration is final.
diff --git a/testdrive/config/testdrive.config.php b/testdrive/config/testdrive.config.php
index f4b1dc0f..c10acf82 100644
--- a/testdrive/config/testdrive.config.php
+++ b/testdrive/config/testdrive.config.php
@@ -1,7 +1,7 @@
 <?php
 
 // Warning: Don't change this file! It only holds the default config values for this addon.
-// Instead, copy this file to config/testdrive.config.php in your Friendica directory and set the correct values there
+// Instead overwrite these config values in config/addon.config.php in your Friendica directory
 
 return [
 	'testdrive' => [
diff --git a/testdrive/lang/C/messages.po b/testdrive/lang/C/messages.po
index 36bb8069..d450b2bc 100644
--- a/testdrive/lang/C/messages.po
+++ b/testdrive/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
+"POT-Creation-Date: 2015-08-23 17:30+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,20 +17,20 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: testdrive.php:64
+#: testdrive.php:67
 msgid "Administrator"
 msgstr ""
 
-#: testdrive.php:89
+#: testdrive.php:94
 #, php-format
 msgid "Your account on %s will expire in a few days."
 msgstr ""
 
-#: testdrive.php:90
+#: testdrive.php:95
 msgid "Your Friendica test account is about to expire."
 msgstr ""
 
-#: testdrive.php:91
+#: testdrive.php:96
 #, php-format
 msgid ""
 "Hi %1$s,\n"
@@ -40,5 +40,5 @@ msgid ""
 "Friendica website for your integrated social communications. A list of "
 "public sites is available at %s/siteinfo - and for more information on "
 "setting up your own Friendica server please see the Friendica project "
-"website at https://friendi.ca."
+"website at http://friendica.com."
 msgstr ""
diff --git a/testdrive/lang/ar/messages.po b/testdrive/lang/ar/messages.po
deleted file mode 100644
index 0115c16b..00000000
--- a/testdrive/lang/ar/messages.po
+++ /dev/null
@@ -1,40 +0,0 @@
-# ADDON testdrive
-# Copyright (C)
-# This file is distributed under the same license as the Friendica testdrive addon package.
-# 
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2021-02-01 18:21+0000\n"
-"Last-Translator: Transifex Bot <>\n"
-"Language-Team: Arabic (http://www.transifex.com/Friendica/friendica/language/ar/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ar\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-
-#: testdrive.php:64
-msgid "Administrator"
-msgstr ""
-
-#: testdrive.php:89
-#, php-format
-msgid "Your account on %s will expire in a few days."
-msgstr ""
-
-#: testdrive.php:90
-msgid "Your Friendica test account is about to expire."
-msgstr ""
-
-#: testdrive.php:91
-#, php-format
-msgid ""
-"Hi %1$s,\n"
-"\n"
-"Your test account on %2$s will expire in less than five days. We hope you enjoyed this test drive and use this opportunity to find a permanent Friendica website for your integrated social communications. A list of public sites is available at %s/siteinfo - and for more information on setting up your own Friendica server please see the Friendica project website at https://friendi.ca."
-msgstr ""
diff --git a/testdrive/lang/ar/strings.php b/testdrive/lang/ar/strings.php
deleted file mode 100644
index eea34dd6..00000000
--- a/testdrive/lang/ar/strings.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_ar")) {
-function string_plural_select_ar($n){
-	$n = intval($n);
-	if ($n==0) { return 0; } else if ($n==1) { return 1; } else if ($n==2) { return 2; } else if ($n%100>=3 && $n%100<=10) { return 3; } else if ($n%100>=11 && $n%100<=99) { return 4; } else  { return 5; }
-}}
diff --git a/testdrive/lang/cs/messages.po b/testdrive/lang/cs/messages.po
index 1640875d..ec29d51d 100644
--- a/testdrive/lang/cs/messages.po
+++ b/testdrive/lang/cs/messages.po
@@ -4,39 +4,38 @@
 # 
 # 
 # Translators:
-# Aditoo, 2018
-# michal_s <msupler@gmail.com>, 2014
+# Michal Šupler <msupler@gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2014-06-23 12:56+0000\n"
-"Last-Translator: Aditoo, 2018\n"
-"Language-Team: Czech (http://app.transifex.com/Friendica/friendica/language/cs/)\n"
+"POT-Creation-Date: 2014-06-23 14:45+0200\n"
+"PO-Revision-Date: 2014-07-28 18:16+0000\n"
+"Last-Translator: Michal Šupler <msupler@gmail.com>\n"
+"Language-Team: Czech (http://www.transifex.com/projects/p/friendica/language/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: cs\n"
-"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: testdrive.php:64
+#: testdrive.php:67
 msgid "Administrator"
 msgstr "Administrátor"
 
-#: testdrive.php:89
+#: testdrive.php:94
 #, php-format
 msgid "Your account on %s will expire in a few days."
 msgstr "Platnost Vašeho účtu na %s vyprší během několika dní."
 
-#: testdrive.php:90
+#: testdrive.php:95
 msgid "Your Friendica test account is about to expire."
-msgstr "Váš testovací účet na Friendica brzy vyprší."
+msgstr "Váš Friendica testovací účet brzy vyprší."
 
-#: testdrive.php:91
+#: testdrive.php:96
 #, php-format
 msgid ""
 "Hi %1$s,\n"
 "\n"
-"Your test account on %2$s will expire in less than five days. We hope you enjoyed this test drive and use this opportunity to find a permanent Friendica website for your integrated social communications. A list of public sites is available at %s/siteinfo - and for more information on setting up your own Friendica server please see the Friendica project website at https://friendi.ca."
-msgstr ""
+"Your test account on %2$s will expire in less than five days. We hope you enjoyed this test drive and use this opportunity to find a permanent Friendica website for your integrated social communications. A list of public sites is available at http://dir.friendica.com/siteinfo - and for more information on setting up your own Friendica server please see the Friendica project website at http://friendica.com."
+msgstr "Ahoj %1$s,\n\nplatnost Vašeho testovacího účtu na %2$s vyprší za méně než 5 dní. Doufáme, že jste si testovací jízdu užili a že se Vám povedlo najít trvalý Friendica server pro Vaši integrovanou sociální komunikaci. List veřejně dostupných serverů je k dispozici na http://dir.friendica.com/siteinfo - a pro více informací, jak si vytvořit svůj vlastní server, navštivte stránky projektu Friendica na adrese http://friendica.com."
diff --git a/testdrive/lang/cs/strings.php b/testdrive/lang/cs/strings.php
index cc68b58b..d2d36aab 100644
--- a/testdrive/lang/cs/strings.php
+++ b/testdrive/lang/cs/strings.php
@@ -2,9 +2,10 @@
 
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
-	$n = intval($n);
-	if (($n == 1 && $n % 1 == 0)) { return 0; } else if (($n >= 2 && $n <= 4 && $n % 1 == 0)) { return 1; } else if (($n % 1 != 0 )) { return 2; } else  { return 3; }
+	return ($n==1) ? 0 : ($n>=2 && $n<=4) ? 1 : 2;;
 }}
-$a->strings['Administrator'] = 'Administrátor';
-$a->strings['Your account on %s will expire in a few days.'] = 'Platnost Vašeho účtu na %s vyprší během několika dní.';
-$a->strings['Your Friendica test account is about to expire.'] = 'Váš testovací účet na Friendica brzy vyprší.';
+;
+$a->strings["Administrator"] = "Administrátor";
+$a->strings["Your account on %s will expire in a few days."] = "Platnost Vašeho účtu na %s vyprší během několika dní.";
+$a->strings["Your Friendica test account is about to expire."] = "Váš Friendica testovací účet brzy vyprší.";
+$a->strings["Hi %1\$s,\n\nYour test account on %2\$s will expire in less than five days. We hope you enjoyed this test drive and use this opportunity to find a permanent Friendica website for your integrated social communications. A list of public sites is available at http://dir.friendica.com/siteinfo - and for more information on setting up your own Friendica server please see the Friendica project website at http://friendica.com."] = "Ahoj %1\$s,\n\nplatnost Vašeho testovacího účtu na %2\$s vyprší za méně než 5 dní. Doufáme, že jste si testovací jízdu užili a že se Vám povedlo najít trvalý Friendica server pro Vaši integrovanou sociální komunikaci. List veřejně dostupných serverů je k dispozici na http://dir.friendica.com/siteinfo - a pro více informací, jak si vytvořit svůj vlastní server, navštivte stránky projektu Friendica na adrese http://friendica.com.";
diff --git a/testdrive/lang/da-dk/messages.po b/testdrive/lang/da-dk/messages.po
deleted file mode 100644
index a95f3c8b..00000000
--- a/testdrive/lang/da-dk/messages.po
+++ /dev/null
@@ -1,41 +0,0 @@
-# ADDON testdrive
-# Copyright (C)
-# This file is distributed under the same license as the Friendica testdrive addon package.
-# 
-# 
-# Translators:
-# Anton <dev@atjn.dk>, 2022
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2014-06-23 12:56+0000\n"
-"Last-Translator: Anton <dev@atjn.dk>, 2022\n"
-"Language-Team: Danish (Denmark) (http://www.transifex.com/Friendica/friendica/language/da_DK/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: da_DK\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: testdrive.php:64
-msgid "Administrator"
-msgstr "Administrator"
-
-#: testdrive.php:89
-#, php-format
-msgid "Your account on %s will expire in a few days."
-msgstr "Din konto på %s udløber om nogle få dage."
-
-#: testdrive.php:90
-msgid "Your Friendica test account is about to expire."
-msgstr "Din Friendica konto er tæt på at udløbe."
-
-#: testdrive.php:91
-#, php-format
-msgid ""
-"Hi %1$s,\n"
-"\n"
-"Your test account on %2$s will expire in less than five days. We hope you enjoyed this test drive and use this opportunity to find a permanent Friendica website for your integrated social communications. A list of public sites is available at %s/siteinfo - and for more information on setting up your own Friendica server please see the Friendica project website at https://friendi.ca."
-msgstr "Hej %1$s,\n\nDin testkonto på %2$s udløber om mindre end fem dage. Vi håber at du nød denne testkørsel og bruger denne lejlighed til at finde en permanent Friendica hjemmeside til dit online sociale liv. En liste af offentlige sider er tilgængelig på %s/siteinfo - og for mere information om at opsætte din egen Friendica server, se venligst Friendica-projektets hjemmeside: https://friendi.ca."
diff --git a/testdrive/lang/da-dk/strings.php b/testdrive/lang/da-dk/strings.php
deleted file mode 100644
index 259f405d..00000000
--- a/testdrive/lang/da-dk/strings.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_da_dk")) {
-function string_plural_select_da_dk($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Administrator'] = 'Administrator';
-$a->strings['Your account on %s will expire in a few days.'] = 'Din konto på %s udløber om nogle få dage.';
-$a->strings['Your Friendica test account is about to expire.'] = 'Din Friendica konto er tæt på at udløbe.';
-$a->strings['Hi %1$s,
-
-Your test account on %2$s will expire in less than five days. We hope you enjoyed this test drive and use this opportunity to find a permanent Friendica website for your integrated social communications. A list of public sites is available at %s/siteinfo - and for more information on setting up your own Friendica server please see the Friendica project website at https://friendi.ca.'] = 'Hej %1$s,
-
-Din testkonto på %2$s udløber om mindre end fem dage. Vi håber at du nød denne testkørsel og bruger denne lejlighed til at finde en permanent Friendica hjemmeside til dit online sociale liv. En liste af offentlige sider er tilgængelig på %s/siteinfo - og for mere information om at opsætte din egen Friendica server, se venligst Friendica-projektets hjemmeside: https://friendi.ca.';
diff --git a/testdrive/lang/de/messages.po b/testdrive/lang/de/messages.po
index 8d7e7977..d21c110f 100644
--- a/testdrive/lang/de/messages.po
+++ b/testdrive/lang/de/messages.po
@@ -4,39 +4,38 @@
 # 
 # 
 # Translators:
-# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2014-2015
-# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2021
+# bavatar <tobias.diekershoff@gmx.net>, 2014-2015
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2014-06-23 12:56+0000\n"
-"Last-Translator: Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2021\n"
-"Language-Team: German (http://app.transifex.com/Friendica/friendica/language/de/)\n"
+"POT-Creation-Date: 2015-08-23 17:30+0200\n"
+"PO-Revision-Date: 2015-08-24 10:59+0000\n"
+"Last-Translator: bavatar <tobias.diekershoff@gmx.net>\n"
+"Language-Team: German (http://www.transifex.com/Friendica/friendica/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: testdrive.php:64
+#: testdrive.php:67
 msgid "Administrator"
 msgstr "Administrator"
 
-#: testdrive.php:89
+#: testdrive.php:94
 #, php-format
 msgid "Your account on %s will expire in a few days."
 msgstr "Dein Konto auf %s wird in ein paar Tagen verfallen."
 
-#: testdrive.php:90
+#: testdrive.php:95
 msgid "Your Friendica test account is about to expire."
 msgstr "Dein Friendica-Testkonto wird bald verfallen."
 
-#: testdrive.php:91
+#: testdrive.php:96
 #, php-format
 msgid ""
 "Hi %1$s,\n"
 "\n"
-"Your test account on %2$s will expire in less than five days. We hope you enjoyed this test drive and use this opportunity to find a permanent Friendica website for your integrated social communications. A list of public sites is available at %s/siteinfo - and for more information on setting up your own Friendica server please see the Friendica project website at https://friendi.ca."
-msgstr "Hallo %1$s,\n\ndein Testkonto auf %2$s wird in weniger als fünf Tagen verfallen. Wir hoffen, dass dir dieser Testlauf gefallen hat, so dass du die Gelegenheit nutzt und dir einen normalen Friendica-Server für deine integrierte Social-Network-Kommunikation suchst. Eine Liste öffentlicher Server findest du auf %s/siteinfo . Um mehr Information darüber zu bekommen, wie man einen eigenen Friendica-Server aufsetzt, kannst du auch einen Blick auf die Friendica-Projektseite werfen: https://friendi.ca"
+"Your test account on %2$s will expire in less than five days. We hope you enjoyed this test drive and use this opportunity to find a permanent Friendica website for your integrated social communications. A list of public sites is available at %s/siteinfo - and for more information on setting up your own Friendica server please see the Friendica project website at http://friendica.com."
+msgstr "Hallo %1$s,\n\ndein Testkonto auf %2$s wird in weniger als fünf Tagen verfallen. Wir hoffen, dass dir dieser Testlauf gefallen hat, so dass du die Gelegenheit nutzt und dir einen normalen Friendica-Server für deine integrierte Social-Network-Kommunikation suchst. Eine Liste öffentlicher Server findest du auf %s/siteinfo . Um mehr Information darüber zu bekommen, wie man einen eigenen Friendica-Server aufsetzt, kannst du auch einen Blick auf die Friendica-Projektseite werfen: http://friendica.com"
diff --git a/testdrive/lang/de/strings.php b/testdrive/lang/de/strings.php
index 35596296..0ba2b035 100644
--- a/testdrive/lang/de/strings.php
+++ b/testdrive/lang/de/strings.php
@@ -2,14 +2,10 @@
 
 if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Administrator'] = 'Administrator';
-$a->strings['Your account on %s will expire in a few days.'] = 'Dein Konto auf %s wird in ein paar Tagen verfallen.';
-$a->strings['Your Friendica test account is about to expire.'] = 'Dein Friendica-Testkonto wird bald verfallen.';
-$a->strings['Hi %1$s,
-
-Your test account on %2$s will expire in less than five days. We hope you enjoyed this test drive and use this opportunity to find a permanent Friendica website for your integrated social communications. A list of public sites is available at %s/siteinfo - and for more information on setting up your own Friendica server please see the Friendica project website at https://friendi.ca.'] = 'Hallo %1$s,
-
-dein Testkonto auf %2$s wird in weniger als fünf Tagen verfallen. Wir hoffen, dass dir dieser Testlauf gefallen hat, so dass du die Gelegenheit nutzt und dir einen normalen Friendica-Server für deine integrierte Social-Network-Kommunikation suchst. Eine Liste öffentlicher Server findest du auf %s/siteinfo . Um mehr Information darüber zu bekommen, wie man einen eigenen Friendica-Server aufsetzt, kannst du auch einen Blick auf die Friendica-Projektseite werfen: https://friendi.ca';
+;
+$a->strings["Administrator"] = "Administrator";
+$a->strings["Your account on %s will expire in a few days."] = "Dein Konto auf %s wird in ein paar Tagen verfallen.";
+$a->strings["Your Friendica test account is about to expire."] = "Dein Friendica-Testkonto wird bald verfallen.";
+$a->strings["Hi %1\$s,\n\nYour test account on %2\$s will expire in less than five days. We hope you enjoyed this test drive and use this opportunity to find a permanent Friendica website for your integrated social communications. A list of public sites is available at %s/siteinfo - and for more information on setting up your own Friendica server please see the Friendica project website at http://friendica.com."] = "Hallo %1\$s,\n\ndein Testkonto auf %2\$s wird in weniger als fünf Tagen verfallen. Wir hoffen, dass dir dieser Testlauf gefallen hat, so dass du die Gelegenheit nutzt und dir einen normalen Friendica-Server für deine integrierte Social-Network-Kommunikation suchst. Eine Liste öffentlicher Server findest du auf %s/siteinfo . Um mehr Information darüber zu bekommen, wie man einen eigenen Friendica-Server aufsetzt, kannst du auch einen Blick auf die Friendica-Projektseite werfen: http://friendica.com";
diff --git a/testdrive/lang/es/messages.po b/testdrive/lang/es/messages.po
index 2065d01d..d19a907a 100644
--- a/testdrive/lang/es/messages.po
+++ b/testdrive/lang/es/messages.po
@@ -5,14 +5,13 @@
 # 
 # Translators:
 # Albert, 2016
-# Senex Petrovic <javierruizo@hotmail.com>, 2021
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2021-04-06 02:10+0000\n"
-"Last-Translator: Senex Petrovic <javierruizo@hotmail.com>\n"
+"POT-Creation-Date: 2015-08-23 17:30+0200\n"
+"PO-Revision-Date: 2016-11-18 11:58+0000\n"
+"Last-Translator: Albert\n"
 "Language-Team: Spanish (http://www.transifex.com/Friendica/friendica/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,23 +19,23 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: testdrive.php:64
+#: testdrive.php:67
 msgid "Administrator"
 msgstr "Administrador"
 
-#: testdrive.php:89
+#: testdrive.php:94
 #, php-format
 msgid "Your account on %s will expire in a few days."
 msgstr "Su cuenta de %s expirará en unos días."
 
-#: testdrive.php:90
+#: testdrive.php:95
 msgid "Your Friendica test account is about to expire."
 msgstr "Su cuenta de prueba de Friendica está a punto de expirar."
 
-#: testdrive.php:91
+#: testdrive.php:96
 #, php-format
 msgid ""
 "Hi %1$s,\n"
 "\n"
-"Your test account on %2$s will expire in less than five days. We hope you enjoyed this test drive and use this opportunity to find a permanent Friendica website for your integrated social communications. A list of public sites is available at %s/siteinfo - and for more information on setting up your own Friendica server please see the Friendica project website at https://friendi.ca."
-msgstr "Hi %1$s,\n\nTu cuenta de prueba en %2$s caducará en menos de cinco días. Esperamos que haya disfrutado de esta prueba y aproveche esta oportunidad para encontrar un sitio web permanente de Friendica para sus comunicaciones sociales integradas. Una lista de sitios públicos está disponible en%s/siteinfo - y para obtener más información sobre cómo configurar su propio servidor Friendica, consulte el sitio web del proyecto Friendica en https://friendi.ca."
+"Your test account on %2$s will expire in less than five days. We hope you enjoyed this test drive and use this opportunity to find a permanent Friendica website for your integrated social communications. A list of public sites is available at %s/siteinfo - and for more information on setting up your own Friendica server please see the Friendica project website at http://friendica.com."
+msgstr "Hola %1$s,\n\nSu cuenta de prueba de %2$s expirará en menos de cinco días. Esperamos que disfrute este drive de prueba y usar esta oportunidad para encontrar una página web permanente de Friendica para sus comunicaciones sociales integradas. Una lista de sitios públicos está disponible en %s/siteinfo - y para más información ajustando su servidor de Friendica por favor vea la página del proyecto de Friendica en http://friendica.com."
diff --git a/testdrive/lang/es/strings.php b/testdrive/lang/es/strings.php
index e26f7dd1..2292d3fd 100644
--- a/testdrive/lang/es/strings.php
+++ b/testdrive/lang/es/strings.php
@@ -2,14 +2,10 @@
 
 if(! function_exists("string_plural_select_es")) {
 function string_plural_select_es($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Administrator'] = 'Administrador';
-$a->strings['Your account on %s will expire in a few days.'] = 'Su cuenta de %s expirará en unos días.';
-$a->strings['Your Friendica test account is about to expire.'] = 'Su cuenta de prueba de Friendica está a punto de expirar.';
-$a->strings['Hi %1$s,
-
-Your test account on %2$s will expire in less than five days. We hope you enjoyed this test drive and use this opportunity to find a permanent Friendica website for your integrated social communications. A list of public sites is available at %s/siteinfo - and for more information on setting up your own Friendica server please see the Friendica project website at https://friendi.ca.'] = 'Hi %1$s,
-
-Tu cuenta de prueba en %2$s caducará en menos de cinco días. Esperamos que haya disfrutado de esta prueba y aproveche esta oportunidad para encontrar un sitio web permanente de Friendica para sus comunicaciones sociales integradas. Una lista de sitios públicos está disponible en%s/siteinfo - y para obtener más información sobre cómo configurar su propio servidor Friendica, consulte el sitio web del proyecto Friendica en https://friendi.ca.';
+;
+$a->strings["Administrator"] = "Administrador";
+$a->strings["Your account on %s will expire in a few days."] = "Su cuenta de %s expirará en unos días.";
+$a->strings["Your Friendica test account is about to expire."] = "Su cuenta de prueba de Friendica está a punto de expirar.";
+$a->strings["Hi %1\$s,\n\nYour test account on %2\$s will expire in less than five days. We hope you enjoyed this test drive and use this opportunity to find a permanent Friendica website for your integrated social communications. A list of public sites is available at %s/siteinfo - and for more information on setting up your own Friendica server please see the Friendica project website at http://friendica.com."] = "Hola %1\$s,\n\nSu cuenta de prueba de %2\$s expirará en menos de cinco días. Esperamos que disfrute este drive de prueba y usar esta oportunidad para encontrar una página web permanente de Friendica para sus comunicaciones sociales integradas. Una lista de sitios públicos está disponible en %s/siteinfo - y para más información ajustando su servidor de Friendica por favor vea la página del proyecto de Friendica en http://friendica.com.";
diff --git a/testdrive/lang/fi-fi/strings.php b/testdrive/lang/fi-fi/strings.php
index b8455b4d..f2942692 100644
--- a/testdrive/lang/fi-fi/strings.php
+++ b/testdrive/lang/fi-fi/strings.php
@@ -3,8 +3,10 @@
 if(! function_exists("string_plural_select_fi_fi")) {
 function string_plural_select_fi_fi($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Administrator'] = 'Ylläpitäjä';
-$a->strings['Your account on %s will expire in a few days.'] = '%s -tilisi vanhenee muutaman päivän kuluttua.';
-$a->strings['Your Friendica test account is about to expire.'] = 'Koetilisi Friendicassa umpeutuu kohta.';
+;
+$a->strings["Administrator"] = "Ylläpitäjä";
+$a->strings["Your account on %s will expire in a few days."] = "%s -tilisi vanhenee muutaman päivän kuluttua.";
+$a->strings["Your Friendica test account is about to expire."] = "Koetilisi Friendicassa umpeutuu kohta.";
+$a->strings["Hi %1\$s,\n\nYour test account on %2\$s will expire in less than five days. We hope you enjoyed this test drive and use this opportunity to find a permanent Friendica website for your integrated social communications. A list of public sites is available at %s/siteinfo - and for more information on setting up your own Friendica server please see the Friendica project website at http://friendica.com."] = "";
diff --git a/testdrive/lang/fr/messages.po b/testdrive/lang/fr/messages.po
deleted file mode 100644
index 7452d7d1..00000000
--- a/testdrive/lang/fr/messages.po
+++ /dev/null
@@ -1,43 +0,0 @@
-# ADDON testdrive
-# Copyright (C)
-# This file is distributed under the same license as the Friendica testdrive addon package.
-# 
-# 
-# Translators:
-# Hypolite Petovan <hypolite@mrpetovan.com>, 2022
-# Nicolas Derive, 2022
-# StefOfficiel <pichard.stephane@free.fr>, 2015
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2014-06-23 12:56+0000\n"
-"Last-Translator: Nicolas Derive, 2022\n"
-"Language-Team: French (http://www.transifex.com/Friendica/friendica/language/fr/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: fr\n"
-"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
-
-#: testdrive.php:64
-msgid "Administrator"
-msgstr "Administrateur"
-
-#: testdrive.php:89
-#, php-format
-msgid "Your account on %s will expire in a few days."
-msgstr "Votre compte sur %s va expirer dans quelques jours."
-
-#: testdrive.php:90
-msgid "Your Friendica test account is about to expire."
-msgstr "Votre compte Friendica de test est sur le point d'expirer."
-
-#: testdrive.php:91
-#, php-format
-msgid ""
-"Hi %1$s,\n"
-"\n"
-"Your test account on %2$s will expire in less than five days. We hope you enjoyed this test drive and use this opportunity to find a permanent Friendica website for your integrated social communications. A list of public sites is available at %s/siteinfo - and for more information on setting up your own Friendica server please see the Friendica project website at https://friendi.ca."
-msgstr "Bonjour %1$s,\n\nVotre compte de test sur %2$s va expirer dans moins de cinq jours. Nous espérons que vous avez apprécié cet essai et que vous utiliserez cette opportunité pour trouver un site Friendica permanent pour vos communications sociales intégrées. Une liste des sites publics est disponible sur %s/siteinfo et pour plus d'informations sur la mise en route de votre propre serveur Friendica, vous pouvez vous référer au site du projet Friendica sur https://friendi.ca."
diff --git a/testdrive/lang/fr/strings.php b/testdrive/lang/fr/strings.php
index 6029f8d9..ad625899 100644
--- a/testdrive/lang/fr/strings.php
+++ b/testdrive/lang/fr/strings.php
@@ -1,15 +1,5 @@
-<?php
-
-if(! function_exists("string_plural_select_fr")) {
-function string_plural_select_fr($n){
-	$n = intval($n);
-	if (($n == 0 || $n == 1)) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
-}}
-$a->strings['Administrator'] = 'Administrateur';
-$a->strings['Your account on %s will expire in a few days.'] = 'Votre compte sur %s va expirer dans quelques jours.';
-$a->strings['Your Friendica test account is about to expire.'] = 'Votre compte Friendica de test est sur le point d\'expirer.';
-$a->strings['Hi %1$s,
-
-Your test account on %2$s will expire in less than five days. We hope you enjoyed this test drive and use this opportunity to find a permanent Friendica website for your integrated social communications. A list of public sites is available at %s/siteinfo - and for more information on setting up your own Friendica server please see the Friendica project website at https://friendi.ca.'] = 'Bonjour %1$s,
-
-Votre compte de test sur %2$s va expirer dans moins de cinq jours. Nous espérons que vous avez apprécié cet essai et que vous utiliserez cette opportunité pour trouver un site Friendica permanent pour vos communications sociales intégrées. Une liste des sites publics est disponible sur %s/siteinfo et pour plus d\'informations sur la mise en route de votre propre serveur Friendica, vous pouvez vous référer au site du projet Friendica sur https://friendi.ca.';
+<?php
+
+$a->strings["Administrator"] = "Administrateur";
+$a->strings["Your account on %s will expire in a few days."] = "Votre compte chez %s va expirer dans quelques jours.";
+$a->strings["Your Friendica test account is about to expire."] = "Votre compte de test Friendica est sur le point d'expirer.";
diff --git a/testdrive/lang/hu/messages.po b/testdrive/lang/hu/messages.po
deleted file mode 100644
index 01da0030..00000000
--- a/testdrive/lang/hu/messages.po
+++ /dev/null
@@ -1,41 +0,0 @@
-# ADDON testdrive
-# Copyright (C)
-# This file is distributed under the same license as the Friendica testdrive addon package.
-# 
-# 
-# Translators:
-# Balázs Úr, 2020-2021
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2014-06-23 12:56+0000\n"
-"Last-Translator: Balázs Úr, 2020-2021\n"
-"Language-Team: Hungarian (http://www.transifex.com/Friendica/friendica/language/hu/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: hu\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: testdrive.php:64
-msgid "Administrator"
-msgstr "Adminisztrátor"
-
-#: testdrive.php:89
-#, php-format
-msgid "Your account on %s will expire in a few days."
-msgstr "A(z) %s oldalon lévő fiókja néhány napon belül le fog járni."
-
-#: testdrive.php:90
-msgid "Your Friendica test account is about to expire."
-msgstr "A Friendica tesztfiókja hamarosan lejár."
-
-#: testdrive.php:91
-#, php-format
-msgid ""
-"Hi %1$s,\n"
-"\n"
-"Your test account on %2$s will expire in less than five days. We hope you enjoyed this test drive and use this opportunity to find a permanent Friendica website for your integrated social communications. A list of public sites is available at %s/siteinfo - and for more information on setting up your own Friendica server please see the Friendica project website at https://friendi.ca."
-msgstr "Kedves %1$s!\n\nA(z) %2$s oldalon lévő tesztfiókja öt napon belül le fog járni. Reméljük, hogy élvezte ezt a tesztvezetést, és élni fog a lehetőséggel, hogy egy állandó Friendica weboldalt keressen az integrált közösségi kommunikációjához. A nyilvános oldalak listája a %s/siteinfo címen érhető el – és a saját Friendica kiszolgáló beállításával kapcsolatos további információkért látogassa meg a Friendica projekt weboldalát a https://friendi.ca címen."
diff --git a/testdrive/lang/hu/strings.php b/testdrive/lang/hu/strings.php
deleted file mode 100644
index 1671ce15..00000000
--- a/testdrive/lang/hu/strings.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_hu")) {
-function string_plural_select_hu($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Administrator'] = 'Adminisztrátor';
-$a->strings['Your account on %s will expire in a few days.'] = 'A(z) %s oldalon lévő fiókja néhány napon belül le fog járni.';
-$a->strings['Your Friendica test account is about to expire.'] = 'A Friendica tesztfiókja hamarosan lejár.';
-$a->strings['Hi %1$s,
-
-Your test account on %2$s will expire in less than five days. We hope you enjoyed this test drive and use this opportunity to find a permanent Friendica website for your integrated social communications. A list of public sites is available at %s/siteinfo - and for more information on setting up your own Friendica server please see the Friendica project website at https://friendi.ca.'] = 'Kedves %1$s!
-
-A(z) %2$s oldalon lévő tesztfiókja öt napon belül le fog járni. Reméljük, hogy élvezte ezt a tesztvezetést, és élni fog a lehetőséggel, hogy egy állandó Friendica weboldalt keressen az integrált közösségi kommunikációjához. A nyilvános oldalak listája a %s/siteinfo címen érhető el – és a saját Friendica kiszolgáló beállításával kapcsolatos további információkért látogassa meg a Friendica projekt weboldalát a https://friendi.ca címen.';
diff --git a/testdrive/lang/it/messages.po b/testdrive/lang/it/messages.po
index f393766e..49e3d95b 100644
--- a/testdrive/lang/it/messages.po
+++ b/testdrive/lang/it/messages.po
@@ -5,38 +5,37 @@
 # 
 # Translators:
 # fabrixxm <fabrix.xm@gmail.com>, 2014-2015
-# Sylke Vicious <silkevicious@gmail.com>, 2021
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2014-06-23 12:56+0000\n"
-"Last-Translator: Sylke Vicious <silkevicious@gmail.com>, 2021\n"
-"Language-Team: Italian (http://app.transifex.com/Friendica/friendica/language/it/)\n"
+"POT-Creation-Date: 2015-08-23 17:30+0200\n"
+"PO-Revision-Date: 2017-09-20 06:08+0000\n"
+"Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n"
+"Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: it\n"
-"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: testdrive.php:64
+#: testdrive.php:67
 msgid "Administrator"
 msgstr "Amministratore"
 
-#: testdrive.php:89
+#: testdrive.php:94
 #, php-format
 msgid "Your account on %s will expire in a few days."
 msgstr "Il tuo account su %s scadrà tra pochi giorni."
 
-#: testdrive.php:90
+#: testdrive.php:95
 msgid "Your Friendica test account is about to expire."
 msgstr "Il tuo account di prova su Friendica sta per scadere."
 
-#: testdrive.php:91
+#: testdrive.php:96
 #, php-format
 msgid ""
 "Hi %1$s,\n"
 "\n"
-"Your test account on %2$s will expire in less than five days. We hope you enjoyed this test drive and use this opportunity to find a permanent Friendica website for your integrated social communications. A list of public sites is available at %s/siteinfo - and for more information on setting up your own Friendica server please see the Friendica project website at https://friendi.ca."
-msgstr "Ciao %1$s,\n\nIl tuo account di prova su %2$s scadrà in meno di cinque giorni. Ci auguriamo che tu abbia gradito questo giro di prova e che tu possa trovare un sito su cui creare un account Friendica permanente. Una lista di siti pubblici è disponibile presso %s/siteinfo . Per maggiori informazioni su come installare un tuo server Friendica personale, vai sul sito del progetto Friendica presso https://friendi.ca."
+"Your test account on %2$s will expire in less than five days. We hope you enjoyed this test drive and use this opportunity to find a permanent Friendica website for your integrated social communications. A list of public sites is available at %s/siteinfo - and for more information on setting up your own Friendica server please see the Friendica project website at http://friendica.com."
+msgstr "Ciao %1$s,\n\nIl tuo account di prova su %2$s scadrà in meno di cinque giorni. Ci auguriamo che tu abbia gradito questo giro di prova e che tu possa trovare un sito su cui creare un account Friendica permanente. Una lista di siti pubblici è disponibile presso %s/siteinfo . Per maggiori informazioni su come installare un tuo server Friendica personale, vai sul sito del progetto Friendica presso http://friendica.com."
diff --git a/testdrive/lang/it/strings.php b/testdrive/lang/it/strings.php
index 8faf5a06..517702bf 100644
--- a/testdrive/lang/it/strings.php
+++ b/testdrive/lang/it/strings.php
@@ -2,14 +2,10 @@
 
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
-	$n = intval($n);
-	if ($n == 1) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
+	return ($n != 1);;
 }}
-$a->strings['Administrator'] = 'Amministratore';
-$a->strings['Your account on %s will expire in a few days.'] = 'Il tuo account su %s scadrà tra pochi giorni.';
-$a->strings['Your Friendica test account is about to expire.'] = 'Il tuo account di prova su Friendica sta per scadere.';
-$a->strings['Hi %1$s,
-
-Your test account on %2$s will expire in less than five days. We hope you enjoyed this test drive and use this opportunity to find a permanent Friendica website for your integrated social communications. A list of public sites is available at %s/siteinfo - and for more information on setting up your own Friendica server please see the Friendica project website at https://friendi.ca.'] = 'Ciao %1$s,
-
-Il tuo account di prova su %2$s scadrà in meno di cinque giorni. Ci auguriamo che tu abbia gradito questo giro di prova e che tu possa trovare un sito su cui creare un account Friendica permanente. Una lista di siti pubblici è disponibile presso %s/siteinfo . Per maggiori informazioni su come installare un tuo server Friendica personale, vai sul sito del progetto Friendica presso https://friendi.ca.';
+;
+$a->strings["Administrator"] = "Amministratore";
+$a->strings["Your account on %s will expire in a few days."] = "Il tuo account su %s scadrà tra pochi giorni.";
+$a->strings["Your Friendica test account is about to expire."] = "Il tuo account di prova su Friendica sta per scadere.";
+$a->strings["Hi %1\$s,\n\nYour test account on %2\$s will expire in less than five days. We hope you enjoyed this test drive and use this opportunity to find a permanent Friendica website for your integrated social communications. A list of public sites is available at %s/siteinfo - and for more information on setting up your own Friendica server please see the Friendica project website at http://friendica.com."] = "Ciao %1\$s,\n\nIl tuo account di prova su %2\$s scadrà in meno di cinque giorni. Ci auguriamo che tu abbia gradito questo giro di prova e che tu possa trovare un sito su cui creare un account Friendica permanente. Una lista di siti pubblici è disponibile presso %s/siteinfo . Per maggiori informazioni su come installare un tuo server Friendica personale, vai sul sito del progetto Friendica presso http://friendica.com.";
diff --git a/testdrive/lang/nl/strings.php b/testdrive/lang/nl/strings.php
index ae95eaac..9c61900d 100644
--- a/testdrive/lang/nl/strings.php
+++ b/testdrive/lang/nl/strings.php
@@ -3,6 +3,10 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Administrator'] = 'Beheerder';
+;
+$a->strings["Administrator"] = "Beheerder";
+$a->strings["Your account on %s will expire in a few days."] = "";
+$a->strings["Your Friendica test account is about to expire."] = "";
+$a->strings["Hi %1\$s,\n\nYour test account on %2\$s will expire in less than five days. We hope you enjoyed this test drive and use this opportunity to find a permanent Friendica website for your integrated social communications. A list of public sites is available at %s/siteinfo - and for more information on setting up your own Friendica server please see the Friendica project website at http://friendica.com."] = "";
diff --git a/testdrive/lang/pl/messages.po b/testdrive/lang/pl/messages.po
index 55ee5809..a89fd792 100644
--- a/testdrive/lang/pl/messages.po
+++ b/testdrive/lang/pl/messages.po
@@ -5,15 +5,14 @@
 # 
 # Translators:
 # TORminator <dominik+foss@danelski.pl>, 2014
-# Piotr Strębski <strebski@gmail.com>, 2022
-# Waldemar Stoczkowski, 2018
+# Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2014-06-23 12:56+0000\n"
-"Last-Translator: Piotr Strębski <strebski@gmail.com>, 2022\n"
+"POT-Creation-Date: 2015-08-23 17:30+0200\n"
+"PO-Revision-Date: 2018-03-30 19:49+0000\n"
+"Last-Translator: Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.com/Friendica/friendica/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,23 +20,23 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
-#: testdrive.php:64
+#: testdrive.php:67
 msgid "Administrator"
 msgstr "Administrator"
 
-#: testdrive.php:89
+#: testdrive.php:94
 #, php-format
 msgid "Your account on %s will expire in a few days."
 msgstr "Twoje konto w  %s wygaśnie w ciągu kilku dni."
 
-#: testdrive.php:90
+#: testdrive.php:95
 msgid "Your Friendica test account is about to expire."
 msgstr "Twoje testowe konto Friendica za chwilę wygaśnie."
 
-#: testdrive.php:91
+#: testdrive.php:96
 #, php-format
 msgid ""
 "Hi %1$s,\n"
 "\n"
-"Your test account on %2$s will expire in less than five days. We hope you enjoyed this test drive and use this opportunity to find a permanent Friendica website for your integrated social communications. A list of public sites is available at %s/siteinfo - and for more information on setting up your own Friendica server please see the Friendica project website at https://friendi.ca."
-msgstr "  Cześć %1$s,\n \n Twoje konto testowe %2$s wygaśnie za mniej niż pięć dni. Mamy nadzieję, że podoba Ci się ta jazda testowa i wykorzystasz tę okazję, aby znaleźć stałą stronę Friendica do zintegrowanej komunikacji społecznej. Lista serwisów publicznych jest dostępna na stronie %s/siteinfo. Aby uzyskać więcej informacji na temat konfigurowania własnego serwera Friendica, odwiedź stronę projektu Friendica pod adresem https://friendi.ca."
+"Your test account on %2$s will expire in less than five days. We hope you enjoyed this test drive and use this opportunity to find a permanent Friendica website for your integrated social communications. A list of public sites is available at %s/siteinfo - and for more information on setting up your own Friendica server please see the Friendica project website at http://friendica.com."
+msgstr "  Cześć %1$s,\n \n Twoje konto testowe wygaśnie %2$s za mniej niż pięć dni. Mamy nadzieję, że podoba Ci się ta jazda testowa i wykorzystaj tę okazję, by znaleźć stałą stronę Friendica do zintegrowanej komunikacji społecznej. Lista serwisów publicznych jest dostępna na stronie %s/siteinfo. Aby uzyskać więcej informacji na temat konfigurowania własnego serwera Friendica, odwiedź stronę projektu Friendica pod adresem http://friendica.com."
diff --git a/testdrive/lang/pl/strings.php b/testdrive/lang/pl/strings.php
index 9051b6ee..f93293fc 100644
--- a/testdrive/lang/pl/strings.php
+++ b/testdrive/lang/pl/strings.php
@@ -2,14 +2,10 @@
 
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
-	$n = intval($n);
-	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
+	return ($n==1 ? 0 : ($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14) ? 1 : $n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14) ? 2 : 3);;
 }}
-$a->strings['Administrator'] = 'Administrator';
-$a->strings['Your account on %s will expire in a few days.'] = 'Twoje konto w  %s wygaśnie w ciągu kilku dni.';
-$a->strings['Your Friendica test account is about to expire.'] = 'Twoje testowe konto Friendica za chwilę wygaśnie.';
-$a->strings['Hi %1$s,
-
-Your test account on %2$s will expire in less than five days. We hope you enjoyed this test drive and use this opportunity to find a permanent Friendica website for your integrated social communications. A list of public sites is available at %s/siteinfo - and for more information on setting up your own Friendica server please see the Friendica project website at https://friendi.ca.'] = '  Cześć %1$s,
- 
- Twoje konto testowe %2$s wygaśnie za mniej niż pięć dni. Mamy nadzieję, że podoba Ci się ta jazda testowa i wykorzystasz tę okazję, aby znaleźć stałą stronę Friendica do zintegrowanej komunikacji społecznej. Lista serwisów publicznych jest dostępna na stronie %s/siteinfo. Aby uzyskać więcej informacji na temat konfigurowania własnego serwera Friendica, odwiedź stronę projektu Friendica pod adresem https://friendi.ca.';
+;
+$a->strings["Administrator"] = "Administrator";
+$a->strings["Your account on %s will expire in a few days."] = "Twoje konto w  %s wygaśnie w ciągu kilku dni.";
+$a->strings["Your Friendica test account is about to expire."] = "Twoje testowe konto Friendica za chwilę wygaśnie.";
+$a->strings["Hi %1\$s,\n\nYour test account on %2\$s will expire in less than five days. We hope you enjoyed this test drive and use this opportunity to find a permanent Friendica website for your integrated social communications. A list of public sites is available at %s/siteinfo - and for more information on setting up your own Friendica server please see the Friendica project website at http://friendica.com."] = "  Cześć %1\$s,\n \n Twoje konto testowe wygaśnie %2\$s za mniej niż pięć dni. Mamy nadzieję, że podoba Ci się ta jazda testowa i wykorzystaj tę okazję, by znaleźć stałą stronę Friendica do zintegrowanej komunikacji społecznej. Lista serwisów publicznych jest dostępna na stronie %s/siteinfo. Aby uzyskać więcej informacji na temat konfigurowania własnego serwera Friendica, odwiedź stronę projektu Friendica pod adresem http://friendica.com.";
diff --git a/testdrive/lang/ro/strings.php b/testdrive/lang/ro/strings.php
index e0c21b70..c647c3c7 100644
--- a/testdrive/lang/ro/strings.php
+++ b/testdrive/lang/ro/strings.php
@@ -2,14 +2,10 @@
 
 if(! function_exists("string_plural_select_ro")) {
 function string_plural_select_ro($n){
-	$n = intval($n);
-	if ($n==1) { return 0; } else if ((($n%100>19)||(($n%100==0)&&($n!=0)))) { return 2; } else  { return 1; }
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
 }}
-$a->strings['Administrator'] = 'Administrator';
-$a->strings['Your account on %s will expire in a few days.'] = 'Contul dvs. de pe %s va expira în câteva zile.';
-$a->strings['Your Friendica test account is about to expire.'] = 'Contul dvs. de testare Friendica, este pe cale sa expire.';
-$a->strings['Hi %1$s,
-
-Your test account on %2$s will expire in less than five days. We hope you enjoyed this test drive and use this opportunity to find a permanent Friendica website for your integrated social communications. A list of public sites is available at http://dir.friendica.com/siteinfo - and for more information on setting up your own Friendica server please see the Friendica project website at http://friendica.com.'] = 'Bună ziua %1$s,
-
-Contul dumneavoastră de testare de pe %2$s va expira în mai puțin de cinci zile. Sperăm că v-ați bucurat de această perioadă de testare, şi că veți folosi această oportunitate pentru a găsi un site Friendica permanent, pentru integrarea comunicațiilor dvs. sociale. O listă a site-urilor publice este disponibilă pe http://dir.friendica.com/siteinfo - şi pentru mai multe informații referitoare la configurarea propriului server Friendica, vă rugăm să consultați site-ul web al proiectului Friendica, pe http://friendica.com.';
+;
+$a->strings["Administrator"] = "Administrator";
+$a->strings["Your account on %s will expire in a few days."] = "Contul dvs. de pe %s va expira în câteva zile.";
+$a->strings["Your Friendica test account is about to expire."] = "Contul dvs. de testare Friendica, este pe cale sa expire.";
+$a->strings["Hi %1\$s,\n\nYour test account on %2\$s will expire in less than five days. We hope you enjoyed this test drive and use this opportunity to find a permanent Friendica website for your integrated social communications. A list of public sites is available at http://dir.friendica.com/siteinfo - and for more information on setting up your own Friendica server please see the Friendica project website at http://friendica.com."] = "Bună ziua %1\$s,\n\nContul dumneavoastră de testare de pe %2\$s va expira în mai puțin de cinci zile. Sperăm că v-ați bucurat de această perioadă de testare, şi că veți folosi această oportunitate pentru a găsi un site Friendica permanent, pentru integrarea comunicațiilor dvs. sociale. O listă a site-urilor publice este disponibilă pe http://dir.friendica.com/siteinfo - şi pentru mai multe informații referitoare la configurarea propriului server Friendica, vă rugăm să consultați site-ul web al proiectului Friendica, pe http://friendica.com.";
diff --git a/testdrive/lang/sv/messages.po b/testdrive/lang/sv/messages.po
deleted file mode 100644
index a12c178d..00000000
--- a/testdrive/lang/sv/messages.po
+++ /dev/null
@@ -1,41 +0,0 @@
-# ADDON testdrive
-# Copyright (C)
-# This file is distributed under the same license as the Friendica testdrive addon package.
-# 
-# 
-# Translators:
-# Kristoffer Grundström <lovaren@gmail.com>, 2022
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2022-01-16 00:53+0000\n"
-"Last-Translator: Kristoffer Grundström <lovaren@gmail.com>\n"
-"Language-Team: Swedish (http://www.transifex.com/Friendica/friendica/language/sv/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: sv\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: testdrive.php:64
-msgid "Administrator"
-msgstr "Administratör"
-
-#: testdrive.php:89
-#, php-format
-msgid "Your account on %s will expire in a few days."
-msgstr ""
-
-#: testdrive.php:90
-msgid "Your Friendica test account is about to expire."
-msgstr ""
-
-#: testdrive.php:91
-#, php-format
-msgid ""
-"Hi %1$s,\n"
-"\n"
-"Your test account on %2$s will expire in less than five days. We hope you enjoyed this test drive and use this opportunity to find a permanent Friendica website for your integrated social communications. A list of public sites is available at %s/siteinfo - and for more information on setting up your own Friendica server please see the Friendica project website at https://friendi.ca."
-msgstr ""
diff --git a/testdrive/lang/sv/strings.php b/testdrive/lang/sv/strings.php
index efbef890..ea2177b9 100644
--- a/testdrive/lang/sv/strings.php
+++ b/testdrive/lang/sv/strings.php
@@ -1,8 +1,3 @@
-<?php
-
-if(! function_exists("string_plural_select_sv")) {
-function string_plural_select_sv($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Administrator'] = 'Administratör';
+<?php
+
+$a->strings["Administrator"] = "Admin";
diff --git a/testdrive/lang/zh-cn/strings.php b/testdrive/lang/zh-cn/strings.php
index 326c8f6b..87dce218 100644
--- a/testdrive/lang/zh-cn/strings.php
+++ b/testdrive/lang/zh-cn/strings.php
@@ -3,13 +3,10 @@
 if(! function_exists("string_plural_select_zh_cn")) {
 function string_plural_select_zh_cn($n){
 	$n = intval($n);
-	return intval(0);
+	return 0;;
 }}
-$a->strings['Administrator'] = '管理员';
-$a->strings['Your account on %s will expire in a few days.'] = '您在 %s 的账户将在几天内过期。';
-$a->strings['Your Friendica test account is about to expire.'] = '您的 Friendica 测试账户即将过期。';
-$a->strings['Hi %1$s,
-
-Your test account on %2$s will expire in less than five days. We hope you enjoyed this test drive and use this opportunity to find a permanent Friendica website for your integrated social communications. A list of public sites is available at %s/siteinfo - and for more information on setting up your own Friendica server please see the Friendica project website at http://friendica.com.'] = '嘿 %1$s，
-
-您在 %2$s 的测试账户将在五天内过期。我们希望您享受这次试用并以此机会为您的综合社交找到常驻的 Friendica 站点。公开可用站点罗列在 %s/siteinfo - 若要了解更多关于建立自己的 Friendica 服务站点的信息，请浏览 Friendica 项目的官方网站 http://friendica.com 。';
+;
+$a->strings["Administrator"] = "管理员";
+$a->strings["Your account on %s will expire in a few days."] = "您在 %s 的账户将在几天内过期。";
+$a->strings["Your Friendica test account is about to expire."] = "您的 Friendica 测试账户即将过期。";
+$a->strings["Hi %1\$s,\n\nYour test account on %2\$s will expire in less than five days. We hope you enjoyed this test drive and use this opportunity to find a permanent Friendica website for your integrated social communications. A list of public sites is available at %s/siteinfo - and for more information on setting up your own Friendica server please see the Friendica project website at http://friendica.com."] = "嘿 %1\$s，\n\n您在 %2\$s 的测试账户将在五天内过期。我们希望您享受这次试用并以此机会为您的综合社交找到常驻的 Friendica 站点。公开可用站点罗列在 %s/siteinfo - 若要了解更多关于建立自己的 Friendica 服务站点的信息，请浏览 Friendica 项目的官方网站 http://friendica.com 。";
diff --git a/testdrive/testdrive.php b/testdrive/testdrive.php
index 55645284..f29dea19 100644
--- a/testdrive/testdrive.php
+++ b/testdrive/testdrive.php
@@ -7,78 +7,100 @@
  */
 
 use Friendica\App;
+use Friendica\Core\Config;
 use Friendica\Core\Hook;
-use Friendica\Core\Search;
+use Friendica\Core\L10n;
 use Friendica\Database\DBA;
-use Friendica\DI;
-use Friendica\Model\Notification;
 use Friendica\Model\User;
-use Friendica\Core\Config\Util\ConfigFileManager;
+use Friendica\Util\ConfigFileLoader;
 use Friendica\Util\DateTimeFormat;
 
-function testdrive_install()
-{
+function testdrive_install() {
+
 	Hook::register('load_config',      'addon/testdrive/testdrive.php', 'testdrive_load_config');
 	Hook::register('register_account', 'addon/testdrive/testdrive.php', 'testdrive_register_account');
 	Hook::register('cron', 'addon/testdrive/testdrive.php', 'testdrive_cron');
 	Hook::register('enotify','addon/testdrive/testdrive.php', 'testdrive_enotify');
 	Hook::register('globaldir_update','addon/testdrive/testdrive.php', 'testdrive_globaldir_update');
+
 }
 
-function testdrive_load_config(ConfigFileManager $loader)
-{
-	DI::app()->getConfigCache()->load($loader->loadAddonConfig('testdrive'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
+
+function testdrive_uninstall() {
+
+	Hook::unregister('load_config',      'addon/testdrive/testdrive.php', 'testdrive_load_config');
+	Hook::unregister('register_account', 'addon/testdrive/testdrive.php', 'testdrive_register_account');
+	Hook::unregister('cron', 'addon/testdrive/testdrive.php', 'testdrive_cron');
+	Hook::unregister('enotify','addon/testdrive/testdrive.php', 'testdrive_enotify');
+	Hook::unregister('globaldir_update','addon/testdrive/testdrive.php', 'testdrive_globaldir_update');
+
 }
 
-function testdrive_globaldir_update(array &$b)
+function testdrive_load_config(App $a, ConfigFileLoader $loader)
 {
+	$a->getConfigCache()->load($loader->loadAddonConfig('testdrive'));
+}
+
+function testdrive_globaldir_update($a,&$b) {
 	$b['url'] = '';
 }
 
-function testdrive_register_account($b)
-{
+function testdrive_register_account($a,$b) {
+
 	$uid = $b;
 
-	$days = DI::config()->get('testdrive','expiredays');
-	if (!$days) {
+	$days = Config::get('testdrive','expiredays');
+	if(! $days)
 		return;
+
+	$r = q("UPDATE user set account_expires_on = '%s' where uid = %d",
+		DBA::escape(DateTimeFormat::convert('now +' . $days . ' days')),
+		intval($uid)
+	);
+
+};
+
+
+function testdrive_cron($a,$b) {
+	$r = q("select * from user where account_expires_on < UTC_TIMESTAMP() + INTERVAL 5 DAY and
+		expire_notification_sent = '0000-00-00 00:00:00' ");
+
+	if(count($r)) {
+		foreach($r as $rr) {
+			notification([
+				'uid' => $rr['uid'],
+				'type' => NOTIFY_SYSTEM,
+				'system_type' => 'testdrive_expire',
+				'language'     => $rr['language'],
+				'to_name'      => $rr['username'],
+				'to_email'     => $rr['email'],
+				'source_name'  => L10n::t('Administrator'),
+				'source_link'  => $a->getBaseURL(),
+				'source_photo' => $a->getBaseURL() . '/images/person-80.jpg',
+			]);
+
+			q("update user set expire_notification_sent = '%s' where uid = %d",
+				DBA::escape(DateTimeFormat::utcNow()),
+				intval($rr['uid'])
+			);
+
+		}
 	}
 
-	DBA::update('user', ['account_expires_on' => DateTimeFormat::convert('now +' . $days . ' days')], ['uid' => $uid]);
-}
-
-
-function testdrive_cron($b)
-{
-	$users = DBA::selectToArray('user', [], ["`account_expires_on` < ? AND `expire_notification_sent` <= ?",
-		DateTimeFormat::utc('now + 5 days'), DBA::NULL_DATETIME]);
-
-	foreach ($users as $rr) {
-		DI::notify()->createFromArray([
-			'type' => Notification\Type::SYSTEM,
-			'uid' => $rr['uid'],
-			'system_type' => 'testdrive_expire',
-			'source_name'  => DI::l10n()->t('Administrator'),
-			'source_link'  => DI::baseUrl(),
-			'source_photo' => DI::baseUrl() . '/images/person-80.jpg',
-		]);
-
-		DBA::update('user', ['expire_notification_sent' => DateTimeFormat::utcNow()], ['uid' => $rr['uid']]);
-	}
-
-	$users = DBA::selectToArray('user', [], ["`account_expired` AND `account_expires_on` < ?", DateTimeFormat::utc('now - 5 days')]);
-	foreach($users as $rr) {
-		User::remove($rr['uid']);
+	$r = q("select * from user where account_expired = 1 and account_expires_on < UTC_TIMESTAMP() - INTERVAL 5 DAY ");
+	if(count($r)) {
+		foreach($r as $rr) {
+			User::remove($rr['uid']);
+		}
 	}
 }
 
-function testdrive_enotify(array &$b)
-{
-	if (!empty($b['params']) && $b['params']['type'] == Notification\Type::SYSTEM
+function testdrive_enotify(&$a, &$b) {
+    if (!empty($b['params']) && $b['params']['type'] == NOTIFY_SYSTEM
 		&& !empty($b['params']['system_type']) && $b['params']['system_type'] === 'testdrive_expire') {
-		$b['itemlink'] = DI::baseUrl();
-		$b['epreamble'] = $b['preamble'] = DI::l10n()->t('Your account on %s will expire in a few days.', DI::config()->get('system', 'sitename'));
-		$b['subject'] = DI::l10n()->t('Your Friendica test account is about to expire.');
-		$b['body'] = DI::l10n()->t("Hi %1\$s,\n\nYour test account on %2\$s will expire in less than five days. We hope you enjoyed this test drive and use this opportunity to find a permanent Friendica website for your integrated social communications. A list of public sites is available at %s/siteinfo - and for more information on setting up your own Friendica server please see the Friendica project website at https://friendi.ca.", $b['params']['to_name'], "[url=".DI::config()->get('system', 'url')."]".DI::config()->get('config', 'sitename')."[/url]", Search::getGlobalDirectory());
-	}
+        $b['itemlink'] = $a->getBaseURL();
+        $b['epreamble'] = $b['preamble'] = L10n::t('Your account on %s will expire in a few days.', Config::get('system', 'sitename'));
+        $b['subject'] = L10n::t('Your Friendica test account is about to expire.');
+        $b['body'] = L10n::t("Hi %1\$s,\n\nYour test account on %2\$s will expire in less than five days. We hope you enjoyed this test drive and use this opportunity to find a permanent Friendica website for your integrated social communications. A list of public sites is available at %s/siteinfo - and for more information on setting up your own Friendica server please see the Friendica project website at https://friendi.ca.", $b['params']['to_name'], "[url=".Config::get('system', 'url')."]".Config::get('config', 'sitename')."[/url]", get_server());
+    }
 }
diff --git a/tictac/lang/C/messages.po b/tictac/lang/C/messages.po
index 8a0ad6c2..5550d622 100644
--- a/tictac/lang/C/messages.po
+++ b/tictac/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,56 +17,56 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: tictac.php:16
+#: tictac.php:20
 msgid "Three Dimensional Tic-Tac-Toe"
 msgstr ""
 
-#: tictac.php:49
+#: tictac.php:53
 msgid "3D Tic-Tac-Toe"
 msgstr ""
 
-#: tictac.php:54
+#: tictac.php:58
 msgid "New game"
 msgstr ""
 
-#: tictac.php:55
+#: tictac.php:59
 msgid "New game with handicap"
 msgstr ""
 
-#: tictac.php:56
+#: tictac.php:60
 msgid ""
 "Three dimensional tic-tac-toe is just like the traditional game except that "
 "it is played on multiple levels simultaneously. "
 msgstr ""
 
-#: tictac.php:57
+#: tictac.php:61
 msgid ""
 "In this case there are three levels. You win by getting three in a row on "
 "any level, as well as up, down, and diagonally across the different levels."
 msgstr ""
 
-#: tictac.php:59
+#: tictac.php:63
 msgid ""
 "The handicap game disables the center position on the middle level because "
 "the player claiming this square often has an unfair advantage."
 msgstr ""
 
-#: tictac.php:178
+#: tictac.php:182
 msgid "You go first..."
 msgstr ""
 
-#: tictac.php:183
+#: tictac.php:187
 msgid "I'm going first this time..."
 msgstr ""
 
-#: tictac.php:189
+#: tictac.php:193
 msgid "You won!"
 msgstr ""
 
-#: tictac.php:195 tictac.php:220
+#: tictac.php:199 tictac.php:224
 msgid "\"Cat\" game!"
 msgstr ""
 
-#: tictac.php:218
+#: tictac.php:222
 msgid "I won!"
 msgstr ""
diff --git a/tictac/lang/ar/messages.po b/tictac/lang/ar/messages.po
deleted file mode 100644
index 7a483b42..00000000
--- a/tictac/lang/ar/messages.po
+++ /dev/null
@@ -1,73 +0,0 @@
-# ADDON tictac
-# Copyright (C)
-# This file is distributed under the same license as the Friendica tictac addon package.
-# 
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2014-06-23 12:57+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Arabic (http://www.transifex.com/Friendica/friendica/language/ar/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ar\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-
-#: tictac.php:16
-msgid "Three Dimensional Tic-Tac-Toe"
-msgstr ""
-
-#: tictac.php:49
-msgid "3D Tic-Tac-Toe"
-msgstr ""
-
-#: tictac.php:54
-msgid "New game"
-msgstr ""
-
-#: tictac.php:55
-msgid "New game with handicap"
-msgstr ""
-
-#: tictac.php:56
-msgid ""
-"Three dimensional tic-tac-toe is just like the traditional game except that "
-"it is played on multiple levels simultaneously. "
-msgstr ""
-
-#: tictac.php:57
-msgid ""
-"In this case there are three levels. You win by getting three in a row on "
-"any level, as well as up, down, and diagonally across the different levels."
-msgstr ""
-
-#: tictac.php:59
-msgid ""
-"The handicap game disables the center position on the middle level because "
-"the player claiming this square often has an unfair advantage."
-msgstr ""
-
-#: tictac.php:178
-msgid "You go first..."
-msgstr ""
-
-#: tictac.php:183
-msgid "I'm going first this time..."
-msgstr ""
-
-#: tictac.php:189
-msgid "You won!"
-msgstr ""
-
-#: tictac.php:195 tictac.php:220
-msgid "\"Cat\" game!"
-msgstr ""
-
-#: tictac.php:218
-msgid "I won!"
-msgstr ""
diff --git a/tictac/lang/ar/strings.php b/tictac/lang/ar/strings.php
deleted file mode 100644
index eea34dd6..00000000
--- a/tictac/lang/ar/strings.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_ar")) {
-function string_plural_select_ar($n){
-	$n = intval($n);
-	if ($n==0) { return 0; } else if ($n==1) { return 1; } else if ($n==2) { return 2; } else if ($n%100>=3 && $n%100<=10) { return 3; } else if ($n%100>=11 && $n%100<=99) { return 4; } else  { return 5; }
-}}
diff --git a/tictac/lang/cs/messages.po b/tictac/lang/cs/messages.po
index cd720924..7e2725da 100644
--- a/tictac/lang/cs/messages.po
+++ b/tictac/lang/cs/messages.po
@@ -4,72 +4,71 @@
 # 
 # 
 # Translators:
-# Aditoo, 2018
-# michal_s <msupler@gmail.com>, 2014
+# Michal Šupler <msupler@gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2014-06-23 12:57+0000\n"
-"Last-Translator: Aditoo, 2018\n"
-"Language-Team: Czech (http://app.transifex.com/Friendica/friendica/language/cs/)\n"
+"POT-Creation-Date: 2014-06-23 14:45+0200\n"
+"PO-Revision-Date: 2014-07-28 18:18+0000\n"
+"Last-Translator: Michal Šupler <msupler@gmail.com>\n"
+"Language-Team: Czech (http://www.transifex.com/projects/p/friendica/language/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: cs\n"
-"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: tictac.php:16
+#: tictac.php:20
 msgid "Three Dimensional Tic-Tac-Toe"
-msgstr "Trojrozměrné piškvorky"
+msgstr "Trojrozměrné Tic-Tac-Toe"
 
-#: tictac.php:49
+#: tictac.php:53
 msgid "3D Tic-Tac-Toe"
-msgstr "3D piškvorky"
+msgstr "3D Tic-Tac-Toe"
 
-#: tictac.php:54
+#: tictac.php:58
 msgid "New game"
 msgstr "Nová hra"
 
-#: tictac.php:55
+#: tictac.php:59
 msgid "New game with handicap"
 msgstr "Nová hra s handicapem"
 
-#: tictac.php:56
+#: tictac.php:60
 msgid ""
 "Three dimensional tic-tac-toe is just like the traditional game except that "
 "it is played on multiple levels simultaneously. "
-msgstr "Trojrozměrné piškvorky jsou podobné této tradiční hře kromě toho, že se hrají na více úrovních současně."
+msgstr "Trojrozměrné tic-tac-toe je podobná této tradiční hře kromě toho, že se hraje na více úrovních současně."
 
-#: tictac.php:57
+#: tictac.php:61
 msgid ""
 "In this case there are three levels. You win by getting three in a row on "
 "any level, as well as up, down, and diagonally across the different levels."
 msgstr "V tomto případě existují tři úrovně. Vyhrajete tím, že dostane tři v řadě na jakékoli úrovni, stejně jako nahoru, dolů a šikmo na různých úrovních."
 
-#: tictac.php:59
+#: tictac.php:63
 msgid ""
 "The handicap game disables the center position on the middle level because "
 "the player claiming this square often has an unfair advantage."
 msgstr "Hra s handicapem zakáže centrální pozici na střední úrovni, protože hráč zaujímající tuto polohu má často nespravedlivou výhodu."
 
-#: tictac.php:178
+#: tictac.php:182
 msgid "You go first..."
 msgstr "Vy začněte ..."
 
-#: tictac.php:183
+#: tictac.php:187
 msgid "I'm going first this time..."
 msgstr "Tentokrát začnu já..."
 
-#: tictac.php:189
+#: tictac.php:193
 msgid "You won!"
-msgstr "Vyhrál/a jste!"
+msgstr "Vyhrál jste!"
 
-#: tictac.php:195 tictac.php:220
+#: tictac.php:199 tictac.php:224
 msgid "\"Cat\" game!"
-msgstr "Remíza!"
+msgstr "Pat hra!"
 
-#: tictac.php:218
+#: tictac.php:222
 msgid "I won!"
 msgstr "Vyhrál jsem!"
diff --git a/tictac/lang/cs/strings.php b/tictac/lang/cs/strings.php
index f895d630..3913f06d 100644
--- a/tictac/lang/cs/strings.php
+++ b/tictac/lang/cs/strings.php
@@ -2,18 +2,18 @@
 
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
-	$n = intval($n);
-	if (($n == 1 && $n % 1 == 0)) { return 0; } else if (($n >= 2 && $n <= 4 && $n % 1 == 0)) { return 1; } else if (($n % 1 != 0 )) { return 2; } else  { return 3; }
+	return ($n==1) ? 0 : ($n>=2 && $n<=4) ? 1 : 2;;
 }}
-$a->strings['Three Dimensional Tic-Tac-Toe'] = 'Trojrozměrné piškvorky';
-$a->strings['3D Tic-Tac-Toe'] = '3D piškvorky';
-$a->strings['New game'] = 'Nová hra';
-$a->strings['New game with handicap'] = 'Nová hra s handicapem';
-$a->strings['Three dimensional tic-tac-toe is just like the traditional game except that it is played on multiple levels simultaneously. '] = 'Trojrozměrné piškvorky jsou podobné této tradiční hře kromě toho, že se hrají na více úrovních současně.';
-$a->strings['In this case there are three levels. You win by getting three in a row on any level, as well as up, down, and diagonally across the different levels.'] = 'V tomto případě existují tři úrovně. Vyhrajete tím, že dostane tři v řadě na jakékoli úrovni, stejně jako nahoru, dolů a šikmo na různých úrovních.';
-$a->strings['The handicap game disables the center position on the middle level because the player claiming this square often has an unfair advantage.'] = 'Hra s handicapem zakáže centrální pozici na střední úrovni, protože hráč zaujímající tuto polohu má často nespravedlivou výhodu.';
-$a->strings['You go first...'] = 'Vy začněte ...';
-$a->strings['I\'m going first this time...'] = 'Tentokrát začnu já...';
-$a->strings['You won!'] = 'Vyhrál/a jste!';
-$a->strings['"Cat" game!'] = 'Remíza!';
-$a->strings['I won!'] = 'Vyhrál jsem!';
+;
+$a->strings["Three Dimensional Tic-Tac-Toe"] = "Trojrozměrné Tic-Tac-Toe";
+$a->strings["3D Tic-Tac-Toe"] = "3D Tic-Tac-Toe";
+$a->strings["New game"] = "Nová hra";
+$a->strings["New game with handicap"] = "Nová hra s handicapem";
+$a->strings["Three dimensional tic-tac-toe is just like the traditional game except that it is played on multiple levels simultaneously. "] = "Trojrozměrné tic-tac-toe je podobná této tradiční hře kromě toho, že se hraje na více úrovních současně.";
+$a->strings["In this case there are three levels. You win by getting three in a row on any level, as well as up, down, and diagonally across the different levels."] = "V tomto případě existují tři úrovně. Vyhrajete tím, že dostane tři v řadě na jakékoli úrovni, stejně jako nahoru, dolů a šikmo na různých úrovních.";
+$a->strings["The handicap game disables the center position on the middle level because the player claiming this square often has an unfair advantage."] = "Hra s handicapem zakáže centrální pozici na střední úrovni, protože hráč zaujímající tuto polohu má často nespravedlivou výhodu.";
+$a->strings["You go first..."] = "Vy začněte ...";
+$a->strings["I'm going first this time..."] = "Tentokrát začnu já...";
+$a->strings["You won!"] = "Vyhrál jste!";
+$a->strings["\"Cat\" game!"] = "Pat hra!";
+$a->strings["I won!"] = "Vyhrál jsem!";
diff --git a/tictac/lang/da-dk/messages.po b/tictac/lang/da-dk/messages.po
deleted file mode 100644
index 3ab88e1d..00000000
--- a/tictac/lang/da-dk/messages.po
+++ /dev/null
@@ -1,74 +0,0 @@
-# ADDON tictac
-# Copyright (C)
-# This file is distributed under the same license as the Friendica tictac addon package.
-# 
-# 
-# Translators:
-# Anton <dev@atjn.dk>, 2022
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2014-06-23 12:57+0000\n"
-"Last-Translator: Anton <dev@atjn.dk>, 2022\n"
-"Language-Team: Danish (Denmark) (http://www.transifex.com/Friendica/friendica/language/da_DK/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: da_DK\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: tictac.php:16
-msgid "Three Dimensional Tic-Tac-Toe"
-msgstr "Tredimensionelt Tic-Tac-Toe"
-
-#: tictac.php:49
-msgid "3D Tic-Tac-Toe"
-msgstr "3D Tic-Tac-Toe"
-
-#: tictac.php:54
-msgid "New game"
-msgstr "Nyt spil"
-
-#: tictac.php:55
-msgid "New game with handicap"
-msgstr "Nyt spil med handicap"
-
-#: tictac.php:56
-msgid ""
-"Three dimensional tic-tac-toe is just like the traditional game except that "
-"it is played on multiple levels simultaneously. "
-msgstr "Tredimensionelt Tic-Tac-Toe er præcis ligesom det traditionelle spil, bortset fra at det spilles på flere niveauer samtidigt."
-
-#: tictac.php:57
-msgid ""
-"In this case there are three levels. You win by getting three in a row on "
-"any level, as well as up, down, and diagonally across the different levels."
-msgstr "I dette tilfælde er der tre niveauer. Du vinder ved at få tre på en række på et af niveauerne, eller op, ned, eller diagonalt på tværs af de tre forskellige niveauer."
-
-#: tictac.php:59
-msgid ""
-"The handicap game disables the center position on the middle level because "
-"the player claiming this square often has an unfair advantage."
-msgstr "Spillet med handicap slår centerpositionen på det midterse niveau fra, fordi spilleren der får den position ofte har en unfair fordel."
-
-#: tictac.php:178
-msgid "You go first..."
-msgstr "Du starter..."
-
-#: tictac.php:183
-msgid "I'm going first this time..."
-msgstr "Jeg starter denne gang..."
-
-#: tictac.php:189
-msgid "You won!"
-msgstr "Du vandt!"
-
-#: tictac.php:195 tictac.php:220
-msgid "\"Cat\" game!"
-msgstr "\"Kat\" spil!"
-
-#: tictac.php:218
-msgid "I won!"
-msgstr "Jeg vandt!"
diff --git a/tictac/lang/da-dk/strings.php b/tictac/lang/da-dk/strings.php
deleted file mode 100644
index 394ec755..00000000
--- a/tictac/lang/da-dk/strings.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_da_dk")) {
-function string_plural_select_da_dk($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Three Dimensional Tic-Tac-Toe'] = 'Tredimensionelt Tic-Tac-Toe';
-$a->strings['3D Tic-Tac-Toe'] = '3D Tic-Tac-Toe';
-$a->strings['New game'] = 'Nyt spil';
-$a->strings['New game with handicap'] = 'Nyt spil med handicap';
-$a->strings['Three dimensional tic-tac-toe is just like the traditional game except that it is played on multiple levels simultaneously. '] = 'Tredimensionelt Tic-Tac-Toe er præcis ligesom det traditionelle spil, bortset fra at det spilles på flere niveauer samtidigt.';
-$a->strings['In this case there are three levels. You win by getting three in a row on any level, as well as up, down, and diagonally across the different levels.'] = 'I dette tilfælde er der tre niveauer. Du vinder ved at få tre på en række på et af niveauerne, eller op, ned, eller diagonalt på tværs af de tre forskellige niveauer.';
-$a->strings['The handicap game disables the center position on the middle level because the player claiming this square often has an unfair advantage.'] = 'Spillet med handicap slår centerpositionen på det midterse niveau fra, fordi spilleren der får den position ofte har en unfair fordel.';
-$a->strings['You go first...'] = 'Du starter...';
-$a->strings['I\'m going first this time...'] = 'Jeg starter denne gang...';
-$a->strings['You won!'] = 'Du vandt!';
-$a->strings['"Cat" game!'] = '"Kat" spil!';
-$a->strings['I won!'] = 'Jeg vandt!';
diff --git a/tictac/lang/de/messages.po b/tictac/lang/de/messages.po
index 351aaf32..01ccff6d 100644
--- a/tictac/lang/de/messages.po
+++ b/tictac/lang/de/messages.po
@@ -4,72 +4,71 @@
 # 
 # 
 # Translators:
-# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2014
-# Ulf Rompe <transifex.com@rompe.org>, 2019
+# bavatar <tobias.diekershoff@gmx.net>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2014-06-23 12:57+0000\n"
-"Last-Translator: Ulf Rompe <transifex.com@rompe.org>, 2019\n"
-"Language-Team: German (http://app.transifex.com/Friendica/friendica/language/de/)\n"
+"POT-Creation-Date: 2014-06-23 14:45+0200\n"
+"PO-Revision-Date: 2014-09-28 12:51+0000\n"
+"Last-Translator: bavatar <tobias.diekershoff@gmx.net>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/friendica/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: tictac.php:16
+#: tictac.php:20
 msgid "Three Dimensional Tic-Tac-Toe"
 msgstr "Dreidimensionales Tic-Tac-Toe"
 
-#: tictac.php:49
+#: tictac.php:53
 msgid "3D Tic-Tac-Toe"
-msgstr "3D-Tic-Tac-Toe"
+msgstr "3D Tic-Tac-Toe"
 
-#: tictac.php:54
+#: tictac.php:58
 msgid "New game"
 msgstr "Neues Spiel"
 
-#: tictac.php:55
+#: tictac.php:59
 msgid "New game with handicap"
-msgstr "Neues Handicap-Spiel"
+msgstr "Neues Handicap Spiel"
 
-#: tictac.php:56
+#: tictac.php:60
 msgid ""
 "Three dimensional tic-tac-toe is just like the traditional game except that "
 "it is played on multiple levels simultaneously. "
 msgstr "3D-Tic-Tac-Toe ist genauso wie das herkömmliche Spiel, nur das man es auf mehreren Ebenen gleichzeitig spielt."
 
-#: tictac.php:57
+#: tictac.php:61
 msgid ""
 "In this case there are three levels. You win by getting three in a row on "
 "any level, as well as up, down, and diagonally across the different levels."
-msgstr "In diesem Fall sind es drei Ebenen. Man gewinnt, indem man drei in einer Reihe auf einer beliebigen Ebene schafft, oder drei übereinander oder diagonal auf verschiedenen Ebenen."
+msgstr "In diesem Fall sind es drei Ebenen. Man gewinnt indem man drei in einer Reihe auf einer beliebigen Reihe schafft, oder drei übereinander oder diagonal auf verschiedenen Ebenen."
 
-#: tictac.php:59
+#: tictac.php:63
 msgid ""
 "The handicap game disables the center position on the middle level because "
 "the player claiming this square often has an unfair advantage."
-msgstr "Beim Handicap-Spiel wird die zentrale Position der mittleren Ebene gesperrt, da der Spieler, der diese Ebene besitzt, oft einen unfairen Vorteil genießt."
+msgstr "Beim Handicap-Spiel wird die zentrale Position der mittleren Ebene gesperrt da der Spieler der diese Ebene besitzt oft einen unfairen Vorteil genießt."
 
-#: tictac.php:178
+#: tictac.php:182
 msgid "You go first..."
 msgstr "Du fängst an..."
 
-#: tictac.php:183
+#: tictac.php:187
 msgid "I'm going first this time..."
 msgstr "Diesmal fange ich an..."
 
-#: tictac.php:189
+#: tictac.php:193
 msgid "You won!"
 msgstr "Du gewinnst!"
 
-#: tictac.php:195 tictac.php:220
+#: tictac.php:199 tictac.php:224
 msgid "\"Cat\" game!"
 msgstr "Unentschieden!"
 
-#: tictac.php:218
+#: tictac.php:222
 msgid "I won!"
 msgstr "Ich gewinne!"
diff --git a/tictac/lang/de/strings.php b/tictac/lang/de/strings.php
index bdb52e10..dd85990b 100644
--- a/tictac/lang/de/strings.php
+++ b/tictac/lang/de/strings.php
@@ -2,18 +2,18 @@
 
 if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Three Dimensional Tic-Tac-Toe'] = 'Dreidimensionales Tic-Tac-Toe';
-$a->strings['3D Tic-Tac-Toe'] = '3D-Tic-Tac-Toe';
-$a->strings['New game'] = 'Neues Spiel';
-$a->strings['New game with handicap'] = 'Neues Handicap-Spiel';
-$a->strings['Three dimensional tic-tac-toe is just like the traditional game except that it is played on multiple levels simultaneously. '] = '3D-Tic-Tac-Toe ist genauso wie das herkömmliche Spiel, nur das man es auf mehreren Ebenen gleichzeitig spielt.';
-$a->strings['In this case there are three levels. You win by getting three in a row on any level, as well as up, down, and diagonally across the different levels.'] = 'In diesem Fall sind es drei Ebenen. Man gewinnt, indem man drei in einer Reihe auf einer beliebigen Ebene schafft, oder drei übereinander oder diagonal auf verschiedenen Ebenen.';
-$a->strings['The handicap game disables the center position on the middle level because the player claiming this square often has an unfair advantage.'] = 'Beim Handicap-Spiel wird die zentrale Position der mittleren Ebene gesperrt, da der Spieler, der diese Ebene besitzt, oft einen unfairen Vorteil genießt.';
-$a->strings['You go first...'] = 'Du fängst an...';
-$a->strings['I\'m going first this time...'] = 'Diesmal fange ich an...';
-$a->strings['You won!'] = 'Du gewinnst!';
-$a->strings['"Cat" game!'] = 'Unentschieden!';
-$a->strings['I won!'] = 'Ich gewinne!';
+;
+$a->strings["Three Dimensional Tic-Tac-Toe"] = "Dreidimensionales Tic-Tac-Toe";
+$a->strings["3D Tic-Tac-Toe"] = "3D Tic-Tac-Toe";
+$a->strings["New game"] = "Neues Spiel";
+$a->strings["New game with handicap"] = "Neues Handicap Spiel";
+$a->strings["Three dimensional tic-tac-toe is just like the traditional game except that it is played on multiple levels simultaneously. "] = "3D-Tic-Tac-Toe ist genauso wie das herkömmliche Spiel, nur das man es auf mehreren Ebenen gleichzeitig spielt.";
+$a->strings["In this case there are three levels. You win by getting three in a row on any level, as well as up, down, and diagonally across the different levels."] = "In diesem Fall sind es drei Ebenen. Man gewinnt indem man drei in einer Reihe auf einer beliebigen Reihe schafft, oder drei übereinander oder diagonal auf verschiedenen Ebenen.";
+$a->strings["The handicap game disables the center position on the middle level because the player claiming this square often has an unfair advantage."] = "Beim Handicap-Spiel wird die zentrale Position der mittleren Ebene gesperrt da der Spieler der diese Ebene besitzt oft einen unfairen Vorteil genießt.";
+$a->strings["You go first..."] = "Du fängst an...";
+$a->strings["I'm going first this time..."] = "Diesmal fange ich an...";
+$a->strings["You won!"] = "Du gewinnst!";
+$a->strings["\"Cat\" game!"] = "Unentschieden!";
+$a->strings["I won!"] = "Ich gewinne!";
diff --git a/tictac/lang/es/strings.php b/tictac/lang/es/strings.php
index f352a2aa..600c84cf 100644
--- a/tictac/lang/es/strings.php
+++ b/tictac/lang/es/strings.php
@@ -2,18 +2,18 @@
 
 if(! function_exists("string_plural_select_es")) {
 function string_plural_select_es($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Three Dimensional Tic-Tac-Toe'] = 'Tic-Tac-Toe tridimensional';
-$a->strings['3D Tic-Tac-Toe'] = '3D Tic-Tac-Toe';
-$a->strings['New game'] = 'Nuevo juego';
-$a->strings['New game with handicap'] = 'Nuevo juego con desventajas';
-$a->strings['Three dimensional tic-tac-toe is just like the traditional game except that it is played on multiple levels simultaneously. '] = 'El Tic-tac-toe tridimensional es como el juego tradicional excepto porque se juega en múltiples niveles simultáneamente. ';
-$a->strings['In this case there are three levels. You win by getting three in a row on any level, as well as up, down, and diagonally across the different levels.'] = 'En este caso hay tres niveles. Usted gana consiguiendo tres seguidos en cualquier nivel, así como cruzando arriba, abajo y diagonalmente los distintos niveles.';
-$a->strings['The handicap game disables the center position on the middle level because the player claiming this square often has an unfair advantage.'] = 'El juego con desventajas deshabilita la posición central en el nivel medio porque la capa de este cuadrado a menudo tiene una ventaja injusta.';
-$a->strings['You go first...'] = 'Usted va primero...';
-$a->strings['I\'m going first this time...'] = 'Yo voy primero esta vez...';
-$a->strings['You won!'] = '¡Usted ha ganado!';
-$a->strings['"Cat" game!'] = '¡Juego "Gato"!';
-$a->strings['I won!'] = '¡Yo gané!';
+;
+$a->strings["Three Dimensional Tic-Tac-Toe"] = "Tic-Tac-Toe tridimensional";
+$a->strings["3D Tic-Tac-Toe"] = "3D Tic-Tac-Toe";
+$a->strings["New game"] = "Nuevo juego";
+$a->strings["New game with handicap"] = "Nuevo juego con desventajas";
+$a->strings["Three dimensional tic-tac-toe is just like the traditional game except that it is played on multiple levels simultaneously. "] = "El Tic-tac-toe tridimensional es como el juego tradicional excepto porque se juega en múltiples niveles simultáneamente. ";
+$a->strings["In this case there are three levels. You win by getting three in a row on any level, as well as up, down, and diagonally across the different levels."] = "En este caso hay tres niveles. Usted gana consiguiendo tres seguidos en cualquier nivel, así como cruzando arriba, abajo y diagonalmente los distintos niveles.";
+$a->strings["The handicap game disables the center position on the middle level because the player claiming this square often has an unfair advantage."] = "El juego con desventajas deshabilita la posición central en el nivel medio porque la capa de este cuadrado a menudo tiene una ventaja injusta.";
+$a->strings["You go first..."] = "Usted va primero...";
+$a->strings["I'm going first this time..."] = "Yo voy primero esta vez...";
+$a->strings["You won!"] = "¡Usted ha ganado!";
+$a->strings["\"Cat\" game!"] = "¡Juego \"Gato\"!";
+$a->strings["I won!"] = "¡Yo gané!";
diff --git a/tictac/lang/fi-fi/strings.php b/tictac/lang/fi-fi/strings.php
index 52f6cd3e..2cb1f7d7 100644
--- a/tictac/lang/fi-fi/strings.php
+++ b/tictac/lang/fi-fi/strings.php
@@ -2,14 +2,18 @@
 
 if(! function_exists("string_plural_select_fi_fi")) {
 function string_plural_select_fi_fi($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Three Dimensional Tic-Tac-Toe'] = 'Kolmiulotteinen ristinolla';
-$a->strings['3D Tic-Tac-Toe'] = '3D ristinolla';
-$a->strings['New game'] = 'Uusi peli';
-$a->strings['New game with handicap'] = 'Uusi peli haitalla';
-$a->strings['You go first...'] = 'Aloita sinä...';
-$a->strings['I\'m going first this time...'] = 'Minä aloitan...';
-$a->strings['You won!'] = 'Sinä voitit!';
-$a->strings['I won!'] = 'Minä voitin!';
+;
+$a->strings["Three Dimensional Tic-Tac-Toe"] = "Kolmiulotteinen ristinolla";
+$a->strings["3D Tic-Tac-Toe"] = "3D ristinolla";
+$a->strings["New game"] = "Uusi peli";
+$a->strings["New game with handicap"] = "Uusi peli haitalla";
+$a->strings["Three dimensional tic-tac-toe is just like the traditional game except that it is played on multiple levels simultaneously. "] = "";
+$a->strings["In this case there are three levels. You win by getting three in a row on any level, as well as up, down, and diagonally across the different levels."] = "";
+$a->strings["The handicap game disables the center position on the middle level because the player claiming this square often has an unfair advantage."] = "";
+$a->strings["You go first..."] = "Aloita sinä...";
+$a->strings["I'm going first this time..."] = "Minä aloitan...";
+$a->strings["You won!"] = "Sinä voitit!";
+$a->strings["\"Cat\" game!"] = "";
+$a->strings["I won!"] = "Minä voitin!";
diff --git a/tictac/lang/fr/messages.po b/tictac/lang/fr/messages.po
deleted file mode 100644
index 61af781d..00000000
--- a/tictac/lang/fr/messages.po
+++ /dev/null
@@ -1,75 +0,0 @@
-# ADDON tictac
-# Copyright (C)
-# This file is distributed under the same license as the Friendica tictac addon package.
-# 
-# 
-# Translators:
-# ButterflyOfFire, 2020
-# Nicolas Derive, 2022
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2014-06-23 12:57+0000\n"
-"Last-Translator: Nicolas Derive, 2022\n"
-"Language-Team: French (http://www.transifex.com/Friendica/friendica/language/fr/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: fr\n"
-"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
-
-#: tictac.php:16
-msgid "Three Dimensional Tic-Tac-Toe"
-msgstr "Morpion tri-dimensionnel"
-
-#: tictac.php:49
-msgid "3D Tic-Tac-Toe"
-msgstr "Morpion 3D"
-
-#: tictac.php:54
-msgid "New game"
-msgstr "Nouvelle partie"
-
-#: tictac.php:55
-msgid "New game with handicap"
-msgstr "Nouvelle partie avec handicap"
-
-#: tictac.php:56
-msgid ""
-"Three dimensional tic-tac-toe is just like the traditional game except that "
-"it is played on multiple levels simultaneously. "
-msgstr "Le morpion tri-dimensionnel est comme le jeu traditionnel, si ce n'est qu'il se joue sur plusieurs niveaux simultanément."
-
-#: tictac.php:57
-msgid ""
-"In this case there are three levels. You win by getting three in a row on "
-"any level, as well as up, down, and diagonally across the different levels."
-msgstr "Dans ce cas, il y a trois niveaux. Vous pouvez gagner en alignant trois signes à la suite sur n'importe quel niveau, aussi bien vers le haut, vers le bas, qu'en diagonale à travers les différents niveaux."
-
-#: tictac.php:59
-msgid ""
-"The handicap game disables the center position on the middle level because "
-"the player claiming this square often has an unfair advantage."
-msgstr "Le jeu avec handicap désactive la position centrale du niveau du milieu car le joueur occupant cette case a souvent un avantage disproportionné."
-
-#: tictac.php:178
-msgid "You go first..."
-msgstr "Vous commencez..."
-
-#: tictac.php:183
-msgid "I'm going first this time..."
-msgstr "Je commence cette fois-ci..."
-
-#: tictac.php:189
-msgid "You won!"
-msgstr "Vous avez gagné !"
-
-#: tictac.php:195 tictac.php:220
-msgid "\"Cat\" game!"
-msgstr "Match nul !"
-
-#: tictac.php:218
-msgid "I won!"
-msgstr "J’ai gagné !"
diff --git a/tictac/lang/fr/strings.php b/tictac/lang/fr/strings.php
index 3175a245..44a77c19 100644
--- a/tictac/lang/fr/strings.php
+++ b/tictac/lang/fr/strings.php
@@ -1,19 +1,14 @@
-<?php
-
-if(! function_exists("string_plural_select_fr")) {
-function string_plural_select_fr($n){
-	$n = intval($n);
-	if (($n == 0 || $n == 1)) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
-}}
-$a->strings['Three Dimensional Tic-Tac-Toe'] = 'Morpion tri-dimensionnel';
-$a->strings['3D Tic-Tac-Toe'] = 'Morpion 3D';
-$a->strings['New game'] = 'Nouvelle partie';
-$a->strings['New game with handicap'] = 'Nouvelle partie avec handicap';
-$a->strings['Three dimensional tic-tac-toe is just like the traditional game except that it is played on multiple levels simultaneously. '] = 'Le morpion tri-dimensionnel est comme le jeu traditionnel, si ce n\'est qu\'il se joue sur plusieurs niveaux simultanément.';
-$a->strings['In this case there are three levels. You win by getting three in a row on any level, as well as up, down, and diagonally across the different levels.'] = 'Dans ce cas, il y a trois niveaux. Vous pouvez gagner en alignant trois signes à la suite sur n\'importe quel niveau, aussi bien vers le haut, vers le bas, qu\'en diagonale à travers les différents niveaux.';
-$a->strings['The handicap game disables the center position on the middle level because the player claiming this square often has an unfair advantage.'] = 'Le jeu avec handicap désactive la position centrale du niveau du milieu car le joueur occupant cette case a souvent un avantage disproportionné.';
-$a->strings['You go first...'] = 'Vous commencez...';
-$a->strings['I\'m going first this time...'] = 'Je commence cette fois-ci...';
-$a->strings['You won!'] = 'Vous avez gagné !';
-$a->strings['"Cat" game!'] = 'Match nul !';
-$a->strings['I won!'] = 'J’ai gagné !';
+<?php
+
+$a->strings["Three Dimensional Tic-Tac-Toe"] = "Morpion en trois dimensions";
+$a->strings["3D Tic-Tac-Toe"] = "Morpion 3D";
+$a->strings["New game"] = "Nouvelle partie";
+$a->strings["New game with handicap"] = "Nouvelle partie avec handicap";
+$a->strings["Three dimensional tic-tac-toe is just like the traditional game except that it is played on multiple levels simultaneously. "] = "Le morpion 3D, c'est comme la version traditionnelle. Sauf qu'on joue sur plusieurs étages en même temps.";
+$a->strings["In this case there are three levels. You win by getting three in a row on any level, as well as up, down, and diagonally across the different levels."] = "Dans le cas qui nous concerne, il y a trois étages. Vous gagnez en alignant trois coups dans n'importe quel étage, ainsi que verticalement ou en diagonale entre les étages.";
+$a->strings["The handicap game disables the center position on the middle level because the player claiming this square often has an unfair advantage."] = "Le handicap interdit la position centrale de l'étage du milieu, parce que le joueur qui prend cette case obtient souvent un avantage.";
+$a->strings["You go first..."] = "À vous de jouer...";
+$a->strings["I'm going first this time..."] = "Je commence...";
+$a->strings["You won!"] = "Vous avez gagné!";
+$a->strings["\"Cat\" game!"] = "Match nul!";
+$a->strings["I won!"] = "J'ai gagné!";
diff --git a/tictac/lang/hu/messages.po b/tictac/lang/hu/messages.po
deleted file mode 100644
index 6eeffca1..00000000
--- a/tictac/lang/hu/messages.po
+++ /dev/null
@@ -1,74 +0,0 @@
-# ADDON tictac
-# Copyright (C)
-# This file is distributed under the same license as the Friendica tictac addon package.
-# 
-# 
-# Translators:
-# Balázs Úr, 2020-2021
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2014-06-23 12:57+0000\n"
-"Last-Translator: Balázs Úr, 2020-2021\n"
-"Language-Team: Hungarian (http://www.transifex.com/Friendica/friendica/language/hu/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: hu\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: tictac.php:16
-msgid "Three Dimensional Tic-Tac-Toe"
-msgstr "Háromdimenziós tic-tac-toe"
-
-#: tictac.php:49
-msgid "3D Tic-Tac-Toe"
-msgstr "3D tic-tac-toe"
-
-#: tictac.php:54
-msgid "New game"
-msgstr "Új játék"
-
-#: tictac.php:55
-msgid "New game with handicap"
-msgstr "Új játék hátránnyal"
-
-#: tictac.php:56
-msgid ""
-"Three dimensional tic-tac-toe is just like the traditional game except that "
-"it is played on multiple levels simultaneously. "
-msgstr "A háromdimenziós tic-tac-toe olyan mint a hagyományos játék, kivéve hogy ezt egyidejűleg több szinten játsszák."
-
-#: tictac.php:57
-msgid ""
-"In this case there are three levels. You win by getting three in a row on "
-"any level, as well as up, down, and diagonally across the different levels."
-msgstr "Ebben az esetben három szint van. Akkor nyeri meg a játékot, ha letesz hármat egy sorba bármely szinten, valamint fel, le és átlósan a különböző szintek között."
-
-#: tictac.php:59
-msgid ""
-"The handicap game disables the center position on the middle level because "
-"the player claiming this square often has an unfair advantage."
-msgstr "A hátránnyal indított játék letiltja a középső pozíciót a középső szinten, mert azt a négyzetet megszerző játékos gyakran tisztességtelen előnyt szerez."
-
-#: tictac.php:178
-msgid "You go first..."
-msgstr "Ön lép először…"
-
-#: tictac.php:183
-msgid "I'm going first this time..."
-msgstr "Most én lépek először…"
-
-#: tictac.php:189
-msgid "You won!"
-msgstr "Ön nyert!"
-
-#: tictac.php:195 tictac.php:220
-msgid "\"Cat\" game!"
-msgstr "„Macska” játék!"
-
-#: tictac.php:218
-msgid "I won!"
-msgstr "Én nyertem!"
diff --git a/tictac/lang/hu/strings.php b/tictac/lang/hu/strings.php
deleted file mode 100644
index ee2b1b73..00000000
--- a/tictac/lang/hu/strings.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_hu")) {
-function string_plural_select_hu($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Three Dimensional Tic-Tac-Toe'] = 'Háromdimenziós tic-tac-toe';
-$a->strings['3D Tic-Tac-Toe'] = '3D tic-tac-toe';
-$a->strings['New game'] = 'Új játék';
-$a->strings['New game with handicap'] = 'Új játék hátránnyal';
-$a->strings['Three dimensional tic-tac-toe is just like the traditional game except that it is played on multiple levels simultaneously. '] = 'A háromdimenziós tic-tac-toe olyan mint a hagyományos játék, kivéve hogy ezt egyidejűleg több szinten játsszák.';
-$a->strings['In this case there are three levels. You win by getting three in a row on any level, as well as up, down, and diagonally across the different levels.'] = 'Ebben az esetben három szint van. Akkor nyeri meg a játékot, ha letesz hármat egy sorba bármely szinten, valamint fel, le és átlósan a különböző szintek között.';
-$a->strings['The handicap game disables the center position on the middle level because the player claiming this square often has an unfair advantage.'] = 'A hátránnyal indított játék letiltja a középső pozíciót a középső szinten, mert azt a négyzetet megszerző játékos gyakran tisztességtelen előnyt szerez.';
-$a->strings['You go first...'] = 'Ön lép először…';
-$a->strings['I\'m going first this time...'] = 'Most én lépek először…';
-$a->strings['You won!'] = 'Ön nyert!';
-$a->strings['"Cat" game!'] = '„Macska” játék!';
-$a->strings['I won!'] = 'Én nyertem!';
diff --git a/tictac/lang/it/messages.po b/tictac/lang/it/messages.po
index e8f01e49..fc0458f1 100644
--- a/tictac/lang/it/messages.po
+++ b/tictac/lang/it/messages.po
@@ -9,66 +9,66 @@ msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2014-06-23 12:57+0000\n"
-"Last-Translator: fabrixxm <fabrix.xm@gmail.com>, 2014\n"
-"Language-Team: Italian (http://app.transifex.com/Friendica/friendica/language/it/)\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2017-09-20 06:09+0000\n"
+"Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n"
+"Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: it\n"
-"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: tictac.php:16
+#: tictac.php:20
 msgid "Three Dimensional Tic-Tac-Toe"
 msgstr "Tic-Tac-Toe tridimensionale"
 
-#: tictac.php:49
+#: tictac.php:53
 msgid "3D Tic-Tac-Toe"
 msgstr "3D Tic-Tac-Toe"
 
-#: tictac.php:54
+#: tictac.php:58
 msgid "New game"
 msgstr "Nuova partita"
 
-#: tictac.php:55
+#: tictac.php:59
 msgid "New game with handicap"
 msgstr "Nuova partita con handicap"
 
-#: tictac.php:56
+#: tictac.php:60
 msgid ""
 "Three dimensional tic-tac-toe is just like the traditional game except that "
 "it is played on multiple levels simultaneously. "
 msgstr "Tic-tac-toe tridimensionale è come il gioco tradizionale, solo che si gioca su livelli multipli contemporaneamente."
 
-#: tictac.php:57
+#: tictac.php:61
 msgid ""
 "In this case there are three levels. You win by getting three in a row on "
 "any level, as well as up, down, and diagonally across the different levels."
 msgstr "In questo caso ci sono tre livelli. Puoi vincere mettendo tre segni in fila su ogni livello, anche verso l'alto, il basso e diagonalmente anche attraverso i diversi livelli."
 
-#: tictac.php:59
+#: tictac.php:63
 msgid ""
 "The handicap game disables the center position on the middle level because "
 "the player claiming this square often has an unfair advantage."
 msgstr "L'handicap disabilita la casella centrale sul livello di mezzo, perchè il giocatore che si prende quella casella spesso ha un deciso vantaggio."
 
-#: tictac.php:178
+#: tictac.php:182
 msgid "You go first..."
 msgstr "Cominci tu..."
 
-#: tictac.php:183
+#: tictac.php:187
 msgid "I'm going first this time..."
 msgstr "Comincio io questa volta..."
 
-#: tictac.php:189
+#: tictac.php:193
 msgid "You won!"
 msgstr "Hai vinto!"
 
-#: tictac.php:195 tictac.php:220
+#: tictac.php:199 tictac.php:224
 msgid "\"Cat\" game!"
 msgstr "Stallo!"
 
-#: tictac.php:218
+#: tictac.php:222
 msgid "I won!"
 msgstr "Ho vinto!"
diff --git a/tictac/lang/it/strings.php b/tictac/lang/it/strings.php
index 716be3c2..14506636 100644
--- a/tictac/lang/it/strings.php
+++ b/tictac/lang/it/strings.php
@@ -2,18 +2,18 @@
 
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
-	$n = intval($n);
-	if ($n == 1) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
+	return ($n != 1);;
 }}
-$a->strings['Three Dimensional Tic-Tac-Toe'] = 'Tic-Tac-Toe tridimensionale';
-$a->strings['3D Tic-Tac-Toe'] = '3D Tic-Tac-Toe';
-$a->strings['New game'] = 'Nuova partita';
-$a->strings['New game with handicap'] = 'Nuova partita con handicap';
-$a->strings['Three dimensional tic-tac-toe is just like the traditional game except that it is played on multiple levels simultaneously. '] = 'Tic-tac-toe tridimensionale è come il gioco tradizionale, solo che si gioca su livelli multipli contemporaneamente.';
-$a->strings['In this case there are three levels. You win by getting three in a row on any level, as well as up, down, and diagonally across the different levels.'] = 'In questo caso ci sono tre livelli. Puoi vincere mettendo tre segni in fila su ogni livello, anche verso l\'alto, il basso e diagonalmente anche attraverso i diversi livelli.';
-$a->strings['The handicap game disables the center position on the middle level because the player claiming this square often has an unfair advantage.'] = 'L\'handicap disabilita la casella centrale sul livello di mezzo, perchè il giocatore che si prende quella casella spesso ha un deciso vantaggio.';
-$a->strings['You go first...'] = 'Cominci tu...';
-$a->strings['I\'m going first this time...'] = 'Comincio io questa volta...';
-$a->strings['You won!'] = 'Hai vinto!';
-$a->strings['"Cat" game!'] = 'Stallo!';
-$a->strings['I won!'] = 'Ho vinto!';
+;
+$a->strings["Three Dimensional Tic-Tac-Toe"] = "Tic-Tac-Toe tridimensionale";
+$a->strings["3D Tic-Tac-Toe"] = "3D Tic-Tac-Toe";
+$a->strings["New game"] = "Nuova partita";
+$a->strings["New game with handicap"] = "Nuova partita con handicap";
+$a->strings["Three dimensional tic-tac-toe is just like the traditional game except that it is played on multiple levels simultaneously. "] = "Tic-tac-toe tridimensionale è come il gioco tradizionale, solo che si gioca su livelli multipli contemporaneamente.";
+$a->strings["In this case there are three levels. You win by getting three in a row on any level, as well as up, down, and diagonally across the different levels."] = "In questo caso ci sono tre livelli. Puoi vincere mettendo tre segni in fila su ogni livello, anche verso l'alto, il basso e diagonalmente anche attraverso i diversi livelli.";
+$a->strings["The handicap game disables the center position on the middle level because the player claiming this square often has an unfair advantage."] = "L'handicap disabilita la casella centrale sul livello di mezzo, perchè il giocatore che si prende quella casella spesso ha un deciso vantaggio.";
+$a->strings["You go first..."] = "Cominci tu...";
+$a->strings["I'm going first this time..."] = "Comincio io questa volta...";
+$a->strings["You won!"] = "Hai vinto!";
+$a->strings["\"Cat\" game!"] = "Stallo!";
+$a->strings["I won!"] = "Ho vinto!";
diff --git a/tictac/lang/nl/strings.php b/tictac/lang/nl/strings.php
index 5c1c5c44..ad0d122e 100644
--- a/tictac/lang/nl/strings.php
+++ b/tictac/lang/nl/strings.php
@@ -3,7 +3,18 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Three Dimensional Tic-Tac-Toe'] = '3D Tic-Tac-Toe';
-$a->strings['3D Tic-Tac-Toe'] = '3D Tic-Tac-Toe ';
+;
+$a->strings["Three Dimensional Tic-Tac-Toe"] = "3D Tic-Tac-Toe";
+$a->strings["3D Tic-Tac-Toe"] = "3D Tic-Tac-Toe ";
+$a->strings["New game"] = "";
+$a->strings["New game with handicap"] = "";
+$a->strings["Three dimensional tic-tac-toe is just like the traditional game except that it is played on multiple levels simultaneously. "] = "";
+$a->strings["In this case there are three levels. You win by getting three in a row on any level, as well as up, down, and diagonally across the different levels."] = "";
+$a->strings["The handicap game disables the center position on the middle level because the player claiming this square often has an unfair advantage."] = "";
+$a->strings["You go first..."] = "";
+$a->strings["I'm going first this time..."] = "";
+$a->strings["You won!"] = "";
+$a->strings["\"Cat\" game!"] = "";
+$a->strings["I won!"] = "";
diff --git a/tictac/lang/pl/messages.po b/tictac/lang/pl/messages.po
index 7cbe4328..8646aca0 100644
--- a/tictac/lang/pl/messages.po
+++ b/tictac/lang/pl/messages.po
@@ -4,14 +4,14 @@
 # 
 # 
 # Translators:
-# Waldemar Stoczkowski, 2018
+# Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2014-06-23 12:57+0000\n"
-"Last-Translator: Waldemar Stoczkowski, 2018\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2018-08-05 15:52+0000\n"
+"Last-Translator: Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.com/Friendica/friendica/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,56 +19,56 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
-#: tictac.php:16
+#: tictac.php:20
 msgid "Three Dimensional Tic-Tac-Toe"
 msgstr "Trójwymiarowe Kółko i Krzyżyk"
 
-#: tictac.php:49
+#: tictac.php:53
 msgid "3D Tic-Tac-Toe"
 msgstr "3D Kółko i Krzyżyk"
 
-#: tictac.php:54
+#: tictac.php:58
 msgid "New game"
 msgstr "Nowa gra"
 
-#: tictac.php:55
+#: tictac.php:59
 msgid "New game with handicap"
 msgstr "Nowa gra z handicapem"
 
-#: tictac.php:56
+#: tictac.php:60
 msgid ""
 "Three dimensional tic-tac-toe is just like the traditional game except that "
 "it is played on multiple levels simultaneously. "
 msgstr "Zasady gry w Trójwymiarowe Kółko i Krzyżyk są takie same jak w tradycyjnej grze, z tym wyjątkiem, że gra się na wielu poziomach jednocześnie."
 
-#: tictac.php:57
+#: tictac.php:61
 msgid ""
 "In this case there are three levels. You win by getting three in a row on "
 "any level, as well as up, down, and diagonally across the different levels."
 msgstr "W tym przypadku istnieją trzy poziomy. Wygrywasz, jeśli ustawisz trzy znaki w rzędzie na dowolnym poziomie, a także w górę, w dół i po przekątnej na różnych poziomach."
 
-#: tictac.php:59
+#: tictac.php:63
 msgid ""
 "The handicap game disables the center position on the middle level because "
 "the player claiming this square often has an unfair advantage."
 msgstr "Gra z handicapem wyłącza środkową pozycję na środkowym poziomie, ponieważ gracz zdobywający ten kwadrat często ma nieuczciwą przewagę."
 
-#: tictac.php:178
+#: tictac.php:182
 msgid "You go first..."
 msgstr "Rozpocznij pierwszy..."
 
-#: tictac.php:183
+#: tictac.php:187
 msgid "I'm going first this time..."
 msgstr "Tym razem rozpoczynam pierwszy..."
 
-#: tictac.php:189
+#: tictac.php:193
 msgid "You won!"
 msgstr "Wygrałeś!"
 
-#: tictac.php:195 tictac.php:220
+#: tictac.php:199 tictac.php:224
 msgid "\"Cat\" game!"
 msgstr "Gra \"Kot\"!"
 
-#: tictac.php:218
+#: tictac.php:222
 msgid "I won!"
 msgstr "Wygrałem!"
diff --git a/tictac/lang/pl/strings.php b/tictac/lang/pl/strings.php
index 95fa220f..de3646ac 100644
--- a/tictac/lang/pl/strings.php
+++ b/tictac/lang/pl/strings.php
@@ -3,17 +3,18 @@
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
 	$n = intval($n);
-	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
+	return ($n==1 ? 0 : ($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14) ? 1 : $n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14) ? 2 : 3);;
 }}
-$a->strings['Three Dimensional Tic-Tac-Toe'] = 'Trójwymiarowe Kółko i Krzyżyk';
-$a->strings['3D Tic-Tac-Toe'] = '3D Kółko i Krzyżyk';
-$a->strings['New game'] = 'Nowa gra';
-$a->strings['New game with handicap'] = 'Nowa gra z handicapem';
-$a->strings['Three dimensional tic-tac-toe is just like the traditional game except that it is played on multiple levels simultaneously. '] = 'Zasady gry w Trójwymiarowe Kółko i Krzyżyk są takie same jak w tradycyjnej grze, z tym wyjątkiem, że gra się na wielu poziomach jednocześnie.';
-$a->strings['In this case there are three levels. You win by getting three in a row on any level, as well as up, down, and diagonally across the different levels.'] = 'W tym przypadku istnieją trzy poziomy. Wygrywasz, jeśli ustawisz trzy znaki w rzędzie na dowolnym poziomie, a także w górę, w dół i po przekątnej na różnych poziomach.';
-$a->strings['The handicap game disables the center position on the middle level because the player claiming this square often has an unfair advantage.'] = 'Gra z handicapem wyłącza środkową pozycję na środkowym poziomie, ponieważ gracz zdobywający ten kwadrat często ma nieuczciwą przewagę.';
-$a->strings['You go first...'] = 'Rozpocznij pierwszy...';
-$a->strings['I\'m going first this time...'] = 'Tym razem rozpoczynam pierwszy...';
-$a->strings['You won!'] = 'Wygrałeś!';
-$a->strings['"Cat" game!'] = 'Gra "Kot"!';
-$a->strings['I won!'] = 'Wygrałem!';
+;
+$a->strings["Three Dimensional Tic-Tac-Toe"] = "Trójwymiarowe Kółko i Krzyżyk";
+$a->strings["3D Tic-Tac-Toe"] = "3D Kółko i Krzyżyk";
+$a->strings["New game"] = "Nowa gra";
+$a->strings["New game with handicap"] = "Nowa gra z handicapem";
+$a->strings["Three dimensional tic-tac-toe is just like the traditional game except that it is played on multiple levels simultaneously. "] = "Zasady gry w Trójwymiarowe Kółko i Krzyżyk są takie same jak w tradycyjnej grze, z tym wyjątkiem, że gra się na wielu poziomach jednocześnie.";
+$a->strings["In this case there are three levels. You win by getting three in a row on any level, as well as up, down, and diagonally across the different levels."] = "W tym przypadku istnieją trzy poziomy. Wygrywasz, jeśli ustawisz trzy znaki w rzędzie na dowolnym poziomie, a także w górę, w dół i po przekątnej na różnych poziomach.";
+$a->strings["The handicap game disables the center position on the middle level because the player claiming this square often has an unfair advantage."] = "Gra z handicapem wyłącza środkową pozycję na środkowym poziomie, ponieważ gracz zdobywający ten kwadrat często ma nieuczciwą przewagę.";
+$a->strings["You go first..."] = "Rozpocznij pierwszy...";
+$a->strings["I'm going first this time..."] = "Tym razem rozpoczynam pierwszy...";
+$a->strings["You won!"] = "Wygrałeś!";
+$a->strings["\"Cat\" game!"] = "Gra \"Kot\"!";
+$a->strings["I won!"] = "Wygrałem!";
diff --git a/tictac/lang/pt-br/strings.php b/tictac/lang/pt-br/strings.php
index 905cf5be..55d91195 100644
--- a/tictac/lang/pt-br/strings.php
+++ b/tictac/lang/pt-br/strings.php
@@ -2,18 +2,18 @@
 
 if(! function_exists("string_plural_select_pt_br")) {
 function string_plural_select_pt_br($n){
-	$n = intval($n);
-	return intval($n > 1);
+	return ($n > 1);;
 }}
-$a->strings['Three Dimensional Tic-Tac-Toe'] = 'Jogo da Velha Tridimensional';
-$a->strings['3D Tic-Tac-Toe'] = 'Jogo da Velha 3D';
-$a->strings['New game'] = 'Novo jogo';
-$a->strings['New game with handicap'] = 'Novo jogo com limitador';
-$a->strings['Three dimensional tic-tac-toe is just like the traditional game except that it is played on multiple levels simultaneously. '] = 'O jogo da velha tridimensional é como o jogo tradicional, exceto por ser jogado em vários níveis simultaneamente.';
-$a->strings['In this case there are three levels. You win by getting three in a row on any level, as well as up, down, and diagonally across the different levels.'] = 'Neste caso, há três níveis. Vence quem conseguir alinhar três quadrados em qualquer um dos níveis, assim como para cima, para baixo e na diagonal, em níveis diferentes.';
-$a->strings['The handicap game disables the center position on the middle level because the player claiming this square often has an unfair advantage.'] = 'No jogo com limitador, a posição central do nível do meio é desativada, porque o jogador que marcasse esse quadrado teria uma vantagem injusta.';
-$a->strings['You go first...'] = 'Você vai primeiro...';
-$a->strings['I\'m going first this time...'] = 'Eu vou primeiro desta vez...';
-$a->strings['You won!'] = 'Você venceu!';
-$a->strings['"Cat" game!'] = 'Empatamos!';
-$a->strings['I won!'] = 'Venci!';
+;
+$a->strings["Three Dimensional Tic-Tac-Toe"] = "Jogo da Velha Tridimensional";
+$a->strings["3D Tic-Tac-Toe"] = "Jogo da Velha 3D";
+$a->strings["New game"] = "Novo jogo";
+$a->strings["New game with handicap"] = "Novo jogo com limitador";
+$a->strings["Three dimensional tic-tac-toe is just like the traditional game except that it is played on multiple levels simultaneously. "] = "O jogo da velha tridimensional é como o jogo tradicional, exceto por ser jogado em vários níveis simultaneamente.";
+$a->strings["In this case there are three levels. You win by getting three in a row on any level, as well as up, down, and diagonally across the different levels."] = "Neste caso, há três níveis. Vence quem conseguir alinhar três quadrados em qualquer um dos níveis, assim como para cima, para baixo e na diagonal, em níveis diferentes.";
+$a->strings["The handicap game disables the center position on the middle level because the player claiming this square often has an unfair advantage."] = "No jogo com limitador, a posição central do nível do meio é desativada, porque o jogador que marcasse esse quadrado teria uma vantagem injusta.";
+$a->strings["You go first..."] = "Você vai primeiro...";
+$a->strings["I'm going first this time..."] = "Eu vou primeiro desta vez...";
+$a->strings["You won!"] = "Você venceu!";
+$a->strings["\"Cat\" game!"] = "Empatamos!";
+$a->strings["I won!"] = "Venci!";
diff --git a/tictac/lang/ro/strings.php b/tictac/lang/ro/strings.php
index ab502dc9..5b0c79e6 100644
--- a/tictac/lang/ro/strings.php
+++ b/tictac/lang/ro/strings.php
@@ -2,18 +2,18 @@
 
 if(! function_exists("string_plural_select_ro")) {
 function string_plural_select_ro($n){
-	$n = intval($n);
-	if ($n==1) { return 0; } else if ((($n%100>19)||(($n%100==0)&&($n!=0)))) { return 2; } else  { return 1; }
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
 }}
-$a->strings['Three Dimensional Tic-Tac-Toe'] = 'Tic-Tac-Toe Tridimensional';
-$a->strings['3D Tic-Tac-Toe'] = '3D Tic-Tac-Toe';
-$a->strings['New game'] = 'Joc nou';
-$a->strings['New game with handicap'] = 'Joc nou cu handicap';
-$a->strings['Three dimensional tic-tac-toe is just like the traditional game except that it is played on multiple levels simultaneously. '] = 'Tic-tac-toe Tridimensional este exact ca și jocul tradițional cu excepția faptului că acesta este jucat simultan pe multiple niveluri.';
-$a->strings['In this case there are three levels. You win by getting three in a row on any level, as well as up, down, and diagonally across the different levels.'] = 'În acest caz există trei niveluri. Câștigați prin obținerea a trei marcaje per line, la orice nivel, precum şi în sus, în jos, sau pe diagonală pe diferite niveluri.';
-$a->strings['The handicap game disables the center position on the middle level because the player claiming this square often has an unfair advantage.'] = 'Jocul cu handicap, dezactivează poziția centrală din nivelul mediu, deoarece jucătorul consideră că acest pătrat are adeseori un avantaj incorect.';
-$a->strings['You go first...'] = 'Bifează tu primul...';
-$a->strings['I\'m going first this time...'] = 'Bifez eu primul, de data aceasta ...';
-$a->strings['You won!'] = 'Ai câştigat!';
-$a->strings['"Cat" game!'] = 'Joc "Pisică" !';
-$a->strings['I won!'] = 'Am câştigat!';
+;
+$a->strings["Three Dimensional Tic-Tac-Toe"] = "Tic-Tac-Toe Tridimensional";
+$a->strings["3D Tic-Tac-Toe"] = "3D Tic-Tac-Toe";
+$a->strings["New game"] = "Joc nou";
+$a->strings["New game with handicap"] = "Joc nou cu handicap";
+$a->strings["Three dimensional tic-tac-toe is just like the traditional game except that it is played on multiple levels simultaneously. "] = "Tic-tac-toe Tridimensional este exact ca și jocul tradițional cu excepția faptului că acesta este jucat simultan pe multiple niveluri.";
+$a->strings["In this case there are three levels. You win by getting three in a row on any level, as well as up, down, and diagonally across the different levels."] = "În acest caz există trei niveluri. Câștigați prin obținerea a trei marcaje per line, la orice nivel, precum şi în sus, în jos, sau pe diagonală pe diferite niveluri.";
+$a->strings["The handicap game disables the center position on the middle level because the player claiming this square often has an unfair advantage."] = "Jocul cu handicap, dezactivează poziția centrală din nivelul mediu, deoarece jucătorul consideră că acest pătrat are adeseori un avantaj incorect.";
+$a->strings["You go first..."] = "Bifează tu primul...";
+$a->strings["I'm going first this time..."] = "Bifez eu primul, de data aceasta ...";
+$a->strings["You won!"] = "Ai câştigat!";
+$a->strings["\"Cat\" game!"] = "Joc \"Pisică\" !";
+$a->strings["I won!"] = "Am câştigat!";
diff --git a/tictac/lang/sv/messages.po b/tictac/lang/sv/messages.po
deleted file mode 100644
index a96d4b7e..00000000
--- a/tictac/lang/sv/messages.po
+++ /dev/null
@@ -1,74 +0,0 @@
-# ADDON tictac
-# Copyright (C)
-# This file is distributed under the same license as the Friendica tictac addon package.
-# 
-# 
-# Translators:
-# Kristoffer Grundström <lovaren@gmail.com>, 2022
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:15+0100\n"
-"PO-Revision-Date: 2022-01-16 00:54+0000\n"
-"Last-Translator: Kristoffer Grundström <lovaren@gmail.com>\n"
-"Language-Team: Swedish (http://www.transifex.com/Friendica/friendica/language/sv/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: sv\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: tictac.php:16
-msgid "Three Dimensional Tic-Tac-Toe"
-msgstr ""
-
-#: tictac.php:49
-msgid "3D Tic-Tac-Toe"
-msgstr ""
-
-#: tictac.php:54
-msgid "New game"
-msgstr "Nytt spel"
-
-#: tictac.php:55
-msgid "New game with handicap"
-msgstr "Nytt spel med handikapp"
-
-#: tictac.php:56
-msgid ""
-"Three dimensional tic-tac-toe is just like the traditional game except that "
-"it is played on multiple levels simultaneously. "
-msgstr ""
-
-#: tictac.php:57
-msgid ""
-"In this case there are three levels. You win by getting three in a row on "
-"any level, as well as up, down, and diagonally across the different levels."
-msgstr ""
-
-#: tictac.php:59
-msgid ""
-"The handicap game disables the center position on the middle level because "
-"the player claiming this square often has an unfair advantage."
-msgstr ""
-
-#: tictac.php:178
-msgid "You go first..."
-msgstr "Börja först du..."
-
-#: tictac.php:183
-msgid "I'm going first this time..."
-msgstr "Jag börjar först den här gången..."
-
-#: tictac.php:189
-msgid "You won!"
-msgstr "Du vann!"
-
-#: tictac.php:195 tictac.php:220
-msgid "\"Cat\" game!"
-msgstr "\"Katt\"-spel!"
-
-#: tictac.php:218
-msgid "I won!"
-msgstr "Jag vann!"
diff --git a/tictac/lang/sv/strings.php b/tictac/lang/sv/strings.php
index 8f3b51db..65f09512 100644
--- a/tictac/lang/sv/strings.php
+++ b/tictac/lang/sv/strings.php
@@ -1,14 +1,14 @@
-<?php
-
-if(! function_exists("string_plural_select_sv")) {
-function string_plural_select_sv($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['New game'] = 'Nytt spel';
-$a->strings['New game with handicap'] = 'Nytt spel med handikapp';
-$a->strings['You go first...'] = 'Börja först du...';
-$a->strings['I\'m going first this time...'] = 'Jag börjar först den här gången...';
-$a->strings['You won!'] = 'Du vann!';
-$a->strings['"Cat" game!'] = '"Katt"-spel!';
-$a->strings['I won!'] = 'Jag vann!';
+<?php
+
+$a->strings["Three Dimensional Tic-Tac-Toe"] = "Tredimensionellt luffarschack";
+$a->strings["3D Tic-Tac-Toe"] = "3D-luffarschack";
+$a->strings["New game"] = "Ny spelomg&aring;ng";
+$a->strings["New game with handicap"] = "Ny spelomg&aring;ng med handikapp";
+$a->strings["Three dimensional tic-tac-toe is just like the traditional game except that it is played on multiple levels simultaneously. "] = "Det tredimensionella luffarschacket &auml;r precis som vanligt luffarschack f&ouml;rutom att det spelas i flera niv&aring;er samtidigt. ";
+$a->strings["In this case there are three levels. You win by getting three in a row on any level, as well as up, down, and diagonally across the different levels."] = "H&auml;r &auml;r det tre niv&aring;er. Man vinner om man f&aring;r tre i rad p&aring; vilken niv&aring; som helst, eller upp&aring;t, ned&aring;t eller diagonalt p&aring; flera niv&aring;er.";
+$a->strings["The handicap game disables the center position on the middle level because the player claiming this square often has an unfair advantage."] = "Om man spelar med handikapp s&aring; st&auml;ngs mittenpositionen p&aring; mittenniv&aring;n av eftersom spelare som v&auml;ljer den positionen ofta f&aring;r &ouml;vertaget.";
+$a->strings["You go first..."] = "Du b&ouml;rjar...";
+$a->strings["I'm going first this time..."] = "Jag b&ouml;rjar den h&auml;r g&aring;ngen...";
+$a->strings["You won!"] = "Du vann!";
+$a->strings["\"Cat\" game!"] = "\"Cat\" game!";
+$a->strings["I won!"] = "Jag vann!";
diff --git a/tictac/tictac.php b/tictac/tictac.php
index 0f9f4fb6..ad0a6077 100644
--- a/tictac/tictac.php
+++ b/tictac/tictac.php
@@ -4,62 +4,65 @@
  * Description: The TicTacToe game application
  * Version: 1.0
  * Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
- * Status: unsupported
  */
-
-use Friendica\App;
+use Friendica\Core\Addon;
 use Friendica\Core\Hook;
-use Friendica\DI;
+use Friendica\Core\L10n;
 
-function tictac_install()
-{
+function tictac_install() {
 	Hook::register('app_menu', 'addon/tictac/tictac.php', 'tictac_app_menu');
 }
 
-function tictac_app_menu(array &$b)
-{
-	$b['app_menu'][] = '<div class="app-title"><a href="tictac">' . DI::l10n()->t('Three Dimensional Tic-Tac-Toe') . '</a></div>';
+function tictac_uninstall() {
+	Hook::unregister('app_menu', 'addon/tictac/tictac.php', 'tictac_app_menu');
+
 }
 
-/**
- * This is a statement rather than an actual function definition. The simple
- * existence of this method is checked to figure out if the addon offers a
- * module.
- */
-function tictac_module() {}
+function tictac_app_menu($a,&$b) {
+	$b['app_menu'][] = '<div class="app-title"><a href="tictac">' . L10n::t('Three Dimensional Tic-Tac-Toe') . '</a></div>';
+}
 
-function tictac_content() {
+
+function tictac_module() {
+	return;
+}
+
+
+
+
+
+function tictac_content(&$a) {
 
 	$o = '';
 
   if($_POST['move']) {
-    $handicap = DI::args()->get(1);
-    $mefirst = DI::args()->get(2);
-    $dimen = DI::args()->get(3);
-    $yours = DI::args()->get(4);
-    $mine  = DI::args()->get(5);
+    $handicap = $a->argv[1];
+    $mefirst = $a->argv[2];
+    $dimen = $a->argv[3];
+    $yours = $a->argv[4];
+    $mine  = $a->argv[5];
 
     $yours .= $_POST['move'];
   }
-  elseif(DI::args()->getArgc() > 1) {
-    $handicap = DI::args()->get(1);
+  elseif($a->argc > 1) {
+    $handicap = $a->argv[1];
     $dimen = 3;
   }
   else {
    $dimen = 3;
   }
 
-  $o .=  '<h3>' . DI::l10n()->t('3D Tic-Tac-Toe') . '</h3><br />';
+  $o .=  '<h3>' . L10n::t('3D Tic-Tac-Toe') . '</h3><br />';
 
   $t = new tictac($dimen,$handicap,$mefirst,$yours,$mine);
   $o .= $t->play();
 
-  $o .=  '<a href="tictac">' . DI::l10n()->t('New game') . '</a><br />';
-  $o .=  '<a href="tictac/1">' . DI::l10n()->t('New game with handicap') . '</a><br />';
-  $o .=  '<p>' . DI::l10n()->t('Three dimensional tic-tac-toe is just like the traditional game except that it is played on multiple levels simultaneously. ');
-  $o .= DI::l10n()->t('In this case there are three levels. You win by getting three in a row on any level, as well as up, down, and diagonally across the different levels.');
+  $o .=  '<a href="tictac">' . L10n::t('New game') . '</a><br />';
+  $o .=  '<a href="tictac/1">' . L10n::t('New game with handicap') . '</a><br />';
+  $o .=  '<p>' . L10n::t('Three dimensional tic-tac-toe is just like the traditional game except that it is played on multiple levels simultaneously. ');
+  $o .= L10n::t('In this case there are three levels. You win by getting three in a row on any level, as well as up, down, and diagonally across the different levels.');
   $o .= '</p><p>';
-  $o .= DI::l10n()->t('The handicap game disables the center position on the middle level because the player claiming this square often has an unfair advantage.');
+  $o .= L10n::t('The handicap game disables the center position on the middle level because the player claiming this square often has an unfair advantage.');
   $o .= '</p>';
 
   return $o;
@@ -178,24 +181,24 @@ class tictac {
 
      if($this->first_move) {
        if(rand(0,1) == 1) {
-         $o .=  '<div class="error-message">' . DI::l10n()->t('You go first...') . '</div><br />';
+         $o .=  '<div class="error-message">' . L10n::t('You go first...') . '</div><br />';
          $this->mefirst = 0;
          $o .= $this->draw_board();
          return $o;
        }
-       $o .=  '<div class="error-message">' . DI::l10n()->t('I\'m going first this time...') . ' </div><br />';
+       $o .=  '<div class="error-message">' . L10n::t('I\'m going first this time...') . ' </div><br />';
        $this->mefirst = 1;
 
      }
 
      if($this->check_youwin()) {
-       $o .=  '<div class="error-message">' . DI::l10n()->t('You won!') . '</div><br />';
+       $o .=  '<div class="error-message">' . L10n::t('You won!') . '</div><br />';
        $o .= $this->draw_board();
        return $o;
      }
 
      if($this->fullboard())
-       $o .=  '<div class="error-message">' . DI::l10n()->t('"Cat" game!') . '</div><br />';
+       $o .=  '<div class="error-message">' . L10n::t('"Cat" game!') . '</div><br />';
 
      $move = $this->winning_move();
      if(strlen($move)) {
@@ -218,9 +221,9 @@ class tictac {
      }
 
      if($this->check_iwon())
-       $o .=  '<div class="error-message">' . DI::l10n()->t('I won!') . '</div><br />';
+       $o .=  '<div class="error-message">' . L10n::t('I won!') . '</div><br />';
      if($this->fullboard())
-       $o .=  '<div class="error-message">' . DI::l10n()->t('"Cat" game!') . '</div><br />';
+       $o .=  '<div class="error-message">' . L10n::t('"Cat" game!') . '</div><br />';
      $o .= $this->draw_board();
 	return $o;
   }
diff --git a/tumblr/README.md b/tumblr/README.md
index 98ff2161..57ca145a 100644
--- a/tumblr/README.md
+++ b/tumblr/README.md
@@ -1,7 +1,12 @@
 Installation
 ------------
 
-[Register](http://www.tumblr.com/oauth/apps) an application and use (your server name)/tumblr/callback as 
-callback URL and (your server name)/tumblr/redirect as OAuth2 redirect URL.
+[Register](http://www.tumblr.com/oauth/apps) an application and use (your server name)/addon/tumblr/callback.php as 
+callback URL
 
-After the registration please enter the values for "Consumer Key" and "Consumer Secret" in the [administration](admin/addons/tumblr).
\ No newline at end of file
+After the registration please enter the values for "Consumer Key" and "Consumer Secret" in the [administration](admin/addons/tumblr).
+
+Notice
+------
+This connector is using the Tumblr-OAuth-Library:
+[https://groups.google.com/d/msg/tumblr-api/g6SeIBWvsnE/gnWqT9jFSlEJ](https://groups.google.com/d/msg/tumblr-api/g6SeIBWvsnE/gnWqT9jFSlEJ)
diff --git a/tumblr/lang/C/messages.po b/tumblr/lang/C/messages.po
index 74968015..d2e4a909 100644
--- a/tumblr/lang/C/messages.po
+++ b/tumblr/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-04-29 06:56+0000\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,71 +17,46 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: tumblr.php:243
+#: tumblr.php:34
 msgid "Permission denied."
 msgstr ""
 
-#: tumblr.php:296
-msgid "Save Settings"
+#: tumblr.php:144
+msgid "You are now authenticated to tumblr."
 msgstr ""
 
-#: tumblr.php:297
-msgid "Consumer Key"
+#: tumblr.php:145
+msgid "return to the connector page"
 msgstr ""
 
-#: tumblr.php:298
-msgid "Consumer Secret"
+#: tumblr.php:158
+msgid "Post to Tumblr"
 msgstr ""
 
-#: tumblr.php:299
-msgid "Maximum tags"
+#: tumblr.php:185
+msgid "Tumblr Post Settings"
 msgstr ""
 
-#: tumblr.php:299
-msgid ""
-"Maximum number of tags that a user can follow. Enter 0 to deactivate the "
-"feature."
-msgstr ""
-
-#: tumblr.php:336
-msgid "Post to page:"
-msgstr ""
-
-#: tumblr.php:342
+#: tumblr.php:188
 msgid "(Re-)Authenticate your tumblr page"
 msgstr ""
 
-#: tumblr.php:343
-msgid "You are not authenticated to tumblr"
-msgstr ""
-
-#: tumblr.php:348
+#: tumblr.php:192
 msgid "Enable Tumblr Post Addon"
 msgstr ""
 
-#: tumblr.php:349
+#: tumblr.php:197
 msgid "Post to Tumblr by default"
 msgstr ""
 
-#: tumblr.php:350
-msgid "Import the remote timeline"
+#: tumblr.php:217
+msgid "Post to page:"
 msgstr ""
 
-#: tumblr.php:351
-msgid "Subscribed tags"
+#: tumblr.php:228
+msgid "You are not authenticated to tumblr"
 msgstr ""
 
-#: tumblr.php:351
-#, php-format
-msgid ""
-"Comma separated list of up to %d tags that will be imported additionally to "
-"the timeline"
-msgstr ""
-
-#: tumblr.php:357
-msgid "Tumblr Import/Export"
-msgstr ""
-
-#: tumblr.php:375
-msgid "Post to Tumblr"
+#: tumblr.php:233
+msgid "Submit"
 msgstr ""
diff --git a/tumblr/lang/ar/messages.po b/tumblr/lang/ar/messages.po
deleted file mode 100644
index 7879231d..00000000
--- a/tumblr/lang/ar/messages.po
+++ /dev/null
@@ -1,71 +0,0 @@
-# ADDON tumblr
-# Copyright (C)
-# This file is distributed under the same license as the Friendica tumblr addon package.
-# 
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-07-25 13:15+0000\n"
-"PO-Revision-Date: 2021-02-20 00:23+0000\n"
-"Last-Translator: Farida Khalaf <faridakhalaf@hotmail.com>\n"
-"Language-Team: Arabic (http://www.transifex.com/Friendica/friendica/language/ar/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ar\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-
-#: tumblr.php:40
-msgid "Permission denied."
-msgstr "الطلب مرفوض."
-
-#: tumblr.php:70 tumblr.php:284
-msgid "Save Settings"
-msgstr "Save Settings"
-
-#: tumblr.php:72
-msgid "Consumer Key"
-msgstr ""
-
-#: tumblr.php:73
-msgid "Consumer Secret"
-msgstr ""
-
-#: tumblr.php:178
-msgid "You are now authenticated to tumblr."
-msgstr ""
-
-#: tumblr.php:179
-msgid "return to the connector page"
-msgstr "الرجوع إلى صفحة الموصل"
-
-#: tumblr.php:195
-msgid "Post to Tumblr"
-msgstr ""
-
-#: tumblr.php:225 tumblr.php:229
-msgid "Tumblr Export"
-msgstr ""
-
-#: tumblr.php:233
-msgid "(Re-)Authenticate your tumblr page"
-msgstr ""
-
-#: tumblr.php:237
-msgid "Enable Tumblr Post Addon"
-msgstr ""
-
-#: tumblr.php:243
-msgid "Post to Tumblr by default"
-msgstr ""
-
-#: tumblr.php:264
-msgid "Post to page:"
-msgstr ""
-
-#: tumblr.php:278
-msgid "You are not authenticated to tumblr"
-msgstr ""
diff --git a/tumblr/lang/ar/strings.php b/tumblr/lang/ar/strings.php
deleted file mode 100644
index ffd3337c..00000000
--- a/tumblr/lang/ar/strings.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_ar")) {
-function string_plural_select_ar($n){
-	$n = intval($n);
-	if ($n==0) { return 0; } else if ($n==1) { return 1; } else if ($n==2) { return 2; } else if ($n%100>=3 && $n%100<=10) { return 3; } else if ($n%100>=11 && $n%100<=99) { return 4; } else  { return 5; }
-}}
-$a->strings['Permission denied.'] = 'الطلب مرفوض.';
-$a->strings['Save Settings'] = 'Save Settings';
-$a->strings['return to the connector page'] = 'الرجوع إلى صفحة الموصل';
diff --git a/tumblr/lang/cs/messages.po b/tumblr/lang/cs/messages.po
index 4e031be6..ebb525ff 100644
--- a/tumblr/lang/cs/messages.po
+++ b/tumblr/lang/cs/messages.po
@@ -4,71 +4,62 @@
 # 
 # 
 # Translators:
-# Aditoo, 2018
-# Aditoo, 2018
+# Lorem Ipsum <aditoo@seznam.cz>, 2018
 # michal_s <msupler@gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:17-0500\n"
-"PO-Revision-Date: 2014-06-23 12:58+0000\n"
-"Last-Translator: Aditoo, 2018\n"
-"Language-Team: Czech (http://app.transifex.com/Friendica/friendica/language/cs/)\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2018-06-10 09:07+0000\n"
+"Last-Translator: Lorem Ipsum <aditoo@seznam.cz>\n"
+"Language-Team: Czech (http://www.transifex.com/Friendica/friendica/language/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: cs\n"
 "Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
 
-#: tumblr.php:39
+#: tumblr.php:34
 msgid "Permission denied."
 msgstr "Přístup odmítnut."
 
-#: tumblr.php:69
-msgid "Save Settings"
-msgstr ""
-
-#: tumblr.php:71
-msgid "Consumer Key"
-msgstr ""
-
-#: tumblr.php:72
-msgid "Consumer Secret"
-msgstr ""
-
-#: tumblr.php:177
+#: tumblr.php:144
 msgid "You are now authenticated to tumblr."
-msgstr "Nyní jste přihlášen/a k Tumblr."
+msgstr "Nyní jste přihlášen k tumblr."
 
-#: tumblr.php:178
+#: tumblr.php:145
 msgid "return to the connector page"
 msgstr "návrat ke stránce konektor"
 
-#: tumblr.php:194
+#: tumblr.php:158
 msgid "Post to Tumblr"
-msgstr "Posílat na Tumblr"
+msgstr "Příspěvek na Tumbir"
 
-#: tumblr.php:225
-msgid "Post to page:"
-msgstr "Posílat na stránku:"
+#: tumblr.php:185
+msgid "Tumblr Post Settings"
+msgstr "Nastavení Tumblr Post"
 
-#: tumblr.php:231
+#: tumblr.php:188
 msgid "(Re-)Authenticate your tumblr page"
-msgstr "(Znovu) přihlásit k Vaší stránce Tumblr"
+msgstr "(Znovu) přihlásit k Vaší tumblr stránce"
 
-#: tumblr.php:232
-msgid "You are not authenticated to tumblr"
-msgstr "Nyní nejste přihlášen/a k Tumblr."
-
-#: tumblr.php:237
+#: tumblr.php:192
 msgid "Enable Tumblr Post Addon"
 msgstr "Povolit doplněk Tumblr Post"
 
-#: tumblr.php:238
+#: tumblr.php:197
 msgid "Post to Tumblr by default"
-msgstr "Ve výchozím stavu posílat příspěvky na Tumblr"
+msgstr "Standardně posílat příspěvky na Tumbir"
 
-#: tumblr.php:244
-msgid "Tumblr Export"
-msgstr ""
+#: tumblr.php:217
+msgid "Post to page:"
+msgstr "Příspěvek ke stránce:"
+
+#: tumblr.php:228
+msgid "You are not authenticated to tumblr"
+msgstr "Nyní nejste přihlášen k tumblr."
+
+#: tumblr.php:233
+msgid "Submit"
+msgstr "Odeslat"
diff --git a/tumblr/lang/cs/strings.php b/tumblr/lang/cs/strings.php
index 2f5f8115..75f8eab1 100644
--- a/tumblr/lang/cs/strings.php
+++ b/tumblr/lang/cs/strings.php
@@ -3,14 +3,17 @@
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
 	$n = intval($n);
-	if (($n == 1 && $n % 1 == 0)) { return 0; } else if (($n >= 2 && $n <= 4 && $n % 1 == 0)) { return 1; } else if (($n % 1 != 0 )) { return 2; } else  { return 3; }
+	return ($n == 1 && $n % 1 == 0) ? 0 : ($n >= 2 && $n <= 4 && $n % 1 == 0) ? 1: ($n % 1 != 0 ) ? 2 : 3;;
 }}
-$a->strings['Permission denied.'] = 'Přístup odmítnut.';
-$a->strings['You are now authenticated to tumblr.'] = 'Nyní jste přihlášen/a k Tumblr.';
-$a->strings['return to the connector page'] = 'návrat ke stránce konektor';
-$a->strings['Post to Tumblr'] = 'Posílat na Tumblr';
-$a->strings['Post to page:'] = 'Posílat na stránku:';
-$a->strings['(Re-)Authenticate your tumblr page'] = '(Znovu) přihlásit k Vaší stránce Tumblr';
-$a->strings['You are not authenticated to tumblr'] = 'Nyní nejste přihlášen/a k Tumblr.';
-$a->strings['Enable Tumblr Post Addon'] = 'Povolit doplněk Tumblr Post';
-$a->strings['Post to Tumblr by default'] = 'Ve výchozím stavu posílat příspěvky na Tumblr';
+;
+$a->strings["Permission denied."] = "Přístup odmítnut.";
+$a->strings["You are now authenticated to tumblr."] = "Nyní jste přihlášen k tumblr.";
+$a->strings["return to the connector page"] = "návrat ke stránce konektor";
+$a->strings["Post to Tumblr"] = "Příspěvek na Tumbir";
+$a->strings["Tumblr Post Settings"] = "Nastavení Tumblr Post";
+$a->strings["(Re-)Authenticate your tumblr page"] = "(Znovu) přihlásit k Vaší tumblr stránce";
+$a->strings["Enable Tumblr Post Addon"] = "Povolit doplněk Tumblr Post";
+$a->strings["Post to Tumblr by default"] = "Standardně posílat příspěvky na Tumbir";
+$a->strings["Post to page:"] = "Příspěvek ke stránce:";
+$a->strings["You are not authenticated to tumblr"] = "Nyní nejste přihlášen k tumblr.";
+$a->strings["Submit"] = "Odeslat";
diff --git a/tumblr/lang/da-dk/messages.po b/tumblr/lang/da-dk/messages.po
deleted file mode 100644
index f1b5fb40..00000000
--- a/tumblr/lang/da-dk/messages.po
+++ /dev/null
@@ -1,72 +0,0 @@
-# ADDON tumblr
-# Copyright (C)
-# This file is distributed under the same license as the Friendica tumblr addon package.
-# 
-# 
-# Translators:
-# Anton <dev@atjn.dk>, 2022
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:17-0500\n"
-"PO-Revision-Date: 2014-06-23 12:58+0000\n"
-"Last-Translator: Anton <dev@atjn.dk>, 2022\n"
-"Language-Team: Danish (Denmark) (http://www.transifex.com/Friendica/friendica/language/da_DK/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: da_DK\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: tumblr.php:39
-msgid "Permission denied."
-msgstr "Ikke tilladt."
-
-#: tumblr.php:69
-msgid "Save Settings"
-msgstr "Gem indstillinger"
-
-#: tumblr.php:71
-msgid "Consumer Key"
-msgstr "\"Consumer\" nøgle"
-
-#: tumblr.php:72
-msgid "Consumer Secret"
-msgstr "\"Consumer\" hemmelighed"
-
-#: tumblr.php:177
-msgid "You are now authenticated to tumblr."
-msgstr ""
-
-#: tumblr.php:178
-msgid "return to the connector page"
-msgstr ""
-
-#: tumblr.php:194
-msgid "Post to Tumblr"
-msgstr "Læg op på Tumblr"
-
-#: tumblr.php:225
-msgid "Post to page:"
-msgstr "Læg op på side:"
-
-#: tumblr.php:231
-msgid "(Re-)Authenticate your tumblr page"
-msgstr ""
-
-#: tumblr.php:232
-msgid "You are not authenticated to tumblr"
-msgstr ""
-
-#: tumblr.php:237
-msgid "Enable Tumblr Post Addon"
-msgstr "Aktiver Tumblr-tilføjelse"
-
-#: tumblr.php:238
-msgid "Post to Tumblr by default"
-msgstr "Læg op på Tumblr som standard"
-
-#: tumblr.php:244
-msgid "Tumblr Export"
-msgstr ""
diff --git a/tumblr/lang/da-dk/strings.php b/tumblr/lang/da-dk/strings.php
deleted file mode 100644
index 655ce8b3..00000000
--- a/tumblr/lang/da-dk/strings.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_da_dk")) {
-function string_plural_select_da_dk($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Permission denied.'] = 'Ikke tilladt.';
-$a->strings['Save Settings'] = 'Gem indstillinger';
-$a->strings['Consumer Key'] = '"Consumer" nøgle';
-$a->strings['Consumer Secret'] = '"Consumer" hemmelighed';
-$a->strings['Post to Tumblr'] = 'Læg op på Tumblr';
-$a->strings['Post to page:'] = 'Læg op på side:';
-$a->strings['Enable Tumblr Post Addon'] = 'Aktiver Tumblr-tilføjelse';
-$a->strings['Post to Tumblr by default'] = 'Læg op på Tumblr som standard';
diff --git a/tumblr/lang/de/messages.po b/tumblr/lang/de/messages.po
index 8056174d..aa3c16cf 100644
--- a/tumblr/lang/de/messages.po
+++ b/tumblr/lang/de/messages.po
@@ -4,71 +4,61 @@
 # 
 # 
 # Translators:
-# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2014-2015
-# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2018,2021
-# Ulf Rompe <transifex.com@rompe.org>, 2019
+# bavatar <tobias.diekershoff@gmx.net>, 2014-2015
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:17-0500\n"
-"PO-Revision-Date: 2014-06-23 12:58+0000\n"
-"Last-Translator: Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2018,2021\n"
-"Language-Team: German (http://app.transifex.com/Friendica/friendica/language/de/)\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2015-07-28 05:49+0000\n"
+"Last-Translator: bavatar <tobias.diekershoff@gmx.net>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/friendica/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: tumblr.php:39
+#: tumblr.php:34
 msgid "Permission denied."
 msgstr "Zugriff verweigert."
 
-#: tumblr.php:69
-msgid "Save Settings"
-msgstr "Einstellungen speichern"
-
-#: tumblr.php:71
-msgid "Consumer Key"
-msgstr "Consumer Key"
-
-#: tumblr.php:72
-msgid "Consumer Secret"
-msgstr "Consumer Secret"
-
-#: tumblr.php:177
+#: tumblr.php:144
 msgid "You are now authenticated to tumblr."
 msgstr "Du bist nun auf tumblr authentifiziert."
 
-#: tumblr.php:178
+#: tumblr.php:145
 msgid "return to the connector page"
-msgstr "zurück zur Connector-Seite"
+msgstr "zurück zur Connector Seite"
 
-#: tumblr.php:194
+#: tumblr.php:158
 msgid "Post to Tumblr"
 msgstr "Auf Tumblr veröffentlichen"
 
-#: tumblr.php:225
-msgid "Post to page:"
-msgstr "Auf tumblr veröffentlichen"
+#: tumblr.php:185
+msgid "Tumblr Post Settings"
+msgstr "Tumblr-Beitragseinstellungen"
 
-#: tumblr.php:231
+#: tumblr.php:188
 msgid "(Re-)Authenticate your tumblr page"
-msgstr "(Re-)Authentifizierung deiner tumblr-Seite"
+msgstr "(Re-)Authentifizierung deiner tumblr Seite"
 
-#: tumblr.php:232
-msgid "You are not authenticated to tumblr"
-msgstr "Du bist gegenüber tumblr nicht authentifiziert"
-
-#: tumblr.php:237
+#: tumblr.php:192
 msgid "Enable Tumblr Post Addon"
 msgstr "Tumblr-Post-Addon aktivieren"
 
-#: tumblr.php:238
+#: tumblr.php:197
 msgid "Post to Tumblr by default"
 msgstr "Standardmäßig bei Tumblr veröffentlichen"
 
-#: tumblr.php:244
-msgid "Tumblr Export"
-msgstr "Tumblr Export"
+#: tumblr.php:217
+msgid "Post to page:"
+msgstr "Auf tumblr veröffentlichen"
+
+#: tumblr.php:228
+msgid "You are not authenticated to tumblr"
+msgstr "Du bist gegenüber tumblr nicht authentifiziert"
+
+#: tumblr.php:233
+msgid "Submit"
+msgstr "Senden"
diff --git a/tumblr/lang/de/strings.php b/tumblr/lang/de/strings.php
index ce43615c..87fd5c50 100644
--- a/tumblr/lang/de/strings.php
+++ b/tumblr/lang/de/strings.php
@@ -2,19 +2,17 @@
 
 if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Permission denied.'] = 'Zugriff verweigert.';
-$a->strings['Save Settings'] = 'Einstellungen speichern';
-$a->strings['Consumer Key'] = 'Consumer Key';
-$a->strings['Consumer Secret'] = 'Consumer Secret';
-$a->strings['You are now authenticated to tumblr.'] = 'Du bist nun auf tumblr authentifiziert.';
-$a->strings['return to the connector page'] = 'zurück zur Connector-Seite';
-$a->strings['Post to Tumblr'] = 'Auf Tumblr veröffentlichen';
-$a->strings['Post to page:'] = 'Auf tumblr veröffentlichen';
-$a->strings['(Re-)Authenticate your tumblr page'] = '(Re-)Authentifizierung deiner tumblr-Seite';
-$a->strings['You are not authenticated to tumblr'] = 'Du bist gegenüber tumblr nicht authentifiziert';
-$a->strings['Enable Tumblr Post Addon'] = 'Tumblr-Post-Addon aktivieren';
-$a->strings['Post to Tumblr by default'] = 'Standardmäßig bei Tumblr veröffentlichen';
-$a->strings['Tumblr Export'] = 'Tumblr Export';
+;
+$a->strings["Permission denied."] = "Zugriff verweigert.";
+$a->strings["You are now authenticated to tumblr."] = "Du bist nun auf tumblr authentifiziert.";
+$a->strings["return to the connector page"] = "zurück zur Connector Seite";
+$a->strings["Post to Tumblr"] = "Auf Tumblr veröffentlichen";
+$a->strings["Tumblr Post Settings"] = "Tumblr-Beitragseinstellungen";
+$a->strings["(Re-)Authenticate your tumblr page"] = "(Re-)Authentifizierung deiner tumblr Seite";
+$a->strings["Enable Tumblr Post Addon"] = "Tumblr-Post-Addon aktivieren";
+$a->strings["Post to Tumblr by default"] = "Standardmäßig bei Tumblr veröffentlichen";
+$a->strings["Post to page:"] = "Auf tumblr veröffentlichen";
+$a->strings["You are not authenticated to tumblr"] = "Du bist gegenüber tumblr nicht authentifiziert";
+$a->strings["Submit"] = "Senden";
diff --git a/tumblr/lang/es/messages.po b/tumblr/lang/es/messages.po
index d78060c6..5993bd53 100644
--- a/tumblr/lang/es/messages.po
+++ b/tumblr/lang/es/messages.po
@@ -4,87 +4,61 @@
 # 
 # 
 # Translators:
-# Albert, 2016
-# Senex Petrovic <javierruizo@hotmail.com>, 2021
+# Alberto Díaz <albertodiaztormo@gmail.com>, 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-04-29 06:56+0000\n"
-"PO-Revision-Date: 2014-06-23 12:58+0000\n"
-"Last-Translator: Senex Petrovic <javierruizo@hotmail.com>, 2021\n"
-"Language-Team: Spanish (http://app.transifex.com/Friendica/friendica/language/es/)\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2016-10-12 15:15+0000\n"
+"Last-Translator: Alberto Díaz <albertodiaztormo@gmail.com>\n"
+"Language-Team: Spanish (http://www.transifex.com/Friendica/friendica/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: es\n"
-"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: tumblr.php:243
+#: tumblr.php:34
 msgid "Permission denied."
 msgstr "Permiso denegado."
 
-#: tumblr.php:296
-msgid "Save Settings"
-msgstr "Guardar ajustes"
+#: tumblr.php:144
+msgid "You are now authenticated to tumblr."
+msgstr "Está ahora autenticado en tumblr."
 
-#: tumblr.php:297
-msgid "Consumer Key"
-msgstr "Consumer Key"
+#: tumblr.php:145
+msgid "return to the connector page"
+msgstr "Vuelva a la página del conector"
 
-#: tumblr.php:298
-msgid "Consumer Secret"
-msgstr "Consumer Secret"
+#: tumblr.php:158
+msgid "Post to Tumblr"
+msgstr "Publicar en Tumblr"
 
-#: tumblr.php:299
-msgid "Maximum tags"
-msgstr ""
+#: tumblr.php:185
+msgid "Tumblr Post Settings"
+msgstr "Ajustes de publicación de Tumblr"
 
-#: tumblr.php:299
-msgid ""
-"Maximum number of tags that a user can follow. Enter 0 to deactivate the "
-"feature."
-msgstr ""
-
-#: tumblr.php:336
-msgid "Post to page:"
-msgstr "Publicar en página:"
-
-#: tumblr.php:342
+#: tumblr.php:188
 msgid "(Re-)Authenticate your tumblr page"
 msgstr "(Re-)autenticar su página de tumblr"
 
-#: tumblr.php:343
-msgid "You are not authenticated to tumblr"
-msgstr "No está autenticado en tumblr"
-
-#: tumblr.php:348
+#: tumblr.php:192
 msgid "Enable Tumblr Post Addon"
-msgstr "Habilitar el complemento de publicación de Tumblr"
+msgstr "Habilite el addon Tumblr Post"
 
-#: tumblr.php:349
+#: tumblr.php:197
 msgid "Post to Tumblr by default"
 msgstr "Publique en Tumblr por defecto"
 
-#: tumblr.php:350
-msgid "Import the remote timeline"
-msgstr ""
+#: tumblr.php:217
+msgid "Post to page:"
+msgstr "Publicar en página:"
 
-#: tumblr.php:351
-msgid "Subscribed tags"
-msgstr ""
+#: tumblr.php:228
+msgid "You are not authenticated to tumblr"
+msgstr "No está autenticado en tumblr"
 
-#: tumblr.php:351
-#, php-format
-msgid ""
-"Comma separated list of up to %d tags that will be imported additionally to "
-"the timeline"
-msgstr ""
-
-#: tumblr.php:357
-msgid "Tumblr Import/Export"
-msgstr ""
-
-#: tumblr.php:375
-msgid "Post to Tumblr"
-msgstr "Publicar en Tumblr"
+#: tumblr.php:233
+msgid "Submit"
+msgstr "Enviar"
diff --git a/tumblr/lang/es/strings.php b/tumblr/lang/es/strings.php
index 550f6dc8..12d3d2d2 100644
--- a/tumblr/lang/es/strings.php
+++ b/tumblr/lang/es/strings.php
@@ -2,16 +2,17 @@
 
 if(! function_exists("string_plural_select_es")) {
 function string_plural_select_es($n){
-	$n = intval($n);
-	if ($n == 1) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
+	return ($n != 1);;
 }}
-$a->strings['Permission denied.'] = 'Permiso denegado.';
-$a->strings['Save Settings'] = 'Guardar ajustes';
-$a->strings['Consumer Key'] = 'Consumer Key';
-$a->strings['Consumer Secret'] = 'Consumer Secret';
-$a->strings['Post to page:'] = 'Publicar en página:';
-$a->strings['(Re-)Authenticate your tumblr page'] = '(Re-)autenticar su página de tumblr';
-$a->strings['You are not authenticated to tumblr'] = 'No está autenticado en tumblr';
-$a->strings['Enable Tumblr Post Addon'] = 'Habilitar el complemento de publicación de Tumblr';
-$a->strings['Post to Tumblr by default'] = 'Publique en Tumblr por defecto';
-$a->strings['Post to Tumblr'] = 'Publicar en Tumblr';
+;
+$a->strings["Permission denied."] = "Permiso denegado.";
+$a->strings["You are now authenticated to tumblr."] = "Está ahora autenticado en tumblr.";
+$a->strings["return to the connector page"] = "Vuelva a la página del conector";
+$a->strings["Post to Tumblr"] = "Publicar en Tumblr";
+$a->strings["Tumblr Post Settings"] = "Ajustes de publicación de Tumblr";
+$a->strings["(Re-)Authenticate your tumblr page"] = "(Re-)autenticar su página de tumblr";
+$a->strings["Enable Tumblr Post Addon"] = "Habilite el addon Tumblr Post";
+$a->strings["Post to Tumblr by default"] = "Publique en Tumblr por defecto";
+$a->strings["Post to page:"] = "Publicar en página:";
+$a->strings["You are not authenticated to tumblr"] = "No está autenticado en tumblr";
+$a->strings["Submit"] = "Enviar";
diff --git a/tumblr/lang/fi-fi/strings.php b/tumblr/lang/fi-fi/strings.php
index e848aa18..fe80c095 100644
--- a/tumblr/lang/fi-fi/strings.php
+++ b/tumblr/lang/fi-fi/strings.php
@@ -2,13 +2,17 @@
 
 if(! function_exists("string_plural_select_fi_fi")) {
 function string_plural_select_fi_fi($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Permission denied.'] = 'Lupa kielletty.';
-$a->strings['Post to Tumblr'] = 'Lähetä Tumblriin';
-$a->strings['Tumblr Post Settings'] = 'Tumblr -viestin asetukset';
-$a->strings['Enable Tumblr Post Addon'] = 'Ota Tumblr -viestilisäosa käyttöön';
-$a->strings['Post to Tumblr by default'] = 'Lähetä Tumblriin oletuksena';
-$a->strings['Post to page:'] = 'Julkaise sivulle:';
-$a->strings['Submit'] = 'Lähetä';
+;
+$a->strings["Permission denied."] = "Lupa kielletty.";
+$a->strings["You are now authenticated to tumblr."] = "";
+$a->strings["return to the connector page"] = "";
+$a->strings["Post to Tumblr"] = "Lähetä Tumblriin";
+$a->strings["Tumblr Post Settings"] = "Tumblr -viestin asetukset";
+$a->strings["(Re-)Authenticate your tumblr page"] = "";
+$a->strings["Enable Tumblr Post Addon"] = "Ota Tumblr -viestilisäosa käyttöön";
+$a->strings["Post to Tumblr by default"] = "Lähetä Tumblriin oletuksena";
+$a->strings["Post to page:"] = "Julkaise sivulle:";
+$a->strings["You are not authenticated to tumblr"] = "";
+$a->strings["Submit"] = "Lähetä";
diff --git a/tumblr/lang/fr/messages.po b/tumblr/lang/fr/messages.po
deleted file mode 100644
index ef2f0e3c..00000000
--- a/tumblr/lang/fr/messages.po
+++ /dev/null
@@ -1,91 +0,0 @@
-# ADDON tumblr
-# Copyright (C)
-# This file is distributed under the same license as the Friendica tumblr addon package.
-# 
-# 
-# Translators:
-# bob lebonche <lebonche@tutanota.com>, 2021
-# Florent C., 2023
-# StefOfficiel <pichard.stephane@free.fr>, 2015
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-04-29 06:56+0000\n"
-"PO-Revision-Date: 2014-06-23 12:58+0000\n"
-"Last-Translator: Florent C., 2023\n"
-"Language-Team: French (http://app.transifex.com/Friendica/friendica/language/fr/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: fr\n"
-"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
-
-#: tumblr.php:243
-msgid "Permission denied."
-msgstr "Permission refusée."
-
-#: tumblr.php:296
-msgid "Save Settings"
-msgstr "Sauvegarder les paramètres"
-
-#: tumblr.php:297
-msgid "Consumer Key"
-msgstr "Clé utilisateur"
-
-#: tumblr.php:298
-msgid "Consumer Secret"
-msgstr "Secret utilisateur"
-
-#: tumblr.php:299
-msgid "Maximum tags"
-msgstr "Tags maximum"
-
-#: tumblr.php:299
-msgid ""
-"Maximum number of tags that a user can follow. Enter 0 to deactivate the "
-"feature."
-msgstr "Nombre maximum de tags qu'un utilisateur peut suivre. Entrez 0 pour désactiver cette fonctionnalité."
-
-#: tumblr.php:336
-msgid "Post to page:"
-msgstr "Publier sur la page :"
-
-#: tumblr.php:342
-msgid "(Re-)Authenticate your tumblr page"
-msgstr "(re)Authentifiez votre page Tumblr"
-
-#: tumblr.php:343
-msgid "You are not authenticated to tumblr"
-msgstr "Vous n'êtes pas identifié sur Tumblr"
-
-#: tumblr.php:348
-msgid "Enable Tumblr Post Addon"
-msgstr "Activez l'extension de publication Tumblr"
-
-#: tumblr.php:349
-msgid "Post to Tumblr by default"
-msgstr "Publier sur Tumblr par défaut"
-
-#: tumblr.php:350
-msgid "Import the remote timeline"
-msgstr "Importer le flux distant"
-
-#: tumblr.php:351
-msgid "Subscribed tags"
-msgstr "Tags suivis"
-
-#: tumblr.php:351
-#, php-format
-msgid ""
-"Comma separated list of up to %d tags that will be imported additionally to "
-"the timeline"
-msgstr "Liste séparée par des virgules contenant jusqu'à %d tags qui seront importés dans le flux"
-
-#: tumblr.php:357
-msgid "Tumblr Import/Export"
-msgstr "Import/Export Tumblr"
-
-#: tumblr.php:375
-msgid "Post to Tumblr"
-msgstr "Publier vers Tumblr"
diff --git a/tumblr/lang/fr/strings.php b/tumblr/lang/fr/strings.php
index ece76c74..c4d50431 100644
--- a/tumblr/lang/fr/strings.php
+++ b/tumblr/lang/fr/strings.php
@@ -1,23 +1,8 @@
-<?php
-
-if(! function_exists("string_plural_select_fr")) {
-function string_plural_select_fr($n){
-	$n = intval($n);
-	if (($n == 0 || $n == 1)) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
-}}
-$a->strings['Permission denied.'] = 'Permission refusée.';
-$a->strings['Save Settings'] = 'Sauvegarder les paramètres';
-$a->strings['Consumer Key'] = 'Clé utilisateur';
-$a->strings['Consumer Secret'] = 'Secret utilisateur';
-$a->strings['Maximum tags'] = 'Tags maximum';
-$a->strings['Maximum number of tags that a user can follow. Enter 0 to deactivate the feature.'] = 'Nombre maximum de tags qu\'un utilisateur peut suivre. Entrez 0 pour désactiver cette fonctionnalité.';
-$a->strings['Post to page:'] = 'Publier sur la page :';
-$a->strings['(Re-)Authenticate your tumblr page'] = '(re)Authentifiez votre page Tumblr';
-$a->strings['You are not authenticated to tumblr'] = 'Vous n\'êtes pas identifié sur Tumblr';
-$a->strings['Enable Tumblr Post Addon'] = 'Activez l\'extension de publication Tumblr';
-$a->strings['Post to Tumblr by default'] = 'Publier sur Tumblr par défaut';
-$a->strings['Import the remote timeline'] = 'Importer le flux distant';
-$a->strings['Subscribed tags'] = 'Tags suivis';
-$a->strings['Comma separated list of up to %d tags that will be imported additionally to the timeline'] = 'Liste séparée par des virgules contenant jusqu\'à %d tags qui seront importés dans le flux';
-$a->strings['Tumblr Import/Export'] = 'Import/Export Tumblr';
-$a->strings['Post to Tumblr'] = 'Publier vers Tumblr';
+<?php
+
+$a->strings["Permission denied."] = "Permission refusée.";
+$a->strings["Post to Tumblr"] = "Publier sur Tumblr";
+$a->strings["Tumblr Post Settings"] = "Réglages de Tumblr";
+$a->strings["Enable Tumblr Post Addon"] = "Activer l'extension Tumblr";
+$a->strings["Post to Tumblr by default"] = "Publier sur Tumblr par défaut";
+$a->strings["Submit"] = "Envoyer";
diff --git a/tumblr/lang/hu/messages.po b/tumblr/lang/hu/messages.po
deleted file mode 100644
index 3c8eb396..00000000
--- a/tumblr/lang/hu/messages.po
+++ /dev/null
@@ -1,89 +0,0 @@
-# ADDON tumblr
-# Copyright (C)
-# This file is distributed under the same license as the Friendica tumblr addon package.
-# 
-# 
-# Translators:
-# Balázs Úr, 2020-2021,2023
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-04-29 06:56+0000\n"
-"PO-Revision-Date: 2014-06-23 12:58+0000\n"
-"Last-Translator: Balázs Úr, 2020-2021,2023\n"
-"Language-Team: Hungarian (http://app.transifex.com/Friendica/friendica/language/hu/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: hu\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: tumblr.php:243
-msgid "Permission denied."
-msgstr "Engedély megtagadva."
-
-#: tumblr.php:296
-msgid "Save Settings"
-msgstr "Beállítások mentése"
-
-#: tumblr.php:297
-msgid "Consumer Key"
-msgstr "Felhasználói kulcs"
-
-#: tumblr.php:298
-msgid "Consumer Secret"
-msgstr "Felhasználói titok"
-
-#: tumblr.php:299
-msgid "Maximum tags"
-msgstr "Legtöbb címke"
-
-#: tumblr.php:299
-msgid ""
-"Maximum number of tags that a user can follow. Enter 0 to deactivate the "
-"feature."
-msgstr "A címkék legnagyobb száma, amit egy felhasználó követhet. Adjon meg 0 értéket a funkció kikapcsolásához."
-
-#: tumblr.php:336
-msgid "Post to page:"
-msgstr "Beküldés az oldalra:"
-
-#: tumblr.php:342
-msgid "(Re-)Authenticate your tumblr page"
-msgstr "A Tumblr-oldal (újra)hitelesítése"
-
-#: tumblr.php:343
-msgid "You are not authenticated to tumblr"
-msgstr "Nincs hitelesítve van a Tumblr-hez"
-
-#: tumblr.php:348
-msgid "Enable Tumblr Post Addon"
-msgstr "A Tumblr-beküldő bővítmény engedélyezése"
-
-#: tumblr.php:349
-msgid "Post to Tumblr by default"
-msgstr "Beküldés a Tumblr-re alapértelmezetten"
-
-#: tumblr.php:350
-msgid "Import the remote timeline"
-msgstr "A távoli idővonal importálása"
-
-#: tumblr.php:351
-msgid "Subscribed tags"
-msgstr "Feliratkozott címkék"
-
-#: tumblr.php:351
-#, php-format
-msgid ""
-"Comma separated list of up to %d tags that will be imported additionally to "
-"the timeline"
-msgstr "Legfeljebb %d címke vesszővel elválasztott listája, amelyek szintén importálásra kerülnek az idővonalon felül"
-
-#: tumblr.php:357
-msgid "Tumblr Import/Export"
-msgstr "Tumblr importálás és exportálás"
-
-#: tumblr.php:375
-msgid "Post to Tumblr"
-msgstr "Beküldése a Tumblr-re"
diff --git a/tumblr/lang/hu/strings.php b/tumblr/lang/hu/strings.php
deleted file mode 100644
index a3838b4a..00000000
--- a/tumblr/lang/hu/strings.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_hu")) {
-function string_plural_select_hu($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Permission denied.'] = 'Engedély megtagadva.';
-$a->strings['Save Settings'] = 'Beállítások mentése';
-$a->strings['Consumer Key'] = 'Felhasználói kulcs';
-$a->strings['Consumer Secret'] = 'Felhasználói titok';
-$a->strings['Maximum tags'] = 'Legtöbb címke';
-$a->strings['Maximum number of tags that a user can follow. Enter 0 to deactivate the feature.'] = 'A címkék legnagyobb száma, amit egy felhasználó követhet. Adjon meg 0 értéket a funkció kikapcsolásához.';
-$a->strings['Post to page:'] = 'Beküldés az oldalra:';
-$a->strings['(Re-)Authenticate your tumblr page'] = 'A Tumblr-oldal (újra)hitelesítése';
-$a->strings['You are not authenticated to tumblr'] = 'Nincs hitelesítve van a Tumblr-hez';
-$a->strings['Enable Tumblr Post Addon'] = 'A Tumblr-beküldő bővítmény engedélyezése';
-$a->strings['Post to Tumblr by default'] = 'Beküldés a Tumblr-re alapértelmezetten';
-$a->strings['Import the remote timeline'] = 'A távoli idővonal importálása';
-$a->strings['Subscribed tags'] = 'Feliratkozott címkék';
-$a->strings['Comma separated list of up to %d tags that will be imported additionally to the timeline'] = 'Legfeljebb %d címke vesszővel elválasztott listája, amelyek szintén importálásra kerülnek az idővonalon felül';
-$a->strings['Tumblr Import/Export'] = 'Tumblr importálás és exportálás';
-$a->strings['Post to Tumblr'] = 'Beküldése a Tumblr-re';
diff --git a/tumblr/lang/it/messages.po b/tumblr/lang/it/messages.po
index f3d1df55..fbd17655 100644
--- a/tumblr/lang/it/messages.po
+++ b/tumblr/lang/it/messages.po
@@ -5,69 +5,60 @@
 # 
 # Translators:
 # fabrixxm <fabrix.xm@gmail.com>, 2014-2015,2018
-# Sylke Vicious <silkevicious@gmail.com>, 2021
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:17-0500\n"
-"PO-Revision-Date: 2014-06-23 12:58+0000\n"
-"Last-Translator: Sylke Vicious <silkevicious@gmail.com>, 2021\n"
-"Language-Team: Italian (http://app.transifex.com/Friendica/friendica/language/it/)\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2018-03-19 13:25+0000\n"
+"Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n"
+"Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: it\n"
-"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: tumblr.php:39
+#: tumblr.php:34
 msgid "Permission denied."
 msgstr "Permesso negato."
 
-#: tumblr.php:69
-msgid "Save Settings"
-msgstr "Salva Impostazioni"
-
-#: tumblr.php:71
-msgid "Consumer Key"
-msgstr "Consumer Key"
-
-#: tumblr.php:72
-msgid "Consumer Secret"
-msgstr "Consumer Secret"
-
-#: tumblr.php:177
+#: tumblr.php:144
 msgid "You are now authenticated to tumblr."
 msgstr "Sei autenticato su Tumblr."
 
-#: tumblr.php:178
+#: tumblr.php:145
 msgid "return to the connector page"
 msgstr "ritorna alla pagina del connettore"
 
-#: tumblr.php:194
+#: tumblr.php:158
 msgid "Post to Tumblr"
 msgstr "Invia a Tumblr"
 
-#: tumblr.php:225
-msgid "Post to page:"
-msgstr "Invia alla pagina:"
+#: tumblr.php:185
+msgid "Tumblr Post Settings"
+msgstr "Impostazioni di invio a Tumblr"
 
-#: tumblr.php:231
+#: tumblr.php:188
 msgid "(Re-)Authenticate your tumblr page"
 msgstr "(Ri)Autenticati con la tua pagina Tumblr"
 
-#: tumblr.php:232
-msgid "You are not authenticated to tumblr"
-msgstr "Non sei autenticato su Tumblr"
-
-#: tumblr.php:237
+#: tumblr.php:192
 msgid "Enable Tumblr Post Addon"
 msgstr "Abilita componente aggiuntivo di invio a Tumblr"
 
-#: tumblr.php:238
+#: tumblr.php:197
 msgid "Post to Tumblr by default"
 msgstr "Invia sempre a Tumblr"
 
-#: tumblr.php:244
-msgid "Tumblr Export"
-msgstr "Esporta Tumblr"
+#: tumblr.php:217
+msgid "Post to page:"
+msgstr "Invia alla pagina:"
+
+#: tumblr.php:228
+msgid "You are not authenticated to tumblr"
+msgstr "Non sei autenticato su Tumblr"
+
+#: tumblr.php:233
+msgid "Submit"
+msgstr "Invia"
diff --git a/tumblr/lang/it/strings.php b/tumblr/lang/it/strings.php
index d4d4e257..3cf0c951 100644
--- a/tumblr/lang/it/strings.php
+++ b/tumblr/lang/it/strings.php
@@ -2,19 +2,17 @@
 
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
-	$n = intval($n);
-	if ($n == 1) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
+	return ($n != 1);;
 }}
-$a->strings['Permission denied.'] = 'Permesso negato.';
-$a->strings['Save Settings'] = 'Salva Impostazioni';
-$a->strings['Consumer Key'] = 'Consumer Key';
-$a->strings['Consumer Secret'] = 'Consumer Secret';
-$a->strings['You are now authenticated to tumblr.'] = 'Sei autenticato su Tumblr.';
-$a->strings['return to the connector page'] = 'ritorna alla pagina del connettore';
-$a->strings['Post to Tumblr'] = 'Invia a Tumblr';
-$a->strings['Post to page:'] = 'Invia alla pagina:';
-$a->strings['(Re-)Authenticate your tumblr page'] = '(Ri)Autenticati con la tua pagina Tumblr';
-$a->strings['You are not authenticated to tumblr'] = 'Non sei autenticato su Tumblr';
-$a->strings['Enable Tumblr Post Addon'] = 'Abilita componente aggiuntivo di invio a Tumblr';
-$a->strings['Post to Tumblr by default'] = 'Invia sempre a Tumblr';
-$a->strings['Tumblr Export'] = 'Esporta Tumblr';
+;
+$a->strings["Permission denied."] = "Permesso negato.";
+$a->strings["You are now authenticated to tumblr."] = "Sei autenticato su Tumblr.";
+$a->strings["return to the connector page"] = "ritorna alla pagina del connettore";
+$a->strings["Post to Tumblr"] = "Invia a Tumblr";
+$a->strings["Tumblr Post Settings"] = "Impostazioni di invio a Tumblr";
+$a->strings["(Re-)Authenticate your tumblr page"] = "(Ri)Autenticati con la tua pagina Tumblr";
+$a->strings["Enable Tumblr Post Addon"] = "Abilita componente aggiuntivo di invio a Tumblr";
+$a->strings["Post to Tumblr by default"] = "Invia sempre a Tumblr";
+$a->strings["Post to page:"] = "Invia alla pagina:";
+$a->strings["You are not authenticated to tumblr"] = "Non sei autenticato su Tumblr";
+$a->strings["Submit"] = "Invia";
diff --git a/tumblr/lang/nl/messages.po b/tumblr/lang/nl/messages.po
index ae8e284c..f299c6f3 100644
--- a/tumblr/lang/nl/messages.po
+++ b/tumblr/lang/nl/messages.po
@@ -9,81 +9,56 @@ msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-04-29 06:56+0000\n"
-"PO-Revision-Date: 2014-06-23 12:58+0000\n"
-"Last-Translator: Jeroen De Meerleer <me@jeroened.be>, 2018\n"
-"Language-Team: Dutch (http://app.transifex.com/Friendica/friendica/language/nl/)\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2018-08-24 13:53+0000\n"
+"Last-Translator: Jeroen De Meerleer <me@jeroened.be>\n"
+"Language-Team: Dutch (http://www.transifex.com/Friendica/friendica/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: tumblr.php:243
+#: tumblr.php:34
 msgid "Permission denied."
 msgstr "Toegang geweigerd."
 
-#: tumblr.php:296
-msgid "Save Settings"
+#: tumblr.php:144
+msgid "You are now authenticated to tumblr."
+msgstr "Je bent nu aangemeld bij tumblr"
+
+#: tumblr.php:145
+msgid "return to the connector page"
 msgstr ""
 
-#: tumblr.php:297
-msgid "Consumer Key"
+#: tumblr.php:158
+msgid "Post to Tumblr"
 msgstr ""
 
-#: tumblr.php:298
-msgid "Consumer Secret"
+#: tumblr.php:185
+msgid "Tumblr Post Settings"
 msgstr ""
 
-#: tumblr.php:299
-msgid "Maximum tags"
-msgstr ""
-
-#: tumblr.php:299
-msgid ""
-"Maximum number of tags that a user can follow. Enter 0 to deactivate the "
-"feature."
-msgstr ""
-
-#: tumblr.php:336
-msgid "Post to page:"
-msgstr "Plaats op pagina:"
-
-#: tumblr.php:342
+#: tumblr.php:188
 msgid "(Re-)Authenticate your tumblr page"
 msgstr ""
 
-#: tumblr.php:343
-msgid "You are not authenticated to tumblr"
-msgstr ""
-
-#: tumblr.php:348
+#: tumblr.php:192
 msgid "Enable Tumblr Post Addon"
 msgstr "Tumblr Post Addon inschakelen"
 
-#: tumblr.php:349
+#: tumblr.php:197
 msgid "Post to Tumblr by default"
 msgstr "Plaatsen op Tumblr als standaard instellen "
 
-#: tumblr.php:350
-msgid "Import the remote timeline"
+#: tumblr.php:217
+msgid "Post to page:"
+msgstr "Plaats op pagina:"
+
+#: tumblr.php:228
+msgid "You are not authenticated to tumblr"
 msgstr ""
 
-#: tumblr.php:351
-msgid "Subscribed tags"
-msgstr ""
-
-#: tumblr.php:351
-#, php-format
-msgid ""
-"Comma separated list of up to %d tags that will be imported additionally to "
-"the timeline"
-msgstr ""
-
-#: tumblr.php:357
-msgid "Tumblr Import/Export"
-msgstr ""
-
-#: tumblr.php:375
-msgid "Post to Tumblr"
+#: tumblr.php:233
+msgid "Submit"
 msgstr ""
diff --git a/tumblr/lang/nl/strings.php b/tumblr/lang/nl/strings.php
index 0c70f7f3..c3661dff 100644
--- a/tumblr/lang/nl/strings.php
+++ b/tumblr/lang/nl/strings.php
@@ -3,9 +3,17 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Permission denied.'] = 'Toegang geweigerd.';
-$a->strings['Post to page:'] = 'Plaats op pagina:';
-$a->strings['Enable Tumblr Post Addon'] = 'Tumblr Post Addon inschakelen';
-$a->strings['Post to Tumblr by default'] = 'Plaatsen op Tumblr als standaard instellen ';
+;
+$a->strings["Permission denied."] = "Toegang geweigerd.";
+$a->strings["You are now authenticated to tumblr."] = "Je bent nu aangemeld bij tumblr";
+$a->strings["return to the connector page"] = "";
+$a->strings["Post to Tumblr"] = "";
+$a->strings["Tumblr Post Settings"] = "";
+$a->strings["(Re-)Authenticate your tumblr page"] = "";
+$a->strings["Enable Tumblr Post Addon"] = "Tumblr Post Addon inschakelen";
+$a->strings["Post to Tumblr by default"] = "Plaatsen op Tumblr als standaard instellen ";
+$a->strings["Post to page:"] = "Plaats op pagina:";
+$a->strings["You are not authenticated to tumblr"] = "";
+$a->strings["Submit"] = "";
diff --git a/tumblr/lang/pl/messages.po b/tumblr/lang/pl/messages.po
index 27a44e15..962fce46 100644
--- a/tumblr/lang/pl/messages.po
+++ b/tumblr/lang/pl/messages.po
@@ -4,15 +4,14 @@
 # 
 # 
 # Translators:
-# Piotr Strębski <strebski@gmail.com>, 2022
-# Waldemar Stoczkowski, 2018
+# Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:17-0500\n"
-"PO-Revision-Date: 2014-06-23 12:58+0000\n"
-"Last-Translator: Piotr Strębski <strebski@gmail.com>, 2022\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2018-03-31 20:13+0000\n"
+"Last-Translator: Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.com/Friendica/friendica/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,54 +19,46 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
-#: tumblr.php:39
+#: tumblr.php:34
 msgid "Permission denied."
 msgstr "Odmowa dostępu."
 
-#: tumblr.php:69
-msgid "Save Settings"
-msgstr "Zapisz ustawienia"
-
-#: tumblr.php:71
-msgid "Consumer Key"
-msgstr "Klucz klienta"
-
-#: tumblr.php:72
-msgid "Consumer Secret"
-msgstr "Tajny klucz klienta"
-
-#: tumblr.php:177
+#: tumblr.php:144
 msgid "You are now authenticated to tumblr."
 msgstr "Jesteś teraz uwierzytelniony na tumblr."
 
-#: tumblr.php:178
+#: tumblr.php:145
 msgid "return to the connector page"
 msgstr "powrót do strony łącza"
 
-#: tumblr.php:194
+#: tumblr.php:158
 msgid "Post to Tumblr"
 msgstr "Opublikuj w Tumblr"
 
-#: tumblr.php:225
-msgid "Post to page:"
-msgstr "Opublikuj na stronie:"
+#: tumblr.php:185
+msgid "Tumblr Post Settings"
+msgstr "Ustawienia Postów Tumblr"
 
-#: tumblr.php:231
+#: tumblr.php:188
 msgid "(Re-)Authenticate your tumblr page"
 msgstr "(Re-) Uwierzytelnij swoją stronę tumblr"
 
-#: tumblr.php:232
-msgid "You are not authenticated to tumblr"
-msgstr "Nie jesteś uwierzytelniony w tumblr"
-
-#: tumblr.php:237
+#: tumblr.php:192
 msgid "Enable Tumblr Post Addon"
 msgstr "Włącz dodatek Tumblr"
 
-#: tumblr.php:238
+#: tumblr.php:197
 msgid "Post to Tumblr by default"
 msgstr "Wyślij domyślnie do Tumblr"
 
-#: tumblr.php:244
-msgid "Tumblr Export"
-msgstr "Eksportuj do Tumblr"
+#: tumblr.php:217
+msgid "Post to page:"
+msgstr "Opublikuj na stronie:"
+
+#: tumblr.php:228
+msgid "You are not authenticated to tumblr"
+msgstr "Nie jesteś uwierzytelniony w tumblr"
+
+#: tumblr.php:233
+msgid "Submit"
+msgstr "Wyślij"
diff --git a/tumblr/lang/pl/strings.php b/tumblr/lang/pl/strings.php
index a9f3bfb5..127d8d81 100644
--- a/tumblr/lang/pl/strings.php
+++ b/tumblr/lang/pl/strings.php
@@ -2,19 +2,17 @@
 
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
-	$n = intval($n);
-	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
+	return ($n==1 ? 0 : ($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14) ? 1 : $n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14) ? 2 : 3);;
 }}
-$a->strings['Permission denied.'] = 'Odmowa dostępu.';
-$a->strings['Save Settings'] = 'Zapisz ustawienia';
-$a->strings['Consumer Key'] = 'Klucz klienta';
-$a->strings['Consumer Secret'] = 'Tajny klucz klienta';
-$a->strings['You are now authenticated to tumblr.'] = 'Jesteś teraz uwierzytelniony na tumblr.';
-$a->strings['return to the connector page'] = 'powrót do strony łącza';
-$a->strings['Post to Tumblr'] = 'Opublikuj w Tumblr';
-$a->strings['Post to page:'] = 'Opublikuj na stronie:';
-$a->strings['(Re-)Authenticate your tumblr page'] = '(Re-) Uwierzytelnij swoją stronę tumblr';
-$a->strings['You are not authenticated to tumblr'] = 'Nie jesteś uwierzytelniony w tumblr';
-$a->strings['Enable Tumblr Post Addon'] = 'Włącz dodatek Tumblr';
-$a->strings['Post to Tumblr by default'] = 'Wyślij domyślnie do Tumblr';
-$a->strings['Tumblr Export'] = 'Eksportuj do Tumblr';
+;
+$a->strings["Permission denied."] = "Odmowa dostępu.";
+$a->strings["You are now authenticated to tumblr."] = "Jesteś teraz uwierzytelniony na tumblr.";
+$a->strings["return to the connector page"] = "powrót do strony łącza";
+$a->strings["Post to Tumblr"] = "Opublikuj w Tumblr";
+$a->strings["Tumblr Post Settings"] = "Ustawienia Postów Tumblr";
+$a->strings["(Re-)Authenticate your tumblr page"] = "(Re-) Uwierzytelnij swoją stronę tumblr";
+$a->strings["Enable Tumblr Post Addon"] = "Włącz dodatek Tumblr";
+$a->strings["Post to Tumblr by default"] = "Wyślij domyślnie do Tumblr";
+$a->strings["Post to page:"] = "Opublikuj na stronie:";
+$a->strings["You are not authenticated to tumblr"] = "Nie jesteś uwierzytelniony w tumblr";
+$a->strings["Submit"] = "Wyślij";
diff --git a/tumblr/lang/pt-br/strings.php b/tumblr/lang/pt-br/strings.php
index 45c906bb..f77c85f2 100644
--- a/tumblr/lang/pt-br/strings.php
+++ b/tumblr/lang/pt-br/strings.php
@@ -2,17 +2,17 @@
 
 if(! function_exists("string_plural_select_pt_br")) {
 function string_plural_select_pt_br($n){
-	$n = intval($n);
-	return intval($n > 1);
+	return ($n > 1);;
 }}
-$a->strings['Permission denied.'] = 'Permissão negada.';
-$a->strings['You are now authenticated to tumblr.'] = 'Você se autenticou no Tumblr.';
-$a->strings['return to the connector page'] = 'voltar à página de conectores';
-$a->strings['Post to Tumblr'] = 'Publicar no Tumblr';
-$a->strings['Tumblr Post Settings'] = 'Configurações de publicação no Tumblr';
-$a->strings['(Re-)Authenticate your tumblr page'] = '(Re)autenticar sua página no Tumblr';
-$a->strings['Enable Tumblr Post Addon'] = 'Habilitar plug-in para publicar no Tumblr';
-$a->strings['Post to Tumblr by default'] = 'Publicar no Tumblr por padrão';
-$a->strings['Post to page:'] = 'Publicar na página:';
-$a->strings['You are not authenticated to tumblr'] = 'Você não se autenticou no Tumblr';
-$a->strings['Submit'] = 'Enviar';
+;
+$a->strings["Permission denied."] = "Permissão negada.";
+$a->strings["You are now authenticated to tumblr."] = "Você se autenticou no Tumblr.";
+$a->strings["return to the connector page"] = "voltar à página de conectores";
+$a->strings["Post to Tumblr"] = "Publicar no Tumblr";
+$a->strings["Tumblr Post Settings"] = "Configurações de publicação no Tumblr";
+$a->strings["(Re-)Authenticate your tumblr page"] = "(Re)autenticar sua página no Tumblr";
+$a->strings["Enable Tumblr Post Addon"] = "Habilitar plug-in para publicar no Tumblr";
+$a->strings["Post to Tumblr by default"] = "Publicar no Tumblr por padrão";
+$a->strings["Post to page:"] = "Publicar na página:";
+$a->strings["You are not authenticated to tumblr"] = "Você não se autenticou no Tumblr";
+$a->strings["Submit"] = "Enviar";
diff --git a/tumblr/lang/ro/strings.php b/tumblr/lang/ro/strings.php
index 972909b1..60f96432 100644
--- a/tumblr/lang/ro/strings.php
+++ b/tumblr/lang/ro/strings.php
@@ -2,17 +2,17 @@
 
 if(! function_exists("string_plural_select_ro")) {
 function string_plural_select_ro($n){
-	$n = intval($n);
-	if ($n==1) { return 0; } else if ((($n%100>19)||(($n%100==0)&&($n!=0)))) { return 2; } else  { return 1; }
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
 }}
-$a->strings['Permission denied.'] = 'Permisiune refuzată.';
-$a->strings['You are now authenticated to tumblr.'] = 'Acum sunteți autentificat pe tumblr.';
-$a->strings['return to the connector page'] = 'revenire la pagina de conectare';
-$a->strings['Post to Tumblr'] = 'Postați pe Tumblr';
-$a->strings['Tumblr Export'] = 'Export Tumblr';
-$a->strings['(Re-)Authenticate your tumblr page'] = '(Re- )Autentificare pagină tumblr ';
-$a->strings['Enable Tumblr Post Addon'] = 'Activare Modul Postare pe Tumblr ';
-$a->strings['Post to Tumblr by default'] = 'Postați implicit pe Tumblr';
-$a->strings['Post to page:'] = 'Postare pe pagina:';
-$a->strings['You are not authenticated to tumblr'] = 'Nu sunteți autentificat pe tumblr.';
-$a->strings['Save Settings'] = 'Salvare Configurări';
+;
+$a->strings["Permission denied."] = "Permisiune refuzată.";
+$a->strings["You are now authenticated to tumblr."] = "Acum sunteți autentificat pe tumblr.";
+$a->strings["return to the connector page"] = "revenire la pagina de conectare";
+$a->strings["Post to Tumblr"] = "Postați pe Tumblr";
+$a->strings["Tumblr Export"] = "Export Tumblr";
+$a->strings["(Re-)Authenticate your tumblr page"] = "(Re- )Autentificare pagină tumblr ";
+$a->strings["Enable Tumblr Post Addon"] = "Activare Modul Postare pe Tumblr ";
+$a->strings["Post to Tumblr by default"] = "Postați implicit pe Tumblr";
+$a->strings["Post to page:"] = "Postare pe pagina:";
+$a->strings["You are not authenticated to tumblr"] = "Nu sunteți autentificat pe tumblr.";
+$a->strings["Save Settings"] = "Salvare Configurări";
diff --git a/tumblr/lang/sv/messages.po b/tumblr/lang/sv/messages.po
deleted file mode 100644
index fe631007..00000000
--- a/tumblr/lang/sv/messages.po
+++ /dev/null
@@ -1,73 +0,0 @@
-# ADDON tumblr
-# Copyright (C)
-# This file is distributed under the same license as the Friendica tumblr addon package.
-# 
-# 
-# Translators:
-# Hypolite Petovan <hypolite@mrpetovan.com>, 2019
-# Kristoffer Grundström <lovaren@gmail.com>, 2022
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:17-0500\n"
-"PO-Revision-Date: 2022-01-16 00:55+0000\n"
-"Last-Translator: Kristoffer Grundström <lovaren@gmail.com>\n"
-"Language-Team: Swedish (http://www.transifex.com/Friendica/friendica/language/sv/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: sv\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: tumblr.php:39
-msgid "Permission denied."
-msgstr "Åtkomst nekad."
-
-#: tumblr.php:69
-msgid "Save Settings"
-msgstr ""
-
-#: tumblr.php:71
-msgid "Consumer Key"
-msgstr ""
-
-#: tumblr.php:72
-msgid "Consumer Secret"
-msgstr ""
-
-#: tumblr.php:177
-msgid "You are now authenticated to tumblr."
-msgstr "Du är nu autentiserad till tumblr."
-
-#: tumblr.php:178
-msgid "return to the connector page"
-msgstr ""
-
-#: tumblr.php:194
-msgid "Post to Tumblr"
-msgstr ""
-
-#: tumblr.php:225
-msgid "Post to page:"
-msgstr ""
-
-#: tumblr.php:231
-msgid "(Re-)Authenticate your tumblr page"
-msgstr ""
-
-#: tumblr.php:232
-msgid "You are not authenticated to tumblr"
-msgstr "Du är inte autentiserad till tumblr"
-
-#: tumblr.php:237
-msgid "Enable Tumblr Post Addon"
-msgstr ""
-
-#: tumblr.php:238
-msgid "Post to Tumblr by default"
-msgstr ""
-
-#: tumblr.php:244
-msgid "Tumblr Export"
-msgstr ""
diff --git a/tumblr/lang/sv/strings.php b/tumblr/lang/sv/strings.php
index 4d39d3c2..266dcdbf 100644
--- a/tumblr/lang/sv/strings.php
+++ b/tumblr/lang/sv/strings.php
@@ -1,10 +1,4 @@
-<?php
-
-if(! function_exists("string_plural_select_sv")) {
-function string_plural_select_sv($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Permission denied.'] = 'Åtkomst nekad.';
-$a->strings['You are now authenticated to tumblr.'] = 'Du är nu autentiserad till tumblr.';
-$a->strings['You are not authenticated to tumblr'] = 'Du är inte autentiserad till tumblr';
+<?php
+
+$a->strings["Permission denied."] = "&Aring;tkomst nekad.";
+$a->strings["Submit"] = "Spara";
diff --git a/tumblr/library/tumblroauth.php b/tumblr/library/tumblroauth.php
new file mode 100644
index 00000000..37da6142
--- /dev/null
+++ b/tumblr/library/tumblroauth.php
@@ -0,0 +1,242 @@
+<?php
+
+/*
+ * Abraham Williams (abraham@abrah.am) http://abrah.am
+ *
+ * The first PHP Library to support OAuth for Tumblr's REST API.  (Originally for Twitter, modified for Tumblr by Lucas)
+ */
+
+/**
+ * Tumblr OAuth class
+ */
+class TumblrOAuth {
+  /* Contains the last HTTP status code returned. */
+  public $http_code;
+  /* Contains the last API call. */
+  public $url;
+  /* Set up the API root URL. */
+  public $host = "https://api.tumblr.com/v2/";
+  /* Set timeout default. */
+  public $timeout = 30;
+  /* Set connect timeout. */
+  public $connecttimeout = 30;
+  /* Verify SSL Cert. */
+  public $ssl_verifypeer = FALSE;
+  /* Respons format. */
+  public $format = 'json';
+  /* Decode returned json data. */
+  public $decode_json = TRUE;
+  /* Contains the last HTTP headers returned. */
+  public $http_info;
+  /* Set the useragnet. */
+  public $useragent = 'TumblrOAuth v0.2.0-beta2';
+  /* Immediately retry the API call if the response was not successful. */
+  //public $retry = TRUE;
+
+
+
+
+  /**
+   * Set API URLS
+   */
+  function accessTokenURL()  { return 'https://www.tumblr.com/oauth/access_token'; }
+  function authenticateURL() { return 'https://www.tumblr.com/oauth/authorize'; }
+  function authorizeURL()    { return 'https://www.tumblr.com/oauth/authorize'; }
+  function requestTokenURL() { return 'https://www.tumblr.com/oauth/request_token'; }
+
+  /**
+   * Debug helpers
+   */
+  function lastStatusCode() { return $this->http_status; }
+  function lastAPICall() { return $this->last_api_call; }
+
+  /**
+   * construct TumblrOAuth object
+   */
+  function __construct($consumer_key, $consumer_secret, $oauth_token = null, $oauth_token_secret = null) {
+    $this->sha1_method = new OAuthSignatureMethod_HMAC_SHA1();
+    $this->consumer = new OAuthConsumer($consumer_key, $consumer_secret);
+    if (!empty($oauth_token) && !empty($oauth_token_secret)) {
+      $this->token = new OAuthConsumer($oauth_token, $oauth_token_secret);
+    } else {
+      $this->token = null;
+    }
+  }
+
+
+  /**
+   * Get a request_token from Tumblr
+   *
+   * @returns a key/value array containing oauth_token and oauth_token_secret
+   */
+  function getRequestToken($oauth_callback = null) {
+    $parameters = array();
+    if (!empty($oauth_callback)) {
+      $parameters['oauth_callback'] = $oauth_callback;
+    }
+    $request = $this->oAuthRequest($this->requestTokenURL(), 'GET', $parameters);
+    $token = OAuthUtil::parse_parameters($request);
+    $this->token = new OAuthConsumer($token['oauth_token'], $token['oauth_token_secret']);
+    return $token;
+  }
+
+  /**
+   * Get the authorize URL
+   *
+   * @returns a string
+   */
+  function getAuthorizeURL($token, $sign_in_with_tumblr = TRUE) {
+    if (is_array($token)) {
+      $token = $token['oauth_token'];
+    }
+    if (empty($sign_in_with_tumblr)) {
+      return $this->authorizeURL() . "?oauth_token={$token}";
+    } else {
+       return $this->authenticateURL() . "?oauth_token={$token}";
+    }
+  }
+
+  /**
+   * Exchange request token and secret for an access token and
+   * secret, to sign API calls.
+   *
+   * @returns array("oauth_token" => "the-access-token",
+   *                "oauth_token_secret" => "the-access-secret",
+   *                "user_id" => "9436992",
+   *                "screen_name" => "abraham")
+   */
+  function getAccessToken($oauth_verifier = FALSE) {
+    $parameters = array();
+    if (!empty($oauth_verifier)) {
+      $parameters['oauth_verifier'] = $oauth_verifier;
+    }
+    $request = $this->oAuthRequest($this->accessTokenURL(), 'GET', $parameters);
+    $token = OAuthUtil::parse_parameters($request);
+    $this->token = new OAuthConsumer($token['oauth_token'], $token['oauth_token_secret']);
+    return $token;
+  }
+
+  /**
+   * One time exchange of username and password for access token and secret.
+   *
+   * @returns array("oauth_token" => "the-access-token",
+   *                "oauth_token_secret" => "the-access-secret",
+   *                "user_id" => "9436992",
+   *                "screen_name" => "abraham",
+   *                "x_auth_expires" => "0")
+   */
+  function getXAuthToken($username, $password) {
+    $parameters = array();
+    $parameters['x_auth_username'] = $username;
+    $parameters['x_auth_password'] = $password;
+    $parameters['x_auth_mode'] = 'client_auth';
+    $request = $this->oAuthRequest($this->accessTokenURL(), 'POST', $parameters);
+    $token = OAuthUtil::parse_parameters($request);
+    $this->token = new OAuthConsumer($token['oauth_token'], $token['oauth_token_secret']);
+    return $token;
+  }
+
+  /**
+   * GET wrapper for oAuthRequest.
+   */
+  function get($url, $parameters = array()) {
+    $response = $this->oAuthRequest($url, 'GET', $parameters);
+    if ($this->format === 'json' && $this->decode_json) {
+      return json_decode($response);
+    }
+    return $response;
+  }
+
+  /**
+   * POST wrapper for oAuthRequest.
+   */
+  function post($url, $parameters = array()) {
+    $response = $this->oAuthRequest($url, 'POST', $parameters);
+    if ($this->format === 'json' && $this->decode_json) {
+      return json_decode($response);
+    }
+    return $response;
+  }
+
+  /**
+   * DELETE wrapper for oAuthReqeust.
+   */
+  function delete($url, $parameters = array()) {
+    $response = $this->oAuthRequest($url, 'DELETE', $parameters);
+    if ($this->format === 'json' && $this->decode_json) {
+      return json_decode($response);
+    }
+    return $response;
+  }
+
+  /**
+   * Format and sign an OAuth / API request
+   */
+  function oAuthRequest($url, $method, $parameters) {
+    if (strrpos($url, 'https://') !== 0 && strrpos($url, 'http://') !== 0) {
+      $url = "{$this->host}{$url}";
+    }
+    $request = OAuthRequest::from_consumer_and_token($this->consumer, $this->token, $method, $url, $parameters);
+    $request->sign_request($this->sha1_method, $this->consumer, $this->token);
+    switch ($method) {
+    case 'GET':
+      return $this->http($request->to_url(), 'GET');
+    default:
+      return $this->http($request->get_normalized_http_url(), $method, $request->to_postdata());
+    }
+  }
+
+  /**
+   * Make an HTTP request
+   *
+   * @return API results
+   */
+  function http($url, $method, $postfields = null) {
+    $this->http_info = array();
+    $ci = curl_init();
+    /* Curl settings */
+    curl_setopt($ci, CURLOPT_USERAGENT, $this->useragent);
+    curl_setopt($ci, CURLOPT_CONNECTTIMEOUT, $this->connecttimeout);
+    curl_setopt($ci, CURLOPT_TIMEOUT, $this->timeout);
+    curl_setopt($ci, CURLOPT_RETURNTRANSFER, TRUE);
+    curl_setopt($ci, CURLOPT_HTTPHEADER, array('Expect:'));
+    curl_setopt($ci, CURLOPT_SSL_VERIFYPEER, $this->ssl_verifypeer);
+    curl_setopt($ci, CURLOPT_HEADERFUNCTION, array($this, 'getHeader'));
+    curl_setopt($ci, CURLOPT_HEADER, FALSE);
+
+    switch ($method) {
+      case 'POST':
+        curl_setopt($ci, CURLOPT_POST, TRUE);
+        if (!empty($postfields)) {
+          curl_setopt($ci, CURLOPT_POSTFIELDS, $postfields);
+        }
+        break;
+      case 'DELETE':
+        curl_setopt($ci, CURLOPT_CUSTOMREQUEST, 'DELETE');
+        if (!empty($postfields)) {
+          $url = "{$url}?{$postfields}";
+        }
+    }
+
+    curl_setopt($ci, CURLOPT_URL, $url);
+    $response = curl_exec($ci);
+    $this->http_code = curl_getinfo($ci, CURLINFO_HTTP_CODE);
+    $this->http_info = array_merge($this->http_info, curl_getinfo($ci));
+    $this->url = $url;
+    curl_close ($ci);
+    return $response;
+  }
+
+  /**
+   * Get the header info to store.
+   */
+  function getHeader($ch, $header) {
+    $i = strpos($header, ':');
+    if (!empty($i)) {
+      $key = str_replace('-', '_', strtolower(substr($header, 0, $i)));
+      $value = trim(substr($header, $i + 2));
+      $this->http_header[$key] = $value;
+    }
+    return strlen($header);
+  }
+}
diff --git a/tumblr/templates/admin.tpl b/tumblr/templates/admin.tpl
index f38844a2..b361f182 100644
--- a/tumblr/templates/admin.tpl
+++ b/tumblr/templates/admin.tpl
@@ -1,4 +1,3 @@
 {{include file="field_input.tpl" field=$consumer_key}}
 {{include file="field_input.tpl" field=$consumer_secret}}
-{{include file="field_input.tpl" field=$max_tags}}
 <div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
diff --git a/tumblr/templates/connector_settings.tpl b/tumblr/templates/connector_settings.tpl
deleted file mode 100644
index 435059e6..00000000
--- a/tumblr/templates/connector_settings.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-<p><a href="{{$authenticate_url}}">{{$l10n.connect}}</a></p>
-
-{{include file="field_checkbox.tpl" field=$enable}}
-{{include file="field_checkbox.tpl" field=$bydefault}}
-{{include file="field_checkbox.tpl" field=$import}}
-{{include file="field_input.tpl" field=$tags}}
-
-{{if $page_select}}
-	{{include file="field_select.tpl" field=$page_select}}
-{{else}}
-	{{$l10n.noconnect}}
-{{/if}}
diff --git a/tumblr/tumblr.css b/tumblr/tumblr.css
new file mode 100644
index 00000000..c76fb61e
--- /dev/null
+++ b/tumblr/tumblr.css
@@ -0,0 +1,16 @@
+
+#tumblr-enable-label, #tumblr-username-label, #tumblr-page-label, #tumblr-bydefault-label {
+	float: left;
+	width: 200px;
+	margin-top: 10px;
+}
+
+#tumblr-checkbox, #tumblr-username, #tumblr-page, #tumblr-bydefault {
+	float: left;
+	margin-top: 10px;
+}
+
+#tumblr-submit {
+	margin-top: 15px;
+}
+
diff --git a/tumblr/tumblr.php b/tumblr/tumblr.php
index 78e415ee..3bf258b3 100644
--- a/tumblr/tumblr.php
+++ b/tumblr/tumblr.php
@@ -7,461 +7,303 @@
  * Author: Michael Vogel <https://pirati.ca/profile/heluecht>
  */
 
-use Friendica\Content\PageInfo;
-use Friendica\Content\Text\BBCode;
-use Friendica\Content\Text\HTML;
-use Friendica\Content\Text\NPF;
-use Friendica\Core\Cache\Enum\Duration;
-use Friendica\Core\Config\Util\ConfigFileManager;
-use Friendica\Core\Hook;
-use Friendica\Core\Logger;
-use Friendica\Core\Protocol;
-use Friendica\Core\Renderer;
-use Friendica\Core\System;
-use Friendica\Core\Worker;
-use Friendica\Database\DBA;
-use Friendica\DI;
-use Friendica\Model\Contact;
-use Friendica\Model\Item;
-use Friendica\Model\Photo;
-use Friendica\Model\Post;
-use Friendica\Model\Tag;
-use Friendica\Network\HTTPClient\Capability\ICanHandleHttpResponses;
-use Friendica\Network\HTTPClient\Client\HttpClientAccept;
-use Friendica\Network\HTTPClient\Client\HttpClientOptions;
-use Friendica\Protocol\Activity;
-use Friendica\Util\DateTimeFormat;
-use Friendica\Util\Network;
-use Friendica\Util\Strings;
-use GuzzleHttp\Client;
-use GuzzleHttp\Exception\RequestException;
-use GuzzleHttp\HandlerStack;
-use GuzzleHttp\Subscriber\Oauth\Oauth1;
+require_once __DIR__ . DIRECTORY_SEPARATOR . 'library' . DIRECTORY_SEPARATOR . 'tumblroauth.php';
 
-define('TUMBLR_DEFAULT_POLL_INTERVAL', 10); // given in minutes
-define('TUMBLR_DEFAULT_MAXIMUM_TAGS', 10);
+use Friendica\App;
+use Friendica\Content\Text\BBCode;
+use Friendica\Core\Config;
+use Friendica\Core\Hook;
+use Friendica\Core\L10n;
+use Friendica\Core\Logger;
+use Friendica\Core\PConfig;
+use Friendica\Core\Renderer;
+use Friendica\Database\DBA;
+use Friendica\Util\Strings;
 
 function tumblr_install()
 {
-	Hook::register('load_config',             __FILE__, 'tumblr_load_config');
-	Hook::register('hook_fork',               __FILE__, 'tumblr_hook_fork');
-	Hook::register('post_local',              __FILE__, 'tumblr_post_local');
-	Hook::register('notifier_normal',         __FILE__, 'tumblr_send');
-	Hook::register('jot_networks',            __FILE__, 'tumblr_jot_nets');
-	Hook::register('connector_settings',      __FILE__, 'tumblr_settings');
-	Hook::register('connector_settings_post', __FILE__, 'tumblr_settings_post');
-	Hook::register('cron',                    __FILE__, 'tumblr_cron');
-	Hook::register('support_follow',          __FILE__, 'tumblr_support_follow');
-	Hook::register('support_probe',           __FILE__, 'tumblr_support_probe');
-	Hook::register('follow',                  __FILE__, 'tumblr_follow');
-	Hook::register('unfollow',                __FILE__, 'tumblr_unfollow');
-	Hook::register('block',                   __FILE__, 'tumblr_block');
-	Hook::register('unblock',                 __FILE__, 'tumblr_unblock');
-	Hook::register('check_item_notification', __FILE__, 'tumblr_check_item_notification');
-	Hook::register('probe_detect',            __FILE__, 'tumblr_probe_detect');
-	Hook::register('item_by_link',            __FILE__, 'tumblr_item_by_link');
-	Logger::info('installed tumblr');
+	Hook::register('hook_fork',               'addon/tumblr/tumblr.php', 'tumblr_hook_fork');
+	Hook::register('post_local',              'addon/tumblr/tumblr.php', 'tumblr_post_local');
+	Hook::register('notifier_normal',         'addon/tumblr/tumblr.php', 'tumblr_send');
+	Hook::register('jot_networks',            'addon/tumblr/tumblr.php', 'tumblr_jot_nets');
+	Hook::register('connector_settings',      'addon/tumblr/tumblr.php', 'tumblr_settings');
+	Hook::register('connector_settings_post', 'addon/tumblr/tumblr.php', 'tumblr_settings_post');
 }
 
-function tumblr_load_config(ConfigFileManager $loader)
+function tumblr_uninstall()
 {
-	DI::app()->getConfigCache()->load($loader->loadAddonConfig('tumblr'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
+	Hook::unregister('hook_fork',               'addon/tumblr/tumblr.php', 'tumblr_hook_fork');
+	Hook::unregister('post_local',              'addon/tumblr/tumblr.php', 'tumblr_post_local');
+	Hook::unregister('notifier_normal',         'addon/tumblr/tumblr.php', 'tumblr_send');
+	Hook::unregister('jot_networks',            'addon/tumblr/tumblr.php', 'tumblr_jot_nets');
+	Hook::unregister('connector_settings',      'addon/tumblr/tumblr.php', 'tumblr_settings');
+	Hook::unregister('connector_settings_post', 'addon/tumblr/tumblr.php', 'tumblr_settings_post');
 }
 
-function tumblr_check_item_notification(array &$notification_data)
-{
-	if (!tumblr_enabled_for_user($notification_data['uid'])) {
-		return;
-	}
-
-	$page = tumblr_get_page($notification_data['uid']);
-	if (empty($page)) {
-		return;
-	}
-
-	$own_user = Contact::selectFirst(['url', 'alias'], ['network' => Protocol::TUMBLR, 'uid' => [0, $notification_data['uid']], 'poll' => 'tumblr::' . $page]);
-	if ($own_user) {
-		$notification_data['profiles'][] = $own_user['url'];
-		$notification_data['profiles'][] = $own_user['alias'];
-	}
-}
-
-function tumblr_probe_detect(array &$hookData)
-{
-	// Don't overwrite an existing result
-	if (isset($hookData['result'])) {
-		return;
-	}
-
-	// Avoid a lookup for the wrong network
-	if (!in_array($hookData['network'], ['', Protocol::TUMBLR])) {
-		return;
-	}
-
-	$hookData['result'] = tumblr_get_contact_by_url($hookData['uri'], $hookData['uid']);
-
-	// Authoritative probe should set the result even if the probe was unsuccessful
-	if ($hookData['network'] == Protocol::TUMBLR && empty($hookData['result'])) {
-		$hookData['result'] = [];
-	}
-}
-
-function tumblr_item_by_link(array &$hookData)
-{
-	// Don't overwrite an existing result
-	if (isset($hookData['item_id'])) {
-		return;
-	}
-
-	if (!tumblr_enabled_for_user($hookData['uid'])) {
-		return;
-	}
-
-	if (!preg_match('#^https?://www\.tumblr.com/blog/view/(.+)/(\d+).*#', $hookData['uri'], $matches) && !preg_match('#^https?://www\.tumblr.com/(.+)/(\d+).*#', $hookData['uri'], $matches)) {
-		return;
-	}
-
-	Logger::debug('Found tumblr post', ['url' => $hookData['uri'], 'blog' => $matches[1], 'id' => $matches[2]]);
-
-	$parameters = ['id' => $matches[2], 'reblog_info' => false, 'notes_info' => false, 'npf' => false];
-	$result = tumblr_get($hookData['uid'], 'blog/' . $matches[1] . '/posts', $parameters);
-	if ($result->meta->status > 399) {
-		Logger::notice('Error fetching status', ['meta' => $result->meta, 'response' => $result->response, 'errors' => $result->errors, 'blog' => $matches[1], 'id' => $matches[2]]);
-		return [];
-	}
-
-	Logger::debug('Got post', ['blog' => $matches[1], 'id' => $matches[2], 'result' => $result->response->posts]);
-	if (!empty($result->response->posts)) {
-		$hookData['item_id'] = tumblr_process_post($result->response->posts[0], $hookData['uid'], Item::PR_FETCHED);
-	}
-}
-
-function tumblr_support_follow(array &$data)
-{
-	if ($data['protocol'] == Protocol::TUMBLR) {
-		$data['result'] = true;
-	}
-}
-
-function tumblr_support_probe(array &$data)
-{
-	if ($data['protocol'] == Protocol::TUMBLR) {
-		$data['result'] = true;
-	}
-}
-
-function tumblr_follow(array &$hook_data)
-{
-	$uid = DI::userSession()->getLocalUserId();
-
-	if (!tumblr_enabled_for_user($uid)) {
-		return;
-	}
-
-	Logger::debug('Check if contact is Tumblr', ['url' => $hook_data['url']]);
-
-	$fields = tumblr_get_contact_by_url($hook_data['url'], $uid);
-	if (empty($fields)) {
-		Logger::debug('Contact is not a Tumblr contact', ['url' => $hook_data['url']]);
-		return;
-	}
-
-	$result = tumblr_post($uid, 'user/follow', ['url' => $fields['url']]);
-	if ($result->meta->status <= 399) {
-		$hook_data['contact'] = $fields;
-		Logger::debug('Successfully start following', ['url' => $fields['url']]);
-	} else {
-		Logger::notice('Following failed', ['meta' => $result->meta, 'response' => $result->response, 'errors' => $result->errors, 'url' => $fields['url']]);
-	}
-}
-
-function tumblr_unfollow(array &$hook_data)
-{
-	if (!tumblr_enabled_for_user($hook_data['uid'])) {
-		return;
-	}
-
-	if (!tumblr_get_contact_uuid($hook_data['contact'])) {
-		return;
-	}
-	$result = tumblr_post($hook_data['uid'], 'user/unfollow', ['url' => $hook_data['contact']['url']]);
-	$hook_data['result'] = ($result->meta->status <= 399);
-}
-
-function tumblr_block(array &$hook_data)
-{
-	if (!tumblr_enabled_for_user($hook_data['uid'])) {
-		return;
-	}
-
-	$uuid = tumblr_get_contact_uuid($hook_data['contact']);
-	if (!$uuid) {
-		return;
-	}
-
-	$result = tumblr_post($hook_data['uid'], 'blog/' . tumblr_get_page($hook_data['uid']) . '/blocks', ['blocked_tumblelog' => $uuid]);
-	$hook_data['result'] = ($result->meta->status <= 399);
-
-	if ($hook_data['result']) {
-		$cdata = Contact::getPublicAndUserContactID($hook_data['contact']['id'], $hook_data['uid']);
-		if (!empty($cdata['user'])) {
-			Contact::remove($cdata['user']);
-		}
-	}
-}
-
-function tumblr_unblock(array &$hook_data)
-{
-	if (!tumblr_enabled_for_user($hook_data['uid'])) {
-		return;
-	}
-
-	$uuid = tumblr_get_contact_uuid($hook_data['contact']);
-	if (!$uuid) {
-		return;
-	}
-
-	$result = tumblr_delete($hook_data['uid'], 'blog/' . tumblr_get_page($hook_data['uid']) . '/blocks', ['blocked_tumblelog' => $uuid]);
-	$hook_data['result'] = ($result->meta->status <= 399);
-}
-
-function tumblr_get_contact_uuid(array $contact): string
-{
-	if (($contact['network'] != Protocol::TUMBLR) || (substr($contact['poll'], 0, 8) != 'tumblr::')) {
-		return '';
-	}
-	return substr($contact['poll'], 8);
-}
-
-/**
- * This is a statement rather than an actual function definition. The simple
- * existence of this method is checked to figure out if the addon offers a
- * module.
- */
 function tumblr_module()
 {
 }
 
-function tumblr_content()
+function tumblr_content(App $a)
 {
-	if (!DI::userSession()->getLocalUserId()) {
-		DI::sysmsg()->addNotice(DI::l10n()->t('Permission denied.'));
-		return;
+	if (! local_user()) {
+		notice(L10n::t('Permission denied.') . EOL);
+		return '';
 	}
 
-	switch (DI::args()->getArgv()[1] ?? '') {
-		case 'connect':
-			tumblr_connect();
-			break;
+	if (isset($a->argv[1])) {
+		switch ($a->argv[1]) {
+			case "connect":
+				$o = tumblr_connect($a);
+				break;
 
-		case 'redirect':
-			tumblr_redirect();
-			break;
+			case "callback":
+				$o = tumblr_callback($a);
+				break;
+
+			default:
+				$o = print_r($a->argv, true);
+				break;
+		}
+	} else {
+		$o = tumblr_connect($a);
 	}
-	DI::baseUrl()->redirect('settings/connectors/tumblr');
+
+	return $o;
 }
 
-function tumblr_redirect()
+function tumblr_addon_admin(App $a, &$o)
 {
-	if (($_REQUEST['state'] ?? '') != DI::session()->get('oauth_state')) {
-		return;
-	}
-
-	tumblr_get_token(DI::userSession()->getLocalUserId(), $_REQUEST['code'] ?? '');
-}
-
-function tumblr_connect()
-{
-	// Define the needed keys
-	$consumer_key    = DI::config()->get('tumblr', 'consumer_key');
-	$consumer_secret = DI::config()->get('tumblr', 'consumer_secret');
-
-	if (empty($consumer_key) || empty($consumer_secret)) {
-		return;
-	}
-
-	$state = base64_encode(random_bytes(20));
-	DI::session()->set('oauth_state', $state);
-
-	$parameters = [
-		'client_id'     => $consumer_key,
-		'response_type' => 'code',
-		'scope'         => 'basic write offline_access',
-		'state'         => $state
-	];
-
-	System::externalRedirect('https://www.tumblr.com/oauth2/authorize?' . http_build_query($parameters));
-}
-
-function tumblr_addon_admin(string &$o)
-{
-	$t = Renderer::getMarkupTemplate('admin.tpl', 'addon/tumblr/');
+	$t = Renderer::getMarkupTemplate( "admin.tpl", "addon/tumblr/" );
 
 	$o = Renderer::replaceMacros($t, [
-		'$submit' => DI::l10n()->t('Save Settings'),
-		'$consumer_key'    => ['consumer_key', DI::l10n()->t('Consumer Key'), DI::config()->get('tumblr', 'consumer_key'), ''],
-		'$consumer_secret' => ['consumer_secret', DI::l10n()->t('Consumer Secret'), DI::config()->get('tumblr', 'consumer_secret'), ''],
-		'$max_tags'        => ['max_tags', DI::l10n()->t('Maximum tags'), DI::config()->get('tumblr', 'max_tags') ?? TUMBLR_DEFAULT_MAXIMUM_TAGS, DI::l10n()->t('Maximum number of tags that a user can follow. Enter 0 to deactivate the feature.')],
+		'$submit' => L10n::t('Save Settings'),
+		// name, label, value, help, [extra values]
+		'$consumer_key' => ['consumer_key', L10n::t('Consumer Key'),  Config::get('tumblr', 'consumer_key' ), ''],
+		'$consumer_secret' => ['consumer_secret', L10n::t('Consumer Secret'),  Config::get('tumblr', 'consumer_secret' ), ''],
 	]);
 }
 
-function tumblr_addon_admin_post()
+function tumblr_addon_admin_post(App $a)
 {
-	DI::config()->set('tumblr', 'consumer_key', trim($_POST['consumer_key'] ?? ''));
-	DI::config()->set('tumblr', 'consumer_secret', trim($_POST['consumer_secret'] ?? ''));
-	DI::config()->set('tumblr', 'max_tags', max(0, intval($_POST['max_tags'] ?? '')));
+	$consumer_key    =       (!empty($_POST['consumer_key'])      ? Strings::escapeTags(trim($_POST['consumer_key']))   : '');
+	$consumer_secret =       (!empty($_POST['consumer_secret'])   ? Strings::escapeTags(trim($_POST['consumer_secret'])): '');
+
+	Config::set('tumblr', 'consumer_key',$consumer_key);
+	Config::set('tumblr', 'consumer_secret',$consumer_secret);
+
+	info(L10n::t('Settings updated.'). EOL);
 }
 
-function tumblr_settings(array &$data)
+function tumblr_connect(App $a)
 {
-	if (!DI::userSession()->getLocalUserId()) {
+	// Start a session.  This is necessary to hold on to  a few keys the callback script will also need
+	session_start();
+
+	// Include the TumblrOAuth library
+	//require_once('addon/tumblr/tumblroauth/tumblroauth.php');
+
+	// Define the needed keys
+	$consumer_key = Config::get('tumblr', 'consumer_key');
+	$consumer_secret = Config::get('tumblr', 'consumer_secret');
+
+	// The callback URL is the script that gets called after the user authenticates with tumblr
+	// In this example, it would be the included callback.php
+	$callback_url = $a->getBaseURL()."/tumblr/callback";
+
+	// Let's begin.  First we need a Request Token.  The request token is required to send the user
+	// to Tumblr's login page.
+
+	// Create a new instance of the TumblrOAuth library.  For this step, all we need to give the library is our
+	// Consumer Key and Consumer Secret
+	$tum_oauth = new TumblrOAuth($consumer_key, $consumer_secret);
+
+	// Ask Tumblr for a Request Token.  Specify the Callback URL here too (although this should be optional)
+	$request_token = $tum_oauth->getRequestToken($callback_url);
+
+	// Store the request token and Request Token Secret as out callback.php script will need this
+	$_SESSION['request_token'] = $token = $request_token['oauth_token'];
+	$_SESSION['request_token_secret'] = $request_token['oauth_token_secret'];
+
+	// Check the HTTP Code.  It should be a 200 (OK), if it's anything else then something didn't work.
+	switch ($tum_oauth->http_code) {
+		case 200:
+			// Ask Tumblr to give us a special address to their login page
+			$url = $tum_oauth->getAuthorizeURL($token);
+
+			// Redirect the user to the login URL given to us by Tumblr
+			header('Location: ' . $url);
+
+			/*
+			 * That's it for our side.  The user is sent to a Tumblr Login page and
+			 * asked to authroize our app.  After that, Tumblr sends the user back to
+			 * our Callback URL (callback.php) along with some information we need to get
+			 * an access token.
+			 */
+			break;
+
+		default:
+			// Give an error message
+			$o = 'Could not connect to Tumblr. Refresh the page or try again later.';
+	}
+
+	return $o;
+}
+
+function tumblr_callback(App $a)
+{
+	// Start a session, load the library
+	session_start();
+	//require_once('addon/tumblr/tumblroauth/tumblroauth.php');
+
+	// Define the needed keys
+	$consumer_key = Config::get('tumblr', 'consumer_key');
+	$consumer_secret = Config::get('tumblr', 'consumer_secret');
+
+	// Once the user approves your app at Tumblr, they are sent back to this script.
+	// This script is passed two parameters in the URL, oauth_token (our Request Token)
+	// and oauth_verifier (Key that we need to get Access Token).
+	// We'll also need out Request Token Secret, which we stored in a session.
+
+	// Create instance of TumblrOAuth.
+	// It'll need our Consumer Key and Secret as well as our Request Token and Secret
+	$tum_oauth = new TumblrOAuth($consumer_key, $consumer_secret, $_SESSION['request_token'], $_SESSION['request_token_secret']);
+
+	// Ok, let's get an Access Token. We'll need to pass along our oauth_verifier which was given to us in the URL.
+	$access_token = $tum_oauth->getAccessToken($_REQUEST['oauth_verifier']);
+
+	// We're done with the Request Token and Secret so let's remove those.
+	unset($_SESSION['request_token']);
+	unset($_SESSION['request_token_secret']);
+
+	// Make sure nothing went wrong.
+	if (200 == $tum_oauth->http_code) {
+		// good to go
+	} else {
+		return 'Unable to authenticate';
+	}
+
+	// What's next?  Now that we have an Access Token and Secret, we can make an API call.
+	PConfig::set(local_user(), "tumblr", "oauth_token", $access_token['oauth_token']);
+	PConfig::set(local_user(), "tumblr", "oauth_token_secret", $access_token['oauth_token_secret']);
+
+	$o = L10n::t("You are now authenticated to tumblr.");
+	$o .= '<br /><a href="'.$a->getBaseURL().'/settings/connectors">'.L10n::t("return to the connector page").'</a>';
+
+	return $o;
+}
+
+function tumblr_jot_nets(App $a, array &$jotnets_fields)
+{
+	if (! local_user()) {
 		return;
 	}
 
-	$enabled     = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'tumblr', 'post') ?? false;
-	$def_enabled = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'tumblr', 'post_by_default') ?? false;
-	$import      = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'tumblr', 'import') ?? false;
-	$tags        = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'tumblr', 'tags') ?? [];
-
-	$max_tags = DI::config()->get('tumblr', 'max_tags') ?? TUMBLR_DEFAULT_MAXIMUM_TAGS;
-
-	$tags_str = implode(', ', $tags);
-	$cachekey = 'tumblr-blogs-' . DI::userSession()->getLocalUserId();
-	$blogs = DI::cache()->get($cachekey);
-	if (empty($blogs)) {
-		$blogs = tumblr_get_blogs(DI::userSession()->getLocalUserId());
-		if (!empty($blogs)) {
-			DI::cache()->set($cachekey, $blogs, Duration::HALF_HOUR);
-		}
-	}
-
-	if (!empty($blogs)) {
-		$page = tumblr_get_page(DI::userSession()->getLocalUserId(), $blogs);
-
-		$page_select = ['tumblr_page', DI::l10n()->t('Post to page:'), $page, '', $blogs];
-	}
-
-	$t    = Renderer::getMarkupTemplate('connector_settings.tpl', 'addon/tumblr/');
-	$html = Renderer::replaceMacros($t, [
-		'$l10n' => [
-			'connect'   => DI::l10n()->t('(Re-)Authenticate your tumblr page'),
-			'noconnect' => DI::l10n()->t('You are not authenticated to tumblr'),
-		],
-
-		'$authenticate_url' => DI::baseUrl() . '/tumblr/connect',
-
-		'$enable'      => ['tumblr', DI::l10n()->t('Enable Tumblr Post Addon'), $enabled],
-		'$bydefault'   => ['tumblr_bydefault', DI::l10n()->t('Post to Tumblr by default'), $def_enabled],
-		'$import'      => ['tumblr_import', DI::l10n()->t('Import the remote timeline'), $import],
-		'$tags'        => ['tags', DI::l10n()->t('Subscribed tags'), $tags_str, DI::l10n()->t('Comma separated list of up to %d tags that will be imported additionally to the timeline', $max_tags)],
-		'$page_select' => $page_select ?? '',
-	]);
-
-	$data = [
-		'connector' => 'tumblr',
-		'title'     => DI::l10n()->t('Tumblr Import/Export'),
-		'image'     => 'images/tumblr.png',
-		'enabled'   => $enabled,
-		'html'      => $html,
-	];
-}
-
-function tumblr_jot_nets(array &$jotnets_fields)
-{
-	if (!DI::userSession()->getLocalUserId()) {
-		return;
-	}
-
-	if (DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'tumblr', 'post')) {
+	if (PConfig::get(local_user(),'tumblr','post')) {
 		$jotnets_fields[] = [
 			'type' => 'checkbox',
 			'field' => [
 				'tumblr_enable',
-				DI::l10n()->t('Post to Tumblr'),
-				DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'tumblr', 'post_by_default')
+				L10n::t('Post to Tumblr'),
+				PConfig::get(local_user(),'tumblr','post_by_default')
 			]
 		];
 	}
 }
 
-function tumblr_settings_post(array &$b)
+function tumblr_settings(App $a, &$s)
+{
+	if (! local_user()) {
+		return;
+	}
+
+	/* Add our stylesheet to the page so we can make our settings look nice */
+
+	$a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->getBaseURL() . '/addon/tumblr/tumblr.css' . '" media="all" />' . "\r\n";
+
+	/* Get the current state of our config variables */
+
+	$enabled = PConfig::get(local_user(), 'tumblr', 'post');
+	$checked = (($enabled) ? ' checked="checked" ' : '');
+	$css = (($enabled) ? '' : '-disabled');
+
+	$def_enabled = PConfig::get(local_user(), 'tumblr', 'post_by_default');
+
+	$def_checked = (($def_enabled) ? ' checked="checked" ' : '');
+
+	/* Add some HTML to the existing form */
+
+	$s .= '<span id="settings_tumblr_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_tumblr_expanded\'); openClose(\'settings_tumblr_inflated\');">';
+	$s .= '<img class="connector'.$css.'" src="images/tumblr.png" /><h3 class="connector">'. L10n::t('Tumblr Export').'</h3>';
+	$s .= '</span>';
+	$s .= '<div id="settings_tumblr_expanded" class="settings-block" style="display: none;">';
+	$s .= '<span class="fakelink" onclick="openClose(\'settings_tumblr_expanded\'); openClose(\'settings_tumblr_inflated\');">';
+	$s .= '<img class="connector'.$css.'" src="images/tumblr.png" /><h3 class="connector">'. L10n::t('Tumblr Export').'</h3>';
+	$s .= '</span>';
+
+	$s .= '<div id="tumblr-username-wrapper">';
+	$s .= '<a href="'.$a->getBaseURL().'/tumblr/connect">'.L10n::t("(Re-)Authenticate your tumblr page").'</a>';
+	$s .= '</div><div class="clear"></div>';
+
+	$s .= '<div id="tumblr-enable-wrapper">';
+	$s .= '<label id="tumblr-enable-label" for="tumblr-checkbox">' . L10n::t('Enable Tumblr Post Addon') . '</label>';
+	$s .= '<input id="tumblr-checkbox" type="checkbox" name="tumblr" value="1" ' . $checked . '/>';
+	$s .= '</div><div class="clear"></div>';
+
+	$s .= '<div id="tumblr-bydefault-wrapper">';
+	$s .= '<label id="tumblr-bydefault-label" for="tumblr-bydefault">' . L10n::t('Post to Tumblr by default') . '</label>';
+	$s .= '<input id="tumblr-bydefault" type="checkbox" name="tumblr_bydefault" value="1" ' . $def_checked . '/>';
+	$s .= '</div><div class="clear"></div>';
+
+	$oauth_token = PConfig::get(local_user(), "tumblr", "oauth_token");
+	$oauth_token_secret = PConfig::get(local_user(), "tumblr", "oauth_token_secret");
+
+	$s .= '<div id="tumblr-page-wrapper">';
+
+	if (($oauth_token != "") && ($oauth_token_secret != "")) {
+		$page = PConfig::get(local_user(), 'tumblr', 'page');
+		$consumer_key = Config::get('tumblr', 'consumer_key');
+		$consumer_secret = Config::get('tumblr', 'consumer_secret');
+
+		$tum_oauth = new TumblrOAuth($consumer_key, $consumer_secret, $oauth_token, $oauth_token_secret);
+
+		$userinfo = $tum_oauth->get('user/info');
+
+		$blogs = [];
+
+		$s .= '<label id="tumblr-page-label" for="tumblr-page">' . L10n::t('Post to page:') . '</label>';
+		$s .= '<select name="tumblr_page" id="tumblr-page">';
+		foreach($userinfo->response->user->blogs as $blog) {
+			$blogurl = substr(str_replace(["http://", "https://"], ["", ""], $blog->url), 0, -1);
+
+			if ($page == $blogurl) {
+				$s .= "<option value='".$blogurl."' selected>".$blogurl."</option>";
+			} else {
+				$s .= "<option value='".$blogurl."'>".$blogurl."</option>";
+			}
+		}
+
+		$s .= "</select>";
+	} else {
+		$s .= L10n::t("You are not authenticated to tumblr");
+	}
+
+	$s .= '</div><div class="clear"></div>';
+
+	/* provide a submit button */
+	$s .= '<div class="settings-submit-wrapper" ><input type="submit" id="tumblr-submit" name="tumblr-submit" class="settings-submit" value="' . L10n::t('Save Settings') . '" /></div></div>';
+}
+
+function tumblr_settings_post(App $a, array &$b)
 {
 	if (!empty($_POST['tumblr-submit'])) {
-		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'tumblr', 'post',            intval($_POST['tumblr']));
-		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'tumblr', 'page',            $_POST['tumblr_page']);
-		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'tumblr', 'post_by_default', intval($_POST['tumblr_bydefault']));
-		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'tumblr', 'import',          intval($_POST['tumblr_import']));
-
-		$max_tags = DI::config()->get('tumblr', 'max_tags') ?? TUMBLR_DEFAULT_MAXIMUM_TAGS;
-		$tags     = [];
-		foreach (explode(',', $_POST['tags']) as $tag) {
-			if (count($tags) < $max_tags) {
-				$tags[] = trim($tag, ' #');
-			}
-		}
-
-		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'tumblr', 'tags', $tags);
+		PConfig::set(local_user(), 'tumblr', 'post',            intval($_POST['tumblr']));
+		PConfig::set(local_user(), 'tumblr', 'page',            $_POST['tumblr_page']);
+		PConfig::set(local_user(), 'tumblr', 'post_by_default', intval($_POST['tumblr_bydefault']));
 	}
 }
 
-function tumblr_cron()
-{
-	$last = (int)DI::keyValue()->get('tumblr_last_poll');
-
-	$poll_interval = intval(DI::config()->get('tumblr', 'poll_interval'));
-	if (!$poll_interval) {
-		$poll_interval = TUMBLR_DEFAULT_POLL_INTERVAL;
-	}
-
-	if ($last) {
-		$next = $last + ($poll_interval * 60);
-		if ($next > time()) {
-			Logger::notice('poll interval not reached');
-			return;
-		}
-	}
-	Logger::notice('cron_start');
-
-	$abandon_days = intval(DI::config()->get('system', 'account_abandon_days'));
-	if ($abandon_days < 1) {
-		$abandon_days = 0;
-	}
-
-	$abandon_limit = date(DateTimeFormat::MYSQL, time() - $abandon_days * 86400);
-
-	$pconfigs = DBA::selectToArray('pconfig', [], ['cat' => 'tumblr', 'k' => 'import', 'v' => true]);
-	foreach ($pconfigs as $pconfig) {
-		if ($abandon_days != 0) {
-			if (!DBA::exists('user', ["`uid` = ? AND `login_date` >= ?", $pconfig['uid'], $abandon_limit])) {
-				Logger::notice('abandoned account: timeline from user will not be imported', ['user' => $pconfig['uid']]);
-				continue;
-			}
-		}
-
-		Logger::notice('importing timeline - start', ['user' => $pconfig['uid']]);
-		tumblr_fetch_dashboard($pconfig['uid'], $last);
-		tumblr_fetch_tags($pconfig['uid'], $last);
-		Logger::notice('importing timeline - done', ['user' => $pconfig['uid']]);
-	}
-
-	$last_clean = DI::keyValue()->get('tumblr_last_clean');
-	if (empty($last_clean) || ($last_clean + 86400 < time())) {
-		Logger::notice('Start contact cleanup');
-		$contacts = DBA::select('account-user-view', ['id', 'pid'], ["`network` = ? AND `uid` != ? AND `rel` = ?", Protocol::TUMBLR, 0, Contact::NOTHING]);
-		while ($contact = DBA::fetch($contacts)) {
-			Worker::add(Worker::PRIORITY_LOW, 'MergeContact', $contact['pid'], $contact['id'], 0);
-		}
-		DBA::close($contacts);
-		DI::keyValue()->set('tumblr_last_clean', time());
-		Logger::notice('Contact cleanup done');
-	}
-
-	Logger::notice('cron_end');
-
-	DI::keyValue()->set('tumblr_last_poll', time());
-}
-
-function tumblr_hook_fork(array &$b)
+function tumblr_hook_fork(&$a, &$b)
 {
 	if ($b['name'] != 'notifier_normal') {
 		return;
@@ -469,34 +311,22 @@ function tumblr_hook_fork(array &$b)
 
 	$post = $b['data'];
 
-	// Editing is not supported by the addon
-	if (($post['created'] !== $post['edited']) && !$post['deleted']) {
-		DI::logger()->info('Editing is not supported by the addon');
-		$b['execute'] = false;
-		return;
-	}
-
-	if (DI::pConfig()->get($post['uid'], 'tumblr', 'import')) {
-		// Don't post if it isn't a reply to a tumblr post
-		if (($post['parent'] != $post['id']) && !Post::exists(['id' => $post['parent'], 'network' => Protocol::TUMBLR])) {
-			Logger::notice('No tumblr parent found', ['item' => $post['id']]);
-			$b['execute'] = false;
-			return;
-		}
-	} elseif (!strstr($post['postopts'] ?? '', 'tumblr') || ($post['parent'] != $post['id']) || $post['private']) {
-		DI::logger()->info('Activities are never exported when we don\'t import the tumblr timeline', ['uid' => $post['uid']]);
+	if ($post['deleted'] || $post['private'] || ($post['created'] !== $post['edited']) ||
+		!strstr($post['postopts'], 'tumblr') || ($post['parent'] != $post['id'])) {
 		$b['execute'] = false;
 		return;
 	}
 }
 
-function tumblr_post_local(array &$b)
+function tumblr_post_local(App $a, array &$b)
 {
+	// This can probably be changed to allow editing by pointing to a different API endpoint
+
 	if ($b['edit']) {
 		return;
 	}
 
-	if (!DI::userSession()->getLocalUserId() || (DI::userSession()->getLocalUserId() != $b['uid'])) {
+	if (!local_user() || (local_user() != $b['uid'])) {
 		return;
 	}
 
@@ -504,11 +334,11 @@ function tumblr_post_local(array &$b)
 		return;
 	}
 
-	$tmbl_post   = intval(DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'tumblr', 'post'));
+	$tmbl_post   = intval(PConfig::get(local_user(), 'tumblr', 'post'));
+
 	$tmbl_enable = (($tmbl_post && !empty($_REQUEST['tumblr_enable'])) ? intval($_REQUEST['tumblr_enable']) : 0);
 
-	// if API is used, default to the chosen settings
-	if ($b['api_source'] && intval(DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'tumblr', 'post_by_default'))) {
+	if ($b['api_source'] && intval(PConfig::get(local_user(), 'tumblr', 'post_by_default'))) {
 		$tmbl_enable = 1;
 	}
 
@@ -523,974 +353,139 @@ function tumblr_post_local(array &$b)
 	$b['postopts'] .= 'tumblr';
 }
 
-function tumblr_send(array &$b)
-{
-	if (($b['created'] !== $b['edited']) && !$b['deleted']) {
+
+
+
+function tumblr_send(App $a, array &$b) {
+
+	if ($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited'])) {
 		return;
 	}
 
-	if ($b['gravity'] != Item::GRAVITY_PARENT) {
-		Logger::debug('Got comment', ['item' => $b]);
+	if (! strstr($b['postopts'],'tumblr')) {
+		return;
+	}
 
-		$parent = tumblr_get_post_from_uri($b['thr-parent']);
-		if (empty($parent)) {
-			Logger::notice('No tumblr post', ['thr-parent' => $b['thr-parent']]);
-			return;
+	if ($b['parent'] != $b['id']) {
+		return;
+	}
+
+	// Dont't post if the post doesn't belong to us.
+	// This is a check for forum postings
+	$self = DBA::selectFirst('contact', ['id'], ['uid' => $b['uid'], 'self' => true]);
+	if ($b['contact-id'] != $self['id']) {
+		return;
+	}
+
+	$oauth_token = PConfig::get($b['uid'], "tumblr", "oauth_token");
+	$oauth_token_secret = PConfig::get($b['uid'], "tumblr", "oauth_token_secret");
+	$page = PConfig::get($b['uid'], "tumblr", "page");
+	$tmbl_blog = 'blog/' . $page . '/post';
+
+	if ($oauth_token && $oauth_token_secret && $tmbl_blog) {
+		$tag_arr = [];
+		$tags = '';
+		preg_match_all('/\#\[(.*?)\](.*?)\[/', $b['tag'], $matches, PREG_SET_ORDER);
+
+		if (!empty($matches)) {
+			foreach($matches as $mtch) {
+				$tag_arr[] = $mtch[2];
+			}
 		}
 
-		Logger::debug('Parent found', ['parent' => $parent]);
+		if (count($tag_arr)) {
+			$tags = implode(',', $tag_arr);
+		}
 
-		$page = tumblr_get_page($b['uid']);
+		$title = trim($b['title']);
 
-		if ($b['gravity'] == Item::GRAVITY_COMMENT) {
-			Logger::notice('Commenting is not supported (yet)');
+		$siteinfo = BBCode::getAttachedData($b["body"]);
+
+		$params = [
+			'state'  => 'published',
+			'tags'   => $tags,
+			'tweet'  => 'off',
+			'format' => 'html',
+		];
+
+		if (!isset($siteinfo["type"])) {
+			$siteinfo["type"] = "";
+		}
+
+		if (($title == "") && isset($siteinfo["title"])) {
+			$title = $siteinfo["title"];
+		}
+
+		if (isset($siteinfo["text"])) {
+			$body = $siteinfo["text"];
 		} else {
-			if (($b['verb'] == Activity::LIKE) && !$b['deleted']) {
-				$params = ['id' => $parent['id'], 'reblog_key' => $parent['reblog_key']];
-				$result = tumblr_post($b['uid'], 'user/like', $params);
-			} elseif (($b['verb'] == Activity::LIKE) && $b['deleted']) {
-				$params = ['id' => $parent['id'], 'reblog_key' => $parent['reblog_key']];
-				$result = tumblr_post($b['uid'], 'user/unlike', $params);
-			} elseif (($b['verb'] == Activity::ANNOUNCE) && !$b['deleted']) {
-				$params = ['id' => $parent['id'], 'reblog_key' => $parent['reblog_key']];
-				$result = tumblr_post($b['uid'], 'blog/' . $page . '/post/reblog', $params);
-			} elseif (($b['verb'] == Activity::ANNOUNCE) && $b['deleted']) {
-				$announce = tumblr_get_post_from_uri($b['extid']);
-				if (empty($announce)) {
-					return;
+			$body = BBCode::removeShareInformation($b["body"]);
+		}
+
+		switch ($siteinfo["type"]) {
+			case "photo":
+				$params['type']    = "photo";
+				$params['caption'] = BBCode::convert($body, false, 4);
+
+				if (isset($siteinfo["url"])) {
+					$params['link'] = $siteinfo["url"];
 				}
-				$params = ['id' => $announce['id']];
-				$result = tumblr_post($b['uid'], 'blog/' . $page . '/post/delete', $params);
-			} else {
-				// Unsupported activity
-				return;
-			}
 
-			if ($result->meta->status < 400) {
-				Logger::info('Successfully performed activity', ['verb' => $b['verb'], 'deleted' => $b['deleted'], 'meta' => $result->meta, 'response' => $result->response]);
-				if (!$b['deleted'] && !empty($result->response->id_string)) {
-					Item::update(['extid' => 'tumblr::' . $result->response->id_string], ['id' => $b['id']]);
-				}
-			} else {
-				Logger::notice('Error while performing activity', ['verb' => $b['verb'], 'deleted' => $b['deleted'], 'meta' => $result->meta, 'response' => $result->response, 'errors' => $result->errors, 'params' => $params]);
-			}
-		}
-		return;
-	} elseif ($b['private'] || !strstr($b['postopts'], 'tumblr')) {
-		return;
-	}
-
-	if (!tumblr_send_npf($b)) {
-		tumblr_send_legacy($b);
-	}
-}
-
-function tumblr_send_legacy(array $b)
-{
-	$b['body'] = BBCode::removeAttachment($b['body']);
-
-	$title = trim($b['title']);
-
-	$media = Post\Media::getByURIId($b['uri-id'], [Post\Media::HTML, Post\Media::AUDIO, Post\Media::VIDEO, Post\Media::IMAGE]);
-
-	$photo = array_search(Post\Media::IMAGE, array_column($media, 'type'));
-	$link  = array_search(Post\Media::HTML, array_column($media, 'type'));
-	$audio = array_search(Post\Media::AUDIO, array_column($media, 'type'));
-	$video = array_search(Post\Media::VIDEO, array_column($media, 'type'));
-
-	$params = [
-		'state'  => 'published',
-		'tags'   => implode(',', array_column(Tag::getByURIId($b['uri-id']), 'name')),
-		'tweet'  => 'off',
-		'format' => 'html',
-	];
-
-	$body = BBCode::removeShareInformation($b['body']);
-	$body = Post\Media::removeFromEndOfBody($body);
-
-	if ($photo !== false) {
-		$params['type'] = 'photo';
-		$params['caption'] = BBCode::convertForUriId($b['uri-id'], $body, BBCode::CONNECTORS);
-		$params['data'] = [];
-		foreach ($media as $photo) {
-			if ($photo['type'] == Post\Media::IMAGE) {
-				if (Network::isLocalLink($photo['url']) && ($data = Photo::getResourceData($photo['url']))) {
-					$photo = Photo::selectFirst([], ["`resource-id` = ? AND `scale` > ?", $data['guid'], 0]);
-					if (!empty($photo)) {
-						$params['data'][] = Photo::getImageDataForPhoto($photo);
-					}
-				}
-			}
-		}
-	} elseif ($link !== false) {
-		$params['type']        = 'link';
-		$params['title']       = $media[$link]['name'];
-		$params['url']         = $media[$link]['url'];
-		$params['description'] = BBCode::convertForUriId($b['uri-id'], $body, BBCode::CONNECTORS);
-
-		if (!empty($media[$link]['preview'])) {
-			$params['thumbnail'] = $media[$link]['preview'];
-		}
-		if (!empty($media[$link]['description'])) {
-			$params['excerpt'] = $media[$link]['description'];
-		}
-		if (!empty($media[$link]['author-name'])) {
-			$params['author'] = $media[$link]['author-name'];
-		}
-	} elseif ($audio !== false) {
-		$params['type']         = 'audio';
-		$params['external_url'] = $media[$audio]['url'];
-		$params['caption']      = BBCode::convertForUriId($b['uri-id'], $body, BBCode::CONNECTORS);
-	} elseif ($video !== false) {
-		$params['type']    = 'video';
-		$params['embed']   = $media[$video]['url'];
-		$params['caption'] = BBCode::convertForUriId($b['uri-id'], $body, BBCode::CONNECTORS);
-	} else {
-		$params['type']  = 'text';
-		$params['title'] = $title;
-		$params['body']  = BBCode::convertForUriId($b['uri-id'], $b['body'], BBCode::CONNECTORS);
-	}
-
-	if (isset($params['caption']) && (trim($title) != '')) {
-		$params['caption'] = '<h1>' . $title . '</h1>' .
-			'<p>' . $params['caption'] . '</p>';
-	}
-
-	$page = tumblr_get_page($b['uid']);
-
-	$result = tumblr_post($b['uid'], 'blog/' . $page . '/post', $params);
-
-	if ($result->meta->status < 400) {
-		Logger::info('Success (legacy)', ['blog' => $page, 'meta' => $result->meta, 'response' => $result->response]);
-	} else {
-		Logger::notice('Error posting blog (legacy)', ['blog' => $page, 'meta' => $result->meta, 'response' => $result->response, 'errors' => $result->errors, 'params' => $params]);
-	}
-}
-
-function tumblr_send_npf(array $post): bool
-{
-	$page = tumblr_get_page($post['uid']);
-
-	if (empty($page)) {
-		Logger::notice('Missing page, post will not be send to Tumblr.', ['uid' => $post['uid'], 'page' => $page, 'id' => $post['id']]);
-		// "true" is returned, since the legacy function will fail as well.
-		return true;
-	}
-
-	$post['body'] = Post\Media::addAttachmentsToBody($post['uri-id'], $post['body'], [Post\Media::IMAGE, Post\Media::AUDIO, Post\Media::VIDEO, Post\Media::ACTIVITY]);
-	if (!empty($post['title'])) {
-		$post['body'] = '[h1]' . $post['title'] . "[/h1]\n" . $post['body'];
-	}
-
-	if (!empty($post['quote-uri-id'])) {
-		$quote = Post::selectFirstPost(['uri', 'plink'], ['uri-id' => $post['quote-uri-id']]);
-		if (!empty($quote)) {
-			if ((strpos($post['body'], $quote['plink'] ?: $quote['uri']) === false) && (strpos($post['body'], $quote['uri']) === false)) {
-				$post['body'] .= "\n[url]" . ($quote['plink'] ?: $quote['uri']) . "[/url]\n";
-			}
-		}
-	}
-
-	$params = [
-		'content'                => NPF::fromBBCode($post['body'], $post['uri-id']),
-		'state'                  => 'published',
-		'date'                   => DateTimeFormat::utc($post['created'], DateTimeFormat::ATOM),
-		'tags'                   => implode(',', array_column(Tag::getByURIId($post['uri-id']), 'name')),
-		'is_private'             => false,
-		'interactability_reblog' => 'everyone'
-	];
-
-	$result = tumblr_post($post['uid'], 'blog/' . $page . '/posts', $params);
-
-	if ($result->meta->status < 400) {
-		Logger::info('Success (NPF)', ['blog' => $page, 'meta' => $result->meta, 'response' => $result->response]);
-		return true;
-	} else {
-		Logger::notice('Error posting blog (NPF)', ['blog' => $page, 'meta' => $result->meta, 'response' => $result->response, 'errors' => $result->errors, 'params' => $params]);
-		return false;
-	}
-}
-
-function tumblr_get_post_from_uri(string $uri): array
-{
-	$parts = explode(':', $uri);
-	if (($parts[0] != 'tumblr') || empty($parts[2])) {
-		return [];
-	}
-
-	$post['id']        = $parts[2];
-	$post['reblog_key'] = $parts[3] ?? '';
-
-	$post['reblog_key'] = str_replace('@t', '', $post['reblog_key']); // Temp
-	return $post;
-}
-
-/**
- * Fetch posts for user defined hashtags for the given user
- *
- * @param int $uid
- * @param int $last_poll
- * @return void
- */
-function tumblr_fetch_tags(int $uid, int $last_poll)
-{
-	if (!DI::config()->get('tumblr', 'max_tags') ?? TUMBLR_DEFAULT_MAXIMUM_TAGS) {
-		return;
-	}
-
-	foreach (DI::pConfig()->get($uid, 'tumblr', 'tags') ?? [] as $tag) {
-		$data = tumblr_get($uid, 'tagged', ['tag' => $tag]);
-		foreach (array_reverse($data->response) as $post) {
-			$id = tumblr_process_post($post, $uid, Item::PR_TAG, $last_poll);
-			if (!empty($id)) {
-				Logger::debug('Tag post imported', ['tag' => $tag, 'id' => $id]);
-				$post = Post::selectFirst(['uri-id'], ['id' => $id]);
-				$stored = Post\Category::storeFileByURIId($post['uri-id'], $uid, Post\Category::SUBCRIPTION, $tag);
-				Logger::debug('Stored tag subscription for user', ['uri-id' => $post['uri-id'], 'uid' => $uid, 'tag' => $tag, 'stored' => $stored]);
-			}
-		}
-	}
-}
-
-/**
- * Fetch the dashboard (timeline) for the given user
- *
- * @param int $uid
- * @param int $last_poll
- * @return void
- */
-function tumblr_fetch_dashboard(int $uid, int $last_poll)
-{
-	$parameters = ['reblog_info' => false, 'notes_info' => false, 'npf' => false];
-
-	$last = DI::pConfig()->get($uid, 'tumblr', 'last_id');
-	if (!empty($last)) {
-		$parameters['since_id'] = $last;
-	}
-
-	$dashboard = tumblr_get($uid, 'user/dashboard', $parameters);
-	if ($dashboard->meta->status > 399) {
-		Logger::notice('Error fetching dashboard', ['meta' => $dashboard->meta, 'response' => $dashboard->response, 'errors' => $dashboard->errors]);
-		return [];
-	}
-
-	if (empty($dashboard->response->posts)) {
-		return;
-	}
-
-	foreach (array_reverse($dashboard->response->posts) as $post) {
-		if ($post->id > $last) {
-			$last = $post->id;
-		}
-
-		Logger::debug('Importing post', ['uid' => $uid, 'created' => date(DateTimeFormat::MYSQL, $post->timestamp), 'id' => $post->id_string]);
-
-		tumblr_process_post($post, $uid, Item::PR_NONE, $last_poll);
-
-		DI::pConfig()->set($uid, 'tumblr', 'last_id', $last);
-	}
-}
-
-function tumblr_process_post(stdClass $post, int $uid, int $post_reason, int $last_poll = 0): int
-{
-	$uri = 'tumblr::' . $post->id_string . ':' . $post->reblog_key;
-
-	if (Post::exists(['uri' => $uri, 'uid' => $uid]) || ($post->blog->uuid == tumblr_get_page($uid))) {
-		return 0;
-	}
-
-	$item = tumblr_get_header($post, $uri, $uid);
-
-	$item = tumblr_get_content($item, $post);
-
-	$item['post-reason'] = $post_reason;
-
-	if (!empty($post->followed)) {
-		$item['post-reason'] = Item::PR_FOLLOWER;
-	}
-
-	if (($last_poll != 0) && strtotime($item['created']) > $last_poll) {
-		$item['received'] = $item['created'];
-	}
-
-	$id = Item::insert($item);
-
-	if ($id) {
-		$stored = Post::selectFirst(['uri-id'], ['id' => $id]);
-
-		if (!empty($post->tags)) {
-			foreach ($post->tags as $tag) {
-				Tag::store($stored['uri-id'], Tag::HASHTAG, $tag);
-			}
-		}
-	}
-	return $id;
-}
-
-/**
- * Sets the initial data for the item array
- *
- * @param stdClass $post
- * @param string $uri
- * @param integer $uid
- * @return array
- */
-function tumblr_get_header(stdClass $post, string $uri, int $uid): array
-{
-	$contact = tumblr_get_contact($post->blog, $uid);
-	$item = [
-		'network'       => Protocol::TUMBLR,
-		'uid'           => $uid,
-		'wall'          => false,
-		'uri'           => $uri,
-		'private'       => Item::UNLISTED,
-		'verb'          => Activity::POST,
-		'contact-id'    => $contact['id'],
-		'author-name'   => $contact['name'],
-		'author-link'   => $contact['url'],
-		'author-avatar' => $contact['avatar'],
-		'plink'         => $post->post_url,
-		'created'       => date(DateTimeFormat::MYSQL, $post->timestamp)
-	];
-
-	$item['owner-name']   = $item['author-name'];
-	$item['owner-link']   = $item['author-link'];
-	$item['owner-avatar'] = $item['author-avatar'];
-
-	return $item;
-}
-
-/**
- * Set the body according the given content type
- *
- * @param array $item
- * @param stdClass $post
- * @return array
- */
-function tumblr_get_content(array $item, stdClass $post): array
-{
-	switch ($post->type) {
-		case 'text':
-			$item['title'] = $post->title;
-			$item['body'] = HTML::toBBCode(tumblr_add_npf_data($post->body, $post->post_url));
-			break;
-
-		case 'quote':
-			if (empty($post->text)) {
-				$body = HTML::toBBCode($post->text) . "\n";
-			} else {
-				$body = '';
-			}
-			if (!empty($post->source_title) && !empty($post->source_url)) {
-				$body .= '[url=' . $post->source_url . ']' . $post->source_title . "[/url]:\n";
-			} elseif (!empty($post->source_title)) {
-				$body .= $post->source_title . ":\n";
-			}
-			$body .= '[quote]' . HTML::toBBCode($post->source) . '[/quote]';
-			$item['body'] = $body;
-			break;
-
-		case 'link':
-			$item['body'] = HTML::toBBCode($post->description) . "\n" . PageInfo::getFooterFromUrl($post->url);
-			break;
-
-		case 'answer':
-			if (!empty($post->asking_name) && !empty($post->asking_url)) {
-				$body = '[url=' . $post->asking_url . ']' . $post->asking_name . "[/url]:\n";
-			} elseif (!empty($post->asking_name)) {
-				$body = $post->asking_name . ":\n";
-			} else {
-				$body = '';
-			}
-			$body .= '[quote]' . HTML::toBBCode($post->question) . "[/quote]\n" . HTML::toBBCode($post->answer);
-			$item['body'] = $body;
-			break;
-
-		case 'video':
-			$item['body'] = HTML::toBBCode($post->caption);
-			if (!empty($post->video_url)) {
-				$item['body'] .= "\n[video]" . $post->video_url . "[/video]\n";
-			} elseif (!empty($post->thumbnail_url)) {
-				$item['body'] .= "\n[url=" . $post->permalink_url . "][img]" . $post->thumbnail_url . "[/img][/url]\n";
-			} elseif (!empty($post->permalink_url)) {
-				$item['body'] .= "\n[url]" . $post->permalink_url . "[/url]\n";
-			} elseif (!empty($post->source_url) && !empty($post->source_title)) {
-				$item['body'] .= "\n[url=" . $post->source_url . "]" . $post->source_title . "[/url]\n";
-			} elseif (!empty($post->source_url)) {
-				$item['body'] .= "\n[url]" . $post->source_url . "[/url]\n";
-			}
-			break;
-
-		case 'audio':
-			$item['body'] = HTML::toBBCode($post->caption);
-			if (!empty($post->source_url) && !empty($post->source_title)) {
-				$item['body'] .= "\n[url=" . $post->source_url . "]" . $post->source_title . "[/url]\n";
-			} elseif (!empty($post->source_url)) {
-				$item['body'] .= "\n[url]" . $post->source_url . "[/url]\n";
-			}
-			break;
-
-		case 'photo':
-			$item['body'] = HTML::toBBCode($post->caption);
-			foreach ($post->photos as $photo) {
-				if (!empty($photo->original_size)) {
-					$item['body'] .= "\n[img]" . $photo->original_size->url . "[/img]";
-				} elseif (!empty($photo->alt_sizes)) {
-					$item['body'] .= "\n[img]" . $photo->alt_sizes[0]->url . "[/img]";
-				}
-			}
-			break;
-
-		case 'chat':
-			$item['title'] = $post->title;
-			$item['body']  = "\n[ul]";
-			foreach ($post->dialogue as $line) {
-				$item['body'] .= "\n[li]" . $line->label . " " . $line->phrase . "[/li]";
-			}
-			$item['body'] .= "[/ul]\n";
-			break;
-	}
-	return $item;
-}
-
-function tumblr_add_npf_data(string $html, string $plink): string
-{
-	$doc = new DOMDocument();
-
-	$doc->formatOutput = true;
-	@$doc->loadHTML(mb_convert_encoding($html, 'HTML-ENTITIES', 'UTF-8'));
-	$xpath = new DomXPath($doc);
-	$list = $xpath->query('//p[@class="npf_link"]');
-	foreach ($list as $node) {
-		$data = tumblr_get_npf_data($node);
-		if (empty($data)) {
-			continue;
-		}
-
-		tumblr_replace_with_npf($doc, $node, tumblr_get_type_replacement($data, $plink));
-	}
-
-	$list = $xpath->query('//div[@data-npf]');
-	foreach ($list as $node) {
-		$data = tumblr_get_npf_data($node);
-		if (empty($data)) {
-			continue;
-		}
-
-		tumblr_replace_with_npf($doc, $node, tumblr_get_type_replacement($data, $plink));
-	}
-
-	$list = $xpath->query('//figure[@data-provider="youtube"]');
-	foreach ($list as $node) {
-		$attributes = tumblr_get_attributes($node);
-		if (empty($attributes['data-url'])) {
-			continue;
-		}
-		tumblr_replace_with_npf($doc, $node, '[youtube]' . $attributes['data-url'] . '[/youtube]');
-	}
-
-	$list = $xpath->query('//figure[@data-npf]');
-	foreach ($list as $node) {
-		$data = tumblr_get_npf_data($node);
-		if (empty($data)) {
-			continue;
-		}
-		tumblr_replace_with_npf($doc, $node, tumblr_get_type_replacement($data, $plink));
-	}
-
-	return $doc->saveHTML();
-}
-
-function tumblr_replace_with_npf(DOMDocument $doc, DOMNode $node, string $replacement)
-{
-	if (empty($replacement)) {
-		return;
-	}
-	$replace = $doc->createTextNode($replacement);
-	$node->parentNode->insertBefore($replace, $node);
-	$node->parentNode->removeChild($node);
-}
-
-function tumblr_get_npf_data(DOMNode $node): array
-{
-	$attributes = tumblr_get_attributes($node);
-	if (empty($attributes['data-npf'])) {
-		return [];
-	}
-
-	return json_decode($attributes['data-npf'], true);
-}
-
-function tumblr_get_attributes($node): array
-{
-	if (empty($node->attributes)) {
-		return [];
-	}
-
-	$attributes = [];
-	foreach ($node->attributes as $key => $attribute) {
-		$attributes[$key] = trim($attribute->value);
-	}
-	return $attributes;
-}
-
-function tumblr_get_type_replacement(array $data, string $plink): string
-{
-	switch ($data['type']) {
-		case 'poll':
-			$body = '[p][url=' . $plink . ']' . $data['question'] . '[/url][/p][ul]';
-			foreach ($data['answers'] as $answer) {
-				$body .= '[li]' . $answer['answer_text'] . '[/li]';
-			}
-			$body .= '[/ul]';
-			break;
-
-		case 'link':
-			$body = PageInfo::getFooterFromUrl(str_replace('https://href.li/?', '', $data['url']));
-			break;
-
-		case 'video':
-			if (!empty($data['url']) && ($data['provider'] == 'tumblr')) {
-				$body = '[video]' . $data['url'] . '[/video]';
+				$params['source'] = $siteinfo["image"];
 				break;
-			}
 
-		default:
-			Logger::notice('Unknown type', ['type' => $data['type'], 'data' => $data, 'plink' => $plink]);
-			$body = '';
-	}
+			case "link":
+				$params['type']        = "link";
+				$params['title']       = $title;
+				$params['url']         = $siteinfo["url"];
+				$params['description'] = BBCode::convert($body, false, 4);
+				break;
 
-	return $body;
-}
+			case "audio":
+				$params['type']         = "audio";
+				$params['external_url'] = $siteinfo["url"];
+				$params['caption']      = BBCode::convert($body, false, 4);
+				break;
 
-/**
- * Get a contact array for the given blog
- *
- * @param stdClass $blog
- * @param integer $uid
- * @return array
- */
-function tumblr_get_contact(stdClass $blog, int $uid): array
-{
-	$condition = ['network' => Protocol::TUMBLR, 'uid' => 0, 'poll' => 'tumblr::' . $blog->uuid];
-	$contact = Contact::selectFirst(['id', 'updated'], $condition);
+			case "video":
+				$params['type']    = "video";
+				$params['embed']   = $siteinfo["url"];
+				$params['caption'] = BBCode::convert($body, false, 4);
+				break;
 
-	$update = empty($contact) || $contact['updated'] < DateTimeFormat::utc('now -24 hours');
-
-	$public_fields = $fields = tumblr_get_contact_fields($blog, $uid, $update);
-
-	$avatar = $fields['avatar'] ?? '';
-	unset($fields['avatar']);
-	unset($public_fields['avatar']);
-
-	$public_fields['uid'] = 0;
-	$public_fields['rel'] = Contact::NOTHING;
-
-	if (empty($contact)) {
-		$cid = Contact::insert($public_fields);
-	} else {
-		$cid = $contact['id'];
-		Contact::update($public_fields, ['id' => $cid], true);
-	}
-
-	if ($uid != 0) {
-		$condition = ['network' => Protocol::TUMBLR, 'uid' => $uid, 'poll' => 'tumblr::' . $blog->uuid];
-
-		$contact = Contact::selectFirst(['id', 'rel', 'uid'], $condition);
-		if (!isset($fields['rel']) && isset($contact['rel'])) {
-			$fields['rel'] = $contact['rel'];
-		} elseif (!isset($fields['rel'])) {
-			$fields['rel'] = Contact::NOTHING;
+			default:
+				$params['type']  = "text";
+				$params['title'] = $title;
+				$params['body']  = BBCode::convert($b['body'], false, 4);
+				break;
 		}
-	}
 
-	if (($uid != 0) && ($fields['rel'] != Contact::NOTHING)) {
-		if (empty($contact)) {
-			$cid = Contact::insert($fields);
+		if (isset($params['caption']) && (trim($title) != "")) {
+			$params['caption'] = '<h1>'.$title."</h1>".
+						"<p>".$params['caption']."</p>";
+		}
+
+		if (empty($params['caption']) && !empty($siteinfo["description"])) {
+			$params['caption'] = BBCode::convert("[quote]" . $siteinfo["description"] . "[/quote]", false, 4);
+		}
+
+		$consumer_key = Config::get('tumblr','consumer_key');
+		$consumer_secret = Config::get('tumblr','consumer_secret');
+
+		$tum_oauth = new TumblrOAuth($consumer_key, $consumer_secret, $oauth_token, $oauth_token_secret);
+
+		// Make an API call with the TumblrOAuth instance.
+		$x = $tum_oauth->post($tmbl_blog,$params);
+		$ret_code = $tum_oauth->http_code;
+
+		//print_r($params);
+		if ($ret_code == 201) {
+			Logger::log('tumblr_send: success');
+		} elseif ($ret_code == 403) {
+			Logger::log('tumblr_send: authentication failure');
 		} else {
-			$cid = $contact['id'];
-			Contact::update($fields, ['id' => $cid], true);
+			Logger::log('tumblr_send: general error: ' . print_r($x,true));
 		}
-		Logger::debug('Get user contact', ['id' => $cid, 'uid' => $uid, 'update' => $update]);
-	} else {
-		Logger::debug('Get public contact', ['id' => $cid, 'uid' => $uid, 'update' => $update]);
-	}
-
-	if (!empty($avatar)) {
-		Contact::updateAvatar($cid, $avatar);
-	}
-
-	return Contact::getById($cid);
-}
-
-function tumblr_get_contact_fields(stdClass $blog, int $uid, bool $update): array
-{
-	$baseurl = 'https://tumblr.com';
-	$url     = $baseurl . '/' . $blog->name;
-
-	$fields = [
-		'uid'      => $uid,
-		'network'  => Protocol::TUMBLR,
-		'poll'     => 'tumblr::' . $blog->uuid,
-		'baseurl'  => $baseurl,
-		'priority' => 1,
-		'writable' => true,
-		'blocked'  => false,
-		'readonly' => false,
-		'pending'  => false,
-		'url'      => $url,
-		'nurl'     => Strings::normaliseLink($url),
-		'alias'    => $blog->url,
-		'name'     => $blog->title ?: $blog->name,
-		'nick'     => $blog->name,
-		'addr'     => $blog->name . '@tumblr.com',
-		'about'    => HTML::toBBCode($blog->description),
-		'updated'  => date(DateTimeFormat::MYSQL, $blog->updated)
-	];
-
-	if (!$update) {
-		Logger::debug('Got contact fields', ['uid' => $uid, 'url' => $fields['url']]);
-		return $fields;
-	}
-
-	$info = tumblr_get($uid, 'blog/' . $blog->uuid . '/info');
-	if ($info->meta->status > 399) {
-		Logger::notice('Error fetching blog info', ['meta' => $info->meta, 'response' => $info->response, 'errors' => $info->errors]);
-		return $fields;
-	}
-
-	$avatar = $info->response->blog->avatar;
-	if (!empty($avatar)) {
-		$fields['avatar'] = $avatar[0]->url;
-	}
-
-	if ($info->response->blog->followed && $info->response->blog->subscribed) {
-		$fields['rel'] = Contact::FRIEND;
-	} elseif ($info->response->blog->followed && !$info->response->blog->subscribed) {
-		$fields['rel'] = Contact::SHARING;
-	} elseif (!$info->response->blog->followed && $info->response->blog->subscribed) {
-		$fields['rel'] = Contact::FOLLOWER;
-	} else {
-		$fields['rel'] = Contact::NOTHING;
-	}
-
-	$fields['header'] = $info->response->blog->theme->header_image_focused;
-
-	Logger::debug('Got updated contact fields', ['uid' => $uid, 'url' => $fields['url']]);
-	return $fields;
-}
-
-/**
- * Get the default page for posting. Detects the value if not provided or has got a bad value.
- *
- * @param integer $uid
- * @param array $blogs
- * @return string
- */
-function tumblr_get_page(int $uid, array $blogs = []): string
-{
-	$page = DI::pConfig()->get($uid, 'tumblr', 'page');
-
-	if (!empty($page) && (strpos($page, '/') === false)) {
-		return $page;
-	}
-
-	if (empty($blogs)) {
-		$blogs = tumblr_get_blogs($uid);
-	}
-
-	if (!empty($blogs)) {
-		$page = array_key_first($blogs);
-		DI::pConfig()->set($uid, 'tumblr', 'page', $page);
-		return $page;
-	}
-
-	return '';
-}
-
-/**
- * Get an array of blogs for the given user
- *
- * @param integer $uid
- * @return array
- */
-function tumblr_get_blogs(int $uid): array
-{
-	$userinfo = tumblr_get($uid, 'user/info');
-	if ($userinfo->meta->status > 399) {
-		Logger::notice('Error fetching blogs', ['meta' => $userinfo->meta, 'response' => $userinfo->response, 'errors' => $userinfo->errors]);
-		return [];
-	}
-
-	$blogs = [];
-	foreach ($userinfo->response->user->blogs as $blog) {
-		$blogs[$blog->uuid] = $blog->name;
-	}
-	return $blogs;
-}
-
-function tumblr_enabled_for_user(int $uid)
-{
-	return !empty($uid) && !empty(DI::pConfig()->get($uid, 'tumblr', 'access_token')) &&
-		!empty(DI::pConfig()->get($uid, 'tumblr', 'refresh_token')) &&
-		!empty(DI::config()->get('tumblr', 'consumer_key')) &&
-		!empty(DI::config()->get('tumblr', 'consumer_secret'));
-}
-
-/**
- * Get a contact array from a Tumblr url
- *
- * @param string $url
- * @param int    $uid
- * @return array|null
- * @throws \Friendica\Network\HTTPException\InternalServerErrorException
- */
-function tumblr_get_contact_by_url(string $url, int $uid): ?array
-{
-	if (!preg_match('#^https?://tumblr.com/(.+)#', $url, $matches) && !preg_match('#^https?://www\.tumblr.com/(.+)#', $url, $matches) && !preg_match('#^https?://(.+)\.tumblr.com#', $url, $matches)) {
-		try {
-			$curlResult = DI::httpClient()->get($url);
-		} catch (\Exception $e) {
-			return null;
-		}
-		$html = $curlResult->getBodyString();
-		if (empty($html)) {
-			return null;
-		}
-		$doc = new DOMDocument();
-		@$doc->loadHTML($html);
-		$xpath = new DomXPath($doc);
-		$body = $xpath->query('body');
-		$attributes = tumblr_get_attributes($body->item(0));
-		$blog = $attributes['data-urlencoded-name'] ?? '';
-	} else {
-		$blogs = explode('/', $matches[1]);
-		$blog = $blogs[0] ?? '';
-	}
-
-	if (empty($blog)) {
-		return null;
-	}
-
-	Logger::debug('Update Tumblr blog data', ['url' => $url, 'blog' => $blog, 'uid' => $uid]);
-
-	$info = tumblr_get($uid, 'blog/' . $blog . '/info');
-	if ($info->meta->status > 399) {
-		Logger::notice('Error fetching blog info', ['meta' => $info->meta, 'response' => $info->response, 'errors' => $info->errors, 'blog' => $blog, 'uid' => $uid]);
-		return null;
-	} else {
-		Logger::debug('Got data', ['blog' => $blog, 'meta' => $info->meta]);
-	}
-
-	$baseurl = 'https://tumblr.com';
-	$url     = $baseurl . '/' . $info->response->blog->name;
-
-	return [
-		'url'      => $url,
-		'nurl'     => Strings::normaliseLink($url),
-		'addr'     => $info->response->blog->name . '@tumblr.com',
-		'alias'    => $info->response->blog->url,
-		'batch'    => '',
-		'notify'   => '',
-		'poll'     => 'tumblr::' . $info->response->blog->uuid,
-		'poco'     => '',
-		'name'     => $info->response->blog->title ?: $info->response->blog->name,
-		'nick'     => $info->response->blog->name,
-		'network'  => Protocol::TUMBLR,
-		'baseurl'  => $baseurl,
-		'pubkey'   => '',
-		'priority' => 0,
-		'guid'     => $info->response->blog->uuid,
-		'about'    => HTML::toBBCode($info->response->blog->description),
-		'photo'    => $info->response->blog->avatar[0]->url,
-		'header'   => $info->response->blog->theme->header_image_focused,
-	];
-}
-
-/**
- * Perform an OAuth2 GET request
- *
- * @param integer $uid
- * @param string $url
- * @param array $parameters
- * @return stdClass
- */
-function tumblr_get(int $uid, string $url, array $parameters = []): stdClass
-{
-	$url = 'https://api.tumblr.com/v2/' . $url;
-
-	if ($uid == 0) {
-		$consumer_key = DI::config()->get('tumblr', 'consumer_key');
-		$parameters['api_key'] = $consumer_key;
-	}
-
-	if (!empty($parameters)) {
-		$url .= '?' . http_build_query($parameters);
-	}
-
-	if ($uid > 0) {
-		$curlResult = DI::httpClient()->get($url, HttpClientAccept::JSON, [HttpClientOptions::HEADERS => ['Authorization' => ['Bearer ' . tumblr_get_token($uid)]]]);
-	} else {
-		$curlResult = DI::httpClient()->get($url, HttpClientAccept::JSON);
-	}
-	return tumblr_format_result($curlResult);
-}
-
-/**
- * Perform an OAuth2 POST request
- *
- * @param integer $uid
- * @param string $url
- * @param array $parameters
- * @return stdClass
- */
-function tumblr_post(int $uid, string $url, array $parameters): stdClass
-{
-	$url = 'https://api.tumblr.com/v2/' . $url;
-
-	$curlResult = DI::httpClient()->post($url, $parameters, ['Authorization' => ['Bearer ' . tumblr_get_token($uid)]]);
-	return tumblr_format_result($curlResult);
-}
-
-/**
- * Perform an OAuth2 DELETE request
- *
- * @param integer $uid
- * @param string $url
- * @param array $parameters
- * @return stdClass
- */
-function tumblr_delete(int $uid, string $url, array $parameters): stdClass
-{
-	$url = 'https://api.tumblr.com/v2/' . $url;
-
-	$opts = [
-		HttpClientOptions::HEADERS     => ['Authorization' => ['Bearer ' . tumblr_get_token($uid)]],
-		HttpClientOptions::FORM_PARAMS => $parameters
-	];
-
-	$curlResult = DI::httpClient()->request('delete', $url, $opts);
-	return tumblr_format_result($curlResult);
-}
-
-/**
- * Format the get/post result value
- *
- * @param ICanHandleHttpResponses $curlResult
- * @return stdClass
- */
-function tumblr_format_result(ICanHandleHttpResponses $curlResult): stdClass
-{
-	$result = json_decode($curlResult->getBodyString());
-	if (empty($result) || empty($result->meta)) {
-		$result               = new stdClass;
-		$result->meta         = new stdClass;
-		$result->meta->status = 500;
-		$result->meta->msg    = '';
-		$result->response     = [];
-		$result->errors       = [];
-	}
-	return $result;
-}
-
-/**
- * Fetch the OAuth token, update it if needed
- *
- * @param integer $uid
- * @param string $code
- * @return string
- */
-function tumblr_get_token(int $uid, string $code = ''): string
-{
-	$access_token  = DI::pConfig()->get($uid, 'tumblr', 'access_token');
-	$expires_at    = DI::pConfig()->get($uid, 'tumblr', 'expires_at');
-	$refresh_token = DI::pConfig()->get($uid, 'tumblr', 'refresh_token');
-
-	if (empty($code) && !empty($access_token) && ($expires_at > (time()))) {
-		Logger::debug('Got token', ['uid' => $uid, 'expires_at' => date('c', $expires_at)]);
-		return $access_token;
-	}
-
-	$consumer_key    = DI::config()->get('tumblr', 'consumer_key');
-	$consumer_secret = DI::config()->get('tumblr', 'consumer_secret');
-
-	$parameters = ['client_id' => $consumer_key, 'client_secret' => $consumer_secret];
-
-	if (empty($refresh_token) && empty($code)) {
-		$result = tumblr_exchange_token($uid);
-		if (empty($result->refresh_token)) {
-			Logger::info('Invalid result while exchanging token', ['uid' => $uid]);
-			return '';
-		}
-		$expires_at = time() + $result->expires_in;
-		Logger::debug('Updated token from OAuth1 to OAuth2', ['uid' => $uid, 'expires_at' => date('c', $expires_at)]);
-	} else {
-		if (!empty($code)) {
-			$parameters['code']       = $code;
-			$parameters['grant_type'] = 'authorization_code';
-		} else {
-			$parameters['refresh_token'] = $refresh_token;
-			$parameters['grant_type']    = 'refresh_token';
-		}
-
-		$curlResult = DI::httpClient()->post('https://api.tumblr.com/v2/oauth2/token', $parameters);
-		if (!$curlResult->isSuccess()) {
-			Logger::info('Error fetching token', ['uid' => $uid, 'code' => $code, 'result' => $curlResult->getBodyString(), 'parameters' => $parameters]);
-			return '';
-		}
-
-		$result = json_decode($curlResult->getBodyString());
-		if (empty($result)) {
-			Logger::info('Invalid result when updating token', ['uid' => $uid]);
-			return '';
-		}
-
-		$expires_at = time() + $result->expires_in;
-		Logger::debug('Renewed token', ['uid' => $uid, 'expires_at' => date('c', $expires_at)]);
-	}
-
-	DI::pConfig()->set($uid, 'tumblr', 'access_token', $result->access_token);
-	DI::pConfig()->set($uid, 'tumblr', 'expires_at', $expires_at);
-	DI::pConfig()->set($uid, 'tumblr', 'refresh_token', $result->refresh_token);
-
-	return $result->access_token;
-}
-
-/**
- * Create an OAuth2 token out of an OAuth1 token
- *
- * @param int $uid
- * @return stdClass
- */
-function tumblr_exchange_token(int $uid): stdClass
-{
-	$oauth_token        = DI::pConfig()->get($uid, 'tumblr', 'oauth_token');
-	$oauth_token_secret = DI::pConfig()->get($uid, 'tumblr', 'oauth_token_secret');
-
-	$consumer_key    = DI::config()->get('tumblr', 'consumer_key');
-	$consumer_secret = DI::config()->get('tumblr', 'consumer_secret');
-
-	$stack = HandlerStack::create();
-
-	$middleware = new Oauth1([
-		'consumer_key'    => $consumer_key,
-		'consumer_secret' => $consumer_secret,
-		'token'           => $oauth_token,
-		'token_secret'    => $oauth_token_secret
-	]);
-
-	$stack->push($middleware);
-
-	try {
-		$client = new Client([
-			'base_uri' => 'https://api.tumblr.com/v2/',
-			'handler' => $stack
-		]);
-
-		$response = $client->post('oauth2/exchange', ['auth' => 'oauth']);
-		return json_decode($response->getBody()->getContents());
-	} catch (RequestException $exception) {
-		Logger::notice('Exchange failed', ['code' => $exception->getCode(), 'message' => $exception->getMessage()]);
-		return new stdClass;
 	}
 }
+
diff --git a/twitter/README.md b/twitter/README.md
index 038bf1ca..f1f87541 100644
--- a/twitter/README.md
+++ b/twitter/README.md
@@ -3,14 +3,41 @@ Twitter Addon
 
 Main authors Tobias Diekershoff, Michael Vogel and Hypolite Petovan.
 
-This is a uni-directional posting connector addon that allows each user to crosspost their Friendica public posts to Twitter.
+This bi-directional connector addon allows each user to crosspost their Friendica public posts to Twitter, import their Twitter timeline, interact with tweets from Friendica, and crosspost to Friendica their public tweets.
 
 ## Installation
 
-To use this addon each single user has to register their own [application](https://developer.twitter.com/en/portal/projects-and-apps), no setup is needed by the administration.
+To use this addon you have to register an [application](https://apps.twitter.com/) for your Friendica instance on Twitter.
+Register your Friendica site as "Client" application with "Read & Write" access we do not need "Twitter as login".
+Please leave the field "Callback URL" empty.
+When you've registered the app you get the OAuth Consumer key and secret pair for your application/site.
+
+After the registration please enter the values for "Consumer Key" and "Consumer Secret" in the [administration](admin/addons/twitter).
+
+## Alternative configuration
+
+Open the `config/local.config.php` file and add "twitter" to the list of activated addons:
+
+    'system' => [
+        ...
+        'addon' => '...,twitter'
+        ...
+    ]
+
+Add your key pair to your global `config/addon.config.php`.
+
+	'twitter' => [
+		'consumerkey' => 'your consumer_key here',
+		'consumersecret' => 'your consumer_secret here',
+	],
+
+After this, users can configure their Twitter account settings from "Settings -> Addon Settings".
 
 ## License
 
-The _Twitter Connector_ is licensed under the [3-clause BSD license][1] see the LICENSE file in the addons directory.
+The _Twitter Connector_ is licensed under the [3-clause BSD license][2] see the LICENSE file in the addons directory.
+
+The _Twitter Connector_ uses the [Twitter OAuth library][2] by Abraham Williams, MIT licensed
 
 [1]: http://opensource.org/licenses/BSD-3-Clause
+[2]: https://github.com/abraham/twitteroauth
diff --git a/twitter/composer.json b/twitter/composer.json
new file mode 100644
index 00000000..22e70b17
--- /dev/null
+++ b/twitter/composer.json
@@ -0,0 +1,32 @@
+{
+    "name": "friendica-addons/twitter",
+    "description": "Twitter Connector addon for Friendica",
+    "type": "friendica-addon",
+	"authors": [
+        {
+            "name": "Tobias Diekershoff",
+            "homepage": "https://f.diekershoff.de/profile/tobias",
+            "role": "Developer"
+        },
+        {
+            "name": "Michael Vogel",
+            "homepage": "https://pirati.ca/profile/heluecht",
+            "role": "Developer"
+        },
+        {
+            "name": "Hypolite Petovan",
+            "email": "hypolite@mrpetovan.com",
+            "homepage": "https://friendica.mrpetovan.com/profile/hypolite",
+            "role": "Developer"
+        }
+    ],
+    "require": {
+        "abraham/twitteroauth": "^0.7.4",
+        "jublonet/codebird-php": "dev-master"
+    },
+    "license": "3-clause BSD license",
+    "minimum-stability": "stable",
+	"config": {
+		"autoloader-suffix": "TwitterAddon"
+	}
+}
diff --git a/twitter/composer.lock b/twitter/composer.lock
new file mode 100644
index 00000000..09aff6f4
--- /dev/null
+++ b/twitter/composer.lock
@@ -0,0 +1,253 @@
+{
+    "_readme": [
+        "This file locks the dependencies of your project to a known state",
+        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
+        "This file is @generated automatically"
+    ],
+    "content-hash": "eaeac282537509fd7d0bc4f92f01bc04",
+    "packages": [
+        {
+            "name": "abraham/twitteroauth",
+            "version": "0.7.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/abraham/twitteroauth.git",
+                "reference": "c6f9e692552dd037b2324ed0dfa28a4e60875acf"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/abraham/twitteroauth/zipball/c6f9e692552dd037b2324ed0dfa28a4e60875acf",
+                "reference": "c6f9e692552dd037b2324ed0dfa28a4e60875acf",
+                "shasum": ""
+            },
+            "require": {
+                "ext-curl": "*",
+                "php": "^5.6 || ^7.0"
+            },
+            "require-dev": {
+                "phpmd/phpmd": "~2.6",
+                "phpunit/phpunit": "~5.7",
+                "squizlabs/php_codesniffer": "~3.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Abraham\\TwitterOAuth\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Abraham Williams",
+                    "email": "abraham@abrah.am",
+                    "homepage": "https://abrah.am",
+                    "role": "Developer"
+                }
+            ],
+            "description": "The most popular PHP library for use with the Twitter OAuth REST API.",
+            "homepage": "https://twitteroauth.com",
+            "keywords": [
+                "Twitter API",
+                "Twitter oAuth",
+                "api",
+                "oauth",
+                "rest",
+                "social",
+                "twitter"
+            ],
+            "time": "2017-06-30T22:02:01+00:00"
+        },
+        {
+            "name": "composer/installers",
+            "version": "v1.6.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/composer/installers.git",
+                "reference": "cfcca6b1b60bc4974324efb5783c13dca6932b5b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/composer/installers/zipball/cfcca6b1b60bc4974324efb5783c13dca6932b5b",
+                "reference": "cfcca6b1b60bc4974324efb5783c13dca6932b5b",
+                "shasum": ""
+            },
+            "require": {
+                "composer-plugin-api": "^1.0"
+            },
+            "replace": {
+                "roundcube/plugin-installer": "*",
+                "shama/baton": "*"
+            },
+            "require-dev": {
+                "composer/composer": "1.0.*@dev",
+                "phpunit/phpunit": "^4.8.36"
+            },
+            "type": "composer-plugin",
+            "extra": {
+                "class": "Composer\\Installers\\Plugin",
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Composer\\Installers\\": "src/Composer/Installers"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Kyle Robinson Young",
+                    "email": "kyle@dontkry.com",
+                    "homepage": "https://github.com/shama"
+                }
+            ],
+            "description": "A multi-framework Composer library installer",
+            "homepage": "https://composer.github.io/installers/",
+            "keywords": [
+                "Craft",
+                "Dolibarr",
+                "Eliasis",
+                "Hurad",
+                "ImageCMS",
+                "Kanboard",
+                "Lan Management System",
+                "MODX Evo",
+                "Mautic",
+                "Maya",
+                "OXID",
+                "Plentymarkets",
+                "Porto",
+                "RadPHP",
+                "SMF",
+                "Thelia",
+                "WolfCMS",
+                "agl",
+                "aimeos",
+                "annotatecms",
+                "attogram",
+                "bitrix",
+                "cakephp",
+                "chef",
+                "cockpit",
+                "codeigniter",
+                "concrete5",
+                "croogo",
+                "dokuwiki",
+                "drupal",
+                "eZ Platform",
+                "elgg",
+                "expressionengine",
+                "fuelphp",
+                "grav",
+                "installer",
+                "itop",
+                "joomla",
+                "kohana",
+                "laravel",
+                "lavalite",
+                "lithium",
+                "magento",
+                "majima",
+                "mako",
+                "mediawiki",
+                "modulework",
+                "modx",
+                "moodle",
+                "osclass",
+                "phpbb",
+                "piwik",
+                "ppi",
+                "puppet",
+                "pxcms",
+                "reindex",
+                "roundcube",
+                "shopware",
+                "silverstripe",
+                "sydes",
+                "symfony",
+                "typo3",
+                "wordpress",
+                "yawik",
+                "zend",
+                "zikula"
+            ],
+            "time": "2018-08-27T06:10:37+00:00"
+        },
+        {
+            "name": "jublonet/codebird-php",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/jublonet/codebird-php.git",
+                "reference": "df362d8ad629aad6c4c7dbf36a440e569ec41368"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/jublonet/codebird-php/zipball/df362d8ad629aad6c4c7dbf36a440e569ec41368",
+                "reference": "df362d8ad629aad6c4c7dbf36a440e569ec41368",
+                "shasum": ""
+            },
+            "require": {
+                "composer/installers": "~1.0",
+                "ext-hash": "*",
+                "ext-json": "*",
+                "lib-openssl": "*",
+                "php": ">=5.5.0"
+            },
+            "require-dev": {
+                "php-coveralls/php-coveralls": ">=0.6",
+                "phpunit/phpunit": ">=7.3",
+                "squizlabs/php_codesniffer": "2.*"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "GPL-3.0+"
+            ],
+            "authors": [
+                {
+                    "name": "Joshua Atkins",
+                    "role": "Developer",
+                    "email": "joshua.atkins@jublo.net",
+                    "homepage": "http://atkins.im/"
+                },
+                {
+                    "name": "J.M.",
+                    "role": "Developer",
+                    "email": "jm@jublo.net",
+                    "homepage": "http://mynetx.net/"
+                }
+            ],
+            "description": "Easy access to the Twitter REST API, Direct Messages API, Account Activity API, TON (Object Nest) API and Twitter Ads API — all from one PHP library.",
+            "homepage": "https://www.jublo.net/projects/codebird/php",
+            "keywords": [
+                "api",
+                "networking",
+                "twitter"
+            ],
+            "time": "2018-08-16T00:07:08+00:00"
+        }
+    ],
+    "packages-dev": [],
+    "aliases": [],
+    "minimum-stability": "stable",
+    "stability-flags": {
+        "jublonet/codebird-php": 20
+    },
+    "prefer-stable": false,
+    "prefer-lowest": false,
+    "platform": [],
+    "platform-dev": []
+}
diff --git a/twitter/config/twitter.config.php b/twitter/config/twitter.config.php
new file mode 100644
index 00000000..e39de2f9
--- /dev/null
+++ b/twitter/config/twitter.config.php
@@ -0,0 +1,16 @@
+<?php
+
+// Warning: Don't change this file! It only holds the default config values for this addon.
+// Instead overwrite these config values in config/addon.config.php in your Friendica directory
+
+return [
+	'twitter' => [
+		// consumerkey (String)
+		// OAuth Consumer Key provided by Twitter on registering an app at https://twitter.com/apps
+		'consumerkey' => '',
+
+		// consumersecret (String)
+		// OAuth Consumer Secret provided by Twitter on registering an app at https://twitter.com/apps
+		'consumersecret' => '',
+	],
+];
diff --git a/twitter/lang/C/messages.po b/twitter/lang/C/messages.po
index 366d6c8f..d76bb2b8 100644
--- a/twitter/lang/C/messages.po
+++ b/twitter/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-08-16 03:27+0000\n"
+"POT-Creation-Date: 2018-06-02 10:25+0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,62 +17,116 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: twitter.php:84
+#: twitter.php:195
 msgid "Post to Twitter"
 msgstr ""
 
-#: twitter.php:123
-msgid "No status."
+#: twitter.php:236
+msgid ""
+"You submitted an empty PIN, please Sign In with Twitter again to get a new "
+"one."
 msgstr ""
 
-#: twitter.php:129
+#: twitter.php:263
+msgid "Twitter settings updated."
+msgstr ""
+
+#: twitter.php:293 twitter.php:297
+msgid "Twitter Import/Export/Mirror"
+msgstr ""
+
+#: twitter.php:304
+msgid ""
+"No consumer key pair for Twitter found. Please contact your site "
+"administrator."
+msgstr ""
+
+#: twitter.php:316
+msgid ""
+"At this Friendica instance the Twitter addon was enabled but you have not "
+"yet connected your account to your Twitter account. To do so click the "
+"button below to get a PIN from Twitter which you have to copy into the input "
+"box below and submit the form. Only your <strong>public</strong> posts will "
+"be posted to Twitter."
+msgstr ""
+
+#: twitter.php:317
+msgid "Log in with Twitter"
+msgstr ""
+
+#: twitter.php:319
+msgid "Copy the PIN from Twitter here"
+msgstr ""
+
+#: twitter.php:324 twitter.php:366 twitter.php:636
+msgid "Save Settings"
+msgstr ""
+
+#: twitter.php:336
+msgid "Currently connected to: "
+msgstr ""
+
+#: twitter.php:337
+msgid "Disconnect"
+msgstr ""
+
+#: twitter.php:347
 msgid "Allow posting to Twitter"
 msgstr ""
 
-#: twitter.php:129
+#: twitter.php:347
 msgid ""
 "If enabled all your <strong>public</strong> postings can be posted to the "
 "associated Twitter account. You can choose to do so by default (here) or for "
 "every posting separately in the posting options when writing the entry."
 msgstr ""
 
-#: twitter.php:130
+#: twitter.php:350
+msgid ""
+"<strong>Note</strong>: Due to your privacy settings (<em>Hide your profile "
+"details from unknown viewers?</em>) the link potentially included in public "
+"postings relayed to Twitter will lead the visitor to a blank page informing "
+"the visitor that the access to your profile has been restricted."
+msgstr ""
+
+#: twitter.php:353
 msgid "Send public postings to Twitter by default"
 msgstr ""
 
-#: twitter.php:131
-msgid "API Key"
+#: twitter.php:356
+msgid "Mirror all posts from twitter that are no replies"
 msgstr ""
 
-#: twitter.php:132
-msgid "API Secret"
+#: twitter.php:359
+msgid "Import the remote timeline"
 msgstr ""
 
-#: twitter.php:133
-msgid "Access Token"
+#: twitter.php:362
+msgid "Automatically create contacts"
 msgstr ""
 
-#: twitter.php:134
-msgid "Access Secret"
-msgstr ""
-
-#: twitter.php:135
+#: twitter.php:362
 msgid ""
-"Each user needs to register their own app to be able to post to Twitter. "
-"Please visit https://developer.twitter.com/en/portal/projects-and-apps to "
-"register a project. Inside the project you then have to register an app. You "
-"will find the needed data for the connector on the page \"Keys and token\" "
-"in the app settings."
+"This will automatically create a contact in Friendica as soon as you receive "
+"a message from an existing contact via the Twitter network. If you do not "
+"enable this, you need to manually add those Twitter contacts in Friendica "
+"from whom you would like to see posts here. However if enabled, you cannot "
+"merely remove a twitter contact from the Friendica contact list, as it will "
+"recreate this contact when they post again."
 msgstr ""
 
-#: twitter.php:136
-msgid "Last Status Summary"
+#: twitter.php:614
+msgid "Twitter post failed. Queued for retry."
 msgstr ""
 
-#: twitter.php:137
-msgid "Last Status Content"
+#: twitter.php:628
+msgid "Settings updated."
 msgstr ""
 
-#: twitter.php:142
-msgid "Twitter Export"
+#: twitter.php:638
+msgid "Consumer key"
+msgstr ""
+
+#: twitter.php:639
+msgid "Consumer secret"
 msgstr ""
diff --git a/twitter/lang/ar/messages.po b/twitter/lang/ar/messages.po
deleted file mode 100644
index e12139c6..00000000
--- a/twitter/lang/ar/messages.po
+++ /dev/null
@@ -1,80 +0,0 @@
-# ADDON twitter
-# Copyright (C)
-# This file is distributed under the same license as the Friendica twitter addon package.
-# 
-# 
-# Translators:
-# Farida Khalaf <faridakhalaf@hotmail.com>, 2021
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-08-16 03:27+0000\n"
-"PO-Revision-Date: 2014-06-23 12:58+0000\n"
-"Last-Translator: Farida Khalaf <faridakhalaf@hotmail.com>, 2021\n"
-"Language-Team: Arabic (http://app.transifex.com/Friendica/friendica/language/ar/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ar\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-
-#: twitter.php:84
-msgid "Post to Twitter"
-msgstr ""
-
-#: twitter.php:123
-msgid "No status."
-msgstr ""
-
-#: twitter.php:129
-msgid "Allow posting to Twitter"
-msgstr ""
-
-#: twitter.php:129
-msgid ""
-"If enabled all your <strong>public</strong> postings can be posted to the "
-"associated Twitter account. You can choose to do so by default (here) or for"
-" every posting separately in the posting options when writing the entry."
-msgstr ""
-
-#: twitter.php:130
-msgid "Send public postings to Twitter by default"
-msgstr ""
-
-#: twitter.php:131
-msgid "API Key"
-msgstr ""
-
-#: twitter.php:132
-msgid "API Secret"
-msgstr ""
-
-#: twitter.php:133
-msgid "Access Token"
-msgstr ""
-
-#: twitter.php:134
-msgid "Access Secret"
-msgstr ""
-
-#: twitter.php:135
-msgid ""
-"Each user needs to register their own app to be able to post to Twitter. "
-"Please visit https://developer.twitter.com/en/portal/projects-and-apps to "
-"register a project. Inside the project you then have to register an app. You"
-" will find the needed data for the connector on the page \"Keys and token\" "
-"in the app settings."
-msgstr ""
-
-#: twitter.php:136
-msgid "Last Status Summary"
-msgstr ""
-
-#: twitter.php:137
-msgid "Last Status Content"
-msgstr ""
-
-#: twitter.php:142
-msgid "Twitter Export"
-msgstr ""
diff --git a/twitter/lang/ar/strings.php b/twitter/lang/ar/strings.php
deleted file mode 100644
index eea34dd6..00000000
--- a/twitter/lang/ar/strings.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_ar")) {
-function string_plural_select_ar($n){
-	$n = intval($n);
-	if ($n==0) { return 0; } else if ($n==1) { return 1; } else if ($n==2) { return 2; } else if ($n%100>=3 && $n%100<=10) { return 3; } else if ($n%100>=11 && $n%100<=99) { return 4; } else  { return 5; }
-}}
diff --git a/twitter/lang/cs/messages.po b/twitter/lang/cs/messages.po
index 3e9d27d5..68586a7e 100644
--- a/twitter/lang/cs/messages.po
+++ b/twitter/lang/cs/messages.po
@@ -11,72 +11,126 @@ msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-08-16 03:27+0000\n"
-"PO-Revision-Date: 2014-06-23 12:58+0000\n"
-"Last-Translator: Aditoo, 2018\n"
-"Language-Team: Czech (http://app.transifex.com/Friendica/friendica/language/cs/)\n"
+"POT-Creation-Date: 2018-06-02 10:25+0700\n"
+"PO-Revision-Date: 2018-06-14 10:10+0000\n"
+"Last-Translator: Aditoo\n"
+"Language-Team: Czech (http://www.transifex.com/Friendica/friendica/language/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: cs\n"
 "Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
 
-#: twitter.php:84
+#: twitter.php:195
 msgid "Post to Twitter"
 msgstr "Poslat příspěvek na Twitter"
 
-#: twitter.php:123
-msgid "No status."
-msgstr ""
+#: twitter.php:236
+msgid ""
+"You submitted an empty PIN, please Sign In with Twitter again to get a new "
+"one."
+msgstr "Vložil/a jste prázdný PIN kód, prosím přihlaste se opět na Twitter pro nový."
 
-#: twitter.php:129
+#: twitter.php:263
+msgid "Twitter settings updated."
+msgstr "Nastavení pro Twitter aktualizována."
+
+#: twitter.php:293 twitter.php:297
+msgid "Twitter Import/Export/Mirror"
+msgstr "Import/Export/Zrcadlení Twitteru"
+
+#: twitter.php:304
+msgid ""
+"No consumer key pair for Twitter found. Please contact your site "
+"administrator."
+msgstr "Nenalezen žádný spotřebitelský páru klíčů pro Twitter. Obraťte se na administrátora webu."
+
+#: twitter.php:316
+msgid ""
+"At this Friendica instance the Twitter addon was enabled but you have not "
+"yet connected your account to your Twitter account. To do so click the "
+"button below to get a PIN from Twitter which you have to copy into the input"
+" box below and submit the form. Only your <strong>public</strong> posts will"
+" be posted to Twitter."
+msgstr "Na této instanci Friendica byl doplněk pro Twitter povolen, ještě jste však nepřipojil/a Váš účet k Vašemu účtu na Twitteru. Pokud to chcete udělat, kliknutím na tlačítko níže získáte od Twitteru PIN kód, zkopírujte jej do pole níže a odešlete formulář. Pouze Vaše <strong>veřejné</strong> příspěvky budou odesílány na Twitter."
+
+#: twitter.php:317
+msgid "Log in with Twitter"
+msgstr "Přihlásit se přes Twitter"
+
+#: twitter.php:319
+msgid "Copy the PIN from Twitter here"
+msgstr "Zkopírujte sem PIN z Twitteru"
+
+#: twitter.php:324 twitter.php:366 twitter.php:636
+msgid "Save Settings"
+msgstr "Uložit nastavení"
+
+#: twitter.php:336
+msgid "Currently connected to: "
+msgstr "V současné době připojen k:"
+
+#: twitter.php:337
+msgid "Disconnect"
+msgstr "Odpojit"
+
+#: twitter.php:347
 msgid "Allow posting to Twitter"
 msgstr "Povolit odesílání na Twitter"
 
-#: twitter.php:129
+#: twitter.php:347
 msgid ""
 "If enabled all your <strong>public</strong> postings can be posted to the "
 "associated Twitter account. You can choose to do so by default (here) or for"
 " every posting separately in the posting options when writing the entry."
 msgstr "Je-li povoleno, všechny Vaše <strong>veřejné</strong> příspěvky mohou být zasílány na související účet na Twitteru. Můžete si vybrat, zda-li toto bude výchozí nastavení (zde), nebo budete mít možnost si vybrat požadované chování při psaní každého příspěvku."
 
-#: twitter.php:130
+#: twitter.php:350
+msgid ""
+"<strong>Note</strong>: Due to your privacy settings (<em>Hide your profile "
+"details from unknown viewers?</em>) the link potentially included in public "
+"postings relayed to Twitter will lead the visitor to a blank page informing "
+"the visitor that the access to your profile has been restricted."
+msgstr "<strong>Poznámka</strong>: Kvůli vašim nastavením o soukromí (<em>Skrýt Vaše profilové detaily před neznámými návštěvníky?</em>), odkaz potenciálně obsažen ve veřejných příspěvcích přeposílaných na Twitter zavedou návštěvníky na prázdnou stránku informující návštěvníky, že přístup na Váš profil byl zakázán."
+
+#: twitter.php:353
 msgid "Send public postings to Twitter by default"
 msgstr "Defaultně zasílat veřejné komentáře na Twitter"
 
-#: twitter.php:131
-msgid "API Key"
-msgstr ""
+#: twitter.php:356
+msgid "Mirror all posts from twitter that are no replies"
+msgstr "Zrcadlit všechny příspěvky z Twitteru, které nejsou odpovědi."
 
-#: twitter.php:132
-msgid "API Secret"
-msgstr ""
+#: twitter.php:359
+msgid "Import the remote timeline"
+msgstr "Importovat vzdálenou časovou osu"
 
-#: twitter.php:133
-msgid "Access Token"
-msgstr ""
+#: twitter.php:362
+msgid "Automatically create contacts"
+msgstr "Automaticky vytvořit kontakty"
 
-#: twitter.php:134
-msgid "Access Secret"
-msgstr ""
-
-#: twitter.php:135
+#: twitter.php:362
 msgid ""
-"Each user needs to register their own app to be able to post to Twitter. "
-"Please visit https://developer.twitter.com/en/portal/projects-and-apps to "
-"register a project. Inside the project you then have to register an app. You"
-" will find the needed data for the connector on the page \"Keys and token\" "
-"in the app settings."
-msgstr ""
+"This will automatically create a contact in Friendica as soon as you receive"
+" a message from an existing contact via the Twitter network. If you do not "
+"enable this, you need to manually add those Twitter contacts in Friendica "
+"from whom you would like to see posts here. However if enabled, you cannot "
+"merely remove a twitter contact from the Friendica contact list, as it will "
+"recreate this contact when they post again."
+msgstr "Tato možnost automaticky vytvoří kontakt na Friendica, jakmile obdržíte zprávu od existujícího kontaktu přes síť Twitter. Pokud toto nezapnete, budete si muset tyto kontakty na Twitteru, od kterých chcete dostávat příspěvky, přidávat do Friendica manuálně. Pokud toto ovšem zapnete, nemůžete jednoduše odstranit kontakt na Twitteru ze seznamu kontaktů na Friendica, neboť tato možnost jej při každém novém příspěvku opět vytvoří."
 
-#: twitter.php:136
-msgid "Last Status Summary"
-msgstr ""
+#: twitter.php:614
+msgid "Twitter post failed. Queued for retry."
+msgstr "Poslání příspěvku na Twitter selhalo. Příspěvek byl poslán do fronty pro zopakování."
 
-#: twitter.php:137
-msgid "Last Status Content"
-msgstr ""
+#: twitter.php:628
+msgid "Settings updated."
+msgstr "Nastavení aktualizováno."
 
-#: twitter.php:142
-msgid "Twitter Export"
-msgstr ""
+#: twitter.php:638
+msgid "Consumer key"
+msgstr "Consumer key"
+
+#: twitter.php:639
+msgid "Consumer secret"
+msgstr "Consumer secret"
diff --git a/twitter/lang/cs/strings.php b/twitter/lang/cs/strings.php
index da68673d..e6aeedfd 100644
--- a/twitter/lang/cs/strings.php
+++ b/twitter/lang/cs/strings.php
@@ -3,9 +3,29 @@
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
 	$n = intval($n);
-	if (($n == 1 && $n % 1 == 0)) { return 0; } else if (($n >= 2 && $n <= 4 && $n % 1 == 0)) { return 1; } else if (($n % 1 != 0 )) { return 2; } else  { return 3; }
+	return ($n == 1 && $n % 1 == 0) ? 0 : ($n >= 2 && $n <= 4 && $n % 1 == 0) ? 1: ($n % 1 != 0 ) ? 2 : 3;;
 }}
-$a->strings['Post to Twitter'] = 'Poslat příspěvek na Twitter';
-$a->strings['Allow posting to Twitter'] = 'Povolit odesílání na Twitter';
-$a->strings['If enabled all your <strong>public</strong> postings can be posted to the associated Twitter account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry.'] = 'Je-li povoleno, všechny Vaše <strong>veřejné</strong> příspěvky mohou být zasílány na související účet na Twitteru. Můžete si vybrat, zda-li toto bude výchozí nastavení (zde), nebo budete mít možnost si vybrat požadované chování při psaní každého příspěvku.';
-$a->strings['Send public postings to Twitter by default'] = 'Defaultně zasílat veřejné komentáře na Twitter';
+;
+$a->strings["Post to Twitter"] = "Poslat příspěvek na Twitter";
+$a->strings["You submitted an empty PIN, please Sign In with Twitter again to get a new one."] = "Vložil/a jste prázdný PIN kód, prosím přihlaste se opět na Twitter pro nový.";
+$a->strings["Twitter settings updated."] = "Nastavení pro Twitter aktualizována.";
+$a->strings["Twitter Import/Export/Mirror"] = "Import/Export/Zrcadlení Twitteru";
+$a->strings["No consumer key pair for Twitter found. Please contact your site administrator."] = "Nenalezen žádný spotřebitelský páru klíčů pro Twitter. Obraťte se na administrátora webu.";
+$a->strings["At this Friendica instance the Twitter addon was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to Twitter."] = "Na této instanci Friendica byl doplněk pro Twitter povolen, ještě jste však nepřipojil/a Váš účet k Vašemu účtu na Twitteru. Pokud to chcete udělat, kliknutím na tlačítko níže získáte od Twitteru PIN kód, zkopírujte jej do pole níže a odešlete formulář. Pouze Vaše <strong>veřejné</strong> příspěvky budou odesílány na Twitter.";
+$a->strings["Log in with Twitter"] = "Přihlásit se přes Twitter";
+$a->strings["Copy the PIN from Twitter here"] = "Zkopírujte sem PIN z Twitteru";
+$a->strings["Save Settings"] = "Uložit nastavení";
+$a->strings["Currently connected to: "] = "V současné době připojen k:";
+$a->strings["Disconnect"] = "Odpojit";
+$a->strings["Allow posting to Twitter"] = "Povolit odesílání na Twitter";
+$a->strings["If enabled all your <strong>public</strong> postings can be posted to the associated Twitter account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "Je-li povoleno, všechny Vaše <strong>veřejné</strong> příspěvky mohou být zasílány na související účet na Twitteru. Můžete si vybrat, zda-li toto bude výchozí nastavení (zde), nebo budete mít možnost si vybrat požadované chování při psaní každého příspěvku.";
+$a->strings["<strong>Note</strong>: Due to your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "<strong>Poznámka</strong>: Kvůli vašim nastavením o soukromí (<em>Skrýt Vaše profilové detaily před neznámými návštěvníky?</em>), odkaz potenciálně obsažen ve veřejných příspěvcích přeposílaných na Twitter zavedou návštěvníky na prázdnou stránku informující návštěvníky, že přístup na Váš profil byl zakázán.";
+$a->strings["Send public postings to Twitter by default"] = "Defaultně zasílat veřejné komentáře na Twitter";
+$a->strings["Mirror all posts from twitter that are no replies"] = "Zrcadlit všechny příspěvky z Twitteru, které nejsou odpovědi.";
+$a->strings["Import the remote timeline"] = "Importovat vzdálenou časovou osu";
+$a->strings["Automatically create contacts"] = "Automaticky vytvořit kontakty";
+$a->strings["This will automatically create a contact in Friendica as soon as you receive a message from an existing contact via the Twitter network. If you do not enable this, you need to manually add those Twitter contacts in Friendica from whom you would like to see posts here. However if enabled, you cannot merely remove a twitter contact from the Friendica contact list, as it will recreate this contact when they post again."] = "Tato možnost automaticky vytvoří kontakt na Friendica, jakmile obdržíte zprávu od existujícího kontaktu přes síť Twitter. Pokud toto nezapnete, budete si muset tyto kontakty na Twitteru, od kterých chcete dostávat příspěvky, přidávat do Friendica manuálně. Pokud toto ovšem zapnete, nemůžete jednoduše odstranit kontakt na Twitteru ze seznamu kontaktů na Friendica, neboť tato možnost jej při každém novém příspěvku opět vytvoří.";
+$a->strings["Twitter post failed. Queued for retry."] = "Poslání příspěvku na Twitter selhalo. Příspěvek byl poslán do fronty pro zopakování.";
+$a->strings["Settings updated."] = "Nastavení aktualizováno.";
+$a->strings["Consumer key"] = "Consumer key";
+$a->strings["Consumer secret"] = "Consumer secret";
diff --git a/twitter/lang/da-dk/messages.po b/twitter/lang/da-dk/messages.po
deleted file mode 100644
index 047242d6..00000000
--- a/twitter/lang/da-dk/messages.po
+++ /dev/null
@@ -1,146 +0,0 @@
-# ADDON twitter
-# Copyright (C)
-# This file is distributed under the same license as the Friendica twitter addon package.
-# 
-# 
-# Translators:
-# Anton <dev@atjn.dk>, 2022
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-27 10:25-0500\n"
-"PO-Revision-Date: 2014-06-23 12:58+0000\n"
-"Last-Translator: Anton <dev@atjn.dk>, 2022\n"
-"Language-Team: Danish (Denmark) (http://www.transifex.com/Friendica/friendica/language/da_DK/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: da_DK\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: twitter.php:213
-msgid "Post to Twitter"
-msgstr "Læg op på Twitter"
-
-#: twitter.php:258
-msgid ""
-"You submitted an empty PIN, please Sign In with Twitter again to get a new "
-"one."
-msgstr "Du indsendte en tom PIN, log venligst ind med Twitter igen og få en ny en."
-
-#: twitter.php:321
-msgid ""
-"No consumer key pair for Twitter found. Please contact your site "
-"administrator."
-msgstr "Intet \"consumer key pair\" fundet for Twitter. Kontakt venligst din sides administrator."
-
-#: twitter.php:334
-msgid ""
-"At this Friendica instance the Twitter addon was enabled but you have not "
-"yet connected your account to your Twitter account. To do so click the "
-"button below to get a PIN from Twitter which you have to copy into the input"
-" box below and submit the form. Only your <strong>public</strong> posts will"
-" be posted to Twitter."
-msgstr "På denne Friendica instans er Twitter-tilføjelsen slået til, men du har ikke forbundet din konto til din Twitter-konto endnu. For at gøre det, skal du klikke på knappen herunder for at få en PIN fra Twitter, som du så skal kopiere ind i input-boksen og indsende . Det er kun dine <strong>offentlige</strong> opslag som vil blive lagt op på Twitter."
-
-#: twitter.php:335
-msgid "Log in with Twitter"
-msgstr "Log ind med Twitter"
-
-#: twitter.php:337
-msgid "Copy the PIN from Twitter here"
-msgstr "Kopier din PIN fra Twitter ind her"
-
-#: twitter.php:345 twitter.php:388
-msgid "An error occured: "
-msgstr "Der opstod en fejl:"
-
-#: twitter.php:359
-#, php-format
-msgid ""
-"Currently connected to: <a href=\"https://twitter.com/%1$s\" "
-"target=\"_twitter\">%1$s</a>"
-msgstr "I øjeblikket forbundet til: <a href=\"https://twitter.com/%1$s\" target=\"_twitter\">%1$s</a>"
-
-#: twitter.php:365
-msgid ""
-"<strong>Note</strong>: Due to your privacy settings (<em>Hide your profile "
-"details from unknown viewers?</em>) the link potentially included in public "
-"postings relayed to Twitter will lead the visitor to a blank page informing "
-"the visitor that the access to your profile has been restricted."
-msgstr "<strong>Note</strong>: Grundet dine privatlivsindstillinger (<em>Skjul dine profildetaljer fra ukendte besøgende?</em>), vil linket, som potentielt kan være inkluderet i offentlige opslag på Twitter, lede tilbage til en blank side som informerer den besøgende om at adgang til din profil er begrænset."
-
-#: twitter.php:372
-msgid "Invalid Twitter info"
-msgstr "Ugyldig Twitter information"
-
-#: twitter.php:373
-msgid "Disconnect"
-msgstr "Afbryd forbindelsen"
-
-#: twitter.php:378
-msgid "Allow posting to Twitter"
-msgstr "Tillad at lave opslag på Twitter"
-
-#: twitter.php:378
-msgid ""
-"If enabled all your <strong>public</strong> postings can be posted to the "
-"associated Twitter account. You can choose to do so by default (here) or for"
-" every posting separately in the posting options when writing the entry."
-msgstr "Hvis aktiveret, kan alle dine <strong>offentlige</strong> opslag blive lagt op på den associerede Twitter konto. Du kan vælge at gøre dette automatisk (her), eller separat for hvert opslag in valgmulighederne når du skriver opslaget."
-
-#: twitter.php:379
-msgid "Send public postings to Twitter by default"
-msgstr "Send som standard offentlige opslag til Twitter"
-
-#: twitter.php:380
-msgid "Mirror all posts from twitter that are no replies"
-msgstr "Spejl alle opslag fra Twitter som ikke er svar"
-
-#: twitter.php:381
-msgid "Import the remote timeline"
-msgstr "Importér den eksterne tidslinje"
-
-#: twitter.php:382
-msgid "Automatically create contacts"
-msgstr "Opret automatisk kontakter"
-
-#: twitter.php:382
-msgid ""
-"This will automatically create a contact in Friendica as soon as you receive"
-" a message from an existing contact via the Twitter network. If you do not "
-"enable this, you need to manually add those Twitter contacts in Friendica "
-"from whom you would like to see posts here."
-msgstr "Dette vil automatisk skabe en kontakt i Friendica, så snart du modtager en besked fra en eksisterende kontakt via Twitter-netværket. Hvis du ikke slår dette til, skal du manuelt tilføje de Twitter kontakter i Friendica, som du gerne vil se opslag fra her."
-
-#: twitter.php:395
-msgid "Twitter Import/Export/Mirror"
-msgstr "Twitter Import/Eksport/Spejl"
-
-#: twitter.php:547
-msgid ""
-"Please connect a Twitter account in your Social Network settings to import "
-"Twitter posts."
-msgstr "Forbind venligst en Twitter konto i dine Sociale Netværk indstiliinger for at importere Twitter opslag."
-
-#: twitter.php:554
-msgid "Twitter post not found."
-msgstr "Twitter opslag kunne ikke opstøves."
-
-#: twitter.php:914
-msgid "Save Settings"
-msgstr "Gem indstillinger"
-
-#: twitter.php:916
-msgid "Consumer key"
-msgstr "\"Consumer\" nøgle"
-
-#: twitter.php:917
-msgid "Consumer secret"
-msgstr "\"Consumer\" hemmelighed"
-
-#: twitter.php:1113
-#, php-format
-msgid "%s on Twitter"
-msgstr "%s på Twitter"
diff --git a/twitter/lang/da-dk/strings.php b/twitter/lang/da-dk/strings.php
deleted file mode 100644
index e0004911..00000000
--- a/twitter/lang/da-dk/strings.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_da_dk")) {
-function string_plural_select_da_dk($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Post to Twitter'] = 'Læg op på Twitter';
-$a->strings['You submitted an empty PIN, please Sign In with Twitter again to get a new one.'] = 'Du indsendte en tom PIN, log venligst ind med Twitter igen og få en ny en.';
-$a->strings['No consumer key pair for Twitter found. Please contact your site administrator.'] = 'Intet "consumer key pair" fundet for Twitter. Kontakt venligst din sides administrator.';
-$a->strings['At this Friendica instance the Twitter addon was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to Twitter.'] = 'På denne Friendica instans er Twitter-tilføjelsen slået til, men du har ikke forbundet din konto til din Twitter-konto endnu. For at gøre det, skal du klikke på knappen herunder for at få en PIN fra Twitter, som du så skal kopiere ind i input-boksen og indsende . Det er kun dine <strong>offentlige</strong> opslag som vil blive lagt op på Twitter.';
-$a->strings['Log in with Twitter'] = 'Log ind med Twitter';
-$a->strings['Copy the PIN from Twitter here'] = 'Kopier din PIN fra Twitter ind her';
-$a->strings['An error occured: '] = 'Der opstod en fejl:';
-$a->strings['Currently connected to: <a href="https://twitter.com/%1$s" target="_twitter">%1$s</a>'] = 'I øjeblikket forbundet til: <a href="https://twitter.com/%1$s" target="_twitter">%1$s</a>';
-$a->strings['<strong>Note</strong>: Due to your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted.'] = '<strong>Note</strong>: Grundet dine privatlivsindstillinger (<em>Skjul dine profildetaljer fra ukendte besøgende?</em>), vil linket, som potentielt kan være inkluderet i offentlige opslag på Twitter, lede tilbage til en blank side som informerer den besøgende om at adgang til din profil er begrænset.';
-$a->strings['Invalid Twitter info'] = 'Ugyldig Twitter information';
-$a->strings['Disconnect'] = 'Afbryd forbindelsen';
-$a->strings['Allow posting to Twitter'] = 'Tillad at lave opslag på Twitter';
-$a->strings['If enabled all your <strong>public</strong> postings can be posted to the associated Twitter account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry.'] = 'Hvis aktiveret, kan alle dine <strong>offentlige</strong> opslag blive lagt op på den associerede Twitter konto. Du kan vælge at gøre dette automatisk (her), eller separat for hvert opslag in valgmulighederne når du skriver opslaget.';
-$a->strings['Send public postings to Twitter by default'] = 'Send som standard offentlige opslag til Twitter';
-$a->strings['Mirror all posts from twitter that are no replies'] = 'Spejl alle opslag fra Twitter som ikke er svar';
-$a->strings['Import the remote timeline'] = 'Importér den eksterne tidslinje';
-$a->strings['Automatically create contacts'] = 'Opret automatisk kontakter';
-$a->strings['This will automatically create a contact in Friendica as soon as you receive a message from an existing contact via the Twitter network. If you do not enable this, you need to manually add those Twitter contacts in Friendica from whom you would like to see posts here.'] = 'Dette vil automatisk skabe en kontakt i Friendica, så snart du modtager en besked fra en eksisterende kontakt via Twitter-netværket. Hvis du ikke slår dette til, skal du manuelt tilføje de Twitter kontakter i Friendica, som du gerne vil se opslag fra her.';
-$a->strings['Twitter Import/Export/Mirror'] = 'Twitter Import/Eksport/Spejl';
-$a->strings['Please connect a Twitter account in your Social Network settings to import Twitter posts.'] = 'Forbind venligst en Twitter konto i dine Sociale Netværk indstiliinger for at importere Twitter opslag.';
-$a->strings['Twitter post not found.'] = 'Twitter opslag kunne ikke opstøves.';
-$a->strings['Save Settings'] = 'Gem indstillinger';
-$a->strings['Consumer key'] = '"Consumer" nøgle';
-$a->strings['Consumer secret'] = '"Consumer" hemmelighed';
-$a->strings['%s on Twitter'] = '%s på Twitter';
diff --git a/twitter/lang/de/messages.po b/twitter/lang/de/messages.po
index a38392a2..f8eb5297 100644
--- a/twitter/lang/de/messages.po
+++ b/twitter/lang/de/messages.po
@@ -4,81 +4,133 @@
 # 
 # 
 # Translators:
-# Raroun, 2023
-# Till Mohr <tmtrfx@till-mohr.de>, 2021
 # Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2014-2015
-# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2018,2020-2022
+# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2018
 # Ulf Rompe <transifex.com@rompe.org>, 2019
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-08-16 03:27+0000\n"
-"PO-Revision-Date: 2014-06-23 12:58+0000\n"
-"Last-Translator: Raroun, 2023\n"
-"Language-Team: German (http://app.transifex.com/Friendica/friendica/language/de/)\n"
+"POT-Creation-Date: 2018-06-02 10:25+0700\n"
+"PO-Revision-Date: 2019-02-11 13:54+0000\n"
+"Last-Translator: Ulf Rompe <transifex.com@rompe.org>\n"
+"Language-Team: German (http://www.transifex.com/Friendica/friendica/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: twitter.php:84
+#: twitter.php:195
 msgid "Post to Twitter"
 msgstr "Auf Twitter veröffentlichen"
 
-#: twitter.php:123
-msgid "No status."
-msgstr "Kein Status."
+#: twitter.php:236
+msgid ""
+"You submitted an empty PIN, please Sign In with Twitter again to get a new "
+"one."
+msgstr "Du hast keine PIN übertragen. Bitte melde dich erneut bei Twitter an, um eine neue PIN zu erhalten."
 
-#: twitter.php:129
+#: twitter.php:263
+msgid "Twitter settings updated."
+msgstr "Twitter-Einstellungen aktualisiert."
+
+#: twitter.php:293 twitter.php:297
+msgid "Twitter Import/Export/Mirror"
+msgstr "Twitter-Import/Export/Spiegeln"
+
+#: twitter.php:304
+msgid ""
+"No consumer key pair for Twitter found. Please contact your site "
+"administrator."
+msgstr "Kein Consumer-Schlüsselpaar für Twitter gefunden. Bitte wende dich an den Administrator der Seite."
+
+#: twitter.php:316
+msgid ""
+"At this Friendica instance the Twitter addon was enabled but you have not "
+"yet connected your account to your Twitter account. To do so click the "
+"button below to get a PIN from Twitter which you have to copy into the input"
+" box below and submit the form. Only your <strong>public</strong> posts will"
+" be posted to Twitter."
+msgstr "Auf diesem Friendica-Server wurde das Twitter-Addon aktiviert, aber du hast deinen Account noch nicht mit deinem Twitter-Account verbunden. Klicke dazu auf die Schaltfläche unten. Du erhältst dann eine PIN von Twitter, die du in das Eingabefeld unten einfügst. Denk daran, den Senden-Knopf zu drücken! Nur <strong>öffentliche</strong> Beiträge werden bei Twitter veröffentlicht."
+
+#: twitter.php:317
+msgid "Log in with Twitter"
+msgstr "bei Twitter anmelden"
+
+#: twitter.php:319
+msgid "Copy the PIN from Twitter here"
+msgstr "Kopiere die Twitter-PIN hier her"
+
+#: twitter.php:324 twitter.php:366 twitter.php:636
+msgid "Save Settings"
+msgstr "Einstellungen speichern"
+
+#: twitter.php:336
+msgid "Currently connected to: "
+msgstr "Momentan verbunden mit: "
+
+#: twitter.php:337
+msgid "Disconnect"
+msgstr "Trennen"
+
+#: twitter.php:347
 msgid "Allow posting to Twitter"
 msgstr "Veröffentlichung bei Twitter erlauben"
 
-#: twitter.php:129
+#: twitter.php:347
 msgid ""
 "If enabled all your <strong>public</strong> postings can be posted to the "
 "associated Twitter account. You can choose to do so by default (here) or for"
 " every posting separately in the posting options when writing the entry."
-msgstr "Wenn aktiviert, können all deine <strong>öffentlichen</strong> Einträge auf dem verbundenen Twitter-Konto veröffentlicht werden. Du kannst dies (hier) als Standardverhalten einstellen oder beim Schreiben eines Beitrags in den Beitragsoptionen festlegen."
+msgstr "Wenn aktiviert, können all deine <strong>öffentlichen</strong> Einträge auf dem verbundenen Twitter Konto veröffentlicht werden. Du kannst dies (hier) als Standardverhalten einstellen oder beim Schreiben eines Beitrags in den Beitragsoptionen festlegen."
 
-#: twitter.php:130
+#: twitter.php:350
+msgid ""
+"<strong>Note</strong>: Due to your privacy settings (<em>Hide your profile "
+"details from unknown viewers?</em>) the link potentially included in public "
+"postings relayed to Twitter will lead the visitor to a blank page informing "
+"the visitor that the access to your profile has been restricted."
+msgstr "<strong>Hinweis</strong>: Aufgrund deiner Privatsphären-Einstellungen (<em>Profil-Details vor unbekannten Betrachtern verbergen?</em>) wird der Link, der eventuell an deinen Twitter-Beitrag angehängt wird, um auf den Originalbeitrag zu verweisen, den Betrachter auf eine leere Seite führen, die ihn darüber informiert, dass der Zugriff eingeschränkt wurde."
+
+#: twitter.php:353
 msgid "Send public postings to Twitter by default"
 msgstr "Veröffentliche öffentliche Beiträge standardmäßig bei Twitter"
 
-#: twitter.php:131
-msgid "API Key"
-msgstr "API Key"
+#: twitter.php:356
+msgid "Mirror all posts from twitter that are no replies"
+msgstr "Spiegle alle Beiträge von Twitter, die keine Antworten oder wiederholten Nachrichten sind"
 
-#: twitter.php:132
-msgid "API Secret"
-msgstr "API Secret"
+#: twitter.php:359
+msgid "Import the remote timeline"
+msgstr "Importiere die entfernte Zeitleiste"
 
-#: twitter.php:133
-msgid "Access Token"
-msgstr "Access Token"
+#: twitter.php:362
+msgid "Automatically create contacts"
+msgstr "Automatisch Kontakte anlegen"
 
-#: twitter.php:134
-msgid "Access Secret"
-msgstr "Access Secret"
-
-#: twitter.php:135
+#: twitter.php:362
 msgid ""
-"Each user needs to register their own app to be able to post to Twitter. "
-"Please visit https://developer.twitter.com/en/portal/projects-and-apps to "
-"register a project. Inside the project you then have to register an app. You"
-" will find the needed data for the connector on the page \"Keys and token\" "
-"in the app settings."
-msgstr "Jeder Nutzer muss seine eigene App registrieren, um auf Twitter posten zu können. Bitte besuchen Sie https://developer.twitter.com/en/portal/projects-and-apps, um ein Projekt zu registrieren. Innerhalb des Projekts müssen Sie dann eine App registrieren. Die benötigten Daten für den Connector finden Sie auf der Seite \"Keys and token\" in den App-Einstellungen."
+"This will automatically create a contact in Friendica as soon as you receive"
+" a message from an existing contact via the Twitter network. If you do not "
+"enable this, you need to manually add those Twitter contacts in Friendica "
+"from whom you would like to see posts here. However if enabled, you cannot "
+"merely remove a twitter contact from the Friendica contact list, as it will "
+"recreate this contact when they post again."
+msgstr "Mit dieser Option wird automatisch ein Kontakt bei Friendica angelegt, wenn du eine Nachricht von einem bestehenden Kontakt auf Twitter erhältst. Ist die Option nicht aktiv, musst du manuell Kontakte für diejenigen deiner Twitter Kontakte anlegen, deren Nachrichten du auf Friendica lesen möchtest.. Auf der anderen Seite kannst du, so diese Option aktiv ist, nicht einfach Twitter Kontakte aus deinen Kontakten bei Friendica entfernen, da diese bei der nächsten Gelegenheit neu erstellt werden."
 
-#: twitter.php:136
-msgid "Last Status Summary"
-msgstr "Zusammenfassung des letzten Status"
+#: twitter.php:614
+msgid "Twitter post failed. Queued for retry."
+msgstr "Veröffentlichung bei Twitter gescheitert. Wir versuchen es später erneut."
 
-#: twitter.php:137
-msgid "Last Status Content"
-msgstr "Inhalt des letzten Status"
+#: twitter.php:628
+msgid "Settings updated."
+msgstr "Einstellungen aktualisiert."
 
-#: twitter.php:142
-msgid "Twitter Export"
-msgstr "Twitter Export"
+#: twitter.php:638
+msgid "Consumer key"
+msgstr "Consumer Key"
+
+#: twitter.php:639
+msgid "Consumer secret"
+msgstr "Consumer Secret"
diff --git a/twitter/lang/de/strings.php b/twitter/lang/de/strings.php
index 4079ddfe..c518ee1c 100644
--- a/twitter/lang/de/strings.php
+++ b/twitter/lang/de/strings.php
@@ -3,18 +3,29 @@
 if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Post to Twitter'] = 'Auf Twitter veröffentlichen';
-$a->strings['No status.'] = 'Kein Status.';
-$a->strings['Allow posting to Twitter'] = 'Veröffentlichung bei Twitter erlauben';
-$a->strings['If enabled all your <strong>public</strong> postings can be posted to the associated Twitter account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry.'] = 'Wenn aktiviert, können all deine <strong>öffentlichen</strong> Einträge auf dem verbundenen Twitter-Konto veröffentlicht werden. Du kannst dies (hier) als Standardverhalten einstellen oder beim Schreiben eines Beitrags in den Beitragsoptionen festlegen.';
-$a->strings['Send public postings to Twitter by default'] = 'Veröffentliche öffentliche Beiträge standardmäßig bei Twitter';
-$a->strings['API Key'] = 'API Key';
-$a->strings['API Secret'] = 'API Secret';
-$a->strings['Access Token'] = 'Access Token';
-$a->strings['Access Secret'] = 'Access Secret';
-$a->strings['Each user needs to register their own app to be able to post to Twitter. Please visit https://developer.twitter.com/en/portal/projects-and-apps to register a project. Inside the project you then have to register an app. You will find the needed data for the connector on the page "Keys and token" in the app settings.'] = 'Jeder Nutzer muss seine eigene App registrieren, um auf Twitter posten zu können. Bitte besuchen Sie https://developer.twitter.com/en/portal/projects-and-apps, um ein Projekt zu registrieren. Innerhalb des Projekts müssen Sie dann eine App registrieren. Die benötigten Daten für den Connector finden Sie auf der Seite "Keys and token" in den App-Einstellungen.';
-$a->strings['Last Status Summary'] = 'Zusammenfassung des letzten Status';
-$a->strings['Last Status Content'] = 'Inhalt des letzten Status';
-$a->strings['Twitter Export'] = 'Twitter Export';
+;
+$a->strings["Post to Twitter"] = "Auf Twitter veröffentlichen";
+$a->strings["You submitted an empty PIN, please Sign In with Twitter again to get a new one."] = "Du hast keine PIN übertragen. Bitte melde dich erneut bei Twitter an, um eine neue PIN zu erhalten.";
+$a->strings["Twitter settings updated."] = "Twitter-Einstellungen aktualisiert.";
+$a->strings["Twitter Import/Export/Mirror"] = "Twitter-Import/Export/Spiegeln";
+$a->strings["No consumer key pair for Twitter found. Please contact your site administrator."] = "Kein Consumer-Schlüsselpaar für Twitter gefunden. Bitte wende dich an den Administrator der Seite.";
+$a->strings["At this Friendica instance the Twitter addon was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to Twitter."] = "Auf diesem Friendica-Server wurde das Twitter-Addon aktiviert, aber du hast deinen Account noch nicht mit deinem Twitter-Account verbunden. Klicke dazu auf die Schaltfläche unten. Du erhältst dann eine PIN von Twitter, die du in das Eingabefeld unten einfügst. Denk daran, den Senden-Knopf zu drücken! Nur <strong>öffentliche</strong> Beiträge werden bei Twitter veröffentlicht.";
+$a->strings["Log in with Twitter"] = "bei Twitter anmelden";
+$a->strings["Copy the PIN from Twitter here"] = "Kopiere die Twitter-PIN hier her";
+$a->strings["Save Settings"] = "Einstellungen speichern";
+$a->strings["Currently connected to: "] = "Momentan verbunden mit: ";
+$a->strings["Disconnect"] = "Trennen";
+$a->strings["Allow posting to Twitter"] = "Veröffentlichung bei Twitter erlauben";
+$a->strings["If enabled all your <strong>public</strong> postings can be posted to the associated Twitter account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "Wenn aktiviert, können all deine <strong>öffentlichen</strong> Einträge auf dem verbundenen Twitter Konto veröffentlicht werden. Du kannst dies (hier) als Standardverhalten einstellen oder beim Schreiben eines Beitrags in den Beitragsoptionen festlegen.";
+$a->strings["<strong>Note</strong>: Due to your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "<strong>Hinweis</strong>: Aufgrund deiner Privatsphären-Einstellungen (<em>Profil-Details vor unbekannten Betrachtern verbergen?</em>) wird der Link, der eventuell an deinen Twitter-Beitrag angehängt wird, um auf den Originalbeitrag zu verweisen, den Betrachter auf eine leere Seite führen, die ihn darüber informiert, dass der Zugriff eingeschränkt wurde.";
+$a->strings["Send public postings to Twitter by default"] = "Veröffentliche öffentliche Beiträge standardmäßig bei Twitter";
+$a->strings["Mirror all posts from twitter that are no replies"] = "Spiegle alle Beiträge von Twitter, die keine Antworten oder wiederholten Nachrichten sind";
+$a->strings["Import the remote timeline"] = "Importiere die entfernte Zeitleiste";
+$a->strings["Automatically create contacts"] = "Automatisch Kontakte anlegen";
+$a->strings["This will automatically create a contact in Friendica as soon as you receive a message from an existing contact via the Twitter network. If you do not enable this, you need to manually add those Twitter contacts in Friendica from whom you would like to see posts here. However if enabled, you cannot merely remove a twitter contact from the Friendica contact list, as it will recreate this contact when they post again."] = "Mit dieser Option wird automatisch ein Kontakt bei Friendica angelegt, wenn du eine Nachricht von einem bestehenden Kontakt auf Twitter erhältst. Ist die Option nicht aktiv, musst du manuell Kontakte für diejenigen deiner Twitter Kontakte anlegen, deren Nachrichten du auf Friendica lesen möchtest.. Auf der anderen Seite kannst du, so diese Option aktiv ist, nicht einfach Twitter Kontakte aus deinen Kontakten bei Friendica entfernen, da diese bei der nächsten Gelegenheit neu erstellt werden.";
+$a->strings["Twitter post failed. Queued for retry."] = "Veröffentlichung bei Twitter gescheitert. Wir versuchen es später erneut.";
+$a->strings["Settings updated."] = "Einstellungen aktualisiert.";
+$a->strings["Consumer key"] = "Consumer Key";
+$a->strings["Consumer secret"] = "Consumer Secret";
diff --git a/twitter/lang/en-gb/strings.php b/twitter/lang/en-gb/strings.php
index 78091276..b03fbe8e 100644
--- a/twitter/lang/en-gb/strings.php
+++ b/twitter/lang/en-gb/strings.php
@@ -3,28 +3,29 @@
 if(! function_exists("string_plural_select_en_gb")) {
 function string_plural_select_en_gb($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Post to Twitter'] = 'Post to Twitter';
-$a->strings['You submitted an empty PIN, please Sign In with Twitter again to get a new one.'] = 'You submitted an empty PIN, please sign in with Twitter again to get a new PIN.';
-$a->strings['Twitter settings updated.'] = 'Twitter settings updated.';
-$a->strings['Twitter Import/Export/Mirror'] = 'Twitter Import/Export/Mirror';
-$a->strings['No consumer key pair for Twitter found. Please contact your site administrator.'] = 'No consumer key pair for Twitter found. Please contact your site administrator.';
-$a->strings['At this Friendica instance the Twitter addon was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to Twitter.'] = 'At this Friendica instance the Twitter addon was enabled, but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to Twitter.';
-$a->strings['Log in with Twitter'] = 'Log in with Twitter';
-$a->strings['Copy the PIN from Twitter here'] = 'Copy the PIN from Twitter here';
-$a->strings['Save Settings'] = 'Save settings';
-$a->strings['Currently connected to: '] = 'Currently connected to: ';
-$a->strings['Disconnect'] = 'Disconnect';
-$a->strings['Allow posting to Twitter'] = 'Allow posting to Twitter';
-$a->strings['If enabled all your <strong>public</strong> postings can be posted to the associated Twitter account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry.'] = 'If enabled all your <strong>public</strong> postings can be posted to the associated Twitter account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry.';
-$a->strings['<strong>Note</strong>: Due to your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted.'] = '<strong>Note</strong>: Due to your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted.';
-$a->strings['Send public postings to Twitter by default'] = 'Send public postings to Twitter by default';
-$a->strings['Mirror all posts from twitter that are no replies'] = 'Mirror all posts from twitter that are no replies';
-$a->strings['Import the remote timeline'] = 'Import the remote timeline';
-$a->strings['Automatically create contacts'] = 'Automatically create contacts';
-$a->strings['This will automatically create a contact in Friendica as soon as you receive a message from an existing contact via the Twitter network. If you do not enable this, you need to manually add those Twitter contacts in Friendica from whom you would like to see posts here. However if enabled, you cannot merely remove a twitter contact from the Friendica contact list, as it will recreate this contact when they post again.'] = 'This will automatically create a contact in Friendica as soon as you receive a message from an existing contact via the Twitter network. If you do not enable this, you need to manually add those Twitter contacts in Friendica from whom you would like to see posts here. However if enabled, you cannot merely remove a twitter contact from the Friendica contact list, as it will recreate this contact when they post again.';
-$a->strings['Twitter post failed. Queued for retry.'] = 'Twitter post failed. Queued for retry.';
-$a->strings['Settings updated.'] = 'Settings updated.';
-$a->strings['Consumer key'] = 'Consumer key';
-$a->strings['Consumer secret'] = 'Consumer secret';
+;
+$a->strings["Post to Twitter"] = "Post to Twitter";
+$a->strings["You submitted an empty PIN, please Sign In with Twitter again to get a new one."] = "You submitted an empty PIN, please sign in with Twitter again to get a new PIN.";
+$a->strings["Twitter settings updated."] = "Twitter settings updated.";
+$a->strings["Twitter Import/Export/Mirror"] = "Twitter Import/Export/Mirror";
+$a->strings["No consumer key pair for Twitter found. Please contact your site administrator."] = "No consumer key pair for Twitter found. Please contact your site administrator.";
+$a->strings["At this Friendica instance the Twitter addon was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to Twitter."] = "At this Friendica instance the Twitter addon was enabled, but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to Twitter.";
+$a->strings["Log in with Twitter"] = "Log in with Twitter";
+$a->strings["Copy the PIN from Twitter here"] = "Copy the PIN from Twitter here";
+$a->strings["Save Settings"] = "Save settings";
+$a->strings["Currently connected to: "] = "Currently connected to: ";
+$a->strings["Disconnect"] = "Disconnect";
+$a->strings["Allow posting to Twitter"] = "Allow posting to Twitter";
+$a->strings["If enabled all your <strong>public</strong> postings can be posted to the associated Twitter account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "If enabled all your <strong>public</strong> postings can be posted to the associated Twitter account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry.";
+$a->strings["<strong>Note</strong>: Due to your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "<strong>Note</strong>: Due to your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted.";
+$a->strings["Send public postings to Twitter by default"] = "Send public postings to Twitter by default";
+$a->strings["Mirror all posts from twitter that are no replies"] = "Mirror all posts from twitter that are no replies";
+$a->strings["Import the remote timeline"] = "Import the remote timeline";
+$a->strings["Automatically create contacts"] = "Automatically create contacts";
+$a->strings["This will automatically create a contact in Friendica as soon as you receive a message from an existing contact via the Twitter network. If you do not enable this, you need to manually add those Twitter contacts in Friendica from whom you would like to see posts here. However if enabled, you cannot merely remove a twitter contact from the Friendica contact list, as it will recreate this contact when they post again."] = "This will automatically create a contact in Friendica as soon as you receive a message from an existing contact via the Twitter network. If you do not enable this, you need to manually add those Twitter contacts in Friendica from whom you would like to see posts here. However if enabled, you cannot merely remove a twitter contact from the Friendica contact list, as it will recreate this contact when they post again.";
+$a->strings["Twitter post failed. Queued for retry."] = "Twitter post failed. Queued for retry.";
+$a->strings["Settings updated."] = "Settings updated.";
+$a->strings["Consumer key"] = "Consumer key";
+$a->strings["Consumer secret"] = "Consumer secret";
diff --git a/twitter/lang/en-us/messages.po b/twitter/lang/en-us/messages.po
index 494d0d79..e7844812 100644
--- a/twitter/lang/en-us/messages.po
+++ b/twitter/lang/en-us/messages.po
@@ -5,15 +5,14 @@
 # 
 # Translators:
 # Andy H3 <andy@hubup.pro>, 2018
-# R C, 2018
-# Spencer Dub <southwest23@gmail.com>, 2021
+# R C <miqrogroove@gmail.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-10-23 02:00-0400\n"
-"PO-Revision-Date: 2021-01-14 00:51+0000\n"
-"Last-Translator: Spencer Dub <southwest23@gmail.com>\n"
+"POT-Creation-Date: 2018-06-02 10:25+0700\n"
+"PO-Revision-Date: 2018-06-13 03:50+0000\n"
+"Last-Translator: R C <miqrogroove@gmail.com>\n"
 "Language-Team: English (United States) (http://www.transifex.com/Friendica/friendica/language/en_US/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,71 +20,71 @@ msgstr ""
 "Language: en_US\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: twitter.php:189
+#: twitter.php:195
 msgid "Post to Twitter"
 msgstr "Post to Twitter"
 
-#: twitter.php:234
+#: twitter.php:236
 msgid ""
 "You submitted an empty PIN, please Sign In with Twitter again to get a new "
 "one."
 msgstr "You submitted an empty PIN, please sign in with Twitter again to get a new PIN."
 
-#: twitter.php:291 twitter.php:295
+#: twitter.php:263
+msgid "Twitter settings updated."
+msgstr "Twitter settings updated."
+
+#: twitter.php:293 twitter.php:297
 msgid "Twitter Import/Export/Mirror"
 msgstr "Twitter Import/Export/Mirror"
 
-#: twitter.php:302
+#: twitter.php:304
 msgid ""
 "No consumer key pair for Twitter found. Please contact your site "
 "administrator."
 msgstr "No consumer key pair for Twitter found. Please contact your site administrator."
 
-#: twitter.php:314
+#: twitter.php:316
 msgid ""
 "At this Friendica instance the Twitter addon was enabled but you have not "
 "yet connected your account to your Twitter account. To do so click the "
 "button below to get a PIN from Twitter which you have to copy into the input"
 " box below and submit the form. Only your <strong>public</strong> posts will"
 " be posted to Twitter."
-msgstr "This Friendica instance has enabled the Twitter addon, but you have not yet connected your Friendica account to your Twitter account. To do so, click the button below to get a PIN from Twitter. Copy the PIN into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to Twitter."
+msgstr "At this Friendica instance the Twitter addon was enabled, but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to Twitter."
 
-#: twitter.php:315
+#: twitter.php:317
 msgid "Log in with Twitter"
 msgstr "Log in with Twitter"
 
-#: twitter.php:317
+#: twitter.php:319
 msgid "Copy the PIN from Twitter here"
 msgstr "Copy the PIN from Twitter here"
 
-#: twitter.php:322 twitter.php:377 twitter.php:757
+#: twitter.php:324 twitter.php:366 twitter.php:636
 msgid "Save Settings"
 msgstr "Save settings"
 
-#: twitter.php:324 twitter.php:379
-msgid "An error occured: "
-msgstr "An error occurred: "
-
-#: twitter.php:341
+#: twitter.php:336
 msgid "Currently connected to: "
 msgstr "Currently connected to: "
 
-#: twitter.php:342 twitter.php:352
+#: twitter.php:337
 msgid "Disconnect"
 msgstr "Disconnect"
 
-#: twitter.php:359
+#: twitter.php:347
 msgid "Allow posting to Twitter"
 msgstr "Allow posting to Twitter"
 
-#: twitter.php:359
+#: twitter.php:347
 msgid ""
 "If enabled all your <strong>public</strong> postings can be posted to the "
 "associated Twitter account. You can choose to do so by default (here) or for"
 " every posting separately in the posting options when writing the entry."
 msgstr "If enabled, all your <strong>public</strong> postings can be posted to the associated Twitter account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."
 
-#: twitter.php:362
+#: twitter.php:350
 msgid ""
 "<strong>Note</strong>: Due to your privacy settings (<em>Hide your profile "
 "details from unknown viewers?</em>) the link potentially included in public "
@@ -93,23 +92,23 @@ msgid ""
 "the visitor that the access to your profile has been restricted."
 msgstr "<strong>Note</strong>: Due to your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."
 
-#: twitter.php:365
+#: twitter.php:353
 msgid "Send public postings to Twitter by default"
 msgstr "Send public postings to Twitter by default"
 
-#: twitter.php:368
+#: twitter.php:356
 msgid "Mirror all posts from twitter that are no replies"
-msgstr "Mirror all posts from Twitter that are not replies"
+msgstr "Mirror all posts from twitter that are no replies"
 
-#: twitter.php:371
+#: twitter.php:359
 msgid "Import the remote timeline"
 msgstr "Import the remote timeline"
 
-#: twitter.php:374
+#: twitter.php:362
 msgid "Automatically create contacts"
 msgstr "Automatically create contacts"
 
-#: twitter.php:374
+#: twitter.php:362
 msgid ""
 "This will automatically create a contact in Friendica as soon as you receive"
 " a message from an existing contact via the Twitter network. If you do not "
@@ -117,17 +116,20 @@ msgid ""
 "from whom you would like to see posts here. However if enabled, you cannot "
 "merely remove a twitter contact from the Friendica contact list, as it will "
 "recreate this contact when they post again."
-msgstr "This will automatically create a contact in Friendica as soon as you receive a message from an existing contact via the Twitter network. If you do not enable this, you need to manually add those Twitter contacts in Friendica from whom you would like to see posts here. However if enabled, you cannot merely remove a Twitter contact from the Friendica contact list, as it will recreate this contact when they post again."
+msgstr ""
 
-#: twitter.php:759
+#: twitter.php:614
+msgid "Twitter post failed. Queued for retry."
+msgstr "Twitter post failed. Queued for retry."
+
+#: twitter.php:628
+msgid "Settings updated."
+msgstr "Settings updated."
+
+#: twitter.php:638
 msgid "Consumer key"
 msgstr "Consumer key"
 
-#: twitter.php:760
+#: twitter.php:639
 msgid "Consumer secret"
 msgstr "Consumer secret"
-
-#: twitter.php:945
-#, php-format
-msgid "%s on Twitter"
-msgstr "%s on Twitter"
diff --git a/twitter/lang/en-us/strings.php b/twitter/lang/en-us/strings.php
index a84113ef..9ccd8325 100644
--- a/twitter/lang/en-us/strings.php
+++ b/twitter/lang/en-us/strings.php
@@ -3,27 +3,29 @@
 if(! function_exists("string_plural_select_en_us")) {
 function string_plural_select_en_us($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Post to Twitter'] = 'Post to Twitter';
-$a->strings['You submitted an empty PIN, please Sign In with Twitter again to get a new one.'] = 'You submitted an empty PIN, please sign in with Twitter again to get a new PIN.';
-$a->strings['Twitter Import/Export/Mirror'] = 'Twitter Import/Export/Mirror';
-$a->strings['No consumer key pair for Twitter found. Please contact your site administrator.'] = 'No consumer key pair for Twitter found. Please contact your site administrator.';
-$a->strings['At this Friendica instance the Twitter addon was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to Twitter.'] = 'This Friendica instance has enabled the Twitter addon, but you have not yet connected your Friendica account to your Twitter account. To do so, click the button below to get a PIN from Twitter. Copy the PIN into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to Twitter.';
-$a->strings['Log in with Twitter'] = 'Log in with Twitter';
-$a->strings['Copy the PIN from Twitter here'] = 'Copy the PIN from Twitter here';
-$a->strings['Save Settings'] = 'Save settings';
-$a->strings['An error occured: '] = 'An error occurred: ';
-$a->strings['Currently connected to: '] = 'Currently connected to: ';
-$a->strings['Disconnect'] = 'Disconnect';
-$a->strings['Allow posting to Twitter'] = 'Allow posting to Twitter';
-$a->strings['If enabled all your <strong>public</strong> postings can be posted to the associated Twitter account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry.'] = 'If enabled, all your <strong>public</strong> postings can be posted to the associated Twitter account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry.';
-$a->strings['<strong>Note</strong>: Due to your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted.'] = '<strong>Note</strong>: Due to your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted.';
-$a->strings['Send public postings to Twitter by default'] = 'Send public postings to Twitter by default';
-$a->strings['Mirror all posts from twitter that are no replies'] = 'Mirror all posts from Twitter that are not replies';
-$a->strings['Import the remote timeline'] = 'Import the remote timeline';
-$a->strings['Automatically create contacts'] = 'Automatically create contacts';
-$a->strings['This will automatically create a contact in Friendica as soon as you receive a message from an existing contact via the Twitter network. If you do not enable this, you need to manually add those Twitter contacts in Friendica from whom you would like to see posts here. However if enabled, you cannot merely remove a twitter contact from the Friendica contact list, as it will recreate this contact when they post again.'] = 'This will automatically create a contact in Friendica as soon as you receive a message from an existing contact via the Twitter network. If you do not enable this, you need to manually add those Twitter contacts in Friendica from whom you would like to see posts here. However if enabled, you cannot merely remove a Twitter contact from the Friendica contact list, as it will recreate this contact when they post again.';
-$a->strings['Consumer key'] = 'Consumer key';
-$a->strings['Consumer secret'] = 'Consumer secret';
-$a->strings['%s on Twitter'] = '%s on Twitter';
+;
+$a->strings["Post to Twitter"] = "Post to Twitter";
+$a->strings["You submitted an empty PIN, please Sign In with Twitter again to get a new one."] = "You submitted an empty PIN, please sign in with Twitter again to get a new PIN.";
+$a->strings["Twitter settings updated."] = "Twitter settings updated.";
+$a->strings["Twitter Import/Export/Mirror"] = "Twitter Import/Export/Mirror";
+$a->strings["No consumer key pair for Twitter found. Please contact your site administrator."] = "No consumer key pair for Twitter found. Please contact your site administrator.";
+$a->strings["At this Friendica instance the Twitter addon was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to Twitter."] = "At this Friendica instance the Twitter addon was enabled, but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to Twitter.";
+$a->strings["Log in with Twitter"] = "Log in with Twitter";
+$a->strings["Copy the PIN from Twitter here"] = "Copy the PIN from Twitter here";
+$a->strings["Save Settings"] = "Save settings";
+$a->strings["Currently connected to: "] = "Currently connected to: ";
+$a->strings["Disconnect"] = "Disconnect";
+$a->strings["Allow posting to Twitter"] = "Allow posting to Twitter";
+$a->strings["If enabled all your <strong>public</strong> postings can be posted to the associated Twitter account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "If enabled, all your <strong>public</strong> postings can be posted to the associated Twitter account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry.";
+$a->strings["<strong>Note</strong>: Due to your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "<strong>Note</strong>: Due to your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted.";
+$a->strings["Send public postings to Twitter by default"] = "Send public postings to Twitter by default";
+$a->strings["Mirror all posts from twitter that are no replies"] = "Mirror all posts from twitter that are no replies";
+$a->strings["Import the remote timeline"] = "Import the remote timeline";
+$a->strings["Automatically create contacts"] = "Automatically create contacts";
+$a->strings["This will automatically create a contact in Friendica as soon as you receive a message from an existing contact via the Twitter network. If you do not enable this, you need to manually add those Twitter contacts in Friendica from whom you would like to see posts here. However if enabled, you cannot merely remove a twitter contact from the Friendica contact list, as it will recreate this contact when they post again."] = "";
+$a->strings["Twitter post failed. Queued for retry."] = "Twitter post failed. Queued for retry.";
+$a->strings["Settings updated."] = "Settings updated.";
+$a->strings["Consumer key"] = "Consumer key";
+$a->strings["Consumer secret"] = "Consumer secret";
diff --git a/twitter/lang/es/messages.po b/twitter/lang/es/messages.po
index f479b846..739ac523 100644
--- a/twitter/lang/es/messages.po
+++ b/twitter/lang/es/messages.po
@@ -4,79 +4,120 @@
 # 
 # 
 # Translators:
-# Albert, 2016
-# Julio Cova, 2019
-# Senex Petrovic <javierruizo@hotmail.com>, 2021
+# Athalbert, 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-08-16 03:27+0000\n"
-"PO-Revision-Date: 2014-06-23 12:58+0000\n"
-"Last-Translator: Senex Petrovic <javierruizo@hotmail.com>, 2021\n"
-"Language-Team: Spanish (http://app.transifex.com/Friendica/friendica/language/es/)\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2016-10-10 15:07+0000\n"
+"Last-Translator: Athalbert\n"
+"Language-Team: Spanish (http://www.transifex.com/Friendica/friendica/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: es\n"
-"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: twitter.php:84
+#: twitter.php:77
 msgid "Post to Twitter"
 msgstr "Entrada para Twitter"
 
-#: twitter.php:123
-msgid "No status."
-msgstr ""
-
 #: twitter.php:129
-msgid "Allow posting to Twitter"
-msgstr "Permitir publicar en Twitter"
+msgid "Twitter settings updated."
+msgstr "Ajustes de Twitter actualizados."
 
-#: twitter.php:129
+#: twitter.php:157
+msgid "Twitter Posting Settings"
+msgstr "Ajustes de publicación de Twitter"
+
+#: twitter.php:164
+msgid ""
+"No consumer key pair for Twitter found. Please contact your site "
+"administrator."
+msgstr "No hay par de claves para encuentro de Twitter."
+
+#: twitter.php:183
+msgid ""
+"At this Friendica instance the Twitter addon was enabled but you have not "
+"yet connected your account to your Twitter account. To do so click the "
+"button below to get a PIN from Twitter which you have to copy into the input"
+" box below and submit the form. Only your <strong>public</strong> posts will"
+" be posted to Twitter."
+msgstr "En esta petición de Friendica el addon de Twitter estaba activo pero usted no ha conectado aún su cuenta con la cuenta de Twitter. Para hacerlo click en el botón de abajo para obtener un PIN desde Twitter que tiene que copiar en la caja de texto de abajo y enviar el formulario. Sólo sus entradas <strong>públicas</strong> serán posteadas en Twitter"
+
+#: twitter.php:184
+msgid "Log in with Twitter"
+msgstr "Iniciar sesión con Twitter"
+
+#: twitter.php:186
+msgid "Copy the PIN from Twitter here"
+msgstr "Copie el PIN de Twitter aquí"
+
+#: twitter.php:191 twitter.php:229 twitter.php:556
+msgid "Submit"
+msgstr "Enviar"
+
+#: twitter.php:200
+msgid "Currently connected to: "
+msgstr "Moneda conectada a:"
+
+#: twitter.php:201
 msgid ""
 "If enabled all your <strong>public</strong> postings can be posted to the "
 "associated Twitter account. You can choose to do so by default (here) or for"
 " every posting separately in the posting options when writing the entry."
 msgstr "Si habilita todas sus publicaciones <strong>públicas</strong> pueden ser publicadas en la cuenta de Twitter asociada. Puede elegir hacer eso por defecto (aquí) o por cada publicación por separado en las opciones de entrada cuando escriba la entrada."
 
-#: twitter.php:130
+#: twitter.php:203
+msgid ""
+"<strong>Note</strong>: Due your privacy settings (<em>Hide your profile "
+"details from unknown viewers?</em>) the link potentially included in public "
+"postings relayed to Twitter will lead the visitor to a blank page informing "
+"the visitor that the access to your profile has been restricted."
+msgstr "<strong>Nota</strong>: Debido a sus ajustes de privacidad (<em>¿Ocultar sus detalles de perfil de espectadores desconocidos?</em>) el enlace potencialmente incluido en publicaciones públicas relevado a Twitter llevará al visitante a una página en blanco informándole de que el acceso a su perfil ha sido restringido."
+
+#: twitter.php:206
+msgid "Allow posting to Twitter"
+msgstr "Permitir publicar en Twitter"
+
+#: twitter.php:209
 msgid "Send public postings to Twitter by default"
 msgstr "Enviar publicaciones públicas a Twitter por defecto"
 
-#: twitter.php:131
-msgid "API Key"
-msgstr ""
+#: twitter.php:213
+msgid "Mirror all posts from twitter that are no replies or retweets"
+msgstr "Reflejar todas las publicaciones de Twitter que no son respuestas o retweets."
 
-#: twitter.php:132
-msgid "API Secret"
-msgstr ""
+#: twitter.php:217
+msgid "Shortening method that optimizes the tweet"
+msgstr "Método de corte the optimiza el tweet"
 
-#: twitter.php:133
-msgid "Access Token"
-msgstr ""
+#: twitter.php:221
+msgid "Send linked #-tags and @-names to Twitter"
+msgstr "Enviar #-etiquetas enlazadas y @-nombres a Twitter"
 
-#: twitter.php:134
-msgid "Access Secret"
-msgstr ""
+#: twitter.php:226
+msgid "Clear OAuth configuration"
+msgstr "Borrar configuración OAuth"
 
-#: twitter.php:135
+#: twitter.php:550
+msgid "Settings updated."
+msgstr "Ajustes actualizados"
+
+#: twitter.php:558
+msgid "Consumer key"
+msgstr "Clave de consumidor"
+
+#: twitter.php:559
+msgid "Consumer secret"
+msgstr "Secreto de consumidor"
+
+#: twitter.php:560
+msgid "Name of the Twitter Application"
+msgstr "Nombre de la aplicación de Twitter"
+
+#: twitter.php:560
 msgid ""
-"Each user needs to register their own app to be able to post to Twitter. "
-"Please visit https://developer.twitter.com/en/portal/projects-and-apps to "
-"register a project. Inside the project you then have to register an app. You"
-" will find the needed data for the connector on the page \"Keys and token\" "
-"in the app settings."
-msgstr ""
-
-#: twitter.php:136
-msgid "Last Status Summary"
-msgstr ""
-
-#: twitter.php:137
-msgid "Last Status Content"
-msgstr ""
-
-#: twitter.php:142
-msgid "Twitter Export"
-msgstr ""
+"set this to avoid mirroring postings from ~friendica back to ~friendica"
+msgstr "Fijar esto para evitar el reflejo de publicaciones de ~friendica de vuelta a ~friendica"
diff --git a/twitter/lang/es/strings.php b/twitter/lang/es/strings.php
index 368c871c..812e646b 100644
--- a/twitter/lang/es/strings.php
+++ b/twitter/lang/es/strings.php
@@ -2,10 +2,28 @@
 
 if(! function_exists("string_plural_select_es")) {
 function string_plural_select_es($n){
-	$n = intval($n);
-	if ($n == 1) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
+	return ($n != 1);;
 }}
-$a->strings['Post to Twitter'] = 'Entrada para Twitter';
-$a->strings['Allow posting to Twitter'] = 'Permitir publicar en Twitter';
-$a->strings['If enabled all your <strong>public</strong> postings can be posted to the associated Twitter account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry.'] = 'Si habilita todas sus publicaciones <strong>públicas</strong> pueden ser publicadas en la cuenta de Twitter asociada. Puede elegir hacer eso por defecto (aquí) o por cada publicación por separado en las opciones de entrada cuando escriba la entrada.';
-$a->strings['Send public postings to Twitter by default'] = 'Enviar publicaciones públicas a Twitter por defecto';
+;
+$a->strings["Post to Twitter"] = "Entrada para Twitter";
+$a->strings["Twitter settings updated."] = "Ajustes de Twitter actualizados.";
+$a->strings["Twitter Posting Settings"] = "Ajustes de publicación de Twitter";
+$a->strings["No consumer key pair for Twitter found. Please contact your site administrator."] = "No hay par de claves para encuentro de Twitter.";
+$a->strings["At this Friendica instance the Twitter addon was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to Twitter."] = "En esta petición de Friendica el addon de Twitter estaba activo pero usted no ha conectado aún su cuenta con la cuenta de Twitter. Para hacerlo click en el botón de abajo para obtener un PIN desde Twitter que tiene que copiar en la caja de texto de abajo y enviar el formulario. Sólo sus entradas <strong>públicas</strong> serán posteadas en Twitter";
+$a->strings["Log in with Twitter"] = "Iniciar sesión con Twitter";
+$a->strings["Copy the PIN from Twitter here"] = "Copie el PIN de Twitter aquí";
+$a->strings["Submit"] = "Enviar";
+$a->strings["Currently connected to: "] = "Moneda conectada a:";
+$a->strings["If enabled all your <strong>public</strong> postings can be posted to the associated Twitter account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "Si habilita todas sus publicaciones <strong>públicas</strong> pueden ser publicadas en la cuenta de Twitter asociada. Puede elegir hacer eso por defecto (aquí) o por cada publicación por separado en las opciones de entrada cuando escriba la entrada.";
+$a->strings["<strong>Note</strong>: Due your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "<strong>Nota</strong>: Debido a sus ajustes de privacidad (<em>¿Ocultar sus detalles de perfil de espectadores desconocidos?</em>) el enlace potencialmente incluido en publicaciones públicas relevado a Twitter llevará al visitante a una página en blanco informándole de que el acceso a su perfil ha sido restringido.";
+$a->strings["Allow posting to Twitter"] = "Permitir publicar en Twitter";
+$a->strings["Send public postings to Twitter by default"] = "Enviar publicaciones públicas a Twitter por defecto";
+$a->strings["Mirror all posts from twitter that are no replies or retweets"] = "Reflejar todas las publicaciones de Twitter que no son respuestas o retweets.";
+$a->strings["Shortening method that optimizes the tweet"] = "Método de corte the optimiza el tweet";
+$a->strings["Send linked #-tags and @-names to Twitter"] = "Enviar #-etiquetas enlazadas y @-nombres a Twitter";
+$a->strings["Clear OAuth configuration"] = "Borrar configuración OAuth";
+$a->strings["Settings updated."] = "Ajustes actualizados";
+$a->strings["Consumer key"] = "Clave de consumidor";
+$a->strings["Consumer secret"] = "Secreto de consumidor";
+$a->strings["Name of the Twitter Application"] = "Nombre de la aplicación de Twitter";
+$a->strings["set this to avoid mirroring postings from ~friendica back to ~friendica"] = "Fijar esto para evitar el reflejo de publicaciones de ~friendica de vuelta a ~friendica";
diff --git a/twitter/lang/fi-fi/strings.php b/twitter/lang/fi-fi/strings.php
index a5beaac3..d8b9fab2 100644
--- a/twitter/lang/fi-fi/strings.php
+++ b/twitter/lang/fi-fi/strings.php
@@ -3,21 +3,28 @@
 if(! function_exists("string_plural_select_fi_fi")) {
 function string_plural_select_fi_fi($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Post to Twitter'] = 'Lähetä Twitteriin';
-$a->strings['Twitter settings updated.'] = 'Twitter -asetukset päivitetty.';
-$a->strings['Twitter Import/Export/Mirror'] = 'Twitter tuonti/vienti/peili';
-$a->strings['No consumer key pair for Twitter found. Please contact your site administrator.'] = 'Twitter -kuluttajan avainparia ei löytynyt. Ota yhteyttä sivuston ylläpitäjään.';
-$a->strings['Log in with Twitter'] = 'Kirjaudu sisään Twitterillä';
-$a->strings['Save Settings'] = 'Tallenna asetukset';
-$a->strings['Disconnect'] = 'Katkaise yhteys';
-$a->strings['Allow posting to Twitter'] = 'Salli julkaisu Twitteriin';
-$a->strings['Send public postings to Twitter by default'] = 'Lähetä oletuksena kaikki julkiset julkaisut Twitteriin';
-$a->strings['Mirror all posts from twitter that are no replies'] = 'Peilaa kaikki julkaisut Twitteristä jotka eivät ole vastauksia';
-$a->strings['Import the remote timeline'] = 'Tuo etäaikajana';
-$a->strings['Automatically create contacts'] = 'Luo kontaktit automaattisesti';
-$a->strings['Twitter post failed. Queued for retry.'] = 'Twitter -julkaisu epäonnistui. Jonossa uudelleenyritykseen.';
-$a->strings['Settings updated.'] = 'Asetukset päivitetty.';
-$a->strings['Consumer key'] = 'Kuluttajan avain';
-$a->strings['Consumer secret'] = 'Kuluttajasalaisuus';
+;
+$a->strings["Post to Twitter"] = "Lähetä Twitteriin";
+$a->strings["You submitted an empty PIN, please Sign In with Twitter again to get a new one."] = "";
+$a->strings["Twitter settings updated."] = "Twitter -asetukset päivitetty.";
+$a->strings["Twitter Import/Export/Mirror"] = "Twitter tuonti/vienti/peili";
+$a->strings["No consumer key pair for Twitter found. Please contact your site administrator."] = "Twitter -kuluttajan avainparia ei löytynyt. Ota yhteyttä sivuston ylläpitäjään.";
+$a->strings["At this Friendica instance the Twitter addon was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to Twitter."] = "";
+$a->strings["Log in with Twitter"] = "Kirjaudu sisään Twitterillä";
+$a->strings["Copy the PIN from Twitter here"] = "";
+$a->strings["Save Settings"] = "Tallenna asetukset";
+$a->strings["Currently connected to: "] = "";
+$a->strings["Disconnect"] = "Katkaise yhteys";
+$a->strings["Allow posting to Twitter"] = "Salli julkaisu Twitteriin";
+$a->strings["If enabled all your <strong>public</strong> postings can be posted to the associated Twitter account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "";
+$a->strings["<strong>Note</strong>: Due to your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "";
+$a->strings["Send public postings to Twitter by default"] = "Lähetä oletuksena kaikki julkiset julkaisut Twitteriin";
+$a->strings["Mirror all posts from twitter that are no replies"] = "Peilaa kaikki julkaisut Twitteristä jotka eivät ole vastauksia";
+$a->strings["Import the remote timeline"] = "Tuo etäaikajana";
+$a->strings["Automatically create contacts"] = "Luo kontaktit automaattisesti";
+$a->strings["Twitter post failed. Queued for retry."] = "Twitter -julkaisu epäonnistui. Jonossa uudelleenyritykseen.";
+$a->strings["Settings updated."] = "Asetukset päivitetty.";
+$a->strings["Consumer key"] = "Kuluttajan avain";
+$a->strings["Consumer secret"] = "Kuluttajasalaisuus";
diff --git a/twitter/lang/fr/messages.po b/twitter/lang/fr/messages.po
index b510d6d8..6b898264 100644
--- a/twitter/lang/fr/messages.po
+++ b/twitter/lang/fr/messages.po
@@ -4,80 +4,121 @@
 # 
 # 
 # Translators:
-# Florent C., 2023
-# Nicolas Derive, 2022
-# ea1cd8241cb389ffb6f92bc6891eff5d_dc12308 <70dced5587d47e18d88f9298024d96f8_93383>, 2015
+# Nicola Spanti <translations@nicola-spanti.info>, 2015
 # StefOfficiel <pichard.stephane@free.fr>, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-08-16 03:27+0000\n"
-"PO-Revision-Date: 2014-06-23 12:58+0000\n"
-"Last-Translator: Florent C., 2023\n"
-"Language-Team: French (http://app.transifex.com/Friendica/friendica/language/fr/)\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2015-08-30 17:24+0000\n"
+"Last-Translator: Nicola Spanti <translations@nicola-spanti.info>\n"
+"Language-Team: French (http://www.transifex.com/Friendica/friendica/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fr\n"
-"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: twitter.php:84
+#: twitter.php:77
 msgid "Post to Twitter"
 msgstr "Publier sur Twitter"
 
-#: twitter.php:123
-msgid "No status."
-msgstr "Aucun statut"
-
 #: twitter.php:129
-msgid "Allow posting to Twitter"
-msgstr "Autoriser la publication sur Twitter"
+msgid "Twitter settings updated."
+msgstr "Paramètres Twitter mis à jour."
 
-#: twitter.php:129
+#: twitter.php:157
+msgid "Twitter Posting Settings"
+msgstr "Paramètres Twitter de publication"
+
+#: twitter.php:164
+msgid ""
+"No consumer key pair for Twitter found. Please contact your site "
+"administrator."
+msgstr ""
+
+#: twitter.php:183
+msgid ""
+"At this Friendica instance the Twitter addon was enabled but you have not "
+"yet connected your account to your Twitter account. To do so click the "
+"button below to get a PIN from Twitter which you have to copy into the input"
+" box below and submit the form. Only your <strong>public</strong> posts will"
+" be posted to Twitter."
+msgstr ""
+
+#: twitter.php:184
+msgid "Log in with Twitter"
+msgstr "Se connecter avec Twitter"
+
+#: twitter.php:186
+msgid "Copy the PIN from Twitter here"
+msgstr "Copier le PIN de Twitter ici"
+
+#: twitter.php:191 twitter.php:229 twitter.php:556
+msgid "Submit"
+msgstr "Soumettre"
+
+#: twitter.php:200
+msgid "Currently connected to: "
+msgstr "Actuellement connecté à :"
+
+#: twitter.php:201
 msgid ""
 "If enabled all your <strong>public</strong> postings can be posted to the "
 "associated Twitter account. You can choose to do so by default (here) or for"
 " every posting separately in the posting options when writing the entry."
-msgstr "En cas d'activation, toutes vos publications <strong>publiques</strong> seront transmises au compte Twitter associé. Vous pourrez choisir de le faire par défaut (ici), ou bien pour chaque publication séparément lors de sa rédaction."
+msgstr ""
 
-#: twitter.php:130
-msgid "Send public postings to Twitter by default"
-msgstr "Envoyer par défaut les publications publiques sur Twitter"
-
-#: twitter.php:131
-msgid "API Key"
-msgstr "Clé API"
-
-#: twitter.php:132
-msgid "API Secret"
-msgstr "Secret API"
-
-#: twitter.php:133
-msgid "Access Token"
-msgstr "Token Accès"
-
-#: twitter.php:134
-msgid "Access Secret"
-msgstr "Secret Accès"
-
-#: twitter.php:135
+#: twitter.php:203
 msgid ""
-"Each user needs to register their own app to be able to post to Twitter. "
-"Please visit https://developer.twitter.com/en/portal/projects-and-apps to "
-"register a project. Inside the project you then have to register an app. You"
-" will find the needed data for the connector on the page \"Keys and token\" "
-"in the app settings."
-msgstr "Chaque utilisateur doit enregistrer sa propre application pour pouvoir publier des messages sur Twitter. Allez sur https://developer.twitter.com/en/portal/projects-and-apps pour enregistrer un projet. Dans le projet, vous devez ensuite enregistrer une application. Vous trouverez les données nécessaires pour le connecteur sur la page \"Keys and token\" dans les paramètres de l'application."
+"<strong>Note</strong>: Due your privacy settings (<em>Hide your profile "
+"details from unknown viewers?</em>) the link potentially included in public "
+"postings relayed to Twitter will lead the visitor to a blank page informing "
+"the visitor that the access to your profile has been restricted."
+msgstr ""
 
-#: twitter.php:136
-msgid "Last Status Summary"
-msgstr "Résumé du dernier statut"
+#: twitter.php:206
+msgid "Allow posting to Twitter"
+msgstr "Autoriser la publication sur Twitter"
 
-#: twitter.php:137
-msgid "Last Status Content"
-msgstr "Contenu du dernier statut"
+#: twitter.php:209
+msgid "Send public postings to Twitter by default"
+msgstr "Envoyer par défaut les messages publics sur Twitter"
 
-#: twitter.php:142
-msgid "Twitter Export"
-msgstr "Export Twitter"
+#: twitter.php:213
+msgid "Mirror all posts from twitter that are no replies or retweets"
+msgstr ""
+
+#: twitter.php:217
+msgid "Shortening method that optimizes the tweet"
+msgstr ""
+
+#: twitter.php:221
+msgid "Send linked #-tags and @-names to Twitter"
+msgstr ""
+
+#: twitter.php:226
+msgid "Clear OAuth configuration"
+msgstr ""
+
+#: twitter.php:550
+msgid "Settings updated."
+msgstr "Paramètres mis à jour."
+
+#: twitter.php:558
+msgid "Consumer key"
+msgstr ""
+
+#: twitter.php:559
+msgid "Consumer secret"
+msgstr ""
+
+#: twitter.php:560
+msgid "Name of the Twitter Application"
+msgstr "Nom de l'application Twitter"
+
+#: twitter.php:560
+msgid ""
+"set this to avoid mirroring postings from ~friendica back to ~friendica"
+msgstr ""
diff --git a/twitter/lang/fr/strings.php b/twitter/lang/fr/strings.php
index d75116e9..d79c5cf9 100644
--- a/twitter/lang/fr/strings.php
+++ b/twitter/lang/fr/strings.php
@@ -2,19 +2,28 @@
 
 if(! function_exists("string_plural_select_fr")) {
 function string_plural_select_fr($n){
-	$n = intval($n);
-	if (($n == 0 || $n == 1)) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
+	return ($n > 1);;
 }}
-$a->strings['Post to Twitter'] = 'Publier sur Twitter';
-$a->strings['No status.'] = 'Aucun statut';
-$a->strings['Allow posting to Twitter'] = 'Autoriser la publication sur Twitter';
-$a->strings['If enabled all your <strong>public</strong> postings can be posted to the associated Twitter account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry.'] = 'En cas d\'activation, toutes vos publications <strong>publiques</strong> seront transmises au compte Twitter associé. Vous pourrez choisir de le faire par défaut (ici), ou bien pour chaque publication séparément lors de sa rédaction.';
-$a->strings['Send public postings to Twitter by default'] = 'Envoyer par défaut les publications publiques sur Twitter';
-$a->strings['API Key'] = 'Clé API';
-$a->strings['API Secret'] = 'Secret API';
-$a->strings['Access Token'] = 'Token Accès';
-$a->strings['Access Secret'] = 'Secret Accès';
-$a->strings['Each user needs to register their own app to be able to post to Twitter. Please visit https://developer.twitter.com/en/portal/projects-and-apps to register a project. Inside the project you then have to register an app. You will find the needed data for the connector on the page "Keys and token" in the app settings.'] = 'Chaque utilisateur doit enregistrer sa propre application pour pouvoir publier des messages sur Twitter. Allez sur https://developer.twitter.com/en/portal/projects-and-apps pour enregistrer un projet. Dans le projet, vous devez ensuite enregistrer une application. Vous trouverez les données nécessaires pour le connecteur sur la page "Keys and token" dans les paramètres de l\'application.';
-$a->strings['Last Status Summary'] = 'Résumé du dernier statut';
-$a->strings['Last Status Content'] = 'Contenu du dernier statut';
-$a->strings['Twitter Export'] = 'Export Twitter';
+;
+$a->strings["Post to Twitter"] = "Publier sur Twitter";
+$a->strings["Twitter settings updated."] = "Paramètres Twitter mis à jour.";
+$a->strings["Twitter Posting Settings"] = "Paramètres Twitter de publication";
+$a->strings["No consumer key pair for Twitter found. Please contact your site administrator."] = "";
+$a->strings["At this Friendica instance the Twitter addon was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to Twitter."] = "";
+$a->strings["Log in with Twitter"] = "Se connecter avec Twitter";
+$a->strings["Copy the PIN from Twitter here"] = "Copier le PIN de Twitter ici";
+$a->strings["Submit"] = "Soumettre";
+$a->strings["Currently connected to: "] = "Actuellement connecté à :";
+$a->strings["If enabled all your <strong>public</strong> postings can be posted to the associated Twitter account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "";
+$a->strings["<strong>Note</strong>: Due your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "";
+$a->strings["Allow posting to Twitter"] = "Autoriser la publication sur Twitter";
+$a->strings["Send public postings to Twitter by default"] = "Envoyer par défaut les messages publics sur Twitter";
+$a->strings["Mirror all posts from twitter that are no replies or retweets"] = "";
+$a->strings["Shortening method that optimizes the tweet"] = "";
+$a->strings["Send linked #-tags and @-names to Twitter"] = "";
+$a->strings["Clear OAuth configuration"] = "";
+$a->strings["Settings updated."] = "Paramètres mis à jour.";
+$a->strings["Consumer key"] = "";
+$a->strings["Consumer secret"] = "";
+$a->strings["Name of the Twitter Application"] = "Nom de l'application Twitter";
+$a->strings["set this to avoid mirroring postings from ~friendica back to ~friendica"] = "";
diff --git a/twitter/lang/hu/messages.po b/twitter/lang/hu/messages.po
deleted file mode 100644
index a42e3327..00000000
--- a/twitter/lang/hu/messages.po
+++ /dev/null
@@ -1,80 +0,0 @@
-# ADDON twitter
-# Copyright (C)
-# This file is distributed under the same license as the Friendica twitter addon package.
-# 
-# 
-# Translators:
-# Balázs Úr, 2020-2023
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-08-16 03:27+0000\n"
-"PO-Revision-Date: 2014-06-23 12:58+0000\n"
-"Last-Translator: Balázs Úr, 2020-2023\n"
-"Language-Team: Hungarian (http://app.transifex.com/Friendica/friendica/language/hu/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: hu\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: twitter.php:84
-msgid "Post to Twitter"
-msgstr "Beküldés a Twitterre"
-
-#: twitter.php:123
-msgid "No status."
-msgstr "Nincs állapot."
-
-#: twitter.php:129
-msgid "Allow posting to Twitter"
-msgstr "Beküldés engedélyezése a Twitterre"
-
-#: twitter.php:129
-msgid ""
-"If enabled all your <strong>public</strong> postings can be posted to the "
-"associated Twitter account. You can choose to do so by default (here) or for"
-" every posting separately in the posting options when writing the entry."
-msgstr "Ha engedélyezve van, akkor az összes <strong>nyilvános</strong> beküldés beküldhető a hozzárendelt Twitter-fiókba. Kiválaszthatja, hogy ezt alapértelmezetten szeretné-e (itt), vagy minden egyes beküldésnél különállóan a beküldési beállításokban, amikor megírja a bejegyzést."
-
-#: twitter.php:130
-msgid "Send public postings to Twitter by default"
-msgstr "Nyilvános beküldések küldése a Twitterre alapértelmezetten"
-
-#: twitter.php:131
-msgid "API Key"
-msgstr "API-kulcs"
-
-#: twitter.php:132
-msgid "API Secret"
-msgstr "API-titok"
-
-#: twitter.php:133
-msgid "Access Token"
-msgstr "Hozzáférési token"
-
-#: twitter.php:134
-msgid "Access Secret"
-msgstr "Hozzáférési titok"
-
-#: twitter.php:135
-msgid ""
-"Each user needs to register their own app to be able to post to Twitter. "
-"Please visit https://developer.twitter.com/en/portal/projects-and-apps to "
-"register a project. Inside the project you then have to register an app. You"
-" will find the needed data for the connector on the page \"Keys and token\" "
-"in the app settings."
-msgstr "Minden felhasználónak regisztrálnia kell a saját alkalmazását, hogy bejegyzést küldhessen a Twitterre. Látogassa meg a https://developer.twitter.com/en/portal/projects-and-apps oldalt egy projekt regisztrálásához. A projekten belül ezután regisztrálnia kell egy alkalmazást. A csatlakozóhoz szükséges adatokat a „Kulcsok és token” oldalon találja az alkalmazás beállításaiban."
-
-#: twitter.php:136
-msgid "Last Status Summary"
-msgstr "Utolsó állapot összegzése"
-
-#: twitter.php:137
-msgid "Last Status Content"
-msgstr "Utolsó állapot tartalma"
-
-#: twitter.php:142
-msgid "Twitter Export"
-msgstr "Twitter exportálás"
diff --git a/twitter/lang/hu/strings.php b/twitter/lang/hu/strings.php
deleted file mode 100644
index 8e2a5084..00000000
--- a/twitter/lang/hu/strings.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_hu")) {
-function string_plural_select_hu($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Post to Twitter'] = 'Beküldés a Twitterre';
-$a->strings['No status.'] = 'Nincs állapot.';
-$a->strings['Allow posting to Twitter'] = 'Beküldés engedélyezése a Twitterre';
-$a->strings['If enabled all your <strong>public</strong> postings can be posted to the associated Twitter account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry.'] = 'Ha engedélyezve van, akkor az összes <strong>nyilvános</strong> beküldés beküldhető a hozzárendelt Twitter-fiókba. Kiválaszthatja, hogy ezt alapértelmezetten szeretné-e (itt), vagy minden egyes beküldésnél különállóan a beküldési beállításokban, amikor megírja a bejegyzést.';
-$a->strings['Send public postings to Twitter by default'] = 'Nyilvános beküldések küldése a Twitterre alapértelmezetten';
-$a->strings['API Key'] = 'API-kulcs';
-$a->strings['API Secret'] = 'API-titok';
-$a->strings['Access Token'] = 'Hozzáférési token';
-$a->strings['Access Secret'] = 'Hozzáférési titok';
-$a->strings['Each user needs to register their own app to be able to post to Twitter. Please visit https://developer.twitter.com/en/portal/projects-and-apps to register a project. Inside the project you then have to register an app. You will find the needed data for the connector on the page "Keys and token" in the app settings.'] = 'Minden felhasználónak regisztrálnia kell a saját alkalmazását, hogy bejegyzést küldhessen a Twitterre. Látogassa meg a https://developer.twitter.com/en/portal/projects-and-apps oldalt egy projekt regisztrálásához. A projekten belül ezután regisztrálnia kell egy alkalmazást. A csatlakozóhoz szükséges adatokat a „Kulcsok és token” oldalon találja az alkalmazás beállításaiban.';
-$a->strings['Last Status Summary'] = 'Utolsó állapot összegzése';
-$a->strings['Last Status Content'] = 'Utolsó állapot tartalma';
-$a->strings['Twitter Export'] = 'Twitter exportálás';
diff --git a/twitter/lang/it/messages.po b/twitter/lang/it/messages.po
index dfb7adb2..7ce7330a 100644
--- a/twitter/lang/it/messages.po
+++ b/twitter/lang/it/messages.po
@@ -5,77 +5,130 @@
 # 
 # Translators:
 # fabrixxm <fabrix.xm@gmail.com>, 2014-2015,2018
-# Sylke Vicious <silkevicious@gmail.com>, 2020
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-08-16 03:27+0000\n"
-"PO-Revision-Date: 2014-06-23 12:58+0000\n"
-"Last-Translator: Sylke Vicious <silkevicious@gmail.com>, 2020\n"
-"Language-Team: Italian (http://app.transifex.com/Friendica/friendica/language/it/)\n"
+"POT-Creation-Date: 2018-06-02 10:25+0700\n"
+"PO-Revision-Date: 2018-06-06 15:03+0000\n"
+"Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n"
+"Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: it\n"
-"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: twitter.php:84
+#: twitter.php:195
 msgid "Post to Twitter"
 msgstr "Invia a Twitter"
 
-#: twitter.php:123
-msgid "No status."
-msgstr ""
+#: twitter.php:236
+msgid ""
+"You submitted an empty PIN, please Sign In with Twitter again to get a new "
+"one."
+msgstr "Hai inserito un PIN vuoto, autenticati con Twitter nuovamente per averne uno nuovo."
 
-#: twitter.php:129
+#: twitter.php:263
+msgid "Twitter settings updated."
+msgstr "Impostazioni di Twitter aggiornate."
+
+#: twitter.php:293 twitter.php:297
+msgid "Twitter Import/Export/Mirror"
+msgstr "Importa/Esporta/Clona Twitter"
+
+#: twitter.php:304
+msgid ""
+"No consumer key pair for Twitter found. Please contact your site "
+"administrator."
+msgstr "Nessuna coppia di chiavi per Twitter trovata. Contatta l'amministratore del sito."
+
+#: twitter.php:316
+msgid ""
+"At this Friendica instance the Twitter addon was enabled but you have not "
+"yet connected your account to your Twitter account. To do so click the "
+"button below to get a PIN from Twitter which you have to copy into the input"
+" box below and submit the form. Only your <strong>public</strong> posts will"
+" be posted to Twitter."
+msgstr "Il componente aggiuntivo Twitter è abilitato ma non hai ancora collegato i tuoi account Friendica e Twitter. Per farlo, clicca il bottone qui sotto per ricevere un PIN da Twitter che dovrai copiare nel campo qui sotto. Solo i tuoi post <strong>pubblici</strong> saranno inviati a Twitter."
+
+#: twitter.php:317
+msgid "Log in with Twitter"
+msgstr "Accedi con Twitter"
+
+#: twitter.php:319
+msgid "Copy the PIN from Twitter here"
+msgstr "Copia il PIN da Twitter qui"
+
+#: twitter.php:324 twitter.php:366 twitter.php:636
+msgid "Save Settings"
+msgstr "Salva Impostazioni"
+
+#: twitter.php:336
+msgid "Currently connected to: "
+msgstr "Al momento connesso con:"
+
+#: twitter.php:337
+msgid "Disconnect"
+msgstr "Disconnetti"
+
+#: twitter.php:347
 msgid "Allow posting to Twitter"
 msgstr "Permetti l'invio a Twitter"
 
-#: twitter.php:129
+#: twitter.php:347
 msgid ""
 "If enabled all your <strong>public</strong> postings can be posted to the "
 "associated Twitter account. You can choose to do so by default (here) or for"
 " every posting separately in the posting options when writing the entry."
 msgstr "Se abilitato tutti i tuoi messaggi <strong>pubblici</strong> possono essere inviati all'account Twitter associato. Puoi scegliere di farlo sempre (qui) o ogni volta che invii, nelle impostazioni di privacy del messaggio."
 
-#: twitter.php:130
+#: twitter.php:350
+msgid ""
+"<strong>Note</strong>: Due to your privacy settings (<em>Hide your profile "
+"details from unknown viewers?</em>) the link potentially included in public "
+"postings relayed to Twitter will lead the visitor to a blank page informing "
+"the visitor that the access to your profile has been restricted."
+msgstr "<strong>Nota</strong>: A causa delle tue impostazioni di privacy(<em>Nascondi i dettagli del tuo profilo ai visitatori sconosciuti?</em>) il link potenzialmente incluso nei messaggi pubblici inviati a Twitter porterà i visitatori a una pagina bianca con una nota che li informa che l'accesso al tuo profilo è stato limitato."
+
+#: twitter.php:353
 msgid "Send public postings to Twitter by default"
 msgstr "Invia sempre i messaggi pubblici a Twitter"
 
-#: twitter.php:131
-msgid "API Key"
-msgstr ""
+#: twitter.php:356
+msgid "Mirror all posts from twitter that are no replies"
+msgstr "Clona tutti i messaggi da Twitter che non sono risposte"
 
-#: twitter.php:132
-msgid "API Secret"
-msgstr ""
+#: twitter.php:359
+msgid "Import the remote timeline"
+msgstr "Importa la timeline remota"
 
-#: twitter.php:133
-msgid "Access Token"
-msgstr ""
+#: twitter.php:362
+msgid "Automatically create contacts"
+msgstr "Crea automaticamente i contatti"
 
-#: twitter.php:134
-msgid "Access Secret"
-msgstr ""
-
-#: twitter.php:135
+#: twitter.php:362
 msgid ""
-"Each user needs to register their own app to be able to post to Twitter. "
-"Please visit https://developer.twitter.com/en/portal/projects-and-apps to "
-"register a project. Inside the project you then have to register an app. You"
-" will find the needed data for the connector on the page \"Keys and token\" "
-"in the app settings."
-msgstr ""
+"This will automatically create a contact in Friendica as soon as you receive"
+" a message from an existing contact via the Twitter network. If you do not "
+"enable this, you need to manually add those Twitter contacts in Friendica "
+"from whom you would like to see posts here. However if enabled, you cannot "
+"merely remove a twitter contact from the Friendica contact list, as it will "
+"recreate this contact when they post again."
+msgstr "Questo creerà automaticamente un contatto in Friendica appena ricevi un messaggio da un tuo contatto sulla rete Twitter. Se non abiliti questa opzione, dovrai aggiungere a mano in Friendica i contatti Twitter da cui vuoi ricevere i messaggi. Se abilitato, pero', non potrai semplicemente rimuovere un contatto Twitter dal tuo elenco contatti su Friendica, dato che questo sarà ricreato la prossima volta che invierà un messaggio."
 
-#: twitter.php:136
-msgid "Last Status Summary"
-msgstr ""
+#: twitter.php:614
+msgid "Twitter post failed. Queued for retry."
+msgstr "Invio a Twitter fallito. In coda per riprovare."
 
-#: twitter.php:137
-msgid "Last Status Content"
-msgstr ""
+#: twitter.php:628
+msgid "Settings updated."
+msgstr "Impostazioni aggiornate."
 
-#: twitter.php:142
-msgid "Twitter Export"
-msgstr ""
+#: twitter.php:638
+msgid "Consumer key"
+msgstr "Consumer key"
+
+#: twitter.php:639
+msgid "Consumer secret"
+msgstr "Consumer secret"
diff --git a/twitter/lang/it/strings.php b/twitter/lang/it/strings.php
index f744c242..deb5b4c1 100644
--- a/twitter/lang/it/strings.php
+++ b/twitter/lang/it/strings.php
@@ -3,9 +3,29 @@
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
 	$n = intval($n);
-	if ($n == 1) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
+	return ($n != 1);;
 }}
-$a->strings['Post to Twitter'] = 'Invia a Twitter';
-$a->strings['Allow posting to Twitter'] = 'Permetti l\'invio a Twitter';
-$a->strings['If enabled all your <strong>public</strong> postings can be posted to the associated Twitter account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry.'] = 'Se abilitato tutti i tuoi messaggi <strong>pubblici</strong> possono essere inviati all\'account Twitter associato. Puoi scegliere di farlo sempre (qui) o ogni volta che invii, nelle impostazioni di privacy del messaggio.';
-$a->strings['Send public postings to Twitter by default'] = 'Invia sempre i messaggi pubblici a Twitter';
+;
+$a->strings["Post to Twitter"] = "Invia a Twitter";
+$a->strings["You submitted an empty PIN, please Sign In with Twitter again to get a new one."] = "Hai inserito un PIN vuoto, autenticati con Twitter nuovamente per averne uno nuovo.";
+$a->strings["Twitter settings updated."] = "Impostazioni di Twitter aggiornate.";
+$a->strings["Twitter Import/Export/Mirror"] = "Importa/Esporta/Clona Twitter";
+$a->strings["No consumer key pair for Twitter found. Please contact your site administrator."] = "Nessuna coppia di chiavi per Twitter trovata. Contatta l'amministratore del sito.";
+$a->strings["At this Friendica instance the Twitter addon was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to Twitter."] = "Il componente aggiuntivo Twitter è abilitato ma non hai ancora collegato i tuoi account Friendica e Twitter. Per farlo, clicca il bottone qui sotto per ricevere un PIN da Twitter che dovrai copiare nel campo qui sotto. Solo i tuoi post <strong>pubblici</strong> saranno inviati a Twitter.";
+$a->strings["Log in with Twitter"] = "Accedi con Twitter";
+$a->strings["Copy the PIN from Twitter here"] = "Copia il PIN da Twitter qui";
+$a->strings["Save Settings"] = "Salva Impostazioni";
+$a->strings["Currently connected to: "] = "Al momento connesso con:";
+$a->strings["Disconnect"] = "Disconnetti";
+$a->strings["Allow posting to Twitter"] = "Permetti l'invio a Twitter";
+$a->strings["If enabled all your <strong>public</strong> postings can be posted to the associated Twitter account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "Se abilitato tutti i tuoi messaggi <strong>pubblici</strong> possono essere inviati all'account Twitter associato. Puoi scegliere di farlo sempre (qui) o ogni volta che invii, nelle impostazioni di privacy del messaggio.";
+$a->strings["<strong>Note</strong>: Due to your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "<strong>Nota</strong>: A causa delle tue impostazioni di privacy(<em>Nascondi i dettagli del tuo profilo ai visitatori sconosciuti?</em>) il link potenzialmente incluso nei messaggi pubblici inviati a Twitter porterà i visitatori a una pagina bianca con una nota che li informa che l'accesso al tuo profilo è stato limitato.";
+$a->strings["Send public postings to Twitter by default"] = "Invia sempre i messaggi pubblici a Twitter";
+$a->strings["Mirror all posts from twitter that are no replies"] = "Clona tutti i messaggi da Twitter che non sono risposte";
+$a->strings["Import the remote timeline"] = "Importa la timeline remota";
+$a->strings["Automatically create contacts"] = "Crea automaticamente i contatti";
+$a->strings["This will automatically create a contact in Friendica as soon as you receive a message from an existing contact via the Twitter network. If you do not enable this, you need to manually add those Twitter contacts in Friendica from whom you would like to see posts here. However if enabled, you cannot merely remove a twitter contact from the Friendica contact list, as it will recreate this contact when they post again."] = "Questo creerà automaticamente un contatto in Friendica appena ricevi un messaggio da un tuo contatto sulla rete Twitter. Se non abiliti questa opzione, dovrai aggiungere a mano in Friendica i contatti Twitter da cui vuoi ricevere i messaggi. Se abilitato, pero', non potrai semplicemente rimuovere un contatto Twitter dal tuo elenco contatti su Friendica, dato che questo sarà ricreato la prossima volta che invierà un messaggio.";
+$a->strings["Twitter post failed. Queued for retry."] = "Invio a Twitter fallito. In coda per riprovare.";
+$a->strings["Settings updated."] = "Impostazioni aggiornate.";
+$a->strings["Consumer key"] = "Consumer key";
+$a->strings["Consumer secret"] = "Consumer secret";
diff --git a/twitter/lang/ja/messages.po b/twitter/lang/ja/messages.po
index f65c86c1..bec72954 100644
--- a/twitter/lang/ja/messages.po
+++ b/twitter/lang/ja/messages.po
@@ -4,77 +4,130 @@
 # 
 # 
 # Translators:
-# daingewuvzeevisiddfddd, 2021
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-08-16 03:27+0000\n"
-"PO-Revision-Date: 2014-06-23 12:58+0000\n"
-"Last-Translator: daingewuvzeevisiddfddd, 2021\n"
-"Language-Team: Japanese (http://app.transifex.com/Friendica/friendica/language/ja/)\n"
+"POT-Creation-Date: 2018-06-02 10:25+0700\n"
+"PO-Revision-Date: 2019-08-28 10:37+0000\n"
+"Last-Translator: Ozero Dien <rgfx0020+misc@gmail.com>\n"
+"Language-Team: Japanese (http://www.transifex.com/Friendica/friendica/language/ja/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ja\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: twitter.php:84
+#: twitter.php:195
 msgid "Post to Twitter"
 msgstr "Twitterに投稿"
 
-#: twitter.php:123
-msgid "No status."
-msgstr ""
+#: twitter.php:236
+msgid ""
+"You submitted an empty PIN, please Sign In with Twitter again to get a new "
+"one."
+msgstr "空のPINを送信しました。もう一度Twitterでサインインして新しいPINを取得してください。"
 
-#: twitter.php:129
+#: twitter.php:263
+msgid "Twitter settings updated."
+msgstr "Twitter設定が更新されました。"
+
+#: twitter.php:293 twitter.php:297
+msgid "Twitter Import/Export/Mirror"
+msgstr "Twitterインポート/エクスポート/ミラー"
+
+#: twitter.php:304
+msgid ""
+"No consumer key pair for Twitter found. Please contact your site "
+"administrator."
+msgstr "Twitterのコンシューマキーペアが見つかりません。サイト管理者に連絡してください。"
+
+#: twitter.php:316
+msgid ""
+"At this Friendica instance the Twitter addon was enabled but you have not "
+"yet connected your account to your Twitter account. To do so click the "
+"button below to get a PIN from Twitter which you have to copy into the input"
+" box below and submit the form. Only your <strong>public</strong> posts will"
+" be posted to Twitter."
+msgstr "このFriendicaインスタンスでは、Twitterアドオンは有効になっていますが、アカウントをTwitterアカウントにまだ接続していません。これを行うには、下のボタンをクリックしてTwitterからPINを取得し、それを下の入力ボックスにコピーしてフォームを送信する必要があります。 <strong>一般公開</strong>投稿のみがTwitterに投稿されます。"
+
+#: twitter.php:317
+msgid "Log in with Twitter"
+msgstr "Twitterでログイン"
+
+#: twitter.php:319
+msgid "Copy the PIN from Twitter here"
+msgstr "ここからTwitterからPINをコピーします"
+
+#: twitter.php:324 twitter.php:366 twitter.php:636
+msgid "Save Settings"
+msgstr "設定を保存する"
+
+#: twitter.php:336
+msgid "Currently connected to: "
+msgstr "現在接続中："
+
+#: twitter.php:337
+msgid "Disconnect"
+msgstr "切断する"
+
+#: twitter.php:347
 msgid "Allow posting to Twitter"
 msgstr "Twitterへの投稿を許可する"
 
-#: twitter.php:129
+#: twitter.php:347
 msgid ""
 "If enabled all your <strong>public</strong> postings can be posted to the "
 "associated Twitter account. You can choose to do so by default (here) or for"
 " every posting separately in the posting options when writing the entry."
 msgstr "有効にすると、すべての<strong>一般公開</strong>投稿を、関連づけたTwitterアカウントに投稿できます。デフォルト（ここ）で行うか、エントリを書き込む際に投稿オプションですべての投稿を個別に行うかを選択できます。"
 
-#: twitter.php:130
+#: twitter.php:350
+msgid ""
+"<strong>Note</strong>: Due to your privacy settings (<em>Hide your profile "
+"details from unknown viewers?</em>) the link potentially included in public "
+"postings relayed to Twitter will lead the visitor to a blank page informing "
+"the visitor that the access to your profile has been restricted."
+msgstr "<strong>注</strong>：プライバシー設定（<em>未知の視聴者からプロフィールの詳細を非表示にしますか？</em>）により、Twitterに中継・公開される投稿内のリンクは、プロフィールへのアクセスが制限されている訪問者に対して空白ページを表示します。"
+
+#: twitter.php:353
 msgid "Send public postings to Twitter by default"
 msgstr "デフォルトでTwitterに一般公開投稿を送信する"
 
-#: twitter.php:131
-msgid "API Key"
-msgstr ""
+#: twitter.php:356
+msgid "Mirror all posts from twitter that are no replies"
+msgstr "返信がないTwitterのすべての投稿をミラーリングする"
 
-#: twitter.php:132
-msgid "API Secret"
-msgstr ""
+#: twitter.php:359
+msgid "Import the remote timeline"
+msgstr "リモートタイムラインをインポートする"
 
-#: twitter.php:133
-msgid "Access Token"
-msgstr ""
+#: twitter.php:362
+msgid "Automatically create contacts"
+msgstr "連絡先を自動的に作成する"
 
-#: twitter.php:134
-msgid "Access Secret"
-msgstr ""
-
-#: twitter.php:135
+#: twitter.php:362
 msgid ""
-"Each user needs to register their own app to be able to post to Twitter. "
-"Please visit https://developer.twitter.com/en/portal/projects-and-apps to "
-"register a project. Inside the project you then have to register an app. You"
-" will find the needed data for the connector on the page \"Keys and token\" "
-"in the app settings."
-msgstr ""
+"This will automatically create a contact in Friendica as soon as you receive"
+" a message from an existing contact via the Twitter network. If you do not "
+"enable this, you need to manually add those Twitter contacts in Friendica "
+"from whom you would like to see posts here. However if enabled, you cannot "
+"merely remove a twitter contact from the Friendica contact list, as it will "
+"recreate this contact when they post again."
+msgstr "これにより、Twitterネットワーク経由で既存の連絡先からメッセージを受信するとすぐに、Friendicaに連絡先が自動的に作成されます。これを有効にしない場合、ここで投稿を表示するFriendicaのTwitter連絡先を手動で追加する必要があります。ただし、有効にした場合、Twitterの連絡先をFriendicaの連絡先リストから単に削除することはできません。再送信するとこの連絡先が再作成されるためです。"
 
-#: twitter.php:136
-msgid "Last Status Summary"
-msgstr ""
+#: twitter.php:614
+msgid "Twitter post failed. Queued for retry."
+msgstr "Twitterの投稿に失敗しました。再試行のためにキューに入れられました。"
 
-#: twitter.php:137
-msgid "Last Status Content"
-msgstr ""
+#: twitter.php:628
+msgid "Settings updated."
+msgstr "設定が更新されました。"
 
-#: twitter.php:142
-msgid "Twitter Export"
-msgstr ""
+#: twitter.php:638
+msgid "Consumer key"
+msgstr "コンシューマ キー"
+
+#: twitter.php:639
+msgid "Consumer secret"
+msgstr "コンシューマ シークレット"
diff --git a/twitter/lang/ja/strings.php b/twitter/lang/ja/strings.php
index 9fda4106..f30a36fa 100644
--- a/twitter/lang/ja/strings.php
+++ b/twitter/lang/ja/strings.php
@@ -3,9 +3,29 @@
 if(! function_exists("string_plural_select_ja")) {
 function string_plural_select_ja($n){
 	$n = intval($n);
-	return intval(0);
+	return 0;;
 }}
-$a->strings['Post to Twitter'] = 'Twitterに投稿';
-$a->strings['Allow posting to Twitter'] = 'Twitterへの投稿を許可する';
-$a->strings['If enabled all your <strong>public</strong> postings can be posted to the associated Twitter account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry.'] = '有効にすると、すべての<strong>一般公開</strong>投稿を、関連づけたTwitterアカウントに投稿できます。デフォルト（ここ）で行うか、エントリを書き込む際に投稿オプションですべての投稿を個別に行うかを選択できます。';
-$a->strings['Send public postings to Twitter by default'] = 'デフォルトでTwitterに一般公開投稿を送信する';
+;
+$a->strings["Post to Twitter"] = "Twitterに投稿";
+$a->strings["You submitted an empty PIN, please Sign In with Twitter again to get a new one."] = "空のPINを送信しました。もう一度Twitterでサインインして新しいPINを取得してください。";
+$a->strings["Twitter settings updated."] = "Twitter設定が更新されました。";
+$a->strings["Twitter Import/Export/Mirror"] = "Twitterインポート/エクスポート/ミラー";
+$a->strings["No consumer key pair for Twitter found. Please contact your site administrator."] = "Twitterのコンシューマキーペアが見つかりません。サイト管理者に連絡してください。";
+$a->strings["At this Friendica instance the Twitter addon was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to Twitter."] = "このFriendicaインスタンスでは、Twitterアドオンは有効になっていますが、アカウントをTwitterアカウントにまだ接続していません。これを行うには、下のボタンをクリックしてTwitterからPINを取得し、それを下の入力ボックスにコピーしてフォームを送信する必要があります。 <strong>一般公開</strong>投稿のみがTwitterに投稿されます。";
+$a->strings["Log in with Twitter"] = "Twitterでログイン";
+$a->strings["Copy the PIN from Twitter here"] = "ここからTwitterからPINをコピーします";
+$a->strings["Save Settings"] = "設定を保存する";
+$a->strings["Currently connected to: "] = "現在接続中：";
+$a->strings["Disconnect"] = "切断する";
+$a->strings["Allow posting to Twitter"] = "Twitterへの投稿を許可する";
+$a->strings["If enabled all your <strong>public</strong> postings can be posted to the associated Twitter account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "有効にすると、すべての<strong>一般公開</strong>投稿を、関連づけたTwitterアカウントに投稿できます。デフォルト（ここ）で行うか、エントリを書き込む際に投稿オプションですべての投稿を個別に行うかを選択できます。";
+$a->strings["<strong>Note</strong>: Due to your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "<strong>注</strong>：プライバシー設定（<em>未知の視聴者からプロフィールの詳細を非表示にしますか？</em>）により、Twitterに中継・公開される投稿内のリンクは、プロフィールへのアクセスが制限されている訪問者に対して空白ページを表示します。";
+$a->strings["Send public postings to Twitter by default"] = "デフォルトでTwitterに一般公開投稿を送信する";
+$a->strings["Mirror all posts from twitter that are no replies"] = "返信がないTwitterのすべての投稿をミラーリングする";
+$a->strings["Import the remote timeline"] = "リモートタイムラインをインポートする";
+$a->strings["Automatically create contacts"] = "連絡先を自動的に作成する";
+$a->strings["This will automatically create a contact in Friendica as soon as you receive a message from an existing contact via the Twitter network. If you do not enable this, you need to manually add those Twitter contacts in Friendica from whom you would like to see posts here. However if enabled, you cannot merely remove a twitter contact from the Friendica contact list, as it will recreate this contact when they post again."] = "これにより、Twitterネットワーク経由で既存の連絡先からメッセージを受信するとすぐに、Friendicaに連絡先が自動的に作成されます。これを有効にしない場合、ここで投稿を表示するFriendicaのTwitter連絡先を手動で追加する必要があります。ただし、有効にした場合、Twitterの連絡先をFriendicaの連絡先リストから単に削除することはできません。再送信するとこの連絡先が再作成されるためです。";
+$a->strings["Twitter post failed. Queued for retry."] = "Twitterの投稿に失敗しました。再試行のためにキューに入れられました。";
+$a->strings["Settings updated."] = "設定が更新されました。";
+$a->strings["Consumer key"] = "コンシューマ キー";
+$a->strings["Consumer secret"] = "コンシューマ シークレット";
diff --git a/twitter/lang/nl/messages.po b/twitter/lang/nl/messages.po
index d1f397ae..b0af4dc9 100644
--- a/twitter/lang/nl/messages.po
+++ b/twitter/lang/nl/messages.po
@@ -9,72 +9,126 @@ msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-08-16 03:27+0000\n"
-"PO-Revision-Date: 2014-06-23 12:58+0000\n"
-"Last-Translator: Jeroen De Meerleer <me@jeroened.be>, 2018\n"
-"Language-Team: Dutch (http://app.transifex.com/Friendica/friendica/language/nl/)\n"
+"POT-Creation-Date: 2018-06-02 10:25+0700\n"
+"PO-Revision-Date: 2018-08-24 13:56+0000\n"
+"Last-Translator: Jeroen De Meerleer <me@jeroened.be>\n"
+"Language-Team: Dutch (http://www.transifex.com/Friendica/friendica/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: twitter.php:84
+#: twitter.php:195
 msgid "Post to Twitter"
 msgstr "Plaatsen op Twitter"
 
-#: twitter.php:123
-msgid "No status."
+#: twitter.php:236
+msgid ""
+"You submitted an empty PIN, please Sign In with Twitter again to get a new "
+"one."
 msgstr ""
 
-#: twitter.php:129
+#: twitter.php:263
+msgid "Twitter settings updated."
+msgstr "Twitter instellingen opgeslagen"
+
+#: twitter.php:293 twitter.php:297
+msgid "Twitter Import/Export/Mirror"
+msgstr "Twitter Import/Exporteren/Spiegelen"
+
+#: twitter.php:304
+msgid ""
+"No consumer key pair for Twitter found. Please contact your site "
+"administrator."
+msgstr ""
+
+#: twitter.php:316
+msgid ""
+"At this Friendica instance the Twitter addon was enabled but you have not "
+"yet connected your account to your Twitter account. To do so click the "
+"button below to get a PIN from Twitter which you have to copy into the input"
+" box below and submit the form. Only your <strong>public</strong> posts will"
+" be posted to Twitter."
+msgstr ""
+
+#: twitter.php:317
+msgid "Log in with Twitter"
+msgstr ""
+
+#: twitter.php:319
+msgid "Copy the PIN from Twitter here"
+msgstr ""
+
+#: twitter.php:324 twitter.php:366 twitter.php:636
+msgid "Save Settings"
+msgstr "Instellingen opslaan"
+
+#: twitter.php:336
+msgid "Currently connected to: "
+msgstr ""
+
+#: twitter.php:337
+msgid "Disconnect"
+msgstr ""
+
+#: twitter.php:347
 msgid "Allow posting to Twitter"
 msgstr "Plaatsen op Twitter toestaan"
 
-#: twitter.php:129
+#: twitter.php:347
 msgid ""
 "If enabled all your <strong>public</strong> postings can be posted to the "
 "associated Twitter account. You can choose to do so by default (here) or for"
 " every posting separately in the posting options when writing the entry."
 msgstr ""
 
-#: twitter.php:130
+#: twitter.php:350
+msgid ""
+"<strong>Note</strong>: Due to your privacy settings (<em>Hide your profile "
+"details from unknown viewers?</em>) the link potentially included in public "
+"postings relayed to Twitter will lead the visitor to a blank page informing "
+"the visitor that the access to your profile has been restricted."
+msgstr ""
+
+#: twitter.php:353
 msgid "Send public postings to Twitter by default"
 msgstr "Verzend publieke berichten naar Twitter als standaard instellen "
 
-#: twitter.php:131
-msgid "API Key"
+#: twitter.php:356
+msgid "Mirror all posts from twitter that are no replies"
 msgstr ""
 
-#: twitter.php:132
-msgid "API Secret"
+#: twitter.php:359
+msgid "Import the remote timeline"
 msgstr ""
 
-#: twitter.php:133
-msgid "Access Token"
+#: twitter.php:362
+msgid "Automatically create contacts"
 msgstr ""
 
-#: twitter.php:134
-msgid "Access Secret"
-msgstr ""
-
-#: twitter.php:135
+#: twitter.php:362
 msgid ""
-"Each user needs to register their own app to be able to post to Twitter. "
-"Please visit https://developer.twitter.com/en/portal/projects-and-apps to "
-"register a project. Inside the project you then have to register an app. You"
-" will find the needed data for the connector on the page \"Keys and token\" "
-"in the app settings."
+"This will automatically create a contact in Friendica as soon as you receive"
+" a message from an existing contact via the Twitter network. If you do not "
+"enable this, you need to manually add those Twitter contacts in Friendica "
+"from whom you would like to see posts here. However if enabled, you cannot "
+"merely remove a twitter contact from the Friendica contact list, as it will "
+"recreate this contact when they post again."
 msgstr ""
 
-#: twitter.php:136
-msgid "Last Status Summary"
+#: twitter.php:614
+msgid "Twitter post failed. Queued for retry."
 msgstr ""
 
-#: twitter.php:137
-msgid "Last Status Content"
+#: twitter.php:628
+msgid "Settings updated."
+msgstr "Instellingen opgeslagen"
+
+#: twitter.php:638
+msgid "Consumer key"
 msgstr ""
 
-#: twitter.php:142
-msgid "Twitter Export"
+#: twitter.php:639
+msgid "Consumer secret"
 msgstr ""
diff --git a/twitter/lang/nl/strings.php b/twitter/lang/nl/strings.php
index 41c44f25..94257ca9 100644
--- a/twitter/lang/nl/strings.php
+++ b/twitter/lang/nl/strings.php
@@ -3,8 +3,29 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Post to Twitter'] = 'Plaatsen op Twitter';
-$a->strings['Allow posting to Twitter'] = 'Plaatsen op Twitter toestaan';
-$a->strings['Send public postings to Twitter by default'] = 'Verzend publieke berichten naar Twitter als standaard instellen ';
+;
+$a->strings["Post to Twitter"] = "Plaatsen op Twitter";
+$a->strings["You submitted an empty PIN, please Sign In with Twitter again to get a new one."] = "";
+$a->strings["Twitter settings updated."] = "Twitter instellingen opgeslagen";
+$a->strings["Twitter Import/Export/Mirror"] = "Twitter Import/Exporteren/Spiegelen";
+$a->strings["No consumer key pair for Twitter found. Please contact your site administrator."] = "";
+$a->strings["At this Friendica instance the Twitter addon was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to Twitter."] = "";
+$a->strings["Log in with Twitter"] = "";
+$a->strings["Copy the PIN from Twitter here"] = "";
+$a->strings["Save Settings"] = "Instellingen opslaan";
+$a->strings["Currently connected to: "] = "";
+$a->strings["Disconnect"] = "";
+$a->strings["Allow posting to Twitter"] = "Plaatsen op Twitter toestaan";
+$a->strings["If enabled all your <strong>public</strong> postings can be posted to the associated Twitter account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "";
+$a->strings["<strong>Note</strong>: Due to your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "";
+$a->strings["Send public postings to Twitter by default"] = "Verzend publieke berichten naar Twitter als standaard instellen ";
+$a->strings["Mirror all posts from twitter that are no replies"] = "";
+$a->strings["Import the remote timeline"] = "";
+$a->strings["Automatically create contacts"] = "";
+$a->strings["This will automatically create a contact in Friendica as soon as you receive a message from an existing contact via the Twitter network. If you do not enable this, you need to manually add those Twitter contacts in Friendica from whom you would like to see posts here. However if enabled, you cannot merely remove a twitter contact from the Friendica contact list, as it will recreate this contact when they post again."] = "";
+$a->strings["Twitter post failed. Queued for retry."] = "";
+$a->strings["Settings updated."] = "Instellingen opgeslagen";
+$a->strings["Consumer key"] = "";
+$a->strings["Consumer secret"] = "";
diff --git a/twitter/lang/pl/messages.po b/twitter/lang/pl/messages.po
index 11aaef7c..5da1b6bd 100644
--- a/twitter/lang/pl/messages.po
+++ b/twitter/lang/pl/messages.po
@@ -4,78 +4,131 @@
 # 
 # 
 # Translators:
-# Piotr Strębski <strebski@gmail.com>, 2022
-# Waldemar Stoczkowski, 2018
+# Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-08-16 03:27+0000\n"
-"PO-Revision-Date: 2014-06-23 12:58+0000\n"
-"Last-Translator: Piotr Strębski <strebski@gmail.com>, 2022\n"
-"Language-Team: Polish (http://app.transifex.com/Friendica/friendica/language/pl/)\n"
+"POT-Creation-Date: 2018-06-02 10:25+0700\n"
+"PO-Revision-Date: 2018-08-04 11:52+0000\n"
+"Last-Translator: Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>\n"
+"Language-Team: Polish (http://www.transifex.com/Friendica/friendica/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pl\n"
 "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
-#: twitter.php:84
+#: twitter.php:195
 msgid "Post to Twitter"
 msgstr "Opublikuj na Twitterze"
 
-#: twitter.php:123
-msgid "No status."
-msgstr ""
+#: twitter.php:236
+msgid ""
+"You submitted an empty PIN, please Sign In with Twitter again to get a new "
+"one."
+msgstr "Przesłałeś pusty kod PIN, zaloguj się ponownie na Twitterze, aby otrzymać nowy."
 
-#: twitter.php:129
+#: twitter.php:263
+msgid "Twitter settings updated."
+msgstr "Zaktualizowano ustawienia Twitter."
+
+#: twitter.php:293 twitter.php:297
+msgid "Twitter Import/Export/Mirror"
+msgstr "Twitter Import/Export/Mirror"
+
+#: twitter.php:304
+msgid ""
+"No consumer key pair for Twitter found. Please contact your site "
+"administrator."
+msgstr "Nie znaleziono pary kluczy konsumpcyjnych dla Twittera. Skontaktuj się z administratorem witryny."
+
+#: twitter.php:316
+msgid ""
+"At this Friendica instance the Twitter addon was enabled but you have not "
+"yet connected your account to your Twitter account. To do so click the "
+"button below to get a PIN from Twitter which you have to copy into the input"
+" box below and submit the form. Only your <strong>public</strong> posts will"
+" be posted to Twitter."
+msgstr "W tej instancji Friendica dodatek do Twittera został włączony, ale jeszcze nie podłączyłeś swojego konta do konta na Twitterze. Aby to zrobić, kliknij przycisk poniżej, aby uzyskać numer PIN z Twittera, który musisz skopiować do poniższego pola wprowadzania i przesłać formularz. Tylko Twoje <strong>publiczne</strong> posty będą publikowane na Twitterze."
+
+#: twitter.php:317
+msgid "Log in with Twitter"
+msgstr "Zaloguj się przez Twitter"
+
+#: twitter.php:319
+msgid "Copy the PIN from Twitter here"
+msgstr "Skopiuj tutaj kod PIN z Twittera"
+
+#: twitter.php:324 twitter.php:366 twitter.php:636
+msgid "Save Settings"
+msgstr "Zapisz ustawienia"
+
+#: twitter.php:336
+msgid "Currently connected to: "
+msgstr "Obecnie podłączony do:"
+
+#: twitter.php:337
+msgid "Disconnect"
+msgstr "Rozłączony"
+
+#: twitter.php:347
 msgid "Allow posting to Twitter"
 msgstr "Zezwalaj na publikowanie na Twitterze"
 
-#: twitter.php:129
+#: twitter.php:347
 msgid ""
 "If enabled all your <strong>public</strong> postings can be posted to the "
 "associated Twitter account. You can choose to do so by default (here) or for"
 " every posting separately in the posting options when writing the entry."
 msgstr "Jeśli ta opcja jest włączona, wszystkie twoje <strong>publiczne</strong> ogłoszenia mogą być wysyłane na powiązane konto Twitter. Możesz to zrobić domyślnie (tutaj) lub dla każdego komentarza osobno w opcjach komentarza podczas pisania wpisu."
 
-#: twitter.php:130
+#: twitter.php:350
+msgid ""
+"<strong>Note</strong>: Due to your privacy settings (<em>Hide your profile "
+"details from unknown viewers?</em>) the link potentially included in public "
+"postings relayed to Twitter will lead the visitor to a blank page informing "
+"the visitor that the access to your profile has been restricted."
+msgstr "<strong>Uwaga</strong>: Ze względu na ustawienia prywatności (<em>Ukryć szczegóły Twojego profilu, przed nieznanymi użytkownikami?</em>) link potencjalnie zawarty w publicznych komentarzach do Twitter doprowadzi użytkownika do pustej strony informowania odwiedzających, że dostęp do Twojego profilu został ograniczony."
+
+#: twitter.php:353
 msgid "Send public postings to Twitter by default"
 msgstr "Wyślij domyślnie komentarze publiczne do Twitter"
 
-#: twitter.php:131
-msgid "API Key"
-msgstr ""
+#: twitter.php:356
+msgid "Mirror all posts from twitter that are no replies"
+msgstr "Lustro wszystkich postów Twitter, które są bez odpowiedzi"
 
-#: twitter.php:132
-msgid "API Secret"
-msgstr ""
+#: twitter.php:359
+msgid "Import the remote timeline"
+msgstr "Zaimportuj zdalną oś czasu"
 
-#: twitter.php:133
-msgid "Access Token"
-msgstr ""
+#: twitter.php:362
+msgid "Automatically create contacts"
+msgstr "Automatycznie twórz kontakty"
 
-#: twitter.php:134
-msgid "Access Secret"
-msgstr ""
-
-#: twitter.php:135
+#: twitter.php:362
 msgid ""
-"Each user needs to register their own app to be able to post to Twitter. "
-"Please visit https://developer.twitter.com/en/portal/projects-and-apps to "
-"register a project. Inside the project you then have to register an app. You"
-" will find the needed data for the connector on the page \"Keys and token\" "
-"in the app settings."
-msgstr ""
+"This will automatically create a contact in Friendica as soon as you receive"
+" a message from an existing contact via the Twitter network. If you do not "
+"enable this, you need to manually add those Twitter contacts in Friendica "
+"from whom you would like to see posts here. However if enabled, you cannot "
+"merely remove a twitter contact from the Friendica contact list, as it will "
+"recreate this contact when they post again."
+msgstr "Spowoduje to automatyczne utworzenie kontaktu w witrynie Friendica, gdy tylko otrzymasz wiadomość od istniejącego kontaktu za pośrednictwem sieci Twitter. Jeśli nie włączysz tego, musisz ręcznie dodać te kontakty z serwisu Twitter w serwisie Friendica, od których chcesz widzieć posty. Jeśli jednak jest włączona, nie można po prostu usunąć kontaktu z Twittera z listy kontaktów Friendica, ponieważ odtworzony zostanie ten kontakt po ponownym wysłaniu."
 
-#: twitter.php:136
-msgid "Last Status Summary"
-msgstr ""
+#: twitter.php:614
+msgid "Twitter post failed. Queued for retry."
+msgstr "Nieudany wpis na Twitterze. W kolejce do ponowienia."
 
-#: twitter.php:137
-msgid "Last Status Content"
-msgstr ""
+#: twitter.php:628
+msgid "Settings updated."
+msgstr "Ustawienia zaktualizowane."
 
-#: twitter.php:142
-msgid "Twitter Export"
-msgstr ""
+#: twitter.php:638
+msgid "Consumer key"
+msgstr "Klucz klienta"
+
+#: twitter.php:639
+msgid "Consumer secret"
+msgstr "Tajny klucz klienta"
diff --git a/twitter/lang/pl/strings.php b/twitter/lang/pl/strings.php
index d160fa3b..c8a2fcc2 100644
--- a/twitter/lang/pl/strings.php
+++ b/twitter/lang/pl/strings.php
@@ -3,9 +3,29 @@
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
 	$n = intval($n);
-	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
+	return ($n==1 ? 0 : ($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14) ? 1 : $n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14) ? 2 : 3);;
 }}
-$a->strings['Post to Twitter'] = 'Opublikuj na Twitterze';
-$a->strings['Allow posting to Twitter'] = 'Zezwalaj na publikowanie na Twitterze';
-$a->strings['If enabled all your <strong>public</strong> postings can be posted to the associated Twitter account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry.'] = 'Jeśli ta opcja jest włączona, wszystkie twoje <strong>publiczne</strong> ogłoszenia mogą być wysyłane na powiązane konto Twitter. Możesz to zrobić domyślnie (tutaj) lub dla każdego komentarza osobno w opcjach komentarza podczas pisania wpisu.';
-$a->strings['Send public postings to Twitter by default'] = 'Wyślij domyślnie komentarze publiczne do Twitter';
+;
+$a->strings["Post to Twitter"] = "Opublikuj na Twitterze";
+$a->strings["You submitted an empty PIN, please Sign In with Twitter again to get a new one."] = "Przesłałeś pusty kod PIN, zaloguj się ponownie na Twitterze, aby otrzymać nowy.";
+$a->strings["Twitter settings updated."] = "Zaktualizowano ustawienia Twitter.";
+$a->strings["Twitter Import/Export/Mirror"] = "Twitter Import/Export/Mirror";
+$a->strings["No consumer key pair for Twitter found. Please contact your site administrator."] = "Nie znaleziono pary kluczy konsumpcyjnych dla Twittera. Skontaktuj się z administratorem witryny.";
+$a->strings["At this Friendica instance the Twitter addon was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to Twitter."] = "W tej instancji Friendica dodatek do Twittera został włączony, ale jeszcze nie podłączyłeś swojego konta do konta na Twitterze. Aby to zrobić, kliknij przycisk poniżej, aby uzyskać numer PIN z Twittera, który musisz skopiować do poniższego pola wprowadzania i przesłać formularz. Tylko Twoje <strong>publiczne</strong> posty będą publikowane na Twitterze.";
+$a->strings["Log in with Twitter"] = "Zaloguj się przez Twitter";
+$a->strings["Copy the PIN from Twitter here"] = "Skopiuj tutaj kod PIN z Twittera";
+$a->strings["Save Settings"] = "Zapisz ustawienia";
+$a->strings["Currently connected to: "] = "Obecnie podłączony do:";
+$a->strings["Disconnect"] = "Rozłączony";
+$a->strings["Allow posting to Twitter"] = "Zezwalaj na publikowanie na Twitterze";
+$a->strings["If enabled all your <strong>public</strong> postings can be posted to the associated Twitter account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "Jeśli ta opcja jest włączona, wszystkie twoje <strong>publiczne</strong> ogłoszenia mogą być wysyłane na powiązane konto Twitter. Możesz to zrobić domyślnie (tutaj) lub dla każdego komentarza osobno w opcjach komentarza podczas pisania wpisu.";
+$a->strings["<strong>Note</strong>: Due to your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "<strong>Uwaga</strong>: Ze względu na ustawienia prywatności (<em>Ukryć szczegóły Twojego profilu, przed nieznanymi użytkownikami?</em>) link potencjalnie zawarty w publicznych komentarzach do Twitter doprowadzi użytkownika do pustej strony informowania odwiedzających, że dostęp do Twojego profilu został ograniczony.";
+$a->strings["Send public postings to Twitter by default"] = "Wyślij domyślnie komentarze publiczne do Twitter";
+$a->strings["Mirror all posts from twitter that are no replies"] = "Lustro wszystkich postów Twitter, które są bez odpowiedzi";
+$a->strings["Import the remote timeline"] = "Zaimportuj zdalną oś czasu";
+$a->strings["Automatically create contacts"] = "Automatycznie twórz kontakty";
+$a->strings["This will automatically create a contact in Friendica as soon as you receive a message from an existing contact via the Twitter network. If you do not enable this, you need to manually add those Twitter contacts in Friendica from whom you would like to see posts here. However if enabled, you cannot merely remove a twitter contact from the Friendica contact list, as it will recreate this contact when they post again."] = "Spowoduje to automatyczne utworzenie kontaktu w witrynie Friendica, gdy tylko otrzymasz wiadomość od istniejącego kontaktu za pośrednictwem sieci Twitter. Jeśli nie włączysz tego, musisz ręcznie dodać te kontakty z serwisu Twitter w serwisie Friendica, od których chcesz widzieć posty. Jeśli jednak jest włączona, nie można po prostu usunąć kontaktu z Twittera z listy kontaktów Friendica, ponieważ odtworzony zostanie ten kontakt po ponownym wysłaniu.";
+$a->strings["Twitter post failed. Queued for retry."] = "Nieudany wpis na Twitterze. W kolejce do ponowienia.";
+$a->strings["Settings updated."] = "Ustawienia zaktualizowane.";
+$a->strings["Consumer key"] = "Klucz klienta";
+$a->strings["Consumer secret"] = "Tajny klucz klienta";
diff --git a/twitter/lang/pt-br/strings.php b/twitter/lang/pt-br/strings.php
index 96ce2a48..698b761e 100644
--- a/twitter/lang/pt-br/strings.php
+++ b/twitter/lang/pt-br/strings.php
@@ -2,19 +2,28 @@
 
 if(! function_exists("string_plural_select_pt_br")) {
 function string_plural_select_pt_br($n){
-	$n = intval($n);
-	return intval($n > 1);
+	return ($n > 1);;
 }}
-$a->strings['Post to Twitter'] = 'Publicar no Twitter';
-$a->strings['Twitter settings updated.'] = 'As configurações do Twitter foram atualizadas.';
-$a->strings['Twitter Posting Settings'] = 'Configurações de publicação no Twitter';
-$a->strings['No consumer key pair for Twitter found. Please contact your site administrator.'] = 'Não foi encontrado nenhum par de "consumer keys" para o Twitter. Por favor, entre em contato com a administração do site.';
-$a->strings['At this Friendica instance the Twitter addon was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to Twitter.'] = 'O plug-in do Twitter está habilitado nesta instância do Friendica, mas você ainda não conectou sua conta aqui à sua conta no Twitter. Para fazer isso, clique no botão abaixo. Você vai receber um código de verificação do Twitter. Copie-o para o campo abaixo e envie o formulário. Apenas os seus posts <strong>públicos</strong> serão publicados no Twitter.';
-$a->strings['Log in with Twitter'] = 'Entrar com o Twitter';
-$a->strings['Copy the PIN from Twitter here'] = 'Cole o código de verificação do Twitter aqui';
-$a->strings['Submit'] = 'Enviar';
-$a->strings['Currently connected to: '] = 'Atualmente conectado a:';
-$a->strings['If enabled all your <strong>public</strong> postings can be posted to the associated Twitter account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry.'] = 'Se habilitado, todos os seus posts <strong>públicos</strong> poderão ser replicados na conta do Twitter associada. Você pode escolher entre fazer isso por padrão (aqui) ou separadamente, quando escrever cada mensagem, nas opções de publicação.';
-$a->strings['Allow posting to Twitter'] = 'Permitir a publicação no Twitter';
-$a->strings['Send public postings to Twitter by default'] = 'Publicar posts públicos no Twitter por padrão';
-$a->strings['Settings updated.'] = 'As configurações foram atualizadas.';
+;
+$a->strings["Post to Twitter"] = "Publicar no Twitter";
+$a->strings["Twitter settings updated."] = "As configurações do Twitter foram atualizadas.";
+$a->strings["Twitter Posting Settings"] = "Configurações de publicação no Twitter";
+$a->strings["No consumer key pair for Twitter found. Please contact your site administrator."] = "Não foi encontrado nenhum par de \"consumer keys\" para o Twitter. Por favor, entre em contato com a administração do site.";
+$a->strings["At this Friendica instance the Twitter addon was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to Twitter."] = "O plug-in do Twitter está habilitado nesta instância do Friendica, mas você ainda não conectou sua conta aqui à sua conta no Twitter. Para fazer isso, clique no botão abaixo. Você vai receber um código de verificação do Twitter. Copie-o para o campo abaixo e envie o formulário. Apenas os seus posts <strong>públicos</strong> serão publicados no Twitter.";
+$a->strings["Log in with Twitter"] = "Entrar com o Twitter";
+$a->strings["Copy the PIN from Twitter here"] = "Cole o código de verificação do Twitter aqui";
+$a->strings["Submit"] = "Enviar";
+$a->strings["Currently connected to: "] = "Atualmente conectado a:";
+$a->strings["If enabled all your <strong>public</strong> postings can be posted to the associated Twitter account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "Se habilitado, todos os seus posts <strong>públicos</strong> poderão ser replicados na conta do Twitter associada. Você pode escolher entre fazer isso por padrão (aqui) ou separadamente, quando escrever cada mensagem, nas opções de publicação.";
+$a->strings["<strong>Note</strong>: Due your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "";
+$a->strings["Allow posting to Twitter"] = "Permitir a publicação no Twitter";
+$a->strings["Send public postings to Twitter by default"] = "Publicar posts públicos no Twitter por padrão";
+$a->strings["Mirror all posts from twitter that are no replies or retweets"] = "";
+$a->strings["Shortening method that optimizes the tweet"] = "";
+$a->strings["Send linked #-tags and @-names to Twitter"] = "";
+$a->strings["Clear OAuth configuration"] = "";
+$a->strings["Settings updated."] = "As configurações foram atualizadas.";
+$a->strings["Consumer key"] = "";
+$a->strings["Consumer secret"] = "";
+$a->strings["Name of the Twitter Application"] = "";
+$a->strings["set this to avoid mirroring postings from ~friendica back to ~friendica"] = "";
diff --git a/twitter/lang/ro/strings.php b/twitter/lang/ro/strings.php
index b3b7525e..36a36e8c 100644
--- a/twitter/lang/ro/strings.php
+++ b/twitter/lang/ro/strings.php
@@ -2,29 +2,29 @@
 
 if(! function_exists("string_plural_select_ro")) {
 function string_plural_select_ro($n){
-	$n = intval($n);
-	if ($n==1) { return 0; } else if ((($n%100>19)||(($n%100==0)&&($n!=0)))) { return 2; } else  { return 1; }
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
 }}
-$a->strings['Post to Twitter'] = 'Postați pe Twitter';
-$a->strings['Twitter settings updated.'] = 'Configurările Twitter au fost actualizate.';
-$a->strings['Twitter Import/Export/Mirror'] = 'Import/Export/Clonare Twitter';
-$a->strings['No consumer key pair for Twitter found. Please contact your site administrator.'] = 'Nici o pereche de chei de utilizator pentru Twitter nu a fost găsită. Vă rugăm să vă contactați administratorul de site.';
-$a->strings['At this Friendica instance the Twitter addon was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to Twitter.'] = 'Pe această sesiune Friendica, modulul Twitter era activat, dar încă nu v-ați conectat contul la profilul dvs. Twitter. Pentru aceasta apăsați pe butonul de mai jos pentru a obține un PIN de pe Twitter pe care va trebui să îl copiați în caseta de introducere mai jos şi trimiteți formularul. Numai postările dumneavoastră <strong>publice</strong> vor fi postate pe Twitter.';
-$a->strings['Log in with Twitter'] = 'Autentificare prin Twitter';
-$a->strings['Copy the PIN from Twitter here'] = 'Copiați aici PIN-ul de la Twitter';
-$a->strings['Save Settings'] = 'Salvare Configurări';
-$a->strings['Currently connected to: '] = 'Conectat curent la:';
-$a->strings['If enabled all your <strong>public</strong> postings can be posted to the associated Twitter account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry.'] = 'Dacă activați, toate postările dvs. <strong>publice</strong> pot fi publicate în contul Twitter asociat. Puteți face acest lucru, implicit (aici), sau pentru fiecare postare separată, prin opțiunile de postare atunci când compuneți un mesaj.';
-$a->strings['<strong>Note</strong>: Due your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted.'] = '<strong>Notă</strong>: Datorită configurărilor de confidenţialitate (<em>Se ascund detaliile profilului dvs. de vizitatorii necunoscuți?</em>), legătura potențial inclusă în postările publice transmise către Twitter, va conduce vizitatorul la o pagină goală, informându-l pe vizitator că accesul la profilul dvs. a fost restricţionat.';
-$a->strings['Allow posting to Twitter'] = 'Permite postarea pe Twitter';
-$a->strings['Send public postings to Twitter by default'] = 'Trimite postările publice pe Twitter, ca și implicit';
-$a->strings['Mirror all posts from twitter that are no replies'] = 'Clonează toate postările, din Twitter, care nu sunt răspunsuri';
-$a->strings['Import the remote timeline'] = 'Importare cronologie la distanță';
-$a->strings['Automatically create contacts'] = 'Creați Automat contactele';
-$a->strings['Clear OAuth configuration'] = 'Ștergeți configurările OAuth';
-$a->strings['Twitter post failed. Queued for retry.'] = 'Postarea pe Twitter a eșuat. S-a pus în așteptare pentru reîncercare.';
-$a->strings['Settings updated.'] = 'Configurări actualizate.';
-$a->strings['Consumer key'] = 'Cheia Utilizatorului';
-$a->strings['Consumer secret'] = 'Cheia Secretă a Utilizatorului';
-$a->strings['Name of the Twitter Application'] = 'Numele Aplicației Twitter';
-$a->strings['set this to avoid mirroring postings from ~friendica back to ~friendica'] = 'stabiliți aceasta pentru a evita clonarea postărilor din ~friendica înapoi la ~friendica';
+;
+$a->strings["Post to Twitter"] = "Postați pe Twitter";
+$a->strings["Twitter settings updated."] = "Configurările Twitter au fost actualizate.";
+$a->strings["Twitter Import/Export/Mirror"] = "Import/Export/Clonare Twitter";
+$a->strings["No consumer key pair for Twitter found. Please contact your site administrator."] = "Nici o pereche de chei de utilizator pentru Twitter nu a fost găsită. Vă rugăm să vă contactați administratorul de site.";
+$a->strings["At this Friendica instance the Twitter addon was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to Twitter."] = "Pe această sesiune Friendica, modulul Twitter era activat, dar încă nu v-ați conectat contul la profilul dvs. Twitter. Pentru aceasta apăsați pe butonul de mai jos pentru a obține un PIN de pe Twitter pe care va trebui să îl copiați în caseta de introducere mai jos şi trimiteți formularul. Numai postările dumneavoastră <strong>publice</strong> vor fi postate pe Twitter.";
+$a->strings["Log in with Twitter"] = "Autentificare prin Twitter";
+$a->strings["Copy the PIN from Twitter here"] = "Copiați aici PIN-ul de la Twitter";
+$a->strings["Save Settings"] = "Salvare Configurări";
+$a->strings["Currently connected to: "] = "Conectat curent la:";
+$a->strings["If enabled all your <strong>public</strong> postings can be posted to the associated Twitter account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "Dacă activați, toate postările dvs. <strong>publice</strong> pot fi publicate în contul Twitter asociat. Puteți face acest lucru, implicit (aici), sau pentru fiecare postare separată, prin opțiunile de postare atunci când compuneți un mesaj.";
+$a->strings["<strong>Note</strong>: Due your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "<strong>Notă</strong>: Datorită configurărilor de confidenţialitate (<em>Se ascund detaliile profilului dvs. de vizitatorii necunoscuți?</em>), legătura potențial inclusă în postările publice transmise către Twitter, va conduce vizitatorul la o pagină goală, informându-l pe vizitator că accesul la profilul dvs. a fost restricţionat.";
+$a->strings["Allow posting to Twitter"] = "Permite postarea pe Twitter";
+$a->strings["Send public postings to Twitter by default"] = "Trimite postările publice pe Twitter, ca și implicit";
+$a->strings["Mirror all posts from twitter that are no replies"] = "Clonează toate postările, din Twitter, care nu sunt răspunsuri";
+$a->strings["Import the remote timeline"] = "Importare cronologie la distanță";
+$a->strings["Automatically create contacts"] = "Creați Automat contactele";
+$a->strings["Clear OAuth configuration"] = "Ștergeți configurările OAuth";
+$a->strings["Twitter post failed. Queued for retry."] = "Postarea pe Twitter a eșuat. S-a pus în așteptare pentru reîncercare.";
+$a->strings["Settings updated."] = "Configurări actualizate.";
+$a->strings["Consumer key"] = "Cheia Utilizatorului";
+$a->strings["Consumer secret"] = "Cheia Secretă a Utilizatorului";
+$a->strings["Name of the Twitter Application"] = "Numele Aplicației Twitter";
+$a->strings["set this to avoid mirroring postings from ~friendica back to ~friendica"] = "stabiliți aceasta pentru a evita clonarea postărilor din ~friendica înapoi la ~friendica";
diff --git a/twitter/lang/ru/messages.po b/twitter/lang/ru/messages.po
index d6b4b442..911b2e08 100644
--- a/twitter/lang/ru/messages.po
+++ b/twitter/lang/ru/messages.po
@@ -9,72 +9,115 @@ msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-08-16 03:27+0000\n"
-"PO-Revision-Date: 2014-06-23 12:58+0000\n"
-"Last-Translator: Stanislav N. <pztrn@pztrn.name>, 2017\n"
-"Language-Team: Russian (http://app.transifex.com/Friendica/friendica/language/ru/)\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: 2017-04-08 05:49+0000\n"
+"Last-Translator: Stanislav N. <pztrn@pztrn.name>\n"
+"Language-Team: Russian (http://www.transifex.com/Friendica/friendica/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ru\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
-#: twitter.php:84
+#: twitter.php:77
 msgid "Post to Twitter"
 msgstr "Отправить в Twitter"
 
-#: twitter.php:123
-msgid "No status."
-msgstr ""
-
 #: twitter.php:129
-msgid "Allow posting to Twitter"
-msgstr "Разрешить отправку сообщений на Twitter"
+msgid "Twitter settings updated."
+msgstr "Настройки Twitter обновлены."
 
-#: twitter.php:129
+#: twitter.php:157
+msgid "Twitter Posting Settings"
+msgstr "Настройка отправки сообщений в Twitter"
+
+#: twitter.php:164
+msgid ""
+"No consumer key pair for Twitter found. Please contact your site "
+"administrator."
+msgstr "Не найдено пары потребительских ключей для Twitter. Пожалуйста, обратитесь к администратору сайта."
+
+#: twitter.php:183
+msgid ""
+"At this Friendica instance the Twitter addon was enabled but you have not "
+"yet connected your account to your Twitter account. To do so click the "
+"button below to get a PIN from Twitter which you have to copy into the input"
+" box below and submit the form. Only your <strong>public</strong> posts will"
+" be posted to Twitter."
+msgstr "Чтобы подключиться к Twitter аккаунту, нажмите на кнопку ниже, чтобы получить код безопасности от Twitter, который нужно скопировать в поле ввода ниже, и отправить форму. Только ваши <strong>публичные сообщения</strong> будут отправляться на Twitter."
+
+#: twitter.php:184
+msgid "Log in with Twitter"
+msgstr "Войдите через Twitter"
+
+#: twitter.php:186
+msgid "Copy the PIN from Twitter here"
+msgstr "Скопируйте PIN с Twitter сюда"
+
+#: twitter.php:191 twitter.php:229 twitter.php:556
+msgid "Submit"
+msgstr "Подтвердить"
+
+#: twitter.php:200
+msgid "Currently connected to: "
+msgstr "В настоящее время соединены с: "
+
+#: twitter.php:201
 msgid ""
 "If enabled all your <strong>public</strong> postings can be posted to the "
 "associated Twitter account. You can choose to do so by default (here) or for"
 " every posting separately in the posting options when writing the entry."
 msgstr "Если включено, то все ваши <strong>общественные сообщения</strong> могут быть отправлены на связанный аккаунт Twitter. Вы можете сделать это по умолчанию (здесь) или для каждого сообщения отдельно при написании записи."
 
-#: twitter.php:130
+#: twitter.php:203
+msgid ""
+"<strong>Note</strong>: Due your privacy settings (<em>Hide your profile "
+"details from unknown viewers?</em>) the link potentially included in public "
+"postings relayed to Twitter will lead the visitor to a blank page informing "
+"the visitor that the access to your profile has been restricted."
+msgstr "<strong>Внимание</strong>: Из-за настроек приватности (<em>Hide your profile details from unknown viewers?</em>) ссылка, которая может быть включена в твит, будет вести посетителя на пустую страницу с информированием о том, что доступ к профилю запрещен."
+
+#: twitter.php:206
+msgid "Allow posting to Twitter"
+msgstr "Разрешить отправку сообщений на Twitter"
+
+#: twitter.php:209
 msgid "Send public postings to Twitter by default"
 msgstr "Отправлять сообщения для всех в Twitter по умолчанию"
 
-#: twitter.php:131
-msgid "API Key"
-msgstr ""
+#: twitter.php:213
+msgid "Mirror all posts from twitter that are no replies or retweets"
+msgstr "Получать посты с Twitter у которых нет ответов и ретвитов"
 
-#: twitter.php:132
-msgid "API Secret"
-msgstr ""
+#: twitter.php:217
+msgid "Shortening method that optimizes the tweet"
+msgstr "Метод сокращения ссылок для оптимизации твита"
 
-#: twitter.php:133
-msgid "Access Token"
-msgstr ""
+#: twitter.php:221
+msgid "Send linked #-tags and @-names to Twitter"
+msgstr "Отправлять #-теги и @-имена в Twitter ссылками"
 
-#: twitter.php:134
-msgid "Access Secret"
-msgstr ""
+#: twitter.php:226
+msgid "Clear OAuth configuration"
+msgstr "Удалить конфигурацию OAuth"
 
-#: twitter.php:135
+#: twitter.php:550
+msgid "Settings updated."
+msgstr "Настройки обновлены."
+
+#: twitter.php:558
+msgid "Consumer key"
+msgstr "Consumer key"
+
+#: twitter.php:559
+msgid "Consumer secret"
+msgstr "Consumer secret"
+
+#: twitter.php:560
+msgid "Name of the Twitter Application"
+msgstr "Имя приложения для Twitter"
+
+#: twitter.php:560
 msgid ""
-"Each user needs to register their own app to be able to post to Twitter. "
-"Please visit https://developer.twitter.com/en/portal/projects-and-apps to "
-"register a project. Inside the project you then have to register an app. You"
-" will find the needed data for the connector on the page \"Keys and token\" "
-"in the app settings."
-msgstr ""
-
-#: twitter.php:136
-msgid "Last Status Summary"
-msgstr ""
-
-#: twitter.php:137
-msgid "Last Status Content"
-msgstr ""
-
-#: twitter.php:142
-msgid "Twitter Export"
-msgstr ""
+"set this to avoid mirroring postings from ~friendica back to ~friendica"
+msgstr "установите это для избежания отправки сообщений из Friendica обратно в Friendica"
diff --git a/twitter/lang/ru/strings.php b/twitter/lang/ru/strings.php
index 94582c11..39e61e4e 100644
--- a/twitter/lang/ru/strings.php
+++ b/twitter/lang/ru/strings.php
@@ -2,10 +2,28 @@
 
 if(! function_exists("string_plural_select_ru")) {
 function string_plural_select_ru($n){
-	$n = intval($n);
-	if ($n%10==1 && $n%100!=11) { return 0; } else if ($n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14)) { return 1; } else if ($n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)) { return 2; } else  { return 3; }
+	return ($n%10==1 && $n%100!=11 ? 0 : $n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14) ? 1 : $n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)? 2 : 3);;
 }}
-$a->strings['Post to Twitter'] = 'Отправить в Twitter';
-$a->strings['Allow posting to Twitter'] = 'Разрешить отправку сообщений на Twitter';
-$a->strings['If enabled all your <strong>public</strong> postings can be posted to the associated Twitter account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry.'] = 'Если включено, то все ваши <strong>общественные сообщения</strong> могут быть отправлены на связанный аккаунт Twitter. Вы можете сделать это по умолчанию (здесь) или для каждого сообщения отдельно при написании записи.';
-$a->strings['Send public postings to Twitter by default'] = 'Отправлять сообщения для всех в Twitter по умолчанию';
+;
+$a->strings["Post to Twitter"] = "Отправить в Twitter";
+$a->strings["Twitter settings updated."] = "Настройки Twitter обновлены.";
+$a->strings["Twitter Posting Settings"] = "Настройка отправки сообщений в Twitter";
+$a->strings["No consumer key pair for Twitter found. Please contact your site administrator."] = "Не найдено пары потребительских ключей для Twitter. Пожалуйста, обратитесь к администратору сайта.";
+$a->strings["At this Friendica instance the Twitter addon was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to Twitter."] = "Чтобы подключиться к Twitter аккаунту, нажмите на кнопку ниже, чтобы получить код безопасности от Twitter, который нужно скопировать в поле ввода ниже, и отправить форму. Только ваши <strong>публичные сообщения</strong> будут отправляться на Twitter.";
+$a->strings["Log in with Twitter"] = "Войдите через Twitter";
+$a->strings["Copy the PIN from Twitter here"] = "Скопируйте PIN с Twitter сюда";
+$a->strings["Submit"] = "Подтвердить";
+$a->strings["Currently connected to: "] = "В настоящее время соединены с: ";
+$a->strings["If enabled all your <strong>public</strong> postings can be posted to the associated Twitter account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "Если включено, то все ваши <strong>общественные сообщения</strong> могут быть отправлены на связанный аккаунт Twitter. Вы можете сделать это по умолчанию (здесь) или для каждого сообщения отдельно при написании записи.";
+$a->strings["<strong>Note</strong>: Due your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "<strong>Внимание</strong>: Из-за настроек приватности (<em>Hide your profile details from unknown viewers?</em>) ссылка, которая может быть включена в твит, будет вести посетителя на пустую страницу с информированием о том, что доступ к профилю запрещен.";
+$a->strings["Allow posting to Twitter"] = "Разрешить отправку сообщений на Twitter";
+$a->strings["Send public postings to Twitter by default"] = "Отправлять сообщения для всех в Twitter по умолчанию";
+$a->strings["Mirror all posts from twitter that are no replies or retweets"] = "Получать посты с Twitter у которых нет ответов и ретвитов";
+$a->strings["Shortening method that optimizes the tweet"] = "Метод сокращения ссылок для оптимизации твита";
+$a->strings["Send linked #-tags and @-names to Twitter"] = "Отправлять #-теги и @-имена в Twitter ссылками";
+$a->strings["Clear OAuth configuration"] = "Удалить конфигурацию OAuth";
+$a->strings["Settings updated."] = "Настройки обновлены.";
+$a->strings["Consumer key"] = "Consumer key";
+$a->strings["Consumer secret"] = "Consumer secret";
+$a->strings["Name of the Twitter Application"] = "Имя приложения для Twitter";
+$a->strings["set this to avoid mirroring postings from ~friendica back to ~friendica"] = "установите это для избежания отправки сообщений из Friendica обратно в Friendica";
diff --git a/twitter/lang/sv/messages.po b/twitter/lang/sv/messages.po
deleted file mode 100644
index df5c8ac1..00000000
--- a/twitter/lang/sv/messages.po
+++ /dev/null
@@ -1,81 +0,0 @@
-# ADDON twitter
-# Copyright (C)
-# This file is distributed under the same license as the Friendica twitter addon package.
-# 
-# 
-# Translators:
-# Hypolite Petovan <hypolite@mrpetovan.com>, 2019
-# Kristoffer Grundström <lovaren@gmail.com>, 2022
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-08-16 03:27+0000\n"
-"PO-Revision-Date: 2014-06-23 12:58+0000\n"
-"Last-Translator: Kristoffer Grundström <lovaren@gmail.com>, 2022\n"
-"Language-Team: Swedish (http://app.transifex.com/Friendica/friendica/language/sv/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: sv\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: twitter.php:84
-msgid "Post to Twitter"
-msgstr ""
-
-#: twitter.php:123
-msgid "No status."
-msgstr ""
-
-#: twitter.php:129
-msgid "Allow posting to Twitter"
-msgstr ""
-
-#: twitter.php:129
-msgid ""
-"If enabled all your <strong>public</strong> postings can be posted to the "
-"associated Twitter account. You can choose to do so by default (here) or for"
-" every posting separately in the posting options when writing the entry."
-msgstr ""
-
-#: twitter.php:130
-msgid "Send public postings to Twitter by default"
-msgstr ""
-
-#: twitter.php:131
-msgid "API Key"
-msgstr ""
-
-#: twitter.php:132
-msgid "API Secret"
-msgstr ""
-
-#: twitter.php:133
-msgid "Access Token"
-msgstr ""
-
-#: twitter.php:134
-msgid "Access Secret"
-msgstr ""
-
-#: twitter.php:135
-msgid ""
-"Each user needs to register their own app to be able to post to Twitter. "
-"Please visit https://developer.twitter.com/en/portal/projects-and-apps to "
-"register a project. Inside the project you then have to register an app. You"
-" will find the needed data for the connector on the page \"Keys and token\" "
-"in the app settings."
-msgstr ""
-
-#: twitter.php:136
-msgid "Last Status Summary"
-msgstr ""
-
-#: twitter.php:137
-msgid "Last Status Content"
-msgstr ""
-
-#: twitter.php:142
-msgid "Twitter Export"
-msgstr ""
diff --git a/twitter/lang/sv/strings.php b/twitter/lang/sv/strings.php
index 72e9772f..3f9d77c8 100644
--- a/twitter/lang/sv/strings.php
+++ b/twitter/lang/sv/strings.php
@@ -1,7 +1,11 @@
-<?php
-
-if(! function_exists("string_plural_select_sv")) {
-function string_plural_select_sv($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
+<?php
+
+$a->strings["Post to Twitter"] = "L&auml;gg in p&aring; Twitter";
+$a->strings["Twitter Posting Settings"] = "Inst&auml;llningar f&ouml;r inl&auml;gg p&aring; Twitter";
+$a->strings["No consumer key pair for Twitter found. Please contact your site administrator."] = "No consumer key pair for Twitter found. Please contact your site administrator.";
+$a->strings["At this Friendica instance the Twitter addon was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to Twitter."] = "At this Friendica instance the Twitter addon was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to Twitter.";
+$a->strings["Copy the PIN from Twitter here"] = "Ange PIN-koden fr&aring;n Twitter h&auml;r";
+$a->strings["Submit"] = "Spara";
+$a->strings["Currently connected to: "] = "Ansluten till: ";
+$a->strings["Clear OAuth configuration"] = "Clear OAuth configuration";
+$a->strings["Settings updated."] = "Inst&auml;llningarna har uppdaterats.";
diff --git a/twitter/lang/zh-cn/messages.po b/twitter/lang/zh-cn/messages.po
deleted file mode 100644
index b6757faf..00000000
--- a/twitter/lang/zh-cn/messages.po
+++ /dev/null
@@ -1,134 +0,0 @@
-# ADDON twitter
-# Copyright (C)
-# This file is distributed under the same license as the Friendica twitter addon package.
-# 
-# 
-# Translators:
-# steve jobs <vicdorke@gmail.com>, 2020
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-06-02 10:25+0700\n"
-"PO-Revision-Date: 2020-06-10 14:20+0000\n"
-"Last-Translator: steve jobs <vicdorke@gmail.com>\n"
-"Language-Team: Chinese (China) (http://www.transifex.com/Friendica/friendica/language/zh_CN/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: zh_CN\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-
-#: twitter.php:195
-msgid "Post to Twitter"
-msgstr "发帖到Twitter"
-
-#: twitter.php:236
-msgid ""
-"You submitted an empty PIN, please Sign In with Twitter again to get a new "
-"one."
-msgstr "您提交的PIN为空，请重新登录Twitter获取新PIN。"
-
-#: twitter.php:263
-msgid "Twitter settings updated."
-msgstr "已更新Twitter设置。"
-
-#: twitter.php:293 twitter.php:297
-msgid "Twitter Import/Export/Mirror"
-msgstr "Twitter导入/导出/镜像"
-
-#: twitter.php:304
-msgid ""
-"No consumer key pair for Twitter found. Please contact your site "
-"administrator."
-msgstr "找不到Twitter的使用者密钥。请与您的站点管理员联系。"
-
-#: twitter.php:316
-msgid ""
-"At this Friendica instance the Twitter addon was enabled but you have not "
-"yet connected your account to your Twitter account. To do so click the "
-"button below to get a PIN from Twitter which you have to copy into the input"
-" box below and submit the form. Only your <strong>public</strong> posts will"
-" be posted to Twitter."
-msgstr "在此Friendica实例中，Twitter插件已启用，但您尚未将您的帐户连接到您的Twitter帐户。要执行此操作，请单击下面的按钮从Twitter获取PIN，您必须将其复制到下面的输入框中并提交表单。只有您的公共帖子才会发布到Twitter上。"
-
-#: twitter.php:317
-msgid "Log in with Twitter"
-msgstr "使用Twitter登录"
-
-#: twitter.php:319
-msgid "Copy the PIN from Twitter here"
-msgstr "将Twitter上的PIN复制到此处"
-
-#: twitter.php:324 twitter.php:366 twitter.php:636
-msgid "Save Settings"
-msgstr "保存设置"
-
-#: twitter.php:336
-msgid "Currently connected to: "
-msgstr "当前连接到："
-
-#: twitter.php:337
-msgid "Disconnect"
-msgstr "断开连接"
-
-#: twitter.php:347
-msgid "Allow posting to Twitter"
-msgstr "允許發佈到Twitter"
-
-#: twitter.php:347
-msgid ""
-"If enabled all your <strong>public</strong> postings can be posted to the "
-"associated Twitter account. You can choose to do so by default (here) or for"
-" every posting separately in the posting options when writing the entry."
-msgstr "如果启用，您所有的公开帖子都可以发布到关联的Twitter帐户。在写入条目时，您可以选择默认(此处)，也可以在过帐选项中分别为每个过帐选择这样做。"
-
-#: twitter.php:350
-msgid ""
-"<strong>Note</strong>: Due to your privacy settings (<em>Hide your profile "
-"details from unknown viewers?</em>) the link potentially included in public "
-"postings relayed to Twitter will lead the visitor to a blank page informing "
-"the visitor that the access to your profile has been restricted."
-msgstr "注意：由于您的隐私设置(向未知观众隐藏您的个人资料详细信息？)。转发到Twitter的公共帖子中可能包含的链接将把访问者引导到一个空白页面，通知访问者访问您的个人资料已受到限制。"
-
-#: twitter.php:353
-msgid "Send public postings to Twitter by default"
-msgstr "默认情况下将公共帖子发送到Twitter"
-
-#: twitter.php:356
-msgid "Mirror all posts from twitter that are no replies"
-msgstr "镜像来自Twitter的所有未回复的帖子"
-
-#: twitter.php:359
-msgid "Import the remote timeline"
-msgstr "导入远程时间线"
-
-#: twitter.php:362
-msgid "Automatically create contacts"
-msgstr "自动创建联系人"
-
-#: twitter.php:362
-msgid ""
-"This will automatically create a contact in Friendica as soon as you receive"
-" a message from an existing contact via the Twitter network. If you do not "
-"enable this, you need to manually add those Twitter contacts in Friendica "
-"from whom you would like to see posts here. However if enabled, you cannot "
-"merely remove a twitter contact from the Friendica contact list, as it will "
-"recreate this contact when they post again."
-msgstr "一旦您通过Twitter网络收到来自现有联系人的消息，这将在Friendica中自动创建一个联系人。如果您不启用此功能，则需要在Friendica中手动添加您希望在此处查看其帖子的Twitter联系人。但是，如果启用，您不能仅将Twitter联系人从Friendica联系人列表中删除，因为它会在他们再次发帖时重新创建此联系人。"
-
-#: twitter.php:614
-msgid "Twitter post failed. Queued for retry."
-msgstr "推特发帖失败。已排队等待重试。"
-
-#: twitter.php:628
-msgid "Settings updated."
-msgstr "设置已更新。"
-
-#: twitter.php:638
-msgid "Consumer key"
-msgstr "使用者密钥"
-
-#: twitter.php:639
-msgid "Consumer secret"
-msgstr "使用者机密"
diff --git a/twitter/lang/zh-cn/strings.php b/twitter/lang/zh-cn/strings.php
index 9d04a783..402534c1 100644
--- a/twitter/lang/zh-cn/strings.php
+++ b/twitter/lang/zh-cn/strings.php
@@ -1,30 +1,24 @@
-<?php
-
-if(! function_exists("string_plural_select_zh_cn")) {
-function string_plural_select_zh_cn($n){
-	$n = intval($n);
-	return intval(0);
-}}
-$a->strings['Post to Twitter'] = '发帖到Twitter';
-$a->strings['You submitted an empty PIN, please Sign In with Twitter again to get a new one.'] = '您提交的PIN为空，请重新登录Twitter获取新PIN。';
-$a->strings['Twitter settings updated.'] = '已更新Twitter设置。';
-$a->strings['Twitter Import/Export/Mirror'] = 'Twitter导入/导出/镜像';
-$a->strings['No consumer key pair for Twitter found. Please contact your site administrator.'] = '找不到Twitter的使用者密钥。请与您的站点管理员联系。';
-$a->strings['At this Friendica instance the Twitter addon was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to Twitter.'] = '在此Friendica实例中，Twitter插件已启用，但您尚未将您的帐户连接到您的Twitter帐户。要执行此操作，请单击下面的按钮从Twitter获取PIN，您必须将其复制到下面的输入框中并提交表单。只有您的公共帖子才会发布到Twitter上。';
-$a->strings['Log in with Twitter'] = '使用Twitter登录';
-$a->strings['Copy the PIN from Twitter here'] = '将Twitter上的PIN复制到此处';
-$a->strings['Save Settings'] = '保存设置';
-$a->strings['Currently connected to: '] = '当前连接到：';
-$a->strings['Disconnect'] = '断开连接';
-$a->strings['Allow posting to Twitter'] = '允許發佈到Twitter';
-$a->strings['If enabled all your <strong>public</strong> postings can be posted to the associated Twitter account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry.'] = '如果启用，您所有的公开帖子都可以发布到关联的Twitter帐户。在写入条目时，您可以选择默认(此处)，也可以在过帐选项中分别为每个过帐选择这样做。';
-$a->strings['<strong>Note</strong>: Due to your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted.'] = '注意：由于您的隐私设置(向未知观众隐藏您的个人资料详细信息？)。转发到Twitter的公共帖子中可能包含的链接将把访问者引导到一个空白页面，通知访问者访问您的个人资料已受到限制。';
-$a->strings['Send public postings to Twitter by default'] = '默认情况下将公共帖子发送到Twitter';
-$a->strings['Mirror all posts from twitter that are no replies'] = '镜像来自Twitter的所有未回复的帖子';
-$a->strings['Import the remote timeline'] = '导入远程时间线';
-$a->strings['Automatically create contacts'] = '自动创建联系人';
-$a->strings['This will automatically create a contact in Friendica as soon as you receive a message from an existing contact via the Twitter network. If you do not enable this, you need to manually add those Twitter contacts in Friendica from whom you would like to see posts here. However if enabled, you cannot merely remove a twitter contact from the Friendica contact list, as it will recreate this contact when they post again.'] = '一旦您通过Twitter网络收到来自现有联系人的消息，这将在Friendica中自动创建一个联系人。如果您不启用此功能，则需要在Friendica中手动添加您希望在此处查看其帖子的Twitter联系人。但是，如果启用，您不能仅将Twitter联系人从Friendica联系人列表中删除，因为它会在他们再次发帖时重新创建此联系人。';
-$a->strings['Twitter post failed. Queued for retry.'] = '推特发帖失败。已排队等待重试。';
-$a->strings['Settings updated.'] = '设置已更新。';
-$a->strings['Consumer key'] = '使用者密钥';
-$a->strings['Consumer secret'] = '使用者机密';
+<?php
+
+$a->strings["Post to Twitter"] = "发送到在Twitter";
+$a->strings["Twitter settings updated."] = "Twitter设置更新了。";
+$a->strings["Twitter Posting Settings"] = "Twitter发送设置";
+$a->strings["No consumer key pair for Twitter found. Please contact your site administrator."] = "找不到Twitter的消费钥匙双。请联系您的网页行政人员。";
+$a->strings["At this Friendica instance the Twitter addon was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to Twitter."] = "在这个Friendica网站使Twitter插件可用的可您还没有把您的账户和您Twitter账户连通。为这做点击下边的按钮得到密码从Twitter您要粘贴在下边的输入框和提交。只您的<strong>公开</strong>文章被发送到Twitter。";
+$a->strings["Log in with Twitter"] = "用Twitter登记";
+$a->strings["Copy the PIN from Twitter here"] = "复制Twitter密码这儿";
+$a->strings["Submit"] = "提交";
+$a->strings["Currently connected to: "] = "现在连接到：";
+$a->strings["If enabled all your <strong>public</strong> postings can be posted to the associated Twitter account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry."] = "如果使可用的都您<strong>公开的</strong>文章会被发送到有关的Twitter账户。您会选择默认地这样做（这儿）或个文章分开地写字时候选择在文章设置。";
+$a->strings["<strong>Note</strong>: Due your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted."] = "<strong>注意</strong>：由于您的隐私设置（<em>隐藏您的简介内容为生人？</em>）环节包括在转播到Twitter的条文可能通空白页通知看者看您的简介有限。";
+$a->strings["Allow posting to Twitter"] = "允许发送到Twitter";
+$a->strings["Send public postings to Twitter by default"] = "默认地发送公开文章到Twitter";
+$a->strings["Mirror all posts from twitter that are no replies or retweets"] = "复制所有文章从twitter除了回答或复准文以外";
+$a->strings["Shortening method that optimizes the tweet"] = "缩短方法优化缩短方法优化准文";
+$a->strings["Send linked #-tags and @-names to Twitter"] = "转播连接的#标签盒@名到Twitter";
+$a->strings["Clear OAuth configuration"] = "清理出OAuth设置";
+$a->strings["Settings updated."] = "设置跟新了";
+$a->strings["Consumer key"] = "钥匙(Consumer key)";
+$a->strings["Consumer secret"] = "密码(Consumer secret)";
+$a->strings["Name of the Twitter Application"] = "Twitter应用名";
+$a->strings["set this to avoid mirroring postings from ~friendica back to ~friendica"] = "选择这个为避免复制文章从~friendica回归~friendica";
diff --git a/twitter/lighter.png b/twitter/lighter.png
new file mode 100644
index 00000000..297bb034
Binary files /dev/null and b/twitter/lighter.png differ
diff --git a/twitter/templates/admin.tpl b/twitter/templates/admin.tpl
new file mode 100644
index 00000000..d598e888
--- /dev/null
+++ b/twitter/templates/admin.tpl
@@ -0,0 +1,4 @@
+{{include file="field_input.tpl" field=$consumerkey}}
+{{include file="field_input.tpl" field=$consumersecret}}
+<!-- {{include file="field_input.tpl" field=$applicationname}} -->
+<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
diff --git a/twitter/templates/connector_settings.tpl b/twitter/templates/connector_settings.tpl
deleted file mode 100644
index 251093de..00000000
--- a/twitter/templates/connector_settings.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-{{include file="field_checkbox.tpl" field=$enable}}
-{{include file="field_checkbox.tpl" field=$default}}
-<p>{{$help}}</p>
-{{include file="field_input.tpl" field=$api_key}}
-{{include file="field_input.tpl" field=$api_secret}}
-{{include file="field_input.tpl" field=$access_token}}
-{{include file="field_input.tpl" field=$access_secret}}
-{{include file="field_input.tpl" field=$status_title}}
-{{include file="field_textarea.tpl" field=$status}}
\ No newline at end of file
diff --git a/twitter/twitter.css b/twitter/twitter.css
new file mode 100644
index 00000000..99ee0bef
--- /dev/null
+++ b/twitter/twitter.css
@@ -0,0 +1,43 @@
+
+
+#twitter-avatar {
+	float: left;
+	width: 48px;
+	height: 48px;
+	padding: 2px;
+}
+#twitter-info-block {
+	height: 52px;
+	vertical-align: middle;
+}
+#twitter-disconnect-label {
+	float: left;
+	width: 250px;
+	margin-bottom: 25px;
+}
+
+#twitter-disconnect {
+	float: left;
+}
+#twitter-default-label,
+#twitter-sendtaglinks-label,
+#twitter-enable-label,
+#twitter-shortening-label, 
+#twitter-mirror-label,
+#twitter-import-label,
+#twitter-create_user-label,
+#twitter-pin-label {
+        float: left;
+        width: 250px;
+        margin-bottom: 10px;
+}
+
+#twitter-checkbox {
+	float: left;
+}
+
+#twitter-pin {
+	float: left;
+}
+
+
diff --git a/twitter/twitter.php b/twitter/twitter.php
index 11c163ef..4510caef 100644
--- a/twitter/twitter.php
+++ b/twitter/twitter.php
@@ -1,14 +1,13 @@
 <?php
 /**
- * Name: Twitter Post Connector
- * Description: Post to Twitter
- * Version: 2.0
+ * Name: Twitter Connector
+ * Description: Bidirectional (posting, relaying and reading) connector for Twitter.
+ * Version: 1.1.0
  * Author: Tobias Diekershoff <https://f.diekershoff.de/profile/tobias>
  * Author: Michael Vogel <https://pirati.ca/profile/heluecht>
  * Maintainer: Hypolite Petovan <https://friendica.mrpetovan.com/profile/hypolite>
- * Maintainer: Michael Vogel <https://pirati.ca/profile/heluecht>
  *
- * Copyright (c) 2011-2023 Tobias Diekershoff, Michael Vogel, Hypolite Petovan
+ * Copyright (c) 2011-2013 Tobias Diekershoff, Michael Vogel, Hypolite Petovan
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -34,166 +33,431 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  */
+/*   Twitter Addon for Friendica
+ *
+ *   Author: Tobias Diekershoff
+ *           tobias.diekershoff@gmx.net
+ *
+ *   License:3-clause BSD license
+ *
+ *   Configuration:
+ *     To use this addon you need a OAuth Consumer key pair (key & secret)
+ *     you can get it from Twitter at https://twitter.com/apps
+ *
+ *     Register your Friendica site as "Client" application with "Read & Write" access
+ *     we do not need "Twitter as login". When you've registered the app you get the
+ *     OAuth Consumer key and secret pair for your application/site.
+ *
+ *     Add this key pair to your global config/addon.config.php or use the admin panel.
+ *
+ *     	'twitter' => [
+ * 		    'consumerkey' => '',
+ *  		'consumersecret' => '',
+ *      ],
+ *
+ *     To activate the addon itself add it to the system.addon
+ *     setting. After this, your user can configure their Twitter account settings
+ *     from "Settings -> Addon Settings".
+ *
+ *     Requirements: PHP5, curl
+ */
 
+use Abraham\TwitterOAuth\TwitterOAuth;
+use Abraham\TwitterOAuth\TwitterOAuthException;
+use Codebird\Codebird;
+use Friendica\App;
+use Friendica\Content\OEmbed;
 use Friendica\Content\Text\BBCode;
 use Friendica\Content\Text\Plaintext;
+use Friendica\Core\Config;
 use Friendica\Core\Hook;
+use Friendica\Core\L10n;
 use Friendica\Core\Logger;
+use Friendica\Core\PConfig;
+use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
 use Friendica\Core\Worker;
-use Friendica\DI;
+use Friendica\Database\DBA;
+use Friendica\Model\Contact;
+use Friendica\Model\Conversation;
+use Friendica\Model\Group;
 use Friendica\Model\Item;
-use Friendica\Model\Post;
-use Friendica\Core\Config\Util\ConfigFileManager;
-use Friendica\Model\Photo;
+use Friendica\Model\ItemContent;
+use Friendica\Model\User;
 use Friendica\Object\Image;
-use GuzzleHttp\Client;
-use GuzzleHttp\Exception\RequestException;
-use GuzzleHttp\HandlerStack;
-use GuzzleHttp\Subscriber\Oauth\Oauth1;
+use Friendica\Protocol\Activity;
+use Friendica\Util\ConfigFileLoader;
+use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Network;
+use Friendica\Util\Strings;
 
-const TWITTER_IMAGE_SIZE = [2000000, 1000000, 500000, 100000, 50000];
+require_once __DIR__ . DIRECTORY_SEPARATOR . 'vendor' . DIRECTORY_SEPARATOR . 'autoload.php';
+
+define('TWITTER_DEFAULT_POLL_INTERVAL', 5); // given in minutes
 
 function twitter_install()
 {
-	Hook::register('load_config', __FILE__, 'twitter_load_config');
-	Hook::register('connector_settings', __FILE__, 'twitter_settings');
+	//  we need some hooks, for the configuration and for sending tweets
+	Hook::register('load_config'            , __FILE__, 'twitter_load_config');
+	Hook::register('connector_settings'     , __FILE__, 'twitter_settings');
 	Hook::register('connector_settings_post', __FILE__, 'twitter_settings_post');
-	Hook::register('hook_fork', __FILE__, 'twitter_hook_fork');
-	Hook::register('post_local', __FILE__, 'twitter_post_local');
-	Hook::register('notifier_normal', __FILE__, 'twitter_post_hook');
-	Hook::register('jot_networks', __FILE__, 'twitter_jot_nets');
+	Hook::register('hook_fork'              , __FILE__, 'twitter_hook_fork');
+	Hook::register('post_local'             , __FILE__, 'twitter_post_local');
+	Hook::register('notifier_normal'        , __FILE__, 'twitter_post_hook');
+	Hook::register('jot_networks'           , __FILE__, 'twitter_jot_nets');
+	Hook::register('cron'                   , __FILE__, 'twitter_cron');
+	Hook::register('follow'                 , __FILE__, 'twitter_follow');
+	Hook::register('expire'                 , __FILE__, 'twitter_expire');
+	Hook::register('prepare_body'           , __FILE__, 'twitter_prepare_body');
+	Hook::register('check_item_notification', __FILE__, 'twitter_check_item_notification');
+	Logger::info("installed twitter");
 }
 
-function twitter_load_config(ConfigFileManager $loader)
+function twitter_uninstall()
 {
-	DI::app()->getConfigCache()->load($loader->loadAddonConfig('twitter'), \Friendica\Core\Config\ValueObject\Cache::SOURCE_STATIC);
+	Hook::unregister('load_config'            , __FILE__, 'twitter_load_config');
+	Hook::unregister('connector_settings'     , __FILE__, 'twitter_settings');
+	Hook::unregister('connector_settings_post', __FILE__, 'twitter_settings_post');
+	Hook::unregister('hook_fork'              , __FILE__, 'twitter_hook_fork');
+	Hook::unregister('post_local'             , __FILE__, 'twitter_post_local');
+	Hook::unregister('notifier_normal'        , __FILE__, 'twitter_post_hook');
+	Hook::unregister('jot_networks'           , __FILE__, 'twitter_jot_nets');
+	Hook::unregister('cron'                   , __FILE__, 'twitter_cron');
+	Hook::unregister('follow'                 , __FILE__, 'twitter_follow');
+	Hook::unregister('expire'                 , __FILE__, 'twitter_expire');
+	Hook::unregister('prepare_body'           , __FILE__, 'twitter_prepare_body');
+	Hook::unregister('check_item_notification', __FILE__, 'twitter_check_item_notification');
+
+	// old setting - remove only
+	Hook::unregister('post_local_end'     , __FILE__, 'twitter_post_hook');
+	Hook::unregister('addon_settings'     , __FILE__, 'twitter_settings');
+	Hook::unregister('addon_settings_post', __FILE__, 'twitter_settings_post');
 }
 
-function twitter_jot_nets(array &$jotnets_fields)
+function twitter_load_config(App $a, ConfigFileLoader $loader)
 {
-	if (!DI::userSession()->getLocalUserId()) {
+	$a->getConfigCache()->load($loader->loadAddonConfig('twitter'));
+}
+
+function twitter_check_item_notification(App $a, array &$notification_data)
+{
+	$own_id = PConfig::get($notification_data["uid"], 'twitter', 'own_id');
+
+	$own_user = q("SELECT `url` FROM `contact` WHERE `uid` = %d AND `alias` = '%s' LIMIT 1",
+			intval($notification_data["uid"]),
+			DBA::escape("twitter::".$own_id)
+	);
+
+	if ($own_user) {
+		$notification_data["profiles"][] = $own_user[0]["url"];
+	}
+}
+
+function twitter_follow(App $a, array &$contact)
+{
+	Logger::info('Check if contact is twitter contact', ['url' => $contact["url"]]);
+
+	if (!strstr($contact["url"], "://twitter.com") && !strstr($contact["url"], "@twitter.com")) {
 		return;
 	}
 
-	if (DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'twitter', 'post')) {
+	// contact seems to be a twitter contact, so continue
+	$nickname = preg_replace("=https?://twitter.com/(.*)=ism", "$1", $contact["url"]);
+	$nickname = str_replace("@twitter.com", "", $nickname);
+
+	$uid = $a->user["uid"];
+
+	$ckey = Config::get('twitter', 'consumerkey');
+	$csecret = Config::get('twitter', 'consumersecret');
+	$otoken = PConfig::get($uid, 'twitter', 'oauthtoken');
+	$osecret = PConfig::get($uid, 'twitter', 'oauthsecret');
+
+	// If the addon is not configured (general or for this user) quit here
+	if (empty($ckey) || empty($csecret) || empty($otoken) || empty($osecret)) {
+		$contact = false;
+		return;
+	}
+
+	$connection = new TwitterOAuth($ckey, $csecret, $otoken, $osecret);
+	$connection->post('friendships/create', ['screen_name' => $nickname]);
+
+	twitter_fetchuser($a, $uid, $nickname);
+
+	$r = q("SELECT name,nick,url,addr,batch,notify,poll,request,confirm,poco,photo,priority,network,alias,pubkey
+		FROM `contact` WHERE `uid` = %d AND `nick` = '%s'",
+				intval($uid),
+				DBA::escape($nickname));
+	if (DBA::isResult($r)) {
+		$contact["contact"] = $r[0];
+	}
+}
+
+function twitter_jot_nets(App $a, array &$jotnets_fields)
+{
+	if (!local_user()) {
+		return;
+	}
+
+	if (PConfig::get(local_user(), 'twitter', 'post')) {
 		$jotnets_fields[] = [
 			'type' => 'checkbox',
 			'field' => [
 				'twitter_enable',
-				DI::l10n()->t('Post to Twitter'),
-				DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'twitter', 'post_by_default')
+				L10n::t('Post to Twitter'),
+				PConfig::get(local_user(), 'twitter', 'post_by_default')
 			]
 		];
 	}
 }
 
-function twitter_settings_post()
+
+function twitter_settings_post(App $a)
 {
-	if (!DI::userSession()->getLocalUserId() || empty($_POST['twitter-submit'])) {
+	if (!local_user()) {
+		return;
+	}
+	// don't check twitter settings if twitter submit button is not clicked
+	if (empty($_POST['twitter-disconnect']) && empty($_POST['twitter-submit'])) {
 		return;
 	}
 
-	$api_key       = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'twitter', 'api_key');
-	$api_secret    = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'twitter', 'api_secret');
-	$access_token  = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'twitter', 'access_token');
-	$access_secret = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'twitter', 'access_secret');
-
-	DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'twitter', 'post',            (bool)$_POST['twitter-enable']);
-	DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'twitter', 'post_by_default', (bool)$_POST['twitter-default']);
-	DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'twitter', 'api_key',         $_POST['twitter-api-key']);
-	DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'twitter', 'api_secret',      $_POST['twitter-api-secret']);
-	DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'twitter', 'access_token',    $_POST['twitter-access-token']);
-	DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'twitter', 'access_secret',   $_POST['twitter-access-secret']);
-
-	if (
-		empty(DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'twitter', 'last_status')) ||
-		($api_key != $_POST['twitter-api-key']) || ($api_secret != $_POST['twitter-api-secret']) ||
-		($access_token != $_POST['twitter-access-token']) || ($access_secret != $_POST['twitter-access-secret'])
-	) {
-		twitter_test_connection(DI::userSession()->getLocalUserId());
-	}
-}
-
-function twitter_settings(array &$data)
-{
-	if (!DI::userSession()->getLocalUserId()) {
-		return;
-	}
-
-	$enabled      = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'twitter', 'post') ?? false;
-	$def_enabled  = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'twitter', 'post_by_default') ?? false;
-
-	$api_key       = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'twitter', 'api_key');
-	$api_secret    = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'twitter', 'api_secret');
-	$access_token  = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'twitter', 'access_token');
-	$access_secret = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'twitter', 'access_secret');
-
-	$last_status = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'twitter', 'last_status');
-	if (!empty($last_status['code']) && !empty($last_status['reason'])) {
-		$status_title = sprintf('%d - %s', $last_status['code'], $last_status['reason']);
+	if (!empty($_POST['twitter-disconnect'])) {
+		/*		 * *
+		 * if the twitter-disconnect checkbox is set, clear the OAuth key/secret pair
+		 * from the user configuration
+		 */
+		PConfig::delete(local_user(), 'twitter', 'consumerkey');
+		PConfig::delete(local_user(), 'twitter', 'consumersecret');
+		PConfig::delete(local_user(), 'twitter', 'oauthtoken');
+		PConfig::delete(local_user(), 'twitter', 'oauthsecret');
+		PConfig::delete(local_user(), 'twitter', 'post');
+		PConfig::delete(local_user(), 'twitter', 'post_by_default');
+		PConfig::delete(local_user(), 'twitter', 'lastid');
+		PConfig::delete(local_user(), 'twitter', 'mirror_posts');
+		PConfig::delete(local_user(), 'twitter', 'import');
+		PConfig::delete(local_user(), 'twitter', 'create_user');
+		PConfig::delete(local_user(), 'twitter', 'own_id');
 	} else {
-		$status_title = DI::l10n()->t('No status.');
+		if (isset($_POST['twitter-pin'])) {
+			//  if the user supplied us with a PIN from Twitter, let the magic of OAuth happen
+			Logger::notice('got a Twitter PIN');
+			$ckey    = Config::get('twitter', 'consumerkey');
+			$csecret = Config::get('twitter', 'consumersecret');
+			//  the token and secret for which the PIN was generated were hidden in the settings
+			//  form as token and token2, we need a new connection to Twitter using these token
+			//  and secret to request a Access Token with the PIN
+			try {
+				if (empty($_POST['twitter-pin'])) {
+					throw new Exception(L10n::t('You submitted an empty PIN, please Sign In with Twitter again to get a new one.'));
+				}
+
+				$connection = new TwitterOAuth($ckey, $csecret, $_POST['twitter-token'], $_POST['twitter-token2']);
+				$token = $connection->oauth("oauth/access_token", ["oauth_verifier" => $_POST['twitter-pin']]);
+				//  ok, now that we have the Access Token, save them in the user config
+				PConfig::set(local_user(), 'twitter', 'oauthtoken', $token['oauth_token']);
+				PConfig::set(local_user(), 'twitter', 'oauthsecret', $token['oauth_token_secret']);
+				PConfig::set(local_user(), 'twitter', 'post', 1);
+			} catch(Exception $e) {
+				info($e->getMessage());
+			} catch(TwitterOAuthException $e) {
+				info($e->getMessage());
+			}
+			//  reload the Addon Settings page, if we don't do it see Bug #42
+			$a->internalRedirect('settings/connectors');
+		} else {
+			//  if no PIN is supplied in the POST variables, the user has changed the setting
+			//  to post a tweet for every new __public__ posting to the wall
+			PConfig::set(local_user(), 'twitter', 'post', intval($_POST['twitter-enable']));
+			PConfig::set(local_user(), 'twitter', 'post_by_default', intval($_POST['twitter-default']));
+			PConfig::set(local_user(), 'twitter', 'mirror_posts', intval($_POST['twitter-mirror']));
+			PConfig::set(local_user(), 'twitter', 'import', intval($_POST['twitter-import']));
+			PConfig::set(local_user(), 'twitter', 'create_user', intval($_POST['twitter-create_user']));
+
+			if (!intval($_POST['twitter-mirror'])) {
+				PConfig::delete(local_user(), 'twitter', 'lastid');
+			}
+
+			info(L10n::t('Twitter settings updated.') . EOL);
+		}
 	}
-	$status_content = $last_status['content'] ?? '';
-
-	$t    = Renderer::getMarkupTemplate('connector_settings.tpl', 'addon/twitter/');
-	$html = Renderer::replaceMacros($t, [
-		'$enable'        => ['twitter-enable', DI::l10n()->t('Allow posting to Twitter'), $enabled, DI::l10n()->t('If enabled all your <strong>public</strong> postings can be posted to the associated Twitter account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry.')],
-		'$default'       => ['twitter-default', DI::l10n()->t('Send public postings to Twitter by default'), $def_enabled],
-		'$api_key'       => ['twitter-api-key', DI::l10n()->t('API Key'), $api_key],
-		'$api_secret'    => ['twitter-api-secret', DI::l10n()->t('API Secret'), $api_secret],
-		'$access_token'  => ['twitter-access-token', DI::l10n()->t('Access Token'), $access_token],
-		'$access_secret' => ['twitter-access-secret', DI::l10n()->t('Access Secret'), $access_secret],
-		'$help'          => DI::l10n()->t('Each user needs to register their own app to be able to post to Twitter. Please visit https://developer.twitter.com/en/portal/projects-and-apps to register a project. Inside the project you then have to register an app. You will find the needed data for the connector on the page "Keys and token" in the app settings.'),
-		'$status_title'  => ['twitter-status-title', DI::l10n()->t('Last Status Summary'), $status_title, '', '', 'readonly'],
-		'$status'        => ['twitter-status', DI::l10n()->t('Last Status Content'), $status_content, '', '', 'readonly'],
-	]);
-
-	$data = [
-		'connector' => 'twitter',
-		'title'     => DI::l10n()->t('Twitter Export'),
-		'enabled'   => $enabled,
-		'image'     => 'images/twitter.png',
-		'html'      => $html,
-	];
 }
 
-function twitter_hook_fork(array &$b)
+function twitter_settings(App $a, &$s)
 {
-	DI::logger()->debug('twitter_hook_fork', $b);
+	if (!local_user()) {
+		return;
+	}
+	$a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->getBaseURL() . '/addon/twitter/twitter.css' . '" media="all" />' . "\r\n";
+	/*	 * *
+	 * 1) Check that we have global consumer key & secret
+	 * 2) If no OAuthtoken & stuff is present, generate button to get some
+	 * 3) Checkbox for "Send public notices (280 chars only)
+	 */
+	$ckey    = Config::get('twitter', 'consumerkey');
+	$csecret = Config::get('twitter', 'consumersecret');
+	$otoken  = PConfig::get(local_user(), 'twitter', 'oauthtoken');
+	$osecret = PConfig::get(local_user(), 'twitter', 'oauthsecret');
 
+	$enabled            = intval(PConfig::get(local_user(), 'twitter', 'post'));
+	$defenabled         = intval(PConfig::get(local_user(), 'twitter', 'post_by_default'));
+	$mirrorenabled      = intval(PConfig::get(local_user(), 'twitter', 'mirror_posts'));
+	$importenabled      = intval(PConfig::get(local_user(), 'twitter', 'import'));
+	$create_userenabled = intval(PConfig::get(local_user(), 'twitter', 'create_user'));
+
+	$css = (($enabled) ? '' : '-disabled');
+
+	$s .= '<span id="settings_twitter_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_twitter_expanded\'); openClose(\'settings_twitter_inflated\');">';
+	$s .= '<img class="connector' . $css . '" src="images/twitter.png" /><h3 class="connector">' . L10n::t('Twitter Import/Export/Mirror') . '</h3>';
+	$s .= '</span>';
+	$s .= '<div id="settings_twitter_expanded" class="settings-block" style="display: none;">';
+	$s .= '<span class="fakelink" onclick="openClose(\'settings_twitter_expanded\'); openClose(\'settings_twitter_inflated\');">';
+	$s .= '<img class="connector' . $css . '" src="images/twitter.png" /><h3 class="connector">' . L10n::t('Twitter Import/Export/Mirror') . '</h3>';
+	$s .= '</span>';
+
+	if ((!$ckey) && (!$csecret)) {
+		/* no global consumer keys
+		 * display warning and skip personal config
+		 */
+		$s .= '<p>' . L10n::t('No consumer key pair for Twitter found. Please contact your site administrator.') . '</p>';
+	} else {
+		// ok we have a consumer key pair now look into the OAuth stuff
+		if ((!$otoken) && (!$osecret)) {
+			/* the user has not yet connected the account to twitter...
+			 * get a temporary OAuth key/secret pair and display a button with
+			 * which the user can request a PIN to connect the account to a
+			 * account at Twitter.
+			 */
+			$connection = new TwitterOAuth($ckey, $csecret);
+			try {
+				$result = $connection->oauth('oauth/request_token', ['oauth_callback' => 'oob']);
+				$s .= '<p>' . L10n::t('At this Friendica instance the Twitter addon was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to Twitter.') . '</p>';
+				$s .= '<a href="' . $connection->url('oauth/authorize', ['oauth_token' => $result['oauth_token']]) . '" target="_twitter"><img src="addon/twitter/lighter.png" alt="' . L10n::t('Log in with Twitter') . '"></a>';
+				$s .= '<div id="twitter-pin-wrapper">';
+				$s .= '<label id="twitter-pin-label" for="twitter-pin">' . L10n::t('Copy the PIN from Twitter here') . '</label>';
+				$s .= '<input id="twitter-pin" type="text" name="twitter-pin" />';
+				$s .= '<input id="twitter-token" type="hidden" name="twitter-token" value="' . $result['oauth_token'] . '" />';
+				$s .= '<input id="twitter-token2" type="hidden" name="twitter-token2" value="' . $result['oauth_token_secret'] . '" />';
+				$s .= '</div><div class="clear"></div>';
+				$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="twitter-submit" class="settings-submit" value="' . L10n::t('Save Settings') . '" /></div>';
+			} catch (TwitterOAuthException $e) {
+				$s .= '<p>' . L10n::t('An error occured: ') . $e->getMessage() . '</p>';
+			}
+		} else {
+			/*			 * *
+			 *  we have an OAuth key / secret pair for the user
+			 *  so let's give a chance to disable the postings to Twitter
+			 */
+			$connection = new TwitterOAuth($ckey, $csecret, $otoken, $osecret);
+			try {
+				$details = $connection->get('account/verify_credentials');
+
+				$field_checkbox = Renderer::getMarkupTemplate('field_checkbox.tpl');
+
+				if (property_exists($details, 'screen_name') &&
+				    property_exists($details, 'description') &&
+				    property_exists($details, 'profile_image_url')) {
+					$s .= '<div id="twitter-info" >
+					<p>' . L10n::t('Currently connected to: ') . '<a href="https://twitter.com/' . $details->screen_name . '" target="_twitter">' . $details->screen_name . '</a>
+						<button type="submit" name="twitter-disconnect" value="1">' . L10n::t('Disconnect') . '</button>
+					</p>
+					<p id="twitter-info-block">
+						<a href="https://twitter.com/' . $details->screen_name . '" target="_twitter"><img id="twitter-avatar" src="' . $details->profile_image_url . '" /></a>
+						<em>' . $details->description . '</em>
+					</p>
+				</div>';
+				} else {
+					$s .= '<div id="twitter-info" >
+					<p>Invalid Twitter info</p>
+				</div>';
+					Logger::info('Invalid twitter info (verify credentials).', ['auth' => TwitterOAuth::class]);
+				}
+				$s .= '<div class="clear"></div>';
+
+				$s .= Renderer::replaceMacros($field_checkbox, [
+					'$field' => ['twitter-enable', L10n::t('Allow posting to Twitter'), $enabled, L10n::t('If enabled all your <strong>public</strong> postings can be posted to the associated Twitter account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry.')]
+				]);
+				if ($a->user['hidewall']) {
+					$s .= '<p>' . L10n::t('<strong>Note</strong>: Due to your privacy settings (<em>Hide your profile details from unknown viewers?</em>) the link potentially included in public postings relayed to Twitter will lead the visitor to a blank page informing the visitor that the access to your profile has been restricted.') . '</p>';
+				}
+				$s .= Renderer::replaceMacros($field_checkbox, [
+					'$field' => ['twitter-default', L10n::t('Send public postings to Twitter by default'), $defenabled, '']
+				]);
+				$s .= Renderer::replaceMacros($field_checkbox, [
+					'$field' => ['twitter-mirror', L10n::t('Mirror all posts from twitter that are no replies'), $mirrorenabled, '']
+				]);
+				$s .= Renderer::replaceMacros($field_checkbox, [
+					'$field' => ['twitter-import', L10n::t('Import the remote timeline'), $importenabled, '']
+				]);
+				$s .= Renderer::replaceMacros($field_checkbox, [
+					'$field' => ['twitter-create_user', L10n::t('Automatically create contacts'), $create_userenabled, L10n::t('This will automatically create a contact in Friendica as soon as you receive a message from an existing contact via the Twitter network. If you do not enable this, you need to manually add those Twitter contacts in Friendica from whom you would like to see posts here. However if enabled, you cannot merely remove a twitter contact from the Friendica contact list, as it will recreate this contact when they post again.')]
+				]);
+				$s .= '<div class="clear"></div>';
+				$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="twitter-submit" class="settings-submit" value="' . L10n::t('Save Settings') . '" /></div>';
+			} catch (TwitterOAuthException $e) {
+				$s .= '<p>' . L10n::t('An error occured: ') . $e->getMessage() . '</p>';
+			}
+		}
+	}
+	$s .= '</div><div class="clear"></div>';
+}
+
+function twitter_hook_fork(App $a, array &$b)
+{
 	if ($b['name'] != 'notifier_normal') {
 		return;
 	}
 
 	$post = $b['data'];
 
-	if (
-		$post['deleted'] || $post['private'] || ($post['created'] !== $post['edited']) ||
-		!strstr($post['postopts'], 'twitter') || ($post['gravity'] != Item::GRAVITY_PARENT)
-	) {
+	// Deleting and editing is not supported by the addon (deleting could, but isn't by now)
+	if ($post['deleted'] || ($post['created'] !== $post['edited'])) {
 		$b['execute'] = false;
 		return;
 	}
+
+	// if post comes from twitter don't send it back
+	if ($post['extid'] == Protocol::TWITTER) {
+		$b['execute'] = false;
+		return;
+	}
+
+	if ($post['app'] == 'Twitter') {
+		$b['execute'] = false;
+		return;
+	}
+
+	if (PConfig::get($post['uid'], 'twitter', 'import')) {
+		// Don't fork if it isn't a reply to a twitter post
+		if (($post['parent'] != $post['id']) && !Item::exists(['id' => $post['parent'], 'network' => Protocol::TWITTER])) {
+			Logger::notice('No twitter parent found', ['item' => $post['id']]);
+			$b['execute'] = false;
+			return;
+		}
+	} else {
+		// Comments are never exported when we don't import the twitter timeline
+		if (!strstr($post['postopts'], 'twitter') || ($post['parent'] != $post['id']) || $post['private']) {
+			$b['execute'] = false;
+			return;
+		}
+        }
 }
 
-function twitter_post_local(array &$b)
+function twitter_post_local(App $a, array &$b)
 {
-	if (!DI::userSession()->getLocalUserId() || (DI::userSession()->getLocalUserId() != $b['uid'])) {
+	if ($b['edit']) {
 		return;
 	}
 
-	if ($b['edit'] || $b['private'] || $b['parent']) {
+	if (!local_user() || (local_user() != $b['uid'])) {
 		return;
 	}
 
-	$twitter_post   = (bool)DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'twitter', 'post');
-	$twitter_enable = (($twitter_post && !empty($_REQUEST['twitter_enable'])) ? (bool)$_REQUEST['twitter_enable'] : false);
+	$twitter_post = intval(PConfig::get(local_user(), 'twitter', 'post'));
+	$twitter_enable = (($twitter_post && !empty($_REQUEST['twitter_enable'])) ? intval($_REQUEST['twitter_enable']) : 0);
 
 	// if API is used, default to the chosen settings
-	if ($b['api_source'] && intval(DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'twitter', 'post_by_default'))) {
-		$twitter_enable = true;
+	if ($b['api_source'] && intval(PConfig::get(local_user(), 'twitter', 'post_by_default'))) {
+		$twitter_enable = 1;
 	}
 
 	if (!$twitter_enable) {
@@ -207,209 +471,1454 @@ function twitter_post_local(array &$b)
 	$b['postopts'] .= 'twitter';
 }
 
-function twitter_post_hook(array &$b)
+function twitter_action(App $a, $uid, $pid, $action)
 {
-	DI::logger()->debug('Invoke post hook', $b);
+	$ckey = Config::get('twitter', 'consumerkey');
+	$csecret = Config::get('twitter', 'consumersecret');
+	$otoken = PConfig::get($uid, 'twitter', 'oauthtoken');
+	$osecret = PConfig::get($uid, 'twitter', 'oauthsecret');
 
-	if (($b['gravity'] != Item::GRAVITY_PARENT) || !strstr($b['postopts'], 'twitter') || $b['private'] || $b['deleted'] || ($b['created'] !== $b['edited'])) {
+	$connection = new TwitterOAuth($ckey, $csecret, $otoken, $osecret);
+
+	$post = ['id' => $pid];
+
+	Logger::log("twitter_action '" . $action . "' ID: " . $pid . " data: " . print_r($post, true), Logger::DATA);
+
+	switch ($action) {
+		case "delete":
+			// To-Do: $result = $connection->post('statuses/destroy', $post);
+			$result = [];
+			break;
+		case "like":
+			$result = $connection->post('favorites/create', $post);
+			break;
+		case "unlike":
+			$result = $connection->post('favorites/destroy', $post);
+			break;
+		default:
+			Logger::log('Unhandled action ' . $action, Logger::DEBUG);
+			$result = [];
+	}
+	Logger::log("twitter_action '" . $action . "' send, result: " . print_r($result, true), Logger::DEBUG);
+}
+
+function twitter_post_hook(App $a, array &$b)
+{
+	// Post to Twitter
+	if (!PConfig::get($b["uid"], 'twitter', 'import')
+		&& ($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited']))) {
 		return;
 	}
 
-	$b['body'] = Post\Media::addAttachmentsToBody($b['uri-id'], DI::contentItem()->addSharedPost($b));
+	if ($b['parent'] != $b['id']) {
+		Logger::log("twitter_post_hook: parameter " . print_r($b, true), Logger::DATA);
+
+		// Looking if its a reply to a twitter post
+		if ((substr($b["parent-uri"], 0, 9) != "twitter::")
+			&& (substr($b["extid"], 0, 9) != "twitter::")
+			&& (substr($b["thr-parent"], 0, 9) != "twitter::"))
+		{
+			Logger::log("twitter_post_hook: no twitter post " . $b["parent"]);
+			return;
+		}
+
+		$condition = ['uri' => $b["thr-parent"], 'uid' => $b["uid"]];
+		$orig_post = Item::selectFirst([], $condition);
+		if (!DBA::isResult($orig_post)) {
+			Logger::log("twitter_post_hook: no parent found " . $b["thr-parent"]);
+			return;
+		} else {
+			$iscomment = true;
+		}
+
+
+		$nicknameplain = preg_replace("=https?://twitter.com/(.*)=ism", "$1", $orig_post["author-link"]);
+		$nickname = "@[url=" . $orig_post["author-link"] . "]" . $nicknameplain . "[/url]";
+		$nicknameplain = "@" . $nicknameplain;
+
+		Logger::log("twitter_post_hook: comparing " . $nickname . " and " . $nicknameplain . " with " . $b["body"], Logger::DEBUG);
+		if ((strpos($b["body"], $nickname) === false) && (strpos($b["body"], $nicknameplain) === false)) {
+			$b["body"] = $nickname . " " . $b["body"];
+		}
+
+		Logger::log("twitter_post_hook: parent found " . print_r($orig_post, true), Logger::DATA);
+	} else {
+		$iscomment = false;
+
+		if ($b['private'] || !strstr($b['postopts'], 'twitter')) {
+			return;
+		}
+
+		// Dont't post if the post doesn't belong to us.
+		// This is a check for forum postings
+		$self = DBA::selectFirst('contact', ['id'], ['uid' => $b['uid'], 'self' => true]);
+		if ($b['contact-id'] != $self['id']) {
+			return;
+		}
+	}
+
+	if (($b['verb'] == Activity::POST) && $b['deleted']) {
+		twitter_action($a, $b["uid"], substr($orig_post["uri"], 9), "delete");
+	}
+
+	if ($b['verb'] == Activity::LIKE) {
+		Logger::log("twitter_post_hook: parameter 2 " . substr($b["thr-parent"], 9), Logger::DEBUG);
+		if ($b['deleted']) {
+			twitter_action($a, $b["uid"], substr($b["thr-parent"], 9), "unlike");
+		} else {
+			twitter_action($a, $b["uid"], substr($b["thr-parent"], 9), "like");
+		}
+
+		return;
+	}
+
+	if ($b['deleted'] || ($b['created'] !== $b['edited'])) {
+		return;
+	}
+
+	// if post comes from twitter don't send it back
+	if ($b['extid'] == Protocol::TWITTER) {
+		return;
+	}
+
+	if ($b['app'] == "Twitter") {
+		return;
+	}
 
 	Logger::notice('twitter post invoked', ['id' => $b['id'], 'guid' => $b['guid']]);
 
-	DI::pConfig()->load($b['uid'], 'twitter');
+	PConfig::load($b['uid'], 'twitter');
 
-	$api_key       = DI::pConfig()->get($b['uid'], 'twitter', 'api_key');
-	$api_secret    = DI::pConfig()->get($b['uid'], 'twitter', 'api_secret');
-	$access_token  = DI::pConfig()->get($b['uid'], 'twitter', 'access_token');
-	$access_secret = DI::pConfig()->get($b['uid'], 'twitter', 'access_secret');
+	$ckey    = Config::get('twitter', 'consumerkey');
+	$csecret = Config::get('twitter', 'consumersecret');
+	$otoken  = PConfig::get($b['uid'], 'twitter', 'oauthtoken');
+	$osecret = PConfig::get($b['uid'], 'twitter', 'oauthsecret');
 
-	if (empty($api_key) || empty($api_secret) || empty($access_token) || empty($access_secret)) {
-		Logger::info('Missing keys, secrets or tokens.');
+	if ($ckey && $csecret && $otoken && $osecret) {
+		Logger::log('twitter: we have customer key and oauth stuff, going to send.', Logger::DEBUG);
+
+		// If it's a repeated message from twitter then do a native retweet and exit
+		if (twitter_is_retweet($a, $b['uid'], $b['body'])) {
+			return;
+		}
+
+		Codebird::setConsumerKey($ckey, $csecret);
+		$cb = Codebird::getInstance();
+		$cb->setToken($otoken, $osecret);
+
+		$connection = new TwitterOAuth($ckey, $csecret, $otoken, $osecret);
+
+		// Set the timeout for upload to 30 seconds
+		$connection->setTimeouts(10, 30);
+
+		$max_char = 280;
+
+		// Handling non-native reshares
+		$b['body'] = Friendica\Content\Text\BBCode::convertShare(
+			$b['body'],
+			function (array $attributes, array $author_contact, $content, $is_quote_share) {
+				return twitter_convert_share($attributes, $author_contact, $content, $is_quote_share);
+			}
+		);
+
+		$b['body'] = twitter_update_mentions($b['body']);
+
+		$msgarr = ItemContent::getPlaintextPost($b, $max_char, true, 8);
+		Logger::info('Got plaintext', ['id' => $b['id'], 'message' => $msgarr]);
+		$msg = $msgarr["text"];
+
+		if (($msg == "") && isset($msgarr["title"])) {
+			$msg = Plaintext::shorten($msgarr["title"], $max_char - 50);
+		}
+
+		if (!empty($msgarr['url']) && ($msgarr['url'] == $b['plink']) && !empty($msgarr['images']) && (count($msgarr['images']) <= 4)) {
+			$url_added = false;
+		} elseif (isset($msgarr["url"]) && ($msgarr["type"] != "photo")) {
+			$msg .= "\n" . $msgarr["url"];
+			$url_added = true;
+		} else {
+			$url_added = false;
+		}
+
+		if (empty($msg)) {
+			Logger::info('Empty message', ['id' => $b['id']]);
+			return;
+		}
+
+		// and now tweet it :-)
+		$post = [];
+
+		if (!empty($msgarr['images'])) {
+			Logger::info('Got images', ['id' => $b['id'], 'images' => $msgarr['images']]);
+			try {
+				$media_ids = [];
+				foreach ($msgarr['images'] as $image) {
+					if (count($media_ids) == 4) {
+						continue;
+					}
+
+					$img_str = Network::fetchUrl($image['url']);
+
+					$tempfile = tempnam(get_temppath(), 'cache');
+					file_put_contents($tempfile, $img_str);
+
+					Logger::info('Uploading', ['id' => $b['id'], 'image' => $image['url']]);
+					$media = $connection->upload('media/upload', ['media' => $tempfile]);
+
+					unlink($tempfile);
+
+					if (isset($media->media_id_string)) {
+						$media_ids[] = $media->media_id_string;
+
+						if (!empty($image['description'])) {
+							$data = ['media_id' => $media->media_id_string,
+								'alt_text' => ['text' => substr($image['description'], 0, 420)]];
+							$ret = $cb->media_metadata_create($data);
+							Logger::info('Metadata create', ['id' => $b['id'], 'data' => $data, 'return' => json_encode($ret)]);
+						}
+					} else {
+						throw new Exception('Failed upload', ['id' => $b['id'], 'image' => $image['url']]);
+					}
+				}
+				$post['media_ids'] = implode(',', $media_ids);
+				if (empty($post['media_ids'])) {
+					unset($post['media_ids']);
+				}
+			} catch (Exception $e) {
+				Logger::info('Exception when trying to send to Twitter', ['id' => $b['id'], 'message' => $e->getMessage()]);
+			}
+		}
+
+		$post['status'] = $msg;
+
+		if ($iscomment) {
+			$post["in_reply_to_status_id"] = substr($orig_post["uri"], 9);
+		}
+
+		$url = 'statuses/update';
+		$result = $connection->post($url, $post);
+		Logger::info('twitter_post send', ['id' => $b['id'], 'result' => $result]);
+
+		if (!empty($result->source)) {
+			Config::set("twitter", "application_name", strip_tags($result->source));
+		}
+
+		if (!empty($result->errors)) {
+			Logger::info('Send to Twitter failed', ['id' => $b['id'], 'error' => $result->errors]);
+			Worker::defer();
+		} elseif ($iscomment) {
+			Logger::info('Update extid', ['id' => $b['id'], 'extid' => $result->id_str]);
+			Item::update(['extid' => "twitter::" . $result->id_str], ['id' => $b['id']]);
+		}
+	}
+}
+
+function twitter_addon_admin_post(App $a)
+{
+	$consumerkey    = !empty($_POST['consumerkey'])    ? Strings::escapeTags(trim($_POST['consumerkey']))    : '';
+	$consumersecret = !empty($_POST['consumersecret']) ? Strings::escapeTags(trim($_POST['consumersecret'])) : '';
+	Config::set('twitter', 'consumerkey', $consumerkey);
+	Config::set('twitter', 'consumersecret', $consumersecret);
+	info(L10n::t('Settings updated.') . EOL);
+}
+
+function twitter_addon_admin(App $a, &$o)
+{
+	$t = Renderer::getMarkupTemplate("admin.tpl", "addon/twitter/");
+
+	$o = Renderer::replaceMacros($t, [
+		'$submit' => L10n::t('Save Settings'),
+		// name, label, value, help, [extra values]
+		'$consumerkey' => ['consumerkey', L10n::t('Consumer key'), Config::get('twitter', 'consumerkey'), ''],
+		'$consumersecret' => ['consumersecret', L10n::t('Consumer secret'), Config::get('twitter', 'consumersecret'), ''],
+	]);
+}
+
+function twitter_cron(App $a)
+{
+	$last = Config::get('twitter', 'last_poll');
+
+	$poll_interval = intval(Config::get('twitter', 'poll_interval'));
+	if (!$poll_interval) {
+		$poll_interval = TWITTER_DEFAULT_POLL_INTERVAL;
+	}
+
+	if ($last) {
+		$next = $last + ($poll_interval * 60);
+		if ($next > time()) {
+			Logger::notice('twitter: poll intervall not reached');
+			return;
+		}
+	}
+	Logger::notice('twitter: cron_start');
+
+	$r = q("SELECT * FROM `pconfig` WHERE `cat` = 'twitter' AND `k` = 'mirror_posts' AND `v` = '1'");
+	if (DBA::isResult($r)) {
+		foreach ($r as $rr) {
+			Logger::notice('Fetching', ['user' => $rr['uid']]);
+			Worker::add(['priority' => PRIORITY_MEDIUM, 'force_priority' => true], "addon/twitter/twitter_sync.php", 1, (int) $rr['uid']);
+		}
+	}
+
+	$abandon_days = intval(Config::get('system', 'account_abandon_days'));
+	if ($abandon_days < 1) {
+		$abandon_days = 0;
+	}
+
+	$abandon_limit = date(DateTimeFormat::MYSQL, time() - $abandon_days * 86400);
+
+	$r = q("SELECT * FROM `pconfig` WHERE `cat` = 'twitter' AND `k` = 'import' AND `v` = '1'");
+	if (DBA::isResult($r)) {
+		foreach ($r as $rr) {
+			if ($abandon_days != 0) {
+				$user = q("SELECT `login_date` FROM `user` WHERE uid=%d AND `login_date` >= '%s'", $rr['uid'], $abandon_limit);
+				if (!DBA::isResult($user)) {
+					Logger::notice('abandoned account: timeline from user will not be imported', ['user' => $rr['uid']]);
+					continue;
+				}
+			}
+
+			Logger::notice('importing timeline', ['user' => $rr['uid']]);
+			Worker::add(['priority' => PRIORITY_MEDIUM, 'force_priority' => true], "addon/twitter/twitter_sync.php", 2, (int) $rr['uid']);
+			/*
+			  // To-Do
+			  // check for new contacts once a day
+			  $last_contact_check = PConfig::get($rr['uid'],'pumpio','contact_check');
+			  if($last_contact_check)
+			  $next_contact_check = $last_contact_check + 86400;
+			  else
+			  $next_contact_check = 0;
+
+			  if($next_contact_check <= time()) {
+			  pumpio_getallusers($a, $rr["uid"]);
+			  PConfig::set($rr['uid'],'pumpio','contact_check',time());
+			  }
+			 */
+		}
+	}
+
+	Logger::notice('twitter: cron_end');
+
+	Config::set('twitter', 'last_poll', time());
+}
+
+function twitter_expire(App $a)
+{
+	$days = Config::get('twitter', 'expire');
+
+	if ($days == 0) {
 		return;
 	}
 
-	$msgarr = Plaintext::getPost($b, 280, true, BBCode::TWITTER);
-	Logger::debug('Got plaintext', ['id' => $b['id'], 'message' => $msgarr]);
+	$r = Item::select(['id'], ['deleted' => true, 'network' => Protocol::TWITTER]);
+	while ($row = DBA::fetch($r)) {
+		DBA::delete('item', ['id' => $row['id']]);
+	}
+	DBA::close($r);
 
-	$media_ids = [];
+	Logger::notice('twitter_expire: expire_start');
 
-	if (!empty($msgarr['images']) || !empty($msgarr['remote_images'])) {
-		Logger::info('Got images', ['id' => $b['id'], 'images' => $msgarr['images'] ?? []]);
-
-		$retrial = Worker::getRetrial();
-		if ($retrial > 4) {
-			return;
+	$r = q("SELECT * FROM `pconfig` WHERE `cat` = 'twitter' AND `k` = 'import' AND `v` = '1' ORDER BY RAND()");
+	if (DBA::isResult($r)) {
+		foreach ($r as $rr) {
+			Logger::notice('twitter_expire', ['user' => $rr['uid']]);
+			Item::expire($rr['uid'], $days, Protocol::TWITTER, true);
 		}
-		foreach ($msgarr['images'] ?? [] as $image) {
-			if (count($media_ids) == 4) {
+	}
+
+	Logger::notice('twitter_expire: expire_end');
+}
+
+function twitter_prepare_body(App $a, array &$b)
+{
+	if ($b["item"]["network"] != Protocol::TWITTER) {
+		return;
+	}
+
+	if ($b["preview"]) {
+		$max_char = 280;
+		$item = $b["item"];
+		$item["plink"] = $a->getBaseURL() . "/display/" . $item["guid"];
+
+		$condition = ['uri' => $item["thr-parent"], 'uid' => local_user()];
+		$orig_post = Item::selectFirst(['author-link'], $condition);
+		if (DBA::isResult($orig_post)) {
+			$nicknameplain = preg_replace("=https?://twitter.com/(.*)=ism", "$1", $orig_post["author-link"]);
+			$nickname = "@[url=" . $orig_post["author-link"] . "]" . $nicknameplain . "[/url]";
+			$nicknameplain = "@" . $nicknameplain;
+
+			if ((strpos($item["body"], $nickname) === false) && (strpos($item["body"], $nicknameplain) === false)) {
+				$item["body"] = $nickname . " " . $item["body"];
+			}
+		}
+
+		$msgarr = ItemContent::getPlaintextPost($item, $max_char, true, 8);
+		$msg = $msgarr["text"];
+
+		if (isset($msgarr["url"]) && ($msgarr["type"] != "photo")) {
+			$msg .= " " . $msgarr["url"];
+		}
+
+		if (isset($msgarr["image"])) {
+			$msg .= " " . $msgarr["image"];
+		}
+
+		$b['html'] = nl2br(htmlspecialchars($msg));
+	}
+}
+
+/**
+ * @brief Build the item array for the mirrored post
+ *
+ * @param App $a Application class
+ * @param integer $uid User id
+ * @param object $post Twitter object with the post
+ *
+ * @return array item data to be posted
+ */
+function twitter_do_mirrorpost(App $a, $uid, $post)
+{
+	$datarray['api_source'] = true;
+	$datarray['profile_uid'] = $uid;
+	$datarray['extid'] = Protocol::TWITTER;
+	$datarray['message_id'] = Item::newURI($uid, Protocol::TWITTER . ':' . $post->id);
+	$datarray['protocol'] = Conversation::PARCEL_TWITTER;
+	$datarray['source'] = json_encode($post);
+	$datarray['title'] = '';
+
+	if (!empty($post->retweeted_status)) {
+		// We don't support nested shares, so we mustn't show quotes as shares on retweets
+		$item = twitter_createpost($a, $uid, $post->retweeted_status, ['id' => 0], false, false, true);
+
+		if (empty($item['body'])) {
+			return [];
+		}
+
+		$datarray['body'] = "\n" . share_header(
+			$item['author-name'],
+			$item['author-link'],
+			$item['author-avatar'],
+			'',
+			$item['created'],
+			$item['plink']
+		);
+
+		$datarray['body'] .= $item['body'] . '[/share]';
+	} else {
+		$item = twitter_createpost($a, $uid, $post, ['id' => 0], false, false, false);
+
+		if (empty($item['body'])) {
+			return [];
+		}
+
+		$datarray['body'] = $item['body'];
+	}
+
+	$datarray['source'] = $item['app'];
+	$datarray['verb'] = $item['verb'];
+
+	if (isset($item['location'])) {
+		$datarray['location'] = $item['location'];
+	}
+
+	if (isset($item['coord'])) {
+		$datarray['coord'] = $item['coord'];
+	}
+
+	return $datarray;
+}
+
+function twitter_fetchtimeline(App $a, $uid)
+{
+	$ckey    = Config::get('twitter', 'consumerkey');
+	$csecret = Config::get('twitter', 'consumersecret');
+	$otoken  = PConfig::get($uid, 'twitter', 'oauthtoken');
+	$osecret = PConfig::get($uid, 'twitter', 'oauthsecret');
+	$lastid  = PConfig::get($uid, 'twitter', 'lastid');
+
+	$application_name = Config::get('twitter', 'application_name');
+
+	if ($application_name == "") {
+		$application_name = $a->getHostName();
+	}
+
+	$has_picture = false;
+
+	require_once 'mod/item.php';
+	require_once 'mod/share.php';
+
+	$connection = new TwitterOAuth($ckey, $csecret, $otoken, $osecret);
+
+	$parameters = ["exclude_replies" => true, "trim_user" => false, "contributor_details" => true, "include_rts" => true, "tweet_mode" => "extended", "include_ext_alt_text" => true];
+
+	$first_time = ($lastid == "");
+
+	if ($lastid != "") {
+		$parameters["since_id"] = $lastid;
+	}
+
+	try {
+		$items = $connection->get('statuses/user_timeline', $parameters);
+	} catch (TwitterOAuthException $e) {
+		Logger::notice('Error fetching timeline', ['user' => $uid, 'message' => $e->getMessage()]);
+		return;
+	}
+
+	if (!is_array($items)) {
+		Logger::notice('No items', ['user' => $uid]);
+		return;
+	}
+
+	$posts = array_reverse($items);
+
+	Logger::log('Starting from ID ' . $lastid . ' for user ' . $uid, Logger::DEBUG);
+
+	if (count($posts)) {
+		foreach ($posts as $post) {
+			if ($post->id_str > $lastid) {
+				$lastid = $post->id_str;
+				PConfig::set($uid, 'twitter', 'lastid', $lastid);
+			}
+
+			if ($first_time) {
 				continue;
 			}
-			try {
-				$media_ids[] = twitter_upload_image($b['uid'], $image, $retrial);
-			} catch (RequestException $exception) {
-				Logger::warning('Error while uploading image', ['image' => $image, 'code' => $exception->getCode(), 'message' => $exception->getMessage()]);
-				Worker::defer();
-				return;
+
+			if (!stristr($post->source, $application_name)) {
+				$_SESSION["authenticated"] = true;
+				$_SESSION["uid"] = $uid;
+
+				Logger::log('Preparing Twitter ID ' . $post->id_str . ' for user ' . $uid, Logger::DEBUG);
+
+				$_REQUEST = twitter_do_mirrorpost($a, $uid, $post);
+
+				if (empty($_REQUEST['body'])) {
+					continue;
+				}
+
+				Logger::log('Posting Twitter ID ' . $post->id_str . ' for user ' . $uid);
+
+				item_post($a);
+			}
+		}
+	}
+	PConfig::set($uid, 'twitter', 'lastid', $lastid);
+	Logger::log('Last ID for user ' . $uid . ' is now ' . $lastid, Logger::DEBUG);
+}
+
+function twitter_fix_avatar($avatar)
+{
+	$new_avatar = str_replace("_normal.", ".", $avatar);
+
+	$info = Image::getInfoFromURL($new_avatar);
+	if (!$info) {
+		$new_avatar = $avatar;
+	}
+
+	return $new_avatar;
+}
+
+function twitter_fetch_contact($uid, $data, $create_user)
+{
+	if (empty($data->id_str)) {
+		return -1;
+	}
+
+	$avatar = twitter_fix_avatar($data->profile_image_url_https);
+	$url = "https://twitter.com/" . $data->screen_name;
+	$addr = $data->screen_name . "@twitter.com";
+
+	$fields = ['url' => $url, 'network' => Protocol::TWITTER,
+		'name' => $data->name, 'nick' => $data->screen_name, 'addr' => $addr,
+                'location' => $data->location, 'about' => $data->description];
+
+	$cid = Contact::getIdForURL($url, 0, true, $fields);
+	if (!empty($cid)) {
+		DBA::update('contact', $fields, ['id' => $cid]);
+		Contact::updateAvatar($avatar, 0, $cid);
+	}
+
+	$contact = DBA::selectFirst('contact', [], ['uid' => $uid, 'alias' => "twitter::" . $data->id_str]);
+	if (!DBA::isResult($contact) && !$create_user) {
+		Logger::info('User contact not found', ['uid' => $uid, 'twitter-id' => $data->id_str]);
+		return 0;
+	}
+
+	if (!DBA::isResult($contact)) {
+		// create contact record
+		$fields['uid'] = $uid;
+		$fields['created'] = DateTimeFormat::utcNow();
+		$fields['nurl'] = Strings::normaliseLink($url);
+		$fields['alias'] = 'twitter::' . $data->id_str;
+		$fields['poll'] = 'twitter::' . $data->id_str;
+		$fields['rel'] = Contact::FRIEND;
+		$fields['priority'] = 1;
+		$fields['writable'] = true;
+		$fields['blocked'] = false;
+		$fields['readonly'] = false;
+		$fields['pending'] = false;
+
+		if (!DBA::insert('contact', $fields)) {
+			return false;
+		}
+
+		$contact_id = DBA::lastInsertId();
+
+		Group::addMember(User::getDefaultGroup($uid), $contact_id);
+
+		Contact::updateAvatar($avatar, $uid, $contact_id);
+	} else {
+		if ($contact["readonly"] || $contact["blocked"]) {
+			Logger::log("twitter_fetch_contact: Contact '" . $contact["nick"] . "' is blocked or readonly.", Logger::DEBUG);
+			return -1;
+		}
+
+		$contact_id = $contact['id'];
+
+		// update profile photos once every twelve hours as we have no notification of when they change.
+		$update_photo = ($contact['avatar-date'] < DateTimeFormat::utc('now -12 hours'));
+
+		// check that we have all the photos, this has been known to fail on occasion
+		if (empty($contact['photo']) || empty($contact['thumb']) || empty($contact['micro']) || $update_photo) {
+			Logger::log("twitter_fetch_contact: Updating contact " . $data->screen_name, Logger::DEBUG);
+
+			Contact::updateAvatar($avatar, $uid, $contact['id']);
+
+			$fields['name-date'] = DateTimeFormat::utcNow();
+			$fields['uri-date'] = DateTimeFormat::utcNow();
+
+			DBA::update('contact', $fields, ['id' => $contact['id']]);
+		}
+	}
+
+	return $contact_id;
+}
+
+function twitter_fetchuser(App $a, $uid, $screen_name = "", $user_id = "")
+{
+	$ckey = Config::get('twitter', 'consumerkey');
+	$csecret = Config::get('twitter', 'consumersecret');
+	$otoken = PConfig::get($uid, 'twitter', 'oauthtoken');
+	$osecret = PConfig::get($uid, 'twitter', 'oauthsecret');
+
+	$r = q("SELECT * FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1",
+		intval($uid));
+
+	if (DBA::isResult($r)) {
+		$self = $r[0];
+	} else {
+		return;
+	}
+
+	$parameters = [];
+
+	if ($screen_name != "") {
+		$parameters["screen_name"] = $screen_name;
+	}
+
+	if ($user_id != "") {
+		$parameters["user_id"] = $user_id;
+	}
+
+	// Fetching user data
+	$connection = new TwitterOAuth($ckey, $csecret, $otoken, $osecret);
+	try {
+		$user = $connection->get('users/show', $parameters);
+	} catch (TwitterOAuthException $e) {
+		Logger::log('twitter_fetchuser: Error fetching user ' . $uid . ': ' . $e->getMessage());
+		return;
+	}
+
+	if (!is_object($user)) {
+		return;
+	}
+
+	$contact_id = twitter_fetch_contact($uid, $user, true);
+
+	return $contact_id;
+}
+
+function twitter_expand_entities(App $a, $body, $item, $picture)
+{
+	$plain = $body;
+
+	$tags_arr = [];
+
+	foreach ($item->entities->hashtags AS $hashtag) {
+		$url = '#[url=' . $a->getBaseURL() . '/search?tag=' . $hashtag->text . ']' . $hashtag->text . '[/url]';
+		$tags_arr['#' . $hashtag->text] = $url;
+		$body = str_replace('#' . $hashtag->text, $url, $body);
+	}
+
+	foreach ($item->entities->user_mentions AS $mention) {
+		$url = '@[url=https://twitter.com/' . rawurlencode($mention->screen_name) . ']' . $mention->screen_name . '[/url]';
+		$tags_arr['@' . $mention->screen_name] = $url;
+		$body = str_replace('@' . $mention->screen_name, $url, $body);
+	}
+
+	if (isset($item->entities->urls)) {
+		$type = '';
+		$footerurl = '';
+		$footerlink = '';
+		$footer = '';
+
+		foreach ($item->entities->urls as $url) {
+			$plain = str_replace($url->url, '', $plain);
+
+			if ($url->url && $url->expanded_url && $url->display_url) {
+				// Quote tweet, we just remove the quoted tweet URL from the body, the share block will be added later.
+				if (!empty($item->quoted_status) && isset($item->quoted_status_id_str)
+					&& substr($url->expanded_url, -strlen($item->quoted_status_id_str)) == $item->quoted_status_id_str ) {
+					$body = str_replace($url->url, '', $body);
+					continue;
+				}
+
+				$expanded_url = $url->expanded_url;
+
+				$final_url = Network::finalUrl($url->expanded_url);
+
+				$oembed_data = OEmbed::fetchURL($final_url);
+
+				if (empty($oembed_data) || empty($oembed_data->type)) {
+					continue;
+				}
+
+				// Quickfix: Workaround for URL with '[' and ']' in it
+				if (strpos($expanded_url, '[') || strpos($expanded_url, ']')) {
+					$expanded_url = $url->url;
+				}
+
+				if ($type == '') {
+					$type = $oembed_data->type;
+				}
+
+				if ($oembed_data->type == 'video') {
+					$type = $oembed_data->type;
+					$footerurl = $expanded_url;
+					$footerlink = '[url=' . $expanded_url . ']' . $url->display_url . '[/url]';
+
+					$body = str_replace($url->url, $footerlink, $body);
+				} elseif (($oembed_data->type == 'photo') && isset($oembed_data->url)) {
+					$body = str_replace($url->url, '[url=' . $expanded_url . '][img]' . $oembed_data->url . '[/img][/url]', $body);
+				} elseif ($oembed_data->type != 'link') {
+					$body = str_replace($url->url, '[url=' . $expanded_url . ']' . $url->display_url . '[/url]', $body);
+				} else {
+					$img_str = Network::fetchUrl($final_url, true, 4);
+
+					$tempfile = tempnam(get_temppath(), 'cache');
+					file_put_contents($tempfile, $img_str);
+
+					// See http://php.net/manual/en/function.exif-imagetype.php#79283
+					if (filesize($tempfile) > 11) {
+						$mime = image_type_to_mime_type(exif_imagetype($tempfile));
+					} else {
+						$mime = false;
+					}
+
+					unlink($tempfile);
+
+					if (substr($mime, 0, 6) == 'image/') {
+						$type = 'photo';
+						$body = str_replace($url->url, '[img]' . $final_url . '[/img]', $body);
+					} else {
+						$type = $oembed_data->type;
+						$footerurl = $expanded_url;
+						$footerlink = '[url=' . $expanded_url . ']' . $url->display_url . '[/url]';
+
+						$body = str_replace($url->url, $footerlink, $body);
+					}
+				}
+			}
+		}
+
+		// Footer will be taken care of with a share block in the case of a quote
+		if (empty($item->quoted_status)) {
+			if ($footerurl != '') {
+				$footer = add_page_info($footerurl, false, $picture);
+			}
+
+			if (($footerlink != '') && (trim($footer) != '')) {
+				$removedlink = trim(str_replace($footerlink, '', $body));
+
+				if (($removedlink == '') || strstr($body, $removedlink)) {
+					$body = $removedlink;
+				}
+
+				$body .= $footer;
+			}
+
+			if ($footer == '' && $picture != '') {
+				$body .= "\n\n[img]" . $picture . "[/img]\n";
+			} elseif ($footer == '' && $picture == '') {
+				$body = add_page_info_to_body($body);
 			}
 		}
 	}
 
-	$in_reply_to_tweet_id = 0;
+	// it seems as if the entities aren't always covering all mentions. So the rest will be checked here
+	$tags = BBCode::getTags($body);
 
-	Logger::debug('Post message', ['id' => $b['id'], 'parts' => count($msgarr['parts'])]);
-	foreach ($msgarr['parts'] as $key => $part) {
-		try {
-			$id = twitter_post_status($b['uid'], $part, $media_ids, $in_reply_to_tweet_id);
-			Logger::info('twitter_post send', ['part' => $key, 'id' => $b['id'], 'result' => $id]);
-		} catch (RequestException $exception) {
-			Logger::warning('Error while posting message', ['part' => $key, 'id' => $b['id'], 'code' => $exception->getCode(), 'message' => $exception->getMessage()]);
-			$status = [
-				'code'    => $exception->getCode(),
-				'reason'  => $exception->getResponse()->getReasonPhrase(),
-				'content' => $exception->getMessage()
-			];
-			DI::pConfig()->set($b['uid'], 'twitter', 'last_status', $status);
-			if ($key == 0) {
-				Worker::defer();
+	if (count($tags)) {
+		foreach ($tags as $tag) {
+			if (strstr(trim($tag), ' ')) {
+				continue;
 			}
+
+			if (strpos($tag, '#') === 0) {
+				if (strpos($tag, '[url=')) {
+					continue;
+				}
+
+				// don't link tags that are already embedded in links
+				if (preg_match('/\[(.*?)' . preg_quote($tag, '/') . '(.*?)\]/', $body)) {
+					continue;
+				}
+				if (preg_match('/\[(.*?)\]\((.*?)' . preg_quote($tag, '/') . '(.*?)\)/', $body)) {
+					continue;
+				}
+
+				$basetag = str_replace('_', ' ', substr($tag, 1));
+				$url = '#[url=' . $a->getBaseURL() . '/search?tag=' . $basetag . ']' . $basetag . '[/url]';
+				$body = str_replace($tag, $url, $body);
+				$tags_arr['#' . $basetag] = $url;
+			} elseif (strpos($tag, '@') === 0) {
+				if (strpos($tag, '[url=')) {
+					continue;
+				}
+
+				$basetag = substr($tag, 1);
+				$url = '@[url=https://twitter.com/' . rawurlencode($basetag) . ']' . $basetag . '[/url]';
+				$body = str_replace($tag, $url, $body);
+				$tags_arr['@' . $basetag] = $url;
+			}
+		}
+	}
+
+	$tags = implode($tags_arr, ',');
+
+	return ['body' => $body, 'tags' => $tags, 'plain' => $plain];
+}
+
+/**
+ * @brief Fetch media entities and add media links to the body
+ *
+ * @param object $post Twitter object with the post
+ * @param array $postarray Array of the item that is about to be posted
+ *
+ * @return $picture string Image URL or empty string
+ */
+function twitter_media_entities($post, array &$postarray)
+{
+	// There are no media entities? So we quit.
+	if (empty($post->extended_entities->media)) {
+		return '';
+	}
+
+	// When the post links to an external page, we only take one picture.
+	// We only do this when there is exactly one media.
+	if ((count($post->entities->urls) > 0) && (count($post->extended_entities->media) == 1)) {
+		$medium = $post->extended_entities->media[0];
+		$picture = '';
+		foreach ($post->entities->urls as $link) {
+			// Let's make sure the external link url matches the media url
+			if ($medium->url == $link->url && isset($medium->media_url_https)) {
+				$picture = $medium->media_url_https;
+				$postarray['body'] = str_replace($medium->url, '', $postarray['body']);
+				return $picture;
+			}
+		}
+	}
+
+	// This is a pure media post, first search for all media urls
+	$media = [];
+	foreach ($post->extended_entities->media AS $medium) {
+		if (!isset($media[$medium->url])) {
+			$media[$medium->url] = '';
+		}
+		switch ($medium->type) {
+			case 'photo':
+				if (!empty($medium->ext_alt_text)) {
+					Logger::info('Got text description', ['alt_text' => $medium->ext_alt_text]);
+					$media[$medium->url] .= "\n[img=" . $medium->media_url_https .']' . $medium->ext_alt_text . '[/img]';
+				} else {
+					$media[$medium->url] .= "\n[img]" . $medium->media_url_https . '[/img]';
+				}
+
+				$postarray['object-type'] = Activity\ObjectType::IMAGE;
+				break;
+			case 'video':
+			case 'animated_gif':
+				if (!empty($medium->ext_alt_text)) {
+					Logger::info('Got text description', ['alt_text' => $medium->ext_alt_text]);
+					$media[$medium->url] .= "\n[img=" . $medium->media_url_https .']' . $medium->ext_alt_text . '[/img]';
+				} else {
+					$media[$medium->url] .= "\n[img]" . $medium->media_url_https . '[/img]';
+				}
+
+				$postarray['object-type'] = Activity\ObjectType::VIDEO;
+				if (is_array($medium->video_info->variants)) {
+					$bitrate = 0;
+					// We take the video with the highest bitrate
+					foreach ($medium->video_info->variants AS $variant) {
+						if (($variant->content_type == 'video/mp4') && ($variant->bitrate >= $bitrate)) {
+							$media[$medium->url] = "\n[video]" . $variant->url . '[/video]';
+							$bitrate = $variant->bitrate;
+						}
+					}
+				}
+				break;
+			// The following code will only be activated for test reasons
+			//default:
+			//	$postarray['body'] .= print_r($medium, true);
+		}
+	}
+
+	// Now we replace the media urls.
+	foreach ($media AS $key => $value) {
+		$postarray['body'] = str_replace($key, "\n" . $value . "\n", $postarray['body']);
+	}
+
+	return '';
+}
+
+function twitter_createpost(App $a, $uid, $post, array $self, $create_user, $only_existing_contact, $noquote)
+{
+	$postarray = [];
+	$postarray['network'] = Protocol::TWITTER;
+	$postarray['uid'] = $uid;
+	$postarray['wall'] = 0;
+	$postarray['uri'] = "twitter::" . $post->id_str;
+	$postarray['protocol'] = Conversation::PARCEL_TWITTER;
+	$postarray['source'] = json_encode($post);
+
+	// Don't import our own comments
+	if (Item::exists(['extid' => $postarray['uri'], 'uid' => $uid])) {
+		Logger::log("Item with extid " . $postarray['uri'] . " found.", Logger::DEBUG);
+		return [];
+	}
+
+	$contactid = 0;
+
+	if ($post->in_reply_to_status_id_str != "") {
+		$parent = "twitter::" . $post->in_reply_to_status_id_str;
+
+		$fields = ['uri', 'parent-uri', 'parent'];
+		$parent_item = Item::selectFirst($fields, ['uri' => $parent, 'uid' => $uid]);
+		if (!DBA::isResult($parent_item)) {
+			$parent_item = Item::selectFirst($fields, ['extid' => $parent, 'uid' => $uid]);
+		}
+
+		if (DBA::isResult($parent_item)) {
+			$postarray['thr-parent'] = $parent_item['uri'];
+			$postarray['parent-uri'] = $parent_item['parent-uri'];
+			$postarray['parent'] = $parent_item['parent'];
+			$postarray['object-type'] = Activity\ObjectType::COMMENT;
+		} else {
+			$postarray['thr-parent'] = $postarray['uri'];
+			$postarray['parent-uri'] = $postarray['uri'];
+			$postarray['object-type'] = Activity\ObjectType::NOTE;
+		}
+
+		// Is it me?
+		$own_id = PConfig::get($uid, 'twitter', 'own_id');
+
+		if ($post->user->id_str == $own_id) {
+			$r = q("SELECT * FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1",
+				intval($uid));
+
+			if (DBA::isResult($r)) {
+				$contactid = $r[0]["id"];
+
+				$postarray['owner-name']   = $r[0]["name"];
+				$postarray['owner-link']   = $r[0]["url"];
+				$postarray['owner-avatar'] = $r[0]["photo"];
+			} else {
+				Logger::log("No self contact for user " . $uid, Logger::DEBUG);
+				return [];
+			}
+		}
+		// Don't create accounts of people who just comment something
+		$create_user = false;
+	} else {
+		$postarray['parent-uri'] = $postarray['uri'];
+		$postarray['object-type'] = Activity\ObjectType::NOTE;
+	}
+
+	if ($contactid == 0) {
+		$contactid = twitter_fetch_contact($uid, $post->user, $create_user);
+
+		$postarray['owner-name'] = $post->user->name;
+		$postarray['owner-link'] = "https://twitter.com/" . $post->user->screen_name;
+		$postarray['owner-avatar'] = twitter_fix_avatar($post->user->profile_image_url_https);
+	}
+
+	if (($contactid == 0) && !$only_existing_contact) {
+		$contactid = $self['id'];
+	} elseif ($contactid <= 0) {
+		Logger::log("Contact ID is zero or less than zero.", Logger::DEBUG);
+		return [];
+	}
+
+	$postarray['contact-id'] = $contactid;
+
+	$postarray['verb'] = Activity::POST;
+	$postarray['author-name'] = $postarray['owner-name'];
+	$postarray['author-link'] = $postarray['owner-link'];
+	$postarray['author-avatar'] = $postarray['owner-avatar'];
+	$postarray['plink'] = "https://twitter.com/" . $post->user->screen_name . "/status/" . $post->id_str;
+	$postarray['app'] = strip_tags($post->source);
+
+	if ($post->user->protected) {
+		$postarray['private'] = 1;
+		$postarray['allow_cid'] = '<' . $self['id'] . '>';
+	} else {
+		$postarray['private'] = 0;
+		$postarray['allow_cid'] = '';
+	}
+
+	if (!empty($post->full_text)) {
+		$postarray['body'] = $post->full_text;
+	} else {
+		$postarray['body'] = $post->text;
+	}
+
+	// When the post contains links then use the correct object type
+	if (count($post->entities->urls) > 0) {
+		$postarray['object-type'] = Activity\ObjectType::BOOKMARK;
+	}
+
+	// Search for media links
+	$picture = twitter_media_entities($post, $postarray);
+
+	$converted = twitter_expand_entities($a, $postarray['body'], $post, $picture);
+	$postarray['body'] = $converted["body"];
+	$postarray['tag'] = $converted["tags"];
+	$postarray['created'] = DateTimeFormat::utc($post->created_at);
+	$postarray['edited'] = DateTimeFormat::utc($post->created_at);
+
+	$statustext = $converted["plain"];
+
+	if (!empty($post->place->name)) {
+		$postarray["location"] = $post->place->name;
+	}
+	if (!empty($post->place->full_name)) {
+		$postarray["location"] = $post->place->full_name;
+	}
+	if (!empty($post->geo->coordinates)) {
+		$postarray["coord"] = $post->geo->coordinates[0] . " " . $post->geo->coordinates[1];
+	}
+	if (!empty($post->coordinates->coordinates)) {
+		$postarray["coord"] = $post->coordinates->coordinates[1] . " " . $post->coordinates->coordinates[0];
+	}
+	if (!empty($post->retweeted_status)) {
+		$retweet = twitter_createpost($a, $uid, $post->retweeted_status, $self, false, false, $noquote);
+
+		if (empty($retweet['body'])) {
+			return [];
+		}
+
+		if (!$noquote) {
+			// Store the original tweet
+			Item::insert($retweet);
+
+			// CHange the other post into a reshare activity
+			$postarray['verb'] = Activity::ANNOUNCE;
+			$postarray['gravity'] = GRAVITY_ACTIVITY;
+			$postarray['object-type'] = Activity\ObjectType::NOTE;
+
+			$postarray['thr-parent'] = $retweet['uri'];
+			$postarray['parent-uri'] = $retweet['uri'];
+		} else {
+			$retweet['source'] = $postarray['source'];
+			$retweet['private'] = $postarray['private'];
+			$retweet['allow_cid'] = $postarray['allow_cid'];
+			$retweet['contact-id'] = $postarray['contact-id'];
+			$retweet['owner-name'] = $postarray['owner-name'];
+			$retweet['owner-link'] = $postarray['owner-link'];
+			$retweet['owner-avatar'] = $postarray['owner-avatar'];
+
+			$postarray = $retweet;
+		}
+	}
+
+	if (!empty($post->quoted_status) && !$noquote) {
+		$quoted = twitter_createpost($a, $uid, $post->quoted_status, $self, false, false, true);
+
+		if (!empty($quoted['body'])) {
+			$postarray['body'] .= "\n" . share_header(
+				$quoted['author-name'],
+				$quoted['author-link'],
+				$quoted['author-avatar'],
+				"",
+				$quoted['created'],
+				$quoted['plink']
+			);
+
+			$postarray['body'] .= $quoted['body'] . '[/share]';
+		} else {
+			// Quoted post author is blocked/ignored, so we just provide the link to avoid removing quote context.
+			$postarray['body'] .= "\n\nhttps://twitter.com/" . $post->quoted_status->user->screen_name . "/status/" . $post->quoted_status->id_str;
+		}
+	}
+
+	return $postarray;
+}
+
+function twitter_fetchparentposts(App $a, $uid, $post, TwitterOAuth $connection, array $self)
+{
+	Logger::log("twitter_fetchparentposts: Fetching for user " . $uid . " and post " . $post->id_str, Logger::DEBUG);
+
+	$posts = [];
+
+	while (!empty($post->in_reply_to_status_id_str)) {
+		$parameters = ["trim_user" => false, "tweet_mode" => "extended", "id" => $post->in_reply_to_status_id_str, "include_ext_alt_text" => true];
+
+		try {
+			$post = $connection->get('statuses/show', $parameters);
+		} catch (TwitterOAuthException $e) {
+			Logger::log('twitter_fetchparentposts: Error fetching for user ' . $uid . ' and post ' . $post->id_str . ': ' . $e->getMessage());
 			break;
 		}
 
-		$in_reply_to_tweet_id = $id;
-		$media_ids = [];
-	}
-}
-
-function twitter_post_status(int $uid, string $status, array $media_ids = [], string $in_reply_to_tweet_id = ''): string
-{
-	$parameters = ['text' => $status];
-	if (!empty($media_ids)) {
-		$parameters['media'] = ['media_ids' => $media_ids];
-	}
-	if (!empty($in_reply_to_tweet_id)) {
-		$parameters['reply'] = ['in_reply_to_tweet_id' => $in_reply_to_tweet_id];
-	}
-
-	$response = twitter_post($uid, 'https://api.twitter.com/2/tweets', 'json', $parameters);
-
-	return $response->data->id;
-}
-
-function twitter_upload_image(int $uid, array $image, int $retrial)
-{
-	if (!empty($image['id'])) {
-		$photo = Photo::selectFirst([], ['id' => $image['id']]);
-	} else {
-		$photo = Photo::createPhotoForExternalResource($image['url']);
-	}
-
-	$picturedata = Photo::getImageForPhoto($photo);
-
-	$picture = new Image($picturedata, $photo['type'], $photo['filename']);
-	$height  = $picture->getHeight();
-	$width   = $picture->getWidth();
-	$size    = strlen($picturedata);
-
-	$picture     = Photo::resizeToFileSize($picture, TWITTER_IMAGE_SIZE[$retrial]);
-	$new_height  = $picture->getHeight();
-	$new_width   = $picture->getWidth();
-	$picturedata = $picture->asString();
-	$new_size    = strlen($picturedata);
-
-	Logger::info('Uploading', ['uid' => $uid, 'retrial' => $retrial, 'height' => $new_height, 'width' => $new_width, 'size' => $new_size, 'orig-height' => $height, 'orig-width' => $width, 'orig-size' => $size, 'image' => $image]);
-	$media = twitter_post($uid, 'https://upload.twitter.com/1.1/media/upload.json', 'form_params', ['media' => base64_encode($picturedata)]);
-	Logger::info('Uploading done', ['uid' => $uid, 'retrial' => $retrial, 'height' => $new_height, 'width' => $new_width, 'size' => $new_size, 'orig-height' => $height, 'orig-width' => $width, 'orig-size' => $size, 'image' => $image]);
-
-	if (isset($media->media_id_string)) {
-		$media_id = $media->media_id_string;
-
-		if (!empty($image['description'])) {
-			$data = [
-				'media_id' => $media->media_id_string,
-				'alt_text' => [
-					'text' => substr($image['description'], 0, 1000)
-				]
-			];
-			$ret = twitter_post($uid, 'https://upload.twitter.com/1.1/media/metadata/create.json', 'json', $data);
-			Logger::info('Metadata create', ['uid' => $uid, 'data' => $data, 'return' => $ret]);
+		if (empty($post)) {
+			Logger::log("twitter_fetchparentposts: Can't fetch post " . $parameters['id'], Logger::DEBUG);
+			break;
 		}
-	} else {
-		Logger::error('Failed upload', ['uid' => $uid, 'size' => strlen($picturedata), 'image' => $image['url'], 'return' => $media]);
-		throw new Exception('Failed upload of ' . $image['url']);
+
+		if (empty($post->id_str)) {
+			Logger::log("twitter_fetchparentposts: This is not a post " . json_encode($post), Logger::DEBUG);
+			break;
+		}
+
+		if (Item::exists(['uri' => 'twitter::' . $post->id_str, 'uid' => $uid])) {
+			break;
+		}
+
+		$posts[] = $post;
 	}
 
-	return $media_id;
+	Logger::log("twitter_fetchparentposts: Fetching " . count($posts) . " parents", Logger::DEBUG);
+
+	$posts = array_reverse($posts);
+
+	if (!empty($posts)) {
+		foreach ($posts as $post) {
+			$postarray = twitter_createpost($a, $uid, $post, $self, false, !PConfig::get($uid, 'twitter', 'create_user'), false);
+
+			if (empty($postarray['body'])) {
+				continue;
+			}
+
+			$item = Item::insert($postarray);
+
+			$postarray["id"] = $item;
+
+			Logger::log('twitter_fetchparentpost: User ' . $self["nick"] . ' posted parent timeline item ' . $item);
+		}
+	}
 }
 
-function twitter_post(int $uid, string $url, string $type, array $data): stdClass
+function twitter_fetchhometimeline(App $a, $uid)
 {
-	$stack = HandlerStack::create();
+	$ckey    = Config::get('twitter', 'consumerkey');
+	$csecret = Config::get('twitter', 'consumersecret');
+	$otoken  = PConfig::get($uid, 'twitter', 'oauthtoken');
+	$osecret = PConfig::get($uid, 'twitter', 'oauthsecret');
+	$create_user = PConfig::get($uid, 'twitter', 'create_user');
+	$mirror_posts = PConfig::get($uid, 'twitter', 'mirror_posts');
 
-	$middleware = new Oauth1([
-		'consumer_key'    => DI::pConfig()->get($uid, 'twitter', 'api_key'),
-		'consumer_secret' => DI::pConfig()->get($uid, 'twitter', 'api_secret'),
-		'token'           => DI::pConfig()->get($uid, 'twitter', 'access_token'),
-		'token_secret'    => DI::pConfig()->get($uid, 'twitter', 'access_secret'),
-	]);
+	Logger::log("Fetching timeline for user " . $uid, Logger::DEBUG);
 
-	$stack->push($middleware);
+	$application_name = Config::get('twitter', 'application_name');
 
-	$client = new Client([
-		'handler' => $stack
-	]);
+	if ($application_name == "") {
+		$application_name = $a->getHostName();
+	}
 
-	$response = $client->post($url, ['auth' => 'oauth', $type => $data]);
-	$body     = $response->getBody()->getContents();
-
-	$status = [
-		'code'    => $response->getStatusCode(),
-		'reason'  => $response->getReasonPhrase(),
-		'content' => $body
-	];
-
-	DI::pConfig()->set($uid, 'twitter', 'last_status', $status);
-
-	$content = json_decode($body) ?? new stdClass;
-	Logger::debug('Success', ['content' => $content]);
-	return $content;
-}
-
-function twitter_test_connection(int $uid)
-{
-	$stack = HandlerStack::create();
-
-	$middleware = new Oauth1([
-		'consumer_key'    => DI::pConfig()->get($uid, 'twitter', 'api_key'),
-		'consumer_secret' => DI::pConfig()->get($uid, 'twitter', 'api_secret'),
-		'token'           => DI::pConfig()->get($uid, 'twitter', 'access_token'),
-		'token_secret'    => DI::pConfig()->get($uid, 'twitter', 'access_secret'),
-	]);
-
-	$stack->push($middleware);
-
-	$client = new Client([
-		'handler' => $stack
-	]);
+	$connection = new TwitterOAuth($ckey, $csecret, $otoken, $osecret);
 
 	try {
-		$response = $client->get('https://api.twitter.com/2/users/me', ['auth' => 'oauth']);
-		$status = [
-			'code'   => $response->getStatusCode(),
-			'reason'  => $response->getReasonPhrase(),
-			'content' => $response->getBody()->getContents()
-		];
-		DI::pConfig()->set(1, 'twitter', 'last_status',  $status);
-		Logger::info('Test successful', ['uid' => $uid]);
-	} catch (RequestException $exception) {
-		$status = [
-			'code'    => $exception->getCode(),
-			'reason'  => $exception->getResponse()->getReasonPhrase(),
-			'content' => $exception->getMessage()
-		];
-		DI::pConfig()->set(1, 'twitter', 'last_status',  $status);
-		Logger::info('Test failed', ['uid' => $uid]);
+		$own_contact = twitter_fetch_own_contact($a, $uid);
+	} catch (TwitterOAuthException $e) {
+		Logger::log('Error fetching own contact for user ' . $uid . ': ' . $e->getMessage());
+		return;
 	}
+
+	$r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
+		intval($own_contact),
+		intval($uid));
+
+	if (DBA::isResult($r)) {
+		$own_id = $r[0]["nick"];
+	} else {
+		Logger::log("Own twitter contact not found for user " . $uid);
+		return;
+	}
+
+	$self = User::getOwnerDataById($uid);
+	if ($self === false) {
+		Logger::log("Own contact not found for user " . $uid);
+		return;
+	}
+
+	$parameters = ["exclude_replies" => false, "trim_user" => false, "contributor_details" => true, "include_rts" => true, "tweet_mode" => "extended", "include_ext_alt_text" => true];
+	//$parameters["count"] = 200;
+	// Fetching timeline
+	$lastid = PConfig::get($uid, 'twitter', 'lasthometimelineid');
+
+	$first_time = ($lastid == "");
+
+	if ($lastid != "") {
+		$parameters["since_id"] = $lastid;
+	}
+
+	try {
+		$items = $connection->get('statuses/home_timeline', $parameters);
+	} catch (TwitterOAuthException $e) {
+		Logger::log('Error fetching home timeline for user ' . $uid . ': ' . $e->getMessage());
+		return;
+	}
+
+	if (!is_array($items)) {
+		Logger::log('No array while fetching home timeline for user ' . $uid . ': ' . print_r($items, true));
+		return;
+	}
+
+	if (empty($items)) {
+		Logger::log('No new timeline content for user ' . $uid, Logger::INFO);
+		return;
+	}
+
+	$posts = array_reverse($items);
+
+	Logger::log('Fetching timeline from ID ' . $lastid . ' for user ' . $uid . ' ' . sizeof($posts) . ' items', Logger::DEBUG);
+
+	if (count($posts)) {
+		foreach ($posts as $post) {
+			if ($post->id_str > $lastid) {
+				$lastid = $post->id_str;
+				PConfig::set($uid, 'twitter', 'lasthometimelineid', $lastid);
+			}
+
+			if ($first_time) {
+				continue;
+			}
+
+			if (stristr($post->source, $application_name) && $post->user->screen_name == $own_id) {
+				Logger::log("Skip previously sent post", Logger::DEBUG);
+				continue;
+			}
+
+			if ($mirror_posts && $post->user->screen_name == $own_id && $post->in_reply_to_status_id_str == "") {
+				Logger::log("Skip post that will be mirrored", Logger::DEBUG);
+				continue;
+			}
+
+			if ($post->in_reply_to_status_id_str != "") {
+				twitter_fetchparentposts($a, $uid, $post, $connection, $self);
+			}
+
+			Logger::log('Preparing post ' . $post->id_str . ' for user ' . $uid, Logger::DEBUG);
+
+			$postarray = twitter_createpost($a, $uid, $post, $self, $create_user, true, false);
+
+			if (empty($postarray['body']) || trim($postarray['body']) == "") {
+				Logger::log('Empty body for post ' . $post->id_str . ' and user ' . $uid, Logger::DEBUG);
+				continue;
+			}
+
+			$notify = false;
+
+			if (($postarray['uri'] == $postarray['parent-uri']) && ($postarray['author-link'] == $postarray['owner-link'])) {
+				$contact = DBA::selectFirst('contact', [], ['id' => $postarray['contact-id'], 'self' => false]);
+				if (DBA::isResult($contact)) {
+					$notify = Item::isRemoteSelf($contact, $postarray);
+				}
+			}
+
+			$item = Item::insert($postarray, false, $notify);
+			$postarray["id"] = $item;
+
+			Logger::log('User ' . $uid . ' posted home timeline item ' . $item);
+		}
+	}
+	PConfig::set($uid, 'twitter', 'lasthometimelineid', $lastid);
+
+	Logger::log('Last timeline ID for user ' . $uid . ' is now ' . $lastid, Logger::DEBUG);
+
+	// Fetching mentions
+	$lastid = PConfig::get($uid, 'twitter', 'lastmentionid');
+
+	$first_time = ($lastid == "");
+
+	if ($lastid != "") {
+		$parameters["since_id"] = $lastid;
+	}
+
+	try {
+		$items = $connection->get('statuses/mentions_timeline', $parameters);
+	} catch (TwitterOAuthException $e) {
+		Logger::log('Error fetching mentions: ' . $e->getMessage());
+		return;
+	}
+
+	if (!is_array($items)) {
+		Logger::log("Error fetching mentions: " . print_r($items, true), Logger::DEBUG);
+		return;
+	}
+
+	$posts = array_reverse($items);
+
+	Logger::log("Fetching mentions for user " . $uid . " " . sizeof($posts) . " items", Logger::DEBUG);
+
+	if (count($posts)) {
+		foreach ($posts as $post) {
+			if ($post->id_str > $lastid) {
+				$lastid = $post->id_str;
+			}
+
+			if ($first_time) {
+				continue;
+			}
+
+			if ($post->in_reply_to_status_id_str != "") {
+				twitter_fetchparentposts($a, $uid, $post, $connection, $self);
+			}
+
+			$postarray = twitter_createpost($a, $uid, $post, $self, false, !$create_user, false);
+
+			if (empty($postarray['body'])) {
+				continue;
+			}
+
+			$item = Item::insert($postarray);
+
+			Logger::log('User ' . $uid . ' posted mention timeline item ' . $item);
+		}
+	}
+
+	PConfig::set($uid, 'twitter', 'lastmentionid', $lastid);
+
+	Logger::log('Last mentions ID for user ' . $uid . ' is now ' . $lastid, Logger::DEBUG);
+}
+
+function twitter_fetch_own_contact(App $a, $uid)
+{
+	$ckey    = Config::get('twitter', 'consumerkey');
+	$csecret = Config::get('twitter', 'consumersecret');
+	$otoken  = PConfig::get($uid, 'twitter', 'oauthtoken');
+	$osecret = PConfig::get($uid, 'twitter', 'oauthsecret');
+
+	$own_id = PConfig::get($uid, 'twitter', 'own_id');
+
+	$contact_id = 0;
+
+	if ($own_id == "") {
+		$connection = new TwitterOAuth($ckey, $csecret, $otoken, $osecret);
+
+		// Fetching user data
+		// get() may throw TwitterOAuthException, but we will catch it later
+		$user = $connection->get('account/verify_credentials');
+		if (empty($user) || empty($user->id_str)) {
+			return false;
+		}
+
+		PConfig::set($uid, 'twitter', 'own_id', $user->id_str);
+
+		$contact_id = twitter_fetch_contact($uid, $user, true);
+	} else {
+		$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `alias` = '%s' LIMIT 1",
+			intval($uid),
+			DBA::escape("twitter::" . $own_id));
+		if (DBA::isResult($r)) {
+			$contact_id = $r[0]["id"];
+		} else {
+			PConfig::delete($uid, 'twitter', 'own_id');
+		}
+	}
+
+	return $contact_id;
+}
+
+function twitter_is_retweet(App $a, $uid, $body)
+{
+	$body = trim($body);
+
+	// Skip if it isn't a pure repeated messages
+	// Does it start with a share?
+	if (strpos($body, "[share") > 0) {
+		return false;
+	}
+
+	// Does it end with a share?
+	if (strlen($body) > (strrpos($body, "[/share]") + 8)) {
+		return false;
+	}
+
+	$attributes = preg_replace("/\[share(.*?)\]\s?(.*?)\s?\[\/share\]\s?/ism", "$1", $body);
+	// Skip if there is no shared message in there
+	if ($body == $attributes) {
+		return false;
+	}
+
+	$link = "";
+	preg_match("/link='(.*?)'/ism", $attributes, $matches);
+	if (!empty($matches[1])) {
+		$link = $matches[1];
+	}
+
+	preg_match('/link="(.*?)"/ism', $attributes, $matches);
+	if (!empty($matches[1])) {
+		$link = $matches[1];
+	}
+
+	$id = preg_replace("=https?://twitter.com/(.*)/status/(.*)=ism", "$2", $link);
+	if ($id == $link) {
+		return false;
+	}
+
+	Logger::log('twitter_is_retweet: Retweeting id ' . $id . ' for user ' . $uid, Logger::DEBUG);
+
+	$ckey    = Config::get('twitter', 'consumerkey');
+	$csecret = Config::get('twitter', 'consumersecret');
+	$otoken  = PConfig::get($uid, 'twitter', 'oauthtoken');
+	$osecret = PConfig::get($uid, 'twitter', 'oauthsecret');
+
+	$connection = new TwitterOAuth($ckey, $csecret, $otoken, $osecret);
+	$result = $connection->post('statuses/retweet/' . $id);
+
+	Logger::log('twitter_is_retweet: result ' . print_r($result, true), Logger::DEBUG);
+
+	return !isset($result->errors);
+}
+
+function twitter_update_mentions($body)
+{
+	$URLSearchString = "^\[\]";
+	$return = preg_replace_callback(
+		"/@\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism",
+		function ($matches) {
+			if (strpos($matches[1], 'twitter.com')) {
+				$return = '@' . substr($matches[1], strrpos($matches[1], '/') + 1);
+			} else {
+				$return = $matches[2] . ' (' . $matches[1] . ')';
+			}
+
+			return $return;
+		},
+		$body
+	);
+
+	return $return;
+}
+
+function twitter_convert_share(array $attributes, array $author_contact, $content, $is_quote_share)
+{
+	if ($author_contact['network'] == Protocol::TWITTER) {
+		$mention = '@' . $author_contact['nick'];
+	} else {
+		$mention = $author_contact['addr'];
+	}
+
+	return ($is_quote_share ? "\n\n" : '' ) . 'RT ' . $mention . ': ' . $content . "\n\n" . $attributes['link'];
 }
diff --git a/twitter/twitter_sync.php b/twitter/twitter_sync.php
new file mode 100644
index 00000000..b2c655e7
--- /dev/null
+++ b/twitter/twitter_sync.php
@@ -0,0 +1,32 @@
+<?php
+
+use Friendica\Core\Config;
+use Friendica\Core\Logger;
+
+function twitter_sync_run($argv, $argc)
+{
+	$a = Friendica\BaseObject::getApp();
+
+	require_once 'addon/twitter/twitter.php';
+
+	if (function_exists('sys_getloadavg')) {
+		$load = sys_getloadavg();
+		if (intval($load[0]) > Config::get('system', 'maxloadavg', 50)) {
+			Logger::log('system: load ' . $load[0] . ' too high. Twitter sync deferred to next scheduled run.');
+			return;
+		}
+	}
+
+	if ($argc < 3) {
+		return;
+	}
+
+	$mode = intval($argv[1]);
+	$uid = intval($argv[2]);
+
+	if ($mode == 1) {
+		twitter_fetchtimeline($a, $uid);
+	} elseif ($mode == 2) {
+		twitter_fetchhometimeline($a, $uid);
+	}
+}
diff --git a/twitter/vendor/abraham/twitteroauth/.gitignore b/twitter/vendor/abraham/twitteroauth/.gitignore
new file mode 100644
index 00000000..8213dad6
--- /dev/null
+++ b/twitter/vendor/abraham/twitteroauth/.gitignore
@@ -0,0 +1,4 @@
+.DS_Store
+composer.lock
+vendor
+env
diff --git a/twitter/vendor/abraham/twitteroauth/.travis.yml b/twitter/vendor/abraham/twitteroauth/.travis.yml
new file mode 100644
index 00000000..f55a2b8c
--- /dev/null
+++ b/twitter/vendor/abraham/twitteroauth/.travis.yml
@@ -0,0 +1,13 @@
+language: php
+dist: trusty
+php:
+  - '5.6'
+  - '7.0'
+  - '7.1'
+  - hhvm
+sudo: false
+before_script:
+    - composer self-update
+    - composer install --prefer-source --no-interaction
+script:
+  - vendor/bin/phpunit
diff --git a/twitter/vendor/abraham/twitteroauth/CODE_OF_CONDUCT.md b/twitter/vendor/abraham/twitteroauth/CODE_OF_CONDUCT.md
new file mode 100644
index 00000000..dae99ffc
--- /dev/null
+++ b/twitter/vendor/abraham/twitteroauth/CODE_OF_CONDUCT.md
@@ -0,0 +1,46 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at abraham@abrah.am. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
+
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/4/
diff --git a/twitter/vendor/abraham/twitteroauth/LICENSE.md b/twitter/vendor/abraham/twitteroauth/LICENSE.md
new file mode 100644
index 00000000..64e83a15
--- /dev/null
+++ b/twitter/vendor/abraham/twitteroauth/LICENSE.md
@@ -0,0 +1,22 @@
+Copyright (c) 2009 Abraham Williams - http://abrah.am - abraham@abrah.am
+ 
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+ 
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+ 
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
diff --git a/twitter/vendor/abraham/twitteroauth/README.md b/twitter/vendor/abraham/twitteroauth/README.md
new file mode 100644
index 00000000..cc403416
--- /dev/null
+++ b/twitter/vendor/abraham/twitteroauth/README.md
@@ -0,0 +1,10 @@
+<span itemprop="name">TwitterOAuth</span> [![Build Status](https://img.shields.io/travis/abraham/twitteroauth.svg)](https://travis-ci.org/abraham/twitteroauth) [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/abraham/twitteroauth/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/abraham/twitteroauth/?branch=master) [![Issues Count](https://img.shields.io/github/issues/abraham/twitteroauth.svg)](https://github.com/abraham/twitteroauth/issues) [![Latest Version](https://img.shields.io/packagist/v/abraham/twitteroauth.svg)](https://packagist.org/packages/abraham/twitteroauth)
+------------
+
+<p itemprop="description">The most popular PHP library for Twitter's OAuth REST API.</p>
+
+See documentation at https://twitteroauth.com.
+
+PHP versions [listed](https://secure.php.net/supported-versions.php) as "active support" or "security fixes only" are supported.
+
+<img src="https://raw.githubusercontent.com/abraham/twitteroauth-demo/master/images/twitter-logo-blue.png" itemprop="image" alt="Twitter bird" width="200px">
diff --git a/twitter/vendor/abraham/twitteroauth/autoload.php b/twitter/vendor/abraham/twitteroauth/autoload.php
new file mode 100644
index 00000000..cff03e8a
--- /dev/null
+++ b/twitter/vendor/abraham/twitteroauth/autoload.php
@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * Use to autoload needed classes without Composer.
+ *
+ * @param string $class The fully-qualified class name.
+ * @return void
+ */
+spl_autoload_register(function ($class) {
+
+    // project-specific namespace prefix
+    $prefix = 'Abraham\\TwitterOAuth\\';
+
+    // base directory for the namespace prefix
+    $base_dir = __DIR__ . '/src/';
+
+    // does the class use the namespace prefix?
+    $len = strlen($prefix);
+    if (strncmp($prefix, $class, $len) !== 0) {
+        // no, move to the next registered autoloader
+        return;
+    }
+
+    // get the relative class name
+    $relative_class = substr($class, $len);
+
+    // replace the namespace prefix with the base directory, replace namespace
+    // separators with directory separators in the relative class name, append
+    // with .php
+    $file = $base_dir . str_replace('\\', '/', $relative_class) . '.php';
+
+    // if the file exists, require it
+    if (file_exists($file)) {
+        require $file;
+    }
+});
diff --git a/twitter/vendor/abraham/twitteroauth/composer.json b/twitter/vendor/abraham/twitteroauth/composer.json
new file mode 100644
index 00000000..4f24b278
--- /dev/null
+++ b/twitter/vendor/abraham/twitteroauth/composer.json
@@ -0,0 +1,34 @@
+{
+    "name": "abraham/twitteroauth",
+    "type": "library",
+    "description": "The most popular PHP library for use with the Twitter OAuth REST API.",
+    "keywords": ["twitter", "api", "oauth", "rest", "social", "twitter api", "twitter oauth"],
+    "license": "MIT",
+    "homepage": "https://twitteroauth.com",
+    "authors": [
+        {
+            "name": "Abraham Williams",
+            "email": "abraham@abrah.am",
+            "homepage": "https://abrah.am",
+            "role": "Developer"
+        }
+    ],
+    "support": {
+        "source": "https://github.com/abraham/twitteroauth",
+        "issues": "https://github.com/abraham/twitteroauth/issues"
+    },
+    "require": {
+        "php": "^5.6 || ^7.0",
+        "ext-curl": "*"
+    },
+    "require-dev": {
+        "phpunit/phpunit": "~5.7",
+        "squizlabs/php_codesniffer": "~3.0",
+        "phpmd/phpmd": "~2.6"
+    },
+    "autoload": {
+        "psr-4": {
+            "Abraham\\TwitterOAuth\\": "src"
+        }
+    }
+}
diff --git a/twitter/vendor/abraham/twitteroauth/phpmd.xml b/twitter/vendor/abraham/twitteroauth/phpmd.xml
new file mode 100644
index 00000000..ef45e75a
--- /dev/null
+++ b/twitter/vendor/abraham/twitteroauth/phpmd.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<ruleset name="My first PHPMD rule set"
+         xmlns="http://pmd.sf.net/ruleset/1.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://pmd.sf.net/ruleset/1.0.0 http://pmd.sf.net/ruleset_xml_schema.xsd"
+         xsi:noNamespaceSchemaLocation="http://pmd.sf.net/ruleset_xml_schema.xsd">
+  <description>Keep TwitterOAuth source code clean.</description>
+
+  <!-- <rule ref="rulesets/cleancode.xml" /> -->
+  <rule ref="rulesets/codesize.xml" />
+  <rule ref="rulesets/controversial.xml" />
+  <rule ref="rulesets/design.xml" />
+  <rule ref="rulesets/naming.xml" />
+  <rule ref="rulesets/unusedcode.xml" />
+</ruleset>
diff --git a/twitter/vendor/abraham/twitteroauth/phpunit.xml b/twitter/vendor/abraham/twitteroauth/phpunit.xml
new file mode 100644
index 00000000..71cc3e1a
--- /dev/null
+++ b/twitter/vendor/abraham/twitteroauth/phpunit.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit
+        colors="true"
+        bootstrap="tests/bootstrap.php">
+
+    <testsuites>
+        <testsuite name="TwitterOAuth Test Suite">
+            <directory>./tests/</directory>
+        </testsuite>
+    </testsuites>
+</phpunit>
diff --git a/twitter/vendor/abraham/twitteroauth/src/Config.php b/twitter/vendor/abraham/twitteroauth/src/Config.php
new file mode 100644
index 00000000..122016c3
--- /dev/null
+++ b/twitter/vendor/abraham/twitteroauth/src/Config.php
@@ -0,0 +1,90 @@
+<?php
+
+namespace Abraham\TwitterOAuth;
+
+/**
+ * Handle setting and storing config for TwitterOAuth.
+ *
+ * @author Abraham Williams <abraham@abrah.am>
+ */
+class Config
+{
+    /** @var int How long to wait for a response from the API */
+    protected $timeout = 5;
+    /** @var int how long to wait while connecting to the API */
+    protected $connectionTimeout = 5;
+    /**
+     * Decode JSON Response as associative Array
+     *
+     * @see http://php.net/manual/en/function.json-decode.php
+     *
+     * @var bool
+     */
+    protected $decodeJsonAsArray = false;
+    /** @var string User-Agent header */
+    protected $userAgent = 'TwitterOAuth (+https://twitteroauth.com)';
+    /** @var array Store proxy connection details */
+    protected $proxy = [];
+
+    /** @var bool Whether to encode the curl requests with gzip or not */
+    protected $gzipEncoding = true;
+
+    /** @var integer Size for Chunked Uploads */
+    protected $chunkSize = 250000; // 0.25 MegaByte
+
+    /**
+     * Set the connection and response timeouts.
+     *
+     * @param int $connectionTimeout
+     * @param int $timeout
+     */
+    public function setTimeouts($connectionTimeout, $timeout)
+    {
+        $this->connectionTimeout = (int)$connectionTimeout;
+        $this->timeout = (int)$timeout;
+    }
+
+    /**
+     * @param bool $value
+     */
+    public function setDecodeJsonAsArray($value)
+    {
+        $this->decodeJsonAsArray = (bool)$value;
+    }
+
+    /**
+     * @param string $userAgent
+     */
+    public function setUserAgent($userAgent)
+    {
+        $this->userAgent = (string)$userAgent;
+    }
+
+    /**
+     * @param array $proxy
+     */
+    public function setProxy(array $proxy)
+    {
+        $this->proxy = $proxy;
+    }
+
+    /**
+     * Whether to encode the curl requests with gzip or not.
+     *
+     * @param boolean $gzipEncoding
+     */
+    public function setGzipEncoding($gzipEncoding)
+    {
+        $this->gzipEncoding = (bool)$gzipEncoding;
+    }
+
+    /**
+     * Set the size of each part of file for chunked media upload.
+     *
+     * @param int $value
+     */
+    public function setChunkSize($value)
+    {
+        $this->chunkSize = (int)$value;
+    }
+}
diff --git a/twitter/vendor/abraham/twitteroauth/src/Consumer.php b/twitter/vendor/abraham/twitteroauth/src/Consumer.php
new file mode 100644
index 00000000..ceaf1ef5
--- /dev/null
+++ b/twitter/vendor/abraham/twitteroauth/src/Consumer.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * The MIT License
+ * Copyright (c) 2007 Andy Smith
+ */
+namespace Abraham\TwitterOAuth;
+
+class Consumer
+{
+    /** @var string  */
+    public $key;
+    /** @var string  */
+    public $secret;
+    /** @var string|null  */
+    public $callbackUrl;
+
+    /**
+     * @param string $key
+     * @param string $secret
+     * @param null $callbackUrl
+     */
+    public function __construct($key, $secret, $callbackUrl = null)
+    {
+        $this->key = $key;
+        $this->secret = $secret;
+        $this->callbackUrl = $callbackUrl;
+    }
+
+    /**
+     * @return string
+     */
+    public function __toString()
+    {
+        return "Consumer[key=$this->key,secret=$this->secret]";
+    }
+}
diff --git a/twitter/vendor/abraham/twitteroauth/src/HmacSha1.php b/twitter/vendor/abraham/twitteroauth/src/HmacSha1.php
new file mode 100644
index 00000000..d8cdab8f
--- /dev/null
+++ b/twitter/vendor/abraham/twitteroauth/src/HmacSha1.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * The MIT License
+ * Copyright (c) 2007 Andy Smith
+ */
+namespace Abraham\TwitterOAuth;
+
+/**
+ * The HMAC-SHA1 signature method uses the HMAC-SHA1 signature algorithm as defined in [RFC2104]
+ * where the Signature Base String is the text and the key is the concatenated values (each first
+ * encoded per Parameter Encoding) of the Consumer Secret and Token Secret, separated by an '&'
+ * character (ASCII code 38) even if empty.
+ *   - Chapter 9.2 ("HMAC-SHA1")
+ */
+class HmacSha1 extends SignatureMethod
+{
+    /**
+     * {@inheritDoc}
+     */
+    public function getName()
+    {
+        return "HMAC-SHA1";
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function buildSignature(Request $request, Consumer $consumer, Token $token = null)
+    {
+        $signatureBase = $request->getSignatureBaseString();
+
+        $parts = [$consumer->secret, null !== $token ? $token->secret : ""];
+
+        $parts = Util::urlencodeRfc3986($parts);
+        $key = implode('&', $parts);
+
+        return base64_encode(hash_hmac('sha1', $signatureBase, $key, true));
+    }
+}
diff --git a/twitter/vendor/abraham/twitteroauth/src/Request.php b/twitter/vendor/abraham/twitteroauth/src/Request.php
new file mode 100644
index 00000000..a60c23db
--- /dev/null
+++ b/twitter/vendor/abraham/twitteroauth/src/Request.php
@@ -0,0 +1,254 @@
+<?php
+/**
+ * The MIT License
+ * Copyright (c) 2007 Andy Smith
+ */
+namespace Abraham\TwitterOAuth;
+
+class Request
+{
+    protected $parameters;
+    protected $httpMethod;
+    protected $httpUrl;
+    public static $version = '1.0';
+
+    /**
+     * Constructor
+     *
+     * @param string     $httpMethod
+     * @param string     $httpUrl
+     * @param array|null $parameters
+     */
+    public function __construct($httpMethod, $httpUrl, array $parameters = [])
+    {
+        $parameters = array_merge(Util::parseParameters(parse_url($httpUrl, PHP_URL_QUERY)), $parameters);
+        $this->parameters = $parameters;
+        $this->httpMethod = $httpMethod;
+        $this->httpUrl = $httpUrl;
+    }
+
+    /**
+     * pretty much a helper function to set up the request
+     *
+     * @param Consumer $consumer
+     * @param Token    $token
+     * @param string   $httpMethod
+     * @param string   $httpUrl
+     * @param array    $parameters
+     *
+     * @return Request
+     */
+    public static function fromConsumerAndToken(
+        Consumer $consumer,
+        Token $token = null,
+        $httpMethod,
+        $httpUrl,
+        array $parameters = []
+    ) {
+        $defaults = [
+            "oauth_version" => Request::$version,
+            "oauth_nonce" => Request::generateNonce(),
+            "oauth_timestamp" => time(),
+            "oauth_consumer_key" => $consumer->key
+        ];
+        if (null !== $token) {
+            $defaults['oauth_token'] = $token->key;
+        }
+
+        $parameters = array_merge($defaults, $parameters);
+
+        return new Request($httpMethod, $httpUrl, $parameters);
+    }
+
+    /**
+     * @param string $name
+     * @param string $value
+     */
+    public function setParameter($name, $value)
+    {
+        $this->parameters[$name] = $value;
+    }
+
+    /**
+     * @param $name
+     *
+     * @return string|null
+     */
+    public function getParameter($name)
+    {
+        return isset($this->parameters[$name]) ? $this->parameters[$name] : null;
+    }
+
+    /**
+     * @return array
+     */
+    public function getParameters()
+    {
+        return $this->parameters;
+    }
+
+    /**
+     * @param $name
+     */
+    public function removeParameter($name)
+    {
+        unset($this->parameters[$name]);
+    }
+
+    /**
+     * The request parameters, sorted and concatenated into a normalized string.
+     *
+     * @return string
+     */
+    public function getSignableParameters()
+    {
+        // Grab all parameters
+        $params = $this->parameters;
+
+        // Remove oauth_signature if present
+        // Ref: Spec: 9.1.1 ("The oauth_signature parameter MUST be excluded.")
+        if (isset($params['oauth_signature'])) {
+            unset($params['oauth_signature']);
+        }
+
+        return Util::buildHttpQuery($params);
+    }
+
+    /**
+     * Returns the base string of this request
+     *
+     * The base string defined as the method, the url
+     * and the parameters (normalized), each urlencoded
+     * and the concated with &.
+     *
+     * @return string
+     */
+    public function getSignatureBaseString()
+    {
+        $parts = [
+            $this->getNormalizedHttpMethod(),
+            $this->getNormalizedHttpUrl(),
+            $this->getSignableParameters()
+        ];
+
+        $parts = Util::urlencodeRfc3986($parts);
+
+        return implode('&', $parts);
+    }
+
+    /**
+     * Returns the HTTP Method in uppercase
+     *
+     * @return string
+     */
+    public function getNormalizedHttpMethod()
+    {
+        return strtoupper($this->httpMethod);
+    }
+
+    /**
+     * parses the url and rebuilds it to be
+     * scheme://host/path
+     *
+     * @return string
+     */
+    public function getNormalizedHttpUrl()
+    {
+        $parts = parse_url($this->httpUrl);
+
+        $scheme = $parts['scheme'];
+        $host = strtolower($parts['host']);
+        $path = $parts['path'];
+
+        return "$scheme://$host$path";
+    }
+
+    /**
+     * Builds a url usable for a GET request
+     *
+     * @return string
+     */
+    public function toUrl()
+    {
+        $postData = $this->toPostdata();
+        $out = $this->getNormalizedHttpUrl();
+        if ($postData) {
+            $out .= '?' . $postData;
+        }
+        return $out;
+    }
+
+    /**
+     * Builds the data one would send in a POST request
+     *
+     * @return string
+     */
+    public function toPostdata()
+    {
+        return Util::buildHttpQuery($this->parameters);
+    }
+
+    /**
+     * Builds the Authorization: header
+     *
+     * @return string
+     * @throws TwitterOAuthException
+     */
+    public function toHeader()
+    {
+        $first = true;
+        $out = 'Authorization: OAuth';
+        foreach ($this->parameters as $k => $v) {
+            if (substr($k, 0, 5) != "oauth") {
+                continue;
+            }
+            if (is_array($v)) {
+                throw new TwitterOAuthException('Arrays not supported in headers');
+            }
+            $out .= ($first) ? ' ' : ', ';
+            $out .= Util::urlencodeRfc3986($k) . '="' . Util::urlencodeRfc3986($v) . '"';
+            $first = false;
+        }
+        return $out;
+    }
+
+    /**
+     * @return string
+     */
+    public function __toString()
+    {
+        return $this->toUrl();
+    }
+
+    /**
+     * @param SignatureMethod $signatureMethod
+     * @param Consumer        $consumer
+     * @param Token           $token
+     */
+    public function signRequest(SignatureMethod $signatureMethod, Consumer $consumer, Token $token = null)
+    {
+        $this->setParameter("oauth_signature_method", $signatureMethod->getName());
+        $signature = $this->buildSignature($signatureMethod, $consumer, $token);
+        $this->setParameter("oauth_signature", $signature);
+    }
+
+    /**
+     * @param SignatureMethod $signatureMethod
+     * @param Consumer        $consumer
+     * @param Token           $token
+     *
+     * @return string
+     */
+    public function buildSignature(SignatureMethod $signatureMethod, Consumer $consumer, Token $token = null)
+    {
+        return $signatureMethod->buildSignature($this, $consumer, $token);
+    }
+
+    /**
+     * @return string
+     */
+    public static function generateNonce()
+    {
+        return md5(microtime() . mt_rand());
+    }
+}
diff --git a/twitter/vendor/abraham/twitteroauth/src/Response.php b/twitter/vendor/abraham/twitteroauth/src/Response.php
new file mode 100644
index 00000000..982b6ae3
--- /dev/null
+++ b/twitter/vendor/abraham/twitteroauth/src/Response.php
@@ -0,0 +1,107 @@
+<?php
+
+namespace Abraham\TwitterOAuth;
+
+/**
+ * The result of the most recent API request.
+ *
+ * @author Abraham Williams <abraham@abrah.am>
+ */
+class Response
+{
+    /** @var string|null API path from the most recent request */
+    private $apiPath;
+    /** @var int HTTP status code from the most recent request */
+    private $httpCode = 0;
+    /** @var array HTTP headers from the most recent request */
+    private $headers = [];
+    /** @var array|object Response body from the most recent request */
+    private $body = [];
+    /** @var array HTTP headers from the most recent request that start with X */
+    private $xHeaders = [];
+
+    /**
+     * @param string $apiPath
+     */
+    public function setApiPath($apiPath)
+    {
+        $this->apiPath = $apiPath;
+    }
+
+    /**
+     * @return string|null
+     */
+    public function getApiPath()
+    {
+        return $this->apiPath;
+    }
+
+    /**
+     * @param array|object $body
+     */
+    public function setBody($body)
+    {
+        $this->body = $body;
+    }
+
+    /**
+     * @return array|object|string
+     */
+    public function getBody()
+    {
+        return $this->body;
+    }
+
+    /**
+     * @param int $httpCode
+     */
+    public function setHttpCode($httpCode)
+    {
+        $this->httpCode = $httpCode;
+    }
+
+    /**
+     * @return int
+     */
+    public function getHttpCode()
+    {
+        return $this->httpCode;
+    }
+
+    /**
+     * @param array $headers
+     */
+    public function setHeaders(array $headers)
+    {
+        foreach ($headers as $key => $value) {
+            if (substr($key, 0, 1) == 'x') {
+                $this->xHeaders[$key] = $value;
+            }
+        }
+        $this->headers = $headers;
+    }
+
+    /**
+     * @return array
+     */
+    public function getsHeaders()
+    {
+        return $this->headers;
+    }
+
+    /**
+     * @param array $xHeaders
+     */
+    public function setXHeaders(array $xHeaders = [])
+    {
+        $this->xHeaders = $xHeaders;
+    }
+
+    /**
+     * @return array
+     */
+    public function getXHeaders()
+    {
+        return $this->xHeaders;
+    }
+}
diff --git a/twitter/vendor/abraham/twitteroauth/src/SignatureMethod.php b/twitter/vendor/abraham/twitteroauth/src/SignatureMethod.php
new file mode 100644
index 00000000..40fd51e8
--- /dev/null
+++ b/twitter/vendor/abraham/twitteroauth/src/SignatureMethod.php
@@ -0,0 +1,66 @@
+<?php
+/**
+ * The MIT License
+ * Copyright (c) 2007 Andy Smith
+ */
+namespace Abraham\TwitterOAuth;
+
+/**
+ * A class for implementing a Signature Method
+ * See section 9 ("Signing Requests") in the spec
+ */
+abstract class SignatureMethod
+{
+    /**
+     * Needs to return the name of the Signature Method (ie HMAC-SHA1)
+     *
+     * @return string
+     */
+    abstract public function getName();
+
+    /**
+     * Build up the signature
+     * NOTE: The output of this function MUST NOT be urlencoded.
+     * the encoding is handled in OAuthRequest when the final
+     * request is serialized
+     *
+     * @param Request $request
+     * @param Consumer $consumer
+     * @param Token $token
+     *
+     * @return string
+     */
+    abstract public function buildSignature(Request $request, Consumer $consumer, Token $token = null);
+
+    /**
+     * Verifies that a given signature is correct
+     *
+     * @param Request $request
+     * @param Consumer $consumer
+     * @param Token $token
+     * @param string $signature
+     *
+     * @return bool
+     */
+    public function checkSignature(Request $request, Consumer $consumer, Token $token, $signature)
+    {
+        $built = $this->buildSignature($request, $consumer, $token);
+
+        // Check for zero length, although unlikely here
+        if (strlen($built) == 0 || strlen($signature) == 0) {
+            return false;
+        }
+
+        if (strlen($built) != strlen($signature)) {
+            return false;
+        }
+
+        // Avoid a timing leak with a (hopefully) time insensitive compare
+        $result = 0;
+        for ($i = 0; $i < strlen($signature); $i++) {
+            $result |= ord($built{$i}) ^ ord($signature{$i});
+        }
+
+        return $result == 0;
+    }
+}
diff --git a/twitter/vendor/abraham/twitteroauth/src/Token.php b/twitter/vendor/abraham/twitteroauth/src/Token.php
new file mode 100644
index 00000000..140c1ecc
--- /dev/null
+++ b/twitter/vendor/abraham/twitteroauth/src/Token.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * The MIT License
+ * Copyright (c) 2007 Andy Smith
+ */
+namespace Abraham\TwitterOAuth;
+
+class Token
+{
+    /** @var string */
+    public $key;
+    /** @var string */
+    public $secret;
+
+    /**
+     * @param string $key    The OAuth Token
+     * @param string $secret The OAuth Token Secret
+     */
+    public function __construct($key, $secret)
+    {
+        $this->key = $key;
+        $this->secret = $secret;
+    }
+
+    /**
+     * Generates the basic string serialization of a token that a server
+     * would respond to request_token and access_token calls with
+     *
+     * @return string
+     */
+    public function __toString()
+    {
+        return sprintf("oauth_token=%s&oauth_token_secret=%s",
+            Util::urlencodeRfc3986($this->key),
+            Util::urlencodeRfc3986($this->secret)
+        );
+    }
+}
diff --git a/twitter/vendor/abraham/twitteroauth/src/TwitterOAuth.php b/twitter/vendor/abraham/twitteroauth/src/TwitterOAuth.php
new file mode 100644
index 00000000..fbb2e418
--- /dev/null
+++ b/twitter/vendor/abraham/twitteroauth/src/TwitterOAuth.php
@@ -0,0 +1,508 @@
+<?php
+/**
+ * The most popular PHP library for use with the Twitter OAuth REST API.
+ *
+ * @license MIT
+ */
+namespace Abraham\TwitterOAuth;
+
+use Abraham\TwitterOAuth\Util\JsonDecoder;
+
+/**
+ * TwitterOAuth class for interacting with the Twitter API.
+ *
+ * @author Abraham Williams <abraham@abrah.am>
+ */
+class TwitterOAuth extends Config
+{
+    const API_VERSION = '1.1';
+    const API_HOST = 'https://api.twitter.com';
+    const UPLOAD_HOST = 'https://upload.twitter.com';
+
+    /** @var Response details about the result of the last request */
+    private $response;
+    /** @var string|null Application bearer token */
+    private $bearer;
+    /** @var Consumer Twitter application details */
+    private $consumer;
+    /** @var Token|null User access token details */
+    private $token;
+    /** @var HmacSha1 OAuth 1 signature type used by Twitter */
+    private $signatureMethod;
+
+    /**
+     * Constructor
+     *
+     * @param string      $consumerKey      The Application Consumer Key
+     * @param string      $consumerSecret   The Application Consumer Secret
+     * @param string|null $oauthToken       The Client Token (optional)
+     * @param string|null $oauthTokenSecret The Client Token Secret (optional)
+     */
+    public function __construct($consumerKey, $consumerSecret, $oauthToken = null, $oauthTokenSecret = null)
+    {
+        $this->resetLastResponse();
+        $this->signatureMethod = new HmacSha1();
+        $this->consumer = new Consumer($consumerKey, $consumerSecret);
+        if (!empty($oauthToken) && !empty($oauthTokenSecret)) {
+            $this->token = new Token($oauthToken, $oauthTokenSecret);
+        }
+        if (empty($oauthToken) && !empty($oauthTokenSecret)) {
+            $this->bearer = $oauthTokenSecret;
+        }
+    }
+
+    /**
+     * @param string $oauthToken
+     * @param string $oauthTokenSecret
+     */
+    public function setOauthToken($oauthToken, $oauthTokenSecret)
+    {
+        $this->token = new Token($oauthToken, $oauthTokenSecret);
+    }
+
+    /**
+     * @return string|null
+     */
+    public function getLastApiPath()
+    {
+        return $this->response->getApiPath();
+    }
+
+    /**
+     * @return int
+     */
+    public function getLastHttpCode()
+    {
+        return $this->response->getHttpCode();
+    }
+
+    /**
+     * @return array
+     */
+    public function getLastXHeaders()
+    {
+        return $this->response->getXHeaders();
+    }
+
+    /**
+     * @return array|object|null
+     */
+    public function getLastBody()
+    {
+        return $this->response->getBody();
+    }
+
+    /**
+     * Resets the last response cache.
+     */
+    public function resetLastResponse()
+    {
+        $this->response = new Response();
+    }
+
+    /**
+     * Make URLs for user browser navigation.
+     *
+     * @param string $path
+     * @param array  $parameters
+     *
+     * @return string
+     */
+    public function url($path, array $parameters)
+    {
+        $this->resetLastResponse();
+        $this->response->setApiPath($path);
+        $query = http_build_query($parameters);
+        return sprintf('%s/%s?%s', self::API_HOST, $path, $query);
+    }
+
+    /**
+     * Make /oauth/* requests to the API.
+     *
+     * @param string $path
+     * @param array  $parameters
+     *
+     * @return array
+     * @throws TwitterOAuthException
+     */
+    public function oauth($path, array $parameters = [])
+    {
+        $response = [];
+        $this->resetLastResponse();
+        $this->response->setApiPath($path);
+        $url = sprintf('%s/%s', self::API_HOST, $path);
+        $result = $this->oAuthRequest($url, 'POST', $parameters);
+
+        if ($this->getLastHttpCode() != 200) {
+            throw new TwitterOAuthException($result);
+        }
+
+        parse_str($result, $response);
+        $this->response->setBody($response);
+
+        return $response;
+    }
+
+    /**
+     * Make /oauth2/* requests to the API.
+     *
+     * @param string $path
+     * @param array  $parameters
+     *
+     * @return array|object
+     */
+    public function oauth2($path, array $parameters = [])
+    {
+        $method = 'POST';
+        $this->resetLastResponse();
+        $this->response->setApiPath($path);
+        $url = sprintf('%s/%s', self::API_HOST, $path);
+        $request = Request::fromConsumerAndToken($this->consumer, $this->token, $method, $url, $parameters);
+        $authorization = 'Authorization: Basic ' . $this->encodeAppAuthorization($this->consumer);
+        $result = $this->request($request->getNormalizedHttpUrl(), $method, $authorization, $parameters);
+        $response = JsonDecoder::decode($result, $this->decodeJsonAsArray);
+        $this->response->setBody($response);
+        return $response;
+    }
+
+    /**
+     * Make GET requests to the API.
+     *
+     * @param string $path
+     * @param array  $parameters
+     *
+     * @return array|object
+     */
+    public function get($path, array $parameters = [])
+    {
+        return $this->http('GET', self::API_HOST, $path, $parameters);
+    }
+
+    /**
+     * Make POST requests to the API.
+     *
+     * @param string $path
+     * @param array  $parameters
+     *
+     * @return array|object
+     */
+    public function post($path, array $parameters = [])
+    {
+        return $this->http('POST', self::API_HOST, $path, $parameters);
+    }
+
+    /**
+     * Make DELETE requests to the API.
+     *
+     * @param string $path
+     * @param array  $parameters
+     *
+     * @return array|object
+     */
+    public function delete($path, array $parameters = [])
+    {
+        return $this->http('DELETE', self::API_HOST, $path, $parameters);
+    }
+
+    /**
+     * Make PUT requests to the API.
+     *
+     * @param string $path
+     * @param array  $parameters
+     *
+     * @return array|object
+     */
+    public function put($path, array $parameters = [])
+    {
+        return $this->http('PUT', self::API_HOST, $path, $parameters);
+    }
+
+    /**
+     * Upload media to upload.twitter.com.
+     *
+     * @param string $path
+     * @param array  $parameters
+     * @param boolean  $chunked
+     *
+     * @return array|object
+     */
+    public function upload($path, array $parameters = [], $chunked = false)
+    {
+        if ($chunked) {
+            return $this->uploadMediaChunked($path, $parameters);
+        } else {
+            return $this->uploadMediaNotChunked($path, $parameters);
+        }
+    }
+
+    /**
+     * Private method to upload media (not chunked) to upload.twitter.com.
+     *
+     * @param string $path
+     * @param array  $parameters
+     *
+     * @return array|object
+     */
+    private function uploadMediaNotChunked($path, array $parameters)
+    {
+        $file = file_get_contents($parameters['media']);
+        $base = base64_encode($file);
+        $parameters['media'] = $base;
+        return $this->http('POST', self::UPLOAD_HOST, $path, $parameters);
+    }
+
+    /**
+     * Private method to upload media (chunked) to upload.twitter.com.
+     *
+     * @param string $path
+     * @param array  $parameters
+     *
+     * @return array|object
+     */
+    private function uploadMediaChunked($path, array $parameters)
+    {
+        $init = $this->http('POST', self::UPLOAD_HOST, $path, $this->mediaInitParameters($parameters));
+        // Append
+        $segmentIndex = 0;
+        $media = fopen($parameters['media'], 'rb');
+        while (!feof($media))
+        {
+            $this->http('POST', self::UPLOAD_HOST, 'media/upload', [
+                'command' => 'APPEND',
+                'media_id' => $init->media_id_string,
+                'segment_index' => $segmentIndex++,
+                'media_data' => base64_encode(fread($media, $this->chunkSize))
+            ]);
+        }
+        fclose($media);
+        // Finalize
+        $finalize = $this->http('POST', self::UPLOAD_HOST, 'media/upload', [
+            'command' => 'FINALIZE',
+            'media_id' => $init->media_id_string
+        ]);
+        return $finalize;
+    }
+
+    /**
+     * Private method to get params for upload media chunked init.
+     * Twitter docs: https://dev.twitter.com/rest/reference/post/media/upload-init.html
+     *
+     * @param array  $parameters
+     *
+     * @return array
+     */
+    private function mediaInitParameters(array $parameters)
+    {
+        $return = [
+            'command' => 'INIT',
+            'media_type' => $parameters['media_type'],
+            'total_bytes' => filesize($parameters['media'])
+        ];
+        if (isset($parameters['additional_owners'])) {
+            $return['additional_owners'] = $parameters['additional_owners'];
+        }
+        if (isset($parameters['media_category'])) {
+            $return['media_category'] = $parameters['media_category'];
+        }
+        return $return;
+    }
+
+    /**
+     * @param string $method
+     * @param string $host
+     * @param string $path
+     * @param array  $parameters
+     *
+     * @return array|object
+     */
+    private function http($method, $host, $path, array $parameters)
+    {
+        $this->resetLastResponse();
+        $url = sprintf('%s/%s/%s.json', $host, self::API_VERSION, $path);
+        $this->response->setApiPath($path);
+        $result = $this->oAuthRequest($url, $method, $parameters);
+        $response = JsonDecoder::decode($result, $this->decodeJsonAsArray);
+        $this->response->setBody($response);
+        return $response;
+    }
+
+    /**
+     * Format and sign an OAuth / API request
+     *
+     * @param string $url
+     * @param string $method
+     * @param array  $parameters
+     *
+     * @return string
+     * @throws TwitterOAuthException
+     */
+    private function oAuthRequest($url, $method, array $parameters)
+    {
+        $request = Request::fromConsumerAndToken($this->consumer, $this->token, $method, $url, $parameters);
+        if (array_key_exists('oauth_callback', $parameters)) {
+            // Twitter doesn't like oauth_callback as a parameter.
+            unset($parameters['oauth_callback']);
+        }
+        if ($this->bearer === null) {
+            $request->signRequest($this->signatureMethod, $this->consumer, $this->token);
+            $authorization = $request->toHeader();
+            if (array_key_exists('oauth_verifier', $parameters)) {
+                // Twitter doesn't always work with oauth in the body and in the header
+                // and it's already included in the $authorization header
+                unset($parameters['oauth_verifier']);
+            }
+        } else {
+            $authorization = 'Authorization: Bearer ' . $this->bearer;
+        }
+        return $this->request($request->getNormalizedHttpUrl(), $method, $authorization, $parameters);
+    }
+
+    /**
+     * Set Curl options.
+     *
+     * @return array
+     */
+    private function curlOptions()
+    {
+        $options = [
+            // CURLOPT_VERBOSE => true,
+            CURLOPT_CONNECTTIMEOUT => $this->connectionTimeout,
+            CURLOPT_HEADER => true,
+            CURLOPT_RETURNTRANSFER => true,
+            CURLOPT_SSL_VERIFYHOST => 2,
+            CURLOPT_SSL_VERIFYPEER => true,
+            CURLOPT_TIMEOUT => $this->timeout,
+            CURLOPT_USERAGENT => $this->userAgent,
+        ];
+
+        if ($this->useCAFile()) {
+            $options[CURLOPT_CAINFO] = __DIR__ . DIRECTORY_SEPARATOR . 'cacert.pem';
+        }
+
+        if($this->gzipEncoding) {
+            $options[CURLOPT_ENCODING] = 'gzip';
+        }
+
+        if (!empty($this->proxy)) {
+            $options[CURLOPT_PROXY] = $this->proxy['CURLOPT_PROXY'];
+            $options[CURLOPT_PROXYUSERPWD] = $this->proxy['CURLOPT_PROXYUSERPWD'];
+            $options[CURLOPT_PROXYPORT] = $this->proxy['CURLOPT_PROXYPORT'];
+            $options[CURLOPT_PROXYAUTH] = CURLAUTH_BASIC;
+            $options[CURLOPT_PROXYTYPE] = CURLPROXY_HTTP;
+        }
+
+        return $options;
+    }
+
+    /**
+     * Make an HTTP request
+     *
+     * @param string $url
+     * @param string $method
+     * @param string $authorization
+     * @param array $postfields
+     *
+     * @return string
+     * @throws TwitterOAuthException
+     */
+    private function request($url, $method, $authorization, array $postfields)
+    {
+        $options = $this->curlOptions($url, $authorization);
+        $options[CURLOPT_URL] = $url;
+        $options[CURLOPT_HTTPHEADER] = ['Accept: application/json', $authorization, 'Expect:'];
+
+        switch ($method) {
+            case 'GET':
+                break;
+            case 'POST':
+                $options[CURLOPT_POST] = true;
+                $options[CURLOPT_POSTFIELDS] = Util::buildHttpQuery($postfields);
+                break;
+            case 'DELETE':
+                $options[CURLOPT_CUSTOMREQUEST] = 'DELETE';
+                break;
+            case 'PUT':
+                $options[CURLOPT_CUSTOMREQUEST] = 'PUT';
+                break;
+        }
+
+        if (in_array($method, ['GET', 'PUT', 'DELETE']) && !empty($postfields)) {
+            $options[CURLOPT_URL] .= '?' . Util::buildHttpQuery($postfields);
+        }
+
+
+        $curlHandle = curl_init();
+        curl_setopt_array($curlHandle, $options);
+        $response = curl_exec($curlHandle);
+
+        // Throw exceptions on cURL errors.
+        if (curl_errno($curlHandle) > 0) {
+            throw new TwitterOAuthException(curl_error($curlHandle), curl_errno($curlHandle));
+        }
+
+        $this->response->setHttpCode(curl_getinfo($curlHandle, CURLINFO_HTTP_CODE));
+        $parts = explode("\r\n\r\n", $response);
+        $responseBody = array_pop($parts);
+        $responseHeader = array_pop($parts);
+        $this->response->setHeaders($this->parseHeaders($responseHeader));
+
+        curl_close($curlHandle);
+
+        return $responseBody;
+    }
+
+    /**
+     * Get the header info to store.
+     *
+     * @param string $header
+     *
+     * @return array
+     */
+    private function parseHeaders($header)
+    {
+        $headers = [];
+        foreach (explode("\r\n", $header) as $line) {
+            if (strpos($line, ':') !== false) {
+                list ($key, $value) = explode(': ', $line);
+                $key = str_replace('-', '_', strtolower($key));
+                $headers[$key] = trim($value);
+            }
+        }
+        return $headers;
+    }
+
+    /**
+     * Encode application authorization header with base64.
+     *
+     * @param Consumer $consumer
+     *
+     * @return string
+     */
+    private function encodeAppAuthorization(Consumer $consumer)
+    {
+        $key = rawurlencode($consumer->key);
+        $secret = rawurlencode($consumer->secret);
+        return base64_encode($key . ':' . $secret);
+    }
+
+    /**
+     * Is the code running from a Phar module.
+     *
+     * @return boolean
+     */
+    private function pharRunning()
+    {
+        return class_exists('Phar') && \Phar::running(false) !== '';
+    }
+
+    /**
+     * Use included CA file instead of OS provided list.
+     *
+     * @return boolean
+     */
+    private function useCAFile()
+    {
+        /* Use CACert file when not in a PHAR file. */
+        return !$this->pharRunning();
+    }
+}
diff --git a/twitter/vendor/abraham/twitteroauth/src/TwitterOAuthException.php b/twitter/vendor/abraham/twitteroauth/src/TwitterOAuthException.php
new file mode 100644
index 00000000..79903eca
--- /dev/null
+++ b/twitter/vendor/abraham/twitteroauth/src/TwitterOAuthException.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Abraham\TwitterOAuth;
+
+/**
+ * @author Abraham Williams <abraham@abrah.am>
+ */
+class TwitterOAuthException extends \Exception
+{
+}
diff --git a/twitter/vendor/abraham/twitteroauth/src/Util.php b/twitter/vendor/abraham/twitteroauth/src/Util.php
new file mode 100644
index 00000000..372af953
--- /dev/null
+++ b/twitter/vendor/abraham/twitteroauth/src/Util.php
@@ -0,0 +1,115 @@
+<?php
+/**
+ * The MIT License
+ * Copyright (c) 2007 Andy Smith
+ */
+namespace Abraham\TwitterOAuth;
+
+class Util
+{
+    /**
+     * @param $input
+     *
+     * @return array|mixed|string
+     */
+    public static function urlencodeRfc3986($input)
+    {
+        $output = '';
+        if (is_array($input)) {
+            $output = array_map([__NAMESPACE__ . '\Util', 'urlencodeRfc3986'], $input);
+        } elseif (is_scalar($input)) {
+            $output = rawurlencode($input);
+        }
+        return $output;
+    }
+
+    /**
+     * @param string $string
+     *
+     * @return string
+     */
+    public static function urldecodeRfc3986($string)
+    {
+        return urldecode($string);
+    }
+
+    /**
+     * This function takes a input like a=b&a=c&d=e and returns the parsed
+     * parameters like this
+     * array('a' => array('b','c'), 'd' => 'e')
+     *
+     * @param string $input
+     *
+     * @return array
+     */
+    public static function parseParameters($input)
+    {
+        if (!is_string($input)) {
+            return [];
+        }
+
+        $pairs = explode('&', $input);
+
+        $parameters = [];
+        foreach ($pairs as $pair) {
+            $split = explode('=', $pair, 2);
+            $parameter = Util::urldecodeRfc3986($split[0]);
+            $value = isset($split[1]) ? Util::urldecodeRfc3986($split[1]) : '';
+
+            if (isset($parameters[$parameter])) {
+                // We have already recieved parameter(s) with this name, so add to the list
+                // of parameters with this name
+
+                if (is_scalar($parameters[$parameter])) {
+                    // This is the first duplicate, so transform scalar (string) into an array
+                    // so we can add the duplicates
+                    $parameters[$parameter] = [$parameters[$parameter]];
+                }
+
+                $parameters[$parameter][] = $value;
+            } else {
+                $parameters[$parameter] = $value;
+            }
+        }
+        return $parameters;
+    }
+
+    /**
+     * @param array $params
+     *
+     * @return string
+     */
+    public static function buildHttpQuery(array $params)
+    {
+        if (empty($params)) {
+            return '';
+        }
+
+        // Urlencode both keys and values
+        $keys = Util::urlencodeRfc3986(array_keys($params));
+        $values = Util::urlencodeRfc3986(array_values($params));
+        $params = array_combine($keys, $values);
+
+        // Parameters are sorted by name, using lexicographical byte value ordering.
+        // Ref: Spec: 9.1.1 (1)
+        uksort($params, 'strcmp');
+
+        $pairs = [];
+        foreach ($params as $parameter => $value) {
+            if (is_array($value)) {
+                // If two or more parameters share the same name, they are sorted by their value
+                // Ref: Spec: 9.1.1 (1)
+                // June 12th, 2010 - changed to sort because of issue 164 by hidetaka
+                sort($value, SORT_STRING);
+                foreach ($value as $duplicateValue) {
+                    $pairs[] = $parameter . '=' . $duplicateValue;
+                }
+            } else {
+                $pairs[] = $parameter . '=' . $value;
+            }
+        }
+        // For each parameter, the name is separated from the corresponding value by an '=' character (ASCII code 61)
+        // Each name-value pair is separated by an '&' character (ASCII code 38)
+        return implode('&', $pairs);
+    }
+}
diff --git a/twitter/vendor/abraham/twitteroauth/src/Util/JsonDecoder.php b/twitter/vendor/abraham/twitteroauth/src/Util/JsonDecoder.php
new file mode 100644
index 00000000..c8589c53
--- /dev/null
+++ b/twitter/vendor/abraham/twitteroauth/src/Util/JsonDecoder.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace Abraham\TwitterOAuth\Util;
+
+/**
+ * @author louis <louis@systemli.org>
+ */
+class JsonDecoder
+{
+    /**
+     * Decodes a JSON string to stdObject or associative array
+     *
+     * @param string $string
+     * @param bool   $asArray
+     *
+     * @return array|object
+     */
+    public static function decode($string, $asArray)
+    {
+        if (version_compare(PHP_VERSION, '5.4.0', '>=') && !(defined('JSON_C_VERSION') && PHP_INT_SIZE > 4)) {
+            return json_decode($string, $asArray, 512, JSON_BIGINT_AS_STRING);
+        }
+
+        return json_decode($string, $asArray);
+    }
+}
diff --git a/twitter/vendor/abraham/twitteroauth/src/cacert.pem b/twitter/vendor/abraham/twitteroauth/src/cacert.pem
new file mode 100644
index 00000000..8849e024
--- /dev/null
+++ b/twitter/vendor/abraham/twitteroauth/src/cacert.pem
@@ -0,0 +1,4043 @@
+##
+## Bundle of CA Root Certificates
+##
+## Certificate data from Mozilla as of: Wed Jan 18 04:12:05 2017 GMT
+##
+## This is a bundle of X.509 certificates of public Certificate Authorities
+## (CA). These were automatically extracted from Mozilla's root certificates
+## file (certdata.txt).  This file can be found in the mozilla source tree:
+## https://hg.mozilla.org/releases/mozilla-release/raw-file/default/security/nss/lib/ckfw/builtins/certdata.txt
+##
+## It contains the certificates in PEM format and therefore
+## can be directly used with curl / libcurl / php_curl, or with
+## an Apache+mod_ssl webserver for SSL client authentication.
+## Just configure this file as the SSLCACertificateFile.
+##
+## Conversion done with mk-ca-bundle.pl version 1.27.
+## SHA256: dffa79e6aa993f558e82884abf7bb54bf440ab66ee91d82a27a627f6f2a4ace4
+##
+
+
+GlobalSign Root CA
+==================
+-----BEGIN CERTIFICATE-----
+MIIDdTCCAl2gAwIBAgILBAAAAAABFUtaw5QwDQYJKoZIhvcNAQEFBQAwVzELMAkGA1UEBhMCQkUx
+GTAXBgNVBAoTEEdsb2JhbFNpZ24gbnYtc2ExEDAOBgNVBAsTB1Jvb3QgQ0ExGzAZBgNVBAMTEkds
+b2JhbFNpZ24gUm9vdCBDQTAeFw05ODA5MDExMjAwMDBaFw0yODAxMjgxMjAwMDBaMFcxCzAJBgNV
+BAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMRAwDgYDVQQLEwdSb290IENBMRswGQYD
+VQQDExJHbG9iYWxTaWduIFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDa
+DuaZjc6j40+Kfvvxi4Mla+pIH/EqsLmVEQS98GPR4mdmzxzdzxtIK+6NiY6arymAZavpxy0Sy6sc
+THAHoT0KMM0VjU/43dSMUBUc71DuxC73/OlS8pF94G3VNTCOXkNz8kHp1Wrjsok6Vjk4bwY8iGlb
+Kk3Fp1S4bInMm/k8yuX9ifUSPJJ4ltbcdG6TRGHRjcdGsnUOhugZitVtbNV4FpWi6cgKOOvyJBNP
+c1STE4U6G7weNLWLBYy5d4ux2x8gkasJU26Qzns3dLlwR5EiUWMWea6xrkEmCMgZK9FGqkjWZCrX
+gzT/LCrBbBlDSgeF59N89iFo7+ryUp9/k5DPAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNV
+HRMBAf8EBTADAQH/MB0GA1UdDgQWBBRge2YaRQ2XyolQL30EzTSo//z9SzANBgkqhkiG9w0BAQUF
+AAOCAQEA1nPnfE920I2/7LqivjTFKDK1fPxsnCwrvQmeU79rXqoRSLblCKOzyj1hTdNGCbM+w6Dj
+Y1Ub8rrvrTnhQ7k4o+YviiY776BQVvnGCv04zcQLcFGUl5gE38NflNUVyRRBnMRddWQVDf9VMOyG
+j/8N7yy5Y0b2qvzfvGn9LhJIZJrglfCm7ymPAbEVtQwdpf5pLGkkeB6zpxxxYu7KyJesF12KwvhH
+hm4qxFYxldBniYUr+WymXUadDKqC5JlR3XC321Y9YeRq4VzW9v493kHMB65jUr9TU/Qr6cf9tveC
+X4XSQRjbgbMEHMUfpIBvFSDJ3gyICh3WZlXi/EjJKSZp4A==
+-----END CERTIFICATE-----
+
+GlobalSign Root CA - R2
+=======================
+-----BEGIN CERTIFICATE-----
+MIIDujCCAqKgAwIBAgILBAAAAAABD4Ym5g0wDQYJKoZIhvcNAQEFBQAwTDEgMB4GA1UECxMXR2xv
+YmFsU2lnbiBSb290IENBIC0gUjIxEzARBgNVBAoTCkdsb2JhbFNpZ24xEzARBgNVBAMTCkdsb2Jh
+bFNpZ24wHhcNMDYxMjE1MDgwMDAwWhcNMjExMjE1MDgwMDAwWjBMMSAwHgYDVQQLExdHbG9iYWxT
+aWduIFJvb3QgQ0EgLSBSMjETMBEGA1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFsU2ln
+bjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKbPJA6+Lm8omUVCxKs+IVSbC9N/hHD6
+ErPLv4dfxn+G07IwXNb9rfF73OX4YJYJkhD10FPe+3t+c4isUoh7SqbKSaZeqKeMWhG8eoLrvozp
+s6yWJQeXSpkqBy+0Hne/ig+1AnwblrjFuTosvNYSuetZfeLQBoZfXklqtTleiDTsvHgMCJiEbKjN
+S7SgfQx5TfC4LcshytVsW33hoCmEofnTlEnLJGKRILzdC9XZzPnqJworc5HGnRusyMvo4KD0L5CL
+TfuwNhv2GXqF4G3yYROIXJ/gkwpRl4pazq+r1feqCapgvdzZX99yqWATXgAByUr6P6TqBwMhAo6C
+ygPCm48CAwEAAaOBnDCBmTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4E
+FgQUm+IHV2ccHsBqBt5ZtJot39wZhi4wNgYDVR0fBC8wLTAroCmgJ4YlaHR0cDovL2NybC5nbG9i
+YWxzaWduLm5ldC9yb290LXIyLmNybDAfBgNVHSMEGDAWgBSb4gdXZxwewGoG3lm0mi3f3BmGLjAN
+BgkqhkiG9w0BAQUFAAOCAQEAmYFThxxol4aR7OBKuEQLq4GsJ0/WwbgcQ3izDJr86iw8bmEbTUsp
+9Z8FHSbBuOmDAGJFtqkIk7mpM0sYmsL4h4hO291xNBrBVNpGP+DTKqttVCL1OmLNIG+6KYnX3ZHu
+01yiPqFbQfXf5WRDLenVOavSot+3i9DAgBkcRcAtjOj4LaR0VknFBbVPFd5uRHg5h6h+u/N5GJG7
+9G+dwfCMNYxdAfvDbbnvRG15RjF+Cv6pgsH/76tuIMRQyV+dTZsXjAzlAcmgQWpzU/qlULRuJQ/7
+TBj0/VLZjmmx6BEP3ojY+x1J96relc8geMJgEtslQIxq/H5COEBkEveegeGTLg==
+-----END CERTIFICATE-----
+
+Verisign Class 3 Public Primary Certification Authority - G3
+============================================================
+-----BEGIN CERTIFICATE-----
+MIIEGjCCAwICEQCbfgZJoz5iudXukEhxKe9XMA0GCSqGSIb3DQEBBQUAMIHKMQswCQYDVQQGEwJV
+UzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRydXN0IE5ldHdv
+cmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNl
+IG9ubHkxRTBDBgNVBAMTPFZlcmlTaWduIENsYXNzIDMgUHVibGljIFByaW1hcnkgQ2VydGlmaWNh
+dGlvbiBBdXRob3JpdHkgLSBHMzAeFw05OTEwMDEwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMIHKMQsw
+CQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRy
+dXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJbmMuIC0gRm9yIGF1dGhv
+cml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlTaWduIENsYXNzIDMgUHVibGljIFByaW1hcnkg
+Q2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBAMu6nFL8eB8aHm8bN3O9+MlrlBIwT/A2R/XQkQr1F8ilYcEWQE37imGQ5XYgwREGfassbqb1
+EUGO+i2tKmFZpGcmTNDovFJbcCAEWNF6yaRpvIMXZK0Fi7zQWM6NjPXr8EJJC52XJ2cybuGukxUc
+cLwgTS8Y3pKI6GyFVxEa6X7jJhFUokWWVYPKMIno3Nij7SqAP395ZVc+FSBmCC+Vk7+qRy+oRpfw
+EuL+wgorUeZ25rdGt+INpsyow0xZVYnm6FNcHOqd8GIWC6fJXwzw3sJ2zq/3avL6QaaiMxTJ5Xpj
+055iN9WFZZ4O5lMkdBteHRJTW8cs54NJOxWuimi5V5cCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
+ERSWwauSCPc/L8my/uRan2Te2yFPhpk0djZX3dAVL8WtfxUfN2JzPtTnX84XA9s1+ivbrmAJXx5f
+j267Cz3qWhMeDGBvtcC1IyIuBwvLqXTLR7sdwdela8wv0kL9Sd2nic9TutoAWii/gt/4uhMdUIaC
+/Y4wjylGsB49Ndo4YhYYSq3mtlFs3q9i6wHQHiT+eo8SGhJouPtmmRQURVyu565pF4ErWjfJXir0
+xuKhXFSbplQAz/DxwceYMBo7Nhbbo27q/a2ywtrvAkcTisDxszGtTxzhT5yvDwyd93gN2PQ1VoDa
+t20Xj50egWTh/sVFuq1ruQp6Tk9LhO5L8X3dEQ==
+-----END CERTIFICATE-----
+
+Entrust.net Premium 2048 Secure Server CA
+=========================================
+-----BEGIN CERTIFICATE-----
+MIIEKjCCAxKgAwIBAgIEOGPe+DANBgkqhkiG9w0BAQUFADCBtDEUMBIGA1UEChMLRW50cnVzdC5u
+ZXQxQDA+BgNVBAsUN3d3dy5lbnRydXN0Lm5ldC9DUFNfMjA0OCBpbmNvcnAuIGJ5IHJlZi4gKGxp
+bWl0cyBsaWFiLikxJTAjBgNVBAsTHChjKSAxOTk5IEVudHJ1c3QubmV0IExpbWl0ZWQxMzAxBgNV
+BAMTKkVudHJ1c3QubmV0IENlcnRpZmljYXRpb24gQXV0aG9yaXR5ICgyMDQ4KTAeFw05OTEyMjQx
+NzUwNTFaFw0yOTA3MjQxNDE1MTJaMIG0MRQwEgYDVQQKEwtFbnRydXN0Lm5ldDFAMD4GA1UECxQ3
+d3d3LmVudHJ1c3QubmV0L0NQU18yMDQ4IGluY29ycC4gYnkgcmVmLiAobGltaXRzIGxpYWIuKTEl
+MCMGA1UECxMcKGMpIDE5OTkgRW50cnVzdC5uZXQgTGltaXRlZDEzMDEGA1UEAxMqRW50cnVzdC5u
+ZXQgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgKDIwNDgpMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEArU1LqRKGsuqjIAcVFmQqK0vRvwtKTY7tgHalZ7d4QMBzQshowNtTK91euHaYNZOL
+Gp18EzoOH1u3Hs/lJBQesYGpjX24zGtLA/ECDNyrpUAkAH90lKGdCCmziAv1h3edVc3kw37XamSr
+hRSGlVuXMlBvPci6Zgzj/L24ScF2iUkZ/cCovYmjZy/Gn7xxGWC4LeksyZB2ZnuU4q941mVTXTzW
+nLLPKQP5L6RQstRIzgUyVYr9smRMDuSYB3Xbf9+5CFVghTAp+XtIpGmG4zU/HoZdenoVve8AjhUi
+VBcAkCaTvA5JaJG/+EfTnZVCwQ5N328mz8MYIWJmQ3DW1cAH4QIDAQABo0IwQDAOBgNVHQ8BAf8E
+BAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUVeSB0RGAvtiJuQijMfmhJAkWuXAwDQYJ
+KoZIhvcNAQEFBQADggEBADubj1abMOdTmXx6eadNl9cZlZD7Bh/KM3xGY4+WZiT6QBshJ8rmcnPy
+T/4xmf3IDExoU8aAghOY+rat2l098c5u9hURlIIM7j+VrxGrD9cv3h8Dj1csHsm7mhpElesYT6Yf
+zX1XEC+bBAlahLVu2B064dae0Wx5XnkcFMXj0EyTO2U87d89vqbllRrDtRnDvV5bu/8j72gZyxKT
+J1wDLW8w0B62GqzeWvfRqqgnpv55gcR5mTNXuhKwqeBCbJPKVt7+bYQLCIt+jerXmCHG8+c8eS9e
+nNFMFY3h7CI3zJpDC5fcgJCNs2ebb0gIFVbPv/ErfF6adulZkMV8gzURZVE=
+-----END CERTIFICATE-----
+
+Baltimore CyberTrust Root
+=========================
+-----BEGIN CERTIFICATE-----
+MIIDdzCCAl+gAwIBAgIEAgAAuTANBgkqhkiG9w0BAQUFADBaMQswCQYDVQQGEwJJRTESMBAGA1UE
+ChMJQmFsdGltb3JlMRMwEQYDVQQLEwpDeWJlclRydXN0MSIwIAYDVQQDExlCYWx0aW1vcmUgQ3li
+ZXJUcnVzdCBSb290MB4XDTAwMDUxMjE4NDYwMFoXDTI1MDUxMjIzNTkwMFowWjELMAkGA1UEBhMC
+SUUxEjAQBgNVBAoTCUJhbHRpbW9yZTETMBEGA1UECxMKQ3liZXJUcnVzdDEiMCAGA1UEAxMZQmFs
+dGltb3JlIEN5YmVyVHJ1c3QgUm9vdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKME
+uyKrmD1X6CZymrV51Cni4eiVgLGw41uOKymaZN+hXe2wCQVt2yguzmKiYv60iNoS6zjrIZ3AQSsB
+UnuId9Mcj8e6uYi1agnnc+gRQKfRzMpijS3ljwumUNKoUMMo6vWrJYeKmpYcqWe4PwzV9/lSEy/C
+G9VwcPCPwBLKBsua4dnKM3p31vjsufFoREJIE9LAwqSuXmD+tqYF/LTdB1kC1FkYmGP1pWPgkAx9
+XbIGevOF6uvUA65ehD5f/xXtabz5OTZydc93Uk3zyZAsuT3lySNTPx8kmCFcB5kpvcY67Oduhjpr
+l3RjM71oGDHweI12v/yejl0qhqdNkNwnGjkCAwEAAaNFMEMwHQYDVR0OBBYEFOWdWTCCR1jMrPoI
+VDaGezq1BE3wMBIGA1UdEwEB/wQIMAYBAf8CAQMwDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEB
+BQUAA4IBAQCFDF2O5G9RaEIFoN27TyclhAO992T9Ldcw46QQF+vaKSm2eT929hkTI7gQCvlYpNRh
+cL0EYWoSihfVCr3FvDB81ukMJY2GQE/szKN+OMY3EU/t3WgxjkzSswF07r51XgdIGn9w/xZchMB5
+hbgF/X++ZRGjD8ACtPhSNzkE1akxehi/oCr0Epn3o0WC4zxe9Z2etciefC7IpJ5OCBRLbf1wbWsa
+Y71k5h+3zvDyny67G7fyUIhzksLi4xaNmjICq44Y3ekQEe5+NauQrz4wlHrQMz2nZQ/1/I6eYs9H
+RCwBXbsdtTLSR9I4LtD+gdwyah617jzV/OeBHRnDJELqYzmp
+-----END CERTIFICATE-----
+
+AddTrust Low-Value Services Root
+================================
+-----BEGIN CERTIFICATE-----
+MIIEGDCCAwCgAwIBAgIBATANBgkqhkiG9w0BAQUFADBlMQswCQYDVQQGEwJTRTEUMBIGA1UEChML
+QWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3b3JrMSEwHwYDVQQDExhBZGRU
+cnVzdCBDbGFzcyAxIENBIFJvb3QwHhcNMDAwNTMwMTAzODMxWhcNMjAwNTMwMTAzODMxWjBlMQsw
+CQYDVQQGEwJTRTEUMBIGA1UEChMLQWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBO
+ZXR3b3JrMSEwHwYDVQQDExhBZGRUcnVzdCBDbGFzcyAxIENBIFJvb3QwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQCWltQhSWDia+hBBwzexODcEyPNwTXH+9ZOEQpnXvUGW2ulCDtbKRY6
+54eyNAbFvAWlA3yCyykQruGIgb3WntP+LVbBFc7jJp0VLhD7Bo8wBN6ntGO0/7Gcrjyvd7ZWxbWr
+oulpOj0OM3kyP3CCkplhbY0wCI9xP6ZIVxn4JdxLZlyldI+Yrsj5wAYi56xz36Uu+1LcsRVlIPo1
+Zmne3yzxbrww2ywkEtvrNTVokMsAsJchPXQhI2U0K7t4WaPW4XY5mqRJjox0r26kmqPZm9I4XJui
+GMx1I4S+6+JNM3GOGvDC+Mcdoq0Dlyz4zyXG9rgkMbFjXZJ/Y/AlyVMuH79NAgMBAAGjgdIwgc8w
+HQYDVR0OBBYEFJWxtPCUtr3H2tERCSG+wa9J/RB7MAsGA1UdDwQEAwIBBjAPBgNVHRMBAf8EBTAD
+AQH/MIGPBgNVHSMEgYcwgYSAFJWxtPCUtr3H2tERCSG+wa9J/RB7oWmkZzBlMQswCQYDVQQGEwJT
+RTEUMBIGA1UEChMLQWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3b3JrMSEw
+HwYDVQQDExhBZGRUcnVzdCBDbGFzcyAxIENBIFJvb3SCAQEwDQYJKoZIhvcNAQEFBQADggEBACxt
+ZBsfzQ3duQH6lmM0MkhHma6X7f1yFqZzR1r0693p9db7RcwpiURdv0Y5PejuvE1Uhh4dbOMXJ0Ph
+iVYrqW9yTkkz43J8KiOavD7/KCrto/8cI7pDVwlnTUtiBi34/2ydYB7YHEt9tTEv2dB8Xfjea4MY
+eDdXL+gzB2ffHsdrKpV2ro9Xo/D0UrSpUwjP4E/TelOL/bscVjby/rK25Xa71SJlpz/+0WatC7xr
+mYbvP33zGDLKe8bjq2RGlfgmadlVg3sslgf/WSxEo8bl6ancoWOAWiFeIc9TVPC6b4nbqKqVz4vj
+ccweGyBECMB6tkD9xOQ14R0WHNC8K47Wcdk=
+-----END CERTIFICATE-----
+
+AddTrust External Root
+======================
+-----BEGIN CERTIFICATE-----
+MIIENjCCAx6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBvMQswCQYDVQQGEwJTRTEUMBIGA1UEChML
+QWRkVHJ1c3QgQUIxJjAkBgNVBAsTHUFkZFRydXN0IEV4dGVybmFsIFRUUCBOZXR3b3JrMSIwIAYD
+VQQDExlBZGRUcnVzdCBFeHRlcm5hbCBDQSBSb290MB4XDTAwMDUzMDEwNDgzOFoXDTIwMDUzMDEw
+NDgzOFowbzELMAkGA1UEBhMCU0UxFDASBgNVBAoTC0FkZFRydXN0IEFCMSYwJAYDVQQLEx1BZGRU
+cnVzdCBFeHRlcm5hbCBUVFAgTmV0d29yazEiMCAGA1UEAxMZQWRkVHJ1c3QgRXh0ZXJuYWwgQ0Eg
+Um9vdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALf3GjPm8gAELTngTlvtH7xsD821
++iO2zt6bETOXpClMfZOfvUq8k+0DGuOPz+VtUFrWlymUWoCwSXrbLpX9uMq/NzgtHj6RQa1wVsfw
+Tz/oMp50ysiQVOnGXw94nZpAPA6sYapeFI+eh6FqUNzXmk6vBbOmcZSccbNQYArHE504B4YCqOmo
+aSYYkKtMsE8jqzpPhNjfzp/haW+710LXa0Tkx63ubUFfclpxCDezeWWkWaCUN/cALw3CknLa0Dhy
+2xSoRcRdKn23tNbE7qzNE0S3ySvdQwAl+mG5aWpYIxG3pzOPVnVZ9c0p10a3CitlttNCbxWyuHv7
+7+ldU9U0WicCAwEAAaOB3DCB2TAdBgNVHQ4EFgQUrb2YejS0Jvf6xCZU7wO94CTLVBowCwYDVR0P
+BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wgZkGA1UdIwSBkTCBjoAUrb2YejS0Jvf6xCZU7wO94CTL
+VBqhc6RxMG8xCzAJBgNVBAYTAlNFMRQwEgYDVQQKEwtBZGRUcnVzdCBBQjEmMCQGA1UECxMdQWRk
+VHJ1c3QgRXh0ZXJuYWwgVFRQIE5ldHdvcmsxIjAgBgNVBAMTGUFkZFRydXN0IEV4dGVybmFsIENB
+IFJvb3SCAQEwDQYJKoZIhvcNAQEFBQADggEBALCb4IUlwtYj4g+WBpKdQZic2YR5gdkeWxQHIzZl
+j7DYd7usQWxHYINRsPkyPef89iYTx4AWpb9a/IfPeHmJIZriTAcKhjW88t5RxNKWt9x+Tu5w/Rw5
+6wwCURQtjr0W4MHfRnXnJK3s9EK0hZNwEGe6nQY1ShjTK3rMUUKhemPR5ruhxSvCNr4TDea9Y355
+e6cJDUCrat2PisP29owaQgVR1EX1n6diIWgVIEM8med8vSTYqZEXc4g/VhsxOBi0cQ+azcgOno4u
+G+GMmIPLHzHxREzGBHNJdmAPx/i9F4BrLunMTA5amnkPIAou1Z5jJh5VkpTYghdae9C8x49OhgQ=
+-----END CERTIFICATE-----
+
+AddTrust Public Services Root
+=============================
+-----BEGIN CERTIFICATE-----
+MIIEFTCCAv2gAwIBAgIBATANBgkqhkiG9w0BAQUFADBkMQswCQYDVQQGEwJTRTEUMBIGA1UEChML
+QWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3b3JrMSAwHgYDVQQDExdBZGRU
+cnVzdCBQdWJsaWMgQ0EgUm9vdDAeFw0wMDA1MzAxMDQxNTBaFw0yMDA1MzAxMDQxNTBaMGQxCzAJ
+BgNVBAYTAlNFMRQwEgYDVQQKEwtBZGRUcnVzdCBBQjEdMBsGA1UECxMUQWRkVHJ1c3QgVFRQIE5l
+dHdvcmsxIDAeBgNVBAMTF0FkZFRydXN0IFB1YmxpYyBDQSBSb290MIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEA6Rowj4OIFMEg2Dybjxt+A3S72mnTRqX4jsIMEZBRpS9mVEBV6tsfSlbu
+nyNu9DnLoblv8n75XYcmYZ4c+OLspoH4IcUkzBEMP9smcnrHAZcHF/nXGCwwfQ56HmIexkvA/X1i
+d9NEHif2P0tEs7c42TkfYNVRknMDtABp4/MUTu7R3AnPdzRGULD4EfL+OHn3Bzn+UZKXC1sIXzSG
+Aa2Il+tmzV7R/9x98oTaunet3IAIx6eH1lWfl2royBFkuucZKT8Rs3iQhCBSWxHveNCD9tVIkNAw
+HM+A+WD+eeSI8t0A65RF62WUaUC6wNW0uLp9BBGo6zEFlpROWCGOn9Bg/QIDAQABo4HRMIHOMB0G
+A1UdDgQWBBSBPjfYkrAfd59ctKtzquf2NGAv+jALBgNVHQ8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB
+/zCBjgYDVR0jBIGGMIGDgBSBPjfYkrAfd59ctKtzquf2NGAv+qFopGYwZDELMAkGA1UEBhMCU0Ux
+FDASBgNVBAoTC0FkZFRydXN0IEFCMR0wGwYDVQQLExRBZGRUcnVzdCBUVFAgTmV0d29yazEgMB4G
+A1UEAxMXQWRkVHJ1c3QgUHVibGljIENBIFJvb3SCAQEwDQYJKoZIhvcNAQEFBQADggEBAAP3FUr4
+JNojVhaTdt02KLmuG7jD8WS6IBh4lSknVwW8fCr0uVFV2ocC3g8WFzH4qnkuCRO7r7IgGRLlk/lL
++YPoRNWyQSW/iHVv/xD8SlTQX/D67zZzfRs2RcYhbbQVuE7PnFylPVoAjgbjPGsye/Kf8Lb93/Ao
+GEjwxrzQvzSAlsJKsW2Ox5BF3i9nrEUEo3rcVZLJR2bYGozH7ZxOmuASu7VqTITh4SINhwBk/ox9
+Yjllpu9CtoAlEmEBqCQTcAARJl/6NVDFSMwGR+gn2HCNX2TmoUQmXiLsks3/QppEIW1cxeMiHV9H
+EufOX1362KqxMy3ZdvJOOjMMK7MtkAY=
+-----END CERTIFICATE-----
+
+AddTrust Qualified Certificates Root
+====================================
+-----BEGIN CERTIFICATE-----
+MIIEHjCCAwagAwIBAgIBATANBgkqhkiG9w0BAQUFADBnMQswCQYDVQQGEwJTRTEUMBIGA1UEChML
+QWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3b3JrMSMwIQYDVQQDExpBZGRU
+cnVzdCBRdWFsaWZpZWQgQ0EgUm9vdDAeFw0wMDA1MzAxMDQ0NTBaFw0yMDA1MzAxMDQ0NTBaMGcx
+CzAJBgNVBAYTAlNFMRQwEgYDVQQKEwtBZGRUcnVzdCBBQjEdMBsGA1UECxMUQWRkVHJ1c3QgVFRQ
+IE5ldHdvcmsxIzAhBgNVBAMTGkFkZFRydXN0IFF1YWxpZmllZCBDQSBSb290MIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5B6a/twJWoekn0e+EV+vhDTbYjx5eLfpMLXsDBwqxBb/4Oxx
+64r1EW7tTw2R0hIYLUkVAcKkIhPHEWT/IhKauY5cLwjPcWqzZwFZ8V1G87B4pfYOQnrjfxvM0PC3
+KP0q6p6zsLkEqv32x7SxuCqg+1jxGaBvcCV+PmlKfw8i2O+tCBGaKZnhqkRFmhJePp1tUvznoD1o
+L/BLcHwTOK28FSXx1s6rosAx1i+f4P8UWfyEk9mHfExUE+uf0S0R+Bg6Ot4l2ffTQO2kBhLEO+GR
+wVY18BTcZTYJbqukB8c10cIDMzZbdSZtQvESa0NvS3GU+jQd7RNuyoB/mC9suWXY6QIDAQABo4HU
+MIHRMB0GA1UdDgQWBBQ5lYtii1zJ1IC6WA+XPxUIQ8yYpzALBgNVHQ8EBAMCAQYwDwYDVR0TAQH/
+BAUwAwEB/zCBkQYDVR0jBIGJMIGGgBQ5lYtii1zJ1IC6WA+XPxUIQ8yYp6FrpGkwZzELMAkGA1UE
+BhMCU0UxFDASBgNVBAoTC0FkZFRydXN0IEFCMR0wGwYDVQQLExRBZGRUcnVzdCBUVFAgTmV0d29y
+azEjMCEGA1UEAxMaQWRkVHJ1c3QgUXVhbGlmaWVkIENBIFJvb3SCAQEwDQYJKoZIhvcNAQEFBQAD
+ggEBABmrder4i2VhlRO6aQTvhsoToMeqT2QbPxj2qC0sVY8FtzDqQmodwCVRLae/DLPt7wh/bDxG
+GuoYQ992zPlmhpwsaPXpF/gxsxjE1kh9I0xowX67ARRvxdlu3rsEQmr49lx95dr6h+sNNVJn0J6X
+dgWTP5XHAeZpVTh/EGGZyeNfpso+gmNIquIISD6q8rKFYqa0p9m9N5xotS1WfbC3P6CxB9bpT9ze
+RXEwMn8bLgn5v1Kh7sKAPgZcLlVAwRv1cEWw3F369nJad9Jjzc9YiQBCYz95OdBEsIJuQRno3eDB
+iFrRHnGTHyQwdOUeqN48Jzd/g66ed8/wMLH/S5noxqE=
+-----END CERTIFICATE-----
+
+Entrust Root Certification Authority
+====================================
+-----BEGIN CERTIFICATE-----
+MIIEkTCCA3mgAwIBAgIERWtQVDANBgkqhkiG9w0BAQUFADCBsDELMAkGA1UEBhMCVVMxFjAUBgNV
+BAoTDUVudHJ1c3QsIEluYy4xOTA3BgNVBAsTMHd3dy5lbnRydXN0Lm5ldC9DUFMgaXMgaW5jb3Jw
+b3JhdGVkIGJ5IHJlZmVyZW5jZTEfMB0GA1UECxMWKGMpIDIwMDYgRW50cnVzdCwgSW5jLjEtMCsG
+A1UEAxMkRW50cnVzdCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTA2MTEyNzIwMjM0
+MloXDTI2MTEyNzIwNTM0MlowgbAxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1FbnRydXN0LCBJbmMu
+MTkwNwYDVQQLEzB3d3cuZW50cnVzdC5uZXQvQ1BTIGlzIGluY29ycG9yYXRlZCBieSByZWZlcmVu
+Y2UxHzAdBgNVBAsTFihjKSAyMDA2IEVudHJ1c3QsIEluYy4xLTArBgNVBAMTJEVudHJ1c3QgUm9v
+dCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+ALaVtkNC+sZtKm9I35RMOVcF7sN5EUFoNu3s/poBj6E4KPz3EEZmLk0eGrEaTsbRwJWIsMn/MYsz
+A9u3g3s+IIRe7bJWKKf44LlAcTfFy0cOlypowCKVYhXbR9n10Cv/gkvJrT7eTNuQgFA/CYqEAOww
+Cj0Yzfv9KlmaI5UXLEWeH25DeW0MXJj+SKfFI0dcXv1u5x609mhF0YaDW6KKjbHjKYD+JXGIrb68
+j6xSlkuqUY3kEzEZ6E5Nn9uss2rVvDlUccp6en+Q3X0dgNmBu1kmwhH+5pPi94DkZfs0Nw4pgHBN
+rziGLp5/V6+eF67rHMsoIV+2HNjnogQi+dPa2MsCAwEAAaOBsDCBrTAOBgNVHQ8BAf8EBAMCAQYw
+DwYDVR0TAQH/BAUwAwEB/zArBgNVHRAEJDAigA8yMDA2MTEyNzIwMjM0MlqBDzIwMjYxMTI3MjA1
+MzQyWjAfBgNVHSMEGDAWgBRokORnpKZTgMeGZqTx90tD+4S9bTAdBgNVHQ4EFgQUaJDkZ6SmU4DH
+hmak8fdLQ/uEvW0wHQYJKoZIhvZ9B0EABBAwDhsIVjcuMTo0LjADAgSQMA0GCSqGSIb3DQEBBQUA
+A4IBAQCT1DCw1wMgKtD5Y+iRDAUgqV8ZyntyTtSx29CW+1RaGSwMCPeyvIWonX9tO1KzKtvn1ISM
+Y/YPyyYBkVBs9F8U4pN0wBOeMDpQ47RgxRzwIkSNcUesyBrJ6ZuaAGAT/3B+XxFNSRuzFVJ7yVTa
+v52Vr2ua2J7p8eRDjeIRRDq/r72DQnNSi6q7pynP9WQcCk3RvKqsnyrQ/39/2n3qse0wJcGE2jTS
+W3iDVuycNsMm4hH2Z0kdkquM++v/eu6FSqdQgPCnXEqULl8FmTxSQeDNtGPPAUO6nIPcj2A781q0
+tHuu2guQOHXvgR1m0vdXcDazv/wor3ElhVsT/h5/WrQ8
+-----END CERTIFICATE-----
+
+GeoTrust Global CA
+==================
+-----BEGIN CERTIFICATE-----
+MIIDVDCCAjygAwIBAgIDAjRWMA0GCSqGSIb3DQEBBQUAMEIxCzAJBgNVBAYTAlVTMRYwFAYDVQQK
+Ew1HZW9UcnVzdCBJbmMuMRswGQYDVQQDExJHZW9UcnVzdCBHbG9iYWwgQ0EwHhcNMDIwNTIxMDQw
+MDAwWhcNMjIwNTIxMDQwMDAwWjBCMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5j
+LjEbMBkGA1UEAxMSR2VvVHJ1c3QgR2xvYmFsIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEA2swYYzD99BcjGlZ+W988bDjkcbd4kdS8odhM+KhDtgPpTSEHCIjaWC9mOSm9BXiLnTjo
+BbdqfnGk5sRgprDvgOSJKA+eJdbtg/OtppHHmMlCGDUUna2YRpIuT8rxh0PBFpVXLVDviS2Aelet
+8u5fa9IAjbkU+BQVNdnARqN7csiRv8lVK83Qlz6cJmTM386DGXHKTubU1XupGc1V3sjs0l44U+Vc
+T4wt/lAjNvxm5suOpDkZALeVAjmRCw7+OC7RHQWa9k0+bw8HHa8sHo9gOeL6NlMTOdReJivbPagU
+vTLrGAMoUgRx5aszPeE4uwc2hGKceeoWMPRfwCvocWvk+QIDAQABo1MwUTAPBgNVHRMBAf8EBTAD
+AQH/MB0GA1UdDgQWBBTAephojYn7qwVkDBF9qn1luMrMTjAfBgNVHSMEGDAWgBTAephojYn7qwVk
+DBF9qn1luMrMTjANBgkqhkiG9w0BAQUFAAOCAQEANeMpauUvXVSOKVCUn5kaFOSPeCpilKInZ57Q
+zxpeR+nBsqTP3UEaBU6bS+5Kb1VSsyShNwrrZHYqLizz/Tt1kL/6cdjHPTfStQWVYrmm3ok9Nns4
+d0iXrKYgjy6myQzCsplFAMfOEVEiIuCl6rYVSAlk6l5PdPcFPseKUgzbFbS9bZvlxrFUaKnjaZC2
+mqUPuLk/IH2uSrW4nOQdtqvmlKXBx4Ot2/Unhw4EbNX/3aBd7YdStysVAq45pmp06drE57xNNB6p
+XE0zX5IJL4hmXXeXxx12E6nV5fEWCRE11azbJHFwLJhWC9kXtNHjUStedejV0NxPNO3CBWaAocvm
+Mw==
+-----END CERTIFICATE-----
+
+GeoTrust Global CA 2
+====================
+-----BEGIN CERTIFICATE-----
+MIIDZjCCAk6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBEMQswCQYDVQQGEwJVUzEWMBQGA1UEChMN
+R2VvVHJ1c3QgSW5jLjEdMBsGA1UEAxMUR2VvVHJ1c3QgR2xvYmFsIENBIDIwHhcNMDQwMzA0MDUw
+MDAwWhcNMTkwMzA0MDUwMDAwWjBEMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5j
+LjEdMBsGA1UEAxMUR2VvVHJ1c3QgR2xvYmFsIENBIDIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQDvPE1APRDfO1MA4Wf+lGAVPoWI8YkNkMgoI5kF6CsgncbzYEbYwbLVjDHZ3CB5JIG/
+NTL8Y2nbsSpr7iFY8gjpeMtvy/wWUsiRxP89c96xPqfCfWbB9X5SJBri1WeR0IIQ13hLTytCOb1k
+LUCgsBDTOEhGiKEMuzozKmKY+wCdE1l/bztyqu6mD4b5BWHqZ38MN5aL5mkWRxHCJ1kDs6ZgwiFA
+Vvqgx306E+PsV8ez1q6diYD3Aecs9pYrEw15LNnA5IZ7S4wMcoKK+xfNAGw6EzywhIdLFnopsk/b
+HdQL82Y3vdj2V7teJHq4PIu5+pIaGoSe2HSPqht/XvT+RSIhAgMBAAGjYzBhMA8GA1UdEwEB/wQF
+MAMBAf8wHQYDVR0OBBYEFHE4NvICMVNHK266ZUapEBVYIAUJMB8GA1UdIwQYMBaAFHE4NvICMVNH
+K266ZUapEBVYIAUJMA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQUFAAOCAQEAA/e1K6tdEPx7
+srJerJsOflN4WT5CBP51o62sgU7XAotexC3IUnbHLB/8gTKY0UvGkpMzNTEv/NgdRN3ggX+d6Yvh
+ZJFiCzkIjKx0nVnZellSlxG5FntvRdOW2TF9AjYPnDtuzywNA0ZF66D0f0hExghAzN4bcLUprbqL
+OzRldRtxIR0sFAqwlpW41uryZfspuk/qkZN0abby/+Ea0AzRdoXLiiW9l14sbxWZJue2Kf8i7MkC
+x1YAzUm5s2x7UwQa4qjJqhIFI8LO57sEAszAR6LkxCkvW0VXiVHuPOtSCP8HNR6fNWpHSlaY0VqF
+H4z1Ir+rzoPz4iIprn2DQKi6bA==
+-----END CERTIFICATE-----
+
+GeoTrust Universal CA
+=====================
+-----BEGIN CERTIFICATE-----
+MIIFaDCCA1CgAwIBAgIBATANBgkqhkiG9w0BAQUFADBFMQswCQYDVQQGEwJVUzEWMBQGA1UEChMN
+R2VvVHJ1c3QgSW5jLjEeMBwGA1UEAxMVR2VvVHJ1c3QgVW5pdmVyc2FsIENBMB4XDTA0MDMwNDA1
+MDAwMFoXDTI5MDMwNDA1MDAwMFowRTELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUdlb1RydXN0IElu
+Yy4xHjAcBgNVBAMTFUdlb1RydXN0IFVuaXZlcnNhbCBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIP
+ADCCAgoCggIBAKYVVaCjxuAfjJ0hUNfBvitbtaSeodlyWL0AG0y/YckUHUWCq8YdgNY96xCcOq9t
+JPi8cQGeBvV8Xx7BDlXKg5pZMK4ZyzBIle0iN430SppyZj6tlcDgFgDgEB8rMQ7XlFTTQjOgNB0e
+RXbdT8oYN+yFFXoZCPzVx5zw8qkuEKmS5j1YPakWaDwvdSEYfyh3peFhF7em6fgemdtzbvQKoiFs
+7tqqhZJmr/Z6a4LauiIINQ/PQvE1+mrufislzDoR5G2vc7J2Ha3QsnhnGqQ5HFELZ1aD/ThdDc7d
+8Lsrlh/eezJS/R27tQahsiFepdaVaH/wmZ7cRQg+59IJDTWU3YBOU5fXtQlEIGQWFwMCTFMNaN7V
+qnJNk22CDtucvc+081xdVHppCZbW2xHBjXWotM85yM48vCR85mLK4b19p71XZQvk/iXttmkQ3Cga
+Rr0BHdCXteGYO8A3ZNY9lO4L4fUorgtWv3GLIylBjobFS1J72HGrH4oVpjuDWtdYAVHGTEHZf9hB
+Z3KiKN9gg6meyHv8U3NyWfWTehd2Ds735VzZC1U0oqpbtWpU5xPKV+yXbfReBi9Fi1jUIxaS5BZu
+KGNZMN9QAZxjiRqf2xeUgnA3wySemkfWWspOqGmJch+RbNt+nhutxx9z3SxPGWX9f5NAEC7S8O08
+ni4oPmkmM8V7AgMBAAGjYzBhMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFNq7LqqwDLiIJlF0
+XG0D08DYj3rWMB8GA1UdIwQYMBaAFNq7LqqwDLiIJlF0XG0D08DYj3rWMA4GA1UdDwEB/wQEAwIB
+hjANBgkqhkiG9w0BAQUFAAOCAgEAMXjmx7XfuJRAyXHEqDXsRh3ChfMoWIawC/yOsjmPRFWrZIRc
+aanQmjg8+uUfNeVE44B5lGiku8SfPeE0zTBGi1QrlaXv9z+ZhP015s8xxtxqv6fXIwjhmF7DWgh2
+qaavdy+3YL1ERmrvl/9zlcGO6JP7/TG37FcREUWbMPEaiDnBTzynANXH/KttgCJwpQzgXQQpAvvL
+oJHRfNbDflDVnVi+QTjruXU8FdmbyUqDWcDaU/0zuzYYm4UPFd3uLax2k7nZAY1IEKj79TiG8dsK
+xr2EoyNB3tZ3b4XUhRxQ4K5RirqNPnbiucon8l+f725ZDQbYKxek0nxru18UGkiPGkzns0ccjkxF
+KyDuSN/n3QmOGKjaQI2SJhFTYXNd673nxE0pN2HrrDktZy4W1vUAg4WhzH92xH3kt0tm7wNFYGm2
+DFKWkoRepqO1pD4r2czYG0eq8kTaT/kD6PAUyz/zg97QwVTjt+gKN02LIFkDMBmhLMi9ER/frslK
+xfMnZmaGrGiR/9nmUxwPi1xpZQomyB40w11Re9epnAahNt3ViZS82eQtDF4JbAiXfKM9fJP/P6EU
+p8+1Xevb2xzEdt+Iub1FBZUbrvxGakyvSOPOrg/SfuvmbJxPgWp6ZKy7PtXny3YuxadIwVyQD8vI
+P/rmMuGNG2+k5o7Y+SlIis5z/iw=
+-----END CERTIFICATE-----
+
+GeoTrust Universal CA 2
+=======================
+-----BEGIN CERTIFICATE-----
+MIIFbDCCA1SgAwIBAgIBATANBgkqhkiG9w0BAQUFADBHMQswCQYDVQQGEwJVUzEWMBQGA1UEChMN
+R2VvVHJ1c3QgSW5jLjEgMB4GA1UEAxMXR2VvVHJ1c3QgVW5pdmVyc2FsIENBIDIwHhcNMDQwMzA0
+MDUwMDAwWhcNMjkwMzA0MDUwMDAwWjBHMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3Qg
+SW5jLjEgMB4GA1UEAxMXR2VvVHJ1c3QgVW5pdmVyc2FsIENBIDIwggIiMA0GCSqGSIb3DQEBAQUA
+A4ICDwAwggIKAoICAQCzVFLByT7y2dyxUxpZKeexw0Uo5dfR7cXFS6GqdHtXr0om/Nj1XqduGdt0
+DE81WzILAePb63p3NeqqWuDW6KFXlPCQo3RWlEQwAx5cTiuFJnSCegx2oG9NzkEtoBUGFF+3Qs17
+j1hhNNwqCPkuwwGmIkQcTAeC5lvO0Ep8BNMZcyfwqph/Lq9O64ceJHdqXbboW0W63MOhBW9Wjo8Q
+JqVJwy7XQYci4E+GymC16qFjwAGXEHm9ADwSbSsVsaxLse4YuU6W3Nx2/zu+z18DwPw76L5GG//a
+QMJS9/7jOvdqdzXQ2o3rXhhqMcceujwbKNZrVMaqW9eiLBsZzKIC9ptZvTdrhrVtgrrY6slWvKk2
+WP0+GfPtDCapkzj4T8FdIgbQl+rhrcZV4IErKIM6+vR7IVEAvlI4zs1meaj0gVbi0IMJR1FbUGrP
+20gaXT73y/Zl92zxlfgCOzJWgjl6W70viRu/obTo/3+NjN8D8WBOWBFM66M/ECuDmgFz2ZRthAAn
+ZqzwcEAJQpKtT5MNYQlRJNiS1QuUYbKHsu3/mjX/hVTK7URDrBs8FmtISgocQIgfksILAAX/8sgC
+SqSqqcyZlpwvWOB94b67B9xfBHJcMTTD7F8t4D1kkCLm0ey4Lt1ZrtmhN79UNdxzMk+MBB4zsslG
+8dhcyFVQyWi9qLo2CQIDAQABo2MwYTAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBR281Xh+qQ2
++/CfXGJx7Tz0RzgQKzAfBgNVHSMEGDAWgBR281Xh+qQ2+/CfXGJx7Tz0RzgQKzAOBgNVHQ8BAf8E
+BAMCAYYwDQYJKoZIhvcNAQEFBQADggIBAGbBxiPz2eAubl/oz66wsCVNK/g7WJtAJDday6sWSf+z
+dXkzoS9tcBc0kf5nfo/sm+VegqlVHy/c1FEHEv6sFj4sNcZj/NwQ6w2jqtB8zNHQL1EuxBRa3ugZ
+4T7GzKQp5y6EqgYweHZUcyiYWTjgAA1i00J9IZ+uPTqM1fp3DRgrFg5fNuH8KrUwJM/gYwx7WBr+
+mbpCErGR9Hxo4sjoryzqyX6uuyo9DRXcNJW2GHSoag/HtPQTxORb7QrSpJdMKu0vbBKJPfEncKpq
+A1Ihn0CoZ1Dy81of398j9tx4TuaYT1U6U+Pv8vSfx3zYWK8pIpe44L2RLrB27FcRz+8pRPPphXpg
+Y+RdM4kX2TGq2tbzGDVyz4crL2MjhF2EjD9XoIj8mZEoJmmZ1I+XRL6O1UixpCgp8RW04eWe3fiP
+pm8m1wk8OhwRDqZsN/etRIcsKMfYdIKz0G9KV7s1KSegi+ghp4dkNl3M2Basx7InQJJVOCiNUW7d
+FGdTbHFcJoRNdVq2fmBWqU2t+5sel/MN2dKXVHfaPRK34B7vCAas+YWH6aLcr34YEoP9VhdBLtUp
+gn2Z9DH2canPLAEnpQW5qrJITirvn5NSUZU8UnOOVkwXQMAJKOSLakhT2+zNVVXxxvjpoixMptEm
+X36vWkzaH6byHCx+rgIW0lbQL1dTR+iS
+-----END CERTIFICATE-----
+
+Visa eCommerce Root
+===================
+-----BEGIN CERTIFICATE-----
+MIIDojCCAoqgAwIBAgIQE4Y1TR0/BvLB+WUF1ZAcYjANBgkqhkiG9w0BAQUFADBrMQswCQYDVQQG
+EwJVUzENMAsGA1UEChMEVklTQTEvMC0GA1UECxMmVmlzYSBJbnRlcm5hdGlvbmFsIFNlcnZpY2Ug
+QXNzb2NpYXRpb24xHDAaBgNVBAMTE1Zpc2EgZUNvbW1lcmNlIFJvb3QwHhcNMDIwNjI2MDIxODM2
+WhcNMjIwNjI0MDAxNjEyWjBrMQswCQYDVQQGEwJVUzENMAsGA1UEChMEVklTQTEvMC0GA1UECxMm
+VmlzYSBJbnRlcm5hdGlvbmFsIFNlcnZpY2UgQXNzb2NpYXRpb24xHDAaBgNVBAMTE1Zpc2EgZUNv
+bW1lcmNlIFJvb3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvV95WHm6h2mCxlCfL
+F9sHP4CFT8icttD0b0/Pmdjh28JIXDqsOTPHH2qLJj0rNfVIsZHBAk4ElpF7sDPwsRROEW+1QK8b
+RaVK7362rPKgH1g/EkZgPI2h4H3PVz4zHvtH8aoVlwdVZqW1LS7YgFmypw23RuwhY/81q6UCzyr0
+TP579ZRdhE2o8mCP2w4lPJ9zcc+U30rq299yOIzzlr3xF7zSujtFWsan9sYXiwGd/BmoKoMWuDpI
+/k4+oKsGGelT84ATB+0tvz8KPFUgOSwsAGl0lUq8ILKpeeUYiZGo3BxN77t+Nwtd/jmliFKMAGzs
+GHxBvfaLdXe6YJ2E5/4tAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEG
+MB0GA1UdDgQWBBQVOIMPPyw/cDMezUb+B4wg4NfDtzANBgkqhkiG9w0BAQUFAAOCAQEAX/FBfXxc
+CLkr4NWSR/pnXKUTwwMhmytMiUbPWU3J/qVAtmPN3XEolWcRzCSs00Rsca4BIGsDoo8Ytyk6feUW
+YFN4PMCvFYP3j1IzJL1kk5fui/fbGKhtcbP3LBfQdCVp9/5rPJS+TUtBjE7ic9DjkCJzQ83z7+pz
+zkWKsKZJ/0x9nXGIxHYdkFsd7v3M9+79YKWxehZx0RbQfBI8bGmX265fOZpwLwU8GUYEmSA20GBu
+YQa7FkKMcPcw++DbZqMAAb3mLNqRX6BGi01qnD093QVG/na/oAo85ADmJ7f/hC3euiInlhBx6yLt
+398znM/jra6O1I7mT1GvFpLgXPYHDw==
+-----END CERTIFICATE-----
+
+Certum Root CA
+==============
+-----BEGIN CERTIFICATE-----
+MIIDDDCCAfSgAwIBAgIDAQAgMA0GCSqGSIb3DQEBBQUAMD4xCzAJBgNVBAYTAlBMMRswGQYDVQQK
+ExJVbml6ZXRvIFNwLiB6IG8uby4xEjAQBgNVBAMTCUNlcnR1bSBDQTAeFw0wMjA2MTExMDQ2Mzla
+Fw0yNzA2MTExMDQ2MzlaMD4xCzAJBgNVBAYTAlBMMRswGQYDVQQKExJVbml6ZXRvIFNwLiB6IG8u
+by4xEjAQBgNVBAMTCUNlcnR1bSBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM6x
+wS7TT3zNJc4YPk/EjG+AanPIW1H4m9LcuwBcsaD8dQPugfCI7iNS6eYVM42sLQnFdvkrOYCJ5JdL
+kKWoePhzQ3ukYbDYWMzhbGZ+nPMJXlVjhNWo7/OxLjBos8Q82KxujZlakE403Daaj4GIULdtlkIJ
+89eVgw1BS7Bqa/j8D35in2fE7SZfECYPCE/wpFcozo+47UX2bu4lXapuOb7kky/ZR6By6/qmW6/K
+Uz/iDsaWVhFu9+lmqSbYf5VT7QqFiLpPKaVCjF62/IUgAKpoC6EahQGcxEZjgoi2IrHu/qpGWX7P
+NSzVttpd90gzFFS269lvzs2I1qsb2pY7HVkCAwEAAaMTMBEwDwYDVR0TAQH/BAUwAwEB/zANBgkq
+hkiG9w0BAQUFAAOCAQEAuI3O7+cUus/usESSbLQ5PqKEbq24IXfS1HeCh+YgQYHu4vgRt2PRFze+
+GXYkHAQaTOs9qmdvLdTN/mUxcMUbpgIKumB7bVjCmkn+YzILa+M6wKyrO7Do0wlRjBCDxjTgxSvg
+GrZgFCdsMneMvLJymM/NzD+5yCRCFNZX/OYmQ6kd5YCQzgNUKD73P9P4Te1qCjqTE5s7FCMTY5w/
+0YcneeVMUeMBrYVdGjux1XMQpNPyvG5k9VpWkKjHDkx0Dy5xO/fIR/RpbxXyEV6DHpx8Uq79AtoS
+qFlnGNu8cN2bsWntgM6JQEhqDjXKKWYVIZQs6GAqm4VKQPNriiTsBhYscw==
+-----END CERTIFICATE-----
+
+Comodo AAA Services root
+========================
+-----BEGIN CERTIFICATE-----
+MIIEMjCCAxqgAwIBAgIBATANBgkqhkiG9w0BAQUFADB7MQswCQYDVQQGEwJHQjEbMBkGA1UECAwS
+R3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRowGAYDVQQKDBFDb21vZG8gQ0Eg
+TGltaXRlZDEhMB8GA1UEAwwYQUFBIENlcnRpZmljYXRlIFNlcnZpY2VzMB4XDTA0MDEwMTAwMDAw
+MFoXDTI4MTIzMTIzNTk1OVowezELMAkGA1UEBhMCR0IxGzAZBgNVBAgMEkdyZWF0ZXIgTWFuY2hl
+c3RlcjEQMA4GA1UEBwwHU2FsZm9yZDEaMBgGA1UECgwRQ29tb2RvIENBIExpbWl0ZWQxITAfBgNV
+BAMMGEFBQSBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBAL5AnfRu4ep2hxxNRUSOvkbIgwadwSr+GB+O5AL686tdUIoWMQuaBtDFcCLNSS1UY8y2bmhG
+C1Pqy0wkwLxyTurxFa70VJoSCsN6sjNg4tqJVfMiWPPe3M/vg4aijJRPn2jymJBGhCfHdr/jzDUs
+i14HZGWCwEiwqJH5YZ92IFCokcdmtet4YgNW8IoaE+oxox6gmf049vYnMlhvB/VruPsUK6+3qszW
+Y19zjNoFmag4qMsXeDZRrOme9Hg6jc8P2ULimAyrL58OAd7vn5lJ8S3frHRNG5i1R8XlKdH5kBjH
+Ypy+g8cmez6KJcfA3Z3mNWgQIJ2P2N7Sw4ScDV7oL8kCAwEAAaOBwDCBvTAdBgNVHQ4EFgQUoBEK
+Iz6W8Qfs4q8p74Klf9AwpLQwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wewYDVR0f
+BHQwcjA4oDagNIYyaHR0cDovL2NybC5jb21vZG9jYS5jb20vQUFBQ2VydGlmaWNhdGVTZXJ2aWNl
+cy5jcmwwNqA0oDKGMGh0dHA6Ly9jcmwuY29tb2RvLm5ldC9BQUFDZXJ0aWZpY2F0ZVNlcnZpY2Vz
+LmNybDANBgkqhkiG9w0BAQUFAAOCAQEACFb8AvCb6P+k+tZ7xkSAzk/ExfYAWMymtrwUSWgEdujm
+7l3sAg9g1o1QGE8mTgHj5rCl7r+8dFRBv/38ErjHT1r0iWAFf2C3BUrz9vHCv8S5dIa2LX1rzNLz
+Rt0vxuBqw8M0Ayx9lt1awg6nCpnBBYurDC/zXDrPbDdVCYfeU0BsWO/8tqtlbgT2G9w84FoVxp7Z
+8VlIMCFlA2zs6SFz7JsDoeA3raAVGI/6ugLOpyypEBMs1OUIJqsil2D4kF501KKaU73yqWjgom7C
+12yxow+ev+to51byrvLjKzg6CYG1a4XXvi3tPxq3smPi9WIsgtRqAEFQ8TmDn5XpNpaYbg==
+-----END CERTIFICATE-----
+
+Comodo Secure Services root
+===========================
+-----BEGIN CERTIFICATE-----
+MIIEPzCCAyegAwIBAgIBATANBgkqhkiG9w0BAQUFADB+MQswCQYDVQQGEwJHQjEbMBkGA1UECAwS
+R3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRowGAYDVQQKDBFDb21vZG8gQ0Eg
+TGltaXRlZDEkMCIGA1UEAwwbU2VjdXJlIENlcnRpZmljYXRlIFNlcnZpY2VzMB4XDTA0MDEwMTAw
+MDAwMFoXDTI4MTIzMTIzNTk1OVowfjELMAkGA1UEBhMCR0IxGzAZBgNVBAgMEkdyZWF0ZXIgTWFu
+Y2hlc3RlcjEQMA4GA1UEBwwHU2FsZm9yZDEaMBgGA1UECgwRQ29tb2RvIENBIExpbWl0ZWQxJDAi
+BgNVBAMMG1NlY3VyZSBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBAMBxM4KK0HDrc4eCQNUd5MvJDkKQ+d40uaG6EfQlhfPMcm3ye5drswfxdySRXyWP
+9nQ95IDC+DwN879A6vfIUtFyb+/Iq0G4bi4XKpVpDM3SHpR7LZQdqnXXs5jLrLxkU0C8j6ysNstc
+rbvd4JQX7NFc0L/vpZXJkMWwrPsbQ996CF23uPJAGysnnlDOXmWCiIxe004MeuoIkbY2qitC++rC
+oznl2yY4rYsK7hljxxwk3wN42ubqwUcaCwtGCd0C/N7Lh1/XMGNooa7cMqG6vv5Eq2i2pRcV/b3V
+p6ea5EQz6YiO/O1R65NxTq0B50SOqy3LqP4BSUjwwN3HaNiS/j0CAwEAAaOBxzCBxDAdBgNVHQ4E
+FgQUPNiTiMLAggnMAZkGkyDpnnAJY08wDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8w
+gYEGA1UdHwR6MHgwO6A5oDeGNWh0dHA6Ly9jcmwuY29tb2RvY2EuY29tL1NlY3VyZUNlcnRpZmlj
+YXRlU2VydmljZXMuY3JsMDmgN6A1hjNodHRwOi8vY3JsLmNvbW9kby5uZXQvU2VjdXJlQ2VydGlm
+aWNhdGVTZXJ2aWNlcy5jcmwwDQYJKoZIhvcNAQEFBQADggEBAIcBbSMdflsXfcFhMs+P5/OKlFlm
+4J4oqF7Tt/Q05qo5spcWxYJvMqTpjOev/e/C6LlLqqP05tqNZSH7uoDrJiiFGv45jN5bBAS0VPmj
+Z55B+glSzAVIqMk/IQQezkhr/IXownuvf7fM+F86/TXGDe+X3EyrEeFryzHRbPtIgKvcnDe4IRRL
+DXE97IMzbtFuMhbsmMcWi1mmNKsFVy2T96oTy9IT4rcuO81rUBcJaD61JlfutuC23bkpgHl9j6Pw
+pCikFcSF9CfUa7/lXORlAnZUtOM3ZiTTGWHIUhDlizeauan5Hb/qmZJhlv8BzaFfDbxxvA6sCx1H
+RR3B7Hzs/Sk=
+-----END CERTIFICATE-----
+
+Comodo Trusted Services root
+============================
+-----BEGIN CERTIFICATE-----
+MIIEQzCCAyugAwIBAgIBATANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJHQjEbMBkGA1UECAwS
+R3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRowGAYDVQQKDBFDb21vZG8gQ0Eg
+TGltaXRlZDElMCMGA1UEAwwcVHJ1c3RlZCBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczAeFw0wNDAxMDEw
+MDAwMDBaFw0yODEyMzEyMzU5NTlaMH8xCzAJBgNVBAYTAkdCMRswGQYDVQQIDBJHcmVhdGVyIE1h
+bmNoZXN0ZXIxEDAOBgNVBAcMB1NhbGZvcmQxGjAYBgNVBAoMEUNvbW9kbyBDQSBMaW1pdGVkMSUw
+IwYDVQQDDBxUcnVzdGVkIENlcnRpZmljYXRlIFNlcnZpY2VzMIIBIjANBgkqhkiG9w0BAQEFAAOC
+AQ8AMIIBCgKCAQEA33FvNlhTWvI2VFeAxHQIIO0Yfyod5jWaHiWsnOWWfnJSoBVC21ndZHoa0Lh7
+3TkVvFVIxO06AOoxEbrycXQaZ7jPM8yoMa+j49d/vzMtTGo87IvDktJTdyR0nAducPy9C1t2ul/y
+/9c3S0pgePfw+spwtOpZqqPOSC+pw7ILfhdyFgymBwwbOM/JYrc/oJOlh0Hyt3BAd9i+FHzjqMB6
+juljatEPmsbS9Is6FARW1O24zG71++IsWL1/T2sr92AkWCTOJu80kTrV44HQsvAEAtdbtz6SrGsS
+ivnkBbA7kUlcsutT6vifR4buv5XAwAaf0lteERv0xwQ1KdJVXOTt6wIDAQABo4HJMIHGMB0GA1Ud
+DgQWBBTFe1i97doladL3WRaoszLAeydb9DAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB
+/zCBgwYDVR0fBHwwejA8oDqgOIY2aHR0cDovL2NybC5jb21vZG9jYS5jb20vVHJ1c3RlZENlcnRp
+ZmljYXRlU2VydmljZXMuY3JsMDqgOKA2hjRodHRwOi8vY3JsLmNvbW9kby5uZXQvVHJ1c3RlZENl
+cnRpZmljYXRlU2VydmljZXMuY3JsMA0GCSqGSIb3DQEBBQUAA4IBAQDIk4E7ibSvuIQSTI3S8Ntw
+uleGFTQQuS9/HrCoiWChisJ3DFBKmwCL2Iv0QeLQg4pKHBQGsKNoBXAxMKdTmw7pSqBYaWcOrp32
+pSxBvzwGa+RZzG0Q8ZZvH9/0BAKkn0U+yNj6NkZEUD+Cl5EfKNsYEYwq5GWDVxISjBc/lDb+XbDA
+BHcTuPQV1T84zJQ6VdCsmPW6AF/ghhmBeC8owH7TzEIK9a5QoNE+xqFx7D+gIIxmOom0jtTYsU0l
+R+4viMi14QVFwL4Ucd56/Y57fU0IlqUSc/AtyjcndBInTMu2l+nZrghtWjlA3QVHdWpaIbOjGM9O
+9y5Xt5hwXsjEeLBi
+-----END CERTIFICATE-----
+
+QuoVadis Root CA
+================
+-----BEGIN CERTIFICATE-----
+MIIF0DCCBLigAwIBAgIEOrZQizANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJCTTEZMBcGA1UE
+ChMQUXVvVmFkaXMgTGltaXRlZDElMCMGA1UECxMcUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0
+eTEuMCwGA1UEAxMlUXVvVmFkaXMgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wMTAz
+MTkxODMzMzNaFw0yMTAzMTcxODMzMzNaMH8xCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRp
+cyBMaW1pdGVkMSUwIwYDVQQLExxSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MS4wLAYDVQQD
+EyVRdW9WYWRpcyBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEAv2G1lVO6V/z68mcLOhrfEYBklbTRvM16z/Ypli4kVEAkOPcahdxYTMuk
+J0KX0J+DisPkBgNbAKVRHnAEdOLB1Dqr1607BxgFjv2DrOpm2RgbaIr1VxqYuvXtdj182d6UajtL
+F8HVj71lODqV0D1VNk7feVcxKh7YWWVJWCCYfqtffp/p1k3sg3Spx2zY7ilKhSoGFPlU5tPaZQeL
+YzcS19Dsw3sgQUSj7cugF+FxZc4dZjH3dgEZyH0DWLaVSR2mEiboxgx24ONmy+pdpibu5cxfvWen
+AScOospUxbF6lR1xHkopigPcakXBpBlebzbNw6Kwt/5cOOJSvPhEQ+aQuwIDAQABo4ICUjCCAk4w
+PQYIKwYBBQUHAQEEMTAvMC0GCCsGAQUFBzABhiFodHRwczovL29jc3AucXVvdmFkaXNvZmZzaG9y
+ZS5jb20wDwYDVR0TAQH/BAUwAwEB/zCCARoGA1UdIASCAREwggENMIIBCQYJKwYBBAG+WAABMIH7
+MIHUBggrBgEFBQcCAjCBxxqBxFJlbGlhbmNlIG9uIHRoZSBRdW9WYWRpcyBSb290IENlcnRpZmlj
+YXRlIGJ5IGFueSBwYXJ0eSBhc3N1bWVzIGFjY2VwdGFuY2Ugb2YgdGhlIHRoZW4gYXBwbGljYWJs
+ZSBzdGFuZGFyZCB0ZXJtcyBhbmQgY29uZGl0aW9ucyBvZiB1c2UsIGNlcnRpZmljYXRpb24gcHJh
+Y3RpY2VzLCBhbmQgdGhlIFF1b1ZhZGlzIENlcnRpZmljYXRlIFBvbGljeS4wIgYIKwYBBQUHAgEW
+Fmh0dHA6Ly93d3cucXVvdmFkaXMuYm0wHQYDVR0OBBYEFItLbe3TKbkGGew5Oanwl4Rqy+/fMIGu
+BgNVHSMEgaYwgaOAFItLbe3TKbkGGew5Oanwl4Rqy+/foYGEpIGBMH8xCzAJBgNVBAYTAkJNMRkw
+FwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMSUwIwYDVQQLExxSb290IENlcnRpZmljYXRpb24gQXV0
+aG9yaXR5MS4wLAYDVQQDEyVRdW9WYWRpcyBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5ggQ6
+tlCLMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOCAQEAitQUtf70mpKnGdSkfnIYj9lo
+fFIk3WdvOXrEql494liwTXCYhGHoG+NpGA7O+0dQoE7/8CQfvbLO9Sf87C9TqnN7Az10buYWnuul
+LsS/VidQK2K6vkscPFVcQR0kvoIgR13VRH56FmjffU1RcHhXHTMe/QKZnAzNCgVPx7uOpHX6Sm2x
+gI4JVrmcGmD+XcHXetwReNDWXcG31a0ymQM6isxUJTkxgXsTIlG6Rmyhu576BGxJJnSP0nPrzDCi
+5upZIof4l/UO/erMkqQWxFIY6iHOsfHmhIHluqmGKPJDWl0Snawe2ajlCmqnf6CHKc/yiU3U7MXi
+5nrQNiOKSnQ2+Q==
+-----END CERTIFICATE-----
+
+QuoVadis Root CA 2
+==================
+-----BEGIN CERTIFICATE-----
+MIIFtzCCA5+gAwIBAgICBQkwDQYJKoZIhvcNAQEFBQAwRTELMAkGA1UEBhMCQk0xGTAXBgNVBAoT
+EFF1b1ZhZGlzIExpbWl0ZWQxGzAZBgNVBAMTElF1b1ZhZGlzIFJvb3QgQ0EgMjAeFw0wNjExMjQx
+ODI3MDBaFw0zMTExMjQxODIzMzNaMEUxCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBM
+aW1pdGVkMRswGQYDVQQDExJRdW9WYWRpcyBSb290IENBIDIwggIiMA0GCSqGSIb3DQEBAQUAA4IC
+DwAwggIKAoICAQCaGMpLlA0ALa8DKYrwD4HIrkwZhR0In6spRIXzL4GtMh6QRr+jhiYaHv5+HBg6
+XJxgFyo6dIMzMH1hVBHL7avg5tKifvVrbxi3Cgst/ek+7wrGsxDp3MJGF/hd/aTa/55JWpzmM+Yk
+lvc/ulsrHHo1wtZn/qtmUIttKGAr79dgw8eTvI02kfN/+NsRE8Scd3bBrrcCaoF6qUWD4gXmuVbB
+lDePSHFjIuwXZQeVikvfj8ZaCuWw419eaxGrDPmF60Tp+ARz8un+XJiM9XOva7R+zdRcAitMOeGy
+lZUtQofX1bOQQ7dsE/He3fbE+Ik/0XX1ksOR1YqI0JDs3G3eicJlcZaLDQP9nL9bFqyS2+r+eXyt
+66/3FsvbzSUr5R/7mp/iUcw6UwxI5g69ybR2BlLmEROFcmMDBOAENisgGQLodKcftslWZvB1Jdxn
+wQ5hYIizPtGo/KPaHbDRsSNU30R2be1B2MGyIrZTHN81Hdyhdyox5C315eXbyOD/5YDXC2Og/zOh
+D7osFRXql7PSorW+8oyWHhqPHWykYTe5hnMz15eWniN9gqRMgeKh0bpnX5UHoycR7hYQe7xFSkyy
+BNKr79X9DFHOUGoIMfmR2gyPZFwDwzqLID9ujWc9Otb+fVuIyV77zGHcizN300QyNQliBJIWENie
+J0f7OyHj+OsdWwIDAQABo4GwMIGtMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0PBAQDAgEGMB0GA1Ud
+DgQWBBQahGK8SEwzJQTU7tD2A8QZRtGUazBuBgNVHSMEZzBlgBQahGK8SEwzJQTU7tD2A8QZRtGU
+a6FJpEcwRTELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxGzAZBgNVBAMT
+ElF1b1ZhZGlzIFJvb3QgQ0EgMoICBQkwDQYJKoZIhvcNAQEFBQADggIBAD4KFk2fBluornFdLwUv
+Z+YTRYPENvbzwCYMDbVHZF34tHLJRqUDGCdViXh9duqWNIAXINzng/iN/Ae42l9NLmeyhP3ZRPx3
+UIHmfLTJDQtyU/h2BwdBR5YM++CCJpNVjP4iH2BlfF/nJrP3MpCYUNQ3cVX2kiF495V5+vgtJodm
+VjB3pjd4M1IQWK4/YY7yarHvGH5KWWPKjaJW1acvvFYfzznB4vsKqBUsfU16Y8Zsl0Q80m/DShcK
++JDSV6IZUaUtl0HaB0+pUNqQjZRG4T7wlP0QADj1O+hA4bRuVhogzG9Yje0uRY/W6ZM/57Es3zrW
+IozchLsib9D45MY56QSIPMO661V6bYCZJPVsAfv4l7CUW+v90m/xd2gNNWQjrLhVoQPRTUIZ3Ph1
+WVaj+ahJefivDrkRoHy3au000LYmYjgahwz46P0u05B/B5EqHdZ+XIWDmbA4CD/pXvk1B+TJYm5X
+f6dQlfe6yJvmjqIBxdZmv3lh8zwc4bmCXF2gw+nYSL0ZohEUGW6yhhtoPkg3Goi3XZZenMfvJ2II
+4pEZXNLxId26F0KCl3GBUzGpn/Z9Yr9y4aOTHcyKJloJONDO1w2AFrR4pTqHTI2KpdVGl/IsELm8
+VCLAAVBpQ570su9t+Oza8eOx79+Rj1QqCyXBJhnEUhAFZdWCEOrCMc0u
+-----END CERTIFICATE-----
+
+QuoVadis Root CA 3
+==================
+-----BEGIN CERTIFICATE-----
+MIIGnTCCBIWgAwIBAgICBcYwDQYJKoZIhvcNAQEFBQAwRTELMAkGA1UEBhMCQk0xGTAXBgNVBAoT
+EFF1b1ZhZGlzIExpbWl0ZWQxGzAZBgNVBAMTElF1b1ZhZGlzIFJvb3QgQ0EgMzAeFw0wNjExMjQx
+OTExMjNaFw0zMTExMjQxOTA2NDRaMEUxCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBM
+aW1pdGVkMRswGQYDVQQDExJRdW9WYWRpcyBSb290IENBIDMwggIiMA0GCSqGSIb3DQEBAQUAA4IC
+DwAwggIKAoICAQDMV0IWVJzmmNPTTe7+7cefQzlKZbPoFog02w1ZkXTPkrgEQK0CSzGrvI2RaNgg
+DhoB4hp7Thdd4oq3P5kazethq8Jlph+3t723j/z9cI8LoGe+AaJZz3HmDyl2/7FWeUUrH556VOij
+KTVopAFPD6QuN+8bv+OPEKhyq1hX51SGyMnzW9os2l2ObjyjPtr7guXd8lyyBTNvijbO0BNO/79K
+DDRMpsMhvVAEVeuxu537RR5kFd5VAYwCdrXLoT9CabwvvWhDFlaJKjdhkf2mrk7AyxRllDdLkgbv
+BNDInIjbC3uBr7E9KsRlOni27tyAsdLTmZw67mtaa7ONt9XOnMK+pUsvFrGeaDsGb659n/je7Mwp
+p5ijJUMv7/FfJuGITfhebtfZFG4ZM2mnO4SJk8RTVROhUXhA+LjJou57ulJCg54U7QVSWllWp5f8
+nT8KKdjcT5EOE7zelaTfi5m+rJsziO+1ga8bxiJTyPbH7pcUsMV8eFLI8M5ud2CEpukqdiDtWAEX
+MJPpGovgc2PZapKUSU60rUqFxKMiMPwJ7Wgic6aIDFUhWMXhOp8q3crhkODZc6tsgLjoC2SToJyM
+Gf+z0gzskSaHirOi4XCPLArlzW1oUevaPwV/izLmE1xr/l9A4iLItLRkT9a6fUg+qGkM17uGcclz
+uD87nSVL2v9A6wIDAQABo4IBlTCCAZEwDwYDVR0TAQH/BAUwAwEB/zCB4QYDVR0gBIHZMIHWMIHT
+BgkrBgEEAb5YAAMwgcUwgZMGCCsGAQUFBwICMIGGGoGDQW55IHVzZSBvZiB0aGlzIENlcnRpZmlj
+YXRlIGNvbnN0aXR1dGVzIGFjY2VwdGFuY2Ugb2YgdGhlIFF1b1ZhZGlzIFJvb3QgQ0EgMyBDZXJ0
+aWZpY2F0ZSBQb2xpY3kgLyBDZXJ0aWZpY2F0aW9uIFByYWN0aWNlIFN0YXRlbWVudC4wLQYIKwYB
+BQUHAgEWIWh0dHA6Ly93d3cucXVvdmFkaXNnbG9iYWwuY29tL2NwczALBgNVHQ8EBAMCAQYwHQYD
+VR0OBBYEFPLAE+CCQz777i9nMpY1XNu4ywLQMG4GA1UdIwRnMGWAFPLAE+CCQz777i9nMpY1XNu4
+ywLQoUmkRzBFMQswCQYDVQQGEwJCTTEZMBcGA1UEChMQUXVvVmFkaXMgTGltaXRlZDEbMBkGA1UE
+AxMSUXVvVmFkaXMgUm9vdCBDQSAzggIFxjANBgkqhkiG9w0BAQUFAAOCAgEAT62gLEz6wPJv92ZV
+qyM07ucp2sNbtrCD2dDQ4iH782CnO11gUyeim/YIIirnv6By5ZwkajGxkHon24QRiSemd1o417+s
+hvzuXYO8BsbRd2sPbSQvS3pspweWyuOEn62Iix2rFo1bZhfZFvSLgNLd+LJ2w/w4E6oM3kJpK27z
+POuAJ9v1pkQNn1pVWQvVDVJIxa6f8i+AxeoyUDUSly7B4f/xI4hROJ/yZlZ25w9Rl6VSDE1JUZU2
+Pb+iSwwQHYaZTKrzchGT5Or2m9qoXadNt54CrnMAyNojA+j56hl0YgCUyyIgvpSnWbWCar6ZeXqp
+8kokUvd0/bpO5qgdAm6xDYBEwa7TIzdfu4V8K5Iu6H6li92Z4b8nby1dqnuH/grdS/yO9SbkbnBC
+bjPsMZ57k8HkyWkaPcBrTiJt7qtYTcbQQcEr6k8Sh17rRdhs9ZgC06DYVYoGmRmioHfRMJ6szHXu
+g/WwYjnPbFfiTNKRCw51KBuav/0aQ/HKd/s7j2G4aSgWQgRecCocIdiP4b0jWy10QJLZYxkNc91p
+vGJHvOB0K7Lrfb5BG7XARsWhIstfTsEokt4YutUqKLsRixeTmJlglFwjz1onl14LBQaTNx47aTbr
+qZ5hHY8y2o4M1nQ+ewkk2gF3R8Q7zTSMmfXK4SVhM7JZG+Ju1zdXtg2pEto=
+-----END CERTIFICATE-----
+
+Security Communication Root CA
+==============================
+-----BEGIN CERTIFICATE-----
+MIIDWjCCAkKgAwIBAgIBADANBgkqhkiG9w0BAQUFADBQMQswCQYDVQQGEwJKUDEYMBYGA1UEChMP
+U0VDT00gVHJ1c3QubmV0MScwJQYDVQQLEx5TZWN1cml0eSBDb21tdW5pY2F0aW9uIFJvb3RDQTEw
+HhcNMDMwOTMwMDQyMDQ5WhcNMjMwOTMwMDQyMDQ5WjBQMQswCQYDVQQGEwJKUDEYMBYGA1UEChMP
+U0VDT00gVHJ1c3QubmV0MScwJQYDVQQLEx5TZWN1cml0eSBDb21tdW5pY2F0aW9uIFJvb3RDQTEw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCzs/5/022x7xZ8V6UMbXaKL0u/ZPtM7orw
+8yl89f/uKuDp6bpbZCKamm8sOiZpUQWZJtzVHGpxxpp9Hp3dfGzGjGdnSj74cbAZJ6kJDKaVv0uM
+DPpVmDvY6CKhS3E4eayXkmmziX7qIWgGmBSWh9JhNrxtJ1aeV+7AwFb9Ms+k2Y7CI9eNqPPYJayX
+5HA49LY6tJ07lyZDo6G8SVlyTCMwhwFY9k6+HGhWZq/NQV3Is00qVUarH9oe4kA92819uZKAnDfd
+DJZkndwi92SL32HeFZRSFaB9UslLqCHJxrHty8OVYNEP8Ktw+N/LTX7s1vqr2b1/VPKl6Xn62dZ2
+JChzAgMBAAGjPzA9MB0GA1UdDgQWBBSgc0mZaNyFW2XjmygvV5+9M7wHSDALBgNVHQ8EBAMCAQYw
+DwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAaECpqLvkT115swW1F7NgE+vGkl3g
+0dNq/vu+m22/xwVtWSDEHPC32oRYAmP6SBbvT6UL90qY8j+eG61Ha2POCEfrUj94nK9NrvjVT8+a
+mCoQQTlSxN3Zmw7vkwGusi7KaEIkQmywszo+zenaSMQVy+n5Bw+SUEmK3TGXX8npN6o7WWWXlDLJ
+s58+OmJYxUmtYg5xpTKqL8aJdkNAExNnPaJUJRDL8Try2frbSVa7pv6nQTXD4IhhyYjH3zYQIphZ
+6rBK+1YWc26sTfcioU+tHXotRSflMMFe8toTyyVCUZVHA4xsIcx0Qu1T/zOLjw9XARYvz6buyXAi
+FL39vmwLAw==
+-----END CERTIFICATE-----
+
+Sonera Class 2 Root CA
+======================
+-----BEGIN CERTIFICATE-----
+MIIDIDCCAgigAwIBAgIBHTANBgkqhkiG9w0BAQUFADA5MQswCQYDVQQGEwJGSTEPMA0GA1UEChMG
+U29uZXJhMRkwFwYDVQQDExBTb25lcmEgQ2xhc3MyIENBMB4XDTAxMDQwNjA3Mjk0MFoXDTIxMDQw
+NjA3Mjk0MFowOTELMAkGA1UEBhMCRkkxDzANBgNVBAoTBlNvbmVyYTEZMBcGA1UEAxMQU29uZXJh
+IENsYXNzMiBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJAXSjWdyvANlsdE+hY3
+/Ei9vX+ALTU74W+oZ6m/AxxNjG8yR9VBaKQTBME1DJqEQ/xcHf+Js+gXGM2RX/uJ4+q/Tl18GybT
+dXnt5oTjV+WtKcT0OijnpXuENmmz/V52vaMtmdOQTiMofRhj8VQ7Jp12W5dCsv+u8E7s3TmVToMG
+f+dJQMjFAbJUWmYdPfz56TwKnoG4cPABi+QjVHzIrviQHgCWctRUz2EjvOr7nQKV0ba5cTppCD8P
+tOFCx4j1P5iop7oc4HFx71hXgVB6XGt0Rg6DA5jDjqhu8nYybieDwnPz3BjotJPqdURrBGAgcVeH
+nfO+oJAjPYok4doh28MCAwEAAaMzMDEwDwYDVR0TAQH/BAUwAwEB/zARBgNVHQ4ECgQISqCqWITT
+XjwwCwYDVR0PBAQDAgEGMA0GCSqGSIb3DQEBBQUAA4IBAQBazof5FnIVV0sd2ZvnoiYw7JNn39Yt
+0jSv9zilzqsWuasvfDXLrNAPtEwr/IDva4yRXzZ299uzGxnq9LIR/WFxRL8oszodv7ND6J+/3DEI
+cbCdjdY0RzKQxmUk96BKfARzjzlvF4xytb1LyHr4e4PDKE6cCepnP7JnBBvDFNr450kkkdAdavph
+Oe9r5yF1BgfYErQhIHBCcYHaPJo2vqZbDWpsmh+Re/n570K6Tk6ezAyNlNzZRZxe7EJQY670XcSx
+EtzKO6gunRRaBXW37Ndj4ro1tgQIkejanZz2ZrUYrAqmVCY0M9IbwdR/GjqOC6oybtv8TyWf2TLH
+llpwrN9M
+-----END CERTIFICATE-----
+
+UTN USERFirst Hardware Root CA
+==============================
+-----BEGIN CERTIFICATE-----
+MIIEdDCCA1ygAwIBAgIQRL4Mi1AAJLQR0zYq/mUK/TANBgkqhkiG9w0BAQUFADCBlzELMAkGA1UE
+BhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2UgQ2l0eTEeMBwGA1UEChMVVGhl
+IFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExhodHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xHzAd
+BgNVBAMTFlVUTi1VU0VSRmlyc3QtSGFyZHdhcmUwHhcNOTkwNzA5MTgxMDQyWhcNMTkwNzA5MTgx
+OTIyWjCBlzELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2UgQ2l0
+eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExhodHRwOi8vd3d3LnVz
+ZXJ0cnVzdC5jb20xHzAdBgNVBAMTFlVUTi1VU0VSRmlyc3QtSGFyZHdhcmUwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQCx98M4P7Sof885glFn0G2f0v9Y8+efK+wNiVSZuTiZFvfgIXlI
+wrthdBKWHTxqctU8EGc6Oe0rE81m65UJM6Rsl7HoxuzBdXmcRl6Nq9Bq/bkqVRcQVLMZ8Jr28bFd
+tqdt++BxF2uiiPsA3/4aMXcMmgF6sTLjKwEHOG7DpV4jvEWbe1DByTCP2+UretNb+zNAHqDVmBe8
+i4fDidNdoI6yqqr2jmmIBsX6iSHzCJ1pLgkzmykNRg+MzEk0sGlRvfkGzWitZky8PqxhvQqIDsjf
+Pe58BEydCl5rkdbux+0ojatNh4lz0G6k0B4WixThdkQDf2Os5M1JnMWS9KsyoUhbAgMBAAGjgbkw
+gbYwCwYDVR0PBAQDAgHGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFKFyXyYbKJhDlV0HN9WF
+lp1L0sNFMEQGA1UdHwQ9MDswOaA3oDWGM2h0dHA6Ly9jcmwudXNlcnRydXN0LmNvbS9VVE4tVVNF
+UkZpcnN0LUhhcmR3YXJlLmNybDAxBgNVHSUEKjAoBggrBgEFBQcDAQYIKwYBBQUHAwUGCCsGAQUF
+BwMGBggrBgEFBQcDBzANBgkqhkiG9w0BAQUFAAOCAQEARxkP3nTGmZev/K0oXnWO6y1n7k57K9cM
+//bey1WiCuFMVGWTYGufEpytXoMs61quwOQt9ABjHbjAbPLPSbtNk28GpgoiskliCE7/yMgUsogW
+XecB5BKV5UU0s4tpvc+0hY91UZ59Ojg6FEgSxvunOxqNDYJAB+gECJChicsZUN/KHAG8HQQZexB2
+lzvukJDKxA4fFm517zP4029bHpbj4HR3dHuKom4t3XbWOTCC8KucUvIqx69JXn7HaOWCgchqJ/kn
+iCrVWFCVH/A7HFe7fRQ5YiuayZSSKqMiDP+JJn1fIytH1xUdqWqeUQ0qUZ6B+dQ7XnASfxAynB67
+nfhmqA==
+-----END CERTIFICATE-----
+
+Camerfirma Chambers of Commerce Root
+====================================
+-----BEGIN CERTIFICATE-----
+MIIEvTCCA6WgAwIBAgIBADANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJFVTEnMCUGA1UEChMe
+QUMgQ2FtZXJmaXJtYSBTQSBDSUYgQTgyNzQzMjg3MSMwIQYDVQQLExpodHRwOi8vd3d3LmNoYW1i
+ZXJzaWduLm9yZzEiMCAGA1UEAxMZQ2hhbWJlcnMgb2YgQ29tbWVyY2UgUm9vdDAeFw0wMzA5MzAx
+NjEzNDNaFw0zNzA5MzAxNjEzNDRaMH8xCzAJBgNVBAYTAkVVMScwJQYDVQQKEx5BQyBDYW1lcmZp
+cm1hIFNBIENJRiBBODI3NDMyODcxIzAhBgNVBAsTGmh0dHA6Ly93d3cuY2hhbWJlcnNpZ24ub3Jn
+MSIwIAYDVQQDExlDaGFtYmVycyBvZiBDb21tZXJjZSBSb290MIIBIDANBgkqhkiG9w0BAQEFAAOC
+AQ0AMIIBCAKCAQEAtzZV5aVdGDDg2olUkfzIx1L4L1DZ77F1c2VHfRtbunXF/KGIJPov7coISjlU
+xFF6tdpg6jg8gbLL8bvZkSM/SAFwdakFKq0fcfPJVD0dBmpAPrMMhe5cG3nCYsS4No41XQEMIwRH
+NaqbYE6gZj3LJgqcQKH0XZi/caulAGgq7YN6D6IUtdQis4CwPAxaUWktWBiP7Zme8a7ileb2R6jW
+DA+wWFjbw2Y3npuRVDM30pQcakjJyfKl2qUMI/cjDpwyVV5xnIQFUZot/eZOKjRa3spAN2cMVCFV
+d9oKDMyXroDclDZK9D7ONhMeU+SsTjoF7Nuucpw4i9A5O4kKPnf+dQIBA6OCAUQwggFAMBIGA1Ud
+EwEB/wQIMAYBAf8CAQwwPAYDVR0fBDUwMzAxoC+gLYYraHR0cDovL2NybC5jaGFtYmVyc2lnbi5v
+cmcvY2hhbWJlcnNyb290LmNybDAdBgNVHQ4EFgQU45T1sU3p26EpW1eLTXYGduHRooowDgYDVR0P
+AQH/BAQDAgEGMBEGCWCGSAGG+EIBAQQEAwIABzAnBgNVHREEIDAegRxjaGFtYmVyc3Jvb3RAY2hh
+bWJlcnNpZ24ub3JnMCcGA1UdEgQgMB6BHGNoYW1iZXJzcm9vdEBjaGFtYmVyc2lnbi5vcmcwWAYD
+VR0gBFEwTzBNBgsrBgEEAYGHLgoDATA+MDwGCCsGAQUFBwIBFjBodHRwOi8vY3BzLmNoYW1iZXJz
+aWduLm9yZy9jcHMvY2hhbWJlcnNyb290Lmh0bWwwDQYJKoZIhvcNAQEFBQADggEBAAxBl8IahsAi
+fJ/7kPMa0QOx7xP5IV8EnNrJpY0nbJaHkb5BkAFyk+cefV/2icZdp0AJPaxJRUXcLo0waLIJuvvD
+L8y6C98/d3tGfToSJI6WjzwFCm/SlCgdbQzALogi1djPHRPH8EjX1wWnz8dHnjs8NMiAT9QUu/wN
+UPf6s+xCX6ndbcj0dc97wXImsQEcXCz9ek60AcUFV7nnPKoF2YjpB0ZBzu9Bga5Y34OirsrXdx/n
+ADydb47kMgkdTXg0eDQ8lJsm7U9xxhl6vSAiSFr+S30Dt+dYvsYyTnQeaN2oaFuzPu5ifdmA6Ap1
+erfutGWaIZDgqtCYvDi1czyL+Nw=
+-----END CERTIFICATE-----
+
+Camerfirma Global Chambersign Root
+==================================
+-----BEGIN CERTIFICATE-----
+MIIExTCCA62gAwIBAgIBADANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJFVTEnMCUGA1UEChMe
+QUMgQ2FtZXJmaXJtYSBTQSBDSUYgQTgyNzQzMjg3MSMwIQYDVQQLExpodHRwOi8vd3d3LmNoYW1i
+ZXJzaWduLm9yZzEgMB4GA1UEAxMXR2xvYmFsIENoYW1iZXJzaWduIFJvb3QwHhcNMDMwOTMwMTYx
+NDE4WhcNMzcwOTMwMTYxNDE4WjB9MQswCQYDVQQGEwJFVTEnMCUGA1UEChMeQUMgQ2FtZXJmaXJt
+YSBTQSBDSUYgQTgyNzQzMjg3MSMwIQYDVQQLExpodHRwOi8vd3d3LmNoYW1iZXJzaWduLm9yZzEg
+MB4GA1UEAxMXR2xvYmFsIENoYW1iZXJzaWduIFJvb3QwggEgMA0GCSqGSIb3DQEBAQUAA4IBDQAw
+ggEIAoIBAQCicKLQn0KuWxfH2H3PFIP8T8mhtxOviteePgQKkotgVvq0Mi+ITaFgCPS3CU6gSS9J
+1tPfnZdan5QEcOw/Wdm3zGaLmFIoCQLfxS+EjXqXd7/sQJ0lcqu1PzKY+7e3/HKE5TWH+VX6ox8O
+by4o3Wmg2UIQxvi1RMLQQ3/bvOSiPGpVeAp3qdjqGTK3L/5cPxvusZjsyq16aUXjlg9V9ubtdepl
+6DJWk0aJqCWKZQbua795B9Dxt6/tLE2Su8CoX6dnfQTyFQhwrJLWfQTSM/tMtgsL+xrJxI0DqX5c
+8lCrEqWhz0hQpe/SyBoT+rB/sYIcd2oPX9wLlY/vQ37mRQklAgEDo4IBUDCCAUwwEgYDVR0TAQH/
+BAgwBgEB/wIBDDA/BgNVHR8EODA2MDSgMqAwhi5odHRwOi8vY3JsLmNoYW1iZXJzaWduLm9yZy9j
+aGFtYmVyc2lnbnJvb3QuY3JsMB0GA1UdDgQWBBRDnDafsJ4wTcbOX60Qq+UDpfqpFDAOBgNVHQ8B
+Af8EBAMCAQYwEQYJYIZIAYb4QgEBBAQDAgAHMCoGA1UdEQQjMCGBH2NoYW1iZXJzaWducm9vdEBj
+aGFtYmVyc2lnbi5vcmcwKgYDVR0SBCMwIYEfY2hhbWJlcnNpZ25yb290QGNoYW1iZXJzaWduLm9y
+ZzBbBgNVHSAEVDBSMFAGCysGAQQBgYcuCgEBMEEwPwYIKwYBBQUHAgEWM2h0dHA6Ly9jcHMuY2hh
+bWJlcnNpZ24ub3JnL2Nwcy9jaGFtYmVyc2lnbnJvb3QuaHRtbDANBgkqhkiG9w0BAQUFAAOCAQEA
+PDtwkfkEVCeR4e3t/mh/YV3lQWVPMvEYBZRqHN4fcNs+ezICNLUMbKGKfKX0j//U2K0X1S0E0T9Y
+gOKBWYi+wONGkyT+kL0mojAt6JcmVzWJdJYY9hXiryQZVgICsroPFOrGimbBhkVVi76SvpykBMdJ
+PJ7oKXqJ1/6v/2j1pReQvayZzKWGVwlnRtvWFsJG8eSpUPWP0ZIV018+xgBJOm5YstHRJw0lyDL4
+IBHNfTIzSJRUTN3cecQwn+uOuFW114hcxWokPbLTBQNRxgfvzBRydD1ucs4YKIxKoHflCStFREes
+t2d/AYoFWpO+ocH/+OcOZ6RHSXZddZAa9SaP8A==
+-----END CERTIFICATE-----
+
+XRamp Global CA Root
+====================
+-----BEGIN CERTIFICATE-----
+MIIEMDCCAxigAwIBAgIQUJRs7Bjq1ZxN1ZfvdY+grTANBgkqhkiG9w0BAQUFADCBgjELMAkGA1UE
+BhMCVVMxHjAcBgNVBAsTFXd3dy54cmFtcHNlY3VyaXR5LmNvbTEkMCIGA1UEChMbWFJhbXAgU2Vj
+dXJpdHkgU2VydmljZXMgSW5jMS0wKwYDVQQDEyRYUmFtcCBHbG9iYWwgQ2VydGlmaWNhdGlvbiBB
+dXRob3JpdHkwHhcNMDQxMTAxMTcxNDA0WhcNMzUwMTAxMDUzNzE5WjCBgjELMAkGA1UEBhMCVVMx
+HjAcBgNVBAsTFXd3dy54cmFtcHNlY3VyaXR5LmNvbTEkMCIGA1UEChMbWFJhbXAgU2VjdXJpdHkg
+U2VydmljZXMgSW5jMS0wKwYDVQQDEyRYUmFtcCBHbG9iYWwgQ2VydGlmaWNhdGlvbiBBdXRob3Jp
+dHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCYJB69FbS638eMpSe2OAtp87ZOqCwu
+IR1cRN8hXX4jdP5efrRKt6atH67gBhbim1vZZ3RrXYCPKZ2GG9mcDZhtdhAoWORlsH9KmHmf4MMx
+foArtYzAQDsRhtDLooY2YKTVMIJt2W7QDxIEM5dfT2Fa8OT5kavnHTu86M/0ay00fOJIYRyO82FE
+zG+gSqmUsE3a56k0enI4qEHMPJQRfevIpoy3hsvKMzvZPTeL+3o+hiznc9cKV6xkmxnr9A8ECIqs
+AxcZZPRaJSKNNCyy9mgdEm3Tih4U2sSPpuIjhdV6Db1q4Ons7Be7QhtnqiXtRYMh/MHJfNViPvry
+xS3T/dRlAgMBAAGjgZ8wgZwwEwYJKwYBBAGCNxQCBAYeBABDAEEwCwYDVR0PBAQDAgGGMA8GA1Ud
+EwEB/wQFMAMBAf8wHQYDVR0OBBYEFMZPoj0GY4QJnM5i5ASsjVy16bYbMDYGA1UdHwQvMC0wK6Ap
+oCeGJWh0dHA6Ly9jcmwueHJhbXBzZWN1cml0eS5jb20vWEdDQS5jcmwwEAYJKwYBBAGCNxUBBAMC
+AQEwDQYJKoZIhvcNAQEFBQADggEBAJEVOQMBG2f7Shz5CmBbodpNl2L5JFMn14JkTpAuw0kbK5rc
+/Kh4ZzXxHfARvbdI4xD2Dd8/0sm2qlWkSLoC295ZLhVbO50WfUfXN+pfTXYSNrsf16GBBEYgoyxt
+qZ4Bfj8pzgCT3/3JknOJiWSe5yvkHJEs0rnOfc5vMZnT5r7SHpDwCRR5XCOrTdLaIR9NmXmd4c8n
+nxCbHIgNsIpkQTG4DmyQJKSbXHGPurt+HBvbaoAPIbzp26a3QPSyi6mx5O+aGtA9aZnuqCij4Tyz
+8LIRnM98QObd50N9otg6tamN8jSZxNQQ4Qb9CYQQO+7ETPTsJ3xCwnR8gooJybQDJbw=
+-----END CERTIFICATE-----
+
+Go Daddy Class 2 CA
+===================
+-----BEGIN CERTIFICATE-----
+MIIEADCCAuigAwIBAgIBADANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJVUzEhMB8GA1UEChMY
+VGhlIEdvIERhZGR5IEdyb3VwLCBJbmMuMTEwLwYDVQQLEyhHbyBEYWRkeSBDbGFzcyAyIENlcnRp
+ZmljYXRpb24gQXV0aG9yaXR5MB4XDTA0MDYyOTE3MDYyMFoXDTM0MDYyOTE3MDYyMFowYzELMAkG
+A1UEBhMCVVMxITAfBgNVBAoTGFRoZSBHbyBEYWRkeSBHcm91cCwgSW5jLjExMC8GA1UECxMoR28g
+RGFkZHkgQ2xhc3MgMiBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCASAwDQYJKoZIhvcNAQEBBQAD
+ggENADCCAQgCggEBAN6d1+pXGEmhW+vXX0iG6r7d/+TvZxz0ZWizV3GgXne77ZtJ6XCAPVYYYwhv
+2vLM0D9/AlQiVBDYsoHUwHU9S3/Hd8M+eKsaA7Ugay9qK7HFiH7Eux6wwdhFJ2+qN1j3hybX2C32
+qRe3H3I2TqYXP2WYktsqbl2i/ojgC95/5Y0V4evLOtXiEqITLdiOr18SPaAIBQi2XKVlOARFmR6j
+YGB0xUGlcmIbYsUfb18aQr4CUWWoriMYavx4A6lNf4DD+qta/KFApMoZFv6yyO9ecw3ud72a9nmY
+vLEHZ6IVDd2gWMZEewo+YihfukEHU1jPEX44dMX4/7VpkI+EdOqXG68CAQOjgcAwgb0wHQYDVR0O
+BBYEFNLEsNKR1EwRcbNhyz2h/t2oatTjMIGNBgNVHSMEgYUwgYKAFNLEsNKR1EwRcbNhyz2h/t2o
+atTjoWekZTBjMQswCQYDVQQGEwJVUzEhMB8GA1UEChMYVGhlIEdvIERhZGR5IEdyb3VwLCBJbmMu
+MTEwLwYDVQQLEyhHbyBEYWRkeSBDbGFzcyAyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5ggEAMAwG
+A1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBADJL87LKPpH8EsahB4yOd6AzBhRckB4Y9wim
+PQoZ+YeAEW5p5JYXMP80kWNyOO7MHAGjHZQopDH2esRU1/blMVgDoszOYtuURXO1v0XJJLXVggKt
+I3lpjbi2Tc7PTMozI+gciKqdi0FuFskg5YmezTvacPd+mSYgFFQlq25zheabIZ0KbIIOqPjCDPoQ
+HmyW74cNxA9hi63ugyuV+I6ShHI56yDqg+2DzZduCLzrTia2cyvk0/ZM/iZx4mERdEr/VxqHD3VI
+Ls9RaRegAhJhldXRQLIQTO7ErBBDpqWeCtWVYpoNz4iCxTIM5CufReYNnyicsbkqWletNw+vHX/b
+vZ8=
+-----END CERTIFICATE-----
+
+Starfield Class 2 CA
+====================
+-----BEGIN CERTIFICATE-----
+MIIEDzCCAvegAwIBAgIBADANBgkqhkiG9w0BAQUFADBoMQswCQYDVQQGEwJVUzElMCMGA1UEChMc
+U3RhcmZpZWxkIFRlY2hub2xvZ2llcywgSW5jLjEyMDAGA1UECxMpU3RhcmZpZWxkIENsYXNzIDIg
+Q2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDQwNjI5MTczOTE2WhcNMzQwNjI5MTczOTE2WjBo
+MQswCQYDVQQGEwJVUzElMCMGA1UEChMcU3RhcmZpZWxkIFRlY2hub2xvZ2llcywgSW5jLjEyMDAG
+A1UECxMpU3RhcmZpZWxkIENsYXNzIDIgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggEgMA0GCSqG
+SIb3DQEBAQUAA4IBDQAwggEIAoIBAQC3Msj+6XGmBIWtDBFk385N78gDGIc/oav7PKaf8MOh2tTY
+bitTkPskpD6E8J7oX+zlJ0T1KKY/e97gKvDIr1MvnsoFAZMej2YcOadN+lq2cwQlZut3f+dZxkqZ
+JRRU6ybH838Z1TBwj6+wRir/resp7defqgSHo9T5iaU0X9tDkYI22WY8sbi5gv2cOj4QyDvvBmVm
+epsZGD3/cVE8MC5fvj13c7JdBmzDI1aaK4UmkhynArPkPw2vCHmCuDY96pzTNbO8acr1zJ3o/WSN
+F4Azbl5KXZnJHoe0nRrA1W4TNSNe35tfPe/W93bC6j67eA0cQmdrBNj41tpvi/JEoAGrAgEDo4HF
+MIHCMB0GA1UdDgQWBBS/X7fRzt0fhvRbVazc1xDCDqmI5zCBkgYDVR0jBIGKMIGHgBS/X7fRzt0f
+hvRbVazc1xDCDqmI56FspGowaDELMAkGA1UEBhMCVVMxJTAjBgNVBAoTHFN0YXJmaWVsZCBUZWNo
+bm9sb2dpZXMsIEluYy4xMjAwBgNVBAsTKVN0YXJmaWVsZCBDbGFzcyAyIENlcnRpZmljYXRpb24g
+QXV0aG9yaXR5ggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAAWdP4id0ckaVaGs
+afPzWdqbAYcaT1epoXkJKtv3L7IezMdeatiDh6GX70k1PncGQVhiv45YuApnP+yz3SFmH8lU+nLM
+PUxA2IGvd56Deruix/U0F47ZEUD0/CwqTRV/p2JdLiXTAAsgGh1o+Re49L2L7ShZ3U0WixeDyLJl
+xy16paq8U4Zt3VekyvggQQto8PT7dL5WXXp59fkdheMtlb71cZBDzI0fmgAKhynpVSJYACPq4xJD
+KVtHCN2MQWplBqjlIapBtJUhlbl90TSrE9atvNziPTnNvT51cKEYWQPJIrSPnNVeKtelttQKbfi3
+QBFGmh95DmK/D5fs4C8fF5Q=
+-----END CERTIFICATE-----
+
+StartCom Certification Authority
+================================
+-----BEGIN CERTIFICATE-----
+MIIHyTCCBbGgAwIBAgIBATANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJJTDEWMBQGA1UEChMN
+U3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmlu
+ZzEpMCcGA1UEAxMgU3RhcnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDYwOTE3MTk0
+NjM2WhcNMzYwOTE3MTk0NjM2WjB9MQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRk
+LjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzEpMCcGA1UEAxMg
+U3RhcnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAw
+ggIKAoICAQDBiNsJvGxGfHiflXu1M5DycmLWwTYgIiRezul38kMKogZkpMyONvg45iPwbm2xPN1y
+o4UcodM9tDMr0y+v/uqwQVlntsQGfQqedIXWeUyAN3rfOQVSWff0G0ZDpNKFhdLDcfN1YjS6LIp/
+Ho/u7TTQEceWzVI9ujPW3U3eCztKS5/CJi/6tRYccjV3yjxd5srhJosaNnZcAdt0FCX+7bWgiA/d
+eMotHweXMAEtcnn6RtYTKqi5pquDSR3l8u/d5AGOGAqPY1MWhWKpDhk6zLVmpsJrdAfkK+F2PrRt
+2PZE4XNiHzvEvqBTViVsUQn3qqvKv3b9bZvzndu/PWa8DFaqr5hIlTpL36dYUNk4dalb6kMMAv+Z
+6+hsTXBbKWWc3apdzK8BMewM69KN6Oqce+Zu9ydmDBpI125C4z/eIT574Q1w+2OqqGwaVLRcJXrJ
+osmLFqa7LH4XXgVNWG4SHQHuEhANxjJ/GP/89PrNbpHoNkm+Gkhpi8KWTRoSsmkXwQqQ1vp5Iki/
+untp+HDH+no32NgN0nZPV/+Qt+OR0t3vwmC3Zzrd/qqc8NSLf3Iizsafl7b4r4qgEKjZ+xjGtrVc
+UjyJthkqcwEKDwOzEmDyei+B26Nu/yYwl/WL3YlXtq09s68rxbd2AvCl1iuahhQqcvbjM4xdCUsT
+37uMdBNSSwIDAQABo4ICUjCCAk4wDAYDVR0TBAUwAwEB/zALBgNVHQ8EBAMCAa4wHQYDVR0OBBYE
+FE4L7xqkQFulF2mHMMo0aEPQQa7yMGQGA1UdHwRdMFswLKAqoCiGJmh0dHA6Ly9jZXJ0LnN0YXJ0
+Y29tLm9yZy9zZnNjYS1jcmwuY3JsMCugKaAnhiVodHRwOi8vY3JsLnN0YXJ0Y29tLm9yZy9zZnNj
+YS1jcmwuY3JsMIIBXQYDVR0gBIIBVDCCAVAwggFMBgsrBgEEAYG1NwEBATCCATswLwYIKwYBBQUH
+AgEWI2h0dHA6Ly9jZXJ0LnN0YXJ0Y29tLm9yZy9wb2xpY3kucGRmMDUGCCsGAQUFBwIBFilodHRw
+Oi8vY2VydC5zdGFydGNvbS5vcmcvaW50ZXJtZWRpYXRlLnBkZjCB0AYIKwYBBQUHAgIwgcMwJxYg
+U3RhcnQgQ29tbWVyY2lhbCAoU3RhcnRDb20pIEx0ZC4wAwIBARqBl0xpbWl0ZWQgTGlhYmlsaXR5
+LCByZWFkIHRoZSBzZWN0aW9uICpMZWdhbCBMaW1pdGF0aW9ucyogb2YgdGhlIFN0YXJ0Q29tIENl
+cnRpZmljYXRpb24gQXV0aG9yaXR5IFBvbGljeSBhdmFpbGFibGUgYXQgaHR0cDovL2NlcnQuc3Rh
+cnRjb20ub3JnL3BvbGljeS5wZGYwEQYJYIZIAYb4QgEBBAQDAgAHMDgGCWCGSAGG+EIBDQQrFilT
+dGFydENvbSBGcmVlIFNTTCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTANBgkqhkiG9w0BAQUFAAOC
+AgEAFmyZ9GYMNPXQhV59CuzaEE44HF7fpiUFS5Eyweg78T3dRAlbB0mKKctmArexmvclmAk8jhvh
+3TaHK0u7aNM5Zj2gJsfyOZEdUauCe37Vzlrk4gNXcGmXCPleWKYK34wGmkUWFjgKXlf2Ysd6AgXm
+vB618p70qSmD+LIU424oh0TDkBreOKk8rENNZEXO3SipXPJzewT4F+irsfMuXGRuczE6Eri8sxHk
+fY+BUZo7jYn0TZNmezwD7dOaHZrzZVD1oNB1ny+v8OqCQ5j4aZyJecRDjkZy42Q2Eq/3JR44iZB3
+fsNrarnDy0RLrHiQi+fHLB5LEUTINFInzQpdn4XBidUaePKVEFMy3YCEZnXZtWgo+2EuvoSoOMCZ
+EoalHmdkrQYuL6lwhceWD3yJZfWOQ1QOq92lgDmUYMA0yZZwLKMS9R9Ie70cfmu3nZD0Ijuu+Pwq
+yvqCUqDvr0tVk+vBtfAii6w0TiYiBKGHLHVKt+V9E9e4DGTANtLJL4YSjCMJwRuCO3NJo2pXh5Tl
+1njFmUNj403gdy3hZZlyaQQaRwnmDwFWJPsfvw55qVguucQJAX6Vum0ABj6y6koQOdjQK/W/7HW/
+lwLFCRsI3FU34oH7N4RDYiDK51ZLZer+bMEkkyShNOsF/5oirpt9P/FlUQqmMGqz9IgcgA38coro
+g14=
+-----END CERTIFICATE-----
+
+Taiwan GRCA
+===========
+-----BEGIN CERTIFICATE-----
+MIIFcjCCA1qgAwIBAgIQH51ZWtcvwgZEpYAIaeNe9jANBgkqhkiG9w0BAQUFADA/MQswCQYDVQQG
+EwJUVzEwMC4GA1UECgwnR292ZXJubWVudCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4X
+DTAyMTIwNTEzMjMzM1oXDTMyMTIwNTEzMjMzM1owPzELMAkGA1UEBhMCVFcxMDAuBgNVBAoMJ0dv
+dmVybm1lbnQgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCAiIwDQYJKoZIhvcNAQEBBQAD
+ggIPADCCAgoCggIBAJoluOzMonWoe/fOW1mKydGGEghU7Jzy50b2iPN86aXfTEc2pBsBHH8eV4qN
+w8XRIePaJD9IK/ufLqGU5ywck9G/GwGHU5nOp/UKIXZ3/6m3xnOUT0b3EEk3+qhZSV1qgQdW8or5
+BtD3cCJNtLdBuTK4sfCxw5w/cP1T3YGq2GN49thTbqGsaoQkclSGxtKyyhwOeYHWtXBiCAEuTk8O
+1RGvqa/lmr/czIdtJuTJV6L7lvnM4T9TjGxMfptTCAtsF/tnyMKtsc2AtJfcdgEWFelq16TheEfO
+htX7MfP6Mb40qij7cEwdScevLJ1tZqa2jWR+tSBqnTuBto9AAGdLiYa4zGX+FVPpBMHWXx1E1wov
+J5pGfaENda1UhhXcSTvxls4Pm6Dso3pdvtUqdULle96ltqqvKKyskKw4t9VoNSZ63Pc78/1Fm9G7
+Q3hub/FCVGqY8A2tl+lSXunVanLeavcbYBT0peS2cWeqH+riTcFCQP5nRhc4L0c/cZyu5SHKYS1t
+B6iEfC3uUSXxY5Ce/eFXiGvviiNtsea9P63RPZYLhY3Naye7twWb7LuRqQoHEgKXTiCQ8P8NHuJB
+O9NAOueNXdpm5AKwB1KYXA6OM5zCppX7VRluTI6uSw+9wThNXo+EHWbNxWCWtFJaBYmOlXqYwZE8
+lSOyDvR5tMl8wUohAgMBAAGjajBoMB0GA1UdDgQWBBTMzO/MKWCkO7GStjz6MmKPrCUVOzAMBgNV
+HRMEBTADAQH/MDkGBGcqBwAEMTAvMC0CAQAwCQYFKw4DAhoFADAHBgVnKgMAAAQUA5vwIhP/lSg2
+09yewDL7MTqKUWUwDQYJKoZIhvcNAQEFBQADggIBAECASvomyc5eMN1PhnR2WPWus4MzeKR6dBcZ
+TulStbngCnRiqmjKeKBMmo4sIy7VahIkv9Ro04rQ2JyftB8M3jh+Vzj8jeJPXgyfqzvS/3WXy6Tj
+Zwj/5cAWtUgBfen5Cv8b5Wppv3ghqMKnI6mGq3ZW6A4M9hPdKmaKZEk9GhiHkASfQlK3T8v+R0F2
+Ne//AHY2RTKbxkaFXeIksB7jSJaYV0eUVXoPQbFEJPPB/hprv4j9wabak2BegUqZIJxIZhm1AHlU
+D7gsL0u8qV1bYH+Mh6XgUmMqvtg7hUAV/h62ZT/FS9p+tXo1KaMuephgIqP0fSdOLeq0dDzpD6Qz
+DxARvBMB1uUO07+1EqLhRSPAzAhuYbeJq4PjJB7mXQfnHyA+z2fI56wwbSdLaG5LKlwCCDTb+Hbk
+Z6MmnD+iMsJKxYEYMRBWqoTvLQr/uB930r+lWKBi5NdLkXWNiYCYfm3LU05er/ayl4WXudpVBrkk
+7tfGOB5jGxI7leFYrPLfhNVfmS8NVVvmONsuP3LpSIXLuykTjx44VbnzssQwmSNOXfJIoRIM3BKQ
+CZBUkQM8R+XVyWXgt0t97EfTsws+rZ7QdAAO671RrcDeLMDDav7v3Aun+kbfYNucpllQdSNpc5Oy
++fwC00fmcc4QAu4njIT/rEUNE1yDMuAlpYYsfPQS
+-----END CERTIFICATE-----
+
+Swisscom Root CA 1
+==================
+-----BEGIN CERTIFICATE-----
+MIIF2TCCA8GgAwIBAgIQXAuFXAvnWUHfV8w/f52oNjANBgkqhkiG9w0BAQUFADBkMQswCQYDVQQG
+EwJjaDERMA8GA1UEChMIU3dpc3Njb20xJTAjBgNVBAsTHERpZ2l0YWwgQ2VydGlmaWNhdGUgU2Vy
+dmljZXMxGzAZBgNVBAMTElN3aXNzY29tIFJvb3QgQ0EgMTAeFw0wNTA4MTgxMjA2MjBaFw0yNTA4
+MTgyMjA2MjBaMGQxCzAJBgNVBAYTAmNoMREwDwYDVQQKEwhTd2lzc2NvbTElMCMGA1UECxMcRGln
+aXRhbCBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczEbMBkGA1UEAxMSU3dpc3Njb20gUm9vdCBDQSAxMIIC
+IjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA0LmwqAzZuz8h+BvVM5OAFmUgdbI9m2BtRsiM
+MW8Xw/qabFbtPMWRV8PNq5ZJkCoZSx6jbVfd8StiKHVFXqrWW/oLJdihFvkcxC7mlSpnzNApbjyF
+NDhhSbEAn9Y6cV9Nbc5fuankiX9qUvrKm/LcqfmdmUc/TilftKaNXXsLmREDA/7n29uj/x2lzZAe
+AR81sH8A25Bvxn570e56eqeqDFdvpG3FEzuwpdntMhy0XmeLVNxzh+XTF3xmUHJd1BpYwdnP2IkC
+b6dJtDZd0KTeByy2dbcokdaXvij1mB7qWybJvbCXc9qukSbraMH5ORXWZ0sKbU/Lz7DkQnGMU3nn
+7uHbHaBuHYwadzVcFh4rUx80i9Fs/PJnB3r1re3WmquhsUvhzDdf/X/NTa64H5xD+SpYVUNFvJbN
+cA78yeNmuk6NO4HLFWR7uZToXTNShXEuT46iBhFRyePLoW4xCGQMwtI89Tbo19AOeCMgkckkKmUp
+WyL3Ic6DXqTz3kvTaI9GdVyDCW4pa8RwjPWd1yAv/0bSKzjCL3UcPX7ape8eYIVpQtPM+GP+HkM5
+haa2Y0EQs3MevNP6yn0WR+Kn1dCjigoIlmJWbjTb2QK5MHXjBNLnj8KwEUAKrNVxAmKLMb7dxiNY
+MUJDLXT5xp6mig/p/r+D5kNXJLrvRjSq1xIBOO0CAwEAAaOBhjCBgzAOBgNVHQ8BAf8EBAMCAYYw
+HQYDVR0hBBYwFDASBgdghXQBUwABBgdghXQBUwABMBIGA1UdEwEB/wQIMAYBAf8CAQcwHwYDVR0j
+BBgwFoAUAyUv3m+CATpcLNwroWm1Z9SM0/0wHQYDVR0OBBYEFAMlL95vggE6XCzcK6FptWfUjNP9
+MA0GCSqGSIb3DQEBBQUAA4ICAQA1EMvspgQNDQ/NwNurqPKIlwzfky9NfEBWMXrrpA9gzXrzvsMn
+jgM+pN0S734edAY8PzHyHHuRMSG08NBsl9Tpl7IkVh5WwzW9iAUPWxAaZOHHgjD5Mq2eUCzneAXQ
+MbFamIp1TpBcahQq4FJHgmDmHtqBsfsUC1rxn9KVuj7QG9YVHaO+htXbD8BJZLsuUBlL0iT43R4H
+VtA4oJVwIHaM190e3p9xxCPvgxNcoyQVTSlAPGrEqdi3pkSlDfTgnXceQHAm/NrZNuR55LU/vJtl
+vrsRls/bxig5OgjOR1tTWsWZ/l2p3e9M1MalrQLmjAcSHm8D0W+go/MpvRLHUKKwf4ipmXeascCl
+OS5cfGniLLDqN2qk4Vrh9VDlg++luyqI54zb/W1elxmofmZ1a3Hqv7HHb6D0jqTsNFFbjCYDcKF3
+1QESVwA12yPeDooomf2xEG9L/zgtYE4snOtnta1J7ksfrK/7DZBaZmBwXarNeNQk7shBoJMBkpxq
+nvy5JMWzFYJ+vq6VK+uxwNrjAWALXmmshFZhvnEX/h0TD/7Gh0Xp/jKgGg0TpJRVcaUWi7rKibCy
+x/yP2FS1k2Kdzs9Z+z0YzirLNRWCXf9UIltxUvu3yf5gmwBBZPCqKuy2QkPOiWaByIufOVQDJdMW
+NY6E0F/6MBr1mmz0DlP5OlvRHA==
+-----END CERTIFICATE-----
+
+DigiCert Assured ID Root CA
+===========================
+-----BEGIN CERTIFICATE-----
+MIIDtzCCAp+gAwIBAgIQDOfg5RfYRv6P5WD8G/AwOTANBgkqhkiG9w0BAQUFADBlMQswCQYDVQQG
+EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSQw
+IgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgQ0EwHhcNMDYxMTEwMDAwMDAwWhcNMzEx
+MTEwMDAwMDAwWjBlMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQL
+ExB3d3cuZGlnaWNlcnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgQ0Ew
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCtDhXO5EOAXLGH87dg+XESpa7cJpSIqvTO
+9SA5KFhgDPiA2qkVlTJhPLWxKISKityfCgyDF3qPkKyK53lTXDGEKvYPmDI2dsze3Tyoou9q+yHy
+UmHfnyDXH+Kx2f4YZNISW1/5WBg1vEfNoTb5a3/UsDg+wRvDjDPZ2C8Y/igPs6eD1sNuRMBhNZYW
+/lmci3Zt1/GiSw0r/wty2p5g0I6QNcZ4VYcgoc/lbQrISXwxmDNsIumH0DJaoroTghHtORedmTpy
+oeb6pNnVFzF1roV9Iq4/AUaG9ih5yLHa5FcXxH4cDrC0kqZWs72yl+2qp/C3xag/lRbQ/6GW6whf
+GHdPAgMBAAGjYzBhMA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRF
+66Kv9JLLgjEtUYunpyGd823IDzAfBgNVHSMEGDAWgBRF66Kv9JLLgjEtUYunpyGd823IDzANBgkq
+hkiG9w0BAQUFAAOCAQEAog683+Lt8ONyc3pklL/3cmbYMuRCdWKuh+vy1dneVrOfzM4UKLkNl2Bc
+EkxY5NM9g0lFWJc1aRqoR+pWxnmrEthngYTffwk8lOa4JiwgvT2zKIn3X/8i4peEH+ll74fg38Fn
+SbNd67IJKusm7Xi+fT8r87cmNW1fiQG2SVufAQWbqz0lwcy2f8Lxb4bG+mRo64EtlOtCt/qMHt1i
+8b5QZ7dsvfPxH2sMNgcWfzd8qVttevESRmCD1ycEvkvOl77DZypoEd+A5wwzZr8TDRRu838fYxAe
++o0bJW1sj6W3YQGx0qMmoRBxna3iw/nDmVG3KwcIzi7mULKn+gpFL6Lw8g==
+-----END CERTIFICATE-----
+
+DigiCert Global Root CA
+=======================
+-----BEGIN CERTIFICATE-----
+MIIDrzCCApegAwIBAgIQCDvgVpBCRrGhdWrJWZHHSjANBgkqhkiG9w0BAQUFADBhMQswCQYDVQQG
+EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSAw
+HgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBDQTAeFw0wNjExMTAwMDAwMDBaFw0zMTExMTAw
+MDAwMDBaMGExCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3
+dy5kaWdpY2VydC5jb20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IENBMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4jvhEXLeqKTTo1eqUKKPC3eQyaKl7hLOllsBCSDMAZOn
+TjC3U/dDxGkAV53ijSLdhwZAAIEJzs4bg7/fzTtxRuLWZscFs3YnFo97nh6Vfe63SKMI2tavegw5
+BmV/Sl0fvBf4q77uKNd0f3p4mVmFaG5cIzJLv07A6Fpt43C/dxC//AH2hdmoRBBYMql1GNXRor5H
+4idq9Joz+EkIYIvUX7Q6hL+hqkpMfT7PT19sdl6gSzeRntwi5m3OFBqOasv+zbMUZBfHWymeMr/y
+7vrTC0LUq7dBMtoM1O/4gdW7jVg/tRvoSSiicNoxBN33shbyTApOB6jtSj1etX+jkMOvJwIDAQAB
+o2MwYTAOBgNVHQ8BAf8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUA95QNVbRTLtm
+8KPiGxvDl7I90VUwHwYDVR0jBBgwFoAUA95QNVbRTLtm8KPiGxvDl7I90VUwDQYJKoZIhvcNAQEF
+BQADggEBAMucN6pIExIK+t1EnE9SsPTfrgT1eXkIoyQY/EsrhMAtudXH/vTBH1jLuG2cenTnmCmr
+EbXjcKChzUyImZOMkXDiqw8cvpOp/2PV5Adg06O/nVsJ8dWO41P0jmP6P6fbtGbfYmbW0W5BjfIt
+tep3Sp+dWOIrWcBAI+0tKIJFPnlUkiaY4IBIqDfv8NZ5YBberOgOzW6sRBc4L0na4UU+Krk2U886
+UAb3LujEV0lsYSEY1QSteDwsOoBrp+uvFRTp2InBuThs4pFsiv9kuXclVzDAGySj4dzp30d8tbQk
+CAUw7C29C79Fv1C5qfPrmAESrciIxpg0X40KPMbp1ZWVbd4=
+-----END CERTIFICATE-----
+
+DigiCert High Assurance EV Root CA
+==================================
+-----BEGIN CERTIFICATE-----
+MIIDxTCCAq2gAwIBAgIQAqxcJmoLQJuPC3nyrkYldzANBgkqhkiG9w0BAQUFADBsMQswCQYDVQQG
+EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSsw
+KQYDVQQDEyJEaWdpQ2VydCBIaWdoIEFzc3VyYW5jZSBFViBSb290IENBMB4XDTA2MTExMDAwMDAw
+MFoXDTMxMTExMDAwMDAwMFowbDELMAkGA1UEBhMCVVMxFTATBgNVBAoTDERpZ2lDZXJ0IEluYzEZ
+MBcGA1UECxMQd3d3LmRpZ2ljZXJ0LmNvbTErMCkGA1UEAxMiRGlnaUNlcnQgSGlnaCBBc3N1cmFu
+Y2UgRVYgUm9vdCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMbM5XPm+9S75S0t
+Mqbf5YE/yc0lSbZxKsPVlDRnogocsF9ppkCxxLeyj9CYpKlBWTrT3JTWPNt0OKRKzE0lgvdKpVMS
+OO7zSW1xkX5jtqumX8OkhPhPYlG++MXs2ziS4wblCJEMxChBVfvLWokVfnHoNb9Ncgk9vjo4UFt3
+MRuNs8ckRZqnrG0AFFoEt7oT61EKmEFBIk5lYYeBQVCmeVyJ3hlKV9Uu5l0cUyx+mM0aBhakaHPQ
+NAQTXKFx01p8VdteZOE3hzBWBOURtCmAEvF5OYiiAhF8J2a3iLd48soKqDirCmTCv2ZdlYTBoSUe
+h10aUAsgEsxBu24LUTi4S8sCAwEAAaNjMGEwDgYDVR0PAQH/BAQDAgGGMA8GA1UdEwEB/wQFMAMB
+Af8wHQYDVR0OBBYEFLE+w2kD+L9HAdSYJhoIAu9jZCvDMB8GA1UdIwQYMBaAFLE+w2kD+L9HAdSY
+JhoIAu9jZCvDMA0GCSqGSIb3DQEBBQUAA4IBAQAcGgaX3NecnzyIZgYIVyHbIUf4KmeqvxgydkAQ
+V8GK83rZEWWONfqe/EW1ntlMMUu4kehDLI6zeM7b41N5cdblIZQB2lWHmiRk9opmzN6cN82oNLFp
+myPInngiK3BD41VHMWEZ71jFhS9OMPagMRYjyOfiZRYzy78aG6A9+MpeizGLYAiJLQwGXFK3xPkK
+mNEVX58Svnw2Yzi9RKR/5CYrCsSXaQ3pjOLAEFe4yHYSkVXySGnYvCoCWw9E1CAx2/S6cCZdkGCe
+vEsXCS+0yx5DaMkHJ8HSXPfqIbloEpw8nL+e/IBcm2PN7EeqJSdnoDfzAIJ9VNep+OkuE6N36B9K
+-----END CERTIFICATE-----
+
+Certplus Class 2 Primary CA
+===========================
+-----BEGIN CERTIFICATE-----
+MIIDkjCCAnqgAwIBAgIRAIW9S/PY2uNp9pTXX8OlRCMwDQYJKoZIhvcNAQEFBQAwPTELMAkGA1UE
+BhMCRlIxETAPBgNVBAoTCENlcnRwbHVzMRswGQYDVQQDExJDbGFzcyAyIFByaW1hcnkgQ0EwHhcN
+OTkwNzA3MTcwNTAwWhcNMTkwNzA2MjM1OTU5WjA9MQswCQYDVQQGEwJGUjERMA8GA1UEChMIQ2Vy
+dHBsdXMxGzAZBgNVBAMTEkNsYXNzIDIgUHJpbWFyeSBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBANxQltAS+DXSCHh6tlJw/W/uz7kRy1134ezpfgSN1sxvc0NXYKwzCkTsA18cgCSR
+5aiRVhKC9+Ar9NuuYS6JEI1rbLqzAr3VNsVINyPi8Fo3UjMXEuLRYE2+L0ER4/YXJQyLkcAbmXuZ
+Vg2v7tK8R1fjeUl7NIknJITesezpWE7+Tt9avkGtrAjFGA7v0lPubNCdEgETjdyAYveVqUSISnFO
+YFWe2yMZeVYHDD9jC1yw4r5+FfyUM1hBOHTE4Y+L3yasH7WLO7dDWWuwJKZtkIvEcupdM5i3y95e
+e++U8Rs+yskhwcWYAqqi9lt3m/V+llU0HGdpwPFC40es/CgcZlUCAwEAAaOBjDCBiTAPBgNVHRME
+CDAGAQH/AgEKMAsGA1UdDwQEAwIBBjAdBgNVHQ4EFgQU43Mt38sOKAze3bOkynm4jrvoMIkwEQYJ
+YIZIAYb4QgEBBAQDAgEGMDcGA1UdHwQwMC4wLKAqoCiGJmh0dHA6Ly93d3cuY2VydHBsdXMuY29t
+L0NSTC9jbGFzczIuY3JsMA0GCSqGSIb3DQEBBQUAA4IBAQCnVM+IRBnL39R/AN9WM2K191EBkOvD
+P9GIROkkXe/nFL0gt5o8AP5tn9uQ3Nf0YtaLcF3n5QRIqWh8yfFC82x/xXp8HVGIutIKPidd3i1R
+TtMTZGnkLuPT55sJmabglZvOGtd/vjzOUrMRFcEPF80Du5wlFbqidon8BvEY0JNLDnyCt6X09l/+
+7UCmnYR0ObncHoUW2ikbhiMAybuJfm6AiB4vFLQDJKgybwOaRywwvlbGp0ICcBvqQNi6BQNwB6SW
+//1IMwrh3KWBkJtN3X3n57LNXMhqlfil9o3EXXgIvnsG1knPGTZQIy4I5p4FTUcY1Rbpsda2ENW7
+l7+ijrRU
+-----END CERTIFICATE-----
+
+DST Root CA X3
+==============
+-----BEGIN CERTIFICATE-----
+MIIDSjCCAjKgAwIBAgIQRK+wgNajJ7qJMDmGLvhAazANBgkqhkiG9w0BAQUFADA/MSQwIgYDVQQK
+ExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMTDkRTVCBSb290IENBIFgzMB4X
+DTAwMDkzMDIxMTIxOVoXDTIxMDkzMDE0MDExNVowPzEkMCIGA1UEChMbRGlnaXRhbCBTaWduYXR1
+cmUgVHJ1c3QgQ28uMRcwFQYDVQQDEw5EU1QgUm9vdCBDQSBYMzCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBAN+v6ZdQCINXtMxiZfaQguzH0yxrMMpb7NnDfcdAwRgUi+DoM3ZJKuM/IUmT
+rE4Orz5Iy2Xu/NMhD2XSKtkyj4zl93ewEnu1lcCJo6m67XMuegwGMoOifooUMM0RoOEqOLl5CjH9
+UL2AZd+3UWODyOKIYepLYYHsUmu5ouJLGiifSKOeDNoJjj4XLh7dIN9bxiqKqy69cK3FCxolkHRy
+xXtqqzTWMIn/5WgTe1QLyNau7Fqckh49ZLOMxt+/yUFw7BZy1SbsOFU5Q9D8/RhcQPGX69Wam40d
+utolucbY38EVAjqr2m7xPi71XAicPNaDaeQQmxkqtilX4+U9m5/wAl0CAwEAAaNCMEAwDwYDVR0T
+AQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFMSnsaR7LHH62+FLkHX/xBVghYkQ
+MA0GCSqGSIb3DQEBBQUAA4IBAQCjGiybFwBcqR7uKGY3Or+Dxz9LwwmglSBd49lZRNI+DT69ikug
+dB/OEIKcdBodfpga3csTS7MgROSR6cz8faXbauX+5v3gTt23ADq1cEmv8uXrAvHRAosZy5Q6XkjE
+GB5YGV8eAlrwDPGxrancWYaLbumR9YbK+rlmM6pZW87ipxZzR8srzJmwN0jP41ZL9c8PDHIyh8bw
+RLtTcm1D9SZImlJnt1ir/md2cXjbDaJWFBM5JDGFoqgCWjBH4d1QB7wCCZAA62RjYJsWvIjJEubS
+fZGL+T0yjWW06XyxV3bqxbYoOb8VZRzI9neWagqNdwvYkQsEjgfbKbYK7p2CNTUQ
+-----END CERTIFICATE-----
+
+DST ACES CA X6
+==============
+-----BEGIN CERTIFICATE-----
+MIIECTCCAvGgAwIBAgIQDV6ZCtadt3js2AdWO4YV2TANBgkqhkiG9w0BAQUFADBbMQswCQYDVQQG
+EwJVUzEgMB4GA1UEChMXRGlnaXRhbCBTaWduYXR1cmUgVHJ1c3QxETAPBgNVBAsTCERTVCBBQ0VT
+MRcwFQYDVQQDEw5EU1QgQUNFUyBDQSBYNjAeFw0wMzExMjAyMTE5NThaFw0xNzExMjAyMTE5NTha
+MFsxCzAJBgNVBAYTAlVTMSAwHgYDVQQKExdEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdDERMA8GA1UE
+CxMIRFNUIEFDRVMxFzAVBgNVBAMTDkRTVCBBQ0VTIENBIFg2MIIBIjANBgkqhkiG9w0BAQEFAAOC
+AQ8AMIIBCgKCAQEAuT31LMmU3HWKlV1j6IR3dma5WZFcRt2SPp/5DgO0PWGSvSMmtWPuktKe1jzI
+DZBfZIGxqAgNTNj50wUoUrQBJcWVHAx+PhCEdc/BGZFjz+iokYi5Q1K7gLFViYsx+tC3dr5BPTCa
+pCIlF3PoHuLTrCq9Wzgh1SpL11V94zpVvddtawJXa+ZHfAjIgrrep4c9oW24MFbCswKBXy314pow
+GCi4ZtPLAZZv6opFVdbgnf9nKxcCpk4aahELfrd755jWjHZvwTvbUJN+5dCOHze4vbrGn2zpfDPy
+MjwmR/onJALJfh1biEITajV8fTXpLmaRcpPVMibEdPVTo7NdmvYJywIDAQABo4HIMIHFMA8GA1Ud
+EwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgHGMB8GA1UdEQQYMBaBFHBraS1vcHNAdHJ1c3Rkc3Qu
+Y29tMGIGA1UdIARbMFkwVwYKYIZIAWUDAgEBATBJMEcGCCsGAQUFBwIBFjtodHRwOi8vd3d3LnRy
+dXN0ZHN0LmNvbS9jZXJ0aWZpY2F0ZXMvcG9saWN5L0FDRVMtaW5kZXguaHRtbDAdBgNVHQ4EFgQU
+CXIGThhDD+XWzMNqizF7eI+og7gwDQYJKoZIhvcNAQEFBQADggEBAKPYjtay284F5zLNAdMEA+V2
+5FYrnJmQ6AgwbN99Pe7lv7UkQIRJ4dEorsTCOlMwiPH1d25Ryvr/ma8kXxug/fKshMrfqfBfBC6t
+Fr8hlxCBPeP/h40y3JTlR4peahPJlJU90u7INJXQgNStMgiAVDzgvVJT11J8smk/f3rPanTK+gQq
+nExaBqXpIK1FZg9p8d2/6eMyi/rgwYZNcjwu2JN4Cir42NInPRmJX1p7ijvMDNpRrscL9yuwNwXs
+vFcj4jjSm2jzVhKIT0J8uDHEtdvkyCE06UgRNe76x5JXxZ805Mf29w4LTJxoeHtxMcfrHuBnQfO3
+oKfN5XozNmr6mis=
+-----END CERTIFICATE-----
+
+SwissSign Gold CA - G2
+======================
+-----BEGIN CERTIFICATE-----
+MIIFujCCA6KgAwIBAgIJALtAHEP1Xk+wMA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNVBAYTAkNIMRUw
+EwYDVQQKEwxTd2lzc1NpZ24gQUcxHzAdBgNVBAMTFlN3aXNzU2lnbiBHb2xkIENBIC0gRzIwHhcN
+MDYxMDI1MDgzMDM1WhcNMzYxMDI1MDgzMDM1WjBFMQswCQYDVQQGEwJDSDEVMBMGA1UEChMMU3dp
+c3NTaWduIEFHMR8wHQYDVQQDExZTd2lzc1NpZ24gR29sZCBDQSAtIEcyMIICIjANBgkqhkiG9w0B
+AQEFAAOCAg8AMIICCgKCAgEAr+TufoskDhJuqVAtFkQ7kpJcyrhdhJJCEyq8ZVeCQD5XJM1QiyUq
+t2/876LQwB8CJEoTlo8jE+YoWACjR8cGp4QjK7u9lit/VcyLwVcfDmJlD909Vopz2q5+bbqBHH5C
+jCA12UNNhPqE21Is8w4ndwtrvxEvcnifLtg+5hg3Wipy+dpikJKVyh+c6bM8K8vzARO/Ws/BtQpg
+vd21mWRTuKCWs2/iJneRjOBiEAKfNA+k1ZIzUd6+jbqEemA8atufK+ze3gE/bk3lUIbLtK/tREDF
+ylqM2tIrfKjuvqblCqoOpd8FUrdVxyJdMmqXl2MT28nbeTZ7hTpKxVKJ+STnnXepgv9VHKVxaSvR
+AiTysybUa9oEVeXBCsdtMDeQKuSeFDNeFhdVxVu1yzSJkvGdJo+hB9TGsnhQ2wwMC3wLjEHXuend
+jIj3o02yMszYF9rNt85mndT9Xv+9lz4pded+p2JYryU0pUHHPbwNUMoDAw8IWh+Vc3hiv69yFGkO
+peUDDniOJihC8AcLYiAQZzlG+qkDzAQ4embvIIO1jEpWjpEA/I5cgt6IoMPiaG59je883WX0XaxR
+7ySArqpWl2/5rX3aYT+YdzylkbYcjCbaZaIJbcHiVOO5ykxMgI93e2CaHt+28kgeDrpOVG2Y4OGi
+GqJ3UM/EY5LsRxmd6+ZrzsECAwEAAaOBrDCBqTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUw
+AwEB/zAdBgNVHQ4EFgQUWyV7lqRlUX64OfPAeGZe6Drn8O4wHwYDVR0jBBgwFoAUWyV7lqRlUX64
+OfPAeGZe6Drn8O4wRgYDVR0gBD8wPTA7BglghXQBWQECAQEwLjAsBggrBgEFBQcCARYgaHR0cDov
+L3JlcG9zaXRvcnkuc3dpc3NzaWduLmNvbS8wDQYJKoZIhvcNAQEFBQADggIBACe645R88a7A3hfm
+5djV9VSwg/S7zV4Fe0+fdWavPOhWfvxyeDgD2StiGwC5+OlgzczOUYrHUDFu4Up+GC9pWbY9ZIEr
+44OE5iKHjn3g7gKZYbge9LgriBIWhMIxkziWMaa5O1M/wySTVltpkuzFwbs4AOPsF6m43Md8AYOf
+Mke6UiI0HTJ6CVanfCU2qT1L2sCCbwq7EsiHSycR+R4tx5M/nttfJmtS2S6K8RTGRI0Vqbe/vd6m
+Gu6uLftIdxf+u+yvGPUqUfA5hJeVbG4bwyvEdGB5JbAKJ9/fXtI5z0V9QkvfsywexcZdylU6oJxp
+mo/a77KwPJ+HbBIrZXAVUjEaJM9vMSNQH4xPjyPDdEFjHFWoFN0+4FFQz/EbMFYOkrCChdiDyyJk
+vC24JdVUorgG6q2SpCSgwYa1ShNqR88uC1aVVMvOmttqtKay20EIhid392qgQmwLOM7XdVAyksLf
+KzAiSNDVQTglXaTpXZ/GlHXQRf0wl0OPkKsKx4ZzYEppLd6leNcG2mqeSz53OiATIgHQv2ieY2Br
+NU0LbbqhPcCT4H8js1WtciVORvnSFu+wZMEBnunKoGqYDs/YYPIvSbjkQuE4NRb0yG5P94FW6Lqj
+viOvrv1vA+ACOzB2+httQc8Bsem4yWb02ybzOqR08kkkW8mw0FfB+j564ZfJ
+-----END CERTIFICATE-----
+
+SwissSign Silver CA - G2
+========================
+-----BEGIN CERTIFICATE-----
+MIIFvTCCA6WgAwIBAgIITxvUL1S7L0swDQYJKoZIhvcNAQEFBQAwRzELMAkGA1UEBhMCQ0gxFTAT
+BgNVBAoTDFN3aXNzU2lnbiBBRzEhMB8GA1UEAxMYU3dpc3NTaWduIFNpbHZlciBDQSAtIEcyMB4X
+DTA2MTAyNTA4MzI0NloXDTM2MTAyNTA4MzI0NlowRzELMAkGA1UEBhMCQ0gxFTATBgNVBAoTDFN3
+aXNzU2lnbiBBRzEhMB8GA1UEAxMYU3dpc3NTaWduIFNpbHZlciBDQSAtIEcyMIICIjANBgkqhkiG
+9w0BAQEFAAOCAg8AMIICCgKCAgEAxPGHf9N4Mfc4yfjDmUO8x/e8N+dOcbpLj6VzHVxumK4DV644
+N0MvFz0fyM5oEMF4rhkDKxD6LHmD9ui5aLlV8gREpzn5/ASLHvGiTSf5YXu6t+WiE7brYT7QbNHm
++/pe7R20nqA1W6GSy/BJkv6FCgU+5tkL4k+73JU3/JHpMjUi0R86TieFnbAVlDLaYQ1HTWBCrpJH
+6INaUFjpiou5XaHc3ZlKHzZnu0jkg7Y360g6rw9njxcH6ATK72oxh9TAtvmUcXtnZLi2kUpCe2Uu
+MGoM9ZDulebyzYLs2aFK7PayS+VFheZteJMELpyCbTapxDFkH4aDCyr0NQp4yVXPQbBH6TCfmb5h
+qAaEuSh6XzjZG6k4sIN/c8HDO0gqgg8hm7jMqDXDhBuDsz6+pJVpATqJAHgE2cn0mRmrVn5bi4Y5
+FZGkECwJMoBgs5PAKrYYC51+jUnyEEp/+dVGLxmSo5mnJqy7jDzmDrxHB9xzUfFwZC8I+bRHHTBs
+ROopN4WSaGa8gzj+ezku01DwH/teYLappvonQfGbGHLy9YR0SslnxFSuSGTfjNFusB3hB48IHpmc
+celM2KX3RxIfdNFRnobzwqIjQAtz20um53MGjMGg6cFZrEb65i/4z3GcRm25xBWNOHkDRUjvxF3X
+CO6HOSKGsg0PWEP3calILv3q1h8CAwEAAaOBrDCBqTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/
+BAUwAwEB/zAdBgNVHQ4EFgQUF6DNweRBtjpbO8tFnb0cwpj6hlgwHwYDVR0jBBgwFoAUF6DNweRB
+tjpbO8tFnb0cwpj6hlgwRgYDVR0gBD8wPTA7BglghXQBWQEDAQEwLjAsBggrBgEFBQcCARYgaHR0
+cDovL3JlcG9zaXRvcnkuc3dpc3NzaWduLmNvbS8wDQYJKoZIhvcNAQEFBQADggIBAHPGgeAn0i0P
+4JUw4ppBf1AsX19iYamGamkYDHRJ1l2E6kFSGG9YrVBWIGrGvShpWJHckRE1qTodvBqlYJ7YH39F
+kWnZfrt4csEGDyrOj4VwYaygzQu4OSlWhDJOhrs9xCrZ1x9y7v5RoSJBsXECYxqCsGKrXlcSH9/L
+3XWgwF15kIwb4FDm3jH+mHtwX6WQ2K34ArZv02DdQEsixT2tOnqfGhpHkXkzuoLcMmkDlm4fS/Bx
+/uNncqCxv1yL5PqZIseEuRuNI5c/7SXgz2W79WEE790eslpBIlqhn10s6FvJbakMDHiqYMZWjwFa
+DGi8aRl5xB9+lwW/xekkUV7U1UtT7dkjWjYDZaPBA61BMPNGG4WQr2W11bHkFlt4dR2Xem1ZqSqP
+e97Dh4kQmUlzeMg9vVE1dCrV8X5pGyq7O70luJpaPXJhkGaH7gzWTdQRdAtq/gsD/KNVV4n+Ssuu
+WxcFyPKNIzFTONItaj+CuY0IavdeQXRuwxF+B6wpYJE/OMpXEA29MC/HpeZBoNquBYeaoKRlbEwJ
+DIm6uNO5wJOKMPqN5ZprFQFOZ6raYlY+hAhm0sQ2fac+EPyI4NSA5QC9qvNOBqN6avlicuMJT+ub
+DgEj8Z+7fNzcbBGXJbLytGMU0gYqZ4yD9c7qB9iaah7s5Aq7KkzrCWA5zspi2C5u
+-----END CERTIFICATE-----
+
+GeoTrust Primary Certification Authority
+========================================
+-----BEGIN CERTIFICATE-----
+MIIDfDCCAmSgAwIBAgIQGKy1av1pthU6Y2yv2vrEoTANBgkqhkiG9w0BAQUFADBYMQswCQYDVQQG
+EwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjExMC8GA1UEAxMoR2VvVHJ1c3QgUHJpbWFyeSBD
+ZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wNjExMjcwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMFgx
+CzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMTEwLwYDVQQDEyhHZW9UcnVzdCBQ
+cmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEAvrgVe//UfH1nrYNke8hCUy3f9oQIIGHWAVlqnEQRr+92/ZV+zmEwu3qDXwK9AWbK7hWN
+b6EwnL2hhZ6UOvNWiAAxz9juapYC2e0DjPt1befquFUWBRaa9OBesYjAZIVcFU2Ix7e64HXprQU9
+nceJSOC7KMgD4TCTZF5SwFlwIjVXiIrxlQqD17wxcwE07e9GceBrAqg1cmuXm2bgyxx5X9gaBGge
+RwLmnWDiNpcB3841kt++Z8dtd1k7j53WkBWUvEI0EME5+bEnPn7WinXFsq+W06Lem+SYvn3h6YGt
+tm/81w7a4DSwDRp35+MImO9Y+pyEtzavwt+s0vQQBnBxNQIDAQABo0IwQDAPBgNVHRMBAf8EBTAD
+AQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQULNVQQZcVi/CPNmFbSvtr2ZnJM5IwDQYJKoZI
+hvcNAQEFBQADggEBAFpwfyzdtzRP9YZRqSa+S7iq8XEN3GHHoOo0Hnp3DwQ16CePbJC/kRYkRj5K
+Ts4rFtULUh38H2eiAkUxT87z+gOneZ1TatnaYzr4gNfTmeGl4b7UVXGYNTq+k+qurUKykG/g/CFN
+NWMziUnWm07Kx+dOCQD32sfvmWKZd7aVIl6KoKv0uHiYyjgZmclynnjNS6yvGaBzEi38wkG6gZHa
+Floxt/m0cYASSJlyc1pZU8FjUjPtp8nSOQJw+uCxQmYpqptR7TBUIhRf2asdweSU8Pj1K/fqynhG
+1riR/aYNKxoUAT6A8EKglQdebc3MS6RFjasS6LPeWuWgfOgPIh1a6Vk=
+-----END CERTIFICATE-----
+
+thawte Primary Root CA
+======================
+-----BEGIN CERTIFICATE-----
+MIIEIDCCAwigAwIBAgIQNE7VVyDV7exJ9C/ON9srbTANBgkqhkiG9w0BAQUFADCBqTELMAkGA1UE
+BhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2
+aWNlcyBEaXZpc2lvbjE4MDYGA1UECxMvKGMpIDIwMDYgdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhv
+cml6ZWQgdXNlIG9ubHkxHzAdBgNVBAMTFnRoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EwHhcNMDYxMTE3
+MDAwMDAwWhcNMzYwNzE2MjM1OTU5WjCBqTELMAkGA1UEBhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwg
+SW5jLjEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjE4MDYGA1UECxMv
+KGMpIDIwMDYgdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxHzAdBgNVBAMT
+FnRoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCs
+oPD7gFnUnMekz52hWXMJEEUMDSxuaPFsW0hoSVk3/AszGcJ3f8wQLZU0HObrTQmnHNK4yZc2AreJ
+1CRfBsDMRJSUjQJib+ta3RGNKJpchJAQeg29dGYvajig4tVUROsdB58Hum/u6f1OCyn1PoSgAfGc
+q/gcfomk6KHYcWUNo1F77rzSImANuVud37r8UVsLr5iy6S7pBOhih94ryNdOwUxkHt3Ph1i6Sk/K
+aAcdHJ1KxtUvkcx8cXIcxcBn6zL9yZJclNqFwJu/U30rCfSMnZEfl2pSy94JNqR32HuHUETVPm4p
+afs5SSYeCaWAe0At6+gnhcn+Yf1+5nyXHdWdAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYD
+VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBR7W0XPr87Lev0xkhpqtvNG61dIUDANBgkqhkiG9w0BAQUF
+AAOCAQEAeRHAS7ORtvzw6WfUDW5FvlXok9LOAz/t2iWwHVfLHjp2oEzsUHboZHIMpKnxuIvW1oeE
+uzLlQRHAd9mzYJ3rG9XRbkREqaYB7FViHXe4XI5ISXycO1cRrK1zN44veFyQaEfZYGDm/Ac9IiAX
+xPcW6cTYcvnIc3zfFi8VqT79aie2oetaupgf1eNNZAqdE8hhuvU5HIe6uL17In/2/qxAeeWsEG89
+jxt5dovEN7MhGITlNgDrYyCZuen+MwS7QcjBAvlEYyCegc5C09Y/LHbTY5xZ3Y+m4Q6gLkH3LpVH
+z7z9M/P2C2F+fpErgUfCJzDupxBdN49cOSvkBPB7jVaMaA==
+-----END CERTIFICATE-----
+
+VeriSign Class 3 Public Primary Certification Authority - G5
+============================================================
+-----BEGIN CERTIFICATE-----
+MIIE0zCCA7ugAwIBAgIQGNrRniZ96LtKIVjNzGs7SjANBgkqhkiG9w0BAQUFADCByjELMAkGA1UE
+BhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBO
+ZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVk
+IHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRp
+ZmljYXRpb24gQXV0aG9yaXR5IC0gRzUwHhcNMDYxMTA4MDAwMDAwWhcNMzYwNzE2MjM1OTU5WjCB
+yjELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2ln
+biBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJpU2lnbiwgSW5jLiAtIEZvciBh
+dXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmlt
+YXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQCvJAgIKXo1nmAMqudLO07cfLw8RRy7K+D+KQL5VwijZIUVJ/XxrcgxiV0i6CqqpkKz
+j/i5Vbext0uz/o9+B1fs70PbZmIVYc9gDaTY3vjgw2IIPVQT60nKWVSFJuUrjxuf6/WhkcIzSdhD
+Y2pSS9KP6HBRTdGJaXvHcPaz3BJ023tdS1bTlr8Vd6Gw9KIl8q8ckmcY5fQGBO+QueQA5N06tRn/
+Arr0PO7gi+s3i+z016zy9vA9r911kTMZHRxAy3QkGSGT2RT+rCpSx4/VBEnkjWNHiDxpg8v+R70r
+fk/Fla4OndTRQ8Bnc+MUCH7lP59zuDMKz10/NIeWiu5T6CUVAgMBAAGjgbIwga8wDwYDVR0TAQH/
+BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwbQYIKwYBBQUHAQwEYTBfoV2gWzBZMFcwVRYJaW1hZ2Uv
+Z2lmMCEwHzAHBgUrDgMCGgQUj+XTGoasjY5rw8+AatRIGCx7GS4wJRYjaHR0cDovL2xvZ28udmVy
+aXNpZ24uY29tL3ZzbG9nby5naWYwHQYDVR0OBBYEFH/TZafC3ey78DAJ80M5+gKvMzEzMA0GCSqG
+SIb3DQEBBQUAA4IBAQCTJEowX2LP2BqYLz3q3JktvXf2pXkiOOzEp6B4Eq1iDkVwZMXnl2YtmAl+
+X6/WzChl8gGqCBpH3vn5fJJaCGkgDdk+bW48DW7Y5gaRQBi5+MHt39tBquCWIMnNZBU4gcmU7qKE
+KQsTb47bDN0lAtukixlE0kF6BWlKWE9gyn6CagsCqiUXObXbf+eEZSqVir2G3l6BFoMtEMze/aiC
+Km0oHw0LxOXnGiYZ4fQRbxC1lfznQgUy286dUV4otp6F01vvpX1FQHKOtw5rDgb7MzVIcbidJ4vE
+ZV8NhnacRHr2lVz2XTIIM6RUthg/aFzyQkqFOFSDX9HoLPKsEdao7WNq
+-----END CERTIFICATE-----
+
+SecureTrust CA
+==============
+-----BEGIN CERTIFICATE-----
+MIIDuDCCAqCgAwIBAgIQDPCOXAgWpa1Cf/DrJxhZ0DANBgkqhkiG9w0BAQUFADBIMQswCQYDVQQG
+EwJVUzEgMB4GA1UEChMXU2VjdXJlVHJ1c3QgQ29ycG9yYXRpb24xFzAVBgNVBAMTDlNlY3VyZVRy
+dXN0IENBMB4XDTA2MTEwNzE5MzExOFoXDTI5MTIzMTE5NDA1NVowSDELMAkGA1UEBhMCVVMxIDAe
+BgNVBAoTF1NlY3VyZVRydXN0IENvcnBvcmF0aW9uMRcwFQYDVQQDEw5TZWN1cmVUcnVzdCBDQTCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKukgeWVzfX2FI7CT8rU4niVWJxB4Q2ZQCQX
+OZEzZum+4YOvYlyJ0fwkW2Gz4BERQRwdbvC4u/jep4G6pkjGnx29vo6pQT64lO0pGtSO0gMdA+9t
+DWccV9cGrcrI9f4Or2YlSASWC12juhbDCE/RRvgUXPLIXgGZbf2IzIaowW8xQmxSPmjL8xk037uH
+GFaAJsTQ3MBv396gwpEWoGQRS0S8Hvbn+mPeZqx2pHGj7DaUaHp3pLHnDi+BeuK1cobvomuL8A/b
+01k/unK8RCSc43Oz969XL0Imnal0ugBS8kvNU3xHCzaFDmapCJcWNFfBZveA4+1wVMeT4C4oFVmH
+ursCAwEAAaOBnTCBmjATBgkrBgEEAYI3FAIEBh4EAEMAQTALBgNVHQ8EBAMCAYYwDwYDVR0TAQH/
+BAUwAwEB/zAdBgNVHQ4EFgQUQjK2FvoE/f5dS3rD/fdMQB1aQ68wNAYDVR0fBC0wKzApoCegJYYj
+aHR0cDovL2NybC5zZWN1cmV0cnVzdC5jb20vU1RDQS5jcmwwEAYJKwYBBAGCNxUBBAMCAQAwDQYJ
+KoZIhvcNAQEFBQADggEBADDtT0rhWDpSclu1pqNlGKa7UTt36Z3q059c4EVlew3KW+JwULKUBRSu
+SceNQQcSc5R+DCMh/bwQf2AQWnL1mA6s7Ll/3XpvXdMc9P+IBWlCqQVxyLesJugutIxq/3HcuLHf
+mbx8IVQr5Fiiu1cprp6poxkmD5kuCLDv/WnPmRoJjeOnnyvJNjR7JLN4TJUXpAYmHrZkUjZfYGfZ
+nMUFdAvnZyPSCPyI6a6Lf+Ew9Dd+/cYy2i2eRDAwbO4H3tI0/NL/QPZL9GZGBlSm8jIKYyYwa5vR
+3ItHuuG51WLQoqD0ZwV4KWMabwTW+MZMo5qxN7SN5ShLHZ4swrhovO0C7jE=
+-----END CERTIFICATE-----
+
+Secure Global CA
+================
+-----BEGIN CERTIFICATE-----
+MIIDvDCCAqSgAwIBAgIQB1YipOjUiolN9BPI8PjqpTANBgkqhkiG9w0BAQUFADBKMQswCQYDVQQG
+EwJVUzEgMB4GA1UEChMXU2VjdXJlVHJ1c3QgQ29ycG9yYXRpb24xGTAXBgNVBAMTEFNlY3VyZSBH
+bG9iYWwgQ0EwHhcNMDYxMTA3MTk0MjI4WhcNMjkxMjMxMTk1MjA2WjBKMQswCQYDVQQGEwJVUzEg
+MB4GA1UEChMXU2VjdXJlVHJ1c3QgQ29ycG9yYXRpb24xGTAXBgNVBAMTEFNlY3VyZSBHbG9iYWwg
+Q0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvNS7YrGxVaQZx5RNoJLNP2MwhR/jx
+YDiJiQPpvepeRlMJ3Fz1Wuj3RSoC6zFh1ykzTM7HfAo3fg+6MpjhHZevj8fcyTiW89sa/FHtaMbQ
+bqR8JNGuQsiWUGMu4P51/pinX0kuleM5M2SOHqRfkNJnPLLZ/kG5VacJjnIFHovdRIWCQtBJwB1g
+8NEXLJXr9qXBkqPFwqcIYA1gBBCWeZ4WNOaptvolRTnIHmX5k/Wq8VLcmZg9pYYaDDUz+kulBAYV
+HDGA76oYa8J719rO+TMg1fW9ajMtgQT7sFzUnKPiXB3jqUJ1XnvUd+85VLrJChgbEplJL4hL/VBi
+0XPnj3pDAgMBAAGjgZ0wgZowEwYJKwYBBAGCNxQCBAYeBABDAEEwCwYDVR0PBAQDAgGGMA8GA1Ud
+EwEB/wQFMAMBAf8wHQYDVR0OBBYEFK9EBMJBfkiD2045AuzshHrmzsmkMDQGA1UdHwQtMCswKaAn
+oCWGI2h0dHA6Ly9jcmwuc2VjdXJldHJ1c3QuY29tL1NHQ0EuY3JsMBAGCSsGAQQBgjcVAQQDAgEA
+MA0GCSqGSIb3DQEBBQUAA4IBAQBjGghAfaReUw132HquHw0LURYD7xh8yOOvaliTFGCRsoTciE6+
+OYo68+aCiV0BN7OrJKQVDpI1WkpEXk5X+nXOH0jOZvQ8QCaSmGwb7iRGDBezUqXbpZGRzzfTb+cn
+CDpOGR86p1hcF895P4vkp9MmI50mD1hp/Ed+stCNi5O/KU9DaXR2Z0vPB4zmAve14bRDtUstFJ/5
+3CYNv6ZHdAbYiNE6KTCEztI5gGIbqMdXSbxqVVFnFUq+NQfk1XWYN3kwFNspnWzFacxHVaIw98xc
+f8LDmBxrThaA63p4ZUWiABqvDA1VZDRIuJK58bRQKfJPIx/abKwfROHdI3hRW8cW
+-----END CERTIFICATE-----
+
+COMODO Certification Authority
+==============================
+-----BEGIN CERTIFICATE-----
+MIIEHTCCAwWgAwIBAgIQToEtioJl4AsC7j41AkblPTANBgkqhkiG9w0BAQUFADCBgTELMAkGA1UE
+BhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgG
+A1UEChMRQ09NT0RPIENBIExpbWl0ZWQxJzAlBgNVBAMTHkNPTU9ETyBDZXJ0aWZpY2F0aW9uIEF1
+dGhvcml0eTAeFw0wNjEyMDEwMDAwMDBaFw0yOTEyMzEyMzU5NTlaMIGBMQswCQYDVQQGEwJHQjEb
+MBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRowGAYDVQQKExFD
+T01PRE8gQ0EgTGltaXRlZDEnMCUGA1UEAxMeQ09NT0RPIENlcnRpZmljYXRpb24gQXV0aG9yaXR5
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0ECLi3LjkRv3UcEbVASY06m/weaKXTuH
++7uIzg3jLz8GlvCiKVCZrts7oVewdFFxze1CkU1B/qnI2GqGd0S7WWaXUF601CxwRM/aN5VCaTww
+xHGzUvAhTaHYujl8HJ6jJJ3ygxaYqhZ8Q5sVW7euNJH+1GImGEaaP+vB+fGQV+useg2L23IwambV
+4EajcNxo2f8ESIl33rXp+2dtQem8Ob0y2WIC8bGoPW43nOIv4tOiJovGuFVDiOEjPqXSJDlqR6sA
+1KGzqSX+DT+nHbrTUcELpNqsOO9VUCQFZUaTNE8tja3G1CEZ0o7KBWFxB3NH5YoZEr0ETc5OnKVI
+rLsm9wIDAQABo4GOMIGLMB0GA1UdDgQWBBQLWOWLxkwVN6RAqTCpIb5HNlpW/zAOBgNVHQ8BAf8E
+BAMCAQYwDwYDVR0TAQH/BAUwAwEB/zBJBgNVHR8EQjBAMD6gPKA6hjhodHRwOi8vY3JsLmNvbW9k
+b2NhLmNvbS9DT01PRE9DZXJ0aWZpY2F0aW9uQXV0aG9yaXR5LmNybDANBgkqhkiG9w0BAQUFAAOC
+AQEAPpiem/Yb6dc5t3iuHXIYSdOH5EOC6z/JqvWote9VfCFSZfnVDeFs9D6Mk3ORLgLETgdxb8CP
+OGEIqB6BCsAvIC9Bi5HcSEW88cbeunZrM8gALTFGTO3nnc+IlP8zwFboJIYmuNg4ON8qa90SzMc/
+RxdMosIGlgnW2/4/PEZB31jiVg88O8EckzXZOFKs7sjsLjBOlDW0JB9LeGna8gI4zJVSk/BwJVmc
+IGfE7vmLV2H0knZ9P4SNVbfo5azV8fUZVqZa+5Acr5Pr5RzUZ5ddBA6+C4OmF4O5MBKgxTMVBbkN
++8cFduPYSo38NBejxiEovjBFMR7HeL5YYTisO+IBZQ==
+-----END CERTIFICATE-----
+
+Network Solutions Certificate Authority
+=======================================
+-----BEGIN CERTIFICATE-----
+MIID5jCCAs6gAwIBAgIQV8szb8JcFuZHFhfjkDFo4DANBgkqhkiG9w0BAQUFADBiMQswCQYDVQQG
+EwJVUzEhMB8GA1UEChMYTmV0d29yayBTb2x1dGlvbnMgTC5MLkMuMTAwLgYDVQQDEydOZXR3b3Jr
+IFNvbHV0aW9ucyBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwHhcNMDYxMjAxMDAwMDAwWhcNMjkxMjMx
+MjM1OTU5WjBiMQswCQYDVQQGEwJVUzEhMB8GA1UEChMYTmV0d29yayBTb2x1dGlvbnMgTC5MLkMu
+MTAwLgYDVQQDEydOZXR3b3JrIFNvbHV0aW9ucyBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDkvH6SMG3G2I4rC7xGzuAnlt7e+foS0zwzc7MEL7xx
+jOWftiJgPl9dzgn/ggwbmlFQGiaJ3dVhXRncEg8tCqJDXRfQNJIg6nPPOCwGJgl6cvf6UDL4wpPT
+aaIjzkGxzOTVHzbRijr4jGPiFFlp7Q3Tf2vouAPlT2rlmGNpSAW+Lv8ztumXWWn4Zxmuk2GWRBXT
+crA/vGp97Eh/jcOrqnErU2lBUzS1sLnFBgrEsEX1QV1uiUV7PTsmjHTC5dLRfbIR1PtYMiKagMnc
+/Qzpf14Dl847ABSHJ3A4qY5usyd2mFHgBeMhqxrVhSI8KbWaFsWAqPS7azCPL0YCorEMIuDTAgMB
+AAGjgZcwgZQwHQYDVR0OBBYEFCEwyfsA106Y2oeqKtCnLrFAMadMMA4GA1UdDwEB/wQEAwIBBjAP
+BgNVHRMBAf8EBTADAQH/MFIGA1UdHwRLMEkwR6BFoEOGQWh0dHA6Ly9jcmwubmV0c29sc3NsLmNv
+bS9OZXR3b3JrU29sdXRpb25zQ2VydGlmaWNhdGVBdXRob3JpdHkuY3JsMA0GCSqGSIb3DQEBBQUA
+A4IBAQC7rkvnt1frf6ott3NHhWrB5KUd5Oc86fRZZXe1eltajSU24HqXLjjAV2CDmAaDn7l2em5Q
+4LqILPxFzBiwmZVRDuwduIj/h1AcgsLj4DKAv6ALR8jDMe+ZZzKATxcheQxpXN5eNK4CtSbqUN9/
+GGUsyfJj4akH/nxxH2szJGoeBfcFaMBqEssuXmHLrijTfsK0ZpEmXzwuJF/LWA/rKOyvEZbz3Htv
+wKeI8lN3s2Berq4o2jUsbzRF0ybh3uxbTydrFny9RAQYgrOJeRcQcT16ohZO9QHNpGxlaKFJdlxD
+ydi8NmdspZS11My5vWo1ViHe2MPr+8ukYEywVaCge1ey
+-----END CERTIFICATE-----
+
+WellsSecure Public Root Certificate Authority
+=============================================
+-----BEGIN CERTIFICATE-----
+MIIEvTCCA6WgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBhTELMAkGA1UEBhMCVVMxIDAeBgNVBAoM
+F1dlbGxzIEZhcmdvIFdlbGxzU2VjdXJlMRwwGgYDVQQLDBNXZWxscyBGYXJnbyBCYW5rIE5BMTYw
+NAYDVQQDDC1XZWxsc1NlY3VyZSBQdWJsaWMgUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwHhcN
+MDcxMjEzMTcwNzU0WhcNMjIxMjE0MDAwNzU0WjCBhTELMAkGA1UEBhMCVVMxIDAeBgNVBAoMF1dl
+bGxzIEZhcmdvIFdlbGxzU2VjdXJlMRwwGgYDVQQLDBNXZWxscyBGYXJnbyBCYW5rIE5BMTYwNAYD
+VQQDDC1XZWxsc1NlY3VyZSBQdWJsaWMgUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDub7S9eeKPCCGeOARBJe+rWxxTkqxtnt3CxC5FlAM1
+iGd0V+PfjLindo8796jE2yljDpFoNoqXjopxaAkH5OjUDk/41itMpBb570OYj7OeUt9tkTmPOL13
+i0Nj67eT/DBMHAGTthP796EfvyXhdDcsHqRePGj4S78NuR4uNuip5Kf4D8uCdXw1LSLWwr8L87T8
+bJVhHlfXBIEyg1J55oNjz7fLY4sR4r1e6/aN7ZVyKLSsEmLpSjPmgzKuBXWVvYSV2ypcm44uDLiB
+K0HmOFafSZtsdvqKXfcBeYF8wYNABf5x/Qw/zE5gCQ5lRxAvAcAFP4/4s0HvWkJ+We/SlwxlAgMB
+AAGjggE0MIIBMDAPBgNVHRMBAf8EBTADAQH/MDkGA1UdHwQyMDAwLqAsoCqGKGh0dHA6Ly9jcmwu
+cGtpLndlbGxzZmFyZ28uY29tL3dzcHJjYS5jcmwwDgYDVR0PAQH/BAQDAgHGMB0GA1UdDgQWBBQm
+lRkQ2eihl5H/3BnZtQQ+0nMKajCBsgYDVR0jBIGqMIGngBQmlRkQ2eihl5H/3BnZtQQ+0nMKaqGB
+i6SBiDCBhTELMAkGA1UEBhMCVVMxIDAeBgNVBAoMF1dlbGxzIEZhcmdvIFdlbGxzU2VjdXJlMRww
+GgYDVQQLDBNXZWxscyBGYXJnbyBCYW5rIE5BMTYwNAYDVQQDDC1XZWxsc1NlY3VyZSBQdWJsaWMg
+Um9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHmCAQEwDQYJKoZIhvcNAQEFBQADggEBALkVsUSRzCPI
+K0134/iaeycNzXK7mQDKfGYZUMbVmO2rvwNa5U3lHshPcZeG1eMd/ZDJPHV3V3p9+N701NX3leZ0
+bh08rnyd2wIDBSxxSyU+B+NemvVmFymIGjifz6pBA4SXa5M4esowRBskRDPQ5NHcKDj0E0M1NSlj
+qHyita04pO2t/caaH/+Xc/77szWnk4bGdpEA5qxRFsQnMlzbc9qlk1eOPm01JghZ1edE13YgY+es
+E2fDbbFwRnzVlhE9iW9dqKHrjQrawx0zbKPqZxmamX9LPYNRKh3KL4YMon4QLSvUFpULB6ouFJJJ
+tylv2G0xffX8oRAHh84vWdw+WNs=
+-----END CERTIFICATE-----
+
+COMODO ECC Certification Authority
+==================================
+-----BEGIN CERTIFICATE-----
+MIICiTCCAg+gAwIBAgIQH0evqmIAcFBUTAGem2OZKjAKBggqhkjOPQQDAzCBhTELMAkGA1UEBhMC
+R0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UE
+ChMRQ09NT0RPIENBIExpbWl0ZWQxKzApBgNVBAMTIkNPTU9ETyBFQ0MgQ2VydGlmaWNhdGlvbiBB
+dXRob3JpdHkwHhcNMDgwMzA2MDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCBhTELMAkGA1UEBhMCR0Ix
+GzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UEChMR
+Q09NT0RPIENBIExpbWl0ZWQxKzApBgNVBAMTIkNPTU9ETyBFQ0MgQ2VydGlmaWNhdGlvbiBBdXRo
+b3JpdHkwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAQDR3svdcmCFYX7deSRFtSrYpn1PlILBs5BAH+X
+4QokPB0BBO490o0JlwzgdeT6+3eKKvUDYEs2ixYjFq0JcfRK9ChQtP6IHG4/bC8vCVlbpVsLM5ni
+wz2J+Wos77LTBumjQjBAMB0GA1UdDgQWBBR1cacZSBm8nZ3qQUfflMRId5nTeTAOBgNVHQ8BAf8E
+BAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAKBggqhkjOPQQDAwNoADBlAjEA7wNbeqy3eApyt4jf/7VG
+FAkK+qDmfQjGGoe9GKhzvSbKYAydzpmfz1wPMOG+FDHqAjAU9JM8SaczepBGR7NjfRObTrdvGDeA
+U/7dIOA1mjbRxwG55tzd8/8dLDoWV9mSOdY=
+-----END CERTIFICATE-----
+
+Security Communication EV RootCA1
+=================================
+-----BEGIN CERTIFICATE-----
+MIIDfTCCAmWgAwIBAgIBADANBgkqhkiG9w0BAQUFADBgMQswCQYDVQQGEwJKUDElMCMGA1UEChMc
+U0VDT00gVHJ1c3QgU3lzdGVtcyBDTy4sTFRELjEqMCgGA1UECxMhU2VjdXJpdHkgQ29tbXVuaWNh
+dGlvbiBFViBSb290Q0ExMB4XDTA3MDYwNjAyMTIzMloXDTM3MDYwNjAyMTIzMlowYDELMAkGA1UE
+BhMCSlAxJTAjBgNVBAoTHFNFQ09NIFRydXN0IFN5c3RlbXMgQ08uLExURC4xKjAoBgNVBAsTIVNl
+Y3VyaXR5IENvbW11bmljYXRpb24gRVYgUm9vdENBMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBALx/7FebJOD+nLpCeamIivqA4PUHKUPqjgo0No0c+qe1OXj/l3X3L+SqawSERMqm4miO
+/VVQYg+kcQ7OBzgtQoVQrTyWb4vVog7P3kmJPdZkLjjlHmy1V4qe70gOzXppFodEtZDkBp2uoQSX
+WHnvIEqCa4wiv+wfD+mEce3xDuS4GBPMVjZd0ZoeUWs5bmB2iDQL87PRsJ3KYeJkHcFGB7hj3R4z
+ZbOOCVVSPbW9/wfrrWFVGCypaZhKqkDFMxRldAD5kd6vA0jFQFTcD4SQaCDFkpbcLuUCRarAX1T4
+bepJz11sS6/vmsJWXMY1VkJqMF/Cq/biPT+zyRGPMUzXn0kCAwEAAaNCMEAwHQYDVR0OBBYEFDVK
+9U2vP9eCOKyrcWUXdYydVZPmMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MA0GCSqG
+SIb3DQEBBQUAA4IBAQCoh+ns+EBnXcPBZsdAS5f8hxOQWsTvoMpfi7ent/HWtWS3irO4G8za+6xm
+iEHO6Pzk2x6Ipu0nUBsCMCRGef4Eh3CXQHPRwMFXGZpppSeZq51ihPZRwSzJIxXYKLerJRO1RuGG
+Av8mjMSIkh1W/hln8lXkgKNrnKt34VFxDSDbEJrbvXZ5B3eZKK2aXtqxT0QsNY6llsf9g/BYxnnW
+mHyojf6GPgcWkuF75x3sM3Z+Qi5KhfmRiWiEA4Glm5q+4zfFVKtWOxgtQaQM+ELbmaDgcm+7XeEW
+T1MKZPlO9L9OVL14bIjqv5wTJMJwaaJ/D8g8rQjJsJhAoyrniIPtd490
+-----END CERTIFICATE-----
+
+OISTE WISeKey Global Root GA CA
+===============================
+-----BEGIN CERTIFICATE-----
+MIID8TCCAtmgAwIBAgIQQT1yx/RrH4FDffHSKFTfmjANBgkqhkiG9w0BAQUFADCBijELMAkGA1UE
+BhMCQ0gxEDAOBgNVBAoTB1dJU2VLZXkxGzAZBgNVBAsTEkNvcHlyaWdodCAoYykgMjAwNTEiMCAG
+A1UECxMZT0lTVEUgRm91bmRhdGlvbiBFbmRvcnNlZDEoMCYGA1UEAxMfT0lTVEUgV0lTZUtleSBH
+bG9iYWwgUm9vdCBHQSBDQTAeFw0wNTEyMTExNjAzNDRaFw0zNzEyMTExNjA5NTFaMIGKMQswCQYD
+VQQGEwJDSDEQMA4GA1UEChMHV0lTZUtleTEbMBkGA1UECxMSQ29weXJpZ2h0IChjKSAyMDA1MSIw
+IAYDVQQLExlPSVNURSBGb3VuZGF0aW9uIEVuZG9yc2VkMSgwJgYDVQQDEx9PSVNURSBXSVNlS2V5
+IEdsb2JhbCBSb290IEdBIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAy0+zAJs9
+Nt350UlqaxBJH+zYK7LG+DKBKUOVTJoZIyEVRd7jyBxRVVuuk+g3/ytr6dTqvirdqFEr12bDYVxg
+Asj1znJ7O7jyTmUIms2kahnBAbtzptf2w93NvKSLtZlhuAGio9RN1AU9ka34tAhxZK9w8RxrfvbD
+d50kc3vkDIzh2TbhmYsFmQvtRTEJysIA2/dyoJaqlYfQjse2YXMNdmaM3Bu0Y6Kff5MTMPGhJ9vZ
+/yxViJGg4E8HsChWjBgbl0SOid3gF27nKu+POQoxhILYQBRJLnpB5Kf+42TMwVlxSywhp1t94B3R
+LoGbw9ho972WG6xwsRYUC9tguSYBBQIDAQABo1EwTzALBgNVHQ8EBAMCAYYwDwYDVR0TAQH/BAUw
+AwEB/zAdBgNVHQ4EFgQUswN+rja8sHnR3JQmthG+IbJphpQwEAYJKwYBBAGCNxUBBAMCAQAwDQYJ
+KoZIhvcNAQEFBQADggEBAEuh/wuHbrP5wUOxSPMowB0uyQlB+pQAHKSkq0lPjz0e701vvbyk9vIm
+MMkQyh2I+3QZH4VFvbBsUfk2ftv1TDI6QU9bR8/oCy22xBmddMVHxjtqD6wU2zz0c5ypBd8A3HR4
++vg1YFkCExh8vPtNsCBtQ7tgMHpnM1zFmdH4LTlSc/uMqpclXHLZCB6rTjzjgTGfA6b7wP4piFXa
+hNVQA7bihKOmNqoROgHhGEvWRGizPflTdISzRpFGlgC3gCy24eMQ4tui5yiPAZZiFj4A4xylNoEY
+okxSdsARo27mHbrjWr42U8U+dY+GaSlYU7Wcu2+fXMUY7N0v4ZjJ/L7fCg0=
+-----END CERTIFICATE-----
+
+Microsec e-Szigno Root CA
+=========================
+-----BEGIN CERTIFICATE-----
+MIIHqDCCBpCgAwIBAgIRAMy4579OKRr9otxmpRwsDxEwDQYJKoZIhvcNAQEFBQAwcjELMAkGA1UE
+BhMCSFUxETAPBgNVBAcTCEJ1ZGFwZXN0MRYwFAYDVQQKEw1NaWNyb3NlYyBMdGQuMRQwEgYDVQQL
+EwtlLVN6aWdubyBDQTEiMCAGA1UEAxMZTWljcm9zZWMgZS1Temlnbm8gUm9vdCBDQTAeFw0wNTA0
+MDYxMjI4NDRaFw0xNzA0MDYxMjI4NDRaMHIxCzAJBgNVBAYTAkhVMREwDwYDVQQHEwhCdWRhcGVz
+dDEWMBQGA1UEChMNTWljcm9zZWMgTHRkLjEUMBIGA1UECxMLZS1Temlnbm8gQ0ExIjAgBgNVBAMT
+GU1pY3Jvc2VjIGUtU3ppZ25vIFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+AQDtyADVgXvNOABHzNuEwSFpLHSQDCHZU4ftPkNEU6+r+ICbPHiN1I2uuO/TEdyB5s87lozWbxXG
+d36hL+BfkrYn13aaHUM86tnsL+4582pnS4uCzyL4ZVX+LMsvfUh6PXX5qqAnu3jCBspRwn5mS6/N
+oqdNAoI/gqyFxuEPkEeZlApxcpMqyabAvjxWTHOSJ/FrtfX9/DAFYJLG65Z+AZHCabEeHXtTRbjc
+QR/Ji3HWVBTji1R4P770Yjtb9aPs1ZJ04nQw7wHb4dSrmZsqa/i9phyGI0Jf7Enemotb9HI6QMVJ
+PqW+jqpx62z69Rrkav17fVVA71hu5tnVvCSrwe+3AgMBAAGjggQ3MIIEMzBnBggrBgEFBQcBAQRb
+MFkwKAYIKwYBBQUHMAGGHGh0dHBzOi8vcmNhLmUtc3ppZ25vLmh1L29jc3AwLQYIKwYBBQUHMAKG
+IWh0dHA6Ly93d3cuZS1zemlnbm8uaHUvUm9vdENBLmNydDAPBgNVHRMBAf8EBTADAQH/MIIBcwYD
+VR0gBIIBajCCAWYwggFiBgwrBgEEAYGoGAIBAQEwggFQMCgGCCsGAQUFBwIBFhxodHRwOi8vd3d3
+LmUtc3ppZ25vLmh1L1NaU1ovMIIBIgYIKwYBBQUHAgIwggEUHoIBEABBACAAdABhAG4A+gBzAO0A
+dAB2AOEAbgB5ACAA6QByAHQAZQBsAG0AZQB6AOkAcwDpAGgAZQB6ACAA6QBzACAAZQBsAGYAbwBn
+AGEAZADhAHMA4QBoAG8AegAgAGEAIABTAHoAbwBsAGcA4QBsAHQAYQB0APMAIABTAHoAbwBsAGcA
+4QBsAHQAYQB0AOEAcwBpACAAUwB6AGEAYgDhAGwAeQB6AGEAdABhACAAcwB6AGUAcgBpAG4AdAAg
+AGsAZQBsAGwAIABlAGwAagDhAHIAbgBpADoAIABoAHQAdABwADoALwAvAHcAdwB3AC4AZQAtAHMA
+egBpAGcAbgBvAC4AaAB1AC8AUwBaAFMAWgAvMIHIBgNVHR8EgcAwgb0wgbqggbeggbSGIWh0dHA6
+Ly93d3cuZS1zemlnbm8uaHUvUm9vdENBLmNybIaBjmxkYXA6Ly9sZGFwLmUtc3ppZ25vLmh1L0NO
+PU1pY3Jvc2VjJTIwZS1Temlnbm8lMjBSb290JTIwQ0EsT1U9ZS1Temlnbm8lMjBDQSxPPU1pY3Jv
+c2VjJTIwTHRkLixMPUJ1ZGFwZXN0LEM9SFU/Y2VydGlmaWNhdGVSZXZvY2F0aW9uTGlzdDtiaW5h
+cnkwDgYDVR0PAQH/BAQDAgEGMIGWBgNVHREEgY4wgYuBEGluZm9AZS1zemlnbm8uaHWkdzB1MSMw
+IQYDVQQDDBpNaWNyb3NlYyBlLVN6aWduw7MgUm9vdCBDQTEWMBQGA1UECwwNZS1TemlnbsOzIEhT
+WjEWMBQGA1UEChMNTWljcm9zZWMgS2Z0LjERMA8GA1UEBxMIQnVkYXBlc3QxCzAJBgNVBAYTAkhV
+MIGsBgNVHSMEgaQwgaGAFMegSXUWYYTbMUuE0vE3QJDvTtz3oXakdDByMQswCQYDVQQGEwJIVTER
+MA8GA1UEBxMIQnVkYXBlc3QxFjAUBgNVBAoTDU1pY3Jvc2VjIEx0ZC4xFDASBgNVBAsTC2UtU3pp
+Z25vIENBMSIwIAYDVQQDExlNaWNyb3NlYyBlLVN6aWdubyBSb290IENBghEAzLjnv04pGv2i3Gal
+HCwPETAdBgNVHQ4EFgQUx6BJdRZhhNsxS4TS8TdAkO9O3PcwDQYJKoZIhvcNAQEFBQADggEBANMT
+nGZjWS7KXHAM/IO8VbH0jgdsZifOwTsgqRy7RlRw7lrMoHfqaEQn6/Ip3Xep1fvj1KcExJW4C+FE
+aGAHQzAxQmHl7tnlJNUb3+FKG6qfx1/4ehHqE5MAyopYse7tDk2016g2JnzgOsHVV4Lxdbb9iV/a
+86g4nzUGCM4ilb7N1fy+W955a9x6qWVmvrElWl/tftOsRm1M9DKHtCAE4Gx4sHfRhUZLphK3dehK
+yVZs15KrnfVJONJPU+NVkBHbmJbGSfI+9J8b4PeI3CVimUTYc78/MPMMNz7UwiiAc7EBt51alhQB
+S6kRnSlqLtBdgcDPsiBDxwPgN05dCtxZICU=
+-----END CERTIFICATE-----
+
+Certigna
+========
+-----BEGIN CERTIFICATE-----
+MIIDqDCCApCgAwIBAgIJAP7c4wEPyUj/MA0GCSqGSIb3DQEBBQUAMDQxCzAJBgNVBAYTAkZSMRIw
+EAYDVQQKDAlEaGlteW90aXMxETAPBgNVBAMMCENlcnRpZ25hMB4XDTA3MDYyOTE1MTMwNVoXDTI3
+MDYyOTE1MTMwNVowNDELMAkGA1UEBhMCRlIxEjAQBgNVBAoMCURoaW15b3RpczERMA8GA1UEAwwI
+Q2VydGlnbmEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDIaPHJ1tazNHUmgh7stL7q
+XOEm7RFHYeGifBZ4QCHkYJ5ayGPhxLGWkv8YbWkj4Sti993iNi+RB7lIzw7sebYs5zRLcAglozyH
+GxnygQcPOJAZ0xH+hrTy0V4eHpbNgGzOOzGTtvKg0KmVEn2lmsxryIRWijOp5yIVUxbwzBfsV1/p
+ogqYCd7jX5xv3EjjhQsVWqa6n6xI4wmy9/Qy3l40vhx4XUJbzg4ij02Q130yGLMLLGq/jj8UEYkg
+DncUtT2UCIf3JR7VsmAA7G8qKCVuKj4YYxclPz5EIBb2JsglrgVKtOdjLPOMFlN+XPsRGgjBRmKf
+Irjxwo1p3Po6WAbfAgMBAAGjgbwwgbkwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUGu3+QTmQ
+tCRZvgHyUtVF9lo53BEwZAYDVR0jBF0wW4AUGu3+QTmQtCRZvgHyUtVF9lo53BGhOKQ2MDQxCzAJ
+BgNVBAYTAkZSMRIwEAYDVQQKDAlEaGlteW90aXMxETAPBgNVBAMMCENlcnRpZ25hggkA/tzjAQ/J
+SP8wDgYDVR0PAQH/BAQDAgEGMBEGCWCGSAGG+EIBAQQEAwIABzANBgkqhkiG9w0BAQUFAAOCAQEA
+hQMeknH2Qq/ho2Ge6/PAD/Kl1NqV5ta+aDY9fm4fTIrv0Q8hbV6lUmPOEvjvKtpv6zf+EwLHyzs+
+ImvaYS5/1HI93TDhHkxAGYwP15zRgzB7mFncfca5DClMoTOi62c6ZYTTluLtdkVwj7Ur3vkj1klu
+PBS1xp81HlDQwY9qcEQCYsuuHWhBp6pX6FOqB9IG9tUUBguRA3UsbHK1YZWaDYu5Def131TN3ubY
+1gkIl2PlwS6wt0QmwCbAr1UwnjvVNioZBPRcHv/PLLf/0P2HQBHVESO7SMAhqaQoLf0V+LBOK/Qw
+WyH8EZE0vkHve52Xdf+XlcCWWC/qu0bXu+TZLg==
+-----END CERTIFICATE-----
+
+Deutsche Telekom Root CA 2
+==========================
+-----BEGIN CERTIFICATE-----
+MIIDnzCCAoegAwIBAgIBJjANBgkqhkiG9w0BAQUFADBxMQswCQYDVQQGEwJERTEcMBoGA1UEChMT
+RGV1dHNjaGUgVGVsZWtvbSBBRzEfMB0GA1UECxMWVC1UZWxlU2VjIFRydXN0IENlbnRlcjEjMCEG
+A1UEAxMaRGV1dHNjaGUgVGVsZWtvbSBSb290IENBIDIwHhcNOTkwNzA5MTIxMTAwWhcNMTkwNzA5
+MjM1OTAwWjBxMQswCQYDVQQGEwJERTEcMBoGA1UEChMTRGV1dHNjaGUgVGVsZWtvbSBBRzEfMB0G
+A1UECxMWVC1UZWxlU2VjIFRydXN0IENlbnRlcjEjMCEGA1UEAxMaRGV1dHNjaGUgVGVsZWtvbSBS
+b290IENBIDIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCrC6M14IspFLEUha88EOQ5
+bzVdSq7d6mGNlUn0b2SjGmBmpKlAIoTZ1KXleJMOaAGtuU1cOs7TuKhCQN/Po7qCWWqSG6wcmtoI
+KyUn+WkjR/Hg6yx6m/UTAtB+NHzCnjwAWav12gz1MjwrrFDa1sPeg5TKqAyZMg4ISFZbavva4VhY
+AUlfckE8FQYBjl2tqriTtM2e66foai1SNNs671x1Udrb8zH57nGYMsRUFUQM+ZtV7a3fGAigo4aK
+Se5TBY8ZTNXeWHmb0mocQqvF1afPaA+W5OFhmHZhyJF81j4A4pFQh+GdCuatl9Idxjp9y7zaAzTV
+jlsB9WoHtxa2bkp/AgMBAAGjQjBAMB0GA1UdDgQWBBQxw3kbuvVT1xfgiXotF2wKsyudMzAPBgNV
+HRMECDAGAQH/AgEFMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOCAQEAlGRZrTlk5ynr
+E/5aw4sTV8gEJPB0d8Bg42f76Ymmg7+Wgnxu1MM9756AbrsptJh6sTtU6zkXR34ajgv8HzFZMQSy
+zhfzLMdiNlXiItiJVbSYSKpk+tYcNthEeFpaIzpXl/V6ME+un2pMSyuOoAPjPuCp1NJ70rOo4nI8
+rZ7/gFnkm0W09juwzTkZmDLl6iFhkOQxIY40sfcvNUqFENrnijchvllj4PKFiDFT1FQUhXB59C4G
+dyd1Lx+4ivn+xbrYNuSD7Odlt79jWvNGr4GUN9RBjNYj1h7P9WgbRGOiWrqnNVmh5XAFmw4jV5mU
+Cm26OWMohpLzGITY+9HPBVZkVw==
+-----END CERTIFICATE-----
+
+Cybertrust Global Root
+======================
+-----BEGIN CERTIFICATE-----
+MIIDoTCCAomgAwIBAgILBAAAAAABD4WqLUgwDQYJKoZIhvcNAQEFBQAwOzEYMBYGA1UEChMPQ3li
+ZXJ0cnVzdCwgSW5jMR8wHQYDVQQDExZDeWJlcnRydXN0IEdsb2JhbCBSb290MB4XDTA2MTIxNTA4
+MDAwMFoXDTIxMTIxNTA4MDAwMFowOzEYMBYGA1UEChMPQ3liZXJ0cnVzdCwgSW5jMR8wHQYDVQQD
+ExZDeWJlcnRydXN0IEdsb2JhbCBSb290MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
++Mi8vRRQZhP/8NN57CPytxrHjoXxEnOmGaoQ25yiZXRadz5RfVb23CO21O1fWLE3TdVJDm71aofW
+0ozSJ8bi/zafmGWgE07GKmSb1ZASzxQG9Dvj1Ci+6A74q05IlG2OlTEQXO2iLb3VOm2yHLtgwEZL
+AfVJrn5GitB0jaEMAs7u/OePuGtm839EAL9mJRQr3RAwHQeWP032a7iPt3sMpTjr3kfb1V05/Iin
+89cqdPHoWqI7n1C6poxFNcJQZZXcY4Lv3b93TZxiyWNzFtApD0mpSPCzqrdsxacwOUBdrsTiXSZT
+8M4cIwhhqJQZugRiQOwfOHB3EgZxpzAYXSUnpQIDAQABo4GlMIGiMA4GA1UdDwEB/wQEAwIBBjAP
+BgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBS2CHsNesysIEyGVjJez6tuhS1wVzA/BgNVHR8EODA2
+MDSgMqAwhi5odHRwOi8vd3d3Mi5wdWJsaWMtdHJ1c3QuY29tL2NybC9jdC9jdHJvb3QuY3JsMB8G
+A1UdIwQYMBaAFLYIew16zKwgTIZWMl7Pq26FLXBXMA0GCSqGSIb3DQEBBQUAA4IBAQBW7wojoFRO
+lZfJ+InaRcHUowAl9B8Tq7ejhVhpwjCt2BWKLePJzYFa+HMjWqd8BfP9IjsO0QbE2zZMcwSO5bAi
+5MXzLqXZI+O4Tkogp24CJJ8iYGd7ix1yCcUxXOl5n4BHPa2hCwcUPUf/A2kaDAtE52Mlp3+yybh2
+hO0j9n0Hq0V+09+zv+mKts2oomcrUtW3ZfA5TGOgkXmTUg9U3YO7n9GPp1Nzw8v/MOx8BLjYRB+T
+X3EJIrduPuocA06dGiBh+4E37F78CkWr1+cXVdCg6mCbpvbjjFspwgZgFJ0tl0ypkxWdYcQBX0jW
+WL1WMRJOEcgh4LMRkWXbtKaIOM5V
+-----END CERTIFICATE-----
+
+ePKI Root Certification Authority
+=================================
+-----BEGIN CERTIFICATE-----
+MIIFsDCCA5igAwIBAgIQFci9ZUdcr7iXAF7kBtK8nTANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQG
+EwJUVzEjMCEGA1UECgwaQ2h1bmdod2EgVGVsZWNvbSBDby4sIEx0ZC4xKjAoBgNVBAsMIWVQS0kg
+Um9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wNDEyMjAwMjMxMjdaFw0zNDEyMjAwMjMx
+MjdaMF4xCzAJBgNVBAYTAlRXMSMwIQYDVQQKDBpDaHVuZ2h3YSBUZWxlY29tIENvLiwgTHRkLjEq
+MCgGA1UECwwhZVBLSSBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIICIjANBgkqhkiG9w0B
+AQEFAAOCAg8AMIICCgKCAgEA4SUP7o3biDN1Z82tH306Tm2d0y8U82N0ywEhajfqhFAHSyZbCUNs
+IZ5qyNUD9WBpj8zwIuQf5/dqIjG3LBXy4P4AakP/h2XGtRrBp0xtInAhijHyl3SJCRImHJ7K2RKi
+lTza6We/CKBk49ZCt0Xvl/T29de1ShUCWH2YWEtgvM3XDZoTM1PRYfl61dd4s5oz9wCGzh1NlDiv
+qOx4UXCKXBCDUSH3ET00hl7lSM2XgYI1TBnsZfZrxQWh7kcT1rMhJ5QQCtkkO7q+RBNGMD+XPNjX
+12ruOzjjK9SXDrkb5wdJfzcq+Xd4z1TtW0ado4AOkUPB1ltfFLqfpo0kR0BZv3I4sjZsN/+Z0V0O
+WQqraffAsgRFelQArr5T9rXn4fg8ozHSqf4hUmTFpmfwdQcGlBSBVcYn5AGPF8Fqcde+S/uUWH1+
+ETOxQvdibBjWzwloPn9s9h6PYq2lY9sJpx8iQkEeb5mKPtf5P0B6ebClAZLSnT0IFaUQAS2zMnao
+lQ2zepr7BxB4EW/hj8e6DyUadCrlHJhBmd8hh+iVBmoKs2pHdmX2Os+PYhcZewoozRrSgx4hxyy/
+vv9haLdnG7t4TY3OZ+XkwY63I2binZB1NJipNiuKmpS5nezMirH4JYlcWrYvjB9teSSnUmjDhDXi
+Zo1jDiVN1Rmy5nk3pyKdVDECAwEAAaNqMGgwHQYDVR0OBBYEFB4M97Zn8uGSJglFwFU5Lnc/Qkqi
+MAwGA1UdEwQFMAMBAf8wOQYEZyoHAAQxMC8wLQIBADAJBgUrDgMCGgUAMAcGBWcqAwAABBRFsMLH
+ClZ87lt4DJX5GFPBphzYEDANBgkqhkiG9w0BAQUFAAOCAgEACbODU1kBPpVJufGBuvl2ICO1J2B0
+1GqZNF5sAFPZn/KmsSQHRGoqxqWOeBLoR9lYGxMqXnmbnwoqZ6YlPwZpVnPDimZI+ymBV3QGypzq
+KOg4ZyYr8dW1P2WT+DZdjo2NQCCHGervJ8A9tDkPJXtoUHRVnAxZfVo9QZQlUgjgRywVMRnVvwdV
+xrsStZf0X4OFunHB2WyBEXYKCrC/gpf36j36+uwtqSiUO1bd0lEursC9CBWMd1I0ltabrNMdjmEP
+NXubrjlpC2JgQCA2j6/7Nu4tCEoduL+bXPjqpRugc6bY+G7gMwRfaKonh+3ZwZCc7b3jajWvY9+r
+GNm65ulK6lCKD2GTHuItGeIwlDWSXQ62B68ZgI9HkFFLLk3dheLSClIKF5r8GrBQAuUBo2M3IUxE
+xJtRmREOc5wGj1QupyheRDmHVi03vYVElOEMSyycw5KFNGHLD7ibSkNS/jQ6fbjpKdx2qcgw+BRx
+gMYeNkh0IkFch4LoGHGLQYlE535YW6i4jRPpp2zDR+2zGp1iro2C6pSe3VkQw63d4k3jMdXH7Ojy
+sP6SHhYKGvzZ8/gntsm+HbRsZJB/9OTEW9c3rkIO3aQab3yIVMUWbuF6aC74Or8NpDyJO3inTmOD
+BCEIZ43ygknQW/2xzQ+DhNQ+IIX3Sj0rnP0qCglN6oH4EZw=
+-----END CERTIFICATE-----
+
+T\xc3\x9c\x42\xC4\xB0TAK UEKAE K\xC3\xB6k Sertifika Hizmet Sa\xC4\x9Flay\xc4\xb1\x63\xc4\xb1s\xc4\xb1 - S\xC3\xBCr\xC3\xBCm 3
+=============================================================================================================================
+-----BEGIN CERTIFICATE-----
+MIIFFzCCA/+gAwIBAgIBETANBgkqhkiG9w0BAQUFADCCASsxCzAJBgNVBAYTAlRSMRgwFgYDVQQH
+DA9HZWJ6ZSAtIEtvY2FlbGkxRzBFBgNVBAoMPlTDvHJraXllIEJpbGltc2VsIHZlIFRla25vbG9q
+aWsgQXJhxZ90xLFybWEgS3VydW11IC0gVMOcQsSwVEFLMUgwRgYDVQQLDD9VbHVzYWwgRWxla3Ry
+b25payB2ZSBLcmlwdG9sb2ppIEFyYcWfdMSxcm1hIEVuc3RpdMO8c8O8IC0gVUVLQUUxIzAhBgNV
+BAsMGkthbXUgU2VydGlmaWthc3lvbiBNZXJrZXppMUowSAYDVQQDDEFUw5xCxLBUQUsgVUVLQUUg
+S8O2ayBTZXJ0aWZpa2EgSGl6bWV0IFNhxJ9sYXnEsWPEsXPEsSAtIFPDvHLDvG0gMzAeFw0wNzA4
+MjQxMTM3MDdaFw0xNzA4MjExMTM3MDdaMIIBKzELMAkGA1UEBhMCVFIxGDAWBgNVBAcMD0dlYnpl
+IC0gS29jYWVsaTFHMEUGA1UECgw+VMO8cmtpeWUgQmlsaW1zZWwgdmUgVGVrbm9sb2ppayBBcmHF
+n3TEsXJtYSBLdXJ1bXUgLSBUw5xCxLBUQUsxSDBGBgNVBAsMP1VsdXNhbCBFbGVrdHJvbmlrIHZl
+IEtyaXB0b2xvamkgQXJhxZ90xLFybWEgRW5zdGl0w7xzw7wgLSBVRUtBRTEjMCEGA1UECwwaS2Ft
+dSBTZXJ0aWZpa2FzeW9uIE1lcmtlemkxSjBIBgNVBAMMQVTDnELEsFRBSyBVRUtBRSBLw7ZrIFNl
+cnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxIC0gU8O8csO8bSAzMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAim1L/xCIOsP2fpTo6iBkcK4hgb46ezzb8R1Sf1n68yJMlaCQvEhO
+Eav7t7WNeoMojCZG2E6VQIdhn8WebYGHV2yKO7Rm6sxA/OOqbLLLAdsyv9Lrhc+hDVXDWzhXcLh1
+xnnRFDDtG1hba+818qEhTsXOfJlfbLm4IpNQp81McGq+agV/E5wrHur+R84EpW+sky58K5+eeROR
+6Oqeyjh1jmKwlZMq5d/pXpduIF9fhHpEORlAHLpVK/swsoHvhOPc7Jg4OQOFCKlUAwUp8MmPi+oL
+hmUZEdPpCSPeaJMDyTYcIW7OjGbxmTDY17PDHfiBLqi9ggtm/oLL4eAagsNAgQIDAQABo0IwQDAd
+BgNVHQ4EFgQUvYiHyY/2pAoLquvF/pEjnatKijIwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQF
+MAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAB18+kmPNOm3JpIWmgV050vQbTlswyb2zrgxvMTfvCr4
+N5EY3ATIZJkrGG2AA1nJrvhY0D7twyOfaTyGOBye79oneNGEN3GKPEs5z35FBtYt2IpNeBLWrcLT
+y9LQQfMmNkqblWwM7uXRQydmwYj3erMgbOqwaSvHIOgMA8RBBZniP+Rr+KCGgceExh/VS4ESshYh
+LBOhgLJeDEoTniDYYkCrkOpkSi+sDQESeUWoL4cZaMjihccwsnX5OD+ywJO0a+IDRM5noN+J1q2M
+dqMTw5RhK2vZbMEHCiIHhWyFJEapvj+LeISCfiQMnf2BN+MlqO02TpUsyZyQ2uypQjyttgI=
+-----END CERTIFICATE-----
+
+certSIGN ROOT CA
+================
+-----BEGIN CERTIFICATE-----
+MIIDODCCAiCgAwIBAgIGIAYFFnACMA0GCSqGSIb3DQEBBQUAMDsxCzAJBgNVBAYTAlJPMREwDwYD
+VQQKEwhjZXJ0U0lHTjEZMBcGA1UECxMQY2VydFNJR04gUk9PVCBDQTAeFw0wNjA3MDQxNzIwMDRa
+Fw0zMTA3MDQxNzIwMDRaMDsxCzAJBgNVBAYTAlJPMREwDwYDVQQKEwhjZXJ0U0lHTjEZMBcGA1UE
+CxMQY2VydFNJR04gUk9PVCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALczuX7I
+JUqOtdu0KBuqV5Do0SLTZLrTk+jUrIZhQGpgV2hUhE28alQCBf/fm5oqrl0Hj0rDKH/v+yv6efHH
+rfAQUySQi2bJqIirr1qjAOm+ukbuW3N7LBeCgV5iLKECZbO9xSsAfsT8AzNXDe3i+s5dRdY4zTW2
+ssHQnIFKquSyAVwdj1+ZxLGt24gh65AIgoDzMKND5pCCrlUoSe1b16kQOA7+j0xbm0bqQfWwCHTD
+0IgztnzXdN/chNFDDnU5oSVAKOp4yw4sLjmdjItuFhwvJoIQ4uNllAoEwF73XVv4EOLQunpL+943
+AAAaWyjj0pxzPjKHmKHJUS/X3qwzs08CAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8B
+Af8EBAMCAcYwHQYDVR0OBBYEFOCMm9slSbPxfIbWskKHC9BroNnkMA0GCSqGSIb3DQEBBQUAA4IB
+AQA+0hyJLjX8+HXd5n9liPRyTMks1zJO890ZeUe9jjtbkw9QSSQTaxQGcu8J06Gh40CEyecYMnQ8
+SG4Pn0vU9x7Tk4ZkVJdjclDVVc/6IJMCopvDI5NOFlV2oHB5bc0hH88vLbwZ44gx+FkagQnIl6Z0
+x2DEW8xXjrJ1/RsCCdtZb3KTafcxQdaIOL+Hsr0Wefmq5L6IJd1hJyMctTEHBDa0GpC9oHRxUIlt
+vBTjD4au8as+x6AJzKNI0eDbZOeStc+vckNwi/nDhDwTqn6Sm1dTk/pwwpEOMfmbZ13pljheX7Nz
+TogVZ96edhBiIL5VaZVDADlN9u6wWk5JRFRYX0KD
+-----END CERTIFICATE-----
+
+CNNIC ROOT
+==========
+-----BEGIN CERTIFICATE-----
+MIIDVTCCAj2gAwIBAgIESTMAATANBgkqhkiG9w0BAQUFADAyMQswCQYDVQQGEwJDTjEOMAwGA1UE
+ChMFQ05OSUMxEzARBgNVBAMTCkNOTklDIFJPT1QwHhcNMDcwNDE2MDcwOTE0WhcNMjcwNDE2MDcw
+OTE0WjAyMQswCQYDVQQGEwJDTjEOMAwGA1UEChMFQ05OSUMxEzARBgNVBAMTCkNOTklDIFJPT1Qw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDTNfc/c3et6FtzF8LRb+1VvG7q6KR5smzD
+o+/hn7E7SIX1mlwhIhAsxYLO2uOabjfhhyzcuQxauohV3/2q2x8x6gHx3zkBwRP9SFIhxFXf2tiz
+VHa6dLG3fdfA6PZZxU3Iva0fFNrfWEQlMhkqx35+jq44sDB7R3IJMfAw28Mbdim7aXZOV/kbZKKT
+VrdvmW7bCgScEeOAH8tjlBAKqeFkgjH5jCftppkA9nCTGPihNIaj3XrCGHn2emU1z5DrvTOTn1Or
+czvmmzQgLx3vqR1jGqCA2wMv+SYahtKNu6m+UjqHZ0gNv7Sg2Ca+I19zN38m5pIEo3/PIKe38zrK
+y5nLAgMBAAGjczBxMBEGCWCGSAGG+EIBAQQEAwIABzAfBgNVHSMEGDAWgBRl8jGtKvf33VKWCscC
+wQ7vptU7ETAPBgNVHRMBAf8EBTADAQH/MAsGA1UdDwQEAwIB/jAdBgNVHQ4EFgQUZfIxrSr3991S
+lgrHAsEO76bVOxEwDQYJKoZIhvcNAQEFBQADggEBAEs17szkrr/Dbq2flTtLP1se31cpolnKOOK5
+Gv+e5m4y3R6u6jW39ZORTtpC4cMXYFDy0VwmuYK36m3knITnA3kXr5g9lNvHugDnuL8BV8F3RTIM
+O/G0HAiw/VGgod2aHRM2mm23xzy54cXZF/qD1T0VoDy7HgviyJA/qIYM/PmLXoXLT1tLYhFHxUV8
+BS9BsZ4QaRuZluBVeftOhpm4lNqGOGqTo+fLbuXf6iFViZx9fX+Y9QCJ7uOEwFyWtcVG6kbghVW2
+G8kS1sHNzYDzAgE8yGnLRUhj2JTQ7IUOO04RZfSCjKY9ri4ilAnIXOo8gV0WKgOXFlUJ24pBgp5m
+mxE=
+-----END CERTIFICATE-----
+
+ApplicationCA - Japanese Government
+===================================
+-----BEGIN CERTIFICATE-----
+MIIDoDCCAoigAwIBAgIBMTANBgkqhkiG9w0BAQUFADBDMQswCQYDVQQGEwJKUDEcMBoGA1UEChMT
+SmFwYW5lc2UgR292ZXJubWVudDEWMBQGA1UECxMNQXBwbGljYXRpb25DQTAeFw0wNzEyMTIxNTAw
+MDBaFw0xNzEyMTIxNTAwMDBaMEMxCzAJBgNVBAYTAkpQMRwwGgYDVQQKExNKYXBhbmVzZSBHb3Zl
+cm5tZW50MRYwFAYDVQQLEw1BcHBsaWNhdGlvbkNBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEAp23gdE6Hj6UG3mii24aZS2QNcfAKBZuOquHMLtJqO8F6tJdhjYq+xpqcBrSGUeQ3DnR4
+fl+Kf5Sk10cI/VBaVuRorChzoHvpfxiSQE8tnfWuREhzNgaeZCw7NCPbXCbkcXmP1G55IrmTwcrN
+wVbtiGrXoDkhBFcsovW8R0FPXjQilbUfKW1eSvNNcr5BViCH/OlQR9cwFO5cjFW6WY2H/CPek9AE
+jP3vbb3QesmlOmpyM8ZKDQUXKi17safY1vC+9D/qDihtQWEjdnjDuGWk81quzMKq2edY3rZ+nYVu
+nyoKb58DKTCXKB28t89UKU5RMfkntigm/qJj5kEW8DOYRwIDAQABo4GeMIGbMB0GA1UdDgQWBBRU
+WssmP3HMlEYNllPqa0jQk/5CdTAOBgNVHQ8BAf8EBAMCAQYwWQYDVR0RBFIwUKROMEwxCzAJBgNV
+BAYTAkpQMRgwFgYDVQQKDA/ml6XmnKzlm73mlL/lupwxIzAhBgNVBAsMGuOCouODl+ODquOCseOD
+vOOCt+ODp+ODs0NBMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBADlqRHZ3ODrs
+o2dGD/mLBqj7apAxzn7s2tGJfHrrLgy9mTLnsCTWw//1sogJhyzjVOGjprIIC8CFqMjSnHH2HZ9g
+/DgzE+Ge3Atf2hZQKXsvcJEPmbo0NI2VdMV+eKlmXb3KIXdCEKxmJj3ekav9FfBv7WxfEPjzFvYD
+io+nEhEMy/0/ecGc/WLuo89UDNErXxc+4z6/wCs+CZv+iKZ+tJIX/COUgb1up8WMwusRRdv4QcmW
+dupwX3kSa+SjB1oF7ydJzyGfikwJcGapJsErEU4z0g781mzSDjJkaP+tBXhfAx2o45CsJOAPQKdL
+rosot4LKGAfmt1t06SAZf7IbiVQ=
+-----END CERTIFICATE-----
+
+GeoTrust Primary Certification Authority - G3
+=============================================
+-----BEGIN CERTIFICATE-----
+MIID/jCCAuagAwIBAgIQFaxulBmyeUtB9iepwxgPHzANBgkqhkiG9w0BAQsFADCBmDELMAkGA1UE
+BhMCVVMxFjAUBgNVBAoTDUdlb1RydXN0IEluYy4xOTA3BgNVBAsTMChjKSAyMDA4IEdlb1RydXN0
+IEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTE2MDQGA1UEAxMtR2VvVHJ1c3QgUHJpbWFy
+eSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEczMB4XDTA4MDQwMjAwMDAwMFoXDTM3MTIwMTIz
+NTk1OVowgZgxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMTkwNwYDVQQLEzAo
+YykgMjAwOCBHZW9UcnVzdCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxNjA0BgNVBAMT
+LUdlb1RydXN0IFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMzCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBANziXmJYHTNXOTIz+uvLh4yn1ErdBojqZI4xmKU4kB6Yzy5j
+K/BGvESyiaHAKAxJcCGVn2TAppMSAmUmhsalifD614SgcK9PGpc/BkTVyetyEH3kMSj7HGHmKAdE
+c5IiaacDiGydY8hS2pgn5whMcD60yRLBxWeDXTPzAxHsatBT4tG6NmCUgLthY2xbF37fQJQeqw3C
+IShwiP/WJmxsYAQlTlV+fe+/lEjetx3dcI0FX4ilm/LC7urRQEFtYjgdVgbFA0dRIBn8exALDmKu
+dlW/X3e+PkkBUz2YJQN2JFodtNuJ6nnltrM7P7pMKEF/BqxqjsHQ9gUdfeZChuOl1UcCAwEAAaNC
+MEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFMR5yo6hTgMdHNxr
+2zFblD4/MH8tMA0GCSqGSIb3DQEBCwUAA4IBAQAtxRPPVoB7eni9n64smefv2t+UXglpp+duaIy9
+cr5HqQ6XErhK8WTTOd8lNNTBzU6B8A8ExCSzNJbGpqow32hhc9f5joWJ7w5elShKKiePEI4ufIbE
+Ap7aDHdlDkQNkv39sxY2+hENHYwOB4lqKVb3cvTdFZx3NWZXqxNT2I7BQMXXExZacse3aQHEerGD
+AWh9jUGhlBjBJVz88P6DAod8DQ3PLghcSkANPuyBYeYk28rgDi0Hsj5W3I31QYUHSJsMC8tJP33s
+t/3LjWeJGqvtux6jAAgIFyqCXDFdRootD4abdNlF+9RAsXqqaC2Gspki4cErx5z481+oghLrGREt
+-----END CERTIFICATE-----
+
+thawte Primary Root CA - G2
+===========================
+-----BEGIN CERTIFICATE-----
+MIICiDCCAg2gAwIBAgIQNfwmXNmET8k9Jj1Xm67XVjAKBggqhkjOPQQDAzCBhDELMAkGA1UEBhMC
+VVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjE4MDYGA1UECxMvKGMpIDIwMDcgdGhhd3RlLCBJbmMu
+IC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxJDAiBgNVBAMTG3RoYXd0ZSBQcmltYXJ5IFJvb3Qg
+Q0EgLSBHMjAeFw0wNzExMDUwMDAwMDBaFw0zODAxMTgyMzU5NTlaMIGEMQswCQYDVQQGEwJVUzEV
+MBMGA1UEChMMdGhhd3RlLCBJbmMuMTgwNgYDVQQLEy8oYykgMjAwNyB0aGF3dGUsIEluYy4gLSBG
+b3IgYXV0aG9yaXplZCB1c2Ugb25seTEkMCIGA1UEAxMbdGhhd3RlIFByaW1hcnkgUm9vdCBDQSAt
+IEcyMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAEotWcgnuVnfFSeIf+iha/BebfowJPDQfGAFG6DAJS
+LSKkQjnE/o/qycG+1E3/n3qe4rF8mq2nhglzh9HnmuN6papu+7qzcMBniKI11KOasf2twu8x+qi5
+8/sIxpHR+ymVo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU
+mtgAMADna3+FGO6Lts6KDPgR4bswCgYIKoZIzj0EAwMDaQAwZgIxAN344FdHW6fmCsO99YCKlzUN
+G4k8VIZ3KMqh9HneteY4sPBlcIx/AlTCv//YoT7ZzwIxAMSNlPzcU9LcnXgWHxUzI1NS41oxXZ3K
+rr0TKUQNJ1uo52icEvdYPy5yAlejj6EULg==
+-----END CERTIFICATE-----
+
+thawte Primary Root CA - G3
+===========================
+-----BEGIN CERTIFICATE-----
+MIIEKjCCAxKgAwIBAgIQYAGXt0an6rS0mtZLL/eQ+zANBgkqhkiG9w0BAQsFADCBrjELMAkGA1UE
+BhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2
+aWNlcyBEaXZpc2lvbjE4MDYGA1UECxMvKGMpIDIwMDggdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhv
+cml6ZWQgdXNlIG9ubHkxJDAiBgNVBAMTG3RoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EgLSBHMzAeFw0w
+ODA0MDIwMDAwMDBaFw0zNzEyMDEyMzU5NTlaMIGuMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMdGhh
+d3RlLCBJbmMuMSgwJgYDVQQLEx9DZXJ0aWZpY2F0aW9uIFNlcnZpY2VzIERpdmlzaW9uMTgwNgYD
+VQQLEy8oYykgMjAwOCB0aGF3dGUsIEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTEkMCIG
+A1UEAxMbdGhhd3RlIFByaW1hcnkgUm9vdCBDQSAtIEczMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAsr8nLPvb2FvdeHsbnndmgcs+vHyu86YnmjSjaDFxODNi5PNxZnmxqWWjpYvVj2At
+P0LMqmsywCPLLEHd5N/8YZzic7IilRFDGF/Eth9XbAoFWCLINkw6fKXRz4aviKdEAhN0cXMKQlkC
++BsUa0Lfb1+6a4KinVvnSr0eAXLbS3ToO39/fR8EtCab4LRarEc9VbjXsCZSKAExQGbY2SS99irY
+7CFJXJv2eul/VTV+lmuNk5Mny5K76qxAwJ/C+IDPXfRa3M50hqY+bAtTyr2SzhkGcuYMXDhpxwTW
+vGzOW/b3aJzcJRVIiKHpqfiYnODz1TEoYRFsZ5aNOZnLwkUkOQIDAQABo0IwQDAPBgNVHRMBAf8E
+BTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUrWyqlGCc7eT/+j4KdCtjA/e2Wb8wDQYJ
+KoZIhvcNAQELBQADggEBABpA2JVlrAmSicY59BDlqQ5mU1143vokkbvnRFHfxhY0Cu9qRFHqKweK
+A3rD6z8KLFIWoCtDuSWQP3CpMyVtRRooOyfPqsMpQhvfO0zAMzRbQYi/aytlryjvsvXDqmbOe1bu
+t8jLZ8HJnBoYuMTDSQPxYA5QzUbF83d597YV4Djbxy8ooAw/dyZ02SUS2jHaGh7cKUGRIjxpp7sC
+8rZcJwOJ9Abqm+RyguOhCcHpABnTPtRwa7pxpqpYrvS76Wy274fMm7v/OeZWYdMKp8RcTGB7BXcm
+er/YB1IsYvdwY9k5vG8cwnncdimvzsUsZAReiDZuMdRAGmI0Nj81Aa6sY6A=
+-----END CERTIFICATE-----
+
+GeoTrust Primary Certification Authority - G2
+=============================================
+-----BEGIN CERTIFICATE-----
+MIICrjCCAjWgAwIBAgIQPLL0SAoA4v7rJDteYD7DazAKBggqhkjOPQQDAzCBmDELMAkGA1UEBhMC
+VVMxFjAUBgNVBAoTDUdlb1RydXN0IEluYy4xOTA3BgNVBAsTMChjKSAyMDA3IEdlb1RydXN0IElu
+Yy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTE2MDQGA1UEAxMtR2VvVHJ1c3QgUHJpbWFyeSBD
+ZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcyMB4XDTA3MTEwNTAwMDAwMFoXDTM4MDExODIzNTk1
+OVowgZgxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMTkwNwYDVQQLEzAoYykg
+MjAwNyBHZW9UcnVzdCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxNjA0BgNVBAMTLUdl
+b1RydXN0IFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMjB2MBAGByqGSM49AgEG
+BSuBBAAiA2IABBWx6P0DFUPlrOuHNxFi79KDNlJ9RVcLSo17VDs6bl8VAsBQps8lL33KSLjHUGMc
+KiEIfJo22Av+0SbFWDEwKCXzXV2juLaltJLtbCyf691DiaI8S0iRHVDsJt/WYC69IaNCMEAwDwYD
+VR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFBVfNVdRVfslsq0DafwBo/q+
+EVXVMAoGCCqGSM49BAMDA2cAMGQCMGSWWaboCd6LuvpaiIjwH5HTRqjySkwCY/tsXzjbLkGTqQ7m
+ndwxHLKgpxgceeHHNgIwOlavmnRs9vuD4DPTCF+hnMJbn0bWtsuRBmOiBuczrD6ogRLQy7rQkgu2
+npaqBA+K
+-----END CERTIFICATE-----
+
+VeriSign Universal Root Certification Authority
+===============================================
+-----BEGIN CERTIFICATE-----
+MIIEuTCCA6GgAwIBAgIQQBrEZCGzEyEDDrvkEhrFHTANBgkqhkiG9w0BAQsFADCBvTELMAkGA1UE
+BhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBO
+ZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwOCBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVk
+IHVzZSBvbmx5MTgwNgYDVQQDEy9WZXJpU2lnbiBVbml2ZXJzYWwgUm9vdCBDZXJ0aWZpY2F0aW9u
+IEF1dGhvcml0eTAeFw0wODA0MDIwMDAwMDBaFw0zNzEyMDEyMzU5NTlaMIG9MQswCQYDVQQGEwJV
+UzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRydXN0IE5ldHdv
+cmsxOjA4BgNVBAsTMShjKSAyMDA4IFZlcmlTaWduLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNl
+IG9ubHkxODA2BgNVBAMTL1ZlcmlTaWduIFVuaXZlcnNhbCBSb290IENlcnRpZmljYXRpb24gQXV0
+aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx2E3XrEBNNti1xWb/1hajCMj
+1mCOkdeQmIN65lgZOIzF9uVkhbSicfvtvbnazU0AtMgtc6XHaXGVHzk8skQHnOgO+k1KxCHfKWGP
+MiJhgsWHH26MfF8WIFFE0XBPV+rjHOPMee5Y2A7Cs0WTwCznmhcrewA3ekEzeOEz4vMQGn+HLL72
+9fdC4uW/h2KJXwBL38Xd5HVEMkE6HnFuacsLdUYI0crSK5XQz/u5QGtkjFdN/BMReYTtXlT2NJ8I
+AfMQJQYXStrxHXpma5hgZqTZ79IugvHw7wnqRMkVauIDbjPTrJ9VAMf2CGqUuV/c4DPxhGD5WycR
+tPwW8rtWaoAljQIDAQABo4GyMIGvMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMG0G
+CCsGAQUFBwEMBGEwX6FdoFswWTBXMFUWCWltYWdlL2dpZjAhMB8wBwYFKw4DAhoEFI/l0xqGrI2O
+a8PPgGrUSBgsexkuMCUWI2h0dHA6Ly9sb2dvLnZlcmlzaWduLmNvbS92c2xvZ28uZ2lmMB0GA1Ud
+DgQWBBS2d/ppSEefUxLVwuoHMnYH0ZcHGTANBgkqhkiG9w0BAQsFAAOCAQEASvj4sAPmLGd75JR3
+Y8xuTPl9Dg3cyLk1uXBPY/ok+myDjEedO2Pzmvl2MpWRsXe8rJq+seQxIcaBlVZaDrHC1LGmWazx
+Y8u4TB1ZkErvkBYoH1quEPuBUDgMbMzxPcP1Y+Oz4yHJJDnp/RVmRvQbEdBNc6N9Rvk97ahfYtTx
+P/jgdFcrGJ2BtMQo2pSXpXDrrB2+BxHw1dvd5Yzw1TKwg+ZX4o+/vqGqvz0dtdQ46tewXDpPaj+P
+wGZsY6rp2aQW9IHRlRQOfc2VNNnSj3BzgXucfr2YYdhFh5iQxeuGMMY1v/D/w1WIg0vvBZIGcfK4
+mJO37M2CYfE45k+XmCpajQ==
+-----END CERTIFICATE-----
+
+VeriSign Class 3 Public Primary Certification Authority - G4
+============================================================
+-----BEGIN CERTIFICATE-----
+MIIDhDCCAwqgAwIBAgIQL4D+I4wOIg9IZxIokYesszAKBggqhkjOPQQDAzCByjELMAkGA1UEBhMC
+VVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBOZXR3
+b3JrMTowOAYDVQQLEzEoYykgMjAwNyBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVz
+ZSBvbmx5MUUwQwYDVQQDEzxWZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmlj
+YXRpb24gQXV0aG9yaXR5IC0gRzQwHhcNMDcxMTA1MDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCByjEL
+MAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2lnbiBU
+cnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNyBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRo
+b3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5
+IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzQwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAASnVnp8
+Utpkmw4tXNherJI9/gHmGUo9FANL+mAnINmDiWn6VMaaGF5VKmTeBvaNSjutEDxlPZCIBIngMGGz
+rl0Bp3vefLK+ymVhAIau2o970ImtTR1ZmkGxvEeA3J5iw/mjgbIwga8wDwYDVR0TAQH/BAUwAwEB
+/zAOBgNVHQ8BAf8EBAMCAQYwbQYIKwYBBQUHAQwEYTBfoV2gWzBZMFcwVRYJaW1hZ2UvZ2lmMCEw
+HzAHBgUrDgMCGgQUj+XTGoasjY5rw8+AatRIGCx7GS4wJRYjaHR0cDovL2xvZ28udmVyaXNpZ24u
+Y29tL3ZzbG9nby5naWYwHQYDVR0OBBYEFLMWkf3upm7ktS5Jj4d4gYDs5bG1MAoGCCqGSM49BAMD
+A2gAMGUCMGYhDBgmYFo4e1ZC4Kf8NoRRkSAsdk1DPcQdhCPQrNZ8NQbOzWm9kA3bbEhCHQ6qQgIx
+AJw9SDkjOVgaFRJZap7v1VmyHVIsmXHNxynfGyphe3HR3vPA5Q06Sqotp9iGKt0uEA==
+-----END CERTIFICATE-----
+
+NetLock Arany (Class Gold) Főtanúsítvány
+========================================
+-----BEGIN CERTIFICATE-----
+MIIEFTCCAv2gAwIBAgIGSUEs5AAQMA0GCSqGSIb3DQEBCwUAMIGnMQswCQYDVQQGEwJIVTERMA8G
+A1UEBwwIQnVkYXBlc3QxFTATBgNVBAoMDE5ldExvY2sgS2Z0LjE3MDUGA1UECwwuVGFuw7pzw610
+dsOhbnlraWFkw7NrIChDZXJ0aWZpY2F0aW9uIFNlcnZpY2VzKTE1MDMGA1UEAwwsTmV0TG9jayBB
+cmFueSAoQ2xhc3MgR29sZCkgRsWRdGFuw7pzw610dsOhbnkwHhcNMDgxMjExMTUwODIxWhcNMjgx
+MjA2MTUwODIxWjCBpzELMAkGA1UEBhMCSFUxETAPBgNVBAcMCEJ1ZGFwZXN0MRUwEwYDVQQKDAxO
+ZXRMb2NrIEtmdC4xNzA1BgNVBAsMLlRhbsO6c8OtdHbDoW55a2lhZMOzayAoQ2VydGlmaWNhdGlv
+biBTZXJ2aWNlcykxNTAzBgNVBAMMLE5ldExvY2sgQXJhbnkgKENsYXNzIEdvbGQpIEbFkXRhbsO6
+c8OtdHbDoW55MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxCRec75LbRTDofTjl5Bu
+0jBFHjzuZ9lk4BqKf8owyoPjIMHj9DrTlF8afFttvzBPhCf2nx9JvMaZCpDyD/V/Q4Q3Y1GLeqVw
+/HpYzY6b7cNGbIRwXdrzAZAj/E4wqX7hJ2Pn7WQ8oLjJM2P+FpD/sLj916jAwJRDC7bVWaaeVtAk
+H3B5r9s5VA1lddkVQZQBr17s9o3x/61k/iCa11zr/qYfCGSji3ZVrR47KGAuhyXoqq8fxmRGILdw
+fzzeSNuWU7c5d+Qa4scWhHaXWy+7GRWF+GmF9ZmnqfI0p6m2pgP8b4Y9VHx2BJtr+UBdADTHLpl1
+neWIA6pN+APSQnbAGwIDAKiLo0UwQzASBgNVHRMBAf8ECDAGAQH/AgEEMA4GA1UdDwEB/wQEAwIB
+BjAdBgNVHQ4EFgQUzPpnk/C2uNClwB7zU/2MU9+D15YwDQYJKoZIhvcNAQELBQADggEBAKt/7hwW
+qZw8UQCgwBEIBaeZ5m8BiFRhbvG5GK1Krf6BQCOUL/t1fC8oS2IkgYIL9WHxHG64YTjrgfpioTta
+YtOUZcTh5m2C+C8lcLIhJsFyUR+MLMOEkMNaj7rP9KdlpeuY0fsFskZ1FSNqb4VjMIDw1Z4fKRzC
+bLBQWV2QWzuoDTDPv31/zvGdg73JRm4gpvlhUbohL3u+pRVjodSVh/GeufOJ8z2FuLjbvrW5Kfna
+NwUASZQDhETnv0Mxz3WLJdH0pmT1kvarBes96aULNmLazAZfNou2XjG4Kvte9nHfRCaexOYNkbQu
+dZWAUWpLMKawYqGT8ZvYzsRjdT9ZR7E=
+-----END CERTIFICATE-----
+
+Staat der Nederlanden Root CA - G2
+==================================
+-----BEGIN CERTIFICATE-----
+MIIFyjCCA7KgAwIBAgIEAJiWjDANBgkqhkiG9w0BAQsFADBaMQswCQYDVQQGEwJOTDEeMBwGA1UE
+CgwVU3RhYXQgZGVyIE5lZGVybGFuZGVuMSswKQYDVQQDDCJTdGFhdCBkZXIgTmVkZXJsYW5kZW4g
+Um9vdCBDQSAtIEcyMB4XDTA4MDMyNjExMTgxN1oXDTIwMDMyNTExMDMxMFowWjELMAkGA1UEBhMC
+TkwxHjAcBgNVBAoMFVN0YWF0IGRlciBOZWRlcmxhbmRlbjErMCkGA1UEAwwiU3RhYXQgZGVyIE5l
+ZGVybGFuZGVuIFJvb3QgQ0EgLSBHMjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMVZ
+5291qj5LnLW4rJ4L5PnZyqtdj7U5EILXr1HgO+EASGrP2uEGQxGZqhQlEq0i6ABtQ8SpuOUfiUtn
+vWFI7/3S4GCI5bkYYCjDdyutsDeqN95kWSpGV+RLufg3fNU254DBtvPUZ5uW6M7XxgpT0GtJlvOj
+CwV3SPcl5XCsMBQgJeN/dVrlSPhOewMHBPqCYYdu8DvEpMfQ9XQ+pV0aCPKbJdL2rAQmPlU6Yiil
+e7Iwr/g3wtG61jj99O9JMDeZJiFIhQGp5Rbn3JBV3w/oOM2ZNyFPXfUib2rFEhZgF1XyZWampzCR
+OME4HYYEhLoaJXhena/MUGDWE4dS7WMfbWV9whUYdMrhfmQpjHLYFhN9C0lK8SgbIHRrxT3dsKpI
+CT0ugpTNGmXZK4iambwYfp/ufWZ8Pr2UuIHOzZgweMFvZ9C+X+Bo7d7iscksWXiSqt8rYGPy5V65
+48r6f1CGPqI0GAwJaCgRHOThuVw+R7oyPxjMW4T182t0xHJ04eOLoEq9jWYv6q012iDTiIJh8BIi
+trzQ1aTsr1SIJSQ8p22xcik/Plemf1WvbibG/ufMQFxRRIEKeN5KzlW/HdXZt1bv8Hb/C3m1r737
+qWmRRpdogBQ2HbN/uymYNqUg+oJgYjOk7Na6B6duxc8UpufWkjTYgfX8HV2qXB72o007uPc5AgMB
+AAGjgZcwgZQwDwYDVR0TAQH/BAUwAwEB/zBSBgNVHSAESzBJMEcGBFUdIAAwPzA9BggrBgEFBQcC
+ARYxaHR0cDovL3d3dy5wa2lvdmVyaGVpZC5ubC9wb2xpY2llcy9yb290LXBvbGljeS1HMjAOBgNV
+HQ8BAf8EBAMCAQYwHQYDVR0OBBYEFJFoMocVHYnitfGsNig0jQt8YojrMA0GCSqGSIb3DQEBCwUA
+A4ICAQCoQUpnKpKBglBu4dfYszk78wIVCVBR7y29JHuIhjv5tLySCZa59sCrI2AGeYwRTlHSeYAz
++51IvuxBQ4EffkdAHOV6CMqqi3WtFMTC6GY8ggen5ieCWxjmD27ZUD6KQhgpxrRW/FYQoAUXvQwj
+f/ST7ZwaUb7dRUG/kSS0H4zpX897IZmflZ85OkYcbPnNe5yQzSipx6lVu6xiNGI1E0sUOlWDuYaN
+kqbG9AclVMwWVxJKgnjIFNkXgiYtXSAfea7+1HAWFpWD2DU5/1JddRwWxRNVz0fMdWVSSt7wsKfk
+CpYL+63C4iWEst3kvX5ZbJvw8NjnyvLplzh+ib7M+zkXYT9y2zqR2GUBGR2tUKRXCnxLvJxxcypF
+URmFzI79R6d0lR2o0a9OF7FpJsKqeFdbxU2n5Z4FF5TKsl+gSRiNNOkmbEgeqmiSBeGCc1qb3Adb
+CG19ndeNIdn8FCCqwkXfP+cAslHkwvgFuXkajDTznlvkN1trSt8sV4pAWja63XVECDdCcAz+3F4h
+oKOKwJCcaNpQ5kUQR3i2TtJlycM33+FCY7BXN0Ute4qcvwXqZVUz9zkQxSgqIXobisQk+T8VyJoV
+IPVVYpbtbZNQvOSqeK3Zywplh6ZmwcSBo3c6WB4L7oOLnR7SUqTMHW+wmG2UMbX4cQrcufx9MmDm
+66+KAQ==
+-----END CERTIFICATE-----
+
+Hongkong Post Root CA 1
+=======================
+-----BEGIN CERTIFICATE-----
+MIIDMDCCAhigAwIBAgICA+gwDQYJKoZIhvcNAQEFBQAwRzELMAkGA1UEBhMCSEsxFjAUBgNVBAoT
+DUhvbmdrb25nIFBvc3QxIDAeBgNVBAMTF0hvbmdrb25nIFBvc3QgUm9vdCBDQSAxMB4XDTAzMDUx
+NTA1MTMxNFoXDTIzMDUxNTA0NTIyOVowRzELMAkGA1UEBhMCSEsxFjAUBgNVBAoTDUhvbmdrb25n
+IFBvc3QxIDAeBgNVBAMTF0hvbmdrb25nIFBvc3QgUm9vdCBDQSAxMIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEArP84tulmAknjorThkPlAj3n54r15/gK97iSSHSL22oVyaf7XPwnU3ZG1
+ApzQjVrhVcNQhrkpJsLj2aDxaQMoIIBFIi1WpztUlVYiWR8o3x8gPW2iNr4joLFutbEnPzlTCeqr
+auh0ssJlXI6/fMN4hM2eFvz1Lk8gKgifd/PFHsSaUmYeSF7jEAaPIpjhZY4bXSNmO7ilMlHIhqqh
+qZ5/dpTCpmy3QfDVyAY45tQM4vM7TG1QjMSDJ8EThFk9nnV0ttgCXjqQesBCNnLsak3c78QA3xMY
+V18meMjWCnl3v/evt3a5pQuEF10Q6m/hq5URX208o1xNg1vysxmKgIsLhwIDAQABoyYwJDASBgNV
+HRMBAf8ECDAGAQH/AgEDMA4GA1UdDwEB/wQEAwIBxjANBgkqhkiG9w0BAQUFAAOCAQEADkbVPK7i
+h9legYsCmEEIjEy82tvuJxuC52pF7BaLT4Wg87JwvVqWuspube5Gi27nKi6Wsxkz67SfqLI37pio
+l7Yutmcn1KZJ/RyTZXaeQi/cImyaT/JaFTmxcdcrUehtHJjA2Sr0oYJ71clBoiMBdDhViw+5Lmei
+IAQ32pwL0xch4I+XeTRvhEgCIDMb5jREn5Fw9IBehEPCKdJsEhTkYY2sEJCehFC78JZvRZ+K88ps
+T/oROhUVRsPNH4NbLUES7VBnQRM9IauUiqpOfMGx+6fWtScvl6tu4B3i0RwsH0Ti/L6RoZz71ilT
+c4afU9hDDl3WY4JxHYB0yvbiAmvZWg==
+-----END CERTIFICATE-----
+
+SecureSign RootCA11
+===================
+-----BEGIN CERTIFICATE-----
+MIIDbTCCAlWgAwIBAgIBATANBgkqhkiG9w0BAQUFADBYMQswCQYDVQQGEwJKUDErMCkGA1UEChMi
+SmFwYW4gQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcywgSW5jLjEcMBoGA1UEAxMTU2VjdXJlU2lnbiBS
+b290Q0ExMTAeFw0wOTA0MDgwNDU2NDdaFw0yOTA0MDgwNDU2NDdaMFgxCzAJBgNVBAYTAkpQMSsw
+KQYDVQQKEyJKYXBhbiBDZXJ0aWZpY2F0aW9uIFNlcnZpY2VzLCBJbmMuMRwwGgYDVQQDExNTZWN1
+cmVTaWduIFJvb3RDQTExMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA/XeqpRyQBTvL
+TJszi1oURaTnkBbR31fSIRCkF/3frNYfp+TbfPfs37gD2pRY/V1yfIw/XwFndBWW4wI8h9uuywGO
+wvNmxoVF9ALGOrVisq/6nL+k5tSAMJjzDbaTj6nU2DbysPyKyiyhFTOVMdrAG/LuYpmGYz+/3ZMq
+g6h2uRMft85OQoWPIucuGvKVCbIFtUROd6EgvanyTgp9UK31BQ1FT0Zx/Sg+U/sE2C3XZR1KG/rP
+O7AxmjVuyIsG0wCR8pQIZUyxNAYAeoni8McDWc/V1uinMrPmmECGxc0nEovMe863ETxiYAcjPitA
+bpSACW22s293bzUIUPsCh8U+iQIDAQABo0IwQDAdBgNVHQ4EFgQUW/hNT7KlhtQ60vFjmqC+CfZX
+t94wDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAKCh
+OBZmLqdWHyGcBvod7bkixTgm2E5P7KN/ed5GIaGHd48HCJqypMWvDzKYC3xmKbabfSVSSUOrTC4r
+bnpwrxYO4wJs+0LmGJ1F2FXI6Dvd5+H0LgscNFxsWEr7jIhQX5Ucv+2rIrVls4W6ng+4reV6G4pQ
+Oh29Dbx7VFALuUKvVaAYga1lme++5Jy/xIWrQbJUb9wlze144o4MjQlJ3WN7WmmWAiGovVJZ6X01
+y8hSyn+B/tlr0/cR7SXf+Of5pPpyl4RTDaXQMhhRdlkUbA/r7F+AjHVDg8OFmP9Mni0N5HeDk061
+lgeLKBObjBmNQSdJQO7e5iNEOdyhIta6A/I=
+-----END CERTIFICATE-----
+
+ACEDICOM Root
+=============
+-----BEGIN CERTIFICATE-----
+MIIFtTCCA52gAwIBAgIIYY3HhjsBggUwDQYJKoZIhvcNAQEFBQAwRDEWMBQGA1UEAwwNQUNFRElD
+T00gUm9vdDEMMAoGA1UECwwDUEtJMQ8wDQYDVQQKDAZFRElDT00xCzAJBgNVBAYTAkVTMB4XDTA4
+MDQxODE2MjQyMloXDTI4MDQxMzE2MjQyMlowRDEWMBQGA1UEAwwNQUNFRElDT00gUm9vdDEMMAoG
+A1UECwwDUEtJMQ8wDQYDVQQKDAZFRElDT00xCzAJBgNVBAYTAkVTMIICIjANBgkqhkiG9w0BAQEF
+AAOCAg8AMIICCgKCAgEA/5KV4WgGdrQsyFhIyv2AVClVYyT/kGWbEHV7w2rbYgIB8hiGtXxaOLHk
+WLn709gtn70yN78sFW2+tfQh0hOR2QetAQXW8713zl9CgQr5auODAKgrLlUTY4HKRxx7XBZXehuD
+YAQ6PmXDzQHe3qTWDLqO3tkE7hdWIpuPY/1NFgu3e3eM+SW10W2ZEi5PGrjm6gSSrj0RuVFCPYew
+MYWveVqc/udOXpJPQ/yrOq2lEiZmueIM15jO1FillUAKt0SdE3QrwqXrIhWYENiLxQSfHY9g5QYb
+m8+5eaA9oiM/Qj9r+hwDezCNzmzAv+YbX79nuIQZ1RXve8uQNjFiybwCq0Zfm/4aaJQ0PZCOrfbk
+HQl/Sog4P75n/TSW9R28MHTLOO7VbKvU/PQAtwBbhTIWdjPp2KOZnQUAqhbm84F9b32qhm2tFXTT
+xKJxqvQUfecyuB+81fFOvW8XAjnXDpVCOscAPukmYxHqC9FK/xidstd7LzrZlvvoHpKuE1XI2Sf2
+3EgbsCTBheN3nZqk8wwRHQ3ItBTutYJXCb8gWH8vIiPYcMt5bMlL8qkqyPyHK9caUPgn6C9D4zq9
+2Fdx/c6mUlv53U3t5fZvie27k5x2IXXwkkwp9y+cAS7+UEaeZAwUswdbxcJzbPEHXEUkFDWug/Fq
+TYl6+rPYLWbwNof1K1MCAwEAAaOBqjCBpzAPBgNVHRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFKaz
+4SsrSbbXc6GqlPUB53NlTKxQMA4GA1UdDwEB/wQEAwIBhjAdBgNVHQ4EFgQUprPhKytJttdzoaqU
+9QHnc2VMrFAwRAYDVR0gBD0wOzA5BgRVHSAAMDEwLwYIKwYBBQUHAgEWI2h0dHA6Ly9hY2VkaWNv
+bS5lZGljb21ncm91cC5jb20vZG9jMA0GCSqGSIb3DQEBBQUAA4ICAQDOLAtSUWImfQwng4/F9tqg
+aHtPkl7qpHMyEVNEskTLnewPeUKzEKbHDZ3Ltvo/Onzqv4hTGzz3gvoFNTPhNahXwOf9jU8/kzJP
+eGYDdwdY6ZXIfj7QeQCM8htRM5u8lOk6e25SLTKeI6RF+7YuE7CLGLHdztUdp0J/Vb77W7tH1Pwk
+zQSulgUV1qzOMPPKC8W64iLgpq0i5ALudBF/TP94HTXa5gI06xgSYXcGCRZj6hitoocf8seACQl1
+ThCojz2GuHURwCRiipZ7SkXp7FnFvmuD5uHorLUwHv4FB4D54SMNUI8FmP8sX+g7tq3PgbUhh8oI
+KiMnMCArz+2UW6yyetLHKKGKC5tNSixthT8Jcjxn4tncB7rrZXtaAWPWkFtPF2Y9fwsZo5NjEFIq
+nxQWWOLcpfShFosOkYuByptZ+thrkQdlVV9SH686+5DdaaVbnG0OLLb6zqylfDJKZ0DcMDQj3dcE
+I2bw/FWAp/tmGYI1Z2JwOV5vx+qQQEQIHriy1tvuWacNGHk0vFQYXlPKNFHtRQrmjseCNj6nOGOp
+MCwXEGCSn1WHElkQwg9naRHMTh5+Spqtr0CodaxWkHS4oJyleW/c6RrIaQXpuvoDs3zk4E7Czp3o
+tkYNbn5XOmeUwssfnHdKZ05phkOTOPu220+DkdRgfks+KzgHVZhepA==
+-----END CERTIFICATE-----
+
+Microsec e-Szigno Root CA 2009
+==============================
+-----BEGIN CERTIFICATE-----
+MIIECjCCAvKgAwIBAgIJAMJ+QwRORz8ZMA0GCSqGSIb3DQEBCwUAMIGCMQswCQYDVQQGEwJIVTER
+MA8GA1UEBwwIQnVkYXBlc3QxFjAUBgNVBAoMDU1pY3Jvc2VjIEx0ZC4xJzAlBgNVBAMMHk1pY3Jv
+c2VjIGUtU3ppZ25vIFJvb3QgQ0EgMjAwOTEfMB0GCSqGSIb3DQEJARYQaW5mb0BlLXN6aWduby5o
+dTAeFw0wOTA2MTYxMTMwMThaFw0yOTEyMzAxMTMwMThaMIGCMQswCQYDVQQGEwJIVTERMA8GA1UE
+BwwIQnVkYXBlc3QxFjAUBgNVBAoMDU1pY3Jvc2VjIEx0ZC4xJzAlBgNVBAMMHk1pY3Jvc2VjIGUt
+U3ppZ25vIFJvb3QgQ0EgMjAwOTEfMB0GCSqGSIb3DQEJARYQaW5mb0BlLXN6aWduby5odTCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOn4j/NjrdqG2KfgQvvPkd6mJviZpWNwrZuuyjNA
+fW2WbqEORO7hE52UQlKavXWFdCyoDh2Tthi3jCyoz/tccbna7P7ofo/kLx2yqHWH2Leh5TvPmUpG
+0IMZfcChEhyVbUr02MelTTMuhTlAdX4UfIASmFDHQWe4oIBhVKZsTh/gnQ4H6cm6M+f+wFUoLAKA
+pxn1ntxVUwOXewdI/5n7N4okxFnMUBBjjqqpGrCEGob5X7uxUG6k0QrM1XF+H6cbfPVTbiJfyyvm
+1HxdrtbCxkzlBQHZ7Vf8wSN5/PrIJIOV87VqUQHQd9bpEqH5GoP7ghu5sJf0dgYzQ0mg/wu1+rUC
+AwEAAaOBgDB+MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTLD8bf
+QkPMPcu1SCOhGnqmKrs0aDAfBgNVHSMEGDAWgBTLD8bfQkPMPcu1SCOhGnqmKrs0aDAbBgNVHREE
+FDASgRBpbmZvQGUtc3ppZ25vLmh1MA0GCSqGSIb3DQEBCwUAA4IBAQDJ0Q5eLtXMs3w+y/w9/w0o
+lZMEyL/azXm4Q5DwpL7v8u8hmLzU1F0G9u5C7DBsoKqpyvGvivo/C3NqPuouQH4frlRheesuCDfX
+I/OMn74dseGkddug4lQUsbocKaQY9hK6ohQU4zE1yED/t+AFdlfBHFny+L/k7SViXITwfn4fs775
+tyERzAMBVnCnEJIeGzSBHq2cGsMEPO0CYdYeBvNfOofyK/FFh+U9rNHHV4S9a67c2Pm2G2JwCz02
+yULyMtd6YebS2z3PyKnJm9zbWETXbzivf3jTo60adbocwTZ8jx5tHMN1Rq41Bab2XD0h7lbwyYIi
+LXpUq3DDfSJlgnCW
+-----END CERTIFICATE-----
+
+GlobalSign Root CA - R3
+=======================
+-----BEGIN CERTIFICATE-----
+MIIDXzCCAkegAwIBAgILBAAAAAABIVhTCKIwDQYJKoZIhvcNAQELBQAwTDEgMB4GA1UECxMXR2xv
+YmFsU2lnbiBSb290IENBIC0gUjMxEzARBgNVBAoTCkdsb2JhbFNpZ24xEzARBgNVBAMTCkdsb2Jh
+bFNpZ24wHhcNMDkwMzE4MTAwMDAwWhcNMjkwMzE4MTAwMDAwWjBMMSAwHgYDVQQLExdHbG9iYWxT
+aWduIFJvb3QgQ0EgLSBSMzETMBEGA1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFsU2ln
+bjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMwldpB5BngiFvXAg7aEyiie/QV2EcWt
+iHL8RgJDx7KKnQRfJMsuS+FggkbhUqsMgUdwbN1k0ev1LKMPgj0MK66X17YUhhB5uzsTgHeMCOFJ
+0mpiLx9e+pZo34knlTifBtc+ycsmWQ1z3rDI6SYOgxXG71uL0gRgykmmKPZpO/bLyCiR5Z2KYVc3
+rHQU3HTgOu5yLy6c+9C7v/U9AOEGM+iCK65TpjoWc4zdQQ4gOsC0p6Hpsk+QLjJg6VfLuQSSaGjl
+OCZgdbKfd/+RFO+uIEn8rUAVSNECMWEZXriX7613t2Saer9fwRPvm2L7DWzgVGkWqQPabumDk3F2
+xmmFghcCAwEAAaNCMEAwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYE
+FI/wS3+oLkUkrk1Q+mOai97i3Ru8MA0GCSqGSIb3DQEBCwUAA4IBAQBLQNvAUKr+yAzv95ZURUm7
+lgAJQayzE4aGKAczymvmdLm6AC2upArT9fHxD4q/c2dKg8dEe3jgr25sbwMpjjM5RcOO5LlXbKr8
+EpbsU8Yt5CRsuZRj+9xTaGdWPoO4zzUhw8lo/s7awlOqzJCK6fBdRoyV3XpYKBovHd7NADdBj+1E
+bddTKJd+82cEHhXXipa0095MJ6RMG3NzdvQXmcIfeg7jLQitChws/zyrVQ4PkX4268NXSb7hLi18
+YIvDQVETI53O9zJrlAGomecsMx86OyXShkDOOyyGeMlhLxS67ttVb9+E7gUJTb0o2HLO02JQZR7r
+kpeDMdmztcpHWD9f
+-----END CERTIFICATE-----
+
+Autoridad de Certificacion Firmaprofesional CIF A62634068
+=========================================================
+-----BEGIN CERTIFICATE-----
+MIIGFDCCA/ygAwIBAgIIU+w77vuySF8wDQYJKoZIhvcNAQEFBQAwUTELMAkGA1UEBhMCRVMxQjBA
+BgNVBAMMOUF1dG9yaWRhZCBkZSBDZXJ0aWZpY2FjaW9uIEZpcm1hcHJvZmVzaW9uYWwgQ0lGIEE2
+MjYzNDA2ODAeFw0wOTA1MjAwODM4MTVaFw0zMDEyMzEwODM4MTVaMFExCzAJBgNVBAYTAkVTMUIw
+QAYDVQQDDDlBdXRvcmlkYWQgZGUgQ2VydGlmaWNhY2lvbiBGaXJtYXByb2Zlc2lvbmFsIENJRiBB
+NjI2MzQwNjgwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDKlmuO6vj78aI14H9M2uDD
+Utd9thDIAl6zQyrET2qyyhxdKJp4ERppWVevtSBC5IsP5t9bpgOSL/UR5GLXMnE42QQMcas9UX4P
+B99jBVzpv5RvwSmCwLTaUbDBPLutN0pcyvFLNg4kq7/DhHf9qFD0sefGL9ItWY16Ck6WaVICqjaY
+7Pz6FIMMNx/Jkjd/14Et5cS54D40/mf0PmbR0/RAz15iNA9wBj4gGFrO93IbJWyTdBSTo3OxDqqH
+ECNZXyAFGUftaI6SEspd/NYrspI8IM/hX68gvqB2f3bl7BqGYTM+53u0P6APjqK5am+5hyZvQWyI
+plD9amML9ZMWGxmPsu2bm8mQ9QEM3xk9Dz44I8kvjwzRAv4bVdZO0I08r0+k8/6vKtMFnXkIoctX
+MbScyJCyZ/QYFpM6/EfY0XiWMR+6KwxfXZmtY4laJCB22N/9q06mIqqdXuYnin1oKaPnirjaEbsX
+LZmdEyRG98Xi2J+Of8ePdG1asuhy9azuJBCtLxTa/y2aRnFHvkLfuwHb9H/TKI8xWVvTyQKmtFLK
+bpf7Q8UIJm+K9Lv9nyiqDdVF8xM6HdjAeI9BZzwelGSuewvF6NkBiDkal4ZkQdU7hwxu+g/GvUgU
+vzlN1J5Bto+WHWOWk9mVBngxaJ43BjuAiUVhOSPHG0SjFeUc+JIwuwIDAQABo4HvMIHsMBIGA1Ud
+EwEB/wQIMAYBAf8CAQEwDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRlzeurNR4APn7VdMActHNH
+DhpkLzCBpgYDVR0gBIGeMIGbMIGYBgRVHSAAMIGPMC8GCCsGAQUFBwIBFiNodHRwOi8vd3d3LmZp
+cm1hcHJvZmVzaW9uYWwuY29tL2NwczBcBggrBgEFBQcCAjBQHk4AUABhAHMAZQBvACAAZABlACAA
+bABhACAAQgBvAG4AYQBuAG8AdgBhACAANAA3ACAAQgBhAHIAYwBlAGwAbwBuAGEAIAAwADgAMAAx
+ADcwDQYJKoZIhvcNAQEFBQADggIBABd9oPm03cXF661LJLWhAqvdpYhKsg9VSytXjDvlMd3+xDLx
+51tkljYyGOylMnfX40S2wBEqgLk9am58m9Ot/MPWo+ZkKXzR4Tgegiv/J2Wv+xYVxC5xhOW1//qk
+R71kMrv2JYSiJ0L1ILDCExARzRAVukKQKtJE4ZYm6zFIEv0q2skGz3QeqUvVhyj5eTSSPi5E6PaP
+T481PyWzOdxjKpBrIF/EUhJOlywqrJ2X3kjyo2bbwtKDlaZmp54lD+kLM5FlClrD2VQS3a/DTg4f
+Jl4N3LON7NWBcN7STyQF82xO9UxJZo3R/9ILJUFI/lGExkKvgATP0H5kSeTy36LssUzAKh3ntLFl
+osS88Zj0qnAHY7S42jtM+kAiMFsRpvAFDsYCA0irhpuF3dvd6qJ2gHN99ZwExEWN57kci57q13XR
+crHedUTnQn3iV2t93Jm8PYMo6oCTjcVMZcFwgbg4/EMxsvYDNEeyrPsiBsse3RdHHF9mudMaotoR
+saS8I8nkvof/uZS2+F0gStRf571oe2XyFR7SOqkt6dhrJKyXWERHrVkY8SFlcN7ONGCoQPHzPKTD
+KCOM/iczQ0CgFzzr6juwcqajuUpLXhZI9LK8yIySxZ2frHI2vDSANGupi5LAuBft7HZT9SQBjLMi
+6Et8Vcad+qMUu2WFbm5PEn4KPJ2V
+-----END CERTIFICATE-----
+
+Izenpe.com
+==========
+-----BEGIN CERTIFICATE-----
+MIIF8TCCA9mgAwIBAgIQALC3WhZIX7/hy/WL1xnmfTANBgkqhkiG9w0BAQsFADA4MQswCQYDVQQG
+EwJFUzEUMBIGA1UECgwLSVpFTlBFIFMuQS4xEzARBgNVBAMMCkl6ZW5wZS5jb20wHhcNMDcxMjEz
+MTMwODI4WhcNMzcxMjEzMDgyNzI1WjA4MQswCQYDVQQGEwJFUzEUMBIGA1UECgwLSVpFTlBFIFMu
+QS4xEzARBgNVBAMMCkl6ZW5wZS5jb20wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDJ
+03rKDx6sp4boFmVqscIbRTJxldn+EFvMr+eleQGPicPK8lVx93e+d5TzcqQsRNiekpsUOqHnJJAK
+ClaOxdgmlOHZSOEtPtoKct2jmRXagaKH9HtuJneJWK3W6wyyQXpzbm3benhB6QiIEn6HLmYRY2xU
++zydcsC8Lv/Ct90NduM61/e0aL6i9eOBbsFGb12N4E3GVFWJGjMxCrFXuaOKmMPsOzTFlUFpfnXC
+PCDFYbpRR6AgkJOhkEvzTnyFRVSa0QUmQbC1TR0zvsQDyCV8wXDbO/QJLVQnSKwv4cSsPsjLkkxT
+OTcj7NMB+eAJRE1NZMDhDVqHIrytG6P+JrUV86f8hBnp7KGItERphIPzidF0BqnMC9bC3ieFUCbK
+F7jJeodWLBoBHmy+E60QrLUk9TiRodZL2vG70t5HtfG8gfZZa88ZU+mNFctKy6lvROUbQc/hhqfK
+0GqfvEyNBjNaooXlkDWgYlwWTvDjovoDGrQscbNYLN57C9saD+veIR8GdwYDsMnvmfzAuU8Lhij+
+0rnq49qlw0dpEuDb8PYZi+17cNcC1u2HGCgsBCRMd+RIihrGO5rUD8r6ddIBQFqNeb+Lz0vPqhbB
+leStTIo+F5HUsWLlguWABKQDfo2/2n+iD5dPDNMN+9fR5XJ+HMh3/1uaD7euBUbl8agW7EekFwID
+AQABo4H2MIHzMIGwBgNVHREEgagwgaWBD2luZm9AaXplbnBlLmNvbaSBkTCBjjFHMEUGA1UECgw+
+SVpFTlBFIFMuQS4gLSBDSUYgQTAxMzM3MjYwLVJNZXJjLlZpdG9yaWEtR2FzdGVpeiBUMTA1NSBG
+NjIgUzgxQzBBBgNVBAkMOkF2ZGEgZGVsIE1lZGl0ZXJyYW5lbyBFdG9yYmlkZWEgMTQgLSAwMTAx
+MCBWaXRvcmlhLUdhc3RlaXowDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0O
+BBYEFB0cZQ6o8iV7tJHP5LGx5r1VdGwFMA0GCSqGSIb3DQEBCwUAA4ICAQB4pgwWSp9MiDrAyw6l
+Fn2fuUhfGI8NYjb2zRlrrKvV9pF9rnHzP7MOeIWblaQnIUdCSnxIOvVFfLMMjlF4rJUT3sb9fbga
+kEyrkgPH7UIBzg/YsfqikuFgba56awmqxinuaElnMIAkejEWOVt+8Rwu3WwJrfIxwYJOubv5vr8q
+hT/AQKM6WfxZSzwoJNu0FXWuDYi6LnPAvViH5ULy617uHjAimcs30cQhbIHsvm0m5hzkQiCeR7Cs
+g1lwLDXWrzY0tM07+DKo7+N4ifuNRSzanLh+QBxh5z6ikixL8s36mLYp//Pye6kfLqCTVyvehQP5
+aTfLnnhqBbTFMXiJ7HqnheG5ezzevh55hM6fcA5ZwjUukCox2eRFekGkLhObNA5me0mrZJfQRsN5
+nXJQY6aYWwa9SG3YOYNw6DXwBdGqvOPbyALqfP2C2sJbUjWumDqtujWTI6cfSN01RpiyEGjkpTHC
+ClguGYEQyVB1/OpaFs4R1+7vUIgtYf8/QnMFlEPVjjxOAToZpR9GTnfQXeWBIiGH/pR9hNiTrdZo
+Q0iy2+tzJOeRf1SktoA+naM8THLCV8Sg1Mw4J87VBp6iSNnpn86CcDaTmjvfliHjWbcM2pE38P1Z
+WrOZyGlsQyYBNWNgVYkDOnXYukrZVP/u3oDYLdE41V4tC5h9Pmzb/CaIxw==
+-----END CERTIFICATE-----
+
+Chambers of Commerce Root - 2008
+================================
+-----BEGIN CERTIFICATE-----
+MIIHTzCCBTegAwIBAgIJAKPaQn6ksa7aMA0GCSqGSIb3DQEBBQUAMIGuMQswCQYDVQQGEwJFVTFD
+MEEGA1UEBxM6TWFkcmlkIChzZWUgY3VycmVudCBhZGRyZXNzIGF0IHd3dy5jYW1lcmZpcm1hLmNv
+bS9hZGRyZXNzKTESMBAGA1UEBRMJQTgyNzQzMjg3MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMu
+QS4xKTAnBgNVBAMTIENoYW1iZXJzIG9mIENvbW1lcmNlIFJvb3QgLSAyMDA4MB4XDTA4MDgwMTEy
+Mjk1MFoXDTM4MDczMTEyMjk1MFowga4xCzAJBgNVBAYTAkVVMUMwQQYDVQQHEzpNYWRyaWQgKHNl
+ZSBjdXJyZW50IGFkZHJlc3MgYXQgd3d3LmNhbWVyZmlybWEuY29tL2FkZHJlc3MpMRIwEAYDVQQF
+EwlBODI3NDMyODcxGzAZBgNVBAoTEkFDIENhbWVyZmlybWEgUy5BLjEpMCcGA1UEAxMgQ2hhbWJl
+cnMgb2YgQ29tbWVyY2UgUm9vdCAtIDIwMDgwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoIC
+AQCvAMtwNyuAWko6bHiUfaN/Gh/2NdW928sNRHI+JrKQUrpjOyhYb6WzbZSm891kDFX29ufyIiKA
+XuFixrYp4YFs8r/lfTJqVKAyGVn+H4vXPWCGhSRv4xGzdz4gljUha7MI2XAuZPeEklPWDrCQiorj
+h40G072QDuKZoRuGDtqaCrsLYVAGUvGef3bsyw/QHg3PmTA9HMRFEFis1tPo1+XqxQEHd9ZR5gN/
+ikilTWh1uem8nk4ZcfUyS5xtYBkL+8ydddy/Js2Pk3g5eXNeJQ7KXOt3EgfLZEFHcpOrUMPrCXZk
+NNI5t3YRCQ12RcSprj1qr7V9ZS+UWBDsXHyvfuK2GNnQm05aSd+pZgvMPMZ4fKecHePOjlO+Bd5g
+D2vlGts/4+EhySnB8esHnFIbAURRPHsl18TlUlRdJQfKFiC4reRB7noI/plvg6aRArBsNlVq5331
+lubKgdaX8ZSD6e2wsWsSaR6s+12pxZjptFtYer49okQ6Y1nUCyXeG0+95QGezdIp1Z8XGQpvvwyQ
+0wlf2eOKNcx5Wk0ZN5K3xMGtr/R5JJqyAQuxr1yW84Ay+1w9mPGgP0revq+ULtlVmhduYJ1jbLhj
+ya6BXBg14JC7vjxPNyK5fuvPnnchpj04gftI2jE9K+OJ9dC1vX7gUMQSibMjmhAxhduub+84Mxh2
+EQIDAQABo4IBbDCCAWgwEgYDVR0TAQH/BAgwBgEB/wIBDDAdBgNVHQ4EFgQU+SSsD7K1+HnA+mCI
+G8TZTQKeFxkwgeMGA1UdIwSB2zCB2IAU+SSsD7K1+HnA+mCIG8TZTQKeFxmhgbSkgbEwga4xCzAJ
+BgNVBAYTAkVVMUMwQQYDVQQHEzpNYWRyaWQgKHNlZSBjdXJyZW50IGFkZHJlc3MgYXQgd3d3LmNh
+bWVyZmlybWEuY29tL2FkZHJlc3MpMRIwEAYDVQQFEwlBODI3NDMyODcxGzAZBgNVBAoTEkFDIENh
+bWVyZmlybWEgUy5BLjEpMCcGA1UEAxMgQ2hhbWJlcnMgb2YgQ29tbWVyY2UgUm9vdCAtIDIwMDiC
+CQCj2kJ+pLGu2jAOBgNVHQ8BAf8EBAMCAQYwPQYDVR0gBDYwNDAyBgRVHSAAMCowKAYIKwYBBQUH
+AgEWHGh0dHA6Ly9wb2xpY3kuY2FtZXJmaXJtYS5jb20wDQYJKoZIhvcNAQEFBQADggIBAJASryI1
+wqM58C7e6bXpeHxIvj99RZJe6dqxGfwWPJ+0W2aeaufDuV2I6A+tzyMP3iU6XsxPpcG1Lawk0lgH
+3qLPaYRgM+gQDROpI9CF5Y57pp49chNyM/WqfcZjHwj0/gF/JM8rLFQJ3uIrbZLGOU8W6jx+ekbU
+RWpGqOt1glanq6B8aBMz9p0w8G8nOSQjKpD9kCk18pPfNKXG9/jvjA9iSnyu0/VU+I22mlaHFoI6
+M6taIgj3grrqLuBHmrS1RaMFO9ncLkVAO+rcf+g769HsJtg1pDDFOqxXnrN2pSB7+R5KBWIBpih1
+YJeSDW4+TTdDDZIVnBgizVGZoCkaPF+KMjNbMMeJL0eYD6MDxvbxrN8y8NmBGuScvfaAFPDRLLmF
+9dijscilIeUcE5fuDr3fKanvNFNb0+RqE4QGtjICxFKuItLcsiFCGtpA8CnJ7AoMXOLQusxI0zcK
+zBIKinmwPQN/aUv0NCB9szTqjktk9T79syNnFQ0EuPAtwQlRPLJsFfClI9eDdOTlLsn+mCdCxqvG
+nrDQWzilm1DefhiYtUU79nm06PcaewaD+9CL2rvHvRirCG88gGtAPxkZumWK5r7VXNM21+9AUiRg
+OGcEMeyP84LG3rlV8zsxkVrctQgVrXYlCg17LofiDKYGvCYQbTed7N14jHyAxfDZd0jQ
+-----END CERTIFICATE-----
+
+Global Chambersign Root - 2008
+==============================
+-----BEGIN CERTIFICATE-----
+MIIHSTCCBTGgAwIBAgIJAMnN0+nVfSPOMA0GCSqGSIb3DQEBBQUAMIGsMQswCQYDVQQGEwJFVTFD
+MEEGA1UEBxM6TWFkcmlkIChzZWUgY3VycmVudCBhZGRyZXNzIGF0IHd3dy5jYW1lcmZpcm1hLmNv
+bS9hZGRyZXNzKTESMBAGA1UEBRMJQTgyNzQzMjg3MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMu
+QS4xJzAlBgNVBAMTHkdsb2JhbCBDaGFtYmVyc2lnbiBSb290IC0gMjAwODAeFw0wODA4MDExMjMx
+NDBaFw0zODA3MzExMjMxNDBaMIGsMQswCQYDVQQGEwJFVTFDMEEGA1UEBxM6TWFkcmlkIChzZWUg
+Y3VycmVudCBhZGRyZXNzIGF0IHd3dy5jYW1lcmZpcm1hLmNvbS9hZGRyZXNzKTESMBAGA1UEBRMJ
+QTgyNzQzMjg3MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMuQS4xJzAlBgNVBAMTHkdsb2JhbCBD
+aGFtYmVyc2lnbiBSb290IC0gMjAwODCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMDf
+VtPkOpt2RbQT2//BthmLN0EYlVJH6xedKYiONWwGMi5HYvNJBL99RDaxccy9Wglz1dmFRP+RVyXf
+XjaOcNFccUMd2drvXNL7G706tcuto8xEpw2uIRU/uXpbknXYpBI4iRmKt4DS4jJvVpyR1ogQC7N0
+ZJJ0YPP2zxhPYLIj0Mc7zmFLmY/CDNBAspjcDahOo7kKrmCgrUVSY7pmvWjg+b4aqIG7HkF4ddPB
+/gBVsIdU6CeQNR1MM62X/JcumIS/LMmjv9GYERTtY/jKmIhYF5ntRQOXfjyGHoiMvvKRhI9lNNgA
+TH23MRdaKXoKGCQwoze1eqkBfSbW+Q6OWfH9GzO1KTsXO0G2Id3UwD2ln58fQ1DJu7xsepeY7s2M
+H/ucUa6LcL0nn3HAa6x9kGbo1106DbDVwo3VyJ2dwW3Q0L9R5OP4wzg2rtandeavhENdk5IMagfe
+Ox2YItaswTXbo6Al/3K1dh3ebeksZixShNBFks4c5eUzHdwHU1SjqoI7mjcv3N2gZOnm3b2u/GSF
+HTynyQbehP9r6GsaPMWis0L7iwk+XwhSx2LE1AVxv8Rk5Pihg+g+EpuoHtQ2TS9x9o0o9oOpE9Jh
+wZG7SMA0j0GMS0zbaRL/UJScIINZc+18ofLx/d33SdNDWKBWY8o9PeU1VlnpDsogzCtLkykPAgMB
+AAGjggFqMIIBZjASBgNVHRMBAf8ECDAGAQH/AgEMMB0GA1UdDgQWBBS5CcqcHtvTbDprru1U8VuT
+BjUuXjCB4QYDVR0jBIHZMIHWgBS5CcqcHtvTbDprru1U8VuTBjUuXqGBsqSBrzCBrDELMAkGA1UE
+BhMCRVUxQzBBBgNVBAcTOk1hZHJpZCAoc2VlIGN1cnJlbnQgYWRkcmVzcyBhdCB3d3cuY2FtZXJm
+aXJtYS5jb20vYWRkcmVzcykxEjAQBgNVBAUTCUE4Mjc0MzI4NzEbMBkGA1UEChMSQUMgQ2FtZXJm
+aXJtYSBTLkEuMScwJQYDVQQDEx5HbG9iYWwgQ2hhbWJlcnNpZ24gUm9vdCAtIDIwMDiCCQDJzdPp
+1X0jzjAOBgNVHQ8BAf8EBAMCAQYwPQYDVR0gBDYwNDAyBgRVHSAAMCowKAYIKwYBBQUHAgEWHGh0
+dHA6Ly9wb2xpY3kuY2FtZXJmaXJtYS5jb20wDQYJKoZIhvcNAQEFBQADggIBAICIf3DekijZBZRG
+/5BXqfEv3xoNa/p8DhxJJHkn2EaqbylZUohwEurdPfWbU1Rv4WCiqAm57OtZfMY18dwY6fFn5a+6
+ReAJ3spED8IXDneRRXozX1+WLGiLwUePmJs9wOzL9dWCkoQ10b42OFZyMVtHLaoXpGNR6woBrX/s
+dZ7LoR/xfxKxueRkf2fWIyr0uDldmOghp+G9PUIadJpwr2hsUF1Jz//7Dl3mLEfXgTpZALVza2Mg
+9jFFCDkO9HB+QHBaP9BrQql0PSgvAm11cpUJjUhjxsYjV5KTXjXBjfkK9yydYhz2rXzdpjEetrHH
+foUm+qRqtdpjMNHvkzeyZi99Bffnt0uYlDXA2TopwZ2yUDMdSqlapskD7+3056huirRXhOukP9Du
+qqqHW2Pok+JrqNS4cnhrG+055F3Lm6qH1U9OAP7Zap88MQ8oAgF9mOinsKJknnn4SPIVqczmyETr
+P3iZ8ntxPjzxmKfFGBI/5rsoM0LpRQp8bfKGeS/Fghl9CYl8slR2iK7ewfPM4W7bMdaTrpmg7yVq
+c5iJWzouE4gev8CSlDQb4ye3ix5vQv/n6TebUB0tovkC7stYWDpxvGjjqsGvHCgfotwjZT+B6q6Z
+09gwzxMNTxXJhLynSC34MCN32EZLeW32jO06f2ARePTpm67VVMB0gNELQp/B
+-----END CERTIFICATE-----
+
+Go Daddy Root Certificate Authority - G2
+========================================
+-----BEGIN CERTIFICATE-----
+MIIDxTCCAq2gAwIBAgIBADANBgkqhkiG9w0BAQsFADCBgzELMAkGA1UEBhMCVVMxEDAOBgNVBAgT
+B0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxGjAYBgNVBAoTEUdvRGFkZHkuY29tLCBJbmMu
+MTEwLwYDVQQDEyhHbyBEYWRkeSBSb290IENlcnRpZmljYXRlIEF1dGhvcml0eSAtIEcyMB4XDTA5
+MDkwMTAwMDAwMFoXDTM3MTIzMTIzNTk1OVowgYMxCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdBcml6
+b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMRowGAYDVQQKExFHb0RhZGR5LmNvbSwgSW5jLjExMC8G
+A1UEAxMoR28gRGFkZHkgUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkgLSBHMjCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAL9xYgjx+lk09xvJGKP3gElY6SKDE6bFIEMBO4Tx5oVJnyfq
+9oQbTqC023CYxzIBsQU+B07u9PpPL1kwIuerGVZr4oAH/PMWdYA5UXvl+TW2dE6pjYIT5LY/qQOD
++qK+ihVqf94Lw7YZFAXK6sOoBJQ7RnwyDfMAZiLIjWltNowRGLfTshxgtDj6AozO091GB94KPutd
+fMh8+7ArU6SSYmlRJQVhGkSBjCypQ5Yj36w6gZoOKcUcqeldHraenjAKOc7xiID7S13MMuyFYkMl
+NAJWJwGRtDtwKj9useiciAF9n9T521NtYJ2/LOdYq7hfRvzOxBsDPAnrSTFcaUaz4EcCAwEAAaNC
+MEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFDqahQcQZyi27/a9
+BUFuIMGU2g/eMA0GCSqGSIb3DQEBCwUAA4IBAQCZ21151fmXWWcDYfF+OwYxdS2hII5PZYe096ac
+vNjpL9DbWu7PdIxztDhC2gV7+AJ1uP2lsdeu9tfeE8tTEH6KRtGX+rcuKxGrkLAngPnon1rpN5+r
+5N9ss4UXnT3ZJE95kTXWXwTrgIOrmgIttRD02JDHBHNA7XIloKmf7J6raBKZV8aPEjoJpL1E/QYV
+N8Gb5DKj7Tjo2GTzLH4U/ALqn83/B2gX2yKQOC16jdFU8WnjXzPKej17CuPKf1855eJ1usV2GDPO
+LPAvTK33sefOT6jEm0pUBsV/fdUID+Ic/n4XuKxe9tQWskMJDE32p2u0mYRlynqI4uJEvlz36hz1
+-----END CERTIFICATE-----
+
+Starfield Root Certificate Authority - G2
+=========================================
+-----BEGIN CERTIFICATE-----
+MIID3TCCAsWgAwIBAgIBADANBgkqhkiG9w0BAQsFADCBjzELMAkGA1UEBhMCVVMxEDAOBgNVBAgT
+B0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxJTAjBgNVBAoTHFN0YXJmaWVsZCBUZWNobm9s
+b2dpZXMsIEluYy4xMjAwBgNVBAMTKVN0YXJmaWVsZCBSb290IENlcnRpZmljYXRlIEF1dGhvcml0
+eSAtIEcyMB4XDTA5MDkwMTAwMDAwMFoXDTM3MTIzMTIzNTk1OVowgY8xCzAJBgNVBAYTAlVTMRAw
+DgYDVQQIEwdBcml6b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMSUwIwYDVQQKExxTdGFyZmllbGQg
+VGVjaG5vbG9naWVzLCBJbmMuMTIwMAYDVQQDEylTdGFyZmllbGQgUm9vdCBDZXJ0aWZpY2F0ZSBB
+dXRob3JpdHkgLSBHMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL3twQP89o/8ArFv
+W59I2Z154qK3A2FWGMNHttfKPTUuiUP3oWmb3ooa/RMgnLRJdzIpVv257IzdIvpy3Cdhl+72WoTs
+bhm5iSzchFvVdPtrX8WJpRBSiUZV9Lh1HOZ/5FSuS/hVclcCGfgXcVnrHigHdMWdSL5stPSksPNk
+N3mSwOxGXn/hbVNMYq/NHwtjuzqd+/x5AJhhdM8mgkBj87JyahkNmcrUDnXMN/uLicFZ8WJ/X7Nf
+ZTD4p7dNdloedl40wOiWVpmKs/B/pM293DIxfJHP4F8R+GuqSVzRmZTRouNjWwl2tVZi4Ut0HZbU
+JtQIBFnQmA4O5t78w+wfkPECAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC
+AQYwHQYDVR0OBBYEFHwMMh+n2TB/xH1oo2Kooc6rB1snMA0GCSqGSIb3DQEBCwUAA4IBAQARWfol
+TwNvlJk7mh+ChTnUdgWUXuEok21iXQnCoKjUsHU48TRqneSfioYmUeYs0cYtbpUgSpIB7LiKZ3sx
+4mcujJUDJi5DnUox9g61DLu34jd/IroAow57UvtruzvE03lRTs2Q9GcHGcg8RnoNAX3FWOdt5oUw
+F5okxBDgBPfg8n/Uqgr/Qh037ZTlZFkSIHc40zI+OIF1lnP6aI+xy84fxez6nH7PfrHxBy22/L/K
+pL/QlwVKvOoYKAKQvVR4CSFx09F9HdkWsKlhPdAKACL8x3vLCWRFCztAgfd9fDL1mMpYjn0q7pBZ
+c2T5NnReJaH1ZgUufzkVqSr7UIuOhWn0
+-----END CERTIFICATE-----
+
+Starfield Services Root Certificate Authority - G2
+==================================================
+-----BEGIN CERTIFICATE-----
+MIID7zCCAtegAwIBAgIBADANBgkqhkiG9w0BAQsFADCBmDELMAkGA1UEBhMCVVMxEDAOBgNVBAgT
+B0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxJTAjBgNVBAoTHFN0YXJmaWVsZCBUZWNobm9s
+b2dpZXMsIEluYy4xOzA5BgNVBAMTMlN0YXJmaWVsZCBTZXJ2aWNlcyBSb290IENlcnRpZmljYXRl
+IEF1dGhvcml0eSAtIEcyMB4XDTA5MDkwMTAwMDAwMFoXDTM3MTIzMTIzNTk1OVowgZgxCzAJBgNV
+BAYTAlVTMRAwDgYDVQQIEwdBcml6b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMSUwIwYDVQQKExxT
+dGFyZmllbGQgVGVjaG5vbG9naWVzLCBJbmMuMTswOQYDVQQDEzJTdGFyZmllbGQgU2VydmljZXMg
+Um9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkgLSBHMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBANUMOsQq+U7i9b4Zl1+OiFOxHz/Lz58gE20pOsgPfTz3a3Y4Y9k2YKibXlwAgLIvWX/2
+h/klQ4bnaRtSmpDhcePYLQ1Ob/bISdm28xpWriu2dBTrz/sm4xq6HZYuajtYlIlHVv8loJNwU4Pa
+hHQUw2eeBGg6345AWh1KTs9DkTvnVtYAcMtS7nt9rjrnvDH5RfbCYM8TWQIrgMw0R9+53pBlbQLP
+LJGmpufehRhJfGZOozptqbXuNC66DQO4M99H67FrjSXZm86B0UVGMpZwh94CDklDhbZsc7tk6mFB
+rMnUVN+HL8cisibMn1lUaJ/8viovxFUcdUBgF4UCVTmLfwUCAwEAAaNCMEAwDwYDVR0TAQH/BAUw
+AwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFJxfAN+qAdcwKziIorhtSpzyEZGDMA0GCSqG
+SIb3DQEBCwUAA4IBAQBLNqaEd2ndOxmfZyMIbw5hyf2E3F/YNoHN2BtBLZ9g3ccaaNnRbobhiCPP
+E95Dz+I0swSdHynVv/heyNXBve6SbzJ08pGCL72CQnqtKrcgfU28elUSwhXqvfdqlS5sdJ/PHLTy
+xQGjhdByPq1zqwubdQxtRbeOlKyWN7Wg0I8VRw7j6IPdj/3vQQF3zCepYoUz8jcI73HPdwbeyBkd
+iEDPfUYd/x7H4c7/I9vG+o1VTqkC50cRRj70/b17KSa7qWFiNyi2LSr2EIZkyXCn0q23KXB56jza
+YyWf/Wi3MOxw+3WKt21gZ7IeyLnp2KhvAotnDU0mV3HaIPzBSlCNsSi6
+-----END CERTIFICATE-----
+
+AffirmTrust Commercial
+======================
+-----BEGIN CERTIFICATE-----
+MIIDTDCCAjSgAwIBAgIId3cGJyapsXwwDQYJKoZIhvcNAQELBQAwRDELMAkGA1UEBhMCVVMxFDAS
+BgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVzdCBDb21tZXJjaWFsMB4XDTEw
+MDEyOTE0MDYwNloXDTMwMTIzMTE0MDYwNlowRDELMAkGA1UEBhMCVVMxFDASBgNVBAoMC0FmZmly
+bVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVzdCBDb21tZXJjaWFsMIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEA9htPZwcroRX1BiLLHwGy43NFBkRJLLtJJRTWzsO3qyxPxkEylFf6Eqdb
+DuKPHx6GGaeqtS25Xw2Kwq+FNXkyLbscYjfysVtKPcrNcV/pQr6U6Mje+SJIZMblq8Yrba0F8PrV
+C8+a5fBQpIs7R6UjW3p6+DM/uO+Zl+MgwdYoic+U+7lF7eNAFxHUdPALMeIrJmqbTFeurCA+ukV6
+BfO9m2kVrn1OIGPENXY6BwLJN/3HR+7o8XYdcxXyl6S1yHp52UKqK39c/s4mT6NmgTWvRLpUHhww
+MmWd5jyTXlBOeuM61G7MGvv50jeuJCqrVwMiKA1JdX+3KNp1v47j3A55MQIDAQABo0IwQDAdBgNV
+HQ4EFgQUnZPGU4teyq8/nx4P5ZmVvCT2lI8wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC
+AQYwDQYJKoZIhvcNAQELBQADggEBAFis9AQOzcAN/wr91LoWXym9e2iZWEnStB03TX8nfUYGXUPG
+hi4+c7ImfU+TqbbEKpqrIZcUsd6M06uJFdhrJNTxFq7YpFzUf1GO7RgBsZNjvbz4YYCanrHOQnDi
+qX0GJX0nof5v7LMeJNrjS1UaADs1tDvZ110w/YETifLCBivtZ8SOyUOyXGsViQK8YvxO8rUzqrJv
+0wqiUOP2O+guRMLbZjipM1ZI8W0bM40NjD9gN53Tym1+NH4Nn3J2ixufcv1SNUFFApYvHLKac0kh
+sUlHRUe072o0EclNmsxZt9YCnlpOZbWUrhvfKbAW8b8Angc6F2S1BLUjIZkKlTuXfO8=
+-----END CERTIFICATE-----
+
+AffirmTrust Networking
+======================
+-----BEGIN CERTIFICATE-----
+MIIDTDCCAjSgAwIBAgIIfE8EORzUmS0wDQYJKoZIhvcNAQEFBQAwRDELMAkGA1UEBhMCVVMxFDAS
+BgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVzdCBOZXR3b3JraW5nMB4XDTEw
+MDEyOTE0MDgyNFoXDTMwMTIzMTE0MDgyNFowRDELMAkGA1UEBhMCVVMxFDASBgNVBAoMC0FmZmly
+bVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVzdCBOZXR3b3JraW5nMIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEAtITMMxcua5Rsa2FSoOujz3mUTOWUgJnLVWREZY9nZOIG41w3SfYvm4SE
+Hi3yYJ0wTsyEheIszx6e/jarM3c1RNg1lho9Nuh6DtjVR6FqaYvZ/Ls6rnla1fTWcbuakCNrmreI
+dIcMHl+5ni36q1Mr3Lt2PpNMCAiMHqIjHNRqrSK6mQEubWXLviRmVSRLQESxG9fhwoXA3hA/Pe24
+/PHxI1Pcv2WXb9n5QHGNfb2V1M6+oF4nI979ptAmDgAp6zxG8D1gvz9Q0twmQVGeFDdCBKNwV6gb
+h+0t+nvujArjqWaJGctB+d1ENmHP4ndGyH329JKBNv3bNPFyfvMMFr20FQIDAQABo0IwQDAdBgNV
+HQ4EFgQUBx/S55zawm6iQLSwelAQUHTEyL0wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC
+AQYwDQYJKoZIhvcNAQEFBQADggEBAIlXshZ6qML91tmbmzTCnLQyFE2npN/svqe++EPbkTfOtDIu
+UFUaNU52Q3Eg75N3ThVwLofDwR1t3Mu1J9QsVtFSUzpE0nPIxBsFZVpikpzuQY0x2+c06lkh1QF6
+12S4ZDnNye2v7UsDSKegmQGA3GWjNq5lWUhPgkvIZfFXHeVZLgo/bNjR9eUJtGxUAArgFU2HdW23
+WJZa3W3SAKD0m0i+wzekujbgfIeFlxoVot4uolu9rxj5kFDNcFn4J2dHy8egBzp90SxdbBk6ZrV9
+/ZFvgrG+CJPbFEfxojfHRZ48x3evZKiT3/Zpg4Jg8klCNO1aAFSFHBY2kgxc+qatv9s=
+-----END CERTIFICATE-----
+
+AffirmTrust Premium
+===================
+-----BEGIN CERTIFICATE-----
+MIIFRjCCAy6gAwIBAgIIbYwURrGmCu4wDQYJKoZIhvcNAQEMBQAwQTELMAkGA1UEBhMCVVMxFDAS
+BgNVBAoMC0FmZmlybVRydXN0MRwwGgYDVQQDDBNBZmZpcm1UcnVzdCBQcmVtaXVtMB4XDTEwMDEy
+OTE0MTAzNloXDTQwMTIzMTE0MTAzNlowQTELMAkGA1UEBhMCVVMxFDASBgNVBAoMC0FmZmlybVRy
+dXN0MRwwGgYDVQQDDBNBZmZpcm1UcnVzdCBQcmVtaXVtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8A
+MIICCgKCAgEAxBLfqV/+Qd3d9Z+K4/as4Tx4mrzY8H96oDMq3I0gW64tb+eT2TZwamjPjlGjhVtn
+BKAQJG9dKILBl1fYSCkTtuG+kU3fhQxTGJoeJKJPj/CihQvL9Cl/0qRY7iZNyaqoe5rZ+jjeRFcV
+5fiMyNlI4g0WJx0eyIOFJbe6qlVBzAMiSy2RjYvmia9mx+n/K+k8rNrSs8PhaJyJ+HoAVt70VZVs
++7pk3WKL3wt3MutizCaam7uqYoNMtAZ6MMgpv+0GTZe5HMQxK9VfvFMSF5yZVylmd2EhMQcuJUmd
+GPLu8ytxjLW6OQdJd/zvLpKQBY0tL3d770O/Nbua2Plzpyzy0FfuKE4mX4+QaAkvuPjcBukumj5R
+p9EixAqnOEhss/n/fauGV+O61oV4d7pD6kh/9ti+I20ev9E2bFhc8e6kGVQa9QPSdubhjL08s9NI
+S+LI+H+SqHZGnEJlPqQewQcDWkYtuJfzt9WyVSHvutxMAJf7FJUnM7/oQ0dG0giZFmA7mn7S5u04
+6uwBHjxIVkkJx0w3AJ6IDsBz4W9m6XJHMD4Q5QsDyZpCAGzFlH5hxIrff4IaC1nEWTJ3s7xgaVY5
+/bQGeyzWZDbZvUjthB9+pSKPKrhC9IK31FOQeE4tGv2Bb0TXOwF0lkLgAOIua+rF7nKsu7/+6qqo
++Nz2snmKtmcCAwEAAaNCMEAwHQYDVR0OBBYEFJ3AZ6YMItkm9UWrpmVSESfYRaxjMA8GA1UdEwEB
+/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBDAUAA4ICAQCzV00QYk465KzquByv
+MiPIs0laUZx2KI15qldGF9X1Uva3ROgIRL8YhNILgM3FEv0AVQVhh0HctSSePMTYyPtwni94loMg
+Nt58D2kTiKV1NpgIpsbfrM7jWNa3Pt668+s0QNiigfV4Py/VpfzZotReBA4Xrf5B8OWycvpEgjNC
+6C1Y91aMYj+6QrCcDFx+LmUmXFNPALJ4fqENmS2NuB2OosSw/WDQMKSOyARiqcTtNd56l+0OOF6S
+L5Nwpamcb6d9Ex1+xghIsV5n61EIJenmJWtSKZGc0jlzCFfemQa0W50QBuHCAKi4HEoCChTQwUHK
++4w1IX2COPKpVJEZNZOUbWo6xbLQu4mGk+ibyQ86p3q4ofB4Rvr8Ny/lioTz3/4E2aFooC8k4gmV
+BtWVyuEklut89pMFu+1z6S3RdTnX5yTb2E5fQ4+e0BQ5v1VwSJlXMbSc7kqYA5YwH2AG7hsj/oFg
+IxpHYoWlzBk0gG+zrBrjn/B7SK3VAdlntqlyk+otZrWyuOQ9PLLvTIzq6we/qzWaVYa8GKa1qF60
+g2xraUDTn9zxw2lrueFtCfTxqlB2Cnp9ehehVZZCmTEJ3WARjQUwfuaORtGdFNrHF+QFlozEJLUb
+zxQHskD4o55BhrwE0GuWyCqANP2/7waj3VjFhT0+j/6eKeC2uAloGRwYQw==
+-----END CERTIFICATE-----
+
+AffirmTrust Premium ECC
+=======================
+-----BEGIN CERTIFICATE-----
+MIIB/jCCAYWgAwIBAgIIdJclisc/elQwCgYIKoZIzj0EAwMwRTELMAkGA1UEBhMCVVMxFDASBgNV
+BAoMC0FmZmlybVRydXN0MSAwHgYDVQQDDBdBZmZpcm1UcnVzdCBQcmVtaXVtIEVDQzAeFw0xMDAx
+MjkxNDIwMjRaFw00MDEyMzExNDIwMjRaMEUxCzAJBgNVBAYTAlVTMRQwEgYDVQQKDAtBZmZpcm1U
+cnVzdDEgMB4GA1UEAwwXQWZmaXJtVHJ1c3QgUHJlbWl1bSBFQ0MwdjAQBgcqhkjOPQIBBgUrgQQA
+IgNiAAQNMF4bFZ0D0KF5Nbc6PJJ6yhUczWLznCZcBz3lVPqj1swS6vQUX+iOGasvLkjmrBhDeKzQ
+N8O9ss0s5kfiGuZjuD0uL3jET9v0D6RoTFVya5UdThhClXjMNzyR4ptlKymjQjBAMB0GA1UdDgQW
+BBSaryl6wBE1NSZRMADDav5A1a7WPDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAK
+BggqhkjOPQQDAwNnADBkAjAXCfOHiFBar8jAQr9HX/VsaobgxCd05DhT1wV/GzTjxi+zygk8N53X
+57hG8f2h4nECMEJZh0PUUd+60wkyWs6Iflc9nF9Ca/UHLbXwgpP5WW+uZPpY5Yse42O+tYHNbwKM
+eQ==
+-----END CERTIFICATE-----
+
+Certum Trusted Network CA
+=========================
+-----BEGIN CERTIFICATE-----
+MIIDuzCCAqOgAwIBAgIDBETAMA0GCSqGSIb3DQEBBQUAMH4xCzAJBgNVBAYTAlBMMSIwIAYDVQQK
+ExlVbml6ZXRvIFRlY2hub2xvZ2llcyBTLkEuMScwJQYDVQQLEx5DZXJ0dW0gQ2VydGlmaWNhdGlv
+biBBdXRob3JpdHkxIjAgBgNVBAMTGUNlcnR1bSBUcnVzdGVkIE5ldHdvcmsgQ0EwHhcNMDgxMDIy
+MTIwNzM3WhcNMjkxMjMxMTIwNzM3WjB+MQswCQYDVQQGEwJQTDEiMCAGA1UEChMZVW5pemV0byBU
+ZWNobm9sb2dpZXMgUy5BLjEnMCUGA1UECxMeQ2VydHVtIENlcnRpZmljYXRpb24gQXV0aG9yaXR5
+MSIwIAYDVQQDExlDZXJ0dW0gVHJ1c3RlZCBOZXR3b3JrIENBMIIBIjANBgkqhkiG9w0BAQEFAAOC
+AQ8AMIIBCgKCAQEA4/t9o3K6wvDJFIf1awFO4W5AB7ptJ11/91sts1rHUV+rpDKmYYe2bg+G0jAC
+l/jXaVehGDldamR5xgFZrDwxSjh80gTSSyjoIF87B6LMTXPb865Px1bVWqeWifrzq2jUI4ZZJ88J
+J7ysbnKDHDBy3+Ci6dLhdHUZvSqeexVUBBvXQzmtVSjF4hq79MDkrjhJM8x2hZ85RdKknvISjFH4
+fOQtf/WsX+sWn7Et0brMkUJ3TCXJkDhv2/DM+44el1k+1WBO5gUo7Ul5E0u6SNsv+XLTOcr+H9g0
+cvW0QM8xAcPs3hEtF10fuFDRXhmnad4HMyjKUJX5p1TLVIZQRan5SQIDAQABo0IwQDAPBgNVHRMB
+Af8EBTADAQH/MB0GA1UdDgQWBBQIds3LB/8k9sXN7buQvOKEN0Z19zAOBgNVHQ8BAf8EBAMCAQYw
+DQYJKoZIhvcNAQEFBQADggEBAKaorSLOAT2mo/9i0Eidi15ysHhE49wcrwn9I0j6vSrEuVUEtRCj
+jSfeC4Jj0O7eDDd5QVsisrCaQVymcODU0HfLI9MA4GxWL+FpDQ3Zqr8hgVDZBqWo/5U30Kr+4rP1
+mS1FhIrlQgnXdAIv94nYmem8J9RHjboNRhx3zxSkHLmkMcScKHQDNP8zGSal6Q10tz6XxnboJ5aj
+Zt3hrvJBW8qYVoNzcOSGGtIxQbovvi0TWnZvTuhOgQ4/WwMioBK+ZlgRSssDxLQqKi2WF+A5VLxI
+03YnnZotBqbJ7DnSq9ufmgsnAjUpsUCV5/nonFWIGUbWtzT1fs45mtk48VH3Tyw=
+-----END CERTIFICATE-----
+
+Certinomis - Autorité Racine
+============================
+-----BEGIN CERTIFICATE-----
+MIIFnDCCA4SgAwIBAgIBATANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJGUjETMBEGA1UEChMK
+Q2VydGlub21pczEXMBUGA1UECxMOMDAwMiA0MzM5OTg5MDMxJjAkBgNVBAMMHUNlcnRpbm9taXMg
+LSBBdXRvcml0w6kgUmFjaW5lMB4XDTA4MDkxNzA4Mjg1OVoXDTI4MDkxNzA4Mjg1OVowYzELMAkG
+A1UEBhMCRlIxEzARBgNVBAoTCkNlcnRpbm9taXMxFzAVBgNVBAsTDjAwMDIgNDMzOTk4OTAzMSYw
+JAYDVQQDDB1DZXJ0aW5vbWlzIC0gQXV0b3JpdMOpIFJhY2luZTCCAiIwDQYJKoZIhvcNAQEBBQAD
+ggIPADCCAgoCggIBAJ2Fn4bT46/HsmtuM+Cet0I0VZ35gb5j2CN2DpdUzZlMGvE5x4jYF1AMnmHa
+wE5V3udauHpOd4cN5bjr+p5eex7Ezyh0x5P1FMYiKAT5kcOrJ3NqDi5N8y4oH3DfVS9O7cdxbwly
+Lu3VMpfQ8Vh30WC8Tl7bmoT2R2FFK/ZQpn9qcSdIhDWerP5pqZ56XjUl+rSnSTV3lqc2W+HN3yNw
+2F1MpQiD8aYkOBOo7C+ooWfHpi2GR+6K/OybDnT0K0kCe5B1jPyZOQE51kqJ5Z52qz6WKDgmi92N
+jMD2AR5vpTESOH2VwnHu7XSu5DaiQ3XV8QCb4uTXzEIDS3h65X27uK4uIJPT5GHfceF2Z5c/tt9q
+c1pkIuVC28+BA5PY9OMQ4HL2AHCs8MF6DwV/zzRpRbWT5BnbUhYjBYkOjUjkJW+zeL9i9Qf6lSTC
+lrLooyPCXQP8w9PlfMl1I9f09bze5N/NgL+RiH2nE7Q5uiy6vdFrzPOlKO1Enn1So2+WLhl+HPNb
+xxaOu2B9d2ZHVIIAEWBsMsGoOBvrbpgT1u449fCfDu/+MYHB0iSVL1N6aaLwD4ZFjliCK0wi1F6g
+530mJ0jfJUaNSih8hp75mxpZuWW/Bd22Ql095gBIgl4g9xGC3srYn+Y3RyYe63j3YcNBZFgCQfna
+4NH4+ej9Uji29YnfAgMBAAGjWzBZMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0G
+A1UdDgQWBBQNjLZh2kS40RR9w759XkjwzspqsDAXBgNVHSAEEDAOMAwGCiqBegFWAgIAAQEwDQYJ
+KoZIhvcNAQEFBQADggIBACQ+YAZ+He86PtvqrxyaLAEL9MW12Ukx9F1BjYkMTv9sov3/4gbIOZ/x
+WqndIlgVqIrTseYyCYIDbNc/CMf4uboAbbnW/FIyXaR/pDGUu7ZMOH8oMDX/nyNTt7buFHAAQCva
+R6s0fl6nVjBhK4tDrP22iCj1a7Y+YEq6QpA0Z43q619FVDsXrIvkxmUP7tCMXWY5zjKn2BCXwH40
+nJ+U8/aGH88bc62UeYdocMMzpXDn2NU4lG9jeeu/Cg4I58UvD0KgKxRA/yHgBcUn4YQRE7rWhh1B
+CxMjidPJC+iKunqjo3M3NYB9Ergzd0A4wPpeMNLytqOx1qKVl4GbUu1pTP+A5FPbVFsDbVRfsbjv
+JL1vnxHDx2TCDyhihWZeGnuyt++uNckZM6i4J9szVb9o4XVIRFb7zdNIu0eJOqxp9YDG5ERQL1TE
+qkPFMTFYvZbF6nVsmnWxTfj3l/+WFvKXTej28xH5On2KOG4Ey+HTRRWqpdEdnV1j6CTmNhTih60b
+WfVEm/vXd3wfAXBioSAaosUaKPQhA+4u2cGA6rnZgtZbdsLLO7XSAPCjDuGtbkD326C00EauFddE
+wk01+dIL8hf2rGbVJLJP0RyZwG71fet0BLj5TXcJ17TPBzAJ8bgAVtkXFhYKK4bfjwEZGuW7gmP/
+vgt2Fl43N+bYdJeimUV5
+-----END CERTIFICATE-----
+
+TWCA Root Certification Authority
+=================================
+-----BEGIN CERTIFICATE-----
+MIIDezCCAmOgAwIBAgIBATANBgkqhkiG9w0BAQUFADBfMQswCQYDVQQGEwJUVzESMBAGA1UECgwJ
+VEFJV0FOLUNBMRAwDgYDVQQLDAdSb290IENBMSowKAYDVQQDDCFUV0NBIFJvb3QgQ2VydGlmaWNh
+dGlvbiBBdXRob3JpdHkwHhcNMDgwODI4MDcyNDMzWhcNMzAxMjMxMTU1OTU5WjBfMQswCQYDVQQG
+EwJUVzESMBAGA1UECgwJVEFJV0FOLUNBMRAwDgYDVQQLDAdSb290IENBMSowKAYDVQQDDCFUV0NB
+IFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQCwfnK4pAOU5qfeCTiRShFAh6d8WWQUe7UREN3+v9XAu1bihSX0NXIP+FPQQeFEAcK0HMMx
+QhZHhTMidrIKbw/lJVBPhYa+v5guEGcevhEFhgWQxFnQfHgQsIBct+HHK3XLfJ+utdGdIzdjp9xC
+oi2SBBtQwXu4PhvJVgSLL1KbralW6cH/ralYhzC2gfeXRfwZVzsrb+RH9JlF/h3x+JejiB03HFyP
+4HYlmlD4oFT/RJB2I9IyxsOrBr/8+7/zrX2SYgJbKdM1o5OaQ2RgXbL6Mv87BK9NQGr5x+PvI/1r
+y+UPizgN7gr8/g+YnzAx3WxSZfmLgb4i4RxYA7qRG4kHAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIB
+BjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRqOFsmjd6LWvJPelSDGRjjCDWmujANBgkqhkiG
+9w0BAQUFAAOCAQEAPNV3PdrfibqHDAhUaiBQkr6wQT25JmSDCi/oQMCXKCeCMErJk/9q56YAf4lC
+mtYR5VPOL8zy2gXE/uJQxDqGfczafhAJO5I1KlOy/usrBdlsXebQ79NqZp4VKIV66IIArB6nCWlW
+QtNoURi+VJq/REG6Sb4gumlc7rh3zc5sH62Dlhh9DrUUOYTxKOkto557HnpyWoOzeW/vtPzQCqVY
+T0bf+215WfKEIlKuD8z7fDvnaspHYcN6+NOSBB+4IIThNlQWx0DeO4pz3N/GCUzf7Nr/1FNCocny
+Yh0igzyXxfkZYiesZSLX0zzG5Y6yU8xJzrww/nsOM5D77dIUkR8Hrw==
+-----END CERTIFICATE-----
+
+Security Communication RootCA2
+==============================
+-----BEGIN CERTIFICATE-----
+MIIDdzCCAl+gAwIBAgIBADANBgkqhkiG9w0BAQsFADBdMQswCQYDVQQGEwJKUDElMCMGA1UEChMc
+U0VDT00gVHJ1c3QgU3lzdGVtcyBDTy4sTFRELjEnMCUGA1UECxMeU2VjdXJpdHkgQ29tbXVuaWNh
+dGlvbiBSb290Q0EyMB4XDTA5MDUyOTA1MDAzOVoXDTI5MDUyOTA1MDAzOVowXTELMAkGA1UEBhMC
+SlAxJTAjBgNVBAoTHFNFQ09NIFRydXN0IFN5c3RlbXMgQ08uLExURC4xJzAlBgNVBAsTHlNlY3Vy
+aXR5IENvbW11bmljYXRpb24gUm9vdENBMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+ANAVOVKxUrO6xVmCxF1SrjpDZYBLx/KWvNs2l9amZIyoXvDjChz335c9S672XewhtUGrzbl+dp++
++T42NKA7wfYxEUV0kz1XgMX5iZnK5atq1LXaQZAQwdbWQonCv/Q4EpVMVAX3NuRFg3sUZdbcDE3R
+3n4MqzvEFb46VqZab3ZpUql6ucjrappdUtAtCms1FgkQhNBqyjoGADdH5H5XTz+L62e4iKrFvlNV
+spHEfbmwhRkGeC7bYRr6hfVKkaHnFtWOojnflLhwHyg/i/xAXmODPIMqGplrz95Zajv8bxbXH/1K
+EOtOghY6rCcMU/Gt1SSwawNQwS08Ft1ENCcadfsCAwEAAaNCMEAwHQYDVR0OBBYEFAqFqXdlBZh8
+QIH4D5csOPEK7DzPMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEB
+CwUAA4IBAQBMOqNErLlFsceTfsgLCkLfZOoc7llsCLqJX2rKSpWeeo8HxdpFcoJxDjrSzG+ntKEj
+u/Ykn8sX/oymzsLS28yN/HH8AynBbF0zX2S2ZTuJbxh2ePXcokgfGT+Ok+vx+hfuzU7jBBJV1uXk
+3fs+BXziHV7Gp7yXT2g69ekuCkO2r1dcYmh8t/2jioSgrGK+KwmHNPBqAbubKVY8/gA3zyNs8U6q
+tnRGEmyR7jTV7JqR50S+kDFy1UkC9gLl9B/rfNmWVan/7Ir5mUf/NVoCqgTLiluHcSmRvaS0eg29
+mvVXIwAHIRc/SjnRBUkLp7Y3gaVdjKozXoEofKd9J+sAro03
+-----END CERTIFICATE-----
+
+EC-ACC
+======
+-----BEGIN CERTIFICATE-----
+MIIFVjCCBD6gAwIBAgIQ7is969Qh3hSoYqwE893EATANBgkqhkiG9w0BAQUFADCB8zELMAkGA1UE
+BhMCRVMxOzA5BgNVBAoTMkFnZW5jaWEgQ2F0YWxhbmEgZGUgQ2VydGlmaWNhY2lvIChOSUYgUS0w
+ODAxMTc2LUkpMSgwJgYDVQQLEx9TZXJ2ZWlzIFB1YmxpY3MgZGUgQ2VydGlmaWNhY2lvMTUwMwYD
+VQQLEyxWZWdldSBodHRwczovL3d3dy5jYXRjZXJ0Lm5ldC92ZXJhcnJlbCAoYykwMzE1MDMGA1UE
+CxMsSmVyYXJxdWlhIEVudGl0YXRzIGRlIENlcnRpZmljYWNpbyBDYXRhbGFuZXMxDzANBgNVBAMT
+BkVDLUFDQzAeFw0wMzAxMDcyMzAwMDBaFw0zMTAxMDcyMjU5NTlaMIHzMQswCQYDVQQGEwJFUzE7
+MDkGA1UEChMyQWdlbmNpYSBDYXRhbGFuYSBkZSBDZXJ0aWZpY2FjaW8gKE5JRiBRLTA4MDExNzYt
+SSkxKDAmBgNVBAsTH1NlcnZlaXMgUHVibGljcyBkZSBDZXJ0aWZpY2FjaW8xNTAzBgNVBAsTLFZl
+Z2V1IGh0dHBzOi8vd3d3LmNhdGNlcnQubmV0L3ZlcmFycmVsIChjKTAzMTUwMwYDVQQLEyxKZXJh
+cnF1aWEgRW50aXRhdHMgZGUgQ2VydGlmaWNhY2lvIENhdGFsYW5lczEPMA0GA1UEAxMGRUMtQUND
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsyLHT+KXQpWIR4NA9h0X84NzJB5R85iK
+w5K4/0CQBXCHYMkAqbWUZRkiFRfCQ2xmRJoNBD45b6VLeqpjt4pEndljkYRm4CgPukLjbo73FCeT
+ae6RDqNfDrHrZqJyTxIThmV6PttPB/SnCWDaOkKZx7J/sxaVHMf5NLWUhdWZXqBIoH7nF2W4onW4
+HvPlQn2v7fOKSGRdghST2MDk/7NQcvJ29rNdQlB50JQ+awwAvthrDk4q7D7SzIKiGGUzE3eeml0a
+E9jD2z3Il3rucO2n5nzbcc8tlGLfbdb1OL4/pYUKGbio2Al1QnDE6u/LDsg0qBIimAy4E5S2S+zw
+0JDnJwIDAQABo4HjMIHgMB0GA1UdEQQWMBSBEmVjX2FjY0BjYXRjZXJ0Lm5ldDAPBgNVHRMBAf8E
+BTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUoMOLRKo3pUW/l4Ba0fF4opvpXY0wfwYD
+VR0gBHgwdjB0BgsrBgEEAfV4AQMBCjBlMCwGCCsGAQUFBwIBFiBodHRwczovL3d3dy5jYXRjZXJ0
+Lm5ldC92ZXJhcnJlbDA1BggrBgEFBQcCAjApGidWZWdldSBodHRwczovL3d3dy5jYXRjZXJ0Lm5l
+dC92ZXJhcnJlbCAwDQYJKoZIhvcNAQEFBQADggEBAKBIW4IB9k1IuDlVNZyAelOZ1Vr/sXE7zDkJ
+lF7W2u++AVtd0x7Y/X1PzaBB4DSTv8vihpw3kpBWHNzrKQXlxJ7HNd+KDM3FIUPpqojlNcAZQmNa
+Al6kSBg6hW/cnbw/nZzBh7h6YQjpdwt/cKt63dmXLGQehb+8dJahw3oS7AwaboMMPOhyRp/7SNVe
+l+axofjk70YllJyJ22k4vuxcDlbHZVHlUIiIv0LVKz3l+bqeLrPK9HOSAgu+TGbrIP65y7WZf+a2
+E/rKS03Z7lNGBjvGTq2TWoF+bCpLagVFjPIhpDGQh2xlnJ2lYJU6Un/10asIbvPuW/mIPX64b24D
+5EI=
+-----END CERTIFICATE-----
+
+Hellenic Academic and Research Institutions RootCA 2011
+=======================================================
+-----BEGIN CERTIFICATE-----
+MIIEMTCCAxmgAwIBAgIBADANBgkqhkiG9w0BAQUFADCBlTELMAkGA1UEBhMCR1IxRDBCBgNVBAoT
+O0hlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNlYXJjaCBJbnN0aXR1dGlvbnMgQ2VydC4gQXV0aG9y
+aXR5MUAwPgYDVQQDEzdIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25z
+IFJvb3RDQSAyMDExMB4XDTExMTIwNjEzNDk1MloXDTMxMTIwMTEzNDk1MlowgZUxCzAJBgNVBAYT
+AkdSMUQwQgYDVQQKEztIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25z
+IENlcnQuIEF1dGhvcml0eTFAMD4GA1UEAxM3SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNo
+IEluc3RpdHV0aW9ucyBSb290Q0EgMjAxMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+AKlTAOMupvaO+mDYLZU++CwqVE7NuYRhlFhPjz2L5EPzdYmNUeTDN9KKiE15HrcS3UN4SoqS5tdI
+1Q+kOilENbgH9mgdVc04UfCMJDGFr4PJfel3r+0ae50X+bOdOFAPplp5kYCvN66m0zH7tSYJnTxa
+71HFK9+WXesyHgLacEnsbgzImjeN9/E2YEsmLIKe0HjzDQ9jpFEw4fkrJxIH2Oq9GGKYsFk3fb7u
+8yBRQlqD75O6aRXxYp2fmTmCobd0LovUxQt7L/DICto9eQqakxylKHJzkUOap9FNhYS5qXSPFEDH
+3N6sQWRstBmbAmNtJGSPRLIl6s5ddAxjMlyNh+UCAwEAAaOBiTCBhjAPBgNVHRMBAf8EBTADAQH/
+MAsGA1UdDwQEAwIBBjAdBgNVHQ4EFgQUppFC/RNhSiOeCKQp5dgTBCPuQSUwRwYDVR0eBEAwPqA8
+MAWCAy5ncjAFggMuZXUwBoIELmVkdTAGggQub3JnMAWBAy5ncjAFgQMuZXUwBoEELmVkdTAGgQQu
+b3JnMA0GCSqGSIb3DQEBBQUAA4IBAQAf73lB4XtuP7KMhjdCSk4cNx6NZrokgclPEg8hwAOXhiVt
+XdMiKahsog2p6z0GW5k6x8zDmjR/qw7IThzh+uTczQ2+vyT+bOdrwg3IBp5OjWEopmr95fZi6hg8
+TqBTnbI6nOulnJEWtk2C4AwFSKls9cz4y51JtPACpf1wA+2KIaWuE4ZJwzNzvoc7dIsXRSZMFpGD
+/md9zU1jZ/rzAxKWeAaNsWftjj++n08C9bMJL/NMh98qy5V8AcysNnq/onN694/BtZqhFLKPM58N
+7yLcZnuEvUUXBj08yrl3NI/K6s8/MT7jiOOASSXIl7WdmplNsDz4SgCbZN2fOUvRJ9e4
+-----END CERTIFICATE-----
+
+Actalis Authentication Root CA
+==============================
+-----BEGIN CERTIFICATE-----
+MIIFuzCCA6OgAwIBAgIIVwoRl0LE48wwDQYJKoZIhvcNAQELBQAwazELMAkGA1UEBhMCSVQxDjAM
+BgNVBAcMBU1pbGFuMSMwIQYDVQQKDBpBY3RhbGlzIFMucC5BLi8wMzM1ODUyMDk2NzEnMCUGA1UE
+AwweQWN0YWxpcyBBdXRoZW50aWNhdGlvbiBSb290IENBMB4XDTExMDkyMjExMjIwMloXDTMwMDky
+MjExMjIwMlowazELMAkGA1UEBhMCSVQxDjAMBgNVBAcMBU1pbGFuMSMwIQYDVQQKDBpBY3RhbGlz
+IFMucC5BLi8wMzM1ODUyMDk2NzEnMCUGA1UEAwweQWN0YWxpcyBBdXRoZW50aWNhdGlvbiBSb290
+IENBMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAp8bEpSmkLO/lGMWwUKNvUTufClrJ
+wkg4CsIcoBh/kbWHuUA/3R1oHwiD1S0eiKD4j1aPbZkCkpAW1V8IbInX4ay8IMKx4INRimlNAJZa
+by/ARH6jDuSRzVju3PvHHkVH3Se5CAGfpiEd9UEtL0z9KK3giq0itFZljoZUj5NDKd45RnijMCO6
+zfB9E1fAXdKDa0hMxKufgFpbOr3JpyI/gCczWw63igxdBzcIy2zSekciRDXFzMwujt0q7bd9Zg1f
+YVEiVRvjRuPjPdA1YprbrxTIW6HMiRvhMCb8oJsfgadHHwTrozmSBp+Z07/T6k9QnBn+locePGX2
+oxgkg4YQ51Q+qDp2JE+BIcXjDwL4k5RHILv+1A7TaLndxHqEguNTVHnd25zS8gebLra8Pu2Fbe8l
+EfKXGkJh90qX6IuxEAf6ZYGyojnP9zz/GPvG8VqLWeICrHuS0E4UT1lF9gxeKF+w6D9Fz8+vm2/7
+hNN3WpVvrJSEnu68wEqPSpP4RCHiMUVhUE4Q2OM1fEwZtN4Fv6MGn8i1zeQf1xcGDXqVdFUNaBr8
+EBtiZJ1t4JWgw5QHVw0U5r0F+7if5t+L4sbnfpb2U8WANFAoWPASUHEXMLrmeGO89LKtmyuy/uE5
+jF66CyCU3nuDuP/jVo23Eek7jPKxwV2dpAtMK9myGPW1n0sCAwEAAaNjMGEwHQYDVR0OBBYEFFLY
+iDrIn3hm7YnzezhwlMkCAjbQMA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0jBBgwFoAUUtiIOsifeGbt
+ifN7OHCUyQICNtAwDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBCwUAA4ICAQALe3KHwGCmSUyI
+WOYdiPcUZEim2FgKDk8TNd81HdTtBjHIgT5q1d07GjLukD0R0i70jsNjLiNmsGe+b7bAEzlgqqI0
+JZN1Ut6nna0Oh4lScWoWPBkdg/iaKWW+9D+a2fDzWochcYBNy+A4mz+7+uAwTc+G02UQGRjRlwKx
+K3JCaKygvU5a2hi/a5iB0P2avl4VSM0RFbnAKVy06Ij3Pjaut2L9HmLecHgQHEhb2rykOLpn7VU+
+Xlff1ANATIGk0k9jpwlCCRT8AKnCgHNPLsBA2RF7SOp6AsDT6ygBJlh0wcBzIm2Tlf05fbsq4/aC
+4yyXX04fkZT6/iyj2HYauE2yOE+b+h1IYHkm4vP9qdCa6HCPSXrW5b0KDtst842/6+OkfcvHlXHo
+2qN8xcL4dJIEG4aspCJTQLas/kx2z/uUMsA1n3Y/buWQbqCmJqK4LL7RK4X9p2jIugErsWx0Hbhz
+lefut8cl8ABMALJ+tguLHPPAUJ4lueAI3jZm/zel0btUZCzJJ7VLkn5l/9Mt4blOvH+kQSGQQXem
+OR/qnuOf0GZvBeyqdn6/axag67XH/JJULysRJyU3eExRarDzzFhdFPFqSBX/wge2sY0PjlxQRrM9
+vwGYT7JZVEc+NHt4bVaTLnPqZih4zR0Uv6CPLy64Lo7yFIrM6bV8+2ydDKXhlg==
+-----END CERTIFICATE-----
+
+Trustis FPS Root CA
+===================
+-----BEGIN CERTIFICATE-----
+MIIDZzCCAk+gAwIBAgIQGx+ttiD5JNM2a/fH8YygWTANBgkqhkiG9w0BAQUFADBFMQswCQYDVQQG
+EwJHQjEYMBYGA1UEChMPVHJ1c3RpcyBMaW1pdGVkMRwwGgYDVQQLExNUcnVzdGlzIEZQUyBSb290
+IENBMB4XDTAzMTIyMzEyMTQwNloXDTI0MDEyMTExMzY1NFowRTELMAkGA1UEBhMCR0IxGDAWBgNV
+BAoTD1RydXN0aXMgTGltaXRlZDEcMBoGA1UECxMTVHJ1c3RpcyBGUFMgUm9vdCBDQTCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBAMVQe547NdDfxIzNjpvto8A2mfRC6qc+gIMPpqdZh8mQ
+RUN+AOqGeSoDvT03mYlmt+WKVoaTnGhLaASMk5MCPjDSNzoiYYkchU59j9WvezX2fihHiTHcDnlk
+H5nSW7r+f2C/revnPDgpai/lkQtV/+xvWNUtyd5MZnGPDNcE2gfmHhjjvSkCqPoc4Vu5g6hBSLwa
+cY3nYuUtsuvffM/bq1rKMfFMIvMFE/eC+XN5DL7XSxzA0RU8k0Fk0ea+IxciAIleH2ulrG6nS4zt
+o3Lmr2NNL4XSFDWaLk6M6jKYKIahkQlBOrTh4/L68MkKokHdqeMDx4gVOxzUGpTXn2RZEm0CAwEA
+AaNTMFEwDwYDVR0TAQH/BAUwAwEB/zAfBgNVHSMEGDAWgBS6+nEleYtXQSUhhgtx67JkDoshZzAd
+BgNVHQ4EFgQUuvpxJXmLV0ElIYYLceuyZA6LIWcwDQYJKoZIhvcNAQEFBQADggEBAH5Y//01GX2c
+GE+esCu8jowU/yyg2kdbw++BLa8F6nRIW/M+TgfHbcWzk88iNVy2P3UnXwmWzaD+vkAMXBJV+JOC
+yinpXj9WV4s4NvdFGkwozZ5BuO1WTISkQMi4sKUraXAEasP41BIy+Q7DsdwyhEQsb8tGD+pmQQ9P
+8Vilpg0ND2HepZ5dfWWhPBfnqFVO76DH7cZEf1T1o+CP8HxVIo8ptoGj4W1OLBuAZ+ytIJ8MYmHV
+l/9D7S3B2l0pKoU/rGXuhg8FjZBf3+6f9L/uHfuY5H+QK4R4EA5sSVPvFVtlRkpdr7r7OnIdzfYl
+iB6XzCGcKQENZetX2fNXlrtIzYE=
+-----END CERTIFICATE-----
+
+StartCom Certification Authority
+================================
+-----BEGIN CERTIFICATE-----
+MIIHhzCCBW+gAwIBAgIBLTANBgkqhkiG9w0BAQsFADB9MQswCQYDVQQGEwJJTDEWMBQGA1UEChMN
+U3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmlu
+ZzEpMCcGA1UEAxMgU3RhcnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDYwOTE3MTk0
+NjM3WhcNMzYwOTE3MTk0NjM2WjB9MQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRk
+LjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzEpMCcGA1UEAxMg
+U3RhcnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAw
+ggIKAoICAQDBiNsJvGxGfHiflXu1M5DycmLWwTYgIiRezul38kMKogZkpMyONvg45iPwbm2xPN1y
+o4UcodM9tDMr0y+v/uqwQVlntsQGfQqedIXWeUyAN3rfOQVSWff0G0ZDpNKFhdLDcfN1YjS6LIp/
+Ho/u7TTQEceWzVI9ujPW3U3eCztKS5/CJi/6tRYccjV3yjxd5srhJosaNnZcAdt0FCX+7bWgiA/d
+eMotHweXMAEtcnn6RtYTKqi5pquDSR3l8u/d5AGOGAqPY1MWhWKpDhk6zLVmpsJrdAfkK+F2PrRt
+2PZE4XNiHzvEvqBTViVsUQn3qqvKv3b9bZvzndu/PWa8DFaqr5hIlTpL36dYUNk4dalb6kMMAv+Z
+6+hsTXBbKWWc3apdzK8BMewM69KN6Oqce+Zu9ydmDBpI125C4z/eIT574Q1w+2OqqGwaVLRcJXrJ
+osmLFqa7LH4XXgVNWG4SHQHuEhANxjJ/GP/89PrNbpHoNkm+Gkhpi8KWTRoSsmkXwQqQ1vp5Iki/
+untp+HDH+no32NgN0nZPV/+Qt+OR0t3vwmC3Zzrd/qqc8NSLf3Iizsafl7b4r4qgEKjZ+xjGtrVc
+UjyJthkqcwEKDwOzEmDyei+B26Nu/yYwl/WL3YlXtq09s68rxbd2AvCl1iuahhQqcvbjM4xdCUsT
+37uMdBNSSwIDAQABo4ICEDCCAgwwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYD
+VR0OBBYEFE4L7xqkQFulF2mHMMo0aEPQQa7yMB8GA1UdIwQYMBaAFE4L7xqkQFulF2mHMMo0aEPQ
+Qa7yMIIBWgYDVR0gBIIBUTCCAU0wggFJBgsrBgEEAYG1NwEBATCCATgwLgYIKwYBBQUHAgEWImh0
+dHA6Ly93d3cuc3RhcnRzc2wuY29tL3BvbGljeS5wZGYwNAYIKwYBBQUHAgEWKGh0dHA6Ly93d3cu
+c3RhcnRzc2wuY29tL2ludGVybWVkaWF0ZS5wZGYwgc8GCCsGAQUFBwICMIHCMCcWIFN0YXJ0IENv
+bW1lcmNpYWwgKFN0YXJ0Q29tKSBMdGQuMAMCAQEagZZMaW1pdGVkIExpYWJpbGl0eSwgcmVhZCB0
+aGUgc2VjdGlvbiAqTGVnYWwgTGltaXRhdGlvbnMqIG9mIHRoZSBTdGFydENvbSBDZXJ0aWZpY2F0
+aW9uIEF1dGhvcml0eSBQb2xpY3kgYXZhaWxhYmxlIGF0IGh0dHA6Ly93d3cuc3RhcnRzc2wuY29t
+L3BvbGljeS5wZGYwEQYJYIZIAYb4QgEBBAQDAgAHMDgGCWCGSAGG+EIBDQQrFilTdGFydENvbSBG
+cmVlIFNTTCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTANBgkqhkiG9w0BAQsFAAOCAgEAjo/n3JR5
+fPGFf59Jb2vKXfuM/gTFwWLRfUKKvFO3lANmMD+x5wqnUCBVJX92ehQN6wQOQOY+2IirByeDqXWm
+N3PH/UvSTa0XQMhGvjt/UfzDtgUx3M2FIk5xt/JxXrAaxrqTi3iSSoX4eA+D/i+tLPfkpLst0OcN
+Org+zvZ49q5HJMqjNTbOx8aHmNrs++myziebiMMEofYLWWivydsQD032ZGNcpRJvkrKTlMeIFw6T
+tn5ii5B/q06f/ON1FE8qMt9bDeD1e5MNq6HPh+GlBEXoPBKlCcWw0bdT82AUuoVpaiF8H3VhFyAX
+e2w7QSlc4axa0c2Mm+tgHRns9+Ww2vl5GKVFP0lDV9LdJNUso/2RjSe15esUBppMeyG7Oq0wBhjA
+2MFrLH9ZXF2RsXAiV+uKa0hK1Q8p7MZAwC+ITGgBF3f0JBlPvfrhsiAhS90a2Cl9qrjeVOwhVYBs
+HvUwyKMQ5bLmKhQxw4UtjJixhlpPiVktucf3HMiKf8CdBUrmQk9io20ppB+Fq9vlgcitKj1MXVuE
+JnHEhV5xJMqlG2zYYdMa4FTbzrqpMrUi9nNBCV24F10OD5mQ1kfabwo6YigUZ4LZ8dCAWZvLMdib
+D4x3TrVoivJs9iQOLWxwxXPR3hTQcY+203sC9uO41Alua551hDnmfyWl8kgAwKQB2j8=
+-----END CERTIFICATE-----
+
+StartCom Certification Authority G2
+===================================
+-----BEGIN CERTIFICATE-----
+MIIFYzCCA0ugAwIBAgIBOzANBgkqhkiG9w0BAQsFADBTMQswCQYDVQQGEwJJTDEWMBQGA1UEChMN
+U3RhcnRDb20gTHRkLjEsMCoGA1UEAxMjU3RhcnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkg
+RzIwHhcNMTAwMTAxMDEwMDAxWhcNMzkxMjMxMjM1OTAxWjBTMQswCQYDVQQGEwJJTDEWMBQGA1UE
+ChMNU3RhcnRDb20gTHRkLjEsMCoGA1UEAxMjU3RhcnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3Jp
+dHkgRzIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC2iTZbB7cgNr2Cu+EWIAOVeq8O
+o1XJJZlKxdBWQYeQTSFgpBSHO839sj60ZwNq7eEPS8CRhXBF4EKe3ikj1AENoBB5uNsDvfOpL9HG
+4A/LnooUCri99lZi8cVytjIl2bLzvWXFDSxu1ZJvGIsAQRSCb0AgJnooD/Uefyf3lLE3PbfHkffi
+Aez9lInhzG7TNtYKGXmu1zSCZf98Qru23QumNK9LYP5/Q0kGi4xDuFby2X8hQxfqp0iVAXV16iul
+Q5XqFYSdCI0mblWbq9zSOdIxHWDirMxWRST1HFSr7obdljKF+ExP6JV2tgXdNiNnvP8V4so75qbs
+O+wmETRIjfaAKxojAuuKHDp2KntWFhxyKrOq42ClAJ8Em+JvHhRYW6Vsi1g8w7pOOlz34ZYrPu8H
+vKTlXcxNnw3h3Kq74W4a7I/htkxNeXJdFzULHdfBR9qWJODQcqhaX2YtENwvKhOuJv4KHBnM0D4L
+nMgJLvlblnpHnOl68wVQdJVznjAJ85eCXuaPOQgeWeU1FEIT/wCc976qUM/iUUjXuG+v+E5+M5iS
+FGI6dWPPe/regjupuznixL0sAA7IF6wT700ljtizkC+p2il9Ha90OrInwMEePnWjFqmveiJdnxMa
+z6eg6+OGCtP95paV1yPIN93EfKo2rJgaErHgTuixO/XWb/Ew1wIDAQABo0IwQDAPBgNVHRMBAf8E
+BTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUS8W0QGutHLOlHGVuRjaJhwUMDrYwDQYJ
+KoZIhvcNAQELBQADggIBAHNXPyzVlTJ+N9uWkusZXn5T50HsEbZH77Xe7XRcxfGOSeD8bpkTzZ+K
+2s06Ctg6Wgk/XzTQLwPSZh0avZyQN8gMjgdalEVGKua+etqhqaRpEpKwfTbURIfXUfEpY9Z1zRbk
+J4kd+MIySP3bmdCPX1R0zKxnNBFi2QwKN4fRoxdIjtIXHfbX/dtl6/2o1PXWT6RbdejF0mCy2wl+
+JYt7ulKSnj7oxXehPOBKc2thz4bcQ///If4jXSRK9dNtD2IEBVeC2m6kMyV5Sy5UGYvMLD0w6dEG
+/+gyRr61M3Z3qAFdlsHB1b6uJcDJHgoJIIihDsnzb02CVAAgp9KP5DlUFy6NHrgbuxu9mk47EDTc
+nIhT76IxW1hPkWLIwpqazRVdOKnWvvgTtZ8SafJQYqz7Fzf07rh1Z2AQ+4NQ+US1dZxAF7L+/Xld
+blhYXzD8AK6vM8EOTmy6p6ahfzLbOOCxchcKK5HsamMm7YnUeMx0HgX4a/6ManY5Ka5lIxKVCCIc
+l85bBu4M4ru8H0ST9tg4RQUh7eStqxK2A6RCLi3ECToDZ2mEmuFZkIoohdVddLHRDiBYmxOlsGOm
+7XtH/UVVMKTumtTm4ofvmMkyghEpIrwACjFeLQ/Ajulrso8uBtjRkcfGEvRM/TAXw8HaOFvjqerm
+obp573PYtlNXLfbQ4ddI
+-----END CERTIFICATE-----
+
+Buypass Class 2 Root CA
+=======================
+-----BEGIN CERTIFICATE-----
+MIIFWTCCA0GgAwIBAgIBAjANBgkqhkiG9w0BAQsFADBOMQswCQYDVQQGEwJOTzEdMBsGA1UECgwU
+QnV5cGFzcyBBUy05ODMxNjMzMjcxIDAeBgNVBAMMF0J1eXBhc3MgQ2xhc3MgMiBSb290IENBMB4X
+DTEwMTAyNjA4MzgwM1oXDTQwMTAyNjA4MzgwM1owTjELMAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1
+eXBhc3MgQVMtOTgzMTYzMzI3MSAwHgYDVQQDDBdCdXlwYXNzIENsYXNzIDIgUm9vdCBDQTCCAiIw
+DQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANfHXvfBB9R3+0Mh9PT1aeTuMgHbo4Yf5FkNuud1
+g1Lr6hxhFUi7HQfKjK6w3Jad6sNgkoaCKHOcVgb/S2TwDCo3SbXlzwx87vFKu3MwZfPVL4O2fuPn
+9Z6rYPnT8Z2SdIrkHJasW4DptfQxh6NR/Md+oW+OU3fUl8FVM5I+GC911K2GScuVr1QGbNgGE41b
+/+EmGVnAJLqBcXmQRFBoJJRfuLMR8SlBYaNByyM21cHxMlAQTn/0hpPshNOOvEu/XAFOBz3cFIqU
+CqTqc/sLUegTBxj6DvEr0VQVfTzh97QZQmdiXnfgolXsttlpF9U6r0TtSsWe5HonfOV116rLJeff
+awrbD02TTqigzXsu8lkBarcNuAeBfos4GzjmCleZPe4h6KP1DBbdi+w0jpwqHAAVF41og9JwnxgI
+zRFo1clrUs3ERo/ctfPYV3Me6ZQ5BL/T3jjetFPsaRyifsSP5BtwrfKi+fv3FmRmaZ9JUaLiFRhn
+Bkp/1Wy1TbMz4GHrXb7pmA8y1x1LPC5aAVKRCfLf6o3YBkBjqhHk/sM3nhRSP/TizPJhk9H9Z2vX
+Uq6/aKtAQ6BXNVN48FP4YUIHZMbXb5tMOA1jrGKvNouicwoN9SG9dKpN6nIDSdvHXx1iY8f93ZHs
+M+71bbRuMGjeyNYmsHVee7QHIJihdjK4TWxPAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wHQYD
+VR0OBBYEFMmAd+BikoL1RpzzuvdMw964o605MA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQsF
+AAOCAgEAU18h9bqwOlI5LJKwbADJ784g7wbylp7ppHR/ehb8t/W2+xUbP6umwHJdELFx7rxP462s
+A20ucS6vxOOto70MEae0/0qyexAQH6dXQbLArvQsWdZHEIjzIVEpMMpghq9Gqx3tOluwlN5E40EI
+osHsHdb9T7bWR9AUC8rmyrV7d35BH16Dx7aMOZawP5aBQW9gkOLo+fsicdl9sz1Gv7SEr5AcD48S
+aq/v7h56rgJKihcrdv6sVIkkLE8/trKnToyokZf7KcZ7XC25y2a2t6hbElGFtQl+Ynhw/qlqYLYd
+DnkM/crqJIByw5c/8nerQyIKx+u2DISCLIBrQYoIwOula9+ZEsuK1V6ADJHgJgg2SMX6OBE1/yWD
+LfJ6v9r9jv6ly0UsH8SIU653DtmadsWOLB2jutXsMq7Aqqz30XpN69QH4kj3Io6wpJ9qzo6ysmD0
+oyLQI+uUWnpp3Q+/QFesa1lQ2aOZ4W7+jQF5JyMV3pKdewlNWudLSDBaGOYKbeaP4NK75t98biGC
+wWg5TbSYWGZizEqQXsP6JwSxeRV0mcy+rSDeJmAc61ZRpqPq5KM/p/9h3PFaTWwyI0PurKju7koS
+CTxdccK+efrCh2gdC/1cacwG0Jp9VJkqyTkaGa9LKkPzY11aWOIv4x3kqdbQCtCev9eBCfHJxyYN
+rJgWVqA=
+-----END CERTIFICATE-----
+
+Buypass Class 3 Root CA
+=======================
+-----BEGIN CERTIFICATE-----
+MIIFWTCCA0GgAwIBAgIBAjANBgkqhkiG9w0BAQsFADBOMQswCQYDVQQGEwJOTzEdMBsGA1UECgwU
+QnV5cGFzcyBBUy05ODMxNjMzMjcxIDAeBgNVBAMMF0J1eXBhc3MgQ2xhc3MgMyBSb290IENBMB4X
+DTEwMTAyNjA4Mjg1OFoXDTQwMTAyNjA4Mjg1OFowTjELMAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1
+eXBhc3MgQVMtOTgzMTYzMzI3MSAwHgYDVQQDDBdCdXlwYXNzIENsYXNzIDMgUm9vdCBDQTCCAiIw
+DQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAKXaCpUWUOOV8l6ddjEGMnqb8RB2uACatVI2zSRH
+sJ8YZLya9vrVediQYkwiL944PdbgqOkcLNt4EemOaFEVcsfzM4fkoF0LXOBXByow9c3EN3coTRiR
+5r/VUv1xLXA+58bEiuPwKAv0dpihi4dVsjoT/Lc+JzeOIuOoTyrvYLs9tznDDgFHmV0ST9tD+leh
+7fmdvhFHJlsTmKtdFoqwNxxXnUX/iJY2v7vKB3tvh2PX0DJq1l1sDPGzbjniazEuOQAnFN44wOwZ
+ZoYS6J1yFhNkUsepNxz9gjDthBgd9K5c/3ATAOux9TN6S9ZV+AWNS2mw9bMoNlwUxFFzTWsL8TQH
+2xc519woe2v1n/MuwU8XKhDzzMro6/1rqy6any2CbgTUUgGTLT2G/H783+9CHaZr77kgxve9oKeV
+/afmiSTYzIw0bOIjL9kSGiG5VZFvC5F5GQytQIgLcOJ60g7YaEi7ghM5EFjp2CoHxhLbWNvSO1UQ
+RwUVZ2J+GGOmRj8JDlQyXr8NYnon74Do29lLBlo3WiXQCBJ31G8JUJc9yB3D34xFMFbG02SrZvPA
+Xpacw8Tvw3xrizp5f7NJzz3iiZ+gMEuFuZyUJHmPfWupRWgPK9Dx2hzLabjKSWJtyNBjYt1gD1iq
+j6G8BaVmos8bdrKEZLFMOVLAMLrwjEsCsLa3AgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wHQYD
+VR0OBBYEFEe4zf/lb+74suwvTg75JbCOPGvDMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQsF
+AAOCAgEAACAjQTUEkMJAYmDv4jVM1z+s4jSQuKFvdvoWFqRINyzpkMLyPPgKn9iB5btb2iUspKdV
+cSQy9sgL8rxq+JOssgfCX5/bzMiKqr5qb+FJEMwx14C7u8jYog5kV+qi9cKpMRXSIGrs/CIBKM+G
+uIAeqcwRpTzyFrNHnfzSgCHEy9BHcEGhyoMZCCxt8l13nIoUE9Q2HJLw5QY33KbmkJs4j1xrG0aG
+Q0JfPgEHU1RdZX33inOhmlRaHylDFCfChQ+1iHsaO5S3HWCntZznKWlXWpuTekMwGwPXYshApqr8
+ZORK15FTAaggiG6cX0S5y2CBNOxv033aSF/rtJC8LakcC6wc1aJoIIAE1vyxjy+7SjENSoYc6+I2
+KSb12tjE8nVhz36udmNKekBlk4f4HoCMhuWG1o8O/FMsYOgWYRqiPkN7zTlgVGr18okmAWiDSKIz
+6MkEkbIRNBE+6tBDGR8Dk5AM/1E9V/RBbuHLoL7ryWPNbczk+DaqaJ3tvV2XcEQNtg413OEMXbug
+UZTLfhbrES+jkkXITHHZvMmZUldGL1DPvTVp9D0VzgalLA8+9oG6lLvDu79leNKGef9JOxqDDPDe
+eOzI8k1MGt6CKfjBWtrt7uYnXuhF0J0cUahoq0Tj0Itq4/g7u9xN12TyUb7mqqta6THuBrxzvxNi
+Cp/HuZc=
+-----END CERTIFICATE-----
+
+T-TeleSec GlobalRoot Class 3
+============================
+-----BEGIN CERTIFICATE-----
+MIIDwzCCAqugAwIBAgIBATANBgkqhkiG9w0BAQsFADCBgjELMAkGA1UEBhMCREUxKzApBgNVBAoM
+IlQtU3lzdGVtcyBFbnRlcnByaXNlIFNlcnZpY2VzIEdtYkgxHzAdBgNVBAsMFlQtU3lzdGVtcyBU
+cnVzdCBDZW50ZXIxJTAjBgNVBAMMHFQtVGVsZVNlYyBHbG9iYWxSb290IENsYXNzIDMwHhcNMDgx
+MDAxMTAyOTU2WhcNMzMxMDAxMjM1OTU5WjCBgjELMAkGA1UEBhMCREUxKzApBgNVBAoMIlQtU3lz
+dGVtcyBFbnRlcnByaXNlIFNlcnZpY2VzIEdtYkgxHzAdBgNVBAsMFlQtU3lzdGVtcyBUcnVzdCBD
+ZW50ZXIxJTAjBgNVBAMMHFQtVGVsZVNlYyBHbG9iYWxSb290IENsYXNzIDMwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQC9dZPwYiJvJK7genasfb3ZJNW4t/zN8ELg63iIVl6bmlQdTQyK
+9tPPcPRStdiTBONGhnFBSivwKixVA9ZIw+A5OO3yXDw/RLyTPWGrTs0NvvAgJ1gORH8EGoel15YU
+NpDQSXuhdfsaa3Ox+M6pCSzyU9XDFES4hqX2iys52qMzVNn6chr3IhUciJFrf2blw2qAsCTz34ZF
+iP0Zf3WHHx+xGwpzJFu5ZeAsVMhg02YXP+HMVDNzkQI6pn97djmiH5a2OK61yJN0HZ65tOVgnS9W
+0eDrXltMEnAMbEQgqxHY9Bn20pxSN+f6tsIxO0rUFJmtxxr1XV/6B7h8DR/Wgx6zAgMBAAGjQjBA
+MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBS1A/d2O2GCahKqGFPr
+AyGUv/7OyjANBgkqhkiG9w0BAQsFAAOCAQEAVj3vlNW92nOyWL6ukK2YJ5f+AbGwUgC4TeQbIXQb
+fsDuXmkqJa9c1h3a0nnJ85cp4IaH3gRZD/FZ1GSFS5mvJQQeyUapl96Cshtwn5z2r3Ex3XsFpSzT
+ucpH9sry9uetuUg/vBa3wW306gmv7PO15wWeph6KU1HWk4HMdJP2udqmJQV0eVp+QD6CSyYRMG7h
+P0HHRwA11fXT91Q+gT3aSWqas+8QPebrb9HIIkfLzM8BMZLZGOMivgkeGj5asuRrDFR6fUNOuIml
+e9eiPZaGzPImNC1qkp2aGtAw4l1OBLBfiyB+d8E9lYLRRpo7PHi4b6HQDWSieB4pTpPDpFQUWw==
+-----END CERTIFICATE-----
+
+EE Certification Centre Root CA
+===============================
+-----BEGIN CERTIFICATE-----
+MIIEAzCCAuugAwIBAgIQVID5oHPtPwBMyonY43HmSjANBgkqhkiG9w0BAQUFADB1MQswCQYDVQQG
+EwJFRTEiMCAGA1UECgwZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1czEoMCYGA1UEAwwfRUUgQ2Vy
+dGlmaWNhdGlvbiBDZW50cmUgUm9vdCBDQTEYMBYGCSqGSIb3DQEJARYJcGtpQHNrLmVlMCIYDzIw
+MTAxMDMwMTAxMDMwWhgPMjAzMDEyMTcyMzU5NTlaMHUxCzAJBgNVBAYTAkVFMSIwIAYDVQQKDBlB
+UyBTZXJ0aWZpdHNlZXJpbWlza2Vza3VzMSgwJgYDVQQDDB9FRSBDZXJ0aWZpY2F0aW9uIENlbnRy
+ZSBSb290IENBMRgwFgYJKoZIhvcNAQkBFglwa2lAc2suZWUwggEiMA0GCSqGSIb3DQEBAQUAA4IB
+DwAwggEKAoIBAQDIIMDs4MVLqwd4lfNE7vsLDP90jmG7sWLqI9iroWUyeuuOF0+W2Ap7kaJjbMeM
+TC55v6kF/GlclY1i+blw7cNRfdCT5mzrMEvhvH2/UpvObntl8jixwKIy72KyaOBhU8E2lf/slLo2
+rpwcpzIP5Xy0xm90/XsY6KxX7QYgSzIwWFv9zajmofxwvI6Sc9uXp3whrj3B9UiHbCe9nyV0gVWw
+93X2PaRka9ZP585ArQ/dMtO8ihJTmMmJ+xAdTX7Nfh9WDSFwhfYggx/2uh8Ej+p3iDXE/+pOoYtN
+P2MbRMNE1CV2yreN1x5KZmTNXMWcg+HCCIia7E6j8T4cLNlsHaFLAgMBAAGjgYowgYcwDwYDVR0T
+AQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFBLyWj7qVhy/zQas8fElyalL1BSZ
+MEUGA1UdJQQ+MDwGCCsGAQUFBwMCBggrBgEFBQcDAQYIKwYBBQUHAwMGCCsGAQUFBwMEBggrBgEF
+BQcDCAYIKwYBBQUHAwkwDQYJKoZIhvcNAQEFBQADggEBAHv25MANqhlHt01Xo/6tu7Fq1Q+e2+Rj
+xY6hUFaTlrg4wCQiZrxTFGGVv9DHKpY5P30osxBAIWrEr7BSdxjhlthWXePdNl4dp1BUoMUq5KqM
+lIpPnTX/dqQGE5Gion0ARD9V04I8GtVbvFZMIi5GQ4okQC3zErg7cBqklrkar4dBGmoYDQZPxz5u
+uSlNDUmJEYcyW+ZLBMjkXOZ0c5RdFpgTlf7727FE5TpwrDdr5rMzcijJs1eg9gIWiAYLtqZLICjU
+3j2LrTcFU3T+bsy8QxdxXvnFzBqpYe73dgzzcvRyrc9yAjYHR8/vGVCJYMzpJJUPwssd8m92kMfM
+dcGWxZ0=
+-----END CERTIFICATE-----
+
+TURKTRUST Certificate Services Provider Root 2007
+=================================================
+-----BEGIN CERTIFICATE-----
+MIIEPTCCAyWgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBvzE/MD0GA1UEAww2VMOcUktUUlVTVCBF
+bGVrdHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxMQswCQYDVQQGEwJUUjEP
+MA0GA1UEBwwGQW5rYXJhMV4wXAYDVQQKDFVUw5xSS1RSVVNUIEJpbGdpIMSwbGV0acWfaW0gdmUg
+QmlsacWfaW0gR8O8dmVubGnEn2kgSGl6bWV0bGVyaSBBLsWeLiAoYykgQXJhbMSxayAyMDA3MB4X
+DTA3MTIyNTE4MzcxOVoXDTE3MTIyMjE4MzcxOVowgb8xPzA9BgNVBAMMNlTDnFJLVFJVU1QgRWxl
+a3Ryb25payBTZXJ0aWZpa2EgSGl6bWV0IFNhxJ9sYXnEsWPEsXPEsTELMAkGA1UEBhMCVFIxDzAN
+BgNVBAcMBkFua2FyYTFeMFwGA1UECgxVVMOcUktUUlVTVCBCaWxnaSDEsGxldGnFn2ltIHZlIEJp
+bGnFn2ltIEfDvHZlbmxpxJ9pIEhpem1ldGxlcmkgQS7Fni4gKGMpIEFyYWzEsWsgMjAwNzCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKu3PgqMyKVYFeaK7yc9SrToJdPNM8Ig3BnuiD9N
+YvDdE3ePYakqtdTyuTFYKTsvP2qcb3N2Je40IIDu6rfwxArNK4aUyeNgsURSsloptJGXg9i3phQv
+KUmi8wUG+7RP2qFsmmaf8EMJyupyj+sA1zU511YXRxcw9L6/P8JorzZAwan0qafoEGsIiveGHtya
+KhUG9qPw9ODHFNRRf8+0222vR5YXm3dx2KdxnSQM9pQ/hTEST7ruToK4uT6PIzdezKKqdfcYbwnT
+rqdUKDT74eA7YH2gvnmJhsifLfkKS8RQouf9eRbHegsYz85M733WB2+Y8a+xwXrXgTW4qhe04MsC
+AwEAAaNCMEAwHQYDVR0OBBYEFCnFkKslrxHkYb+j/4hhkeYO/pyBMA4GA1UdDwEB/wQEAwIBBjAP
+BgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAQDdr4Ouwo0RSVgrESLFF6QSU2TJ/s
+Px+EnWVUXKgWAkD6bho3hO9ynYYKVZ1WKKxmLNA6VpM0ByWtCLCPyA8JWcqdmBzlVPi5RX9ql2+I
+aE1KBiY3iAIOtsbWcpnOa3faYjGkVh+uX4132l32iPwa2Z61gfAyuOOI0JzzaqC5mxRZNTZPz/OO
+Xl0XrRWV2N2y1RVuAE6zS89mlOTgzbUF2mNXi+WzqtvALhyQRNsaXRik7r4EW5nVcV9VZWRi1aKb
+BFmGyGJ353yCRWo9F7/snXUMrqNvWtMvmDb08PUZqxFdyKbjKlhqQgnDvZImZjINXQhVdP+MmNAK
+poRq0Tl9
+-----END CERTIFICATE-----
+
+D-TRUST Root Class 3 CA 2 2009
+==============================
+-----BEGIN CERTIFICATE-----
+MIIEMzCCAxugAwIBAgIDCYPzMA0GCSqGSIb3DQEBCwUAME0xCzAJBgNVBAYTAkRFMRUwEwYDVQQK
+DAxELVRydXN0IEdtYkgxJzAlBgNVBAMMHkQtVFJVU1QgUm9vdCBDbGFzcyAzIENBIDIgMjAwOTAe
+Fw0wOTExMDUwODM1NThaFw0yOTExMDUwODM1NThaME0xCzAJBgNVBAYTAkRFMRUwEwYDVQQKDAxE
+LVRydXN0IEdtYkgxJzAlBgNVBAMMHkQtVFJVU1QgUm9vdCBDbGFzcyAzIENBIDIgMjAwOTCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANOySs96R+91myP6Oi/WUEWJNTrGa9v+2wBoqOAD
+ER03UAifTUpolDWzU9GUY6cgVq/eUXjsKj3zSEhQPgrfRlWLJ23DEE0NkVJD2IfgXU42tSHKXzlA
+BF9bfsyjxiupQB7ZNoTWSPOSHjRGICTBpFGOShrvUD9pXRl/RcPHAY9RySPocq60vFYJfxLLHLGv
+KZAKyVXMD9O0Gu1HNVpK7ZxzBCHQqr0ME7UAyiZsxGsMlFqVlNpQmvH/pStmMaTJOKDfHR+4CS7z
+p+hnUquVH+BGPtikw8paxTGA6Eian5Rp/hnd2HN8gcqW3o7tszIFZYQ05ub9VxC1X3a/L7AQDcUC
+AwEAAaOCARowggEWMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFP3aFMSfMN4hvR5COfyrYyNJ
+4PGEMA4GA1UdDwEB/wQEAwIBBjCB0wYDVR0fBIHLMIHIMIGAoH6gfIZ6bGRhcDovL2RpcmVjdG9y
+eS5kLXRydXN0Lm5ldC9DTj1ELVRSVVNUJTIwUm9vdCUyMENsYXNzJTIwMyUyMENBJTIwMiUyMDIw
+MDksTz1ELVRydXN0JTIwR21iSCxDPURFP2NlcnRpZmljYXRlcmV2b2NhdGlvbmxpc3QwQ6BBoD+G
+PWh0dHA6Ly93d3cuZC10cnVzdC5uZXQvY3JsL2QtdHJ1c3Rfcm9vdF9jbGFzc18zX2NhXzJfMjAw
+OS5jcmwwDQYJKoZIhvcNAQELBQADggEBAH+X2zDI36ScfSF6gHDOFBJpiBSVYEQBrLLpME+bUMJm
+2H6NMLVwMeniacfzcNsgFYbQDfC+rAF1hM5+n02/t2A7nPPKHeJeaNijnZflQGDSNiH+0LS4F9p0
+o3/U37CYAqxva2ssJSRyoWXuJVrl5jLn8t+rSfrzkGkj2wTZ51xY/GXUl77M/C4KzCUqNQT4YJEV
+dT1B/yMfGchs64JTBKbkTCJNjYy6zltz7GRUUG3RnFX7acM2w4y8PIWmawomDeCTmGCufsYkl4ph
+X5GOZpIJhzbNi5stPvZR1FDUWSi9g/LMKHtThm3YJohw1+qRzT65ysCQblrGXnRl11z+o+I=
+-----END CERTIFICATE-----
+
+D-TRUST Root Class 3 CA 2 EV 2009
+=================================
+-----BEGIN CERTIFICATE-----
+MIIEQzCCAyugAwIBAgIDCYP0MA0GCSqGSIb3DQEBCwUAMFAxCzAJBgNVBAYTAkRFMRUwEwYDVQQK
+DAxELVRydXN0IEdtYkgxKjAoBgNVBAMMIUQtVFJVU1QgUm9vdCBDbGFzcyAzIENBIDIgRVYgMjAw
+OTAeFw0wOTExMDUwODUwNDZaFw0yOTExMDUwODUwNDZaMFAxCzAJBgNVBAYTAkRFMRUwEwYDVQQK
+DAxELVRydXN0IEdtYkgxKjAoBgNVBAMMIUQtVFJVU1QgUm9vdCBDbGFzcyAzIENBIDIgRVYgMjAw
+OTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJnxhDRwui+3MKCOvXwEz75ivJn9gpfS
+egpnljgJ9hBOlSJzmY3aFS3nBfwZcyK3jpgAvDw9rKFs+9Z5JUut8Mxk2og+KbgPCdM03TP1YtHh
+zRnp7hhPTFiu4h7WDFsVWtg6uMQYZB7jM7K1iXdODL/ZlGsTl28So/6ZqQTMFexgaDbtCHu39b+T
+7WYxg4zGcTSHThfqr4uRjRxWQa4iN1438h3Z0S0NL2lRp75mpoo6Kr3HGrHhFPC+Oh25z1uxav60
+sUYgovseO3Dvk5h9jHOW8sXvhXCtKSb8HgQ+HKDYD8tSg2J87otTlZCpV6LqYQXY+U3EJ/pure35
+11H3a6UCAwEAAaOCASQwggEgMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFNOUikxiEyoZLsyv
+cop9NteaHNxnMA4GA1UdDwEB/wQEAwIBBjCB3QYDVR0fBIHVMIHSMIGHoIGEoIGBhn9sZGFwOi8v
+ZGlyZWN0b3J5LmQtdHJ1c3QubmV0L0NOPUQtVFJVU1QlMjBSb290JTIwQ2xhc3MlMjAzJTIwQ0El
+MjAyJTIwRVYlMjAyMDA5LE89RC1UcnVzdCUyMEdtYkgsQz1ERT9jZXJ0aWZpY2F0ZXJldm9jYXRp
+b25saXN0MEagRKBChkBodHRwOi8vd3d3LmQtdHJ1c3QubmV0L2NybC9kLXRydXN0X3Jvb3RfY2xh
+c3NfM19jYV8yX2V2XzIwMDkuY3JsMA0GCSqGSIb3DQEBCwUAA4IBAQA07XtaPKSUiO8aEXUHL7P+
+PPoeUSbrh/Yp3uDx1MYkCenBz1UbtDDZzhr+BlGmFaQt77JLvyAoJUnRpjZ3NOhk31KxEcdzes05
+nsKtjHEh8lprr988TlWvsoRlFIm5d8sqMb7Po23Pb0iUMkZv53GMoKaEGTcH8gNFCSuGdXzfX2lX
+ANtu2KZyIktQ1HWYVt+3GP9DQ1CuekR78HlR10M9p9OB0/DJT7naxpeG0ILD5EJt/rDiZE4OJudA
+NCa1CInXCGNjOCd1HjPqbqjdn5lPdE2BiYBL3ZqXKVwvvoFBuYz/6n1gBp7N1z3TLqMVvKjmJuVv
+w9y4AyHqnxbxLFS1
+-----END CERTIFICATE-----
+
+PSCProcert
+==========
+-----BEGIN CERTIFICATE-----
+MIIJhjCCB26gAwIBAgIBCzANBgkqhkiG9w0BAQsFADCCAR4xPjA8BgNVBAMTNUF1dG9yaWRhZCBk
+ZSBDZXJ0aWZpY2FjaW9uIFJhaXogZGVsIEVzdGFkbyBWZW5lem9sYW5vMQswCQYDVQQGEwJWRTEQ
+MA4GA1UEBxMHQ2FyYWNhczEZMBcGA1UECBMQRGlzdHJpdG8gQ2FwaXRhbDE2MDQGA1UEChMtU2lz
+dGVtYSBOYWNpb25hbCBkZSBDZXJ0aWZpY2FjaW9uIEVsZWN0cm9uaWNhMUMwQQYDVQQLEzpTdXBl
+cmludGVuZGVuY2lhIGRlIFNlcnZpY2lvcyBkZSBDZXJ0aWZpY2FjaW9uIEVsZWN0cm9uaWNhMSUw
+IwYJKoZIhvcNAQkBFhZhY3JhaXpAc3VzY2VydGUuZ29iLnZlMB4XDTEwMTIyODE2NTEwMFoXDTIw
+MTIyNTIzNTk1OVowgdExJjAkBgkqhkiG9w0BCQEWF2NvbnRhY3RvQHByb2NlcnQubmV0LnZlMQ8w
+DQYDVQQHEwZDaGFjYW8xEDAOBgNVBAgTB01pcmFuZGExKjAoBgNVBAsTIVByb3ZlZWRvciBkZSBD
+ZXJ0aWZpY2Fkb3MgUFJPQ0VSVDE2MDQGA1UEChMtU2lzdGVtYSBOYWNpb25hbCBkZSBDZXJ0aWZp
+Y2FjaW9uIEVsZWN0cm9uaWNhMQswCQYDVQQGEwJWRTETMBEGA1UEAxMKUFNDUHJvY2VydDCCAiIw
+DQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANW39KOUM6FGqVVhSQ2oh3NekS1wwQYalNo97BVC
+wfWMrmoX8Yqt/ICV6oNEolt6Vc5Pp6XVurgfoCfAUFM+jbnADrgV3NZs+J74BCXfgI8Qhd19L3uA
+3VcAZCP4bsm+lU/hdezgfl6VzbHvvnpC2Mks0+saGiKLt38GieU89RLAu9MLmV+QfI4tL3czkkoh
+RqipCKzx9hEC2ZUWno0vluYC3XXCFCpa1sl9JcLB/KpnheLsvtF8PPqv1W7/U0HU9TI4seJfxPmO
+EO8GqQKJ/+MMbpfg353bIdD0PghpbNjU5Db4g7ayNo+c7zo3Fn2/omnXO1ty0K+qP1xmk6wKImG2
+0qCZyFSTXai20b1dCl53lKItwIKOvMoDKjSuc/HUtQy9vmebVOvh+qBa7Dh+PsHMosdEMXXqP+UH
+0quhJZb25uSgXTcYOWEAM11G1ADEtMo88aKjPvM6/2kwLkDd9p+cJsmWN63nOaK/6mnbVSKVUyqU
+td+tFjiBdWbjxywbk5yqjKPK2Ww8F22c3HxT4CAnQzb5EuE8XL1mv6JpIzi4mWCZDlZTOpx+FIyw
+Bm/xhnaQr/2v/pDGj59/i5IjnOcVdo/Vi5QTcmn7K2FjiO/mpF7moxdqWEfLcU8UC17IAggmosvp
+r2uKGcfLFFb14dq12fy/czja+eevbqQ34gcnAgMBAAGjggMXMIIDEzASBgNVHRMBAf8ECDAGAQH/
+AgEBMDcGA1UdEgQwMC6CD3N1c2NlcnRlLmdvYi52ZaAbBgVghl4CAqASDBBSSUYtRy0yMDAwNDAz
+Ni0wMB0GA1UdDgQWBBRBDxk4qpl/Qguk1yeYVKIXTC1RVDCCAVAGA1UdIwSCAUcwggFDgBStuyId
+xuDSAaj9dlBSk+2YwU2u06GCASakggEiMIIBHjE+MDwGA1UEAxM1QXV0b3JpZGFkIGRlIENlcnRp
+ZmljYWNpb24gUmFpeiBkZWwgRXN0YWRvIFZlbmV6b2xhbm8xCzAJBgNVBAYTAlZFMRAwDgYDVQQH
+EwdDYXJhY2FzMRkwFwYDVQQIExBEaXN0cml0byBDYXBpdGFsMTYwNAYDVQQKEy1TaXN0ZW1hIE5h
+Y2lvbmFsIGRlIENlcnRpZmljYWNpb24gRWxlY3Ryb25pY2ExQzBBBgNVBAsTOlN1cGVyaW50ZW5k
+ZW5jaWEgZGUgU2VydmljaW9zIGRlIENlcnRpZmljYWNpb24gRWxlY3Ryb25pY2ExJTAjBgkqhkiG
+9w0BCQEWFmFjcmFpekBzdXNjZXJ0ZS5nb2IudmWCAQowDgYDVR0PAQH/BAQDAgEGME0GA1UdEQRG
+MESCDnByb2NlcnQubmV0LnZloBUGBWCGXgIBoAwMClBTQy0wMDAwMDKgGwYFYIZeAgKgEgwQUklG
+LUotMzE2MzUzNzMtNzB2BgNVHR8EbzBtMEagRKBChkBodHRwOi8vd3d3LnN1c2NlcnRlLmdvYi52
+ZS9sY3IvQ0VSVElGSUNBRE8tUkFJWi1TSEEzODRDUkxERVIuY3JsMCOgIaAfhh1sZGFwOi8vYWNy
+YWl6LnN1c2NlcnRlLmdvYi52ZTA3BggrBgEFBQcBAQQrMCkwJwYIKwYBBQUHMAGGG2h0dHA6Ly9v
+Y3NwLnN1c2NlcnRlLmdvYi52ZTBBBgNVHSAEOjA4MDYGBmCGXgMBAjAsMCoGCCsGAQUFBwIBFh5o
+dHRwOi8vd3d3LnN1c2NlcnRlLmdvYi52ZS9kcGMwDQYJKoZIhvcNAQELBQADggIBACtZ6yKZu4Sq
+T96QxtGGcSOeSwORR3C7wJJg7ODU523G0+1ng3dS1fLld6c2suNUvtm7CpsR72H0xpkzmfWvADmN
+g7+mvTV+LFwxNG9s2/NkAZiqlCxB3RWGymspThbASfzXg0gTB1GEMVKIu4YXx2sviiCtxQuPcD4q
+uxtxj7mkoP3YldmvWb8lK5jpY5MvYB7Eqvh39YtsL+1+LrVPQA3uvFd359m21D+VJzog1eWuq2w1
+n8GhHVnchIHuTQfiSLaeS5UtQbHh6N5+LwUeaO6/u5BlOsju6rEYNxxik6SgMexxbJHmpHmJWhSn
+FFAFTKQAVzAswbVhltw+HoSvOULP5dAssSS830DD7X9jSr3hTxJkhpXzsOfIt+FTvZLm8wyWuevo
+5pLtp4EJFAv8lXrPj9Y0TzYS3F7RNHXGRoAvlQSMx4bEqCaJqD8Zm4G7UaRKhqsLEQ+xrmNTbSjq
+3TNWOByyrYDT13K9mmyZY+gAu0F2BbdbmRiKw7gSXFbPVgx96OLP7bx0R/vu0xdOIk9W/1DzLuY5
+poLWccret9W6aAjtmcz9opLLabid+Qqkpj5PkygqYWwHJgD/ll9ohri4zspV4KuxPX+Y1zMOWj3Y
+eMLEYC/HYvBhkdI4sPaeVdtAgAUSM84dkpvRabP/v/GSCmE1P93+hvS84Bpxs2Km
+-----END CERTIFICATE-----
+
+China Internet Network Information Center EV Certificates Root
+==============================================================
+-----BEGIN CERTIFICATE-----
+MIID9zCCAt+gAwIBAgIESJ8AATANBgkqhkiG9w0BAQUFADCBijELMAkGA1UEBhMCQ04xMjAwBgNV
+BAoMKUNoaW5hIEludGVybmV0IE5ldHdvcmsgSW5mb3JtYXRpb24gQ2VudGVyMUcwRQYDVQQDDD5D
+aGluYSBJbnRlcm5ldCBOZXR3b3JrIEluZm9ybWF0aW9uIENlbnRlciBFViBDZXJ0aWZpY2F0ZXMg
+Um9vdDAeFw0xMDA4MzEwNzExMjVaFw0zMDA4MzEwNzExMjVaMIGKMQswCQYDVQQGEwJDTjEyMDAG
+A1UECgwpQ2hpbmEgSW50ZXJuZXQgTmV0d29yayBJbmZvcm1hdGlvbiBDZW50ZXIxRzBFBgNVBAMM
+PkNoaW5hIEludGVybmV0IE5ldHdvcmsgSW5mb3JtYXRpb24gQ2VudGVyIEVWIENlcnRpZmljYXRl
+cyBSb290MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAm35z7r07eKpkQ0H1UN+U8i6y
+jUqORlTSIRLIOTJCBumD1Z9S7eVnAztUwYyZmczpwA//DdmEEbK40ctb3B75aDFk4Zv6dOtouSCV
+98YPjUesWgbdYavi7NifFy2cyjw1l1VxzUOFsUcW9SxTgHbP0wBkvUCZ3czY28Sf1hNfQYOL+Q2H
+klY0bBoQCxfVWhyXWIQ8hBouXJE0bhlffxdpxWXvayHG1VA6v2G5BY3vbzQ6sm8UY78WO5upKv23
+KzhmBsUs4qpnHkWnjQRmQvaPK++IIGmPMowUc9orhpFjIpryp9vOiYurXccUwVswah+xt54ugQEC
+7c+WXmPbqOY4twIDAQABo2MwYTAfBgNVHSMEGDAWgBR8cks5x8DbYqVPm6oYNJKiyoOCWTAPBgNV
+HRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUfHJLOcfA22KlT5uqGDSSosqD
+glkwDQYJKoZIhvcNAQEFBQADggEBACrDx0M3j92tpLIM7twUbY8opJhJywyA6vPtI2Z1fcXTIWd5
+0XPFtQO3WKwMVC/GVhMPMdoG52U7HW8228gd+f2ABsqjPWYWqJ1MFn3AlUa1UeTiH9fqBk1jjZaM
+7+czV0I664zBechNdn3e9rG3geCg+aF4RhcaVpjwTj2rHO3sOdwHSPdj/gauwqRcalsyiMXHM4Ws
+ZkJHwlgkmeHlPuV1LI5D1l08eB6olYIpUNHRFrrvwb562bTYzB5MRuF3sTGrvSrIzo9uoV1/A3U0
+5K2JRVRevq4opbs/eHnrc7MKDf2+yfdWrPa37S+bISnHOLaVxATywy39FCqQmbkHzJ8=
+-----END CERTIFICATE-----
+
+Swisscom Root CA 2
+==================
+-----BEGIN CERTIFICATE-----
+MIIF2TCCA8GgAwIBAgIQHp4o6Ejy5e/DfEoeWhhntjANBgkqhkiG9w0BAQsFADBkMQswCQYDVQQG
+EwJjaDERMA8GA1UEChMIU3dpc3Njb20xJTAjBgNVBAsTHERpZ2l0YWwgQ2VydGlmaWNhdGUgU2Vy
+dmljZXMxGzAZBgNVBAMTElN3aXNzY29tIFJvb3QgQ0EgMjAeFw0xMTA2MjQwODM4MTRaFw0zMTA2
+MjUwNzM4MTRaMGQxCzAJBgNVBAYTAmNoMREwDwYDVQQKEwhTd2lzc2NvbTElMCMGA1UECxMcRGln
+aXRhbCBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczEbMBkGA1UEAxMSU3dpc3Njb20gUm9vdCBDQSAyMIIC
+IjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAlUJOhJ1R5tMJ6HJaI2nbeHCOFvErjw0DzpPM
+LgAIe6szjPTpQOYXTKueuEcUMncy3SgM3hhLX3af+Dk7/E6J2HzFZ++r0rk0X2s682Q2zsKwzxNo
+ysjL67XiPS4h3+os1OD5cJZM/2pYmLcX5BtS5X4HAB1f2uY+lQS3aYg5oUFgJWFLlTloYhyxCwWJ
+wDaCFCE/rtuh/bxvHGCGtlOUSbkrRsVPACu/obvLP+DHVxxX6NZp+MEkUp2IVd3Chy50I9AU/SpH
+Wrumnf2U5NGKpV+GY3aFy6//SSj8gO1MedK75MDvAe5QQQg1I3ArqRa0jG6F6bYRzzHdUyYb3y1a
+SgJA/MTAtukxGggo5WDDH8SQjhBiYEQN7Aq+VRhxLKX0srwVYv8c474d2h5Xszx+zYIdkeNL6yxS
+NLCK/RJOlrDrcH+eOfdmQrGrrFLadkBXeyq96G4DsguAhYidDMfCd7Camlf0uPoTXGiTOmekl9Ab
+mbeGMktg2M7v0Ax/lZ9vh0+Hio5fCHyqW/xavqGRn1V9TrALacywlKinh/LTSlDcX3KwFnUey7QY
+Ypqwpzmqm59m2I2mbJYV4+by+PGDYmy7Velhk6M99bFXi08jsJvllGov34zflVEpYKELKeRcVVi3
+qPyZ7iVNTA6z00yPhOgpD/0QVAKFyPnlw4vP5w8CAwEAAaOBhjCBgzAOBgNVHQ8BAf8EBAMCAYYw
+HQYDVR0hBBYwFDASBgdghXQBUwIBBgdghXQBUwIBMBIGA1UdEwEB/wQIMAYBAf8CAQcwHQYDVR0O
+BBYEFE0mICKJS9PVpAqhb97iEoHF8TwuMB8GA1UdIwQYMBaAFE0mICKJS9PVpAqhb97iEoHF8Twu
+MA0GCSqGSIb3DQEBCwUAA4ICAQAyCrKkG8t9voJXiblqf/P0wS4RfbgZPnm3qKhyN2abGu2sEzsO
+v2LwnN+ee6FTSA5BesogpxcbtnjsQJHzQq0Qw1zv/2BZf82Fo4s9SBwlAjxnffUy6S8w5X2lejjQ
+82YqZh6NM4OKb3xuqFp1mrjX2lhIREeoTPpMSQpKwhI3qEAMw8jh0FcNlzKVxzqfl9NX+Ave5XLz
+o9v/tdhZsnPdTSpxsrpJ9csc1fV5yJmz/MFMdOO0vSk3FQQoHt5FRnDsr7p4DooqzgB53MBfGWcs
+a0vvaGgLQ+OswWIJ76bdZWGgr4RVSJFSHMYlkSrQwSIjYVmvRRGFHQEkNI/Ps/8XciATwoCqISxx
+OQ7Qj1zB09GOInJGTB2Wrk9xseEFKZZZ9LuedT3PDTcNYtsmjGOpI99nBjx8Oto0QuFmtEYE3saW
+mA9LSHokMnWRn6z3aOkquVVlzl1h0ydw2Df+n7mvoC5Wt6NlUe07qxS/TFED6F+KBZvuim6c779o
++sjaC+NCydAXFJy3SuCvkychVSa1ZC+N8f+mQAWFBVzKBxlcCxMoTFh/wqXvRdpg065lYZ1Tg3TC
+rvJcwhbtkj6EPnNgiLx29CzP0H1907he0ZESEOnN3col49XtmS++dYFLJPlFRpTJKSFTnCZFqhMX
+5OfNeOI5wSsSnqaeG8XmDtkx2Q==
+-----END CERTIFICATE-----
+
+Swisscom Root EV CA 2
+=====================
+-----BEGIN CERTIFICATE-----
+MIIF4DCCA8igAwIBAgIRAPL6ZOJ0Y9ON/RAdBB92ylgwDQYJKoZIhvcNAQELBQAwZzELMAkGA1UE
+BhMCY2gxETAPBgNVBAoTCFN3aXNzY29tMSUwIwYDVQQLExxEaWdpdGFsIENlcnRpZmljYXRlIFNl
+cnZpY2VzMR4wHAYDVQQDExVTd2lzc2NvbSBSb290IEVWIENBIDIwHhcNMTEwNjI0MDk0NTA4WhcN
+MzEwNjI1MDg0NTA4WjBnMQswCQYDVQQGEwJjaDERMA8GA1UEChMIU3dpc3Njb20xJTAjBgNVBAsT
+HERpZ2l0YWwgQ2VydGlmaWNhdGUgU2VydmljZXMxHjAcBgNVBAMTFVN3aXNzY29tIFJvb3QgRVYg
+Q0EgMjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMT3HS9X6lds93BdY7BxUglgRCgz
+o3pOCvrY6myLURYaVa5UJsTMRQdBTxB5f3HSek4/OE6zAMaVylvNwSqD1ycfMQ4jFrclyxy0uYAy
+Xhqdk/HoPGAsp15XGVhRXrwsVgu42O+LgrQ8uMIkqBPHoCE2G3pXKSinLr9xJZDzRINpUKTk4Rti
+GZQJo/PDvO/0vezbE53PnUgJUmfANykRHvvSEaeFGHR55E+FFOtSN+KxRdjMDUN/rhPSays/p8Li
+qG12W0OfvrSdsyaGOx9/5fLoZigWJdBLlzin5M8J0TbDC77aO0RYjb7xnglrPvMyxyuHxuxenPaH
+Za0zKcQvidm5y8kDnftslFGXEBuGCxobP/YCfnvUxVFkKJ3106yDgYjTdLRZncHrYTNaRdHLOdAG
+alNgHa/2+2m8atwBz735j9m9W8E6X47aD0upm50qKGsaCnw8qyIL5XctcfaCNYGu+HuB5ur+rPQa
+m3Rc6I8k9l2dRsQs0h4rIWqDJ2dVSqTjyDKXZpBy2uPUZC5f46Fq9mDU5zXNysRojddxyNMkM3Ox
+bPlq4SjbX8Y96L5V5jcb7STZDxmPX2MYWFCBUWVv8p9+agTnNCRxunZLWB4ZvRVgRaoMEkABnRDi
+xzgHcgplwLa7JSnaFp6LNYth7eVxV4O1PHGf40+/fh6Bn0GXAgMBAAGjgYYwgYMwDgYDVR0PAQH/
+BAQDAgGGMB0GA1UdIQQWMBQwEgYHYIV0AVMCAgYHYIV0AVMCAjASBgNVHRMBAf8ECDAGAQH/AgED
+MB0GA1UdDgQWBBRF2aWBbj2ITY1x0kbBbkUe88SAnTAfBgNVHSMEGDAWgBRF2aWBbj2ITY1x0kbB
+bkUe88SAnTANBgkqhkiG9w0BAQsFAAOCAgEAlDpzBp9SSzBc1P6xXCX5145v9Ydkn+0UjrgEjihL
+j6p7jjm02Vj2e6E1CqGdivdj5eu9OYLU43otb98TPLr+flaYC/NUn81ETm484T4VvwYmneTwkLbU
+wp4wLh/vx3rEUMfqe9pQy3omywC0Wqu1kx+AiYQElY2NfwmTv9SoqORjbdlk5LgpWgi/UOGED1V7
+XwgiG/W9mR4U9s70WBCCswo9GcG/W6uqmdjyMb3lOGbcWAXH7WMaLgqXfIeTK7KK4/HsGOV1timH
+59yLGn602MnTihdsfSlEvoqq9X46Lmgxk7lq2prg2+kupYTNHAq4Sgj5nPFhJpiTt3tm7JFe3VE/
+23MPrQRYCd0EApUKPtN236YQHoA96M2kZNEzx5LH4k5E4wnJTsJdhw4Snr8PyQUQ3nqjsTzyP6Wq
+J3mtMX0f/fwZacXduT98zca0wjAefm6S139hdlqP65VNvBFuIXxZN5nQBrz5Bm0yFqXZaajh3DyA
+HmBR3NdUIR7KYndP+tiPsys6DXhyyWhBWkdKwqPrGtcKqzwyVcgKEZzfdNbwQBUdyLmPtTbFr/gi
+uMod89a2GQ+fYWVq6nTIfI/DT11lgh/ZDYnadXL77/FHZxOzyNEZiCcmmpl5fx7kLD977vHeTYuW
+l8PVP3wbI+2ksx0WckNLIOFZfsLorSa/ovc=
+-----END CERTIFICATE-----
+
+CA Disig Root R1
+================
+-----BEGIN CERTIFICATE-----
+MIIFaTCCA1GgAwIBAgIJAMMDmu5QkG4oMA0GCSqGSIb3DQEBBQUAMFIxCzAJBgNVBAYTAlNLMRMw
+EQYDVQQHEwpCcmF0aXNsYXZhMRMwEQYDVQQKEwpEaXNpZyBhLnMuMRkwFwYDVQQDExBDQSBEaXNp
+ZyBSb290IFIxMB4XDTEyMDcxOTA5MDY1NloXDTQyMDcxOTA5MDY1NlowUjELMAkGA1UEBhMCU0sx
+EzARBgNVBAcTCkJyYXRpc2xhdmExEzARBgNVBAoTCkRpc2lnIGEucy4xGTAXBgNVBAMTEENBIERp
+c2lnIFJvb3QgUjEwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCqw3j33Jijp1pedxiy
+3QRkD2P9m5YJgNXoqqXinCaUOuiZc4yd39ffg/N4T0Dhf9Kn0uXKE5Pn7cZ3Xza1lK/oOI7bm+V8
+u8yN63Vz4STN5qctGS7Y1oprFOsIYgrY3LMATcMjfF9DCCMyEtztDK3AfQ+lekLZWnDZv6fXARz2
+m6uOt0qGeKAeVjGu74IKgEH3G8muqzIm1Cxr7X1r5OJeIgpFy4QxTaz+29FHuvlglzmxZcfe+5nk
+CiKxLU3lSCZpq+Kq8/v8kiky6bM+TR8noc2OuRf7JT7JbvN32g0S9l3HuzYQ1VTW8+DiR0jm3hTa
+YVKvJrT1cU/J19IG32PK/yHoWQbgCNWEFVP3Q+V8xaCJmGtzxmjOZd69fwX3se72V6FglcXM6pM6
+vpmumwKjrckWtc7dXpl4fho5frLABaTAgqWjR56M6ly2vGfb5ipN0gTco65F97yLnByn1tUD3AjL
+LhbKXEAz6GfDLuemROoRRRw1ZS0eRWEkG4IupZ0zXWX4Qfkuy5Q/H6MMMSRE7cderVC6xkGbrPAX
+ZcD4XW9boAo0PO7X6oifmPmvTiT6l7Jkdtqr9O3jw2Dv1fkCyC2fg69naQanMVXVz0tv/wQFx1is
+XxYb5dKj6zHbHzMVTdDypVP1y+E9Tmgt2BLdqvLmTZtJ5cUoobqwWsagtQIDAQABo0IwQDAPBgNV
+HRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUiQq0OJMa5qvum5EY+fU8PjXQ
+04IwDQYJKoZIhvcNAQEFBQADggIBADKL9p1Kyb4U5YysOMo6CdQbzoaz3evUuii+Eq5FLAR0rBNR
+xVgYZk2C2tXck8An4b58n1KeElb21Zyp9HWc+jcSjxyT7Ff+Bw+r1RL3D65hXlaASfX8MPWbTx9B
+LxyE04nH4toCdu0Jz2zBuByDHBb6lM19oMgY0sidbvW9adRtPTXoHqJPYNcHKfyyo6SdbhWSVhlM
+CrDpfNIZTUJG7L399ldb3Zh+pE3McgODWF3vkzpBemOqfDqo9ayk0d2iLbYq/J8BjuIQscTK5Gfb
+VSUZP/3oNn6z4eGBrxEWi1CXYBmCAMBrTXO40RMHPuq2MU/wQppt4hF05ZSsjYSVPCGvxdpHyN85
+YmLLW1AL14FABZyb7bq2ix4Eb5YgOe2kfSnbSM6C3NQCjR0EMVrHS/BsYVLXtFHCgWzN4funodKS
+ds+xDzdYpPJScWc/DIh4gInByLUfkmO+p3qKViwaqKactV2zY9ATIKHrkWzQjX2v3wvkF7mGnjix
+lAxYjOBVqjtjbZqJYLhkKpLGN/R+Q0O3c+gB53+XD9fyexn9GtePyfqFa3qdnom2piiZk4hA9z7N
+UaPK6u95RyG1/jLix8NRb76AdPCkwzryT+lf3xkK8jsTQ6wxpLPn6/wY1gGp8yqPNg7rtLG8t0zJ
+a7+h89n07eLw4+1knj0vllJPgFOL
+-----END CERTIFICATE-----
+
+CA Disig Root R2
+================
+-----BEGIN CERTIFICATE-----
+MIIFaTCCA1GgAwIBAgIJAJK4iNuwisFjMA0GCSqGSIb3DQEBCwUAMFIxCzAJBgNVBAYTAlNLMRMw
+EQYDVQQHEwpCcmF0aXNsYXZhMRMwEQYDVQQKEwpEaXNpZyBhLnMuMRkwFwYDVQQDExBDQSBEaXNp
+ZyBSb290IFIyMB4XDTEyMDcxOTA5MTUzMFoXDTQyMDcxOTA5MTUzMFowUjELMAkGA1UEBhMCU0sx
+EzARBgNVBAcTCkJyYXRpc2xhdmExEzARBgNVBAoTCkRpc2lnIGEucy4xGTAXBgNVBAMTEENBIERp
+c2lnIFJvb3QgUjIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCio8QACdaFXS1tFPbC
+w3OeNcJxVX6B+6tGUODBfEl45qt5WDza/3wcn9iXAng+a0EE6UG9vgMsRfYvZNSrXaNHPWSb6Wia
+xswbP7q+sos0Ai6YVRn8jG+qX9pMzk0DIaPY0jSTVpbLTAwAFjxfGs3Ix2ymrdMxp7zo5eFm1tL7
+A7RBZckQrg4FY8aAamkw/dLukO8NJ9+flXP04SXabBbeQTg06ov80egEFGEtQX6sx3dOy1FU+16S
+GBsEWmjGycT6txOgmLcRK7fWV8x8nhfRyyX+hk4kLlYMeE2eARKmK6cBZW58Yh2EhN/qwGu1pSqV
+g8NTEQxzHQuyRpDRQjrOQG6Vrf/GlK1ul4SOfW+eioANSW1z4nuSHsPzwfPrLgVv2RvPN3YEyLRa
+5Beny912H9AZdugsBbPWnDTYltxhh5EF5EQIM8HauQhl1K6yNg3ruji6DOWbnuuNZt2Zz9aJQfYE
+koopKW1rOhzndX0CcQ7zwOe9yxndnWCywmZgtrEE7snmhrmaZkCo5xHtgUUDi/ZnWejBBhG93c+A
+Ak9lQHhcR1DIm+YfgXvkRKhbhZri3lrVx/k6RGZL5DJUfORsnLMOPReisjQS1n6yqEm70XooQL6i
+Fh/f5DcfEXP7kAplQ6INfPgGAVUzfbANuPT1rqVCV3w2EYx7XsQDnYx5nQIDAQABo0IwQDAPBgNV
+HRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUtZn4r7CU9eMg1gqtzk5WpC5u
+Qu0wDQYJKoZIhvcNAQELBQADggIBACYGXnDnZTPIgm7ZnBc6G3pmsgH2eDtpXi/q/075KMOYKmFM
+tCQSin1tERT3nLXK5ryeJ45MGcipvXrA1zYObYVybqjGom32+nNjf7xueQgcnYqfGopTpti72TVV
+sRHFqQOzVju5hJMiXn7B9hJSi+osZ7z+Nkz1uM/Rs0mSO9MpDpkblvdhuDvEK7Z4bLQjb/D907Je
+dR+Zlais9trhxTF7+9FGs9K8Z7RiVLoJ92Owk6Ka+elSLotgEqv89WBW7xBci8QaQtyDW2QOy7W8
+1k/BfDxujRNt+3vrMNDcTa/F1balTFtxyegxvug4BkihGuLq0t4SOVga/4AOgnXmt8kHbA7v/zjx
+mHHEt38OFdAlab0inSvtBfZGR6ztwPDUO+Ls7pZbkBNOHlY667DvlruWIxG68kOGdGSVyCh13x01
+utI3gzhTODY7z2zp+WsO0PsE6E9312UBeIYMej4hYvF/Y3EMyZ9E26gnonW+boE+18DrG5gPcFw0
+sorMwIUY6256s/daoQe/qUKS82Ail+QUoQebTnbAjn39pCXHR+3/H3OszMOl6W8KjptlwlCFtaOg
+UxLMVYdh84GuEEZhvUQhuMI9dM9+JDX6HAcOmz0iyu8xL4ysEr3vQCj8KWefshNPZiTEUxnpHikV
+7+ZtsH8tZ/3zbBt1RqPlShfppNcL
+-----END CERTIFICATE-----
+
+ACCVRAIZ1
+=========
+-----BEGIN CERTIFICATE-----
+MIIH0zCCBbugAwIBAgIIXsO3pkN/pOAwDQYJKoZIhvcNAQEFBQAwQjESMBAGA1UEAwwJQUNDVlJB
+SVoxMRAwDgYDVQQLDAdQS0lBQ0NWMQ0wCwYDVQQKDARBQ0NWMQswCQYDVQQGEwJFUzAeFw0xMTA1
+MDUwOTM3MzdaFw0zMDEyMzEwOTM3MzdaMEIxEjAQBgNVBAMMCUFDQ1ZSQUlaMTEQMA4GA1UECwwH
+UEtJQUNDVjENMAsGA1UECgwEQUNDVjELMAkGA1UEBhMCRVMwggIiMA0GCSqGSIb3DQEBAQUAA4IC
+DwAwggIKAoICAQCbqau/YUqXry+XZpp0X9DZlv3P4uRm7x8fRzPCRKPfmt4ftVTdFXxpNRFvu8gM
+jmoYHtiP2Ra8EEg2XPBjs5BaXCQ316PWywlxufEBcoSwfdtNgM3802/J+Nq2DoLSRYWoG2ioPej0
+RGy9ocLLA76MPhMAhN9KSMDjIgro6TenGEyxCQ0jVn8ETdkXhBilyNpAlHPrzg5XPAOBOp0KoVdD
+aaxXbXmQeOW1tDvYvEyNKKGno6e6Ak4l0Squ7a4DIrhrIA8wKFSVf+DuzgpmndFALW4ir50awQUZ
+0m/A8p/4e7MCQvtQqR0tkw8jq8bBD5L/0KIV9VMJcRz/RROE5iZe+OCIHAr8Fraocwa48GOEAqDG
+WuzndN9wrqODJerWx5eHk6fGioozl2A3ED6XPm4pFdahD9GILBKfb6qkxkLrQaLjlUPTAYVtjrs7
+8yM2x/474KElB0iryYl0/wiPgL/AlmXz7uxLaL2diMMxs0Dx6M/2OLuc5NF/1OVYm3z61PMOm3WR
+5LpSLhl+0fXNWhn8ugb2+1KoS5kE3fj5tItQo05iifCHJPqDQsGH+tUtKSpacXpkatcnYGMN285J
+9Y0fkIkyF/hzQ7jSWpOGYdbhdQrqeWZ2iE9x6wQl1gpaepPluUsXQA+xtrn13k/c4LOsOxFwYIRK
+Q26ZIMApcQrAZQIDAQABo4ICyzCCAscwfQYIKwYBBQUHAQEEcTBvMEwGCCsGAQUFBzAChkBodHRw
+Oi8vd3d3LmFjY3YuZXMvZmlsZWFkbWluL0FyY2hpdm9zL2NlcnRpZmljYWRvcy9yYWl6YWNjdjEu
+Y3J0MB8GCCsGAQUFBzABhhNodHRwOi8vb2NzcC5hY2N2LmVzMB0GA1UdDgQWBBTSh7Tj3zcnk1X2
+VuqB5TbMjB4/vTAPBgNVHRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFNKHtOPfNyeTVfZW6oHlNsyM
+Hj+9MIIBcwYDVR0gBIIBajCCAWYwggFiBgRVHSAAMIIBWDCCASIGCCsGAQUFBwICMIIBFB6CARAA
+QQB1AHQAbwByAGkAZABhAGQAIABkAGUAIABDAGUAcgB0AGkAZgBpAGMAYQBjAGkA8wBuACAAUgBh
+AO0AegAgAGQAZQAgAGwAYQAgAEEAQwBDAFYAIAAoAEEAZwBlAG4AYwBpAGEAIABkAGUAIABUAGUA
+YwBuAG8AbABvAGcA7QBhACAAeQAgAEMAZQByAHQAaQBmAGkAYwBhAGMAaQDzAG4AIABFAGwAZQBj
+AHQAcgDzAG4AaQBjAGEALAAgAEMASQBGACAAUQA0ADYAMAAxADEANQA2AEUAKQAuACAAQwBQAFMA
+IABlAG4AIABoAHQAdABwADoALwAvAHcAdwB3AC4AYQBjAGMAdgAuAGUAczAwBggrBgEFBQcCARYk
+aHR0cDovL3d3dy5hY2N2LmVzL2xlZ2lzbGFjaW9uX2MuaHRtMFUGA1UdHwROMEwwSqBIoEaGRGh0
+dHA6Ly93d3cuYWNjdi5lcy9maWxlYWRtaW4vQXJjaGl2b3MvY2VydGlmaWNhZG9zL3JhaXphY2N2
+MV9kZXIuY3JsMA4GA1UdDwEB/wQEAwIBBjAXBgNVHREEEDAOgQxhY2N2QGFjY3YuZXMwDQYJKoZI
+hvcNAQEFBQADggIBAJcxAp/n/UNnSEQU5CmH7UwoZtCPNdpNYbdKl02125DgBS4OxnnQ8pdpD70E
+R9m+27Up2pvZrqmZ1dM8MJP1jaGo/AaNRPTKFpV8M9xii6g3+CfYCS0b78gUJyCpZET/LtZ1qmxN
+YEAZSUNUY9rizLpm5U9EelvZaoErQNV/+QEnWCzI7UiRfD+mAM/EKXMRNt6GGT6d7hmKG9Ww7Y49
+nCrADdg9ZuM8Db3VlFzi4qc1GwQA9j9ajepDvV+JHanBsMyZ4k0ACtrJJ1vnE5Bc5PUzolVt3OAJ
+TS+xJlsndQAJxGJ3KQhfnlmstn6tn1QwIgPBHnFk/vk4CpYY3QIUrCPLBhwepH2NDd4nQeit2hW3
+sCPdK6jT2iWH7ehVRE2I9DZ+hJp4rPcOVkkO1jMl1oRQQmwgEh0q1b688nCBpHBgvgW1m54ERL5h
+I6zppSSMEYCUWqKiuUnSwdzRp+0xESyeGabu4VXhwOrPDYTkF7eifKXeVSUG7szAh1xA2syVP1Xg
+Nce4hL60Xc16gwFy7ofmXx2utYXGJt/mwZrpHgJHnyqobalbz+xFd3+YJ5oyXSrjhO7FmGYvliAd
+3djDJ9ew+f7Zfc3Qn48LFFhRny+Lwzgt3uiP1o2HpPVWQxaZLPSkVrQ0uGE3ycJYgBugl6H8WY3p
+EfbRD0tVNEYqi4Y7
+-----END CERTIFICATE-----
+
+TWCA Global Root CA
+===================
+-----BEGIN CERTIFICATE-----
+MIIFQTCCAymgAwIBAgICDL4wDQYJKoZIhvcNAQELBQAwUTELMAkGA1UEBhMCVFcxEjAQBgNVBAoT
+CVRBSVdBTi1DQTEQMA4GA1UECxMHUm9vdCBDQTEcMBoGA1UEAxMTVFdDQSBHbG9iYWwgUm9vdCBD
+QTAeFw0xMjA2MjcwNjI4MzNaFw0zMDEyMzExNTU5NTlaMFExCzAJBgNVBAYTAlRXMRIwEAYDVQQK
+EwlUQUlXQU4tQ0ExEDAOBgNVBAsTB1Jvb3QgQ0ExHDAaBgNVBAMTE1RXQ0EgR2xvYmFsIFJvb3Qg
+Q0EwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCwBdvI64zEbooh745NnHEKH1Jw7W2C
+nJfF10xORUnLQEK1EjRsGcJ0pDFfhQKX7EMzClPSnIyOt7h52yvVavKOZsTuKwEHktSz0ALfUPZV
+r2YOy+BHYC8rMjk1Ujoog/h7FsYYuGLWRyWRzvAZEk2tY/XTP3VfKfChMBwqoJimFb3u/Rk28OKR
+Q4/6ytYQJ0lM793B8YVwm8rqqFpD/G2Gb3PpN0Wp8DbHzIh1HrtsBv+baz4X7GGqcXzGHaL3SekV
+tTzWoWH1EfcFbx39Eb7QMAfCKbAJTibc46KokWofwpFFiFzlmLhxpRUZyXx1EcxwdE8tmx2RRP1W
+KKD+u4ZqyPpcC1jcxkt2yKsi2XMPpfRaAok/T54igu6idFMqPVMnaR1sjjIsZAAmY2E2TqNGtz99
+sy2sbZCilaLOz9qC5wc0GZbpuCGqKX6mOL6OKUohZnkfs8O1CWfe1tQHRvMq2uYiN2DLgbYPoA/p
+yJV/v1WRBXrPPRXAb94JlAGD1zQbzECl8LibZ9WYkTunhHiVJqRaCPgrdLQABDzfuBSO6N+pjWxn
+kjMdwLfS7JLIvgm/LCkFbwJrnu+8vyq8W8BQj0FwcYeyTbcEqYSjMq+u7msXi7Kx/mzhkIyIqJdI
+zshNy/MGz19qCkKxHh53L46g5pIOBvwFItIm4TFRfTLcDwIDAQABoyMwITAOBgNVHQ8BAf8EBAMC
+AQYwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAgEAXzSBdu+WHdXltdkCY4QWwa6g
+cFGn90xHNcgL1yg9iXHZqjNB6hQbbCEAwGxCGX6faVsgQt+i0trEfJdLjbDorMjupWkEmQqSpqsn
+LhpNgb+E1HAerUf+/UqdM+DyucRFCCEK2mlpc3INvjT+lIutwx4116KD7+U4x6WFH6vPNOw/KP4M
+8VeGTslV9xzU2KV9Bnpv1d8Q34FOIWWxtuEXeZVFBs5fzNxGiWNoRI2T9GRwoD2dKAXDOXC4Ynsg
+/eTb6QihuJ49CcdP+yz4k3ZB3lLg4VfSnQO8d57+nile98FRYB/e2guyLXW3Q0iT5/Z5xoRdgFlg
+lPx4mI88k1HtQJAH32RjJMtOcQWh15QaiDLxInQirqWm2BJpTGCjAu4r7NRjkgtevi92a6O2JryP
+A9gK8kxkRr05YuWW6zRjESjMlfGt7+/cgFhI6Uu46mWs6fyAtbXIRfmswZ/ZuepiiI7E8UuDEq3m
+i4TWnsLrgxifarsbJGAzcMzs9zLzXNl5fe+epP7JI8Mk7hWSsT2RTyaGvWZzJBPqpK5jwa19hAM8
+EHiGG3njxPPyBJUgriOCxLM6AGK/5jYk4Ve6xx6QddVfP5VhK8E7zeWzaGHQRiapIVJpLesux+t3
+zqY6tQMzT3bR51xUAV3LePTJDL/PEo4XLSNolOer/qmyKwbQBM0=
+-----END CERTIFICATE-----
+
+TeliaSonera Root CA v1
+======================
+-----BEGIN CERTIFICATE-----
+MIIFODCCAyCgAwIBAgIRAJW+FqD3LkbxezmCcvqLzZYwDQYJKoZIhvcNAQEFBQAwNzEUMBIGA1UE
+CgwLVGVsaWFTb25lcmExHzAdBgNVBAMMFlRlbGlhU29uZXJhIFJvb3QgQ0EgdjEwHhcNMDcxMDE4
+MTIwMDUwWhcNMzIxMDE4MTIwMDUwWjA3MRQwEgYDVQQKDAtUZWxpYVNvbmVyYTEfMB0GA1UEAwwW
+VGVsaWFTb25lcmEgUm9vdCBDQSB2MTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMK+
+6yfwIaPzaSZVfp3FVRaRXP3vIb9TgHot0pGMYzHw7CTww6XScnwQbfQ3t+XmfHnqjLWCi65ItqwA
+3GV17CpNX8GH9SBlK4GoRz6JI5UwFpB/6FcHSOcZrr9FZ7E3GwYq/t75rH2D+1665I+XZ75Ljo1k
+B1c4VWk0Nj0TSO9P4tNmHqTPGrdeNjPUtAa9GAH9d4RQAEX1jF3oI7x+/jXh7VB7qTCNGdMJjmhn
+Xb88lxhTuylixcpecsHHltTbLaC0H2kD7OriUPEMPPCs81Mt8Bz17Ww5OXOAFshSsCPN4D7c3TxH
+oLs1iuKYaIu+5b9y7tL6pe0S7fyYGKkmdtwoSxAgHNN/Fnct7W+A90m7UwW7XWjH1Mh1Fj+JWov3
+F0fUTPHSiXk+TT2YqGHeOh7S+F4D4MHJHIzTjU3TlTazN19jY5szFPAtJmtTfImMMsJu7D0hADnJ
+oWjiUIMusDor8zagrC/kb2HCUQk5PotTubtn2txTuXZZNp1D5SDgPTJghSJRt8czu90VL6R4pgd7
+gUY2BIbdeTXHlSw7sKMXNeVzH7RcWe/a6hBle3rQf5+ztCo3O3CLm1u5K7fsslESl1MpWtTwEhDc
+TwK7EpIvYtQ/aUN8Ddb8WHUBiJ1YFkveupD/RwGJBmr2X7KQarMCpgKIv7NHfirZ1fpoeDVNAgMB
+AAGjPzA9MA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0PBAQDAgEGMB0GA1UdDgQWBBTwj1k4ALP1j5qW
+DNXr+nuqF+gTEjANBgkqhkiG9w0BAQUFAAOCAgEAvuRcYk4k9AwI//DTDGjkk0kiP0Qnb7tt3oNm
+zqjMDfz1mgbldxSR651Be5kqhOX//CHBXfDkH1e3damhXwIm/9fH907eT/j3HEbAek9ALCI18Bmx
+0GtnLLCo4MBANzX2hFxc469CeP6nyQ1Q6g2EdvZR74NTxnr/DlZJLo961gzmJ1TjTQpgcmLNkQfW
+pb/ImWvtxBnmq0wROMVvMeJuScg/doAmAyYp4Db29iBT4xdwNBedY2gea+zDTYa4EzAvXUYNR0PV
+G6pZDrlcjQZIrXSHX8f8MVRBE+LHIQ6e4B4N4cB7Q4WQxYpYxmUKeFfyxiMPAdkgS94P+5KFdSpc
+c41teyWRyu5FrgZLAMzTsVlQ2jqIOylDRl6XK1TOU2+NSueW+r9xDkKLfP0ooNBIytrEgUy7onOT
+JsjrDNYmiLbAJM+7vVvrdX3pCI6GMyx5dwlppYn8s3CQh3aP0yK7Qs69cwsgJirQmz1wHiRszYd2
+qReWt88NkvuOGKmYSdGe/mBEciG5Ge3C9THxOUiIkCR1VBatzvT4aRRkOfujuLpwQMcnHL/EVlP6
+Y2XQ8xwOFvVrhlhNGNTkDY6lnVuR3HYkUD/GKvvZt5y11ubQ2egZixVxSK236thZiNSQvxaz2ems
+WWFUyBy6ysHK4bkgTI86k4mloMy/0/Z1pHWWbVY=
+-----END CERTIFICATE-----
+
+E-Tugra Certification Authority
+===============================
+-----BEGIN CERTIFICATE-----
+MIIGSzCCBDOgAwIBAgIIamg+nFGby1MwDQYJKoZIhvcNAQELBQAwgbIxCzAJBgNVBAYTAlRSMQ8w
+DQYDVQQHDAZBbmthcmExQDA+BgNVBAoMN0UtVHXEn3JhIEVCRyBCaWxpxZ9pbSBUZWtub2xvamls
+ZXJpIHZlIEhpem1ldGxlcmkgQS7Fni4xJjAkBgNVBAsMHUUtVHVncmEgU2VydGlmaWthc3lvbiBN
+ZXJrZXppMSgwJgYDVQQDDB9FLVR1Z3JhIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTEzMDMw
+NTEyMDk0OFoXDTIzMDMwMzEyMDk0OFowgbIxCzAJBgNVBAYTAlRSMQ8wDQYDVQQHDAZBbmthcmEx
+QDA+BgNVBAoMN0UtVHXEn3JhIEVCRyBCaWxpxZ9pbSBUZWtub2xvamlsZXJpIHZlIEhpem1ldGxl
+cmkgQS7Fni4xJjAkBgNVBAsMHUUtVHVncmEgU2VydGlmaWthc3lvbiBNZXJrZXppMSgwJgYDVQQD
+DB9FLVR1Z3JhIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIICIjANBgkqhkiG9w0BAQEFAAOCAg8A
+MIICCgKCAgEA4vU/kwVRHoViVF56C/UYB4Oufq9899SKa6VjQzm5S/fDxmSJPZQuVIBSOTkHS0vd
+hQd2h8y/L5VMzH2nPbxHD5hw+IyFHnSOkm0bQNGZDbt1bsipa5rAhDGvykPL6ys06I+XawGb1Q5K
+CKpbknSFQ9OArqGIW66z6l7LFpp3RMih9lRozt6Plyu6W0ACDGQXwLWTzeHxE2bODHnv0ZEoq1+g
+ElIwcxmOj+GMB6LDu0rw6h8VqO4lzKRG+Bsi77MOQ7osJLjFLFzUHPhdZL3Dk14opz8n8Y4e0ypQ
+BaNV2cvnOVPAmJ6MVGKLJrD3fY185MaeZkJVgkfnsliNZvcHfC425lAcP9tDJMW/hkd5s3kc91r0
+E+xs+D/iWR+V7kI+ua2oMoVJl0b+SzGPWsutdEcf6ZG33ygEIqDUD13ieU/qbIWGvaimzuT6w+Gz
+rt48Ue7LE3wBf4QOXVGUnhMMti6lTPk5cDZvlsouDERVxcr6XQKj39ZkjFqzAQqptQpHF//vkUAq
+jqFGOjGY5RH8zLtJVor8udBhmm9lbObDyz51Sf6Pp+KJxWfXnUYTTjF2OySznhFlhqt/7x3U+Lzn
+rFpct1pHXFXOVbQicVtbC/DP3KBhZOqp12gKY6fgDT+gr9Oq0n7vUaDmUStVkhUXU8u3Zg5mTPj5
+dUyQ5xJwx0UCAwEAAaNjMGEwHQYDVR0OBBYEFC7j27JJ0JxUeVz6Jyr+zE7S6E5UMA8GA1UdEwEB
+/wQFMAMBAf8wHwYDVR0jBBgwFoAULuPbsknQnFR5XPonKv7MTtLoTlQwDgYDVR0PAQH/BAQDAgEG
+MA0GCSqGSIb3DQEBCwUAA4ICAQAFNzr0TbdF4kV1JI+2d1LoHNgQk2Xz8lkGpD4eKexd0dCrfOAK
+kEh47U6YA5n+KGCRHTAduGN8qOY1tfrTYXbm1gdLymmasoR6d5NFFxWfJNCYExL/u6Au/U5Mh/jO
+XKqYGwXgAEZKgoClM4so3O0409/lPun++1ndYYRP0lSWE2ETPo+Aab6TR7U1Q9Jauz1c77NCR807
+VRMGsAnb/WP2OogKmW9+4c4bU2pEZiNRCHu8W1Ki/QY3OEBhj0qWuJA3+GbHeJAAFS6LrVE1Uweo
+a2iu+U48BybNCAVwzDk/dr2l02cmAYamU9JgO3xDf1WKvJUawSg5TB9D0pH0clmKuVb8P7Sd2nCc
+dlqMQ1DujjByTd//SffGqWfZbawCEeI6FiWnWAjLb1NBnEg4R2gz0dfHj9R0IdTDBZB6/86WiLEV
+KV0jq9BgoRJP3vQXzTLlyb/IQ639Lo7xr+L0mPoSHyDYwKcMhcWQ9DstliaxLL5Mq+ux0orJ23gT
+Dx4JnW2PAJ8C2sH6H3p6CcRK5ogql5+Ji/03X186zjhZhkuvcQu02PJwT58yE+Owp1fl2tpDy4Q0
+8ijE6m30Ku/Ba3ba+367hTzSU8JNvnHhRdH9I2cNE3X7z2VnIp2usAnRCf8dNL/+I5c30jn6PQ0G
+C7TbO6Orb1wdtn7os4I07QZcJA==
+-----END CERTIFICATE-----
+
+T-TeleSec GlobalRoot Class 2
+============================
+-----BEGIN CERTIFICATE-----
+MIIDwzCCAqugAwIBAgIBATANBgkqhkiG9w0BAQsFADCBgjELMAkGA1UEBhMCREUxKzApBgNVBAoM
+IlQtU3lzdGVtcyBFbnRlcnByaXNlIFNlcnZpY2VzIEdtYkgxHzAdBgNVBAsMFlQtU3lzdGVtcyBU
+cnVzdCBDZW50ZXIxJTAjBgNVBAMMHFQtVGVsZVNlYyBHbG9iYWxSb290IENsYXNzIDIwHhcNMDgx
+MDAxMTA0MDE0WhcNMzMxMDAxMjM1OTU5WjCBgjELMAkGA1UEBhMCREUxKzApBgNVBAoMIlQtU3lz
+dGVtcyBFbnRlcnByaXNlIFNlcnZpY2VzIEdtYkgxHzAdBgNVBAsMFlQtU3lzdGVtcyBUcnVzdCBD
+ZW50ZXIxJTAjBgNVBAMMHFQtVGVsZVNlYyBHbG9iYWxSb290IENsYXNzIDIwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQCqX9obX+hzkeXaXPSi5kfl82hVYAUdAqSzm1nzHoqvNK38DcLZ
+SBnuaY/JIPwhqgcZ7bBcrGXHX+0CfHt8LRvWurmAwhiCFoT6ZrAIxlQjgeTNuUk/9k9uN0goOA/F
+vudocP05l03Sx5iRUKrERLMjfTlH6VJi1hKTXrcxlkIF+3anHqP1wvzpesVsqXFP6st4vGCvx970
+2cu+fjOlbpSD8DT6IavqjnKgP6TeMFvvhk1qlVtDRKgQFRzlAVfFmPHmBiiRqiDFt1MmUUOyCxGV
+WOHAD3bZwI18gfNycJ5v/hqO2V81xrJvNHy+SE/iWjnX2J14np+GPgNeGYtEotXHAgMBAAGjQjBA
+MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBS/WSA2AHmgoCJrjNXy
+YdK4LMuCSjANBgkqhkiG9w0BAQsFAAOCAQEAMQOiYQsfdOhyNsZt+U2e+iKo4YFWz827n+qrkRk4
+r6p8FU3ztqONpfSO9kSpp+ghla0+AGIWiPACuvxhI+YzmzB6azZie60EI4RYZeLbK4rnJVM3YlNf
+vNoBYimipidx5joifsFvHZVwIEoHNN/q/xWA5brXethbdXwFeilHfkCoMRN3zUA7tFFHei4R40cR
+3p1m0IvVVGb6g1XqfMIpiRvpb7PO4gWEyS8+eIVibslfwXhjdFjASBgMmTnrpMwatXlajRWc2BQN
+9noHV8cigwUtPJslJj0Ys6lDfMjIq2SPDqO/nBudMNva0Bkuqjzx+zOAduTNrRlPBSeOE6Fuwg==
+-----END CERTIFICATE-----
+
+Atos TrustedRoot 2011
+=====================
+-----BEGIN CERTIFICATE-----
+MIIDdzCCAl+gAwIBAgIIXDPLYixfszIwDQYJKoZIhvcNAQELBQAwPDEeMBwGA1UEAwwVQXRvcyBU
+cnVzdGVkUm9vdCAyMDExMQ0wCwYDVQQKDARBdG9zMQswCQYDVQQGEwJERTAeFw0xMTA3MDcxNDU4
+MzBaFw0zMDEyMzEyMzU5NTlaMDwxHjAcBgNVBAMMFUF0b3MgVHJ1c3RlZFJvb3QgMjAxMTENMAsG
+A1UECgwEQXRvczELMAkGA1UEBhMCREUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCV
+hTuXbyo7LjvPpvMpNb7PGKw+qtn4TaA+Gke5vJrf8v7MPkfoepbCJI419KkM/IL9bcFyYie96mvr
+54rMVD6QUM+A1JX76LWC1BTFtqlVJVfbsVD2sGBkWXppzwO3bw2+yj5vdHLqqjAqc2K+SZFhyBH+
+DgMq92og3AIVDV4VavzjgsG1xZ1kCWyjWZgHJ8cblithdHFsQ/H3NYkQ4J7sVaE3IqKHBAUsR320
+HLliKWYoyrfhk/WklAOZuXCFteZI6o1Q/NnezG8HDt0Lcp2AMBYHlT8oDv3FdU9T1nSatCQujgKR
+z3bFmx5VdJx4IbHwLfELn8LVlhgf8FQieowHAgMBAAGjfTB7MB0GA1UdDgQWBBSnpQaxLKYJYO7R
+l+lwrrw7GWzbITAPBgNVHRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFKelBrEspglg7tGX6XCuvDsZ
+bNshMBgGA1UdIAQRMA8wDQYLKwYBBAGwLQMEAQEwDgYDVR0PAQH/BAQDAgGGMA0GCSqGSIb3DQEB
+CwUAA4IBAQAmdzTblEiGKkGdLD4GkGDEjKwLVLgfuXvTBznk+j57sj1O7Z8jvZfza1zv7v1Apt+h
+k6EKhqzvINB5Ab149xnYJDE0BAGmuhWawyfc2E8PzBhj/5kPDpFrdRbhIfzYJsdHt6bPWHJxfrrh
+TZVHO8mvbaG0weyJ9rQPOLXiZNwlz6bb65pcmaHFCN795trV1lpFDMS3wrUU77QR/w4VtfX128a9
+61qn8FYiqTxlVMYVqL2Gns2Dlmh6cYGJ4Qvh6hEbaAjMaZ7snkGeRDImeuKHCnE96+RapNLbxc3G
+3mB/ufNPRJLvKrcYPqcZ2Qt9sTdBQrC6YB3y/gkRsPCHe6ed
+-----END CERTIFICATE-----
+
+QuoVadis Root CA 1 G3
+=====================
+-----BEGIN CERTIFICATE-----
+MIIFYDCCA0igAwIBAgIUeFhfLq0sGUvjNwc1NBMotZbUZZMwDQYJKoZIhvcNAQELBQAwSDELMAkG
+A1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHjAcBgNVBAMTFVF1b1ZhZGlzIFJv
+b3QgQ0EgMSBHMzAeFw0xMjAxMTIxNzI3NDRaFw00MjAxMTIxNzI3NDRaMEgxCzAJBgNVBAYTAkJN
+MRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMR4wHAYDVQQDExVRdW9WYWRpcyBSb290IENBIDEg
+RzMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCgvlAQjunybEC0BJyFuTHK3C3kEakE
+PBtVwedYMB0ktMPvhd6MLOHBPd+C5k+tR4ds7FtJwUrVu4/sh6x/gpqG7D0DmVIB0jWerNrwU8lm
+PNSsAgHaJNM7qAJGr6Qc4/hzWHa39g6QDbXwz8z6+cZM5cOGMAqNF34168Xfuw6cwI2H44g4hWf6
+Pser4BOcBRiYz5P1sZK0/CPTz9XEJ0ngnjybCKOLXSoh4Pw5qlPafX7PGglTvF0FBM+hSo+LdoIN
+ofjSxxR3W5A2B4GbPgb6Ul5jxaYA/qXpUhtStZI5cgMJYr2wYBZupt0lwgNm3fME0UDiTouG9G/l
+g6AnhF4EwfWQvTA9xO+oabw4m6SkltFi2mnAAZauy8RRNOoMqv8hjlmPSlzkYZqn0ukqeI1RPToV
+7qJZjqlc3sX5kCLliEVx3ZGZbHqfPT2YfF72vhZooF6uCyP8Wg+qInYtyaEQHeTTRCOQiJ/GKubX
+9ZqzWB4vMIkIG1SitZgj7Ah3HJVdYdHLiZxfokqRmu8hqkkWCKi9YSgxyXSthfbZxbGL0eUQMk1f
+iyA6PEkfM4VZDdvLCXVDaXP7a3F98N/ETH3Goy7IlXnLc6KOTk0k+17kBL5yG6YnLUlamXrXXAkg
+t3+UuU/xDRxeiEIbEbfnkduebPRq34wGmAOtzCjvpUfzUwIDAQABo0IwQDAPBgNVHRMBAf8EBTAD
+AQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUo5fW816iEOGrRZ88F2Q87gFwnMwwDQYJKoZI
+hvcNAQELBQADggIBABj6W3X8PnrHX3fHyt/PX8MSxEBd1DKquGrX1RUVRpgjpeaQWxiZTOOtQqOC
+MTaIzen7xASWSIsBx40Bz1szBpZGZnQdT+3Btrm0DWHMY37XLneMlhwqI2hrhVd2cDMT/uFPpiN3
+GPoajOi9ZcnPP/TJF9zrx7zABC4tRi9pZsMbj/7sPtPKlL92CiUNqXsCHKnQO18LwIE6PWThv6ct
+Tr1NxNgpxiIY0MWscgKCP6o6ojoilzHdCGPDdRS5YCgtW2jgFqlmgiNR9etT2DGbe+m3nUvriBbP
++V04ikkwj+3x6xn0dxoxGE1nVGwvb2X52z3sIexe9PSLymBlVNFxZPT5pqOBMzYzcfCkeF9OrYMh
+3jRJjehZrJ3ydlo28hP0r+AJx2EqbPfgna67hkooby7utHnNkDPDs3b69fBsnQGQ+p6Q9pxyz0fa
+wx/kNSBT8lTR32GDpgLiJTjehTItXnOQUl1CxM49S+H5GYQd1aJQzEH7QRTDvdbJWqNjZgKAvQU6
+O0ec7AAmTPWIUb+oI38YB7AL7YsmoWTTYUrrXJ/es69nA7Mf3W1daWhpq1467HxpvMc7hU6eFbm0
+FU/DlXpY18ls6Wy58yljXrQs8C097Vpl4KlbQMJImYFtnh8GKjwStIsPm6Ik8KaN1nrgS7ZklmOV
+hMJKzRwuJIczYOXD
+-----END CERTIFICATE-----
+
+QuoVadis Root CA 2 G3
+=====================
+-----BEGIN CERTIFICATE-----
+MIIFYDCCA0igAwIBAgIURFc0JFuBiZs18s64KztbpybwdSgwDQYJKoZIhvcNAQELBQAwSDELMAkG
+A1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHjAcBgNVBAMTFVF1b1ZhZGlzIFJv
+b3QgQ0EgMiBHMzAeFw0xMjAxMTIxODU5MzJaFw00MjAxMTIxODU5MzJaMEgxCzAJBgNVBAYTAkJN
+MRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMR4wHAYDVQQDExVRdW9WYWRpcyBSb290IENBIDIg
+RzMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQChriWyARjcV4g/Ruv5r+LrI3HimtFh
+ZiFfqq8nUeVuGxbULX1QsFN3vXg6YOJkApt8hpvWGo6t/x8Vf9WVHhLL5hSEBMHfNrMWn4rjyduY
+NM7YMxcoRvynyfDStNVNCXJJ+fKH46nafaF9a7I6JaltUkSs+L5u+9ymc5GQYaYDFCDy54ejiK2t
+oIz/pgslUiXnFgHVy7g1gQyjO/Dh4fxaXc6AcW34Sas+O7q414AB+6XrW7PFXmAqMaCvN+ggOp+o
+MiwMzAkd056OXbxMmO7FGmh77FOm6RQ1o9/NgJ8MSPsc9PG/Srj61YxxSscfrf5BmrODXfKEVu+l
+V0POKa2Mq1W/xPtbAd0jIaFYAI7D0GoT7RPjEiuA3GfmlbLNHiJuKvhB1PLKFAeNilUSxmn1uIZo
+L1NesNKqIcGY5jDjZ1XHm26sGahVpkUG0CM62+tlXSoREfA7T8pt9DTEceT/AFr2XK4jYIVz8eQQ
+sSWu1ZK7E8EM4DnatDlXtas1qnIhO4M15zHfeiFuuDIIfR0ykRVKYnLP43ehvNURG3YBZwjgQQvD
+6xVu+KQZ2aKrr+InUlYrAoosFCT5v0ICvybIxo/gbjh9Uy3l7ZizlWNof/k19N+IxWA1ksB8aRxh
+lRbQ694Lrz4EEEVlWFA4r0jyWbYW8jwNkALGcC4BrTwV1wIDAQABo0IwQDAPBgNVHRMBAf8EBTAD
+AQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU7edvdlq/YOxJW8ald7tyFnGbxD0wDQYJKoZI
+hvcNAQELBQADggIBAJHfgD9DCX5xwvfrs4iP4VGyvD11+ShdyLyZm3tdquXK4Qr36LLTn91nMX66
+AarHakE7kNQIXLJgapDwyM4DYvmL7ftuKtwGTTwpD4kWilhMSA/ohGHqPHKmd+RCroijQ1h5fq7K
+pVMNqT1wvSAZYaRsOPxDMuHBR//47PERIjKWnML2W2mWeyAMQ0GaW/ZZGYjeVYg3UQt4XAoeo0L9
+x52ID8DyeAIkVJOviYeIyUqAHerQbj5hLja7NQ4nlv1mNDthcnPxFlxHBlRJAHpYErAK74X9sbgz
+dWqTHBLmYF5vHX/JHyPLhGGfHoJE+V+tYlUkmlKY7VHnoX6XOuYvHxHaU4AshZ6rNRDbIl9qxV6X
+U/IyAgkwo1jwDQHVcsaxfGl7w/U2Rcxhbl5MlMVerugOXou/983g7aEOGzPuVBj+D77vfoRrQ+Nw
+mNtddbINWQeFFSM51vHfqSYP1kjHs6Yi9TM3WpVHn3u6GBVv/9YUZINJ0gpnIdsPNWNgKCLjsZWD
+zYWm3S8P52dSbrsvhXz1SnPnxT7AvSESBT/8twNJAlvIJebiVDj1eYeMHVOyToV7BjjHLPj4sHKN
+JeV3UvQDHEimUF+IIDBu8oJDqz2XhOdT+yHBTw8imoa4WSr2Rz0ZiC3oheGe7IUIarFsNMkd7Egr
+O3jtZsSOeWmD3n+M
+-----END CERTIFICATE-----
+
+QuoVadis Root CA 3 G3
+=====================
+-----BEGIN CERTIFICATE-----
+MIIFYDCCA0igAwIBAgIULvWbAiin23r/1aOp7r0DoM8Sah0wDQYJKoZIhvcNAQELBQAwSDELMAkG
+A1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHjAcBgNVBAMTFVF1b1ZhZGlzIFJv
+b3QgQ0EgMyBHMzAeFw0xMjAxMTIyMDI2MzJaFw00MjAxMTIyMDI2MzJaMEgxCzAJBgNVBAYTAkJN
+MRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMR4wHAYDVQQDExVRdW9WYWRpcyBSb290IENBIDMg
+RzMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCzyw4QZ47qFJenMioKVjZ/aEzHs286
+IxSR/xl/pcqs7rN2nXrpixurazHb+gtTTK/FpRp5PIpM/6zfJd5O2YIyC0TeytuMrKNuFoM7pmRL
+Mon7FhY4futD4tN0SsJiCnMK3UmzV9KwCoWdcTzeo8vAMvMBOSBDGzXRU7Ox7sWTaYI+FrUoRqHe
+6okJ7UO4BUaKhvVZR74bbwEhELn9qdIoyhA5CcoTNs+cra1AdHkrAj80//ogaX3T7mH1urPnMNA3
+I4ZyYUUpSFlob3emLoG+B01vr87ERRORFHAGjx+f+IdpsQ7vw4kZ6+ocYfx6bIrc1gMLnia6Et3U
+VDmrJqMz6nWB2i3ND0/kA9HvFZcba5DFApCTZgIhsUfei5pKgLlVj7WiL8DWM2fafsSntARE60f7
+5li59wzweyuxwHApw0BiLTtIadwjPEjrewl5qW3aqDCYz4ByA4imW0aucnl8CAMhZa634RylsSqi
+Md5mBPfAdOhx3v89WcyWJhKLhZVXGqtrdQtEPREoPHtht+KPZ0/l7DxMYIBpVzgeAVuNVejH38DM
+dyM0SXV89pgR6y3e7UEuFAUCf+D+IOs15xGsIs5XPd7JMG0QA4XN8f+MFrXBsj6IbGB/kE+V9/Yt
+rQE5BwT6dYB9v0lQ7e/JxHwc64B+27bQ3RP+ydOc17KXqQIDAQABo0IwQDAPBgNVHRMBAf8EBTAD
+AQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUxhfQvKjqAkPyGwaZXSuQILnXnOQwDQYJKoZI
+hvcNAQELBQADggIBADRh2Va1EodVTd2jNTFGu6QHcrxfYWLopfsLN7E8trP6KZ1/AvWkyaiTt3px
+KGmPc+FSkNrVvjrlt3ZqVoAh313m6Tqe5T72omnHKgqwGEfcIHB9UqM+WXzBusnIFUBhynLWcKzS
+t/Ac5IYp8M7vaGPQtSCKFWGafoaYtMnCdvvMujAWzKNhxnQT5WvvoxXqA/4Ti2Tk08HS6IT7SdEQ
+TXlm66r99I0xHnAUrdzeZxNMgRVhvLfZkXdxGYFgu/BYpbWcC/ePIlUnwEsBbTuZDdQdm2NnL9Du
+DcpmvJRPpq3t/O5jrFc/ZSXPsoaP0Aj/uHYUbt7lJ+yreLVTubY/6CD50qi+YUbKh4yE8/nxoGib
+Ih6BJpsQBJFxwAYf3KDTuVan45gtf4Od34wrnDKOMpTwATwiKp9Dwi7DmDkHOHv8XgBCH/MyJnmD
+hPbl8MFREsALHgQjDFSlTC9JxUrRtm5gDWv8a4uFJGS3iQ6rJUdbPM9+Sb3H6QrG2vd+DhcI00iX
+0HGS8A85PjRqHH3Y8iKuu2n0M7SmSFXRDw4m6Oy2Cy2nhTXN/VnIn9HNPlopNLk9hM6xZdRZkZFW
+dSHBd575euFgndOtBBj0fOtek49TSiIp+EgrPk2GrFt/ywaZWWDYWGWVjUTR939+J399roD1B0y2
+PpxxVJkES/1Y+Zj0
+-----END CERTIFICATE-----
+
+DigiCert Assured ID Root G2
+===========================
+-----BEGIN CERTIFICATE-----
+MIIDljCCAn6gAwIBAgIQC5McOtY5Z+pnI7/Dr5r0SzANBgkqhkiG9w0BAQsFADBlMQswCQYDVQQG
+EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSQw
+IgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgRzIwHhcNMTMwODAxMTIwMDAwWhcNMzgw
+MTE1MTIwMDAwWjBlMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQL
+ExB3d3cuZGlnaWNlcnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgRzIw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDZ5ygvUj82ckmIkzTz+GoeMVSAn61UQbVH
+35ao1K+ALbkKz3X9iaV9JPrjIgwrvJUXCzO/GU1BBpAAvQxNEP4HteccbiJVMWWXvdMX0h5i89vq
+bFCMP4QMls+3ywPgym2hFEwbid3tALBSfK+RbLE4E9HpEgjAALAcKxHad3A2m67OeYfcgnDmCXRw
+VWmvo2ifv922ebPynXApVfSr/5Vh88lAbx3RvpO704gqu52/clpWcTs/1PPRCv4o76Pu2ZmvA9OP
+YLfykqGxvYmJHzDNw6YuYjOuFgJ3RFrngQo8p0Quebg/BLxcoIfhG69Rjs3sLPr4/m3wOnyqi+Rn
+lTGNAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgGGMB0GA1UdDgQWBBTO
+w0q5mVXyuNtgv6l+vVa1lzan1jANBgkqhkiG9w0BAQsFAAOCAQEAyqVVjOPIQW5pJ6d1Ee88hjZv
+0p3GeDgdaZaikmkuOGybfQTUiaWxMTeKySHMq2zNixya1r9I0jJmwYrA8y8678Dj1JGG0VDjA9tz
+d29KOVPt3ibHtX2vK0LRdWLjSisCx1BL4GnilmwORGYQRI+tBev4eaymG+g3NJ1TyWGqolKvSnAW
+hsI6yLETcDbYz+70CjTVW0z9B5yiutkBclzzTcHdDrEcDcRjvq30FPuJ7KJBDkzMyFdA0G4Dqs0M
+jomZmWzwPDCvON9vvKO+KSAnq3T/EyJ43pdSVR6DtVQgA+6uwE9W3jfMw3+qBCe703e4YtsXfJwo
+IhNzbM8m9Yop5w==
+-----END CERTIFICATE-----
+
+DigiCert Assured ID Root G3
+===========================
+-----BEGIN CERTIFICATE-----
+MIICRjCCAc2gAwIBAgIQC6Fa+h3foLVJRK/NJKBs7DAKBggqhkjOPQQDAzBlMQswCQYDVQQGEwJV
+UzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSQwIgYD
+VQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgRzMwHhcNMTMwODAxMTIwMDAwWhcNMzgwMTE1
+MTIwMDAwWjBlMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
+d3cuZGlnaWNlcnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgRzMwdjAQ
+BgcqhkjOPQIBBgUrgQQAIgNiAAQZ57ysRGXtzbg/WPuNsVepRC0FFfLvC/8QdJ+1YlJfZn4f5dwb
+RXkLzMZTCp2NXQLZqVneAlr2lSoOjThKiknGvMYDOAdfVdp+CW7if17QRSAPWXYQ1qAk8C3eNvJs
+KTmjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgGGMB0GA1UdDgQWBBTL0L2p4ZgF
+UaFNN6KDec6NHSrkhDAKBggqhkjOPQQDAwNnADBkAjAlpIFFAmsSS3V0T8gj43DydXLefInwz5Fy
+YZ5eEJJZVrmDxxDnOOlYJjZ91eQ0hjkCMHw2U/Aw5WJjOpnitqM7mzT6HtoQknFekROn3aRukswy
+1vUhZscv6pZjamVFkpUBtA==
+-----END CERTIFICATE-----
+
+DigiCert Global Root G2
+=======================
+-----BEGIN CERTIFICATE-----
+MIIDjjCCAnagAwIBAgIQAzrx5qcRqaC7KGSxHQn65TANBgkqhkiG9w0BAQsFADBhMQswCQYDVQQG
+EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSAw
+HgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBHMjAeFw0xMzA4MDExMjAwMDBaFw0zODAxMTUx
+MjAwMDBaMGExCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3
+dy5kaWdpY2VydC5jb20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IEcyMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuzfNNNx7a8myaJCtSnX/RrohCgiN9RlUyfuI2/Ou8jqJ
+kTx65qsGGmvPrC3oXgkkRLpimn7Wo6h+4FR1IAWsULecYxpsMNzaHxmx1x7e/dfgy5SDN67sH0NO
+3Xss0r0upS/kqbitOtSZpLYl6ZtrAGCSYP9PIUkY92eQq2EGnI/yuum06ZIya7XzV+hdG82MHauV
+BJVJ8zUtluNJbd134/tJS7SsVQepj5WztCO7TG1F8PapspUwtP1MVYwnSlcUfIKdzXOS0xZKBgyM
+UNGPHgm+F6HmIcr9g+UQvIOlCsRnKPZzFBQ9RnbDhxSJITRNrw9FDKZJobq7nMWxM4MphQIDAQAB
+o0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBhjAdBgNVHQ4EFgQUTiJUIBiV5uNu
+5g/6+rkS7QYXjzkwDQYJKoZIhvcNAQELBQADggEBAGBnKJRvDkhj6zHd6mcY1Yl9PMWLSn/pvtsr
+F9+wX3N3KjITOYFnQoQj8kVnNeyIv/iPsGEMNKSuIEyExtv4NeF22d+mQrvHRAiGfzZ0JFrabA0U
+WTW98kndth/Jsw1HKj2ZL7tcu7XUIOGZX1NGFdtom/DzMNU+MeKNhJ7jitralj41E6Vf8PlwUHBH
+QRFXGU7Aj64GxJUTFy8bJZ918rGOmaFvE7FBcf6IKshPECBV1/MUReXgRPTqh5Uykw7+U0b6LJ3/
+iyK5S9kJRaTepLiaWN0bfVKfjllDiIGknibVb63dDcY3fe0Dkhvld1927jyNxF1WW6LZZm6zNTfl
+MrY=
+-----END CERTIFICATE-----
+
+DigiCert Global Root G3
+=======================
+-----BEGIN CERTIFICATE-----
+MIICPzCCAcWgAwIBAgIQBVVWvPJepDU1w6QP1atFcjAKBggqhkjOPQQDAzBhMQswCQYDVQQGEwJV
+UzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSAwHgYD
+VQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBHMzAeFw0xMzA4MDExMjAwMDBaFw0zODAxMTUxMjAw
+MDBaMGExCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5k
+aWdpY2VydC5jb20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IEczMHYwEAYHKoZIzj0C
+AQYFK4EEACIDYgAE3afZu4q4C/sLfyHS8L6+c/MzXRq8NOrexpu80JX28MzQC7phW1FGfp4tn+6O
+YwwX7Adw9c+ELkCDnOg/QW07rdOkFFk2eJ0DQ+4QE2xy3q6Ip6FrtUPOZ9wj/wMco+I+o0IwQDAP
+BgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBhjAdBgNVHQ4EFgQUs9tIpPmhxdiuNkHMEWNp
+Yim8S8YwCgYIKoZIzj0EAwMDaAAwZQIxAK288mw/EkrRLTnDCgmXc/SINoyIJ7vmiI1Qhadj+Z4y
+3maTD/HMsQmP3Wyr+mt/oAIwOWZbwmSNuJ5Q3KjVSaLtx9zRSX8XAbjIho9OjIgrqJqpisXRAL34
+VOKa5Vt8sycX
+-----END CERTIFICATE-----
+
+DigiCert Trusted Root G4
+========================
+-----BEGIN CERTIFICATE-----
+MIIFkDCCA3igAwIBAgIQBZsbV56OITLiOQe9p3d1XDANBgkqhkiG9w0BAQwFADBiMQswCQYDVQQG
+EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSEw
+HwYDVQQDExhEaWdpQ2VydCBUcnVzdGVkIFJvb3QgRzQwHhcNMTMwODAxMTIwMDAwWhcNMzgwMTE1
+MTIwMDAwWjBiMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
+d3cuZGlnaWNlcnQuY29tMSEwHwYDVQQDExhEaWdpQ2VydCBUcnVzdGVkIFJvb3QgRzQwggIiMA0G
+CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC/5pBzaN675F1KPDAiMGkz7MKnJS7JIT3yithZwuEp
+pz1Yq3aaza57G4QNxDAf8xukOBbrVsaXbR2rsnnyyhHS5F/WBTxSD1Ifxp4VpX6+n6lXFllVcq9o
+k3DCsrp1mWpzMpTREEQQLt+C8weE5nQ7bXHiLQwb7iDVySAdYyktzuxeTsiT+CFhmzTrBcZe7Fsa
+vOvJz82sNEBfsXpm7nfISKhmV1efVFiODCu3T6cw2Vbuyntd463JT17lNecxy9qTXtyOj4DatpGY
+QJB5w3jHtrHEtWoYOAMQjdjUN6QuBX2I9YI+EJFwq1WCQTLX2wRzKm6RAXwhTNS8rhsDdV14Ztk6
+MUSaM0C/CNdaSaTC5qmgZ92kJ7yhTzm1EVgX9yRcRo9k98FpiHaYdj1ZXUJ2h4mXaXpI8OCiEhtm
+mnTK3kse5w5jrubU75KSOp493ADkRSWJtppEGSt+wJS00mFt6zPZxd9LBADMfRyVw4/3IbKyEbe7
+f/LVjHAsQWCqsWMYRJUadmJ+9oCw++hkpjPRiQfhvbfmQ6QYuKZ3AeEPlAwhHbJUKSWJbOUOUlFH
+dL4mrLZBdd56rF+NP8m800ERElvlEFDrMcXKchYiCd98THU/Y+whX8QgUWtvsauGi0/C1kVfnSD8
+oR7FwI+isX4KJpn15GkvmB0t9dmpsh3lGwIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1Ud
+DwEB/wQEAwIBhjAdBgNVHQ4EFgQU7NfjgtJxXWRM3y5nP+e6mK4cD08wDQYJKoZIhvcNAQEMBQAD
+ggIBALth2X2pbL4XxJEbw6GiAI3jZGgPVs93rnD5/ZpKmbnJeFwMDF/k5hQpVgs2SV1EY+CtnJYY
+ZhsjDT156W1r1lT40jzBQ0CuHVD1UvyQO7uYmWlrx8GnqGikJ9yd+SeuMIW59mdNOj6PWTkiU0Tr
+yF0Dyu1Qen1iIQqAyHNm0aAFYF/opbSnr6j3bTWcfFqK1qI4mfN4i/RN0iAL3gTujJtHgXINwBQy
+7zBZLq7gcfJW5GqXb5JQbZaNaHqasjYUegbyJLkJEVDXCLG4iXqEI2FCKeWjzaIgQdfRnGTZ6iah
+ixTXTBmyUEFxPT9NcCOGDErcgdLMMpSEDQgJlxxPwO5rIHQw0uA5NBCFIRUBCOhVMt5xSdkoF1BN
+5r5N0XWs0Mr7QbhDparTwwVETyw2m+L64kW4I1NsBm9nVX9GtUw/bihaeSbSpKhil9Ie4u1Ki7wb
+/UdKDd9nZn6yW0HQO+T0O/QEY+nvwlQAUaCKKsnOeMzV6ocEGLPOr0mIr/OSmbaz5mEP0oUA51Aa
+5BuVnRmhuZyxm7EAHu/QD09CbMkKvO5D+jpxpchNJqU1/YldvIViHTLSoCtU7ZpXwdv6EM8Zt4tK
+G48BtieVU+i2iW1bvGjUI+iLUaJW+fCmgKDWHrO8Dw9TdSmq6hN35N6MgSGtBxBHEa2HPQfRdbzP
+82Z+
+-----END CERTIFICATE-----
+
+WoSign
+======
+-----BEGIN CERTIFICATE-----
+MIIFdjCCA16gAwIBAgIQXmjWEXGUY1BWAGjzPsnFkTANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQG
+EwJDTjEaMBgGA1UEChMRV29TaWduIENBIExpbWl0ZWQxKjAoBgNVBAMTIUNlcnRpZmljYXRpb24g
+QXV0aG9yaXR5IG9mIFdvU2lnbjAeFw0wOTA4MDgwMTAwMDFaFw0zOTA4MDgwMTAwMDFaMFUxCzAJ
+BgNVBAYTAkNOMRowGAYDVQQKExFXb1NpZ24gQ0EgTGltaXRlZDEqMCgGA1UEAxMhQ2VydGlmaWNh
+dGlvbiBBdXRob3JpdHkgb2YgV29TaWduMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA
+vcqNrLiRFVaXe2tcesLea9mhsMMQI/qnobLMMfo+2aYpbxY94Gv4uEBf2zmoAHqLoE1UfcIiePyO
+CbiohdfMlZdLdNiefvAA5A6JrkkoRBoQmTIPJYhTpA2zDxIIFgsDcSccf+Hb0v1naMQFXQoOXXDX
+2JegvFNBmpGN9J42Znp+VsGQX+axaCA2pIwkLCxHC1l2ZjC1vt7tj/id07sBMOby8w7gLJKA84X5
+KIq0VC6a7fd2/BVoFutKbOsuEo/Uz/4Mx1wdC34FMr5esAkqQtXJTpCzWQ27en7N1QhatH/YHGkR
++ScPewavVIMYe+HdVHpRaG53/Ma/UkpmRqGyZxq7o093oL5d//xWC0Nyd5DKnvnyOfUNqfTq1+ez
+EC8wQjchzDBwyYaYD8xYTYO7feUapTeNtqwylwA6Y3EkHp43xP901DfA4v6IRmAR3Qg/UDaruHqk
+lWJqbrDKaiFaafPz+x1wOZXzp26mgYmhiMU7ccqjUu6Du/2gd/Tkb+dC221KmYo0SLwX3OSACCK2
+8jHAPwQ+658geda4BmRkAjHXqc1S+4RFaQkAKtxVi8QGRkvASh0JWzko/amrzgD5LkhLJuYwTKVY
+yrREgk/nkR4zw7CT/xH8gdLKH3Ep3XZPkiWvHYG3Dy+MwwbMLyejSuQOmbp8HkUff6oZRZb9/D0C
+AwEAAaNCMEAwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFOFmzw7R
+8bNLtwYgFP6HEtX2/vs+MA0GCSqGSIb3DQEBBQUAA4ICAQCoy3JAsnbBfnv8rWTjMnvMPLZdRtP1
+LOJwXcgu2AZ9mNELIaCJWSQBnfmvCX0KI4I01fx8cpm5o9dU9OpScA7F9dY74ToJMuYhOZO9sxXq
+T2r09Ys/L3yNWC7F4TmgPsc9SnOeQHrAK2GpZ8nzJLmzbVUsWh2eJXLOC62qx1ViC777Y7NhRCOj
+y+EaDveaBk3e1CNOIZZbOVtXHS9dCF4Jef98l7VNg64N1uajeeAz0JmWAjCnPv/So0M/BVoG6kQC
+2nz4SNAzqfkHx5Xh9T71XXG68pWpdIhhWeO/yloTunK0jF02h+mmxTwTv97QRCbut+wucPrXnbes
+5cVAWubXbHssw1abR80LzvobtCHXt2a49CUwi1wNuepnsvRtrtWhnk/Yn+knArAdBtaP4/tIEp9/
+EaEQPkxROpaw0RPxx9gmrjrKkcRpnd8BKWRRb2jaFOwIQZeQjdCygPLPwj2/kWjFgGcexGATVdVh
+mVd8upUPYUk6ynW8yQqTP2cOEvIo4jEbwFcW3wh8GcF+Dx+FHgo2fFt+J7x6v+Db9NpSvd4MVHAx
+kUOVyLzwPt0JfjBkUO1/AaQzZ01oT74V77D2AhGiGxMlOtzCWfHjXEa7ZywCRuoeSKbmW9m1vFGi
+kpbbqsY3Iqb+zCB0oy2pLmvLwIIRIbWTee5Ehr7XHuQe+w==
+-----END CERTIFICATE-----
+
+WoSign China
+============
+-----BEGIN CERTIFICATE-----
+MIIFWDCCA0CgAwIBAgIQUHBrzdgT/BtOOzNy0hFIjTANBgkqhkiG9w0BAQsFADBGMQswCQYDVQQG
+EwJDTjEaMBgGA1UEChMRV29TaWduIENBIExpbWl0ZWQxGzAZBgNVBAMMEkNBIOayg+mAmuagueiv
+geS5pjAeFw0wOTA4MDgwMTAwMDFaFw0zOTA4MDgwMTAwMDFaMEYxCzAJBgNVBAYTAkNOMRowGAYD
+VQQKExFXb1NpZ24gQ0EgTGltaXRlZDEbMBkGA1UEAwwSQ0Eg5rKD6YCa5qC56K+B5LmmMIICIjAN
+BgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA0EkhHiX8h8EqwqzbdoYGTufQdDTc7WU1/FDWiD+k
+8H/rD195L4mx/bxjWDeTmzj4t1up+thxx7S8gJeNbEvxUNUqKaqoGXqW5pWOdO2XCld19AXbbQs5
+uQF/qvbW2mzmBeCkTVL829B0txGMe41P/4eDrv8FAxNXUDf+jJZSEExfv5RxadmWPgxDT74wwJ85
+dE8GRV2j1lY5aAfMh09Qd5Nx2UQIsYo06Yms25tO4dnkUkWMLhQfkWsZHWgpLFbE4h4TV2TwYeO5
+Ed+w4VegG63XX9Gv2ystP9Bojg/qnw+LNVgbExz03jWhCl3W6t8Sb8D7aQdGctyB9gQjF+BNdeFy
+b7Ao65vh4YOhn0pdr8yb+gIgthhid5E7o9Vlrdx8kHccREGkSovrlXLp9glk3Kgtn3R46MGiCWOc
+76DbT52VqyBPt7D3h1ymoOQ3OMdc4zUPLK2jgKLsLl3Az+2LBcLmc272idX10kaO6m1jGx6KyX2m
++Jzr5dVjhU1zZmkR/sgO9MHHZklTfuQZa/HpelmjbX7FF+Ynxu8b22/8DU0GAbQOXDBGVWCvOGU6
+yke6rCzMRh+yRpY/8+0mBe53oWprfi1tWFxK1I5nuPHa1UaKJ/kR8slC/k7e3x9cxKSGhxYzoacX
+GKUN5AXlK8IrC6KVkLn9YDxOiT7nnO4fuwECAwEAAaNCMEAwDgYDVR0PAQH/BAQDAgEGMA8GA1Ud
+EwEB/wQFMAMBAf8wHQYDVR0OBBYEFOBNv9ybQV0T6GTwp+kVpOGBwboxMA0GCSqGSIb3DQEBCwUA
+A4ICAQBqinA4WbbaixjIvirTthnVZil6Xc1bL3McJk6jfW+rtylNpumlEYOnOXOvEESS5iVdT2H6
+yAa+Tkvv/vMx/sZ8cApBWNromUuWyXi8mHwCKe0JgOYKOoICKuLJL8hWGSbueBwj/feTZU7n85iY
+r83d2Z5AiDEoOqsuC7CsDCT6eiaY8xJhEPRdF/d+4niXVOKM6Cm6jBAyvd0zaziGfjk9DgNyp115
+j0WKWa5bIW4xRtVZjc8VX90xJc/bYNaBRHIpAlf2ltTW/+op2znFuCyKGo3Oy+dCMYYFaA6eFN0A
+kLppRQjbbpCBhqcqBT/mhDn4t/lXX0ykeVoQDF7Va/81XwVRHmyjdanPUIPTfPRm94KNPQx96N97
+qA4bLJyuQHCH2u2nFoJavjVsIE4iYdm8UXrNemHcSxH5/mc0zy4EZmFcV5cjjPOGG0jfKq+nwf/Y
+jj4Du9gqsPoUJbJRa4ZDhS4HIxaAjUz7tGM7zMN07RujHv41D198HRaG9Q7DlfEvr10lO1Hm13ZB
+ONFLAzkopR6RctR9q5czxNM+4Gm2KHmgCY0c0f9BckgG/Jou5yD5m6Leie2uPAmvylezkolwQOQv
+T8Jwg0DXJCxr5wkf09XHwQj02w47HAcLQxGEIYbpgNR12KvxAmLBsX5VYc8T1yaw15zLKYs4SgsO
+kI26oQ==
+-----END CERTIFICATE-----
+
+COMODO RSA Certification Authority
+==================================
+-----BEGIN CERTIFICATE-----
+MIIF2DCCA8CgAwIBAgIQTKr5yttjb+Af907YWwOGnTANBgkqhkiG9w0BAQwFADCBhTELMAkGA1UE
+BhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgG
+A1UEChMRQ09NT0RPIENBIExpbWl0ZWQxKzApBgNVBAMTIkNPTU9ETyBSU0EgQ2VydGlmaWNhdGlv
+biBBdXRob3JpdHkwHhcNMTAwMTE5MDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCBhTELMAkGA1UEBhMC
+R0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UE
+ChMRQ09NT0RPIENBIExpbWl0ZWQxKzApBgNVBAMTIkNPTU9ETyBSU0EgQ2VydGlmaWNhdGlvbiBB
+dXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCR6FSS0gpWsawNJN3Fz0Rn
+dJkrN6N9I3AAcbxT38T6KhKPS38QVr2fcHK3YX/JSw8Xpz3jsARh7v8Rl8f0hj4K+j5c+ZPmNHrZ
+FGvnnLOFoIJ6dq9xkNfs/Q36nGz637CC9BR++b7Epi9Pf5l/tfxnQ3K9DADWietrLNPtj5gcFKt+
+5eNu/Nio5JIk2kNrYrhV/erBvGy2i/MOjZrkm2xpmfh4SDBF1a3hDTxFYPwyllEnvGfDyi62a+pG
+x8cgoLEfZd5ICLqkTqnyg0Y3hOvozIFIQ2dOciqbXL1MGyiKXCJ7tKuY2e7gUYPDCUZObT6Z+pUX
+2nwzV0E8jVHtC7ZcryxjGt9XyD+86V3Em69FmeKjWiS0uqlWPc9vqv9JWL7wqP/0uK3pN/u6uPQL
+OvnoQ0IeidiEyxPx2bvhiWC4jChWrBQdnArncevPDt09qZahSL0896+1DSJMwBGB7FY79tOi4lu3
+sgQiUpWAk2nojkxl8ZEDLXB0AuqLZxUpaVICu9ffUGpVRr+goyhhf3DQw6KqLCGqR84onAZFdr+C
+GCe01a60y1Dma/RMhnEw6abfFobg2P9A3fvQQoh/ozM6LlweQRGBY84YcWsr7KaKtzFcOmpH4MN5
+WdYgGq/yapiqcrxXStJLnbsQ/LBMQeXtHT1eKJ2czL+zUdqnR+WEUwIDAQABo0IwQDAdBgNVHQ4E
+FgQUu69+Aj36pvE8hI6t7jiY7NkyMtQwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8w
+DQYJKoZIhvcNAQEMBQADggIBAArx1UaEt65Ru2yyTUEUAJNMnMvlwFTPoCWOAvn9sKIN9SCYPBMt
+rFaisNZ+EZLpLrqeLppysb0ZRGxhNaKatBYSaVqM4dc+pBroLwP0rmEdEBsqpIt6xf4FpuHA1sj+
+nq6PK7o9mfjYcwlYRm6mnPTXJ9OV2jeDchzTc+CiR5kDOF3VSXkAKRzH7JsgHAckaVd4sjn8OoSg
+tZx8jb8uk2IntznaFxiuvTwJaP+EmzzV1gsD41eeFPfR60/IvYcjt7ZJQ3mFXLrrkguhxuhoqEwW
+sRqZCuhTLJK7oQkYdQxlqHvLI7cawiiFwxv/0Cti76R7CZGYZ4wUAc1oBmpjIXUDgIiKboHGhfKp
+pC3n9KUkEEeDys30jXlYsQab5xoq2Z0B15R97QNKyvDb6KkBPvVWmckejkk9u+UJueBPSZI9FoJA
+zMxZxuY67RIuaTxslbH9qh17f4a+Hg4yRvv7E491f0yLS0Zj/gA0QHDBw7mh3aZw4gSzQbzpgJHq
+ZJx64SIDqZxubw5lT2yHh17zbqD5daWbQOhTsiedSrnAdyGN/4fy3ryM7xfft0kL0fJuMAsaDk52
+7RH89elWsn2/x20Kk4yl0MC2Hb46TpSi125sC8KKfPog88Tk5c0NqMuRkrF8hey1FGlmDoLnzc7I
+LaZRfyHBNVOFBkpdn627G190
+-----END CERTIFICATE-----
+
+USERTrust RSA Certification Authority
+=====================================
+-----BEGIN CERTIFICATE-----
+MIIF3jCCA8agAwIBAgIQAf1tMPyjylGoG7xkDjUDLTANBgkqhkiG9w0BAQwFADCBiDELMAkGA1UE
+BhMCVVMxEzARBgNVBAgTCk5ldyBKZXJzZXkxFDASBgNVBAcTC0plcnNleSBDaXR5MR4wHAYDVQQK
+ExVUaGUgVVNFUlRSVVNUIE5ldHdvcmsxLjAsBgNVBAMTJVVTRVJUcnVzdCBSU0EgQ2VydGlmaWNh
+dGlvbiBBdXRob3JpdHkwHhcNMTAwMjAxMDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCBiDELMAkGA1UE
+BhMCVVMxEzARBgNVBAgTCk5ldyBKZXJzZXkxFDASBgNVBAcTC0plcnNleSBDaXR5MR4wHAYDVQQK
+ExVUaGUgVVNFUlRSVVNUIE5ldHdvcmsxLjAsBgNVBAMTJVVTRVJUcnVzdCBSU0EgQ2VydGlmaWNh
+dGlvbiBBdXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCAEmUXNg7D2wiz
+0KxXDXbtzSfTTK1Qg2HiqiBNCS1kCdzOiZ/MPans9s/B3PHTsdZ7NygRK0faOca8Ohm0X6a9fZ2j
+Y0K2dvKpOyuR+OJv0OwWIJAJPuLodMkYtJHUYmTbf6MG8YgYapAiPLz+E/CHFHv25B+O1ORRxhFn
+RghRy4YUVD+8M/5+bJz/Fp0YvVGONaanZshyZ9shZrHUm3gDwFA66Mzw3LyeTP6vBZY1H1dat//O
++T23LLb2VN3I5xI6Ta5MirdcmrS3ID3KfyI0rn47aGYBROcBTkZTmzNg95S+UzeQc0PzMsNT79uq
+/nROacdrjGCT3sTHDN/hMq7MkztReJVni+49Vv4M0GkPGw/zJSZrM233bkf6c0Plfg6lZrEpfDKE
+Y1WJxA3Bk1QwGROs0303p+tdOmw1XNtB1xLaqUkL39iAigmTYo61Zs8liM2EuLE/pDkP2QKe6xJM
+lXzzawWpXhaDzLhn4ugTncxbgtNMs+1b/97lc6wjOy0AvzVVdAlJ2ElYGn+SNuZRkg7zJn0cTRe8
+yexDJtC/QV9AqURE9JnnV4eeUB9XVKg+/XRjL7FQZQnmWEIuQxpMtPAlR1n6BB6T1CZGSlCBst6+
+eLf8ZxXhyVeEHg9j1uliutZfVS7qXMYoCAQlObgOK6nyTJccBz8NUvXt7y+CDwIDAQABo0IwQDAd
+BgNVHQ4EFgQUU3m/WqorSs9UgOHYm8Cd8rIDZsswDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQF
+MAMBAf8wDQYJKoZIhvcNAQEMBQADggIBAFzUfA3P9wF9QZllDHPFUp/L+M+ZBn8b2kMVn54CVVeW
+FPFSPCeHlCjtHzoBN6J2/FNQwISbxmtOuowhT6KOVWKR82kV2LyI48SqC/3vqOlLVSoGIG1VeCkZ
+7l8wXEskEVX/JJpuXior7gtNn3/3ATiUFJVDBwn7YKnuHKsSjKCaXqeYalltiz8I+8jRRa8YFWSQ
+Eg9zKC7F4iRO/Fjs8PRF/iKz6y+O0tlFYQXBl2+odnKPi4w2r78NBc5xjeambx9spnFixdjQg3IM
+8WcRiQycE0xyNN+81XHfqnHd4blsjDwSXWXavVcStkNr/+XeTWYRUc+ZruwXtuhxkYzeSf7dNXGi
+FSeUHM9h4ya7b6NnJSFd5t0dCy5oGzuCr+yDZ4XUmFF0sbmZgIn/f3gZXHlKYC6SQK5MNyosycdi
+yA5d9zZbyuAlJQG03RoHnHcAP9Dc1ew91Pq7P8yF1m9/qS3fuQL39ZeatTXaw2ewh0qpKJ4jjv9c
+J2vhsE/zB+4ALtRZh8tSQZXq9EfX7mRBVXyNWQKV3WKdwrnuWih0hKWbt5DHDAff9Yk2dDLWKMGw
+sAvgnEzDHNb842m1R0aBL6KCq9NjRHDEjf8tM7qtj3u1cIiuPhnPQCjY/MiQu12ZIvVS5ljFH4gx
+Q+6IHdfGjjxDah2nGN59PRbxYvnKkKj9
+-----END CERTIFICATE-----
+
+USERTrust ECC Certification Authority
+=====================================
+-----BEGIN CERTIFICATE-----
+MIICjzCCAhWgAwIBAgIQXIuZxVqUxdJxVt7NiYDMJjAKBggqhkjOPQQDAzCBiDELMAkGA1UEBhMC
+VVMxEzARBgNVBAgTCk5ldyBKZXJzZXkxFDASBgNVBAcTC0plcnNleSBDaXR5MR4wHAYDVQQKExVU
+aGUgVVNFUlRSVVNUIE5ldHdvcmsxLjAsBgNVBAMTJVVTRVJUcnVzdCBFQ0MgQ2VydGlmaWNhdGlv
+biBBdXRob3JpdHkwHhcNMTAwMjAxMDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCBiDELMAkGA1UEBhMC
+VVMxEzARBgNVBAgTCk5ldyBKZXJzZXkxFDASBgNVBAcTC0plcnNleSBDaXR5MR4wHAYDVQQKExVU
+aGUgVVNFUlRSVVNUIE5ldHdvcmsxLjAsBgNVBAMTJVVTRVJUcnVzdCBFQ0MgQ2VydGlmaWNhdGlv
+biBBdXRob3JpdHkwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAQarFRaqfloI+d61SRvU8Za2EurxtW2
+0eZzca7dnNYMYf3boIkDuAUU7FfO7l0/4iGzzvfUinngo4N+LZfQYcTxmdwlkWOrfzCjtHDix6Ez
+nPO/LlxTsV+zfTJ/ijTjeXmjQjBAMB0GA1UdDgQWBBQ64QmG1M8ZwpZ2dEl23OA1xmNjmjAOBgNV
+HQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAKBggqhkjOPQQDAwNoADBlAjA2Z6EWCNzklwBB
+HU6+4WMBzzuqQhFkoJ2UOQIReVx7Hfpkue4WQrO/isIJxOzksU0CMQDpKmFHjFJKS04YcPbWRNZu
+9YO6bVi9JNlWSOrvxKJGgYhqOkbRqZtNyWHa0V1Xahg=
+-----END CERTIFICATE-----
+
+GlobalSign ECC Root CA - R4
+===========================
+-----BEGIN CERTIFICATE-----
+MIIB4TCCAYegAwIBAgIRKjikHJYKBN5CsiilC+g0mAIwCgYIKoZIzj0EAwIwUDEkMCIGA1UECxMb
+R2xvYmFsU2lnbiBFQ0MgUm9vdCBDQSAtIFI0MRMwEQYDVQQKEwpHbG9iYWxTaWduMRMwEQYDVQQD
+EwpHbG9iYWxTaWduMB4XDTEyMTExMzAwMDAwMFoXDTM4MDExOTAzMTQwN1owUDEkMCIGA1UECxMb
+R2xvYmFsU2lnbiBFQ0MgUm9vdCBDQSAtIFI0MRMwEQYDVQQKEwpHbG9iYWxTaWduMRMwEQYDVQQD
+EwpHbG9iYWxTaWduMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEuMZ5049sJQ6fLjkZHAOkrprl
+OQcJFspjsbmG+IpXwVfOQvpzofdlQv8ewQCybnMO/8ch5RikqtlxP6jUuc6MHaNCMEAwDgYDVR0P
+AQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFFSwe61FuOJAf/sKbvu+M8k8o4TV
+MAoGCCqGSM49BAMCA0gAMEUCIQDckqGgE6bPA7DmxCGXkPoUVy0D7O48027KqGx2vKLeuwIgJ6iF
+JzWbVsaj8kfSt24bAgAXqmemFZHe+pTsewv4n4Q=
+-----END CERTIFICATE-----
+
+GlobalSign ECC Root CA - R5
+===========================
+-----BEGIN CERTIFICATE-----
+MIICHjCCAaSgAwIBAgIRYFlJ4CYuu1X5CneKcflK2GwwCgYIKoZIzj0EAwMwUDEkMCIGA1UECxMb
+R2xvYmFsU2lnbiBFQ0MgUm9vdCBDQSAtIFI1MRMwEQYDVQQKEwpHbG9iYWxTaWduMRMwEQYDVQQD
+EwpHbG9iYWxTaWduMB4XDTEyMTExMzAwMDAwMFoXDTM4MDExOTAzMTQwN1owUDEkMCIGA1UECxMb
+R2xvYmFsU2lnbiBFQ0MgUm9vdCBDQSAtIFI1MRMwEQYDVQQKEwpHbG9iYWxTaWduMRMwEQYDVQQD
+EwpHbG9iYWxTaWduMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAER0UOlvt9Xb/pOdEh+J8LttV7HpI6
+SFkc8GIxLcB6KP4ap1yztsyX50XUWPrRd21DosCHZTQKH3rd6zwzocWdTaRvQZU4f8kehOvRnkmS
+h5SHDDqFSmafnVmTTZdhBoZKo0IwQDAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAd
+BgNVHQ4EFgQUPeYpSJvqB8ohREom3m7e0oPQn1kwCgYIKoZIzj0EAwMDaAAwZQIxAOVpEslu28Yx
+uglB4Zf4+/2a4n0Sye18ZNPLBSWLVtmg515dTguDnFt2KaAJJiFqYgIwcdK1j1zqO+F4CYWodZI7
+yFz9SO8NdCKoCOJuxUnOxwy8p2Fp8fc74SrL+SvzZpA3
+-----END CERTIFICATE-----
+
+Staat der Nederlanden Root CA - G3
+==================================
+-----BEGIN CERTIFICATE-----
+MIIFdDCCA1ygAwIBAgIEAJiiOTANBgkqhkiG9w0BAQsFADBaMQswCQYDVQQGEwJOTDEeMBwGA1UE
+CgwVU3RhYXQgZGVyIE5lZGVybGFuZGVuMSswKQYDVQQDDCJTdGFhdCBkZXIgTmVkZXJsYW5kZW4g
+Um9vdCBDQSAtIEczMB4XDTEzMTExNDExMjg0MloXDTI4MTExMzIzMDAwMFowWjELMAkGA1UEBhMC
+TkwxHjAcBgNVBAoMFVN0YWF0IGRlciBOZWRlcmxhbmRlbjErMCkGA1UEAwwiU3RhYXQgZGVyIE5l
+ZGVybGFuZGVuIFJvb3QgQ0EgLSBHMzCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAL4y
+olQPcPssXFnrbMSkUeiFKrPMSjTysF/zDsccPVMeiAho2G89rcKezIJnByeHaHE6n3WWIkYFsO2t
+x1ueKt6c/DrGlaf1F2cY5y9JCAxcz+bMNO14+1Cx3Gsy8KL+tjzk7FqXxz8ecAgwoNzFs21v0IJy
+EavSgWhZghe3eJJg+szeP4TrjTgzkApyI/o1zCZxMdFyKJLZWyNtZrVtB0LrpjPOktvA9mxjeM3K
+Tj215VKb8b475lRgsGYeCasH/lSJEULR9yS6YHgamPfJEf0WwTUaVHXvQ9Plrk7O53vDxk5hUUur
+mkVLoR9BvUhTFXFkC4az5S6+zqQbwSmEorXLCCN2QyIkHxcE1G6cxvx/K2Ya7Irl1s9N9WMJtxU5
+1nus6+N86U78dULI7ViVDAZCopz35HCz33JvWjdAidiFpNfxC95DGdRKWCyMijmev4SH8RY7Ngzp
+07TKbBlBUgmhHbBqv4LvcFEhMtwFdozL92TkA1CvjJFnq8Xy7ljY3r735zHPbMk7ccHViLVlvMDo
+FxcHErVc0qsgk7TmgoNwNsXNo42ti+yjwUOH5kPiNL6VizXtBznaqB16nzaeErAMZRKQFWDZJkBE
+41ZgpRDUajz9QdwOWke275dhdU/Z/seyHdTtXUmzqWrLZoQT1Vyg3N9udwbRcXXIV2+vD3dbAgMB
+AAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRUrfrHkleu
+yjWcLhL75LpdINyUVzANBgkqhkiG9w0BAQsFAAOCAgEAMJmdBTLIXg47mAE6iqTnB/d6+Oea31BD
+U5cqPco8R5gu4RV78ZLzYdqQJRZlwJ9UXQ4DO1t3ApyEtg2YXzTdO2PCwyiBwpwpLiniyMMB8jPq
+KqrMCQj3ZWfGzd/TtiunvczRDnBfuCPRy5FOCvTIeuXZYzbB1N/8Ipf3YF3qKS9Ysr1YvY2WTxB1
+v0h7PVGHoTx0IsL8B3+A3MSs/mrBcDCw6Y5p4ixpgZQJut3+TcCDjJRYwEYgr5wfAvg1VUkvRtTA
+8KCWAg8zxXHzniN9lLf9OtMJgwYh/WA9rjLA0u6NpvDntIJ8CsxwyXmA+P5M9zWEGYox+wrZ13+b
+8KKaa8MFSu1BYBQw0aoRQm7TIwIEC8Zl3d1Sd9qBa7Ko+gE4uZbqKmxnl4mUnrzhVNXkanjvSr0r
+mj1AfsbAddJu+2gw7OyLnflJNZoaLNmzlTnVHpL3prllL+U9bTpITAjc5CgSKL59NVzq4BZ+Extq
+1z7XnvwtdbLBFNUjA9tbbws+eC8N3jONFrdI54OagQ97wUNNVQQXOEpR1VmiiXTTn74eS9fGbbeI
+JG9gkaSChVtWQbzQRKtqE77RLFi3EjNYsjdj3BP1lB0/QFH1T/U67cjF68IeHRaVesd+QnGTbksV
+tzDfqu1XhUisHWrdOWnk4Xl4vs4Fv6EM94B7IWcnMFk=
+-----END CERTIFICATE-----
+
+Staat der Nederlanden EV Root CA
+================================
+-----BEGIN CERTIFICATE-----
+MIIFcDCCA1igAwIBAgIEAJiWjTANBgkqhkiG9w0BAQsFADBYMQswCQYDVQQGEwJOTDEeMBwGA1UE
+CgwVU3RhYXQgZGVyIE5lZGVybGFuZGVuMSkwJwYDVQQDDCBTdGFhdCBkZXIgTmVkZXJsYW5kZW4g
+RVYgUm9vdCBDQTAeFw0xMDEyMDgxMTE5MjlaFw0yMjEyMDgxMTEwMjhaMFgxCzAJBgNVBAYTAk5M
+MR4wHAYDVQQKDBVTdGFhdCBkZXIgTmVkZXJsYW5kZW4xKTAnBgNVBAMMIFN0YWF0IGRlciBOZWRl
+cmxhbmRlbiBFViBSb290IENBMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA48d+ifkk
+SzrSM4M1LGns3Amk41GoJSt5uAg94JG6hIXGhaTK5skuU6TJJB79VWZxXSzFYGgEt9nCUiY4iKTW
+O0Cmws0/zZiTs1QUWJZV1VD+hq2kY39ch/aO5ieSZxeSAgMs3NZmdO3dZ//BYY1jTw+bbRcwJu+r
+0h8QoPnFfxZpgQNH7R5ojXKhTbImxrpsX23Wr9GxE46prfNeaXUmGD5BKyF/7otdBwadQ8QpCiv8
+Kj6GyzyDOvnJDdrFmeK8eEEzduG/L13lpJhQDBXd4Pqcfzho0LKmeqfRMb1+ilgnQ7O6M5HTp5gV
+XJrm0w912fxBmJc+qiXbj5IusHsMX/FjqTf5m3VpTCgmJdrV8hJwRVXj33NeN/UhbJCONVrJ0yPr
+08C+eKxCKFhmpUZtcALXEPlLVPxdhkqHz3/KRawRWrUgUY0viEeXOcDPusBCAUCZSCELa6fS/ZbV
+0b5GnUngC6agIk440ME8MLxwjyx1zNDFjFE7PZQIZCZhfbnDZY8UnCHQqv0XcgOPvZuM5l5Tnrmd
+74K74bzickFbIZTTRTeU0d8JOV3nI6qaHcptqAqGhYqCvkIH1vI4gnPah1vlPNOePqc7nvQDs/nx
+fRN0Av+7oeX6AHkcpmZBiFxgV6YuCcS6/ZrPpx9Aw7vMWgpVSzs4dlG4Y4uElBbmVvMCAwEAAaNC
+MEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFP6rAJCYniT8qcwa
+ivsnuL8wbqg7MA0GCSqGSIb3DQEBCwUAA4ICAQDPdyxuVr5Os7aEAJSrR8kN0nbHhp8dB9O2tLsI
+eK9p0gtJ3jPFrK3CiAJ9Brc1AsFgyb/E6JTe1NOpEyVa/m6irn0F3H3zbPB+po3u2dfOWBfoqSmu
+c0iH55vKbimhZF8ZE/euBhD/UcabTVUlT5OZEAFTdfETzsemQUHSv4ilf0X8rLiltTMMgsT7B/Zq
+5SWEXwbKwYY5EdtYzXc7LMJMD16a4/CrPmEbUCTCwPTxGfARKbalGAKb12NMcIxHowNDXLldRqAN
+b/9Zjr7dn3LDWyvfjFvO5QxGbJKyCqNMVEIYFRIYvdr8unRu/8G2oGTYqV9Vrp9canaW2HNnh/tN
+f1zuacpzEPuKqf2evTY4SUmH9A4U8OmHuD+nT3pajnnUk+S7aFKErGzp85hwVXIy+TSrK0m1zSBi
+5Dp6Z2Orltxtrpfs/J92VoguZs9btsmksNcFuuEnL5O7Jiqik7Ab846+HUCjuTaPPoIaGl6I6lD4
+WeKDRikL40Rc4ZW2aZCaFG+XroHPaO+Zmr615+F/+PoTRxZMzG0IQOeLeG9QgkRQP2YGiqtDhFZK
+DyAthg710tvSeopLzaXoTvFeJiUBWSOgftL2fiFX1ye8FVdMpEbB4IMeDExNH08GGeL5qPQ6gqGy
+eUN51q1veieQA6TqJIc/2b3Z6fJfUEkc7uzXLg==
+-----END CERTIFICATE-----
+
+IdenTrust Commercial Root CA 1
+==============================
+-----BEGIN CERTIFICATE-----
+MIIFYDCCA0igAwIBAgIQCgFCgAAAAUUjyES1AAAAAjANBgkqhkiG9w0BAQsFADBKMQswCQYDVQQG
+EwJVUzESMBAGA1UEChMJSWRlblRydXN0MScwJQYDVQQDEx5JZGVuVHJ1c3QgQ29tbWVyY2lhbCBS
+b290IENBIDEwHhcNMTQwMTE2MTgxMjIzWhcNMzQwMTE2MTgxMjIzWjBKMQswCQYDVQQGEwJVUzES
+MBAGA1UEChMJSWRlblRydXN0MScwJQYDVQQDEx5JZGVuVHJ1c3QgQ29tbWVyY2lhbCBSb290IENB
+IDEwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCnUBneP5k91DNG8W9RYYKyqU+PZ4ld
+hNlT3Qwo2dfw/66VQ3KZ+bVdfIrBQuExUHTRgQ18zZshq0PirK1ehm7zCYofWjK9ouuU+ehcCuz/
+mNKvcbO0U59Oh++SvL3sTzIwiEsXXlfEU8L2ApeN2WIrvyQfYo3fw7gpS0l4PJNgiCL8mdo2yMKi
+1CxUAGc1bnO/AljwpN3lsKImesrgNqUZFvX9t++uP0D1bVoE/c40yiTcdCMbXTMTEl3EASX2MN0C
+XZ/g1Ue9tOsbobtJSdifWwLziuQkkORiT0/Br4sOdBeo0XKIanoBScy0RnnGF7HamB4HWfp1IYVl
+3ZBWzvurpWCdxJ35UrCLvYf5jysjCiN2O/cz4ckA82n5S6LgTrx+kzmEB/dEcH7+B1rlsazRGMzy
+NeVJSQjKVsk9+w8YfYs7wRPCTY/JTw436R+hDmrfYi7LNQZReSzIJTj0+kuniVyc0uMNOYZKdHzV
+WYfCP04MXFL0PfdSgvHqo6z9STQaKPNBiDoT7uje/5kdX7rL6B7yuVBgwDHTc+XvvqDtMwt0viAg
+xGds8AgDelWAf0ZOlqf0Hj7h9tgJ4TNkK2PXMl6f+cB7D3hvl7yTmvmcEpB4eoCHFddydJxVdHix
+uuFucAS6T6C6aMN7/zHwcz09lCqxC0EOoP5NiGVreTO01wIDAQABo0IwQDAOBgNVHQ8BAf8EBAMC
+AQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU7UQZwNPwBovupHu+QucmVMiONnYwDQYJKoZI
+hvcNAQELBQADggIBAA2ukDL2pkt8RHYZYR4nKM1eVO8lvOMIkPkp165oCOGUAFjvLi5+U1KMtlwH
+6oi6mYtQlNeCgN9hCQCTrQ0U5s7B8jeUeLBfnLOic7iPBZM4zY0+sLj7wM+x8uwtLRvM7Kqas6pg
+ghstO8OEPVeKlh6cdbjTMM1gCIOQ045U8U1mwF10A0Cj7oV+wh93nAbowacYXVKV7cndJZ5t+qnt
+ozo00Fl72u1Q8zW/7esUTTHHYPTa8Yec4kjixsU3+wYQ+nVZZjFHKdp2mhzpgq7vmrlR94gjmmmV
+YjzlVYA211QC//G5Xc7UI2/YRYRKW2XviQzdFKcgyxilJbQN+QHwotL0AMh0jqEqSI5l2xPE4iUX
+feu+h1sXIFRRk0pTAwvsXcoz7WL9RccvW9xYoIA55vrX/hMUpu09lEpCdNTDd1lzzY9GvlU47/ro
+kTLql1gEIt44w8y8bckzOmoKaT+gyOpyj4xjhiO9bTyWnpXgSUyqorkqG5w2gXjtw+hG4iZZRHUe
+2XWJUc0QhJ1hYMtd+ZciTY6Y5uN/9lu7rs3KSoFrXgvzUeF0K+l+J6fZmUlO+KWA2yUPHGNiiskz
+Z2s8EIPGrd6ozRaOjfAHN3Gf8qv8QfXBi+wAN10J5U6A7/qxXDgGpRtK4dw4LTzcqx+QGtVKnO7R
+cGzM7vRX+Bi6hG6H
+-----END CERTIFICATE-----
+
+IdenTrust Public Sector Root CA 1
+=================================
+-----BEGIN CERTIFICATE-----
+MIIFZjCCA06gAwIBAgIQCgFCgAAAAUUjz0Z8AAAAAjANBgkqhkiG9w0BAQsFADBNMQswCQYDVQQG
+EwJVUzESMBAGA1UEChMJSWRlblRydXN0MSowKAYDVQQDEyFJZGVuVHJ1c3QgUHVibGljIFNlY3Rv
+ciBSb290IENBIDEwHhcNMTQwMTE2MTc1MzMyWhcNMzQwMTE2MTc1MzMyWjBNMQswCQYDVQQGEwJV
+UzESMBAGA1UEChMJSWRlblRydXN0MSowKAYDVQQDEyFJZGVuVHJ1c3QgUHVibGljIFNlY3RvciBS
+b290IENBIDEwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC2IpT8pEiv6EdrCvsnduTy
+P4o7ekosMSqMjbCpwzFrqHd2hCa2rIFCDQjrVVi7evi8ZX3yoG2LqEfpYnYeEe4IFNGyRBb06tD6
+Hi9e28tzQa68ALBKK0CyrOE7S8ItneShm+waOh7wCLPQ5CQ1B5+ctMlSbdsHyo+1W/CD80/HLaXI
+rcuVIKQxKFdYWuSNG5qrng0M8gozOSI5Cpcu81N3uURF/YTLNiCBWS2ab21ISGHKTN9T0a9SvESf
+qy9rg3LvdYDaBjMbXcjaY8ZNzaxmMc3R3j6HEDbhuaR672BQssvKplbgN6+rNBM5Jeg5ZuSYeqoS
+mJxZZoY+rfGwyj4GD3vwEUs3oERte8uojHH01bWRNszwFcYr3lEXsZdMUD2xlVl8BX0tIdUAvwFn
+ol57plzy9yLxkA2T26pEUWbMfXYD62qoKjgZl3YNa4ph+bz27nb9cCvdKTz4Ch5bQhyLVi9VGxyh
+LrXHFub4qjySjmm2AcG1hp2JDws4lFTo6tyePSW8Uybt1as5qsVATFSrsrTZ2fjXctscvG29ZV/v
+iDUqZi/u9rNl8DONfJhBaUYPQxxp+pu10GFqzcpL2UyQRqsVWaFHVCkugyhfHMKiq3IXAAaOReyL
+4jM9f9oZRORicsPfIsbyVtTdX5Vy7W1f90gDW/3FKqD2cyOEEBsB5wIDAQABo0IwQDAOBgNVHQ8B
+Af8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU43HgntinQtnbcZFrlJPrw6PRFKMw
+DQYJKoZIhvcNAQELBQADggIBAEf63QqwEZE4rU1d9+UOl1QZgkiHVIyqZJnYWv6IAcVYpZmxI1Qj
+t2odIFflAWJBF9MJ23XLblSQdf4an4EKwt3X9wnQW3IV5B4Jaj0z8yGa5hV+rVHVDRDtfULAj+7A
+mgjVQdZcDiFpboBhDhXAuM/FSRJSzL46zNQuOAXeNf0fb7iAaJg9TaDKQGXSc3z1i9kKlT/YPyNt
+GtEqJBnZhbMX73huqVjRI9PHE+1yJX9dsXNw0H8GlwmEKYBhHfpe/3OsoOOJuBxxFcbeMX8S3OFt
+m6/n6J91eEyrRjuazr8FGF1NFTwWmhlQBJqymm9li1JfPFgEKCXAZmExfrngdbkaqIHWchezxQMx
+NRF4eKLg6TCMf4DfWN88uieW4oA0beOY02QnrEh+KHdcxiVhJfiFDGX6xDIvpZgF5PgLZxYWxoK4
+Mhn5+bl53B/N66+rDt0b20XkeucC4pVd/GnwU2lhlXV5C15V5jgclKlZM57IcXR5f1GJtshquDDI
+ajjDbp7hNxbqBWJMWxJH7ae0s1hWx0nzfxJoCTFx8G34Tkf71oXuxVhAGaQdp/lLQzfcaFpPz+vC
+ZHTetBXZ9FRUGi8c15dxVJCO2SCdUyt/q4/i6jC8UDfv8Ue1fXwsBOxonbRJRBD0ckscZOf85muQ
+3Wl9af0AVqW3rLatt8o+Ae+c
+-----END CERTIFICATE-----
+
+Entrust Root Certification Authority - G2
+=========================================
+-----BEGIN CERTIFICATE-----
+MIIEPjCCAyagAwIBAgIESlOMKDANBgkqhkiG9w0BAQsFADCBvjELMAkGA1UEBhMCVVMxFjAUBgNV
+BAoTDUVudHJ1c3QsIEluYy4xKDAmBgNVBAsTH1NlZSB3d3cuZW50cnVzdC5uZXQvbGVnYWwtdGVy
+bXMxOTA3BgNVBAsTMChjKSAyMDA5IEVudHJ1c3QsIEluYy4gLSBmb3IgYXV0aG9yaXplZCB1c2Ug
+b25seTEyMDAGA1UEAxMpRW50cnVzdCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzIw
+HhcNMDkwNzA3MTcyNTU0WhcNMzAxMjA3MTc1NTU0WjCBvjELMAkGA1UEBhMCVVMxFjAUBgNVBAoT
+DUVudHJ1c3QsIEluYy4xKDAmBgNVBAsTH1NlZSB3d3cuZW50cnVzdC5uZXQvbGVnYWwtdGVybXMx
+OTA3BgNVBAsTMChjKSAyMDA5IEVudHJ1c3QsIEluYy4gLSBmb3IgYXV0aG9yaXplZCB1c2Ugb25s
+eTEyMDAGA1UEAxMpRW50cnVzdCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzIwggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6hLZy254Ma+KZ6TABp3bqMriVQRrJ2mFOWHLP
+/vaCeb9zYQYKpSfYs1/TRU4cctZOMvJyig/3gxnQaoCAAEUesMfnmr8SVycco2gvCoe9amsOXmXz
+HHfV1IWNcCG0szLni6LVhjkCsbjSR87kyUnEO6fe+1R9V77w6G7CebI6C1XiUJgWMhNcL3hWwcKU
+s/Ja5CeanyTXxuzQmyWC48zCxEXFjJd6BmsqEZ+pCm5IO2/b1BEZQvePB7/1U1+cPvQXLOZprE4y
+TGJ36rfo5bs0vBmLrpxR57d+tVOxMyLlbc9wPBr64ptntoP0jaWvYkxN4FisZDQSA/i2jZRjJKRx
+AgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRqciZ6
+0B7vfec7aVHUbI2fkBJmqzANBgkqhkiG9w0BAQsFAAOCAQEAeZ8dlsa2eT8ijYfThwMEYGprmi5Z
+iXMRrEPR9RP/jTkrwPK9T3CMqS/qF8QLVJ7UG5aYMzyorWKiAHarWWluBh1+xLlEjZivEtRh2woZ
+Rkfz6/djwUAFQKXSt/S1mja/qYh2iARVBCuch38aNzx+LaUa2NSJXsq9rD1s2G2v1fN2D807iDgi
+nWyTmsQ9v4IbZT+mD12q/OWyFcq1rca8PdCE6OoGcrBNOTJ4vz4RnAuknZoh8/CbCzB428Hch0P+
+vGOaysXCHMnHjf87ElgI5rY97HosTvuDls4MPGmHVHOkc8KT/1EQrBVUAdj8BbGJoX90g5pJ19xO
+e4pIb4tF9g==
+-----END CERTIFICATE-----
+
+Entrust Root Certification Authority - EC1
+==========================================
+-----BEGIN CERTIFICATE-----
+MIIC+TCCAoCgAwIBAgINAKaLeSkAAAAAUNCR+TAKBggqhkjOPQQDAzCBvzELMAkGA1UEBhMCVVMx
+FjAUBgNVBAoTDUVudHJ1c3QsIEluYy4xKDAmBgNVBAsTH1NlZSB3d3cuZW50cnVzdC5uZXQvbGVn
+YWwtdGVybXMxOTA3BgNVBAsTMChjKSAyMDEyIEVudHJ1c3QsIEluYy4gLSBmb3IgYXV0aG9yaXpl
+ZCB1c2Ugb25seTEzMDEGA1UEAxMqRW50cnVzdCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5
+IC0gRUMxMB4XDTEyMTIxODE1MjUzNloXDTM3MTIxODE1NTUzNlowgb8xCzAJBgNVBAYTAlVTMRYw
+FAYDVQQKEw1FbnRydXN0LCBJbmMuMSgwJgYDVQQLEx9TZWUgd3d3LmVudHJ1c3QubmV0L2xlZ2Fs
+LXRlcm1zMTkwNwYDVQQLEzAoYykgMjAxMiBFbnRydXN0LCBJbmMuIC0gZm9yIGF1dGhvcml6ZWQg
+dXNlIG9ubHkxMzAxBgNVBAMTKkVudHJ1c3QgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAt
+IEVDMTB2MBAGByqGSM49AgEGBSuBBAAiA2IABIQTydC6bUF74mzQ61VfZgIaJPRbiWlH47jCffHy
+AsWfoPZb1YsGGYZPUxBtByQnoaD41UcZYUx9ypMn6nQM72+WCf5j7HBdNq1nd67JnXxVRDqiY1Ef
+9eNi1KlHBz7MIKNCMEAwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYE
+FLdj5xrdjekIplWDpOBqUEFlEUJJMAoGCCqGSM49BAMDA2cAMGQCMGF52OVCR98crlOZF7ZvHH3h
+vxGU0QOIdeSNiaSKd0bebWHvAvX7td/M/k7//qnmpwIwW5nXhTcGtXsI/esni0qU+eH6p44mCOh8
+kmhtc9hvJqwhAriZtyZBWyVgrtBIGu4G
+-----END CERTIFICATE-----
+
+CFCA EV ROOT
+============
+-----BEGIN CERTIFICATE-----
+MIIFjTCCA3WgAwIBAgIEGErM1jANBgkqhkiG9w0BAQsFADBWMQswCQYDVQQGEwJDTjEwMC4GA1UE
+CgwnQ2hpbmEgRmluYW5jaWFsIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MRUwEwYDVQQDDAxDRkNB
+IEVWIFJPT1QwHhcNMTIwODA4MDMwNzAxWhcNMjkxMjMxMDMwNzAxWjBWMQswCQYDVQQGEwJDTjEw
+MC4GA1UECgwnQ2hpbmEgRmluYW5jaWFsIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MRUwEwYDVQQD
+DAxDRkNBIEVWIFJPT1QwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDXXWvNED8fBVnV
+BU03sQ7smCuOFR36k0sXgiFxEFLXUWRwFsJVaU2OFW2fvwwbwuCjZ9YMrM8irq93VCpLTIpTUnrD
+7i7es3ElweldPe6hL6P3KjzJIx1qqx2hp/Hz7KDVRM8Vz3IvHWOX6Jn5/ZOkVIBMUtRSqy5J35DN
+uF++P96hyk0g1CXohClTt7GIH//62pCfCqktQT+x8Rgp7hZZLDRJGqgG16iI0gNyejLi6mhNbiyW
+ZXvKWfry4t3uMCz7zEasxGPrb382KzRzEpR/38wmnvFyXVBlWY9ps4deMm/DGIq1lY+wejfeWkU7
+xzbh72fROdOXW3NiGUgthxwG+3SYIElz8AXSG7Ggo7cbcNOIabla1jj0Ytwli3i/+Oh+uFzJlU9f
+py25IGvPa931DfSCt/SyZi4QKPaXWnuWFo8BGS1sbn85WAZkgwGDg8NNkt0yxoekN+kWzqotaK8K
+gWU6cMGbrU1tVMoqLUuFG7OA5nBFDWteNfB/O7ic5ARwiRIlk9oKmSJgamNgTnYGmE69g60dWIol
+hdLHZR4tjsbftsbhf4oEIRUpdPA+nJCdDC7xij5aqgwJHsfVPKPtl8MeNPo4+QgO48BdK4PRVmrJ
+tqhUUy54Mmc9gn900PvhtgVguXDbjgv5E1hvcWAQUhC5wUEJ73IfZzF4/5YFjQIDAQABo2MwYTAf
+BgNVHSMEGDAWgBTj/i39KNALtbq2osS/BqoFjJP7LzAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB
+/wQEAwIBBjAdBgNVHQ4EFgQU4/4t/SjQC7W6tqLEvwaqBYyT+y8wDQYJKoZIhvcNAQELBQADggIB
+ACXGumvrh8vegjmWPfBEp2uEcwPenStPuiB/vHiyz5ewG5zz13ku9Ui20vsXiObTej/tUxPQ4i9q
+ecsAIyjmHjdXNYmEwnZPNDatZ8POQQaIxffu2Bq41gt/UP+TqhdLjOztUmCypAbqTuv0axn96/Ua
+4CUqmtzHQTb3yHQFhDmVOdYLO6Qn+gjYXB74BGBSESgoA//vU2YApUo0FmZ8/Qmkrp5nGm9BC2sG
+E5uPhnEFtC+NiWYzKXZUmhH4J/qyP5Hgzg0b8zAarb8iXRvTvyUFTeGSGn+ZnzxEk8rUQElsgIfX
+BDrDMlI1Dlb4pd19xIsNER9Tyx6yF7Zod1rg1MvIB671Oi6ON7fQAUtDKXeMOZePglr4UeWJoBjn
+aH9dCi77o0cOPaYjesYBx4/IXr9tgFa+iiS6M+qf4TIRnvHST4D2G0CvOJ4RUHlzEhLN5mydLIhy
+PDCBBpEi6lmt2hkuIsKNuYyH4Ga8cyNfIWRjgEj1oDwYPZTISEEdQLpe/v5WOaHIz16eGWRGENoX
+kbcFgKyLmZJ956LYBws2J+dIeWCKw9cTXPhyQN9Ky8+ZAAoACxGV2lZFA4gKn2fQ1XmxqI1AbQ3C
+ekD6819kR5LLU7m7Wc5P/dAVUwHY3+vZ5nbv0CO7O6l5s9UCKc2Jo5YPSjXnTkLAdc0Hz+Ys63su
+-----END CERTIFICATE-----
+
+TÜRKTRUST Elektronik Sertifika Hizmet Sağlayıcısı H5
+====================================================
+-----BEGIN CERTIFICATE-----
+MIIEJzCCAw+gAwIBAgIHAI4X/iQggTANBgkqhkiG9w0BAQsFADCBsTELMAkGA1UEBhMCVFIxDzAN
+BgNVBAcMBkFua2FyYTFNMEsGA1UECgxEVMOcUktUUlVTVCBCaWxnaSDEsGxldGnFn2ltIHZlIEJp
+bGnFn2ltIEfDvHZlbmxpxJ9pIEhpem1ldGxlcmkgQS7Fni4xQjBABgNVBAMMOVTDnFJLVFJVU1Qg
+RWxla3Ryb25payBTZXJ0aWZpa2EgSGl6bWV0IFNhxJ9sYXnEsWPEsXPEsSBINTAeFw0xMzA0MzAw
+ODA3MDFaFw0yMzA0MjgwODA3MDFaMIGxMQswCQYDVQQGEwJUUjEPMA0GA1UEBwwGQW5rYXJhMU0w
+SwYDVQQKDERUw5xSS1RSVVNUIEJpbGdpIMSwbGV0acWfaW0gdmUgQmlsacWfaW0gR8O8dmVubGnE
+n2kgSGl6bWV0bGVyaSBBLsWeLjFCMEAGA1UEAww5VMOcUktUUlVTVCBFbGVrdHJvbmlrIFNlcnRp
+ZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxIEg1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEApCUZ4WWe60ghUEoI5RHwWrom/4NZzkQqL/7hzmAD/I0Dpe3/a6i6zDQGn1k19uwsu537
+jVJp45wnEFPzpALFp/kRGml1bsMdi9GYjZOHp3GXDSHHmflS0yxjXVW86B8BSLlg/kJK9siArs1m
+ep5Fimh34khon6La8eHBEJ/rPCmBp+EyCNSgBbGM+42WAA4+Jd9ThiI7/PS98wl+d+yG6w8z5UNP
+9FR1bSmZLmZaQ9/LXMrI5Tjxfjs1nQ/0xVqhzPMggCTTV+wVunUlm+hkS7M0hO8EuPbJbKoCPrZV
+4jI3X/xml1/N1p7HIL9Nxqw/dV8c7TKcfGkAaZHjIxhT6QIDAQABo0IwQDAdBgNVHQ4EFgQUVpkH
+HtOsDGlktAxQR95DLL4gwPswDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZI
+hvcNAQELBQADggEBAJ5FdnsXSDLyOIspve6WSk6BGLFRRyDN0GSxDsnZAdkJzsiZ3GglE9Rc8qPo
+BP5yCccLqh0lVX6Wmle3usURehnmp349hQ71+S4pL+f5bFgWV1Al9j4uPqrtd3GqqpmWRgqujuwq
+URawXs3qZwQcWDD1YIq9pr1N5Za0/EKJAWv2cMhQOQwt1WbZyNKzMrcbGW3LM/nfpeYVhDfwwvJl
+lpKQd/Ct9JDpEXjXk4nAPQu6KfTomZ1yju2dL+6SfaHx/126M2CFYv4HAqGEVka+lgqaE9chTLd8
+B59OTj+RdPsnnRHM3eaxynFNExc5JsUpISuTKWqW+qtB4Uu2NQvAmxU=
+-----END CERTIFICATE-----
+
+TÜRKTRUST Elektronik Sertifika Hizmet Sağlayıcısı H6
+====================================================
+-----BEGIN CERTIFICATE-----
+MIIEJjCCAw6gAwIBAgIGfaHyZeyKMA0GCSqGSIb3DQEBCwUAMIGxMQswCQYDVQQGEwJUUjEPMA0G
+A1UEBwwGQW5rYXJhMU0wSwYDVQQKDERUw5xSS1RSVVNUIEJpbGdpIMSwbGV0acWfaW0gdmUgQmls
+acWfaW0gR8O8dmVubGnEn2kgSGl6bWV0bGVyaSBBLsWeLjFCMEAGA1UEAww5VMOcUktUUlVTVCBF
+bGVrdHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxIEg2MB4XDTEzMTIxODA5
+MDQxMFoXDTIzMTIxNjA5MDQxMFowgbExCzAJBgNVBAYTAlRSMQ8wDQYDVQQHDAZBbmthcmExTTBL
+BgNVBAoMRFTDnFJLVFJVU1QgQmlsZ2kgxLBsZXRpxZ9pbSB2ZSBCaWxpxZ9pbSBHw7x2ZW5sacSf
+aSBIaXptZXRsZXJpIEEuxZ4uMUIwQAYDVQQDDDlUw5xSS1RSVVNUIEVsZWt0cm9uaWsgU2VydGlm
+aWthIEhpem1ldCBTYcSfbGF5xLFjxLFzxLEgSDYwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQCdsGjW6L0UlqMACprx9MfMkU1xeHe59yEmFXNRFpQJRwXiM/VomjX/3EsvMsew7eKC5W/a
+2uqsxgbPJQ1BgfbBOCK9+bGlprMBvD9QFyv26WZV1DOzXPhDIHiTVRZwGTLmiddk671IUP320EED
+wnS3/faAz1vFq6TWlRKb55cTMgPp1KtDWxbtMyJkKbbSk60vbNg9tvYdDjTu0n2pVQ8g9P0pu5Fb
+HH3GQjhtQiht1AH7zYiXSX6484P4tZgvsycLSF5W506jM7NE1qXyGJTtHB6plVxiSvgNZ1GpryHV
++DKdeboaX+UEVU0TRv/yz3THGmNtwx8XEsMeED5gCLMxAgMBAAGjQjBAMB0GA1UdDgQWBBTdVRcT
+9qzoSCHK77Wv0QAy7Z6MtTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG
+9w0BAQsFAAOCAQEAb1gNl0OqFlQ+v6nfkkU/hQu7VtMMUszIv3ZnXuaqs6fvuay0EBQNdH49ba3R
+fdCaqaXKGDsCQC4qnFAUi/5XfldcEQlLNkVS9z2sFP1E34uXI9TDwe7UU5X+LEr+DXCqu4svLcsy
+o4LyVN/Y8t3XSHLuSqMplsNEzm61kod2pLv0kmzOLBQJZo6NrRa1xxsJYTvjIKIDgI6tflEATseW
+hvtDmHd9KMeP2Cpu54Rvl0EpABZeTeIT6lnAY2c6RPuY/ATTMHKm9ocJV612ph1jmv3XZch4gyt1
+O6VbuA1df74jrlZVlFjvH4GMKrLN5ptjnhi85WsGtAuYSyher4hYyw==
+-----END CERTIFICATE-----
+
+Certinomis - Root CA
+====================
+-----BEGIN CERTIFICATE-----
+MIIFkjCCA3qgAwIBAgIBATANBgkqhkiG9w0BAQsFADBaMQswCQYDVQQGEwJGUjETMBEGA1UEChMK
+Q2VydGlub21pczEXMBUGA1UECxMOMDAwMiA0MzM5OTg5MDMxHTAbBgNVBAMTFENlcnRpbm9taXMg
+LSBSb290IENBMB4XDTEzMTAyMTA5MTcxOFoXDTMzMTAyMTA5MTcxOFowWjELMAkGA1UEBhMCRlIx
+EzARBgNVBAoTCkNlcnRpbm9taXMxFzAVBgNVBAsTDjAwMDIgNDMzOTk4OTAzMR0wGwYDVQQDExRD
+ZXJ0aW5vbWlzIC0gUm9vdCBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANTMCQos
+P5L2fxSeC5yaah1AMGT9qt8OHgZbn1CF6s2Nq0Nn3rD6foCWnoR4kkjW4znuzuRZWJflLieY6pOo
+d5tK8O90gC3rMB+12ceAnGInkYjwSond3IjmFPnVAy//ldu9n+ws+hQVWZUKxkd8aRi5pwP5ynap
+z8dvtF4F/u7BUrJ1Mofs7SlmO/NKFoL21prbcpjp3vDFTKWrteoB4owuZH9kb/2jJZOLyKIOSY00
+8B/sWEUuNKqEUL3nskoTuLAPrjhdsKkb5nPJWqHZZkCqqU2mNAKthH6yI8H7KsZn9DS2sJVqM09x
+RLWtwHkziOC/7aOgFLScCbAK42C++PhmiM1b8XcF4LVzbsF9Ri6OSyemzTUK/eVNfaoqoynHWmgE
+6OXWk6RiwsXm9E/G+Z8ajYJJGYrKWUM66A0ywfRMEwNvbqY/kXPLynNvEiCL7sCCeN5LLsJJwx3t
+FvYk9CcbXFcx3FXuqB5vbKziRcxXV4p1VxngtViZSTYxPDMBbRZKzbgqg4SGm/lg0h9tkQPTYKbV
+PZrdd5A9NaSfD171UkRpucC63M9933zZxKyGIjK8e2uR73r4F2iw4lNVYC2vPsKD2NkJK/DAZNuH
+i5HMkesE/Xa0lZrmFAYb1TQdvtj/dBxThZngWVJKYe2InmtJiUZ+IFrZ50rlau7SZRFDAgMBAAGj
+YzBhMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBTvkUz1pcMw6C8I
+6tNxIqSSaHh02TAfBgNVHSMEGDAWgBTvkUz1pcMw6C8I6tNxIqSSaHh02TANBgkqhkiG9w0BAQsF
+AAOCAgEAfj1U2iJdGlg+O1QnurrMyOMaauo++RLrVl89UM7g6kgmJs95Vn6RHJk/0KGRHCwPT5iV
+WVO90CLYiF2cN/z7ZMF4jIuaYAnq1fohX9B0ZedQxb8uuQsLrbWwF6YSjNRieOpWauwK0kDDPAUw
+Pk2Ut59KA9N9J0u2/kTO+hkzGm2kQtHdzMjI1xZSg081lLMSVX3l4kLr5JyTCcBMWwerx20RoFAX
+lCOotQqSD7J6wWAsOMwaplv/8gzjqh8c3LigkyfeY+N/IZ865Z764BNqdeuWXGKRlI5nU7aJ+BIJ
+y29SWwNyhlCVCNSNh4YVH5Uk2KRvms6knZtt0rJ2BobGVgjF6wnaNsIbW0G+YSrjcOa4pvi2WsS9
+Iff/ql+hbHY5ZtbqTFXhADObE5hjyW/QASAJN1LnDE8+zbz1X5YnpyACleAu6AdBBR8Vbtaw5Bng
+DwKTACdyxYvRVB9dSsNAl35VpnzBMwQUAR1JIGkLGZOdblgi90AMRgwjY/M50n92Uaf0yKHxDHYi
+I0ZSKS3io0EHVmmY0gUJvGnHWmHNj4FgFU2A3ZDifcRQ8ow7bkrHxuaAKzyBvBGAFhAn1/DNP3nM
+cyrDflOR1m749fPH0FFNjkulW+YZFzvWgQncItzujrnEj1PhZ7szuIgVRs/taTX/dQ1G885x4cVr
+hkIGuUE=
+-----END CERTIFICATE-----
+
+OISTE WISeKey Global Root GB CA
+===============================
+-----BEGIN CERTIFICATE-----
+MIIDtTCCAp2gAwIBAgIQdrEgUnTwhYdGs/gjGvbCwDANBgkqhkiG9w0BAQsFADBtMQswCQYDVQQG
+EwJDSDEQMA4GA1UEChMHV0lTZUtleTEiMCAGA1UECxMZT0lTVEUgRm91bmRhdGlvbiBFbmRvcnNl
+ZDEoMCYGA1UEAxMfT0lTVEUgV0lTZUtleSBHbG9iYWwgUm9vdCBHQiBDQTAeFw0xNDEyMDExNTAw
+MzJaFw0zOTEyMDExNTEwMzFaMG0xCzAJBgNVBAYTAkNIMRAwDgYDVQQKEwdXSVNlS2V5MSIwIAYD
+VQQLExlPSVNURSBGb3VuZGF0aW9uIEVuZG9yc2VkMSgwJgYDVQQDEx9PSVNURSBXSVNlS2V5IEds
+b2JhbCBSb290IEdCIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2Be3HEokKtaX
+scriHvt9OO+Y9bI5mE4nuBFde9IllIiCFSZqGzG7qFshISvYD06fWvGxWuR51jIjK+FTzJlFXHtP
+rby/h0oLS5daqPZI7H17Dc0hBt+eFf1Biki3IPShehtX1F1Q/7pn2COZH8g/497/b1t3sWtuuMlk
+9+HKQUYOKXHQuSP8yYFfTvdv37+ErXNku7dCjmn21HYdfp2nuFeKUWdy19SouJVUQHMD9ur06/4o
+Qnc/nSMbsrY9gBQHTC5P99UKFg29ZkM3fiNDecNAhvVMKdqOmq0NpQSHiB6F4+lT1ZvIiwNjeOvg
+GUpuuy9rM2RYk61pv48b74JIxwIDAQABo1EwTzALBgNVHQ8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB
+/zAdBgNVHQ4EFgQUNQ/INmNe4qPs+TtmFc5RUuORmj0wEAYJKwYBBAGCNxUBBAMCAQAwDQYJKoZI
+hvcNAQELBQADggEBAEBM+4eymYGQfp3FsLAmzYh7KzKNbrghcViXfa43FK8+5/ea4n32cZiZBKpD
+dHij40lhPnOMTZTg+XHEthYOU3gf1qKHLwI5gSk8rxWYITD+KJAAjNHhy/peyP34EEY7onhCkRd0
+VQreUGdNZtGn//3ZwLWoo4rOZvUPQ82nK1d7Y0Zqqi5S2PTt4W2tKZB4SLrhI6qjiey1q5bAtEui
+HZeeevJuQHHfaPFlTc58Bd9TZaml8LGXBHAVRgOY1NK/VLSgWH1Sb9pWJmLU2NuJMW8c8CLC02Ic
+Nc1MaRVUGpCY3useX8p3x8uOPUNpnJpY0CQ73xtAln41rYHHTnG6iBM=
+-----END CERTIFICATE-----
+
+Certification Authority of WoSign G2
+====================================
+-----BEGIN CERTIFICATE-----
+MIIDfDCCAmSgAwIBAgIQayXaioidfLwPBbOxemFFRDANBgkqhkiG9w0BAQsFADBYMQswCQYDVQQG
+EwJDTjEaMBgGA1UEChMRV29TaWduIENBIExpbWl0ZWQxLTArBgNVBAMTJENlcnRpZmljYXRpb24g
+QXV0aG9yaXR5IG9mIFdvU2lnbiBHMjAeFw0xNDExMDgwMDU4NThaFw00NDExMDgwMDU4NThaMFgx
+CzAJBgNVBAYTAkNOMRowGAYDVQQKExFXb1NpZ24gQ0EgTGltaXRlZDEtMCsGA1UEAxMkQ2VydGlm
+aWNhdGlvbiBBdXRob3JpdHkgb2YgV29TaWduIEcyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEAvsXEoCKASU+/2YcRxlPhuw+9YH+v9oIOH9ywjj2X4FA8jzrvZjtFB5sg+OPXJYY1kBai
+XW8wGQiHC38Gsp1ij96vkqVg1CuAmlI/9ZqD6TRay9nVYlzmDuDfBpgOgHzKtB0TiGsOqCR3A9Du
+W/PKaZE1OVbFbeP3PU9ekzgkyhjpJMuSA93MHD0JcOQg5PGurLtzaaNjOg9FD6FKmsLRY6zLEPg9
+5k4ot+vElbGs/V6r+kHLXZ1L3PR8du9nfwB6jdKgGlxNIuG12t12s9R23164i5jIFFTMaxeSt+BK
+v0mUYQs4kI9dJGwlezt52eJ+na2fmKEG/HgUYFf47oB3sQIDAQABo0IwQDAOBgNVHQ8BAf8EBAMC
+AQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU+mCp62XF3RYUCE4MD42b4Pdkr2cwDQYJKoZI
+hvcNAQELBQADggEBAFfDejaCnI2Y4qtAqkePx6db7XznPWZaOzG73/MWM5H8fHulwqZm46qwtyeY
+P0nXYGdnPzZPSsvxFPpahygc7Y9BMsaV+X3avXtbwrAh449G3CE4Q3RM+zD4F3LBMvzIkRfEzFg3
+TgvMWvchNSiDbGAtROtSjFA9tWwS1/oJu2yySrHFieT801LYYRf+epSEj3m2M1m6D8QL4nCgS3gu
++sif/a+RZQp4OBXllxcU3fngLDT4ONCEIgDAFFEYKwLcMFrw6AF8NTojrwjkr6qOKEJJLvD1mTS+
+7Q9LGOHSJDy7XUe3IfKN0QqZjuNuPq1w4I+5ysxugTH2e5x6eeRncRg=
+-----END CERTIFICATE-----
+
+CA WoSign ECC Root
+==================
+-----BEGIN CERTIFICATE-----
+MIICCTCCAY+gAwIBAgIQaEpYcIBr8I8C+vbe6LCQkDAKBggqhkjOPQQDAzBGMQswCQYDVQQGEwJD
+TjEaMBgGA1UEChMRV29TaWduIENBIExpbWl0ZWQxGzAZBgNVBAMTEkNBIFdvU2lnbiBFQ0MgUm9v
+dDAeFw0xNDExMDgwMDU4NThaFw00NDExMDgwMDU4NThaMEYxCzAJBgNVBAYTAkNOMRowGAYDVQQK
+ExFXb1NpZ24gQ0EgTGltaXRlZDEbMBkGA1UEAxMSQ0EgV29TaWduIEVDQyBSb290MHYwEAYHKoZI
+zj0CAQYFK4EEACIDYgAE4f2OuEMkq5Z7hcK6C62N4DrjJLnSsb6IOsq/Srj57ywvr1FQPEd1bPiU
+t5v8KB7FVMxjnRZLU8HnIKvNrCXSf4/CwVqCXjCLelTOA7WRf6qU0NGKSMyCBSah1VES1ns2o0Iw
+QDAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUqv3VWqP2h4syhf3R
+MluARZPzA7gwCgYIKoZIzj0EAwMDaAAwZQIxAOSkhLCB1T2wdKyUpOgOPQB0TKGXa/kNUTyh2Tv0
+Daupn75OcsqF1NnstTJFGG+rrQIwfcf3aWMvoeGY7xMQ0Xk/0f7qO3/eVvSQsRUR2LIiFdAvwyYu
+a/GRspBl9JrmkO5K
+-----END CERTIFICATE-----
+
+SZAFIR ROOT CA2
+===============
+-----BEGIN CERTIFICATE-----
+MIIDcjCCAlqgAwIBAgIUPopdB+xV0jLVt+O2XwHrLdzk1uQwDQYJKoZIhvcNAQELBQAwUTELMAkG
+A1UEBhMCUEwxKDAmBgNVBAoMH0tyYWpvd2EgSXpiYSBSb3psaWN6ZW5pb3dhIFMuQS4xGDAWBgNV
+BAMMD1NaQUZJUiBST09UIENBMjAeFw0xNTEwMTkwNzQzMzBaFw0zNTEwMTkwNzQzMzBaMFExCzAJ
+BgNVBAYTAlBMMSgwJgYDVQQKDB9LcmFqb3dhIEl6YmEgUm96bGljemVuaW93YSBTLkEuMRgwFgYD
+VQQDDA9TWkFGSVIgUk9PVCBDQTIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3vD5Q
+qEvNQLXOYeeWyrSh2gwisPq1e3YAd4wLz32ohswmUeQgPYUM1ljj5/QqGJ3a0a4m7utT3PSQ1hNK
+DJA8w/Ta0o4NkjrcsbH/ON7Dui1fgLkCvUqdGw+0w8LBZwPd3BucPbOw3gAeqDRHu5rr/gsUvTaE
+2g0gv/pby6kWIK05YO4vdbbnl5z5Pv1+TW9NL++IDWr63fE9biCloBK0TXC5ztdyO4mTp4CEHCdJ
+ckm1/zuVnsHMyAHs6A6KCpbns6aH5db5BSsNl0BwPLqsdVqc1U2dAgrSS5tmS0YHF2Wtn2yIANwi
+ieDhZNRnvDF5YTy7ykHNXGoAyDw4jlivAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0P
+AQH/BAQDAgEGMB0GA1UdDgQWBBQuFqlKGLXLzPVvUPMjX/hd56zwyDANBgkqhkiG9w0BAQsFAAOC
+AQEAtXP4A9xZWx126aMqe5Aosk3AM0+qmrHUuOQn/6mWmc5G4G18TKI4pAZw8PRBEew/R40/cof5
+O/2kbytTAOD/OblqBw7rHRz2onKQy4I9EYKL0rufKq8h5mOGnXkZ7/e7DDWQw4rtTw/1zBLZpD67
+oPwglV9PJi8RI4NOdQcPv5vRtB3pEAT+ymCPoky4rc/hkA/NrgrHXXu3UNLUYfrVFdvXn4dRVOul
+4+vJhaAlIDf7js4MNIThPIGyd05DpYhfhmehPea0XGG2Ptv+tyjFogeutcrKjSoS75ftwjCkySp6
++/NNIxuZMzSgLvWpCz/UXeHPhJ/iGcJfitYgHuNztw==
+-----END CERTIFICATE-----
+
+Certum Trusted Network CA 2
+===========================
+-----BEGIN CERTIFICATE-----
+MIIF0jCCA7qgAwIBAgIQIdbQSk8lD8kyN/yqXhKN6TANBgkqhkiG9w0BAQ0FADCBgDELMAkGA1UE
+BhMCUEwxIjAgBgNVBAoTGVVuaXpldG8gVGVjaG5vbG9naWVzIFMuQS4xJzAlBgNVBAsTHkNlcnR1
+bSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTEkMCIGA1UEAxMbQ2VydHVtIFRydXN0ZWQgTmV0d29y
+ayBDQSAyMCIYDzIwMTExMDA2MDgzOTU2WhgPMjA0NjEwMDYwODM5NTZaMIGAMQswCQYDVQQGEwJQ
+TDEiMCAGA1UEChMZVW5pemV0byBUZWNobm9sb2dpZXMgUy5BLjEnMCUGA1UECxMeQ2VydHVtIENl
+cnRpZmljYXRpb24gQXV0aG9yaXR5MSQwIgYDVQQDExtDZXJ0dW0gVHJ1c3RlZCBOZXR3b3JrIENB
+IDIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC9+Xj45tWADGSdhhuWZGc/IjoedQF9
+7/tcZ4zJzFxrqZHmuULlIEub2pt7uZld2ZuAS9eEQCsn0+i6MLs+CRqnSZXvK0AkwpfHp+6bJe+o
+CgCXhVqqndwpyeI1B+twTUrWwbNWuKFBOJvR+zF/j+Bf4bE/D44WSWDXBo0Y+aomEKsq09DRZ40b
+Rr5HMNUuctHFY9rnY3lEfktjJImGLjQ/KUxSiyqnwOKRKIm5wFv5HdnnJ63/mgKXwcZQkpsCLL2p
+uTRZCr+ESv/f/rOf69me4Jgj7KZrdxYq28ytOxykh9xGc14ZYmhFV+SQgkK7QtbwYeDBoz1mo130
+GO6IyY0XRSmZMnUCMe4pJshrAua1YkV/NxVaI2iJ1D7eTiew8EAMvE0Xy02isx7QBlrd9pPPV3WZ
+9fqGGmd4s7+W/jTcvedSVuWz5XV710GRBdxdaeOVDUO5/IOWOZV7bIBaTxNyxtd9KXpEulKkKtVB
+Rgkg/iKgtlswjbyJDNXXcPiHUv3a76xRLgezTv7QCdpw75j6VuZt27VXS9zlLCUVyJ4ueE742pye
+hizKV/Ma5ciSixqClnrDvFASadgOWkaLOusm+iPJtrCBvkIApPjW/jAux9JG9uWOdf3yzLnQh1vM
+BhBgu4M1t15n3kfsmUjxpKEV/q2MYo45VU85FrmxY53/twIDAQABo0IwQDAPBgNVHRMBAf8EBTAD
+AQH/MB0GA1UdDgQWBBS2oVQ5AsOgP46KvPrU+Bym0ToO/TAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZI
+hvcNAQENBQADggIBAHGlDs7k6b8/ONWJWsQCYftMxRQXLYtPU2sQF/xlhMcQSZDe28cmk4gmb3DW
+Al45oPePq5a1pRNcgRRtDoGCERuKTsZPpd1iHkTfCVn0W3cLN+mLIMb4Ck4uWBzrM9DPhmDJ2vuA
+L55MYIR4PSFk1vtBHxgP58l1cb29XN40hz5BsA72udY/CROWFC/emh1auVbONTqwX3BNXuMp8SMo
+clm2q8KMZiYcdywmdjWLKKdpoPk79SPdhRB0yZADVpHnr7pH1BKXESLjokmUbOe3lEu6LaTaM4tM
+pkT/WjzGHWTYtTHkpjx6qFcL2+1hGsvxznN3Y6SHb0xRONbkX8eftoEq5IVIeVheO/jbAoJnwTnb
+w3RLPTYe+SmTiGhbqEQZIfCn6IENLOiTNrQ3ssqwGyZ6miUfmpqAnksqP/ujmv5zMnHCnsZy4Ypo
+J/HkD7TETKVhk/iXEAcqMCWpuchxuO9ozC1+9eB+D4Kob7a6bINDd82Kkhehnlt4Fj1F4jNy3eFm
+ypnTycUm/Q1oBEauttmbjL4ZvrHG8hnjXALKLNhvSgfZyTXaQHXyxKcZb55CEJh15pWLYLztxRLX
+is7VmFxWlgPF7ncGNf/P5O4/E2Hu29othfDNrp2yGAlFw5Khchf8R7agCyzxxN5DaAhqXzvwdmP7
+zAYspsbiDrW5viSP
+-----END CERTIFICATE-----
+
+Hellenic Academic and Research Institutions RootCA 2015
+=======================================================
+-----BEGIN CERTIFICATE-----
+MIIGCzCCA/OgAwIBAgIBADANBgkqhkiG9w0BAQsFADCBpjELMAkGA1UEBhMCR1IxDzANBgNVBAcT
+BkF0aGVuczFEMEIGA1UEChM7SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0
+aW9ucyBDZXJ0LiBBdXRob3JpdHkxQDA+BgNVBAMTN0hlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNl
+YXJjaCBJbnN0aXR1dGlvbnMgUm9vdENBIDIwMTUwHhcNMTUwNzA3MTAxMTIxWhcNNDAwNjMwMTAx
+MTIxWjCBpjELMAkGA1UEBhMCR1IxDzANBgNVBAcTBkF0aGVuczFEMEIGA1UEChM7SGVsbGVuaWMg
+QWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9ucyBDZXJ0LiBBdXRob3JpdHkxQDA+BgNV
+BAMTN0hlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNlYXJjaCBJbnN0aXR1dGlvbnMgUm9vdENBIDIw
+MTUwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDC+Kk/G4n8PDwEXT2QNrCROnk8Zlrv
+bTkBSRq0t89/TSNTt5AA4xMqKKYx8ZEA4yjsriFBzh/a/X0SWwGDD7mwX5nh8hKDgE0GPt+sr+eh
+iGsxr/CL0BgzuNtFajT0AoAkKAoCFZVedioNmToUW/bLy1O8E00BiDeUJRtCvCLYjqOWXjrZMts+
+6PAQZe104S+nfK8nNLspfZu2zwnI5dMK/IhlZXQK3HMcXM1AsRzUtoSMTFDPaI6oWa7CJ06CojXd
+FPQf/7J31Ycvqm59JCfnxssm5uX+Zwdj2EUN3TpZZTlYepKZcj2chF6IIbjV9Cz82XBST3i4vTwr
+i5WY9bPRaM8gFH5MXF/ni+X1NYEZN9cRCLdmvtNKzoNXADrDgfgXy5I2XdGj2HUb4Ysn6npIQf1F
+GQatJ5lOwXBH3bWfgVMS5bGMSF0xQxfjjMZ6Y5ZLKTBOhE5iGV48zpeQpX8B653g+IuJ3SWYPZK2
+fu/Z8VFRfS0myGlZYeCsargqNhEEelC9MoS+L9xy1dcdFkfkR2YgP/SWxa+OAXqlD3pk9Q0Yh9mu
+iNX6hME6wGkoLfINaFGq46V3xqSQDqE3izEjR8EJCOtu93ib14L8hCCZSRm2Ekax+0VVFqmjZayc
+Bw/qa9wfLgZy7IaIEuQt218FL+TwA9MmM+eAws1CoRc0CwIDAQABo0IwQDAPBgNVHRMBAf8EBTAD
+AQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUcRVnyMjJvXVdctA4GGqd83EkVAswDQYJKoZI
+hvcNAQELBQADggIBAHW7bVRLqhBYRjTyYtcWNl0IXtVsyIe9tC5G8jH4fOpCtZMWVdyhDBKg2mF+
+D1hYc2Ryx+hFjtyp8iY/xnmMsVMIM4GwVhO+5lFc2JsKT0ucVlMC6U/2DWDqTUJV6HwbISHTGzrM
+d/K4kPFox/la/vot9L/J9UUbzjgQKjeKeaO04wlshYaT/4mWJ3iBj2fjRnRUjtkNaeJK9E10A/+y
+d+2VZ5fkscWrv2oj6NSU4kQoYsRL4vDY4ilrGnB+JGGTe08DMiUNRSQrlrRGar9KC/eaj8GsGsVn
+82800vpzY4zvFrCopEYq+OsS7HK07/grfoxSwIuEVPkvPuNVqNxmsdnhX9izjFk0WaSrT2y7Hxjb
+davYy5LNlDhhDgcGH0tGEPEVvo2FXDtKK4F5D7Rpn0lQl033DlZdwJVqwjbDG2jJ9SrcR5q+ss7F
+Jej6A7na+RZukYT1HCjI/CbM1xyQVqdfbzoEvM14iQuODy+jqk+iGxI9FghAD/FGTNeqewjBCvVt
+J94Cj8rDtSvK6evIIVM4pcw72Hc3MKJP2W/R8kCtQXoXxdZKNYm3QdV8hn9VTYNKpXMgwDqvkPGa
+JI7ZjnHKe7iG2rKPmT4dEw0SEe7Uq/DpFXYC5ODfqiAeW2GFZECpkJcNrVPSWh2HagCXZWK0vm9q
+p/UsQu0yrbYhnr68
+-----END CERTIFICATE-----
+
+Hellenic Academic and Research Institutions ECC RootCA 2015
+===========================================================
+-----BEGIN CERTIFICATE-----
+MIICwzCCAkqgAwIBAgIBADAKBggqhkjOPQQDAjCBqjELMAkGA1UEBhMCR1IxDzANBgNVBAcTBkF0
+aGVuczFEMEIGA1UEChM7SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9u
+cyBDZXJ0LiBBdXRob3JpdHkxRDBCBgNVBAMTO0hlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNlYXJj
+aCBJbnN0aXR1dGlvbnMgRUNDIFJvb3RDQSAyMDE1MB4XDTE1MDcwNzEwMzcxMloXDTQwMDYzMDEw
+MzcxMlowgaoxCzAJBgNVBAYTAkdSMQ8wDQYDVQQHEwZBdGhlbnMxRDBCBgNVBAoTO0hlbGxlbmlj
+IEFjYWRlbWljIGFuZCBSZXNlYXJjaCBJbnN0aXR1dGlvbnMgQ2VydC4gQXV0aG9yaXR5MUQwQgYD
+VQQDEztIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIEVDQyBSb290
+Q0EgMjAxNTB2MBAGByqGSM49AgEGBSuBBAAiA2IABJKgQehLgoRc4vgxEZmGZE4JJS+dQS8KrjVP
+dJWyUWRrjWvmP3CV8AVER6ZyOFB2lQJajq4onvktTpnvLEhvTCUp6NFxW98dwXU3tNf6e3pCnGoK
+Vlp8aQuqgAkkbH7BRqNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0O
+BBYEFLQiC4KZJAEOnLvkDv2/+5cgk5kqMAoGCCqGSM49BAMCA2cAMGQCMGfOFmI4oqxiRaeplSTA
+GiecMjvAwNW6qef4BENThe5SId6d9SWDPp5YSy/XZxMOIQIwBeF1Ad5o7SofTUwJCA3sS61kFyjn
+dc5FZXIhF8siQQ6ME5g4mlRtm8rifOoCWCKR
+-----END CERTIFICATE-----
+
+Certplus Root CA G1
+===================
+-----BEGIN CERTIFICATE-----
+MIIFazCCA1OgAwIBAgISESBVg+QtPlRWhS2DN7cs3EYRMA0GCSqGSIb3DQEBDQUAMD4xCzAJBgNV
+BAYTAkZSMREwDwYDVQQKDAhDZXJ0cGx1czEcMBoGA1UEAwwTQ2VydHBsdXMgUm9vdCBDQSBHMTAe
+Fw0xNDA1MjYwMDAwMDBaFw0zODAxMTUwMDAwMDBaMD4xCzAJBgNVBAYTAkZSMREwDwYDVQQKDAhD
+ZXJ0cGx1czEcMBoGA1UEAwwTQ2VydHBsdXMgUm9vdCBDQSBHMTCCAiIwDQYJKoZIhvcNAQEBBQAD
+ggIPADCCAgoCggIBANpQh7bauKk+nWT6VjOaVj0W5QOVsjQcmm1iBdTYj+eJZJ+622SLZOZ5KmHN
+r49aiZFluVj8tANfkT8tEBXgfs+8/H9DZ6itXjYj2JizTfNDnjl8KvzsiNWI7nC9hRYt6kuJPKNx
+Qv4c/dMcLRC4hlTqQ7jbxofaqK6AJc96Jh2qkbBIb6613p7Y1/oA/caP0FG7Yn2ksYyy/yARujVj
+BYZHYEMzkPZHogNPlk2dT8Hq6pyi/jQu3rfKG3akt62f6ajUeD94/vI4CTYd0hYCyOwqaK/1jpTv
+LRN6HkJKHRUxrgwEV/xhc/MxVoYxgKDEEW4wduOU8F8ExKyHcomYxZ3MVwia9Az8fXoFOvpHgDm2
+z4QTd28n6v+WZxcIbekN1iNQMLAVdBM+5S//Ds3EC0pd8NgAM0lm66EYfFkuPSi5YXHLtaW6uOrc
+4nBvCGrch2c0798wct3zyT8j/zXhviEpIDCB5BmlIOklynMxdCm+4kLV87ImZsdo/Rmz5yCTmehd
+4F6H50boJZwKKSTUzViGUkAksnsPmBIgJPaQbEfIDbsYIC7Z/fyL8inqh3SV4EJQeIQEQWGw9CEj
+jy3LKCHyamz0GqbFFLQ3ZU+V/YDI+HLlJWvEYLF7bY5KinPOWftwenMGE9nTdDckQQoRb5fc5+R+
+ob0V8rqHDz1oihYHAgMBAAGjYzBhMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0G
+A1UdDgQWBBSowcCbkahDFXxdBie0KlHYlwuBsTAfBgNVHSMEGDAWgBSowcCbkahDFXxdBie0KlHY
+lwuBsTANBgkqhkiG9w0BAQ0FAAOCAgEAnFZvAX7RvUz1isbwJh/k4DgYzDLDKTudQSk0YcbX8ACh
+66Ryj5QXvBMsdbRX7gp8CXrc1cqh0DQT+Hern+X+2B50ioUHj3/MeXrKls3N/U/7/SMNkPX0XtPG
+YX2eEeAC7gkE2Qfdpoq3DIMku4NQkv5gdRE+2J2winq14J2by5BSS7CTKtQ+FjPlnsZlFT5kOwQ/
+2wyPX1wdaR+v8+khjPPvl/aatxm2hHSco1S1cE5j2FddUyGbQJJD+tZ3VTNPZNX70Cxqjm0lpu+F
+6ALEUz65noe8zDUa3qHpimOHZR4RKttjd5cUvpoUmRGywO6wT/gUITJDT5+rosuoD6o7BlXGEilX
+CNQ314cnrUlZp5GrRHpejXDbl85IULFzk/bwg2D5zfHhMf1bfHEhYxQUqq/F3pN+aLHsIqKqkHWe
+tUNy6mSjhEv9DKgma3GX7lZjZuhCVPnHHd/Qj1vfyDBviP4NxDMcU6ij/UgQ8uQKTuEVV/xuZDDC
+VRHc6qnNSlSsKWNEz0pAoNZoWRsz+e86i9sgktxChL8Bq4fA1SCC28a5g4VCXA9DO2pJNdWY9BW/
++mGBDAkgGNLQFwzLSABQ6XaCjGTXOqAHVcweMcDvOrRl++O/QmueD6i9a5jc2NvLi6Td11n0bt3+
+qsOR0C5CB8AMTVPNJLFMWx5R9N/pkvo=
+-----END CERTIFICATE-----
+
+Certplus Root CA G2
+===================
+-----BEGIN CERTIFICATE-----
+MIICHDCCAaKgAwIBAgISESDZkc6uo+jF5//pAq/Pc7xVMAoGCCqGSM49BAMDMD4xCzAJBgNVBAYT
+AkZSMREwDwYDVQQKDAhDZXJ0cGx1czEcMBoGA1UEAwwTQ2VydHBsdXMgUm9vdCBDQSBHMjAeFw0x
+NDA1MjYwMDAwMDBaFw0zODAxMTUwMDAwMDBaMD4xCzAJBgNVBAYTAkZSMREwDwYDVQQKDAhDZXJ0
+cGx1czEcMBoGA1UEAwwTQ2VydHBsdXMgUm9vdCBDQSBHMjB2MBAGByqGSM49AgEGBSuBBAAiA2IA
+BM0PW1aC3/BFGtat93nwHcmsltaeTpwftEIRyoa/bfuFo8XlGVzX7qY/aWfYeOKmycTbLXku54uN
+Am8xIk0G42ByRZ0OQneezs/lf4WbGOT8zC5y0xaTTsqZY1yhBSpsBqNjMGEwDgYDVR0PAQH/BAQD
+AgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFNqDYwJ5jtpMxjwjFNiPwyCrKGBZMB8GA1Ud
+IwQYMBaAFNqDYwJ5jtpMxjwjFNiPwyCrKGBZMAoGCCqGSM49BAMDA2gAMGUCMHD+sAvZ94OX7PNV
+HdTcswYO/jOYnYs5kGuUIe22113WTNchp+e/IQ8rzfcq3IUHnQIxAIYUFuXcsGXCwI4Un78kFmjl
+vPl5adytRSv3tjFzzAalU5ORGpOucGpnutee5WEaXw==
+-----END CERTIFICATE-----
+
+OpenTrust Root CA G1
+====================
+-----BEGIN CERTIFICATE-----
+MIIFbzCCA1egAwIBAgISESCzkFU5fX82bWTCp59rY45nMA0GCSqGSIb3DQEBCwUAMEAxCzAJBgNV
+BAYTAkZSMRIwEAYDVQQKDAlPcGVuVHJ1c3QxHTAbBgNVBAMMFE9wZW5UcnVzdCBSb290IENBIEcx
+MB4XDTE0MDUyNjA4NDU1MFoXDTM4MDExNTAwMDAwMFowQDELMAkGA1UEBhMCRlIxEjAQBgNVBAoM
+CU9wZW5UcnVzdDEdMBsGA1UEAwwUT3BlblRydXN0IFJvb3QgQ0EgRzEwggIiMA0GCSqGSIb3DQEB
+AQUAA4ICDwAwggIKAoICAQD4eUbalsUwXopxAy1wpLuwxQjczeY1wICkES3d5oeuXT2R0odsN7fa
+Yp6bwiTXj/HbpqbfRm9RpnHLPhsxZ2L3EVs0J9V5ToybWL0iEA1cJwzdMOWo010hOHQX/uMftk87
+ay3bfWAfjH1MBcLrARYVmBSO0ZB3Ij/swjm4eTrwSSTilZHcYTSSjFR077F9jAHiOH3BX2pfJLKO
+YheteSCtqx234LSWSE9mQxAGFiQD4eCcjsZGT44ameGPuY4zbGneWK2gDqdkVBFpRGZPTBKnjix9
+xNRbxQA0MMHZmf4yzgeEtE7NCv82TWLxp2NX5Ntqp66/K7nJ5rInieV+mhxNaMbBGN4zK1FGSxyO
+9z0M+Yo0FMT7MzUj8czxKselu7Cizv5Ta01BG2Yospb6p64KTrk5M0ScdMGTHPjgniQlQ/GbI4Kq
+3ywgsNw2TgOzfALU5nsaqocTvz6hdLubDuHAk5/XpGbKuxs74zD0M1mKB3IDVedzagMxbm+WG+Oi
+n6+Sx+31QrclTDsTBM8clq8cIqPQqwWyTBIjUtz9GVsnnB47ev1CI9sjgBPwvFEVVJSmdz7QdFG9
+URQIOTfLHzSpMJ1ShC5VkLG631UAC9hWLbFJSXKAqWLXwPYYEQRVzXR7z2FwefR7LFxckvzluFqr
+TJOVoSfupb7PcSNCupt2LQIDAQABo2MwYTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB
+/zAdBgNVHQ4EFgQUl0YhVyE12jZVx/PxN3DlCPaTKbYwHwYDVR0jBBgwFoAUl0YhVyE12jZVx/Px
+N3DlCPaTKbYwDQYJKoZIhvcNAQELBQADggIBAB3dAmB84DWn5ph76kTOZ0BP8pNuZtQ5iSas000E
+PLuHIT839HEl2ku6q5aCgZG27dmxpGWX4m9kWaSW7mDKHyP7Rbr/jyTwyqkxf3kfgLMtMrpkZ2Cv
+uVnN35pJ06iCsfmYlIrM4LvgBBuZYLFGZdwIorJGnkSI6pN+VxbSFXJfLkur1J1juONI5f6ELlgK
+n0Md/rcYkoZDSw6cMoYsYPXpSOqV7XAp8dUv/TW0V8/bhUiZucJvbI/NeJWsZCj9VrDDb8O+WVLh
+X4SPgPL0DTatdrOjteFkdjpY3H1PXlZs5VVZV6Xf8YpmMIzUUmI4d7S+KNfKNsSbBfD4Fdvb8e80
+nR14SohWZ25g/4/Ii+GOvUKpMwpZQhISKvqxnUOOBZuZ2mKtVzazHbYNeS2WuOvyDEsMpZTGMKcm
+GS3tTAZQMPH9WD25SxdfGbRqhFS0OE85og2WaMMolP3tLR9Ka0OWLpABEPs4poEL0L9109S5zvE/
+bw4cHjdx5RiHdRk/ULlepEU0rbDK5uUTdg8xFKmOLZTW1YVNcxVPS/KyPu1svf0OnWZzsD2097+o
+4BGkxK51CUpjAEggpsadCwmKtODmzj7HPiY46SvepghJAwSQiumPv+i2tCqjI40cHLI5kqiPAlxA
+OXXUc0ECd97N4EOH1uS6SsNsEn/+KuYj1oxx
+-----END CERTIFICATE-----
+
+OpenTrust Root CA G2
+====================
+-----BEGIN CERTIFICATE-----
+MIIFbzCCA1egAwIBAgISESChaRu/vbm9UpaPI+hIvyYRMA0GCSqGSIb3DQEBDQUAMEAxCzAJBgNV
+BAYTAkZSMRIwEAYDVQQKDAlPcGVuVHJ1c3QxHTAbBgNVBAMMFE9wZW5UcnVzdCBSb290IENBIEcy
+MB4XDTE0MDUyNjAwMDAwMFoXDTM4MDExNTAwMDAwMFowQDELMAkGA1UEBhMCRlIxEjAQBgNVBAoM
+CU9wZW5UcnVzdDEdMBsGA1UEAwwUT3BlblRydXN0IFJvb3QgQ0EgRzIwggIiMA0GCSqGSIb3DQEB
+AQUAA4ICDwAwggIKAoICAQDMtlelM5QQgTJT32F+D3Y5z1zCU3UdSXqWON2ic2rxb95eolq5cSG+
+Ntmh/LzubKh8NBpxGuga2F8ORAbtp+Dz0mEL4DKiltE48MLaARf85KxP6O6JHnSrT78eCbY2albz
+4e6WiWYkBuTNQjpK3eCasMSCRbP+yatcfD7J6xcvDH1urqWPyKwlCm/61UWY0jUJ9gNDlP7ZvyCV
+eYCYitmJNbtRG6Q3ffyZO6v/v6wNj0OxmXsWEH4db0fEFY8ElggGQgT4hNYdvJGmQr5J1WqIP7wt
+UdGejeBSzFfdNTVY27SPJIjki9/ca1TSgSuyzpJLHB9G+h3Ykst2Z7UJmQnlrBcUVXDGPKBWCgOz
+3GIZ38i1MH/1PCZ1Eb3XG7OHngevZXHloM8apwkQHZOJZlvoPGIytbU6bumFAYueQ4xncyhZW+vj
+3CzMpSZyYhK05pyDRPZRpOLAeiRXyg6lPzq1O4vldu5w5pLeFlwoW5cZJ5L+epJUzpM5ChaHvGOz
+9bGTXOBut9Dq+WIyiET7vycotjCVXRIouZW+j1MY5aIYFuJWpLIsEPUdN6b4t/bQWVyJ98LVtZR0
+0dX+G7bw5tYee9I8y6jj9RjzIR9u701oBnstXW5DiabA+aC/gh7PU3+06yzbXfZqfUAkBXKJOAGT
+y3HCOV0GEfZvePg3DTmEJwIDAQABo2MwYTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB
+/zAdBgNVHQ4EFgQUajn6QiL35okATV59M4PLuG53hq8wHwYDVR0jBBgwFoAUajn6QiL35okATV59
+M4PLuG53hq8wDQYJKoZIhvcNAQENBQADggIBAJjLq0A85TMCl38th6aP1F5Kr7ge57tx+4BkJamz
+Gj5oXScmp7oq4fBXgwpkTx4idBvpkF/wrM//T2h6OKQQbA2xx6R3gBi2oihEdqc0nXGEL8pZ0keI
+mUEiyTCYYW49qKgFbdEfwFFEVn8nNQLdXpgKQuswv42hm1GqO+qTRmTFAHneIWv2V6CG1wZy7HBG
+S4tz3aAhdT7cHcCP009zHIXZ/n9iyJVvttN7jLpTwm+bREx50B1ws9efAvSyB7DH5fitIw6mVskp
+EndI2S9G/Tvw/HRwkqWOOAgfZDC2t0v7NqwQjqBSM2OdAzVWxWm9xiNaJ5T2pBL4LTM8oValX9YZ
+6e18CL13zSdkzJTaTkZQh+D5wVOAHrut+0dSixv9ovneDiK3PTNZbNTe9ZUGMg1RGUFcPk8G97kr
+gCf2o6p6fAbhQ8MTOWIaNr3gKC6UAuQpLmBVrkA9sHSSXvAgZJY/X0VdiLWK2gKgW0VU3jg9CcCo
+SmVGFvyqv1ROTVu+OEO3KMqLM6oaJbolXCkvW0pujOotnCr2BXbgd5eAiN1nE28daCSLT7d0geX0
+YJ96Vdc+N9oWaz53rK4YcJUIeSkDiv7BO7M/Gg+kO14fWKGVyasvc0rQLW6aWQ9VGHgtPFGml4vm
+u7JwqkwR3v98KzfUetF3NI/n+UL3PIEMS1IK
+-----END CERTIFICATE-----
+
+OpenTrust Root CA G3
+====================
+-----BEGIN CERTIFICATE-----
+MIICITCCAaagAwIBAgISESDm+Ez8JLC+BUCs2oMbNGA/MAoGCCqGSM49BAMDMEAxCzAJBgNVBAYT
+AkZSMRIwEAYDVQQKDAlPcGVuVHJ1c3QxHTAbBgNVBAMMFE9wZW5UcnVzdCBSb290IENBIEczMB4X
+DTE0MDUyNjAwMDAwMFoXDTM4MDExNTAwMDAwMFowQDELMAkGA1UEBhMCRlIxEjAQBgNVBAoMCU9w
+ZW5UcnVzdDEdMBsGA1UEAwwUT3BlblRydXN0IFJvb3QgQ0EgRzMwdjAQBgcqhkjOPQIBBgUrgQQA
+IgNiAARK7liuTcpm3gY6oxH84Bjwbhy6LTAMidnW7ptzg6kjFYwvWYpa3RTqnVkrQ7cG7DK2uu5B
+ta1doYXM6h0UZqNnfkbilPPntlahFVmhTzeXuSIevRHr9LIfXsMUmuXZl5mjYzBhMA4GA1UdDwEB
+/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRHd8MUi2I5DMlv4VBN0BBY3JWIbTAf
+BgNVHSMEGDAWgBRHd8MUi2I5DMlv4VBN0BBY3JWIbTAKBggqhkjOPQQDAwNpADBmAjEAj6jcnboM
+BBf6Fek9LykBl7+BFjNAk2z8+e2AcG+qj9uEwov1NcoG3GRvaBbhj5G5AjEA2Euly8LQCGzpGPta
+3U1fJAuwACEl74+nBCZx4nxp5V2a+EEfOzmTk51V6s2N8fvB
+-----END CERTIFICATE-----
+
+ISRG Root X1
+============
+-----BEGIN CERTIFICATE-----
+MIIFazCCA1OgAwIBAgIRAIIQz7DSQONZRGPgu2OCiwAwDQYJKoZIhvcNAQELBQAwTzELMAkGA1UE
+BhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2VhcmNoIEdyb3VwMRUwEwYDVQQD
+EwxJU1JHIFJvb3QgWDEwHhcNMTUwNjA0MTEwNDM4WhcNMzUwNjA0MTEwNDM4WjBPMQswCQYDVQQG
+EwJVUzEpMCcGA1UEChMgSW50ZXJuZXQgU2VjdXJpdHkgUmVzZWFyY2ggR3JvdXAxFTATBgNVBAMT
+DElTUkcgUm9vdCBYMTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAK3oJHP0FDfzm54r
+Vygch77ct984kIxuPOZXoHj3dcKi/vVqbvYATyjb3miGbESTtrFj/RQSa78f0uoxmyF+0TM8ukj1
+3Xnfs7j/EvEhmkvBioZxaUpmZmyPfjxwv60pIgbz5MDmgK7iS4+3mX6UA5/TR5d8mUgjU+g4rk8K
+b4Mu0UlXjIB0ttov0DiNewNwIRt18jA8+o+u3dpjq+sWT8KOEUt+zwvo/7V3LvSye0rgTBIlDHCN
+Aymg4VMk7BPZ7hm/ELNKjD+Jo2FR3qyHB5T0Y3HsLuJvW5iB4YlcNHlsdu87kGJ55tukmi8mxdAQ
+4Q7e2RCOFvu396j3x+UCB5iPNgiV5+I3lg02dZ77DnKxHZu8A/lJBdiB3QW0KtZB6awBdpUKD9jf
+1b0SHzUvKBds0pjBqAlkd25HN7rOrFleaJ1/ctaJxQZBKT5ZPt0m9STJEadao0xAH0ahmbWnOlFu
+hjuefXKnEgV4We0+UXgVCwOPjdAvBbI+e0ocS3MFEvzG6uBQE3xDk3SzynTnjh8BCNAw1FtxNrQH
+usEwMFxIt4I7mKZ9YIqioymCzLq9gwQbooMDQaHWBfEbwrbwqHyGO0aoSCqI3Haadr8faqU9GY/r
+OPNk3sgrDQoo//fb4hVC1CLQJ13hef4Y53CIrU7m2Ys6xt0nUW7/vGT1M0NPAgMBAAGjQjBAMA4G
+A1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBR5tFnme7bl5AFzgAiIyBpY
+9umbbjANBgkqhkiG9w0BAQsFAAOCAgEAVR9YqbyyqFDQDLHYGmkgJykIrGF1XIpu+ILlaS/V9lZL
+ubhzEFnTIZd+50xx+7LSYK05qAvqFyFWhfFQDlnrzuBZ6brJFe+GnY+EgPbk6ZGQ3BebYhtF8GaV
+0nxvwuo77x/Py9auJ/GpsMiu/X1+mvoiBOv/2X/qkSsisRcOj/KKNFtY2PwByVS5uCbMiogziUwt
+hDyC3+6WVwW6LLv3xLfHTjuCvjHIInNzktHCgKQ5ORAzI4JMPJ+GslWYHb4phowim57iaztXOoJw
+TdwJx4nLCgdNbOhdjsnvzqvHu7UrTkXWStAmzOVyyghqpZXjFaH3pO3JLF+l+/+sKAIuvtd7u+Nx
+e5AW0wdeRlN8NwdCjNPElpzVmbUq4JUagEiuTDkHzsxHpFKVK7q4+63SM1N95R1NbdWhscdCb+ZA
+JzVcoyi3B43njTOQ5yOf+1CceWxG1bQVs5ZufpsMljq4Ui0/1lvh+wjChP4kqKOJ2qxq4RgqsahD
+YVvTH9w7jXbyLeiNdd8XM2w9U/t7y0Ff/9yi0GE44Za4rF2LN9d11TPAmRGunUHBcnWEvgJBQl9n
+JEiU0Zsnvgc/ubhPgXRR4Xq37Z0j4r7g1SgEEzwxA57demyPxgcYxn/eR44/KJ4EBs+lVDR3veyJ
+m+kXQ99b21/+jh5Xos1AnX5iItreGCc=
+-----END CERTIFICATE-----
+
+AC RAIZ FNMT-RCM
+================
+-----BEGIN CERTIFICATE-----
+MIIFgzCCA2ugAwIBAgIPXZONMGc2yAYdGsdUhGkHMA0GCSqGSIb3DQEBCwUAMDsxCzAJBgNVBAYT
+AkVTMREwDwYDVQQKDAhGTk1ULVJDTTEZMBcGA1UECwwQQUMgUkFJWiBGTk1ULVJDTTAeFw0wODEw
+MjkxNTU5NTZaFw0zMDAxMDEwMDAwMDBaMDsxCzAJBgNVBAYTAkVTMREwDwYDVQQKDAhGTk1ULVJD
+TTEZMBcGA1UECwwQQUMgUkFJWiBGTk1ULVJDTTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoC
+ggIBALpxgHpMhm5/yBNtwMZ9HACXjywMI7sQmkCpGreHiPibVmr75nuOi5KOpyVdWRHbNi63URcf
+qQgfBBckWKo3Shjf5TnUV/3XwSyRAZHiItQDwFj8d0fsjz50Q7qsNI1NOHZnjrDIbzAzWHFctPVr
+btQBULgTfmxKo0nRIBnuvMApGGWn3v7v3QqQIecaZ5JCEJhfTzC8PhxFtBDXaEAUwED653cXeuYL
+j2VbPNmaUtu1vZ5Gzz3rkQUCwJaydkxNEJY7kvqcfw+Z374jNUUeAlz+taibmSXaXvMiwzn15Cou
+08YfxGyqxRxqAQVKL9LFwag0Jl1mpdICIfkYtwb1TplvqKtMUejPUBjFd8g5CSxJkjKZqLsXF3mw
+WsXmo8RZZUc1g16p6DULmbvkzSDGm0oGObVo/CK67lWMK07q87Hj/LaZmtVC+nFNCM+HHmpxffnT
+tOmlcYF7wk5HlqX2doWjKI/pgG6BU6VtX7hI+cL5NqYuSf+4lsKMB7ObiFj86xsc3i1w4peSMKGJ
+47xVqCfWS+2QrYv6YyVZLag13cqXM7zlzced0ezvXg5KkAYmY6252TUtB7p2ZSysV4999AeU14EC
+ll2jB0nVetBX+RvnU0Z1qrB5QstocQjpYL05ac70r8NWQMetUqIJ5G+GR4of6ygnXYMgrwTJbFaa
+i0b1AgMBAAGjgYMwgYAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYE
+FPd9xf3E6Jobd2Sn9R2gzL+HYJptMD4GA1UdIAQ3MDUwMwYEVR0gADArMCkGCCsGAQUFBwIBFh1o
+dHRwOi8vd3d3LmNlcnQuZm5tdC5lcy9kcGNzLzANBgkqhkiG9w0BAQsFAAOCAgEAB5BK3/MjTvDD
+nFFlm5wioooMhfNzKWtN/gHiqQxjAb8EZ6WdmF/9ARP67Jpi6Yb+tmLSbkyU+8B1RXxlDPiyN8+s
+D8+Nb/kZ94/sHvJwnvDKuO+3/3Y3dlv2bojzr2IyIpMNOmqOFGYMLVN0V2Ue1bLdI4E7pWYjJ2cJ
+j+F3qkPNZVEI7VFY/uY5+ctHhKQV8Xa7pO6kO8Rf77IzlhEYt8llvhjho6Tc+hj507wTmzl6NLrT
+Qfv6MooqtyuGC2mDOL7Nii4LcK2NJpLuHvUBKwrZ1pebbuCoGRw6IYsMHkCtA+fdZn71uSANA+iW
++YJF1DngoABd15jmfZ5nc8OaKveri6E6FO80vFIOiZiaBECEHX5FaZNXzuvO+FB8TxxuBEOb+dY7
+Ixjp6o7RTUaN8Tvkasq6+yO3m/qZASlaWFot4/nUbQ4mrcFuNLwy+AwF+mWj2zs3gyLp1txyM/1d
+8iC9djwj2ij3+RvrWWTV3F9yfiD8zYm1kGdNYno/Tq0dwzn+evQoFt9B9kiABdcPUXmsEKvU7ANm
+5mqwujGSQkBqvjrTcuFqN1W8rB2Vt2lh8kORdOag0wokRqEIr9baRRmW1FMdW4R58MD3R++Lj8UG
+rp1MYp3/RgT408m2ECVAdf4WqslKYIYvuu8wd+RU4riEmViAqhOLUTpPSPaLtrM=
+-----END CERTIFICATE-----
+
+Amazon Root CA 1
+================
+-----BEGIN CERTIFICATE-----
+MIIDQTCCAimgAwIBAgITBmyfz5m/jAo54vB4ikPmljZbyjANBgkqhkiG9w0BAQsFADA5MQswCQYD
+VQQGEwJVUzEPMA0GA1UEChMGQW1hem9uMRkwFwYDVQQDExBBbWF6b24gUm9vdCBDQSAxMB4XDTE1
+MDUyNjAwMDAwMFoXDTM4MDExNzAwMDAwMFowOTELMAkGA1UEBhMCVVMxDzANBgNVBAoTBkFtYXpv
+bjEZMBcGA1UEAxMQQW1hem9uIFJvb3QgQ0EgMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBALJ4gHHKeNXjca9HgFB0fW7Y14h29Jlo91ghYPl0hAEvrAIthtOgQ3pOsqTQNroBvo3bSMgH
+FzZM9O6II8c+6zf1tRn4SWiw3te5djgdYZ6k/oI2peVKVuRF4fn9tBb6dNqcmzU5L/qwIFAGbHrQ
+gLKm+a/sRxmPUDgH3KKHOVj4utWp+UhnMJbulHheb4mjUcAwhmahRWa6VOujw5H5SNz/0egwLX0t
+dHA114gk957EWW67c4cX8jJGKLhD+rcdqsq08p8kDi1L93FcXmn/6pUCyziKrlA4b9v7LWIbxcce
+VOF34GfID5yHI9Y/QCB/IIDEgEw+OyQmjgSubJrIqg0CAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB
+/zAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0OBBYEFIQYzIU07LwMlJQuCFmcx7IQTgoIMA0GCSqGSIb3
+DQEBCwUAA4IBAQCY8jdaQZChGsV2USggNiMOruYou6r4lK5IpDB/G/wkjUu0yKGX9rbxenDIU5PM
+CCjjmCXPI6T53iHTfIUJrU6adTrCC2qJeHZERxhlbI1Bjjt/msv0tadQ1wUsN+gDS63pYaACbvXy
+8MWy7Vu33PqUXHeeE6V/Uq2V8viTO96LXFvKWlJbYK8U90vvo/ufQJVtMVT8QtPHRh8jrdkPSHCa
+2XV4cdFyQzR1bldZwgJcJmApzyMZFo6IQ6XU5MsI+yMRQ+hDKXJioaldXgjUkK642M4UwtBV8ob2
+xJNDd2ZhwLnoQdeXeGADbkpyrqXRfboQnoZsG4q5WTP468SQvvG5
+-----END CERTIFICATE-----
+
+Amazon Root CA 2
+================
+-----BEGIN CERTIFICATE-----
+MIIFQTCCAymgAwIBAgITBmyf0pY1hp8KD+WGePhbJruKNzANBgkqhkiG9w0BAQwFADA5MQswCQYD
+VQQGEwJVUzEPMA0GA1UEChMGQW1hem9uMRkwFwYDVQQDExBBbWF6b24gUm9vdCBDQSAyMB4XDTE1
+MDUyNjAwMDAwMFoXDTQwMDUyNjAwMDAwMFowOTELMAkGA1UEBhMCVVMxDzANBgNVBAoTBkFtYXpv
+bjEZMBcGA1UEAxMQQW1hem9uIFJvb3QgQ0EgMjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoC
+ggIBAK2Wny2cSkxKgXlRmeyKy2tgURO8TW0G/LAIjd0ZEGrHJgw12MBvIITplLGbhQPDW9tK6Mj4
+kHbZW0/jTOgGNk3Mmqw9DJArktQGGWCsN0R5hYGCrVo34A3MnaZMUnbqQ523BNFQ9lXg1dKmSYXp
+N+nKfq5clU1Imj+uIFptiJXZNLhSGkOQsL9sBbm2eLfq0OQ6PBJTYv9K8nu+NQWpEjTj82R0Yiw9
+AElaKP4yRLuH3WUnAnE72kr3H9rN9yFVkE8P7K6C4Z9r2UXTu/Bfh+08LDmG2j/e7HJV63mjrdvd
+fLC6HM783k81ds8P+HgfajZRRidhW+mez/CiVX18JYpvL7TFz4QuK/0NURBs+18bvBt+xa47mAEx
+kv8LV/SasrlX6avvDXbR8O70zoan4G7ptGmh32n2M8ZpLpcTnqWHsFcQgTfJU7O7f/aS0ZzQGPSS
+btqDT6ZjmUyl+17vIWR6IF9sZIUVyzfpYgwLKhbcAS4y2j5L9Z469hdAlO+ekQiG+r5jqFoz7Mt0
+Q5X5bGlSNscpb/xVA1wf+5+9R+vnSUeVC06JIglJ4PVhHvG/LopyboBZ/1c6+XUyo05f7O0oYtlN
+c/LMgRdg7c3r3NunysV+Ar3yVAhU/bQtCSwXVEqY0VThUWcI0u1ufm8/0i2BWSlmy5A5lREedCf+
+3euvAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgGGMB0GA1UdDgQWBBSw
+DPBMMPQFWAJI/TPlUq9LhONmUjANBgkqhkiG9w0BAQwFAAOCAgEAqqiAjw54o+Ci1M3m9Zh6O+oA
+A7CXDpO8Wqj2LIxyh6mx/H9z/WNxeKWHWc8w4Q0QshNabYL1auaAn6AFC2jkR2vHat+2/XcycuUY
++gn0oJMsXdKMdYV2ZZAMA3m3MSNjrXiDCYZohMr/+c8mmpJ5581LxedhpxfL86kSk5Nrp+gvU5LE
+YFiwzAJRGFuFjWJZY7attN6a+yb3ACfAXVU3dJnJUH/jWS5E4ywl7uxMMne0nxrpS10gxdr9HIcW
+xkPo1LsmmkVwXqkLN1PiRnsn/eBG8om3zEK2yygmbtmlyTrIQRNg91CMFa6ybRoVGld45pIq2WWQ
+gj9sAq+uEjonljYE1x2igGOpm/HlurR8FLBOybEfdF849lHqm/osohHUqS0nGkWxr7JOcQ3AWEbW
+aQbLU8uz/mtBzUF+fUwPfHJ5elnNXkoOrJupmHN5fLT0zLm4BwyydFy4x2+IoZCn9Kr5v2c69BoV
+Yh63n749sSmvZ6ES8lgQGVMDMBu4Gon2nL2XA46jCfMdiyHxtN/kHNGfZQIG6lzWE7OE76KlXIx3
+KadowGuuQNKotOrN8I1LOJwZmhsoVLiJkO/KdYE+HvJkJMcYr07/R54H9jVlpNMKVv/1F2Rs76gi
+JUmTtt8AF9pYfl3uxRuw0dFfIRDH+fO6AgonB8Xx1sfT4PsJYGw=
+-----END CERTIFICATE-----
+
+Amazon Root CA 3
+================
+-----BEGIN CERTIFICATE-----
+MIIBtjCCAVugAwIBAgITBmyf1XSXNmY/Owua2eiedgPySjAKBggqhkjOPQQDAjA5MQswCQYDVQQG
+EwJVUzEPMA0GA1UEChMGQW1hem9uMRkwFwYDVQQDExBBbWF6b24gUm9vdCBDQSAzMB4XDTE1MDUy
+NjAwMDAwMFoXDTQwMDUyNjAwMDAwMFowOTELMAkGA1UEBhMCVVMxDzANBgNVBAoTBkFtYXpvbjEZ
+MBcGA1UEAxMQQW1hem9uIFJvb3QgQ0EgMzBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABCmXp8ZB
+f8ANm+gBG1bG8lKlui2yEujSLtf6ycXYqm0fc4E7O5hrOXwzpcVOho6AF2hiRVd9RFgdszflZwjr
+Zt6jQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgGGMB0GA1UdDgQWBBSrttvXBp43
+rDCGB5Fwx5zEGbF4wDAKBggqhkjOPQQDAgNJADBGAiEA4IWSoxe3jfkrBqWTrBqYaGFy+uGh0Psc
+eGCmQ5nFuMQCIQCcAu/xlJyzlvnrxir4tiz+OpAUFteMYyRIHN8wfdVoOw==
+-----END CERTIFICATE-----
+
+Amazon Root CA 4
+================
+-----BEGIN CERTIFICATE-----
+MIIB8jCCAXigAwIBAgITBmyf18G7EEwpQ+Vxe3ssyBrBDjAKBggqhkjOPQQDAzA5MQswCQYDVQQG
+EwJVUzEPMA0GA1UEChMGQW1hem9uMRkwFwYDVQQDExBBbWF6b24gUm9vdCBDQSA0MB4XDTE1MDUy
+NjAwMDAwMFoXDTQwMDUyNjAwMDAwMFowOTELMAkGA1UEBhMCVVMxDzANBgNVBAoTBkFtYXpvbjEZ
+MBcGA1UEAxMQQW1hem9uIFJvb3QgQ0EgNDB2MBAGByqGSM49AgEGBSuBBAAiA2IABNKrijdPo1MN
+/sGKe0uoe0ZLY7Bi9i0b2whxIdIA6GO9mif78DluXeo9pcmBqqNbIJhFXRbb/egQbeOc4OO9X4Ri
+83BkM6DLJC9wuoihKqB1+IGuYgbEgds5bimwHvouXKNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNV
+HQ8BAf8EBAMCAYYwHQYDVR0OBBYEFNPsxzplbszh2naaVvuc84ZtV+WBMAoGCCqGSM49BAMDA2gA
+MGUCMDqLIfG9fhGt0O9Yli/W651+kI0rz2ZVwyzjKKlwCkcO8DdZEv8tmZQoTipPNU0zWgIxAOp1
+AE47xDqUEpHJWEadIRNyp4iciuRMStuW1KyLa2tJElMzrdfkviT8tQp21KW8EA==
+-----END CERTIFICATE-----
+
+LuxTrust Global Root 2
+======================
+-----BEGIN CERTIFICATE-----
+MIIFwzCCA6ugAwIBAgIUCn6m30tEntpqJIWe5rgV0xZ/u7EwDQYJKoZIhvcNAQELBQAwRjELMAkG
+A1UEBhMCTFUxFjAUBgNVBAoMDUx1eFRydXN0IFMuQS4xHzAdBgNVBAMMFkx1eFRydXN0IEdsb2Jh
+bCBSb290IDIwHhcNMTUwMzA1MTMyMTU3WhcNMzUwMzA1MTMyMTU3WjBGMQswCQYDVQQGEwJMVTEW
+MBQGA1UECgwNTHV4VHJ1c3QgUy5BLjEfMB0GA1UEAwwWTHV4VHJ1c3QgR2xvYmFsIFJvb3QgMjCC
+AiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANeFl78RmOnwYoNMPIf5U2o3C/IPPIfOb9wm
+Kb3FibrJgz337spbxm1Jc7TJRqMbNBM/wYlFV/TZsfs2ZUv7COJIcRHIbjuend+JZTemhfY7RBi2
+xjcwYkSSl2l9QjAk5A0MiWtj3sXh306pFGxT4GHO9hcvHTy95iJMHZP1EMShduxq3sVs35a0VkBC
+wGKSMKEtFZSg0iAGCW5qbeXrt77U8PEVfIvmTroTzEsnXpk8F12PgX8zPU/TPxvsXD/wPEx1bvKm
+1Z3aLQdjAsZy6ZS8TEmVT4hSyNvoaYL4zDRbIvCGp4m9SAptZoFtyMhk+wHh9OHe2Z7d21vUKpkm
+FRseTJIpgp7VkoGSQXAZ96Tlk0u8d2cx3Rz9MXANF5kM+Qw5GSoXtTBxVdUPrljhPS80m8+f9niF
+wpN6cj5mj5wWEWCPnolvZ77gR1o7DJpni89Gxq44o/KnvObWhWszJHAiS8sIm7vI+AIpHb4gDEa/
+a4ebsypmQjVGbKq6rfmYe+lQVRQxv7HaLe2ArWgk+2mr2HETMOZns4dA/Yl+8kPREd8vZS9kzl8U
+ubG/Mb2HeFpZZYiq/FkySIbWTLkpS5XTdvN3JW1CHDiDTf2jX5t/Lax5Gw5CMZdjpPuKadUiDTSQ
+MC6otOBttpSsvItO13D8xTiOZCXhTTmQzsmHhFhxAgMBAAGjgagwgaUwDwYDVR0TAQH/BAUwAwEB
+/zBCBgNVHSAEOzA5MDcGByuBKwEBAQowLDAqBggrBgEFBQcCARYeaHR0cHM6Ly9yZXBvc2l0b3J5
+Lmx1eHRydXN0Lmx1MA4GA1UdDwEB/wQEAwIBBjAfBgNVHSMEGDAWgBT/GCh2+UgFLKGu8SsbK7JT
++Et8szAdBgNVHQ4EFgQU/xgodvlIBSyhrvErGyuyU/hLfLMwDQYJKoZIhvcNAQELBQADggIBAGoZ
+FO1uecEsh9QNcH7X9njJCwROxLHOk3D+sFTAMs2ZMGQXvw/l4jP9BzZAcg4atmpZ1gDlaCDdLnIN
+H2pkMSCEfUmmWjfrRcmF9dTHF5kH5ptV5AzoqbTOjFu1EVzPig4N1qx3gf4ynCSecs5U89BvolbW
+7MM3LGVYvlcAGvI1+ut7MV3CwRI9loGIlonBWVx65n9wNOeD4rHh4bhY79SV5GCc8JaXcozrhAIu
+ZY+kt9J/Z93I055cqqmkoCUUBpvsT34tC38ddfEz2O3OuHVtPlu5mB0xDVbYQw8wkbIEa91WvpWA
+VWe+2M2D2RjuLg+GLZKecBPs3lHJQ3gCpU3I+V/EkVhGFndadKpAvAefMLmx9xIX3eP/JEAdemrR
+TxgKqpAd60Ae36EeRJIQmvKN4dFLRp7oRUKX6kWZ8+xm1QL68qZKJKrezrnK+T+Tb/mjuuqlPpmt
+/f97mfVl7vBZKGfXkJWkE4SphMHozs51k2MavDzq1WQfLSoSOcbDWjLtR5EWDrw4wVDej8oqkDQc
+7kGUnF4ZLvhFSZl0kbAEb+MEWrGrKqv+x9CWttrhSmQGbmBNvUJO/3jaJMobtNeWOWyu8Q6qp31I
+iyBMz2TWuJdGsE7RKlY6oJO9r4Ak4Ap+58rVyuiFVdw2KuGUaJPHZnJED4AhMmwlxyOAgwrr
+-----END CERTIFICATE-----
diff --git a/twitter/vendor/abraham/twitteroauth/tests/AbstractSignatureMethodTest.php b/twitter/vendor/abraham/twitteroauth/tests/AbstractSignatureMethodTest.php
new file mode 100644
index 00000000..344b4c1f
--- /dev/null
+++ b/twitter/vendor/abraham/twitteroauth/tests/AbstractSignatureMethodTest.php
@@ -0,0 +1,51 @@
+<?php
+
+namespace Abraham\TwitterOAuth\Tests;
+
+use Abraham\TwitterOAuth\SignatureMethod;
+
+abstract class AbstractSignatureMethodTest extends \PHPUnit_Framework_TestCase
+{
+    protected $name;
+
+    /**
+     * @return SignatureMethod
+     */
+    abstract public function getClass();
+
+    abstract protected function signatureDataProvider();
+
+    public function testGetName()
+    {
+        $this->assertEquals($this->name, $this->getClass()->getName());
+    }
+
+    /**
+     * @dataProvider signatureDataProvider
+     */
+    public function testBuildSignature($expected, $request, $consumer, $token)
+    {
+        $this->assertEquals($expected, $this->getClass()->buildSignature($request, $consumer, $token));
+    }
+
+    protected function getRequest()
+    {
+        return $this->getMockBuilder('Abraham\TwitterOAuth\Request')
+            ->disableOriginalConstructor()
+            ->getMock();
+    }
+
+    protected function getConsumer($key = null, $secret = null, $callbackUrl = null)
+    {
+        return $this->getMockBuilder('Abraham\TwitterOAuth\Consumer')
+            ->setConstructorArgs([$key, $secret, $callbackUrl])
+            ->getMock();
+    }
+
+    protected function getToken($key = null, $secret = null)
+    {
+        return $this->getMockBuilder('Abraham\TwitterOAuth\Token')
+            ->setConstructorArgs([$key, $secret])
+            ->getMock();
+    }
+}
diff --git a/twitter/vendor/abraham/twitteroauth/tests/ConsumerTest.php b/twitter/vendor/abraham/twitteroauth/tests/ConsumerTest.php
new file mode 100644
index 00000000..3ec810a9
--- /dev/null
+++ b/twitter/vendor/abraham/twitteroauth/tests/ConsumerTest.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace Abraham\TwitterOAuth\Tests;
+
+use Abraham\TwitterOAuth\Consumer;
+
+class ConsumerTest extends \PHPUnit_Framework_TestCase {
+    public function testToString()
+    {
+        $key = uniqid();
+        $secret = uniqid();
+        $consumer = new Consumer($key, $secret);
+
+        $this->assertEquals("Consumer[key=$key,secret=$secret]", $consumer->__toString());
+    }
+}
\ No newline at end of file
diff --git a/twitter/vendor/abraham/twitteroauth/tests/HmacSha1Test.php b/twitter/vendor/abraham/twitteroauth/tests/HmacSha1Test.php
new file mode 100644
index 00000000..cf37a22e
--- /dev/null
+++ b/twitter/vendor/abraham/twitteroauth/tests/HmacSha1Test.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace Abraham\TwitterOAuth\Tests;
+
+use Abraham\TwitterOAuth\HmacSha1;
+
+class HmacSha1Test extends AbstractSignatureMethodTest
+{
+    protected $name = 'HMAC-SHA1';
+
+    public function getClass()
+    {
+        return new HmacSha1();
+    }
+
+    public function signatureDataProvider()
+    {
+        return [
+            ['5CoEcoq7XoKFjwYCieQvuzadeUA=', $this->getRequest(), $this->getConsumer(), $this->getToken()],
+            [
+                'EBw0gHngam3BTx8kfPfNNSyKem4=',
+                $this->getRequest(),
+                $this->getConsumer('key', 'secret'),
+                $this->getToken()
+            ],
+            [
+                'kDsHFZzws2a5M6cAQjfpdNBo+v8=',
+                $this->getRequest(),
+                $this->getConsumer('key', 'secret'),
+                $this->getToken('key', 'secret')
+            ],
+            ['EBw0gHngam3BTx8kfPfNNSyKem4=', $this->getRequest(), $this->getConsumer('key', 'secret'), null],
+        ];
+    }
+}
\ No newline at end of file
diff --git a/twitter/vendor/abraham/twitteroauth/tests/TokenTest.php b/twitter/vendor/abraham/twitteroauth/tests/TokenTest.php
new file mode 100644
index 00000000..5be372be
--- /dev/null
+++ b/twitter/vendor/abraham/twitteroauth/tests/TokenTest.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace Abraham\TwitterOAuth\Tests;
+
+use Abraham\TwitterOAuth\Token;
+
+class TokenTest extends \PHPUnit_Framework_TestCase {
+    /**
+     * @dataProvider tokenProvider
+     */
+    public function testToString($expected, $key, $secret)
+    {
+        $token = new Token($key, $secret);
+
+        $this->assertEquals($expected, $token->__toString());
+    }
+
+    public function tokenProvider()
+    {
+        return [
+            ['oauth_token=key&oauth_token_secret=secret', 'key', 'secret'],
+            ['oauth_token=key%2Bkey&oauth_token_secret=secret', 'key+key', 'secret'],
+            ['oauth_token=key~key&oauth_token_secret=secret', 'key~key', 'secret'],
+        ];
+    }
+}
\ No newline at end of file
diff --git a/twitter/vendor/abraham/twitteroauth/tests/TwitterOAuthTest.php b/twitter/vendor/abraham/twitteroauth/tests/TwitterOAuthTest.php
new file mode 100644
index 00000000..730bd34e
--- /dev/null
+++ b/twitter/vendor/abraham/twitteroauth/tests/TwitterOAuthTest.php
@@ -0,0 +1,256 @@
+<?php
+/**
+ * WARNING: Running these tests will post and delete through the actual Twitter account.
+ */
+namespace Abraham\TwitterOAuth\Test;
+
+use Abraham\TwitterOAuth\TwitterOAuth;
+
+class TwitterOAuthTest extends \PHPUnit_Framework_TestCase
+{
+    /** @var TwitterOAuth */
+    protected $twitter;
+
+    protected function setUp()
+    {
+        $this->twitter = new TwitterOAuth(CONSUMER_KEY, CONSUMER_SECRET, ACCESS_TOKEN, ACCESS_TOKEN_SECRET);
+    }
+
+    public function testBuildClient()
+    {
+        $this->assertObjectHasAttribute('consumer', $this->twitter);
+        $this->assertObjectHasAttribute('token', $this->twitter);
+    }
+
+    public function testSetOauthToken()
+    {
+        $twitter = new TwitterOAuth(CONSUMER_KEY, CONSUMER_SECRET);
+        $twitter->setOauthToken(ACCESS_TOKEN, ACCESS_TOKEN_SECRET);
+        $this->assertObjectHasAttribute('consumer', $twitter);
+        $this->assertObjectHasAttribute('token', $twitter);
+        $twitter->get('friendships/show', ['target_screen_name' => 'twitterapi']);
+        $this->assertEquals(200, $twitter->getLastHttpCode());
+    }
+
+    public function testOauth2Token()
+    {
+        $twitter = new TwitterOAuth(CONSUMER_KEY, CONSUMER_SECRET);
+        $result = $twitter->oauth2('oauth2/token', ['grant_type' => 'client_credentials']);
+        $this->assertEquals(200, $twitter->getLastHttpCode());
+        $this->assertObjectHasAttribute('token_type', $result);
+        $this->assertObjectHasAttribute('access_token', $result);
+        $this->assertEquals('bearer', $result->token_type);
+        return $result;
+    }
+
+    /**
+     * @depends testOauth2Token
+     */
+    public function testBearerToken($accessToken)
+    {
+        $twitter = new TwitterOAuth(CONSUMER_KEY, CONSUMER_SECRET, null, $accessToken->access_token);
+        $result = $twitter->get('statuses/user_timeline', ['screen_name' => 'twitterapi']);
+        if ($twitter->getLastHttpCode() !== 200) {
+            $this->assertEquals('foo', substr($accessToken->access_token, 0, 75));
+            $this->assertEquals('foo', print_r($result, true));
+        }
+        $this->assertEquals(200, $twitter->getLastHttpCode());
+        return $accessToken;
+    }
+
+    // This causes issues for parallel run tests.
+    // /**
+    //  * @depends testBearerToken
+    //  */
+    // public function testOauth2TokenInvalidate($accessToken)
+    // {
+    //     $twitter = new TwitterOAuth(CONSUMER_KEY, CONSUMER_SECRET);
+    //     // HACK: access_token is already urlencoded but gets urlencoded again breaking the invalidate request.
+    //     $result = $twitter->oauth2(
+    //         'oauth2/invalidate_token',
+    //         array('access_token' => urldecode($accessToken->access_token))
+    //     );
+    //     $this->assertEquals(200, $twitter->getLastHttpCode());
+    //     $this->assertObjectHasAttribute('access_token', $result);
+    //     return $result;
+    // }
+
+    public function testOauthRequestToken()
+    {
+        $twitter = new TwitterOAuth(CONSUMER_KEY, CONSUMER_SECRET);
+        $result = $twitter->oauth('oauth/request_token', ['oauth_callback' => OAUTH_CALLBACK]);
+        $this->assertEquals(200, $twitter->getLastHttpCode());
+        $this->assertArrayHasKey('oauth_token', $result);
+        $this->assertArrayHasKey('oauth_token_secret', $result);
+        $this->assertArrayHasKey('oauth_callback_confirmed', $result);
+        $this->assertEquals('true', $result['oauth_callback_confirmed']);
+        return $result;
+    }
+
+    /**
+     * @expectedException \Abraham\TwitterOAuth\TwitterOAuthException
+     * @expectedExceptionMessage Could not authenticate you
+     */
+    public function testOauthRequestTokenException()
+    {
+        $twitter = new TwitterOAuth('CONSUMER_KEY', 'CONSUMER_SECRET');
+        $result = $twitter->oauth('oauth/request_token', ['oauth_callback' => OAUTH_CALLBACK]);
+        return $result;
+    }
+
+    /**
+     * @expectedException \Abraham\TwitterOAuth\TwitterOAuthException
+     * @expectedExceptionMessage Invalid oauth_verifier parameter
+     * @depends testOauthRequestToken
+     */
+    public function testOauthAccessTokenTokenException(array $requestToken)
+    {
+        // Can't test this without a browser logging into Twitter so check for the correct error instead.
+        $twitter = new TwitterOAuth(
+            CONSUMER_KEY,
+            CONSUMER_SECRET,
+            $requestToken['oauth_token'],
+            $requestToken['oauth_token_secret']
+        );
+        $twitter->oauth("oauth/access_token", ["oauth_verifier" => "fake_oauth_verifier"]);
+    }
+
+    public function testUrl()
+    {
+        $url = $this->twitter->url('oauth/authorize', ['foo' => 'bar', 'baz' => 'qux']);
+        $this->assertEquals('https://api.twitter.com/oauth/authorize?foo=bar&baz=qux', $url);
+    }
+
+    public function testGetAccountVerifyCredentials()
+    {
+        // Include entities boolean added to test parameter value cohearsion
+        $this->twitter->get('account/verify_credentials', ["include_entities" => false]);
+        $this->assertEquals(200, $this->twitter->getLastHttpCode());
+    }
+
+    // BUG: testing is too unreliable for now
+    // public function testSetProxy()
+    // {
+    //     $this->twitter->setProxy(array(
+    //         'CURLOPT_PROXY' => PROXY,
+    //         'CURLOPT_PROXYUSERPWD' => PROXYUSERPWD,
+    //         'CURLOPT_PROXYPORT' => PROXYPORT,
+    //     ));
+    //     $this->twitter->setTimeouts(60, 60);
+    //     $result = $this->twitter->get('account/verify_credentials');
+    //     $this->assertEquals(200, $this->twitter->getLastHttpCode());
+    //     $this->assertObjectHasAttribute('id', $result);
+    // }
+
+    public function testGetStatusesMentionsTimeline()
+    {
+        $this->twitter->get('statuses/mentions_timeline');
+        $this->assertEquals(200, $this->twitter->getLastHttpCode());
+    }
+
+    public function testGetSearchTweets()
+    {
+        $result = $this->twitter->get('search/tweets', ['q' => 'twitter']);
+        $this->assertEquals(200, $this->twitter->getLastHttpCode());
+        return $result->statuses;
+    }
+
+    /**
+     * @depends testGetSearchTweets
+     */
+    public function testGetSearchTweetsWithMaxId($statuses)
+    {
+        $maxId = array_pop($statuses)->id_str;
+        $this->twitter->get('search/tweets', ['q' => 'twitter', 'max_id' => $maxId]);
+        $this->assertEquals(200, $this->twitter->getLastHttpCode());
+    }
+
+    public function testPostFavoritesCreate()
+    {
+        $result = $this->twitter->post('favorites/create', ['id' => '6242973112']);
+        if ($this->twitter->getLastHttpCode() == 403) {
+            // Status already favorited
+            $this->assertEquals(139, $result->errors[0]->code);
+        } else {
+            $this->assertEquals(200, $this->twitter->getLastHttpCode());
+        }
+    }
+
+    /**
+     * @depends testPostFavoritesCreate
+     */
+    public function testPostFavoritesDestroy()
+    {
+        $this->twitter->post('favorites/destroy', ['id' => '6242973112']);
+        $this->assertEquals(200, $this->twitter->getLastHttpCode());
+    }
+
+    public function testPostStatusesUpdateWithMedia()
+    {
+        $this->twitter->setTimeouts(60, 30);
+        // Image source https://www.flickr.com/photos/titrans/8548825587/
+        $file_path = __DIR__ . '/kitten.jpg';
+        $result = $this->twitter->upload('media/upload', ['media' => $file_path]);
+        $this->assertEquals(200, $this->twitter->getLastHttpCode());
+        $this->assertObjectHasAttribute('media_id_string', $result);
+        $parameters = ['status' => 'Hello World ' . time(), 'media_ids' => $result->media_id_string];
+        $result = $this->twitter->post('statuses/update', $parameters);
+        $this->assertEquals(200, $this->twitter->getLastHttpCode());
+        if ($this->twitter->getLastHttpCode() == 200) {
+            $result = $this->twitter->post('statuses/destroy/' . $result->id_str);
+        }
+        return $result;
+    }
+
+    public function testPostStatusesUpdateWithMediaChunked()
+    {
+        $this->twitter->setTimeouts(60, 30);
+        // Video source http://www.sample-videos.com/
+        $file_path = __DIR__ . '/video.mp4';
+        $result = $this->twitter->upload('media/upload', ['media' => $file_path, 'media_type' => 'video/mp4'], true);
+        $this->assertEquals(201, $this->twitter->getLastHttpCode());
+        $this->assertObjectHasAttribute('media_id_string', $result);
+        $parameters = ['status' => 'Hello World ' . time(), 'media_ids' => $result->media_id_string];
+        $result = $this->twitter->post('statuses/update', $parameters);
+        $this->assertEquals(200, $this->twitter->getLastHttpCode());
+        if ($this->twitter->getLastHttpCode() == 200) {
+            $result = $this->twitter->post('statuses/destroy/' . $result->id_str);
+        }
+        return $result;
+    }
+
+    public function testPostStatusesUpdateUtf8()
+    {
+        $result = $this->twitter->post('statuses/update', ['status' => 'xこんにちは世界 ' . time()]);
+        $this->assertEquals(200, $this->twitter->getLastHttpCode());
+        return $result;
+    }
+
+    /**
+     * @depends testPostStatusesUpdateUtf8
+     */
+    public function testPostStatusesDestroy($status)
+    {
+        $this->twitter->post('statuses/destroy/' . $status->id_str);
+        $this->assertEquals(200, $this->twitter->getLastHttpCode());
+    }
+
+    public function testLastResult()
+    {
+        $this->twitter->get('search/tweets', ['q' => 'twitter']);
+        $this->assertEquals('search/tweets', $this->twitter->getLastApiPath());
+        $this->assertEquals(200, $this->twitter->getLastHttpCode());
+        $this->assertObjectHasAttribute('statuses', $this->twitter->getLastBody());
+    }
+
+    /**
+     * @depends testLastResult
+     */
+    public function testResetLastResponse()
+    {
+        $this->twitter->resetLastResponse();
+        $this->assertEquals('', $this->twitter->getLastApiPath());
+        $this->assertEquals(0, $this->twitter->getLastHttpCode());
+        $this->assertEquals([], $this->twitter->getLastBody());
+    }
+}
diff --git a/twitter/vendor/abraham/twitteroauth/tests/Util/JsonDecoderTest.php b/twitter/vendor/abraham/twitteroauth/tests/Util/JsonDecoderTest.php
new file mode 100644
index 00000000..609382d6
--- /dev/null
+++ b/twitter/vendor/abraham/twitteroauth/tests/Util/JsonDecoderTest.php
@@ -0,0 +1,50 @@
+<?php
+
+namespace Abraham\TwitterOAuth\Tests;
+
+use Abraham\TwitterOAuth\Util\JsonDecoder;
+
+class JsonDecoderTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @dataProvider jsonProvider
+     */
+    public function testDecode($input, $asArray, $expected)
+    {
+        $this->assertEquals($expected, JsonDecoder::decode($input, $asArray));
+    }
+
+    public function jsonProvider()
+    {
+        return [
+            ['[]', true, []],
+            ['[1,2,3]', true, [1, 2, 3]],
+            ['[{"id": 556179961825226750}]', true, [['id' => 556179961825226750]]],
+            ['[]', false, []],
+            ['[1,2,3]', false, [1, 2, 3]],
+            [
+                '[{"id": 556179961825226750}]',
+                false,
+                [
+                    $this->getClass(function ($object) {
+                        $object->id = 556179961825226750;
+                        return $object;
+                    })
+                ]
+            ],
+
+        ];
+    }
+
+    /**
+     * @param callable $callable
+     *
+     * @return stdClass
+     */
+    private function getClass(\Closure $callable)
+    {
+        $object = new \stdClass();
+
+        return $callable($object);
+    }
+}
diff --git a/twitter/vendor/abraham/twitteroauth/tests/bootstrap.php b/twitter/vendor/abraham/twitteroauth/tests/bootstrap.php
new file mode 100644
index 00000000..7cc9c27f
--- /dev/null
+++ b/twitter/vendor/abraham/twitteroauth/tests/bootstrap.php
@@ -0,0 +1,12 @@
+<?php
+
+require __DIR__ . '/../vendor/autoload.php';
+
+define('CONSUMER_KEY', getenv('TEST_CONSUMER_KEY'));
+define('CONSUMER_SECRET', getenv('TEST_CONSUMER_SECRET'));
+define('ACCESS_TOKEN', getenv('TEST_ACCESS_TOKEN'));
+define('ACCESS_TOKEN_SECRET', getenv('TEST_ACCESS_TOKEN_SECRET'));
+define('OAUTH_CALLBACK', getenv('TEST_OAUTH_CALLBACK'));
+define('PROXY', getenv('TEST_CURLOPT_PROXY'));
+define('PROXYUSERPWD', getenv('TEST_CURLOPT_PROXYUSERPWD'));
+define('PROXYPORT', getenv('TEST_CURLOPT_PROXYPORT'));
diff --git a/twitter/vendor/abraham/twitteroauth/tests/kitten.jpg b/twitter/vendor/abraham/twitteroauth/tests/kitten.jpg
new file mode 100644
index 00000000..9f7acf1a
Binary files /dev/null and b/twitter/vendor/abraham/twitteroauth/tests/kitten.jpg differ
diff --git a/twitter/vendor/abraham/twitteroauth/tests/sample_env b/twitter/vendor/abraham/twitteroauth/tests/sample_env
new file mode 100644
index 00000000..64e07fd5
--- /dev/null
+++ b/twitter/vendor/abraham/twitteroauth/tests/sample_env
@@ -0,0 +1,13 @@
+# WARNING: Running the tests will perform live actions as the Twitter account.
+# Set all values, move to `env`, run `source tests/env` and `phpunit` to start testing.
+
+# To run the tests you must register Twitter application at https://app.twitter.com/.
+export TEST_CONSUMER_KEY=
+export TEST_CONSUMER_SECRET=
+export TEST_ACCESS_TOKEN=
+export TEST_ACCESS_TOKEN_SECRET=
+export TEST_OAUTH_CALLBACK=
+# You can find proxies for testing at http://proxylist.hidemyass.com/.
+export TEST_CURLOPT_PROXY=
+export TEST_CURLOPT_PROXYUSERPWD=
+export TEST_CURLOPT_PROXYPORT=
diff --git a/twitter/vendor/abraham/twitteroauth/tests/video.mp4 b/twitter/vendor/abraham/twitteroauth/tests/video.mp4
new file mode 100644
index 00000000..1fc47884
Binary files /dev/null and b/twitter/vendor/abraham/twitteroauth/tests/video.mp4 differ
diff --git a/twitter/vendor/autoload.php b/twitter/vendor/autoload.php
new file mode 100644
index 00000000..b727d660
--- /dev/null
+++ b/twitter/vendor/autoload.php
@@ -0,0 +1,7 @@
+<?php
+
+// autoload.php @generated by Composer
+
+require_once __DIR__ . '/composer/autoload_real.php';
+
+return ComposerAutoloaderInitTwitterAddon::getLoader();
diff --git a/twitter/vendor/composer/ClassLoader.php b/twitter/vendor/composer/ClassLoader.php
new file mode 100644
index 00000000..95f7e097
--- /dev/null
+++ b/twitter/vendor/composer/ClassLoader.php
@@ -0,0 +1,445 @@
+<?php
+
+/*
+ * This file is part of Composer.
+ *
+ * (c) Nils Adermann <naderman@naderman.de>
+ *     Jordi Boggiano <j.boggiano@seld.be>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Composer\Autoload;
+
+/**
+ * ClassLoader implements a PSR-0, PSR-4 and classmap class loader.
+ *
+ *     $loader = new \Composer\Autoload\ClassLoader();
+ *
+ *     // register classes with namespaces
+ *     $loader->add('Symfony\Component', __DIR__.'/component');
+ *     $loader->add('Symfony',           __DIR__.'/framework');
+ *
+ *     // activate the autoloader
+ *     $loader->register();
+ *
+ *     // to enable searching the include path (eg. for PEAR packages)
+ *     $loader->setUseIncludePath(true);
+ *
+ * In this example, if you try to use a class in the Symfony\Component
+ * namespace or one of its children (Symfony\Component\Console for instance),
+ * the autoloader will first look for the class under the component/
+ * directory, and it will then fallback to the framework/ directory if not
+ * found before giving up.
+ *
+ * This class is loosely based on the Symfony UniversalClassLoader.
+ *
+ * @author Fabien Potencier <fabien@symfony.com>
+ * @author Jordi Boggiano <j.boggiano@seld.be>
+ * @see    http://www.php-fig.org/psr/psr-0/
+ * @see    http://www.php-fig.org/psr/psr-4/
+ */
+class ClassLoader
+{
+    // PSR-4
+    private $prefixLengthsPsr4 = array();
+    private $prefixDirsPsr4 = array();
+    private $fallbackDirsPsr4 = array();
+
+    // PSR-0
+    private $prefixesPsr0 = array();
+    private $fallbackDirsPsr0 = array();
+
+    private $useIncludePath = false;
+    private $classMap = array();
+    private $classMapAuthoritative = false;
+    private $missingClasses = array();
+    private $apcuPrefix;
+
+    public function getPrefixes()
+    {
+        if (!empty($this->prefixesPsr0)) {
+            return call_user_func_array('array_merge', $this->prefixesPsr0);
+        }
+
+        return array();
+    }
+
+    public function getPrefixesPsr4()
+    {
+        return $this->prefixDirsPsr4;
+    }
+
+    public function getFallbackDirs()
+    {
+        return $this->fallbackDirsPsr0;
+    }
+
+    public function getFallbackDirsPsr4()
+    {
+        return $this->fallbackDirsPsr4;
+    }
+
+    public function getClassMap()
+    {
+        return $this->classMap;
+    }
+
+    /**
+     * @param array $classMap Class to filename map
+     */
+    public function addClassMap(array $classMap)
+    {
+        if ($this->classMap) {
+            $this->classMap = array_merge($this->classMap, $classMap);
+        } else {
+            $this->classMap = $classMap;
+        }
+    }
+
+    /**
+     * Registers a set of PSR-0 directories for a given prefix, either
+     * appending or prepending to the ones previously set for this prefix.
+     *
+     * @param string       $prefix  The prefix
+     * @param array|string $paths   The PSR-0 root directories
+     * @param bool         $prepend Whether to prepend the directories
+     */
+    public function add($prefix, $paths, $prepend = false)
+    {
+        if (!$prefix) {
+            if ($prepend) {
+                $this->fallbackDirsPsr0 = array_merge(
+                    (array) $paths,
+                    $this->fallbackDirsPsr0
+                );
+            } else {
+                $this->fallbackDirsPsr0 = array_merge(
+                    $this->fallbackDirsPsr0,
+                    (array) $paths
+                );
+            }
+
+            return;
+        }
+
+        $first = $prefix[0];
+        if (!isset($this->prefixesPsr0[$first][$prefix])) {
+            $this->prefixesPsr0[$first][$prefix] = (array) $paths;
+
+            return;
+        }
+        if ($prepend) {
+            $this->prefixesPsr0[$first][$prefix] = array_merge(
+                (array) $paths,
+                $this->prefixesPsr0[$first][$prefix]
+            );
+        } else {
+            $this->prefixesPsr0[$first][$prefix] = array_merge(
+                $this->prefixesPsr0[$first][$prefix],
+                (array) $paths
+            );
+        }
+    }
+
+    /**
+     * Registers a set of PSR-4 directories for a given namespace, either
+     * appending or prepending to the ones previously set for this namespace.
+     *
+     * @param string       $prefix  The prefix/namespace, with trailing '\\'
+     * @param array|string $paths   The PSR-4 base directories
+     * @param bool         $prepend Whether to prepend the directories
+     *
+     * @throws \InvalidArgumentException
+     */
+    public function addPsr4($prefix, $paths, $prepend = false)
+    {
+        if (!$prefix) {
+            // Register directories for the root namespace.
+            if ($prepend) {
+                $this->fallbackDirsPsr4 = array_merge(
+                    (array) $paths,
+                    $this->fallbackDirsPsr4
+                );
+            } else {
+                $this->fallbackDirsPsr4 = array_merge(
+                    $this->fallbackDirsPsr4,
+                    (array) $paths
+                );
+            }
+        } elseif (!isset($this->prefixDirsPsr4[$prefix])) {
+            // Register directories for a new namespace.
+            $length = strlen($prefix);
+            if ('\\' !== $prefix[$length - 1]) {
+                throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
+            }
+            $this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length;
+            $this->prefixDirsPsr4[$prefix] = (array) $paths;
+        } elseif ($prepend) {
+            // Prepend directories for an already registered namespace.
+            $this->prefixDirsPsr4[$prefix] = array_merge(
+                (array) $paths,
+                $this->prefixDirsPsr4[$prefix]
+            );
+        } else {
+            // Append directories for an already registered namespace.
+            $this->prefixDirsPsr4[$prefix] = array_merge(
+                $this->prefixDirsPsr4[$prefix],
+                (array) $paths
+            );
+        }
+    }
+
+    /**
+     * Registers a set of PSR-0 directories for a given prefix,
+     * replacing any others previously set for this prefix.
+     *
+     * @param string       $prefix The prefix
+     * @param array|string $paths  The PSR-0 base directories
+     */
+    public function set($prefix, $paths)
+    {
+        if (!$prefix) {
+            $this->fallbackDirsPsr0 = (array) $paths;
+        } else {
+            $this->prefixesPsr0[$prefix[0]][$prefix] = (array) $paths;
+        }
+    }
+
+    /**
+     * Registers a set of PSR-4 directories for a given namespace,
+     * replacing any others previously set for this namespace.
+     *
+     * @param string       $prefix The prefix/namespace, with trailing '\\'
+     * @param array|string $paths  The PSR-4 base directories
+     *
+     * @throws \InvalidArgumentException
+     */
+    public function setPsr4($prefix, $paths)
+    {
+        if (!$prefix) {
+            $this->fallbackDirsPsr4 = (array) $paths;
+        } else {
+            $length = strlen($prefix);
+            if ('\\' !== $prefix[$length - 1]) {
+                throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator.");
+            }
+            $this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length;
+            $this->prefixDirsPsr4[$prefix] = (array) $paths;
+        }
+    }
+
+    /**
+     * Turns on searching the include path for class files.
+     *
+     * @param bool $useIncludePath
+     */
+    public function setUseIncludePath($useIncludePath)
+    {
+        $this->useIncludePath = $useIncludePath;
+    }
+
+    /**
+     * Can be used to check if the autoloader uses the include path to check
+     * for classes.
+     *
+     * @return bool
+     */
+    public function getUseIncludePath()
+    {
+        return $this->useIncludePath;
+    }
+
+    /**
+     * Turns off searching the prefix and fallback directories for classes
+     * that have not been registered with the class map.
+     *
+     * @param bool $classMapAuthoritative
+     */
+    public function setClassMapAuthoritative($classMapAuthoritative)
+    {
+        $this->classMapAuthoritative = $classMapAuthoritative;
+    }
+
+    /**
+     * Should class lookup fail if not found in the current class map?
+     *
+     * @return bool
+     */
+    public function isClassMapAuthoritative()
+    {
+        return $this->classMapAuthoritative;
+    }
+
+    /**
+     * APCu prefix to use to cache found/not-found classes, if the extension is enabled.
+     *
+     * @param string|null $apcuPrefix
+     */
+    public function setApcuPrefix($apcuPrefix)
+    {
+        $this->apcuPrefix = function_exists('apcu_fetch') && ini_get('apc.enabled') ? $apcuPrefix : null;
+    }
+
+    /**
+     * The APCu prefix in use, or null if APCu caching is not enabled.
+     *
+     * @return string|null
+     */
+    public function getApcuPrefix()
+    {
+        return $this->apcuPrefix;
+    }
+
+    /**
+     * Registers this instance as an autoloader.
+     *
+     * @param bool $prepend Whether to prepend the autoloader or not
+     */
+    public function register($prepend = false)
+    {
+        spl_autoload_register(array($this, 'loadClass'), true, $prepend);
+    }
+
+    /**
+     * Unregisters this instance as an autoloader.
+     */
+    public function unregister()
+    {
+        spl_autoload_unregister(array($this, 'loadClass'));
+    }
+
+    /**
+     * Loads the given class or interface.
+     *
+     * @param  string    $class The name of the class
+     * @return bool|null True if loaded, null otherwise
+     */
+    public function loadClass($class)
+    {
+        if ($file = $this->findFile($class)) {
+            includeFile($file);
+
+            return true;
+        }
+    }
+
+    /**
+     * Finds the path to the file where the class is defined.
+     *
+     * @param string $class The name of the class
+     *
+     * @return string|false The path if found, false otherwise
+     */
+    public function findFile($class)
+    {
+        // class map lookup
+        if (isset($this->classMap[$class])) {
+            return $this->classMap[$class];
+        }
+        if ($this->classMapAuthoritative || isset($this->missingClasses[$class])) {
+            return false;
+        }
+        if (null !== $this->apcuPrefix) {
+            $file = apcu_fetch($this->apcuPrefix.$class, $hit);
+            if ($hit) {
+                return $file;
+            }
+        }
+
+        $file = $this->findFileWithExtension($class, '.php');
+
+        // Search for Hack files if we are running on HHVM
+        if (false === $file && defined('HHVM_VERSION')) {
+            $file = $this->findFileWithExtension($class, '.hh');
+        }
+
+        if (null !== $this->apcuPrefix) {
+            apcu_add($this->apcuPrefix.$class, $file);
+        }
+
+        if (false === $file) {
+            // Remember that this class does not exist.
+            $this->missingClasses[$class] = true;
+        }
+
+        return $file;
+    }
+
+    private function findFileWithExtension($class, $ext)
+    {
+        // PSR-4 lookup
+        $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR) . $ext;
+
+        $first = $class[0];
+        if (isset($this->prefixLengthsPsr4[$first])) {
+            $subPath = $class;
+            while (false !== $lastPos = strrpos($subPath, '\\')) {
+                $subPath = substr($subPath, 0, $lastPos);
+                $search = $subPath . '\\';
+                if (isset($this->prefixDirsPsr4[$search])) {
+                    $pathEnd = DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $lastPos + 1);
+                    foreach ($this->prefixDirsPsr4[$search] as $dir) {
+                        if (file_exists($file = $dir . $pathEnd)) {
+                            return $file;
+                        }
+                    }
+                }
+            }
+        }
+
+        // PSR-4 fallback dirs
+        foreach ($this->fallbackDirsPsr4 as $dir) {
+            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4)) {
+                return $file;
+            }
+        }
+
+        // PSR-0 lookup
+        if (false !== $pos = strrpos($class, '\\')) {
+            // namespaced class name
+            $logicalPathPsr0 = substr($logicalPathPsr4, 0, $pos + 1)
+                . strtr(substr($logicalPathPsr4, $pos + 1), '_', DIRECTORY_SEPARATOR);
+        } else {
+            // PEAR-like class name
+            $logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR) . $ext;
+        }
+
+        if (isset($this->prefixesPsr0[$first])) {
+            foreach ($this->prefixesPsr0[$first] as $prefix => $dirs) {
+                if (0 === strpos($class, $prefix)) {
+                    foreach ($dirs as $dir) {
+                        if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+                            return $file;
+                        }
+                    }
+                }
+            }
+        }
+
+        // PSR-0 fallback dirs
+        foreach ($this->fallbackDirsPsr0 as $dir) {
+            if (file_exists($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+                return $file;
+            }
+        }
+
+        // PSR-0 include paths.
+        if ($this->useIncludePath && $file = stream_resolve_include_path($logicalPathPsr0)) {
+            return $file;
+        }
+
+        return false;
+    }
+}
+
+/**
+ * Scope isolated include.
+ *
+ * Prevents access to $this/self from included files.
+ */
+function includeFile($file)
+{
+    include $file;
+}
diff --git a/monolog/vendor/composer/LICENSE b/twitter/vendor/composer/LICENSE
similarity index 100%
rename from monolog/vendor/composer/LICENSE
rename to twitter/vendor/composer/LICENSE
diff --git a/twitter/vendor/composer/autoload_classmap.php b/twitter/vendor/composer/autoload_classmap.php
new file mode 100644
index 00000000..1573664b
--- /dev/null
+++ b/twitter/vendor/composer/autoload_classmap.php
@@ -0,0 +1,14 @@
+<?php
+
+// autoload_classmap.php @generated by Composer
+
+$vendorDir = dirname(dirname(__FILE__));
+$baseDir = dirname($vendorDir);
+
+return array(
+    'Codebird\\Codebird' => $vendorDir . '/jublonet/codebird-php/src/codebird.php',
+    'Codebird\\CodebirdAuthException' => $vendorDir . '/jublonet/codebird-php/src/codebird.php',
+    'Codebird\\CodebirdCredentialsException' => $vendorDir . '/jublonet/codebird-php/src/codebird.php',
+    'Codebird\\CodebirdEndpointException' => $vendorDir . '/jublonet/codebird-php/src/codebird.php',
+    'Codebird\\CodebirdMediaException' => $vendorDir . '/jublonet/codebird-php/src/codebird.php',
+);
diff --git a/monolog/vendor/composer/autoload_namespaces.php b/twitter/vendor/composer/autoload_namespaces.php
similarity index 100%
rename from monolog/vendor/composer/autoload_namespaces.php
rename to twitter/vendor/composer/autoload_namespaces.php
diff --git a/twitter/vendor/composer/autoload_psr4.php b/twitter/vendor/composer/autoload_psr4.php
new file mode 100644
index 00000000..3eab876e
--- /dev/null
+++ b/twitter/vendor/composer/autoload_psr4.php
@@ -0,0 +1,11 @@
+<?php
+
+// autoload_psr4.php @generated by Composer
+
+$vendorDir = dirname(dirname(__FILE__));
+$baseDir = dirname($vendorDir);
+
+return array(
+    'Composer\\Installers\\' => array($vendorDir . '/composer/installers/src/Composer/Installers'),
+    'Abraham\\TwitterOAuth\\' => array($vendorDir . '/abraham/twitteroauth/src'),
+);
diff --git a/twitter/vendor/composer/autoload_real.php b/twitter/vendor/composer/autoload_real.php
new file mode 100644
index 00000000..9059acfd
--- /dev/null
+++ b/twitter/vendor/composer/autoload_real.php
@@ -0,0 +1,52 @@
+<?php
+
+// autoload_real.php @generated by Composer
+
+class ComposerAutoloaderInitTwitterAddon
+{
+    private static $loader;
+
+    public static function loadClassLoader($class)
+    {
+        if ('Composer\Autoload\ClassLoader' === $class) {
+            require __DIR__ . '/ClassLoader.php';
+        }
+    }
+
+    public static function getLoader()
+    {
+        if (null !== self::$loader) {
+            return self::$loader;
+        }
+
+        spl_autoload_register(array('ComposerAutoloaderInitTwitterAddon', 'loadClassLoader'), true, true);
+        self::$loader = $loader = new \Composer\Autoload\ClassLoader();
+        spl_autoload_unregister(array('ComposerAutoloaderInitTwitterAddon', 'loadClassLoader'));
+
+        $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
+        if ($useStaticLoader) {
+            require_once __DIR__ . '/autoload_static.php';
+
+            call_user_func(\Composer\Autoload\ComposerStaticInitTwitterAddon::getInitializer($loader));
+        } else {
+            $map = require __DIR__ . '/autoload_namespaces.php';
+            foreach ($map as $namespace => $path) {
+                $loader->set($namespace, $path);
+            }
+
+            $map = require __DIR__ . '/autoload_psr4.php';
+            foreach ($map as $namespace => $path) {
+                $loader->setPsr4($namespace, $path);
+            }
+
+            $classMap = require __DIR__ . '/autoload_classmap.php';
+            if ($classMap) {
+                $loader->addClassMap($classMap);
+            }
+        }
+
+        $loader->register(true);
+
+        return $loader;
+    }
+}
diff --git a/twitter/vendor/composer/autoload_static.php b/twitter/vendor/composer/autoload_static.php
new file mode 100644
index 00000000..faf5c95a
--- /dev/null
+++ b/twitter/vendor/composer/autoload_static.php
@@ -0,0 +1,48 @@
+<?php
+
+// autoload_static.php @generated by Composer
+
+namespace Composer\Autoload;
+
+class ComposerStaticInitTwitterAddon
+{
+    public static $prefixLengthsPsr4 = array (
+        'C' => 
+        array (
+            'Composer\\Installers\\' => 20,
+        ),
+        'A' => 
+        array (
+            'Abraham\\TwitterOAuth\\' => 21,
+        ),
+    );
+
+    public static $prefixDirsPsr4 = array (
+        'Composer\\Installers\\' => 
+        array (
+            0 => __DIR__ . '/..' . '/composer/installers/src/Composer/Installers',
+        ),
+        'Abraham\\TwitterOAuth\\' => 
+        array (
+            0 => __DIR__ . '/..' . '/abraham/twitteroauth/src',
+        ),
+    );
+
+    public static $classMap = array (
+        'Codebird\\Codebird' => __DIR__ . '/..' . '/jublonet/codebird-php/src/codebird.php',
+        'Codebird\\CodebirdAuthException' => __DIR__ . '/..' . '/jublonet/codebird-php/src/codebird.php',
+        'Codebird\\CodebirdCredentialsException' => __DIR__ . '/..' . '/jublonet/codebird-php/src/codebird.php',
+        'Codebird\\CodebirdEndpointException' => __DIR__ . '/..' . '/jublonet/codebird-php/src/codebird.php',
+        'Codebird\\CodebirdMediaException' => __DIR__ . '/..' . '/jublonet/codebird-php/src/codebird.php',
+    );
+
+    public static function getInitializer(ClassLoader $loader)
+    {
+        return \Closure::bind(function () use ($loader) {
+            $loader->prefixLengthsPsr4 = ComposerStaticInitTwitterAddon::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInitTwitterAddon::$prefixDirsPsr4;
+            $loader->classMap = ComposerStaticInitTwitterAddon::$classMap;
+
+        }, null, ClassLoader::class);
+    }
+}
diff --git a/twitter/vendor/composer/installed.json b/twitter/vendor/composer/installed.json
new file mode 100644
index 00000000..ba42eaab
--- /dev/null
+++ b/twitter/vendor/composer/installed.json
@@ -0,0 +1,241 @@
+[
+    {
+        "name": "abraham/twitteroauth",
+        "version": "0.7.4",
+        "version_normalized": "0.7.4.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/abraham/twitteroauth.git",
+            "reference": "c6f9e692552dd037b2324ed0dfa28a4e60875acf"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/abraham/twitteroauth/zipball/c6f9e692552dd037b2324ed0dfa28a4e60875acf",
+            "reference": "c6f9e692552dd037b2324ed0dfa28a4e60875acf",
+            "shasum": ""
+        },
+        "require": {
+            "ext-curl": "*",
+            "php": "^5.6 || ^7.0"
+        },
+        "require-dev": {
+            "phpmd/phpmd": "~2.6",
+            "phpunit/phpunit": "~5.7",
+            "squizlabs/php_codesniffer": "~3.0"
+        },
+        "time": "2017-06-30T22:02:01+00:00",
+        "type": "library",
+        "installation-source": "dist",
+        "autoload": {
+            "psr-4": {
+                "Abraham\\TwitterOAuth\\": "src"
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "Abraham Williams",
+                "email": "abraham@abrah.am",
+                "homepage": "https://abrah.am",
+                "role": "Developer"
+            }
+        ],
+        "description": "The most popular PHP library for use with the Twitter OAuth REST API.",
+        "homepage": "https://twitteroauth.com",
+        "keywords": [
+            "Twitter API",
+            "Twitter oAuth",
+            "api",
+            "oauth",
+            "rest",
+            "social",
+            "twitter"
+        ]
+    },
+    {
+        "name": "composer/installers",
+        "version": "v1.6.0",
+        "version_normalized": "1.6.0.0",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/composer/installers.git",
+            "reference": "cfcca6b1b60bc4974324efb5783c13dca6932b5b"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/composer/installers/zipball/cfcca6b1b60bc4974324efb5783c13dca6932b5b",
+            "reference": "cfcca6b1b60bc4974324efb5783c13dca6932b5b",
+            "shasum": ""
+        },
+        "require": {
+            "composer-plugin-api": "^1.0"
+        },
+        "replace": {
+            "roundcube/plugin-installer": "*",
+            "shama/baton": "*"
+        },
+        "require-dev": {
+            "composer/composer": "1.0.*@dev",
+            "phpunit/phpunit": "^4.8.36"
+        },
+        "time": "2018-08-27T06:10:37+00:00",
+        "type": "composer-plugin",
+        "extra": {
+            "class": "Composer\\Installers\\Plugin",
+            "branch-alias": {
+                "dev-master": "1.0-dev"
+            }
+        },
+        "installation-source": "dist",
+        "autoload": {
+            "psr-4": {
+                "Composer\\Installers\\": "src/Composer/Installers"
+            }
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "MIT"
+        ],
+        "authors": [
+            {
+                "name": "Kyle Robinson Young",
+                "email": "kyle@dontkry.com",
+                "homepage": "https://github.com/shama"
+            }
+        ],
+        "description": "A multi-framework Composer library installer",
+        "homepage": "https://composer.github.io/installers/",
+        "keywords": [
+            "Craft",
+            "Dolibarr",
+            "Eliasis",
+            "Hurad",
+            "ImageCMS",
+            "Kanboard",
+            "Lan Management System",
+            "MODX Evo",
+            "Mautic",
+            "Maya",
+            "OXID",
+            "Plentymarkets",
+            "Porto",
+            "RadPHP",
+            "SMF",
+            "Thelia",
+            "WolfCMS",
+            "agl",
+            "aimeos",
+            "annotatecms",
+            "attogram",
+            "bitrix",
+            "cakephp",
+            "chef",
+            "cockpit",
+            "codeigniter",
+            "concrete5",
+            "croogo",
+            "dokuwiki",
+            "drupal",
+            "eZ Platform",
+            "elgg",
+            "expressionengine",
+            "fuelphp",
+            "grav",
+            "installer",
+            "itop",
+            "joomla",
+            "kohana",
+            "laravel",
+            "lavalite",
+            "lithium",
+            "magento",
+            "majima",
+            "mako",
+            "mediawiki",
+            "modulework",
+            "modx",
+            "moodle",
+            "osclass",
+            "phpbb",
+            "piwik",
+            "ppi",
+            "puppet",
+            "pxcms",
+            "reindex",
+            "roundcube",
+            "shopware",
+            "silverstripe",
+            "sydes",
+            "symfony",
+            "typo3",
+            "wordpress",
+            "yawik",
+            "zend",
+            "zikula"
+        ]
+    },
+    {
+        "name": "jublonet/codebird-php",
+        "version": "dev-master",
+        "version_normalized": "9999999-dev",
+        "source": {
+            "type": "git",
+            "url": "https://github.com/jublonet/codebird-php.git",
+            "reference": "df362d8ad629aad6c4c7dbf36a440e569ec41368"
+        },
+        "dist": {
+            "type": "zip",
+            "url": "https://api.github.com/repos/jublonet/codebird-php/zipball/df362d8ad629aad6c4c7dbf36a440e569ec41368",
+            "reference": "df362d8ad629aad6c4c7dbf36a440e569ec41368",
+            "shasum": ""
+        },
+        "require": {
+            "composer/installers": "~1.0",
+            "ext-hash": "*",
+            "ext-json": "*",
+            "lib-openssl": "*",
+            "php": ">=5.5.0"
+        },
+        "require-dev": {
+            "php-coveralls/php-coveralls": ">=0.6",
+            "phpunit/phpunit": ">=7.3",
+            "squizlabs/php_codesniffer": "2.*"
+        },
+        "time": "2018-08-16T00:07:08+00:00",
+        "type": "library",
+        "installation-source": "source",
+        "autoload": {
+            "classmap": [
+                "src/"
+            ]
+        },
+        "notification-url": "https://packagist.org/downloads/",
+        "license": [
+            "GPL-3.0+"
+        ],
+        "authors": [
+            {
+                "name": "Joshua Atkins",
+                "role": "Developer",
+                "email": "joshua.atkins@jublo.net",
+                "homepage": "http://atkins.im/"
+            },
+            {
+                "name": "J.M.",
+                "role": "Developer",
+                "email": "jm@jublo.net",
+                "homepage": "http://mynetx.net/"
+            }
+        ],
+        "description": "Easy access to the Twitter REST API, Direct Messages API, Account Activity API, TON (Object Nest) API and Twitter Ads API — all from one PHP library.",
+        "homepage": "https://www.jublo.net/projects/codebird/php",
+        "keywords": [
+            "api",
+            "networking",
+            "twitter"
+        ]
+    }
+]
diff --git a/twitter/vendor/jublonet/codebird-php/.gitattributes b/twitter/vendor/jublonet/codebird-php/.gitattributes
new file mode 100644
index 00000000..dfe07704
--- /dev/null
+++ b/twitter/vendor/jublonet/codebird-php/.gitattributes
@@ -0,0 +1,2 @@
+# Auto detect text files and perform LF normalization
+* text=auto
diff --git a/twitter/vendor/jublonet/codebird-php/.gitignore b/twitter/vendor/jublonet/codebird-php/.gitignore
new file mode 100644
index 00000000..db64e73a
--- /dev/null
+++ b/twitter/vendor/jublonet/codebird-php/.gitignore
@@ -0,0 +1,7 @@
+build
+composer.lock
+RELEASE_MESSAGE*
+test*.php
+vendor
+*.jpg
+*.mp4
diff --git a/twitter/vendor/jublonet/codebird-php/.travis.yml b/twitter/vendor/jublonet/codebird-php/.travis.yml
new file mode 100644
index 00000000..976b65c5
--- /dev/null
+++ b/twitter/vendor/jublonet/codebird-php/.travis.yml
@@ -0,0 +1,47 @@
+# The Travis setup:
+# - run testsuite for every PHP version
+# - run lint for every PHP version
+
+language: php
+sudo: false
+
+php:
+  - "7.2"
+  - "7.1"
+  - hhvm
+  - nightly
+
+sudo: false
+
+before_script:
+  - export PATH=~/.composer/vendor/bin/:$PATH
+  - composer install --no-interaction
+  - pip install --user codecov
+
+script:
+  - ant clean
+  - set -e;
+    if [ $TRAVIS_PHP_VERSION == "hhvm" ] ; then
+    ant phpunit-hhvm ;
+    else
+    ant phpunit ;
+    fi
+
+after_script:
+  - if [ -f vendor/bin/coveralls ] ; then php vendor/bin/coveralls -v || true ; fi
+  - codecov
+  - if [ -f php.log ] ; then cat php.log ; fi
+
+matrix:
+  allow_failures:
+    - php: hhvm
+    - php: nightly
+  fast_finish: true
+cache:
+  directories:
+    - $HOME/.composer/cache/
+    - $HOME/runkit
+# trigger Buildtime Trend Service to parse Travis CI log
+notifications:
+  webhooks:
+    - https://buildtimetrend.herokuapp.com/travis
diff --git a/twitter/vendor/jublonet/codebird-php/CHANGELOG b/twitter/vendor/jublonet/codebird-php/CHANGELOG
new file mode 100644
index 00000000..5f2b1bde
--- /dev/null
+++ b/twitter/vendor/jublonet/codebird-php/CHANGELOG
@@ -0,0 +1,185 @@
+codebird-php - changelog
+========================
+
+4.0.0 (not yet released)
++ #161 Update oembed API method endpoint
++ Update to Twitter Ads API Version 1
++ Add Ads API POST tailored_audience_memberships method
++ Add Ads Sandbox API POST accounts method
++ Add Ads Sandbox API POST accounts/:account_id/features method
++ Add Ads Sandbox API POST accounts/:account_id/funding_instruments method
++ Update more Ads API methods
+- Fix Ads API batch methods to send JSON body
++ Update Ads API Analytics methods (stats)
++ #177 Add async media/upload calls status by GET
++ Add POST media/metadata/create method
+- Fix TON API upload - add additional header parsing
++ Add custom Codebird Exception classes
++ Add Account Activity API methods
++ Add new Direct Messages API
++ Update cacert.pem file
+- Remove sunsetting Direct Messages API
+- Remove sunsetting Streaming API
+- Remove contributor API methods
+- Remove deprecated statuses/update_with_media method
+- Remove deprecated statuses/update_profile_background_image method
+
+3.1.0 (2016-02-15)
++ #143 Add support for proxy types
++ #152 Throw Exception on failed remote media download
++ Add REST API POST statuses/unretweet/:id
++ Add Ads API GET insights/keywords/search
++ #151 Avoid JSON_BIGINT_AS_STRING errors
+- Fix typo in changelog
+
+3.0.0 (2016-01-01)
++ Add unit testing suite
++ #32 Support Twitter Streaming API
++ #144 Support Twitter Collections API
++ #145 Support Twitter TON (Object Nest) API
++ #120 Support Twitter Ads API
++ #117 Drop cURL workarounds added for PHP 5.3
++ Update cacert.pem
++ #121 Allow for multiple parameters in templated methods
+  by replacing preg_match with preg_match_all
++ #134 Add support for compressed remote images
++ #129 Allow to change remote media download timeout
++ Support WebP media format
++ Fixes for non-multipart media uploads, see #141
++ Return rate-limiting info as object, when return format = object
+- #107 Decoding issue for big ints on 32-bit servers
+- #147 Undefined index when checking for possible media files
+
+2.7.2 (2015-09-23)
+- #135 Invalid HTTP request headers in non-cURL mode
+
+2.7.1 (2015-08-16)
++ #124 Download redirected remote images
+
+2.7.0 (2015-05-14)
+- #92, #108 Fix issues with uploading special chars
++ #109 Proxy support
+- Drop support for internal and old API methods
++ #111 Set user agent for remote calls
++ #106 Add logout method
++ #86 Return exception for failed cURL requests
+
+2.6.1 (2014-12-13)
+- #90 Allow uploading media with special chars
+
+2.6.0 (2014-10-12)
++ #67 Don't require cURL, allow stream connections too
++ Use default timeout
++ #69 Add composer/installers to allow install path changes
+- Regression: Codebird::getApiMethods removed accidentally in 2.5.0
++ #66 Allow remote media uploads
+- #81 CURLOPT_TIMEOUT_MS and CURLOPT_CONNECTTIMEOUT_MS errors on PHP 5.3
+- #83 Use POST for users/lookup and statuses/lookup, params may get too long for GET
++ Update README to reflect new process for uploading single/multiple media, see #78
+
+2.5.0 (2014-06-20)
++ Add section about cacert.pem to README
++ Option to set cURL timeout
++ #42 Allow to get the supported API methods as array
++ #48 Update composer file to jublonet path
++ Update cacert.pem root certificates file
++ #58 support for GET statuses/retweeters/ids
++ #53 Better Proxy HTTP status detection
+- #62 Places & Geo API call issue
++ #33 Support internal API methods
++ #59 Support all known API methods
++ Reset bearer token when requesting a new token
++ #61 Return rate limit details with each API call
++ #60 Support uploading multiple media
+- #63 Return rate-limiting info only if contained in response
+- #57 Don't require consumer key if bearer token is already known
+
+2.4.1 (2013-06-23)
++ #26 Stringify null and boolean parameters
++ Validate Twitter SSL certificate for oauth2/token method
+
+2.4.0 (2013-06-15)
++ Add contributing guidelines
++ rfe #21 JSON return format
++ Support HTTP proxy replies
++ Validate Twitter SSL certificate
++ #23 Readme: Fix authentication sample
+
+2.3.6 (2013-05-12)
++ Add backslash to stdClass construction, due to namespace
+
+2.3.5 (2013-04-30)
++ Fix fatal error:  Class 'Codebird\Exception' not found
+
+2.3.4 (2013-04-28)
++ Fix namespace not properly cased
+
+2.3.3 (2013-04-26)
++ Detect API error responses as XML, see #1
++ OAuth: add support for force_login, screen_name parameters, see #14
++ Add namespace
+
+2.3.2 (2013-04-09)
++ Use protected keyword for methods that may be overriden in extended classes
+
+2.3.1 (2013-03-23)
+- Re-remove statuses/sample. It's streaming API, which Codebird doesn't currently support
++ Don't send multipart POST to non-multipart methods, fix issue #8
++ Remove auto-added backslashes from parsed API method parameters if magic quotes are on, fix #7
+
+2.3.0 (2013-03-19)
++ Update README with info about how to get details of the current user
++ Clarify that the consumer secret and access token secret are not the same
++ Readme: Clarify authentication tokens
++ Add README section about rate-limiting
++ Add README section about cursored results
++ Add OAuth2 application-only auth
+- Drop support for statuses/public_timeline
+- Drop support for v1 API
++ add statuses/sample, friendships/no_retweets/ids methods
++ Add Changelog
+
+2.2.3 (2012-12-03)
++ Fix wrong assignment operator in _detectMethod for multi HTTP method endpoints
++ Add documentation about $params in _detectMethod
++ Add new methods now available in 1.1
++ Add friends/list, followers/list API methods
+
+2.2.2 (2012-10-17)
++ Add profile banner methods
++ Drop separate media upload method as noted at https://dev.twitter.com/docs/api/1.1/post/statuses/update_with_media
++ Fix wrong Exception
++ add support for old endpoints
++ Update endpoints to 1.1 endpoints
+
+2.2.1 (2012-09-17)
++ Update to Twitter API 1.1
+
+2.2.0 (2012-07-08)
++ Add support for users/profile_image/:screen_name
+- drop support for string return format
+
+2.1 (2012-07-07)
++ Add documentation in readme
++ make OAuth consumer key and secret static
++ Highlight the 'uploading files to Twitter' docs
++ Return HTTP status with array return_format
+
+2.0 (2012-07-06)
++ Complete rewrite. Now supports media uploads.
++ Support API methods with templated variables (like statuses/show/:id)
++ Add documentation
+
+1.2 (2012-07-04)
++ Apply PEAR coding standards
++ Use self instead of class name
+
+1.1 (2011-07-08)
++ Fixed: Removed ; sign.
++ Added: Detect parameter-less messages (such as, error messages).
++ Changed: Oauth_Authorize should return the URL instead of redirecting there.
++ Added: Ability to provide parameters to oauth/request_token.
++ Changed: Use api.twitter.com as OAuth hostname.
++ Added: Allow oauth/access_token to have parameters.
++ Changed: Don't rely on intval() for the large tweet id's that Snowflake is generating nowadays.
++ Fixed: Decode empty JSON arrays [] properly.
diff --git a/twitter/vendor/jublonet/codebird-php/CONTRIBUTING.md b/twitter/vendor/jublonet/codebird-php/CONTRIBUTING.md
new file mode 100644
index 00000000..e6b5c88f
--- /dev/null
+++ b/twitter/vendor/jublonet/codebird-php/CONTRIBUTING.md
@@ -0,0 +1,11 @@
+### Which branch?
+- Bugs are fixed in the master branch, please base your bugfix pull requests on this branch.
+- New features are added to the develop branch, please base your feature-add pull requests on that branch.
+
+### Code style
+- Please use 2 soft spaces per indent level.
+- Take a look at the coding style used in codebird.php and apply the same convention to your contributed code.
+The styleguide is also available online at https://pear.php.net/manual/en/standards.php.
+
+### License
+- Code contributed by you will get the same license as Codebird itself, that is, GPU General Public License V3.
diff --git a/twitter/vendor/jublonet/codebird-php/LICENSE b/twitter/vendor/jublonet/codebird-php/LICENSE
new file mode 100644
index 00000000..94a9ed02
--- /dev/null
+++ b/twitter/vendor/jublonet/codebird-php/LICENSE
@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/twitter/vendor/jublonet/codebird-php/README.md b/twitter/vendor/jublonet/codebird-php/README.md
new file mode 100644
index 00000000..6b0a5c73
--- /dev/null
+++ b/twitter/vendor/jublonet/codebird-php/README.md
@@ -0,0 +1,891 @@
+codebird-php
+============
+*Easy access to the Twitter REST API, Direct Messages API, Account Activity API, TON (Object Nest) API and Twitter Ads API — all from one PHP library.*
+
+Copyright (C) 2010-2018 Jublo Limited <support@jublo.net>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+[![Codacy Badge](https://api.codacy.com/project/badge/Grade/3cd81a521d334648b9958327621a3070)](https://www.codacy.com/app/jublonet/codebird-php?utm_source=github.com&utm_medium=referral&utm_content=jublonet/codebird-php&utm_campaign=badger)
+[![Coverage Status](https://img.shields.io/coveralls/jublonet/codebird-php/develop.svg)](https://coveralls.io/github/jublonet/codebird-php?branch=develop)
+[![Travis Status](https://img.shields.io/travis/jublonet/codebird-php/develop.svg)](https://travis-ci.org/jublonet/codebird-php/branches)
+
+### Requirements
+
+- PHP 7.1.0 or higher
+- OpenSSL extension
+
+
+Summary
+-------
+
+Use Codebird to connect to the Twitter **REST API, Streaming API, Collections API, TON (Object Nest) API**
+and **Twitter Ads API** from your PHP code — all using just one library.
+Codebird supports full 3-way OAuth as well as application-only auth.
+
+
+Authentication
+--------------
+
+To authenticate your API requests on behalf of a certain Twitter user
+(following OAuth 1.0a), take a look at these steps:
+
+```php
+require_once ('codebird.php');
+\Codebird\Codebird::setConsumerKey('YOURKEY', 'YOURSECRET'); // static, see README
+
+$cb = \Codebird\Codebird::getInstance();
+```
+
+You may either set the OAuth token and secret, if you already have them:
+```php
+$cb->setToken('YOURTOKEN', 'YOURTOKENSECRET');
+```
+
+Or you authenticate, like this:
+
+```php
+session_start();
+
+if (! isset($_SESSION['oauth_token'])) {
+  // get the request token
+  $reply = $cb->oauth_requestToken([
+    'oauth_callback' => 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']
+  ]);
+
+  // store the token
+  $cb->setToken($reply->oauth_token, $reply->oauth_token_secret);
+  $_SESSION['oauth_token'] = $reply->oauth_token;
+  $_SESSION['oauth_token_secret'] = $reply->oauth_token_secret;
+  $_SESSION['oauth_verify'] = true;
+
+  // redirect to auth website
+  $auth_url = $cb->oauth_authorize();
+  header('Location: ' . $auth_url);
+  die();
+
+} elseif (isset($_GET['oauth_verifier']) && isset($_SESSION['oauth_verify'])) {
+  // verify the token
+  $cb->setToken($_SESSION['oauth_token'], $_SESSION['oauth_token_secret']);
+  unset($_SESSION['oauth_verify']);
+
+  // get the access token
+  $reply = $cb->oauth_accessToken([
+    'oauth_verifier' => $_GET['oauth_verifier']
+  ]);
+
+  // store the token (which is different from the request token!)
+  $_SESSION['oauth_token'] = $reply->oauth_token;
+  $_SESSION['oauth_token_secret'] = $reply->oauth_token_secret;
+
+  // send to same URL, without oauth GET parameters
+  header('Location: ' . basename(__FILE__));
+  die();
+}
+
+// assign access token on each page load
+$cb->setToken($_SESSION['oauth_token'], $_SESSION['oauth_token_secret']);
+```
+
+### Logging out
+
+In case you want to log out the current user (to log in a different user without
+creating a new Codebird object), just call the `logout()` method.
+
+```
+$cb->logout();
+```
+
+### Application-only auth
+
+Some API methods also support authenticating on a per-application level.
+This is useful for getting data that are not directly related to a specific
+Twitter user, but generic to the Twitter ecosystem (such as ```search/tweets```).
+
+To obtain an app-only bearer token, call the appropriate API:
+
+```php
+$reply = $cb->oauth2_token();
+$bearer_token = $reply->access_token;
+```
+
+I strongly recommend that you store the obtained bearer token in your database.
+There is no need to re-obtain the token with each page load, as it becomes invalid
+only when you call the ```oauth2/invalidate_token``` method.
+
+If you already have your token, tell Codebird to use it:
+```php
+\Codebird\Codebird::setBearerToken('YOURBEARERTOKEN');
+```
+In this case, you don't need to set the consumer key and secret.
+For sending an API request with app-only auth, see the ‘Usage examples’ section.
+
+
+### A word on your callback URL
+
+Twitter is very restrictive about which URLs may be used for your callback URL.
+For example, even the presence of the ‘www’ subdomain must match with the domain
+that you specified in the settings of your app at https://developer.twitter.com/en/apps.
+
+
+Mapping API methods to Codebird function calls
+----------------------------------------------
+
+As you can see from the last example, there is a general way how Twitter’s API methods
+map to Codebird function calls. The general rules are:
+
+1. For each slash in a Twitter API method, use an underscore in the Codebird function.
+
+  Example: ```statuses/update``` maps to ```Codebird::statuses_update()```.
+
+2. For each underscore in a Twitter API method, use camelCase in the Codebird function.
+
+  Example: ```statuses/home_timeline``` maps to ```Codebird::statuses_homeTimeline()```.
+
+3. For each parameter template in method, use UPPERCASE in the Codebird function.
+  Also don’t forget to include the parameter in your parameter list.
+
+  Examples:
+  - ```statuses/show/:id``` maps to ```Codebird::statuses_show_ID('id=12345')```.
+  - ```users/profile_image/:screen_name``` maps to
+    `Codebird::users_profileImage_SCREEN_NAME('screen_name=jublonet')`.
+
+Usage examples
+--------------
+
+When you have an access token, calling the API is simple:
+
+```php
+$cb->setToken($_SESSION['oauth_token'], $_SESSION['oauth_token_secret']); // see above
+
+$reply = (array) $cb->statuses_homeTimeline();
+print_r($reply);
+```
+
+Tweeting is as easy as this:
+
+```php
+$reply = $cb->statuses_update('status=Whohoo, I just Tweeted!');
+```
+
+:warning: *Make sure to urlencode any parameter values that contain
+query-reserved characters, like Tweeting the `&` sign:*
+
+```php
+$reply = $cb->statuses_update('status=' . urlencode('Fish & chips'));
+// will result in this:
+$reply = $cb->statuses_update('status=Fish+%26+chips');
+```
+
+In most cases, giving all parameters in an array is easier,
+because no encoding is needed:
+
+```php
+$params = [
+  'status' => 'Fish & chips'
+];
+$reply = $cb->statuses_update($params);
+```
+
+```php
+$params = [
+  'status' => 'I love London',
+  'lat'    => 51.5033,
+  'long'   => 0.1197
+];
+$reply = $cb->statuses_update($params);
+```
+
+```php
+$params = [
+  'screen_name' => 'jublonet'
+];
+$reply = $cb->users_show($params);
+```
+This is the [resulting Tweet](https://twitter.com/LarryMcTweet/status/482239971399835648)
+sent with the code above.
+
+### Requests with app-only auth
+
+To send API requests without an access token for a user (app-only auth),
+add a second parameter to your method call, like this:
+
+```php
+$reply = $cb->search_tweets('q=Twitter', true);
+```
+
+Bear in mind that not all API methods support application-only auth.
+
+
+HTTP methods (GET, POST, DELETE etc.)
+-------------------------------------
+
+Never care about which HTTP method (verb) to use when calling a Twitter API.
+Codebird is intelligent enough to find out on its own.
+
+Response codes
+--------------
+
+The HTTP response code that the API gave is included in any return values.
+You can find it within the return object’s ```httpstatus``` property.
+
+### Dealing with rate-limits
+
+Basically, Codebird leaves it up to you to handle Twitter’s rate limit.
+The library returns the response HTTP status code, so you can detect rate limits.
+
+I suggest you to check if the ```$reply->httpstatus``` property is ```400```
+and check with the Twitter API to find out if you are currently being
+rate-limited.
+See the [Rate Limiting FAQ](https://developer.twitter.com/en/docs/basics/rate-limiting)
+for more information.
+
+Unless your return format is JSON, you will receive rate-limiting details
+in the returned data’s ```$reply->rate``` property,
+if the Twitter API responds with rate-limiting HTTP headers.
+
+Return formats
+--------------
+The default return format for API calls is a PHP object.
+For API methods returning multiple data (like ```statuses/home_timeline```),
+you should cast the reply to array, like this:
+
+```php
+$reply = $cb->statuses_homeTimeline();
+$data = (array) $reply;
+```
+
+Upon your choice, you may also get PHP arrays directly:
+
+```php
+$cb->setReturnFormat(CODEBIRD_RETURNFORMAT_ARRAY);
+```
+
+The Twitter API natively responds to API calls in JSON (JS Object Notation).
+To get a JSON string, set the corresponding return format:
+
+```php
+$cb->setReturnFormat(CODEBIRD_RETURNFORMAT_JSON);
+```
+
+Uploading images and videos
+---------------------------
+
+Twitter will accept the following media types, all of which are supported by Codebird:
+- PNG
+- JPEG
+- BMP
+- WebP
+- GIF
+- Animated GIF
+- Video
+
+Tweet media can be uploaded in a 2-step process:
+
+**First** you send each media to Twitter. For **images**, it works like this:
+
+```php
+// these files to upload. You can also just upload 1 image!
+$media_files = [
+  'bird1.jpg', 'bird2.jpg', 'bird3.jpg'
+];
+// will hold the uploaded IDs
+$media_ids = [];
+
+foreach ($media_files as $file) {
+  // upload all media files
+  $reply = $cb->media_upload([
+    'media' => $file
+  ]);
+  // and collect their IDs
+  $media_ids[] = $reply->media_id_string;
+}
+```
+
+Uploading **videos** requires you to send the data in chunks. See the next section on this.
+
+**Second,** you attach the collected media ids for all images to your call
+to ```statuses/update```, like this:
+
+```php
+// convert media ids to string list
+$media_ids = implode(',', $media_ids);
+
+// send Tweet with these medias
+$reply = $cb->statuses_update([
+  'status' => 'These are some of my relatives.',
+  'media_ids' => $media_ids
+]);
+print_r($reply);
+```
+
+Here is a [sample Tweet](https://twitter.com/LarryMcTweet/status/475276535386365952)
+sent with the code above.
+
+More [documentation for uploading media](https://developer.twitter.com/en/docs/media/upload-media/overview) is available on the Twitter Developer site.
+
+### Remote files
+
+Remote files received from `http` and `https` servers are supported, too:
+```php
+$reply = $cb->media_upload(array(
+  'media' => 'http://www.bing.com/az/hprichbg/rb/BilbaoGuggenheim_EN-US11232447099_1366x768.jpg'
+));
+```
+
+:warning: *URLs containing Unicode characters should be normalised. A sample normalisation function can be found at http://stackoverflow.com/a/6059053/1816603*
+
+To circumvent download issues when remote servers are slow to respond,
+you may customise the remote download timeout, like this:
+
+```php
+$cb->setRemoteDownloadTimeout(10000); // milliseconds
+```
+
+### Video files
+
+Uploading videos to Twitter (≤ 15MB, MP4) requires you to send them in chunks.
+You need to perform at least 3 calls to obtain your `media_id` for the video:
+
+1. Send an `INIT` event to get a `media_id` draft.
+2. Upload your chunks with `APPEND` events, each one up to 5MB in size.
+3. Send a `FINALIZE` event to convert the draft to a ready-to-Tweet `media_id`.
+4. Post your Tweet with video attached.
+
+Here’s a sample for video uploads:
+
+```php
+$file       = 'demo-video.mp4';
+$size_bytes = filesize($file);
+$fp         = fopen($file, 'r');
+
+// INIT the upload
+
+$reply = $cb->media_upload([
+  'command'     => 'INIT',
+  'media_type'  => 'video/mp4',
+  'total_bytes' => $size_bytes
+]);
+
+$media_id = $reply->media_id_string;
+
+// APPEND data to the upload
+
+$segment_id = 0;
+
+while (! feof($fp)) {
+  $chunk = fread($fp, 1048576); // 1MB per chunk for this sample
+
+  $reply = $cb->media_upload([
+    'command'       => 'APPEND',
+    'media_id'      => $media_id,
+    'segment_index' => $segment_id,
+    'media'         => $chunk
+  ]);
+
+  $segment_id++;
+}
+
+fclose($fp);
+
+// FINALIZE the upload
+
+$reply = $cb->media_upload([
+  'command'       => 'FINALIZE',
+  'media_id'      => $media_id
+]);
+
+var_dump($reply);
+
+if ($reply->httpstatus < 200 || $reply->httpstatus > 299) {
+  die();
+}
+
+// if you have a field `processing_info` in the reply,
+// use the STATUS command to check if the video has finished processing.
+
+// Now use the media_id in a Tweet
+$reply = $cb->statuses_update([
+  'status'    => 'Twitter now accepts video uploads.',
+  'media_ids' => $media_id
+]);
+
+```
+
+**Find more information about [accepted media formats](https://developer.twitter.com/en/docs/media/upload-media/uploading-media/media-best-practices) in the Twitter Developer docs.**
+
+:warning: When uploading a video in multiple chunks, you may run into an error `The validation of media ids failed.` even though the `media_id` is correct. This is known. Please check back in the [Twitter community forums](https://twittercommunity.com/tags/video).
+
+
+Twitter Streaming API
+---------------------
+
+The Streaming APIs give developers low latency access to Twitter’s global stream of
+Tweet data. A proper implementation of a streaming client will be pushed messages
+indicating Tweets and other events have occurred, without any of the overhead
+associated with polling a REST endpoint.
+
+To consume one of the available Twitter streams, follow these **two steps:**
+
+1. Set up a callback function that gets called for every new streaming message that arrives.
+
+   Codebird also calls this function once per second, to allow you to work on any due tasks, and to give you the chance to cancel the stream even if no new messages appear.
+
+2. After creating the callback, tell Codebird about it using a [callable](http://php.net/manual/en/language.types.callable.php). Then start consuming the stream.
+
+```php
+// First, create a callback function:
+
+function some_callback($message)
+{
+  // gets called for every new streamed message
+  // gets called with $message = NULL once per second
+
+  if ($message !== null) {
+    print_r($message);
+    flush();
+  }
+
+  // return false to continue streaming
+  // return true to close the stream
+
+  // close streaming after 1 minute for this simple sample
+  // don't rely on globals in your code!
+  if (time() - $GLOBALS['time_start'] >= 60) {
+    return true;
+  }
+
+  return false;
+}
+
+// set the streaming callback in Codebird
+$cb->setStreamingCallback('some_callback');
+
+// any callable is accepted:
+// $cb->setStreamingCallback(['MyClass', 'some_callback']);
+
+// for canceling, see callback function body
+// not considered good practice in real world!
+$GLOBALS['time_start'] = time();
+
+// Second, start consuming the stream:
+$reply = $cb->statuses_filter();
+
+// See the *Mapping API methods to Codebird function calls* section for method names.
+// $reply = $cb->statuses_filter('track=Windows');
+```
+
+You should be able to set a timeout for the streaming API using `setTimeout`.
+In addition, your callback will receive empty messages if no events occur,
+and you should make your function `return true;` in order to cancel the stream.
+
+Find more information on the [Streaming API](https://developer.twitter.com/en/docs/tweets/filter-realtime/overview)
+in the developer documentation website.
+
+
+Twitter Collections, Direct Messages and Account Activity APIs
+--------------------------------------------------------------
+
+Collections are a type of timeline that you control and can be hand curated
+and/or programmed using an API.
+
+Pay close attention to the differences in how collections are presented —
+often they will be decomposed, efficient objects with information about users,
+Tweets, and timelines grouped, simplified, and stripped of unnecessary repetition.
+
+Never care about the OAuth signing specialities and the JSON POST body
+for POST and PUT calls to these special APIs. Codebird takes off the work for you
+and will always send the correct Content-Type automatically.
+
+Find out more about the [Collections API](https://developer.twitter.com/en/docs/tweets/curate-a-collection/overview/about_collections) in the Twitter API docs.
+More information on the [Direct Messages API](https://developer.twitter.com/en/docs/direct-messages/api-features) and the [Account Activity API](https://developer.twitter.com/en/docs/accounts-and-users/subscribe-account-activity/overview) is available there as well.
+
+Here’s a sample for adding a Tweet using the Collections API:
+
+```php
+$reply = $cb->collections_entries_curate([
+  'id' => 'custom-672852634622144512',
+  'changes' => [
+  ['op' => 'add', 'tweet_id' => '672727928262828032']
+  ]
+]);
+
+var_dump($reply);
+```
+
+TON (Twitter Object Nest) API
+-----------------------------
+
+The [TON (Twitter Object Nest) API](https://developer.twitter.com/en/docs/ads/audiences/overview/ton-upload.html) allows implementers to upload media and various assets to Twitter.
+The TON API supports non-resumable and resumable upload methods based on the size of the file.
+For files less than 64MB, non-resumable may be used. For files greater than or equal to 64MB,
+resumable must be used. Resumable uploads require chunk sizes of less than 64MB.
+
+For accessing the TON API, please adapt the following code samples for uploading:
+
+### Single-chunk upload
+
+```php
+// single-chunk upload
+
+$reply = $cb->ton_bucket_BUCKET([
+  'bucket' => 'ta_partner',
+  'Content-Type' => 'image/jpeg',
+  'media' => $file
+]);
+
+var_dump($reply);
+
+// use the Location header now...
+echo $reply->Location;
+```
+
+As you see from that sample, Codebird rewrites the special TON API headers into the reply,
+so you can easily access them.  This also applies to the `X-TON-Min-Chunk-Size` and
+`X-Ton-Max-Chunk-Size` for chunked uploads:
+
+### Multi-chunk upload
+
+```php
+// multi-chunk upload
+$file       = 'demo-video.mp4';
+$size_bytes = filesize($file);
+$fp         = fopen($file, 'r');
+
+// INIT the upload
+
+$reply = $cb->__call(
+  'ton/bucket/BUCKET?resumable=true',
+  [[ // note the double square braces when using __call
+    'bucket' => 'ta_partner',
+    'Content-Type' => 'video/mp4',
+    'X-Ton-Content-Type' => 'video/mp4',
+    'X-Ton-Content-Length' => $size_bytes
+  ]]
+);
+
+$target = $reply->Location;
+// something like: '/1.1/ton/bucket/ta_partner/SzFxGfAg_Zj.mp4?resumable=true&resumeId=28401873'
+$match = [];
+
+// match the location parts
+preg_match('/ton\/bucket\/.+\/(.+)\?resumable=true&resumeId=(\d+)/', $target, $match);
+list ($target, $file, $resumeId) = $match;
+
+// APPEND data to the upload
+
+$segment_id = 0;
+
+while (! feof($fp)) {
+  $chunk = fread($fp, 1048576); // 1MB per chunk for this sample
+
+  // special way to call Codebird for the upload chunks
+  $reply = $cb->__call(
+    'ton/bucket/BUCKET/FILE?resumable=true&resumeId=RESUMEID',
+    [[ // note the double square braces when using __call
+      'bucket' => 'ta_partner',
+      'file' => $file, // you get real filename from INIT, see above
+      'Content-Type' => 'image/jpeg',
+      'Content-Range' => 'bytes '
+        . ($segment_id * 1048576) . '-' . strlen($chunk) . '/' . $size_bytes,
+      'resumeId' => $resumeId,
+      'media' => $chunk
+    ]]
+  );
+
+  $segment_id++;
+}
+
+fclose($fp);
+```
+
+Twitter Ads API
+---------------
+
+The [Twitter Ads API](https://developer.twitter.com/en/docs/ads/general/overview) allows partners to
+integrate with the Twitter advertising platform in their own advertising solutions.
+Selected partners have the ability to create custom tools to manage and execute
+Twitter Ad campaigns.
+
+When accessing the Ads API or Ads Sandbox API, access it by prefixing your call
+with `ads_`. Watch out for the usual replacements for in-url parameters,
+particularly `:account_id`.
+
+**Tip:** For accessing the Ads Sandbox API, use the `ads_sandbox_` prefix,
+like shown further down.
+
+Here is an example for calling the Twitter Ads API:
+
+```php
+$reply = $cb->ads_accounts_ACCOUNT_ID_cards_appDownload([
+  'account_id' => '123456789',
+  'name' => 'Test',
+  'app_country_code' => 'DE'
+]);
+```
+
+### Multiple-method API calls
+
+In the Twitter Ads API, there are multiple methods that can be reached by
+HTTP `GET`, `POST`, `PUT` and/or `DELETE`. While Codebird does its best to guess
+which HTTP verb you’ll want to use, it’s the safest bet to give a hint yourself,
+like this:
+
+```php
+$reply = $cb->ads_sandbox_accounts_ACCOUNT_ID_cards_imageConversation_CARD_ID([
+  'httpmethod' => 'DELETE',
+  'account_id' => '123456789',
+  'card_id' => '2468013579'
+]);
+```
+
+Codebird will remove the `httpmethod` parameter from the parameters list automatically,
+and set the corresponding HTTP verb.
+
+
+How Do I…?
+----------
+
+### …use multiple Codebird instances?
+
+By default, Codebird works with just one instance. This programming paradigma is
+called a *singleton*.
+
+Getting the main Codebird object is done like this:
+
+```php
+$cb = \Codebird\Codebird::getInstance();
+```
+
+If you need to run requests to the Twitter API for multiple users at once,
+Codebird supports this as well. Instead of getting the instance like shown above,
+create a new object:
+
+```php
+$cb1 = new \Codebird\Codebird;
+$cb2 = new \Codebird\Codebird;
+```
+
+Please note that your OAuth consumer key and secret is shared within
+multiple Codebird instances, while the OAuth request and access tokens with their
+secrets are *not* shared.
+
+
+### …access a user’s profile image?
+
+First retrieve the user object using
+
+```$reply = $cb->users_show("screen_name=$username");```
+
+
+with ```$username``` being the username of the account you wish to retrieve the profile image from.
+
+Then get the value from the index ```profile_image_url``` or ```profile_image_url_https``` of the user object previously retrieved.
+
+
+For example:
+
+```$reply['profile_image_url']``` will then return the profile image url without https.
+
+### …get user ID, screen name and more details about the current user?
+
+When the user returns from the authentication screen, you need to trade
+the obtained request token for an access token, using the OAuth verifier.
+As discussed in the section ‘Usage example,’ you use a call to
+```oauth/access_token``` to do that.
+
+The API reply to this method call tells you details about the user that just logged in.
+These details contain the **user ID** and the **screen name.**
+
+Take a look at the returned data as follows:
+
+```
+stdClass Object
+(
+  [oauth_token] => 14648265-rPn8EJwfB**********************
+  [oauth_token_secret] => agvf3L3**************************
+  [user_id] => 14648265
+  [screen_name] => jublonet
+  [httpstatus] => 200
+)
+```
+
+If you need to get more details, such as the user’s latest Tweet,
+you should fetch the complete User Entity.  The simplest way to get the
+user entity of the currently authenticated user is to use the
+```account/verify_credentials``` API method.  In Codebird, it works like this:
+
+```php
+$reply = $cb->account_verifyCredentials();
+print_r($reply);
+```
+
+I suggest to cache the User Entity after obtaining it, as the
+```account/verify_credentials``` method is rate-limited by 15 calls per 15 minutes.
+
+### …walk through cursored results?
+
+The Twitter REST API utilizes a technique called ‘cursoring’ to paginate
+large result sets. Cursoring separates results into pages of no more than
+5000 results at a time, and provides a means to move backwards and
+forwards through these pages.
+
+Here is how you can walk through cursored results with Codebird.
+
+1. Get the first result set of a cursored method:
+```php
+$result1 = $cb->followers_list();
+```
+
+2. To navigate forth, take the ```next_cursor_str```:
+```php
+$nextCursor = $result1->next_cursor_str;
+```
+
+3. If ```$nextCursor``` is not 0, use this cursor to request the next result page:
+```php
+  if ($nextCursor > 0) {
+    $result2 = $cb->followers_list('cursor=' . $nextCursor);
+  }
+```
+
+To navigate back instead of forth, use the field ```$resultX->previous_cursor_str```
+instead of ```next_cursor_str```.
+
+It might make sense to use the cursors in a loop.  Watch out, though,
+not to send more than the allowed number of requests to ```followers/list```
+per rate-limit timeframe, or else you will hit your rate-limit.
+
+### …use xAuth with Codebird?
+
+Codebird supports xAuth just like every other authentication used at Twitter.
+Remember that your application needs to be whitelisted to be able to use xAuth.
+
+Here’s an example:
+```php
+$reply = $cb->oauth_accessToken([
+  'x_auth_username' => 'username',
+  'x_auth_password' => '4h3_p4$$w0rd',
+  'x_auth_mode' => 'client_auth'
+]);
+```
+
+Are you getting a strange error message?  If the user is enrolled in
+login verification, the server will return a HTTP 401 error with a custom body.
+If you are using the ```send_error_codes``` parameter, you will receive the
+following error message in the response body:
+
+```xml
+<?xml version="1.0" encoding="UTF-8"?>
+<errors>
+<error code="231">User must verify login</error>
+</errors>
+```
+
+Otherwise, the response body will contain a plaintext response:
+```
+User must verify login
+```
+
+When this error occurs, advise the user to
+[generate a temporary password](https://twitter.com/settings/applications)
+on twitter.com and use that to complete signing in to the application.
+
+### …know what cacert.pem is for?
+
+Connections to the Twitter API are done over a secured SSL connection.
+Codebird-php checks if the Twitter API server has a valid SSL certificate.
+Valid certificates have a correct signature-chain.
+The cacert.pem file contains a list of all public certificates for root
+certificate authorities. You can find more information about this file
+at http://curl.haxx.se/docs/caextract.html.
+
+### …set the timeout for requests to the Twitter API?
+
+For connecting to Twitter, Codebird uses the cURL library, if available.
+You can specify both the connection timeout and the request timeout,
+in milliseconds:
+
+```php
+$cb->setConnectionTimeout(2000);
+$cb->setTimeout(5000);
+```
+
+If you don't specify the timeout, codebird uses these values:
+
+- connection time = 3000 ms = 3 s
+- timeout = 10000 ms = 10 s
+
+### …disable cURL?
+
+Codebird automatically detects whether you have the PHP cURL extension enabled.
+If not, the library will try to connect to Twitter via socket.
+For this to work, the PHP setting `allow_url_fopen` must be enabled.
+
+You may also manually disable cURL.  Use the following call:
+
+```php
+$cb->setUseCurl(false);
+```
+
+### …use a proxy?
+
+Codebird allows proxy support for both cURL handles and sockets.
+
+To activate proxy mode, use the following call:
+
+```php
+$cb->setProxy('<host>', '<port>');
+```
+
+You may also use an authenticated proxy. Use the following call:
+
+```php
+$cb->setProxy('<host>', '<port>');
+$cb->setProxyAuthentication('<username>:<password>');
+```
+
+By default, a HTTP proxy is assumed. To use a different proxy type,
+use the corresponding [`CURLPROXY_*` constants](http://php.net/curl_setopt), like this:
+
+```php
+$cb->setProxy('<host>', '<port>', CURLPROXY_SOCKS5);
+```
+
+### …quote a Tweet?
+
+Quoting a Tweet is different from a Retweet because you may add your own text.
+The original Tweet will appear below your quote.
+To quote a Tweet, add a link to the original Tweet to your quote, like in this sample:
+
+```php
+$original_tweet = [
+  'id_str' => '684483801687392256',
+  'user' => [
+    'screen_name' => 'LarryMcTweet'
+  ]
+];
+$original_tweet = (object) $original_tweet; // sample, get real Tweet from API
+
+$id = $original_tweet->id_str; // use the `id_str` field because of long numbers
+$screen_name = $original_tweet->user->screen_name;
+
+// looks like this: https://twitter.com/LarryMcTweet/status/684483801687392256
+$url = "https://twitter.com/$screen_name/status/$id";
+$text = 'I’d like to quote a Tweet.'; // maximum length = 140 minus 24 (link length) minus 1 space
+
+$reply = $cb->statuses_update([
+  'status' => "$text $url"
+]);
+```
diff --git a/twitter/vendor/jublonet/codebird-php/bower.json b/twitter/vendor/jublonet/codebird-php/bower.json
new file mode 100644
index 00000000..6c724a2a
--- /dev/null
+++ b/twitter/vendor/jublonet/codebird-php/bower.json
@@ -0,0 +1,25 @@
+{
+  "name": "codebird-php",
+  "version": "3.1.0",
+  "homepage": "https://www.jublo.net/projects/codebird/php",
+  "authors": [
+    "Joshua Atkins <joshua.atkins@jublo.net>",
+    "J.M. <jm@jublo.net>"
+  ],
+  "description": "Easy access to the Twitter REST, Direct Messages, Account Activity, TON (Object Nest) and Twitter Ads API — all from one PHP library.",
+  "main": "src/codebird.php",
+  "moduleType": [],
+  "keywords": [
+    "Twitter",
+    "API",
+    "networking"
+  ],
+  "license": "GPL-3.0+",
+  "ignore": [
+    "**/.*",
+    "node_modules",
+    "bower_components",
+    "test",
+    "tests"
+  ]
+}
diff --git a/twitter/vendor/jublonet/codebird-php/build.xml b/twitter/vendor/jublonet/codebird-php/build.xml
new file mode 100644
index 00000000..7addea7e
--- /dev/null
+++ b/twitter/vendor/jublonet/codebird-php/build.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project name="codebird-php" default="build" basedir=".">
+ <property name="source" value="src"/>
+ <property name="source_comma_sep" value="."/>
+ <property environment="env"/>
+ <property name="env.PHPUNIT_XML" value="phpunit.xml"/>
+ <property name="env.PHPUNIT_XML_HHVM" value="phpunit.xml.hhvm"/>
+ <property name="env.PHPUNIT_ARGS" value=""/>
+
+ <target name="clean" description="Clean up and create artifact directories">
+  <delete dir="${basedir}/build/api"/>
+  <delete dir="${basedir}/build/code-browser"/>
+  <delete dir="${basedir}/build/coverage"/>
+  <delete dir="${basedir}/build/logs"/>
+  <delete dir="${basedir}/build/pdepend"/>
+
+  <mkdir dir="${basedir}/build/api"/>
+  <mkdir dir="${basedir}/build/code-browser"/>
+  <mkdir dir="${basedir}/build/coverage"/>
+  <mkdir dir="${basedir}/build/logs"/>
+  <mkdir dir="${basedir}/build/pdepend"/>
+ </target>
+
+ <target name="phpunit" description="Run unit tests using PHPUnit and generates junit.xml and clover.xml">
+  <exec executable="${basedir}/vendor/bin/phpunit" failonerror="true">
+      <arg line="--configuration ${env.PHPUNIT_XML} ${env.PHPUNIT_ARGS}"/>
+  </exec>
+ </target>
+
+ <target name="phpunit-hhvm" description="Run unit tests using PHPUnit with HHVM specific config">
+  <exec executable="${basedir}/vendor/bin/phpunit" failonerror="true">
+      <arg line="--configuration ${env.PHPUNIT_XML_HHVM} ${env.PHPUNIT_ARGS}"/>
+  </exec>
+ </target>
+
+ <target name="pdepend" description="Generate jdepend.xml and software metrics charts using PHP_Depend">
+  <exec executable="pdepend">
+   <arg line="'--jdepend-xml=${basedir}/build/logs/jdepend.xml'
+              '--jdepend-chart=${basedir}/build/pdepend/dependencies.svg'
+              '--overview-pyramid=${basedir}/build/pdepend/overview-pyramid.svg'
+              ${source_comma_sep}" />
+  </exec>
+ </target>
+
+ <target name="phpmd" description="Generate pmd.xml using PHPMD">
+  <exec executable="phpmd">
+   <arg line="${source_comma_sep}
+              xml
+              codesize,design,naming,unusedcode
+              --exclude test,build,vendor
+              --reportfile '${basedir}/build/logs/pmd.xml'" />
+  </exec>
+ </target>
+
+ <target name="phpcpd" description="Generate pmd-cpd.xml using PHPCPD">
+  <exec executable="phpcpd">
+   <arg line="--log-pmd '${basedir}/build/logs/pmd-cpd.xml'
+              --exclude test
+              --exclude build
+              --exclude vendor
+              ${source}" />
+  </exec>
+ </target>
+
+ <target name="phploc" description="Generate phploc.csv">
+  <exec executable="phploc">
+   <arg line="--log-csv '${basedir}/build/logs/phploc.csv'
+              --exclude test
+              --exclude build
+              --exclude vendor
+              ${source}" />
+  </exec>
+ </target>
+
+ <target name="phpcs" description="Generate checkstyle.xml using PHP_CodeSniffer excluding third party libraries">
+  <exec executable="phpcs">
+   <arg line="
+              --ignore=*/vendor/*,*/build/*
+              --report=checkstyle
+              --extensions=php
+              --report-file='${basedir}/build/logs/checkstyle.xml'
+              --standard=PEAR
+              ${source}" />
+  </exec>
+ </target>
+
+ <target name="phpdoc" description="Generate API documentation using PHPDocumentor">
+  <exec executable="phpdoc">
+   <arg line="-d ${source} -t '${basedir}/build/api'" />
+  </exec>
+ </target>
+
+ <target name="phpcb" description="Aggregate tool output with PHP_CodeBrowser">
+  <exec executable="phpcb">
+   <arg line="--log    '${basedir}/build/logs'
+              --source '${source}'
+              --output '${basedir}/build/code-browser'" />
+  </exec>
+ </target>
+
+ <target name="lint" description="Perform syntax check of sourcecode files">
+  <apply executable="php" failonerror="true" output="${basedir}/build/logs/lint.log" logError="true">
+   <arg value="-l" />
+
+   <fileset dir="${basedir}">
+    <include name="src/**/*.php" />
+    <include name="test/**/*.php" />
+    <modified />
+   </fileset>
+  </apply>
+ </target>
+
+ <target name="build" depends="clean,phpunit,pdepend,phpmd,phpcpd,phpcs,phpdoc,phploc,phpcb,lint"/>
+</project>
diff --git a/twitter/vendor/jublonet/codebird-php/composer.json b/twitter/vendor/jublonet/codebird-php/composer.json
new file mode 100644
index 00000000..586f39c2
--- /dev/null
+++ b/twitter/vendor/jublonet/codebird-php/composer.json
@@ -0,0 +1,45 @@
+{
+    "name": "jublonet/codebird-php",
+    "description" : "Easy access to the Twitter REST API, Direct Messages API, Account Activity API, TON (Object Nest) API and Twitter Ads API — all from one PHP library.",
+    "keywords": [
+        "Twitter",
+        "API",
+        "networking"
+    ],
+    "homepage": "https://www.jublo.net/projects/codebird/php",
+    "license": "GPL-3.0+",
+    "authors": [
+        {
+            "name": "Joshua Atkins",
+            "email": "joshua.atkins@jublo.net",
+            "homepage": "http://atkins.im/",
+            "role": "Developer"
+        },
+        {
+            "name": "J.M.",
+            "email": "jm@jublo.net",
+            "homepage": "http://mynetx.net/",
+            "role": "Developer"
+        }
+    ],
+    "support": {
+        "email": "support@jublo.net",
+        "issues": "https://github.com/jublonet/codebird-php/issues",
+        "source": "https://github.com/jublonet/codebird-php/releases"
+    },
+    "require": {
+        "php": ">=5.5.0",
+        "ext-hash": "*",
+        "ext-json": "*",
+        "lib-openssl": "*",
+        "composer/installers": "~1.0"
+    },
+    "autoload": {
+        "classmap": ["src/"]
+    },
+    "require-dev": {
+        "php-coveralls/php-coveralls": ">=0.6",
+        "phpunit/phpunit": ">=7.3",
+        "squizlabs/php_codesniffer": "2.*"
+    }
+}
diff --git a/twitter/vendor/jublonet/codebird-php/phpunit.xml b/twitter/vendor/jublonet/codebird-php/phpunit.xml
new file mode 100644
index 00000000..cd28e1c9
--- /dev/null
+++ b/twitter/vendor/jublonet/codebird-php/phpunit.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit backupGlobals="true"
+         backupStaticAttributes="false"
+         colors="true"
+         verbose="true">
+
+    <testsuites>
+        <testsuite name="Environment">
+            <file>test/environment_test.php</file>
+        </testsuite>
+        <testsuite name="Unit">
+            <directory suffix="_tests.php">test</directory>
+        </testsuite>
+    </testsuites>
+
+    <logging>
+        <log type="coverage-clover" target="build/logs/clover.xml"/>
+        <log type="junit" target="build/logs/junit.xml" logIncompleteSkipped="false"/>
+    </logging>
+
+    <filter>
+        <whitelist addUncoveredFilesFromWhitelist="true">
+            <directory suffix=".php">src</directory>
+        </whitelist>
+    </filter>
+</phpunit>
diff --git a/twitter/vendor/jublonet/codebird-php/phpunit.xml.hhvm b/twitter/vendor/jublonet/codebird-php/phpunit.xml.hhvm
new file mode 100644
index 00000000..87e7409c
--- /dev/null
+++ b/twitter/vendor/jublonet/codebird-php/phpunit.xml.hhvm
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit backupGlobals="true"
+         backupStaticAttributes="false"
+         strict="true"
+         timeoutForSmallTests="10"
+         timeoutForMediumTests="30"
+         colors="true"
+         verbose="true">
+
+    <testsuites>
+        <testsuite name="Environment">
+            <file>test/environment_test.php</file>
+        </testsuite>
+        <testsuite name="Unit">
+            <directory suffix="_tests.php">test</directory>
+        </testsuite>
+    </testsuites>
+
+    <logging>
+        <log type="junit" target="build/logs/junit.xml" logIncompleteSkipped="false"/>
+    </logging>
+</phpunit>
diff --git a/twitter/vendor/jublonet/codebird-php/src/cacert.pem b/twitter/vendor/jublonet/codebird-php/src/cacert.pem
new file mode 100644
index 00000000..ee25bee1
--- /dev/null
+++ b/twitter/vendor/jublonet/codebird-php/src/cacert.pem
@@ -0,0 +1,3314 @@
+##
+## Bundle of CA Root Certificates
+##
+## Certificate data from Mozilla as of: Wed Jun 20 03:12:06 2018 GMT
+##
+## This is a bundle of X.509 certificates of public Certificate Authorities
+## (CA). These were automatically extracted from Mozilla's root certificates
+## file (certdata.txt).  This file can be found in the mozilla source tree:
+## https://hg.mozilla.org/releases/mozilla-release/raw-file/default/security/nss/lib/ckfw/builtins/certdata.txt
+##
+## It contains the certificates in PEM format and therefore
+## can be directly used with curl / libcurl / php_curl, or with
+## an Apache+mod_ssl webserver for SSL client authentication.
+## Just configure this file as the SSLCACertificateFile.
+##
+## Conversion done with mk-ca-bundle.pl version 1.27.
+## SHA256: c80f571d9f4ebca4a91e0ad3a546f263153d71afffc845c6f8f52ce9d1a2e8ec
+##
+
+
+GlobalSign Root CA
+==================
+-----BEGIN CERTIFICATE-----
+MIIDdTCCAl2gAwIBAgILBAAAAAABFUtaw5QwDQYJKoZIhvcNAQEFBQAwVzELMAkGA1UEBhMCQkUx
+GTAXBgNVBAoTEEdsb2JhbFNpZ24gbnYtc2ExEDAOBgNVBAsTB1Jvb3QgQ0ExGzAZBgNVBAMTEkds
+b2JhbFNpZ24gUm9vdCBDQTAeFw05ODA5MDExMjAwMDBaFw0yODAxMjgxMjAwMDBaMFcxCzAJBgNV
+BAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMRAwDgYDVQQLEwdSb290IENBMRswGQYD
+VQQDExJHbG9iYWxTaWduIFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDa
+DuaZjc6j40+Kfvvxi4Mla+pIH/EqsLmVEQS98GPR4mdmzxzdzxtIK+6NiY6arymAZavpxy0Sy6sc
+THAHoT0KMM0VjU/43dSMUBUc71DuxC73/OlS8pF94G3VNTCOXkNz8kHp1Wrjsok6Vjk4bwY8iGlb
+Kk3Fp1S4bInMm/k8yuX9ifUSPJJ4ltbcdG6TRGHRjcdGsnUOhugZitVtbNV4FpWi6cgKOOvyJBNP
+c1STE4U6G7weNLWLBYy5d4ux2x8gkasJU26Qzns3dLlwR5EiUWMWea6xrkEmCMgZK9FGqkjWZCrX
+gzT/LCrBbBlDSgeF59N89iFo7+ryUp9/k5DPAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNV
+HRMBAf8EBTADAQH/MB0GA1UdDgQWBBRge2YaRQ2XyolQL30EzTSo//z9SzANBgkqhkiG9w0BAQUF
+AAOCAQEA1nPnfE920I2/7LqivjTFKDK1fPxsnCwrvQmeU79rXqoRSLblCKOzyj1hTdNGCbM+w6Dj
+Y1Ub8rrvrTnhQ7k4o+YviiY776BQVvnGCv04zcQLcFGUl5gE38NflNUVyRRBnMRddWQVDf9VMOyG
+j/8N7yy5Y0b2qvzfvGn9LhJIZJrglfCm7ymPAbEVtQwdpf5pLGkkeB6zpxxxYu7KyJesF12KwvhH
+hm4qxFYxldBniYUr+WymXUadDKqC5JlR3XC321Y9YeRq4VzW9v493kHMB65jUr9TU/Qr6cf9tveC
+X4XSQRjbgbMEHMUfpIBvFSDJ3gyICh3WZlXi/EjJKSZp4A==
+-----END CERTIFICATE-----
+
+GlobalSign Root CA - R2
+=======================
+-----BEGIN CERTIFICATE-----
+MIIDujCCAqKgAwIBAgILBAAAAAABD4Ym5g0wDQYJKoZIhvcNAQEFBQAwTDEgMB4GA1UECxMXR2xv
+YmFsU2lnbiBSb290IENBIC0gUjIxEzARBgNVBAoTCkdsb2JhbFNpZ24xEzARBgNVBAMTCkdsb2Jh
+bFNpZ24wHhcNMDYxMjE1MDgwMDAwWhcNMjExMjE1MDgwMDAwWjBMMSAwHgYDVQQLExdHbG9iYWxT
+aWduIFJvb3QgQ0EgLSBSMjETMBEGA1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFsU2ln
+bjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKbPJA6+Lm8omUVCxKs+IVSbC9N/hHD6
+ErPLv4dfxn+G07IwXNb9rfF73OX4YJYJkhD10FPe+3t+c4isUoh7SqbKSaZeqKeMWhG8eoLrvozp
+s6yWJQeXSpkqBy+0Hne/ig+1AnwblrjFuTosvNYSuetZfeLQBoZfXklqtTleiDTsvHgMCJiEbKjN
+S7SgfQx5TfC4LcshytVsW33hoCmEofnTlEnLJGKRILzdC9XZzPnqJworc5HGnRusyMvo4KD0L5CL
+TfuwNhv2GXqF4G3yYROIXJ/gkwpRl4pazq+r1feqCapgvdzZX99yqWATXgAByUr6P6TqBwMhAo6C
+ygPCm48CAwEAAaOBnDCBmTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4E
+FgQUm+IHV2ccHsBqBt5ZtJot39wZhi4wNgYDVR0fBC8wLTAroCmgJ4YlaHR0cDovL2NybC5nbG9i
+YWxzaWduLm5ldC9yb290LXIyLmNybDAfBgNVHSMEGDAWgBSb4gdXZxwewGoG3lm0mi3f3BmGLjAN
+BgkqhkiG9w0BAQUFAAOCAQEAmYFThxxol4aR7OBKuEQLq4GsJ0/WwbgcQ3izDJr86iw8bmEbTUsp
+9Z8FHSbBuOmDAGJFtqkIk7mpM0sYmsL4h4hO291xNBrBVNpGP+DTKqttVCL1OmLNIG+6KYnX3ZHu
+01yiPqFbQfXf5WRDLenVOavSot+3i9DAgBkcRcAtjOj4LaR0VknFBbVPFd5uRHg5h6h+u/N5GJG7
+9G+dwfCMNYxdAfvDbbnvRG15RjF+Cv6pgsH/76tuIMRQyV+dTZsXjAzlAcmgQWpzU/qlULRuJQ/7
+TBj0/VLZjmmx6BEP3ojY+x1J96relc8geMJgEtslQIxq/H5COEBkEveegeGTLg==
+-----END CERTIFICATE-----
+
+Verisign Class 3 Public Primary Certification Authority - G3
+============================================================
+-----BEGIN CERTIFICATE-----
+MIIEGjCCAwICEQCbfgZJoz5iudXukEhxKe9XMA0GCSqGSIb3DQEBBQUAMIHKMQswCQYDVQQGEwJV
+UzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRydXN0IE5ldHdv
+cmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNl
+IG9ubHkxRTBDBgNVBAMTPFZlcmlTaWduIENsYXNzIDMgUHVibGljIFByaW1hcnkgQ2VydGlmaWNh
+dGlvbiBBdXRob3JpdHkgLSBHMzAeFw05OTEwMDEwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMIHKMQsw
+CQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRy
+dXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJbmMuIC0gRm9yIGF1dGhv
+cml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlTaWduIENsYXNzIDMgUHVibGljIFByaW1hcnkg
+Q2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBAMu6nFL8eB8aHm8bN3O9+MlrlBIwT/A2R/XQkQr1F8ilYcEWQE37imGQ5XYgwREGfassbqb1
+EUGO+i2tKmFZpGcmTNDovFJbcCAEWNF6yaRpvIMXZK0Fi7zQWM6NjPXr8EJJC52XJ2cybuGukxUc
+cLwgTS8Y3pKI6GyFVxEa6X7jJhFUokWWVYPKMIno3Nij7SqAP395ZVc+FSBmCC+Vk7+qRy+oRpfw
+EuL+wgorUeZ25rdGt+INpsyow0xZVYnm6FNcHOqd8GIWC6fJXwzw3sJ2zq/3avL6QaaiMxTJ5Xpj
+055iN9WFZZ4O5lMkdBteHRJTW8cs54NJOxWuimi5V5cCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
+ERSWwauSCPc/L8my/uRan2Te2yFPhpk0djZX3dAVL8WtfxUfN2JzPtTnX84XA9s1+ivbrmAJXx5f
+j267Cz3qWhMeDGBvtcC1IyIuBwvLqXTLR7sdwdela8wv0kL9Sd2nic9TutoAWii/gt/4uhMdUIaC
+/Y4wjylGsB49Ndo4YhYYSq3mtlFs3q9i6wHQHiT+eo8SGhJouPtmmRQURVyu565pF4ErWjfJXir0
+xuKhXFSbplQAz/DxwceYMBo7Nhbbo27q/a2ywtrvAkcTisDxszGtTxzhT5yvDwyd93gN2PQ1VoDa
+t20Xj50egWTh/sVFuq1ruQp6Tk9LhO5L8X3dEQ==
+-----END CERTIFICATE-----
+
+Entrust.net Premium 2048 Secure Server CA
+=========================================
+-----BEGIN CERTIFICATE-----
+MIIEKjCCAxKgAwIBAgIEOGPe+DANBgkqhkiG9w0BAQUFADCBtDEUMBIGA1UEChMLRW50cnVzdC5u
+ZXQxQDA+BgNVBAsUN3d3dy5lbnRydXN0Lm5ldC9DUFNfMjA0OCBpbmNvcnAuIGJ5IHJlZi4gKGxp
+bWl0cyBsaWFiLikxJTAjBgNVBAsTHChjKSAxOTk5IEVudHJ1c3QubmV0IExpbWl0ZWQxMzAxBgNV
+BAMTKkVudHJ1c3QubmV0IENlcnRpZmljYXRpb24gQXV0aG9yaXR5ICgyMDQ4KTAeFw05OTEyMjQx
+NzUwNTFaFw0yOTA3MjQxNDE1MTJaMIG0MRQwEgYDVQQKEwtFbnRydXN0Lm5ldDFAMD4GA1UECxQ3
+d3d3LmVudHJ1c3QubmV0L0NQU18yMDQ4IGluY29ycC4gYnkgcmVmLiAobGltaXRzIGxpYWIuKTEl
+MCMGA1UECxMcKGMpIDE5OTkgRW50cnVzdC5uZXQgTGltaXRlZDEzMDEGA1UEAxMqRW50cnVzdC5u
+ZXQgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgKDIwNDgpMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEArU1LqRKGsuqjIAcVFmQqK0vRvwtKTY7tgHalZ7d4QMBzQshowNtTK91euHaYNZOL
+Gp18EzoOH1u3Hs/lJBQesYGpjX24zGtLA/ECDNyrpUAkAH90lKGdCCmziAv1h3edVc3kw37XamSr
+hRSGlVuXMlBvPci6Zgzj/L24ScF2iUkZ/cCovYmjZy/Gn7xxGWC4LeksyZB2ZnuU4q941mVTXTzW
+nLLPKQP5L6RQstRIzgUyVYr9smRMDuSYB3Xbf9+5CFVghTAp+XtIpGmG4zU/HoZdenoVve8AjhUi
+VBcAkCaTvA5JaJG/+EfTnZVCwQ5N328mz8MYIWJmQ3DW1cAH4QIDAQABo0IwQDAOBgNVHQ8BAf8E
+BAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUVeSB0RGAvtiJuQijMfmhJAkWuXAwDQYJ
+KoZIhvcNAQEFBQADggEBADubj1abMOdTmXx6eadNl9cZlZD7Bh/KM3xGY4+WZiT6QBshJ8rmcnPy
+T/4xmf3IDExoU8aAghOY+rat2l098c5u9hURlIIM7j+VrxGrD9cv3h8Dj1csHsm7mhpElesYT6Yf
+zX1XEC+bBAlahLVu2B064dae0Wx5XnkcFMXj0EyTO2U87d89vqbllRrDtRnDvV5bu/8j72gZyxKT
+J1wDLW8w0B62GqzeWvfRqqgnpv55gcR5mTNXuhKwqeBCbJPKVt7+bYQLCIt+jerXmCHG8+c8eS9e
+nNFMFY3h7CI3zJpDC5fcgJCNs2ebb0gIFVbPv/ErfF6adulZkMV8gzURZVE=
+-----END CERTIFICATE-----
+
+Baltimore CyberTrust Root
+=========================
+-----BEGIN CERTIFICATE-----
+MIIDdzCCAl+gAwIBAgIEAgAAuTANBgkqhkiG9w0BAQUFADBaMQswCQYDVQQGEwJJRTESMBAGA1UE
+ChMJQmFsdGltb3JlMRMwEQYDVQQLEwpDeWJlclRydXN0MSIwIAYDVQQDExlCYWx0aW1vcmUgQ3li
+ZXJUcnVzdCBSb290MB4XDTAwMDUxMjE4NDYwMFoXDTI1MDUxMjIzNTkwMFowWjELMAkGA1UEBhMC
+SUUxEjAQBgNVBAoTCUJhbHRpbW9yZTETMBEGA1UECxMKQ3liZXJUcnVzdDEiMCAGA1UEAxMZQmFs
+dGltb3JlIEN5YmVyVHJ1c3QgUm9vdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKME
+uyKrmD1X6CZymrV51Cni4eiVgLGw41uOKymaZN+hXe2wCQVt2yguzmKiYv60iNoS6zjrIZ3AQSsB
+UnuId9Mcj8e6uYi1agnnc+gRQKfRzMpijS3ljwumUNKoUMMo6vWrJYeKmpYcqWe4PwzV9/lSEy/C
+G9VwcPCPwBLKBsua4dnKM3p31vjsufFoREJIE9LAwqSuXmD+tqYF/LTdB1kC1FkYmGP1pWPgkAx9
+XbIGevOF6uvUA65ehD5f/xXtabz5OTZydc93Uk3zyZAsuT3lySNTPx8kmCFcB5kpvcY67Oduhjpr
+l3RjM71oGDHweI12v/yejl0qhqdNkNwnGjkCAwEAAaNFMEMwHQYDVR0OBBYEFOWdWTCCR1jMrPoI
+VDaGezq1BE3wMBIGA1UdEwEB/wQIMAYBAf8CAQMwDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEB
+BQUAA4IBAQCFDF2O5G9RaEIFoN27TyclhAO992T9Ldcw46QQF+vaKSm2eT929hkTI7gQCvlYpNRh
+cL0EYWoSihfVCr3FvDB81ukMJY2GQE/szKN+OMY3EU/t3WgxjkzSswF07r51XgdIGn9w/xZchMB5
+hbgF/X++ZRGjD8ACtPhSNzkE1akxehi/oCr0Epn3o0WC4zxe9Z2etciefC7IpJ5OCBRLbf1wbWsa
+Y71k5h+3zvDyny67G7fyUIhzksLi4xaNmjICq44Y3ekQEe5+NauQrz4wlHrQMz2nZQ/1/I6eYs9H
+RCwBXbsdtTLSR9I4LtD+gdwyah617jzV/OeBHRnDJELqYzmp
+-----END CERTIFICATE-----
+
+AddTrust External Root
+======================
+-----BEGIN CERTIFICATE-----
+MIIENjCCAx6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBvMQswCQYDVQQGEwJTRTEUMBIGA1UEChML
+QWRkVHJ1c3QgQUIxJjAkBgNVBAsTHUFkZFRydXN0IEV4dGVybmFsIFRUUCBOZXR3b3JrMSIwIAYD
+VQQDExlBZGRUcnVzdCBFeHRlcm5hbCBDQSBSb290MB4XDTAwMDUzMDEwNDgzOFoXDTIwMDUzMDEw
+NDgzOFowbzELMAkGA1UEBhMCU0UxFDASBgNVBAoTC0FkZFRydXN0IEFCMSYwJAYDVQQLEx1BZGRU
+cnVzdCBFeHRlcm5hbCBUVFAgTmV0d29yazEiMCAGA1UEAxMZQWRkVHJ1c3QgRXh0ZXJuYWwgQ0Eg
+Um9vdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALf3GjPm8gAELTngTlvtH7xsD821
++iO2zt6bETOXpClMfZOfvUq8k+0DGuOPz+VtUFrWlymUWoCwSXrbLpX9uMq/NzgtHj6RQa1wVsfw
+Tz/oMp50ysiQVOnGXw94nZpAPA6sYapeFI+eh6FqUNzXmk6vBbOmcZSccbNQYArHE504B4YCqOmo
+aSYYkKtMsE8jqzpPhNjfzp/haW+710LXa0Tkx63ubUFfclpxCDezeWWkWaCUN/cALw3CknLa0Dhy
+2xSoRcRdKn23tNbE7qzNE0S3ySvdQwAl+mG5aWpYIxG3pzOPVnVZ9c0p10a3CitlttNCbxWyuHv7
+7+ldU9U0WicCAwEAAaOB3DCB2TAdBgNVHQ4EFgQUrb2YejS0Jvf6xCZU7wO94CTLVBowCwYDVR0P
+BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wgZkGA1UdIwSBkTCBjoAUrb2YejS0Jvf6xCZU7wO94CTL
+VBqhc6RxMG8xCzAJBgNVBAYTAlNFMRQwEgYDVQQKEwtBZGRUcnVzdCBBQjEmMCQGA1UECxMdQWRk
+VHJ1c3QgRXh0ZXJuYWwgVFRQIE5ldHdvcmsxIjAgBgNVBAMTGUFkZFRydXN0IEV4dGVybmFsIENB
+IFJvb3SCAQEwDQYJKoZIhvcNAQEFBQADggEBALCb4IUlwtYj4g+WBpKdQZic2YR5gdkeWxQHIzZl
+j7DYd7usQWxHYINRsPkyPef89iYTx4AWpb9a/IfPeHmJIZriTAcKhjW88t5RxNKWt9x+Tu5w/Rw5
+6wwCURQtjr0W4MHfRnXnJK3s9EK0hZNwEGe6nQY1ShjTK3rMUUKhemPR5ruhxSvCNr4TDea9Y355
+e6cJDUCrat2PisP29owaQgVR1EX1n6diIWgVIEM8med8vSTYqZEXc4g/VhsxOBi0cQ+azcgOno4u
+G+GMmIPLHzHxREzGBHNJdmAPx/i9F4BrLunMTA5amnkPIAou1Z5jJh5VkpTYghdae9C8x49OhgQ=
+-----END CERTIFICATE-----
+
+Entrust Root Certification Authority
+====================================
+-----BEGIN CERTIFICATE-----
+MIIEkTCCA3mgAwIBAgIERWtQVDANBgkqhkiG9w0BAQUFADCBsDELMAkGA1UEBhMCVVMxFjAUBgNV
+BAoTDUVudHJ1c3QsIEluYy4xOTA3BgNVBAsTMHd3dy5lbnRydXN0Lm5ldC9DUFMgaXMgaW5jb3Jw
+b3JhdGVkIGJ5IHJlZmVyZW5jZTEfMB0GA1UECxMWKGMpIDIwMDYgRW50cnVzdCwgSW5jLjEtMCsG
+A1UEAxMkRW50cnVzdCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTA2MTEyNzIwMjM0
+MloXDTI2MTEyNzIwNTM0MlowgbAxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1FbnRydXN0LCBJbmMu
+MTkwNwYDVQQLEzB3d3cuZW50cnVzdC5uZXQvQ1BTIGlzIGluY29ycG9yYXRlZCBieSByZWZlcmVu
+Y2UxHzAdBgNVBAsTFihjKSAyMDA2IEVudHJ1c3QsIEluYy4xLTArBgNVBAMTJEVudHJ1c3QgUm9v
+dCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+ALaVtkNC+sZtKm9I35RMOVcF7sN5EUFoNu3s/poBj6E4KPz3EEZmLk0eGrEaTsbRwJWIsMn/MYsz
+A9u3g3s+IIRe7bJWKKf44LlAcTfFy0cOlypowCKVYhXbR9n10Cv/gkvJrT7eTNuQgFA/CYqEAOww
+Cj0Yzfv9KlmaI5UXLEWeH25DeW0MXJj+SKfFI0dcXv1u5x609mhF0YaDW6KKjbHjKYD+JXGIrb68
+j6xSlkuqUY3kEzEZ6E5Nn9uss2rVvDlUccp6en+Q3X0dgNmBu1kmwhH+5pPi94DkZfs0Nw4pgHBN
+rziGLp5/V6+eF67rHMsoIV+2HNjnogQi+dPa2MsCAwEAAaOBsDCBrTAOBgNVHQ8BAf8EBAMCAQYw
+DwYDVR0TAQH/BAUwAwEB/zArBgNVHRAEJDAigA8yMDA2MTEyNzIwMjM0MlqBDzIwMjYxMTI3MjA1
+MzQyWjAfBgNVHSMEGDAWgBRokORnpKZTgMeGZqTx90tD+4S9bTAdBgNVHQ4EFgQUaJDkZ6SmU4DH
+hmak8fdLQ/uEvW0wHQYJKoZIhvZ9B0EABBAwDhsIVjcuMTo0LjADAgSQMA0GCSqGSIb3DQEBBQUA
+A4IBAQCT1DCw1wMgKtD5Y+iRDAUgqV8ZyntyTtSx29CW+1RaGSwMCPeyvIWonX9tO1KzKtvn1ISM
+Y/YPyyYBkVBs9F8U4pN0wBOeMDpQ47RgxRzwIkSNcUesyBrJ6ZuaAGAT/3B+XxFNSRuzFVJ7yVTa
+v52Vr2ua2J7p8eRDjeIRRDq/r72DQnNSi6q7pynP9WQcCk3RvKqsnyrQ/39/2n3qse0wJcGE2jTS
+W3iDVuycNsMm4hH2Z0kdkquM++v/eu6FSqdQgPCnXEqULl8FmTxSQeDNtGPPAUO6nIPcj2A781q0
+tHuu2guQOHXvgR1m0vdXcDazv/wor3ElhVsT/h5/WrQ8
+-----END CERTIFICATE-----
+
+GeoTrust Global CA
+==================
+-----BEGIN CERTIFICATE-----
+MIIDVDCCAjygAwIBAgIDAjRWMA0GCSqGSIb3DQEBBQUAMEIxCzAJBgNVBAYTAlVTMRYwFAYDVQQK
+Ew1HZW9UcnVzdCBJbmMuMRswGQYDVQQDExJHZW9UcnVzdCBHbG9iYWwgQ0EwHhcNMDIwNTIxMDQw
+MDAwWhcNMjIwNTIxMDQwMDAwWjBCMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5j
+LjEbMBkGA1UEAxMSR2VvVHJ1c3QgR2xvYmFsIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEA2swYYzD99BcjGlZ+W988bDjkcbd4kdS8odhM+KhDtgPpTSEHCIjaWC9mOSm9BXiLnTjo
+BbdqfnGk5sRgprDvgOSJKA+eJdbtg/OtppHHmMlCGDUUna2YRpIuT8rxh0PBFpVXLVDviS2Aelet
+8u5fa9IAjbkU+BQVNdnARqN7csiRv8lVK83Qlz6cJmTM386DGXHKTubU1XupGc1V3sjs0l44U+Vc
+T4wt/lAjNvxm5suOpDkZALeVAjmRCw7+OC7RHQWa9k0+bw8HHa8sHo9gOeL6NlMTOdReJivbPagU
+vTLrGAMoUgRx5aszPeE4uwc2hGKceeoWMPRfwCvocWvk+QIDAQABo1MwUTAPBgNVHRMBAf8EBTAD
+AQH/MB0GA1UdDgQWBBTAephojYn7qwVkDBF9qn1luMrMTjAfBgNVHSMEGDAWgBTAephojYn7qwVk
+DBF9qn1luMrMTjANBgkqhkiG9w0BAQUFAAOCAQEANeMpauUvXVSOKVCUn5kaFOSPeCpilKInZ57Q
+zxpeR+nBsqTP3UEaBU6bS+5Kb1VSsyShNwrrZHYqLizz/Tt1kL/6cdjHPTfStQWVYrmm3ok9Nns4
+d0iXrKYgjy6myQzCsplFAMfOEVEiIuCl6rYVSAlk6l5PdPcFPseKUgzbFbS9bZvlxrFUaKnjaZC2
+mqUPuLk/IH2uSrW4nOQdtqvmlKXBx4Ot2/Unhw4EbNX/3aBd7YdStysVAq45pmp06drE57xNNB6p
+XE0zX5IJL4hmXXeXxx12E6nV5fEWCRE11azbJHFwLJhWC9kXtNHjUStedejV0NxPNO3CBWaAocvm
+Mw==
+-----END CERTIFICATE-----
+
+GeoTrust Universal CA
+=====================
+-----BEGIN CERTIFICATE-----
+MIIFaDCCA1CgAwIBAgIBATANBgkqhkiG9w0BAQUFADBFMQswCQYDVQQGEwJVUzEWMBQGA1UEChMN
+R2VvVHJ1c3QgSW5jLjEeMBwGA1UEAxMVR2VvVHJ1c3QgVW5pdmVyc2FsIENBMB4XDTA0MDMwNDA1
+MDAwMFoXDTI5MDMwNDA1MDAwMFowRTELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUdlb1RydXN0IElu
+Yy4xHjAcBgNVBAMTFUdlb1RydXN0IFVuaXZlcnNhbCBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIP
+ADCCAgoCggIBAKYVVaCjxuAfjJ0hUNfBvitbtaSeodlyWL0AG0y/YckUHUWCq8YdgNY96xCcOq9t
+JPi8cQGeBvV8Xx7BDlXKg5pZMK4ZyzBIle0iN430SppyZj6tlcDgFgDgEB8rMQ7XlFTTQjOgNB0e
+RXbdT8oYN+yFFXoZCPzVx5zw8qkuEKmS5j1YPakWaDwvdSEYfyh3peFhF7em6fgemdtzbvQKoiFs
+7tqqhZJmr/Z6a4LauiIINQ/PQvE1+mrufislzDoR5G2vc7J2Ha3QsnhnGqQ5HFELZ1aD/ThdDc7d
+8Lsrlh/eezJS/R27tQahsiFepdaVaH/wmZ7cRQg+59IJDTWU3YBOU5fXtQlEIGQWFwMCTFMNaN7V
+qnJNk22CDtucvc+081xdVHppCZbW2xHBjXWotM85yM48vCR85mLK4b19p71XZQvk/iXttmkQ3Cga
+Rr0BHdCXteGYO8A3ZNY9lO4L4fUorgtWv3GLIylBjobFS1J72HGrH4oVpjuDWtdYAVHGTEHZf9hB
+Z3KiKN9gg6meyHv8U3NyWfWTehd2Ds735VzZC1U0oqpbtWpU5xPKV+yXbfReBi9Fi1jUIxaS5BZu
+KGNZMN9QAZxjiRqf2xeUgnA3wySemkfWWspOqGmJch+RbNt+nhutxx9z3SxPGWX9f5NAEC7S8O08
+ni4oPmkmM8V7AgMBAAGjYzBhMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFNq7LqqwDLiIJlF0
+XG0D08DYj3rWMB8GA1UdIwQYMBaAFNq7LqqwDLiIJlF0XG0D08DYj3rWMA4GA1UdDwEB/wQEAwIB
+hjANBgkqhkiG9w0BAQUFAAOCAgEAMXjmx7XfuJRAyXHEqDXsRh3ChfMoWIawC/yOsjmPRFWrZIRc
+aanQmjg8+uUfNeVE44B5lGiku8SfPeE0zTBGi1QrlaXv9z+ZhP015s8xxtxqv6fXIwjhmF7DWgh2
+qaavdy+3YL1ERmrvl/9zlcGO6JP7/TG37FcREUWbMPEaiDnBTzynANXH/KttgCJwpQzgXQQpAvvL
+oJHRfNbDflDVnVi+QTjruXU8FdmbyUqDWcDaU/0zuzYYm4UPFd3uLax2k7nZAY1IEKj79TiG8dsK
+xr2EoyNB3tZ3b4XUhRxQ4K5RirqNPnbiucon8l+f725ZDQbYKxek0nxru18UGkiPGkzns0ccjkxF
+KyDuSN/n3QmOGKjaQI2SJhFTYXNd673nxE0pN2HrrDktZy4W1vUAg4WhzH92xH3kt0tm7wNFYGm2
+DFKWkoRepqO1pD4r2czYG0eq8kTaT/kD6PAUyz/zg97QwVTjt+gKN02LIFkDMBmhLMi9ER/frslK
+xfMnZmaGrGiR/9nmUxwPi1xpZQomyB40w11Re9epnAahNt3ViZS82eQtDF4JbAiXfKM9fJP/P6EU
+p8+1Xevb2xzEdt+Iub1FBZUbrvxGakyvSOPOrg/SfuvmbJxPgWp6ZKy7PtXny3YuxadIwVyQD8vI
+P/rmMuGNG2+k5o7Y+SlIis5z/iw=
+-----END CERTIFICATE-----
+
+GeoTrust Universal CA 2
+=======================
+-----BEGIN CERTIFICATE-----
+MIIFbDCCA1SgAwIBAgIBATANBgkqhkiG9w0BAQUFADBHMQswCQYDVQQGEwJVUzEWMBQGA1UEChMN
+R2VvVHJ1c3QgSW5jLjEgMB4GA1UEAxMXR2VvVHJ1c3QgVW5pdmVyc2FsIENBIDIwHhcNMDQwMzA0
+MDUwMDAwWhcNMjkwMzA0MDUwMDAwWjBHMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3Qg
+SW5jLjEgMB4GA1UEAxMXR2VvVHJ1c3QgVW5pdmVyc2FsIENBIDIwggIiMA0GCSqGSIb3DQEBAQUA
+A4ICDwAwggIKAoICAQCzVFLByT7y2dyxUxpZKeexw0Uo5dfR7cXFS6GqdHtXr0om/Nj1XqduGdt0
+DE81WzILAePb63p3NeqqWuDW6KFXlPCQo3RWlEQwAx5cTiuFJnSCegx2oG9NzkEtoBUGFF+3Qs17
+j1hhNNwqCPkuwwGmIkQcTAeC5lvO0Ep8BNMZcyfwqph/Lq9O64ceJHdqXbboW0W63MOhBW9Wjo8Q
+JqVJwy7XQYci4E+GymC16qFjwAGXEHm9ADwSbSsVsaxLse4YuU6W3Nx2/zu+z18DwPw76L5GG//a
+QMJS9/7jOvdqdzXQ2o3rXhhqMcceujwbKNZrVMaqW9eiLBsZzKIC9ptZvTdrhrVtgrrY6slWvKk2
+WP0+GfPtDCapkzj4T8FdIgbQl+rhrcZV4IErKIM6+vR7IVEAvlI4zs1meaj0gVbi0IMJR1FbUGrP
+20gaXT73y/Zl92zxlfgCOzJWgjl6W70viRu/obTo/3+NjN8D8WBOWBFM66M/ECuDmgFz2ZRthAAn
+ZqzwcEAJQpKtT5MNYQlRJNiS1QuUYbKHsu3/mjX/hVTK7URDrBs8FmtISgocQIgfksILAAX/8sgC
+SqSqqcyZlpwvWOB94b67B9xfBHJcMTTD7F8t4D1kkCLm0ey4Lt1ZrtmhN79UNdxzMk+MBB4zsslG
+8dhcyFVQyWi9qLo2CQIDAQABo2MwYTAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBR281Xh+qQ2
++/CfXGJx7Tz0RzgQKzAfBgNVHSMEGDAWgBR281Xh+qQ2+/CfXGJx7Tz0RzgQKzAOBgNVHQ8BAf8E
+BAMCAYYwDQYJKoZIhvcNAQEFBQADggIBAGbBxiPz2eAubl/oz66wsCVNK/g7WJtAJDday6sWSf+z
+dXkzoS9tcBc0kf5nfo/sm+VegqlVHy/c1FEHEv6sFj4sNcZj/NwQ6w2jqtB8zNHQL1EuxBRa3ugZ
+4T7GzKQp5y6EqgYweHZUcyiYWTjgAA1i00J9IZ+uPTqM1fp3DRgrFg5fNuH8KrUwJM/gYwx7WBr+
+mbpCErGR9Hxo4sjoryzqyX6uuyo9DRXcNJW2GHSoag/HtPQTxORb7QrSpJdMKu0vbBKJPfEncKpq
+A1Ihn0CoZ1Dy81of398j9tx4TuaYT1U6U+Pv8vSfx3zYWK8pIpe44L2RLrB27FcRz+8pRPPphXpg
+Y+RdM4kX2TGq2tbzGDVyz4crL2MjhF2EjD9XoIj8mZEoJmmZ1I+XRL6O1UixpCgp8RW04eWe3fiP
+pm8m1wk8OhwRDqZsN/etRIcsKMfYdIKz0G9KV7s1KSegi+ghp4dkNl3M2Basx7InQJJVOCiNUW7d
+FGdTbHFcJoRNdVq2fmBWqU2t+5sel/MN2dKXVHfaPRK34B7vCAas+YWH6aLcr34YEoP9VhdBLtUp
+gn2Z9DH2canPLAEnpQW5qrJITirvn5NSUZU8UnOOVkwXQMAJKOSLakhT2+zNVVXxxvjpoixMptEm
+X36vWkzaH6byHCx+rgIW0lbQL1dTR+iS
+-----END CERTIFICATE-----
+
+Visa eCommerce Root
+===================
+-----BEGIN CERTIFICATE-----
+MIIDojCCAoqgAwIBAgIQE4Y1TR0/BvLB+WUF1ZAcYjANBgkqhkiG9w0BAQUFADBrMQswCQYDVQQG
+EwJVUzENMAsGA1UEChMEVklTQTEvMC0GA1UECxMmVmlzYSBJbnRlcm5hdGlvbmFsIFNlcnZpY2Ug
+QXNzb2NpYXRpb24xHDAaBgNVBAMTE1Zpc2EgZUNvbW1lcmNlIFJvb3QwHhcNMDIwNjI2MDIxODM2
+WhcNMjIwNjI0MDAxNjEyWjBrMQswCQYDVQQGEwJVUzENMAsGA1UEChMEVklTQTEvMC0GA1UECxMm
+VmlzYSBJbnRlcm5hdGlvbmFsIFNlcnZpY2UgQXNzb2NpYXRpb24xHDAaBgNVBAMTE1Zpc2EgZUNv
+bW1lcmNlIFJvb3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvV95WHm6h2mCxlCfL
+F9sHP4CFT8icttD0b0/Pmdjh28JIXDqsOTPHH2qLJj0rNfVIsZHBAk4ElpF7sDPwsRROEW+1QK8b
+RaVK7362rPKgH1g/EkZgPI2h4H3PVz4zHvtH8aoVlwdVZqW1LS7YgFmypw23RuwhY/81q6UCzyr0
+TP579ZRdhE2o8mCP2w4lPJ9zcc+U30rq299yOIzzlr3xF7zSujtFWsan9sYXiwGd/BmoKoMWuDpI
+/k4+oKsGGelT84ATB+0tvz8KPFUgOSwsAGl0lUq8ILKpeeUYiZGo3BxN77t+Nwtd/jmliFKMAGzs
+GHxBvfaLdXe6YJ2E5/4tAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEG
+MB0GA1UdDgQWBBQVOIMPPyw/cDMezUb+B4wg4NfDtzANBgkqhkiG9w0BAQUFAAOCAQEAX/FBfXxc
+CLkr4NWSR/pnXKUTwwMhmytMiUbPWU3J/qVAtmPN3XEolWcRzCSs00Rsca4BIGsDoo8Ytyk6feUW
+YFN4PMCvFYP3j1IzJL1kk5fui/fbGKhtcbP3LBfQdCVp9/5rPJS+TUtBjE7ic9DjkCJzQ83z7+pz
+zkWKsKZJ/0x9nXGIxHYdkFsd7v3M9+79YKWxehZx0RbQfBI8bGmX265fOZpwLwU8GUYEmSA20GBu
+YQa7FkKMcPcw++DbZqMAAb3mLNqRX6BGi01qnD093QVG/na/oAo85ADmJ7f/hC3euiInlhBx6yLt
+398znM/jra6O1I7mT1GvFpLgXPYHDw==
+-----END CERTIFICATE-----
+
+Comodo AAA Services root
+========================
+-----BEGIN CERTIFICATE-----
+MIIEMjCCAxqgAwIBAgIBATANBgkqhkiG9w0BAQUFADB7MQswCQYDVQQGEwJHQjEbMBkGA1UECAwS
+R3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRowGAYDVQQKDBFDb21vZG8gQ0Eg
+TGltaXRlZDEhMB8GA1UEAwwYQUFBIENlcnRpZmljYXRlIFNlcnZpY2VzMB4XDTA0MDEwMTAwMDAw
+MFoXDTI4MTIzMTIzNTk1OVowezELMAkGA1UEBhMCR0IxGzAZBgNVBAgMEkdyZWF0ZXIgTWFuY2hl
+c3RlcjEQMA4GA1UEBwwHU2FsZm9yZDEaMBgGA1UECgwRQ29tb2RvIENBIExpbWl0ZWQxITAfBgNV
+BAMMGEFBQSBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBAL5AnfRu4ep2hxxNRUSOvkbIgwadwSr+GB+O5AL686tdUIoWMQuaBtDFcCLNSS1UY8y2bmhG
+C1Pqy0wkwLxyTurxFa70VJoSCsN6sjNg4tqJVfMiWPPe3M/vg4aijJRPn2jymJBGhCfHdr/jzDUs
+i14HZGWCwEiwqJH5YZ92IFCokcdmtet4YgNW8IoaE+oxox6gmf049vYnMlhvB/VruPsUK6+3qszW
+Y19zjNoFmag4qMsXeDZRrOme9Hg6jc8P2ULimAyrL58OAd7vn5lJ8S3frHRNG5i1R8XlKdH5kBjH
+Ypy+g8cmez6KJcfA3Z3mNWgQIJ2P2N7Sw4ScDV7oL8kCAwEAAaOBwDCBvTAdBgNVHQ4EFgQUoBEK
+Iz6W8Qfs4q8p74Klf9AwpLQwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wewYDVR0f
+BHQwcjA4oDagNIYyaHR0cDovL2NybC5jb21vZG9jYS5jb20vQUFBQ2VydGlmaWNhdGVTZXJ2aWNl
+cy5jcmwwNqA0oDKGMGh0dHA6Ly9jcmwuY29tb2RvLm5ldC9BQUFDZXJ0aWZpY2F0ZVNlcnZpY2Vz
+LmNybDANBgkqhkiG9w0BAQUFAAOCAQEACFb8AvCb6P+k+tZ7xkSAzk/ExfYAWMymtrwUSWgEdujm
+7l3sAg9g1o1QGE8mTgHj5rCl7r+8dFRBv/38ErjHT1r0iWAFf2C3BUrz9vHCv8S5dIa2LX1rzNLz
+Rt0vxuBqw8M0Ayx9lt1awg6nCpnBBYurDC/zXDrPbDdVCYfeU0BsWO/8tqtlbgT2G9w84FoVxp7Z
+8VlIMCFlA2zs6SFz7JsDoeA3raAVGI/6ugLOpyypEBMs1OUIJqsil2D4kF501KKaU73yqWjgom7C
+12yxow+ev+to51byrvLjKzg6CYG1a4XXvi3tPxq3smPi9WIsgtRqAEFQ8TmDn5XpNpaYbg==
+-----END CERTIFICATE-----
+
+QuoVadis Root CA
+================
+-----BEGIN CERTIFICATE-----
+MIIF0DCCBLigAwIBAgIEOrZQizANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJCTTEZMBcGA1UE
+ChMQUXVvVmFkaXMgTGltaXRlZDElMCMGA1UECxMcUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0
+eTEuMCwGA1UEAxMlUXVvVmFkaXMgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wMTAz
+MTkxODMzMzNaFw0yMTAzMTcxODMzMzNaMH8xCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRp
+cyBMaW1pdGVkMSUwIwYDVQQLExxSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MS4wLAYDVQQD
+EyVRdW9WYWRpcyBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEAv2G1lVO6V/z68mcLOhrfEYBklbTRvM16z/Ypli4kVEAkOPcahdxYTMuk
+J0KX0J+DisPkBgNbAKVRHnAEdOLB1Dqr1607BxgFjv2DrOpm2RgbaIr1VxqYuvXtdj182d6UajtL
+F8HVj71lODqV0D1VNk7feVcxKh7YWWVJWCCYfqtffp/p1k3sg3Spx2zY7ilKhSoGFPlU5tPaZQeL
+YzcS19Dsw3sgQUSj7cugF+FxZc4dZjH3dgEZyH0DWLaVSR2mEiboxgx24ONmy+pdpibu5cxfvWen
+AScOospUxbF6lR1xHkopigPcakXBpBlebzbNw6Kwt/5cOOJSvPhEQ+aQuwIDAQABo4ICUjCCAk4w
+PQYIKwYBBQUHAQEEMTAvMC0GCCsGAQUFBzABhiFodHRwczovL29jc3AucXVvdmFkaXNvZmZzaG9y
+ZS5jb20wDwYDVR0TAQH/BAUwAwEB/zCCARoGA1UdIASCAREwggENMIIBCQYJKwYBBAG+WAABMIH7
+MIHUBggrBgEFBQcCAjCBxxqBxFJlbGlhbmNlIG9uIHRoZSBRdW9WYWRpcyBSb290IENlcnRpZmlj
+YXRlIGJ5IGFueSBwYXJ0eSBhc3N1bWVzIGFjY2VwdGFuY2Ugb2YgdGhlIHRoZW4gYXBwbGljYWJs
+ZSBzdGFuZGFyZCB0ZXJtcyBhbmQgY29uZGl0aW9ucyBvZiB1c2UsIGNlcnRpZmljYXRpb24gcHJh
+Y3RpY2VzLCBhbmQgdGhlIFF1b1ZhZGlzIENlcnRpZmljYXRlIFBvbGljeS4wIgYIKwYBBQUHAgEW
+Fmh0dHA6Ly93d3cucXVvdmFkaXMuYm0wHQYDVR0OBBYEFItLbe3TKbkGGew5Oanwl4Rqy+/fMIGu
+BgNVHSMEgaYwgaOAFItLbe3TKbkGGew5Oanwl4Rqy+/foYGEpIGBMH8xCzAJBgNVBAYTAkJNMRkw
+FwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMSUwIwYDVQQLExxSb290IENlcnRpZmljYXRpb24gQXV0
+aG9yaXR5MS4wLAYDVQQDEyVRdW9WYWRpcyBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5ggQ6
+tlCLMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOCAQEAitQUtf70mpKnGdSkfnIYj9lo
+fFIk3WdvOXrEql494liwTXCYhGHoG+NpGA7O+0dQoE7/8CQfvbLO9Sf87C9TqnN7Az10buYWnuul
+LsS/VidQK2K6vkscPFVcQR0kvoIgR13VRH56FmjffU1RcHhXHTMe/QKZnAzNCgVPx7uOpHX6Sm2x
+gI4JVrmcGmD+XcHXetwReNDWXcG31a0ymQM6isxUJTkxgXsTIlG6Rmyhu576BGxJJnSP0nPrzDCi
+5upZIof4l/UO/erMkqQWxFIY6iHOsfHmhIHluqmGKPJDWl0Snawe2ajlCmqnf6CHKc/yiU3U7MXi
+5nrQNiOKSnQ2+Q==
+-----END CERTIFICATE-----
+
+QuoVadis Root CA 2
+==================
+-----BEGIN CERTIFICATE-----
+MIIFtzCCA5+gAwIBAgICBQkwDQYJKoZIhvcNAQEFBQAwRTELMAkGA1UEBhMCQk0xGTAXBgNVBAoT
+EFF1b1ZhZGlzIExpbWl0ZWQxGzAZBgNVBAMTElF1b1ZhZGlzIFJvb3QgQ0EgMjAeFw0wNjExMjQx
+ODI3MDBaFw0zMTExMjQxODIzMzNaMEUxCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBM
+aW1pdGVkMRswGQYDVQQDExJRdW9WYWRpcyBSb290IENBIDIwggIiMA0GCSqGSIb3DQEBAQUAA4IC
+DwAwggIKAoICAQCaGMpLlA0ALa8DKYrwD4HIrkwZhR0In6spRIXzL4GtMh6QRr+jhiYaHv5+HBg6
+XJxgFyo6dIMzMH1hVBHL7avg5tKifvVrbxi3Cgst/ek+7wrGsxDp3MJGF/hd/aTa/55JWpzmM+Yk
+lvc/ulsrHHo1wtZn/qtmUIttKGAr79dgw8eTvI02kfN/+NsRE8Scd3bBrrcCaoF6qUWD4gXmuVbB
+lDePSHFjIuwXZQeVikvfj8ZaCuWw419eaxGrDPmF60Tp+ARz8un+XJiM9XOva7R+zdRcAitMOeGy
+lZUtQofX1bOQQ7dsE/He3fbE+Ik/0XX1ksOR1YqI0JDs3G3eicJlcZaLDQP9nL9bFqyS2+r+eXyt
+66/3FsvbzSUr5R/7mp/iUcw6UwxI5g69ybR2BlLmEROFcmMDBOAENisgGQLodKcftslWZvB1Jdxn
+wQ5hYIizPtGo/KPaHbDRsSNU30R2be1B2MGyIrZTHN81Hdyhdyox5C315eXbyOD/5YDXC2Og/zOh
+D7osFRXql7PSorW+8oyWHhqPHWykYTe5hnMz15eWniN9gqRMgeKh0bpnX5UHoycR7hYQe7xFSkyy
+BNKr79X9DFHOUGoIMfmR2gyPZFwDwzqLID9ujWc9Otb+fVuIyV77zGHcizN300QyNQliBJIWENie
+J0f7OyHj+OsdWwIDAQABo4GwMIGtMA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0PBAQDAgEGMB0GA1Ud
+DgQWBBQahGK8SEwzJQTU7tD2A8QZRtGUazBuBgNVHSMEZzBlgBQahGK8SEwzJQTU7tD2A8QZRtGU
+a6FJpEcwRTELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxGzAZBgNVBAMT
+ElF1b1ZhZGlzIFJvb3QgQ0EgMoICBQkwDQYJKoZIhvcNAQEFBQADggIBAD4KFk2fBluornFdLwUv
+Z+YTRYPENvbzwCYMDbVHZF34tHLJRqUDGCdViXh9duqWNIAXINzng/iN/Ae42l9NLmeyhP3ZRPx3
+UIHmfLTJDQtyU/h2BwdBR5YM++CCJpNVjP4iH2BlfF/nJrP3MpCYUNQ3cVX2kiF495V5+vgtJodm
+VjB3pjd4M1IQWK4/YY7yarHvGH5KWWPKjaJW1acvvFYfzznB4vsKqBUsfU16Y8Zsl0Q80m/DShcK
++JDSV6IZUaUtl0HaB0+pUNqQjZRG4T7wlP0QADj1O+hA4bRuVhogzG9Yje0uRY/W6ZM/57Es3zrW
+IozchLsib9D45MY56QSIPMO661V6bYCZJPVsAfv4l7CUW+v90m/xd2gNNWQjrLhVoQPRTUIZ3Ph1
+WVaj+ahJefivDrkRoHy3au000LYmYjgahwz46P0u05B/B5EqHdZ+XIWDmbA4CD/pXvk1B+TJYm5X
+f6dQlfe6yJvmjqIBxdZmv3lh8zwc4bmCXF2gw+nYSL0ZohEUGW6yhhtoPkg3Goi3XZZenMfvJ2II
+4pEZXNLxId26F0KCl3GBUzGpn/Z9Yr9y4aOTHcyKJloJONDO1w2AFrR4pTqHTI2KpdVGl/IsELm8
+VCLAAVBpQ570su9t+Oza8eOx79+Rj1QqCyXBJhnEUhAFZdWCEOrCMc0u
+-----END CERTIFICATE-----
+
+QuoVadis Root CA 3
+==================
+-----BEGIN CERTIFICATE-----
+MIIGnTCCBIWgAwIBAgICBcYwDQYJKoZIhvcNAQEFBQAwRTELMAkGA1UEBhMCQk0xGTAXBgNVBAoT
+EFF1b1ZhZGlzIExpbWl0ZWQxGzAZBgNVBAMTElF1b1ZhZGlzIFJvb3QgQ0EgMzAeFw0wNjExMjQx
+OTExMjNaFw0zMTExMjQxOTA2NDRaMEUxCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBM
+aW1pdGVkMRswGQYDVQQDExJRdW9WYWRpcyBSb290IENBIDMwggIiMA0GCSqGSIb3DQEBAQUAA4IC
+DwAwggIKAoICAQDMV0IWVJzmmNPTTe7+7cefQzlKZbPoFog02w1ZkXTPkrgEQK0CSzGrvI2RaNgg
+DhoB4hp7Thdd4oq3P5kazethq8Jlph+3t723j/z9cI8LoGe+AaJZz3HmDyl2/7FWeUUrH556VOij
+KTVopAFPD6QuN+8bv+OPEKhyq1hX51SGyMnzW9os2l2ObjyjPtr7guXd8lyyBTNvijbO0BNO/79K
+DDRMpsMhvVAEVeuxu537RR5kFd5VAYwCdrXLoT9CabwvvWhDFlaJKjdhkf2mrk7AyxRllDdLkgbv
+BNDInIjbC3uBr7E9KsRlOni27tyAsdLTmZw67mtaa7ONt9XOnMK+pUsvFrGeaDsGb659n/je7Mwp
+p5ijJUMv7/FfJuGITfhebtfZFG4ZM2mnO4SJk8RTVROhUXhA+LjJou57ulJCg54U7QVSWllWp5f8
+nT8KKdjcT5EOE7zelaTfi5m+rJsziO+1ga8bxiJTyPbH7pcUsMV8eFLI8M5ud2CEpukqdiDtWAEX
+MJPpGovgc2PZapKUSU60rUqFxKMiMPwJ7Wgic6aIDFUhWMXhOp8q3crhkODZc6tsgLjoC2SToJyM
+Gf+z0gzskSaHirOi4XCPLArlzW1oUevaPwV/izLmE1xr/l9A4iLItLRkT9a6fUg+qGkM17uGcclz
+uD87nSVL2v9A6wIDAQABo4IBlTCCAZEwDwYDVR0TAQH/BAUwAwEB/zCB4QYDVR0gBIHZMIHWMIHT
+BgkrBgEEAb5YAAMwgcUwgZMGCCsGAQUFBwICMIGGGoGDQW55IHVzZSBvZiB0aGlzIENlcnRpZmlj
+YXRlIGNvbnN0aXR1dGVzIGFjY2VwdGFuY2Ugb2YgdGhlIFF1b1ZhZGlzIFJvb3QgQ0EgMyBDZXJ0
+aWZpY2F0ZSBQb2xpY3kgLyBDZXJ0aWZpY2F0aW9uIFByYWN0aWNlIFN0YXRlbWVudC4wLQYIKwYB
+BQUHAgEWIWh0dHA6Ly93d3cucXVvdmFkaXNnbG9iYWwuY29tL2NwczALBgNVHQ8EBAMCAQYwHQYD
+VR0OBBYEFPLAE+CCQz777i9nMpY1XNu4ywLQMG4GA1UdIwRnMGWAFPLAE+CCQz777i9nMpY1XNu4
+ywLQoUmkRzBFMQswCQYDVQQGEwJCTTEZMBcGA1UEChMQUXVvVmFkaXMgTGltaXRlZDEbMBkGA1UE
+AxMSUXVvVmFkaXMgUm9vdCBDQSAzggIFxjANBgkqhkiG9w0BAQUFAAOCAgEAT62gLEz6wPJv92ZV
+qyM07ucp2sNbtrCD2dDQ4iH782CnO11gUyeim/YIIirnv6By5ZwkajGxkHon24QRiSemd1o417+s
+hvzuXYO8BsbRd2sPbSQvS3pspweWyuOEn62Iix2rFo1bZhfZFvSLgNLd+LJ2w/w4E6oM3kJpK27z
+POuAJ9v1pkQNn1pVWQvVDVJIxa6f8i+AxeoyUDUSly7B4f/xI4hROJ/yZlZ25w9Rl6VSDE1JUZU2
+Pb+iSwwQHYaZTKrzchGT5Or2m9qoXadNt54CrnMAyNojA+j56hl0YgCUyyIgvpSnWbWCar6ZeXqp
+8kokUvd0/bpO5qgdAm6xDYBEwa7TIzdfu4V8K5Iu6H6li92Z4b8nby1dqnuH/grdS/yO9SbkbnBC
+bjPsMZ57k8HkyWkaPcBrTiJt7qtYTcbQQcEr6k8Sh17rRdhs9ZgC06DYVYoGmRmioHfRMJ6szHXu
+g/WwYjnPbFfiTNKRCw51KBuav/0aQ/HKd/s7j2G4aSgWQgRecCocIdiP4b0jWy10QJLZYxkNc91p
+vGJHvOB0K7Lrfb5BG7XARsWhIstfTsEokt4YutUqKLsRixeTmJlglFwjz1onl14LBQaTNx47aTbr
+qZ5hHY8y2o4M1nQ+ewkk2gF3R8Q7zTSMmfXK4SVhM7JZG+Ju1zdXtg2pEto=
+-----END CERTIFICATE-----
+
+Security Communication Root CA
+==============================
+-----BEGIN CERTIFICATE-----
+MIIDWjCCAkKgAwIBAgIBADANBgkqhkiG9w0BAQUFADBQMQswCQYDVQQGEwJKUDEYMBYGA1UEChMP
+U0VDT00gVHJ1c3QubmV0MScwJQYDVQQLEx5TZWN1cml0eSBDb21tdW5pY2F0aW9uIFJvb3RDQTEw
+HhcNMDMwOTMwMDQyMDQ5WhcNMjMwOTMwMDQyMDQ5WjBQMQswCQYDVQQGEwJKUDEYMBYGA1UEChMP
+U0VDT00gVHJ1c3QubmV0MScwJQYDVQQLEx5TZWN1cml0eSBDb21tdW5pY2F0aW9uIFJvb3RDQTEw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCzs/5/022x7xZ8V6UMbXaKL0u/ZPtM7orw
+8yl89f/uKuDp6bpbZCKamm8sOiZpUQWZJtzVHGpxxpp9Hp3dfGzGjGdnSj74cbAZJ6kJDKaVv0uM
+DPpVmDvY6CKhS3E4eayXkmmziX7qIWgGmBSWh9JhNrxtJ1aeV+7AwFb9Ms+k2Y7CI9eNqPPYJayX
+5HA49LY6tJ07lyZDo6G8SVlyTCMwhwFY9k6+HGhWZq/NQV3Is00qVUarH9oe4kA92819uZKAnDfd
+DJZkndwi92SL32HeFZRSFaB9UslLqCHJxrHty8OVYNEP8Ktw+N/LTX7s1vqr2b1/VPKl6Xn62dZ2
+JChzAgMBAAGjPzA9MB0GA1UdDgQWBBSgc0mZaNyFW2XjmygvV5+9M7wHSDALBgNVHQ8EBAMCAQYw
+DwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAaECpqLvkT115swW1F7NgE+vGkl3g
+0dNq/vu+m22/xwVtWSDEHPC32oRYAmP6SBbvT6UL90qY8j+eG61Ha2POCEfrUj94nK9NrvjVT8+a
+mCoQQTlSxN3Zmw7vkwGusi7KaEIkQmywszo+zenaSMQVy+n5Bw+SUEmK3TGXX8npN6o7WWWXlDLJ
+s58+OmJYxUmtYg5xpTKqL8aJdkNAExNnPaJUJRDL8Try2frbSVa7pv6nQTXD4IhhyYjH3zYQIphZ
+6rBK+1YWc26sTfcioU+tHXotRSflMMFe8toTyyVCUZVHA4xsIcx0Qu1T/zOLjw9XARYvz6buyXAi
+FL39vmwLAw==
+-----END CERTIFICATE-----
+
+Sonera Class 2 Root CA
+======================
+-----BEGIN CERTIFICATE-----
+MIIDIDCCAgigAwIBAgIBHTANBgkqhkiG9w0BAQUFADA5MQswCQYDVQQGEwJGSTEPMA0GA1UEChMG
+U29uZXJhMRkwFwYDVQQDExBTb25lcmEgQ2xhc3MyIENBMB4XDTAxMDQwNjA3Mjk0MFoXDTIxMDQw
+NjA3Mjk0MFowOTELMAkGA1UEBhMCRkkxDzANBgNVBAoTBlNvbmVyYTEZMBcGA1UEAxMQU29uZXJh
+IENsYXNzMiBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJAXSjWdyvANlsdE+hY3
+/Ei9vX+ALTU74W+oZ6m/AxxNjG8yR9VBaKQTBME1DJqEQ/xcHf+Js+gXGM2RX/uJ4+q/Tl18GybT
+dXnt5oTjV+WtKcT0OijnpXuENmmz/V52vaMtmdOQTiMofRhj8VQ7Jp12W5dCsv+u8E7s3TmVToMG
+f+dJQMjFAbJUWmYdPfz56TwKnoG4cPABi+QjVHzIrviQHgCWctRUz2EjvOr7nQKV0ba5cTppCD8P
+tOFCx4j1P5iop7oc4HFx71hXgVB6XGt0Rg6DA5jDjqhu8nYybieDwnPz3BjotJPqdURrBGAgcVeH
+nfO+oJAjPYok4doh28MCAwEAAaMzMDEwDwYDVR0TAQH/BAUwAwEB/zARBgNVHQ4ECgQISqCqWITT
+XjwwCwYDVR0PBAQDAgEGMA0GCSqGSIb3DQEBBQUAA4IBAQBazof5FnIVV0sd2ZvnoiYw7JNn39Yt
+0jSv9zilzqsWuasvfDXLrNAPtEwr/IDva4yRXzZ299uzGxnq9LIR/WFxRL8oszodv7ND6J+/3DEI
+cbCdjdY0RzKQxmUk96BKfARzjzlvF4xytb1LyHr4e4PDKE6cCepnP7JnBBvDFNr450kkkdAdavph
+Oe9r5yF1BgfYErQhIHBCcYHaPJo2vqZbDWpsmh+Re/n570K6Tk6ezAyNlNzZRZxe7EJQY670XcSx
+EtzKO6gunRRaBXW37Ndj4ro1tgQIkejanZz2ZrUYrAqmVCY0M9IbwdR/GjqOC6oybtv8TyWf2TLH
+llpwrN9M
+-----END CERTIFICATE-----
+
+XRamp Global CA Root
+====================
+-----BEGIN CERTIFICATE-----
+MIIEMDCCAxigAwIBAgIQUJRs7Bjq1ZxN1ZfvdY+grTANBgkqhkiG9w0BAQUFADCBgjELMAkGA1UE
+BhMCVVMxHjAcBgNVBAsTFXd3dy54cmFtcHNlY3VyaXR5LmNvbTEkMCIGA1UEChMbWFJhbXAgU2Vj
+dXJpdHkgU2VydmljZXMgSW5jMS0wKwYDVQQDEyRYUmFtcCBHbG9iYWwgQ2VydGlmaWNhdGlvbiBB
+dXRob3JpdHkwHhcNMDQxMTAxMTcxNDA0WhcNMzUwMTAxMDUzNzE5WjCBgjELMAkGA1UEBhMCVVMx
+HjAcBgNVBAsTFXd3dy54cmFtcHNlY3VyaXR5LmNvbTEkMCIGA1UEChMbWFJhbXAgU2VjdXJpdHkg
+U2VydmljZXMgSW5jMS0wKwYDVQQDEyRYUmFtcCBHbG9iYWwgQ2VydGlmaWNhdGlvbiBBdXRob3Jp
+dHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCYJB69FbS638eMpSe2OAtp87ZOqCwu
+IR1cRN8hXX4jdP5efrRKt6atH67gBhbim1vZZ3RrXYCPKZ2GG9mcDZhtdhAoWORlsH9KmHmf4MMx
+foArtYzAQDsRhtDLooY2YKTVMIJt2W7QDxIEM5dfT2Fa8OT5kavnHTu86M/0ay00fOJIYRyO82FE
+zG+gSqmUsE3a56k0enI4qEHMPJQRfevIpoy3hsvKMzvZPTeL+3o+hiznc9cKV6xkmxnr9A8ECIqs
+AxcZZPRaJSKNNCyy9mgdEm3Tih4U2sSPpuIjhdV6Db1q4Ons7Be7QhtnqiXtRYMh/MHJfNViPvry
+xS3T/dRlAgMBAAGjgZ8wgZwwEwYJKwYBBAGCNxQCBAYeBABDAEEwCwYDVR0PBAQDAgGGMA8GA1Ud
+EwEB/wQFMAMBAf8wHQYDVR0OBBYEFMZPoj0GY4QJnM5i5ASsjVy16bYbMDYGA1UdHwQvMC0wK6Ap
+oCeGJWh0dHA6Ly9jcmwueHJhbXBzZWN1cml0eS5jb20vWEdDQS5jcmwwEAYJKwYBBAGCNxUBBAMC
+AQEwDQYJKoZIhvcNAQEFBQADggEBAJEVOQMBG2f7Shz5CmBbodpNl2L5JFMn14JkTpAuw0kbK5rc
+/Kh4ZzXxHfARvbdI4xD2Dd8/0sm2qlWkSLoC295ZLhVbO50WfUfXN+pfTXYSNrsf16GBBEYgoyxt
+qZ4Bfj8pzgCT3/3JknOJiWSe5yvkHJEs0rnOfc5vMZnT5r7SHpDwCRR5XCOrTdLaIR9NmXmd4c8n
+nxCbHIgNsIpkQTG4DmyQJKSbXHGPurt+HBvbaoAPIbzp26a3QPSyi6mx5O+aGtA9aZnuqCij4Tyz
+8LIRnM98QObd50N9otg6tamN8jSZxNQQ4Qb9CYQQO+7ETPTsJ3xCwnR8gooJybQDJbw=
+-----END CERTIFICATE-----
+
+Go Daddy Class 2 CA
+===================
+-----BEGIN CERTIFICATE-----
+MIIEADCCAuigAwIBAgIBADANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJVUzEhMB8GA1UEChMY
+VGhlIEdvIERhZGR5IEdyb3VwLCBJbmMuMTEwLwYDVQQLEyhHbyBEYWRkeSBDbGFzcyAyIENlcnRp
+ZmljYXRpb24gQXV0aG9yaXR5MB4XDTA0MDYyOTE3MDYyMFoXDTM0MDYyOTE3MDYyMFowYzELMAkG
+A1UEBhMCVVMxITAfBgNVBAoTGFRoZSBHbyBEYWRkeSBHcm91cCwgSW5jLjExMC8GA1UECxMoR28g
+RGFkZHkgQ2xhc3MgMiBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCASAwDQYJKoZIhvcNAQEBBQAD
+ggENADCCAQgCggEBAN6d1+pXGEmhW+vXX0iG6r7d/+TvZxz0ZWizV3GgXne77ZtJ6XCAPVYYYwhv
+2vLM0D9/AlQiVBDYsoHUwHU9S3/Hd8M+eKsaA7Ugay9qK7HFiH7Eux6wwdhFJ2+qN1j3hybX2C32
+qRe3H3I2TqYXP2WYktsqbl2i/ojgC95/5Y0V4evLOtXiEqITLdiOr18SPaAIBQi2XKVlOARFmR6j
+YGB0xUGlcmIbYsUfb18aQr4CUWWoriMYavx4A6lNf4DD+qta/KFApMoZFv6yyO9ecw3ud72a9nmY
+vLEHZ6IVDd2gWMZEewo+YihfukEHU1jPEX44dMX4/7VpkI+EdOqXG68CAQOjgcAwgb0wHQYDVR0O
+BBYEFNLEsNKR1EwRcbNhyz2h/t2oatTjMIGNBgNVHSMEgYUwgYKAFNLEsNKR1EwRcbNhyz2h/t2o
+atTjoWekZTBjMQswCQYDVQQGEwJVUzEhMB8GA1UEChMYVGhlIEdvIERhZGR5IEdyb3VwLCBJbmMu
+MTEwLwYDVQQLEyhHbyBEYWRkeSBDbGFzcyAyIENlcnRpZmljYXRpb24gQXV0aG9yaXR5ggEAMAwG
+A1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBADJL87LKPpH8EsahB4yOd6AzBhRckB4Y9wim
+PQoZ+YeAEW5p5JYXMP80kWNyOO7MHAGjHZQopDH2esRU1/blMVgDoszOYtuURXO1v0XJJLXVggKt
+I3lpjbi2Tc7PTMozI+gciKqdi0FuFskg5YmezTvacPd+mSYgFFQlq25zheabIZ0KbIIOqPjCDPoQ
+HmyW74cNxA9hi63ugyuV+I6ShHI56yDqg+2DzZduCLzrTia2cyvk0/ZM/iZx4mERdEr/VxqHD3VI
+Ls9RaRegAhJhldXRQLIQTO7ErBBDpqWeCtWVYpoNz4iCxTIM5CufReYNnyicsbkqWletNw+vHX/b
+vZ8=
+-----END CERTIFICATE-----
+
+Starfield Class 2 CA
+====================
+-----BEGIN CERTIFICATE-----
+MIIEDzCCAvegAwIBAgIBADANBgkqhkiG9w0BAQUFADBoMQswCQYDVQQGEwJVUzElMCMGA1UEChMc
+U3RhcmZpZWxkIFRlY2hub2xvZ2llcywgSW5jLjEyMDAGA1UECxMpU3RhcmZpZWxkIENsYXNzIDIg
+Q2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDQwNjI5MTczOTE2WhcNMzQwNjI5MTczOTE2WjBo
+MQswCQYDVQQGEwJVUzElMCMGA1UEChMcU3RhcmZpZWxkIFRlY2hub2xvZ2llcywgSW5jLjEyMDAG
+A1UECxMpU3RhcmZpZWxkIENsYXNzIDIgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggEgMA0GCSqG
+SIb3DQEBAQUAA4IBDQAwggEIAoIBAQC3Msj+6XGmBIWtDBFk385N78gDGIc/oav7PKaf8MOh2tTY
+bitTkPskpD6E8J7oX+zlJ0T1KKY/e97gKvDIr1MvnsoFAZMej2YcOadN+lq2cwQlZut3f+dZxkqZ
+JRRU6ybH838Z1TBwj6+wRir/resp7defqgSHo9T5iaU0X9tDkYI22WY8sbi5gv2cOj4QyDvvBmVm
+epsZGD3/cVE8MC5fvj13c7JdBmzDI1aaK4UmkhynArPkPw2vCHmCuDY96pzTNbO8acr1zJ3o/WSN
+F4Azbl5KXZnJHoe0nRrA1W4TNSNe35tfPe/W93bC6j67eA0cQmdrBNj41tpvi/JEoAGrAgEDo4HF
+MIHCMB0GA1UdDgQWBBS/X7fRzt0fhvRbVazc1xDCDqmI5zCBkgYDVR0jBIGKMIGHgBS/X7fRzt0f
+hvRbVazc1xDCDqmI56FspGowaDELMAkGA1UEBhMCVVMxJTAjBgNVBAoTHFN0YXJmaWVsZCBUZWNo
+bm9sb2dpZXMsIEluYy4xMjAwBgNVBAsTKVN0YXJmaWVsZCBDbGFzcyAyIENlcnRpZmljYXRpb24g
+QXV0aG9yaXR5ggEAMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAAWdP4id0ckaVaGs
+afPzWdqbAYcaT1epoXkJKtv3L7IezMdeatiDh6GX70k1PncGQVhiv45YuApnP+yz3SFmH8lU+nLM
+PUxA2IGvd56Deruix/U0F47ZEUD0/CwqTRV/p2JdLiXTAAsgGh1o+Re49L2L7ShZ3U0WixeDyLJl
+xy16paq8U4Zt3VekyvggQQto8PT7dL5WXXp59fkdheMtlb71cZBDzI0fmgAKhynpVSJYACPq4xJD
+KVtHCN2MQWplBqjlIapBtJUhlbl90TSrE9atvNziPTnNvT51cKEYWQPJIrSPnNVeKtelttQKbfi3
+QBFGmh95DmK/D5fs4C8fF5Q=
+-----END CERTIFICATE-----
+
+Taiwan GRCA
+===========
+-----BEGIN CERTIFICATE-----
+MIIFcjCCA1qgAwIBAgIQH51ZWtcvwgZEpYAIaeNe9jANBgkqhkiG9w0BAQUFADA/MQswCQYDVQQG
+EwJUVzEwMC4GA1UECgwnR292ZXJubWVudCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4X
+DTAyMTIwNTEzMjMzM1oXDTMyMTIwNTEzMjMzM1owPzELMAkGA1UEBhMCVFcxMDAuBgNVBAoMJ0dv
+dmVybm1lbnQgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTCCAiIwDQYJKoZIhvcNAQEBBQAD
+ggIPADCCAgoCggIBAJoluOzMonWoe/fOW1mKydGGEghU7Jzy50b2iPN86aXfTEc2pBsBHH8eV4qN
+w8XRIePaJD9IK/ufLqGU5ywck9G/GwGHU5nOp/UKIXZ3/6m3xnOUT0b3EEk3+qhZSV1qgQdW8or5
+BtD3cCJNtLdBuTK4sfCxw5w/cP1T3YGq2GN49thTbqGsaoQkclSGxtKyyhwOeYHWtXBiCAEuTk8O
+1RGvqa/lmr/czIdtJuTJV6L7lvnM4T9TjGxMfptTCAtsF/tnyMKtsc2AtJfcdgEWFelq16TheEfO
+htX7MfP6Mb40qij7cEwdScevLJ1tZqa2jWR+tSBqnTuBto9AAGdLiYa4zGX+FVPpBMHWXx1E1wov
+J5pGfaENda1UhhXcSTvxls4Pm6Dso3pdvtUqdULle96ltqqvKKyskKw4t9VoNSZ63Pc78/1Fm9G7
+Q3hub/FCVGqY8A2tl+lSXunVanLeavcbYBT0peS2cWeqH+riTcFCQP5nRhc4L0c/cZyu5SHKYS1t
+B6iEfC3uUSXxY5Ce/eFXiGvviiNtsea9P63RPZYLhY3Naye7twWb7LuRqQoHEgKXTiCQ8P8NHuJB
+O9NAOueNXdpm5AKwB1KYXA6OM5zCppX7VRluTI6uSw+9wThNXo+EHWbNxWCWtFJaBYmOlXqYwZE8
+lSOyDvR5tMl8wUohAgMBAAGjajBoMB0GA1UdDgQWBBTMzO/MKWCkO7GStjz6MmKPrCUVOzAMBgNV
+HRMEBTADAQH/MDkGBGcqBwAEMTAvMC0CAQAwCQYFKw4DAhoFADAHBgVnKgMAAAQUA5vwIhP/lSg2
+09yewDL7MTqKUWUwDQYJKoZIhvcNAQEFBQADggIBAECASvomyc5eMN1PhnR2WPWus4MzeKR6dBcZ
+TulStbngCnRiqmjKeKBMmo4sIy7VahIkv9Ro04rQ2JyftB8M3jh+Vzj8jeJPXgyfqzvS/3WXy6Tj
+Zwj/5cAWtUgBfen5Cv8b5Wppv3ghqMKnI6mGq3ZW6A4M9hPdKmaKZEk9GhiHkASfQlK3T8v+R0F2
+Ne//AHY2RTKbxkaFXeIksB7jSJaYV0eUVXoPQbFEJPPB/hprv4j9wabak2BegUqZIJxIZhm1AHlU
+D7gsL0u8qV1bYH+Mh6XgUmMqvtg7hUAV/h62ZT/FS9p+tXo1KaMuephgIqP0fSdOLeq0dDzpD6Qz
+DxARvBMB1uUO07+1EqLhRSPAzAhuYbeJq4PjJB7mXQfnHyA+z2fI56wwbSdLaG5LKlwCCDTb+Hbk
+Z6MmnD+iMsJKxYEYMRBWqoTvLQr/uB930r+lWKBi5NdLkXWNiYCYfm3LU05er/ayl4WXudpVBrkk
+7tfGOB5jGxI7leFYrPLfhNVfmS8NVVvmONsuP3LpSIXLuykTjx44VbnzssQwmSNOXfJIoRIM3BKQ
+CZBUkQM8R+XVyWXgt0t97EfTsws+rZ7QdAAO671RrcDeLMDDav7v3Aun+kbfYNucpllQdSNpc5Oy
++fwC00fmcc4QAu4njIT/rEUNE1yDMuAlpYYsfPQS
+-----END CERTIFICATE-----
+
+DigiCert Assured ID Root CA
+===========================
+-----BEGIN CERTIFICATE-----
+MIIDtzCCAp+gAwIBAgIQDOfg5RfYRv6P5WD8G/AwOTANBgkqhkiG9w0BAQUFADBlMQswCQYDVQQG
+EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSQw
+IgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgQ0EwHhcNMDYxMTEwMDAwMDAwWhcNMzEx
+MTEwMDAwMDAwWjBlMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQL
+ExB3d3cuZGlnaWNlcnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgQ0Ew
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCtDhXO5EOAXLGH87dg+XESpa7cJpSIqvTO
+9SA5KFhgDPiA2qkVlTJhPLWxKISKityfCgyDF3qPkKyK53lTXDGEKvYPmDI2dsze3Tyoou9q+yHy
+UmHfnyDXH+Kx2f4YZNISW1/5WBg1vEfNoTb5a3/UsDg+wRvDjDPZ2C8Y/igPs6eD1sNuRMBhNZYW
+/lmci3Zt1/GiSw0r/wty2p5g0I6QNcZ4VYcgoc/lbQrISXwxmDNsIumH0DJaoroTghHtORedmTpy
+oeb6pNnVFzF1roV9Iq4/AUaG9ih5yLHa5FcXxH4cDrC0kqZWs72yl+2qp/C3xag/lRbQ/6GW6whf
+GHdPAgMBAAGjYzBhMA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRF
+66Kv9JLLgjEtUYunpyGd823IDzAfBgNVHSMEGDAWgBRF66Kv9JLLgjEtUYunpyGd823IDzANBgkq
+hkiG9w0BAQUFAAOCAQEAog683+Lt8ONyc3pklL/3cmbYMuRCdWKuh+vy1dneVrOfzM4UKLkNl2Bc
+EkxY5NM9g0lFWJc1aRqoR+pWxnmrEthngYTffwk8lOa4JiwgvT2zKIn3X/8i4peEH+ll74fg38Fn
+SbNd67IJKusm7Xi+fT8r87cmNW1fiQG2SVufAQWbqz0lwcy2f8Lxb4bG+mRo64EtlOtCt/qMHt1i
+8b5QZ7dsvfPxH2sMNgcWfzd8qVttevESRmCD1ycEvkvOl77DZypoEd+A5wwzZr8TDRRu838fYxAe
++o0bJW1sj6W3YQGx0qMmoRBxna3iw/nDmVG3KwcIzi7mULKn+gpFL6Lw8g==
+-----END CERTIFICATE-----
+
+DigiCert Global Root CA
+=======================
+-----BEGIN CERTIFICATE-----
+MIIDrzCCApegAwIBAgIQCDvgVpBCRrGhdWrJWZHHSjANBgkqhkiG9w0BAQUFADBhMQswCQYDVQQG
+EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSAw
+HgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBDQTAeFw0wNjExMTAwMDAwMDBaFw0zMTExMTAw
+MDAwMDBaMGExCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3
+dy5kaWdpY2VydC5jb20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IENBMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4jvhEXLeqKTTo1eqUKKPC3eQyaKl7hLOllsBCSDMAZOn
+TjC3U/dDxGkAV53ijSLdhwZAAIEJzs4bg7/fzTtxRuLWZscFs3YnFo97nh6Vfe63SKMI2tavegw5
+BmV/Sl0fvBf4q77uKNd0f3p4mVmFaG5cIzJLv07A6Fpt43C/dxC//AH2hdmoRBBYMql1GNXRor5H
+4idq9Joz+EkIYIvUX7Q6hL+hqkpMfT7PT19sdl6gSzeRntwi5m3OFBqOasv+zbMUZBfHWymeMr/y
+7vrTC0LUq7dBMtoM1O/4gdW7jVg/tRvoSSiicNoxBN33shbyTApOB6jtSj1etX+jkMOvJwIDAQAB
+o2MwYTAOBgNVHQ8BAf8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUA95QNVbRTLtm
+8KPiGxvDl7I90VUwHwYDVR0jBBgwFoAUA95QNVbRTLtm8KPiGxvDl7I90VUwDQYJKoZIhvcNAQEF
+BQADggEBAMucN6pIExIK+t1EnE9SsPTfrgT1eXkIoyQY/EsrhMAtudXH/vTBH1jLuG2cenTnmCmr
+EbXjcKChzUyImZOMkXDiqw8cvpOp/2PV5Adg06O/nVsJ8dWO41P0jmP6P6fbtGbfYmbW0W5BjfIt
+tep3Sp+dWOIrWcBAI+0tKIJFPnlUkiaY4IBIqDfv8NZ5YBberOgOzW6sRBc4L0na4UU+Krk2U886
+UAb3LujEV0lsYSEY1QSteDwsOoBrp+uvFRTp2InBuThs4pFsiv9kuXclVzDAGySj4dzp30d8tbQk
+CAUw7C29C79Fv1C5qfPrmAESrciIxpg0X40KPMbp1ZWVbd4=
+-----END CERTIFICATE-----
+
+DigiCert High Assurance EV Root CA
+==================================
+-----BEGIN CERTIFICATE-----
+MIIDxTCCAq2gAwIBAgIQAqxcJmoLQJuPC3nyrkYldzANBgkqhkiG9w0BAQUFADBsMQswCQYDVQQG
+EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSsw
+KQYDVQQDEyJEaWdpQ2VydCBIaWdoIEFzc3VyYW5jZSBFViBSb290IENBMB4XDTA2MTExMDAwMDAw
+MFoXDTMxMTExMDAwMDAwMFowbDELMAkGA1UEBhMCVVMxFTATBgNVBAoTDERpZ2lDZXJ0IEluYzEZ
+MBcGA1UECxMQd3d3LmRpZ2ljZXJ0LmNvbTErMCkGA1UEAxMiRGlnaUNlcnQgSGlnaCBBc3N1cmFu
+Y2UgRVYgUm9vdCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMbM5XPm+9S75S0t
+Mqbf5YE/yc0lSbZxKsPVlDRnogocsF9ppkCxxLeyj9CYpKlBWTrT3JTWPNt0OKRKzE0lgvdKpVMS
+OO7zSW1xkX5jtqumX8OkhPhPYlG++MXs2ziS4wblCJEMxChBVfvLWokVfnHoNb9Ncgk9vjo4UFt3
+MRuNs8ckRZqnrG0AFFoEt7oT61EKmEFBIk5lYYeBQVCmeVyJ3hlKV9Uu5l0cUyx+mM0aBhakaHPQ
+NAQTXKFx01p8VdteZOE3hzBWBOURtCmAEvF5OYiiAhF8J2a3iLd48soKqDirCmTCv2ZdlYTBoSUe
+h10aUAsgEsxBu24LUTi4S8sCAwEAAaNjMGEwDgYDVR0PAQH/BAQDAgGGMA8GA1UdEwEB/wQFMAMB
+Af8wHQYDVR0OBBYEFLE+w2kD+L9HAdSYJhoIAu9jZCvDMB8GA1UdIwQYMBaAFLE+w2kD+L9HAdSY
+JhoIAu9jZCvDMA0GCSqGSIb3DQEBBQUAA4IBAQAcGgaX3NecnzyIZgYIVyHbIUf4KmeqvxgydkAQ
+V8GK83rZEWWONfqe/EW1ntlMMUu4kehDLI6zeM7b41N5cdblIZQB2lWHmiRk9opmzN6cN82oNLFp
+myPInngiK3BD41VHMWEZ71jFhS9OMPagMRYjyOfiZRYzy78aG6A9+MpeizGLYAiJLQwGXFK3xPkK
+mNEVX58Svnw2Yzi9RKR/5CYrCsSXaQ3pjOLAEFe4yHYSkVXySGnYvCoCWw9E1CAx2/S6cCZdkGCe
+vEsXCS+0yx5DaMkHJ8HSXPfqIbloEpw8nL+e/IBcm2PN7EeqJSdnoDfzAIJ9VNep+OkuE6N36B9K
+-----END CERTIFICATE-----
+
+Certplus Class 2 Primary CA
+===========================
+-----BEGIN CERTIFICATE-----
+MIIDkjCCAnqgAwIBAgIRAIW9S/PY2uNp9pTXX8OlRCMwDQYJKoZIhvcNAQEFBQAwPTELMAkGA1UE
+BhMCRlIxETAPBgNVBAoTCENlcnRwbHVzMRswGQYDVQQDExJDbGFzcyAyIFByaW1hcnkgQ0EwHhcN
+OTkwNzA3MTcwNTAwWhcNMTkwNzA2MjM1OTU5WjA9MQswCQYDVQQGEwJGUjERMA8GA1UEChMIQ2Vy
+dHBsdXMxGzAZBgNVBAMTEkNsYXNzIDIgUHJpbWFyeSBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBANxQltAS+DXSCHh6tlJw/W/uz7kRy1134ezpfgSN1sxvc0NXYKwzCkTsA18cgCSR
+5aiRVhKC9+Ar9NuuYS6JEI1rbLqzAr3VNsVINyPi8Fo3UjMXEuLRYE2+L0ER4/YXJQyLkcAbmXuZ
+Vg2v7tK8R1fjeUl7NIknJITesezpWE7+Tt9avkGtrAjFGA7v0lPubNCdEgETjdyAYveVqUSISnFO
+YFWe2yMZeVYHDD9jC1yw4r5+FfyUM1hBOHTE4Y+L3yasH7WLO7dDWWuwJKZtkIvEcupdM5i3y95e
+e++U8Rs+yskhwcWYAqqi9lt3m/V+llU0HGdpwPFC40es/CgcZlUCAwEAAaOBjDCBiTAPBgNVHRME
+CDAGAQH/AgEKMAsGA1UdDwQEAwIBBjAdBgNVHQ4EFgQU43Mt38sOKAze3bOkynm4jrvoMIkwEQYJ
+YIZIAYb4QgEBBAQDAgEGMDcGA1UdHwQwMC4wLKAqoCiGJmh0dHA6Ly93d3cuY2VydHBsdXMuY29t
+L0NSTC9jbGFzczIuY3JsMA0GCSqGSIb3DQEBBQUAA4IBAQCnVM+IRBnL39R/AN9WM2K191EBkOvD
+P9GIROkkXe/nFL0gt5o8AP5tn9uQ3Nf0YtaLcF3n5QRIqWh8yfFC82x/xXp8HVGIutIKPidd3i1R
+TtMTZGnkLuPT55sJmabglZvOGtd/vjzOUrMRFcEPF80Du5wlFbqidon8BvEY0JNLDnyCt6X09l/+
+7UCmnYR0ObncHoUW2ikbhiMAybuJfm6AiB4vFLQDJKgybwOaRywwvlbGp0ICcBvqQNi6BQNwB6SW
+//1IMwrh3KWBkJtN3X3n57LNXMhqlfil9o3EXXgIvnsG1knPGTZQIy4I5p4FTUcY1Rbpsda2ENW7
+l7+ijrRU
+-----END CERTIFICATE-----
+
+DST Root CA X3
+==============
+-----BEGIN CERTIFICATE-----
+MIIDSjCCAjKgAwIBAgIQRK+wgNajJ7qJMDmGLvhAazANBgkqhkiG9w0BAQUFADA/MSQwIgYDVQQK
+ExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMTDkRTVCBSb290IENBIFgzMB4X
+DTAwMDkzMDIxMTIxOVoXDTIxMDkzMDE0MDExNVowPzEkMCIGA1UEChMbRGlnaXRhbCBTaWduYXR1
+cmUgVHJ1c3QgQ28uMRcwFQYDVQQDEw5EU1QgUm9vdCBDQSBYMzCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBAN+v6ZdQCINXtMxiZfaQguzH0yxrMMpb7NnDfcdAwRgUi+DoM3ZJKuM/IUmT
+rE4Orz5Iy2Xu/NMhD2XSKtkyj4zl93ewEnu1lcCJo6m67XMuegwGMoOifooUMM0RoOEqOLl5CjH9
+UL2AZd+3UWODyOKIYepLYYHsUmu5ouJLGiifSKOeDNoJjj4XLh7dIN9bxiqKqy69cK3FCxolkHRy
+xXtqqzTWMIn/5WgTe1QLyNau7Fqckh49ZLOMxt+/yUFw7BZy1SbsOFU5Q9D8/RhcQPGX69Wam40d
+utolucbY38EVAjqr2m7xPi71XAicPNaDaeQQmxkqtilX4+U9m5/wAl0CAwEAAaNCMEAwDwYDVR0T
+AQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFMSnsaR7LHH62+FLkHX/xBVghYkQ
+MA0GCSqGSIb3DQEBBQUAA4IBAQCjGiybFwBcqR7uKGY3Or+Dxz9LwwmglSBd49lZRNI+DT69ikug
+dB/OEIKcdBodfpga3csTS7MgROSR6cz8faXbauX+5v3gTt23ADq1cEmv8uXrAvHRAosZy5Q6XkjE
+GB5YGV8eAlrwDPGxrancWYaLbumR9YbK+rlmM6pZW87ipxZzR8srzJmwN0jP41ZL9c8PDHIyh8bw
+RLtTcm1D9SZImlJnt1ir/md2cXjbDaJWFBM5JDGFoqgCWjBH4d1QB7wCCZAA62RjYJsWvIjJEubS
+fZGL+T0yjWW06XyxV3bqxbYoOb8VZRzI9neWagqNdwvYkQsEjgfbKbYK7p2CNTUQ
+-----END CERTIFICATE-----
+
+SwissSign Gold CA - G2
+======================
+-----BEGIN CERTIFICATE-----
+MIIFujCCA6KgAwIBAgIJALtAHEP1Xk+wMA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNVBAYTAkNIMRUw
+EwYDVQQKEwxTd2lzc1NpZ24gQUcxHzAdBgNVBAMTFlN3aXNzU2lnbiBHb2xkIENBIC0gRzIwHhcN
+MDYxMDI1MDgzMDM1WhcNMzYxMDI1MDgzMDM1WjBFMQswCQYDVQQGEwJDSDEVMBMGA1UEChMMU3dp
+c3NTaWduIEFHMR8wHQYDVQQDExZTd2lzc1NpZ24gR29sZCBDQSAtIEcyMIICIjANBgkqhkiG9w0B
+AQEFAAOCAg8AMIICCgKCAgEAr+TufoskDhJuqVAtFkQ7kpJcyrhdhJJCEyq8ZVeCQD5XJM1QiyUq
+t2/876LQwB8CJEoTlo8jE+YoWACjR8cGp4QjK7u9lit/VcyLwVcfDmJlD909Vopz2q5+bbqBHH5C
+jCA12UNNhPqE21Is8w4ndwtrvxEvcnifLtg+5hg3Wipy+dpikJKVyh+c6bM8K8vzARO/Ws/BtQpg
+vd21mWRTuKCWs2/iJneRjOBiEAKfNA+k1ZIzUd6+jbqEemA8atufK+ze3gE/bk3lUIbLtK/tREDF
+ylqM2tIrfKjuvqblCqoOpd8FUrdVxyJdMmqXl2MT28nbeTZ7hTpKxVKJ+STnnXepgv9VHKVxaSvR
+AiTysybUa9oEVeXBCsdtMDeQKuSeFDNeFhdVxVu1yzSJkvGdJo+hB9TGsnhQ2wwMC3wLjEHXuend
+jIj3o02yMszYF9rNt85mndT9Xv+9lz4pded+p2JYryU0pUHHPbwNUMoDAw8IWh+Vc3hiv69yFGkO
+peUDDniOJihC8AcLYiAQZzlG+qkDzAQ4embvIIO1jEpWjpEA/I5cgt6IoMPiaG59je883WX0XaxR
+7ySArqpWl2/5rX3aYT+YdzylkbYcjCbaZaIJbcHiVOO5ykxMgI93e2CaHt+28kgeDrpOVG2Y4OGi
+GqJ3UM/EY5LsRxmd6+ZrzsECAwEAAaOBrDCBqTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUw
+AwEB/zAdBgNVHQ4EFgQUWyV7lqRlUX64OfPAeGZe6Drn8O4wHwYDVR0jBBgwFoAUWyV7lqRlUX64
+OfPAeGZe6Drn8O4wRgYDVR0gBD8wPTA7BglghXQBWQECAQEwLjAsBggrBgEFBQcCARYgaHR0cDov
+L3JlcG9zaXRvcnkuc3dpc3NzaWduLmNvbS8wDQYJKoZIhvcNAQEFBQADggIBACe645R88a7A3hfm
+5djV9VSwg/S7zV4Fe0+fdWavPOhWfvxyeDgD2StiGwC5+OlgzczOUYrHUDFu4Up+GC9pWbY9ZIEr
+44OE5iKHjn3g7gKZYbge9LgriBIWhMIxkziWMaa5O1M/wySTVltpkuzFwbs4AOPsF6m43Md8AYOf
+Mke6UiI0HTJ6CVanfCU2qT1L2sCCbwq7EsiHSycR+R4tx5M/nttfJmtS2S6K8RTGRI0Vqbe/vd6m
+Gu6uLftIdxf+u+yvGPUqUfA5hJeVbG4bwyvEdGB5JbAKJ9/fXtI5z0V9QkvfsywexcZdylU6oJxp
+mo/a77KwPJ+HbBIrZXAVUjEaJM9vMSNQH4xPjyPDdEFjHFWoFN0+4FFQz/EbMFYOkrCChdiDyyJk
+vC24JdVUorgG6q2SpCSgwYa1ShNqR88uC1aVVMvOmttqtKay20EIhid392qgQmwLOM7XdVAyksLf
+KzAiSNDVQTglXaTpXZ/GlHXQRf0wl0OPkKsKx4ZzYEppLd6leNcG2mqeSz53OiATIgHQv2ieY2Br
+NU0LbbqhPcCT4H8js1WtciVORvnSFu+wZMEBnunKoGqYDs/YYPIvSbjkQuE4NRb0yG5P94FW6Lqj
+viOvrv1vA+ACOzB2+httQc8Bsem4yWb02ybzOqR08kkkW8mw0FfB+j564ZfJ
+-----END CERTIFICATE-----
+
+SwissSign Silver CA - G2
+========================
+-----BEGIN CERTIFICATE-----
+MIIFvTCCA6WgAwIBAgIITxvUL1S7L0swDQYJKoZIhvcNAQEFBQAwRzELMAkGA1UEBhMCQ0gxFTAT
+BgNVBAoTDFN3aXNzU2lnbiBBRzEhMB8GA1UEAxMYU3dpc3NTaWduIFNpbHZlciBDQSAtIEcyMB4X
+DTA2MTAyNTA4MzI0NloXDTM2MTAyNTA4MzI0NlowRzELMAkGA1UEBhMCQ0gxFTATBgNVBAoTDFN3
+aXNzU2lnbiBBRzEhMB8GA1UEAxMYU3dpc3NTaWduIFNpbHZlciBDQSAtIEcyMIICIjANBgkqhkiG
+9w0BAQEFAAOCAg8AMIICCgKCAgEAxPGHf9N4Mfc4yfjDmUO8x/e8N+dOcbpLj6VzHVxumK4DV644
+N0MvFz0fyM5oEMF4rhkDKxD6LHmD9ui5aLlV8gREpzn5/ASLHvGiTSf5YXu6t+WiE7brYT7QbNHm
++/pe7R20nqA1W6GSy/BJkv6FCgU+5tkL4k+73JU3/JHpMjUi0R86TieFnbAVlDLaYQ1HTWBCrpJH
+6INaUFjpiou5XaHc3ZlKHzZnu0jkg7Y360g6rw9njxcH6ATK72oxh9TAtvmUcXtnZLi2kUpCe2Uu
+MGoM9ZDulebyzYLs2aFK7PayS+VFheZteJMELpyCbTapxDFkH4aDCyr0NQp4yVXPQbBH6TCfmb5h
+qAaEuSh6XzjZG6k4sIN/c8HDO0gqgg8hm7jMqDXDhBuDsz6+pJVpATqJAHgE2cn0mRmrVn5bi4Y5
+FZGkECwJMoBgs5PAKrYYC51+jUnyEEp/+dVGLxmSo5mnJqy7jDzmDrxHB9xzUfFwZC8I+bRHHTBs
+ROopN4WSaGa8gzj+ezku01DwH/teYLappvonQfGbGHLy9YR0SslnxFSuSGTfjNFusB3hB48IHpmc
+celM2KX3RxIfdNFRnobzwqIjQAtz20um53MGjMGg6cFZrEb65i/4z3GcRm25xBWNOHkDRUjvxF3X
+CO6HOSKGsg0PWEP3calILv3q1h8CAwEAAaOBrDCBqTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/
+BAUwAwEB/zAdBgNVHQ4EFgQUF6DNweRBtjpbO8tFnb0cwpj6hlgwHwYDVR0jBBgwFoAUF6DNweRB
+tjpbO8tFnb0cwpj6hlgwRgYDVR0gBD8wPTA7BglghXQBWQEDAQEwLjAsBggrBgEFBQcCARYgaHR0
+cDovL3JlcG9zaXRvcnkuc3dpc3NzaWduLmNvbS8wDQYJKoZIhvcNAQEFBQADggIBAHPGgeAn0i0P
+4JUw4ppBf1AsX19iYamGamkYDHRJ1l2E6kFSGG9YrVBWIGrGvShpWJHckRE1qTodvBqlYJ7YH39F
+kWnZfrt4csEGDyrOj4VwYaygzQu4OSlWhDJOhrs9xCrZ1x9y7v5RoSJBsXECYxqCsGKrXlcSH9/L
+3XWgwF15kIwb4FDm3jH+mHtwX6WQ2K34ArZv02DdQEsixT2tOnqfGhpHkXkzuoLcMmkDlm4fS/Bx
+/uNncqCxv1yL5PqZIseEuRuNI5c/7SXgz2W79WEE790eslpBIlqhn10s6FvJbakMDHiqYMZWjwFa
+DGi8aRl5xB9+lwW/xekkUV7U1UtT7dkjWjYDZaPBA61BMPNGG4WQr2W11bHkFlt4dR2Xem1ZqSqP
+e97Dh4kQmUlzeMg9vVE1dCrV8X5pGyq7O70luJpaPXJhkGaH7gzWTdQRdAtq/gsD/KNVV4n+Ssuu
+WxcFyPKNIzFTONItaj+CuY0IavdeQXRuwxF+B6wpYJE/OMpXEA29MC/HpeZBoNquBYeaoKRlbEwJ
+DIm6uNO5wJOKMPqN5ZprFQFOZ6raYlY+hAhm0sQ2fac+EPyI4NSA5QC9qvNOBqN6avlicuMJT+ub
+DgEj8Z+7fNzcbBGXJbLytGMU0gYqZ4yD9c7qB9iaah7s5Aq7KkzrCWA5zspi2C5u
+-----END CERTIFICATE-----
+
+GeoTrust Primary Certification Authority
+========================================
+-----BEGIN CERTIFICATE-----
+MIIDfDCCAmSgAwIBAgIQGKy1av1pthU6Y2yv2vrEoTANBgkqhkiG9w0BAQUFADBYMQswCQYDVQQG
+EwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjExMC8GA1UEAxMoR2VvVHJ1c3QgUHJpbWFyeSBD
+ZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wNjExMjcwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMFgx
+CzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMTEwLwYDVQQDEyhHZW9UcnVzdCBQ
+cmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEAvrgVe//UfH1nrYNke8hCUy3f9oQIIGHWAVlqnEQRr+92/ZV+zmEwu3qDXwK9AWbK7hWN
+b6EwnL2hhZ6UOvNWiAAxz9juapYC2e0DjPt1befquFUWBRaa9OBesYjAZIVcFU2Ix7e64HXprQU9
+nceJSOC7KMgD4TCTZF5SwFlwIjVXiIrxlQqD17wxcwE07e9GceBrAqg1cmuXm2bgyxx5X9gaBGge
+RwLmnWDiNpcB3841kt++Z8dtd1k7j53WkBWUvEI0EME5+bEnPn7WinXFsq+W06Lem+SYvn3h6YGt
+tm/81w7a4DSwDRp35+MImO9Y+pyEtzavwt+s0vQQBnBxNQIDAQABo0IwQDAPBgNVHRMBAf8EBTAD
+AQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQULNVQQZcVi/CPNmFbSvtr2ZnJM5IwDQYJKoZI
+hvcNAQEFBQADggEBAFpwfyzdtzRP9YZRqSa+S7iq8XEN3GHHoOo0Hnp3DwQ16CePbJC/kRYkRj5K
+Ts4rFtULUh38H2eiAkUxT87z+gOneZ1TatnaYzr4gNfTmeGl4b7UVXGYNTq+k+qurUKykG/g/CFN
+NWMziUnWm07Kx+dOCQD32sfvmWKZd7aVIl6KoKv0uHiYyjgZmclynnjNS6yvGaBzEi38wkG6gZHa
+Floxt/m0cYASSJlyc1pZU8FjUjPtp8nSOQJw+uCxQmYpqptR7TBUIhRf2asdweSU8Pj1K/fqynhG
+1riR/aYNKxoUAT6A8EKglQdebc3MS6RFjasS6LPeWuWgfOgPIh1a6Vk=
+-----END CERTIFICATE-----
+
+thawte Primary Root CA
+======================
+-----BEGIN CERTIFICATE-----
+MIIEIDCCAwigAwIBAgIQNE7VVyDV7exJ9C/ON9srbTANBgkqhkiG9w0BAQUFADCBqTELMAkGA1UE
+BhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2
+aWNlcyBEaXZpc2lvbjE4MDYGA1UECxMvKGMpIDIwMDYgdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhv
+cml6ZWQgdXNlIG9ubHkxHzAdBgNVBAMTFnRoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EwHhcNMDYxMTE3
+MDAwMDAwWhcNMzYwNzE2MjM1OTU5WjCBqTELMAkGA1UEBhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwg
+SW5jLjEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjE4MDYGA1UECxMv
+KGMpIDIwMDYgdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxHzAdBgNVBAMT
+FnRoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCs
+oPD7gFnUnMekz52hWXMJEEUMDSxuaPFsW0hoSVk3/AszGcJ3f8wQLZU0HObrTQmnHNK4yZc2AreJ
+1CRfBsDMRJSUjQJib+ta3RGNKJpchJAQeg29dGYvajig4tVUROsdB58Hum/u6f1OCyn1PoSgAfGc
+q/gcfomk6KHYcWUNo1F77rzSImANuVud37r8UVsLr5iy6S7pBOhih94ryNdOwUxkHt3Ph1i6Sk/K
+aAcdHJ1KxtUvkcx8cXIcxcBn6zL9yZJclNqFwJu/U30rCfSMnZEfl2pSy94JNqR32HuHUETVPm4p
+afs5SSYeCaWAe0At6+gnhcn+Yf1+5nyXHdWdAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYD
+VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBR7W0XPr87Lev0xkhpqtvNG61dIUDANBgkqhkiG9w0BAQUF
+AAOCAQEAeRHAS7ORtvzw6WfUDW5FvlXok9LOAz/t2iWwHVfLHjp2oEzsUHboZHIMpKnxuIvW1oeE
+uzLlQRHAd9mzYJ3rG9XRbkREqaYB7FViHXe4XI5ISXycO1cRrK1zN44veFyQaEfZYGDm/Ac9IiAX
+xPcW6cTYcvnIc3zfFi8VqT79aie2oetaupgf1eNNZAqdE8hhuvU5HIe6uL17In/2/qxAeeWsEG89
+jxt5dovEN7MhGITlNgDrYyCZuen+MwS7QcjBAvlEYyCegc5C09Y/LHbTY5xZ3Y+m4Q6gLkH3LpVH
+z7z9M/P2C2F+fpErgUfCJzDupxBdN49cOSvkBPB7jVaMaA==
+-----END CERTIFICATE-----
+
+VeriSign Class 3 Public Primary Certification Authority - G5
+============================================================
+-----BEGIN CERTIFICATE-----
+MIIE0zCCA7ugAwIBAgIQGNrRniZ96LtKIVjNzGs7SjANBgkqhkiG9w0BAQUFADCByjELMAkGA1UE
+BhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBO
+ZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVk
+IHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRp
+ZmljYXRpb24gQXV0aG9yaXR5IC0gRzUwHhcNMDYxMTA4MDAwMDAwWhcNMzYwNzE2MjM1OTU5WjCB
+yjELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2ln
+biBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJpU2lnbiwgSW5jLiAtIEZvciBh
+dXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmlt
+YXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQCvJAgIKXo1nmAMqudLO07cfLw8RRy7K+D+KQL5VwijZIUVJ/XxrcgxiV0i6CqqpkKz
+j/i5Vbext0uz/o9+B1fs70PbZmIVYc9gDaTY3vjgw2IIPVQT60nKWVSFJuUrjxuf6/WhkcIzSdhD
+Y2pSS9KP6HBRTdGJaXvHcPaz3BJ023tdS1bTlr8Vd6Gw9KIl8q8ckmcY5fQGBO+QueQA5N06tRn/
+Arr0PO7gi+s3i+z016zy9vA9r911kTMZHRxAy3QkGSGT2RT+rCpSx4/VBEnkjWNHiDxpg8v+R70r
+fk/Fla4OndTRQ8Bnc+MUCH7lP59zuDMKz10/NIeWiu5T6CUVAgMBAAGjgbIwga8wDwYDVR0TAQH/
+BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwbQYIKwYBBQUHAQwEYTBfoV2gWzBZMFcwVRYJaW1hZ2Uv
+Z2lmMCEwHzAHBgUrDgMCGgQUj+XTGoasjY5rw8+AatRIGCx7GS4wJRYjaHR0cDovL2xvZ28udmVy
+aXNpZ24uY29tL3ZzbG9nby5naWYwHQYDVR0OBBYEFH/TZafC3ey78DAJ80M5+gKvMzEzMA0GCSqG
+SIb3DQEBBQUAA4IBAQCTJEowX2LP2BqYLz3q3JktvXf2pXkiOOzEp6B4Eq1iDkVwZMXnl2YtmAl+
+X6/WzChl8gGqCBpH3vn5fJJaCGkgDdk+bW48DW7Y5gaRQBi5+MHt39tBquCWIMnNZBU4gcmU7qKE
+KQsTb47bDN0lAtukixlE0kF6BWlKWE9gyn6CagsCqiUXObXbf+eEZSqVir2G3l6BFoMtEMze/aiC
+Km0oHw0LxOXnGiYZ4fQRbxC1lfznQgUy286dUV4otp6F01vvpX1FQHKOtw5rDgb7MzVIcbidJ4vE
+ZV8NhnacRHr2lVz2XTIIM6RUthg/aFzyQkqFOFSDX9HoLPKsEdao7WNq
+-----END CERTIFICATE-----
+
+SecureTrust CA
+==============
+-----BEGIN CERTIFICATE-----
+MIIDuDCCAqCgAwIBAgIQDPCOXAgWpa1Cf/DrJxhZ0DANBgkqhkiG9w0BAQUFADBIMQswCQYDVQQG
+EwJVUzEgMB4GA1UEChMXU2VjdXJlVHJ1c3QgQ29ycG9yYXRpb24xFzAVBgNVBAMTDlNlY3VyZVRy
+dXN0IENBMB4XDTA2MTEwNzE5MzExOFoXDTI5MTIzMTE5NDA1NVowSDELMAkGA1UEBhMCVVMxIDAe
+BgNVBAoTF1NlY3VyZVRydXN0IENvcnBvcmF0aW9uMRcwFQYDVQQDEw5TZWN1cmVUcnVzdCBDQTCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKukgeWVzfX2FI7CT8rU4niVWJxB4Q2ZQCQX
+OZEzZum+4YOvYlyJ0fwkW2Gz4BERQRwdbvC4u/jep4G6pkjGnx29vo6pQT64lO0pGtSO0gMdA+9t
+DWccV9cGrcrI9f4Or2YlSASWC12juhbDCE/RRvgUXPLIXgGZbf2IzIaowW8xQmxSPmjL8xk037uH
+GFaAJsTQ3MBv396gwpEWoGQRS0S8Hvbn+mPeZqx2pHGj7DaUaHp3pLHnDi+BeuK1cobvomuL8A/b
+01k/unK8RCSc43Oz969XL0Imnal0ugBS8kvNU3xHCzaFDmapCJcWNFfBZveA4+1wVMeT4C4oFVmH
+ursCAwEAAaOBnTCBmjATBgkrBgEEAYI3FAIEBh4EAEMAQTALBgNVHQ8EBAMCAYYwDwYDVR0TAQH/
+BAUwAwEB/zAdBgNVHQ4EFgQUQjK2FvoE/f5dS3rD/fdMQB1aQ68wNAYDVR0fBC0wKzApoCegJYYj
+aHR0cDovL2NybC5zZWN1cmV0cnVzdC5jb20vU1RDQS5jcmwwEAYJKwYBBAGCNxUBBAMCAQAwDQYJ
+KoZIhvcNAQEFBQADggEBADDtT0rhWDpSclu1pqNlGKa7UTt36Z3q059c4EVlew3KW+JwULKUBRSu
+SceNQQcSc5R+DCMh/bwQf2AQWnL1mA6s7Ll/3XpvXdMc9P+IBWlCqQVxyLesJugutIxq/3HcuLHf
+mbx8IVQr5Fiiu1cprp6poxkmD5kuCLDv/WnPmRoJjeOnnyvJNjR7JLN4TJUXpAYmHrZkUjZfYGfZ
+nMUFdAvnZyPSCPyI6a6Lf+Ew9Dd+/cYy2i2eRDAwbO4H3tI0/NL/QPZL9GZGBlSm8jIKYyYwa5vR
+3ItHuuG51WLQoqD0ZwV4KWMabwTW+MZMo5qxN7SN5ShLHZ4swrhovO0C7jE=
+-----END CERTIFICATE-----
+
+Secure Global CA
+================
+-----BEGIN CERTIFICATE-----
+MIIDvDCCAqSgAwIBAgIQB1YipOjUiolN9BPI8PjqpTANBgkqhkiG9w0BAQUFADBKMQswCQYDVQQG
+EwJVUzEgMB4GA1UEChMXU2VjdXJlVHJ1c3QgQ29ycG9yYXRpb24xGTAXBgNVBAMTEFNlY3VyZSBH
+bG9iYWwgQ0EwHhcNMDYxMTA3MTk0MjI4WhcNMjkxMjMxMTk1MjA2WjBKMQswCQYDVQQGEwJVUzEg
+MB4GA1UEChMXU2VjdXJlVHJ1c3QgQ29ycG9yYXRpb24xGTAXBgNVBAMTEFNlY3VyZSBHbG9iYWwg
+Q0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvNS7YrGxVaQZx5RNoJLNP2MwhR/jx
+YDiJiQPpvepeRlMJ3Fz1Wuj3RSoC6zFh1ykzTM7HfAo3fg+6MpjhHZevj8fcyTiW89sa/FHtaMbQ
+bqR8JNGuQsiWUGMu4P51/pinX0kuleM5M2SOHqRfkNJnPLLZ/kG5VacJjnIFHovdRIWCQtBJwB1g
+8NEXLJXr9qXBkqPFwqcIYA1gBBCWeZ4WNOaptvolRTnIHmX5k/Wq8VLcmZg9pYYaDDUz+kulBAYV
+HDGA76oYa8J719rO+TMg1fW9ajMtgQT7sFzUnKPiXB3jqUJ1XnvUd+85VLrJChgbEplJL4hL/VBi
+0XPnj3pDAgMBAAGjgZ0wgZowEwYJKwYBBAGCNxQCBAYeBABDAEEwCwYDVR0PBAQDAgGGMA8GA1Ud
+EwEB/wQFMAMBAf8wHQYDVR0OBBYEFK9EBMJBfkiD2045AuzshHrmzsmkMDQGA1UdHwQtMCswKaAn
+oCWGI2h0dHA6Ly9jcmwuc2VjdXJldHJ1c3QuY29tL1NHQ0EuY3JsMBAGCSsGAQQBgjcVAQQDAgEA
+MA0GCSqGSIb3DQEBBQUAA4IBAQBjGghAfaReUw132HquHw0LURYD7xh8yOOvaliTFGCRsoTciE6+
+OYo68+aCiV0BN7OrJKQVDpI1WkpEXk5X+nXOH0jOZvQ8QCaSmGwb7iRGDBezUqXbpZGRzzfTb+cn
+CDpOGR86p1hcF895P4vkp9MmI50mD1hp/Ed+stCNi5O/KU9DaXR2Z0vPB4zmAve14bRDtUstFJ/5
+3CYNv6ZHdAbYiNE6KTCEztI5gGIbqMdXSbxqVVFnFUq+NQfk1XWYN3kwFNspnWzFacxHVaIw98xc
+f8LDmBxrThaA63p4ZUWiABqvDA1VZDRIuJK58bRQKfJPIx/abKwfROHdI3hRW8cW
+-----END CERTIFICATE-----
+
+COMODO Certification Authority
+==============================
+-----BEGIN CERTIFICATE-----
+MIIEHTCCAwWgAwIBAgIQToEtioJl4AsC7j41AkblPTANBgkqhkiG9w0BAQUFADCBgTELMAkGA1UE
+BhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgG
+A1UEChMRQ09NT0RPIENBIExpbWl0ZWQxJzAlBgNVBAMTHkNPTU9ETyBDZXJ0aWZpY2F0aW9uIEF1
+dGhvcml0eTAeFw0wNjEyMDEwMDAwMDBaFw0yOTEyMzEyMzU5NTlaMIGBMQswCQYDVQQGEwJHQjEb
+MBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHEwdTYWxmb3JkMRowGAYDVQQKExFD
+T01PRE8gQ0EgTGltaXRlZDEnMCUGA1UEAxMeQ09NT0RPIENlcnRpZmljYXRpb24gQXV0aG9yaXR5
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0ECLi3LjkRv3UcEbVASY06m/weaKXTuH
++7uIzg3jLz8GlvCiKVCZrts7oVewdFFxze1CkU1B/qnI2GqGd0S7WWaXUF601CxwRM/aN5VCaTww
+xHGzUvAhTaHYujl8HJ6jJJ3ygxaYqhZ8Q5sVW7euNJH+1GImGEaaP+vB+fGQV+useg2L23IwambV
+4EajcNxo2f8ESIl33rXp+2dtQem8Ob0y2WIC8bGoPW43nOIv4tOiJovGuFVDiOEjPqXSJDlqR6sA
+1KGzqSX+DT+nHbrTUcELpNqsOO9VUCQFZUaTNE8tja3G1CEZ0o7KBWFxB3NH5YoZEr0ETc5OnKVI
+rLsm9wIDAQABo4GOMIGLMB0GA1UdDgQWBBQLWOWLxkwVN6RAqTCpIb5HNlpW/zAOBgNVHQ8BAf8E
+BAMCAQYwDwYDVR0TAQH/BAUwAwEB/zBJBgNVHR8EQjBAMD6gPKA6hjhodHRwOi8vY3JsLmNvbW9k
+b2NhLmNvbS9DT01PRE9DZXJ0aWZpY2F0aW9uQXV0aG9yaXR5LmNybDANBgkqhkiG9w0BAQUFAAOC
+AQEAPpiem/Yb6dc5t3iuHXIYSdOH5EOC6z/JqvWote9VfCFSZfnVDeFs9D6Mk3ORLgLETgdxb8CP
+OGEIqB6BCsAvIC9Bi5HcSEW88cbeunZrM8gALTFGTO3nnc+IlP8zwFboJIYmuNg4ON8qa90SzMc/
+RxdMosIGlgnW2/4/PEZB31jiVg88O8EckzXZOFKs7sjsLjBOlDW0JB9LeGna8gI4zJVSk/BwJVmc
+IGfE7vmLV2H0knZ9P4SNVbfo5azV8fUZVqZa+5Acr5Pr5RzUZ5ddBA6+C4OmF4O5MBKgxTMVBbkN
++8cFduPYSo38NBejxiEovjBFMR7HeL5YYTisO+IBZQ==
+-----END CERTIFICATE-----
+
+Network Solutions Certificate Authority
+=======================================
+-----BEGIN CERTIFICATE-----
+MIID5jCCAs6gAwIBAgIQV8szb8JcFuZHFhfjkDFo4DANBgkqhkiG9w0BAQUFADBiMQswCQYDVQQG
+EwJVUzEhMB8GA1UEChMYTmV0d29yayBTb2x1dGlvbnMgTC5MLkMuMTAwLgYDVQQDEydOZXR3b3Jr
+IFNvbHV0aW9ucyBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwHhcNMDYxMjAxMDAwMDAwWhcNMjkxMjMx
+MjM1OTU5WjBiMQswCQYDVQQGEwJVUzEhMB8GA1UEChMYTmV0d29yayBTb2x1dGlvbnMgTC5MLkMu
+MTAwLgYDVQQDEydOZXR3b3JrIFNvbHV0aW9ucyBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDkvH6SMG3G2I4rC7xGzuAnlt7e+foS0zwzc7MEL7xx
+jOWftiJgPl9dzgn/ggwbmlFQGiaJ3dVhXRncEg8tCqJDXRfQNJIg6nPPOCwGJgl6cvf6UDL4wpPT
+aaIjzkGxzOTVHzbRijr4jGPiFFlp7Q3Tf2vouAPlT2rlmGNpSAW+Lv8ztumXWWn4Zxmuk2GWRBXT
+crA/vGp97Eh/jcOrqnErU2lBUzS1sLnFBgrEsEX1QV1uiUV7PTsmjHTC5dLRfbIR1PtYMiKagMnc
+/Qzpf14Dl847ABSHJ3A4qY5usyd2mFHgBeMhqxrVhSI8KbWaFsWAqPS7azCPL0YCorEMIuDTAgMB
+AAGjgZcwgZQwHQYDVR0OBBYEFCEwyfsA106Y2oeqKtCnLrFAMadMMA4GA1UdDwEB/wQEAwIBBjAP
+BgNVHRMBAf8EBTADAQH/MFIGA1UdHwRLMEkwR6BFoEOGQWh0dHA6Ly9jcmwubmV0c29sc3NsLmNv
+bS9OZXR3b3JrU29sdXRpb25zQ2VydGlmaWNhdGVBdXRob3JpdHkuY3JsMA0GCSqGSIb3DQEBBQUA
+A4IBAQC7rkvnt1frf6ott3NHhWrB5KUd5Oc86fRZZXe1eltajSU24HqXLjjAV2CDmAaDn7l2em5Q
+4LqILPxFzBiwmZVRDuwduIj/h1AcgsLj4DKAv6ALR8jDMe+ZZzKATxcheQxpXN5eNK4CtSbqUN9/
+GGUsyfJj4akH/nxxH2szJGoeBfcFaMBqEssuXmHLrijTfsK0ZpEmXzwuJF/LWA/rKOyvEZbz3Htv
+wKeI8lN3s2Berq4o2jUsbzRF0ybh3uxbTydrFny9RAQYgrOJeRcQcT16ohZO9QHNpGxlaKFJdlxD
+ydi8NmdspZS11My5vWo1ViHe2MPr+8ukYEywVaCge1ey
+-----END CERTIFICATE-----
+
+COMODO ECC Certification Authority
+==================================
+-----BEGIN CERTIFICATE-----
+MIICiTCCAg+gAwIBAgIQH0evqmIAcFBUTAGem2OZKjAKBggqhkjOPQQDAzCBhTELMAkGA1UEBhMC
+R0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UE
+ChMRQ09NT0RPIENBIExpbWl0ZWQxKzApBgNVBAMTIkNPTU9ETyBFQ0MgQ2VydGlmaWNhdGlvbiBB
+dXRob3JpdHkwHhcNMDgwMzA2MDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCBhTELMAkGA1UEBhMCR0Ix
+GzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UEChMR
+Q09NT0RPIENBIExpbWl0ZWQxKzApBgNVBAMTIkNPTU9ETyBFQ0MgQ2VydGlmaWNhdGlvbiBBdXRo
+b3JpdHkwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAQDR3svdcmCFYX7deSRFtSrYpn1PlILBs5BAH+X
+4QokPB0BBO490o0JlwzgdeT6+3eKKvUDYEs2ixYjFq0JcfRK9ChQtP6IHG4/bC8vCVlbpVsLM5ni
+wz2J+Wos77LTBumjQjBAMB0GA1UdDgQWBBR1cacZSBm8nZ3qQUfflMRId5nTeTAOBgNVHQ8BAf8E
+BAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAKBggqhkjOPQQDAwNoADBlAjEA7wNbeqy3eApyt4jf/7VG
+FAkK+qDmfQjGGoe9GKhzvSbKYAydzpmfz1wPMOG+FDHqAjAU9JM8SaczepBGR7NjfRObTrdvGDeA
+U/7dIOA1mjbRxwG55tzd8/8dLDoWV9mSOdY=
+-----END CERTIFICATE-----
+
+OISTE WISeKey Global Root GA CA
+===============================
+-----BEGIN CERTIFICATE-----
+MIID8TCCAtmgAwIBAgIQQT1yx/RrH4FDffHSKFTfmjANBgkqhkiG9w0BAQUFADCBijELMAkGA1UE
+BhMCQ0gxEDAOBgNVBAoTB1dJU2VLZXkxGzAZBgNVBAsTEkNvcHlyaWdodCAoYykgMjAwNTEiMCAG
+A1UECxMZT0lTVEUgRm91bmRhdGlvbiBFbmRvcnNlZDEoMCYGA1UEAxMfT0lTVEUgV0lTZUtleSBH
+bG9iYWwgUm9vdCBHQSBDQTAeFw0wNTEyMTExNjAzNDRaFw0zNzEyMTExNjA5NTFaMIGKMQswCQYD
+VQQGEwJDSDEQMA4GA1UEChMHV0lTZUtleTEbMBkGA1UECxMSQ29weXJpZ2h0IChjKSAyMDA1MSIw
+IAYDVQQLExlPSVNURSBGb3VuZGF0aW9uIEVuZG9yc2VkMSgwJgYDVQQDEx9PSVNURSBXSVNlS2V5
+IEdsb2JhbCBSb290IEdBIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAy0+zAJs9
+Nt350UlqaxBJH+zYK7LG+DKBKUOVTJoZIyEVRd7jyBxRVVuuk+g3/ytr6dTqvirdqFEr12bDYVxg
+Asj1znJ7O7jyTmUIms2kahnBAbtzptf2w93NvKSLtZlhuAGio9RN1AU9ka34tAhxZK9w8RxrfvbD
+d50kc3vkDIzh2TbhmYsFmQvtRTEJysIA2/dyoJaqlYfQjse2YXMNdmaM3Bu0Y6Kff5MTMPGhJ9vZ
+/yxViJGg4E8HsChWjBgbl0SOid3gF27nKu+POQoxhILYQBRJLnpB5Kf+42TMwVlxSywhp1t94B3R
+LoGbw9ho972WG6xwsRYUC9tguSYBBQIDAQABo1EwTzALBgNVHQ8EBAMCAYYwDwYDVR0TAQH/BAUw
+AwEB/zAdBgNVHQ4EFgQUswN+rja8sHnR3JQmthG+IbJphpQwEAYJKwYBBAGCNxUBBAMCAQAwDQYJ
+KoZIhvcNAQEFBQADggEBAEuh/wuHbrP5wUOxSPMowB0uyQlB+pQAHKSkq0lPjz0e701vvbyk9vIm
+MMkQyh2I+3QZH4VFvbBsUfk2ftv1TDI6QU9bR8/oCy22xBmddMVHxjtqD6wU2zz0c5ypBd8A3HR4
++vg1YFkCExh8vPtNsCBtQ7tgMHpnM1zFmdH4LTlSc/uMqpclXHLZCB6rTjzjgTGfA6b7wP4piFXa
+hNVQA7bihKOmNqoROgHhGEvWRGizPflTdISzRpFGlgC3gCy24eMQ4tui5yiPAZZiFj4A4xylNoEY
+okxSdsARo27mHbrjWr42U8U+dY+GaSlYU7Wcu2+fXMUY7N0v4ZjJ/L7fCg0=
+-----END CERTIFICATE-----
+
+Certigna
+========
+-----BEGIN CERTIFICATE-----
+MIIDqDCCApCgAwIBAgIJAP7c4wEPyUj/MA0GCSqGSIb3DQEBBQUAMDQxCzAJBgNVBAYTAkZSMRIw
+EAYDVQQKDAlEaGlteW90aXMxETAPBgNVBAMMCENlcnRpZ25hMB4XDTA3MDYyOTE1MTMwNVoXDTI3
+MDYyOTE1MTMwNVowNDELMAkGA1UEBhMCRlIxEjAQBgNVBAoMCURoaW15b3RpczERMA8GA1UEAwwI
+Q2VydGlnbmEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDIaPHJ1tazNHUmgh7stL7q
+XOEm7RFHYeGifBZ4QCHkYJ5ayGPhxLGWkv8YbWkj4Sti993iNi+RB7lIzw7sebYs5zRLcAglozyH
+GxnygQcPOJAZ0xH+hrTy0V4eHpbNgGzOOzGTtvKg0KmVEn2lmsxryIRWijOp5yIVUxbwzBfsV1/p
+ogqYCd7jX5xv3EjjhQsVWqa6n6xI4wmy9/Qy3l40vhx4XUJbzg4ij02Q130yGLMLLGq/jj8UEYkg
+DncUtT2UCIf3JR7VsmAA7G8qKCVuKj4YYxclPz5EIBb2JsglrgVKtOdjLPOMFlN+XPsRGgjBRmKf
+Irjxwo1p3Po6WAbfAgMBAAGjgbwwgbkwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUGu3+QTmQ
+tCRZvgHyUtVF9lo53BEwZAYDVR0jBF0wW4AUGu3+QTmQtCRZvgHyUtVF9lo53BGhOKQ2MDQxCzAJ
+BgNVBAYTAkZSMRIwEAYDVQQKDAlEaGlteW90aXMxETAPBgNVBAMMCENlcnRpZ25hggkA/tzjAQ/J
+SP8wDgYDVR0PAQH/BAQDAgEGMBEGCWCGSAGG+EIBAQQEAwIABzANBgkqhkiG9w0BAQUFAAOCAQEA
+hQMeknH2Qq/ho2Ge6/PAD/Kl1NqV5ta+aDY9fm4fTIrv0Q8hbV6lUmPOEvjvKtpv6zf+EwLHyzs+
+ImvaYS5/1HI93TDhHkxAGYwP15zRgzB7mFncfca5DClMoTOi62c6ZYTTluLtdkVwj7Ur3vkj1klu
+PBS1xp81HlDQwY9qcEQCYsuuHWhBp6pX6FOqB9IG9tUUBguRA3UsbHK1YZWaDYu5Def131TN3ubY
+1gkIl2PlwS6wt0QmwCbAr1UwnjvVNioZBPRcHv/PLLf/0P2HQBHVESO7SMAhqaQoLf0V+LBOK/Qw
+WyH8EZE0vkHve52Xdf+XlcCWWC/qu0bXu+TZLg==
+-----END CERTIFICATE-----
+
+Deutsche Telekom Root CA 2
+==========================
+-----BEGIN CERTIFICATE-----
+MIIDnzCCAoegAwIBAgIBJjANBgkqhkiG9w0BAQUFADBxMQswCQYDVQQGEwJERTEcMBoGA1UEChMT
+RGV1dHNjaGUgVGVsZWtvbSBBRzEfMB0GA1UECxMWVC1UZWxlU2VjIFRydXN0IENlbnRlcjEjMCEG
+A1UEAxMaRGV1dHNjaGUgVGVsZWtvbSBSb290IENBIDIwHhcNOTkwNzA5MTIxMTAwWhcNMTkwNzA5
+MjM1OTAwWjBxMQswCQYDVQQGEwJERTEcMBoGA1UEChMTRGV1dHNjaGUgVGVsZWtvbSBBRzEfMB0G
+A1UECxMWVC1UZWxlU2VjIFRydXN0IENlbnRlcjEjMCEGA1UEAxMaRGV1dHNjaGUgVGVsZWtvbSBS
+b290IENBIDIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCrC6M14IspFLEUha88EOQ5
+bzVdSq7d6mGNlUn0b2SjGmBmpKlAIoTZ1KXleJMOaAGtuU1cOs7TuKhCQN/Po7qCWWqSG6wcmtoI
+KyUn+WkjR/Hg6yx6m/UTAtB+NHzCnjwAWav12gz1MjwrrFDa1sPeg5TKqAyZMg4ISFZbavva4VhY
+AUlfckE8FQYBjl2tqriTtM2e66foai1SNNs671x1Udrb8zH57nGYMsRUFUQM+ZtV7a3fGAigo4aK
+Se5TBY8ZTNXeWHmb0mocQqvF1afPaA+W5OFhmHZhyJF81j4A4pFQh+GdCuatl9Idxjp9y7zaAzTV
+jlsB9WoHtxa2bkp/AgMBAAGjQjBAMB0GA1UdDgQWBBQxw3kbuvVT1xfgiXotF2wKsyudMzAPBgNV
+HRMECDAGAQH/AgEFMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOCAQEAlGRZrTlk5ynr
+E/5aw4sTV8gEJPB0d8Bg42f76Ymmg7+Wgnxu1MM9756AbrsptJh6sTtU6zkXR34ajgv8HzFZMQSy
+zhfzLMdiNlXiItiJVbSYSKpk+tYcNthEeFpaIzpXl/V6ME+un2pMSyuOoAPjPuCp1NJ70rOo4nI8
+rZ7/gFnkm0W09juwzTkZmDLl6iFhkOQxIY40sfcvNUqFENrnijchvllj4PKFiDFT1FQUhXB59C4G
+dyd1Lx+4ivn+xbrYNuSD7Odlt79jWvNGr4GUN9RBjNYj1h7P9WgbRGOiWrqnNVmh5XAFmw4jV5mU
+Cm26OWMohpLzGITY+9HPBVZkVw==
+-----END CERTIFICATE-----
+
+Cybertrust Global Root
+======================
+-----BEGIN CERTIFICATE-----
+MIIDoTCCAomgAwIBAgILBAAAAAABD4WqLUgwDQYJKoZIhvcNAQEFBQAwOzEYMBYGA1UEChMPQ3li
+ZXJ0cnVzdCwgSW5jMR8wHQYDVQQDExZDeWJlcnRydXN0IEdsb2JhbCBSb290MB4XDTA2MTIxNTA4
+MDAwMFoXDTIxMTIxNTA4MDAwMFowOzEYMBYGA1UEChMPQ3liZXJ0cnVzdCwgSW5jMR8wHQYDVQQD
+ExZDeWJlcnRydXN0IEdsb2JhbCBSb290MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
++Mi8vRRQZhP/8NN57CPytxrHjoXxEnOmGaoQ25yiZXRadz5RfVb23CO21O1fWLE3TdVJDm71aofW
+0ozSJ8bi/zafmGWgE07GKmSb1ZASzxQG9Dvj1Ci+6A74q05IlG2OlTEQXO2iLb3VOm2yHLtgwEZL
+AfVJrn5GitB0jaEMAs7u/OePuGtm839EAL9mJRQr3RAwHQeWP032a7iPt3sMpTjr3kfb1V05/Iin
+89cqdPHoWqI7n1C6poxFNcJQZZXcY4Lv3b93TZxiyWNzFtApD0mpSPCzqrdsxacwOUBdrsTiXSZT
+8M4cIwhhqJQZugRiQOwfOHB3EgZxpzAYXSUnpQIDAQABo4GlMIGiMA4GA1UdDwEB/wQEAwIBBjAP
+BgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBS2CHsNesysIEyGVjJez6tuhS1wVzA/BgNVHR8EODA2
+MDSgMqAwhi5odHRwOi8vd3d3Mi5wdWJsaWMtdHJ1c3QuY29tL2NybC9jdC9jdHJvb3QuY3JsMB8G
+A1UdIwQYMBaAFLYIew16zKwgTIZWMl7Pq26FLXBXMA0GCSqGSIb3DQEBBQUAA4IBAQBW7wojoFRO
+lZfJ+InaRcHUowAl9B8Tq7ejhVhpwjCt2BWKLePJzYFa+HMjWqd8BfP9IjsO0QbE2zZMcwSO5bAi
+5MXzLqXZI+O4Tkogp24CJJ8iYGd7ix1yCcUxXOl5n4BHPa2hCwcUPUf/A2kaDAtE52Mlp3+yybh2
+hO0j9n0Hq0V+09+zv+mKts2oomcrUtW3ZfA5TGOgkXmTUg9U3YO7n9GPp1Nzw8v/MOx8BLjYRB+T
+X3EJIrduPuocA06dGiBh+4E37F78CkWr1+cXVdCg6mCbpvbjjFspwgZgFJ0tl0ypkxWdYcQBX0jW
+WL1WMRJOEcgh4LMRkWXbtKaIOM5V
+-----END CERTIFICATE-----
+
+ePKI Root Certification Authority
+=================================
+-----BEGIN CERTIFICATE-----
+MIIFsDCCA5igAwIBAgIQFci9ZUdcr7iXAF7kBtK8nTANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQG
+EwJUVzEjMCEGA1UECgwaQ2h1bmdod2EgVGVsZWNvbSBDby4sIEx0ZC4xKjAoBgNVBAsMIWVQS0kg
+Um9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wNDEyMjAwMjMxMjdaFw0zNDEyMjAwMjMx
+MjdaMF4xCzAJBgNVBAYTAlRXMSMwIQYDVQQKDBpDaHVuZ2h3YSBUZWxlY29tIENvLiwgTHRkLjEq
+MCgGA1UECwwhZVBLSSBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIICIjANBgkqhkiG9w0B
+AQEFAAOCAg8AMIICCgKCAgEA4SUP7o3biDN1Z82tH306Tm2d0y8U82N0ywEhajfqhFAHSyZbCUNs
+IZ5qyNUD9WBpj8zwIuQf5/dqIjG3LBXy4P4AakP/h2XGtRrBp0xtInAhijHyl3SJCRImHJ7K2RKi
+lTza6We/CKBk49ZCt0Xvl/T29de1ShUCWH2YWEtgvM3XDZoTM1PRYfl61dd4s5oz9wCGzh1NlDiv
+qOx4UXCKXBCDUSH3ET00hl7lSM2XgYI1TBnsZfZrxQWh7kcT1rMhJ5QQCtkkO7q+RBNGMD+XPNjX
+12ruOzjjK9SXDrkb5wdJfzcq+Xd4z1TtW0ado4AOkUPB1ltfFLqfpo0kR0BZv3I4sjZsN/+Z0V0O
+WQqraffAsgRFelQArr5T9rXn4fg8ozHSqf4hUmTFpmfwdQcGlBSBVcYn5AGPF8Fqcde+S/uUWH1+
+ETOxQvdibBjWzwloPn9s9h6PYq2lY9sJpx8iQkEeb5mKPtf5P0B6ebClAZLSnT0IFaUQAS2zMnao
+lQ2zepr7BxB4EW/hj8e6DyUadCrlHJhBmd8hh+iVBmoKs2pHdmX2Os+PYhcZewoozRrSgx4hxyy/
+vv9haLdnG7t4TY3OZ+XkwY63I2binZB1NJipNiuKmpS5nezMirH4JYlcWrYvjB9teSSnUmjDhDXi
+Zo1jDiVN1Rmy5nk3pyKdVDECAwEAAaNqMGgwHQYDVR0OBBYEFB4M97Zn8uGSJglFwFU5Lnc/Qkqi
+MAwGA1UdEwQFMAMBAf8wOQYEZyoHAAQxMC8wLQIBADAJBgUrDgMCGgUAMAcGBWcqAwAABBRFsMLH
+ClZ87lt4DJX5GFPBphzYEDANBgkqhkiG9w0BAQUFAAOCAgEACbODU1kBPpVJufGBuvl2ICO1J2B0
+1GqZNF5sAFPZn/KmsSQHRGoqxqWOeBLoR9lYGxMqXnmbnwoqZ6YlPwZpVnPDimZI+ymBV3QGypzq
+KOg4ZyYr8dW1P2WT+DZdjo2NQCCHGervJ8A9tDkPJXtoUHRVnAxZfVo9QZQlUgjgRywVMRnVvwdV
+xrsStZf0X4OFunHB2WyBEXYKCrC/gpf36j36+uwtqSiUO1bd0lEursC9CBWMd1I0ltabrNMdjmEP
+NXubrjlpC2JgQCA2j6/7Nu4tCEoduL+bXPjqpRugc6bY+G7gMwRfaKonh+3ZwZCc7b3jajWvY9+r
+GNm65ulK6lCKD2GTHuItGeIwlDWSXQ62B68ZgI9HkFFLLk3dheLSClIKF5r8GrBQAuUBo2M3IUxE
+xJtRmREOc5wGj1QupyheRDmHVi03vYVElOEMSyycw5KFNGHLD7ibSkNS/jQ6fbjpKdx2qcgw+BRx
+gMYeNkh0IkFch4LoGHGLQYlE535YW6i4jRPpp2zDR+2zGp1iro2C6pSe3VkQw63d4k3jMdXH7Ojy
+sP6SHhYKGvzZ8/gntsm+HbRsZJB/9OTEW9c3rkIO3aQab3yIVMUWbuF6aC74Or8NpDyJO3inTmOD
+BCEIZ43ygknQW/2xzQ+DhNQ+IIX3Sj0rnP0qCglN6oH4EZw=
+-----END CERTIFICATE-----
+
+certSIGN ROOT CA
+================
+-----BEGIN CERTIFICATE-----
+MIIDODCCAiCgAwIBAgIGIAYFFnACMA0GCSqGSIb3DQEBBQUAMDsxCzAJBgNVBAYTAlJPMREwDwYD
+VQQKEwhjZXJ0U0lHTjEZMBcGA1UECxMQY2VydFNJR04gUk9PVCBDQTAeFw0wNjA3MDQxNzIwMDRa
+Fw0zMTA3MDQxNzIwMDRaMDsxCzAJBgNVBAYTAlJPMREwDwYDVQQKEwhjZXJ0U0lHTjEZMBcGA1UE
+CxMQY2VydFNJR04gUk9PVCBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALczuX7I
+JUqOtdu0KBuqV5Do0SLTZLrTk+jUrIZhQGpgV2hUhE28alQCBf/fm5oqrl0Hj0rDKH/v+yv6efHH
+rfAQUySQi2bJqIirr1qjAOm+ukbuW3N7LBeCgV5iLKECZbO9xSsAfsT8AzNXDe3i+s5dRdY4zTW2
+ssHQnIFKquSyAVwdj1+ZxLGt24gh65AIgoDzMKND5pCCrlUoSe1b16kQOA7+j0xbm0bqQfWwCHTD
+0IgztnzXdN/chNFDDnU5oSVAKOp4yw4sLjmdjItuFhwvJoIQ4uNllAoEwF73XVv4EOLQunpL+943
+AAAaWyjj0pxzPjKHmKHJUS/X3qwzs08CAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8B
+Af8EBAMCAcYwHQYDVR0OBBYEFOCMm9slSbPxfIbWskKHC9BroNnkMA0GCSqGSIb3DQEBBQUAA4IB
+AQA+0hyJLjX8+HXd5n9liPRyTMks1zJO890ZeUe9jjtbkw9QSSQTaxQGcu8J06Gh40CEyecYMnQ8
+SG4Pn0vU9x7Tk4ZkVJdjclDVVc/6IJMCopvDI5NOFlV2oHB5bc0hH88vLbwZ44gx+FkagQnIl6Z0
+x2DEW8xXjrJ1/RsCCdtZb3KTafcxQdaIOL+Hsr0Wefmq5L6IJd1hJyMctTEHBDa0GpC9oHRxUIlt
+vBTjD4au8as+x6AJzKNI0eDbZOeStc+vckNwi/nDhDwTqn6Sm1dTk/pwwpEOMfmbZ13pljheX7Nz
+TogVZ96edhBiIL5VaZVDADlN9u6wWk5JRFRYX0KD
+-----END CERTIFICATE-----
+
+GeoTrust Primary Certification Authority - G3
+=============================================
+-----BEGIN CERTIFICATE-----
+MIID/jCCAuagAwIBAgIQFaxulBmyeUtB9iepwxgPHzANBgkqhkiG9w0BAQsFADCBmDELMAkGA1UE
+BhMCVVMxFjAUBgNVBAoTDUdlb1RydXN0IEluYy4xOTA3BgNVBAsTMChjKSAyMDA4IEdlb1RydXN0
+IEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTE2MDQGA1UEAxMtR2VvVHJ1c3QgUHJpbWFy
+eSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEczMB4XDTA4MDQwMjAwMDAwMFoXDTM3MTIwMTIz
+NTk1OVowgZgxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMTkwNwYDVQQLEzAo
+YykgMjAwOCBHZW9UcnVzdCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxNjA0BgNVBAMT
+LUdlb1RydXN0IFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMzCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBANziXmJYHTNXOTIz+uvLh4yn1ErdBojqZI4xmKU4kB6Yzy5j
+K/BGvESyiaHAKAxJcCGVn2TAppMSAmUmhsalifD614SgcK9PGpc/BkTVyetyEH3kMSj7HGHmKAdE
+c5IiaacDiGydY8hS2pgn5whMcD60yRLBxWeDXTPzAxHsatBT4tG6NmCUgLthY2xbF37fQJQeqw3C
+IShwiP/WJmxsYAQlTlV+fe+/lEjetx3dcI0FX4ilm/LC7urRQEFtYjgdVgbFA0dRIBn8exALDmKu
+dlW/X3e+PkkBUz2YJQN2JFodtNuJ6nnltrM7P7pMKEF/BqxqjsHQ9gUdfeZChuOl1UcCAwEAAaNC
+MEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFMR5yo6hTgMdHNxr
+2zFblD4/MH8tMA0GCSqGSIb3DQEBCwUAA4IBAQAtxRPPVoB7eni9n64smefv2t+UXglpp+duaIy9
+cr5HqQ6XErhK8WTTOd8lNNTBzU6B8A8ExCSzNJbGpqow32hhc9f5joWJ7w5elShKKiePEI4ufIbE
+Ap7aDHdlDkQNkv39sxY2+hENHYwOB4lqKVb3cvTdFZx3NWZXqxNT2I7BQMXXExZacse3aQHEerGD
+AWh9jUGhlBjBJVz88P6DAod8DQ3PLghcSkANPuyBYeYk28rgDi0Hsj5W3I31QYUHSJsMC8tJP33s
+t/3LjWeJGqvtux6jAAgIFyqCXDFdRootD4abdNlF+9RAsXqqaC2Gspki4cErx5z481+oghLrGREt
+-----END CERTIFICATE-----
+
+thawte Primary Root CA - G2
+===========================
+-----BEGIN CERTIFICATE-----
+MIICiDCCAg2gAwIBAgIQNfwmXNmET8k9Jj1Xm67XVjAKBggqhkjOPQQDAzCBhDELMAkGA1UEBhMC
+VVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjE4MDYGA1UECxMvKGMpIDIwMDcgdGhhd3RlLCBJbmMu
+IC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxJDAiBgNVBAMTG3RoYXd0ZSBQcmltYXJ5IFJvb3Qg
+Q0EgLSBHMjAeFw0wNzExMDUwMDAwMDBaFw0zODAxMTgyMzU5NTlaMIGEMQswCQYDVQQGEwJVUzEV
+MBMGA1UEChMMdGhhd3RlLCBJbmMuMTgwNgYDVQQLEy8oYykgMjAwNyB0aGF3dGUsIEluYy4gLSBG
+b3IgYXV0aG9yaXplZCB1c2Ugb25seTEkMCIGA1UEAxMbdGhhd3RlIFByaW1hcnkgUm9vdCBDQSAt
+IEcyMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAEotWcgnuVnfFSeIf+iha/BebfowJPDQfGAFG6DAJS
+LSKkQjnE/o/qycG+1E3/n3qe4rF8mq2nhglzh9HnmuN6papu+7qzcMBniKI11KOasf2twu8x+qi5
+8/sIxpHR+ymVo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU
+mtgAMADna3+FGO6Lts6KDPgR4bswCgYIKoZIzj0EAwMDaQAwZgIxAN344FdHW6fmCsO99YCKlzUN
+G4k8VIZ3KMqh9HneteY4sPBlcIx/AlTCv//YoT7ZzwIxAMSNlPzcU9LcnXgWHxUzI1NS41oxXZ3K
+rr0TKUQNJ1uo52icEvdYPy5yAlejj6EULg==
+-----END CERTIFICATE-----
+
+thawte Primary Root CA - G3
+===========================
+-----BEGIN CERTIFICATE-----
+MIIEKjCCAxKgAwIBAgIQYAGXt0an6rS0mtZLL/eQ+zANBgkqhkiG9w0BAQsFADCBrjELMAkGA1UE
+BhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2
+aWNlcyBEaXZpc2lvbjE4MDYGA1UECxMvKGMpIDIwMDggdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhv
+cml6ZWQgdXNlIG9ubHkxJDAiBgNVBAMTG3RoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EgLSBHMzAeFw0w
+ODA0MDIwMDAwMDBaFw0zNzEyMDEyMzU5NTlaMIGuMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMdGhh
+d3RlLCBJbmMuMSgwJgYDVQQLEx9DZXJ0aWZpY2F0aW9uIFNlcnZpY2VzIERpdmlzaW9uMTgwNgYD
+VQQLEy8oYykgMjAwOCB0aGF3dGUsIEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTEkMCIG
+A1UEAxMbdGhhd3RlIFByaW1hcnkgUm9vdCBDQSAtIEczMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAsr8nLPvb2FvdeHsbnndmgcs+vHyu86YnmjSjaDFxODNi5PNxZnmxqWWjpYvVj2At
+P0LMqmsywCPLLEHd5N/8YZzic7IilRFDGF/Eth9XbAoFWCLINkw6fKXRz4aviKdEAhN0cXMKQlkC
++BsUa0Lfb1+6a4KinVvnSr0eAXLbS3ToO39/fR8EtCab4LRarEc9VbjXsCZSKAExQGbY2SS99irY
+7CFJXJv2eul/VTV+lmuNk5Mny5K76qxAwJ/C+IDPXfRa3M50hqY+bAtTyr2SzhkGcuYMXDhpxwTW
+vGzOW/b3aJzcJRVIiKHpqfiYnODz1TEoYRFsZ5aNOZnLwkUkOQIDAQABo0IwQDAPBgNVHRMBAf8E
+BTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUrWyqlGCc7eT/+j4KdCtjA/e2Wb8wDQYJ
+KoZIhvcNAQELBQADggEBABpA2JVlrAmSicY59BDlqQ5mU1143vokkbvnRFHfxhY0Cu9qRFHqKweK
+A3rD6z8KLFIWoCtDuSWQP3CpMyVtRRooOyfPqsMpQhvfO0zAMzRbQYi/aytlryjvsvXDqmbOe1bu
+t8jLZ8HJnBoYuMTDSQPxYA5QzUbF83d597YV4Djbxy8ooAw/dyZ02SUS2jHaGh7cKUGRIjxpp7sC
+8rZcJwOJ9Abqm+RyguOhCcHpABnTPtRwa7pxpqpYrvS76Wy274fMm7v/OeZWYdMKp8RcTGB7BXcm
+er/YB1IsYvdwY9k5vG8cwnncdimvzsUsZAReiDZuMdRAGmI0Nj81Aa6sY6A=
+-----END CERTIFICATE-----
+
+GeoTrust Primary Certification Authority - G2
+=============================================
+-----BEGIN CERTIFICATE-----
+MIICrjCCAjWgAwIBAgIQPLL0SAoA4v7rJDteYD7DazAKBggqhkjOPQQDAzCBmDELMAkGA1UEBhMC
+VVMxFjAUBgNVBAoTDUdlb1RydXN0IEluYy4xOTA3BgNVBAsTMChjKSAyMDA3IEdlb1RydXN0IElu
+Yy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTE2MDQGA1UEAxMtR2VvVHJ1c3QgUHJpbWFyeSBD
+ZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEcyMB4XDTA3MTEwNTAwMDAwMFoXDTM4MDExODIzNTk1
+OVowgZgxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMTkwNwYDVQQLEzAoYykg
+MjAwNyBHZW9UcnVzdCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxNjA0BgNVBAMTLUdl
+b1RydXN0IFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMjB2MBAGByqGSM49AgEG
+BSuBBAAiA2IABBWx6P0DFUPlrOuHNxFi79KDNlJ9RVcLSo17VDs6bl8VAsBQps8lL33KSLjHUGMc
+KiEIfJo22Av+0SbFWDEwKCXzXV2juLaltJLtbCyf691DiaI8S0iRHVDsJt/WYC69IaNCMEAwDwYD
+VR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFBVfNVdRVfslsq0DafwBo/q+
+EVXVMAoGCCqGSM49BAMDA2cAMGQCMGSWWaboCd6LuvpaiIjwH5HTRqjySkwCY/tsXzjbLkGTqQ7m
+ndwxHLKgpxgceeHHNgIwOlavmnRs9vuD4DPTCF+hnMJbn0bWtsuRBmOiBuczrD6ogRLQy7rQkgu2
+npaqBA+K
+-----END CERTIFICATE-----
+
+VeriSign Universal Root Certification Authority
+===============================================
+-----BEGIN CERTIFICATE-----
+MIIEuTCCA6GgAwIBAgIQQBrEZCGzEyEDDrvkEhrFHTANBgkqhkiG9w0BAQsFADCBvTELMAkGA1UE
+BhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBO
+ZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwOCBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVk
+IHVzZSBvbmx5MTgwNgYDVQQDEy9WZXJpU2lnbiBVbml2ZXJzYWwgUm9vdCBDZXJ0aWZpY2F0aW9u
+IEF1dGhvcml0eTAeFw0wODA0MDIwMDAwMDBaFw0zNzEyMDEyMzU5NTlaMIG9MQswCQYDVQQGEwJV
+UzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRydXN0IE5ldHdv
+cmsxOjA4BgNVBAsTMShjKSAyMDA4IFZlcmlTaWduLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNl
+IG9ubHkxODA2BgNVBAMTL1ZlcmlTaWduIFVuaXZlcnNhbCBSb290IENlcnRpZmljYXRpb24gQXV0
+aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx2E3XrEBNNti1xWb/1hajCMj
+1mCOkdeQmIN65lgZOIzF9uVkhbSicfvtvbnazU0AtMgtc6XHaXGVHzk8skQHnOgO+k1KxCHfKWGP
+MiJhgsWHH26MfF8WIFFE0XBPV+rjHOPMee5Y2A7Cs0WTwCznmhcrewA3ekEzeOEz4vMQGn+HLL72
+9fdC4uW/h2KJXwBL38Xd5HVEMkE6HnFuacsLdUYI0crSK5XQz/u5QGtkjFdN/BMReYTtXlT2NJ8I
+AfMQJQYXStrxHXpma5hgZqTZ79IugvHw7wnqRMkVauIDbjPTrJ9VAMf2CGqUuV/c4DPxhGD5WycR
+tPwW8rtWaoAljQIDAQABo4GyMIGvMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMG0G
+CCsGAQUFBwEMBGEwX6FdoFswWTBXMFUWCWltYWdlL2dpZjAhMB8wBwYFKw4DAhoEFI/l0xqGrI2O
+a8PPgGrUSBgsexkuMCUWI2h0dHA6Ly9sb2dvLnZlcmlzaWduLmNvbS92c2xvZ28uZ2lmMB0GA1Ud
+DgQWBBS2d/ppSEefUxLVwuoHMnYH0ZcHGTANBgkqhkiG9w0BAQsFAAOCAQEASvj4sAPmLGd75JR3
+Y8xuTPl9Dg3cyLk1uXBPY/ok+myDjEedO2Pzmvl2MpWRsXe8rJq+seQxIcaBlVZaDrHC1LGmWazx
+Y8u4TB1ZkErvkBYoH1quEPuBUDgMbMzxPcP1Y+Oz4yHJJDnp/RVmRvQbEdBNc6N9Rvk97ahfYtTx
+P/jgdFcrGJ2BtMQo2pSXpXDrrB2+BxHw1dvd5Yzw1TKwg+ZX4o+/vqGqvz0dtdQ46tewXDpPaj+P
+wGZsY6rp2aQW9IHRlRQOfc2VNNnSj3BzgXucfr2YYdhFh5iQxeuGMMY1v/D/w1WIg0vvBZIGcfK4
+mJO37M2CYfE45k+XmCpajQ==
+-----END CERTIFICATE-----
+
+VeriSign Class 3 Public Primary Certification Authority - G4
+============================================================
+-----BEGIN CERTIFICATE-----
+MIIDhDCCAwqgAwIBAgIQL4D+I4wOIg9IZxIokYesszAKBggqhkjOPQQDAzCByjELMAkGA1UEBhMC
+VVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2lnbiBUcnVzdCBOZXR3
+b3JrMTowOAYDVQQLEzEoYykgMjAwNyBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVz
+ZSBvbmx5MUUwQwYDVQQDEzxWZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmlj
+YXRpb24gQXV0aG9yaXR5IC0gRzQwHhcNMDcxMTA1MDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCByjEL
+MAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2lnbiBU
+cnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNyBWZXJpU2lnbiwgSW5jLiAtIEZvciBhdXRo
+b3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5
+IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzQwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAASnVnp8
+Utpkmw4tXNherJI9/gHmGUo9FANL+mAnINmDiWn6VMaaGF5VKmTeBvaNSjutEDxlPZCIBIngMGGz
+rl0Bp3vefLK+ymVhAIau2o970ImtTR1ZmkGxvEeA3J5iw/mjgbIwga8wDwYDVR0TAQH/BAUwAwEB
+/zAOBgNVHQ8BAf8EBAMCAQYwbQYIKwYBBQUHAQwEYTBfoV2gWzBZMFcwVRYJaW1hZ2UvZ2lmMCEw
+HzAHBgUrDgMCGgQUj+XTGoasjY5rw8+AatRIGCx7GS4wJRYjaHR0cDovL2xvZ28udmVyaXNpZ24u
+Y29tL3ZzbG9nby5naWYwHQYDVR0OBBYEFLMWkf3upm7ktS5Jj4d4gYDs5bG1MAoGCCqGSM49BAMD
+A2gAMGUCMGYhDBgmYFo4e1ZC4Kf8NoRRkSAsdk1DPcQdhCPQrNZ8NQbOzWm9kA3bbEhCHQ6qQgIx
+AJw9SDkjOVgaFRJZap7v1VmyHVIsmXHNxynfGyphe3HR3vPA5Q06Sqotp9iGKt0uEA==
+-----END CERTIFICATE-----
+
+NetLock Arany (Class Gold) Főtanúsítvány
+========================================
+-----BEGIN CERTIFICATE-----
+MIIEFTCCAv2gAwIBAgIGSUEs5AAQMA0GCSqGSIb3DQEBCwUAMIGnMQswCQYDVQQGEwJIVTERMA8G
+A1UEBwwIQnVkYXBlc3QxFTATBgNVBAoMDE5ldExvY2sgS2Z0LjE3MDUGA1UECwwuVGFuw7pzw610
+dsOhbnlraWFkw7NrIChDZXJ0aWZpY2F0aW9uIFNlcnZpY2VzKTE1MDMGA1UEAwwsTmV0TG9jayBB
+cmFueSAoQ2xhc3MgR29sZCkgRsWRdGFuw7pzw610dsOhbnkwHhcNMDgxMjExMTUwODIxWhcNMjgx
+MjA2MTUwODIxWjCBpzELMAkGA1UEBhMCSFUxETAPBgNVBAcMCEJ1ZGFwZXN0MRUwEwYDVQQKDAxO
+ZXRMb2NrIEtmdC4xNzA1BgNVBAsMLlRhbsO6c8OtdHbDoW55a2lhZMOzayAoQ2VydGlmaWNhdGlv
+biBTZXJ2aWNlcykxNTAzBgNVBAMMLE5ldExvY2sgQXJhbnkgKENsYXNzIEdvbGQpIEbFkXRhbsO6
+c8OtdHbDoW55MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxCRec75LbRTDofTjl5Bu
+0jBFHjzuZ9lk4BqKf8owyoPjIMHj9DrTlF8afFttvzBPhCf2nx9JvMaZCpDyD/V/Q4Q3Y1GLeqVw
+/HpYzY6b7cNGbIRwXdrzAZAj/E4wqX7hJ2Pn7WQ8oLjJM2P+FpD/sLj916jAwJRDC7bVWaaeVtAk
+H3B5r9s5VA1lddkVQZQBr17s9o3x/61k/iCa11zr/qYfCGSji3ZVrR47KGAuhyXoqq8fxmRGILdw
+fzzeSNuWU7c5d+Qa4scWhHaXWy+7GRWF+GmF9ZmnqfI0p6m2pgP8b4Y9VHx2BJtr+UBdADTHLpl1
+neWIA6pN+APSQnbAGwIDAKiLo0UwQzASBgNVHRMBAf8ECDAGAQH/AgEEMA4GA1UdDwEB/wQEAwIB
+BjAdBgNVHQ4EFgQUzPpnk/C2uNClwB7zU/2MU9+D15YwDQYJKoZIhvcNAQELBQADggEBAKt/7hwW
+qZw8UQCgwBEIBaeZ5m8BiFRhbvG5GK1Krf6BQCOUL/t1fC8oS2IkgYIL9WHxHG64YTjrgfpioTta
+YtOUZcTh5m2C+C8lcLIhJsFyUR+MLMOEkMNaj7rP9KdlpeuY0fsFskZ1FSNqb4VjMIDw1Z4fKRzC
+bLBQWV2QWzuoDTDPv31/zvGdg73JRm4gpvlhUbohL3u+pRVjodSVh/GeufOJ8z2FuLjbvrW5Kfna
+NwUASZQDhETnv0Mxz3WLJdH0pmT1kvarBes96aULNmLazAZfNou2XjG4Kvte9nHfRCaexOYNkbQu
+dZWAUWpLMKawYqGT8ZvYzsRjdT9ZR7E=
+-----END CERTIFICATE-----
+
+Staat der Nederlanden Root CA - G2
+==================================
+-----BEGIN CERTIFICATE-----
+MIIFyjCCA7KgAwIBAgIEAJiWjDANBgkqhkiG9w0BAQsFADBaMQswCQYDVQQGEwJOTDEeMBwGA1UE
+CgwVU3RhYXQgZGVyIE5lZGVybGFuZGVuMSswKQYDVQQDDCJTdGFhdCBkZXIgTmVkZXJsYW5kZW4g
+Um9vdCBDQSAtIEcyMB4XDTA4MDMyNjExMTgxN1oXDTIwMDMyNTExMDMxMFowWjELMAkGA1UEBhMC
+TkwxHjAcBgNVBAoMFVN0YWF0IGRlciBOZWRlcmxhbmRlbjErMCkGA1UEAwwiU3RhYXQgZGVyIE5l
+ZGVybGFuZGVuIFJvb3QgQ0EgLSBHMjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMVZ
+5291qj5LnLW4rJ4L5PnZyqtdj7U5EILXr1HgO+EASGrP2uEGQxGZqhQlEq0i6ABtQ8SpuOUfiUtn
+vWFI7/3S4GCI5bkYYCjDdyutsDeqN95kWSpGV+RLufg3fNU254DBtvPUZ5uW6M7XxgpT0GtJlvOj
+CwV3SPcl5XCsMBQgJeN/dVrlSPhOewMHBPqCYYdu8DvEpMfQ9XQ+pV0aCPKbJdL2rAQmPlU6Yiil
+e7Iwr/g3wtG61jj99O9JMDeZJiFIhQGp5Rbn3JBV3w/oOM2ZNyFPXfUib2rFEhZgF1XyZWampzCR
+OME4HYYEhLoaJXhena/MUGDWE4dS7WMfbWV9whUYdMrhfmQpjHLYFhN9C0lK8SgbIHRrxT3dsKpI
+CT0ugpTNGmXZK4iambwYfp/ufWZ8Pr2UuIHOzZgweMFvZ9C+X+Bo7d7iscksWXiSqt8rYGPy5V65
+48r6f1CGPqI0GAwJaCgRHOThuVw+R7oyPxjMW4T182t0xHJ04eOLoEq9jWYv6q012iDTiIJh8BIi
+trzQ1aTsr1SIJSQ8p22xcik/Plemf1WvbibG/ufMQFxRRIEKeN5KzlW/HdXZt1bv8Hb/C3m1r737
+qWmRRpdogBQ2HbN/uymYNqUg+oJgYjOk7Na6B6duxc8UpufWkjTYgfX8HV2qXB72o007uPc5AgMB
+AAGjgZcwgZQwDwYDVR0TAQH/BAUwAwEB/zBSBgNVHSAESzBJMEcGBFUdIAAwPzA9BggrBgEFBQcC
+ARYxaHR0cDovL3d3dy5wa2lvdmVyaGVpZC5ubC9wb2xpY2llcy9yb290LXBvbGljeS1HMjAOBgNV
+HQ8BAf8EBAMCAQYwHQYDVR0OBBYEFJFoMocVHYnitfGsNig0jQt8YojrMA0GCSqGSIb3DQEBCwUA
+A4ICAQCoQUpnKpKBglBu4dfYszk78wIVCVBR7y29JHuIhjv5tLySCZa59sCrI2AGeYwRTlHSeYAz
++51IvuxBQ4EffkdAHOV6CMqqi3WtFMTC6GY8ggen5ieCWxjmD27ZUD6KQhgpxrRW/FYQoAUXvQwj
+f/ST7ZwaUb7dRUG/kSS0H4zpX897IZmflZ85OkYcbPnNe5yQzSipx6lVu6xiNGI1E0sUOlWDuYaN
+kqbG9AclVMwWVxJKgnjIFNkXgiYtXSAfea7+1HAWFpWD2DU5/1JddRwWxRNVz0fMdWVSSt7wsKfk
+CpYL+63C4iWEst3kvX5ZbJvw8NjnyvLplzh+ib7M+zkXYT9y2zqR2GUBGR2tUKRXCnxLvJxxcypF
+URmFzI79R6d0lR2o0a9OF7FpJsKqeFdbxU2n5Z4FF5TKsl+gSRiNNOkmbEgeqmiSBeGCc1qb3Adb
+CG19ndeNIdn8FCCqwkXfP+cAslHkwvgFuXkajDTznlvkN1trSt8sV4pAWja63XVECDdCcAz+3F4h
+oKOKwJCcaNpQ5kUQR3i2TtJlycM33+FCY7BXN0Ute4qcvwXqZVUz9zkQxSgqIXobisQk+T8VyJoV
+IPVVYpbtbZNQvOSqeK3Zywplh6ZmwcSBo3c6WB4L7oOLnR7SUqTMHW+wmG2UMbX4cQrcufx9MmDm
+66+KAQ==
+-----END CERTIFICATE-----
+
+Hongkong Post Root CA 1
+=======================
+-----BEGIN CERTIFICATE-----
+MIIDMDCCAhigAwIBAgICA+gwDQYJKoZIhvcNAQEFBQAwRzELMAkGA1UEBhMCSEsxFjAUBgNVBAoT
+DUhvbmdrb25nIFBvc3QxIDAeBgNVBAMTF0hvbmdrb25nIFBvc3QgUm9vdCBDQSAxMB4XDTAzMDUx
+NTA1MTMxNFoXDTIzMDUxNTA0NTIyOVowRzELMAkGA1UEBhMCSEsxFjAUBgNVBAoTDUhvbmdrb25n
+IFBvc3QxIDAeBgNVBAMTF0hvbmdrb25nIFBvc3QgUm9vdCBDQSAxMIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEArP84tulmAknjorThkPlAj3n54r15/gK97iSSHSL22oVyaf7XPwnU3ZG1
+ApzQjVrhVcNQhrkpJsLj2aDxaQMoIIBFIi1WpztUlVYiWR8o3x8gPW2iNr4joLFutbEnPzlTCeqr
+auh0ssJlXI6/fMN4hM2eFvz1Lk8gKgifd/PFHsSaUmYeSF7jEAaPIpjhZY4bXSNmO7ilMlHIhqqh
+qZ5/dpTCpmy3QfDVyAY45tQM4vM7TG1QjMSDJ8EThFk9nnV0ttgCXjqQesBCNnLsak3c78QA3xMY
+V18meMjWCnl3v/evt3a5pQuEF10Q6m/hq5URX208o1xNg1vysxmKgIsLhwIDAQABoyYwJDASBgNV
+HRMBAf8ECDAGAQH/AgEDMA4GA1UdDwEB/wQEAwIBxjANBgkqhkiG9w0BAQUFAAOCAQEADkbVPK7i
+h9legYsCmEEIjEy82tvuJxuC52pF7BaLT4Wg87JwvVqWuspube5Gi27nKi6Wsxkz67SfqLI37pio
+l7Yutmcn1KZJ/RyTZXaeQi/cImyaT/JaFTmxcdcrUehtHJjA2Sr0oYJ71clBoiMBdDhViw+5Lmei
+IAQ32pwL0xch4I+XeTRvhEgCIDMb5jREn5Fw9IBehEPCKdJsEhTkYY2sEJCehFC78JZvRZ+K88ps
+T/oROhUVRsPNH4NbLUES7VBnQRM9IauUiqpOfMGx+6fWtScvl6tu4B3i0RwsH0Ti/L6RoZz71ilT
+c4afU9hDDl3WY4JxHYB0yvbiAmvZWg==
+-----END CERTIFICATE-----
+
+SecureSign RootCA11
+===================
+-----BEGIN CERTIFICATE-----
+MIIDbTCCAlWgAwIBAgIBATANBgkqhkiG9w0BAQUFADBYMQswCQYDVQQGEwJKUDErMCkGA1UEChMi
+SmFwYW4gQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcywgSW5jLjEcMBoGA1UEAxMTU2VjdXJlU2lnbiBS
+b290Q0ExMTAeFw0wOTA0MDgwNDU2NDdaFw0yOTA0MDgwNDU2NDdaMFgxCzAJBgNVBAYTAkpQMSsw
+KQYDVQQKEyJKYXBhbiBDZXJ0aWZpY2F0aW9uIFNlcnZpY2VzLCBJbmMuMRwwGgYDVQQDExNTZWN1
+cmVTaWduIFJvb3RDQTExMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA/XeqpRyQBTvL
+TJszi1oURaTnkBbR31fSIRCkF/3frNYfp+TbfPfs37gD2pRY/V1yfIw/XwFndBWW4wI8h9uuywGO
+wvNmxoVF9ALGOrVisq/6nL+k5tSAMJjzDbaTj6nU2DbysPyKyiyhFTOVMdrAG/LuYpmGYz+/3ZMq
+g6h2uRMft85OQoWPIucuGvKVCbIFtUROd6EgvanyTgp9UK31BQ1FT0Zx/Sg+U/sE2C3XZR1KG/rP
+O7AxmjVuyIsG0wCR8pQIZUyxNAYAeoni8McDWc/V1uinMrPmmECGxc0nEovMe863ETxiYAcjPitA
+bpSACW22s293bzUIUPsCh8U+iQIDAQABo0IwQDAdBgNVHQ4EFgQUW/hNT7KlhtQ60vFjmqC+CfZX
+t94wDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAKCh
+OBZmLqdWHyGcBvod7bkixTgm2E5P7KN/ed5GIaGHd48HCJqypMWvDzKYC3xmKbabfSVSSUOrTC4r
+bnpwrxYO4wJs+0LmGJ1F2FXI6Dvd5+H0LgscNFxsWEr7jIhQX5Ucv+2rIrVls4W6ng+4reV6G4pQ
+Oh29Dbx7VFALuUKvVaAYga1lme++5Jy/xIWrQbJUb9wlze144o4MjQlJ3WN7WmmWAiGovVJZ6X01
+y8hSyn+B/tlr0/cR7SXf+Of5pPpyl4RTDaXQMhhRdlkUbA/r7F+AjHVDg8OFmP9Mni0N5HeDk061
+lgeLKBObjBmNQSdJQO7e5iNEOdyhIta6A/I=
+-----END CERTIFICATE-----
+
+Microsec e-Szigno Root CA 2009
+==============================
+-----BEGIN CERTIFICATE-----
+MIIECjCCAvKgAwIBAgIJAMJ+QwRORz8ZMA0GCSqGSIb3DQEBCwUAMIGCMQswCQYDVQQGEwJIVTER
+MA8GA1UEBwwIQnVkYXBlc3QxFjAUBgNVBAoMDU1pY3Jvc2VjIEx0ZC4xJzAlBgNVBAMMHk1pY3Jv
+c2VjIGUtU3ppZ25vIFJvb3QgQ0EgMjAwOTEfMB0GCSqGSIb3DQEJARYQaW5mb0BlLXN6aWduby5o
+dTAeFw0wOTA2MTYxMTMwMThaFw0yOTEyMzAxMTMwMThaMIGCMQswCQYDVQQGEwJIVTERMA8GA1UE
+BwwIQnVkYXBlc3QxFjAUBgNVBAoMDU1pY3Jvc2VjIEx0ZC4xJzAlBgNVBAMMHk1pY3Jvc2VjIGUt
+U3ppZ25vIFJvb3QgQ0EgMjAwOTEfMB0GCSqGSIb3DQEJARYQaW5mb0BlLXN6aWduby5odTCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOn4j/NjrdqG2KfgQvvPkd6mJviZpWNwrZuuyjNA
+fW2WbqEORO7hE52UQlKavXWFdCyoDh2Tthi3jCyoz/tccbna7P7ofo/kLx2yqHWH2Leh5TvPmUpG
+0IMZfcChEhyVbUr02MelTTMuhTlAdX4UfIASmFDHQWe4oIBhVKZsTh/gnQ4H6cm6M+f+wFUoLAKA
+pxn1ntxVUwOXewdI/5n7N4okxFnMUBBjjqqpGrCEGob5X7uxUG6k0QrM1XF+H6cbfPVTbiJfyyvm
+1HxdrtbCxkzlBQHZ7Vf8wSN5/PrIJIOV87VqUQHQd9bpEqH5GoP7ghu5sJf0dgYzQ0mg/wu1+rUC
+AwEAAaOBgDB+MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTLD8bf
+QkPMPcu1SCOhGnqmKrs0aDAfBgNVHSMEGDAWgBTLD8bfQkPMPcu1SCOhGnqmKrs0aDAbBgNVHREE
+FDASgRBpbmZvQGUtc3ppZ25vLmh1MA0GCSqGSIb3DQEBCwUAA4IBAQDJ0Q5eLtXMs3w+y/w9/w0o
+lZMEyL/azXm4Q5DwpL7v8u8hmLzU1F0G9u5C7DBsoKqpyvGvivo/C3NqPuouQH4frlRheesuCDfX
+I/OMn74dseGkddug4lQUsbocKaQY9hK6ohQU4zE1yED/t+AFdlfBHFny+L/k7SViXITwfn4fs775
+tyERzAMBVnCnEJIeGzSBHq2cGsMEPO0CYdYeBvNfOofyK/FFh+U9rNHHV4S9a67c2Pm2G2JwCz02
+yULyMtd6YebS2z3PyKnJm9zbWETXbzivf3jTo60adbocwTZ8jx5tHMN1Rq41Bab2XD0h7lbwyYIi
+LXpUq3DDfSJlgnCW
+-----END CERTIFICATE-----
+
+GlobalSign Root CA - R3
+=======================
+-----BEGIN CERTIFICATE-----
+MIIDXzCCAkegAwIBAgILBAAAAAABIVhTCKIwDQYJKoZIhvcNAQELBQAwTDEgMB4GA1UECxMXR2xv
+YmFsU2lnbiBSb290IENBIC0gUjMxEzARBgNVBAoTCkdsb2JhbFNpZ24xEzARBgNVBAMTCkdsb2Jh
+bFNpZ24wHhcNMDkwMzE4MTAwMDAwWhcNMjkwMzE4MTAwMDAwWjBMMSAwHgYDVQQLExdHbG9iYWxT
+aWduIFJvb3QgQ0EgLSBSMzETMBEGA1UEChMKR2xvYmFsU2lnbjETMBEGA1UEAxMKR2xvYmFsU2ln
+bjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMwldpB5BngiFvXAg7aEyiie/QV2EcWt
+iHL8RgJDx7KKnQRfJMsuS+FggkbhUqsMgUdwbN1k0ev1LKMPgj0MK66X17YUhhB5uzsTgHeMCOFJ
+0mpiLx9e+pZo34knlTifBtc+ycsmWQ1z3rDI6SYOgxXG71uL0gRgykmmKPZpO/bLyCiR5Z2KYVc3
+rHQU3HTgOu5yLy6c+9C7v/U9AOEGM+iCK65TpjoWc4zdQQ4gOsC0p6Hpsk+QLjJg6VfLuQSSaGjl
+OCZgdbKfd/+RFO+uIEn8rUAVSNECMWEZXriX7613t2Saer9fwRPvm2L7DWzgVGkWqQPabumDk3F2
+xmmFghcCAwEAAaNCMEAwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYE
+FI/wS3+oLkUkrk1Q+mOai97i3Ru8MA0GCSqGSIb3DQEBCwUAA4IBAQBLQNvAUKr+yAzv95ZURUm7
+lgAJQayzE4aGKAczymvmdLm6AC2upArT9fHxD4q/c2dKg8dEe3jgr25sbwMpjjM5RcOO5LlXbKr8
+EpbsU8Yt5CRsuZRj+9xTaGdWPoO4zzUhw8lo/s7awlOqzJCK6fBdRoyV3XpYKBovHd7NADdBj+1E
+bddTKJd+82cEHhXXipa0095MJ6RMG3NzdvQXmcIfeg7jLQitChws/zyrVQ4PkX4268NXSb7hLi18
+YIvDQVETI53O9zJrlAGomecsMx86OyXShkDOOyyGeMlhLxS67ttVb9+E7gUJTb0o2HLO02JQZR7r
+kpeDMdmztcpHWD9f
+-----END CERTIFICATE-----
+
+Autoridad de Certificacion Firmaprofesional CIF A62634068
+=========================================================
+-----BEGIN CERTIFICATE-----
+MIIGFDCCA/ygAwIBAgIIU+w77vuySF8wDQYJKoZIhvcNAQEFBQAwUTELMAkGA1UEBhMCRVMxQjBA
+BgNVBAMMOUF1dG9yaWRhZCBkZSBDZXJ0aWZpY2FjaW9uIEZpcm1hcHJvZmVzaW9uYWwgQ0lGIEE2
+MjYzNDA2ODAeFw0wOTA1MjAwODM4MTVaFw0zMDEyMzEwODM4MTVaMFExCzAJBgNVBAYTAkVTMUIw
+QAYDVQQDDDlBdXRvcmlkYWQgZGUgQ2VydGlmaWNhY2lvbiBGaXJtYXByb2Zlc2lvbmFsIENJRiBB
+NjI2MzQwNjgwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDKlmuO6vj78aI14H9M2uDD
+Utd9thDIAl6zQyrET2qyyhxdKJp4ERppWVevtSBC5IsP5t9bpgOSL/UR5GLXMnE42QQMcas9UX4P
+B99jBVzpv5RvwSmCwLTaUbDBPLutN0pcyvFLNg4kq7/DhHf9qFD0sefGL9ItWY16Ck6WaVICqjaY
+7Pz6FIMMNx/Jkjd/14Et5cS54D40/mf0PmbR0/RAz15iNA9wBj4gGFrO93IbJWyTdBSTo3OxDqqH
+ECNZXyAFGUftaI6SEspd/NYrspI8IM/hX68gvqB2f3bl7BqGYTM+53u0P6APjqK5am+5hyZvQWyI
+plD9amML9ZMWGxmPsu2bm8mQ9QEM3xk9Dz44I8kvjwzRAv4bVdZO0I08r0+k8/6vKtMFnXkIoctX
+MbScyJCyZ/QYFpM6/EfY0XiWMR+6KwxfXZmtY4laJCB22N/9q06mIqqdXuYnin1oKaPnirjaEbsX
+LZmdEyRG98Xi2J+Of8ePdG1asuhy9azuJBCtLxTa/y2aRnFHvkLfuwHb9H/TKI8xWVvTyQKmtFLK
+bpf7Q8UIJm+K9Lv9nyiqDdVF8xM6HdjAeI9BZzwelGSuewvF6NkBiDkal4ZkQdU7hwxu+g/GvUgU
+vzlN1J5Bto+WHWOWk9mVBngxaJ43BjuAiUVhOSPHG0SjFeUc+JIwuwIDAQABo4HvMIHsMBIGA1Ud
+EwEB/wQIMAYBAf8CAQEwDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRlzeurNR4APn7VdMActHNH
+DhpkLzCBpgYDVR0gBIGeMIGbMIGYBgRVHSAAMIGPMC8GCCsGAQUFBwIBFiNodHRwOi8vd3d3LmZp
+cm1hcHJvZmVzaW9uYWwuY29tL2NwczBcBggrBgEFBQcCAjBQHk4AUABhAHMAZQBvACAAZABlACAA
+bABhACAAQgBvAG4AYQBuAG8AdgBhACAANAA3ACAAQgBhAHIAYwBlAGwAbwBuAGEAIAAwADgAMAAx
+ADcwDQYJKoZIhvcNAQEFBQADggIBABd9oPm03cXF661LJLWhAqvdpYhKsg9VSytXjDvlMd3+xDLx
+51tkljYyGOylMnfX40S2wBEqgLk9am58m9Ot/MPWo+ZkKXzR4Tgegiv/J2Wv+xYVxC5xhOW1//qk
+R71kMrv2JYSiJ0L1ILDCExARzRAVukKQKtJE4ZYm6zFIEv0q2skGz3QeqUvVhyj5eTSSPi5E6PaP
+T481PyWzOdxjKpBrIF/EUhJOlywqrJ2X3kjyo2bbwtKDlaZmp54lD+kLM5FlClrD2VQS3a/DTg4f
+Jl4N3LON7NWBcN7STyQF82xO9UxJZo3R/9ILJUFI/lGExkKvgATP0H5kSeTy36LssUzAKh3ntLFl
+osS88Zj0qnAHY7S42jtM+kAiMFsRpvAFDsYCA0irhpuF3dvd6qJ2gHN99ZwExEWN57kci57q13XR
+crHedUTnQn3iV2t93Jm8PYMo6oCTjcVMZcFwgbg4/EMxsvYDNEeyrPsiBsse3RdHHF9mudMaotoR
+saS8I8nkvof/uZS2+F0gStRf571oe2XyFR7SOqkt6dhrJKyXWERHrVkY8SFlcN7ONGCoQPHzPKTD
+KCOM/iczQ0CgFzzr6juwcqajuUpLXhZI9LK8yIySxZ2frHI2vDSANGupi5LAuBft7HZT9SQBjLMi
+6Et8Vcad+qMUu2WFbm5PEn4KPJ2V
+-----END CERTIFICATE-----
+
+Izenpe.com
+==========
+-----BEGIN CERTIFICATE-----
+MIIF8TCCA9mgAwIBAgIQALC3WhZIX7/hy/WL1xnmfTANBgkqhkiG9w0BAQsFADA4MQswCQYDVQQG
+EwJFUzEUMBIGA1UECgwLSVpFTlBFIFMuQS4xEzARBgNVBAMMCkl6ZW5wZS5jb20wHhcNMDcxMjEz
+MTMwODI4WhcNMzcxMjEzMDgyNzI1WjA4MQswCQYDVQQGEwJFUzEUMBIGA1UECgwLSVpFTlBFIFMu
+QS4xEzARBgNVBAMMCkl6ZW5wZS5jb20wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDJ
+03rKDx6sp4boFmVqscIbRTJxldn+EFvMr+eleQGPicPK8lVx93e+d5TzcqQsRNiekpsUOqHnJJAK
+ClaOxdgmlOHZSOEtPtoKct2jmRXagaKH9HtuJneJWK3W6wyyQXpzbm3benhB6QiIEn6HLmYRY2xU
++zydcsC8Lv/Ct90NduM61/e0aL6i9eOBbsFGb12N4E3GVFWJGjMxCrFXuaOKmMPsOzTFlUFpfnXC
+PCDFYbpRR6AgkJOhkEvzTnyFRVSa0QUmQbC1TR0zvsQDyCV8wXDbO/QJLVQnSKwv4cSsPsjLkkxT
+OTcj7NMB+eAJRE1NZMDhDVqHIrytG6P+JrUV86f8hBnp7KGItERphIPzidF0BqnMC9bC3ieFUCbK
+F7jJeodWLBoBHmy+E60QrLUk9TiRodZL2vG70t5HtfG8gfZZa88ZU+mNFctKy6lvROUbQc/hhqfK
+0GqfvEyNBjNaooXlkDWgYlwWTvDjovoDGrQscbNYLN57C9saD+veIR8GdwYDsMnvmfzAuU8Lhij+
+0rnq49qlw0dpEuDb8PYZi+17cNcC1u2HGCgsBCRMd+RIihrGO5rUD8r6ddIBQFqNeb+Lz0vPqhbB
+leStTIo+F5HUsWLlguWABKQDfo2/2n+iD5dPDNMN+9fR5XJ+HMh3/1uaD7euBUbl8agW7EekFwID
+AQABo4H2MIHzMIGwBgNVHREEgagwgaWBD2luZm9AaXplbnBlLmNvbaSBkTCBjjFHMEUGA1UECgw+
+SVpFTlBFIFMuQS4gLSBDSUYgQTAxMzM3MjYwLVJNZXJjLlZpdG9yaWEtR2FzdGVpeiBUMTA1NSBG
+NjIgUzgxQzBBBgNVBAkMOkF2ZGEgZGVsIE1lZGl0ZXJyYW5lbyBFdG9yYmlkZWEgMTQgLSAwMTAx
+MCBWaXRvcmlhLUdhc3RlaXowDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0O
+BBYEFB0cZQ6o8iV7tJHP5LGx5r1VdGwFMA0GCSqGSIb3DQEBCwUAA4ICAQB4pgwWSp9MiDrAyw6l
+Fn2fuUhfGI8NYjb2zRlrrKvV9pF9rnHzP7MOeIWblaQnIUdCSnxIOvVFfLMMjlF4rJUT3sb9fbga
+kEyrkgPH7UIBzg/YsfqikuFgba56awmqxinuaElnMIAkejEWOVt+8Rwu3WwJrfIxwYJOubv5vr8q
+hT/AQKM6WfxZSzwoJNu0FXWuDYi6LnPAvViH5ULy617uHjAimcs30cQhbIHsvm0m5hzkQiCeR7Cs
+g1lwLDXWrzY0tM07+DKo7+N4ifuNRSzanLh+QBxh5z6ikixL8s36mLYp//Pye6kfLqCTVyvehQP5
+aTfLnnhqBbTFMXiJ7HqnheG5ezzevh55hM6fcA5ZwjUukCox2eRFekGkLhObNA5me0mrZJfQRsN5
+nXJQY6aYWwa9SG3YOYNw6DXwBdGqvOPbyALqfP2C2sJbUjWumDqtujWTI6cfSN01RpiyEGjkpTHC
+ClguGYEQyVB1/OpaFs4R1+7vUIgtYf8/QnMFlEPVjjxOAToZpR9GTnfQXeWBIiGH/pR9hNiTrdZo
+Q0iy2+tzJOeRf1SktoA+naM8THLCV8Sg1Mw4J87VBp6iSNnpn86CcDaTmjvfliHjWbcM2pE38P1Z
+WrOZyGlsQyYBNWNgVYkDOnXYukrZVP/u3oDYLdE41V4tC5h9Pmzb/CaIxw==
+-----END CERTIFICATE-----
+
+Chambers of Commerce Root - 2008
+================================
+-----BEGIN CERTIFICATE-----
+MIIHTzCCBTegAwIBAgIJAKPaQn6ksa7aMA0GCSqGSIb3DQEBBQUAMIGuMQswCQYDVQQGEwJFVTFD
+MEEGA1UEBxM6TWFkcmlkIChzZWUgY3VycmVudCBhZGRyZXNzIGF0IHd3dy5jYW1lcmZpcm1hLmNv
+bS9hZGRyZXNzKTESMBAGA1UEBRMJQTgyNzQzMjg3MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMu
+QS4xKTAnBgNVBAMTIENoYW1iZXJzIG9mIENvbW1lcmNlIFJvb3QgLSAyMDA4MB4XDTA4MDgwMTEy
+Mjk1MFoXDTM4MDczMTEyMjk1MFowga4xCzAJBgNVBAYTAkVVMUMwQQYDVQQHEzpNYWRyaWQgKHNl
+ZSBjdXJyZW50IGFkZHJlc3MgYXQgd3d3LmNhbWVyZmlybWEuY29tL2FkZHJlc3MpMRIwEAYDVQQF
+EwlBODI3NDMyODcxGzAZBgNVBAoTEkFDIENhbWVyZmlybWEgUy5BLjEpMCcGA1UEAxMgQ2hhbWJl
+cnMgb2YgQ29tbWVyY2UgUm9vdCAtIDIwMDgwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoIC
+AQCvAMtwNyuAWko6bHiUfaN/Gh/2NdW928sNRHI+JrKQUrpjOyhYb6WzbZSm891kDFX29ufyIiKA
+XuFixrYp4YFs8r/lfTJqVKAyGVn+H4vXPWCGhSRv4xGzdz4gljUha7MI2XAuZPeEklPWDrCQiorj
+h40G072QDuKZoRuGDtqaCrsLYVAGUvGef3bsyw/QHg3PmTA9HMRFEFis1tPo1+XqxQEHd9ZR5gN/
+ikilTWh1uem8nk4ZcfUyS5xtYBkL+8ydddy/Js2Pk3g5eXNeJQ7KXOt3EgfLZEFHcpOrUMPrCXZk
+NNI5t3YRCQ12RcSprj1qr7V9ZS+UWBDsXHyvfuK2GNnQm05aSd+pZgvMPMZ4fKecHePOjlO+Bd5g
+D2vlGts/4+EhySnB8esHnFIbAURRPHsl18TlUlRdJQfKFiC4reRB7noI/plvg6aRArBsNlVq5331
+lubKgdaX8ZSD6e2wsWsSaR6s+12pxZjptFtYer49okQ6Y1nUCyXeG0+95QGezdIp1Z8XGQpvvwyQ
+0wlf2eOKNcx5Wk0ZN5K3xMGtr/R5JJqyAQuxr1yW84Ay+1w9mPGgP0revq+ULtlVmhduYJ1jbLhj
+ya6BXBg14JC7vjxPNyK5fuvPnnchpj04gftI2jE9K+OJ9dC1vX7gUMQSibMjmhAxhduub+84Mxh2
+EQIDAQABo4IBbDCCAWgwEgYDVR0TAQH/BAgwBgEB/wIBDDAdBgNVHQ4EFgQU+SSsD7K1+HnA+mCI
+G8TZTQKeFxkwgeMGA1UdIwSB2zCB2IAU+SSsD7K1+HnA+mCIG8TZTQKeFxmhgbSkgbEwga4xCzAJ
+BgNVBAYTAkVVMUMwQQYDVQQHEzpNYWRyaWQgKHNlZSBjdXJyZW50IGFkZHJlc3MgYXQgd3d3LmNh
+bWVyZmlybWEuY29tL2FkZHJlc3MpMRIwEAYDVQQFEwlBODI3NDMyODcxGzAZBgNVBAoTEkFDIENh
+bWVyZmlybWEgUy5BLjEpMCcGA1UEAxMgQ2hhbWJlcnMgb2YgQ29tbWVyY2UgUm9vdCAtIDIwMDiC
+CQCj2kJ+pLGu2jAOBgNVHQ8BAf8EBAMCAQYwPQYDVR0gBDYwNDAyBgRVHSAAMCowKAYIKwYBBQUH
+AgEWHGh0dHA6Ly9wb2xpY3kuY2FtZXJmaXJtYS5jb20wDQYJKoZIhvcNAQEFBQADggIBAJASryI1
+wqM58C7e6bXpeHxIvj99RZJe6dqxGfwWPJ+0W2aeaufDuV2I6A+tzyMP3iU6XsxPpcG1Lawk0lgH
+3qLPaYRgM+gQDROpI9CF5Y57pp49chNyM/WqfcZjHwj0/gF/JM8rLFQJ3uIrbZLGOU8W6jx+ekbU
+RWpGqOt1glanq6B8aBMz9p0w8G8nOSQjKpD9kCk18pPfNKXG9/jvjA9iSnyu0/VU+I22mlaHFoI6
+M6taIgj3grrqLuBHmrS1RaMFO9ncLkVAO+rcf+g769HsJtg1pDDFOqxXnrN2pSB7+R5KBWIBpih1
+YJeSDW4+TTdDDZIVnBgizVGZoCkaPF+KMjNbMMeJL0eYD6MDxvbxrN8y8NmBGuScvfaAFPDRLLmF
+9dijscilIeUcE5fuDr3fKanvNFNb0+RqE4QGtjICxFKuItLcsiFCGtpA8CnJ7AoMXOLQusxI0zcK
+zBIKinmwPQN/aUv0NCB9szTqjktk9T79syNnFQ0EuPAtwQlRPLJsFfClI9eDdOTlLsn+mCdCxqvG
+nrDQWzilm1DefhiYtUU79nm06PcaewaD+9CL2rvHvRirCG88gGtAPxkZumWK5r7VXNM21+9AUiRg
+OGcEMeyP84LG3rlV8zsxkVrctQgVrXYlCg17LofiDKYGvCYQbTed7N14jHyAxfDZd0jQ
+-----END CERTIFICATE-----
+
+Global Chambersign Root - 2008
+==============================
+-----BEGIN CERTIFICATE-----
+MIIHSTCCBTGgAwIBAgIJAMnN0+nVfSPOMA0GCSqGSIb3DQEBBQUAMIGsMQswCQYDVQQGEwJFVTFD
+MEEGA1UEBxM6TWFkcmlkIChzZWUgY3VycmVudCBhZGRyZXNzIGF0IHd3dy5jYW1lcmZpcm1hLmNv
+bS9hZGRyZXNzKTESMBAGA1UEBRMJQTgyNzQzMjg3MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMu
+QS4xJzAlBgNVBAMTHkdsb2JhbCBDaGFtYmVyc2lnbiBSb290IC0gMjAwODAeFw0wODA4MDExMjMx
+NDBaFw0zODA3MzExMjMxNDBaMIGsMQswCQYDVQQGEwJFVTFDMEEGA1UEBxM6TWFkcmlkIChzZWUg
+Y3VycmVudCBhZGRyZXNzIGF0IHd3dy5jYW1lcmZpcm1hLmNvbS9hZGRyZXNzKTESMBAGA1UEBRMJ
+QTgyNzQzMjg3MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMuQS4xJzAlBgNVBAMTHkdsb2JhbCBD
+aGFtYmVyc2lnbiBSb290IC0gMjAwODCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMDf
+VtPkOpt2RbQT2//BthmLN0EYlVJH6xedKYiONWwGMi5HYvNJBL99RDaxccy9Wglz1dmFRP+RVyXf
+XjaOcNFccUMd2drvXNL7G706tcuto8xEpw2uIRU/uXpbknXYpBI4iRmKt4DS4jJvVpyR1ogQC7N0
+ZJJ0YPP2zxhPYLIj0Mc7zmFLmY/CDNBAspjcDahOo7kKrmCgrUVSY7pmvWjg+b4aqIG7HkF4ddPB
+/gBVsIdU6CeQNR1MM62X/JcumIS/LMmjv9GYERTtY/jKmIhYF5ntRQOXfjyGHoiMvvKRhI9lNNgA
+TH23MRdaKXoKGCQwoze1eqkBfSbW+Q6OWfH9GzO1KTsXO0G2Id3UwD2ln58fQ1DJu7xsepeY7s2M
+H/ucUa6LcL0nn3HAa6x9kGbo1106DbDVwo3VyJ2dwW3Q0L9R5OP4wzg2rtandeavhENdk5IMagfe
+Ox2YItaswTXbo6Al/3K1dh3ebeksZixShNBFks4c5eUzHdwHU1SjqoI7mjcv3N2gZOnm3b2u/GSF
+HTynyQbehP9r6GsaPMWis0L7iwk+XwhSx2LE1AVxv8Rk5Pihg+g+EpuoHtQ2TS9x9o0o9oOpE9Jh
+wZG7SMA0j0GMS0zbaRL/UJScIINZc+18ofLx/d33SdNDWKBWY8o9PeU1VlnpDsogzCtLkykPAgMB
+AAGjggFqMIIBZjASBgNVHRMBAf8ECDAGAQH/AgEMMB0GA1UdDgQWBBS5CcqcHtvTbDprru1U8VuT
+BjUuXjCB4QYDVR0jBIHZMIHWgBS5CcqcHtvTbDprru1U8VuTBjUuXqGBsqSBrzCBrDELMAkGA1UE
+BhMCRVUxQzBBBgNVBAcTOk1hZHJpZCAoc2VlIGN1cnJlbnQgYWRkcmVzcyBhdCB3d3cuY2FtZXJm
+aXJtYS5jb20vYWRkcmVzcykxEjAQBgNVBAUTCUE4Mjc0MzI4NzEbMBkGA1UEChMSQUMgQ2FtZXJm
+aXJtYSBTLkEuMScwJQYDVQQDEx5HbG9iYWwgQ2hhbWJlcnNpZ24gUm9vdCAtIDIwMDiCCQDJzdPp
+1X0jzjAOBgNVHQ8BAf8EBAMCAQYwPQYDVR0gBDYwNDAyBgRVHSAAMCowKAYIKwYBBQUHAgEWHGh0
+dHA6Ly9wb2xpY3kuY2FtZXJmaXJtYS5jb20wDQYJKoZIhvcNAQEFBQADggIBAICIf3DekijZBZRG
+/5BXqfEv3xoNa/p8DhxJJHkn2EaqbylZUohwEurdPfWbU1Rv4WCiqAm57OtZfMY18dwY6fFn5a+6
+ReAJ3spED8IXDneRRXozX1+WLGiLwUePmJs9wOzL9dWCkoQ10b42OFZyMVtHLaoXpGNR6woBrX/s
+dZ7LoR/xfxKxueRkf2fWIyr0uDldmOghp+G9PUIadJpwr2hsUF1Jz//7Dl3mLEfXgTpZALVza2Mg
+9jFFCDkO9HB+QHBaP9BrQql0PSgvAm11cpUJjUhjxsYjV5KTXjXBjfkK9yydYhz2rXzdpjEetrHH
+foUm+qRqtdpjMNHvkzeyZi99Bffnt0uYlDXA2TopwZ2yUDMdSqlapskD7+3056huirRXhOukP9Du
+qqqHW2Pok+JrqNS4cnhrG+055F3Lm6qH1U9OAP7Zap88MQ8oAgF9mOinsKJknnn4SPIVqczmyETr
+P3iZ8ntxPjzxmKfFGBI/5rsoM0LpRQp8bfKGeS/Fghl9CYl8slR2iK7ewfPM4W7bMdaTrpmg7yVq
+c5iJWzouE4gev8CSlDQb4ye3ix5vQv/n6TebUB0tovkC7stYWDpxvGjjqsGvHCgfotwjZT+B6q6Z
+09gwzxMNTxXJhLynSC34MCN32EZLeW32jO06f2ARePTpm67VVMB0gNELQp/B
+-----END CERTIFICATE-----
+
+Go Daddy Root Certificate Authority - G2
+========================================
+-----BEGIN CERTIFICATE-----
+MIIDxTCCAq2gAwIBAgIBADANBgkqhkiG9w0BAQsFADCBgzELMAkGA1UEBhMCVVMxEDAOBgNVBAgT
+B0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxGjAYBgNVBAoTEUdvRGFkZHkuY29tLCBJbmMu
+MTEwLwYDVQQDEyhHbyBEYWRkeSBSb290IENlcnRpZmljYXRlIEF1dGhvcml0eSAtIEcyMB4XDTA5
+MDkwMTAwMDAwMFoXDTM3MTIzMTIzNTk1OVowgYMxCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdBcml6
+b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMRowGAYDVQQKExFHb0RhZGR5LmNvbSwgSW5jLjExMC8G
+A1UEAxMoR28gRGFkZHkgUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkgLSBHMjCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAL9xYgjx+lk09xvJGKP3gElY6SKDE6bFIEMBO4Tx5oVJnyfq
+9oQbTqC023CYxzIBsQU+B07u9PpPL1kwIuerGVZr4oAH/PMWdYA5UXvl+TW2dE6pjYIT5LY/qQOD
++qK+ihVqf94Lw7YZFAXK6sOoBJQ7RnwyDfMAZiLIjWltNowRGLfTshxgtDj6AozO091GB94KPutd
+fMh8+7ArU6SSYmlRJQVhGkSBjCypQ5Yj36w6gZoOKcUcqeldHraenjAKOc7xiID7S13MMuyFYkMl
+NAJWJwGRtDtwKj9useiciAF9n9T521NtYJ2/LOdYq7hfRvzOxBsDPAnrSTFcaUaz4EcCAwEAAaNC
+MEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFDqahQcQZyi27/a9
+BUFuIMGU2g/eMA0GCSqGSIb3DQEBCwUAA4IBAQCZ21151fmXWWcDYfF+OwYxdS2hII5PZYe096ac
+vNjpL9DbWu7PdIxztDhC2gV7+AJ1uP2lsdeu9tfeE8tTEH6KRtGX+rcuKxGrkLAngPnon1rpN5+r
+5N9ss4UXnT3ZJE95kTXWXwTrgIOrmgIttRD02JDHBHNA7XIloKmf7J6raBKZV8aPEjoJpL1E/QYV
+N8Gb5DKj7Tjo2GTzLH4U/ALqn83/B2gX2yKQOC16jdFU8WnjXzPKej17CuPKf1855eJ1usV2GDPO
+LPAvTK33sefOT6jEm0pUBsV/fdUID+Ic/n4XuKxe9tQWskMJDE32p2u0mYRlynqI4uJEvlz36hz1
+-----END CERTIFICATE-----
+
+Starfield Root Certificate Authority - G2
+=========================================
+-----BEGIN CERTIFICATE-----
+MIID3TCCAsWgAwIBAgIBADANBgkqhkiG9w0BAQsFADCBjzELMAkGA1UEBhMCVVMxEDAOBgNVBAgT
+B0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxJTAjBgNVBAoTHFN0YXJmaWVsZCBUZWNobm9s
+b2dpZXMsIEluYy4xMjAwBgNVBAMTKVN0YXJmaWVsZCBSb290IENlcnRpZmljYXRlIEF1dGhvcml0
+eSAtIEcyMB4XDTA5MDkwMTAwMDAwMFoXDTM3MTIzMTIzNTk1OVowgY8xCzAJBgNVBAYTAlVTMRAw
+DgYDVQQIEwdBcml6b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMSUwIwYDVQQKExxTdGFyZmllbGQg
+VGVjaG5vbG9naWVzLCBJbmMuMTIwMAYDVQQDEylTdGFyZmllbGQgUm9vdCBDZXJ0aWZpY2F0ZSBB
+dXRob3JpdHkgLSBHMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL3twQP89o/8ArFv
+W59I2Z154qK3A2FWGMNHttfKPTUuiUP3oWmb3ooa/RMgnLRJdzIpVv257IzdIvpy3Cdhl+72WoTs
+bhm5iSzchFvVdPtrX8WJpRBSiUZV9Lh1HOZ/5FSuS/hVclcCGfgXcVnrHigHdMWdSL5stPSksPNk
+N3mSwOxGXn/hbVNMYq/NHwtjuzqd+/x5AJhhdM8mgkBj87JyahkNmcrUDnXMN/uLicFZ8WJ/X7Nf
+ZTD4p7dNdloedl40wOiWVpmKs/B/pM293DIxfJHP4F8R+GuqSVzRmZTRouNjWwl2tVZi4Ut0HZbU
+JtQIBFnQmA4O5t78w+wfkPECAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC
+AQYwHQYDVR0OBBYEFHwMMh+n2TB/xH1oo2Kooc6rB1snMA0GCSqGSIb3DQEBCwUAA4IBAQARWfol
+TwNvlJk7mh+ChTnUdgWUXuEok21iXQnCoKjUsHU48TRqneSfioYmUeYs0cYtbpUgSpIB7LiKZ3sx
+4mcujJUDJi5DnUox9g61DLu34jd/IroAow57UvtruzvE03lRTs2Q9GcHGcg8RnoNAX3FWOdt5oUw
+F5okxBDgBPfg8n/Uqgr/Qh037ZTlZFkSIHc40zI+OIF1lnP6aI+xy84fxez6nH7PfrHxBy22/L/K
+pL/QlwVKvOoYKAKQvVR4CSFx09F9HdkWsKlhPdAKACL8x3vLCWRFCztAgfd9fDL1mMpYjn0q7pBZ
+c2T5NnReJaH1ZgUufzkVqSr7UIuOhWn0
+-----END CERTIFICATE-----
+
+Starfield Services Root Certificate Authority - G2
+==================================================
+-----BEGIN CERTIFICATE-----
+MIID7zCCAtegAwIBAgIBADANBgkqhkiG9w0BAQsFADCBmDELMAkGA1UEBhMCVVMxEDAOBgNVBAgT
+B0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxJTAjBgNVBAoTHFN0YXJmaWVsZCBUZWNobm9s
+b2dpZXMsIEluYy4xOzA5BgNVBAMTMlN0YXJmaWVsZCBTZXJ2aWNlcyBSb290IENlcnRpZmljYXRl
+IEF1dGhvcml0eSAtIEcyMB4XDTA5MDkwMTAwMDAwMFoXDTM3MTIzMTIzNTk1OVowgZgxCzAJBgNV
+BAYTAlVTMRAwDgYDVQQIEwdBcml6b25hMRMwEQYDVQQHEwpTY290dHNkYWxlMSUwIwYDVQQKExxT
+dGFyZmllbGQgVGVjaG5vbG9naWVzLCBJbmMuMTswOQYDVQQDEzJTdGFyZmllbGQgU2VydmljZXMg
+Um9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkgLSBHMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBANUMOsQq+U7i9b4Zl1+OiFOxHz/Lz58gE20pOsgPfTz3a3Y4Y9k2YKibXlwAgLIvWX/2
+h/klQ4bnaRtSmpDhcePYLQ1Ob/bISdm28xpWriu2dBTrz/sm4xq6HZYuajtYlIlHVv8loJNwU4Pa
+hHQUw2eeBGg6345AWh1KTs9DkTvnVtYAcMtS7nt9rjrnvDH5RfbCYM8TWQIrgMw0R9+53pBlbQLP
+LJGmpufehRhJfGZOozptqbXuNC66DQO4M99H67FrjSXZm86B0UVGMpZwh94CDklDhbZsc7tk6mFB
+rMnUVN+HL8cisibMn1lUaJ/8viovxFUcdUBgF4UCVTmLfwUCAwEAAaNCMEAwDwYDVR0TAQH/BAUw
+AwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFJxfAN+qAdcwKziIorhtSpzyEZGDMA0GCSqG
+SIb3DQEBCwUAA4IBAQBLNqaEd2ndOxmfZyMIbw5hyf2E3F/YNoHN2BtBLZ9g3ccaaNnRbobhiCPP
+E95Dz+I0swSdHynVv/heyNXBve6SbzJ08pGCL72CQnqtKrcgfU28elUSwhXqvfdqlS5sdJ/PHLTy
+xQGjhdByPq1zqwubdQxtRbeOlKyWN7Wg0I8VRw7j6IPdj/3vQQF3zCepYoUz8jcI73HPdwbeyBkd
+iEDPfUYd/x7H4c7/I9vG+o1VTqkC50cRRj70/b17KSa7qWFiNyi2LSr2EIZkyXCn0q23KXB56jza
+YyWf/Wi3MOxw+3WKt21gZ7IeyLnp2KhvAotnDU0mV3HaIPzBSlCNsSi6
+-----END CERTIFICATE-----
+
+AffirmTrust Commercial
+======================
+-----BEGIN CERTIFICATE-----
+MIIDTDCCAjSgAwIBAgIId3cGJyapsXwwDQYJKoZIhvcNAQELBQAwRDELMAkGA1UEBhMCVVMxFDAS
+BgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVzdCBDb21tZXJjaWFsMB4XDTEw
+MDEyOTE0MDYwNloXDTMwMTIzMTE0MDYwNlowRDELMAkGA1UEBhMCVVMxFDASBgNVBAoMC0FmZmly
+bVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVzdCBDb21tZXJjaWFsMIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEA9htPZwcroRX1BiLLHwGy43NFBkRJLLtJJRTWzsO3qyxPxkEylFf6Eqdb
+DuKPHx6GGaeqtS25Xw2Kwq+FNXkyLbscYjfysVtKPcrNcV/pQr6U6Mje+SJIZMblq8Yrba0F8PrV
+C8+a5fBQpIs7R6UjW3p6+DM/uO+Zl+MgwdYoic+U+7lF7eNAFxHUdPALMeIrJmqbTFeurCA+ukV6
+BfO9m2kVrn1OIGPENXY6BwLJN/3HR+7o8XYdcxXyl6S1yHp52UKqK39c/s4mT6NmgTWvRLpUHhww
+MmWd5jyTXlBOeuM61G7MGvv50jeuJCqrVwMiKA1JdX+3KNp1v47j3A55MQIDAQABo0IwQDAdBgNV
+HQ4EFgQUnZPGU4teyq8/nx4P5ZmVvCT2lI8wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC
+AQYwDQYJKoZIhvcNAQELBQADggEBAFis9AQOzcAN/wr91LoWXym9e2iZWEnStB03TX8nfUYGXUPG
+hi4+c7ImfU+TqbbEKpqrIZcUsd6M06uJFdhrJNTxFq7YpFzUf1GO7RgBsZNjvbz4YYCanrHOQnDi
+qX0GJX0nof5v7LMeJNrjS1UaADs1tDvZ110w/YETifLCBivtZ8SOyUOyXGsViQK8YvxO8rUzqrJv
+0wqiUOP2O+guRMLbZjipM1ZI8W0bM40NjD9gN53Tym1+NH4Nn3J2ixufcv1SNUFFApYvHLKac0kh
+sUlHRUe072o0EclNmsxZt9YCnlpOZbWUrhvfKbAW8b8Angc6F2S1BLUjIZkKlTuXfO8=
+-----END CERTIFICATE-----
+
+AffirmTrust Networking
+======================
+-----BEGIN CERTIFICATE-----
+MIIDTDCCAjSgAwIBAgIIfE8EORzUmS0wDQYJKoZIhvcNAQEFBQAwRDELMAkGA1UEBhMCVVMxFDAS
+BgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVzdCBOZXR3b3JraW5nMB4XDTEw
+MDEyOTE0MDgyNFoXDTMwMTIzMTE0MDgyNFowRDELMAkGA1UEBhMCVVMxFDASBgNVBAoMC0FmZmly
+bVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVzdCBOZXR3b3JraW5nMIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEAtITMMxcua5Rsa2FSoOujz3mUTOWUgJnLVWREZY9nZOIG41w3SfYvm4SE
+Hi3yYJ0wTsyEheIszx6e/jarM3c1RNg1lho9Nuh6DtjVR6FqaYvZ/Ls6rnla1fTWcbuakCNrmreI
+dIcMHl+5ni36q1Mr3Lt2PpNMCAiMHqIjHNRqrSK6mQEubWXLviRmVSRLQESxG9fhwoXA3hA/Pe24
+/PHxI1Pcv2WXb9n5QHGNfb2V1M6+oF4nI979ptAmDgAp6zxG8D1gvz9Q0twmQVGeFDdCBKNwV6gb
+h+0t+nvujArjqWaJGctB+d1ENmHP4ndGyH329JKBNv3bNPFyfvMMFr20FQIDAQABo0IwQDAdBgNV
+HQ4EFgQUBx/S55zawm6iQLSwelAQUHTEyL0wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC
+AQYwDQYJKoZIhvcNAQEFBQADggEBAIlXshZ6qML91tmbmzTCnLQyFE2npN/svqe++EPbkTfOtDIu
+UFUaNU52Q3Eg75N3ThVwLofDwR1t3Mu1J9QsVtFSUzpE0nPIxBsFZVpikpzuQY0x2+c06lkh1QF6
+12S4ZDnNye2v7UsDSKegmQGA3GWjNq5lWUhPgkvIZfFXHeVZLgo/bNjR9eUJtGxUAArgFU2HdW23
+WJZa3W3SAKD0m0i+wzekujbgfIeFlxoVot4uolu9rxj5kFDNcFn4J2dHy8egBzp90SxdbBk6ZrV9
+/ZFvgrG+CJPbFEfxojfHRZ48x3evZKiT3/Zpg4Jg8klCNO1aAFSFHBY2kgxc+qatv9s=
+-----END CERTIFICATE-----
+
+AffirmTrust Premium
+===================
+-----BEGIN CERTIFICATE-----
+MIIFRjCCAy6gAwIBAgIIbYwURrGmCu4wDQYJKoZIhvcNAQEMBQAwQTELMAkGA1UEBhMCVVMxFDAS
+BgNVBAoMC0FmZmlybVRydXN0MRwwGgYDVQQDDBNBZmZpcm1UcnVzdCBQcmVtaXVtMB4XDTEwMDEy
+OTE0MTAzNloXDTQwMTIzMTE0MTAzNlowQTELMAkGA1UEBhMCVVMxFDASBgNVBAoMC0FmZmlybVRy
+dXN0MRwwGgYDVQQDDBNBZmZpcm1UcnVzdCBQcmVtaXVtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8A
+MIICCgKCAgEAxBLfqV/+Qd3d9Z+K4/as4Tx4mrzY8H96oDMq3I0gW64tb+eT2TZwamjPjlGjhVtn
+BKAQJG9dKILBl1fYSCkTtuG+kU3fhQxTGJoeJKJPj/CihQvL9Cl/0qRY7iZNyaqoe5rZ+jjeRFcV
+5fiMyNlI4g0WJx0eyIOFJbe6qlVBzAMiSy2RjYvmia9mx+n/K+k8rNrSs8PhaJyJ+HoAVt70VZVs
++7pk3WKL3wt3MutizCaam7uqYoNMtAZ6MMgpv+0GTZe5HMQxK9VfvFMSF5yZVylmd2EhMQcuJUmd
+GPLu8ytxjLW6OQdJd/zvLpKQBY0tL3d770O/Nbua2Plzpyzy0FfuKE4mX4+QaAkvuPjcBukumj5R
+p9EixAqnOEhss/n/fauGV+O61oV4d7pD6kh/9ti+I20ev9E2bFhc8e6kGVQa9QPSdubhjL08s9NI
+S+LI+H+SqHZGnEJlPqQewQcDWkYtuJfzt9WyVSHvutxMAJf7FJUnM7/oQ0dG0giZFmA7mn7S5u04
+6uwBHjxIVkkJx0w3AJ6IDsBz4W9m6XJHMD4Q5QsDyZpCAGzFlH5hxIrff4IaC1nEWTJ3s7xgaVY5
+/bQGeyzWZDbZvUjthB9+pSKPKrhC9IK31FOQeE4tGv2Bb0TXOwF0lkLgAOIua+rF7nKsu7/+6qqo
++Nz2snmKtmcCAwEAAaNCMEAwHQYDVR0OBBYEFJ3AZ6YMItkm9UWrpmVSESfYRaxjMA8GA1UdEwEB
+/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBDAUAA4ICAQCzV00QYk465KzquByv
+MiPIs0laUZx2KI15qldGF9X1Uva3ROgIRL8YhNILgM3FEv0AVQVhh0HctSSePMTYyPtwni94loMg
+Nt58D2kTiKV1NpgIpsbfrM7jWNa3Pt668+s0QNiigfV4Py/VpfzZotReBA4Xrf5B8OWycvpEgjNC
+6C1Y91aMYj+6QrCcDFx+LmUmXFNPALJ4fqENmS2NuB2OosSw/WDQMKSOyARiqcTtNd56l+0OOF6S
+L5Nwpamcb6d9Ex1+xghIsV5n61EIJenmJWtSKZGc0jlzCFfemQa0W50QBuHCAKi4HEoCChTQwUHK
++4w1IX2COPKpVJEZNZOUbWo6xbLQu4mGk+ibyQ86p3q4ofB4Rvr8Ny/lioTz3/4E2aFooC8k4gmV
+BtWVyuEklut89pMFu+1z6S3RdTnX5yTb2E5fQ4+e0BQ5v1VwSJlXMbSc7kqYA5YwH2AG7hsj/oFg
+IxpHYoWlzBk0gG+zrBrjn/B7SK3VAdlntqlyk+otZrWyuOQ9PLLvTIzq6we/qzWaVYa8GKa1qF60
+g2xraUDTn9zxw2lrueFtCfTxqlB2Cnp9ehehVZZCmTEJ3WARjQUwfuaORtGdFNrHF+QFlozEJLUb
+zxQHskD4o55BhrwE0GuWyCqANP2/7waj3VjFhT0+j/6eKeC2uAloGRwYQw==
+-----END CERTIFICATE-----
+
+AffirmTrust Premium ECC
+=======================
+-----BEGIN CERTIFICATE-----
+MIIB/jCCAYWgAwIBAgIIdJclisc/elQwCgYIKoZIzj0EAwMwRTELMAkGA1UEBhMCVVMxFDASBgNV
+BAoMC0FmZmlybVRydXN0MSAwHgYDVQQDDBdBZmZpcm1UcnVzdCBQcmVtaXVtIEVDQzAeFw0xMDAx
+MjkxNDIwMjRaFw00MDEyMzExNDIwMjRaMEUxCzAJBgNVBAYTAlVTMRQwEgYDVQQKDAtBZmZpcm1U
+cnVzdDEgMB4GA1UEAwwXQWZmaXJtVHJ1c3QgUHJlbWl1bSBFQ0MwdjAQBgcqhkjOPQIBBgUrgQQA
+IgNiAAQNMF4bFZ0D0KF5Nbc6PJJ6yhUczWLznCZcBz3lVPqj1swS6vQUX+iOGasvLkjmrBhDeKzQ
+N8O9ss0s5kfiGuZjuD0uL3jET9v0D6RoTFVya5UdThhClXjMNzyR4ptlKymjQjBAMB0GA1UdDgQW
+BBSaryl6wBE1NSZRMADDav5A1a7WPDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAK
+BggqhkjOPQQDAwNnADBkAjAXCfOHiFBar8jAQr9HX/VsaobgxCd05DhT1wV/GzTjxi+zygk8N53X
+57hG8f2h4nECMEJZh0PUUd+60wkyWs6Iflc9nF9Ca/UHLbXwgpP5WW+uZPpY5Yse42O+tYHNbwKM
+eQ==
+-----END CERTIFICATE-----
+
+Certum Trusted Network CA
+=========================
+-----BEGIN CERTIFICATE-----
+MIIDuzCCAqOgAwIBAgIDBETAMA0GCSqGSIb3DQEBBQUAMH4xCzAJBgNVBAYTAlBMMSIwIAYDVQQK
+ExlVbml6ZXRvIFRlY2hub2xvZ2llcyBTLkEuMScwJQYDVQQLEx5DZXJ0dW0gQ2VydGlmaWNhdGlv
+biBBdXRob3JpdHkxIjAgBgNVBAMTGUNlcnR1bSBUcnVzdGVkIE5ldHdvcmsgQ0EwHhcNMDgxMDIy
+MTIwNzM3WhcNMjkxMjMxMTIwNzM3WjB+MQswCQYDVQQGEwJQTDEiMCAGA1UEChMZVW5pemV0byBU
+ZWNobm9sb2dpZXMgUy5BLjEnMCUGA1UECxMeQ2VydHVtIENlcnRpZmljYXRpb24gQXV0aG9yaXR5
+MSIwIAYDVQQDExlDZXJ0dW0gVHJ1c3RlZCBOZXR3b3JrIENBMIIBIjANBgkqhkiG9w0BAQEFAAOC
+AQ8AMIIBCgKCAQEA4/t9o3K6wvDJFIf1awFO4W5AB7ptJ11/91sts1rHUV+rpDKmYYe2bg+G0jAC
+l/jXaVehGDldamR5xgFZrDwxSjh80gTSSyjoIF87B6LMTXPb865Px1bVWqeWifrzq2jUI4ZZJ88J
+J7ysbnKDHDBy3+Ci6dLhdHUZvSqeexVUBBvXQzmtVSjF4hq79MDkrjhJM8x2hZ85RdKknvISjFH4
+fOQtf/WsX+sWn7Et0brMkUJ3TCXJkDhv2/DM+44el1k+1WBO5gUo7Ul5E0u6SNsv+XLTOcr+H9g0
+cvW0QM8xAcPs3hEtF10fuFDRXhmnad4HMyjKUJX5p1TLVIZQRan5SQIDAQABo0IwQDAPBgNVHRMB
+Af8EBTADAQH/MB0GA1UdDgQWBBQIds3LB/8k9sXN7buQvOKEN0Z19zAOBgNVHQ8BAf8EBAMCAQYw
+DQYJKoZIhvcNAQEFBQADggEBAKaorSLOAT2mo/9i0Eidi15ysHhE49wcrwn9I0j6vSrEuVUEtRCj
+jSfeC4Jj0O7eDDd5QVsisrCaQVymcODU0HfLI9MA4GxWL+FpDQ3Zqr8hgVDZBqWo/5U30Kr+4rP1
+mS1FhIrlQgnXdAIv94nYmem8J9RHjboNRhx3zxSkHLmkMcScKHQDNP8zGSal6Q10tz6XxnboJ5aj
+Zt3hrvJBW8qYVoNzcOSGGtIxQbovvi0TWnZvTuhOgQ4/WwMioBK+ZlgRSssDxLQqKi2WF+A5VLxI
+03YnnZotBqbJ7DnSq9ufmgsnAjUpsUCV5/nonFWIGUbWtzT1fs45mtk48VH3Tyw=
+-----END CERTIFICATE-----
+
+TWCA Root Certification Authority
+=================================
+-----BEGIN CERTIFICATE-----
+MIIDezCCAmOgAwIBAgIBATANBgkqhkiG9w0BAQUFADBfMQswCQYDVQQGEwJUVzESMBAGA1UECgwJ
+VEFJV0FOLUNBMRAwDgYDVQQLDAdSb290IENBMSowKAYDVQQDDCFUV0NBIFJvb3QgQ2VydGlmaWNh
+dGlvbiBBdXRob3JpdHkwHhcNMDgwODI4MDcyNDMzWhcNMzAxMjMxMTU1OTU5WjBfMQswCQYDVQQG
+EwJUVzESMBAGA1UECgwJVEFJV0FOLUNBMRAwDgYDVQQLDAdSb290IENBMSowKAYDVQQDDCFUV0NB
+IFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQCwfnK4pAOU5qfeCTiRShFAh6d8WWQUe7UREN3+v9XAu1bihSX0NXIP+FPQQeFEAcK0HMMx
+QhZHhTMidrIKbw/lJVBPhYa+v5guEGcevhEFhgWQxFnQfHgQsIBct+HHK3XLfJ+utdGdIzdjp9xC
+oi2SBBtQwXu4PhvJVgSLL1KbralW6cH/ralYhzC2gfeXRfwZVzsrb+RH9JlF/h3x+JejiB03HFyP
+4HYlmlD4oFT/RJB2I9IyxsOrBr/8+7/zrX2SYgJbKdM1o5OaQ2RgXbL6Mv87BK9NQGr5x+PvI/1r
+y+UPizgN7gr8/g+YnzAx3WxSZfmLgb4i4RxYA7qRG4kHAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIB
+BjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRqOFsmjd6LWvJPelSDGRjjCDWmujANBgkqhkiG
+9w0BAQUFAAOCAQEAPNV3PdrfibqHDAhUaiBQkr6wQT25JmSDCi/oQMCXKCeCMErJk/9q56YAf4lC
+mtYR5VPOL8zy2gXE/uJQxDqGfczafhAJO5I1KlOy/usrBdlsXebQ79NqZp4VKIV66IIArB6nCWlW
+QtNoURi+VJq/REG6Sb4gumlc7rh3zc5sH62Dlhh9DrUUOYTxKOkto557HnpyWoOzeW/vtPzQCqVY
+T0bf+215WfKEIlKuD8z7fDvnaspHYcN6+NOSBB+4IIThNlQWx0DeO4pz3N/GCUzf7Nr/1FNCocny
+Yh0igzyXxfkZYiesZSLX0zzG5Y6yU8xJzrww/nsOM5D77dIUkR8Hrw==
+-----END CERTIFICATE-----
+
+Security Communication RootCA2
+==============================
+-----BEGIN CERTIFICATE-----
+MIIDdzCCAl+gAwIBAgIBADANBgkqhkiG9w0BAQsFADBdMQswCQYDVQQGEwJKUDElMCMGA1UEChMc
+U0VDT00gVHJ1c3QgU3lzdGVtcyBDTy4sTFRELjEnMCUGA1UECxMeU2VjdXJpdHkgQ29tbXVuaWNh
+dGlvbiBSb290Q0EyMB4XDTA5MDUyOTA1MDAzOVoXDTI5MDUyOTA1MDAzOVowXTELMAkGA1UEBhMC
+SlAxJTAjBgNVBAoTHFNFQ09NIFRydXN0IFN5c3RlbXMgQ08uLExURC4xJzAlBgNVBAsTHlNlY3Vy
+aXR5IENvbW11bmljYXRpb24gUm9vdENBMjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+ANAVOVKxUrO6xVmCxF1SrjpDZYBLx/KWvNs2l9amZIyoXvDjChz335c9S672XewhtUGrzbl+dp++
++T42NKA7wfYxEUV0kz1XgMX5iZnK5atq1LXaQZAQwdbWQonCv/Q4EpVMVAX3NuRFg3sUZdbcDE3R
+3n4MqzvEFb46VqZab3ZpUql6ucjrappdUtAtCms1FgkQhNBqyjoGADdH5H5XTz+L62e4iKrFvlNV
+spHEfbmwhRkGeC7bYRr6hfVKkaHnFtWOojnflLhwHyg/i/xAXmODPIMqGplrz95Zajv8bxbXH/1K
+EOtOghY6rCcMU/Gt1SSwawNQwS08Ft1ENCcadfsCAwEAAaNCMEAwHQYDVR0OBBYEFAqFqXdlBZh8
+QIH4D5csOPEK7DzPMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEB
+CwUAA4IBAQBMOqNErLlFsceTfsgLCkLfZOoc7llsCLqJX2rKSpWeeo8HxdpFcoJxDjrSzG+ntKEj
+u/Ykn8sX/oymzsLS28yN/HH8AynBbF0zX2S2ZTuJbxh2ePXcokgfGT+Ok+vx+hfuzU7jBBJV1uXk
+3fs+BXziHV7Gp7yXT2g69ekuCkO2r1dcYmh8t/2jioSgrGK+KwmHNPBqAbubKVY8/gA3zyNs8U6q
+tnRGEmyR7jTV7JqR50S+kDFy1UkC9gLl9B/rfNmWVan/7Ir5mUf/NVoCqgTLiluHcSmRvaS0eg29
+mvVXIwAHIRc/SjnRBUkLp7Y3gaVdjKozXoEofKd9J+sAro03
+-----END CERTIFICATE-----
+
+EC-ACC
+======
+-----BEGIN CERTIFICATE-----
+MIIFVjCCBD6gAwIBAgIQ7is969Qh3hSoYqwE893EATANBgkqhkiG9w0BAQUFADCB8zELMAkGA1UE
+BhMCRVMxOzA5BgNVBAoTMkFnZW5jaWEgQ2F0YWxhbmEgZGUgQ2VydGlmaWNhY2lvIChOSUYgUS0w
+ODAxMTc2LUkpMSgwJgYDVQQLEx9TZXJ2ZWlzIFB1YmxpY3MgZGUgQ2VydGlmaWNhY2lvMTUwMwYD
+VQQLEyxWZWdldSBodHRwczovL3d3dy5jYXRjZXJ0Lm5ldC92ZXJhcnJlbCAoYykwMzE1MDMGA1UE
+CxMsSmVyYXJxdWlhIEVudGl0YXRzIGRlIENlcnRpZmljYWNpbyBDYXRhbGFuZXMxDzANBgNVBAMT
+BkVDLUFDQzAeFw0wMzAxMDcyMzAwMDBaFw0zMTAxMDcyMjU5NTlaMIHzMQswCQYDVQQGEwJFUzE7
+MDkGA1UEChMyQWdlbmNpYSBDYXRhbGFuYSBkZSBDZXJ0aWZpY2FjaW8gKE5JRiBRLTA4MDExNzYt
+SSkxKDAmBgNVBAsTH1NlcnZlaXMgUHVibGljcyBkZSBDZXJ0aWZpY2FjaW8xNTAzBgNVBAsTLFZl
+Z2V1IGh0dHBzOi8vd3d3LmNhdGNlcnQubmV0L3ZlcmFycmVsIChjKTAzMTUwMwYDVQQLEyxKZXJh
+cnF1aWEgRW50aXRhdHMgZGUgQ2VydGlmaWNhY2lvIENhdGFsYW5lczEPMA0GA1UEAxMGRUMtQUND
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsyLHT+KXQpWIR4NA9h0X84NzJB5R85iK
+w5K4/0CQBXCHYMkAqbWUZRkiFRfCQ2xmRJoNBD45b6VLeqpjt4pEndljkYRm4CgPukLjbo73FCeT
+ae6RDqNfDrHrZqJyTxIThmV6PttPB/SnCWDaOkKZx7J/sxaVHMf5NLWUhdWZXqBIoH7nF2W4onW4
+HvPlQn2v7fOKSGRdghST2MDk/7NQcvJ29rNdQlB50JQ+awwAvthrDk4q7D7SzIKiGGUzE3eeml0a
+E9jD2z3Il3rucO2n5nzbcc8tlGLfbdb1OL4/pYUKGbio2Al1QnDE6u/LDsg0qBIimAy4E5S2S+zw
+0JDnJwIDAQABo4HjMIHgMB0GA1UdEQQWMBSBEmVjX2FjY0BjYXRjZXJ0Lm5ldDAPBgNVHRMBAf8E
+BTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUoMOLRKo3pUW/l4Ba0fF4opvpXY0wfwYD
+VR0gBHgwdjB0BgsrBgEEAfV4AQMBCjBlMCwGCCsGAQUFBwIBFiBodHRwczovL3d3dy5jYXRjZXJ0
+Lm5ldC92ZXJhcnJlbDA1BggrBgEFBQcCAjApGidWZWdldSBodHRwczovL3d3dy5jYXRjZXJ0Lm5l
+dC92ZXJhcnJlbCAwDQYJKoZIhvcNAQEFBQADggEBAKBIW4IB9k1IuDlVNZyAelOZ1Vr/sXE7zDkJ
+lF7W2u++AVtd0x7Y/X1PzaBB4DSTv8vihpw3kpBWHNzrKQXlxJ7HNd+KDM3FIUPpqojlNcAZQmNa
+Al6kSBg6hW/cnbw/nZzBh7h6YQjpdwt/cKt63dmXLGQehb+8dJahw3oS7AwaboMMPOhyRp/7SNVe
+l+axofjk70YllJyJ22k4vuxcDlbHZVHlUIiIv0LVKz3l+bqeLrPK9HOSAgu+TGbrIP65y7WZf+a2
+E/rKS03Z7lNGBjvGTq2TWoF+bCpLagVFjPIhpDGQh2xlnJ2lYJU6Un/10asIbvPuW/mIPX64b24D
+5EI=
+-----END CERTIFICATE-----
+
+Hellenic Academic and Research Institutions RootCA 2011
+=======================================================
+-----BEGIN CERTIFICATE-----
+MIIEMTCCAxmgAwIBAgIBADANBgkqhkiG9w0BAQUFADCBlTELMAkGA1UEBhMCR1IxRDBCBgNVBAoT
+O0hlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNlYXJjaCBJbnN0aXR1dGlvbnMgQ2VydC4gQXV0aG9y
+aXR5MUAwPgYDVQQDEzdIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25z
+IFJvb3RDQSAyMDExMB4XDTExMTIwNjEzNDk1MloXDTMxMTIwMTEzNDk1MlowgZUxCzAJBgNVBAYT
+AkdSMUQwQgYDVQQKEztIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25z
+IENlcnQuIEF1dGhvcml0eTFAMD4GA1UEAxM3SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNo
+IEluc3RpdHV0aW9ucyBSb290Q0EgMjAxMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+AKlTAOMupvaO+mDYLZU++CwqVE7NuYRhlFhPjz2L5EPzdYmNUeTDN9KKiE15HrcS3UN4SoqS5tdI
+1Q+kOilENbgH9mgdVc04UfCMJDGFr4PJfel3r+0ae50X+bOdOFAPplp5kYCvN66m0zH7tSYJnTxa
+71HFK9+WXesyHgLacEnsbgzImjeN9/E2YEsmLIKe0HjzDQ9jpFEw4fkrJxIH2Oq9GGKYsFk3fb7u
+8yBRQlqD75O6aRXxYp2fmTmCobd0LovUxQt7L/DICto9eQqakxylKHJzkUOap9FNhYS5qXSPFEDH
+3N6sQWRstBmbAmNtJGSPRLIl6s5ddAxjMlyNh+UCAwEAAaOBiTCBhjAPBgNVHRMBAf8EBTADAQH/
+MAsGA1UdDwQEAwIBBjAdBgNVHQ4EFgQUppFC/RNhSiOeCKQp5dgTBCPuQSUwRwYDVR0eBEAwPqA8
+MAWCAy5ncjAFggMuZXUwBoIELmVkdTAGggQub3JnMAWBAy5ncjAFgQMuZXUwBoEELmVkdTAGgQQu
+b3JnMA0GCSqGSIb3DQEBBQUAA4IBAQAf73lB4XtuP7KMhjdCSk4cNx6NZrokgclPEg8hwAOXhiVt
+XdMiKahsog2p6z0GW5k6x8zDmjR/qw7IThzh+uTczQ2+vyT+bOdrwg3IBp5OjWEopmr95fZi6hg8
+TqBTnbI6nOulnJEWtk2C4AwFSKls9cz4y51JtPACpf1wA+2KIaWuE4ZJwzNzvoc7dIsXRSZMFpGD
+/md9zU1jZ/rzAxKWeAaNsWftjj++n08C9bMJL/NMh98qy5V8AcysNnq/onN694/BtZqhFLKPM58N
+7yLcZnuEvUUXBj08yrl3NI/K6s8/MT7jiOOASSXIl7WdmplNsDz4SgCbZN2fOUvRJ9e4
+-----END CERTIFICATE-----
+
+Actalis Authentication Root CA
+==============================
+-----BEGIN CERTIFICATE-----
+MIIFuzCCA6OgAwIBAgIIVwoRl0LE48wwDQYJKoZIhvcNAQELBQAwazELMAkGA1UEBhMCSVQxDjAM
+BgNVBAcMBU1pbGFuMSMwIQYDVQQKDBpBY3RhbGlzIFMucC5BLi8wMzM1ODUyMDk2NzEnMCUGA1UE
+AwweQWN0YWxpcyBBdXRoZW50aWNhdGlvbiBSb290IENBMB4XDTExMDkyMjExMjIwMloXDTMwMDky
+MjExMjIwMlowazELMAkGA1UEBhMCSVQxDjAMBgNVBAcMBU1pbGFuMSMwIQYDVQQKDBpBY3RhbGlz
+IFMucC5BLi8wMzM1ODUyMDk2NzEnMCUGA1UEAwweQWN0YWxpcyBBdXRoZW50aWNhdGlvbiBSb290
+IENBMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAp8bEpSmkLO/lGMWwUKNvUTufClrJ
+wkg4CsIcoBh/kbWHuUA/3R1oHwiD1S0eiKD4j1aPbZkCkpAW1V8IbInX4ay8IMKx4INRimlNAJZa
+by/ARH6jDuSRzVju3PvHHkVH3Se5CAGfpiEd9UEtL0z9KK3giq0itFZljoZUj5NDKd45RnijMCO6
+zfB9E1fAXdKDa0hMxKufgFpbOr3JpyI/gCczWw63igxdBzcIy2zSekciRDXFzMwujt0q7bd9Zg1f
+YVEiVRvjRuPjPdA1YprbrxTIW6HMiRvhMCb8oJsfgadHHwTrozmSBp+Z07/T6k9QnBn+locePGX2
+oxgkg4YQ51Q+qDp2JE+BIcXjDwL4k5RHILv+1A7TaLndxHqEguNTVHnd25zS8gebLra8Pu2Fbe8l
+EfKXGkJh90qX6IuxEAf6ZYGyojnP9zz/GPvG8VqLWeICrHuS0E4UT1lF9gxeKF+w6D9Fz8+vm2/7
+hNN3WpVvrJSEnu68wEqPSpP4RCHiMUVhUE4Q2OM1fEwZtN4Fv6MGn8i1zeQf1xcGDXqVdFUNaBr8
+EBtiZJ1t4JWgw5QHVw0U5r0F+7if5t+L4sbnfpb2U8WANFAoWPASUHEXMLrmeGO89LKtmyuy/uE5
+jF66CyCU3nuDuP/jVo23Eek7jPKxwV2dpAtMK9myGPW1n0sCAwEAAaNjMGEwHQYDVR0OBBYEFFLY
+iDrIn3hm7YnzezhwlMkCAjbQMA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0jBBgwFoAUUtiIOsifeGbt
+ifN7OHCUyQICNtAwDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBCwUAA4ICAQALe3KHwGCmSUyI
+WOYdiPcUZEim2FgKDk8TNd81HdTtBjHIgT5q1d07GjLukD0R0i70jsNjLiNmsGe+b7bAEzlgqqI0
+JZN1Ut6nna0Oh4lScWoWPBkdg/iaKWW+9D+a2fDzWochcYBNy+A4mz+7+uAwTc+G02UQGRjRlwKx
+K3JCaKygvU5a2hi/a5iB0P2avl4VSM0RFbnAKVy06Ij3Pjaut2L9HmLecHgQHEhb2rykOLpn7VU+
+Xlff1ANATIGk0k9jpwlCCRT8AKnCgHNPLsBA2RF7SOp6AsDT6ygBJlh0wcBzIm2Tlf05fbsq4/aC
+4yyXX04fkZT6/iyj2HYauE2yOE+b+h1IYHkm4vP9qdCa6HCPSXrW5b0KDtst842/6+OkfcvHlXHo
+2qN8xcL4dJIEG4aspCJTQLas/kx2z/uUMsA1n3Y/buWQbqCmJqK4LL7RK4X9p2jIugErsWx0Hbhz
+lefut8cl8ABMALJ+tguLHPPAUJ4lueAI3jZm/zel0btUZCzJJ7VLkn5l/9Mt4blOvH+kQSGQQXem
+OR/qnuOf0GZvBeyqdn6/axag67XH/JJULysRJyU3eExRarDzzFhdFPFqSBX/wge2sY0PjlxQRrM9
+vwGYT7JZVEc+NHt4bVaTLnPqZih4zR0Uv6CPLy64Lo7yFIrM6bV8+2ydDKXhlg==
+-----END CERTIFICATE-----
+
+Trustis FPS Root CA
+===================
+-----BEGIN CERTIFICATE-----
+MIIDZzCCAk+gAwIBAgIQGx+ttiD5JNM2a/fH8YygWTANBgkqhkiG9w0BAQUFADBFMQswCQYDVQQG
+EwJHQjEYMBYGA1UEChMPVHJ1c3RpcyBMaW1pdGVkMRwwGgYDVQQLExNUcnVzdGlzIEZQUyBSb290
+IENBMB4XDTAzMTIyMzEyMTQwNloXDTI0MDEyMTExMzY1NFowRTELMAkGA1UEBhMCR0IxGDAWBgNV
+BAoTD1RydXN0aXMgTGltaXRlZDEcMBoGA1UECxMTVHJ1c3RpcyBGUFMgUm9vdCBDQTCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBAMVQe547NdDfxIzNjpvto8A2mfRC6qc+gIMPpqdZh8mQ
+RUN+AOqGeSoDvT03mYlmt+WKVoaTnGhLaASMk5MCPjDSNzoiYYkchU59j9WvezX2fihHiTHcDnlk
+H5nSW7r+f2C/revnPDgpai/lkQtV/+xvWNUtyd5MZnGPDNcE2gfmHhjjvSkCqPoc4Vu5g6hBSLwa
+cY3nYuUtsuvffM/bq1rKMfFMIvMFE/eC+XN5DL7XSxzA0RU8k0Fk0ea+IxciAIleH2ulrG6nS4zt
+o3Lmr2NNL4XSFDWaLk6M6jKYKIahkQlBOrTh4/L68MkKokHdqeMDx4gVOxzUGpTXn2RZEm0CAwEA
+AaNTMFEwDwYDVR0TAQH/BAUwAwEB/zAfBgNVHSMEGDAWgBS6+nEleYtXQSUhhgtx67JkDoshZzAd
+BgNVHQ4EFgQUuvpxJXmLV0ElIYYLceuyZA6LIWcwDQYJKoZIhvcNAQEFBQADggEBAH5Y//01GX2c
+GE+esCu8jowU/yyg2kdbw++BLa8F6nRIW/M+TgfHbcWzk88iNVy2P3UnXwmWzaD+vkAMXBJV+JOC
+yinpXj9WV4s4NvdFGkwozZ5BuO1WTISkQMi4sKUraXAEasP41BIy+Q7DsdwyhEQsb8tGD+pmQQ9P
+8Vilpg0ND2HepZ5dfWWhPBfnqFVO76DH7cZEf1T1o+CP8HxVIo8ptoGj4W1OLBuAZ+ytIJ8MYmHV
+l/9D7S3B2l0pKoU/rGXuhg8FjZBf3+6f9L/uHfuY5H+QK4R4EA5sSVPvFVtlRkpdr7r7OnIdzfYl
+iB6XzCGcKQENZetX2fNXlrtIzYE=
+-----END CERTIFICATE-----
+
+Buypass Class 2 Root CA
+=======================
+-----BEGIN CERTIFICATE-----
+MIIFWTCCA0GgAwIBAgIBAjANBgkqhkiG9w0BAQsFADBOMQswCQYDVQQGEwJOTzEdMBsGA1UECgwU
+QnV5cGFzcyBBUy05ODMxNjMzMjcxIDAeBgNVBAMMF0J1eXBhc3MgQ2xhc3MgMiBSb290IENBMB4X
+DTEwMTAyNjA4MzgwM1oXDTQwMTAyNjA4MzgwM1owTjELMAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1
+eXBhc3MgQVMtOTgzMTYzMzI3MSAwHgYDVQQDDBdCdXlwYXNzIENsYXNzIDIgUm9vdCBDQTCCAiIw
+DQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANfHXvfBB9R3+0Mh9PT1aeTuMgHbo4Yf5FkNuud1
+g1Lr6hxhFUi7HQfKjK6w3Jad6sNgkoaCKHOcVgb/S2TwDCo3SbXlzwx87vFKu3MwZfPVL4O2fuPn
+9Z6rYPnT8Z2SdIrkHJasW4DptfQxh6NR/Md+oW+OU3fUl8FVM5I+GC911K2GScuVr1QGbNgGE41b
+/+EmGVnAJLqBcXmQRFBoJJRfuLMR8SlBYaNByyM21cHxMlAQTn/0hpPshNOOvEu/XAFOBz3cFIqU
+CqTqc/sLUegTBxj6DvEr0VQVfTzh97QZQmdiXnfgolXsttlpF9U6r0TtSsWe5HonfOV116rLJeff
+awrbD02TTqigzXsu8lkBarcNuAeBfos4GzjmCleZPe4h6KP1DBbdi+w0jpwqHAAVF41og9JwnxgI
+zRFo1clrUs3ERo/ctfPYV3Me6ZQ5BL/T3jjetFPsaRyifsSP5BtwrfKi+fv3FmRmaZ9JUaLiFRhn
+Bkp/1Wy1TbMz4GHrXb7pmA8y1x1LPC5aAVKRCfLf6o3YBkBjqhHk/sM3nhRSP/TizPJhk9H9Z2vX
+Uq6/aKtAQ6BXNVN48FP4YUIHZMbXb5tMOA1jrGKvNouicwoN9SG9dKpN6nIDSdvHXx1iY8f93ZHs
+M+71bbRuMGjeyNYmsHVee7QHIJihdjK4TWxPAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wHQYD
+VR0OBBYEFMmAd+BikoL1RpzzuvdMw964o605MA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQsF
+AAOCAgEAU18h9bqwOlI5LJKwbADJ784g7wbylp7ppHR/ehb8t/W2+xUbP6umwHJdELFx7rxP462s
+A20ucS6vxOOto70MEae0/0qyexAQH6dXQbLArvQsWdZHEIjzIVEpMMpghq9Gqx3tOluwlN5E40EI
+osHsHdb9T7bWR9AUC8rmyrV7d35BH16Dx7aMOZawP5aBQW9gkOLo+fsicdl9sz1Gv7SEr5AcD48S
+aq/v7h56rgJKihcrdv6sVIkkLE8/trKnToyokZf7KcZ7XC25y2a2t6hbElGFtQl+Ynhw/qlqYLYd
+DnkM/crqJIByw5c/8nerQyIKx+u2DISCLIBrQYoIwOula9+ZEsuK1V6ADJHgJgg2SMX6OBE1/yWD
+LfJ6v9r9jv6ly0UsH8SIU653DtmadsWOLB2jutXsMq7Aqqz30XpN69QH4kj3Io6wpJ9qzo6ysmD0
+oyLQI+uUWnpp3Q+/QFesa1lQ2aOZ4W7+jQF5JyMV3pKdewlNWudLSDBaGOYKbeaP4NK75t98biGC
+wWg5TbSYWGZizEqQXsP6JwSxeRV0mcy+rSDeJmAc61ZRpqPq5KM/p/9h3PFaTWwyI0PurKju7koS
+CTxdccK+efrCh2gdC/1cacwG0Jp9VJkqyTkaGa9LKkPzY11aWOIv4x3kqdbQCtCev9eBCfHJxyYN
+rJgWVqA=
+-----END CERTIFICATE-----
+
+Buypass Class 3 Root CA
+=======================
+-----BEGIN CERTIFICATE-----
+MIIFWTCCA0GgAwIBAgIBAjANBgkqhkiG9w0BAQsFADBOMQswCQYDVQQGEwJOTzEdMBsGA1UECgwU
+QnV5cGFzcyBBUy05ODMxNjMzMjcxIDAeBgNVBAMMF0J1eXBhc3MgQ2xhc3MgMyBSb290IENBMB4X
+DTEwMTAyNjA4Mjg1OFoXDTQwMTAyNjA4Mjg1OFowTjELMAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1
+eXBhc3MgQVMtOTgzMTYzMzI3MSAwHgYDVQQDDBdCdXlwYXNzIENsYXNzIDMgUm9vdCBDQTCCAiIw
+DQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAKXaCpUWUOOV8l6ddjEGMnqb8RB2uACatVI2zSRH
+sJ8YZLya9vrVediQYkwiL944PdbgqOkcLNt4EemOaFEVcsfzM4fkoF0LXOBXByow9c3EN3coTRiR
+5r/VUv1xLXA+58bEiuPwKAv0dpihi4dVsjoT/Lc+JzeOIuOoTyrvYLs9tznDDgFHmV0ST9tD+leh
+7fmdvhFHJlsTmKtdFoqwNxxXnUX/iJY2v7vKB3tvh2PX0DJq1l1sDPGzbjniazEuOQAnFN44wOwZ
+ZoYS6J1yFhNkUsepNxz9gjDthBgd9K5c/3ATAOux9TN6S9ZV+AWNS2mw9bMoNlwUxFFzTWsL8TQH
+2xc519woe2v1n/MuwU8XKhDzzMro6/1rqy6any2CbgTUUgGTLT2G/H783+9CHaZr77kgxve9oKeV
+/afmiSTYzIw0bOIjL9kSGiG5VZFvC5F5GQytQIgLcOJ60g7YaEi7ghM5EFjp2CoHxhLbWNvSO1UQ
+RwUVZ2J+GGOmRj8JDlQyXr8NYnon74Do29lLBlo3WiXQCBJ31G8JUJc9yB3D34xFMFbG02SrZvPA
+Xpacw8Tvw3xrizp5f7NJzz3iiZ+gMEuFuZyUJHmPfWupRWgPK9Dx2hzLabjKSWJtyNBjYt1gD1iq
+j6G8BaVmos8bdrKEZLFMOVLAMLrwjEsCsLa3AgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wHQYD
+VR0OBBYEFEe4zf/lb+74suwvTg75JbCOPGvDMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQsF
+AAOCAgEAACAjQTUEkMJAYmDv4jVM1z+s4jSQuKFvdvoWFqRINyzpkMLyPPgKn9iB5btb2iUspKdV
+cSQy9sgL8rxq+JOssgfCX5/bzMiKqr5qb+FJEMwx14C7u8jYog5kV+qi9cKpMRXSIGrs/CIBKM+G
+uIAeqcwRpTzyFrNHnfzSgCHEy9BHcEGhyoMZCCxt8l13nIoUE9Q2HJLw5QY33KbmkJs4j1xrG0aG
+Q0JfPgEHU1RdZX33inOhmlRaHylDFCfChQ+1iHsaO5S3HWCntZznKWlXWpuTekMwGwPXYshApqr8
+ZORK15FTAaggiG6cX0S5y2CBNOxv033aSF/rtJC8LakcC6wc1aJoIIAE1vyxjy+7SjENSoYc6+I2
+KSb12tjE8nVhz36udmNKekBlk4f4HoCMhuWG1o8O/FMsYOgWYRqiPkN7zTlgVGr18okmAWiDSKIz
+6MkEkbIRNBE+6tBDGR8Dk5AM/1E9V/RBbuHLoL7ryWPNbczk+DaqaJ3tvV2XcEQNtg413OEMXbug
+UZTLfhbrES+jkkXITHHZvMmZUldGL1DPvTVp9D0VzgalLA8+9oG6lLvDu79leNKGef9JOxqDDPDe
+eOzI8k1MGt6CKfjBWtrt7uYnXuhF0J0cUahoq0Tj0Itq4/g7u9xN12TyUb7mqqta6THuBrxzvxNi
+Cp/HuZc=
+-----END CERTIFICATE-----
+
+T-TeleSec GlobalRoot Class 3
+============================
+-----BEGIN CERTIFICATE-----
+MIIDwzCCAqugAwIBAgIBATANBgkqhkiG9w0BAQsFADCBgjELMAkGA1UEBhMCREUxKzApBgNVBAoM
+IlQtU3lzdGVtcyBFbnRlcnByaXNlIFNlcnZpY2VzIEdtYkgxHzAdBgNVBAsMFlQtU3lzdGVtcyBU
+cnVzdCBDZW50ZXIxJTAjBgNVBAMMHFQtVGVsZVNlYyBHbG9iYWxSb290IENsYXNzIDMwHhcNMDgx
+MDAxMTAyOTU2WhcNMzMxMDAxMjM1OTU5WjCBgjELMAkGA1UEBhMCREUxKzApBgNVBAoMIlQtU3lz
+dGVtcyBFbnRlcnByaXNlIFNlcnZpY2VzIEdtYkgxHzAdBgNVBAsMFlQtU3lzdGVtcyBUcnVzdCBD
+ZW50ZXIxJTAjBgNVBAMMHFQtVGVsZVNlYyBHbG9iYWxSb290IENsYXNzIDMwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQC9dZPwYiJvJK7genasfb3ZJNW4t/zN8ELg63iIVl6bmlQdTQyK
+9tPPcPRStdiTBONGhnFBSivwKixVA9ZIw+A5OO3yXDw/RLyTPWGrTs0NvvAgJ1gORH8EGoel15YU
+NpDQSXuhdfsaa3Ox+M6pCSzyU9XDFES4hqX2iys52qMzVNn6chr3IhUciJFrf2blw2qAsCTz34ZF
+iP0Zf3WHHx+xGwpzJFu5ZeAsVMhg02YXP+HMVDNzkQI6pn97djmiH5a2OK61yJN0HZ65tOVgnS9W
+0eDrXltMEnAMbEQgqxHY9Bn20pxSN+f6tsIxO0rUFJmtxxr1XV/6B7h8DR/Wgx6zAgMBAAGjQjBA
+MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBS1A/d2O2GCahKqGFPr
+AyGUv/7OyjANBgkqhkiG9w0BAQsFAAOCAQEAVj3vlNW92nOyWL6ukK2YJ5f+AbGwUgC4TeQbIXQb
+fsDuXmkqJa9c1h3a0nnJ85cp4IaH3gRZD/FZ1GSFS5mvJQQeyUapl96Cshtwn5z2r3Ex3XsFpSzT
+ucpH9sry9uetuUg/vBa3wW306gmv7PO15wWeph6KU1HWk4HMdJP2udqmJQV0eVp+QD6CSyYRMG7h
+P0HHRwA11fXT91Q+gT3aSWqas+8QPebrb9HIIkfLzM8BMZLZGOMivgkeGj5asuRrDFR6fUNOuIml
+e9eiPZaGzPImNC1qkp2aGtAw4l1OBLBfiyB+d8E9lYLRRpo7PHi4b6HQDWSieB4pTpPDpFQUWw==
+-----END CERTIFICATE-----
+
+EE Certification Centre Root CA
+===============================
+-----BEGIN CERTIFICATE-----
+MIIEAzCCAuugAwIBAgIQVID5oHPtPwBMyonY43HmSjANBgkqhkiG9w0BAQUFADB1MQswCQYDVQQG
+EwJFRTEiMCAGA1UECgwZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1czEoMCYGA1UEAwwfRUUgQ2Vy
+dGlmaWNhdGlvbiBDZW50cmUgUm9vdCBDQTEYMBYGCSqGSIb3DQEJARYJcGtpQHNrLmVlMCIYDzIw
+MTAxMDMwMTAxMDMwWhgPMjAzMDEyMTcyMzU5NTlaMHUxCzAJBgNVBAYTAkVFMSIwIAYDVQQKDBlB
+UyBTZXJ0aWZpdHNlZXJpbWlza2Vza3VzMSgwJgYDVQQDDB9FRSBDZXJ0aWZpY2F0aW9uIENlbnRy
+ZSBSb290IENBMRgwFgYJKoZIhvcNAQkBFglwa2lAc2suZWUwggEiMA0GCSqGSIb3DQEBAQUAA4IB
+DwAwggEKAoIBAQDIIMDs4MVLqwd4lfNE7vsLDP90jmG7sWLqI9iroWUyeuuOF0+W2Ap7kaJjbMeM
+TC55v6kF/GlclY1i+blw7cNRfdCT5mzrMEvhvH2/UpvObntl8jixwKIy72KyaOBhU8E2lf/slLo2
+rpwcpzIP5Xy0xm90/XsY6KxX7QYgSzIwWFv9zajmofxwvI6Sc9uXp3whrj3B9UiHbCe9nyV0gVWw
+93X2PaRka9ZP585ArQ/dMtO8ihJTmMmJ+xAdTX7Nfh9WDSFwhfYggx/2uh8Ej+p3iDXE/+pOoYtN
+P2MbRMNE1CV2yreN1x5KZmTNXMWcg+HCCIia7E6j8T4cLNlsHaFLAgMBAAGjgYowgYcwDwYDVR0T
+AQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFBLyWj7qVhy/zQas8fElyalL1BSZ
+MEUGA1UdJQQ+MDwGCCsGAQUFBwMCBggrBgEFBQcDAQYIKwYBBQUHAwMGCCsGAQUFBwMEBggrBgEF
+BQcDCAYIKwYBBQUHAwkwDQYJKoZIhvcNAQEFBQADggEBAHv25MANqhlHt01Xo/6tu7Fq1Q+e2+Rj
+xY6hUFaTlrg4wCQiZrxTFGGVv9DHKpY5P30osxBAIWrEr7BSdxjhlthWXePdNl4dp1BUoMUq5KqM
+lIpPnTX/dqQGE5Gion0ARD9V04I8GtVbvFZMIi5GQ4okQC3zErg7cBqklrkar4dBGmoYDQZPxz5u
+uSlNDUmJEYcyW+ZLBMjkXOZ0c5RdFpgTlf7727FE5TpwrDdr5rMzcijJs1eg9gIWiAYLtqZLICjU
+3j2LrTcFU3T+bsy8QxdxXvnFzBqpYe73dgzzcvRyrc9yAjYHR8/vGVCJYMzpJJUPwssd8m92kMfM
+dcGWxZ0=
+-----END CERTIFICATE-----
+
+D-TRUST Root Class 3 CA 2 2009
+==============================
+-----BEGIN CERTIFICATE-----
+MIIEMzCCAxugAwIBAgIDCYPzMA0GCSqGSIb3DQEBCwUAME0xCzAJBgNVBAYTAkRFMRUwEwYDVQQK
+DAxELVRydXN0IEdtYkgxJzAlBgNVBAMMHkQtVFJVU1QgUm9vdCBDbGFzcyAzIENBIDIgMjAwOTAe
+Fw0wOTExMDUwODM1NThaFw0yOTExMDUwODM1NThaME0xCzAJBgNVBAYTAkRFMRUwEwYDVQQKDAxE
+LVRydXN0IEdtYkgxJzAlBgNVBAMMHkQtVFJVU1QgUm9vdCBDbGFzcyAzIENBIDIgMjAwOTCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANOySs96R+91myP6Oi/WUEWJNTrGa9v+2wBoqOAD
+ER03UAifTUpolDWzU9GUY6cgVq/eUXjsKj3zSEhQPgrfRlWLJ23DEE0NkVJD2IfgXU42tSHKXzlA
+BF9bfsyjxiupQB7ZNoTWSPOSHjRGICTBpFGOShrvUD9pXRl/RcPHAY9RySPocq60vFYJfxLLHLGv
+KZAKyVXMD9O0Gu1HNVpK7ZxzBCHQqr0ME7UAyiZsxGsMlFqVlNpQmvH/pStmMaTJOKDfHR+4CS7z
+p+hnUquVH+BGPtikw8paxTGA6Eian5Rp/hnd2HN8gcqW3o7tszIFZYQ05ub9VxC1X3a/L7AQDcUC
+AwEAAaOCARowggEWMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFP3aFMSfMN4hvR5COfyrYyNJ
+4PGEMA4GA1UdDwEB/wQEAwIBBjCB0wYDVR0fBIHLMIHIMIGAoH6gfIZ6bGRhcDovL2RpcmVjdG9y
+eS5kLXRydXN0Lm5ldC9DTj1ELVRSVVNUJTIwUm9vdCUyMENsYXNzJTIwMyUyMENBJTIwMiUyMDIw
+MDksTz1ELVRydXN0JTIwR21iSCxDPURFP2NlcnRpZmljYXRlcmV2b2NhdGlvbmxpc3QwQ6BBoD+G
+PWh0dHA6Ly93d3cuZC10cnVzdC5uZXQvY3JsL2QtdHJ1c3Rfcm9vdF9jbGFzc18zX2NhXzJfMjAw
+OS5jcmwwDQYJKoZIhvcNAQELBQADggEBAH+X2zDI36ScfSF6gHDOFBJpiBSVYEQBrLLpME+bUMJm
+2H6NMLVwMeniacfzcNsgFYbQDfC+rAF1hM5+n02/t2A7nPPKHeJeaNijnZflQGDSNiH+0LS4F9p0
+o3/U37CYAqxva2ssJSRyoWXuJVrl5jLn8t+rSfrzkGkj2wTZ51xY/GXUl77M/C4KzCUqNQT4YJEV
+dT1B/yMfGchs64JTBKbkTCJNjYy6zltz7GRUUG3RnFX7acM2w4y8PIWmawomDeCTmGCufsYkl4ph
+X5GOZpIJhzbNi5stPvZR1FDUWSi9g/LMKHtThm3YJohw1+qRzT65ysCQblrGXnRl11z+o+I=
+-----END CERTIFICATE-----
+
+D-TRUST Root Class 3 CA 2 EV 2009
+=================================
+-----BEGIN CERTIFICATE-----
+MIIEQzCCAyugAwIBAgIDCYP0MA0GCSqGSIb3DQEBCwUAMFAxCzAJBgNVBAYTAkRFMRUwEwYDVQQK
+DAxELVRydXN0IEdtYkgxKjAoBgNVBAMMIUQtVFJVU1QgUm9vdCBDbGFzcyAzIENBIDIgRVYgMjAw
+OTAeFw0wOTExMDUwODUwNDZaFw0yOTExMDUwODUwNDZaMFAxCzAJBgNVBAYTAkRFMRUwEwYDVQQK
+DAxELVRydXN0IEdtYkgxKjAoBgNVBAMMIUQtVFJVU1QgUm9vdCBDbGFzcyAzIENBIDIgRVYgMjAw
+OTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJnxhDRwui+3MKCOvXwEz75ivJn9gpfS
+egpnljgJ9hBOlSJzmY3aFS3nBfwZcyK3jpgAvDw9rKFs+9Z5JUut8Mxk2og+KbgPCdM03TP1YtHh
+zRnp7hhPTFiu4h7WDFsVWtg6uMQYZB7jM7K1iXdODL/ZlGsTl28So/6ZqQTMFexgaDbtCHu39b+T
+7WYxg4zGcTSHThfqr4uRjRxWQa4iN1438h3Z0S0NL2lRp75mpoo6Kr3HGrHhFPC+Oh25z1uxav60
+sUYgovseO3Dvk5h9jHOW8sXvhXCtKSb8HgQ+HKDYD8tSg2J87otTlZCpV6LqYQXY+U3EJ/pure35
+11H3a6UCAwEAAaOCASQwggEgMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFNOUikxiEyoZLsyv
+cop9NteaHNxnMA4GA1UdDwEB/wQEAwIBBjCB3QYDVR0fBIHVMIHSMIGHoIGEoIGBhn9sZGFwOi8v
+ZGlyZWN0b3J5LmQtdHJ1c3QubmV0L0NOPUQtVFJVU1QlMjBSb290JTIwQ2xhc3MlMjAzJTIwQ0El
+MjAyJTIwRVYlMjAyMDA5LE89RC1UcnVzdCUyMEdtYkgsQz1ERT9jZXJ0aWZpY2F0ZXJldm9jYXRp
+b25saXN0MEagRKBChkBodHRwOi8vd3d3LmQtdHJ1c3QubmV0L2NybC9kLXRydXN0X3Jvb3RfY2xh
+c3NfM19jYV8yX2V2XzIwMDkuY3JsMA0GCSqGSIb3DQEBCwUAA4IBAQA07XtaPKSUiO8aEXUHL7P+
+PPoeUSbrh/Yp3uDx1MYkCenBz1UbtDDZzhr+BlGmFaQt77JLvyAoJUnRpjZ3NOhk31KxEcdzes05
+nsKtjHEh8lprr988TlWvsoRlFIm5d8sqMb7Po23Pb0iUMkZv53GMoKaEGTcH8gNFCSuGdXzfX2lX
+ANtu2KZyIktQ1HWYVt+3GP9DQ1CuekR78HlR10M9p9OB0/DJT7naxpeG0ILD5EJt/rDiZE4OJudA
+NCa1CInXCGNjOCd1HjPqbqjdn5lPdE2BiYBL3ZqXKVwvvoFBuYz/6n1gBp7N1z3TLqMVvKjmJuVv
+w9y4AyHqnxbxLFS1
+-----END CERTIFICATE-----
+
+CA Disig Root R2
+================
+-----BEGIN CERTIFICATE-----
+MIIFaTCCA1GgAwIBAgIJAJK4iNuwisFjMA0GCSqGSIb3DQEBCwUAMFIxCzAJBgNVBAYTAlNLMRMw
+EQYDVQQHEwpCcmF0aXNsYXZhMRMwEQYDVQQKEwpEaXNpZyBhLnMuMRkwFwYDVQQDExBDQSBEaXNp
+ZyBSb290IFIyMB4XDTEyMDcxOTA5MTUzMFoXDTQyMDcxOTA5MTUzMFowUjELMAkGA1UEBhMCU0sx
+EzARBgNVBAcTCkJyYXRpc2xhdmExEzARBgNVBAoTCkRpc2lnIGEucy4xGTAXBgNVBAMTEENBIERp
+c2lnIFJvb3QgUjIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCio8QACdaFXS1tFPbC
+w3OeNcJxVX6B+6tGUODBfEl45qt5WDza/3wcn9iXAng+a0EE6UG9vgMsRfYvZNSrXaNHPWSb6Wia
+xswbP7q+sos0Ai6YVRn8jG+qX9pMzk0DIaPY0jSTVpbLTAwAFjxfGs3Ix2ymrdMxp7zo5eFm1tL7
+A7RBZckQrg4FY8aAamkw/dLukO8NJ9+flXP04SXabBbeQTg06ov80egEFGEtQX6sx3dOy1FU+16S
+GBsEWmjGycT6txOgmLcRK7fWV8x8nhfRyyX+hk4kLlYMeE2eARKmK6cBZW58Yh2EhN/qwGu1pSqV
+g8NTEQxzHQuyRpDRQjrOQG6Vrf/GlK1ul4SOfW+eioANSW1z4nuSHsPzwfPrLgVv2RvPN3YEyLRa
+5Beny912H9AZdugsBbPWnDTYltxhh5EF5EQIM8HauQhl1K6yNg3ruji6DOWbnuuNZt2Zz9aJQfYE
+koopKW1rOhzndX0CcQ7zwOe9yxndnWCywmZgtrEE7snmhrmaZkCo5xHtgUUDi/ZnWejBBhG93c+A
+Ak9lQHhcR1DIm+YfgXvkRKhbhZri3lrVx/k6RGZL5DJUfORsnLMOPReisjQS1n6yqEm70XooQL6i
+Fh/f5DcfEXP7kAplQ6INfPgGAVUzfbANuPT1rqVCV3w2EYx7XsQDnYx5nQIDAQABo0IwQDAPBgNV
+HRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUtZn4r7CU9eMg1gqtzk5WpC5u
+Qu0wDQYJKoZIhvcNAQELBQADggIBACYGXnDnZTPIgm7ZnBc6G3pmsgH2eDtpXi/q/075KMOYKmFM
+tCQSin1tERT3nLXK5ryeJ45MGcipvXrA1zYObYVybqjGom32+nNjf7xueQgcnYqfGopTpti72TVV
+sRHFqQOzVju5hJMiXn7B9hJSi+osZ7z+Nkz1uM/Rs0mSO9MpDpkblvdhuDvEK7Z4bLQjb/D907Je
+dR+Zlais9trhxTF7+9FGs9K8Z7RiVLoJ92Owk6Ka+elSLotgEqv89WBW7xBci8QaQtyDW2QOy7W8
+1k/BfDxujRNt+3vrMNDcTa/F1balTFtxyegxvug4BkihGuLq0t4SOVga/4AOgnXmt8kHbA7v/zjx
+mHHEt38OFdAlab0inSvtBfZGR6ztwPDUO+Ls7pZbkBNOHlY667DvlruWIxG68kOGdGSVyCh13x01
+utI3gzhTODY7z2zp+WsO0PsE6E9312UBeIYMej4hYvF/Y3EMyZ9E26gnonW+boE+18DrG5gPcFw0
+sorMwIUY6256s/daoQe/qUKS82Ail+QUoQebTnbAjn39pCXHR+3/H3OszMOl6W8KjptlwlCFtaOg
+UxLMVYdh84GuEEZhvUQhuMI9dM9+JDX6HAcOmz0iyu8xL4ysEr3vQCj8KWefshNPZiTEUxnpHikV
+7+ZtsH8tZ/3zbBt1RqPlShfppNcL
+-----END CERTIFICATE-----
+
+ACCVRAIZ1
+=========
+-----BEGIN CERTIFICATE-----
+MIIH0zCCBbugAwIBAgIIXsO3pkN/pOAwDQYJKoZIhvcNAQEFBQAwQjESMBAGA1UEAwwJQUNDVlJB
+SVoxMRAwDgYDVQQLDAdQS0lBQ0NWMQ0wCwYDVQQKDARBQ0NWMQswCQYDVQQGEwJFUzAeFw0xMTA1
+MDUwOTM3MzdaFw0zMDEyMzEwOTM3MzdaMEIxEjAQBgNVBAMMCUFDQ1ZSQUlaMTEQMA4GA1UECwwH
+UEtJQUNDVjENMAsGA1UECgwEQUNDVjELMAkGA1UEBhMCRVMwggIiMA0GCSqGSIb3DQEBAQUAA4IC
+DwAwggIKAoICAQCbqau/YUqXry+XZpp0X9DZlv3P4uRm7x8fRzPCRKPfmt4ftVTdFXxpNRFvu8gM
+jmoYHtiP2Ra8EEg2XPBjs5BaXCQ316PWywlxufEBcoSwfdtNgM3802/J+Nq2DoLSRYWoG2ioPej0
+RGy9ocLLA76MPhMAhN9KSMDjIgro6TenGEyxCQ0jVn8ETdkXhBilyNpAlHPrzg5XPAOBOp0KoVdD
+aaxXbXmQeOW1tDvYvEyNKKGno6e6Ak4l0Squ7a4DIrhrIA8wKFSVf+DuzgpmndFALW4ir50awQUZ
+0m/A8p/4e7MCQvtQqR0tkw8jq8bBD5L/0KIV9VMJcRz/RROE5iZe+OCIHAr8Fraocwa48GOEAqDG
+WuzndN9wrqODJerWx5eHk6fGioozl2A3ED6XPm4pFdahD9GILBKfb6qkxkLrQaLjlUPTAYVtjrs7
+8yM2x/474KElB0iryYl0/wiPgL/AlmXz7uxLaL2diMMxs0Dx6M/2OLuc5NF/1OVYm3z61PMOm3WR
+5LpSLhl+0fXNWhn8ugb2+1KoS5kE3fj5tItQo05iifCHJPqDQsGH+tUtKSpacXpkatcnYGMN285J
+9Y0fkIkyF/hzQ7jSWpOGYdbhdQrqeWZ2iE9x6wQl1gpaepPluUsXQA+xtrn13k/c4LOsOxFwYIRK
+Q26ZIMApcQrAZQIDAQABo4ICyzCCAscwfQYIKwYBBQUHAQEEcTBvMEwGCCsGAQUFBzAChkBodHRw
+Oi8vd3d3LmFjY3YuZXMvZmlsZWFkbWluL0FyY2hpdm9zL2NlcnRpZmljYWRvcy9yYWl6YWNjdjEu
+Y3J0MB8GCCsGAQUFBzABhhNodHRwOi8vb2NzcC5hY2N2LmVzMB0GA1UdDgQWBBTSh7Tj3zcnk1X2
+VuqB5TbMjB4/vTAPBgNVHRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFNKHtOPfNyeTVfZW6oHlNsyM
+Hj+9MIIBcwYDVR0gBIIBajCCAWYwggFiBgRVHSAAMIIBWDCCASIGCCsGAQUFBwICMIIBFB6CARAA
+QQB1AHQAbwByAGkAZABhAGQAIABkAGUAIABDAGUAcgB0AGkAZgBpAGMAYQBjAGkA8wBuACAAUgBh
+AO0AegAgAGQAZQAgAGwAYQAgAEEAQwBDAFYAIAAoAEEAZwBlAG4AYwBpAGEAIABkAGUAIABUAGUA
+YwBuAG8AbABvAGcA7QBhACAAeQAgAEMAZQByAHQAaQBmAGkAYwBhAGMAaQDzAG4AIABFAGwAZQBj
+AHQAcgDzAG4AaQBjAGEALAAgAEMASQBGACAAUQA0ADYAMAAxADEANQA2AEUAKQAuACAAQwBQAFMA
+IABlAG4AIABoAHQAdABwADoALwAvAHcAdwB3AC4AYQBjAGMAdgAuAGUAczAwBggrBgEFBQcCARYk
+aHR0cDovL3d3dy5hY2N2LmVzL2xlZ2lzbGFjaW9uX2MuaHRtMFUGA1UdHwROMEwwSqBIoEaGRGh0
+dHA6Ly93d3cuYWNjdi5lcy9maWxlYWRtaW4vQXJjaGl2b3MvY2VydGlmaWNhZG9zL3JhaXphY2N2
+MV9kZXIuY3JsMA4GA1UdDwEB/wQEAwIBBjAXBgNVHREEEDAOgQxhY2N2QGFjY3YuZXMwDQYJKoZI
+hvcNAQEFBQADggIBAJcxAp/n/UNnSEQU5CmH7UwoZtCPNdpNYbdKl02125DgBS4OxnnQ8pdpD70E
+R9m+27Up2pvZrqmZ1dM8MJP1jaGo/AaNRPTKFpV8M9xii6g3+CfYCS0b78gUJyCpZET/LtZ1qmxN
+YEAZSUNUY9rizLpm5U9EelvZaoErQNV/+QEnWCzI7UiRfD+mAM/EKXMRNt6GGT6d7hmKG9Ww7Y49
+nCrADdg9ZuM8Db3VlFzi4qc1GwQA9j9ajepDvV+JHanBsMyZ4k0ACtrJJ1vnE5Bc5PUzolVt3OAJ
+TS+xJlsndQAJxGJ3KQhfnlmstn6tn1QwIgPBHnFk/vk4CpYY3QIUrCPLBhwepH2NDd4nQeit2hW3
+sCPdK6jT2iWH7ehVRE2I9DZ+hJp4rPcOVkkO1jMl1oRQQmwgEh0q1b688nCBpHBgvgW1m54ERL5h
+I6zppSSMEYCUWqKiuUnSwdzRp+0xESyeGabu4VXhwOrPDYTkF7eifKXeVSUG7szAh1xA2syVP1Xg
+Nce4hL60Xc16gwFy7ofmXx2utYXGJt/mwZrpHgJHnyqobalbz+xFd3+YJ5oyXSrjhO7FmGYvliAd
+3djDJ9ew+f7Zfc3Qn48LFFhRny+Lwzgt3uiP1o2HpPVWQxaZLPSkVrQ0uGE3ycJYgBugl6H8WY3p
+EfbRD0tVNEYqi4Y7
+-----END CERTIFICATE-----
+
+TWCA Global Root CA
+===================
+-----BEGIN CERTIFICATE-----
+MIIFQTCCAymgAwIBAgICDL4wDQYJKoZIhvcNAQELBQAwUTELMAkGA1UEBhMCVFcxEjAQBgNVBAoT
+CVRBSVdBTi1DQTEQMA4GA1UECxMHUm9vdCBDQTEcMBoGA1UEAxMTVFdDQSBHbG9iYWwgUm9vdCBD
+QTAeFw0xMjA2MjcwNjI4MzNaFw0zMDEyMzExNTU5NTlaMFExCzAJBgNVBAYTAlRXMRIwEAYDVQQK
+EwlUQUlXQU4tQ0ExEDAOBgNVBAsTB1Jvb3QgQ0ExHDAaBgNVBAMTE1RXQ0EgR2xvYmFsIFJvb3Qg
+Q0EwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCwBdvI64zEbooh745NnHEKH1Jw7W2C
+nJfF10xORUnLQEK1EjRsGcJ0pDFfhQKX7EMzClPSnIyOt7h52yvVavKOZsTuKwEHktSz0ALfUPZV
+r2YOy+BHYC8rMjk1Ujoog/h7FsYYuGLWRyWRzvAZEk2tY/XTP3VfKfChMBwqoJimFb3u/Rk28OKR
+Q4/6ytYQJ0lM793B8YVwm8rqqFpD/G2Gb3PpN0Wp8DbHzIh1HrtsBv+baz4X7GGqcXzGHaL3SekV
+tTzWoWH1EfcFbx39Eb7QMAfCKbAJTibc46KokWofwpFFiFzlmLhxpRUZyXx1EcxwdE8tmx2RRP1W
+KKD+u4ZqyPpcC1jcxkt2yKsi2XMPpfRaAok/T54igu6idFMqPVMnaR1sjjIsZAAmY2E2TqNGtz99
+sy2sbZCilaLOz9qC5wc0GZbpuCGqKX6mOL6OKUohZnkfs8O1CWfe1tQHRvMq2uYiN2DLgbYPoA/p
+yJV/v1WRBXrPPRXAb94JlAGD1zQbzECl8LibZ9WYkTunhHiVJqRaCPgrdLQABDzfuBSO6N+pjWxn
+kjMdwLfS7JLIvgm/LCkFbwJrnu+8vyq8W8BQj0FwcYeyTbcEqYSjMq+u7msXi7Kx/mzhkIyIqJdI
+zshNy/MGz19qCkKxHh53L46g5pIOBvwFItIm4TFRfTLcDwIDAQABoyMwITAOBgNVHQ8BAf8EBAMC
+AQYwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAgEAXzSBdu+WHdXltdkCY4QWwa6g
+cFGn90xHNcgL1yg9iXHZqjNB6hQbbCEAwGxCGX6faVsgQt+i0trEfJdLjbDorMjupWkEmQqSpqsn
+LhpNgb+E1HAerUf+/UqdM+DyucRFCCEK2mlpc3INvjT+lIutwx4116KD7+U4x6WFH6vPNOw/KP4M
+8VeGTslV9xzU2KV9Bnpv1d8Q34FOIWWxtuEXeZVFBs5fzNxGiWNoRI2T9GRwoD2dKAXDOXC4Ynsg
+/eTb6QihuJ49CcdP+yz4k3ZB3lLg4VfSnQO8d57+nile98FRYB/e2guyLXW3Q0iT5/Z5xoRdgFlg
+lPx4mI88k1HtQJAH32RjJMtOcQWh15QaiDLxInQirqWm2BJpTGCjAu4r7NRjkgtevi92a6O2JryP
+A9gK8kxkRr05YuWW6zRjESjMlfGt7+/cgFhI6Uu46mWs6fyAtbXIRfmswZ/ZuepiiI7E8UuDEq3m
+i4TWnsLrgxifarsbJGAzcMzs9zLzXNl5fe+epP7JI8Mk7hWSsT2RTyaGvWZzJBPqpK5jwa19hAM8
+EHiGG3njxPPyBJUgriOCxLM6AGK/5jYk4Ve6xx6QddVfP5VhK8E7zeWzaGHQRiapIVJpLesux+t3
+zqY6tQMzT3bR51xUAV3LePTJDL/PEo4XLSNolOer/qmyKwbQBM0=
+-----END CERTIFICATE-----
+
+TeliaSonera Root CA v1
+======================
+-----BEGIN CERTIFICATE-----
+MIIFODCCAyCgAwIBAgIRAJW+FqD3LkbxezmCcvqLzZYwDQYJKoZIhvcNAQEFBQAwNzEUMBIGA1UE
+CgwLVGVsaWFTb25lcmExHzAdBgNVBAMMFlRlbGlhU29uZXJhIFJvb3QgQ0EgdjEwHhcNMDcxMDE4
+MTIwMDUwWhcNMzIxMDE4MTIwMDUwWjA3MRQwEgYDVQQKDAtUZWxpYVNvbmVyYTEfMB0GA1UEAwwW
+VGVsaWFTb25lcmEgUm9vdCBDQSB2MTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMK+
+6yfwIaPzaSZVfp3FVRaRXP3vIb9TgHot0pGMYzHw7CTww6XScnwQbfQ3t+XmfHnqjLWCi65ItqwA
+3GV17CpNX8GH9SBlK4GoRz6JI5UwFpB/6FcHSOcZrr9FZ7E3GwYq/t75rH2D+1665I+XZ75Ljo1k
+B1c4VWk0Nj0TSO9P4tNmHqTPGrdeNjPUtAa9GAH9d4RQAEX1jF3oI7x+/jXh7VB7qTCNGdMJjmhn
+Xb88lxhTuylixcpecsHHltTbLaC0H2kD7OriUPEMPPCs81Mt8Bz17Ww5OXOAFshSsCPN4D7c3TxH
+oLs1iuKYaIu+5b9y7tL6pe0S7fyYGKkmdtwoSxAgHNN/Fnct7W+A90m7UwW7XWjH1Mh1Fj+JWov3
+F0fUTPHSiXk+TT2YqGHeOh7S+F4D4MHJHIzTjU3TlTazN19jY5szFPAtJmtTfImMMsJu7D0hADnJ
+oWjiUIMusDor8zagrC/kb2HCUQk5PotTubtn2txTuXZZNp1D5SDgPTJghSJRt8czu90VL6R4pgd7
+gUY2BIbdeTXHlSw7sKMXNeVzH7RcWe/a6hBle3rQf5+ztCo3O3CLm1u5K7fsslESl1MpWtTwEhDc
+TwK7EpIvYtQ/aUN8Ddb8WHUBiJ1YFkveupD/RwGJBmr2X7KQarMCpgKIv7NHfirZ1fpoeDVNAgMB
+AAGjPzA9MA8GA1UdEwEB/wQFMAMBAf8wCwYDVR0PBAQDAgEGMB0GA1UdDgQWBBTwj1k4ALP1j5qW
+DNXr+nuqF+gTEjANBgkqhkiG9w0BAQUFAAOCAgEAvuRcYk4k9AwI//DTDGjkk0kiP0Qnb7tt3oNm
+zqjMDfz1mgbldxSR651Be5kqhOX//CHBXfDkH1e3damhXwIm/9fH907eT/j3HEbAek9ALCI18Bmx
+0GtnLLCo4MBANzX2hFxc469CeP6nyQ1Q6g2EdvZR74NTxnr/DlZJLo961gzmJ1TjTQpgcmLNkQfW
+pb/ImWvtxBnmq0wROMVvMeJuScg/doAmAyYp4Db29iBT4xdwNBedY2gea+zDTYa4EzAvXUYNR0PV
+G6pZDrlcjQZIrXSHX8f8MVRBE+LHIQ6e4B4N4cB7Q4WQxYpYxmUKeFfyxiMPAdkgS94P+5KFdSpc
+c41teyWRyu5FrgZLAMzTsVlQ2jqIOylDRl6XK1TOU2+NSueW+r9xDkKLfP0ooNBIytrEgUy7onOT
+JsjrDNYmiLbAJM+7vVvrdX3pCI6GMyx5dwlppYn8s3CQh3aP0yK7Qs69cwsgJirQmz1wHiRszYd2
+qReWt88NkvuOGKmYSdGe/mBEciG5Ge3C9THxOUiIkCR1VBatzvT4aRRkOfujuLpwQMcnHL/EVlP6
+Y2XQ8xwOFvVrhlhNGNTkDY6lnVuR3HYkUD/GKvvZt5y11ubQ2egZixVxSK236thZiNSQvxaz2ems
+WWFUyBy6ysHK4bkgTI86k4mloMy/0/Z1pHWWbVY=
+-----END CERTIFICATE-----
+
+E-Tugra Certification Authority
+===============================
+-----BEGIN CERTIFICATE-----
+MIIGSzCCBDOgAwIBAgIIamg+nFGby1MwDQYJKoZIhvcNAQELBQAwgbIxCzAJBgNVBAYTAlRSMQ8w
+DQYDVQQHDAZBbmthcmExQDA+BgNVBAoMN0UtVHXEn3JhIEVCRyBCaWxpxZ9pbSBUZWtub2xvamls
+ZXJpIHZlIEhpem1ldGxlcmkgQS7Fni4xJjAkBgNVBAsMHUUtVHVncmEgU2VydGlmaWthc3lvbiBN
+ZXJrZXppMSgwJgYDVQQDDB9FLVR1Z3JhIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MB4XDTEzMDMw
+NTEyMDk0OFoXDTIzMDMwMzEyMDk0OFowgbIxCzAJBgNVBAYTAlRSMQ8wDQYDVQQHDAZBbmthcmEx
+QDA+BgNVBAoMN0UtVHXEn3JhIEVCRyBCaWxpxZ9pbSBUZWtub2xvamlsZXJpIHZlIEhpem1ldGxl
+cmkgQS7Fni4xJjAkBgNVBAsMHUUtVHVncmEgU2VydGlmaWthc3lvbiBNZXJrZXppMSgwJgYDVQQD
+DB9FLVR1Z3JhIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIICIjANBgkqhkiG9w0BAQEFAAOCAg8A
+MIICCgKCAgEA4vU/kwVRHoViVF56C/UYB4Oufq9899SKa6VjQzm5S/fDxmSJPZQuVIBSOTkHS0vd
+hQd2h8y/L5VMzH2nPbxHD5hw+IyFHnSOkm0bQNGZDbt1bsipa5rAhDGvykPL6ys06I+XawGb1Q5K
+CKpbknSFQ9OArqGIW66z6l7LFpp3RMih9lRozt6Plyu6W0ACDGQXwLWTzeHxE2bODHnv0ZEoq1+g
+ElIwcxmOj+GMB6LDu0rw6h8VqO4lzKRG+Bsi77MOQ7osJLjFLFzUHPhdZL3Dk14opz8n8Y4e0ypQ
+BaNV2cvnOVPAmJ6MVGKLJrD3fY185MaeZkJVgkfnsliNZvcHfC425lAcP9tDJMW/hkd5s3kc91r0
+E+xs+D/iWR+V7kI+ua2oMoVJl0b+SzGPWsutdEcf6ZG33ygEIqDUD13ieU/qbIWGvaimzuT6w+Gz
+rt48Ue7LE3wBf4QOXVGUnhMMti6lTPk5cDZvlsouDERVxcr6XQKj39ZkjFqzAQqptQpHF//vkUAq
+jqFGOjGY5RH8zLtJVor8udBhmm9lbObDyz51Sf6Pp+KJxWfXnUYTTjF2OySznhFlhqt/7x3U+Lzn
+rFpct1pHXFXOVbQicVtbC/DP3KBhZOqp12gKY6fgDT+gr9Oq0n7vUaDmUStVkhUXU8u3Zg5mTPj5
+dUyQ5xJwx0UCAwEAAaNjMGEwHQYDVR0OBBYEFC7j27JJ0JxUeVz6Jyr+zE7S6E5UMA8GA1UdEwEB
+/wQFMAMBAf8wHwYDVR0jBBgwFoAULuPbsknQnFR5XPonKv7MTtLoTlQwDgYDVR0PAQH/BAQDAgEG
+MA0GCSqGSIb3DQEBCwUAA4ICAQAFNzr0TbdF4kV1JI+2d1LoHNgQk2Xz8lkGpD4eKexd0dCrfOAK
+kEh47U6YA5n+KGCRHTAduGN8qOY1tfrTYXbm1gdLymmasoR6d5NFFxWfJNCYExL/u6Au/U5Mh/jO
+XKqYGwXgAEZKgoClM4so3O0409/lPun++1ndYYRP0lSWE2ETPo+Aab6TR7U1Q9Jauz1c77NCR807
+VRMGsAnb/WP2OogKmW9+4c4bU2pEZiNRCHu8W1Ki/QY3OEBhj0qWuJA3+GbHeJAAFS6LrVE1Uweo
+a2iu+U48BybNCAVwzDk/dr2l02cmAYamU9JgO3xDf1WKvJUawSg5TB9D0pH0clmKuVb8P7Sd2nCc
+dlqMQ1DujjByTd//SffGqWfZbawCEeI6FiWnWAjLb1NBnEg4R2gz0dfHj9R0IdTDBZB6/86WiLEV
+KV0jq9BgoRJP3vQXzTLlyb/IQ639Lo7xr+L0mPoSHyDYwKcMhcWQ9DstliaxLL5Mq+ux0orJ23gT
+Dx4JnW2PAJ8C2sH6H3p6CcRK5ogql5+Ji/03X186zjhZhkuvcQu02PJwT58yE+Owp1fl2tpDy4Q0
+8ijE6m30Ku/Ba3ba+367hTzSU8JNvnHhRdH9I2cNE3X7z2VnIp2usAnRCf8dNL/+I5c30jn6PQ0G
+C7TbO6Orb1wdtn7os4I07QZcJA==
+-----END CERTIFICATE-----
+
+T-TeleSec GlobalRoot Class 2
+============================
+-----BEGIN CERTIFICATE-----
+MIIDwzCCAqugAwIBAgIBATANBgkqhkiG9w0BAQsFADCBgjELMAkGA1UEBhMCREUxKzApBgNVBAoM
+IlQtU3lzdGVtcyBFbnRlcnByaXNlIFNlcnZpY2VzIEdtYkgxHzAdBgNVBAsMFlQtU3lzdGVtcyBU
+cnVzdCBDZW50ZXIxJTAjBgNVBAMMHFQtVGVsZVNlYyBHbG9iYWxSb290IENsYXNzIDIwHhcNMDgx
+MDAxMTA0MDE0WhcNMzMxMDAxMjM1OTU5WjCBgjELMAkGA1UEBhMCREUxKzApBgNVBAoMIlQtU3lz
+dGVtcyBFbnRlcnByaXNlIFNlcnZpY2VzIEdtYkgxHzAdBgNVBAsMFlQtU3lzdGVtcyBUcnVzdCBD
+ZW50ZXIxJTAjBgNVBAMMHFQtVGVsZVNlYyBHbG9iYWxSb290IENsYXNzIDIwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQCqX9obX+hzkeXaXPSi5kfl82hVYAUdAqSzm1nzHoqvNK38DcLZ
+SBnuaY/JIPwhqgcZ7bBcrGXHX+0CfHt8LRvWurmAwhiCFoT6ZrAIxlQjgeTNuUk/9k9uN0goOA/F
+vudocP05l03Sx5iRUKrERLMjfTlH6VJi1hKTXrcxlkIF+3anHqP1wvzpesVsqXFP6st4vGCvx970
+2cu+fjOlbpSD8DT6IavqjnKgP6TeMFvvhk1qlVtDRKgQFRzlAVfFmPHmBiiRqiDFt1MmUUOyCxGV
+WOHAD3bZwI18gfNycJ5v/hqO2V81xrJvNHy+SE/iWjnX2J14np+GPgNeGYtEotXHAgMBAAGjQjBA
+MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBS/WSA2AHmgoCJrjNXy
+YdK4LMuCSjANBgkqhkiG9w0BAQsFAAOCAQEAMQOiYQsfdOhyNsZt+U2e+iKo4YFWz827n+qrkRk4
+r6p8FU3ztqONpfSO9kSpp+ghla0+AGIWiPACuvxhI+YzmzB6azZie60EI4RYZeLbK4rnJVM3YlNf
+vNoBYimipidx5joifsFvHZVwIEoHNN/q/xWA5brXethbdXwFeilHfkCoMRN3zUA7tFFHei4R40cR
+3p1m0IvVVGb6g1XqfMIpiRvpb7PO4gWEyS8+eIVibslfwXhjdFjASBgMmTnrpMwatXlajRWc2BQN
+9noHV8cigwUtPJslJj0Ys6lDfMjIq2SPDqO/nBudMNva0Bkuqjzx+zOAduTNrRlPBSeOE6Fuwg==
+-----END CERTIFICATE-----
+
+Atos TrustedRoot 2011
+=====================
+-----BEGIN CERTIFICATE-----
+MIIDdzCCAl+gAwIBAgIIXDPLYixfszIwDQYJKoZIhvcNAQELBQAwPDEeMBwGA1UEAwwVQXRvcyBU
+cnVzdGVkUm9vdCAyMDExMQ0wCwYDVQQKDARBdG9zMQswCQYDVQQGEwJERTAeFw0xMTA3MDcxNDU4
+MzBaFw0zMDEyMzEyMzU5NTlaMDwxHjAcBgNVBAMMFUF0b3MgVHJ1c3RlZFJvb3QgMjAxMTENMAsG
+A1UECgwEQXRvczELMAkGA1UEBhMCREUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCV
+hTuXbyo7LjvPpvMpNb7PGKw+qtn4TaA+Gke5vJrf8v7MPkfoepbCJI419KkM/IL9bcFyYie96mvr
+54rMVD6QUM+A1JX76LWC1BTFtqlVJVfbsVD2sGBkWXppzwO3bw2+yj5vdHLqqjAqc2K+SZFhyBH+
+DgMq92og3AIVDV4VavzjgsG1xZ1kCWyjWZgHJ8cblithdHFsQ/H3NYkQ4J7sVaE3IqKHBAUsR320
+HLliKWYoyrfhk/WklAOZuXCFteZI6o1Q/NnezG8HDt0Lcp2AMBYHlT8oDv3FdU9T1nSatCQujgKR
+z3bFmx5VdJx4IbHwLfELn8LVlhgf8FQieowHAgMBAAGjfTB7MB0GA1UdDgQWBBSnpQaxLKYJYO7R
+l+lwrrw7GWzbITAPBgNVHRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFKelBrEspglg7tGX6XCuvDsZ
+bNshMBgGA1UdIAQRMA8wDQYLKwYBBAGwLQMEAQEwDgYDVR0PAQH/BAQDAgGGMA0GCSqGSIb3DQEB
+CwUAA4IBAQAmdzTblEiGKkGdLD4GkGDEjKwLVLgfuXvTBznk+j57sj1O7Z8jvZfza1zv7v1Apt+h
+k6EKhqzvINB5Ab149xnYJDE0BAGmuhWawyfc2E8PzBhj/5kPDpFrdRbhIfzYJsdHt6bPWHJxfrrh
+TZVHO8mvbaG0weyJ9rQPOLXiZNwlz6bb65pcmaHFCN795trV1lpFDMS3wrUU77QR/w4VtfX128a9
+61qn8FYiqTxlVMYVqL2Gns2Dlmh6cYGJ4Qvh6hEbaAjMaZ7snkGeRDImeuKHCnE96+RapNLbxc3G
+3mB/ufNPRJLvKrcYPqcZ2Qt9sTdBQrC6YB3y/gkRsPCHe6ed
+-----END CERTIFICATE-----
+
+QuoVadis Root CA 1 G3
+=====================
+-----BEGIN CERTIFICATE-----
+MIIFYDCCA0igAwIBAgIUeFhfLq0sGUvjNwc1NBMotZbUZZMwDQYJKoZIhvcNAQELBQAwSDELMAkG
+A1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHjAcBgNVBAMTFVF1b1ZhZGlzIFJv
+b3QgQ0EgMSBHMzAeFw0xMjAxMTIxNzI3NDRaFw00MjAxMTIxNzI3NDRaMEgxCzAJBgNVBAYTAkJN
+MRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMR4wHAYDVQQDExVRdW9WYWRpcyBSb290IENBIDEg
+RzMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCgvlAQjunybEC0BJyFuTHK3C3kEakE
+PBtVwedYMB0ktMPvhd6MLOHBPd+C5k+tR4ds7FtJwUrVu4/sh6x/gpqG7D0DmVIB0jWerNrwU8lm
+PNSsAgHaJNM7qAJGr6Qc4/hzWHa39g6QDbXwz8z6+cZM5cOGMAqNF34168Xfuw6cwI2H44g4hWf6
+Pser4BOcBRiYz5P1sZK0/CPTz9XEJ0ngnjybCKOLXSoh4Pw5qlPafX7PGglTvF0FBM+hSo+LdoIN
+ofjSxxR3W5A2B4GbPgb6Ul5jxaYA/qXpUhtStZI5cgMJYr2wYBZupt0lwgNm3fME0UDiTouG9G/l
+g6AnhF4EwfWQvTA9xO+oabw4m6SkltFi2mnAAZauy8RRNOoMqv8hjlmPSlzkYZqn0ukqeI1RPToV
+7qJZjqlc3sX5kCLliEVx3ZGZbHqfPT2YfF72vhZooF6uCyP8Wg+qInYtyaEQHeTTRCOQiJ/GKubX
+9ZqzWB4vMIkIG1SitZgj7Ah3HJVdYdHLiZxfokqRmu8hqkkWCKi9YSgxyXSthfbZxbGL0eUQMk1f
+iyA6PEkfM4VZDdvLCXVDaXP7a3F98N/ETH3Goy7IlXnLc6KOTk0k+17kBL5yG6YnLUlamXrXXAkg
+t3+UuU/xDRxeiEIbEbfnkduebPRq34wGmAOtzCjvpUfzUwIDAQABo0IwQDAPBgNVHRMBAf8EBTAD
+AQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUo5fW816iEOGrRZ88F2Q87gFwnMwwDQYJKoZI
+hvcNAQELBQADggIBABj6W3X8PnrHX3fHyt/PX8MSxEBd1DKquGrX1RUVRpgjpeaQWxiZTOOtQqOC
+MTaIzen7xASWSIsBx40Bz1szBpZGZnQdT+3Btrm0DWHMY37XLneMlhwqI2hrhVd2cDMT/uFPpiN3
+GPoajOi9ZcnPP/TJF9zrx7zABC4tRi9pZsMbj/7sPtPKlL92CiUNqXsCHKnQO18LwIE6PWThv6ct
+Tr1NxNgpxiIY0MWscgKCP6o6ojoilzHdCGPDdRS5YCgtW2jgFqlmgiNR9etT2DGbe+m3nUvriBbP
++V04ikkwj+3x6xn0dxoxGE1nVGwvb2X52z3sIexe9PSLymBlVNFxZPT5pqOBMzYzcfCkeF9OrYMh
+3jRJjehZrJ3ydlo28hP0r+AJx2EqbPfgna67hkooby7utHnNkDPDs3b69fBsnQGQ+p6Q9pxyz0fa
+wx/kNSBT8lTR32GDpgLiJTjehTItXnOQUl1CxM49S+H5GYQd1aJQzEH7QRTDvdbJWqNjZgKAvQU6
+O0ec7AAmTPWIUb+oI38YB7AL7YsmoWTTYUrrXJ/es69nA7Mf3W1daWhpq1467HxpvMc7hU6eFbm0
+FU/DlXpY18ls6Wy58yljXrQs8C097Vpl4KlbQMJImYFtnh8GKjwStIsPm6Ik8KaN1nrgS7ZklmOV
+hMJKzRwuJIczYOXD
+-----END CERTIFICATE-----
+
+QuoVadis Root CA 2 G3
+=====================
+-----BEGIN CERTIFICATE-----
+MIIFYDCCA0igAwIBAgIURFc0JFuBiZs18s64KztbpybwdSgwDQYJKoZIhvcNAQELBQAwSDELMAkG
+A1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHjAcBgNVBAMTFVF1b1ZhZGlzIFJv
+b3QgQ0EgMiBHMzAeFw0xMjAxMTIxODU5MzJaFw00MjAxMTIxODU5MzJaMEgxCzAJBgNVBAYTAkJN
+MRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMR4wHAYDVQQDExVRdW9WYWRpcyBSb290IENBIDIg
+RzMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQChriWyARjcV4g/Ruv5r+LrI3HimtFh
+ZiFfqq8nUeVuGxbULX1QsFN3vXg6YOJkApt8hpvWGo6t/x8Vf9WVHhLL5hSEBMHfNrMWn4rjyduY
+NM7YMxcoRvynyfDStNVNCXJJ+fKH46nafaF9a7I6JaltUkSs+L5u+9ymc5GQYaYDFCDy54ejiK2t
+oIz/pgslUiXnFgHVy7g1gQyjO/Dh4fxaXc6AcW34Sas+O7q414AB+6XrW7PFXmAqMaCvN+ggOp+o
+MiwMzAkd056OXbxMmO7FGmh77FOm6RQ1o9/NgJ8MSPsc9PG/Srj61YxxSscfrf5BmrODXfKEVu+l
+V0POKa2Mq1W/xPtbAd0jIaFYAI7D0GoT7RPjEiuA3GfmlbLNHiJuKvhB1PLKFAeNilUSxmn1uIZo
+L1NesNKqIcGY5jDjZ1XHm26sGahVpkUG0CM62+tlXSoREfA7T8pt9DTEceT/AFr2XK4jYIVz8eQQ
+sSWu1ZK7E8EM4DnatDlXtas1qnIhO4M15zHfeiFuuDIIfR0ykRVKYnLP43ehvNURG3YBZwjgQQvD
+6xVu+KQZ2aKrr+InUlYrAoosFCT5v0ICvybIxo/gbjh9Uy3l7ZizlWNof/k19N+IxWA1ksB8aRxh
+lRbQ694Lrz4EEEVlWFA4r0jyWbYW8jwNkALGcC4BrTwV1wIDAQABo0IwQDAPBgNVHRMBAf8EBTAD
+AQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU7edvdlq/YOxJW8ald7tyFnGbxD0wDQYJKoZI
+hvcNAQELBQADggIBAJHfgD9DCX5xwvfrs4iP4VGyvD11+ShdyLyZm3tdquXK4Qr36LLTn91nMX66
+AarHakE7kNQIXLJgapDwyM4DYvmL7ftuKtwGTTwpD4kWilhMSA/ohGHqPHKmd+RCroijQ1h5fq7K
+pVMNqT1wvSAZYaRsOPxDMuHBR//47PERIjKWnML2W2mWeyAMQ0GaW/ZZGYjeVYg3UQt4XAoeo0L9
+x52ID8DyeAIkVJOviYeIyUqAHerQbj5hLja7NQ4nlv1mNDthcnPxFlxHBlRJAHpYErAK74X9sbgz
+dWqTHBLmYF5vHX/JHyPLhGGfHoJE+V+tYlUkmlKY7VHnoX6XOuYvHxHaU4AshZ6rNRDbIl9qxV6X
+U/IyAgkwo1jwDQHVcsaxfGl7w/U2Rcxhbl5MlMVerugOXou/983g7aEOGzPuVBj+D77vfoRrQ+Nw
+mNtddbINWQeFFSM51vHfqSYP1kjHs6Yi9TM3WpVHn3u6GBVv/9YUZINJ0gpnIdsPNWNgKCLjsZWD
+zYWm3S8P52dSbrsvhXz1SnPnxT7AvSESBT/8twNJAlvIJebiVDj1eYeMHVOyToV7BjjHLPj4sHKN
+JeV3UvQDHEimUF+IIDBu8oJDqz2XhOdT+yHBTw8imoa4WSr2Rz0ZiC3oheGe7IUIarFsNMkd7Egr
+O3jtZsSOeWmD3n+M
+-----END CERTIFICATE-----
+
+QuoVadis Root CA 3 G3
+=====================
+-----BEGIN CERTIFICATE-----
+MIIFYDCCA0igAwIBAgIULvWbAiin23r/1aOp7r0DoM8Sah0wDQYJKoZIhvcNAQELBQAwSDELMAkG
+A1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHjAcBgNVBAMTFVF1b1ZhZGlzIFJv
+b3QgQ0EgMyBHMzAeFw0xMjAxMTIyMDI2MzJaFw00MjAxMTIyMDI2MzJaMEgxCzAJBgNVBAYTAkJN
+MRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMR4wHAYDVQQDExVRdW9WYWRpcyBSb290IENBIDMg
+RzMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCzyw4QZ47qFJenMioKVjZ/aEzHs286
+IxSR/xl/pcqs7rN2nXrpixurazHb+gtTTK/FpRp5PIpM/6zfJd5O2YIyC0TeytuMrKNuFoM7pmRL
+Mon7FhY4futD4tN0SsJiCnMK3UmzV9KwCoWdcTzeo8vAMvMBOSBDGzXRU7Ox7sWTaYI+FrUoRqHe
+6okJ7UO4BUaKhvVZR74bbwEhELn9qdIoyhA5CcoTNs+cra1AdHkrAj80//ogaX3T7mH1urPnMNA3
+I4ZyYUUpSFlob3emLoG+B01vr87ERRORFHAGjx+f+IdpsQ7vw4kZ6+ocYfx6bIrc1gMLnia6Et3U
+VDmrJqMz6nWB2i3ND0/kA9HvFZcba5DFApCTZgIhsUfei5pKgLlVj7WiL8DWM2fafsSntARE60f7
+5li59wzweyuxwHApw0BiLTtIadwjPEjrewl5qW3aqDCYz4ByA4imW0aucnl8CAMhZa634RylsSqi
+Md5mBPfAdOhx3v89WcyWJhKLhZVXGqtrdQtEPREoPHtht+KPZ0/l7DxMYIBpVzgeAVuNVejH38DM
+dyM0SXV89pgR6y3e7UEuFAUCf+D+IOs15xGsIs5XPd7JMG0QA4XN8f+MFrXBsj6IbGB/kE+V9/Yt
+rQE5BwT6dYB9v0lQ7e/JxHwc64B+27bQ3RP+ydOc17KXqQIDAQABo0IwQDAPBgNVHRMBAf8EBTAD
+AQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUxhfQvKjqAkPyGwaZXSuQILnXnOQwDQYJKoZI
+hvcNAQELBQADggIBADRh2Va1EodVTd2jNTFGu6QHcrxfYWLopfsLN7E8trP6KZ1/AvWkyaiTt3px
+KGmPc+FSkNrVvjrlt3ZqVoAh313m6Tqe5T72omnHKgqwGEfcIHB9UqM+WXzBusnIFUBhynLWcKzS
+t/Ac5IYp8M7vaGPQtSCKFWGafoaYtMnCdvvMujAWzKNhxnQT5WvvoxXqA/4Ti2Tk08HS6IT7SdEQ
+TXlm66r99I0xHnAUrdzeZxNMgRVhvLfZkXdxGYFgu/BYpbWcC/ePIlUnwEsBbTuZDdQdm2NnL9Du
+DcpmvJRPpq3t/O5jrFc/ZSXPsoaP0Aj/uHYUbt7lJ+yreLVTubY/6CD50qi+YUbKh4yE8/nxoGib
+Ih6BJpsQBJFxwAYf3KDTuVan45gtf4Od34wrnDKOMpTwATwiKp9Dwi7DmDkHOHv8XgBCH/MyJnmD
+hPbl8MFREsALHgQjDFSlTC9JxUrRtm5gDWv8a4uFJGS3iQ6rJUdbPM9+Sb3H6QrG2vd+DhcI00iX
+0HGS8A85PjRqHH3Y8iKuu2n0M7SmSFXRDw4m6Oy2Cy2nhTXN/VnIn9HNPlopNLk9hM6xZdRZkZFW
+dSHBd575euFgndOtBBj0fOtek49TSiIp+EgrPk2GrFt/ywaZWWDYWGWVjUTR939+J399roD1B0y2
+PpxxVJkES/1Y+Zj0
+-----END CERTIFICATE-----
+
+DigiCert Assured ID Root G2
+===========================
+-----BEGIN CERTIFICATE-----
+MIIDljCCAn6gAwIBAgIQC5McOtY5Z+pnI7/Dr5r0SzANBgkqhkiG9w0BAQsFADBlMQswCQYDVQQG
+EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSQw
+IgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgRzIwHhcNMTMwODAxMTIwMDAwWhcNMzgw
+MTE1MTIwMDAwWjBlMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQL
+ExB3d3cuZGlnaWNlcnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgRzIw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDZ5ygvUj82ckmIkzTz+GoeMVSAn61UQbVH
+35ao1K+ALbkKz3X9iaV9JPrjIgwrvJUXCzO/GU1BBpAAvQxNEP4HteccbiJVMWWXvdMX0h5i89vq
+bFCMP4QMls+3ywPgym2hFEwbid3tALBSfK+RbLE4E9HpEgjAALAcKxHad3A2m67OeYfcgnDmCXRw
+VWmvo2ifv922ebPynXApVfSr/5Vh88lAbx3RvpO704gqu52/clpWcTs/1PPRCv4o76Pu2ZmvA9OP
+YLfykqGxvYmJHzDNw6YuYjOuFgJ3RFrngQo8p0Quebg/BLxcoIfhG69Rjs3sLPr4/m3wOnyqi+Rn
+lTGNAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgGGMB0GA1UdDgQWBBTO
+w0q5mVXyuNtgv6l+vVa1lzan1jANBgkqhkiG9w0BAQsFAAOCAQEAyqVVjOPIQW5pJ6d1Ee88hjZv
+0p3GeDgdaZaikmkuOGybfQTUiaWxMTeKySHMq2zNixya1r9I0jJmwYrA8y8678Dj1JGG0VDjA9tz
+d29KOVPt3ibHtX2vK0LRdWLjSisCx1BL4GnilmwORGYQRI+tBev4eaymG+g3NJ1TyWGqolKvSnAW
+hsI6yLETcDbYz+70CjTVW0z9B5yiutkBclzzTcHdDrEcDcRjvq30FPuJ7KJBDkzMyFdA0G4Dqs0M
+jomZmWzwPDCvON9vvKO+KSAnq3T/EyJ43pdSVR6DtVQgA+6uwE9W3jfMw3+qBCe703e4YtsXfJwo
+IhNzbM8m9Yop5w==
+-----END CERTIFICATE-----
+
+DigiCert Assured ID Root G3
+===========================
+-----BEGIN CERTIFICATE-----
+MIICRjCCAc2gAwIBAgIQC6Fa+h3foLVJRK/NJKBs7DAKBggqhkjOPQQDAzBlMQswCQYDVQQGEwJV
+UzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSQwIgYD
+VQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgRzMwHhcNMTMwODAxMTIwMDAwWhcNMzgwMTE1
+MTIwMDAwWjBlMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
+d3cuZGlnaWNlcnQuY29tMSQwIgYDVQQDExtEaWdpQ2VydCBBc3N1cmVkIElEIFJvb3QgRzMwdjAQ
+BgcqhkjOPQIBBgUrgQQAIgNiAAQZ57ysRGXtzbg/WPuNsVepRC0FFfLvC/8QdJ+1YlJfZn4f5dwb
+RXkLzMZTCp2NXQLZqVneAlr2lSoOjThKiknGvMYDOAdfVdp+CW7if17QRSAPWXYQ1qAk8C3eNvJs
+KTmjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgGGMB0GA1UdDgQWBBTL0L2p4ZgF
+UaFNN6KDec6NHSrkhDAKBggqhkjOPQQDAwNnADBkAjAlpIFFAmsSS3V0T8gj43DydXLefInwz5Fy
+YZ5eEJJZVrmDxxDnOOlYJjZ91eQ0hjkCMHw2U/Aw5WJjOpnitqM7mzT6HtoQknFekROn3aRukswy
+1vUhZscv6pZjamVFkpUBtA==
+-----END CERTIFICATE-----
+
+DigiCert Global Root G2
+=======================
+-----BEGIN CERTIFICATE-----
+MIIDjjCCAnagAwIBAgIQAzrx5qcRqaC7KGSxHQn65TANBgkqhkiG9w0BAQsFADBhMQswCQYDVQQG
+EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSAw
+HgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBHMjAeFw0xMzA4MDExMjAwMDBaFw0zODAxMTUx
+MjAwMDBaMGExCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3
+dy5kaWdpY2VydC5jb20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IEcyMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuzfNNNx7a8myaJCtSnX/RrohCgiN9RlUyfuI2/Ou8jqJ
+kTx65qsGGmvPrC3oXgkkRLpimn7Wo6h+4FR1IAWsULecYxpsMNzaHxmx1x7e/dfgy5SDN67sH0NO
+3Xss0r0upS/kqbitOtSZpLYl6ZtrAGCSYP9PIUkY92eQq2EGnI/yuum06ZIya7XzV+hdG82MHauV
+BJVJ8zUtluNJbd134/tJS7SsVQepj5WztCO7TG1F8PapspUwtP1MVYwnSlcUfIKdzXOS0xZKBgyM
+UNGPHgm+F6HmIcr9g+UQvIOlCsRnKPZzFBQ9RnbDhxSJITRNrw9FDKZJobq7nMWxM4MphQIDAQAB
+o0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBhjAdBgNVHQ4EFgQUTiJUIBiV5uNu
+5g/6+rkS7QYXjzkwDQYJKoZIhvcNAQELBQADggEBAGBnKJRvDkhj6zHd6mcY1Yl9PMWLSn/pvtsr
+F9+wX3N3KjITOYFnQoQj8kVnNeyIv/iPsGEMNKSuIEyExtv4NeF22d+mQrvHRAiGfzZ0JFrabA0U
+WTW98kndth/Jsw1HKj2ZL7tcu7XUIOGZX1NGFdtom/DzMNU+MeKNhJ7jitralj41E6Vf8PlwUHBH
+QRFXGU7Aj64GxJUTFy8bJZ918rGOmaFvE7FBcf6IKshPECBV1/MUReXgRPTqh5Uykw7+U0b6LJ3/
+iyK5S9kJRaTepLiaWN0bfVKfjllDiIGknibVb63dDcY3fe0Dkhvld1927jyNxF1WW6LZZm6zNTfl
+MrY=
+-----END CERTIFICATE-----
+
+DigiCert Global Root G3
+=======================
+-----BEGIN CERTIFICATE-----
+MIICPzCCAcWgAwIBAgIQBVVWvPJepDU1w6QP1atFcjAKBggqhkjOPQQDAzBhMQswCQYDVQQGEwJV
+UzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSAwHgYD
+VQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBHMzAeFw0xMzA4MDExMjAwMDBaFw0zODAxMTUxMjAw
+MDBaMGExCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxGTAXBgNVBAsTEHd3dy5k
+aWdpY2VydC5jb20xIDAeBgNVBAMTF0RpZ2lDZXJ0IEdsb2JhbCBSb290IEczMHYwEAYHKoZIzj0C
+AQYFK4EEACIDYgAE3afZu4q4C/sLfyHS8L6+c/MzXRq8NOrexpu80JX28MzQC7phW1FGfp4tn+6O
+YwwX7Adw9c+ELkCDnOg/QW07rdOkFFk2eJ0DQ+4QE2xy3q6Ip6FrtUPOZ9wj/wMco+I+o0IwQDAP
+BgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBhjAdBgNVHQ4EFgQUs9tIpPmhxdiuNkHMEWNp
+Yim8S8YwCgYIKoZIzj0EAwMDaAAwZQIxAK288mw/EkrRLTnDCgmXc/SINoyIJ7vmiI1Qhadj+Z4y
+3maTD/HMsQmP3Wyr+mt/oAIwOWZbwmSNuJ5Q3KjVSaLtx9zRSX8XAbjIho9OjIgrqJqpisXRAL34
+VOKa5Vt8sycX
+-----END CERTIFICATE-----
+
+DigiCert Trusted Root G4
+========================
+-----BEGIN CERTIFICATE-----
+MIIFkDCCA3igAwIBAgIQBZsbV56OITLiOQe9p3d1XDANBgkqhkiG9w0BAQwFADBiMQswCQYDVQQG
+EwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSEw
+HwYDVQQDExhEaWdpQ2VydCBUcnVzdGVkIFJvb3QgRzQwHhcNMTMwODAxMTIwMDAwWhcNMzgwMTE1
+MTIwMDAwWjBiMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
+d3cuZGlnaWNlcnQuY29tMSEwHwYDVQQDExhEaWdpQ2VydCBUcnVzdGVkIFJvb3QgRzQwggIiMA0G
+CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC/5pBzaN675F1KPDAiMGkz7MKnJS7JIT3yithZwuEp
+pz1Yq3aaza57G4QNxDAf8xukOBbrVsaXbR2rsnnyyhHS5F/WBTxSD1Ifxp4VpX6+n6lXFllVcq9o
+k3DCsrp1mWpzMpTREEQQLt+C8weE5nQ7bXHiLQwb7iDVySAdYyktzuxeTsiT+CFhmzTrBcZe7Fsa
+vOvJz82sNEBfsXpm7nfISKhmV1efVFiODCu3T6cw2Vbuyntd463JT17lNecxy9qTXtyOj4DatpGY
+QJB5w3jHtrHEtWoYOAMQjdjUN6QuBX2I9YI+EJFwq1WCQTLX2wRzKm6RAXwhTNS8rhsDdV14Ztk6
+MUSaM0C/CNdaSaTC5qmgZ92kJ7yhTzm1EVgX9yRcRo9k98FpiHaYdj1ZXUJ2h4mXaXpI8OCiEhtm
+mnTK3kse5w5jrubU75KSOp493ADkRSWJtppEGSt+wJS00mFt6zPZxd9LBADMfRyVw4/3IbKyEbe7
+f/LVjHAsQWCqsWMYRJUadmJ+9oCw++hkpjPRiQfhvbfmQ6QYuKZ3AeEPlAwhHbJUKSWJbOUOUlFH
+dL4mrLZBdd56rF+NP8m800ERElvlEFDrMcXKchYiCd98THU/Y+whX8QgUWtvsauGi0/C1kVfnSD8
+oR7FwI+isX4KJpn15GkvmB0t9dmpsh3lGwIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1Ud
+DwEB/wQEAwIBhjAdBgNVHQ4EFgQU7NfjgtJxXWRM3y5nP+e6mK4cD08wDQYJKoZIhvcNAQEMBQAD
+ggIBALth2X2pbL4XxJEbw6GiAI3jZGgPVs93rnD5/ZpKmbnJeFwMDF/k5hQpVgs2SV1EY+CtnJYY
+ZhsjDT156W1r1lT40jzBQ0CuHVD1UvyQO7uYmWlrx8GnqGikJ9yd+SeuMIW59mdNOj6PWTkiU0Tr
+yF0Dyu1Qen1iIQqAyHNm0aAFYF/opbSnr6j3bTWcfFqK1qI4mfN4i/RN0iAL3gTujJtHgXINwBQy
+7zBZLq7gcfJW5GqXb5JQbZaNaHqasjYUegbyJLkJEVDXCLG4iXqEI2FCKeWjzaIgQdfRnGTZ6iah
+ixTXTBmyUEFxPT9NcCOGDErcgdLMMpSEDQgJlxxPwO5rIHQw0uA5NBCFIRUBCOhVMt5xSdkoF1BN
+5r5N0XWs0Mr7QbhDparTwwVETyw2m+L64kW4I1NsBm9nVX9GtUw/bihaeSbSpKhil9Ie4u1Ki7wb
+/UdKDd9nZn6yW0HQO+T0O/QEY+nvwlQAUaCKKsnOeMzV6ocEGLPOr0mIr/OSmbaz5mEP0oUA51Aa
+5BuVnRmhuZyxm7EAHu/QD09CbMkKvO5D+jpxpchNJqU1/YldvIViHTLSoCtU7ZpXwdv6EM8Zt4tK
+G48BtieVU+i2iW1bvGjUI+iLUaJW+fCmgKDWHrO8Dw9TdSmq6hN35N6MgSGtBxBHEa2HPQfRdbzP
+82Z+
+-----END CERTIFICATE-----
+
+COMODO RSA Certification Authority
+==================================
+-----BEGIN CERTIFICATE-----
+MIIF2DCCA8CgAwIBAgIQTKr5yttjb+Af907YWwOGnTANBgkqhkiG9w0BAQwFADCBhTELMAkGA1UE
+BhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgG
+A1UEChMRQ09NT0RPIENBIExpbWl0ZWQxKzApBgNVBAMTIkNPTU9ETyBSU0EgQ2VydGlmaWNhdGlv
+biBBdXRob3JpdHkwHhcNMTAwMTE5MDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCBhTELMAkGA1UEBhMC
+R0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UE
+ChMRQ09NT0RPIENBIExpbWl0ZWQxKzApBgNVBAMTIkNPTU9ETyBSU0EgQ2VydGlmaWNhdGlvbiBB
+dXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCR6FSS0gpWsawNJN3Fz0Rn
+dJkrN6N9I3AAcbxT38T6KhKPS38QVr2fcHK3YX/JSw8Xpz3jsARh7v8Rl8f0hj4K+j5c+ZPmNHrZ
+FGvnnLOFoIJ6dq9xkNfs/Q36nGz637CC9BR++b7Epi9Pf5l/tfxnQ3K9DADWietrLNPtj5gcFKt+
+5eNu/Nio5JIk2kNrYrhV/erBvGy2i/MOjZrkm2xpmfh4SDBF1a3hDTxFYPwyllEnvGfDyi62a+pG
+x8cgoLEfZd5ICLqkTqnyg0Y3hOvozIFIQ2dOciqbXL1MGyiKXCJ7tKuY2e7gUYPDCUZObT6Z+pUX
+2nwzV0E8jVHtC7ZcryxjGt9XyD+86V3Em69FmeKjWiS0uqlWPc9vqv9JWL7wqP/0uK3pN/u6uPQL
+OvnoQ0IeidiEyxPx2bvhiWC4jChWrBQdnArncevPDt09qZahSL0896+1DSJMwBGB7FY79tOi4lu3
+sgQiUpWAk2nojkxl8ZEDLXB0AuqLZxUpaVICu9ffUGpVRr+goyhhf3DQw6KqLCGqR84onAZFdr+C
+GCe01a60y1Dma/RMhnEw6abfFobg2P9A3fvQQoh/ozM6LlweQRGBY84YcWsr7KaKtzFcOmpH4MN5
+WdYgGq/yapiqcrxXStJLnbsQ/LBMQeXtHT1eKJ2czL+zUdqnR+WEUwIDAQABo0IwQDAdBgNVHQ4E
+FgQUu69+Aj36pvE8hI6t7jiY7NkyMtQwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8w
+DQYJKoZIhvcNAQEMBQADggIBAArx1UaEt65Ru2yyTUEUAJNMnMvlwFTPoCWOAvn9sKIN9SCYPBMt
+rFaisNZ+EZLpLrqeLppysb0ZRGxhNaKatBYSaVqM4dc+pBroLwP0rmEdEBsqpIt6xf4FpuHA1sj+
+nq6PK7o9mfjYcwlYRm6mnPTXJ9OV2jeDchzTc+CiR5kDOF3VSXkAKRzH7JsgHAckaVd4sjn8OoSg
+tZx8jb8uk2IntznaFxiuvTwJaP+EmzzV1gsD41eeFPfR60/IvYcjt7ZJQ3mFXLrrkguhxuhoqEwW
+sRqZCuhTLJK7oQkYdQxlqHvLI7cawiiFwxv/0Cti76R7CZGYZ4wUAc1oBmpjIXUDgIiKboHGhfKp
+pC3n9KUkEEeDys30jXlYsQab5xoq2Z0B15R97QNKyvDb6KkBPvVWmckejkk9u+UJueBPSZI9FoJA
+zMxZxuY67RIuaTxslbH9qh17f4a+Hg4yRvv7E491f0yLS0Zj/gA0QHDBw7mh3aZw4gSzQbzpgJHq
+ZJx64SIDqZxubw5lT2yHh17zbqD5daWbQOhTsiedSrnAdyGN/4fy3ryM7xfft0kL0fJuMAsaDk52
+7RH89elWsn2/x20Kk4yl0MC2Hb46TpSi125sC8KKfPog88Tk5c0NqMuRkrF8hey1FGlmDoLnzc7I
+LaZRfyHBNVOFBkpdn627G190
+-----END CERTIFICATE-----
+
+USERTrust RSA Certification Authority
+=====================================
+-----BEGIN CERTIFICATE-----
+MIIF3jCCA8agAwIBAgIQAf1tMPyjylGoG7xkDjUDLTANBgkqhkiG9w0BAQwFADCBiDELMAkGA1UE
+BhMCVVMxEzARBgNVBAgTCk5ldyBKZXJzZXkxFDASBgNVBAcTC0plcnNleSBDaXR5MR4wHAYDVQQK
+ExVUaGUgVVNFUlRSVVNUIE5ldHdvcmsxLjAsBgNVBAMTJVVTRVJUcnVzdCBSU0EgQ2VydGlmaWNh
+dGlvbiBBdXRob3JpdHkwHhcNMTAwMjAxMDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCBiDELMAkGA1UE
+BhMCVVMxEzARBgNVBAgTCk5ldyBKZXJzZXkxFDASBgNVBAcTC0plcnNleSBDaXR5MR4wHAYDVQQK
+ExVUaGUgVVNFUlRSVVNUIE5ldHdvcmsxLjAsBgNVBAMTJVVTRVJUcnVzdCBSU0EgQ2VydGlmaWNh
+dGlvbiBBdXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCAEmUXNg7D2wiz
+0KxXDXbtzSfTTK1Qg2HiqiBNCS1kCdzOiZ/MPans9s/B3PHTsdZ7NygRK0faOca8Ohm0X6a9fZ2j
+Y0K2dvKpOyuR+OJv0OwWIJAJPuLodMkYtJHUYmTbf6MG8YgYapAiPLz+E/CHFHv25B+O1ORRxhFn
+RghRy4YUVD+8M/5+bJz/Fp0YvVGONaanZshyZ9shZrHUm3gDwFA66Mzw3LyeTP6vBZY1H1dat//O
++T23LLb2VN3I5xI6Ta5MirdcmrS3ID3KfyI0rn47aGYBROcBTkZTmzNg95S+UzeQc0PzMsNT79uq
+/nROacdrjGCT3sTHDN/hMq7MkztReJVni+49Vv4M0GkPGw/zJSZrM233bkf6c0Plfg6lZrEpfDKE
+Y1WJxA3Bk1QwGROs0303p+tdOmw1XNtB1xLaqUkL39iAigmTYo61Zs8liM2EuLE/pDkP2QKe6xJM
+lXzzawWpXhaDzLhn4ugTncxbgtNMs+1b/97lc6wjOy0AvzVVdAlJ2ElYGn+SNuZRkg7zJn0cTRe8
+yexDJtC/QV9AqURE9JnnV4eeUB9XVKg+/XRjL7FQZQnmWEIuQxpMtPAlR1n6BB6T1CZGSlCBst6+
+eLf8ZxXhyVeEHg9j1uliutZfVS7qXMYoCAQlObgOK6nyTJccBz8NUvXt7y+CDwIDAQABo0IwQDAd
+BgNVHQ4EFgQUU3m/WqorSs9UgOHYm8Cd8rIDZsswDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQF
+MAMBAf8wDQYJKoZIhvcNAQEMBQADggIBAFzUfA3P9wF9QZllDHPFUp/L+M+ZBn8b2kMVn54CVVeW
+FPFSPCeHlCjtHzoBN6J2/FNQwISbxmtOuowhT6KOVWKR82kV2LyI48SqC/3vqOlLVSoGIG1VeCkZ
+7l8wXEskEVX/JJpuXior7gtNn3/3ATiUFJVDBwn7YKnuHKsSjKCaXqeYalltiz8I+8jRRa8YFWSQ
+Eg9zKC7F4iRO/Fjs8PRF/iKz6y+O0tlFYQXBl2+odnKPi4w2r78NBc5xjeambx9spnFixdjQg3IM
+8WcRiQycE0xyNN+81XHfqnHd4blsjDwSXWXavVcStkNr/+XeTWYRUc+ZruwXtuhxkYzeSf7dNXGi
+FSeUHM9h4ya7b6NnJSFd5t0dCy5oGzuCr+yDZ4XUmFF0sbmZgIn/f3gZXHlKYC6SQK5MNyosycdi
+yA5d9zZbyuAlJQG03RoHnHcAP9Dc1ew91Pq7P8yF1m9/qS3fuQL39ZeatTXaw2ewh0qpKJ4jjv9c
+J2vhsE/zB+4ALtRZh8tSQZXq9EfX7mRBVXyNWQKV3WKdwrnuWih0hKWbt5DHDAff9Yk2dDLWKMGw
+sAvgnEzDHNb842m1R0aBL6KCq9NjRHDEjf8tM7qtj3u1cIiuPhnPQCjY/MiQu12ZIvVS5ljFH4gx
+Q+6IHdfGjjxDah2nGN59PRbxYvnKkKj9
+-----END CERTIFICATE-----
+
+USERTrust ECC Certification Authority
+=====================================
+-----BEGIN CERTIFICATE-----
+MIICjzCCAhWgAwIBAgIQXIuZxVqUxdJxVt7NiYDMJjAKBggqhkjOPQQDAzCBiDELMAkGA1UEBhMC
+VVMxEzARBgNVBAgTCk5ldyBKZXJzZXkxFDASBgNVBAcTC0plcnNleSBDaXR5MR4wHAYDVQQKExVU
+aGUgVVNFUlRSVVNUIE5ldHdvcmsxLjAsBgNVBAMTJVVTRVJUcnVzdCBFQ0MgQ2VydGlmaWNhdGlv
+biBBdXRob3JpdHkwHhcNMTAwMjAxMDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCBiDELMAkGA1UEBhMC
+VVMxEzARBgNVBAgTCk5ldyBKZXJzZXkxFDASBgNVBAcTC0plcnNleSBDaXR5MR4wHAYDVQQKExVU
+aGUgVVNFUlRSVVNUIE5ldHdvcmsxLjAsBgNVBAMTJVVTRVJUcnVzdCBFQ0MgQ2VydGlmaWNhdGlv
+biBBdXRob3JpdHkwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAQarFRaqfloI+d61SRvU8Za2EurxtW2
+0eZzca7dnNYMYf3boIkDuAUU7FfO7l0/4iGzzvfUinngo4N+LZfQYcTxmdwlkWOrfzCjtHDix6Ez
+nPO/LlxTsV+zfTJ/ijTjeXmjQjBAMB0GA1UdDgQWBBQ64QmG1M8ZwpZ2dEl23OA1xmNjmjAOBgNV
+HQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAKBggqhkjOPQQDAwNoADBlAjA2Z6EWCNzklwBB
+HU6+4WMBzzuqQhFkoJ2UOQIReVx7Hfpkue4WQrO/isIJxOzksU0CMQDpKmFHjFJKS04YcPbWRNZu
+9YO6bVi9JNlWSOrvxKJGgYhqOkbRqZtNyWHa0V1Xahg=
+-----END CERTIFICATE-----
+
+GlobalSign ECC Root CA - R4
+===========================
+-----BEGIN CERTIFICATE-----
+MIIB4TCCAYegAwIBAgIRKjikHJYKBN5CsiilC+g0mAIwCgYIKoZIzj0EAwIwUDEkMCIGA1UECxMb
+R2xvYmFsU2lnbiBFQ0MgUm9vdCBDQSAtIFI0MRMwEQYDVQQKEwpHbG9iYWxTaWduMRMwEQYDVQQD
+EwpHbG9iYWxTaWduMB4XDTEyMTExMzAwMDAwMFoXDTM4MDExOTAzMTQwN1owUDEkMCIGA1UECxMb
+R2xvYmFsU2lnbiBFQ0MgUm9vdCBDQSAtIFI0MRMwEQYDVQQKEwpHbG9iYWxTaWduMRMwEQYDVQQD
+EwpHbG9iYWxTaWduMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEuMZ5049sJQ6fLjkZHAOkrprl
+OQcJFspjsbmG+IpXwVfOQvpzofdlQv8ewQCybnMO/8ch5RikqtlxP6jUuc6MHaNCMEAwDgYDVR0P
+AQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFFSwe61FuOJAf/sKbvu+M8k8o4TV
+MAoGCCqGSM49BAMCA0gAMEUCIQDckqGgE6bPA7DmxCGXkPoUVy0D7O48027KqGx2vKLeuwIgJ6iF
+JzWbVsaj8kfSt24bAgAXqmemFZHe+pTsewv4n4Q=
+-----END CERTIFICATE-----
+
+GlobalSign ECC Root CA - R5
+===========================
+-----BEGIN CERTIFICATE-----
+MIICHjCCAaSgAwIBAgIRYFlJ4CYuu1X5CneKcflK2GwwCgYIKoZIzj0EAwMwUDEkMCIGA1UECxMb
+R2xvYmFsU2lnbiBFQ0MgUm9vdCBDQSAtIFI1MRMwEQYDVQQKEwpHbG9iYWxTaWduMRMwEQYDVQQD
+EwpHbG9iYWxTaWduMB4XDTEyMTExMzAwMDAwMFoXDTM4MDExOTAzMTQwN1owUDEkMCIGA1UECxMb
+R2xvYmFsU2lnbiBFQ0MgUm9vdCBDQSAtIFI1MRMwEQYDVQQKEwpHbG9iYWxTaWduMRMwEQYDVQQD
+EwpHbG9iYWxTaWduMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAER0UOlvt9Xb/pOdEh+J8LttV7HpI6
+SFkc8GIxLcB6KP4ap1yztsyX50XUWPrRd21DosCHZTQKH3rd6zwzocWdTaRvQZU4f8kehOvRnkmS
+h5SHDDqFSmafnVmTTZdhBoZKo0IwQDAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAd
+BgNVHQ4EFgQUPeYpSJvqB8ohREom3m7e0oPQn1kwCgYIKoZIzj0EAwMDaAAwZQIxAOVpEslu28Yx
+uglB4Zf4+/2a4n0Sye18ZNPLBSWLVtmg515dTguDnFt2KaAJJiFqYgIwcdK1j1zqO+F4CYWodZI7
+yFz9SO8NdCKoCOJuxUnOxwy8p2Fp8fc74SrL+SvzZpA3
+-----END CERTIFICATE-----
+
+Staat der Nederlanden Root CA - G3
+==================================
+-----BEGIN CERTIFICATE-----
+MIIFdDCCA1ygAwIBAgIEAJiiOTANBgkqhkiG9w0BAQsFADBaMQswCQYDVQQGEwJOTDEeMBwGA1UE
+CgwVU3RhYXQgZGVyIE5lZGVybGFuZGVuMSswKQYDVQQDDCJTdGFhdCBkZXIgTmVkZXJsYW5kZW4g
+Um9vdCBDQSAtIEczMB4XDTEzMTExNDExMjg0MloXDTI4MTExMzIzMDAwMFowWjELMAkGA1UEBhMC
+TkwxHjAcBgNVBAoMFVN0YWF0IGRlciBOZWRlcmxhbmRlbjErMCkGA1UEAwwiU3RhYXQgZGVyIE5l
+ZGVybGFuZGVuIFJvb3QgQ0EgLSBHMzCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAL4y
+olQPcPssXFnrbMSkUeiFKrPMSjTysF/zDsccPVMeiAho2G89rcKezIJnByeHaHE6n3WWIkYFsO2t
+x1ueKt6c/DrGlaf1F2cY5y9JCAxcz+bMNO14+1Cx3Gsy8KL+tjzk7FqXxz8ecAgwoNzFs21v0IJy
+EavSgWhZghe3eJJg+szeP4TrjTgzkApyI/o1zCZxMdFyKJLZWyNtZrVtB0LrpjPOktvA9mxjeM3K
+Tj215VKb8b475lRgsGYeCasH/lSJEULR9yS6YHgamPfJEf0WwTUaVHXvQ9Plrk7O53vDxk5hUUur
+mkVLoR9BvUhTFXFkC4az5S6+zqQbwSmEorXLCCN2QyIkHxcE1G6cxvx/K2Ya7Irl1s9N9WMJtxU5
+1nus6+N86U78dULI7ViVDAZCopz35HCz33JvWjdAidiFpNfxC95DGdRKWCyMijmev4SH8RY7Ngzp
+07TKbBlBUgmhHbBqv4LvcFEhMtwFdozL92TkA1CvjJFnq8Xy7ljY3r735zHPbMk7ccHViLVlvMDo
+FxcHErVc0qsgk7TmgoNwNsXNo42ti+yjwUOH5kPiNL6VizXtBznaqB16nzaeErAMZRKQFWDZJkBE
+41ZgpRDUajz9QdwOWke275dhdU/Z/seyHdTtXUmzqWrLZoQT1Vyg3N9udwbRcXXIV2+vD3dbAgMB
+AAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRUrfrHkleu
+yjWcLhL75LpdINyUVzANBgkqhkiG9w0BAQsFAAOCAgEAMJmdBTLIXg47mAE6iqTnB/d6+Oea31BD
+U5cqPco8R5gu4RV78ZLzYdqQJRZlwJ9UXQ4DO1t3ApyEtg2YXzTdO2PCwyiBwpwpLiniyMMB8jPq
+KqrMCQj3ZWfGzd/TtiunvczRDnBfuCPRy5FOCvTIeuXZYzbB1N/8Ipf3YF3qKS9Ysr1YvY2WTxB1
+v0h7PVGHoTx0IsL8B3+A3MSs/mrBcDCw6Y5p4ixpgZQJut3+TcCDjJRYwEYgr5wfAvg1VUkvRtTA
+8KCWAg8zxXHzniN9lLf9OtMJgwYh/WA9rjLA0u6NpvDntIJ8CsxwyXmA+P5M9zWEGYox+wrZ13+b
+8KKaa8MFSu1BYBQw0aoRQm7TIwIEC8Zl3d1Sd9qBa7Ko+gE4uZbqKmxnl4mUnrzhVNXkanjvSr0r
+mj1AfsbAddJu+2gw7OyLnflJNZoaLNmzlTnVHpL3prllL+U9bTpITAjc5CgSKL59NVzq4BZ+Extq
+1z7XnvwtdbLBFNUjA9tbbws+eC8N3jONFrdI54OagQ97wUNNVQQXOEpR1VmiiXTTn74eS9fGbbeI
+JG9gkaSChVtWQbzQRKtqE77RLFi3EjNYsjdj3BP1lB0/QFH1T/U67cjF68IeHRaVesd+QnGTbksV
+tzDfqu1XhUisHWrdOWnk4Xl4vs4Fv6EM94B7IWcnMFk=
+-----END CERTIFICATE-----
+
+Staat der Nederlanden EV Root CA
+================================
+-----BEGIN CERTIFICATE-----
+MIIFcDCCA1igAwIBAgIEAJiWjTANBgkqhkiG9w0BAQsFADBYMQswCQYDVQQGEwJOTDEeMBwGA1UE
+CgwVU3RhYXQgZGVyIE5lZGVybGFuZGVuMSkwJwYDVQQDDCBTdGFhdCBkZXIgTmVkZXJsYW5kZW4g
+RVYgUm9vdCBDQTAeFw0xMDEyMDgxMTE5MjlaFw0yMjEyMDgxMTEwMjhaMFgxCzAJBgNVBAYTAk5M
+MR4wHAYDVQQKDBVTdGFhdCBkZXIgTmVkZXJsYW5kZW4xKTAnBgNVBAMMIFN0YWF0IGRlciBOZWRl
+cmxhbmRlbiBFViBSb290IENBMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA48d+ifkk
+SzrSM4M1LGns3Amk41GoJSt5uAg94JG6hIXGhaTK5skuU6TJJB79VWZxXSzFYGgEt9nCUiY4iKTW
+O0Cmws0/zZiTs1QUWJZV1VD+hq2kY39ch/aO5ieSZxeSAgMs3NZmdO3dZ//BYY1jTw+bbRcwJu+r
+0h8QoPnFfxZpgQNH7R5ojXKhTbImxrpsX23Wr9GxE46prfNeaXUmGD5BKyF/7otdBwadQ8QpCiv8
+Kj6GyzyDOvnJDdrFmeK8eEEzduG/L13lpJhQDBXd4Pqcfzho0LKmeqfRMb1+ilgnQ7O6M5HTp5gV
+XJrm0w912fxBmJc+qiXbj5IusHsMX/FjqTf5m3VpTCgmJdrV8hJwRVXj33NeN/UhbJCONVrJ0yPr
+08C+eKxCKFhmpUZtcALXEPlLVPxdhkqHz3/KRawRWrUgUY0viEeXOcDPusBCAUCZSCELa6fS/ZbV
+0b5GnUngC6agIk440ME8MLxwjyx1zNDFjFE7PZQIZCZhfbnDZY8UnCHQqv0XcgOPvZuM5l5Tnrmd
+74K74bzickFbIZTTRTeU0d8JOV3nI6qaHcptqAqGhYqCvkIH1vI4gnPah1vlPNOePqc7nvQDs/nx
+fRN0Av+7oeX6AHkcpmZBiFxgV6YuCcS6/ZrPpx9Aw7vMWgpVSzs4dlG4Y4uElBbmVvMCAwEAAaNC
+MEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFP6rAJCYniT8qcwa
+ivsnuL8wbqg7MA0GCSqGSIb3DQEBCwUAA4ICAQDPdyxuVr5Os7aEAJSrR8kN0nbHhp8dB9O2tLsI
+eK9p0gtJ3jPFrK3CiAJ9Brc1AsFgyb/E6JTe1NOpEyVa/m6irn0F3H3zbPB+po3u2dfOWBfoqSmu
+c0iH55vKbimhZF8ZE/euBhD/UcabTVUlT5OZEAFTdfETzsemQUHSv4ilf0X8rLiltTMMgsT7B/Zq
+5SWEXwbKwYY5EdtYzXc7LMJMD16a4/CrPmEbUCTCwPTxGfARKbalGAKb12NMcIxHowNDXLldRqAN
+b/9Zjr7dn3LDWyvfjFvO5QxGbJKyCqNMVEIYFRIYvdr8unRu/8G2oGTYqV9Vrp9canaW2HNnh/tN
+f1zuacpzEPuKqf2evTY4SUmH9A4U8OmHuD+nT3pajnnUk+S7aFKErGzp85hwVXIy+TSrK0m1zSBi
+5Dp6Z2Orltxtrpfs/J92VoguZs9btsmksNcFuuEnL5O7Jiqik7Ab846+HUCjuTaPPoIaGl6I6lD4
+WeKDRikL40Rc4ZW2aZCaFG+XroHPaO+Zmr615+F/+PoTRxZMzG0IQOeLeG9QgkRQP2YGiqtDhFZK
+DyAthg710tvSeopLzaXoTvFeJiUBWSOgftL2fiFX1ye8FVdMpEbB4IMeDExNH08GGeL5qPQ6gqGy
+eUN51q1veieQA6TqJIc/2b3Z6fJfUEkc7uzXLg==
+-----END CERTIFICATE-----
+
+IdenTrust Commercial Root CA 1
+==============================
+-----BEGIN CERTIFICATE-----
+MIIFYDCCA0igAwIBAgIQCgFCgAAAAUUjyES1AAAAAjANBgkqhkiG9w0BAQsFADBKMQswCQYDVQQG
+EwJVUzESMBAGA1UEChMJSWRlblRydXN0MScwJQYDVQQDEx5JZGVuVHJ1c3QgQ29tbWVyY2lhbCBS
+b290IENBIDEwHhcNMTQwMTE2MTgxMjIzWhcNMzQwMTE2MTgxMjIzWjBKMQswCQYDVQQGEwJVUzES
+MBAGA1UEChMJSWRlblRydXN0MScwJQYDVQQDEx5JZGVuVHJ1c3QgQ29tbWVyY2lhbCBSb290IENB
+IDEwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCnUBneP5k91DNG8W9RYYKyqU+PZ4ld
+hNlT3Qwo2dfw/66VQ3KZ+bVdfIrBQuExUHTRgQ18zZshq0PirK1ehm7zCYofWjK9ouuU+ehcCuz/
+mNKvcbO0U59Oh++SvL3sTzIwiEsXXlfEU8L2ApeN2WIrvyQfYo3fw7gpS0l4PJNgiCL8mdo2yMKi
+1CxUAGc1bnO/AljwpN3lsKImesrgNqUZFvX9t++uP0D1bVoE/c40yiTcdCMbXTMTEl3EASX2MN0C
+XZ/g1Ue9tOsbobtJSdifWwLziuQkkORiT0/Br4sOdBeo0XKIanoBScy0RnnGF7HamB4HWfp1IYVl
+3ZBWzvurpWCdxJ35UrCLvYf5jysjCiN2O/cz4ckA82n5S6LgTrx+kzmEB/dEcH7+B1rlsazRGMzy
+NeVJSQjKVsk9+w8YfYs7wRPCTY/JTw436R+hDmrfYi7LNQZReSzIJTj0+kuniVyc0uMNOYZKdHzV
+WYfCP04MXFL0PfdSgvHqo6z9STQaKPNBiDoT7uje/5kdX7rL6B7yuVBgwDHTc+XvvqDtMwt0viAg
+xGds8AgDelWAf0ZOlqf0Hj7h9tgJ4TNkK2PXMl6f+cB7D3hvl7yTmvmcEpB4eoCHFddydJxVdHix
+uuFucAS6T6C6aMN7/zHwcz09lCqxC0EOoP5NiGVreTO01wIDAQABo0IwQDAOBgNVHQ8BAf8EBAMC
+AQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU7UQZwNPwBovupHu+QucmVMiONnYwDQYJKoZI
+hvcNAQELBQADggIBAA2ukDL2pkt8RHYZYR4nKM1eVO8lvOMIkPkp165oCOGUAFjvLi5+U1KMtlwH
+6oi6mYtQlNeCgN9hCQCTrQ0U5s7B8jeUeLBfnLOic7iPBZM4zY0+sLj7wM+x8uwtLRvM7Kqas6pg
+ghstO8OEPVeKlh6cdbjTMM1gCIOQ045U8U1mwF10A0Cj7oV+wh93nAbowacYXVKV7cndJZ5t+qnt
+ozo00Fl72u1Q8zW/7esUTTHHYPTa8Yec4kjixsU3+wYQ+nVZZjFHKdp2mhzpgq7vmrlR94gjmmmV
+YjzlVYA211QC//G5Xc7UI2/YRYRKW2XviQzdFKcgyxilJbQN+QHwotL0AMh0jqEqSI5l2xPE4iUX
+feu+h1sXIFRRk0pTAwvsXcoz7WL9RccvW9xYoIA55vrX/hMUpu09lEpCdNTDd1lzzY9GvlU47/ro
+kTLql1gEIt44w8y8bckzOmoKaT+gyOpyj4xjhiO9bTyWnpXgSUyqorkqG5w2gXjtw+hG4iZZRHUe
+2XWJUc0QhJ1hYMtd+ZciTY6Y5uN/9lu7rs3KSoFrXgvzUeF0K+l+J6fZmUlO+KWA2yUPHGNiiskz
+Z2s8EIPGrd6ozRaOjfAHN3Gf8qv8QfXBi+wAN10J5U6A7/qxXDgGpRtK4dw4LTzcqx+QGtVKnO7R
+cGzM7vRX+Bi6hG6H
+-----END CERTIFICATE-----
+
+IdenTrust Public Sector Root CA 1
+=================================
+-----BEGIN CERTIFICATE-----
+MIIFZjCCA06gAwIBAgIQCgFCgAAAAUUjz0Z8AAAAAjANBgkqhkiG9w0BAQsFADBNMQswCQYDVQQG
+EwJVUzESMBAGA1UEChMJSWRlblRydXN0MSowKAYDVQQDEyFJZGVuVHJ1c3QgUHVibGljIFNlY3Rv
+ciBSb290IENBIDEwHhcNMTQwMTE2MTc1MzMyWhcNMzQwMTE2MTc1MzMyWjBNMQswCQYDVQQGEwJV
+UzESMBAGA1UEChMJSWRlblRydXN0MSowKAYDVQQDEyFJZGVuVHJ1c3QgUHVibGljIFNlY3RvciBS
+b290IENBIDEwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC2IpT8pEiv6EdrCvsnduTy
+P4o7ekosMSqMjbCpwzFrqHd2hCa2rIFCDQjrVVi7evi8ZX3yoG2LqEfpYnYeEe4IFNGyRBb06tD6
+Hi9e28tzQa68ALBKK0CyrOE7S8ItneShm+waOh7wCLPQ5CQ1B5+ctMlSbdsHyo+1W/CD80/HLaXI
+rcuVIKQxKFdYWuSNG5qrng0M8gozOSI5Cpcu81N3uURF/YTLNiCBWS2ab21ISGHKTN9T0a9SvESf
+qy9rg3LvdYDaBjMbXcjaY8ZNzaxmMc3R3j6HEDbhuaR672BQssvKplbgN6+rNBM5Jeg5ZuSYeqoS
+mJxZZoY+rfGwyj4GD3vwEUs3oERte8uojHH01bWRNszwFcYr3lEXsZdMUD2xlVl8BX0tIdUAvwFn
+ol57plzy9yLxkA2T26pEUWbMfXYD62qoKjgZl3YNa4ph+bz27nb9cCvdKTz4Ch5bQhyLVi9VGxyh
+LrXHFub4qjySjmm2AcG1hp2JDws4lFTo6tyePSW8Uybt1as5qsVATFSrsrTZ2fjXctscvG29ZV/v
+iDUqZi/u9rNl8DONfJhBaUYPQxxp+pu10GFqzcpL2UyQRqsVWaFHVCkugyhfHMKiq3IXAAaOReyL
+4jM9f9oZRORicsPfIsbyVtTdX5Vy7W1f90gDW/3FKqD2cyOEEBsB5wIDAQABo0IwQDAOBgNVHQ8B
+Af8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU43HgntinQtnbcZFrlJPrw6PRFKMw
+DQYJKoZIhvcNAQELBQADggIBAEf63QqwEZE4rU1d9+UOl1QZgkiHVIyqZJnYWv6IAcVYpZmxI1Qj
+t2odIFflAWJBF9MJ23XLblSQdf4an4EKwt3X9wnQW3IV5B4Jaj0z8yGa5hV+rVHVDRDtfULAj+7A
+mgjVQdZcDiFpboBhDhXAuM/FSRJSzL46zNQuOAXeNf0fb7iAaJg9TaDKQGXSc3z1i9kKlT/YPyNt
+GtEqJBnZhbMX73huqVjRI9PHE+1yJX9dsXNw0H8GlwmEKYBhHfpe/3OsoOOJuBxxFcbeMX8S3OFt
+m6/n6J91eEyrRjuazr8FGF1NFTwWmhlQBJqymm9li1JfPFgEKCXAZmExfrngdbkaqIHWchezxQMx
+NRF4eKLg6TCMf4DfWN88uieW4oA0beOY02QnrEh+KHdcxiVhJfiFDGX6xDIvpZgF5PgLZxYWxoK4
+Mhn5+bl53B/N66+rDt0b20XkeucC4pVd/GnwU2lhlXV5C15V5jgclKlZM57IcXR5f1GJtshquDDI
+ajjDbp7hNxbqBWJMWxJH7ae0s1hWx0nzfxJoCTFx8G34Tkf71oXuxVhAGaQdp/lLQzfcaFpPz+vC
+ZHTetBXZ9FRUGi8c15dxVJCO2SCdUyt/q4/i6jC8UDfv8Ue1fXwsBOxonbRJRBD0ckscZOf85muQ
+3Wl9af0AVqW3rLatt8o+Ae+c
+-----END CERTIFICATE-----
+
+Entrust Root Certification Authority - G2
+=========================================
+-----BEGIN CERTIFICATE-----
+MIIEPjCCAyagAwIBAgIESlOMKDANBgkqhkiG9w0BAQsFADCBvjELMAkGA1UEBhMCVVMxFjAUBgNV
+BAoTDUVudHJ1c3QsIEluYy4xKDAmBgNVBAsTH1NlZSB3d3cuZW50cnVzdC5uZXQvbGVnYWwtdGVy
+bXMxOTA3BgNVBAsTMChjKSAyMDA5IEVudHJ1c3QsIEluYy4gLSBmb3IgYXV0aG9yaXplZCB1c2Ug
+b25seTEyMDAGA1UEAxMpRW50cnVzdCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzIw
+HhcNMDkwNzA3MTcyNTU0WhcNMzAxMjA3MTc1NTU0WjCBvjELMAkGA1UEBhMCVVMxFjAUBgNVBAoT
+DUVudHJ1c3QsIEluYy4xKDAmBgNVBAsTH1NlZSB3d3cuZW50cnVzdC5uZXQvbGVnYWwtdGVybXMx
+OTA3BgNVBAsTMChjKSAyMDA5IEVudHJ1c3QsIEluYy4gLSBmb3IgYXV0aG9yaXplZCB1c2Ugb25s
+eTEyMDAGA1UEAxMpRW50cnVzdCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzIwggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC6hLZy254Ma+KZ6TABp3bqMriVQRrJ2mFOWHLP
+/vaCeb9zYQYKpSfYs1/TRU4cctZOMvJyig/3gxnQaoCAAEUesMfnmr8SVycco2gvCoe9amsOXmXz
+HHfV1IWNcCG0szLni6LVhjkCsbjSR87kyUnEO6fe+1R9V77w6G7CebI6C1XiUJgWMhNcL3hWwcKU
+s/Ja5CeanyTXxuzQmyWC48zCxEXFjJd6BmsqEZ+pCm5IO2/b1BEZQvePB7/1U1+cPvQXLOZprE4y
+TGJ36rfo5bs0vBmLrpxR57d+tVOxMyLlbc9wPBr64ptntoP0jaWvYkxN4FisZDQSA/i2jZRjJKRx
+AgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRqciZ6
+0B7vfec7aVHUbI2fkBJmqzANBgkqhkiG9w0BAQsFAAOCAQEAeZ8dlsa2eT8ijYfThwMEYGprmi5Z
+iXMRrEPR9RP/jTkrwPK9T3CMqS/qF8QLVJ7UG5aYMzyorWKiAHarWWluBh1+xLlEjZivEtRh2woZ
+Rkfz6/djwUAFQKXSt/S1mja/qYh2iARVBCuch38aNzx+LaUa2NSJXsq9rD1s2G2v1fN2D807iDgi
+nWyTmsQ9v4IbZT+mD12q/OWyFcq1rca8PdCE6OoGcrBNOTJ4vz4RnAuknZoh8/CbCzB428Hch0P+
+vGOaysXCHMnHjf87ElgI5rY97HosTvuDls4MPGmHVHOkc8KT/1EQrBVUAdj8BbGJoX90g5pJ19xO
+e4pIb4tF9g==
+-----END CERTIFICATE-----
+
+Entrust Root Certification Authority - EC1
+==========================================
+-----BEGIN CERTIFICATE-----
+MIIC+TCCAoCgAwIBAgINAKaLeSkAAAAAUNCR+TAKBggqhkjOPQQDAzCBvzELMAkGA1UEBhMCVVMx
+FjAUBgNVBAoTDUVudHJ1c3QsIEluYy4xKDAmBgNVBAsTH1NlZSB3d3cuZW50cnVzdC5uZXQvbGVn
+YWwtdGVybXMxOTA3BgNVBAsTMChjKSAyMDEyIEVudHJ1c3QsIEluYy4gLSBmb3IgYXV0aG9yaXpl
+ZCB1c2Ugb25seTEzMDEGA1UEAxMqRW50cnVzdCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5
+IC0gRUMxMB4XDTEyMTIxODE1MjUzNloXDTM3MTIxODE1NTUzNlowgb8xCzAJBgNVBAYTAlVTMRYw
+FAYDVQQKEw1FbnRydXN0LCBJbmMuMSgwJgYDVQQLEx9TZWUgd3d3LmVudHJ1c3QubmV0L2xlZ2Fs
+LXRlcm1zMTkwNwYDVQQLEzAoYykgMjAxMiBFbnRydXN0LCBJbmMuIC0gZm9yIGF1dGhvcml6ZWQg
+dXNlIG9ubHkxMzAxBgNVBAMTKkVudHJ1c3QgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAt
+IEVDMTB2MBAGByqGSM49AgEGBSuBBAAiA2IABIQTydC6bUF74mzQ61VfZgIaJPRbiWlH47jCffHy
+AsWfoPZb1YsGGYZPUxBtByQnoaD41UcZYUx9ypMn6nQM72+WCf5j7HBdNq1nd67JnXxVRDqiY1Ef
+9eNi1KlHBz7MIKNCMEAwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYE
+FLdj5xrdjekIplWDpOBqUEFlEUJJMAoGCCqGSM49BAMDA2cAMGQCMGF52OVCR98crlOZF7ZvHH3h
+vxGU0QOIdeSNiaSKd0bebWHvAvX7td/M/k7//qnmpwIwW5nXhTcGtXsI/esni0qU+eH6p44mCOh8
+kmhtc9hvJqwhAriZtyZBWyVgrtBIGu4G
+-----END CERTIFICATE-----
+
+CFCA EV ROOT
+============
+-----BEGIN CERTIFICATE-----
+MIIFjTCCA3WgAwIBAgIEGErM1jANBgkqhkiG9w0BAQsFADBWMQswCQYDVQQGEwJDTjEwMC4GA1UE
+CgwnQ2hpbmEgRmluYW5jaWFsIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MRUwEwYDVQQDDAxDRkNB
+IEVWIFJPT1QwHhcNMTIwODA4MDMwNzAxWhcNMjkxMjMxMDMwNzAxWjBWMQswCQYDVQQGEwJDTjEw
+MC4GA1UECgwnQ2hpbmEgRmluYW5jaWFsIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MRUwEwYDVQQD
+DAxDRkNBIEVWIFJPT1QwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDXXWvNED8fBVnV
+BU03sQ7smCuOFR36k0sXgiFxEFLXUWRwFsJVaU2OFW2fvwwbwuCjZ9YMrM8irq93VCpLTIpTUnrD
+7i7es3ElweldPe6hL6P3KjzJIx1qqx2hp/Hz7KDVRM8Vz3IvHWOX6Jn5/ZOkVIBMUtRSqy5J35DN
+uF++P96hyk0g1CXohClTt7GIH//62pCfCqktQT+x8Rgp7hZZLDRJGqgG16iI0gNyejLi6mhNbiyW
+ZXvKWfry4t3uMCz7zEasxGPrb382KzRzEpR/38wmnvFyXVBlWY9ps4deMm/DGIq1lY+wejfeWkU7
+xzbh72fROdOXW3NiGUgthxwG+3SYIElz8AXSG7Ggo7cbcNOIabla1jj0Ytwli3i/+Oh+uFzJlU9f
+py25IGvPa931DfSCt/SyZi4QKPaXWnuWFo8BGS1sbn85WAZkgwGDg8NNkt0yxoekN+kWzqotaK8K
+gWU6cMGbrU1tVMoqLUuFG7OA5nBFDWteNfB/O7ic5ARwiRIlk9oKmSJgamNgTnYGmE69g60dWIol
+hdLHZR4tjsbftsbhf4oEIRUpdPA+nJCdDC7xij5aqgwJHsfVPKPtl8MeNPo4+QgO48BdK4PRVmrJ
+tqhUUy54Mmc9gn900PvhtgVguXDbjgv5E1hvcWAQUhC5wUEJ73IfZzF4/5YFjQIDAQABo2MwYTAf
+BgNVHSMEGDAWgBTj/i39KNALtbq2osS/BqoFjJP7LzAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB
+/wQEAwIBBjAdBgNVHQ4EFgQU4/4t/SjQC7W6tqLEvwaqBYyT+y8wDQYJKoZIhvcNAQELBQADggIB
+ACXGumvrh8vegjmWPfBEp2uEcwPenStPuiB/vHiyz5ewG5zz13ku9Ui20vsXiObTej/tUxPQ4i9q
+ecsAIyjmHjdXNYmEwnZPNDatZ8POQQaIxffu2Bq41gt/UP+TqhdLjOztUmCypAbqTuv0axn96/Ua
+4CUqmtzHQTb3yHQFhDmVOdYLO6Qn+gjYXB74BGBSESgoA//vU2YApUo0FmZ8/Qmkrp5nGm9BC2sG
+E5uPhnEFtC+NiWYzKXZUmhH4J/qyP5Hgzg0b8zAarb8iXRvTvyUFTeGSGn+ZnzxEk8rUQElsgIfX
+BDrDMlI1Dlb4pd19xIsNER9Tyx6yF7Zod1rg1MvIB671Oi6ON7fQAUtDKXeMOZePglr4UeWJoBjn
+aH9dCi77o0cOPaYjesYBx4/IXr9tgFa+iiS6M+qf4TIRnvHST4D2G0CvOJ4RUHlzEhLN5mydLIhy
+PDCBBpEi6lmt2hkuIsKNuYyH4Ga8cyNfIWRjgEj1oDwYPZTISEEdQLpe/v5WOaHIz16eGWRGENoX
+kbcFgKyLmZJ956LYBws2J+dIeWCKw9cTXPhyQN9Ky8+ZAAoACxGV2lZFA4gKn2fQ1XmxqI1AbQ3C
+ekD6819kR5LLU7m7Wc5P/dAVUwHY3+vZ5nbv0CO7O6l5s9UCKc2Jo5YPSjXnTkLAdc0Hz+Ys63su
+-----END CERTIFICATE-----
+
+Certinomis - Root CA
+====================
+-----BEGIN CERTIFICATE-----
+MIIFkjCCA3qgAwIBAgIBATANBgkqhkiG9w0BAQsFADBaMQswCQYDVQQGEwJGUjETMBEGA1UEChMK
+Q2VydGlub21pczEXMBUGA1UECxMOMDAwMiA0MzM5OTg5MDMxHTAbBgNVBAMTFENlcnRpbm9taXMg
+LSBSb290IENBMB4XDTEzMTAyMTA5MTcxOFoXDTMzMTAyMTA5MTcxOFowWjELMAkGA1UEBhMCRlIx
+EzARBgNVBAoTCkNlcnRpbm9taXMxFzAVBgNVBAsTDjAwMDIgNDMzOTk4OTAzMR0wGwYDVQQDExRD
+ZXJ0aW5vbWlzIC0gUm9vdCBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANTMCQos
+P5L2fxSeC5yaah1AMGT9qt8OHgZbn1CF6s2Nq0Nn3rD6foCWnoR4kkjW4znuzuRZWJflLieY6pOo
+d5tK8O90gC3rMB+12ceAnGInkYjwSond3IjmFPnVAy//ldu9n+ws+hQVWZUKxkd8aRi5pwP5ynap
+z8dvtF4F/u7BUrJ1Mofs7SlmO/NKFoL21prbcpjp3vDFTKWrteoB4owuZH9kb/2jJZOLyKIOSY00
+8B/sWEUuNKqEUL3nskoTuLAPrjhdsKkb5nPJWqHZZkCqqU2mNAKthH6yI8H7KsZn9DS2sJVqM09x
+RLWtwHkziOC/7aOgFLScCbAK42C++PhmiM1b8XcF4LVzbsF9Ri6OSyemzTUK/eVNfaoqoynHWmgE
+6OXWk6RiwsXm9E/G+Z8ajYJJGYrKWUM66A0ywfRMEwNvbqY/kXPLynNvEiCL7sCCeN5LLsJJwx3t
+FvYk9CcbXFcx3FXuqB5vbKziRcxXV4p1VxngtViZSTYxPDMBbRZKzbgqg4SGm/lg0h9tkQPTYKbV
+PZrdd5A9NaSfD171UkRpucC63M9933zZxKyGIjK8e2uR73r4F2iw4lNVYC2vPsKD2NkJK/DAZNuH
+i5HMkesE/Xa0lZrmFAYb1TQdvtj/dBxThZngWVJKYe2InmtJiUZ+IFrZ50rlau7SZRFDAgMBAAGj
+YzBhMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBTvkUz1pcMw6C8I
+6tNxIqSSaHh02TAfBgNVHSMEGDAWgBTvkUz1pcMw6C8I6tNxIqSSaHh02TANBgkqhkiG9w0BAQsF
+AAOCAgEAfj1U2iJdGlg+O1QnurrMyOMaauo++RLrVl89UM7g6kgmJs95Vn6RHJk/0KGRHCwPT5iV
+WVO90CLYiF2cN/z7ZMF4jIuaYAnq1fohX9B0ZedQxb8uuQsLrbWwF6YSjNRieOpWauwK0kDDPAUw
+Pk2Ut59KA9N9J0u2/kTO+hkzGm2kQtHdzMjI1xZSg081lLMSVX3l4kLr5JyTCcBMWwerx20RoFAX
+lCOotQqSD7J6wWAsOMwaplv/8gzjqh8c3LigkyfeY+N/IZ865Z764BNqdeuWXGKRlI5nU7aJ+BIJ
+y29SWwNyhlCVCNSNh4YVH5Uk2KRvms6knZtt0rJ2BobGVgjF6wnaNsIbW0G+YSrjcOa4pvi2WsS9
+Iff/ql+hbHY5ZtbqTFXhADObE5hjyW/QASAJN1LnDE8+zbz1X5YnpyACleAu6AdBBR8Vbtaw5Bng
+DwKTACdyxYvRVB9dSsNAl35VpnzBMwQUAR1JIGkLGZOdblgi90AMRgwjY/M50n92Uaf0yKHxDHYi
+I0ZSKS3io0EHVmmY0gUJvGnHWmHNj4FgFU2A3ZDifcRQ8ow7bkrHxuaAKzyBvBGAFhAn1/DNP3nM
+cyrDflOR1m749fPH0FFNjkulW+YZFzvWgQncItzujrnEj1PhZ7szuIgVRs/taTX/dQ1G885x4cVr
+hkIGuUE=
+-----END CERTIFICATE-----
+
+OISTE WISeKey Global Root GB CA
+===============================
+-----BEGIN CERTIFICATE-----
+MIIDtTCCAp2gAwIBAgIQdrEgUnTwhYdGs/gjGvbCwDANBgkqhkiG9w0BAQsFADBtMQswCQYDVQQG
+EwJDSDEQMA4GA1UEChMHV0lTZUtleTEiMCAGA1UECxMZT0lTVEUgRm91bmRhdGlvbiBFbmRvcnNl
+ZDEoMCYGA1UEAxMfT0lTVEUgV0lTZUtleSBHbG9iYWwgUm9vdCBHQiBDQTAeFw0xNDEyMDExNTAw
+MzJaFw0zOTEyMDExNTEwMzFaMG0xCzAJBgNVBAYTAkNIMRAwDgYDVQQKEwdXSVNlS2V5MSIwIAYD
+VQQLExlPSVNURSBGb3VuZGF0aW9uIEVuZG9yc2VkMSgwJgYDVQQDEx9PSVNURSBXSVNlS2V5IEds
+b2JhbCBSb290IEdCIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2Be3HEokKtaX
+scriHvt9OO+Y9bI5mE4nuBFde9IllIiCFSZqGzG7qFshISvYD06fWvGxWuR51jIjK+FTzJlFXHtP
+rby/h0oLS5daqPZI7H17Dc0hBt+eFf1Biki3IPShehtX1F1Q/7pn2COZH8g/497/b1t3sWtuuMlk
+9+HKQUYOKXHQuSP8yYFfTvdv37+ErXNku7dCjmn21HYdfp2nuFeKUWdy19SouJVUQHMD9ur06/4o
+Qnc/nSMbsrY9gBQHTC5P99UKFg29ZkM3fiNDecNAhvVMKdqOmq0NpQSHiB6F4+lT1ZvIiwNjeOvg
+GUpuuy9rM2RYk61pv48b74JIxwIDAQABo1EwTzALBgNVHQ8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB
+/zAdBgNVHQ4EFgQUNQ/INmNe4qPs+TtmFc5RUuORmj0wEAYJKwYBBAGCNxUBBAMCAQAwDQYJKoZI
+hvcNAQELBQADggEBAEBM+4eymYGQfp3FsLAmzYh7KzKNbrghcViXfa43FK8+5/ea4n32cZiZBKpD
+dHij40lhPnOMTZTg+XHEthYOU3gf1qKHLwI5gSk8rxWYITD+KJAAjNHhy/peyP34EEY7onhCkRd0
+VQreUGdNZtGn//3ZwLWoo4rOZvUPQ82nK1d7Y0Zqqi5S2PTt4W2tKZB4SLrhI6qjiey1q5bAtEui
+HZeeevJuQHHfaPFlTc58Bd9TZaml8LGXBHAVRgOY1NK/VLSgWH1Sb9pWJmLU2NuJMW8c8CLC02Ic
+Nc1MaRVUGpCY3useX8p3x8uOPUNpnJpY0CQ73xtAln41rYHHTnG6iBM=
+-----END CERTIFICATE-----
+
+SZAFIR ROOT CA2
+===============
+-----BEGIN CERTIFICATE-----
+MIIDcjCCAlqgAwIBAgIUPopdB+xV0jLVt+O2XwHrLdzk1uQwDQYJKoZIhvcNAQELBQAwUTELMAkG
+A1UEBhMCUEwxKDAmBgNVBAoMH0tyYWpvd2EgSXpiYSBSb3psaWN6ZW5pb3dhIFMuQS4xGDAWBgNV
+BAMMD1NaQUZJUiBST09UIENBMjAeFw0xNTEwMTkwNzQzMzBaFw0zNTEwMTkwNzQzMzBaMFExCzAJ
+BgNVBAYTAlBMMSgwJgYDVQQKDB9LcmFqb3dhIEl6YmEgUm96bGljemVuaW93YSBTLkEuMRgwFgYD
+VQQDDA9TWkFGSVIgUk9PVCBDQTIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3vD5Q
+qEvNQLXOYeeWyrSh2gwisPq1e3YAd4wLz32ohswmUeQgPYUM1ljj5/QqGJ3a0a4m7utT3PSQ1hNK
+DJA8w/Ta0o4NkjrcsbH/ON7Dui1fgLkCvUqdGw+0w8LBZwPd3BucPbOw3gAeqDRHu5rr/gsUvTaE
+2g0gv/pby6kWIK05YO4vdbbnl5z5Pv1+TW9NL++IDWr63fE9biCloBK0TXC5ztdyO4mTp4CEHCdJ
+ckm1/zuVnsHMyAHs6A6KCpbns6aH5db5BSsNl0BwPLqsdVqc1U2dAgrSS5tmS0YHF2Wtn2yIANwi
+ieDhZNRnvDF5YTy7ykHNXGoAyDw4jlivAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0P
+AQH/BAQDAgEGMB0GA1UdDgQWBBQuFqlKGLXLzPVvUPMjX/hd56zwyDANBgkqhkiG9w0BAQsFAAOC
+AQEAtXP4A9xZWx126aMqe5Aosk3AM0+qmrHUuOQn/6mWmc5G4G18TKI4pAZw8PRBEew/R40/cof5
+O/2kbytTAOD/OblqBw7rHRz2onKQy4I9EYKL0rufKq8h5mOGnXkZ7/e7DDWQw4rtTw/1zBLZpD67
+oPwglV9PJi8RI4NOdQcPv5vRtB3pEAT+ymCPoky4rc/hkA/NrgrHXXu3UNLUYfrVFdvXn4dRVOul
+4+vJhaAlIDf7js4MNIThPIGyd05DpYhfhmehPea0XGG2Ptv+tyjFogeutcrKjSoS75ftwjCkySp6
++/NNIxuZMzSgLvWpCz/UXeHPhJ/iGcJfitYgHuNztw==
+-----END CERTIFICATE-----
+
+Certum Trusted Network CA 2
+===========================
+-----BEGIN CERTIFICATE-----
+MIIF0jCCA7qgAwIBAgIQIdbQSk8lD8kyN/yqXhKN6TANBgkqhkiG9w0BAQ0FADCBgDELMAkGA1UE
+BhMCUEwxIjAgBgNVBAoTGVVuaXpldG8gVGVjaG5vbG9naWVzIFMuQS4xJzAlBgNVBAsTHkNlcnR1
+bSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTEkMCIGA1UEAxMbQ2VydHVtIFRydXN0ZWQgTmV0d29y
+ayBDQSAyMCIYDzIwMTExMDA2MDgzOTU2WhgPMjA0NjEwMDYwODM5NTZaMIGAMQswCQYDVQQGEwJQ
+TDEiMCAGA1UEChMZVW5pemV0byBUZWNobm9sb2dpZXMgUy5BLjEnMCUGA1UECxMeQ2VydHVtIENl
+cnRpZmljYXRpb24gQXV0aG9yaXR5MSQwIgYDVQQDExtDZXJ0dW0gVHJ1c3RlZCBOZXR3b3JrIENB
+IDIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC9+Xj45tWADGSdhhuWZGc/IjoedQF9
+7/tcZ4zJzFxrqZHmuULlIEub2pt7uZld2ZuAS9eEQCsn0+i6MLs+CRqnSZXvK0AkwpfHp+6bJe+o
+CgCXhVqqndwpyeI1B+twTUrWwbNWuKFBOJvR+zF/j+Bf4bE/D44WSWDXBo0Y+aomEKsq09DRZ40b
+Rr5HMNUuctHFY9rnY3lEfktjJImGLjQ/KUxSiyqnwOKRKIm5wFv5HdnnJ63/mgKXwcZQkpsCLL2p
+uTRZCr+ESv/f/rOf69me4Jgj7KZrdxYq28ytOxykh9xGc14ZYmhFV+SQgkK7QtbwYeDBoz1mo130
+GO6IyY0XRSmZMnUCMe4pJshrAua1YkV/NxVaI2iJ1D7eTiew8EAMvE0Xy02isx7QBlrd9pPPV3WZ
+9fqGGmd4s7+W/jTcvedSVuWz5XV710GRBdxdaeOVDUO5/IOWOZV7bIBaTxNyxtd9KXpEulKkKtVB
+Rgkg/iKgtlswjbyJDNXXcPiHUv3a76xRLgezTv7QCdpw75j6VuZt27VXS9zlLCUVyJ4ueE742pye
+hizKV/Ma5ciSixqClnrDvFASadgOWkaLOusm+iPJtrCBvkIApPjW/jAux9JG9uWOdf3yzLnQh1vM
+BhBgu4M1t15n3kfsmUjxpKEV/q2MYo45VU85FrmxY53/twIDAQABo0IwQDAPBgNVHRMBAf8EBTAD
+AQH/MB0GA1UdDgQWBBS2oVQ5AsOgP46KvPrU+Bym0ToO/TAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZI
+hvcNAQENBQADggIBAHGlDs7k6b8/ONWJWsQCYftMxRQXLYtPU2sQF/xlhMcQSZDe28cmk4gmb3DW
+Al45oPePq5a1pRNcgRRtDoGCERuKTsZPpd1iHkTfCVn0W3cLN+mLIMb4Ck4uWBzrM9DPhmDJ2vuA
+L55MYIR4PSFk1vtBHxgP58l1cb29XN40hz5BsA72udY/CROWFC/emh1auVbONTqwX3BNXuMp8SMo
+clm2q8KMZiYcdywmdjWLKKdpoPk79SPdhRB0yZADVpHnr7pH1BKXESLjokmUbOe3lEu6LaTaM4tM
+pkT/WjzGHWTYtTHkpjx6qFcL2+1hGsvxznN3Y6SHb0xRONbkX8eftoEq5IVIeVheO/jbAoJnwTnb
+w3RLPTYe+SmTiGhbqEQZIfCn6IENLOiTNrQ3ssqwGyZ6miUfmpqAnksqP/ujmv5zMnHCnsZy4Ypo
+J/HkD7TETKVhk/iXEAcqMCWpuchxuO9ozC1+9eB+D4Kob7a6bINDd82Kkhehnlt4Fj1F4jNy3eFm
+ypnTycUm/Q1oBEauttmbjL4ZvrHG8hnjXALKLNhvSgfZyTXaQHXyxKcZb55CEJh15pWLYLztxRLX
+is7VmFxWlgPF7ncGNf/P5O4/E2Hu29othfDNrp2yGAlFw5Khchf8R7agCyzxxN5DaAhqXzvwdmP7
+zAYspsbiDrW5viSP
+-----END CERTIFICATE-----
+
+Hellenic Academic and Research Institutions RootCA 2015
+=======================================================
+-----BEGIN CERTIFICATE-----
+MIIGCzCCA/OgAwIBAgIBADANBgkqhkiG9w0BAQsFADCBpjELMAkGA1UEBhMCR1IxDzANBgNVBAcT
+BkF0aGVuczFEMEIGA1UEChM7SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0
+aW9ucyBDZXJ0LiBBdXRob3JpdHkxQDA+BgNVBAMTN0hlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNl
+YXJjaCBJbnN0aXR1dGlvbnMgUm9vdENBIDIwMTUwHhcNMTUwNzA3MTAxMTIxWhcNNDAwNjMwMTAx
+MTIxWjCBpjELMAkGA1UEBhMCR1IxDzANBgNVBAcTBkF0aGVuczFEMEIGA1UEChM7SGVsbGVuaWMg
+QWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9ucyBDZXJ0LiBBdXRob3JpdHkxQDA+BgNV
+BAMTN0hlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNlYXJjaCBJbnN0aXR1dGlvbnMgUm9vdENBIDIw
+MTUwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDC+Kk/G4n8PDwEXT2QNrCROnk8Zlrv
+bTkBSRq0t89/TSNTt5AA4xMqKKYx8ZEA4yjsriFBzh/a/X0SWwGDD7mwX5nh8hKDgE0GPt+sr+eh
+iGsxr/CL0BgzuNtFajT0AoAkKAoCFZVedioNmToUW/bLy1O8E00BiDeUJRtCvCLYjqOWXjrZMts+
+6PAQZe104S+nfK8nNLspfZu2zwnI5dMK/IhlZXQK3HMcXM1AsRzUtoSMTFDPaI6oWa7CJ06CojXd
+FPQf/7J31Ycvqm59JCfnxssm5uX+Zwdj2EUN3TpZZTlYepKZcj2chF6IIbjV9Cz82XBST3i4vTwr
+i5WY9bPRaM8gFH5MXF/ni+X1NYEZN9cRCLdmvtNKzoNXADrDgfgXy5I2XdGj2HUb4Ysn6npIQf1F
+GQatJ5lOwXBH3bWfgVMS5bGMSF0xQxfjjMZ6Y5ZLKTBOhE5iGV48zpeQpX8B653g+IuJ3SWYPZK2
+fu/Z8VFRfS0myGlZYeCsargqNhEEelC9MoS+L9xy1dcdFkfkR2YgP/SWxa+OAXqlD3pk9Q0Yh9mu
+iNX6hME6wGkoLfINaFGq46V3xqSQDqE3izEjR8EJCOtu93ib14L8hCCZSRm2Ekax+0VVFqmjZayc
+Bw/qa9wfLgZy7IaIEuQt218FL+TwA9MmM+eAws1CoRc0CwIDAQABo0IwQDAPBgNVHRMBAf8EBTAD
+AQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUcRVnyMjJvXVdctA4GGqd83EkVAswDQYJKoZI
+hvcNAQELBQADggIBAHW7bVRLqhBYRjTyYtcWNl0IXtVsyIe9tC5G8jH4fOpCtZMWVdyhDBKg2mF+
+D1hYc2Ryx+hFjtyp8iY/xnmMsVMIM4GwVhO+5lFc2JsKT0ucVlMC6U/2DWDqTUJV6HwbISHTGzrM
+d/K4kPFox/la/vot9L/J9UUbzjgQKjeKeaO04wlshYaT/4mWJ3iBj2fjRnRUjtkNaeJK9E10A/+y
+d+2VZ5fkscWrv2oj6NSU4kQoYsRL4vDY4ilrGnB+JGGTe08DMiUNRSQrlrRGar9KC/eaj8GsGsVn
+82800vpzY4zvFrCopEYq+OsS7HK07/grfoxSwIuEVPkvPuNVqNxmsdnhX9izjFk0WaSrT2y7Hxjb
+davYy5LNlDhhDgcGH0tGEPEVvo2FXDtKK4F5D7Rpn0lQl033DlZdwJVqwjbDG2jJ9SrcR5q+ss7F
+Jej6A7na+RZukYT1HCjI/CbM1xyQVqdfbzoEvM14iQuODy+jqk+iGxI9FghAD/FGTNeqewjBCvVt
+J94Cj8rDtSvK6evIIVM4pcw72Hc3MKJP2W/R8kCtQXoXxdZKNYm3QdV8hn9VTYNKpXMgwDqvkPGa
+JI7ZjnHKe7iG2rKPmT4dEw0SEe7Uq/DpFXYC5ODfqiAeW2GFZECpkJcNrVPSWh2HagCXZWK0vm9q
+p/UsQu0yrbYhnr68
+-----END CERTIFICATE-----
+
+Hellenic Academic and Research Institutions ECC RootCA 2015
+===========================================================
+-----BEGIN CERTIFICATE-----
+MIICwzCCAkqgAwIBAgIBADAKBggqhkjOPQQDAjCBqjELMAkGA1UEBhMCR1IxDzANBgNVBAcTBkF0
+aGVuczFEMEIGA1UEChM7SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9u
+cyBDZXJ0LiBBdXRob3JpdHkxRDBCBgNVBAMTO0hlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNlYXJj
+aCBJbnN0aXR1dGlvbnMgRUNDIFJvb3RDQSAyMDE1MB4XDTE1MDcwNzEwMzcxMloXDTQwMDYzMDEw
+MzcxMlowgaoxCzAJBgNVBAYTAkdSMQ8wDQYDVQQHEwZBdGhlbnMxRDBCBgNVBAoTO0hlbGxlbmlj
+IEFjYWRlbWljIGFuZCBSZXNlYXJjaCBJbnN0aXR1dGlvbnMgQ2VydC4gQXV0aG9yaXR5MUQwQgYD
+VQQDEztIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIEVDQyBSb290
+Q0EgMjAxNTB2MBAGByqGSM49AgEGBSuBBAAiA2IABJKgQehLgoRc4vgxEZmGZE4JJS+dQS8KrjVP
+dJWyUWRrjWvmP3CV8AVER6ZyOFB2lQJajq4onvktTpnvLEhvTCUp6NFxW98dwXU3tNf6e3pCnGoK
+Vlp8aQuqgAkkbH7BRqNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0O
+BBYEFLQiC4KZJAEOnLvkDv2/+5cgk5kqMAoGCCqGSM49BAMCA2cAMGQCMGfOFmI4oqxiRaeplSTA
+GiecMjvAwNW6qef4BENThe5SId6d9SWDPp5YSy/XZxMOIQIwBeF1Ad5o7SofTUwJCA3sS61kFyjn
+dc5FZXIhF8siQQ6ME5g4mlRtm8rifOoCWCKR
+-----END CERTIFICATE-----
+
+Certplus Root CA G1
+===================
+-----BEGIN CERTIFICATE-----
+MIIFazCCA1OgAwIBAgISESBVg+QtPlRWhS2DN7cs3EYRMA0GCSqGSIb3DQEBDQUAMD4xCzAJBgNV
+BAYTAkZSMREwDwYDVQQKDAhDZXJ0cGx1czEcMBoGA1UEAwwTQ2VydHBsdXMgUm9vdCBDQSBHMTAe
+Fw0xNDA1MjYwMDAwMDBaFw0zODAxMTUwMDAwMDBaMD4xCzAJBgNVBAYTAkZSMREwDwYDVQQKDAhD
+ZXJ0cGx1czEcMBoGA1UEAwwTQ2VydHBsdXMgUm9vdCBDQSBHMTCCAiIwDQYJKoZIhvcNAQEBBQAD
+ggIPADCCAgoCggIBANpQh7bauKk+nWT6VjOaVj0W5QOVsjQcmm1iBdTYj+eJZJ+622SLZOZ5KmHN
+r49aiZFluVj8tANfkT8tEBXgfs+8/H9DZ6itXjYj2JizTfNDnjl8KvzsiNWI7nC9hRYt6kuJPKNx
+Qv4c/dMcLRC4hlTqQ7jbxofaqK6AJc96Jh2qkbBIb6613p7Y1/oA/caP0FG7Yn2ksYyy/yARujVj
+BYZHYEMzkPZHogNPlk2dT8Hq6pyi/jQu3rfKG3akt62f6ajUeD94/vI4CTYd0hYCyOwqaK/1jpTv
+LRN6HkJKHRUxrgwEV/xhc/MxVoYxgKDEEW4wduOU8F8ExKyHcomYxZ3MVwia9Az8fXoFOvpHgDm2
+z4QTd28n6v+WZxcIbekN1iNQMLAVdBM+5S//Ds3EC0pd8NgAM0lm66EYfFkuPSi5YXHLtaW6uOrc
+4nBvCGrch2c0798wct3zyT8j/zXhviEpIDCB5BmlIOklynMxdCm+4kLV87ImZsdo/Rmz5yCTmehd
+4F6H50boJZwKKSTUzViGUkAksnsPmBIgJPaQbEfIDbsYIC7Z/fyL8inqh3SV4EJQeIQEQWGw9CEj
+jy3LKCHyamz0GqbFFLQ3ZU+V/YDI+HLlJWvEYLF7bY5KinPOWftwenMGE9nTdDckQQoRb5fc5+R+
+ob0V8rqHDz1oihYHAgMBAAGjYzBhMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0G
+A1UdDgQWBBSowcCbkahDFXxdBie0KlHYlwuBsTAfBgNVHSMEGDAWgBSowcCbkahDFXxdBie0KlHY
+lwuBsTANBgkqhkiG9w0BAQ0FAAOCAgEAnFZvAX7RvUz1isbwJh/k4DgYzDLDKTudQSk0YcbX8ACh
+66Ryj5QXvBMsdbRX7gp8CXrc1cqh0DQT+Hern+X+2B50ioUHj3/MeXrKls3N/U/7/SMNkPX0XtPG
+YX2eEeAC7gkE2Qfdpoq3DIMku4NQkv5gdRE+2J2winq14J2by5BSS7CTKtQ+FjPlnsZlFT5kOwQ/
+2wyPX1wdaR+v8+khjPPvl/aatxm2hHSco1S1cE5j2FddUyGbQJJD+tZ3VTNPZNX70Cxqjm0lpu+F
+6ALEUz65noe8zDUa3qHpimOHZR4RKttjd5cUvpoUmRGywO6wT/gUITJDT5+rosuoD6o7BlXGEilX
+CNQ314cnrUlZp5GrRHpejXDbl85IULFzk/bwg2D5zfHhMf1bfHEhYxQUqq/F3pN+aLHsIqKqkHWe
+tUNy6mSjhEv9DKgma3GX7lZjZuhCVPnHHd/Qj1vfyDBviP4NxDMcU6ij/UgQ8uQKTuEVV/xuZDDC
+VRHc6qnNSlSsKWNEz0pAoNZoWRsz+e86i9sgktxChL8Bq4fA1SCC28a5g4VCXA9DO2pJNdWY9BW/
++mGBDAkgGNLQFwzLSABQ6XaCjGTXOqAHVcweMcDvOrRl++O/QmueD6i9a5jc2NvLi6Td11n0bt3+
+qsOR0C5CB8AMTVPNJLFMWx5R9N/pkvo=
+-----END CERTIFICATE-----
+
+Certplus Root CA G2
+===================
+-----BEGIN CERTIFICATE-----
+MIICHDCCAaKgAwIBAgISESDZkc6uo+jF5//pAq/Pc7xVMAoGCCqGSM49BAMDMD4xCzAJBgNVBAYT
+AkZSMREwDwYDVQQKDAhDZXJ0cGx1czEcMBoGA1UEAwwTQ2VydHBsdXMgUm9vdCBDQSBHMjAeFw0x
+NDA1MjYwMDAwMDBaFw0zODAxMTUwMDAwMDBaMD4xCzAJBgNVBAYTAkZSMREwDwYDVQQKDAhDZXJ0
+cGx1czEcMBoGA1UEAwwTQ2VydHBsdXMgUm9vdCBDQSBHMjB2MBAGByqGSM49AgEGBSuBBAAiA2IA
+BM0PW1aC3/BFGtat93nwHcmsltaeTpwftEIRyoa/bfuFo8XlGVzX7qY/aWfYeOKmycTbLXku54uN
+Am8xIk0G42ByRZ0OQneezs/lf4WbGOT8zC5y0xaTTsqZY1yhBSpsBqNjMGEwDgYDVR0PAQH/BAQD
+AgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFNqDYwJ5jtpMxjwjFNiPwyCrKGBZMB8GA1Ud
+IwQYMBaAFNqDYwJ5jtpMxjwjFNiPwyCrKGBZMAoGCCqGSM49BAMDA2gAMGUCMHD+sAvZ94OX7PNV
+HdTcswYO/jOYnYs5kGuUIe22113WTNchp+e/IQ8rzfcq3IUHnQIxAIYUFuXcsGXCwI4Un78kFmjl
+vPl5adytRSv3tjFzzAalU5ORGpOucGpnutee5WEaXw==
+-----END CERTIFICATE-----
+
+OpenTrust Root CA G1
+====================
+-----BEGIN CERTIFICATE-----
+MIIFbzCCA1egAwIBAgISESCzkFU5fX82bWTCp59rY45nMA0GCSqGSIb3DQEBCwUAMEAxCzAJBgNV
+BAYTAkZSMRIwEAYDVQQKDAlPcGVuVHJ1c3QxHTAbBgNVBAMMFE9wZW5UcnVzdCBSb290IENBIEcx
+MB4XDTE0MDUyNjA4NDU1MFoXDTM4MDExNTAwMDAwMFowQDELMAkGA1UEBhMCRlIxEjAQBgNVBAoM
+CU9wZW5UcnVzdDEdMBsGA1UEAwwUT3BlblRydXN0IFJvb3QgQ0EgRzEwggIiMA0GCSqGSIb3DQEB
+AQUAA4ICDwAwggIKAoICAQD4eUbalsUwXopxAy1wpLuwxQjczeY1wICkES3d5oeuXT2R0odsN7fa
+Yp6bwiTXj/HbpqbfRm9RpnHLPhsxZ2L3EVs0J9V5ToybWL0iEA1cJwzdMOWo010hOHQX/uMftk87
+ay3bfWAfjH1MBcLrARYVmBSO0ZB3Ij/swjm4eTrwSSTilZHcYTSSjFR077F9jAHiOH3BX2pfJLKO
+YheteSCtqx234LSWSE9mQxAGFiQD4eCcjsZGT44ameGPuY4zbGneWK2gDqdkVBFpRGZPTBKnjix9
+xNRbxQA0MMHZmf4yzgeEtE7NCv82TWLxp2NX5Ntqp66/K7nJ5rInieV+mhxNaMbBGN4zK1FGSxyO
+9z0M+Yo0FMT7MzUj8czxKselu7Cizv5Ta01BG2Yospb6p64KTrk5M0ScdMGTHPjgniQlQ/GbI4Kq
+3ywgsNw2TgOzfALU5nsaqocTvz6hdLubDuHAk5/XpGbKuxs74zD0M1mKB3IDVedzagMxbm+WG+Oi
+n6+Sx+31QrclTDsTBM8clq8cIqPQqwWyTBIjUtz9GVsnnB47ev1CI9sjgBPwvFEVVJSmdz7QdFG9
+URQIOTfLHzSpMJ1ShC5VkLG631UAC9hWLbFJSXKAqWLXwPYYEQRVzXR7z2FwefR7LFxckvzluFqr
+TJOVoSfupb7PcSNCupt2LQIDAQABo2MwYTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB
+/zAdBgNVHQ4EFgQUl0YhVyE12jZVx/PxN3DlCPaTKbYwHwYDVR0jBBgwFoAUl0YhVyE12jZVx/Px
+N3DlCPaTKbYwDQYJKoZIhvcNAQELBQADggIBAB3dAmB84DWn5ph76kTOZ0BP8pNuZtQ5iSas000E
+PLuHIT839HEl2ku6q5aCgZG27dmxpGWX4m9kWaSW7mDKHyP7Rbr/jyTwyqkxf3kfgLMtMrpkZ2Cv
+uVnN35pJ06iCsfmYlIrM4LvgBBuZYLFGZdwIorJGnkSI6pN+VxbSFXJfLkur1J1juONI5f6ELlgK
+n0Md/rcYkoZDSw6cMoYsYPXpSOqV7XAp8dUv/TW0V8/bhUiZucJvbI/NeJWsZCj9VrDDb8O+WVLh
+X4SPgPL0DTatdrOjteFkdjpY3H1PXlZs5VVZV6Xf8YpmMIzUUmI4d7S+KNfKNsSbBfD4Fdvb8e80
+nR14SohWZ25g/4/Ii+GOvUKpMwpZQhISKvqxnUOOBZuZ2mKtVzazHbYNeS2WuOvyDEsMpZTGMKcm
+GS3tTAZQMPH9WD25SxdfGbRqhFS0OE85og2WaMMolP3tLR9Ka0OWLpABEPs4poEL0L9109S5zvE/
+bw4cHjdx5RiHdRk/ULlepEU0rbDK5uUTdg8xFKmOLZTW1YVNcxVPS/KyPu1svf0OnWZzsD2097+o
+4BGkxK51CUpjAEggpsadCwmKtODmzj7HPiY46SvepghJAwSQiumPv+i2tCqjI40cHLI5kqiPAlxA
+OXXUc0ECd97N4EOH1uS6SsNsEn/+KuYj1oxx
+-----END CERTIFICATE-----
+
+OpenTrust Root CA G2
+====================
+-----BEGIN CERTIFICATE-----
+MIIFbzCCA1egAwIBAgISESChaRu/vbm9UpaPI+hIvyYRMA0GCSqGSIb3DQEBDQUAMEAxCzAJBgNV
+BAYTAkZSMRIwEAYDVQQKDAlPcGVuVHJ1c3QxHTAbBgNVBAMMFE9wZW5UcnVzdCBSb290IENBIEcy
+MB4XDTE0MDUyNjAwMDAwMFoXDTM4MDExNTAwMDAwMFowQDELMAkGA1UEBhMCRlIxEjAQBgNVBAoM
+CU9wZW5UcnVzdDEdMBsGA1UEAwwUT3BlblRydXN0IFJvb3QgQ0EgRzIwggIiMA0GCSqGSIb3DQEB
+AQUAA4ICDwAwggIKAoICAQDMtlelM5QQgTJT32F+D3Y5z1zCU3UdSXqWON2ic2rxb95eolq5cSG+
+Ntmh/LzubKh8NBpxGuga2F8ORAbtp+Dz0mEL4DKiltE48MLaARf85KxP6O6JHnSrT78eCbY2albz
+4e6WiWYkBuTNQjpK3eCasMSCRbP+yatcfD7J6xcvDH1urqWPyKwlCm/61UWY0jUJ9gNDlP7ZvyCV
+eYCYitmJNbtRG6Q3ffyZO6v/v6wNj0OxmXsWEH4db0fEFY8ElggGQgT4hNYdvJGmQr5J1WqIP7wt
+UdGejeBSzFfdNTVY27SPJIjki9/ca1TSgSuyzpJLHB9G+h3Ykst2Z7UJmQnlrBcUVXDGPKBWCgOz
+3GIZ38i1MH/1PCZ1Eb3XG7OHngevZXHloM8apwkQHZOJZlvoPGIytbU6bumFAYueQ4xncyhZW+vj
+3CzMpSZyYhK05pyDRPZRpOLAeiRXyg6lPzq1O4vldu5w5pLeFlwoW5cZJ5L+epJUzpM5ChaHvGOz
+9bGTXOBut9Dq+WIyiET7vycotjCVXRIouZW+j1MY5aIYFuJWpLIsEPUdN6b4t/bQWVyJ98LVtZR0
+0dX+G7bw5tYee9I8y6jj9RjzIR9u701oBnstXW5DiabA+aC/gh7PU3+06yzbXfZqfUAkBXKJOAGT
+y3HCOV0GEfZvePg3DTmEJwIDAQABo2MwYTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB
+/zAdBgNVHQ4EFgQUajn6QiL35okATV59M4PLuG53hq8wHwYDVR0jBBgwFoAUajn6QiL35okATV59
+M4PLuG53hq8wDQYJKoZIhvcNAQENBQADggIBAJjLq0A85TMCl38th6aP1F5Kr7ge57tx+4BkJamz
+Gj5oXScmp7oq4fBXgwpkTx4idBvpkF/wrM//T2h6OKQQbA2xx6R3gBi2oihEdqc0nXGEL8pZ0keI
+mUEiyTCYYW49qKgFbdEfwFFEVn8nNQLdXpgKQuswv42hm1GqO+qTRmTFAHneIWv2V6CG1wZy7HBG
+S4tz3aAhdT7cHcCP009zHIXZ/n9iyJVvttN7jLpTwm+bREx50B1ws9efAvSyB7DH5fitIw6mVskp
+EndI2S9G/Tvw/HRwkqWOOAgfZDC2t0v7NqwQjqBSM2OdAzVWxWm9xiNaJ5T2pBL4LTM8oValX9YZ
+6e18CL13zSdkzJTaTkZQh+D5wVOAHrut+0dSixv9ovneDiK3PTNZbNTe9ZUGMg1RGUFcPk8G97kr
+gCf2o6p6fAbhQ8MTOWIaNr3gKC6UAuQpLmBVrkA9sHSSXvAgZJY/X0VdiLWK2gKgW0VU3jg9CcCo
+SmVGFvyqv1ROTVu+OEO3KMqLM6oaJbolXCkvW0pujOotnCr2BXbgd5eAiN1nE28daCSLT7d0geX0
+YJ96Vdc+N9oWaz53rK4YcJUIeSkDiv7BO7M/Gg+kO14fWKGVyasvc0rQLW6aWQ9VGHgtPFGml4vm
+u7JwqkwR3v98KzfUetF3NI/n+UL3PIEMS1IK
+-----END CERTIFICATE-----
+
+OpenTrust Root CA G3
+====================
+-----BEGIN CERTIFICATE-----
+MIICITCCAaagAwIBAgISESDm+Ez8JLC+BUCs2oMbNGA/MAoGCCqGSM49BAMDMEAxCzAJBgNVBAYT
+AkZSMRIwEAYDVQQKDAlPcGVuVHJ1c3QxHTAbBgNVBAMMFE9wZW5UcnVzdCBSb290IENBIEczMB4X
+DTE0MDUyNjAwMDAwMFoXDTM4MDExNTAwMDAwMFowQDELMAkGA1UEBhMCRlIxEjAQBgNVBAoMCU9w
+ZW5UcnVzdDEdMBsGA1UEAwwUT3BlblRydXN0IFJvb3QgQ0EgRzMwdjAQBgcqhkjOPQIBBgUrgQQA
+IgNiAARK7liuTcpm3gY6oxH84Bjwbhy6LTAMidnW7ptzg6kjFYwvWYpa3RTqnVkrQ7cG7DK2uu5B
+ta1doYXM6h0UZqNnfkbilPPntlahFVmhTzeXuSIevRHr9LIfXsMUmuXZl5mjYzBhMA4GA1UdDwEB
+/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRHd8MUi2I5DMlv4VBN0BBY3JWIbTAf
+BgNVHSMEGDAWgBRHd8MUi2I5DMlv4VBN0BBY3JWIbTAKBggqhkjOPQQDAwNpADBmAjEAj6jcnboM
+BBf6Fek9LykBl7+BFjNAk2z8+e2AcG+qj9uEwov1NcoG3GRvaBbhj5G5AjEA2Euly8LQCGzpGPta
+3U1fJAuwACEl74+nBCZx4nxp5V2a+EEfOzmTk51V6s2N8fvB
+-----END CERTIFICATE-----
+
+ISRG Root X1
+============
+-----BEGIN CERTIFICATE-----
+MIIFazCCA1OgAwIBAgIRAIIQz7DSQONZRGPgu2OCiwAwDQYJKoZIhvcNAQELBQAwTzELMAkGA1UE
+BhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2VhcmNoIEdyb3VwMRUwEwYDVQQD
+EwxJU1JHIFJvb3QgWDEwHhcNMTUwNjA0MTEwNDM4WhcNMzUwNjA0MTEwNDM4WjBPMQswCQYDVQQG
+EwJVUzEpMCcGA1UEChMgSW50ZXJuZXQgU2VjdXJpdHkgUmVzZWFyY2ggR3JvdXAxFTATBgNVBAMT
+DElTUkcgUm9vdCBYMTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAK3oJHP0FDfzm54r
+Vygch77ct984kIxuPOZXoHj3dcKi/vVqbvYATyjb3miGbESTtrFj/RQSa78f0uoxmyF+0TM8ukj1
+3Xnfs7j/EvEhmkvBioZxaUpmZmyPfjxwv60pIgbz5MDmgK7iS4+3mX6UA5/TR5d8mUgjU+g4rk8K
+b4Mu0UlXjIB0ttov0DiNewNwIRt18jA8+o+u3dpjq+sWT8KOEUt+zwvo/7V3LvSye0rgTBIlDHCN
+Aymg4VMk7BPZ7hm/ELNKjD+Jo2FR3qyHB5T0Y3HsLuJvW5iB4YlcNHlsdu87kGJ55tukmi8mxdAQ
+4Q7e2RCOFvu396j3x+UCB5iPNgiV5+I3lg02dZ77DnKxHZu8A/lJBdiB3QW0KtZB6awBdpUKD9jf
+1b0SHzUvKBds0pjBqAlkd25HN7rOrFleaJ1/ctaJxQZBKT5ZPt0m9STJEadao0xAH0ahmbWnOlFu
+hjuefXKnEgV4We0+UXgVCwOPjdAvBbI+e0ocS3MFEvzG6uBQE3xDk3SzynTnjh8BCNAw1FtxNrQH
+usEwMFxIt4I7mKZ9YIqioymCzLq9gwQbooMDQaHWBfEbwrbwqHyGO0aoSCqI3Haadr8faqU9GY/r
+OPNk3sgrDQoo//fb4hVC1CLQJ13hef4Y53CIrU7m2Ys6xt0nUW7/vGT1M0NPAgMBAAGjQjBAMA4G
+A1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBR5tFnme7bl5AFzgAiIyBpY
+9umbbjANBgkqhkiG9w0BAQsFAAOCAgEAVR9YqbyyqFDQDLHYGmkgJykIrGF1XIpu+ILlaS/V9lZL
+ubhzEFnTIZd+50xx+7LSYK05qAvqFyFWhfFQDlnrzuBZ6brJFe+GnY+EgPbk6ZGQ3BebYhtF8GaV
+0nxvwuo77x/Py9auJ/GpsMiu/X1+mvoiBOv/2X/qkSsisRcOj/KKNFtY2PwByVS5uCbMiogziUwt
+hDyC3+6WVwW6LLv3xLfHTjuCvjHIInNzktHCgKQ5ORAzI4JMPJ+GslWYHb4phowim57iaztXOoJw
+TdwJx4nLCgdNbOhdjsnvzqvHu7UrTkXWStAmzOVyyghqpZXjFaH3pO3JLF+l+/+sKAIuvtd7u+Nx
+e5AW0wdeRlN8NwdCjNPElpzVmbUq4JUagEiuTDkHzsxHpFKVK7q4+63SM1N95R1NbdWhscdCb+ZA
+JzVcoyi3B43njTOQ5yOf+1CceWxG1bQVs5ZufpsMljq4Ui0/1lvh+wjChP4kqKOJ2qxq4RgqsahD
+YVvTH9w7jXbyLeiNdd8XM2w9U/t7y0Ff/9yi0GE44Za4rF2LN9d11TPAmRGunUHBcnWEvgJBQl9n
+JEiU0Zsnvgc/ubhPgXRR4Xq37Z0j4r7g1SgEEzwxA57demyPxgcYxn/eR44/KJ4EBs+lVDR3veyJ
+m+kXQ99b21/+jh5Xos1AnX5iItreGCc=
+-----END CERTIFICATE-----
+
+AC RAIZ FNMT-RCM
+================
+-----BEGIN CERTIFICATE-----
+MIIFgzCCA2ugAwIBAgIPXZONMGc2yAYdGsdUhGkHMA0GCSqGSIb3DQEBCwUAMDsxCzAJBgNVBAYT
+AkVTMREwDwYDVQQKDAhGTk1ULVJDTTEZMBcGA1UECwwQQUMgUkFJWiBGTk1ULVJDTTAeFw0wODEw
+MjkxNTU5NTZaFw0zMDAxMDEwMDAwMDBaMDsxCzAJBgNVBAYTAkVTMREwDwYDVQQKDAhGTk1ULVJD
+TTEZMBcGA1UECwwQQUMgUkFJWiBGTk1ULVJDTTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoC
+ggIBALpxgHpMhm5/yBNtwMZ9HACXjywMI7sQmkCpGreHiPibVmr75nuOi5KOpyVdWRHbNi63URcf
+qQgfBBckWKo3Shjf5TnUV/3XwSyRAZHiItQDwFj8d0fsjz50Q7qsNI1NOHZnjrDIbzAzWHFctPVr
+btQBULgTfmxKo0nRIBnuvMApGGWn3v7v3QqQIecaZ5JCEJhfTzC8PhxFtBDXaEAUwED653cXeuYL
+j2VbPNmaUtu1vZ5Gzz3rkQUCwJaydkxNEJY7kvqcfw+Z374jNUUeAlz+taibmSXaXvMiwzn15Cou
+08YfxGyqxRxqAQVKL9LFwag0Jl1mpdICIfkYtwb1TplvqKtMUejPUBjFd8g5CSxJkjKZqLsXF3mw
+WsXmo8RZZUc1g16p6DULmbvkzSDGm0oGObVo/CK67lWMK07q87Hj/LaZmtVC+nFNCM+HHmpxffnT
+tOmlcYF7wk5HlqX2doWjKI/pgG6BU6VtX7hI+cL5NqYuSf+4lsKMB7ObiFj86xsc3i1w4peSMKGJ
+47xVqCfWS+2QrYv6YyVZLag13cqXM7zlzced0ezvXg5KkAYmY6252TUtB7p2ZSysV4999AeU14EC
+ll2jB0nVetBX+RvnU0Z1qrB5QstocQjpYL05ac70r8NWQMetUqIJ5G+GR4of6ygnXYMgrwTJbFaa
+i0b1AgMBAAGjgYMwgYAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYE
+FPd9xf3E6Jobd2Sn9R2gzL+HYJptMD4GA1UdIAQ3MDUwMwYEVR0gADArMCkGCCsGAQUFBwIBFh1o
+dHRwOi8vd3d3LmNlcnQuZm5tdC5lcy9kcGNzLzANBgkqhkiG9w0BAQsFAAOCAgEAB5BK3/MjTvDD
+nFFlm5wioooMhfNzKWtN/gHiqQxjAb8EZ6WdmF/9ARP67Jpi6Yb+tmLSbkyU+8B1RXxlDPiyN8+s
+D8+Nb/kZ94/sHvJwnvDKuO+3/3Y3dlv2bojzr2IyIpMNOmqOFGYMLVN0V2Ue1bLdI4E7pWYjJ2cJ
+j+F3qkPNZVEI7VFY/uY5+ctHhKQV8Xa7pO6kO8Rf77IzlhEYt8llvhjho6Tc+hj507wTmzl6NLrT
+Qfv6MooqtyuGC2mDOL7Nii4LcK2NJpLuHvUBKwrZ1pebbuCoGRw6IYsMHkCtA+fdZn71uSANA+iW
++YJF1DngoABd15jmfZ5nc8OaKveri6E6FO80vFIOiZiaBECEHX5FaZNXzuvO+FB8TxxuBEOb+dY7
+Ixjp6o7RTUaN8Tvkasq6+yO3m/qZASlaWFot4/nUbQ4mrcFuNLwy+AwF+mWj2zs3gyLp1txyM/1d
+8iC9djwj2ij3+RvrWWTV3F9yfiD8zYm1kGdNYno/Tq0dwzn+evQoFt9B9kiABdcPUXmsEKvU7ANm
+5mqwujGSQkBqvjrTcuFqN1W8rB2Vt2lh8kORdOag0wokRqEIr9baRRmW1FMdW4R58MD3R++Lj8UG
+rp1MYp3/RgT408m2ECVAdf4WqslKYIYvuu8wd+RU4riEmViAqhOLUTpPSPaLtrM=
+-----END CERTIFICATE-----
+
+Amazon Root CA 1
+================
+-----BEGIN CERTIFICATE-----
+MIIDQTCCAimgAwIBAgITBmyfz5m/jAo54vB4ikPmljZbyjANBgkqhkiG9w0BAQsFADA5MQswCQYD
+VQQGEwJVUzEPMA0GA1UEChMGQW1hem9uMRkwFwYDVQQDExBBbWF6b24gUm9vdCBDQSAxMB4XDTE1
+MDUyNjAwMDAwMFoXDTM4MDExNzAwMDAwMFowOTELMAkGA1UEBhMCVVMxDzANBgNVBAoTBkFtYXpv
+bjEZMBcGA1UEAxMQQW1hem9uIFJvb3QgQ0EgMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBALJ4gHHKeNXjca9HgFB0fW7Y14h29Jlo91ghYPl0hAEvrAIthtOgQ3pOsqTQNroBvo3bSMgH
+FzZM9O6II8c+6zf1tRn4SWiw3te5djgdYZ6k/oI2peVKVuRF4fn9tBb6dNqcmzU5L/qwIFAGbHrQ
+gLKm+a/sRxmPUDgH3KKHOVj4utWp+UhnMJbulHheb4mjUcAwhmahRWa6VOujw5H5SNz/0egwLX0t
+dHA114gk957EWW67c4cX8jJGKLhD+rcdqsq08p8kDi1L93FcXmn/6pUCyziKrlA4b9v7LWIbxcce
+VOF34GfID5yHI9Y/QCB/IIDEgEw+OyQmjgSubJrIqg0CAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB
+/zAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0OBBYEFIQYzIU07LwMlJQuCFmcx7IQTgoIMA0GCSqGSIb3
+DQEBCwUAA4IBAQCY8jdaQZChGsV2USggNiMOruYou6r4lK5IpDB/G/wkjUu0yKGX9rbxenDIU5PM
+CCjjmCXPI6T53iHTfIUJrU6adTrCC2qJeHZERxhlbI1Bjjt/msv0tadQ1wUsN+gDS63pYaACbvXy
+8MWy7Vu33PqUXHeeE6V/Uq2V8viTO96LXFvKWlJbYK8U90vvo/ufQJVtMVT8QtPHRh8jrdkPSHCa
+2XV4cdFyQzR1bldZwgJcJmApzyMZFo6IQ6XU5MsI+yMRQ+hDKXJioaldXgjUkK642M4UwtBV8ob2
+xJNDd2ZhwLnoQdeXeGADbkpyrqXRfboQnoZsG4q5WTP468SQvvG5
+-----END CERTIFICATE-----
+
+Amazon Root CA 2
+================
+-----BEGIN CERTIFICATE-----
+MIIFQTCCAymgAwIBAgITBmyf0pY1hp8KD+WGePhbJruKNzANBgkqhkiG9w0BAQwFADA5MQswCQYD
+VQQGEwJVUzEPMA0GA1UEChMGQW1hem9uMRkwFwYDVQQDExBBbWF6b24gUm9vdCBDQSAyMB4XDTE1
+MDUyNjAwMDAwMFoXDTQwMDUyNjAwMDAwMFowOTELMAkGA1UEBhMCVVMxDzANBgNVBAoTBkFtYXpv
+bjEZMBcGA1UEAxMQQW1hem9uIFJvb3QgQ0EgMjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoC
+ggIBAK2Wny2cSkxKgXlRmeyKy2tgURO8TW0G/LAIjd0ZEGrHJgw12MBvIITplLGbhQPDW9tK6Mj4
+kHbZW0/jTOgGNk3Mmqw9DJArktQGGWCsN0R5hYGCrVo34A3MnaZMUnbqQ523BNFQ9lXg1dKmSYXp
+N+nKfq5clU1Imj+uIFptiJXZNLhSGkOQsL9sBbm2eLfq0OQ6PBJTYv9K8nu+NQWpEjTj82R0Yiw9
+AElaKP4yRLuH3WUnAnE72kr3H9rN9yFVkE8P7K6C4Z9r2UXTu/Bfh+08LDmG2j/e7HJV63mjrdvd
+fLC6HM783k81ds8P+HgfajZRRidhW+mez/CiVX18JYpvL7TFz4QuK/0NURBs+18bvBt+xa47mAEx
+kv8LV/SasrlX6avvDXbR8O70zoan4G7ptGmh32n2M8ZpLpcTnqWHsFcQgTfJU7O7f/aS0ZzQGPSS
+btqDT6ZjmUyl+17vIWR6IF9sZIUVyzfpYgwLKhbcAS4y2j5L9Z469hdAlO+ekQiG+r5jqFoz7Mt0
+Q5X5bGlSNscpb/xVA1wf+5+9R+vnSUeVC06JIglJ4PVhHvG/LopyboBZ/1c6+XUyo05f7O0oYtlN
+c/LMgRdg7c3r3NunysV+Ar3yVAhU/bQtCSwXVEqY0VThUWcI0u1ufm8/0i2BWSlmy5A5lREedCf+
+3euvAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgGGMB0GA1UdDgQWBBSw
+DPBMMPQFWAJI/TPlUq9LhONmUjANBgkqhkiG9w0BAQwFAAOCAgEAqqiAjw54o+Ci1M3m9Zh6O+oA
+A7CXDpO8Wqj2LIxyh6mx/H9z/WNxeKWHWc8w4Q0QshNabYL1auaAn6AFC2jkR2vHat+2/XcycuUY
++gn0oJMsXdKMdYV2ZZAMA3m3MSNjrXiDCYZohMr/+c8mmpJ5581LxedhpxfL86kSk5Nrp+gvU5LE
+YFiwzAJRGFuFjWJZY7attN6a+yb3ACfAXVU3dJnJUH/jWS5E4ywl7uxMMne0nxrpS10gxdr9HIcW
+xkPo1LsmmkVwXqkLN1PiRnsn/eBG8om3zEK2yygmbtmlyTrIQRNg91CMFa6ybRoVGld45pIq2WWQ
+gj9sAq+uEjonljYE1x2igGOpm/HlurR8FLBOybEfdF849lHqm/osohHUqS0nGkWxr7JOcQ3AWEbW
+aQbLU8uz/mtBzUF+fUwPfHJ5elnNXkoOrJupmHN5fLT0zLm4BwyydFy4x2+IoZCn9Kr5v2c69BoV
+Yh63n749sSmvZ6ES8lgQGVMDMBu4Gon2nL2XA46jCfMdiyHxtN/kHNGfZQIG6lzWE7OE76KlXIx3
+KadowGuuQNKotOrN8I1LOJwZmhsoVLiJkO/KdYE+HvJkJMcYr07/R54H9jVlpNMKVv/1F2Rs76gi
+JUmTtt8AF9pYfl3uxRuw0dFfIRDH+fO6AgonB8Xx1sfT4PsJYGw=
+-----END CERTIFICATE-----
+
+Amazon Root CA 3
+================
+-----BEGIN CERTIFICATE-----
+MIIBtjCCAVugAwIBAgITBmyf1XSXNmY/Owua2eiedgPySjAKBggqhkjOPQQDAjA5MQswCQYDVQQG
+EwJVUzEPMA0GA1UEChMGQW1hem9uMRkwFwYDVQQDExBBbWF6b24gUm9vdCBDQSAzMB4XDTE1MDUy
+NjAwMDAwMFoXDTQwMDUyNjAwMDAwMFowOTELMAkGA1UEBhMCVVMxDzANBgNVBAoTBkFtYXpvbjEZ
+MBcGA1UEAxMQQW1hem9uIFJvb3QgQ0EgMzBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABCmXp8ZB
+f8ANm+gBG1bG8lKlui2yEujSLtf6ycXYqm0fc4E7O5hrOXwzpcVOho6AF2hiRVd9RFgdszflZwjr
+Zt6jQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgGGMB0GA1UdDgQWBBSrttvXBp43
+rDCGB5Fwx5zEGbF4wDAKBggqhkjOPQQDAgNJADBGAiEA4IWSoxe3jfkrBqWTrBqYaGFy+uGh0Psc
+eGCmQ5nFuMQCIQCcAu/xlJyzlvnrxir4tiz+OpAUFteMYyRIHN8wfdVoOw==
+-----END CERTIFICATE-----
+
+Amazon Root CA 4
+================
+-----BEGIN CERTIFICATE-----
+MIIB8jCCAXigAwIBAgITBmyf18G7EEwpQ+Vxe3ssyBrBDjAKBggqhkjOPQQDAzA5MQswCQYDVQQG
+EwJVUzEPMA0GA1UEChMGQW1hem9uMRkwFwYDVQQDExBBbWF6b24gUm9vdCBDQSA0MB4XDTE1MDUy
+NjAwMDAwMFoXDTQwMDUyNjAwMDAwMFowOTELMAkGA1UEBhMCVVMxDzANBgNVBAoTBkFtYXpvbjEZ
+MBcGA1UEAxMQQW1hem9uIFJvb3QgQ0EgNDB2MBAGByqGSM49AgEGBSuBBAAiA2IABNKrijdPo1MN
+/sGKe0uoe0ZLY7Bi9i0b2whxIdIA6GO9mif78DluXeo9pcmBqqNbIJhFXRbb/egQbeOc4OO9X4Ri
+83BkM6DLJC9wuoihKqB1+IGuYgbEgds5bimwHvouXKNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNV
+HQ8BAf8EBAMCAYYwHQYDVR0OBBYEFNPsxzplbszh2naaVvuc84ZtV+WBMAoGCCqGSM49BAMDA2gA
+MGUCMDqLIfG9fhGt0O9Yli/W651+kI0rz2ZVwyzjKKlwCkcO8DdZEv8tmZQoTipPNU0zWgIxAOp1
+AE47xDqUEpHJWEadIRNyp4iciuRMStuW1KyLa2tJElMzrdfkviT8tQp21KW8EA==
+-----END CERTIFICATE-----
+
+LuxTrust Global Root 2
+======================
+-----BEGIN CERTIFICATE-----
+MIIFwzCCA6ugAwIBAgIUCn6m30tEntpqJIWe5rgV0xZ/u7EwDQYJKoZIhvcNAQELBQAwRjELMAkG
+A1UEBhMCTFUxFjAUBgNVBAoMDUx1eFRydXN0IFMuQS4xHzAdBgNVBAMMFkx1eFRydXN0IEdsb2Jh
+bCBSb290IDIwHhcNMTUwMzA1MTMyMTU3WhcNMzUwMzA1MTMyMTU3WjBGMQswCQYDVQQGEwJMVTEW
+MBQGA1UECgwNTHV4VHJ1c3QgUy5BLjEfMB0GA1UEAwwWTHV4VHJ1c3QgR2xvYmFsIFJvb3QgMjCC
+AiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANeFl78RmOnwYoNMPIf5U2o3C/IPPIfOb9wm
+Kb3FibrJgz337spbxm1Jc7TJRqMbNBM/wYlFV/TZsfs2ZUv7COJIcRHIbjuend+JZTemhfY7RBi2
+xjcwYkSSl2l9QjAk5A0MiWtj3sXh306pFGxT4GHO9hcvHTy95iJMHZP1EMShduxq3sVs35a0VkBC
+wGKSMKEtFZSg0iAGCW5qbeXrt77U8PEVfIvmTroTzEsnXpk8F12PgX8zPU/TPxvsXD/wPEx1bvKm
+1Z3aLQdjAsZy6ZS8TEmVT4hSyNvoaYL4zDRbIvCGp4m9SAptZoFtyMhk+wHh9OHe2Z7d21vUKpkm
+FRseTJIpgp7VkoGSQXAZ96Tlk0u8d2cx3Rz9MXANF5kM+Qw5GSoXtTBxVdUPrljhPS80m8+f9niF
+wpN6cj5mj5wWEWCPnolvZ77gR1o7DJpni89Gxq44o/KnvObWhWszJHAiS8sIm7vI+AIpHb4gDEa/
+a4ebsypmQjVGbKq6rfmYe+lQVRQxv7HaLe2ArWgk+2mr2HETMOZns4dA/Yl+8kPREd8vZS9kzl8U
+ubG/Mb2HeFpZZYiq/FkySIbWTLkpS5XTdvN3JW1CHDiDTf2jX5t/Lax5Gw5CMZdjpPuKadUiDTSQ
+MC6otOBttpSsvItO13D8xTiOZCXhTTmQzsmHhFhxAgMBAAGjgagwgaUwDwYDVR0TAQH/BAUwAwEB
+/zBCBgNVHSAEOzA5MDcGByuBKwEBAQowLDAqBggrBgEFBQcCARYeaHR0cHM6Ly9yZXBvc2l0b3J5
+Lmx1eHRydXN0Lmx1MA4GA1UdDwEB/wQEAwIBBjAfBgNVHSMEGDAWgBT/GCh2+UgFLKGu8SsbK7JT
++Et8szAdBgNVHQ4EFgQU/xgodvlIBSyhrvErGyuyU/hLfLMwDQYJKoZIhvcNAQELBQADggIBAGoZ
+FO1uecEsh9QNcH7X9njJCwROxLHOk3D+sFTAMs2ZMGQXvw/l4jP9BzZAcg4atmpZ1gDlaCDdLnIN
+H2pkMSCEfUmmWjfrRcmF9dTHF5kH5ptV5AzoqbTOjFu1EVzPig4N1qx3gf4ynCSecs5U89BvolbW
+7MM3LGVYvlcAGvI1+ut7MV3CwRI9loGIlonBWVx65n9wNOeD4rHh4bhY79SV5GCc8JaXcozrhAIu
+ZY+kt9J/Z93I055cqqmkoCUUBpvsT34tC38ddfEz2O3OuHVtPlu5mB0xDVbYQw8wkbIEa91WvpWA
+VWe+2M2D2RjuLg+GLZKecBPs3lHJQ3gCpU3I+V/EkVhGFndadKpAvAefMLmx9xIX3eP/JEAdemrR
+TxgKqpAd60Ae36EeRJIQmvKN4dFLRp7oRUKX6kWZ8+xm1QL68qZKJKrezrnK+T+Tb/mjuuqlPpmt
+/f97mfVl7vBZKGfXkJWkE4SphMHozs51k2MavDzq1WQfLSoSOcbDWjLtR5EWDrw4wVDej8oqkDQc
+7kGUnF4ZLvhFSZl0kbAEb+MEWrGrKqv+x9CWttrhSmQGbmBNvUJO/3jaJMobtNeWOWyu8Q6qp31I
+iyBMz2TWuJdGsE7RKlY6oJO9r4Ak4Ap+58rVyuiFVdw2KuGUaJPHZnJED4AhMmwlxyOAgwrr
+-----END CERTIFICATE-----
+
+TUBITAK Kamu SM SSL Kok Sertifikasi - Surum 1
+=============================================
+-----BEGIN CERTIFICATE-----
+MIIEYzCCA0ugAwIBAgIBATANBgkqhkiG9w0BAQsFADCB0jELMAkGA1UEBhMCVFIxGDAWBgNVBAcT
+D0dlYnplIC0gS29jYWVsaTFCMEAGA1UEChM5VHVya2l5ZSBCaWxpbXNlbCB2ZSBUZWtub2xvamlr
+IEFyYXN0aXJtYSBLdXJ1bXUgLSBUVUJJVEFLMS0wKwYDVQQLEyRLYW11IFNlcnRpZmlrYXN5b24g
+TWVya2V6aSAtIEthbXUgU00xNjA0BgNVBAMTLVRVQklUQUsgS2FtdSBTTSBTU0wgS29rIFNlcnRp
+ZmlrYXNpIC0gU3VydW0gMTAeFw0xMzExMjUwODI1NTVaFw00MzEwMjUwODI1NTVaMIHSMQswCQYD
+VQQGEwJUUjEYMBYGA1UEBxMPR2ViemUgLSBLb2NhZWxpMUIwQAYDVQQKEzlUdXJraXllIEJpbGlt
+c2VsIHZlIFRla25vbG9qaWsgQXJhc3Rpcm1hIEt1cnVtdSAtIFRVQklUQUsxLTArBgNVBAsTJEth
+bXUgU2VydGlmaWthc3lvbiBNZXJrZXppIC0gS2FtdSBTTTE2MDQGA1UEAxMtVFVCSVRBSyBLYW11
+IFNNIFNTTCBLb2sgU2VydGlmaWthc2kgLSBTdXJ1bSAxMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAr3UwM6q7a9OZLBI3hNmNe5eA027n/5tQlT6QlVZC1xl8JoSNkvoBHToP4mQ4t4y8
+6Ij5iySrLqP1N+RAjhgleYN1Hzv/bKjFxlb4tO2KRKOrbEz8HdDc72i9z+SqzvBV96I01INrN3wc
+wv61A+xXzry0tcXtAA9TNypN9E8Mg/uGz8v+jE69h/mniyFXnHrfA2eJLJ2XYacQuFWQfw4tJzh0
+3+f92k4S400VIgLI4OD8D62K18lUUMw7D8oWgITQUVbDjlZ/iSIzL+aFCr2lqBs23tPcLG07xxO9
+WSMs5uWk99gL7eqQQESolbuT1dCANLZGeA4fAJNG4e7p+exPFwIDAQABo0IwQDAdBgNVHQ4EFgQU
+ZT/HiobGPN08VFw1+DrtUgxHV8gwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wDQYJ
+KoZIhvcNAQELBQADggEBACo/4fEyjq7hmFxLXs9rHmoJ0iKpEsdeV31zVmSAhHqT5Am5EM2fKifh
+AHe+SMg1qIGf5LgsyX8OsNJLN13qudULXjS99HMpw+0mFZx+CFOKWI3QSyjfwbPfIPP54+M638yc
+lNhOT8NrF7f3cuitZjO1JVOr4PhMqZ398g26rrnZqsZr+ZO7rqu4lzwDGrpDxpa5RXI4s6ehlj2R
+e37AIVNMh+3yC1SVUZPVIqUNivGTDj5UDrDYyU7c8jEyVupk+eq1nRZmQnLzf9OxMUP8pI4X8W0j
+q5Rm+K37DwhuJi1/FwcJsoz7UMCflo3Ptv0AnVoUmr8CRPXBwp8iXqIPoeM=
+-----END CERTIFICATE-----
+
+GDCA TrustAUTH R5 ROOT
+======================
+-----BEGIN CERTIFICATE-----
+MIIFiDCCA3CgAwIBAgIIfQmX/vBH6nowDQYJKoZIhvcNAQELBQAwYjELMAkGA1UEBhMCQ04xMjAw
+BgNVBAoMKUdVQU5HIERPTkcgQ0VSVElGSUNBVEUgQVVUSE9SSVRZIENPLixMVEQuMR8wHQYDVQQD
+DBZHRENBIFRydXN0QVVUSCBSNSBST09UMB4XDTE0MTEyNjA1MTMxNVoXDTQwMTIzMTE1NTk1OVow
+YjELMAkGA1UEBhMCQ04xMjAwBgNVBAoMKUdVQU5HIERPTkcgQ0VSVElGSUNBVEUgQVVUSE9SSVRZ
+IENPLixMVEQuMR8wHQYDVQQDDBZHRENBIFRydXN0QVVUSCBSNSBST09UMIICIjANBgkqhkiG9w0B
+AQEFAAOCAg8AMIICCgKCAgEA2aMW8Mh0dHeb7zMNOwZ+Vfy1YI92hhJCfVZmPoiC7XJjDp6L3TQs
+AlFRwxn9WVSEyfFrs0yw6ehGXTjGoqcuEVe6ghWinI9tsJlKCvLriXBjTnnEt1u9ol2x8kECK62p
+OqPseQrsXzrj/e+APK00mxqriCZ7VqKChh/rNYmDf1+uKU49tm7srsHwJ5uu4/Ts765/94Y9cnrr
+pftZTqfrlYwiOXnhLQiPzLyRuEH3FMEjqcOtmkVEs7LXLM3GKeJQEK5cy4KOFxg2fZfmiJqwTTQJ
+9Cy5WmYqsBebnh52nUpmMUHfP/vFBu8btn4aRjb3ZGM74zkYI+dndRTVdVeSN72+ahsmUPI2JgaQ
+xXABZG12ZuGR224HwGGALrIuL4xwp9E7PLOR5G62xDtw8mySlwnNR30YwPO7ng/Wi64HtloPzgsM
+R6flPri9fcebNaBhlzpBdRfMK5Z3KpIhHtmVdiBnaM8Nvd/WHwlqmuLMc3GkL30SgLdTMEZeS1SZ
+D2fJpcjyIMGC7J0R38IC+xo70e0gmu9lZJIQDSri3nDxGGeCjGHeuLzRL5z7D9Ar7Rt2ueQ5Vfj4
+oR24qoAATILnsn8JuLwwoC8N9VKejveSswoAHQBUlwbgsQfZxw9cZX08bVlX5O2ljelAU58VS6Bx
+9hoh49pwBiFYFIeFd3mqgnkCAwEAAaNCMEAwHQYDVR0OBBYEFOLJQJ9NzuiaoXzPDj9lxSmIahlR
+MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgGGMA0GCSqGSIb3DQEBCwUAA4ICAQDRSVfg
+p8xoWLoBDysZzY2wYUWsEe1jUGn4H3++Fo/9nesLqjJHdtJnJO29fDMylyrHBYZmDRd9FBUb1Ov9
+H5r2XpdptxolpAqzkT9fNqyL7FeoPueBihhXOYV0GkLH6VsTX4/5COmSdI31R9KrO9b7eGZONn35
+6ZLpBN79SWP8bfsUcZNnL0dKt7n/HipzcEYwv1ryL3ml4Y0M2fmyYzeMN2WFcGpcWwlyua1jPLHd
++PwyvzeG5LuOmCd+uh8W4XAR8gPfJWIyJyYYMoSf/wA6E7qaTfRPuBRwIrHKK5DOKcFw9C+df/KQ
+HtZa37dG/OaG+svgIHZ6uqbL9XzeYqWxi+7egmaKTjowHz+Ay60nugxe19CxVsp3cbK1daFQqUBD
+F8Io2c9Si1vIY9RCPqAzekYu9wogRlR+ak8x8YF+QnQ4ZXMn7sZ8uI7XpTrXmKGcjBBV09tL7ECQ
+8s1uV9JiDnxXk7Gnbc2dg7sq5+W2O3FYrf3RRbxake5TFW/TRQl1brqQXR4EzzffHqhmsYzmIGrv
+/EhOdJhCrylvLmrH+33RZjEizIYAfmaDDEL0vTSSwxrqT8p+ck0LcIymSLumoRT2+1hEmRSuqguT
+aaApJUqlyyvdimYHFngVV3Eb7PVHhPOeMTd61X8kreS8/f3MboPoDKi3QWwH3b08hpcv0g==
+-----END CERTIFICATE-----
+
+TrustCor RootCert CA-1
+======================
+-----BEGIN CERTIFICATE-----
+MIIEMDCCAxigAwIBAgIJANqb7HHzA7AZMA0GCSqGSIb3DQEBCwUAMIGkMQswCQYDVQQGEwJQQTEP
+MA0GA1UECAwGUGFuYW1hMRQwEgYDVQQHDAtQYW5hbWEgQ2l0eTEkMCIGA1UECgwbVHJ1c3RDb3Ig
+U3lzdGVtcyBTLiBkZSBSLkwuMScwJQYDVQQLDB5UcnVzdENvciBDZXJ0aWZpY2F0ZSBBdXRob3Jp
+dHkxHzAdBgNVBAMMFlRydXN0Q29yIFJvb3RDZXJ0IENBLTEwHhcNMTYwMjA0MTIzMjE2WhcNMjkx
+MjMxMTcyMzE2WjCBpDELMAkGA1UEBhMCUEExDzANBgNVBAgMBlBhbmFtYTEUMBIGA1UEBwwLUGFu
+YW1hIENpdHkxJDAiBgNVBAoMG1RydXN0Q29yIFN5c3RlbXMgUy4gZGUgUi5MLjEnMCUGA1UECwwe
+VHJ1c3RDb3IgQ2VydGlmaWNhdGUgQXV0aG9yaXR5MR8wHQYDVQQDDBZUcnVzdENvciBSb290Q2Vy
+dCBDQS0xMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAv463leLCJhJrMxnHQFgKq1mq
+jQCj/IDHUHuO1CAmujIS2CNUSSUQIpidRtLByZ5OGy4sDjjzGiVoHKZaBeYei0i/mJZ0PmnK6bV4
+pQa81QBeCQryJ3pS/C3Vseq0iWEk8xoT26nPUu0MJLq5nux+AHT6k61sKZKuUbS701e/s/OojZz0
+JEsq1pme9J7+wH5COucLlVPat2gOkEz7cD+PSiyU8ybdY2mplNgQTsVHCJCZGxdNuWxu72CVEY4h
+gLW9oHPY0LJ3xEXqWib7ZnZ2+AYfYW0PVcWDtxBWcgYHpfOxGgMFZA6dWorWhnAbJN7+KIor0Gqw
+/Hqi3LJ5DotlDwIDAQABo2MwYTAdBgNVHQ4EFgQU7mtJPHo/DeOxCbeKyKsZn3MzUOcwHwYDVR0j
+BBgwFoAU7mtJPHo/DeOxCbeKyKsZn3MzUOcwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC
+AYYwDQYJKoZIhvcNAQELBQADggEBACUY1JGPE+6PHh0RU9otRCkZoB5rMZ5NDp6tPVxBb5UrJKF5
+mDo4Nvu7Zp5I/5CQ7z3UuJu0h3U/IJvOcs+hVcFNZKIZBqEHMwwLKeXx6quj7LUKdJDHfXLy11yf
+ke+Ri7fc7Waiz45mO7yfOgLgJ90WmMCV1Aqk5IGadZQ1nJBfiDcGrVmVCrDRZ9MZyonnMlo2HD6C
+qFqTvsbQZJG2z9m2GM/bftJlo6bEjhcxwft+dtvTheNYsnd6djtsL1Ac59v2Z3kf9YKVmgenFK+P
+3CghZwnS1k1aHBkcjndcw5QkPTJrS37UeJSDvjdNzl/HHk484IkzlQsPpTLWPFp5LBk=
+-----END CERTIFICATE-----
+
+TrustCor RootCert CA-2
+======================
+-----BEGIN CERTIFICATE-----
+MIIGLzCCBBegAwIBAgIIJaHfyjPLWQIwDQYJKoZIhvcNAQELBQAwgaQxCzAJBgNVBAYTAlBBMQ8w
+DQYDVQQIDAZQYW5hbWExFDASBgNVBAcMC1BhbmFtYSBDaXR5MSQwIgYDVQQKDBtUcnVzdENvciBT
+eXN0ZW1zIFMuIGRlIFIuTC4xJzAlBgNVBAsMHlRydXN0Q29yIENlcnRpZmljYXRlIEF1dGhvcml0
+eTEfMB0GA1UEAwwWVHJ1c3RDb3IgUm9vdENlcnQgQ0EtMjAeFw0xNjAyMDQxMjMyMjNaFw0zNDEy
+MzExNzI2MzlaMIGkMQswCQYDVQQGEwJQQTEPMA0GA1UECAwGUGFuYW1hMRQwEgYDVQQHDAtQYW5h
+bWEgQ2l0eTEkMCIGA1UECgwbVHJ1c3RDb3IgU3lzdGVtcyBTLiBkZSBSLkwuMScwJQYDVQQLDB5U
+cnVzdENvciBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkxHzAdBgNVBAMMFlRydXN0Q29yIFJvb3RDZXJ0
+IENBLTIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCnIG7CKqJiJJWQdsg4foDSq8Gb
+ZQWU9MEKENUCrO2fk8eHyLAnK0IMPQo+QVqedd2NyuCb7GgypGmSaIwLgQ5WoD4a3SwlFIIvl9Nk
+RvRUqdw6VC0xK5mC8tkq1+9xALgxpL56JAfDQiDyitSSBBtlVkxs1Pu2YVpHI7TYabS3OtB0PAx1
+oYxOdqHp2yqlO/rOsP9+aij9JxzIsekp8VduZLTQwRVtDr4uDkbIXvRR/u8OYzo7cbrPb1nKDOOb
+XUm4TOJXsZiKQlecdu/vvdFoqNL0Cbt3Nb4lggjEFixEIFapRBF37120Hapeaz6LMvYHL1cEksr1
+/p3C6eizjkxLAjHZ5DxIgif3GIJ2SDpxsROhOdUuxTTCHWKF3wP+TfSvPd9cW436cOGlfifHhi5q
+jxLGhF5DUVCcGZt45vz27Ud+ez1m7xMTiF88oWP7+ayHNZ/zgp6kPwqcMWmLmaSISo5uZk3vFsQP
+eSghYA2FFn3XVDjxklb9tTNMg9zXEJ9L/cb4Qr26fHMC4P99zVvh1Kxhe1fVSntb1IVYJ12/+Ctg
+rKAmrhQhJ8Z3mjOAPF5GP/fDsaOGM8boXg25NSyqRsGFAnWAoOsk+xWq5Gd/bnc/9ASKL3x74xdh
+8N0JqSDIvgmk0H5Ew7IwSjiqqewYmgeCK9u4nBit2uBGF6zPXQIDAQABo2MwYTAdBgNVHQ4EFgQU
+2f4hQG6UnrybPZx9mCAZ5YwwYrIwHwYDVR0jBBgwFoAU2f4hQG6UnrybPZx9mCAZ5YwwYrIwDwYD
+VR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAYYwDQYJKoZIhvcNAQELBQADggIBAJ5Fngw7tu/h
+Osh80QA9z+LqBrWyOrsGS2h60COXdKcs8AjYeVrXWoSK2BKaG9l9XE1wxaX5q+WjiYndAfrs3fnp
+kpfbsEZC89NiqpX+MWcUaViQCqoL7jcjx1BRtPV+nuN79+TMQjItSQzL/0kMmx40/W5ulop5A7Zv
+2wnL/V9lFDfhOPXzYRZY5LVtDQsEGz9QLX+zx3oaFoBg+Iof6Rsqxvm6ARppv9JYx1RXCI/hOWB3
+S6xZhBqI8d3LT3jX5+EzLfzuQfogsL7L9ziUwOHQhQ+77Sxzq+3+knYaZH9bDTMJBzN7Bj8RpFxw
+PIXAz+OQqIN3+tvmxYxoZxBnpVIt8MSZj3+/0WvitUfW2dCFmU2Umw9Lje4AWkcdEQOsQRivh7dv
+DDqPys/cA8GiCcjl/YBeyGBCARsaU1q7N6a3vLqE6R5sGtRk2tRD/pOLS/IseRYQ1JMLiI+h2IYU
+RpFHmygk71dSTlxCnKr3Sewn6EAes6aJInKc9Q0ztFijMDvd1GpUk74aTfOTlPf8hAs/hCBcNANE
+xdqtvArBAs8e5ZTZ845b2EzwnexhF7sUMlQMAimTHpKG9n/v55IFDlndmQguLvqcAFLTxWYp5KeX
+RKQOKIETNcX2b2TmQcTVL8w0RSXPQQCWPUouwpaYT05KnJe32x+SMsj/D1Fu1uwJ
+-----END CERTIFICATE-----
+
+TrustCor ECA-1
+==============
+-----BEGIN CERTIFICATE-----
+MIIEIDCCAwigAwIBAgIJAISCLF8cYtBAMA0GCSqGSIb3DQEBCwUAMIGcMQswCQYDVQQGEwJQQTEP
+MA0GA1UECAwGUGFuYW1hMRQwEgYDVQQHDAtQYW5hbWEgQ2l0eTEkMCIGA1UECgwbVHJ1c3RDb3Ig
+U3lzdGVtcyBTLiBkZSBSLkwuMScwJQYDVQQLDB5UcnVzdENvciBDZXJ0aWZpY2F0ZSBBdXRob3Jp
+dHkxFzAVBgNVBAMMDlRydXN0Q29yIEVDQS0xMB4XDTE2MDIwNDEyMzIzM1oXDTI5MTIzMTE3Mjgw
+N1owgZwxCzAJBgNVBAYTAlBBMQ8wDQYDVQQIDAZQYW5hbWExFDASBgNVBAcMC1BhbmFtYSBDaXR5
+MSQwIgYDVQQKDBtUcnVzdENvciBTeXN0ZW1zIFMuIGRlIFIuTC4xJzAlBgNVBAsMHlRydXN0Q29y
+IENlcnRpZmljYXRlIEF1dGhvcml0eTEXMBUGA1UEAwwOVHJ1c3RDb3IgRUNBLTEwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDPj+ARtZ+odnbb3w9U73NjKYKtR8aja+3+XzP4Q1HpGjOR
+MRegdMTUpwHmspI+ap3tDvl0mEDTPwOABoJA6LHip1GnHYMma6ve+heRK9jGrB6xnhkB1Zem6g23
+xFUfJ3zSCNV2HykVh0A53ThFEXXQmqc04L/NyFIduUd+Dbi7xgz2c1cWWn5DkR9VOsZtRASqnKmc
+p0yJF4OuowReUoCLHhIlERnXDH19MURB6tuvsBzvgdAsxZohmz3tQjtQJvLsznFhBmIhVE5/wZ0+
+fyCMgMsq2JdiyIMzkX2woloPV+g7zPIlstR8L+xNxqE6FXrntl019fZISjZFZtS6mFjBAgMBAAGj
+YzBhMB0GA1UdDgQWBBREnkj1zG1I1KBLf/5ZJC+Dl5mahjAfBgNVHSMEGDAWgBREnkj1zG1I1KBL
+f/5ZJC+Dl5mahjAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQsF
+AAOCAQEABT41XBVwm8nHc2FvcivUwo/yQ10CzsSUuZQRg2dd4mdsdXa/uwyqNsatR5Nj3B5+1t4u
+/ukZMjgDfxT2AHMsWbEhBuH7rBiVDKP/mZb3Kyeb1STMHd3BOuCYRLDE5D53sXOpZCz2HAF8P11F
+hcCF5yWPldwX8zyfGm6wyuMdKulMY/okYWLW2n62HGz1Ah3UKt1VkOsqEUc8Ll50soIipX1TH0Xs
+J5F95yIW6MBoNtjG8U+ARDL54dHRHareqKucBK+tIA5kmE2la8BIWJZpTdwHjFGTot+fDz2LYLSC
+jaoITmJF4PkL0uDgPFveXHEnJcLmA4GLEFPjx1WitJ/X5g==
+-----END CERTIFICATE-----
+
+SSL.com Root Certification Authority RSA
+========================================
+-----BEGIN CERTIFICATE-----
+MIIF3TCCA8WgAwIBAgIIeyyb0xaAMpkwDQYJKoZIhvcNAQELBQAwfDELMAkGA1UEBhMCVVMxDjAM
+BgNVBAgMBVRleGFzMRAwDgYDVQQHDAdIb3VzdG9uMRgwFgYDVQQKDA9TU0wgQ29ycG9yYXRpb24x
+MTAvBgNVBAMMKFNTTC5jb20gUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSBSU0EwHhcNMTYw
+MjEyMTczOTM5WhcNNDEwMjEyMTczOTM5WjB8MQswCQYDVQQGEwJVUzEOMAwGA1UECAwFVGV4YXMx
+EDAOBgNVBAcMB0hvdXN0b24xGDAWBgNVBAoMD1NTTCBDb3Jwb3JhdGlvbjExMC8GA1UEAwwoU1NM
+LmNvbSBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IFJTQTCCAiIwDQYJKoZIhvcNAQEBBQAD
+ggIPADCCAgoCggIBAPkP3aMrfcvQKv7sZ4Wm5y4bunfh4/WvpOz6Sl2RxFdHaxh3a3by/ZPkPQ/C
+Fp4LZsNWlJ4Xg4XOVu/yFv0AYvUiCVToZRdOQbngT0aXqhvIuG5iXmmxX9sqAn78bMrzQdjt0Oj8
+P2FI7bADFB0QDksZ4LtO7IZl/zbzXmcCC52GVWH9ejjt/uIZALdvoVBidXQ8oPrIJZK0bnoix/ge
+oeOy3ZExqysdBP+lSgQ36YWkMyv94tZVNHwZpEpox7Ko07fKoZOI68GXvIz5HdkihCR0xwQ9aqkp
+k8zruFvh/l8lqjRYyMEjVJ0bmBHDOJx+PYZspQ9AhnwC9FwCTyjLrnGfDzrIM/4RJTXq/LrFYD3Z
+fBjVsqnTdXgDciLKOsMf7yzlLqn6niy2UUb9rwPW6mBo6oUWNmuF6R7As93EJNyAKoFBbZQ+yODJ
+gUEAnl6/f8UImKIYLEJAs/lvOCdLToD0PYFH4Ih86hzOtXVcUS4cK38acijnALXRdMbX5J+tB5O2
+UzU1/Dfkw/ZdFr4hc96SCvigY2q8lpJqPvi8ZVWb3vUNiSYE/CUapiVpy8JtynziWV+XrOvvLsi8
+1xtZPCvM8hnIk2snYxnP/Okm+Mpxm3+T/jRnhE6Z6/yzeAkzcLpmpnbtG3PrGqUNxCITIJRWCk4s
+bE6x/c+cCbqiM+2HAgMBAAGjYzBhMB0GA1UdDgQWBBTdBAkHovV6fVJTEpKV7jiAJQ2mWTAPBgNV
+HRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFN0ECQei9Xp9UlMSkpXuOIAlDaZZMA4GA1UdDwEB/wQE
+AwIBhjANBgkqhkiG9w0BAQsFAAOCAgEAIBgRlCn7Jp0cHh5wYfGVcpNxJK1ok1iOMq8bs3AD/CUr
+dIWQPXhq9LmLpZc7tRiRux6n+UBbkflVma8eEdBcHadm47GUBwwyOabqG7B52B2ccETjit3E+ZUf
+ijhDPwGFpUenPUayvOUiaPd7nNgsPgohyC0zrL/FgZkxdMF1ccW+sfAjRfSda/wZY52jvATGGAsl
+u1OJD7OAUN5F7kR/q5R4ZJjT9ijdh9hwZXT7DrkT66cPYakylszeu+1jTBi7qUD3oFRuIIhxdRjq
+erQ0cuAjJ3dctpDqhiVAq+8zD8ufgr6iIPv2tS0a5sKFsXQP+8hlAqRSAUfdSSLBv9jra6x+3uxj
+MxW3IwiPxg+NQVrdjsW5j+VFP3jbutIbQLH+cU0/4IGiul607BXgk90IH37hVZkLId6Tngr75qNJ
+vTYw/ud3sqB1l7UtgYgXZSD32pAAn8lSzDLKNXz1PQ/YK9f1JmzJBjSWFupwWRoyeXkLtoh/D1JI
+Pb9s2KJELtFOt3JY04kTlf5Eq/jXixtunLwsoFvVagCvXzfh1foQC5ichucmj87w7G6KVwuA406y
+wKBjYZC6VWg3dGq2ktufoYYitmUnDuy2n0Jg5GfCtdpBC8TTi2EbvPofkSvXRAdeuims2cXp71NI
+WuuA8ShYIc2wBlX7Jz9TkHCpBB5XJ7k=
+-----END CERTIFICATE-----
+
+SSL.com Root Certification Authority ECC
+========================================
+-----BEGIN CERTIFICATE-----
+MIICjTCCAhSgAwIBAgIIdebfy8FoW6gwCgYIKoZIzj0EAwIwfDELMAkGA1UEBhMCVVMxDjAMBgNV
+BAgMBVRleGFzMRAwDgYDVQQHDAdIb3VzdG9uMRgwFgYDVQQKDA9TU0wgQ29ycG9yYXRpb24xMTAv
+BgNVBAMMKFNTTC5jb20gUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSBFQ0MwHhcNMTYwMjEy
+MTgxNDAzWhcNNDEwMjEyMTgxNDAzWjB8MQswCQYDVQQGEwJVUzEOMAwGA1UECAwFVGV4YXMxEDAO
+BgNVBAcMB0hvdXN0b24xGDAWBgNVBAoMD1NTTCBDb3Jwb3JhdGlvbjExMC8GA1UEAwwoU1NMLmNv
+bSBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IEVDQzB2MBAGByqGSM49AgEGBSuBBAAiA2IA
+BEVuqVDEpiM2nl8ojRfLliJkP9x6jh3MCLOicSS6jkm5BBtHllirLZXI7Z4INcgn64mMU1jrYor+
+8FsPazFSY0E7ic3s7LaNGdM0B9y7xgZ/wkWV7Mt/qCPgCemB+vNH06NjMGEwHQYDVR0OBBYEFILR
+hXMw5zUE044CkvvlpNHEIejNMA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0jBBgwFoAUgtGFczDnNQTT
+jgKS++Wk0cQh6M0wDgYDVR0PAQH/BAQDAgGGMAoGCCqGSM49BAMCA2cAMGQCMG/n61kRpGDPYbCW
+e+0F+S8Tkdzt5fxQaxFGRrMcIQBiu77D5+jNB5n5DQtdcj7EqgIwH7y6C+IwJPt8bYBVCpk+gA0z
+5Wajs6O7pdWLjwkspl1+4vAHCGht0nxpbl/f5Wpl
+-----END CERTIFICATE-----
+
+SSL.com EV Root Certification Authority RSA R2
+==============================================
+-----BEGIN CERTIFICATE-----
+MIIF6zCCA9OgAwIBAgIIVrYpzTS8ePYwDQYJKoZIhvcNAQELBQAwgYIxCzAJBgNVBAYTAlVTMQ4w
+DAYDVQQIDAVUZXhhczEQMA4GA1UEBwwHSG91c3RvbjEYMBYGA1UECgwPU1NMIENvcnBvcmF0aW9u
+MTcwNQYDVQQDDC5TU0wuY29tIEVWIFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgUlNBIFIy
+MB4XDTE3MDUzMTE4MTQzN1oXDTQyMDUzMDE4MTQzN1owgYIxCzAJBgNVBAYTAlVTMQ4wDAYDVQQI
+DAVUZXhhczEQMA4GA1UEBwwHSG91c3RvbjEYMBYGA1UECgwPU1NMIENvcnBvcmF0aW9uMTcwNQYD
+VQQDDC5TU0wuY29tIEVWIFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgUlNBIFIyMIICIjAN
+BgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAjzZlQOHWTcDXtOlG2mvqM0fNTPl9fb69LT3w23jh
+hqXZuglXaO1XPqDQCEGD5yhBJB/jchXQARr7XnAjssufOePPxU7Gkm0mxnu7s9onnQqG6YE3Bf7w
+cXHswxzpY6IXFJ3vG2fThVUCAtZJycxa4bH3bzKfydQ7iEGonL3Lq9ttewkfokxykNorCPzPPFTO
+Zw+oz12WGQvE43LrrdF9HSfvkusQv1vrO6/PgN3B0pYEW3p+pKk8OHakYo6gOV7qd89dAFmPZiw+
+B6KjBSYRaZfqhbcPlgtLyEDhULouisv3D5oi53+aNxPN8k0TayHRwMwi8qFG9kRpnMphNQcAb9Zh
+CBHqurj26bNg5U257J8UZslXWNvNh2n4ioYSA0e/ZhN2rHd9NCSFg83XqpyQGp8hLH94t2S42Oim
+9HizVcuE0jLEeK6jj2HdzghTreyI/BXkmg3mnxp3zkyPuBQVPWKchjgGAGYS5Fl2WlPAApiiECto
+RHuOec4zSnaqW4EWG7WK2NAAe15itAnWhmMOpgWVSbooi4iTsjQc2KRVbrcc0N6ZVTsj9CLg+Slm
+JuwgUHfbSguPvuUCYHBBXtSuUDkiFCbLsjtzdFVHB3mBOagwE0TlBIqulhMlQg+5U8Sb/M3kHN48
++qvWBkofZ6aYMBzdLNvcGJVXZsb/XItW9XcCAwEAAaNjMGEwDwYDVR0TAQH/BAUwAwEB/zAfBgNV
+HSMEGDAWgBT5YLvU49U09rj1BoAlp3PbRmmonjAdBgNVHQ4EFgQU+WC71OPVNPa49QaAJadz20Zp
+qJ4wDgYDVR0PAQH/BAQDAgGGMA0GCSqGSIb3DQEBCwUAA4ICAQBWs47LCp1Jjr+kxJG7ZhcFUZh1
+++VQLHqe8RT6q9OKPv+RKY9ji9i0qVQBDb6Thi/5Sm3HXvVX+cpVHBK+Rw82xd9qt9t1wkclf7nx
+Y/hoLVUE0fKNsKTPvDxeH3jnpaAgcLAExbf3cqfeIg29MyVGjGSSJuM+LmOW2puMPfgYCdcDzH2G
+guDKBAdRUNf/ktUM79qGn5nX67evaOI5JpS6aLe/g9Pqemc9YmeuJeVy6OLk7K4S9ksrPJ/psEDz
+OFSz/bdoyNrGj1E8svuR3Bznm53htw1yj+KkxKl4+esUrMZDBcJlOSgYAsOCsp0FvmXtll9ldDz7
+CTUue5wT/RsPXcdtgTpWD8w74a8CLyKsRspGPKAcTNZEtF4uXBVmCeEmKf7GUmG6sXP/wwyc5Wxq
+lD8UykAWlYTzWamsX0xhk23RO8yilQwipmdnRC652dKKQbNmC1r7fSOl8hqw/96bg5Qu0T/fkreR
+rwU7ZcegbLHNYhLDkBvjJc40vG93drEQw/cFGsDWr3RiSBd3kmmQYRzelYB0VI8YHMPzA9C/pEN1
+hlMYegouCRw2n5H9gooiS9EOUCXdywMMF8mDAAhONU2Ki+3wApRmLER/y5UnlhetCTCstnEXbosX
+9hwJ1C07mKVx01QT2WDz9UtmT/rx7iASjbSsV7FFY6GsdqnC+w==
+-----END CERTIFICATE-----
+
+SSL.com EV Root Certification Authority ECC
+===========================================
+-----BEGIN CERTIFICATE-----
+MIIClDCCAhqgAwIBAgIILCmcWxbtBZUwCgYIKoZIzj0EAwIwfzELMAkGA1UEBhMCVVMxDjAMBgNV
+BAgMBVRleGFzMRAwDgYDVQQHDAdIb3VzdG9uMRgwFgYDVQQKDA9TU0wgQ29ycG9yYXRpb24xNDAy
+BgNVBAMMK1NTTC5jb20gRVYgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSBFQ0MwHhcNMTYw
+MjEyMTgxNTIzWhcNNDEwMjEyMTgxNTIzWjB/MQswCQYDVQQGEwJVUzEOMAwGA1UECAwFVGV4YXMx
+EDAOBgNVBAcMB0hvdXN0b24xGDAWBgNVBAoMD1NTTCBDb3Jwb3JhdGlvbjE0MDIGA1UEAwwrU1NM
+LmNvbSBFViBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IEVDQzB2MBAGByqGSM49AgEGBSuB
+BAAiA2IABKoSR5CYG/vvw0AHgyBO8TCCogbR8pKGYfL2IWjKAMTH6kMAVIbc/R/fALhBYlzccBYy
+3h+Z1MzFB8gIH2EWB1E9fVwHU+M1OIzfzZ/ZLg1KthkuWnBaBu2+8KGwytAJKaNjMGEwHQYDVR0O
+BBYEFFvKXuXe0oGqzagtZFG22XKbl+ZPMA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0jBBgwFoAUW8pe
+5d7SgarNqC1kUbbZcpuX5k8wDgYDVR0PAQH/BAQDAgGGMAoGCCqGSM49BAMCA2gAMGUCMQCK5kCJ
+N+vp1RPZytRrJPOwPYdGWBrssd9v+1a6cGvHOMzosYxPD/fxZ3YOg9AeUY8CMD32IygmTMZgh5Mm
+m7I1HrrW9zzRHM76JTymGoEVW/MSD2zuZYrJh6j5B+BimoxcSg==
+-----END CERTIFICATE-----
diff --git a/twitter/vendor/jublonet/codebird-php/src/codebird.php b/twitter/vendor/jublonet/codebird-php/src/codebird.php
new file mode 100644
index 00000000..52018bde
--- /dev/null
+++ b/twitter/vendor/jublonet/codebird-php/src/codebird.php
@@ -0,0 +1,2720 @@
+<?php
+
+namespace Codebird;
+
+/**
+ * A Twitter library in PHP.
+ *
+ * @package   codebird
+ * @version   4.0.0-beta.1
+ * @author    Jublo Limited <support@jublo.net>
+ * @copyright 2010-2018 Jublo Limited <support@jublo.net>
+ * @license   https://opensource.org/licenses/GPL-3.0 GNU General Public License 3.0
+ * @link      https://github.com/jublonet/codebird-php
+ */
+
+/**
+ * Define constants
+ */
+$constants = explode(' ', 'OBJECT ARRAY JSON');
+foreach ($constants as $i => $id) {
+  $id = 'CODEBIRD_RETURNFORMAT_' . $id;
+  defined($id) or define($id, $i);
+}
+$constants = [
+  'CURLE_SSL_CERTPROBLEM' => 58,
+  'CURLE_SSL_CACERT' => 60,
+  'CURLE_SSL_CACERT_BADFILE' => 77,
+  'CURLE_SSL_CRL_BADFILE' => 82,
+  'CURLE_SSL_ISSUER_ERROR' => 83
+];
+foreach ($constants as $id => $i) {
+  defined($id) or define($id, $i);
+}
+unset($constants);
+unset($i);
+unset($id);
+
+/**
+ * A Twitter library in PHP.
+ *
+ * @package codebird
+ * @subpackage codebird-php
+ * @method bool curl_setopt (resource $ch, int $option, mixed $value)
+ */
+class Codebird
+{
+  /**
+   * The current singleton instance
+   */
+  private static $_instance = null;
+
+  /**
+   * The OAuth consumer key of your registered app
+   */
+  protected static $_consumer_key = null;
+
+  /**
+   * The corresponding consumer secret
+   */
+  protected static $_consumer_secret = null;
+
+  /**
+   * The app-only bearer token. Used to authorize app-only requests
+   */
+  protected static $_bearer_token = null;
+
+  /**
+   * The API endpoints to use
+   */
+  protected static $_endpoints = [
+    'ads'          => [
+      'production' => 'https://ads-api.twitter.com/2/',
+      'sandbox'    => 'https://ads-api-sandbox.twitter.com/2/'
+    ],
+    'media'        => 'https://upload.twitter.com/1.1/',
+    'publish'      => 'https://publish.twitter.com/',
+    'oauth'        => 'https://api.twitter.com/',
+    'rest'         => 'https://api.twitter.com/1.1/',
+    'streaming'    => [
+      'public'     => 'https://stream.twitter.com/1.1/'
+    ],
+    'ton'          => 'https://ton.twitter.com/1.1/'
+  ];
+
+  /**
+   * Supported API methods
+   */
+  protected static $_api_methods = [
+    'GET' => [
+      'account/settings',
+      'account/verify_credentials',
+      'account_activity/all/:env_name/subscriptions',
+      'account_activity/all/:env_name/subscriptions/list',
+      'account_activity/all/:env_name/webhooks',
+      'account_activity/all/webhooks',
+      'account_activity/subscriptions/count',
+      'account_activity/webhooks',
+      'account_activity/webhooks/:webhook_id/subscriptions/all',
+      'account_activity/webhooks/:webhook_id/subscriptions/all/list',
+      'ads/accounts',
+      'ads/accounts/:account_id',
+      'ads/accounts/:account_id/account_media',
+      'ads/accounts/:account_id/app_event_provider_configurations',
+      'ads/accounts/:account_id/app_event_provider_configurations/:id',
+      'ads/accounts/:account_id/app_event_tags',
+      'ads/accounts/:account_id/app_event_tags/:id',
+      'ads/accounts/:account_id/app_lists',
+      'ads/accounts/:account_id/auction_insights',
+      'ads/accounts/:account_id/authenticated_user_access',
+      'ads/accounts/:account_id/campaigns',
+      'ads/accounts/:account_id/campaigns/:campaign_id',
+      'ads/accounts/:account_id/cards/app_download',
+      'ads/accounts/:account_id/cards/app_download/:card_id',
+      'ads/accounts/:account_id/cards/image_app_download',
+      'ads/accounts/:account_id/cards/image_app_download/:card_id',
+      'ads/accounts/:account_id/cards/image_conversation',
+      'ads/accounts/:account_id/cards/image_conversation/:card_id',
+      'ads/accounts/:account_id/cards/lead_gen',
+      'ads/accounts/:account_id/cards/lead_gen/:card_id',
+      'ads/accounts/:account_id/cards/video_app_download',
+      'ads/accounts/:account_id/cards/video_app_download/:id',
+      'ads/accounts/:account_id/cards/video_conversation',
+      'ads/accounts/:account_id/cards/video_conversation/:card_id',
+      'ads/accounts/:account_id/cards/website',
+      'ads/accounts/:account_id/cards/website/:card_id',
+      'ads/accounts/:account_id/features',
+      'ads/accounts/:account_id/funding_instruments',
+      'ads/accounts/:account_id/funding_instruments/:id',
+      'ads/accounts/:account_id/line_items',
+      'ads/accounts/:account_id/line_items/:line_item_id',
+      'ads/accounts/:account_id/media_creatives',
+      'ads/accounts/:account_id/media_creatives/:id',
+      'ads/accounts/:account_id/preroll_call_to_actions',
+      'ads/accounts/:account_id/preroll_call_to_actions/:preroll_call_to_action_id',
+      'ads/accounts/:account_id/promotable_users',
+      'ads/accounts/:account_id/promoted_accounts',
+      'ads/accounts/:account_id/promoted_tweets',
+      'ads/accounts/:account_id/reach_estimate',
+      'ads/accounts/:account_id/recommendations',
+      'ads/accounts/:account_id/recommendations/:recommendation_id',
+      'ads/accounts/:account_id/scoped_timeline',
+      'ads/accounts/:account_id/tailored_audience_changes',
+      'ads/accounts/:account_id/tailored_audience_changes/:id',
+      'ads/accounts/:account_id/tailored_audiences',
+      'ads/accounts/:account_id/tailored_audiences/:id',
+      'ads/accounts/:account_id/tailored_audiences/:id/permissions',
+      'ads/accounts/:account_id/targeting_criteria',
+      'ads/accounts/:account_id/targeting_criteria/:id',
+      'ads/accounts/:account_id/targeting_suggestions',
+      'ads/accounts/:account_id/tweet/preview',
+      'ads/accounts/:account_id/tweet/preview/:tweet_id',
+      'ads/accounts/:account_id/videos',
+      'ads/accounts/:account_id/videos/:id',
+      'ads/accounts/:account_id/web_event_tags',
+      'ads/accounts/:account_id/web_event_tags/:web_event_tag_id',
+      'ads/bidding_rules',
+      'ads/conversion_attribution',
+      'ads/iab_categories',
+      'ads/insights/accounts/:account_id',
+      'ads/insights/accounts/:account_id/available_audiences',
+      'ads/insights/keywords/search',
+      'ads/line_items/placements',
+      'ads/sandbox/accounts',
+      'ads/sandbox/accounts/:account_id',
+      'ads/sandbox/accounts/:account_id/account_media',
+      'ads/sandbox/accounts/:account_id/app_event_provider_configurations',
+      'ads/sandbox/accounts/:account_id/app_event_provider_configurations/:id',
+      'ads/sandbox/accounts/:account_id/app_event_tags',
+      'ads/sandbox/accounts/:account_id/app_event_tags/:id',
+      'ads/sandbox/accounts/:account_id/app_lists',
+      'ads/sandbox/accounts/:account_id/auction_insights',
+      'ads/sandbox/accounts/:account_id/authenticated_user_access',
+      'ads/sandbox/accounts/:account_id/campaigns',
+      'ads/sandbox/accounts/:account_id/campaigns/:campaign_id',
+      'ads/sandbox/accounts/:account_id/cards/app_download',
+      'ads/sandbox/accounts/:account_id/cards/app_download/:card_id',
+      'ads/sandbox/accounts/:account_id/cards/image_app_download',
+      'ads/sandbox/accounts/:account_id/cards/image_app_download/:card_id',
+      'ads/sandbox/accounts/:account_id/cards/image_conversation',
+      'ads/sandbox/accounts/:account_id/cards/image_conversation/:card_id',
+      'ads/sandbox/accounts/:account_id/cards/lead_gen',
+      'ads/sandbox/accounts/:account_id/cards/lead_gen/:card_id',
+      'ads/sandbox/accounts/:account_id/cards/video_app_download',
+      'ads/sandbox/accounts/:account_id/cards/video_app_download/:id',
+      'ads/sandbox/accounts/:account_id/cards/video_conversation',
+      'ads/sandbox/accounts/:account_id/cards/video_conversation/:card_id',
+      'ads/sandbox/accounts/:account_id/cards/website',
+      'ads/sandbox/accounts/:account_id/cards/website/:card_id',
+      'ads/sandbox/accounts/:account_id/features',
+      'ads/sandbox/accounts/:account_id/funding_instruments',
+      'ads/sandbox/accounts/:account_id/funding_instruments/:id',
+      'ads/sandbox/accounts/:account_id/line_items',
+      'ads/sandbox/accounts/:account_id/line_items/:line_item_id',
+      'ads/sandbox/accounts/:account_id/media_creatives',
+      'ads/sandbox/accounts/:account_id/media_creatives/:id',
+      'ads/sandbox/accounts/:account_id/preroll_call_to_actions',
+      'ads/sandbox/accounts/:account_id/preroll_call_to_actions/:preroll_call_to_action_id',
+      'ads/sandbox/accounts/:account_id/promotable_users',
+      'ads/sandbox/accounts/:account_id/promoted_accounts',
+      'ads/sandbox/accounts/:account_id/promoted_tweets',
+      'ads/sandbox/accounts/:account_id/reach_estimate',
+      'ads/sandbox/accounts/:account_id/recommendations',
+      'ads/sandbox/accounts/:account_id/recommendations/:recommendation_id',
+      'ads/sandbox/accounts/:account_id/scoped_timeline',
+      'ads/sandbox/accounts/:account_id/tailored_audience_changes',
+      'ads/sandbox/accounts/:account_id/tailored_audience_changes/:id',
+      'ads/sandbox/accounts/:account_id/tailored_audiences',
+      'ads/sandbox/accounts/:account_id/tailored_audiences/:id',
+      'ads/sandbox/accounts/:account_id/tailored_audiences/:id/permissions',
+      'ads/sandbox/accounts/:account_id/targeting_criteria',
+      'ads/sandbox/accounts/:account_id/targeting_criteria/:id',
+      'ads/sandbox/accounts/:account_id/targeting_suggestions',
+      'ads/sandbox/accounts/:account_id/tweet/preview',
+      'ads/sandbox/accounts/:account_id/tweet/preview/:tweet_id',
+      'ads/sandbox/accounts/:account_id/videos',
+      'ads/sandbox/accounts/:account_id/videos/:id',
+      'ads/sandbox/accounts/:account_id/web_event_tags',
+      'ads/sandbox/accounts/:account_id/web_event_tags/:web_event_tag_id',
+      'ads/sandbox/bidding_rules',
+      'ads/sandbox/conversion_attribution',
+      'ads/sandbox/iab_categories',
+      'ads/sandbox/insights/accounts/:account_id',
+      'ads/sandbox/insights/accounts/:account_id/available_audiences',
+      'ads/sandbox/insights/keywords/search',
+      'ads/sandbox/line_items/placements',
+      'ads/sandbox/stats/accounts/:account_id',
+      'ads/sandbox/stats/accounts/:account_id/reach/campaigns',
+      'ads/sandbox/stats/accounts/:account_id/reach/funding_instruments',
+      'ads/sandbox/targeting_criteria/app_store_categories',
+      'ads/sandbox/targeting_criteria/behavior_taxonomies',
+      'ads/sandbox/targeting_criteria/behaviors',
+      'ads/sandbox/targeting_criteria/devices',
+      'ads/sandbox/targeting_criteria/events',
+      'ads/sandbox/targeting_criteria/interests',
+      'ads/sandbox/targeting_criteria/languages',
+      'ads/sandbox/targeting_criteria/locations',
+      'ads/sandbox/targeting_criteria/network_operators',
+      'ads/sandbox/targeting_criteria/platform_versions',
+      'ads/sandbox/targeting_criteria/platforms',
+      'ads/sandbox/targeting_criteria/tv_channels',
+      'ads/sandbox/targeting_criteria/tv_genres',
+      'ads/sandbox/targeting_criteria/tv_markets',
+      'ads/sandbox/targeting_criteria/tv_shows',
+      'ads/stats/accounts/:account_id',
+      'ads/stats/accounts/:account_id/reach/campaigns',
+      'ads/stats/accounts/:account_id/reach/funding_instruments',
+      'ads/targeting_criteria/app_store_categories',
+      'ads/targeting_criteria/behavior_taxonomies',
+      'ads/targeting_criteria/behaviors',
+      'ads/targeting_criteria/devices',
+      'ads/targeting_criteria/events',
+      'ads/targeting_criteria/interests',
+      'ads/targeting_criteria/languages',
+      'ads/targeting_criteria/locations',
+      'ads/targeting_criteria/network_operators',
+      'ads/targeting_criteria/platform_versions',
+      'ads/targeting_criteria/platforms',
+      'ads/targeting_criteria/tv_channels',
+      'ads/targeting_criteria/tv_genres',
+      'ads/targeting_criteria/tv_markets',
+      'ads/targeting_criteria/tv_shows',
+      'application/rate_limit_status',
+      'blocks/ids',
+      'blocks/list',
+      'collections/entries',
+      'collections/list',
+      'collections/show',
+      'custom_profiles/:id',
+      'custom_profiles/list',
+      'direct_messages/events/list',
+      'direct_messages/events/show',
+      'direct_messages/welcome_messages/list',
+      'direct_messages/welcome_messages/rules/list',
+      'direct_messages/welcome_messages/rules/show',
+      'direct_messages/welcome_messages/show',
+      'favorites/list',
+      'feedback/events',
+      'feedback/show/:id',
+      'followers/ids',
+      'followers/list',
+      'friends/ids',
+      'friends/list',
+      'friendships/incoming',
+      'friendships/lookup',
+      'friendships/no_retweets/ids',
+      'friendships/outgoing',
+      'friendships/show',
+      'geo/id/:place_id',
+      'geo/reverse_geocode',
+      'geo/search',
+      'help/configuration',
+      'help/languages',
+      'help/privacy',
+      'help/tos',
+      'lists/list',
+      'lists/members',
+      'lists/members/show',
+      'lists/memberships',
+      'lists/ownerships',
+      'lists/show',
+      'lists/statuses',
+      'lists/subscribers',
+      'lists/subscribers/show',
+      'lists/subscriptions',
+      'mutes/users/ids',
+      'mutes/users/list',
+      'oauth/authenticate',
+      'oauth/authorize',
+      'saved_searches/list',
+      'saved_searches/show/:id',
+      'search/tweets',
+      'statuses/firehose',
+      'statuses/home_timeline',
+      'statuses/mentions_timeline',
+      'statuses/oembed',
+      'statuses/retweeters/ids',
+      'statuses/retweets/:id',
+      'statuses/retweets_of_me',
+      'statuses/sample',
+      'statuses/show/:id',
+      'statuses/user_timeline',
+      'trends/available',
+      'trends/closest',
+      'trends/place',
+      'users/profile_banner',
+      'users/search',
+      'users/show',
+      'users/suggestions',
+      'users/suggestions/:slug',
+      'users/suggestions/:slug/members'
+    ],
+    'POST' => [
+      'account/remove_profile_banner',
+      'account/settings',
+      'account/update_profile',
+      'account/update_profile_banner',
+      'account/update_profile_image',
+      'account_activity/all/:env_name/subscriptions',
+      'account_activity/all/:env_name/webhooks',
+      'account_activity/webhooks',
+      'account_activity/webhooks/:webhook_id/subscriptions/all',
+      'ads/accounts/:account_id/account_media',
+      'ads/accounts/:account_id/app_lists',
+      'ads/accounts/:account_id/campaigns',
+      'ads/accounts/:account_id/cards/app_download',
+      'ads/accounts/:account_id/cards/image_app_download',
+      'ads/accounts/:account_id/cards/image_conversation',
+      'ads/accounts/:account_id/cards/lead_gen',
+      'ads/accounts/:account_id/cards/video_app_download',
+      'ads/accounts/:account_id/cards/video_conversation',
+      'ads/accounts/:account_id/cards/website',
+      'ads/accounts/:account_id/line_items',
+      'ads/accounts/:account_id/media_creatives',
+      'ads/accounts/:account_id/promoted_accounts',
+      'ads/accounts/:account_id/promoted_tweets',
+      'ads/accounts/:account_id/tailored_audience_changes',
+      'ads/accounts/:account_id/tailored_audiences',
+      'ads/accounts/:account_id/tailored_audiences/:id/permissions',
+      'ads/accounts/:account_id/targeting_criteria',
+      'ads/accounts/:account_id/tweet',
+      'ads/accounts/:account_id/videos',
+      'ads/accounts/:account_id/web_event_tags',
+      'ads/batch/accounts/:account_id/campaigns',
+      'ads/batch/accounts/:account_id/line_items',
+      'ads/batch/accounts/:account_id/tailored_audiences',
+      'ads/batch/accounts/:account_id/targeting_criteria',
+      'ads/conversion_event',
+      'ads/sandbox/accounts',
+      'ads/sandbox/accounts/:account_id/account_media',
+      'ads/sandbox/accounts/:account_id/app_lists',
+      'ads/sandbox/accounts/:account_id/campaigns',
+      'ads/sandbox/accounts/:account_id/cards/app_download',
+      'ads/sandbox/accounts/:account_id/cards/image_app_download',
+      'ads/sandbox/accounts/:account_id/cards/image_conversation',
+      'ads/sandbox/accounts/:account_id/cards/lead_gen',
+      'ads/sandbox/accounts/:account_id/cards/video_app_download',
+      'ads/sandbox/accounts/:account_id/cards/video_conversation',
+      'ads/sandbox/accounts/:account_id/cards/website',
+      'ads/sandbox/accounts/:account_id/features',
+      'ads/sandbox/accounts/:account_id/funding_instruments',
+      'ads/sandbox/accounts/:account_id/line_items',
+      'ads/sandbox/accounts/:account_id/media_creatives',
+      'ads/sandbox/accounts/:account_id/promoted_accounts',
+      'ads/sandbox/accounts/:account_id/promoted_tweets',
+      'ads/sandbox/accounts/:account_id/tailored_audience_changes',
+      'ads/sandbox/accounts/:account_id/tailored_audiences',
+      'ads/sandbox/accounts/:account_id/tailored_audiences/:id/permissions',
+      'ads/sandbox/accounts/:account_id/targeting_criteria',
+      'ads/sandbox/accounts/:account_id/tweet',
+      'ads/sandbox/accounts/:account_id/videos',
+      'ads/sandbox/accounts/:account_id/web_event_tags',
+      'ads/sandbox/batch/accounts/:account_id/campaigns',
+      'ads/sandbox/batch/accounts/:account_id/line_items',
+      'ads/sandbox/batch/accounts/:account_id/tailored_audiences',
+      'ads/sandbox/batch/accounts/:account_id/targeting_criteria',
+      'ads/sandbox/conversion_event',
+      'ads/sandbox/stats/jobs/accounts/:account_id',
+      'ads/sandbox/tailored_audience_memberships',
+      'ads/stats/jobs/accounts/:account_id',
+      'ads/tailored_audience_memberships',
+      'blocks/create',
+      'blocks/destroy',
+      'collections/create',
+      'collections/destroy',
+      'collections/entries/add',
+      'collections/entries/curate',
+      'collections/entries/move',
+      'collections/entries/remove',
+      'collections/update',
+      'custom_profiles/new',
+      'direct_messages/events/new',
+      'direct_messages/indicate_typing',
+      'direct_messages/mark_read',
+      'direct_messages/welcome_messages/new',
+      'direct_messages/welcome_messages/rules/new',
+      'favorites/create',
+      'favorites/destroy',
+      'feedback/create',
+      'friendships/create',
+      'friendships/destroy',
+      'friendships/update',
+      'lists/create',
+      'lists/destroy',
+      'lists/members/create',
+      'lists/members/create_all',
+      'lists/members/destroy',
+      'lists/members/destroy_all',
+      'lists/subscribers/create',
+      'lists/subscribers/destroy',
+      'lists/update',
+      'media/metadata/create',
+      'media/upload',
+      'mutes/users/create',
+      'mutes/users/destroy',
+      'oauth/access_token',
+      'oauth/request_token',
+      'oauth2/invalidate_token',
+      'oauth2/token',
+      'saved_searches/create',
+      'saved_searches/destroy/:id',
+      'statuses/destroy/:id',
+      'statuses/filter',
+      'statuses/lookup',
+      'statuses/retweet/:id',
+      'statuses/unretweet/:id',
+      'statuses/update',
+      'ton/bucket/:bucket',
+      'ton/bucket/:bucket?resumable=true',
+      'tweets/search/30day/:env',
+      'tweets/search/30day/:env/counts',
+      'tweets/search/fullarchive/:env',
+      'tweets/search/fullarchive/:env/counts',
+      'users/lookup',
+      'users/report_spam'
+    ],
+    'PUT' => [
+      'account_activity/all/:env_name/webhooks/:webhook_id',
+      'account_activity/webhooks/:webhook_id',
+      'ads/accounts/:account_id/campaigns/:campaign_id',
+      'ads/accounts/:account_id/cards/app_download/:card_id',
+      'ads/accounts/:account_id/cards/image_app_download/:card_id',
+      'ads/accounts/:account_id/cards/image_conversation/:card_id',
+      'ads/accounts/:account_id/cards/lead_gen/:card_id',
+      'ads/accounts/:account_id/cards/video_app_download/:id',
+      'ads/accounts/:account_id/cards/video_conversation/:card_id',
+      'ads/accounts/:account_id/cards/website/:card_id',
+      'ads/accounts/:account_id/line_items/:line_item_id',
+      'ads/accounts/:account_id/preroll_call_to_actions/:preroll_call_to_action_id',
+      'ads/accounts/:account_id/promoted_tweets/:id',
+      'ads/accounts/:account_id/tailored_audiences/global_opt_out',
+      'ads/accounts/:account_id/targeting_criteria',
+      'ads/accounts/:account_id/videos/:id',
+      'ads/accounts/:account_id/web_event_tags/:web_event_tag_id',
+      'ads/sandbox/accounts/:account_id/campaigns/:campaign_id',
+      'ads/sandbox/accounts/:account_id/cards/app_download/:card_id',
+      'ads/sandbox/accounts/:account_id/cards/image_app_download/:card_id',
+      'ads/sandbox/accounts/:account_id/cards/image_conversation/:card_id',
+      'ads/sandbox/accounts/:account_id/cards/lead_gen/:card_id',
+      'ads/sandbox/accounts/:account_id/cards/video_app_download/:id',
+      'ads/sandbox/accounts/:account_id/cards/video_conversation/:card_id',
+      'ads/sandbox/accounts/:account_id/cards/website/:card_id',
+      'ads/sandbox/accounts/:account_id/line_items/:line_item_id',
+      'ads/sandbox/accounts/:account_id/preroll_call_to_actions/:preroll_call_to_action_id',
+      'ads/sandbox/accounts/:account_id/promoted_tweets/:id',
+      'ads/sandbox/accounts/:account_id/tailored_audiences/global_opt_out',
+      'ads/sandbox/accounts/:account_id/targeting_criteria',
+      'ads/sandbox/accounts/:account_id/videos/:id',
+      'ads/sandbox/accounts/:account_id/web_event_tags/:web_event_tag_id',
+      'direct_messages/welcome_messages/update',
+      'ton/bucket/:bucket/:file?resumable=true&resumeId=:resumeId'
+    ],
+    'DELETE' => [
+      'account_activity/all/:env_name/subscriptions',
+      'account_activity/all/:env_name/webhooks/:webhook_id',
+      'account_activity/webhooks/:webhook_id',
+      'account_activity/webhooks/:webhook_id/subscriptions/all',
+      'ads/accounts/:account_id/campaigns/:campaign_id',
+      'ads/accounts/:account_id/cards/app_download/:card_id',
+      'ads/accounts/:account_id/cards/image_app_download/:card_id',
+      'ads/accounts/:account_id/cards/image_conversation/:card_id',
+      'ads/accounts/:account_id/cards/lead_gen/:card_id',
+      'ads/accounts/:account_id/cards/video_app_download/:id',
+      'ads/accounts/:account_id/cards/video_conversation/:card_id',
+      'ads/accounts/:account_id/cards/website/:card_id',
+      'ads/accounts/:account_id/line_items/:line_item_id',
+      'ads/accounts/:account_id/media_creatives/:id',
+      'ads/accounts/:account_id/preroll_call_to_actions/:preroll_call_to_action_id',
+      'ads/accounts/:account_id/promoted_tweets/:id',
+      'ads/accounts/:account_id/tailored_audiences/:id',
+      'ads/accounts/:account_id/targeting_criteria/:id',
+      'ads/accounts/:account_id/videos/:id',
+      'ads/accounts/:account_id/web_event_tags/:web_event_tag_id',
+      'ads/sandbox/accounts/:account_id/campaigns/:campaign_id',
+      'ads/sandbox/accounts/:account_id/cards/app_download/:card_id',
+      'ads/sandbox/accounts/:account_id/cards/image_app_download/:card_id',
+      'ads/sandbox/accounts/:account_id/cards/image_conversation/:card_id',
+      'ads/sandbox/accounts/:account_id/cards/lead_gen/:card_id',
+      'ads/sandbox/accounts/:account_id/cards/video_app_download/:id',
+      'ads/sandbox/accounts/:account_id/cards/video_conversation/:card_id',
+      'ads/sandbox/accounts/:account_id/cards/website/:card_id',
+      'ads/sandbox/accounts/:account_id/line_items/:line_item_id',
+      'ads/sandbox/accounts/:account_id/media_creatives/:id',
+      'ads/sandbox/accounts/:account_id/preroll_call_to_actions/:preroll_call_to_action_id',
+      'ads/sandbox/accounts/:account_id/promoted_tweets/:id',
+      'ads/sandbox/accounts/:account_id/tailored_audiences/:id',
+      'ads/sandbox/accounts/:account_id/targeting_criteria/:id',
+      'ads/sandbox/accounts/:account_id/videos/:id',
+      'ads/sandbox/accounts/:account_id/web_event_tags/:web_event_tag_id',
+      'custom_profiles/destroy',
+      'direct_messages/events/destroy',
+      'direct_messages/welcome_messages/destroy',
+      'direct_messages/welcome_messages/rules/destroy'
+    ]
+  ];
+
+  /**
+   * Possible file name parameters
+   */
+  protected static $_possible_files = [
+    // Tweets
+    'media/upload' => ['media'],
+    // Accounts
+    'account/update_profile_image' => ['image'],
+    'account/update_profile_banner' => ['banner']
+  ];
+
+  /**
+   * The current Codebird version
+   */
+  protected static $_version = '4.0.0-beta.1';
+
+  /**
+   * The Request or access token. Used to sign requests
+   */
+  protected $_oauth_token = null;
+
+  /**
+   * The corresponding request or access token secret
+   */
+  protected $_oauth_token_secret = null;
+
+  /**
+   * The format of data to return from API calls
+   */
+  protected $_return_format = CODEBIRD_RETURNFORMAT_OBJECT;
+
+  /**
+   * The callback to call with any new streaming messages
+   */
+  protected $_streaming_callback = null;
+
+  /**
+   * Auto-detect cURL absence
+   */
+  protected $_use_curl = true;
+
+  /**
+   * Timeouts
+   */
+  protected $_timeouts = [
+    'request' => 10000,
+    'connect' => 3000,
+    'remote'  => 5000
+  ];
+
+  /**
+   * Proxy
+   */
+  protected $_proxy = [];
+
+  /**
+   *
+   * Class constructor
+   *
+   */
+  public function __construct()
+  {
+    // Pre-define $_use_curl depending on cURL availability
+    $this->setUseCurl(function_exists('curl_init'));
+  }
+
+  /**
+   * Returns singleton class instance
+   * Always use this method unless you're working with multiple authenticated users at once
+   *
+   * @return Codebird The instance
+   */
+  public static function getInstance()
+  {
+    if (self::$_instance === null) {
+      self::$_instance = new self;
+    }
+    return self::$_instance;
+  }
+
+  /**
+   * Sets the OAuth consumer key and secret (App key)
+   *
+   * @param string $key    OAuth consumer key
+   * @param string $secret OAuth consumer secret
+   *
+   * @return void
+   */
+  public static function setConsumerKey($key, $secret)
+  {
+    self::$_consumer_key    = $key;
+    self::$_consumer_secret = $secret;
+  }
+
+  /**
+   * Sets the OAuth2 app-only auth bearer token
+   *
+   * @param string $token OAuth2 bearer token
+   *
+   * @return void
+   */
+  public static function setBearerToken($token)
+  {
+    self::$_bearer_token = $token;
+  }
+
+  /**
+   * Gets the current Codebird version
+   *
+   * @return string The version number
+   */
+  public function getVersion()
+  {
+    return self::$_version;
+  }
+
+  /**
+   * Sets the OAuth request or access token and secret (User key)
+   *
+   * @param string $token  OAuth request or access token
+   * @param string $secret OAuth request or access token secret
+   *
+   * @return void
+   */
+  public function setToken($token, $secret)
+  {
+    $this->_oauth_token        = $token;
+    $this->_oauth_token_secret = $secret;
+  }
+
+  /**
+   * Forgets the OAuth request or access token and secret (User key)
+   *
+   * @return bool
+   */
+  public function logout()
+  {
+    $this->_oauth_token =
+    $this->_oauth_token_secret = null;
+
+    return true;
+  }
+
+  /**
+   * Sets if codebird should use cURL
+   *
+   * @param bool $use_curl Request uses cURL or not
+   *
+   * @return void
+   * @throws \Exception
+   */
+  public function setUseCurl($use_curl)
+  {
+    if ($use_curl && ! function_exists('curl_init')) {
+      throw new \Exception('To use cURL, the PHP curl extension must be available.');
+    }
+
+    $this->_use_curl = (bool) $use_curl;
+  }
+
+  /**
+   * Sets request timeout in milliseconds
+   *
+   * @param int $timeout Request timeout in milliseconds
+   *
+   * @return void
+   */
+  public function setTimeout($timeout)
+  {
+    if ($timeout < 0) {
+      $timeout = 0;
+    }
+    $this->_timeouts['request'] = (int) $timeout;
+  }
+
+  /**
+   * Sets connection timeout in milliseconds
+   *
+   * @param int $timeout Connection timeout in milliseconds
+   *
+   * @return void
+   */
+  public function setConnectionTimeout($timeout)
+  {
+    if ($timeout < 0) {
+      $timeout = 0;
+    }
+    $this->_timeouts['connect'] = (int) $timeout;
+  }
+
+  /**
+   * Sets remote media download timeout in milliseconds
+   *
+   * @param int $timeout Remote media timeout in milliseconds
+   *
+   * @return void
+   */
+  public function setRemoteDownloadTimeout($timeout)
+  {
+    if ($timeout < 0) {
+      $timeout = 0;
+    }
+    $this->_timeouts['remote'] = (int) $timeout;
+  }
+
+  /**
+   * Sets the format for API replies
+   *
+   * @param int $return_format One of these:
+   *                           CODEBIRD_RETURNFORMAT_OBJECT (default)
+   *                           CODEBIRD_RETURNFORMAT_ARRAY
+   *                           CODEBIRD_RETURNFORMAT_JSON
+   *
+   * @return void
+   */
+  public function setReturnFormat($return_format)
+  {
+    $this->_return_format = $return_format;
+  }
+
+  /**
+   * Sets the proxy
+   *
+   * @param string       $host Proxy host
+   * @param int          $port Proxy port
+   * @param int optional $type Proxy type, defaults to HTTP
+   *
+   * @return void
+   * @throws \Exception
+   */
+  public function setProxy($host, $port, $type = CURLPROXY_HTTP)
+  {
+    static $types_str = [
+      'HTTP', 'SOCKS4', 'SOCKS5', 'SOCKS4A', 'SOCKS5_HOSTNAME'
+    ];
+    $types = [];
+    foreach ($types_str as $type_str) {
+      if (defined('CURLPROXY_' . $type_str)) {
+        $types[] = constant('CURLPROXY_' . $type_str);
+      }
+    }
+    if (! in_array($type, $types)) {
+      throw new \Exception('Invalid proxy type specified.');
+    }
+
+    $this->_proxy['host'] = $host;
+    $this->_proxy['port'] = (int) $port;
+    $this->_proxy['type'] = $type;
+  }
+
+  /**
+   * Sets the proxy authentication
+   *
+   * @param string $authentication Proxy authentication
+   *
+   * @return void
+   */
+  public function setProxyAuthentication($authentication)
+  {
+    $this->_proxy['authentication'] = $authentication;
+  }
+
+  /**
+   * Sets streaming callback
+   *
+   * @param callable $callback The streaming callback
+   *
+   * @return void
+   * @throws \Exception
+   */
+  public function setStreamingCallback($callback)
+  {
+    if (!is_callable($callback)) {
+      throw new \Exception('This is not a proper callback.');
+    }
+    $this->_streaming_callback = $callback;
+  }
+
+  /**
+   * Get allowed API methods, sorted by HTTP method
+   * Watch out for multiple-method API methods!
+   *
+   * @return array $apimethods
+   */
+  public function getApiMethods()
+  {
+    return self::$_api_methods;
+  }
+
+  /**
+   * Main API handler working on any requests you issue
+   *
+   * @param string $function The member function you called
+   * @param array  $params   The parameters you sent along
+   *
+   * @return string The API reply encoded in the set return_format
+   */
+
+  public function __call($function, $params)
+  {
+    // cURL function?
+    if (substr($function, 0, 6) === '_curl_'
+      || $function === '_time'
+      || $function === '_microtime'
+    ) {
+      return call_user_func_array(substr($function, 1), $params);
+    }
+
+    // parse parameters
+    $apiparams = $this->_parseApiParams($params);
+
+    // stringify null and boolean parameters
+    $apiparams = $this->_stringifyNullBoolParams($apiparams);
+
+    $app_only_auth = false;
+    if (count($params) > 1) {
+      // convert app_only_auth param to bool
+      $app_only_auth = !! $params[1];
+    }
+
+    // reset token when requesting a new token
+    // (causes 401 for signature error on subsequent requests)
+    if ($function === 'oauth_requestToken') {
+      $this->setToken(null, null);
+    }
+
+    // map function name to API method
+    list($method, $method_template) = $this->_mapFnToApiMethod($function, $apiparams);
+
+    $httpmethod = $this->_detectMethod($method_template, $apiparams);
+    $multipart  = $this->_detectMultipart($method_template);
+
+    return $this->_callApi(
+      $httpmethod,
+      $method,
+      $method_template,
+      $apiparams,
+      $multipart,
+      $app_only_auth
+    );
+  }
+
+
+  /**
+   * __call() helpers
+   */
+
+  /**
+   * Parse given params, detect query-style params
+   *
+   * @param array|string $params Parameters to parse
+   *
+   * @return array $apiparams
+   */
+  protected function _parseApiParams($params)
+  {
+    $apiparams = [];
+    if (count($params) === 0) {
+      return $apiparams;
+    }
+
+    if (is_array($params[0])) {
+      // given parameters are array
+      $apiparams = $params[0];
+      return $apiparams;
+    }
+
+    // user gave us query-style params
+    parse_str($params[0], $apiparams);
+    if (! is_array($apiparams)) {
+      $apiparams = [];
+    }
+
+    return $apiparams;
+  }
+
+  /**
+   * Replace null and boolean parameters with their string representations
+   *
+   * @param array $apiparams Parameter array to replace in
+   *
+   * @return array $apiparams
+   */
+  protected function _stringifyNullBoolParams($apiparams)
+  {
+    foreach ($apiparams as $key => $value) {
+      if (! is_scalar($value)) {
+        // no need to try replacing arrays
+        continue;
+      }
+      if (is_null($value)) {
+        $apiparams[$key] = 'null';
+      } elseif (is_bool($value)) {
+        $apiparams[$key] = $value ? 'true' : 'false';
+      }
+    }
+
+    return $apiparams;
+  }
+
+  /**
+   * Maps called PHP magic method name to Twitter API method
+   *
+   * @param string $function        Function called
+   * @param array  $apiparams byref API parameters
+   *
+   * @return string[] (string method, string method_template)
+   */
+  protected function _mapFnToApiMethod($function, &$apiparams)
+  {
+    // replace _ by /
+    $method = $this->_mapFnInsertSlashes($function);
+
+    // undo replacement for URL parameters
+    $method = $this->_mapFnRestoreParamUnderscores($method);
+
+    // replace AA by URL parameters
+    list ($method, $method_template) = $this->_mapFnInlineParams($method, $apiparams);
+
+    if (substr($method, 0, 4) !== 'ton/') {
+      // replace A-Z by _a-z
+      for ($i = 0; $i < 26; $i++) {
+        $method  = str_replace(chr(65 + $i), '_' . chr(97 + $i), $method);
+        $method_template = str_replace(chr(65 + $i), '_' . chr(97 + $i), $method_template);
+      }
+    }
+
+    return [$method, $method_template];
+  }
+
+  /**
+   * API method mapping: Replaces _ with / character
+   *
+   * @param string $function Function called
+   *
+   * @return string API method to call
+   */
+  protected function _mapFnInsertSlashes($function)
+  {
+    return str_replace('_', '/', $function);
+  }
+
+  /**
+   * API method mapping: Restore _ character in named parameters
+   *
+   * @param string $method API method to call
+   *
+   * @return string API method with restored underscores
+   */
+  protected function _mapFnRestoreParamUnderscores($method)
+  {
+    $params = [
+      'screen_name', 'place_id',
+      'account_id', 'campaign_id', 'card_id', 'line_item_id',
+      'tweet_id', 'web_event_tag_id'
+    ];
+    foreach ($params as $param) {
+      $param = strtoupper($param);
+      $replacement_was = str_replace('_', '/', $param);
+      $method = str_replace($replacement_was, $param, $method);
+    }
+
+    return $method;
+  }
+
+  /**
+   * Inserts inline parameters into the method name
+   *
+   * @param string      $method    The method to call
+   * @param array byref $apiparams The parameters to send along
+   *
+   * @return string[] (string method, string method_template)
+   * @throws \Exception
+   */
+  protected function _mapFnInlineParams($method, &$apiparams)
+  {
+    $method_template = $method;
+    $match           = [];
+    if (preg_match_all('/[A-Z_]{2,}/', $method, $match)) {
+      foreach ($match[0] as $param) {
+        $param_l = strtolower($param);
+        if ($param_l === 'resumeid') {
+          $param_l = 'resumeId';
+        }
+        $method_template = str_replace($param, ':' . $param_l, $method_template);
+        if (! isset($apiparams[$param_l])) {
+          for ($i = 0; $i < 26; $i++) {
+            $method_template = str_replace(chr(65 + $i), '_' . chr(97 + $i), $method_template);
+          }
+          throw new \Exception(
+            'To call the templated method "' . $method_template
+            . '", specify the parameter value for "' . $param_l . '".'
+          );
+        }
+        $method  = str_replace($param, $apiparams[$param_l], $method);
+        unset($apiparams[$param_l]);
+      }
+    }
+
+    return [$method, $method_template];
+  }
+
+  /**
+   * Avoids any JSON_BIGINT_AS_STRING errors
+   *
+   * @param string       $data       JSON data to decode
+   * @param int optional $need_array Decode as array, otherwise as object
+   *
+   * @return array|object The decoded object
+   */
+  protected function _json_decode($data, $need_array = false)
+  {
+    if (!(defined('JSON_C_VERSION') && PHP_INT_SIZE > 4)) {
+      return json_decode($data, $need_array, 512, JSON_BIGINT_AS_STRING);
+    }
+    $max_int_length = strlen((string) PHP_INT_MAX) - 1;
+    $json_without_bigints = preg_replace('/:\s*(-?\d{'.$max_int_length.',})/', ': "$1"', $data);
+    $obj = json_decode($json_without_bigints, $need_array);
+    return $obj;
+  }
+
+  /**
+   * Uncommon API methods
+   */
+
+  /**
+   * Gets the OAuth authenticate URL for the current request token
+   *
+   * @param optional bool   $force_login Whether to force the user to enter their login data
+   * @param optional string $screen_name Screen name to repopulate the user name with
+   * @param optional string $type        'authenticate' or 'authorize', to avoid duplicate code
+   *
+   * @return string The OAuth authenticate/authorize URL
+   * @throws \Exception
+   */
+  public function oauth_authenticate($force_login = NULL, $screen_name = NULL, $type = 'authenticate')
+  {
+    if (! in_array($type, ['authenticate', 'authorize'])) {
+      throw new \Exception('To get the ' . $type . ' URL, use the correct third parameter, or omit it.');
+    }
+    if ($this->_oauth_token === null) {
+      throw new CodebirdCredentialsException('To get the ' . $type . ' URL, the OAuth token must be set.');
+    }
+    $url = self::$_endpoints['oauth'] . 'oauth/' . $type . '?oauth_token=' . $this->_url($this->_oauth_token);
+    if ($force_login) {
+      $url .= "&force_login=1";
+    }
+    if ($screen_name) {
+      $url .= "&screen_name=" . $screen_name;
+    }
+    return $url;
+  }
+
+  /**
+   * Gets the OAuth authorize URL for the current request token
+   * @param optional bool   $force_login Whether to force the user to enter their login data
+   * @param optional string $screen_name Screen name to repopulate the user name with
+   *
+   * @return string The OAuth authorize URL
+   */
+  public function oauth_authorize($force_login = NULL, $screen_name = NULL)
+  {
+    return $this->oauth_authenticate($force_login, $screen_name, 'authorize');
+  }
+
+  /**
+   * Gets the OAuth bearer token
+   *
+   * @return string The OAuth bearer token
+   */
+
+  public function oauth2_token()
+  {
+    if ($this->_use_curl) {
+      return $this->_oauth2TokenCurl();
+    }
+    return $this->_oauth2TokenNoCurl();
+  }
+
+  /**
+   * Gets a cURL handle
+   * @param string $url the URL for the curl initialization
+   * @return resource handle
+   */
+  protected function _getCurlInitialization($url)
+  {
+    $connection = $this->_curl_init($url);
+
+    $this->_curl_setopt($connection, CURLOPT_RETURNTRANSFER, 1);
+    $this->_curl_setopt($connection, CURLOPT_FOLLOWLOCATION, 0);
+    $this->_curl_setopt($connection, CURLOPT_HEADER, 1);
+    $this->_curl_setopt($connection, CURLOPT_SSL_VERIFYPEER, 1);
+    $this->_curl_setopt($connection, CURLOPT_SSL_VERIFYHOST, 2);
+    $this->_curl_setopt($connection, CURLOPT_CAINFO, __DIR__ . '/cacert.pem');
+    $this->_curl_setopt(
+      $connection, CURLOPT_USERAGENT,
+      'codebird-php/' . $this->getVersion() . ' +https://github.com/jublonet/codebird-php'
+    );
+
+    if ($this->_hasProxy()) {
+      $this->_curl_setopt($connection, CURLOPT_PROXYTYPE, $this->_getProxyType());
+      $this->_curl_setopt($connection, CURLOPT_PROXY, $this->_getProxyHost());
+      $this->_curl_setopt($connection, CURLOPT_PROXYPORT, $this->_getProxyPort());
+
+      if ($this->_getProxyAuthentication()) {
+        $this->_curl_setopt($connection, CURLOPT_PROXYAUTH, CURLAUTH_BASIC);
+        $this->_curl_setopt($connection, CURLOPT_PROXYUSERPWD, $this->_getProxyAuthentication());
+      }
+    }
+
+    return $connection;
+  }
+
+  /**
+   * Gets a non cURL initialization
+   *
+   * @param string $url            the URL for the curl initialization
+   * @param array  $contextOptions the options for the stream context
+   * @param string $hostname       the hostname to verify the SSL FQDN for
+   *
+   * @return array the read data
+   */
+  protected function _getNoCurlInitialization($url, $contextOptions, $hostname = '')
+  {
+    $httpOptions = [];
+
+    $httpOptions['header'] = [
+      'User-Agent: codebird-php/' . $this->getVersion() . ' +https://github.com/jublonet/codebird-php'
+    ];
+
+    $httpOptions['ssl'] = [
+      'verify_peer'  => true,
+      'cafile'       => __DIR__ . '/cacert.pem',
+      'verify_depth' => 5,
+      'peer_name'    => $hostname
+    ];
+
+    if ($this->_hasProxy()) {
+      $httpOptions['request_fulluri'] = true;
+      $httpOptions['proxy'] = $this->_getProxyHost() . ':' . $this->_getProxyPort();
+
+      if ($this->_getProxyAuthentication()) {
+        $httpOptions['header'][] =
+          'Proxy-Authorization: Basic ' . base64_encode($this->_getProxyAuthentication());
+      }
+    }
+
+    // merge the http options with the context options
+    $options = array_merge_recursive(
+      $contextOptions,
+      ['http' => $httpOptions]
+    );
+
+    // concatenate $options['http']['header']
+    $options['http']['header'] = implode("\r\n", $options['http']['header']);
+
+    // silent the file_get_contents function
+    $content = @file_get_contents($url, false, stream_context_create($options));
+
+    $headers = [];
+    // API is responding
+    if (isset($http_response_header)) {
+      $headers = $http_response_header;
+    }
+
+    return [
+      $content,
+      $headers
+    ];
+  }
+
+  protected function _hasProxy()
+  {
+    return isset($this->_proxy['host']) || isset($this->_proxy['port']);
+  }
+
+  /**
+   * Gets the proxy host
+   *
+   * @return string The proxy host
+   */
+  protected function _getProxyHost()
+  {
+    return $this->_getProxyData('host');
+  }
+
+  /**
+   * Gets the proxy port
+   *
+   * @return string The proxy port
+   */
+  protected function _getProxyPort()
+  {
+    return $this->_getProxyData('port');
+  }
+
+  /**
+   * Gets the proxy authentication
+   *
+   * @return string The proxy authentication
+   */
+  protected function _getProxyAuthentication()
+  {
+    return $this->_getProxyData('authentication');
+  }
+
+  /**
+   * Gets the proxy type
+   *
+   * @return string The proxy type
+   */
+  protected function _getProxyType()
+  {
+    return $this->_getProxyData('type');
+  }
+
+  /**
+   * Gets data from the proxy configuration
+   *
+   * @param string $name
+   */
+  private function _getProxyData($name)
+  {
+    return empty($this->_proxy[$name]) ? null : $this->_proxy[$name];
+  }
+
+  /**
+   * Gets the OAuth bearer token, using cURL
+   *
+   * @return string The OAuth bearer token
+   * @throws \Exception
+   */
+
+  protected function _oauth2TokenCurl()
+  {
+    if (self::$_consumer_key === null) {
+      throw new CodebirdCredentialsException('To obtain a bearer token, the consumer key must be set.');
+    }
+    $post_fields = [
+      'grant_type' => 'client_credentials'
+    ];
+    $url        = self::$_endpoints['oauth'] . 'oauth2/token';
+    $connection = $this->_getCurlInitialization($url);
+    $this->_curl_setopt($connection, CURLOPT_POST, 1);
+    $this->_curl_setopt($connection, CURLOPT_POSTFIELDS, $post_fields);
+
+    $this->_curl_setopt($connection, CURLOPT_USERPWD, self::$_consumer_key . ':' . self::$_consumer_secret);
+    $this->_curl_setopt($connection, CURLOPT_HTTPHEADER, [
+      'Expect:'
+    ]);
+    $result = $this->_curl_exec($connection);
+
+    // catch request errors
+    if ($result === false) {
+      throw new CodebirdAuthException('Request error for bearer token: ' . $this->_curl_error($connection));
+    }
+
+    // certificate validation results
+    $validation_result = $this->_curl_errno($connection);
+    $this->_validateSslCertificate($validation_result);
+
+    $httpstatus = $this->_curl_getinfo($connection, CURLINFO_HTTP_CODE);
+    $reply = $this->_parseBearerReply($result, $httpstatus);
+    return $reply;
+  }
+
+  /**
+   * Gets the OAuth bearer token, without cURL
+   *
+   * @return string The OAuth bearer token
+   * @throws \Exception
+   */
+
+  protected function _oauth2TokenNoCurl()
+  {
+    if (self::$_consumer_key == null) {
+      throw new CodebirdCredentialsException('To obtain a bearer token, the consumer key must be set.');
+    }
+
+    $url      = self::$_endpoints['oauth'] . 'oauth2/token';
+    $hostname = parse_url($url, PHP_URL_HOST);
+
+    if ($hostname === false) {
+      throw new CodebirdEndpointException('Incorrect API endpoint host.');
+    }
+
+    $contextOptions = [
+      'http' => [
+        'method'           => 'POST',
+        'protocol_version' => '1.1',
+        'header'           => "Accept: */*\r\n"
+          . 'Authorization: Basic '
+          . base64_encode(
+            self::$_consumer_key
+            . ':'
+            . self::$_consumer_secret
+          ),
+        'timeout'          => $this->_timeouts['request'] / 1000,
+        'content'          => 'grant_type=client_credentials',
+        'ignore_errors'    => true
+      ]
+    ];
+    list($reply, $headers) = $this->_getNoCurlInitialization($url, $contextOptions, $hostname);
+    $result  = '';
+    foreach ($headers as $header) {
+      $result .= $header . "\r\n";
+    }
+    $result .= "\r\n" . $reply;
+
+    // find HTTP status
+    $httpstatus = $this->_getHttpStatusFromHeaders($headers);
+    $reply      = $this->_parseBearerReply($result, $httpstatus);
+    return $reply;
+  }
+
+
+  /**
+   * General helpers to avoid duplicate code
+   */
+
+  /**
+   * Extract HTTP status code from headers
+   *
+   * @param array $headers The headers to parse
+   *
+   * @return string The HTTP status code
+   */
+  protected function _getHttpStatusFromHeaders($headers)
+  {
+    $httpstatus = '500';
+    $match      = [];
+    if (!empty($headers[0]) && preg_match('/HTTP\/\d\.\d (\d{3})/', $headers[0], $match)) {
+      $httpstatus = $match[1];
+    }
+    return $httpstatus;
+  }
+
+  /**
+   * Parse oauth2_token reply and set bearer token, if found
+   *
+   * @param string $result     Raw HTTP response
+   * @param int    $httpstatus HTTP status code
+   *
+   * @return string reply
+   */
+  protected function _parseBearerReply($result, $httpstatus)
+  {
+    list($headers, $reply) = $this->_parseApiHeaders($result);
+    $reply                 = $this->_parseApiReply($reply);
+    $rate                  = $this->_getRateLimitInfo($headers);
+    switch ($this->_return_format) {
+      case CODEBIRD_RETURNFORMAT_ARRAY:
+        $reply['httpstatus'] = $httpstatus;
+        $reply['rate']       = $rate;
+        if ($httpstatus === 200) {
+          self::setBearerToken($reply['access_token']);
+        }
+        break;
+      case CODEBIRD_RETURNFORMAT_JSON:
+        if ($httpstatus === 200) {
+          $parsed = $this->_json_decode($reply);
+          self::setBearerToken($parsed->access_token);
+        }
+        break;
+      case CODEBIRD_RETURNFORMAT_OBJECT:
+        $reply->httpstatus = $httpstatus;
+        $reply->rate       = $rate;
+        if ($httpstatus === 200) {
+          self::setBearerToken($reply->access_token);
+        }
+        break;
+    }
+    return $reply;
+  }
+
+  /**
+   * Extract rate-limiting data from response headers
+   *
+   * @param array $headers The CURL response headers
+   *
+   * @return null|array|object The rate-limiting information
+   */
+  protected function _getRateLimitInfo($headers)
+  {
+    if (! isset($headers['x-rate-limit-limit'])) {
+      return null;
+    }
+    $rate = [
+      'limit'     => $headers['x-rate-limit-limit'],
+      'remaining' => $headers['x-rate-limit-remaining'],
+      'reset'     => $headers['x-rate-limit-reset']
+    ];
+    if ($this->_return_format === CODEBIRD_RETURNFORMAT_OBJECT) {
+      return (object) $rate;
+    }
+    return $rate;
+  }
+
+  /**
+   * Check if there were any SSL certificate errors
+   *
+   * @param int $validation_result The curl error number
+   *
+   * @return void
+   * @throws \Exception
+   */
+  protected function _validateSslCertificate($validation_result)
+  {
+    if (in_array(
+        $validation_result,
+        [
+          CURLE_SSL_CERTPROBLEM,
+          CURLE_SSL_CACERT,
+          CURLE_SSL_CACERT_BADFILE,
+          CURLE_SSL_CRL_BADFILE,
+          CURLE_SSL_ISSUER_ERROR
+        ]
+      )
+    ) {
+      throw new \Exception(
+        'Error ' . $validation_result
+        . ' while validating the Twitter API certificate.'
+      );
+    }
+  }
+
+  /**
+   * Signing helpers
+   */
+
+  /**
+   * URL-encodes the given data
+   *
+   * @param mixed $data
+   *
+   * @return mixed The encoded data
+   */
+  protected function _url($data)
+  {
+    if (is_array($data)) {
+      return array_map([
+        $this,
+        '_url'
+      ], $data);
+    } elseif (is_scalar($data)) {
+      return str_replace([
+        '+',
+        '!',
+        '*',
+        "'",
+        '(',
+        ')'
+      ], [
+        ' ',
+        '%21',
+        '%2A',
+        '%27',
+        '%28',
+        '%29'
+      ], rawurlencode($data));
+    }
+    return '';
+  }
+
+  /**
+   * Gets the base64-encoded SHA1 hash for the given data
+   *
+   * @param string $data The data to calculate the hash from
+   *
+   * @return string The hash
+   * @throws \Exception
+   */
+  protected function _sha1($data)
+  {
+    if (self::$_consumer_secret === null) {
+      throw new CodebirdCredentialsException('To generate a hash, the consumer secret must be set.');
+    }
+    if (!function_exists('hash_hmac')) {
+      throw new \Exception('To generate a hash, the PHP hash extension must be available.');
+    }
+    return base64_encode(hash_hmac(
+      'sha1',
+      $data,
+      self::$_consumer_secret
+      . '&'
+      . ($this->_oauth_token_secret !== null
+        ? $this->_oauth_token_secret
+        : ''
+      ),
+      true
+    ));
+  }
+
+  /**
+   * Generates a (hopefully) unique random string
+   *
+   * @param int optional $length The length of the string to generate
+   *
+   * @return string The random string
+   * @throws \Exception
+   */
+  protected function _nonce($length = 8)
+  {
+    if ($length < 1) {
+      throw new \Exception('Invalid nonce length.');
+    }
+    return substr(md5($this->_microtime(true)), 0, $length);
+  }
+
+  /**
+   * Signature helper
+   *
+   * @param string $httpmethod   Usually either 'GET' or 'POST' or 'DELETE'
+   * @param string $method       The API method to call
+   * @param array  $base_params  The signature base parameters
+   *
+   * @return string signature
+   */
+  protected function _getSignature($httpmethod, $method, $base_params)
+  {
+    // convert params to string
+    $base_string = '';
+    foreach ($base_params as $key => $value) {
+      $base_string .= $key . '=' . $value . '&';
+    }
+
+    // trim last ampersand
+    $base_string = substr($base_string, 0, -1);
+
+    // hash it
+    return $this->_sha1(
+      $httpmethod . '&' .
+      $this->_url($method) . '&' .
+      $this->_url($base_string)
+    );
+  }
+
+  /**
+   * Generates an OAuth signature
+   *
+   * @param string          $httpmethod   Usually either 'GET' or 'POST' or 'DELETE'
+   * @param string          $method       The API method to call
+   * @param array  optional $params       The API call parameters, associative
+   *
+   * @return string Authorization HTTP header
+   * @throws \Exception
+   */
+  protected function _sign($httpmethod, $method, $params = [])
+  {
+    if (self::$_consumer_key === null) {
+      throw new CodebirdCredentialsException('To generate a signature, the consumer key must be set.');
+    }
+    $sign_base_params = array_map(
+      [$this, '_url'],
+      [
+        'oauth_consumer_key'     => self::$_consumer_key,
+        'oauth_version'          => '1.0',
+        'oauth_timestamp'        => $this->_time(),
+        'oauth_nonce'            => $this->_nonce(),
+        'oauth_signature_method' => 'HMAC-SHA1'
+      ]
+    );
+    if ($this->_oauth_token !== null) {
+      $sign_base_params['oauth_token'] = $this->_url($this->_oauth_token);
+    }
+    $oauth_params = $sign_base_params;
+
+    // merge in the non-OAuth params
+    $sign_base_params = array_merge(
+      $sign_base_params,
+      array_map([$this, '_url'], $params)
+    );
+    ksort($sign_base_params);
+
+    $signature = $this->_getSignature($httpmethod, $method, $sign_base_params);
+
+    $params = $oauth_params;
+    $params['oauth_signature'] = $signature;
+
+    ksort($params);
+    $authorization = 'OAuth ';
+    foreach ($params as $key => $value) {
+      $authorization .= $key . "=\"" . $this->_url($value) . "\", ";
+    }
+    return substr($authorization, 0, -2);
+  }
+
+  /**
+   * Detects HTTP method to use for API call
+   *
+   * @param string      $method The API method to call
+   * @param array byref $params The parameters to send along
+   *
+   * @return string The HTTP method that should be used
+   */
+  protected function _detectMethod($method, &$params)
+  {
+    if (isset($params['httpmethod'])) {
+      $httpmethod = $params['httpmethod'];
+      unset($params['httpmethod']);
+      return $httpmethod;
+    }
+    $apimethods = $this->getApiMethods();
+
+    // multi-HTTP method API methods
+    // parameter-based detection
+    $httpmethods_by_param = [
+      'POST' => [
+        'campaign_id' => [
+          'ads/accounts/:account_id/line_items',
+          'ads/sandbox/accounts/:account_id/line_items'
+        ],
+        'media_id' => [
+          'ads/accounts/:account_id/account_media',
+          'ads/sandbox/accounts/:account_id/account_media'
+        ],
+        'name' => [
+          'ads/accounts/:account_id/app_lists',
+          'ads/accounts/:account_id/campaigns',
+          'ads/accounts/:account_id/cards/app_download',
+          'ads/accounts/:account_id/cards/image_app_download',
+          'ads/accounts/:account_id/cards/image_conversation',
+          'ads/accounts/:account_id/cards/lead_gen',
+          'ads/accounts/:account_id/cards/video_app_download',
+          'ads/accounts/:account_id/cards/video_conversation',
+          'ads/accounts/:account_id/cards/website',
+          'ads/accounts/:account_id/tailored_audiences',
+          'ads/accounts/:account_id/web_event_tags',
+          'ads/sandbox/accounts/:account_id/app_lists',
+          'ads/sandbox/accounts/:account_id/campaigns',
+          'ads/sandbox/accounts/:account_id/cards/app_download',
+          'ads/sandbox/accounts/:account_id/cards/image_app_download',
+          'ads/sandbox/accounts/:account_id/cards/image_conversation',
+          'ads/sandbox/accounts/:account_id/cards/lead_gen',
+          'ads/sandbox/accounts/:account_id/cards/video_app_download',
+          'ads/sandbox/accounts/:account_id/cards/video_conversation',
+          'ads/sandbox/accounts/:account_id/cards/website',
+          'ads/sandbox/accounts/:account_id/tailored_audiences',
+          'ads/sandbox/accounts/:account_id/web_event_tags'
+        ],
+        'permission_level' => [
+          'ads/accounts/:account_id/tailored_audiences/:id/permissions',
+          'ads/sandbox/accounts/:account_id/tailored_audiences/:id/permissions'
+        ],
+        'tailored_audience_id' => [
+          'ads/accounts/:account_id/tailored_audience_changes',
+          'ads/sandbox/accounts/:account_id/tailored_audience_changes'
+        ],
+        'targeting_value' => [
+          'ads/accounts/:account_id/targeting_criteria',
+          'ads/sandbox/accounts/:account_id/targeting_criteria'
+        ],
+        'tweet_ids' => [
+          'ads/accounts/:account_id/promoted_tweets',
+          'ads/sandbox/accounts/:account_id/promoted_tweets'
+        ],
+        'type' => [
+          'ads/sandbox/accounts/:account_id/features',
+          'ads/sandbox/accounts/:account_id/funding_instruments'
+        ],
+        'url' => [
+          'account_activity/webhooks'
+        ],
+        'user_id' => [
+          'ads/accounts/:account_id/promoted_accounts',
+          'ads/sandbox/accounts/:account_id/promoted_accounts'
+        ],
+        'video_media_id' => [
+          'ads/accounts/:account_id/videos',
+          'ads/sandbox/accounts/:account_id/videos'
+        ]
+      ],
+      'PUT' => [
+        'name' => [
+          'ads/accounts/:account_id/cards/image_conversation/:card_id',
+          'ads/accounts/:account_id/cards/video_conversation/:card_id',
+          'ads/accounts/:account_id/cards/website/:card_id',
+          'ads/sandbox/accounts/:account_id/cards/image_conversation/:card_id',
+          'ads/sandbox/accounts/:account_id/cards/video_conversation/:card_id',
+          'ads/sandbox/accounts/:account_id/cards/website/:card_id'
+        ]
+      ]
+    ];
+    foreach ($httpmethods_by_param as $httpmethod => $methods_by_param) {
+      foreach ($methods_by_param as $param => $methods) {
+        if (in_array($method, $methods) && isset($params[$param])) {
+          return $httpmethod;
+        }
+      }
+    }
+
+    // async media/upload calls may request a status by GET
+    if ($method === 'media/upload'
+      && isset($params['command'])
+      && $params['command'] === 'STATUS'
+    ) {
+      return 'GET';
+    }
+
+    // prefer POST and PUT if parameters are set
+    if (count($params) > 0) {
+      if (in_array($method, $apimethods['POST'])) {
+        return 'POST';
+      }
+      if (in_array($method, $apimethods['PUT'])) {
+        return 'PUT';
+      }
+    }
+
+    foreach ($apimethods as $httpmethod => $methods) {
+      if (in_array($method, $methods)) {
+        return $httpmethod;
+      }
+    }
+    throw new \Exception('Can\'t find HTTP method to use for "' . $method . '".');
+  }
+
+  /**
+   * Detects if API call should use multipart/form-data
+   *
+   * @param string $method The API method to call
+   *
+   * @return bool Whether the method should be sent as multipart
+   */
+  protected function _detectMultipart($method)
+  {
+    $multiparts = [
+      // Tweets
+      'media/upload',
+
+      // Users
+      // no multipart for these, for now:
+      //'account/update_profile_image',
+      //'account/update_profile_banner'
+    ];
+    return in_array($method, $multiparts);
+  }
+
+  /**
+   * Merge multipart string from parameters array
+   *
+   * @param string $method_template The method template to call
+   * @param string $border          The multipart border
+   * @param array  $params          The parameters to send along
+   *
+   * @return string request
+   * @throws \Exception
+   */
+  protected function _getMultipartRequestFromParams($method_template, $border, $params)
+  {
+    $request = '';
+    foreach ($params as $key => $value) {
+      // is it an array?
+      if (is_array($value)) {
+        throw new CodebirdMediaException('Using URL-encoded parameters is not supported for uploading media.');
+      }
+      $request .=
+        '--' . $border . "\r\n"
+        . 'Content-Disposition: form-data; name="' . $key . '"';
+
+      // check for filenames
+      $data = $this->_checkForFiles($method_template, $key, $value);
+      if ($data !== false) {
+        $value = $data;
+      }
+
+      $request .= "\r\n\r\n" . $value . "\r\n";
+    }
+
+    return $request;
+  }
+
+  /**
+   * Check for files
+   *
+   * @param string $method_template The method template to call
+   * @param string $key             The parameter name
+   * @param string $value           The possible file name or URL
+   *
+   * @return mixed
+   */
+  protected function _checkForFiles($method_template, $key, $value) {
+    if (!array_key_exists($method_template, self::$_possible_files)
+      || !in_array($key, self::$_possible_files[$method_template])
+    ) {
+      return false;
+    }
+    $data = $this->_buildBinaryBody($value);
+    if ($data === $value) {
+      return false;
+    }
+    return $data;
+  }
+
+
+  /**
+   * Detect filenames in upload parameters,
+   * build multipart request from upload params
+   *
+   * @param string $method  The API method to call
+   * @param array  $params  The parameters to send along
+   *
+   * @return null|string
+   */
+  protected function _buildMultipart($method, $params)
+  {
+    // well, files will only work in multipart methods
+    if (! $this->_detectMultipart($method)) {
+      return;
+    }
+
+    // only check specific parameters
+    // method might have files?
+    if (! in_array($method, array_keys(self::$_possible_files))) {
+      return;
+    }
+
+    $multipart_border = '--------------------' . $this->_nonce();
+    $multipart_request =
+      $this->_getMultipartRequestFromParams($method, $multipart_border, $params)
+      . '--' . $multipart_border . '--';
+
+    return $multipart_request;
+  }
+
+  /**
+   * Detect filenames in upload parameters
+   *
+   * @param mixed $input The data or file name to parse
+   *
+   * @return null|string
+   */
+  protected function _buildBinaryBody($input)
+  {
+    if (// is it a file, a readable one?
+      @file_exists($input)
+      && @is_readable($input)
+    ) {
+      // try to read the file
+      $data = @file_get_contents($input);
+      if ($data !== false && strlen($data) !== 0) {
+        return $data;
+      }
+    } elseif (// is it a remote file?
+      filter_var($input, FILTER_VALIDATE_URL)
+      && preg_match('/^https?:\/\//', $input)
+    ) {
+      $data = $this->_fetchRemoteFile($input);
+      if ($data !== false) {
+        return $data;
+      }
+    }
+    return $input;
+  }
+
+  /**
+   * Fetches a remote file
+   *
+   * @param string $url The URL to download from
+   *
+   * @return mixed The file contents or FALSE
+   * @throws \Exception
+   */
+  protected function _fetchRemoteFile($url)
+  {
+    // try to fetch the file
+    if ($this->_use_curl) {
+      $connection = $this->_getCurlInitialization($url);
+      $this->_curl_setopt($connection, CURLOPT_RETURNTRANSFER, 1);
+      $this->_curl_setopt($connection, CURLOPT_HEADER, 0);
+      // no SSL validation for downloading media
+      $this->_curl_setopt($connection, CURLOPT_SSL_VERIFYPEER, 1);
+      $this->_curl_setopt($connection, CURLOPT_SSL_VERIFYHOST, 2);
+      $this->_curl_setopt($connection, CURLOPT_TIMEOUT_MS, $this->_timeouts['remote']);
+      $this->_curl_setopt($connection, CURLOPT_CONNECTTIMEOUT_MS, $this->_timeouts['remote'] / 2);
+      // find files that have been redirected
+      $this->_curl_setopt($connection, CURLOPT_FOLLOWLOCATION, true);
+      // process compressed images
+      $this->_curl_setopt($connection, CURLOPT_ENCODING, 'gzip,deflate,sdch');
+      $result = $this->_curl_exec($connection);
+      if ($result !== false
+        && $this->_curl_getinfo($connection, CURLINFO_HTTP_CODE) === 200
+      ) {
+        return $result;
+      }
+      throw new CodebirdMediaException('Downloading a remote media file failed.');
+      return false;
+    }
+    // no cURL
+    $contextOptions = [
+      'http' => [
+        'method'           => 'GET',
+        'protocol_version' => '1.1',
+        'timeout'          => $this->_timeouts['remote']
+      ],
+      'ssl' => [
+        'verify_peer'  => false
+      ]
+    ];
+    list($result, $headers) = $this->_getNoCurlInitialization($url, $contextOptions);
+    if ($result !== false
+      && preg_match('/^HTTP\/\d\.\d 200 OK$/', $headers[0])
+    ) {
+      return $result;
+    }
+    throw new CodebirdMediaException('Downloading a remote media file failed.');
+    return false;
+  }
+
+  /**
+   * Detects if API call should use media endpoint
+   *
+   * @param string $method The API method to call
+   *
+   * @return bool Whether the method is defined in media API
+   */
+  protected function _detectMedia($method) {
+    $medias = [
+      'media/metadata/create',
+      'media/upload'
+    ];
+    return in_array($method, $medias);
+  }
+
+  /**
+   * Detects if API call should use JSON body
+   *
+   * @param string $method_template The API method to call
+   *
+   * @return bool Whether the method is defined as accepting JSON body
+   */
+  protected function _detectJsonBody($method_template) {
+    $json_bodies = [
+      'ads/batch/accounts/:account_id/campaigns',
+      'ads/batch/accounts/:account_id/line_items',
+      'ads/batch/accounts/:account_id/targeting_criteria',
+      'ads/sandbox/batch/accounts/:account_id/campaigns',
+      'ads/sandbox/batch/accounts/:account_id/line_items',
+      'ads/sandbox/batch/accounts/:account_id/targeting_criteria',
+      'collections/entries/curate',
+      'custom_profiles/new',
+      'direct_messages/events/new',
+      'direct_messages/indicate_typing',
+      'direct_messages/mark_read',
+      'direct_messages/welcome_messages/new',
+      'direct_messages/welcome_messages/rules/new',
+      'direct_messages/welcome_messages/update',
+      'media/metadata/create',
+      'tweets/search/30day/:env',
+      'tweets/search/fullarchive/:env'
+    ];
+    return in_array($method_template, $json_bodies);
+  }
+
+  /**
+   * Detects if API call should use binary body
+   *
+   * @param string $method_template The API method to call
+   *
+   * @return bool Whether the method is defined as accepting binary body
+   */
+  protected function _detectBinaryBody($method_template) {
+    $binary = [
+      'ton/bucket/:bucket',
+      'ton/bucket/:bucket?resumable=true',
+      'ton/bucket/:bucket/:file?resumable=true&resumeId=:resumeId'
+    ];
+    return in_array($method_template, $binary);
+  }
+
+  /**
+   * Detects if API call should use streaming endpoint, and if yes, which one
+   *
+   * @param string $method The API method to call
+   *
+   * @return string|false Variant of streaming API to be used
+   */
+  protected function _detectStreaming($method) {
+    $streamings = [
+      'public' => [
+        'statuses/sample',
+        'statuses/filter'
+      ]
+    ];
+    foreach ($streamings as $key => $values) {
+      if (in_array($method, $values)) {
+        return $key;
+      }
+    }
+
+    return false;
+  }
+
+  /**
+   * Builds the complete API endpoint url
+   *
+   * @param string $method The API method to call
+   * @param string $method_template The API method to call
+   *
+   * @return string The URL to send the request to
+   */
+  protected function _getEndpoint($method, $method_template)
+  {
+    $url = self::$_endpoints['rest'] . $method . '.json';
+    if (substr($method_template, 0, 5) === 'oauth') {
+      $url = self::$_endpoints['oauth'] . $method;
+    } elseif ($this->_detectMedia($method_template)) {
+      $url = self::$_endpoints['media'] . $method . '.json';
+    } elseif ($method_template === 'statuses/oembed') {
+      $url = self::$_endpoints['publish'] . 'oembed';
+    } elseif ($variant = $this->_detectStreaming($method_template)) {
+      $url = self::$_endpoints['streaming'][$variant] . $method . '.json';
+    } elseif ($this->_detectBinaryBody($method_template)) {
+      $url = self::$_endpoints['ton'] . $method;
+    } elseif (substr($method_template, 0, 12) === 'ads/sandbox/') {
+      $url = self::$_endpoints['ads']['sandbox'] . substr($method, 12);
+    } elseif (substr($method_template, 0, 4) === 'ads/') {
+      $url = self::$_endpoints['ads']['production'] . substr($method, 4);
+    }
+    return $url;
+  }
+
+  /**
+   * Calls the API
+   *
+   * @param string          $httpmethod      The HTTP method to use for making the request
+   * @param string          $method          The API method to call
+   * @param string          $method_template The API method template to call
+   * @param array  optional $params          The parameters to send along
+   * @param bool   optional $multipart       Whether to use multipart/form-data
+   * @param bool   optional $app_only_auth   Whether to use app-only bearer authentication
+   *
+   * @return string The API reply, encoded in the set return_format
+   * @throws \Exception
+   */
+
+  protected function _callApi($httpmethod, $method, $method_template, $params = [], $multipart = false, $app_only_auth = false)
+  {
+    if (! $app_only_auth
+      && $this->_oauth_token === null
+      && substr($method, 0, 5) !== 'oauth'
+    ) {
+        throw new CodebirdCredentialsException('To call this API, the OAuth access token must be set.');
+    }
+    // use separate API access for streaming API
+    if ($this->_detectStreaming($method) !== false) {
+      return $this->_callApiStreaming($httpmethod, $method, $method_template, $params, $app_only_auth);
+    }
+
+    if ($this->_use_curl) {
+      return $this->_callApiCurl($httpmethod, $method, $method_template, $params, $multipart, $app_only_auth);
+    }
+    return $this->_callApiNoCurl($httpmethod, $method, $method_template, $params, $multipart, $app_only_auth);
+  }
+
+  /**
+   * Calls the API using cURL
+   *
+   * @param string          $httpmethod    The HTTP method to use for making the request
+   * @param string          $method        The API method to call
+   * @param string          $method_template The API method template to call
+   * @param array  optional $params        The parameters to send along
+   * @param bool   optional $multipart     Whether to use multipart/form-data
+   * @param bool   optional $app_only_auth Whether to use app-only bearer authentication
+   *
+   * @return string The API reply, encoded in the set return_format
+   * @throws \Exception
+   */
+
+  protected function _callApiCurl(
+    $httpmethod, $method, $method_template, $params = [], $multipart = false, $app_only_auth = false
+  )
+  {
+    list ($authorization, $url, $params, $request_headers)
+      = $this->_callApiPreparations(
+        $httpmethod, $method, $method_template, $params, $multipart, $app_only_auth
+      );
+
+    $connection        = $this->_getCurlInitialization($url);
+    $request_headers[] = 'Authorization: ' . $authorization;
+    $request_headers[] = 'Expect:';
+
+    if ($httpmethod !== 'GET') {
+      $this->_curl_setopt($connection, CURLOPT_POST, 1);
+      $this->_curl_setopt($connection, CURLOPT_POSTFIELDS, $params);
+      if (in_array($httpmethod, ['POST', 'PUT', 'DELETE'])) {
+        $this->_curl_setopt($connection, CURLOPT_CUSTOMREQUEST, $httpmethod);
+      }
+    }
+
+    $this->_curl_setopt($connection, CURLOPT_HTTPHEADER, $request_headers);
+    $this->_curl_setopt($connection, CURLOPT_TIMEOUT_MS, $this->_timeouts['request']);
+    $this->_curl_setopt($connection, CURLOPT_CONNECTTIMEOUT_MS, $this->_timeouts['connect']);
+
+    $result = $this->_curl_exec($connection);
+
+    // catch request errors
+    if ($result === false) {
+      throw new \Exception('Request error for API call: ' . $this->_curl_error($connection));
+    }
+
+    // certificate validation results
+    $validation_result = $this->_curl_errno($connection);
+    $this->_validateSslCertificate($validation_result);
+
+    $httpstatus            = $this->_curl_getinfo($connection, CURLINFO_HTTP_CODE);
+    list($headers, $reply) = $this->_parseApiHeaders($result);
+    // TON API & redirects
+    $reply                 = $this->_parseApiReplyPrefillHeaders($headers, $reply);
+    $reply                 = $this->_parseApiReply($reply);
+    $rate                  = $this->_getRateLimitInfo($headers);
+
+    $reply = $this->_appendHttpStatusAndRate($reply, $httpstatus, $rate);
+    return $reply;
+  }
+
+  /**
+   * Calls the API without cURL
+   *
+   * @param string          $httpmethod      The HTTP method to use for making the request
+   * @param string          $method          The API method to call
+   * @param string          $method_template The API method template to call
+   * @param array  optional $params          The parameters to send along
+   * @param bool   optional $multipart       Whether to use multipart/form-data
+   * @param bool   optional $app_only_auth   Whether to use app-only bearer authentication
+   *
+   * @return string The API reply, encoded in the set return_format
+   * @throws \Exception
+   */
+
+  protected function _callApiNoCurl(
+    $httpmethod, $method, $method_template, $params = [], $multipart = false, $app_only_auth = false
+  )
+  {
+    list ($authorization, $url, $params, $request_headers)
+      = $this->_callApiPreparations(
+        $httpmethod, $method, $method_template, $params, $multipart, $app_only_auth
+      );
+
+    $hostname = parse_url($url, PHP_URL_HOST);
+    if ($hostname === false) {
+      throw new CodebirdEndpointException('Incorrect API endpoint host.');
+    }
+
+    $request_headers[] = 'Authorization: ' . $authorization;
+    $request_headers[] = 'Accept: */*';
+    $request_headers[] = 'Connection: Close';
+    if ($httpmethod !== 'GET' && ! $multipart) {
+      $request_headers[]  = 'Content-Type: application/x-www-form-urlencoded';
+    }
+
+    $contextOptions = [
+      'http' => [
+        'method'           => $httpmethod,
+        'protocol_version' => '1.1',
+        'header'           => implode("\r\n", $request_headers),
+        'timeout'          => $this->_timeouts['request'] / 1000,
+        'content'          => in_array($httpmethod, ['POST', 'PUT']) ? $params : null,
+        'ignore_errors'    => true
+      ]
+    ];
+
+    list($reply, $headers) = $this->_getNoCurlInitialization($url, $contextOptions, $hostname);
+    $result  = '';
+    foreach ($headers as $header) {
+      $result .= $header . "\r\n";
+    }
+    $result .= "\r\n" . $reply;
+
+    // find HTTP status
+    $httpstatus            = $this->_getHttpStatusFromHeaders($headers);
+    list($headers, $reply) = $this->_parseApiHeaders($result);
+    // TON API & redirects
+    $reply                 = $this->_parseApiReplyPrefillHeaders($headers, $reply);
+    $reply                 = $this->_parseApiReply($reply);
+    $rate                  = $this->_getRateLimitInfo($headers);
+
+    $reply = $this->_appendHttpStatusAndRate($reply, $httpstatus, $rate);
+    return $reply;
+  }
+
+  /**
+   * Do preparations to make the API GET call
+   *
+   * @param string  $httpmethod      The HTTP method to use for making the request
+   * @param string  $url             The URL to call
+   * @param array   $params          The parameters to send along
+   * @param bool    $app_only_auth   Whether to use app-only bearer authentication
+   *
+   * @return string[] (string authorization, string url)
+   */
+  protected function _callApiPreparationsGet(
+    $httpmethod, $url, $params, $app_only_auth
+  ) {
+    return [
+      $app_only_auth                ? null : $this->_sign($httpmethod, $url, $params),
+      json_encode($params) === '[]' ? $url : $url . '?' . http_build_query($params)
+    ];
+  }
+
+  /**
+   * Do preparations to make the API POST call
+   *
+   * @param string  $httpmethod      The HTTP method to use for making the request
+   * @param string  $url             The URL to call
+   * @param string  $method          The API method to call
+   * @param string  $method_template The API method template to call
+   * @param array   $params          The parameters to send along
+   * @param bool    $multipart       Whether to use multipart/form-data
+   * @param bool    $app_only_auth   Whether to use app-only bearer authentication
+   *
+   * @return array (string authorization, array params, array request_headers)
+   */
+  protected function _callApiPreparationsPost(
+    $httpmethod, $url, $method, $method_template, $params, $multipart, $app_only_auth
+  ) {
+    $authorization   = null;
+    $request_headers = [];
+    if ($multipart) {
+      if (! $app_only_auth) {
+        $authorization = $this->_sign($httpmethod, $url, []);
+      }
+      $params = $this->_buildMultipart($method, $params);
+      $first_newline      = strpos($params, "\r\n");
+      $multipart_boundary = substr($params, 2, $first_newline - 2);
+      $request_headers[]  = 'Content-Type: multipart/form-data; boundary='
+        . $multipart_boundary;
+    } elseif ($this->_detectJsonBody($method_template)) {
+      $authorization = $this->_sign($httpmethod, $url, []);
+      $params = json_encode($params);
+      $request_headers[] = 'Content-Type: application/json';
+    } elseif ($this->_detectBinaryBody($method_template)) {
+      // transform parametric headers to real headers
+      foreach ([
+          'Content-Length',
+          'Content-Range',
+          'Content-Type',
+          'X-TON-Content-Type',
+          'X-TON-Content-Length',
+          'X-TON-Expires'
+        ] as $key) {
+        if (isset($params[$key])) {
+          $request_headers[] = $key . ': ' . $params[$key];
+          unset($params[$key]);
+        }
+      }
+      $sign_params = [];
+      parse_str(parse_url($method, PHP_URL_QUERY), $sign_params);
+      if ($sign_params === null) {
+        $sign_params = [];
+      }
+      $authorization = $this->_sign($httpmethod, $url, $sign_params);
+      if (isset($params['media'])) {
+        $params = $this->_buildBinaryBody($params['media']);
+      } else {
+        // resumable upload
+        $params = [];
+      }
+    } else {
+      // check for possible files in non-multipart methods
+      foreach ($params as $key => $value) {
+        $data = $this->_checkForFiles($method_template, $key, $value);
+        if ($data !== false) {
+          $params[$key] = base64_encode($data);
+        }
+      }
+      if (! $app_only_auth) {
+        $authorization = $this->_sign($httpmethod, $url, $params);
+      }
+      $params = http_build_query($params);
+    }
+    return [$authorization, $params, $request_headers];
+  }
+
+  /**
+   * Appends HTTP status and rate limiting info to the reply
+   *
+   * @param array|object|string $reply      The reply to append to
+   * @param string              $httpstatus The HTTP status code to append
+   * @param mixed               $rate       The rate limiting info to append
+   */
+  protected function _appendHttpStatusAndRate($reply, $httpstatus, $rate)
+  {
+    switch ($this->_return_format) {
+      case CODEBIRD_RETURNFORMAT_ARRAY:
+        $reply['httpstatus'] = $httpstatus;
+        $reply['rate']       = $rate;
+        break;
+      case CODEBIRD_RETURNFORMAT_OBJECT:
+        $reply->httpstatus = $httpstatus;
+        $reply->rate       = $rate;
+        break;
+      case CODEBIRD_RETURNFORMAT_JSON:
+        $reply             = $this->_json_decode($reply);
+        $reply->httpstatus = $httpstatus;
+        $reply->rate       = $rate;
+        $reply             = json_encode($reply);
+        break;
+    }
+    return $reply;
+  }
+
+  /**
+   * Get Bearer authorization string
+   *
+   * @return string authorization
+   * @throws \Exception
+   */
+  protected function _getBearerAuthorization()
+  {
+    if (self::$_consumer_key === null
+      && self::$_bearer_token === null
+    ) {
+      throw new CodebirdCredentialsException('To make an app-only auth API request, consumer key or bearer token must be set.');
+    }
+    // automatically fetch bearer token, if necessary
+    if (self::$_bearer_token === null) {
+      $this->oauth2_token();
+    }
+    return 'Bearer ' . self::$_bearer_token;
+  }
+
+  /**
+   * Do preparations to make the API call
+   *
+   * @param string  $httpmethod      The HTTP method to use for making the request
+   * @param string  $method          The API method to call
+   * @param string  $method_template The API method template to call
+   * @param array   $params          The parameters to send along
+   * @param bool    $multipart       Whether to use multipart/form-data
+   * @param bool    $app_only_auth   Whether to use app-only bearer authentication
+   *
+   * @return array (string authorization, string url, array params, array request_headers)
+   */
+  protected function _callApiPreparations(
+    $httpmethod, $method, $method_template, $params, $multipart, $app_only_auth
+  )
+  {
+    $url             = $this->_getEndpoint($method, $method_template);
+    $request_headers = [];
+    if ($httpmethod === 'GET') {
+      // GET
+      list ($authorization, $url) =
+        $this->_callApiPreparationsGet($httpmethod, $url, $params, $app_only_auth);
+    } else {
+      // POST
+      list ($authorization, $params, $request_headers) =
+        $this->_callApiPreparationsPost($httpmethod, $url, $method, $method_template, $params, $multipart, $app_only_auth);
+    }
+    if ($app_only_auth) {
+      $authorization = $this->_getBearerAuthorization();
+    }
+
+    return [
+      $authorization, $url, $params, $request_headers
+    ];
+  }
+
+  /**
+   * Calls the streaming API
+   *
+   * @param string          $httpmethod      The HTTP method to use for making the request
+   * @param string          $method          The API method to call
+   * @param string          $method_template The API method template to call
+   * @param array  optional $params          The parameters to send along
+   * @param bool   optional $app_only_auth   Whether to use app-only bearer authentication
+   *
+   * @return void
+   * @throws \Exception
+   */
+
+  protected function _callApiStreaming(
+    $httpmethod, $method, $method_template, $params = [], $app_only_auth = false
+  )
+  {
+    if ($this->_streaming_callback === null) {
+      throw new \Exception('Set streaming callback before consuming a stream.');
+    }
+
+    $params['delimited'] = 'length';
+
+    list ($authorization, $url, $params, $request_headers)
+      = $this->_callApiPreparations(
+        $httpmethod, $method, $method_template, $params, false, $app_only_auth
+      );
+
+    $hostname = parse_url($url, PHP_URL_HOST);
+    $path     = parse_url($url, PHP_URL_PATH);
+    $query    = parse_url($url, PHP_URL_QUERY);
+    if ($hostname === false) {
+      throw new CodebirdEndpointException('Incorrect API endpoint host.');
+    }
+
+    $request_headers[] = 'Authorization: ' . $authorization;
+    $request_headers[] = 'Accept: */*';
+    if ($httpmethod !== 'GET') {
+      $request_headers[]  = 'Content-Type: application/x-www-form-urlencoded';
+      $request_headers[]  = 'Content-Length: ' . strlen($params);
+    }
+
+    $errno   = 0;
+    $errstr  = '';
+    $connection = stream_socket_client(
+      'ssl://' . $hostname . ':443',
+      $errno, $errstr,
+      $this->_timeouts['connect'],
+      STREAM_CLIENT_CONNECT
+    );
+
+    // send request
+    $request = $httpmethod . ' '
+      . $path . ($query ? '?' . $query : '') . " HTTP/1.1\r\n"
+      . 'Host: ' . $hostname . "\r\n"
+      . implode("\r\n", $request_headers)
+      . "\r\n\r\n";
+    if ($httpmethod !== 'GET') {
+      $request .= $params;
+    }
+    fputs($connection, $request);
+    stream_set_blocking($connection, 0);
+    stream_set_timeout($connection, 0);
+
+    // collect headers
+    do {
+      $result  = stream_get_line($connection, 1048576, "\r\n\r\n");
+    } while(!$result);
+    $headers = explode("\r\n", $result);
+
+    // find HTTP status
+    $httpstatus     = $this->_getHttpStatusFromHeaders($headers);
+    list($headers,) = $this->_parseApiHeaders($result);
+    $rate           = $this->_getRateLimitInfo($headers);
+
+    if ($httpstatus !== '200') {
+      $reply = [
+        'httpstatus' => $httpstatus,
+        'rate'       => $rate
+      ];
+      switch ($this->_return_format) {
+        case CODEBIRD_RETURNFORMAT_ARRAY:
+          return $reply;
+        case CODEBIRD_RETURNFORMAT_OBJECT:
+          return (object) $reply;
+        case CODEBIRD_RETURNFORMAT_JSON:
+          return json_encode($reply);
+      }
+    }
+
+    $signal_function = function_exists('pcntl_signal_dispatch');
+    $data            = '';
+    $last_message    = $this->_time();
+    $message_length  = 0;
+
+    while (!feof($connection)) {
+      // call signal handlers, if any
+      if ($signal_function) {
+        pcntl_signal_dispatch();
+      }
+      $connection_array = [$connection];
+      $write            = $except = null;
+      if (false === ($num_changed_streams = stream_select($connection_array, $write, $except, 0, 200000))) {
+        break;
+      } elseif ($num_changed_streams === 0) {
+        if ($this->_time() - $last_message >= 1) {
+          // deliver empty message, allow callback to cancel stream
+          $cancel_stream = $this->_deliverStreamingMessage(null);
+          if ($cancel_stream) {
+            break;
+          }
+          $last_message = $this->_time();
+        }
+        continue;
+      }
+      $chunk_length = fgets($connection, 10);
+      if ($chunk_length === '' || !$chunk_length = hexdec($chunk_length)) {
+        continue;
+      }
+
+      $chunk = '';
+      do {
+        $chunk .= fread($connection, $chunk_length);
+        $chunk_length -= strlen($chunk);
+      } while($chunk_length > 0);
+
+      if(0 === $message_length) {
+        $message_length = (int) strstr($chunk, "\r\n", true);
+        if ($message_length) {
+          $chunk = substr($chunk, strpos($chunk, "\r\n") + 2);
+        } else {
+          continue;
+        }
+
+        $data = $chunk;
+      } else {
+        $data .= $chunk;
+      }
+
+      if (strlen($data) < $message_length) {
+        continue;
+      }
+
+      $reply = $this->_parseApiReply($data);
+      switch ($this->_return_format) {
+        case CODEBIRD_RETURNFORMAT_ARRAY:
+          $reply['httpstatus'] = $httpstatus;
+          $reply['rate']       = $rate;
+          break;
+        case CODEBIRD_RETURNFORMAT_OBJECT:
+          $reply->httpstatus = $httpstatus;
+          $reply->rate       = $rate;
+          break;
+      }
+
+      $cancel_stream = $this->_deliverStreamingMessage($reply);
+      if ($cancel_stream) {
+        fclose($connection);
+        break;
+      }
+
+      $data           = '';
+      $message_length = 0;
+      $last_message   = $this->_time();
+    }
+
+    return;
+  }
+
+  /**
+   * Calls streaming callback with received message
+   *
+   * @param string|array|object message
+   *
+   * @return bool Whether to cancel streaming
+   */
+  protected function _deliverStreamingMessage($message)
+  {
+    return call_user_func($this->_streaming_callback, $message);
+  }
+
+  /**
+   * Parses the API reply to separate headers from the body
+   *
+   * @param string $reply The actual raw HTTP request reply
+   *
+   * @return array (headers, reply)
+   */
+  protected function _parseApiHeaders($reply) {
+    // split headers and body
+    $headers = [];
+    $reply = explode("\r\n\r\n", $reply, 4);
+
+    // check if using proxy
+    $proxy_tester = strtolower(substr($reply[0], 0, 35));
+    if ($proxy_tester === 'http/1.0 200 connection established'
+      || $proxy_tester === 'http/1.1 200 connection established'
+    ) {
+      array_shift($reply);
+    }
+
+    $headers_array = explode("\r\n", $reply[0]);
+    foreach ($headers_array as $header) {
+      $header_array = explode(': ', $header, 2);
+      $key = $header_array[0];
+      $value = '';
+      if (count($header_array) > 1) {
+        $value = $header_array[1];
+      }
+      $headers[$key] = $value;
+    }
+
+    if (count($reply) > 1) {
+      $reply = $reply[1];
+    } else {
+      $reply = '';
+    }
+
+    return [$headers, $reply];
+  }
+
+  /**
+   * Parses the API headers to return Location and Ton API headers
+   *
+   * @param array  $headers The headers list
+   * @param string $reply   The actual HTTP body
+   *
+   * @return string $reply
+   */
+  protected function _parseApiReplyPrefillHeaders($headers, $reply)
+  {
+    if ($reply === '' && (isset($headers['Location']) || isset($headers['location']))) {
+      $reply = [
+        'Location' => isset($headers['Location']) ? $headers['Location'] : $headers['location']
+      ];
+      if (isset($headers['X-TON-Min-Chunk-Size'])) {
+        $reply['X-TON-Min-Chunk-Size'] = $headers['X-TON-Min-Chunk-Size'];
+      }
+      if (isset($headers['X-TON-Max-Chunk-Size'])) {
+        $reply['X-TON-Max-Chunk-Size'] = $headers['X-TON-Max-Chunk-Size'];
+      }
+      if (isset($headers['Range'])) {
+        $reply['Range'] = $headers['Range'];
+      }
+      $reply = json_encode($reply);
+    }
+    return $reply;
+  }
+
+  /**
+   * Parses the API reply to encode it in the set return_format
+   *
+   * @param string $reply The actual HTTP body, JSON-encoded or URL-encoded
+   *
+   * @return array|string|object The parsed reply
+   */
+  protected function _parseApiReply($reply)
+  {
+    $need_array = $this->_return_format === CODEBIRD_RETURNFORMAT_ARRAY;
+    if ($reply === '[]') {
+      switch ($this->_return_format) {
+        case CODEBIRD_RETURNFORMAT_ARRAY:
+          return [];
+        case CODEBIRD_RETURNFORMAT_JSON:
+          return '{}';
+        case CODEBIRD_RETURNFORMAT_OBJECT:
+          return new \stdClass;
+      }
+    }
+    if (! $parsed = $this->_json_decode($reply, $need_array)) {
+      if ($reply) {
+        // assume query format
+        $reply = explode('&', $reply);
+        foreach ($reply as $element) {
+          if (stristr($element, '=')) {
+            list($key, $value) = explode('=', $element, 2);
+            $parsed[$key] = $value;
+          } else {
+            $parsed['message'] = $element;
+          }
+        }
+      }
+      $reply = json_encode($parsed);
+    }
+    switch ($this->_return_format) {
+      case CODEBIRD_RETURNFORMAT_ARRAY:
+        return $parsed;
+      case CODEBIRD_RETURNFORMAT_JSON:
+        return $reply;
+      case CODEBIRD_RETURNFORMAT_OBJECT:
+        return (object) $parsed;
+    }
+    return $parsed;
+  }
+
+}
+
+/**
+ * Catch errors when authtoken is expired
+ */
+class CodebirdAuthException extends \Exception {
+	
+}
+
+
+/**
+ * Catch error when credentials are not set correclty
+ */
+class CodebirdCredentialsException extends \Exception {
+	
+}
+
+/**
+ * Catch errors r elated to bad endpoi ts
+ */
+class CodebirdEndpointException extends \Exception {
+	
+}
+
+/*
+ * Catch errors relatedto media
+ */
+
+class CodebirdMediaException extends \Exception {
+	
+}
+
diff --git a/twitter/vendor/jublonet/codebird-php/test/README b/twitter/vendor/jublonet/codebird-php/test/README
new file mode 100644
index 00000000..fd344c4a
--- /dev/null
+++ b/twitter/vendor/jublonet/codebird-php/test/README
@@ -0,0 +1,16 @@
+The following methods are not covered by unit tests yet:
+
+_getMultipartRequestFromParams
+_checkForFiles
+_buildMultipart
+_buildBinaryBody
+
+_callApi
+_callApiCurl
+_callApiNoCurl
+_callApiPreparationsGet
+_callApiPreparationsPost
+_callApiPreparations
+
+_callApiStreaming
+_deliverStreamingMessage
diff --git a/twitter/vendor/jublonet/codebird-php/test/codebirdm.php b/twitter/vendor/jublonet/codebird-php/test/codebirdm.php
new file mode 100644
index 00000000..6cbae4a5
--- /dev/null
+++ b/twitter/vendor/jublonet/codebird-php/test/codebirdm.php
@@ -0,0 +1,204 @@
+<?php
+
+namespace Codebird;
+require_once ('test/codebirdt.php');
+
+/**
+ * A Twitter library in PHP.
+ *
+ * @package   codebird-test
+ * @author    Jublo Solutions <support@jublo.net>
+ * @copyright 2010-2016 Jublo Solutions <support@jublo.net>
+ * @license   https://opensource.org/licenses/GPL-3.0 GNU General Public License 3.0
+ * @link      https://github.com/jublonet/codebird-php
+ */
+
+/**
+ * Codebird testing class with mock data source
+ *
+ * @package codebird-test
+ */
+class CodebirdM extends CodebirdT
+{
+  /**
+   * Stores the request data
+   */
+  protected $_requests = [];
+
+  /**
+   * Mock API replies
+   */
+  protected static $_mock_replies = [
+    'default' => [
+      'httpstatus' => 404,
+      'reply' => "HTTP/1.1 404 Not Found\r\ncontent-length: 68\r\ncontent-type: application/json;charset=utf-8\r\ndate: Sun, 06 Dec 2015 14:43:28 GMT\r\nserver: tsa_b\r\nset-cookie: guest_id=v1%3A144941300885288055; Domain=.twitter.com; Path=/; Expires=Tue, 05-Dec-2017 14:43:28 UTC\r\nstrict-transport-security: max-age=631138519\r\nx-connection-hash: 12218aef9e9757609afb08e661fa3b9b\r\nx-response-time: 2\r\n\r\n{\"errors\":[{\"message\":\"Sorry, that page does not exist\",\"code\":34}]}"
+    ],
+    'proxy1' => [
+      'httpstatus' => 404,
+      'reply' => "HTTP/1.1 200 Connection Established\r\n\r\nHTTP/1.1 404 Not Found\r\ncontent-length: 68\r\ncontent-type: application/json;charset=utf-8\r\ndate: Sun, 06 Dec 2015 14:43:28 GMT\r\nserver: tsa_b\r\nset-cookie: guest_id=v1%3A144941300885288055; Domain=.twitter.com; Path=/; Expires=Tue, 05-Dec-2017 14:43:28 UTC\r\nstrict-transport-security: max-age=631138519\r\nx-connection-hash: 12218aef9e9757609afb08e661fa3b9b\r\nx-response-time: 2\r\n\r\n{\"errors\":[{\"message\":\"Sorry, that page does not exist\",\"code\":34}]}"
+    ],
+    'GET http://www.example.org/found.txt' => [
+      'httpstatus' => 200,
+      'reply' => "HTTP/1.1 200 OK\r\nContent-Length: 12\r\n\r\nA test file."
+    ],
+    'GET https://api.twitter.com/1.1/users/show.json?screen_name=TwitterAPI' => [
+      'httpstatus' => 200,
+      'reply' => "HTTP/1.1 200 OK\r\ncache-control: no-cache, no-store, must-revalidate, pre-check=0, post-check=0\r\ncontent-disposition: attachment; filename=json.json\r\ncontent-length: 2801\r\ncontent-type: application/json;charset=utf-8\r\ndate: Sun, 06 Dec 2015 14:55:46 GMT\r\nexpires: Tue, 31 Mar 1981 05:00:00 GMT\r\nlast-modified: Sun, 06 Dec 2015 14:55:46 GMT\r\npragma: no-cache\r\nserver: tsa_b\r\nset-cookie: lang=en-gb; Path=/\r\nset-cookie: guest_id=v1%3A144941374684866365; Domain=.twitter.com; Path=/; Expires=Tue, 05-Dec-2017 14:55:46 UTC\r\nstatus: 200 OK\r\nstrict-transport-security: max-age=631138519\r\nx-access-level: read-write-directmessages\r\nx-connection-hash: 1906b689730b92318bccf65b496f74d0\r\nx-content-type-options: nosniff\r\nx-frame-options: SAMEORIGIN\r\nx-rate-limit-limit: 181\r\nx-rate-limit-remaining: 177\r\nx-rate-limit-reset: 1449414513\r\nx-response-time: 44\r\nx-transaction: 663cc05c64857ba0\r\nx-twitter-response-tags: BouncerCompliant\r\nx-xss-protection: 1; mode=block\r\n\r\n{\"id\":6253282,\"id_str\":\"6253282\",\"name\":\"Twitter API\",\"screen_name\":\"twitterapi\",\"location\":\"San Francisco, CA\",\"profile_location\":null,\"description\":\"The Real Twitter API. I tweet about API changes, service issues and happily answer questions about Twitter and our API. Don't get an answer? It's on my website.\",\"url\":\"http:\/\/t.co\/78pYTvWfJd\",\"entities\":{\"url\":{\"urls\":[{\"url\":\"http:\/\/t.co\/78pYTvWfJd\",\"expanded_url\":\"http:\/\/dev.twitter.com\",\"display_url\":\"dev.twitter.com\",\"indices\":[0,22]}]},\"description\":{\"urls\":[]}},\"protected\":false,\"followers_count\":4993679,\"friends_count\":48,\"listed_count\":13001,\"created_at\":\"Wed May 23 06:01:13 +0000 2007\",\"favourites_count\":27,\"utc_offset\":-28800,\"time_zone\":\"Pacific Time (US & Canada)\",\"geo_enabled\":true,\"verified\":true,\"statuses_count\":3553,\"lang\":\"en\",\"status\":{\"created_at\":\"Tue Nov 24 08:56:07 +0000 2015\",\"id\":669077021138493440,\"id_str\":\"669077021138493440\",\"text\":\"Additional 64-bit entity ID migration coming in Feb 2016 https:\/\/t.co\/eQIGvw1rsJ\",\"source\":\"\u003ca href=\\\"https:\/\/about.twitter.com\/products\/tweetdeck\\\" rel=\\\"nofollow\\\"\u003eTweetDeck\u003c\/a\u003e\",\"truncated\":false,\"in_reply_to_status_id\":null,\"in_reply_to_status_id_str\":null,\"in_reply_to_user_id\":null,\"in_reply_to_user_id_str\":null,\"in_reply_to_screen_name\":null,\"geo\":null,\"coordinates\":null,\"place\":null,\"contributors\":null,\"retweet_count\":67,\"favorite_count\":79,\"entities\":{\"hashtags\":[],\"symbols\":[],\"user_mentions\":[],\"urls\":[{\"url\":\"https:\/\/t.co\/eQIGvw1rsJ\",\"expanded_url\":\"https:\/\/twittercommunity.com\/t\/migration-of-twitter-core-entities-to-64-bit-ids\/56881\",\"display_url\":\"twittercommunity.com\/t\/migration-of\u2026\",\"indices\":[57,80]}]},\"favorited\":false,\"retweeted\":false,\"possibly_sensitive\":false,\"lang\":\"en\"},\"contributors_enabled\":false,\"is_translator\":false,\"is_translation_enabled\":false,\"profile_background_color\":\"C0DEED\",\"profile_background_image_url\":\"http:\/\/pbs.twimg.com\/profile_background_images\/656927849\/miyt9dpjz77sc0w3d4vj.png\",\"profile_background_image_url_https\":\"https:\/\/pbs.twimg.com\/profile_background_images\/656927849\/miyt9dpjz77sc0w3d4vj.png\",\"profile_background_tile\":true,\"profile_image_url\":\"http:\/\/pbs.twimg.com\/profile_images\/2284174872\/7df3h38zabcvjylnyfe3_normal.png\",\"profile_image_url_https\":\"https:\/\/pbs.twimg.com\/profile_images\/2284174872\/7df3h38zabcvjylnyfe3_normal.png\",\"profile_banner_url\":\"https:\/\/pbs.twimg.com\/profile_banners\/6253282\/1431474710\",\"profile_link_color\":\"0084B4\",\"profile_sidebar_border_color\":\"C0DEED\",\"profile_sidebar_fill_color\":\"DDEEF6\",\"profile_text_color\":\"333333\",\"profile_use_background_image\":true,\"has_extended_profile\":false,\"default_profile\":false,\"default_profile_image\":false,\"following\":true,\"follow_request_sent\":false,\"notifications\":false}"
+    ],
+    'POST https://api.twitter.com/oauth2/token' => [
+      'httpstatus' => 200,
+      'reply' => "HTTP/1.1 200 OK\r\ncache-control: no-cache, no-store, must-revalidate, pre-check=0, post-check=0\r\ncontent-disposition: attachment; filename=json.json\r\ncontent-length: 52\r\ncontent-type: application/json;charset=utf-8\r\ndate: Sun, 06 Dec 2015 15:53:02 GMT\r\nexpires: Tue, 31 Mar 1981 05:00:00 GMT\r\nlast-modified: Sun, 06 Dec 2015 15:53:01 GMT\r\nml: S\r\npragma: no-cache\r\nserver: tsa_b\r\nset-cookie: guest_id=v1%3A144941718194388038; Domain=.twitter.com; Path=/; Expires=Tue, 05-Dec-2017 15:53:02 UTC\r\nstatus: 200 OK\r\nstrict-transport-security: max-age=631138519\r\nx-connection-hash: 97f4d4e6a33433b477510d8c58a0b026\r\nx-content-type-options: nosniff\r\nx-frame-options: DENY\r\nx-response-time: 87\r\nx-transaction: 6a0e5e8144d7e6df\r\nx-tsa-request-body-time: 164\r\nx-twitter-response-tags: BouncerCompliant\r\nx-ua-compatible: IE=edge,chrome=1\r\nx-xss-protection: 1; mode=block\r\n\r\n{\"token_type\":\"bearer\",\"access_token\":\"VqiO0n2HrKE\"}"
+    ]
+  ];
+
+  /**
+   * Gets a mock cURL handle
+   * @param string $url the URL for the curl initialization
+   * @return string connection ID
+   */
+  protected function _curl_init($url = null)
+  {
+    $request = [
+      'url' => $url,
+      CURLOPT_RETURNTRANSFER => false
+    ];
+    $id = mt_rand();
+    $this->_requests[$id] = $request;
+
+    return $id;
+  }
+
+  /**
+   * Sets mock cURL parameters
+   * @param string $id     connection ID
+   * @param int    $option cURL option to set
+   * @param mixed  $value  Value to set for the option
+   * @return bool
+   */
+  protected function _curl_setopt($id, $option, $value)
+  {
+    if (!isset($this->_requests[$id])) {
+      return false;
+    }
+
+    $this->_requests[$id][$option] = $value;
+
+    return true;
+  }
+
+  /**
+   * Executes mock cURL transfer
+   * @param string $id connection ID
+   * @return bool|string
+   */
+  protected function _curl_exec($id)
+  {
+    if (!isset($this->_requests[$id])) {
+      return false;
+    }
+
+    $request = $this->_requests[$id];
+    $url     = $this->_requests[$id]['url'];
+    $reply   = self::$_mock_replies['default'];
+
+    $httpmethod = 'GET';
+    if (isset($request[CURLOPT_POST]) && $request[CURLOPT_POST]) {
+      $httpmethod = 'POST';
+    }
+    if (isset($request[CURLOPT_CUSTOMREQUEST])) {
+      $httpmethod = $request[CURLOPT_CUSTOMREQUEST];
+    }
+
+    $index = $httpmethod . ' ' . $url;
+
+    if (isset(self::$_mock_replies[$index])) {
+      $reply = self::$_mock_replies[$index];
+    }
+
+    $this->_requests[$id][CURLINFO_HTTP_CODE] = $reply['httpstatus'];
+    $this->_requests[$id]['reply'] = $reply['reply'];
+
+    if (! $this->_requests[$id][CURLOPT_HEADER]
+      && stristr($reply['reply'], "\r\n\r\n")
+    ) {
+      $reply_parts = explode("\r\n\r\n", $reply['reply'], 2);
+      $reply['reply'] = $reply_parts[1];
+    }
+
+    if ($this->_requests[$id][CURLOPT_RETURNTRANSFER]) {
+      return $reply['reply'];
+    }
+
+    return true;
+  }
+
+  /**
+   * Gets cURL error
+   * @param string $id connection ID
+   * @return string
+   */
+  protected function _curl_error($id)
+  {
+    return '';
+  }
+
+  /**
+   * Gets cURL error
+   * @param string $id connection ID
+   * @return int
+   */
+  protected function _curl_errno($id)
+  {
+    return 0;
+  }
+
+  /**
+   * Gets info about cURL connection
+   * @param string $id  connection ID
+   * @param int    $opt option to get
+   * @return mixed
+   */
+  protected function _curl_getinfo($id, $opt = 0)
+  {
+    if (!isset($this->_requests[$id])) {
+      return false;
+    }
+
+    $request = $this->_requests[$id];
+
+    if (!$opt) {
+      return [
+        'url' => $request['url'],
+        'http_code' => $request[CURLINFO_HTTP_CODE]
+      ];
+    }
+
+    if (isset($request[$opt])) {
+      return $request[$opt];
+    }
+
+    return false;
+  }
+
+  /**
+   * Gets fake time
+   * @return int Timestamp
+   */
+  protected function _time()
+  {
+    return 1412345678;
+  }
+
+  /**
+   * Gets fake time
+   * @param bool $get_as_float
+   * @return int Timestamp
+   */
+  protected function _microtime($get_as_float = false)
+  {
+    if ($get_as_float) {
+      return 1412345678.777;
+    }
+    return '777 1412345678';
+  }
+}
diff --git a/twitter/vendor/jublonet/codebird-php/test/codebirdt.php b/twitter/vendor/jublonet/codebird-php/test/codebirdt.php
new file mode 100644
index 00000000..dd54dfc4
--- /dev/null
+++ b/twitter/vendor/jublonet/codebird-php/test/codebirdt.php
@@ -0,0 +1,97 @@
+<?php
+
+namespace Codebird;
+require_once ('src/codebird.php');
+
+/**
+ * A Twitter library in PHP.
+ *
+ * @package   codebird-test
+ * @author    Jublo Solutions <support@jublo.net>
+ * @copyright 2010-2016 Jublo Solutions <support@jublo.net>
+ * @license   https://opensource.org/licenses/GPL-3.0 GNU General Public License 3.0
+ * @link      https://github.com/jublonet/codebird-php
+ */
+
+/**
+ * Codebird testing class
+ *
+ * @package codebird-test
+ */
+class CodebirdT extends Codebird
+{
+  /**
+   * Returns properties
+   *
+   * @param string $property The property to get
+   *
+   * @return mixed Property
+   */
+  public function get($property)
+  {
+    if (property_exists($this, $property)) {
+      return $this->$property;
+    }
+    throw new \Exception('Property ' . $property . ' is not defined.');
+  }
+
+  /**
+   * Returns static properties
+   *
+   * @param string $property The property to get
+   *
+   * @return mixed Property
+   */
+  public function getStatic($property)
+  {
+    if (property_exists($this, $property)) {
+      return static::$$property;
+    }
+    throw new \Exception('Static property ' . $property . ' is not defined.');
+  }
+
+  /**
+   * Calls methods
+   *
+   * @param string $property The property to get
+   *
+   * @return mixed Property
+   */
+  public function call($method, $params = [], &$params2 = null)
+  {
+    $methods_byref = [
+      '_mapFnToApiMethod',
+      '_mapFnInlineParams',
+      '_detectMethod'
+    ];
+    if (in_array($method, $methods_byref)) {
+      return $this->$method($params, $params2);
+    }
+    if (method_exists($this, $method)) {
+      return call_user_func_array([$this, $method], $params);
+    }
+    throw new \Exception('Method ' . $method . ' is not defined.');
+  }
+
+  /**
+   * Calls methods
+   *
+   * @param string $property The property to get
+   *
+   * @return mixed Property
+   */
+  public function callStatic($method, $params = [])
+  {
+    if (function_exists([self, $method])) {
+      return call_user_func_array([self, $method], $params);
+    }
+    throw new \Exception('Static method ' . $method . ' is not defined.');
+  }
+
+  /**
+   * Streaming callback test
+   */
+  public static function streamingCallbackTest()
+  {
+  }
+}
diff --git a/twitter/vendor/jublonet/codebird-php/test/constant_tests.php b/twitter/vendor/jublonet/codebird-php/test/constant_tests.php
new file mode 100644
index 00000000..2017e1c6
--- /dev/null
+++ b/twitter/vendor/jublonet/codebird-php/test/constant_tests.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace Codebird;
+require_once ('test/codebirdt.php');
+
+/**
+ * A Twitter library in PHP.
+ *
+ * @package   codebird-test
+ * @author    Jublo Limited <support@jublo.net>
+ * @copyright 2010-2018 Jublo Limited <support@jublo.net>
+ * @license   https://opensource.org/licenses/GPL-3.0 GNU General Public License 3.0
+ * @link      https://github.com/jublonet/codebird-php
+ */
+
+/**
+ * Constant tests
+ *
+ * @package codebird-test
+ */
+class Constant_Test extends \PHPUnit\Framework\TestCase
+{
+  /**
+   * Tests if constants defined
+   */
+  public function testConstants()
+  {
+    $constants = [
+      'CODEBIRD_RETURNFORMAT_OBJECT',
+      'CODEBIRD_RETURNFORMAT_ARRAY',
+      'CODEBIRD_RETURNFORMAT_JSON'
+    ];
+    foreach ($constants as $constant) {
+      $this->assertTrue(
+        defined($constant),
+        $constant
+      );
+    }
+  }
+}
diff --git a/twitter/vendor/jublonet/codebird-php/test/curl_tests.php b/twitter/vendor/jublonet/codebird-php/test/curl_tests.php
new file mode 100644
index 00000000..3f49661b
--- /dev/null
+++ b/twitter/vendor/jublonet/codebird-php/test/curl_tests.php
@@ -0,0 +1,57 @@
+<?php
+
+namespace Codebird;
+require_once ('test/codebirdm.php');
+
+/**
+ * A Twitter library in PHP.
+ *
+ * @package   codebird-test
+ * @author    Jublo Limited <support@jublo.net>
+ * @copyright 2010-2018 Jublo Limited <support@jublo.net>
+ * @license   https://opensource.org/licenses/GPL-3.0 GNU General Public License 3.0
+ * @link      https://github.com/jublonet/codebird-php
+ */
+
+/**
+ * cURL tests
+ *
+ * @package codebird-test
+ */
+class Curl_Test extends \PHPUnit\Framework\TestCase
+{
+  /**
+   * Initialise Codebird class
+   *
+   * @return \Codebird\Codebird The Codebird class
+   */
+  protected function getCB()
+  {
+    $cb = new CodebirdM();
+
+    return $cb;
+  }
+
+  /**
+   * Tests _getCurlInitialization
+   */
+  public function testGetCurlInitialization()
+  {
+    $cb = $this->getCB();
+    $id = $cb->call('_getCurlInitialization', ['https://test']);
+    $this->assertEquals(
+      [
+        'url' => 'https://test',
+        CURLOPT_RETURNTRANSFER => 1,
+        CURLOPT_FOLLOWLOCATION => 0,
+        CURLOPT_HEADER => 1,
+        CURLOPT_SSL_VERIFYPEER => 1,
+        CURLOPT_SSL_VERIFYHOST => 2,
+        CURLOPT_CAINFO => substr(__DIR__, 0, -strlen(basename(__DIR__))) . 'src/cacert.pem',
+        CURLOPT_USERAGENT => 'codebird-php/' . $cb->getStatic('_version')
+          . ' +https://github.com/jublonet/codebird-php'
+      ],
+      $cb->get('_requests')[$id]
+    );
+  }
+}
diff --git a/twitter/vendor/jublonet/codebird-php/test/detection_tests.php b/twitter/vendor/jublonet/codebird-php/test/detection_tests.php
new file mode 100644
index 00000000..9114a2d7
--- /dev/null
+++ b/twitter/vendor/jublonet/codebird-php/test/detection_tests.php
@@ -0,0 +1,288 @@
+<?php
+
+namespace Codebird;
+require_once ('test/codebirdm.php');
+
+/**
+ * A Twitter library in PHP.
+ *
+ * @package   codebird-test
+ * @author    Jublo Limited <support@jublo.net>
+ * @copyright 2010-2018 Jublo Limited <support@jublo.net>
+ * @license   https://opensource.org/licenses/GPL-3.0 GNU General Public License 3.0
+ * @link      https://github.com/jublonet/codebird-php
+ */
+
+/**
+ * Detection tests
+ *
+ * @package codebird-test
+ */
+class Detection_Test extends \PHPUnit\Framework\TestCase
+{
+  /**
+   * Initialise Codebird class
+   *
+   * @return \Codebird\Codebird The Codebird class
+   */
+  protected function getCB()
+  {
+    $cb = new CodebirdM();
+
+    return $cb;
+  }
+
+  /**
+   * Tests _detectMethod
+   * @expectedException \Exception
+   * @expectedExceptionMessage Can't find HTTP method to use for "non-existent".
+   */
+  public function testDetectMethod1()
+  {
+    $cb = $this->getCB();
+    $params = [];
+    $cb->call('_detectMethod', 'non-existent', $params);
+  }
+
+  /**
+   * Tests _detectMethod
+   */
+  public function testDetectMethod2()
+  {
+    $cb = $this->getCB();
+
+    // forced httpmethod
+    $params = ['httpmethod' => 'DELETE'];
+    $this->assertEquals(
+      'DELETE',
+      $cb->call('_detectMethod', 'doesnt-matter', $params)
+    );
+
+    // normal detection
+    $params = [];
+    $post = ['httpmethod' => 'POST'];
+    $this->assertEquals('GET', $cb->call('_detectMethod', 'search/tweets', $params));
+    $this->assertEquals('POST', $cb->call('_detectMethod', 'statuses/update', $params));
+    $this->assertEquals('POST', $cb->call('_detectMethod', 'ads/sandbox/accounts', $post));
+    $this->assertEquals(
+      'PUT',
+      $cb->call(
+        '_detectMethod',
+        'ton/bucket/:bucket/:file?resumable=true&resumeId=:resumeId',
+        $params
+      )
+    );
+
+    // parameter-based detection
+    $this->assertEquals('GET', $cb->call('_detectMethod', 'account/settings', $params));
+    $params = ['test' => 12];
+    $this->assertEquals('POST', $cb->call('_detectMethod', 'account/settings', $params));
+
+    $params = [];
+    $this->assertEquals('POST', $cb->call('_detectMethod', 'media/upload', $params));
+    $params = ['command' => 'STATUS'];
+    $this->assertEquals('GET', $cb->call('_detectMethod', 'media/upload', $params));
+
+    $httpmethods_by_param = [
+      'POST' => [
+        'campaign_id' => [
+          'ads/accounts/:account_id/line_items',
+          'ads/sandbox/accounts/:account_id/line_items'
+        ],
+        'name' => [
+          'ads/accounts/:account_id/app_lists',
+          'ads/accounts/:account_id/campaigns',
+          'ads/accounts/:account_id/cards/app_download',
+          'ads/accounts/:account_id/cards/image_app_download',
+          'ads/accounts/:account_id/cards/image_conversation',
+          'ads/accounts/:account_id/cards/lead_gen',
+          'ads/accounts/:account_id/cards/video_app_download',
+          'ads/accounts/:account_id/cards/video_conversation',
+          'ads/accounts/:account_id/cards/website',
+          'ads/accounts/:account_id/tailored_audiences',
+          'ads/accounts/:account_id/web_event_tags',
+          'ads/sandbox/accounts/:account_id/app_lists',
+          'ads/sandbox/accounts/:account_id/campaigns',
+          'ads/sandbox/accounts/:account_id/cards/app_download',
+          'ads/sandbox/accounts/:account_id/cards/image_app_download',
+          'ads/sandbox/accounts/:account_id/cards/image_conversation',
+          'ads/sandbox/accounts/:account_id/cards/lead_gen',
+          'ads/sandbox/accounts/:account_id/cards/video_app_download',
+          'ads/sandbox/accounts/:account_id/cards/video_conversation',
+          'ads/sandbox/accounts/:account_id/cards/website',
+          'ads/sandbox/accounts/:account_id/tailored_audiences',
+          'ads/sandbox/accounts/:account_id/web_event_tags'
+        ],
+        'tailored_audience_id' => [
+          'ads/accounts/:account_id/tailored_audience_changes',
+          'ads/sandbox/accounts/:account_id/tailored_audience_changes'
+        ],
+        'targeting_value' => [
+          'ads/accounts/:account_id/targeting_criteria',
+          'ads/sandbox/accounts/:account_id/targeting_criteria'
+        ],
+        'tweet_ids' => [
+          'ads/accounts/:account_id/promoted_tweets',
+          'ads/sandbox/accounts/:account_id/promoted_tweets'
+        ],
+        'user_id' => [
+          'ads/accounts/:account_id/promoted_accounts',
+          'ads/sandbox/accounts/:account_id/promoted_accounts'
+        ],
+        'video_media_id' => [
+          'ads/accounts/:account_id/videos',
+          'ads/sandbox/accounts/:account_id/videos'
+        ]
+      ],
+      'PUT' => [
+        'name' => [
+          'ads/accounts/:account_id/cards/image_conversation/:card_id',
+          'ads/accounts/:account_id/cards/video_conversation/:card_id',
+          'ads/accounts/:account_id/cards/website/:card_id',
+          'ads/sandbox/accounts/:account_id/cards/image_conversation/:card_id',
+          'ads/sandbox/accounts/:account_id/cards/video_conversation/:card_id',
+          'ads/sandbox/accounts/:account_id/cards/website/:card_id'
+        ]
+      ]
+    ];
+    foreach ($httpmethods_by_param as $httpmethod => $methods_by_param) {
+      foreach ($methods_by_param as $param => $methods) {
+        foreach ($methods as $method) {
+          $params = [];
+          $this->assertEquals(
+            'GET',
+            $cb->call('_detectMethod', $method, $params),
+            $method
+          );
+          $params[$param] = '123';
+          $this->assertEquals(
+            $httpmethod,
+            $cb->call('_detectMethod', $method, $params),
+            $method
+          );
+        }
+      }
+    }
+  }
+
+  /**
+   * Tests _detectMultipart
+   */
+  public function testDetectMultipart()
+  {
+    $cb = $this->getCB();
+    $this->assertFalse($cb->call('_detectMultipart', ['statuses/update']));
+    $this->assertTrue($cb->call('_detectMultipart', ['media/upload']));
+  }
+
+  /**
+   * Tests _detectMedia
+   */
+  public function testDetectMedia()
+  {
+    $cb = $this->getCB();
+    $this->assertFalse($cb->call('_detectMedia', ['statuses/update']));
+    $this->assertTrue($cb->call('_detectMedia', ['media/upload']));
+  }
+
+  /**
+   * Tests _detectJsonBody
+   */
+  public function testDetectJsonBody()
+  {
+    $cb = $this->getCB();
+    $this->assertFalse($cb->call('_detectJsonBody', ['statuses/update']));
+    $this->assertTrue($cb->call('_detectJsonBody', ['collections/entries/curate']));
+    $this->assertTrue($cb->call('_detectJsonBody', ['ads/batch/accounts/:account_id/targeting_criteria']));
+  }
+
+  /**
+   * Tests _detectBinaryBody
+   */
+  public function testDetectBinaryBody()
+  {
+    $cb = $this->getCB();
+    $this->assertFalse($cb->call('_detectBinaryBody', ['statuses/update']));
+    $this->assertTrue($cb->call('_detectBinaryBody', ['ton/bucket/:bucket']));
+    $this->assertTrue($cb->call('_detectBinaryBody', ['ton/bucket/:bucket?resumable=true']));
+    $this->assertTrue($cb->call(
+      '_detectBinaryBody',
+      ['ton/bucket/:bucket/:file?resumable=true&resumeId=:resumeId']
+    ));
+  }
+
+  /**
+   * Tests _detectStreaming
+   */
+  public function testDetectStreaming()
+  {
+    $cb = $this->getCB();
+    $this->assertFalse($cb->call('_detectStreaming', ['statuses/update']));
+    $this->assertEquals('public', $cb->call('_detectStreaming', ['statuses/sample']));
+    $this->assertEquals('public', $cb->call('_detectStreaming', ['statuses/filter']));
+  }
+
+  /**
+   * Tests _getEndpoint
+   */
+  public function testGetEndpoint()
+  {
+    $cb = $this->getCB();
+    $this->assertEquals(
+      'https://api.twitter.com/1.1/statuses/update.json',
+      $cb->call('_getEndpoint', ['statuses/update', 'statuses/update']),
+      'statuses/update'
+    );
+    $this->assertEquals(
+      'https://api.twitter.com/oauth/authenticate',
+      $cb->call('_getEndpoint', ['oauth/authenticate', 'oauth/authenticate']),
+      'oauth/authenticate'
+    );
+    $this->assertEquals(
+      'https://api.twitter.com/oauth2/token',
+      $cb->call('_getEndpoint', ['oauth2/token', 'oauth2/token']),
+      'oauth2/token'
+    );
+    $this->assertEquals(
+      'https://upload.twitter.com/1.1/media/upload.json',
+      $cb->call('_getEndpoint', ['media/upload', 'media/upload']),
+      'media/upload'
+    );
+    $this->assertEquals(
+      'https://upload.twitter.com/1.1/media/metadata/create.json',
+      $cb->call('_getEndpoint', ['media/metadata/create', 'media/metadata/create']),
+      'media/metadata/create'
+    );
+    $this->assertEquals(
+      'https://publish.twitter.com/oembed',
+      $cb->call('_getEndpoint', ['statuses/oembed', 'statuses/oembed']),
+      'statuses/oembed'
+    );
+    $this->assertEquals(
+      'https://stream.twitter.com/1.1/statuses/filter.json',
+      $cb->call('_getEndpoint', ['statuses/filter', 'statuses/filter']),
+      'statuses/filter'
+    );
+    $this->assertEquals(
+      'https://ton.twitter.com/1.1/ton/bucket/ta_partner',
+      $cb->call('_getEndpoint', ['ton/bucket/ta_partner', 'ton/bucket/:bucket']),
+      'ton/bucket/:bucket'
+    );
+    $this->assertEquals(
+      'https://ads-api.twitter.com/2/accounts/1234/campaigns',
+      $cb->call(
+        '_getEndpoint',
+        ['ads/accounts/1234/campaigns', 'ads/accounts/:account_id/campaigns']
+      ),
+      'ads/accounts/:account_id/campaigns'
+    );
+    $this->assertEquals(
+      'https://ads-api-sandbox.twitter.com/2/accounts/1234/campaigns',
+      $cb->call(
+        '_getEndpoint',
+        ['ads/sandbox/accounts/1234/campaigns', 'ads/sandbox/accounts/:account_id/campaigns']
+      ),
+      'ads/sandbox/accounts/:account_id/campaigns'
+    );
+  }
+}
diff --git a/twitter/vendor/jublonet/codebird-php/test/environment_test.php b/twitter/vendor/jublonet/codebird-php/test/environment_test.php
new file mode 100644
index 00000000..b5d6d043
--- /dev/null
+++ b/twitter/vendor/jublonet/codebird-php/test/environment_test.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace Codebird;
+
+/**
+ * A Twitter library in PHP.
+ *
+ * @package   codebird-test
+ * @author    Jublo Limited <support@jublo.net>
+ * @copyright 2010-2018 Jublo Limited <support@jublo.net>
+ * @license   https://opensource.org/licenses/GPL-3.0 GNU General Public License 3.0
+ * @link      https://github.com/jublonet/codebird-php
+ */
+
+/**
+ * Environment tests
+ *
+ * @package codebird-test
+ */
+class Environment_Test extends \PHPUnit\Framework\TestCase
+{
+  /**
+   * Tests PHP version
+   */
+  public function testPhpVersion()
+  {
+    $this->assertTrue(
+      version_compare('7.1', phpversion(), '<='),
+      'Codebird requires PHP 7.1 or above'
+    );
+  }
+
+  /**
+   * Tests OpenSSL module availability
+   */
+  public function testOpenssl()
+  {
+    $this->assertTrue(function_exists('openssl_open'));
+  }
+}
diff --git a/twitter/vendor/jublonet/codebird-php/test/media_tests.php b/twitter/vendor/jublonet/codebird-php/test/media_tests.php
new file mode 100644
index 00000000..f4ab9261
--- /dev/null
+++ b/twitter/vendor/jublonet/codebird-php/test/media_tests.php
@@ -0,0 +1,56 @@
+<?php
+
+namespace Codebird;
+require_once ('test/codebirdm.php');
+
+/**
+ * A Twitter library in PHP.
+ *
+ * @package   codebird-test
+ * @author    Jublo Limited <support@jublo.net>
+ * @copyright 2010-2018 Jublo Limited <support@jublo.net>
+ * @license   https://opensource.org/licenses/GPL-3.0 GNU General Public License 3.0
+ * @link      https://github.com/jublonet/codebird-php
+ */
+
+/**
+ * Media tests
+ *
+ * @package codebird-test
+ */
+class Media_Test extends \PHPUnit\Framework\TestCase
+{
+  /**
+   * Initialise Codebird class
+   *
+   * @return \Codebird\Codebird The Codebird class
+   */
+  protected function getCB()
+  {
+    Codebird::setConsumerKey('123', '456');
+    $cb = new CodebirdM();
+
+    return $cb;
+  }
+
+  /**
+   * Tests _fetchRemoteFile
+   */
+  public function testFetchRemoteFile()
+  {
+    $cb = $this->getCB();
+    $expected = $cb->call('_fetchRemoteFile', ['http://www.example.org/found.txt']);
+    $this->assertEquals($expected, 'A test file.');
+  }
+
+  /**
+   * Tests _fetchRemoteFile
+    * @expectedException \Exception
+    * @expectedExceptionMessage Downloading a remote media file failed.
+   */
+  public function testFetchRemoteFile1()
+  {
+    $cb = $this->getCB();
+    $reply = $cb->call('_fetchRemoteFile', ['http://www.example.org/not-found.jpg']);
+  }
+}
diff --git a/twitter/vendor/jublonet/codebird-php/test/oauth_tests.php b/twitter/vendor/jublonet/codebird-php/test/oauth_tests.php
new file mode 100644
index 00000000..086dfa2e
--- /dev/null
+++ b/twitter/vendor/jublonet/codebird-php/test/oauth_tests.php
@@ -0,0 +1,130 @@
+<?php
+
+namespace Codebird;
+require_once ('test/codebirdm.php');
+
+/**
+ * A Twitter library in PHP.
+ *
+ * @package   codebird-test
+ * @author    Jublo Limited <support@jublo.net>
+ * @copyright 2010-2018 Jublo Limited <support@jublo.net>
+ * @license   https://opensource.org/licenses/GPL-3.0 GNU General Public License 3.0
+ * @link      https://github.com/jublonet/codebird-php
+ */
+
+/**
+ * OAuth tests
+ *
+ * @package codebird-test
+ */
+class Oauth_Test extends \PHPUnit\Framework\TestCase
+{
+  /**
+   * Initialise Codebird class
+   *
+   * @return \Codebird\Codebird The Codebird class
+   */
+  protected function getCB()
+  {
+    Codebird::setConsumerKey('123', '456');
+    $cb = new CodebirdM();
+
+    return $cb;
+  }
+
+  /**
+   * Tests oauth_authenticate
+   */
+  public function testOauthAuthenticate()
+  {
+    $cb = $this->getCB();
+    $cb->setToken('123', '456');
+    $this->assertEquals(
+      'https://api.twitter.com/oauth/authenticate?oauth_token=123',
+      $cb->oauth_authenticate()
+    );
+    $this->assertEquals(
+      'https://api.twitter.com/oauth/authenticate?oauth_token=123&force_login=1',
+      $cb->oauth_authenticate($force_login = true)
+    );
+    $this->assertEquals(
+      'https://api.twitter.com/oauth/authenticate?'
+      . 'oauth_token=123&force_login=1&screen_name=TwitterAPI',
+      $cb->oauth_authenticate($force_login = true, $screen_name = 'TwitterAPI')
+    );
+    $this->assertEquals(
+      'https://api.twitter.com/oauth/authenticate?'
+      . 'oauth_token=123&screen_name=TwitterAPI',
+      $cb->oauth_authenticate($force_login = false, $screen_name = 'TwitterAPI')
+    );
+  }
+
+  /**
+   * Tests oauth_authorize
+   */
+  public function testOauthAuthorize()
+  {
+    $cb = $this->getCB();
+    $cb->setToken('123', '456');
+    $this->assertEquals(
+      'https://api.twitter.com/oauth/authorize?oauth_token=123',
+      $cb->oauth_authorize()
+    );
+    $this->assertEquals(
+      'https://api.twitter.com/oauth/authorize?oauth_token=123&force_login=1',
+      $cb->oauth_authorize($force_login = true)
+    );
+    $this->assertEquals(
+      'https://api.twitter.com/oauth/authorize?'
+      . 'oauth_token=123&force_login=1&screen_name=TwitterAPI',
+      $cb->oauth_authorize($force_login = true, $screen_name = 'TwitterAPI')
+    );
+    $this->assertEquals(
+      'https://api.twitter.com/oauth/authorize?'
+      . 'oauth_token=123&screen_name=TwitterAPI',
+      $cb->oauth_authorize($force_login = false, $screen_name = 'TwitterAPI')
+    );
+  }
+
+  /**
+   * Tests oauth2_token
+   */
+  public function testOauth2Token()
+  {
+    $cb = $this->getCB();
+    $expected = new \stdClass;
+    $expected->token_type = 'bearer';
+    $expected->access_token = 'VqiO0n2HrKE';
+    $expected->httpstatus = '200';
+    $expected->rate = null;
+    $this->assertEquals($expected, $cb->oauth2_token());
+  }
+
+  /**
+   * Tests _getBearerAuthorization
+    * @expectedException \Exception
+    * @expectedExceptionMessage To make an app-only auth API request, consumer key or bearer token must be set.
+   */
+  public function testGetBearerAuthorization1()
+  {
+    $cb = $this->getCB();
+    Codebird::setConsumerKey(null, null);
+    $cb->setBearerToken(null);
+    $cb->call('_getBearerAuthorization', []);
+  }
+
+  /**
+   * Tests _getBearerAuthorization
+   */
+  public function testGetBearerAuthorization2()
+  {
+    $cb = $this->getCB();
+    $cb->setBearerToken('12345678');
+    $this->assertEquals('Bearer 12345678', $cb->call('_getBearerAuthorization', []));
+
+    // automatic fetching
+    $cb->setBearerToken(null);
+    $this->assertEquals('Bearer VqiO0n2HrKE', $cb->call('_getBearerAuthorization', []));
+  }
+}
diff --git a/twitter/vendor/jublonet/codebird-php/test/replyparse_tests.php b/twitter/vendor/jublonet/codebird-php/test/replyparse_tests.php
new file mode 100644
index 00000000..f316cd16
--- /dev/null
+++ b/twitter/vendor/jublonet/codebird-php/test/replyparse_tests.php
@@ -0,0 +1,361 @@
+<?php
+
+namespace Codebird;
+require_once ('test/codebirdm.php');
+
+/**
+ * A Twitter library in PHP.
+ *
+ * @package   codebird-test
+ * @author    Jublo Limited <support@jublo.net>
+ * @copyright 2010-2018 Jublo Limited <support@jublo.net>
+ * @license   https://opensource.org/licenses/GPL-3.0 GNU General Public License 3.0
+ * @link      https://github.com/jublonet/codebird-php
+ */
+
+/**
+ * Reply parsing tests
+ *
+ * @package codebird-test
+ */
+class Replyparse_Test extends \PHPUnit\Framework\TestCase
+{
+  /**
+   * Initialise Codebird class
+   *
+   * @return \Codebird\Codebird The Codebird class
+   */
+  protected function getCB()
+  {
+    Codebird::setConsumerKey('123', '456');
+    $cb = new CodebirdM();
+
+    return $cb;
+  }
+
+  /**
+   * Tests _getHttpStatusFromHeaders
+   */
+  public function testGetHttpStatusFromHeaders()
+  {
+    $cb = $this->getCB();
+    $this->assertEquals(
+      '500',
+      $cb->call('_getHttpStatusFromHeaders', [['']])
+    );
+    $this->assertEquals(
+      '200',
+      $cb->call('_getHttpStatusFromHeaders', [
+        ['HTTP/1.1 200 OK'],
+        ['X-Some-Data: test']
+      ])
+    );
+    $this->assertEquals(
+      '404',
+      $cb->call('_getHttpStatusFromHeaders', [
+        ['HTTP/1.1 404 Not Found'],
+        ['X-Some-Data: test']
+      ])
+    );
+  }
+
+  /**
+   * Tests _parseBearerReply
+   */
+  public function testParseBearerReply()
+  {
+    $cb = $this->getCB();
+    $cb->setBearerToken(null);
+    // get raw reply from mock collection
+    $reply = $cb->getStatic('_mock_replies')['POST https://api.twitter.com/oauth2/token'];
+    // check that bearer token is not yet set
+    $this->assertNull($cb->getStatic('_bearer_token'));
+    // parse it as object
+    $result = $cb->call(
+      '_parseBearerReply',
+      [
+        $reply['reply'],
+        $reply['httpstatus']
+      ]
+    );
+    $expected = new \stdClass;
+    $expected->token_type = 'bearer';
+    $expected->access_token = 'VqiO0n2HrKE';
+    $expected->httpstatus = 200;
+    $expected->rate = null;
+    $this->assertEquals($expected, $result);
+    // check that bearer token was actually set
+    $this->assertNotNull($cb->getStatic('_bearer_token'));
+
+    // array
+    $cb->setReturnFormat(CODEBIRD_RETURNFORMAT_ARRAY);
+    $cb->setBearerToken(null);
+    $result = $cb->call(
+      '_parseBearerReply',
+      [
+        $reply['reply'],
+        $reply['httpstatus']
+      ]
+    );
+    $expected = [
+      'token_type'   => 'bearer',
+      'access_token' => 'VqiO0n2HrKE',
+      'httpstatus'   => 200,
+      'rate'         => null
+    ];
+    $this->assertEquals($expected, $result);
+    // check that bearer token was actually set
+    $this->assertNotNull($cb->getStatic('_bearer_token'));
+
+    // JSON
+    $cb->setReturnFormat(CODEBIRD_RETURNFORMAT_JSON);
+    $cb->setBearerToken(null);
+    $result = $cb->call(
+      '_parseBearerReply',
+      [
+        $reply['reply'],
+        $reply['httpstatus']
+      ]
+    );
+    $expected = '{"token_type":"bearer","access_token":"VqiO0n2HrKE"}';
+    $this->assertEquals($expected, $result);
+    // check that bearer token was actually set
+    $this->assertNotNull($cb->getStatic('_bearer_token'));
+  }
+
+  /**
+   * Tests _getRateLimitInfo
+   */
+  public function testGetRateLimitInfo()
+  {
+    $cb = $this->getCB();
+    $headers = [
+      'content-length' => 68,
+      'content-type'   => 'application/json;charset=utf-8',
+      'date'           => 'Sun, 06 Dec 2015 14:43:28 GMT'
+    ];
+    $this->assertNull($cb->call('_getRateLimitInfo', [$headers]));
+
+    // set rate-limit headers
+    $headers['x-rate-limit-limit'] = 180;
+    $headers['x-rate-limit-remaining'] = 123;
+    $headers['x-rate-limit-reset'] = time() + 234;
+    $rate = $cb->call('_getRateLimitInfo', [$headers]);
+    $expected = new \stdClass;
+    $expected->limit = $headers['x-rate-limit-limit'];
+    $expected->remaining = $headers['x-rate-limit-remaining'];
+    $expected->reset = $headers['x-rate-limit-reset'];
+    $this->assertEquals($expected, $rate);
+
+    // array
+    $cb->setReturnFormat(CODEBIRD_RETURNFORMAT_ARRAY);
+    $rate = $cb->call('_getRateLimitInfo', [$headers]);
+    $expected = [
+      'limit'     => $headers['x-rate-limit-limit'],
+      'remaining' => $headers['x-rate-limit-remaining'],
+      'reset'     => $headers['x-rate-limit-reset']
+    ];
+    $this->assertEquals($expected, $rate);
+  }
+
+  /**
+   * Tests _validateSslCertificate
+   */
+  public function testValidateSslCertificate1()
+  {
+    $cb = $this->getCB();
+    $cb->call('_validateSslCertificate', [0]);
+  }
+
+  /**
+   * Tests _validateSslCertificate
+   * @expectedException \Exception
+   * @expectedExceptionMessage Error 58 while validating the Twitter API certificate.
+   */
+  public function testValidateSslCertificate2()
+  {
+    $cb = $this->getCB();
+    $cb->call('_validateSslCertificate', [CURLE_SSL_CERTPROBLEM]);
+  }
+
+  /**
+   * Tests _appendHttpStatusAndRate
+   */
+  public function testAppendHttpStatusAndRate()
+  {
+    $cb = $this->getCB();
+
+    // object
+    $reply = new \stdClass;
+    $reply->somedata = 123;
+    $reply->moredata = '456';
+    $rate = new \stdClass;
+    $rate->field1 = 180;
+    $rate->field2 = 177;
+    $expected = new \stdClass;
+    $expected->somedata = 123;
+    $expected->moredata = '456';
+    $expected->httpstatus = 409;
+    $expected->rate = new \stdClass;
+    $expected->rate->field1 = 180;
+    $expected->rate->field2 = 177;
+    $this->assertEquals(
+      $expected,
+      $cb->call('_appendHttpStatusAndRate', [$reply, 409, $rate])
+    );
+
+    // array
+    $reply            = (array) $reply;
+    $rate             = (array) $rate;
+    $expected         = (array) $expected;
+    $expected['rate'] = (array) $expected['rate'];
+    $cb->setReturnFormat(CODEBIRD_RETURNFORMAT_ARRAY);
+    $this->assertEquals(
+      $expected,
+      $cb->call('_appendHttpStatusAndRate', [$reply, 409, $rate])
+    );
+
+    // JSON
+    $reply    = '{"somedata":123,"moredata":"456"}';
+    $expected = '{"somedata":123,"moredata":"456","httpstatus":409,'
+      . '"rate":{"field1":180,"field2":177}}';
+    $cb->setReturnFormat(CODEBIRD_RETURNFORMAT_JSON);
+    $this->assertEquals(
+      $expected,
+      $cb->call('_appendHttpStatusAndRate', [$reply, 409, $rate])
+    );
+  }
+
+  /**
+   * Tests _parseApiHeaders
+   */
+  public function testParseApiHeaders()
+  {
+    $cb   = $this->getCB();
+    $data = $cb->getStatic('_mock_replies')['default']['reply'];
+    list($headers, $reply) = $cb->call('_parseApiHeaders', [$data]);
+    $expected_headers = [
+      'HTTP/1.1 404 Not Found' => '',
+      'content-length' => '68',
+      'content-type' => 'application/json;charset=utf-8',
+      'date' => 'Sun, 06 Dec 2015 14:43:28 GMT',
+      'server' => 'tsa_b',
+      'set-cookie' => 'guest_id=v1%3A144941300885288055; Domain=.twitter.com'
+        . '; Path=/; Expires=Tue, 05-Dec-2017 14:43:28 UTC',
+      'strict-transport-security' => 'max-age=631138519',
+      'x-connection-hash' => '12218aef9e9757609afb08e661fa3b9b',
+      'x-response-time' => '2'
+    ];
+    $expected_reply = '{"errors":[{"message":"Sorry, that page does not exist","code":34}]}';
+    $this->assertEquals($expected_headers, $headers);
+    $this->assertEquals($expected_reply, $reply);
+
+    // proxy
+    $data = $cb->getStatic('_mock_replies')['proxy1']['reply'];
+    list($headers, $reply) = $cb->call('_parseApiHeaders', [$data]);
+    $this->assertEquals($expected_headers, $headers);
+    $this->assertEquals($expected_reply, $reply);
+  }
+
+  /**
+   * Tests _parseApiReplyPrefillHeaders
+   */
+  public function testParseApiReplyPrefillHeaders()
+  {
+    $cb = $this->getCB();
+    $headers = [
+      'X-TON-Min-Chunk-Size' => '12345',
+      'X-TON-Max-Chunk-Size' => '23456',
+      'Range'                => 'bytes 0-1234567/2345678'
+    ];
+
+    // non-empty reply: no touching
+    $this->assertEquals(
+      '123',
+      $cb->call('_parseApiReplyPrefillHeaders', [$headers, '123'])
+    );
+
+    // no location header: no touching
+    $this->assertEquals(
+      '',
+      $cb->call('_parseApiReplyPrefillHeaders', [$headers, ''])
+    );
+
+    $headers['Location'] = 'https://twitter.com';
+    $this->assertEquals(
+      '{"Location":"https:\/\/twitter.com","X-TON-Min-Chunk-Size":"12345",'
+      . '"X-TON-Max-Chunk-Size":"23456","Range":"bytes 0-1234567\/2345678"}',
+      $cb->call('_parseApiReplyPrefillHeaders', [$headers, ''])
+    );
+  }
+
+  /**
+   * Tests _parseApiReply
+   */
+  public function testParseApiReply1()
+  {
+    $cb = $this->getCB();
+
+    // object
+    $this->assertEquals(new \stdClass, $cb->call('_parseApiReply', ['[]']));
+
+    // array
+    $cb->setReturnFormat(CODEBIRD_RETURNFORMAT_ARRAY);
+    $this->assertEquals([], $cb->call('_parseApiReply', ['[]']));
+
+    // JSON
+    $cb->setReturnFormat(CODEBIRD_RETURNFORMAT_JSON);
+    $this->assertEquals('{}', $cb->call('_parseApiReply', ['[]']));
+  }
+
+  /**
+   * Tests _parseApiReply
+   */
+  public function testParseApiReply2()
+  {
+    $cb = $this->getCB();
+    $reply = '{"id_str":"6253282","profile_location":null,'
+      . '"status":{"created_at":"Tue Nov 24 08:56:07 +0000 2015","id":669077021138493440}}';
+
+    // object
+    $expected = new \stdClass;
+    $expected->id_str = '6253282';
+    $expected->profile_location = null;
+    $expected->status = new \stdClass;
+    $expected->status->created_at = 'Tue Nov 24 08:56:07 +0000 2015';
+    $expected->status->id = 669077021138493440;
+    $result = $cb->call('_parseApiReply', [$reply]);
+    $this->assertEquals($expected, $result);
+    $this->assertSame($expected->status->id, $result->status->id);
+
+    // array
+    $cb->setReturnFormat(CODEBIRD_RETURNFORMAT_ARRAY);
+    $expected = (array) $expected;
+    $expected['status'] = (array) $expected['status'];
+    $this->assertEquals($expected, $cb->call('_parseApiReply', [$reply]));
+
+    // JSON
+    $cb->setReturnFormat(CODEBIRD_RETURNFORMAT_JSON);
+    $this->assertEquals($reply, $cb->call('_parseApiReply', [$reply]));
+
+    // query-string format
+    $cb->setReturnFormat(CODEBIRD_RETURNFORMAT_ARRAY);
+    $this->assertEquals(
+      [
+        'oauth_token' => 'ABC',
+        'oauth_token_secret' => 'def',
+        'oauth_callback_confirmed' => 'true'
+      ],
+      $cb->call(
+        '_parseApiReply',
+        ['oauth_token=ABC&oauth_token_secret=def&oauth_callback_confirmed=true']
+      )
+    );
+
+    // message
+    $this->assertEquals(
+      ['message' => 'This is just a message.'],
+      $cb->call('_parseApiReply', ['This is just a message.'])
+    );
+  }
+}
diff --git a/twitter/vendor/jublonet/codebird-php/test/requestparse_tests.php b/twitter/vendor/jublonet/codebird-php/test/requestparse_tests.php
new file mode 100644
index 00000000..1656f3d2
--- /dev/null
+++ b/twitter/vendor/jublonet/codebird-php/test/requestparse_tests.php
@@ -0,0 +1,212 @@
+<?php
+
+namespace Codebird;
+require_once ('test/codebirdm.php');
+
+/**
+ * A Twitter library in PHP.
+ *
+ * @package   codebird-test
+ * @author    Jublo Limited <support@jublo.net>
+ * @copyright 2010-2018 Jublo Limited <support@jublo.net>
+ * @license   https://opensource.org/licenses/GPL-3.0 GNU General Public License 3.0
+ * @link      https://github.com/jublonet/codebird-php
+ */
+
+/**
+ * Request parsing tests
+ *
+ * @package codebird-test
+ */
+class Requestparse_Test extends \PHPUnit\Framework\TestCase
+{
+  /**
+   * Initialise Codebird class
+   *
+   * @return \Codebird\Codebird The Codebird class
+   */
+  protected function getCB()
+  {
+    Codebird::setConsumerKey('123', '456');
+    $cb = new CodebirdM();
+    $cb->setToken('234', '567');
+
+    return $cb;
+  }
+
+  /**
+   * Tests _parseApiParams
+   */
+  public function testParseApiParams()
+  {
+    $cb = $this->getCB();
+    // empty list
+    $this->assertEquals([], $cb->call('_parseApiParams', [[]]));
+    // arrays
+    $this->assertEquals(['test' => 1], $cb->call('_parseApiParams', [[['test' => 1]]]));
+    $this->assertEquals(
+      ['media[]' => '123'],
+      $cb->call('_parseApiParams', [[['media[]' => 123]]])
+    );
+    // urlencoded strings
+    $this->assertEquals(['testdata' => ''], $cb->call('_parseApiParams', [['testdata']]));
+    $this->assertEquals(
+      ['param1' => '12', 'param2' => 'ab'],
+      $cb->call('_parseApiParams', [['param1=12&param2=ab']])
+    );
+    $this->assertEquals(
+      ['media' => ['123', '456']],
+      $cb->call('_parseApiParams', [['media[]=123&media[]=456']])
+    );
+  }
+
+  /**
+   * Tests _stringifyNullBoolParams
+   */
+  public function testStringifyNullBoolParams()
+  {
+    $cb = $this->getCB();
+    $result = $cb->call(
+        '_stringifyNullBoolParams',
+        [['a' => 123, 'b' => null, 'c' => true, 'd' => false, 'e' => 'x']]
+      );
+    $this->assertEquals('123', $result['a']);
+    $this->assertNull($result['b']);
+    $this->assertEquals('true', $result['c']);
+    $this->assertEquals('false', $result['d']);
+  }
+
+  /**
+   * Tests _mapFnToApiMethod
+   */
+  public function testMapFnToApiMethod()
+  {
+    $cb = $this->getCB();
+    $apiparams = [
+      'test' => 1,
+      'account_id' => '1234'
+    ];
+    $result = $cb->call(
+        '_mapFnToApiMethod',
+        'ads_accounts_ACCOUNT_ID_cards_appDownload',
+        $apiparams
+      );
+    $this->assertEquals([
+      'ads/accounts/1234/cards/app_download',
+      'ads/accounts/:account_id/cards/app_download'
+    ], $result);
+    // check that inline parameter was removed from array
+    $this->assertArrayNotHasKey('account_id', $apiparams);
+  }
+
+  /**
+   * Tests _mapFnInsertSlashes
+   */
+  public function testMapFnInsertSlashes()
+  {
+    $cb = $this->getCB();
+    $result = $cb->call(
+        '_mapFnInsertSlashes',
+        ['ads_accounts_ACCOUNT_ID_cards_appDownload']
+      );
+    $this->assertEquals(
+      'ads/accounts/ACCOUNT/ID/cards/appDownload',
+      $result
+    );
+  }
+
+  /**
+   * Tests _mapFnRestoreParamUnderscores
+   */
+  public function testMapFnRestoreParamUnderscores()
+  {
+    $cb = $this->getCB();
+    $params_underscore = [
+      'screen_name', 'place_id',
+      'account_id', 'campaign_id', 'card_id', 'line_item_id',
+      'tweet_id', 'web_event_tag_id'
+    ];
+    $params_slash = [];
+    foreach ($params_underscore as $param) {
+      $params_slash[] = str_replace('_', '/', $param);
+    }
+    for ($i = 0; $i < count($params_underscore); $i++) {
+      $result = $cb->call(
+          '_mapFnRestoreParamUnderscores',
+          ['ads/accounts/' . strtoupper($params_slash[$i]) . '/cards/appDownload']
+        );
+      $this->assertEquals(
+        'ads/accounts/' . strtoupper($params_underscore[$i]) . '/cards/appDownload',
+        $result
+      );
+    }
+  }
+
+  /**
+   * Tests _mapFnInlineParams
+   */
+  public function testMapFnInlineParams()
+  {
+    $cb = $this->getCB();
+    // normal parameters
+    $apiparams = [
+      'test' => 1,
+      'account_id' => '1234'
+    ];
+    $result = $cb->call(
+        '_mapFnInlineParams',
+        'ads/accounts/ACCOUNT_ID/cards/app_download',
+        $apiparams
+      );
+    $this->assertEquals([
+        'ads/accounts/1234/cards/app_download',
+        'ads/accounts/:account_id/cards/app_download'
+      ],
+      $result
+    );
+    // check that inline parameter was removed from array
+    $this->assertArrayNotHasKey('account_id', $apiparams);
+
+    // special parameters (TON API)
+    $apiparams = [
+      'test'     => 1,
+      'bucket'   => 'ta_partner',
+      'file'     => 'test_Ab.mp4',
+      'resumeId' => '56789'
+    ];
+    $result = $cb->call(
+        '_mapFnInlineParams',
+        'ton/bucket/BUCKET/FILE?resumable=true&resumeId=RESUMEID',
+        $apiparams
+      );
+    $this->assertEquals([
+        'ton/bucket/ta_partner/test_Ab.mp4?resumable=true&resumeId=56789',
+        'ton/bucket/:bucket/:file?resumable=true&resumeId=:resumeId'
+      ],
+      $result
+    );
+    $this->assertArrayNotHasKey('bucket', $apiparams);
+    $this->assertArrayNotHasKey('file', $apiparams);
+    $this->assertArrayNotHasKey('resumeId', $apiparams);
+    $this->assertEquals(['test' => 1], $apiparams);
+  }
+
+  /**
+   * Tests _json_decode
+   */
+  public function testJsonDecode()
+  {
+    $json  = '{"id": 123456789123456789, "id_str": "123456789123456789"}';
+    $array = [
+      'id' => 123456789123456789,
+      'id_str' => '123456789123456789'
+    ];
+    $object = (object) $array;
+
+    $cb = $this->getCB();
+    $result = $cb->call('_json_decode', [$json]);
+    $this->assertEquals($object, $result);
+    $result = $cb->call('_json_decode', [$json, true]);
+    $this->assertEquals($array, $result);
+  }
+}
diff --git a/twitter/vendor/jublonet/codebird-php/test/returnformat_tests.php b/twitter/vendor/jublonet/codebird-php/test/returnformat_tests.php
new file mode 100644
index 00000000..321c2ee3
--- /dev/null
+++ b/twitter/vendor/jublonet/codebird-php/test/returnformat_tests.php
@@ -0,0 +1,70 @@
+<?php
+
+namespace Codebird;
+require_once ('test/codebirdm.php');
+
+/**
+ * A Twitter library in PHP.
+ *
+ * @package   codebird-test
+ * @author    Jublo Limited <support@jublo.net>
+ * @copyright 2010-2018 Jublo Limited <support@jublo.net>
+ * @license   https://opensource.org/licenses/GPL-3.0 GNU General Public License 3.0
+ * @link      https://github.com/jublonet/codebird-php
+ */
+
+/**
+ * Return format tests
+ *
+ * @package codebird-test
+ */
+class Returnformat_Test extends \PHPUnit\Framework\TestCase
+{
+  /**
+   * Initialise Codebird class
+   *
+   * @return \Codebird\Codebird The Codebird class
+   */
+  protected function getCB()
+  {
+    Codebird::setConsumerKey('123', '456');
+    $cb = new CodebirdM();
+    $cb->setToken('234', '567');
+
+    return $cb;
+  }
+
+  /**
+   * Tests array return format
+   */
+  public function testArrayFormat()
+  {
+    $cb = $this->getCB();
+    $cb->setReturnFormat(CODEBIRD_RETURNFORMAT_ARRAY);
+    $reply = $cb->users_show(['screen_name' => 'TwitterAPI']);
+    $this->assertTrue(is_array($reply));
+  }
+
+  /**
+   * Tests object return format
+   */
+  public function testObjectFormat()
+  {
+    $cb = $this->getCB();
+    $cb->setReturnFormat(CODEBIRD_RETURNFORMAT_OBJECT);
+    $reply = $cb->users_show(['screen_name' => 'TwitterAPI']);
+    $this->assertInstanceOf('stdClass', $reply);
+  }
+
+  /**
+   * Tests JSON return format
+   */
+  public function testJsonFormat()
+  {
+    $cb = $this->getCB();
+    $cb->setReturnFormat(CODEBIRD_RETURNFORMAT_JSON);
+    $reply = $cb->users_show(['screen_name' => 'TwitterAPI']);
+    $data = json_decode($reply);
+    $this->assertNotFalse($data);
+  }
+}
diff --git a/twitter/vendor/jublonet/codebird-php/test/setter_tests.php b/twitter/vendor/jublonet/codebird-php/test/setter_tests.php
new file mode 100644
index 00000000..4c2cd094
--- /dev/null
+++ b/twitter/vendor/jublonet/codebird-php/test/setter_tests.php
@@ -0,0 +1,253 @@
+<?php
+
+namespace Codebird;
+require_once ('test/codebirdt.php');
+
+/**
+ * A Twitter library in PHP.
+ *
+ * @package   codebird-test
+ * @author    Jublo Limited <support@jublo.net>
+ * @copyright 2010-2018 Jublo Limited <support@jublo.net>
+ * @license   https://opensource.org/licenses/GPL-3.0 GNU General Public License 3.0
+ * @link      https://github.com/jublonet/codebird-php
+ */
+
+/**
+ * Setter function tests
+ *
+ * @package codebird-test
+ */
+class Setter_Test extends \PHPUnit\Framework\TestCase
+{
+  /**
+   * Tests setConsumerKey
+   */
+  public function testSetConsumerKey()
+  {
+    $cb = new CodebirdT();
+    $cb->setConsumerKey('123', '456');
+    $this->assertEquals('123', $cb->getStatic('_consumer_key'));
+    $this->assertEquals('456', $cb->getStatic('_consumer_secret'));
+  }
+
+  /**
+   * Tests setBearerToken
+   */
+  public function testSetBearerToken()
+  {
+    $cb = new CodebirdT();
+    $cb->setBearerToken('789');
+    $this->assertEquals('789', $cb->getStatic('_bearer_token'));
+  }
+
+  /**
+   * Tests getVersion
+   */
+  public function testGetVersion()
+  {
+    $cb = new CodebirdT();
+    $version = $cb->getVersion();
+    $this->assertEquals($version, $cb->getStatic('_version'));
+    $this->assertRegexp('/^[1-9]\d*\.\d+\.\d+(-([a-z]+\.[1-9]\d*|dev))?$/', $version);
+  }
+
+  /**
+   * Tests setToken
+   */
+  public function testSetToken()
+  {
+    $cb = new CodebirdT();
+    $cb->setToken('123', '456');
+    $this->assertEquals('123', $cb->get('_oauth_token'));
+    $this->assertEquals('456', $cb->get('_oauth_token_secret'));
+  }
+
+  /**
+   * Tests logout
+   */
+  public function testLogout()
+  {
+    $cb = new CodebirdT();
+    $cb->setToken('123', '456');
+    $cb->logout();
+    $this->assertNull($cb->get('_oauth_token'));
+    $this->assertNull($cb->get('_oauth_token_secret'));
+  }
+
+  /**
+   * Tests setUseCurl
+   */
+  public function testSetUseCurl()
+  {
+    $cb = new CodebirdT();
+    $cb->setUseCurl(true);
+    $this->assertTrue($cb->get('_use_curl'));
+    $cb->setUseCurl(false);
+    $this->assertFalse($cb->get('_use_curl'));
+    $cb->setUseCurl('123');
+    $this->assertTrue($cb->get('_use_curl'));
+  }
+
+  /**
+   * Tests setTimeout
+   */
+  public function testSetTimeout()
+  {
+    $cb = new CodebirdT();
+    $cb->setTimeout(123);
+    $this->assertEquals(123, $cb->get('_timeouts')['request']);
+    $cb->setTimeout(0);
+    $this->assertEquals(0, $cb->get('_timeouts')['request']);
+    $cb->setTimeout(-123);
+    $this->assertEquals(0, $cb->get('_timeouts')['request']);
+  }
+
+  /**
+   * Tests setConnectionTimeout
+   */
+  public function testSetConnectionTimeout()
+  {
+    $cb = new CodebirdT();
+    $cb->setConnectionTimeout(123);
+    $this->assertEquals(123, $cb->get('_timeouts')['connect']);
+    $cb->setConnectionTimeout(0);
+    $this->assertEquals(0, $cb->get('_timeouts')['connect']);
+    $cb->setConnectionTimeout(-123);
+    $this->assertEquals(0, $cb->get('_timeouts')['connect']);
+  }
+
+  /**
+   * Tests setConnectionTimeout
+   */
+  public function testSetRemoteDownloadTimeout()
+  {
+    $cb = new CodebirdT();
+    $cb->setRemoteDownloadTimeout(123);
+    $this->assertEquals(123, $cb->get('_timeouts')['remote']);
+    $cb->setRemoteDownloadTimeout(0);
+    $this->assertEquals(0, $cb->get('_timeouts')['remote']);
+    $cb->setRemoteDownloadTimeout(-123);
+    $this->assertEquals(0, $cb->get('_timeouts')['remote']);
+  }
+
+  /**
+   * Tests setReturnFormat
+   */
+  public function testSetReturnFormat()
+  {
+    $cb = new CodebirdT();
+    $cb->setReturnFormat(CODEBIRD_RETURNFORMAT_JSON);
+    $this->assertEquals($cb->get('_return_format'), CODEBIRD_RETURNFORMAT_JSON);
+  }
+
+  /**
+   * Tests setProxy
+   */
+  public function testSetProxy()
+  {
+    $cb = new CodebirdT();
+    $cb->setProxy('127.0.0.1', '8888');
+    $this->assertEquals('127.0.0.1', $cb->get('_proxy')['host']);
+    $this->assertEquals('8888', $cb->get('_proxy')['port']);
+    $this->assertEquals(CURLPROXY_HTTP, $cb->get('_proxy')['type']);
+
+    $cb->setProxy('127.0.0.1', '8888', CURLPROXY_SOCKS5);
+    $this->assertEquals('127.0.0.1', $cb->get('_proxy')['host']);
+    $this->assertEquals('8888', $cb->get('_proxy')['port']);
+    $this->assertEquals(CURLPROXY_SOCKS5, $cb->get('_proxy')['type']);
+  }
+
+  /**
+   * Tests setProxy
+    * @expectedException \Exception
+    * @expectedExceptionMessage Invalid proxy type specified.
+   */
+  public function testSetProxy2()
+  {
+    $cb = new CodebirdT();
+    $cb->setProxy('127.0.0.1', '8888', 1);
+  }
+
+  /**
+   * Tests setProxyAuthentication
+   */
+  public function testSetProxyAuthentication()
+  {
+    $cb = new CodebirdT();
+    $cb->setProxyAuthentication('ABCDEF');
+    $this->assertEquals('ABCDEF', $cb->get('_proxy')['authentication']);
+  }
+
+  /**
+   * Tests setStreamingCallback
+   */
+  public function testSetStreamingCallback1()
+  {
+    $callback = ['\Codebird\CodebirdT', 'streamingCallbackTest'];
+    $cb = new CodebirdT();
+    $cb->setStreamingCallback($callback);
+    $this->assertSame(
+      array_diff($callback, $cb->get('_streaming_callback')),
+      array_diff($cb->get('_streaming_callback'), $callback)
+    );
+  }
+
+  /**
+    * Tests setStreamingCallback
+    * @expectedException \Exception
+    * @expectedExceptionMessage This is not a proper callback.
+    */
+  public function testSetStreamingCallback2()
+  {
+    $cb = new CodebirdT();
+    $cb->setStreamingCallback(['\Codebird\CodebirdTX', 'somewhere']);
+  }
+
+  /**
+    * Tests getApiMethods
+    */
+  public function testGetApiMethods()
+  {
+    $cb = new CodebirdT();
+    $methods = $cb->getApiMethods();
+    $this->assertArrayHasKey('GET', $cb->getStatic('_api_methods'));
+    $this->assertArrayHasKey('POST', $cb->getStatic('_api_methods'));
+    $this->assertArrayHasKey('PUT', $cb->getStatic('_api_methods'));
+    $this->assertArrayHasKey('DELETE', $cb->getStatic('_api_methods'));
+    $this->assertEquals($methods, $cb->getStatic('_api_methods'));
+  }
+
+  /**
+    * Tests hasProxy
+    */
+  public function testHasProxy()
+  {
+    $cb = new CodebirdT();
+    $this->assertFalse($cb->call('_hasProxy'));
+    $cb->setProxy('127.0.0.1', '8888');
+    $this->assertTrue($cb->call('_hasProxy'));
+  }
+
+  /**
+    * Tests getProxyHost
+    */
+  public function testGetProxyHost()
+  {
+    $cb = new CodebirdT();
+    $this->assertNull($cb->call('_getProxyHost'));
+    $cb->setProxy('127.0.0.1', '8888');
+    $this->assertEquals('127.0.0.1', $cb->call('_getProxyHost'));
+  }
+
+  /**
+    * Tests getProxyPort
+    */
+  public function testGetProxyPort()
+  {
+    $cb = new CodebirdT();
+    $this->assertNull($cb->call('_getProxyPort'));
+    $cb->setProxy('127.0.0.1', '8888');
+    $this->assertEquals('8888', $cb->call('_getProxyPort'));
+  }
+}
diff --git a/twitter/vendor/jublonet/codebird-php/test/signing_tests.php b/twitter/vendor/jublonet/codebird-php/test/signing_tests.php
new file mode 100644
index 00000000..3a4f5fb3
--- /dev/null
+++ b/twitter/vendor/jublonet/codebird-php/test/signing_tests.php
@@ -0,0 +1,166 @@
+<?php
+
+namespace Codebird;
+require_once ('test/codebirdm.php');
+
+/**
+ * A Twitter library in PHP.
+ *
+ * @package   codebird-test
+ * @author    Jublo Limited <support@jublo.net>
+ * @copyright 2010-2018 Jublo Limited <support@jublo.net>
+ * @license   https://opensource.org/licenses/GPL-3.0 GNU General Public License 3.0
+ * @link      https://github.com/jublonet/codebird-php
+ */
+
+/**
+ * OAuth signing tests
+ *
+ * @package codebird-test
+ */
+class Signing_Test extends \PHPUnit\Framework\TestCase
+{
+  /**
+   * Initialise Codebird class
+   *
+   * @return \Codebird\Codebird The Codebird class
+   */
+  protected function getCB()
+  {
+    Codebird::setConsumerKey('123', '456');
+    $cb = new CodebirdM();
+
+    return $cb;
+  }
+
+  /**
+   * Tests _url
+   */
+  public function testUrl()
+  {
+    $cb = $this->getCB();
+    // string
+    $this->assertEquals(
+      'q%20%2B%20b%21%22%C2%A7%24%25%26%2F%28%29%3D%3F%23%2A13%2C3%C3%A4.',
+      $cb->call('_url', ['q + b!"§$%&/()=?#*13,3ä.'])
+    );
+    // array
+    $this->assertEquals(
+      [
+        'q%20%2B%20b%21%22%C2%A7%24%25%26%2F%28%29%3D%3F%23%2A13%2C3%C3%A4.',
+        'test123'
+      ],
+      $cb->call('_url', [[
+        'q + b!"§$%&/()=?#*13,3ä.',
+        'test123'
+      ]])
+    );
+  }
+
+  /**
+   * Tests _sha1
+   */
+  public function testSha1()
+  {
+    $cb = $this->getCB();
+    $this->assertEquals(
+      'ydAlpYjrGHU7psDQ9HPgHTcwEuw=',
+      $cb->call('_sha1', ['q + b!"§$%&/()=?#*13,3ä.'])
+    );
+
+    // with access token secret
+    $cb->setToken('678', '789');
+    $this->assertEquals(
+      'CtivZhAHiX49ZMUuHXtKabLAuo0=',
+      $cb->call('_sha1', ['q + b!"§$%&/()=?#*13,3ä.'])
+    );
+  }
+
+  /**
+   * Tests _nonce
+   */
+  public function testNonce1()
+  {
+    $cb = $this->getCB();
+    // default length
+    $this->assertEquals(
+      '4247c524',
+      $cb->call('_nonce', [])
+    );
+    // custom length
+    $this->assertEquals(
+      '4247c5248da',
+      $cb->call('_nonce', [11])
+    );
+  }
+
+  /**
+   * Tests _nonce
+   * @expectedException \Exception
+   * @expectedExceptionMessage Invalid nonce length.
+   */
+  public function testNonce2()
+  {
+    $cb = $this->getCB();
+    // invalid length
+    $cb->call('_nonce', [0]);
+  }
+
+  /**
+   * Tests _getSignature
+   */
+  public function testGetSignature()
+  {
+    $cb = $this->getCB();
+    $base_params = [
+      'oauth_consumer_key' => '123',
+      'oauth_nonce' => '12345678',
+      'oauth_signature_method' => 'HMAC-SHA1',
+      'oauth_timestamp' => '1400000000',
+      'oauth_token' => '567',
+      'oauth_version' => '1.0',
+      'q' => 'Test search.'
+    ];
+    $this->assertEquals(
+      'ZON/m9bHvciPdtyK9BlokjeiW4M=',
+      $cb->call('_getSignature', ['GET', 'search/tweets', $base_params])
+    );
+  }
+
+  /**
+   * Tests _sign
+   * @expectedException \Exception
+   * @expectedExceptionMessage To generate a signature, the consumer key must be set.
+   */
+  public function testSign1()
+  {
+    $cb = $this->getCB();
+    $cb->setConsumerKey(null, null);
+    $params = ['q' => 'Test search.'];
+    $cb->call('_sign', ['GET', 'search/tweets', $params]);
+  }
+
+  /**
+   * Tests _sign
+   */
+  public function testSign2()
+  {
+    $cb = $this->getCB();
+    $params = ['q' => 'Test search.'];
+    $this->assertEquals(
+      'OAuth oauth_consumer_key="123", oauth_nonce="4247c524", oauth_signature'
+      . '="lOLNd5l6cGB9kWACxWLNKJwSD%2FI%3D", oauth_signature_method="HMAC-SHA'
+      . '1", oauth_timestamp="1412345678", oauth_version="1.0"',
+      $cb->call('_sign', ['GET', 'search/tweets', $params])
+    );
+
+    // with oauth token
+    $cb->setToken('678', '789');
+    $this->assertEquals(
+      'OAuth oauth_consumer_key="123", oauth_nonce="4247c524", oauth_signature'
+      . '="XzegzFKEqs2PpUMym5T%2BwhEmTz4%3D", oauth_signature_method="HMAC-SHA'
+      . '1", oauth_timestamp="1412345678", oauth_token="678", oauth_version="1.0"',
+      $cb->call('_sign', ['GET', 'search/tweets', $params])
+    );
+  }
+}
diff --git a/twitter/vendor/jublonet/codebird-php/test/singleton_tests.php b/twitter/vendor/jublonet/codebird-php/test/singleton_tests.php
new file mode 100644
index 00000000..b47da416
--- /dev/null
+++ b/twitter/vendor/jublonet/codebird-php/test/singleton_tests.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace Codebird;
+require_once ('test/codebirdt.php');
+
+/**
+ * A Twitter library in PHP.
+ *
+ * @package   codebird-test
+ * @author    Jublo Limited <support@jublo.net>
+ * @copyright 2010-2018 Jublo Limited <support@jublo.net>
+ * @license   https://opensource.org/licenses/GPL-3.0 GNU General Public License 3.0
+ * @link      https://github.com/jublonet/codebird-php
+ */
+
+/**
+ * Singleton tests
+ *
+ * @package codebird-test
+ */
+class Singleton_Test extends \PHPUnit\Framework\TestCase
+{
+  /**
+   * Tests getInstance
+   */
+  public function testGetInstance()
+  {
+    $cb = CodebirdT::getInstance();
+    $this->assertInstanceOf('\Codebird\Codebird', $cb);
+  }
+}
diff --git a/unicode_smilies/unicode_smilies.php b/unicode_smilies/unicode_smilies.php
index 3bd30644..f212dc75 100644
--- a/unicode_smilies/unicode_smilies.php
+++ b/unicode_smilies/unicode_smilies.php
@@ -1,13 +1,10 @@
 <?php
 /*
  * Name: Unicode Smilies
- * Description: Smilies based on the unicode emojis - On Linux use https://github.com/eosrei/emojione-color-font to see them in color and http://www.unicode.org/emoji/charts/full-emoji-list.html
- * Version: 1.1.2
+ * Description: Smilies based on the unicode emojis - On Linux use https://github.com/eosrei/emojione-color-font to see them in color
+ * Version: 1.0
  * Author: Michael Vogel <http://pirati.ca/profile/heluecht>
- * Author: Matthias Ebers <https://loma.ml/profile/one>
  */
-
-use Friendica\App;
 use Friendica\Content\Smilies;
 use Friendica\Core\Hook;
 
@@ -15,8 +12,11 @@ function unicode_smilies_install() {
 	Hook::register('smilie', 'addon/unicode_smilies/unicode_smilies.php', 'unicode_smilies_smilies');
 }
 
-function unicode_smilies_smilies(array &$b)
-{
+function unicode_smilies_uninstall() {
+	Hook::unregister('smilie', 'addon/unicode_smilies/unicode_smilies.php', 'unicode_smilies_smilies');
+}
+
+function unicode_smilies_smilies(&$a,&$b) {
 	Smilies::add($b, ':-)', '&#x1F600;');
 	Smilies::add($b, ':)', '&#x1F600;');
 	Smilies::add($b, ':-(', '&#x1F641;');
@@ -25,18 +25,12 @@ function unicode_smilies_smilies(array &$b)
 	Smilies::add($b, ':-D', '&#x1F601;');
 	Smilies::add($b, ':D', '&#x1F601;');
 	Smilies::add($b, ';-)', '&#x1F609;');
-	// Smilies::add($b, ';)', '&#x1F609;');  // Deactivated since this leads to disturbed html entities
+	// Smilies::add($b, ';)', '&#x1F609;'); // Deactivated since this leads to disturbed html entities
 	Smilies::add($b, ':-P', '&#x1F61B;');
 	Smilies::add($b, ':-p', '&#x1F61B;');
-	Smilies::add($b, ':P', '&#x1F61B;');
-	Smilies::add($b, ':p', '&#x1F61B;');
 	Smilies::add($b, ':-O', '&#x1F62E;');
-	Smilies::add($b, ':-o', '&#x1F62E;');
-	Smilies::add($b, ':O', '&#x1F62E;');
 	Smilies::add($b, ':-X', '&#x1F910;');
 	Smilies::add($b, ':-x', '&#x1F910;');
-	Smilies::add($b, ':X', '&#x1F910;');
-	Smilies::add($b, ':x', '&#x1F910;');
 	Smilies::add($b, '8-)', '&#x1F60E;');
 	Smilies::add($b, ':-/', '&#x1F615;');
 	Smilies::add($b, ':-"', '&#x1F48F;');
@@ -47,1816 +41,220 @@ function unicode_smilies_smilies(array &$b)
 	Smilies::add($b, '&lt;\\3', '&#x1F494;');
 	Smilies::add($b, '8-|', '&#x1F632;');
 	Smilies::add($b, '8-O', '&#x1F632;');
+	Smilies::add($b, '\\o/', '&#x1F44D;');
 	Smilies::add($b, ":'(", '&#x1F622;');
+	Smilies::add($b, ':coffee', '&#x2615;');
+	Smilies::add($b, ':beer', '&#x1F37A;');
+	Smilies::add($b, ':homebrew', '&#x1F37A;');
+	Smilies::add($b, ':like', '&#x1F44D;');
+	Smilies::add($b, ':dislike', '&#x1F44E;');
 //	Smilies::add($b, 'o.O', '&#x;');
 //	Smilies::add($b, 'O.o', '&#x;');
 //	Smilies::add($b, 'o_O', '&#x;');
 //	Smilies::add($b, 'O_o', '&#x;');
-
-// face-smiling
-	Smilies::add($b, ':grinning face:', '&#x1F600');
-	Smilies::add($b, ':grinning face with big eyes:', '&#x1F603');
-	Smilies::add($b, ':grinning face with smiling eyes:', '&#x1F604');
-	Smilies::add($b, ':beaming face with smiling eyes:', '&#x1F601');
-	Smilies::add($b, ':grinning squinting face:', '&#x1F606');
-	Smilies::add($b, ':laughing:', '&#x1F606');
-	Smilies::add($b, ':grinning face with sweat:', '&#x1F605');
-	Smilies::add($b, ':rolling on the floor laughing:', '&#x1F923');
-	Smilies::add($b, ':rofl:', '&#x1F923;');
-	Smilies::add($b, ':face with tears of joy:', '&#x1F602');
-	Smilies::add($b, ':tearsofjoy:', '&#x1F602;');
-	Smilies::add($b, ':slightly smiling face:', '&#x1F642');
-	Smilies::add($b, ':upside-down face:', '&#x1F643');
-	Smilies::add($b, ':winking face:', '&#x1F609');
-	Smilies::add($b, ':smiling face with smiling eyes:', '&#x1F60A');
-	Smilies::add($b, ':smiling face with halo:', '&#x1F607');
-
-// face-affection
-	Smilies::add($b, ':smiling face with hearts:', '&#x1F970');
-	Smilies::add($b, ':smiling face with heart-eyes:', '&#x1F60D');
-	Smilies::add($b, ':star-struck:', '&#x1F929');
-	Smilies::add($b, ':face blowing a kiss:', '&#x1F618');
-	Smilies::add($b, ':kissing face:', '&#x1F617');
-	Smilies::add($b, ':smiling face:', '&#x263A');
-	Smilies::add($b, ':kissing face with closed eyes:', '&#x1F61A');
-	Smilies::add($b, ':kissing face with smiling eyes:', '&#x1F619');
-
-// face-tongue
-	Smilies::add($b, ':face savoring food:', '&#x1F60B');
-	Smilies::add($b, ':face with tongue:', '&#x1F61B');
-	Smilies::add($b, ':winking face with tongue:', '&#x1F61C');
-	Smilies::add($b, ':zany face:', '&#x1F92A');
-	Smilies::add($b, ':squinting face with tongue:', '&#x1F61D');
-	Smilies::add($b, ':money-mouth face:', '&#x1F911');
-
-// face-hand
-	Smilies::add($b, ':hugging face:', '&#x1F917');
-	Smilies::add($b, ':face with hand over mouth:', '&#x1F92D');
-	Smilies::add($b, ':shushing face:', '&#x1F92B');
-	Smilies::add($b, ':thinking face:', '&#x1F914');
-
-// face-neutral-skeptical
-	Smilies::add($b, ':zipper-mouth face:', '&#x1F910');
-	Smilies::add($b, ':face with raised eyebrow:', '&#x1F928');
-	Smilies::add($b, ':neutral face:', '&#x1F610');
-	Smilies::add($b, ':expressionless face:', '&#x1F611');
-	Smilies::add($b, ':face without mouth:', '&#x1F636');
-	Smilies::add($b, ':smirking face:', '&#x1F60F');
-	Smilies::add($b, ':unamused face:', '&#x1F612');
-	Smilies::add($b, ':face with rolling eyes:', '&#x1F644');
-	Smilies::add($b, ':grimacing face:', '&#x1F62C');
-	Smilies::add($b, ':lying face:', '&#x1F925');
-
-// face-sleepy
-	Smilies::add($b, ':relieved face:', '&#x1F60C');
-	Smilies::add($b, ':pensive face:', '&#x1F614');
-	Smilies::add($b, ':sleepy face:', '&#x1F62A');
-	Smilies::add($b, ':drooling face:', '&#x1F924');
-	Smilies::add($b, ':drool:', '&#x1F924;');
-	Smilies::add($b, ':sleeping face:', '&#x1F634');
-
-// face-unwell
-	Smilies::add($b, ':face with medical mask:', '&#x1F637');
-	Smilies::add($b, ':face with thermometer:', '&#x1F912');
-	Smilies::add($b, ':face with head-bandage:', '&#x1F915');
-	Smilies::add($b, ':nauseated face:', '&#x1F922');
-	Smilies::add($b, ':face vomiting:', '&#x1F92E');
-	Smilies::add($b, ':vomit:', '&#x1F92E;');
-	Smilies::add($b, ':sneezing face:', '&#x1F927');
-	Smilies::add($b, ':hot face:', '&#x1F975');
-	Smilies::add($b, ':cold face:', '&#x1F976');
-	Smilies::add($b, ':woozy face:', '&#x1F974');
-	Smilies::add($b, ':dizzy face:', '&#x1F635');
-	Smilies::add($b, ':dead:', '&#x1F635;');
-	Smilies::add($b, ':exploding head:', '&#x1F92F');
-
-// face-hat
-	Smilies::add($b, ':cowboy hat face:', '&#x1F920');
-	Smilies::add($b, ':partying face:', '&#x1F973');
-
-// face-glasses
-	Smilies::add($b, ':smiling face with sunglasses:', '&#x1F60E');
-	Smilies::add($b, ':nerd face:', '&#x1F913');
-	Smilies::add($b, ':face with monocle:', '&#x1F9D0');
-
-// face-concerned
-	Smilies::add($b, ':confused face:', '&#x1F615');
-	Smilies::add($b, ':worried face:', '&#x1F61F');
-	Smilies::add($b, ':slightly frowning face:', '&#x1F641');
-	Smilies::add($b, ':frowning face:', '&#x2639');
-	Smilies::add($b, ':face with open mouth:', '&#x1F62E');
-	Smilies::add($b, ':hushed face:', '&#x1F62F');
-	Smilies::add($b, ':astonished face:', '&#x1F632');
-	Smilies::add($b, ':flushed face:', '&#x1F633');
-	Smilies::add($b, ':dazed:', '&#x1F633;');
-	Smilies::add($b, ':pleading face:', '&#x1F97A');
-	Smilies::add($b, ':frowning face with open mouth:', '&#x1F626');
-	Smilies::add($b, ':anguished face:', '&#x1F627');
-	Smilies::add($b, ':fearful face:', '&#x1F628');
-	Smilies::add($b, ':anxious face with sweat:', '&#x1F630');
-	Smilies::add($b, ':sad but relieved face:', '&#x1F625');
-	Smilies::add($b, ':crying face:', '&#x1F622');
-	Smilies::add($b, ':loudly crying face:', '&#x1F62D');
-	Smilies::add($b, ':face screaming in fear:', '&#x1F631');
-	Smilies::add($b, ':confounded face:', '&#x1F616');
-	Smilies::add($b, ':persevering face:', '&#x1F623');
-	Smilies::add($b, ':disappointed face:', '&#x1F61E');
-
-// face-negative
-	Smilies::add($b, ':face with steam from nose:', '&#x1F624');
-	Smilies::add($b, ':pouting face:', '&#x1F621');
-	Smilies::add($b, ':angry face:', '&#x1F620');
-	Smilies::add($b, ':face with symbols on mouth:', '&#x1F92C');
-	Smilies::add($b, ':smiling face with horns:', '&#x1F608');
-	Smilies::add($b, ':angry face with horns:', '&#x1F47F');
-	Smilies::add($b, ':skull:', '&#x1F480');
-	Smilies::add($b, ':skull and crossbones:', '&#x2620');
-
-// face-costume
-	Smilies::add($b, ':pile of poo:', '&#x1F4A9');
-	Smilies::add($b, ':clown face:', '&#x1F921');
-	Smilies::add($b, ':ogre:', '&#x1F479');
-	Smilies::add($b, ':goblin:', '&#x1F47A');
-	Smilies::add($b, ':ghost:', '&#x1F47B');
-	Smilies::add($b, ':alien:', '&#x1F47D');
-	Smilies::add($b, ':alien monster:', '&#x1F47E');
-	Smilies::add($b, ':robot:', '&#x1F916');
-
-// cat-face
-	Smilies::add($b, ':grinning cat:', '&#x1F63A');
-	Smilies::add($b, ':grinning cat with smiling eyes:', '&#x1F638');
-	Smilies::add($b, ':cat with tears of joy:', '&#x1F639');
-	Smilies::add($b, ':smiling cat with heart-eyes:', '&#x1F63B');
-	Smilies::add($b, ':cat with wry smile:', '&#x1F63C');
-	Smilies::add($b, ':kissing cat:', '&#x1F63D');
-	Smilies::add($b, ':weary cat:', '&#x1F640');
-	Smilies::add($b, ':crying cat:', '&#x1F63F');
-	Smilies::add($b, ':pouting cat:', '&#x1F63E');
-
-// monkey-face
-	Smilies::add($b, ':see-no-evil monkey:', '&#x1F648');
-	Smilies::add($b, ':hear-no-evil monkey:', '&#x1F649');
-	Smilies::add($b, ':speak-no-evil monkey:', '&#x1F64A');
-
-//emotion
-	Smilies::add($b, ':kiss mark:', '&#x1F48B');
-	Smilies::add($b, ':love letter:', '&#x1F48C');
-	Smilies::add($b, ':heart with arrow:', '&#x1F498');
-	Smilies::add($b, ':heart with ribbon:', '&#x1F49D');
-	Smilies::add($b, ':sparkling heart:', '&#x1F496');
-    Smilies::add($b, ':loveheart:', '&#x1F496;');
-	Smilies::add($b, ':growing heart:', '&#x1F497');
-	Smilies::add($b, ':beating heart:', '&#x1F493');
-	Smilies::add($b, ':revolving hearts:', '&#x1F49E');
-	Smilies::add($b, ':two hearts:', '&#x1F495');
-	Smilies::add($b, ':heart decoration:', '&#x1F49F');
-	Smilies::add($b, ':heart exclamation:', '&#x2763');
-	Smilies::add($b, ':broken heart:', '&#x1F494');
-	Smilies::add($b, ':red heart:', '&#x2764');
-	Smilies::add($b, ':orange heart:', '&#x1F9E1');
-	Smilies::add($b, ':yellow heart:', '&#x1F49B');
-	Smilies::add($b, ':green heart:', '&#x1F49A');
-	Smilies::add($b, ':blue heart:', '&#x1F499');
-	Smilies::add($b, ':purple heart:', '&#x1F49C');
-	Smilies::add($b, ':brown heart:', '&#x1F90E');
-	Smilies::add($b, ':black heart:', '&#x1F5A4');
-	Smilies::add($b, ':white heart:', '&#x1F90D');
-	Smilies::add($b, ':hundred points:', '&#x1F4AF');
-	Smilies::add($b, ':anger symbol:', '&#x1F4A2');
-	Smilies::add($b, ':collision:', '&#x1F4A5');
-	Smilies::add($b, ':dizzy:', '&#x1F4AB');
-	Smilies::add($b, ':sweat droplets:', '&#x1F4A6');
-	Smilies::add($b, ':dashing away:', '&#x1F4A8');
-	Smilies::add($b, ':hole:', '&#x1F573');
-	Smilies::add($b, ':bomb:', '&#x1F4A3');
-	Smilies::add($b, ':speech balloon:', '&#x1F4AC');
-	Smilies::add($b, ':left speech bubble:', '&#x1F5E8');
-	Smilies::add($b, ':right anger bubble:', '&#x1F5EF');
-	Smilies::add($b, ':thought balloon:', '&#x1F4AD');
-	Smilies::add($b, ':zzz:', '&#x1F4A4');
-
-// People & Body
-// hand-fingers-open
-	Smilies::add($b, ':waving hand:', '&#x1F44B');
-	Smilies::add($b, ':raised back of hand:', '&#x1F91A');
-	Smilies::add($b, ':hand with fingers splayed:', '&#x1F590');
-	Smilies::add($b, ':raised hand:', '&#x270B');
-	Smilies::add($b, ':vulcan salute:', '&#x1F596');
-
-// hand-fingers-partial
-	Smilies::add($b, ':OK hand:', '&#x1F44C');
-//	Smilies::add($b, ':pinching hand:', '&#x1F90F');
-	Smilies::add($b, ':victory hand:', '&#x270C');
-	Smilies::add($b, ':crossed fingers:', '&#x1F91E');
-	Smilies::add($b, ':love-you gesture:', '&#x1F91F');
-	Smilies::add($b, ':sign of the horns:', '&#x1F918');
-	Smilies::add($b, ':call me hand:', '&#x1F919');
-
-// hand-single-finger
-	Smilies::add($b, ':backhand index pointing left:', '&#x1F448');
-	Smilies::add($b, ':backhand index pointing right:', '&#x1F449');
-	Smilies::add($b, ':backhand index pointing up:', '&#x1F446');
-	Smilies::add($b, ':middle finger:', '&#x1F595');
-	Smilies::add($b, ':backhand index pointing down:', '&#x1F447');
-	Smilies::add($b, ':index pointing up:', '&#x261D');
-
-// hand-fingers-closed
-	Smilies::add($b, ':thumbs up:', '&#x1F44D');
-	Smilies::add($b, ':like:', '&#x1F44D;');
-	Smilies::add($b, '\\o/', '&#x1F44D;');
-	Smilies::add($b, ':thumbs down:', '&#x1F44E');
-	Smilies::add($b, ':dislike:', '&#x1F44E;');
-	Smilies::add($b, ':raised fist:', '&#x270A');
-	Smilies::add($b, ':oncoming fist:', '&#x1F44A');
-	Smilies::add($b, ':left-facing fist:', '&#x1F91B');
-	Smilies::add($b, ':right-facing fist:', '&#x1F91C');
-
-// hands
-	Smilies::add($b, ':clapping hands:', '&#x1F44F');
-	Smilies::add($b, ':raising hands:', '&#x1F64C');
-	Smilies::add($b, ':open hands:', '&#x1F450');
-	Smilies::add($b, ':palms up together:', '&#x1F932');
-	Smilies::add($b, ':handshake:', '&#x1F91D');
-	Smilies::add($b, ':folded hands:', '&#x1F64F');
-
-// hand-prop
-	Smilies::add($b, ':writing hand:', '&#x270D');
-	Smilies::add($b, ':nail polish:', '&#x1F485');
-	Smilies::add($b, ':selfie:', '&#x1F933');
-
-// body-parts
-	Smilies::add($b, ':flexed biceps:', '&#x1F4AA');
-	Smilies::add($b, ':mechanical arm:', '&#x1F9BE');
-	Smilies::add($b, ':mechanical leg:', '&#x1F9BF');
-	Smilies::add($b, ':leg:', '&#x1F9B5');
-	Smilies::add($b, ':foot:', '&#x1F9B6');
-	Smilies::add($b, ':ear:', '&#x1F442');
-//	Smilies::add($b, ':ear with hearing aid:', '&#x1F9BB');
-	Smilies::add($b, ':nose:', '&#x1F443');
-	Smilies::add($b, ':brain:', '&#x1F9E0');
-	Smilies::add($b, ':tooth:', '&#x1F9B7');
-	Smilies::add($b, ':bone:', '&#x1F9B4');
-	Smilies::add($b, ':eyes:', '&#x1F440');
-	Smilies::add($b, ':eye:', '&#x1F441');
-	Smilies::add($b, ':tongue:', '&#x1F445');
-	Smilies::add($b, ':mouth:', '&#x1F444');
-
-// person
-	Smilies::add($b, ':baby:', '&#x1F476');
-	Smilies::add($b, ':child:', '&#x1F9D2');
-	Smilies::add($b, ':boy:', '&#x1F466');
-	Smilies::add($b, ':girl:', '&#x1F467');
-	Smilies::add($b, ':person:', '&#x1F9D1');
-	Smilies::add($b, ':person: blond hair:', '&#x1F471');
-	Smilies::add($b, ':man:', '&#x1F468');
-	Smilies::add($b, ':man: beard:', '&#x1F9D4');
-	Smilies::add($b, ':beard:', '&#x1F9D4;');
-	Smilies::add($b, ':man: red hair:', '&#x1F468&#x200D&#x1F9B0');
-	Smilies::add($b, ':man: curly hair:', '&#x1F468&#x200D&#x1F9B1');
-	Smilies::add($b, ':man: white hair:', '&#x1F468&#x200D&#x1F9B3');
-	Smilies::add($b, ':man: bald:', '&#x1F468&#x200D&#x1F9B2');
-	Smilies::add($b, ':woman:', '&#x1F469');
-	Smilies::add($b, ':woman: red hair:', '&#x1F469&#x200D&#x1F9B0');
-	Smilies::add($b, ':person: red hair:', '&#x1F9D1&#x200D&#x1F9B0');
-	Smilies::add($b, ':woman: curly hair:', '&#x1F469&#x200D&#x1F9B1');
-	Smilies::add($b, ':person: curly hair:', '&#x1F9D1&#x200D&#x1F9B1');
-	Smilies::add($b, ':woman: white hair:', '&#x1F469&#x200D&#x1F9B3');
-	Smilies::add($b, ':person: white hair:', '&#x1F9D1&#x200D&#x1F9B3');
-	Smilies::add($b, ':woman: bald:', '&#x1F469&#x200D&#x1F9B2');
-	Smilies::add($b, ':bald::', '&#x1F9D1&#x200D&#x1F9B2');
-	Smilies::add($b, ':woman: blond hair:', '&#x1F471&#x200D&#x2640&#xFE0F');
-	Smilies::add($b, ':man: blond hair:', '&#x1F471&#x200D&#x2642&#xFE0F');
-	Smilies::add($b, ':older person:', '&#x1F9D3');
-	Smilies::add($b, ':old man:', '&#x1F474');
-	Smilies::add($b, ':old woman:', '&#x1F475');
-	Smilies::add($b, ':pregnant:', '&#x1F930;');
-
-// person-gesture
-	Smilies::add($b, ':person frowning:', '&#x1F64D');
-	Smilies::add($b, ':man frowning:', '&#x1F64D&#x200D&#x2642&#xFE0F');
-	Smilies::add($b, ':woman frowning:', '&#x1F64D&#x200D&#x2640&#xFE0F');
-	Smilies::add($b, ':person pouting:', '&#x1F64E');
-	Smilies::add($b, ':man pouting:', '&#x1F64E&#x200D&#x2642&#xFE0F');
-	Smilies::add($b, ':woman pouting:', '&#x1F64E&#x200D&#x2640&#xFE0F');
-	Smilies::add($b, ':person gesturing NO:', '&#x1F645');
-	Smilies::add($b, ':man gesturing NO:', '&#x1F645&#x200D&#x2642&#xFE0F');
-	Smilies::add($b, ':woman gesturing NO:', '&#x1F645&#x200D&#x2640&#xFE0F');
-	Smilies::add($b, ':person gesturing OK:', '&#x1F646');
-	Smilies::add($b, ':man gesturing OK:', '&#x1F646&#x200D&#x2642&#xFE0F');
-	Smilies::add($b, ':woman gesturing OK:', '&#x1F646&#x200D&#x2640&#xFE0F');
-	Smilies::add($b, ':person tipping hand:', '&#x1F481');
-	Smilies::add($b, ':man tipping hand:', '&#x1F481&#x200D&#x2642&#xFE0F');
-	Smilies::add($b, ':woman tipping hand:', '&#x1F481&#x200D&#x2640&#xFE0F');
-	Smilies::add($b, ':person raising hand:', '&#x1F64B');
-	Smilies::add($b, ':man raising hand:', '&#x1F64B&#x200D&#x2642&#xFE0F');
-	Smilies::add($b, ':woman raising hand', '&#x1F64B&#x200D&#x2640&#xFE0F');
-//	Smilies::add($b, ':deaf person:', '&#x1F9CF');
-//	Smilies::add($b, ':deaf man:', '&#x1F9CF&#x200D&#x2642&#xFE0F');
-//	Smilies::add($b, ':deaf woman:', '&#x1F9CF&#x200D&#x2640&#xFE0F');
-	Smilies::add($b, ':person bowing:', '&#x1F647');
-	Smilies::add($b, ':bow:', '&#x1F647;');
-	Smilies::add($b, ':man bowing:', '&#x1F647&#x200D&#x2642&#xFE0F');
-	Smilies::add($b, ':woman bowing:', '&#x1F647&#x200D&#x2640&#xFE0F');
-	Smilies::add($b, ':person facepalming:', '&#x1F926');
-	Smilies::add($b, ':facepalm:', '&#x1F926;');
-	Smilies::add($b, ':man facepalming:', '&#x1F926&#x200D&#x2642&#xFE0F');
-	Smilies::add($b, ':woman facepalming:', '&#x1F926&#x200D&#x2640&#xFE0F');
-	Smilies::add($b, ':person shrugging:', '&#x1F937');
-	Smilies::add($b, ':shrug:', '&#x1F937;');
-	Smilies::add($b, ':man shrugging:', '&#x1F937&#x200D&#x2642&#xFE0F');
-	Smilies::add($b, ':woman shrugging:', '&#x1F937&#x200D&#x2640&#xFE0F');
-
-// person-role
-
-// person-fantasy
-	Smilies::add($b, ':baby angel:', '&#x1F47C');
-	Smilies::add($b, ':angel:', '&#x1F47C;');
-	Smilies::add($b, ':cherub:', '&#x1F47C;');
-	Smilies::add($b, ':Santa Claus:', '&#x1F385');
-	Smilies::add($b, ':Mrs. Claus:', '&#x1F936');
-	Smilies::add($b, ':superhero:', '&#x1F9B8');
-	Smilies::add($b, ':man superhero:', '&#x1F9B8&#x200D&#x2642&#xFE0F');
-	Smilies::add($b, ':woman superhero:', '&#x1F9B8&#x200D&#x2640&#xFE0F');
-	Smilies::add($b, ':supervillain:', '&#x1F9B9');
-	Smilies::add($b, ':man supervillain:', '&#x1F9B9&#x200D&#x2642&#xFE0F');
-	Smilies::add($b, ':woman supervillain:', '&#x1F9B9&#x200D&#x2640&#xFE0F');
-	Smilies::add($b, ':mage:', '&#x1F9D9');
-	Smilies::add($b, ':man mage:', '&#x1F9D9&#x200D&#x2642&#xFE0F');
-	Smilies::add($b, ':woman mage:', '&#x1F9D9&#x200D&#x2640&#xFE0F');
-	Smilies::add($b, ':fairy:', '&#x1F9DA');
-	Smilies::add($b, ':man fairy:', '&#x1F9DA&#x200D&#x2642&#xFE0F');
-	Smilies::add($b, ':woman fairy:', '&#x1F9DA&#x200D&#x2640&#xFE0F');
-	Smilies::add($b, ':vampire:', '&#x1F9DB');
-	Smilies::add($b, ':man vampire:', '&#x1F9DB&#x200D&#x2642&#xFE0F');
-	Smilies::add($b, ':woman vampire:', '&#x1F9DB&#x200D&#x2640&#xFE0F');
-	Smilies::add($b, ':merperson:', '&#x1F9DC');
-	Smilies::add($b, ':merman:', '&#x1F9DC&#x200D&#x2642&#xFE0F');
-	Smilies::add($b, ':mermaid:', '&#x1F9DC&#x200D&#x2640&#xFE0F');
-	Smilies::add($b, ':elf:', '&#x1F9DD');
-	Smilies::add($b, ':man elf:', '&#x1F9DD&#x200D&#x2642&#xFE0F');
-	Smilies::add($b, ':woman elf:', '&#x1F9DD&#x200D&#x2640&#xFE0F');
-	Smilies::add($b, ':genie:', '&#x1F9DE');
-	Smilies::add($b, ':man genie:', '&#x1F9DE&#x200D&#x2642&#xFE0F');
-	Smilies::add($b, ':woman genie:', '&#x1F9DE&#x200D&#x2640&#xFE0F');
-	Smilies::add($b, ':zombie:', '&#x1F9DF');
-	Smilies::add($b, ':man zombie:', '&#x1F9DF&#x200D&#x2642&#xFE0F');
-	Smilies::add($b, ':woman zombie:', '&#x1F9DF&#x200D&#x2640&#xFE0F');
-
-// person-activity
-
-// person-sport
-
-	Smilies::add($b, ':golf:', '&#x1F3CC;');
-
-// person-resting
-
-// family
-	Smilies::add($b, ':people holding hands:', '&#x1F9D1&#x200D&#x1F91D&#x200D&#x1F9D1');
-	Smilies::add($b, ':women holding hands:', '&#x1F46D');
-	Smilies::add($b, ':woman and man holding hands:', '&#x1F46B');
-	Smilies::add($b, ':men holding hands:', '&#x1F46C');
-	Smilies::add($b, ':kiss:', '&#x1F48F');
-	Smilies::add($b, ':couple with heart:', '&#x1F491');
-	Smilies::add($b, ':family:', '&#x1F46A');
-
-// person-symbol
-	Smilies::add($b, ':speaking head:', '&#x1F5E3');
-	Smilies::add($b, ':bust in silhouette:', '&#x1F464');
-	Smilies::add($b, ':busts in silhouette:', '&#x1F465');
-	Smilies::add($b, ':footprints:', '&#x1F463');
-
-// Component
-// hair-style
-
-// Animals & Nature
-// animal-mammal
-	Smilies::add($b, ':monkey face:', '&#x1F435');
-	Smilies::add($b, ':monkey:', '&#x1F412');
-	Smilies::add($b, ':gorilla:', '&#x1F98D');
-	Smilies::add($b, ':orangutan:', '&#x1F9A7');
-	Smilies::add($b, ':dog face:', '&#x1F436');
-	Smilies::add($b, ':dog:', '&#x1F415');
-	Smilies::add($b, ':guide dog:', '&#x1F9AE');
-	Smilies::add($b, ':poodle:', '&#x1F429');
-	Smilies::add($b, ':wolf:', '&#x1F43A');
-	Smilies::add($b, ':fox:', '&#x1F98A');
-	Smilies::add($b, ':raccoon:', '&#x1F99D');
-	Smilies::add($b, ':cat face:', '&#x1F431');
-	Smilies::add($b, ':cat:', '&#x1F408');
-	Smilies::add($b, ':lion:', '&#x1F981');
-	Smilies::add($b, ':tiger face:', '&#x1F42F');
-	Smilies::add($b, ':tiger:', '&#x1F405');
-	Smilies::add($b, ':leopard:', '&#x1F406');
-	Smilies::add($b, ':horse face:', '&#x1F434');
-	Smilies::add($b, ':horse:', '&#x1F40E');
-	Smilies::add($b, ':unicorn:', '&#x1F984');
-	Smilies::add($b, ':zebra:', '&#x1F993');
-	Smilies::add($b, ':deer:', '&#x1F98C');
-	Smilies::add($b, ':cow face:', '&#x1F42E');
-	Smilies::add($b, ':ox:', '&#x1F402');
-	Smilies::add($b, ':water buffalo:', '&#x1F403');
-	Smilies::add($b, ':cow:', '&#x1F404');
-	Smilies::add($b, ':pig face:', '&#x1F437');
-	Smilies::add($b, ':pig:', '&#x1F416');
-	Smilies::add($b, ':boar:', '&#x1F417');
-	Smilies::add($b, ':pig nose:', '&#x1F43D');
-	Smilies::add($b, ':ram:', '&#x1F40F');
-	Smilies::add($b, ':sheep:', '&#x1F411');
-	Smilies::add($b, ':goat:', '&#x1F410');
-	Smilies::add($b, ':camel:', '&#x1F42A');
-	Smilies::add($b, ':two-hump camel:', '&#x1F42B');
-	Smilies::add($b, ':llama:', '&#x1F999');
-	Smilies::add($b, ':giraffe:', '&#x1F992');
-	Smilies::add($b, ':elephant:', '&#x1F418');
-	Smilies::add($b, ':rhinoceros:', '&#x1F98F');
-	Smilies::add($b, ':hippopotamus:', '&#x1F99B');
-	Smilies::add($b, ':mouse face:', '&#x1F42D');
-	Smilies::add($b, ':mouse:', '&#x1F401');
-	Smilies::add($b, ':rat:', '&#x1F400');
-	Smilies::add($b, ':hamster:', '&#x1F439');
-	Smilies::add($b, ':rabbit face:', '&#x1F430');
-	Smilies::add($b, ':rabbit:', '&#x1F407');
-	Smilies::add($b, ':chipmunk:', '&#x1F43F');
-	Smilies::add($b, ':hedgehog:', '&#x1F994');
-	Smilies::add($b, ':bat:', '&#x1F987');
-	Smilies::add($b, ':bear:', '&#x1F43B');
-	Smilies::add($b, ':koala:', '&#x1F428');
-	Smilies::add($b, ':panda:', '&#x1F43C');
-	Smilies::add($b, ':sloth:', '&#x1F9A5');
-	Smilies::add($b, ':otter:', '&#x1F9A6');
-	Smilies::add($b, ':skunk:', '&#x1F9A8');
-	Smilies::add($b, ':kangaroo:', '&#x1F998');
-	Smilies::add($b, ':badger:', '&#x1F9A1');
-	Smilies::add($b, ':paw prints:', '&#x1F43E');
-//	Smilies::add($b, ':bunnyflowers:', '&#x;');
-	Smilies::add($b, ':chick:', '&#x1F424;');
-	Smilies::add($b, ':ladybird:', '&#x1F41E;');
-	Smilies::add($b, ':bunny:', '&#x1F430;');
-//	Smilies::add($b, ':dragonfly:', '&#x;');
-
-// animal-bird
-	Smilies::add($b, ':turkey:', '&#x1F983');
-	Smilies::add($b, ':chicken:', '&#x1F414');
-	Smilies::add($b, ':rooster:', '&#x1F413');
-	Smilies::add($b, ':hatching chick:', '&#x1F423');
-	Smilies::add($b, ':baby chick:', '&#x1F424');
-	Smilies::add($b, ':front-facing baby chick:', '&#x1F425');
-	Smilies::add($b, ':bird:', '&#x1F426');
-	Smilies::add($b, ':tux:', '&#x1F427');
-	Smilies::add($b, ':dove:', '&#x1F54A');
-	Smilies::add($b, ':eagle:', '&#x1F985');
-	Smilies::add($b, ':duck:', '&#x1F986');
-	Smilies::add($b, ':swan:', '&#x1F9A2');
-	Smilies::add($b, ':owl:', '&#x1F989');
-	Smilies::add($b, ':flamingo:', '&#x1F9A9');
-	Smilies::add($b, ':peacock:', '&#x1F99A');
-	Smilies::add($b, ':parrot:', '&#x1F99C');
-
-// animal-amphibian
-	Smilies::add($b, ':frog:', '&#x1F438');
-
-// animal-reptile
-	Smilies::add($b, ':crocodile:', '&#x1F40A');
-	Smilies::add($b, ':turtle:', '&#x1F422');
-	Smilies::add($b, ':lizard:', '&#x1F98E');
-	Smilies::add($b, ':snake:', '&#x1F40D');
-	Smilies::add($b, ':dragon face:', '&#x1F432');
-	Smilies::add($b, ':dragon:', '&#x1F409');
-	Smilies::add($b, ':draco:', '&#x1F409;');
-	Smilies::add($b, ':sauropod:', '&#x1F995');
-	Smilies::add($b, ':T-Rex:', '&#x1F996');
-
-// animal-marine
-	Smilies::add($b, ':spouting whale:', '&#x1F433');
-	Smilies::add($b, ':whale:', '&#x1F40B');
-	Smilies::add($b, ':dolphin:', '&#x1F42C');
-	Smilies::add($b, ':fish:', '&#x1F41F');
-	Smilies::add($b, ':tropical fish:', '&#x1F420');
-	Smilies::add($b, ':blowfish:', '&#x1F421');
-	Smilies::add($b, ':shark:', '&#x1F988');
-	Smilies::add($b, ':octopus:', '&#x1F419');
-	Smilies::add($b, ':spiral shell:', '&#x1F41A');
-
-// animal-bug
-	Smilies::add($b, ':snail:', '&#x1F40C');
-	Smilies::add($b, ':butterfly:', '&#x1F98B');
-	Smilies::add($b, ':bug:', '&#x1F41B');
-	Smilies::add($b, ':ant:', '&#x1F41C');
-	Smilies::add($b, ':honeybee:', '&#x1F41D');
-	Smilies::add($b, ':lady beetle:', '&#x1F41E');
-	Smilies::add($b, ':cricket:', '&#x1F997');
-	Smilies::add($b, ':spider:', '&#x1F577');
-	Smilies::add($b, ':spider web:', '&#x1F578');
-	Smilies::add($b, ':scorpion:', '&#x1F982');
-	Smilies::add($b, ':mosquito:', '&#x1F99F');
-	Smilies::add($b, ':microbe:', '&#x1F9A0');
-
-// plant-flower
-	Smilies::add($b, ':bouquet:', '&#x1F490');
-	Smilies::add($b, ':cherry blossom:', '&#x1F338');
-	Smilies::add($b, ':white flower:', '&#x1F4AE');
-	Smilies::add($b, ':rosette:', '&#x1F3F5');
-	Smilies::add($b, ':rose:', '&#x1F339');
-	Smilies::add($b, ':wilted flower:', '&#x1F940');
-	Smilies::add($b, ':hibiscus:', '&#x1F33A');
-	Smilies::add($b, ':sunflower:', '&#x1F33B');
-	Smilies::add($b, ':blossom:', '&#x1F33C');
-	Smilies::add($b, ':tulip:', '&#x1F337');
-
-// plant-other
-	Smilies::add($b, ':seedling:', '&#x1F331');
-	Smilies::add($b, ':evergreen tree:', '&#x1F332');
-	Smilies::add($b, ':deciduous tree:', '&#x1F333');
-	Smilies::add($b, ':palm tree:', '&#x1F334');
-	Smilies::add($b, ':cactus:', '&#x1F335');
-	Smilies::add($b, ':sheaf of rice:', '&#x1F33E');
-	Smilies::add($b, ':herb:', '&#x1F33F');
-	Smilies::add($b, ':shamrock:', '&#x2618');
-	Smilies::add($b, ':four leaf clover:', '&#x1F340');
-	Smilies::add($b, ':maple leaf:', '&#x1F341');
-	Smilies::add($b, ':fallen leaf:', '&#x1F342');
-	Smilies::add($b, ':leaf fluttering in wind:', '&#x1F343');
-
-// Food & Drink
-// food-fruit
-	Smilies::add($b, ':grapes:', '&#x1F347');
-	Smilies::add($b, ':melon:', '&#x1F348');
-	Smilies::add($b, ':watermelon:', '&#x1F349');
-	Smilies::add($b, ':tangerine:', '&#x1F34A');
-	Smilies::add($b, ':lemon:', '&#x1F34B');
-	Smilies::add($b, ':banana:', '&#x1F34C');
-	Smilies::add($b, ':pineapple:', '&#x1F34D');
-	Smilies::add($b, ':mango:', '&#x1F96D');
-	Smilies::add($b, ':red apple:', '&#x1F34E');
-	Smilies::add($b, ':apple:', '&#x1F34E;');
-	Smilies::add($b, ':green apple:', '&#x1F34F');
-	Smilies::add($b, ':pear:', '&#x1F350');
-	Smilies::add($b, ':peach:', '&#x1F351');
-	Smilies::add($b, ':cherries:', '&#x1F352');
-	Smilies::add($b, ':strawberry:', '&#x1F353');
-	Smilies::add($b, ':kiwi fruit:', '&#x1F95D');
-	Smilies::add($b, ':tomato:', '&#x1F345');
-	Smilies::add($b, ':coconut:', '&#x1F965');
-
-// food-vegetable
-	Smilies::add($b, ':avocado:', '&#x1F951');
-	Smilies::add($b, ':eggplant:', '&#x1F346');
-	Smilies::add($b, ':potato:', '&#x1F954');
-	Smilies::add($b, ':carrot:', '&#x1F955');
-	Smilies::add($b, ':ear of corn:', '&#x1F33D');
-	Smilies::add($b, ':hot pepper:', '&#x1F336');
-	Smilies::add($b, ':cucumber:', '&#x1F952');
-	Smilies::add($b, ':leafy green:', '&#x1F96C');
-	Smilies::add($b, ':broccoli:', '&#x1F966');
-	Smilies::add($b, ':garlic:', '&#x1F9C4');
-	Smilies::add($b, ':onion:', '&#x1F9C5');
-	Smilies::add($b, ':mushroom:', '&#x1F344');
-	Smilies::add($b, ':peanuts:', '&#x1F95C');
-	Smilies::add($b, ':chestnut:', '&#x1F330');
-
-// food-prepared
-	Smilies::add($b, ':bread:', '&#x1F35E');
-	Smilies::add($b, ':croissant:', '&#x1F950');
-	Smilies::add($b, ':baguette bread:', '&#x1F956');
-	Smilies::add($b, ':pretzel:', '&#x1F968');
-	Smilies::add($b, ':bagel:', '&#x1F96F');
-	Smilies::add($b, ':pancakes:', '&#x1F95E');
-	Smilies::add($b, ':waffle:', '&#x1F9C7');
-	Smilies::add($b, ':cheese wedge:', '&#x1F9C0');
-	Smilies::add($b, ':meat on bone:', '&#x1F356');
-	Smilies::add($b, ':poultry leg:', '&#x1F357');
-	Smilies::add($b, ':cut of meat:', '&#x1F969');
-	Smilies::add($b, ':bacon:', '&#x1F953');
-	Smilies::add($b, ':hamburger:', '&#x1F354');
-	Smilies::add($b, ':french fries:', '&#x1F35F');
-	Smilies::add($b, ':pizza:', '&#x1F355');
-	Smilies::add($b, ':hot dog:', '&#x1F32D');
-	Smilies::add($b, ':sandwich:', '&#x1F96A');
-	Smilies::add($b, ':taco:', '&#x1F32E');
-	Smilies::add($b, ':burrito:', '&#x1F32F');
-	Smilies::add($b, ':stuffed flatbread:', '&#x1F959');
-	Smilies::add($b, ':falafel:', '&#x1F9C6');
-	Smilies::add($b, ':egg:', '&#x1F95A');
-	Smilies::add($b, ':cooking:', '&#x1F373');
-	Smilies::add($b, ':fryegg:', '&#x1F373;');
-	Smilies::add($b, ':shallow pan of food:', '&#x1F958');
-	Smilies::add($b, ':pot of food:', '&#x1F372');
-	Smilies::add($b, ':bowl with spoon:', '&#x1F963');
-	Smilies::add($b, ':green salad:', '&#x1F957');
-	Smilies::add($b, ':popcorn:', '&#x1F37F');
-	Smilies::add($b, ':butter:', '&#x1F9C8');
-	Smilies::add($b, ':salt:', '&#x1F9C2');
-	Smilies::add($b, ':canned food:', '&#x1F96B');
-
-// food-asian
-	Smilies::add($b, ':bento box:', '&#x1F371');
-	Smilies::add($b, ':rice cracker:', '&#x1F358');
-	Smilies::add($b, ':rice ball:', '&#x1F359');
-	Smilies::add($b, ':cooked rice:', '&#x1F35A');
-	Smilies::add($b, ':curry rice:', '&#x1F35B');
-	Smilies::add($b, ':steaming bowl:', '&#x1F35C');
-	Smilies::add($b, ':spaghetti:', '&#x1F35D');
-	Smilies::add($b, ':roasted sweet potato:', '&#x1F360');
-	Smilies::add($b, ':oden:', '&#x1F362');
-	Smilies::add($b, ':sushi:', '&#x1F363');
-	Smilies::add($b, ':fried shrimp:', '&#x1F364');
-	Smilies::add($b, ':fish cake with swirl:', '&#x1F365');
-	Smilies::add($b, ':moon cake:', '&#x1F96E');
-	Smilies::add($b, ':dango:', '&#x1F361');
-	Smilies::add($b, ':dumpling:', '&#x1F95F');
-	Smilies::add($b, ':fortune cookie:', '&#x1F960');
-	Smilies::add($b, ':takeout box:', '&#x1F961');
-
-// food-marine
-	Smilies::add($b, ':crab:', '&#x1F980');
-	Smilies::add($b, ':lobster:', '&#x1F99E');
-	Smilies::add($b, ':shrimp:', '&#x1F990');
-	Smilies::add($b, ':squid:', '&#x1F991');
-// 	Smilies::add($b, ':oyster:', '&#x1F9AA');
-
-// food-sweet
-	Smilies::add($b, ':soft ice cream:', '&#x1F366');
-	Smilies::add($b, ':shaved ice:', '&#x1F367');
-	Smilies::add($b, ':ice cream:', '&#x1F368');
-	Smilies::add($b, ':doughnut:', '&#x1F369');
-	Smilies::add($b, ':cookie:', '&#x1F36A');
-	Smilies::add($b, ':birthday cake:', '&#x1F382');
-	Smilies::add($b, ':shortcake:', '&#x1F370');
-	Smilies::add($b, ':cake:', '&#x1F370;');
-	Smilies::add($b, ':cupcake:', '&#x1F9C1');
-	Smilies::add($b, ':pie:', '&#x1F967');
-	Smilies::add($b, ':chocolate bar:', '&#x1F36B');
-	Smilies::add($b, ':candy:', '&#x1F36C');
-	Smilies::add($b, ':lollipop:', '&#x1F36D');
-	Smilies::add($b, ':custard:', '&#x1F36E');
-	Smilies::add($b, ':honey pot:', '&#x1F36F');
-
-// drink  
-	Smilies::add($b, ':baby bottle:', '&#x1F37C');
-	Smilies::add($b, ':glass of milk:', '&#x1F95B');
-	Smilies::add($b, ':hot beverage:', '&#x2615');
-	Smilies::add($b, ':coffee:', '&#x2615;');
-	Smilies::add($b, ':tea:', '&#x2615;');
-	Smilies::add($b, ':tee:', '&#x2615;');
-	Smilies::add($b, ':teacup without handle:', '&#x1F375');
-	Smilies::add($b, ':sake:', '&#x1F376');
-	Smilies::add($b, ':bottle with popping cork:', '&#x1F37E');
-	Smilies::add($b, ':wine glass:', '&#x1F377');
-	Smilies::add($b, ':cocktail glass:', '&#x1F378');
-	Smilies::add($b, ':tropical drink:', '&#x1F379');
-	Smilies::add($b, ':beer mug:', '&#x1F37A');
-	Smilies::add($b, ':beer:', '&#x1F37A;');
-	Smilies::add($b, ':homebrew:', '&#x1F37A;');
-	Smilies::add($b, ':clinking beer mugs:', '&#x1F37B');
-	Smilies::add($b, ':clinking glasses:', '&#x1F942');
-	Smilies::add($b, ':tumbler glass:', '&#x1F943');
-	Smilies::add($b, ':cup with straw:', '&#x1F964');
-//	Smilies::add($b, ':beverage box:', '&#x1F9C3');
-	Smilies::add($b, ':mate:', '&#x1F9C9');
-	Smilies::add($b, ':ice:', '&#x1F9CA');
-
-// dishware
-	Smilies::add($b, ':chopsticks:', '&#x1F962');
-	Smilies::add($b, ':fork and knife with plate:', '&#x1F37D');
-	Smilies::add($b, ':fork and knife:', '&#x1F374');
-	Smilies::add($b, ':spoon:', '&#x1F944');
-	Smilies::add($b, ':kitchen knife:', '&#x1F52A');
-	Smilies::add($b, ':amphora:', '&#x1F3FA');
-
-// Travel & Places
-// place-map
-	Smilies::add($b, ':globe showing Europe-Africa:', '&#x1F30D');
-	Smilies::add($b, ':globe showing Americas:', '&#x1F30E');
-	Smilies::add($b, ':globe showing Asia-Australia:', '&#x1F30F');
-	Smilies::add($b, ':globe with meridians:', '&#x1F310');
-	Smilies::add($b, ':world map:', '&#x1F5FA');
-	Smilies::add($b, ':map of Japan:', '&#x1F5FE');
-	Smilies::add($b, ':compass:', '&#x1F9ED');
-
-// place-geographic
-	Smilies::add($b, ':snow-capped mountain:', '&#x1F3D4');
-	Smilies::add($b, ':mountain:', '&#x26F0');
-	Smilies::add($b, ':volcano:', '&#x1F30B');
-	Smilies::add($b, ':mount fuji:', '&#x1F5FB');
-	Smilies::add($b, ':camping:', '&#x1F3D5');
-	Smilies::add($b, ':beach with umbrella:', '&#x1F3D6');
-	Smilies::add($b, ':desert:', '&#x1F3DC');
-	Smilies::add($b, ':desert island:', '&#x1F3DD');
-	Smilies::add($b, ':national park:', '&#x1F3DE');
-
-// place-building
-	Smilies::add($b, ':stadium:', '&#x1F3DF');
-	Smilies::add($b, ':classical building:', '&#x1F3DB');
-	Smilies::add($b, ':building construction:', '&#x1F3D7');
-	Smilies::add($b, ':brick:', '&#x1F9F1');
-	Smilies::add($b, ':houses:', '&#x1F3D8');
-	Smilies::add($b, ':derelict house:', '&#x1F3DA');
-	Smilies::add($b, ':house:', '&#x1F3E0');
-	Smilies::add($b, ':house with garden:', '&#x1F3E1');
-	Smilies::add($b, ':office building:', '&#x1F3E2');
-	Smilies::add($b, ':Japanese post office:', '&#x1F3E3');
-	Smilies::add($b, ':post office:', '&#x1F3E4');
-	Smilies::add($b, ':hospital:', '&#x1F3E5');
-	Smilies::add($b, ':bank:', '&#x1F3E6');
-	Smilies::add($b, ':hotel:', '&#x1F3E8');
-	Smilies::add($b, ':love hotel:', '&#x1F3E9');
-	Smilies::add($b, ':convenience store:', '&#x1F3EA');
-	Smilies::add($b, ':school:', '&#x1F3EB');
-	Smilies::add($b, ':department store:', '&#x1F3EC');
-	Smilies::add($b, ':factory:', '&#x1F3ED');
-	Smilies::add($b, ':Japanese castle:', '&#x1F3EF');
-	Smilies::add($b, ':castle:', '&#x1F3F0');
-	Smilies::add($b, ':wedding:', '&#x1F492');
-	Smilies::add($b, ':Tokyo tower:', '&#x1F5FC');
-	Smilies::add($b, ':Statue of Liberty:', '&#x1F5FD');
-
-
-// place-religious
-	Smilies::add($b, ':church:', '&#x26EA');
-	Smilies::add($b, ':mosque:', '&#x1F54C');
-// 	Smilies::add($b, ':hindu temple:', '&#x1F6D5');
-	Smilies::add($b, ':synagogue:', '&#x1F54D');
-	Smilies::add($b, ':shinto shrine:', '&#x26E9');
-	Smilies::add($b, ':kaaba:', '&#x1F54B');
-
-// place-other
-	Smilies::add($b, ':fountain:', '&#x26F2');
-	Smilies::add($b, ':tent:', '&#x26FA');
-	Smilies::add($b, ':foggy:', '&#x1F301');
-	Smilies::add($b, ':night with stars:', '&#x1F303');
-	Smilies::add($b, ':cityscape:', '&#x1F3D9');
-	Smilies::add($b, ':sunrise over mountains:', '&#x1F304');
-	Smilies::add($b, ':sunrise:', '&#x1F305');
-	Smilies::add($b, ':cityscape at dusk:', '&#x1F306');
-	Smilies::add($b, ':sunset:', '&#x1F307');
-	Smilies::add($b, ':bridge at night:', '&#x1F309');
-	Smilies::add($b, ':hot springs:', '&#x2668');
-	Smilies::add($b, ':carousel horse:', '&#x1F3A0');
-	Smilies::add($b, ':ferris wheel:', '&#x1F3A1');
-	Smilies::add($b, ':roller coaster:', '&#x1F3A2');
-	Smilies::add($b, ':barber pole:', '&#x1F488');
-	Smilies::add($b, ':circus tent:', '&#x1F3AA');
-
-// transport-ground
-	Smilies::add($b, ':locomotive:', '&#x1F682');
-	Smilies::add($b, ':railway car:', '&#x1F683');
-	Smilies::add($b, ':high-speed train:', '&#x1F684');
-	Smilies::add($b, ':bullet train:', '&#x1F685');
-	Smilies::add($b, ':train:', '&#x1F686');
-	Smilies::add($b, ':metro:', '&#x1F687');
-	Smilies::add($b, ':light rail:', '&#x1F688');
-	Smilies::add($b, ':station:', '&#x1F689');
-	Smilies::add($b, ':tram:', '&#x1F68A');
-	Smilies::add($b, ':monorail:', '&#x1F69D');
-	Smilies::add($b, ':mountain railway:', '&#x1F69E');
-	Smilies::add($b, ':tram car:', '&#x1F68B');
-	Smilies::add($b, ':bus:', '&#x1F68C');
-	Smilies::add($b, ':oncoming bus:', '&#x1F68D');
-	Smilies::add($b, ':trolleybus:', '&#x1F68E');
-	Smilies::add($b, ':minibus:', '&#x1F690');
-	Smilies::add($b, ':ambulance:', '&#x1F691');
-	Smilies::add($b, ':fire engine:', '&#x1F692');
-	Smilies::add($b, ':police car:', '&#x1F693');
-	Smilies::add($b, ':oncoming police car:', '&#x1F694');
-	Smilies::add($b, ':taxi:', '&#x1F695');
-	Smilies::add($b, ':oncoming taxi:', '&#x1F696');
-	Smilies::add($b, ':automobile:', '&#x1F697');
-	Smilies::add($b, ':oncoming automobile:', '&#x1F698');
-	Smilies::add($b, ':sport utility vehicle:', '&#x1F699');
-	Smilies::add($b, ':delivery truck:', '&#x1F69A');
-	Smilies::add($b, ':articulated lorry:', '&#x1F69B');
-	Smilies::add($b, ':tractor:', '&#x1F69C');
-	Smilies::add($b, ':racing car:', '&#x1F3CE');
-	Smilies::add($b, ':motorcycle:', '&#x1F3CD');
-	Smilies::add($b, ':motor scooter:', '&#x1F6F5');
-//	Smilies::add($b, ':manual wheelchair:', '&#x1F9BD');
-//	Smilies::add($b, ':motorized wheelchair:', '&#x1F9BC');
-//	Smilies::add($b, ':auto rickshaw:', '&#x1F6FA');
-	Smilies::add($b, ':bicycle:', '&#x1F6B2');
-	Smilies::add($b, ':kick scooter:', '&#x1F6F4');
-	Smilies::add($b, ':skateboard:', '&#x1F6F9');
-	Smilies::add($b, ':bus stop:', '&#x1F68F');
-	Smilies::add($b, ':motorway:', '&#x1F6E3');
-	Smilies::add($b, ':railway track:', '&#x1F6E4');
-	Smilies::add($b, ':oil drum:', '&#x1F6E2');
-	Smilies::add($b, ':fuel pump:', '&#x26FD');
-	Smilies::add($b, ':police car light:', '&#x1F6A8');
-	Smilies::add($b, ':horizontal traffic light:', '&#x1F6A5');
-	Smilies::add($b, ':vertical traffic light:', '&#x1F6A6');
-	Smilies::add($b, ':stop sign:', '&#x1F6D1');
-	Smilies::add($b, ':construction:', '&#x1F6A7');
-
-// transport-water
-	Smilies::add($b, ':anchor:', '&#x2693');
-	Smilies::add($b, ':sailboat:', '&#x26F5');
-	Smilies::add($b, ':canoe:', '&#x1F6F6');
-	Smilies::add($b, ':speedboat:', '&#x1F6A4');
-	Smilies::add($b, ':passenger ship:', '&#x1F6F3');
-	Smilies::add($b, ':ferry:', '&#x26F4');
-	Smilies::add($b, ':motor boat:', '&#x1F6E5');
-	Smilies::add($b, ':ship:', '&#x1F6A2');
-
-// transport-air
-	Smilies::add($b, ':airplane:', '&#x2708');
-	Smilies::add($b, ':small airplane:', '&#x1F6E9');
-	Smilies::add($b, ':airplane departure:', '&#x1F6EB');
-	Smilies::add($b, ':airplane arrival:', '&#x1F6EC');
-	Smilies::add($b, ':parachute:', '&#x1FA82');
-	Smilies::add($b, ':seat:', '&#x1F4BA');
-	Smilies::add($b, ':helicopter:', '&#x1F681');
-	Smilies::add($b, ':suspension railway:', '&#x1F69F');
-	Smilies::add($b, ':mountain cableway:', '&#x1F6A0');
-	Smilies::add($b, ':aerial tramway:', '&#x1F6A1');
-	Smilies::add($b, ':satellite:', '&#x1F6F0');
-	Smilies::add($b, ':rocket:', '&#x1F680');
-	Smilies::add($b, ':flying saucer:', '&#x1F6F8');
-
-// hotel
-	Smilies::add($b, ':bellhop bell:', '&#x1F6CE');
-	Smilies::add($b, ':luggage:', '&#x1F9F3');
-
-// time
-	Smilies::add($b, ':hourglass done:', '&#x231B');
-	Smilies::add($b, ':hourglass not done:', '&#x23F3');
-	Smilies::add($b, ':watch:', '&#x231A');
-	Smilies::add($b, ':alarm clock:', '&#x23F0');
-	Smilies::add($b, ':stopwatch:', '&#x23F1');
-	Smilies::add($b, ':timer clock:', '&#x23F2');
-	Smilies::add($b, ':mantelpiece clock:', '&#x1F570');
-	Smilies::add($b, ':twelve o’clock:', '&#x1F55B');
-	Smilies::add($b, ':twelve-thirty:', '&#x1F567');
-	Smilies::add($b, ':one o’clock:', '&#x1F550');
-	Smilies::add($b, ':one-thirty:', '&#x1F55C');
-	Smilies::add($b, ':two o’clock:', '&#x1F551');
-	Smilies::add($b, ':two-thirty:', '&#x1F55D');
-	Smilies::add($b, ':three o’clock:', '&#x1F552');
-	Smilies::add($b, ':three-thirty:', '&#x1F55E');
-	Smilies::add($b, ':four o’clock:', '&#x1F553');
-	Smilies::add($b, ':four-thirty:', '&#x1F55F');
-	Smilies::add($b, ':five o’clock:', '&#x1F554');
-	Smilies::add($b, ':five-thirty:', '&#x1F560');
-	Smilies::add($b, ':six o’clock:', '&#x1F555');
-	Smilies::add($b, ':six-thirty:', '&#x1F561');
-	Smilies::add($b, ':seven o’clock:', '&#x1F556');
-	Smilies::add($b, ':seven-thirty:', '&#x1F562');
-	Smilies::add($b, ':eight o’clock:', '&#x1F557');
-	Smilies::add($b, ':eight-thirty:', '&#x1F563');
-	Smilies::add($b, ':nine o’clock:', '&#x1F558');
-	Smilies::add($b, ':nine-thirty:', '&#x1F564');
-	Smilies::add($b, ':ten o’clock:', '&#x1F559');
-	Smilies::add($b, ':ten-thirty:', '&#x1F565');
-	Smilies::add($b, ':eleven o’clock:', '&#x1F55A');
-	Smilies::add($b, ':eleven-thirty:', '&#x1F566');
-
-// sky & weather
-	Smilies::add($b, ':new moon:', '&#x1F311');
-	Smilies::add($b, ':waxing crescent moon:', '&#x1F312');
-	Smilies::add($b, ':first quarter moon:', '&#x1F313');
-	Smilies::add($b, ':waxing gibbous moon:', '&#x1F314');
-	Smilies::add($b, ':full moon:', '&#x1F315');
-	Smilies::add($b, ':waning gibbous moon:', '&#x1F316');
-	Smilies::add($b, ':last quarter moon:', '&#x1F317');
-	Smilies::add($b, ':waning crescent moon:', '&#x1F318');
-	Smilies::add($b, ':crescent moon:', '&#x1F319');
-	Smilies::add($b, ':new moon face:', '&#x1F31A');
-	Smilies::add($b, ':first quarter moon face:', '&#x1F31B');
-	Smilies::add($b, ':last quarter moon face:', '&#x1F31C');
-	Smilies::add($b, ':thermometer:', '&#x1F321');
-	Smilies::add($b, ':sun:', '&#x2600');
-	Smilies::add($b, ':full moon face:', '&#x1F31D');
-	Smilies::add($b, ':sun with face:', '&#x1F31E');
-	Smilies::add($b, ':ringed planet:', '&#x1FA90');
-	Smilies::add($b, ':star:', '&#x2B50');
-	Smilies::add($b, ':glowing star:', '&#x1F31F');
-	Smilies::add($b, ':shooting star:', '&#x1F320');
-	Smilies::add($b, ':milky way:', '&#x1F30C');
-	Smilies::add($b, ':cloud:', '&#x2601');
-	Smilies::add($b, ':sun behind cloud:', '&#x26C5');
-	Smilies::add($b, ':cloud with lightning and rain:', '&#x26C8');
-	Smilies::add($b, ':sun behind small cloud:', '&#x1F324');
-	Smilies::add($b, ':sun behind large cloud:', '&#x1F325');
-	Smilies::add($b, ':sun behind rain cloud:', '&#x1F326');
-	Smilies::add($b, ':cloud with rain:', '&#x1F327');
-	Smilies::add($b, ':cloud with snow:', '&#x1F328');
-	Smilies::add($b, ':cloud with lightning:', '&#x1F329');
-	Smilies::add($b, ':tornado:', '&#x1F32A');
-	Smilies::add($b, ':fog:', '&#x1F32B');
-	Smilies::add($b, ':wind face:', '&#x1F32C');
-	Smilies::add($b, ':cyclone:', '&#x1F300');
-	Smilies::add($b, ':rainbow:', '&#x1F308');
-	Smilies::add($b, ':closed umbrella:', '&#x1F302');
-	Smilies::add($b, ':umbrella:', '&#x2602');
-	Smilies::add($b, ':umbrella with rain drops:', '&#x2614');
-	Smilies::add($b, ':umbrella on ground:', '&#x26F1');
-	Smilies::add($b, ':high voltage:', '&#x26A1');
-	Smilies::add($b, ':snowflake:', '&#x2744');
-	Smilies::add($b, ':snowman:', '&#x2603');
-	Smilies::add($b, ':snowman without snow:', '&#x26C4');
-	Smilies::add($b, ':comet:', '&#x2604');
-	Smilies::add($b, ':fire:', '&#x1F525');
-	Smilies::add($b, ':droplet:', '&#x1F4A7');
-	Smilies::add($b, ':water wave:', '&#x1F30A');
-
-// Activities
-// event
-	Smilies::add($b, ':jack-o-lantern:', '&#x1F383');
-	Smilies::add($b, ':Christmas tree:', '&#x1F384');
-	Smilies::add($b, ':fireworks:', '&#x1F386');
-	Smilies::add($b, ':sparkler:', '&#x1F387');
-	Smilies::add($b, ':firecracker:', '&#x1F9E8');
-	Smilies::add($b, ':sparkles:', '&#x2728');
-	Smilies::add($b, ':balloon:', '&#x1F388');
-	Smilies::add($b, ':party popper:', '&#x1F389');
-	Smilies::add($b, ':confetti ball:', '&#x1F38A');
-	Smilies::add($b, ':tanabata tree:', '&#x1F38B');
-	Smilies::add($b, ':pine decoration:', '&#x1F38D');
-	Smilies::add($b, ':Japanese dolls:', '&#x1F38E');
-	Smilies::add($b, ':carp streamer:', '&#x1F38F');
-	Smilies::add($b, ':wind chime:', '&#x1F390');
-	Smilies::add($b, ':moon viewing ceremony:', '&#x1F391');
-	Smilies::add($b, ':red envelope:', '&#x1F9E7');
-	Smilies::add($b, ':ribbon:', '&#x1F380');
-	Smilies::add($b, ':wrapped gift:', '&#x1F381');
-	Smilies::add($b, ':reminder ribbon:', '&#x1F397');
-	Smilies::add($b, ':admission tickets:', '&#x1F39F');
-	Smilies::add($b, ':ticket:', '&#x1F3AB');
-
-// award-medal
-	Smilies::add($b, ':military medal:', '&#x1F396');
-	Smilies::add($b, ':trophy:', '&#x1F3C6');
-	Smilies::add($b, ':sports medal:', '&#x1F3C5');
-	Smilies::add($b, ':1st place medal:', '&#x1F947');
-	Smilies::add($b, ':2nd place medal:', '&#x1F948');
-	Smilies::add($b, ':3rd place medal:', '&#x1F949');
-
-// sport
-	Smilies::add($b, ':soccer ball:', '&#x26BD');
-	Smilies::add($b, ':baseball:', '&#x26BE');
-	Smilies::add($b, ':softball:', '&#x1F94E');
-	Smilies::add($b, ':basketball:', '&#x1F3C0');
-	Smilies::add($b, ':volleyball:', '&#x1F3D0');
-	Smilies::add($b, ':american football:', '&#x1F3C8');
-	Smilies::add($b, ':football:', '&#x1F3C8;');
-	Smilies::add($b, ':rugby football:', '&#x1F3C9');
-	Smilies::add($b, ':tennis:', '&#x1F3BE');
-	Smilies::add($b, ':flying disc:', '&#x1F94F');
-	Smilies::add($b, ':bowling:', '&#x1F3B3');
-	Smilies::add($b, ':cricket game:', '&#x1F3CF');
-	Smilies::add($b, ':field hockey:', '&#x1F3D1');
-	Smilies::add($b, ':ice hockey:', '&#x1F3D2');
-	Smilies::add($b, ':lacrosse:', '&#x1F94D');
-	Smilies::add($b, ':ping pong:', '&#x1F3D3');
-	Smilies::add($b, ':badminton:', '&#x1F3F8');
-	Smilies::add($b, ':boxing glove:', '&#x1F94A');
-	Smilies::add($b, ':martial arts uniform:', '&#x1F94B');
-	Smilies::add($b, ':goal net:', '&#x1F945');
-	Smilies::add($b, ':flag in hole:', '&#x26F3');
-	Smilies::add($b, ':ice skate:', '&#x26F8');
-	Smilies::add($b, ':fishing pole:', '&#x1F3A3');
-//	Smilies::add($b, ':diving mask:', '&#x1F93F');
-	Smilies::add($b, ':running shirt:', '&#x1F3BD');
-	Smilies::add($b, ':skis:', '&#x1F3BF');
-	Smilies::add($b, ':sled:', '&#x1F6F7');
-	Smilies::add($b, ':curling stone:', '&#x1F94C');
-	Smilies::add($b, ':cycling:', '&#x1F6B4;');
-	Smilies::add($b, ':darts:', '&#x1F3AF;');
-	Smilies::add($b, ':fencing:', '&#x1F93A;');
-	Smilies::add($b, ':juggling:', '&#x1F939;');
-//	Smilies::add($b, ':skipping:', '&#x;');
-//	Smilies::add($b, ':archery:', '&#x;');
-	Smilies::add($b, ':surfing:', '&#x1F3C4;');
-	Smilies::add($b, ':snooker:', '&#x1F3B1;');
-	Smilies::add($b, ':horseriding:', '&#x1F3C7;');
-
-// game
-	Smilies::add($b, ':direct hit:', '&#x1F3AF');
-	Smilies::add($b, ':yo-yo:', '&#x1FA80');
-	Smilies::add($b, ':kite:', '&#x1FA81');
-	Smilies::add($b, ':pool 8 ball:', '&#x1F3B1');
-	Smilies::add($b, ':crystal ball:', '&#x1F52E');
-	Smilies::add($b, ':nazar amulet:', '&#x1F9FF');
-	Smilies::add($b, ':video game:', '&#x1F3AE');
-	Smilies::add($b, ':joystick:', '&#x1F579');
-	Smilies::add($b, ':slot machine:', '&#x1F3B0');
-	Smilies::add($b, ':game die:', '&#x1F3B2');
-	Smilies::add($b, ':puzzle piece:', '&#x1F9E9');
-	Smilies::add($b, ':teddy bear:', '&#x1F9F8');
-	Smilies::add($b, ':spade suit:', '&#x2660');
-	Smilies::add($b, ':heart suit:', '&#x2665');
-	Smilies::add($b, ':diamond suit:', '&#x2666');
-	Smilies::add($b, ':club suit:', '&#x2663');
-	Smilies::add($b, ':chess pawn:', '&#x265F');
-	Smilies::add($b, ':joker:', '&#x1F0CF');
-	Smilies::add($b, ':mahjong red dragon:', '&#x1F004');
-	Smilies::add($b, ':flower playing cards:', '&#x1F3B4');
-
-// arts & crafts
-	Smilies::add($b, ':performing arts:', '&#x1F3AD');
-	Smilies::add($b, ':framed picture:', '&#x1F5BC');
-	Smilies::add($b, ':artist palette:', '&#x1F3A8');
-	Smilies::add($b, ':thread:', '&#x1F9F5');
-	Smilies::add($b, ':yarn:', '&#x1F9F6');
-
-// Objects
-// clothing
-	Smilies::add($b, ':glasses:', '&#x1F453');
-	Smilies::add($b, ':sunglasses:', '&#x1F576');
-	Smilies::add($b, ':goggles:', '&#x1F97D');
-	Smilies::add($b, ':lab coat:', '&#x1F97C');
-	Smilies::add($b, ':safety vest:', '&#x1F9BA');
-	Smilies::add($b, ':necktie:', '&#x1F454');
-	Smilies::add($b, ':t-shirt:', '&#x1F455');
-	Smilies::add($b, ':jeans:', '&#x1F456');
-	Smilies::add($b, ':scarf:', '&#x1F9E3');
-	Smilies::add($b, ':gloves:', '&#x1F9E4');
-	Smilies::add($b, ':coat:', '&#x1F9E5');
-	Smilies::add($b, ':socks:', '&#x1F9E6');
-	Smilies::add($b, ':dress:', '&#x1F457');
-	Smilies::add($b, ':kimono:', '&#x1F458');
-	Smilies::add($b, ':sari:', '&#x1F97B');
-	Smilies::add($b, ':one-piece swimsuit:', '&#x1FA71');
-	Smilies::add($b, ':briefs:', '&#x1FA72');
-	Smilies::add($b, ':shorts:', '&#x1FA73');
-	Smilies::add($b, ':bikini:', '&#x1F459');
-	Smilies::add($b, ':woman’s clothes:', '&#x1F45A');
-	Smilies::add($b, ':purse:', '&#x1F45B');
-	Smilies::add($b, ':handbag:', '&#x1F45C');
-	Smilies::add($b, ':clutch bag:', '&#x1F45D');
-	Smilies::add($b, ':shopping bags:', '&#x1F6CD');
-	Smilies::add($b, ':backpack:', '&#x1F392');
-	Smilies::add($b, ':man’s shoe:', '&#x1F45E');
-	Smilies::add($b, ':running shoe:', '&#x1F45F');
-	Smilies::add($b, ':hiking boot:', '&#x1F97E');
-	Smilies::add($b, ':flat shoe:', '&#x1F97F');
-	Smilies::add($b, ':high-heeled shoe:', '&#x1F460');
-	Smilies::add($b, ':woman’s sandal:', '&#x1F461');
-//	Smilies::add($b, ':ballet shoes:', '&#x1FA70');
-	Smilies::add($b, ':woman’s boot:', '&#x1F462');
-	Smilies::add($b, ':crown:', '&#x1F451');
-	Smilies::add($b, ':woman’s hat:', '&#x1F452');
-	Smilies::add($b, ':top hat:', '&#x1F3A9');
-	Smilies::add($b, ':graduation cap:', '&#x1F393');
-	Smilies::add($b, ':billed cap:', '&#x1F9E2');
-	Smilies::add($b, ':rescue worker’s helmet:', '&#x26D1');
-	Smilies::add($b, ':prayer beads:', '&#x1F4FF');
-	Smilies::add($b, ':lipstick:', '&#x1F484');
-	Smilies::add($b, ':ring:', '&#x1F48D');
-	Smilies::add($b, ':gem stone:', '&#x1F48E');
-
-// sound
-	Smilies::add($b, ':muted speaker:', '&#x1F507');
-	Smilies::add($b, ':speaker low volume:', '&#x1F508');
-	Smilies::add($b, ':speaker medium volume:', '&#x1F509');
-	Smilies::add($b, ':speaker high volume:', '&#x1F50A');
-	Smilies::add($b, ':loudspeaker:', '&#x1F4E2');
-	Smilies::add($b, ':megaphone:', '&#x1F4E3');
-	Smilies::add($b, ':postal horn:', '&#x1F4EF');
-	Smilies::add($b, ':bell:', '&#x1F514');
-	Smilies::add($b, ':bell with slash:', '&#x1F515');
-
-// musik
-	Smilies::add($b, ':musical score:', '&#x1F3BC');
-	Smilies::add($b, ':musical note:', '&#x1F3B5');
-	Smilies::add($b, ':musical notes:', '&#x1F3B6');
-	Smilies::add($b, ':studio microphone:', '&#x1F399');
-	Smilies::add($b, ':level slider:', '&#x1F39A');
-	Smilies::add($b, ':control knobs:', '&#x1F39B');
-	Smilies::add($b, ':microphone:', '&#x1F3A4');
-	Smilies::add($b, ':headphone:', '&#x1F3A7');
-	Smilies::add($b, ':radio:', '&#x1F4FB');    
-
-// musical-instrument
-	Smilies::add($b, ':saxophone:', '&#x1F3B7');
-	Smilies::add($b, ':guitar:', '&#x1F3B8');
-	Smilies::add($b, ':musical keyboard:', '&#x1F3B9');
-	Smilies::add($b, ':trumpet:', '&#x1F3BA');
-	Smilies::add($b, ':violin:', '&#x1F3BB');
-//  Smilies::add($b, ':banjo:', '&#x1FA95');
-	Smilies::add($b, ':drum:', '&#x1F941');
-
-// phone
-	Smilies::add($b, ':mobile phone:', '&#x1F4F1');
-	Smilies::add($b, ':mobile phone with arrow:', '&#x1F4F2');
-	Smilies::add($b, ':telephone:', '&#x260E');
-	Smilies::add($b, ':telephone receiver:', '&#x1F4DE');
-	Smilies::add($b, ':pager:', '&#x1F4DF');
-	Smilies::add($b, ':fax machine:', '&#x1F4E0');
-
-// computer
-	Smilies::add($b, ':battery:', '&#x1F50B');
-	Smilies::add($b, ':electric plug:', '&#x1F50C');
-	Smilies::add($b, ':laptop:', '&#x1F4BB');
-	Smilies::add($b, ':desktop computer:', '&#x1F5A5');
-	Smilies::add($b, ':printer:', '&#x1F5A8');
-	Smilies::add($b, ':keyboard:', '&#x2328');
-	Smilies::add($b, ':computer mouse:', '&#x1F5B1');
-	Smilies::add($b, ':trackball:', '&#x1F5B2');
-	Smilies::add($b, ':computer disk:', '&#x1F4BD');
-	Smilies::add($b, ':floppy disk:', '&#x1F4BE');
-	Smilies::add($b, ':optical disk:', '&#x1F4BF');
-	Smilies::add($b, ':dvd:', '&#x1F4C0');
-	Smilies::add($b, ':abacus:', '&#x1F9EE');
-
-// light & video
-	Smilies::add($b, ':movie camera:', '&#x1F3A5');
-	Smilies::add($b, ':film frames:', '&#x1F39E');
-	Smilies::add($b, ':film projector:', '&#x1F4FD');
-	Smilies::add($b, ':clapper board:', '&#x1F3AC');
-	Smilies::add($b, ':television:', '&#x1F4FA');
-	Smilies::add($b, ':camera:', '&#x1F4F7');
-	Smilies::add($b, ':camera with flash:', '&#x1F4F8');
-	Smilies::add($b, ':video camera:', '&#x1F4F9');
-	Smilies::add($b, ':videocassette:', '&#x1F4FC');
-	Smilies::add($b, ':magnifying glass tilted left:', '&#x1F50D');
-	Smilies::add($b, ':magnifying glass tilted right:', '&#x1F50E');
-	Smilies::add($b, ':candle:', '&#x1F56F');
-	Smilies::add($b, ':light bulb:', '&#x1F4A1');
-	Smilies::add($b, ':flashlight:', '&#x1F526');
-	Smilies::add($b, ':red paper lantern:', '&#x1F3EE');
-//	Smilies::add($b, ':diya lamp:', '&#x1FA94');
-
-// book-paper
-	Smilies::add($b, ':notebook with decorative cover:', '&#x1F4D4');
-	Smilies::add($b, ':closed book:', '&#x1F4D5');
-	Smilies::add($b, ':open book:', '&#x1F4D6');
-	Smilies::add($b, ':green book:', '&#x1F4D7');
-	Smilies::add($b, ':blue book:', '&#x1F4D8');
-	Smilies::add($b, ':orange book:', '&#x1F4D9');
-	Smilies::add($b, ':books:', '&#x1F4DA');
-	Smilies::add($b, ':notebook:', '&#x1F4D3');
-	Smilies::add($b, ':ledger:', '&#x1F4D2');
-	Smilies::add($b, ':page with curl:', '&#x1F4C3');
-	Smilies::add($b, ':scroll:', '&#x1F4DC');
-	Smilies::add($b, ':page facing up:', '&#x1F4C4');
-	Smilies::add($b, ':newspaper:', '&#x1F4F0');
-	Smilies::add($b, ':rolled-up newspaper:', '&#x1F5DE');
-	Smilies::add($b, ':bookmark tabs:', '&#x1F4D1');
-	Smilies::add($b, ':bookmark:', '&#x1F516');
-	Smilies::add($b, ':label:', '&#x1F3F7');
-
-// money
-	Smilies::add($b, ':money bag:', '&#x1F4B0');
-	Smilies::add($b, ':yen banknote:', '&#x1F4B4');
-	Smilies::add($b, ':dollar banknote:', '&#x1F4B5');
-	Smilies::add($b, ':euro banknote:', '&#x1F4B6');
-	Smilies::add($b, ':pound banknote:', '&#x1F4B7');
-	Smilies::add($b, ':money with wings:', '&#x1F4B8');
-	Smilies::add($b, ':credit card:', '&#x1F4B3');
-	Smilies::add($b, ':receipt:', '&#x1F9FE');
-	Smilies::add($b, ':chart increasing with yen:', '&#x1F4B9');
-
-// mail
-	Smilies::add($b, ':envelope:', '&#x2709');
-	Smilies::add($b, ':e-mail:', '&#x1F4E7');
-	Smilies::add($b, ':incoming envelope:', '&#x1F4E8');
-	Smilies::add($b, ':envelope with arrow:', '&#x1F4E9');
-	Smilies::add($b, ':outbox tray:', '&#x1F4E4');
-	Smilies::add($b, ':inbox tray:', '&#x1F4E5');
-	Smilies::add($b, ':package:', '&#x1F4E6');
-	Smilies::add($b, ':closed mailbox with raised flag:', '&#x1F4EB');
-	Smilies::add($b, ':closed mailbox with lowered flag:', '&#x1F4EA');
-	Smilies::add($b, ':open mailbox with raised flag:', '&#x1F4EC');
-	Smilies::add($b, ':open mailbox with lowered flag:', '&#x1F4ED');
-	Smilies::add($b, ':postbox:', '&#x1F4EE');
-	Smilies::add($b, ':ballot box with ballot:', '&#x1F5F3');
-
-// writing
-	Smilies::add($b, ':pencil:', '&#x270F');
-	Smilies::add($b, ':black nib:', '&#x2712');
-	Smilies::add($b, ':fountain pen:', '&#x1F58B');
-	Smilies::add($b, ':pen:', '&#x1F58A');
-	Smilies::add($b, ':paintbrush:', '&#x1F58C');
-	Smilies::add($b, ':crayon:', '&#x1F58D');
-	Smilies::add($b, ':memo:', '&#x1F4DD');
-
-// office
-	Smilies::add($b, ':briefcase:', '&#x1F4BC');
-	Smilies::add($b, ':file folder:', '&#x1F4C1');
-	Smilies::add($b, ':open file folder:', '&#x1F4C2');
-	Smilies::add($b, ':card index dividers:', '&#x1F5C2');
-	Smilies::add($b, ':calendar:', '&#x1F4C5');
-	Smilies::add($b, ':tear-off calendar:', '&#x1F4C6');
-	Smilies::add($b, ':spiral notepad:', '&#x1F5D2');
-	Smilies::add($b, ':spiral calendar:', '&#x1F5D3');
-	Smilies::add($b, ':card index:', '&#x1F4C7');
-	Smilies::add($b, ':chart increasing:', '&#x1F4C8');
-	Smilies::add($b, ':chart decreasing:', '&#x1F4C9');
-	Smilies::add($b, ':bar chart:', '&#x1F4CA');
-	Smilies::add($b, ':clipboard:', '&#x1F4CB');
-	Smilies::add($b, ':pushpin:', '&#x1F4CC');
-	Smilies::add($b, ':round pushpin:', '&#x1F4CD');
-	Smilies::add($b, ':paperclip:', '&#x1F4CE');
-	Smilies::add($b, ':linked paperclips:', '&#x1F587');
-	Smilies::add($b, ':straight ruler:', '&#x1F4CF');
-	Smilies::add($b, ':triangular ruler:', '&#x1F4D0');
-	Smilies::add($b, ':scissors:', '&#x2702');
-	Smilies::add($b, ':card file box:', '&#x1F5C3');
-	Smilies::add($b, ':file cabinet:', '&#x1F5C4');
-	Smilies::add($b, ':wastebasket:', '&#x1F5D1');
-
-// lock
-	Smilies::add($b, ':locked:', '&#x1F512');
-	Smilies::add($b, ':unlocked:', '&#x1F513');
-	Smilies::add($b, ':locked with pen:', '&#x1F50F');
-	Smilies::add($b, ':locked with key:', '&#x1F510');
-	Smilies::add($b, ':key:', '&#x1F511');
-	Smilies::add($b, ':old key:', '&#x1F5DD');
-
-// tool
-	Smilies::add($b, ':hammer:', '&#x1F528');
-//	Smilies::add($b, ':axe:', '&#x1FA93');
-	Smilies::add($b, ':pick:', '&#x26CF');
-	Smilies::add($b, ':hammer and pick:', '&#x2692');
-	Smilies::add($b, ':hammer and wrench:', '&#x1F6E0');
-	Smilies::add($b, ':dagger:', '&#x1F5E1');
-	Smilies::add($b, ':sabre:', '&#x1F5E1;');
-	Smilies::add($b, ':crossed swords:', '&#x2694');
-	Smilies::add($b, ':pistol:', '&#x1F52B');
-	Smilies::add($b, ':bow and arrow:', '&#x1F3F9');
-	Smilies::add($b, ':shield:', '&#x1F6E1');
-	Smilies::add($b, ':wrench:', '&#x1F527');
-	Smilies::add($b, ':nut and bolt:', '&#x1F529');
-	Smilies::add($b, ':gear:', '&#x2699');
-	Smilies::add($b, ':clamp:', '&#x1F5DC');
-	Smilies::add($b, ':balance scale:', '&#x2696');
-	Smilies::add($b, ':white cane:', '&#x1F9AF');
-	Smilies::add($b, ':link:', '&#x1F517');
-	Smilies::add($b, ':chains:', '&#x26D3');
-	Smilies::add($b, ':toolbox:', '&#x1F9F0');
-	Smilies::add($b, ':magnet:', '&#x1F9F2');
-
-// science
-	Smilies::add($b, ':alembic:', '&#x2697');
-	Smilies::add($b, ':test tube:', '&#x1F9EA');
-	Smilies::add($b, ':petri dish:', '&#x1F9EB');
-	Smilies::add($b, ':dna:', '&#x1F9EC');
-	Smilies::add($b, ':microscope:', '&#x1F52C');
-	Smilies::add($b, ':telescope:', '&#x1F52D');
-	Smilies::add($b, ':satellite antenna:', '&#x1F4E1');
-
-// medical
-	Smilies::add($b, ':syringe:', '&#x1F489');
-	Smilies::add($b, ':drop of blood:', '&#x1FA78');
-	Smilies::add($b, ':pill:', '&#x1F48A');
-	Smilies::add($b, ':adhesive bandage:', '&#x1FA79');
-	Smilies::add($b, ':stethoscope:', '&#x1FA7A');
-
-// household
-	Smilies::add($b, ':door:', '&#x1F6AA');
-	Smilies::add($b, ':bed:', '&#x1F6CF');
-	Smilies::add($b, ':couch and lamp:', '&#x1F6CB');
-//	Smilies::add($b, ':chair:', '&#x1FA91');
-	Smilies::add($b, ':toilet:', '&#x1F6BD');
-	Smilies::add($b, ':shower:', '&#x1F6BF');
-	Smilies::add($b, ':bathtub:', '&#x1F6C1');
-	Smilies::add($b, ':razor:', '&#x1FA92');
-	Smilies::add($b, ':lotion bottle:', '&#x1F9F4');
-	Smilies::add($b, ':safety pin:', '&#x1F9F7');
-	Smilies::add($b, ':broom:', '&#x1F9F9');
-	Smilies::add($b, ':basket:', '&#x1F9FA');
-	Smilies::add($b, ':roll of paper:', '&#x1F9FB');
-	Smilies::add($b, ':soap:', '&#x1F9FC');
-	Smilies::add($b, ':sponge:', '&#x1F9FD');
-	Smilies::add($b, ':fire extinguisher:', '&#x1F9EF');
-	Smilies::add($b, ':shopping cart:', '&#x1F6D2');
-
-// other-object
-	Smilies::add($b, ':cigarette:', '&#x1F6AC');
-	Smilies::add($b, ':coffin:', '&#x26B0');
-	Smilies::add($b, ':funeral urn:', '&#x26B1');
-	Smilies::add($b, ':moai:', '&#x1F5FF');
-
-// Symbols
-// transport-sign
-	Smilies::add($b, ':atm sign:', '&#x1F3E7');
-	Smilies::add($b, ':litter in bin sign:', '&#x1F6AE');
-	Smilies::add($b, ':potable water:', '&#x1F6B0');
-	Smilies::add($b, ':wheelchair symbol:', '&#x267F');
-	Smilies::add($b, ':men’s room:', '&#x1F6B9');
-	Smilies::add($b, ':women’s room:', '&#x1F6BA');
-	Smilies::add($b, ':restroom:', '&#x1F6BB');
-	Smilies::add($b, ':baby symbol:', '&#x1F6BC');
-	Smilies::add($b, ':water closet:', '&#x1F6BE');
-	Smilies::add($b, ':passport control:', '&#x1F6C2');
-	Smilies::add($b, ':customs:', '&#x1F6C3');
-	Smilies::add($b, ':baggage claim:', '&#x1F6C4');
-	Smilies::add($b, ':left luggage:', '&#x1F6C5');
-
-// warning
-	Smilies::add($b, ':warning:', '&#x26A0');
-	Smilies::add($b, ':children crossing:', '&#x1F6B8');
-	Smilies::add($b, ':no entry:', '&#x26D4');
-	Smilies::add($b, ':prohibited:', '&#x1F6AB');
-	Smilies::add($b, ':no bicycles:', '&#x1F6B3');
-	Smilies::add($b, ':no smoking:', '&#x1F6AD');
-	Smilies::add($b, ':no littering:', '&#x1F6AF');
-	Smilies::add($b, ':non-potable water:', '&#x1F6B1');
-	Smilies::add($b, ':no pedestrians:', '&#x1F6B7');
-	Smilies::add($b, ':no mobile phones:', '&#x1F4F5');
-	Smilies::add($b, ':no one under eighteen:', '&#x1F51E');
-	Smilies::add($b, ':radioactive:', '&#x2622');
-	Smilies::add($b, ':biohazard:', '&#x2623');
-	Smilies::add($b, ':army:', '&#x1FA96;');
-
-// arrow
-	Smilies::add($b, ':up arrow:', '&#x2B06');
-	Smilies::add($b, ':up-right arrow:', '&#x2197');
-	Smilies::add($b, ':right arrow:', '&#x27A1');
-	Smilies::add($b, ':down-right arrow:', '&#x2198');
-	Smilies::add($b, ':down arrow:', '&#x2B07');
-	Smilies::add($b, ':down-left arrow:', '&#x2199');
-	Smilies::add($b, ':left arrow:', '&#x2B05');
-	Smilies::add($b, ':up-left arrow:', '&#x2196');
-	Smilies::add($b, ':up-down arrow:', '&#x2195');
-	Smilies::add($b, ':left-right arrow:', '&#x2194');
-	Smilies::add($b, ':right arrow curving left:', '&#x21A9');
-	Smilies::add($b, ':left arrow curving right:', '&#x21AA');
-	Smilies::add($b, ':right arrow curving up:', '&#x2934');
-	Smilies::add($b, ':right arrow curving down:', '&#x2935');
-	Smilies::add($b, ':clockwise vertical arrows:', '&#x1F503');
-	Smilies::add($b, ':counterclockwise arrows button:', '&#x1F504');
-	Smilies::add($b, ':BACK arrow:', '&#x1F519');
-	Smilies::add($b, ':END arrow:', '&#x1F51A');
-	Smilies::add($b, ':ON! arrow:', '&#x1F51B');
-	Smilies::add($b, ':SOON arrow:', '&#x1F51C');
-	Smilies::add($b, ':TOP arrow:', '&#x1F51D');
-
-// religion
-	Smilies::add($b, ':place of worship:', '&#x1F6D0');
-	Smilies::add($b, ':atom symbol:', '&#x269B');
-	Smilies::add($b, ':om:', '&#x1F549');
-	Smilies::add($b, ':star of David:', '&#x2721');
-	Smilies::add($b, ':wheel of dharma:', '&#x2638');
-	Smilies::add($b, ':yin yang:', '&#x262F');
-	Smilies::add($b, ':latin cross:', '&#x271D');
-	Smilies::add($b, ':orthodox cross:', '&#x2626');
-	Smilies::add($b, ':star and crescent:', '&#x262A');
-	Smilies::add($b, ':peace symbol:', '&#x262E');
-	Smilies::add($b, ':menorah:', '&#x1F54E');
-	Smilies::add($b, ':dotted six-pointed star:', '&#x1F52F');
-
-// zodiac
-	Smilies::add($b, ':Aries:', '&#x2648');
-	Smilies::add($b, ':Taurus:', '&#x2649');
-	Smilies::add($b, ':Gemini:', '&#x264A');
-	Smilies::add($b, ':Cancer:', '&#x264B');
-	Smilies::add($b, ':Leo:', '&#x264C');
-	Smilies::add($b, ':Virgo:', '&#x264D');
-	Smilies::add($b, ':Libra:', '&#x264E');
-	Smilies::add($b, ':Scorpio:', '&#x264F');
-	Smilies::add($b, ':Sagittarius:', '&#x2650');
-	Smilies::add($b, ':Capricorn:', '&#x2651');
-	Smilies::add($b, ':Aquarius:', '&#x2652');
-	Smilies::add($b, ':Pisces:', '&#x2653');
-	Smilies::add($b, ':Ophiuchus:', '&#x26CE');
-
-// av-symbol
-	Smilies::add($b, ':shuffle tracks button:', '&#x1F500');
-	Smilies::add($b, ':repeat button:', '&#x1F501');
-	Smilies::add($b, ':repeat single button:', '&#x1F502');
-	Smilies::add($b, ':play button:', '&#x25B6');
-	Smilies::add($b, ':fast-forward button:', '&#x23E9');
-	Smilies::add($b, ':next track button:', '&#x23ED');
-	Smilies::add($b, ':play or pause button:', '&#x23EF');
-	Smilies::add($b, ':reverse button:', '&#x25C0');
-	Smilies::add($b, ':fast reverse button:', '&#x23EA');
-	Smilies::add($b, ':last track button:', '&#x23EE');
-	Smilies::add($b, ':upwards button:', '&#x1F53C');
-	Smilies::add($b, ':fast up button:', '&#x23EB');
-	Smilies::add($b, ':downwards button:', '&#x1F53D');
-	Smilies::add($b, ':fast down button:', '&#x23EC');
-	Smilies::add($b, ':pause button:', '&#x23F8');
-	Smilies::add($b, ':stop button:', '&#x23F9');
-	Smilies::add($b, ':record button:', '&#x23FA');
-	Smilies::add($b, ':eject button:', '&#x23CF');
-	Smilies::add($b, ':cinema:', '&#x1F3A6');
-	Smilies::add($b, ':dim button:', '&#x1F505');
-	Smilies::add($b, ':bright button:', '&#x1F506');
-	Smilies::add($b, ':antenna bars:', '&#x1F4F6');
-	Smilies::add($b, ':vibration mode:', '&#x1F4F3');
-	Smilies::add($b, ':mobile phone off:', '&#x1F4F4');
-
-// gender
-	Smilies::add($b, ':female sign:', '&#x2640');
-	Smilies::add($b, ':male sign:', '&#x2642');
-
-// math
-	Smilies::add($b, ':multiply:', '&#x2716');
-	Smilies::add($b, ':plus:', '&#x2795');
-	Smilies::add($b, ':minus:', '&#x2796');
-	Smilies::add($b, ':divide:', '&#x2797');
-	Smilies::add($b, ':infinity:', '&#x267E');
-	Smilies::add($b, ':kreisoperator:', '&#x2218;');
-	Smilies::add($b, ':leere menge:', '&#x2205;');
-	Smilies::add($b, ':rundung:', '&#x2248;');
-	Smilies::add($b, ':gleichung:', '&#x003D;');
-	Smilies::add($b, ':ungleichung:', '&#x2260;');
-	Smilies::add($b, ':kleiner als:', '&#x003C;');
-	Smilies::add($b, ':groesser als:', '&#x003E;');
-	Smilies::add($b, ':prozent:', '&#x0025;');
-
-// punctuation
-	Smilies::add($b, ':double exclamation mark:', '&#x203C');
-	Smilies::add($b, ':exclamation question mark:', '&#x2049');
-	Smilies::add($b, ':question mark:', '&#x2753');
-	Smilies::add($b, ':white question mark:', '&#x2754');
-	Smilies::add($b, ':white exclamation mark:', '&#x2755');
-	Smilies::add($b, ':exclamation mark:', '&#x2757');
-	Smilies::add($b, ':wavy dash:', '&#x3030');
-
-// currency
-	Smilies::add($b, ':currency exchange:', '&#x1F4B1');
-	Smilies::add($b, ':heavy dollar sign:', '&#x1F4B2');
-
-// other-symbol
-	Smilies::add($b, ':medical symbol:', '&#x2695');
-	Smilies::add($b, ':recycling symbol:', '&#x267B');
-	Smilies::add($b, ':fleur-de-lis:', '&#x269C');
-	Smilies::add($b, ':trident emblem:', '&#x1F531');
-	Smilies::add($b, ':name badge:', '&#x1F4DB');
-	Smilies::add($b, ':Japanese symbol for beginner:', '&#x1F530');
-	Smilies::add($b, ':hollow red circle:', '&#x2B55');
-	Smilies::add($b, ':check mark button:', '&#x2705');
-	Smilies::add($b, ':check box with check:', '&#x2611');
-	Smilies::add($b, ':check mark:', '&#x2714');
-	Smilies::add($b, ':cross mark:', '&#x274C');
-	Smilies::add($b, ':cross mark button:', '&#x274E');
-	Smilies::add($b, ':curly loop:', '&#x27B0');
-	Smilies::add($b, ':double curly loop:', '&#x27BF');
-	Smilies::add($b, ':part alternation mark:', '&#x303D');
-	Smilies::add($b, ':eight-spoked asterisk:', '&#x2733');
-	Smilies::add($b, ':eight-pointed star:', '&#x2734');
-	Smilies::add($b, ':sparkle:', '&#x2747');
-	Smilies::add($b, ':copyright:', '&#x00A9');
-	Smilies::add($b, ':registered:', '&#x00AE');
-	Smilies::add($b, ':trade mark:', '&#x2122');
-
-// keycap
-	Smilies::add($b, ':keycap: #:', '&#x0023&#xFE0F&#x20E3');
-	Smilies::add($b, ':keycap: *:', '&#x002A&#xFE0F&#x20E3');
-	Smilies::add($b, ':keycap: 0:', '&#x0030&#xFE0F&#x20E3');
-	Smilies::add($b, ':keycap: 1:', '&#x0031&#xFE0F&#x20E3');
-	Smilies::add($b, ':keycap: 2:', '&#x0032&#xFE0F&#x20E3');
-	Smilies::add($b, ':keycap: 3:', '&#x0033&#xFE0F&#x20E3');
-	Smilies::add($b, ':keycap: 4:', '&#x0034&#xFE0F&#x20E3');
-	Smilies::add($b, ':keycap: 5:', '&#x0035&#xFE0F&#x20E3');
-	Smilies::add($b, ':keycap: 6:', '&#x0036&#xFE0F&#x20E3');
-	Smilies::add($b, ':keycap: 7:', '&#x0037&#xFE0F&#x20E3');
-	Smilies::add($b, ':keycap: 8:', '&#x0038&#xFE0F&#x20E3');
-	Smilies::add($b, ':keycap: 9:', '&#x0039&#xFE0F&#x20E3');
-	Smilies::add($b, ':keycap: 10:', '&#x1F51F');
-
-// alphanum
-	Smilies::add($b, ':input latin uppercase:', '&#x1F520');
-	Smilies::add($b, ':input latin lowercase:', '&#x1F521');
-	Smilies::add($b, ':input numbers:', '&#x1F522');
-	Smilies::add($b, ':input symbols:', '&#x1F523');
-	Smilies::add($b, ':input latin letters:', '&#x1F524');
-	Smilies::add($b, ':A button (blood type):', '&#x1F170');
-	Smilies::add($b, ':AB button (blood type):', '&#x1F18E');
-	Smilies::add($b, ':B button (blood type):', '&#x1F171');
-	Smilies::add($b, ':CL button:', '&#x1F191');
-	Smilies::add($b, ':COOL button:', '&#x1F192');
-	Smilies::add($b, ':cool:', '&#x1F192;');
-	Smilies::add($b, ':FREE button:', '&#x1F193');
-	Smilies::add($b, ':information:', '&#x2139');
-	Smilies::add($b, ':ID button:', '&#x1F194');
-	Smilies::add($b, ':circled M:', '&#x24C2');
-	Smilies::add($b, ':NEW button:', '&#x1F195');
-	Smilies::add($b, ':NG button:', '&#x1F196');
-	Smilies::add($b, ':O button (blood type):', '&#x1F17E');
-	Smilies::add($b, ':OK button:', '&#x1F197');
-	Smilies::add($b, ':P button:', '&#x1F17F');
-	Smilies::add($b, ':SOS button:', '&#x1F198');  
-	Smilies::add($b, ':UP! button:', '&#x1F199');
-	Smilies::add($b, ':VS button:', '&#x1F19A');
-	Smilies::add($b, ':Japanese “here” button:', '&#x1F201');
-	Smilies::add($b, ':Japanese “service charge” button:', '&#x1F202');
-	Smilies::add($b, ':Japanese “monthly amount” button:', '&#x1F237');
-	Smilies::add($b, ':Japanese “not free of charge” button:', '&#x1F236');
-	Smilies::add($b, ':Japanese “reserved” button:', '&#x1F22F');
-	Smilies::add($b, ':Japanese “bargain” button:', '&#x1F250');
-	Smilies::add($b, ':Japanese “discount” button:', '&#x1F239');
-	Smilies::add($b, ':Japanese “free of charge” button:', '&#x1F21A');
-	Smilies::add($b, ':Japanese “prohibited” button:', '&#x1F232');
-	Smilies::add($b, ':Japanese “acceptable” button:', '&#x1F251');
-	Smilies::add($b, ':Japanese “application” button:', '&#x1F238');
-	Smilies::add($b, ':Japanese “passing grade” button:', '&#x1F234');
-	Smilies::add($b, ':Japanese “vacancy” button:', '&#x1F233');
-	Smilies::add($b, ':Japanese “congratulations” button:', '&#x3297');
-	Smilies::add($b, ':Japanese “secret” button:', '&#x3299');
-	Smilies::add($b, ':Japanese “open for business” button:', '&#x1F23A');
-	Smilies::add($b, ':Japanese “no vacancy” button:', '&#x1F235');
-
-// geometric
-	Smilies::add($b, ':red circle:', '&#x1F534');
-//	Smilies::add($b, ':orange circle:', '&#x1F7E0');
-//	Smilies::add($b, ':yellow circle:', '&#x1F7E1');
-//	Smilies::add($b, ':green circle:', '&#x1F7E2');
-	Smilies::add($b, ':blue circle:', '&#x1F535');
-//	Smilies::add($b, ':purple circle:', '&#x1F7E3');
-//	Smilies::add($b, ':brown circle:', '&#x1F7E4');
-	Smilies::add($b, ':black circle:', '&#x26AB');
-	Smilies::add($b, ':white circle:', '&#x26AA');
-//	Smilies::add($b, ':red square:', '&#x1F7E5');
-//	Smilies::add($b, ':orange square:', '&#x1F7E7');
-//	Smilies::add($b, ':yellow square:', '&#x1F7E8');
-//	Smilies::add($b, ':green square:', '&#x1F7E9');
-//	Smilies::add($b, ':blue square:', '&#x1F7E6');
-//	Smilies::add($b, ':purple square:', '&#x1F7EA');
-//	Smilies::add($b, ':brown square:', '&#x1F7EB');
-	Smilies::add($b, ':black large square:', '&#x2B1B');
-	Smilies::add($b, ':white large square:', '&#x2B1C');
-	Smilies::add($b, ':black medium square:', '&#x25FC');
-	Smilies::add($b, ':white medium square:', '&#x25FB');
-	Smilies::add($b, ':black medium-small square:', '&#x25FE');
-	Smilies::add($b, ':white medium-small square:', '&#x25FD');
-	Smilies::add($b, ':black small square:', '&#x25AA');
-	Smilies::add($b, ':white small square:', '&#x25AB');
-	Smilies::add($b, ':large orange diamond:', '&#x1F536');
-	Smilies::add($b, ':large blue diamond:', '&#x1F537');
-	Smilies::add($b, ':small orange diamond:', '&#x1F538');
-	Smilies::add($b, ':small blue diamond:', '&#x1F539');
-	Smilies::add($b, ':red triangle pointed up:', '&#x1F53A');
-	Smilies::add($b, ':red triangle pointed down:', '&#x1F53B');
-	Smilies::add($b, ':diamond with a dot:', '&#x1F4A0');
-	Smilies::add($b, ':radio button:', '&#x1F518');
-	Smilies::add($b, ':white square button:', '&#x1F533');
-	Smilies::add($b, ':black square button:', '&#x1F532');
-
-// Flags
-// flag
-	Smilies::add($b, ':chequered flag:', '&#x1F3C1');
-	Smilies::add($b, ':triangular flag:', '&#x1F6A9');
-	Smilies::add($b, ':crossed flags:', '&#x1F38C');
-	Smilies::add($b, ':black flag:', '&#x1F3F4');
-	Smilies::add($b, ':white flag:', '&#x1F3F3');
-	Smilies::add($b, ':rainbow flag:', '&#x1F3F3&#xFE0F&#x200D&#x1F308');
-	Smilies::add($b, ':pirate flag:', '&#x1F3F4&#x200D&#x2620&#xFE0F');
-
-// country-flag
-	Smilies::add($b, ':ascension island:', '&#x1F1E6&#x1F1E8');
-	Smilies::add($b, ':andorra:', '&#x1F1E6&#x1F1E9');
-	Smilies::add($b, ':united arab emirates:', '&#x1F1E6&#x1F1EA');
-	Smilies::add($b, ':afghanistan:', '&#x1F1E6&#x1F1EB');
-	Smilies::add($b, ':antigua & barbuda:', '&#x1F1E6&#x1F1EC');
-	Smilies::add($b, ':anguilla:', '&#x1F1E6&#x1F1EE');
-	Smilies::add($b, ':albania:', '&#x1F1E6&#x1F1F1');
-	Smilies::add($b, ':armenia:', '&#x1F1E6&#x1F1F2');
-	Smilies::add($b, ':angola:', '&#x1F1E6&#x1F1F4');
-	Smilies::add($b, ':antarctica:', '&#x1F1E6&#x1F1F6');
-	Smilies::add($b, ':argentina:', '&#x1F1E6&#x1F1F7');
-	Smilies::add($b, ':americansamoa:', '&#x1F1E6&#x1F1F8');
-	Smilies::add($b, ':austria:', '&#x1F1E6&#x1F1F9');
-	Smilies::add($b, ':australia:', '&#x1F1E6&#x1F1FA');
-	Smilies::add($b, ':aruba:', '&#x1F1E6&#x1F1FC');
-	Smilies::add($b, ':ålandislands:', '&#x1F1E6&#x1F1FD');
-	Smilies::add($b, ':azerbaijan:', '&#x1F1E6&#x1F1FF');
-	Smilies::add($b, ':bosnia&herzegovina:', '&#x1F1E7&#x1F1E6');
-	Smilies::add($b, ':barbados:', '&#x1F1E7&#x1F1E7');
-	Smilies::add($b, ':bangladesh:', '&#x1F1E7&#x1F1E9');
-	Smilies::add($b, ':belgium:', '&#x1F1E7&#x1F1EA');
-	Smilies::add($b, ':burkinafaso:', '&#x1F1E7&#x1F1EB');
-	Smilies::add($b, ':bulgaria:', '&#x1F1E7&#x1F1EC');
-	Smilies::add($b, ':bahrain:', '&#x1F1E7&#x1F1ED');
-	Smilies::add($b, ':burundi:', '&#x1F1E7&#x1F1EE');
-	Smilies::add($b, ':benin:', '&#x1F1E7&#x1F1EF');
-	Smilies::add($b, ':st.barthélemy:', '&#x1F1E7&#x1F1F1');
-	Smilies::add($b, ':bermuda:', '&#x1F1E7&#x1F1F2');
-	Smilies::add($b, ':brunei:', '&#x1F1E7&#x1F1F3');
-	Smilies::add($b, ':bolivia:', '&#x1F1E7&#x1F1F4');
-	Smilies::add($b, ':caribbeannetherlands:', '&#x1F1E7&#x1F1F6');
-	Smilies::add($b, ':brazil:', '&#x1F1E7&#x1F1F7');
-	Smilies::add($b, ':bahamas:', '&#x1F1E7&#x1F1F8');
-	Smilies::add($b, ':bhutan:', '&#x1F1E7&#x1F1F9');
-	Smilies::add($b, ':bouvetisland:', '&#x1F1E7&#x1F1FB');
-	Smilies::add($b, ':botswana:', '&#x1F1E7&#x1F1FC');
-	Smilies::add($b, ':belarus:', '&#x1F1E7&#x1F1FE');
-	Smilies::add($b, ':belize:', '&#x1F1E7&#x1F1FF');
-	Smilies::add($b, ':canada:', '&#x1F1E8&#x1F1E6');
-	Smilies::add($b, ':cocos(keeling)islands:', '&#x1F1E8&#x1F1E8');
-	Smilies::add($b, ':congo-kinshasa:', '&#x1F1E8&#x1F1E9');
-	Smilies::add($b, ':centralafricanrepublic:', '&#x1F1E8&#x1F1EB');
-	Smilies::add($b, ':congo-brazzaville:', '&#x1F1E8&#x1F1EC');
-	Smilies::add($b, ':switzerland:', '&#x1F1E8&#x1F1ED');
-	Smilies::add($b, ':côted’ivoire:', '&#x1F1E8&#x1F1EE');
-	Smilies::add($b, ':cookislands:', '&#x1F1E8&#x1F1F0');
-	Smilies::add($b, ':chile:', '&#x1F1E8&#x1F1F1');
-	Smilies::add($b, ':cameroon:', '&#x1F1E8&#x1F1F2');
-	Smilies::add($b, ':china:', '&#x1F1E8&#x1F1F3');
-	Smilies::add($b, ':colombia:', '&#x1F1E8&#x1F1F4');
-	Smilies::add($b, ':clippertonisland:', '&#x1F1E8&#x1F1F5');
-	Smilies::add($b, ':costarica:', '&#x1F1E8&#x1F1F7');
-	Smilies::add($b, ':cuba:', '&#x1F1E8&#x1F1FA');
-	Smilies::add($b, ':capeverde:', '&#x1F1E8&#x1F1FB');
-	Smilies::add($b, ':curaçao:', '&#x1F1E8&#x1F1FC');
-	Smilies::add($b, ':christmasisland:', '&#x1F1E8&#x1F1FD');
-	Smilies::add($b, ':cyprus:', '&#x1F1E8&#x1F1FE');
-	Smilies::add($b, ':czechia:', '&#x1F1E8&#x1F1FF');
-	Smilies::add($b, ':germany:', '&#x1F1E9&#x1F1EA');
-	Smilies::add($b, ':diegogarcia:', '&#x1F1E9&#x1F1EC');
-	Smilies::add($b, ':djibouti:', '&#x1F1E9&#x1F1EF');
-	Smilies::add($b, ':denmark:', '&#x1F1E9&#x1F1F0');
-	Smilies::add($b, ':dominica:', '&#x1F1E9&#x1F1F2');
-	Smilies::add($b, ':dominicanrepublic:', '&#x1F1E9&#x1F1F4');
-	Smilies::add($b, ':algeria:', '&#x1F1E9&#x1F1FF');
-	Smilies::add($b, ':ceuta&melilla:', '&#x1F1EA&#x1F1E6');
-	Smilies::add($b, ':ecuador:', '&#x1F1EA&#x1F1E8');
-	Smilies::add($b, ':estonia:', '&#x1F1EA&#x1F1EA');
-	Smilies::add($b, ':egypt:', '&#x1F1EA&#x1F1EC');
-	Smilies::add($b, ':westernsahara:', '&#x1F1EA&#x1F1ED');
-	Smilies::add($b, ':eritrea:', '&#x1F1EA&#x1F1F7');
-	Smilies::add($b, ':spain:', '&#x1F1EA&#x1F1F8');
-	Smilies::add($b, ':ethiopia:', '&#x1F1EA&#x1F1F9');
-	Smilies::add($b, ':europeanunion:', '&#x1F1EA&#x1F1FA');
-	Smilies::add($b, ':finland:', '&#x1F1EB&#x1F1EE');
-	Smilies::add($b, ':fiji:', '&#x1F1EB&#x1F1EF');
-	Smilies::add($b, ':falklandislands:', '&#x1F1EB&#x1F1F0');
-	Smilies::add($b, ':micronesia:', '&#x1F1EB&#x1F1F2');
-	Smilies::add($b, ':faroeislands:', '&#x1F1EB&#x1F1F4');
-	Smilies::add($b, ':france:', '&#x1F1EB&#x1F1F7');
-	Smilies::add($b, ':gabon:', '&#x1F1EC&#x1F1E6');
-	Smilies::add($b, ':unitedkingdom:', '&#x1F1EC&#x1F1E7');
-	Smilies::add($b, ':grenada:', '&#x1F1EC&#x1F1E9');
-	Smilies::add($b, ':georgia:', '&#x1F1EC&#x1F1EA');
-	Smilies::add($b, ':frenchguiana:', '&#x1F1EC&#x1F1EB');
-	Smilies::add($b, ':guernsey:', '&#x1F1EC&#x1F1EC');
-	Smilies::add($b, ':ghana:', '&#x1F1EC&#x1F1ED');
-	Smilies::add($b, ':gibraltar:', '&#x1F1EC&#x1F1EE');
-	Smilies::add($b, ':greenland:', '&#x1F1EC&#x1F1F1');
-	Smilies::add($b, ':gambia:', '&#x1F1EC&#x1F1F2');
-	Smilies::add($b, ':guinea:', '&#x1F1EC&#x1F1F3');
-	Smilies::add($b, ':guadeloupe:', '&#x1F1EC&#x1F1F5');
-	Smilies::add($b, ':equatorialguinea:', '&#x1F1EC&#x1F1F6');
-	Smilies::add($b, ':greece:', '&#x1F1EC&#x1F1F7');
-	Smilies::add($b, ':southgeorgia&southsandwichislands:', '&#x1F1EC&#x1F1F8');
-	Smilies::add($b, ':guatemala:', '&#x1F1EC&#x1F1F9');
-	Smilies::add($b, ':guam:', '&#x1F1EC&#x1F1FA');
-	Smilies::add($b, ':guinea-bissau:', '&#x1F1EC&#x1F1FC');
-	Smilies::add($b, ':guyana:', '&#x1F1EC&#x1F1FE');
-	Smilies::add($b, ':hongkongsarchina:', '&#x1F1ED&#x1F1F0');
-	Smilies::add($b, ':heard&mcdonaldislands:', '&#x1F1ED&#x1F1F2');
-	Smilies::add($b, ':honduras:', '&#x1F1ED&#x1F1F3');
-	Smilies::add($b, ':croatia:', '&#x1F1ED&#x1F1F7');
-	Smilies::add($b, ':haiti:', '&#x1F1ED&#x1F1F9');
-	Smilies::add($b, ':hungary:', '&#x1F1ED&#x1F1FA');
-	Smilies::add($b, ':canaryislands:', '&#x1F1EE&#x1F1E8');
-	Smilies::add($b, ':indonesia:', '&#x1F1EE&#x1F1E9');
-	Smilies::add($b, ':ireland:', '&#x1F1EE&#x1F1EA');
-	Smilies::add($b, ':israel:', '&#x1F1EE&#x1F1F1');
-	Smilies::add($b, ':isleofman:', '&#x1F1EE&#x1F1F2');
-	Smilies::add($b, ':india:', '&#x1F1EE&#x1F1F3');
-	Smilies::add($b, ':britishindianoceanterritory:', '&#x1F1EE&#x1F1F4');
-	Smilies::add($b, ':iraq:', '&#x1F1EE&#x1F1F6');
-	Smilies::add($b, ':iran:', '&#x1F1EE&#x1F1F7');
-	Smilies::add($b, ':iceland:', '&#x1F1EE&#x1F1F8');
-	Smilies::add($b, ':italy:', '&#x1F1EE&#x1F1F9');
-	Smilies::add($b, ':jersey:', '&#x1F1EF&#x1F1EA');
-	Smilies::add($b, ':jamaica:', '&#x1F1EF&#x1F1F2');
-	Smilies::add($b, ':jordan:', '&#x1F1EF&#x1F1F4');
-	Smilies::add($b, ':japan:', '&#x1F1EF&#x1F1F5');
-	Smilies::add($b, ':kenya:', '&#x1F1F0&#x1F1EA');
-	Smilies::add($b, ':kyrgyzstan:', '&#x1F1F0&#x1F1EC');
-	Smilies::add($b, ':cambodia:', '&#x1F1F0&#x1F1ED');
-	Smilies::add($b, ':kiribati:', '&#x1F1F0&#x1F1EE');
-	Smilies::add($b, ':comoros:', '&#x1F1F0&#x1F1F2');
-	Smilies::add($b, ':st.kitts&nevis:', '&#x1F1F0&#x1F1F3');
-	Smilies::add($b, ':northkorea:', '&#x1F1F0&#x1F1F5');
-	Smilies::add($b, ':southkorea:', '&#x1F1F0&#x1F1F7');
-	Smilies::add($b, ':kuwait:', '&#x1F1F0&#x1F1FC');
-	Smilies::add($b, ':caymanislands:', '&#x1F1F0&#x1F1FE');
-	Smilies::add($b, ':kazakhstan:', '&#x1F1F0&#x1F1FF');
-	Smilies::add($b, ':laos:', '&#x1F1F1&#x1F1E6');
-	Smilies::add($b, ':lebanon:', '&#x1F1F1&#x1F1E7');
-	Smilies::add($b, ':st.lucia:', '&#x1F1F1&#x1F1E8');
-	Smilies::add($b, ':liechtenstein:', '&#x1F1F1&#x1F1EE');
-	Smilies::add($b, ':srilanka:', '&#x1F1F1&#x1F1F0');
-	Smilies::add($b, ':liberia:', '&#x1F1F1&#x1F1F7');
-	Smilies::add($b, ':lesotho:', '&#x1F1F1&#x1F1F8');
-	Smilies::add($b, ':lithuania:', '&#x1F1F1&#x1F1F9');
-	Smilies::add($b, ':luxembourg:', '&#x1F1F1&#x1F1FA');
-	Smilies::add($b, ':latvia:', '&#x1F1F1&#x1F1FB');
-	Smilies::add($b, ':libya:', '&#x1F1F1&#x1F1FE');
-	Smilies::add($b, ':morocco:', '&#x1F1F2&#x1F1E6');
-	Smilies::add($b, ':monaco:', '&#x1F1F2&#x1F1E8');
-	Smilies::add($b, ':moldova:', '&#x1F1F2&#x1F1E9');
-	Smilies::add($b, ':montenegro:', '&#x1F1F2&#x1F1EA');
-	Smilies::add($b, ':st.martin:', '&#x1F1F2&#x1F1EB');
-	Smilies::add($b, ':madagascar:', '&#x1F1F2&#x1F1EC');
-	Smilies::add($b, ':marshallislands:', '&#x1F1F2&#x1F1ED');
-	Smilies::add($b, ':northmacedonia:', '&#x1F1F2&#x1F1F0');
-	Smilies::add($b, ':mali:', '&#x1F1F2&#x1F1F1');
-	Smilies::add($b, ':myanmar(burma):', '&#x1F1F2&#x1F1F2');
-	Smilies::add($b, ':mongolia:', '&#x1F1F2&#x1F1F3');
-	Smilies::add($b, ':macaosarchina:', '&#x1F1F2&#x1F1F4');
-	Smilies::add($b, ':northernmarianaislands:', '&#x1F1F2&#x1F1F5');
-	Smilies::add($b, ':martinique:', '&#x1F1F2&#x1F1F6');
-	Smilies::add($b, ':mauritania:', '&#x1F1F2&#x1F1F7');
-	Smilies::add($b, ':montserrat:', '&#x1F1F2&#x1F1F8');
-	Smilies::add($b, ':malta:', '&#x1F1F2&#x1F1F9');
-	Smilies::add($b, ':mauritius:', '&#x1F1F2&#x1F1FA');
-	Smilies::add($b, ':maldives:', '&#x1F1F2&#x1F1FB');
-	Smilies::add($b, ':malawi:', '&#x1F1F2&#x1F1FC');
-	Smilies::add($b, ':mexico:', '&#x1F1F2&#x1F1FD');
-	Smilies::add($b, ':malaysia:', '&#x1F1F2&#x1F1FE');
-	Smilies::add($b, ':mozambique:', '&#x1F1F2&#x1F1FF');
-	Smilies::add($b, ':namibia:', '&#x1F1F3&#x1F1E6');
-	Smilies::add($b, ':newcaledonia:', '&#x1F1F3&#x1F1E8');
-	Smilies::add($b, ':niger:', '&#x1F1F3&#x1F1EA');
-	Smilies::add($b, ':norfolkisland:', '&#x1F1F3&#x1F1EB');
-	Smilies::add($b, ':nigeria:', '&#x1F1F3&#x1F1EC');
-	Smilies::add($b, ':nicaragua:', '&#x1F1F3&#x1F1EE');
-	Smilies::add($b, ':netherlands:', '&#x1F1F3&#x1F1F1');
-	Smilies::add($b, ':norway:', '&#x1F1F3&#x1F1F4');
-	Smilies::add($b, ':nepal:', '&#x1F1F3&#x1F1F5');
-	Smilies::add($b, ':nauru:', '&#x1F1F3&#x1F1F7');
-	Smilies::add($b, ':niue:', '&#x1F1F3&#x1F1FA');
-	Smilies::add($b, ':newzealand:', '&#x1F1F3&#x1F1FF');
-	Smilies::add($b, ':oman:', '&#x1F1F4&#x1F1F2');
-	Smilies::add($b, ':panama:', '&#x1F1F5&#x1F1E6');
-	Smilies::add($b, ':peru:', '&#x1F1F5&#x1F1EA');
-	Smilies::add($b, ':frenchpolynesia:', '&#x1F1F5&#x1F1EB');
-	Smilies::add($b, ':papuanewguinea:', '&#x1F1F5&#x1F1EC');
-	Smilies::add($b, ':philippines:', '&#x1F1F5&#x1F1ED');
-	Smilies::add($b, ':pakistan:', '&#x1F1F5&#x1F1F0');
-	Smilies::add($b, ':poland:', '&#x1F1F5&#x1F1F1');
-	Smilies::add($b, ':st.pierre&miquelon:', '&#x1F1F5&#x1F1F2');
-	Smilies::add($b, ':pitcairnislands:', '&#x1F1F5&#x1F1F3');
-	Smilies::add($b, ':puertorico:', '&#x1F1F5&#x1F1F7');
-	Smilies::add($b, ':palestinianterritories:', '&#x1F1F5&#x1F1F8');
-	Smilies::add($b, ':portugal:', '&#x1F1F5&#x1F1F9');
-	Smilies::add($b, ':palau:', '&#x1F1F5&#x1F1FC');
-	Smilies::add($b, ':paraguay:', '&#x1F1F5&#x1F1FE');
-	Smilies::add($b, ':qatar:', '&#x1F1F6&#x1F1E6');
-	Smilies::add($b, ':réunion:', '&#x1F1F7&#x1F1EA');
-	Smilies::add($b, ':romania:', '&#x1F1F7&#x1F1F4');
-	Smilies::add($b, ':serbia:', '&#x1F1F7&#x1F1F8');
-	Smilies::add($b, ':russia:', '&#x1F1F7&#x1F1FA');
-	Smilies::add($b, ':rwanda:', '&#x1F1F7&#x1F1FC');
-	Smilies::add($b, ':saudiarabia:', '&#x1F1F8&#x1F1E6');
-	Smilies::add($b, ':solomonislands:', '&#x1F1F8&#x1F1E7');
-	Smilies::add($b, ':seychelles:', '&#x1F1F8&#x1F1E8');
-	Smilies::add($b, ':sudan:', '&#x1F1F8&#x1F1E9');
-	Smilies::add($b, ':sweden:', '&#x1F1F8&#x1F1EA');
-	Smilies::add($b, ':singapore:', '&#x1F1F8&#x1F1EC');
-	Smilies::add($b, ':st.helena:', '&#x1F1F8&#x1F1ED');
-	Smilies::add($b, ':slovenia:', '&#x1F1F8&#x1F1EE');
-	Smilies::add($b, ':svalbard&janmayen:', '&#x1F1F8&#x1F1EF');
-	Smilies::add($b, ':slovakia:', '&#x1F1F8&#x1F1F0');
-	Smilies::add($b, ':sierraleone:', '&#x1F1F8&#x1F1F1');
-	Smilies::add($b, ':sanmarino:', '&#x1F1F8&#x1F1F2');
-	Smilies::add($b, ':senegal:', '&#x1F1F8&#x1F1F3');
-	Smilies::add($b, ':somalia:', '&#x1F1F8&#x1F1F4');
-	Smilies::add($b, ':suriname:', '&#x1F1F8&#x1F1F7');
-	Smilies::add($b, ':southsudan:', '&#x1F1F8&#x1F1F8');
-	Smilies::add($b, ':sãotomé&príncipe:', '&#x1F1F8&#x1F1F9');
-	Smilies::add($b, ':elsalvador:', '&#x1F1F8&#x1F1FB');
-	Smilies::add($b, ':sintmaarten:', '&#x1F1F8&#x1F1FD');
-	Smilies::add($b, ':syria:', '&#x1F1F8&#x1F1FE');
-	Smilies::add($b, ':eswatini:', '&#x1F1F8&#x1F1FF');
-	Smilies::add($b, ':tristandacunha:', '&#x1F1F9&#x1F1E6');
-	Smilies::add($b, ':turks&caicosislands:', '&#x1F1F9&#x1F1E8');
-	Smilies::add($b, ':chad:', '&#x1F1F9&#x1F1E9');
-	Smilies::add($b, ':frenchsouthernterritories:', '&#x1F1F9&#x1F1EB');
-	Smilies::add($b, ':togo:', '&#x1F1F9&#x1F1EC');
-	Smilies::add($b, ':thailand:', '&#x1F1F9&#x1F1ED');
-	Smilies::add($b, ':tajikistan:', '&#x1F1F9&#x1F1EF');
-	Smilies::add($b, ':tokelau:', '&#x1F1F9&#x1F1F0');
-	Smilies::add($b, ':timor-leste:', '&#x1F1F9&#x1F1F1');
-	Smilies::add($b, ':turkmenistan:', '&#x1F1F9&#x1F1F2');
-	Smilies::add($b, ':tunisia:', '&#x1F1F9&#x1F1F3');
-	Smilies::add($b, ':tonga:', '&#x1F1F9&#x1F1F4');
-	Smilies::add($b, ':turkey:', '&#x1F1F9&#x1F1F7');
-	Smilies::add($b, ':trinidad&tobago:', '&#x1F1F9&#x1F1F9');
-	Smilies::add($b, ':tuvalu:', '&#x1F1F9&#x1F1FB');
-	Smilies::add($b, ':taiwan:', '&#x1F1F9&#x1F1FC');
-	Smilies::add($b, ':tanzania:', '&#x1F1F9&#x1F1FF');
-	Smilies::add($b, ':ukraine:', '&#x1F1FA&#x1F1E6');
-	Smilies::add($b, ':uganda:', '&#x1F1FA&#x1F1EC');
-	Smilies::add($b, ':u.s.outlyingislands:', '&#x1F1FA&#x1F1F2');
-	Smilies::add($b, ':unitednations:', '&#x1F1FA&#x1F1F3');
-	Smilies::add($b, ':unitedstates:', '&#x1F1FA&#x1F1F8');
-	Smilies::add($b, ':uruguay:', '&#x1F1FA&#x1F1FE');
-	Smilies::add($b, ':uzbekistan:', '&#x1F1FA&#x1F1FF');
-	Smilies::add($b, ':vaticancity:', '&#x1F1FB&#x1F1E6');
-	Smilies::add($b, ':st.vincent&grenadines:', '&#x1F1FB&#x1F1E8');
-	Smilies::add($b, ':venezuela:', '&#x1F1FB&#x1F1EA');
-	Smilies::add($b, ':britishvirginislands:', '&#x1F1FB&#x1F1EC');
-	Smilies::add($b, ':u.s.virginislands:', '&#x1F1FB&#x1F1EE');
-	Smilies::add($b, ':vietnam:', '&#x1F1FB&#x1F1F3');
-	Smilies::add($b, ':vanuatu:', '&#x1F1FB&#x1F1FA');
-	Smilies::add($b, ':wallis&futuna:', '&#x1F1FC&#x1F1EB');
-	Smilies::add($b, ':samoa:', '&#x1F1FC&#x1F1F8');
-	Smilies::add($b, ':kosovo:', '&#x1F1FD&#x1F1F0');
-	Smilies::add($b, ':yemen:', '&#x1F1FE&#x1F1EA');
-	Smilies::add($b, ':mayotte:', '&#x1F1FE&#x1F1F9');
-	Smilies::add($b, ':southafrica:', '&#x1F1FF&#x1F1E6');
-	Smilies::add($b, ':zambia:', '&#x1F1FF&#x1F1F2');
-	Smilies::add($b, ':zimbabwe:', '&#x1F1FF&#x1F1FC');
-
-// subdivision-flag
- 	Smilies::add($b, ':england:', '&#x1F3F4&#xE0067&#xE0062&#xE0065&#xE006E&#xE0067&#xE007F');
-	Smilies::add($b, ':scotland:', '&#x1F3F4&#xE0067&#xE0062&#xE0073&#xE0074&#xE007F');
-	Smilies::add($b, ':wales:', '&#x1F3F4&#xE0067&#xE0062&#xE0077&#xE006C&#xE0073&#xE007F');
-
-	}
+//	Smilies::add($b, ':facepalm', '&#x1F926;'); // Bad client support
+
+// Animal smileys.
+
+//	Smilies::add($b, ':bunnyflowers', '&#x;');
+	Smilies::add($b, ':chick', '&#x1F424;');
+	Smilies::add($b, ':bumblebee', '&#x1F41D;');
+	Smilies::add($b, ':ladybird', '&#x1F41E;');
+	Smilies::add($b, ':bigspider', '&#x1F577;');
+	Smilies::add($b, ':cat', '&#x1F408;');
+	Smilies::add($b, ':bunny', '&#x1F430;');
+	Smilies::add($b, ':cow', '&#x1F42E;');
+	Smilies::add($b, ':crab', '&#x1F980;');
+	Smilies::add($b, ':dolphin', '&#x1F42C;');
+//	Smilies::add($b, ':dragonfly', '&#x;');
+	Smilies::add($b, ':frog', '&#x1F438;');
+	Smilies::add($b, ':hamster', '&#x1F439;');
+	Smilies::add($b, ':monkey', '&#x1F412;');
+	Smilies::add($b, ':horse', '&#x1F434;');
+//	Smilies::add($b, ':parrot', '&#x;');
+	Smilies::add($b, ':tux', '&#x1F427;');
+	Smilies::add($b, ':snail', '&#x1F40C;');
+	Smilies::add($b, ':sheep', '&#x1F411;');
+	Smilies::add($b, ':dog', '&#x1F436;');
+	Smilies::add($b, ':elephant', '&#x1F418;');
+	Smilies::add($b, ':fish', '&#x1F41F;');
+//	Smilies::add($b, ':giraffe', '&#x1F992;'); // Bad client support
+	Smilies::add($b, ':pig', '&#x1F416;');
+
+// Baby Smileys
+
+	Smilies::add($b, ':baby', '&#x1F476;');
+//	Smilies::add($b, ':babycot', '&#x;');
+//	Smilies::add($b, ':pregnant', '&#x1F930;'); // Bad client support
+//	Smilies::add($b, ':stork', '&#x;');
+
+// Confused Smileys
+
+	Smilies::add($b, ':confused', '&#x1F615;');
+	Smilies::add($b, ':shrug', '&#x1F937;');
+//	Smilies::add($b, ':stupid', '&#x;');
+//	Smilies::add($b, ':dazed', '&#x;');
+
+// Cool Smileys
+
+//	Smilies::add($b, ':affro', '&#x;');
+
+// Devil/Angel Smileys
+
+	Smilies::add($b, ':angel', '&#x1F47C;');
+	Smilies::add($b, ':cherub', '&#x1F47C;');
+//	Smilies::add($b, ':devilangel', '&#x;');
+//	Smilies::add($b, ':catdevil', '&#x;');
+//	Smilies::add($b, ':devillish', '&#x;');
+//	Smilies::add($b, ':daseesaw', '&#x;');
+//	Smilies::add($b, ':turnevil', '&#x;');
+//	Smilies::add($b, ':saint', '&#x;');
+//	Smilies::add($b, ':graveside', '&#x;');
+
+// Unpleasent smileys.
+
+	Smilies::add($b, ':toilet', '&#x1F6BD;');
+//	Smilies::add($b, ':fartinbed', '&#x;');
+//	Smilies::add($b, ':fartblush', '&#x;');
+
+// Sad smileys
+
+	Smilies::add($b, ':crying', '&#x1F622;');
+//	Smilies::add($b, ':prisoner', '&#x;');
+//	Smilies::add($b, ':sigh', '&#x;');
+
+// Smoking - only one smiley in here, maybe it needs moving elsewhere?
+
+	Smilies::add($b, ':smoking', '&#x1F6AC;');
+
+// Sport smileys
+
+	Smilies::add($b, ':basketball', '&#x1F3C0;');
+	Smilies::add($b, '~bowling', '&#x1F3B3;');
+	Smilies::add($b, ':cycling', '&#x1F6B4;');
+	Smilies::add($b, ':darts', '&#x1F3AF;');
+	Smilies::add($b, ':fencing', '&#x1F93A;');
+	Smilies::add($b, ':juggling', '&#x1F939;');
+//	Smilies::add($b, ':skipping', '&#x;');
+//	Smilies::add($b, ':archery', '&#x;');
+	Smilies::add($b, ':surfing', '&#x1F3C4;');
+	Smilies::add($b, ':snooker', '&#x1F3B1;');
+	Smilies::add($b, ':horseriding', '&#x1F3C7;');
+
+// Love smileys
+
+//	Smilies::add($b, ':iloveyou', '&#x;');
+//	Smilies::add($b, ':inlove', '&#x;');
+//	Smilies::add($b, '~love', '&#x;');
+//	Smilies::add($b, ':lovebear', '&#x;');
+//	Smilies::add($b, ':lovebed', '&#x;');
+	Smilies::add($b, ':loveheart', '&#x1F496;');
+
+// Tired/Sleep smileys
+
+//	Smilies::add($b, ':countsheep', '&#x;');
+//	Smilies::add($b, ':hammock', '&#x;');
+//	Smilies::add($b, ':pillow', '&#x;');
+//	Smilies::add($b, ':yawn', '&#x;');
+
+// Fight/Flame/Violent smileys
+
+//	Smilies::add($b, ':2guns', '&#x;');
+//	Smilies::add($b, ':alienfight', '&#x;');
+//	Smilies::add($b, ':army', '&#x;');
+//	Smilies::add($b, ':arrowhead', '&#x;');
+//	Smilies::add($b, ':bfg', '&#x;');
+//	Smilies::add($b, ':bowman', '&#x;');
+//	Smilies::add($b, ':chainsaw', '&#x;');
+//	Smilies::add($b, ':crossbow', '&#x;');
+//	Smilies::add($b, ':crusader', '&#x;');
+//	Smilies::add($b, ':dead', '&#x;');
+//	Smilies::add($b, ':hammersplat', '&#x;');
+//	Smilies::add($b, ':lasergun', '&#x;');
+//	Smilies::add($b, ':machinegun', '&#x;');
+//	Smilies::add($b, ':acid', '&#x;');
+
+// Fantasy smileys - monsters and dragons fantasy.  The other type of fantasy belongs in adult smileys
+
+	Smilies::add($b, ':alienmonster', '&#x1F47E;');
+//	Smilies::add($b, ':barbarian', '&#x;');
+//	Smilies::add($b, ':dinosaur', '&#x;');
+	Smilies::add($b, ':dragon', '&#x1F409;');
+	Smilies::add($b, ':draco', '&#x1F409;');
+	Smilies::add($b, ':ghost', '&#x1F47B;');
+//	Smilies::add($b, ':mummy', '&#x;');
+
+// Food smileys
+
+	Smilies::add($b, ':apple', '&#x1F34E;');
+//	Smilies::add($b, ':broccoli', '&#x;');
+	Smilies::add($b, ':cake', '&#x1F370;');
+//	Smilies::add($b, ':carrot', '&#x1F955;'); // Bad client support
+	Smilies::add($b, ':popcorn', '&#x1F37F;');
+	Smilies::add($b, ':tomato', '&#x1F345;');
+	Smilies::add($b, ':banana', '&#x1F34C;');
+	Smilies::add($b, ':cooking', '&#x1F373;');
+	Smilies::add($b, ':fryegg', '&#x1F373;');
+	Smilies::add($b, ':birthdaycake', '&#x1F382;');
+
+// Happy smileys
+
+//	Smilies::add($b, ':cloud9', '&#x;');
+	Smilies::add($b, ':tearsofjoy', '&#x1F602;');
+
+// Respect smileys
+
+	Smilies::add($b, ':bow', '&#x1F647;');
+//	Smilies::add($b, ':bravo', '&#x;');
+//	Smilies::add($b, ':hailking', '&#x;');
+//	Smilies::add($b, ':number1', '&#x;');
+
+// Laugh smileys
+
+//	Smilies::add($b, ':hahaha', '&#x;');
+//	Smilies::add($b, ':loltv', '&#x;');
+//	Smilies::add($b, ':rofl', '&#x1F923;'); // Bad client support
+// Music smileys
+
+//	Smilies::add($b, ':drums', '&#x1F941;'); // Bad client support
+	Smilies::add($b, ':guitar', '&#x1F3B8;');
+	Smilies::add($b, ':trumpet', '&#x1F3BA;');
+
+// Smileys that used to be in core
+
+//	Smilies::add($b, ':headbang', '&#x;');
+//	Smilies::add($b, ':beard', '&#x1F9D4;'); // Bad client support
+//	Smilies::add($b, ':whitebeard', '&#x;');
+//	Smilies::add($b, ':shaka', '&#x;');
+//	Smilies::add($b, ':\\.../', '&#x;');
+//	Smilies::add($b, ':\\ooo/', '&#x;');
+//	Smilies::add($b, ':headdesk', '&#x;');
+
+// These two are still in core, so oldcore isn't strictly right, but we don't want too many directories
+
+//	Smilies::add($b, ':-d', '&#x;');
+	Smilies::add($b, ':-o', '&#x1F62E;');
+
+//  Regex killers - stick these at the bottom so they appear at the end of the English and
+//  at the start of $OtherLanguage.
+
+// Drinks
+
+	Smilies::add($b, ':tea', '&#x2615;');
+//	Smilies::add($b, ':drool', '&#x1F924;'); // Bad client support
+
+	Smilies::add($b, ':cool', '&#x1F192;');
+//	Smilies::add($b, ':vomit', '&#x1F92E;'); // Bad client support
+	Smilies::add($b, ':golf', '&#x1F3CC;');
+	Smilies::add($b, ':football', '&#x1F3C8;');
+	Smilies::add($b, ':tennis', '&#x1F3BE;');
+//	Smilies::add($b, ':alpha', '&#x;');
+//	Smilies::add($b, ':marine', '&#x;');
+	Smilies::add($b, ':sabre', '&#x1F5E1;');
+//	Smilies::add($b, ':tank', '&#x;');
+//	Smilies::add($b, ':viking', '&#x;');
+//	Smilies::add($b, ':gangs', '&#x;');
+//	Smilies::add($b, ':dj', '&#x;');
+//	Smilies::add($b, ':elvis', '&#x;');
+	Smilies::add($b, ':violin', '&#x1F3BB;');
+}
diff --git a/url_replace/LICENSE.md b/url_replace/LICENSE.md
deleted file mode 100644
index 09dc8f64..00000000
--- a/url_replace/LICENSE.md
+++ /dev/null
@@ -1,21 +0,0 @@
-# MIT License
-
-Copyright © 2024 Dr. Tobias Quathamer <t.quathamer@mailbox.org>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/url_replace/README.md b/url_replace/README.md
deleted file mode 100644
index 348c4426..00000000
--- a/url_replace/README.md
+++ /dev/null
@@ -1,18 +0,0 @@
-# URL replace
-
-This addon will replace all occurrences of specified URLs with the address of
-alternative servers in all displayed postings on a Friendica node.
-
-You can use this to switch from Twitter (or X) to a nitter instance, from
-YouTube to an invidious instance, from Instagram to a proxigram instance,
-or from some news sites to 12ft.io.
-
-Note: If you are using the twitter connector on your server, the links to the
-contacts profile pages will not be replaced by this addon. Only links in the
-body of the postings are affected.
-
-## Why
-
-- Access a website without JavaScript enabled to prevent JavaScript analytics
-  and potential IP-based tracking
-- Avoid seeing ads on YouTube videos
diff --git a/url_replace/lang/C/messages.po b/url_replace/lang/C/messages.po
deleted file mode 100644
index e8dbb04c..00000000
--- a/url_replace/lang/C/messages.po
+++ /dev/null
@@ -1,64 +0,0 @@
-# ADDON url_replace
-# Copyright (C) 
-# This file is distributed under the same license as the Friendica url_replace addon package.
-# 
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-03-14 09:05+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: url_replace.php:68
-msgid "Replace links to X."
-msgstr ""
-
-#: url_replace.php:73
-msgid "Nitter server"
-msgstr ""
-
-#: url_replace.php:75 url_replace.php:88 url_replace.php:101
-#, php-format
-msgid "Specify the URL with protocol. The default is %s."
-msgstr ""
-
-#: url_replace.php:81
-msgid "Replace links to YouTube."
-msgstr ""
-
-#: url_replace.php:86
-msgid "Invidious server"
-msgstr ""
-
-#: url_replace.php:94
-msgid "Replace links to Instagram."
-msgstr ""
-
-#: url_replace.php:99
-msgid "Proxigram server"
-msgstr ""
-
-#: url_replace.php:107
-msgid "Sites which are accessed through 12ft.io"
-msgstr ""
-
-#: url_replace.php:109
-msgid "Specify the URLs with protocol, one per line."
-msgstr ""
-
-#: url_replace.php:113
-msgid "Save settings"
-msgstr ""
-
-#: url_replace.php:179
-msgid ""
-"(URL replace addon enabled for X, YouTube, Instagram and some news sites.)"
-msgstr ""
diff --git a/url_replace/templates/admin.tpl b/url_replace/templates/admin.tpl
deleted file mode 100644
index fec5a253..00000000
--- a/url_replace/templates/admin.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-{{include file="field_checkbox.tpl" field=$nitter_server_enabled}}
-{{include file="field_input.tpl" field=$nitter_server}}
-{{include file="field_checkbox.tpl" field=$invidious_server_enabled}}
-{{include file="field_input.tpl" field=$invidious_server}}
-{{include file="field_checkbox.tpl" field=$proxigram_server_enabled}}
-{{include file="field_input.tpl" field=$proxigram_server}}
-{{include file="field_textarea.tpl" field=$twelvefeet_sites}}
-
-<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
diff --git a/url_replace/url_replace.php b/url_replace/url_replace.php
deleted file mode 100644
index cd3b60b4..00000000
--- a/url_replace/url_replace.php
+++ /dev/null
@@ -1,190 +0,0 @@
-<?php
-/**
- * Name: URL Replace
- * Description: Replaces occurrences of specified URLs with the address of alternative servers in all displays of postings on a node.
- * Version: 1.1
- * Author: Dr. Tobias Quathamer <https://social.anoxinon.de/@toddy>
- * Maintainer: Dr. Tobias Quathamer <https://social.anoxinon.de/@toddy>
- */
-
-use Friendica\Core\Hook;
-use Friendica\Core\Renderer;
-use Friendica\DI;
-
-const URL_REPLACE_NITTER_DEFAULT    = 'https://nitter.net';
-const URL_REPLACE_INVIDIOUS_DEFAULT = 'https://invidio.us';
-const URL_REPLACE_PROXIGRAM_DEFAULT = 'https://proxigram.lunar.icu';
-
-function url_replace_install()
-{
-	Hook::register('prepare_body_final', 'addon/url_replace/url_replace.php', 'url_replace_render');
-}
-
-/**
- * Handle sent data from admin settings
- */
-function url_replace_addon_admin_post()
-{
-	DI::config()->set('url_replace', 'nitter_server_enabled', !empty($_POST['nitter_server_enabled']));
-	$nitter_server = rtrim(trim($_POST['nitter_server']), '/');
-	if ($nitter_server) {
-		DI::config()->set('url_replace', 'nitter_server', $nitter_server);
-	} else {
-		DI::config()->delete('url_replace', 'nitter_server');
-	}
-	DI::config()->set('url_replace', 'invidious_server_enabled', !empty($_POST['invidious_server_enabled']));
-	$invidious_server = rtrim(trim($_POST['invidious_server']), '/');
-	if ($invidious_server) {
-		DI::config()->set('url_replace', 'invidious_server', $invidious_server);
-	} else {
-		DI::config()->delete('url_replace', 'invidious_server');
-	}
-	DI::config()->set('url_replace', 'proxigram_server_enabled', !empty($_POST['proxigram_server_enabled']));
-	$proxigram_server = rtrim(trim($_POST['proxigram_server']), '/');
-	if ($proxigram_server) {
-		DI::config()->set('url_replace', 'proxigram_server', $proxigram_server);
-	} else {
-		DI::config()->delete('url_replace', 'proxigram_server');
-	}
-	// Convert twelvefeet_sites into an array before setting the new value
-	$twelvefeet_sites = explode(PHP_EOL, $_POST['twelvefeet_sites']);
-	// Normalize URLs by using lower case, removing a trailing slash and whitespace
-	$twelvefeet_sites = array_map(fn ($value): string => rtrim(trim(strtolower($value)), '/'), $twelvefeet_sites);
-	// Do not store empty lines or duplicates
-	$twelvefeet_sites = array_filter($twelvefeet_sites, fn ($value): bool => !empty($value));
-	$twelvefeet_sites = array_unique($twelvefeet_sites);
-	// Ensure a protocol and default to HTTPS
-	$twelvefeet_sites = array_map(
-		fn ($value): string => substr($value, 0, 4) !== 'http' ? 'https://' . $value : $value,
-		$twelvefeet_sites
-	);
-	asort($twelvefeet_sites);
-	DI::config()->set('url_replace', 'twelvefeet_sites', $twelvefeet_sites);
-}
-
-/**
- * Hook into admin settings to enable choosing a different server
- * for Twitter, YouTube, Instagram, and news sites.
- */
-function url_replace_addon_admin(string &$o)
-{
-	$nitter_server_enabled    = DI::config()->get('url_replace', 'nitter_server_enabled')    ?? true;
-	$nitter_server            = DI::config()->get('url_replace', 'nitter_server')            ?? '';
-	$invidious_server_enabled = DI::config()->get('url_replace', 'invidious_server_enabled') ?? true;
-	$invidious_server         = DI::config()->get('url_replace', 'invidious_server')         ?? '';
-	$proxigram_server_enabled = DI::config()->get('url_replace', 'proxigram_server_enabled') ?? true;
-	$proxigram_server         = DI::config()->get('url_replace', 'proxigram_server')         ?? '';
-	$twelvefeet_sites         = implode(PHP_EOL, DI::config()->get('url_replace', 'twelvefeet_sites') ?? []);
-
-	$t = Renderer::getMarkupTemplate('admin.tpl', 'addon/url_replace/');
-	$o = Renderer::replaceMacros($t, [
-		'$nitter_server_enabled' => [
-			'nitter_server_enabled',
-			DI::l10n()->t('Replace links to X.'),
-			$nitter_server_enabled,
-		],
-		'$nitter_server' => [
-			'nitter_server',
-			DI::l10n()->t('Nitter server'),
-			$nitter_server,
-			DI::l10n()->t('Specify the URL with protocol. The default is %s.', URL_REPLACE_NITTER_DEFAULT),
-			null,
-			'placeholder="' . URL_REPLACE_NITTER_DEFAULT . '"',
-		],
-		'$invidious_server_enabled' => [
-			'invidious_server_enabled',
-			DI::l10n()->t('Replace links to YouTube.'),
-			$invidious_server_enabled,
-		],
-		'$invidious_server' => [
-			'invidious_server',
-			DI::l10n()->t('Invidious server'),
-			$invidious_server,
-			DI::l10n()->t('Specify the URL with protocol. The default is %s.', URL_REPLACE_INVIDIOUS_DEFAULT),
-			null,
-			'placeholder="' . URL_REPLACE_INVIDIOUS_DEFAULT . '"',
-		],
-		'$proxigram_server_enabled' => [
-			'proxigram_server_enabled',
-			DI::l10n()->t('Replace links to Instagram.'),
-			$proxigram_server_enabled,
-		],
-		'$proxigram_server' => [
-			'proxigram_server',
-			DI::l10n()->t('Proxigram server'),
-			$proxigram_server,
-			DI::l10n()->t('Specify the URL with protocol. The default is %s.', URL_REPLACE_PROXIGRAM_DEFAULT),
-			null,
-			'placeholder="' . URL_REPLACE_PROXIGRAM_DEFAULT . '"',
-		],
-		'$twelvefeet_sites' => [
-			'twelvefeet_sites',
-			DI::l10n()->t('Sites which are accessed through 12ft.io'),
-			$twelvefeet_sites,
-			DI::l10n()->t('Specify the URLs with protocol, one per line.'),
-			null,
-			'rows="6"'
-		],
-		'$submit' => DI::l10n()->t('Save settings'),
-	]);
-}
-
-/**
- * Replace proprietary URLs with their specified counterpart
- */
-function url_replace_render(array &$b)
-{
-	$replaced     = false;
-	$replacements = [];
-
-	$nitter_server         = DI::config()->get('url_replace', 'nitter_server')         ?? URL_REPLACE_NITTER_DEFAULT;
-	$nitter_server_enabled = DI::config()->get('url_replace', 'nitter_server_enabled') ?? true;
-	if ($nitter_server_enabled) {
-		$replacements = array_merge($replacements, [
-			'https://mobile.twitter.com' => $nitter_server,
-			'https://twitter.com'        => $nitter_server,
-			'https://mobile.x.com'       => $nitter_server,
-			'https://x.com'              => $nitter_server,
-		]);
-	}
-
-	$invidious_server         = DI::config()->get('url_replace', 'invidious_server')         ?? URL_REPLACE_INVIDIOUS_DEFAULT;
-	$invidious_server_enabled = DI::config()->get('url_replace', 'invidious_server_enabled') ?? true;
-	if ($invidious_server_enabled) {
-		$replacements = array_merge($replacements, [
-			'https://www.youtube.com' => $invidious_server,
-			'https://youtube.com'     => $invidious_server,
-			'https://m.youtube.com'   => $invidious_server,
-			'https://youtu.be'        => $invidious_server,
-		]);
-	}
-
-	$proxigram_server         = DI::config()->get('url_replace', 'proxigram_server')         ?? URL_REPLACE_PROXIGRAM_DEFAULT;
-	$proxigram_server_enabled = DI::config()->get('url_replace', 'proxigram_server_enabled') ?? true;
-	if ($proxigram_server_enabled) {
-		$replacements = array_merge($replacements, [
-			'https://www.instagram.com' => $proxigram_server,
-			'https://instagram.com'     => $proxigram_server,
-			'https://ig.me'             => $proxigram_server,
-		]);
-	}
-
-	foreach ($replacements as $server => $replacement) {
-		if (strpos($b['html'], $server) !== false) {
-			$b['html'] = str_replace($server, $replacement, $b['html']);
-			$replaced  = true;
-		}
-	}
-
-	$twelvefeet_sites = DI::config()->get('url_replace', 'twelvefeet_sites') ?? [];
-	foreach ($twelvefeet_sites as $twelvefeet_site) {
-		if (strpos($b['html'], $twelvefeet_site) !== false) {
-			$b['html'] = str_replace($twelvefeet_site, 'https://12ft.io/' . $twelvefeet_site, $b['html']);
-			$replaced  = true;
-		}
-	}
-
-	if ($replaced) {
-		$b['html'] .= '<hr><p><small>' . DI::l10n()->t('(URL replace addon enabled for X, YouTube, Instagram and some news sites.)') . '</small></p>';
-	}
-}
diff --git a/viewsrc/lang/C/messages.po b/viewsrc/lang/C/messages.po
index 2516817c..8d2c2167 100644
--- a/viewsrc/lang/C/messages.po
+++ b/viewsrc/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:16+0100\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,6 +17,6 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: viewsrc.php:49
+#: viewsrc.php:39
 msgid "View Source"
 msgstr ""
diff --git a/viewsrc/lang/ar/messages.po b/viewsrc/lang/ar/messages.po
deleted file mode 100644
index 5f1b061b..00000000
--- a/viewsrc/lang/ar/messages.po
+++ /dev/null
@@ -1,26 +0,0 @@
-# ADDON viewsrc
-# Copyright (C)
-# This file is distributed under the same license as the Friendica viewsrc addon package.
-# 
-# 
-# Translators:
-# Farida Khalaf <faridakhalaf@hotmail.com>, 2021
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:16+0100\n"
-"PO-Revision-Date: 2018-03-20 07:26+0000\n"
-"Last-Translator: Farida Khalaf <faridakhalaf@hotmail.com>, 2021\n"
-"Language-Team: Arabic (https://www.transifex.com/Friendica/teams/12172/ar/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ar\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-
-#: viewsrc.php:49
-msgid "View Source"
-msgstr "اعرض المصدر"
diff --git a/viewsrc/lang/ar/strings.php b/viewsrc/lang/ar/strings.php
deleted file mode 100644
index b6c4fd9b..00000000
--- a/viewsrc/lang/ar/strings.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_ar")) {
-function string_plural_select_ar($n){
-	$n = intval($n);
-	if ($n==0) { return 0; } else if ($n==1) { return 1; } else if ($n==2) { return 2; } else if ($n%100>=3 && $n%100<=10) { return 3; } else if ($n%100>=11 && $n%100<=99) { return 4; } else  { return 5; }
-}}
-$a->strings['View Source'] = 'اعرض المصدر';
diff --git a/viewsrc/lang/cs/strings.php b/viewsrc/lang/cs/strings.php
index 3de2459b..6ac28bcf 100644
--- a/viewsrc/lang/cs/strings.php
+++ b/viewsrc/lang/cs/strings.php
@@ -3,6 +3,7 @@
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
 	$n = intval($n);
-	if (($n == 1 && $n % 1 == 0)) { return 0; } else if (($n >= 2 && $n <= 4 && $n % 1 == 0)) { return 1; } else if (($n % 1 != 0 )) { return 2; } else  { return 3; }
+	return ($n == 1 && $n % 1 == 0) ? 0 : ($n >= 2 && $n <= 4 && $n % 1 == 0) ? 1: ($n % 1 != 0 ) ? 2 : 3;;
 }}
-$a->strings['View Source'] = 'Zobrazit zdroj';
+;
+$a->strings["View Source"] = "Zobrazit zdroj";
diff --git a/viewsrc/lang/da-dk/messages.po b/viewsrc/lang/da-dk/messages.po
deleted file mode 100644
index 62f041c4..00000000
--- a/viewsrc/lang/da-dk/messages.po
+++ /dev/null
@@ -1,26 +0,0 @@
-# ADDON viewsrc
-# Copyright (C)
-# This file is distributed under the same license as the Friendica viewsrc addon package.
-# 
-# 
-# Translators:
-# Anton <dev@atjn.dk>, 2022
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:16+0100\n"
-"PO-Revision-Date: 2018-03-20 07:26+0000\n"
-"Last-Translator: Anton <dev@atjn.dk>, 2022\n"
-"Language-Team: Danish (Denmark) (https://www.transifex.com/Friendica/teams/12172/da_DK/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: da_DK\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: viewsrc.php:49
-msgid "View Source"
-msgstr "Vis kilde"
diff --git a/viewsrc/lang/da-dk/strings.php b/viewsrc/lang/da-dk/strings.php
deleted file mode 100644
index 61f8043e..00000000
--- a/viewsrc/lang/da-dk/strings.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_da_dk")) {
-function string_plural_select_da_dk($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['View Source'] = 'Vis kilde';
diff --git a/viewsrc/lang/de/messages.po b/viewsrc/lang/de/messages.po
deleted file mode 100644
index 7cd70c0c..00000000
--- a/viewsrc/lang/de/messages.po
+++ /dev/null
@@ -1,26 +0,0 @@
-# ADDON viewsrc
-# Copyright (C)
-# This file is distributed under the same license as the Friendica viewsrc addon package.
-# 
-# 
-# Translators:
-# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2018
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:16+0100\n"
-"PO-Revision-Date: 2018-03-20 07:26+0000\n"
-"Last-Translator: Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2018\n"
-"Language-Team: German (https://app.transifex.com/Friendica/teams/12172/de/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: de\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: viewsrc.php:49
-msgid "View Source"
-msgstr "Quelle ansehen"
diff --git a/viewsrc/lang/de/strings.php b/viewsrc/lang/de/strings.php
index a4f12490..356979be 100644
--- a/viewsrc/lang/de/strings.php
+++ b/viewsrc/lang/de/strings.php
@@ -1,8 +1,3 @@
-<?php
-
-if(! function_exists("string_plural_select_de")) {
-function string_plural_select_de($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['View Source'] = 'Quelle ansehen';
+<?php
+
+$a->strings["View Source"] = "Quelle ansehen";
diff --git a/viewsrc/lang/es/messages.po b/viewsrc/lang/es/messages.po
deleted file mode 100644
index 7e22ccf8..00000000
--- a/viewsrc/lang/es/messages.po
+++ /dev/null
@@ -1,26 +0,0 @@
-# ADDON viewsrc
-# Copyright (C)
-# This file is distributed under the same license as the Friendica viewsrc addon package.
-# 
-# 
-# Translators:
-# Senex Petrovic <javierruizo@hotmail.com>, 2021
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:16+0100\n"
-"PO-Revision-Date: 2018-03-20 07:26+0000\n"
-"Last-Translator: Senex Petrovic <javierruizo@hotmail.com>, 2021\n"
-"Language-Team: Spanish (https://www.transifex.com/Friendica/teams/12172/es/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: es\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: viewsrc.php:49
-msgid "View Source"
-msgstr "Ver fuente"
diff --git a/viewsrc/lang/es/strings.php b/viewsrc/lang/es/strings.php
index 0599f64c..4252372a 100644
--- a/viewsrc/lang/es/strings.php
+++ b/viewsrc/lang/es/strings.php
@@ -1,8 +1,3 @@
-<?php
-
-if(! function_exists("string_plural_select_es")) {
-function string_plural_select_es($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['View Source'] = 'Ver fuente';
+<?php
+
+$a->strings["View Source"] = "Ver fuente";
diff --git a/viewsrc/lang/fi-fi/strings.php b/viewsrc/lang/fi-fi/strings.php
index 37c90e0c..67f25b18 100644
--- a/viewsrc/lang/fi-fi/strings.php
+++ b/viewsrc/lang/fi-fi/strings.php
@@ -3,6 +3,7 @@
 if(! function_exists("string_plural_select_fi_fi")) {
 function string_plural_select_fi_fi($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['View Source'] = 'Näytä lähde';
+;
+$a->strings["View Source"] = "Näytä lähde";
diff --git a/viewsrc/lang/fr/messages.po b/viewsrc/lang/fr/messages.po
index 824d2991..722f7c6d 100644
--- a/viewsrc/lang/fr/messages.po
+++ b/viewsrc/lang/fr/messages.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:16+0100\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
 "PO-Revision-Date: 2018-03-20 07:26+0000\n"
 "Last-Translator: Marie Olive <lacellule101@gmail.com>, 2018\n"
 "Language-Team: French (https://www.transifex.com/Friendica/teams/12172/fr/)\n"
@@ -19,8 +19,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fr\n"
-"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: viewsrc.php:49
+#: viewsrc.php:39
 msgid "View Source"
 msgstr "Voir source"
diff --git a/viewsrc/lang/fr/strings.php b/viewsrc/lang/fr/strings.php
index b13e0c38..a4abe2da 100644
--- a/viewsrc/lang/fr/strings.php
+++ b/viewsrc/lang/fr/strings.php
@@ -1,8 +1,2 @@
 <?php
 
-if(! function_exists("string_plural_select_fr")) {
-function string_plural_select_fr($n){
-	$n = intval($n);
-	if (($n == 0 || $n == 1)) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
-}}
-$a->strings['View Source'] = 'Voir source';
diff --git a/viewsrc/lang/hu/messages.po b/viewsrc/lang/hu/messages.po
deleted file mode 100644
index 68e7f2f1..00000000
--- a/viewsrc/lang/hu/messages.po
+++ /dev/null
@@ -1,26 +0,0 @@
-# ADDON viewsrc
-# Copyright (C)
-# This file is distributed under the same license as the Friendica viewsrc addon package.
-# 
-# 
-# Translators:
-# Balázs Úr, 2020
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:16+0100\n"
-"PO-Revision-Date: 2018-03-20 07:26+0000\n"
-"Last-Translator: Balázs Úr, 2020\n"
-"Language-Team: Hungarian (https://www.transifex.com/Friendica/teams/12172/hu/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: hu\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: viewsrc.php:49
-msgid "View Source"
-msgstr "Forrás megtekintése"
diff --git a/viewsrc/lang/hu/strings.php b/viewsrc/lang/hu/strings.php
deleted file mode 100644
index 857df025..00000000
--- a/viewsrc/lang/hu/strings.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_hu")) {
-function string_plural_select_hu($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['View Source'] = 'Forrás megtekintése';
diff --git a/viewsrc/lang/is/strings.php b/viewsrc/lang/is/strings.php
index 9c54b046..d67368df 100644
--- a/viewsrc/lang/is/strings.php
+++ b/viewsrc/lang/is/strings.php
@@ -3,6 +3,7 @@
 if(! function_exists("string_plural_select_is")) {
 function string_plural_select_is($n){
 	$n = intval($n);
-	return intval($n % 10 != 1 || $n % 100 == 11);
+	return ($n % 10 != 1 || $n % 100 == 11);;
 }}
-$a->strings['View Source'] = 'Skoða uppruna';
+;
+$a->strings["View Source"] = "Skoða uppruna";
diff --git a/viewsrc/lang/it/messages.po b/viewsrc/lang/it/messages.po
index e063ba17..0b9f3f93 100644
--- a/viewsrc/lang/it/messages.po
+++ b/viewsrc/lang/it/messages.po
@@ -3,24 +3,21 @@
 # This file is distributed under the same license as the Friendica viewsrc addon package.
 # 
 # 
-# Translators:
-# fabrixxm <fabrix.xm@gmail.com>, 2018
-# 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:16+0100\n"
-"PO-Revision-Date: 2018-03-20 07:26+0000\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: fabrixxm <fabrix.xm@gmail.com>, 2018\n"
-"Language-Team: Italian (https://app.transifex.com/Friendica/teams/12172/it/)\n"
+"Language-Team: Italian (https://www.transifex.com/Friendica/teams/12172/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: it\n"
-"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: viewsrc.php:49
+#: viewsrc.php:39
 msgid "View Source"
 msgstr "Vedi Sorgente"
diff --git a/viewsrc/lang/it/strings.php b/viewsrc/lang/it/strings.php
index b0b07861..09b93909 100644
--- a/viewsrc/lang/it/strings.php
+++ b/viewsrc/lang/it/strings.php
@@ -2,7 +2,7 @@
 
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
-	$n = intval($n);
-	if ($n == 1) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
+	return ($n != 1);;
 }}
-$a->strings['View Source'] = 'Vedi Sorgente';
+;
+$a->strings["View Source"] = "Vedi Sorgente";
diff --git a/viewsrc/lang/nb-no/messages.po b/viewsrc/lang/nb-no/messages.po
deleted file mode 100644
index b3a64ef3..00000000
--- a/viewsrc/lang/nb-no/messages.po
+++ /dev/null
@@ -1,26 +0,0 @@
-# ADDON viewsrc
-# Copyright (C)
-# This file is distributed under the same license as the Friendica viewsrc addon package.
-# 
-# 
-# Translators:
-# 9d7045af8ca83a89b1b4bf48a2c67786_a2524de <552015d9a2e1abe6fabe3394a3652575_905986>, 2020
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-02-27 05:01-0500\n"
-"PO-Revision-Date: 2018-03-20 07:26+0000\n"
-"Last-Translator: 9d7045af8ca83a89b1b4bf48a2c67786_a2524de <552015d9a2e1abe6fabe3394a3652575_905986>, 2020\n"
-"Language-Team: Norwegian Bokmål (Norway) (https://www.transifex.com/Friendica/teams/12172/nb_NO/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: nb_NO\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: viewsrc.php:39
-msgid "View Source"
-msgstr "Se kilde"
diff --git a/viewsrc/lang/nb-no/strings.php b/viewsrc/lang/nb-no/strings.php
index efbecdd2..cbd2bfd5 100644
--- a/viewsrc/lang/nb-no/strings.php
+++ b/viewsrc/lang/nb-no/strings.php
@@ -1,8 +1,3 @@
-<?php
-
-if(! function_exists("string_plural_select_nb_no")) {
-function string_plural_select_nb_no($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['View Source'] = 'Se kilde';
+<?php
+
+$a->strings["View Source"] = "";
diff --git a/viewsrc/lang/nl/strings.php b/viewsrc/lang/nl/strings.php
index ecaa7839..c64e24c0 100644
--- a/viewsrc/lang/nl/strings.php
+++ b/viewsrc/lang/nl/strings.php
@@ -3,6 +3,7 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['View Source'] = 'Bekijk Bron';
+;
+$a->strings["View Source"] = "Bekijk Bron";
diff --git a/viewsrc/lang/pl/messages.po b/viewsrc/lang/pl/messages.po
index 9640d869..27829b1b 100644
--- a/viewsrc/lang/pl/messages.po
+++ b/viewsrc/lang/pl/messages.po
@@ -3,17 +3,14 @@
 # This file is distributed under the same license as the Friendica viewsrc addon package.
 # 
 # 
-# Translators:
-# Waldemar Stoczkowski, 2018
-# 
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:16+0100\n"
-"PO-Revision-Date: 2018-03-20 07:26+0000\n"
-"Last-Translator: Waldemar Stoczkowski, 2018\n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>, 2018\n"
 "Language-Team: Polish (https://www.transifex.com/Friendica/teams/12172/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,6 +18,6 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
-#: viewsrc.php:49
+#: viewsrc.php:39
 msgid "View Source"
 msgstr "Pokaż źródło"
diff --git a/viewsrc/lang/pl/strings.php b/viewsrc/lang/pl/strings.php
index 7ea5b21a..3b8f56ab 100644
--- a/viewsrc/lang/pl/strings.php
+++ b/viewsrc/lang/pl/strings.php
@@ -2,7 +2,7 @@
 
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
-	$n = intval($n);
-	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
+	return ($n==1 ? 0 : ($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14) ? 1 : $n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14) ? 2 : 3);;
 }}
-$a->strings['View Source'] = 'Pokaż źródło';
+;
+$a->strings["View Source"] = "Pokaż źródło";
diff --git a/viewsrc/lang/ru/strings.php b/viewsrc/lang/ru/strings.php
index ff25c22f..345462c4 100644
--- a/viewsrc/lang/ru/strings.php
+++ b/viewsrc/lang/ru/strings.php
@@ -3,6 +3,7 @@
 if(! function_exists("string_plural_select_ru")) {
 function string_plural_select_ru($n){
 	$n = intval($n);
-	if ($n%10==1 && $n%100!=11) { return 0; } else if ($n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14)) { return 1; } else if ($n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)) { return 2; } else  { return 3; }
+	return ($n%10==1 && $n%100!=11 ? 0 : $n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14) ? 1 : $n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)? 2 : 3);;
 }}
-$a->strings['View Source'] = 'Показать исходник';
+;
+$a->strings["View Source"] = "Показать исходник";
diff --git a/viewsrc/lang/sv/messages.po b/viewsrc/lang/sv/messages.po
deleted file mode 100644
index 91100ad2..00000000
--- a/viewsrc/lang/sv/messages.po
+++ /dev/null
@@ -1,22 +0,0 @@
-# ADDON viewsrc
-# Copyright (C)
-# This file is distributed under the same license as the Friendica viewsrc addon package.
-# 
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:16+0100\n"
-"PO-Revision-Date: 2018-03-20 07:26+0000\n"
-"Language-Team: Swedish (https://www.transifex.com/Friendica/teams/12172/sv/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: sv\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: viewsrc.php:49
-msgid "View Source"
-msgstr ""
diff --git a/viewsrc/lang/sv/strings.php b/viewsrc/lang/sv/strings.php
index 72e9772f..ab4fa67a 100644
--- a/viewsrc/lang/sv/strings.php
+++ b/viewsrc/lang/sv/strings.php
@@ -1,7 +1,2 @@
-<?php
-
-if(! function_exists("string_plural_select_sv")) {
-function string_plural_select_sv($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
+<?php
+
diff --git a/viewsrc/lang/zh-cn/strings.php b/viewsrc/lang/zh-cn/strings.php
index 7363f07e..33fc8222 100644
--- a/viewsrc/lang/zh-cn/strings.php
+++ b/viewsrc/lang/zh-cn/strings.php
@@ -3,6 +3,7 @@
 if(! function_exists("string_plural_select_zh_cn")) {
 function string_plural_select_zh_cn($n){
 	$n = intval($n);
-	return intval(0);
+	return 0;;
 }}
-$a->strings['View Source'] = '查看源码';
+;
+$a->strings["View Source"] = "查看源码";
diff --git a/viewsrc/viewsrc.php b/viewsrc/viewsrc.php
index c4d21ccb..a890be2a 100644
--- a/viewsrc/viewsrc.php
+++ b/viewsrc/viewsrc.php
@@ -6,20 +6,25 @@
  * Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
  *
  */
-
-use Friendica\App;
 use Friendica\Core\Hook;
-use Friendica\DI;
+use Friendica\Core\L10n;
+use Friendica\Model\Item;
+use Friendica\Database\DBA;
 
-function viewsrc_install()
-{
+function viewsrc_install() {
 	Hook::register('item_photo_menu', 'addon/viewsrc/viewsrc.php', 'viewsrc_item_photo_menu');
 	Hook::register('page_end', 'addon/viewsrc/viewsrc.php', 'viewsrc_page_end');
 }
 
-function viewsrc_page_end(string &$o)
-{
-	DI::page()['htmlhead'] .= <<< EOS
+
+function viewsrc_uninstall() {
+	Hook::unregister('item_photo_menu', 'addon/viewsrc/viewsrc.php', 'viewsrc_item_photo_menu');
+	Hook::unregister('page_end', 'addon/viewsrc/viewsrc.php', 'viewsrc_page_end');
+
+}
+
+function viewsrc_page_end(&$a, &$o){
+	$a->page['htmlhead'] .= <<< EOS
 	<script>
 		$(function(){
 			$('a[href*="/viewsrc/"]').each(function() {
@@ -30,11 +35,27 @@ function viewsrc_page_end(string &$o)
 EOS;
 }
 
-function viewsrc_item_photo_menu(array &$b)
+function viewsrc_item_photo_menu(&$a, &$b)
 {
-	if (!DI::userSession()->getLocalUserId()) {
+	if (!local_user()) {
 		return;
 	}
 
-	$b['menu'] = array_merge([DI::l10n()->t('View Source') => DI::baseUrl() . '/viewsrc/'. $b['item']['uri-id']], $b['menu']);
+	if (local_user() != $b['item']['uid']) {
+		$item = Item::selectFirstForUser(local_user(), ['id'], ['uid' => local_user(), 'guid' => $b['item']['guid']]);
+		if (!DBA::isResult($item)) {
+			return;
+		}
+
+		$item_id = $item['id'];
+	} else {
+		$item_id = $b['item']['id'];
+	}
+
+	$b['menu'] = array_merge([L10n::t('View Source') => $a->getBaseURL() . '/viewsrc/'. $item_id], $b['menu']);
+
+	//if((! local_user()) || (local_user() != $b['item']['uid']))
+	//	return;
+
+	//$b['menu'] = array_merge(array(L10n::t('View Source') => $a->getBaseURL() . '/viewsrc/'. $b['item']['id']), $b['menu']);
 }
diff --git a/webdav_storage/composer.json b/webdav_storage/composer.json
deleted file mode 100644
index 17a4ba96..00000000
--- a/webdav_storage/composer.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "name": "friendica-addons/webdav_storage",
-  "description": "Adds the possibility to use WebDAV as a selectable storage backend",
-  "type": "friendica-addon",
-  "authors": [
-	{
-	  "name": "Philipp Holzer",
-	  "email": "admin@philipp.info",
-	  "homepage": "https://blog.philipp.info",
-	  "role": "Developer"
-	}
-  ],
-  "require": {
-	"php": ">=7.0"
-  },
-  "license": "3-clause BSD license",
-  "config": {
-	"optimize-autoloader": true,
-	"autoloader-suffix": "WebDavStorageAddon",
-	"preferred-install": "dist"
-  }
-}
diff --git a/webdav_storage/lang/C/messages.po b/webdav_storage/lang/C/messages.po
deleted file mode 100644
index 5f282bc8..00000000
--- a/webdav_storage/lang/C/messages.po
+++ /dev/null
@@ -1,58 +0,0 @@
-# ADDON webdav_storage
-# Copyright (C) 
-# This file is distributed under the same license as the Friendica webdav_storage addon package.
-# 
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-10-04 11:59+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: src/WebDavConfig.php:82
-msgid "URL"
-msgstr ""
-
-#: src/WebDavConfig.php:84
-msgid "URL to the Webdav endpoint, where files can be saved"
-msgstr ""
-
-#: src/WebDavConfig.php:89
-msgid "Username"
-msgstr ""
-
-#: src/WebDavConfig.php:91
-msgid "Username to authenticate to the Webdav endpoint"
-msgstr ""
-
-#: src/WebDavConfig.php:95
-msgid "Password"
-msgstr ""
-
-#: src/WebDavConfig.php:97
-msgid "Password to authenticate to the Webdav endpoint"
-msgstr ""
-
-#: src/WebDavConfig.php:101
-msgid "Authentication type"
-msgstr ""
-
-#: src/WebDavConfig.php:103
-msgid "authentication type to the Webdav endpoint"
-msgstr ""
-
-#: src/WebDavConfig.php:127
-msgid "Authentication type is invalid."
-msgstr ""
-
-#: src/WebDavConfig.php:143
-msgid "url is either invalid or not reachable"
-msgstr ""
diff --git a/webdav_storage/src/WebDav.php b/webdav_storage/src/WebDav.php
deleted file mode 100644
index ddf2dae0..00000000
--- a/webdav_storage/src/WebDav.php
+++ /dev/null
@@ -1,268 +0,0 @@
-<?php
-
-namespace Friendica\Addon\webdav_storage\src;
-
-use Exception;
-use Friendica\Core\Storage\Capability\ICanWriteToStorage;
-use Friendica\Core\Storage\Exception\ReferenceStorageException;
-use Friendica\Core\Storage\Exception\StorageException;
-use Friendica\Network\HTTPClient\Client\HttpClientOptions;
-use Friendica\Network\HTTPClient\Capability\ICanSendHttpRequests;
-use Friendica\Util\Strings;
-use Psr\Log\LoggerInterface;
-
-/**
- * A WebDav Backend Storage class
- */
-class WebDav implements ICanWriteToStorage
-{
-	const NAME = 'WebDav';
-
-	/** @var string */
-	private $url;
-
-	/** @var ICanSendHttpRequests */
-	private $client;
-
-	/** @var LoggerInterface */
-	private $logger;
-
-	/** @var array */
-	private $authOptions;
-
-	/**
-	 * WebDav constructor
-	 *
-	 * @param string               $url         The full URL to the webdav endpoint (including the subdirectories)
-	 * @param array                $authOptions The authentication options for the http calls ( ['username', 'password', 'auth_type'] )
-	 * @param ICanSendHttpRequests $client      The http client for communicating with the WebDav endpoint
-	 * @param LoggerInterface      $logger      The standard logging class
-	 */
-	public function __construct(string $url, array $authOptions, ICanSendHttpRequests $client, LoggerInterface $logger)
-	{
-		$this->client = $client;
-		$this->logger = $logger;
-
-		$this->authOptions = $authOptions;
-		$this->url         = $url;
-	}
-
-	/**
-	 * Split data ref and return file path
-	 *
-	 * @param string $reference Data reference
-	 *
-	 * @return string[]
-	 */
-	private function pathForRef(string $reference): array
-	{
-		$fold1 = substr($reference, 0, 2);
-		$fold2 = substr($reference, 2, 2);
-		$file  = substr($reference, 4);
-
-		return [$this->encodePath(implode('/', [$fold1, $fold2, $file])), implode('/', [$fold1, $fold2]), $file];
-	}
-
-	/**
-	 * URL encodes the given path but keeps the slashes
-	 *
-	 * @param string $path to encode
-	 *
-	 * @return string encoded path
-	 */
-	protected function encodePath(string $path): string
-	{
-		// slashes need to stay
-		return str_replace('%2F', '/', rawurlencode($path));
-	}
-
-	/**
-	 * Checks if the URL exists
-	 *
-	 * @param string $uri the URL to check
-	 *
-	 * @return bool true in case the file/folder exists
-	 */
-	protected function exists(string $uri): bool
-	{
-		return $this->client->head($uri, [HttpClientOptions::AUTH => $this->authOptions])->getReturnCode() == 200;
-	}
-
-	/**
-	 * Checks if a folder has items left
-	 *
-	 * @param string $uri the URL to check
-	 *
-	 * @return bool true in case there are items left in the folder
-	 */
-	protected function hasItems(string $uri): bool
-	{
-		$dom               = new \DOMDocument('1.0', 'UTF-8');
-		$dom->formatOutput = true;
-		$root              = $dom->createElementNS('DAV:', 'd:propfind');
-		$prop              = $dom->createElement('d:allprop');
-
-		$dom->appendChild($root)->appendChild($prop);
-
-		$opts = [
-			HttpClientOptions::AUTH    => $this->authOptions,
-			HttpClientOptions::HEADERS => ['Depth' => 1, 'Prefer' => 'return-minimal', 'Content-Type' => 'application/xml'],
-			HttpClientOptions::BODY    => $dom->saveXML(),
-		];
-
-		$response = $this->client->request('propfind', $uri, $opts);
-
-		$responseDoc = new \DOMDocument();
-		$responseDoc->loadXML($response->getBodyString());
-		$responseDoc->formatOutput = true;
-
-		$xpath = new \DOMXPath($responseDoc);
-		$xpath->registerNamespace('d', 'DAV');
-		$result = $xpath->query('//d:multistatus/d:response');
-
-		// returns at least its own directory, so >1
-		return $result !== false && count($result) > 1;
-	}
-
-	/**
-	 * Creates a DAV-collection (= folder) for the given uri
-	 *
-	 * @param string $uri The uri for creating a DAV-collection
-	 *
-	 * @return bool true in case the creation was successful (not immutable!)
-	 */
-	protected function mkcol(string $uri): bool
-	{
-		return $this->client->request('mkcol', $uri, [HttpClientOptions::AUTH => $this->authOptions])
-							->getReturnCode() == 200;
-	}
-
-	/**
-	 * Checks if the given path exists and if not creates it
-	 *
-	 * @param string $fullPath the full path (the folder structure after the hostname)
-	 */
-	protected function checkAndCreatePath(string $fullPath): void
-	{
-		$finalUrl = $this->url . '/' . trim($fullPath, '/');
-
-		if ($this->exists($finalUrl)) {
-			return;
-		}
-
-		$pathParts = explode('/', trim($fullPath, '/'));
-		$path      = '';
-
-		foreach ($pathParts as $part) {
-			$path .= '/' . $part;
-			$partUrl = $this->url . $path;
-			if (!$this->exists($partUrl)) {
-				$this->mkcol($partUrl);
-			}
-		}
-	}
-
-	/**
-	 * Checks recursively, if paths are empty and deletes them
-	 *
-	 * @param string $fullPath the full path (the folder structure after the hostname)
-	 *
-	 * @throws StorageException In case a directory cannot get deleted
-	 */
-	protected function checkAndDeletePath(string $fullPath): void
-	{
-		$pathParts = explode('/', trim($fullPath, '/'));
-		$partURL   = '/' . implode('/', $pathParts);
-
-		foreach ($pathParts as $pathPart) {
-			$checkUrl = $this->url . $partURL;
-			if (!empty($partURL) && !$this->hasItems($checkUrl)) {
-				$response = $this->client->request('delete', $checkUrl, [HttpClientOptions::AUTH => $this->authOptions]);
-
-				if (!$response->isSuccess()) {
-					if ($response->getReturnCode() == "404") {
-						$this->logger->warning('Directory already deleted.', ['uri' => $checkUrl]);
-					} else {
-						throw new StorageException(sprintf('Unpredicted error for %s: %s', $checkUrl, $response->getError()), $response->getReturnCode());
-					}
-				}
-			}
-
-			$partURL = substr($partURL, 0, -strlen('/' . $pathPart));
-		}
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function get(string $reference): string
-	{
-		$file = $this->pathForRef($reference);
-
-		$response = $this->client->request('get', $this->url . '/' . $file[0], [HttpClientOptions::AUTH => $this->authOptions]);
-
-		if (!$response->isSuccess()) {
-			throw new ReferenceStorageException(sprintf('Invalid reference %s', $reference));
-		}
-
-		return $response->getBodyString();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function put(string $data, string $reference = ""): string
-	{
-		if ($reference === '') {
-			try {
-				$reference = Strings::getRandomHex();
-			} catch (Exception $exception) {
-				throw new StorageException('Webdav storage failed to generate a random hex', $exception->getCode(), $exception);
-			}
-		}
-		$file = $this->pathForRef($reference);
-
-		$this->checkAndCreatePath($file[1]);
-
-		$opts = [
-			HttpClientOptions::BODY => $data,
-			HttpClientOptions::AUTH => $this->authOptions,
-		];
-
-		$this->client->request('put', $this->url . '/' . $file[0], $opts);
-
-		return $reference;
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function delete(string $reference)
-	{
-		$file = $this->pathForRef($reference);
-
-		$response = $this->client->request('delete', $this->url . '/' . $file[0], [HttpClientOptions::AUTH => $this->authOptions]);
-
-		if (!$response->isSuccess()) {
-			throw new ReferenceStorageException(sprintf('Invalid reference %s', $reference));
-		}
-
-		$this->checkAndDeletePath($file[1]);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function __toString(): string
-	{
-		return self::getName();
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public static function getName(): string
-	{
-		return self::NAME;
-	}
-}
diff --git a/webdav_storage/src/WebDavConfig.php b/webdav_storage/src/WebDavConfig.php
deleted file mode 100644
index 2236e97a..00000000
--- a/webdav_storage/src/WebDavConfig.php
+++ /dev/null
@@ -1,156 +0,0 @@
-<?php
-
-namespace Friendica\Addon\webdav_storage\src;
-
-use Friendica\Core\Config\Capability\IManageConfigValues;
-use Friendica\Core\L10n;
-use Friendica\Core\Storage\Capability\ICanConfigureStorage;
-use Friendica\Network\HTTPClient\Client\HttpClientOptions;
-use Friendica\Network\HTTPClient\Capability\ICanSendHttpRequests;
-
-/**
- * The WebDav Backend Storage configuration class
- */
-class WebDavConfig implements ICanConfigureStorage
-{
-	const NAME = 'WebDav';
-
-	/** @var L10n */
-	private $l10n;
-
-	/** @var IManageConfigValues */
-	private $config;
-
-	/** @var string */
-	private $url;
-
-	/** @var \Friendica\Network\HTTPClient\Capability\ICanSendHttpRequests */
-	private $client;
-
-	/** @var array */
-	private $authOptions;
-
-	/**
-	 * @return string
-	 */
-	public function getUrl(): string
-	{
-		return $this->url;
-	}
-
-	/**
-	 * @return array
-	 */
-	public function getAuthOptions(): array
-	{
-		return $this->authOptions;
-	}
-
-	public function __construct(L10n $l10n, IManageConfigValues $config, ICanSendHttpRequests $client)
-	{
-		$this->l10n   = $l10n;
-		$this->config = $config;
-		$this->client = $client;
-
-		$this->authOptions = null;
-
-		if (!empty($this->config->get('webdav', 'username'))) {
-			$this->authOptions = [
-				$this->config->get('webdav', 'username'),
-				(string)$this->config->get('webdav', 'password', ''),
-				$this->config->get('webdav', 'auth_type', 'basic')
-			];
-		}
-
-		$this->url = $this->config->get('webdav', 'url');
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function getOptions(): array
-	{
-		$auths = [
-			''       => 'None',
-			'basic'  => 'Basic',
-			'digest' => 'Digest',
-		];
-
-		return [
-			'url' => [
-				'input',
-				$this->l10n->t('URL'),
-				$this->url,
-				$this->l10n->t('URL to the Webdav endpoint, where files can be saved'),
-				true
-			],
-			'username' => [
-				'input',
-				$this->l10n->t('Username'),
-				$this->config->get('webdav', 'username', ''),
-				$this->l10n->t('Username to authenticate to the Webdav endpoint')
-			],
-			'password' => [
-				'password',
-				$this->l10n->t('Password'),
-				$this->config->get('webdav', 'username', ''),
-				$this->l10n->t('Password to authenticate to the Webdav endpoint')
-			],
-			'auth_type' => [
-				'select',
-				$this->l10n->t('Authentication type'),
-				$this->config->get('webdav', 'auth_type', ''),
-				$this->l10n->t('authentication type to the Webdav endpoint'),
-				$auths,
-			]
-		];
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	public function saveOptions(array $data): array
-	{
-		$url      = $data['url']      ?? '';
-		$username = $data['username'] ?? '';
-		$password = $data['password'] ?? '';
-
-		$auths = [
-			''       => 'None',
-			'basic'  => 'Basic',
-			'digest' => 'Digest',
-		];
-
-		$authType = $data['auth_type'] ?? '';
-		if (!key_exists($authType, $auths)) {
-			return [
-				'auth_type' => $this->l10n->t('Authentication type is invalid.'),
-			];
-		}
-
-		$options = null;
-
-		if (!empty($username)) {
-			$options = [
-				$username,
-				$password,
-				$authType
-			];
-		}
-
-		if (!$this->client->head($url, [HttpClientOptions::AUTH => $options])->isSuccess()) {
-			return [
-				'url' => $this->l10n->t('url is either invalid or not reachable'),
-			];
-		}
-
-		$this->config->set('webdav', 'url', $url);
-		$this->config->set('webdav', 'username', $username);
-		$this->config->set('webdav', 'password', $password);
-		$this->config->set('webdav', 'auth_type', $authType);
-
-		$this->url = $url;
-
-		return [];
-	}
-}
diff --git a/webdav_storage/tests/WebDavTest.php.bak b/webdav_storage/tests/WebDavTest.php.bak
deleted file mode 100644
index bdcbd005..00000000
--- a/webdav_storage/tests/WebDavTest.php.bak
+++ /dev/null
@@ -1,121 +0,0 @@
-<?php
-
-namespace Friendica\Addon\webdav_storage\tests;
-
-use Friendica\Addon\webdav_storage\src\WebDav;
-use Friendica\DI;
-use Friendica\Network\HTTPClient\Factory\HTTPClientFactory;
-use Friendica\Test\src\Core\Storage\StorageTest;
-use Friendica\Core\Logger\Type\VoidLogger;
-
-/// @todo remove when constant is moved to a class constant
-/// Necessary for DB_UPDATE_VERSION constant in case of direct calls, where dbstructure isn't included during the calling process
-require_once __DIR__ . '/../../../static/dbstructure.config.php';
-
-class WebDavTest extends StorageTest
-{
-	public function dataMultiStatus()
-	{
-		return [
-			'nextcloud' => [
-				'xml' => <<<EOF
-<?xml version="1.0"?>
-<d:multistatus xmlns:d="DAV:" xmlns:s="http://sabredav.org/ns" xmlns:oc="http://owncloud.org/ns"
-			   xmlns:nc="http://nextcloud.org/ns">
-	<d:response>
-		<d:href>/remote.php/dav/files/admin/Friendica_test/97/18/</d:href>
-		<d:propstat>
-			<d:prop>
-				<d:getlastmodified>Mon, 30 Aug 2021 12:58:54 GMT</d:getlastmodified>
-				<d:resourcetype>
-					<d:collection/>
-				</d:resourcetype>
-				<d:quota-used-bytes>45017</d:quota-used-bytes>
-				<d:quota-available-bytes>59180834349</d:quota-available-bytes>
-				<d:getetag>&quot;612cd60ec9fd5&quot;</d:getetag>
-			</d:prop>
-			<d:status>HTTP/1.1 200 OK</d:status>
-		</d:propstat>
-	</d:response>
-	<d:response>
-		<d:href>
-			/remote.php/dav/files/admin/Friendica_test/97/18/4d9d36f614dc005756bdfb9abbf1d8d24aa9ae842e5d6b5e7eb1dafbe767
-															  </d:href>
-		<d:propstat>
-			<d:prop>
-				<d:getlastmodified>Mon, 30 Aug 2021 12:58:54 GMT</d:getlastmodified>
-				<d:getcontentlength>45017</d:getcontentlength>
-				<d:resourcetype/>
-				<d:getetag>&quot;4f7a144092532141d0e6b925e50a896e&quot;</d:getetag>
-				<d:getcontenttype>application/octet-stream
-				</d:getcontenttype>
-			</d:prop>
-			<d:status>HTTP/1.1 200 OK</d:status>
-		</d:propstat>
-		<d:propstat>
-			<d:prop>
-				<d:quota-used-bytes/>
-				<d:quota-available-bytes/>
-			</d:prop>
-			<d:status>HTTP/1.1 404 Not Found
-									   </d:status>
-		</d:propstat>
-	</d:response>
-</d:multistatus>
-EOF,
-				'assertionCount' => 2,
-			],
-			'onlyDir' => [
-				'xml' => <<<EOF
-<d:multistatus xmlns:d="DAV:" xmlns:s="http://sabredav.org/ns" xmlns:oc="http://owncloud.org/ns" xmlns:nc="http://nextcloud.org/ns">
-  <d:response>
-    <d:href>/remote.php/dav/files/admin/Friendica_test/34/cf/</d:href>
-    <d:propstat>
-      <d:prop>
-        <d:getlastmodified>Sun, 05 Sep 2021 17:56:05 GMT</d:getlastmodified>
-        <d:resourcetype>
-          <d:collection/>
-        </d:resourcetype>
-        <d:quota-used-bytes>0</d:quota-used-bytes>
-        <d:quota-available-bytes>59182800697</d:quota-available-bytes>
-        <d:getetag>"613504b55db4f"</d:getetag>
-      </d:prop>
-      <d:status>HTTP/1.1 200 OK</d:status>
-    </d:propstat>
-  </d:response>
-</d:multistatus>
-EOF,
-				'assertionCount' => 1,
-			],
-		];
-	}
-
-	/**
-	 * @dataProvider dataMultiStatus
-	 */
-	public function testMultistatus(string $xml, int $assertionCount)
-	{
-		$responseDoc = new \DOMDocument();
-		$responseDoc->loadXML($xml);
-
-		$xpath = new \DOMXPath($responseDoc);
-		$xpath->registerNamespace('d', 'DAV');
-
-		self::assertCount($assertionCount, $xpath->query('//d:multistatus/d:response'));
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	protected function getInstance()
-	{
-		/** @var HTTPClientFactory $factory */
-		$factory = DI::getDice()->create(HTTPClientFactory::class);
-
-		return new WebDav(getenv('WEBDAV_URL'), [
-			getenv('WEBDAV_USERNAME'),
-			getenv('WEBDAV_PASSWORD'),
-			'basic',
-		], $factory->createClient(), new VoidLogger());
-	}
-}
diff --git a/webdav_storage/webdav_storage.php b/webdav_storage/webdav_storage.php
deleted file mode 100644
index adcbea29..00000000
--- a/webdav_storage/webdav_storage.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/*
- * Name: WebDAV Storage
- * Description: Adds the possibility to use WebDAV as a selectable storage backend
- * Version: 1.0
- * Author: Philipp Holzer
- */
-
-use Friendica\Addon\webdav_storage\src\WebDav;
-use Friendica\Addon\webdav_storage\src\WebDavConfig;
-use Friendica\App;
-use Friendica\Core\Hook;
-use Friendica\DI;
-
-function webdav_storage_install($a)
-{
-	Hook::register('storage_instance' , __FILE__, 'webdav_storage_instance');
-	Hook::register('storage_config' , __FILE__, 'webdav_storage_config');
-	DI::storageManager()->register(WebDav::class);
-}
-
-function webdav_storage_uninstall()
-{
-	DI::storageManager()->unregister(WebDav::class);
-}
-
-function webdav_storage_instance(array &$data)
-{
-	if ($data['name'] == WebDav::getName()) {
-		$config          = new WebDavConfig(DI::l10n(), DI::config(), DI::httpClient());
-		$data['storage'] = new WebDav($config->getUrl(), $config->getAuthOptions(), DI::httpClient(), DI::logger());
-	}
-}
-
-function webdav_storage_config(array &$data)
-{
-	if ($data['name'] == WebDav::getName()) {
-		$data['storage_config'] = new WebDavConfig(DI::l10n(), DI::config(), DI::httpClient());
-	}
-}
diff --git a/webrtc/README.md b/webrtc/README.md
index 673eaeb2..2b5c9ed0 100644
--- a/webrtc/README.md
+++ b/webrtc/README.md
@@ -10,10 +10,12 @@ really a person 2 person communication, using the server to only signal who
 wants to talk to who, the actual transfer of the audio and video is directly
 between the participants.
 
-You can test it by visiting a known webrtc instance (i.e. [live.mayfirst.org](https://live.mayfirst.org))
-create a room, you should be asked to share your camera and microphone (firefox
-will let you choose one or the other, whereas chrome/chromium asks for both in
-one question).
+If you would like to try this addon please download one of the following
+either Chrome/Chromium 25 or higher or Firefox 21 or higher. Then test it by
+visiting a known webrtc instance (i.e. [live.mayfirst.org](https://live.mayfirst.org)) create a
+room, you should be asked to share your camera and microphone (firefox will let
+you choose one or the other, whereas chrome/chromium asks for both in one
+question).
 
 If the test is successful then proceed with copying the webrtc instance you
 would like to use and place it in the config window and save. Now when you
diff --git a/webrtc/lang/C/messages.po b/webrtc/lang/C/messages.po
index ad233014..a690269d 100644
--- a/webrtc/lang/C/messages.po
+++ b/webrtc/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-04-29 15:56+0200\n"
+"POT-Creation-Date: 2014-06-23 14:45+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,36 +17,40 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: webrtc.php:18
+#: webrtc.php:20
 msgid "WebRTC Videochat"
 msgstr ""
 
-#: webrtc.php:24
+#: webrtc.php:26
 msgid "Save Settings"
 msgstr ""
 
-#: webrtc.php:25
+#: webrtc.php:27
 msgid "WebRTC Base URL"
 msgstr ""
 
-#: webrtc.php:25
+#: webrtc.php:27
 msgid ""
 "Page your users will create a WebRTC chat room on. For example you could use "
 "https://live.mayfirst.org ."
 msgstr ""
 
-#: webrtc.php:44
-msgid "Video Chat"
-msgstr ""
-
-#: webrtc.php:45
-msgid ""
-"WebRTC is a video and audio conferencing tool that works in all modern "
-"browsers. Just create a new chat room and send the link to someone you want "
-"to chat with."
+#: webrtc.php:33
+msgid "Settings updated."
 msgstr ""
 
 #: webrtc.php:47
+msgid "Video Chat"
+msgstr ""
+
+#: webrtc.php:48
+msgid ""
+"WebRTC is a video and audio conferencing tool that works with Firefox "
+"(version 21 and above) and Chrome/Chromium (version 25 and above). Just "
+"create a new chat room and send the link to someone you want to chat with."
+msgstr ""
+
+#: webrtc.php:50
 msgid ""
 "Please contact your friendica admin and send a reminder to configure the "
 "WebRTC addon."
diff --git a/webrtc/lang/ar/messages.po b/webrtc/lang/ar/messages.po
deleted file mode 100644
index 007d68f7..00000000
--- a/webrtc/lang/ar/messages.po
+++ /dev/null
@@ -1,55 +0,0 @@
-# ADDON webrtc
-# Copyright (C)
-# This file is distributed under the same license as the Friendica webrtc addon package.
-# 
-# 
-# Translators:
-# Farida Khalaf <faridakhalaf@hotmail.com>, 2021
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:16+0100\n"
-"PO-Revision-Date: 2021-02-21 18:48+0000\n"
-"Last-Translator: Farida Khalaf <faridakhalaf@hotmail.com>\n"
-"Language-Team: Arabic (http://www.transifex.com/Friendica/friendica/language/ar/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ar\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-
-#: webrtc.php:19
-msgid "WebRTC Videochat"
-msgstr ""
-
-#: webrtc.php:25
-msgid "Save Settings"
-msgstr "حفظ الإعدادات"
-
-#: webrtc.php:26
-msgid "WebRTC Base URL"
-msgstr ""
-
-#: webrtc.php:26
-msgid ""
-"Page your users will create a WebRTC chat room on. For example you could use"
-" https://live.mayfirst.org ."
-msgstr ""
-
-#: webrtc.php:45
-msgid "Video Chat"
-msgstr ""
-
-#: webrtc.php:46
-msgid ""
-"WebRTC is a video and audio conferencing tool that works with Firefox "
-"(version 21 and above) and Chrome/Chromium (version 25 and above). Just "
-"create a new chat room and send the link to someone you want to chat with."
-msgstr ""
-
-#: webrtc.php:48
-msgid ""
-"Please contact your friendica admin and send a reminder to configure the "
-"WebRTC addon."
-msgstr ""
diff --git a/webrtc/lang/ar/strings.php b/webrtc/lang/ar/strings.php
deleted file mode 100644
index 285ad303..00000000
--- a/webrtc/lang/ar/strings.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_ar")) {
-function string_plural_select_ar($n){
-	$n = intval($n);
-	if ($n==0) { return 0; } else if ($n==1) { return 1; } else if ($n==2) { return 2; } else if ($n%100>=3 && $n%100<=10) { return 3; } else if ($n%100>=11 && $n%100<=99) { return 4; } else  { return 5; }
-}}
-$a->strings['Save Settings'] = 'حفظ الإعدادات';
diff --git a/webrtc/lang/cs/messages.po b/webrtc/lang/cs/messages.po
index 9485b565..217385f8 100644
--- a/webrtc/lang/cs/messages.po
+++ b/webrtc/lang/cs/messages.po
@@ -4,53 +4,56 @@
 # 
 # 
 # Translators:
-# Aditoo, 2018
-# michal_s <msupler@gmail.com>, 2014
+# Michal Šupler <msupler@gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-04-29 15:56+0200\n"
-"PO-Revision-Date: 2014-06-23 13:05+0000\n"
-"Last-Translator: Aditoo, 2018\n"
-"Language-Team: Czech (http://app.transifex.com/Friendica/friendica/language/cs/)\n"
+"POT-Creation-Date: 2014-06-23 14:45+0200\n"
+"PO-Revision-Date: 2014-07-02 15:10+0000\n"
+"Last-Translator: Michal Šupler <msupler@gmail.com>\n"
+"Language-Team: Czech (http://www.transifex.com/projects/p/friendica/language/cs/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: cs\n"
-"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: webrtc.php:18
+#: webrtc.php:20
 msgid "WebRTC Videochat"
 msgstr "WebRTC Videochat"
 
-#: webrtc.php:24
+#: webrtc.php:26
 msgid "Save Settings"
 msgstr "Uložit Nastavení"
 
-#: webrtc.php:25
+#: webrtc.php:27
 msgid "WebRTC Base URL"
-msgstr "Základní adresa URL WebRTC"
+msgstr "WebRTC Base adresa URL"
 
-#: webrtc.php:25
+#: webrtc.php:27
 msgid ""
 "Page your users will create a WebRTC chat room on. For example you could use"
 " https://live.mayfirst.org ."
-msgstr "Stránka, na které budou vaši uživatelé vytvářet chatovací místnosti WebRTC. Například můžete zadat https://live.mayfirst.org."
+msgstr "Stránka, na které budou vaši uživatelé vytvářet  WebRTC chatovací místnosti. Například můžete zadat https://live.mayfirst.org."
 
-#: webrtc.php:44
+#: webrtc.php:33
+msgid "Settings updated."
+msgstr "Nastavení aktualizováno."
+
+#: webrtc.php:47
 msgid "Video Chat"
 msgstr "Video Chat"
 
-#: webrtc.php:45
+#: webrtc.php:48
 msgid ""
-"WebRTC is a video and audio conferencing tool that works in all modern "
-"browsers. Just create a new chat room and send the link to someone you want "
-"to chat with."
-msgstr ""
+"WebRTC is a video and audio conferencing tool that works with Firefox "
+"(version 21 and above) and Chrome/Chromium (version 25 and above). Just "
+"create a new chat room and send the link to someone you want to chat with."
+msgstr "WebRTC je video a audio konferenční nástroj který funguje s prohlížeči Firefox (verze 21 a vyšší) a Chrome/Chromium (verze 25 a vyšší). Stačí vytvořit novou chatovací místnost a poslat link někomu, se kterým chcete chatovat."
 
-#: webrtc.php:47
+#: webrtc.php:50
 msgid ""
 "Please contact your friendica admin and send a reminder to configure the "
 "WebRTC addon."
-msgstr "Prosím kontaktujte administrátora Vašeho serveru Friendica a požádejte ho o konfiguraci doplňku WebRTC."
+msgstr "Prosím kontaktujte vašeho administrátora serveru friendica a požádejte ho o konfiguraci WebRTC rozšíření."
diff --git a/webrtc/lang/cs/strings.php b/webrtc/lang/cs/strings.php
index 5ab781bf..e8a97315 100644
--- a/webrtc/lang/cs/strings.php
+++ b/webrtc/lang/cs/strings.php
@@ -2,12 +2,14 @@
 
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
-	$n = intval($n);
-	if (($n == 1 && $n % 1 == 0)) { return 0; } else if (($n >= 2 && $n <= 4 && $n % 1 == 0)) { return 1; } else if (($n % 1 != 0 )) { return 2; } else  { return 3; }
+	return ($n==1) ? 0 : ($n>=2 && $n<=4) ? 1 : 2;;
 }}
-$a->strings['WebRTC Videochat'] = 'WebRTC Videochat';
-$a->strings['Save Settings'] = 'Uložit Nastavení';
-$a->strings['WebRTC Base URL'] = 'Základní adresa URL WebRTC';
-$a->strings['Page your users will create a WebRTC chat room on. For example you could use https://live.mayfirst.org .'] = 'Stránka, na které budou vaši uživatelé vytvářet chatovací místnosti WebRTC. Například můžete zadat https://live.mayfirst.org.';
-$a->strings['Video Chat'] = 'Video Chat';
-$a->strings['Please contact your friendica admin and send a reminder to configure the WebRTC addon.'] = 'Prosím kontaktujte administrátora Vašeho serveru Friendica a požádejte ho o konfiguraci doplňku WebRTC.';
+;
+$a->strings["WebRTC Videochat"] = "WebRTC Videochat";
+$a->strings["Save Settings"] = "Uložit Nastavení";
+$a->strings["WebRTC Base URL"] = "WebRTC Base adresa URL";
+$a->strings["Page your users will create a WebRTC chat room on. For example you could use https://live.mayfirst.org ."] = "Stránka, na které budou vaši uživatelé vytvářet  WebRTC chatovací místnosti. Například můžete zadat https://live.mayfirst.org.";
+$a->strings["Settings updated."] = "Nastavení aktualizováno.";
+$a->strings["Video Chat"] = "Video Chat";
+$a->strings["WebRTC is a video and audio conferencing tool that works with Firefox (version 21 and above) and Chrome/Chromium (version 25 and above). Just create a new chat room and send the link to someone you want to chat with."] = "WebRTC je video a audio konferenční nástroj který funguje s prohlížeči Firefox (verze 21 a vyšší) a Chrome/Chromium (verze 25 a vyšší). Stačí vytvořit novou chatovací místnost a poslat link někomu, se kterým chcete chatovat.";
+$a->strings["Please contact your friendica admin and send a reminder to configure the WebRTC addon."] = "Prosím kontaktujte vašeho administrátora serveru friendica a požádejte ho o konfiguraci WebRTC rozšíření.";
diff --git a/webrtc/lang/da-dk/messages.po b/webrtc/lang/da-dk/messages.po
deleted file mode 100644
index 0194df7f..00000000
--- a/webrtc/lang/da-dk/messages.po
+++ /dev/null
@@ -1,55 +0,0 @@
-# ADDON webrtc
-# Copyright (C)
-# This file is distributed under the same license as the Friendica webrtc addon package.
-# 
-# 
-# Translators:
-# Anton <dev@atjn.dk>, 2022
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-04-29 15:56+0200\n"
-"PO-Revision-Date: 2014-06-23 13:05+0000\n"
-"Last-Translator: Anton <dev@atjn.dk>, 2022\n"
-"Language-Team: Danish (Denmark) (http://www.transifex.com/Friendica/friendica/language/da_DK/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: da_DK\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: webrtc.php:18
-msgid "WebRTC Videochat"
-msgstr "WebRTC videochat"
-
-#: webrtc.php:24
-msgid "Save Settings"
-msgstr "Gem indstillinger"
-
-#: webrtc.php:25
-msgid "WebRTC Base URL"
-msgstr "WebRTC Base URL"
-
-#: webrtc.php:25
-msgid ""
-"Page your users will create a WebRTC chat room on. For example you could use"
-" https://live.mayfirst.org ."
-msgstr "Side dine brugere vil lave et WebRTC chatrum på. For eksempel kan du bruge https://live.mayfirst.org ."
-
-#: webrtc.php:44
-msgid "Video Chat"
-msgstr "Video chat"
-
-#: webrtc.php:45
-msgid ""
-"WebRTC is a video and audio conferencing tool that works in all modern "
-"browsers. Just create a new chat room and send the link to someone you want "
-"to chat with."
-msgstr "WebRTC er et video- og lydkonferenceværktøj som virker i alle moderne browsere. Bare lav et nyt chatrum og send linket til en du gerne vil chatte med."
-
-#: webrtc.php:47
-msgid ""
-"Please contact your friendica admin and send a reminder to configure the "
-"WebRTC addon."
-msgstr "Kontakt venligst din friendica administrator og send en påmindelse om at konfigurere WebRTC tilføjelsen."
diff --git a/webrtc/lang/da-dk/strings.php b/webrtc/lang/da-dk/strings.php
deleted file mode 100644
index c15b4ead..00000000
--- a/webrtc/lang/da-dk/strings.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_da_dk")) {
-function string_plural_select_da_dk($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['WebRTC Videochat'] = 'WebRTC videochat';
-$a->strings['Save Settings'] = 'Gem indstillinger';
-$a->strings['WebRTC Base URL'] = 'WebRTC Base URL';
-$a->strings['Page your users will create a WebRTC chat room on. For example you could use https://live.mayfirst.org .'] = 'Side dine brugere vil lave et WebRTC chatrum på. For eksempel kan du bruge https://live.mayfirst.org .';
-$a->strings['Video Chat'] = 'Video chat';
-$a->strings['WebRTC is a video and audio conferencing tool that works in all modern browsers. Just create a new chat room and send the link to someone you want to chat with.'] = 'WebRTC er et video- og lydkonferenceværktøj som virker i alle moderne browsere. Bare lav et nyt chatrum og send linket til en du gerne vil chatte med.';
-$a->strings['Please contact your friendica admin and send a reminder to configure the WebRTC addon.'] = 'Kontakt venligst din friendica administrator og send en påmindelse om at konfigurere WebRTC tilføjelsen.';
diff --git a/webrtc/lang/de/messages.po b/webrtc/lang/de/messages.po
index e5e37294..b6abd14f 100644
--- a/webrtc/lang/de/messages.po
+++ b/webrtc/lang/de/messages.po
@@ -4,54 +4,56 @@
 # 
 # 
 # Translators:
-# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2014
-# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2022
-# Ulf Rompe <transifex.com@rompe.org>, 2019
+# bavatar <tobias.diekershoff@gmx.net>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-04-29 15:56+0200\n"
-"PO-Revision-Date: 2014-06-23 13:05+0000\n"
-"Last-Translator: Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2022\n"
-"Language-Team: German (http://app.transifex.com/Friendica/friendica/language/de/)\n"
+"POT-Creation-Date: 2014-06-23 14:45+0200\n"
+"PO-Revision-Date: 2014-07-11 05:33+0000\n"
+"Last-Translator: bavatar <tobias.diekershoff@gmx.net>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/friendica/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: webrtc.php:18
+#: webrtc.php:20
 msgid "WebRTC Videochat"
 msgstr "WebRTC Videochat"
 
-#: webrtc.php:24
+#: webrtc.php:26
 msgid "Save Settings"
 msgstr "Einstellungen speichern"
 
-#: webrtc.php:25
+#: webrtc.php:27
 msgid "WebRTC Base URL"
-msgstr "Basis-URL des WebRTC-Servers"
+msgstr "Basis-URL des WebRTC Servers"
 
-#: webrtc.php:25
+#: webrtc.php:27
 msgid ""
 "Page your users will create a WebRTC chat room on. For example you could use"
 " https://live.mayfirst.org ."
-msgstr "Auf welcher Seite sollten deine Nutzer einen WebRTC-Chatraum anlegen? Du könntest bspw. https://live.mayfirst.org verwenden."
+msgstr "Auf welcher Seite sollten deine Nutzer einen WebRTC Chatraum anlegen. Z.B. könntest du https://live.mayfirst.org verwenden."
 
-#: webrtc.php:44
+#: webrtc.php:33
+msgid "Settings updated."
+msgstr "Einstellungen aktualisiert."
+
+#: webrtc.php:47
 msgid "Video Chat"
 msgstr "Video Chat"
 
-#: webrtc.php:45
+#: webrtc.php:48
 msgid ""
-"WebRTC is a video and audio conferencing tool that works in all modern "
-"browsers. Just create a new chat room and send the link to someone you want "
-"to chat with."
-msgstr "WebRTC ist ein Standart für Audio und Video Konferenzen der von allen modernen Browser unterstützt wird, Öffne einfach einen neuen Chatraum und sende den Link an diejenige Person, mit der du dich unterhalten möchtest."
+"WebRTC is a video and audio conferencing tool that works with Firefox "
+"(version 21 and above) and Chrome/Chromium (version 25 and above). Just "
+"create a new chat room and send the link to someone you want to chat with."
+msgstr "WebRTC ist ein Werkzeug für Audio- und Videokonferenzen das mit Firefox (Version 21 und höher) und Chrome/Chromium (Versionen 25 und höher) funktioniert. Lege einfach einen neuen Chatraum an und sende den Link an die Personen mit denen du chatten willst."
 
-#: webrtc.php:47
+#: webrtc.php:50
 msgid ""
 "Please contact your friendica admin and send a reminder to configure the "
 "WebRTC addon."
-msgstr "Bitte schicke eine Erinnerung an deinen Friendica-Admin, dass WebRTC noch nicht richtig konfiguriert ist."
+msgstr "Bitte schicke eine Erinnerung an deinen friendica Admin, dass WebRTC noch nicht richtig konfiguriert ist."
diff --git a/webrtc/lang/de/strings.php b/webrtc/lang/de/strings.php
index 207bedf3..c94de480 100644
--- a/webrtc/lang/de/strings.php
+++ b/webrtc/lang/de/strings.php
@@ -2,13 +2,14 @@
 
 if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['WebRTC Videochat'] = 'WebRTC Videochat';
-$a->strings['Save Settings'] = 'Einstellungen speichern';
-$a->strings['WebRTC Base URL'] = 'Basis-URL des WebRTC-Servers';
-$a->strings['Page your users will create a WebRTC chat room on. For example you could use https://live.mayfirst.org .'] = 'Auf welcher Seite sollten deine Nutzer einen WebRTC-Chatraum anlegen? Du könntest bspw. https://live.mayfirst.org verwenden.';
-$a->strings['Video Chat'] = 'Video Chat';
-$a->strings['WebRTC is a video and audio conferencing tool that works in all modern browsers. Just create a new chat room and send the link to someone you want to chat with.'] = 'WebRTC ist ein Standart für Audio und Video Konferenzen der von allen modernen Browser unterstützt wird, Öffne einfach einen neuen Chatraum und sende den Link an diejenige Person, mit der du dich unterhalten möchtest.';
-$a->strings['Please contact your friendica admin and send a reminder to configure the WebRTC addon.'] = 'Bitte schicke eine Erinnerung an deinen Friendica-Admin, dass WebRTC noch nicht richtig konfiguriert ist.';
+;
+$a->strings["WebRTC Videochat"] = "WebRTC Videochat";
+$a->strings["Save Settings"] = "Einstellungen speichern";
+$a->strings["WebRTC Base URL"] = "Basis-URL des WebRTC Servers";
+$a->strings["Page your users will create a WebRTC chat room on. For example you could use https://live.mayfirst.org ."] = "Auf welcher Seite sollten deine Nutzer einen WebRTC Chatraum anlegen. Z.B. könntest du https://live.mayfirst.org verwenden.";
+$a->strings["Settings updated."] = "Einstellungen aktualisiert.";
+$a->strings["Video Chat"] = "Video Chat";
+$a->strings["WebRTC is a video and audio conferencing tool that works with Firefox (version 21 and above) and Chrome/Chromium (version 25 and above). Just create a new chat room and send the link to someone you want to chat with."] = "WebRTC ist ein Werkzeug für Audio- und Videokonferenzen das mit Firefox (Version 21 und höher) und Chrome/Chromium (Versionen 25 und höher) funktioniert. Lege einfach einen neuen Chatraum an und sende den Link an die Personen mit denen du chatten willst.";
+$a->strings["Please contact your friendica admin and send a reminder to configure the WebRTC addon."] = "Bitte schicke eine Erinnerung an deinen friendica Admin, dass WebRTC noch nicht richtig konfiguriert ist.";
diff --git a/webrtc/lang/es/messages.po b/webrtc/lang/es/messages.po
index f1113ada..ae877e03 100644
--- a/webrtc/lang/es/messages.po
+++ b/webrtc/lang/es/messages.po
@@ -9,46 +9,50 @@ msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-04-29 15:56+0200\n"
-"PO-Revision-Date: 2014-06-23 13:05+0000\n"
-"Last-Translator: Tupambae.org, 2016\n"
-"Language-Team: Spanish (http://app.transifex.com/Friendica/friendica/language/es/)\n"
+"POT-Creation-Date: 2014-06-23 14:45+0200\n"
+"PO-Revision-Date: 2016-04-18 19:15+0000\n"
+"Last-Translator: Tupambae.org\n"
+"Language-Team: Spanish (http://www.transifex.com/Friendica/friendica/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: es\n"
-"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: webrtc.php:18
+#: webrtc.php:20
 msgid "WebRTC Videochat"
 msgstr "WebRTC Videochat"
 
-#: webrtc.php:24
+#: webrtc.php:26
 msgid "Save Settings"
 msgstr "Guardar ajustes"
 
-#: webrtc.php:25
+#: webrtc.php:27
 msgid "WebRTC Base URL"
 msgstr "WebRTC URL Base"
 
-#: webrtc.php:25
+#: webrtc.php:27
 msgid ""
 "Page your users will create a WebRTC chat room on. For example you could use"
 " https://live.mayfirst.org ."
 msgstr "Pagina donde el usuario creara una habitación de chat.\nPor ejemplo podría usar https://live.mayfirst.org ."
 
-#: webrtc.php:44
+#: webrtc.php:33
+msgid "Settings updated."
+msgstr "Ajustes actualizados."
+
+#: webrtc.php:47
 msgid "Video Chat"
 msgstr "Video Chat"
 
-#: webrtc.php:45
+#: webrtc.php:48
 msgid ""
-"WebRTC is a video and audio conferencing tool that works in all modern "
-"browsers. Just create a new chat room and send the link to someone you want "
-"to chat with."
-msgstr ""
+"WebRTC is a video and audio conferencing tool that works with Firefox "
+"(version 21 and above) and Chrome/Chromium (version 25 and above). Just "
+"create a new chat room and send the link to someone you want to chat with."
+msgstr "WebRTC es una herramienta de vídeo conferencia que funciona con Firefox (versión 21 y arriba) y Chrome/Chromium (versión 25 y arriba). "
 
-#: webrtc.php:47
+#: webrtc.php:50
 msgid ""
 "Please contact your friendica admin and send a reminder to configure the "
 "WebRTC addon."
diff --git a/webrtc/lang/es/strings.php b/webrtc/lang/es/strings.php
index 797567fa..7c79f35d 100644
--- a/webrtc/lang/es/strings.php
+++ b/webrtc/lang/es/strings.php
@@ -2,13 +2,14 @@
 
 if(! function_exists("string_plural_select_es")) {
 function string_plural_select_es($n){
-	$n = intval($n);
-	if ($n == 1) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
+	return ($n != 1);;
 }}
-$a->strings['WebRTC Videochat'] = 'WebRTC Videochat';
-$a->strings['Save Settings'] = 'Guardar ajustes';
-$a->strings['WebRTC Base URL'] = 'WebRTC URL Base';
-$a->strings['Page your users will create a WebRTC chat room on. For example you could use https://live.mayfirst.org .'] = 'Pagina donde el usuario creara una habitación de chat.
-Por ejemplo podría usar https://live.mayfirst.org .';
-$a->strings['Video Chat'] = 'Video Chat';
-$a->strings['Please contact your friendica admin and send a reminder to configure the WebRTC addon.'] = 'Por favor contacta a tu administrador de friendica y envíale un recordatorio para configurar el accesorio (addon) WebRTC.';
+;
+$a->strings["WebRTC Videochat"] = "WebRTC Videochat";
+$a->strings["Save Settings"] = "Guardar ajustes";
+$a->strings["WebRTC Base URL"] = "WebRTC URL Base";
+$a->strings["Page your users will create a WebRTC chat room on. For example you could use https://live.mayfirst.org ."] = "Pagina donde el usuario creara una habitación de chat.\nPor ejemplo podría usar https://live.mayfirst.org .";
+$a->strings["Settings updated."] = "Ajustes actualizados.";
+$a->strings["Video Chat"] = "Video Chat";
+$a->strings["WebRTC is a video and audio conferencing tool that works with Firefox (version 21 and above) and Chrome/Chromium (version 25 and above). Just create a new chat room and send the link to someone you want to chat with."] = "WebRTC es una herramienta de vídeo conferencia que funciona con Firefox (versión 21 y arriba) y Chrome/Chromium (versión 25 y arriba). ";
+$a->strings["Please contact your friendica admin and send a reminder to configure the WebRTC addon."] = "Por favor contacta a tu administrador de friendica y envíale un recordatorio para configurar el accesorio (addon) WebRTC.";
diff --git a/webrtc/lang/fi-fi/strings.php b/webrtc/lang/fi-fi/strings.php
index 6d950b7f..edf6f18a 100644
--- a/webrtc/lang/fi-fi/strings.php
+++ b/webrtc/lang/fi-fi/strings.php
@@ -3,12 +3,14 @@
 if(! function_exists("string_plural_select_fi_fi")) {
 function string_plural_select_fi_fi($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['WebRTC Videochat'] = 'WebRTC videokeskustelu';
-$a->strings['Save Settings'] = 'Tallenna asetukset';
-$a->strings['WebRTC Base URL'] = 'WebRTC perus-URL-osoite';
-$a->strings['Page your users will create a WebRTC chat room on. For example you could use https://live.mayfirst.org .'] = 'Sivusto jolla käyttäjäsi luo WebRTC -chattihuoneen. Esim. https://live.mayfirst.org';
-$a->strings['Settings updated.'] = 'Asetukset päivitetty.';
-$a->strings['Video Chat'] = 'Videokeskustelu';
-$a->strings['Please contact your friendica admin and send a reminder to configure the WebRTC addon.'] = 'Ota yhteyttä Friendica -ylläpitäjääsi ja pyydä heitä asentamaan WebRTC -lisäosan.';
+;
+$a->strings["WebRTC Videochat"] = "WebRTC videokeskustelu";
+$a->strings["Save Settings"] = "Tallenna asetukset";
+$a->strings["WebRTC Base URL"] = "WebRTC perus-URL-osoite";
+$a->strings["Page your users will create a WebRTC chat room on. For example you could use https://live.mayfirst.org ."] = "Sivusto jolla käyttäjäsi luo WebRTC -chattihuoneen. Esim. https://live.mayfirst.org";
+$a->strings["Settings updated."] = "Asetukset päivitetty.";
+$a->strings["Video Chat"] = "Videokeskustelu";
+$a->strings["WebRTC is a video and audio conferencing tool that works with Firefox (version 21 and above) and Chrome/Chromium (version 25 and above). Just create a new chat room and send the link to someone you want to chat with."] = "";
+$a->strings["Please contact your friendica admin and send a reminder to configure the WebRTC addon."] = "Ota yhteyttä Friendica -ylläpitäjääsi ja pyydä heitä asentamaan WebRTC -lisäosan.";
diff --git a/webrtc/lang/fr/messages.po b/webrtc/lang/fr/messages.po
deleted file mode 100644
index 3fc78a4a..00000000
--- a/webrtc/lang/fr/messages.po
+++ /dev/null
@@ -1,57 +0,0 @@
-# ADDON webrtc
-# Copyright (C)
-# This file is distributed under the same license as the Friendica webrtc addon package.
-# 
-# 
-# Translators:
-# Hypolite Petovan <hypolite@mrpetovan.com>, 2022
-# Nicolas Derive, 2022
-# StefOfficiel <pichard.stephane@free.fr>, 2015
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-04-29 15:56+0200\n"
-"PO-Revision-Date: 2014-06-23 13:05+0000\n"
-"Last-Translator: Nicolas Derive, 2022\n"
-"Language-Team: French (http://www.transifex.com/Friendica/friendica/language/fr/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: fr\n"
-"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
-
-#: webrtc.php:18
-msgid "WebRTC Videochat"
-msgstr "Tchat vidéo WebRTC"
-
-#: webrtc.php:24
-msgid "Save Settings"
-msgstr "Enregistrer les paramètres"
-
-#: webrtc.php:25
-msgid "WebRTC Base URL"
-msgstr "URL de base WebRTC"
-
-#: webrtc.php:25
-msgid ""
-"Page your users will create a WebRTC chat room on. For example you could use"
-" https://live.mayfirst.org ."
-msgstr "La page sur laquelle vos utilisateurs créeront un salon de discussion WebRTC. Par exemple, vous pouvez utiliser https://live.mayfirst.org ."
-
-#: webrtc.php:44
-msgid "Video Chat"
-msgstr "Chat Video"
-
-#: webrtc.php:45
-msgid ""
-"WebRTC is a video and audio conferencing tool that works in all modern "
-"browsers. Just create a new chat room and send the link to someone you want "
-"to chat with."
-msgstr "WebRTC est un outil de conférence audio et vidéo qui fonctionne sur tous les navigateurs web modernes. Il faut seulement créer un nouveau salon de discussion et envoyer le lien à quelqu'un avec qui vous souhaitez discuter."
-
-#: webrtc.php:47
-msgid ""
-"Please contact your friendica admin and send a reminder to configure the "
-"WebRTC addon."
-msgstr "Merci de contacter votre admin Friendica et lui envoyer un rappel pour configurer l'extension WebRTC."
diff --git a/webrtc/lang/fr/strings.php b/webrtc/lang/fr/strings.php
deleted file mode 100644
index 92396ef8..00000000
--- a/webrtc/lang/fr/strings.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_fr")) {
-function string_plural_select_fr($n){
-	$n = intval($n);
-	if (($n == 0 || $n == 1)) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
-}}
-$a->strings['WebRTC Videochat'] = 'Tchat vidéo WebRTC';
-$a->strings['Save Settings'] = 'Enregistrer les paramètres';
-$a->strings['WebRTC Base URL'] = 'URL de base WebRTC';
-$a->strings['Page your users will create a WebRTC chat room on. For example you could use https://live.mayfirst.org .'] = 'La page sur laquelle vos utilisateurs créeront un salon de discussion WebRTC. Par exemple, vous pouvez utiliser https://live.mayfirst.org .';
-$a->strings['Video Chat'] = 'Chat Video';
-$a->strings['WebRTC is a video and audio conferencing tool that works in all modern browsers. Just create a new chat room and send the link to someone you want to chat with.'] = 'WebRTC est un outil de conférence audio et vidéo qui fonctionne sur tous les navigateurs web modernes. Il faut seulement créer un nouveau salon de discussion et envoyer le lien à quelqu\'un avec qui vous souhaitez discuter.';
-$a->strings['Please contact your friendica admin and send a reminder to configure the WebRTC addon.'] = 'Merci de contacter votre admin Friendica et lui envoyer un rappel pour configurer l\'extension WebRTC.';
diff --git a/webrtc/lang/hu/messages.po b/webrtc/lang/hu/messages.po
deleted file mode 100644
index 570e74f7..00000000
--- a/webrtc/lang/hu/messages.po
+++ /dev/null
@@ -1,55 +0,0 @@
-# ADDON webrtc
-# Copyright (C)
-# This file is distributed under the same license as the Friendica webrtc addon package.
-# 
-# 
-# Translators:
-# Balázs Úr, 2020-2022
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-04-29 15:56+0200\n"
-"PO-Revision-Date: 2014-06-23 13:05+0000\n"
-"Last-Translator: Balázs Úr, 2020-2022\n"
-"Language-Team: Hungarian (http://www.transifex.com/Friendica/friendica/language/hu/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: hu\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: webrtc.php:18
-msgid "WebRTC Videochat"
-msgstr "WebRTC videocsevegés"
-
-#: webrtc.php:24
-msgid "Save Settings"
-msgstr "Beállítások mentése"
-
-#: webrtc.php:25
-msgid "WebRTC Base URL"
-msgstr "WebRTC alap URL"
-
-#: webrtc.php:25
-msgid ""
-"Page your users will create a WebRTC chat room on. For example you could use"
-" https://live.mayfirst.org ."
-msgstr "Egy oldal, ahol a felhasználók WebRTC csevegőszobát fognak létrehozni. Például használhatja a https://live.mayfirst.org oldalt."
-
-#: webrtc.php:44
-msgid "Video Chat"
-msgstr "Videocsevegés"
-
-#: webrtc.php:45
-msgid ""
-"WebRTC is a video and audio conferencing tool that works in all modern "
-"browsers. Just create a new chat room and send the link to someone you want "
-"to chat with."
-msgstr "A WebRTC egy olyan video- és hangkonferencia-eszköz, amely minden modern böngészőben működik. Egyszerűen hozzon létre egy új csevegőszobát, és küldje el a hivatkozást annak, akivel csevegni szeretne."
-
-#: webrtc.php:47
-msgid ""
-"Please contact your friendica admin and send a reminder to configure the "
-"WebRTC addon."
-msgstr "Vegye fel a kapcsolatot a Friendica adminisztrátorával, és küldjön neki emlékeztetőt, hogy állítsa be a WebRTC bővítményt."
diff --git a/webrtc/lang/hu/strings.php b/webrtc/lang/hu/strings.php
deleted file mode 100644
index 98e07c82..00000000
--- a/webrtc/lang/hu/strings.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_hu")) {
-function string_plural_select_hu($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['WebRTC Videochat'] = 'WebRTC videocsevegés';
-$a->strings['Save Settings'] = 'Beállítások mentése';
-$a->strings['WebRTC Base URL'] = 'WebRTC alap URL';
-$a->strings['Page your users will create a WebRTC chat room on. For example you could use https://live.mayfirst.org .'] = 'Egy oldal, ahol a felhasználók WebRTC csevegőszobát fognak létrehozni. Például használhatja a https://live.mayfirst.org oldalt.';
-$a->strings['Video Chat'] = 'Videocsevegés';
-$a->strings['WebRTC is a video and audio conferencing tool that works in all modern browsers. Just create a new chat room and send the link to someone you want to chat with.'] = 'A WebRTC egy olyan video- és hangkonferencia-eszköz, amely minden modern böngészőben működik. Egyszerűen hozzon létre egy új csevegőszobát, és küldje el a hivatkozást annak, akivel csevegni szeretne.';
-$a->strings['Please contact your friendica admin and send a reminder to configure the WebRTC addon.'] = 'Vegye fel a kapcsolatot a Friendica adminisztrátorával, és küldjön neki emlékeztetőt, hogy állítsa be a WebRTC bővítményt.';
diff --git a/webrtc/lang/it/messages.po b/webrtc/lang/it/messages.po
index f018cb6e..9410d594 100644
--- a/webrtc/lang/it/messages.po
+++ b/webrtc/lang/it/messages.po
@@ -5,51 +5,54 @@
 # 
 # Translators:
 # fabrixxm <fabrix.xm@gmail.com>, 2014
-# Sylke Vicious <silkevicious@gmail.com>, 2020,2023
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-04-29 15:56+0200\n"
-"PO-Revision-Date: 2014-06-23 13:05+0000\n"
-"Last-Translator: Sylke Vicious <silkevicious@gmail.com>, 2020,2023\n"
-"Language-Team: Italian (http://app.transifex.com/Friendica/friendica/language/it/)\n"
+"POT-Creation-Date: 2014-06-23 14:45+0200\n"
+"PO-Revision-Date: 2017-09-20 06:09+0000\n"
+"Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n"
+"Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: it\n"
-"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: webrtc.php:18
+#: webrtc.php:20
 msgid "WebRTC Videochat"
 msgstr "Chat video WebRTC"
 
-#: webrtc.php:24
+#: webrtc.php:26
 msgid "Save Settings"
 msgstr "Salva Impostazioni"
 
-#: webrtc.php:25
+#: webrtc.php:27
 msgid "WebRTC Base URL"
 msgstr "Indirizzo base WebRTC"
 
-#: webrtc.php:25
+#: webrtc.php:27
 msgid ""
 "Page your users will create a WebRTC chat room on. For example you could use"
 " https://live.mayfirst.org ."
 msgstr "Indirizzo della pagina che i tuoi utenti utilizzeranno per creare una chat rom WebRTC. Per esempio potresti usare https://live.mayfirst.org ."
 
-#: webrtc.php:44
+#: webrtc.php:33
+msgid "Settings updated."
+msgstr "Impostazioni aggiornate."
+
+#: webrtc.php:47
 msgid "Video Chat"
 msgstr "Chat Video"
 
-#: webrtc.php:45
+#: webrtc.php:48
 msgid ""
-"WebRTC is a video and audio conferencing tool that works in all modern "
-"browsers. Just create a new chat room and send the link to someone you want "
-"to chat with."
-msgstr "WebRTC è uno strumento di conferenza video e audio che funziona in tutti i browser moderni. Ti basta creare una nuova stanza di conversazione e inviare il collegamento a qualcuno con il quale vuoi parlare."
+"WebRTC is a video and audio conferencing tool that works with Firefox "
+"(version 21 and above) and Chrome/Chromium (version 25 and above). Just "
+"create a new chat room and send the link to someone you want to chat with."
+msgstr "WebRTC è un sistema di conferenza audio/video che funziona con Firefox (dalla versione 21) e Chrome/Chromium (dalla versione 25).\nCrea semplicemente una nuova stanza e invia il link alla persona con cui vuoi parlare."
 
-#: webrtc.php:47
+#: webrtc.php:50
 msgid ""
 "Please contact your friendica admin and send a reminder to configure the "
 "WebRTC addon."
diff --git a/webrtc/lang/it/strings.php b/webrtc/lang/it/strings.php
index 0e1bb5b8..7eb1f2f4 100644
--- a/webrtc/lang/it/strings.php
+++ b/webrtc/lang/it/strings.php
@@ -2,13 +2,14 @@
 
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
-	$n = intval($n);
-	if ($n == 1) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
+	return ($n != 1);;
 }}
-$a->strings['WebRTC Videochat'] = 'Chat video WebRTC';
-$a->strings['Save Settings'] = 'Salva Impostazioni';
-$a->strings['WebRTC Base URL'] = 'Indirizzo base WebRTC';
-$a->strings['Page your users will create a WebRTC chat room on. For example you could use https://live.mayfirst.org .'] = 'Indirizzo della pagina che i tuoi utenti utilizzeranno per creare una chat rom WebRTC. Per esempio potresti usare https://live.mayfirst.org .';
-$a->strings['Video Chat'] = 'Chat Video';
-$a->strings['WebRTC is a video and audio conferencing tool that works in all modern browsers. Just create a new chat room and send the link to someone you want to chat with.'] = 'WebRTC è uno strumento di conferenza video e audio che funziona in tutti i browser moderni. Ti basta creare una nuova stanza di conversazione e inviare il collegamento a qualcuno con il quale vuoi parlare.';
-$a->strings['Please contact your friendica admin and send a reminder to configure the WebRTC addon.'] = 'Contatta il tuo amministratore Friendica e ricordagli di configurare il plugin WebRTC.';
+;
+$a->strings["WebRTC Videochat"] = "Chat video WebRTC";
+$a->strings["Save Settings"] = "Salva Impostazioni";
+$a->strings["WebRTC Base URL"] = "Indirizzo base WebRTC";
+$a->strings["Page your users will create a WebRTC chat room on. For example you could use https://live.mayfirst.org ."] = "Indirizzo della pagina che i tuoi utenti utilizzeranno per creare una chat rom WebRTC. Per esempio potresti usare https://live.mayfirst.org .";
+$a->strings["Settings updated."] = "Impostazioni aggiornate.";
+$a->strings["Video Chat"] = "Chat Video";
+$a->strings["WebRTC is a video and audio conferencing tool that works with Firefox (version 21 and above) and Chrome/Chromium (version 25 and above). Just create a new chat room and send the link to someone you want to chat with."] = "WebRTC è un sistema di conferenza audio/video che funziona con Firefox (dalla versione 21) e Chrome/Chromium (dalla versione 25).\nCrea semplicemente una nuova stanza e invia il link alla persona con cui vuoi parlare.";
+$a->strings["Please contact your friendica admin and send a reminder to configure the WebRTC addon."] = "Contatta il tuo amministratore Friendica e ricordagli di configurare il plugin WebRTC.";
diff --git a/webrtc/lang/nl/strings.php b/webrtc/lang/nl/strings.php
index e78d1360..943551be 100644
--- a/webrtc/lang/nl/strings.php
+++ b/webrtc/lang/nl/strings.php
@@ -3,8 +3,14 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['WebRTC Videochat'] = 'WebRTC Videochat';
-$a->strings['Save Settings'] = 'Instellingen opslaan';
-$a->strings['Settings updated.'] = 'Instellingen opgeslagen';
+;
+$a->strings["WebRTC Videochat"] = "WebRTC Videochat";
+$a->strings["Save Settings"] = "Instellingen opslaan";
+$a->strings["WebRTC Base URL"] = "";
+$a->strings["Page your users will create a WebRTC chat room on. For example you could use https://live.mayfirst.org ."] = "";
+$a->strings["Settings updated."] = "Instellingen opgeslagen";
+$a->strings["Video Chat"] = "";
+$a->strings["WebRTC is a video and audio conferencing tool that works with Firefox (version 21 and above) and Chrome/Chromium (version 25 and above). Just create a new chat room and send the link to someone you want to chat with."] = "";
+$a->strings["Please contact your friendica admin and send a reminder to configure the WebRTC addon."] = "";
diff --git a/webrtc/lang/pl/messages.po b/webrtc/lang/pl/messages.po
index 6e7fa248..b32a43ce 100644
--- a/webrtc/lang/pl/messages.po
+++ b/webrtc/lang/pl/messages.po
@@ -4,15 +4,14 @@
 # 
 # 
 # Translators:
-# Piotr Strębski <strebski@gmail.com>, 2022
-# Waldemar Stoczkowski, 2018
+# Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-04-29 15:56+0200\n"
-"PO-Revision-Date: 2014-06-23 13:05+0000\n"
-"Last-Translator: Piotr Strębski <strebski@gmail.com>, 2022\n"
+"POT-Creation-Date: 2014-06-23 14:45+0200\n"
+"PO-Revision-Date: 2018-08-05 15:55+0000\n"
+"Last-Translator: Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.com/Friendica/friendica/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,36 +19,40 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
-#: webrtc.php:18
+#: webrtc.php:20
 msgid "WebRTC Videochat"
 msgstr "Videochat WebRTC"
 
-#: webrtc.php:24
+#: webrtc.php:26
 msgid "Save Settings"
 msgstr "Zapisz ustawienia"
 
-#: webrtc.php:25
+#: webrtc.php:27
 msgid "WebRTC Base URL"
 msgstr "Podstawowy adres URL WebRTC"
 
-#: webrtc.php:25
+#: webrtc.php:27
 msgid ""
 "Page your users will create a WebRTC chat room on. For example you could use"
 " https://live.mayfirst.org ."
 msgstr "Strona Twoich użytkowników utworzą pokój czatu WebRTC. Na przykład możesz użyć https://live.mayfirst.org."
 
-#: webrtc.php:44
+#: webrtc.php:33
+msgid "Settings updated."
+msgstr "Zaktualizowano ustawienia."
+
+#: webrtc.php:47
 msgid "Video Chat"
 msgstr "Czat wideo"
 
-#: webrtc.php:45
+#: webrtc.php:48
 msgid ""
-"WebRTC is a video and audio conferencing tool that works in all modern "
-"browsers. Just create a new chat room and send the link to someone you want "
-"to chat with."
-msgstr "WebRTC to narzędzie do obsługi konferencji wideo i dźwiękowych, które działa we wszystkich nowoczesnych przeglądarkach. Po prostu utwórz nowy pokój rozmów i wyślij odnośnik do osoby, z którą chcesz porozmawiać."
+"WebRTC is a video and audio conferencing tool that works with Firefox "
+"(version 21 and above) and Chrome/Chromium (version 25 and above). Just "
+"create a new chat room and send the link to someone you want to chat with."
+msgstr "WebRTC to narzędzie do wideokonferencji, które działa z przeglądarką Firefox (wersja 21 i nowsze) oraz Chrome/Chromium (wersja 25 i nowsze). Utwórz nowy pokój czatu i wyślij link do kogoś, z kim chcesz porozmawiać."
 
-#: webrtc.php:47
+#: webrtc.php:50
 msgid ""
 "Please contact your friendica admin and send a reminder to configure the "
 "WebRTC addon."
diff --git a/webrtc/lang/pl/strings.php b/webrtc/lang/pl/strings.php
index 10af69a8..d9fdc635 100644
--- a/webrtc/lang/pl/strings.php
+++ b/webrtc/lang/pl/strings.php
@@ -3,12 +3,14 @@
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
 	$n = intval($n);
-	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
+	return ($n==1 ? 0 : ($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14) ? 1 : $n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14) ? 2 : 3);;
 }}
-$a->strings['WebRTC Videochat'] = 'Videochat WebRTC';
-$a->strings['Save Settings'] = 'Zapisz ustawienia';
-$a->strings['WebRTC Base URL'] = 'Podstawowy adres URL WebRTC';
-$a->strings['Page your users will create a WebRTC chat room on. For example you could use https://live.mayfirst.org .'] = 'Strona Twoich użytkowników utworzą pokój czatu WebRTC. Na przykład możesz użyć https://live.mayfirst.org.';
-$a->strings['Video Chat'] = 'Czat wideo';
-$a->strings['WebRTC is a video and audio conferencing tool that works in all modern browsers. Just create a new chat room and send the link to someone you want to chat with.'] = 'WebRTC to narzędzie do obsługi konferencji wideo i dźwiękowych, które działa we wszystkich nowoczesnych przeglądarkach. Po prostu utwórz nowy pokój rozmów i wyślij odnośnik do osoby, z którą chcesz porozmawiać.';
-$a->strings['Please contact your friendica admin and send a reminder to configure the WebRTC addon.'] = 'Skontaktuj się z administratorem friendica i wyślij przypomnienie, aby skonfigurować dodatek WebRTC.';
+;
+$a->strings["WebRTC Videochat"] = "Videochat WebRTC";
+$a->strings["Save Settings"] = "Zapisz ustawienia";
+$a->strings["WebRTC Base URL"] = "Podstawowy adres URL WebRTC";
+$a->strings["Page your users will create a WebRTC chat room on. For example you could use https://live.mayfirst.org ."] = "Strona Twoich użytkowników utworzą pokój czatu WebRTC. Na przykład możesz użyć https://live.mayfirst.org.";
+$a->strings["Settings updated."] = "Zaktualizowano ustawienia.";
+$a->strings["Video Chat"] = "Czat wideo";
+$a->strings["WebRTC is a video and audio conferencing tool that works with Firefox (version 21 and above) and Chrome/Chromium (version 25 and above). Just create a new chat room and send the link to someone you want to chat with."] = "WebRTC to narzędzie do wideokonferencji, które działa z przeglądarką Firefox (wersja 21 i nowsze) oraz Chrome/Chromium (wersja 25 i nowsze). Utwórz nowy pokój czatu i wyślij link do kogoś, z kim chcesz porozmawiać.";
+$a->strings["Please contact your friendica admin and send a reminder to configure the WebRTC addon."] = "Skontaktuj się z administratorem friendica i wyślij przypomnienie, aby skonfigurować dodatek WebRTC.";
diff --git a/webrtc/lang/ro/strings.php b/webrtc/lang/ro/strings.php
index d2988e38..6afbbc93 100644
--- a/webrtc/lang/ro/strings.php
+++ b/webrtc/lang/ro/strings.php
@@ -2,14 +2,14 @@
 
 if(! function_exists("string_plural_select_ro")) {
 function string_plural_select_ro($n){
-	$n = intval($n);
-	if ($n==1) { return 0; } else if ((($n%100>19)||(($n%100==0)&&($n!=0)))) { return 2; } else  { return 1; }
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
 }}
-$a->strings['WebRTC Videochat'] = 'Videochat WebRTC ';
-$a->strings['Save Settings'] = 'Salvare Configurări';
-$a->strings['WebRTC Base URL'] = 'Adresa URL de Bază WebRTC ';
-$a->strings['Page your users will create a WebRTC chat room on. For example you could use https://live.mayfirst.org .'] = 'Pagina pe care utilizatorii dvs vor crea o camera de chat WebRTC . De exemplu, a-ți putea utiliza https://live.mayfirst.org .';
-$a->strings['Settings updated.'] = 'Configurări actualizate.';
-$a->strings['Video Chat'] = 'Video Chat';
-$a->strings['WebRTC is a video and audio conferencing tool that works with Firefox (version 21 and above) and Chrome/Chromium (version 25 and above). Just create a new chat room and send the link to someone you want to chat with.'] = 'WebRTC este un instrument de conferințe audio-video care funcționează cu Firefox (versiunea 21 şi superioară) şi Chrome/Chromium (versiunea 25 şi superioară). Trebuie doar să creați o nouă cameră de chat şi să trimiteți legătura cuiva cu care doriţi să conversați.';
-$a->strings['Please contact your friendica admin and send a reminder to configure the WebRTC addon.'] = 'Vă rugăm să vă contactați administratorul friendica şi să-i trimiteți un memento pentru a configura suplimentul WebRTC.';
+;
+$a->strings["WebRTC Videochat"] = "Videochat WebRTC ";
+$a->strings["Save Settings"] = "Salvare Configurări";
+$a->strings["WebRTC Base URL"] = "Adresa URL de Bază WebRTC ";
+$a->strings["Page your users will create a WebRTC chat room on. For example you could use https://live.mayfirst.org ."] = "Pagina pe care utilizatorii dvs vor crea o camera de chat WebRTC . De exemplu, a-ți putea utiliza https://live.mayfirst.org .";
+$a->strings["Settings updated."] = "Configurări actualizate.";
+$a->strings["Video Chat"] = "Video Chat";
+$a->strings["WebRTC is a video and audio conferencing tool that works with Firefox (version 21 and above) and Chrome/Chromium (version 25 and above). Just create a new chat room and send the link to someone you want to chat with."] = "WebRTC este un instrument de conferințe audio-video care funcționează cu Firefox (versiunea 21 şi superioară) şi Chrome/Chromium (versiunea 25 şi superioară). Trebuie doar să creați o nouă cameră de chat şi să trimiteți legătura cuiva cu care doriţi să conversați.";
+$a->strings["Please contact your friendica admin and send a reminder to configure the WebRTC addon."] = "Vă rugăm să vă contactați administratorul friendica şi să-i trimiteți un memento pentru a configura suplimentul WebRTC.";
diff --git a/webrtc/lang/ru/messages.po b/webrtc/lang/ru/messages.po
deleted file mode 100644
index 84c98c51..00000000
--- a/webrtc/lang/ru/messages.po
+++ /dev/null
@@ -1,55 +0,0 @@
-# ADDON webrtc
-# Copyright (C)
-# This file is distributed under the same license as the Friendica webrtc addon package.
-# 
-# 
-# Translators:
-# Alexander An <ravnina@gmail.com>, 2022
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-04-29 15:56+0200\n"
-"PO-Revision-Date: 2014-06-23 13:05+0000\n"
-"Last-Translator: Alexander An <ravnina@gmail.com>, 2022\n"
-"Language-Team: Russian (http://www.transifex.com/Friendica/friendica/language/ru/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ru\n"
-"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
-
-#: webrtc.php:18
-msgid "WebRTC Videochat"
-msgstr "Видеочат WebRTC"
-
-#: webrtc.php:24
-msgid "Save Settings"
-msgstr "Сохранить настройки"
-
-#: webrtc.php:25
-msgid "WebRTC Base URL"
-msgstr "Основная URL WebRTC"
-
-#: webrtc.php:25
-msgid ""
-"Page your users will create a WebRTC chat room on. For example you could use"
-" https://live.mayfirst.org ."
-msgstr "Страница, на которой ваши пользователи будут создавать чат WebRTC. Например, https://live.mayfirst.org ."
-
-#: webrtc.php:44
-msgid "Video Chat"
-msgstr "Видеочат"
-
-#: webrtc.php:45
-msgid ""
-"WebRTC is a video and audio conferencing tool that works in all modern "
-"browsers. Just create a new chat room and send the link to someone you want "
-"to chat with."
-msgstr "WebRTC это средство для видео и аудиоконференций, которое работает во всех современных браузерах. Просто создайте новую комнату и пошлите ссылку тем, с кем хотите пообщаться."
-
-#: webrtc.php:47
-msgid ""
-"Please contact your friendica admin and send a reminder to configure the "
-"WebRTC addon."
-msgstr "Пожалуйста, свяжитесь со своим администратором Friendica и напомните сконфигурировать дополнение WebRTC."
diff --git a/webrtc/lang/ru/strings.php b/webrtc/lang/ru/strings.php
deleted file mode 100644
index 63ec51af..00000000
--- a/webrtc/lang/ru/strings.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_ru")) {
-function string_plural_select_ru($n){
-	$n = intval($n);
-	if ($n%10==1 && $n%100!=11) { return 0; } else if ($n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14)) { return 1; } else if ($n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)) { return 2; } else  { return 3; }
-}}
-$a->strings['WebRTC Videochat'] = 'Видеочат WebRTC';
-$a->strings['Save Settings'] = 'Сохранить настройки';
-$a->strings['WebRTC Base URL'] = 'Основная URL WebRTC';
-$a->strings['Page your users will create a WebRTC chat room on. For example you could use https://live.mayfirst.org .'] = 'Страница, на которой ваши пользователи будут создавать чат WebRTC. Например, https://live.mayfirst.org .';
-$a->strings['Video Chat'] = 'Видеочат';
-$a->strings['WebRTC is a video and audio conferencing tool that works in all modern browsers. Just create a new chat room and send the link to someone you want to chat with.'] = 'WebRTC это средство для видео и аудиоконференций, которое работает во всех современных браузерах. Просто создайте новую комнату и пошлите ссылку тем, с кем хотите пообщаться.';
-$a->strings['Please contact your friendica admin and send a reminder to configure the WebRTC addon.'] = 'Пожалуйста, свяжитесь со своим администратором Friendica и напомните сконфигурировать дополнение WebRTC.';
diff --git a/webrtc/lang/sv/messages.po b/webrtc/lang/sv/messages.po
deleted file mode 100644
index dd191b6e..00000000
--- a/webrtc/lang/sv/messages.po
+++ /dev/null
@@ -1,56 +0,0 @@
-# ADDON webrtc
-# Copyright (C)
-# This file is distributed under the same license as the Friendica webrtc addon package.
-# 
-# 
-# Translators:
-# Hypolite Petovan <hypolite@mrpetovan.com>, 2019
-# Kristoffer Grundström <lovaren@gmail.com>, 2022
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:16+0100\n"
-"PO-Revision-Date: 2022-01-16 00:57+0000\n"
-"Last-Translator: Kristoffer Grundström <lovaren@gmail.com>\n"
-"Language-Team: Swedish (http://www.transifex.com/Friendica/friendica/language/sv/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: sv\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: webrtc.php:19
-msgid "WebRTC Videochat"
-msgstr ""
-
-#: webrtc.php:25
-msgid "Save Settings"
-msgstr "Spara inställningar"
-
-#: webrtc.php:26
-msgid "WebRTC Base URL"
-msgstr ""
-
-#: webrtc.php:26
-msgid ""
-"Page your users will create a WebRTC chat room on. For example you could use"
-" https://live.mayfirst.org ."
-msgstr ""
-
-#: webrtc.php:45
-msgid "Video Chat"
-msgstr "Videochatt"
-
-#: webrtc.php:46
-msgid ""
-"WebRTC is a video and audio conferencing tool that works with Firefox "
-"(version 21 and above) and Chrome/Chromium (version 25 and above). Just "
-"create a new chat room and send the link to someone you want to chat with."
-msgstr ""
-
-#: webrtc.php:48
-msgid ""
-"Please contact your friendica admin and send a reminder to configure the "
-"WebRTC addon."
-msgstr ""
diff --git a/webrtc/lang/sv/strings.php b/webrtc/lang/sv/strings.php
deleted file mode 100644
index da4b974a..00000000
--- a/webrtc/lang/sv/strings.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_sv")) {
-function string_plural_select_sv($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Save Settings'] = 'Spara inställningar';
-$a->strings['Video Chat'] = 'Videochatt';
diff --git a/webrtc/lang/zh-cn/strings.php b/webrtc/lang/zh-cn/strings.php
index 33f75e72..1d41cd16 100644
--- a/webrtc/lang/zh-cn/strings.php
+++ b/webrtc/lang/zh-cn/strings.php
@@ -3,13 +3,14 @@
 if(! function_exists("string_plural_select_zh_cn")) {
 function string_plural_select_zh_cn($n){
 	$n = intval($n);
-	return intval(0);
+	return 0;;
 }}
-$a->strings['WebRTC Videochat'] = 'WebRTC 视频通话';
-$a->strings['Save Settings'] = '保存设置';
-$a->strings['WebRTC Base URL'] = 'WebRTC Base URL';
-$a->strings['Page your users will create a WebRTC chat room on. For example you could use https://live.mayfirst.org .'] = '通知您的用户将启用的 WebRTC 聊天室。例如您可以使用 https://live.mayfirst.org。';
-$a->strings['Settings updated.'] = '设置已更新。';
-$a->strings['Video Chat'] = '视频通话';
-$a->strings['WebRTC is a video and audio conferencing tool that works with Firefox (version 21 and above) and Chrome/Chromium (version 25 and above). Just create a new chat room and send the link to someone you want to chat with.'] = 'WebRTC 是一款视频和音频会议工具，可在 Firefox (21 及以上版本) 和 Chrome/Chromium (25 及以上版本) 上使用。只需创建一个新的聊天室并将链接发送给您想要聊天的人即可开始聊天。';
-$a->strings['Please contact your friendica admin and send a reminder to configure the WebRTC addon.'] = '请联系提醒您的 friendica 管理员完成 WebRTC 插件的配置。';
+;
+$a->strings["WebRTC Videochat"] = "WebRTC 视频通话";
+$a->strings["Save Settings"] = "保存设置";
+$a->strings["WebRTC Base URL"] = "WebRTC Base URL";
+$a->strings["Page your users will create a WebRTC chat room on. For example you could use https://live.mayfirst.org ."] = "通知您的用户将启用的 WebRTC 聊天室。例如您可以使用 https://live.mayfirst.org。";
+$a->strings["Settings updated."] = "设置已更新。";
+$a->strings["Video Chat"] = "视频通话";
+$a->strings["WebRTC is a video and audio conferencing tool that works with Firefox (version 21 and above) and Chrome/Chromium (version 25 and above). Just create a new chat room and send the link to someone you want to chat with."] = "WebRTC 是一款视频和音频会议工具，可在 Firefox (21 及以上版本) 和 Chrome/Chromium (25 及以上版本) 上使用。只需创建一个新的聊天室并将链接发送给您想要聊天的人即可开始聊天。";
+$a->strings["Please contact your friendica admin and send a reminder to configure the WebRTC addon."] = "请联系提醒您的 friendica 管理员完成 WebRTC 插件的配置。";
diff --git a/webrtc/webrtc.php b/webrtc/webrtc.php
index e142b374..026e3cc3 100644
--- a/webrtc/webrtc.php
+++ b/webrtc/webrtc.php
@@ -6,62 +6,58 @@
  * Author: Stephen Mahood <https://friends.mayfirst.org/profile/marxistvegan>
  * Author: Tobias Diekershoff <https://f.diekershoff.de/profile/tobias>
  */
-
-use Friendica\App;
+use Friendica\Core\Config;
 use Friendica\Core\Hook;
+use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
-use Friendica\DI;
+use Friendica\Util\Strings;
 
 function webrtc_install() {
-	Hook::register('app_menu', 'addon/webrtc/webrtc.php', 'webrtc_app_menu');
+        Hook::register('app_menu', 'addon/webrtc/webrtc.php', 'webrtc_app_menu');
 }
 
-function webrtc_app_menu(array &$b)
-{
-	$b['app_menu'][] = '<div class="app-title"><a href="webrtc">' . DI::l10n()->t('WebRTC Videochat') . '</a></div>';
+function webrtc_uninstall() {
+        Hook::unregister('app_menu', 'addon/webrtc/webrtc.php', 'webrtc_app_menu');
+
 }
 
-function webrtc_addon_admin (string &$o)
-{
-	$t = Renderer::getMarkupTemplate('admin.tpl', 'addon/webrtc/' );
-	$o = Renderer::replaceMacros($t, [
-		'$submit' => DI::l10n()->t('Save Settings'),
-		'$webrtcurl' => [
-			'webrtcurl',
-			DI::l10n()->t('WebRTC Base URL'),
-			DI::config()->get('webrtc','webrtcurl' ),
-			DI::l10n()->t('Page your users will create a WebRTC chat room on. For example you could use https://live.mayfirst.org .'),
-		],
+function webrtc_app_menu($a,&$b) {
+	$b['app_menu'][] = '<div class="app-title"><a href="webrtc">' . L10n::t('WebRTC Videochat') . '</a></div>';
+}
+
+function webrtc_addon_admin (&$a, &$o) {
+        $t = Renderer::getMarkupTemplate( "admin.tpl", "addon/webrtc/" );
+	$o = Renderer::replaceMacros( $t, [
+	    '$submit' => L10n::t('Save Settings'),
+	    '$webrtcurl' => ['webrtcurl', L10n::t('WebRTC Base URL'), Config::get('webrtc','webrtcurl' ), L10n::t('Page your users will create a WebRTC chat room on. For example you could use https://live.mayfirst.org .')],
 	]);
 }
-
-function webrtc_addon_admin_post ()
-{
-	DI::config()->set('webrtc', 'webrtcurl', trim($_POST['webrtcurl'] ?? ''));
+function webrtc_addon_admin_post (&$a) {
+        $url = (!empty($_POST['webrtcurl']) ? Strings::escapeTags(trim($_POST['webrtcurl'])) : '');
+	    Config::set('webrtc', 'webrtcurl', $url);
+	    info(L10n::t('Settings updated.'). EOL);
 }
 
-/**
- * This is a statement rather than an actual function definition. The simple
- * existence of this method is checked to figure out if the addon offers a
- * module.
- */
-function webrtc_module() {}
+function webrtc_module() {
+	return;
+}
 
-function webrtc_content(): string
-{
-	$o = '';
+function webrtc_content(&$a) {
+        $o = '';
 
-	/* landingpage to create chatrooms */
-	$webrtcurl = DI::config()->get('webrtc','webrtcurl');
+        /* landingpage to create chatrooms */
+        $webrtcurl = Config::get('webrtc','webrtcurl');
 
-	/* embedd the landing page in an iframe */
-	$o .= '<h2>'.DI::l10n()->t('Video Chat').'</h2>';
-	$o .= '<p>'.DI::l10n()->t('WebRTC is a video and audio conferencing tool that works in all modern browsers. Just create a new chat room and send the link to someone you want to chat with.').'</p>';
+        /* embedd the landing page in an iframe */
+        $o .= '<h2>'.L10n::t('Video Chat').'</h2>';
+        $o .= '<p>'.L10n::t('WebRTC is a video and audio conferencing tool that works with Firefox (version 21 and above) and Chrome/Chromium (version 25 and above). Just create a new chat room and send the link to someone you want to chat with.').'</p>';
 	if ($webrtcurl == '') {
-		$o .= '<p>'.DI::l10n()->t('Please contact your friendica admin and send a reminder to configure the WebRTC addon.').'</p>';
+	    $o .= '<p>'.L10n::t('Please contact your friendica admin and send a reminder to configure the WebRTC addon.').'</p>';
 	} else {
-		$o .= '<iframe src="'.$webrtcurl.'" width="600px" height="600px"></iframe>';
+	    $o .= '<iframe src="'.$webrtcurl.'" width="600px" height="600px"></iframe>';
 	}
 
-	return $o;
+
+        return $o;
 }
+?>
diff --git a/widgets/lang/C/messages.po b/widgets/lang/C/messages.po
new file mode 100644
index 00000000..79a7a402
--- /dev/null
+++ b/widgets/lang/C/messages.po
@@ -0,0 +1,57 @@
+# ADDON widgets
+# Copyright (C) 
+# This file is distributed under the same license as the Friendica widgets addon package.
+# 
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-02-27 05:01-0500\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+#"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
+
+#: widget_like.php:59
+#, php-format
+msgid "%d person likes this"
+msgid_plural "%d people like this"
+msgstr[0] ""
+msgstr[1] ""
+
+#: widget_like.php:62
+#, php-format
+msgid "%d person doesn't like this"
+msgid_plural "%d people don't like this"
+msgstr[0] ""
+msgstr[1] ""
+
+#: widget_friends.php:40
+msgid "Connect on Friendica!"
+msgstr ""
+
+#: widgets.php:57
+msgid "Generate new key"
+msgstr ""
+
+#: widgets.php:60
+msgid "Widgets key"
+msgstr ""
+
+#: widgets.php:62
+msgid "Widgets available"
+msgstr ""
+
+#: widgets.php:124
+msgid "Addon Settings"
+msgstr ""
+
+#: widget_friendheader.php:40
+msgid "Get added to this list!"
+msgstr ""
diff --git a/widgets/lang/ca/strings.php b/widgets/lang/ca/strings.php
new file mode 100644
index 00000000..fb4bd472
--- /dev/null
+++ b/widgets/lang/ca/strings.php
@@ -0,0 +1,10 @@
+<?php
+
+$a->strings["%d person likes this"] = "Array";
+$a->strings["%d person doesn't like this"] = "Array";
+$a->strings["Connect on Friendica!"] = "Connectar en Friendica";
+$a->strings["Generate new key"] = "Generar nova clau";
+$a->strings["Widgets key"] = "Ginys clau";
+$a->strings["Widgets available"] = "Ginys disponibles";
+$a->strings["Addon Settings"] = "Ajustos de Addon";
+$a->strings["Get added to this list!"] = "S'afegeixen a aquesta llista!";
diff --git a/widgets/lang/cs/strings.php b/widgets/lang/cs/strings.php
new file mode 100644
index 00000000..e6da406d
--- /dev/null
+++ b/widgets/lang/cs/strings.php
@@ -0,0 +1,10 @@
+<?php
+
+$a->strings["%d person likes this"] = "Array";
+$a->strings["%d person doesn't like this"] = "Array";
+$a->strings["Connect on Friendica!"] = "Připojit na Friendica!";
+$a->strings["Generate new key"] = "Generovat nové klíče";
+$a->strings["Widgets key"] = "Widgety klíč";
+$a->strings["Widgets available"] = "Widgety k dispozici";
+$a->strings["Addon Settings"] = "Nastavení doplňku";
+$a->strings["Get added to this list!"] = "Nechte se přidat do tohoto listu!";
diff --git a/widgets/lang/de/strings.php b/widgets/lang/de/strings.php
new file mode 100644
index 00000000..86e42c68
--- /dev/null
+++ b/widgets/lang/de/strings.php
@@ -0,0 +1,10 @@
+<?php
+
+$a->strings["%d person likes this"] = "Array";
+$a->strings["%d person doesn't like this"] = "Array";
+$a->strings["Connect on Friendica!"] = "In Friendica verbinden!";
+$a->strings["Generate new key"] = "Neuen Schlüssel erstellen";
+$a->strings["Widgets key"] = "Widgets Schlüssel";
+$a->strings["Widgets available"] = "Verfügbare Widgets";
+$a->strings["Addon Settings"] = "Addon-Einstellungen";
+$a->strings["Get added to this list!"] = "Werde Mitglied dieser Liste";
diff --git a/widgets/lang/eo/strings.php b/widgets/lang/eo/strings.php
new file mode 100644
index 00000000..7585a6bb
--- /dev/null
+++ b/widgets/lang/eo/strings.php
@@ -0,0 +1,10 @@
+<?php
+
+$a->strings["%d person likes this"] = "Array";
+$a->strings["%d person doesn't like this"] = "Array";
+$a->strings["Connect on Friendica!"] = "Konekti ĉe Friendica!";
+$a->strings["Generate new key"] = "Generi novan ĉifroŝlosilon";
+$a->strings["Widgets key"] = "Ŝlosilo por fenestraĵoj";
+$a->strings["Widgets available"] = "Disponeblaj fenestraĵoj";
+$a->strings["Addon Settings"] = "Kromprogramoagordoj";
+$a->strings["Get added to this list!"] = "Iĝu membro de ĉi tiu listo!";
diff --git a/widgets/lang/es/strings.php b/widgets/lang/es/strings.php
new file mode 100644
index 00000000..736ae769
--- /dev/null
+++ b/widgets/lang/es/strings.php
@@ -0,0 +1,10 @@
+<?php
+
+$a->strings["%d person likes this"] = "Array";
+$a->strings["%d person doesn't like this"] = "Array";
+$a->strings["Connect on Friendica!"] = "¡Conéctate en Friendica!";
+$a->strings["Generate new key"] = "Generar clave nueva";
+$a->strings["Widgets key"] = "Clave de aplicaciones";
+$a->strings["Widgets available"] = "Aplicaciones disponibles";
+$a->strings["Addon Settings"] = "Configuración de los módulos";
+$a->strings["Get added to this list!"] = "¡Añadido a la lista!";
diff --git a/widgets/lang/fr/strings.php b/widgets/lang/fr/strings.php
new file mode 100644
index 00000000..2a3000e3
--- /dev/null
+++ b/widgets/lang/fr/strings.php
@@ -0,0 +1,10 @@
+<?php
+
+$a->strings["%d person likes this"] = "Array";
+$a->strings["%d person doesn't like this"] = "Array";
+$a->strings["Connect on Friendica!"] = "Se connecter sur Friendica!";
+$a->strings["Generate new key"] = "Générer une nouvelle clé";
+$a->strings["Widgets key"] = "Clé des widgets";
+$a->strings["Widgets available"] = "Widgets disponibles";
+$a->strings["Addon Settings"] = "Extensions";
+$a->strings["Get added to this list!"] = "Ajoutez-vous à cette liste!";
diff --git a/widgets/lang/is/strings.php b/widgets/lang/is/strings.php
new file mode 100644
index 00000000..7867762d
--- /dev/null
+++ b/widgets/lang/is/strings.php
@@ -0,0 +1,10 @@
+<?php
+
+$a->strings["%d person likes this"] = "Array";
+$a->strings["%d person doesn't like this"] = "Array";
+$a->strings["Connect on Friendica!"] = "Tengist á Friendica!";
+$a->strings["Generate new key"] = "Búa til nýjan lykil";
+$a->strings["Widgets key"] = "Lykill smáforrits ";
+$a->strings["Widgets available"] = "Smáforrit til";
+$a->strings["Addon Settings"] = "Eininga stillingar";
+$a->strings["Get added to this list!"] = "Láta bæta þér við þennan lista!";
diff --git a/widgets/lang/it/strings.php b/widgets/lang/it/strings.php
new file mode 100644
index 00000000..277f1f86
--- /dev/null
+++ b/widgets/lang/it/strings.php
@@ -0,0 +1,10 @@
+<?php
+
+$a->strings["%d person likes this"] = "Array";
+$a->strings["%d person doesn't like this"] = "Array";
+$a->strings["Connect on Friendica!"] = "Connettiti su Friendica!";
+$a->strings["Generate new key"] = "Genera una nuova chiave";
+$a->strings["Widgets key"] = "Chiave Widget";
+$a->strings["Widgets available"] = "Widget disponibili";
+$a->strings["Addon Settings"] = "Impostazioni addon";
+$a->strings["Get added to this list!"] = "Aggiungiti a questa lista!";
diff --git a/widgets/lang/nb-no/strings.php b/widgets/lang/nb-no/strings.php
new file mode 100644
index 00000000..cdcf3f43
--- /dev/null
+++ b/widgets/lang/nb-no/strings.php
@@ -0,0 +1,10 @@
+<?php
+
+$a->strings["%d person likes this"] = "Array";
+$a->strings["%d person doesn't like this"] = "Array";
+$a->strings["Connect on Friendica!"] = "";
+$a->strings["Generate new key"] = "Lag ny nøkkel";
+$a->strings["Widgets key"] = "Nøkkel til småprogrammer";
+$a->strings["Widgets available"] = "Småprogrammer er tilgjengelige";
+$a->strings["Addon Settings"] = "Tilleggsinnstillinger";
+$a->strings["Get added to this list!"] = "";
diff --git a/widgets/lang/pl/strings.php b/widgets/lang/pl/strings.php
new file mode 100644
index 00000000..b36b2cf5
--- /dev/null
+++ b/widgets/lang/pl/strings.php
@@ -0,0 +1,10 @@
+<?php
+
+$a->strings["%d person likes this"] = "Array";
+$a->strings["%d person doesn't like this"] = "Array";
+$a->strings["Connect on Friendica!"] = "Połączono z Friendica!";
+$a->strings["Generate new key"] = "Stwórz nowy klucz";
+$a->strings["Widgets key"] = "";
+$a->strings["Widgets available"] = "Widgety są dostępne";
+$a->strings["Addon Settings"] = "Ustawienia wtyczki";
+$a->strings["Get added to this list!"] = "Zostań dodany do listy!";
diff --git a/widgets/lang/pt-br/strings.php b/widgets/lang/pt-br/strings.php
new file mode 100644
index 00000000..934ffea3
--- /dev/null
+++ b/widgets/lang/pt-br/strings.php
@@ -0,0 +1,10 @@
+<?php
+
+$a->strings["%d person likes this"] = "Array";
+$a->strings["%d person doesn't like this"] = "Array";
+$a->strings["Connect on Friendica!"] = "Conecte no Friendica!";
+$a->strings["Generate new key"] = "Gerar nova chave";
+$a->strings["Widgets key"] = "Chave de widgets";
+$a->strings["Widgets available"] = "Widgets disponíveis";
+$a->strings["Addon Settings"] = "Configurações do addon";
+$a->strings["Get added to this list!"] = "";
diff --git a/widgets/lang/ru/strings.php b/widgets/lang/ru/strings.php
new file mode 100644
index 00000000..8d8cf250
--- /dev/null
+++ b/widgets/lang/ru/strings.php
@@ -0,0 +1,10 @@
+<?php
+
+$a->strings["%d person likes this"] = "Array";
+$a->strings["%d person doesn't like this"] = "Array";
+$a->strings["Connect on Friendica!"] = "Подключены к Friendica!";
+$a->strings["Generate new key"] = "Сгенерировать новый ключ";
+$a->strings["Widgets key"] = "Ключ виджетов";
+$a->strings["Widgets available"] = "Виджеты доступны";
+$a->strings["Addon Settings"] = "Настройки плагина";
+$a->strings["Get added to this list!"] = "";
diff --git a/widgets/lang/sv/strings.php b/widgets/lang/sv/strings.php
new file mode 100644
index 00000000..6b34aac1
--- /dev/null
+++ b/widgets/lang/sv/strings.php
@@ -0,0 +1,3 @@
+<?php
+
+$a->strings["Addon Settings"] = "Inst&auml;llningar f&ouml;r insticksprogram";
diff --git a/widgets/lang/zh-cn/strings.php b/widgets/lang/zh-cn/strings.php
new file mode 100644
index 00000000..df8fc494
--- /dev/null
+++ b/widgets/lang/zh-cn/strings.php
@@ -0,0 +1,10 @@
+<?php
+
+$a->strings["%d person likes this"] = "Array";
+$a->strings["%d person doesn't like this"] = "Array";
+$a->strings["Connect on Friendica!"] = "连接在Friendica！";
+$a->strings["Generate new key"] = "造成新钥匙";
+$a->strings["Widgets key"] = "小窗口钥匙";
+$a->strings["Widgets available"] = "可用的小窗口";
+$a->strings["Addon Settings"] = "插件设置";
+$a->strings["Get added to this list!"] = "被在这个单子加入！";
diff --git a/widgets/templates/settings.tpl b/widgets/templates/settings.tpl
new file mode 100644
index 00000000..017fa120
--- /dev/null
+++ b/widgets/templates/settings.tpl
@@ -0,0 +1,19 @@
+<div class="settings-block">
+	<h3 class="settings-heading">{{$title}}</h3>
+	<div class='field noedit'>
+		<label>{{$label}}</label>
+		<tt>{{$key}}</tt>
+	</div>
+	
+	<div class="settings-submit-wrapper">
+		<input type="submit" value="{{$submit}}" class="settings-submit" name="widgets-submit" />
+	</div>
+	
+	<h4>{{$widgets_h}}</h4>
+	<ul>
+		{{foreach $widgets as $w}}
+			<li><a href="{{$baseurl}}/widgets/{{$w.0}}/?k={{$key}}&p=1">{{$w.1}}</a></li>
+		{{/foreach}}
+	</ul>
+	
+</div>
diff --git a/widgets/templates/widget_like.tpl b/widgets/templates/widget_like.tpl
new file mode 100644
index 00000000..ad529575
--- /dev/null
+++ b/widgets/templates/widget_like.tpl
@@ -0,0 +1,3 @@
+<style>body {font-size: 0.8em; margin: 0px; padding: 0px;}</style>
+<span class='f9k_like' title="{{$strlike}}">{{$like}} <img src="{{$baseurl}}/images/like.gif" alt="like"/></span> 
+<span class='f9k_dislike' title="{{$strdislike}}">{{$dislike}} <img src="{{$baseurl}}/images/dislike.gif" alt="dislike"/></span>
diff --git a/widgets/widget_friendheader.php b/widgets/widget_friendheader.php
new file mode 100644
index 00000000..7df1ff7c
--- /dev/null
+++ b/widgets/widget_friendheader.php
@@ -0,0 +1,53 @@
+<?php
+
+use Friendica\Content\Text\HTML;
+use Friendica\Core\L10n;
+
+function friendheader_widget_name()
+{
+	return "Shows friends as a bar";
+}
+function friendheader_widget_help()
+{
+	return "";
+}
+
+function friendheader_widget_args()
+{
+	return [];
+}
+
+function friendheader_widget_size()
+{
+	return ['780px','140px'];
+}
+
+
+function friendheader_widget_content(&$a, $conf)
+{
+	$r = q("SELECT `profile`.`uid` AS `profile_uid`, `profile`.* , `user`.* FROM `profile`
+			LEFT JOIN `user` ON `profile`.`uid` = `user`.`uid`
+			WHERE `user`.`uid` = %s AND `profile`.`is-default` = 1 LIMIT 1",
+		intval($conf['uid'])
+	);
+	if (!count($r)) {
+		return;
+	}
+
+	$a->profile = $r[0];
+
+	$o = "";
+	$o .= "<style>
+		body {font-size: 0.8em; margin: 0px; padding: 0px;}
+		#contact-block { overflow: hidden; height: auto; }
+		.contact-block-h4 { float: left; margin: 0px; }
+		.allcontact-link { float: right; margin: 0px; }
+		.contact-block-content { clear:both; }
+		.contact-block-div { display: block !important; float: left!important; width: 50px!important; height: 50px!important; margin: 2px!important;}
+
+	</style>";
+	$o .= _abs_url(HTML::contactBlock());
+	$o .= "<a href='".$a->getBaseURL().'/profile/'.$a->profile['nickname']."' target=new>". L10n::t('Get added to this list!') ."</a>";
+
+	return $o;
+}
diff --git a/widgets/widget_friends.php b/widgets/widget_friends.php
new file mode 100644
index 00000000..f661a4f0
--- /dev/null
+++ b/widgets/widget_friends.php
@@ -0,0 +1,54 @@
+<?php
+
+use Friendica\Content\Text\HTML;
+use Friendica\Core\L10n;
+
+function friends_widget_name()
+{
+	return "Shows profile contacts";
+}
+
+function friends_widget_help()
+{
+	return "";
+}
+
+function friends_widget_args()
+{
+	return [];
+}
+
+function friends_widget_size()
+{
+	return ['100%', '200px'];
+}
+
+
+function friends_widget_content(&$a, $conf)
+{
+	$r = q("SELECT `profile`.`uid` AS `profile_uid`, `profile`.* , `user`.* FROM `profile`
+			LEFT JOIN `user` ON `profile`.`uid` = `user`.`uid`
+			WHERE `user`.`uid` = %s AND `profile`.`is-default` = 1 LIMIT 1",
+		intval($conf['uid'])
+	);
+
+	if (!count($r)) {
+		return;
+	}
+	
+	$a->profile = $r[0];
+
+	$o = "";
+	$o .= "<style>
+		body {font-size: 0.8em; margin: 0px; padding: 0px;}
+		#contact-block { overflow: hidden; height: auto; }
+		.contact-block-h4 { float: left; margin: 0px; }
+		.allcontact-link { float: right; margin: 0px; }
+		.contact-block-content { clear:both; }
+		.contact-block-div { display: block !important; float: left!important; width: 50px!important; height: 50px!important; margin: 2px!important;}
+
+	</style>";
+	$o .= _abs_url(HTML::contactBlock());
+	$o .= "<a href='".$a->getBaseURL().'/profile/'.$a->profile['nickname']."'>". L10n::t('Connect on Friendica!') ."</a>";
+	return $o;
+}
diff --git a/widgets/widget_like.php b/widgets/widget_like.php
new file mode 100644
index 00000000..1fcc96b9
--- /dev/null
+++ b/widgets/widget_like.php
@@ -0,0 +1,68 @@
+<?php
+
+use Friendica\Core\L10n;
+use Friendica\Core\Renderer;
+use Friendica\Database\DBA;
+
+function like_widget_name() {
+	return "Shows likes";
+}
+function like_widget_help() {
+	return "Search first item which contains <em>KEY</em> and print like/dislike count";
+}
+
+function like_widget_args(){
+	return ["KEY"];
+}
+
+function like_widget_size(){
+	return ['60px','20px'];
+}
+
+
+function like_widget_content(&$a, $conf){
+	$args = explode(",",$_GET['a']);
+
+
+	$baseq="SELECT COUNT(`item`.`id`) as `c`, `p`.`id`
+					FROM `item`,
+						(SELECT `i`.`id` FROM `item` as `i` WHERE
+							`i`.`visible` = 1 AND `i`.`deleted` = 0
+							AND (( `i`.`wall` = 1 AND `i`.`allow_cid` = ''
+									AND `i`.`allow_gid` = ''
+									AND `i`.`deny_cid`  = ''
+									AND `i`.`deny_gid`  = '' )
+								  OR `i`.`uid` = %d )
+							AND `i`.`body` LIKE '%%%s%%' LIMIT 1) as `p`
+					WHERE `item`.`parent` = `p`.`id` ";
+
+	// count likes
+	$r = q( $baseq . "AND `item`.`verb` = 'http://activitystrea.ms/schema/1.0/like'",
+			intval($conf['uid']),
+			DBA::escape($args[0])
+	);
+	$likes = $r[0]['c'];
+	$iid = $r[0]['id'];
+
+	// count dislikes
+	$r = q( $baseq . "AND `item`.`verb` = 'http://purl.org/macgirvin/dfrn/1.0/dislike'",
+			intval($conf['uid']),
+			DBA::escape($args[0])
+	);
+	$dislikes = $r[0]['c'];
+
+
+	$o = "";
+
+#	$t = file_get_contents( dirname(__file__). "/widget_like.tpl" );
+	$t = Renderer::getMarkupTemplate("widget_like.tpl", "addon/widgets/");
+	$o .= Renderer::replaceMacros($t, [
+		'$like'		=> $likes,
+		'$strlike'	=> L10n::tt("%d person likes this", "%d people like this", $likes),
+
+		'$dislike'	=> $dislikes,
+		'$strdislike'=> L10n::tt("%d person doesn't like this", "%d people don't like this", $dislikes),
+	]);
+
+	return $o;
+}
diff --git a/widgets/widgets.js b/widgets/widgets.js
new file mode 100644
index 00000000..f7b7ac9e
--- /dev/null
+++ b/widgets/widgets.js
@@ -0,0 +1,37 @@
+/**
+ * @author Fabio Comuni
+ */
+var f9a_widget_$widget_id = {
+	width: "$width",
+	height: "$height",
+	entrypoint : "$entrypoint",
+	key	: "$key",
+	widgetid: "$widget_id",
+	argstr: "$args",
+
+	load : function() {
+		var args = new Array();
+		args['k']=this.key;
+		args['s']=window.location.href;
+		args['a']=this.argstr;
+		var urlencodedargs = new Array();
+		for(k in args){ 
+			if (typeof args[k] != 'function')
+				urlencodedargs.push( encodeURIComponent(k)+"="+encodeURIComponent(args[k]) );
+		 }
+		var url = this.entrypoint + "?"+ urlencodedargs.join("&");
+
+		console.log(this.widgetid);
+		console.log(document.getElementById(this.widgetid));
+		document.getElementById(this.widgetid).innerHTML = '<iframe style="border:0px; width: '+this.width+'; height:'+this.height+'" src="'+url+'"></iframe>';
+	}
+
+};
+
+document.writeln("<div id='$widget_id' class='f9k_widget $type'>");
+document.writeln("<img id='$widget_id_ld' src='$loader'>");
+document.writeln("</div>");
+(function() {
+	f9a_widget_$widget_id.load();	
+})();
+
diff --git a/widgets/widgets.php b/widgets/widgets.php
new file mode 100644
index 00000000..5c075964
--- /dev/null
+++ b/widgets/widgets.php
@@ -0,0 +1,179 @@
+<?php
+/**
+ * Name: Widgets
+ * Description: Allow to embed info from friendica into another site
+ * Version: 1.0
+ * Author: Fabio Comuni <http://kirgroup.com/profile/fabrix/>
+ * Status: Unsupported
+ */
+
+use Friendica\Core\Hook;
+use Friendica\Core\L10n;
+use Friendica\Core\Logger;
+use Friendica\Core\PConfig;
+use Friendica\Core\Renderer;
+use Friendica\Database\DBA;
+
+function widgets_install() {
+	Hook::register('addon_settings', 'addon/widgets/widgets.php', 'widgets_settings');
+	Hook::register('addon_settings_post', 'addon/widgets/widgets.php', 'widgets_settings_post');
+	Logger::log("installed widgets");
+}
+
+function widgets_uninstall() {
+	Hook::unregister('addon_settings', 'addon/widgets/widgets.php', 'widgets_settings');
+	Hook::unregister('addon_settings_post', 'addon/widgets/widgets.php', 'widgets_settings_post');
+}
+
+function widgets_settings_post(){
+	if(! local_user())
+		return;
+	if (isset($_POST['widgets-submit'])){
+		PConfig::delete(local_user(), 'widgets', 'key');
+
+	}
+}
+
+function widgets_settings(&$a,&$o) {
+    if(! local_user())
+		return;
+
+
+	$key = PConfig::get(local_user(), 'widgets', 'key' );
+	if ($key=='') { $key = mt_rand(); PConfig::set(local_user(), 'widgets', 'key', $key); }
+
+	$widgets = [];
+	$d = dir(dirname(__file__));
+	while(false !== ($f = $d->read())) {
+		 if(substr($f,0,7)=="widget_") {
+			 preg_match("|widget_([^.]+).php|", $f, $m);
+			 $w=$m[1];
+			 if ($w!=""){
+				require_once($f);
+				$widgets[] = [$w, call_user_func($w."_widget_name")];
+			}
+
+		 }
+	}
+
+
+
+#	$t = file_get_contents( dirname(__file__). "/settings.tpl" );
+	$t = Renderer::getMarkupTemplate("settings.tpl", "addon/widgets/");
+	$o .= Renderer::replaceMacros($t, [
+		'$submit' => L10n::t('Generate new key'),
+		'$title' => "Widgets",
+		'$label' => L10n::t('Widgets key'),
+		'$key' => $key,
+		'$widgets_h' => L10n::t('Widgets available'),
+		'$widgets' => $widgets,
+	]);
+
+}
+
+function widgets_module() {
+	return;
+}
+
+function _abs_url($s){
+	$a = \get_app();
+	return preg_replace("|href=(['\"])([^h][^t][^t][^p])|", "href=\$1".$a->getBaseURL()."/\$2", $s);
+}
+
+function _randomAlphaNum($length){
+	return substr(str_shuffle(str_repeat('ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789',$length)),0,$length);
+}
+
+
+function widgets_content(&$a) {
+
+	if (!isset($_GET['k'])) {
+		if($a->argv[2]=="cb"){header('HTTP/1.0 400 Bad Request'); exit();}
+		return;
+	}
+
+	$r = q("SELECT * FROM pconfig WHERE uid IN (SELECT uid FROM pconfig  WHERE v='%s')AND  cat='widgets'",
+			DBA::escape($_GET['k'])
+		 );
+	if (!count($r)){
+		if($a->argv[2]=="cb"){header('HTTP/1.0 400 Bad Request'); exit();}
+		return;
+	}
+	$conf = [];
+	$conf['uid'] = $r[0]['uid'];
+	foreach($r as $e) { $conf[$e['k']]=$e['v']; }
+
+	$o = "";
+
+	$widgetfile =dirname(__file__)."/widget_".$a->argv[1].".php";
+	if (file_exists($widgetfile)){
+		require_once($widgetfile);
+	} else {
+		if($a->argv[2]=="cb"){header('HTTP/1.0 400 Bad Request'); exit();}
+		return;
+	}
+
+
+
+
+	//echo "<pre>"; var_dump($a->argv); die();
+	if ($a->argv[2]=="cb"){
+		/*header('Access-Control-Allow-Origin: *');*/
+		$o .= call_user_func($a->argv[1].'_widget_content',$a, $conf);
+
+	} else {
+
+
+		if (isset($_GET['p']) && local_user()==$conf['uid'] ) {
+			$o .= "<style>.f9k_widget { float: left;border:1px solid black; }</style>";
+			$o .= "<h1>Preview Widget</h1>";
+			$o .= '<a href="'.$a->getBaseURL().'/settings/addon">'. L10n::t("Addon Settings") .'</a>';
+
+			$o .=  "<h4>".call_user_func($a->argv[1].'_widget_name')."</h4>";
+			$o .=  call_user_func($a->argv[1].'_widget_help');
+			$o .= "<br style='clear:left'/><br/>";
+			$o .= "<script>";
+		} else {
+			header("content-type: application/x-javascript");
+		}
+
+
+
+		$widget_size = call_user_func($a->argv[1].'_widget_size');
+
+		$script = file_get_contents(dirname(__file__)."/widgets.js");
+		$o .= Renderer::replaceMacros($script, [
+			'$entrypoint' => $a->getBaseURL()."/widgets/".$a->argv[1]."/cb/",
+			'$key' => $conf['key'],
+			'$widget_id' => 'f9a_'.$a->argv[1]."_"._randomAlphaNum(6),
+			'$loader' => $a->getBaseURL()."/images/rotator.gif",
+			'$args' => (isset($_GET['a'])?$_GET['a']:''),
+			'$width' => $widget_size[0],
+			'$height' => $widget_size[1],
+			'$type' => $a->argv[1],
+		]);
+
+
+		if (isset($_GET['p'])) {
+			$wargs = call_user_func($a->argv[1].'_widget_args');
+			$jsargs = implode("</em>,<em>", $wargs);
+			if ($jsargs!='') $jsargs = "&a=<em>".$jsargs."</em>";
+
+			$o .= "</script>
+			<br style='clear:left'/><br/>
+			<h4>Copy and paste this code</h4>
+			<code>"
+
+			.htmlspecialchars('<script src="'.$a->getBaseURL().'/widgets/'.$a->argv[1].'?k='.$conf['key'])
+			.$jsargs
+			.htmlspecialchars('"></script>')
+			."</code>";
+
+
+			return $o;
+		}
+	}
+
+	echo $o;
+	exit();
+}
diff --git a/windowsphonepush/lang/C/messages.po b/windowsphonepush/lang/C/messages.po
new file mode 100644
index 00000000..8643694a
--- /dev/null
+++ b/windowsphonepush/lang/C/messages.po
@@ -0,0 +1,38 @@
+# ADDON windowsphonepush
+# Copyright (C) 
+# This file is distributed under the same license as the Friendica windowsphonepush addon package.
+# 
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-10-26 15:02+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: windowsphonepush.php:85
+msgid "WindowsPhonePush settings updated."
+msgstr ""
+
+#: windowsphonepush.php:114
+msgid "WindowsPhonePush Settings"
+msgstr ""
+
+#: windowsphonepush.php:117
+msgid "Enable WindowsPhonePush Addon"
+msgstr ""
+
+#: windowsphonepush.php:122
+msgid "Push text of new item"
+msgstr ""
+
+#: windowsphonepush.php:127
+msgid "Save Settings"
+msgstr ""
diff --git a/windowsphonepush/lang/cs/messages.po b/windowsphonepush/lang/cs/messages.po
new file mode 100644
index 00000000..b1299ec1
--- /dev/null
+++ b/windowsphonepush/lang/cs/messages.po
@@ -0,0 +1,40 @@
+# ADDON windowsphonepush
+# Copyright (C)
+# This file is distributed under the same license as the Friendica windowsphonepush addon package.
+# 
+# 
+# Translators:
+# Lorem Ipsum <aditoo@seznam.cz>, 2018
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-10-26 15:02+0100\n"
+"PO-Revision-Date: 2018-06-09 12:01+0000\n"
+"Last-Translator: Lorem Ipsum <aditoo@seznam.cz>\n"
+"Language-Team: Czech (http://www.transifex.com/Friendica/friendica/language/cs/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
+
+#: windowsphonepush.php:85
+msgid "WindowsPhonePush settings updated."
+msgstr "Nastavení WindowsPhonePush aktualizována"
+
+#: windowsphonepush.php:114
+msgid "WindowsPhonePush Settings"
+msgstr "Nastavení WindowsPhonePush"
+
+#: windowsphonepush.php:117
+msgid "Enable WindowsPhonePush Addon"
+msgstr "Povolit doplněk WindowsPhonePush"
+
+#: windowsphonepush.php:122
+msgid "Push text of new item"
+msgstr "Načíst text nové položky"
+
+#: windowsphonepush.php:127
+msgid "Save Settings"
+msgstr "Uložit nastavení"
diff --git a/windowsphonepush/lang/cs/strings.php b/windowsphonepush/lang/cs/strings.php
new file mode 100644
index 00000000..1afd57ff
--- /dev/null
+++ b/windowsphonepush/lang/cs/strings.php
@@ -0,0 +1,13 @@
+<?php
+
+if(! function_exists("string_plural_select_cs")) {
+function string_plural_select_cs($n){
+	$n = intval($n);
+	return ($n == 1 && $n % 1 == 0) ? 0 : ($n >= 2 && $n <= 4 && $n % 1 == 0) ? 1: ($n % 1 != 0 ) ? 2 : 3;;
+}}
+;
+$a->strings["WindowsPhonePush settings updated."] = "Nastavení WindowsPhonePush aktualizována";
+$a->strings["WindowsPhonePush Settings"] = "Nastavení WindowsPhonePush";
+$a->strings["Enable WindowsPhonePush Addon"] = "Povolit doplněk WindowsPhonePush";
+$a->strings["Push text of new item"] = "Načíst text nové položky";
+$a->strings["Save Settings"] = "Uložit nastavení";
diff --git a/windowsphonepush/lang/de/messages.po b/windowsphonepush/lang/de/messages.po
new file mode 100644
index 00000000..58bf87cf
--- /dev/null
+++ b/windowsphonepush/lang/de/messages.po
@@ -0,0 +1,40 @@
+# ADDON windowsphonepush
+# Copyright (C)
+# This file is distributed under the same license as the Friendica windowsphonepush addon package.
+# 
+# 
+# Translators:
+# Abrax <webmaster@a-zwenkau.de>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-10-26 15:02+0100\n"
+"PO-Revision-Date: 2014-10-31 14:06+0000\n"
+"Last-Translator: Abrax <webmaster@a-zwenkau.de>\n"
+"Language-Team: German (http://www.transifex.com/projects/p/friendica/language/de/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: windowsphonepush.php:85
+msgid "WindowsPhonePush settings updated."
+msgstr "WindowsPhonePush Einstellungen aktualisiert."
+
+#: windowsphonepush.php:114
+msgid "WindowsPhonePush Settings"
+msgstr "WindowsPhonePush Einstellungen"
+
+#: windowsphonepush.php:117
+msgid "Enable WindowsPhonePush Addon"
+msgstr "Aktiviere WindowsPhonePush Addon"
+
+#: windowsphonepush.php:122
+msgid "Push text of new item"
+msgstr "Text senden"
+
+#: windowsphonepush.php:127
+msgid "Save Settings"
+msgstr "Einstellungen speichern"
diff --git a/windowsphonepush/lang/de/strings.php b/windowsphonepush/lang/de/strings.php
new file mode 100644
index 00000000..e03a0bd7
--- /dev/null
+++ b/windowsphonepush/lang/de/strings.php
@@ -0,0 +1,12 @@
+<?php
+
+if(! function_exists("string_plural_select_de")) {
+function string_plural_select_de($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["WindowsPhonePush settings updated."] = "WindowsPhonePush Einstellungen aktualisiert.";
+$a->strings["WindowsPhonePush Settings"] = "WindowsPhonePush Einstellungen";
+$a->strings["Enable WindowsPhonePush Addon"] = "Aktiviere WindowsPhonePush Addon";
+$a->strings["Push text of new item"] = "Text senden";
+$a->strings["Save Settings"] = "Einstellungen speichern";
diff --git a/windowsphonepush/lang/es/messages.po b/windowsphonepush/lang/es/messages.po
new file mode 100644
index 00000000..52d8e807
--- /dev/null
+++ b/windowsphonepush/lang/es/messages.po
@@ -0,0 +1,40 @@
+# ADDON windowsphonepush
+# Copyright (C)
+# This file is distributed under the same license as the Friendica windowsphonepush addon package.
+# 
+# 
+# Translators:
+# Albert, 2016
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-10-26 15:02+0100\n"
+"PO-Revision-Date: 2016-11-19 11:41+0000\n"
+"Last-Translator: Albert\n"
+"Language-Team: Spanish (http://www.transifex.com/Friendica/friendica/language/es/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: windowsphonepush.php:85
+msgid "WindowsPhonePush settings updated."
+msgstr "Ajustes de WindowsPhonePush actualizados."
+
+#: windowsphonepush.php:114
+msgid "WindowsPhonePush Settings"
+msgstr "Ajustes de WindowsPhonePush"
+
+#: windowsphonepush.php:117
+msgid "Enable WindowsPhonePush Addon"
+msgstr "Habilitar Addon de WindowsPhonePush"
+
+#: windowsphonepush.php:122
+msgid "Push text of new item"
+msgstr "Empujar texto de nuevo objeto"
+
+#: windowsphonepush.php:127
+msgid "Save Settings"
+msgstr "Guardar Ajustes"
diff --git a/windowsphonepush/lang/es/strings.php b/windowsphonepush/lang/es/strings.php
new file mode 100644
index 00000000..b1a1bd37
--- /dev/null
+++ b/windowsphonepush/lang/es/strings.php
@@ -0,0 +1,12 @@
+<?php
+
+if(! function_exists("string_plural_select_es")) {
+function string_plural_select_es($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["WindowsPhonePush settings updated."] = "Ajustes de WindowsPhonePush actualizados.";
+$a->strings["WindowsPhonePush Settings"] = "Ajustes de WindowsPhonePush";
+$a->strings["Enable WindowsPhonePush Addon"] = "Habilitar Addon de WindowsPhonePush";
+$a->strings["Push text of new item"] = "Empujar texto de nuevo objeto";
+$a->strings["Save Settings"] = "Guardar Ajustes";
diff --git a/windowsphonepush/lang/fi-fi/messages.po b/windowsphonepush/lang/fi-fi/messages.po
new file mode 100644
index 00000000..4906a46c
--- /dev/null
+++ b/windowsphonepush/lang/fi-fi/messages.po
@@ -0,0 +1,41 @@
+# ADDON windowsphonepush
+# Copyright (C)
+# This file is distributed under the same license as the Friendica windowsphonepush addon package.
+# 
+# 
+# Translators:
+# Kris, 2018
+# Kris, 2018
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-10-26 15:02+0100\n"
+"PO-Revision-Date: 2018-05-12 13:13+0000\n"
+"Last-Translator: Kris\n"
+"Language-Team: Finnish (Finland) (http://www.transifex.com/Friendica/friendica/language/fi_FI/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fi_FI\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: windowsphonepush.php:85
+msgid "WindowsPhonePush settings updated."
+msgstr "WindowsPhonePush -asetuket päivitetty."
+
+#: windowsphonepush.php:114
+msgid "WindowsPhonePush Settings"
+msgstr "WindowsPhonePush -asetukset"
+
+#: windowsphonepush.php:117
+msgid "Enable WindowsPhonePush Addon"
+msgstr "Ota WindowsPhonePush -lisäosa käyttöön"
+
+#: windowsphonepush.php:122
+msgid "Push text of new item"
+msgstr "Uuden kohteen Push -teksti"
+
+#: windowsphonepush.php:127
+msgid "Save Settings"
+msgstr "Tallenna asetukset"
diff --git a/windowsphonepush/lang/fi-fi/strings.php b/windowsphonepush/lang/fi-fi/strings.php
new file mode 100644
index 00000000..3383a021
--- /dev/null
+++ b/windowsphonepush/lang/fi-fi/strings.php
@@ -0,0 +1,13 @@
+<?php
+
+if(! function_exists("string_plural_select_fi_fi")) {
+function string_plural_select_fi_fi($n){
+	$n = intval($n);
+	return ($n != 1);;
+}}
+;
+$a->strings["WindowsPhonePush settings updated."] = "WindowsPhonePush -asetuket päivitetty.";
+$a->strings["WindowsPhonePush Settings"] = "WindowsPhonePush -asetukset";
+$a->strings["Enable WindowsPhonePush Addon"] = "Ota WindowsPhonePush -lisäosa käyttöön";
+$a->strings["Push text of new item"] = "Uuden kohteen Push -teksti";
+$a->strings["Save Settings"] = "Tallenna asetukset";
diff --git a/windowsphonepush/lang/fr/messages.po b/windowsphonepush/lang/fr/messages.po
new file mode 100644
index 00000000..b03b65aa
--- /dev/null
+++ b/windowsphonepush/lang/fr/messages.po
@@ -0,0 +1,41 @@
+# ADDON windowsphonepush
+# Copyright (C)
+# This file is distributed under the same license as the Friendica windowsphonepush addon package.
+# 
+# 
+# Translators:
+# Marie Olive <lacellule101@gmail.com>, 2018
+# Tubuntu <tubuntu@testimonium.be>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-10-26 15:02+0100\n"
+"PO-Revision-Date: 2018-11-13 12:57+0000\n"
+"Last-Translator: Marie Olive <lacellule101@gmail.com>\n"
+"Language-Team: French (http://www.transifex.com/Friendica/friendica/language/fr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fr\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: windowsphonepush.php:85
+msgid "WindowsPhonePush settings updated."
+msgstr "Paramètres WindowsPhonePush mis à jour"
+
+#: windowsphonepush.php:114
+msgid "WindowsPhonePush Settings"
+msgstr "Paramètres WindowsPhonePush"
+
+#: windowsphonepush.php:117
+msgid "Enable WindowsPhonePush Addon"
+msgstr "Activer l'extension WindowsPhonePush"
+
+#: windowsphonepush.php:122
+msgid "Push text of new item"
+msgstr "Pousse le texte du nouvel élément"
+
+#: windowsphonepush.php:127
+msgid "Save Settings"
+msgstr "Sauvegarde des paramètres"
diff --git a/windowsphonepush/lang/fr/strings.php b/windowsphonepush/lang/fr/strings.php
new file mode 100644
index 00000000..a23fabb1
--- /dev/null
+++ b/windowsphonepush/lang/fr/strings.php
@@ -0,0 +1,13 @@
+<?php
+
+if(! function_exists("string_plural_select_fr")) {
+function string_plural_select_fr($n){
+	$n = intval($n);
+	return ($n > 1);;
+}}
+;
+$a->strings["WindowsPhonePush settings updated."] = "Paramètres WindowsPhonePush mis à jour";
+$a->strings["WindowsPhonePush Settings"] = "Paramètres WindowsPhonePush";
+$a->strings["Enable WindowsPhonePush Addon"] = "Activer l'extension WindowsPhonePush";
+$a->strings["Push text of new item"] = "Pousse le texte du nouvel élément";
+$a->strings["Save Settings"] = "Sauvegarde des paramètres";
diff --git a/windowsphonepush/lang/it/messages.po b/windowsphonepush/lang/it/messages.po
new file mode 100644
index 00000000..39e29279
--- /dev/null
+++ b/windowsphonepush/lang/it/messages.po
@@ -0,0 +1,40 @@
+# ADDON windowsphonepush
+# Copyright (C)
+# This file is distributed under the same license as the Friendica windowsphonepush addon package.
+# 
+# 
+# Translators:
+# fabrixxm <fabrix.xm@gmail.com>, 2014,2018
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-10-26 15:02+0100\n"
+"PO-Revision-Date: 2018-03-19 13:26+0000\n"
+"Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n"
+"Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: it\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: windowsphonepush.php:85
+msgid "WindowsPhonePush settings updated."
+msgstr "Impostazioni WindowsPhonePush aggiornate."
+
+#: windowsphonepush.php:114
+msgid "WindowsPhonePush Settings"
+msgstr "Impostazioni WindowsPhonePush"
+
+#: windowsphonepush.php:117
+msgid "Enable WindowsPhonePush Addon"
+msgstr "Abilita componente aggiuntivo WindowsPhonePush"
+
+#: windowsphonepush.php:122
+msgid "Push text of new item"
+msgstr "Notifica il testo dei nuovi elementi"
+
+#: windowsphonepush.php:127
+msgid "Save Settings"
+msgstr "Salva Impostazioni"
diff --git a/windowsphonepush/lang/it/strings.php b/windowsphonepush/lang/it/strings.php
new file mode 100644
index 00000000..a45c2c7f
--- /dev/null
+++ b/windowsphonepush/lang/it/strings.php
@@ -0,0 +1,12 @@
+<?php
+
+if(! function_exists("string_plural_select_it")) {
+function string_plural_select_it($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["WindowsPhonePush settings updated."] = "Impostazioni WindowsPhonePush aggiornate.";
+$a->strings["WindowsPhonePush Settings"] = "Impostazioni WindowsPhonePush";
+$a->strings["Enable WindowsPhonePush Addon"] = "Abilita componente aggiuntivo WindowsPhonePush";
+$a->strings["Push text of new item"] = "Notifica il testo dei nuovi elementi";
+$a->strings["Save Settings"] = "Salva Impostazioni";
diff --git a/windowsphonepush/lang/nl/messages.po b/windowsphonepush/lang/nl/messages.po
new file mode 100644
index 00000000..e5f9ad97
--- /dev/null
+++ b/windowsphonepush/lang/nl/messages.po
@@ -0,0 +1,40 @@
+# ADDON windowsphonepush
+# Copyright (C)
+# This file is distributed under the same license as the Friendica windowsphonepush addon package.
+# 
+# 
+# Translators:
+# Jeroen De Meerleer <me@jeroened.be>, 2018
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-10-26 15:02+0100\n"
+"PO-Revision-Date: 2018-08-24 13:48+0000\n"
+"Last-Translator: Jeroen De Meerleer <me@jeroened.be>\n"
+"Language-Team: Dutch (http://www.transifex.com/Friendica/friendica/language/nl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: windowsphonepush.php:85
+msgid "WindowsPhonePush settings updated."
+msgstr "WindowsPhonePush instellingen opgeslagen"
+
+#: windowsphonepush.php:114
+msgid "WindowsPhonePush Settings"
+msgstr "WindowsPhonePush instellingen"
+
+#: windowsphonepush.php:117
+msgid "Enable WindowsPhonePush Addon"
+msgstr "WindowsPhonePush Addon inschakelen"
+
+#: windowsphonepush.php:122
+msgid "Push text of new item"
+msgstr ""
+
+#: windowsphonepush.php:127
+msgid "Save Settings"
+msgstr "Instellingen opslaan"
diff --git a/windowsphonepush/lang/nl/strings.php b/windowsphonepush/lang/nl/strings.php
new file mode 100644
index 00000000..1ac1b717
--- /dev/null
+++ b/windowsphonepush/lang/nl/strings.php
@@ -0,0 +1,13 @@
+<?php
+
+if(! function_exists("string_plural_select_nl")) {
+function string_plural_select_nl($n){
+	$n = intval($n);
+	return ($n != 1);;
+}}
+;
+$a->strings["WindowsPhonePush settings updated."] = "WindowsPhonePush instellingen opgeslagen";
+$a->strings["WindowsPhonePush Settings"] = "WindowsPhonePush instellingen";
+$a->strings["Enable WindowsPhonePush Addon"] = "WindowsPhonePush Addon inschakelen";
+$a->strings["Push text of new item"] = "";
+$a->strings["Save Settings"] = "Instellingen opslaan";
diff --git a/windowsphonepush/lang/ro/messages.po b/windowsphonepush/lang/ro/messages.po
new file mode 100644
index 00000000..cbef36da
--- /dev/null
+++ b/windowsphonepush/lang/ro/messages.po
@@ -0,0 +1,40 @@
+# ADDON windowsphonepush
+# Copyright (C)
+# This file is distributed under the same license as the Friendica windowsphonepush addon package.
+# 
+# 
+# Translators:
+# Doru  DEACONU <dumitrudeaconu@yahoo.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-10-26 15:02+0100\n"
+"PO-Revision-Date: 2014-11-27 14:31+0000\n"
+"Last-Translator: Doru  DEACONU <dumitrudeaconu@yahoo.com>\n"
+"Language-Team: Romanian (Romania) (http://www.transifex.com/projects/p/friendica/language/ro_RO/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ro_RO\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
+
+#: windowsphonepush.php:85
+msgid "WindowsPhonePush settings updated."
+msgstr "Configurări  WindowsPhonePush actualizate."
+
+#: windowsphonepush.php:114
+msgid "WindowsPhonePush Settings"
+msgstr "Configurare  WindowsPhonePush"
+
+#: windowsphonepush.php:117
+msgid "Enable WindowsPhonePush Addon"
+msgstr "Activare Addon WindowsPhonePush"
+
+#: windowsphonepush.php:122
+msgid "Push text of new item"
+msgstr "Tastează textul noului element"
+
+#: windowsphonepush.php:127
+msgid "Save Settings"
+msgstr "Salvare Configurări"
diff --git a/windowsphonepush/lang/ro/strings.php b/windowsphonepush/lang/ro/strings.php
new file mode 100644
index 00000000..819ef6fe
--- /dev/null
+++ b/windowsphonepush/lang/ro/strings.php
@@ -0,0 +1,12 @@
+<?php
+
+if(! function_exists("string_plural_select_ro")) {
+function string_plural_select_ro($n){
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
+}}
+;
+$a->strings["WindowsPhonePush settings updated."] = "Configurări  WindowsPhonePush actualizate.";
+$a->strings["WindowsPhonePush Settings"] = "Configurare  WindowsPhonePush";
+$a->strings["Enable WindowsPhonePush Addon"] = "Activare Addon WindowsPhonePush";
+$a->strings["Push text of new item"] = "Tastează textul noului element";
+$a->strings["Save Settings"] = "Salvare Configurări";
diff --git a/windowsphonepush/lang/zh-cn/messages.po b/windowsphonepush/lang/zh-cn/messages.po
new file mode 100644
index 00000000..12318597
--- /dev/null
+++ b/windowsphonepush/lang/zh-cn/messages.po
@@ -0,0 +1,40 @@
+# ADDON windowsphonepush
+# Copyright (C)
+# This file is distributed under the same license as the Friendica windowsphonepush addon package.
+# 
+# 
+# Translators:
+# 朱陈锬 <tangenters@outlook.com>, 2018
+msgid ""
+msgstr ""
+"Project-Id-Version: friendica\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-10-26 15:02+0100\n"
+"PO-Revision-Date: 2018-06-16 09:28+0000\n"
+"Last-Translator: 朱陈锬 <tangenters@outlook.com>\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/Friendica/friendica/language/zh_CN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: windowsphonepush.php:85
+msgid "WindowsPhonePush settings updated."
+msgstr "WindowsPhonePush 设置已更新。"
+
+#: windowsphonepush.php:114
+msgid "WindowsPhonePush Settings"
+msgstr "WindowsPhonePush 设置"
+
+#: windowsphonepush.php:117
+msgid "Enable WindowsPhonePush Addon"
+msgstr "启用 WindowsPhonePush 插件"
+
+#: windowsphonepush.php:122
+msgid "Push text of new item"
+msgstr "推送新项目的文本"
+
+#: windowsphonepush.php:127
+msgid "Save Settings"
+msgstr "保存设置"
diff --git a/windowsphonepush/lang/zh-cn/strings.php b/windowsphonepush/lang/zh-cn/strings.php
new file mode 100644
index 00000000..3782a314
--- /dev/null
+++ b/windowsphonepush/lang/zh-cn/strings.php
@@ -0,0 +1,13 @@
+<?php
+
+if(! function_exists("string_plural_select_zh_cn")) {
+function string_plural_select_zh_cn($n){
+	$n = intval($n);
+	return 0;;
+}}
+;
+$a->strings["WindowsPhonePush settings updated."] = "WindowsPhonePush 设置已更新。";
+$a->strings["WindowsPhonePush Settings"] = "WindowsPhonePush 设置";
+$a->strings["Enable WindowsPhonePush Addon"] = "启用 WindowsPhonePush 插件";
+$a->strings["Push text of new item"] = "推送新项目的文本";
+$a->strings["Save Settings"] = "保存设置";
diff --git a/windowsphonepush/windowsphonepush.css b/windowsphonepush/windowsphonepush.css
new file mode 100644
index 00000000..95ba6d2c
--- /dev/null
+++ b/windowsphonepush/windowsphonepush.css
@@ -0,0 +1,36 @@
+#windowsphonepush-device_url-wrapper {
+	margin-top: 25px;
+}
+
+
+#windowsphonepush-enable-label {
+	float: left;
+	width: 200px;
+	margin-bottom: 25px;
+}
+
+#windowsphonepush-enable-chk {
+	float: left;
+}
+
+#windowsphonepush-device_url-label {
+	float: left;
+	width: 200px;
+	margin-bottom: 25px;
+}
+
+#windowsphonepush-device_url-text {
+	float: left;
+	background-color: #C0C0C0; 
+	width: 500px;
+}
+
+#windowsphonepush-senditemtext-label {
+	float: left;
+	width: 200px;
+	margin-bottom: 25px;
+}
+
+#windowsphonepush-senditemtext-chk {
+	float: left;
+}
diff --git a/windowsphonepush/windowsphonepush.php b/windowsphonepush/windowsphonepush.php
new file mode 100644
index 00000000..30c6cf60
--- /dev/null
+++ b/windowsphonepush/windowsphonepush.php
@@ -0,0 +1,479 @@
+<?php
+
+/**
+ * Name: WindowsPhonePush
+ * Description: Enable push notification to send information to Friendica Mobile app on Windows phone (count of unread timeline entries, text of last posting - if wished by user)
+ * Version: 2.0
+ * Author: Gerhard Seeber <http://friendica.seeber.at/profile/admin>
+ *
+ *
+ * Pre-requisite: Windows Phone mobile device (at least WP 7.0)
+ *                Friendica mobile app on Windows Phone
+ *
+ * When addon is installed, the system calls the addon
+ * name_install() function, located in 'addon/name/name.php',
+ * where 'name' is the name of the addon.
+ * If the addon is removed from the configuration list, the
+ * system will call the name_uninstall() function.
+ *
+ * Version history:
+ * 1.1  : addon crashed on php versions >= 5.4 as of removed deprecated call-time
+ *        pass-by-reference used in function calls within function windowsphonepush_content
+ * 2.0  : adaption for supporting emphasizing new entries in app (count on tile cannot be read out,
+ *        so we need to retrieve counter through show_settings secondly). Provide new function for
+ *        calling from app to set the counter back after start (if user starts again before cronjob
+ *        sets the counter back
+ *        count only unseen elements which are not type=activity (likes and dislikes not seen as new elements)
+ */
+
+use Friendica\App;
+use Friendica\Content\Text\BBCode;
+use Friendica\Content\Text\HTML;
+use Friendica\Core\Hook;
+use Friendica\Core\L10n;
+use Friendica\Core\Logger;
+use Friendica\Core\PConfig;
+use Friendica\Core\Session;
+use Friendica\Database\DBA;
+use Friendica\Model\Item;
+use Friendica\Model\User;
+
+function windowsphonepush_install()
+{
+	/* Our addon will attach in three places.
+	 * The first is within cron - so the push notifications will be
+	 * sent every 10 minutes (or whatever is set in crontab).
+	 */
+	Hook::register('cron', 'addon/windowsphonepush/windowsphonepush.php', 'windowsphonepush_cron');
+
+	/* Then we'll attach into the addon settings page, and also the
+	 * settings post hook so that we can create and update
+	 * user preferences. User shall be able to activate the addon and
+	 * define whether he allows pushing first characters of item text
+	 */
+	Hook::register('addon_settings', 'addon/windowsphonepush/windowsphonepush.php', 'windowsphonepush_settings');
+	Hook::register('addon_settings_post', 'addon/windowsphonepush/windowsphonepush.php', 'windowsphonepush_settings_post');
+
+	Logger::log("installed windowsphonepush");
+}
+
+function windowsphonepush_uninstall()
+{
+	/* uninstall unregisters any hooks created with register_hook
+	 * during install. Don't delete data in table `pconfig`.
+	 */
+	Hook::unregister('cron', 'addon/windowsphonepush/windowsphonepush.php', 'windowsphonepush_cron');
+	Hook::unregister('addon_settings', 'addon/windowsphonepush/windowsphonepush.php', 'windowsphonepush_settings');
+	Hook::unregister('addon_settings_post', 'addon/windowsphonepush/windowsphonepush.php', 'windowsphonepush_settings_post');
+
+	Logger::log("removed windowsphonepush");
+}
+
+/* declare the windowsphonepush function so that /windowsphonepush url requests will land here */
+function windowsphonepush_module()
+{
+
+}
+
+/* Callback from the settings post function.
+ * $post contains the $_POST array.
+ * We will make sure we've got a valid user account
+ * and if so set our configuration setting for this person.
+ */
+function windowsphonepush_settings_post($a, $post)
+{
+	if (!local_user() || empty($_POST['windowsphonepush-submit'])) {
+		return;
+	}
+	$enable = intval($_POST['windowsphonepush']);
+	PConfig::set(local_user(), 'windowsphonepush', 'enable', $enable);
+
+	if ($enable) {
+		PConfig::set(local_user(), 'windowsphonepush', 'counterunseen', 0);
+	}
+
+	PConfig::set(local_user(), 'windowsphonepush', 'senditemtext', intval($_POST['windowsphonepush-senditemtext']));
+
+	info(L10n::t('WindowsPhonePush settings updated.') . EOL);
+}
+
+/* Called from the Addon Setting form.
+ * Add our own settings info to the page.
+ */
+function windowsphonepush_settings(&$a, &$s)
+{
+	if (!local_user()) {
+		return;
+	}
+
+	/* Add our stylesheet to the page so we can make our settings look nice */
+	$a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->getBaseURL() . '/addon/windowsphonepush/windowsphonepush.css' . '" media="all" />' . "\r\n";
+
+	/* Get the current state of our config variables */
+	$enabled = PConfig::get(local_user(), 'windowsphonepush', 'enable');
+	$checked_enabled = (($enabled) ? ' checked="checked" ' : '');
+
+	$senditemtext = PConfig::get(local_user(), 'windowsphonepush', 'senditemtext');
+	$checked_senditemtext = (($senditemtext) ? ' checked="checked" ' : '');
+
+	$device_url = PConfig::get(local_user(), 'windowsphonepush', 'device_url');
+
+	/* Add some HTML to the existing form */
+	$s .= '<div class="settings-block">';
+	$s .= '<h3>' . L10n::t('WindowsPhonePush Settings') . '</h3>';
+
+	$s .= '<div id="windowsphonepush-enable-wrapper">';
+	$s .= '<label id="windowsphonepush-enable-label" for="windowsphonepush-enable-chk">' . L10n::t('Enable WindowsPhonePush Addon') . '</label>';
+	$s .= '<input id="windowsphonepush-enable-chk" type="checkbox" name="windowsphonepush" value="1" ' . $checked_enabled . '/>';
+	$s .= '</div><div class="clear"></div>';
+
+	$s .= '<div id="windowsphonepush-senditemtext-wrapper">';
+	$s .= '<label id="windowsphonepush-senditemtext-label" for="windowsphonepush-senditemtext-chk">' . L10n::t('Push text of new item') . '</label>';
+	$s .= '<input id="windowsphonepush-senditemtext-chk" type="checkbox" name="windowsphonepush-senditemtext" value="1" ' . $checked_senditemtext . '/>';
+	$s .= '</div><div class="clear"></div>';
+
+	/* provide a submit button - enable und senditemtext can be changed by the user */
+	$s .= '<div class="settings-submit-wrapper" ><input type="submit" id="windowsphonepush-submit" name="windowsphonepush-submit" class="settings-submit" value="' . L10n::t('Save Settings') . '" /></div><div class="clear"></div>';
+
+	/* provide further read-only information concerning the addon (useful for */
+	$s .= '<div id="windowsphonepush-device_url-wrapper">';
+	$s .= '<label id="windowsphonepush-device_url-label" for="windowsphonepush-device_url-text">Device-URL</label>';
+	$s .= '<input id="windowsphonepush-device_url-text" type="text" readonly value=' . $device_url . '/>';
+	$s .= '</div><div class="clear"></div></div>';
+
+	return;
+}
+
+/* Cron function used to regularly check all users on the server with active windowsphonepushaddon and send
+ * notifications to the Microsoft servers and consequently to the Windows Phone device
+ */
+function windowsphonepush_cron()
+{
+	// retrieve all UID's for which the addon windowsphonepush is enabled and loop through every user
+	$r = q("SELECT * FROM `pconfig` WHERE `cat` = 'windowsphonepush' AND `k` = 'enable' AND `v` = 1");
+	if (count($r)) {
+		foreach ($r as $rr) {
+			// load stored information for the user-id of the current loop
+			$device_url = PConfig::get($rr['uid'], 'windowsphonepush', 'device_url');
+			$lastpushid = PConfig::get($rr['uid'], 'windowsphonepush', 'lastpushid');
+
+			// pushing only possible if device_url (the URI on Microsoft server) is available or not "NA" (which will be sent
+			// by app if user has switched the server setting in app - sending blank not possible as this would return an update error)
+			if (( $device_url == "" ) || ( $device_url == "NA" )) {
+				// no Device-URL for the user availabe, but addon is enabled --> write info to Logger
+				Logger::log("WARN: windowsphonepush is enable for user " . $rr['uid'] . ", but no Device-URL is specified for the user.");
+			} else {
+				// retrieve the number of unseen items and the id of the latest one (if there are more than
+				// one new entries since last poller run, only the latest one will be pushed)
+				$count = q("SELECT count(`id`) as count, max(`id`) as max FROM `item` WHERE `unseen` = 1 AND `type` <> 'activity' AND `uid` = %d", intval($rr['uid']));
+
+				// send number of unseen items to the device (the number will be displayed on Start screen until
+				// App will be started by user) - this update will be sent every 10 minutes to update the number to 0 if
+				// user has loaded the timeline through app or website
+				$res_tile = send_tile_update($device_url, "", $count[0]['count'], "");
+				switch (trim($res_tile)) {
+					case "Received":
+						// ok, count has been pushed, let's save it in personal settings
+						PConfig::set($rr['uid'], 'windowsphonepush', 'counterunseen', $count[0]['count']);
+						break;
+					case "QueueFull":
+						// maximum of 30 messages reached, server rejects any further push notification until device reconnects
+						Logger::log("INFO: Device-URL '" . $device_url . "' returns a QueueFull.");
+						break;
+					case "Suppressed":
+						// notification received and dropped as something in app was not enabled
+						Logger::log("WARN. Device-URL '" . $device_url . "' returns a Suppressed. Unexpected error in Mobile App?");
+						break;
+					case "Dropped":
+						// mostly combines with Expired, in that case Device-URL will be deleted from pconfig (function send_push)
+						break;
+					default:
+						// error, mostly called by "" which means that the url (not "" which has been checked)
+						// didn't not received Microsoft Notification Server -> wrong url
+						Logger::log("ERROR: specified Device-URL '" . $device_url . "' didn't produced any response.");
+				}
+
+				// additionally user receives the text of the newest item (function checks against last successfully pushed item)
+				if (intval($count[0]['max']) > intval($lastpushid)) {
+					// user can define if he wants to see the text of the item in the push notification
+					// this has been implemented as the device_url is not a https uri (not so secure)
+					$senditemtext = PConfig::get($rr['uid'], 'windowsphonepush', 'senditemtext');
+					if ($senditemtext == 1) {
+						// load item with the max id
+						$item = Item::selectFirst(['author-name', 'body'], ['id' => $count[0]['max']]);
+
+						// as user allows to send the item, we want to show the sender of the item in the toast
+						// toasts are limited to one line, therefore place is limited - author shall be in
+						// max. 15 chars (incl. dots); author is displayed in bold font
+						$author = $item['author-name'];
+						$author = ((strlen($author) > 12) ? substr($author, 0, 12) . "..." : $author);
+
+						// normally we show the body of the item, however if it is an url or an image we cannot
+						// show this in the toast (only test), therefore changing to an alternate text
+						// Otherwise BBcode-Tags will be eliminated and plain text cutted to 140 chars (incl. dots)
+						// BTW: information only possible in English
+						$body = $item['body'];
+						if (substr($body, 0, 4) == "[url") {
+							$body = "URL/Image ...";
+						} else {
+							$body = BBCode::convert($body, false, 2, true);
+							$body = HTML::toPlaintext($body, 0);
+							$body = ((strlen($body) > 137) ? substr($body, 0, 137) . "..." : $body);
+						}
+					} else {
+						// if user wishes higher privacy, we only display "Friendica - New timeline entry arrived"
+						$author = "Friendica";
+						$body = "New timeline entry arrived ...";
+					}
+					// only if toast push notification returns the Notification status "Received" we will update th settings with the
+					// new indicator max-id is checked against (QueueFull, Suppressed, N/A, Dropped shall qualify to resend
+					// the push notification some minutes later (BTW: if resulting in Expired for subscription status the
+					// device_url will be deleted (no further try on this url, see send_push)
+					// further log information done on count pushing with send_tile (see above)
+					$res_toast = send_toast($device_url, $author, $body);
+					if (trim($res_toast) === 'Received') {
+						PConfig::set($rr['uid'], 'windowsphonepush', 'lastpushid', $count[0]['max']);
+					}
+				}
+			}
+		}
+	}
+}
+
+/* Tile push notification change the number in the icon of the App in Start Screen of
+ * a Windows Phone Device, Image could be changed, not used for App "Friendica Mobile"
+ */
+function send_tile_update($device_url, $image_url, $count, $title, $priority = 1)
+{
+	$msg = "<?xml version=\"1.0\" encoding=\"utf-8\"?>" .
+		"<wp:Notification xmlns:wp=\"WPNotification\">" .
+		"<wp:Tile>" .
+		"<wp:BackgroundImage>" . $image_url . "</wp:BackgroundImage>" .
+		"<wp:Count>" . $count . "</wp:Count>" .
+		"<wp:Title>" . $title . "</wp:Title>" .
+		"</wp:Tile> " .
+		"</wp:Notification>";
+
+	$result = send_push($device_url, [
+		'X-WindowsPhone-Target: token',
+		'X-NotificationClass: ' . $priority,
+		], $msg);
+	return $result;
+}
+
+/* Toast push notification send information to the top of the display
+ * if the user is not currently using the Friendica Mobile App, however
+ * there is only one line for displaying the information
+ */
+function send_toast($device_url, $title, $message, $priority = 2)
+{
+	$msg = "<?xml version=\"1.0\" encoding=\"utf-8\"?>" .
+		"<wp:Notification xmlns:wp=\"WPNotification\">" .
+		"<wp:Toast>" .
+		"<wp:Text1>" . $title . "</wp:Text1>" .
+		"<wp:Text2>" . $message . "</wp:Text2>" .
+		"<wp:Param></wp:Param>" .
+		"</wp:Toast>" .
+		"</wp:Notification>";
+
+	$result = send_push($device_url, [
+		'X-WindowsPhone-Target: toast',
+		'X-NotificationClass: ' . $priority,
+		], $msg);
+	return $result;
+}
+
+// General function to send the push notification via cURL
+function send_push($device_url, $headers, $msg)
+{
+	$ch = curl_init();
+	curl_setopt($ch, CURLOPT_URL, $device_url);
+	curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+	curl_setopt($ch, CURLOPT_POST, true);
+	curl_setopt($ch, CURLOPT_HEADER, true);
+	curl_setopt($ch, CURLOPT_HTTPHEADER, $headers + [
+		'Content-Type: text/xml',
+		'charset=utf-8',
+		'Accept: application/*',
+		]
+	);
+	curl_setopt($ch, CURLOPT_POSTFIELDS, $msg);
+
+	$output = curl_exec($ch);
+	curl_close($ch);
+
+	// if we received "Expired" from Microsoft server we will delete the obsolete device-URL
+	// and log this fact
+	$subscriptionStatus = get_header_value($output, 'X-SubscriptionStatus');
+	if ($subscriptionStatus == "Expired") {
+		PConfig::set(local_user(), 'windowsphonepush', 'device_url', "");
+		Logger::log("ERROR: the stored Device-URL " . $device_url . "returned an 'Expired' error, it has been deleted now.");
+	}
+
+	// the notification status shall be returned to windowsphonepush_cron (will
+	// update settings if 'Received' otherwise keep old value in settings (on QueuedFull. Suppressed, N/A, Dropped)
+	$notificationStatus = get_header_value($output, 'X-NotificationStatus');
+	return $notificationStatus;
+}
+
+// helper function to receive statuses from webresponse of Microsoft server
+function get_header_value($content, $header)
+{
+	return preg_match_all("/$header: (.*)/i", $content, $match) ? $match[1][0] : "";
+}
+
+/* reading information from url and deciding which function to start
+ * show_settings = delivering settings to check
+ * update_settings = set the device_url
+ * update_counterunseen = set counter for unseen elements to zero
+ */
+function windowsphonepush_content(App $a)
+{
+	// Login with the specified Network credentials (like in api.php)
+	windowsphonepush_login($a);
+
+	$path = $a->argv[0];
+	$path2 = $a->argv[1];
+	if ($path == "windowsphonepush") {
+		switch ($path2) {
+			case "show_settings":
+				windowsphonepush_showsettings($a);
+				exit();
+				break;
+			case "update_settings":
+				$ret = windowsphonepush_updatesettings($a);
+				header("Content-Type: application/json; charset=utf-8");
+				echo json_encode(['status' => $ret]);
+				exit();
+				break;
+			case "update_counterunseen":
+				$ret = windowsphonepush_updatecounterunseen();
+				header("Content-Type: application/json; charset=utf-8");
+				echo json_encode(['status' => $ret]);
+				exit();
+				break;
+			default:
+				echo "Fehler";
+		}
+	}
+}
+
+// return settings for windowsphonepush addon to be able to check them in WP app
+function windowsphonepush_showsettings()
+{
+	if (!local_user()) {
+		return;
+	}
+
+	$enable = PConfig::get(local_user(), 'windowsphonepush', 'enable');
+	$device_url = PConfig::get(local_user(), 'windowsphonepush', 'device_url');
+	$senditemtext = PConfig::get(local_user(), 'windowsphonepush', 'senditemtext');
+	$lastpushid = PConfig::get(local_user(), 'windowsphonepush', 'lastpushid');
+	$counterunseen = PConfig::get(local_user(), 'windowsphonepush', 'counterunseen');
+	$addonversion = "2.0";
+
+	if (!$device_url) {
+		$device_url = "";
+	}
+
+	if (!$lastpushid) {
+		$lastpushid = 0;
+	}
+
+	header("Content-Type: application/json");
+	echo json_encode(['uid' => local_user(),
+		'enable' => $enable,
+		'device_url' => $device_url,
+		'senditemtext' => $senditemtext,
+		'lastpushid' => $lastpushid,
+		'counterunseen' => $counterunseen,
+		'addonversion' => $addonversion]);
+}
+
+/* update_settings is used to transfer the device_url from WP device to the Friendica server
+ * return the status of the operation to the server
+ */
+function windowsphonepush_updatesettings()
+{
+	if (!local_user()) {
+		return "Not Authenticated";
+	}
+
+	// no updating if user hasn't enabled the addon
+	$enable = PConfig::get(local_user(), 'windowsphonepush', 'enable');
+	if (!$enable) {
+		return "Plug-in not enabled";
+	}
+
+	// check if sent url is empty - don't save and send return code to app
+	$device_url = $_POST['deviceurl'];
+	if ($device_url == "") {
+		Logger::log("ERROR: no valid Device-URL specified - client transferred '" . $device_url . "'");
+		return "No valid Device-URL specified";
+	}
+
+	// check if sent url is already stored in database for another user, we assume that there was a change of
+	// the user on the Windows Phone device and that device url is no longer true for the other user, so we
+	// et the device_url for the OTHER user blank (should normally not occur as App should include User/server
+	// in url request to Microsoft Push Notification server)
+	$r = q("SELECT * FROM `pconfig` WHERE `uid` <> " . local_user() . " AND
+						`cat` = 'windowsphonepush' AND
+						`k` = 'device_url' AND
+						`v` = '" . $device_url . "'");
+	if (count($r)) {
+		foreach ($r as $rr) {
+			PConfig::set($rr['uid'], 'windowsphonepush', 'device_url', '');
+			Logger::log("WARN: the sent URL was already registered with user '" . $rr['uid'] . "'. Deleted for this user as we expect to be correct now for user '" . local_user() . "'.");
+		}
+	}
+
+	PConfig::set(local_user(), 'windowsphonepush', 'device_url', $device_url);
+	// output the successfull update of the device URL to the logger for error analysis if necessary
+	Logger::log("INFO: Device-URL for user '" . local_user() . "' has been updated with '" . $device_url . "'");
+	return "Device-URL updated successfully!";
+}
+
+// update_counterunseen is used to reset the counter to zero from Windows Phone app
+function windowsphonepush_updatecounterunseen()
+{
+	if (!local_user()) {
+		return "Not Authenticated";
+	}
+
+	// no updating if user hasn't enabled the addon
+	$enable = PConfig::get(local_user(), 'windowsphonepush', 'enable');
+	if (!$enable) {
+		return "Plug-in not enabled";
+	}
+
+	PConfig::set(local_user(), 'windowsphonepush', 'counterunseen', 0);
+	return "Counter set to zero";
+}
+
+/* helper function to login to the server with the specified Network credentials
+ * (mainly copied from api.php)
+ */
+function windowsphonepush_login(App $a)
+{
+	if (!isset($_SERVER['PHP_AUTH_USER'])) {
+		Logger::log('API_login: ' . print_r($_SERVER, true), Logger::DEBUG);
+		header('WWW-Authenticate: Basic realm="Friendica"');
+		header('HTTP/1.0 401 Unauthorized');
+		die('This api requires login');
+	}
+
+	$user_id = User::authenticate($_SERVER['PHP_AUTH_USER'], trim($_SERVER['PHP_AUTH_PW']));
+
+	if ($user_id) {
+		$record = DBA::selectFirst('user', [], ['uid' => $user_id]);
+	} else {
+		Logger::log('API_login failure: ' . print_r($_SERVER, true), Logger::DEBUG);
+		header('WWW-Authenticate: Basic realm="Friendica"');
+		header('HTTP/1.0 401 Unauthorized');
+		die('This api requires login');
+	}
+
+	Session::setAuthenticatedForUser($a, $record);
+	$_SESSION["allow_api"] = true;
+	Hook::callAll('logged_in', $a->user);
+}
diff --git a/wppost/lang/C/messages.po b/wppost/lang/C/messages.po
index 187b0316..92bc721d 100644
--- a/wppost/lang/C/messages.po
+++ b/wppost/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-06-03 15:51-0400\n"
+"POT-Creation-Date: 2017-01-24 21:06+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,52 +17,56 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: wppost.php:41
+#: wppost.php:42
 msgid "Post to Wordpress"
 msgstr ""
 
-#: wppost.php:65
-msgid "Enable Wordpress Post Addon"
+#: wppost.php:80 wppost.php:84
+msgid "Wordpress Export"
 msgstr ""
 
-#: wppost.php:66
-msgid "Wordpress username"
+#: wppost.php:87
+msgid "Enable WordPress Post Addon"
 msgstr ""
 
-#: wppost.php:67
-msgid "Wordpress password"
+#: wppost.php:92
+msgid "WordPress username"
 msgstr ""
 
-#: wppost.php:68
+#: wppost.php:97
+msgid "WordPress password"
+msgstr ""
+
+#: wppost.php:102
 msgid "WordPress API URL"
 msgstr ""
 
-#: wppost.php:69
-msgid "Post to Wordpress by default"
+#: wppost.php:107
+msgid "Post to WordPress by default"
 msgstr ""
 
-#: wppost.php:70
+#: wppost.php:112
 msgid "Provide a backlink to the Friendica post"
 msgstr ""
 
-#: wppost.php:71
+#: wppost.php:116
 msgid ""
 "Text for the backlink, e.g. Read the original post and comment stream on "
 "Friendica."
 msgstr ""
 
-#: wppost.php:72
+#: wppost.php:121
 msgid "Don't post messages that are too short"
 msgstr ""
 
-#: wppost.php:77
-msgid "Wordpress Export"
+#: wppost.php:127
+msgid "Save Settings"
 msgstr ""
 
-#: wppost.php:185
+#: wppost.php:206
 msgid "Read the orig­i­nal post and com­ment stream on Friendica"
 msgstr ""
 
-#: wppost.php:235
+#: wppost.php:269
 msgid "Post from Friendica"
 msgstr ""
diff --git a/wppost/lang/ar/messages.po b/wppost/lang/ar/messages.po
deleted file mode 100644
index ce71a341..00000000
--- a/wppost/lang/ar/messages.po
+++ /dev/null
@@ -1,74 +0,0 @@
-# ADDON wppost
-# Copyright (C)
-# This file is distributed under the same license as the Friendica wppost addon package.
-# 
-# 
-# Translators:
-# Farida Khalaf <faridakhalaf@hotmail.com>, 2021
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:16+0100\n"
-"PO-Revision-Date: 2021-02-21 18:48+0000\n"
-"Last-Translator: Farida Khalaf <faridakhalaf@hotmail.com>\n"
-"Language-Team: Arabic (http://www.transifex.com/Friendica/friendica/language/ar/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: ar\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-
-#: wppost.php:39
-msgid "Post to Wordpress"
-msgstr ""
-
-#: wppost.php:80 wppost.php:84
-msgid "Wordpress Export"
-msgstr ""
-
-#: wppost.php:87
-msgid "Enable WordPress Post Addon"
-msgstr ""
-
-#: wppost.php:93
-msgid "WordPress username"
-msgstr ""
-
-#: wppost.php:98
-msgid "WordPress password"
-msgstr ""
-
-#: wppost.php:103
-msgid "WordPress API URL"
-msgstr ""
-
-#: wppost.php:108
-msgid "Post to WordPress by default"
-msgstr ""
-
-#: wppost.php:114
-msgid "Provide a backlink to the Friendica post"
-msgstr ""
-
-#: wppost.php:119
-msgid ""
-"Text for the backlink, e.g. Read the original post and comment stream on "
-"Friendica."
-msgstr ""
-
-#: wppost.php:124
-msgid "Don't post messages that are too short"
-msgstr ""
-
-#: wppost.php:131
-msgid "Save Settings"
-msgstr "حفظ الإعدادات"
-
-#: wppost.php:231
-msgid "Read the orig­i­nal post and com­ment stream on Friendica"
-msgstr ""
-
-#: wppost.php:289
-msgid "Post from Friendica"
-msgstr "مشاركة من فرينديكا Friendica"
diff --git a/wppost/lang/ar/strings.php b/wppost/lang/ar/strings.php
deleted file mode 100644
index 689e8128..00000000
--- a/wppost/lang/ar/strings.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_ar")) {
-function string_plural_select_ar($n){
-	$n = intval($n);
-	if ($n==0) { return 0; } else if ($n==1) { return 1; } else if ($n==2) { return 2; } else if ($n%100>=3 && $n%100<=10) { return 3; } else if ($n%100>=11 && $n%100<=99) { return 4; } else  { return 5; }
-}}
-$a->strings['Save Settings'] = 'حفظ الإعدادات';
-$a->strings['Post from Friendica'] = 'مشاركة من فرينديكا Friendica';
diff --git a/wppost/lang/cs/strings.php b/wppost/lang/cs/strings.php
index ca9ca984..6ed8f6c4 100644
--- a/wppost/lang/cs/strings.php
+++ b/wppost/lang/cs/strings.php
@@ -3,18 +3,19 @@
 if(! function_exists("string_plural_select_cs")) {
 function string_plural_select_cs($n){
 	$n = intval($n);
-	if (($n == 1 && $n % 1 == 0)) { return 0; } else if (($n >= 2 && $n <= 4 && $n % 1 == 0)) { return 1; } else if (($n % 1 != 0 )) { return 2; } else  { return 3; }
+	return ($n == 1 && $n % 1 == 0) ? 0 : ($n >= 2 && $n <= 4 && $n % 1 == 0) ? 1: ($n % 1 != 0 ) ? 2 : 3;;
 }}
-$a->strings['Post to Wordpress'] = 'Odesílat na WordPress';
-$a->strings['Wordpress Export'] = 'Exportovat do WordPress';
-$a->strings['Enable WordPress Post Addon'] = 'Povolit doplněk WordPress Post';
-$a->strings['WordPress username'] = 'WordPress uživatelské jméno';
-$a->strings['WordPress password'] = 'WordPress heslo';
-$a->strings['WordPress API URL'] = 'URL adresa API WordPress';
-$a->strings['Post to WordPress by default'] = 'standardně posílat příspěvky na WordPress';
-$a->strings['Provide a backlink to the Friendica post'] = 'Poskytnout zpětný odkaz na příspěvek Friendica';
-$a->strings['Text for the backlink, e.g. Read the original post and comment stream on Friendica.'] = 'Text pro zpětné odkazy, např. "Přečtěte si původní příspěvek a komentáře na Friendica".';
-$a->strings['Don\'t post messages that are too short'] = 'Neposílejte zprávy, které jsou příliš krátké';
-$a->strings['Save Settings'] = 'Uložit nastavení';
-$a->strings['Read the orig­i­nal post and com­ment stream on Friendica'] = 'Přečtěte si původní příspěvek a komentáře na Friendica';
-$a->strings['Post from Friendica'] = 'Příspěvek z Friendica';
+;
+$a->strings["Post to Wordpress"] = "Odesílat na WordPress";
+$a->strings["Wordpress Export"] = "Exportovat do WordPress";
+$a->strings["Enable WordPress Post Addon"] = "Povolit doplněk WordPress Post";
+$a->strings["WordPress username"] = "WordPress uživatelské jméno";
+$a->strings["WordPress password"] = "WordPress heslo";
+$a->strings["WordPress API URL"] = "URL adresa API WordPress";
+$a->strings["Post to WordPress by default"] = "standardně posílat příspěvky na WordPress";
+$a->strings["Provide a backlink to the Friendica post"] = "Poskytnout zpětný odkaz na příspěvek Friendica";
+$a->strings["Text for the backlink, e.g. Read the original post and comment stream on Friendica."] = "Text pro zpětné odkazy, např. \"Přečtěte si původní příspěvek a komentáře na Friendica\".";
+$a->strings["Don't post messages that are too short"] = "Neposílejte zprávy, které jsou příliš krátké";
+$a->strings["Save Settings"] = "Uložit nastavení";
+$a->strings["Read the orig­i­nal post and com­ment stream on Friendica"] = "Přečtěte si původní příspěvek a komentáře na Friendica";
+$a->strings["Post from Friendica"] = "Příspěvek z Friendica";
diff --git a/wppost/lang/da-dk/messages.po b/wppost/lang/da-dk/messages.po
deleted file mode 100644
index 5625b422..00000000
--- a/wppost/lang/da-dk/messages.po
+++ /dev/null
@@ -1,69 +0,0 @@
-# ADDON wppost
-# Copyright (C)
-# This file is distributed under the same license as the Friendica wppost addon package.
-# 
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:18-0500\n"
-"PO-Revision-Date: 2014-06-23 13:07+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Danish (Denmark) (http://www.transifex.com/Friendica/friendica/language/da_DK/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: da_DK\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: wppost.php:41
-msgid "Post to Wordpress"
-msgstr ""
-
-#: wppost.php:65
-msgid "Enable Wordpress Post Addon"
-msgstr ""
-
-#: wppost.php:66
-msgid "Wordpress username"
-msgstr ""
-
-#: wppost.php:67
-msgid "Wordpress password"
-msgstr ""
-
-#: wppost.php:68
-msgid "WordPress API URL"
-msgstr ""
-
-#: wppost.php:69
-msgid "Post to Wordpress by default"
-msgstr ""
-
-#: wppost.php:70
-msgid "Provide a backlink to the Friendica post"
-msgstr ""
-
-#: wppost.php:71
-msgid ""
-"Text for the backlink, e.g. Read the original post and comment stream on "
-"Friendica."
-msgstr ""
-
-#: wppost.php:72
-msgid "Don't post messages that are too short"
-msgstr ""
-
-#: wppost.php:77
-msgid "Wordpress Export"
-msgstr ""
-
-#: wppost.php:182
-msgid "Read the orig­i­nal post and com­ment stream on Friendica"
-msgstr ""
-
-#: wppost.php:240
-msgid "Post from Friendica"
-msgstr ""
diff --git a/wppost/lang/da-dk/strings.php b/wppost/lang/da-dk/strings.php
deleted file mode 100644
index 09554750..00000000
--- a/wppost/lang/da-dk/strings.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_da_dk")) {
-function string_plural_select_da_dk($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
diff --git a/wppost/lang/de/messages.po b/wppost/lang/de/messages.po
index b3f1e38e..eb10db40 100644
--- a/wppost/lang/de/messages.po
+++ b/wppost/lang/de/messages.po
@@ -6,68 +6,71 @@
 # Translators:
 # Andreas H., 2017
 # Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2014-2015
-# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2017-2018,2022
-# Ulf Rompe <transifex.com@rompe.org>, 2019
+# Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:18-0500\n"
-"PO-Revision-Date: 2014-06-23 13:07+0000\n"
-"Last-Translator: Tobias Diekershoff <tobias.diekershoff@gmx.net>, 2017-2018,2022\n"
-"Language-Team: German (http://app.transifex.com/Friendica/friendica/language/de/)\n"
+"POT-Creation-Date: 2017-01-24 21:06+0100\n"
+"PO-Revision-Date: 2017-02-10 11:11+0000\n"
+"Last-Translator: Andreas H.\n"
+"Language-Team: German (http://www.transifex.com/Friendica/friendica/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: wppost.php:41
+#: wppost.php:42
 msgid "Post to Wordpress"
 msgstr "Bei WordPress veröffentlichen"
 
-#: wppost.php:65
-msgid "Enable Wordpress Post Addon"
-msgstr "Wordpress-Addon aktivieren"
+#: wppost.php:80 wppost.php:84
+msgid "Wordpress Export"
+msgstr "Wordpress Export"
 
-#: wppost.php:66
-msgid "Wordpress username"
-msgstr "Wordpress-Benutzername"
+#: wppost.php:87
+msgid "Enable WordPress Post Addon"
+msgstr "WordPress Addon aktivieren"
 
-#: wppost.php:67
-msgid "Wordpress password"
-msgstr "Wordpress-Passwort"
+#: wppost.php:92
+msgid "WordPress username"
+msgstr "WordPress-Benutzername"
 
-#: wppost.php:68
+#: wppost.php:97
+msgid "WordPress password"
+msgstr "WordPress-Passwort"
+
+#: wppost.php:102
 msgid "WordPress API URL"
 msgstr "WordPress-API-URL"
 
-#: wppost.php:69
-msgid "Post to Wordpress by default"
-msgstr "Standardmäßig auf Wordpress veröffentlichen"
+#: wppost.php:107
+msgid "Post to WordPress by default"
+msgstr "Standardmäßig auf WordPress veröffentlichen"
 
-#: wppost.php:70
+#: wppost.php:112
 msgid "Provide a backlink to the Friendica post"
 msgstr "Einen Link zurück zum Friendica-Beitrag hinzufügen"
 
-#: wppost.php:71
+#: wppost.php:116
 msgid ""
 "Text for the backlink, e.g. Read the original post and comment stream on "
 "Friendica."
-msgstr "Text für den Link zurück, z.B. \"Lies den Original-Post und die Kommentare auf Friendica\"."
+msgstr "Text für den Link zurück, z.B. lies den Original-Post und die Kommentare auf Friendica."
 
-#: wppost.php:72
+#: wppost.php:121
 msgid "Don't post messages that are too short"
 msgstr "Zu kurze Mitteilungen nicht posten"
 
-#: wppost.php:77
-msgid "Wordpress Export"
-msgstr "Wordpress-Export"
+#: wppost.php:127
+msgid "Save Settings"
+msgstr "Einstellungen speichern"
 
-#: wppost.php:182
+#: wppost.php:206
 msgid "Read the orig­i­nal post and com­ment stream on Friendica"
 msgstr "Lies den Original-Post und die Kommentare auf Friendica"
 
-#: wppost.php:240
+#: wppost.php:269
 msgid "Post from Friendica"
 msgstr "Post via Friendica"
diff --git a/wppost/lang/de/strings.php b/wppost/lang/de/strings.php
index c109b311..57ae6afe 100644
--- a/wppost/lang/de/strings.php
+++ b/wppost/lang/de/strings.php
@@ -2,18 +2,19 @@
 
 if(! function_exists("string_plural_select_de")) {
 function string_plural_select_de($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Post to Wordpress'] = 'Bei WordPress veröffentlichen';
-$a->strings['Enable Wordpress Post Addon'] = 'Wordpress-Addon aktivieren';
-$a->strings['Wordpress username'] = 'Wordpress-Benutzername';
-$a->strings['Wordpress password'] = 'Wordpress-Passwort';
-$a->strings['WordPress API URL'] = 'WordPress-API-URL';
-$a->strings['Post to Wordpress by default'] = 'Standardmäßig auf Wordpress veröffentlichen';
-$a->strings['Provide a backlink to the Friendica post'] = 'Einen Link zurück zum Friendica-Beitrag hinzufügen';
-$a->strings['Text for the backlink, e.g. Read the original post and comment stream on Friendica.'] = 'Text für den Link zurück, z.B. "Lies den Original-Post und die Kommentare auf Friendica".';
-$a->strings['Don\'t post messages that are too short'] = 'Zu kurze Mitteilungen nicht posten';
-$a->strings['Wordpress Export'] = 'Wordpress-Export';
-$a->strings['Read the orig­i­nal post and com­ment stream on Friendica'] = 'Lies den Original-Post und die Kommentare auf Friendica';
-$a->strings['Post from Friendica'] = 'Post via Friendica';
+;
+$a->strings["Post to Wordpress"] = "Bei WordPress veröffentlichen";
+$a->strings["Wordpress Export"] = "Wordpress Export";
+$a->strings["Enable WordPress Post Addon"] = "WordPress Addon aktivieren";
+$a->strings["WordPress username"] = "WordPress-Benutzername";
+$a->strings["WordPress password"] = "WordPress-Passwort";
+$a->strings["WordPress API URL"] = "WordPress-API-URL";
+$a->strings["Post to WordPress by default"] = "Standardmäßig auf WordPress veröffentlichen";
+$a->strings["Provide a backlink to the Friendica post"] = "Einen Link zurück zum Friendica-Beitrag hinzufügen";
+$a->strings["Text for the backlink, e.g. Read the original post and comment stream on Friendica."] = "Text für den Link zurück, z.B. lies den Original-Post und die Kommentare auf Friendica.";
+$a->strings["Don't post messages that are too short"] = "Zu kurze Mitteilungen nicht posten";
+$a->strings["Save Settings"] = "Einstellungen speichern";
+$a->strings["Read the orig­i­nal post and com­ment stream on Friendica"] = "Lies den Original-Post und die Kommentare auf Friendica";
+$a->strings["Post from Friendica"] = "Post via Friendica";
diff --git a/wppost/lang/es/messages.po b/wppost/lang/es/messages.po
index 067ca792..0c555a7f 100644
--- a/wppost/lang/es/messages.po
+++ b/wppost/lang/es/messages.po
@@ -5,14 +5,13 @@
 # 
 # Translators:
 # Albert, 2016-2017
-# Senex Petrovic <javierruizo@hotmail.com>, 2021
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-02-01 18:16+0100\n"
-"PO-Revision-Date: 2021-04-06 02:38+0000\n"
-"Last-Translator: Senex Petrovic <javierruizo@hotmail.com>\n"
+"POT-Creation-Date: 2017-01-24 21:06+0100\n"
+"PO-Revision-Date: 2017-02-25 22:42+0000\n"
+"Last-Translator: Albert\n"
 "Language-Team: Spanish (http://www.transifex.com/Friendica/friendica/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,7 +19,7 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: wppost.php:39
+#: wppost.php:42
 msgid "Post to Wordpress"
 msgstr "Publicar en Wordpress"
 
@@ -30,46 +29,46 @@ msgstr "Exportar a Wordpress"
 
 #: wppost.php:87
 msgid "Enable WordPress Post Addon"
-msgstr "Habilitar el complemento de publicación de WordPress"
+msgstr "Habilitar Addon de publicación de WordPress"
 
-#: wppost.php:93
+#: wppost.php:92
 msgid "WordPress username"
 msgstr "Nombre de usuario de WordPress"
 
-#: wppost.php:98
+#: wppost.php:97
 msgid "WordPress password"
 msgstr "Contraseña de WordPress"
 
-#: wppost.php:103
+#: wppost.php:102
 msgid "WordPress API URL"
 msgstr "URL de API de WordPress"
 
-#: wppost.php:108
+#: wppost.php:107
 msgid "Post to WordPress by default"
 msgstr "Publicar en WordPress por defecto"
 
-#: wppost.php:114
+#: wppost.php:112
 msgid "Provide a backlink to the Friendica post"
 msgstr "Proveer un enlace inverso a la entrada de Friendica"
 
-#: wppost.php:119
+#: wppost.php:116
 msgid ""
 "Text for the backlink, e.g. Read the original post and comment stream on "
 "Friendica."
 msgstr "Texto para el enlace inverso, e.g. Lea la entrada original y comente en Friendica."
 
-#: wppost.php:124
+#: wppost.php:121
 msgid "Don't post messages that are too short"
 msgstr "No escriba mensajes demasiado cortos"
 
-#: wppost.php:131
+#: wppost.php:127
 msgid "Save Settings"
 msgstr "Guardar configuración"
 
-#: wppost.php:231
+#: wppost.php:206
 msgid "Read the orig­i­nal post and com­ment stream on Friendica"
 msgstr "Leer la publicación original y comente en Friendica"
 
-#: wppost.php:289
+#: wppost.php:269
 msgid "Post from Friendica"
 msgstr "Publicar desde Friendica"
diff --git a/wppost/lang/es/strings.php b/wppost/lang/es/strings.php
index 68e5b47d..fab68021 100644
--- a/wppost/lang/es/strings.php
+++ b/wppost/lang/es/strings.php
@@ -2,19 +2,19 @@
 
 if(! function_exists("string_plural_select_es")) {
 function string_plural_select_es($n){
-	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Post to Wordpress'] = 'Publicar en Wordpress';
-$a->strings['Wordpress Export'] = 'Exportar a Wordpress';
-$a->strings['Enable WordPress Post Addon'] = 'Habilitar el complemento de publicación de WordPress';
-$a->strings['WordPress username'] = 'Nombre de usuario de WordPress';
-$a->strings['WordPress password'] = 'Contraseña de WordPress';
-$a->strings['WordPress API URL'] = 'URL de API de WordPress';
-$a->strings['Post to WordPress by default'] = 'Publicar en WordPress por defecto';
-$a->strings['Provide a backlink to the Friendica post'] = 'Proveer un enlace inverso a la entrada de Friendica';
-$a->strings['Text for the backlink, e.g. Read the original post and comment stream on Friendica.'] = 'Texto para el enlace inverso, e.g. Lea la entrada original y comente en Friendica.';
-$a->strings['Don\'t post messages that are too short'] = 'No escriba mensajes demasiado cortos';
-$a->strings['Save Settings'] = 'Guardar configuración';
-$a->strings['Read the orig­i­nal post and com­ment stream on Friendica'] = 'Leer la publicación original y comente en Friendica';
-$a->strings['Post from Friendica'] = 'Publicar desde Friendica';
+;
+$a->strings["Post to Wordpress"] = "Publicar en Wordpress";
+$a->strings["Wordpress Export"] = "Exportar a Wordpress";
+$a->strings["Enable WordPress Post Addon"] = "Habilitar Addon de publicación de WordPress";
+$a->strings["WordPress username"] = "Nombre de usuario de WordPress";
+$a->strings["WordPress password"] = "Contraseña de WordPress";
+$a->strings["WordPress API URL"] = "URL de API de WordPress";
+$a->strings["Post to WordPress by default"] = "Publicar en WordPress por defecto";
+$a->strings["Provide a backlink to the Friendica post"] = "Proveer un enlace inverso a la entrada de Friendica";
+$a->strings["Text for the backlink, e.g. Read the original post and comment stream on Friendica."] = "Texto para el enlace inverso, e.g. Lea la entrada original y comente en Friendica.";
+$a->strings["Don't post messages that are too short"] = "No escriba mensajes demasiado cortos";
+$a->strings["Save Settings"] = "Guardar configuración";
+$a->strings["Read the orig­i­nal post and com­ment stream on Friendica"] = "Leer la publicación original y comente en Friendica";
+$a->strings["Post from Friendica"] = "Publicar desde Friendica";
diff --git a/wppost/lang/fi-fi/strings.php b/wppost/lang/fi-fi/strings.php
index 672c4c0a..0d1353d8 100644
--- a/wppost/lang/fi-fi/strings.php
+++ b/wppost/lang/fi-fi/strings.php
@@ -3,18 +3,19 @@
 if(! function_exists("string_plural_select_fi_fi")) {
 function string_plural_select_fi_fi($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Post to Wordpress'] = 'Lähetä WordPressiin';
-$a->strings['Wordpress Export'] = 'WordPress vienti';
-$a->strings['Enable WordPress Post Addon'] = 'Ota WordPress -viestilisäosa käyttöön';
-$a->strings['WordPress username'] = 'WordPress -käyttäjätunnus';
-$a->strings['WordPress password'] = 'WordPress -salasana';
-$a->strings['WordPress API URL'] = 'WordPress API URL-osoite';
-$a->strings['Post to WordPress by default'] = 'Lähetä WordPressiin oletuksena';
-$a->strings['Provide a backlink to the Friendica post'] = 'Lisää backlinkki alkuperäiseen Friendica -julkaisuun';
-$a->strings['Text for the backlink, e.g. Read the original post and comment stream on Friendica.'] = 'Backlinkin teksti, esim. Katso alkuperäinen julkaisu ja kommentit Friendicassa.';
-$a->strings['Don\'t post messages that are too short'] = 'Älä julkaise lyhyitä viestejä';
-$a->strings['Save Settings'] = 'Tallenna asetukset';
-$a->strings['Read the orig­i­nal post and com­ment stream on Friendica'] = 'Katso alkuperäinen julkaisu ja kommentit Friendicassa';
-$a->strings['Post from Friendica'] = 'Lähetä Friendicasta';
+;
+$a->strings["Post to Wordpress"] = "Lähetä WordPressiin";
+$a->strings["Wordpress Export"] = "WordPress vienti";
+$a->strings["Enable WordPress Post Addon"] = "Ota WordPress -viestilisäosa käyttöön";
+$a->strings["WordPress username"] = "WordPress -käyttäjätunnus";
+$a->strings["WordPress password"] = "WordPress -salasana";
+$a->strings["WordPress API URL"] = "WordPress API URL-osoite";
+$a->strings["Post to WordPress by default"] = "Lähetä WordPressiin oletuksena";
+$a->strings["Provide a backlink to the Friendica post"] = "Lisää backlinkki alkuperäiseen Friendica -julkaisuun";
+$a->strings["Text for the backlink, e.g. Read the original post and comment stream on Friendica."] = "Backlinkin teksti, esim. Katso alkuperäinen julkaisu ja kommentit Friendicassa.";
+$a->strings["Don't post messages that are too short"] = "Älä julkaise lyhyitä viestejä";
+$a->strings["Save Settings"] = "Tallenna asetukset";
+$a->strings["Read the orig­i­nal post and com­ment stream on Friendica"] = "Katso alkuperäinen julkaisu ja kommentit Friendicassa";
+$a->strings["Post from Friendica"] = "Lähetä Friendicasta";
diff --git a/wppost/lang/fr/messages.po b/wppost/lang/fr/messages.po
deleted file mode 100644
index 723ddd6e..00000000
--- a/wppost/lang/fr/messages.po
+++ /dev/null
@@ -1,72 +0,0 @@
-# ADDON wppost
-# Copyright (C)
-# This file is distributed under the same license as the Friendica wppost addon package.
-# 
-# 
-# Translators:
-# Hypolite Petovan <hypolite@mrpetovan.com>, 2022
-# Nicolas Derive, 2022
-# StefOfficiel <pichard.stephane@free.fr>, 2015
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:18-0500\n"
-"PO-Revision-Date: 2014-06-23 13:07+0000\n"
-"Last-Translator: Nicolas Derive, 2022\n"
-"Language-Team: French (http://www.transifex.com/Friendica/friendica/language/fr/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: fr\n"
-"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
-
-#: wppost.php:41
-msgid "Post to Wordpress"
-msgstr "Publier sur Wordpress"
-
-#: wppost.php:65
-msgid "Enable Wordpress Post Addon"
-msgstr "Activer l'extension WordPress"
-
-#: wppost.php:66
-msgid "Wordpress username"
-msgstr "Nom d'utilisateur WordPress"
-
-#: wppost.php:67
-msgid "Wordpress password"
-msgstr "Mot de passe WordPress"
-
-#: wppost.php:68
-msgid "WordPress API URL"
-msgstr "URL de l'API WordPress"
-
-#: wppost.php:69
-msgid "Post to Wordpress by default"
-msgstr "Publier sur WordPress par défaut"
-
-#: wppost.php:70
-msgid "Provide a backlink to the Friendica post"
-msgstr "Fournit un rétrolien vers la publication Friendica"
-
-#: wppost.php:71
-msgid ""
-"Text for the backlink, e.g. Read the original post and comment stream on "
-"Friendica."
-msgstr "Le texte du rétrolien, par exemple Lire la publication d'origine et le fil de commentaires sur Friendica."
-
-#: wppost.php:72
-msgid "Don't post messages that are too short"
-msgstr "Ne pas publier de message trop court"
-
-#: wppost.php:77
-msgid "Wordpress Export"
-msgstr "Export WordPress"
-
-#: wppost.php:182
-msgid "Read the orig­i­nal post and com­ment stream on Friendica"
-msgstr "Lire la publication d'origine et le fil de commentaires sur Friendica"
-
-#: wppost.php:240
-msgid "Post from Friendica"
-msgstr "Publier depuis Friendica"
diff --git a/wppost/lang/fr/strings.php b/wppost/lang/fr/strings.php
index 25d598bd..ed511397 100644
--- a/wppost/lang/fr/strings.php
+++ b/wppost/lang/fr/strings.php
@@ -1,19 +1,13 @@
-<?php
-
-if(! function_exists("string_plural_select_fr")) {
-function string_plural_select_fr($n){
-	$n = intval($n);
-	if (($n == 0 || $n == 1)) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
-}}
-$a->strings['Post to Wordpress'] = 'Publier sur Wordpress';
-$a->strings['Enable Wordpress Post Addon'] = 'Activer l\'extension WordPress';
-$a->strings['Wordpress username'] = 'Nom d\'utilisateur WordPress';
-$a->strings['Wordpress password'] = 'Mot de passe WordPress';
-$a->strings['WordPress API URL'] = 'URL de l\'API WordPress';
-$a->strings['Post to Wordpress by default'] = 'Publier sur WordPress par défaut';
-$a->strings['Provide a backlink to the Friendica post'] = 'Fournit un rétrolien vers la publication Friendica';
-$a->strings['Text for the backlink, e.g. Read the original post and comment stream on Friendica.'] = 'Le texte du rétrolien, par exemple Lire la publication d\'origine et le fil de commentaires sur Friendica.';
-$a->strings['Don\'t post messages that are too short'] = 'Ne pas publier de message trop court';
-$a->strings['Wordpress Export'] = 'Export WordPress';
-$a->strings['Read the orig­i­nal post and com­ment stream on Friendica'] = 'Lire la publication d\'origine et le fil de commentaires sur Friendica';
-$a->strings['Post from Friendica'] = 'Publier depuis Friendica';
+<?php
+
+$a->strings["Post to Wordpress"] = "Poster sur WordPress";
+$a->strings["WordPress Post Settings"] = "Réglages WordPress";
+$a->strings["Enable WordPress Post Addon"] = "Activer l'extension WordPress";
+$a->strings["WordPress username"] = "Utilisateur WordPress";
+$a->strings["WordPress password"] = "Mot de passe WordPress";
+$a->strings["WordPress API URL"] = "URL de l'API WordPress";
+$a->strings["Post to WordPress by default"] = "Publier sur WordPress par défaut";
+$a->strings["Provide a backlink to the Friendica post"] = "Fournir un rétrolien vers le message sur Friendica";
+$a->strings["Submit"] = "Envoyer";
+$a->strings["Post from Friendica"] = "Publier depuis Friendica";
+$a->strings["Read the original post and comment stream on Friendica"] = "Lire le message d'origine et le flux des commentaires sur Friendica";
diff --git a/wppost/lang/hu/messages.po b/wppost/lang/hu/messages.po
deleted file mode 100644
index a3c910e4..00000000
--- a/wppost/lang/hu/messages.po
+++ /dev/null
@@ -1,70 +0,0 @@
-# ADDON wppost
-# Copyright (C)
-# This file is distributed under the same license as the Friendica wppost addon package.
-# 
-# 
-# Translators:
-# Balázs Úr, 2020-2021
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:18-0500\n"
-"PO-Revision-Date: 2014-06-23 13:07+0000\n"
-"Last-Translator: Balázs Úr, 2020-2021\n"
-"Language-Team: Hungarian (http://www.transifex.com/Friendica/friendica/language/hu/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: hu\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: wppost.php:41
-msgid "Post to Wordpress"
-msgstr "Beküldés a WordPressre"
-
-#: wppost.php:65
-msgid "Enable Wordpress Post Addon"
-msgstr "A WordPress-beküldő bővítmény engedélyezése"
-
-#: wppost.php:66
-msgid "Wordpress username"
-msgstr "WordPress felhasználónév"
-
-#: wppost.php:67
-msgid "Wordpress password"
-msgstr "WordPress jelszó"
-
-#: wppost.php:68
-msgid "WordPress API URL"
-msgstr "WordPress API URL"
-
-#: wppost.php:69
-msgid "Post to Wordpress by default"
-msgstr "Beküldés a WordPressre alapértelmezetten"
-
-#: wppost.php:70
-msgid "Provide a backlink to the Friendica post"
-msgstr "Visszafelé mutató hivatkozás biztosítása a Friendica bejegyzésre"
-
-#: wppost.php:71
-msgid ""
-"Text for the backlink, e.g. Read the original post and comment stream on "
-"Friendica."
-msgstr "A visszafelé mutató hivatkozás szövege, például „Olvassa el az eredeti bejegyzést és a hozzászólásokat a Friendicán”."
-
-#: wppost.php:72
-msgid "Don't post messages that are too short"
-msgstr "Ne küldjön be olyan üzeneteket, amelyek túl rövidek"
-
-#: wppost.php:77
-msgid "Wordpress Export"
-msgstr "WordPress exportálás"
-
-#: wppost.php:182
-msgid "Read the orig­i­nal post and com­ment stream on Friendica"
-msgstr "Olvassa el az eredeti bejegyzést és a hozzászólásokat a Friendicán"
-
-#: wppost.php:240
-msgid "Post from Friendica"
-msgstr "Bejegyzés a Friendicáról"
diff --git a/wppost/lang/hu/strings.php b/wppost/lang/hu/strings.php
deleted file mode 100644
index 483fcfd4..00000000
--- a/wppost/lang/hu/strings.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-if(! function_exists("string_plural_select_hu")) {
-function string_plural_select_hu($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
-$a->strings['Post to Wordpress'] = 'Beküldés a WordPressre';
-$a->strings['Enable Wordpress Post Addon'] = 'A WordPress-beküldő bővítmény engedélyezése';
-$a->strings['Wordpress username'] = 'WordPress felhasználónév';
-$a->strings['Wordpress password'] = 'WordPress jelszó';
-$a->strings['WordPress API URL'] = 'WordPress API URL';
-$a->strings['Post to Wordpress by default'] = 'Beküldés a WordPressre alapértelmezetten';
-$a->strings['Provide a backlink to the Friendica post'] = 'Visszafelé mutató hivatkozás biztosítása a Friendica bejegyzésre';
-$a->strings['Text for the backlink, e.g. Read the original post and comment stream on Friendica.'] = 'A visszafelé mutató hivatkozás szövege, például „Olvassa el az eredeti bejegyzést és a hozzászólásokat a Friendicán”.';
-$a->strings['Don\'t post messages that are too short'] = 'Ne küldjön be olyan üzeneteket, amelyek túl rövidek';
-$a->strings['Wordpress Export'] = 'WordPress exportálás';
-$a->strings['Read the orig­i­nal post and com­ment stream on Friendica'] = 'Olvassa el az eredeti bejegyzést és a hozzászólásokat a Friendicán';
-$a->strings['Post from Friendica'] = 'Bejegyzés a Friendicáról';
diff --git a/wppost/lang/it/messages.po b/wppost/lang/it/messages.po
index efd90e1f..85e2b317 100644
--- a/wppost/lang/it/messages.po
+++ b/wppost/lang/it/messages.po
@@ -5,67 +5,70 @@
 # 
 # Translators:
 # fabrixxm <fabrix.xm@gmail.com>, 2014-2015,2017-2018
-# Sylke Vicious <silkevicious@gmail.com>, 2020,2023
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:18-0500\n"
-"PO-Revision-Date: 2014-06-23 13:07+0000\n"
-"Last-Translator: Sylke Vicious <silkevicious@gmail.com>, 2020,2023\n"
-"Language-Team: Italian (http://app.transifex.com/Friendica/friendica/language/it/)\n"
+"POT-Creation-Date: 2017-01-24 21:06+0100\n"
+"PO-Revision-Date: 2018-03-19 13:26+0000\n"
+"Last-Translator: fabrixxm <fabrix.xm@gmail.com>\n"
+"Language-Team: Italian (http://www.transifex.com/Friendica/friendica/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: it\n"
-"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: wppost.php:41
+#: wppost.php:42
 msgid "Post to Wordpress"
 msgstr "Invia a Wordpress"
 
-#: wppost.php:65
-msgid "Enable Wordpress Post Addon"
-msgstr "Abilita Componente Aggiuntivo di Pubblicazione Wordpress"
-
-#: wppost.php:66
-msgid "Wordpress username"
-msgstr "Nome utente Wordpress"
-
-#: wppost.php:67
-msgid "Wordpress password"
-msgstr "Password Wordpress"
-
-#: wppost.php:68
-msgid "WordPress API URL"
-msgstr "Indirizzo API Wordpress"
-
-#: wppost.php:69
-msgid "Post to Wordpress by default"
-msgstr "Pubblica su Wordpress per impostazione predefinita"
-
-#: wppost.php:70
-msgid "Provide a backlink to the Friendica post"
-msgstr "Inserisci un collegamento al messaggio originale su Friendica"
-
-#: wppost.php:71
-msgid ""
-"Text for the backlink, e.g. Read the original post and comment stream on "
-"Friendica."
-msgstr "Testo per il collegamento al messaggio originale, p.e. Leggi il messaggio originale e i commenti su Friendica."
-
-#: wppost.php:72
-msgid "Don't post messages that are too short"
-msgstr "Non inviare messaggi troppo corti"
-
-#: wppost.php:77
+#: wppost.php:80 wppost.php:84
 msgid "Wordpress Export"
 msgstr "Esporta a Wordpress"
 
-#: wppost.php:182
+#: wppost.php:87
+msgid "Enable WordPress Post Addon"
+msgstr "Abilita il componente aggiuntivo di invio a Wordpress"
+
+#: wppost.php:92
+msgid "WordPress username"
+msgstr "Nome utente Wordpress"
+
+#: wppost.php:97
+msgid "WordPress password"
+msgstr "Password Wordpress"
+
+#: wppost.php:102
+msgid "WordPress API URL"
+msgstr "Indirizzo API Wordpress"
+
+#: wppost.php:107
+msgid "Post to WordPress by default"
+msgstr "Invia sempre a Wordpress"
+
+#: wppost.php:112
+msgid "Provide a backlink to the Friendica post"
+msgstr "Inserisci un link al messaggio originale su Friendica"
+
+#: wppost.php:116
+msgid ""
+"Text for the backlink, e.g. Read the original post and comment stream on "
+"Friendica."
+msgstr "Testo per il backlink, p.e. Leggi il post originale e i commenti su Friendica."
+
+#: wppost.php:121
+msgid "Don't post messages that are too short"
+msgstr "Non inviare messaggi troppo corti"
+
+#: wppost.php:127
+msgid "Save Settings"
+msgstr "Salva Impostazioni"
+
+#: wppost.php:206
 msgid "Read the orig­i­nal post and com­ment stream on Friendica"
 msgstr "Leggi il messaggio originale e i commenti su Friendica"
 
-#: wppost.php:240
+#: wppost.php:269
 msgid "Post from Friendica"
 msgstr "Messaggio da Friendica"
diff --git a/wppost/lang/it/strings.php b/wppost/lang/it/strings.php
index 504a077c..c982dbcd 100644
--- a/wppost/lang/it/strings.php
+++ b/wppost/lang/it/strings.php
@@ -2,18 +2,19 @@
 
 if(! function_exists("string_plural_select_it")) {
 function string_plural_select_it($n){
-	$n = intval($n);
-	if ($n == 1) { return 0; } else if ($n != 0 && $n % 1000000 == 0) { return 1; } else  { return 2; }
+	return ($n != 1);;
 }}
-$a->strings['Post to Wordpress'] = 'Invia a Wordpress';
-$a->strings['Enable Wordpress Post Addon'] = 'Abilita Componente Aggiuntivo di Pubblicazione Wordpress';
-$a->strings['Wordpress username'] = 'Nome utente Wordpress';
-$a->strings['Wordpress password'] = 'Password Wordpress';
-$a->strings['WordPress API URL'] = 'Indirizzo API Wordpress';
-$a->strings['Post to Wordpress by default'] = 'Pubblica su Wordpress per impostazione predefinita';
-$a->strings['Provide a backlink to the Friendica post'] = 'Inserisci un collegamento al messaggio originale su Friendica';
-$a->strings['Text for the backlink, e.g. Read the original post and comment stream on Friendica.'] = 'Testo per il collegamento al messaggio originale, p.e. Leggi il messaggio originale e i commenti su Friendica.';
-$a->strings['Don\'t post messages that are too short'] = 'Non inviare messaggi troppo corti';
-$a->strings['Wordpress Export'] = 'Esporta a Wordpress';
-$a->strings['Read the orig­i­nal post and com­ment stream on Friendica'] = 'Leggi il messaggio originale e i commenti su Friendica';
-$a->strings['Post from Friendica'] = 'Messaggio da Friendica';
+;
+$a->strings["Post to Wordpress"] = "Invia a Wordpress";
+$a->strings["Wordpress Export"] = "Esporta a Wordpress";
+$a->strings["Enable WordPress Post Addon"] = "Abilita il componente aggiuntivo di invio a Wordpress";
+$a->strings["WordPress username"] = "Nome utente Wordpress";
+$a->strings["WordPress password"] = "Password Wordpress";
+$a->strings["WordPress API URL"] = "Indirizzo API Wordpress";
+$a->strings["Post to WordPress by default"] = "Invia sempre a Wordpress";
+$a->strings["Provide a backlink to the Friendica post"] = "Inserisci un link al messaggio originale su Friendica";
+$a->strings["Text for the backlink, e.g. Read the original post and comment stream on Friendica."] = "Testo per il backlink, p.e. Leggi il post originale e i commenti su Friendica.";
+$a->strings["Don't post messages that are too short"] = "Non inviare messaggi troppo corti";
+$a->strings["Save Settings"] = "Salva Impostazioni";
+$a->strings["Read the orig­i­nal post and com­ment stream on Friendica"] = "Leggi il messaggio originale e i commenti su Friendica";
+$a->strings["Post from Friendica"] = "Messaggio da Friendica";
diff --git a/wppost/lang/nl/strings.php b/wppost/lang/nl/strings.php
index 5c72404f..d838cccd 100644
--- a/wppost/lang/nl/strings.php
+++ b/wppost/lang/nl/strings.php
@@ -3,12 +3,19 @@
 if(! function_exists("string_plural_select_nl")) {
 function string_plural_select_nl($n){
 	$n = intval($n);
-	return intval($n != 1);
+	return ($n != 1);;
 }}
-$a->strings['Post to Wordpress'] = 'Plaatsen op Wordpress';
-$a->strings['Wordpress Export'] = 'Wordpress Exporteren';
-$a->strings['Enable WordPress Post Addon'] = 'Wordpress Post Addon Inschakelen';
-$a->strings['Post to WordPress by default'] = 'Plaatsen op Wordpress als standaard instellen ';
-$a->strings['Provide a backlink to the Friendica post'] = 'Geef een terugkoppeling naar get Friendica bericht';
-$a->strings['Don\'t post messages that are too short'] = 'Plaats geen berichten die te kort zijn';
-$a->strings['Save Settings'] = 'Instellingen opslaan';
+;
+$a->strings["Post to Wordpress"] = "Plaatsen op Wordpress";
+$a->strings["Wordpress Export"] = "Wordpress Exporteren";
+$a->strings["Enable WordPress Post Addon"] = "Wordpress Post Addon Inschakelen";
+$a->strings["WordPress username"] = "";
+$a->strings["WordPress password"] = "";
+$a->strings["WordPress API URL"] = "";
+$a->strings["Post to WordPress by default"] = "Plaatsen op Wordpress als standaard instellen ";
+$a->strings["Provide a backlink to the Friendica post"] = "Geef een terugkoppeling naar get Friendica bericht";
+$a->strings["Text for the backlink, e.g. Read the original post and comment stream on Friendica."] = "";
+$a->strings["Don't post messages that are too short"] = "Plaats geen berichten die te kort zijn";
+$a->strings["Save Settings"] = "Instellingen opslaan";
+$a->strings["Read the orig­i­nal post and com­ment stream on Friendica"] = "";
+$a->strings["Post from Friendica"] = "";
diff --git a/wppost/lang/pl/messages.po b/wppost/lang/pl/messages.po
index e98b092a..7bc14923 100644
--- a/wppost/lang/pl/messages.po
+++ b/wppost/lang/pl/messages.po
@@ -4,15 +4,14 @@
 # 
 # 
 # Translators:
-# Piotr Strębski <strebski@gmail.com>, 2022
-# Waldemar Stoczkowski, 2018
+# Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:18-0500\n"
-"PO-Revision-Date: 2014-06-23 13:07+0000\n"
-"Last-Translator: Piotr Strębski <strebski@gmail.com>, 2022\n"
+"POT-Creation-Date: 2017-01-24 21:06+0100\n"
+"PO-Revision-Date: 2018-08-04 11:18+0000\n"
+"Last-Translator: Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.com/Friendica/friendica/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,52 +19,56 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
-#: wppost.php:41
+#: wppost.php:42
 msgid "Post to Wordpress"
 msgstr "Opublikuj w Wordpress"
 
-#: wppost.php:65
-msgid "Enable Wordpress Post Addon"
-msgstr "Włącz dodatek Dodaj wpis do WordPress"
+#: wppost.php:80 wppost.php:84
+msgid "Wordpress Export"
+msgstr "Eksport do Wordpress"
 
-#: wppost.php:66
-msgid "Wordpress username"
-msgstr "Nazwa użytkownika Wordpress"
+#: wppost.php:87
+msgid "Enable WordPress Post Addon"
+msgstr "Włącz dodatek Dodaj post do WordPress"
 
-#: wppost.php:67
-msgid "Wordpress password"
-msgstr "Hasło Wordpress"
+#: wppost.php:92
+msgid "WordPress username"
+msgstr "Nazwa użytkownika WordPress"
 
-#: wppost.php:68
+#: wppost.php:97
+msgid "WordPress password"
+msgstr "Hasło WordPress"
+
+#: wppost.php:102
 msgid "WordPress API URL"
 msgstr "WordPress API URL"
 
-#: wppost.php:69
-msgid "Post to Wordpress by default"
-msgstr "Publikuj domyślnie w Wordpress"
+#: wppost.php:107
+msgid "Post to WordPress by default"
+msgstr "Wyślij  domyślnie do WordPress"
 
-#: wppost.php:70
+#: wppost.php:112
 msgid "Provide a backlink to the Friendica post"
 msgstr "Podaj zwrotny link do posta Friendica"
 
-#: wppost.php:71
+#: wppost.php:116
 msgid ""
 "Text for the backlink, e.g. Read the original post and comment stream on "
 "Friendica."
 msgstr "Tekst linku zwrotnego, np. Przeczytaj oryginalny post i strumień komentarzy na stronie Friendica."
 
-#: wppost.php:72
+#: wppost.php:121
 msgid "Don't post messages that are too short"
 msgstr "Nie publikuj zbyt krótkich wiadomości"
 
-#: wppost.php:77
-msgid "Wordpress Export"
-msgstr "Eksport do Wordpress"
+#: wppost.php:127
+msgid "Save Settings"
+msgstr "Zapisz ustawienia"
 
-#: wppost.php:182
+#: wppost.php:206
 msgid "Read the orig­i­nal post and com­ment stream on Friendica"
 msgstr "Przeczytaj oryginalny post i strumień komentarzy na stronie Friendica"
 
-#: wppost.php:240
+#: wppost.php:269
 msgid "Post from Friendica"
 msgstr "Post z Friendica"
diff --git a/wppost/lang/pl/strings.php b/wppost/lang/pl/strings.php
index 6e1b4543..3c152f48 100644
--- a/wppost/lang/pl/strings.php
+++ b/wppost/lang/pl/strings.php
@@ -3,17 +3,19 @@
 if(! function_exists("string_plural_select_pl")) {
 function string_plural_select_pl($n){
 	$n = intval($n);
-	if ($n==1) { return 0; } else if (($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14)) { return 1; } else if ($n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14)) { return 2; } else  { return 3; }
+	return ($n==1 ? 0 : ($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14) ? 1 : $n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14) ? 2 : 3);;
 }}
-$a->strings['Post to Wordpress'] = 'Opublikuj w Wordpress';
-$a->strings['Enable Wordpress Post Addon'] = 'Włącz dodatek Dodaj wpis do WordPress';
-$a->strings['Wordpress username'] = 'Nazwa użytkownika Wordpress';
-$a->strings['Wordpress password'] = 'Hasło Wordpress';
-$a->strings['WordPress API URL'] = 'WordPress API URL';
-$a->strings['Post to Wordpress by default'] = 'Publikuj domyślnie w Wordpress';
-$a->strings['Provide a backlink to the Friendica post'] = 'Podaj zwrotny link do posta Friendica';
-$a->strings['Text for the backlink, e.g. Read the original post and comment stream on Friendica.'] = 'Tekst linku zwrotnego, np. Przeczytaj oryginalny post i strumień komentarzy na stronie Friendica.';
-$a->strings['Don\'t post messages that are too short'] = 'Nie publikuj zbyt krótkich wiadomości';
-$a->strings['Wordpress Export'] = 'Eksport do Wordpress';
-$a->strings['Read the orig­i­nal post and com­ment stream on Friendica'] = 'Przeczytaj oryginalny post i strumień komentarzy na stronie Friendica';
-$a->strings['Post from Friendica'] = 'Post z Friendica';
+;
+$a->strings["Post to Wordpress"] = "Opublikuj w Wordpress";
+$a->strings["Wordpress Export"] = "Eksport do Wordpress";
+$a->strings["Enable WordPress Post Addon"] = "Włącz dodatek Dodaj post do WordPress";
+$a->strings["WordPress username"] = "Nazwa użytkownika WordPress";
+$a->strings["WordPress password"] = "Hasło WordPress";
+$a->strings["WordPress API URL"] = "WordPress API URL";
+$a->strings["Post to WordPress by default"] = "Wyślij  domyślnie do WordPress";
+$a->strings["Provide a backlink to the Friendica post"] = "Podaj zwrotny link do posta Friendica";
+$a->strings["Text for the backlink, e.g. Read the original post and comment stream on Friendica."] = "Tekst linku zwrotnego, np. Przeczytaj oryginalny post i strumień komentarzy na stronie Friendica.";
+$a->strings["Don't post messages that are too short"] = "Nie publikuj zbyt krótkich wiadomości";
+$a->strings["Save Settings"] = "Zapisz ustawienia";
+$a->strings["Read the orig­i­nal post and com­ment stream on Friendica"] = "Przeczytaj oryginalny post i strumień komentarzy na stronie Friendica";
+$a->strings["Post from Friendica"] = "Post z Friendica";
diff --git a/wppost/lang/pt-br/strings.php b/wppost/lang/pt-br/strings.php
index 55434b32..fc59fcb3 100644
--- a/wppost/lang/pt-br/strings.php
+++ b/wppost/lang/pt-br/strings.php
@@ -2,13 +2,17 @@
 
 if(! function_exists("string_plural_select_pt_br")) {
 function string_plural_select_pt_br($n){
-	$n = intval($n);
-	return intval($n > 1);
+	return ($n > 1);;
 }}
-$a->strings['Post to Wordpress'] = 'Publicar no Wordpress';
-$a->strings['WordPress Post Settings'] = 'Configurações de publicação no WordPress';
-$a->strings['Enable WordPress Post Addon'] = 'Habilitar plug-in para publicar no WordPress';
-$a->strings['WordPress username'] = 'Nome de usuário no WordPress';
-$a->strings['WordPress password'] = 'Senha do WordPress';
-$a->strings['Post to WordPress by default'] = 'Publicar no WordPress por padrão';
-$a->strings['Submit'] = 'Enviar';
+;
+$a->strings["Post to Wordpress"] = "Publicar no Wordpress";
+$a->strings["WordPress Post Settings"] = "Configurações de publicação no WordPress";
+$a->strings["Enable WordPress Post Addon"] = "Habilitar plug-in para publicar no WordPress";
+$a->strings["WordPress username"] = "Nome de usuário no WordPress";
+$a->strings["WordPress password"] = "Senha do WordPress";
+$a->strings["WordPress API URL"] = "";
+$a->strings["Post to WordPress by default"] = "Publicar no WordPress por padrão";
+$a->strings["Provide a backlink to the Friendica post"] = "";
+$a->strings["Submit"] = "Enviar";
+$a->strings["Post from Friendica"] = "";
+$a->strings["Read the original post and comment stream on Friendica"] = "";
diff --git a/wppost/lang/ro/strings.php b/wppost/lang/ro/strings.php
index f7d3525f..fcd0efa4 100644
--- a/wppost/lang/ro/strings.php
+++ b/wppost/lang/ro/strings.php
@@ -2,18 +2,18 @@
 
 if(! function_exists("string_plural_select_ro")) {
 function string_plural_select_ro($n){
-	$n = intval($n);
-	if ($n==1) { return 0; } else if ((($n%100>19)||(($n%100==0)&&($n!=0)))) { return 2; } else  { return 1; }
+	return ($n==1?0:((($n%100>19)||(($n%100==0)&&($n!=0)))?2:1));;
 }}
-$a->strings['Post to Wordpress'] = 'Postați pe Wordpress';
-$a->strings['Wordpress Export'] = 'Export pe Wordpress';
-$a->strings['Enable WordPress Post Addon'] = 'Activare Modul Postare pe Wordpress';
-$a->strings['WordPress username'] = 'Utilizator WordPress ';
-$a->strings['WordPress password'] = 'Parolă WordPress ';
-$a->strings['WordPress API URL'] = 'URL Cheie API WordPress';
-$a->strings['Post to WordPress by default'] = 'Postați implicit pe Wordpress';
-$a->strings['Provide a backlink to the Friendica post'] = 'Oferiți un backlink către postarea de pe Friendica';
-$a->strings['Don\'t post messages that are too short'] = 'Nu publica mesajele prea scurte';
-$a->strings['Save Settings'] = 'Salvare Configurări';
-$a->strings['Post from Friendica'] = 'Postați din Friendica';
-$a->strings['Read the original post and comment stream on Friendica'] = 'Citiți publicația originală și fluxul de comentarii, pe Friendica';
+;
+$a->strings["Post to Wordpress"] = "Postați pe Wordpress";
+$a->strings["Wordpress Export"] = "Export pe Wordpress";
+$a->strings["Enable WordPress Post Addon"] = "Activare Modul Postare pe Wordpress";
+$a->strings["WordPress username"] = "Utilizator WordPress ";
+$a->strings["WordPress password"] = "Parolă WordPress ";
+$a->strings["WordPress API URL"] = "URL Cheie API WordPress";
+$a->strings["Post to WordPress by default"] = "Postați implicit pe Wordpress";
+$a->strings["Provide a backlink to the Friendica post"] = "Oferiți un backlink către postarea de pe Friendica";
+$a->strings["Don't post messages that are too short"] = "Nu publica mesajele prea scurte";
+$a->strings["Save Settings"] = "Salvare Configurări";
+$a->strings["Post from Friendica"] = "Postați din Friendica";
+$a->strings["Read the original post and comment stream on Friendica"] = "Citiți publicația originală și fluxul de comentarii, pe Friendica";
diff --git a/wppost/lang/sv/messages.po b/wppost/lang/sv/messages.po
deleted file mode 100644
index 7743e9e8..00000000
--- a/wppost/lang/sv/messages.po
+++ /dev/null
@@ -1,69 +0,0 @@
-# ADDON wppost
-# Copyright (C)
-# This file is distributed under the same license as the Friendica wppost addon package.
-# 
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-21 19:18-0500\n"
-"PO-Revision-Date: 2021-12-22 16:15+0000\n"
-"Last-Translator: Transifex Bot <>\n"
-"Language-Team: Swedish (http://www.transifex.com/Friendica/friendica/language/sv/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: sv\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-#: wppost.php:41
-msgid "Post to Wordpress"
-msgstr ""
-
-#: wppost.php:65
-msgid "Enable Wordpress Post Addon"
-msgstr ""
-
-#: wppost.php:66
-msgid "Wordpress username"
-msgstr ""
-
-#: wppost.php:67
-msgid "Wordpress password"
-msgstr ""
-
-#: wppost.php:68
-msgid "WordPress API URL"
-msgstr ""
-
-#: wppost.php:69
-msgid "Post to Wordpress by default"
-msgstr ""
-
-#: wppost.php:70
-msgid "Provide a backlink to the Friendica post"
-msgstr ""
-
-#: wppost.php:71
-msgid ""
-"Text for the backlink, e.g. Read the original post and comment stream on "
-"Friendica."
-msgstr ""
-
-#: wppost.php:72
-msgid "Don't post messages that are too short"
-msgstr ""
-
-#: wppost.php:77
-msgid "Wordpress Export"
-msgstr ""
-
-#: wppost.php:182
-msgid "Read the orig­i­nal post and com­ment stream on Friendica"
-msgstr ""
-
-#: wppost.php:240
-msgid "Post from Friendica"
-msgstr ""
diff --git a/wppost/lang/sv/strings.php b/wppost/lang/sv/strings.php
index 72e9772f..3ec569a7 100644
--- a/wppost/lang/sv/strings.php
+++ b/wppost/lang/sv/strings.php
@@ -1,7 +1,3 @@
-<?php
-
-if(! function_exists("string_plural_select_sv")) {
-function string_plural_select_sv($n){
-	$n = intval($n);
-	return intval($n != 1);
-}}
+<?php
+
+$a->strings["Submit"] = "Spara";
diff --git a/wppost/lang/zh-cn/messages.po b/wppost/lang/zh-cn/messages.po
deleted file mode 100644
index 7a444d64..00000000
--- a/wppost/lang/zh-cn/messages.po
+++ /dev/null
@@ -1,74 +0,0 @@
-# ADDON wppost
-# Copyright (C)
-# This file is distributed under the same license as the Friendica wppost addon package.
-# 
-# 
-# Translators:
-# steve jobs <vicdorke@gmail.com>, 2020
-msgid ""
-msgstr ""
-"Project-Id-Version: friendica\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-24 21:06+0100\n"
-"PO-Revision-Date: 2020-07-31 03:59+0000\n"
-"Last-Translator: steve jobs <vicdorke@gmail.com>\n"
-"Language-Team: Chinese (China) (http://www.transifex.com/Friendica/friendica/language/zh_CN/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: zh_CN\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-
-#: wppost.php:42
-msgid "Post to Wordpress"
-msgstr "发布到 Wordpress"
-
-#: wppost.php:80 wppost.php:84
-msgid "Wordpress Export"
-msgstr "导出WordPress"
-
-#: wppost.php:87
-msgid "Enable WordPress Post Addon"
-msgstr "启用 WordPress 文章插件"
-
-#: wppost.php:92
-msgid "WordPress username"
-msgstr "WordPress用户名"
-
-#: wppost.php:97
-msgid "WordPress password"
-msgstr "WordPress密码"
-
-#: wppost.php:102
-msgid "WordPress API URL"
-msgstr "WordPress API URL"
-
-#: wppost.php:107
-msgid "Post to WordPress by default"
-msgstr "默认发布到 WordPress"
-
-#: wppost.php:112
-msgid "Provide a backlink to the Friendica post"
-msgstr "提供 Friendica 发布的反向链接"
-
-#: wppost.php:116
-msgid ""
-"Text for the backlink, e.g. Read the original post and comment stream on "
-"Friendica."
-msgstr "反向链接的文本，例如阅读 Friendica 的原始文章和评论流。"
-
-#: wppost.php:121
-msgid "Don't post messages that are too short"
-msgstr "不要发太短的信息"
-
-#: wppost.php:127
-msgid "Save Settings"
-msgstr "保存设置"
-
-#: wppost.php:206
-msgid "Read the orig­i­nal post and com­ment stream on Friendica"
-msgstr "阅读原文并在 Friendica 上发表评论"
-
-#: wppost.php:269
-msgid "Post from Friendica"
-msgstr "来自Friendica的帖子"
diff --git a/wppost/lang/zh-cn/strings.php b/wppost/lang/zh-cn/strings.php
index 7716f4cd..9ac233fd 100644
--- a/wppost/lang/zh-cn/strings.php
+++ b/wppost/lang/zh-cn/strings.php
@@ -1,20 +1,13 @@
-<?php
-
-if(! function_exists("string_plural_select_zh_cn")) {
-function string_plural_select_zh_cn($n){
-	$n = intval($n);
-	return intval(0);
-}}
-$a->strings['Post to Wordpress'] = '发布到 Wordpress';
-$a->strings['Wordpress Export'] = '导出WordPress';
-$a->strings['Enable WordPress Post Addon'] = '启用 WordPress 文章插件';
-$a->strings['WordPress username'] = 'WordPress用户名';
-$a->strings['WordPress password'] = 'WordPress密码';
-$a->strings['WordPress API URL'] = 'WordPress API URL';
-$a->strings['Post to WordPress by default'] = '默认发布到 WordPress';
-$a->strings['Provide a backlink to the Friendica post'] = '提供 Friendica 发布的反向链接';
-$a->strings['Text for the backlink, e.g. Read the original post and comment stream on Friendica.'] = '反向链接的文本，例如阅读 Friendica 的原始文章和评论流。';
-$a->strings['Don\'t post messages that are too short'] = '不要发太短的信息';
-$a->strings['Save Settings'] = '保存设置';
-$a->strings['Read the orig­i­nal post and com­ment stream on Friendica'] = '阅读原文并在 Friendica 上发表评论';
-$a->strings['Post from Friendica'] = '来自Friendica的帖子';
+<?php
+
+$a->strings["Post to Wordpress"] = "发送到Wordpress";
+$a->strings["WordPress Post Settings"] = "Wordpress发送设置";
+$a->strings["Enable WordPress Post Addon"] = "使Wordpress发送插件可用";
+$a->strings["WordPress username"] = "Wordpress用户名";
+$a->strings["WordPress password"] = "Wordpress密码";
+$a->strings["WordPress API URL"] = "WordPress API URL";
+$a->strings["Post to WordPress by default"] = "默认地发送到Wordpress";
+$a->strings["Provide a backlink to the Friendica post"] = "输入反向链接到Friendica文章";
+$a->strings["Submit"] = "提交";
+$a->strings["Post from Friendica"] = "文章从Friendica";
+$a->strings["Read the original post and comment stream on Friendica"] = "看原来文章和评论溪流在Friendica";
diff --git a/wppost/templates/connector_settings.tpl b/wppost/templates/connector_settings.tpl
deleted file mode 100644
index f31bd431..00000000
--- a/wppost/templates/connector_settings.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-{{include file="field_checkbox.tpl" field=$enabled}}
-{{include file="field_input.tpl" field=$username}}
-{{include file="field_password.tpl" field=$password}}
-{{include file="field_input.tpl" field=$blog}}
-{{include file="field_checkbox.tpl" field=$bydefault}}
-{{include file="field_checkbox.tpl" field=$backlink}}
-{{include file="field_input.tpl" field=$backlink_text}}
-{{include file="field_checkbox.tpl" field=$shortcheck}}
diff --git a/wppost/wppost.css b/wppost/wppost.css
new file mode 100644
index 00000000..d5a39fde
--- /dev/null
+++ b/wppost/wppost.css
@@ -0,0 +1,20 @@
+
+#wppost-enable-label, #wppost-username-label, #wppost-password-label, 
+#wppost-blog-label, #wppost-bydefault-label, 
+#wppost-backlink-label, #wppost-shortcheck-label {
+	float: left;
+	width: 200px;
+	margin-top: 10px;
+}
+
+#wppost-checkbox, #wppost-username, #wppost-password, 
+#wppost-blog, #wppost-bydefault, 
+#wppost-shortcheck, #wppost-backlink {
+	float: left;
+	margin-top: 10px;
+}
+
+#wppost-submit {
+	margin-top: 15px;
+}
+
diff --git a/wppost/wppost.php b/wppost/wppost.php
index e27079aa..bcdedffe 100644
--- a/wppost/wppost.php
+++ b/wppost/wppost.php
@@ -9,13 +9,12 @@
 use Friendica\Content\Text\BBCode;
 use Friendica\Content\Text\HTML;
 use Friendica\Core\Hook;
+use Friendica\Core\L10n;
 use Friendica\Core\Logger;
-use Friendica\Core\Renderer;
+use Friendica\Core\PConfig;
 use Friendica\Database\DBA;
-use Friendica\DI;
-use Friendica\Model\Item;
-use Friendica\Model\Post;
-use Friendica\Model\User;
+use Friendica\Util\Network;
+use Friendica\Util\Strings;
 use Friendica\Util\XML;
 
 function wppost_install()
@@ -28,78 +27,145 @@ function wppost_install()
 	Hook::register('connector_settings_post', 'addon/wppost/wppost.php', 'wppost_settings_post');
 }
 
-function wppost_jot_nets(array &$jotnets_fields)
+function wppost_uninstall()
 {
-	if (!DI::userSession()->getLocalUserId()) {
+	Hook::unregister('hook_fork',        'addon/wppost/wppost.php', 'wppost_hook_fork');
+	Hook::unregister('post_local',       'addon/wppost/wppost.php', 'wppost_post_local');
+	Hook::unregister('notifier_normal',  'addon/wppost/wppost.php', 'wppost_send');
+	Hook::unregister('jot_networks',     'addon/wppost/wppost.php', 'wppost_jot_nets');
+	Hook::unregister('connector_settings',      'addon/wppost/wppost.php', 'wppost_settings');
+	Hook::unregister('connector_settings_post', 'addon/wppost/wppost.php', 'wppost_settings_post');
+
+	// obsolete - remove
+	Hook::unregister('post_local_end',   'addon/wppost/wppost.php', 'wppost_send');
+	Hook::unregister('addon_settings',  'addon/wppost/wppost.php', 'wppost_settings');
+	Hook::unregister('addon_settings_post',  'addon/wppost/wppost.php', 'wppost_settings_post');
+}
+
+
+function wppost_jot_nets(\Friendica\App &$a, array &$jotnets_fields)
+{
+	if (!local_user()) {
 		return;
 	}
 
-	if (DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'wppost', 'post')) {
+	if (PConfig::get(local_user(),'wppost','post')) {
 		$jotnets_fields[] = [
 			'type' => 'checkbox',
 			'field' => [
 				'wppost_enable',
-				DI::l10n()->t('Post to Wordpress'),
-				DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'wppost', 'post_by_default')
+				L10n::t('Post to Wordpress'),
+				PConfig::get(local_user(),'wppost','post_by_default')
 			]
 		];
 	}
 }
 
 
-function wppost_settings(array &$data)
-{
-	if (!DI::userSession()->getLocalUserId()) {
+function wppost_settings(&$a,&$s) {
+
+	if(! local_user())
 		return;
-	}
 
-	$enabled            = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'wppost', 'post', false);
-	$wp_username        = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'wppost', 'wp_username');
-	$wp_blog            = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'wppost', 'wp_blog');
-	$def_enabled        = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'wppost', 'post_by_default', false);
-	$back_enabled       = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'wppost', 'backlink', false);
-	$wp_backlink_text   = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'wppost', 'wp_backlink_text');
-	$shortcheck_enabled = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'wppost', 'shortcheck', false);
+	/* Add our stylesheet to the page so we can make our settings look nice */
 
-	$t    = Renderer::getMarkupTemplate('connector_settings.tpl', 'addon/wppost/');
-	$html = Renderer::replaceMacros($t, [
-		'$enabled'       => ['wppost', DI::l10n()->t('Enable Wordpress Post Addon'), $enabled],
-		'$username'      => ['wp_username', DI::l10n()->t('Wordpress username'), $wp_username],
-		'$password'      => ['wp_password', DI::l10n()->t('Wordpress password')],
-		'$blog'          => ['wp_blog', DI::l10n()->t('WordPress API URL'), $wp_blog],
-		'$bydefault'     => ['wp_bydefault', DI::l10n()->t('Post to Wordpress by default'), $def_enabled],
-		'$backlink'      => ['wp_backlink', DI::l10n()->t('Provide a backlink to the Friendica post'), $back_enabled],
-		'$backlink_text' => ['wp_backlink_text', DI::l10n()->t('Text for the backlink, e.g. Read the original post and comment stream on Friendica.'), $wp_backlink_text],
-		'$shortcheck'    => ['wp_shortcheck', DI::l10n()->t('Don\'t post messages that are too short'), $shortcheck_enabled],
-	]);
+	$a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->getBaseURL() . '/addon/wppost/wppost.css' . '" media="all" />' . "\r\n";
+
+	/* Get the current state of our config variables */
+
+	$enabled = PConfig::get(local_user(),'wppost','post');
+	$checked = (($enabled) ? ' checked="checked" ' : '');
+
+	$css = (($enabled) ? '' : '-disabled');
+
+	$def_enabled = PConfig::get(local_user(),'wppost','post_by_default');
+	$back_enabled = PConfig::get(local_user(),'wppost','backlink');
+	$shortcheck_enabled = PConfig::get(local_user(),'wppost','shortcheck');
+
+	$def_checked = (($def_enabled) ? ' checked="checked" ' : '');
+	$back_checked = (($back_enabled) ? ' checked="checked" ' : '');
+	$shortcheck_checked = (($shortcheck_enabled) ? ' checked="checked" ' : '');
+
+	$wp_username = PConfig::get(local_user(), 'wppost', 'wp_username');
+	$wp_password = PConfig::get(local_user(), 'wppost', 'wp_password');
+	$wp_blog = PConfig::get(local_user(), 'wppost', 'wp_blog');
+	$wp_backlink_text = PConfig::get(local_user(), 'wppost', 'wp_backlink_text');
+
+
+    /* Add some HTML to the existing form */
+
+    $s .= '<span id="settings_wppost_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_wppost_expanded\'); openClose(\'settings_wppost_inflated\');">';
+    $s .= '<img class="connector'.$css.'" src="images/wordpress.png" /><h3 class="connector">'. L10n::t('Wordpress Export').'</h3>';
+    $s .= '</span>';
+    $s .= '<div id="settings_wppost_expanded" class="settings-block" style="display: none;">';
+    $s .= '<span class="fakelink" onclick="openClose(\'settings_wppost_expanded\'); openClose(\'settings_wppost_inflated\');">';
+    $s .= '<img class="connector'.$css.'" src="images/wordpress.png" /><h3 class="connector">'. L10n::t('Wordpress Export').'</h3>';
+    $s .= '</span>';
+    $s .= '<div id="wppost-enable-wrapper">';
+    $s .= '<label id="wppost-enable-label" for="wppost-checkbox">' . L10n::t('Enable WordPress Post Addon') . '</label>';
+    $s .= '<input id="wppost-checkbox" type="checkbox" name="wppost" value="1" ' . $checked . '/>';
+    $s .= '</div><div class="clear"></div>';
+
+    $s .= '<div id="wppost-username-wrapper">';
+    $s .= '<label id="wppost-username-label" for="wppost-username">' . L10n::t('WordPress username') . '</label>';
+    $s .= '<input id="wppost-username" type="text" name="wp_username" value="' . $wp_username . '" />';
+    $s .= '</div><div class="clear"></div>';
+
+    $s .= '<div id="wppost-password-wrapper">';
+    $s .= '<label id="wppost-password-label" for="wppost-password">' . L10n::t('WordPress password') . '</label>';
+    $s .= '<input id="wppost-password" type="password" name="wp_password" value="' . $wp_password . '" />';
+    $s .= '</div><div class="clear"></div>';
+
+    $s .= '<div id="wppost-blog-wrapper">';
+    $s .= '<label id="wppost-blog-label" for="wppost-blog">' . L10n::t('WordPress API URL') . '</label>';
+    $s .= '<input id="wppost-blog" type="text" name="wp_blog" value="' . $wp_blog . '" />';
+    $s .= '</div><div class="clear"></div>';
+
+    $s .= '<div id="wppost-bydefault-wrapper">';
+    $s .= '<label id="wppost-bydefault-label" for="wppost-bydefault">' . L10n::t('Post to WordPress by default') . '</label>';
+    $s .= '<input id="wppost-bydefault" type="checkbox" name="wp_bydefault" value="1" ' . $def_checked . '/>';
+    $s .= '</div><div class="clear"></div>';
+
+    $s .= '<div id="wppost-backlink-wrapper">';
+    $s .= '<label id="wppost-backlink-label" for="wppost-backlink">' . L10n::t('Provide a backlink to the Friendica post') . '</label>';
+    $s .= '<input id="wppost-backlink" type="checkbox" name="wp_backlink" value="1" ' . $back_checked . '/>';
+    $s .= '</div><div class="clear"></div>';
+    $s .= '<div id="wppost-backlinktext-wrapper">';
+    $s .= '<label id="wppost-backlinktext-label" for="wp_backlink_text">' . L10n::t('Text for the backlink, e.g. Read the original post and comment stream on Friendica.') . '</label>';
+    $s .= '<input id="wppost-backlinktext" type="text" name="wp_backlink_text" value="'. $wp_backlink_text.'" ' . $wp_backlink_text . '/>';
+    $s .= '</div><div class="clear"></div>';
+
+    $s .= '<div id="wppost-shortcheck-wrapper">';
+    $s .= '<label id="wppost-shortcheck-label" for="wppost-shortcheck">' . L10n::t("Don't post messages that are too short") . '</label>';
+    $s .= '<input id="wppost-shortcheck" type="checkbox" name="wp_shortcheck" value="1" '.$shortcheck_checked.'/>';
+    $s .= '</div><div class="clear"></div>';
+
+    /* provide a submit button */
+
+    $s .= '<div class="settings-submit-wrapper" ><input type="submit" id="wppost-submit" name="wppost-submit" class="settings-submit" value="' . L10n::t('Save Settings') . '" /></div></div>';
 
-	$data = [
-		'connector' => 'wppost',
-		'title'     => DI::l10n()->t('Wordpress Export'),
-		'image'     => 'images/wordpress.png',
-		'enabled'   => $enabled,
-		'html'      => $html,
-	];
 }
 
 
-function wppost_settings_post(array &$b)
-{
-	if (!empty($_POST['wppost-submit'])) {
-		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'wppost', 'post', intval($_POST['wppost']));
-		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'wppost', 'post_by_default', intval($_POST['wp_bydefault']));
-		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'wppost', 'wp_username',   trim($_POST['wp_username']));
-		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'wppost', 'wp_password',   trim($_POST['wp_password']));
-		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'wppost', 'wp_blog',   trim($_POST['wp_blog']));
-		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'wppost', 'backlink', intval($_POST['wp_backlink']));
-		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'wppost', 'shortcheck', intval($_POST['wp_shortcheck']));
-		$wp_backlink_text = BBCode::convertForUriId(User::getSystemUriId(), trim($_POST['wp_backlink_text']), BBCode::BACKLINK);
+function wppost_settings_post(&$a,&$b) {
+
+	if(!empty($_POST['wppost-submit'])) {
+		PConfig::set(local_user(),'wppost','post',intval($_POST['wppost']));
+		PConfig::set(local_user(),'wppost','post_by_default',intval($_POST['wp_bydefault'] ?? false));
+		PConfig::set(local_user(),'wppost','wp_username',trim($_POST['wp_username']));
+		PConfig::set(local_user(),'wppost','wp_password',trim($_POST['wp_password']));
+		PConfig::set(local_user(),'wppost','wp_blog',trim($_POST['wp_blog']));
+		PConfig::set(local_user(),'wppost','backlink',trim($_POST['wp_backlink'] ?? ''));
+		PConfig::set(local_user(),'wppost','shortcheck',trim($_POST['wp_shortcheck']));
+		$wp_backlink_text = Strings::escapeTags(trim($_POST['wp_backlink_text']));
+		$wp_backlink_text = BBCode::convert($wp_backlink_text, false, 8);
 		$wp_backlink_text = HTML::toPlaintext($wp_backlink_text, 0, true);
-		DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'wppost', 'wp_backlink_text', $wp_backlink_text);
+		PConfig::set(local_user(),'wppost','wp_backlink_text', $wp_backlink_text);
 	}
+
 }
 
-function wppost_hook_fork(array &$b)
+function wppost_hook_fork(&$a, &$b)
 {
 	if ($b['name'] != 'notifier_normal') {
 		return;
@@ -107,17 +173,14 @@ function wppost_hook_fork(array &$b)
 
 	$post = $b['data'];
 
-	if (
-		$post['deleted'] || $post['private'] || ($post['created'] !== $post['edited']) ||
-		!strstr($post['postopts'] ?? '', 'wppost') || ($post['parent'] != $post['id'])
-	) {
+	if ($post['deleted'] || $post['private'] || ($post['created'] !== $post['edited']) ||
+		!strstr($post['postopts'], 'wppost') || ($post['parent'] != $post['id'])) {
 		$b['execute'] = false;
 		return;
 	}
 }
 
-function wppost_post_local(array &$b)
-{
+function wppost_post_local(&$a, &$b) {
 
 	// This can probably be changed to allow editing by pointing to a different API endpoint
 
@@ -125,7 +188,7 @@ function wppost_post_local(array &$b)
 		return;
 	}
 
-	if (!DI::userSession()->getLocalUserId() || (DI::userSession()->getLocalUserId() != $b['uid'])) {
+	if (!local_user() || (local_user() != $b['uid'])) {
 		return;
 	}
 
@@ -133,11 +196,11 @@ function wppost_post_local(array &$b)
 		return;
 	}
 
-	$wp_post   = intval(DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'wppost', 'post'));
+	$wp_post   = intval(PConfig::get(local_user(),'wppost','post'));
 
 	$wp_enable = (($wp_post && !empty($_REQUEST['wppost_enable'])) ? intval($_REQUEST['wppost_enable']) : 0);
 
-	if ($b['api_source'] && intval(DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'wppost', 'post_by_default'))) {
+	if ($b['api_source'] && intval(PConfig::get(local_user(),'wppost','post_by_default'))) {
 		$wp_enable = 1;
 	}
 
@@ -155,43 +218,49 @@ function wppost_post_local(array &$b)
 
 
 
-function wppost_send(array &$b)
+function wppost_send(&$a, &$b)
 {
-	if ($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited'])) {
+	if($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited'])) {
 		return;
 	}
 
-	if (!strstr($b['postopts'], 'wppost')) {
+	if(! strstr($b['postopts'],'wppost')) {
 		return;
 	}
 
-	if ($b['gravity'] != Item::GRAVITY_PARENT) {
+	if($b['parent'] != $b['id']) {
 		return;
 	}
 
 	// Dont't post if the post doesn't belong to us.
-	// This is a check for group postings
+	// This is a check for forum postings
 	$self = DBA::selectFirst('contact', ['id'], ['uid' => $b['uid'], 'self' => true]);
 	if ($b['contact-id'] != $self['id']) {
 		return;
 	}
 
-	$b['body'] = Post\Media::addAttachmentsToBody($b['uri-id'], DI::contentItem()->addSharedPost($b));
-
-	$wp_username = XML::escape(DI::pConfig()->get($b['uid'], 'wppost', 'wp_username'));
-	$wp_password = XML::escape(DI::pConfig()->get($b['uid'], 'wppost', 'wp_password'));
-	$wp_blog = DI::pConfig()->get($b['uid'], 'wppost', 'wp_blog');
-	$wp_backlink_text = DI::pConfig()->get($b['uid'], 'wppost', 'wp_backlink_text');
+	$wp_username = XML::escape(PConfig::get($b['uid'], 'wppost', 'wp_username'));
+	$wp_password = XML::escape(PConfig::get($b['uid'], 'wppost', 'wp_password'));
+	$wp_blog = PConfig::get($b['uid'],'wppost','wp_blog');
+	$wp_backlink_text = PConfig::get($b['uid'],'wppost','wp_backlink_text');
 	if ($wp_backlink_text == '') {
-		$wp_backlink_text = DI::l10n()->t('Read the orig­i­nal post and com­ment stream on Friendica');
+		$wp_backlink_text = L10n::t('Read the orig­i­nal post and com­ment stream on Friendica');
 	}
 
 	if ($wp_username && $wp_password && $wp_blog) {
 		$wptitle = trim($b['title']);
 
-		if (intval(DI::pConfig()->get($b['uid'], 'wppost', 'shortcheck'))) {
+		if (intval(PConfig::get($b['uid'], 'wppost', 'shortcheck'))) {
 			// Checking, if its a post that is worth a blog post
-			$postentry = (bool)Post\Media::getByURIId($b['uri-id'], [Post\Media::HTML, Post\Media::AUDIO, Post\Media::VIDEO, Post\Media::IMAGE]);
+			$postentry = false;
+			$siteinfo = BBCode::getAttachedData($b["body"]);
+
+			// Is it a link to an aricle, a video or a photo?
+			if (isset($siteinfo["type"])) {
+				if (in_array($siteinfo["type"], ["link", "audio", "video", "photo"])) {
+					$postentry = true;
+				}
+			}
 
 			// Does it have a title?
 			if ($wptitle != "") {
@@ -211,17 +280,17 @@ function wppost_send(array &$b)
 		// If the title is empty then try to guess
 		if ($wptitle == '') {
 			// Fetch information about the post
-			$media = Post\Media::getByURIId($b['uri-id'], [Post\Media::HTML]);
-			if (!empty($media) && !empty($media[0]['name']) && ($media[0]['name'] != $media[0]['url'])) {
-				$wptitle = $media[0]['name'];
+			$siteinfo = BBCode::getAttachedData($b["body"]);
+			if (isset($siteinfo["title"])) {
+				$wptitle = $siteinfo["title"];
 			}
 
 			// If no bookmark is found then take the first line
 			if ($wptitle == '') {
 				// Remove the share element before fetching the first line
-				$title = trim(preg_replace("/\[share.*?\](.*?)\[\/share\]/ism", "\n$1\n", $b['body']));
+				$title = trim(preg_replace("/\[share.*?\](.*?)\[\/share\]/ism","\n$1\n",$b['body']));
 
-				$title = BBCode::toPlaintext($title) . "\n";
+				$title = HTML::toPlaintext(BBCode::convert($title, false), 0, true)."\n";
 				$pos = strpos($title, "\n");
 				$trailer = "";
 				if (($pos == 0) || ($pos > 100)) {
@@ -229,22 +298,23 @@ function wppost_send(array &$b)
 					$trailer = "...";
 				}
 
-				$wptitle = substr($title, 0, $pos) . $trailer;
+				$wptitle = substr($title, 0, $pos).$trailer;
 			}
 		}
 
-		$title = '<title>' . (($wptitle) ? $wptitle : DI::l10n()->t('Post from Friendica')) . '</title>';
-		$post = BBCode::convertForUriId($b['uri-id'], $b['body'], BBCode::CONNECTORS);
+		$title = '<title>' . (($wptitle) ? $wptitle : L10n::t('Post from Friendica')) . '</title>';
+		$post = BBCode::convert($b['body'], false, 4);
 
 		// If a link goes to youtube then remove the stuff around it. Wordpress detects youtube links and embeds it
-		$post = preg_replace('/<a.*?href="(https?:\/\/www.youtube.com\/.*?)".*?>(.*?)<\/a>/ism', "\n$1\n", $post);
-		$post = preg_replace('/<a.*?href="(https?:\/\/youtu.be\/.*?)".*?>(.*?)<\/a>/ism', "\n$1\n", $post);
+		$post = preg_replace('/<a.*?href="(https?:\/\/www.youtube.com\/.*?)".*?>(.*?)<\/a>/ism',"\n$1\n",$post);
+		$post = preg_replace('/<a.*?href="(https?:\/\/youtu.be\/.*?)".*?>(.*?)<\/a>/ism',"\n$1\n",$post);
 
-		$post = $title . $post;
+		$post = $title.$post;
 
-		$wp_backlink = intval(DI::pConfig()->get($b['uid'], 'wppost', 'backlink'));
-		if ($wp_backlink && $b['plink']) {
-			$post .= '<p><a href="' . $b['plink'] . '">' . $wp_backlink_text . '</a></p>';
+		$wp_backlink = intval(PConfig::get($b['uid'],'wppost','backlink'));
+		if($wp_backlink && $b['plink']) {
+			$post .= EOL . EOL . '<a href="' . $b['plink'] . '">'
+				. $wp_backlink_text . '</a>' . EOL . EOL;
 		}
 
 		$post = XML::escape($post);
@@ -266,11 +336,11 @@ function wppost_send(array &$b)
 
 EOT;
 
-		Logger::debug('wppost: data: ' . $xml);
+		Logger::log('wppost: data: ' . $xml, Logger::DATA);
 
 		if ($wp_blog !== 'test') {
-			$x = DI::httpClient()->post($wp_blog, $xml)->getBodyString();
+			$x = Network::post($wp_blog, $xml)->getBody();
 		}
-		Logger::info('posted to wordpress: ' . (($x) ? $x : ''));
+		Logger::log('posted to wordpress: ' . (($x) ? $x : ''), Logger::DEBUG);
 	}
 }
diff --git a/xmpp/converse/CONTRIBUTING.rst b/xmpp/converse/CONTRIBUTING.rst
new file mode 100644
index 00000000..49d71933
--- /dev/null
+++ b/xmpp/converse/CONTRIBUTING.rst
@@ -0,0 +1,37 @@
+=======================
+Contribution Guidelines
+=======================
+
+Thanks for contributing to `Converse.js <http://conversejs.org>`_.
+
+Support questions
+=================
+Please ask support and setup questions on the mailing list: conversejs@librelist.com
+
+The issue tracker is only for bugs (i.e. issues) and feature requests.
+
+Contributing Code
+=================
+Please follow the usual github workflow. Create your own local fork of this repository,
+make your changes and then submit a pull request.
+
+Before submitting a pull request
+--------------------------------
+
+Please read the `style guide <https://conversejs.org/docs/html/style_guide.html>`_ and make sure that your code follows it.
+
+Add tests for your bugfix or feature
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Add a test for any bug fixed or feature added. We use Jasmine
+for testing. 
+
+Take a look at `tests.html <https://github.com/jcbrand/converse.js/blob/master/tests.html>`_
+and the `spec files <https://github.com/jcbrand/converse.js/blob/master/tests.html>`_
+to see how tests are implemented.
+
+Check that the tests pass
+~~~~~~~~~~~~~~~~~~~~~~~~~
+Check that all tests complete sucessfully.
+
+Run ``make check`` in your terminal or open `tests.html <https://github.com/jcbrand/converse.js/blob/master/tests.html>`_
+in your browser.
diff --git a/xmpp/converse/README.rst b/xmpp/converse/README.rst
new file mode 100644
index 00000000..96b61a76
--- /dev/null
+++ b/xmpp/converse/README.rst
@@ -0,0 +1,110 @@
+===========
+converse.js
+===========
+
+.. figure:: https://api.travis-ci.org/jcbrand/converse.js.png?branch=master
+   :alt: Build Status
+
+`Converse.js <https://conversejs.org>`_ is a web based `XMPP/Jabber <http://xmpp.org>`_
+instant messaging client.
+
+It enables you to add chat functionality to your website, independent of any
+specific backend. You will however need an XMPP server to connect to, either
+your own, or a public one.
+
+--------
+Features
+--------
+
+It has the following features:
+
+* Single-user chat
+* Multi-user chat rooms `XEP 45 <http://xmpp.org/extensions/xep-0045.html>`_
+* Direct invitations to chat rooms `XEP 249 <http://xmpp.org/extensions/xep-0249.html>`_
+* vCard support `XEP 54 <http://xmpp.org/extensions/xep-0054.html>`_
+* Service discovery `XEP 30 <http://xmpp.org/extensions/xep-0030.html>`_
+* In-band registration `XEP 77 <http://xmpp.org/extensions/xep-0077.html>`_
+* Contact rosters and groups
+* Contact subscriptions
+* Roster item exchange `XEP 144 <http://xmpp.org/extensions/tmp/xep-0144-1.1.html>`_
+* Chat statuses (online, busy, away, offline)
+* Custom status messages
+* Typing and state notifications `XEP 85 <http://xmpp.org/extensions/xep-0085.html>`_
+* Messages appear in all connnected chat clients `XEP 280 <http://xmpp.org/extensions/xep-0280.html>`_
+* Third person "/me" messages `XEP 245 <http://xmpp.org/extensions/xep-0245.html>`_
+* XMPP Ping `XEP 199 <http://xmpp.org/extensions/xep-0199.html>`_
+* Server-side archiving of messages `XEP 313 <http://xmpp.org/extensions/xep-0313.html>`_
+* Client state indication `XEP 352 <http://xmpp.org/extensions/xep-0352.html>`_
+* Off-the-record encryption
+* Translated into 16 languages
+
+-----------
+Screencasts
+-----------
+
+* `In a static HTML page`_. Here we chat to external XMPP accounts on Jabber.org and Gmail.
+* `Integrated into a Plone site`_ via collective.xmpp.chat.
+* `Off-the-record encryption <https://opkode.com/media/blog/2013/11/11/conversejs-otr-support>`_ in Converse 0.7.
+
+Integration into other frameworks
+---------------------------------
+
+* `Plone <http://plone.org>`_: 
+    `collective.xmpp.chat <http://github.com/collective/collective.xmpp.chat>`_ is an add-on for Plone that uses *Converse.js*. Together with `collective.xmpp.core <http://github.com/collective/collective.xmpp.core>`_, it provides for single-signon-support (SSO) and also enables you to manually or automatically register your Plone users onto your XMPP server.
+* `Django <http://www.djangoproject.com>`_: 
+    `django-conversejs <https://pypi.python.org/pypi/django-conversejs>`_ is an app that makes it easer to integrate *Converse.js* into Django.
+    `django-xmpp <https://github.com/fpytloun/django-xmpp>`_ adds XMPP chat integration with converse.js by letting Ejabberd authenticate against your Django site.
+* `Roundcube <http://roundcube.net>`_: 
+    `roundcube-converse.js-xmpp-plugin <https://github.com/priyadi/roundcube-converse.js-xmpp-plugin>`_ is an addon for Roundcube Webmail.
+* `Wordpress <http://wordpress.org>`_:
+    `ConverseJS <http://wordpress.org/plugins/conversejs>`_
+* `Patternslib <http://patternslib.com>`_:
+    `patterns.converse <https://github.com/jcbrand/patterns.converse>`_ provides a Patternslib pattern for Converse.js
+* `Alfresco <http://www.alfresco.com>`_:
+    `alfresco-js-chat-share`_: `alfresco-js-chat-share <https://github.com/keensoft/alfresco-js-chat-share>`_
+
+----
+Demo
+----
+
+A live demo is available at `<https://conversejs.org>`_
+
+-----
+Tests
+-----
+
+We use behavior-driven tests written with `jasmine.js <http://pivotal.github.io/jasmine>`_.
+
+Open `tests.html <https://github.com/jcbrand/converse.js/blob/master/tests.html>`_
+in your browser, and the tests will run automatically.
+
+-------------
+Documentation
+-------------
+
+The developer/integrator documentation can be found at `<https://conversejs.org/docs/html>`_.
+
+-------
+Licence
+-------
+
+``Converse.js`` is released under the `Mozilla Public License (MPL) <https://www.mozilla.org/MPL/2.0/index.txt>`_.
+
+-------
+Support
+-------
+
+For support queries and discussions, please join the mailing list: conversejs@librelist.com
+
+Also take a look at the `mailing list archives <http://librelist.com/browser/conversejs>`_.
+
+Issues can be logged on the `Github issue tracker <https://github.com/jcbrand/converse.js/issues>`_.
+
+----------------------------------
+Donations and tips are appreciated
+----------------------------------
+
+* Bitcoin: 16FsPqE9DhFTryxrUenpsGX4LJ1TPu8GqS
+
+.. _`Integrated into a Plone site`: http://opkode.com/media/blog/instant-messaging-for-plone-with-javascript-and-xmpp
+.. _`In a static HTML page`: http://opkode.com/media/blog/2013/04/02/converse.js-xmpp-instant-messaging-with-javascript
diff --git a/xmpp/converse/builds/converse.min.js b/xmpp/converse/builds/converse.min.js
new file mode 100644
index 00000000..7ac83109
--- /dev/null
+++ b/xmpp/converse/builds/converse.min.js
@@ -0,0 +1,237 @@
+/**
+ * @license almond 0.3.1 Copyright (c) 2011-2014, The Dojo Foundation All Rights Reserved.
+ * Available via the MIT or new BSD license.
+ * see: http://github.com/jrburke/almond for details
+ */
+
+/*!
+ * jQuery JavaScript Library v1.11.0
+ * http://jquery.com/
+ *
+ * Includes Sizzle.js
+ * http://sizzlejs.com/
+ *
+ * Copyright 2005, 2014 jQuery Foundation, Inc. and other contributors
+ * Released under the MIT license
+ * http://jquery.org/license
+ *
+ * Date: 2014-01-23T21:02Z
+ */
+
+/*!
+ * Sizzle CSS Selector Engine v1.10.16
+ * http://sizzlejs.com/
+ *
+ * Copyright 2013 jQuery Foundation, Inc. and other contributors
+ * Released under the MIT license
+ * http://jquery.org/license
+ *
+ * Date: 2014-01-13
+ */
+
+//     Underscore.js 1.8.3
+//     http://underscorejs.org
+//     (c) 2009-2015 Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
+//     Underscore may be freely distributed under the MIT license.
+
+/**
+ * @license RequireJS text 2.0.14 Copyright (c) 2010-2014, The Dojo Foundation All Rights Reserved.
+ * Available via the MIT or new BSD license.
+ * see: http://github.com/requirejs/text for details
+ */
+
+// RequireJS UnderscoreJS template addon
+// http://github.com/jfparadis/requirejs-tpl
+//
+// An alternative to http://github.com/ZeeAgency/requirejs-tpl
+//
+// Using UnderscoreJS micro-templates at http://underscorejs.org/#template
+// Using and RequireJS text.js at http://requirejs.org/docs/api.html#text
+// @author JF Paradis
+// @version 0.0.2
+//
+// Released under the MIT license
+//
+// Usage:
+//   require(['backbone', 'tpl!mytemplate'], function (Backbone, mytemplate) {
+//     return Backbone.View.extend({
+//       initialize: function(){
+//         this.render();
+//       },
+//       render: function(){
+//         this.$el.html(mytemplate({message: 'hello'}));
+//     });
+//   });
+//
+// Configuration: (optional)
+//   require.config({
+//     tpl: {
+//       extension: '.tpl' // default = '.html'
+//     }
+//   });
+
+/*
+jed.js
+v0.5.0beta
+
+https://github.com/SlexAxton/Jed
+-----------
+A gettext compatible i18n library for modern JavaScript Applications
+
+by Alex Sexton - AlexSexton [at] gmail - @SlexAxton
+WTFPL license for use
+Dojo CLA for contributions
+
+Jed offers the entire applicable GNU gettext spec'd set of
+functions, but also offers some nicer wrappers around them.
+The api for gettext was written for a language with no function
+overloading, so Jed allows a little more of that.
+
+Many thanks to Joshua I. Miller - unrtst@cpan.org - who wrote
+gettext.js back in 2008. I was able to vet a lot of my ideas
+against his. I also made sure Jed passed against his tests
+in order to offer easy upgrades -- jsgettext.berlios.de
+*/
+
+// Underscore 1.3.0 was used to port and is licensed
+
+/**
+   sprintf() for JavaScript 0.7-beta1
+   http://www.diveintojavascript.com/projects/javascript-sprintf
+
+   Copyright (c) Alexandru Marasteanu <alexaholic [at) gmail (dot] com>
+   All rights reserved.
+
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions are met:
+       * Redistributions of source code must retain the above copyright
+         notice, this list of conditions and the following disclaimer.
+       * Redistributions in binary form must reproduce the above copyright
+         notice, this list of conditions and the following disclaimer in the
+         documentation and/or other materials provided with the distribution.
+       * Neither the name of sprintf() for JavaScript nor the
+         names of its contributors may be used to endorse or promote products
+         derived from this software without specific prior written permission.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+   ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+   WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+   DISCLAIMED. IN NO EVENT SHALL Alexandru Marasteanu BE LIABLE FOR ANY
+   DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+   (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+   LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+   ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  */
+
+/*!
+ * jQuery Browser Plugin 0.0.8
+ * https://github.com/gabceb/jquery-browser-plugin
+ *
+ * Original jquery-browser code Copyright 2005, 2015 jQuery Foundation, Inc. and other contributors
+ * http://jquery.org/license
+ *
+ * Modifications Copyright 2015 Gabriel Cebrian
+ * https://github.com/gabceb
+ *
+ * Released under the MIT license
+ *
+ * Date: 05-07-2015
+ */
+
+/*
+CryptoJS v3.1.2
+code.google.com/p/crypto-js
+(c) 2009-2013 by Jeff Mott. All rights reserved.
+code.google.com/p/crypto-js/wiki/License
+*/
+
+/*!
+ * EventEmitter v4.2.3 - git.io/ee
+ * Oliver Caldwell
+ * MIT license
+ * @preserve
+ */
+
+/*!
+
+  otr.js v0.2.12 - 2014-04-15
+  (c) 2014 - Arlo Breault <arlolra@gmail.com>
+  Freely distributed under the MPL v2.0 license.
+
+  This file is concatenated for the browser.
+  Please see: https://github.com/arlolra/otr
+
+*/
+
+//! moment.js
+//! version : 2.10.6
+//! authors : Tim Wood, Iskren Chernev, Moment.js contributors
+//! license : MIT
+//! momentjs.com
+
+/*
+ * A JavaScript implementation of the Secure Hash Algorithm, SHA-1, as defined
+ * in FIPS PUB 180-1
+ * Version 2.1a Copyright Paul Johnston 2000 - 2002.
+ * Other contributors: Greg Holt, Andrew Kepert, Ydnar, Lostinet
+ * Distributed under the BSD License
+ * See http://pajhome.org.uk/crypt/md5 for details.
+ */
+
+/*
+ * A JavaScript implementation of the RSA Data Security, Inc. MD5 Message
+ * Digest Algorithm, as defined in RFC 1321.
+ * Version 2.1 Copyright (C) Paul Johnston 1999 - 2002.
+ * Other contributors: Greg Holt, Andrew Kepert, Ydnar, Lostinet
+ * Distributed under the BSD License
+ * See http://pajhome.org.uk/crypt/md5 for more info.
+ */
+
+/*
+    This program is distributed under the terms of the MIT license.
+    Please see the LICENSE file for details.
+
+    Copyright 2006-2008, OGG, LLC
+*/
+
+/*
+  Copyright 2010, François de Metz <francois@2metz.fr>
+*/
+
+/*
+* Based on Ping Strophejs plugins (https://github.com/metajack/strophejs-plugins/tree/master/ping)
+* This addon is distributed under the terms of the MIT licence.
+* Please see the LICENCE file for details.
+*
+* Copyright (c) Markus Kohlhase, 2010
+* Refactored by Pavel Lang, 2011
+*/
+
+//     (c) 2010-2014 Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
+//     Backbone may be freely distributed under the MIT license.
+//     For all details and documentation:
+//     http://backbonejs.org
+
+/*!
+ * Backbone.Overview 
+ *
+ * Copyright (c) 2014, JC Brand <jc@opkode.com>
+ * Licensed under the Mozilla Public License (MPL) 
+ */
+
+/*!
+ * typeahead.js 0.10.5
+ * https://github.com/twitter/typeahead.js
+ * Copyright 2013-2014 Twitter, Inc. and other contributors; Licensed MIT
+ */
+
+// Converse.js (A browser based XMPP chat client)
+// http://conversejs.org
+//
+// Copyright (c) 2012-2015, Jan-Carel Brand <jc@opkode.com>
+// Licensed under the Mozilla Public License (MPLv2)
+//
+
+var requirejs,require,define;(function(e){function h(e,t){return f.call(e,t)}function p(e,t){var n,r,i,s,o,a,f,l,h,p,d,v=t&&t.split("/"),m=u.map,g=m&&m["*"]||{};if(e&&e.charAt(0)===".")if(t){e=e.split("/"),o=e.length-1,u.nodeIdCompat&&c.test(e[o])&&(e[o]=e[o].replace(c,"")),e=v.slice(0,v.length-1).concat(e);for(h=0;h<e.length;h+=1){d=e[h];if(d===".")e.splice(h,1),h-=1;else if(d===".."){if(h===1&&(e[2]===".."||e[0]===".."))break;h>0&&(e.splice(h-1,2),h-=2)}}e=e.join("/")}else e.indexOf("./")===0&&(e=e.substring(2));if((v||g)&&m){n=e.split("/");for(h=n.length;h>0;h-=1){r=n.slice(0,h).join("/");if(v)for(p=v.length;p>0;p-=1){i=m[v.slice(0,p).join("/")];if(i){i=i[r];if(i){s=i,a=h;break}}}if(s)break;!f&&g&&g[r]&&(f=g[r],l=h)}!s&&f&&(s=f,a=l),s&&(n.splice(0,a,s),e=n.join("/"))}return e}function d(t,r){return function(){var i=l.call(arguments,0);return typeof i[0]!="string"&&i.length===1&&i.push(null),n.apply(e,i.concat([t,r]))}}function v(e){return function(t){return p(t,e)}}function m(e){return function(t){s[e]=t}}function g(n){if(h(o,n)){var r=o[n];delete o[n],a[n]=!0,t.apply(e,r)}if(!h(s,n)&&!h(a,n))throw new Error("No "+n);return s[n]}function y(e){var t,n=e?e.indexOf("!"):-1;return n>-1&&(t=e.substring(0,n),e=e.substring(n+1,e.length)),[t,e]}function b(e){return function(){return u&&u.config&&u.config[e]||{}}}var t,n,r,i,s={},o={},u={},a={},f=Object.prototype.hasOwnProperty,l=[].slice,c=/\.js$/;r=function(e,t){var n,r=y(e),i=r[0];return e=r[1],i&&(i=p(i,t),n=g(i)),i?n&&n.normalize?e=n.normalize(e,v(t)):e=p(e,t):(e=p(e,t),r=y(e),i=r[0],e=r[1],i&&(n=g(i))),{f:i?i+"!"+e:e,n:e,pr:i,p:n}},i={require:function(e){return d(e)},exports:function(e){var t=s[e];return typeof t!="undefined"?t:s[e]={}},module:function(e){return{id:e,uri:"",exports:s[e],config:b(e)}}},t=function(t,n,u,f){var l,c,p,v,y,b=[],w=typeof u,E;f=f||t;if(w==="undefined"||w==="function"){n=!n.length&&u.length?["require","exports","module"]:n;for(y=0;y<n.length;y+=1){v=r(n[y],f),c=v.f;if(c==="require")b[y]=i.require(t);else if(c==="exports")b[y]=i.exports(t),E=!0;else if(c==="module")l=b[y]=i.module(t);else if(h(s,c)||h(o,c)||h(a,c))b[y]=g(c);else{if(!v.p)throw new Error(t+" missing "+c);v.p.load(v.n,d(f,!0),m(c),{}),b[y]=s[c]}}p=u?u.apply(s[t],b):undefined;if(t)if(l&&l.exports!==e&&l.exports!==s[t])s[t]=l.exports;else if(p!==e||!E)s[t]=p}else t&&(s[t]=u)},requirejs=require=n=function(s,o,a,f,l){if(typeof s=="string")return i[s]?i[s](o):g(r(s,o).f);if(!s.splice){u=s,u.deps&&n(u.deps,u.callback);if(!o)return;o.splice?(s=o,o=a,a=null):s=e}return o=o||function(){},typeof a=="function"&&(a=f,f=l),f?t(e,s,o,a):setTimeout(function(){t(e,s,o,a)},4),n},n.config=function(e){return n(e)},requirejs._defined=s,define=function(e,t,n){if(typeof e!="string")throw new Error("See almond README: incorrect module build, no module name");t.splice||(n=t,t=[]),!h(s,e)&&!h(o,e)&&(o[e]=[e,t,n])},define.amd={jQuery:!0}})(),define("components/almond/almond.js",function(){}),function(e,t){typeof module=="object"&&typeof module.exports=="object"?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw new Error("jQuery requires a window with a document");return t(e)}:t(e)}(typeof window!="undefined"?window:this,function(e,t){function y(e){var t=e.length,n=p.type(e);return n==="function"||p.isWindow(e)?!1:e.nodeType===1&&t?!0:n==="array"||t===0||typeof t=="number"&&t>0&&t-1 in e}function x(e,t,n){if(p.isFunction(t))return p.grep(e,function(e,r){return!!t.call(e,r,e)!==n});if(t.nodeType)return p.grep(e,function(e){return e===t!==n});if(typeof t=="string"){if(S.test(t))return p.filter(t,e,n);t=p.filter(t,e)}return p.grep(e,function(e){return p.inArray(e,t)>=0!==n})}function O(e,t){do e=e[t];while(e&&e.nodeType!==1);return e}function D(e){var t=_[e]={};return p.each(e.match(M)||[],function(e,n){t[n]=!0}),t}function H(){N.addEventListener?(N.removeEventListener("DOMContentLoaded",B,!1),e.removeEventListener("load",B,!1)):(N.detachEvent("onreadystatechange",B),e.detachEvent("onload",B))}function B(){if(N.addEventListener||event.type==="load"||N.readyState==="complete")H(),p.ready()}function R(e,t,n){if(n===undefined&&e.nodeType===1){var r="data-"+t.replace(q,"-$1").toLowerCase();n=e.getAttribute(r);if(typeof n=="string"){try{n=n==="true"?!0:n==="false"?!1:n==="null"?null:+n+""===n?+n:I.test(n)?p.parseJSON(n):n}catch(i){}p.data(e,t,n)}else n=undefined}return n}function U(e){var t;for(t in e){if(t==="data"&&p.isEmptyObject(e[t]))continue;if(t!=="toJSON")return!1}return!0}function z(e,t,r,i){if(!p.acceptData(e))return;var s,o,u=p.expando,a=e.nodeType,f=a?p.cache:e,l=a?e[u]:e[u]&&u;if((!l||!f[l]||!i&&!f[l].data)&&r===undefined&&typeof t=="string")return;l||(a?l=e[u]=n.pop()||p.guid++:l=u),f[l]||(f[l]=a?{}:{toJSON:p.noop});if(typeof t=="object"||typeof t=="function")i?f[l]=p.extend(f[l],t):f[l].data=p.extend(f[l].data,t);return o=f[l],i||(o.data||(o.data={}),o=o.data),r!==undefined&&(o[p.camelCase(t)]=r),typeof t=="string"?(s=o[t],s==null&&(s=o[p.camelCase(t)])):s=o,s}function W(e,t,n){if(!p.acceptData(e))return;var r,i,s=e.nodeType,o=s?p.cache:e,u=s?e[p.expando]:p.expando;if(!o[u])return;if(t){r=n?o[u]:o[u].data;if(r){p.isArray(t)?t=t.concat(p.map(t,p.camelCase)):t in r?t=[t]:(t=p.camelCase(t),t in r?t=[t]:t=t.split(" ")),i=t.length;while(i--)delete r[t[i]];if(n?!U(r):!p.isEmptyObject(r))return}}if(!n){delete o[u].data;if(!U(o[u]))return}s?p.cleanData([e],!0):c.deleteExpando||o!=o.window?delete o[u]:o[u]=null}function tt(){return!0}function nt(){return!1}function rt(){try{return N.activeElement}catch(e){}}function it(e){var t=st.split("|"),n=e.createDocumentFragment();if(n.createElement)while(t.length)n.createElement(t.pop());return n}function Et(e,t){var n,r,i=0,s=typeof e.getElementsByTagName!==j?e.getElementsByTagName(t||"*"):typeof e.querySelectorAll!==j?e.querySelectorAll(t||"*"):undefined;if(!s)for(s=[],n=e.childNodes||e;(r=n[i])!=null;i++)!t||p.nodeName(r,t)?s.push(r):p.merge(s,Et(r,t));return t===undefined||t&&p.nodeName(e,t)?p.merge([e],s):s}function St(e){K.test(e.type)&&(e.defaultChecked=e.checked)}function xt(e,t){return p.nodeName(e,"table")&&p.nodeName(t.nodeType!==11?t:t.firstChild,"tr")?e.getElementsByTagName("tbody")[0]||e.appendChild(e.ownerDocument.createElement("tbody")):e}function Tt(e){return e.type=(p.find.attr(e,"type")!==null)+"/"+e.type,e}function Nt(e){var t=mt.exec(e.type);return t?e.type=t[1]:e.removeAttribute("type"),e}function Ct(e,t){var n,r=0;for(;(n=e[r])!=null;r++)p._data(n,"globalEval",!t||p._data(t[r],"globalEval"))}function kt(e,t){if(t.nodeType!==1||!p.hasData(e))return;var n,r,i,s=p._data(e),o=p._data(t,s),u=s.events;if(u){delete o.handle,o.events={};for(n in u)for(r=0,i=u[n].length;r<i;r++)p.event.add(t,n,u[n][r])}o.data&&(o.data=p.extend({},o.data))}function Lt(e,t){var n,r,i;if(t.nodeType!==1)return;n=t.nodeName.toLowerCase();if(!c.noCloneEvent&&t[p.expando]){i=p._data(t);for(r in i.events)p.removeEvent(t,r,i.handle);t.removeAttribute(p.expando)}if(n==="script"&&t.text!==e.text)Tt(t).text=e.text,Nt(t);else if(n==="object")t.parentNode&&(t.outerHTML=e.outerHTML),c.html5Clone&&e.innerHTML&&!p.trim(t.innerHTML)&&(t.innerHTML=e.innerHTML);else if(n==="input"&&K.test(e.type))t.defaultChecked=t.checked=e.checked,t.value!==e.value&&(t.value=e.value);else if(n==="option")t.defaultSelected=t.selected=e.defaultSelected;else if(n==="input"||n==="textarea")t.defaultValue=e.defaultValue}function Mt(t,n){var r=p(n.createElement(t)).appendTo(n.body),i=e.getDefaultComputedStyle?e.getDefaultComputedStyle(r[0]).display:p.css(r[0],"display");return r.detach(),i}function _t(e){var t=N,n=Ot[e];if(!n){n=Mt(e,t);if(n==="none"||!n)At=(At||p("<iframe frameborder='0' width='0' height='0'/>")).appendTo(t.documentElement),t=(At[0].contentWindow||At[0].contentDocument).document,t.write(),t.close(),n=Mt(e,t),At.detach();Ot[e]=n}return n}function Ft(e,t){return{get:function(){var n=e();if(n==null)return;if(n){delete this.get;return}return(this.get=t).apply(this,arguments)}}}function $t(e,t){if(t in e)return t;var n=t.charAt(0).toUpperCase()+t.slice(1),r=t,i=Vt.length;while(i--){t=Vt[i]+n;if(t in e)return t}return r}function Jt(e,t){var n,r,i,s=[],o=0,u=e.length;for(;o<u;o++){r=e[o];if(!r.style)continue;s[o]=p._data(r,"olddisplay"),n=r.style.display,t?(!s[o]&&n==="none"&&(r.style.display=""),r.style.display===""&&$(r)&&(s[o]=p._data(r,"olddisplay",_t(r.nodeName)))):s[o]||(i=$(r),(n&&n!=="none"||!i)&&p._data(r,"olddisplay",i?n:p.css(r,"display")))}for(o=0;o<u;o++){r=e[o];if(!r.style)continue;if(!t||r.style.display==="none"||r.style.display==="")r.style.display=t?s[o]||"":"none"}return e}function Kt(e,t,n){var r=Ut.exec(t);return r?Math.max(0,r[1]-(n||0))+(r[2]||"px"):t}function Qt(e,t,n,r,i){var s=n===(r?"border":"content")?4:t==="width"?1:0,o=0;for(;s<4;s+=2)n==="margin"&&(o+=p.css(e,n+V[s],!0,i)),r?(n==="content"&&(o-=p.css(e,"padding"+V[s],!0,i)),n!=="margin"&&(o-=p.css(e,"border"+V[s]+"Width",!0,i))):(o+=p.css(e,"padding"+V[s],!0,i),n!=="padding"&&(o+=p.css(e,"border"+V[s]+"Width",!0,i)));return o}function Gt(e,t,n){var r=!0,i=t==="width"?e.offsetWidth:e.offsetHeight,s=Ht(e),o=c.boxSizing()&&p.css(e,"boxSizing",!1,s)==="border-box";if(i<=0||i==null){i=Bt(e,t,s);if(i<0||i==null)i=e.style[t];if(Pt.test(i))return i;r=o&&(c.boxSizingReliable()||i===e.style[t]),i=parseFloat(i)||0}return i+Qt(e,t,n||(o?"border":"content"),r,s)+"px"}function Yt(e,t,n,r,i){return new Yt.prototype.init(e,t,n,r,i)}function un(){return setTimeout(function(){Zt=undefined}),Zt=p.now()}function an(e,t){var n,r={height:e},i=0;t=t?1:0;for(;i<4;i+=2-t)n=V[i],r["margin"+n]=r["padding"+n]=e;return t&&(r.opacity=r.width=e),r}function fn(e,t,n){var r,i=(on[t]||[]).concat(on["*"]),s=0,o=i.length;for(;s<o;s++)if(r=i[s].call(n,t,e))return r}function ln(e,t,n){var r,i,s,o,u,a,f,l,h=this,d={},v=e.style,m=e.nodeType&&$(e),g=p._data(e,"fxshow");n.queue||(u=p._queueHooks(e,"fx"),u.unqueued==null&&(u.unqueued=0,a=u.empty.fire,u.empty.fire=function(){u.unqueued||a()}),u.unqueued++,h.always(function(){h.always(function(){u.unqueued--,p.queue(e,"fx").length||u.empty.fire()})})),e.nodeType===1&&("height"in t||"width"in t)&&(n.overflow=[v.overflow,v.overflowX,v.overflowY],f=p.css(e,"display"),l=_t(e.nodeName),f==="none"&&(f=l),f==="inline"&&p.css(e,"float")==="none"&&(!c.inlineBlockNeedsLayout||l==="inline"?v.display="inline-block":v.zoom=1)),n.overflow&&(v.overflow="hidden",c.shrinkWrapBlocks()||h.always(function(){v.overflow=n.overflow[0],v.overflowX=n.overflow[1],v.overflowY=n.overflow[2]}));for(r in t){i=t[r];if(tn.exec(i)){delete t[r],s=s||i==="toggle";if(i===(m?"hide":"show")){if(i!=="show"||!g||g[r]===undefined)continue;m=!0}d[r]=g&&g[r]||p.style(e,r)}}if(!p.isEmptyObject(d)){g?"hidden"in g&&(m=g.hidden):g=p._data(e,"fxshow",{}),s&&(g.hidden=!m),m?p(e).show():h.done(function(){p(e).hide()}),h.done(function(){var t;p._removeData(e,"fxshow");for(t in d)p.style(e,t,d[t])});for(r in d)o=fn(m?g[r]:0,r,h),r in g||(g[r]=o.start,m&&(o.end=o.start,o.start=r==="width"||r==="height"?1:0))}}function cn(e,t){var n,r,i,s,o;for(n in e){r=p.camelCase(n),i=t[r],s=e[n],p.isArray(s)&&(i=s[1],s=e[n]=s[0]),n!==r&&(e[r]=s,delete e[n]),o=p.cssHooks[r];if(o&&"expand"in o){s=o.expand(s),delete e[r];for(n in s)n in e||(e[n]=s[n],t[n]=i)}else t[r]=i}}function hn(e,t,n){var r,i,s=0,o=sn.length,u=p.Deferred().always(function(){delete a.elem}),a=function(){if(i)return!1;var t=Zt||un(),n=Math.max(0,f.startTime+f.duration-t),r=n/f.duration||0,s=1-r,o=0,a=f.tweens.length;for(;o<a;o++)f.tweens[o].run(s);return u.notifyWith(e,[f,s,n]),s<1&&a?n:(u.resolveWith(e,[f]),!1)},f=u.promise({elem:e,props:p.extend({},t),opts:p.extend(!0,{specialEasing:{}},n),originalProperties:t,originalOptions:n,startTime:Zt||un(),duration:n.duration,tweens:[],createTween:function(t,n){var r=p.Tween(e,f.opts,t,n,f.opts.specialEasing[t]||f.opts.easing);return f.tweens.push(r),r},stop:function(t){var n=0,r=t?f.tweens.length:0;if(i)return this;i=!0;for(;n<r;n++)f.tweens[n].run(1);return t?u.resolveWith(e,[f,t]):u.rejectWith(e,[f,t]),this}}),l=f.props;cn(l,f.opts.specialEasing);for(;s<o;s++){r=sn[s].call(f,e,l,f.opts);if(r)return r}return p.map(l,fn,f),p.isFunction(f.opts.start)&&f.opts.start.call(e,f),p.fx.timer(p.extend(a,{elem:e,anim:f,queue:f.opts.queue})),f.progress(f.opts.progress).done(f.opts.done,f.opts.complete).fail(f.opts.fail).always(f.opts.always)}function In(e){return function(t,n){typeof t!="string"&&(n=t,t="*");var r,i=0,s=t.toLowerCase().match(M)||[];if(p.isFunction(n))while(r=s[i++])r.charAt(0)==="+"?(r=r.slice(1)||"*",(e[r]=e[r]||[]).unshift(n)):(e[r]=e[r]||[]).push(n)}}function qn(e,t,n,r){function o(u){var a;return i[u]=!0,p.each(e[u]||[],function(e,u){var f=u(t,n,r);if(typeof f=="string"&&!s&&!i[f])return t.dataTypes.unshift(f),o(f),!1;if(s)return!(a=f)}),a}var i={},s=e===Bn;return o(t.dataTypes[0])||!i["*"]&&o("*")}function Rn(e,t){var n,r,i=p.ajaxSettings.flatOptions||{};for(r in t)t[r]!==undefined&&((i[r]?e:n||(n={}))[r]=t[r]);return n&&p.extend(!0,e,n),e}function Un(e,t,n){var r,i,s,o,u=e.contents,a=e.dataTypes;while(a[0]==="*")a.shift(),i===undefined&&(i=e.mimeType||t.getResponseHeader("Content-Type"));if(i)for(o in u)if(u[o]&&u[o].test(i)){a.unshift(o);break}if(a[0]in n)s=a[0];else{for(o in n){if(!a[0]||e.converters[o+" "+a[0]]){s=o;break}r||(r=o)}s=s||r}if(s)return s!==a[0]&&a.unshift(s),n[s]}function zn(e,t,n,r){var i,s,o,u,a,f={},l=e.dataTypes.slice();if(l[1])for(o in e.converters)f[o.toLowerCase()]=e.converters[o];s=l.shift();while(s){e.responseFields[s]&&(n[e.responseFields[s]]=t),!a&&r&&e.dataFilter&&(t=e.dataFilter(t,e.dataType)),a=s,s=l.shift();if(s)if(s==="*")s=a;else if(a!=="*"&&a!==s){o=f[a+" "+s]||f["* "+s];if(!o)for(i in f){u=i.split(" ");if(u[1]===s){o=f[a+" "+u[0]]||f["* "+u[0]];if(o){o===!0?o=f[i]:f[i]!==!0&&(s=u[0],l.unshift(u[1]));break}}}if(o!==!0)if(o&&e["throws"])t=o(t);else try{t=o(t)}catch(c){return{state:"parsererror",error:o?c:"No conversion from "+a+" to "+s}}}}return{state:"success",data:t}}function Kn(e,t,n,r){var i;if(p.isArray(t))p.each(t,function(t,i){n||Xn.test(e)?r(e,i):Kn(e+"["+(typeof i=="object"?t:"")+"]",i,n,r)});else if(!n&&p.type(t)==="object")for(i in t)Kn(e+"["+i+"]",t[i],n,r);else r(e,t)}function Zn(){try{return new e.XMLHttpRequest}catch(t){}}function er(){try{return new e.ActiveXObject("Microsoft.XMLHTTP")}catch(t){}}function sr(e){return p.isWindow(e)?e:e.nodeType===9?e.defaultView||e.parentWindow:!1}var n=[],r=n.slice,i=n.concat,s=n.push,o=n.indexOf,u={},a=u.toString,f=u.hasOwnProperty,l="".trim,c={},h="1.11.0",p=function(e,t){return new p.fn.init(e,t)},d=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,v=/^-ms-/,m=/-([\da-z])/gi,g=function(e,t){return t.toUpperCase()};p.fn=p.prototype={jquery:h,constructor:p,selector:"",length:0,toArray:function(){return r.call(this)},get:function(e){return e!=null?e<0?this[e+this.length]:this[e]:r.call(this)},pushStack:function(e){var t=p.merge(this.constructor(),e);return t.prevObject=this,t.context=this.context,t},each:function(e,t){return p.each(this,e,t)},map:function(e){return this.pushStack(p.map(this,function(t,n){return e.call(t,n,t)}))},slice:function(){return this.pushStack(r.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(e){var t=this.length,n=+e+(e<0?t:0);return this.pushStack(n>=0&&n<t?[this[n]]:[])},end:function(){return this.prevObject||this.constructor(null)},push:s,sort:n.sort,splice:n.splice},p.extend=p.fn.extend=function(){var e,t,n,r,i,s,o=arguments[0]||{},u=1,a=arguments.length,f=!1;typeof o=="boolean"&&(f=o,o=arguments[u]||{},u++),typeof o!="object"&&!p.isFunction(o)&&(o={}),u===a&&(o=this,u--);for(;u<a;u++)if((i=arguments[u])!=null)for(r in i){e=o[r],n=i[r];if(o===n)continue;f&&n&&(p.isPlainObject(n)||(t=p.isArray(n)))?(t?(t=!1,s=e&&p.isArray(e)?e:[]):s=e&&p.isPlainObject(e)?e:{},o[r]=p.extend(f,s,n)):n!==undefined&&(o[r]=n)}return o},p.extend({expando:"jQuery"+(h+Math.random()).replace(/\D/g,""),isReady:!0,error:function(e){throw new Error(e)},noop:function(){},isFunction:function(e){return p.type(e)==="function"},isArray:Array.isArray||function(e){return p.type(e)==="array"},isWindow:function(e){return e!=null&&e==e.window},isNumeric:function(e){return e-parseFloat(e)>=0},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},isPlainObject:function(e){var t;if(!e||p.type(e)!=="object"||e.nodeType||p.isWindow(e))return!1;try{if(e.constructor&&!f.call(e,"constructor")&&!f.call(e.constructor.prototype,"isPrototypeOf"))return!1}catch(n){return!1}if(c.ownLast)for(t in e)return f.call(e,t);for(t in e);return t===undefined||f.call(e,t)},type:function(e){return e==null?e+"":typeof e=="object"||typeof e=="function"?u[a.call(e)]||"object":typeof e},globalEval:function(t){t&&p.trim(t)&&(e.execScript||function(t){e.eval.call(e,t)})(t)},camelCase:function(e){return e.replace(v,"ms-").replace(m,g)},nodeName:function(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()},each:function(e,t,n){var r,i=0,s=e.length,o=y(e);if(n)if(o)for(;i<s;i++){r=t.apply(e[i],n);if(r===!1)break}else for(i in e){r=t.apply(e[i],n);if(r===!1)break}else if(o)for(;i<s;i++){r=t.call(e[i],i,e[i]);if(r===!1)break}else for(i in e){r=t.call(e[i],i,e[i]);if(r===!1)break}return e},trim:l&&!l.call(" ")?function(e){return e==null?"":l.call(e)}:function(e){return e==null?"":(e+"").replace(d,"")},makeArray:function(e,t){var n=t||[];return e!=null&&(y(Object(e))?p.merge(n,typeof e=="string"?[e]:e):s.call(n,e)),n},inArray:function(e,t,n){var r;if(t){if(o)return o.call(t,e,n);r=t.length,n=n?n<0?Math.max(0,r+n):n:0;for(;n<r;n++)if(n in t&&t[n]===e)return n}return-1},merge:function(e,t){var n=+t.length,r=0,i=e.length;while(r<n)e[i++]=t[r++];if(n!==n)while(t[r]!==undefined)e[i++]=t[r++];return e.length=i,e},grep:function(e,t,n){var r,i=[],s=0,o=e.length,u=!n;for(;s<o;s++)r=!t(e[s],s),r!==u&&i.push(e[s]);return i},map:function(e,t,n){var r,s=0,o=e.length,u=y(e),a=[];if(u)for(;s<o;s++)r=t(e[s],s,n),r!=null&&a.push(r);else for(s in e)r=t(e[s],s,n),r!=null&&a.push(r);return i.apply([],a)},guid:1,proxy:function(e,t){var n,i,s;return typeof t=="string"&&(s=e[t],t=e,e=s),p.isFunction(e)?(n=r.call(arguments,2),i=function(){return e.apply(t||this,n.concat(r.call(arguments)))},i.guid=e.guid=e.guid||p.guid++,i):undefined},now:function(){return+(new Date)},support:c}),p.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(e,t){u["[object "+t+"]"]=t.toLowerCase()});var b=function(e){function rt(e,t,r,i){var s,o,u,a,f,h,v,m,w,E;(t?t.ownerDocument||t:b)!==c&&l(t),t=t||c,r=r||[];if(!e||typeof e!="string")return r;if((a=t.nodeType)!==1&&a!==9)return[];if(p&&!i){if(s=G.exec(e))if(u=s[1]){if(a===9){o=t.getElementById(u);if(!o||!o.parentNode)return r;if(o.id===u)return r.push(o),r}else if(t.ownerDocument&&(o=t.ownerDocument.getElementById(u))&&g(t,o)&&o.id===u)return r.push(o),r}else{if(s[2])return _.apply(r,t.getElementsByTagName(e)),r;if((u=s[3])&&n.getElementsByClassName&&t.getElementsByClassName)return _.apply(r,t.getElementsByClassName(u)),r}if(n.qsa&&(!d||!d.test(e))){m=v=y,w=t,E=a===9&&e;if(a===1&&t.nodeName.toLowerCase()!=="object"){h=dt(e),(v=t.getAttribute("id"))?m=v.replace(Z,"\\$&"):t.setAttribute("id",m),m="[id='"+m+"'] ",f=h.length;while(f--)h[f]=m+vt(h[f]);w=Y.test(e)&&ht(t.parentNode)||t,E=h.join(",")}if(E)try{return _.apply(r,w.querySelectorAll(E)),r}catch(S){}finally{v||t.removeAttribute("id")}}}return xt(e.replace(R,"$1"),t,r,i)}function it(){function t(n,i){return e.push(n+" ")>r.cacheLength&&delete t[e.shift()],t[n+" "]=i}var e=[];return t}function st(e){return e[y]=!0,e}function ot(e){var t=c.createElement("div");try{return!!e(t)}catch(n){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function ut(e,t){var n=e.split("|"),i=e.length;while(i--)r.attrHandle[n[i]]=t}function at(e,t){var n=t&&e,r=n&&e.nodeType===1&&t.nodeType===1&&(~t.sourceIndex||k)-(~e.sourceIndex||k);if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function ft(e){return function(t){var n=t.nodeName.toLowerCase();return n==="input"&&t.type===e}}function lt(e){return function(t){var n=t.nodeName.toLowerCase();return(n==="input"||n==="button")&&t.type===e}}function ct(e){return st(function(t){return t=+t,st(function(n,r){var i,s=e([],n.length,t),o=s.length;while(o--)n[i=s[o]]&&(n[i]=!(r[i]=n[i]))})})}function ht(e){return e&&typeof e.getElementsByTagName!==C&&e}function pt(){}function dt(e,t){var n,i,s,o,u,a,f,l=x[e+" "];if(l)return t?0:l.slice(0);u=e,a=[],f=r.preFilter;while(u){if(!n||(i=U.exec(u)))i&&(u=u.slice(i[0].length)||u),a.push(s=[]);n=!1;if(i=z.exec(u))n=i.shift(),s.push({value:n,type:i[0].replace(R," ")}),u=u.slice(n.length);for(o in r.filter)(i=$[o].exec(u))&&(!f[o]||(i=f[o](i)))&&(n=i.shift(),s.push({value:n,type:o,matches:i}),u=u.slice(n.length));if(!n)break}return t?u.length:u?rt.error(e):x(e,a).slice(0)}function vt(e){var t=0,n=e.length,r="";for(;t<n;t++)r+=e[t].value;return r}function mt(e,t,n){var r=t.dir,i=n&&r==="parentNode",s=E++;return t.first?function(t,n,s){while(t=t[r])if(t.nodeType===1||i)return e(t,n,s)}:function(t,n,o){var u,a,f=[w,s];if(o){while(t=t[r])if(t.nodeType===1||i)if(e(t,n,o))return!0}else while(t=t[r])if(t.nodeType===1||i){a=t[y]||(t[y]={});if((u=a[r])&&u[0]===w&&u[1]===s)return f[2]=u[2];a[r]=f;if(f[2]=e(t,n,o))return!0}}}function gt(e){return e.length>1?function(t,n,r){var i=e.length;while(i--)if(!e[i](t,n,r))return!1;return!0}:e[0]}function yt(e,t,n,r,i){var s,o=[],u=0,a=e.length,f=t!=null;for(;u<a;u++)if(s=e[u])if(!n||n(s,r,i))o.push(s),f&&t.push(u);return o}function bt(e,t,n,r,i,s){return r&&!r[y]&&(r=bt(r)),i&&!i[y]&&(i=bt(i,s)),st(function(s,o,u,a){var f,l,c,h=[],p=[],d=o.length,v=s||St(t||"*",u.nodeType?[u]:u,[]),m=e&&(s||!t)?yt(v,h,e,u,a):v,g=n?i||(s?e:d||r)?[]:o:m;n&&n(m,g,u,a);if(r){f=yt(g,p),r(f,[],u,a),l=f.length;while(l--)if(c=f[l])g[p[l]]=!(m[p[l]]=c)}if(s){if(i||e){if(i){f=[],l=g.length;while(l--)(c=g[l])&&f.push(m[l]=c);i(null,g=[],f,a)}l=g.length;while(l--)(c=g[l])&&(f=i?P.call(s,c):h[l])>-1&&(s[f]=!(o[f]=c))}}else g=yt(g===o?g.splice(d,g.length):g),i?i(null,o,g,a):_.apply(o,g)})}function wt(e){var t,n,i,s=e.length,o=r.relative[e[0].type],a=o||r.relative[" "],f=o?1:0,l=mt(function(e){return e===t},a,!0),c=mt(function(e){return P.call(t,e)>-1},a,!0),h=[function(e,n,r){return!o&&(r||n!==u)||((t=n).nodeType?l(e,n,r):c(e,n,r))}];for(;f<s;f++)if(n=r.relative[e[f].type])h=[mt(gt(h),n)];else{n=r.filter[e[f].type].apply(null,e[f].matches);if(n[y]){i=++f;for(;i<s;i++)if(r.relative[e[i].type])break;return bt(f>1&&gt(h),f>1&&vt(e.slice(0,f-1).concat({value:e[f-2].type===" "?"*":""})).replace(R,"$1"),n,f<i&&wt(e.slice(f,i)),i<s&&wt(e=e.slice(i)),i<s&&vt(e))}h.push(n)}return gt(h)}function Et(e,t){var n=t.length>0,i=e.length>0,s=function(s,o,a,f,l){var h,p,d,v=0,m="0",g=s&&[],y=[],b=u,E=s||i&&r.find.TAG("*",l),S=w+=b==null?1:Math.random()||.1,x=E.length;l&&(u=o!==c&&o);for(;m!==x&&(h=E[m])!=null;m++){if(i&&h){p=0;while(d=e[p++])if(d(h,o,a)){f.push(h);break}l&&(w=S)}n&&((h=!d&&h)&&v--,s&&g.push(h))}v+=m;if(n&&m!==v){p=0;while(d=t[p++])d(g,y,o,a);if(s){if(v>0)while(m--)!g[m]&&!y[m]&&(y[m]=O.call(f));y=yt(y)}_.apply(f,y),l&&!s&&y.length>0&&v+t.length>1&&rt.uniqueSort(f)}return l&&(w=S,u=b),g};return n?st(s):s}function St(e,t,n){var r=0,i=t.length;for(;r<i;r++)rt(e,t[r],n);return n}function xt(e,t,i,s){var u,a,f,l,c,h=dt(e);if(!s&&h.length===1){a=h[0]=h[0].slice(0);if(a.length>2&&(f=a[0]).type==="ID"&&n.getById&&t.nodeType===9&&p&&r.relative[a[1].type]){t=(r.find.ID(f.matches[0].replace(et,tt),t)||[])[0];if(!t)return i;e=e.slice(a.shift().value.length)}u=$.needsContext.test(e)?0:a.length;while(u--){f=a[u];if(r.relative[l=f.type])break;if(c=r.find[l])if(s=c(f.matches[0].replace(et,tt),Y.test(a[0].type)&&ht(t.parentNode)||t)){a.splice(u,1),e=s.length&&vt(a);if(!e)return _.apply(i,s),i;break}}}return o(e,h)(s,t,!p,i,Y.test(e)&&ht(t.parentNode)||t),i}var t,n,r,i,s,o,u,a,f,l,c,h,p,d,v,m,g,y="sizzle"+ -(new Date),b=e.document,w=0,E=0,S=it(),x=it(),T=it(),N=function(e,t){return e===t&&(f=!0),0},C=typeof undefined,k=1<<31,L={}.hasOwnProperty,A=[],O=A.pop,M=A.push,_=A.push,D=A.slice,P=A.indexOf||function(e){var t=0,n=this.length;for(;t<n;t++)if(this[t]===e)return t;return-1},H="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",B="[\\x20\\t\\r\\n\\f]",j="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",F=j.replace("w","w#"),I="\\["+B+"*("+j+")"+B+"*(?:([*^$|!~]?=)"+B+"*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|("+F+")|)|)"+B+"*\\]",q=":("+j+")(?:\\(((['\"])((?:\\\\.|[^\\\\])*?)\\3|((?:\\\\.|[^\\\\()[\\]]|"+I.replace(3,8)+")*)|.*)\\)|)",R=new RegExp("^"+B+"+|((?:^|[^\\\\])(?:\\\\.)*)"+B+"+$","g"),U=new RegExp("^"+B+"*,"+B+"*"),z=new RegExp("^"+B+"*([>+~]|"+B+")"+B+"*"),W=new RegExp("="+B+"*([^\\]'\"]*?)"+B+"*\\]","g"),X=new RegExp(q),V=new RegExp("^"+F+"$"),$={ID:new RegExp("^#("+j+")"),CLASS:new RegExp("^\\.("+j+")"),TAG:new RegExp("^("+j.replace("w","w*")+")"),ATTR:new RegExp("^"+I),PSEUDO:new RegExp("^"+q),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+B+"*(even|odd|(([+-]|)(\\d*)n|)"+B+"*(?:([+-]|)"+B+"*(\\d+)|))"+B+"*\\)|)","i"),bool:new RegExp("^(?:"+H+")$","i"),needsContext:new RegExp("^"+B+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+B+"*((?:-\\d)?\\d*)"+B+"*\\)|)(?=[^-]|$)","i")},J=/^(?:input|select|textarea|button)$/i,K=/^h\d$/i,Q=/^[^{]+\{\s*\[native \w/,G=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,Y=/[+~]/,Z=/'|\\/g,et=new RegExp("\\\\([\\da-f]{1,6}"+B+"?|("+B+")|.)","ig"),tt=function(e,t,n){var r="0x"+t-65536;return r!==r||n?t:r<0?String.fromCharCode(r+65536):String.fromCharCode(r>>10|55296,r&1023|56320)};try{_.apply(A=D.call(b.childNodes),b.childNodes),A[b.childNodes.length].nodeType}catch(nt){_={apply:A.length?function(e,t){M.apply(e,D.call(t))}:function(e,t){var n=e.length,r=0;while(e[n++]=t[r++]);e.length=n-1}}}n=rt.support={},s=rt.isXML=function(e){var t=e&&(e.ownerDocument||e).documentElement;return t?t.nodeName!=="HTML":!1},l=rt.setDocument=function(e){var t,i=e?e.ownerDocument||e:b,o=i.defaultView;if(i===c||i.nodeType!==9||!i.documentElement)return c;c=i,h=i.documentElement,p=!s(i),o&&o!==o.top&&(o.addEventListener?o.addEventListener("unload",function(){l()},!1):o.attachEvent&&o.attachEvent("onunload",function(){l()})),n.attributes=ot(function(e){return e.className="i",!e.getAttribute("className")}),n.getElementsByTagName=ot(function(e){return e.appendChild(i.createComment("")),!e.getElementsByTagName("*").length}),n.getElementsByClassName=Q.test(i.getElementsByClassName)&&ot(function(e){return e.innerHTML="<div class='a'></div><div class='a i'></div>",e.firstChild.className="i",e.getElementsByClassName("i").length===2}),n.getById=ot(function(e){return h.appendChild(e).id=y,!i.getElementsByName||!i.getElementsByName(y).length}),n.getById?(r.find.ID=function(e,t){if(typeof t.getElementById!==C&&p){var n=t.getElementById(e);return n&&n.parentNode?[n]:[]}},r.filter.ID=function(e){var t=e.replace(et,tt);return function(e){return e.getAttribute("id")===t}}):(delete r.find.ID,r.filter.ID=function(e){var t=e.replace(et,tt);return function(e){var n=typeof e.getAttributeNode!==C&&e.getAttributeNode("id");return n&&n.value===t}}),r.find.TAG=n.getElementsByTagName?function(e,t){if(typeof t.getElementsByTagName!==C)return t.getElementsByTagName(e)}:function(e,t){var n,r=[],i=0,s=t.getElementsByTagName(e);if(e==="*"){while(n=s[i++])n.nodeType===1&&r.push(n);return r}return s},r.find.CLASS=n.getElementsByClassName&&function(e,t){if(typeof t.getElementsByClassName!==C&&p)return t.getElementsByClassName(e)},v=[],d=[];if(n.qsa=Q.test(i.querySelectorAll))ot(function(e){e.innerHTML="<select t=''><option selected=''></option></select>",e.querySelectorAll("[t^='']").length&&d.push("[*^$]="+B+"*(?:''|\"\")"),e.querySelectorAll("[selected]").length||d.push("\\["+B+"*(?:value|"+H+")"),e.querySelectorAll(":checked").length||d.push(":checked")}),ot(function(e){var t=i.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("name","D"),e.querySelectorAll("[name=d]").length&&d.push("name"+B+"*[*^$|!~]?="),e.querySelectorAll(":enabled").length||d.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),d.push(",.*:")});return(n.matchesSelector=Q.test(m=h.webkitMatchesSelector||h.mozMatchesSelector||h.oMatchesSelector||h.msMatchesSelector))&&ot(function(e){n.disconnectedMatch=m.call(e,"div"),m.call(e,"[s!='']:x"),v.push("!=",q)}),d=d.length&&new RegExp(d.join("|")),v=v.length&&new RegExp(v.join("|")),t=Q.test(h.compareDocumentPosition),g=t||Q.test(h.contains)?function(e,t){var n=e.nodeType===9?e.documentElement:e,r=t&&t.parentNode;return e===r||!!r&&r.nodeType===1&&!!(n.contains?n.contains(r):e.compareDocumentPosition&&e.compareDocumentPosition(r)&16)}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},N=t?function(e,t){if(e===t)return f=!0,0;var r=!e.compareDocumentPosition-!t.compareDocumentPosition;return r?r:(r=(e.ownerDocument||e)===(t.ownerDocument||t)?e.compareDocumentPosition(t):1,r&1||!n.sortDetached&&t.compareDocumentPosition(e)===r?e===i||e.ownerDocument===b&&g(b,e)?-1:t===i||t.ownerDocument===b&&g(b,t)?1:a?P.call(a,e)-P.call(a,t):0:r&4?-1:1)}:function(e,t){if(e===t)return f=!0,0;var n,r=0,s=e.parentNode,o=t.parentNode,u=[e],l=[t];if(!s||!o)return e===i?-1:t===i?1:s?-1:o?1:a?P.call(a,e)-P.call(a,t):0;if(s===o)return at(e,t);n=e;while(n=n.parentNode)u.unshift(n);n=t;while(n=n.parentNode)l.unshift(n);while(u[r]===l[r])r++;return r?at(u[r],l[r]):u[r]===b?-1:l[r]===b?1:0},i},rt.matches=function(e,t){return rt(e,null,null,t)},rt.matchesSelector=function(e,t){(e.ownerDocument||e)!==c&&l(e),t=t.replace(W,"='$1']");if(n.matchesSelector&&p&&(!v||!v.test(t))&&(!d||!d.test(t)))try{var r=m.call(e,t);if(r||n.disconnectedMatch||e.document&&e.document.nodeType!==11)return r}catch(i){}return rt(t,c,null,[e]).length>0},rt.contains=function(e,t){return(e.ownerDocument||e)!==c&&l(e),g(e,t)},rt.attr=function(e,t){(e.ownerDocument||e)!==c&&l(e);var i=r.attrHandle[t.toLowerCase()],s=i&&L.call(r.attrHandle,t.toLowerCase())?i(e,t,!p):undefined;return s!==undefined?s:n.attributes||!p?e.getAttribute(t):(s=e.getAttributeNode(t))&&s.specified?s.value:null},rt.error=function(e){throw new Error("Syntax error, unrecognized expression: "+e)},rt.uniqueSort=function(e){var t,r=[],i=0,s=0;f=!n.detectDuplicates,a=!n.sortStable&&e.slice(0),e.sort(N);if(f){while(t=e[s++])t===e[s]&&(i=r.push(s));while(i--)e.splice(r[i],1)}return a=null,e},i=rt.getText=function(e){var t,n="",r=0,s=e.nodeType;if(!s)while(t=e[r++])n+=i(t);else if(s===1||s===9||s===11){if(typeof e.textContent=="string")return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=i(e)}else if(s===3||s===4)return e.nodeValue;return n},r=rt.selectors={cacheLength:50,createPseudo:st,match:$,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(et,tt),e[3]=(e[4]||e[5]||"").replace(et,tt),e[2]==="~="&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),e[1].slice(0,3)==="nth"?(e[3]||rt.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*(e[3]==="even"||e[3]==="odd")),e[5]=+(e[7]+e[8]||e[3]==="odd")):e[3]&&rt.error(e[0]),e},PSEUDO:function(e){var t,n=!e[5]&&e[2];return $.CHILD.test(e[0])?null:(e[3]&&e[4]!==undefined?e[2]=e[4]:n&&X.test(n)&&(t=dt(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(et,tt).toLowerCase();return e==="*"?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=S[e+" "];return t||(t=new RegExp("(^|"+B+")"+e+"("+B+"|$)"))&&S(e,function(e){return t.test(typeof e.className=="string"&&e.className||typeof e.getAttribute!==C&&e.getAttribute("class")||"")})},ATTR:function(e,t,n){return function(r){var i=rt.attr(r,e);return i==null?t==="!=":t?(i+="",t==="="?i===n:t==="!="?i!==n:t==="^="?n&&i.indexOf(n)===0:t==="*="?n&&i.indexOf(n)>-1:t==="$="?n&&i.slice(-n.length)===n:t==="~="?(" "+i+" ").indexOf(n)>-1:t==="|="?i===n||i.slice(0,n.length+1)===n+"-":!1):!0}},CHILD:function(e,t,n,r,i){var s=e.slice(0,3)!=="nth",o=e.slice(-4)!=="last",u=t==="of-type";return r===1&&i===0?function(e){return!!e.parentNode}:function(t,n,a){var f,l,c,h,p,d,v=s!==o?"nextSibling":"previousSibling",m=t.parentNode,g=u&&t.nodeName.toLowerCase(),b=!a&&!u;if(m){if(s){while(v){c=t;while(c=c[v])if(u?c.nodeName.toLowerCase()===g:c.nodeType===1)return!1;d=v=e==="only"&&!d&&"nextSibling"}return!0}d=[o?m.firstChild:m.lastChild];if(o&&b){l=m[y]||(m[y]={}),f=l[e]||[],p=f[0]===w&&f[1],h=f[0]===w&&f[2],c=p&&m.childNodes[p];while(c=++p&&c&&c[v]||(h=p=0)||d.pop())if(c.nodeType===1&&++h&&c===t){l[e]=[w,p,h];break}}else if(b&&(f=(t[y]||(t[y]={}))[e])&&f[0]===w)h=f[1];else while(c=++p&&c&&c[v]||(h=p=0)||d.pop())if((u?c.nodeName.toLowerCase()===g:c.nodeType===1)&&++h){b&&((c[y]||(c[y]={}))[e]=[w,h]);if(c===t)break}return h-=i,h===r||h%r===0&&h/r>=0}}},PSEUDO:function(e,t){var n,i=r.pseudos[e]||r.setFilters[e.toLowerCase()]||rt.error("unsupported pseudo: "+e);return i[y]?i(t):i.length>1?(n=[e,e,"",t],r.setFilters.hasOwnProperty(e.toLowerCase())?st(function(e,n){var r,s=i(e,t),o=s.length;while(o--)r=P.call(e,s[o]),e[r]=!(n[r]=s[o])}):function(e){return i(e,0,n)}):i}},pseudos:{not:st(function(e){var t=[],n=[],r=o(e.replace(R,"$1"));return r[y]?st(function(e,t,n,i){var s,o=r(e,null,i,[]),u=e.length;while(u--)if(s=o[u])e[u]=!(t[u]=s)}):function(e,i,s){return t[0]=e,r(t,null,s,n),!n.pop()}}),has:st(function(e){return function(t){return rt(e,t).length>0}}),contains:st(function(e){return function(t){return(t.textContent||t.innerText||i(t)).indexOf(e)>-1}}),lang:st(function(e){return V.test(e||"")||rt.error("unsupported lang: "+e),e=e.replace(et,tt).toLowerCase(),function(t){var n;do if(n=p?t.lang:t.getAttribute("xml:lang")||t.getAttribute("lang"))return n=n.toLowerCase(),n===e||n.indexOf(e+"-")===0;while((t=t.parentNode)&&t.nodeType===1);return!1}}),target:function(t){var n=e.location&&e.location.hash;return n&&n.slice(1)===t.id},root:function(e){return e===h},focus:function(e){return e===c.activeElement&&(!c.hasFocus||c.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:function(e){return e.disabled===!1},disabled:function(e){return e.disabled===!0},checked:function(e){var t=e.nodeName.toLowerCase();return t==="input"&&!!e.checked||t==="option"&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,e.selected===!0},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeType<6)return!1;return!0},parent:function(e){return!r.pseudos.empty(e)},header:function(e){return K.test(e.nodeName)},input:function(e){return J.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return t==="input"&&e.type==="button"||t==="button"},text:function(e){var t;return e.nodeName.toLowerCase()==="input"&&e.type==="text"&&((t=e.getAttribute("type"))==null||t.toLowerCase()==="text")},first:ct(function(){return[0]}),last:ct(function(e,t){return[t-1]}),eq:ct(function(e,t,n){return[n<0?n+t:n]}),even:ct(function(e,t){var n=0;for(;n<t;n+=2)e.push(n);return e}),odd:ct(function(e,t){var n=1;for(;n<t;n+=2)e.push(n);return e}),lt:ct(function(e,t,n){var r=n<0?n+t:n;for(;--r>=0;)e.push(r);return e}),gt:ct(function(e,t,n){var r=n<0?n+t:n;for(;++r<t;)e.push(r);return e})}},r.pseudos.nth=r.pseudos.eq;for(t in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})r.pseudos[t]=ft(t);for(t in{submit:!0,reset:!0})r.pseudos[t]=lt(t);return pt.prototype=r.filters=r.pseudos,r.setFilters=new pt,o=rt.compile=function(e,t){var n,r=[],i=[],s=T[e+" "];if(!s){t||(t=dt(e)),n=t.length;while(n--)s=wt(t[n]),s[y]?r.push(s):i.push(s);s=T(e,Et(i,r))}return s},n.sortStable=y.split("").sort(N).join("")===y,n.detectDuplicates=!!f,l(),n.sortDetached=ot(function(e){return e.compareDocumentPosition(c.createElement("div"))&1}),ot(function(e){return e.innerHTML="<a href='#'></a>",e.firstChild.getAttribute("href")==="#"})||ut("type|href|height|width",function(e,t,n){if(!n)return e.getAttribute(t,t.toLowerCase()==="type"?1:2)}),(!n.attributes||!ot(function(e){return e.innerHTML="<input/>",e.firstChild.setAttribute("value",""),e.firstChild.getAttribute("value")===""}))&&ut("value",function(e,t,n){if(!n&&e.nodeName.toLowerCase()==="input")return e.defaultValue}),ot(function(e){return e.getAttribute("disabled")==null})||ut(H,function(e,t,n){var r;if(!n)return e[t]===!0?t.toLowerCase():(r=e.getAttributeNode(t))&&r.specified?r.value:null}),rt}(e);p.find=b,p.expr=b.selectors,p.expr[":"]=p.expr.pseudos,p.unique=b.uniqueSort,p.text=b.getText,p.isXMLDoc=b.isXML,p.contains=b.contains;var w=p.expr.match.needsContext,E=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,S=/^.[^:#\[\.,]*$/;p.filter=function(e,t,n){var r=t[0];return n&&(e=":not("+e+")"),t.length===1&&r.nodeType===1?p.find.matchesSelector(r,e)?[r]:[]:p.find.matches(e,p.grep(t,function(e){return e.nodeType===1}))},p.fn.extend({find:function(e){var t,n=[],r=this,i=r.length;if(typeof e!="string")return this.pushStack(p(e).filter(function(){for(t=0;t<i;t++)if(p.contains(r[t],this))return!0}));for(t=0;t<i;t++)p.find(e,r[t],n);return n=this.pushStack(i>1?p.unique(n):n),n.selector=this.selector?this.selector+" "+e:e,n},filter:function(e){return this.pushStack(x(this,e||[],!1))},not:function(e){return this.pushStack(x(this,e||[],!0))},is:function(e){return!!x(this,typeof e=="string"&&w.test(e)?p(e):e||[],!1).length}});var T,N=e.document,C=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,k=p.fn.init=function(e,t){var n,r;if(!e)return this;if(typeof e=="string"){e.charAt(0)==="<"&&e.charAt(e.length-1)===">"&&e.length>=3?n=[null,e,null]:n=C.exec(e);if(n&&(n[1]||!t)){if(n[1]){t=t instanceof p?t[0]:t,p.merge(this,p.parseHTML(n[1],t&&t.nodeType?t.ownerDocument||t:N,!0));if(E.test(n[1])&&p.isPlainObject(t))for(n in t)p.isFunction(this[n])?this[n](t[n]):this.attr(n,t[n]);return this}r=N.getElementById(n[2]);if(r&&r.parentNode){if(r.id!==n[2])return T.find(e);this.length=1,this[0]=r}return this.context=N,this.selector=e,this}return!t||t.jquery?(t||T).find(e):this.constructor(t).find(e)}return e.nodeType?(this.context=this[0]=e,this.length=1,this):p.isFunction(e)?typeof T.ready!="undefined"?T.ready(e):e(p):(e.selector!==undefined&&(this.selector=e.selector,this.context=e.context),p.makeArray(e,this))};k.prototype=p.fn,T=p(N);var L=/^(?:parents|prev(?:Until|All))/,A={children:!0,contents:!0,next:!0,prev:!0};p.extend({dir:function(e,t,n){var r=[],i=e[t];while(i&&i.nodeType!==9&&(n===undefined||i.nodeType!==1||!p(i).is(n)))i.nodeType===1&&r.push(i),i=i[t];return r},sibling:function(e,t){var n=[];for(;e;e=e.nextSibling)e.nodeType===1&&e!==t&&n.push(e);return n}}),p.fn.extend({has:function(e){var t,n=p(e,this),r=n.length;return this.filter(function(){for(t=0;t<r;t++)if(p.contains(this,n[t]))return!0})},closest:function(e,t){var n,r=0,i=this.length,s=[],o=w.test(e)||typeof e!="string"?p(e,t||this.context):0;for(;r<i;r++)for(n=this[r];n&&n!==t;n=n.parentNode)if(n.nodeType<11&&(o?o.index(n)>-1:n.nodeType===1&&p.find.matchesSelector(n,e))){s.push(n);break}return this.pushStack(s.length>1?p.unique(s):s)},index:function(e){return e?typeof e=="string"?p.inArray(this[0],p(e)):p.inArray(e.jquery?e[0]:e,this):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){return this.pushStack(p.unique(p.merge(this.get(),p(e,t))))},addBack:function(e){return this.add(e==null?this.prevObject:this.prevObject.filter(e))}}),p.each({parent:function(e){var t=e.parentNode;return t&&t.nodeType!==11?t:null},parents:function(e){return p.dir(e,"parentNode")},parentsUntil:function(e,t,n){return p.dir(e,"parentNode",n)},next:function(e){return O(e,"nextSibling")},prev:function(e){return O(e,"previousSibling")},nextAll:function(e){return p.dir(e,"nextSibling")},prevAll:function(e){return p.dir(e,"previousSibling")},nextUntil:function(e,t,n){return p.dir(e,"nextSibling",n)},prevUntil:function(e,t,n){return p.dir(e,"previousSibling",n)},siblings:function(e){return p.sibling((e.parentNode||{}).firstChild,e)},children:function(e){return p.sibling(e.firstChild)},contents:function(e){return p.nodeName(e,"iframe")?e.contentDocument||e.contentWindow.document:p.merge([],e.childNodes)}},function(e,t){p.fn[e]=function(n,r){var i=p.map(this,t,n);return e.slice(-5)!=="Until"&&(r=n),r&&typeof r=="string"&&(i=p.filter(r,i)),this.length>1&&(A[e]||(i=p.unique(i)),L.test(e)&&(i=i.reverse())),this.pushStack(i)}});var M=/\S+/g,_={};p.Callbacks=function(e){e=typeof e=="string"?_[e]||D(e):p.extend({},e);var t,n,r,i,s,o,u=[],a=!e.once&&[],f=function(c){n=e.memory&&c,r=!0,s=o||0,o=0,i=u.length,t=!0;for(;u&&s<i;s++)if(u[s].apply(c[0],c[1])===!1&&e.stopOnFalse){n=!1;break}t=!1,u&&(a?a.length&&f(a.shift()):n?u=[]:l.disable())},l={add:function(){if(u){var r=u.length;(function s(t){p.each(t,function(t,n){var r=p.type(n);r==="function"?(!e.unique||!l.has(n))&&u.push(n):n&&n.length&&r!=="string"&&s(n)})})(arguments),t?i=u.length:n&&(o=r,f(n))}return this},remove:function(){return u&&p.each(arguments,function(e,n){var r;while((r=p.inArray(n,u,r))>-1)u.splice(r,1),t&&(r<=i&&i--,r<=s&&s--)}),this},has:function(e){return e?p.inArray(e,u)>-1:!!u&&!!u.length},empty:function(){return u=[],i=0,this},disable:function(){return u=a=n=undefined,this},disabled:function(){return!u},lock:function(){return a=undefined,n||l.disable(),this},locked:function(){return!a},fireWith:function(e,n){return u&&(!r||a)&&(n=n||[],n=[e,n.slice?n.slice():n],t?a.push(n):f(n)),this},fire:function(){return l.fireWith(this,arguments),this},fired:function(){return!!r}};return l},p.extend({Deferred:function(e){var t=[["resolve","done",p.Callbacks("once memory"),"resolved"],["reject","fail",p.Callbacks("once memory"),"rejected"],["notify","progress",p.Callbacks("memory")]],n="pending",r={state:function(){return n},always:function(){return i.done(arguments).fail(arguments),this},then:function(){var e=arguments;return p.Deferred(function(n){p.each(t,function(t,s){var o=p.isFunction(e[t])&&e[t];i[s[1]](function(){var e=o&&o.apply(this,arguments);e&&p.isFunction(e.promise)?e.promise().done(n.resolve).fail(n.reject).progress(n.notify):n[s[0]+"With"](this===r?n.promise():this,o?[e]:arguments)})}),e=null}).promise()},promise:function(e){return e!=null?p.extend(e,r):r}},i={};return r.pipe=r.then,p.each(t,function(e,s){var o=s[2],u=s[3];r[s[1]]=o.add,u&&o.add(function(){n=u},t[e^1][2].disable,t[2][2].lock),i[s[0]]=function(){return i[s[0]+"With"](this===i?r:this,arguments),this},i[s[0]+"With"]=o.fireWith}),r.promise(i),e&&e.call(i,i),i},when:function(e){var t=0,n=r.call(arguments),i=n.length,s=i!==1||e&&p.isFunction(e.promise)?i:0,o=s===1?e:p.Deferred(),u=function(e,t,n){return function(i){t[e]=this,n[e]=arguments.length>1?r.call(arguments):i,n===a?o.notifyWith(t,n):--s||o.resolveWith(t,n)}},a,f,l;if(i>1){a=new Array(i),f=new Array(i),l=new Array(i);for(;t<i;t++)n[t]&&p.isFunction(n[t].promise)?n[t].promise().done(u(t,l,n)).fail(o.reject).progress(u(t,f,a)):--s}return s||o.resolveWith(l,n),o.promise()}});var P;p.fn.ready=function(e){return p.ready.promise().done(e),this},p.extend({isReady:!1,readyWait:1,holdReady:function(e){e?p.readyWait++:p.ready(!0)},ready:function(e){if(e===!0?--p.readyWait:p.isReady)return;if(!N.body)return setTimeout(p.ready);p.isReady=!0;if(e!==!0&&--p.readyWait>0)return;P.resolveWith(N,[p]),p.fn.trigger&&p(N).trigger("ready").off("ready")}}),p.ready.promise=function(t){if(!P){P=p.Deferred();if(N.readyState==="complete")setTimeout(p.ready);else if(N.addEventListener)N.addEventListener("DOMContentLoaded",B,!1),e.addEventListener("load",B,!1);else{N.attachEvent("onreadystatechange",B),e.attachEvent("onload",B);var n=!1;try{n=e.frameElement==null&&N.documentElement}catch(r){}n&&n.doScroll&&function i(){if(!p.isReady){try{n.doScroll("left")}catch(e){return setTimeout(i,50)}H(),p.ready()}}()}}return P.promise(t)};var j=typeof undefined,F;for(F in p(c))break;c.ownLast=F!=="0",c.inlineBlockNeedsLayout=!1,p(function(){var e,t,n=N.getElementsByTagName("body")[0];if(!n)return;e=N.createElement("div"),e.style.cssText="border:0;width:0;height:0;position:absolute;top:0;left:-9999px;margin-top:1px",t=N.createElement("div"),n.appendChild(e).appendChild(t);if(typeof t.style.zoom!==j){t.style.cssText="border:0;margin:0;width:1px;padding:1px;display:inline;zoom:1";if(c.inlineBlockNeedsLayout=t.offsetWidth===3)n.style.zoom=1}n.removeChild(e),e=t=null}),function(){var e=N.createElement("div");if(c.deleteExpando==null){c.deleteExpando=!0;try{delete e.test}catch(t){c.deleteExpando=!1}}e=null}(),p.acceptData=function(e){var t=p.noData[(e.nodeName+" ").toLowerCase()],n=+e.nodeType||1;return n!==1&&n!==9?!1:!t||t!==!0&&e.getAttribute("classid")===t};var I=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,q=/([A-Z])/g;p.extend({cache:{},noData:{"applet ":!0,"embed ":!0,"object ":"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"},hasData:function(e){return e=e.nodeType?p.cache[e[p.expando]]:e[p.expando],!!e&&!U(e)},data:function(e,t,n){return z(e,t,n)},removeData:function(e,t){return W(e,t)},_data:function(e,t,n){return z(e,t,n,!0)},_removeData:function(e,t){return W(e,t,!0)}}),p.fn.extend({data:function(e,t){var n,r,i,s=this[0],o=s&&s.attributes;if(e===undefined){if(this.length){i=p.data(s);if(s.nodeType===1&&!p._data(s,"parsedAttrs")){n=o.length;while(n--)r=o[n].name,r.indexOf("data-")===0&&(r=p.camelCase(r.slice(5)),R(s,r,i[r]));p._data(s,"parsedAttrs",!0)}}return i}return typeof e=="object"?this.each(function(){p.data(this,e)}):arguments.length>1?this.each(function(){p.data(this,e,t)}):s?R(s,e,p.data(s,e)):undefined},removeData:function(e){return this.each(function(){p.removeData(this,e)})}}),p.extend({queue:function(e,t,n){var r;if(e)return t=(t||"fx")+"queue",r=p._data(e,t),n&&(!r||p.isArray(n)?r=p._data(e,t,p.makeArray(n)):r.push(n)),r||[]},dequeue:function(e,t){t=t||"fx";var n=p.queue(e,t),r=n.length,i=n.shift(),s=p._queueHooks(e,t),o=function(){p.dequeue(e,t)};i==="inprogress"&&(i=n.shift(),r--),i&&(t==="fx"&&n.unshift("inprogress"),delete s.stop,i.call(e,o,s)),!r&&s&&s.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return p._data(e,n)||p._data(e,n,{empty:p.Callbacks("once memory").add(function(){p._removeData(e,t+"queue"),p._removeData(e,n)})})}}),p.fn.extend({queue:function(e,t){var n=2;return typeof e!="string"&&(t=e,e="fx",n--),arguments.length<n?p.queue(this[0],e):t===undefined?this:this.each(function(){var n=p.queue(this,e,t);p._queueHooks(this,e),e==="fx"&&n[0]!=="inprogress"&&p.dequeue(this,e)})},dequeue:function(e){return this.each(function(){p.dequeue(this,e)})},clearQueue:function(e){return this.queue(e||"fx",[])},promise:function(e,t){var n,r=1,i=p.Deferred(),s=this,o=this.length,u=function(){--r||i.resolveWith(s,[s])};typeof e!="string"&&(t=e,e=undefined),e=e||"fx";while(o--)n=p._data(s[o],e+"queueHooks"),n&&n.empty&&(r++,n.empty.add(u));return u(),i.promise(t)}});var X=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,V=["Top","Right","Bottom","Left"],$=function(e,t){return e=t||e,p.css(e,"display")==="none"||!p.contains(e.ownerDocument,e)},J=p.access=function(e,t,n,r,i,s,o){var u=0,a=e.length,f=n==null;if(p.type(n)==="object"){i=!0;for(u in n)p.access(e,t,u,n[u],!0,s,o)}else if(r!==undefined){i=!0,p.isFunction(r)||(o=!0),f&&(o?(t.call(e,r),t=null):(f=t,t=function(e,t,n){return f.call(p(e),n)}));if(t)for(;u<a;u++)t(e[u],n,o?r:r.call(e[u],u,t(e[u],n)))}return i?e:f?t.call(e):a?t(e[0],n):s},K=/^(?:checkbox|radio)$/i;(function(){var e=N.createDocumentFragment(),t=N.createElement("div"),n=N.createElement("input");t.setAttribute("className","t"),t.innerHTML="  <link/><table></table><a href='/a'>a</a>",c.leadingWhitespace=t.firstChild.nodeType===3,c.tbody=!t.getElementsByTagName("tbody").length,c.htmlSerialize=!!t.getElementsByTagName("link").length,c.html5Clone=N.createElement("nav").cloneNode(!0).outerHTML!=="<:nav></:nav>",n.type="checkbox",n.checked=!0,e.appendChild(n),c.appendChecked=n.checked,t.innerHTML="<textarea>x</textarea>",c.noCloneChecked=!!t.cloneNode(!0).lastChild.defaultValue,e.appendChild(t),t.innerHTML="<input type='radio' checked='checked' name='t'/>",c.checkClone=t.cloneNode(!0).cloneNode(!0).lastChild.checked,c.noCloneEvent=!0,t.attachEvent&&(t.attachEvent("onclick",function(){c.noCloneEvent=!1}),t.cloneNode(!0).click());if(c.deleteExpando==null){c.deleteExpando=!0;try{delete t.test}catch(r){c.deleteExpando=!1}}e=t=n=null})(),function(){var t,n,r=N.createElement("div");for(t in{submit:!0,change:!0,focusin:!0})n="on"+t,(c[t+"Bubbles"]=n in e)||(r.setAttribute(n,"t"),c[t+"Bubbles"]=r.attributes[n].expando===!1);r=null}();var Q=/^(?:input|select|textarea)$/i,G=/^key/,Y=/^(?:mouse|contextmenu)|click/,Z=/^(?:focusinfocus|focusoutblur)$/,et=/^([^.]*)(?:\.(.+)|)$/;p.event={global:{},add:function(e,t,n,r,i){var s,o,u,a,f,l,c,h,d,v,m,g=p._data(e);if(!g)return;n.handler&&(a=n,n=a.handler,i=a.selector),n.guid||(n.guid=p.guid++),(o=g.events)||(o=g.events={}),(l=g.handle)||(l=g.handle=function(e){return typeof p===j||!!e&&p.event.triggered===e.type?undefined:p.event.dispatch.apply(l.elem,arguments)},l.elem=e),t=(t||"").match(M)||[""],u=t.length;while(u--){s=et.exec(t[u])||[],d=m=s[1],v=(s[2]||"").split(".").sort();if(!d)continue;f=p.event.special[d]||{},d=(i?f.delegateType:f.bindType)||d,f=p.event.special[d]||{},c=p.extend({type:d,origType:m,data:r,handler:n,guid:n.guid,selector:i,needsContext:i&&p.expr.match.needsContext.test(i),namespace:v.join(".")},a);if(!(h=o[d])){h=o[d]=[],h.delegateCount=0;if(!f.setup||f.setup.call(e,r,v,l)===!1)e.addEventListener?e.addEventListener(d,l,!1):e.attachEvent&&e.attachEvent("on"+d,l)}f.add&&(f.add.call(e,c),c.handler.guid||(c.handler.guid=n.guid)),i?h.splice(h.delegateCount++,0,c):h.push(c),p.event.global[d]=!0}e=null},remove:function(e,t,n,r,i){var s,o,u,a,f,l,c,h,d,v,m,g=p.hasData(e)&&p._data(e);if(!g||!(l=g.events))return;t=(t||"").match(M)||[""],f=t.length;while(f--){u=et.exec(t[f])||[],d=m=u[1],v=(u[2]||"").split(".").sort();if(!d){for(d in l)p.event.remove(e,d+t[f],n,r,!0);continue}c=p.event.special[d]||{},d=(r?c.delegateType:c.bindType)||d,h=l[d]||[],u=u[2]&&new RegExp("(^|\\.)"+v.join("\\.(?:.*\\.|)")+"(\\.|$)"),a=s=h.length;while(s--)o=h[s],(i||m===o.origType)&&(!n||n.guid===o.guid)&&(!u||u.test(o.namespace))&&(!r||r===o.selector||r==="**"&&o.selector)&&(h.splice(s,1),o.selector&&h.delegateCount--,c.remove&&c.remove.call(e,o));a&&!h.length&&((!c.teardown||c.teardown.call(e,v,g.handle)===!1)&&p.removeEvent(e,d,g.handle),delete l[d])}p.isEmptyObject(l)&&(delete g.handle,p._removeData(e,"events"))},trigger:function(t,n,r,i){var s,o,u,a,l,c,h,d=[r||N],v=f.call(t,"type")?t.type:t,m=f.call(t,"namespace")?t.namespace.split("."):[];u=c=r=r||N;if(r.nodeType===3||r.nodeType===8)return;if(Z.test(v+p.event.triggered))return;v.indexOf(".")>=0&&(m=v.split("."),v=m.shift(),m.sort()),o=v.indexOf(":")<0&&"on"+v,t=t[p.expando]?t:new p.Event(v,typeof t=="object"&&t),t.isTrigger=i?2:3,t.namespace=m.join("."),t.namespace_re=t.namespace?new RegExp("(^|\\.)"+m.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,t.result=undefined,t.target||(t.target=r),n=n==null?[t]:p.makeArray(n,[t]),l=p.event.special[v]||{};if(!i&&l.trigger&&l.trigger.apply(r,n)===!1)return;if(!i&&!l.noBubble&&!p.isWindow(r)){a=l.delegateType||v,Z.test(a+v)||(u=u.parentNode);for(;u;u=u.parentNode)d.push(u),c=u;c===(r.ownerDocument||N)&&d.push(c.defaultView||c.parentWindow||e)}h=0;while((u=d[h++])&&!t.isPropagationStopped())t.type=h>1?a:l.bindType||v,s=(p._data(u,"events")||{})[t.type]&&p._data(u,"handle"),s&&s.apply(u,n),s=o&&u[o],s&&s.apply&&p.acceptData(u)&&(t.result=s.apply(u,n),t.result===!1&&t.preventDefault());t.type=v;if(!i&&!t.isDefaultPrevented()&&(!l._default||l._default.apply(d.pop(),n)===!1)&&p.acceptData(r)&&o&&r[v]&&!p.isWindow(r)){c=r[o],c&&(r[o]=null),p.event.triggered=v;try{r[v]()}catch(g){}p.event.triggered=undefined,c&&(r[o]=c)}return t.result},dispatch:function(e){e=p.event.fix(e);var t,n,i,s,o,u=[],a=r.call(arguments),f=(p._data(this,"events")||{})[e.type]||[],l=p.event.special[e.type]||{};a[0]=e,e.delegateTarget=this;if(l.preDispatch&&l.preDispatch.call(this,e)===!1)return;u=p.event.handlers.call(this,e,f),t=0;while((s=u[t++])&&!e.isPropagationStopped()){e.currentTarget=s.elem,o=0;while((i=s.handlers[o++])&&!e.isImmediatePropagationStopped())if(!e.namespace_re||e.namespace_re.test(i.namespace))e.handleObj=i,e.data=i.data,n=((p.event.special[i.origType]||{}).handle||i.handler).apply(s.elem,a),n!==undefined&&(e.result=n)===!1&&(e.preventDefault(),e.stopPropagation())}return l.postDispatch&&l.postDispatch.call(this,e),e.result},handlers:function(e,t){var n,r,i,s,o=[],u=t.delegateCount,a=e.target;if(u&&a.nodeType&&(!e.button||e.type!=="click"))for(;a!=this;a=a.parentNode||this)if(a.nodeType===1&&(a.disabled!==!0||e.type!=="click")){i=[];for(s=0;s<u;s++)r=t[s],n=r.selector+" ",i[n]===undefined&&(i[n]=r.needsContext?p(n,this).index(a)>=0:p.find(n,this,null,[a]).length),i[n]&&i.push(r);i.length&&o.push({elem:a,handlers:i})}return u<t.length&&o.push({elem:this,handlers:t.slice(u)}),o},fix:function(e){if(e[p.expando])return e;var t,n,r,i=e.type,s=e,o=this.fixHooks[i];o||(this.fixHooks[i]=o=Y.test(i)?this.mouseHooks:G.test(i)?this.keyHooks:{}),r=o.props?this.props.concat(o.props):this.props,e=new p.Event(s),t=r.length;while(t--)n=r[t],e[n]=s[n];return e.target||(e.target=s.srcElement||N),e.target.nodeType===3&&(e.target=e.target.parentNode),e.metaKey=!!e.metaKey,o.filter?o.filter(e,s):e},props:"altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(e,t){return e.which==null&&(e.which=t.charCode!=null?t.charCode:t.keyCode),e}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(e,t){var n,r,i,s=t.button,o=t.fromElement;return e.pageX==null&&t.clientX!=null&&(r=e.target.ownerDocument||N,i=r.documentElement,n=r.body,e.pageX=t.clientX+(i&&i.scrollLeft||n&&n.scrollLeft||0)-(i&&i.clientLeft||n&&n.clientLeft||0),e.pageY=t.clientY+(i&&i.scrollTop||n&&n.scrollTop||0)-(i&&i.clientTop||n&&n.clientTop||0)),!e.relatedTarget&&o&&(e.relatedTarget=o===e.target?t.toElement:o),!e.which&&s!==undefined&&(e.which=s&1?1:s&2?3:s&4?2:0),e}},special:{load:{noBubble:!0},focus:{trigger:function(){if(this!==rt()&&this.focus)try{return this.focus(),!1}catch(e){}},delegateType:"focusin"},blur:{trigger:function(){if(this===rt()&&this.blur)return this.blur(),!1},delegateType:"focusout"},click:{trigger:function(){if(p.nodeName(this,"input")&&this.type==="checkbox"&&this.click)return this.click(),!1},_default:function(e){return p.nodeName(e.target,"a")}},beforeunload:{postDispatch:function(e){e.result!==undefined&&(e.originalEvent.returnValue=e.result)}}},simulate:function(e,t,n,r){var i=p.extend(new p.Event,n,{type:e,isSimulated:!0,originalEvent:{}});r?p.event.trigger(i,null,t):p.event.dispatch.call(t,i),i.isDefaultPrevented()&&n.preventDefault()}},p.removeEvent=N.removeEventListener?function(e,t,n){e.removeEventListener&&e.removeEventListener(t,n,!1)}:function(e,t,n){var r="on"+t;e.detachEvent&&(typeof e[r]===j&&(e[r]=null),e.detachEvent(r,n))},p.Event=function(e,t){if(!(this instanceof p.Event))return new p.Event(e,t);e&&e.type?(this.originalEvent=e,this.type=e.type,this.isDefaultPrevented=e.defaultPrevented||e.defaultPrevented===undefined&&(e.returnValue===!1||e.getPreventDefault&&e.getPreventDefault())?tt:nt):this.type=e,t&&p.extend(this,t),this.timeStamp=e&&e.timeStamp||p.now(),this[p.expando]=!0},p.Event.prototype={isDefaultPrevented:nt,isPropagationStopped:nt,isImmediatePropagationStopped:nt,preventDefault:function(){var e=this.originalEvent;this.isDefaultPrevented=tt;if(!e)return;e.preventDefault?e.preventDefault():e.returnValue=!1},stopPropagation:function(){var e=this.originalEvent;this.isPropagationStopped=tt;if(!e)return;e.stopPropagation&&e.stopPropagation(),e.cancelBubble=!0},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=tt,this.stopPropagation()}},p.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(e,t){p.event.special[e]={delegateType:t,bindType:t,handle:function(e){var n,r=this,i=e.relatedTarget,s=e.handleObj;if(!i||i!==r&&!p.contains(r,i))e.type=s.origType,n=s.handler.apply(this,arguments),e.type=t;return n}}}),c.submitBubbles||(p.event.special.submit={setup:function(){if(p.nodeName(this,"form"))return!1;p.event.add(this,"click._submit keypress._submit",function(e){var t=e.target,n=p.nodeName(t,"input")||p.nodeName(t,"button")?t.form:undefined;n&&!p._data(n,"submitBubbles")&&(p.event.add(n,"submit._submit",function(e){e._submit_bubble=!0}),p._data(n,"submitBubbles",!0))})},postDispatch:function(e){e._submit_bubble&&(delete e._submit_bubble,this.parentNode&&!e.isTrigger&&p.event.simulate("submit",this.parentNode,e,!0))},teardown:function(){if(p.nodeName(this,"form"))return!1;p.event.remove(this,"._submit")}}),c.changeBubbles||(p.event.special.change={setup:function(){if(Q.test(this.nodeName)){if(this.type==="checkbox"||this.type==="radio")p.event.add(this,"propertychange._change",function(e){e.originalEvent.propertyName==="checked"&&(this._just_changed=!0)}),p.event.add(this,"click._change",function(e){this._just_changed&&!e.isTrigger&&(this._just_changed=!1),p.event.simulate("change",this,e,!0)});return!1}p.event.add(this,"beforeactivate._change",function(e){var t=e.target;Q.test(t.nodeName)&&!p._data(t,"changeBubbles")&&(p.event.add(t,"change._change",function(e){this.parentNode&&!e.isSimulated&&!e.isTrigger&&p.event.simulate("change",this.parentNode,e,!0)}),p._data(t,"changeBubbles",!0))})},handle:function(e){var t=e.target;if(this!==t||e.isSimulated||e.isTrigger||t.type!=="radio"&&t.type!=="checkbox")return e.handleObj.handler.apply(this,arguments)},teardown:function(){return p.event.remove(this,"._change"),!Q.test(this.nodeName)}}),c.focusinBubbles||p.each({focus:"focusin",blur:"focusout"},function(e,t){var n=function(e){p.event.simulate(t,e.target,p.event.fix(e),!0)};p.event.special[t]={setup:function(){var r=this.ownerDocument||this,i=p._data(r,t);i||r.addEventListener(e,n,!0),p._data(r,t,(i||0)+1)},teardown:function(){var r=this.ownerDocument||this,i=p._data(r,t)-1;i?p._data(r,t,i):(r.removeEventListener(e,n,!0),p._removeData(r,t))}}}),p.fn.extend({on:function(e,t,n,r,i){var s,o;if(typeof e=="object"){typeof t!="string"&&(n=n||t,t=undefined);for(s in e)this.on(s,t,n,e[s],i);return this}n==null&&r==null?(r=t,n=t=undefined):r==null&&(typeof t=="string"?(r=n,n=undefined):(r=n,n=t,t=undefined));if(r===!1)r=nt;else if(!r)return this;return i===1&&(o=r,r=function(e){return p().off(e),o.apply(this,arguments)},r.guid=o.guid||(o.guid=p.guid++)),this.each(function(){p.event.add(this,e,r,n,t)})},one:function(e,t,n,r){return this.on(e,t,n,r,1)},off:function(e,t,n){var r,i;if(e&&e.preventDefault&&e.handleObj)return r=e.handleObj,p(e.delegateTarget).off(r.namespace?r.origType+"."+r.namespace:r.origType,r.selector,r.handler),this;if(typeof e=="object"){for(i in e)this.off(i,t,e[i]);return this}if(t===!1||typeof t=="function")n=t,t=undefined;return n===!1&&(n=nt),this.each(function(){p.event.remove(this,e,n,t)})},trigger:function(e,t){return this.each(function(){p.event.trigger(e,t,this)})},triggerHandler:function(e,t){var n=this[0];if(n)return p.event.trigger(e,t,n,!0)}});var st="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",ot=/ jQuery\d+="(?:null|\d+)"/g,ut=new RegExp("<(?:"+st+")[\\s/>]","i"),at=/^\s+/,ft=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,lt=/<([\w:]+)/,ct=/<tbody/i,ht=/<|&#?\w+;/,pt=/<(?:script|style|link)/i,dt=/checked\s*(?:[^=]|=\s*.checked.)/i,vt=/^$|\/(?:java|ecma)script/i,mt=/^true\/(.*)/,gt=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,yt={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],area:[1,"<map>","</map>"],param:[1,"<object>","</object>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:c.htmlSerialize?[0,"",""]:[1,"X<div>","</div>"]},bt=it(N),wt=bt.appendChild(N.createElement("div"));yt.optgroup=yt.option,yt.tbody=yt.tfoot=yt.colgroup=yt.caption=yt.thead,yt.th=yt.td,p.extend({clone:function(e,t,n){var r,i,s,o,u,a=p.contains(e.ownerDocument,e);c.html5Clone||p.isXMLDoc(e)||!ut.test("<"+e.nodeName+">")?s=e.cloneNode(!0):(wt.innerHTML=e.outerHTML,wt.removeChild(s=wt.firstChild));if((!c.noCloneEvent||!c.noCloneChecked)&&(e.nodeType===1||e.nodeType===11)&&!p.isXMLDoc(e)){r=Et(s),u=Et(e);for(o=0;(i=u[o])!=null;++o)r[o]&&Lt(i,r[o])}if(t)if(n){u=u||Et(e),r=r||Et(s);for(o=0;(i=u[o])!=null;o++)kt(i,r[o])}else kt(e,s);return r=Et(s,"script"),r.length>0&&Ct(r,!a&&Et(e,"script")),r=u=i=null,s},buildFragment:function(e,t,n,r){var i,s,o,u,a,f,l,h=e.length,d=it(t),v=[],m=0;for(;m<h;m++){s=e[m];if(s||s===0)if(p.type(s)==="object")p.merge(v,s.nodeType?[s]:s);else if(!ht.test(s))v.push(t.createTextNode(s));else{u=u||d.appendChild(t.createElement("div")),a=(lt.exec(s)||["",""])[1].toLowerCase(),l=yt[a]||yt._default,u.innerHTML=l[1]+s.replace(ft,"<$1></$2>")+l[2],i=l[0];while(i--)u=u.lastChild;!c.leadingWhitespace&&at.test(s)&&v.push(t.createTextNode(at.exec(s)[0]));if(!c.tbody){s=a==="table"&&!ct.test(s)?u.firstChild:l[1]==="<table>"&&!ct.test(s)?u:0,i=s&&s.childNodes.length;while(i--)p.nodeName(f=s.childNodes[i],"tbody")&&!f.childNodes.length&&s.removeChild(f)}p.merge(v,u.childNodes),u.textContent="";while(u.firstChild)u.removeChild(u.firstChild);u=d.lastChild}}u&&d.removeChild(u),c.appendChecked||p.grep(Et(v,"input"),St),m=0;while(s=v[m++]){if(r&&p.inArray(s,r)!==-1)continue;o=p.contains(s.ownerDocument,s),u=Et(d.appendChild(s),"script"),o&&Ct(u);if(n){i=0;while(s=u[i++])vt.test(s.type||"")&&n.push(s)}}return u=null,d},cleanData:function(e,t){var r,i,s,o,u=0,a=p.expando,f=p.cache,l=c.deleteExpando,h=p.event.special;for(;(r=e[u])!=null;u++)if(t||p.acceptData(r)){s=r[a],o=s&&f[s];if(o){if(o.events)for(i in o.events)h[i]?p.event.remove(r,i):p.removeEvent(r,i,o.handle);f[s]&&(delete f[s],l?delete r[a]:typeof r.removeAttribute!==j?r.removeAttribute(a):r[a]=null,n.push(s))}}}}),p.fn.extend({text:function(e){return J(this,function(e){return e===undefined?p.text(this):this.empty().append((this[0]&&this[0].ownerDocument||N).createTextNode(e))},null,e,arguments.length)},append:function(){return this.domManip(arguments,function(e){if(this.nodeType===1||this.nodeType===11||this.nodeType===9){var t=xt(this,e);t.appendChild(e)}})},prepend:function(){return this.domManip(arguments,function(e){if(this.nodeType===1||this.nodeType===11||this.nodeType===9){var t=xt(this,e);t.insertBefore(e,t.firstChild)}})},before:function(){return this.domManip(arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return this.domManip(arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)})},remove:function(e,t){var n,r=e?p.filter(e,this):this,i=0;for(;(n=r[i])!=null;i++)!t&&n.nodeType===1&&p.cleanData(Et(n)),n.parentNode&&(t&&p.contains(n.ownerDocument,n)&&Ct(Et(n,"script")),n.parentNode.removeChild(n));return this},empty:function(){var e,t=0;for(;(e=this[t])!=null;t++){e.nodeType===1&&p.cleanData(Et(e,!1));while(e.firstChild)e.removeChild(e.firstChild);e.options&&p.nodeName(e,"select")&&(e.options.length=0)}return this},clone:function(e,t){return e=e==null?!1:e,t=t==null?e:t,this.map(function(){return p.clone(this,e,t)})},html:function(e){return J(this,function(e){var t=this[0]||{},n=0,r=this.length;if(e===undefined)return t.nodeType===1?t.innerHTML.replace(ot,""):undefined;if(typeof e=="string"&&!pt.test(e)&&(c.htmlSerialize||!ut.test(e))&&(c.leadingWhitespace||!at.test(e))&&!yt[(lt.exec(e)||["",""])[1].toLowerCase()]){e=e.replace(ft,"<$1></$2>");try{for(;n<r;n++)t=this[n]||{},t.nodeType===1&&(p.cleanData(Et(t,!1)),t.innerHTML=e);t=0}catch(i){}}t&&this.empty().append(e)},null,e,arguments.length)},replaceWith:function(){var e=arguments[0];return this.domManip(arguments,function(t){e=this.parentNode,p.cleanData(Et(this)),e&&e.replaceChild(t,this)}),e&&(e.length||e.nodeType)?this:this.remove()},detach:function(e){return this.remove(e,!0)},domManip:function(e,t){e=i.apply([],e);var n,r,s,o,u,a,f=0,l=this.length,h=this,d=l-1,v=e[0],m=p.isFunction(v);if(m||l>1&&typeof v=="string"&&!c.checkClone&&dt.test(v))return this.each(function(n){var r=h.eq(n);m&&(e[0]=v.call(this,n,r.html())),r.domManip(e,t)});if(l){a=p.buildFragment(e,this[0].ownerDocument,!1,this),n=a.firstChild,a.childNodes.length===1&&(a=n);if(n){o=p.map(Et(a,"script"),Tt),s=o.length;for(;f<l;f++)r=a,f!==d&&(r=p.clone(r,!0,!0),s&&p.merge(o,Et(r,"script"))),t.call(this[f],r,f);if(s){u=o[o.length-1].ownerDocument,p.map(o,Nt);for(f=0;f<s;f++)r=o[f],vt.test(r.type||"")&&!p._data(r,"globalEval")&&p.contains(u,r)&&(r.src?p._evalUrl&&p._evalUrl(r.src):p.globalEval((r.text||r.textContent||r.innerHTML||"").replace(gt,"")))}a=n=null}}return this}}),p.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(e,t){p.fn[e]=function(e){var n,r=0,i=[],o=p(e),u=o.length-1;for(;r<=u;r++)n=r===u?this:this.clone(!0),p(o[r])[t](n),s.apply(i,n.get());return this.pushStack(i)}});var At,Ot={};(function(){var e,t,n=N.createElement("div"),r="-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;display:block;padding:0;margin:0;border:0";n.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",e=n.getElementsByTagName("a")[0],e.style.cssText="float:left;opacity:.5",c.opacity=/^0.5/.test(e.style.opacity),c.cssFloat=!!e.style.cssFloat,n.style.backgroundClip="content-box",n.cloneNode(!0).style.backgroundClip="",c.clearCloneStyle=n.style.backgroundClip==="content-box",e=n=null,c.shrinkWrapBlocks=function(){var e,n,i,s;if(t==null){e=N.getElementsByTagName("body")[0];if(!e)return;s="border:0;width:0;height:0;position:absolute;top:0;left:-9999px",n=N.createElement("div"),i=N.createElement("div"),e.appendChild(n).appendChild(i),t=!1,typeof i.style.zoom!==j&&(i.style.cssText=r+";width:1px;padding:1px;zoom:1",i.innerHTML="<div></div>",i.firstChild.style.width="5px",t=i.offsetWidth!==3),e.removeChild(n),e=n=i=null}return t}})();var Dt=/^margin/,Pt=new RegExp("^("+X+")(?!px)[a-z%]+$","i"),Ht,Bt,jt=/^(top|right|bottom|left)$/;e.getComputedStyle?(Ht=function(e){return e.ownerDocument.defaultView.getComputedStyle(e,null)},Bt=function(e,t,n){var r,i,s,o,u=e.style;return n=n||Ht(e),o=n?n.getPropertyValue(t)||n[t]:undefined,n&&(o===""&&!p.contains(e.ownerDocument,e)&&(o=p.style(e,t)),Pt.test(o)&&Dt.test(t)&&(r=u.width,i=u.minWidth,s=u.maxWidth,u.minWidth=u.maxWidth=u.width=o,o=n.width,u.width=r,u.minWidth=i,u.maxWidth=s)),o===undefined?o:o+""}):N.documentElement.currentStyle&&(Ht=function(e){return e.currentStyle},Bt=function(e,t,n){var r,i,s,o,u=e.style;return n=n||Ht(e),o=n?n[t]:undefined,o==null&&u&&u[t]&&(o=u[t]),Pt.test(o)&&!jt.test(t)&&(r=u.left,i=e.runtimeStyle,s=i&&i.left,s&&(i.left=e.currentStyle.left),u.left=t==="fontSize"?"1em":o,o=u.pixelLeft+"px",u.left=r,s&&(i.left=s)),o===undefined?o:o+""||"auto"}),function(){function l(){var t,n,u=N.getElementsByTagName("body")[0];if(!u)return;t=N.createElement("div"),n=N.createElement("div"),t.style.cssText=a,u.appendChild(t).appendChild(n),n.style.cssText="-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;position:absolute;display:block;padding:1px;border:1px;width:4px;margin-top:1%;top:1%",p.swap(u,u.style.zoom!=null?{zoom:1}:{},function(){r=n.offsetWidth===4}),i=!0,s=!1,o=!0,e.getComputedStyle&&(s=(e.getComputedStyle(n,null)||{}).top!=="1%",i=(e.getComputedStyle(n,null)||{width:"4px"}).width==="4px"),u.removeChild(t),n=u=null}var t,n,r,i,s,o,u=N.createElement("div"),a="border:0;width:0;height:0;position:absolute;top:0;left:-9999px",f="-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;display:block;padding:0;margin:0;border:0";u.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",t=u.getElementsByTagName("a")[0],t.style.cssText="float:left;opacity:.5",c.opacity=/^0.5/.test(t.style.opacity),c.cssFloat=!!t.style.cssFloat,u.style.backgroundClip="content-box",u.cloneNode(!0).style.backgroundClip="",c.clearCloneStyle=u.style.backgroundClip==="content-box",t=u=null,p.extend(c,{reliableHiddenOffsets:function(){if(n!=null)return n;var e,t,r,i=N.createElement("div"),s=N.getElementsByTagName("body")[0];if(!s)return;return i.setAttribute("className","t"),i.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",e=N.createElement("div"),e.style.cssText=a,s.appendChild(e).appendChild(i),i.innerHTML="<table><tr><td></td><td>t</td></tr></table>",t=i.getElementsByTagName("td"),t[0].style.cssText="padding:0;margin:0;border:0;display:none",r=t[0].offsetHeight===0,t[0].style.display="",t[1].style.display="none",n=r&&t[0].offsetHeight===0,s.removeChild(e),i=s=null,n},boxSizing:function(){return r==null&&l(),r},boxSizingReliable:function(){return i==null&&l(),i},pixelPosition:function(){return s==null&&l(),s},reliableMarginRight:function(){var t,n,r,i;if(o==null&&e.getComputedStyle){t=N.getElementsByTagName("body")[0];if(!t)return;n=N.createElement("div"),r=N.createElement("div"),n.style.cssText=a,t.appendChild(n).appendChild(r),i=r.appendChild(N.createElement("div")),i.style.cssText=r.style.cssText=f,i.style.marginRight=i.style.width="0",r.style.width="1px",o=!parseFloat((e.getComputedStyle(i,null)||{}).marginRight),t.removeChild(n)}return o}})}(),p.swap=function(e,t,n,r){var i,s,o={};for(s in t)o[s]=e.style[s],e.style[s]=t[s];i=n.apply(e,r||[]);for(s in t)e.style[s]=o[s];return i};var It=/alpha\([^)]*\)/i,qt=/opacity\s*=\s*([^)]*)/,Rt=/^(none|table(?!-c[ea]).+)/,Ut=new RegExp("^("+X+")(.*)$","i"),zt=new RegExp("^([+-])=("+X+")","i"),Wt={position:"absolute",visibility:"hidden",display:"block"},Xt={letterSpacing:0,fontWeight:400},Vt=["Webkit","O","Moz","ms"];p.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=Bt(e,"opacity");return n===""?"1":n}}}},cssNumber:{columnCount:!0,fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":c.cssFloat?"cssFloat":"styleFloat"},style:function(e,t,n,r){if(!e||e.nodeType===3||e.nodeType===8||!e.style)return;var i,s,o,u=p.camelCase(t),a=e.style;t=p.cssProps[u]||(p.cssProps[u]=$t(a,u)),o=p.cssHooks[t]||p.cssHooks[u];if(n===undefined)return o&&"get"in o&&(i=o.get(e,!1,r))!==undefined?i:a[t];s=typeof n,s==="string"&&(i=zt.exec(n))&&(n=(i[1]+1)*i[2]+parseFloat(p.css(e,t)),s="number");if(n==null||n!==n)return;s==="number"&&!p.cssNumber[u]&&(n+="px"),!c.clearCloneStyle&&n===""&&t.indexOf("background")===0&&(a[t]="inherit");if(!o||!("set"in o)||(n=o.set(e,n,r))!==undefined)try{a[t]="",a[t]=n}catch(f){}},css:function(e,t,n,r){var i,s,o,u=p.camelCase(t);return t=p.cssProps[u]||(p.cssProps[u]=$t(e.style,u)),o=p.cssHooks[t]||p.cssHooks[u],o&&"get"in o&&(s=o.get(e,!0,n)),s===undefined&&(s=Bt(e,t,r)),s==="normal"&&t in Xt&&(s=Xt[t]),n===""||n?(i=parseFloat(s),n===!0||p.isNumeric(i)?i||0:s):s}}),p.each(["height","width"],function(e,t){p.cssHooks[t]={get:function(e,n,r){if(n)return e.offsetWidth===0&&Rt.test(p.css(e,"display"))?p.swap(e,Wt,function(){return Gt(e,t,r)}):Gt(e,t,r)},set:function(e,n,r){var i=r&&Ht(e);return Kt(e,n,r?Qt(e,t,r,c.boxSizing()&&p.css(e,"boxSizing",!1,i)==="border-box",i):0)}}}),c.opacity||(p.cssHooks.opacity={get:function(e,t){return qt.test((t&&e.currentStyle?e.currentStyle.filter:e.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":t?"1":""},set:function(e,t){var n=e.style,r=e.currentStyle,i=p.isNumeric(t)?"alpha(opacity="+t*100+")":"",s=r&&r.filter||n.filter||"";n.zoom=1;if((t>=1||t==="")&&p.trim(s.replace(It,""))===""&&n.removeAttribute){n.removeAttribute("filter");if(t===""||r&&!r.filter)return}n.filter=It.test(s)?s.replace(It,i):s+" "+i}}),p.cssHooks.marginRight=Ft(c.reliableMarginRight,function(e,t){if(t)return p.swap(e,{display:"inline-block"},Bt,[e,"marginRight"])}),p.each({margin:"",padding:"",border:"Width"},function(e,t){p.cssHooks[e+t]={expand:function(n){var r=0,i={},s=typeof n=="string"?n.split(" "):[n];for(;r<4;r++)i[e+V[r]+t]=s[r]||s[r-2]||s[0];return i}},Dt.test(e)||(p.cssHooks[e+t].set=Kt)}),p.fn.extend({css:function(e,t){return J(this,function(e,t,n){var r,i,s={},o=0;if(p.isArray(t)){r=Ht(e),i=t.length;for(;o<i;o++)s[t[o]]=p.css(e,t[o],!1,r);return s}return n!==undefined?p.style(e,t,n):p.css(e,t)},e,t,arguments.length>1)},show:function(){return Jt(this,!0)},hide:function(){return Jt(this)},toggle:function(e){return typeof e=="boolean"?e?this.show():this.hide():this.each(function(){$(this)?p(this).show():p(this).hide()})}}),p.Tween=Yt,Yt.prototype={constructor:Yt,init:function(e,t,n,r,i,s){this.elem=e,this.prop=n,this.easing=i||"swing",this.options=t,this.start=this.now=this.cur(),this.end=r,this.unit=s||(p.cssNumber[n]?"":"px")},cur:function(){var e=Yt.propHooks[this.prop];return e&&e.get?e.get(this):Yt.propHooks._default.get(this)},run:function(e){var t,n=Yt.propHooks[this.prop];return this.options.duration?this.pos=t=p.easing[this.easing](e,this.options.duration*e,0,1,this.options.duration):this.pos=t=e,this.now=(this.end-this.start)*t+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),n&&n.set?n.set(this):Yt.propHooks._default.set(this),this}},Yt.prototype.init.prototype=Yt.prototype,Yt.propHooks={_default:{get:function(e){var t;return e.elem[e.prop]==null||!!e.elem.style&&e.elem.style[e.prop]!=null?(t=p.css(e.elem,e.prop,""),!t||t==="auto"?0:t):e.elem[e.prop]},set:function(e){p.fx.step[e.prop]?p.fx.step[e.prop](e):e.elem.style&&(e.elem.style[p.cssProps[e.prop]]!=null||p.cssHooks[e.prop])?p.style(e.elem,e.prop,e.now+e.unit):e.elem[e.prop]=e.now}}},Yt.propHooks.scrollTop=Yt.propHooks.scrollLeft={set:function(e){e.elem.nodeType&&e.elem.parentNode&&(e.elem[e.prop]=e.now)}},p.easing={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math.PI)/2}},p.fx=Yt.prototype.init,p.fx.step={};var Zt,en,tn=/^(?:toggle|show|hide)$/,nn=new RegExp("^(?:([+-])=|)("+X+")([a-z%]*)$","i"),rn=/queueHooks$/,sn=[ln],on={"*":[function(e,t){var n=this.createTween(e,t),r=n.cur(),i=nn.exec(t),s=i&&i[3]||(p.cssNumber[e]?"":"px"),o=(p.cssNumber[e]||s!=="px"&&+r)&&nn.exec(p.css(n.elem,e)),u=1,a=20;if(o&&o[3]!==s){s=s||o[3],i=i||[],o=+r||1;do u=u||".5",o/=u,p.style(n.elem,e,o+s);while(u!==(u=n.cur()/r)&&u!==1&&--a)}return i&&(o=n.start=+o||+r||0,n.unit=s,n.end=i[1]?o+(i[1]+1)*i[2]:+i[2]),n}]};p.Animation=p.extend(hn,{tweener:function(e,t){p.isFunction(e)?(t=e,e=["*"]):e=e.split(" ");var n,r=0,i=e.length;for(;r<i;r++)n=e[r],on[n]=on[n]||[],on[n].unshift(t)},prefilter:function(e,t){t?sn.unshift(e):sn.push(e)}}),p.speed=function(e,t,n){var r=e&&typeof e=="object"?p.extend({},e):{complete:n||!n&&t||p.isFunction(e)&&e,duration:e,easing:n&&t||t&&!p.isFunction(t)&&t};r.duration=p.fx.off?0:typeof r.duration=="number"?r.duration:r.duration in p.fx.speeds?p.fx.speeds[r.duration]:p.fx.speeds._default;if(r.queue==null||r.queue===!0)r.queue="fx";return r.old=r.complete,r.complete=function(){p.isFunction(r.old)&&r.old.call(this),r.queue&&p.dequeue(this,r.queue)},r},p.fn.extend({fadeTo:function(e,t,n,r){return this.filter($).css("opacity",0).show().end().animate({opacity:t},e,n,r)},animate:function(e,t,n,r){var i=p.isEmptyObject(e),s=p.speed(t,n,r),o=function(){var t=hn(this,p.extend({},e),s);(i||p._data(this,"finish"))&&t.stop(!0)};return o.finish=o,i||s.queue===!1?this.each(o):this.queue(s.queue,o)},stop:function(e,t,n){var r=function(e){var t=e.stop;delete e.stop,t(n)};return typeof e!="string"&&(n=t,t=e,e=undefined),t&&e!==!1&&this.queue(e||"fx",[]),this.each(function(){var t=!0,i=e!=null&&e+"queueHooks",s=p.timers,o=p._data(this);if(i)o[i]&&o[i].stop&&r(o[i]);else for(i in o)o[i]&&o[i].stop&&rn.test(i)&&r(o[i]);for(i=s.length;i--;)s[i].elem===this&&(e==null||s[i].queue===e)&&(s[i].anim.stop(n),t=!1,s.splice(i,1));(t||!n)&&p.dequeue(this,e)})},finish:function(e){return e!==!1&&(e=e||"fx"),this.each(function(){var t,n=p._data(this),r=n[e+"queue"],i=n[e+"queueHooks"],s=p.timers,o=r?r.length:0;n.finish=!0,p.queue(this,e,[]),i&&i.stop&&i.stop.call(this,!0);for(t=s.length;t--;)s[t].elem===this&&s[t].queue===e&&(s[t].anim.stop(!0),s.splice(t,1));for(t=0;t<o;t++)r[t]&&r[t].finish&&r[t].finish.call(this);delete n.finish})}}),p.each(["toggle","show","hide"],function(e,t){var n=p.fn[t];p.fn[t]=function(e,r,i){return e==null||typeof e=="boolean"?n.apply(this,arguments):this.animate(an(t,!0),e,r,i)}}),p.each({slideDown:an("show"),slideUp:an("hide"),slideToggle:an("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(e,t){p.fn[e]=function(e,n,r){return this.animate(t,e,n,r)}}),p.timers=[],p.fx.tick=function(){var e,t=p.timers,n=0;Zt=p.now();for(;n<t.length;n++)e=t[n],!e()&&t[n]===e&&t.splice(n--,1);t.length||p.fx.stop(),Zt=undefined},p.fx.timer=function(e){p.timers.push(e),e()?p.fx.start():p.timers.pop()},p.fx.interval=13,p.fx.start=function(){en||(en=setInterval(p.fx.tick,p.fx.interval))},p.fx.stop=function(){clearInterval(en),en=null},p.fx.speeds={slow:600,fast:200,_default:400},p.fn.delay=function(e,t){return e=p.fx?p.fx.speeds[e]||e:e,t=t||"fx",this.queue(t,function(t,n){var r=setTimeout(t,e);n.stop=function(){clearTimeout(r)}})},function(){var e,t,n,r,i=N.createElement("div");i.setAttribute("className","t"),i.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",e=i.getElementsByTagName("a")[0],n=N.createElement("select"),r=n.appendChild(N.createElement("option")),t=i.getElementsByTagName("input")[0],e.style.cssText="top:1px",c.getSetAttribute=i.className!=="t",c.style=/top/.test(e.getAttribute("style")),c.hrefNormalized=e.getAttribute("href")==="/a",c.checkOn=!!t.value,c.optSelected=r.selected,c.enctype=!!N.createElement("form").enctype,n.disabled=!0,c.optDisabled=!r.disabled,t=N.createElement("input"),t.setAttribute("value",""),c.input=t.getAttribute("value")==="",t.value="t",t.setAttribute("type","radio"),c.radioValue=t.value==="t",e=t=n=r=i=null}();var pn=/\r/g;p.fn.extend({val:function(e){var t,n,r,i=this[0];if(!arguments.length){if(i)return t=p.valHooks[i.type]||p.valHooks[i.nodeName.toLowerCase()],t&&"get"in t&&(n=t.get(i,"value"))!==undefined?n:(n=i.value,typeof n=="string"?n.replace(pn,""):n==null?"":n);return}return r=p.isFunction(e),this.each(function(n){var i;if(this.nodeType!==1)return;r?i=e.call(this,n,p(this).val()):i=e,i==null?i="":typeof i=="number"?i+="":p.isArray(i)&&(i=p.map(i,function(e){return e==null?"":e+""})),t=p.valHooks[this.type]||p.valHooks[this.nodeName.toLowerCase()];if(!t||!("set"in t)||t.set(this,i,"value")===undefined)this.value=i})}}),p.extend({valHooks:{option:{get:function(e){var t=p.find.attr(e,"value");return t!=null?t:p.text(e)}},select:{get:function(e){var t,n,r=e.options,i=e.selectedIndex,s=e.type==="select-one"||i<0,o=s?null:[],u=s?i+1:r.length,a=i<0?u:s?i:0;for(;a<u;a++){n=r[a];if((n.selected||a===i)&&(c.optDisabled?!n.disabled:n.getAttribute("disabled")===null)&&(!n.parentNode.disabled||!p.nodeName(n.parentNode,"optgroup"))){t=p(n).val();if(s)return t;o.push(t)}}return o},set:function(e,t){var n,r,i=e.options,s=p.makeArray(t),o=i.length;while(o--){r=i[o];if(p.inArray(p.valHooks.option.get(r),s)>=0)try{r.selected=n=!0}catch(u){r.scrollHeight}else r.selected=!1}return n||(e.selectedIndex=-1),i}}}}),p.each(["radio","checkbox"],function(){p.valHooks[this]={set:function(e,t){if(p.isArray(t))return e.checked=p.inArray(p(e).val(),t)>=0}},c.checkOn||(p.valHooks[this].get=function(e){return e.getAttribute("value")===null?"on":e.value})});var dn,vn,mn=p.expr.attrHandle,gn=/^(?:checked|selected)$/i,yn=c.getSetAttribute,bn=c.input;p.fn.extend({attr:function(e,t){return J(this,p.attr,e,t,arguments.length>1)},removeAttr:function(e){return this.each(function(){p.removeAttr(this,e)})}}),p.extend({attr:function(e,t,n){var r,i,s=e.nodeType;if(!e||s===3||s===8||s===2)return;if(typeof e.getAttribute===j)return p.prop(e,t,n);if(s!==1||!p.isXMLDoc(e))t=t.toLowerCase(),r=p.attrHooks[t]||(p.expr.match.bool.test(t)?vn:dn);if(n===undefined)return r&&"get"in r&&(i=r.get(e,t))!==null?i:(i=p.find.attr(e,t),i==null?undefined:i);if(n!==null)return r&&"set"in r&&(i=r.set(e,n,t))!==undefined?i:(e.setAttribute(t,n+""),n);p.removeAttr(e,t)},removeAttr:function(e,t){var n,r,i=0,s=t&&t.match(M);if(s&&e.nodeType===1)while(n=s[i++])r=p.propFix[n]||n,p.expr.match.bool.test(n)?bn&&yn||!gn.test(n)?e[r]=!1:e[p.camelCase("default-"+n)]=e[r]=!1:p.attr(e,n,""),e.removeAttribute(yn?n:r)},attrHooks:{type:{set:function(e,t){if(!c.radioValue&&t==="radio"&&p.nodeName(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}}}),vn={set:function(e,t,n){return t===!1?p.removeAttr(e,n):bn&&yn||!gn.test(n)?e.setAttribute(!yn&&p.propFix[n]||n,n):e[p.camelCase("default-"+n)]=e[n]=!0,n}},p.each(p.expr.match.bool.source.match(/\w+/g),function(e,t){var n=mn[t]||p.find.attr;mn[t]=bn&&yn||!gn.test(t)?function(e,t,r){var i,s;return r||(s=mn[t],mn[t]=i,i=n(e,t,r)!=null?t.toLowerCase():null,mn[t]=s),i}:function(e,t,n){if(!n)return e[p.camelCase("default-"+t)]?t.toLowerCase():null}});if(!bn||!yn)p.attrHooks.value={set:function(e,t,n){if(!p.nodeName(e,"input"))return dn&&dn.set(e,t,n);e.defaultValue=t}};yn||(dn={set:function(e,t,n){var r=e.getAttributeNode(n);r||e.setAttributeNode(r=e.ownerDocument.createAttribute(n)),r.value=t+="";if(n==="value"||t===e.getAttribute(n))return t}},mn.id=mn.name=mn.coords=function(e,t,n){var r;if(!n)return(r=e.getAttributeNode(t))&&r.value!==""?r.value:null},p.valHooks.button={get:function(e,t){var n=e.getAttributeNode(t);if(n&&n.specified)return n.value},set:dn.set},p.attrHooks.contenteditable={set:function(e,t,n){dn.set(e,t===""?!1:t,n)}},p.each(["width","height"],function(e,t){p.attrHooks[t]={set:function(e,n){if(n==="")return e.setAttribute(t,"auto"),n}}})),c.style||(p.attrHooks.style={get:function(e){return e.style.cssText||undefined},set:function(e,t){return e.style.cssText=t+""}});var wn=/^(?:input|select|textarea|button|object)$/i,En=/^(?:a|area)$/i;p.fn.extend({prop:function(e,t){return J(this,p.prop,e,t,arguments.length>1)},removeProp:function(e){return e=p.propFix[e]||e,this.each(function(){try{this[e]=undefined,delete this[e]}catch(t){}})}}),p.extend({propFix:{"for":"htmlFor","class":"className"},prop:function(e,t,n){var r,i,s,o=e.nodeType;if(!e||o===3||o===8||o===2)return;return s=o!==1||!p.isXMLDoc(e),s&&(t=p.propFix[t]||t,i=p.propHooks[t]),n!==undefined?i&&"set"in i&&(r=i.set(e,n,t))!==undefined?r:e[t]=n:i&&"get"in i&&(r=i.get(e,t))!==null?r:e[t]},propHooks:{tabIndex:{get:function(e){var t=p.find.attr(e,"tabindex");return t?parseInt(t,10):wn.test(e.nodeName)||En.test(e.nodeName)&&e.href?0:-1}}}}),c.hrefNormalized||p.each(["href","src"],function(e,t){p.propHooks[t]={get:function(e){return e.getAttribute(t,4)}}}),c.optSelected||(p.propHooks.selected={get:function(e){var t=e.parentNode;return t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex),null}}),p.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){p.propFix[this.toLowerCase()]=this}),c.enctype||(p.propFix.enctype="encoding");var Sn=/[\t\r\n\f]/g;p.fn.extend({addClass:function(e){var t,n,r,i,s,o,u=0,a=this.length,f=typeof e=="string"&&e;if(p.isFunction(e))return this.each(function(t){p(this).addClass(e.call(this,t,this.className))});if(f){t=(e||"").match(M)||[];for(;u<a;u++){n=this[u],r=n.nodeType===1&&(n.className?(" "+n.className+" ").replace(Sn," "):" ");if(r){s=0;while(i=t[s++])r.indexOf(" "+i+" ")<0&&(r+=i+" ");o=p.trim(r),n.className!==o&&(n.className=o)}}}return this},removeClass:function(e){var t,n,r,i,s,o,u=0,a=this.length,f=arguments.length===0||typeof e=="string"&&e;if(p.isFunction(e))return this.each(function(t){p(this).removeClass(e.call(this,t,this.className))});if(f){t=(e||"").match(M)||[];for(;u<a;u++){n=this[u],r=n.nodeType===1&&(n.className?(" "+n.className+" ").replace(Sn," "):"");if(r){s=0;while(i=t[s++])while(r.indexOf(" "+i+" ")>=0)r=r.replace(" "+i+" "," ");o=e?p.trim(r):"",n.className!==o&&(n.className=o)}}}return this},toggleClass:function(e,t){var n=typeof e;return typeof t=="boolean"&&n==="string"?t?this.addClass(e):this.removeClass(e):p.isFunction(e)?this.each(function(n){p(this).toggleClass(e.call(this,n,this.className,t),t)}):this.each(function(){if(n==="string"){var t,r=0,i=p(this),s=e.match(M)||[];while(t=s[r++])i.hasClass(t)?i.removeClass(t):i.addClass(t)}else if(n===j||n==="boolean")this.className&&p._data(this,"__className__",this.className),this.className=this.className||e===!1?"":p._data(this,"__className__")||""})},hasClass:function(e){var t=" "+e+" ",n=0,r=this.length;for(;n<r;n++)if(this[n].nodeType===1&&(" "+this[n].className+" ").replace(Sn," ").indexOf(t)>=0)return!0;return!1}}),p.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(e,t){p.fn[t]=function(e,n){return arguments.length>0?this.on(t,null,e,n):this.trigger(t)}}),p.fn.extend({hover:function(e,t){return this.mouseenter(e).mouseleave(t||e)},bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return arguments.length===1?this.off(e,"**"):this.off(t,e||"**",n)}});var xn=p.now(),Tn=/\?/,Nn=/(,)|(\[|{)|(}|])|"(?:[^"\\\r\n]|\\["\\\/bfnrt]|\\u[\da-fA-F]{4})*"\s*:?|true|false|null|-?(?!0\d)\d+(?:\.\d+|)(?:[eE][+-]?\d+|)/g;p.parseJSON=function(t){if(e.JSON&&e.JSON.parse)return e.JSON.parse(t+"");var n,r=null,i=p.trim(t+"");return i&&!p.trim(i.replace(Nn,function(e,t,i,s){return n&&t&&(r=0),r===0?e:(n=i||t,r+=!s-!i,"")}))?Function("return "+i)():p.error("Invalid JSON: "+t)},p.parseXML=function(t){var n,r;if(!t||typeof t!="string")return null;try{e.DOMParser?(r=new DOMParser,n=r.parseFromString(t,"text/xml")):(n=new ActiveXObject("Microsoft.XMLDOM"),n.async="false",n.loadXML(t))}catch(i){n=undefined}return(!n||!n.documentElement||n.getElementsByTagName("parsererror").length)&&p.error("Invalid XML: "+t),n};var Cn,kn,Ln=/#.*$/,An=/([?&])_=[^&]*/,On=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,Mn=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,_n=/^(?:GET|HEAD)$/,Dn=/^\/\//,Pn=/^([\w.+-]+:)(?:\/\/(?:[^\/?#]*@|)([^\/?#:]*)(?::(\d+)|)|)/,Hn={},Bn={},jn="*/".concat("*");try{kn=location.href}catch(Fn){kn=N.createElement("a"),kn.href="",kn=kn.href}Cn=Pn.exec(kn.toLowerCase())||[],p.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:kn,type:"GET",isLocal:Mn.test(Cn[1]),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":jn,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":p.parseJSON,"text xml":p.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(e,t){return t?Rn(Rn(e,p.ajaxSettings),t):Rn(p.ajaxSettings,e)},ajaxPrefilter:In(Hn),ajaxTransport:In(Bn),ajax:function(e,t){function x(e,t,n,r){var f,g,y,w,S,x=t;if(b===2)return;b=2,o&&clearTimeout(o),a=undefined,s=r||"",E.readyState=e>0?4:0,f=e>=200&&e<300||e===304,n&&(w=Un(l,E,n)),w=zn(l,w,E,f);if(f)l.ifModified&&(S=E.getResponseHeader("Last-Modified"),S&&(p.lastModified[i]=S),S=E.getResponseHeader("etag"),S&&(p.etag[i]=S)),e===204||l.type==="HEAD"?x="nocontent":e===304?x="notmodified":(x=w.state,g=w.data,y=w.error,f=!y);else{y=x;if(e||!x)x="error",e<0&&(e=0)}E.status=e,E.statusText=(t||x)+"",f?d.resolveWith(c,[g,x,E]):d.rejectWith(c,[E,x,y]),E.statusCode(m),m=undefined,u&&h.trigger(f?"ajaxSuccess":"ajaxError",[E,l,f?g:y]),v.fireWith(c,[E,x]),u&&(h.trigger("ajaxComplete",[E,l]),--p.active||p.event.trigger("ajaxStop"))}typeof e=="object"&&(t=e,e=undefined),t=t||{};var n,r,i,s,o,u,a,f,l=p.ajaxSetup({},t),c=l.context||l,h=l.context&&(c.nodeType||c.jquery)?p(c):p.event,d=p.Deferred(),v=p.Callbacks("once memory"),m=l.statusCode||{},g={},y={},b=0,w="canceled",E={readyState:0,getResponseHeader:function(e){var t;if(b===2){if(!f){f={};while(t=On.exec(s))f[t[1].toLowerCase()]=t[2]}t=f[e.toLowerCase()]}return t==null?null:t},getAllResponseHeaders:function(){return b===2?s:null},setRequestHeader:function(e,t){var n=e.toLowerCase();return b||(e=y[n]=y[n]||e,g[e]=t),this},overrideMimeType:function(e){return b||(l.mimeType=e),this},statusCode:function(e){var t;if(e)if(b<2)for(t in e)m[t]=[m[t],e[t]];else E.always(e[E.status]);return this},abort:function(e){var t=e||w;return a&&a.abort(t),x(0,t),this}};d.promise(E).complete=v.add,E.success=E.done,E.error=E.fail,l.url=((e||l.url||kn)+"").replace(Ln,"").replace(Dn,Cn[1]+"//"),l.type=t.method||t.type||l.method||l.type,l.dataTypes=p.trim(l.dataType||"*").toLowerCase().match(M)||[""],l.crossDomain==null&&(n=Pn.exec(l.url.toLowerCase()),l.crossDomain=!(!n||n[1]===Cn[1]&&n[2]===Cn[2]&&(n[3]||(n[1]==="http:"?"80":"443"))===(Cn[3]||(Cn[1]==="http:"?"80":"443")))),l.data&&l.processData&&typeof l.data!="string"&&(l.data=p.param(l.data,l.traditional)),qn(Hn,l,t,E);if(b===2)return E;u=l.global,u&&p.active++===0&&p.event.trigger("ajaxStart"),l.type=l.type.toUpperCase(),l.hasContent=!_n.test(l.type),i=l.url,l.hasContent||(l.data&&(i=l.url+=(Tn.test(i)?"&":"?")+l.data,delete l.data),l.cache===!1&&(l.url=An.test(i)?i.replace(An,"$1_="+xn++):i+(Tn.test(i)?"&":"?")+"_="+xn++)),l.ifModified&&(p.lastModified[i]&&E.setRequestHeader("If-Modified-Since",p.lastModified[i]),p.etag[i]&&E.setRequestHeader("If-None-Match",p.etag[i])),(l.data&&l.hasContent&&l.contentType!==!1||t.contentType)&&E.setRequestHeader("Content-Type",l.contentType),E.setRequestHeader("Accept",l.dataTypes[0]&&l.accepts[l.dataTypes[0]]?l.accepts[l.dataTypes[0]]+(l.dataTypes[0]!=="*"?", "+jn+"; q=0.01":""):l.accepts["*"]);for(r in l.headers)E.setRequestHeader(r,l.headers[r]);if(!l.beforeSend||l.beforeSend.call(c,E,l)!==!1&&b!==2){w="abort";for(r in{success:1,error:1,complete:1})E[r](l[r]);a=qn(Bn,l,t,E);if(!a)x(-1,"No Transport");else{E.readyState=1,u&&h.trigger("ajaxSend",[E,l]),l.async&&l.timeout>0&&(o=setTimeout(function(){E.abort("timeout")},l.timeout));try{b=1,a.send(g,x)}catch(S){if(!(b<2))throw S;x(-1,S)}}return E}return E.abort()},getJSON:function(e,t,n){return p.get(e,t,n,"json")},getScript:function(e,t){return p.get(e,undefined,t,"script")}}),p.each(["get","post"],function(e,t){p[t]=function(e,n,r,i){return p.isFunction(n)&&(i=i||r,r=n,n=undefined),p.ajax({url:e,type:t,dataType:i,data:n,success:r})}}),p.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){p.fn[t]=function(e){return this.on(t,e)}}),p._evalUrl=function(e){return p.ajax({url:e,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0})},p.fn.extend({wrapAll:function(e){if(p.isFunction(e))return this.each(function(t){p(this).wrapAll(e.call(this,t))});if(this[0]){var t=p(e,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){var e=this;while(e.firstChild&&e.firstChild.nodeType===1)e=e.firstChild;return e}).append(this)}return this},wrapInner:function(e){return p.isFunction(e)?this.each(function(t){p(this).wrapInner(e.call(this,t))}):this.each(function(){var t=p(this),n=t.contents();n.length?n.wrapAll(e):t.append(e)})},wrap:function(e){var t=p.isFunction(e);return this.each(function(n){p(this).wrapAll(t?e.call(this,n):e)})},unwrap:function(){return this.parent().each(function(){p.nodeName(this,"body")||p(this).replaceWith(this.childNodes)}).end()}}),p.expr.filters.hidden=function(e){return e.offsetWidth<=0&&e.offsetHeight<=0||!c.reliableHiddenOffsets()&&(e.style&&e.style.display||p.css(e,"display"))==="none"},p.expr.filters.visible=function(e){return!p.expr.filters.hidden(e)};var Wn=/%20/g,Xn=/\[\]$/,Vn=/\r?\n/g,$n=/^(?:submit|button|image|reset|file)$/i,Jn=/^(?:input|select|textarea|keygen)/i;p.param=function(e,t){var n,r=[],i=function(e,t){t=p.isFunction(t)?t():t==null?"":t,r[r.length]=encodeURIComponent(e)+"="+encodeURIComponent(t)};t===undefined&&(t=p.ajaxSettings&&p.ajaxSettings.traditional);if(p.isArray(e)||e.jquery&&!p.isPlainObject(e))p.each(e,function(){i(this.name,this.value)});else for(n in e)Kn(n,e[n],t,i);return r.join("&").replace(Wn,"+")},p.fn.extend({serialize:function(){return p.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var e=p.prop(this,"elements");return e?p.makeArray(e):this}).filter(function(){var e=this.type;return this.name&&!p(this).is(":disabled")&&Jn.test(this.nodeName)&&!$n.test(e)&&(this.checked||!K.test(e))}).map(function(e,t){var n=p(this).val();return n==null?null:p.isArray(n)?p.map(n,function(e){return{name:t.name,value:e.replace(Vn,"\r\n")}}):{name:t.name,value:n.replace(Vn,"\r\n")}}).get()}}),p.ajaxSettings.xhr=e.ActiveXObject!==undefined?function(){return!this.isLocal&&/^(get|post|head|put|delete|options)$/i.test(this.type)&&Zn()||er()}:Zn;var Qn=0,Gn={},Yn=p.ajaxSettings.xhr();e.ActiveXObject&&p(e).on("unload",function(){for(var e in Gn)Gn[e](undefined,!0)}),c.cors=!!Yn&&"withCredentials"in Yn,Yn=c.ajax=!!Yn,Yn&&p.ajaxTransport(function(e){if(!e.crossDomain||c.cors){var t;return{send:function(n,r){var i,s=e.xhr(),o=++Qn;s.open(e.type,e.url,e.async,e.username,e.password);if(e.xhrFields)for(i in e.xhrFields)s[i]=e.xhrFields[i];e.mimeType&&s.overrideMimeType&&s.overrideMimeType(e.mimeType),!e.crossDomain&&!n["X-Requested-With"]&&(n["X-Requested-With"]="XMLHttpRequest");for(i in n)n[i]!==undefined&&s.setRequestHeader(i,n[i]+"");s.send(e.hasContent&&e.data||null),t=function(n,i){var u,a,f;if(t&&(i||s.readyState===4)){delete Gn[o],t=undefined,s.onreadystatechange=p.noop;if(i)s.readyState!==4&&s.abort();else{f={},u=s.status,typeof s.responseText=="string"&&(f.text=s.responseText);try{a=s.statusText}catch(l){a=""}!u&&e.isLocal&&!e.crossDomain?u=f.text?200:404:u===1223&&(u=204)}}f&&r(u,a,f,s.getAllResponseHeaders())},e.async?s.readyState===4?setTimeout(t):s.onreadystatechange=Gn[o]=t:t()},abort:function(){t&&t(undefined,!0)}}}}),p.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/(?:java|ecma)script/},converters:{"text script":function(e){return p.globalEval(e),e}}}),p.ajaxPrefilter("script",function(e){e.cache===undefined&&(e.cache=!1),e.crossDomain&&(e.type="GET",e.global=!1)}),p.ajaxTransport("script",function(e){if(e.crossDomain){var t,n=N.head||p("head")[0]||N.documentElement;return{send:function(r,i){t=N.createElement("script"),t.async=!0,e.scriptCharset&&(t.charset=e.scriptCharset),t.src=e.url,t.onload=t.onreadystatechange=function(e,n){if(n||!t.readyState||/loaded|complete/.test(t.readyState))t.onload=t.onreadystatechange=null,t.parentNode&&t.parentNode.removeChild(t),t=null,n||i(200,"success")},n.insertBefore(t,n.firstChild)},abort:function(){t&&t.onload(undefined,!0)}}}});var tr=[],nr=/(=)\?(?=&|$)|\?\?/;p.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=tr.pop()||p.expando+"_"+xn++;return this[e]=!0,e}}),p.ajaxPrefilter("json jsonp",function(t,n,r){var i,s,o,u=t.jsonp!==!1&&(nr.test(t.url)?"url":typeof t.data=="string"&&!(t.contentType||"").indexOf("application/x-www-form-urlencoded")&&nr.test(t.data)&&"data");if(u||t.dataTypes[0]==="jsonp")return i=t.jsonpCallback=p.isFunction(t.jsonpCallback)?t.jsonpCallback():t.jsonpCallback,u?t[u]=t[u].replace(nr,"$1"+i):t.jsonp!==!1&&(t.url+=(Tn.test(t.url)?"&":"?")+t.jsonp+"="+i),t.converters["script json"]=function(){return o||p.error(i+" was not called"),o[0]},t.dataTypes[0]="json",s=e[i],e[i]=function(){o=arguments},r.always(function(){e[i]=s,t[i]&&(t.jsonpCallback=n.jsonpCallback,tr.push(i)),o&&p.isFunction(s)&&s(o[0]),o=s=undefined}),"script"}),p.parseHTML=function(e,t,n){if(!e||typeof e!="string")return null;typeof t=="boolean"&&(n=t,t=!1),t=t||N;var r=E.exec(e),i=!n&&[];return r?[t.createElement(r[1])]:(r=p.buildFragment([e],t,i),i&&i.length&&p(i).remove(),p.merge([],r.childNodes))};var rr=p.fn.load;p.fn.load=function(e,t,n){if(typeof e!="string"&&rr)return rr.apply(this,arguments);var r,i,s,o=this,u=e.indexOf(" ");return u>=0&&(r=e.slice(u,e.length),e=e.slice(0,u)),p.isFunction(t)?(n=t,t=undefined):t&&typeof t=="object"&&(s="POST"),o.length>0&&p.ajax({url:e,type:s,dataType:"html",data:t}).done(function(e){i=arguments,o.html(r?p("<div>").append(p.parseHTML(e)).find(r):e)}).complete(n&&function(e,t){o.each(n,i||[e.responseText,t,e])}),this},p.expr.filters.animated=function(e){return p.grep(p.timers,function(t){return e===t.elem}).length};var ir=e.document.documentElement;p.offset={setOffset:function(e,t,n){var r,i,s,o,u,a,f,l=p.css(e,"position"),c=p(e),h={};l==="static"&&(e.style.position="relative"),u=c.offset(),s=p.css(e,"top"),a=p.css(e,"left"),f=(l==="absolute"||l==="fixed")&&p.inArray("auto",[s,a])>-1,f?(r=c.position(),o=r.top,i=r.left):(o=parseFloat(s)||0,i=parseFloat(a)||0),p.isFunction(t)&&(t=t.call(e,n,u)),t.top!=null&&(h.top=t.top-u.top+o),t.left!=null&&(h.left=t.left-u.left+i),"using"in t?t.using.call(e,h):c.css(h)}},p.fn.extend({offset:function(e){if(arguments.length)return e===undefined?this:this.each(function(t){p.offset.setOffset(this,e,t)});var t,n,r={top:0,left:0},i=this[0],s=i&&i.ownerDocument;if(!s)return;return t=s.documentElement,p.contains(t,i)?(typeof i.getBoundingClientRect!==j&&(r=i.getBoundingClientRect()),n=sr(s),{top:r.top+(n.pageYOffset||t.scrollTop)-(t.clientTop||0),left:r.left+(n.pageXOffset||t.scrollLeft)-(t.clientLeft||0)}):r},position:function(){if(!this[0])return;var e,t,n={top:0,left:0},r=this[0];return p.css(r,"position")==="fixed"?t=r.getBoundingClientRect():(e=this.offsetParent(),t=this.offset(),p.nodeName(e[0],"html")||(n=e.offset()),n.top+=p.css(e[0],"borderTopWidth",!0),n.left+=p.css(e[0],"borderLeftWidth",!0)),{top:t.top-n.top-p.css(r,"marginTop",!0),left:t.left-n.left-p.css(r,"marginLeft",!0)}},offsetParent:function(){return this.map(function(){var e=this.offsetParent||ir;while(e&&!p.nodeName(e,"html")&&p.css(e,"position")==="static")e=e.offsetParent;return e||ir})}}),p.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(e,t){var n=/Y/.test(t);p.fn[e]=function(r){return J(this,function(e,r,i){var s=sr(e);if(i===undefined)return s?t in s?s[t]:s.document.documentElement[r]:e[r];s?s.scrollTo(n?p(s).scrollLeft():i,n?i:p(s).scrollTop()):e[r]=i},e,r,arguments.length,null)}}),p.each(["top","left"],function(e,t){p.cssHooks[t]=Ft(c.pixelPosition,function(e,n){if(n)return n=Bt(e,t),Pt.test(n)?p(e).position()[t]+"px":n})}),p.each({Height:"height",Width:"width"},function(e,t){p.each({padding:"inner"+e,content:t,"":"outer"+e},function(n,r){p.fn[r]=function(r,i){var s=arguments.length&&(n||typeof r!="boolean"),o=n||(r===!0||i===!0?"margin":"border");return J(this,function(t,n,r){var i;return p.isWindow(t)?t.document.documentElement["client"+e]:t.nodeType===9?(i=t.documentElement,Math.max(t.body["scroll"+e],i["scroll"+e],t.body["offset"+e],i["offset"+e],i["client"+e])):r===undefined?p.css(t,n,o):p.style(t,n,r,o)},t,s?r:undefined,s,null)}})}),p.fn.size=function(){return this.length},p.fn.andSelf=p.fn.addBack,typeof define=="function"&&define.amd&&define("jquery",[],function(){return p});var or=e.jQuery,ur=e.$;return p.noConflict=function(t){return e.$===p&&(e.$=ur),t&&e.jQuery===p&&(e.jQuery=or),p},typeof t===j&&(e.jQuery=e.$=p),p}),define("jquery-private",["jquery"],function(e){return e.noConflict(!0)}),function(){function x(e){function t(t,n,r,i,s,o){for(;s>=0&&s<o;s+=e){var u=i?i[s]:s;r=n(r,t[u],u,t)}return r}return function(n,r,i,s){r=v(r,s,4);var o=!S(n)&&d.keys(n),u=(o||n).length,a=e>0?0:u-1;return arguments.length<3&&(i=n[o?o[a]:a],a+=e),t(n,r,i,o,a,u)}}function C(e){return function(t,n,r){n=m(n,r);var i=E(t),s=e>0?0:i-1;for(;s>=0&&s<i;s+=e)if(n(t[s],s,t))return s;return-1}}function k(e,t,n){return function(r,i,s){var u=0,a=E(r);if(typeof s=="number")e>0?u=s>=0?s:Math.max(s+a,u):a=s>=0?Math.min(s+1,a):s+a+1;else if(n&&s&&a)return s=n(r,i),r[s]===i?s:-1;if(i!==i)return s=t(o.call(r,u,a),d.isNaN),s>=0?s+u:-1;for(s=e>0?u:a-1;s>=0&&s<a;s+=e)if(r[s]===i)return s;return-1}}function M(e,t){var n=O.length,i=e.constructor,s=d.isFunction(i)&&i.prototype||r,o="constructor";d.has(e,o)&&!d.contains(t,o)&&t.push(o);while(n--)o=O[n],o in e&&e[o]!==s[o]&&!d.contains(t,o)&&t.push(o)}var e=this,t=e._,n=Array.prototype,r=Object.prototype,i=Function.prototype,s=n.push,o=n.slice,u=r.toString,a=r.hasOwnProperty,f=Array.isArray,l=Object.keys,c=i.bind,h=Object.create,p=function(){},d=function(e){if(e instanceof d)return e;if(!(this instanceof d))return new d(e);this._wrapped=e};typeof exports!="undefined"?(typeof module!="undefined"&&module.exports&&(exports=module.exports=d),exports._=d):e._=d,d.VERSION="1.8.3";var v=function(e,t,n){if(t===void 0)return e;switch(n==null?3:n){case 1:return function(n){return e.call(t,n)};case 2:return function(n,r){return e.call(t,n,r)};case 3:return function(n,r,i){return e.call(t,n,r,i)};case 4:return function(n,r,i,s){return e.call(t,n,r,i,s)}}return function(){return e.apply(t,arguments)}},m=function(e,t,n){return e==null?d.identity:d.isFunction(e)?v(e,t,n):d.isObject(e)?d.matcher(e):d.property(e)};d.iteratee=function(e,t){return m(e,t,Infinity)};var g=function(e,t){return function(n){var r=arguments.length;if(r<2||n==null)return n;for(var i=1;i<r;i++){var s=arguments[i],o=e(s),u=o.length;for(var a=0;a<u;a++){var f=o[a];if(!t||n[f]===void 0)n[f]=s[f]}}return n}},y=function(e){if(!d.isObject(e))return{};if(h)return h(e);p.prototype=e;var t=new p;return p.prototype=null,t},b=function(e){return function(t){return t==null?void 0:t[e]}},w=Math.pow(2,53)-1,E=b("length"),S=function(e){var t=E(e);return typeof t=="number"&&t>=0&&t<=w};d.each=d.forEach=function(e,t,n){t=v(t,n);var r,i;if(S(e))for(r=0,i=e.length;r<i;r++)t(e[r],r,e);else{var s=d.keys(e);for(r=0,i=s.length;r<i;r++)t(e[s[r]],s[r],e)}return e},d.map=d.collect=function(e,t,n){t=m(t,n);var r=!S(e)&&d.keys(e),i=(r||e).length,s=Array(i);for(var o=0;o<i;o++){var u=r?r[o]:o;s[o]=t(e[u],u,e)}return s},d.reduce=d.foldl=d.inject=x(1),d.reduceRight=d.foldr=x(-1),d.find=d.detect=function(e,t,n){var r;S(e)?r=d.findIndex(e,t,n):r=d.findKey(e,t,n);if(r!==void 0&&r!==-1)return e[r]},d.filter=d.select=function(e,t,n){var r=[];return t=m(t,n),d.each(e,function(e,n,i){t(e,n,i)&&r.push(e)}),r},d.reject=function(e,t,n){return d.filter(e,d.negate(m(t)),n)},d.every=d.all=function(e,t,n){t=m(t,n);var r=!S(e)&&d.keys(e),i=(r||e).length;for(var s=0;s<i;s++){var o=r?r[s]:s;if(!t(e[o],o,e))return!1}return!0},d.some=d.any=function(e,t,n){t=m(t,n);var r=!S(e)&&d.keys(e),i=(r||e).length;for(var s=0;s<i;s++){var o=r?r[s]:s;if(t(e[o],o,e))return!0}return!1},d.contains=d.includes=d.include=function(e,t,n,r){S(e)||(e=d.values(e));if(typeof n!="number"||r)n=0;return d.indexOf(e,t,n)>=0},d.invoke=function(e,t){var n=o.call(arguments,2),r=d.isFunction(t);return d.map(e,function(e){var i=r?t:e[t];return i==null?i:i.apply(e,n)})},d.pluck=function(e,t){return d.map(e,d.property(t))},d.where=function(e,t){return d.filter(e,d.matcher(t))},d.findWhere=function(e,t){return d.find(e,d.matcher(t))},d.max=function(e,t,n){var r=-Infinity,i=-Infinity,s,o;if(t==null&&e!=null){e=S(e)?e:d.values(e);for(var u=0,a=e.length;u<a;u++)s=e[u],s>r&&(r=s)}else t=m(t,n),d.each(e,function(e,n,s){o=t(e,n,s);if(o>i||o===-Infinity&&r===-Infinity)r=e,i=o});return r},d.min=function(e,t,n){var r=Infinity,i=Infinity,s,o;if(t==null&&e!=null){e=S(e)?e:d.values(e);for(var u=0,a=e.length;u<a;u++)s=e[u],s<r&&(r=s)}else t=m(t,n),d.each(e,function(e,n,s){o=t(e,n,s);if(o<i||o===Infinity&&r===Infinity)r=e,i=o});return r},d.shuffle=function(e){var t=S(e)?e:d.values(e),n=t.length,r=Array(n);for(var i=0,s;i<n;i++)s=d.random(0,i),s!==i&&(r[i]=r[s]),r[s]=t[i];return r},d.sample=function(e,t,n){return t==null||n?(S(e)||(e=d.values(e)),e[d.random(e.length-1)]):d.shuffle(e).slice(0,Math.max(0,t))},d.sortBy=function(e,t,n){return t=m(t,n),d.pluck(d.map(e,function(e,n,r){return{value:e,index:n,criteria:t(e,n,r)}}).sort(function(e,t){var n=e.criteria,r=t.criteria;if(n!==r){if(n>r||n===void 0)return 1;if(n<r||r===void 0)return-1}return e.index-t.index}),"value")};var T=function(e){return function(t,n,r){var i={};return n=m(n,r),d.each(t,function(r,s){var o=n(r,s,t);e(i,r,o)}),i}};d.groupBy=T(function(e,t,n){d.has(e,n)?e[n].push(t):e[n]=[t]}),d.indexBy=T(function(e,t,n){e[n]=t}),d.countBy=T(function(e,t,n){d.has(e,n)?e[n]++:e[n]=1}),d.toArray=function(e){return e?d.isArray(e)?o.call(e):S(e)?d.map(e,d.identity):d.values(e):[]},d.size=function(e){return e==null?0:S(e)?e.length:d.keys(e).length},d.partition=function(e,t,n){t=m(t,n);var r=[],i=[];return d.each(e,function(e,n,s){(t(e,n,s)?r:i).push(e)}),[r,i]},d.first=d.head=d.take=function(e,t,n){return e==null?void 0:t==null||n?e[0]:d.initial(e,e.length-t)},d.initial=function(e,t,n){return o.call(e,0,Math.max(0,e.length-(t==null||n?1:t)))},d.last=function(e,t,n){return e==null?void 0:t==null||n?e[e.length-1]:d.rest(e,Math.max(0,e.length-t))},d.rest=d.tail=d.drop=function(e,t,n){return o.call(e,t==null||n?1:t)},d.compact=function(e){return d.filter(e,d.identity)};var N=function(e,t,n,r){var i=[],s=0;for(var o=r||0,u=E(e);o<u;o++){var a=e[o];if(S(a)&&(d.isArray(a)||d.isArguments(a))){t||(a=N(a,t,n));var f=0,l=a.length;i.length+=l;while(f<l)i[s++]=a[f++]}else n||(i[s++]=a)}return i};d.flatten=function(e,t){return N(e,t,!1)},d.without=function(e){return d.difference(e,o.call(arguments,1))},d.uniq=d.unique=function(e,t,n,r){d.isBoolean(t)||(r=n,n=t,t=!1),n!=null&&(n=m(n,r));var i=[],s=[];for(var o=0,u=E(e);o<u;o++){var a=e[o],f=n?n(a,o,e):a;t?((!o||s!==f)&&i.push(a),s=f):n?d.contains(s,f)||(s.push(f),i.push(a)):d.contains(i,a)||i.push(a)}return i},d.union=function(){return d.uniq(N(arguments,!0,!0))},d.intersection=function(e){var t=[],n=arguments.length;for(var r=0,i=E(e);r<i;r++){var s=e[r];if(d.contains(t,s))continue;for(var o=1;o<n;o++)if(!d.contains(arguments[o],s))break;o===n&&t.push(s)}return t},d.difference=function(e){var t=N(arguments,!0,!0,1);return d.filter(e,function(e){return!d.contains(t,e)})},d.zip=function(){return d.unzip(arguments)},d.unzip=function(e){var t=e&&d.max(e,E).length||0,n=Array(t);for(var r=0;r<t;r++)n[r]=d.pluck(e,r);return n},d.object=function(e,t){var n={};for(var r=0,i=E(e);r<i;r++)t?n[e[r]]=t[r]:n[e[r][0]]=e[r][1];return n},d.findIndex=C(1),d.findLastIndex=C(-1),d.sortedIndex=function(e,t,n,r){n=m(n,r,1);var i=n(t),s=0,o=E(e);while(s<o){var u=Math.floor((s+o)/2);n(e[u])<i?s=u+1:o=u}return s},d.indexOf=k(1,d.findIndex,d.sortedIndex),d.lastIndexOf=k(-1,d.findLastIndex),d.range=function(e,t,n){t==null&&(t=e||0,e=0),n=n||1;var r=Math.max(Math.ceil((t-e)/n),0),i=Array(r);for(var s=0;s<r;s++,e+=n)i[s]=e;return i};var L=function(e,t,n,r,i){if(r instanceof t){var s=y(e.prototype),o=e.apply(s,i);return d.isObject(o)?o:s}return e.apply(n,i)};d.bind=function(e,t){if(c&&e.bind===c)return c.apply(e,o.call(arguments,1));if(!d.isFunction(e))throw new TypeError("Bind must be called on a function");var n=o.call(arguments,2),r=function(){return L(e,r,t,this,n.concat(o.call(arguments)))};return r},d.partial=function(e){var t=o.call(arguments,1),n=function(){var r=0,i=t.length,s=Array(i);for(var o=0;o<i;o++)s[o]=t[o]===d?arguments[r++]:t[o];while(r<arguments.length)s.push(arguments[r++]);return L(e,n,this,this,s)};return n},d.bindAll=function(e){var t,n=arguments.length,r;if(n<=1)throw new Error("bindAll must be passed function names");for(t=1;t<n;t++)r=arguments[t],e[r]=d.bind(e[r],e);return e},d.memoize=function(e,t){var n=function(r){var i=n.cache,s=""+(t?t.apply(this,arguments):r);return d.has(i,s)||(i[s]=e.apply(this,arguments)),i[s]};return n.cache={},n},d.delay=function(e,t){var n=o.call(arguments,2);return setTimeout(function(){return e.apply(null,n)},t)},d.defer=d.partial(d.delay,d,1),d.throttle=function(e,t,n){var r,i,s,o=null,u=0;n||(n={});var a=function(){u=n.leading===!1?0:d.now(),o=null,s=e.apply(r,i),o||(r=i=null)};return function(){var f=d.now();!u&&n.leading===!1&&(u=f);var l=t-(f-u);return r=this,i=arguments,l<=0||l>t?(o&&(clearTimeout(o),o=null),u=f,s=e.apply(r,i),o||(r=i=null)):!o&&n.trailing!==!1&&(o=setTimeout(a,l)),s}},d.debounce=function(e,t,n){var r,i,s,o,u,a=function(){var f=d.now()-o;f<t&&f>=0?r=setTimeout(a,t-f):(r=null,n||(u=e.apply(s,i),r||(s=i=null)))};return function(){s=this,i=arguments,o=d.now();var f=n&&!r;return r||(r=setTimeout(a,t)),f&&(u=e.apply(s,i),s=i=null),u}},d.wrap=function(e,t){return d.partial(t,e)},d.negate=function(e){return function(){return!e.apply(this,arguments)}},d.compose=function(){var e=arguments,t=e.length-1;return function(){var n=t,r=e[t].apply(this,arguments);while(n--)r=e[n].call(this,r);return r}},d.after=function(e,t){return function(){if(--e<1)return t.apply(this,arguments)}},d.before=function(e,t){var n;return function(){return--e>0&&(n=t.apply(this,arguments)),e<=1&&(t=null),n}},d.once=d.partial(d.before,2);var A=!{toString:null}.propertyIsEnumerable("toString"),O=["valueOf","isPrototypeOf","toString","propertyIsEnumerable","hasOwnProperty","toLocaleString"];d.keys=function(e){if(!d.isObject(e))return[];if(l)return l(e);var t=[];for(var n in e)d.has(e,n)&&t.push(n);return A&&M(e,t),t},d.allKeys=function(e){if(!d.isObject(e))return[];var t=[];for(var n in e)t.push(n);return A&&M(e,t),t},d.values=function(e){var t=d.keys(e),n=t.length,r=Array(n);for(var i=0;i<n;i++)r[i]=e[t[i]];return r},d.mapObject=function(e,t,n){t=m(t,n);var r=d.keys(e),i=r.length,s={},o;for(var u=0;u<i;u++)o=r[u],s[o]=t(e[o],o,e);return s},d.pairs=function(e){var t=d.keys(e),n=t.length,r=Array(n);for(var i=0;i<n;i++)r[i]=[t[i],e[t[i]]];return r},d.invert=function(e){var t={},n=d.keys(e);for(var r=0,i=n.length;r<i;r++)t[e[n[r]]]=n[r];return t},d.functions=d.methods=function(e){var t=[];for(var n in e)d.isFunction(e[n])&&t.push(n);return t.sort()},d.extend=g(d.allKeys),d.extendOwn=d.assign=g(d.keys),d.findKey=function(e,t,n){t=m(t,n);var r=d.keys(e),i;for(var s=0,o=r.length;s<o;s++){i=r[s];if(t(e[i],i,e))return i}},d.pick=function(e,t,n){var r={},i=e,s,o;if(i==null)return r;d.isFunction(t)?(o=d.allKeys(i),s=v(t,n)):(o=N(arguments,!1,!1,1),s=function(e,t,n){return t in n},i=Object(i));for(var u=0,a=o.length;u<a;u++){var f=o[u],l=i[f];s(l,f,i)&&(r[f]=l)}return r},d.omit=function(e,t,n){if(d.isFunction(t))t=d.negate(t);else{var r=d.map(N(arguments,!1,!1,1),String);t=function(e,t){return!d.contains(r,t)}}return d.pick(e,t,n)},d.defaults=g(d.allKeys,!0),d.create=function(e,t){var n=y(e);return t&&d.extendOwn(n,t),n},d.clone=function(e){return d.isObject(e)?d.isArray(e)?e.slice():d.extend({},e):e},d.tap=function(e,t){return t(e),e},d.isMatch=function(e,t){var n=d.keys(t),r=n.length;if(e==null)return!r;var i=Object(e);for(var s=0;s<r;s++){var o=n[s];if(t[o]!==i[o]||!(o in i))return!1}return!0};var _=function(e,t,n,r){if(e===t)return e!==0||1/e===1/t;if(e==null||t==null)return e===t;e instanceof d&&(e=e._wrapped),t instanceof d&&(t=t._wrapped);var i=u.call(e);if(i!==u.call(t))return!1;switch(i){case"[object RegExp]":case"[object String]":return""+e==""+t;case"[object Number]":if(+e!==+e)return+t!==+t;return+e===0?1/+e===1/t:+e===+t;case"[object Date]":case"[object Boolean]":return+e===+t}var s=i==="[object Array]";if(!s){if(typeof e!="object"||typeof t!="object")return!1;var o=e.constructor,a=t.constructor;if(o!==a&&!(d.isFunction(o)&&o instanceof o&&d.isFunction(a)&&a instanceof a)&&"constructor"in e&&"constructor"in t)return!1}n=n||[],r=r||[];var f=n.length;while(f--)if(n[f]===e)return r[f]===t;n.push(e),r.push(t);if(s){f=e.length;if(f!==t.length)return!1;while(f--)if(!_(e[f],t[f],n,r))return!1}else{var l=d.keys(e),c;f=l.length;if(d.keys(t).length!==f)return!1;while(f--){c=l[f];if(!d.has(t,c)||!_(e[c],t[c],n,r))return!1}}return n.pop(),r.pop(),!0};d.isEqual=function(e,t){return _(e,t)},d.isEmpty=function(e){return e==null?!0:S(e)&&(d.isArray(e)||d.isString(e)||d.isArguments(e))?e.length===0:d.keys(e).length===0},d.isElement=function(e){return!!e&&e.nodeType===1},d.isArray=f||function(e){return u.call(e)==="[object Array]"},d.isObject=function(e){var t=typeof e;return t==="function"||t==="object"&&!!e},d.each(["Arguments","Function","String","Number","Date","RegExp","Error"],function(e){d["is"+e]=function(t){return u.call(t)==="[object "+e+"]"}}),d.isArguments(arguments)||(d.isArguments=function(e){return d.has(e,"callee")}),typeof /./!="function"&&typeof Int8Array!="object"&&(d.isFunction=function(e){return typeof e=="function"||!1}),d.isFinite=function(e){return isFinite(e)&&!isNaN(parseFloat(e))},d.isNaN=function(e){return d.isNumber(e)&&e!==+e},d.isBoolean=function(e){return e===!0||e===!1||u.call(e)==="[object Boolean]"},d.isNull=function(e){return e===null},d.isUndefined=function(e){return e===void 0},d.has=function(e,t){return e!=null&&a.call(e,t)},d.noConflict=function(){return e._=t,this},d.identity=function(e){return e},d.constant=function(e){return function(){return e}},d.noop=function(){},d.property=b,d.propertyOf=function(e){return e==null?function(){}:function(t){return e[t]}},d.matcher=d.matches=function(e){return e=d.extendOwn({},e),function(t){return d.isMatch(t,e)}},d.times=function(e,t,n){var r=Array(Math.max(0,e));t=v(t,n,1);for(var i=0;i<e;i++)r[i]=t(i);return r},d.random=function(e,t){return t==null&&(t=e,e=0),e+Math.floor(Math.random()*(t-e+1))},d.now=Date.now||function(){return(new Date).getTime()};var D={"&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;","'":"&#x27;","`":"&#x60;"},P=d.invert(D),H=function(e){var t=function(t){return e[t]},n="(?:"+d.keys(e).join("|")+")",r=RegExp(n),i=RegExp(n,"g");return function(e){return e=e==null?"":""+e,r.test(e)?e.replace(i,t):e}};d.escape=H(D),d.unescape=H(P),d.result=function(e,t,n){var r=e==null?void 0:e[t];return r===void 0&&(r=n),d.isFunction(r)?r.call(e):r};var B=0;d.uniqueId=function(e){var t=++B+"";return e?e+t:t},d.templateSettings={evaluate:/<%([\s\S]+?)%>/g,interpolate:/<%=([\s\S]+?)%>/g,escape:/<%-([\s\S]+?)%>/g};var j=/(.)^/,F={"'":"'","\\":"\\","\r":"r","\n":"n","\u2028":"u2028","\u2029":"u2029"},I=/\\|'|\r|\n|\u2028|\u2029/g,q=function(e){return"\\"+F[e]};d.template=function(e,t,n){!t&&n&&(t=n),t=d.defaults({},t,d.templateSettings);var r=RegExp([(t.escape||j).source,(t.interpolate||j).source,(t.evaluate||j).source].join("|")+"|$","g"),i=0,s="__p+='";e.replace(r,function(t,n,r,o,u){return s+=e.slice(i,u).replace(I,q),i=u+t.length,n?s+="'+\n((__t=("+n+"))==null?'':_.escape(__t))+\n'":r?s+="'+\n((__t=("+r+"))==null?'':__t)+\n'":o&&(s+="';\n"+o+"\n__p+='"),t}),s+="';\n",t.variable||(s="with(obj||{}){\n"+s+"}\n"),s="var __t,__p='',__j=Array.prototype.join,print=function(){__p+=__j.call(arguments,'');};\n"+s+"return __p;\n";try{var o=new Function(t.variable||"obj","_",s)}catch(u){throw u.source=s,u}var a=function(e){return o.call(this,e,d)},f=t.variable||"obj";return a.source="function("+f+"){\n"+s+"}",a},d.chain=function(e){var t=d(e);return t._chain=!0,t};var R=function(e,t){return e._chain?d(t).chain():t};d.mixin=function(e){d.each(d.functions(e),function(t){var n=d[t]=e[t];d.prototype[t]=function(){var e=[this._wrapped];return s.apply(e,arguments),R(this,n.apply(d,e))}})},d.mixin(d),d.each(["pop","push","reverse","shift","sort","splice","unshift"],function(e){var t=n[e];d.prototype[e]=function(){var n=this._wrapped;return t.apply(n,arguments),(e==="shift"||e==="splice")&&n.length===0&&delete n[0],R(this,n)}}),d.each(["concat","join","slice"],function(e){var t=n[e];d.prototype[e]=function(){return R(this,t.apply(this._wrapped,arguments))}}),d.prototype.value=function(){return this._wrapped},d.prototype.valueOf=d.prototype.toJSON=d.prototype.value,d.prototype.toString=function(){return""+this._wrapped},typeof define=="function"&&define.amd&&define("underscore",[],function(){return d})}.call(this),String.prototype.endsWith||(String.prototype.endsWith=function(e,t){var n=this.toString();if(t===undefined||t>n.length)t=n.length;t-=e.length;var r=n.indexOf(e,t);return r!==-1&&r===t}),String.prototype.splitOnce=function(e){var t=this.split(e);return[t.shift(),t.join(e)]},String.prototype.trim||(String.prototype.trim=function(){return this.replace(/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,"")}),define("polyfill",function(){}),define("text",["module"],function(e){"use strict";var t,n,r,i,s,o=["Msxml2.XMLHTTP","Microsoft.XMLHTTP","Msxml2.XMLHTTP.4.0"],u=/^\s*<\?xml(\s)+version=[\'\"](\d)*.(\d)*[\'\"](\s)*\?>/im,a=/<body[^>]*>\s*([\s\S]+)\s*<\/body>/im,f=typeof location!="undefined"&&location.href,l=f&&location.protocol&&location.protocol.replace(/\:/,""),c=f&&location.hostname,h=f&&(location.port||undefined),p={},d=e.config&&e.config()||{};t={version:"2.0.14",strip:function(e){if(e){e=e.replace(u,"");var t=e.match(a);t&&(e=t[1])}else e="";return e},jsEscape:function(e){return e.replace(/(['\\])/g,"\\$1").replace(/[\f]/g,"\\f").replace(/[\b]/g,"\\b").replace(/[\n]/g,"\\n").replace(/[\t]/g,"\\t").replace(/[\r]/g,"\\r").replace(/[\u2028]/g,"\\u2028").replace(/[\u2029]/g,"\\u2029")},createXhr:d.createXhr||function(){var e,t,n;if(typeof XMLHttpRequest!="undefined")return new XMLHttpRequest;if(typeof ActiveXObject!="undefined")for(t=0;t<3;t+=1){n=o[t];try{e=new ActiveXObject(n)}catch(r){}if(e){o=[n];break}}return e},parseName:function(e){var t,n,r,i=!1,s=e.lastIndexOf("."),o=e.indexOf("./")===0||e.indexOf("../")===0;return s!==-1&&(!o||s>1)?(t=e.substring(0,s),n=e.substring(s+1)):t=e,r=n||t,s=r.indexOf("!"),s!==-1&&(i=r.substring(s+1)==="strip",r=r.substring(0,s),n?n=r:t=r),{moduleName:t,ext:n,strip:i}},xdRegExp:/^((\w+)\:)?\/\/([^\/\\]+)/,useXhr:function(e,n,r,i){var s,o,u,a=t.xdRegExp.exec(e);return a?(s=a[2],o=a[3],o=o.split(":"),u=o[1],o=o[0],(!s||s===n)&&(!o||o.toLowerCase()===r.toLowerCase())&&(!u&&!o||u===i)):!0},finishLoad:function(e,n,r,i){r=n?t.strip(r):r,d.isBuild&&(p[e]=r),i(r)},load:function(e,n,r,i){if(i&&i.isBuild&&!i.inlineText){r();return}d.isBuild=i&&i.isBuild;var s=t.parseName(e),o=s.moduleName+(s.ext?"."+s.ext:""),u=n.toUrl(o),a=d.useXhr||t.useXhr;if(u.indexOf("empty:")===0){r();return}!f||a(u,l,c,h)?t.get(u,function(n){t.finishLoad(e,s.strip,n,r)},function(e){r.error&&r.error(e)}):n([o],function(e){t.finishLoad(s.moduleName+"."+s.ext,s.strip,e,r)})},write:function(e,n,r,i){if(p.hasOwnProperty(n)){var s=t.jsEscape(p[n]);r.asModule(e+"!"+n,"define(function () { return '"+s+"';});\n")}},writeFile:function(e,n,r,i,s){var o=t.parseName(n),u=o.ext?"."+o.ext:"",a=o.moduleName+u,f=r.toUrl(o.moduleName+u)+".js";t.load(a,r,function(n){var r=function(e){return i(f,e)};r.asModule=function(e,t){return i.asModule(e,f,t)},t.write(e,a,r,s)},s)}};if(d.env==="node"||!d.env&&typeof process!="undefined"&&process.versions&&!!process.versions.node&&!process.versions["node-webkit"]&&!process.versions["atom-shell"])n=require.nodeRequire("fs"),t.get=function(e,t,r){try{var i=n.readFileSync(e,"utf8");i[0]===""&&(i=i.substring(1)),t(i)}catch(s){r&&r(s)}};else if(d.env==="xhr"||!d.env&&t.createXhr())t.get=function(e,n,r,i){var s=t.createXhr(),o;s.open("GET",e,!0);if(i)for(o in i)i.hasOwnProperty(o)&&s.setRequestHeader(o.toLowerCase(),i[o]);d.onXhr&&d.onXhr(s,e),s.onreadystatechange=function(t){var i,o;s.readyState===4&&(i=s.status||0,i>399&&i<600?(o=new Error(e+" HTTP status: "+i),o.xhr=s,r&&r(o)):n(s.responseText),d.onXhrComplete&&d.onXhrComplete(s,e))},s.send(null)};else if(d.env==="rhino"||!d.env&&typeof Packages!="undefined"&&typeof java!="undefined")t.get=function(e,t){var n,r,i="utf-8",s=new java.io.File(e),o=java.lang.System.getProperty("line.separator"),u=new java.io.BufferedReader(new java.io.InputStreamReader(new java.io.FileInputStream(s),i)),a="";try{n=new java.lang.StringBuffer,r=u.readLine(),r&&r.length()&&r.charAt(0)===65279&&(r=r.substring(1)),r!==null&&n.append(r);while((r=u.readLine())!==null)n.append(o),n.append(r);a=String(n.toString())}finally{u.close()}t(a)};else if(d.env==="xpconnect"||!d.env&&typeof Components!="undefined"&&Components.classes&&Components.interfaces)r=Components.classes,i=Components.interfaces,Components.utils["import"]("resource://gre/modules/FileUtils.jsm"),s="@mozilla.org/windows-registry-key;1"in r,t.get=function(e,t){var n,o,u,a={};s&&(e=e.replace(/\//g,"\\")),u=new FileUtils.File(e);try{n=r["@mozilla.org/network/file-input-stream;1"].createInstance(i.nsIFileInputStream),n.init(u,1,0,!1),o=r["@mozilla.org/intl/converter-input-stream;1"].createInstance(i.nsIConverterInputStream),o.init(n,"utf-8",n.available(),i.nsIConverterInputStream.DEFAULT_REPLACEMENT_CHARACTER),o.readString(n.available(),a),o.close(),n.close(),t(a.value)}catch(f){throw new Error((u&&u.path||"")+": "+f)}};return t}),define("tpl",["text","underscore"],function(e,t){"use strict";var n={},r="define('{pluginName}!{moduleName}', function () { return {source}; });\n";return{version:"0.0.2",load:function(r,i,s,o){o.tpl&&o.tpl.templateSettings&&(t.templateSettings=o.tpl.templateSettings);if(n[r])s(n[r]);else{var u=o.tpl&&o.tpl.extension||".html",a=o.tpl&&o.tpl.path||"";e.load(a+r+u,i,function(e){n[r]=t.template(e),s(n[r])},o)}},write:function(e,t,i){var s=n[t],o=s&&s.source;o&&i.asModule(e+"!"+t,r.replace("{pluginName}",e).replace("{moduleName}",t).replace("{source}",o))}}}),define("tpl!action",[],function(){return function(obj){var __t,__p="",__j=Array.prototype.join,print=function(){__p+=__j.call(arguments,"")};with(obj||{})__p+='<div class="chat-message '+((__t=extra_classes)==null?"":__t)+'" data-isodate="'+((__t=isodate)==null?"":__t)+'">\n    <span class="chat-msg-author chat-msg-'+((__t=sender)==null?"":__t)+'">'+((__t=time)==null?"":__t)+" **"+((__t=username)==null?"":__t)+' </span>\n    <span class="chat-msg-content">'+((__t=message)==null?"":__t)+"</span>\n</div>\n";return __p}}),define("tpl!add_contact_dropdown",[],function(){return function(obj){var __t,__p="",__j=Array.prototype.join,print=function(){__p+=__j.call(arguments,"")};with(obj||{})__p+='<dl class="add-converse-contact dropdown">\n    <dt id="xmpp-contact-search" class="fancy-dropdown">\n        <a class="toggle-xmpp-contact-form icon-plus" href="#" title="'+((__t=label_click_to_chat)==null?"":__t)+'"> '+((__t=label_add_contact)==null?"":__t)+'</a>\n    </dt>\n    <dd class="search-xmpp" style="display:none"><ul></ul></dd>\n</dl>\n';return __p}}),define("tpl!add_contact_form",[],function(){return function(obj){var __t,__p="",__j=Array.prototype.join,print=function(){__p+=__j.call(arguments,"")};with(obj||{})__p+='<li>\n    <form class="pure-form add-xmpp-contact">\n        <input type="text"\n            name="identifier"\n            class="username"\n            placeholder="'+((__t=label_contact_username)==null?"":__t)+'"/>\n        <button class="pure-button button-primary" type="submit">'+((__t=label_add)==null?"":__t)+"</button>\n    </form>\n</li>\n";return __p}}),define("tpl!change_status_message",[],function(){return function(obj){var __t,__p="",__j=Array.prototype.join,print=function(){__p+=__j.call(arguments,"")};with(obj||{})__p+='<form id="set-custom-xmpp-status" class="pure-form">\n<fieldset>\n    <span class="input-button-group">\n        <input type="text" class="custom-xmpp-status" '+((__t=status_message)==null?"":__t)+' placeholder="'+((__t=label_custom_status)==null?"":__t)+'"/>\n        <input type="submit" class="pure-button button-primary" value="'+((__t=label_save)==null?"":__t)+'"/>\n    </span>\n</fieldset>\n</form>\n';return __p}}),define("tpl!chat_status",[],function(){return function(obj){var __t,__p="",__j=Array.prototype.join,print=function(){__p+=__j.call(arguments,"")};with(obj||{})__p+='<div class="xmpp-status">\n    <a class="choose-xmpp-status '+((__t=chat_status)==null?"":__t)+" icon-"+((__t=chat_status)==null?"":__t)+'" data-value="'+((__t=status_message)==null?"":__t)+'" href="#" title="'+((__t=desc_change_status)==null?"":__t)+'">\n        '+((__t=status_message)==null?"":__t)+'\n    </a>\n    <a class="change-xmpp-status-message icon-pencil" href="#" title="'+((__t=desc_custom_status)==null?"":__t)+'"></a>\n</div>\n';return __p}}),define("tpl!chatarea",[],function(){return function(obj){var __t,__p="",__j=Array.prototype.join,print=function(){__p+=__j.call(arguments,"")};with(obj||{})__p+='<div class="chat-area">\n    <div class="chat-content"></div>\n    <form class="sendXMPPMessage" action="" method="post">\n        ',show_toolbar&&(__p+='\n            <ul class="chat-toolbar no-text-select"></ul>\n        '),__p+='\n        <textarea type="text" class="chat-textarea" \n            placeholder="'+((__t=label_message)==null?"":__t)+'"/>\n    </form>\n</div>\n';return __p}}),define("tpl!chatbox",[],function(){return function(obj){var __t,__p="",__j=Array.prototype.join,print=function(){__p+=__j.call(arguments,"")};with(obj||{})__p+='<div class="flyout box-flyout">\n    <div class="dragresize dragresize-top"></div>\n    <div class="dragresize dragresize-topleft"></div>\n    <div class="dragresize dragresize-left"></div>\n    <div class="chat-head chat-head-chatbox">\n        <a class="chatbox-btn close-chatbox-button icon-close" title="'+((__t=info_close)==null?"":__t)+'"></a>\n        <a class="chatbox-btn toggle-chatbox-button icon-minus" title="'+((__t=info_minimize)==null?"":__t)+'"></a>\n        <div class="chat-title">\n            ',url&&(__p+='\n                <a href="'+((__t=url)==null?"":__t)+'" target="_blank" class="user">\n            '),__p+="\n                    "+((__t=fullname)==null?"":__t)+"\n            ",url&&(__p+="\n                </a>\n            "),__p+='\n        </div>\n        <p class="user-custom-message"><p/>\n    </div>\n    <div class="chat-body">\n        <div class="chat-content"></div>\n        <form class="sendXMPPMessage" action="" method="post">\n            ',show_toolbar&&(__p+='\n                <ul class="chat-toolbar no-text-select"></ul>\n            '),__p+='\n        <textarea\n            type="text"\n            class="chat-textarea"\n            placeholder="'+((__t=label_personal_message)==null?"":__t)+'"/>\n        </form>\n    </div>\n</div>\n';return __p}}),define("tpl!chatroom",[],function(){return function(obj){var __t,__p="",__j=Array.prototype.join,print=function(){__p+=__j.call(arguments,"")};with(obj||{})__p+='<div class="flyout box-flyout">\n    <div class="dragresize dragresize-top"></div>\n    <div class="dragresize dragresize-topleft"></div>\n    <div class="dragresize dragresize-left"></div>\n    <div class="chat-head chat-head-chatroom">\n        <a class="chatbox-btn close-chatbox-button icon-close"></a>\n        <a class="chatbox-btn toggle-chatbox-button icon-minus"></a>\n        <a class="chatbox-btn configure-chatroom-button icon-wrench" style="display:none"></a>\n        <div class="chat-title"> '+((__t=_.escape(name))==null?"":__t)+' </div>\n        <p class="chatroom-topic"><p/>\n    </div>\n    <div class="chat-body chatroom-body"><span class="spinner centered"/></div>\n</div>\n';return __p}}),define("tpl!chatroom_form",[],function(){return function(obj){var __t,__p="",__j=Array.prototype.join,print=function(){__p+=__j.call(arguments,"")};with(obj||{})__p+='<div class="chatroom-form-container">\n    <form class="pure-form pure-form-stacked converse-form chatroom-form">\n        <fieldset>\n            <span class="spinner centered"/>\n        </fieldset>\n    </form>\n</div>\n';return __p}}),define("tpl!chatroom_password_form",[],function(){return function(obj){var __t,__p="",__j=Array.prototype.join,print=function(){__p+=__j.call(arguments,"")};with(obj||{})__p+='<div class="chatroom-form-container">\n    <form class="pure-form converse-form chatroom-form">\n        <fieldset>\n            <legend>'+((__t=heading)==null?"":__t)+"</legend>\n            <label>"+((__t=label_password)==null?"":__t)+'</label>\n            <input type="password" name="password"/>\n        </fieldset>\n        <fieldset>\n            <input class="pure-button button-primary" type="submit" value="'+((__t=label_submit)==null?"":__t)+'"/>\n        </fieldset>\n    </form>\n</div>\n';return __p}}),define("tpl!chatroom_sidebar",[],function(){return function(obj){var __t,__p="",__j=Array.prototype.join,print=function(){__p+=__j.call(arguments,"")};with(obj||{})__p+='<!-- <div class="occupants"> -->\n<form class="pure-form room-invite">\n    <input class="invited-contact" placeholder="'+((__t=label_invitation)==null?"":__t)+'" type="text"/>\n</form>\n<p class="occupants-heading">'+((__t=label_occupants)==null?"":__t)+':</p>\n<ul class="occupant-list"></ul>\n<!-- </div> -->\n';return __p}}),define("tpl!chatrooms_tab",[],function(){return function(obj){var __t,__p="",__j=Array.prototype.join,print=function(){__p+=__j.call(arguments,"")};with(obj||{})__p+='<li><a class="s" href="#chatrooms">'+((__t=label_rooms)==null?"":__t)+"</a></li>\n";return __p}}),define("tpl!chats_panel",[],function(){return function(obj){var __t,__p="",__j=Array.prototype.join,print=function(){__p+=__j.call(arguments,"")};with(obj||{})__p+='<div id="minimized-chats">\n    <a id="toggle-minimized-chats" href="#"></a>\n    <div class="flyout minimized-chats-flyout"></div>\n</div>\n';return __p}}),define("tpl!choose_status",[],function(){return function(obj){var __t,__p="",__j=Array.prototype.join,print=function(){__p+=__j.call(arguments,"")};with(obj||{})__p+='<dl id="target" class="dropdown">\n    <dt id="fancy-xmpp-status-select" class="fancy-dropdown"></dt>\n    <dd><ul class="xmpp-status-menu"></ul></dd>\n</dl>\n';return __p}}),define("tpl!contacts_panel",[],function(){return function(obj){var __t,__p="",__j=Array.prototype.join,print=function(){__p+=__j.call(arguments,"")};with(obj||{})__p+='<form class="pure-form set-xmpp-status" action="" method="post">\n    <span id="xmpp-status-holder">\n        <select id="select-xmpp-status" style="display:none">\n            <option value="online">'+((__t=label_online)==null?"":__t)+'</option>\n            <option value="dnd">'+((__t=label_busy)==null?"":__t)+'</option>\n            <option value="away">'+((__t=label_away)==null?"":__t)+'</option>\n            <option value="offline">'+((__t=label_offline)==null?"":__t)+"</option>\n            ",allow_logout&&(__p+='\n            <option value="logout">'+((__t=label_logout)==null?"":__t)+"</option>\n            "),__p+="\n        </select>\n    </span>\n</form>\n";return __p}}),define("tpl!contacts_tab",[],function(){return function(obj){var __t,__p="",__j=Array.prototype.join,print=function(){__p+=__j.call(arguments,"")};with(obj||{})__p+='<li><a class="s current" href="#users">'+((__t=label_contacts)==null?"":__t)+"</a></li>\n";return __p}}),define("tpl!controlbox",[],function(){return function(obj){var __t,__p="",__j=Array.prototype.join,print=function(){__p+=__j.call(arguments,"")};with(obj||{})__p+='<div class="flyout box-flyout">\n    <div class="dragresize dragresize-top"></div>\n    <div class="dragresize dragresize-topleft"></div>\n    <div class="dragresize dragresize-left"></div>\n    <div class="chat-head controlbox-head">\n        <ul id="controlbox-tabs"></ul>\n        <a class="chatbox-btn close-chatbox-button icon-close"></a>\n    </div>\n    <div class="controlbox-panes"></div>\n</div>\n';return __p}}),define("tpl!controlbox_toggle",[],function(){return function(obj){var __t,__p="",__j=Array.prototype.join,print=function(){__p+=__j.call(arguments,"")};with(obj||{})__p+='<span class="conn-feedback">'+((__t=label_toggle)==null?"":__t)+'</span>\n<span style="display: none" id="online-count">(0)</span>\n';return __p}}),define("tpl!field",[],function(){return function(obj){var __t,__p="",__j=Array.prototype.join,print=function(){__p+=__j.call(arguments,"")};with(obj||{})__p+='<field var="'+((__t=name)==null?"":__t)+'">',_.isArray(value)?(__p+="\n    ",_.each(value,function(e){__p+="<value>"+((__t=e)==null?"":__t)+"</value>"}),__p+="\n"):__p+="\n    <value>"+((__t=value)==null?"":__t)+"</value>\n",__p+="</field>\n";return __p}}),define("tpl!form_captcha",[],function(){return function(obj){var __t,__p="",__j=Array.prototype.join,print=function(){__p+=__j.call(arguments,"")};with(obj||{})__p+="",label&&(__p+="\n<label>\n    "+((__t=label)==null?"":__t)+"\n</label>\n"),__p+='\n<img src="data:'+((__t=type)==null?"":__t)+";base64,"+((__t=data)==null?"":__t)+'">\n<input name="'+((__t=name)==null?"":__t)+'" type="text" ',required&&(__p+=' class="required" '),__p+=" >\n\n\n";return __p}}),define("tpl!form_checkbox",[],function(){return function(obj){var __t,__p="",__j=Array.prototype.join,print=function(){__p+=__j.call(arguments,"")};with(obj||{})__p+="<label>"+((__t=label)==null?"":__t)+'</label>\n<input name="'+((__t=name)==null?"":__t)+'" type="'+((__t=type)==null?"":__t)+'" '+((__t=checked)==null?"":__t)+">\n";return __p}}),define("tpl!form_input",[],function(){return function(obj){var __t,__p="",__j=Array.prototype.join,print=function(){__p+=__j.call(arguments,"")};with(obj||{})__p+="",label&&(__p+="\n<label>\n    "+((__t=label)==null?"":__t)+"\n</label>\n"),__p+='\n<input name="'+((__t=name)==null?"":__t)+'" type="'+((__t=type)==null?"":__t)+'" \n    ',value&&(__p+=' value="'+((__t=value)==null?"":__t)+'" '),__p+="\n    ",required&&(__p+=' class="required" '),__p+=" >\n";return __p}}),define("tpl!form_select",[],function(){return function(obj){var __t,__p="",__j=Array.prototype.join,print=function(){__p+=__j.call(arguments,"")};with(obj||{})__p+="<label>"+((__t=label)==null?"":__t)+'</label>\n<select name="'+((__t=name)==null?"":__t)+'"  ',multiple&&(__p+=' multiple="multiple" '),__p+=">"+((__t=options)==null?"":__t)+"</select>\n";return __p}}),define("tpl!form_textarea",[],function(){return function(obj){var __t,__p="",__j=Array.prototype.join,print=function(){__p+=__j.call(arguments,"")};with(obj||{})__p+='<label class="label-ta">'+((__t=label)==null?"":__t)+'</label>\n<textarea name="'+((__t=name)==null?"":__t)+'">'+((__t=value)==null?"":__t)+"</textarea>\n";return __p}}),define("tpl!form_username",[],function(){return function(obj){var __t,__p="",__j=Array.prototype.join,print=function(){__p+=__j.call(arguments,"")};with(obj||{})__p+="",label&&(__p+="\n<label>\n    "+((__t=label)==null?"":__t)+"\n</label>\n"),__p+='\n<div class="input-group">\n    <input name="'+((__t=name)==null?"":__t)+'" type="'+((__t=type)==null?"":__t)+'"\n        ',value&&(__p+=' value="'+((__t=value)==null?"":__t)+'" '),__p+="\n        ",required&&(__p+=' class="required" '),__p+=' />\n    <span title="'+((__t=domain)==null?"":__t)+'">'+((__t=domain)==null?"":__t)+"</span>\n</div>\n";return __p}}),define("tpl!group_header",[],function(){return function(obj){var __t,__p="",__j=Array.prototype.join,print=function(){__p+=__j.call(arguments,"")};with(obj||{})__p+='<a href="#" class="group-toggle icon-'+((__t=toggle_state)==null?"":__t)+'" title="'+((__t=desc_group_toggle)==null?"":__t)+'">'+((__t=label_group)==null?"":__t)+"</a>\n";return __p}}),define("tpl!info",[],function(){return function(obj){var __t,__p="",__j=Array.prototype.join,print=function(){__p+=__j.call(arguments,"")};with(obj||{})__p+='<div class="chat-info">'+((__t=message)==null?"":__t)+"</div>\n";return __p}}),define("tpl!login_panel",[],function(){return function(obj){var __t,__p="",__j=Array.prototype.join,print=function(){__p+=__j.call(arguments,"")};with(obj||{})__p+='<form class="pure-form pure-form-stacked converse-form" id="converse-login" method="post">\n    ',auto_login&&(__p+='\n        <span class="spinner login-submit"/>\n    '),__p+="\n    ",auto_login||(__p+="\n        ",authentication==LOGIN&&(__p+="\n            <label>"+((__t=label_username)==null?"":__t)+'</label>\n            <input type="text" name="jid" placeholder="'+((__t=placeholder_username)==null?"":__t)+'">\n            <label>'+((__t=label_password)==null?"":__t)+'</label>\n            <input type="password" name="password" placeholder="'+((__t=placeholder_password)==null?"":__t)+'">\n            <input class="pure-button button-primary" type="submit" value="'+((__t=label_login)==null?"":__t)+'">\n            <span class="conn-feedback"></span>\n        '),__p+="\n        ",authentication==ANONYMOUS&&(__p+='\n            <input type="pure-button button-primary" class="submit login-anon" value="'+((__t=label_anon_login)==null?"":__t)+'"/>\n        '),__p+="\n        ",authentication==PREBIND&&(__p+="\n            <p>Disconnected.</p>\n        "),__p+="\n    "),__p+="\n</form>\n";return __p}}),define("tpl!login_tab",[],function(){return function(obj){var __t,__p="",__j=Array.prototype.join,print=function(){__p+=__j.call(arguments,"")};with(obj||{})__p+='<li><a class="current" href="#login-dialog">'+((__t=label_sign_in)==null?"":__t)+"</a></li>\n";return __p}}),define("tpl!message",[],function(){return function(obj){var __t,__p="",__j=Array.prototype.join,print=function(){__p+=__j.call(arguments,"")};with(obj||{})__p+='<div class="chat-message '+((__t=extra_classes)==null?"":__t)+'" data-isodate="'+((__t=isodate)==null?"":__t)+'" data-msgid="'+((__t=msgid)==null?"":__t)+'">\n    <span class="chat-msg-author chat-msg-'+((__t=sender)==null?"":__t)+'">'+((__t=time)==null?"":__t)+" "+((__t=username)==null?"":__t)+':&nbsp;</span>\n    <span class="chat-msg-content">'+((__t=message)==null?"":__t)+"</span>\n</div>\n";return __p}}),define("tpl!new_day",[],function(){return function(obj){var __t,__p="",__j=Array.prototype.join,print=function(){__p+=__j.call(arguments,"")};with(obj||{})__p+='<time class="chat-info chat-date" data-isodate="'+((__t=isodate)==null?"":__t)+'">'+((__t=datestring)==null?"":__t)+"</time>\n";return __p}}),define("tpl!occupant",[],function(){return function(obj){var __t,__p="",__j=Array.prototype.join,print=function(){__p+=__j.call(arguments,"")};with(obj||{})__p+='<li class="'+((__t=role)==null?"":__t)+'"\n    ',role==="moderator"&&(__p+='\n       title="'+((__t=desc_moderator)==null?"":__t)+'"\n    '),__p+="\n    ",role==="occupant"&&(__p+='\n       title="'+((__t=desc_occupant)==null?"":__t)+'"\n    '),__p+="\n    ",role==="visitor"&&(__p+='\n       title="'+((__t=desc_visitor)==null?"":__t)+'"\n    '),__p+="\n>"+((__t=nick)==null?"":__t)+"</li>\n";return __p}}),define("tpl!pending_contact",[],function(){return function(obj){var __t,__p="",__j=Array.prototype.join,print=function(){__p+=__j.call(arguments,"")};with(obj||{})__p+="",allow_chat_pending_contacts&&(__p+='\n<a class="open-chat"href="#">\n'),__p+='\n<span class="pending-contact-name" title="Name: '+((__t=fullname)==null?"":__t)+"\nJID: "+((__t=jid)==null?"":__t)+'">'+((__t=fullname)==null?"":__t)+"</span> \n",allow_chat_pending_contacts&&(__p+="\n</a>\n"),__p+='\n<a class="remove-xmpp-contact icon-remove" title="'+((__t=desc_remove)==null?"":__t)+'" href="#"></a>\n';return __p}}),define("tpl!pending_contacts",[],function(){return function(obj){var __t,__p="",__j=Array.prototype.join,print=function(){__p+=__j.call(arguments,"")};with(obj||{})__p+='<dt class="roster-group" id="pending-xmpp-contacts"><a href="#" class="group-toggle icon-'+((__t=toggle_state)==null?"":__t)+'" title="'+((__t=desc_group_toggle)==null?"":__t)+'">'+((__t=label_pending_contacts)==null?"":__t)+"</a></dt>\n";return __p}}),define("tpl!register_panel",[],function(){return function(obj){var __t,__p="",__j=Array.prototype.join,print=function(){__p+=__j.call(arguments,"")};with(obj||{})__p+='<form id="converse-register" class="pure-form converse-form">\n    <span class="reg-feedback"></span>\n    <label>'+((__t=label_domain)==null?"":__t)+'</label>\n    <input type="text" name="domain" placeholder="'+((__t=domain_placeholder)==null?"":__t)+'">\n    <p class="form-help">'+((__t=help_providers)==null?"":__t)+' <a href="'+((__t=href_providers)==null?"":__t)+'" class="url" target="_blank">'+((__t=help_providers_link)==null?"":__t)+'</a>.</p>\n    <input class="pure-button button-primary" type="submit" value="'+((__t=label_register)==null?"":__t)+'">\n</form>\n';return __p}}),define("tpl!register_tab",[],function(){return function(obj){var __t,__p="",__j=Array.prototype.join,print=function(){__p+=__j.call(arguments,"")};with(obj||{})__p+='<li><a class="s" href="#register">'+((__t=label_register)==null?"":__t)+"</a></li>\n";return __p}}),define("tpl!registration_form",[],function(){return function(obj){var __t,__p="",__j=Array.prototype.join,print=function(){__p+=__j.call(arguments,"")};with(obj||{})__p+='<p class="provider-title">'+((__t=domain)==null?"":__t)+"</p>\n<a href='https://xmpp.net/result.php?domain="+((__t=domain)==null?"":__t)+"&amp;type=client'>\n    <img class=\"provider-score\" src='https://xmpp.net/badge.php?domain="+((__t=domain)==null?"":__t)+"' alt='xmpp.net score' />\n</a>\n<p class=\"title\">"+((__t=title)==null?"":__t)+'</p>\n<p class="instructions">'+((__t=instructions)==null?"":__t)+"</p>\n";return __p}}),define("tpl!registration_request",[],function(){return function(obj){var __t,__p="",__j=Array.prototype.join,print=function(){__p+=__j.call(arguments,"")};with(obj||{})__p+='<span class="spinner login-submit"/>\n<p class="info">'+((__t=info_message)==null?"":__t)+'</p>\n<button class="pure-button button-cancel hor_centered">'+((__t=cancel)==null?"":__t)+"</button>\n";return __p}}),define("tpl!requesting_contact",[],function(){return function(obj){var __t,__p="",__j=Array.prototype.join,print=function(){__p+=__j.call(arguments,"")};with(obj||{})__p+="",allow_chat_pending_contacts&&(__p+='\n<a class="open-chat"href="#">\n'),__p+='\n<span class="req-contact-name" title="Name: '+((__t=fullname)==null?"":__t)+"\nJID: "+((__t=jid)==null?"":__t)+'">'+((__t=fullname)==null?"":__t)+"</span>\n",allow_chat_pending_contacts&&(__p+="\n</a>\n"),__p+='\n<span class="request-actions">\n    <a class="accept-xmpp-request icon-checkmark" title="'+((__t=desc_accept)==null?"":__t)+'" href="#"></a>\n    <a class="decline-xmpp-request icon-close" title="'+((__t=desc_decline)==null?"":__t)+'" href="#"></a>\n</span>\n';return __p}}),define("tpl!requesting_contacts",[],function(){return function(obj){var __t,__p="",__j=Array.prototype.join,print=function(){__p+=__j.call(arguments,"")};with(obj||{})__p+='<dt class="roster-group" id="xmpp-contact-requests"><a href="#" class="group-toggle icon-'+((__t=toggle_state)==null?"":__t)+'" title="'+((__t=desc_group_toggle)==null?"":__t)+'">'+((__t=label_contact_requests)==null?"":__t)+"</a></dt>\n";return __p}}),define("tpl!room_description",[],function(){return function(obj){var __t,__p="",__j=Array.prototype.join,print=function(){__p+=__j.call(arguments,"")};with(obj||{})__p+='<!-- FIXME: check markup in mockup -->\n<div class="room-info">\n<p class="room-info"><strong>'+((__t=label_desc)==null?"":__t)+"</strong> "+((__t=desc)==null?"":__t)+'</p>\n<p class="room-info"><strong>'+((__t=label_occ)==null?"":__t)+"</strong> "+((__t=occ)==null?"":__t)+'</p>\n<p class="room-info"><strong>'+((__t=label_features)==null?"":__t)+"</strong>\n    <ul>\n        ",passwordprotected&&(__p+='\n        <li class="room-info locked">'+((__t=label_requires_auth)==null?"":__t)+"</li>\n        "),__p+="\n        ",hidden&&(__p+='\n        <li class="room-info">'+((__t=label_hidden)==null?"":__t)+"</li>\n        "),__p+="\n        ",membersonly&&(__p+='\n        <li class="room-info">'+((__t=label_requires_invite)==null?"":__t)+"</li>\n        "),__p+="\n        ",moderated&&(__p+='\n        <li class="room-info">'+((__t=label_moderated)==null?"":__t)+"</li>\n        "),__p+="\n        ",nonanonymous&&(__p+='\n        <li class="room-info">'+((__t=label_non_anon)==null?"":__t)+"</li>\n        "),__p+="\n        ",open&&(__p+='\n        <li class="room-info">'+((__t=label_open_room)==null?"":__t)+"</li>\n        "),__p+="\n        ",persistent&&(__p+='\n        <li class="room-info">'+((__t=label_permanent_room)==null?"":__t)+"</li>\n        "),__p+="\n        ",publicroom&&(__p+='\n        <li class="room-info">'+((__t=label_public)==null?"":__t)+"</li>\n        "),__p+="\n        ",semianonymous&&(__p+='\n        <li class="room-info">'+((__t=label_semi_anon)==null?"":__t)+"</li>\n        "),__p+="\n        ",temporary&&(__p+='\n        <li class="room-info">'+((__t=label_temp_room)==null?"":__t)+"</li>\n        "),__p+="\n        ",unmoderated&&(__p+='\n        <li class="room-info">'+((__t=label_unmoderated)==null?"":__t)+"</li>\n        "),__p+="\n    </ul>\n</p>\n</div>\n";return __p}}),define("tpl!room_item",[],function(){return function(obj){var __t,__p="",__j=Array.prototype.join,print=function(){__p+=__j.call(arguments,"")};with(obj||{})__p+='<dd class="available-chatroom">\n<a class="open-room" data-room-jid="'+((__t=jid)==null?"":__t)+'"\n   title="'+((__t=open_title)==null?"":__t)+'" href="#">'+((__t=_.escape(name))==null?"":__t)+'</a>\n<a class="room-info icon-room-info" data-room-jid="'+((__t=jid)==null?"":__t)+'"\n   title="'+((__t=info_title)==null?"":__t)+'" href="#">&nbsp;</a>\n</dd>\n';return __p}}),define("tpl!room_panel",[],function(){return function(obj){var __t,__p="",__j=Array.prototype.join,print=function(){__p+=__j.call(arguments,"")};with(obj||{})__p+='<form class="pure-form pure-form-stacked converse-form add-chatroom" action="" method="post">\n    <fieldset>\n        <label>'+((__t=label_room_name)==null?"":__t)+'</label>\n        <input type="text" name="chatroom" class="new-chatroom-name" placeholder="'+((__t=label_room_name)==null?"":__t)+'"/>\n        <label>'+((__t=label_nickname)==null?"":__t)+'</label> <input type="text" name="nick" class="new-chatroom-nick" placeholder="'+((__t=label_nickname)==null?"":__t)+'"/>\n        <input type="submit" class="pure-button button-primary" name="join" value="'+((__t=label_join)==null?"":__t)+'"/>\n    </fieldset>\n    <fieldset>\n        ',server_input_type!="hidden"&&(__p+="\n            <label"+((__t=server_label_global_attr)==null?"":__t)+">"+((__t=label_server)==null?"":__t)+"</label>\n        "),__p+='\n        <input type="'+((__t=server_input_type)==null?"":__t)+'" name="server" class="new-chatroom-server" placeholder="'+((__t=label_server)==null?"":__t)+'"/>\n        <input type="button" class="pure-button button-secondary" name="show" id="show-rooms" value="'+((__t=label_show_rooms)==null?"":__t)+'"/>\n    </fieldset>\n</form>\n<dl id="available-chatrooms"></dl>\n';return __p}}),define("tpl!roster",[],function(){return function(obj){var __t,__p="",__j=Array.prototype.join,print=function(){__p+=__j.call(arguments,"")};with(obj||{})__p+='<form class="pure-form roster-filter-group input-button-group">\n    <input style="display: none;" class="roster-filter" placeholder="'+((__t=placeholder)==null?"":__t)+'">\n    <select style="display: none;" class="filter-type">\n        <option value="contacts">'+((__t=label_contacts)==null?"":__t)+'</option>\n        <option value="groups">'+((__t=label_groups)==null?"":__t)+"</option>\n    </select>\n</form>\n";return __p}}),define("tpl!roster_item",[],function(){return function(obj){var __t,__p="",__j=Array.prototype.join,print=function(){__p+=__j.call(arguments,"")};with(obj||{})__p+='<a class="open-chat" title="'+((__t=title_fullname)==null?"":__t)+": "+((__t=fullname)==null?"":__t)+"\nJID: "+((__t=jid)==null?"":__t)+"\n"+((__t=desc_chat)==null?"":__t)+'" href="#"><span class="icon-'+((__t=chat_status)==null?"":__t)+'" title="'+((__t=desc_status)==null?"":__t)+'"></span>'+((__t=fullname)==null?"":__t)+"</a>\n",allow_contact_removal&&(__p+='\n<a class="remove-xmpp-contact icon-remove" title="'+((__t=desc_remove)==null?"":__t)+'" href="#"></a>\n'),__p+="\n";return __p}}),define("tpl!search_contact",[],function(){return function(obj){var __t,__p="",__j=Array.prototype.join,print=function(){__p+=__j.call(arguments,"")};with(obj||{})__p+='<li>\n    <form class="search-xmpp-contact">\n        <input type="text"\n            name="identifier"\n            class="username"\n            placeholder="'+((__t=label_contact_name)==null?"":__t)+'"/>\n        <button type="submit">'+((__t=label_search)==null?"":__t)+"</button>\n    </form>\n</li>\n";return __p}}),define("tpl!select_option",[],function(){return function(obj){var __t,__p="",__j=Array.prototype.join,print=function(){__p+=__j.call(arguments,"")};with(obj||{})__p+='<option value="'+((__t=value)==null?"":__t)+'" ',selected&&(__p+=' selected="selected" '),__p+=" >"+((__t=label)==null?"":__t)+"</option>\n";return __p}}),define("tpl!status_option",[],function(){return function(obj){var __t,__p="",__j=Array.prototype.join,print=function(){__p+=__j.call(arguments,"")};with(obj||{})__p+='<li>\n    <a href="#" class="'+((__t=value)==null?"":__t)+'" data-value="'+((__t=value)==null?"":__t)+'">\n        <span class="icon-'+((__t=value)==null?"":__t)+'"></span>\n        '+((__t=text)==null?"":__t)+"\n    </a>\n</li>\n";return __p}}),define("tpl!toggle_chats",[],function(){return function(obj){var __t,__p="",__j=Array.prototype.join,print=function(){__p+=__j.call(arguments,"")};with(obj||{})__p+=""+((__t=Minimized)==null?"":__t)+' <span id="minimized-count">('+((__t=num_minimized)==null?"":__t)+')</span>\n<span class="unread-message-count"\n    ',num_unread||(__p+=' style="display: none" '),__p+='\n    href="#">'+((__t=num_unread)==null?"":__t)+"</span>\n";return __p}}),define("tpl!toolbar",[],function(){return function(obj){var __t,__p="",__j=Array.prototype.join,print=function(){__p+=__j.call(arguments,"")};with(obj||{})__p+="",show_emoticons&&(__p+='\n    <li class="toggle-smiley icon-happy" title="'+((__t=label_insert_smiley)==null?"":__t)+'">\n        <ul>\n            <li><a class="icon-smiley" href="#" data-emoticon=":)"></a></li>\n            <li><a class="icon-wink" href="#" data-emoticon=";)"></a></li>\n            <li><a class="icon-grin" href="#" data-emoticon=":D"></a></li>\n            <li><a class="icon-tongue" href="#" data-emoticon=":P"></a></li>\n            <li><a class="icon-cool" href="#" data-emoticon="8)"></a></li>\n            <li><a class="icon-evil" href="#" data-emoticon=">:)"></a></li>\n            <li><a class="icon-confused" href="#" data-emoticon=":S"></a></li>\n            <li><a class="icon-wondering" href="#" data-emoticon=":\\"></a></li>\n            <li><a class="icon-angry" href="#" data-emoticon=">:("></a></li>\n            <li><a class="icon-sad" href="#" data-emoticon=":("></a></li>\n            <li><a class="icon-shocked" href="#" data-emoticon=":O"></a></li>\n            <li><a class="icon-thumbs-up" href="#" data-emoticon="(^.^)b"></a></li>\n            <li><a class="icon-heart" href="#" data-emoticon="<3"></a></li>\n        </ul>\n    </li>\n'),__p+="\n",show_call_button&&(__p+='\n<li class="toggle-call"><a class="icon-phone" title="'+((__t=label_start_call)==null?"":__t)+'"></a></li>\n'),__p+="\n",show_occupants_toggle&&(__p+='\n<li class="toggle-occupants"><a class="icon-hide-users" title="'+((__t=label_hide_occupants)==null?"":__t)+'"></a></li>\n'),__p+="\n",show_clear_button&&(__p+='\n<li class="toggle-clear"><a class="icon-remove" title="'+((__t=label_clear)==null?"":__t)+'"></a></li>\n'),__p+="\n",allow_otr&&(__p+='\n    <li class="toggle-otr '+((__t=otr_status_class)==null?"":__t)+'" title="'+((__t=otr_tooltip)==null?"":__t)+'">\n        <span class="chat-toolbar-text">'+((__t=otr_translated_status)==null?"":__t)+"</span>\n        ",otr_status==UNENCRYPTED&&(__p+='\n            <span class="icon-unlocked"></span>\n        '),__p+="\n        ",otr_status==UNVERIFIED&&(__p+='\n            <span class="icon-lock"></span>\n        '),__p+="\n        ",otr_status==VERIFIED&&(__p+='\n            <span class="icon-lock"></span>\n        '),__p+="\n        ",otr_status==FINISHED&&(__p+='\n            <span class="icon-unlocked"></span>\n        '),__p+="\n        <ul>\n            ",otr_status==UNENCRYPTED&&(__p+='\n               <li><a class="start-otr" href="#">'+((__t=label_start_encrypted_conversation)==null?"":__t)+"</a></li>\n            "),__p+="\n            ",otr_status!=UNENCRYPTED&&(__p+='\n               <li><a class="start-otr" href="#">'+((__t=label_refresh_encrypted_conversation)==null?"":__t)+'</a></li>\n               <li><a class="end-otr" href="#">'+((__t=label_end_encrypted_conversation)==null?"":__t)+'</a></li>\n               <li><a class="auth-otr" data-scheme="smp" href="#">'+((__t=label_verify_with_smp)==null?"":__t)+"</a></li>\n            "),__p+="\n            ",otr_status==UNVERIFIED&&(__p+='\n               <li><a class="auth-otr" data-scheme="fingerprint" href="#">'+((__t=label_verify_with_fingerprints)==null?"":__t)+"</a></li>\n            "),__p+='\n            <li><a href="http://www.cypherpunks.ca/otr/help/3.2.0/levels.php" target="_blank">'+((__t=label_whats_this)==null?"":__t)+"</a></li>\n        </ul>\n    </li>\n"),__p+="\n";return __p}}),define("tpl!trimmed_chat",[],function(){return function(obj){var __t,__p="",__j=Array.prototype.join,print=function(){__p+=__j.call(arguments,"")};with(obj||{})__p+='<a class="chatbox-btn close-chatbox-button icon-close"></a>\n<a class="chat-head-message-count" \n    ',num_unread||(__p+=' style="display: none" '),__p+='\n    href="#">'+((__t=num_unread)==null?"":__t)+'</a>\n<a href="#" class="restore-chat" title="'+((__t=tooltip)==null?"":__t)+'">\n    '+((__t=title)==null?"":__t)+"\n</a>\n";return __p}}),define("tpl!vcard",[],function(){return function(obj){var __t,__p="",__j=Array.prototype.join,print=function(){__p+=__j.call(arguments,"")};with(obj||{})__p+='<form class="pure-form converse-form vcard-info">\n    <fieldset>\n        <legend>The VCard info gets rendered here</legend>\n        <label>Full name:</label>\n        '+((__t=fullname)==null?"":__t)+"\n        <label>URL:</label>\n        "+((__t=url)==null?"":__t)+'\n    </fieldset>\n    <fieldset>\n        <input type="button" class="pure-button button-cancel" value="'+((__t=label_return)==null?"":__t)+'"/>\n    </fieldset>\n</form>\n';return __p}}),define("converse-templates",["tpl!action","tpl!add_contact_dropdown","tpl!add_contact_form","tpl!change_status_message","tpl!chat_status","tpl!chatarea","tpl!chatbox","tpl!chatroom","tpl!chatroom_form","tpl!chatroom_password_form","tpl!chatroom_sidebar","tpl!chatrooms_tab","tpl!chats_panel","tpl!choose_status","tpl!contacts_panel","tpl!contacts_tab","tpl!controlbox","tpl!controlbox_toggle","tpl!field","tpl!form_captcha","tpl!form_checkbox","tpl!form_input","tpl!form_select","tpl!form_textarea","tpl!form_username","tpl!group_header","tpl!info","tpl!login_panel","tpl!login_tab","tpl!message","tpl!new_day","tpl!occupant","tpl!pending_contact","tpl!pending_contacts","tpl!register_panel","tpl!register_tab","tpl!registration_form","tpl!registration_request","tpl!requesting_contact","tpl!requesting_contacts","tpl!room_description","tpl!room_item","tpl!room_panel","tpl!roster","tpl!roster_item","tpl!search_contact","tpl!select_option","tpl!status_option","tpl!toggle_chats","tpl!toolbar","tpl!trimmed_chat","tpl!vcard"],function(){return{action:arguments[0],add_contact_dropdown:arguments[1],add_contact_form:arguments[2],change_status_message:arguments[3],chat_status:arguments[4],chatarea:arguments[5],chatbox:arguments[6],chatroom:arguments[7],chatroom_form:arguments[8],chatroom_password_form:arguments[9],chatroom_sidebar:arguments[10],chatrooms_tab:arguments[11],chats_panel:arguments[12],choose_status:arguments[13],contacts_panel:arguments[14],contacts_tab:arguments[15],controlbox:arguments[16],controlbox_toggle:arguments[17],field:arguments[18],form_captcha:arguments[19],form_checkbox:arguments[20],form_input:arguments[21],form_select:arguments[22],form_textarea:arguments[23],form_username:arguments[24],group_header:arguments[25],info:arguments[26],login_panel:arguments[27],login_tab:arguments[28],message:arguments[29],new_day:arguments[30],occupant:arguments[31],pending_contact:arguments[32],pending_contacts:arguments[33],register_panel:arguments[34],register_tab:arguments[35],registration_form:arguments[36],registration_request:arguments[37],requesting_contact:arguments[38],requesting_contacts:arguments[39],room_description:arguments[40],room_item:arguments[41],room_panel:arguments[42],roster:arguments[43],roster_item:arguments[44],search_contact:arguments[45],select_option:arguments[46],status_option:arguments[47],toggle_chats:arguments[48],toolbar:arguments[49],trimmed_chat:arguments[50],vcard:arguments[51]}}),function(e,t){function l(e){return f.PF.compile(e||"nplurals=2; plural=(n != 1);")}function c(e,t){this._key=e,this._i18n=t}var n=Array.prototype,r=Object.prototype,i=n.slice,s=r.hasOwnProperty,o=n.forEach,u={},a={forEach:function(e,t,n){var r,i,a;if(e===null)return;if(o&&e.forEach===o)e.forEach(t,n);else if(e.length===+e.length){for(r=0,i=e.length;r<i;r++)if(r in e&&t.call(n,e[r],r,e)===u)return}else for(a in e)if(s.call(e,a)&&t.call(n,e[a],a,e)===u)return},extend:function(e){return this.forEach(i.call(arguments,1),function(t){for(var n in t)e[n]=t[n]}),e}},f=function(e){this.defaults={locale_data:{messages:{"":{domain:"messages",lang:"en",plural_forms:"nplurals=2; plural=(n != 1);"}}},domain:"messages"},this.options=a.extend({},this.defaults,e),this.textdomain(this.options.domain);if(e.domain&&!this.options.locale_data[this.options.domain])throw new Error("Text domain set to non-existent domain: `"+e.domain+"`")};f.context_delimiter=String.fromCharCode(4),a.extend(c.prototype,{onDomain:function(e){return this._domain=e,this},withContext:function(e){return this._context=e,this},ifPlural:function(e,t){return this._val=e,this._pkey=t,this},fetch:function(e){return{}.toString.call(e)!="[object Array]"&&(e=[].slice.call(arguments)),(e&&e.length?f.sprintf:function(e){return e})(this._i18n.dcnpgettext(this._domain,this._context,this._key,this._pkey,this._val),e)}}),a.extend(f.prototype,{translate:function(e){return new c(e,this)},textdomain:function(e){if(!e)return this._textdomain;this._textdomain=e},gettext:function(e){return this.dcnpgettext.call(this,t,t,e)},dgettext:function(e,n){return this.dcnpgettext.call(this,e,t,n)},dcgettext:function(e,n){return this.dcnpgettext.call(this,e,t,n)},ngettext:function(e,n,r){return this.dcnpgettext.call(this,t,t,e,n,r)},dngettext:function(e,n,r,i){return this.dcnpgettext.call(this,e,t,n,r,i)},dcngettext:function(e,n,r,i){return this.dcnpgettext.call(this,e,t,n,r,i)},pgettext:function(e,n){return this.dcnpgettext.call(this,t,e,n)},dpgettext:function(e,t,n){return this.dcnpgettext.call(this,e,t,n)},dcpgettext:function(e,t,n){return this.dcnpgettext.call(this,e,t,n)},npgettext:function(e,n,r,i){return this.dcnpgettext.call(this,t,e,n,r,i)},dnpgettext:function(e,t,n,r,i){return this.dcnpgettext.call(this,e,t,n,r,i)},dcnpgettext:function(e,t,n,r,i){r=r||n,e=e||this._textdomain,i=typeof i=="undefined"?1:i;var s;if(!this.options)return s=new f,s.dcnpgettext.call(s,undefined,undefined,n,r,i);if(!this.options.locale_data)throw new Error("No locale data provided.");if(!this.options.locale_data[e])throw new Error("Domain `"+e+"` was not found.");if(!this.options.locale_data[e][""])throw new Error("No locale meta information provided.");if(!n)throw new Error("No translation key found.");if(typeof i!="number"){i=parseInt(i,10);if(isNaN(i))throw new Error("The number that was passed in is not a number.")}var o=t?t+f.context_delimiter+n:n,u=this.options.locale_data,a=u[e],c=a[""].plural_forms||(u.messages||this.defaults.locale_data.messages)[""].plural_forms,h=l(c)(i)+1,p,d;if(!a)throw new Error("No domain named `"+e+"` could be found.");return p=a[o],!p||h>=p.length?(this.options.missing_key_callback&&this.options.missing_key_callback(o),d=[null,n,r],d[l(c)(i)+1]):(d=p[h],d?d:(d=[null,n,r],d[l(c)(i)+1]))}});var h=function(){function e(e){return Object.prototype.toString.call(e).slice(8,-1).toLowerCase()}function t(e,t){for(var n=[];t>0;n[--t]=e);return n.join("")}var n=function(){return n.cache.hasOwnProperty(arguments[0])||(n.cache[arguments[0]]=n.parse(arguments[0])),n.format.call(null,n.cache[arguments[0]],arguments)};return n.format=function(n,r){var i=1,s=n.length,o="",u,a=[],f,l,c,p,d,v;for(f=0;f<s;f++){o=e(n[f]);if(o==="string")a.push(n[f]);else if(o==="array"){c=n[f];if(c[2]){u=r[i];for(l=0;l<c[2].length;l++){if(!u.hasOwnProperty(c[2][l]))throw h('[sprintf] property "%s" does not exist',c[2][l]);u=u[c[2][l]]}}else c[1]?u=r[c[1]]:u=r[i++];if(/[^s]/.test(c[8])&&e(u)!="number")throw h("[sprintf] expecting number but found %s",e(u));if(typeof u=="undefined"||u===null)u="";switch(c[8]){case"b":u=u.toString(2);break;case"c":u=String.fromCharCode(u);break;case"d":u=parseInt(u,10);break;case"e":u=c[7]?u.toExponential(c[7]):u.toExponential();break;case"f":u=c[7]?parseFloat(u).toFixed(c[7]):parseFloat(u);break;case"o":u=u.toString(8);break;case"s":u=(u=String(u))&&c[7]?u.substring(0,c[7]):u;break;case"u":u=Math.abs(u);break;case"x":u=u.toString(16);break;case"X":u=u.toString(16).toUpperCase()}u=/[def]/.test(c[8])&&c[3]&&u>=0?"+"+u:u,d=c[4]?c[4]=="0"?"0":c[4].charAt(1):" ",v=c[6]-String(u).length,p=c[6]?t(d,v):"",a.push(c[5]?u+p:p+u)}}return a.join("")},n.cache={},n.parse=function(e){var t=e,n=[],r=[],i=0;while(t){if((n=/^[^\x25]+/.exec(t))!==null)r.push(n[0]);else if((n=/^\x25{2}/.exec(t))!==null)r.push("%");else{if((n=/^\x25(?:([1-9]\d*)\$|\(([^\)]+)\))?(\+)?(0|'[^$])?(-)?(\d+)?(?:\.(\d+))?([b-fosuxX])/.exec(t))===null)throw"[sprintf] huh?";if(n[2]){i|=1;var s=[],o=n[2],u=[];if((u=/^([a-z_][a-z_\d]*)/i.exec(o))===null)throw"[sprintf] huh?";s.push(u[1]);while((o=o.substring(u[0].length))!=="")if((u=/^\.([a-z_][a-z_\d]*)/i.exec(o))!==null)s.push(u[1]);else{if((u=/^\[(\d+)\]/.exec(o))===null)throw"[sprintf] huh?";s.push(u[1])}n[2]=s}else i|=2;if(i===3)throw"[sprintf] mixing positional and named placeholders is not (yet) supported";r.push(n)}t=t.substring(n[0].length)}return r},n}(),p=function(e,t){return t.unshift(e),h.apply(null,t)};f.parse_plural=function(e,t){return e=e.replace(/n/g,t),f.parse_expression(e)},f.sprintf=function(e,t){return{}.toString.call(t)=="[object Array]"?p(e,[].slice.call(t)):h.apply(this,[].slice.call(arguments))},f.prototype.sprintf=function(){return f.sprintf.apply(this,arguments)},f.PF={},f.PF.parse=function(e){var t=f.PF.extractPluralExpr(e);return f.PF.parser.parse.call(f.PF.parser,t)},f.PF.compile=function(e){function t(e){return e===!0?1:e?e:0}var n=f.PF.parse(e);return function(e){return t(f.PF.interpreter(n)(e))}},f.PF.interpreter=function(e){return function(t){var n;switch(e.type){case"GROUP":return f.PF.interpreter(e.expr)(t);case"TERNARY":if(f.PF.interpreter(e.expr)(t))return f.PF.interpreter(e.truthy)(t);return f.PF.interpreter(e.falsey)(t);case"OR":return f.PF.interpreter(e.left)(t)||f.PF.interpreter(e.right)(t);case"AND":return f.PF.interpreter(e.left)(t)&&f.PF.interpreter(e.right)(t);case"LT":return f.PF.interpreter(e.left)(t)<f.PF.interpreter(e.right)(t);case"GT":return f.PF.interpreter(e.left)(t)>f.PF.interpreter(e.right)(t);case"LTE":return f.PF.interpreter(e.left)(t)<=f.PF.interpreter(e.right)(t);case"GTE":return f.PF.interpreter(e.left)(t)>=f.PF.interpreter(e.right)(t);case"EQ":return f.PF.interpreter(e.left)(t)==f.PF.interpreter(e.right)(t);case"NEQ":return f.PF.interpreter(e.left)(t)!=f.PF.interpreter(e.right)(t);case"MOD":return f.PF.interpreter(e.left)(t)%f.PF.interpreter(e.right)(t);case"VAR":return t;case"NUM":return e.val;default:throw new Error("Invalid Token found.")}}},f.PF.extractPluralExpr=function(e){e=e.replace(/^\s\s*/,"").replace(/\s\s*$/,""),/;\s*$/.test(e)||(e=e.concat(";"));var t=/nplurals\=(\d+);/,n=/plural\=(.*);/,r=e.match(t),i={},s;if(r.length>1){i.nplurals=r[1],e=e.replace(t,""),s=e.match(n);if(!(s&&s.length>1))throw new Error("`plural` expression not found: "+e);return s[1]}throw new Error("nplurals not found in plural_forms string: "+e)},f.PF.parser=function(){var e={trace:function(){},yy:{},symbols_:{error:2,expressions:3,e:4,EOF:5,"?":6,":":7,"||":8,"&&":9,"<":10,"<=":11,">":12,">=":13,"!=":14,"==":15,"%":16,"(":17,")":18,n:19,NUMBER:20,$accept:0,$end:1},terminals_:{2:"error",5:"EOF",6:"?",7:":",8:"||",9:"&&",10:"<",11:"<=",12:">",13:">=",14:"!=",15:"==",16:"%",17:"(",18:")",19:"n",20:"NUMBER"},productions_:[0,[3,2],[4,5],[4,3],[4,3],[4,3],[4,3],[4,3],[4,3],[4,3],[4,3],[4,3],[4,3],[4,1],[4,1]],performAction:function(t,n,r,i,s,o,u){var a=o.length-1;switch(s){case 1:return{type:"GROUP",expr:o[a-1]};case 2:this.$={type:"TERNARY",expr:o[a-4],truthy:o[a-2],falsey:o[a]};break;case 3:this.$={type:"OR",left:o[a-2],right:o[a]};break;case 4:this.$={type:"AND",left:o[a-2],right:o[a]};break;case 5:this.$={type:"LT",left:o[a-2],right:o[a]};break;case 6:this.$={type:"LTE",left:o[a-2],right:o[a]};break;case 7:this.$={type:"GT",left:o[a-2],right:o[a]};break;case 8:this.$={type:"GTE",left:o[a-2],right:o[a]};break;case 9:this.$={type:"NEQ",left:o[a-2],right:o[a]};break;case 10:this.$={type:"EQ",left:o[a-2],right:o[a]};break;case 11:this.$={type:"MOD",left:o[a-2],right:o[a]};break;case 12:this.$={type:"GROUP",expr:o[a-1]};break;case 13:this.$={type:"VAR"};break;case 14:this.$={type:"NUM",val:Number(t)}}},table:[{3:1,4:2,17:[1,3],19:[1,4],20:[1,5]},{1:[3]},{5:[1,6],6:[1,7],8:[1,8],9:[1,9],10:[1,10],11:[1,11],12:[1,12],13:[1,13],14:[1,14],15:[1,15],16:[1,16]},{4:17,17:[1,3],19:[1,4],20:[1,5]},{5:[2,13],6:[2,13],7:[2,13],8:[2,13],9:[2,13],10:[2,13],11:[2,13],12:[2,13],13:[2,13],14:[2,13],15:[2,13],16:[2,13],18:[2,13]},{5:[2,14],6:[2,14],7:[2,14],8:[2,14],9:[2,14],10:[2,14],11:[2,14],12:[2,14],13:[2,14],14:[2,14],15:[2,14],16:[2,14],18:[2,14]},{1:[2,1]},{4:18,17:[1,3],19:[1,4],20:[1,5]},{4:19,17:[1,3],19:[1,4],20:[1,5]},{4:20,17:[1,3],19:[1,4],20:[1,5]},{4:21,17:[1,3],19:[1,4],20:[1,5]},{4:22,17:[1,3],19:[1,4],20:[1,5]},{4:23,17:[1,3],19:[1,4],20:[1,5]},{4:24,17:[1,3],19:[1,4],20:[1,5]},{4:25,17:[1,3],19:[1,4],20:[1,5]},{4:26,17:[1,3],19:[1,4],20:[1,5]},{4:27,17:[1,3],19:[1,4],20:[1,5]},{6:[1,7],8:[1,8],9:[1,9],10:[1,10],11:[1,11],12:[1,12],13:[1,13],14:[1,14],15:[1,15],16:[1,16],18:[1,28]},{6:[1,7],7:[1,29],8:[1,8],9:[1,9],10:[1,10],11:[1,11],12:[1,12],13:[1,13],14:[1,14],15:[1,15],16:[1,16]},{5:[2,3],6:[2,3],7:[2,3],8:[2,3],9:[1,9],10:[1,10],11:[1,11],12:[1,12],13:[1,13],14:[1,14],15:[1,15],16:[1,16],18:[2,3]},{5:[2,4],6:[2,4],7:[2,4],8:[2,4],9:[2,4],10:[1,10],11:[1,11],12:[1,12],13:[1,13],14:[1,14],15:[1,15],16:[1,16],18:[2,4]},{5:[2,5],6:[2,5],7:[2,5],8:[2,5],9:[2,5],10:[2,5],11:[2,5],12:[2,5],13:[2,5],14:[2,5],15:[2,5],16:[1,16],18:[2,5]},{5:[2,6],6:[2,6],7:[2,6],8:[2,6],9:[2,6],10:[2,6],11:[2,6],12:[2,6],13:[2,6],14:[2,6],15:[2,6],16:[1,16],18:[2,6]},{5:[2,7],6:[2,7],7:[2,7],8:[2,7],9:[2,7],10:[2,7],11:[2,7],12:[2,7],13:[2,7],14:[2,7],15:[2,7],16:[1,16],18:[2,7]},{5:[2,8],6:[2,8],7:[2,8],8:[2,8],9:[2,8],10:[2,8],11:[2,8],12:[2,8],13:[2,8],14:[2,8],15:[2,8],16:[1,16],18:[2,8]},{5:[2,9],6:[2,9],7:[2,9],8:[2,9],9:[2,9],10:[2,9],11:[2,9],12:[2,9],13:[2,9],14:[2,9],15:[2,9],16:[1,16],18:[2,9]},{5:[2,10],6:[2,10],7:[2,10],8:[2,10],9:[2,10],10:[2,10],11:[2,10],12:[2,10],13:[2,10],14:[2,10],15:[2,10],16:[1,16],18:[2,10]},{5:[2,11],6:[2,11],7:[2,11],8:[2,11],9:[2,11],10:[2,11],11:[2,11],12:[2,11],13:[2,11],14:[2,11],15:[2,11],16:[2,11],18:[2,11]},{5:[2,12],6:[2,12],7:[2,12],8:[2,12],9:[2,12],10:[2,12],11:[2,12],12:[2,12],13:[2,12],14:[2,12],15:[2,12],16:[2,12],18:[2,12]},{4:30,17:[1,3],19:[1,4],20:[1,5]},{5:[2,2],6:[1,7],7:[2,2],8:[1,8],9:[1,9],10:[1,10],11:[1,11],12:[1,12],13:[1,13],14:[1,14],15:[1,15],16:[1,16],18:[2,2]}],defaultActions:{6:[2,1]},parseError:function(t,n){throw new Error(t)},parse:function(t){function d(e){r.length=r.length-2*e,i.length=i.length-e,s.length=s.length-e}function v(){var e;return e=n.lexer.lex()||1,typeof e!="number"&&(e=n.symbols_[e]||e),e}var n=this,r=[0],i=[null],s=[],o=this.table,u="",a=0,f=0,l=0,c=2,h=1;this.lexer.setInput(t),this.lexer.yy=this.yy,this.yy.lexer=this.lexer,typeof this.lexer.yylloc=="undefined"&&(this.lexer.yylloc={});var p=this.lexer.yylloc;s.push(p),typeof this.yy.parseError=="function"&&(this.parseError=this.yy.parseError);var m,g,y,b,w,E,S={},x,T,N,C;for(;;){y=r[r.length-1],this.defaultActions[y]?b=this.defaultActions[y]:(m==null&&(m=v()),b=o[y]&&o[y][m]);if(typeof b=="undefined"||!b.length||!b[0]){if(!l){C=[];for(x in o[y])this.terminals_[x]&&x>2&&C.push("'"+this.terminals_[x]+"'");var k="";this.lexer.showPosition?k="Parse error on line "+(a+1)+":\n"+this.lexer.showPosition()+"\nExpecting "+C.join(", ")+", got '"+this.terminals_[m]+"'":k="Parse error on line "+(a+1)+": Unexpected "+(m==1?"end of input":"'"+(this.terminals_[m]||m)+"'"),this.parseError(k,{text:this.lexer.match,token:this.terminals_[m]||m,line:this.lexer.yylineno,loc:p,expected:C})}if(l==3){if(m==h)throw new Error(k||"Parsing halted.");f=this.lexer.yyleng,u=this.lexer.yytext,a=this.lexer.yylineno,p=this.lexer.yylloc,m=v()}for(;;){if(c.toString()in o[y])break;if(y==0)throw new Error(k||"Parsing halted.");d(1),y=r[r.length-1]}g=m,m=c,y=r[r.length-1],b=o[y]&&o[y][c],l=3}if(b[0]instanceof Array&&b.length>1)throw new Error("Parse Error: multiple actions possible at state: "+y+", token: "+m);switch(b[0]){case 1:r.push(m),i.push(this.lexer.yytext),s.push(this.lexer.yylloc),r.push(b[1]),m=null,g?(m=g,g=null):(f=this.lexer.yyleng,u=this.lexer.yytext,a=this.lexer.yylineno,p=this.lexer.yylloc,l>0&&l--);break;case 2:T=this.productions_[b[1]][1],S.$=i[i.length-T],S._$={first_line:s[s.length-(T||1)].first_line,last_line:s[s.length-1].last_line,first_column:s[s.length-(T||1)].first_column,last_column:s[s.length-1].last_column},E=this.performAction.call(S,u,f,a,this.yy,b[1],i,s);if(typeof E!="undefined")return E;T&&(r=r.slice(0,-1*T*2),i=i.slice(0,-1*T),s=s.slice(0,-1*T)),r.push(this.productions_[b[1]][0]),i.push(S.$),s.push(S._$),N=o[r[r.length-2]][r[r.length-1]],r.push(N);break;case 3:return!0}}return!0}},t=function(){var e={EOF:1,parseError:function(t,n){if(!this.yy.parseError)throw new Error(t);this.yy.parseError(t,n)},setInput:function(e){return this._input=e,this._more=this._less=this.done=!1,this.yylineno=this.yyleng=0,this.yytext=this.matched=this.match="",this.conditionStack=["INITIAL"],this.yylloc={first_line:1,first_column:0,last_line:1,last_column:0},this},input:function(){var e=this._input[0];this.yytext+=e,this.yyleng++,this.match+=e,this.matched+=e;var t=e.match(/\n/);return t&&this.yylineno++,this._input=this._input.slice(1),e},unput:function(e){return this._input=e+this._input,this},more:function(){return this._more=!0,this},pastInput:function(){var e=this.matched.substr(0,this.matched.length-this.match.length);return(e.length>20?"...":"")+e.substr(-20).replace(/\n/g,"")},upcomingInput:function(){var e=this.match;return e.length<20&&(e+=this._input.substr(0,20-e.length)),(e.substr(0,20)+(e.length>20?"...":"")).replace(/\n/g,"")},showPosition:function(){var e=this.pastInput(),t=(new Array(e.length+1)).join("-");return e+this.upcomingInput()+"\n"+t+"^"},next:function(){if(this.done)return this.EOF;this._input||(this.done=!0);var e,t,n,r;this._more||(this.yytext="",this.match="");var i=this._currentRules();for(var s=0;s<i.length;s++){t=this._input.match(this.rules[i[s]]);if(t){r=t[0].match(/\n.*/g),r&&(this.yylineno+=r.length),this.yylloc={first_line:this.yylloc.last_line,last_line:this.yylineno+1,first_column:this.yylloc.last_column,last_column:r?r[r.length-1].length-1:this.yylloc.last_column+t[0].length},this.yytext+=t[0],this.match+=t[0],this.matches=t,this.yyleng=this.yytext.length,this._more=!1,this._input=this._input.slice(t[0].length),this.matched+=t[0],e=this.performAction.call(this,this.yy,this,i[s],this.conditionStack[this.conditionStack.length-1]);if(e)return e;return}}if(this._input==="")return this.EOF;this.parseError("Lexical error on line "+(this.yylineno+1)+". Unrecognized text.\n"+this.showPosition(),{text:"",token:null,line:this.yylineno})},lex:function(){var t=this.next();return typeof t!="undefined"?t:this.lex()},begin:function(t){this.conditionStack.push(t)},popState:function(){return this.conditionStack.pop()},_currentRules:function(){return this.conditions[this.conditionStack[this.conditionStack.length-1]].rules},topState:function(){return this.conditionStack[this.conditionStack.length-2]},pushState:function(t){this.begin(t)}};return e.performAction=function(t,n,r,i){var s=i;switch(r){case 0:break;case 1:return 20;case 2:return 19;case 3:return 8;case 4:return 9;case 5:return 6;case 6:return 7;case 7:return 11;case 8:return 13;case 9:return 10;case 10:return 12;case 11:return 14;case 12:return 15;case 13:return 16;case 14:return 17;case 15:return 18;case 16:return 5;case 17:return"INVALID"}},e.rules=[/^\s+/,/^[0-9]+(\.[0-9]+)?\b/,/^n\b/,/^\|\|/,/^&&/,/^\?/,/^:/,/^<=/,/^>=/,/^</,/^>/,/^!=/,/^==/,/^%/,/^\(/,/^\)/,/^$/,/^./],e.conditions={INITIAL:{rules:[0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17],inclusive:!0}},e}();return e.lexer=t,e}(),typeof exports!="undefined"?(typeof module!="undefined"&&module.exports&&(exports=module.exports=f),exports.Jed=f):(typeof define=="function"&&define.amd&&define("jed",[],function(){return f}),e.Jed=f)}(this),define("text!af",[],function(){return'{\n   "domain": "converse",\n   "locale_data": {\n      "converse": {\n         "": {\n            "domain": "converse",\n            "lang": "af"\n         },\n         " e.g. conversejs.org": [\n            null,\n            "bv. conversejs.org"\n         ],\n         "unencrypted": [\n            null,\n            "nie-privaat"\n         ],\n         "unverified": [\n            null,\n            "onbevestig"\n         ],\n         "verified": [\n            null,\n            "privaat"\n         ],\n         "finished": [\n            null,\n            "afgesluit"\n         ],\n         "This contact is busy": [\n            null,\n            "Hierdie persoon is besig"\n         ],\n         "This contact is online": [\n            null,\n            "Hierdie persoon is aanlyn"\n         ],\n         "This contact is offline": [\n            null,\n            "Hierdie persoon is aflyn"\n         ],\n         "This contact is unavailable": [\n            null,\n            "Hierdie persoon is onbeskikbaar"\n         ],\n         "This contact is away for an extended period": [\n            null,\n            "Hierdie persoon is vir lank afwesig"\n         ],\n         "This contact is away": [\n            null,\n            "Hierdie persoon is afwesig"\n         ],\n         "Click to hide these contacts": [\n            null,\n            "Klik om hierdie kontakte te verskuil"\n         ],\n         "My contacts": [\n            null,\n            "My kontakte"\n         ],\n         "Pending contacts": [\n            null,\n            "Hangende kontakte"\n         ],\n         "Contact requests": [\n            null,\n            "Kontak versoeke"\n         ],\n         "Ungrouped": [\n            null,\n            "Ongegroepeer"\n         ],\n         "Contacts": [\n            null,\n            "Kontakte"\n         ],\n         "Groups": [\n            null,\n            "Groepe"\n         ],\n         "Attempting to reconnect in 5 seconds": [\n            null,\n            ""\n         ],\n         "Error": [\n            null,\n            "Fout"\n         ],\n         "Connecting": [\n            null,\n            "Verbind tans"\n         ],\n         "Authenticating": [\n            null,\n            "Besig om te bekragtig"\n         ],\n         "Authentication Failed": [\n            null,\n            "Bekragtiging het gefaal"\n         ],\n         "Re-establishing encrypted session": [\n            null,\n            "Herstel versleutelde sessie"\n         ],\n         "Generating private key.": [\n            null,\n            "Genereer private sleutel."\n         ],\n         "Your browser might become unresponsive.": [\n            null,\n            "U webblaaier mag tydelik onreageerbaar word."\n         ],\n         "Authentication request from %1$s\\n\\nYour chat contact is attempting to verify your identity, by asking you the question below.\\n\\n%2$s": [\n            null,\n            "Identiteitbevestigingsversoek van  %1$s\\n\\nU gespreksmaat probeer om u identiteit te bevestig, deur die volgende vraag te vra \\n\\n%2$s"\n         ],\n         "Could not verify this user\'s identify.": [\n            null,\n            "Kon nie hierdie gebruiker se identitied bevestig nie."\n         ],\n         "Exchanging private key with contact.": [\n            null,\n            "Sleutels word met gespreksmaat uitgeruil."\n         ],\n         "Close this chat box": [\n            null,\n            "Klik om hierdie kletskas toe te maak"\n         ],\n         "Minimize this chat box": [\n            null,\n            "Minimeer hierdie kletskas"\n         ],\n         "View more information on this person": [\n            null,\n            "Wys meer inligting aangaande hierdie persoon"\n         ],\n         "Personal message": [\n            null,\n            "Persoonlike boodskap"\n         ],\n         "Are you sure you want to clear the messages from this room?": [\n            null,\n            "Is u seker dat u die boodskappe in hierdie kamer wil verwyder?"\n         ],\n         "me": [\n            null,\n            "ek"\n         ],\n         "is typing": [\n            null,\n            "tik tans"\n         ],\n         "has stopped typing": [\n            null,\n            "het opgehou tik"\n         ],\n         "has gone away": [\n            null,\n            "het weggegaan"\n         ],\n         "Show this menu": [\n            null,\n            "Vertoon hierdie keuselys"\n         ],\n         "Write in the third person": [\n            null,\n            "Skryf in die derde persoon"\n         ],\n         "Remove messages": [\n            null,\n            "Verwyder boodskappe"\n         ],\n         "Are you sure you want to clear the messages from this chat box?": [\n            null,\n            "Is u seker u wil die boodskappe in hierdie kletskas uitvee?"\n         ],\n         "Your message could not be sent": [\n            null,\n            "U boodskap kon nie gestuur word nie"\n         ],\n         "We received an unencrypted message": [\n            null,\n            "Ons het \'n onversleutelde boodskap ontvang"\n         ],\n         "We received an unreadable encrypted message": [\n            null,\n            "Ons het \'n onleesbare versleutelde boodskap ontvang"\n         ],\n         "Here are the fingerprints, please confirm them with %1$s, outside of this chat.\\n\\nFingerprint for you, %2$s: %3$s\\n\\nFingerprint for %1$s: %4$s\\n\\nIf you have confirmed that the fingerprints match, click OK, otherwise click Cancel.": [\n            null,\n            "Hier is die vingerafdrukke, bevestig hulle met %1$s, buite hierdie kletskanaal \\n\\nU vingerafdruk, %2$s: %3$s\\n\\nVingerafdruk vir %1$s: %4$s\\n\\nIndien u die vingerafdrukke bevestig het, klik OK, andersinds klik Kanselleer"\n         ],\n         "You will be prompted to provide a security question and then an answer to that question.\\n\\nYour contact will then be prompted the same question and if they type the exact same answer (case sensitive), their identity will be verified.": [\n            null,\n            "Daar sal van u verwag word om \'n sekuriteitsvraag te stel, en dan ook die antwoord tot daardie vraag te verskaf.\\n\\nU gespreksmaat sal dan daardie vraag gestel word, en indien hulle presies dieselfde antwoord (lw. hoofletters tel) verskaf, sal hul identiteit bevestig wees."\n         ],\n         "What is your security question?": [\n            null,\n            "Wat is u sekuriteitsvraag?"\n         ],\n         "What is the answer to the security question?": [\n            null,\n            "Wat is die antwoord tot die sekuriteitsvraag?"\n         ],\n         "Invalid authentication scheme provided": [\n            null,\n            "Ongeldige verifikasiemetode verskaf"\n         ],\n         "has gone offline": [\n            null,\n            "is nou aflyn"\n         ],\n         "is busy": [\n            null,\n            "is besig"\n         ],\n         "Your messages are not encrypted anymore": [\n            null,\n            "U boodskappe is nie meer versleutel nie"\n         ],\n         "Your messages are now encrypted but your contact\'s identity has not been verified.": [\n            null,\n            "U boodskappe is now versleutel maar u gespreksmaat se identiteit is nog onseker."\n         ],\n         "Your contact\'s identify has been verified.": [\n            null,\n            "U gespreksmaat se identiteit is bevestig."\n         ],\n         "Your contact has ended encryption on their end, you should do the same.": [\n            null,\n            "U gespreksmaat het versleuteling gestaak, u behoort nou dieselfde te doen."\n         ],\n         "Your messages are not encrypted. Click here to enable OTR encryption.": [\n            null,\n            "U boodskappe is nie versleutel nie. Klik hier om OTR versleuteling te aktiveer."\n         ],\n         "Your messages are encrypted, but your contact has not been verified.": [\n            null,\n            "U boodskappe is versleutel, maar u gespreksmaat se identiteit is not onseker."\n         ],\n         "Your messages are encrypted and your contact verified.": [\n            null,\n            "U boodskappe is versleutel en u gespreksmaat se identiteit bevestig."\n         ],\n         "Your contact has closed their end of the private session, you should do the same": [\n            null,\n            "U gespreksmaat het die private sessie gestaak. U behoort dieselfde te doen"\n         ],\n         "Clear all messages": [\n            null,\n            "Vee alle boodskappe uit"\n         ],\n         "End encrypted conversation": [\n            null,\n            "Beëindig versleutelde gesprek"\n         ],\n         "Insert a smiley": [\n            null,\n            ""\n         ],\n         "Hide the list of occupants": [\n            null,\n            "Verskuil die lys van deelnemers"\n         ],\n         "Refresh encrypted conversation": [\n            null,\n            "Verfris versleutelde gesprek"\n         ],\n         "Start a call": [\n            null,\n            "Begin \'n oproep"\n         ],\n         "Start encrypted conversation": [\n            null,\n            "Begin versleutelde gesprek"\n         ],\n         "Verify with fingerprints": [\n            null,\n            "Bevestig met vingerafdrukke"\n         ],\n         "Verify with SMP": [\n            null,\n            "Bevestig met SMP"\n         ],\n         "What\'s this?": [\n            null,\n            "Wat is hierdie?"\n         ],\n         "Online": [\n            null,\n            "Aangemeld"\n         ],\n         "Busy": [\n            null,\n            "Besig"\n         ],\n         "Away": [\n            null,\n            "Afwesig"\n         ],\n         "Offline": [\n            null,\n            "Afgemeld"\n         ],\n         "Log out": [\n            null,\n            "Meld af"\n         ],\n         "Contact name": [\n            null,\n            "Kontaknaam"\n         ],\n         "Search": [\n            null,\n            "Soek"\n         ],\n         "e.g. user@example.com": [\n            null,\n            ""\n         ],\n         "Add": [\n            null,\n            "Voeg by"\n         ],\n         "Click to add new chat contacts": [\n            null,\n            "Klik om nuwe kletskontakte by te voeg"\n         ],\n         "Add a contact": [\n            null,\n            "Voeg \'n kontak by"\n         ],\n         "No users found": [\n            null,\n            "Geen gebruikers gevind"\n         ],\n         "Click to add as a chat contact": [\n            null,\n            "Klik om as kletskontak by te voeg"\n         ],\n         "Room name": [\n            null,\n            "Kamer naam"\n         ],\n         "Nickname": [\n            null,\n            "Bynaam"\n         ],\n         "Server": [\n            null,\n            "Bediener"\n         ],\n         "Join Room": [\n            null,\n            "Betree kamer"\n         ],\n         "Show rooms": [\n            null,\n            "Wys kamers"\n         ],\n         "Rooms": [\n            null,\n            "Kamers"\n         ],\n         "No rooms on %1$s": [\n            null,\n            "Geen kamers op %1$s"\n         ],\n         "Rooms on %1$s": [\n            null,\n            "Kamers op %1$s"\n         ],\n         "Click to open this room": [\n            null,\n            "Klik om hierdie kletskamer te open"\n         ],\n         "Show more information on this room": [\n            null,\n            "Wys meer inligting aangaande hierdie kletskamer"\n         ],\n         "Description:": [\n            null,\n            "Beskrywing:"\n         ],\n         "Occupants:": [\n            null,\n            "Deelnemers:"\n         ],\n         "Features:": [\n            null,\n            "Eienskappe:"\n         ],\n         "Requires authentication": [\n            null,\n            "Benodig magtiging"\n         ],\n         "Hidden": [\n            null,\n            "Verskuil"\n         ],\n         "Requires an invitation": [\n            null,\n            "Benodig \'n uitnodiging"\n         ],\n         "Moderated": [\n            null,\n            "Gemodereer"\n         ],\n         "Non-anonymous": [\n            null,\n            "Nie-anoniem"\n         ],\n         "Open room": [\n            null,\n            "Oop kletskamer"\n         ],\n         "Permanent room": [\n            null,\n            "Permanente kamer"\n         ],\n         "Public": [\n            null,\n            "Publiek"\n         ],\n         "Semi-anonymous": [\n            null,\n            "Deels anoniem"\n         ],\n         "Temporary room": [\n            null,\n            "Tydelike kamer"\n         ],\n         "Unmoderated": [\n            null,\n            "Ongemodereer"\n         ],\n         "This user is a moderator": [\n            null,\n            "Hierdie gebruiker is \'n moderator"\n         ],\n         "This user can send messages in this room": [\n            null,\n            "Hierdie gebruiker kan boodskappe na die kamer stuur"\n         ],\n         "This user can NOT send messages in this room": [\n            null,\n            "Hierdie gebruiker kan NIE boodskappe na die kamer stuur nie"\n         ],\n         "Invite...": [\n            null,\n            "Nooi uit..."\n         ],\n         "Occupants": [\n            null,\n            "Deelnemers"\n         ],\n         "You are about to invite %1$s to the chat room \\"%2$s\\". ": [\n            null,\n            "U is op die punt om %1$s na die kletskamer \\"%2$s\\" uit te nooi."\n         ],\n         "You may optionally include a message, explaining the reason for the invitation.": [\n            null,\n            "U mag na keuse \'n boodskap insluit, om bv. die rede vir die uitnodiging te staaf."\n         ],\n         "Message": [\n            null,\n            "Boodskap"\n         ],\n         "Error: could not execute the command": [\n            null,\n            "Fout: kon nie die opdrag uitvoer nie"\n         ],\n         "Error: the \\"": [\n            null,\n            ""\n         ],\n         "Change user\'s affiliation to admin": [\n            null,\n            ""\n         ],\n         "Ban user from room": [\n            null,\n            "Verban gebruiker uit hierdie kletskamer"\n         ],\n         "Change user role to occupant": [\n            null,\n            "Verander gebruiker se rol na lid"\n         ],\n         "Kick user from room": [\n            null,\n            "Skop gebruiker uit hierdie kletskamer"\n         ],\n         "Write in 3rd person": [\n            null,\n            "Skryf in die derde persoon"\n         ],\n         "Grant membership to a user": [\n            null,\n            "Verleen lidmaatskap aan \'n gebruiker"\n         ],\n         "Remove user\'s ability to post messages": [\n            null,\n            "Verwyder gebruiker se vermoë om boodskappe te plaas"\n         ],\n         "Change your nickname": [\n            null,\n            "Verander u bynaam"\n         ],\n         "Grant moderator role to user": [\n            null,\n            "Verleen moderator rol aan gebruiker"\n         ],\n         "Grant ownership of this room": [\n            null,\n            "Verleen eienaarskap van hierdie kamer"\n         ],\n         "Revoke user\'s membership": [\n            null,\n            "Herroep gebruiker se lidmaatskap"\n         ],\n         "Set room topic": [\n            null,\n            "Stel onderwerp vir kletskamer"\n         ],\n         "Allow muted user to post messages": [\n            null,\n            "Laat stilgemaakte gebruiker toe om weer boodskappe te plaas"\n         ],\n         "Save": [\n            null,\n            "Stoor"\n         ],\n         "Cancel": [\n            null,\n            "Kanseleer"\n         ],\n         "An error occurred while trying to save the form.": [\n            null,\n            "A fout het voorgekom terwyl probeer is om die vorm te stoor."\n         ],\n         "This chatroom requires a password": [\n            null,\n            "Hiedie kletskamer benodig \'n wagwoord"\n         ],\n         "Password: ": [\n            null,\n            "Wagwoord:"\n         ],\n         "Submit": [\n            null,\n            "Dien in"\n         ],\n         "This room is not anonymous": [\n            null,\n            "Hierdie vertrek is nie anoniem nie"\n         ],\n         "This room now shows unavailable members": [\n            null,\n            "Hierdie vertrek wys nou onbeskikbare lede"\n         ],\n         "This room does not show unavailable members": [\n            null,\n            "Hierdie vertrek wys nie onbeskikbare lede nie"\n         ],\n         "Non-privacy-related room configuration has changed": [\n            null,\n            "Nie-privaatheidverwante kamer instellings het verander"\n         ],\n         "Room logging is now enabled": [\n            null,\n            "Kamer log is nou aangeskakel"\n         ],\n         "Room logging is now disabled": [\n            null,\n            "Kamer log is nou afgeskakel"\n         ],\n         "This room is now non-anonymous": [\n            null,\n            "Hiedie kamer is nou nie anoniem nie"\n         ],\n         "This room is now semi-anonymous": [\n            null,\n            "Hierdie kamer is nou gedeeltelik anoniem"\n         ],\n         "This room is now fully-anonymous": [\n            null,\n            "Hierdie kamer is nou ten volle anoniem"\n         ],\n         "A new room has been created": [\n            null,\n            "\'n Nuwe kamer is geskep"\n         ],\n         "You have been banned from this room": [\n            null,\n            "Jy is uit die kamer verban"\n         ],\n         "You have been kicked from this room": [\n            null,\n            "Jy is uit die kamer geskop"\n         ],\n         "You have been removed from this room because of an affiliation change": [\n            null,\n            "Jy is vanuit die kamer verwyder a.g.v \'n verandering van affiliasie"\n         ],\n         "You have been removed from this room because the room has changed to members-only and you\'re not a member": [\n            null,\n            "Jy is vanuit die kamer verwyder omdat die kamer nou slegs tot lede beperk word en jy nie \'n lid is nie."\n         ],\n         "You have been removed from this room because the MUC (Multi-user chat) service is being shut down.": [\n            null,\n            "Jy is van hierdie kamer verwyder aangesien die MUC (Multi-user chat) diens nou afgeskakel word."\n         ],\n         "<strong>%1$s</strong> has been banned": [\n            null,\n            "<strong>%1$s</strong> is verban"\n         ],\n         "<strong>%1$s</strong>\'s nickname has changed": [\n            null,\n            "<strong>%1$s</strong> se bynaam het verander"\n         ],\n         "<strong>%1$s</strong> has been kicked out": [\n            null,\n            "<strong>%1$s</strong> is uitgeskop"\n         ],\n         "<strong>%1$s</strong> has been removed because of an affiliation change": [\n            null,\n            "<strong>%1$s</strong> is verwyder a.g.v \'n verandering van affiliasie"\n         ],\n         "<strong>%1$s</strong> has been removed for not being a member": [\n            null,\n            "<strong>%1$s</strong> is nie \'n lid nie, en dus verwyder"\n         ],\n         "Your nickname has been automatically changed to: <strong>%1$s</strong>": [\n            null,\n            "U bynaam is outomaties verander na: <strong>%1$s</strong>"\n         ],\n         "Your nickname has been changed to: <strong>%1$s</strong>": [\n            null,\n            "U bynaam is verander na: <strong>%1$s</strong>"\n         ],\n         "The reason given is: \\"": [\n            null,\n            "Die gegewe rede is: \\""\n         ],\n         "You are not on the member list of this room": [\n            null,\n            "Jy is nie op die ledelys van hierdie kamer nie"\n         ],\n         "No nickname was specified": [\n            null,\n            "Geen bynaam verskaf nie"\n         ],\n         "You are not allowed to create new rooms": [\n            null,\n            "Jy word nie toegelaat om nog kamers te skep nie"\n         ],\n         "Your nickname doesn\'t conform to this room\'s policies": [\n            null,\n            "Jou bynaam voldoen nie aan die kamer se beleid nie"\n         ],\n         "Your nickname is already taken": [\n            null,\n            "Jou bynaam is reeds geneem"\n         ],\n         "This room does not (yet) exist": [\n            null,\n            "Hierdie kamer bestaan tans (nog) nie"\n         ],\n         "This room has reached it\'s maximum number of occupants": [\n            null,\n            "Hierdie kamer het sy maksimum aantal deelnemers bereik"\n         ],\n         "Topic set by %1$s to: %2$s": [\n            null,\n            "Onderwerp deur %1$s bygewerk na: %2$s"\n         ],\n         "%1$s has invited you to join a chat room: %2$s": [\n            null,\n            "%1$s het u uitgenooi om die kletskamer %2$s te besoek"\n         ],\n         "%1$s has invited you to join a chat room: %2$s, and left the following reason: \\"%3$s\\"": [\n            null,\n            "%1$s het u uitgenooi om die kletskamer %2$s te besoek, en het die volgende rede verskaf: \\"%3$s\\""\n         ],\n         "Click to restore this chat": [\n            null,\n            "Klik om hierdie klets te herstel"\n         ],\n         "Minimized": [\n            null,\n            "Geminimaliseer"\n         ],\n         "Click to remove this contact": [\n            null,\n            "Klik om hierdie kontak te verwyder"\n         ],\n         "Click to accept this contact request": [\n            null,\n            "Klik om hierdie kontakversoek te aanvaar"\n         ],\n         "Click to decline this contact request": [\n            null,\n            "Klik om hierdie kontakversoek te weier"\n         ],\n         "Click to chat with this contact": [\n            null,\n            "Klik om met hierdie kontak te klets"\n         ],\n         "Name": [\n            null,\n            ""\n         ],\n         "Are you sure you want to remove this contact?": [\n            null,\n            "Is u seker u wil hierdie gespreksmaat verwyder?"\n         ],\n         "Sorry, there was an error while trying to remove ": [\n            null,\n            ""\n         ],\n         "Are you sure you want to decline this contact request?": [\n            null,\n            "Is u seker dat u hierdie persoon se versoek wil afkeur?"\n         ],\n         "Sorry, there was an error while trying to add ": [\n            null,\n            ""\n         ],\n         "This client does not allow presence subscriptions": [\n            null,\n            ""\n         ],\n         "Type to filter": [\n            null,\n            "Tik om te filtreer"\n         ],\n         "I am %1$s": [\n            null,\n            "Ek is %1$s"\n         ],\n         "Click here to write a custom status message": [\n            null,\n            "Klik hier om jou eie statusboodskap te skryf"\n         ],\n         "Click to change your chat status": [\n            null,\n            "Klik om jou klets-status te verander"\n         ],\n         "Custom status": [\n            null,\n            "Doelgemaakte status"\n         ],\n         "online": [\n            null,\n            "aangemeld"\n         ],\n         "busy": [\n            null,\n            "besig"\n         ],\n         "away for long": [\n            null,\n            "vir lank afwesig"\n         ],\n         "away": [\n            null,\n            "afwesig"\n         ],\n         "offline": [\n            null,\n            "afgemeld"\n         ],\n         "Your XMPP provider\'s domain name:": [\n            null,\n            "U XMPP-verskaffer se domein naam:"\n         ],\n         "Fetch registration form": [\n            null,\n            "Haal die registrasie form"\n         ],\n         "Tip: A list of public XMPP providers is available": [\n            null,\n            "Wenk: A lys van publieke XMPP-verskaffers is beskikbaar"\n         ],\n         "here": [\n            null,\n            "hier"\n         ],\n         "Register": [\n            null,\n            "Registreer"\n         ],\n         "Sorry, the given provider does not support in band account registration. Please try with a different provider.": [\n            null,\n            "Jammer, die gekose verskaffer ondersteun nie in-band registrasie nie.Probeer weer met \'n ander verskaffer."\n         ],\n         "Requesting a registration form from the XMPP server": [\n            null,\n            "Vra tans die XMPP-bediener vir \'n registrasie vorm"\n         ],\n         "Something went wrong while establishing a connection with \\"%1$s\\". Are you sure it exists?": [\n            null,\n            "Iets het fout geloop tydens koppeling met \\"%1$s\\". Is u seker dat dit bestaan?"\n         ],\n         "Now logging you in": [\n            null,\n            "U word nou aangemeld"\n         ],\n         "Registered successfully": [\n            null,\n            "Suksesvol geregistreer"\n         ],\n         "Return": [\n            null,\n            "Terug"\n         ],\n         "XMPP Username:": [\n            null,\n            "XMPP Gebruikersnaam:"\n         ],\n         "Password:": [\n            null,\n            "Wagwoord"\n         ],\n         "Click here to log in anonymously": [\n            null,\n            "Klik hier om anoniem aan te meld"\n         ],\n         "Log In": [\n            null,\n            "Meld aan"\n         ],\n         "user@server": [\n            null,\n            "gebruiker@bediener"\n         ],\n         "password": [\n            null,\n            "wagwoord"\n         ],\n         "Sign in": [\n            null,\n            "Teken in"\n         ],\n         "Toggle chat": [\n            null,\n            "Klets"\n         ]\n      }\n   }\n}'}),define("text!de",[],function(){return'{\n   "domain": "converse",\n   "locale_data": {\n      "converse": {\n         "": {\n            "domain": "converse",\n            "plural_forms": "nplurals=2; plural=(n != 1);",\n            "lang": "de"\n         },\n         " e.g. conversejs.org": [\n            null,\n            "z. B. conversejs.org"\n         ],\n         "unencrypted": [\n            null,\n            "unverschlüsselt"\n         ],\n         "unverified": [\n            null,\n            "nicht verifiziert"\n         ],\n         "verified": [\n            null,\n            "verifiziert"\n         ],\n         "finished": [\n            null,\n            "erledigt"\n         ],\n         "This contact is busy": [\n            null,\n            "Dieser Kontakt ist beschäftigt"\n         ],\n         "This contact is online": [\n            null,\n            "Dieser Kontakt ist online"\n         ],\n         "This contact is offline": [\n            null,\n            "Dieser Kontakt ist offline"\n         ],\n         "This contact is unavailable": [\n            null,\n            "Dieser Kontakt ist nicht verfügbar"\n         ],\n         "This contact is away for an extended period": [\n            null,\n            "Dieser Kontakt ist für längere Zeit abwesend"\n         ],\n         "This contact is away": [\n            null,\n            "Dieser Kontakt ist abwesend"\n         ],\n         "Click to hide these contacts": [\n            null,\n            "Hier klicken um diese Kontakte zu verstecken"\n         ],\n         "My contacts": [\n            null,\n            "Meine Kontakte"\n         ],\n         "Pending contacts": [\n            null,\n            "Unbestätigte Kontakte"\n         ],\n         "Contact requests": [\n            null,\n            "Kontaktanfragen"\n         ],\n         "Ungrouped": [\n            null,\n            "Ungruppiert"\n         ],\n         "Contacts": [\n            null,\n            "Kontakte"\n         ],\n         "Groups": [\n            null,\n            "Gruppen"\n         ],\n         "Attempting to reconnect in 5 seconds": [\n            null,\n            ""\n         ],\n         "Error": [\n            null,\n            "Fehler"\n         ],\n         "Connecting": [\n            null,\n            "Verbindungsaufbau …"\n         ],\n         "Authenticating": [\n            null,\n            "Authentifizierung"\n         ],\n         "Authentication Failed": [\n            null,\n            "Authentifizierung gescheitert"\n         ],\n         "Re-establishing encrypted session": [\n            null,\n            "Verschlüsselte Sitzung wiederherstellen"\n         ],\n         "Generating private key.": [\n            null,\n            "Generiere privaten Schlüssel."\n         ],\n         "Your browser might become unresponsive.": [\n            null,\n            "Ihr Browser könnte langsam reagieren."\n         ],\n         "Authentication request from %1$s\\n\\nYour chat contact is attempting to verify your identity, by asking you the question below.\\n\\n%2$s": [\n            null,\n            "Authentifizierungsanfrage von %1$s\\n\\nIhr Kontakt möchte durch die folgende Frage Ihre Identität verifizieren:\\n\\n%2$s"\n         ],\n         "Could not verify this user\'s identify.": [\n            null,\n            "Die Identität des Benutzers konnte nicht verifiziert werden."\n         ],\n         "Exchanging private key with contact.": [\n            null,\n            "Tausche private Schlüssel mit Kontakt aus."\n         ],\n         "Minimize this chat box": [\n            null,\n            ""\n         ],\n         "Personal message": [\n            null,\n            "Persönliche Nachricht"\n         ],\n         "Are you sure you want to clear the messages from this room?": [\n            null,\n            "Sind Sie sicher, dass Sie alle Nachrichten in diesem Raum löschen möchten?"\n         ],\n         "me": [\n            null,\n            "Ich"\n         ],\n         "is typing": [\n            null,\n            "tippt"\n         ],\n         "has stopped typing": [\n            null,\n            "tippt nicht mehr"\n         ],\n         "has gone away": [\n            null,\n            "ist jetzt abwesend"\n         ],\n         "Show this menu": [\n            null,\n            "Dieses Menü anzeigen"\n         ],\n         "Write in the third person": [\n            null,\n            "In der dritten Person schreiben"\n         ],\n         "Remove messages": [\n            null,\n            "Nachrichten entfernen"\n         ],\n         "Are you sure you want to clear the messages from this chat box?": [\n            null,\n            "Sind Sie sicher, dass Sie alle Nachrichten dieses Chats löschen möchten?"\n         ],\n         "Your message could not be sent": [\n            null,\n            "Ihre Nachricht konnte nicht gesendet werden"\n         ],\n         "We received an unencrypted message": [\n            null,\n            "Wir haben eine unverschlüsselte Nachricht empfangen"\n         ],\n         "We received an unreadable encrypted message": [\n            null,\n            "Wir haben eine unlesbare Nachricht empfangen"\n         ],\n         "Here are the fingerprints, please confirm them with %1$s, outside of this chat.\\n\\nFingerprint for you, %2$s: %3$s\\n\\nFingerprint for %1$s: %4$s\\n\\nIf you have confirmed that the fingerprints match, click OK, otherwise click Cancel.": [\n            null,\n            ""\n         ],\n         "You will be prompted to provide a security question and then an answer to that question.\\n\\nYour contact will then be prompted the same question and if they type the exact same answer (case sensitive), their identity will be verified.": [\n            null,\n            ""\n         ],\n         "What is your security question?": [\n            null,\n            ""\n         ],\n         "What is the answer to the security question?": [\n            null,\n            ""\n         ],\n         "Invalid authentication scheme provided": [\n            null,\n            ""\n         ],\n         "is busy": [\n            null,\n            "ist beschäftigt"\n         ],\n         "Your messages are not encrypted anymore": [\n            null,\n            ""\n         ],\n         "Your messages are now encrypted but your contact\'s identity has not been verified.": [\n            null,\n            ""\n         ],\n         "Your contact\'s identify has been verified.": [\n            null,\n            ""\n         ],\n         "Your contact has ended encryption on their end, you should do the same.": [\n            null,\n            ""\n         ],\n         "Your messages are not encrypted. Click here to enable OTR encryption.": [\n            null,\n            ""\n         ],\n         "Your messages are encrypted, but your contact has not been verified.": [\n            null,\n            ""\n         ],\n         "Your messages are encrypted and your contact verified.": [\n            null,\n            ""\n         ],\n         "Your contact has closed their end of the private session, you should do the same": [\n            null,\n            ""\n         ],\n         "Clear all messages": [\n            null,\n            "Alle Nachrichten löschen"\n         ],\n         "End encrypted conversation": [\n            null,\n            ""\n         ],\n         "Insert a smiley": [\n            null,\n            ""\n         ],\n         "Refresh encrypted conversation": [\n            null,\n            ""\n         ],\n         "Start a call": [\n            null,\n            ""\n         ],\n         "Start encrypted conversation": [\n            null,\n            ""\n         ],\n         "Verify with fingerprints": [\n            null,\n            ""\n         ],\n         "Verify with SMP": [\n            null,\n            ""\n         ],\n         "What\'s this?": [\n            null,\n            "Was ist das?"\n         ],\n         "Online": [\n            null,\n            "Online"\n         ],\n         "Busy": [\n            null,\n            "Beschäftigt"\n         ],\n         "Away": [\n            null,\n            "Abwesend"\n         ],\n         "Offline": [\n            null,\n            "Abgemeldet"\n         ],\n         "Log out": [\n            null,\n            "Abmelden"\n         ],\n         "Contact name": [\n            null,\n            "Name des Kontakts"\n         ],\n         "Search": [\n            null,\n            "Suche"\n         ],\n         "e.g. user@example.com": [\n            null,\n            ""\n         ],\n         "Add": [\n            null,\n            "Hinzufügen"\n         ],\n         "Click to add new chat contacts": [\n            null,\n            "Hier klicken um neuen Kontakt hinzuzufügen"\n         ],\n         "Add a contact": [\n            null,\n            "Kontakt hinzufügen"\n         ],\n         "No users found": [\n            null,\n            "Keine Benutzer gefunden"\n         ],\n         "Click to add as a chat contact": [\n            null,\n            "Hier klicken um als Kontakt hinzuzufügen"\n         ],\n         "Room name": [\n            null,\n            "Raumname"\n         ],\n         "Nickname": [\n            null,\n            "Spitzname"\n         ],\n         "Server": [\n            null,\n            "Server"\n         ],\n         "Join Room": [\n            null,\n            "Raum betreten"\n         ],\n         "Show rooms": [\n            null,\n            "Räume anzeigen"\n         ],\n         "Rooms": [\n            null,\n            "Räume"\n         ],\n         "No rooms on %1$s": [\n            null,\n            "Keine Räume auf %1$s"\n         ],\n         "Rooms on %1$s": [\n            null,\n            "Räume auf %1$s"\n         ],\n         "Click to open this room": [\n            null,\n            "Hier klicken um diesen Raum zu öffnen"\n         ],\n         "Show more information on this room": [\n            null,\n            "Mehr Information über diesen Raum zeigen"\n         ],\n         "Description:": [\n            null,\n            "Beschreibung"\n         ],\n         "Occupants:": [\n            null,\n            "Teilnehmer"\n         ],\n         "Features:": [\n            null,\n            "Funktionen:"\n         ],\n         "Requires authentication": [\n            null,\n            "Authentifizierung erforderlich"\n         ],\n         "Hidden": [\n            null,\n            "Versteckt"\n         ],\n         "Requires an invitation": [\n            null,\n            "Einladung erforderlich"\n         ],\n         "Moderated": [\n            null,\n            "Moderiert"\n         ],\n         "Non-anonymous": [\n            null,\n            "Nicht anonym"\n         ],\n         "Open room": [\n            null,\n            "Offener Raum"\n         ],\n         "Permanent room": [\n            null,\n            "Dauerhafter Raum"\n         ],\n         "Public": [\n            null,\n            "Öffentlich"\n         ],\n         "Semi-anonymous": [\n            null,\n            "Teils anonym"\n         ],\n         "Temporary room": [\n            null,\n            "Vorübergehender Raum"\n         ],\n         "Unmoderated": [\n            null,\n            "Unmoderiert"\n         ],\n         "This user is a moderator": [\n            null,\n            "Dieser Benutzer ist ein Moderator"\n         ],\n         "This user can send messages in this room": [\n            null,\n            "Dieser Benutzer kann Nachrichten in diesem Raum verschicken"\n         ],\n         "This user can NOT send messages in this room": [\n            null,\n            "Dieser Benutzer kann keine Nachrichten in diesem Raum verschicken"\n         ],\n         "Invite...": [\n            null,\n            "Einladen..."\n         ],\n         "Occupants": [\n            null,\n            "Teilnehmer"\n         ],\n         "You are about to invite %1$s to the chat room \\"%2$s\\". ": [\n            null,\n            ""\n         ],\n         "You may optionally include a message, explaining the reason for the invitation.": [\n            null,\n            ""\n         ],\n         "Message": [\n            null,\n            "Nachricht"\n         ],\n         "Error: could not execute the command": [\n            null,\n            "Fehler: Konnte den Befehl nicht ausführen"\n         ],\n         "Error: the \\"": [\n            null,\n            ""\n         ],\n         "Change user\'s affiliation to admin": [\n            null,\n            ""\n         ],\n         "Ban user from room": [\n            null,\n            "Verbanne einen Benutzer aus dem Raum."\n         ],\n         "Kick user from room": [\n            null,\n            "Werfe einen Benutzer aus dem Raum."\n         ],\n         "Write in 3rd person": [\n            null,\n            "In der dritten Person schreiben"\n         ],\n         "Grant membership to a user": [\n            null,\n            ""\n         ],\n         "Remove user\'s ability to post messages": [\n            null,\n            ""\n         ],\n         "Change your nickname": [\n            null,\n            "Spitznamen ändern"\n         ],\n         "Grant moderator role to user": [\n            null,\n            ""\n         ],\n         "Grant ownership of this room": [\n            null,\n            "Besitzrechte an diesem Raum vergeben"\n         ],\n         "Revoke user\'s membership": [\n            null,\n            ""\n         ],\n         "Set room topic": [\n            null,\n            "Chatraum Thema festlegen"\n         ],\n         "Allow muted user to post messages": [\n            null,\n            ""\n         ],\n         "Save": [\n            null,\n            "Speichern"\n         ],\n         "Cancel": [\n            null,\n            "Abbrechen"\n         ],\n         "An error occurred while trying to save the form.": [\n            null,\n            "Beim Speichern des Formulars ist ein Fehler aufgetreten."\n         ],\n         "This chatroom requires a password": [\n            null,\n            "Dieser Raum erfordert ein Passwort"\n         ],\n         "Password: ": [\n            null,\n            "Passwort: "\n         ],\n         "Submit": [\n            null,\n            "Abschicken"\n         ],\n         "This room is not anonymous": [\n            null,\n            "Dieser Raum ist nicht anonym"\n         ],\n         "This room now shows unavailable members": [\n            null,\n            "Dieser Raum zeigt jetzt nicht verfügbare Mitglieder an"\n         ],\n         "This room does not show unavailable members": [\n            null,\n            "Dieser Raum zeigt jetzt nicht verfügbare Mitglieder nicht an"\n         ],\n         "Non-privacy-related room configuration has changed": [\n            null,\n            "Die Raumkonfiguration hat sich geändert (nicht Privatsphäre relevant)"\n         ],\n         "Room logging is now enabled": [\n            null,\n            "Nachrichten in diesem Raum werden ab jetzt protokolliert."\n         ],\n         "Room logging is now disabled": [\n            null,\n            "Nachrichten in diesem Raum werden nicht mehr protokolliert."\n         ],\n         "This room is now non-anonymous": [\n            null,\n            "Dieser Raum ist jetzt nicht anonym"\n         ],\n         "This room is now semi-anonymous": [\n            null,\n            "Dieser Raum ist jetzt teils anonym"\n         ],\n         "This room is now fully-anonymous": [\n            null,\n            "Dieser Raum ist jetzt anonym"\n         ],\n         "A new room has been created": [\n            null,\n            "Ein neuer Raum wurde erstellt"\n         ],\n         "You have been banned from this room": [\n            null,\n            "Sie sind aus diesem Raum verbannt worden"\n         ],\n         "You have been kicked from this room": [\n            null,\n            "Sie wurden aus diesem Raum hinausgeworfen"\n         ],\n         "You have been removed from this room because of an affiliation change": [\n            null,\n            "Sie wurden wegen einer Zugehörigkeitsänderung entfernt"\n         ],\n         "You have been removed from this room because the room has changed to members-only and you\'re not a member": [\n            null,\n            "Sie wurden aus diesem Raum entfernt, da Sie kein Mitglied sind."\n         ],\n         "You have been removed from this room because the MUC (Multi-user chat) service is being shut down.": [\n            null,\n            "Sie wurden aus diesem Raum entfernt, da der MUC (Multi-User Chat) Dienst gerade heruntergefahren wird."\n         ],\n         "<strong>%1$s</strong> has been banned": [\n            null,\n            "<strong>%1$s</strong> ist verbannt worden"\n         ],\n         "<strong>%1$s</strong>\'s nickname has changed": [\n            null,\n            "<strong>%1$s</strong> hat den Spitznamen geändert"\n         ],\n         "<strong>%1$s</strong> has been kicked out": [\n            null,\n            "<strong>%1$s</strong> wurde hinausgeworfen"\n         ],\n         "<strong>%1$s</strong> has been removed because of an affiliation change": [\n            null,\n            "<strong>%1$s</strong> wurde wegen einer Zugehörigkeitsänderung entfernt"\n         ],\n         "<strong>%1$s</strong> has been removed for not being a member": [\n            null,\n            "<strong>%1$s</strong> ist kein Mitglied und wurde daher entfernt"\n         ],\n         "Your nickname has been automatically changed to: <strong>%1$s</strong>": [\n            null,\n            "Ihr Spitzname wurde automatisiert geändert zu: <strong>%1$s</strong>"\n         ],\n         "Your nickname has been changed to: <strong>%1$s</strong>": [\n            null,\n            "Ihr Spitzname wurde geändert zu: <strong>%1$s</strong>"\n         ],\n         "The reason given is: \\"": [\n            null,\n            "Die angegebene Begründung lautet: \\""\n         ],\n         "You are not on the member list of this room": [\n            null,\n            "Sie sind nicht auf der Mitgliederliste dieses Raums"\n         ],\n         "No nickname was specified": [\n            null,\n            "Kein Spitzname festgelegt"\n         ],\n         "You are not allowed to create new rooms": [\n            null,\n            "Es ist Ihnen nicht erlaubt neue Räume anzulegen"\n         ],\n         "Your nickname doesn\'t conform to this room\'s policies": [\n            null,\n            "Ungültiger Spitzname"\n         ],\n         "Your nickname is already taken": [\n            null,\n            "Ihre Spitzname existiert bereits."\n         ],\n         "This room does not (yet) exist": [\n            null,\n            "Dieser Raum existiert (noch) nicht"\n         ],\n         "This room has reached it\'s maximum number of occupants": [\n            null,\n            "Dieser Raum hat die maximale Mitgliederanzahl erreicht"\n         ],\n         "Topic set by %1$s to: %2$s": [\n            null,\n            "%1$s hat das Thema zu \\"%2$s\\" geändert"\n         ],\n         "%1$s has invited you to join a chat room: %2$s": [\n            null,\n            "%1$s hat Sie in den Raum \\"%2$s\\" eingeladen"\n         ],\n         "%1$s has invited you to join a chat room: %2$s, and left the following reason: \\"%3$s\\"": [\n            null,\n            "%1$s hat Sie in den Raum \\"%2$s\\" eingeladen. Begründung: \\"%3$s\\""\n         ],\n         "Click to restore this chat": [\n            null,\n            "Hier klicken um diesen Chat wiederherzustellen"\n         ],\n         "Minimized": [\n            null,\n            "Minimiert"\n         ],\n         "Click to remove this contact": [\n            null,\n            "Hier klicken um diesen Kontakt zu entfernen"\n         ],\n         "Click to accept this contact request": [\n            null,\n            "Hier klicken um diese Kontaktanfrage zu akzeptieren"\n         ],\n         "Click to decline this contact request": [\n            null,\n            "Hier klicken um diese Kontaktanfrage zu abzulehnen"\n         ],\n         "Click to chat with this contact": [\n            null,\n            "Hier klicken um mit diesem Kontakt zu chatten"\n         ],\n         "Name": [\n            null,\n            ""\n         ],\n         "Are you sure you want to remove this contact?": [\n            null,\n            "Wollen Sie diesen Kontakt wirklich entfernen?"\n         ],\n         "Sorry, there was an error while trying to remove ": [\n            null,\n            ""\n         ],\n         "Are you sure you want to decline this contact request?": [\n            null,\n            "Wollen Sie diese Kontaktanfrage wirklich ablehnen?"\n         ],\n         "Sorry, there was an error while trying to add ": [\n            null,\n            ""\n         ],\n         "This client does not allow presence subscriptions": [\n            null,\n            ""\n         ],\n         "Type to filter": [\n            null,\n            "Tippen um zu filtern"\n         ],\n         "I am %1$s": [\n            null,\n            "Ich bin %1$s"\n         ],\n         "Click here to write a custom status message": [\n            null,\n            "Hier klicken um Statusnachricht zu ändern"\n         ],\n         "Click to change your chat status": [\n            null,\n            "Hier klicken um Status zu ändern"\n         ],\n         "Custom status": [\n            null,\n            "Statusnachricht"\n         ],\n         "online": [\n            null,\n            "online"\n         ],\n         "busy": [\n            null,\n            "beschäftigt"\n         ],\n         "away for long": [\n            null,\n            "länger abwesend"\n         ],\n         "away": [\n            null,\n            "abwesend"\n         ],\n         "Your XMPP provider\'s domain name:": [\n            null,\n            ""\n         ],\n         "Fetch registration form": [\n            null,\n            ""\n         ],\n         "Tip: A list of public XMPP providers is available": [\n            null,\n            ""\n         ],\n         "here": [\n            null,\n            ""\n         ],\n         "Register": [\n            null,\n            ""\n         ],\n         "Sorry, the given provider does not support in band account registration. Please try with a different provider.": [\n            null,\n            ""\n         ],\n         "Requesting a registration form from the XMPP server": [\n            null,\n            ""\n         ],\n         "Something went wrong while establishing a connection with \\"%1$s\\". Are you sure it exists?": [\n            null,\n            ""\n         ],\n         "Now logging you in": [\n            null,\n            ""\n         ],\n         "Registered successfully": [\n            null,\n            ""\n         ],\n         "Return": [\n            null,\n            "Zurück"\n         ],\n         "The provider rejected your registration attempt. Please check the values you entered for correctness.": [\n            null,\n            ""\n         ],\n         "XMPP Username:": [\n            null,\n            "XMPP Benutzername"\n         ],\n         "Password:": [\n            null,\n            "Passwort:"\n         ],\n         "Click here to log in anonymously": [\n            null,\n            "Hier klicken um anonym anzumelden"\n         ],\n         "Log In": [\n            null,\n            "Anmelden"\n         ],\n         "user@server": [\n            null,\n            ""\n         ],\n         "Sign in": [\n            null,\n            "Anmelden"\n         ],\n         "Toggle chat": [\n            null,\n            "Chat ein-/ausblenden"\n         ]\n      }\n   }\n}'}),define("text!en",[],function(){return'{\n   "domain": "converse",\n   "locale_data": {\n      "converse": {\n         "": {\n            "domain": "converse",\n            "plural_forms": "nplurals=2; plural=(n != 1);",\n            "lang": "en"\n         },\n         " e.g. conversejs.org": [\n            null,\n            ""\n         ],\n         "unencrypted": [\n            null,\n            ""\n         ],\n         "unverified": [\n            null,\n            ""\n         ],\n         "verified": [\n            null,\n            ""\n         ],\n         "finished": [\n            null,\n            ""\n         ],\n         "This contact is busy": [\n            null,\n            ""\n         ],\n         "This contact is online": [\n            null,\n            ""\n         ],\n         "This contact is offline": [\n            null,\n            ""\n         ],\n         "This contact is unavailable": [\n            null,\n            ""\n         ],\n         "This contact is away for an extended period": [\n            null,\n            ""\n         ],\n         "This contact is away": [\n            null,\n            ""\n         ],\n         "Click to hide these contacts": [\n            null,\n            ""\n         ],\n         "My contacts": [\n            null,\n            ""\n         ],\n         "Pending contacts": [\n            null,\n            ""\n         ],\n         "Contact requests": [\n            null,\n            ""\n         ],\n         "Ungrouped": [\n            null,\n            ""\n         ],\n         "Contacts": [\n            null,\n            ""\n         ],\n         "Groups": [\n            null,\n            ""\n         ],\n         "Attempting to reconnect in 5 seconds": [\n            null,\n            ""\n         ],\n         "Error": [\n            null,\n            ""\n         ],\n         "Connecting": [\n            null,\n            ""\n         ],\n         "Authenticating": [\n            null,\n            ""\n         ],\n         "Authentication Failed": [\n            null,\n            ""\n         ],\n         "Re-establishing encrypted session": [\n            null,\n            ""\n         ],\n         "Generating private key.": [\n            null,\n            ""\n         ],\n         "Your browser might become unresponsive.": [\n            null,\n            ""\n         ],\n         "Authentication request from %1$s\\n\\nYour chat contact is attempting to verify your identity, by asking you the question below.\\n\\n%2$s": [\n            null,\n            ""\n         ],\n         "Could not verify this user\'s identify.": [\n            null,\n            ""\n         ],\n         "Exchanging private key with contact.": [\n            null,\n            ""\n         ],\n         "Close this chat box": [\n            null,\n            ""\n         ],\n         "Minimize this chat box": [\n            null,\n            ""\n         ],\n         "Personal message": [\n            null,\n            ""\n         ],\n         "Are you sure you want to clear the messages from this room?": [\n            null,\n            ""\n         ],\n         "me": [\n            null,\n            ""\n         ],\n         "is typing": [\n            null,\n            ""\n         ],\n         "has stopped typing": [\n            null,\n            ""\n         ],\n         "has gone away": [\n            null,\n            ""\n         ],\n         "Show this menu": [\n            null,\n            "Show this menu"\n         ],\n         "Write in the third person": [\n            null,\n            "Write in the third person"\n         ],\n         "Remove messages": [\n            null,\n            "Remove messages"\n         ],\n         "Are you sure you want to clear the messages from this chat box?": [\n            null,\n            ""\n         ],\n         "Your message could not be sent": [\n            null,\n            ""\n         ],\n         "We received an unencrypted message": [\n            null,\n            ""\n         ],\n         "We received an unreadable encrypted message": [\n            null,\n            ""\n         ],\n         "Here are the fingerprints, please confirm them with %1$s, outside of this chat.\\n\\nFingerprint for you, %2$s: %3$s\\n\\nFingerprint for %1$s: %4$s\\n\\nIf you have confirmed that the fingerprints match, click OK, otherwise click Cancel.": [\n            null,\n            ""\n         ],\n         "You will be prompted to provide a security question and then an answer to that question.\\n\\nYour contact will then be prompted the same question and if they type the exact same answer (case sensitive), their identity will be verified.": [\n            null,\n            ""\n         ],\n         "What is your security question?": [\n            null,\n            ""\n         ],\n         "What is the answer to the security question?": [\n            null,\n            ""\n         ],\n         "Invalid authentication scheme provided": [\n            null,\n            ""\n         ],\n         "has gone offline": [\n            null,\n            ""\n         ],\n         "is busy": [\n            null,\n            ""\n         ],\n         "Your messages are not encrypted anymore": [\n            null,\n            ""\n         ],\n         "Your messages are now encrypted but your contact\'s identity has not been verified.": [\n            null,\n            ""\n         ],\n         "Your contact\'s identify has been verified.": [\n            null,\n            ""\n         ],\n         "Your contact has ended encryption on their end, you should do the same.": [\n            null,\n            ""\n         ],\n         "Your messages are not encrypted. Click here to enable OTR encryption.": [\n            null,\n            ""\n         ],\n         "Your messages are encrypted, but your contact has not been verified.": [\n            null,\n            ""\n         ],\n         "Your messages are encrypted and your contact verified.": [\n            null,\n            ""\n         ],\n         "Your contact has closed their end of the private session, you should do the same": [\n            null,\n            ""\n         ],\n         "Clear all messages": [\n            null,\n            ""\n         ],\n         "End encrypted conversation": [\n            null,\n            ""\n         ],\n         "Insert a smiley": [\n            null,\n            ""\n         ],\n         "Hide the list of occupants": [\n            null,\n            ""\n         ],\n         "Refresh encrypted conversation": [\n            null,\n            ""\n         ],\n         "Start a call": [\n            null,\n            ""\n         ],\n         "Start encrypted conversation": [\n            null,\n            ""\n         ],\n         "Verify with fingerprints": [\n            null,\n            ""\n         ],\n         "Verify with SMP": [\n            null,\n            ""\n         ],\n         "What\'s this?": [\n            null,\n            ""\n         ],\n         "Online": [\n            null,\n            ""\n         ],\n         "Busy": [\n            null,\n            ""\n         ],\n         "Away": [\n            null,\n            ""\n         ],\n         "Offline": [\n            null,\n            ""\n         ],\n         "Log out": [\n            null,\n            ""\n         ],\n         "Contact name": [\n            null,\n            ""\n         ],\n         "Search": [\n            null,\n            ""\n         ],\n         "e.g. user@example.com": [\n            null,\n            ""\n         ],\n         "Add": [\n            null,\n            ""\n         ],\n         "Click to add new chat contacts": [\n            null,\n            ""\n         ],\n         "Add a contact": [\n            null,\n            ""\n         ],\n         "No users found": [\n            null,\n            ""\n         ],\n         "Click to add as a chat contact": [\n            null,\n            ""\n         ],\n         "Room name": [\n            null,\n            ""\n         ],\n         "Nickname": [\n            null,\n            ""\n         ],\n         "Server": [\n            null,\n            "Server"\n         ],\n         "Join Room": [\n            null,\n            ""\n         ],\n         "Show rooms": [\n            null,\n            ""\n         ],\n         "Rooms": [\n            null,\n            ""\n         ],\n         "No rooms on %1$s": [\n            null,\n            ""\n         ],\n         "Rooms on %1$s": [\n            null,\n            "Rooms on %1$s"\n         ],\n         "Click to open this room": [\n            null,\n            "Click to open this room"\n         ],\n         "Show more information on this room": [\n            null,\n            "Show more information on this room"\n         ],\n         "Description:": [\n            null,\n            "Description:"\n         ],\n         "Occupants:": [\n            null,\n            "Occupants:"\n         ],\n         "Features:": [\n            null,\n            "Features:"\n         ],\n         "Requires authentication": [\n            null,\n            "Requires authentication"\n         ],\n         "Hidden": [\n            null,\n            "Hidden"\n         ],\n         "Requires an invitation": [\n            null,\n            "Requires an invitation"\n         ],\n         "Moderated": [\n            null,\n            "Moderated"\n         ],\n         "Non-anonymous": [\n            null,\n            "Non-anonymous"\n         ],\n         "Open room": [\n            null,\n            "Open room"\n         ],\n         "Permanent room": [\n            null,\n            "Permanent room"\n         ],\n         "Public": [\n            null,\n            "Public"\n         ],\n         "Semi-anonymous": [\n            null,\n            "Semi-anonymous"\n         ],\n         "Temporary room": [\n            null,\n            "Temporary room"\n         ],\n         "Unmoderated": [\n            null,\n            "Unmoderated"\n         ],\n         "This user is a moderator": [\n            null,\n            "This user is a moderator"\n         ],\n         "This user can send messages in this room": [\n            null,\n            "This user can send messages in this room"\n         ],\n         "This user can NOT send messages in this room": [\n            null,\n            "This user can NOT send messages in this room"\n         ],\n         "Invite...": [\n            null,\n            ""\n         ],\n         "Occupants": [\n            null,\n            ""\n         ],\n         "You are about to invite %1$s to the chat room \\"%2$s\\". ": [\n            null,\n            ""\n         ],\n         "You may optionally include a message, explaining the reason for the invitation.": [\n            null,\n            ""\n         ],\n         "Message": [\n            null,\n            "Message"\n         ],\n         "Error: could not execute the command": [\n            null,\n            ""\n         ],\n         "Error: the \\"": [\n            null,\n            ""\n         ],\n         "Change user\'s affiliation to admin": [\n            null,\n            ""\n         ],\n         "Ban user from room": [\n            null,\n            ""\n         ],\n         "Change user role to occupant": [\n            null,\n            ""\n         ],\n         "Kick user from room": [\n            null,\n            ""\n         ],\n         "Write in 3rd person": [\n            null,\n            ""\n         ],\n         "Grant membership to a user": [\n            null,\n            ""\n         ],\n         "Remove user\'s ability to post messages": [\n            null,\n            ""\n         ],\n         "Change your nickname": [\n            null,\n            ""\n         ],\n         "Grant moderator role to user": [\n            null,\n            ""\n         ],\n         "Grant ownership of this room": [\n            null,\n            ""\n         ],\n         "Revoke user\'s membership": [\n            null,\n            ""\n         ],\n         "Set room topic": [\n            null,\n            ""\n         ],\n         "Allow muted user to post messages": [\n            null,\n            ""\n         ],\n         "Save": [\n            null,\n            "Save"\n         ],\n         "Cancel": [\n            null,\n            "Cancel"\n         ],\n         "An error occurred while trying to save the form.": [\n            null,\n            "An error occurred while trying to save the form."\n         ],\n         "This chatroom requires a password": [\n            null,\n            "This chatroom requires a password"\n         ],\n         "Password: ": [\n            null,\n            "Password: "\n         ],\n         "Submit": [\n            null,\n            "Submit"\n         ],\n         "This room is not anonymous": [\n            null,\n            "This room is not anonymous"\n         ],\n         "This room now shows unavailable members": [\n            null,\n            "This room now shows unavailable members"\n         ],\n         "This room does not show unavailable members": [\n            null,\n            "This room does not show unavailable members"\n         ],\n         "Non-privacy-related room configuration has changed": [\n            null,\n            "Non-privacy-related room configuration has changed"\n         ],\n         "Room logging is now enabled": [\n            null,\n            "Room logging is now enabled"\n         ],\n         "Room logging is now disabled": [\n            null,\n            "Room logging is now disabled"\n         ],\n         "This room is now non-anonymous": [\n            null,\n            "This room is now non-anonymous"\n         ],\n         "This room is now semi-anonymous": [\n            null,\n            "This room is now semi-anonymous"\n         ],\n         "This room is now fully-anonymous": [\n            null,\n            "This room is now fully-anonymous"\n         ],\n         "A new room has been created": [\n            null,\n            "A new room has been created"\n         ],\n         "You have been banned from this room": [\n            null,\n            "You have been banned from this room"\n         ],\n         "You have been kicked from this room": [\n            null,\n            "You have been kicked from this room"\n         ],\n         "You have been removed from this room because of an affiliation change": [\n            null,\n            "You have been removed from this room because of an affiliation change"\n         ],\n         "You have been removed from this room because the room has changed to members-only and you\'re not a member": [\n            null,\n            "You have been removed from this room because the room has changed to members-only and you\'re not a member"\n         ],\n         "You have been removed from this room because the MUC (Multi-user chat) service is being shut down.": [\n            null,\n            "You have been removed from this room because the MUC (Multi-user chat) service is being shut down."\n         ],\n         "<strong>%1$s</strong> has been banned": [\n            null,\n            "<strong>%1$s</strong> has been banned"\n         ],\n         "<strong>%1$s</strong>\'s nickname has changed": [\n            null,\n            ""\n         ],\n         "<strong>%1$s</strong> has been kicked out": [\n            null,\n            "<strong>%1$s</strong> has been kicked out"\n         ],\n         "<strong>%1$s</strong> has been removed because of an affiliation change": [\n            null,\n            "<strong>%1$s</strong> has been removed because of an affiliation change"\n         ],\n         "<strong>%1$s</strong> has been removed for not being a member": [\n            null,\n            "<strong>%1$s</strong> has been removed for not being a member"\n         ],\n         "Your nickname has been automatically changed to: <strong>%1$s</strong>": [\n            null,\n            ""\n         ],\n         "Your nickname has been changed to: <strong>%1$s</strong>": [\n            null,\n            ""\n         ],\n         "The reason given is: \\"": [\n            null,\n            ""\n         ],\n         "You are not on the member list of this room": [\n            null,\n            "You are not on the member list of this room"\n         ],\n         "No nickname was specified": [\n            null,\n            "No nickname was specified"\n         ],\n         "You are not allowed to create new rooms": [\n            null,\n            "You are not allowed to create new rooms"\n         ],\n         "Your nickname doesn\'t conform to this room\'s policies": [\n            null,\n            "Your nickname doesn\'t conform to this room\'s policies"\n         ],\n         "Your nickname is already taken": [\n            null,\n            "Your nickname is already taken"\n         ],\n         "This room does not (yet) exist": [\n            null,\n            "This room does not (yet) exist"\n         ],\n         "This room has reached it\'s maximum number of occupants": [\n            null,\n            "This room has reached it\'s maximum number of occupants"\n         ],\n         "Topic set by %1$s to: %2$s": [\n            null,\n            "Topic set by %1$s to: %2$s"\n         ],\n         "%1$s has invited you to join a chat room: %2$s": [\n            null,\n            ""\n         ],\n         "%1$s has invited you to join a chat room: %2$s, and left the following reason: \\"%3$s\\"": [\n            null,\n            ""\n         ],\n         "Click to restore this chat": [\n            null,\n            ""\n         ],\n         "Minimized": [\n            null,\n            ""\n         ],\n         "Click to remove this contact": [\n            null,\n            "Click to remove this contact"\n         ],\n         "Click to accept this contact request": [\n            null,\n            ""\n         ],\n         "Click to decline this contact request": [\n            null,\n            ""\n         ],\n         "Click to chat with this contact": [\n            null,\n            "Click to chat with this contact"\n         ],\n         "Name": [\n            null,\n            ""\n         ],\n         "Are you sure you want to remove this contact?": [\n            null,\n            ""\n         ],\n         "Sorry, there was an error while trying to remove ": [\n            null,\n            ""\n         ],\n         "Are you sure you want to decline this contact request?": [\n            null,\n            ""\n         ],\n         "Sorry, there was an error while trying to add ": [\n            null,\n            ""\n         ],\n         "This client does not allow presence subscriptions": [\n            null,\n            ""\n         ],\n         "Type to filter": [\n            null,\n            ""\n         ],\n         "I am %1$s": [\n            null,\n            "I am %1$s"\n         ],\n         "Click here to write a custom status message": [\n            null,\n            "Click here to write a custom status message"\n         ],\n         "Click to change your chat status": [\n            null,\n            "Click to change your chat status"\n         ],\n         "Custom status": [\n            null,\n            "Custom status"\n         ],\n         "online": [\n            null,\n            "online"\n         ],\n         "busy": [\n            null,\n            "busy"\n         ],\n         "away for long": [\n            null,\n            "away for long"\n         ],\n         "away": [\n            null,\n            "away"\n         ],\n         "Your XMPP provider\'s domain name:": [\n            null,\n            ""\n         ],\n         "Fetch registration form": [\n            null,\n            ""\n         ],\n         "Tip: A list of public XMPP providers is available": [\n            null,\n            ""\n         ],\n         "here": [\n            null,\n            ""\n         ],\n         "Register": [\n            null,\n            ""\n         ],\n         "Sorry, the given provider does not support in band account registration. Please try with a different provider.": [\n            null,\n            ""\n         ],\n         "Requesting a registration form from the XMPP server": [\n            null,\n            ""\n         ],\n         "Something went wrong while establishing a connection with \\"%1$s\\". Are you sure it exists?": [\n            null,\n            ""\n         ],\n         "Now logging you in": [\n            null,\n            ""\n         ],\n         "Registered successfully": [\n            null,\n            ""\n         ],\n         "Return": [\n            null,\n            ""\n         ],\n         "The provider rejected your registration attempt. Please check the values you entered for correctness.": [\n            null,\n            ""\n         ],\n         "XMPP Username:": [\n            null,\n            ""\n         ],\n         "Password:": [\n            null,\n            "Password:"\n         ],\n         "Click here to log in anonymously": [\n            null,\n            "Click here to log in anonymously"\n         ],\n         "Log In": [\n            null,\n            "Log In"\n         ],\n         "user@server": [\n            null,\n            ""\n         ],\n         "Sign in": [\n            null,\n            "Sign in"\n         ],\n         "Toggle chat": [\n            null,\n            ""\n         ]\n      }\n   }\n}'}),define("text!es",[],function(){return'{\n   "domain": "converse",\n   "locale_data": {\n      "converse": {\n         "": {\n            "domain": "converse",\n            "plural_forms": "nplurals=2; plural=(n != 1);",\n            "lang": "es"\n         },\n         " e.g. conversejs.org": [\n            null,\n            ""\n         ],\n         "unencrypted": [\n            null,\n            "texto plano"\n         ],\n         "unverified": [\n            null,\n            "sin verificar"\n         ],\n         "verified": [\n            null,\n            "verificado"\n         ],\n         "finished": [\n            null,\n            "finalizado"\n         ],\n         "This contact is busy": [\n            null,\n            "Este contacto está ocupado"\n         ],\n         "This contact is online": [\n            null,\n            "Este contacto está en línea"\n         ],\n         "This contact is offline": [\n            null,\n            "Este contacto está desconectado"\n         ],\n         "This contact is unavailable": [\n            null,\n            "Este contacto no está disponible"\n         ],\n         "This contact is away for an extended period": [\n            null,\n            "Este contacto está ausente por un largo periodo de tiempo"\n         ],\n         "This contact is away": [\n            null,\n            "Este contacto está ausente"\n         ],\n         "My contacts": [\n            null,\n            "Mis contactos"\n         ],\n         "Pending contacts": [\n            null,\n            "Contactos pendientes"\n         ],\n         "Contact requests": [\n            null,\n            "Solicitudes de contacto"\n         ],\n         "Ungrouped": [\n            null,\n            ""\n         ],\n         "Contacts": [\n            null,\n            "Contactos"\n         ],\n         "Groups": [\n            null,\n            ""\n         ],\n         "Attempting to reconnect in 5 seconds": [\n            null,\n            ""\n         ],\n         "Error": [\n            null,\n            "Error"\n         ],\n         "Connecting": [\n            null,\n            "Conectando"\n         ],\n         "Authenticating": [\n            null,\n            "Autenticando"\n         ],\n         "Authentication Failed": [\n            null,\n            "La autenticación falló"\n         ],\n         "Re-establishing encrypted session": [\n            null,\n            "Re-estableciendo sesión cifrada"\n         ],\n         "Generating private key.": [\n            null,\n            "Generando llave privada"\n         ],\n         "Your browser might become unresponsive.": [\n            null,\n            "Su navegador podría dejar de responder por un momento"\n         ],\n         "Could not verify this user\'s identify.": [\n            null,\n            "No se pudo verificar la identidad de este usuario"\n         ],\n         "Minimize this chat box": [\n            null,\n            ""\n         ],\n         "Personal message": [\n            null,\n            "Mensaje personal"\n         ],\n         "Are you sure you want to clear the messages from this room?": [\n            null,\n            "¿Está seguro de querer limpiar los mensajes de esta sala?"\n         ],\n         "me": [\n            null,\n            "yo"\n         ],\n         "is typing": [\n            null,\n            ""\n         ],\n         "has stopped typing": [\n            null,\n            ""\n         ],\n         "Show this menu": [\n            null,\n            "Mostrar este menú"\n         ],\n         "Write in the third person": [\n            null,\n            "Escribir en tercera persona"\n         ],\n         "Remove messages": [\n            null,\n            "Eliminar mensajes"\n         ],\n         "Are you sure you want to clear the messages from this chat box?": [\n            null,\n            "¿Está seguro de querer limpiar los mensajes de esta conversación?"\n         ],\n         "Your message could not be sent": [\n            null,\n            "Su mensaje no se pudo enviar"\n         ],\n         "We received an unencrypted message": [\n            null,\n            "Se recibío un mensaje sin cifrar"\n         ],\n         "We received an unreadable encrypted message": [\n            null,\n            "Se recibío un mensaje cifrado corrupto"\n         ],\n         "Here are the fingerprints, please confirm them with %1$s, outside of this chat.\\n\\nFingerprint for you, %2$s: %3$s\\n\\nFingerprint for %1$s: %4$s\\n\\nIf you have confirmed that the fingerprints match, click OK, otherwise click Cancel.": [\n            null,\n            "Por favor confirme los identificadores de %1$s fuera de este chat.\\n\\nSu identificador es, %2$s: %3$s\\n\\nEl identificador de %1$s es: %4$s\\n\\nDespués de confirmar los identificadores haga click en OK, cancele si no concuerdan."\n         ],\n         "What is your security question?": [\n            null,\n            "Introduzca su pregunta de seguridad"\n         ],\n         "What is the answer to the security question?": [\n            null,\n            "Introduzca la respuesta a su pregunta de seguridad"\n         ],\n         "Invalid authentication scheme provided": [\n            null,\n            "Esquema de autenticación inválido"\n         ],\n         "Your messages are not encrypted anymore": [\n            null,\n            "Sus mensajes han dejado de cifrarse"\n         ],\n         "Your messages are not encrypted. Click here to enable OTR encryption.": [\n            null,\n            "Sus mensajes no están cifrados. Haga click aquí para habilitar el cifrado OTR"\n         ],\n         "End encrypted conversation": [\n            null,\n            "Finalizar sesión cifrada"\n         ],\n         "Insert a smiley": [\n            null,\n            ""\n         ],\n         "Hide the list of occupants": [\n            null,\n            ""\n         ],\n         "Refresh encrypted conversation": [\n            null,\n            "Actualizar sesión cifrada"\n         ],\n         "Start a call": [\n            null,\n            ""\n         ],\n         "Start encrypted conversation": [\n            null,\n            "Iniciar sesión cifrada"\n         ],\n         "Verify with fingerprints": [\n            null,\n            "Verificar con identificadores"\n         ],\n         "Verify with SMP": [\n            null,\n            "Verificar con SMP"\n         ],\n         "What\'s this?": [\n            null,\n            "¿Qué es esto?"\n         ],\n         "Online": [\n            null,\n            "En línea"\n         ],\n         "Busy": [\n            null,\n            "Ocupado"\n         ],\n         "Away": [\n            null,\n            "Ausente"\n         ],\n         "Offline": [\n            null,\n            "Desconectado"\n         ],\n         "Contact name": [\n            null,\n            "Nombre de contacto"\n         ],\n         "Search": [\n            null,\n            "Búsqueda"\n         ],\n         "e.g. user@example.com": [\n            null,\n            ""\n         ],\n         "Add": [\n            null,\n            "Agregar"\n         ],\n         "Click to add new chat contacts": [\n            null,\n            "Haga click para agregar nuevos contactos al chat"\n         ],\n         "Add a contact": [\n            null,\n            "Agregar un contacto"\n         ],\n         "No users found": [\n            null,\n            "Sin usuarios encontrados"\n         ],\n         "Click to add as a chat contact": [\n            null,\n            "Haga click para agregar como contacto de chat"\n         ],\n         "Room name": [\n            null,\n            "Nombre de sala"\n         ],\n         "Nickname": [\n            null,\n            "Apodo"\n         ],\n         "Server": [\n            null,\n            "Servidor"\n         ],\n         "Show rooms": [\n            null,\n            "Mostrar salas"\n         ],\n         "Rooms": [\n            null,\n            "Salas"\n         ],\n         "No rooms on %1$s": [\n            null,\n            "Sin salas en %1$s"\n         ],\n         "Rooms on %1$s": [\n            null,\n            "Salas en %1$s"\n         ],\n         "Click to open this room": [\n            null,\n            "Haga click para abrir esta sala"\n         ],\n         "Show more information on this room": [\n            null,\n            "Mostrar más información en esta sala"\n         ],\n         "Description:": [\n            null,\n            "Descripción"\n         ],\n         "Occupants:": [\n            null,\n            "Ocupantes:"\n         ],\n         "Features:": [\n            null,\n            "Características:"\n         ],\n         "Requires authentication": [\n            null,\n            "Autenticación requerida"\n         ],\n         "Hidden": [\n            null,\n            "Oculto"\n         ],\n         "Requires an invitation": [\n            null,\n            "Requiere una invitación"\n         ],\n         "Moderated": [\n            null,\n            "Moderado"\n         ],\n         "Non-anonymous": [\n            null,\n            "No anónimo"\n         ],\n         "Open room": [\n            null,\n            "Abrir sala"\n         ],\n         "Permanent room": [\n            null,\n            "Sala permanente"\n         ],\n         "Public": [\n            null,\n            "Pública"\n         ],\n         "Semi-anonymous": [\n            null,\n            "Semi anónimo"\n         ],\n         "Temporary room": [\n            null,\n            "Sala temporal"\n         ],\n         "Unmoderated": [\n            null,\n            "Sin moderar"\n         ],\n         "This user is a moderator": [\n            null,\n            "Este usuario es un moderador"\n         ],\n         "This user can send messages in this room": [\n            null,\n            "Este usuario puede enviar mensajes en esta sala"\n         ],\n         "This user can NOT send messages in this room": [\n            null,\n            "Este usuario NO puede enviar mensajes en esta"\n         ],\n         "Invite...": [\n            null,\n            ""\n         ],\n         "You are about to invite %1$s to the chat room \\"%2$s\\". ": [\n            null,\n            ""\n         ],\n         "You may optionally include a message, explaining the reason for the invitation.": [\n            null,\n            ""\n         ],\n         "Message": [\n            null,\n            "Mensaje"\n         ],\n         "Error: could not execute the command": [\n            null,\n            ""\n         ],\n         "Error: the \\"": [\n            null,\n            ""\n         ],\n         "Change user\'s affiliation to admin": [\n            null,\n            ""\n         ],\n         "Change user role to occupant": [\n            null,\n            ""\n         ],\n         "Grant membership to a user": [\n            null,\n            ""\n         ],\n         "Remove user\'s ability to post messages": [\n            null,\n            ""\n         ],\n         "Change your nickname": [\n            null,\n            ""\n         ],\n         "Grant moderator role to user": [\n            null,\n            ""\n         ],\n         "Revoke user\'s membership": [\n            null,\n            ""\n         ],\n         "Allow muted user to post messages": [\n            null,\n            ""\n         ],\n         "Save": [\n            null,\n            "Guardar"\n         ],\n         "Cancel": [\n            null,\n            "Cancelar"\n         ],\n         "An error occurred while trying to save the form.": [\n            null,\n            "Un error ocurrío mientras se guardaba el formulario."\n         ],\n         "This chatroom requires a password": [\n            null,\n            "Esta sala de chat requiere una contraseña."\n         ],\n         "Password: ": [\n            null,\n            "Contraseña: "\n         ],\n         "Submit": [\n            null,\n            "Enviar"\n         ],\n         "This room is not anonymous": [\n            null,\n            "Esta sala no es para usuarios anónimos"\n         ],\n         "This room now shows unavailable members": [\n            null,\n            "Esta sala ahora muestra los miembros no disponibles"\n         ],\n         "This room does not show unavailable members": [\n            null,\n            "Esta sala no muestra los miembros no disponibles"\n         ],\n         "Non-privacy-related room configuration has changed": [\n            null,\n            "Una configuración de la sala no relacionada con la privacidad ha sido cambiada"\n         ],\n         "Room logging is now enabled": [\n            null,\n            "El registro de la sala ahora está habilitado"\n         ],\n         "Room logging is now disabled": [\n            null,\n            "El registro de la sala ahora está deshabilitado"\n         ],\n         "This room is now non-anonymous": [\n            null,\n            "Esta sala ahora es pública"\n         ],\n         "This room is now semi-anonymous": [\n            null,\n            "Esta sala ahora es semi-anónima"\n         ],\n         "This room is now fully-anonymous": [\n            null,\n            "Esta sala ahora es completamente anónima"\n         ],\n         "A new room has been created": [\n            null,\n            "Una nueva sala ha sido creada"\n         ],\n         "You have been banned from this room": [\n            null,\n            "Usted ha sido bloqueado de esta sala"\n         ],\n         "You have been kicked from this room": [\n            null,\n            "Usted ha sido expulsado de esta sala"\n         ],\n         "You have been removed from this room because of an affiliation change": [\n            null,\n            "Usted ha sido eliminado de esta sala debido a un cambio de afiliación"\n         ],\n         "You have been removed from this room because the room has changed to members-only and you\'re not a member": [\n            null,\n            "Usted ha sido eliminado de esta sala debido a que la sala cambio su configuración a solo-miembros y usted no es un miembro"\n         ],\n         "You have been removed from this room because the MUC (Multi-user chat) service is being shut down.": [\n            null,\n            "Usted ha sido eliminado de esta sala debido a que el servicio MUC (Multi-user chat) está deshabilitado."\n         ],\n         "<strong>%1$s</strong> has been banned": [\n            null,\n            "<strong>%1$s</strong> ha sido bloqueado"\n         ],\n         "<strong>%1$s</strong> has been kicked out": [\n            null,\n            "<strong>%1$s</strong> ha sido expulsado"\n         ],\n         "<strong>%1$s</strong> has been removed because of an affiliation change": [\n            null,\n            "<strong>%1$s</strong> ha sido eliminado debido a un cambio de afiliación"\n         ],\n         "<strong>%1$s</strong> has been removed for not being a member": [\n            null,\n            "<strong>%1$s</strong> ha sido eliminado debido a que no es miembro"\n         ],\n         "The reason given is: \\"": [\n            null,\n            ""\n         ],\n         "You are not on the member list of this room": [\n            null,\n            "Usted no está en la lista de miembros de esta sala"\n         ],\n         "No nickname was specified": [\n            null,\n            "Sin apodo especificado"\n         ],\n         "You are not allowed to create new rooms": [\n            null,\n            "Usted no esta autorizado para crear nuevas salas"\n         ],\n         "Your nickname doesn\'t conform to this room\'s policies": [\n            null,\n            "Su apodo no se ajusta a la política de esta sala"\n         ],\n         "Your nickname is already taken": [\n            null,\n            "Su apodo ya ha sido tomando por otro usuario"\n         ],\n         "This room does not (yet) exist": [\n            null,\n            "Esta sala (aún) no existe"\n         ],\n         "This room has reached it\'s maximum number of occupants": [\n            null,\n            "Esta sala ha alcanzado su número máximo de ocupantes"\n         ],\n         "Topic set by %1$s to: %2$s": [\n            null,\n            "Tema fijado por %1$s a: %2$s"\n         ],\n         "%1$s has invited you to join a chat room: %2$s": [\n            null,\n            ""\n         ],\n         "%1$s has invited you to join a chat room: %2$s, and left the following reason: \\"%3$s\\"": [\n            null,\n            ""\n         ],\n         "Click to restore this chat": [\n            null,\n            "Haga click para eliminar este contacto"\n         ],\n         "Minimized": [\n            null,\n            "Minimizado"\n         ],\n         "Click to remove this contact": [\n            null,\n            "Haga click para eliminar este contacto"\n         ],\n         "Click to chat with this contact": [\n            null,\n            "Haga click para conversar con este contacto"\n         ],\n         "Name": [\n            null,\n            ""\n         ],\n         "Are you sure you want to remove this contact?": [\n            null,\n            "¿Esta seguro de querer eliminar este contacto?"\n         ],\n         "Sorry, there was an error while trying to remove ": [\n            null,\n            ""\n         ],\n         "Sorry, there was an error while trying to add ": [\n            null,\n            ""\n         ],\n         "This client does not allow presence subscriptions": [\n            null,\n            ""\n         ],\n         "Type to filter": [\n            null,\n            ""\n         ],\n         "I am %1$s": [\n            null,\n            "Estoy %1$s"\n         ],\n         "Click here to write a custom status message": [\n            null,\n            "Haga click para escribir un mensaje de estatus personalizado"\n         ],\n         "Click to change your chat status": [\n            null,\n            "Haga click para cambiar su estatus de chat"\n         ],\n         "Custom status": [\n            null,\n            "Personalizar estatus"\n         ],\n         "online": [\n            null,\n            "en línea"\n         ],\n         "busy": [\n            null,\n            "ocupado"\n         ],\n         "away for long": [\n            null,\n            "ausente por mucho tiempo"\n         ],\n         "away": [\n            null,\n            "ausente"\n         ],\n         "Your XMPP provider\'s domain name:": [\n            null,\n            ""\n         ],\n         "Fetch registration form": [\n            null,\n            ""\n         ],\n         "Tip: A list of public XMPP providers is available": [\n            null,\n            ""\n         ],\n         "here": [\n            null,\n            ""\n         ],\n         "Register": [\n            null,\n            ""\n         ],\n         "Sorry, the given provider does not support in band account registration. Please try with a different provider.": [\n            null,\n            ""\n         ],\n         "Requesting a registration form from the XMPP server": [\n            null,\n            ""\n         ],\n         "Something went wrong while establishing a connection with \\"%1$s\\". Are you sure it exists?": [\n            null,\n            ""\n         ],\n         "Now logging you in": [\n            null,\n            ""\n         ],\n         "Registered successfully": [\n            null,\n            ""\n         ],\n         "Return": [\n            null,\n            ""\n         ],\n         "The provider rejected your registration attempt. Please check the values you entered for correctness.": [\n            null,\n            ""\n         ],\n         "Password:": [\n            null,\n            "Contraseña:"\n         ],\n         "Log In": [\n            null,\n            "Iniciar sesión"\n         ],\n         "user@server": [\n            null,\n            ""\n         ],\n         "Sign in": [\n            null,\n            "Registrar"\n         ],\n         "Toggle chat": [\n            null,\n            "Chat"\n         ]\n      }\n   }\n}'}),define("text!fr",[],function(){return'{\n   "domain": "converse",\n   "locale_data": {\n      "converse": {\n         "": {\n            "domain": "converse",\n            "plural_forms": "nplurals=2; plural=(n != 1);",\n            "lang": "fr"\n         },\n         " e.g. conversejs.org": [\n            null,\n            ""\n         ],\n         "unencrypted": [\n            null,\n            "non crypté"\n         ],\n         "unverified": [\n            null,\n            "non vérifié"\n         ],\n         "verified": [\n            null,\n            "vérifié"\n         ],\n         "finished": [\n            null,\n            "terminé"\n         ],\n         "This contact is busy": [\n            null,\n            "Ce contact est occupé"\n         ],\n         "This contact is online": [\n            null,\n            "Ce contact est connecté"\n         ],\n         "This contact is offline": [\n            null,\n            "Ce contact est déconnecté"\n         ],\n         "This contact is unavailable": [\n            null,\n            "Ce contact est indisponible"\n         ],\n         "This contact is away for an extended period": [\n            null,\n            "Ce contact est absent"\n         ],\n         "This contact is away": [\n            null,\n            "Ce contact est absent"\n         ],\n         "Click to hide these contacts": [\n            null,\n            "Cliquez pour cacher ces contacts"\n         ],\n         "My contacts": [\n            null,\n            "Mes contacts"\n         ],\n         "Pending contacts": [\n            null,\n            "Contacts en attente"\n         ],\n         "Contact requests": [\n            null,\n            "Demandes de contacts"\n         ],\n         "Ungrouped": [\n            null,\n            "Sans groupe"\n         ],\n         "Contacts": [\n            null,\n            "Contacts"\n         ],\n         "Groups": [\n            null,\n            "Groupes"\n         ],\n         "Attempting to reconnect in 5 seconds": [\n            null,\n            ""\n         ],\n         "Error": [\n            null,\n            "Erreur"\n         ],\n         "Connecting": [\n            null,\n            "Connexion"\n         ],\n         "Authenticating": [\n            null,\n            "Authentification"\n         ],\n         "Authentication Failed": [\n            null,\n            "L\'authentification a échoué"\n         ],\n         "Re-establishing encrypted session": [\n            null,\n            "Rétablissement de la session encryptée"\n         ],\n         "Generating private key.": [\n            null,\n            "Génération de la clé privée"\n         ],\n         "Your browser might become unresponsive.": [\n            null,\n            "Votre navigateur pourrait ne plus répondre"\n         ],\n         "Authentication request from %1$s\\n\\nYour chat contact is attempting to verify your identity, by asking you the question below.\\n\\n%2$s": [\n            null,\n            "Demande d\'authentification de %1$s\\n\\nVotre contact tente de vérifier votre identité, en vous posant la question ci-dessous.\\n\\n%2$s"\n         ],\n         "Could not verify this user\'s identify.": [\n            null,\n            "L\'identité de cet utilisateur ne peut pas être vérifiée"\n         ],\n         "Exchanging private key with contact.": [\n            null,\n            "Échange de clé privée avec le contact"\n         ],\n         "Minimize this chat box": [\n            null,\n            ""\n         ],\n         "Personal message": [\n            null,\n            "Message personnel"\n         ],\n         "Are you sure you want to clear the messages from this room?": [\n            null,\n            "Etes-vous sûr de vouloir supprimer les messages de ce salon ?"\n         ],\n         "me": [\n            null,\n            "moi"\n         ],\n         "is typing": [\n            null,\n            "écrit"\n         ],\n         "has stopped typing": [\n            null,\n            "a arrêté d\'écrire"\n         ],\n         "has gone away": [\n            null,\n            "est parti"\n         ],\n         "Show this menu": [\n            null,\n            "Afficher ce menu"\n         ],\n         "Write in the third person": [\n            null,\n            "Écrire à la troisième personne"\n         ],\n         "Remove messages": [\n            null,\n            "Effacer les messages"\n         ],\n         "Are you sure you want to clear the messages from this chat box?": [\n            null,\n            "Êtes-vous sûr de vouloir supprimer les messages de cette conversation?"\n         ],\n         "Your message could not be sent": [\n            null,\n            "Votre message ne peut pas être envoyé"\n         ],\n         "We received an unencrypted message": [\n            null,\n            "Un message non crypté a été reçu"\n         ],\n         "We received an unreadable encrypted message": [\n            null,\n            "Un message crypté illisible a été reçu"\n         ],\n         "Here are the fingerprints, please confirm them with %1$s, outside of this chat.\\n\\nFingerprint for you, %2$s: %3$s\\n\\nFingerprint for %1$s: %4$s\\n\\nIf you have confirmed that the fingerprints match, click OK, otherwise click Cancel.": [\n            null,\n            "Voici les empreintes de sécurité, veuillez les confirmer avec %1$s, en dehors de ce chat.\\n\\nEmpreinte pour vous, %2$s: %3$s\\n\\nEmpreinte pour %1$s: %4$s\\n\\nSi vous avez confirmé que les empreintes correspondent, cliquez OK, sinon cliquez Annuler."\n         ],\n         "You will be prompted to provide a security question and then an answer to that question.\\n\\nYour contact will then be prompted the same question and if they type the exact same answer (case sensitive), their identity will be verified.": [\n            null,\n            "Vous allez être invité à fournir une question de sécurité et une réponse à cette question.\\n\\nVotre contact devra répondre à la même question et s\'il fournit la même réponse (sensible à la casse), son identité sera vérifiée."\n         ],\n         "What is your security question?": [\n            null,\n            "Quelle est votre question de sécurité?"\n         ],\n         "What is the answer to the security question?": [\n            null,\n            "Quelle est la réponse à la question de sécurité?"\n         ],\n         "Invalid authentication scheme provided": [\n            null,\n            "Schéma d\'authentification fourni non valide"\n         ],\n         "has gone offline": [\n            null,\n            "s\'est déconnecté"\n         ],\n         "is busy": [\n            null,\n            "est occupé"\n         ],\n         "Your messages are not encrypted anymore": [\n            null,\n            "Vos messages ne sont plus cryptés"\n         ],\n         "Your messages are now encrypted but your contact\'s identity has not been verified.": [\n            null,\n            "Vos messages sont maintenant cryptés mais l\'identité de votre contact n\'a pas econre été véfifiée"\n         ],\n         "Your contact\'s identify has been verified.": [\n            null,\n            "L\'identité de votre contact a été vérifiée"\n         ],\n         "Your contact has ended encryption on their end, you should do the same.": [\n            null,\n            "Votre contact a arrêté le cryptage de son côté, vous devriez le faire aussi"\n         ],\n         "Your messages are not encrypted. Click here to enable OTR encryption.": [\n            null,\n            "Vos messges ne sont pas cryptés. Cliquez ici pour activer le cryptage OTR"\n         ],\n         "Your messages are encrypted, but your contact has not been verified.": [\n            null,\n            "Vos messges sont cryptés, mais votre contact n\'a pas été vérifié"\n         ],\n         "Your messages are encrypted and your contact verified.": [\n            null,\n            "Vos messages sont cryptés et votre contact est vérifié"\n         ],\n         "Your contact has closed their end of the private session, you should do the same": [\n            null,\n            "Votre contact a fermé la session privée de son côté, vous devriez le faire aussi"\n         ],\n         "Clear all messages": [\n            null,\n            "Supprimer tous les messages"\n         ],\n         "End encrypted conversation": [\n            null,\n            "Terminer la conversation cryptée"\n         ],\n         "Insert a smiley": [\n            null,\n            ""\n         ],\n         "Refresh encrypted conversation": [\n            null,\n            "Actualiser la conversation cryptée"\n         ],\n         "Start a call": [\n            null,\n            "Démarrer un appel"\n         ],\n         "Start encrypted conversation": [\n            null,\n            "Démarrer une conversation cryptée"\n         ],\n         "Verify with fingerprints": [\n            null,\n            "Vérifier par empreintes de sécurité"\n         ],\n         "Verify with SMP": [\n            null,\n            "Vérifier par Question/Réponse"\n         ],\n         "What\'s this?": [\n            null,\n            "Qu\'est-ce qu\'une conversation cryptée?"\n         ],\n         "Online": [\n            null,\n            "En ligne"\n         ],\n         "Busy": [\n            null,\n            "Occupé"\n         ],\n         "Away": [\n            null,\n            "Absent"\n         ],\n         "Offline": [\n            null,\n            "Déconnecté"\n         ],\n         "Log out": [\n            null,\n            "Se déconnecter"\n         ],\n         "Contact name": [\n            null,\n            "Nom du contact"\n         ],\n         "Search": [\n            null,\n            "Rechercher"\n         ],\n         "e.g. user@example.com": [\n            null,\n            ""\n         ],\n         "Add": [\n            null,\n            "Ajouter"\n         ],\n         "Click to add new chat contacts": [\n            null,\n            "Cliquez pour ajouter de nouveaux contacts"\n         ],\n         "Add a contact": [\n            null,\n            "Ajouter un contact"\n         ],\n         "No users found": [\n            null,\n            "Aucun utilisateur trouvé"\n         ],\n         "Click to add as a chat contact": [\n            null,\n            "Cliquer pour ajouter aux contacts"\n         ],\n         "Room name": [\n            null,\n            "Nom du salon"\n         ],\n         "Nickname": [\n            null,\n            "Alias"\n         ],\n         "Server": [\n            null,\n            "Serveur"\n         ],\n         "Join Room": [\n            null,\n            "Rejoindre"\n         ],\n         "Show rooms": [\n            null,\n            "Afficher les salons"\n         ],\n         "Rooms": [\n            null,\n            "Salons"\n         ],\n         "No rooms on %1$s": [\n            null,\n            "Aucun salon dans %1$s"\n         ],\n         "Rooms on %1$s": [\n            null,\n            "Salons dans %1$s"\n         ],\n         "Click to open this room": [\n            null,\n            "Cliquer pour ouvrir ce salon"\n         ],\n         "Show more information on this room": [\n            null,\n            "Afficher davantage d\'informations sur ce salon"\n         ],\n         "Description:": [\n            null,\n            "Description:"\n         ],\n         "Occupants:": [\n            null,\n            "Participants:"\n         ],\n         "Features:": [\n            null,\n            "Caractéristiques:"\n         ],\n         "Requires authentication": [\n            null,\n            "Nécessite une authentification"\n         ],\n         "Hidden": [\n            null,\n            "Masqué"\n         ],\n         "Requires an invitation": [\n            null,\n            "Nécessite une invitation"\n         ],\n         "Moderated": [\n            null,\n            "Modéré"\n         ],\n         "Non-anonymous": [\n            null,\n            "Non-anonyme"\n         ],\n         "Open room": [\n            null,\n            "Ouvrir un salon"\n         ],\n         "Permanent room": [\n            null,\n            "Salon permanent"\n         ],\n         "Public": [\n            null,\n            "Public"\n         ],\n         "Semi-anonymous": [\n            null,\n            "Semi-anonyme"\n         ],\n         "Temporary room": [\n            null,\n            "Salon temporaire"\n         ],\n         "Unmoderated": [\n            null,\n            "Non modéré"\n         ],\n         "This user is a moderator": [\n            null,\n            "Cet utilisateur est modérateur"\n         ],\n         "This user can send messages in this room": [\n            null,\n            "Cet utilisateur peut envoyer des messages dans ce salon"\n         ],\n         "This user can NOT send messages in this room": [\n            null,\n            "Cet utilisateur ne peut PAS envoyer de messages dans ce salon"\n         ],\n         "Invite...": [\n            null,\n            "Inviter..."\n         ],\n         "Occupants": [\n            null,\n            "Participants:"\n         ],\n         "You are about to invite %1$s to the chat room \\"%2$s\\". ": [\n            null,\n            "Vous vous apprêtez à inviter %1$s dans le salon \\"%2$s\\". "\n         ],\n         "You may optionally include a message, explaining the reason for the invitation.": [\n            null,\n            "Vous pouvez facultativement ajouter un message, expliquant la raison de cette invitation."\n         ],\n         "Message": [\n            null,\n            "Message"\n         ],\n         "Error: could not execute the command": [\n            null,\n            "Erreur: la commande ne peut pas être exécutée"\n         ],\n         "Error: the \\"": [\n            null,\n            ""\n         ],\n         "Change user\'s affiliation to admin": [\n            null,\n            "Changer le rôle  de l\'utilisateur en administrateur"\n         ],\n         "Ban user from room": [\n            null,\n            "Bannir l\'utilisateur du salon"\n         ],\n         "Kick user from room": [\n            null,\n            "Expulser l\'utilisateur du salon"\n         ],\n         "Write in 3rd person": [\n            null,\n            "Écrire à la troisième personne"\n         ],\n         "Grant membership to a user": [\n            null,\n            "Autoriser l\'utilisateur à être membre"\n         ],\n         "Remove user\'s ability to post messages": [\n            null,\n            "Retirer le droit d\'envoyer des messages"\n         ],\n         "Change your nickname": [\n            null,\n            "Changer votre alias"\n         ],\n         "Grant moderator role to user": [\n            null,\n            "Changer le rôle de l\'utilisateur en modérateur"\n         ],\n         "Grant ownership of this room": [\n            null,\n            "Accorder la propriété à ce salon"\n         ],\n         "Revoke user\'s membership": [\n            null,\n            "Révoquer l\'utilisateur des membres"\n         ],\n         "Set room topic": [\n            null,\n            "Indiquer le sujet du salon"\n         ],\n         "Allow muted user to post messages": [\n            null,\n            "Autoriser les utilisateurs muets à poster des messages"\n         ],\n         "Save": [\n            null,\n            "Enregistrer"\n         ],\n         "Cancel": [\n            null,\n            "Annuler"\n         ],\n         "An error occurred while trying to save the form.": [\n            null,\n            "Une erreur est survenue lors de l\'enregistrement du formulaire."\n         ],\n         "This chatroom requires a password": [\n            null,\n            "Ce salon nécessite un mot de passe."\n         ],\n         "Password: ": [\n            null,\n            "Mot de passe: "\n         ],\n         "Submit": [\n            null,\n            "Soumettre"\n         ],\n         "This room is not anonymous": [\n            null,\n            "Ce salon n\'est pas anonyme"\n         ],\n         "This room now shows unavailable members": [\n            null,\n            "Ce salon affiche maintenant les membres indisponibles"\n         ],\n         "This room does not show unavailable members": [\n            null,\n            "Ce salon n\'affiche pas les membres indisponibles"\n         ],\n         "Non-privacy-related room configuration has changed": [\n            null,\n            "Les paramètres du salon non liés à la confidentialité ont été modifiés"\n         ],\n         "Room logging is now enabled": [\n            null,\n            "Le logging du salon est activé"\n         ],\n         "Room logging is now disabled": [\n            null,\n            "Le logging du salon est désactivé"\n         ],\n         "This room is now non-anonymous": [\n            null,\n            "Ce salon est maintenant non-anonyme"\n         ],\n         "This room is now semi-anonymous": [\n            null,\n            "Ce salon est maintenant semi-anonyme"\n         ],\n         "This room is now fully-anonymous": [\n            null,\n            "Ce salon est maintenant entièrement anonyme"\n         ],\n         "A new room has been created": [\n            null,\n            "Un nouveau salon a été créé"\n         ],\n         "You have been banned from this room": [\n            null,\n            "Vous avez été banni de ce salon"\n         ],\n         "You have been kicked from this room": [\n            null,\n            "Vous avez été expulsé de ce salon"\n         ],\n         "You have been removed from this room because of an affiliation change": [\n            null,\n            "Vous avez été retiré de ce salon du fait d\'un changement d\'affiliation"\n         ],\n         "You have been removed from this room because the room has changed to members-only and you\'re not a member": [\n            null,\n            "Vous avez été retiré de ce salon parce que ce salon est devenu réservé aux membres et vous n\'êtes pas membre"\n         ],\n         "You have been removed from this room because the MUC (Multi-user chat) service is being shut down.": [\n            null,\n            "Vous avez été retiré de ce salon parce que le service de chat multi-utilisateur a été désactivé."\n         ],\n         "<strong>%1$s</strong> has been banned": [\n            null,\n            "<strong>%1$s</strong> a été banni"\n         ],\n         "<strong>%1$s</strong>\'s nickname has changed": [\n            null,\n            "<strong>%1$s</strong> a changé son nom"\n         ],\n         "<strong>%1$s</strong> has been kicked out": [\n            null,\n            "<strong>%1$s</strong> a été expulsé"\n         ],\n         "<strong>%1$s</strong> has been removed because of an affiliation change": [\n            null,\n            "<strong>%1$s</strong> a été supprimé à cause d\'un changement d\'affiliation"\n         ],\n         "<strong>%1$s</strong> has been removed for not being a member": [\n            null,\n            "<strong>%1$s</strong> a été supprimé car il n\'est pas membre"\n         ],\n         "Your nickname has been automatically changed to: <strong>%1$s</strong>": [\n            null,\n            "Votre alias a été modifié automatiquement en: <strong>%1$s</strong>"\n         ],\n         "Your nickname has been changed to: <strong>%1$s</strong>": [\n            null,\n            "Votre alias a été modifié en: <strong>%1$s</strong>"\n         ],\n         "The reason given is: \\"": [\n            null,\n            "La raison indiquée est: \\""\n         ],\n         "You are not on the member list of this room": [\n            null,\n            "Vous n\'êtes pas dans la liste des membres de ce salon"\n         ],\n         "No nickname was specified": [\n            null,\n            "Aucun alias n\'a été indiqué"\n         ],\n         "You are not allowed to create new rooms": [\n            null,\n            "Vous n\'êtes pas autorisé à créer des salons"\n         ],\n         "Your nickname doesn\'t conform to this room\'s policies": [\n            null,\n            "Votre alias n\'est pas conforme à la politique de ce salon"\n         ],\n         "Your nickname is already taken": [\n            null,\n            "Votre alias est déjà utilisé"\n         ],\n         "This room does not (yet) exist": [\n            null,\n            "Ce salon n\'existe pas encore"\n         ],\n         "This room has reached it\'s maximum number of occupants": [\n            null,\n            "Ce salon a atteint la limite maximale d\'occupants"\n         ],\n         "Topic set by %1$s to: %2$s": [\n            null,\n            "Le sujet \'%2$s\' a été défini par %1$s"\n         ],\n         "%1$s has invited you to join a chat room: %2$s": [\n            null,\n            "%1$s vous invite à rejoindre le salon: %2$s"\n         ],\n         "%1$s has invited you to join a chat room: %2$s, and left the following reason: \\"%3$s\\"": [\n            null,\n            "%1$s vous invite à rejoindre le salon: %2$s, avec le message suivant:\\"%3$s\\""\n         ],\n         "Click to restore this chat": [\n            null,\n            "Cliquez pour afficher cette discussion"\n         ],\n         "Minimized": [\n            null,\n            "Réduit(s)"\n         ],\n         "Click to remove this contact": [\n            null,\n            "Cliquez pour supprimer ce contact"\n         ],\n         "Click to accept this contact request": [\n            null,\n            "Cliquez pour accepter la demande de ce contact"\n         ],\n         "Click to decline this contact request": [\n            null,\n            "Cliquez pour refuser la demande de ce contact"\n         ],\n         "Click to chat with this contact": [\n            null,\n            "Cliquez pour discuter avec ce contact"\n         ],\n         "Name": [\n            null,\n            ""\n         ],\n         "Are you sure you want to remove this contact?": [\n            null,\n            "Êtes-vous sûr de vouloir supprimer ce contact?"\n         ],\n         "Sorry, there was an error while trying to remove ": [\n            null,\n            ""\n         ],\n         "Are you sure you want to decline this contact request?": [\n            null,\n            "Êtes-vous sûr de vouloir refuser la demande de ce contact?"\n         ],\n         "Sorry, there was an error while trying to add ": [\n            null,\n            ""\n         ],\n         "This client does not allow presence subscriptions": [\n            null,\n            ""\n         ],\n         "Type to filter": [\n            null,\n            "Filtrer"\n         ],\n         "I am %1$s": [\n            null,\n            "Je suis %1$s"\n         ],\n         "Click here to write a custom status message": [\n            null,\n            "Cliquez ici pour indiquer votre statut personnel"\n         ],\n         "Click to change your chat status": [\n            null,\n            "Cliquez pour changer votre statut"\n         ],\n         "Custom status": [\n            null,\n            "Statut personnel"\n         ],\n         "online": [\n            null,\n            "en ligne"\n         ],\n         "busy": [\n            null,\n            "occupé"\n         ],\n         "away for long": [\n            null,\n            "absent pour une longue durée"\n         ],\n         "away": [\n            null,\n            "absent"\n         ],\n         "Your XMPP provider\'s domain name:": [\n            null,\n            "Votre domaine XMPP:"\n         ],\n         "Fetch registration form": [\n            null,\n            "Récupération du formulaire d\'enregistrement"\n         ],\n         "Tip: A list of public XMPP providers is available": [\n            null,\n            "Astuce: Une liste publique de fournisseurs XMPP est disponible"\n         ],\n         "here": [\n            null,\n            "ici"\n         ],\n         "Register": [\n            null,\n            "S\'enregistrer"\n         ],\n         "Sorry, the given provider does not support in band account registration. Please try with a different provider.": [\n            null,\n            "Désolé, le fournisseur indiqué ne supporte pas l\'enregistrement de compte en ligne. Merci d\'essayer avec un autre fournisseur."\n         ],\n         "Requesting a registration form from the XMPP server": [\n            null,\n            "Demande du formulaire enregistrement au serveur XMPP"\n         ],\n         "Something went wrong while establishing a connection with \\"%1$s\\". Are you sure it exists?": [\n            null,\n            "Quelque chose a échoué lors de l\'établissement de la connexion avec \\"%1$s\\". Êtes-vous sure qu\'il existe ?"\n         ],\n         "Now logging you in": [\n            null,\n            "En cours de connexion"\n         ],\n         "Registered successfully": [\n            null,\n            "Enregistré avec succès"\n         ],\n         "Return": [\n            null,\n            "Retourner"\n         ],\n         "XMPP Username:": [\n            null,\n            "Nom d\'utilisateur XMPP/Jabber"\n         ],\n         "Password:": [\n            null,\n            "Mot de passe:"\n         ],\n         "Click here to log in anonymously": [\n            null,\n            "Cliquez ici pour se connecter anonymement"\n         ],\n         "Log In": [\n            null,\n            "Se connecter"\n         ],\n         "user@server": [\n            null,\n            ""\n         ],\n         "Sign in": [\n            null,\n            "S\'inscrire"\n         ],\n         "Toggle chat": [\n            null,\n            "Ouvrir IM"\n         ]\n      }\n   }\n}'}),define("text!he",[],function(){return'{\n   "domain": "converse",\n   "locale_data": {\n      "converse": {\n         "": {\n            "domain": "converse",\n            "plural_forms": "nplurals=2; plural=(n != 1);",\n            "lang": "he"\n         },\n         " e.g. conversejs.org": [\n            null,\n            " למשל conversejs.org"\n         ],\n         "unencrypted": [\n            null,\n            "לא מוצפנת"\n         ],\n         "unverified": [\n            null,\n            "לא מאומתת"\n         ],\n         "verified": [\n            null,\n            "מאומתת"\n         ],\n         "finished": [\n            null,\n            "מוגמרת"\n         ],\n         "This contact is busy": [\n            null,\n            "איש קשר זה עסוק"\n         ],\n         "This contact is online": [\n            null,\n            "איש קשר זה מקוון"\n         ],\n         "This contact is offline": [\n            null,\n            "איש קשר זה אינו מקוון"\n         ],\n         "This contact is unavailable": [\n            null,\n            "איש קשר זה לא זמין"\n         ],\n         "This contact is away for an extended period": [\n            null,\n            "איש קשר זה נעדר למשך זמן ממושך"\n         ],\n         "This contact is away": [\n            null,\n            "איש קשר זה הינו נעדר"\n         ],\n         "Click to hide these contacts": [\n            null,\n            "לחץ כדי להסתיר את אנשי קשר אלה"\n         ],\n         "My contacts": [\n            null,\n            "האנשי קשר שלי"\n         ],\n         "Pending contacts": [\n            null,\n            "אנשי קשר ממתינים"\n         ],\n         "Contact requests": [\n            null,\n            "בקשות איש קשר"\n         ],\n         "Ungrouped": [\n            null,\n            "ללא קבוצה"\n         ],\n         "Contacts": [\n            null,\n            "אנשי קשר"\n         ],\n         "Groups": [\n            null,\n            "קבוצות"\n         ],\n         "Attempting to reconnect in 5 seconds": [\n            null,\n            "מנסה להתחבר בעוד 5 שניות"\n         ],\n         "Error": [\n            null,\n            "שגיאה"\n         ],\n         "Connecting": [\n            null,\n            "כעת מתחבר"\n         ],\n         "Authenticating": [\n            null,\n            "כעת מאמת"\n         ],\n         "Authentication Failed": [\n            null,\n            "אימות נכשל"\n         ],\n         "Re-establishing encrypted session": [\n            null,\n            "בסס מחדש ישיבה מוצפנת"\n         ],\n         "Generating private key.": [\n            null,\n            "כעת מפיק מפתח פרטי."\n         ],\n         "Your browser might become unresponsive.": [\n            null,\n            "הדפדפן שלך עשוי שלא להגיב."\n         ],\n         "Authentication request from %1$s\\n\\nYour chat contact is attempting to verify your identity, by asking you the question below.\\n\\n%2$s": [\n            null,\n            "בקשת אימות מאת %1$s\\n\\nהאיש קשר שלך מנסה לאמת את הזהות שלך, בעזרת שאילת השאלה שלהלן.\\n\\n%2$s"\n         ],\n         "Could not verify this user\'s identify.": [\n            null,\n            "לא היתה אפשרות לאמת את זהות משתמש זה."\n         ],\n         "Exchanging private key with contact.": [\n            null,\n            "מחליף מפתח פרטי עם איש קשר."\n         ],\n         "Minimize this chat box": [\n            null,\n            ""\n         ],\n         "Personal message": [\n            null,\n            "הודעה אישית"\n         ],\n         "Are you sure you want to clear the messages from this room?": [\n            null,\n            "האם אתה בטוח כי ברצונך לטהר את ההודעות מתוך חדר זה?"\n         ],\n         "me": [\n            null,\n            "אני"\n         ],\n         "is typing": [\n            null,\n            "מקליד(ה) כעת"\n         ],\n         "has stopped typing": [\n            null,\n            "חדל(ה) להקליד"\n         ],\n         "has gone away": [\n            null,\n            "נעדר(ת)"\n         ],\n         "Show this menu": [\n            null,\n            "הצג את תפריט זה"\n         ],\n         "Write in the third person": [\n            null,\n            "כתוב בגוף השלישי"\n         ],\n         "Remove messages": [\n            null,\n            "הסר הודעות"\n         ],\n         "Are you sure you want to clear the messages from this chat box?": [\n            null,\n            "האם אתה בטוח כי ברצונך לטהר את ההודעות מתוך תיבת שיחה זה?"\n         ],\n         "Your message could not be sent": [\n            null,\n            "ההודעה שלך לא היתה יכולה להישלח"\n         ],\n         "We received an unencrypted message": [\n            null,\n            "אנחנו קיבלנו הודעה לא מוצפנת"\n         ],\n         "We received an unreadable encrypted message": [\n            null,\n            "אנחנו קיבלנו הודעה מוצפנת לא קריאה"\n         ],\n         "Here are the fingerprints, please confirm them with %1$s, outside of this chat.\\n\\nFingerprint for you, %2$s: %3$s\\n\\nFingerprint for %1$s: %4$s\\n\\nIf you have confirmed that the fingerprints match, click OK, otherwise click Cancel.": [\n            null,\n            "הרי טביעות האצבע, אנא אמת אותן עם %1$s, מחוץ לשיחה זו.\\n\\nטביעת אצבע עבורך, %2$s: %3$s\\n\\nטביעת אצבע עבור %1$s: %4$s\\n\\nהיה ואימתת כי טביעות האצבע תואמות, לחץ אישור (OK), אחרת לחץ ביטול (Cancel)."\n         ],\n         "You will be prompted to provide a security question and then an answer to that question.\\n\\nYour contact will then be prompted the same question and if they type the exact same answer (case sensitive), their identity will be verified.": [\n            null,\n            "אתה תתבקש לספק שאלת אבטחה ולאחריה תשובה לשאלה הזו.\\n\\nהאיש קשר יתבקש עובר זאת לאותה שאלת אבטחה ואם אלו יקלידו את אותה התשובה במדויק (case sensitive), זהותם תאומת."\n         ],\n         "What is your security question?": [\n            null,\n            "מהי שאלת האבטחה שלך?"\n         ],\n         "What is the answer to the security question?": [\n            null,\n            "מהי התשובה לשאלת האבטחה?"\n         ],\n         "Invalid authentication scheme provided": [\n            null,\n            "סופקה סכימת אימות שגויה"\n         ],\n         "has gone offline": [\n            null,\n            "כבר לא מקוון"\n         ],\n         "is busy": [\n            null,\n            "עסוק(ה) כעת"\n         ],\n         "Your messages are not encrypted anymore": [\n            null,\n            "ההודעות שלך אינן מוצפנות עוד"\n         ],\n         "Your messages are now encrypted but your contact\'s identity has not been verified.": [\n            null,\n            "ההודעות שלך מוצפנות כעת אך זהות האיש קשר שלך טרם אומתה."\n         ],\n         "Your contact\'s identify has been verified.": [\n            null,\n            "זהות האיש קשר שלך אומתה."\n         ],\n         "Your contact has ended encryption on their end, you should do the same.": [\n            null,\n            "האיש קשר סיים הצפנה בקצה שלהם, עליך לעשות זאת גם כן."\n         ],\n         "Your messages are not encrypted. Click here to enable OTR encryption.": [\n            null,\n            "ההודעות שלך אינן מוצפנות. לחץ כאן כדי לאפשר OTR."\n         ],\n         "Your messages are encrypted, but your contact has not been verified.": [\n            null,\n            "ההודעות שלך מוצפנות כעת, אך האיש קשר שלך טרם אומת."\n         ],\n         "Your messages are encrypted and your contact verified.": [\n            null,\n            "ההודעות שלך מוצפנות כעת והאיש קשר שלך אומת."\n         ],\n         "Your contact has closed their end of the private session, you should do the same": [\n            null,\n            "האיש קשר סגר את קצה ישיבה פרטית שלהם, עליך לעשות זאת גם כן"\n         ],\n         "Clear all messages": [\n            null,\n            "טהר את כל ההודעות"\n         ],\n         "End encrypted conversation": [\n            null,\n            "סיים ישיבה מוצפנת"\n         ],\n         "Insert a smiley": [\n            null,\n            "הכנס סמיילי"\n         ],\n         "Refresh encrypted conversation": [\n            null,\n            "רענן ישיבה מוצפנת"\n         ],\n         "Start a call": [\n            null,\n            "התחל שיחה"\n         ],\n         "Start encrypted conversation": [\n            null,\n            "התחל ישיבה מוצפנת"\n         ],\n         "Verify with fingerprints": [\n            null,\n            "אמת בעזרת טביעות אצבע"\n         ],\n         "Verify with SMP": [\n            null,\n            "אמת בעזרת SMP"\n         ],\n         "What\'s this?": [\n            null,\n            "מה זה?"\n         ],\n         "Online": [\n            null,\n            "מקוון"\n         ],\n         "Busy": [\n            null,\n            "עסוק"\n         ],\n         "Away": [\n            null,\n            "נעדר"\n         ],\n         "Offline": [\n            null,\n            "לא מקוון"\n         ],\n         "Log out": [\n            null,\n            "התנתקות"\n         ],\n         "Contact name": [\n            null,\n            "שם איש קשר"\n         ],\n         "Search": [\n            null,\n            "חיפוש"\n         ],\n         "e.g. user@example.com": [\n            null,\n            "למשל user@example.com"\n         ],\n         "Add": [\n            null,\n            "הוסף"\n         ],\n         "Click to add new chat contacts": [\n            null,\n            "לחץ כדי להוסיף אנשי קשר שיחה חדשים"\n         ],\n         "Add a contact": [\n            null,\n            "הוסף איש קשר"\n         ],\n         "No users found": [\n            null,\n            "לא נמצאו משתמשים"\n         ],\n         "Click to add as a chat contact": [\n            null,\n            "לחץ כדי להוסיף בתור איש קשר שיחה"\n         ],\n         "Room name": [\n            null,\n            "שם חדר"\n         ],\n         "Nickname": [\n            null,\n            "שם כינוי"\n         ],\n         "Server": [\n            null,\n            "שרת"\n         ],\n         "Join Room": [\n            null,\n            "הצטרף לחדר"\n         ],\n         "Show rooms": [\n            null,\n            "הצג חדרים"\n         ],\n         "Rooms": [\n            null,\n            "חדרים"\n         ],\n         "No rooms on %1$s": [\n            null,\n            "אין חדרים על %1$s"\n         ],\n         "Rooms on %1$s": [\n            null,\n            "חדרים על %1$s"\n         ],\n         "Click to open this room": [\n            null,\n            "לחץ כדי לפתוח את חדר זה"\n         ],\n         "Show more information on this room": [\n            null,\n            "הצג עוד מידע אודות חדר זה"\n         ],\n         "Description:": [\n            null,\n            "תיאור:"\n         ],\n         "Occupants:": [\n            null,\n            "נוכחים:"\n         ],\n         "Features:": [\n            null,\n            "תכונות:"\n         ],\n         "Requires authentication": [\n            null,\n            "מצריך אישור"\n         ],\n         "Hidden": [\n            null,\n            "נסתר"\n         ],\n         "Requires an invitation": [\n            null,\n            "מצריך הזמנה"\n         ],\n         "Moderated": [\n            null,\n            "מבוקר"\n         ],\n         "Non-anonymous": [\n            null,\n            "לא-אנונימי"\n         ],\n         "Open room": [\n            null,\n            "חדר פתוח"\n         ],\n         "Permanent room": [\n            null,\n            "חדר צמיתה"\n         ],\n         "Public": [\n            null,\n            "פומבי"\n         ],\n         "Semi-anonymous": [\n            null,\n            "אנונימי-למחצה"\n         ],\n         "Temporary room": [\n            null,\n            "חדר זמני"\n         ],\n         "Unmoderated": [\n            null,\n            "לא מבוקר"\n         ],\n         "This user is a moderator": [\n            null,\n            "משתמש זה הינו אחראי"\n         ],\n         "This user can send messages in this room": [\n            null,\n            "משתמש זה מסוגל לשלוח הודעות בתוך חדר זה"\n         ],\n         "This user can NOT send messages in this room": [\n            null,\n            "משתמש זה ﬥﬡ מסוגל לשלוח הודעות בתוך חדר זה"\n         ],\n         "Invite...": [\n            null,\n            "הזמנה..."\n         ],\n         "Occupants": [\n            null,\n            "נוכחים"\n         ],\n         "You are about to invite %1$s to the chat room \\"%2$s\\". ": [\n            null,\n            "אתה עומד להזמין את %1$s לחדר שיחה \\"%2$s\\". "\n         ],\n         "You may optionally include a message, explaining the reason for the invitation.": [\n            null,\n            "באפשרותך להכליל הודעה, אשר  מסבירה את הסיבה להזמנה."\n         ],\n         "Message": [\n            null,\n            "הודעה"\n         ],\n         "Error: could not execute the command": [\n            null,\n            "שגיאה: לא היתה אפשרות לבצע פקודה"\n         ],\n         "Error: the \\"": [\n            null,\n            ""\n         ],\n         "Change user\'s affiliation to admin": [\n            null,\n            "שנה סינוף משתמש למנהל"\n         ],\n         "Ban user from room": [\n            null,\n            "אסור משתמש מתוך חדר"\n         ],\n         "Kick user from room": [\n            null,\n            "בעט משתמש מתוך חדר"\n         ],\n         "Write in 3rd person": [\n            null,\n            "כתוב בגוף שלישי"\n         ],\n         "Grant membership to a user": [\n            null,\n            "הענק חברות למשתמש"\n         ],\n         "Remove user\'s ability to post messages": [\n            null,\n            "הסר יכולת משתמש לפרסם הודעות"\n         ],\n         "Change your nickname": [\n            null,\n            "שנה את השם כינוי שלך"\n         ],\n         "Grant moderator role to user": [\n            null,\n            "הענק תפקיד אחראי למשתמש"\n         ],\n         "Grant ownership of this room": [\n            null,\n            "הענק בעלות על חדר זה"\n         ],\n         "Revoke user\'s membership": [\n            null,\n            "שלול חברות משתמש"\n         ],\n         "Set room topic": [\n            null,\n            "קבע נושא חדר"\n         ],\n         "Allow muted user to post messages": [\n            null,\n            "התר למשתמש מושתק לפרסם הודעות"\n         ],\n         "Save": [\n            null,\n            "שמור"\n         ],\n         "Cancel": [\n            null,\n            "ביטול"\n         ],\n         "An error occurred while trying to save the form.": [\n            null,\n            "אירעה שגיאה במהלך ניסיון שמירת הטופס."\n         ],\n         "This chatroom requires a password": [\n            null,\n            "חדר שיחה זה מצריך סיסמה"\n         ],\n         "Password: ": [\n            null,\n            "סיסמה: "\n         ],\n         "Submit": [\n            null,\n            "שלח"\n         ],\n         "This room is not anonymous": [\n            null,\n            "חדר זה אינו אנונימי"\n         ],\n         "This room now shows unavailable members": [\n            null,\n            "חדר זה כעת מציג חברים לא זמינים"\n         ],\n         "This room does not show unavailable members": [\n            null,\n            "חדר זה לא מציג חברים לא זמינים"\n         ],\n         "Non-privacy-related room configuration has changed": [\n            null,\n            "תצורת חדר אשר לא-קשורה-בפרטיות שונתה"\n         ],\n         "Room logging is now enabled": [\n            null,\n            "יומן חדר הינו מופעל כעת"\n         ],\n         "Room logging is now disabled": [\n            null,\n            "יומן חדר הינו מנוטרל כעת"\n         ],\n         "This room is now non-anonymous": [\n            null,\n            "חדר זה אינו אנונימי כעת"\n         ],\n         "This room is now semi-anonymous": [\n            null,\n            "חדר זה הינו אנונימי-למחצה כעת"\n         ],\n         "This room is now fully-anonymous": [\n            null,\n            "חדר זה הינו אנונימי-לחלוטין כעת"\n         ],\n         "A new room has been created": [\n            null,\n            "חדר חדש נוצר"\n         ],\n         "You have been banned from this room": [\n            null,\n            "נאסרת מתוך חדר זה"\n         ],\n         "You have been kicked from this room": [\n            null,\n            "נבעטת מתוך חדר זה"\n         ],\n         "You have been removed from this room because of an affiliation change": [\n            null,\n            "הוסרת מתוך חדר זה משום שינוי שיוך"\n         ],\n         "You have been removed from this room because the room has changed to members-only and you\'re not a member": [\n            null,\n            "הוסרת מתוך חדר זה משום שהחדר שונה לחברים-בלבד ואינך במעמד של חבר"\n         ],\n         "You have been removed from this room because the MUC (Multi-user chat) service is being shut down.": [\n            null,\n            "הוסרת מתוך חדר זה משום ששירות שמ״מ (שיחה מרובת משתמשים) זה כעת מצוי בהליכי סגירה."\n         ],\n         "<strong>%1$s</strong> has been banned": [\n            null,\n            "<strong>%1$s</strong> נאסר(ה)"\n         ],\n         "<strong>%1$s</strong>\'s nickname has changed": [\n            null,\n            "השם כינוי של<strong>%1$s</strong> השתנה"\n         ],\n         "<strong>%1$s</strong> has been kicked out": [\n            null,\n            "<strong>%1$s</strong> נבעט(ה)"\n         ],\n         "<strong>%1$s</strong> has been removed because of an affiliation change": [\n            null,\n            "<strong>%1$s</strong> הוסרה(ה) משום שינוי שיוך"\n         ],\n         "<strong>%1$s</strong> has been removed for not being a member": [\n            null,\n            "<strong>%1$s</strong> הוסר(ה) משום אי הימצאות במסגרת מעמד של חבר"\n         ],\n         "Your nickname has been automatically changed to: <strong>%1$s</strong>": [\n            null,\n            "השם כינוי שלך שונה אוטומטית בשם: <strong>%1$s</strong>"\n         ],\n         "Your nickname has been changed to: <strong>%1$s</strong>": [\n            null,\n            "השם כינוי שלך שונה בשם: <strong>%1$s</strong>"\n         ],\n         "The reason given is: \\"": [\n            null,\n            "הסיבה שניתנה היא: \\""\n         ],\n         "You are not on the member list of this room": [\n            null,\n            "אינך ברשימת החברים של חדר זה"\n         ],\n         "No nickname was specified": [\n            null,\n            "לא צוין שום שם כינוי"\n         ],\n         "You are not allowed to create new rooms": [\n            null,\n            "אין לך רשות ליצור חדרים חדשים"\n         ],\n         "Your nickname doesn\'t conform to this room\'s policies": [\n            null,\n            "השם כינוי שלך לא תואם את המדינויות של חדר זה"\n         ],\n         "Your nickname is already taken": [\n            null,\n            "השם כינוי שלך הינו תפוס"\n         ],\n         "This room does not (yet) exist": [\n            null,\n            "חדר זה (עדיין) לא קיים"\n         ],\n         "This room has reached it\'s maximum number of occupants": [\n            null,\n            "חדר זה הגיע לסף הנוכחים המרבי שלו"\n         ],\n         "Topic set by %1$s to: %2$s": [\n            null,\n            "נושא חדר זה נקבע על ידי %1$s אל: %2$s"\n         ],\n         "%1$s has invited you to join a chat room: %2$s": [\n            null,\n            "%1$s הזמינך להצטרף לחדר שיחה: %2$s"\n         ],\n         "%1$s has invited you to join a chat room: %2$s, and left the following reason: \\"%3$s\\"": [\n            null,\n            "%1$s הזמינך להצטרף לחדר שיחה: %2$s, והשאיר את הסיבה הבאה: \\"%3$s\\""\n         ],\n         "Click to restore this chat": [\n            null,\n            "לחץ כדי לשחזר את שיחה זו"\n         ],\n         "Minimized": [\n            null,\n            "ממוזער"\n         ],\n         "Click to remove this contact": [\n            null,\n            "לחץ כדי להסיר את איש קשר זה"\n         ],\n         "Click to accept this contact request": [\n            null,\n            "לחץ כדי לקבל את בקשת איש קשר זה"\n         ],\n         "Click to decline this contact request": [\n            null,\n            "לחץ כדי לסרב את בקשת איש קשר זה"\n         ],\n         "Click to chat with this contact": [\n            null,\n            "לחץ כדי לשוחח עם איש קשר זה"\n         ],\n         "Name": [\n            null,\n            "שם"\n         ],\n         "Are you sure you want to remove this contact?": [\n            null,\n            "האם אתה בטוח כי ברצונך להסיר את איש קשר זה?"\n         ],\n         "Sorry, there was an error while trying to remove ": [\n            null,\n            "מצטערים, היתה שגיאה במהלך ניסיון להסיר את "\n         ],\n         "Are you sure you want to decline this contact request?": [\n            null,\n            "האם אתה בטוח כי ברצונך לסרב את בקשת איש קשר זה?"\n         ],\n         "Sorry, there was an error while trying to add ": [\n            null,\n            "מצטערים, היתה שגיאה במהלך ניסיון הוספת "\n         ],\n         "This client does not allow presence subscriptions": [\n            null,\n            "לקוח זה לא מתיר הרשמות נוכחות"\n         ],\n         "Type to filter": [\n            null,\n            "הקלד כדי לסנן"\n         ],\n         "I am %1$s": [\n            null,\n            "מצבי כעת הינו %1$s"\n         ],\n         "Click here to write a custom status message": [\n            null,\n            "לחץ כאן כדי לכתוב הודעת מצב מותאמת"\n         ],\n         "Click to change your chat status": [\n            null,\n            "לחץ כדי לשנות את הודעת השיחה שלך"\n         ],\n         "Custom status": [\n            null,\n            "מצב מותאם"\n         ],\n         "online": [\n            null,\n            "מקוון"\n         ],\n         "busy": [\n            null,\n            "עסוק"\n         ],\n         "away for long": [\n            null,\n            "נעדר לזמן מה"\n         ],\n         "away": [\n            null,\n            "נעדר"\n         ],\n         "offline": [\n            null,\n            "לא מקוון"\n         ],\n         "Your XMPP provider\'s domain name:": [\n            null,\n            "שם מתחם של ספק XMPP שלך:"\n         ],\n         "Fetch registration form": [\n            null,\n            "משוך טופס הרשמה"\n         ],\n         "Tip: A list of public XMPP providers is available": [\n            null,\n            "טיפ: רשימה פומבית של ספקי XMPP הינה זמינה"\n         ],\n         "here": [\n            null,\n            "כאן"\n         ],\n         "Register": [\n            null,\n            "הירשם"\n         ],\n         "Sorry, the given provider does not support in band account registration. Please try with a different provider.": [\n            null,\n            "מצטערים, הספק שניתן לא תומך ברישום חשבונות in band. אנא נסה עם ספק אחר."\n         ],\n         "Requesting a registration form from the XMPP server": [\n            null,\n            "כעת מבקש טופס הרשמה מתוך שרת XMPP"\n         ],\n         "Something went wrong while establishing a connection with \\"%1$s\\". Are you sure it exists?": [\n            null,\n            "משהו השתבש במהלך ביסוס חיבור עם \\"%1$s\\". האם אתה בטוח כי זה קיים?"\n         ],\n         "Now logging you in": [\n            null,\n            "כעת מחבר אותך פנימה"\n         ],\n         "Registered successfully": [\n            null,\n            "נרשם בהצלחה"\n         ],\n         "Return": [\n            null,\n            "חזור"\n         ],\n         "XMPP Username:": [\n            null,\n            "שם משתמש XMPP:"\n         ],\n         "Password:": [\n            null,\n            "סיסמה:"\n         ],\n         "Click here to log in anonymously": [\n            null,\n            "לחץ כאן כדי להתחבר באופן אנונימי"\n         ],\n         "Log In": [\n            null,\n            "כניסה"\n         ],\n         "user@server": [\n            null,\n            ""\n         ],\n         "password": [\n            null,\n            "סיסמה"\n         ],\n         "Sign in": [\n            null,\n            "התחברות"\n         ],\n         "Toggle chat": [\n            null,\n            "הפעל שיח"\n         ]\n      }\n   }\n}'}),define("text!hu",[],function(){return'{\n   "domain": "converse",\n   "locale_data": {\n      "converse": {\n         "": {\n            "domain": "converse",\n            "lang": "hu"\n         },\n         " e.g. conversejs.org": [\n            null,\n            ""\n         ],\n         "unencrypted": [\n            null,\n            "titkosítatlan"\n         ],\n         "unverified": [\n            null,\n            "nem hitelesített"\n         ],\n         "verified": [\n            null,\n            "hitelesített"\n         ],\n         "finished": [\n            null,\n            "befejezett"\n         ],\n         "This contact is busy": [\n            null,\n            "Elfoglalt"\n         ],\n         "This contact is online": [\n            null,\n            "Elérhető"\n         ],\n         "This contact is offline": [\n            null,\n            "Nincs bejelentkezve"\n         ],\n         "This contact is unavailable": [\n            null,\n            "Elérhetetlen"\n         ],\n         "This contact is away for an extended period": [\n            null,\n            "Hosszabb ideje távol"\n         ],\n         "This contact is away": [\n            null,\n            "Távol"\n         ],\n         "Click to hide these contacts": [\n            null,\n            "A csevegő partnerek elrejtése"\n         ],\n         "My contacts": [\n            null,\n            "Kapcsolataim"\n         ],\n         "Pending contacts": [\n            null,\n            "Függőben levő kapcsolatok"\n         ],\n         "Contact requests": [\n            null,\n            "Kapcsolatnak jelölés"\n         ],\n         "Ungrouped": [\n            null,\n            "Nincs csoportosítva"\n         ],\n         "Contacts": [\n            null,\n            "Kapcsolatok"\n         ],\n         "Groups": [\n            null,\n            "Csoportok"\n         ],\n         "Attempting to reconnect in 5 seconds": [\n            null,\n            ""\n         ],\n         "Error": [\n            null,\n            "Hiba"\n         ],\n         "Connecting": [\n            null,\n            "Kapcsolódás"\n         ],\n         "Authenticating": [\n            null,\n            "Azonosítás"\n         ],\n         "Authentication Failed": [\n            null,\n            "Azonosítási hiba"\n         ],\n         "Re-establishing encrypted session": [\n            null,\n            "Titkosított kapcsolat újraépítése"\n         ],\n         "Generating private key.": [\n            null,\n            "Privát kulcs generálása"\n         ],\n         "Your browser might become unresponsive.": [\n            null,\n            "Előfordulhat, hogy a böngésző futása megáll."\n         ],\n         "Authentication request from %1$s\\n\\nYour chat contact is attempting to verify your identity, by asking you the question below.\\n\\n%2$s": [\n            null,\n            "Azonosítási kérés érkezett: %1$s\\n\\nA csevegő partnere hitelesítést kér a következő kérdés megválaszolásával:\\n\\n%2$s"\n         ],\n         "Could not verify this user\'s identify.": [\n            null,\n            "A felhasználó ellenőrzése sikertelen."\n         ],\n         "Exchanging private key with contact.": [\n            null,\n            "Privát kulcs cseréje..."\n         ],\n         "Minimize this chat box": [\n            null,\n            ""\n         ],\n         "Personal message": [\n            null,\n            "Személyes üzenet"\n         ],\n         "Are you sure you want to clear the messages from this room?": [\n            null,\n            "Törölni szeretné az üzeneteket ebből a szobából?"\n         ],\n         "me": [\n            null,\n            "Én"\n         ],\n         "is typing": [\n            null,\n            "gépel..."\n         ],\n         "has stopped typing": [\n            null,\n            "már nem gépel"\n         ],\n         "Show this menu": [\n            null,\n            "Mutasd a menüt"\n         ],\n         "Write in the third person": [\n            null,\n            "Írjon egyes szám harmadik személyben"\n         ],\n         "Remove messages": [\n            null,\n            "Üzenetek törlése"\n         ],\n         "Are you sure you want to clear the messages from this chat box?": [\n            null,\n            "Törölni szeretné az eddigi üzeneteket?"\n         ],\n         "Your message could not be sent": [\n            null,\n            "Az üzenet elküldése nem sikerült"\n         ],\n         "We received an unencrypted message": [\n            null,\n            "Titkosítatlan üzenet érkezett"\n         ],\n         "We received an unreadable encrypted message": [\n            null,\n            "Visszafejthetetlen titkosított üzenet érkezett"\n         ],\n         "Here are the fingerprints, please confirm them with %1$s, outside of this chat.\\n\\nFingerprint for you, %2$s: %3$s\\n\\nFingerprint for %1$s: %4$s\\n\\nIf you have confirmed that the fingerprints match, click OK, otherwise click Cancel.": [\n            null,\n            "Újjlenyomatok megerősítése.\\n\\nAz Ön újjlenyomata,  %2$s: %3$s\\n\\nA csevegő partnere újjlenyomata, %1$s: %4$s\\n\\nAmennyiben az újjlenyomatok biztosan egyeznek, klikkeljen az OK, ellenkező esetben a Mégsem gombra."\n         ],\n         "You will be prompted to provide a security question and then an answer to that question.\\n\\nYour contact will then be prompted the same question and if they type the exact same answer (case sensitive), their identity will be verified.": [\n            null,\n            "Elsőként egy biztonsági kérdést kell majd feltennie és megválaszolnia.\\n\\nMajd a csevegő partnerének is megjelenik ez a kérdés. Végül ha a válaszok azonosak lesznek (kis- nagybetű érzékeny), a partner hitelesítetté válik."\n         ],\n         "What is your security question?": [\n            null,\n            "Mi legyen a biztonsági kérdés?"\n         ],\n         "What is the answer to the security question?": [\n            null,\n            "Mi a válasz a biztonsági kérdésre?"\n         ],\n         "Invalid authentication scheme provided": [\n            null,\n            "Érvénytelen hitelesítési séma."\n         ],\n         "Your messages are not encrypted anymore": [\n            null,\n            "Az üzenetek mostantól már nem titkosítottak"\n         ],\n         "Your messages are now encrypted but your contact\'s identity has not been verified.": [\n            null,\n            "Az üzenetek titikosítva vannak, de a csevegő partnerét még nem hitelesítette."\n         ],\n         "Your contact\'s identify has been verified.": [\n            null,\n            "A csevegő partnere hitelesítve lett."\n         ],\n         "Your contact has ended encryption on their end, you should do the same.": [\n            null,\n            "A csevegő partnere kikapcsolta a titkosítást, így Önnek is ezt kellene tennie."\n         ],\n         "Your messages are not encrypted. Click here to enable OTR encryption.": [\n            null,\n            "Az üzenetek titkosítatlanok. OTR titkosítás aktiválása."\n         ],\n         "Your messages are encrypted, but your contact has not been verified.": [\n            null,\n            "Az üzenetek titikosítottak, de a csevegő partnere még nem hitelesített."\n         ],\n         "Your messages are encrypted and your contact verified.": [\n            null,\n            "Az üzenetek titikosítottak és a csevegő partnere hitelesített."\n         ],\n         "Your contact has closed their end of the private session, you should do the same": [\n            null,\n            "A csevegő partnere lezárta a magán beszélgetést"\n         ],\n         "Clear all messages": [\n            null,\n            "Üzenetek törlése"\n         ],\n         "End encrypted conversation": [\n            null,\n            "Titkosított kapcsolat vége"\n         ],\n         "Insert a smiley": [\n            null,\n            ""\n         ],\n         "Refresh encrypted conversation": [\n            null,\n            "A titkosított kapcsolat frissítése"\n         ],\n         "Start a call": [\n            null,\n            "Hívás indítása"\n         ],\n         "Start encrypted conversation": [\n            null,\n            "Titkosított beszélgetés indítása"\n         ],\n         "Verify with fingerprints": [\n            null,\n            "Ellenőrzés újjlenyomattal"\n         ],\n         "Verify with SMP": [\n            null,\n            "Ellenőrzés SMP-vel"\n         ],\n         "What\'s this?": [\n            null,\n            "Mi ez?"\n         ],\n         "Online": [\n            null,\n            "Elérhető"\n         ],\n         "Busy": [\n            null,\n            "Foglalt"\n         ],\n         "Away": [\n            null,\n            "Távol"\n         ],\n         "Offline": [\n            null,\n            "Nem elérhető"\n         ],\n         "Log out": [\n            null,\n            "Kilépés"\n         ],\n         "Contact name": [\n            null,\n            "Partner neve"\n         ],\n         "Search": [\n            null,\n            "Keresés"\n         ],\n         "e.g. user@example.com": [\n            null,\n            ""\n         ],\n         "Add": [\n            null,\n            "Hozzáad"\n         ],\n         "Click to add new chat contacts": [\n            null,\n            "Új csevegő partner hozzáadása"\n         ],\n         "Add a contact": [\n            null,\n            "Új partner felvétele"\n         ],\n         "No users found": [\n            null,\n            "Nincs felhasználó"\n         ],\n         "Click to add as a chat contact": [\n            null,\n            "Felvétel a csevegő partnerek közé"\n         ],\n         "Room name": [\n            null,\n            "Szoba neve"\n         ],\n         "Nickname": [\n            null,\n            "Becenév"\n         ],\n         "Server": [\n            null,\n            "Szerver"\n         ],\n         "Show rooms": [\n            null,\n            "Létező szobák"\n         ],\n         "Rooms": [\n            null,\n            "Szobák"\n         ],\n         "No rooms on %1$s": [\n            null,\n            "Nincs csevegő szoba a(z) %1$s szerveren"\n         ],\n         "Rooms on %1$s": [\n            null,\n            "Csevegő szobák a(z) %1$s szerveren:"\n         ],\n         "Click to open this room": [\n            null,\n            "Belépés a csevegő szobába"\n         ],\n         "Show more information on this room": [\n            null,\n            "További információk a csevegő szobáról"\n         ],\n         "Description:": [\n            null,\n            "Leírás:"\n         ],\n         "Occupants:": [\n            null,\n            "Jelenlevők:"\n         ],\n         "Features:": [\n            null,\n            "Tulajdonságok:"\n         ],\n         "Requires authentication": [\n            null,\n            "Azonosítás szükséges"\n         ],\n         "Hidden": [\n            null,\n            "Rejtett"\n         ],\n         "Requires an invitation": [\n            null,\n            "Meghívás szükséges"\n         ],\n         "Moderated": [\n            null,\n            "Moderált"\n         ],\n         "Non-anonymous": [\n            null,\n            "NEM névtelen"\n         ],\n         "Open room": [\n            null,\n            "Nyitott szoba"\n         ],\n         "Permanent room": [\n            null,\n            "Állandó szoba"\n         ],\n         "Public": [\n            null,\n            "Nyílvános"\n         ],\n         "Semi-anonymous": [\n            null,\n            "Félig névtelen"\n         ],\n         "Temporary room": [\n            null,\n            "Ideiglenes szoba"\n         ],\n         "Unmoderated": [\n            null,\n            "Moderálatlan"\n         ],\n         "This user is a moderator": [\n            null,\n            "Ez a felhasználó egy moderátor"\n         ],\n         "This user can send messages in this room": [\n            null,\n            "Ez a felhasználó küldhet üzenetet ebbe a szobába"\n         ],\n         "This user can NOT send messages in this room": [\n            null,\n            "Ez a felhasználó NEM küldhet üzenetet ebbe a szobába"\n         ],\n         "Invite...": [\n            null,\n            "Meghívás..."\n         ],\n         "Occupants": [\n            null,\n            "Jelenlevők"\n         ],\n         "You are about to invite %1$s to the chat room \\"%2$s\\". ": [\n            null,\n            "%1$s meghívott a \\"%2$s\\" csevegő szobába. "\n         ],\n         "Message": [\n            null,\n            "Üzenet"\n         ],\n         "Error: could not execute the command": [\n            null,\n            "Hiba: A parancs nem értelmezett"\n         ],\n         "Error: the \\"": [\n            null,\n            ""\n         ],\n         "Change user\'s affiliation to admin": [\n            null,\n            ""\n         ],\n         "Ban user from room": [\n            null,\n            "Felhasználó kitíltása a csevegő szobából"\n         ],\n         "Kick user from room": [\n            null,\n            "Felhasználó kiléptetése a csevegő szobából"\n         ],\n         "Write in 3rd person": [\n            null,\n            "Írjon egyes szám harmadik személyben"\n         ],\n         "Grant membership to a user": [\n            null,\n            ""\n         ],\n         "Remove user\'s ability to post messages": [\n            null,\n            "A felhasználó nem küldhet üzeneteket"\n         ],\n         "Change your nickname": [\n            null,\n            "Becenév módosítása"\n         ],\n         "Grant moderator role to user": [\n            null,\n            ""\n         ],\n         "Revoke user\'s membership": [\n            null,\n            ""\n         ],\n         "Set room topic": [\n            null,\n            "Csevegőszoba téma beállítás"\n         ],\n         "Allow muted user to post messages": [\n            null,\n            "Elnémított felhasználók is küldhetnek üzeneteket"\n         ],\n         "Save": [\n            null,\n            "Ment"\n         ],\n         "Cancel": [\n            null,\n            "Mégsem"\n         ],\n         "An error occurred while trying to save the form.": [\n            null,\n            "Hiba történt az adatok mentése közben."\n         ],\n         "This chatroom requires a password": [\n            null,\n            "A csevegő szoba belépéshez jelszó szükséges"\n         ],\n         "Password: ": [\n            null,\n            "Jelszó: "\n         ],\n         "Submit": [\n            null,\n            "Küldés"\n         ],\n         "This room is not anonymous": [\n            null,\n            "Ez a szoba NEM névtelen"\n         ],\n         "This room now shows unavailable members": [\n            null,\n            "Ez a szoba mutatja az elérhetetlen tagokat"\n         ],\n         "This room does not show unavailable members": [\n            null,\n            "Ez a szoba nem mutatja az elérhetetlen tagokat"\n         ],\n         "Non-privacy-related room configuration has changed": [\n            null,\n            "A szoba általános konfigurációja módosult"\n         ],\n         "Room logging is now enabled": [\n            null,\n            "A szobába a belépés lehetséges"\n         ],\n         "Room logging is now disabled": [\n            null,\n            "A szobába a belépés szünetel"\n         ],\n         "This room is now non-anonymous": [\n            null,\n            "Ez a szoba most NEM névtelen"\n         ],\n         "This room is now semi-anonymous": [\n            null,\n            "Ez a szoba most félig névtelen"\n         ],\n         "This room is now fully-anonymous": [\n            null,\n            "Ez a szoba most teljesen névtelen"\n         ],\n         "A new room has been created": [\n            null,\n            "Létrejött egy új csevegő szoba"\n         ],\n         "You have been banned from this room": [\n            null,\n            "Ki lettél tíltva ebből a szobából"\n         ],\n         "You have been kicked from this room": [\n            null,\n            "Ki lettél dobva ebből a szobából"\n         ],\n         "You have been removed from this room because of an affiliation change": [\n            null,\n            "Taglista módosítás miatt kiléptettünk a csevegő szobából"\n         ],\n         "You have been removed from this room because the room has changed to members-only and you\'re not a member": [\n            null,\n            "Kiléptettünk a csevegő szobából, mert mostantól csak a taglistán szereplők lehetnek jelen"\n         ],\n         "You have been removed from this room because the MUC (Multi-user chat) service is being shut down.": [\n            null,\n            "Kiléptettünk a csevegő szobából, mert a MUC (Multi-User Chat) szolgáltatás leállításra került."\n         ],\n         "<strong>%1$s</strong> has been banned": [\n            null,\n            "A szobából kitíltva: <strong>%1$s</strong>"\n         ],\n         "<strong>%1$s</strong>\'s nickname has changed": [\n            null,\n            "<strong>%1$s</strong> beceneve módosult"\n         ],\n         "<strong>%1$s</strong> has been kicked out": [\n            null,\n            "A szobából kidobva: <strong>%1$s</strong>"\n         ],\n         "<strong>%1$s</strong> has been removed because of an affiliation change": [\n            null,\n            "Taglista módosítás miatt a szobából kiléptetve: <strong>%1$s</strong>"\n         ],\n         "<strong>%1$s</strong> has been removed for not being a member": [\n            null,\n            "A taglistán nem szerepel így a szobából kiléptetve: <strong>%1$s</strong>"\n         ],\n         "Your nickname has been automatically changed to: <strong>%1$s</strong>": [\n            null,\n            "A beceneved módosításra került a következőre: <strong>%1$s</strong>"\n         ],\n         "Your nickname has been changed to: <strong>%1$s</strong>": [\n            null,\n            "A beceneved a következőre módosult: <strong>%1$s</strong>"\n         ],\n         "The reason given is: \\"": [\n            null,\n            "Az indok: \\""\n         ],\n         "You are not on the member list of this room": [\n            null,\n            "Nem szerepelsz a csevegő szoba taglistáján"\n         ],\n         "No nickname was specified": [\n            null,\n            "Nem lett megadva becenév"\n         ],\n         "You are not allowed to create new rooms": [\n            null,\n            "Nem lehet új csevegő szobát létrehozni"\n         ],\n         "Your nickname doesn\'t conform to this room\'s policies": [\n            null,\n            "A beceneved ütközik a csevegő szoba szabályzataival"\n         ],\n         "Your nickname is already taken": [\n            null,\n            "A becenevedet már valaki használja"\n         ],\n         "This room does not (yet) exist": [\n            null,\n            "Ez a szoba (még) nem létezik"\n         ],\n         "This room has reached it\'s maximum number of occupants": [\n            null,\n            "Ez a csevegő szoba elérte a maximális jelenlévők számát"\n         ],\n         "Topic set by %1$s to: %2$s": [\n            null,\n            "A következő témát állította be %1$s: %2$s"\n         ],\n         "%1$s has invited you to join a chat room: %2$s": [\n            null,\n            "%1$s meghívott a(z) %2$s csevegő szobába"\n         ],\n         "%1$s has invited you to join a chat room: %2$s, and left the following reason: \\"%3$s\\"": [\n            null,\n            "%1$s meghívott a(z) %2$s csevegő szobába. Indok: \\"%3$s\\""\n         ],\n         "Click to restore this chat": [\n            null,\n            "A csevegés visszaállítása"\n         ],\n         "Minimized": [\n            null,\n            "Lezárva"\n         ],\n         "Click to remove this contact": [\n            null,\n            "Partner törlése"\n         ],\n         "Click to accept this contact request": [\n            null,\n            "Elogadása a partnerlistába történő felvételnek"\n         ],\n         "Click to decline this contact request": [\n            null,\n            "Megtagadása a partnerlistába történő felvételnek"\n         ],\n         "Click to chat with this contact": [\n            null,\n            "Csevegés indítása ezzel a partnerünkkel"\n         ],\n         "Name": [\n            null,\n            ""\n         ],\n         "Are you sure you want to remove this contact?": [\n            null,\n            "Valóban törölni szeretné a csevegő partnerét?"\n         ],\n         "Sorry, there was an error while trying to remove ": [\n            null,\n            ""\n         ],\n         "Are you sure you want to decline this contact request?": [\n            null,\n            "Valóban elutasítja ezt a kapcsolat felvételi kérést?"\n         ],\n         "Sorry, there was an error while trying to add ": [\n            null,\n            ""\n         ],\n         "This client does not allow presence subscriptions": [\n            null,\n            ""\n         ],\n         "Type to filter": [\n            null,\n            "Írjon be pár betűt"\n         ],\n         "I am %1$s": [\n            null,\n            "%1$s vagyok"\n         ],\n         "Click here to write a custom status message": [\n            null,\n            "Egyedi státusz üzenet írása"\n         ],\n         "Click to change your chat status": [\n            null,\n            "Saját státusz beállítása"\n         ],\n         "Custom status": [\n            null,\n            "Egyedi státusz"\n         ],\n         "online": [\n            null,\n            "Elérhető"\n         ],\n         "busy": [\n            null,\n            "Elfoglalt"\n         ],\n         "away for long": [\n            null,\n            "Hosszú ideje távol"\n         ],\n         "away": [\n            null,\n            "Távol"\n         ],\n         "Your XMPP provider\'s domain name:": [\n            null,\n            "Az XMPP szolgáltató domain neve:"\n         ],\n         "Fetch registration form": [\n            null,\n            "Regisztrációs űrlap"\n         ],\n         "Tip: A list of public XMPP providers is available": [\n            null,\n            "Tipp: A nyílvános XMPP szolgáltatókról egy lista elérhető"\n         ],\n         "here": [\n            null,\n            "itt"\n         ],\n         "Register": [\n            null,\n            "Regisztráció"\n         ],\n         "Sorry, the given provider does not support in band account registration. Please try with a different provider.": [\n            null,\n            "A megadott szolgáltató nem támogatja a csevegőn keresztüli regisztrációt. Próbáljon meg egy másikat."\n         ],\n         "Requesting a registration form from the XMPP server": [\n            null,\n            "Regisztrációs űrlap lekérése az XMPP szervertől"\n         ],\n         "Something went wrong while establishing a connection with \\"%1$s\\". Are you sure it exists?": [\n            null,\n            "Hiba történt a(z) \\"%1$s\\" kapcsolódásakor. Biztos benne, hogy ez létező kiszolgáló?"\n         ],\n         "Now logging you in": [\n            null,\n            "Belépés..."\n         ],\n         "Registered successfully": [\n            null,\n            "Sikeres regisztráció"\n         ],\n         "Return": [\n            null,\n            "Visza"\n         ],\n         "XMPP Username:": [\n            null,\n            "XMPP/Jabber azonosító:"\n         ],\n         "Password:": [\n            null,\n            "Jelszó:"\n         ],\n         "Log In": [\n            null,\n            "Belépés"\n         ],\n         "user@server": [\n            null,\n            ""\n         ],\n         "Sign in": [\n            null,\n            "Belépés"\n         ],\n         "Toggle chat": [\n            null,\n            "Csevegő ablak"\n         ]\n      }\n   }\n}'}),define("text!id",[],function(){return'{\n   "domain": "converse",\n   "locale_data": {\n      "converse": {\n         "": {\n            "domain": "converse",\n            "lang": "id"\n         },\n         " e.g. conversejs.org": [\n            null,\n            ""\n         ],\n         "unencrypted": [\n            null,\n            "tak dienkripsi"\n         ],\n         "unverified": [\n            null,\n            "tak diverifikasi"\n         ],\n         "verified": [\n            null,\n            "diverifikasi"\n         ],\n         "finished": [\n            null,\n            "selesai"\n         ],\n         "This contact is busy": [\n            null,\n            "Teman ini sedang sibuk"\n         ],\n         "This contact is online": [\n            null,\n            "Teman ini terhubung"\n         ],\n         "This contact is offline": [\n            null,\n            "Teman ini tidak terhubung"\n         ],\n         "This contact is unavailable": [\n            null,\n            "Teman ini tidak tersedia"\n         ],\n         "This contact is away for an extended period": [\n            null,\n            "Teman ini tidak di tempat untuk waktu yang lama"\n         ],\n         "This contact is away": [\n            null,\n            "Teman ini tidak di tempat"\n         ],\n         "My contacts": [\n            null,\n            "Teman saya"\n         ],\n         "Pending contacts": [\n            null,\n            "Teman yang menunggu"\n         ],\n         "Contact requests": [\n            null,\n            "Permintaan pertemanan"\n         ],\n         "Ungrouped": [\n            null,\n            ""\n         ],\n         "Contacts": [\n            null,\n            "Teman"\n         ],\n         "Groups": [\n            null,\n            ""\n         ],\n         "Attempting to reconnect in 5 seconds": [\n            null,\n            ""\n         ],\n         "Error": [\n            null,\n            "Kesalahan"\n         ],\n         "Connecting": [\n            null,\n            "Menyambung"\n         ],\n         "Authenticating": [\n            null,\n            "Melakukan otentikasi"\n         ],\n         "Authentication Failed": [\n            null,\n            "Otentikasi gagal"\n         ],\n         "Re-establishing encrypted session": [\n            null,\n            "Menyambung kembali sesi terenkripsi"\n         ],\n         "Generating private key.": [\n            null,\n            ""\n         ],\n         "Your browser might become unresponsive.": [\n            null,\n            ""\n         ],\n         "Could not verify this user\'s identify.": [\n            null,\n            "Tak dapat melakukan verifikasi identitas pengguna ini."\n         ],\n         "Exchanging private key with contact.": [\n            null,\n            ""\n         ],\n         "Minimize this chat box": [\n            null,\n            ""\n         ],\n         "Personal message": [\n            null,\n            "Pesan pribadi"\n         ],\n         "me": [\n            null,\n            "saya"\n         ],\n         "is typing": [\n            null,\n            ""\n         ],\n         "has stopped typing": [\n            null,\n            ""\n         ],\n         "Show this menu": [\n            null,\n            "Tampilkan menu ini"\n         ],\n         "Write in the third person": [\n            null,\n            "Tulis ini menggunakan bahasa pihak ketiga"\n         ],\n         "Remove messages": [\n            null,\n            "Hapus pesan"\n         ],\n         "Are you sure you want to clear the messages from this chat box?": [\n            null,\n            ""\n         ],\n         "Your message could not be sent": [\n            null,\n            "Pesan anda tak dapat dikirim"\n         ],\n         "We received an unencrypted message": [\n            null,\n            "Kami menerima pesan terenkripsi"\n         ],\n         "We received an unreadable encrypted message": [\n            null,\n            "Kami menerima pesan terenkripsi yang gagal dibaca"\n         ],\n         "Here are the fingerprints, please confirm them with %1$s, outside of this chat.\\n\\nFingerprint for you, %2$s: %3$s\\n\\nFingerprint for %1$s: %4$s\\n\\nIf you have confirmed that the fingerprints match, click OK, otherwise click Cancel.": [\n            null,\n            "Ini adalah sidik jari anda, konfirmasikan bersama mereka dengan %1$s, di luar percakapan ini.\\n\\nSidik jari untuk anda, %2$s: %3$s\\n\\nSidik jari untuk %1$s: %4$s\\n\\nJika anda bisa mengkonfirmasi sidik jadi cocok, klik Lanjutkan, jika tidak klik Batal."\n         ],\n         "What is your security question?": [\n            null,\n            "Apakah pertanyaan keamanan anda?"\n         ],\n         "What is the answer to the security question?": [\n            null,\n            "Apa jawaban dari pertanyaan keamanan tersebut?"\n         ],\n         "Invalid authentication scheme provided": [\n            null,\n            "Skema otentikasi salah"\n         ],\n         "Your messages are not encrypted anymore": [\n            null,\n            "Pesan anda tidak lagi terenkripsi"\n         ],\n         "Your messages are not encrypted. Click here to enable OTR encryption.": [\n            null,\n            "Pesan anda tak terenkripsi. Klik di sini untuk menyalakan enkripsi OTR."\n         ],\n         "End encrypted conversation": [\n            null,\n            "Sudahi percakapan terenkripsi"\n         ],\n         "Insert a smiley": [\n            null,\n            ""\n         ],\n         "Hide the list of occupants": [\n            null,\n            ""\n         ],\n         "Refresh encrypted conversation": [\n            null,\n            "Setel ulang percakapan terenkripsi"\n         ],\n         "Start a call": [\n            null,\n            ""\n         ],\n         "Start encrypted conversation": [\n            null,\n            "Mulai sesi terenkripsi"\n         ],\n         "Verify with fingerprints": [\n            null,\n            "Verifikasi menggunakan sidik jari"\n         ],\n         "Verify with SMP": [\n            null,\n            "Verifikasi menggunakan SMP"\n         ],\n         "What\'s this?": [\n            null,\n            "Apakah ini?"\n         ],\n         "Online": [\n            null,\n            "Terhubung"\n         ],\n         "Busy": [\n            null,\n            "Sibuk"\n         ],\n         "Away": [\n            null,\n            "Pergi"\n         ],\n         "Offline": [\n            null,\n            "Tak Terhubung"\n         ],\n         "Contact name": [\n            null,\n            "Nama teman"\n         ],\n         "Search": [\n            null,\n            "Cari"\n         ],\n         "e.g. user@example.com": [\n            null,\n            ""\n         ],\n         "Add": [\n            null,\n            "Tambah"\n         ],\n         "Click to add new chat contacts": [\n            null,\n            "Klik untuk menambahkan teman baru"\n         ],\n         "Add a contact": [\n            null,\n            "Tambah teman"\n         ],\n         "No users found": [\n            null,\n            "Pengguna tak ditemukan"\n         ],\n         "Click to add as a chat contact": [\n            null,\n            "Klik untuk menambahkan sebagai teman"\n         ],\n         "Room name": [\n            null,\n            "Nama ruangan"\n         ],\n         "Nickname": [\n            null,\n            "Nama panggilan"\n         ],\n         "Server": [\n            null,\n            "Server"\n         ],\n         "Show rooms": [\n            null,\n            "Perlihatkan ruangan"\n         ],\n         "Rooms": [\n            null,\n            "Ruangan"\n         ],\n         "No rooms on %1$s": [\n            null,\n            "Tak ada ruangan di %1$s"\n         ],\n         "Rooms on %1$s": [\n            null,\n            "Ruangan di %1$s"\n         ],\n         "Click to open this room": [\n            null,\n            "Klik untuk membuka ruangan ini"\n         ],\n         "Show more information on this room": [\n            null,\n            "Tampilkan informasi ruangan ini"\n         ],\n         "Description:": [\n            null,\n            "Keterangan:"\n         ],\n         "Occupants:": [\n            null,\n            "Penghuni:"\n         ],\n         "Features:": [\n            null,\n            "Fitur:"\n         ],\n         "Requires authentication": [\n            null,\n            "Membutuhkan otentikasi"\n         ],\n         "Hidden": [\n            null,\n            "Tersembunyi"\n         ],\n         "Requires an invitation": [\n            null,\n            "Membutuhkan undangan"\n         ],\n         "Moderated": [\n            null,\n            "Dimoderasi"\n         ],\n         "Non-anonymous": [\n            null,\n            "Tidak anonim"\n         ],\n         "Open room": [\n            null,\n            "Ruangan terbuka"\n         ],\n         "Permanent room": [\n            null,\n            "Ruangan permanen"\n         ],\n         "Public": [\n            null,\n            "Umum"\n         ],\n         "Semi-anonymous": [\n            null,\n            "Semi-anonim"\n         ],\n         "Temporary room": [\n            null,\n            "Ruangan sementara"\n         ],\n         "Unmoderated": [\n            null,\n            "Tak dimoderasi"\n         ],\n         "This user is a moderator": [\n            null,\n            "Pengguna ini adalah moderator"\n         ],\n         "This user can send messages in this room": [\n            null,\n            "Pengguna ini dapat mengirim pesan di ruangan ini"\n         ],\n         "This user can NOT send messages in this room": [\n            null,\n            "Pengguna ini tak dapat mengirim pesan di ruangan ini"\n         ],\n         "Invite...": [\n            null,\n            ""\n         ],\n         "You are about to invite %1$s to the chat room \\"%2$s\\". ": [\n            null,\n            ""\n         ],\n         "You may optionally include a message, explaining the reason for the invitation.": [\n            null,\n            ""\n         ],\n         "Message": [\n            null,\n            "Pesan"\n         ],\n         "Error: could not execute the command": [\n            null,\n            ""\n         ],\n         "Error: the \\"": [\n            null,\n            ""\n         ],\n         "Change user\'s affiliation to admin": [\n            null,\n            ""\n         ],\n         "Change user role to occupant": [\n            null,\n            ""\n         ],\n         "Grant membership to a user": [\n            null,\n            ""\n         ],\n         "Remove user\'s ability to post messages": [\n            null,\n            ""\n         ],\n         "Change your nickname": [\n            null,\n            ""\n         ],\n         "Grant moderator role to user": [\n            null,\n            ""\n         ],\n         "Revoke user\'s membership": [\n            null,\n            ""\n         ],\n         "Allow muted user to post messages": [\n            null,\n            ""\n         ],\n         "Save": [\n            null,\n            "Simpan"\n         ],\n         "Cancel": [\n            null,\n            "Batal"\n         ],\n         "An error occurred while trying to save the form.": [\n            null,\n            "Kesalahan terjadi saat menyimpan formulir ini."\n         ],\n         "This chatroom requires a password": [\n            null,\n            "Ruangan ini membutuhkan kata sandi"\n         ],\n         "Password: ": [\n            null,\n            "Kata sandi: "\n         ],\n         "Submit": [\n            null,\n            "Kirim"\n         ],\n         "This room is not anonymous": [\n            null,\n            "Ruangan ini tidak anonim"\n         ],\n         "This room now shows unavailable members": [\n            null,\n            "Ruangan ini menampilkan anggota yang tak tersedia"\n         ],\n         "This room does not show unavailable members": [\n            null,\n            "Ruangan ini tidak menampilkan anggota yang tak tersedia"\n         ],\n         "Non-privacy-related room configuration has changed": [\n            null,\n            "Konfigurasi ruangan yang tak berhubungan dengan privasi telah diubah"\n         ],\n         "Room logging is now enabled": [\n            null,\n            "Pencatatan di ruangan ini sekarang dinyalakan"\n         ],\n         "Room logging is now disabled": [\n            null,\n            "Pencatatan di ruangan ini sekarang dimatikan"\n         ],\n         "This room is now non-anonymous": [\n            null,\n            "Ruangan ini sekarang tak-anonim"\n         ],\n         "This room is now semi-anonymous": [\n            null,\n            "Ruangan ini sekarang semi-anonim"\n         ],\n         "This room is now fully-anonymous": [\n            null,\n            "Ruangan ini sekarang anonim"\n         ],\n         "A new room has been created": [\n            null,\n            "Ruangan baru telah dibuat"\n         ],\n         "You have been banned from this room": [\n            null,\n            "Anda telah dicekal dari ruangan ini"\n         ],\n         "You have been kicked from this room": [\n            null,\n            "Anda telah ditendang dari ruangan ini"\n         ],\n         "You have been removed from this room because of an affiliation change": [\n            null,\n            "Anda telah dihapus dari ruangan ini karena perubahan afiliasi"\n         ],\n         "You have been removed from this room because the room has changed to members-only and you\'re not a member": [\n            null,\n            "Anda telah dihapus dari ruangan ini karena ruangan ini hanya terbuka untuk anggota dan anda bukan anggota"\n         ],\n         "You have been removed from this room because the MUC (Multi-user chat) service is being shut down.": [\n            null,\n            "Anda telah dihapus dari ruangan ini karena layanan MUC (Multi-user chat) telah dimatikan."\n         ],\n         "<strong>%1$s</strong> has been banned": [\n            null,\n            "<strong>%1$s</strong> telah dicekal"\n         ],\n         "<strong>%1$s</strong> has been kicked out": [\n            null,\n            "<strong>%1$s</strong> telah ditendang keluar"\n         ],\n         "<strong>%1$s</strong> has been removed because of an affiliation change": [\n            null,\n            "<strong>%1$s</strong> telah dihapus karena perubahan afiliasi"\n         ],\n         "<strong>%1$s</strong> has been removed for not being a member": [\n            null,\n            "<strong>%1$s</strong> telah dihapus karena bukan anggota"\n         ],\n         "The reason given is: \\"": [\n            null,\n            ""\n         ],\n         "You are not on the member list of this room": [\n            null,\n            "Anda bukan anggota dari ruangan ini"\n         ],\n         "No nickname was specified": [\n            null,\n            "Nama panggilan belum ditentukan"\n         ],\n         "You are not allowed to create new rooms": [\n            null,\n            "Anda tak diizinkan untuk membuat ruangan baru"\n         ],\n         "Your nickname doesn\'t conform to this room\'s policies": [\n            null,\n            "Nama panggilan anda tidak sesuai aturan ruangan ini"\n         ],\n         "Your nickname is already taken": [\n            null,\n            "Nama panggilan anda telah digunakan orang lain"\n         ],\n         "This room does not (yet) exist": [\n            null,\n            "Ruangan ini belum dibuat"\n         ],\n         "This room has reached it\'s maximum number of occupants": [\n            null,\n            "Ruangan ini telah mencapai jumlah penghuni maksimum"\n         ],\n         "Topic set by %1$s to: %2$s": [\n            null,\n            "Topik diganti oleh %1$s menjadi: %2$s"\n         ],\n         "%1$s has invited you to join a chat room: %2$s": [\n            null,\n            ""\n         ],\n         "%1$s has invited you to join a chat room: %2$s, and left the following reason: \\"%3$s\\"": [\n            null,\n            ""\n         ],\n         "Minimized": [\n            null,\n            ""\n         ],\n         "Click to remove this contact": [\n            null,\n            "Klik untuk menghapus teman ini"\n         ],\n         "Click to chat with this contact": [\n            null,\n            "Klik untuk mulai perbinjangan dengan teman ini"\n         ],\n         "Name": [\n            null,\n            ""\n         ],\n         "Sorry, there was an error while trying to remove ": [\n            null,\n            ""\n         ],\n         "Sorry, there was an error while trying to add ": [\n            null,\n            ""\n         ],\n         "This client does not allow presence subscriptions": [\n            null,\n            ""\n         ],\n         "Type to filter": [\n            null,\n            ""\n         ],\n         "I am %1$s": [\n            null,\n            "Saya %1$s"\n         ],\n         "Click here to write a custom status message": [\n            null,\n            "Klik untuk menulis status kustom"\n         ],\n         "Click to change your chat status": [\n            null,\n            "Klik untuk mengganti status"\n         ],\n         "Custom status": [\n            null,\n            "Status kustom"\n         ],\n         "online": [\n            null,\n            "terhubung"\n         ],\n         "busy": [\n            null,\n            "sibuk"\n         ],\n         "away for long": [\n            null,\n            "lama tak di tempat"\n         ],\n         "away": [\n            null,\n            "tak di tempat"\n         ],\n         "Your XMPP provider\'s domain name:": [\n            null,\n            ""\n         ],\n         "Fetch registration form": [\n            null,\n            ""\n         ],\n         "Tip: A list of public XMPP providers is available": [\n            null,\n            ""\n         ],\n         "here": [\n            null,\n            ""\n         ],\n         "Register": [\n            null,\n            ""\n         ],\n         "Sorry, the given provider does not support in band account registration. Please try with a different provider.": [\n            null,\n            ""\n         ],\n         "Requesting a registration form from the XMPP server": [\n            null,\n            ""\n         ],\n         "Something went wrong while establishing a connection with \\"%1$s\\". Are you sure it exists?": [\n            null,\n            ""\n         ],\n         "Now logging you in": [\n            null,\n            ""\n         ],\n         "Registered successfully": [\n            null,\n            ""\n         ],\n         "Return": [\n            null,\n            ""\n         ],\n         "The provider rejected your registration attempt. Please check the values you entered for correctness.": [\n            null,\n            ""\n         ],\n         "Password:": [\n            null,\n            "Kata sandi:"\n         ],\n         "Log In": [\n            null,\n            "Masuk"\n         ],\n         "user@server": [\n            null,\n            ""\n         ],\n         "Sign in": [\n            null,\n            "Masuk"\n         ],\n         "Toggle chat": [\n            null,\n            ""\n         ]\n      }\n   }\n}'}),define("text!it",[],function(){return'{\n   "domain": "converse",\n   "locale_data": {\n      "converse": {\n         "": {\n            "domain": "converse",\n            "plural_forms": "nplurals=2; plural=(n != 1);",\n            "lang": "it"\n         },\n         " e.g. conversejs.org": [\n            null,\n            "es. conversejs.org"\n         ],\n         "unencrypted": [\n            null,\n            "non criptato"\n         ],\n         "unverified": [\n            null,\n            "non verificato"\n         ],\n         "verified": [\n            null,\n            "verificato"\n         ],\n         "finished": [\n            null,\n            "finito"\n         ],\n         "This contact is busy": [\n            null,\n            "Questo contatto è occupato"\n         ],\n         "This contact is online": [\n            null,\n            "Questo contatto è online"\n         ],\n         "This contact is offline": [\n            null,\n            "Questo contatto è offline"\n         ],\n         "This contact is unavailable": [\n            null,\n            "Questo contatto non è disponibile"\n         ],\n         "This contact is away for an extended period": [\n            null,\n            "Il contatto è away da un lungo periodo"\n         ],\n         "This contact is away": [\n            null,\n            "Questo contatto è away"\n         ],\n         "Click to hide these contacts": [\n            null,\n            "Clicca per nascondere questi contatti"\n         ],\n         "My contacts": [\n            null,\n            "I miei contatti"\n         ],\n         "Pending contacts": [\n            null,\n            "Contatti in attesa"\n         ],\n         "Contact requests": [\n            null,\n            "Richieste dei contatti"\n         ],\n         "Ungrouped": [\n            null,\n            "Senza Gruppo"\n         ],\n         "Contacts": [\n            null,\n            "Contatti"\n         ],\n         "Groups": [\n            null,\n            "Gruppi"\n         ],\n         "Attempting to reconnect in 5 seconds": [\n            null,\n            "Attendi riconversione in 5 secondi"\n         ],\n         "Error": [\n            null,\n            "Errore"\n         ],\n         "Connecting": [\n            null,\n            "Connessione in corso"\n         ],\n         "Authenticating": [\n            null,\n            "Autenticazione in corso"\n         ],\n         "Authentication Failed": [\n            null,\n            "Autenticazione fallita"\n         ],\n         "Re-establishing encrypted session": [\n            null,\n            ""\n         ],\n         "Generating private key.": [\n            null,\n            ""\n         ],\n         "Your browser might become unresponsive.": [\n            null,\n            ""\n         ],\n         "Authentication request from %1$s\\n\\nYour chat contact is attempting to verify your identity, by asking you the question below.\\n\\n%2$s": [\n            null,\n            ""\n         ],\n         "Could not verify this user\'s identify.": [\n            null,\n            ""\n         ],\n         "Exchanging private key with contact.": [\n            null,\n            ""\n         ],\n         "Minimize this chat box": [\n            null,\n            ""\n         ],\n         "Personal message": [\n            null,\n            "Messaggio personale"\n         ],\n         "Are you sure you want to clear the messages from this room?": [\n            null,\n            "Sei sicuro di voler pulire i messaggi da questa stanza?"\n         ],\n         "me": [\n            null,\n            "me"\n         ],\n         "is typing": [\n            null,\n            "sta scrivendo"\n         ],\n         "has stopped typing": [\n            null,\n            "ha smesso di scrivere"\n         ],\n         "has gone away": [\n            null,\n            ""\n         ],\n         "Show this menu": [\n            null,\n            "Mostra questo menu"\n         ],\n         "Write in the third person": [\n            null,\n            "Scrivi in terza persona"\n         ],\n         "Remove messages": [\n            null,\n            "Rimuovi messaggi"\n         ],\n         "Are you sure you want to clear the messages from this chat box?": [\n            null,\n            ""\n         ],\n         "Your message could not be sent": [\n            null,\n            ""\n         ],\n         "We received an unencrypted message": [\n            null,\n            ""\n         ],\n         "We received an unreadable encrypted message": [\n            null,\n            ""\n         ],\n         "Here are the fingerprints, please confirm them with %1$s, outside of this chat.\\n\\nFingerprint for you, %2$s: %3$s\\n\\nFingerprint for %1$s: %4$s\\n\\nIf you have confirmed that the fingerprints match, click OK, otherwise click Cancel.": [\n            null,\n            ""\n         ],\n         "You will be prompted to provide a security question and then an answer to that question.\\n\\nYour contact will then be prompted the same question and if they type the exact same answer (case sensitive), their identity will be verified.": [\n            null,\n            ""\n         ],\n         "What is your security question?": [\n            null,\n            ""\n         ],\n         "What is the answer to the security question?": [\n            null,\n            ""\n         ],\n         "Invalid authentication scheme provided": [\n            null,\n            ""\n         ],\n         "has gone offline": [\n            null,\n            ""\n         ],\n         "is busy": [\n            null,\n            "è occupato"\n         ],\n         "Your messages are not encrypted anymore": [\n            null,\n            ""\n         ],\n         "Your messages are now encrypted but your contact\'s identity has not been verified.": [\n            null,\n            ""\n         ],\n         "Your contact\'s identify has been verified.": [\n            null,\n            ""\n         ],\n         "Your contact has ended encryption on their end, you should do the same.": [\n            null,\n            ""\n         ],\n         "Your messages are not encrypted. Click here to enable OTR encryption.": [\n            null,\n            ""\n         ],\n         "Your messages are encrypted, but your contact has not been verified.": [\n            null,\n            ""\n         ],\n         "Your messages are encrypted and your contact verified.": [\n            null,\n            ""\n         ],\n         "Your contact has closed their end of the private session, you should do the same": [\n            null,\n            ""\n         ],\n         "Clear all messages": [\n            null,\n            "Pulisci tutti i messaggi"\n         ],\n         "End encrypted conversation": [\n            null,\n            ""\n         ],\n         "Insert a smiley": [\n            null,\n            ""\n         ],\n         "Hide the list of occupants": [\n            null,\n            ""\n         ],\n         "Refresh encrypted conversation": [\n            null,\n            ""\n         ],\n         "Start a call": [\n            null,\n            ""\n         ],\n         "Start encrypted conversation": [\n            null,\n            ""\n         ],\n         "Verify with fingerprints": [\n            null,\n            ""\n         ],\n         "Verify with SMP": [\n            null,\n            ""\n         ],\n         "What\'s this?": [\n            null,\n            ""\n         ],\n         "Online": [\n            null,\n            "In linea"\n         ],\n         "Busy": [\n            null,\n            "Occupato"\n         ],\n         "Away": [\n            null,\n            "Assente"\n         ],\n         "Offline": [\n            null,\n            "Non in linea"\n         ],\n         "Log out": [\n            null,\n            "Logo out"\n         ],\n         "Contact name": [\n            null,\n            "Nome del contatto"\n         ],\n         "Search": [\n            null,\n            "Cerca"\n         ],\n         "e.g. user@example.com": [\n            null,\n            "es. user@example.com"\n         ],\n         "Add": [\n            null,\n            "Aggiungi"\n         ],\n         "Click to add new chat contacts": [\n            null,\n            "Clicca per aggiungere nuovi contatti alla chat"\n         ],\n         "Add a contact": [\n            null,\n            "Aggiungi contatti"\n         ],\n         "No users found": [\n            null,\n            "Nessun utente trovato"\n         ],\n         "Click to add as a chat contact": [\n            null,\n            "Clicca per aggiungere il contatto alla chat"\n         ],\n         "Room name": [\n            null,\n            "Nome stanza"\n         ],\n         "Nickname": [\n            null,\n            "Soprannome"\n         ],\n         "Server": [\n            null,\n            "Server"\n         ],\n         "Join Room": [\n            null,\n            "Entra nella Stanza"\n         ],\n         "Show rooms": [\n            null,\n            "Mostra stanze"\n         ],\n         "Rooms": [\n            null,\n            "Stanze"\n         ],\n         "No rooms on %1$s": [\n            null,\n            "Nessuna stanza su %1$s"\n         ],\n         "Rooms on %1$s": [\n            null,\n            "Stanze su %1$s"\n         ],\n         "Click to open this room": [\n            null,\n            "Clicca per aprire questa stanza"\n         ],\n         "Show more information on this room": [\n            null,\n            "Mostra più informazioni su questa stanza"\n         ],\n         "Description:": [\n            null,\n            "Descrizione:"\n         ],\n         "Occupants:": [\n            null,\n            "Utenti presenti:"\n         ],\n         "Features:": [\n            null,\n            "Funzionalità:"\n         ],\n         "Requires authentication": [\n            null,\n            "Richiede autenticazione"\n         ],\n         "Hidden": [\n            null,\n            "Nascosta"\n         ],\n         "Requires an invitation": [\n            null,\n            "Richiede un invito"\n         ],\n         "Moderated": [\n            null,\n            "Moderata"\n         ],\n         "Non-anonymous": [\n            null,\n            "Non-anonima"\n         ],\n         "Open room": [\n            null,\n            "Stanza aperta"\n         ],\n         "Permanent room": [\n            null,\n            "Stanza permanente"\n         ],\n         "Public": [\n            null,\n            "Pubblica"\n         ],\n         "Semi-anonymous": [\n            null,\n            "Semi-anonima"\n         ],\n         "Temporary room": [\n            null,\n            "Stanza temporanea"\n         ],\n         "Unmoderated": [\n            null,\n            "Non moderata"\n         ],\n         "This user is a moderator": [\n            null,\n            "Questo utente è un moderatore"\n         ],\n         "This user can send messages in this room": [\n            null,\n            "Questo utente può inviare messaggi in questa stanza"\n         ],\n         "This user can NOT send messages in this room": [\n            null,\n            "Questo utente NON può inviare messaggi in questa stanza"\n         ],\n         "Invite...": [\n            null,\n            "Invita…"\n         ],\n         "Occupants": [\n            null,\n            "Occupanti"\n         ],\n         "You are about to invite %1$s to the chat room \\"%2$s\\". ": [\n            null,\n            ""\n         ],\n         "You may optionally include a message, explaining the reason for the invitation.": [\n            null,\n            ""\n         ],\n         "Message": [\n            null,\n            "Messaggio"\n         ],\n         "Error: could not execute the command": [\n            null,\n            ""\n         ],\n         "Error: the \\"": [\n            null,\n            ""\n         ],\n         "Change user\'s affiliation to admin": [\n            null,\n            ""\n         ],\n         "Ban user from room": [\n            null,\n            "Bandisci utente dalla stanza"\n         ],\n         "Change user role to occupant": [\n            null,\n            ""\n         ],\n         "Kick user from room": [\n            null,\n            "Espelli utente dalla stanza"\n         ],\n         "Write in 3rd person": [\n            null,\n            "Scrivi in terza persona"\n         ],\n         "Grant membership to a user": [\n            null,\n            ""\n         ],\n         "Remove user\'s ability to post messages": [\n            null,\n            ""\n         ],\n         "Change your nickname": [\n            null,\n            ""\n         ],\n         "Grant moderator role to user": [\n            null,\n            ""\n         ],\n         "Revoke user\'s membership": [\n            null,\n            ""\n         ],\n         "Set room topic": [\n            null,\n            "Cambia oggetto della stanza"\n         ],\n         "Allow muted user to post messages": [\n            null,\n            ""\n         ],\n         "Save": [\n            null,\n            "Salva"\n         ],\n         "Cancel": [\n            null,\n            "Annulla"\n         ],\n         "An error occurred while trying to save the form.": [\n            null,\n            "Errore durante il salvataggio del modulo"\n         ],\n         "This chatroom requires a password": [\n            null,\n            "Questa stanza richiede una password"\n         ],\n         "Password: ": [\n            null,\n            "Password: "\n         ],\n         "Submit": [\n            null,\n            "Invia"\n         ],\n         "This room is not anonymous": [\n            null,\n            "Questa stanza non è anonima"\n         ],\n         "This room now shows unavailable members": [\n            null,\n            "Questa stanza mostra i membri non disponibili al momento"\n         ],\n         "This room does not show unavailable members": [\n            null,\n            "Questa stanza non mostra i membri non disponibili"\n         ],\n         "Non-privacy-related room configuration has changed": [\n            null,\n            "Una configurazione della stanza non legata alla privacy è stata modificata"\n         ],\n         "Room logging is now enabled": [\n            null,\n            "La registrazione è abilitata nella stanza"\n         ],\n         "Room logging is now disabled": [\n            null,\n            "La registrazione è disabilitata nella stanza"\n         ],\n         "This room is now non-anonymous": [\n            null,\n            "Questa stanza è non-anonima"\n         ],\n         "This room is now semi-anonymous": [\n            null,\n            "Questa stanza è semi-anonima"\n         ],\n         "This room is now fully-anonymous": [\n            null,\n            "Questa stanza è completamente-anonima"\n         ],\n         "A new room has been created": [\n            null,\n            "Una nuova stanza è stata creata"\n         ],\n         "You have been banned from this room": [\n            null,\n            "Sei stato bandito da questa stanza"\n         ],\n         "You have been kicked from this room": [\n            null,\n            "Sei stato espulso da questa stanza"\n         ],\n         "You have been removed from this room because of an affiliation change": [\n            null,\n            "Sei stato rimosso da questa stanza a causa di un cambio di affiliazione"\n         ],\n         "You have been removed from this room because the room has changed to members-only and you\'re not a member": [\n            null,\n            "Sei stato rimosso da questa stanza poiché ora la stanza accetta solo membri"\n         ],\n         "You have been removed from this room because the MUC (Multi-user chat) service is being shut down.": [\n            null,\n            "Sei stato rimosso da questa stanza poiché il servizio MUC (Chat multi utente) è in fase di spegnimento"\n         ],\n         "<strong>%1$s</strong> has been banned": [\n            null,\n            "<strong>%1$s</strong> è stato bandito"\n         ],\n         "<strong>%1$s</strong>\'s nickname has changed": [\n            null,\n            "<strong>%1$s</strong> nickname è cambiato"\n         ],\n         "<strong>%1$s</strong> has been kicked out": [\n            null,\n            "<strong>%1$s</strong> è stato espulso"\n         ],\n         "<strong>%1$s</strong> has been removed because of an affiliation change": [\n            null,\n            "<strong>%1$s</strong> è stato rimosso a causa di un cambio di affiliazione"\n         ],\n         "<strong>%1$s</strong> has been removed for not being a member": [\n            null,\n            "<strong>%1$s</strong> è stato rimosso in quanto non membro"\n         ],\n         "Your nickname has been automatically changed to: <strong>%1$s</strong>": [\n            null,\n            "Il tuo nickname è stato cambiato automaticamente in: <strong>%1$s</strong>"\n         ],\n         "Your nickname has been changed to: <strong>%1$s</strong>": [\n            null,\n            "Il tuo nickname è stato cambiato: <strong>%1$s</strong>"\n         ],\n         "The reason given is: \\"": [\n            null,\n            ""\n         ],\n         "You are not on the member list of this room": [\n            null,\n            "Non sei nella lista dei membri di questa stanza"\n         ],\n         "No nickname was specified": [\n            null,\n            "Nessun soprannome specificato"\n         ],\n         "You are not allowed to create new rooms": [\n            null,\n            "Non ti è permesso creare nuove stanze"\n         ],\n         "Your nickname doesn\'t conform to this room\'s policies": [\n            null,\n            "Il tuo soprannome non è conforme alle regole di questa stanza"\n         ],\n         "Your nickname is already taken": [\n            null,\n            "Il tuo soprannome è già utilizzato"\n         ],\n         "This room does not (yet) exist": [\n            null,\n            "Questa stanza non esiste (per ora)"\n         ],\n         "This room has reached it\'s maximum number of occupants": [\n            null,\n            "Questa stanza ha raggiunto il limite massimo di utenti"\n         ],\n         "Topic set by %1$s to: %2$s": [\n            null,\n            "Topic impostato da %1$s a: %2$s"\n         ],\n         "%1$s has invited you to join a chat room: %2$s": [\n            null,\n            "%1$s ti ha invitato a partecipare a una chat room: %2$s"\n         ],\n         "%1$s has invited you to join a chat room: %2$s, and left the following reason: \\"%3$s\\"": [\n            null,\n            "%1$s ti ha invitato a partecipare a una chat room: %2$s, e ha lasciato il seguente motivo: “%3$s”"\n         ],\n         "Click to restore this chat": [\n            null,\n            "Clicca per ripristinare questa chat"\n         ],\n         "Minimized": [\n            null,\n            "Ridotto"\n         ],\n         "Click to remove this contact": [\n            null,\n            "Clicca per rimuovere questo contatto"\n         ],\n         "Click to accept this contact request": [\n            null,\n            "Clicca per accettare questa richiesta di contatto"\n         ],\n         "Click to decline this contact request": [\n            null,\n            "Clicca per rifiutare questa richiesta di contatto"\n         ],\n         "Click to chat with this contact": [\n            null,\n            "Clicca per parlare con questo contatto"\n         ],\n         "Name": [\n            null,\n            "Nome"\n         ],\n         "Are you sure you want to remove this contact?": [\n            null,\n            "Sei sicuro di voler rimuovere questo contatto?"\n         ],\n         "Sorry, there was an error while trying to remove ": [\n            null,\n            "Si è verificato un errore durante il tentativo di rimozione"\n         ],\n         "Are you sure you want to decline this contact request?": [\n            null,\n            "Sei sicuro dirifiutare questa richiesta di contatto?"\n         ],\n         "Sorry, there was an error while trying to add ": [\n            null,\n            "Si è verificato un errore durante il tentativo di aggiunta"\n         ],\n         "This client does not allow presence subscriptions": [\n            null,\n            "Questo client non consente sottoscrizioni di presenza"\n         ],\n         "Type to filter": [\n            null,\n            ""\n         ],\n         "I am %1$s": [\n            null,\n            "Sono %1$s"\n         ],\n         "Click here to write a custom status message": [\n            null,\n            "Clicca qui per scrivere un messaggio di stato personalizzato"\n         ],\n         "Click to change your chat status": [\n            null,\n            "Clicca per cambiare il tuo stato"\n         ],\n         "Custom status": [\n            null,\n            "Stato personalizzato"\n         ],\n         "online": [\n            null,\n            "in linea"\n         ],\n         "busy": [\n            null,\n            "occupato"\n         ],\n         "away for long": [\n            null,\n            "assente da molto"\n         ],\n         "away": [\n            null,\n            "assente"\n         ],\n         "offline": [\n            null,\n            "offline"\n         ],\n         "Your XMPP provider\'s domain name:": [\n            null,\n            "Nome del dominio del provider XMPP:"\n         ],\n         "Fetch registration form": [\n            null,\n            "Recupero il modulo di registrazione"\n         ],\n         "Tip: A list of public XMPP providers is available": [\n            null,\n            "Suggerimento: È disponibile un elenco di provider XMPP pubblici"\n         ],\n         "here": [\n            null,\n            "qui"\n         ],\n         "Register": [\n            null,\n            "Registra"\n         ],\n         "Sorry, the given provider does not support in band account registration. Please try with a different provider.": [\n            null,\n            "Siamo spiacenti, il provider specificato non supporta la registrazione di account. Si prega di provare con un altro provider."\n         ],\n         "Requesting a registration form from the XMPP server": [\n            null,\n            "Sto richiedendo un modulo di registrazione al server XMPP"\n         ],\n         "Something went wrong while establishing a connection with \\"%1$s\\". Are you sure it exists?": [\n            null,\n            "Qualcosa è andato storto durante la connessione con “%1$s”. Sei sicuro che esiste?"\n         ],\n         "Now logging you in": [\n            null,\n            ""\n         ],\n         "Registered successfully": [\n            null,\n            "Registrazione riuscita"\n         ],\n         "Return": [\n            null,\n            ""\n         ],\n         "XMPP Username:": [\n            null,\n            "XMPP Username:"\n         ],\n         "Password:": [\n            null,\n            "Password:"\n         ],\n         "Click here to log in anonymously": [\n            null,\n            "Clicca per entrare anonimo"\n         ],\n         "Log In": [\n            null,\n            "Entra"\n         ],\n         "user@server": [\n            null,\n            "user@server"\n         ],\n         "password": [\n            null,\n            "Password"\n         ],\n         "Sign in": [\n            null,\n            "Accesso"\n         ],\n         "Toggle chat": [\n            null,\n            "Attiva/disattiva chat"\n         ]\n      }\n   }\n}'}),define("text!ja",[],function(){return'{\n   "domain": "converse",\n   "locale_data": {\n      "converse": {\n         "": {\n            "domain": "converse",\n            "plural_forms": "nplurals=1; plural=0;",\n            "lang": "JA"\n         },\n         " e.g. conversejs.org": [\n            null,\n            ""\n         ],\n         "unencrypted": [\n            null,\n            "暗号化されていません"\n         ],\n         "unverified": [\n            null,\n            "検証されていません"\n         ],\n         "verified": [\n            null,\n            "検証されました"\n         ],\n         "finished": [\n            null,\n            "完了"\n         ],\n         "This contact is busy": [\n            null,\n            "この相手先は取り込み中です"\n         ],\n         "This contact is online": [\n            null,\n            "この相手先は在席しています"\n         ],\n         "This contact is offline": [\n            null,\n            "この相手先はオフラインです"\n         ],\n         "This contact is unavailable": [\n            null,\n            "この相手先は不通です"\n         ],\n         "This contact is away for an extended period": [\n            null,\n            "この相手先は不在です"\n         ],\n         "This contact is away": [\n            null,\n            "この相手先は離席中です"\n         ],\n         "My contacts": [\n            null,\n            "相手先一覧"\n         ],\n         "Pending contacts": [\n            null,\n            "保留中の相手先"\n         ],\n         "Contact requests": [\n            null,\n            "会話に呼び出し"\n         ],\n         "Ungrouped": [\n            null,\n            ""\n         ],\n         "Contacts": [\n            null,\n            "相手先"\n         ],\n         "Groups": [\n            null,\n            ""\n         ],\n         "Attempting to reconnect in 5 seconds": [\n            null,\n            ""\n         ],\n         "Error": [\n            null,\n            "エラー"\n         ],\n         "Connecting": [\n            null,\n            "接続中です"\n         ],\n         "Authenticating": [\n            null,\n            "認証中"\n         ],\n         "Authentication Failed": [\n            null,\n            "認証に失敗"\n         ],\n         "Re-establishing encrypted session": [\n            null,\n            "暗号化セッションの再接続"\n         ],\n         "Generating private key.": [\n            null,\n            ""\n         ],\n         "Your browser might become unresponsive.": [\n            null,\n            ""\n         ],\n         "Could not verify this user\'s identify.": [\n            null,\n            "このユーザーの本人性を検証できませんでした。"\n         ],\n         "Exchanging private key with contact.": [\n            null,\n            ""\n         ],\n         "Minimize this chat box": [\n            null,\n            ""\n         ],\n         "Personal message": [\n            null,\n            "私信"\n         ],\n         "me": [\n            null,\n            "私"\n         ],\n         "is typing": [\n            null,\n            ""\n         ],\n         "has stopped typing": [\n            null,\n            ""\n         ],\n         "Show this menu": [\n            null,\n            "このメニューを表示"\n         ],\n         "Write in the third person": [\n            null,\n            "第三者に書く"\n         ],\n         "Remove messages": [\n            null,\n            "メッセージを削除"\n         ],\n         "Are you sure you want to clear the messages from this chat box?": [\n            null,\n            ""\n         ],\n         "Your message could not be sent": [\n            null,\n            "メッセージを送信できませんでした"\n         ],\n         "We received an unencrypted message": [\n            null,\n            "暗号化されていないメッセージを受信しました"\n         ],\n         "We received an unreadable encrypted message": [\n            null,\n            "読めない暗号化メッセージを受信しました"\n         ],\n         "Here are the fingerprints, please confirm them with %1$s, outside of this chat.\\n\\nFingerprint for you, %2$s: %3$s\\n\\nFingerprint for %1$s: %4$s\\n\\nIf you have confirmed that the fingerprints match, click OK, otherwise click Cancel.": [\n            null,\n            "これは鍵指紋です。チャット以外の方法でこれらを %1$s と確認してください。\\n\\nあなた %2$s の鍵指紋: %3$s\\n\\n%1$s の鍵指紋: %4$s\\n\\n確認して、鍵指紋が正しければ「OK」を、正しくなければ「キャンセル」をクリックしてください。"\n         ],\n         "What is your security question?": [\n            null,\n            "秘密の質問はなんですか?"\n         ],\n         "What is the answer to the security question?": [\n            null,\n            "秘密の質問の答はなんですか?"\n         ],\n         "Invalid authentication scheme provided": [\n            null,\n            "認証の方式が正しくありません"\n         ],\n         "Your messages are not encrypted anymore": [\n            null,\n            "メッセージはもう暗号化されません"\n         ],\n         "Your messages are not encrypted. Click here to enable OTR encryption.": [\n            null,\n            "メッセージは暗号化されません。OTR 暗号化を有効にするにはここをクリックしてください。"\n         ],\n         "End encrypted conversation": [\n            null,\n            "暗号化された会話を終了"\n         ],\n         "Insert a smiley": [\n            null,\n            ""\n         ],\n         "Hide the list of occupants": [\n            null,\n            ""\n         ],\n         "Refresh encrypted conversation": [\n            null,\n            "暗号化された会話をリフレッシュ"\n         ],\n         "Start a call": [\n            null,\n            ""\n         ],\n         "Start encrypted conversation": [\n            null,\n            "暗号化された会話を開始"\n         ],\n         "Verify with fingerprints": [\n            null,\n            "鍵指紋で検証"\n         ],\n         "Verify with SMP": [\n            null,\n            "SMP で検証"\n         ],\n         "What\'s this?": [\n            null,\n            "これは何ですか?"\n         ],\n         "Online": [\n            null,\n            "オンライン"\n         ],\n         "Busy": [\n            null,\n            "取り込み中"\n         ],\n         "Away": [\n            null,\n            "離席中"\n         ],\n         "Offline": [\n            null,\n            "オフライン"\n         ],\n         "Contact name": [\n            null,\n            "名前"\n         ],\n         "Search": [\n            null,\n            "検索"\n         ],\n         "e.g. user@example.com": [\n            null,\n            ""\n         ],\n         "Add": [\n            null,\n            "追加"\n         ],\n         "Click to add new chat contacts": [\n            null,\n            "クリックして新しいチャットの相手先を追加"\n         ],\n         "Add a contact": [\n            null,\n            "相手先を追加"\n         ],\n         "No users found": [\n            null,\n            "ユーザーが見つかりません"\n         ],\n         "Click to add as a chat contact": [\n            null,\n            "クリックしてチャットの相手先として追加"\n         ],\n         "Room name": [\n            null,\n            "談話室の名前"\n         ],\n         "Nickname": [\n            null,\n            "ニックネーム"\n         ],\n         "Server": [\n            null,\n            "サーバー"\n         ],\n         "Show rooms": [\n            null,\n            "談話室一覧を見る"\n         ],\n         "Rooms": [\n            null,\n            "談話室"\n         ],\n         "No rooms on %1$s": [\n            null,\n            "%1$s に談話室はありません"\n         ],\n         "Rooms on %1$s": [\n            null,\n            "%1$s の談話室一覧"\n         ],\n         "Click to open this room": [\n            null,\n            "クリックしてこの談話室を開く"\n         ],\n         "Show more information on this room": [\n            null,\n            "この談話室についての詳細を見る"\n         ],\n         "Description:": [\n            null,\n            "説明: "\n         ],\n         "Occupants:": [\n            null,\n            "入室者:"\n         ],\n         "Features:": [\n            null,\n            "特徴:"\n         ],\n         "Requires authentication": [\n            null,\n            "認証の要求"\n         ],\n         "Hidden": [\n            null,\n            "非表示"\n         ],\n         "Requires an invitation": [\n            null,\n            "招待の要求"\n         ],\n         "Moderated": [\n            null,\n            "発言制限"\n         ],\n         "Non-anonymous": [\n            null,\n            "非匿名"\n         ],\n         "Open room": [\n            null,\n            "開放談話室"\n         ],\n         "Permanent room": [\n            null,\n            "常設談話室"\n         ],\n         "Public": [\n            null,\n            "公開談話室"\n         ],\n         "Semi-anonymous": [\n            null,\n            "半匿名"\n         ],\n         "Temporary room": [\n            null,\n            "臨時談話室"\n         ],\n         "Unmoderated": [\n            null,\n            "発言制限なし"\n         ],\n         "This user is a moderator": [\n            null,\n            "このユーザーは司会者です"\n         ],\n         "This user can send messages in this room": [\n            null,\n            "このユーザーはこの談話室で発言できます"\n         ],\n         "This user can NOT send messages in this room": [\n            null,\n            "このユーザーはこの談話室で発言できません"\n         ],\n         "Invite...": [\n            null,\n            ""\n         ],\n         "You are about to invite %1$s to the chat room \\"%2$s\\". ": [\n            null,\n            ""\n         ],\n         "You may optionally include a message, explaining the reason for the invitation.": [\n            null,\n            ""\n         ],\n         "Message": [\n            null,\n            "メッセージ"\n         ],\n         "Error: could not execute the command": [\n            null,\n            ""\n         ],\n         "Error: the \\"": [\n            null,\n            ""\n         ],\n         "Change user\'s affiliation to admin": [\n            null,\n            ""\n         ],\n         "Change user role to occupant": [\n            null,\n            ""\n         ],\n         "Grant membership to a user": [\n            null,\n            ""\n         ],\n         "Remove user\'s ability to post messages": [\n            null,\n            ""\n         ],\n         "Change your nickname": [\n            null,\n            ""\n         ],\n         "Grant moderator role to user": [\n            null,\n            ""\n         ],\n         "Revoke user\'s membership": [\n            null,\n            ""\n         ],\n         "Allow muted user to post messages": [\n            null,\n            ""\n         ],\n         "Save": [\n            null,\n            "保存"\n         ],\n         "Cancel": [\n            null,\n            "キャンセル"\n         ],\n         "An error occurred while trying to save the form.": [\n            null,\n            "フォームを保存する際にエラーが発生しました。"\n         ],\n         "This chatroom requires a password": [\n            null,\n            "この談話室にはパスワードが必要です"\n         ],\n         "Password: ": [\n            null,\n            "パスワード:"\n         ],\n         "Submit": [\n            null,\n            "送信"\n         ],\n         "This room is not anonymous": [\n            null,\n            "この談話室は非匿名です"\n         ],\n         "This room now shows unavailable members": [\n            null,\n            "この談話室はメンバー以外にも見えます"\n         ],\n         "This room does not show unavailable members": [\n            null,\n            "この談話室はメンバー以外には見えません"\n         ],\n         "Non-privacy-related room configuration has changed": [\n            null,\n            "談話室の設定(プライバシーに無関係)が変更されました"\n         ],\n         "Room logging is now enabled": [\n            null,\n            "談話室の記録を取りはじめます"\n         ],\n         "Room logging is now disabled": [\n            null,\n            "談話室の記録を止めます"\n         ],\n         "This room is now non-anonymous": [\n            null,\n            "この談話室はただいま非匿名です"\n         ],\n         "This room is now semi-anonymous": [\n            null,\n            "この談話室はただいま半匿名です"\n         ],\n         "This room is now fully-anonymous": [\n            null,\n            "この談話室はただいま匿名です"\n         ],\n         "A new room has been created": [\n            null,\n            "新しい談話室が作成されました"\n         ],\n         "You have been banned from this room": [\n            null,\n            "この談話室から締め出されました"\n         ],\n         "You have been kicked from this room": [\n            null,\n            "この談話室から蹴り出されました"\n         ],\n         "You have been removed from this room because of an affiliation change": [\n            null,\n            "分掌の変更のため、この談話室から削除されました"\n         ],\n         "You have been removed from this room because the room has changed to members-only and you\'re not a member": [\n            null,\n            "談話室がメンバー制に変更されました。メンバーではないため、この談話室から削除されました"\n         ],\n         "You have been removed from this room because the MUC (Multi-user chat) service is being shut down.": [\n            null,\n            "MUC(グループチャット)のサービスが停止したため、この談話室から削除されました。"\n         ],\n         "<strong>%1$s</strong> has been banned": [\n            null,\n            "<strong>%1$s</strong> を締め出しました"\n         ],\n         "<strong>%1$s</strong> has been kicked out": [\n            null,\n            "<strong>%1$s</strong> を蹴り出しました"\n         ],\n         "<strong>%1$s</strong> has been removed because of an affiliation change": [\n            null,\n            "分掌の変更のため、<strong>%1$s</strong> を削除しました"\n         ],\n         "<strong>%1$s</strong> has been removed for not being a member": [\n            null,\n            "メンバーでなくなったため、<strong>%1$s</strong> を削除しました"\n         ],\n         "The reason given is: \\"": [\n            null,\n            ""\n         ],\n         "You are not on the member list of this room": [\n            null,\n            "この談話室のメンバー一覧にいません"\n         ],\n         "No nickname was specified": [\n            null,\n            "ニックネームがありません"\n         ],\n         "You are not allowed to create new rooms": [\n            null,\n            "新しい談話室を作成する権限がありません"\n         ],\n         "Your nickname doesn\'t conform to this room\'s policies": [\n            null,\n            "ニックネームがこの談話室のポリシーに従っていません"\n         ],\n         "Your nickname is already taken": [\n            null,\n            "ニックネームは既に使われています"\n         ],\n         "This room does not (yet) exist": [\n            null,\n            "この談話室は存在しません"\n         ],\n         "This room has reached it\'s maximum number of occupants": [\n            null,\n            "この談話室は入室者数の上限に達しています"\n         ],\n         "Topic set by %1$s to: %2$s": [\n            null,\n            "%1$s が話題を設定しました: %2$s"\n         ],\n         "%1$s has invited you to join a chat room: %2$s": [\n            null,\n            ""\n         ],\n         "%1$s has invited you to join a chat room: %2$s, and left the following reason: \\"%3$s\\"": [\n            null,\n            ""\n         ],\n         "Minimized": [\n            null,\n            ""\n         ],\n         "Click to remove this contact": [\n            null,\n            "クリックしてこの相手先を削除"\n         ],\n         "Click to chat with this contact": [\n            null,\n            "クリックしてこの相手先とチャット"\n         ],\n         "Name": [\n            null,\n            ""\n         ],\n         "Sorry, there was an error while trying to remove ": [\n            null,\n            ""\n         ],\n         "Sorry, there was an error while trying to add ": [\n            null,\n            ""\n         ],\n         "This client does not allow presence subscriptions": [\n            null,\n            ""\n         ],\n         "Type to filter": [\n            null,\n            ""\n         ],\n         "I am %1$s": [\n            null,\n            "私はいま %1$s"\n         ],\n         "Click here to write a custom status message": [\n            null,\n            "状況メッセージを入力するには、ここをクリック"\n         ],\n         "Click to change your chat status": [\n            null,\n            "クリックして、在席状況を変更"\n         ],\n         "Custom status": [\n            null,\n            "独自の在席状況"\n         ],\n         "online": [\n            null,\n            "在席"\n         ],\n         "busy": [\n            null,\n            "取り込み中"\n         ],\n         "away for long": [\n            null,\n            "不在"\n         ],\n         "away": [\n            null,\n            "離席中"\n         ],\n         "Your XMPP provider\'s domain name:": [\n            null,\n            ""\n         ],\n         "Fetch registration form": [\n            null,\n            ""\n         ],\n         "Tip: A list of public XMPP providers is available": [\n            null,\n            ""\n         ],\n         "here": [\n            null,\n            ""\n         ],\n         "Register": [\n            null,\n            ""\n         ],\n         "Sorry, the given provider does not support in band account registration. Please try with a different provider.": [\n            null,\n            ""\n         ],\n         "Requesting a registration form from the XMPP server": [\n            null,\n            ""\n         ],\n         "Something went wrong while establishing a connection with \\"%1$s\\". Are you sure it exists?": [\n            null,\n            ""\n         ],\n         "Now logging you in": [\n            null,\n            ""\n         ],\n         "Registered successfully": [\n            null,\n            ""\n         ],\n         "Return": [\n            null,\n            ""\n         ],\n         "The provider rejected your registration attempt. Please check the values you entered for correctness.": [\n            null,\n            ""\n         ],\n         "Password:": [\n            null,\n            "パスワード:"\n         ],\n         "Log In": [\n            null,\n            "ログイン"\n         ],\n         "user@server": [\n            null,\n            ""\n         ],\n         "Sign in": [\n            null,\n            "サインイン"\n         ],\n         "Toggle chat": [\n            null,\n            ""\n         ]\n      }\n   }\n}'}),define("text!nb",[],function(){return'{\n   "domain": "converse",\n   "locale_data": {\n      "converse": {\n         "": {\n            "domain": "converse",\n            "plural_forms": "nplurals=2; plural=(n != 1);",\n            "lang": "nb"\n         },\n         " e.g. conversejs.org": [\n            null,\n            ""\n         ],\n         "unencrypted": [\n            null,\n            "ukryptertß"\n         ],\n         "unverified": [\n            null,\n            "uverifisert"\n         ],\n         "verified": [\n            null,\n            "verifisert"\n         ],\n         "finished": [\n            null,\n            "ferdig"\n         ],\n         "This contact is busy": [\n            null,\n            "Denne kontakten er opptatt"\n         ],\n         "This contact is online": [\n            null,\n            "Kontakten er pålogget"\n         ],\n         "This contact is offline": [\n            null,\n            "Kontakten er avlogget"\n         ],\n         "This contact is unavailable": [\n            null,\n            "Kontakten er utilgjengelig"\n         ],\n         "This contact is away for an extended period": [\n            null,\n            "Kontakten er borte for en lengre periode"\n         ],\n         "This contact is away": [\n            null,\n            "Kontakten er borte"\n         ],\n         "Click to hide these contacts": [\n            null,\n            "Klikk for å skjule disse kontaktene"\n         ],\n         "My contacts": [\n            null,\n            "Mine Kontakter"\n         ],\n         "Pending contacts": [\n            null,\n            "Kontakter som venter på godkjenning"\n         ],\n         "Contact requests": [\n            null,\n            "Kontaktforespørsler"\n         ],\n         "Ungrouped": [\n            null,\n            "Ugrupperte"\n         ],\n         "Contacts": [\n            null,\n            "Kontakter"\n         ],\n         "Groups": [\n            null,\n            "Grupper"\n         ],\n         "Attempting to reconnect in 5 seconds": [\n            null,\n            ""\n         ],\n         "Error": [\n            null,\n            "Feil"\n         ],\n         "Connecting": [\n            null,\n            "Kobler til"\n         ],\n         "Authenticating": [\n            null,\n            "Godkjenner"\n         ],\n         "Authentication Failed": [\n            null,\n            "Godkjenning mislyktes"\n         ],\n         "Re-establishing encrypted session": [\n            null,\n            "Gjenopptar kryptert økt"\n         ],\n         "Generating private key.": [\n            null,\n            "Genererer privat nøkkel"\n         ],\n         "Your browser might become unresponsive.": [\n            null,\n            "Din nettleser kan bli uresponsiv"\n         ],\n         "Authentication request from %1$s\\n\\nYour chat contact is attempting to verify your identity, by asking you the question below.\\n\\n%2$s": [\n            null,\n            "Godkjenningsforespørsel fra %1$s\\n\\nDin nettpratkontakt forsøker å bekrefte din identitet, ved å spørre deg spørsmålet under.\\n\\n%2$s"\n         ],\n         "Could not verify this user\'s identify.": [\n            null,\n            "Kunne ikke bekrefte denne brukerens identitet"\n         ],\n         "Exchanging private key with contact.": [\n            null,\n            "Bytter private nøkler med kontakt"\n         ],\n         "Minimize this chat box": [\n            null,\n            ""\n         ],\n         "Personal message": [\n            null,\n            "Personlig melding"\n         ],\n         "Are you sure you want to clear the messages from this room?": [\n            null,\n            "Er du sikker på at du vil fjerne meldingene fra dette rommet?"\n         ],\n         "me": [\n            null,\n            "meg"\n         ],\n         "is typing": [\n            null,\n            "skriver"\n         ],\n         "has stopped typing": [\n            null,\n            "har stoppet å skrive"\n         ],\n         "Show this menu": [\n            null,\n            "Viser denne menyen"\n         ],\n         "Write in the third person": [\n            null,\n            "Skriv i tredjeperson"\n         ],\n         "Remove messages": [\n            null,\n            "Fjern meldinger"\n         ],\n         "Are you sure you want to clear the messages from this chat box?": [\n            null,\n            "Er du sikker på at du vil fjerne meldingene fra denne meldingsboksen?"\n         ],\n         "Your message could not be sent": [\n            null,\n            "Beskjeden din kunne ikke sendes"\n         ],\n         "We received an unencrypted message": [\n            null,\n            "Vi mottok en ukryptert beskjed"\n         ],\n         "We received an unreadable encrypted message": [\n            null,\n            "Vi mottok en uleselig melding"\n         ],\n         "Here are the fingerprints, please confirm them with %1$s, outside of this chat.\\n\\nFingerprint for you, %2$s: %3$s\\n\\nFingerprint for %1$s: %4$s\\n\\nIf you have confirmed that the fingerprints match, click OK, otherwise click Cancel.": [\n            null,\n            "Here are the fingerprints, please confirm them with %1$s, outside of this chat.\\n\\nFingerprint for you, %2$s: %3$s\\n\\nFingerprint for %1$s: %4$s\\n\\nOm du har bekreftet at avtrykkene matcher, klikk OK. I motsatt fall, trykk Avbryt."\n         ],\n         "You will be prompted to provide a security question and then an answer to that question.\\n\\nYour contact will then be prompted the same question and if they type the exact same answer (case sensitive), their identity will be verified.": [\n            null,\n            "Du vil bli spurt etter å tilby et sikkerhetsspørsmål og siden svare på dette.\\n\\nDin kontakt vil så bli spurt om det samme spørsmålet, og om de svarer det nøyaktig samme svaret (det er forskjell på små og store bokstaver), vil identiteten verifiseres."\n         ],\n         "What is your security question?": [\n            null,\n            "Hva er ditt Sikkerhetsspørsmål?"\n         ],\n         "What is the answer to the security question?": [\n            null,\n            "Hva er svaret på ditt Sikkerhetsspørsmål?"\n         ],\n         "Invalid authentication scheme provided": [\n            null,\n            "Du har vedlagt en ugyldig godkjenningsplan."\n         ],\n         "Your messages are not encrypted anymore": [\n            null,\n            "Dine meldinger er ikke kryptert lenger."\n         ],\n         "Your messages are now encrypted but your contact\'s identity has not been verified.": [\n            null,\n            "Dine meldinger er nå krypterte, men identiteten til din kontakt har ikke blitt verifisert."\n         ],\n         "Your contact\'s identify has been verified.": [\n            null,\n            "Din kontakts identitet har blitt verifisert."\n         ],\n         "Your contact has ended encryption on their end, you should do the same.": [\n            null,\n            "Din kontakt har avsluttet kryptering i sin ende, dette burde du også gjøre."\n         ],\n         "Your messages are not encrypted. Click here to enable OTR encryption.": [\n            null,\n            "Dine meldinger er ikke krypterte. Klikk her for å aktivere OTR-kryptering."\n         ],\n         "Your messages are encrypted, but your contact has not been verified.": [\n            null,\n            "Dine meldinger er krypterte, men din kontakt har ikke blitt verifisert."\n         ],\n         "Your messages are encrypted and your contact verified.": [\n            null,\n            "Dine meldinger er krypterte og din kontakt er verifisert."\n         ],\n         "Your contact has closed their end of the private session, you should do the same": [\n            null,\n            "Din kontakt har avsluttet økten i sin ende, dette burde du også gjøre."\n         ],\n         "Clear all messages": [\n            null,\n            "Fjern alle meldinger"\n         ],\n         "End encrypted conversation": [\n            null,\n            "Avslutt kryptert økt"\n         ],\n         "Insert a smiley": [\n            null,\n            ""\n         ],\n         "Refresh encrypted conversation": [\n            null,\n            "Last inn kryptert samtale på nytt"\n         ],\n         "Start a call": [\n            null,\n            "Start en samtale"\n         ],\n         "Start encrypted conversation": [\n            null,\n            "Start en kryptert samtale"\n         ],\n         "Verify with fingerprints": [\n            null,\n            "Verifiser med Avtrykk"\n         ],\n         "Verify with SMP": [\n            null,\n            "Verifiser med SMP"\n         ],\n         "What\'s this?": [\n            null,\n            "Hva er dette?"\n         ],\n         "Online": [\n            null,\n            "Pålogget"\n         ],\n         "Busy": [\n            null,\n            "Opptatt"\n         ],\n         "Away": [\n            null,\n            "Borte"\n         ],\n         "Offline": [\n            null,\n            "Avlogget"\n         ],\n         "Log out": [\n            null,\n            "Logg Av"\n         ],\n         "Contact name": [\n            null,\n            "Kontaktnavn"\n         ],\n         "Search": [\n            null,\n            "Søk"\n         ],\n         "e.g. user@example.com": [\n            null,\n            ""\n         ],\n         "Add": [\n            null,\n            "Legg Til"\n         ],\n         "Click to add new chat contacts": [\n            null,\n            "Klikk for å legge til nye meldingskontakter"\n         ],\n         "Add a contact": [\n            null,\n            "Legg til en Kontakt"\n         ],\n         "No users found": [\n            null,\n            "Ingen brukere funnet"\n         ],\n         "Click to add as a chat contact": [\n            null,\n            "Klikk for å legge til som meldingskontakt"\n         ],\n         "Room name": [\n            null,\n            "Romnavn"\n         ],\n         "Nickname": [\n            null,\n            "Kallenavn"\n         ],\n         "Server": [\n            null,\n            "Server"\n         ],\n         "Show rooms": [\n            null,\n            "Vis Rom"\n         ],\n         "Rooms": [\n            null,\n            "Rom"\n         ],\n         "No rooms on %1$s": [\n            null,\n            "Ingen rom på %1$s"\n         ],\n         "Rooms on %1$s": [\n            null,\n            "Rom på %1$s"\n         ],\n         "Click to open this room": [\n            null,\n            "Klikk for å åpne dette rommet"\n         ],\n         "Show more information on this room": [\n            null,\n            "Vis mer informasjon om dette rommet"\n         ],\n         "Description:": [\n            null,\n            "Beskrivelse:"\n         ],\n         "Occupants:": [\n            null,\n            "Brukere her:"\n         ],\n         "Features:": [\n            null,\n            "Egenskaper:"\n         ],\n         "Requires authentication": [\n            null,\n            "Krever Godkjenning"\n         ],\n         "Hidden": [\n            null,\n            "Skjult"\n         ],\n         "Requires an invitation": [\n            null,\n            "Krever en invitasjon"\n         ],\n         "Moderated": [\n            null,\n            "Moderert"\n         ],\n         "Non-anonymous": [\n            null,\n            "Ikke-Anonym"\n         ],\n         "Open room": [\n            null,\n            "Åpent Rom"\n         ],\n         "Permanent room": [\n            null,\n            "Permanent Rom"\n         ],\n         "Public": [\n            null,\n            "Alle"\n         ],\n         "Semi-anonymous": [\n            null,\n            "Semi-anonymt"\n         ],\n         "Temporary room": [\n            null,\n            "Midlertidig Rom"\n         ],\n         "Unmoderated": [\n            null,\n            "Umoderert"\n         ],\n         "This user is a moderator": [\n            null,\n            "Denne brukeren er moderator"\n         ],\n         "This user can send messages in this room": [\n            null,\n            "Denne brukeren kan skrive meldinger i dette rommet"\n         ],\n         "This user can NOT send messages in this room": [\n            null,\n            "Denne brukeren kan IKKE sende meldinger i dette rommet"\n         ],\n         "Invite...": [\n            null,\n            "Invitér..."\n         ],\n         "Occupants": [\n            null,\n            "Brukere her:"\n         ],\n         "You are about to invite %1$s to the chat room \\"%2$s\\". ": [\n            null,\n            "Du er i ferd med å invitere %1$s til samtalerommet \\"%2$s\\". "\n         ],\n         "You may optionally include a message, explaining the reason for the invitation.": [\n            null,\n            "Du kan eventuelt inkludere en melding og forklare årsaken til invitasjonen."\n         ],\n         "Message": [\n            null,\n            "Melding"\n         ],\n         "Error: could not execute the command": [\n            null,\n            "Feil: kunne ikke utføre kommandoen"\n         ],\n         "Error: the \\"": [\n            null,\n            ""\n         ],\n         "Change user\'s affiliation to admin": [\n            null,\n            ""\n         ],\n         "Ban user from room": [\n            null,\n            "Utesteng bruker fra rommet"\n         ],\n         "Kick user from room": [\n            null,\n            "Kast ut bruker fra rommet"\n         ],\n         "Write in 3rd person": [\n            null,\n            "Skriv i tredjeperson"\n         ],\n         "Grant membership to a user": [\n            null,\n            ""\n         ],\n         "Remove user\'s ability to post messages": [\n            null,\n            "Fjern brukerens muligheter til å skrive meldinger"\n         ],\n         "Change your nickname": [\n            null,\n            "Endre ditt kallenavn"\n         ],\n         "Grant moderator role to user": [\n            null,\n            ""\n         ],\n         "Revoke user\'s membership": [\n            null,\n            ""\n         ],\n         "Set room topic": [\n            null,\n            "Endre rommets emne"\n         ],\n         "Allow muted user to post messages": [\n            null,\n            "Tillat stumme brukere å skrive meldinger"\n         ],\n         "Save": [\n            null,\n            "Lagre"\n         ],\n         "Cancel": [\n            null,\n            "Avbryt"\n         ],\n         "An error occurred while trying to save the form.": [\n            null,\n            "En feil skjedde under lagring av skjemaet."\n         ],\n         "This chatroom requires a password": [\n            null,\n            "Dette rommet krever et passord"\n         ],\n         "Password: ": [\n            null,\n            "Passord:"\n         ],\n         "Submit": [\n            null,\n            "Send"\n         ],\n         "This room is not anonymous": [\n            null,\n            "Dette rommet er ikke anonymt"\n         ],\n         "This room now shows unavailable members": [\n            null,\n            "Dette rommet viser nå utilgjengelige medlemmer"\n         ],\n         "This room does not show unavailable members": [\n            null,\n            "Dette rommet viser ikke utilgjengelige medlemmer"\n         ],\n         "Non-privacy-related room configuration has changed": [\n            null,\n            "Ikke-personvernsrelatert romkonfigurasjon har blitt endret"\n         ],\n         "Room logging is now enabled": [\n            null,\n            "Romlogging er nå aktivert"\n         ],\n         "Room logging is now disabled": [\n            null,\n            "Romlogging er nå deaktivert"\n         ],\n         "This room is now non-anonymous": [\n            null,\n            "Dette rommet er nå ikke-anonymt"\n         ],\n         "This room is now semi-anonymous": [\n            null,\n            "Dette rommet er nå semi-anonymt"\n         ],\n         "This room is now fully-anonymous": [\n            null,\n            "Dette rommet er nå totalt anonymt"\n         ],\n         "A new room has been created": [\n            null,\n            "Et nytt rom har blitt opprettet"\n         ],\n         "You have been banned from this room": [\n            null,\n            "Du har blitt utestengt fra dette rommet"\n         ],\n         "You have been kicked from this room": [\n            null,\n            "Du ble kastet ut av dette rommet"\n         ],\n         "You have been removed from this room because of an affiliation change": [\n            null,\n            "Du har blitt fjernet fra dette rommet på grunn av en holdningsendring"\n         ],\n         "You have been removed from this room because the room has changed to members-only and you\'re not a member": [\n            null,\n            "Du har blitt fjernet fra dette rommet fordi rommet nå kun tillater medlemmer, noe du ikke er."\n         ],\n         "You have been removed from this room because the MUC (Multi-user chat) service is being shut down.": [\n            null,\n            "Du har blitt fjernet fra dette rommet fordi MBC (Multi-Bruker-Chat)-tjenesten er stengt ned."\n         ],\n         "<strong>%1$s</strong> has been banned": [\n            null,\n            "<strong>%1$s</strong>  har blitt utestengt"\n         ],\n         "<strong>%1$s</strong>\'s nickname has changed": [\n            null,\n            "<strong>%1$s</strong> sitt kallenavn er endret"\n         ],\n         "<strong>%1$s</strong> has been kicked out": [\n            null,\n            "<strong>%1$s</strong>  ble kastet ut"\n         ],\n         "<strong>%1$s</strong> has been removed because of an affiliation change": [\n            null,\n            "<strong>%1$s</strong> har blitt fjernet på grunn av en holdningsendring"\n         ],\n         "<strong>%1$s</strong> has been removed for not being a member": [\n            null,\n            "<strong>%1$s</strong> har blitt fjernet på grunn av at han/hun ikke er medlem"\n         ],\n         "Your nickname has been automatically changed to: <strong>%1$s</strong>": [\n            null,\n            "Ditt kallenavn har blitt automatisk endret til <strong>%1$s</strong> "\n         ],\n         "Your nickname has been changed to: <strong>%1$s</strong>": [\n            null,\n            "Ditt kallenavn har blitt endret til <strong>%1$s</strong> "\n         ],\n         "The reason given is: \\"": [\n            null,\n            "Årsaken som er oppgitt er: \\""\n         ],\n         "You are not on the member list of this room": [\n            null,\n            "Du er ikke på medlemslisten til dette rommet"\n         ],\n         "No nickname was specified": [\n            null,\n            "Ingen kallenavn var spesifisert"\n         ],\n         "You are not allowed to create new rooms": [\n            null,\n            "Du har ikke tillatelse til å opprette nye rom"\n         ],\n         "Your nickname doesn\'t conform to this room\'s policies": [\n            null,\n            "Ditt kallenavn er ikke i samsvar med rommets regler"\n         ],\n         "Your nickname is already taken": [\n            null,\n            "Kallenavnet er allerede tatt"\n         ],\n         "This room does not (yet) exist": [\n            null,\n            "Dette rommet eksisterer ikke (enda)"\n         ],\n         "This room has reached it\'s maximum number of occupants": [\n            null,\n            "Dette rommet har nådd maksimalt antall brukere"\n         ],\n         "Topic set by %1$s to: %2$s": [\n            null,\n            "Emnet ble endret den %1$s til: %2$s"\n         ],\n         "%1$s has invited you to join a chat room: %2$s": [\n            null,\n            "%1$s har invitert deg til å bli med i chatterommet: %2$s"\n         ],\n         "%1$s has invited you to join a chat room: %2$s, and left the following reason: \\"%3$s\\"": [\n            null,\n            "%1$s har invitert deg til å bli med i chatterommet: %2$s, og forlot selv av følgende grunn:  \\"%3$s\\""\n         ],\n         "Click to restore this chat": [\n            null,\n            "Klikk for å gjenopprette denne samtalen"\n         ],\n         "Minimized": [\n            null,\n            "Minimert"\n         ],\n         "Click to remove this contact": [\n            null,\n            "Klikk for å fjerne denne kontakten"\n         ],\n         "Click to accept this contact request": [\n            null,\n            "Klikk for å Godta denne kontaktforespørselen"\n         ],\n         "Click to decline this contact request": [\n            null,\n            "Klikk for å avslå denne kontaktforespørselen"\n         ],\n         "Click to chat with this contact": [\n            null,\n            "Klikk for å chatte med denne kontakten"\n         ],\n         "Name": [\n            null,\n            ""\n         ],\n         "Are you sure you want to remove this contact?": [\n            null,\n            "Er du sikker på at du vil fjerne denne kontakten?"\n         ],\n         "Sorry, there was an error while trying to remove ": [\n            null,\n            ""\n         ],\n         "Are you sure you want to decline this contact request?": [\n            null,\n            "Er du sikker på at du vil avslå denne kontaktforespørselen?"\n         ],\n         "Sorry, there was an error while trying to add ": [\n            null,\n            ""\n         ],\n         "This client does not allow presence subscriptions": [\n            null,\n            ""\n         ],\n         "Type to filter": [\n            null,\n            "Skriv til filter"\n         ],\n         "I am %1$s": [\n            null,\n            "Jeg er %1$s"\n         ],\n         "Click here to write a custom status message": [\n            null,\n            "Klikk her for å skrive en personlig statusmelding"\n         ],\n         "Click to change your chat status": [\n            null,\n            "Klikk for å endre din meldingsstatus"\n         ],\n         "Custom status": [\n            null,\n            "Personlig status"\n         ],\n         "online": [\n            null,\n            "pålogget"\n         ],\n         "busy": [\n            null,\n            "opptatt"\n         ],\n         "away for long": [\n            null,\n            "borte lenge"\n         ],\n         "away": [\n            null,\n            "borte"\n         ],\n         "Your XMPP provider\'s domain name:": [\n            null,\n            "Din XMPP-tilbyders domenenavn:"\n         ],\n         "Fetch registration form": [\n            null,\n            "Hent registreringsskjema"\n         ],\n         "Tip: A list of public XMPP providers is available": [\n            null,\n            "Tips: En liste med offentlige XMPP-tilbydere er tilgjengelig"\n         ],\n         "here": [\n            null,\n            "her"\n         ],\n         "Register": [\n            null,\n            "Registrér deg"\n         ],\n         "Sorry, the given provider does not support in band account registration. Please try with a different provider.": [\n            null,\n            "Beklager, den valgte tilbyderen støtter ikke in band kontoregistrering. Vennligst prøv igjen med en annen tilbyder. "\n         ],\n         "Requesting a registration form from the XMPP server": [\n            null,\n            "Spør etter registreringsskjema fra XMPP-tjeneren"\n         ],\n         "Something went wrong while establishing a connection with \\"%1$s\\". Are you sure it exists?": [\n            null,\n            "Noe gikk galt under etablering av forbindelse med \\"%1$s\\". Er du sikker på at denne eksisterer?"\n         ],\n         "Now logging you in": [\n            null,\n            "Logger deg inn"\n         ],\n         "Registered successfully": [\n            null,\n            "Registrering var vellykket"\n         ],\n         "Return": [\n            null,\n            "Tilbake"\n         ],\n         "XMPP Username:": [\n            null,\n            "XMPP Brukernavn:"\n         ],\n         "Password:": [\n            null,\n            "Passord:"\n         ],\n         "Log In": [\n            null,\n            "Logg inn"\n         ],\n         "user@server": [\n            null,\n            ""\n         ],\n         "Sign in": [\n            null,\n            "Innlogging"\n         ],\n         "Toggle chat": [\n            null,\n            "Endre chatten"\n         ]\n      }\n   }\n}'}),define("text!nl",[],function(){return'{\n   "domain": "converse",\n   "locale_data": {\n      "converse": {\n         "": {\n            "domain": "converse",\n            "plural_forms": "nplurals=2; plural=(n != 1);",\n            "lang": "nl"\n         },\n         " e.g. conversejs.org": [\n            null,\n            ""\n         ],\n         "unencrypted": [\n            null,\n            "ongecodeerde"\n         ],\n         "unverified": [\n            null,\n            "niet geverifieerd"\n         ],\n         "verified": [\n            null,\n            "geverifieerd"\n         ],\n         "finished": [\n            null,\n            "klaar"\n         ],\n         "This contact is busy": [\n            null,\n            "Contact is bezet"\n         ],\n         "This contact is online": [\n            null,\n            "Contact is online"\n         ],\n         "This contact is offline": [\n            null,\n            "Contact is offline"\n         ],\n         "This contact is unavailable": [\n            null,\n            "Contact is niet beschikbaar"\n         ],\n         "This contact is away for an extended period": [\n            null,\n            "Contact is afwezig voor lange periode"\n         ],\n         "This contact is away": [\n            null,\n            "Conact is afwezig"\n         ],\n         "My contacts": [\n            null,\n            "Mijn contacts"\n         ],\n         "Pending contacts": [\n            null,\n            "Conacten in afwachting van"\n         ],\n         "Contact requests": [\n            null,\n            "Contact uitnodiging"\n         ],\n         "Ungrouped": [\n            null,\n            ""\n         ],\n         "Contacts": [\n            null,\n            "Contacten"\n         ],\n         "Groups": [\n            null,\n            ""\n         ],\n         "Attempting to reconnect in 5 seconds": [\n            null,\n            ""\n         ],\n         "Error": [\n            null,\n            "Error"\n         ],\n         "Connecting": [\n            null,\n            "Verbinden"\n         ],\n         "Authenticating": [\n            null,\n            "Authenticeren"\n         ],\n         "Authentication Failed": [\n            null,\n            "Authenticeren mislukt"\n         ],\n         "Re-establishing encrypted session": [\n            null,\n            "Bezig versleutelde sessie te herstellen"\n         ],\n         "Generating private key.": [\n            null,\n            ""\n         ],\n         "Your browser might become unresponsive.": [\n            null,\n            ""\n         ],\n         "Authentication request from %1$s\\n\\nYour chat contact is attempting to verify your identity, by asking you the question below.\\n\\n%2$s": [\n            null,\n            ""\n         ],\n         "Could not verify this user\'s identify.": [\n            null,\n            "Niet kon de identiteit van deze gebruiker niet identificeren."\n         ],\n         "Exchanging private key with contact.": [\n            null,\n            ""\n         ],\n         "Minimize this chat box": [\n            null,\n            ""\n         ],\n         "Personal message": [\n            null,\n            "Persoonlijk bericht"\n         ],\n         "me": [\n            null,\n            "ikzelf"\n         ],\n         "Show this menu": [\n            null,\n            "Toon dit menu"\n         ],\n         "Write in the third person": [\n            null,\n            "Schrijf in de 3de persoon"\n         ],\n         "Remove messages": [\n            null,\n            "Verwijder bericht"\n         ],\n         "Are you sure you want to clear the messages from this chat box?": [\n            null,\n            ""\n         ],\n         "Your message could not be sent": [\n            null,\n            "Je bericht kon niet worden verzonden"\n         ],\n         "We received an unencrypted message": [\n            null,\n            "We ontvingen een unencrypted bericht "\n         ],\n         "We received an unreadable encrypted message": [\n            null,\n            "We ontvangen een onleesbaar unencrypted bericht"\n         ],\n         "Here are the fingerprints, please confirm them with %1$s, outside of this chat.\\n\\nFingerprint for you, %2$s: %3$s\\n\\nFingerprint for %1$s: %4$s\\n\\nIf you have confirmed that the fingerprints match, click OK, otherwise click Cancel.": [\n            null,\n            ""\n         ],\n         "You will be prompted to provide a security question and then an answer to that question.\\n\\nYour contact will then be prompted the same question and if they type the exact same answer (case sensitive), their identity will be verified.": [\n            null,\n            ""\n         ],\n         "What is your security question?": [\n            null,\n            "Wat is jou sericury vraag?"\n         ],\n         "What is the answer to the security question?": [\n            null,\n            "Wat is het antwoord op de security vraag?"\n         ],\n         "Invalid authentication scheme provided": [\n            null,\n            ""\n         ],\n         "Your messages are not encrypted anymore": [\n            null,\n            "Je berichten zijn niet meer encrypted"\n         ],\n         "Your messages are not encrypted. Click here to enable OTR encryption.": [\n            null,\n            "Jou bericht is niet encrypted. KLik hier om ORC encrytion aan te zetten."\n         ],\n         "End encrypted conversation": [\n            null,\n            "Beeindig encrypted gesprek"\n         ],\n         "Insert a smiley": [\n            null,\n            ""\n         ],\n         "Hide the list of occupants": [\n            null,\n            ""\n         ],\n         "Refresh encrypted conversation": [\n            null,\n            "Ververs encrypted gesprek"\n         ],\n         "Start a call": [\n            null,\n            ""\n         ],\n         "Start encrypted conversation": [\n            null,\n            "Start encrypted gesprek"\n         ],\n         "Verify with fingerprints": [\n            null,\n            ""\n         ],\n         "Verify with SMP": [\n            null,\n            ""\n         ],\n         "What\'s this?": [\n            null,\n            "Wat is dit?"\n         ],\n         "Online": [\n            null,\n            "Online"\n         ],\n         "Busy": [\n            null,\n            "Bezet"\n         ],\n         "Away": [\n            null,\n            "Afwezig"\n         ],\n         "Offline": [\n            null,\n            ""\n         ],\n         "Contact name": [\n            null,\n            "Contact naam"\n         ],\n         "Search": [\n            null,\n            "Zoeken"\n         ],\n         "e.g. user@example.com": [\n            null,\n            ""\n         ],\n         "Add": [\n            null,\n            "Toevoegen"\n         ],\n         "Click to add new chat contacts": [\n            null,\n            "Klik om nieuwe contacten toe te voegen"\n         ],\n         "Add a contact": [\n            null,\n            "Voeg contact toe"\n         ],\n         "No users found": [\n            null,\n            "Geen gebruikers gevonden"\n         ],\n         "Click to add as a chat contact": [\n            null,\n            "Klik om contact toe te voegen"\n         ],\n         "Room name": [\n            null,\n            "Room naam"\n         ],\n         "Nickname": [\n            null,\n            "Nickname"\n         ],\n         "Server": [\n            null,\n            "Server"\n         ],\n         "Show rooms": [\n            null,\n            "Toon rooms"\n         ],\n         "Rooms": [\n            null,\n            "Rooms"\n         ],\n         "No rooms on %1$s": [\n            null,\n            "Geen room op %1$s"\n         ],\n         "Rooms on %1$s": [\n            null,\n            "Room op %1$s"\n         ],\n         "Click to open this room": [\n            null,\n            "Klik om room te openen"\n         ],\n         "Show more information on this room": [\n            null,\n            "Toon meer informatie over deze room"\n         ],\n         "Description:": [\n            null,\n            "Beschrijving"\n         ],\n         "Occupants:": [\n            null,\n            "Deelnemers:"\n         ],\n         "Features:": [\n            null,\n            "Functies:"\n         ],\n         "Requires authentication": [\n            null,\n            "Verificatie vereist"\n         ],\n         "Hidden": [\n            null,\n            "Verborgen"\n         ],\n         "Requires an invitation": [\n            null,\n            "Veriest een uitnodiging"\n         ],\n         "Moderated": [\n            null,\n            "Gemodereerd"\n         ],\n         "Non-anonymous": [\n            null,\n            "Niet annoniem"\n         ],\n         "Open room": [\n            null,\n            "Open room"\n         ],\n         "Permanent room": [\n            null,\n            "Blijvend room"\n         ],\n         "Public": [\n            null,\n            "Publiek"\n         ],\n         "Semi-anonymous": [\n            null,\n            "Semi annoniem"\n         ],\n         "Temporary room": [\n            null,\n            "Tijdelijke room"\n         ],\n         "Unmoderated": [\n            null,\n            "Niet gemodereerd"\n         ],\n         "This user is a moderator": [\n            null,\n            "Dit is een moderator"\n         ],\n         "This user can send messages in this room": [\n            null,\n            "Deze gebruiker kan berichten sturen in deze room"\n         ],\n         "This user can NOT send messages in this room": [\n            null,\n            "Deze gebruiker kan NIET een bericht sturen in deze room"\n         ],\n         "Invite...": [\n            null,\n            ""\n         ],\n         "You are about to invite %1$s to the chat room \\"%2$s\\". ": [\n            null,\n            ""\n         ],\n         "You may optionally include a message, explaining the reason for the invitation.": [\n            null,\n            ""\n         ],\n         "Message": [\n            null,\n            "Bericht"\n         ],\n         "Error: could not execute the command": [\n            null,\n            ""\n         ],\n         "Error: the \\"": [\n            null,\n            ""\n         ],\n         "Change user\'s affiliation to admin": [\n            null,\n            ""\n         ],\n         "Change user role to occupant": [\n            null,\n            ""\n         ],\n         "Grant membership to a user": [\n            null,\n            ""\n         ],\n         "Remove user\'s ability to post messages": [\n            null,\n            ""\n         ],\n         "Change your nickname": [\n            null,\n            ""\n         ],\n         "Grant moderator role to user": [\n            null,\n            ""\n         ],\n         "Revoke user\'s membership": [\n            null,\n            ""\n         ],\n         "Allow muted user to post messages": [\n            null,\n            ""\n         ],\n         "Save": [\n            null,\n            "Opslaan"\n         ],\n         "Cancel": [\n            null,\n            "Annuleren"\n         ],\n         "An error occurred while trying to save the form.": [\n            null,\n            "Een error tijdens het opslaan van het formulier."\n         ],\n         "This chatroom requires a password": [\n            null,\n            "Chatroom heeft een wachtwoord"\n         ],\n         "Password: ": [\n            null,\n            "Wachtwoord: "\n         ],\n         "Submit": [\n            null,\n            "Indienen"\n         ],\n         "This room is not anonymous": [\n            null,\n            "Deze room is niet annoniem"\n         ],\n         "This room now shows unavailable members": [\n            null,\n            ""\n         ],\n         "This room does not show unavailable members": [\n            null,\n            ""\n         ],\n         "Non-privacy-related room configuration has changed": [\n            null,\n            ""\n         ],\n         "Room logging is now enabled": [\n            null,\n            ""\n         ],\n         "Room logging is now disabled": [\n            null,\n            ""\n         ],\n         "This room is now non-anonymous": [\n            null,\n            "Deze room is nu niet annoniem"\n         ],\n         "This room is now semi-anonymous": [\n            null,\n            "Deze room is nu semie annoniem"\n         ],\n         "This room is now fully-anonymous": [\n            null,\n            "Deze room is nu volledig annoniem"\n         ],\n         "A new room has been created": [\n            null,\n            "Een nieuwe room is gemaakt"\n         ],\n         "You have been banned from this room": [\n            null,\n            "Je bent verbannen uit deze room"\n         ],\n         "You have been kicked from this room": [\n            null,\n            "Je bent uit de room gegooid"\n         ],\n         "You have been removed from this room because of an affiliation change": [\n            null,\n            ""\n         ],\n         "You have been removed from this room because the room has changed to members-only and you\'re not a member": [\n            null,\n            ""\n         ],\n         "You have been removed from this room because the MUC (Multi-user chat) service is being shut down.": [\n            null,\n            ""\n         ],\n         "<strong>%1$s</strong> has been banned": [\n            null,\n            "<strong>%1$s</strong> is verbannen"\n         ],\n         "<strong>%1$s</strong> has been kicked out": [\n            null,\n            "<strong>%1$s</strong> has been kicked out"\n         ],\n         "<strong>%1$s</strong> has been removed because of an affiliation change": [\n            null,\n            ""\n         ],\n         "<strong>%1$s</strong> has been removed for not being a member": [\n            null,\n            ""\n         ],\n         "The reason given is: \\"": [\n            null,\n            ""\n         ],\n         "You are not on the member list of this room": [\n            null,\n            "Je bent niet een gebruiker van deze room"\n         ],\n         "No nickname was specified": [\n            null,\n            "Geen nickname ingegeven"\n         ],\n         "You are not allowed to create new rooms": [\n            null,\n            "Je bent niet toegestaan nieuwe rooms te maken"\n         ],\n         "Your nickname doesn\'t conform to this room\'s policies": [\n            null,\n            "Je nickname is niet conform policy"\n         ],\n         "Your nickname is already taken": [\n            null,\n            "Je nickname bestaat al"\n         ],\n         "This room does not (yet) exist": [\n            null,\n            "Deze room bestaat niet"\n         ],\n         "This room has reached it\'s maximum number of occupants": [\n            null,\n            "Deze room heeft het maximale aantal gebruikers"\n         ],\n         "Topic set by %1$s to: %2$s": [\n            null,\n            ""\n         ],\n         "%1$s has invited you to join a chat room: %2$s": [\n            null,\n            ""\n         ],\n         "%1$s has invited you to join a chat room: %2$s, and left the following reason: \\"%3$s\\"": [\n            null,\n            ""\n         ],\n         "Minimized": [\n            null,\n            ""\n         ],\n         "Click to remove this contact": [\n            null,\n            "Klik om contact te verwijderen"\n         ],\n         "Click to chat with this contact": [\n            null,\n            "Klik om te chatten met contact"\n         ],\n         "Name": [\n            null,\n            ""\n         ],\n         "Sorry, there was an error while trying to remove ": [\n            null,\n            ""\n         ],\n         "Sorry, there was an error while trying to add ": [\n            null,\n            ""\n         ],\n         "This client does not allow presence subscriptions": [\n            null,\n            ""\n         ],\n         "Type to filter": [\n            null,\n            ""\n         ],\n         "I am %1$s": [\n            null,\n            "Ik ben %1$s"\n         ],\n         "Click here to write a custom status message": [\n            null,\n            "Klik hier om custom status bericht te maken"\n         ],\n         "Click to change your chat status": [\n            null,\n            "Klik hier om status te wijzigen"\n         ],\n         "Custom status": [\n            null,\n            ""\n         ],\n         "online": [\n            null,\n            "online"\n         ],\n         "busy": [\n            null,\n            "bezet"\n         ],\n         "away for long": [\n            null,\n            "afwezig lange tijd"\n         ],\n         "away": [\n            null,\n            "afwezig"\n         ],\n         "Your XMPP provider\'s domain name:": [\n            null,\n            ""\n         ],\n         "Fetch registration form": [\n            null,\n            ""\n         ],\n         "Tip: A list of public XMPP providers is available": [\n            null,\n            ""\n         ],\n         "here": [\n            null,\n            ""\n         ],\n         "Register": [\n            null,\n            ""\n         ],\n         "Sorry, the given provider does not support in band account registration. Please try with a different provider.": [\n            null,\n            ""\n         ],\n         "Requesting a registration form from the XMPP server": [\n            null,\n            ""\n         ],\n         "Something went wrong while establishing a connection with \\"%1$s\\". Are you sure it exists?": [\n            null,\n            ""\n         ],\n         "Now logging you in": [\n            null,\n            ""\n         ],\n         "Registered successfully": [\n            null,\n            ""\n         ],\n         "Return": [\n            null,\n            ""\n         ],\n         "The provider rejected your registration attempt. Please check the values you entered for correctness.": [\n            null,\n            ""\n         ],\n         "Password:": [\n            null,\n            "Wachtwoord:"\n         ],\n         "Log In": [\n            null,\n            "Aanmelden"\n         ],\n         "user@server": [\n            null,\n            ""\n         ],\n         "Sign in": [\n            null,\n            "Aanmelden"\n         ],\n         "Toggle chat": [\n            null,\n            ""\n         ]\n      }\n   }\n}'}),define("text!pl",[],function(){return'{\n   "domain": "converse",\n   "locale_data": {\n      "converse": {\n         "": {\n            "domain": "converse",\n            "plural_forms": "nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);",\n            "lang": "pl"\n         },\n         " e.g. conversejs.org": [\n            null,\n            "np. conversejs.org"\n         ],\n         "unencrypted": [\n            null,\n            "nieszyfrowane"\n         ],\n         "unverified": [\n            null,\n            "niezweryfikowane"\n         ],\n         "verified": [\n            null,\n            "zweryfikowane"\n         ],\n         "finished": [\n            null,\n            "zakończone"\n         ],\n         "This contact is busy": [\n            null,\n            "Kontakt jest zajęty"\n         ],\n         "This contact is online": [\n            null,\n            "Kontakt jest połączony"\n         ],\n         "This contact is offline": [\n            null,\n            "Kontakt jest niepołączony"\n         ],\n         "This contact is unavailable": [\n            null,\n            "Kontakt jest niedostępny"\n         ],\n         "This contact is away for an extended period": [\n            null,\n            "Kontakt jest nieobecny przez dłuższą chwilę"\n         ],\n         "This contact is away": [\n            null,\n            "Kontakt jest nieobecny"\n         ],\n         "Click to hide these contacts": [\n            null,\n            "Kliknij aby schować te kontakty"\n         ],\n         "My contacts": [\n            null,\n            "Moje kontakty"\n         ],\n         "Pending contacts": [\n            null,\n            "Kontakty oczekujące"\n         ],\n         "Contact requests": [\n            null,\n            "Zaproszenia do kontaktu"\n         ],\n         "Ungrouped": [\n            null,\n            "Niezgrupowane"\n         ],\n         "Contacts": [\n            null,\n            "Kontakty"\n         ],\n         "Groups": [\n            null,\n            "Grupy"\n         ],\n         "Attempting to reconnect in 5 seconds": [\n            null,\n            ""\n         ],\n         "Error": [\n            null,\n            "Błąd"\n         ],\n         "Connecting": [\n            null,\n            "Łączę się"\n         ],\n         "Authenticating": [\n            null,\n            "Autoryzacja"\n         ],\n         "Authentication Failed": [\n            null,\n            "Autoryzacja nie powiodła się"\n         ],\n         "Re-establishing encrypted session": [\n            null,\n            "Przywrócenie sesji szyfrowanej"\n         ],\n         "Generating private key.": [\n            null,\n            "Generuję klucz prywatny."\n         ],\n         "Your browser might become unresponsive.": [\n            null,\n            "Twoja przeglądarka może nieco zwolnić."\n         ],\n         "Authentication request from %1$s\\n\\nYour chat contact is attempting to verify your identity, by asking you the question below.\\n\\n%2$s": [\n            null,\n            "Prośba o autoryzację od %1$s\\n\\nKontakt próbuje zweryfikować twoją tożsamość, zadając ci pytanie poniżej.\\n\\n%2$s"\n         ],\n         "Could not verify this user\'s identify.": [\n            null,\n            "Nie jestem w stanie zweryfikować tożsamości kontaktu."\n         ],\n         "Exchanging private key with contact.": [\n            null,\n            "Wymieniam klucze szyfrujące z kontaktem."\n         ],\n         "Minimize this chat box": [\n            null,\n            ""\n         ],\n         "Personal message": [\n            null,\n            "Wiadomość osobista"\n         ],\n         "Are you sure you want to clear the messages from this room?": [\n            null,\n            "Potwierdź czy rzeczywiście chcesz wyczyścić wiadomości z tego pokoju?"\n         ],\n         "me": [\n            null,\n            "ja"\n         ],\n         "is typing": [\n            null,\n            "pisze"\n         ],\n         "has stopped typing": [\n            null,\n            "przestał pisać"\n         ],\n         "has gone away": [\n            null,\n            "uciekł"\n         ],\n         "Show this menu": [\n            null,\n            "Pokaż menu"\n         ],\n         "Write in the third person": [\n            null,\n            "Pisz w trzeciej osobie"\n         ],\n         "Remove messages": [\n            null,\n            "Usuń wiadomość"\n         ],\n         "Are you sure you want to clear the messages from this chat box?": [\n            null,\n            "Potwierdź czy rzeczywiście chcesz wyczyścić wiadomości z okienka rozmowy?"\n         ],\n         "Your message could not be sent": [\n            null,\n            "Twoja wiadomość nie została wysłana"\n         ],\n         "We received an unencrypted message": [\n            null,\n            "Otrzymaliśmy niezaszyfrowaną wiadomość"\n         ],\n         "We received an unreadable encrypted message": [\n            null,\n            "Otrzymaliśmy nieczytelną zaszyfrowaną wiadomość"\n         ],\n         "Here are the fingerprints, please confirm them with %1$s, outside of this chat.\\n\\nFingerprint for you, %2$s: %3$s\\n\\nFingerprint for %1$s: %4$s\\n\\nIf you have confirmed that the fingerprints match, click OK, otherwise click Cancel.": [\n            null,\n            "Oto odciski palców, potwiedź je proszę z %1$s używając innego sposobuwymiany informacji niż ta rozmowa.\\n\\nOdcisk palca dla ciebie, %2$s: %3$s\\n\\nOdcisk palca dla %1$s: %4$s\\n\\nJeśli odciski palców zostały potwierdzone, kliknij OK, w inny wypadku kliknij Anuluj."\n         ],\n         "You will be prompted to provide a security question and then an answer to that question.\\n\\nYour contact will then be prompted the same question and if they type the exact same answer (case sensitive), their identity will be verified.": [\n            null,\n            "Poprosimy cię o podanie pytania sprawdzającego i odpowiedzi na nie.\\n\\nTwój kontakt zostanie poproszony później o odpowiedź na to samo pytanie i jeśli udzieli tej samej odpowiedzi (ważna jest wielkość liter), tożsamość zostanie zwerfikowana."\n         ],\n         "What is your security question?": [\n            null,\n            "Jakie jest pytanie bezpieczeństwa?"\n         ],\n         "What is the answer to the security question?": [\n            null,\n            "Jaka jest odpowiedź na pytanie bezpieczeństwa?"\n         ],\n         "Invalid authentication scheme provided": [\n            null,\n            "Niewłaściwy schemat autoryzacji"\n         ],\n         "has gone offline": [\n            null,\n            "wyłączył się"\n         ],\n         "is busy": [\n            null,\n            "zajęty"\n         ],\n         "Your messages are not encrypted anymore": [\n            null,\n            "Twoje wiadomości nie są już szyfrowane"\n         ],\n         "Your messages are now encrypted but your contact\'s identity has not been verified.": [\n            null,\n            "Wiadomości są teraz szyfrowane, ale tożsamość kontaktu nie została zweryfikowana."\n         ],\n         "Your contact\'s identify has been verified.": [\n            null,\n            "Tożsamość kontaktu została zweryfikowana"\n         ],\n         "Your contact has ended encryption on their end, you should do the same.": [\n            null,\n            "Kontakt zakończył sesję szyfrowaną, powinieneś zrobić to samo."\n         ],\n         "Your messages are not encrypted. Click here to enable OTR encryption.": [\n            null,\n            "Twoje wiadomości nie są szyfrowane. Kliknij, aby uruchomić szyfrowanie OTR"\n         ],\n         "Your messages are encrypted, but your contact has not been verified.": [\n            null,\n            "Wiadomości są szyfrowane, ale tożsamość kontaktu nie została zweryfikowana."\n         ],\n         "Your messages are encrypted and your contact verified.": [\n            null,\n            "Wiadomości są szyfrowane i tożsamość kontaktu została zweryfikowana."\n         ],\n         "Your contact has closed their end of the private session, you should do the same": [\n            null,\n            "Kontakt zakończył prywatną rozmowę i ty zrób to samo"\n         ],\n         "Clear all messages": [\n            null,\n            "Wyczyść wszystkie wiadomości"\n         ],\n         "End encrypted conversation": [\n            null,\n            "Zakończ szyfrowaną rozmowę"\n         ],\n         "Insert a smiley": [\n            null,\n            "Wstaw uśmieszek"\n         ],\n         "Refresh encrypted conversation": [\n            null,\n            "Odśwież szyfrowaną rozmowę"\n         ],\n         "Start a call": [\n            null,\n            "Zadzwoń"\n         ],\n         "Start encrypted conversation": [\n            null,\n            "Rozpocznij szyfrowaną rozmowę"\n         ],\n         "Verify with fingerprints": [\n            null,\n            "Zweryfikuj za pomocą odcisków palców"\n         ],\n         "Verify with SMP": [\n            null,\n            "Zweryfikuj za pomocą SMP"\n         ],\n         "What\'s this?": [\n            null,\n            "Co to jest?"\n         ],\n         "Online": [\n            null,\n            "Dostępny"\n         ],\n         "Busy": [\n            null,\n            "Zajęty"\n         ],\n         "Away": [\n            null,\n            "Nieobecny"\n         ],\n         "Offline": [\n            null,\n            "Rozłączony"\n         ],\n         "Log out": [\n            null,\n            "Wyloguj"\n         ],\n         "Contact name": [\n            null,\n            "Nazwa kontaktu"\n         ],\n         "Search": [\n            null,\n            "Szukaj"\n         ],\n         "e.g. user@example.com": [\n            null,\n            "np. user@example.com"\n         ],\n         "Add": [\n            null,\n            "Dodaj"\n         ],\n         "Click to add new chat contacts": [\n            null,\n            "Kliknij aby dodać nowe kontakty"\n         ],\n         "Add a contact": [\n            null,\n            "Dodaj kontakt"\n         ],\n         "No users found": [\n            null,\n            "Nie znaleziono użytkowników"\n         ],\n         "Click to add as a chat contact": [\n            null,\n            "Kliknij aby dodać jako kontakt"\n         ],\n         "Room name": [\n            null,\n            "Nazwa pokoju"\n         ],\n         "Nickname": [\n            null,\n            "Ksywka"\n         ],\n         "Server": [\n            null,\n            "Serwer"\n         ],\n         "Join Room": [\n            null,\n            "Wejdź do pokoju"\n         ],\n         "Show rooms": [\n            null,\n            "Pokaż pokoje"\n         ],\n         "Rooms": [\n            null,\n            "Pokoje"\n         ],\n         "No rooms on %1$s": [\n            null,\n            "Brak jest pokojów na %1$s"\n         ],\n         "Rooms on %1$s": [\n            null,\n            "Pokoje na %1$s"\n         ],\n         "Click to open this room": [\n            null,\n            "Kliknij aby wejść do pokoju"\n         ],\n         "Show more information on this room": [\n            null,\n            "Pokaż więcej informacji o pokoju"\n         ],\n         "Description:": [\n            null,\n            "Opis:"\n         ],\n         "Occupants:": [\n            null,\n            "Uczestnicy:"\n         ],\n         "Features:": [\n            null,\n            "Możliwości:"\n         ],\n         "Requires authentication": [\n            null,\n            "Wymaga autoryzacji"\n         ],\n         "Hidden": [\n            null,\n            "Ukryty"\n         ],\n         "Requires an invitation": [\n            null,\n            "Wymaga zaproszenia"\n         ],\n         "Moderated": [\n            null,\n            "Moderowany"\n         ],\n         "Non-anonymous": [\n            null,\n            "Nieanonimowy"\n         ],\n         "Open room": [\n            null,\n            "Otwarty pokój"\n         ],\n         "Permanent room": [\n            null,\n            "Stały pokój"\n         ],\n         "Public": [\n            null,\n            "Publiczny"\n         ],\n         "Semi-anonymous": [\n            null,\n            "Półanonimowy"\n         ],\n         "Temporary room": [\n            null,\n            "Pokój tymczasowy"\n         ],\n         "Unmoderated": [\n            null,\n            "Niemoderowany"\n         ],\n         "This user is a moderator": [\n            null,\n            "Ten człowiek jest moderatorem"\n         ],\n         "This user can send messages in this room": [\n            null,\n            "Ten człowiek może rozmawiać w niejszym pokoju"\n         ],\n         "This user can NOT send messages in this room": [\n            null,\n            "Ten człowiek nie może rozmawiać w niniejszym pokoju"\n         ],\n         "Invite...": [\n            null,\n            "Zaproś..."\n         ],\n         "Occupants": [\n            null,\n            "Uczestników"\n         ],\n         "You are about to invite %1$s to the chat room \\"%2$s\\". ": [\n            null,\n            "Zamierzasz zaprosić %1$s do pokoju rozmów \\"%2$s\\". "\n         ],\n         "You may optionally include a message, explaining the reason for the invitation.": [\n            null,\n            "Masz opcjonalną możliwość dołączenia wiadomości, która wyjaśni przyczynę zaproszenia."\n         ],\n         "Message": [\n            null,\n            "Wiadomość:"\n         ],\n         "Error: could not execute the command": [\n            null,\n            "Błąd: nie potrafię uruchomić polecenia"\n         ],\n         "Error: the \\"": [\n            null,\n            "Błąd: \\""\n         ],\n         "Change user\'s affiliation to admin": [\n            null,\n            "Przyznaj prawa administratora"\n         ],\n         "Ban user from room": [\n            null,\n            "Zablokuj dostępu do pokoju"\n         ],\n         "Kick user from room": [\n            null,\n            "Wykop z pokoju"\n         ],\n         "Write in 3rd person": [\n            null,\n            "Pisz w trzeciej osobie"\n         ],\n         "Grant membership to a user": [\n            null,\n            "Przyznaj członkowstwo "\n         ],\n         "Remove user\'s ability to post messages": [\n            null,\n            "Zablokuj człowiekowi możliwość rozmowy"\n         ],\n         "Change your nickname": [\n            null,\n            "Zmień ksywkę"\n         ],\n         "Grant moderator role to user": [\n            null,\n            "Przyznaj prawa moderatora"\n         ],\n         "Grant ownership of this room": [\n            null,\n            "Uczyń właścicielem pokoju"\n         ],\n         "Revoke user\'s membership": [\n            null,\n            "Usuń z listy członków"\n         ],\n         "Set room topic": [\n            null,\n            "Ustaw temat pokoju"\n         ],\n         "Allow muted user to post messages": [\n            null,\n            "Pozwól uciszonemu człowiekowi na rozmowę"\n         ],\n         "Save": [\n            null,\n            "Zachowaj"\n         ],\n         "Cancel": [\n            null,\n            "Anuluj"\n         ],\n         "An error occurred while trying to save the form.": [\n            null,\n            "Wystąpił błąd w czasie próby zachowania formularza."\n         ],\n         "This chatroom requires a password": [\n            null,\n            "Pokój rozmów wymaga podania hasła"\n         ],\n         "Password: ": [\n            null,\n            "Hasło:"\n         ],\n         "Submit": [\n            null,\n            "Wyślij"\n         ],\n         "This room is not anonymous": [\n            null,\n            "Pokój nie jest anonimowy"\n         ],\n         "This room now shows unavailable members": [\n            null,\n            "Pokój pokazuje niedostępnych rozmówców"\n         ],\n         "This room does not show unavailable members": [\n            null,\n            "Ten pokój nie wyświetla niedostępnych członków"\n         ],\n         "Non-privacy-related room configuration has changed": [\n            null,\n            "Ustawienia pokoju nie związane z prywatnością zostały zmienione"\n         ],\n         "Room logging is now enabled": [\n            null,\n            "Zostało włączone zapisywanie rozmów w pokoju"\n         ],\n         "Room logging is now disabled": [\n            null,\n            "Zostało wyłączone zapisywanie rozmów w pokoju"\n         ],\n         "This room is now non-anonymous": [\n            null,\n            "Pokój stał się nieanonimowy"\n         ],\n         "This room is now semi-anonymous": [\n            null,\n            "Pokój stał się półanonimowy"\n         ],\n         "This room is now fully-anonymous": [\n            null,\n            "Pokój jest teraz w pełni anonimowy"\n         ],\n         "A new room has been created": [\n            null,\n            "Został utworzony nowy pokój"\n         ],\n         "You have been banned from this room": [\n            null,\n            "Jesteś niemile widziany w tym pokoju"\n         ],\n         "You have been kicked from this room": [\n            null,\n            "Zostałeś wykopany z pokoju"\n         ],\n         "You have been removed from this room because of an affiliation change": [\n            null,\n            "Zostałeś usunięty z pokoju ze względu na zmianę przynależności"\n         ],\n         "You have been removed from this room because the room has changed to members-only and you\'re not a member": [\n            null,\n            "Zostałeś usunięty z pokoju ze względu na to, że pokój zmienił się na wymagający członkowstwa, a ty nie jesteś członkiem"\n         ],\n         "You have been removed from this room because the MUC (Multi-user chat) service is being shut down.": [\n            null,\n            "Zostałeś usunięty z pokoju ze względu na to, że serwis MUC(Multi-user chat) został wyłączony."\n         ],\n         "<strong>%1$s</strong> has been banned": [\n            null,\n            "<strong>%1$s</strong> został zbanowany"\n         ],\n         "<strong>%1$s</strong>\'s nickname has changed": [\n            null,\n            "<strong>%1$s</strong> zmienił ksywkę"\n         ],\n         "<strong>%1$s</strong> has been kicked out": [\n            null,\n            "<strong>%1$s</strong> został wykopany"\n         ],\n         "<strong>%1$s</strong> has been removed because of an affiliation change": [\n            null,\n            "<strong>%1$s</strong> został usunięty z powodu zmiany przynależności"\n         ],\n         "<strong>%1$s</strong> has been removed for not being a member": [\n            null,\n            "<strong>%1$s</strong> został usunięty ze względu na to, że nie jest członkiem"\n         ],\n         "Your nickname has been automatically changed to: <strong>%1$s</strong>": [\n            null,\n            "Twoja ksywka została automatycznie zmieniona na: <strong>%1$s</strong>"\n         ],\n         "Your nickname has been changed to: <strong>%1$s</strong>": [\n            null,\n            "Twoja ksywka została zmieniona na: <strong>%1$s</strong>"\n         ],\n         "The reason given is: \\"": [\n            null,\n            "Podana przyczyna to: \\""\n         ],\n         "You are not on the member list of this room": [\n            null,\n            "Nie jesteś członkiem tego pokoju rozmów"\n         ],\n         "No nickname was specified": [\n            null,\n            "Nie podałeś ksywki"\n         ],\n         "You are not allowed to create new rooms": [\n            null,\n            "Nie masz uprawnień do tworzenia nowych pokojów rozmów"\n         ],\n         "Your nickname doesn\'t conform to this room\'s policies": [\n            null,\n            "Twoja ksywka nie jest zgodna z regulaminem pokoju"\n         ],\n         "Your nickname is already taken": [\n            null,\n            "Twoja ksywka jest już w użyciu"\n         ],\n         "This room does not (yet) exist": [\n            null,\n            "Ten pokój (jeszcze) nie istnieje"\n         ],\n         "This room has reached it\'s maximum number of occupants": [\n            null,\n            "Pokój przekroczył dozwoloną ilość rozmówców"\n         ],\n         "Topic set by %1$s to: %2$s": [\n            null,\n            "Temat ustawiony przez %1$s na: %2$s"\n         ],\n         "%1$s has invited you to join a chat room: %2$s": [\n            null,\n            "%1$s zaprosił(a) cię do wejścia do pokoju rozmów %2$s"\n         ],\n         "%1$s has invited you to join a chat room: %2$s, and left the following reason: \\"%3$s\\"": [\n            null,\n            "%1$s zaprosił cię do pokoju: %2$s, podając następujący powód: \\"%3$s\\""\n         ],\n         "Click to restore this chat": [\n            null,\n            "Kliknij aby powrócić do rozmowy"\n         ],\n         "Minimized": [\n            null,\n            "Zminimalizowany"\n         ],\n         "Click to remove this contact": [\n            null,\n            "Kliknij aby usunąć kontakt"\n         ],\n         "Click to accept this contact request": [\n            null,\n            "Klknij aby zaakceptować życzenie nawiązania kontaktu"\n         ],\n         "Click to decline this contact request": [\n            null,\n            "Kliknij aby odrzucić życzenie nawiązania kontaktu"\n         ],\n         "Click to chat with this contact": [\n            null,\n            "Kliknij aby porozmawiać z kontaktem"\n         ],\n         "Name": [\n            null,\n            "Nazwa"\n         ],\n         "Are you sure you want to remove this contact?": [\n            null,\n            "Czy potwierdzasz zamiar usnunięcia tego kontaktu?"\n         ],\n         "Sorry, there was an error while trying to remove ": [\n            null,\n            "Wystąpił błąd w trakcie próby usunięcia "\n         ],\n         "Are you sure you want to decline this contact request?": [\n            null,\n            "Czy potwierdzasz odrzucenie chęci nawiązania kontaktu?"\n         ],\n         "Sorry, there was an error while trying to add ": [\n            null,\n            "Wystąpił błąd w czasie próby dodania "\n         ],\n         "This client does not allow presence subscriptions": [\n            null,\n            "Klient nie umożliwia subskrybcji obecności"\n         ],\n         "Type to filter": [\n            null,\n            "Zacznij pisać, aby odfiltrować"\n         ],\n         "I am %1$s": [\n            null,\n            "Jestem %1$s"\n         ],\n         "Click here to write a custom status message": [\n            null,\n            "Kliknij aby wpisać nowy status"\n         ],\n         "Click to change your chat status": [\n            null,\n            "Kliknij aby zmienić status rozmowy"\n         ],\n         "Custom status": [\n            null,\n            "Własny status"\n         ],\n         "online": [\n            null,\n            "dostępny"\n         ],\n         "busy": [\n            null,\n            "zajęty"\n         ],\n         "away for long": [\n            null,\n            "dłużej nieobecny"\n         ],\n         "away": [\n            null,\n            "nieobecny"\n         ],\n         "offline": [\n            null,\n            "rozłączony"\n         ],\n         "Your XMPP provider\'s domain name:": [\n            null,\n            "Domena twojego dostawcy XMPP:"\n         ],\n         "Fetch registration form": [\n            null,\n            "Pobierz formularz rejestracyjny"\n         ],\n         "Tip: A list of public XMPP providers is available": [\n            null,\n            "Wskazówka: dostępna jest lista publicznych dostawców XMPP"\n         ],\n         "here": [\n            null,\n            "tutaj"\n         ],\n         "Register": [\n            null,\n            "Zarejestruj"\n         ],\n         "Sorry, the given provider does not support in band account registration. Please try with a different provider.": [\n            null,\n            "Przepraszamy, ale podany dostawca nie obsługuje rejestracji. Spróbuj wskazać innego dostawcę."\n         ],\n         "Requesting a registration form from the XMPP server": [\n            null,\n            "Pobieranie formularza rejestracyjnego z serwera XMPP"\n         ],\n         "Something went wrong while establishing a connection with \\"%1$s\\". Are you sure it exists?": [\n            null,\n            "Coś nie zadziałało przy próbie połączenia z \\"%1$s\\". Jesteś pewien że istnieje?"\n         ],\n         "Now logging you in": [\n            null,\n            "Teraz jesteś logowany"\n         ],\n         "Registered successfully": [\n            null,\n            "Szczęśliwie zarejestrowany"\n         ],\n         "Return": [\n            null,\n            "Powrót"\n         ],\n         "The provider rejected your registration attempt. Please check the values you entered for correctness.": [\n            null,\n            "Dostawca odrzucił twoją próbę rejestracji. Sprawdź proszę poprawność danych które zostały wprowadzone."\n         ],\n         "XMPP Username:": [\n            null,\n            "Nazwa użytkownika XMPP:"\n         ],\n         "Password:": [\n            null,\n            "Hasło:"\n         ],\n         "Click here to log in anonymously": [\n            null,\n            "Kliknij tutaj aby zalogować się anonimowo"\n         ],\n         "Log In": [\n            null,\n            "Zaloguj się"\n         ],\n         "user@server": [\n            null,\n            "user@server"\n         ],\n         "password": [\n            null,\n            "hasło"\n         ],\n         "Sign in": [\n            null,\n            "Zarejestruj się"\n         ],\n         "Toggle chat": [\n            null,\n            "Przełącz rozmowę"\n         ]\n      }\n   }\n}'}),define("text!pt_BR",[],function(){return'{\n   "domain": "converse",\n   "locale_data": {\n      "converse": {\n         "": {\n            "domain": "converse",\n            "plural_forms": "nplurals=2; plural=(n > 1);",\n            "lang": "pt_BR"\n         },\n         " e.g. conversejs.org": [\n            null,\n            ""\n         ],\n         "unencrypted": [\n            null,\n            "não-criptografado"\n         ],\n         "unverified": [\n            null,\n            "não-verificado"\n         ],\n         "verified": [\n            null,\n            "verificado"\n         ],\n         "finished": [\n            null,\n            "finalizado"\n         ],\n         "This contact is busy": [\n            null,\n            "Este contato está ocupado"\n         ],\n         "This contact is online": [\n            null,\n            "Este contato está online"\n         ],\n         "This contact is offline": [\n            null,\n            "Este contato está offline"\n         ],\n         "This contact is unavailable": [\n            null,\n            "Este contato está indisponível"\n         ],\n         "This contact is away for an extended period": [\n            null,\n            "Este contato está ausente por um longo período"\n         ],\n         "This contact is away": [\n            null,\n            "Este contato está ausente"\n         ],\n         "My contacts": [\n            null,\n            "Meus contatos"\n         ],\n         "Pending contacts": [\n            null,\n            "Contados pendentes"\n         ],\n         "Contact requests": [\n            null,\n            "Solicitação de contatos"\n         ],\n         "Ungrouped": [\n            null,\n            ""\n         ],\n         "Contacts": [\n            null,\n            "Contatos"\n         ],\n         "Groups": [\n            null,\n            ""\n         ],\n         "Attempting to reconnect in 5 seconds": [\n            null,\n            ""\n         ],\n         "Error": [\n            null,\n            "Erro"\n         ],\n         "Connecting": [\n            null,\n            "Conectando"\n         ],\n         "Authenticating": [\n            null,\n            "Autenticando"\n         ],\n         "Authentication Failed": [\n            null,\n            "Falha de autenticação"\n         ],\n         "Re-establishing encrypted session": [\n            null,\n            "Reestabelecendo sessão criptografada"\n         ],\n         "Generating private key.": [\n            null,\n            "Gerando chave-privada."\n         ],\n         "Your browser might become unresponsive.": [\n            null,\n            "Seu navegador pode parar de responder."\n         ],\n         "Could not verify this user\'s identify.": [\n            null,\n            "Não foi possível verificar a identidade deste usuário."\n         ],\n         "Minimize this chat box": [\n            null,\n            ""\n         ],\n         "Personal message": [\n            null,\n            "Mensagem pessoal"\n         ],\n         "me": [\n            null,\n            "eu"\n         ],\n         "Show this menu": [\n            null,\n            "Mostrar o menu"\n         ],\n         "Write in the third person": [\n            null,\n            "Escrever em terceira pessoa"\n         ],\n         "Remove messages": [\n            null,\n            "Remover mensagens"\n         ],\n         "Are you sure you want to clear the messages from this chat box?": [\n            null,\n            "Tem certeza que deseja limpar as mensagens dessa caixa?"\n         ],\n         "Your message could not be sent": [\n            null,\n            "Sua mensagem não pode ser enviada"\n         ],\n         "We received an unencrypted message": [\n            null,\n            "Recebemos uma mensagem não-criptografada"\n         ],\n         "We received an unreadable encrypted message": [\n            null,\n            "Recebemos uma mensagem não-criptografada ilegível"\n         ],\n         "Here are the fingerprints, please confirm them with %1$s, outside of this chat.\\n\\nFingerprint for you, %2$s: %3$s\\n\\nFingerprint for %1$s: %4$s\\n\\nIf you have confirmed that the fingerprints match, click OK, otherwise click Cancel.": [\n            null,\n            "Aqui estão as assinaturas digitais, por favor confirme elas com %1$s, fora deste chat.\\n\\nAssinatura para você, %2$s: %3$s\\n\\nAssinatura para %1$s: %4$s\\n\\nSe você tiver confirmado que as assinaturas conferem, clique OK, caso contrário, clique Cancelar."\n         ],\n         "What is your security question?": [\n            null,\n            "Qual é a sua pergunta de segurança?"\n         ],\n         "What is the answer to the security question?": [\n            null,\n            "Qual é a resposta para a pergunta de segurança?"\n         ],\n         "Invalid authentication scheme provided": [\n            null,\n            "Schema de autenticação fornecido é inválido"\n         ],\n         "Your messages are not encrypted anymore": [\n            null,\n            "Suas mensagens não estão mais criptografadas"\n         ],\n         "Your messages are not encrypted. Click here to enable OTR encryption.": [\n            null,\n            "Suas mensagens não estão criptografadas. Clique aqui para habilitar criptografia OTR."\n         ],\n         "End encrypted conversation": [\n            null,\n            "Finalizar conversa criptografada"\n         ],\n         "Insert a smiley": [\n            null,\n            ""\n         ],\n         "Hide the list of occupants": [\n            null,\n            ""\n         ],\n         "Refresh encrypted conversation": [\n            null,\n            "Atualizar conversa criptografada"\n         ],\n         "Start a call": [\n            null,\n            ""\n         ],\n         "Start encrypted conversation": [\n            null,\n            "Iniciar conversa criptografada"\n         ],\n         "Verify with fingerprints": [\n            null,\n            "Verificar com assinatura digital"\n         ],\n         "Verify with SMP": [\n            null,\n            "Verificar com SMP"\n         ],\n         "What\'s this?": [\n            null,\n            "O que é isso?"\n         ],\n         "Online": [\n            null,\n            "Online"\n         ],\n         "Busy": [\n            null,\n            "Ocupado"\n         ],\n         "Away": [\n            null,\n            "Ausente"\n         ],\n         "Offline": [\n            null,\n            "Offline"\n         ],\n         "Contact name": [\n            null,\n            "Nome do contato"\n         ],\n         "Search": [\n            null,\n            "Procurar"\n         ],\n         "e.g. user@example.com": [\n            null,\n            ""\n         ],\n         "Add": [\n            null,\n            "Adicionar"\n         ],\n         "Click to add new chat contacts": [\n            null,\n            "Clique para adicionar novos contatos ao chat"\n         ],\n         "Add a contact": [\n            null,\n            "Adicionar contato"\n         ],\n         "No users found": [\n            null,\n            "Não foram encontrados usuários"\n         ],\n         "Click to add as a chat contact": [\n            null,\n            "Clique para adicionar como um contato do chat"\n         ],\n         "Room name": [\n            null,\n            "Nome da sala"\n         ],\n         "Nickname": [\n            null,\n            "Apelido"\n         ],\n         "Server": [\n            null,\n            "Server"\n         ],\n         "Show rooms": [\n            null,\n            "Mostar salas"\n         ],\n         "Rooms": [\n            null,\n            "Salas"\n         ],\n         "No rooms on %1$s": [\n            null,\n            "Sem salas em %1$s"\n         ],\n         "Rooms on %1$s": [\n            null,\n            "Salas em %1$s"\n         ],\n         "Click to open this room": [\n            null,\n            "CLique para abrir a sala"\n         ],\n         "Show more information on this room": [\n            null,\n            "Mostrar mais informações nessa sala"\n         ],\n         "Description:": [\n            null,\n            "Descrição:"\n         ],\n         "Occupants:": [\n            null,\n            "Ocupantes:"\n         ],\n         "Features:": [\n            null,\n            "Recursos:"\n         ],\n         "Requires authentication": [\n            null,\n            "Requer autenticação"\n         ],\n         "Hidden": [\n            null,\n            "Escondido"\n         ],\n         "Requires an invitation": [\n            null,\n            "Requer um convite"\n         ],\n         "Moderated": [\n            null,\n            "Moderado"\n         ],\n         "Non-anonymous": [\n            null,\n            "Não anônimo"\n         ],\n         "Open room": [\n            null,\n            "Sala aberta"\n         ],\n         "Permanent room": [\n            null,\n            "Sala permanente"\n         ],\n         "Public": [\n            null,\n            "Público"\n         ],\n         "Semi-anonymous": [\n            null,\n            "Semi anônimo"\n         ],\n         "Temporary room": [\n            null,\n            "Sala temporária"\n         ],\n         "Unmoderated": [\n            null,\n            "Sem moderação"\n         ],\n         "This user is a moderator": [\n            null,\n            "Esse usuário é o moderador"\n         ],\n         "This user can send messages in this room": [\n            null,\n            "Esse usuário pode enviar mensagens nessa sala"\n         ],\n         "This user can NOT send messages in this room": [\n            null,\n            "Esse usuário NÃO pode enviar mensagens nessa sala"\n         ],\n         "Invite...": [\n            null,\n            ""\n         ],\n         "You are about to invite %1$s to the chat room \\"%2$s\\". ": [\n            null,\n            ""\n         ],\n         "You may optionally include a message, explaining the reason for the invitation.": [\n            null,\n            ""\n         ],\n         "Message": [\n            null,\n            "Mensagem"\n         ],\n         "Error: could not execute the command": [\n            null,\n            ""\n         ],\n         "Error: the \\"": [\n            null,\n            ""\n         ],\n         "Change user\'s affiliation to admin": [\n            null,\n            ""\n         ],\n         "Change user role to occupant": [\n            null,\n            ""\n         ],\n         "Grant membership to a user": [\n            null,\n            ""\n         ],\n         "Remove user\'s ability to post messages": [\n            null,\n            ""\n         ],\n         "Change your nickname": [\n            null,\n            ""\n         ],\n         "Grant moderator role to user": [\n            null,\n            ""\n         ],\n         "Revoke user\'s membership": [\n            null,\n            ""\n         ],\n         "Allow muted user to post messages": [\n            null,\n            ""\n         ],\n         "Save": [\n            null,\n            "Salvar"\n         ],\n         "Cancel": [\n            null,\n            "Cancelar"\n         ],\n         "An error occurred while trying to save the form.": [\n            null,\n            "Ocorreu um erro enquanto tentava salvar o formulário"\n         ],\n         "This chatroom requires a password": [\n            null,\n            "Esse chat precisa de senha"\n         ],\n         "Password: ": [\n            null,\n            "Senha: "\n         ],\n         "Submit": [\n            null,\n            "Enviar"\n         ],\n         "This room is not anonymous": [\n            null,\n            "Essa sala não é anônima"\n         ],\n         "This room now shows unavailable members": [\n            null,\n            "Agora esta sala mostra membros indisponíveis"\n         ],\n         "This room does not show unavailable members": [\n            null,\n            "Essa sala não mostra membros indisponíveis"\n         ],\n         "Non-privacy-related room configuration has changed": [\n            null,\n            "Configuraçõs não relacionadas à privacidade mudaram"\n         ],\n         "Room logging is now enabled": [\n            null,\n            "O log da sala está ativado"\n         ],\n         "Room logging is now disabled": [\n            null,\n            "O log da sala está desativado"\n         ],\n         "This room is now non-anonymous": [\n            null,\n            "Esse sala é não anônima"\n         ],\n         "This room is now semi-anonymous": [\n            null,\n            "Essa sala agora é semi anônima"\n         ],\n         "This room is now fully-anonymous": [\n            null,\n            "Essa sala agora é totalmente anônima"\n         ],\n         "A new room has been created": [\n            null,\n            "Uma nova sala foi criada"\n         ],\n         "You have been banned from this room": [\n            null,\n            "Você foi banido dessa sala"\n         ],\n         "You have been kicked from this room": [\n            null,\n            "Você foi expulso dessa sala"\n         ],\n         "You have been removed from this room because of an affiliation change": [\n            null,\n            "Você foi removido da sala devido a uma mudança de associação"\n         ],\n         "You have been removed from this room because the room has changed to members-only and you\'re not a member": [\n            null,\n            "Você foi removido da sala porque ela foi mudada para somente membrose você não é um membro"\n         ],\n         "You have been removed from this room because the MUC (Multi-user chat) service is being shut down.": [\n            null,\n            "Você foi removido da sala devido a MUC (Multi-user chat)o serviço está sendo desligado"\n         ],\n         "<strong>%1$s</strong> has been banned": [\n            null,\n            "<strong>%1$s</strong> foi banido"\n         ],\n         "<strong>%1$s</strong> has been kicked out": [\n            null,\n            "<strong>%1$s</strong> foi expulso"\n         ],\n         "<strong>%1$s</strong> has been removed because of an affiliation change": [\n            null,\n            "<srtong>%1$s</strong> foi removido por causa de troca de associação"\n         ],\n         "<strong>%1$s</strong> has been removed for not being a member": [\n            null,\n            "<strong>%1$s</strong> foi removido por não ser um membro"\n         ],\n         "The reason given is: \\"": [\n            null,\n            ""\n         ],\n         "You are not on the member list of this room": [\n            null,\n            "Você não é membro dessa sala"\n         ],\n         "No nickname was specified": [\n            null,\n            "Você não escolheu um apelido "\n         ],\n         "You are not allowed to create new rooms": [\n            null,\n            "Você não tem permitição de criar novas salas"\n         ],\n         "Your nickname doesn\'t conform to this room\'s policies": [\n            null,\n            "Seu apelido não está de acordo com as regras da sala"\n         ],\n         "Your nickname is already taken": [\n            null,\n            "Seu apelido já foi escolhido"\n         ],\n         "This room does not (yet) exist": [\n            null,\n            "A sala não existe (ainda)"\n         ],\n         "This room has reached it\'s maximum number of occupants": [\n            null,\n            "A sala atingiu o número máximo de ocupantes"\n         ],\n         "Topic set by %1$s to: %2$s": [\n            null,\n            "Topico definido por %1$s para: %2$s"\n         ],\n         "%1$s has invited you to join a chat room: %2$s": [\n            null,\n            ""\n         ],\n         "%1$s has invited you to join a chat room: %2$s, and left the following reason: \\"%3$s\\"": [\n            null,\n            ""\n         ],\n         "Minimized": [\n            null,\n            "Minimizado"\n         ],\n         "Click to remove this contact": [\n            null,\n            "Clique para remover o contato"\n         ],\n         "Click to chat with this contact": [\n            null,\n            "Clique para conversar com o contato"\n         ],\n         "Name": [\n            null,\n            ""\n         ],\n         "Sorry, there was an error while trying to remove ": [\n            null,\n            ""\n         ],\n         "Sorry, there was an error while trying to add ": [\n            null,\n            ""\n         ],\n         "This client does not allow presence subscriptions": [\n            null,\n            ""\n         ],\n         "Type to filter": [\n            null,\n            ""\n         ],\n         "I am %1$s": [\n            null,\n            "Estou %1$s"\n         ],\n         "Click here to write a custom status message": [\n            null,\n            "Clique aqui para customizar a mensagem de status"\n         ],\n         "Click to change your chat status": [\n            null,\n            "Clique para mudar seu status no chat"\n         ],\n         "Custom status": [\n            null,\n            "Status customizado"\n         ],\n         "online": [\n            null,\n            "online"\n         ],\n         "busy": [\n            null,\n            "ocupado"\n         ],\n         "away for long": [\n            null,\n            "ausente a bastante tempo"\n         ],\n         "away": [\n            null,\n            "ausente"\n         ],\n         "Your XMPP provider\'s domain name:": [\n            null,\n            ""\n         ],\n         "Fetch registration form": [\n            null,\n            ""\n         ],\n         "Tip: A list of public XMPP providers is available": [\n            null,\n            ""\n         ],\n         "here": [\n            null,\n            ""\n         ],\n         "Register": [\n            null,\n            ""\n         ],\n         "Sorry, the given provider does not support in band account registration. Please try with a different provider.": [\n            null,\n            ""\n         ],\n         "Requesting a registration form from the XMPP server": [\n            null,\n            ""\n         ],\n         "Something went wrong while establishing a connection with \\"%1$s\\". Are you sure it exists?": [\n            null,\n            ""\n         ],\n         "Now logging you in": [\n            null,\n            ""\n         ],\n         "Registered successfully": [\n            null,\n            ""\n         ],\n         "Return": [\n            null,\n            ""\n         ],\n         "The provider rejected your registration attempt. Please check the values you entered for correctness.": [\n            null,\n            ""\n         ],\n         "Password:": [\n            null,\n            "Senha:"\n         ],\n         "Log In": [\n            null,\n            "Entrar"\n         ],\n         "user@server": [\n            null,\n            ""\n         ],\n         "Sign in": [\n            null,\n            "Conectar-se"\n         ],\n         "Toggle chat": [\n            null,\n            "Alternar bate-papo"\n         ]\n      }\n   }\n}'}),define("text!ru",[],function(){return'{\n   "domain": "converse",\n   "locale_data": {\n      "converse": {\n         "": {\n            "domain": "converse",\n            "lang": "ru"\n         },\n         " e.g. conversejs.org": [\n            null,\n            ""\n         ],\n         "unencrypted": [\n            null,\n            "не зашифровано"\n         ],\n         "unverified": [\n            null,\n            "непроверено"\n         ],\n         "verified": [\n            null,\n            "проверено"\n         ],\n         "finished": [\n            null,\n            "закончено"\n         ],\n         "This contact is busy": [\n            null,\n            "Занят"\n         ],\n         "This contact is online": [\n            null,\n            "В сети"\n         ],\n         "This contact is offline": [\n            null,\n            "Не в сети"\n         ],\n         "This contact is unavailable": [\n            null,\n            "Не доступен"\n         ],\n         "This contact is away for an extended period": [\n            null,\n            "На долго отошёл"\n         ],\n         "This contact is away": [\n            null,\n            "Отошёл"\n         ],\n         "My contacts": [\n            null,\n            "Контакты"\n         ],\n         "Pending contacts": [\n            null,\n            "Собеседники ожидающие авторизации"\n         ],\n         "Contact requests": [\n            null,\n            "Запросы на авторизацию"\n         ],\n         "Ungrouped": [\n            null,\n            ""\n         ],\n         "Contacts": [\n            null,\n            "Контакты"\n         ],\n         "Groups": [\n            null,\n            ""\n         ],\n         "Attempting to reconnect in 5 seconds": [\n            null,\n            ""\n         ],\n         "Error": [\n            null,\n            "Ошибка"\n         ],\n         "Connecting": [\n            null,\n            "Соединение"\n         ],\n         "Authenticating": [\n            null,\n            "Авторизация"\n         ],\n         "Authentication Failed": [\n            null,\n            "Не удалось авторизоваться"\n         ],\n         "Re-establishing encrypted session": [\n            null,\n            ""\n         ],\n         "Generating private key.": [\n            null,\n            ""\n         ],\n         "Your browser might become unresponsive.": [\n            null,\n            ""\n         ],\n         "Authentication request from %1$s\\n\\nYour chat contact is attempting to verify your identity, by asking you the question below.\\n\\n%2$s": [\n            null,\n            ""\n         ],\n         "Could not verify this user\'s identify.": [\n            null,\n            ""\n         ],\n         "Exchanging private key with contact.": [\n            null,\n            ""\n         ],\n         "Minimize this chat box": [\n            null,\n            ""\n         ],\n         "Personal message": [\n            null,\n            "Введите сообщение"\n         ],\n         "me": [\n            null,\n            "Я"\n         ],\n         "is typing": [\n            null,\n            ""\n         ],\n         "has stopped typing": [\n            null,\n            ""\n         ],\n         "Show this menu": [\n            null,\n            "Показать это меню"\n         ],\n         "Write in the third person": [\n            null,\n            ""\n         ],\n         "Remove messages": [\n            null,\n            "Удалить сообщения"\n         ],\n         "Are you sure you want to clear the messages from this chat box?": [\n            null,\n            ""\n         ],\n         "Your message could not be sent": [\n            null,\n            "Ваше сообщение не послано"\n         ],\n         "We received an unencrypted message": [\n            null,\n            ""\n         ],\n         "We received an unreadable encrypted message": [\n            null,\n            ""\n         ],\n         "Here are the fingerprints, please confirm them with %1$s, outside of this chat.\\n\\nFingerprint for you, %2$s: %3$s\\n\\nFingerprint for %1$s: %4$s\\n\\nIf you have confirmed that the fingerprints match, click OK, otherwise click Cancel.": [\n            null,\n            ""\n         ],\n         "You will be prompted to provide a security question and then an answer to that question.\\n\\nYour contact will then be prompted the same question and if they type the exact same answer (case sensitive), their identity will be verified.": [\n            null,\n            ""\n         ],\n         "What is your security question?": [\n            null,\n            ""\n         ],\n         "What is the answer to the security question?": [\n            null,\n            ""\n         ],\n         "Invalid authentication scheme provided": [\n            null,\n            ""\n         ],\n         "Your messages are not encrypted anymore": [\n            null,\n            "Ваши сообщения больше не шифруются"\n         ],\n         "Your contact has ended encryption on their end, you should do the same.": [\n            null,\n            ""\n         ],\n         "Your messages are not encrypted. Click here to enable OTR encryption.": [\n            null,\n            "Ваши сообщения не шифруются. Нажмите здесь чтобы настроить шифрование."\n         ],\n         "Your contact has closed their end of the private session, you should do the same": [\n            null,\n            ""\n         ],\n         "End encrypted conversation": [\n            null,\n            ""\n         ],\n         "Insert a smiley": [\n            null,\n            ""\n         ],\n         "Hide the list of occupants": [\n            null,\n            ""\n         ],\n         "Refresh encrypted conversation": [\n            null,\n            ""\n         ],\n         "Start a call": [\n            null,\n            ""\n         ],\n         "Start encrypted conversation": [\n            null,\n            ""\n         ],\n         "Verify with fingerprints": [\n            null,\n            ""\n         ],\n         "Verify with SMP": [\n            null,\n            ""\n         ],\n         "What\'s this?": [\n            null,\n            "Что это?"\n         ],\n         "Online": [\n            null,\n            "В сети"\n         ],\n         "Busy": [\n            null,\n            "Занят"\n         ],\n         "Away": [\n            null,\n            "Отошёл"\n         ],\n         "Offline": [\n            null,\n            "Не в сети"\n         ],\n         "Contact name": [\n            null,\n            "Имя контакта"\n         ],\n         "Search": [\n            null,\n            "Поиск"\n         ],\n         "e.g. user@example.com": [\n            null,\n            ""\n         ],\n         "Add": [\n            null,\n            "Добавить"\n         ],\n         "Click to add new chat contacts": [\n            null,\n            "Добавить новую конференцию"\n         ],\n         "Add a contact": [\n            null,\n            "Добавть контакт"\n         ],\n         "No users found": [\n            null,\n            "Пользователи не найдены"\n         ],\n         "Click to add as a chat contact": [\n            null,\n            "Добавить контакт"\n         ],\n         "Room name": [\n            null,\n            "Имя конференции"\n         ],\n         "Nickname": [\n            null,\n            "Псевдоним"\n         ],\n         "Server": [\n            null,\n            "Сервер"\n         ],\n         "Show rooms": [\n            null,\n            "Обновить"\n         ],\n         "Rooms": [\n            null,\n            "Конфер."\n         ],\n         "No rooms on %1$s": [\n            null,\n            "Нет доступных конференций %1$s"\n         ],\n         "Rooms on %1$s": [\n            null,\n            "Конференции %1$s:"\n         ],\n         "Click to open this room": [\n            null,\n            "Зайти в конференцию"\n         ],\n         "Show more information on this room": [\n            null,\n            "Показать больше информации об этой конференции"\n         ],\n         "Description:": [\n            null,\n            "Описание:"\n         ],\n         "Occupants:": [\n            null,\n            "Участники:"\n         ],\n         "Features:": [\n            null,\n            "Свойства:"\n         ],\n         "Requires authentication": [\n            null,\n            "Требуется авторизация"\n         ],\n         "Hidden": [\n            null,\n            "Скрыто"\n         ],\n         "Requires an invitation": [\n            null,\n            "Требуется приглашение"\n         ],\n         "Moderated": [\n            null,\n            "Модерируемая"\n         ],\n         "Non-anonymous": [\n            null,\n            "Не анонимная"\n         ],\n         "Open room": [\n            null,\n            "Открыть конференцию"\n         ],\n         "Permanent room": [\n            null,\n            "Перманентная конференция"\n         ],\n         "Public": [\n            null,\n            "Публичный"\n         ],\n         "Semi-anonymous": [\n            null,\n            "Частично анонимная"\n         ],\n         "Temporary room": [\n            null,\n            "Временная конференция"\n         ],\n         "Unmoderated": [\n            null,\n            "Немодерируемая"\n         ],\n         "This user is a moderator": [\n            null,\n            "Модератор"\n         ],\n         "This user can send messages in this room": [\n            null,\n            "Собеседник"\n         ],\n         "This user can NOT send messages in this room": [\n            null,\n            "Пользователь не может посылать сообщения в эту комнату"\n         ],\n         "Invite...": [\n            null,\n            ""\n         ],\n         "You are about to invite %1$s to the chat room \\"%2$s\\". ": [\n            null,\n            ""\n         ],\n         "You may optionally include a message, explaining the reason for the invitation.": [\n            null,\n            ""\n         ],\n         "Message": [\n            null,\n            "Сообщение"\n         ],\n         "Error: could not execute the command": [\n            null,\n            ""\n         ],\n         "Error: the \\"": [\n            null,\n            ""\n         ],\n         "Change user\'s affiliation to admin": [\n            null,\n            ""\n         ],\n         "Change user role to occupant": [\n            null,\n            ""\n         ],\n         "Write in 3rd person": [\n            null,\n            ""\n         ],\n         "Grant membership to a user": [\n            null,\n            ""\n         ],\n         "Remove user\'s ability to post messages": [\n            null,\n            ""\n         ],\n         "Change your nickname": [\n            null,\n            ""\n         ],\n         "Grant moderator role to user": [\n            null,\n            ""\n         ],\n         "Revoke user\'s membership": [\n            null,\n            ""\n         ],\n         "Allow muted user to post messages": [\n            null,\n            ""\n         ],\n         "Save": [\n            null,\n            "Сохранить"\n         ],\n         "Cancel": [\n            null,\n            "Отменить"\n         ],\n         "An error occurred while trying to save the form.": [\n            null,\n            "При сохранение формы произошла ошибка."\n         ],\n         "This chatroom requires a password": [\n            null,\n            "Для доступа в конфер. необходим пароль."\n         ],\n         "Password: ": [\n            null,\n            "Пароль: "\n         ],\n         "Submit": [\n            null,\n            "Отправить"\n         ],\n         "This room is not anonymous": [\n            null,\n            "Эта комната не анонимная"\n         ],\n         "This room now shows unavailable members": [\n            null,\n            "Эта комната показывает доступных собеседников"\n         ],\n         "This room does not show unavailable members": [\n            null,\n            "Эта комната не показывает недоступных собеседников"\n         ],\n         "Non-privacy-related room configuration has changed": [\n            null,\n            ""\n         ],\n         "Room logging is now enabled": [\n            null,\n            ""\n         ],\n         "Room logging is now disabled": [\n            null,\n            ""\n         ],\n         "This room is now non-anonymous": [\n            null,\n            "Эта комната не анонимная"\n         ],\n         "This room is now semi-anonymous": [\n            null,\n            "Эта комната частично анонимная"\n         ],\n         "This room is now fully-anonymous": [\n            null,\n            "Эта комната стала полностью анонимной"\n         ],\n         "A new room has been created": [\n            null,\n            "Новая комната была создана"\n         ],\n         "You have been banned from this room": [\n            null,\n            "Вам запрещено подключатся к этой конференции"\n         ],\n         "You have been kicked from this room": [\n            null,\n            "Вам запрещено подключатся к этой конференции"\n         ],\n         "You have been removed from this room because of an affiliation change": [\n            null,\n            "<strong>%1$s</strong> удалён потому что изменились права"\n         ],\n         "You have been removed from this room because the room has changed to members-only and you\'re not a member": [\n            null,\n            "Вы отключены от этой конференции потому что режим изменился: только-участники"\n         ],\n         "You have been removed from this room because the MUC (Multi-user chat) service is being shut down.": [\n            null,\n            "Вы отключены от этой конференции потому что сервись конференций выключен."\n         ],\n         "<strong>%1$s</strong> has been banned": [\n            null,\n            "<strong>%1$s</strong> забанен"\n         ],\n         "<strong>%1$s</strong> has been kicked out": [\n            null,\n            "<strong>%1$s</strong> выдворен"\n         ],\n         "<strong>%1$s</strong> has been removed because of an affiliation change": [\n            null,\n            "<strong>%1$s</strong> has been removed because of an affiliation change"\n         ],\n         "<strong>%1$s</strong> has been removed for not being a member": [\n            null,\n            "<strong>%1$s</strong> удалён потому что не участник"\n         ],\n         "The reason given is: \\"": [\n            null,\n            ""\n         ],\n         "You are not on the member list of this room": [\n            null,\n            "Вас нет в списке этой конференции"\n         ],\n         "No nickname was specified": [\n            null,\n            "Вы не указали псевдоним"\n         ],\n         "You are not allowed to create new rooms": [\n            null,\n            "Вы не имеете права создавать конфер."\n         ],\n         "Your nickname doesn\'t conform to this room\'s policies": [\n            null,\n            "Псевдоним не согласуется с правилами конфер."\n         ],\n         "Your nickname is already taken": [\n            null,\n            "Ваш ник уже используется другим пользователем"\n         ],\n         "This room does not (yet) exist": [\n            null,\n            "Эта комната не существует"\n         ],\n         "This room has reached it\'s maximum number of occupants": [\n            null,\n            "Конференция достигла максимального количества участников"\n         ],\n         "Topic set by %1$s to: %2$s": [\n            null,\n            "Тема %2$s устатновлена %1$s"\n         ],\n         "%1$s has invited you to join a chat room: %2$s": [\n            null,\n            ""\n         ],\n         "%1$s has invited you to join a chat room: %2$s, and left the following reason: \\"%3$s\\"": [\n            null,\n            ""\n         ],\n         "Minimized": [\n            null,\n            ""\n         ],\n         "Click to remove this contact": [\n            null,\n            "Удалить контакт"\n         ],\n         "Click to chat with this contact": [\n            null,\n            "Начать общение"\n         ],\n         "Name": [\n            null,\n            ""\n         ],\n         "Sorry, there was an error while trying to remove ": [\n            null,\n            ""\n         ],\n         "Sorry, there was an error while trying to add ": [\n            null,\n            ""\n         ],\n         "This client does not allow presence subscriptions": [\n            null,\n            ""\n         ],\n         "Type to filter": [\n            null,\n            ""\n         ],\n         "I am %1$s": [\n            null,\n            "%1$s"\n         ],\n         "Click here to write a custom status message": [\n            null,\n            "Редактировать произвольный статус"\n         ],\n         "Click to change your chat status": [\n            null,\n            "Изменить ваш статус"\n         ],\n         "Custom status": [\n            null,\n            "Произвольный статус"\n         ],\n         "online": [\n            null,\n            "на связи"\n         ],\n         "busy": [\n            null,\n            "занят"\n         ],\n         "away for long": [\n            null,\n            "отошёл на долго"\n         ],\n         "away": [\n            null,\n            "отошёл"\n         ],\n         "Your XMPP provider\'s domain name:": [\n            null,\n            ""\n         ],\n         "Fetch registration form": [\n            null,\n            ""\n         ],\n         "Tip: A list of public XMPP providers is available": [\n            null,\n            ""\n         ],\n         "here": [\n            null,\n            ""\n         ],\n         "Register": [\n            null,\n            ""\n         ],\n         "Sorry, the given provider does not support in band account registration. Please try with a different provider.": [\n            null,\n            ""\n         ],\n         "Requesting a registration form from the XMPP server": [\n            null,\n            ""\n         ],\n         "Something went wrong while establishing a connection with \\"%1$s\\". Are you sure it exists?": [\n            null,\n            ""\n         ],\n         "Now logging you in": [\n            null,\n            ""\n         ],\n         "Registered successfully": [\n            null,\n            ""\n         ],\n         "Return": [\n            null,\n            ""\n         ],\n         "The provider rejected your registration attempt. Please check the values you entered for correctness.": [\n            null,\n            ""\n         ],\n         "Password:": [\n            null,\n            "Пароль:"\n         ],\n         "Log In": [\n            null,\n            "Войти"\n         ],\n         "user@server": [\n            null,\n            ""\n         ],\n         "Sign in": [\n            null,\n            "Подписать"\n         ],\n         "Toggle chat": [\n            null,\n            ""\n         ]\n      }\n   }\n}'}),define("text!uk",[],function(){return'{\n   "domain": "converse",\n   "locale_data": {\n      "converse": {\n         "": {\n            "domain": "converse",\n            "plural_forms": "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);",\n            "lang": "uk"\n         },\n         " e.g. conversejs.org": [\n            null,\n            " напр. conversejs.org"\n         ],\n         "unencrypted": [\n            null,\n            "некриптовано"\n         ],\n         "unverified": [\n            null,\n            "неперевірено"\n         ],\n         "verified": [\n            null,\n            "перевірено"\n         ],\n         "finished": [\n            null,\n            "завершено"\n         ],\n         "This contact is busy": [\n            null,\n            "Цей контакт зайнятий"\n         ],\n         "This contact is online": [\n            null,\n            "Цей контакт на зв\'язку"\n         ],\n         "This contact is offline": [\n            null,\n            "Цей контакт поза мережею"\n         ],\n         "This contact is unavailable": [\n            null,\n            "Цей контакт недоступний"\n         ],\n         "This contact is away for an extended period": [\n            null,\n            "Цей контакт відсутній тривалий час"\n         ],\n         "This contact is away": [\n            null,\n            "Цей контакт відсутній"\n         ],\n         "Click to hide these contacts": [\n            null,\n            "Клацніть, щоб приховати ці контакти"\n         ],\n         "My contacts": [\n            null,\n            "Мої контакти"\n         ],\n         "Pending contacts": [\n            null,\n            "Контакти в очікуванні"\n         ],\n         "Contact requests": [\n            null,\n            "Запити контакту"\n         ],\n         "Ungrouped": [\n            null,\n            "Негруповані"\n         ],\n         "Contacts": [\n            null,\n            "Контакти"\n         ],\n         "Groups": [\n            null,\n            "Групи"\n         ],\n         "Attempting to reconnect in 5 seconds": [\n            null,\n            ""\n         ],\n         "Error": [\n            null,\n            "Помилка"\n         ],\n         "Connecting": [\n            null,\n            "Під\'єднуюсь"\n         ],\n         "Authenticating": [\n            null,\n            "Автентикуюсь"\n         ],\n         "Authentication Failed": [\n            null,\n            "Автентикація невдала"\n         ],\n         "Re-establishing encrypted session": [\n            null,\n            "Перевстановлюю криптований сеанс"\n         ],\n         "Generating private key.": [\n            null,\n            "Генерація приватного ключа."\n         ],\n         "Your browser might become unresponsive.": [\n            null,\n            "Ваш браузер може підвиснути."\n         ],\n         "Authentication request from %1$s\\n\\nYour chat contact is attempting to verify your identity, by asking you the question below.\\n\\n%2$s": [\n            null,\n            "Запит автентикації від %1$s\\n\\nВаш контакт в чаті намагається встановити Вашу особу і просить відповісти на питання нижче.\\n\\n%2$s"\n         ],\n         "Could not verify this user\'s identify.": [\n            null,\n            "Не можу перевірити автентичність цього користувача."\n         ],\n         "Exchanging private key with contact.": [\n            null,\n            "Обмін приватним ключем з контактом."\n         ],\n         "Minimize this chat box": [\n            null,\n            ""\n         ],\n         "Personal message": [\n            null,\n            "Персональна вісточка"\n         ],\n         "Are you sure you want to clear the messages from this room?": [\n            null,\n            "Ви впевнені, що хочете очистити повідомлення з цієї кімнати?"\n         ],\n         "me": [\n            null,\n            "я"\n         ],\n         "is typing": [\n            null,\n            "друкує"\n         ],\n         "has stopped typing": [\n            null,\n            "припинив друкувати"\n         ],\n         "has gone away": [\n            null,\n            "пішов геть"\n         ],\n         "Show this menu": [\n            null,\n            "Показати це меню"\n         ],\n         "Write in the third person": [\n            null,\n            "Писати від третьої особи"\n         ],\n         "Remove messages": [\n            null,\n            "Видалити повідомлення"\n         ],\n         "Are you sure you want to clear the messages from this chat box?": [\n            null,\n            "Ви впевнені, що хочете очистити повідомлення з цього вікна чату?"\n         ],\n         "Your message could not be sent": [\n            null,\n            "Ваше повідомлення не може бути надіслане"\n         ],\n         "We received an unencrypted message": [\n            null,\n            "Ми отримали некриптоване повідомлення"\n         ],\n         "We received an unreadable encrypted message": [\n            null,\n            "Ми отримали нечитабельне криптоване повідомлення"\n         ],\n         "Here are the fingerprints, please confirm them with %1$s, outside of this chat.\\n\\nFingerprint for you, %2$s: %3$s\\n\\nFingerprint for %1$s: %4$s\\n\\nIf you have confirmed that the fingerprints match, click OK, otherwise click Cancel.": [\n            null,\n            "Ось відбитки, будь-ласка, підтвердіть їх з %1$s, за межами цього чату.\\n\\nВідбиток для Вас, %2$s: %3$s\\n\\nВідбиток для %1$s: %4$s\\n\\nЯкщо Ви підтверджуєте відповідність відбитка, клацніть Гаразд, інакше клацніть Відміна."\n         ],\n         "You will be prompted to provide a security question and then an answer to that question.\\n\\nYour contact will then be prompted the same question and if they type the exact same answer (case sensitive), their identity will be verified.": [\n            null,\n            "Вас запитають таємне питання і відповідь на нього.\\n\\nПотім Вашого контакта запитають те саме питання, і якщо вони введуть ту саму відповідь (враховуючи регістр), їх особи будуть перевірені."\n         ],\n         "What is your security question?": [\n            null,\n            "Яке Ваше таємне питання?"\n         ],\n         "What is the answer to the security question?": [\n            null,\n            "Яка відповідь на таємне питання?"\n         ],\n         "Invalid authentication scheme provided": [\n            null,\n            "Надана некоректна схема автентикації"\n         ],\n         "has gone offline": [\n            null,\n            "тепер поза мережею"\n         ],\n         "is busy": [\n            null,\n            "зайнятий"\n         ],\n         "Your messages are not encrypted anymore": [\n            null,\n            "Ваші повідомлення більше не криптуються"\n         ],\n         "Your messages are now encrypted but your contact\'s identity has not been verified.": [\n            null,\n            "Ваші повідомлення вже криптуються, але особа Вашого контакту не перевірена."\n         ],\n         "Your contact\'s identify has been verified.": [\n            null,\n            "Особу Вашого контакту перевірено."\n         ],\n         "Your contact has ended encryption on their end, you should do the same.": [\n            null,\n            "Ваш контакт припинив криптування зі свого боку, Вам слід зробити те саме."\n         ],\n         "Your messages are not encrypted. Click here to enable OTR encryption.": [\n            null,\n            "Ваші повідомлення не криптуються. Клацніть тут, щоб увімкнути OTR-криптування."\n         ],\n         "Your messages are encrypted, but your contact has not been verified.": [\n            null,\n            "Ваші повідомлення криптуються, але Ваш контакт не був перевірений."\n         ],\n         "Your messages are encrypted and your contact verified.": [\n            null,\n            "Ваші повідомлення криптуються і Ваш контакт перевірено."\n         ],\n         "Your contact has closed their end of the private session, you should do the same": [\n            null,\n            "Ваш контакт закрив зі свого боку приватну сесію, Вам слід зробити те ж саме"\n         ],\n         "Clear all messages": [\n            null,\n            "Очистити всі повідомлення"\n         ],\n         "End encrypted conversation": [\n            null,\n            "Завершити криптовану розмову"\n         ],\n         "Insert a smiley": [\n            null,\n            ""\n         ],\n         "Refresh encrypted conversation": [\n            null,\n            "Оновити криптовану розмову"\n         ],\n         "Start a call": [\n            null,\n            "Почати виклик"\n         ],\n         "Start encrypted conversation": [\n            null,\n            "Почати криптовану розмову"\n         ],\n         "Verify with fingerprints": [\n            null,\n            "Перевірити за відбитками"\n         ],\n         "Verify with SMP": [\n            null,\n            "Перевірити за SMP"\n         ],\n         "What\'s this?": [\n            null,\n            "Що це?"\n         ],\n         "Online": [\n            null,\n            "На зв\'язку"\n         ],\n         "Busy": [\n            null,\n            "Зайнятий"\n         ],\n         "Away": [\n            null,\n            "Далеко"\n         ],\n         "Offline": [\n            null,\n            "Поза мережею"\n         ],\n         "Log out": [\n            null,\n            "Вийти"\n         ],\n         "Contact name": [\n            null,\n            "Назва контакту"\n         ],\n         "Search": [\n            null,\n            "Пошук"\n         ],\n         "e.g. user@example.com": [\n            null,\n            ""\n         ],\n         "Add": [\n            null,\n            "Додати"\n         ],\n         "Click to add new chat contacts": [\n            null,\n            "Клацніть, щоб додати нові контакти до чату"\n         ],\n         "Add a contact": [\n            null,\n            "Додати контакт"\n         ],\n         "No users found": [\n            null,\n            "Жодного користувача не знайдено"\n         ],\n         "Click to add as a chat contact": [\n            null,\n            "Клацніть, щоб додати як чат-контакт"\n         ],\n         "Room name": [\n            null,\n            "Назва кімнати"\n         ],\n         "Nickname": [\n            null,\n            "Прізвисько"\n         ],\n         "Server": [\n            null,\n            "Сервер"\n         ],\n         "Join Room": [\n            null,\n            "Приєднатися до кімнати"\n         ],\n         "Show rooms": [\n            null,\n            "Показати кімнати"\n         ],\n         "Rooms": [\n            null,\n            "Кімнати"\n         ],\n         "No rooms on %1$s": [\n            null,\n            "Жодної кімнати на %1$s"\n         ],\n         "Rooms on %1$s": [\n            null,\n            "Кімнати на %1$s"\n         ],\n         "Click to open this room": [\n            null,\n            "Клацніть, щоб увійти в цю кімнату"\n         ],\n         "Show more information on this room": [\n            null,\n            "Показати більше інформації про цю кімату"\n         ],\n         "Description:": [\n            null,\n            "Опис:"\n         ],\n         "Occupants:": [\n            null,\n            "Присутні:"\n         ],\n         "Features:": [\n            null,\n            "Особливості:"\n         ],\n         "Requires authentication": [\n            null,\n            "Вимагає автентикації"\n         ],\n         "Hidden": [\n            null,\n            "Прихована"\n         ],\n         "Requires an invitation": [\n            null,\n            "Вимагає запрошення"\n         ],\n         "Moderated": [\n            null,\n            "Модерована"\n         ],\n         "Non-anonymous": [\n            null,\n            "Не-анонімні"\n         ],\n         "Open room": [\n            null,\n            "Увійти в кімнату"\n         ],\n         "Permanent room": [\n            null,\n            "Постійна кімната"\n         ],\n         "Public": [\n            null,\n            "Публічна"\n         ],\n         "Semi-anonymous": [\n            null,\n            "Напів-анонімна"\n         ],\n         "Temporary room": [\n            null,\n            "Тимчасова кімната"\n         ],\n         "Unmoderated": [\n            null,\n            "Немодерована"\n         ],\n         "This user is a moderator": [\n            null,\n            "Цей користувач є модератором"\n         ],\n         "This user can send messages in this room": [\n            null,\n            "Цей користувач може слати повідомлення в цій кімнаті"\n         ],\n         "This user can NOT send messages in this room": [\n            null,\n            "Цей користувач НЕ МОЖЕ слати повідомлення в цій кімнаті"\n         ],\n         "Invite...": [\n            null,\n            "Запросіть..."\n         ],\n         "Occupants": [\n            null,\n            "Учасники"\n         ],\n         "You are about to invite %1$s to the chat room \\"%2$s\\". ": [\n            null,\n            "Ви запрошуєте %1$s до чату \\"%2$s\\". "\n         ],\n         "You may optionally include a message, explaining the reason for the invitation.": [\n            null,\n            "Ви можете опціонально додати повідомлення, щоб пояснити причину запрошення."\n         ],\n         "Message": [\n            null,\n            "Повідомлення"\n         ],\n         "Error: could not execute the command": [\n            null,\n            "Помилка: Не можу виконати команду"\n         ],\n         "Error: the \\"": [\n            null,\n            ""\n         ],\n         "Change user\'s affiliation to admin": [\n            null,\n            "Призначити користувача адміністратором"\n         ],\n         "Ban user from room": [\n            null,\n            "Заблокувати і викинути з кімнати"\n         ],\n         "Kick user from room": [\n            null,\n            "Викинути з кімнати"\n         ],\n         "Write in 3rd person": [\n            null,\n            "Писати в 3-й особі"\n         ],\n         "Grant membership to a user": [\n            null,\n            "Надати членство користувачу"\n         ],\n         "Remove user\'s ability to post messages": [\n            null,\n            "Забрати можливість слати повідомлення"\n         ],\n         "Change your nickname": [\n            null,\n            "Змінити Ваше прізвисько"\n         ],\n         "Grant moderator role to user": [\n            null,\n            "Надати права модератора"\n         ],\n         "Grant ownership of this room": [\n            null,\n            "Передати у власність цю кімнату"\n         ],\n         "Revoke user\'s membership": [\n            null,\n            "Забрати членство в користувача"\n         ],\n         "Set room topic": [\n            null,\n            "Встановити тему кімнати"\n         ],\n         "Allow muted user to post messages": [\n            null,\n            "Дозволити безголосому користувачу слати повідомлення"\n         ],\n         "Save": [\n            null,\n            "Зберегти"\n         ],\n         "Cancel": [\n            null,\n            "Відміна"\n         ],\n         "An error occurred while trying to save the form.": [\n            null,\n            "Трапилася помилка при спробі зберегти форму."\n         ],\n         "This chatroom requires a password": [\n            null,\n            "Ця кімната вимагає пароль"\n         ],\n         "Password: ": [\n            null,\n            "Пароль:"\n         ],\n         "Submit": [\n            null,\n            "Надіслати"\n         ],\n         "This room is not anonymous": [\n            null,\n            "Ця кімната не є анонімною"\n         ],\n         "This room now shows unavailable members": [\n            null,\n            "Ця кімната вже показує недоступних учасників"\n         ],\n         "This room does not show unavailable members": [\n            null,\n            "Ця кімната не показує недоступних учасників"\n         ],\n         "Non-privacy-related room configuration has changed": [\n            null,\n            "Змінено конфігурацію кімнати, не повязану з приватністю"\n         ],\n         "Room logging is now enabled": [\n            null,\n            "Журналювання кімнати тепер ввімкнено"\n         ],\n         "Room logging is now disabled": [\n            null,\n            "Журналювання кімнати тепер вимкнено"\n         ],\n         "This room is now non-anonymous": [\n            null,\n            "Ця кімната тепер не-анонімна"\n         ],\n         "This room is now semi-anonymous": [\n            null,\n            "Ця кімната тепер напів-анонімна"\n         ],\n         "This room is now fully-anonymous": [\n            null,\n            "Ця кімната тепер повністю анонімна"\n         ],\n         "A new room has been created": [\n            null,\n            "Створено нову кімнату"\n         ],\n         "You have been banned from this room": [\n            null,\n            "Вам заблокували доступ до цієї кімнати"\n         ],\n         "You have been kicked from this room": [\n            null,\n            "Вас викинули з цієї кімнати"\n         ],\n         "You have been removed from this room because of an affiliation change": [\n            null,\n            "Вас видалено з кімнати у зв\'язку зі змінами власності кімнати"\n         ],\n         "You have been removed from this room because the room has changed to members-only and you\'re not a member": [\n            null,\n            "Вас видалено з цієї кімнати, оскільки вона тепер вимагає членства, а Ви ним не є її членом"\n         ],\n         "You have been removed from this room because the MUC (Multi-user chat) service is being shut down.": [\n            null,\n            "Вас видалено з цієї кімнати, тому що MUC (Чат-сервіс) припиняє роботу."\n         ],\n         "<strong>%1$s</strong> has been banned": [\n            null,\n            "<strong>%1$s</strong> заблоковано"\n         ],\n         "<strong>%1$s</strong>\'s nickname has changed": [\n            null,\n            "Прізвисько <strong>%1$s</strong> змінено"\n         ],\n         "<strong>%1$s</strong> has been kicked out": [\n            null,\n            "<strong>%1$s</strong> було викинуто звідси"\n         ],\n         "<strong>%1$s</strong> has been removed because of an affiliation change": [\n            null,\n            "<strong>%1$s</strong> було видалено через зміни власності кімнати"\n         ],\n         "<strong>%1$s</strong> has been removed for not being a member": [\n            null,\n            "<strong>%1$s</strong> було виделано через відсутність членства"\n         ],\n         "Your nickname has been automatically changed to: <strong>%1$s</strong>": [\n            null,\n            "Ваше прізвисько було автоматично змінене на: <strong>%1$s</strong>"\n         ],\n         "Your nickname has been changed to: <strong>%1$s</strong>": [\n            null,\n            "Ваше прізвисько було змінене на: <strong>%1$s</strong>"\n         ],\n         "The reason given is: \\"": [\n            null,\n            "Причиною вказано: \\""\n         ],\n         "You are not on the member list of this room": [\n            null,\n            "Ви не є у списку членів цієї кімнати"\n         ],\n         "No nickname was specified": [\n            null,\n            "Не вказане прізвисько"\n         ],\n         "You are not allowed to create new rooms": [\n            null,\n            "Вам не дозволено створювати нові кімнати"\n         ],\n         "Your nickname doesn\'t conform to this room\'s policies": [\n            null,\n            "Ваше прізвисько не відповідає політиці кімнати"\n         ],\n         "Your nickname is already taken": [\n            null,\n            "Таке прізвисько вже зайняте"\n         ],\n         "This room does not (yet) exist": [\n            null,\n            "Такої кімнати (поки) не існує"\n         ],\n         "This room has reached it\'s maximum number of occupants": [\n            null,\n            "Ця кімната досягнула максимуму учасників"\n         ],\n         "Topic set by %1$s to: %2$s": [\n            null,\n            "Тема встановлена %1$s: %2$s"\n         ],\n         "%1$s has invited you to join a chat room: %2$s": [\n            null,\n            "%1$s запрошує вас приєднатись до чату: %2$s"\n         ],\n         "%1$s has invited you to join a chat room: %2$s, and left the following reason: \\"%3$s\\"": [\n            null,\n            "%1$s запрошує Вас приєднатись до чату: %2$s, аргументує ось як: \\"%3$s\\""\n         ],\n         "Click to restore this chat": [\n            null,\n            "Клацніть, щоб відновити цей чат"\n         ],\n         "Minimized": [\n            null,\n            "Мінімізовано"\n         ],\n         "Click to remove this contact": [\n            null,\n            "Клацніть, щоб видалити цей контакт"\n         ],\n         "Click to accept this contact request": [\n            null,\n            "Клацніть, щоб прийняти цей запит контакту"\n         ],\n         "Click to decline this contact request": [\n            null,\n            "Клацніть, щоб відхилити цей запит контакту"\n         ],\n         "Click to chat with this contact": [\n            null,\n            "Клацніть, щоб почати розмову з цим контактом"\n         ],\n         "Name": [\n            null,\n            ""\n         ],\n         "Are you sure you want to remove this contact?": [\n            null,\n            "Ви впевнені, що хочете видалити цей контакт?"\n         ],\n         "Sorry, there was an error while trying to remove ": [\n            null,\n            ""\n         ],\n         "Are you sure you want to decline this contact request?": [\n            null,\n            "Ви впевнені, що хочете відхилити цей запит контакту?"\n         ],\n         "Sorry, there was an error while trying to add ": [\n            null,\n            ""\n         ],\n         "This client does not allow presence subscriptions": [\n            null,\n            ""\n         ],\n         "Type to filter": [\n            null,\n            "Друкуйте для фільтру"\n         ],\n         "I am %1$s": [\n            null,\n            "Я %1$s"\n         ],\n         "Click here to write a custom status message": [\n            null,\n            "Клацніть тут, щоб створити власний статус"\n         ],\n         "Click to change your chat status": [\n            null,\n            "Клацніть, щоб змінити статус в чаті"\n         ],\n         "Custom status": [\n            null,\n            "Власний статус"\n         ],\n         "online": [\n            null,\n            "на зв\'язку"\n         ],\n         "busy": [\n            null,\n            "зайнятий"\n         ],\n         "away for long": [\n            null,\n            "давно відсутній"\n         ],\n         "away": [\n            null,\n            "відсутній"\n         ],\n         "Your XMPP provider\'s domain name:": [\n            null,\n            "Домен Вашого провайдера XMPP:"\n         ],\n         "Fetch registration form": [\n            null,\n            "Отримати форму реєстрації"\n         ],\n         "Tip: A list of public XMPP providers is available": [\n            null,\n            "Порада: доступний перелік публічних XMPP-провайдерів"\n         ],\n         "here": [\n            null,\n            "тут"\n         ],\n         "Register": [\n            null,\n            "Реєстрація"\n         ],\n         "Sorry, the given provider does not support in band account registration. Please try with a different provider.": [\n            null,\n            "Вибачте, вказаний провайдер не підтримує реєстрації онлайн. Спробуйте іншого провайдера."\n         ],\n         "Requesting a registration form from the XMPP server": [\n            null,\n            "Запитую форму реєстрації з XMPP сервера"\n         ],\n         "Something went wrong while establishing a connection with \\"%1$s\\". Are you sure it exists?": [\n            null,\n            "Щось пішло не так при встановленні зв\'язку з \\"%1$s\\". Ви впевнені, що такий існує?"\n         ],\n         "Now logging you in": [\n            null,\n            "Входимо"\n         ],\n         "Registered successfully": [\n            null,\n            "Успішно зареєстровано"\n         ],\n         "Return": [\n            null,\n            "Вернутися"\n         ],\n         "XMPP Username:": [\n            null,\n            "XMPP адреса:"\n         ],\n         "Password:": [\n            null,\n            "Пароль:"\n         ],\n         "Log In": [\n            null,\n            "Ввійти"\n         ],\n         "user@server": [\n            null,\n            ""\n         ],\n         "Sign in": [\n            null,\n            "Вступити"\n         ],\n         "Toggle chat": [\n            null,\n            "Включити чат"\n         ]\n      }\n   }\n}'}),define("text!zh",[],function(){return'{\n   "domain": "converse",\n   "locale_data": {\n      "converse": {\n         "": {\n            "domain": "converse",\n            "lang": "zh"\n         },\n         " e.g. conversejs.org": [\n            null,\n            ""\n         ],\n         "unencrypted": [\n            null,\n            "未加密"\n         ],\n         "unverified": [\n            null,\n            "未验证"\n         ],\n         "verified": [\n            null,\n            "已验证"\n         ],\n         "finished": [\n            null,\n            "结束了"\n         ],\n         "This contact is busy": [\n            null,\n            "对方忙碌中"\n         ],\n         "This contact is online": [\n            null,\n            "对方在线中"\n         ],\n         "This contact is offline": [\n            null,\n            "对方已下线"\n         ],\n         "This contact is unavailable": [\n            null,\n            "对方免打扰"\n         ],\n         "This contact is away for an extended period": [\n            null,\n            "对方暂时离开"\n         ],\n         "This contact is away": [\n            null,\n            "对方离开"\n         ],\n         "My contacts": [\n            null,\n            "我的好友列表"\n         ],\n         "Pending contacts": [\n            null,\n            "保留中的联系人"\n         ],\n         "Contact requests": [\n            null,\n            "来自好友的请求"\n         ],\n         "Ungrouped": [\n            null,\n            ""\n         ],\n         "Contacts": [\n            null,\n            "联系人"\n         ],\n         "Groups": [\n            null,\n            ""\n         ],\n         "Attempting to reconnect in 5 seconds": [\n            null,\n            ""\n         ],\n         "Error": [\n            null,\n            "错误"\n         ],\n         "Connecting": [\n            null,\n            "连接中"\n         ],\n         "Authenticating": [\n            null,\n            "验证中"\n         ],\n         "Authentication Failed": [\n            null,\n            "验证失败"\n         ],\n         "Re-establishing encrypted session": [\n            null,\n            "重新建立加密会话"\n         ],\n         "Generating private key.": [\n            null,\n            "正在生成私钥"\n         ],\n         "Your browser might become unresponsive.": [\n            null,\n            "您的浏览器可能会暂时无响应"\n         ],\n         "Could not verify this user\'s identify.": [\n            null,\n            "无法验证对方信息。"\n         ],\n         "Minimize this chat box": [\n            null,\n            ""\n         ],\n         "Personal message": [\n            null,\n            "私信"\n         ],\n         "me": [\n            null,\n            "我"\n         ],\n         "is typing": [\n            null,\n            ""\n         ],\n         "has stopped typing": [\n            null,\n            ""\n         ],\n         "Show this menu": [\n            null,\n            "显示此项菜单"\n         ],\n         "Write in the third person": [\n            null,\n            "以第三者身份写"\n         ],\n         "Remove messages": [\n            null,\n            "移除消息"\n         ],\n         "Are you sure you want to clear the messages from this chat box?": [\n            null,\n            "你确定清除此次的聊天记录吗？"\n         ],\n         "Your message could not be sent": [\n            null,\n            "您的消息无法送出"\n         ],\n         "We received an unencrypted message": [\n            null,\n            "我们收到了一条未加密的信息"\n         ],\n         "We received an unreadable encrypted message": [\n            null,\n            "我们收到一条无法读取的信息"\n         ],\n         "Here are the fingerprints, please confirm them with %1$s, outside of this chat.\\n\\nFingerprint for you, %2$s: %3$s\\n\\nFingerprint for %1$s: %4$s\\n\\nIf you have confirmed that the fingerprints match, click OK, otherwise click Cancel.": [\n            null,\n            "这里是指纹。请与 %1$s 确认。\\n\\n您的 %2$s 指纹: %3$s\\n\\n%1$s 的指纹: %4$s\\n\\n如果确认符合，请点击OK，否则点击取消"\n         ],\n         "What is your security question?": [\n            null,\n            "您的安全问题是?"\n         ],\n         "What is the answer to the security question?": [\n            null,\n            "此安全问题的答案是?"\n         ],\n         "Invalid authentication scheme provided": [\n            null,\n            "非法的认证方式"\n         ],\n         "Your messages are not encrypted anymore": [\n            null,\n            "您的消息将不再被加密"\n         ],\n         "Your messages are not encrypted. Click here to enable OTR encryption.": [\n            null,\n            "您的消息未加密。点击这里来启用OTR加密"\n         ],\n         "End encrypted conversation": [\n            null,\n            "结束加密的会话"\n         ],\n         "Insert a smiley": [\n            null,\n            ""\n         ],\n         "Hide the list of occupants": [\n            null,\n            ""\n         ],\n         "Refresh encrypted conversation": [\n            null,\n            "刷新加密的会话"\n         ],\n         "Start a call": [\n            null,\n            ""\n         ],\n         "Start encrypted conversation": [\n            null,\n            "开始加密的会话"\n         ],\n         "Verify with fingerprints": [\n            null,\n            "验证指纹"\n         ],\n         "Verify with SMP": [\n            null,\n            "验证SMP"\n         ],\n         "What\'s this?": [\n            null,\n            "这是什么?"\n         ],\n         "Online": [\n            null,\n            "在线"\n         ],\n         "Busy": [\n            null,\n            "忙碌中"\n         ],\n         "Away": [\n            null,\n            "离开"\n         ],\n         "Offline": [\n            null,\n            "离线"\n         ],\n         "Contact name": [\n            null,\n            "联系人名称"\n         ],\n         "Search": [\n            null,\n            "搜索"\n         ],\n         "e.g. user@example.com": [\n            null,\n            ""\n         ],\n         "Add": [\n            null,\n            "添加"\n         ],\n         "Click to add new chat contacts": [\n            null,\n            "点击添加新联系人"\n         ],\n         "Add a contact": [\n            null,\n            "添加联系人"\n         ],\n         "No users found": [\n            null,\n            "未找到用户"\n         ],\n         "Click to add as a chat contact": [\n            null,\n            "点击添加为好友"\n         ],\n         "Room name": [\n            null,\n            "聊天室名称"\n         ],\n         "Nickname": [\n            null,\n            "昵称"\n         ],\n         "Server": [\n            null,\n            "服务器"\n         ],\n         "Show rooms": [\n            null,\n            "显示所有聊天室"\n         ],\n         "Rooms": [\n            null,\n            "聊天室"\n         ],\n         "No rooms on %1$s": [\n            null,\n            "%1$s 上没有聊天室"\n         ],\n         "Rooms on %1$s": [\n            null,\n            "%1$s 上的聊天室"\n         ],\n         "Click to open this room": [\n            null,\n            "打开聊天室"\n         ],\n         "Show more information on this room": [\n            null,\n            "显示次聊天室的更多信息"\n         ],\n         "Description:": [\n            null,\n            "描述: "\n         ],\n         "Occupants:": [\n            null,\n            "成员:"\n         ],\n         "Features:": [\n            null,\n            "特性:"\n         ],\n         "Requires authentication": [\n            null,\n            "需要验证"\n         ],\n         "Hidden": [\n            null,\n            "隐藏的"\n         ],\n         "Requires an invitation": [\n            null,\n            "需要被邀请"\n         ],\n         "Moderated": [\n            null,\n            "发言受限"\n         ],\n         "Non-anonymous": [\n            null,\n            "非匿名"\n         ],\n         "Open room": [\n            null,\n            "打开聊天室"\n         ],\n         "Permanent room": [\n            null,\n            "永久聊天室"\n         ],\n         "Public": [\n            null,\n            "公开的"\n         ],\n         "Semi-anonymous": [\n            null,\n            "半匿名"\n         ],\n         "Temporary room": [\n            null,\n            "临时聊天室"\n         ],\n         "Unmoderated": [\n            null,\n            "无发言限制"\n         ],\n         "This user is a moderator": [\n            null,\n            "此用户是主持人"\n         ],\n         "This user can send messages in this room": [\n            null,\n            "此用户在这房间里可发消息"\n         ],\n         "This user can NOT send messages in this room": [\n            null,\n            "此用户不可在此房间发消息"\n         ],\n         "Invite...": [\n            null,\n            ""\n         ],\n         "You are about to invite %1$s to the chat room \\"%2$s\\". ": [\n            null,\n            ""\n         ],\n         "You may optionally include a message, explaining the reason for the invitation.": [\n            null,\n            ""\n         ],\n         "Message": [\n            null,\n            "信息"\n         ],\n         "Error: could not execute the command": [\n            null,\n            ""\n         ],\n         "Error: the \\"": [\n            null,\n            ""\n         ],\n         "Change user\'s affiliation to admin": [\n            null,\n            ""\n         ],\n         "Change user role to occupant": [\n            null,\n            ""\n         ],\n         "Grant membership to a user": [\n            null,\n            ""\n         ],\n         "Remove user\'s ability to post messages": [\n            null,\n            ""\n         ],\n         "Change your nickname": [\n            null,\n            ""\n         ],\n         "Grant moderator role to user": [\n            null,\n            ""\n         ],\n         "Revoke user\'s membership": [\n            null,\n            ""\n         ],\n         "Allow muted user to post messages": [\n            null,\n            ""\n         ],\n         "Save": [\n            null,\n            "保存"\n         ],\n         "Cancel": [\n            null,\n            "取消"\n         ],\n         "An error occurred while trying to save the form.": [\n            null,\n            "保存表单是出错。"\n         ],\n         "This chatroom requires a password": [\n            null,\n            "此聊天室需要密码"\n         ],\n         "Password: ": [\n            null,\n            "密码:"\n         ],\n         "Submit": [\n            null,\n            "发送"\n         ],\n         "This room is not anonymous": [\n            null,\n            "此为非匿名聊天室"\n         ],\n         "This room now shows unavailable members": [\n            null,\n            "此聊天室显示不可用用户"\n         ],\n         "This room does not show unavailable members": [\n            null,\n            "此聊天室不显示不可用用户"\n         ],\n         "Non-privacy-related room configuration has changed": [\n            null,\n            "此聊天室设置(非私密性)已改变"\n         ],\n         "Room logging is now enabled": [\n            null,\n            "聊天室聊天记录已启用"\n         ],\n         "Room logging is now disabled": [\n            null,\n            "聊天室聊天记录已禁用"\n         ],\n         "This room is now non-anonymous": [\n            null,\n            "此聊天室非匿名"\n         ],\n         "This room is now semi-anonymous": [\n            null,\n            "此聊天室半匿名"\n         ],\n         "This room is now fully-anonymous": [\n            null,\n            "此聊天室完全匿名"\n         ],\n         "A new room has been created": [\n            null,\n            "新聊天室已创建"\n         ],\n         "You have been banned from this room": [\n            null,\n            "您已被此聊天室禁止入内"\n         ],\n         "You have been kicked from this room": [\n            null,\n            "您已被踢出次房间"\n         ],\n         "You have been removed from this room because of an affiliation change": [\n            null,\n            "由于关系变化，您已被移除此房间"\n         ],\n         "You have been removed from this room because the room has changed to members-only and you\'re not a member": [\n            null,\n            "您已被移除此房间因为此房间更改为只允许成员加入，而您非成员"\n         ],\n         "You have been removed from this room because the MUC (Multi-user chat) service is being shut down.": [\n            null,\n            "由于服务不可用，您已被移除此房间。"\n         ],\n         "<strong>%1$s</strong> has been banned": [\n            null,\n            "<strong>%1$s</strong> 已被禁止"\n         ],\n         "<strong>%1$s</strong> has been kicked out": [\n            null,\n            "<strong>%1$s</strong> 已被踢出"\n         ],\n         "<strong>%1$s</strong> has been removed because of an affiliation change": [\n            null,\n            "由于关系解除、<strong>%1$s</strong> 已被移除"\n         ],\n         "<strong>%1$s</strong> has been removed for not being a member": [\n            null,\n            "由于不是成员、<strong>%1$s</strong> 已被移除"\n         ],\n         "The reason given is: \\"": [\n            null,\n            ""\n         ],\n         "You are not on the member list of this room": [\n            null,\n            "您并非此房间成员"\n         ],\n         "No nickname was specified": [\n            null,\n            "未指定昵称"\n         ],\n         "You are not allowed to create new rooms": [\n            null,\n            "您可此创建新房间了"\n         ],\n         "Your nickname doesn\'t conform to this room\'s policies": [\n            null,\n            "您的昵称不符合此房间标准"\n         ],\n         "Your nickname is already taken": [\n            null,\n            "您的昵称已被占用"\n         ],\n         "This room does not (yet) exist": [\n            null,\n            "此房间不存在"\n         ],\n         "This room has reached it\'s maximum number of occupants": [\n            null,\n            "此房间人数已达上线"\n         ],\n         "Topic set by %1$s to: %2$s": [\n            null,\n            "%1$s 设置话题为: %2$s"\n         ],\n         "%1$s has invited you to join a chat room: %2$s": [\n            null,\n            ""\n         ],\n         "%1$s has invited you to join a chat room: %2$s, and left the following reason: \\"%3$s\\"": [\n            null,\n            ""\n         ],\n         "Minimized": [\n            null,\n            "最小化的"\n         ],\n         "Click to remove this contact": [\n            null,\n            "点击移除联系人"\n         ],\n         "Click to chat with this contact": [\n            null,\n            "点击与对方交谈"\n         ],\n         "Name": [\n            null,\n            ""\n         ],\n         "Sorry, there was an error while trying to remove ": [\n            null,\n            ""\n         ],\n         "Sorry, there was an error while trying to add ": [\n            null,\n            ""\n         ],\n         "This client does not allow presence subscriptions": [\n            null,\n            ""\n         ],\n         "Type to filter": [\n            null,\n            ""\n         ],\n         "I am %1$s": [\n            null,\n            "我现在%1$s"\n         ],\n         "Click here to write a custom status message": [\n            null,\n            "点击这里，填写状态信息"\n         ],\n         "Click to change your chat status": [\n            null,\n            "点击这里改变聊天状态"\n         ],\n         "Custom status": [\n            null,\n            "DIY状态"\n         ],\n         "online": [\n            null,\n            "在线"\n         ],\n         "busy": [\n            null,\n            "忙碌"\n         ],\n         "away for long": [\n            null,\n            "长时间离开"\n         ],\n         "away": [\n            null,\n            "离开"\n         ],\n         "Your XMPP provider\'s domain name:": [\n            null,\n            ""\n         ],\n         "Fetch registration form": [\n            null,\n            ""\n         ],\n         "Tip: A list of public XMPP providers is available": [\n            null,\n            ""\n         ],\n         "here": [\n            null,\n            ""\n         ],\n         "Register": [\n            null,\n            ""\n         ],\n         "Sorry, the given provider does not support in band account registration. Please try with a different provider.": [\n            null,\n            ""\n         ],\n         "Requesting a registration form from the XMPP server": [\n            null,\n            ""\n         ],\n         "Something went wrong while establishing a connection with \\"%1$s\\". Are you sure it exists?": [\n            null,\n            ""\n         ],\n         "Now logging you in": [\n            null,\n            ""\n         ],\n         "Registered successfully": [\n            null,\n            ""\n         ],\n         "Return": [\n            null,\n            ""\n         ],\n         "The provider rejected your registration attempt. Please check the values you entered for correctness.": [\n            null,\n            ""\n         ],\n         "Password:": [\n            null,\n            "密码:"\n         ],\n         "Log In": [\n            null,\n            "登录"\n         ],\n         "user@server": [\n            null,\n            ""\n         ],\n         "Sign in": [\n            null,\n            "登录"\n         ],\n         "Toggle chat": [\n            null,\n            "折叠聊天窗口"\n         ]\n      }\n   }\n}'}),function(e,t){define("locales",["jquery","jed","text!af","text!de","text!en","text!es","text!fr","text!he","text!hu","text!id","text!it","text!ja","text!nb","text!nl","text!pl","text!pt_BR","text!ru","text!uk","text!zh"],function(t,n){return e.locales={af:arguments[2],de:arguments[3],en:arguments[4],es:arguments[5],fr:arguments[6],he:arguments[7],hu:arguments[8],id:arguments[9],it:arguments[10],ja:arguments[11],nb:arguments[12],nl:arguments[13],pl:arguments[14],"pt-br":arguments[15],ru:arguments[16],uk:arguments[17],zh:arguments[18]},e.locales})}(this),function(e,t){typeof define=="function"&&define.amd?define("utils",["jquery","underscore","converse-templates","locales"],t):e.utils=t(jQuery,_,templates)}(this,function(e,t,n,r){"use strict";var i={"text-private":"password","text-single":"text",fixed:"label","boolean":"checkbox",hidden:"hidden","jid-multi":"textarea","list-single":"dropdown","list-multi":"dropdown"};e.expr[":"].emptyVal=function(e){return e.value===""},e.fn.hasScrollBar=function(){return e.contains(document,this.get(0))?this.parent().height()<this.get(0).scrollHeight?!0:!1:!1},e.fn.addHyperlinks=function(){return this.length>0&&this.each(function(t,n){var r=e(n).html(),i=r.match(/\b(https?:\/\/|www\.|https?:\/\/www\.)[^\s<]{2,200}\b/g);if(i)for(t=0;t<i.length;t++){var s=i[t].indexOf("http://")===0||i[t].indexOf("https://")===0?"":"http://",o=encodeURI(decodeURI(i[t])).replace(/[!'()]/g,escape).replace(/\*/g,"%2A");r=r.replace(i[t],"<a target='_blank' href='"+s+o+"'>"+i[t]+"</a>")}e(n).html(r)}),this},e.fn.addEmoticons=function(t){return t&&this.length>0&&this.each(function(t,n){var r=e(n).html();r=r.replace(/&gt;:\)/g,'<span class="emoticon icon-evil"></span>'),r=r.replace(/:\)/g,'<span class="emoticon icon-smiley"></span>'),r=r.replace(/:\-\)/g,'<span class="emoticon icon-smiley"></span>'),r=r.replace(/;\)/g,'<span class="emoticon icon-wink"></span>'),r=r.replace(/;\-\)/g,'<span class="emoticon icon-wink"></span>'),r=r.replace(/:D/g,'<span class="emoticon icon-grin"></span>'),r=r.replace(/:\-D/g,'<span class="emoticon icon-grin"></span>'),r=r.replace(/:P/g,'<span class="emoticon icon-tongue"></span>'),r=r.replace(/:\-P/g,'<span class="emoticon icon-tongue"></span>'),r=r.replace(/:p/g,'<span class="emoticon icon-tongue"></span>'),r=r.replace(/:\-p/g,'<span class="emoticon icon-tongue"></span>'),r=r.replace(/8\)/g,'<span class="emoticon icon-cool"></span>'),r=r.replace(/:S/g,'<span class="emoticon icon-confused"></span>'),r=r.replace(/:\\/g,'<span class="emoticon icon-wondering"></span>'),r=r.replace(/:\/ /g,'<span class="emoticon icon-wondering"></span>'),r=r.replace(/&gt;:\(/g,'<span class="emoticon icon-angry"></span>'),r=r.replace(/:\(/g,'<span class="emoticon icon-sad"></span>'),r=r.replace(/:\-\(/g,'<span class="emoticon icon-sad"></span>'),r=r.replace(/:O/g,'<span class="emoticon icon-shocked"></span>'),r=r.replace(/:\-O/g,'<span class="emoticon icon-shocked"></span>'),r=r.replace(/\=\-O/g,'<span class="emoticon icon-shocked"></span>'),r=r.replace(/\(\^.\^\)b/g,'<span class="emoticon icon-thumbs-up"></span>'),r=r.replace(/&lt;3/g,'<span class="emoticon icon-heart"></span>'),e(n).html(r)}),this};var s={__:function(t){typeof this.i18n=="undefined"&&(this.i18n=r.en),typeof this.i18n=="string"&&(this.i18n=e.parseJSON(this.i18n)),typeof this.jed=="undefined"&&(this.jed=new Jed(this.i18n));var n=this.jed.translate(t);return arguments.length>1?n.fetch.apply(n,[].slice.call(arguments,1)):n.fetch()},___:function(e){return e},webForm2xForm:function(t){var r=e(t),i;if(r.is("[type=checkbox]"))i=r.is(":checked")&&1||0;else if(r.is("textarea")){i=[];var s=r.val().split("\n");for(var o=0;o<s.length;o++){var u=e.trim(s[o]);if(u==="")continue;i.push(u)}}else i=r.val();return e(n.field({name:r.attr("name"),value:i}))[0]},xForm2webForm:function(r,s){var o=[],u,a,f,l,c;if(r.attr("type")==="list-single"||r.attr("type")==="list-multi"){c=[],f=r.children("value");for(u=0;u<f.length;u++)c.push(e(f[u]).text());a=r.children("option");for(u=0;u<a.length;u++)l=e(a[u]).find("value").text(),o.push(n.select_option({value:l,label:e(a[u]).attr("label"),selected:c.indexOf(l)>=0,required:r.find("required").length}));return n.form_select({name:r.attr("var"),label:r.attr("label"),options:o.join(""),multiple:r.attr("type")==="list-multi",required:r.find("required").length})}if(r.attr("type")==="fixed")return e('<p class="form-help">').text(r.find("value").text());if(r.attr("type")==="jid-multi")return n.form_textarea({name:r.attr("var"),label:r.attr("label")||"",value:r.find("value").text(),required:r.find("required").length});if(r.attr("type")==="boolean")return n.form_checkbox({name:r.attr("var"),type:i[r.attr("type")],label:r.attr("label")||"",checked:r.find("value").text()==="1"&&'checked="1"'||"",required:r.find("required").length});if(r.attr("type")&&r.attr("var")==="username")return n.form_username({domain:" @"+this.domain,name:r.attr("var"),type:i[r.attr("type")],label:r.attr("label")||"",value:r.find("value").text(),required:r.find("required").length});if(r.attr("type"))return n.form_input({name:r.attr("var"),type:i[r.attr("type")],label:r.attr("label")||"",value:r.find("value").text(),required:r.find("required").length});if(r.attr("var")==="ocr")return t.reduce(t.map(r.find("uri"),e.proxy(function(e){return n.form_captcha({label:this.$field.attr("label"),name:this.$field.attr("var"),data:this.$stanza.find('data[cid="'+e.textContent.replace(/^cid:/,"")+'"]').text(),type:e.getAttribute("type"),required:this.$field.find("required").length})},{$stanza:s,$field:r})),function(e,t){return e+t},"")}};return s}),function(e){typeof define=="function"&&define.amd?define("jquery.browser",["jquery"],function(t){return e(t)}):typeof module=="object"&&typeof module.exports=="object"?module.exports=e(require("jquery")):e(window.jQuery)}(function(e){"use strict";function t(e){e===undefined&&(e=window.navigator.userAgent),e=e.toLowerCase();var t=/(edge)\/([\w.]+)/.exec(e)||/(opr)[\/]([\w.]+)/.exec(e)||/(chrome)[ \/]([\w.]+)/.exec(e)||/(version)(applewebkit)[ \/]([\w.]+).*(safari)[ \/]([\w.]+)/.exec(e)||/(webkit)[ \/]([\w.]+).*(version)[ \/]([\w.]+).*(safari)[ \/]([\w.]+)/.exec(e)||/(webkit)[ \/]([\w.]+)/.exec(e)||/(opera)(?:.*version|)[ \/]([\w.]+)/.exec(e)||/(msie) ([\w.]+)/.exec(e)||e.indexOf("trident")>=0&&/(rv)(?::| )([\w.]+)/.exec(e)||e.indexOf("compatible")<0&&/(mozilla)(?:.*? rv:([\w.]+)|)/.exec(e)||[],n=/(ipad)/.exec(e)||/(ipod)/.exec(e)||/(iphone)/.exec(e)||/(kindle)/.exec(e)||/(silk)/.exec(e)||/(android)/.exec(e)||/(windows phone)/.exec(e)||/(win)/.exec(e)||/(mac)/.exec(e)||/(linux)/.exec(e)||/(cros)/.exec(e)||/(playbook)/.exec(e)||/(bb)/.exec(e)||/(blackberry)/.exec(e)||[],r={},i={browser:t[5]||t[3]||t[1]||"",version:t[2]||t[4]||"0",versionNumber:t[4]||t[2]||"0",platform:n[0]||""};i.browser&&(r[i.browser]=!0,r.version=i.version,r.versionNumber=parseInt(i.versionNumber,10)),i.platform&&(r[i.platform]=!0);if(r.android||r.bb||r.blackberry||r.ipad||r.iphone||r.ipod||r.kindle||r.playbook||r.silk||r["windows phone"])r.mobile=!0;if(r.cros||r.mac||r.linux||r.win)r.desktop=!0;if(r.chrome||r.opr||r.safari)r.webkit=!0;if(r.rv||r.edge){var s="msie";i.browser=s,r[s]=!0}if(r.safari&&r.blackberry){var o="blackberry";i.browser=o,r[o]=!0}if(r.safari&&r.playbook){var u="playbook";i.browser=u,r[u]=!0}if(r.bb){var a="blackberry";i.browser=a,r[a]=!0}if(r.opr){var f="opera";i.browser=f,r[f]=!0}if(r.safari&&r.android){var l="android";i.browser=l,r[l]=!0}if(r.safari&&r.kindle){var c="kindle";i.browser=c,r[c]=!0}if(r.safari&&r.silk){var h="silk";i.browser=h,r[h]=!0}return r.name=i.browser,r.platform=i.platform,r}return window.jQBrowser=t(window.navigator.userAgent),window.jQBrowser.uaMatch=t,e&&(e.browser=window.jQBrowser),window.jQBrowser});var CryptoJS=CryptoJS||function(e,t){var n={},r=n.lib={},i=r.Base=function(){function e(){}return{extend:function(t){e.prototype=this;var n=new e;return t&&n.mixIn(t),n.hasOwnProperty("init")||(n.init=function(){n.$super.init.apply(this,arguments)}),n.init.prototype=n,n.$super=this,n},create:function(){var e=this.extend();return e.init.apply(e,arguments),e},init:function(){},mixIn:function(e){for(var t in e)e.hasOwnProperty(t)&&(this[t]=e[t]);e.hasOwnProperty("toString")&&(this.toString=e.toString)},clone:function(){return this.init.prototype.extend(this)}}}(),s=r.WordArray=i.extend({init:function(e,n){e=this.words=e||[],n!=t?this.sigBytes=n:this.sigBytes=e.length*4},toString:function(e){return(e||u).stringify(this)},concat:function(e){var t=this.words,n=e.words,r=this.sigBytes,i=e.sigBytes;this.clamp();if(r%4)for(var s=0;s<i;s++){var o=n[s>>>2]>>>24-s%4*8&255;t[r+s>>>2]|=o<<24-(r+s)%4*8}else if(n.length>65535)for(var s=0;s<i;s+=4)t[r+s>>>2]=n[s>>>2];else t.push.apply(t,n);return this.sigBytes+=i,this},clamp:function(){var t=this.words,n=this.sigBytes;t[n>>>2]&=4294967295<<32-n%4*8,t.length=e.ceil(n/4)},clone:function(){var e=i.clone.call(this);return e.words=this.words.slice(0),e},random:function(t){var n=[];for(var r=0;r<t;r+=4)n.push(e.random()*4294967296|0);return new s.init(n,t)}}),o=n.enc={},u=o.Hex={stringify:function(e){var t=e.words,n=e.sigBytes,r=[];for(var i=0;i<n;i++){var s=t[i>>>2]>>>24-i%4*8&255;r.push((s>>>4).toString(16)),r.push((s&15).toString(16))}return r.join("")},parse:function(e){var t=e.length,n=[];for(var r=0;r<t;r+=2)n[r>>>3]|=parseInt(e.substr(r,2),16)<<24-r%8*4;return new s.init(n,t/2)}},a=o.Latin1={stringify:function(e){var t=e.words,n=e.sigBytes,r=[];for(var i=0;i<n;i++){var s=t[i>>>2]>>>24-i%4*8&255;r.push(String.fromCharCode(s))}return r.join("")},parse:function(e){var t=e.length,n=[];for(var r=0;r<t;r++)n[r>>>2]|=(e.charCodeAt(r)&255)<<24-r%4*8;return new s.init(n,t)}},f=o.Utf8={stringify:function(e){try{return decodeURIComponent(escape(a.stringify(e)))}catch(t){throw new Error("Malformed UTF-8 data")}},parse:function(e){return a.parse(unescape(encodeURIComponent(e)))}},l=r.BufferedBlockAlgorithm=i.extend({reset:function(){this._data=new s.init,this._nDataBytes=0},_append:function(e){typeof e=="string"&&(e=f.parse(e)),this._data.concat(e),this._nDataBytes+=e.sigBytes},_process:function(t){var n=this._data,r=n.words,i=n.sigBytes,o=this.blockSize,u=o*4,a=i/u;t?a=e.ceil(a):a=e.max((a|0)-this._minBufferSize,0);var f=a*o,l=e.min(f*4,i);if(f){for(var c=0;c<f;c+=o)this._doProcessBlock(r,c);var h=r.splice(0,f);n.sigBytes-=l}return new s.init(h,l)},clone:function(){var e=i.clone.call(this);return e._data=this._data.clone(),e},_minBufferSize:0}),c=r.Hasher=l.extend({cfg:i.extend(),init:function(e){this.cfg=this.cfg.extend(e),this.reset()},reset:function(){l.reset.call(this),this._doReset()},update:function(e){return this._append(e),this._process(),this},finalize:function(e){e&&this._append(e);var t=this._doFinalize();return t},blockSize:16,_createHelper:function(e){return function(t,n){return(new e.init(n)).finalize(t)}},_createHmacHelper:function(e){return function(t,n){return(new h.HMAC.init(e,n)).finalize(t)}}}),h=n.algo={};return n}(Math);define("crypto.core",function(){}),function(){var e=CryptoJS,t=e.lib,n=t.WordArray,r=e.enc,i=r.Base64={stringify:function(e){var t=e.words,n=e.sigBytes,r=this._map;e.clamp();var i=[];for(var s=0;s<n;s+=3){var o=t[s>>>2]>>>24-s%4*8&255,u=t[s+1>>>2]>>>24-(s+1)%4*8&255,a=t[s+2>>>2]>>>24-(s+2)%4*8&255,f=o<<16|u<<8|a;for(var l=0;l<4&&s+l*.75<n;l++)i.push(r.charAt(f>>>6*(3-l)&63))}var c=r.charAt(64);if(c)while(i.length%4)i.push(c);return i.join("")},parse:function(e){var t=e.length,r=this._map,i=r.charAt(64);if(i){var s=e.indexOf(i);s!=-1&&(t=s)}var o=[],u=0;for(var a=0;a<t;a++)if(a%4){var f=r.indexOf(e.charAt(a-1))<<a%4*2,l=r.indexOf(e.charAt(a))>>>6-a%4*2;o[u>>>2]|=(f|l)<<24-u%4*8,u++}return n.create(o,u)},_map:"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/="}}(),define("crypto.enc-base64",["crypto.core"],function(){}),function(e){function a(e,t,n,r,i,s,o){var u=e+(t&n|~t&r)+i+o;return(u<<s|u>>>32-s)+t}function f(e,t,n,r,i,s,o){var u=e+(t&r|n&~r)+i+o;return(u<<s|u>>>32-s)+t}function l(e,t,n,r,i,s,o){var u=e+(t^n^r)+i+o;return(u<<s|u>>>32-s)+t}function c(e,t,n,r,i,s,o){var u=e+(n^(t|~r))+i+o;return(u<<s|u>>>32-s)+t}var t=CryptoJS,n=t.lib,r=n.WordArray,i=n.Hasher,s=t.algo,o=[];(function(){for(var t=0;t<64;t++)o[t]=e.abs(e.sin(t+1))*4294967296|0})();var u=s.MD5=i.extend({_doReset:function(){this._hash=new r.init([1732584193,4023233417,2562383102,271733878])},_doProcessBlock:function(e,t){for(var n=0;n<16;n++){var r=t+n,i=e[r];e[r]=(i<<8|i>>>24)&16711935|(i<<24|i>>>8)&4278255360}var s=this._hash.words,u=e[t+0],h=e[t+1],p=e[t+2],d=e[t+3],v=e[t+4],m=e[t+5],g=e[t+6],y=e[t+7],b=e[t+8],w=e[t+9],E=e[t+10],S=e[t+11],x=e[t+12],N=e[t+13],C=e[t+14],k=e[t+15],L=s[0],A=s[1],O=s[2],M=s[3];L=a(L,A,O,M,u,7,o[0]),M=a(M,L,A,O,h,12,o[1]),O=a(O,M,L,A,p,17,o[2]),A=a(A,O,M,L,d,22,o[3]),L=a(L,A,O,M,v,7,o[4]),M=a(M,L,A,O,m,12,o[5]),O=a(O,M,L,A,g,17,o[6]),A=a(A,O,M,L,y,22,o[7]),L=a(L,A,O,M,b,7,o[8]),M=a(M,L,A,O,w,12,o[9]),O=a(O,M,L,A,E,17,o[10]),A=a(A,O,M,L,S,22,o[11]),L=a(L,A,O,M,x,7,o[12]),M=a(M,L,A,O,N,12,o[13]),O=a(O,M,L,A,C,17,o[14]),A=a(A,O,M,L,k,22,o[15]),L=f(L,A,O,M,h,5,o[16]),M=f(M,L,A,O,g,9,o[17]),O=f(O,M,L,A,S,14,o[18]),A=f(A,O,M,L,u,20,o[19]),L=f(L,A,O,M,m,5,o[20]),M=f(M,L,A,O,E,9,o[21]),O=f(O,M,L,A,k,14,o[22]),A=f(A,O,M,L,v,20,o[23]),L=f(L,A,O,M,w,5,o[24]),M=f(M,L,A,O,C,9,o[25]),O=f(O,M,L,A,d,14,o[26]),A=f(A,O,M,L,b,20,o[27]),L=f(L,A,O,M,N,5,o[28]),M=f(M,L,A,O,p,9,o[29]),O=f(O,M,L,A,y,14,o[30]),A=f(A,O,M,L,x,20,o[31]),L=l(L,A,O,M,m,4,o[32]),M=l(M,L,A,O,b,11,o[33]),O=l(O,M,L,A,S,16,o[34]),A=l(A,O,M,L,C,23,o[35]),L=l(L,A,O,M,h,4,o[36]),M=l(M,L,A,O,v,11,o[37]),O=l(O,M,L,A,y,16,o[38]),A=l(A,O,M,L,E,23,o[39]),L=l(L,A,O,M,N,4,o[40]),M=l(M,L,A,O,u,11,o[41]),O=l(O,M,L,A,d,16,o[42]),A=l(A,O,M,L,g,23,o[43]),L=l(L,A,O,M,w,4,o[44]),M=l(M,L,A,O,x,11,o[45]),O=l(O,M,L,A,k,16,o[46]),A=l(A,O,M,L,p,23,o[47]),L=c(L,A,O,M,u,6,o[48]),M=c(M,L,A,O,y,10,o[49]),O=c(O,M,L,A,C,15,o[50]),A=c(A,O,M,L,m,21,o[51]),L=c(L,A,O,M,x,6,o[52]),M=c(M,L,A,O,d,10,o[53]),O=c(O,M,L,A,E,15,o[54]),A=c(A,O,M,L,h,21,o[55]),L=c(L,A,O,M,b,6,o[56]),M=c(M,L,A,O,k,10,o[57]),O=c(O,M,L,A,g,15,o[58]),A=c(A,O,M,L,N,21,o[59]),L=c(L,A,O,M,v,6,o[60]),M=c(M,L,A,O,S,10,o[61]),O=c(O,M,L,A,p,15,o[62]),A=c(A,O,M,L,w,21,o[63]),s[0]=s[0]+L|0,s[1]=s[1]+A|0,s[2]=s[2]+O|0,s[3]=s[3]+M|0},_doFinalize:function(){var t=this._data,n=t.words,r=this._nDataBytes*8,i=t.sigBytes*8;n[i>>>5]|=128<<24-i%32;var s=e.floor(r/4294967296),o=r;n[(i+64>>>9<<4)+15]=(s<<8|s>>>24)&16711935|(s<<24|s>>>8)&4278255360,n[(i+64>>>9<<4)+14]=(o<<8|o>>>24)&16711935|(o<<24|o>>>8)&4278255360,t.sigBytes=(n.length+1)*4,this._process();var u=this._hash,a=u.words;for(var f=0;f<4;f++){var l=a[f];a[f]=(l<<8|l>>>24)&16711935|(l<<24|l>>>8)&4278255360}return u},clone:function(){var e=i.clone.call(this);return e._hash=this._hash.clone(),e}});t.MD5=i._createHelper(u),t.HmacMD5=i._createHmacHelper(u)}(Math),define("crypto.md5",["crypto.core"],function(){}),function(){var e=CryptoJS,t=e.lib,n=t.Base,r=t.WordArray,i=e.algo,s=i.MD5,o=i.EvpKDF=n.extend({cfg:n.extend({keySize:4,hasher:s,iterations:1}),init:function(e){this.cfg=this.cfg.extend(e)},compute:function(e,t){var n=this.cfg,i=n.hasher.create(),s=r.create(),o=s.words,u=n.keySize,a=n.iterations;while(o.length<u){f&&i.update(f);var f=i.update(e).finalize(t);i.reset();for(var l=1;l<a;l++)f=i.finalize(f),i.reset();s.concat(f)}return s.sigBytes=u*4,s}});e.EvpKDF=function(e,t,n){return o.create(n).compute(e,t)}}(),define("crypto.evpkdf",["crypto.md5"],function(){}),CryptoJS.lib.Cipher||function(e){var t=CryptoJS,n=t.lib,r=n.Base,i=n.WordArray,s=n.BufferedBlockAlgorithm,o=t.enc,u=o.Utf8,a=o.Base64,f=t.algo,l=f.EvpKDF,c=n.Cipher=s.extend({cfg:r.extend(),createEncryptor:function(e,t){return this.create(this._ENC_XFORM_MODE,e,t)},createDecryptor:function(e,t){return this.create(this._DEC_XFORM_MODE,e,t)},init:function(e,t,n){this.cfg=this.cfg.extend(n),this._xformMode=e,this._key=t,this.reset()},reset:function(){s.reset.call(this),this._doReset()},process:function(e){return this._append(e),this._process()},finalize:function(e){e&&this._append(e);var t=this._doFinalize();return t},keySize:4,ivSize:4,_ENC_XFORM_MODE:1,_DEC_XFORM_MODE:2,_createHelper:function(){function e(e){return typeof e=="string"?N:S}return function(t){return{encrypt:function(n,r,i){return e(r).encrypt(t,n,r,i)},decrypt:function(n,r,i){return e(r).decrypt(t,n,r,i)}}}}()}),h=n.StreamCipher=c.extend({_doFinalize:function(){var e=this._process(!0);return e},blockSize:1}),p=t.mode={},d=n.BlockCipherMode=r.extend({createEncryptor:function(e,t){return this.Encryptor.create(e,t)},createDecryptor:function(e,t){return this.Decryptor.create(e,t)},init:function(e,t){this._cipher=e,this._iv=t}}),v=p.CBC=function(){function n(t,n,r){var i=this._iv;if(i){var s=i;this._iv=e}else var s=this._prevBlock;for(var o=0;o<r;o++)t[n+o]^=s[o]}var t=d.extend();return t.Encryptor=t.extend({processBlock:function(e,t){var r=this._cipher,i=r.blockSize;n.call(this,e,t,i),r.encryptBlock(e,t),this._prevBlock=e.slice(t,t+i)}}),t.Decryptor=t.extend({processBlock:function(e,t){var r=this._cipher,i=r.blockSize,s=e.slice(t,t+i);r.decryptBlock(e,t),n.call(this,e,t,i),this._prevBlock=s}}),t}(),m=t.pad={},g=m.Pkcs7={pad:function(e,t){var n=t*4,r=n-e.sigBytes%n,s=r<<24|r<<16|r<<8|r,o=[];for(var u=0;u<r;u+=4)o.push(s);var a=i.create(o,r);e.concat(a)},unpad:function(e){var t=e.words[e.sigBytes-1>>>2]&255;e.sigBytes-=t}},y=n.BlockCipher=c.extend({cfg:c.cfg.extend({mode:v,padding:g}),reset:function(){c.reset.call(this);var e=this.cfg,t=e.iv,n=e.mode;if(this._xformMode==this._ENC_XFORM_MODE)var r=n.createEncryptor;else{var r=n.createDecryptor;this._minBufferSize=1}this._mode=r.call(n,this,t&&t.words)},_doProcessBlock:function(e,t){this._mode.processBlock(e,t)},_doFinalize:function(){var e=this.cfg.padding;if(this._xformMode==this._ENC_XFORM_MODE){e.pad(this._data,this.blockSize);var t=this._process(!0)}else{var t=this._process(!0);e.unpad(t)}return t},blockSize:4}),b=n.CipherParams=r.extend({init:function(e){this.mixIn(e)},toString:function(e){return(e||this.formatter).stringify(this)}}),w=t.format={},E=w.OpenSSL={stringify:function(e){var t=e.ciphertext,n=e.salt;if(n)var r=i.create([1398893684,1701076831]).concat(n).concat(t);else var r=t;return r.toString(a)},parse:function(e){var t=a.parse(e),n=t.words;if(n[0]==1398893684&&n[1]==1701076831){var r=i.create(n.slice(2,4));n.splice(0,4),t.sigBytes-=16}return b.create({ciphertext:t,salt:r})}},S=n.SerializableCipher=r.extend({cfg:r.extend({format:E}),encrypt:function(e,t,n,r){r=this.cfg.extend(r);var i=e.createEncryptor(n,r),s=i.finalize(t),o=i.cfg;return b.create({ciphertext:s,key:n,iv:o.iv,algorithm:e,mode:o.mode,padding:o.padding,blockSize:e.blockSize,formatter:r.format})},decrypt:function(e,t,n,r){r=this.cfg.extend(r),t=this._parse(t,r.format);var i=e.createDecryptor(n,r).finalize(t.ciphertext);return i},_parse:function(e,t){return typeof e=="string"?t.parse(e,this):e}}),x=t.kdf={},T=x.OpenSSL={execute:function(e,t,n,r){r||(r=i.random(8));var s=l.create({keySize:t+n}).compute(e,r),o=i.create(s.words.slice(t),n*4);return s.sigBytes=t*4,b.create({key:s,iv:o,salt:r})}},N=n.PasswordBasedCipher=S.extend({cfg:S.cfg.extend({kdf:T}),encrypt:function(e,t,n,r){r=this.cfg.extend(r);var i=r.kdf.execute(n,e.keySize,e.ivSize);r.iv=i.iv;var s=S.encrypt.call(this,e,t,i.key,r);return s.mixIn(i),s},decrypt:function(e,t,n,r){r=this.cfg.extend(r),t=this._parse(t,r.format);var i=r.kdf.execute(n,e.keySize,e.ivSize,t.salt);r.iv=i.iv;var s=S.decrypt.call(this,e,t,i.key,r);return s}})}(),define("crypto.cipher-core",["crypto.enc-base64","crypto.evpkdf"],function(){}),function(){var e=CryptoJS,t=e.lib,n=t.BlockCipher,r=e.algo,i=[],s=[],o=[],u=[],a=[],f=[],l=[],c=[],h=[],p=[];(function(){var e=[];for(var t=0;t<256;t++)t<128?e[t]=t<<1:e[t]=t<<1^283;var n=0,r=0;for(var t=0;t<256;t++){var d=r^r<<1^r<<2^r<<3^r<<4;d=d>>>8^d&255^99,i[n]=d,s[d]=n;var v=e[n],m=e[v],g=e[m],y=e[d]*257^d*16843008;o[n]=y<<24|y>>>8,u[n]=y<<16|y>>>16,a[n]=y<<8|y>>>24,f[n]=y;var y=g*16843009^m*65537^v*257^n*16843008;l[d]=y<<24|y>>>8,c[d]=y<<16|y>>>16,h[d]=y<<8|y>>>24,p[d]=y,n?(n=v^e[e[e[g^v]]],r^=e[e[r]]):n=r=1}})();var d=[0,1,2,4,8,16,32,64,128,27,54],v=r.AES=n.extend({_doReset:function(){var e=this._key,t=e.words,n=e.sigBytes/4,r=this._nRounds=n+6,s=(r+1)*4,o=this._keySchedule=[];for(var u=0;u<s;u++)if(u<n)o[u]=t[u];else{var a=o[u-1];u%n?n>6&&u%n==4&&(a=i[a>>>24]<<24|i[a>>>16&255]<<16|i[a>>>8&255]<<8|i[a&255]):(a=a<<8|a>>>24,a=i[a>>>24]<<24|i[a>>>16&255]<<16|i[a>>>8&255]<<8|i[a&255],a^=d[u/n|0]<<24),o[u]=o[u-n]^a}var f=this._invKeySchedule=[];for(var v=0;v<s;v++){var u=s-v;if(v%4)var a=o[u];else var a=o[u-4];v<4||u<=4?f[v]=a:f[v]=l[i[a>>>24]]^c[i[a>>>16&255]]^h[i[a>>>8&255]]^p[i[a&255]]}},encryptBlock:function(e,t){this._doCryptBlock(e,t,this._keySchedule,o,u,a,f,i)},decryptBlock:function(e,t){var n=e[t+1];e[t+1]=e[t+3],e[t+3]=n,this._doCryptBlock(e,t,this._invKeySchedule,l,c,h,p,s);var n=e[t+1];e[t+1]=e[t+3],e[t+3]=n},_doCryptBlock:function(e,t,n,r,i,s,o,u){var a=this._nRounds,f=e[t]^n[0],l=e[t+1]^n[1],c=e[t+2]^n[2],h=e[t+3]^n[3],p=4;for(var d=1;d<a;d++){var v=r[f>>>24]^i[l>>>16&255]^s[c>>>8&255]^o[h&255]^n[p++],m=r[l>>>24]^i[c>>>16&255]^s[h>>>8&255]^o[f&255]^n[p++],g=r[c>>>24]^i[h>>>16&255]^s[f>>>8&255]^o[l&255]^n[p++],y=r[h>>>24]^i[f>>>16&255]^s[l>>>8&255]^o[c&255]^n[p++];f=v,l=m,c=g,h=y}var v=(u[f>>>24]<<24|u[l>>>16&255]<<16|u[c>>>8&255]<<8|u[h&255])^n[p++],m=(u[l>>>24]<<24|u[c>>>16&255]<<16|u[h>>>8&255]<<8|u[f&255])^n[p++],g=(u[c>>>24]<<24|u[h>>>16&255]<<16|u[f>>>8&255]<<8|u[l&255])^n[p++],y=(u[h>>>24]<<24|u[f>>>16&255]<<16|u[l>>>8&255]<<8|u[c&255])^n[p++];e[t]=v,e[t+1]=m,e[t+2]=g,e[t+3]=y},keySize:8});e.AES=n._createHelper(v)}(),define("crypto.aes",["crypto.cipher-core"],function(){}),function(){var e=CryptoJS,t=e.lib,n=t.WordArray,r=t.Hasher,i=e.algo,s=[],o=i.SHA1=r.extend({_doReset:function(){this._hash=new n.init([1732584193,4023233417,2562383102,271733878,3285377520])},_doProcessBlock:function(e,t){var n=this._hash.words,r=n[0],i=n[1],o=n[2],u=n[3],a=n[4];for(var f=0;f<80;f++){if(f<16)s[f]=e[t+f]|0;else{var l=s[f-3]^s[f-8]^s[f-14]^s[f-16];s[f]=l<<1|l>>>31}var c=(r<<5|r>>>27)+a+s[f];f<20?c+=(i&o|~i&u)+1518500249:f<40?c+=(i^o^u)+1859775393:f<60?c+=(i&o|i&u|o&u)-1894007588:c+=(i^o^u)-899497514,a=u,u=o,o=i<<30|i>>>2,i=r,r=c}n[0]=n[0]+r|0,n[1]=n[1]+i|0,n[2]=n[2]+o|0,n[3]=n[3]+u|0,n[4]=n[4]+a|0},_doFinalize:function(){var e=this._data,t=e.words,n=this._nDataBytes*8,r=e.sigBytes*8;return t[r>>>5]|=128<<24-r%32,t[(r+64>>>9<<4)+14]=Math.floor(n/4294967296),t[(r+64>>>9<<4)+15]=n,e.sigBytes=t.length*4,this._process(),this._hash},clone:function(){var e=r.clone.call(this);return e._hash=this._hash.clone(),e}});e.SHA1=r._createHelper(o),e.HmacSHA1=r._createHmacHelper(o)}(),define("crypto.sha1",["crypto.core"],function(){}),function(e){var t=CryptoJS,n=t.lib,r=n.WordArray,i=n.Hasher,s=t.algo,o=[],u=[];(function(){function t(t){var n=e.sqrt(t);for(var r=2;r<=n;r++)if(!(t%r))return!1;return!0}function n(e){return(e-(e|0))*4294967296|0}var r=2,i=0;while(i<64)t(r)&&(i<8&&(o[i]=n(e.pow(r,.5))),u[i]=n(e.pow(r,1/3)),i++),r++})();var a=[],f=s.SHA256=i.extend({_doReset:function(){this._hash=new r.init(o.slice(0))},_doProcessBlock:function(e,t){var n=this._hash.words,r=n[0],i=n[1],s=n[2],o=n[3],f=n[4],l=n[5],c=n[6],h=n[7];for(var p=0;p<64;p++){if(p<16)a[p]=e[t+p]|0;else{var d=a[p-15],v=(d<<25|d>>>7)^(d<<14|d>>>18)^d>>>3,m=a[p-2],g=(m<<15|m>>>17)^(m<<13|m>>>19)^m>>>10;a[p]=v+a[p-7]+g+a[p-16]}var y=f&l^~f&c,b=r&i^r&s^i&s,w=(r<<30|r>>>2)^(r<<19|r>>>13)^(r<<10|r>>>22),E=(f<<26|f>>>6)^(f<<21|f>>>11)^(f<<7|f>>>25),S=h+E+y+u[p]+a[p],x=w+b;h=c,c=l,l=f,f=o+S|0,o=s,s=i,i=r,r=S+x|0}n[0]=n[0]+r|0,n[1]=n[1]+i|0,n[2]=n[2]+s|0,n[3]=n[3]+o|0,n[4]=n[4]+f|0,n[5]=n[5]+l|0,n[6]=n[6]+c|0,n[7]=n[7]+h|0},_doFinalize:function(){var t=this._data,n=t.words,r=this._nDataBytes*8,i=t.sigBytes*8;return n[i>>>5]|=128<<24-i%32,n[(i+64>>>9<<4)+14]=e.floor(r/4294967296),n[(i+64>>>9<<4)+15]=r,t.sigBytes=n.length*4,this._process(),this._hash},clone:function(){var e=i.clone.call(this);return e._hash=this._hash.clone(),e}});t.SHA256=i._createHelper(f),t.HmacSHA256=i._createHmacHelper(f)}(Math),define("crypto.sha256",["crypto.core"],function(){}),function(){var e=CryptoJS,t=e.lib,n=t.Base,r=e.enc,i=r.Utf8,s=e.algo,o=s.HMAC=n.extend({init:function(e,t){e=this._hasher=new e.init,typeof t=="string"&&(t=i.parse(t));var n=e.blockSize,r=n*4;t.sigBytes>r&&(t=e.finalize(t)),t.clamp();var s=this._oKey=t.clone(),o=this._iKey=t.clone(),u=s.words,a=o.words;for(var f=0;f<n;f++)u[f]^=1549556828,a[f]^=909522486;s.sigBytes=o.sigBytes=r,this.reset()},reset:function(){var e=this._hasher;e.reset(),e.update(this._iKey)},update:function(e){return this._hasher.update(e),this},finalize:function(e){var t=this._hasher,n=t.finalize(e);t.reset();var r=t.finalize(this._oKey.clone().concat(n));return r}})}(),define("crypto.hmac",["crypto.core"],function(){}),CryptoJS.pad.NoPadding={pad:function(){},unpad:function(){}},define("crypto.pad-nopadding",["crypto.cipher-core"],function(){}),CryptoJS.mode.CTR=function(){var e=CryptoJS.lib.BlockCipherMode.extend(),t=e.Encryptor=e.extend({processBlock:function(e,t){var n=this._cipher,r=n.blockSize,i=this._iv,s=this._counter;i&&(s=this._counter=i.slice(0),this._iv=undefined);var o=s.slice(0);n.encryptBlock(o,0),s[r-1]=s[r-1]+1|0;for(var u=0;u<r;u++)e[t+u]^=o[u]}});return e.Decryptor=t,e}(),define("crypto.mode-ctr",["crypto.cipher-core"],function(){}),function(e,t){typeof define=="function"&&define.amd?define("crypto",["crypto.core","crypto.enc-base64","crypto.md5","crypto.evpkdf","crypto.cipher-core","crypto.aes","crypto.sha1","crypto.sha256","crypto.hmac","crypto.pad-nopadding","crypto.mode-ctr"],function(){return CryptoJS}):e.CryptoJS=t()}(this),function(e,t){typeof define=="function"&&define.amd?define("bigint",[],t.bind(e,e.crypto||e.msCrypto)):typeof module!="undefined"&&module.exports?module.exports=t(require("crypto")):e.BigInt=t(e.crypto||e.msCrypto)}(this,function(e){function G(e){var t,n,r,i;n=new Array(e);for(t=0;t<e;t++)n[t]=0;n[0]=2,r=0;for(;n[r]<e;){for(t=n[r]*n[r];t<e;t+=n[r])n[t]=1;r++,n[r]=n[r-1]+1;for(;n[r]<e&&n[n[r]];n[r]++);}i=new Array(r);for(t=0;t<r;t++)i[t]=n[t];return i}function Y(e,t){return y.length!=e.length&&(y=Pt(e),b=Pt(e),w=Pt(e)),Bt(w,t),Z(e,w)}function Z(e,n){var r,i,s,o;y.length!=e.length&&(y=Pt(e),b=Pt(e),w=Pt(e)),Ht(w,n),Ht(b,e),Ht(y,e),jt(b,-1),jt(y,-1);if(_t(b))return 0;for(s=0;b[s]==0;s++);for(r=1,i=2;b[s]%i==0;i*=2,r++);o=s*t+r-1,o&&Ft(b,o),en(w,b,e);if(!Ot(w,1)&&!Mt(w,y)){i=1;while(i<=o-1&&!Mt(w,y)){Yt(w,e);if(Ot(w,1))return 0;i++}if(!Mt(w,y))return 0}return 1}function et(e){var n,r,i;for(n=e.length-1;e[n]==0&&n>0;n--);for(r=0,i=e[n];i;i>>=1,r++);return r+=t*n,r}function tt(e,n){var r=Lt(0,(e.length>n?e.length:n)*t,0);return Ht(r,e),r}function nt(e){var t=Lt(0,e,0);return pt(t,e),Zt(t,1)}function rt(e){return e>=600?it(e,2):e>=550?it(e,4):e>=500?it(e,5):e>=400?it(e,6):e>=350?it(e,7):e>=300?it(e,9):e>=250?it(e,12):e>=200?it(e,15):e>=150?it(e,18):e>=100?it(e,27):it(e,40)}function it(e,t){var n,r,i,s;s=3e4,n=Lt(0,e,0),P.length==0&&(P=G(3e4)),Q.length!=n.length&&(Q=Pt(n));for(;;){vt(n,e,0),n[0]|=1,i=0;for(r=0;r<P.length&&P[r]<=s;r++)if(kt(n,P[r])==0&&!Ot(n,P[r])){i=1;break}for(r=0;r<t&&!i;r++){vt(Q,e,0);while(!Tt(n,Q))vt(Q,e,0);Z(n,Q)||(i=1)}if(!i)return n}}function st(e,t){var n=Pt(e);return Qt(n,t),Zt(n,1)}function ot(e,t){var n=tt(e,e.length+1);return jt(n,t),Zt(n,1)}function ut(e,t){var n=tt(e,e.length+t.length);return Kt(n,t),Zt(n,1)}function at(e,t,n){var r=tt(e,n.length);return en(r,Zt(t,2),Zt(n,2),0),Zt(r,1)}function ft(e,t){var n=tt(e,e.length>t.length?e.length+1:t.length+1);return $t(n,t),Zt(n,1)}function lt(e,t){var n=tt(e,e.length>t.length?e.length+1:t.length+1);return Jt(n,t),Zt(n,1)}function ct(e,t){var n=tt(e,t.length),r;return r=yt(n,t),r?Zt(n,1):null}function ht(e,t,n){var r=tt(e,n.length);return Gt(r,t,n),Zt(r,1)}function pt(e,n){var r,i,s,o,u,a,f,l,c,h,p,d,v;P.length==0&&(P=G(3e4));if(H.length==0){H=new Array(512);for(a=0;a<512;a++)H[a]=Math.pow(2,a/511-1)}r=.1,s=20,v=20,j.length!=e.length&&(j=Pt(e),F=Pt(e),R=Pt(e),z=Pt(e),V=Pt(e),$=Pt(e),J=Pt(e),X=Pt(e),W=Pt(e),B=Pt(e),I=Pt(e),q=Pt(e),U=Pt(e),K=Pt(e));if(n<=v){o=(1<<(n+2>>1))-1,Bt(e,0);for(u=1;u;){u=0,e[0]=1|1<<n-1|hn(n);for(a=1;a<P.length&&(P[a]&o)==P[a];a++)if(0==e[0]%P[a]){u=1;break}}Ct(e);return}l=r*n*n;if(n>2*s)for(f=1;n-n*f<=s;)f=H[hn(9)];else f=.5;d=Math.floor(f*n)+1,pt(q,d),Bt(j,0),j[Math.floor((n-2)/t)]|=1<<(n-2)%t,Nt(j,q,B,I),h=et(B);for(;;){for(;;){vt(F,h,0);if(Tt(B,F))break}jt(F,1),Jt(F,B),Ht(W,q),Kt(W,F),Rt(W,2),jt(W,1),Ht(z,F),Rt(z,2);for(c=0,a=0;a<P.length&&P[a]<l;a++)if(kt(W,P[a])==0&&!Ot(W,P[a])){c=1;break}c||Y(W,2)||(c=1);if(!c){jt(W,-3);for(a=W.length-1;W[a]==0&&a>0;a--);for(p=0,i=W[a];i;i>>=1,p++);p+=t*a;for(;;){vt(U,p,0);if(Tt(W,U))break}jt(W,3),jt(U,2),Ht(X,U),Ht(R,W),jt(R,-1),en(X,R,W),jt(X,-1);if(_t(X)){Ht(X,U),en(X,z,W),jt(X,-1),Ht(K,W),Ht(V,X),gt(V,W);if(Ot(V,1)){Ht(e,K);return}}}}}function dt(e,n){var r,i;return r=Math.floor((e-1)/t)+2,i=Lt(0,0,r),vt(i,e,n),i}function vt(e,n,r){var i,s;for(i=0;i<e.length;i++)e[i]=0;s=Math.floor((n-1)/t)+1;for(i=0;i<s;i++)e[i]=hn(t);e[s-1]&=(2<<(n-1)%t)-1,r==1&&(e[s-1]|=1<<(n-1)%t)}function mt(e,t){var n,r;return n=Pt(e),r=Pt(t),gt(n,r),n}function gt(e,t){var n,r,i,s,u,a,f,l,c,h;m.length!=e.length&&(m=Pt(e)),c=1;while(c){c=0;for(n=1;n<t.length;n++)if(t[n]){c=1;break}if(!c)break;for(n=e.length;!e[n]&&n>=0;n--);r=e[n],i=t[n],s=1,u=0,a=0,f=1;while(i+a&&i+f){l=Math.floor((r+s)/(i+a)),h=Math.floor((r+u)/(i+f));if(l!=h)break;o=s-l*a,s=a,a=o,o=u-l*f,u=f,f=o,o=r-l*i,r=i,i=o}u?(Ht(m,e),zt(e,t,s,u),zt(t,m,f,a)):(Qt(e,t),Ht(m,e),Ht(e,t),Ht(t,m))}if(t[0]==0)return;o=kt(e,t[0]),Bt(e,t[0]),t[0]=o;while(t[0])e[0]%=t[0],o=e[0],e[0]=t[0],t[0]=o}function yt(e,t){var n=1+2*Math.max(e.length,t.length);if(!(e[0]&1)&&!(t[0]&1))return Bt(e,0),0;S.length!=n&&(S=new Array(n),E=new Array(n),x=new Array(n),T=new Array(n),N=new Array(n),C=new Array(n)),Ht(S,e),Ht(E,t),Bt(x,1),Bt(T,0),Bt(N,0),Bt(C,1);for(;;){while(!(S[0]&1))It(S),!(x[0]&1)&&!(T[0]&1)?(It(x),It(T)):(Jt(x,t),It(x),$t(T,e),It(T));while(!(E[0]&1))It(E),!(N[0]&1)&&!(C[0]&1)?(It(N),It(C)):(Jt(N,t),It(N),$t(C,e),It(C));Tt(E,S)?($t(E,S),$t(N,x),$t(C,T)):($t(S,E),$t(x,N),$t(T,C));if(Ot(S,0)){while(St(N))Jt(N,t);return Ht(e,N),Ot(E,1)?1:(Bt(e,0),0)}}}function bt(e,t){var n=1,r=0,i;for(;;){if(e==1)return n;if(e==0)return 0;r-=n*Math.floor(t/e),t%=e;if(t==1)return r;if(t==0)return 0;n-=r*Math.floor(e/t),e%=t}}function wt(e,t){return bt(e,t)}function Et(e,t,n,r,i){var s=0,o=Math.max(e.length,t.length);S.length!=o&&(S=new Array(o),x=new Array(o),T=new Array(o),N=new Array(o),C=new Array(o));while(!(e[0]&1)&&!(t[0]&1))It(e),It(t),s++;Ht(S,e),Ht(n,t),Bt(x,1),Bt(T,0),Bt(N,0),Bt(C,1);for(;;){while(!(S[0]&1))It(S),!(x[0]&1)&&!(T[0]&1)?(It(x),It(T)):(Jt(x,t),It(x),$t(T,e),It(T));while(!(n[0]&1))It(n),!(N[0]&1)&&!(C[0]&1)?(It(N),It(C)):(Jt(N,t),It(N),$t(C,e),It(C));Tt(n,S)?($t(n,S),$t(N,x),$t(C,T)):($t(S,n),$t(x,N),$t(T,C));if(Ot(S,0)){while(St(N))Jt(N,t),$t(C,e);Rt(C,-1),Ht(r,N),Ht(i,C),qt(n,s);return}}}function St(e){return e[e.length-1]>>t-1&1}function xt(e,t,n){var r,i=e.length,s=t.length,o=i+n<s?i+n:s;for(r=s-1-n;r<i&&r>=0;r++)if(e[r]>0)return 1;for(r=i-1+n;r<s;r++)if(t[r]>0)return 0;for(r=o-1;r>=n;r--){if(e[r-n]>t[r])return 1;if(e[r-n]<t[r])return 0}return 0}function Tt(e,t){var n,r=e.length<t.length?e.length:t.length;for(n=e.length;n<t.length;n++)if(t[n])return 0;for(n=t.length;n<e.length;n++)if(e[n])return 1;for(n=r-1;n>=0;n--){if(e[n]>t[n])return 1;if(e[n]<t[n])return 0}return 0}function Nt(e,i,s,o){var u,a,f,l,c,h,p,d,v;Ht(o,e);for(a=i.length;i[a-1]==0;a--);v=i[a-1];for(d=0;v;d++)v>>=1;d=t-d,qt(i,d),qt(o,d);for(u=o.length;o[u-1]==0&&u>a;u--);Bt(s,0);while(!xt(i,o,u-a))Vt(o,i,u-a),s[u-a]++;for(f=u-1;f>=a;f--){o[f]==i[a-1]?s[f-a]=r:s[f-a]=Math.floor((o[f]*n+o[f-1])/i[a-1]);for(;;){h=(a>1?i[a-2]:0)*s[f-a],p=h,h&=r,p=(p-h)/n,c=p+s[f-a]*i[a-1],p=c,c&=r,p=(p-c)/n;if(!(p==o[f]?c==o[f-1]?h>(f>1?o[f-2]:0):c>o[f-1]:p>o[f]))break;s[f-a]--}Wt(o,i,-s[f-a],f-a),St(o)&&(Xt(o,i,f-a),s[f-a]--)}Ft(i,d),Ft(o,d)}function Ct(e){var t,i,s,o;i=e.length,s=0;for(t=0;t<i;t++)s+=e[t],o=0,s<0&&(o=s&r,o=-((s-o)/n),s+=o*n),e[t]=s&r,s=(s-e[t])/n-o}function kt(e,t){var r,i=0;for(r=e.length-1;r>=0;r--)i=(i*n+e[r])%t;return i}function Lt(e,n,r){var i,s,o;return s=Math.ceil(n/t)+1,s=r>s?r:s,o=new Array(s),Bt(o,e),o}function At(e,t,n){var r,s,o,u,a,f,l=e.length;if(t==-1){u=new Array(0);for(;;){a=new Array(u.length+1);for(s=0;s<u.length;s++)a[s+1]=u[s];a[0]=parseInt(e,10),u=a,r=e.indexOf(",",0);if(r<1)break;e=e.substring(r+1);if(e.length==0)break}return u.length<n?(a=new Array(n),Ht(a,u),a):u}var c=t,h=0,p=t==1?l:0;while(c>1)c&1&&(h=1),p+=l,c>>=1;p+=h*l,u=Lt(0,p,0);for(s=0;s<l;s++){r=i.indexOf(e.substring(s,s+1),0),t<=36&&r>=36&&(r-=26);if(r>=t||r<0)break;Rt(u,t),jt(u,r)}for(l=u.length;l>0&&!u[l-1];l--);l=n>l+1?n:l+1,a=new Array(l),f=l<u.length?l:u.length;for(s=0;s<f;s++)a[s]=u[s];for(;s<l;s++)a[s]=0;return a}function Ot(e,t){var n;if(e[0]!=t)return 0;for(n=1;n<e.length;n++)if(e[n])return 0;return 1}function Mt(e,t){var n,r=e.length<t.length?e.length:t.length;for(n=0;n<r;n++)if(e[n]!=t[n])return 0;if(e.length>t.length){for(;n<e.length;n++)if(e[n])return 0}else for(;n<t.length;n++)if(t[n])return 0;return 1}function _t(e){var t;for(t=0;t<e.length;t++)if(e[t])return 0;return 1}function Dt(e,t){var n,r,s="";d.length!=e.length?d=Pt(e):Ht(d,e);if(t==-1){for(n=e.length-1;n>0;n--)s+=e[n]+",";s+=e[0]}else while(!_t(d))r=Ut(d,t),s=i.substring(r,r+1)+s;return s.length==0&&(s="0"),s}function Pt(e){var t,n;return n=new Array(e.length),Ht(n,e),n}function Ht(e,t){var n,r=e.length<t.length?e.length:t.length;for(n=0;n<r;n++)e[n]=t[n];for(n=r;n<e.length;n++)e[n]=0}function Bt(e,n){var i,s;for(s=n,i=0;i<e.length;i++)e[i]=s&r,s>>=t}function jt(e,t){var i,s,o,u;e[0]+=t,s=e.length,o=0;for(i=0;i<s;i++){o+=e[i],u=0,o<0&&(u=o&r,u=-((o-u)/n),o+=u*n),e[i]=o&r,o=(o-e[i])/n-u;if(!o)return}}function Ft(e,n){var i,s=Math.floor(n/t);if(s){for(i=0;i<e.length-s;i++)e[i]=e[i+s];for(;i<e.length;i++)e[i]=0;n%=t}for(i=0;i<e.length-1;i++)e[i]=r&(e[i+1]<<t-n|e[i]>>n);e[i]>>=n}function It(e){var i;for(i=0;i<e.length-1;i++)e[i]=r&(e[i+1]<<t-1|e[i]>>1);e[i]=e[i]>>1|e[i]&n>>1}function qt(e,n){var i,s=Math.floor(n/t);if(s){for(i=e.length;i>=s;i--)e[i]=e[i-s];for(;i>=0;i--)e[i]=0;n%=t}if(!n)return;for(i=e.length-1;i>0;i--)e[i]=r&(e[i]<<n|e[i-1]>>t-n);e[i]=r&e[i]<<n}function Rt(e,t){var i,s,o,u;if(!t)return;s=e.length,o=0;for(i=0;i<s;i++)o+=e[i]*t,u=0,o<0&&(u=o&r,u=-((o-u)/n),o+=u*n),e[i]=o&r,o=(o-e[i])/n-u}function Ut(e,t){var r,i=0,s;for(r=e.length-1;r>=0;r--)s=i*n+e[r],e[r]=Math.floor(s/t),i=s%t;return i}function zt(e,t,i,s){var o,u,a,f;a=e.length<t.length?e.length:t.length,f=e.length;for(u=0,o=0;o<a;o++)u+=i*e[o]+s*t[o],e[o]=u&r,u=(u-e[o])/n;for(o=a;o<f;o++)u+=i*e[o],e[o]=u&r,u=(u-e[o])/n}function Wt(e,t,i,s){var o,u,a,f;a=e.length<s+t.length?e.length:s+t.length,f=e.length;for(u=0,o=s;o<a;o++)u+=e[o]+i*t[o-s],e[o]=u&r,u=(u-e[o])/n;for(o=a;u&&o<f;o++)u+=e[o],e[o]=u&r,u=(u-e[o])/n}function Xt(e,t,i){var s,o,u,a;u=e.length<i+t.length?e.length:i+t.length,a=e.length;for(o=0,s=i;s<u;s++)o+=e[s]+t[s-i],e[s]=o&r,o=(o-e[s])/n;for(s=u;o&&s<a;s++)o+=e[s],e[s]=o&r,o=(o-e[s])/n}function Vt(e,t,i){var s,o,u,a;u=e.length<i+t.length?e.length:i+t.length,a=e.length;for(o=0,s=i;s<u;s++)o+=e[s]-t[s-i],e[s]=o&r,o=(o-e[s])/n;for(s=u;o&&s<a;s++)o+=e[s],e[s]=o&r,o=(o-e[s])/n}function $t(e,t){var i,s,o,u;o=e.length<t.length?e.length:t.length;for(s=0,i=0;i<o;i++)s+=e[i]-t[i],e[i]=s&r,s=(s-e[i])/n;for(i=o;s&&i<e.length;i++)s+=e[i],e[i]=s&r,s=(s-e[i])/n}function Jt(e,t){var i,s,o,u;o=e.length<t.length?e.length:t.length;for(s=0,i=0;i<o;i++)s+=e[i]+t[i],e[i]=s&r,s=(s-e[i])/n;for(i=o;s&&i<e.length;i++)s+=e[i],e[i]=s&r,s=(s-e[i])/n}function Kt(e,t){var n;u.length!=2*e.length&&(u=new Array(2*e.length)),Bt(u,0);for(n=0;n<t.length;n++)t[n]&&Wt(u,e,t[n],n);Ht(e,u)}function Qt(e,t){h.length!=e.length?h=Pt(e):Ht(h,e),p.length!=e.length&&(p=Pt(e)),Nt(h,t,p,e)}function Gt(e,t,n){var r;a.length!=2*e.length&&(a=new Array(2*e.length)),Bt(a,0);for(r=0;r<t.length;r++)t[r]&&Wt(a,e,t[r],r);Qt(a,n),Ht(e,a)}function Yt(e,t){var i,s,o,u,f,l,c;for(f=e.length;f>0&&!e[f-1];f--);c=f>t.length?2*f:2*t.length,a.length!=c&&(a=new Array(c)),Bt(a,0);for(i=0;i<f;i++){u=a[2*i]+e[i]*e[i],a[2*i]=u&r,u=(u-a[2*i])/n;for(s=i+1;s<f;s++)u=a[i+s]+2*e[i]*e[s]+u,a[i+s]=u&r,u=(u-a[i+s])/n;a[i+f]=u}Qt(a,t),Ht(e,a)}function Zt(e,t){var n,r;for(n=e.length;n>0&&!e[n-1];n--);return r=new Array(n+t),Ht(r,e),r}function en(e,r,i){var o,u,a,f;v.length!=i.length&&(v=Pt(i));if((i[0]&1)==0){Ht(v,e),Bt(e,1);while(!Ot(r,0))r[0]&1&&Gt(e,v,i),Ut(r,2),Yt(v,i);return}Bt(v,0);for(a=i.length;a>0&&!i[a-1];a--);f=n-bt(kt(i,n),n),v[a]=1,Gt(e,v,i),c.length!=e.length?c=Pt(e):Ht(c,e);for(o=r.length-1;o>0&!r[o];o--);if(r[o]==0){Bt(e,1);return}for(u=1<<t-1;u&&!(r[o]&u);u>>=1);for(;;){if(!(u>>=1)){o--;if(o<0){tn(e,s,i,f);return}u=1<<t-1}tn(e,e,i,f),u&r[o]&&tn(e,c,i,f)}}function tn(e,t,i,s){var o,u,a,f,l,c,h,p=i.length,d=t.length;g.length!=p&&(g=new Array(p)),Bt(g,0);for(;p>0&&i[p-1]==0;p--);for(;d>0&&t[d-1]==0;d--);h=g.length-1;for(o=0;o<p;o++){l=g[0]+e[o]*t[0],f=(l&r)*s&r,a=l+f*i[0],a=(a-(a&r))/n,l=e[o],u=1;for(;u<d-4;)a+=g[u]+f*i[u]+l*t[u],c=g[u-1]=a&r,a=(a-c)/n,u++,a+=g[u]+f*i[u]+l*t[u],c=g[u-1]=a&r,a=(a-c)/n,u++,a+=g[u]+f*i[u]+l*t[u],c=g[u-1]=a&r,a=(a-c)/n,u++,a+=g[u]+f*i[u]+l*t[u],c=g[u-1]=a&r,a=(a-c)/n,u++,a+=g[u]+f*i[u]+l*t[u],c=g[u-1]=a&r,a=(a-c)/n,u++;for(;u<d;)a+=g[u]+f*i[u]+l*t[u],c=g[u-1]=a&r,a=(a-c)/n,u++;for(;u<p-4;)a+=g[u]+f*i[u],c=g[u-1]=a&r,a=(a-c)/n,u++,a+=g[u]+f*i[u],c=g[u-1]=a&r,a=(a-c)/n,u++,a+=g[u]+f*i[u],c=g[u-1]=a&r,a=(a-c)/n,u++,a+=g[u]+f*i[u],c=g[u-1]=a&r,a=(a-c)/n,u++,a+=g[u]+f*i[u],c=g[u-1]=a&r,a=(a-c)/n,u++;for(;u<p;)a+=g[u]+f*i[u],c=g[u-1]=a&r,a=(a-c)/n,u++;for(;u<h;)a+=g[u],c=g[u-1]=a&r,a=(a-c)/n,u++;g[u-1]=a&r}Tt(i,g)||$t(g,i),Ht(e,g)}function nn(e,t,n){return ht(e,ct(t,n),n)}function rn(e,t,n){return e=st(e,n),t=st(t,n),Tt(t,e)&&(e=lt(e,n)),ft(e,t)}function sn(e){var n=Math.floor(e/t)+2,r=new Array(n);for(var i=0;i<n;i++)r[i]=0;return r[n-2]=1<<e%t,r}function un(e,t){t||(t=0),e=Pt(e);var n="";while(!_t(e))n=on[e[0]&255]+n,Ft(e,8);while(n.length<t)n="\0"+n;return n}function an(e){var t=At("0",10,e.length);return e.forEach(function(e,n){n&&qt(t,8),t[0]|=e}),t}function ln(){return fn(40)}function cn(){return fn(1)[0]}function hn(e){if(e>31)throw new Error("Too many bits.");var t=0,n=0,r=Math.floor(e/8),i=(1<<e%8)-1;i&&(n=cn()&i);for(;t<r;t++)n=256*n+cn();return n}var t=26,n=1<<t,r=n-1,i="0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz_=!@#$%^&*()[]{}|;:,.<>/?`~ \\'\"+-",s=Lt(1,1,1),o=new Array(0),u=o,a=o,f=o,l=o,c=o,h=o,p=o,d=o,v=o,m=o,g=o,y=o,b=o,w=o,E=o,S=o,x=o,T=o,N=o,C=o,k=o,L=o,A=o,O=o,M=o,_=o,D=o,P=o,H=o,B=o,j=o,F=o,I=o,q=o,R=o,U=o,z=o,W=o,X=o,V=o,$=o,J=o,K=o,Q=o,on=function(){var e=0,t={};for(;e<256;++e)t[e]=String.fromCharCode(e);return t}(),fn=function(){if(typeof e!="undefined"&&typeof e.randomBytes=="function")return function(t){try{var n=e.randomBytes(t)}catch(r){throw r}return Array.prototype.slice.call(n,0)};if(typeof e!="undefined"&&typeof e.getRandomValues=="function")return function(t){var n=new Uint8Array(t);return e.getRandomValues(n),Array.prototype.slice.call(n,0)};console.log("Keys should not be generated without CSPRNG.");return}();return{str2bigInt:At,bigInt2str:Dt,int2bigInt:Lt,multMod:ht,powMod:at,inverseMod:ct,randBigInt:dt,randBigInt_:vt,equals:Mt,equalsInt:Ot,sub:ft,mod:st,modInt:kt,mult:ut,divInt_:Ut,rightShift_:Ft,dup:Pt,greater:Tt,add:lt,isZero:_t,bitSize:et,millerRabin:Z,divide_:Nt,trim:Zt,primes:P,findPrimes:G,getSeed:ln,divMod:nn,subMod:rn,twoToThe:sn,bigInt2bits:un,ba2bigInt:an}}),function(){"use strict";function e(){}function n(e,t){var n=e.length;while(n--)if(e[n].listener===t)return n;return-1}function r(e){return function(){return this[e].apply(this,arguments)}}var t=e.prototype;t.getListeners=function(t){var n=this._getEvents(),r,i;if(typeof t=="object"){r={};for(i in n)n.hasOwnProperty(i)&&t.test(i)&&(r[i]=n[i])}else r=n[t]||(n[t]=[]);return r},t.flattenListeners=function(t){var n=[],r;for(r=0;r<t.length;r+=1)n.push(t[r].listener);return n},t.getListenersAsObject=function(t){var n=this.getListeners(t),r;return n instanceof Array&&(r={},r[t]=n),r||n},t.addListener=function(t,r){var i=this.getListenersAsObject(t),s=typeof r=="object",o;for(o in i)i.hasOwnProperty(o)&&n(i[o],r)===-1&&i[o].push(s?r:{listener:r,once:!1});return this},t.on=r("addListener"),t.addOnceListener=function(t,n){return this.addListener(t,{listener:n,once:!0})},t.once=r("addOnceListener"),t.defineEvent=function(t){return this.getListeners(t),this},t.defineEvents=function(t){for(var n=0;n<t.length;n+=1)this.defineEvent(t[n]);return this},t.removeListener=function(t,r){var i=this.getListenersAsObject(t),s,o;for(o in i)i.hasOwnProperty(o)&&(s=n(i[o],r),s!==-1&&i[o].splice(s,1));return this},t.off=r("removeListener"),t.addListeners=function(t,n){return this.manipulateListeners(!1,t,n)},t.removeListeners=function(t,n){return this.manipulateListeners(!0,t,n)},t.manipulateListeners=function(t,n,r){var i,s,o=t?this.removeListener:this.addListener,u=t?this.removeListeners:this.addListeners;if(typeof n!="object"||n instanceof RegExp){i=r.length;while(i--)o.call(this,n,r[i])}else for(i in n)n.hasOwnProperty(i)&&(s=n[i])&&(typeof s=="function"?o.call(this,i,s):u.call(this,i,s));return this},t.removeEvent=function(t){var n=typeof t,r=this._getEvents(),i;if(n==="string")delete r[t];else if(n==="object")for(i in r)r.hasOwnProperty(i)&&t.test(i)&&delete r[i];else delete this._events;return this},t.emitEvent=function(t,n){var r=this.getListenersAsObject(t),i,s,o,u;for(o in r)if(r.hasOwnProperty(o)){s=r[o].length;while(s--)i=r[o][s],i.once===!0&&this.removeListener(t,i.listener),u=i.listener.apply(this,n||[]),u===this._getOnceReturnValue()&&this.removeListener(t,i.listener)}return this},t.trigger=r("emitEvent"),t.emit=function(t){var n=Array.prototype.slice.call(arguments,1);return this.emitEvent(t,n)},t.setOnceReturnValue=function(t){return this._onceReturnValue=t,this},t._getOnceReturnValue=function(){return this.hasOwnProperty("_onceReturnValue")?this._onceReturnValue:!0},t._getEvents=function(){return this._events||(this._events={})},typeof define=="function"&&define.amd?define("eventemitter",[],function(){return e}):typeof module=="object"&&module.exports?module.exports=e:this.EventEmitter=e}.call(this),function(e,t){typeof define=="function"&&define.amd?define("otr",["jquery","jquery.browser","bigint","crypto","eventemitter"],function(e,n,r,i,s){if(e.browser.msie)return undefined;var o={BigInt:r,CryptoJS:i,EventEmitter:s,OTR:{},DSA:{}};return t.call(o)}):(e.OTR={},e.DSA={},t.call(e))}(this,function(){return function(){"use strict";var e=this,t={N:"FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD129024E088A67CC74020BBEA63B139B22514A08798E3404DDEF9519B3CD3A431B302B0A6DF25F14374FE1356D6D51C245E485B576625E7EC6F44C42E9A637ED6B0BFF5CB6F406B7EDEE386BFB5A899FA5AE9F24117C4B1FE649286651ECE45B3DC2007CB8A163BF0598DA48361C55D39A69163FA8FD24CF5F83655D23DCA3AD961C62F356208552BB9ED529077096966D670C354E4ABC9804F1746C08CA237327FFFFFFFFFFFFFFFF",G:"2",MSGSTATE_PLAINTEXT:0,MSGSTATE_ENCRYPTED:1,MSGSTATE_FINISHED:2,AUTHSTATE_NONE:0,AUTHSTATE_AWAITING_DHKEY:1,AUTHSTATE_AWAITING_REVEALSIG:2,AUTHSTATE_AWAITING_SIG:3,WHITESPACE_TAG:" 	  				 	 	 	  ",WHITESPACE_TAG_V2:"  		  	 ",WHITESPACE_TAG_V3:"  		  		",OTR_TAG:"?OTR",OTR_VERSION_1:"\0
",OTR_VERSION_2:"\0",OTR_VERSION_3:"\0",SMPSTATE_EXPECT0:0,SMPSTATE_EXPECT1:1,SMPSTATE_EXPECT2:2,SMPSTATE_EXPECT3:3,SMPSTATE_EXPECT4:4,STATUS_SEND_QUERY:0,STATUS_AKE_INIT:1,STATUS_AKE_SUCCESS:2,STATUS_END_OTR:3};typeof module!="undefined"&&module.exports?module.exports=t:e.OTR.CONST=t}.call(this),function(){"use strict";var e=this,t={},n,r;typeof module!="undefined"&&module.exports?(module.exports=t={},n=require("../vendor/crypto.js"),r=require("../vendor/bigint.js")):(e.OTR&&(e.OTR.HLP=t),e.DSA&&(e.DSA.HLP=t),n=e.CryptoJS,r=e.BigInt);var i={BYTE:1,SHORT:2,INT:4,CTR:8,MAC:20,SIG:40},s="?OTR",o=".",u=r.str2bigInt("2",10);t.debug=function(e){this.debug&&typeof this.debug!="function"&&typeof console!="undefined"&&console.log(e)},t.extend=function(e,t){function r(){this.constructor=e}for(var n in t)Object.hasOwnProperty.call(t,n)&&(e[n]=t[n]);r.prototype=t.prototype,e.prototype=new r,e.__super__=t.prototype},t.compare=function(e,t){if(e.length!==t.length)return!1;var n=0,r=0;for(;n<e.length;n++)r|=e[n].charCodeAt(0)^t[n].charCodeAt(0);return r===0},t.randomExponent=function(){return r.randBigInt(1536)},t.smpHash=function(e,r,s){var o=n.algo.SHA256.create();o.update(n.enc.Latin1.parse(t.packBytes(e,i.BYTE))),o.update(n.enc.Latin1.parse(t.packMPI(r))),s&&o.update(n.enc.Latin1.parse(t.packMPI(s)));var u=o.finalize();return t.bits2bigInt(u.toString(n.enc.Latin1))},t.makeMac=function(e,r){var i=n.enc.Latin1.parse(r),s=n.HmacSHA256(n.enc.Latin1.parse(e),i);return t.mask(s.toString(n.enc.Latin1),0,160)},t.make1Mac=function(e,t){var r=n.enc.Latin1.parse(t),i=n.HmacSHA1(n.enc.Latin1.parse(e),r);return i.toString(n.enc.Latin1)},t.encryptAes=function(e,t,r){var i={mode:n.mode.CTR,iv:n.enc.Latin1.parse(r),padding:n.pad.NoPadding},s=n.AES.encrypt(e,n.enc.Latin1.parse(t),i),o=n.enc.Base64.parse(s.toString());return n.enc.Latin1.stringify(o)},t.decryptAes=function(e,t,r){e=n.enc.Latin1.parse(e);var i={mode:n.mode.CTR,iv:n.enc.Latin1.parse(r),padding:n.pad.NoPadding};return n.AES.decrypt(n.enc.Base64.stringify(e),n.enc.Latin1.parse(t),i)},t.multPowMod=function(e,t,n,i,s){return r.multMod(r.powMod(e,t,s),r.powMod(n,i,s),s)},t.ZKP=function(e,n,i,s){return r.equals(n,t.smpHash(e,i,s))},t.GTOE=function(e,t){return r.equals(e,t)||r.greater(e,t)},t.between=function(e,t,n){return r.greater(e,t)&&r.greater(n,e)},t.checkGroup=function(e,n){return t.GTOE(e,u)&&t.GTOE(n,e)},t.h1=function(e,t){var r=n.algo.SHA1.create();return r.update(n.enc.Latin1.parse(e)),r.update(n.enc.Latin1.parse(t)),r.finalize().toString(n.enc.Latin1)},t.h2=function(e,t){var r=n.algo.SHA256.create();return r.update(n.enc.Latin1.parse(e)),r.update(n.enc.Latin1.parse(t)),r.finalize().toString(n.enc.Latin1)},t.mask=function(e,t,n){return e.substr(t/8,n/8)};var a=String.fromCharCode;t.packBytes=function(e,t){e=e.toString(16);var n,r="";for(;t>0;t--)n=e.length?e.substr(-2,2):"0",e=e.substr(0,e.length-2),r=a(parseInt(n,16))+r;return r},t.packINT=function(e){return t.packBytes(e,i.INT)},t.packCtr=function(e){return t.padCtr(t.packBytes(e,i.CTR))},t.padCtr=function(e){return e+"\0\0\0\0\0\0\0\0"},t.unpackCtr=function(e){return e=t.toByteArray(e.substring(0,8)),t.unpack(e)},t.unpack=function(e){var t=0,n=0,r=e.length;for(;n<r;n++)t=t*256+e[n];return t},t.packData=function(e){return t.packINT(e.length)+e},t.bits2bigInt=function(e){return e=t.toByteArray(e),r.ba2bigInt(e)},t.packMPI=function(e){return t.packData(r.bigInt2bits(r.trim(e,0)))},t.packSHORT=function(e){return t.packBytes(e,i.SHORT)},t.unpackSHORT=function(e){return e=t.toByteArray(e),t.unpack(e)},t.packTLV=function(e,n){return t.packSHORT(e)+t.packSHORT(n.length)+n},t.readLen=function(e){return e=t.toByteArray(e.substring(0,4)),t.unpack(e)},t.readData=function(e){var n=t.unpack(e.splice(0,4));return[n,e]},t.readMPI=function(e){return e=t.toByteArray(e),e=t.readData(e),r.ba2bigInt(e[1])},t.packMPIs=function(e){return e.reduce(function(e,n){return e+t.packMPI(n)},"")},t.unpackMPIs=function(e,n){var r=0,i=[];for(;r<e;r++)i.push("MPI");return t.splitype(i,n).map(function(e){return t.readMPI(e)})},t.wrapMsg=function(e,r,i,u,a){e=n.enc.Base64.stringify(n.enc.Latin1.parse(e)),e=s+":"+e+o;var f;i&&(f="|",f+=t.readLen(u).toString(16),f+="|",f+=t.readLen(a).toString(16));if(!r)return[null,e];var l=Math.ceil(e.length/r);if(l>65535)return["Too many fragments"];if(l==1)return[null,e];var c,h,p,d,v,m=[];for(c=1;c<=l;c++)h=(c-1)*r,p=c*r,d=e.slice(h,p),v=s,i&&(v+=f),v+=","+c+",",v+=l+",",v+=d+",",m.push(v);return[null,m]},t.splitype=function l(e,n){var r=[];return e.forEach(function(e){var s;switch(e){case"PUBKEY":s=l(["SHORT","MPI","MPI","MPI","MPI"],n).join("");break;case"DATA":case"MPI":s=n.substring(0,t.readLen(n)+4);break;default:s=n.substring(0,i[e])}r.push(s),n=n.substring(s.length)}),r};var f=function(){var e=0,t={};for(;e<256;++e)t[String.fromCharCode(e)]=e;for(e=128;e<256;++e)t[String.fromCharCode(63232+e)]=e;return t}();t.toByteArray=function(e){var t=[],n=e.split(""),r=-1,i=n.length,s=i%8;while(s--)++r,t[r]=f[n[r]];s=i>>3;while(s--)t.push(f[n[++r]],f[n[++r]],f[n[++r]],f[n[++r]],f[n[++r]],f[n[++r]],f[n[++r]],f[n[++r]]);return t}}.call(this),function(){"use strict";function c(){var e=(new Date).getTime();return function(t){if(!l||typeof console=="undefined")return;var n=(new Date).getTime();console.log(t+": "+(n-e)),e=n}}function h(e,t){var r=n.randBigInt(n.bitSize(t));return s.between(r,e,t)?r:h(e,t)}function d(e,t){var r,i=3e4,s=n.bitSize(e),o=n.primes;o.length===0&&(o=n.findPrimes(i)),p.length!=e.length&&(p=n.dup(e));for(r=0;r<o.length&&o[r]<=i;r++)if(n.modInt(e,o[r])===0&&!n.equalsInt(e,o[r]))return 0;for(r=0;r<t;r++){n.randBigInt_(p,s,0);while(!n.greater(e,p))n.randBigInt_(p,s,0);if(!n.millerRabin(e,p))return 0}return 1}function g(e){var t=c(),r=v[e].repeat,i=v[e].N,s=n.twoToThe(e-1),o=4*e,f=!1,l,h,p,g;for(;;){l=n.randBigInt(i,1),l[0]|=1;if(!d(l,r))continue;t("q");for(g=0;g<o;g++){h=n.randBigInt(e,1),h[0]|=1,p=n.mod(h,l),p=n.sub(p,u),h=n.sub(h,p);if(n.greater(s,h))continue;if(!d(h,r))continue;t("p"),m[e]={p:h,q:l},f=!0;break}if(f)break}var y=n.dup(a),b=n.sub(h,u),w=n.multMod(b,n.inverseMod(l,h),h),E;for(;;){E=n.powMod(y,w,h);if(n.equals(E,u)){y=n.add(y,u);continue}m[e].g=E,t("g");return}throw new Error("Unreachable!")}function y(e,t){if(!(this instanceof y))return new y(e,t);t=t||{};if(e){var r=this;["p","q","g","y","x"].forEach(function(t){r[t]=e[t]}),this.type=e.type||f;return}var i=parseInt(t.bit_length?t.bit_length:1024,10);if(!v[i])throw new Error("Unsupported bit length.");m[i]||g(i),this.p=m[i].p,this.q=m[i].q,this.g=m[i].g,this.type=f,this.x=h(o,this.q),this.y=n.powMod(this.g,this.x,this.p),t.nocache&&(m[i]=null)}function b(e){var t,n;t=e.indexOf("("),n=e.lastIndexOf(")");if(t<0||n<0)throw new Error("Malformed S-Expression");e=e.substring(t+1,n);var r=e.search(/\s/),i={type:e.substring(0,r),val:[]};e=e.substring(r+1,n),t=e.indexOf("(");if(t<0)i.val.push(e);else{var s,o,u,a;while(t>-1){s=t+1,o=e.length;for(u=1,a=0;s<o&&a<u;s++)e[s]==="("&&u++,e[s]===")"&&a++;i.val.push(b(e.substring(t,++s))),e=e.substring(++s),t=e.indexOf("(")}}return i}function w(e){if(!e.type)throw new Error("Parse error.");var t,r;return e.type==="privkeys"?(t=[],e.val.forEach(function(e){t.push(w(e))}),t):(t={},e.val.forEach(function(e){r=e.val[0],typeof r=="string"?r.indexOf("#")===0&&(r=r.substring(1,r.lastIndexOf("#")),r=n.str2bigInt(r,16)):r=w(e),t[e.type]=r}),t)}var e=this,t,n,r,i,s;typeof module!="undefined"&&module.exports?(module.exports=y,t=require("../vendor/crypto.js"),n=require("../vendor/bigint.js"),i=require("path").join(__dirname,"/dsa-webworker.js"),s=require("./helpers.js")):(Object.keys(e.DSA).forEach(function(t){y[t]=e.DSA[t]}),e.DSA=y,t=e.CryptoJS,n=e.BigInt,r=e.Worker,i="dsa-webworker.js",s=y.HLP);var o=n.str2bigInt("0",10),u=n.str2bigInt("1",10),a=n.str2bigInt("2",10),f="\0\0",l=!1,p=[],v={1024:{N:160,repeat:40},2048:{N:224,repeat:56}},m={};y.prototype={constructor:y,packPublic:function(){var e=this.type;return e+=s.packMPI(this.p),e+=s.packMPI(this.q),e+=s.packMPI(this.g),e+=s.packMPI(this.y),e},packPrivate:function(){var e=this.packPublic()+s.packMPI(this.x);return e=t.enc.Latin1.parse(e),e.toString(t.enc.Base64)},generateNonce:function(e){var r=n.bigInt2bits(n.trim(this.x,0)),i=n.bigInt2bits(n.randBigInt(256)),u=t.algo.SHA256.create();u.update(t.enc.Latin1.parse(r)),u.update(e),u.update(t.enc.Latin1.parse(i));var a=u.finalize();return a=s.bits2bigInt(a.toString(t.enc.Latin1)),n.rightShift_(a,256-n.bitSize(this.q)),s.between(a,o,this.q)?a:this.generateNonce(e)},sign:function(e){e=t.enc.Latin1.parse(e);var r=n.str2bigInt(e.toString(t.enc.Hex),16),i,s=o,u=o;while(n.isZero(u)||n.isZero(s)){i=this.generateNonce(e),s=n.mod(n.powMod(this.g,i,this.p),this.q);if(n.isZero(s))continue;u=n.inverseMod(i,this.q),u=n.mult(u,n.add(r,n.mult(this.x,s))),u=n.mod(u,this.q)}return[s,u]},fingerprint:function(){var e=this.packPublic();return this.type===f&&(e=e.substring(2)),e=t.enc.Latin1.parse(e),t.SHA1(e).toString(t.enc.Hex)}},y.parsePublic=function(e,t){var n=["SHORT","MPI","MPI","MPI","MPI"];t&&n.push("MPI"),e=s.splitype(n,e);var r={type:e[0],p:s.readMPI(e[1]),q:s.readMPI(e[2]),g:s.readMPI(e[3]),y:s.readMPI(e[4])};return t&&(r.x=s.readMPI(e[5])),new y(r)},y.parsePrivate=function(e,n){return n?w(b(e))[0]["private-key"].dsa:(e=t.enc.Base64.parse(e),e=e.toString(t.enc.Latin1),y.parsePublic(e,!0))},y.verify=function(e,r,i,u){if(!s.between(i,o,e.q)||!s.between(u,o,e.q))return!1;var a=t.enc.Latin1.parse(r);a=n.str2bigInt(a.toString(t.enc.Hex),16);var f=n.inverseMod(u,e.q),l=n.multMod(a,f,e.q),c=n.multMod(i,f,e.q);l=n.powMod(e.g,l,e.p),c=n.powMod(e.y,c,e.p);var h=n.mod(n.multMod(l,c,e.p),e.q);return n.equals(h,i)},y.createInWebWorker=function(e,t){var s={path:i,seed:n.getSeed};e&&typeof e=="object"&&Object.keys(e).forEach(function(t){s[t]=e[t]}),typeof module!="undefined"&&module.exports&&(r=require("webworker-threads").Worker);var o=new r(s.path);o.onmessage=function(e){var n=e.data;switch(n.type){case"debug":if(!l||typeof console=="undefined")return;console.log(n.val);break;case"data":o.terminate(),t(y.parsePrivate(n.val));break;default:throw new Error("Unrecognized type.")}},o.postMessage({seed:s.seed(),imports:s.imports,debug:l})}}.call(this),function(){"use strict";var e=this,t={},n,r,i;typeof module!="undefined"&&module.exports?(module.exports=t,n=require("../vendor/crypto.js"),r=require("./const.js"),i=require("./helpers.js")):(e.OTR.Parse=t,n=e.CryptoJS,r=e.OTR.CONST,i=e.OTR.HLP);var s={};s[r.WHITESPACE_TAG_V2]=r.OTR_VERSION_2,s[r.WHITESPACE_TAG_V3]=r.OTR_VERSION_3,t.parseMsg=function(e,t){var o=[],u=t.indexOf(r.OTR_TAG);if(!~u){this.initFragment(e),l=t.indexOf(r.WHITESPACE_TAG);if(~l){t=t.split(""),t.splice(l,16);var a,f=t.length;for(;l<f;){a=t.slice(l,l+8).join("");if(Object.hasOwnProperty.call(s,a)){t.splice(l,8),o.push(s[a]);continue}l+=8}t=t.join("")}return{msg:t,ver:o}}var l=u+r.OTR_TAG.length,c=t[l];if(c===","||c==="|")return this.msgFragment(e,t.substring(l+1),c==="|");this.initFragment(e);if(~["?","v"].indexOf(c)){t[l]==="?"&&(o.push(r.OTR_VERSION_1),l+=1);var h={2:r.OTR_VERSION_2,3:r.OTR_VERSION_3},p=t.substring(l+1),d=p.indexOf("?");return d>=1&&(p=p.substring(0,d).split(""),t[l]==="v"&&p.forEach(function(e){Object.hasOwnProperty.call(h,e)&&o.push(h[e])})),{cls:"query",ver:o}}if(c===":"){l+=1;var v=t.substring(l,l+4);if(v.length<4)return{msg:t};v=n.enc.Base64.parse(v).toString(n.enc.Latin1);var m=v.substring(0,2),g=v.substring(2);if(!e["ALLOW_V"+i.unpackSHORT(m)])return{msg:t};l+=4;var y=t.substring(l).indexOf(".");if(!~y)return{msg:t};t=n.enc.Base64.parse(t.substring(l,l+y)),t=n.enc.Latin1.stringify(t);var b;m===r.OTR_VERSION_3&&(b=t.substring(0,8),t=t.substring(8));var w;return~["","\n","",""].indexOf(g)?w="ake":g===""&&(w="data"),{version:m,type:g,msg:t,cls:w,instance_tags:b}}return t.substring(l,l+7)===" Error:"?(e.ERROR_START_AKE&&e.sendQueryMsg(),{msg:t.substring(l+7),cls:"error"}):{msg:t}},t.initFragment=function(e){e.fragment={s:"",j:0,k:0}},t.msgFragment=function(e,t,n){t=t.split(",");if(n){var r=t.shift().split("|"),s=i.packINT(parseInt(r[0],16)),o=i.packINT(parseInt(r[1],16));if(e.checkInstanceTags(s+o))return}if(t.length<4||isNaN(parseInt(t[0],10))||isNaN(parseInt(t[1],10)))return;var u=parseInt(t[0],10),a=parseInt(t[1],10);t=t[2];if(a<u||a===0||u===0){this.initFragment(e);return}u===1?(this.initFragment(e),e.fragment={k:1,n:a,s:t}):a===e.fragment.n&&u===e.fragment.k+1?(e.fragment.s+=t,e.fragment.k+=1):this.initFragment(e);if(a===u)return t=e.fragment.s,this.initFragment(e),this.parseMsg(e,t);return}}.call(this),function(){"use strict";function a(e,n,r,s,o){var u=t.enc.Latin1.parse(o),a=t.algo.HMAC.create(t.algo.SHA256,u);return a.update(t.enc.Latin1.parse(i.packMPI(e))),a.update(t.enc.Latin1.parse(i.packMPI(n))),a.update(t.enc.Latin1.parse(r)),a.update(t.enc.Latin1.parse(s)),a.finalize().toString(t.enc.Latin1)}function f(e){if(!(this instanceof f))return new f(e);this.otr=e,this.our_dh=e.our_old_dh,this.our_keyid=e.our_keyid-1,this.their_y=null,this.their_keyid=null,this.their_priv_pk=null,this.ssid=null,this.transmittedRS=!1,this.r=null;var t=this;["sendMsg"].forEach(function(e){t[e]=t[e].bind(t)})}var e=this,t,n,r,i,s;typeof module!="undefined"&&module.exports?(module.exports=f,t=require("../vendor/crypto.js"),n=require("../vendor/bigint.js"),r=require("./const.js"),i=require("./helpers.js"),s=require("./dsa.js")):(e.OTR.AKE=f,t=e.CryptoJS,n=e.BigInt,r=e.OTR.CONST,i=e.OTR.HLP,s=e.DSA);var o=n.str2bigInt(r.N,16),u=n.sub(o,n.str2bigInt("2",10));f.prototype={constructor:f,createKeys:function(e){var t=n.powMod(e,this.our_dh.privateKey,o),r=i.packMPI(t);this.ssid=i.mask(i.h2("\0",r),0,64);var s=i.h2("
",r);this.c=i.mask(s,0,128),this.c_prime=i.mask(s,128,128),this.m1=i.h2("",r),this.m2=i.h2("",r),this.m1_prime=i.h2("",r),this.m2_prime=i.h2("",r)},verifySignMac:function(e,n,r,o,u,f,l,c){var h=i.makeMac(n,r);if(!i.compare(e,h))return["MACs do not match."];var p=i.decryptAes(n.substring(4),o,c);p=i.splitype(["PUBKEY","INT","SIG"],p.toString(t.enc.Latin1));var d=a(u,f,p[0],p[1],l),v=s.parsePublic(p[0]),m=i.bits2bigInt(p[2].substring(0,20)),g=i.bits2bigInt(p[2].substring(20));return s.verify(v,d,m,g)?[null,i.readLen(p[1]),v]:["Cannot verify signature of m."]},makeM:function(e,r,s,o){var u=this.otr.priv.packPublic(),f=i.packINT(this.our_keyid),l=a(this.our_dh.publicKey,e,u,f,r);l=this.otr.priv.sign(l);var c=u+f;c+=n.bigInt2bits(l[0],20),c+=n.bigInt2bits(l[1],20),c=t.enc.Latin1.parse(c);var h=i.packData(i.encryptAes(c,s,i.packCtr(0))),p=i.makeMac(h,o);return h+p},akeSuccess:function(e){i.debug.call(this.otr,"success");if(n.equals(this.their_y,this.our_dh.publicKey))return this.otr.error("equal keys - we have a problem.",!0);this.otr.our_old_dh=this.our_dh,this.otr.their_priv_pk=this.their_priv_pk,this.their_keyid===this.otr.their_keyid&&n.equals(this.their_y,this.otr.their_y)||this.their_keyid===this.otr.their_keyid-1&&n.equals(this.their_y,this.otr.their_old_y)||(this.otr.their_y=this.their_y,this.otr.their_old_y=null,this.otr.their_keyid=this.their_keyid,this.otr.sessKeys[0]=[new this.otr.DHSession(this.otr.our_dh,this.otr.their_y),null],this.otr.sessKeys[1]=[new this.otr.DHSession(this.otr.our_old_dh,this.otr.their_y),null]),this.otr.ssid=this.ssid,this.otr.transmittedRS=this.transmittedRS,this.otr_version=e,this.otr.authstate=r.AUTHSTATE_NONE,this.otr.msgstate=r.MSGSTATE_ENCRYPTED,this.r=null,this.myhashed=null,this.dhcommit=null,this.encrypted=null,this.hashed=null,this.otr.trigger("status",[r.STATUS_AKE_SUCCESS]),this.otr.sendStored()},handleAKE:function(e){var s,o,a,f=e.version;switch(e.type){case"":i.debug.call(this.otr,"d-h key message"),e=i.splitype(["DATA","DATA"],e.msg);if(this.otr.authstate===r.AUTHSTATE_AWAITING_DHKEY){var l=i.readMPI(this.myhashed),c=i.readMPI(e[1]);if(n.greater(l,c)){a="",s=this.dhcommit;break}this.our_dh=this.otr.dh(),this.otr.authstate=r.AUTHSTATE_NONE,this.r=null,this.myhashed=null}else this.otr.authstate===r.AUTHSTATE_AWAITING_SIG&&(this.our_dh=this.otr.dh());this.otr.authstate=r.AUTHSTATE_AWAITING_REVEALSIG,this.encrypted=e[0].substring(4),this.hashed=e[1].substring(4),a="\n",s=i.packMPI(this.our_dh.publicKey);break;case"\n":i.debug.call(this.otr,"reveal signature message"),e=i.splitype(["MPI"],e.msg);if(this.otr.authstate!==r.AUTHSTATE_AWAITING_DHKEY){if(this.otr.authstate!==r.AUTHSTATE_AWAITING_SIG)return;if(!n.equals(this.their_y,i.readMPI(e[0])))return}this.otr.authstate=r.AUTHSTATE_AWAITING_SIG,this.their_y=i.readMPI(e[0]);if(!i.checkGroup(this.their_y,u))return this.otr.error("Illegal g^y.",!0);this.createKeys(this.their_y),a="",s=i.packMPI(this.r),s+=this.makeM(this.their_y,this.m1,this.c,this.m2),this.m1=null,this.m2=null,this.c=null;break;case"":i.debug.call(this.otr,"signature message");if(this.otr.authstate!==r.AUTHSTATE_AWAITING_REVEALSIG)return;e=i.splitype(["DATA","DATA","MAC"],e.msg),this.r=i.readMPI(e[0]);var h=t.enc.Hex.parse(n.bigInt2str(this.r,16));h=t.enc.Latin1.stringify(h);var p=i.decryptAes(this.encrypted,h,i.packCtr(0));p=p.toString(t.enc.Latin1),this.their_y=i.readMPI(p);var d=t.SHA256(t.enc.Latin1.parse(p));if(!i.compare(this.hashed,d.toString(t.enc.Latin1)))return this.otr.error("Hashed g^x does not match.",!0);if(!i.checkGroup(this.their_y,u))return this.otr.error("Illegal g^x.",!0);this.createKeys(this.their_y),o=this.verifySignMac(e[2],e[1],this.m2,this.c,this.their_y,this.our_dh.publicKey,this.m1,i.packCtr(0));if(o[0])return this.otr.error(o[0],!0);this.their_keyid=o[1],this.their_priv_pk=o[2],s=this.makeM(this.their_y,this.m1_prime,this.c_prime,this.m2_prime),this.m1=null,this.m2=null,this.m1_prime=null,this.m2_prime=null,this.c=null,this.c_prime=null,this.sendMsg(f,"",s),this.akeSuccess(f);return;case"":i.debug.call(this.otr,"data message");if(this.otr.authstate!==r.AUTHSTATE_AWAITING_SIG)return;e=i.splitype(["DATA","MAC"],e.msg),o=this.verifySignMac(e[1],e[0],this.m2_prime,this.c_prime,this.their_y,this.our_dh.publicKey,this.m1_prime,i.packCtr(0));if(o[0])return this.otr.error(o[0],!0);this.their_keyid=o[1],this.their_priv_pk=o[2],this.m1_prime=null,this.m2_prime=null,this.c_prime=null,this.transmittedRS=!0,this.akeSuccess(f);return;default:return}this.sendMsg(f,a,s)},sendMsg:function(e,t,n){var s=e+t,o=e===r.OTR_VERSION_3;o&&(i.debug.call(this.otr,"instance tags"),s+=this.otr.our_instance_tag,s+=this.otr.their_instance_tag),s+=n,s=i.wrapMsg(s,this.otr.fragment_size,o,this.otr.our_instance_tag,this.otr.their_instance_tag);if(s[0])return this.otr.error(s[0]);this.otr.io(s[1])},initiateAKE:function(e){i.debug.call(this.otr,"d-h commit message"),this.otr.trigger("status",[r.STATUS_AKE_INIT]),this.otr.authstate=r.AUTHSTATE_AWAITING_DHKEY;var s=i.packMPI(this.our_dh.publicKey);s=t.enc.Latin1.parse(s),this.r=n.randBigInt(128);var o=t.enc.Hex.parse(n.bigInt2str(this.r,16));o=t.enc.Latin1.stringify(o),this.myhashed=t.SHA256(s),this.myhashed=i.packData(this.myhashed.toString(t.enc.Latin1)),this.dhcommit=i.packData(i.encryptAes(s,o,i.packCtr(0))),this.dhcommit+=this.myhashed,this.sendMsg(e,"",this.dhcommit)}}}.call(this),function(){"use strict";function l(e){if(!(this instanceof l))return new l(e);this.version=1,this.our_fp=e.our_fp,this.their_fp=e.their_fp,this.ssid=e.ssid,this.debug=!!e.debug,this.init()}var e=this,t,n,r,i,s;typeof module!="undefined"&&module.exports?(module.exports=l,t=require("../vendor/crypto.js"),n=require("../vendor/bigint.js"),r=require("../vendor/eventemitter.js"),i=require("./const.js"),s=require("./helpers.js")):(e.OTR.SM=l,t=e.CryptoJS,n=e.BigInt,r=e.EventEmitter,i=e.OTR.CONST,s=e.OTR.HLP);var o=n.str2bigInt(i.G,10),u=n.str2bigInt(i.N,16),a=n.sub(u,n.str2bigInt("2",10)),f=n.sub(u,n.str2bigInt("1",10));n.divInt_(f,2),s.extend(l,r),l.prototype.init=function(){this.smpstate=i.SMPSTATE_EXPECT1,this.secret=null},l.prototype.makeSecret=function(e,n){var r=t.algo.SHA256.create();r.update(t.enc.Latin1.parse(s.packBytes(this.version,1))),r.update(t.enc.Hex.parse(e?this.our_fp:this.their_fp)),r.update(t.enc.Hex.parse(e?this.their_fp:this.our_fp)),r.update(t.enc.Latin1.parse(this.ssid)),r.update(t.enc.Latin1.parse(n));var i=r.finalize();this.secret=s.bits2bigInt(i.toString(t.enc.Latin1))},l.prototype.makeG2s=function(){this.a2=s.randomExponent(),this.a3=s.randomExponent(),this.g2a=n.powMod(o,this.a2,u),this.g3a=n.powMod(o,this.a3,u),(!s.checkGroup(this.g2a,a)||!s.checkGroup(this.g3a,a))&&this.makeG2s()},l.prototype.computeGs=function(e,t){this.g2=n.powMod(e,this.a2,u),this.g3=n.powMod(t,this.a3,u)},l.prototype.computePQ=function(e){this.p=n.powMod(this.g3,e,u),this.q=s.multPowMod(o,e,this.g2,this.secret,u)},l.prototype.computeR=function(){this.r=n.powMod(this.QoQ,this.a3,u)},l.prototype.computeRab=function(e){return n.powMod(e,this.a3,u)},l.prototype.computeC=function(e,t){return s.smpHash(e,n.powMod(o,t,u))},l.prototype.computeD=function(e,t,r){return n.subMod(e,n.multMod(t,r,f),f)},l.prototype.handleSM=function(e){var r,f,l,c,h,p,d,v,m,g,y,b,w,E,S={2:i.SMPSTATE_EXPECT1,3:i.SMPSTATE_EXPECT2,4:i.SMPSTATE_EXPECT3,5:i.SMPSTATE_EXPECT4,7:i.SMPSTATE_EXPECT1};if(e.type===6){this.init(),this.trigger("abort");return}if(this.smpstate!==S[e.type])return this.abort();switch(this.smpstate){case i.SMPSTATE_EXPECT1:s.debug.call(this,"smp tlv 2");var x,T;e.type===7&&(x=e.msg.indexOf("\0"),T=e.msg.substring(0,x),e.msg=e.msg.substring(x+1)),w=s.readLen(e.msg.substr(0,4));if(w!==6)return this.abort();e=s.unpackMPIs(6,e.msg.substring(4));if(!s.checkGroup(e[0],a)||!s.checkGroup(e[3],a))return this.abort();if(!s.ZKP(1,e[1],s.multPowMod(o,e[2],e[0],e[1],u)))return this.abort();if(!s.ZKP(2,e[4],s.multPowMod(o,e[5],e[3],e[4],u)))return this.abort();this.g3ao=e[3],this.makeG2s(),f=s.randomExponent(),l=s.randomExponent(),this.c2=this.computeC(3,f),this.c3=this.computeC(4,l),this.d2=this.computeD(f,this.a2,this.c2),this.d3=this.computeD(l,this.a3,this.c3),this.computeGs(e[0],e[3]),this.smpstate=i.SMPSTATE_EXPECT0,T=t.enc.Latin1.parse(T).toString(t.enc.Utf8),this.trigger("question",[T]);return;case i.SMPSTATE_EXPECT2:s.debug.call(this,"smp tlv 3"),w=s.readLen(e.msg.substr(0,4));if(w!==11)return this.abort();e=s.unpackMPIs(11,e.msg.substring(4));if(!s.checkGroup(e[0],a)||!s.checkGroup(e[3],a)||!s.checkGroup(e[6],a)||!s.checkGroup(e[7],a))return this.abort();if(!s.ZKP(3,e[1],s.multPowMod(o,e[2],e[0],e[1],u)))return this.abort();if(!s.ZKP(4,e[4],s.multPowMod(o,e[5],e[3],e[4],u)))return this.abort();this.g3ao=e[3],this.computeGs(e[0],e[3]),h=s.multPowMod(this.g3,e[9],e[6],e[8],u),p=s.multPowMod(o,e[9],this.g2,e[10],u),p=n.multMod(p,n.powMod(e[7],e[8],u),u);if(!s.ZKP(5,e[8],h,p))return this.abort();var C=s.randomExponent();this.computePQ(C);var k=s.randomExponent(),L=s.randomExponent(),A=s.multPowMod(o,k,this.g2,L,u),O=s.smpHash(6,n.powMod(this.g3,k,u),A),M=this.computeD(k,C,O),_=this.computeD(L,this.secret,O);this.QoQ=n.divMod(this.q,e[7],u),this.PoP=n.divMod(this.p,e[6],u),this.computeR(),c=s.randomExponent(),g=n.powMod(this.QoQ,c,u),y=s.smpHash(7,n.powMod(o,c,u),g),b=this.computeD(c,this.a3,y),this.smpstate=i.SMPSTATE_EXPECT4,r=s.packINT(8)+s.packMPIs([this.p,this.q,O,M,_,this.r,y,b]),r=s.packTLV(4,r);break;case i.SMPSTATE_EXPECT3:s.debug.call(this,"smp tlv 4"),w=s.readLen(e.msg.substr(0,4));if(w!==8)return this.abort();e=s.unpackMPIs(8,e.msg.substring(4));if(!s.checkGroup(e[0],a)||!s.checkGroup(e[1],a)||!s.checkGroup(e[5],a))return this.abort();h=s.multPowMod(this.g3,e[3],e[0],e[2],u),p=s.multPowMod(o,e[3],this.g2,e[4],u),p=n.multMod(p,n.powMod(e[1],e[2],u),u);if(!s.ZKP(6,e[2],h,p))return this.abort();d=s.multPowMod(o,e[7],this.g3ao,e[6],u),this.QoQ=n.divMod(e[1],this.q,u),v=s.multPowMod(this.QoQ,e[7],e[5],e[6],u);if(!s.ZKP(7,e[6],d,v))return this.abort();this.computeR(),c=s.randomExponent(),g=n.powMod(this.QoQ,c,u),y=s.smpHash(8,n.powMod(o,c,u),g),b=this.computeD(c,this.a3,y),r=s.packINT(3)+s.packMPIs([this.r,y,b]),r=s.packTLV(5,r),m=this.computeRab(e[5]),E=!!n.equals(m,n.divMod(e[0],this.p,u)),this.trigger("trust",[E,"answered"]),this.init();break;case i.SMPSTATE_EXPECT4:s.debug.call(this,"smp tlv 5"),w=s.readLen(e.msg.substr(0,4));if(w!==3)return this.abort();e=s.unpackMPIs(3,e.msg.substring(4));if(!s.checkGroup(e[0],a))return this.abort();d=s.multPowMod(o,e[2],this.g3ao,e[1],u),v=s.multPowMod(this.QoQ,e[2],e[0],e[1],u);if(!s.ZKP(8,e[1],d,v))return this.abort();m=this.computeRab(e[0]),E=!!n.equals(m,this.PoP),this.trigger("trust",[E,"asked"]),this.init();return}this.sendMsg(r)},l.prototype.sendMsg=function(e){this.trigger("send",[this.ssid,"\0"+e])},l.prototype.rcvSecret=function(e,t){s.debug.call(this,"receive secret");var n,r=!1;this.smpstate===i.SMPSTATE_EXPECT0?n=this.answer:(n=this.initiate,r=!0),this.makeSecret(r,e),n.call(this,t)},l.prototype.answer=function(){s.debug.call(this,"smp answer");var e=s.randomExponent();this.computePQ(e);var t=s.randomExponent(),r=s.randomExponent(),a=s.multPowMod(o,t,this.g2,r,u),f=s.smpHash(5,n.powMod(this.g3,t,u),a),l=this.computeD(t,e,f),c=this.computeD(r,this.secret,f);this.smpstate=i.SMPSTATE_EXPECT3;var h=s.packINT(11)+s.packMPIs([this.g2a,this.c2,this.d2,this.g3a,this.c3,this.d3,this.p,this.q,f,l,c]);this.sendMsg(s.packTLV(3,h))},l.prototype.initiate=function(e){s.debug.call(this,"smp initiate"),this.smpstate!==i.SMPSTATE_EXPECT1&&this.abort(),this.makeG2s();var t=s.randomExponent(),n=s.randomExponent();this.c2=this.computeC(1,t),this.c3=this.computeC(2,n),this.d2=this.computeD(t,this.a2,this.c2),this.d3=this.computeD(n,this.a3,this.c3),this.smpstate=i.SMPSTATE_EXPECT2;var r="",o=2;e&&(r+=e,r+="\0",o=7),r+=s.packINT(6)+s.packMPIs([this.g2a,this.c2,this.d2,this.g3a,this.c3,this.d3]),this.sendMsg(s.packTLV(o,r))},l.prototype.abort=function(){this.init(),this.sendMsg(s.packTLV(6,"")),this.trigger("abort")}}.call(this),function(){"use strict";function m(e){if(!(this instanceof m))return new m(e);e=e||{};if(!(!e.priv||e.priv instanceof c))throw new Error("Requires long-lived DSA key.");this.priv=e.priv?e.priv:new c,this.fragment_size=e.fragment_size||0;if(this.fragment_size<0)throw new Error("Fragment size must be a positive integer.");this.send_interval=e.send_interval||0;if(this.send_interval<0)throw new Error("Send interval must be a positive integer.");this.outgoing=[],this.our_instance_tag=e.instance_tag||m.makeInstanceTag(),this.debug=!!e.debug,this.smw=e.smw,this.init();var t=this;["sendMsg","receiveMsg"].forEach(function(e){t[e]=t[e].bind(t)}),r.call(this)}var e=this,t,n,r,i,s,o,u,a,f,l,c;typeof module!="undefined"&&module.exports?(module.exports=m,t=require("../vendor/crypto.js"),n=require("../vendor/bigint.js"),r=require("../vendor/eventemitter.js"),s=require("path").join(__dirname,"/sm-webworker.js"),o=require("./const.js"),u=require("./helpers.js"),a=require("./parse.js"),f=require("./ake.js"),l=require("./sm.js"),c=require("./dsa.js"),m.CONST=o):(Object.keys(e.OTR).forEach(function(t){m[t]=e.OTR[t]}),e.OTR=m,t=e.CryptoJS,n=e.BigInt,r=e.EventEmitter,i=e.Worker,s="sm-webworker.js",o=m.CONST,u=m.HLP,a=m.Parse,f=m.AKE,l=m.SM,c=e.DSA);var h=n.str2bigInt(o.G,10),p=n.str2bigInt(o.N,16),d=Math.pow(2,53)-1,v=Math.pow(2,31)-1;u.extend(m,r),m.prototype.init=function(){this.msgstate=o.MSGSTATE_PLAINTEXT,this.authstate=o.AUTHSTATE_NONE,this.ALLOW_V2=!0,this.ALLOW_V3=!0,this.REQUIRE_ENCRYPTION=!1,this.SEND_WHITESPACE_TAG=!1,this.WHITESPACE_START_AKE=!1,this.ERROR_START_AKE=!1,a.initFragment(this),this.their_y=null,this.their_old_y=null,this.their_keyid=0,this.their_priv_pk=null,this.their_instance_tag="\0\0\0\0",this.our_dh=this.dh(),this.our_old_dh=this.dh(),this.our_keyid=2,this.sessKeys=[new Array(2),new Array(2)],this.storedMgs=[],this.oldMacKeys=[],this.sm=null,this._akeInit(),this.receivedPlaintext=!1},m.prototype._akeInit=function(){this.ake=new f(this),this.transmittedRS=!1,this.ssid=null},m.prototype._SMW=function(e,t){this.otr=e;var r={path:s,seed:n.getSeed};typeof e.smw=="object"&&Object.keys(e.smw).forEach(function(t){r[t]=e.smw[t]}),typeof module!="undefined"&&module.exports&&(i=require("webworker-threads").Worker),this.worker=new i(r.path);var o=this;this.worker.onmessage=function(e){var t=e.data;if(!t)return;o.trigger(t.method,t.args)},this.worker.postMessage({type:"seed",seed:r.seed(),imports:r.imports}),this.worker.postMessage({type:"init",reqs:t})},u.extend(m.prototype._SMW,r),["handleSM","rcvSecret","abort"].forEach(function(e){m.prototype._SMW.prototype[e]=function(){this.worker.postMessage({type:"method",method:e,args:Array.prototype.slice.call(arguments,0)})}}),m.prototype._smInit=function(){var e={ssid:this.ssid,our_fp:this.priv.fingerprint(),their_fp:this.their_priv_pk.fingerprint(),debug:this.debug};this.smw?(this.sm&&this.sm.worker.terminate(),this.sm=new this._SMW(this,e)):this.sm=new l(e);var t=this;["trust","abort","question"].forEach(function(e){t.sm.on(e,function(){t.trigger("smp",[e].concat(Array.prototype.slice.call(arguments)))})}),this.sm.on("send",function(e,n){t.ssid===e&&(n=t.prepareMsg(n),t.io(n))})},m.prototype.io=function(e,t){e=[].concat(e).map(function(e){return{msg:e,meta:t}}),this.outgoing=this.outgoing.concat(e);var n=this;(function r(e){if(!e){if(!n.outgoing.length)return;var t=n.outgoing.shift();n.trigger("io",[t.msg,t.meta])}setTimeout(r,e?0:n.send_interval)})(!0)},m.prototype.dh=function(){var t={privateKey:n.randBigInt(320)};return t.publicKey=n.powMod(h,t.privateKey,p),t},m.prototype.DHSession=function g(e,r){if(!(this instanceof g))return new g(e,r);var i=n.powMod(r,e.privateKey,p),s=u.packMPI(i);this.id=u.mask(u.h2("\0",s),0,64);var o=n.greater(e.publicKey,r),a=o?"
":"",f=o?"":"
";this.sendenc=u.mask(u.h1(a,s),0,128),this.sendmac=t.SHA1(t.enc.Latin1.parse(this.sendenc)),this.sendmac=this.sendmac.toString(t.enc.Latin1),this.rcvenc=u.mask(u.h1(f,s),0,128),this.rcvmac=t.SHA1(t.enc.Latin1.parse(this.rcvenc)),this.rcvmac=this.rcvmac.toString(t.enc.Latin1),this.rcvmacused=!1,this.extra_symkey=u.h2("ÿ",s),this.send_counter=0,this.rcv_counter=0},m.prototype.rotateOurKeys=function(){var e=this;this.sessKeys[1].forEach(function(t){t&&t.rcvmacused&&e.oldMacKeys.push(t.rcvmac)}),this.our_old_dh=this.our_dh,this.our_dh=this.dh(),this.our_keyid+=1,this.sessKeys[1][0]=this.sessKeys[0][0],this.sessKeys[1][1]=this.sessKeys[0][1],this.sessKeys[0]=[this.their_y?new this.DHSession(this.our_dh,this.their_y):null,this.their_old_y?new this.DHSession(this.our_dh,this.their_old_y):null]},m.prototype.rotateTheirKeys=function(e){this.their_keyid+=1;var t=this;this.sessKeys.forEach(function(e){e[1]&&e[1].rcvmacused&&t.oldMacKeys.push(e[1].rcvmac)}),this.their_old_y=this.their_y,this.sessKeys[0][1]=this.sessKeys[0][0],this.sessKeys[1][1]=this.sessKeys[1][0],this.their_y=e,this.sessKeys[0][0]=new this.DHSession(this.our_dh,this.their_y),this.sessKeys[1][0]=new this.DHSession(this.our_old_dh,this.their_y)},m.prototype.prepareMsg=function(e,n){if(this.msgstate!==o.MSGSTATE_ENCRYPTED||this.their_keyid===0)return this.error("Not ready to encrypt.");var r=this.sessKeys[1][0];if(r.send_counter>=d)return this.error("Should have rekeyed by now.");r.send_counter+=1;var i=u.packCtr(r.send_counter),s=this.ake.otr_version+"",a=this.ake.otr_version===o.OTR_VERSION_3;a&&(s+=this.our_instance_tag,s+=this.their_instance_tag),s+="\0",s+=u.packINT(this.our_keyid-1),s+=u.packINT(this.their_keyid),s+=u.packMPI(this.our_dh.publicKey),s+=i.substring(0,8);if(Math.ceil(e.length/8)>=v)return this.error("Message is too long.");var f=u.encryptAes(t.enc.Latin1.parse(e),r.sendenc,i);return s+=u.packData(f),s+=u.make1Mac(s,r.sendmac),s+=u.packData(this.oldMacKeys.splice(0).join("")),s=u.wrapMsg(s,this.fragment_size,a,this.our_instance_tag,this.their_instance_tag),s[0]?this.error(s[0]):(n&&this.trigger("file",["send",r.extra_symkey,n]),s[1])},m.prototype.handleDataMsg=function(e){var n=e.version+e.type;this.ake.otr_version===o.OTR_VERSION_3&&(n+=e.instance_tags);var r=["BYTE","INT","INT","MPI","CTR","DATA","MAC","DATA"];e=u.splitype(r,e.msg);var i=e[0]==="
";if(this.msgstate!==o.MSGSTATE_ENCRYPTED||e.length!==8){i||this.error("Received an unreadable encrypted message.",!0);return}var s=this.our_keyid-u.readLen(e[2]),a=this.their_keyid-u.readLen(e[1]);if(s<0||s>1){i||this.error("Not of our latest keys.",!0);return}if(a<0||a>1){i||this.error("Not of your latest keys.",!0);return}var f=a?this.their_old_y:this.their_y;if(a===1&&!f){i||this.error("Do not have that key.");return}var l=this.sessKeys[s][a],c=u.unpackCtr(e[4]);if(c<=l.rcv_counter){i||this.error("Counter in message is not larger.");return}l.rcv_counter=c,n+=e.slice(0,6).join("");var h=u.make1Mac(n,l.rcvmac);if(!u.compare(e[6],h)){i||this.error("MACs do not match.");return}l.rcvmacused=!0;var p=u.decryptAes(e[5].substring(4),l.rcvenc,u.padCtr(e[4]));p=p.toString(t.enc.Latin1),s||this.rotateOurKeys(),a||this.rotateTheirKeys(u.readMPI(e[3]));var d=p.indexOf("\0");return~d&&(this.handleTLVs(p.substring(d+1),l),p=p.substring(0,d)),p=t.enc.Latin1.parse(p),p.toString(t.enc.Utf8)},m.prototype.handleTLVs=function(e,n){var r,i,s;for(;e.length;){r=u.unpackSHORT(e.substr(0,2)),i=u.unpackSHORT(e.substr(2,2)),s=e.substr(4,i);if(s.length<i)break;switch(r){case 1:this.msgstate=o.MSGSTATE_FINISHED,this.trigger("status",[o.STATUS_END_OTR]);break;case 2:case 3:case 4:case 5:case 6:case 7:if(this.msgstate!==o.MSGSTATE_ENCRYPTED){this.sm&&this.sm.abort();return}this.sm||this._smInit(),this.sm.handleSM({msg:s,type:r});break;case 8:s=s.substring(4),s=t.enc.Latin1.parse(s),s=s.toString(t.enc.Utf8),this.trigger("file",["receive",n.extra_symkey,s])}e=e.substring(4+i)}},m.prototype.smpSecret=function(e,n){if(this.msgstate!==o.MSGSTATE_ENCRYPTED)return this.error("Must be encrypted for SMP.");if(typeof e!="string"||e.length<1)return this.error("Secret is required.");this.sm||this._smInit(),e=t.enc.Utf8.parse(e).toString(t.enc.Latin1),n=t.enc.Utf8.parse(n).toString(t.enc.Latin1),this.sm.rcvSecret(e,n)},m.prototype.sendQueryMsg=function(){var e={},t=o.OTR_TAG;this.ALLOW_V2&&(e[2]=!0),this.ALLOW_V3&&(e[3]=!0);var n=Object.keys(e);n.length&&(t+="v",n.forEach(function(e){e!=="1"&&(t+=e)}),t+="?"),this.io(t),this.trigger("status",[o.STATUS_SEND_QUERY])},m.prototype.sendMsg=function(e,n){if(this.REQUIRE_ENCRYPTION||this.msgstate!==o.MSGSTATE_PLAINTEXT)e=t.enc.Utf8.parse(e),e=e.toString(t.enc.Latin1);switch(this.msgstate){case o.MSGSTATE_PLAINTEXT:if(this.REQUIRE_ENCRYPTION){this.storedMgs.push({msg:e,meta:n}),this.sendQueryMsg();return}this.SEND_WHITESPACE_TAG&&!this.receivedPlaintext&&(e+=o.WHITESPACE_TAG,this.ALLOW_V3&&(e+=o.WHITESPACE_TAG_V3),this.ALLOW_V2&&(e+=o.WHITESPACE_TAG_V2));break;case o.MSGSTATE_FINISHED:this.storedMgs.push({msg:e,meta:n}),this.error("Message cannot be sent at this time.");return;case o.MSGSTATE_ENCRYPTED:e=this.prepareMsg(e);break;default:throw new Error("Unknown message state.")}e&&this.io(e,n)},m.prototype.receiveMsg=function(e){e=a.parseMsg(this,e);if(!e)return;switch(e.cls){case"error":this.error(e.msg);return;case"ake":if(e.version===o.OTR_VERSION_3&&this.checkInstanceTags(e.instance_tags))return;this.ake.handleAKE(e);return;case"data":if(e.version===o.OTR_VERSION_3&&this.checkInstanceTags(e.instance_tags))return;e.msg=this.handleDataMsg(e),e.encrypted=!0;break;case"query":this.msgstate===o.MSGSTATE_ENCRYPTED&&this._akeInit(),this.doAKE(e);break;default:(this.REQUIRE_ENCRYPTION||this.msgstate!==o.MSGSTATE_PLAINTEXT)&&this.error("Received an unencrypted message."),this.receivedPlaintext=!0,this.WHITESPACE_START_AKE&&e.ver.length>0&&this.doAKE(e)}e.msg&&this.trigger("ui",[e.msg,!!e.encrypted])},m.prototype.checkInstanceTags=function(e){var t=u.readLen(e.substr(0,4)),n=u.readLen(e.substr(4,4));if(n&&n!==u.readLen(this.our_instance_tag))return!0;if(u.readLen(this.their_instance_tag)){if(u.readLen(this.their_instance_tag)!==t)return!0}else{if(t<100)return!0;this.their_instance_tag=u.packINT(t)}},m.prototype.doAKE=function(e){this.ALLOW_V3&&~e.ver.indexOf(o.OTR_VERSION_3)?this.ake.initiateAKE(o.OTR_VERSION_3):this.ALLOW_V2&&~e.ver.indexOf(o.OTR_VERSION_2)?this.ake.initiateAKE(o.OTR_VERSION_2):this.error("OTR conversation requested, but no compatible protocol version found.")},m.prototype.error=function(e,t){if(t){this.debug||(e="An OTR error has occurred."),e="?OTR Error:"+e,this.io(e);return}this.trigger("error",[e])},m.prototype.sendStored=function(){var e=this;this.storedMgs.splice(0).forEach(function(t){var n=e.prepareMsg(t.msg);e.io(n,t.meta)})},m.prototype.sendFile=function(e){if(this.msgstate!==o.MSGSTATE_ENCRYPTED)return this.error("Not ready to encrypt.");if(this.ake.otr_version!==o.OTR_VERSION_3)return this.error("Protocol v3 required.");if(!e)return this.error("Please specify a filename.");var n=t.enc.Utf8.parse(e);n=n.toString(t.enc.Latin1);if(n.length>=65532)return this.error("filename is too long.");var r="\0";r+="\0\b",r+=u.packSHORT(4+n.length),r+="\0\0\0
",r+=n,r=this.prepareMsg(r,e),this.io(r)},m.prototype.endOtr=function(){this.msgstate===o.MSGSTATE_ENCRYPTED&&(this.sendMsg("\0\0
\0\0"),this.sm&&(this.smw&&this.sm.worker.terminate(),this.sm=null)),this.msgstate=o.MSGSTATE_PLAINTEXT,this.receivedPlaintext=!1,this.trigger("status",[o.STATUS_END_OTR])},m.makeInstanceTag=function(){var e=n.randBigInt(32);return n.greater(n.str2bigInt("100",16),e)?m.makeInstanceTag():u.packINT(parseInt(n.bigInt2str(e,10),10))}}.call(this),{OTR:this.OTR,DSA:this.DSA}}),function(e,t){typeof exports=="object"&&typeof module!="undefined"?module.exports=t():typeof define=="function"&&define.amd?define("moment",t):e.moment=t()}(this,function(){"use strict";function t(){return e.apply(null,arguments)}function n(t){e=t}function r(e){return Object.prototype.toString.call(e)==="[object Array]"}function i(e){return e instanceof Date||Object.prototype.toString.call(e)==="[object Date]"}function s(e,t){var n=[],r;for(r=0;r<e.length;++r)n.push(t(e[r],r));return n}function o(e,t){return Object.prototype.hasOwnProperty.call(e,t)}function u(e,t){for(var n in t)o(t,n)&&(e[n]=t[n]);return o(t,"toString")&&(e.toString=t.toString),o(t,"valueOf")&&(e.valueOf=t.valueOf),e}function a(e,t,n,r){return gn(e,t,n,r,!0).utc()}function f(){return{empty:!1,unusedTokens:[],unusedInput:[],overflow:-2,charsLeftOver:0,nullInput:!1,invalidMonth:null,invalidFormat:!1,userInvalidated:!1,iso:!1}}function l(e){return e._pf==null&&(e._pf=f()),e._pf}function c(e){if(e._isValid==null){var t=l(e);e._isValid=!isNaN(e._d.getTime())&&t.overflow<0&&!t.empty&&!t.invalidMonth&&!t.invalidWeekday&&!t.nullInput&&!t.invalidFormat&&!t.userInvalidated,e._strict&&(e._isValid=e._isValid&&t.charsLeftOver===0&&t.unusedTokens.length===0&&t.bigHour===undefined)}return e._isValid}function h(e){var t=a(NaN);return e!=null?u(l(t),e):l(t).userInvalidated=!0,t}function d(e,t){var n,r,i;typeof t._isAMomentObject!="undefined"&&(e._isAMomentObject=t._isAMomentObject),typeof t._i!="undefined"&&(e._i=t._i),typeof t._f!="undefined"&&(e._f=t._f),typeof t._l!="undefined"&&(e._l=t._l),typeof t._strict!="undefined"&&(e._strict=t._strict),typeof t._tzm!="undefined"&&(e._tzm=t._tzm),typeof t._isUTC!="undefined"&&(e._isUTC=t._isUTC),typeof t._offset!="undefined"&&(e._offset=t._offset),typeof t._pf!="undefined"&&(e._pf=l(t)),typeof t._locale!="undefined"&&(e._locale=t._locale);if(p.length>0)for(n in p)r=p[n],i=t[r],typeof i!="undefined"&&(e[r]=i);return e}function m(e){d(this,e),this._d=new Date(e._d!=null?e._d.getTime():NaN),v===!1&&(v=!0,t.updateOffset(this),v=!1)}function g(e){return e instanceof m||e!=null&&e._isAMomentObject!=null}function y(e){return e<0?Math.ceil(e):Math.floor(e)}function b(e){var t=+e,n=0;return t!==0&&isFinite(t)&&(n=y(t)),n}function w(e,t,n){var r=Math.min(e.length,t.length),i=Math.abs(e.length-t.length),s=0,o;for(o=0;o<r;o++)(n&&e[o]!==t[o]||!n&&b(e[o])!==b(t[o]))&&s++;return s+i}function E(){}function T(e){return e?e.toLowerCase().replace("_","-"):e}function N(e){var t=0,n,r,i,s;while(t<e.length){s=T(e[t]).split("-"),n=s.length,r=T(e[t+1]),r=r?r.split("-"):null;while(n>0){i=C(s.slice(0,n).join("-"));if(i)return i;if(r&&r.length>=n&&w(s,r,!0)>=n-1)break;n--}t++}return null}function C(e){var t=null;if(!S[e]&&typeof module!="undefined"&&module&&module.exports)try{t=x._abbr,require("./locale/"+e),k(t)}catch(n){}return S[e]}function k(e,t){var n;return e&&(typeof t=="undefined"?n=A(e):n=L(e,t),n&&(x=n)),x._abbr}function L(e,t){return t!==null?(t.abbr=e,S[e]=S[e]||new E,S[e].set(t),k(e),S[e]):(delete S[e],null)}function A(e){var t;e&&e._locale&&e._locale._abbr&&(e=e._locale._abbr);if(!e)return x;if(!r(e)){t=C(e);if(t)return t;e=[e]}return N(e)}function M(e,t){var n=e.toLowerCase();O[n]=O[n+"s"]=O[t]=e}function _(e){return typeof e=="string"?O[e]||O[e.toLowerCase()]:undefined}function D(e){var t={},n,r;for(r in e)o(e,r)&&(n=_(r),n&&(t[n]=e[r]));return t}function P(e,n){return function(r){return r!=null?(B(this,e,r),t.updateOffset(this,n),this):H(this,e)}}function H(e,t){return e._d["get"+(e._isUTC?"UTC":"")+t]()}function B(e,t,n){return e._d["set"+(e._isUTC?"UTC":"")+t](n)}function j(e,t){var n;if(typeof e=="object")for(n in e)this.set(n,e[n]);else{e=_(e);if(typeof this[e]=="function")return this[e](t)}return this}function F(e,t,n){var r=""+Math.abs(e),i=t-r.length,s=e>=0;return(s?n?"+":"":"-")+Math.pow(10,Math.max(0,i)).toString().substr(1)+r}function z(e,t,n,r){var i=r;typeof r=="string"&&(i=function(){return this[r]()}),e&&(U[e]=i),t&&(U[t[0]]=function(){return F(i.apply(this,arguments),t[1],t[2])}),n&&(U[n]=function(){return this.localeData().ordinal(i.apply(this,arguments),e)})}function W(e){return e.match(/\[[\s\S]/)?e.replace(/^\[|\]$/g,""):e.replace(/\\/g,"")}function X(e){var t=e.match(I),n,r;for(n=0,r=t.length;n<r;n++)U[t[n]]?t[n]=U[t[n]]:t[n]=W(t[n]);return function(i){var s="";for(n=0;n<r;n++)s+=t[n]instanceof Function?t[n].call(i,e):t[n];return s}}function V(e,t){return e.isValid()?(t=$(t,e.localeData()),R[t]=R[t]||X(t),R[t](e)):e.localeData().invalidDate()}function $(e,t){function r(e){return t.longDateFormat(e)||e}var n=5;q.lastIndex=0;while(n>=0&&q.test(e))e=e.replace(q,r),q.lastIndex=0,n-=1;return e}function ft(e){return typeof e=="function"&&Object.prototype.toString.call(e)==="[object Function]"}function lt(e,t,n){at[e]=ft(t)?t:function(e){return e&&n?n:t}}function ct(e,t){return o(at,e)?at[e](t._strict,t._locale):new RegExp(ht(e))}function ht(e){return e.replace("\\","").replace(/\\(\[)|\\(\])|\[([^\]\[]*)\]|\\(.)/g,function(e,t,n,r,i){return t||n||r||i}).replace(/[-\/\\^$*+?.()|[\]{}]/g,"\\$&")}function dt(e,t){var n,r=t;typeof e=="string"&&(e=[e]),typeof t=="number"&&(r=function(e,n){n[t]=b(e)});for(n=0;n<e.length;n++)pt[e[n]]=r}function vt(e,t){dt(e,function(e,n,r,i){r._w=r._w||{},t(e,r._w,r,i)})}function mt(e,t,n){t!=null&&o(pt,e)&&pt[e](t,n._a,n,e)}function Tt(e,t){return(new Date(Date.UTC(e,t+1,0))).getUTCDate()}function Ct(e){return this._months[e.month()]}function Lt(e){return this._monthsShort[e.month()]}function At(e,t,n){var r,i,s;this._monthsParse||(this._monthsParse=[],this._longMonthsParse=[],this._shortMonthsParse=[]);for(r=0;r<12;r++){i=a([2e3,r]),n&&!this._longMonthsParse[r]&&(this._longMonthsParse[r]=new RegExp("^"+this.months(i,"").replace(".","")+"$","i"),this._shortMonthsParse[r]=new RegExp("^"+this.monthsShort(i,"").replace(".","")+"$","i")),!n&&!this._monthsParse[r]&&(s="^"+this.months(i,"")+"|^"+this.monthsShort(i,""),this._monthsParse[r]=new RegExp(s.replace(".",""),"i"));if(n&&t==="MMMM"&&this._longMonthsParse[r].test(e))return r;if(n&&t==="MMM"&&this._shortMonthsParse[r].test(e))return r;if(!n&&this._monthsParse[r].test(e))return r}}function Ot(e,t){var n;if(typeof t=="string"){t=e.localeData().monthsParse(t);if(typeof t!="number")return e}return n=Math.min(e.date(),Tt(e.year(),t)),e._d["set"+(e._isUTC?"UTC":"")+"Month"](t,n),e}function Mt(e){return e!=null?(Ot(this,e),t.updateOffset(this,!0),this):H(this,"Month")}function _t(){return Tt(this.year(),this.month())}function Dt(e){var t,n=e._a;return n&&l(e).overflow===-2&&(t=n[yt]<0||n[yt]>11?yt:n[bt]<1||n[bt]>Tt(n[gt],n[yt])?bt:n[wt]<0||n[wt]>24||n[wt]===24&&(n[Et]!==0||n[St]!==0||n[xt]!==0)?wt:n[Et]<0||n[Et]>59?Et:n[St]<0||n[St]>59?St:n[xt]<0||n[xt]>999?xt:-1,l(e)._overflowDayOfYear&&(t<gt||t>bt)&&(t=bt),l(e).overflow=t),e}function Pt(e){t.suppressDeprecationWarnings===!1&&typeof console!="undefined"&&console.warn&&console.warn("Deprecation warning: "+e)}function Ht(e,t){var n=!0;return u(function(){return n&&(Pt(e+"\n"+(new Error).stack),n=!1),t.apply(this,arguments)},t)}function jt(e,t){Bt[e]||(Pt(t),Bt[e]=!0)}function Ut(e){var t,n,r=e._i,i=Ft.exec(r);if(i){l(e).iso=!0;for(t=0,n=It.length;t<n;t++)if(It[t][1].exec(r)){e._f=It[t][0];break}for(t=0,n=qt.length;t<n;t++)if(qt[t][1].exec(r)){e._f+=(i[6]||" ")+qt[t][0];break}r.match(st)&&(e._f+="Z"),ln(e)}else e._isValid=!1}function zt(e){var n=Rt.exec(e._i);if(n!==null){e._d=new Date(+n[1]);return}Ut(e),e._isValid===!1&&(delete e._isValid,t.createFromInputFallback(e))}function Wt(e,t,n,r,i,s,o){var u=new Date(e,t,n,r,i,s,o);return e<1970&&u.setFullYear(e),u}function Xt(e){var t=new Date(Date.UTC.apply(null,arguments));return e<1970&&t.setUTCFullYear(e),t}function Vt(e){return $t(e)?366:365}function $t(e){return e%4===0&&e%100!==0||e%400===0}function Kt(){return $t(this.year())}function Qt(e,t,n){var r=n-t,i=n-e.day(),s;return i>r&&(i-=7),i<r-7&&(i+=7),s=yn(e).add(i,"d"),{week:Math.ceil(s.dayOfYear()/7),year:s.year()}}function Gt(e){return Qt(e,this._week.dow,this._week.doy).week}function Zt(){return this._week.dow}function en(){return this._week.doy}function tn(e){var t=this.localeData().week(this);return e==null?t:this.add((e-t)*7,"d")}function nn(e){var t=Qt(this,1,4).week;return e==null?t:this.add((e-t)*7,"d")}function rn(e,t,n,r,i){var s=6+i-r,o=Xt(e,0,1+s),u=o.getUTCDay(),a;return u<i&&(u+=7),n=n!=null?1*n:i,a=1+s+7*(t-1)-u+n,{year:a>0?e:e-1,dayOfYear:a>0?a:Vt(e-1)+a}}function sn(e){var t=Math.round((this.clone().startOf("day")-this.clone().startOf("year"))/864e5)+1;return e==null?t:this.add(e-t,"d")}function on(e,t,n){return e!=null?e:t!=null?t:n}function un(e){var t=new Date;return e._useUTC?[t.getUTCFullYear(),t.getUTCMonth(),t.getUTCDate()]:[t.getFullYear(),t.getMonth(),t.getDate()]}function an(e){var t,n,r=[],i,s;if(e._d)return;i=un(e),e._w&&e._a[bt]==null&&e._a[yt]==null&&fn(e),e._dayOfYear&&(s=on(e._a[gt],i[gt]),e._dayOfYear>Vt(s)&&(l(e)._overflowDayOfYear=!0),n=Xt(s,0,e._dayOfYear),e._a[yt]=n.getUTCMonth(),e._a[bt]=n.getUTCDate());for(t=0;t<3&&e._a[t]==null;++t)e._a[t]=r[t]=i[t];for(;t<7;t++)e._a[t]=r[t]=e._a[t]==null?t===2?1:0:e._a[t];e._a[wt]===24&&e._a[Et]===0&&e._a[St]===0&&e._a[xt]===0&&(e._nextDay=!0,e._a[wt]=0),e._d=(e._useUTC?Xt:Wt).apply(null,r),e._tzm!=null&&e._d.setUTCMinutes(e._d.getUTCMinutes()-e._tzm),e._nextDay&&(e._a[wt]=24)}function fn(e){var t,n,r,i,s,o,u;t=e._w,t.GG!=null||t.W!=null||t.E!=null?(s=1,o=4,n=on(t.GG,e._a[gt],Qt(yn(),1,4).year),r=on(t.W,1),i=on(t.E,1)):(s=e._locale._week.dow,o=e._locale._week.doy,n=on(t.gg,e._a[gt],Qt(yn(),s,o).year),r=on(t.w,1),t.d!=null?(i=t.d,i<s&&++r):t.e!=null?i=t.e+s:i=s),u=rn(n,r,i,o,s),e._a[gt]=u.year,e._dayOfYear=u.dayOfYear}function ln(e){if(e._f===t.ISO_8601){Ut(e);return}e._a=[],l(e).empty=!0;var n=""+e._i,r,i,s,o,u,a=n.length,f=0;s=$(e._f,e._locale).match(I)||[];for(r=0;r<s.length;r++)o=s[r],i=(n.match(ct(o,e))||[])[0],i&&(u=n.substr(0,n.indexOf(i)),u.length>0&&l(e).unusedInput.push(u),n=n.slice(n.indexOf(i)+i.length),f+=i.length),U[o]?(i?l(e).empty=!1:l(e).unusedTokens.push(o),mt(o,i,e)):e._strict&&!i&&l(e).unusedTokens.push(o);l(e).charsLeftOver=a-f,n.length>0&&l(e).unusedInput.push(n),l(e).bigHour===!0&&e._a[wt]<=12&&e._a[wt]>0&&(l(e).bigHour=undefined),e._a[wt]=cn(e._locale,e._a[wt],e._meridiem),an(e),Dt(e)}function cn(e,t,n){var r;return n==null?t:e.meridiemHour!=null?e.meridiemHour(t,n):e.isPM!=null?(r=e.isPM(n),r&&t<12&&(t+=12),!r&&t===12&&(t=0),t):t}function hn(e){var t,n,r,i,s;if(e._f.length===0){l(e).invalidFormat=!0,e._d=new Date(NaN);return}for(i=0;i<e._f.length;i++){s=0,t=d({},e),e._useUTC!=null&&(t._useUTC=e._useUTC),t._f=e._f[i],ln(t);if(!c(t))continue;s+=l(t).charsLeftOver,s+=l(t).unusedTokens.length*10,l(t).score=s;if(r==null||s<r)r=s,n=t}u(e,n||t)}function pn(e){if(e._d)return;var t=D(e._i);e._a=[t.year,t.month,t.day||t.date,t.hour,t.minute,t.second,t.millisecond],an(e)}function dn(e){var t=new m(Dt(vn(e)));return t._nextDay&&(t.add(1,"d"),t._nextDay=undefined),t}function vn(e){var t=e._i,n=e._f;return e._locale=e._locale||A(e._l),t===null||n===undefined&&t===""?h({nullInput:!0}):(typeof t=="string"&&(e._i=t=e._locale.preparse(t)),g(t)?new m(Dt(t)):(r(n)?hn(e):n?ln(e):i(t)?e._d=t:mn(e),e))}function mn(e){var n=e._i;n===undefined?e._d=new Date:i(n)?e._d=new Date(+n):typeof n=="string"?zt(e):r(n)?(e._a=s(n.slice(0),function(e){return parseInt(e,10)}),an(e)):typeof n=="object"?pn(e):typeof n=="number"?e._d=new Date(n):t.createFromInputFallback(e)}function gn(e,t,n,r,i){var s={};return typeof n=="boolean"&&(r=n,n=undefined),s._isAMomentObject=!0,s._useUTC=s._isUTC=i,s._l=n,s._i=e,s._f=t,s._strict=r,dn(s)}function yn(e,t,n,r){return gn(e,t,n,r,!1)}function En(e,t){var n,i;t.length===1&&r(t[0])&&(t=t[0]);if(!t.length)return yn();n=t[0];for(i=1;i<t.length;++i)if(!t[i].isValid()||t[i][e](n))n=t[i];return n}function Sn(){var e=[].slice.call(arguments,0);return En("isBefore",e)}function xn(){var e=[].slice.call(arguments,0);return En("isAfter",e)}function Tn(e){var t=D(e),n=t.year||0,r=t.quarter||0,i=t.month||0,s=t.week||0,o=t.day||0,u=t.hour||0,a=t.minute||0,f=t.second||0,l=t.millisecond||0;this._milliseconds=+l+f*1e3+a*6e4+u*36e5,this._days=+o+s*7,this._months=+i+r*3+n*12,this._data={},this._locale=A(),this._bubble()}function Nn(e){return e instanceof Tn}function Cn(e,t){z(e,0,0,function(){var e=this.utcOffset(),n="+";return e<0&&(e=-e,n="-"),n+F(~~(e/60),2)+t+F(~~e%60,2)})}function Ln(e){var t=(e||"").match(st)||[],n=t[t.length-1]||[],r=(n+"").match(kn)||["-",0,0],i=+(r[1]*60)+b(r[2]);return r[0]==="+"?i:-i}function An(e,n){var r,s;return n._isUTC?(r=n.clone(),s=(g(e)||i(e)?+e:+yn(e))- +r,r._d.setTime(+r._d+s),t.updateOffset(r,!1),r):yn(e).local()}function On(e){return-Math.round(e._d.getTimezoneOffset()/15)*15}function Mn(e,n){var r=this._offset||0,i;return e!=null?(typeof e=="string"&&(e=Ln(e)),Math.abs(e)<16&&(e*=60),!this._isUTC&&n&&(i=On(this)),this._offset=e,this._isUTC=!0,i!=null&&this.add(i,"m"),r!==e&&(!n||this._changeInProgress?Kn(this,Wn(e-r,"m"),1,!1):this._changeInProgress||(this._changeInProgress=!0,t.updateOffset(this,!0),this._changeInProgress=null)),this):this._isUTC?r:On(this)}function _n(e,t){return e!=null?(typeof e!="string"&&(e=-e),this.utcOffset(e,t),this):-this.utcOffset()}function Dn(e){return this.utcOffset(0,e)}function Pn(e){return this._isUTC&&(this.utcOffset(0,e),this._isUTC=!1,e&&this.subtract(On(this),"m")),this}function Hn(){return this._tzm?this.utcOffset(this._tzm):typeof this._i=="string"&&this.utcOffset(Ln(this._i)),this}function Bn(e){return e=e?yn(e).utcOffset():0,(this.utcOffset()-e)%60===0}function jn(){return this.utcOffset()>this.clone().month(0).utcOffset()||this.utcOffset()>this.clone().month(5).utcOffset()}function Fn(){if(typeof this._isDSTShifted!="undefined")return this._isDSTShifted;var e={};d(e,this),e=vn(e);if(e._a){var t=e._isUTC?a(e._a):yn(e._a);this._isDSTShifted=this.isValid()&&w(e._a,t.toArray())>0}else this._isDSTShifted=!1;return this._isDSTShifted}function In(){return!this._isUTC}function qn(){return this._isUTC}function Rn(){return this._isUTC&&this._offset===0}function Wn(e,t){var n=e,r=null,i,s,u;return Nn(e)?n={ms:e._milliseconds,d:e._days,M:e._months}:typeof e=="number"?(n={},t?n[t]=e:n.milliseconds=e):(r=Un.exec(e))?(i=r[1]==="-"?-1:1,n={y:0,d:b(r[bt])*i,h:b(r[wt])*i,m:b(r[Et])*i,s:b(r[St])*i,ms:b(r[xt])*i}):(r=zn.exec(e))?(i=r[1]==="-"?-1:1,n={y:Xn(r[2],i),M:Xn(r[3],i),d:Xn(r[4],i),h:Xn(r[5],i),m:Xn(r[6],i),s:Xn(r[7],i),w:Xn(r[8],i)}):n==null?n={}:typeof n=="object"&&("from"in n||"to"in n)&&(u=$n(yn(n.from),yn(n.to)),n={},n.ms=u.milliseconds,n.M=u.months),s=new Tn(n),Nn(e)&&o(e,"_locale")&&(s._locale=e._locale),s}function Xn(e,t){var n=e&&parseFloat(e.replace(",","."));return(isNaN(n)?0:n)*t}function Vn(e,t){var n={milliseconds:0,months:0};return n.months=t.month()-e.month()+(t.year()-e.year())*12,e.clone().add(n.months,"M").isAfter(t)&&--n.months,n.milliseconds=+t- +e.clone().add(n.months,"M"),n}function $n(e,t){var n;return t=An(t,e),e.isBefore(t)?n=Vn(e,t):(n=Vn(t,e),n.milliseconds=-n.milliseconds,n.months=-n.months),n}function Jn(e,t){return function(n,r){var i,s;return r!==null&&!isNaN(+r)&&(jt(t,"moment()."+t+"(period, number) is deprecated. Please use moment()."+t+"(number, period)."),s=n,n=r,r=s),n=typeof n=="string"?+n:n,i=Wn(n,r),Kn(this,i,e),this}}function Kn(e,n,r,i){var s=n._milliseconds,o=n._days,u=n._months;i=i==null?!0:i,s&&e._d.setTime(+e._d+s*r),o&&B(e,"Date",H(e,"Date")+o*r),u&&Ot(e,H(e,"Month")+u*r),i&&t.updateOffset(e,o||u)}function Yn(e,t){var n=e||yn(),r=An(n,this).startOf("day"),i=this.diff(r,"days",!0),s=i<-6?"sameElse":i<-1?"lastWeek":i<0?"lastDay":i<1?"sameDay":i<2?"nextDay":i<7?"nextWeek":"sameElse";return this.format(t&&t[s]||this.localeData().calendar(s,this,yn(n)))}function Zn(){return new m(this)}function er(e,t){var n;return t=_(typeof t!="undefined"?t:"millisecond"),t==="millisecond"?(e=g(e)?e:yn(e),+this>+e):(n=g(e)?+e:+yn(e),n<+this.clone().startOf(t))}function tr(e,t){var n;return t=_(typeof t!="undefined"?t:"millisecond"),t==="millisecond"?(e=g(e)?e:yn(e),+this<+e):(n=g(e)?+e:+yn(e),+this.clone().endOf(t)<n)}function nr(e,t,n){return this.isAfter(e,n)&&this.isBefore(t,n)}function rr(e,t){var n;return t=_(t||"millisecond"),t==="millisecond"?(e=g(e)?e:yn(e),+this===+e):(n=+yn(e),+this.clone().startOf(t)<=n&&n<=+this.clone().endOf(t))}function ir(e,t,n){var r=An(e,this),i=(r.utcOffset()-this.utcOffset())*6e4,s,o;return t=_(t),t==="year"||t==="month"||t==="quarter"?(o=sr(this,r),t==="quarter"?o/=3:t==="year"&&(o/=12)):(s=this-r,o=t==="second"?s/1e3:t==="minute"?s/6e4:t==="hour"?s/36e5:t==="day"?(s-i)/864e5:t==="week"?(s-i)/6048e5:s),n?o:y(o)}function sr(e,t){var n=(t.year()-e.year())*12+(t.month()-e.month()),r=e.clone().add(n,"months"),i,s;return t-r<0?(i=e.clone().add(n-1,"months"),s=(t-r)/(r-i)):(i=e.clone().add(n+1,"months"),s=(t-r)/(i-r)),-(n+s)}function or(){return this.clone().locale("en").format("ddd MMM DD YYYY HH:mm:ss [GMT]ZZ")}function ur(){var e=this.clone().utc();return 0<e.year()&&e.year()<=9999?"function"==typeof Date.prototype.toISOString?this.toDate().toISOString():V(e,"YYYY-MM-DD[T]HH:mm:ss.SSS[Z]"):V(e,"YYYYYY-MM-DD[T]HH:mm:ss.SSS[Z]")}function ar(e){var n=V(this,e||t.defaultFormat);return this.localeData().postformat(n)}function fr(e,t){return this.isValid()?Wn({to:this,from:e}).locale(this.locale()).humanize(!t):this.localeData().invalidDate()}function lr(e){return this.from(yn(),e)}function cr(e,t){return this.isValid()?Wn({from:this,to:e}).locale(this.locale()).humanize(!t):this.localeData().invalidDate()}function hr(e){return this.to(yn(),e)}function pr(e){var t;return e===undefined?this._locale._abbr:(t=A(e),t!=null&&(this._locale=t),this)}function vr(){return this._locale}function mr(e){e=_(e);switch(e){case"year":this.month(0);case"quarter":case"month":this.date(1);case"week":case"isoWeek":case"day":this.hours(0);case"hour":this.minutes(0);case"minute":this.seconds(0);case"second":this.milliseconds(0)}return e==="week"&&this.weekday(0),e==="isoWeek"&&this.isoWeekday(1),e==="quarter"&&this.month(Math.floor(this.month()/3)*3),this}function gr(e){return e=_(e),e===undefined||e==="millisecond"?this:this.startOf(e).add(1,e==="isoWeek"?"week":e).subtract(1,"ms")}function yr(){return+this._d-(this._offset||0)*6e4}function br(){return Math.floor(+this/1e3)}function wr(){return this._offset?new Date(+this):this._d}function Er(){var e=this;return[e.year(),e.month(),e.date(),e.hour(),e.minute(),e.second(),e.millisecond()]}function Sr(){var e=this;return{years:e.year(),months:e.month(),date:e.date(),hours:e.hours(),minutes:e.minutes(),seconds:e.seconds(),milliseconds:e.milliseconds()}}function xr(){return c(this)}function Tr(){return u({},l(this))}function Nr(){return l(this).overflow}function Cr(e,t){z(0,[e,e.length],0,t)}function kr(e,t,n){return Qt(yn([e,11,31+t-n]),t,n).week}function Lr(e){var t=Qt(this,this.localeData()._week.dow,this.localeData()._week.doy).year;return e==null?t:this.add(e-t,"y")}function Ar(e){var t=Qt(this,1,4).year;return e==null?t:this.add(e-t,"y")}function Or(){return kr(this.year(),1,4)}function Mr(){var e=this.localeData()._week;return kr(this.year(),e.dow,e.doy)}function _r(e){return e==null?Math.ceil((this.month()+1)/3):this.month((e-1)*3+this.month()%3)}function Pr(e,t){return typeof e!="string"?e:isNaN(e)?(e=t.weekdaysParse(e),typeof e=="number"?e:null):parseInt(e,10)}function Br(e){return this._weekdays[e.day()]}function Fr(e){return this._weekdaysShort[e.day()]}function qr(e){return this._weekdaysMin[e.day()]}function Rr(e){var t,n,r;this._weekdaysParse=this._weekdaysParse||[];for(t=0;t<7;t++){this._weekdaysParse[t]||(n=yn([2e3,1]).day(t),r="^"+this.weekdays(n,"")+"|^"+this.weekdaysShort(n,"")+"|^"+this.weekdaysMin(n,""),this._weekdaysParse[t]=new RegExp(r.replace(".",""),"i"));if(this._weekdaysParse[t].test(e))return t}}function Ur(e){var t=this._isUTC?this._d.getUTCDay():this._d.getDay();return e!=null?(e=Pr(e,this.localeData()),this.add(e-t,"d")):t}function zr(e){var t=(this.day()+7-this.localeData()._week.dow)%7;return e==null?t:this.add(e-t,"d")}function Wr(e){return e==null?this.day()||7:this.day(this.day()%7?e:e-7)}function Xr(e,t){z(e,0,0,function(){return this.localeData().meridiem(this.hours(),this.minutes(),t)})}function Vr(e,t){return t._meridiemParse}function $r(e){return(e+"").toLowerCase().charAt(0)==="p"}function Kr(e,t,n){return e>11?n?"pm":"PM":n?"am":"AM"}function ei(e,t){t[xt]=b(("0."+e)*1e3)}function ni(){return this._isUTC?"UTC":""}function ri(){return this._isUTC?"Coordinated Universal Time":""}function oi(e){return yn(e*1e3)}function ui(){return yn.apply(null,arguments).parseZone()}function fi(e,t,n){var r=this._calendar[e];return typeof r=="function"?r.call(t,n):r}function ci(e){var t=this._longDateFormat[e],n=this._longDateFormat[e.toUpperCase()];return t||!n?t:(this._longDateFormat[e]=n.replace(/MMMM|MM|DD|dddd/g,function(e){return e.slice(1)}),this._longDateFormat[e])}function pi(){return this._invalidDate}function mi(e){return this._ordinal.replace("%d",e)}function gi(e){return e}function bi(e,t,n,r){var i=this._relativeTime[n];return typeof i=="function"?i(e,t,n,r):i.replace(/%d/i,e)}function wi(e,t){var n=this._relativeTime[e>0?"future":"past"];return typeof n=="function"?n(t):n.replace(/%s/i,t)}function Ei(e){var t,n;for(n in e)t=e[n],typeof t=="function"?this[n]=t:this["_"+n]=t;this._ordinalParseLenient=new RegExp(this._ordinalParse.source+"|"+/\d{1,2}/.source)}function xi(e,t,n,r){var i=A(),s=a().set(r,t);return i[n](s,e)}function Ti(e,t,n,r,i){typeof e=="number"&&(t=e,e=undefined),e=e||"";if(t!=null)return xi(e,t,n,i);var s,o=[];for(s=0;s<r;s++)o[s]=xi(e,s,n,i);return o}function Ni(e,t){return Ti(e,t,"months",12,"month")}function Ci(e,t){return Ti(e,t,"monthsShort",12,"month")}function ki(e,t){return Ti(e,t,"weekdays",7,"day")}function Li(e,t){return Ti(e,t,"weekdaysShort",7,"day")}function Ai(e,t){return Ti(e,t,"weekdaysMin",7,"day")}function Mi(){var e=this._data;return this._milliseconds=Oi(this._milliseconds),this._days=Oi(this._days),this._months=Oi(this._months),e.milliseconds=Oi(e.milliseconds),e.seconds=Oi(e.seconds),e.minutes=Oi(e.minutes),e.hours=Oi(e.hours),e.months=Oi(e.months),e.years=Oi(e.years),this}function _i(e,t,n,r){var i=Wn(t,n);return e._milliseconds+=r*i._milliseconds,e._days+=r*i._days,e._months+=r*i._months,e._bubble()}function Di(e,t){return _i(this,e,t,1)}function Pi(e,t){return _i(this,e,t,-1)}function Hi(e){return e<0?Math.floor(e):Math.ceil(e)}function Bi(){var e=this._milliseconds,t=this._days,n=this._months,r=this._data,i,s,o,u,a;return e>=0&&t>=0&&n>=0||e<=0&&t<=0&&n<=0||(e+=Hi(Fi(n)+t)*864e5,t=0,n=0),r.milliseconds=e%1e3,i=y(e/1e3),r.seconds=i%60,s=y(i/60),r.minutes=s%60,o=y(s/60),r.hours=o%24,t+=y(o/24),a=y(ji(t)),n+=a,t-=Hi(Fi(a)),u=y(n/12),n%=12,r.days=t,r.months=n,r.years=u,this}function ji(e){return e*4800/146097}function Fi(e){return e*146097/4800}function Ii(e){var t,n,r=this._milliseconds;e=_(e);if(e==="month"||e==="year")return t=this._days+r/864e5,n=this._months+ji(t),e==="month"?n:n/12;t=this._days+Math.round(Fi(this._months));switch(e){case"week":return t/7+r/6048e5;case"day":return t+r/864e5;case"hour":return t*24+r/36e5;case"minute":return t*1440+r/6e4;case"second":return t*86400+r/1e3;case"millisecond":return Math.floor(t*864e5)+r;default:throw new Error("Unknown unit "+e)}}function qi(){return this._milliseconds+this._days*864e5+this._months%12*2592e6+b(this._months/12)*31536e6}function Ri(e){return function(){return this.as(e)}}function Qi(e){return e=_(e),this[e+"s"]()}function Gi(e){return function(){return this._data[e]}}function ss(){return y(this.days()/7)}function as(e,t,n,r,i){return i.relativeTime(t||1,!!n,e,r)}function fs(e,t,n){var r=Wn(e).abs(),i=os(r.as("s")),s=os(r.as("m")),o=os(r.as("h")),u=os(r.as("d")),a=os(r.as("M")),f=os(r.as("y")),l=i<us.s&&["s",i]||s===1&&["m"]||s<us.m&&["mm",s]||o===1&&["h"]||o<us.h&&["hh",o]||u===1&&["d"]||u<us.d&&["dd",u]||a===1&&["M"]||a<us.M&&["MM",a]||f===1&&["y"]||["yy",f];return l[2]=t,l[3]=+e>0,l[4]=n,as.apply(null,l)}function ls(e,t){return us[e]===undefined?!1:t===undefined?us[e]:(us[e]=t,!0)}function cs(e){var t=this.localeData(),n=fs(this,!e,t);return e&&(n=t.pastFuture(+this,n)),t.postformat(n)}function ps(){var e=hs(this._milliseconds)/1e3,t=hs(this._days),n=hs(this._months),r,i,s;r=y(e/60),i=y(r/60),e%=60,r%=60,s=y(n/12),n%=12;var o=s,u=n,a=t,f=i,l=r,c=e,h=this.asSeconds();return h?(h<0?"-":"")+"P"+(o?o+"Y":"")+(u?u+"M":"")+(a?a+"D":"")+(f||l||c?"T":"")+(f?f+"H":"")+(l?l+"M":"")+(c?c+"S":""):"P0D"}var e,p=t.momentProperties=[],v=!1,S={},x,O={},I=/(\[[^\[]*\])|(\\)?(Mo|MM?M?M?|Do|DDDo|DD?D?D?|ddd?d?|do?|w[o|w]?|W[o|W]?|Q|YYYYYY|YYYYY|YYYY|YY|gg(ggg?)?|GG(GGG?)?|e|E|a|A|hh?|HH?|mm?|ss?|S{1,9}|x|X|zz?|ZZ?|.)/g,q=/(\[[^\[]*\])|(\\)?(LTS|LT|LL?L?L?|l{1,4})/g,R={},U={},J=/\d/,K=/\d\d/,Q=/\d{3}/,G=/\d{4}/,Y=/[+-]?\d{6}/,Z=/\d\d?/,et=/\d{1,3}/,tt=/\d{1,4}/,nt=/[+-]?\d{1,6}/,rt=/\d+/,it=/[+-]?\d+/,st=/Z|[+-]\d\d:?\d\d/gi,ot=/[+-]?\d+(\.\d{1,3})?/,ut=/[0-9]*['a-z\u00A0-\u05FF\u0700-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]+|[\u0600-\u06FF\/]+(\s*?[\u0600-\u06FF]+){1,2}/i,at={},pt={},gt=0,yt=1,bt=2,wt=3,Et=4,St=5,xt=6;z("M",["MM",2],"Mo",function(){return this.month()+1}),z("MMM",0,0,function(e){return this.localeData().monthsShort(this,e)}),z("MMMM",0,0,function(e){return this.localeData().months(this,e)}),M("month","M"),lt("M",Z),lt("MM",Z,K),lt("MMM",ut),lt("MMMM",ut),dt(["M","MM"],function(e,t){t[yt]=b(e)-1}),dt(["MMM","MMMM"],function(e,t,n,r){var i=n._locale.monthsParse(e,r,n._strict);i!=null?t[yt]=i:l(n).invalidMonth=e});var Nt="January_February_March_April_May_June_July_August_September_October_November_December".split("_"),kt="Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec".split("_"),Bt={};t.suppressDeprecationWarnings=!1;var Ft=/^\s*(?:[+-]\d{6}|\d{4})-(?:(\d\d-\d\d)|(W\d\d$)|(W\d\d-\d)|(\d\d\d))((T| )(\d\d(:\d\d(:\d\d(\.\d+)?)?)?)?([\+\-]\d\d(?::?\d\d)?|\s*Z)?)?$/,It=[["YYYYYY-MM-DD",/[+-]\d{6}-\d{2}-\d{2}/],["YYYY-MM-DD",/\d{4}-\d{2}-\d{2}/],["GGGG-[W]WW-E",/\d{4}-W\d{2}-\d/],["GGGG-[W]WW",/\d{4}-W\d{2}/],["YYYY-DDD",/\d{4}-\d{3}/]],qt=[["HH:mm:ss.SSSS",/(T| )\d\d:\d\d:\d\d\.\d+/],["HH:mm:ss",/(T| )\d\d:\d\d:\d\d/],["HH:mm",/(T| )\d\d:\d\d/],["HH",/(T| )\d\d/]],Rt=/^\/?Date\((\-?\d+)/i;t.createFromInputFallback=Ht("moment construction falls back to js Date. This is discouraged and will be removed in upcoming major release. Please refer to https://github.com/moment/moment/issues/1407 for more info.",function(e){e._d=new Date(e._i+(e._useUTC?" UTC":""))}),z(0,["YY",2],0,function(){return this.year()%100}),z(0,["YYYY",4],0,"year"),z(0,["YYYYY",5],0,"year"),z(0,["YYYYYY",6,!0],0,"year"),M("year","y"),lt("Y",it),lt("YY",Z,K),lt("YYYY",tt,G),lt("YYYYY",nt,Y),lt("YYYYYY",nt,Y),dt(["YYYYY","YYYYYY"],gt),dt("YYYY",function(e,n){n[gt]=e.length===2?t.parseTwoDigitYear(e):b(e)}),dt("YY",function(e,n){n[gt]=t.parseTwoDigitYear(e)}),t.parseTwoDigitYear=function(e){return b(e)+(b(e)>68?1900:2e3)};var Jt=P("FullYear",!1);z("w",["ww",2],"wo","week"),z("W",["WW",2],"Wo","isoWeek"),M("week","w"),M("isoWeek","W"),lt("w",Z),lt("ww",Z,K),lt("W",Z),lt("WW",Z,K),vt(["w","ww","W","WW"],function(e,t,n,r){t[r.substr(0,1)]=b(e)});var Yt={dow:0,doy:6};z("DDD",["DDDD",3],"DDDo","dayOfYear"),M("dayOfYear","DDD"),lt("DDD",et),lt("DDDD",Q),dt(["DDD","DDDD"],function(e,t,n){n._dayOfYear=b(e)}),t.ISO_8601=function(){};var bn=Ht("moment().min is deprecated, use moment.min instead. https://github.com/moment/moment/issues/1548",function(){var e=yn.apply(null,arguments);return e<this?this:e}),wn=Ht("moment().max is deprecated, use moment.max instead. https://github.com/moment/moment/issues/1548",function(){var e=yn.apply(null,arguments);return e>this?this:e});Cn("Z",":"),Cn("ZZ",""),lt("Z",st),lt("ZZ",st),dt(["Z","ZZ"],function(e,t,n){n._useUTC=!0,n._tzm=Ln(e)});var kn=/([\+\-]|\d\d)/gi;t.updateOffset=function(){};var Un=/(\-)?(?:(\d*)\.)?(\d+)\:(\d+)(?:\:(\d+)\.?(\d{3})?)?/,zn=/^(-)?P(?:(?:([0-9,.]*)Y)?(?:([0-9,.]*)M)?(?:([0-9,.]*)D)?(?:T(?:([0-9,.]*)H)?(?:([0-9,.]*)M)?(?:([0-9,.]*)S)?)?|([0-9,.]*)W)$/;Wn.fn=Tn.prototype;var Qn=Jn(1,"add"),Gn=Jn(-1,"subtract");t.defaultFormat="YYYY-MM-DDTHH:mm:ssZ";var dr=Ht("moment().lang() is deprecated. Instead, use moment().localeData() to get the language configuration. Use moment().locale() to change languages.",function(e){return e===undefined?this.localeData():this.locale(e)});z(0,["gg",2],0,function(){return this.weekYear()%100}),z(0,["GG",2],0,function(){return this.isoWeekYear()%100}),Cr("gggg","weekYear"),Cr("ggggg","weekYear"),Cr("GGGG","isoWeekYear"),Cr("GGGGG","isoWeekYear"),M("weekYear","gg"),M("isoWeekYear","GG"),lt("G",it),lt("g",it),lt("GG",Z,K),lt("gg",Z,K),lt("GGGG",tt,G),lt("gggg",tt,G),lt("GGGGG",nt,Y),lt("ggggg",nt,Y),vt(["gggg","ggggg","GGGG","GGGGG"],function(e,t,n,r){t[r.substr(0,2)]=b(e)}),vt(["gg","GG"],function(e,n,r,i){n[i]=t.parseTwoDigitYear(e)}),z("Q",0,0,"quarter"),M("quarter","Q"),lt("Q",J),dt("Q",function(e,t){t[yt]=(b(e)-1)*3}),z("D",["DD",2],"Do","date"),M("date","D"),lt("D",Z),lt("DD",Z,K),lt("Do",function(e,t){return e?t._ordinalParse:t._ordinalParseLenient}),dt(["D","DD"],bt),dt("Do",function(e,t){t[bt]=b(e.match(Z)[0],10)});var Dr=P("Date",!0);z("d",0,"do","day"),z("dd",0,0,function(e){return this.localeData().weekdaysMin(this,e)}),z("ddd",0,0,function(e){return this.localeData().weekdaysShort(this,e)}),z("dddd",0,0,function(e){return this.localeData().weekdays(this,e)}),z("e",0,0,"weekday"),z("E",0,0,"isoWeekday"),M("day","d"),M("weekday","e"),M("isoWeekday","E"),lt("d",Z),lt("e",Z),lt("E",Z),lt("dd",ut),lt("ddd",ut),lt("dddd",ut),vt(["dd","ddd","dddd"],function(e,t,n){var r=n._locale.weekdaysParse(e);r!=null?t.d=r:l(n).invalidWeekday=e}),vt(["d","e","E"],function(e,t,n,r){t[r]=b(e)});var Hr="Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),jr="Sun_Mon_Tue_Wed_Thu_Fri_Sat".split("_"),Ir="Su_Mo_Tu_We_Th_Fr_Sa".split("_");z("H",["HH",2],0,"hour"),z("h",["hh",2],0,function(){return this.hours()%12||12}),Xr("a",!0),Xr("A",!1),M("hour","h"),lt("a",Vr),lt("A",Vr),lt("H",Z),lt("h",Z),lt("HH",Z,K),lt("hh",Z,K),dt(["H","HH"],wt),dt(["a","A"],function(e,t,n){n._isPm=n._locale.isPM(e),n._meridiem=e}),dt(["h","hh"],function(e,t,n){t[wt]=b(e),l(n).bigHour=!0});var Jr=/[ap]\.?m?\.?/i,Qr=P("Hours",!0);z("m",["mm",2],0,"minute"),M("minute","m"),lt("m",Z),lt("mm",Z,K),dt(["m","mm"],Et);var Gr=P("Minutes",!1);z("s",["ss",2],0,"second"),M("second","s"),lt("s",Z),lt("ss",Z,K),dt(["s","ss"],St);var Yr=P("Seconds",!1);z("S",0,0,function(){return~~(this.millisecond()/100)}),z(0,["SS",2],0,function(){return~~(this.millisecond()/10)}),z(0,["SSS",3],0,"millisecond"),z(0,["SSSS",4],0,function(){return this.millisecond()*10}),z(0,["SSSSS",5],0,function(){return this.millisecond()*100}),z(0,["SSSSSS",6],0,function(){return this.millisecond()*1e3}),z(0,["SSSSSSS",7],0,function(){return this.millisecond()*1e4}),z(0,["SSSSSSSS",8],0,function(){return this.millisecond()*1e5}),z(0,["SSSSSSSSS",9],0,function(){return this.millisecond()*1e6}),M("millisecond","ms"),lt("S",et,J),lt("SS",et,K),lt("SSS",et,Q);var Zr;for(Zr="SSSS";Zr.length<=9;Zr+="S")lt(Zr,rt);for(Zr="S";Zr.length<=9;Zr+="S")dt(Zr,ei);var ti=P("Milliseconds",!1);z("z",0,0,"zoneAbbr"),z("zz",0,0,"zoneName");var ii=m.prototype;ii.add=Qn,ii.calendar=Yn,ii.clone=Zn,ii.diff=ir,ii.endOf=gr,ii.format=ar,ii.from=fr,ii.fromNow=lr,ii.to=cr,ii.toNow=hr,ii.get=j,ii.invalidAt=Nr,ii.isAfter=er,ii.isBefore=tr,ii.isBetween=nr,ii.isSame=rr,ii.isValid=xr,ii.lang=dr,ii.locale=pr,ii.localeData=vr,ii.max=wn,ii.min=bn,ii.parsingFlags=Tr,ii.set=j,ii.startOf=mr,ii.subtract=Gn,ii.toArray=Er,ii.toObject=Sr,ii.toDate=wr,ii.toISOString=ur,ii.toJSON=ur,ii.toString=or,ii.unix=br,ii.valueOf=yr,ii.year=Jt,ii.isLeapYear=Kt,ii.weekYear=Lr,ii.isoWeekYear=Ar,ii.quarter=ii.quarters=_r,ii.month=Mt,ii.daysInMonth=_t,ii.week=ii.weeks=tn,ii.isoWeek=ii.isoWeeks=nn,ii.weeksInYear=Mr,ii.isoWeeksInYear=Or,ii.date=Dr,ii.day=ii.days=Ur,ii.weekday=zr,ii.isoWeekday=Wr,ii.dayOfYear=sn,ii.hour=ii.hours=Qr,ii.minute=ii.minutes=Gr,ii.second=ii.seconds=Yr,ii.millisecond=ii.milliseconds=ti,ii.utcOffset=Mn,ii.utc=Dn,ii.local=Pn,ii.parseZone=Hn,ii.hasAlignedHourOffset=Bn,ii.isDST=jn,ii.isDSTShifted=Fn,ii.isLocal=In,ii.isUtcOffset=qn,ii.isUtc=Rn,ii.isUTC=Rn,ii.zoneAbbr=ni,ii.zoneName=ri,ii.dates=Ht("dates accessor is deprecated. Use date instead.",Dr),ii.months=Ht("months accessor is deprecated. Use month instead",Mt),ii.years=Ht("years accessor is deprecated. Use year instead",Jt),ii.zone=Ht("moment().zone is deprecated, use moment().utcOffset instead. https://github.com/moment/moment/issues/1779",_n);var si=ii,ai={sameDay:"[Today at] LT",nextDay:"[Tomorrow at] LT",nextWeek:"dddd [at] LT",lastDay:"[Yesterday at] LT",lastWeek:"[Last] dddd [at] LT",sameElse:"L"},li={LTS:"h:mm:ss A",LT:"h:mm A",L:"MM/DD/YYYY",LL:"MMMM D, YYYY",LLL:"MMMM D, YYYY h:mm A",LLLL:"dddd, MMMM D, YYYY h:mm A"},hi="Invalid date",di="%d",vi=/\d{1,2}/,yi={future:"in %s",past:"%s ago",s:"a few seconds",m:"a minute",mm:"%d minutes",h:"an hour",hh:"%d hours",d:"a day",dd:"%d days",M:"a month",MM:"%d months",y:"a year",yy:"%d years"},Si=E.prototype;Si._calendar=ai,Si.calendar=fi,Si._longDateFormat=li,Si.longDateFormat=ci,Si._invalidDate=hi,Si.invalidDate=pi,Si._ordinal=di,Si.ordinal=mi,Si._ordinalParse=vi,Si.preparse=gi,Si.postformat=gi,Si._relativeTime=yi,Si.relativeTime=bi,Si.pastFuture=wi,Si.set=Ei,Si.months=Ct,Si._months=Nt,Si.monthsShort=Lt,Si._monthsShort=kt,Si.monthsParse=At,Si.week=Gt,Si._week=Yt,Si.firstDayOfYear=en,Si.firstDayOfWeek=Zt,Si.weekdays=Br,Si._weekdays=Hr,Si.weekdaysMin=qr,Si._weekdaysMin=Ir,Si.weekdaysShort=Fr,Si._weekdaysShort=jr,Si.weekdaysParse=Rr,Si.isPM=$r,Si._meridiemParse=Jr,Si.meridiem=Kr,k("en",{ordinalParse:/\d{1,2}(th|st|nd|rd)/,ordinal:function(e){var t=e%10,n=b(e%100/10)===1?"th":t===1?"st":t===2?"nd":t===3?"rd":"th";return e+n}}),t.lang=Ht("moment.lang is deprecated. Use moment.locale instead.",k),t.langData=Ht("moment.langData is deprecated. Use moment.localeData instead.",A);var Oi=Math.abs,Ui=Ri("ms"),zi=Ri("s"),Wi=Ri("m"),Xi=Ri("h"),Vi=Ri("d"),$i=Ri("w"),Ji=Ri("M"),Ki=Ri("y"),Yi=Gi("milliseconds"),Zi=Gi("seconds"),es=Gi("minutes"),ts=Gi("hours"),ns=Gi("days"),rs=Gi("months"),is=Gi("years"),os=Math.round,us={s:45,m:45,h:22,d:26,M:11},hs=Math.abs,ds=Tn.prototype;ds.abs=Mi,ds.add=Di,ds.subtract=Pi,ds.as=Ii,ds.asMilliseconds=Ui,ds.asSeconds=zi,ds.asMinutes=Wi,ds.asHours=Xi,ds.asDays=Vi,ds.asWeeks=$i,ds.asMonths=Ji,ds.asYears=Ki,ds.valueOf=qi,ds._bubble=Bi,ds.get=Qi,ds.milliseconds=Yi,ds.seconds=Zi,ds.minutes=es,ds.hours=ts,ds.days=ns,ds.weeks=ss,ds.months=rs,ds.years=is,ds.humanize=cs,ds.toISOString=ps,ds.toString=ps,ds.toJSON=ps,ds.locale=pr,ds.localeData=vr,ds.toIsoString=Ht("toIsoString() is deprecated. Please use toISOString() instead (notice the capitals)",ps),ds.lang=dr,z("X",0,0,"unix"),z("x",0,0,"valueOf"),lt("x",it),lt("X",ot),dt("X",function(e,t,n){n._d=new Date(parseFloat(e,10)*1e3)}),dt("x",function(e,t,n){n._d=new Date(b(e))}),t.version="2.10.6",n(yn),t.fn=si,t.min=Sn,t.max=xn,t.utc=a,t.unix=oi,t.months=Ni,t.isDate=i,t.locale=k,t.invalid=h,t.duration=Wn,t.isMoment=g,t.weekdays=ki,t.parseZone=ui,t.localeData=A,t.isDuration=Nn,t.monthsShort=Ci,t.weekdaysMin=Ai,t.defineLocale=L,t.weekdaysShort=Li,t.normalizeUnits=_,t.relativeTimeThreshold=ls;var vs=t;return vs}),function(e,t){typeof exports=="object"&&typeof module!="undefined"?t(require("../moment")):typeof define=="function"&&define.amd?define("moment_af",["moment"],t):t(e.moment)}(this,function(e){"use strict";var t=e.defineLocale("af",{months:"Januarie_Februarie_Maart_April_Mei_Junie_Julie_Augustus_September_Oktober_November_Desember".split("_"),monthsShort:"Jan_Feb_Mar_Apr_Mei_Jun_Jul_Aug_Sep_Okt_Nov_Des".split("_"),weekdays:"Sondag_Maandag_Dinsdag_Woensdag_Donderdag_Vrydag_Saterdag".split("_"),weekdaysShort:"Son_Maa_Din_Woe_Don_Vry_Sat".split("_"),weekdaysMin:"So_Ma_Di_Wo_Do_Vr_Sa".split("_"),meridiemParse:/vm|nm/i,isPM:function(e){return/^nm$/i.test(e)},meridiem:function(e,t,n){return e<12?n?"vm":"VM":n?"nm":"NM"},longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd, D MMMM YYYY HH:mm"},calendar:{sameDay:"[Vandag om] LT",nextDay:"[Môre om] LT",nextWeek:"dddd [om] LT",lastDay:"[Gister om] LT",lastWeek:"[Laas] dddd [om] LT",sameElse:"L"},relativeTime:{future:"oor %s",past:"%s gelede",s:"'n paar sekondes",m:"'n minuut",mm:"%d minute",h:"'n uur",hh:"%d ure",d:"'n dag",dd:"%d dae",M:"'n maand",MM:"%d maande",y:"'n jaar",yy:"%d jaar"},ordinalParse:/\d{1,2}(ste|de)/,ordinal:function(e){return e+(e===1||e===8||e>=20?"ste":"de")},week:{dow:1,doy:4}});return t}),function(e,t){typeof exports=="object"&&typeof module!="undefined"?t(require("../moment")):typeof define=="function"&&define.amd?define("moment_de",["moment"],t):t(e.moment)}(this,function(e){"use strict";function t(e,t,n,r){var i={m:["eine Minute","einer Minute"],h:["eine Stunde","einer Stunde"],d:["ein Tag","einem Tag"],dd:[e+" Tage",e+" Tagen"],M:["ein Monat","einem Monat"],MM:[e+" Monate",e+" Monaten"],y:["ein Jahr","einem Jahr"],yy:[e+" Jahre",e+" Jahren"]};return t?i[n][0]:i[n][1]}var n=e.defineLocale("de",{months:"Januar_Februar_März_April_Mai_Juni_Juli_August_September_Oktober_November_Dezember".split("_"),monthsShort:"Jan._Febr._Mrz._Apr._Mai_Jun._Jul._Aug._Sept._Okt._Nov._Dez.".split("_"),weekdays:"Sonntag_Montag_Dienstag_Mittwoch_Donnerstag_Freitag_Samstag".split("_"),weekdaysShort:"So._Mo._Di._Mi._Do._Fr._Sa.".split("_"),weekdaysMin:"So_Mo_Di_Mi_Do_Fr_Sa".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD.MM.YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY HH:mm",LLLL:"dddd, D. MMMM YYYY HH:mm"},calendar:{sameDay:"[Heute um] LT [Uhr]",sameElse:"L",nextDay:"[Morgen um] LT [Uhr]",nextWeek:"dddd [um] LT [Uhr]",lastDay:"[Gestern um] LT [Uhr]",lastWeek:"[letzten] dddd [um] LT [Uhr]"},relativeTime:{future:"in %s",past:"vor %s",s:"ein paar Sekunden",m:t,mm:"%d Minuten",h:t,hh:"%d Stunden",d:t,dd:t,M:t,MM:t,y:t,yy:t},ordinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:4}});return n}),function(e,t){typeof exports=="object"&&typeof module!="undefined"?t(require("../moment")):typeof define=="function"&&define.amd?define("moment_es",["moment"],t):t(e.moment)}(this,function(e){"use strict";var t="Ene._Feb._Mar._Abr._May._Jun._Jul._Ago._Sep._Oct._Nov._Dic.".split("_"),n="Ene_Feb_Mar_Abr_May_Jun_Jul_Ago_Sep_Oct_Nov_Dic".split("_"),r=e.defineLocale("es",{months:"Enero_Febrero_Marzo_Abril_Mayo_Junio_Julio_Agosto_Septiembre_Octubre_Noviembre_Diciembre".split("_"),monthsShort:function(e,r){return/-MMM-/.test(r)?n[e.month()]:t[e.month()]},weekdays:"Domingo_Lunes_Martes_Miércoles_Jueves_Viernes_Sábado".split("_"),weekdaysShort:"Dom._Lun._Mar._Mié._Jue._Vie._Sáb.".split("_"),weekdaysMin:"Do_Lu_Ma_Mi_Ju_Vi_Sá".split("_"),longDateFormat:{LT:"H:mm",LTS:"H:mm:ss",L:"DD/MM/YYYY",LL:"D [de] MMMM [de] YYYY",LLL:"D [de] MMMM [de] YYYY H:mm",LLLL:"dddd, D [de] MMMM [de] YYYY H:mm"},calendar:{sameDay:function(){return"[hoy a la"+(this.hours()!==1?"s":"")+"] LT"},nextDay:function(){return"[mañana a la"+(this.hours()!==1?"s":"")+"] LT"},nextWeek:function(){return"dddd [a la"+(this.hours()!==1?"s":"")+"] LT"},lastDay:function(){return"[ayer a la"+(this.hours()!==1?"s":"")+"] LT"},lastWeek:function(){return"[el] dddd [pasado a la"+(this.hours()!==1?"s":"")+"] LT"},sameElse:"L"},relativeTime:{future:"en %s",past:"hace %s",s:"unos segundos",m:"un minuto",mm:"%d minutos",h:"una hora",hh:"%d horas",d:"un día",dd:"%d días",M:"un mes",MM:"%d meses",y:"un año",yy:"%d años"},ordinalParse:/\d{1,2}º/,ordinal:"%dº",week:{dow:1,doy:4}});return r}),function(e,t){typeof exports=="object"&&typeof module!="undefined"?t(require("../moment")):typeof define=="function"&&define.amd?define("moment_fr",["moment"],t):t(e.moment)}(this,function(e){"use strict";var t=e.defineLocale("fr",{months:"janvier_février_mars_avril_mai_juin_juillet_août_septembre_octobre_novembre_décembre".split("_"),monthsShort:"janv._févr._mars_avr._mai_juin_juil._août_sept._oct._nov._déc.".split("_"),weekdays:"dimanche_lundi_mardi_mercredi_jeudi_vendredi_samedi".split("_"),weekdaysShort:"dim._lun._mar._mer._jeu._ven._sam.".split("_"),weekdaysMin:"Di_Lu_Ma_Me_Je_Ve_Sa".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd D MMMM YYYY HH:mm"},calendar:{sameDay:"[Aujourd'hui à] LT",nextDay:"[Demain à] LT",nextWeek:"dddd [à] LT",lastDay:"[Hier à] LT",lastWeek:"dddd [dernier à] LT",sameElse:"L"},relativeTime:{future:"dans %s",past:"il y a %s",s:"quelques secondes",m:"une minute",mm:"%d minutes",h:"une heure",hh:"%d heures",d:"un jour",dd:"%d jours",M:"un mois",MM:"%d mois",y:"un an",yy:"%d ans"},ordinalParse:/\d{1,2}(er|)/,ordinal:function(e){return e+(e===1?"er":"")},week:{dow:1,doy:4}});return t}),function(e,t){typeof exports=="object"&&typeof module!="undefined"?t(require("../moment")):typeof define=="function"&&define.amd?define("moment_he",["moment"],t):t(e.moment)}(this,function(e){"use strict";var t=e.defineLocale("he",{months:"ינואר_פברואר_מרץ_אפריל_מאי_יוני_יולי_אוגוסט_ספטמבר_אוקטובר_נובמבר_דצמבר".split("_"),monthsShort:"ינו׳_פבר׳_מרץ_אפר׳_מאי_יוני_יולי_אוג׳_ספט׳_אוק׳_נוב׳_דצמ׳".split("_"),weekdays:"ראשון_שני_שלישי_רביעי_חמישי_שישי_שבת".split("_"),weekdaysShort:"א׳_ב׳_ג׳_ד׳_ה׳_ו׳_ש׳".split("_"),weekdaysMin:"א_ב_ג_ד_ה_ו_ש".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D [ב]MMMM YYYY",LLL:"D [ב]MMMM YYYY HH:mm",LLLL:"dddd, D [ב]MMMM YYYY HH:mm",l:"D/M/YYYY",ll:"D MMM YYYY",lll:"D MMM YYYY HH:mm",llll:"ddd, D MMM YYYY HH:mm"},calendar:{sameDay:"[היום ב־]LT",nextDay:"[מחר ב־]LT",nextWeek:"dddd [בשעה] LT",lastDay:"[אתמול ב־]LT",lastWeek:"[ביום] dddd [האחרון בשעה] LT",sameElse:"L"},relativeTime:{future:"בעוד %s",past:"לפני %s",s:"מספר שניות",m:"דקה",mm:"%d דקות",h:"שעה",hh:function(e){return e===2?"שעתיים":e+" שעות"},d:"יום",dd:function(e){return e===2?"יומיים":e+" ימים"},M:"חודש",MM:function(e){return e===2?"חודשיים":e+" חודשים"},y:"שנה",yy:function(e){return e===2?"שנתיים":e%10===0&&e!==10?e+" שנה":e+" שנים"}}});return t}),function(e,t){typeof exports=="object"&&typeof module!="undefined"?t(require("../moment")):typeof define=="function"&&define.amd?define("moment_hu",["moment"],t):t(e.moment)}(this,function(e){"use strict";function n(e,t,n,r){var i=e,s;switch(n){case"s":return r||t?"néhány másodperc":"néhány másodperce";case"m":return"egy"+(r||t?" perc":" perce");case"mm":return i+(r||t?" perc":" perce");case"h":return"egy"+(r||t?" óra":" órája");case"hh":return i+(r||t?" óra":" órája");case"d":return"egy"+(r||t?" nap":" napja");case"dd":return i+(r||t?" nap":" napja");case"M":return"egy"+(r||t?" hónap":" hónapja");case"MM":return i+(r||t?" hónap":" hónapja");case"y":return"egy"+(r||t?" év":" éve");case"yy":return i+(r||t?" év":" éve")}return""}function r(e){return(e?"":"[múlt] ")+"["+t[this.day()]+"] LT[-kor]"}var t="vasárnap hétfőn kedden szerdán csütörtökön pénteken szombaton".split(" "),i=e.defineLocale("hu",{months:"január_február_március_április_május_június_július_augusztus_szeptember_október_november_december".split("_"),monthsShort:"jan_feb_márc_ápr_máj_jún_júl_aug_szept_okt_nov_dec".split("_"),weekdays:"vasárnap_hétfő_kedd_szerda_csütörtök_péntek_szombat".split("_"),weekdaysShort:"vas_hét_kedd_sze_csüt_pén_szo".split("_"),weekdaysMin:"v_h_k_sze_cs_p_szo".split("_"),longDateFormat:{LT:"H:mm",LTS:"H:mm:ss",L:"YYYY.MM.DD.",LL:"YYYY. MMMM D.",LLL:"YYYY. MMMM D. H:mm",LLLL:"YYYY. MMMM D., dddd H:mm"},meridiemParse:/de|du/i,isPM:function(e){return e.charAt(1).toLowerCase()==="u"},meridiem:function(e,t,n){return e<12?n===!0?"de":"DE":n===!0?"du":"DU"},calendar:{sameDay:"[ma] LT[-kor]",nextDay:"[holnap] LT[-kor]",nextWeek:function(){return r.call(this,!0)},lastDay:"[tegnap] LT[-kor]",lastWeek:function(){return r.call(this,!1)},sameElse:"L"},relativeTime:{future:"%s múlva",past:"%s",s:n,m:n,mm:n,h:n,hh:n,d:n,dd:n,M:n,MM:n,y:n,yy:n},ordinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:7}});return i}),function(e,t){typeof exports=="object"&&typeof module!="undefined"?t(require("../moment")):typeof define=="function"&&define.amd?define("moment_id",["moment"],t):t(e.moment)}(this,function(e){"use strict";var t=e.defineLocale("id",{months:"Januari_Februari_Maret_April_Mei_Juni_Juli_Agustus_September_Oktober_November_Desember".split("_"),monthsShort:"Jan_Feb_Mar_Apr_Mei_Jun_Jul_Ags_Sep_Okt_Nov_Des".split("_"),weekdays:"Minggu_Senin_Selasa_Rabu_Kamis_Jumat_Sabtu".split("_"),weekdaysShort:"Min_Sen_Sel_Rab_Kam_Jum_Sab".split("_"),weekdaysMin:"Mg_Sn_Sl_Rb_Km_Jm_Sb".split("_"),longDateFormat:{LT:"HH.mm",LTS:"HH.mm.ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY [pukul] HH.mm",LLLL:"dddd, D MMMM YYYY [pukul] HH.mm"},meridiemParse:/pagi|siang|sore|malam/,meridiemHour:function(e,t){e===12&&(e=0);if(t==="pagi")return e;if(t==="siang")return e>=11?e:e+12;if(t==="sore"||t==="malam")return e+12},meridiem:function(e,t,n){return e<11?"pagi":e<15?"siang":e<19?"sore":"malam"},calendar:{sameDay:"[Hari ini pukul] LT",nextDay:"[Besok pukul] LT",nextWeek:"dddd [pukul] LT",lastDay:"[Kemarin pukul] LT",lastWeek:"dddd [lalu pukul] LT",sameElse:"L"},relativeTime:{future:"dalam %s",past:"%s yang lalu",s:"beberapa detik",m:"semenit",mm:"%d menit",h:"sejam",hh:"%d jam",d:"sehari",dd:"%d hari",M:"sebulan",MM:"%d bulan",y:"setahun",yy:"%d tahun"},week:{dow:1,doy:7}});return t}),function(e,t){typeof exports=="object"&&typeof module!="undefined"?t(require("../moment")):typeof define=="function"&&define.amd?define("moment_it",["moment"],t):t(e.moment)}(this,function(e){"use strict";var t=e.defineLocale("it",{months:"gennaio_febbraio_marzo_aprile_maggio_giugno_luglio_agosto_settembre_ottobre_novembre_dicembre".split("_"),monthsShort:"gen_feb_mar_apr_mag_giu_lug_ago_set_ott_nov_dic".split("_"),weekdays:"Domenica_Lunedì_Martedì_Mercoledì_Giovedì_Venerdì_Sabato".split("_"),weekdaysShort:"Dom_Lun_Mar_Mer_Gio_Ven_Sab".split("_"),weekdaysMin:"D_L_Ma_Me_G_V_S".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd, D MMMM YYYY HH:mm"},calendar:{sameDay:"[Oggi alle] LT",nextDay:"[Domani alle] LT",nextWeek:"dddd [alle] LT",lastDay:"[Ieri alle] LT",lastWeek:function(){switch(this.day()){case 0:return"[la scorsa] dddd [alle] LT";default:return"[lo scorso] dddd [alle] LT"}},sameElse:"L"},relativeTime:{future:function(e){return(/^[0-9].+$/.test(e)?"tra":"in")+" "+e},past:"%s fa",s:"alcuni secondi",m:"un minuto",mm:"%d minuti",h:"un'ora",hh:"%d ore",d:"un giorno",dd:"%d giorni",M:"un mese",MM:"%d mesi",y:"un anno",yy:"%d anni"},ordinalParse:/\d{1,2}º/,ordinal:"%dº",week:{dow:1,doy:4}});return t}),function(e,t){typeof exports=="object"&&typeof module!="undefined"?t(require("../moment")):typeof define=="function"&&define.amd?define("moment_ja",["moment"],t):t(e.moment)}(this,function(e){"use strict";var t=e.defineLocale("ja",{months:"1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月".split("_"),monthsShort:"1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月".split("_"),weekdays:"日曜日_月曜日_火曜日_水曜日_木曜日_金曜日_土曜日".split("_"),weekdaysShort:"日_月_火_水_木_金_土".split("_"),weekdaysMin:"日_月_火_水_木_金_土".split("_"),longDateFormat:{LT:"Ah時m分",LTS:"Ah時m分s秒",L:"YYYY/MM/DD",LL:"YYYY年M月D日",LLL:"YYYY年M月D日Ah時m分",LLLL:"YYYY年M月D日Ah時m分 dddd"},meridiemParse:/午前|午後/i,isPM:function(e){return e==="午後"},meridiem:function(e,t,n){return e<12?"午前":"午後"},calendar:{sameDay:"[今日] LT",nextDay:"[明日] LT",nextWeek:"[来週]dddd LT",lastDay:"[昨日] LT",lastWeek:"[前週]dddd LT",sameElse:"L"},relativeTime:{future:"%s後",past:"%s前",s:"数秒",m:"1分",mm:"%d分",h:"1時間",hh:"%d時間",d:"1日",dd:"%d日",M:"1ヶ月",MM:"%dヶ月",y:"1年",yy:"%d年"}});return t}),function(e,t){typeof exports=="object"&&typeof module!="undefined"?t(require("../moment")):typeof define=="function"&&define.amd?define("moment_nb",["moment"],t):t(e.moment)}(this,function(e){"use strict";var t=e.defineLocale("nb",{months:"januar_februar_mars_april_mai_juni_juli_august_september_oktober_november_desember".split("_"),monthsShort:"jan_feb_mar_apr_mai_jun_jul_aug_sep_okt_nov_des".split("_"),weekdays:"søndag_mandag_tirsdag_onsdag_torsdag_fredag_lørdag".split("_"),weekdaysShort:"søn_man_tirs_ons_tors_fre_lør".split("_"),weekdaysMin:"sø_ma_ti_on_to_fr_lø".split("_"),longDateFormat:{LT:"H.mm",LTS:"H.mm.ss",L:"DD.MM.YYYY",LL:"D. MMMM YYYY",LLL:"D. MMMM YYYY [kl.] H.mm",LLLL:"dddd D. MMMM YYYY [kl.] H.mm"},calendar:{sameDay:"[i dag kl.] LT",nextDay:"[i morgen kl.] LT",nextWeek:"dddd [kl.] LT",lastDay:"[i går kl.] LT",lastWeek:"[forrige] dddd [kl.] LT",sameElse:"L"},relativeTime:{future:"om %s",past:"for %s siden",s:"noen sekunder",m:"ett minutt",mm:"%d minutter",h:"en time",hh:"%d timer",d:"en dag",dd:"%d dager",M:"en måned",MM:"%d måneder",y:"ett år",yy:"%d år"},ordinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:4}});return t}),function(e,t){typeof exports=="object"&&typeof module!="undefined"?t(require("../moment")):typeof define=="function"&&define.amd?define("moment_nl",["moment"],t):t(e.moment)}(this,function(e){"use strict";var t="jan._feb._mrt._apr._mei_jun._jul._aug._sep._okt._nov._dec.".split("_"),n="jan_feb_mrt_apr_mei_jun_jul_aug_sep_okt_nov_dec".split("_"),r=e.defineLocale("nl",{months:"januari_februari_maart_april_mei_juni_juli_augustus_september_oktober_november_december".split("_"),monthsShort:function(e,r){return/-MMM-/.test(r)?n[e.month()]:t[e.month()]},weekdays:"zondag_maandag_dinsdag_woensdag_donderdag_vrijdag_zaterdag".split("_"),weekdaysShort:"zo._ma._di._wo._do._vr._za.".split("_"),weekdaysMin:"Zo_Ma_Di_Wo_Do_Vr_Za".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD-MM-YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd D MMMM YYYY HH:mm"},calendar:{sameDay:"[vandaag om] LT",nextDay:"[morgen om] LT",nextWeek:"dddd [om] LT",lastDay:"[gisteren om] LT",lastWeek:"[afgelopen] dddd [om] LT",sameElse:"L"},relativeTime:{future:"over %s",past:"%s geleden",s:"een paar seconden",m:"één minuut",mm:"%d minuten",h:"één uur",hh:"%d uur",d:"één dag",dd:"%d dagen",M:"één maand",MM:"%d maanden",y:"één jaar",yy:"%d jaar"},ordinalParse:/\d{1,2}(ste|de)/,ordinal:function(e){return e+(e===1||e===8||e>=20?"ste":"de")},week:{dow:1,doy:4}});return r}),function(e,t){typeof exports=="object"&&typeof module!="undefined"?t(require("../moment")):typeof define=="function"&&define.amd?define("moment_pl",["moment"],t):t(e.moment)}(this,function(e){"use strict";function r(e){return e%10<5&&e%10>1&&~~(e/10)%10!==1}function i(e,t,n){var i=e+" ";switch(n){case"m":return t?"minuta":"minutę";case"mm":return i+(r(e)?"minuty":"minut");case"h":return t?"godzina":"godzinę";case"hh":return i+(r(e)?"godziny":"godzin");case"MM":return i+(r(e)?"miesiące":"miesięcy");case"yy":return i+(r(e)?"lata":"lat")}}var t="styczeń_luty_marzec_kwiecień_maj_czerwiec_lipiec_sierpień_wrzesień_październik_listopad_grudzień".split("_"),n="stycznia_lutego_marca_kwietnia_maja_czerwca_lipca_sierpnia_września_października_listopada_grudnia".split("_"),s=e.defineLocale("pl",{months:function(e,r){return r===""?"("+n[e.month()]+"|"+t[e.month()]+")":/D MMMM/.test(r)?n[e.month()]:t[e.month()]},monthsShort:"sty_lut_mar_kwi_maj_cze_lip_sie_wrz_paź_lis_gru".split("_"),weekdays:"niedziela_poniedziałek_wtorek_środa_czwartek_piątek_sobota".split("_"),weekdaysShort:"nie_pon_wt_śr_czw_pt_sb".split("_"),weekdaysMin:"N_Pn_Wt_Śr_Cz_Pt_So".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD.MM.YYYY",LL:"D MMMM YYYY",LLL:"D MMMM YYYY HH:mm",LLLL:"dddd, D MMMM YYYY HH:mm"},calendar:{sameDay:"[Dziś o] LT",nextDay:"[Jutro o] LT",nextWeek:"[W] dddd [o] LT",lastDay:"[Wczoraj o] LT",lastWeek:function(){switch(this.day()){case 0:return"[W zeszłą niedzielę o] LT";case 3:return"[W zeszłą środę o] LT";case 6:return"[W zeszłą sobotę o] LT";default:return"[W zeszły] dddd [o] LT"}},sameElse:"L"},relativeTime:{future:"za %s",past:"%s temu",s:"kilka sekund",m:i,mm:i,h:i,hh:i,d:"1 dzień",dd:"%d dni",M:"miesiąc",MM:i,y:"rok",yy:i},ordinalParse:/\d{1,2}\./,ordinal:"%d.",week:{dow:1,doy:4}});return s}),function(e,t){typeof exports=="object"&&typeof module!="undefined"?t(require("../moment")):typeof define=="function"&&define.amd?define("moment_pt-br",["moment"],t):t(e.moment)}(this,function(e){"use strict";var t=e.defineLocale("pt-br",{months:"Janeiro_Fevereiro_Março_Abril_Maio_Junho_Julho_Agosto_Setembro_Outubro_Novembro_Dezembro".split("_"),monthsShort:"Jan_Fev_Mar_Abr_Mai_Jun_Jul_Ago_Set_Out_Nov_Dez".split("_"),weekdays:"Domingo_Segunda-Feira_Terça-Feira_Quarta-Feira_Quinta-Feira_Sexta-Feira_Sábado".split("_"),weekdaysShort:"Dom_Seg_Ter_Qua_Qui_Sex_Sáb".split("_"),weekdaysMin:"Dom_2ª_3ª_4ª_5ª_6ª_Sáb".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD/MM/YYYY",LL:"D [de] MMMM [de] YYYY",LLL:"D [de] MMMM [de] YYYY [às] HH:mm",LLLL:"dddd, D [de] MMMM [de] YYYY [às] HH:mm"},calendar:{sameDay:"[Hoje às] LT",nextDay:"[Amanhã às] LT",nextWeek:"dddd [às] LT",lastDay:"[Ontem às] LT",lastWeek:function(){return this.day()===0||this.day()===6?"[Último] dddd [às] LT":"[Última] dddd [às] LT"},sameElse:"L"},relativeTime:{future:"em %s",past:"%s atrás",s:"poucos segundos",m:"um minuto",mm:"%d minutos",h:"uma hora",hh:"%d horas",d:"um dia",dd:"%d dias",M:"um mês",MM:"%d meses",y:"um ano",yy:"%d anos"},ordinalParse:/\d{1,2}º/,ordinal:"%dº"});return t}),function(e,t){typeof exports=="object"&&typeof module!="undefined"?t(require("../moment")):typeof define=="function"&&define.amd?define("moment_ru",["moment"],t):t(e.moment)}(this,function(e){"use strict";function t(e,t){var n=e.split("_");return t%10===1&&t%100!==11?n[0]:t%10>=2&&t%10<=4&&(t%100<10||t%100>=20)?n[1]:n[2]}function n(e,n,r){var i={mm:n?"минута_минуты_минут":"минуту_минуты_минут",hh:"час_часа_часов",dd:"день_дня_дней",MM:"месяц_месяца_месяцев",yy:"год_года_лет"};return r==="m"?n?"минута":"минуту":e+" "+t(i[r],+e)}function r(e,t){var n={nominative:"январь_февраль_март_апрель_май_июнь_июль_август_сентябрь_октябрь_ноябрь_декабрь".split("_"),accusative:"января_февраля_марта_апреля_мая_июня_июля_августа_сентября_октября_ноября_декабря".split("_")},r=/D[oD]?(\[[^\[\]]*\]|\s+)+MMMM?/.test(t)?"accusative":"nominative";return n[r][e.month()]}function i(e,t){var n={nominative:"янв_фев_март_апр_май_июнь_июль_авг_сен_окт_ноя_дек".split("_"),accusative:"янв_фев_мар_апр_мая_июня_июля_авг_сен_окт_ноя_дек".split("_")},r=/D[oD]?(\[[^\[\]]*\]|\s+)+MMMM?/.test(t)?"accusative":"nominative";return n[r][e.month()]}function s(e,t){var n={nominative:"воскресенье_понедельник_вторник_среда_четверг_пятница_суббота".split("_"),accusative:"воскресенье_понедельник_вторник_среду_четверг_пятницу_субботу".split("_")},r=/\[ ?[Вв] ?(?:прошлую|следующую|эту)? ?\] ?dddd/.test(t)?"accusative":"nominative";return n[r][e.day()]}var o=e.defineLocale("ru",{months:r,monthsShort:i,weekdays:s,weekdaysShort:"вс_пн_вт_ср_чт_пт_сб".split("_"),weekdaysMin:"вс_пн_вт_ср_чт_пт_сб".split("_"),monthsParse:[/^янв/i,/^фев/i,/^мар/i,/^апр/i,/^ма[й|я]/i,/^июн/i,/^июл/i,/^авг/i,/^сен/i,/^окт/i,/^ноя/i,/^дек/i],longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD.MM.YYYY",LL:"D MMMM YYYY г.",LLL:"D MMMM YYYY г., HH:mm",LLLL:"dddd, D MMMM YYYY г., HH:mm"},calendar:{sameDay:"[Сегодня в] LT",nextDay:"[Завтра в] LT",lastDay:"[Вчера в] LT",nextWeek:function(){return this.day()===2?"[Во] dddd [в] LT":"[В] dddd [в] LT"},lastWeek:function(e){if(e.week()===this.week())return this.day()===2?"[Во] dddd [в] LT":"[В] dddd [в] LT";switch(this.day()){case 0:return"[В прошлое] dddd [в] LT";case 1:case 2:case 4:return"[В прошлый] dddd [в] LT";case 3:case 5:case 6:return"[В прошлую] dddd [в] LT"}},sameElse:"L"},relativeTime:{future:"через %s",past:"%s назад",s:"несколько секунд",m:n,mm:n,h:"час",hh:n,d:"день",dd:n,M:"месяц",MM:n,y:"год",yy:n},meridiemParse:/ночи|утра|дня|вечера/i,isPM:function(e){return/^(дня|вечера)$/.test(e)},meridiem:function(e,t,n){return e<4?"ночи":e<12?"утра":e<17?"дня":"вечера"},ordinalParse:/\d{1,2}-(й|го|я)/,ordinal:function(e,t){switch(t){case"M":case"d":case"DDD":return e+"-й";case"D":return e+"-го";case"w":case"W":return e+"-я";default:return e}},week:{dow:1,doy:7}});return o}),function(e,t){typeof exports=="object"&&typeof module!="undefined"?t(require("../moment")):typeof define=="function"&&define.amd?define("moment_uk",["moment"],t):t(e.moment)}(this,function(e){"use strict";function t(e,t){var n=e.split("_");return t%10===1&&t%100!==11?n[0]:t%10>=2&&t%10<=4&&(t%100<10||t%100>=20)?n[1]:n[2]}function n(e,n,r){var i={mm:"хвилина_хвилини_хвилин",hh:"година_години_годин",dd:"день_дні_днів",MM:"місяць_місяці_місяців",yy:"рік_роки_років"};return r==="m"?n?"хвилина":"хвилину":r==="h"?n?"година":"годину":e+" "+t(i[r],+e)}function r(e,t){var n={nominative:"січень_лютий_березень_квітень_травень_червень_липень_серпень_вересень_жовтень_листопад_грудень".split("_"),accusative:"січня_лютого_березня_квітня_травня_червня_липня_серпня_вересня_жовтня_листопада_грудня".split("_")},r=/D[oD]? *MMMM?/.test(t)?"accusative":"nominative";return n[r][e.month()]}function i(e,t){var n={nominative:"неділя_понеділок_вівторок_середа_четвер_п’ятниця_субота".split("_"),accusative:"неділю_понеділок_вівторок_середу_четвер_п’ятницю_суботу".split("_"),genitive:"неділі_понеділка_вівторка_середи_четверга_п’ятниці_суботи".split("_")},r=/(\[[ВвУу]\]) ?dddd/.test(t)?"accusative":/\[?(?:минулої|наступної)? ?\] ?dddd/.test(t)?"genitive":"nominative";return n[r][e.day()]}function s(e){return function(){return e+"о"+(this.hours()===11?"б":"")+"] LT"}}var o=e.defineLocale("uk",{months:r,monthsShort:"січ_лют_бер_квіт_трав_черв_лип_серп_вер_жовт_лист_груд".split("_"),weekdays:i,weekdaysShort:"нд_пн_вт_ср_чт_пт_сб".split("_"),weekdaysMin:"нд_пн_вт_ср_чт_пт_сб".split("_"),longDateFormat:{LT:"HH:mm",LTS:"HH:mm:ss",L:"DD.MM.YYYY",LL:"D MMMM YYYY р.",LLL:"D MMMM YYYY р., HH:mm",LLLL:"dddd, D MMMM YYYY р., HH:mm"},calendar:{sameDay:s("[Сьогодні "),nextDay:s("[Завтра "),lastDay:s("[Вчора "),nextWeek:s("[У] dddd ["),lastWeek:function(){switch(this.day()){case 0:case 3:case 5:case 6:return s("[Минулої] dddd [").call(this);case 1:case 2:case 4:return s("[Минулого] dddd [").call(this)}},sameElse:"L"},relativeTime:{future:"за %s",past:"%s тому",s:"декілька секунд",m:n,mm:n,h:"годину",hh:n,d:"день",dd:n,M:"місяць",MM:n,y:"рік",yy:n},meridiemParse:/ночі|ранку|дня|вечора/,isPM:function(e){return/^(дня|вечора)$/.test(e)},meridiem:function(e,t,n){return e<4?"ночі":e<12?"ранку":e<17?"дня":"вечора"},ordinalParse:/\d{1,2}-(й|го)/,ordinal:function(e,t){switch(t){case"M":case"d":case"DDD":case"w":case"W":return e+"-й";case"D":return e+"-го";default:return e}},week:{dow:1,doy:7}});return o}),function(e,t){typeof exports=="object"&&typeof module!="undefined"?t(require("../moment")):typeof define=="function"&&define.amd?define("moment_zh",["moment"],t):t(e.moment)}(this,function(e){"use strict";var t=e.defineLocale("zh-cn",{months:"一月_二月_三月_四月_五月_六月_七月_八月_九月_十月_十一月_十二月".split("_"),monthsShort:"1月_2月_3月_4月_5月_6月_7月_8月_9月_10月_11月_12月".split("_"),weekdays:"星期日_星期一_星期二_星期三_星期四_星期五_星期六".split("_"),weekdaysShort:"周日_周一_周二_周三_周四_周五_周六".split("_"),weekdaysMin:"日_一_二_三_四_五_六".split("_"),longDateFormat:{LT:"Ah点mm分",LTS:"Ah点m分s秒",L:"YYYY-MM-DD",LL:"YYYY年MMMD日",LLL:"YYYY年MMMD日Ah点mm分",LLLL:"YYYY年MMMD日ddddAh点mm分",l:"YYYY-MM-DD",ll:"YYYY年MMMD日",lll:"YYYY年MMMD日Ah点mm分",llll:"YYYY年MMMD日ddddAh点mm分"},meridiemParse:/凌晨|早上|上午|中午|下午|晚上/,meridiemHour:function(e,t){return e===12&&(e=0),t==="凌晨"||t==="早上"||t==="上午"?e:t==="下午"||t==="晚上"?e+12:e>=11?e:e+12},meridiem:function(e,t,n){var r=e*100+t;return r<600?"凌晨":r<900?"早上":r<1130?"上午":r<1230?"中午":r<1800?"下午":"晚上"},calendar:{sameDay:function(){return this.minutes()===0?"[今天]Ah[点整]":"[今天]LT"},nextDay:function(){return this.minutes()===0?"[明天]Ah[点整]":"[明天]LT"},lastDay:function(){return this.minutes()===0?"[昨天]Ah[点整]":"[昨天]LT"},nextWeek:function(){var t,n;return t=e().startOf("week"),n=this.unix()-t.unix()>=604800?"[下]":"[本]",this.minutes()===0?n+"dddAh点整":n+"dddAh点mm"},lastWeek:function(){var t,n;return t=e().startOf("week"),n=this.unix()<t.unix()?"[上]":"[本]",this.minutes()===0?n+"dddAh点整":n+"dddAh点mm"},sameElse:"LL"},ordinalParse:/\d{1,2}(日|月|周)/,ordinal:function(e,t){switch(t){case"d":case"D":case"DDD":return e+"日";case"M":return e+"月";case"w":case"W":return e+"周";default:return e}},relativeTime:{future:"%s内",past:"%s前",s:"几秒",m:"1 分钟",mm:"%d 分钟",h:"1 小时",hh:"%d 小时",d:"1 天",dd:"%d 天",M:"1 个月",MM:"%d 个月",y:"1 年",yy:"%d 年"},week:{dow:1,doy:4}});return t}),function(e,t){define("moment_with_locales",["moment","moment_af","moment_de","moment_es","moment_fr","moment_he","moment_hu","moment_id","moment_it","moment_ja","moment_nb","moment_nl","moment_pl","moment_pt-br","moment_ru","moment_uk","moment_zh"],function(e){return e})}(this),function(e,t){typeof define=="function"&&define.amd?define("strophe-sha1",[],function(){return t()}):e.SHA1=t()}(this,function(){function e(e,r){e[r>>5]|=128<<24-r%32,e[(r+64>>9<<4)+15]=r;var o=new Array(80),u=1732584193,a=-271733879,f=-1732584194,l=271733878,c=-1009589776,h,p,d,v,m,g,y,b;for(h=0;h<e.length;h+=16){v=u,m=a,g=f,y=l,b=c;for(p=0;p<80;p++)p<16?o[p]=e[h+p]:o[p]=s(o[p-3]^o[p-8]^o[p-14]^o[p-16],1),d=i(i(s(u,5),t(p,a,f,l)),i(i(c,o[p]),n(p))),c=l,l=f,f=s(a,30),a=u,u=d;u=i(u,v),a=i(a,m),f=i(f,g),l=i(l,y),c=i(c,b)}return[u,a,f,l,c]}function t(e,t,n,r){return e<20?t&n|~t&r:e<40?t^n^r:e<60?t&n|t&r|n&r:t^n^r}function n(e){return e<20?1518500249:e<40?1859775393:e<60?-1894007588:-899497514}function r(t,n){var r=o(t);r.length>16&&(r=e(r,t.length*8));var i=new Array(16),s=new Array(16);for(var u=0;u<16;u++)i[u]=r[u]^909522486,s[u]=r[u]^1549556828;var a=e(i.concat(o(n)),512+n.length*8);return e(s.concat(a),672)}function i(e,t){var n=(e&65535)+(t&65535),r=(e>>16)+(t>>16)+(n>>16);return r<<16|n&65535}function s(e,t){return e<<t|e>>>32-t}function o(e){var t=[],n=255;for(var r=0;r<e.length*8;r+=8)t[r>>5]|=(e.charCodeAt(r/8)&n)<<24-r%32;return t}function u(e){var t="",n=255;for(var r=0;r<e.length*32;r+=8)t+=String.fromCharCode(e[r>>5]>>>24-r%32&n);return t}function a(e){var t="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/",n="",r,i;for(var s=0;s<e.length*4;s+=3){r=(e[s>>2]>>8*(3-s%4)&255)<<16|(e[s+1>>2]>>8*(3-(s+1)%4)&255)<<8|e[s+2>>2]>>8*(3-(s+2)%4)&255;for(i=0;i<4;i++)s*8+i*6>e.length*32?n+="=":n+=t.charAt(r>>6*(3-i)&63)}return n}return{b64_hmac_sha1:function(e,t){return a(r(e,t))},b64_sha1:function(t){return a(e(o(t),t.length*8))},binb2str:u,core_hmac_sha1:r,str_hmac_sha1:function(e,t){return u(r(e,t))},str_sha1:function(t){return u(e(o(t),t.length*8))}}}),function(e,t){typeof define=="function"&&define.amd?define("strophe-base64",[],function(){return t()}):e.Base64=t()}(this,function(){var e="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=",t={encode:function(t){var n="",r,i,s,o,u,a,f,l=0;do r=t.charCodeAt(l++),i=t.charCodeAt(l++),s=t.charCodeAt(l++),o=r>>2,u=(r&3)<<4|i>>4,a=(i&15)<<2|s>>6,f=s&63,isNaN(i)?(u=(r&3)<<4,a=f=64):isNaN(s)&&(f=64),n=n+e.charAt(o)+e.charAt(u)+e.charAt(a)+e.charAt(f);while(l<t.length);return n},decode:function(t){var n="",r,i,s,o,u,a,f,l=0;t=t.replace(/[^A-Za-z0-9\+\/\=]/g,"");do o=e.indexOf(t.charAt(l++)),u=e.indexOf(t.charAt(l++)),a=e.indexOf(t.charAt(l++)),f=e.indexOf(t.charAt(l++)),r=o<<2|u>>4,i=(u&15)<<4|a>>2,s=(a&3)<<6|f,n+=String.fromCharCode(r),a!=64&&(n+=String.fromCharCode(i)),f!=64&&(n+=String.fromCharCode(s));while(l<t.length);return n}};return t}),function(e,t){typeof define=="function"&&define.amd?define("strophe-md5",[],function(){return t()}):e.MD5=t()}(this,function(e){var t=function(e,t){var n=(e&65535)+(t&65535),r=(e>>16)+(t>>16)+(n>>16);return r<<16|n&65535},n=function(e,t){return e<<t|e>>>32-t},r=function(e){var t=[];for(var n=0;n<e.length*8;n+=8)t[n>>5]|=(e.charCodeAt(n/8)&255)<<n%32;return t},i=function(e){var t="";for(var n=0;n<e.length*32;n+=8)t+=String.fromCharCode(e[n>>5]>>>n%32&255);return t},s=function(e){var t="0123456789abcdef",n="";for(var r=0;r<e.length*4;r++)n+=t.charAt(e[r>>2]>>r%4*8+4&15)+t.charAt(e[r>>2]>>r%4*8&15);return n},o=function(e,r,i,s,o,u){return t(n(t(t(r,e),t(s,u)),o),i)},u=function(e,t,n,r,i,s,u){return o(t&n|~t&r,e,t,i,s,u)},a=function(e,t,n,r,i,s,u){return o(t&r|n&~r,e,t,i,s,u)},f=function(e,t,n,r,i,s,u){return o(t^n^r,e,t,i,s,u)},l=function(e,t,n,r,i,s,u){return o(n^(t|~r),e,t,i,s,u)},c=function(e,n){e[n>>5]|=128<<n%32,e[(n+64>>>9<<4)+14]=n;var r=1732584193,i=-271733879,s=-1732584194,o=271733878,c,h,p,d;for(var v=0;v<e.length;v+=16)c=r,h=i,p=s,d=o,r=u(r,i,s,o,e[v+0],7,-680876936),o=u(o,r,i,s,e[v+1],12,-389564586),s=u(s,o,r,i,e[v+2],17,606105819),i=u(i,s,o,r,e[v+3],22,-1044525330),r=u(r,i,s,o,e[v+4],7,-176418897),o=u(o,r,i,s,e[v+5],12,1200080426),s=u(s,o,r,i,e[v+6],17,-1473231341),i=u(i,s,o,r,e[v+7],22,-45705983),r=u(r,i,s,o,e[v+8],7,1770035416),o=u(o,r,i,s,e[v+9],12,-1958414417),s=u(s,o,r,i,e[v+10],17,-42063),i=u(i,s,o,r,e[v+11],22,-1990404162),r=u(r,i,s,o,e[v+12],7,1804603682),o=u(o,r,i,s,e[v+13],12,-40341101),s=u(s,o,r,i,e[v+14],17,-1502002290),i=u(i,s,o,r,e[v+15],22,1236535329),r=a(r,i,s,o,e[v+1],5,-165796510),o=a(o,r,i,s,e[v+6],9,-1069501632),s=a(s,o,r,i,e[v+11],14,643717713),i=a(i,s,o,r,e[v+0],20,-373897302),r=a(r,i,s,o,e[v+5],5,-701558691),o=a(o,r,i,s,e[v+10],9,38016083),s=a(s,o,r,i,e[v+15],14,-660478335),i=a(i,s,o,r,e[v+4],20,-405537848),r=a(r,i,s,o,e[v+9],5,568446438),o=a(o,r,i,s,e[v+14],9,-1019803690),s=a(s,o,r,i,e[v+3],14,-187363961),i=a(i,s,o,r,e[v+8],20,1163531501),r=a(r,i,s,o,e[v+13],5,-1444681467),o=a(o,r,i,s,e[v+2],9,-51403784),s=a(s,o,r,i,e[v+7],14,1735328473),i=a(i,s,o,r,e[v+12],20,-1926607734),r=f(r,i,s,o,e[v+5],4,-378558),o=f(o,r,i,s,e[v+8],11,-2022574463),s=f(s,o,r,i,e[v+11],16,1839030562),i=f(i,s,o,r,e[v+14],23,-35309556),r=f(r,i,s,o,e[v+1],4,-1530992060),o=f(o,r,i,s,e[v+4],11,1272893353),s=f(s,o,r,i,e[v+7],16,-155497632),i=f(i,s,o,r,e[v+10],23,-1094730640),r=f(r,i,s,o,e[v+13],4,681279174),o=f(o,r,i,s,e[v+0],11,-358537222),s=f(s,o,r,i,e[v+3],16,-722521979),i=f(i,s,o,r,e[v+6],23,76029189),r=f(r,i,s,o,e[v+9],4,-640364487),o=f(o,r,i,s,e[v+12],11,-421815835),s=f(s,o,r,i,e[v+15],16,530742520),i=f(i,s,o,r,e[v+2],23,-995338651),r=l(r,i,s,o,e[v+0],6,-198630844),o=l(o,r,i,s,e[v+7],10,1126891415),s=l(s,o,r,i,e[v+14],15,-1416354905),i=l(i,s,o,r,e[v+5],21,-57434055),r=l(r,i,s,o,e[v+12],6,1700485571),o=l(o,r,i,s,e[v+3],10,-1894986606),s=l(s,o,r,i,e[v+10],15,-1051523),i=l(i,s,o,r,e[v+1],21,-2054922799),r=l(r,i,s,o,e[v+8],6,1873313359),o=l(o,r,i,s,e[v+15],10,-30611744),s=l(s,o,r,i,e[v+6],15,-1560198380),i=l(i,s,o,r,e[v+13],21,1309151649),r=l(r,i,s,o,e[v+4],6,-145523070),o=l(o,r,i,s,e[v+11],10,-1120210379),s=l(s,o,r,i,e[v+2],15,718787259),i=l(i,s,o,r,e[v+9],21,-343485551),r=t(r,c),i=t(i,h),s=t(s,p),o=t(o,d);return[r,i,s,o]},h={hexdigest:function(e){return s(c(r(e),e.length*8))},hash:function(e){return i(c(r(e),e.length*8))}};return h}),Function.prototype.bind||(Function.prototype.bind=function(e){var t=this,n=Array.prototype.slice,r=Array.prototype.concat,i=n.call(arguments,1);return function(){return t.apply(e?e:this,r.call(i,n.call(arguments,0)))}}),Array.isArray||(Array.isArray=function(e){return Object.prototype.toString.call(e)==="[object Array]"}),Array.prototype.indexOf||(Array.prototype.indexOf=function(e){var t=this.length,n=Number(arguments[1])||0;n=n<0?Math.ceil(n):Math.floor(n),n<0&&(n+=t);for(;n<t;n++)if(n in this&&this[n]===e)return n;return-1}),define("strophe-polyfill",function(){}),function(e,t){if(typeof define=="function"&&define.amd)define("strophe-core",["strophe-sha1","strophe-base64","strophe-md5","strophe-polyfill"],function(){return t.apply(this,arguments)});else{var n=t(e.SHA1,e.Base64,e.MD5);window.Strophe=n.Strophe,window.$build=n.$build,window.$iq=n.$iq,window.$msg=n.$msg,window.$pres=n.$pres,window.SHA1=n.SHA1,window.Base64=n.Base64,window.MD5=n.MD5,window.b64_hmac_sha1=n.SHA1.b64_hmac_sha1,window.b64_sha1=n.SHA1.b64_sha1,window.str_hmac_sha1=n.SHA1.str_hmac_sha1,window.str_sha1=n.SHA1.str_sha1}}(this,function(e,t,n){function i(e,t){return new r.Builder(e,t)}function s(e){return new r.Builder("message",e)}function o(e){return new r.Builder("iq",e)}function u(e){return new r.Builder("presence",e)}var r;return r={VERSION:"@VERSION@",NS:{HTTPBIND:"http://jabber.org/protocol/httpbind",BOSH:"urn:xmpp:xbosh",CLIENT:"jabber:client",AUTH:"jabber:iq:auth",ROSTER:"jabber:iq:roster",PROFILE:"jabber:iq:profile",DISCO_INFO:"http://jabber.org/protocol/disco#info",DISCO_ITEMS:"http://jabber.org/protocol/disco#items",MUC:"http://jabber.org/protocol/muc",SASL:"urn:ietf:params:xml:ns:xmpp-sasl",STREAM:"http://etherx.jabber.org/streams",FRAMING:"urn:ietf:params:xml:ns:xmpp-framing",BIND:"urn:ietf:params:xml:ns:xmpp-bind",SESSION:"urn:ietf:params:xml:ns:xmpp-session",VERSION:"jabber:iq:version",STANZAS:"urn:ietf:params:xml:ns:xmpp-stanzas",XHTML_IM:"http://jabber.org/protocol/xhtml-im",XHTML:"http://www.w3.org/1999/xhtml"},XHTML:{tags:["a","blockquote","br","cite","em","img","li","ol","p","span","strong","ul","body"],attributes:{a:["href"],blockquote:["style"],br:[],cite:["style"],em:[],img:["src","alt","style","height","width"],li:["style"],ol:["style"],p:["style"],span:["style"],strong:[],ul:["style"],body:[]},css:["background-color","color","font-family","font-size","font-style","font-weight","margin-left","margin-right","text-align","text-decoration"],validTag:function(e){for(var t=0;t<r.XHTML.tags.length;t++)if(e==r.XHTML.tags[t])return!0;return!1},validAttribute:function(e,t){if(typeof r.XHTML.attributes[e]!="undefined"&&r.XHTML.attributes[e].length>0)for(var n=0;n<r.XHTML.attributes[e].length;n++)if(t==r.XHTML.attributes[e][n])return!0;return!1},validCSS:function(e){for(var t=0;t<r.XHTML.css.length;t++)if(e==r.XHTML.css[t])return!0;return!1}},Status:{ERROR:0,CONNECTING:1,CONNFAIL:2,AUTHENTICATING:3,AUTHFAIL:4,CONNECTED:5,DISCONNECTED:6,DISCONNECTING:7,ATTACHED:8,REDIRECT:9},LogLevel:{DEBUG:0,INFO:1,WARN:2,ERROR:3,FATAL:4},ElementType:{NORMAL:1,TEXT:3,CDATA:4,FRAGMENT:11},TIMEOUT:1.1,SECONDARY_TIMEOUT:.1,addNamespace:function(e,t){r.NS[e]=t},forEachChild:function(e,t,n){var i,s;for(i=0;i<e.childNodes.length;i++)s=e.childNodes[i],s.nodeType==r.ElementType.NORMAL&&(!t||this.isTagEqual(s,t))&&n(s)},isTagEqual:function(e,t){return e.tagName==t},_xmlGenerator:null,_makeGenerator:function(){var e;return document.implementation.createDocument===undefined||document.implementation.createDocument&&document.documentMode&&document.documentMode<10?(e=this._getIEXmlDom(),e.appendChild(e.createElement("strophe"))):e=document.implementation.createDocument("jabber:client","strophe",null),e},xmlGenerator:function(){return r._xmlGenerator||(r._xmlGenerator=r._makeGenerator()),r._xmlGenerator},_getIEXmlDom:function(){var e=null,t=["Msxml2.DOMDocument.6.0","Msxml2.DOMDocument.5.0","Msxml2.DOMDocument.4.0","MSXML2.DOMDocument.3.0","MSXML2.DOMDocument","MSXML.DOMDocument","Microsoft.XMLDOM"];for(var n=0;n<t.length;n++){if(e!==null)break;try{e=new ActiveXObject(t[n])}catch(r){e=null}}return e},xmlElement:function(e){if(!e)return null;var t=r.xmlGenerator().createElement(e),n,i,s;for(n=1;n<arguments.length;n++){var o=arguments[n];if(!o)continue;if(typeof o=="string"||typeof o=="number")t.appendChild(r.xmlTextNode(o));else if(typeof o=="object"&&typeof o.sort=="function")for(i=0;i<o.length;i++){var u=o[i];typeof u=="object"&&typeof u.sort=="function"&&u[1]!==undefined&&u[1]!==null&&t.setAttribute(u[0],u[1])}else if(typeof o=="object")for(s in o)o.hasOwnProperty(s)&&o[s]!==undefined&&o[s]!==null&&t.setAttribute(s,o[s])}return t},xmlescape:function(e){return e=e.replace(/\&/g,"&amp;"),e=e.replace(/</g,"&lt;"),e=e.replace(/>/g,"&gt;"),e=e.replace(/'/g,"&apos;"),e=e.replace(/"/g,"&quot;"),e},xmlunescape:function(e){return e=e.replace(/\&amp;/g,"&"),e=e.replace(/&lt;/g,"<"),e=e.replace(/&gt;/g,">"),e=e.replace(/&apos;/g,"'"),e=e.replace(/&quot;/g,'"'),e},xmlTextNode:function(e){return r.xmlGenerator().createTextNode(e)},xmlHtmlNode:function(e){var t;if(window.DOMParser){var n=new DOMParser;t=n.parseFromString(e,"text/xml")}else t=new ActiveXObject("Microsoft.XMLDOM"),t.async="false",t.loadXML(e);return t},getText:function(e){if(!e)return null;var t="";e.childNodes.length===0&&e.nodeType==r.ElementType.TEXT&&(t+=e.nodeValue);for(var n=0;n<e.childNodes.length;n++)e.childNodes[n].nodeType==r.ElementType.TEXT&&(t+=e.childNodes[n].nodeValue);return r.xmlescape(t)},copyElement:function(e){var t,n;if(e.nodeType==r.ElementType.NORMAL){n=r.xmlElement(e.tagName);for(t=0;t<e.attributes.length;t++)n.setAttribute(e.attributes[t].nodeName,e.attributes[t].value);for(t=0;t<e.childNodes.length;t++)n.appendChild(r.copyElement(e.childNodes[t]))}else e.nodeType==r.ElementType.TEXT&&(n=r.xmlGenerator().createTextNode(e.nodeValue));return n},createHtml:function(e){var t,n,i,s,o,u,a,f,l,c,h;if(e.nodeType==r.ElementType.NORMAL){s=e.nodeName.toLowerCase();if(r.XHTML.validTag(s))try{n=r.xmlElement(s);for(t=0;t<r.XHTML.attributes[s].length;t++){o=r.XHTML.attributes[s][t],u=e.getAttribute(o);if(typeof u=="undefined"||u===null||u===""||u===!1||u===0)continue;o=="style"&&typeof u=="object"&&typeof u.cssText!="undefined"&&(u=u.cssText);if(o=="style"){a=[],f=u.split(";");for(i=0;i<f.length;i++)l=f[i].split(":"),c=l[0].replace(/^\s*/,"").replace(/\s*$/,"").toLowerCase(),r.XHTML.validCSS(c)&&(h=l[1].replace(/^\s*/,"").replace(/\s*$/,""),a.push(c+": "+h));a.length>0&&(u=a.join("; "),n.setAttribute(o,u))}else n.setAttribute(o,u)}for(t=0;t<e.childNodes.length;t++)n.appendChild(r.createHtml(e.childNodes[t]))}catch(p){n=r.xmlTextNode("")}else{n=r.xmlGenerator().createDocumentFragment();for(t=0;t<e.childNodes.length;t++)n.appendChild(r.createHtml(e.childNodes[t]))}}else if(e.nodeType==r.ElementType.FRAGMENT){n=r.xmlGenerator().createDocumentFragment();for(t=0;t<e.childNodes.length;t++)n.appendChild(r.createHtml(e.childNodes[t]))}else e.nodeType==r.ElementType.TEXT&&(n=r.xmlTextNode(e.nodeValue));return n},escapeNode:function(e){return typeof e!="string"?e:e.replace(/^\s+|\s+$/g,"").replace(/\\/g,"\\5c").replace(/ /g,"\\20").replace(/\"/g,"\\22").replace(/\&/g,"\\26").replace(/\'/g,"\\27").replace(/\//g,"\\2f").replace(/:/g,"\\3a").replace(/</g,"\\3c").replace(/>/g,"\\3e").replace(/@/g,"\\40")},unescapeNode:function(e){return typeof e!="string"?e:e.replace(/\\20/g," ").replace(/\\22/g,'"').replace(/\\26/g,"&").replace(/\\27/g,"'").replace(/\\2f/g,"/").replace(/\\3a/g,":").replace(/\\3c/g,"<").replace(/\\3e/g,">").replace(/\\40/g,"@").replace(/\\5c/g,"\\")},getNodeFromJid:function(e){return e.indexOf("@")<0?null:e.split("@")[0]},getDomainFromJid:function(e){var t=r.getBareJidFromJid(e);if(t.indexOf("@")<0)return t;var n=t.split("@");return n.splice(0,1),n.join("@")},getResourceFromJid:function(e){var t=e.split("/");return t.length<2?null:(t.splice(0,1),t.join("/"))},getBareJidFromJid:function(e){return e?e.split("/")[0]:null},log:function(e,t){return},debug:function(e){this.log(this.LogLevel.DEBUG,e)},info:function(e){this.log(this.LogLevel.INFO,e)},warn:function(e){this.log(this.LogLevel.WARN,e)},error:function(e){this.log(this.LogLevel.ERROR,e)},fatal:function(e){this.log(this.LogLevel.FATAL,e)},serialize:function(e){var t;if(!e)return null;typeof e.tree=="function"&&(e=e.tree());var n=e.nodeName,i,s;e.getAttribute("_realname")&&(n=e.getAttribute("_realname")),t="<"+n;for(i=0;i<e.attributes.length;i++)e.attributes[i].nodeName!="_realname"&&(t+=" "+e.attributes[i].nodeName+"='"+e.attributes[i].value.replace(/&/g,"&amp;").replace(/\'/g,"&apos;").replace(/>/g,"&gt;").replace(/</g,"&lt;")+"'");if(e.childNodes.length>0){t+=">";for(i=0;i<e.childNodes.length;i++){s=e.childNodes[i];switch(s.nodeType){case r.ElementType.NORMAL:t+=r.serialize(s);break;case r.ElementType.TEXT:t+=r.xmlescape(s.nodeValue);break;case r.ElementType.CDATA:t+="<![CDATA["+s.nodeValue+"]]>"}}t+="</"+n+">"}else t+="/>";return t},_requestId:0,_connectionPlugins:{},addConnectionPlugin:function(e,t){r._connectionPlugins[e]=t}},r.Builder=function(e,t){if(e=="presence"||e=="message"||e=="iq")t&&!t.xmlns?t.xmlns=r.NS.CLIENT:t||(t={xmlns:r.NS.CLIENT});this.nodeTree=r.xmlElement(e,t),this.node=this.nodeTree},r.Builder.prototype={tree:function(){return this.nodeTree},toString:function(){return r.serialize(this.nodeTree)},up:function(){return this.node=this.node.parentNode,this},attrs:function(e){for(var t in e)e.hasOwnProperty(t)&&(e[t]===undefined?this.node.removeAttribute(t):this.node.setAttribute(t,e[t]));return this},c:function(e,t,n){var i=r.xmlElement(e,t,n);return this.node.appendChild(i),typeof n!="string"&&(this.node=i),this},cnode:function(e){var t,n=r.xmlGenerator();try{t=n.importNode!==undefined}catch(i){t=!1}var s=t?n.importNode(e,!0):r.copyElement(e);return this.node.appendChild(s),this.node=s,this},t:function(e){var t=r.xmlTextNode(e);return this.node.appendChild(t),this},h:function(e){var t=document.createElement("body");t.innerHTML=e;var n=r.createHtml(t);while(n.childNodes.length>0)this.node.appendChild(n.childNodes[0]);return this}},r.Handler=function(e,t,n,i,s,o,u){this.handler=e,this.ns=t,this.name=n,this.type=i,this.id=s,this.options=u||{matchBare:!1},this.options.matchBare||(this.options.matchBare=!1),this.options.matchBare?this.from=o?r.getBareJidFromJid(o):null:this.from=o,this.user=!0},r.Handler.prototype={isMatch:function(e){var t,n=null;this.options.matchBare?n=r.getBareJidFromJid(e.getAttribute("from")):n=e.getAttribute("from"),t=!1;if(!this.ns)t=!0;else{var i=this;r.forEachChild(e,null,function(e){e.getAttribute("xmlns")==i.ns&&(t=!0)}),t=t||e.getAttribute("xmlns")==this.ns}var s=e.getAttribute("type");return!t||!!this.name&&!r.isTagEqual(e,this.name)||!!this.type&&(Array.isArray(this.type)?this.type.indexOf(s)==-1:s!=this.type)||!!this.id&&e.getAttribute("id")!=this.id||!!this.from&&n!=this.from?!1:!0},run:function(e){var t=null;try{t=this.handler(e)}catch(n){throw n.sourceURL?r.fatal("error: "+this.handler+" "+n.sourceURL+":"+n.line+" - "+n.name+": "+n.message):n.fileName?(typeof console!="undefined"&&(console.trace(),console.error(this.handler," - error - ",n,n.message)),r.fatal("error: "+this.handler+" "+n.fileName+":"+n.lineNumber+" - "+n.name+": "+n.message)):r.fatal("error: "+n.message+"\n"+n.stack),n}return t},toString:function(){return"{Handler: "+this.handler+"("+this.name+","+this.id+","+this.ns+")}"}},r.TimedHandler=function(e,t){this.period=e,this.handler=t,this.lastCalled=(new Date).getTime(),this.user=!0},r.TimedHandler.prototype={run:function(){return this.lastCalled=(new Date).getTime(),this.handler()},reset:function(){this.lastCalled=(new Date).getTime()},toString:function(){return"{TimedHandler: "+this.handler+"("+this.period+")}"}},r.Connection=function(e,t){this.service=e,this.options=t||{};var n=this.options.protocol||"";e.indexOf("ws:")===0||e.indexOf("wss:")===0||n.indexOf("ws")===0?this._proto=new r.Websocket(this):this._proto=new r.Bosh(this),this.jid="",this.domain=null,this.features=null,this._sasl_data={},this.do_session=!1,this.do_bind=!1,this.timedHandlers=[],this.handlers=[],this.removeTimeds=[],this.removeHandlers=[],this.addTimeds=[],this.addHandlers=[],this._authentication={},this._idleTimeout=null,this._disconnectTimeout=null,this.authenticated=!1,this.connected=!1,this.disconnecting=!1,this.do_authentication=!0,this.paused=!1,this.restored=!1,this._data=[],this._uniqueId=0,this._sasl_success_handler=null,this._sasl_failure_handler=null,this._sasl_challenge_handler=null,this.maxRetries=5,this._idleTimeout=setTimeout(this._onIdle.bind(this),100);for(var i in r._connectionPlugins)if(r._connectionPlugins.hasOwnProperty(i)){var s=r._connectionPlugins[i],o=function(){};o.prototype=s,this[i]=new o,this[i].init(this)}},r.Connection.prototype={reset:function(){this._proto._reset(),this.do_session=!1,this.do_bind=!1,this.timedHandlers=[],this.handlers=[],this.removeTimeds=[],this.removeHandlers=[],this.addTimeds=[],this.addHandlers=[],this._authentication={},this.authenticated=!1,this.connected=!1,this.disconnecting=!1,this.restored=!1,this._data=[],this._requests=[],this._uniqueId=0},pause:function(){this.paused=!0},resume:function(){this.paused=!1},getUniqueId:function(e){var t="xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g,function(e){var t=Math.random()*16|0,n=e=="x"?t:t&3|8;return n.toString(16)});return typeof e=="string"||typeof e=="number"?t+":"+e:t+""},connect:function(e,t,n,i,s,o,u){this.jid=e,this.authzid=r.getBareJidFromJid(this.jid),this.authcid=u||r.getNodeFromJid(this.jid),this.pass=t,this.servtype="xmpp",this.connect_callback=n,this.disconnecting=!1,this.connected=!1,this.authenticated=!1,this.restored=!1,this.domain=r.getDomainFromJid(this.jid),this._changeConnectStatus(r.Status.CONNECTING,null),this._proto._connect(i,s,o)},attach:function(e,t,n,i,s,o,u){if(!(this._proto instanceof r.Bosh))throw{name:"StropheSessionError",message:'The "attach" method can only be used with a BOSH connection.'};this._proto._attach(e,t,n,i,s,o,u)},restore:function(e,t,n,r,i){if(!this._sessionCachingSupported())throw{name:"StropheSessionError",message:'The "restore" method can only be used with a BOSH connection.'};this._proto._restore(e,t,n,r,i)},_sessionCachingSupported:function(){if(this._proto instanceof r.Bosh){if(!JSON)return!1;try{window.sessionStorage.setItem("_strophe_","_strophe_"),window.sessionStorage.removeItem("_strophe_")}catch(e){return!1}return!0}return!1},xmlInput:function(e){return},xmlOutput:function(e){return},rawInput:function(e){return},rawOutput:function(e){return},nextValidRid:function(e){return},send:function(e){if(e===null)return;if(typeof e.sort=="function")for(var t=0;t<e.length;t++)this._queueData(e[t]);else typeof e.tree=="function"?this._queueData(e.tree()):this._queueData(e);this._proto._send()},flush:function(){clearTimeout(this._idleTimeout),this._onIdle()},sendIQ:function(e,t,n,i){var s=null,o=this;typeof e.tree=="function"&&(e=e.tree());var u=e.getAttribute("id");u||(u=this.getUniqueId("sendIQ"),e.setAttribute("id",u));var a=e.getAttribute("to"),f=this.jid,l=this.addHandler(function(e){s&&o.deleteTimedHandler(s);var i=!1,u=e.getAttribute("from");if(u===a||a===null&&(u===r.getBareJidFromJid(f)||u===r.getDomainFromJid(f)||u===f))i=!0;if(!i)throw{name:"StropheError",message:"Got answer to IQ from wrong jid:"+u+"\nExpected jid: "+a};var l=e.getAttribute("type");if(l=="result")t&&t(e);else{if(l!="error")throw{name:"StropheError",message:"Got bad IQ type of "+l};n&&n(e)}},null,"iq",["error","result"],u);return i&&(s=this.addTimedHandler(i,function(){return o.deleteHandler(l),n&&n(null),!1})),this.send(e),u},_queueData:function(e){if(e===null||!e.tagName||!e.childNodes)throw{name:"StropheError",message:"Cannot queue non-DOMElement."};this._data.push(e)},_sendRestart:function(){this._data.push("restart"),this._proto._sendRestart(),this._idleTimeout=setTimeout(this._onIdle.bind(this),100)},addTimedHandler:function(e,t){var n=new r.TimedHandler(e,t);return this.addTimeds.push(n),n},deleteTimedHandler:function(e){this.removeTimeds.push(e)},addHandler:function(e,t,n,i,s,o,u){var a=new r.Handler(e,t,n,i,s,o,u);return this.addHandlers.push(a),a},deleteHandler:function(e){this.removeHandlers.push(e);var t=this.addHandlers.indexOf(e);t>=0&&this.addHandlers.splice(t,1)},disconnect:function(e){this._changeConnectStatus(r.Status.DISCONNECTING,e),r.info("Disconnect was called because: "+e);if(this.connected){var t=!1;this.disconnecting=!0,this.authenticated&&(t=u({xmlns:r.NS.CLIENT,type:"unavailable"})),this._disconnectTimeout=this._addSysTimedHandler(3e3,this._onDisconnectTimeout.bind(this)),this._proto._disconnect(t)}else r.info("Disconnect was called before Strophe connected to the server"),this._proto._abortAllRequests()},_changeConnectStatus:function(e,t){for(var n in r._connectionPlugins)if(r._connectionPlugins.hasOwnProperty(n)){var i=this[n];if(i.statusChanged)try{i.statusChanged(e,t)}catch(s){r.error(""+n+" plugin caused an exception "+"changing status: "+s)}}if(this.connect_callback)try{this.connect_callback(e,t)}catch(o){r.error("User connection callback caused an exception: "+o)}},_doDisconnect:function(e){typeof this._idleTimeout=="number"&&clearTimeout(this._idleTimeout),this._disconnectTimeout!==null&&(this.deleteTimedHandler(this._disconnectTimeout),this._disconnectTimeout=null),r.info("_doDisconnect was called"),this._proto._doDisconnect(),this.authenticated=!1,this.disconnecting=!1,this.restored=!1,this.handlers=[],this.timedHandlers=[],this.removeTimeds=[],this.removeHandlers=[],this.addTimeds=[],this.addHandlers=[],this._changeConnectStatus(r.Status.DISCONNECTED,e),this.connected=!1},_dataRecv:function(e,t){r.info("_dataRecv called");var n=this._proto._reqToData(e);if(n===null)return;this.xmlInput!==r.Connection.prototype.xmlInput&&(n.nodeName===this._proto.strip&&n.childNodes.length?this.xmlInput(n.childNodes[0]):this.xmlInput(n)),this.rawInput!==r.Connection.prototype.rawInput&&(t?this.rawInput(t):this.rawInput(r.serialize(n)));var i,s;while(this.removeHandlers.length>0)s=this.removeHandlers.pop(),i=this.handlers.indexOf(s),i>=0&&this.handlers.splice(i,1);while(this.addHandlers.length>0)this.handlers.push(this.addHandlers.pop());if(this.disconnecting&&this._proto._emptyQueue()){this._doDisconnect();return}var o=n.getAttribute("type"),u,a;if(o!==null&&o=="terminate"){if(this.disconnecting)return;u=n.getAttribute("condition"),a=n.getElementsByTagName("conflict"),u!==null?(u=="remote-stream-error"&&a.length>0&&(u="conflict"),this._changeConnectStatus(r.Status.CONNFAIL,u)):this._changeConnectStatus(r.Status.CONNFAIL,"unknown"),this._doDisconnect(u);return}var f=this;r.forEachChild(n,null,function(e){var t,n;n=f.handlers,f.handlers=[];for(t=0;t<n.length;t++){var i=n[t];try{i.isMatch(e)&&(f.authenticated||!i.user)?i.run(e)&&f.handlers.push(i):f.handlers.push(i)}catch(s){r.warn("Removing Strophe handlers due to uncaught exception: "+s.message)}}})},mechanisms:{},_connect_cb:function(e,t,n){r.info("_connect_cb was called"),this.connected=!0;var i=this._proto._reqToData(e);if(!i)return;this.xmlInput!==r.Connection.prototype.xmlInput&&(i.nodeName===this._proto.strip&&i.childNodes.length?this.xmlInput(i.childNodes[0]):this.xmlInput(i)),this.rawInput!==r.Connection.prototype.rawInput&&(n?this.rawInput(n):this.rawInput(r.serialize(i)));var s=this._proto._connect_cb(i);if(s===r.Status.CONNFAIL)return;this._authentication.sasl_scram_sha1=!1,this._authentication.sasl_plain=!1,this._authentication.sasl_digest_md5=!1,this._authentication.sasl_anonymous=!1,this._authentication.legacy_auth=!1;var o;i.getElementsByTagNameNS?o=i.getElementsByTagNameNS(r.NS.STREAM,"features").length>0:o=i.getElementsByTagName("stream:features").length>0||i.getElementsByTagName("features").length>0;var u=i.getElementsByTagName("mechanism"),a=[],f,l,c=!1;if(!o){this._proto._no_auth_received(t);return}if(u.length>0)for(f=0;f<u.length;f++)l=r.getText(u[f]),this.mechanisms[l]&&a.push(this.mechanisms[l]);this._authentication.legacy_auth=i.getElementsByTagName("auth").length>0,c=this._authentication.legacy_auth||a.length>0;if(!c){this._proto._no_auth_received(t);return}this.do_authentication!==!1&&this.authenticate(a)},authenticate:function(e){var n;for(n=0;n<e.length-1;++n){var s=n;for(var u=n+1;u<e.length;++u)e[u].prototype.priority>e[s].prototype.priority&&(s=u);if(s!=n){var a=e[n];e[n]=e[s],e[s]=a}}var f=!1;for(n=0;n<e.length;++n){if(!e[n].test(this))continue;this._sasl_success_handler=this._addSysHandler(this._sasl_success_cb.bind(this),null,"success",null,null),this._sasl_failure_handler=this._addSysHandler(this._sasl_failure_cb.bind(this),null,"failure",null,null),this._sasl_challenge_handler=this._addSysHandler(this._sasl_challenge_cb.bind(this),null,"challenge",null,null),this._sasl_mechanism=new e[n],this._sasl_mechanism.onStart(this);var l=i("auth",{xmlns:r.NS.SASL,mechanism:this._sasl_mechanism.name});if(this._sasl_mechanism.isClientFirst){var c=this._sasl_mechanism.onChallenge(this,null);l.t(t.encode(c))}this.send(l.tree()),f=!0;break}f||(r.getNodeFromJid(this.jid)===null?(this._changeConnectStatus(r.Status.CONNFAIL,"x-strophe-bad-non-anon-jid"),this.disconnect("x-strophe-bad-non-anon-jid")):(this._changeConnectStatus(r.Status.AUTHENTICATING,null),this._addSysHandler(this._auth1_cb.bind(this),null,null,null,"_auth_1"),this.send(o({type:"get",to:this.domain,id:"_auth_1"}).c("query",{xmlns:r.NS.AUTH}).c("username",{}).t(r.getNodeFromJid(this.jid)).tree())))},_sasl_challenge_cb:function(e){var n=t.decode(r.getText(e)),s=this._sasl_mechanism.onChallenge(this,n),o=i("response",{xmlns:r.NS.SASL});return s!==""&&o.t(t.encode(s)),this.send(o.tree()),!0},_auth1_cb:function(e){var t=o({type:"set",id:"_auth_2"}).c("query",{xmlns:r.NS.AUTH}).c("username",{}).t(r.getNodeFromJid(this.jid)).up().c("password").t(this.pass);return r.getResourceFromJid(this.jid)||(this.jid=r.getBareJidFromJid(this.jid)+"/strophe"),t.up().c("resource",{}).t(r.getResourceFromJid(this.jid)),this._addSysHandler(this._auth2_cb.bind(this),null,null,null,"_auth_2"),this.send(t.tree()),!1},_sasl_success_cb:function(e){if(this._sasl_data["server-signature"]){var n,i=t.decode(r.getText(e)),s=/([a-z]+)=([^,]+)(,|$)/,o=i.match(s);o[1]=="v"&&(n=o[2]);if(n!=this._sasl_data["server-signature"])return this.deleteHandler(this._sasl_failure_handler),this._sasl_failure_handler=null,this._sasl_challenge_handler&&(this.deleteHandler(this._sasl_challenge_handler),this._sasl_challenge_handler=null),this._sasl_data={},this._sasl_failure_cb(null)}r.info("SASL authentication succeeded."),this._sasl_mechanism&&this._sasl_mechanism.onSuccess(),this.deleteHandler(this._sasl_failure_handler),this._sasl_failure_handler=null,this._sasl_challenge_handler&&(this.deleteHandler(this._sasl_challenge_handler),this._sasl_challenge_handler=null);var u=[],a=function(e,t){while(e.length)this.deleteHandler(e.pop());return this._sasl_auth1_cb.bind(this)(t),!1};return u.push(this._addSysHandler(function(e){a.bind(this)(u,e)}.bind(this),null,"stream:features",null,null)),u.push(this._addSysHandler(function(e){a.bind(this)(u,e)}.bind(this),r.NS.STREAM,"features",null,null)),this._sendRestart(),!1},_sasl_auth1_cb:function(e){this.features=e;var t,n;for(t=0;t<e.childNodes.length;t++)n=e.childNodes[t],n.nodeName=="bind"&&(this.do_bind=!0),n.nodeName=="session"&&(this.do_session=!0);if(!this.do_bind)return this._changeConnectStatus(r.Status.AUTHFAIL,null),!1;this._addSysHandler(this._sasl_bind_cb.bind(this),null,null,null,"_bind_auth_2");var i=r.getResourceFromJid(this.jid);return i?this.send(o({type:"set",id:"_bind_auth_2"}).c("bind",{xmlns:r.NS.BIND}).c("resource",{}).t(i).tree()):this.send(o({type:"set",id:"_bind_auth_2"}).c("bind",{xmlns:r.NS.BIND}).tree()),!1},_sasl_bind_cb:function(e){if(e.getAttribute("type")=="error"){r.info("SASL binding failed.");var t=e.getElementsByTagName("conflict"),n;return t.length>0&&(n="conflict"),this._changeConnectStatus(r.Status.AUTHFAIL,n),!1}var i=e.getElementsByTagName("bind"),s;if(!(i.length>0))return r.info("SASL binding failed."),this._changeConnectStatus(r.Status.AUTHFAIL,null),!1;s=i[0].getElementsByTagName("jid"),s.length>0&&(this.jid=r.getText(s[0]),this.do_session?(this._addSysHandler(this._sasl_session_cb.bind(this),null,null,null,"_session_auth_2"),this.send(o({type:"set",id:"_session_auth_2"}).c("session",{xmlns:r.NS.SESSION}).tree())):(this.authenticated=!0,this._changeConnectStatus(r.Status.CONNECTED,null)))},_sasl_session_cb:function(e){if(e.getAttribute("type")=="result")this.authenticated=!0,this._changeConnectStatus(r.Status.CONNECTED,null);else if(e.getAttribute("type")=="error")return r.info("Session creation failed."),this._changeConnectStatus(r.Status.AUTHFAIL,null),!1;return!1},_sasl_failure_cb:function(e){return this._sasl_success_handler&&(this.deleteHandler(this._sasl_success_handler),this._sasl_success_handler=null),this._sasl_challenge_handler&&(this.deleteHandler(this._sasl_challenge_handler),this._sasl_challenge_handler=null),this._sasl_mechanism&&this._sasl_mechanism.onFailure(),this._changeConnectStatus(r.Status.AUTHFAIL,null),!1},_auth2_cb:function(e){return e.getAttribute("type")=="result"?(this.authenticated=!0,this._changeConnectStatus(r.Status.CONNECTED,null)):e.getAttribute("type")=="error"&&(this._changeConnectStatus(r.Status.AUTHFAIL,null),this.disconnect("authentication failed")),!1},_addSysTimedHandler:function(e,t){var n=new r.TimedHandler(e,t);return n.user=!1,this.addTimeds.push(n),n},_addSysHandler:function(e,t,n,i,s){var o=new r.Handler(e,t,n,i,s);return o.user=!1,this.addHandlers.push(o),o},_onDisconnectTimeout:function(){return r.info("_onDisconnectTimeout was called"),this._proto._onDisconnectTimeout(),this._doDisconnect(),!1},_onIdle:function(){var e,t,n,r;while(this.addTimeds.length>0)this.timedHandlers.push(this.addTimeds.pop());while(this.removeTimeds.length>0)t=this.removeTimeds.pop(),e=this.timedHandlers.indexOf(t),e>=0&&this.timedHandlers.splice(e,1);var i=(new Date).getTime();r=[];for(e=0;e<this.timedHandlers.length;e++){t=this.timedHandlers[e];if(this.authenticated||!t.user)n=t.lastCalled+t.period,n-i<=0?t.run()&&r.push(t):r.push(t)}this.timedHandlers=r,clearTimeout(this._idleTimeout),this._proto._onIdle(),this.connected&&(this._idleTimeout=setTimeout(this._onIdle.bind(this),100))}},r.SASLMechanism=function(e,t,n){this.name=e,this.isClientFirst=t,this.priority=n},r.SASLMechanism.prototype={test:function(e){return!0},onStart:function(e){this._connection=e},onChallenge:function(e,t){throw new Error("You should implement challenge handling!")},onFailure:function(){this._connection=null},onSuccess:function(){this._connection=null}},r.SASLAnonymous=function(){},r.SASLAnonymous.prototype=new r.SASLMechanism("ANONYMOUS",!1,10),r.SASLAnonymous.test=function(e){return e.authcid===null},r.Connection.prototype.mechanisms[r.SASLAnonymous.prototype.name]=r.SASLAnonymous,r.SASLPlain=function(){},r.SASLPlain.prototype=new r.SASLMechanism("PLAIN",!0,20),r.SASLPlain.test=function(e){return e.authcid!==null},r.SASLPlain.prototype.onChallenge=function(e){var t=e.authzid;return t+="\0",t+=e.authcid,t+="\0",t+=e.pass,t},r.Connection.prototype.mechanisms[r.SASLPlain.prototype.name]=r.SASLPlain,r.SASLSHA1=function(){},r.SASLSHA1.prototype=new r.SASLMechanism("SCRAM-SHA-1",!0,40),r.SASLSHA1.test=function(e){return e.authcid!==null},r.SASLSHA1.prototype.onChallenge=function(r,i,s){var o=s||n.hexdigest(Math.random()*1234567890),u="n="+r.authcid;return u+=",r=",u+=o,r._sasl_data.cnonce=o,r._sasl_data["client-first-message-bare"]=u,u="n,,"+u,this.onChallenge=function(n,r){var i,s,o,u,a,f,l,c,h,p,d,v="c=biws,",m=n._sasl_data["client-first-message-bare"]+","+r+",",g=n._sasl_data.cnonce,y=/([a-z]+)=([^,]+)(,|$)/;while(r.match(y)){var b=r.match(y);r=r.replace(b[0],"");switch(b[1]){case"r":i=b[2];break;case"s":s=b[2];break;case"i":o=b[2]}}if(i.substr(0,g.length)!==g)return n._sasl_data={},n._sasl_failure_cb();v+="r="+i,m+=v,s=t.decode(s),s+="\0\0\0
",u=f=e.core_hmac_sha1(n.pass,s);for(l=1;l<o;l++){a=e.core_hmac_sha1(n.pass,e.binb2str(f));for(c=0;c<5;c++)u[c]^=a[c];f=a}u=e.binb2str(u),h=e.core_hmac_sha1(u,"Client Key"),p=e.str_hmac_sha1(u,"Server Key"),d=e.core_hmac_sha1(e.str_sha1(e.binb2str(h)),m),n._sasl_data["server-signature"]=e.b64_hmac_sha1(p,m);for(c=0;c<5;c++)h[c]^=d[c];return v+=",p="+t.encode(e.binb2str(h)),v}.bind(this),u},r.Connection.prototype.mechanisms[r.SASLSHA1.prototype.name]=r.SASLSHA1,r.SASLMD5=function(){},r.SASLMD5.prototype=new r.SASLMechanism("DIGEST-MD5",!1,30),r.SASLMD5.test=function(e){return e.authcid!==null},r.SASLMD5.prototype._quote=function(e){return'"'+e.replace(/\\/g,"\\\\").replace(/"/g,'\\"')+'"'},r.SASLMD5.prototype.onChallenge=function(e,t,r){var i=/([a-z]+)=("[^"]+"|[^,"]+)(?:,|$)/,s=r||n.hexdigest(""+Math.random()*1234567890),o="",u=null,a="",f="",l;while(t.match(i)){l=t.match(i),t=t.replace(l[0],""),l[2]=l[2].replace(/^"(.+)"$/,"$1");switch(l[1]){case"realm":o=l[2];break;case"nonce":a=l[2];break;case"qop":f=l[2];break;case"host":u=l[2]}}var c=e.servtype+"/"+e.domain;u!==null&&(c=c+"/"+u);var h=n.hash(e.authcid+":"+o+":"+this._connection.pass)+":"+a+":"+s,p="AUTHENTICATE:"+c,d="";return d+="charset=utf-8,",d+="username="+this._quote(e.authcid)+",",d+="realm="+this._quote(o)+",",d+="nonce="+this._quote(a)+",",d+="nc=00000001,",d+="cnonce="+this._quote(s)+",",d+="digest-uri="+this._quote(c)+",",d+="response="+n.hexdigest(n.hexdigest(h)+":"+a+":00000001:"+s+":auth:"+n.hexdigest(p))+",",d+="qop=auth",this.onChallenge=function(){return""}.bind(this),d},r.Connection.prototype.mechanisms[r.SASLMD5.prototype.name]=r.SASLMD5,{Strophe:r,$build:i,$msg:s,$iq:o,$pres:u,SHA1:e,Base64:t,MD5:n}}),function(e,t){if(typeof define!="function"||!define.amd)return t(Strophe,$build);define("strophe-bosh",["strophe-core"],function(e){return t(e.Strophe,e.$build)})}(this,function(e,t){return e.Request=function(t,n,r,i){this.id=++e._requestId,this.xmlData=t,this.data=e.serialize(t),this.origFunc=n,this.func=n,this.rid=r,this.date=NaN,this.sends=i||0,this.abort=!1,this.dead=null,this.age=function(){if(!this.date)return 0;var e=new Date;return(e-this.date)/1e3},this.timeDead=function(){if(!this.dead)return 0;var e=new Date;return(e-this.dead)/1e3},this.xhr=this._newXHR()},e.Request.prototype={getResponse:function(){var t=null;if(this.xhr.responseXML&&this.xhr.responseXML.documentElement){t=this.xhr.responseXML.documentElement;if(t.tagName=="parsererror")throw e.error("invalid response received"),e.error("responseText: "+this.xhr.responseText),e.error("responseXML: "+e.serialize(this.xhr.responseXML)),"parsererror"}else this.xhr.responseText&&(e.error("invalid response received"),e.error("responseText: "+this.xhr.responseText),e.error("responseXML: "+e.serialize(this.xhr.responseXML)));return t},_newXHR:function(){var e=null;return window.XMLHttpRequest?(e=new XMLHttpRequest,e.overrideMimeType&&e.overrideMimeType("text/xml; charset=utf-8")):window.ActiveXObject&&(e=new ActiveXObject("Microsoft.XMLHTTP")),e.onreadystatechange=this.func.bind(null,this),e}},e.Bosh=function(e){this._conn=e,this.rid=Math.floor(Math.random()*4294967295),this.sid=null,this.hold=1,this.wait=60,this.window=5,this.errors=0,this._requests=[]},e.Bosh.prototype={strip:null,_buildBody:function(){var n=t("body",{rid:this.rid++,xmlns:e.NS.HTTPBIND});return this.sid!==null&&n.attrs({sid:this.sid}),this._conn.options.keepalive&&this._cacheSession(),n},_reset:function(){this.rid=Math.floor(Math.random()*4294967295),this.sid=null,this.errors=0,window.sessionStorage.removeItem("strophe-bosh-session"),this._conn.nextValidRid(this.rid)},_connect:function(t,n,r){this.wait=t||this.wait,this.hold=n||this.hold,this.errors=0;var i=this._buildBody().attrs({to:this._conn.domain,"xml:lang":"en",wait:this.wait,hold:this.hold,content:"text/xml; charset=utf-8",ver:"1.6","xmpp:version":"1.0","xmlns:xmpp":e.NS.BOSH});r&&i.attrs({route:r});var s=this._conn._connect_cb;this._requests.push(new e.Request(i.tree(),this._onRequestStateChange.bind(this,s.bind(this._conn)),i.tree().getAttribute("rid"))),this._throttledRequestHandler()},_attach:function(t,n,r,i,s,o,u){this._conn.jid=t,this.sid=n,this.rid=r,this._conn.connect_callback=i,this._conn.domain=e.getDomainFromJid(this._conn.jid),this._conn.authenticated=!0,this._conn.connected=!0,this.wait=s||this.wait,this.hold=o||this.hold,this.window=u||this.window,this._conn._changeConnectStatus(e.Status.ATTACHED,null)},_restore:function(t,n,r,i,s){var o=JSON.parse(window.sessionStorage.getItem("strophe-bosh-session"));if(!(typeof o!="undefined"&&o!==null&&o.rid&&o.sid&&o.jid)||typeof t!="undefined"&&t!=="null"&&e.getBareJidFromJid(o.jid)!=e.getBareJidFromJid(t))throw{name:"StropheSessionError",message:"_restore: no restoreable session."};this._conn.restored=!0,this._attach(o.jid,o.sid,o.rid,n,r,i,s)},_cacheSession:function(){this._conn.authenticated?this._conn.jid&&this.rid&&this.sid&&window.sessionStorage.setItem("strophe-bosh-session",JSON.stringify({jid:this._conn.jid,rid:this.rid,sid:this.sid})):window.sessionStorage.removeItem("strophe-bosh-session")},_connect_cb:function(t){var n=t.getAttribute("type"),r,i;if(n!==null&&n=="terminate")return r=t.getAttribute("condition"),e.error("BOSH-Connection failed: "+r),i=t.getElementsByTagName("conflict"),r!==null?(r=="remote-stream-error"&&i.length>0&&(r="conflict"),this._conn._changeConnectStatus(e.Status.CONNFAIL,r)):this._conn._changeConnectStatus(e.Status.CONNFAIL,"unknown"),this._conn._doDisconnect(r),e.Status.CONNFAIL;this.sid||(this.sid=t.getAttribute("sid"));var s=t.getAttribute("requests");s&&(this.window=parseInt(s,10));var o=t.getAttribute("hold");o&&(this.hold=parseInt(o,10));var u=t.getAttribute("wait");u&&(this.wait=parseInt(u,10))},_disconnect:function(e){this._sendTerminate(e)},_doDisconnect:function(){this.sid=null,this.rid=Math.floor(Math.random()*4294967295),window.sessionStorage.removeItem("strophe-bosh-session"),this._conn.nextValidRid(this.rid)},_emptyQueue:function(){return this._requests.length===0},_hitError:function(t){this.errors++,e.warn("request errored, status: "+t+", number of errors: "+this.errors),this.errors>4&&this._conn._onDisconnectTimeout()},_no_auth_received:function(t){t?t=t.bind(this._conn):t=this._conn._connect_cb.bind(this._conn);var n=this._buildBody();this._requests.push(new e.Request(n.tree(),this._onRequestStateChange.bind(this,t.bind(this._conn)),n.tree().getAttribute("rid"))),this._throttledRequestHandler()},_onDisconnectTimeout:function(){this._abortAllRequests()},_abortAllRequests:function(){var t;while(this._requests.length>0)t=this._requests.pop(),t.abort=!0,t.xhr.abort(),t.xhr.onreadystatechange=function(){}},_onIdle:function(){var t=this._conn._data;this._conn.authenticated&&this._requests.length===0&&t.length===0&&!this._conn.disconnecting&&(e.info("no requests during idle cycle, sending blank request"),t.push(null));if(this._conn.paused)return;if(this._requests.length<2&&t.length>0){var n=this._buildBody();for(var r=0;r<t.length;r++)t[r]!==null&&(t[r]==="restart"?n.attrs({to:this._conn.domain,"xml:lang":"en","xmpp:restart":"true","xmlns:xmpp":e.NS.BOSH}):n.cnode(t[r]).up());delete this._conn._data,this._conn._data=[],this._requests.push(new e.Request(n.tree(),this._onRequestStateChange.bind(this,this._conn._dataRecv.bind(this._conn)),n.tree().getAttribute("rid"))),this._throttledRequestHandler()}if(this._requests.length>0){var i=this._requests[0].age();this._requests[0].dead!==null&&this._requests[0].timeDead()>Math.floor(e.SECONDARY_TIMEOUT*this.wait)&&this._throttledRequestHandler(),i>Math.floor(e.TIMEOUT*this.wait)&&(e.warn("Request "+this._requests[0].id+" timed out, over "+Math.floor(e.TIMEOUT*this.wait)+" seconds since last activity"),this._throttledRequestHandler())}},_onRequestStateChange:function(t,n){e.debug("request id "+n.id+"."+n.sends+" state changed to "+n.xhr.readyState);if(n.abort){n.abort=!1;return}var r;if(n.xhr.readyState==4){r=0;try{r=n.xhr.status}catch(i){}typeof r=="undefined"&&(r=0);if(this.disconnecting&&r>=400){this._hitError(r);return}var s=this._requests[0]==n,o=this._requests[1]==n;if(r>0&&r<500||n.sends>5)this._removeRequest(n),e.debug("request id "+n.id+" should now be removed");if(r==200)(o||s&&this._requests.length>0&&this._requests[0].age()>Math.floor(e.SECONDARY_TIMEOUT*this.wait))&&this._restartRequest(0),this._conn.nextValidRid(Number(n.rid)+1),e.debug("request id "+n.id+"."+n.sends+" got 200"),t(n),this.errors=0;else{e.error("request id "+n.id+"."+n.sends+" error "+r+" happened");if(r===0||r>=400&&r<600||r>=12e3)this._hitError(r),r>=400&&r<500&&(this._conn._changeConnectStatus(e.Status.DISCONNECTING,null),this._conn._doDisconnect())}r>0&&r<500||n.sends>5||this._throttledRequestHandler()}},_processRequest:function(t){var n=this,r=this._requests[t],i=-1;try{r.xhr.readyState==4&&(i=r.xhr.status)}catch(s){e.error("caught an error in _requests["+t+"], reqStatus: "+i)}typeof i=="undefined"&&(i=-1);if(r.sends>this._conn.maxRetries){this._conn._onDisconnectTimeout();return}var o=r.age(),u=!isNaN(o)&&o>Math.floor(e.TIMEOUT*this.wait),a=r.dead!==null&&r.timeDead()>Math.floor(e.SECONDARY_TIMEOUT*this.wait),f=r.xhr.readyState==4&&(i<1||i>=500);if(u||a||f)a&&e.error("Request "+this._requests[t].id+" timed out (secondary), restarting"),r.abort=!0,r.xhr.abort(),r.xhr.onreadystatechange=function(){},this._requests[t]=new e.Request(r.xmlData,r.origFunc,r.rid,r.sends),r=this._requests[t];if(r.xhr.readyState===0){e.debug("request id "+r.id+"."+r.sends+" posting");try{r.xhr.open("POST",this._conn.service,this._conn.options.sync?!1:!0),r.xhr.setRequestHeader("Content-Type","text/xml; charset=utf-8")}catch(l){e.error("XHR open failed."),this._conn.connected||this._conn._changeConnectStatus(e.Status.CONNFAIL,"bad-service"),this._conn.disconnect();return}var c=function(){r.date=new Date;if(n._conn.options.customHeaders){var e=n._conn.options.customHeaders;for(var t in e)e.hasOwnProperty(t)&&r.xhr.setRequestHeader(t,e[t])}r.xhr.send(r.data)};if(r.sends>1){var h=Math.min(Math.floor(e.TIMEOUT*this.wait),Math.pow(r.sends,3))*1e3;setTimeout(c,h)}else c();r.sends++,this._conn.xmlOutput!==e.Connection.prototype.xmlOutput&&(r.xmlData.nodeName===this.strip&&r.xmlData.childNodes.length?this._conn.xmlOutput(r.xmlData.childNodes[0]):this._conn.xmlOutput(r.xmlData)),this._conn.rawOutput!==e.Connection.prototype.rawOutput&&this._conn.rawOutput(r.data)}else e.debug("_processRequest: "+(t===0?"first":"second")+" request has readyState of "+r.xhr.readyState)},_removeRequest:function(t){e.debug("removing request");var n;for(n=this._requests.length-1;n>=0;n--)t==this._requests[n]&&this._requests.splice(n,1);t.xhr.onreadystatechange=function(){},this._throttledRequestHandler()},_restartRequest:function(e){var t=this._requests[e];t.dead===null&&(t.dead=new Date),this._processRequest(e)},_reqToData:function(e){try{return e.getResponse()}catch(t){if(t!="parsererror")throw t;this._conn.disconnect("strophe-parsererror")}},_sendTerminate:function(t){e.info("_sendTerminate was called");var n=this._buildBody().attrs({type:"terminate"});t&&n.cnode(t.tree());var r=new e.Request(n.tree(),this._onRequestStateChange.bind(this,this._conn._dataRecv.bind(this._conn)),n.tree().getAttribute("rid"));this._requests.push(r),this._throttledRequestHandler()},_send:function(){clearTimeout(this._conn._idleTimeout),this._throttledRequestHandler(),this._conn._idleTimeout=setTimeout(this._conn._onIdle.bind(this._conn),100)},_sendRestart:function(){this._throttledRequestHandler(),clearTimeout(this._conn._idleTimeout)},_throttledRequestHandler:function(){this._requests?e.debug("_throttledRequestHandler called with "+this._requests.length+" requests"):e.debug("_throttledRequestHandler called with undefined requests");if(!this._requests||this._requests.length===0)return;this._requests.length>0&&this._processRequest(0),this._requests.length>1&&Math.abs(this._requests[0].rid-this._requests[1].rid)<this.window&&this._processRequest(1)}},e}),function(e,t){if(typeof define!="function"||!define.amd)return t(Strophe,$build);define("strophe-websocket",["strophe-core"],function(e){return t(e.Strophe,e.$build)})}(this,function(e,t){return e.Websocket=function(e){this._conn=e,this.strip="wrapper";var t=e.service;if(t.indexOf("ws:")!==0&&t.indexOf("wss:")!==0){var n="";e.options.protocol==="ws"&&window.location.protocol!=="https:"?n+="ws":n+="wss",n+="://"+window.location.host,t.indexOf("/")!==0?n+=window.location.pathname+t:n+=t,e.service=n}},e.Websocket.prototype={_buildStream:function(){return t("open",{xmlns:e.NS.FRAMING,to:this._conn.domain,version:"1.0"})},_check_streamerror:function(t,n){var r;t.getElementsByTagNameNS?r=t.getElementsByTagNameNS(e.NS.STREAM,"error"):r=t.getElementsByTagName("stream:error");if(r.length===0)return!1;var i=r[0],s="",o="",u="urn:ietf:params:xml:ns:xmpp-streams";for(var a=0;a<i.childNodes.length;a++){var f=i.childNodes[a];if(f.getAttribute("xmlns")!==u)break;f.nodeName==="text"?o=f.textContent:s=f.nodeName}var l="WebSocket stream error: ";return s?l+=s:l+="unknown",o&&(l+=" - "+s),e.error(l),this._conn._changeConnectStatus(n,s),this._conn._doDisconnect(),!0},_reset:function(){return},_connect:function(){this._closeSocket(),this.socket=new WebSocket(this._conn.service,"xmpp"),this.socket.onopen=this._onOpen.bind(this),this.socket.onerror=this._onError.bind(this),this.socket.onclose=this._onClose.bind(this),this.socket.onmessage=this._connect_cb_wrapper.bind(this)},_connect_cb:function(t){var n=this._check_streamerror(t,e.Status.CONNFAIL);if(n)return e.Status.CONNFAIL},_handleStreamStart:function(t){var n=!1,r=t.getAttribute("xmlns");typeof r!="string"?n="Missing xmlns in <open />":r!==e.NS.FRAMING&&(n="Wrong xmlns in <open />: "+r);var i=t.getAttribute("version");return typeof i!="string"?n="Missing version in <open />":i!=="1.0"&&(n="Wrong version in <open />: "+i),n?(this._conn._changeConnectStatus(e.Status.CONNFAIL,n),this._conn._doDisconnect(),!1):!0},_connect_cb_wrapper:function(t){if(t.data.indexOf("<open ")===0||t.data.indexOf("<?xml")===0){var n=t.data.replace(/^(<\?.*?\?>\s*)*/,"");if(n==="")return;var r=(new DOMParser).parseFromString(n,"text/xml").documentElement;this._conn.xmlInput(r),this._conn.rawInput(t.data),this._handleStreamStart(r)&&this._connect_cb(r)}else if(t.data.indexOf("<close ")===0){this._conn.rawInput(t.data),this._conn.xmlInput(t);var i=t.getAttribute("see-other-uri");i?(this._conn._changeConnectStatus(e.Status.REDIRECT,"Received see-other-uri, resetting connection"),this._conn.reset(),this._conn.service=i,this._connect()):(this._conn._changeConnectStatus(e.Status.CONNFAIL,"Received closing stream"),this._conn._doDisconnect())}else{var s=this._streamWrap(t.data),o=(new DOMParser).parseFromString(s,"text/xml").documentElement;this.socket.onmessage=this._onMessage.bind(this),this._conn._connect_cb(o,null,t.data)}},_disconnect:function(n){if(this.socket&&this.socket.readyState!==WebSocket.CLOSED){n&&this._conn.send(n);var r=t("close",{xmlns:e.NS.FRAMING});this._conn.xmlOutput(r);var i=e.serialize(r);this._conn.rawOutput(i);try{this.socket.send(i)}catch(s){e.info("Couldn't send <close /> tag.")}}this._conn._doDisconnect()},_doDisconnect:function(){e.info("WebSockets _doDisconnect was called"),this._closeSocket()},_streamWrap:function(e){return"<wrapper>"+e+"</wrapper>"},_closeSocket:function(){if(this.socket)try{this.socket.close()}catch(e){}this.socket=null},_emptyQueue:function(){return!0},_onClose:function(){this._conn.connected&&!this._conn.disconnecting?(e.error("Websocket closed unexcectedly"),this._conn._doDisconnect()):e.info("Websocket closed")},_no_auth_received:function(t){e.error("Server did not send any auth methods"),this._conn._changeConnectStatus(e.Status.CONNFAIL,"Server did not send any auth methods"),t&&(t=t.bind(this._conn),t()),this._conn._doDisconnect()},_onDisconnectTimeout:function(){},_abortAllRequests:function(){},_onError:function(t){e.error("Websocket error "+t),this._conn._changeConnectStatus(e.Status.CONNFAIL,"The WebSocket connection could not be established was disconnected."),this._disconnect()},_onIdle:function(){var t=this._conn._data;if(t.length>0&&!this._conn.paused){for(var n=0;n<t.length;n++)if(t[n]!==null){var r,i;t[n]==="restart"?r=this._buildStream().tree():r=t[n],i=e.serialize(r),this._conn.xmlOutput(r),this._conn.rawOutput(i),this.socket.send(i)}this._conn._data=[]}},_onMessage:function(t){var n,r,i='<close xmlns="urn:ietf:params:xml:ns:xmpp-framing" />';if(t.data===i){this._conn.rawInput(i),this._conn.xmlInput(t),this._conn.disconnecting||this._conn._doDisconnect();return}if(t.data.search("<open ")===0){n=(new DOMParser).parseFromString(t.data,"text/xml").documentElement;if(!this._handleStreamStart(n))return}else r=this._streamWrap(t.data),n=(new DOMParser).parseFromString(r,"text/xml").documentElement;if(this._check_streamerror(n,e.Status.ERROR))return;if(this._conn.disconnecting&&n.firstChild.nodeName==="presence"&&n.firstChild.getAttribute("type")==="unavailable"){this._conn.xmlInput(n),this._conn.rawInput(e.serialize(n));return}this._conn._dataRecv(n,t.data)},_onOpen:function(){e.info("Websocket open");var t=this._buildStream();this._conn.xmlOutput(t.tree());var n=e.serialize(t);this._conn.rawOutput(n),this.socket.send(n)},_reqToData:function(e){return e},_send:function(){this._conn.flush()},_sendRestart:function(){clearTimeout(this._conn._idleTimeout),this._conn._onIdle.bind(this._conn)()}},e}),define("strophe",["strophe-core","strophe-bosh","strophe-websocket"],function(e){return e}),function(e,t){typeof define=="function"&&define.amd?define("strophe.disco",["strophe"],function(e){return t(e.Strophe,e.$build,e.$iq,e.$msg,e.$pres),e}):t(e.Strophe,e.$build,e.$iq,e.$msg,e.$pres)}(this,function(e,t,n,r,i){e.addConnectionPlugin("disco",{_connection:null,_identities:[],_features:[],_items:[],init:function(t){this._connection=t,this._identities=[],this._features=[],this._items=[],t.addHandler(this._onDiscoInfo.bind(this),e.NS.DISCO_INFO,"iq","get",null,null),t.addHandler(this._onDiscoItems.bind(this),e.NS.DISCO_ITEMS,"iq","get",null,null)},addIdentity:function(e,t,n,r){for(var i=0;i<this._identities.length;i++)if(this._identities[i].category==e&&this._identities[i].type==t&&this._identities[i].name==n&&this._identities[i].lang==r)return!1;return this._identities.push({category:e,type:t,name:n,lang:r}),!0},addFeature:function(e){for(var t=0;t<this._features.length;t++)if(this._features[t]==e)return!1;return this._features.push(e),!0},removeFeature:function(e){for(var t=0;t<this._features.length;t++)if(this._features[t]===e)return this._features.splice(t,1),!0;return!1},addItem:function(e,t,n,r){return n&&!r?!1:(this._items.push({jid:e,name:t,node:n,call_back:r}),!0)},info:function(t,r,i,s,o){var u={xmlns:e.NS.DISCO_INFO};r&&(u.node=r);var a=n({from:this._connection.jid,to:t,type:"get"}).c("query",u);this._connection.sendIQ(a,i,s,o)},items:function(t,r,i,s,o){var u={xmlns:e.NS.DISCO_ITEMS};r&&(u.node=r);var a=n({from:this._connection.jid,to:t,type:"get"}).c("query",u);this._connection.sendIQ(a,i,s,o)},_buildIQResult:function(e,t){var r=e.getAttribute("id"),i=e.getAttribute("from"),s=n({type:"result",id:r});return i!==null&&s.attrs({to:i}),s.c("query",t)},_onDiscoInfo:function(t){var n=t.getElementsByTagName("query")[0].getAttribute("node"),r={xmlns:e.NS.DISCO_INFO},i;n&&(r.node=n);var s=this._buildIQResult(t,r);for(i=0;i<this._identities.length;i++)r={category:this._identities[i].category,type:this._identities[i].type},this._identities[i].name&&(r.name=this._identities[i].name),this._identities[i].lang&&(r["xml:lang"]=this._identities[i].lang),s.c("identity",r).up();for(i=0;i<this._features.length;i++)s.c("feature",{"var":this._features[i]}).up();return this._connection.send(s.tree()),!0},_onDiscoItems:function(t){var n={xmlns:e.NS.DISCO_ITEMS},r=t.getElementsByTagName("query")[0].getAttribute("node"),i,s;if(r){n.node=r,i=[];for(s=0;s<this._items.length;s++)if(this._items[s].node==r){i=this._items[s].call_back(t);break}}else i=this._items;var o=this._buildIQResult(t,n);for(s=0;s<i.length;s++){var u={jid:i[s].jid};i[s].name&&(u.name=i[s].name),i[s].node&&(u.node=i[s].node),o.c("item",u).up()}return this._connection.send(o.tree()),!0}})}),function(e,t){typeof define=="function"&&define.amd?define("strophe.ping",["strophe"],function(e){return t(e.Strophe,e.$build,e.$iq,e.$msg,e.$pres),e}):t(e.Strophe,e.$build,e.$iq,e.$msg,e.$pres)}(this,function(e,t,n,r,i){e.addConnectionPlugin("ping",{_c:null,init:function(t){this._c=t,e.addNamespace("PING","urn:xmpp:ping")},ping:function(t,r,i,s){var o=this._c.getUniqueId("ping"),u=n({type:"get",to:t,id:o}).c("ping",{xmlns:e.NS.PING});this._c.sendIQ(u,r,i,s)},pong:function(e){var t=e.getAttribute("from"),r=e.getAttribute("id"),i=n({type:"result",to:t,id:r});this._c.sendIQ(i)},addPingHandler:function(t){return this._c.addHandler(t,e.NS.PING,"iq","get")}})}),function(e,t){typeof define=="function"&&define.amd?define("strophe.rsm",["strophe"],function(e){return t(e.Strophe,e.$build,e.$iq,e.$msg,e.$pres),e}):t(e.Strophe,e.$build,e.$iq,e.$msg,e.$pres)}(this,function(e,t,n,r,i){e.addNamespace("RSM","http://jabber.org/protocol/rsm"),e.RSM=function(e){this.attribs=["max","first","last","after","before","index","count"];if(typeof e.xml!="undefined")this.fromXMLElement(e.xml);else for(var t=0;t<this.attribs.length;t++){var n=this.attribs[t];this[n]=e[n]}},e.RSM.prototype={toXML:function(){var n=t("set",{xmlns:e.NS.RSM});for(var r=0;r<this.attribs.length;r++){var i=this.attribs[r];typeof this[i]!="undefined"&&(n=n.c(i).t(this[i].toString()).up())}return n.tree()},next:function(t){var n=new e.RSM({max:t,after:this.last});return n},previous:function(t){var n=new e.RSM({max:t,before:this.first});return n},fromXMLElement:function(t){for(var n=0;n<this.attribs.length;n++){var r=this.attribs[n],i=t.getElementsByTagName(r)[0];typeof i!="undefined"&&i!==null&&(this[r]=e.getText(i),r=="first"&&(this.index=i.getAttribute("index")))}}}}),function(e,t){typeof define=="function"&&define.amd?define("strophe.vcard",["strophe"],function(e){return t(e.Strophe,e.$build,e.$iq,e.$msg,e.$pres),e}):t(e.Strophe,e.$build,e.$iq,e.$msg,e.$pres)}(this,function(e,t,n,r,i){var s=function(t,r,i){var s=n(r?{type:t,to:r}:{type:t});return s.c("vCard",{xmlns:e.NS.VCARD}),i&&s.cnode(i),s};e.addConnectionPlugin("vcard",{_connection:null,init:function(t){return this._connection=t,e.addNamespace("VCARD","vcard-temp")},get:function(e,t,n){var r=s("get",t);return this._connection.sendIQ(r,e,n)},set:function(e,t,n,r){var i=s("set",n,t);return this._connection.sendIQ(i,e,r)}})}),function(e,t){if(typeof define=="function"&&define.amd)define("backbone",["underscore","jquery","exports"],function(n,r,i){e.Backbone=t(e,i,n,r)});else if(typeof exports!="undefined"){var n=require("underscore");t(e,exports,n)}else e.Backbone=t(e,{},e._,e.jQuery||e.Zepto||e.ender||e.$)}(this,function(e,t,n,r){var i=e.Backbone,s=[],o=s.push,u=s.slice,a=s.splice;t.VERSION="1.1.2",t.$=r,t.noConflict=function(){return e.Backbone=i,this},t.emulateHTTP=!1,t.emulateJSON=!1;var f=t.Events={on:function(e,t,n){if(!c(this,"on",e,[t,n])||!t)return this;this._events||(this._events={});var r=this._events[e]||(this._events[e]=[]);return r.push({callback:t,context:n,ctx:n||this}),this},once:function(e,t,r){if(!c(this,"once",e,[t,r])||!t)return this;var i=this,s=n.once(function(){i.off(e,s),t.apply(this,arguments)});return s._callback=t,this.on(e,s,r)},off:function(e,t,r){var i,s,o,u,a,f,l,h;if(!this._events||!c(this,"off",e,[t,r]))return this;if(!e&&!t&&!r)return this._events=void 0,this;u=e?[e]:n.keys(this._events);for(a=0,f=u.length;a<f;a++){e=u[a];if(o=this._events[e]){this._events[e]=i=[];if(t||r)for(l=0,h=o.length;l<h;l++)s=o[l],(t&&t!==s.callback&&t!==s.callback._callback||r&&r!==s.context)&&i.push(s);i.length||delete this._events[e]}}return this},trigger:function(e){if(!this._events)return this;var t=u.call(arguments,1);if(!c(this,"trigger",e,t))return this;var n=this._events[e],r=this._events.all;return n&&h(n,t),r&&h(r,arguments),this},stopListening:function(e,t,r){var i=this._listeningTo;if(!i)return this;var s=!t&&!r;!r&&typeof t=="object"&&(r=this),e&&((i={})[e._listenId]=e);for(var o in i)e=i[o],e.off(t,r,this),(s||n.isEmpty(e._events))&&delete this._listeningTo[o];return this}},l=/\s+/,c=function(e,t,n,r){if(!n)return!0;if(typeof n=="object"){for(var i in n)e[t].apply(e,[i,n[i]].concat(r));return!1}if(l.test(n)){var s=n.split(l);for(var o=0,u=s.length;o<u;o++)e[t].apply(e,[s[o]].concat(r));return!1}return!0},h=function(e,t){var n,r=-1,i=e.length,s=t[0],o=t[1],u=t[2];switch(t.length){case 0:while(++r<i)(n=e[r]).callback.call(n.ctx);return;case 1:while(++r<i)(n=e[r]).callback.call(n.ctx,s);return;case 2:while(++r<i)(n=e[r]).callback.call(n.ctx,s,o);return;case 3:while(++r<i)(n=e[r]).callback.call(n.ctx,s,o,u);return;default:while(++r<i)(n=e[r]).callback.apply(n.ctx,t);return}},p={listenTo:"on",listenToOnce:"once"};n.each(p,function(e,t){f[t]=function(t,r,i){var s=this._listeningTo||(this._listeningTo={}),o=t._listenId||(t._listenId=n.uniqueId("l"));return s[o]=t,!i&&typeof r=="object"&&(i=this),t[e](r,i,this),this}}),f.bind=f.on,f.unbind=f.off,n.extend(t,f);var d=t.Model=function(e,t){var r=e||{};t||(t={}),this.cid=n.uniqueId("c"),this.attributes={},t.collection&&(this.collection=t.collection),t.parse&&(r=this.parse(r,t)||{}),r=n.defaults({},r,n.result(this,"defaults")),this.set(r,t),this.changed={},this.initialize.apply(this,arguments)};n.extend(d.prototype,f,{changed:null,validationError:null,idAttribute:"id",initialize:function(){},toJSON:function(e){return n.clone(this.attributes)},sync:function(){return t.sync.apply(this,arguments)},get:function(e){return this.attributes[e]},escape:function(e){return n.escape(this.get(e))},has:function(e){return this.get(e)!=null},set:function(e,t,r){var i,s,o,u,a,f,l,c;if(e==null)return this;typeof e=="object"?(s=e,r=t):(s={})[e]=t,r||(r={});if(!this._validate(s,r))return!1;o=r.unset,a=r.silent,u=[],f=this._changing,this._changing=!0,f||(this._previousAttributes=n.clone(this.attributes),this.changed={}),c=this.attributes,l=this._previousAttributes,this.idAttribute in s&&(this.id=s[this.idAttribute]);for(i in s)t=s[i],n.isEqual(c[i],t)||u.push(i),n.isEqual(l[i],t)?delete this.changed[i]:this.changed[i]=t,o?delete c[i]:c[i]=t;if(!a){u.length&&(this._pending=r);for(var h=0,p=u.length;h<p;h++)this.trigger("change:"+u[h],this,c[u[h]],r)}if(f)return this;if(!a)while(this._pending)r=this._pending,this._pending=!1,this.trigger("change",this,r);return this._pending=!1,this._changing=!1,this},unset:function(e,t){return this.set(e,void 0,n.extend({},t,{unset:!0}))},clear:function(e){var t={};for(var r in this.attributes)t[r]=void 0;return this.set(t,n.extend({},e,{unset:!0}))},hasChanged:function(e){return e==null?!n.isEmpty(this.changed):n.has(this.changed,e)},changedAttributes:function(e){if(!e)return this.hasChanged()?n.clone(this.changed):!1;var t,r=!1,i=this._changing?this._previousAttributes:this.attributes;for(var s in e){if(n.isEqual(i[s],t=e[s]))continue;(r||(r={}))[s]=t}return r},previous:function(e){return e==null||!this._previousAttributes?null:this._previousAttributes[e]},previousAttributes:function(){return n.clone(this._previousAttributes)},fetch:function(e){e=e?n.clone(e):{},e.parse===void 0&&(e.parse=!0);var t=this,r=e.success;return e.success=function(n){if(!t.set(t.parse(n,e),e))return!1;r&&r(t,n,e),t.trigger("sync",t,n,e)},I(this,e),this.sync("read",this,e)},save:function(e,t,r){var i,s,o,u=this.attributes;e==null||typeof e=="object"?(i=e,r=t):(i={})[e]=t,r=n.extend({validate:!0},r);if(i&&!r.wait){if(!this.set(i,r))return!1}else if(!this._validate(i,r))return!1;i&&r.wait&&(this.attributes=n.extend({},u,i)),r.parse===void 0&&(r.parse=!0);var a=this,f=r.success;return r.success=function(e){a.attributes=u;var t=a.parse(e,r);r.wait&&(t=n.extend(i||{},t));if(n.isObject(t)&&!a.set(t,r))return!1;f&&f(a,e,r),a.trigger("sync",a,e,r)},I(this,r),s=this.isNew()?"create":r.patch?"patch":"update",s==="patch"&&(r.attrs=i),o=this.sync(s,this,r),i&&r.wait&&(this.attributes=u),o},destroy:function(e){e=e?n.clone(e):{};var t=this,r=e.success,i=function(){t.trigger("destroy",t,t.collection,e)};e.success=function(n){(e.wait||t.isNew())&&i(),r&&r(t,n,e),t.isNew()||t.trigger("sync",t,n,e)};if(this.isNew())return e.success(),!1;I(this,e);var s=this.sync("delete",this,e);return e.wait||i(),s},url:function(){var e=n.result(this,"urlRoot")||n.result(this.collection,"url")||F();return this.isNew()?e:e.replace(/([^\/])$/,"$1/")+encodeURIComponent(this.id)},parse:function(e,t){return e},clone:function(){return new this.constructor(this.attributes)},isNew:function(){return!this.has(this.idAttribute)},isValid:function(e){return this._validate({},n.extend(e||{},{validate:!0}))},_validate:function(e,t){if(!t.validate||!this.validate)return!0;e=n.extend({},this.attributes,e);var r=this.validationError=this.validate(e,t)||null;return r?(this.trigger("invalid",this,r,n.extend(t,{validationError:r})),!1):!0}});var v=["keys","values","pairs","invert","pick","omit"];n.each(v,function(e){d.prototype[e]=function(){var t=u.call(arguments);return t.unshift(this.attributes),n[e].apply(n,t)}});var m=t.Collection=function(e,t){t||(t={}),t.model&&(this.model=t.model),t.comparator!==void 0&&(this.comparator=t.comparator),this._reset(),this.initialize.apply(this,arguments),e&&this.reset(e,n.extend({silent:!0},t))},g={add:!0,remove:!0,merge:!0},y={add:!0,remove:!1};n.extend(m.prototype,f,{model:d,initialize:function(){},toJSON:function(e){return this.map(function(t){return t.toJSON(e)})},sync:function(){return t.sync.apply(this,arguments)},add:function(e,t){return this.set(e,n.extend({merge:!1},t,y))},remove:function(e,t){var r=!n.isArray(e);e=r?[e]:n.clone(e),t||(t={});var i,s,o,u;for(i=0,s=e.length;i<s;i++){u=e[i]=this.get(e[i]);if(!u)continue;delete this._byId[u.id],delete this._byId[u.cid],o=this.indexOf(u),this.models.splice(o,1),this.length--,t.silent||(t.index=o,u.trigger("remove",u,this,t)),this._removeReference(u,t)}return r?e[0]:e},set:function(e,t){t=n.defaults({},t,g),t.parse&&(e=this.parse(e,t));var r=!n.isArray(e);e=r?e?[e]:[]:n.clone(e);var i,s,o,u,a,f,l,c=t.at,h=this.model,p=this.comparator&&c==null&&t.sort!==!1,v=n.isString(this.comparator)?this.comparator:null,m=[],y=[],b={},w=t.add,E=t.merge,S=t.remove,x=!p&&w&&S?[]:!1;for(i=0,s=e.length;i<s;i++){a=e[i]||{},a instanceof d?o=u=a:o=a[h.prototype.idAttribute||"id"];if(f=this.get(o))S&&(b[f.cid]=!0),E&&(a=a===u?u.attributes:a,t.parse&&(a=f.parse(a,t)),f.set(a,t),p&&!l&&f.hasChanged(v)&&(l=!0)),e[i]=f;else if(w){u=e[i]=this._prepareModel(a,t);if(!u)continue;m.push(u),this._addReference(u,t)}u=f||u,x&&(u.isNew()||!b[u.id])&&x.push(u),b[u.id]=!0}if(S){for(i=0,s=this.length;i<s;++i)b[(u=this.models[i]).cid]||y.push(u);y.length&&this.remove(y,t)}if(m.length||x&&x.length){p&&(l=!0),this.length+=m.length;if(c!=null)for(i=0,s=m.length;i<s;i++)this.models.splice(c+i,0,m[i]);else{x&&(this.models.length=0);var T=x||m;for(i=0,s=T.length;i<s;i++)this.models.push(T[i])}}l&&this.sort({silent:!0});if(!t.silent){for(i=0,s=m.length;i<s;i++)(u=m[i]).trigger("add",u,this,t);(l||x&&x.length)&&this.trigger("sort",this,t)}return r?e[0]:e},reset:function(e,t){t||(t={});for(var r=0,i=this.models.length;r<i;r++)this._removeReference(this.models[r],t);return t.previousModels=this.models,this._reset(),e=this.add(e,n.extend({silent:!0},t)),t.silent||this.trigger("reset",this,t),e},push:function(e,t){return this.add(e,n.extend({at:this.length},t))},pop:function(e){var t=this.at(this.length-1);return this.remove(t,e),t},unshift:function(e,t){return this.add(e,n.extend({at:0},t))},shift:function(e){var t=this.at(0);return this.remove(t,e),t},slice:function(){return u.apply(this.models,arguments)},get:function(e){return e==null?void 0:this._byId[e]||this._byId[e.id]||this._byId[e.cid]},at:function(e){return this.models[e]},where:function(e,t){return n.isEmpty(e)?t?void 0:[]:this[t?"find":"filter"](function(t){for(var n in e)if(e[n]!==t.get(n))return!1;return!0})},findWhere:function(e){return this.where(e,!0)},sort:function(e){if(!this.comparator)throw new Error("Cannot sort a set without a comparator");return e||(e={}),n.isString(this.comparator)||this.comparator.length===1?this.models=this.sortBy(this.comparator,this):this.models.sort(n.bind(this.comparator,this)),e.silent||this.trigger("sort",this,e),this},pluck:function(e){return n.invoke(this.models,"get",e)},fetch:function(e){e=e?n.clone(e):{},e.parse===void 0&&(e.parse=!0);var t=e.success,r=this;return e.success=function(n){var i=e.reset?"reset":"set";r[i](n,e),t&&t(r,n,e),r.trigger("sync",r,n,e)},I(this,e),this.sync("read",this,e)},create:function(e,t){t=t?n.clone(t):{};if(!(e=this._prepareModel(e,t)))return!1;t.wait||this.add(e,t);var r=this,i=t.success;return t.success=function(e,n){t.wait&&r.add(e,t),i&&i(e,n,t)},e.save(null,t),e},parse:function(e,t){return e},clone:function(){return new this.constructor(this.models)},_reset:function(){this.length=0,this.models=[],this._byId={}},_prepareModel:function(e,t){if(e instanceof d)return e;t=t?n.clone(t):{},t.collection=this;var r=new this.model(e,t);return r.validationError?(this.trigger("invalid",this,r.validationError,t),!1):r},_addReference:function(e,t){this._byId[e.cid]=e,e.id!=null&&(this._byId[e.id]=e),e.collection||(e.collection=this),e.on("all",this._onModelEvent,this)},_removeReference:function(e,t){this===e.collection&&delete e.collection,e.off("all",this._onModelEvent,this)},_onModelEvent:function(e,t,n,r){if((e==="add"||e==="remove")&&n!==this)return;e==="destroy"&&this.remove(t,r),t&&e==="change:"+t.idAttribute&&(delete this._byId[t.previous(t.idAttribute)],t.id!=null&&(this._byId[t.id]=t)),this.trigger.apply(this,arguments)}});var b=["forEach","each","map","collect","reduce","foldl","inject","reduceRight","foldr","find","detect","filter","select","reject","every","all","some","any","include","contains","invoke","max","min","toArray","size","first","head","take","initial","rest","tail","drop","last","without","difference","indexOf","shuffle","lastIndexOf","isEmpty","chain","sample"];n.each(b,function(e){m.prototype[e]=function(){var t=u.call(arguments);return t.unshift(this.models),n[e].apply(n,t)}});var w=["groupBy","countBy","sortBy","indexBy"];n.each(w,function(e){m.prototype[e]=function(t,r){var i=n.isFunction(t)?t:function(e){return e.get(t)};return n[e](this.models,i,r)}});var E=t.View=function(e){this.cid=n.uniqueId("view"),e||(e={}),n.extend(this,n.pick(e,x)),this._ensureElement(),this.initialize.apply(this,arguments),this.delegateEvents()},S=/^(\S+)\s*(.*)$/,x=["model","collection","el","id","attributes","className","tagName","events"];n.extend(E.prototype,f,{tagName:"div",$:function(e){return this.$el.find(e)},initialize:function(){},render:function(){return this},remove:function(){return this.$el.remove(),this.stopListening(),this},setElement:function(e,n){return this.$el&&this.undelegateEvents(),this.$el=e instanceof t.$?e:t.$(e),this.el=this.$el[0],n!==!1&&this.delegateEvents(),this},delegateEvents:function(e){if(!e&&!(e=n.result(this,"events")))return this;this.undelegateEvents();for(var t in e){var r=e[t];n.isFunction(r)||(r=this[e[t]]);if(!r)continue;var i=t.match(S),s=i[1],o=i[2];r=n.bind(r,this),s+=".delegateEvents"+this.cid,o===""?this.$el.on(s,r):this.$el.on(s,o,r)}return this},undelegateEvents:function(){return this.$el.off(".delegateEvents"+this.cid),this},_ensureElement:function(){if(!this.el){var e=n.extend({},n.result(this,"attributes"));this.id&&(e.id=n.result(this,"id")),this.className&&(e["class"]=n.result(this,"className"));var r=t.$("<"+n.result(this,"tagName")+">").attr(e);this.setElement(r,!1)}else this.setElement(n.result(this,"el"),!1)}}),t.sync=function(e,r,i){var s=N[e];n.defaults(i||(i={}),{emulateHTTP:t.emulateHTTP,emulateJSON:t.emulateJSON});var o={type:s,dataType:"json"};i.url||(o.url=n.result(r,"url")||F()),i.data==null&&r&&(e==="create"||e==="update"||e==="patch")&&(o.contentType="application/json",o.data=JSON.stringify(i.attrs||r.toJSON(i))),i.emulateJSON&&(o.contentType="application/x-www-form-urlencoded",o.data=o.data?{model:o.data}:{});if(i.emulateHTTP&&(s==="PUT"||s==="DELETE"||s==="PATCH")){o.type="POST",i.emulateJSON&&(o.data._method=s);var u=i.beforeSend;i.beforeSend=function(e){e.setRequestHeader("X-HTTP-Method-Override",s);if(u)return u.apply(this,arguments)}}o.type!=="GET"&&!i.emulateJSON&&(o.processData=!1),o.type==="PATCH"&&T&&(o.xhr=function(){return new ActiveXObject("Microsoft.XMLHTTP")});var a=i.xhr=t.ajax(n.extend(o,i));return r.trigger("request",r,a,i),a};var T=typeof window!="undefined"&&!!window.ActiveXObject&&(!window.XMLHttpRequest||!(new XMLHttpRequest).dispatchEvent),N={create:"POST",update:"PUT",patch:"PATCH","delete":"DELETE",read:"GET"};t.ajax=function(){return t.$.ajax.apply(t.$,arguments)};var C=t.Router=function(e){e||(e={}),e.routes&&(this.routes=e.routes),this._bindRoutes(),this.initialize.apply(this,arguments)},k=/\((.*?)\)/g,L=/(\(\?)?:\w+/g,A=/\*\w+/g,O=/[\-{}\[\]+?.,\\\^$|#\s]/g;n.extend(C.prototype,f,{initialize:function(){},route:function(e,r,i){n.isRegExp(e)||(e=this._routeToRegExp(e)),n.isFunction(r)&&(i=r,r=""),i||(i=this[r]);var s=this;return t.history.route(e,function(n){var o=s._extractParameters(e,n);s.execute(i,o),s.trigger.apply(s,["route:"+r].concat(o)),s.trigger("route",r,o),t.history.trigger("route",s,r,o)}),this},execute:function(e,t){e&&e.apply(this,t)},navigate:function(e,n){return t.history.navigate(e,n),this},_bindRoutes:function(){if(!this.routes)return;this.routes=n.result(this,"routes");var e,t=n.keys(this.routes);while((e=t.pop())!=null)this.route(e,this.routes[e])},_routeToRegExp:function(e){return e=e.replace(O,"\\$&").replace(k,"(?:$1)?").replace(L,function(e,t){return t?e:"([^/?]+)"}).replace(A,"([^?]*?)"),new RegExp("^"+e+"(?:\\?([\\s\\S]*))?$")},_extractParameters:function(e,t){var r=e.exec(t).slice(1);return n.map(r,function(e,t){return t===r.length-1?e||null:e?decodeURIComponent(e):null})}});var M=t.History=function(){this.handlers=[],n.bindAll(this,"checkUrl"),typeof window!="undefined"&&(this.location=window.location,this.history=window.history)},_=/^[#\/]|\s+$/g,D=/^\/+|\/+$/g,P=/msie [\w.]+/,H=/\/$/,B=/#.*$/;M.started=!1,n.extend(M.prototype,f,{interval:50,atRoot:function(){return this.location.pathname.replace(/[^\/]$/,"$&/")===this.root},getHash:function(e){var t=(e||this).location.href.match(/#(.*)$/);return t?t[1]:""},getFragment:function(e,t){if(e==null)if(this._hasPushState||!this._wantsHashChange||t){e=decodeURI(this.location.pathname+this.location.search);var n=this.root.replace(H,"");e.indexOf(n)||(e=e.slice(n.length))}else e=this.getHash();return e.replace(_,"")},start:function(e){if(M.started)throw new Error("Backbone.history has already been started");M.started=!0,this.options=n.extend({root:"/"},this.options,e),this.root=this.options.root,this._wantsHashChange=this.options.hashChange!==!1,this._wantsPushState=!!this.options.pushState,this._hasPushState=!!(this.options.pushState&&this.history&&this.history.pushState);var r=this.getFragment(),i=document.documentMode,s=P.exec(navigator.userAgent.toLowerCase())&&(!i||i<=7);this.root=("/"+this.root+"/").replace(D,"/");if(s&&this._wantsHashChange){var o=t.$('<iframe src="javascript:0" tabindex="-1">');this.iframe=o.hide().appendTo("body")[0].contentWindow,this.navigate(r)}this._hasPushState?t.$(window).on("popstate",this.checkUrl):this._wantsHashChange&&"onhashchange"in window&&!s?t.$(window).on("hashchange",this.checkUrl):this._wantsHashChange&&(this._checkUrlInterval=setInterval(this.checkUrl,this.interval)),this.fragment=r;var u=this.location;if(this._wantsHashChange&&this._wantsPushState){if(!this._hasPushState&&!this.atRoot())return this.fragment=this.getFragment(null,!0),this.location.replace(this.root+"#"+this.fragment),!0;this._hasPushState&&this.atRoot()&&u.hash&&(this.fragment=this.getHash().replace(_,""),this.history.replaceState({},document.title,this.root+this.fragment))}if(!this.options.silent)return this.loadUrl()},stop:function(){t.$(window).off("popstate",this.checkUrl).off("hashchange",this.checkUrl),this._checkUrlInterval&&clearInterval(this._checkUrlInterval),M.started=!1},route:function(e,t){this.handlers.unshift({route:e,callback:t})},checkUrl:function(e){var t=this.getFragment();t===this.fragment&&this.iframe&&(t=this.getFragment(this.getHash(this.iframe)));if(t===this.fragment)return!1;this.iframe&&this.navigate(t),this.loadUrl()},loadUrl:function(e){return e=this.fragment=this.getFragment(e),n.any(this.handlers,function(t){if(t.route.test(e))return t.callback(e),!0})},navigate:function(e,t){if(!M.started)return!1;if(!t||t===!0)t={trigger:!!t};var n=this.root+(e=this.getFragment(e||""));e=e.replace(B,"");if(this.fragment===e)return;this.fragment=e,e===""&&n!=="/"&&(n=n.slice(0,-1));if(this._hasPushState)this.history[t.replace?"replaceState":"pushState"]({},document.title,n);else{if(!this._wantsHashChange)return this.location.assign(n);this._updateHash(this.location,e,t.replace),this.iframe&&e!==this.getFragment(this.getHash(this.iframe))&&(t.replace||this.iframe.document.open().close(),this._updateHash(this.iframe.location,e,t.replace))}if(t.trigger)return this.loadUrl(e)},_updateHash:function(e,t,n){if(n){var r=e.href.replace(/(javascript:|#).*$/,"");e.replace(r+"#"+t)}else e.hash="#"+t}}),t.history=new M;var j=function(e,t){var r=this,i;e&&n.has(e,"constructor")?i=e.constructor:i=function(){return r.apply(this,arguments)},n.extend(i,r,t);var s=function(){this.constructor=i};return s.prototype=r.prototype,i.prototype=new s,e&&n.extend(i.prototype,e),i.__super__=r.prototype,i};d.extend=m.extend=C.extend=E.extend=M.extend=j;var F=function(){throw new Error('A "url" property or function must be specified')},I=function(e,t){var n=t.error;t.error=function(r){n&&n(e,r,t),e.trigger("error",e,r,t)}};return t}),function(e,t){typeof exports=="object"&&typeof require=="function"?module.exports=t(require("backbone"),require("underscore")):typeof define=="function"&&define.amd?define("backbone.browserStorage",["backbone","underscore"],function(n,r){return t(n||e.Backbone,r||e._)}):t(Backbone,_)}(this,function(e,t){function n(){return((1+Math.random())*65536|0).toString(16).substring(1)}function r(){return n()+n()+"-"+n()+"-"+n()+"-"+n()+"-"+n()+n()+n()}function i(e,t){var n=e.length;while(n--)if(e[n]===t)return!0;return!1}function s(e,t){for(var n in t)e[n]=t[n];return e}function o(e,n,r){var i;if(r==="local"&&!window.localStorage)throw"Backbone.browserStorage: Environment does not support localStorage.";if(r==="session"&&!window.sessionStorage)throw"Backbone.browserStorage: Environment does not support sessionStorage.";this.name=e,this.serializer=n||{serialize:function(e){return t.isObject(e)?JSON.stringify(e):e},deserialize:function(e){return e&&JSON.parse(e)}};if(r==="session")this.store=window.sessionStorage;else{if(r!=="local")throw"Backbone.browserStorage: No storage type was specified";this.store=window.localStorage}i=this.store.getItem(this.name),this.records=i&&i.split(",")||[]}e.BrowserStorage={local:function(e,t){return o.bind(this,e,t,"local")()},session:function(e,t){return o.bind(this,e,t,"session")()}};var u={save:function(){this.store.setItem(this.name,this.records.join(","))},create:function(e){return e.id||(e.id=r(),e.set(e.idAttribute,e.id)),this.store.setItem(this._itemName(e.id),this.serializer.serialize(e)),this.records.push(e.id.toString()),this.save(),this.find(e)!==!1},update:function(e){this.store.setItem(this._itemName(e.id),this.serializer.serialize(e));var t=e.id.toString();return i(this.records,t)||(this.records.push(t),this.save()),this.find(e)!==!1},find:function(e){return this.serializer.deserialize(this.store.getItem(this._itemName(e.id)))},findAll:function(){var e=[];for(var t=0,n,r;t<this.records.length;t++)n=this.records[t],r=this.serializer.deserialize(this.store.getItem(this._itemName(n))),r!==null&&e.push(r);return e},destroy:function(e){this.store.removeItem(this._itemName(e.id));var t=e.id.toString();for(var n=0,r;n<this.records.length;n++)this.records[n]===t&&this.records.splice(n,1);return this.save(),e},browserStorage:function(){return{session:sessionStorage,local:localStorage}},_clear:function(){var e=this.store,t=new RegExp("^"+this.name+"-");e.removeItem(this.name);for(var n in e)t.test(n)&&e.removeItem(n);this.records.length=0},_storageSize:function(){return this.store.length},_itemName:function(e){return this.name+"-"+e}};return s(e.BrowserStorage.session.prototype,u),s(e.BrowserStorage.local.prototype,u),e.BrowserStorage.sync=e.localSync=function(t,n,r){var i=n.browserStorage||n.collection.browserStorage,s,o,u=e.$?e.$.Deferred&&e.$.Deferred():e.Deferred&&e.Deferred();try{switch(t){case"read":s=n.id!==undefined?i.find(n):i.findAll();break;case"create":s=i.create(n);break;case"update":s=i.update(n);break;case"delete":s=i.destroy(n)}}catch(a){a.code===22&&i._storageSize()===0?o="Private browsing is unsupported":o=a.message}return s?(r&&r.success&&(e.VERSION==="0.9.10"?r.success(n,s,r):r.success(s)),u&&u.resolve(s)):(o=o?o:"Record Not Found",r&&r.error&&(e.VERSION==="0.9.10"?r.error(n,o,r):r.error(o)),u&&u.reject(o)),r&&r.complete&&r.complete(s),u&&u.promise()},e.ajaxSync=e.sync,e.getSyncMethod=function(t){return t.browserStorage||t.collection&&t.collection.browserStorage?e.localSync:e.ajaxSync},e.sync=function(t,n,r){return e.getSyncMethod(n).apply(this,[t,n,r])},e.BrowserStorage}),function(e,t){typeof define=="function"&&define.amd?define("backbone.overview",["underscore","backbone"],t):t(_||e._,Backbone||e.Backbone)}(this,function(e,t){"use strict";var n=t.Overview=function(n){this.views={},this.keys=e.partial(e.keys,this.views),this.getAll=e.partial(e.identity,this.views),this.get=function(e){return this.views[e]}.bind(this),this.add=function(e,t){return this.views[e]=t,t}.bind(this),this.remove=function(e){typeof e=="undefined"&&(new t.View).remove.apply(this);var n=this.views[e];if(n)return delete this.views[e],n.remove(),n}.bind(this),this.removeAll=function(){e.each(e.keys(this.views),this.remove)}.bind(this),t.View.apply(this,Array.prototype.slice.apply(arguments))},r=["forEach","each","map","collect","reduce","foldl","inject","reduceRight","foldr","find","detect","filter","select","reject","every","all","some","any","include","contains","invoke","max","min","toArray","size","first","head","take","initial","rest","tail","drop","last","without","difference","indexOf","shuffle","lastIndexOf","isEmpty","chain","sample"];return e.each(r,function(t){n.prototype[t]=function(){var n=Array.prototype.slice.call(arguments);return n.unshift(this.views),e[t].apply(e,n)}}),e.extend(n.prototype,t.View.prototype),n.extend=t.View.extend,t.Overview}),function(e,t){typeof define=="function"&&define.amd?define("typeahead",["jquery"],function(n){t(n,e)}):t(jQuery,e)}(this,function(e,t){var n=function(){"use strict";return{isMsie:function(){return/(msie|trident)/i.test(navigator.userAgent)?navigator.userAgent.match(/(msie |rv:)(\d+(.\d+)?)/i)[2]:!1},isBlankString:function(e){return!e||/^\s*$/.test(e)},escapeRegExChars:function(e){return e.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g,"\\$&")},isString:function(e){return typeof e=="string"},isNumber:function(e){return typeof e=="number"},isArray:e.isArray,isFunction:e.isFunction,isObject:e.isPlainObject,isUndefined:function(e){return typeof e=="undefined"},toStr:function(t){return n.isUndefined(t)||t===null?"":t+""},bind:e.proxy,each:function(t,n){function r(e,t){return n(t,e)}e.each(t,r)},map:e.map,filter:e.grep,every:function(t,n){var r=!0;return t?(e.each(t,function(e,i){if(!(r=n.call(null,i,e,t)))return!1}),!!r):r},some:function(t,n){var r=!1;return t?(e.each(t,function(e,i){if(r=n.call(null,i,e,t))return!1}),!!r):r},mixin:e.extend,getUniqueId:function(){var e=0;return function(){return e++}}(),templatify:function(n){function r(){return String(n)}return e.isFunction(n)?n:r},defer:function(e){setTimeout(e,0)},debounce:function(e,t,n){var r,i;return function(){var s=this,o=arguments,u,a;return u=function(){r=null,n||(i=e.apply(s,o))},a=n&&!r,clearTimeout(r),r=setTimeout(u,t),a&&(i=e.apply(s,o)),i}},throttle:function(e,t){var n,r,i,s,o,u;return o=0,u=function(){o=new Date,i=null,s=e.apply(n,r)},function(){var a=new Date,f=t-(a-o);return n=this,r=arguments,f<=0?(clearTimeout(i),i=null,o=a,s=e.apply(n,r)):i||(i=setTimeout(u,f)),s}},noop:function(){}}}(),r=function(){return{wrapper:'<span class="twitter-typeahead"></span>',dropdown:'<span class="tt-dropdown-menu"></span>',dataset:'<div class="tt-dataset-%CLASS%"></div>',suggestions:'<span class="tt-suggestions"></span>',suggestion:'<div class="tt-suggestion"></div>'}}(),i=function(){"use strict";var e={wrapper:{position:"relative",display:"inline-block"},hint:{position:"absolute",top:"0",left:"0",borderColor:"transparent",boxShadow:"none",opacity:"1"},input:{position:"relative",verticalAlign:"top",backgroundColor:"transparent"},inputWithNoHint:{position:"relative",verticalAlign:"top"},dropdown:{position:"absolute",top:"100%",left:"0",zIndex:"100",display:"none"},suggestions:{display:"block"},suggestion:{whiteSpace:"nowrap",cursor:"pointer"},suggestionChild:{whiteSpace:"normal"},ltr:{left:"0",right:"auto"},rtl:{left:"auto",right:" 0"}};return n.isMsie()&&n.mixin(e.input,{backgroundImage:"url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7)"}),n.isMsie()&&n.isMsie()<=7&&n.mixin(e.input,{marginTop:"-1px"}),e}(),s=function(){"use strict";function r(t){(!t||!t.el)&&e.error("EventBus initialized without el"),this.$el=e(t.el)}var t="typeahead:";return n.mixin(r.prototype,{trigger:function(e){var n=[].slice.call(arguments,1);this.$el.trigger(t+e,n)}}),r}(),o=function(){"use strict";function r(t,n,r,i){var s;if(!r)return this;n=n.split(e),r=i?l(r,i):r,this._callbacks=this._callbacks||{};while(s=n.shift())this._callbacks[s]=this._callbacks[s]||{sync:[],async:[]},this._callbacks[s][t].push(r);return this}function i(e,t,n){return r.call(this,"async",e,t,n)}function s(e,t,n){return r.call(this,"sync",e,t,n)}function o(t){var n;if(!this._callbacks)return this;t=t.split(e);while(n=t.shift())delete this._callbacks[n];return this}function u(t){var r,i,s,o,u;if(!this._callbacks)return this;t=t.split(e),s=[].slice.call(arguments,1);while((r=t.shift())&&(i=this._callbacks[r]))o=a(i.sync,this,[r].concat(s)),u=a(i.async,this,[r].concat(s)),o()&&n(u);return this}function a(e,t,n){function r(){var r;for(var i=0,s=e.length;!r&&i<s;i+=1)r=e[i].apply(t,n)===!1;return!r}return r}function f(){var e;return t.setImmediate?e=function(t){setImmediate(function(){t()})}:e=function(t){setTimeout(function(){t()},0)},e}function l(e,t){return e.bind?e.bind(t):function(){e.apply(t,[].slice.call(arguments,0))}}var e=/\s+/,n=f();return{onSync:s,onAsync:i,off:o,trigger:u}}(),u=function(e){"use strict";function r(e,t,r){var i=[],s;for(var o=0,u=e.length;o<u;o++)i.push(n.escapeRegExChars(e[o]));return s=r?"\\b("+i.join("|")+")\\b":"("+i.join("|")+")",t?new RegExp(s):new RegExp(s,"i")}var t={node:null,pattern:null,tagName:"strong",className:null,wordsOnly:!1,caseSensitive:!1};return function(s){function u(t){var n,r,i;if(n=o.exec(t.data))i=e.createElement(s.tagName),s.className&&(i.className=s.className),r=t.splitText(n.index),r.splitText(n[0].length),i.appendChild(r.cloneNode(!0)),t.parentNode.replaceChild(i,r);return!!n}function a(e,t){var n,r=3;for(var i=0;i<e.childNodes.length;i++)n=e.childNodes[i],n.nodeType===r?i+=t(n)?1:0:a(n,t)}var o;s=n.mixin({},t,s);if(!s.node||!s.pattern)return;s.pattern=n.isArray(s.pattern)?s.pattern:[s.pattern],o=r(s.pattern,s.caseSensitive,s.wordsOnly),a(s.node,u)}}(t.document),a=function(){"use strict";function r(r){var s=this,o,u,a,f;r=r||{},r.input||e.error("input is missing"),o=n.bind(this._onBlur,this),u=n.bind(this._onFocus,this),a=n.bind(this._onKeydown,this),f=n.bind(this._onInput,this),this.$hint=e(r.hint),this.$input=e(r.input).on("blur.tt",o).on("focus.tt",u).on("keydown.tt",a),this.$hint.length===0&&(this.setHint=this.getHint=this.clearHint=this.clearHintIfInvalid=n.noop),n.isMsie()?this.$input.on("keydown.tt keypress.tt cut.tt paste.tt",function(e){if(t[e.which||e.keyCode])return;n.defer(n.bind(s._onInput,s,e))}):this.$input.on("input.tt",f),this.query=this.$input.val(),this.$overflowHelper=i(this.$input)}function i(t){return e('<pre aria-hidden="true"></pre>').css({position:"absolute",visibility:"hidden",whiteSpace:"pre",fontFamily:t.css("font-family"),fontSize:t.css("font-size"),fontStyle:t.css("font-style"),fontVariant:t.css("font-variant"),fontWeight:t.css("font-weight"),wordSpacing:t.css("word-spacing"),letterSpacing:t.css("letter-spacing"),textIndent:t.css("text-indent"),textRendering:t.css("text-rendering"),textTransform:t.css("text-transform")}).insertAfter(t)}function s(e,t){return r.normalizeQuery(e)===r.normalizeQuery(t)}function u(e){return e.altKey||e.ctrlKey||e.metaKey||e.shiftKey}var t;return t={9:"tab",27:"esc",37:"left",39:"right",13:"enter",38:"up",40:"down"},r.normalizeQuery=function(e){return(e||"").replace(/^\s*/g,"").replace(/\s{2,}/g," ")},n.mixin(r.prototype,o,{_onBlur:function(){this.resetInputValue(),this.trigger("blurred")},_onFocus:function(){this.trigger("focused")},_onKeydown:function(n){var r=t[n.which||n.keyCode];this._managePreventDefault(r,n),r&&this._shouldTrigger(r,n)&&this.trigger(r+"Keyed",n)},_onInput:function(){this._checkInputValue()},_managePreventDefault:function(t,n){var r,i,s;switch(t){case"tab":i=this.getHint(),s=this.getInputValue(),r=i&&i!==s&&!u(n);break;case"up":case"down":r=!u(n);break;default:r=!1}r&&n.preventDefault()},_shouldTrigger:function(t,n){var r;switch(t){case"tab":r=!u(n);break;default:r=!0}return r},_checkInputValue:function(){var t,n,r;t=this.getInputValue(),n=s(t,this.query),r=n?this.query.length!==t.length:!1,this.query=t,n?r&&this.trigger("whitespaceChanged",this.query):this.trigger("queryChanged",this.query)},focus:function(){this.$input.focus()},blur:function(){this.$input.blur()},getQuery:function(){return this.query},setQuery:function(t){this.query=t},getInputValue:function(){return this.$input.val()},setInputValue:function(t,n){this.$input.val(t),n?this.clearHint():this._checkInputValue()},resetInputValue:function(){this.setInputValue(this.query,!0)},getHint:function(){return this.$hint.val()},setHint:function(t){this.$hint.val(t)},clearHint:function(){this.setHint("")},clearHintIfInvalid:function(){var t,n,r,i;t=this.getInputValue(),n=this.getHint(),r=t!==n&&n.indexOf(t)===0,i=t!==""&&r&&!this.hasOverflow(),!i&&this.clearHint()},getLanguageDirection:function(){return(this.$input.css("direction")||"ltr").toLowerCase()},hasOverflow:function(){var t=this.$input.width()-2;return this.$overflowHelper.text(this.getInputValue()),this.$overflowHelper.width()>=t},isCursorAtEnd:function(){var e,t,r;return e=this.$input.val().length,t=this.$input[0].selectionStart,n.isNumber(t)?t===e:document.selection?(r=document.selection.createRange(),r.moveStart("character",-e),e===r.text.length):!0},destroy:function(){this.$hint.off(".tt"),this.$input.off(".tt"),this.$hint=this.$input=this.$overflowHelper=null}}),r}(),f=function(){"use strict";function f(t){t=t||{},t.templates=t.templates||{},t.source||e.error("missing source"),t.name&&!h(t.name)&&e.error("invalid dataset name: "+t.name),this.query=null,this.highlight=!!t.highlight,this.name=t.name||n.getUniqueId(),this.source=t.source,this.displayFn=l(t.display||t.displayKey),this.templates=c(t.templates,this.displayFn),this.$el=e(r.dataset.replace("%CLASS%",this.name))}function l(e){function t(t){return t[e]}return e=e||"value",n.isFunction(e)?e:t}function c(e,t){function r(e){return"<p>"+t(e)+"</p>"}return{empty:e.empty&&n.templatify(e.empty),header:e.header&&n.templatify(e.header),footer:e.footer&&n.templatify(e.footer),suggestion:e.suggestion||r}}function h(e){return/^[_a-zA-Z0-9-]+$/.test(e)}var t="ttDataset",s="ttValue",a="ttDatum";return f.extractDatasetName=function(r){return e(r).data(t)},f.extractValue=function(n){return e(n).data(s)},f.extractDatum=function(n){return e(n).data(a)},n.mixin(f.prototype,o,{_render:function(f,l){function p(){return c.templates.empty({query:f,isEmpty:!0})}function d(){function p(n){var o;return o=e(r.suggestion).append(c.templates.suggestion(n)).data(t,c.name).data(s,c.displayFn(n)).data(a,n),o.children().each(function(){e(this).css(i.suggestionChild)}),o}var o,h;return o=e(r.suggestions).css(i.suggestions),h=n.map(l,p),o.append.apply(o,h),c.highlight&&u({className:"tt-highlight",node:o[0],pattern:f}),o}function v(){return c.templates.header({query:f,isEmpty:!h})}function m(){return c.templates.footer({query:f,isEmpty:!h})}if(!this.$el)return;var c=this,h;this.$el.empty(),h=l&&l.length,!h&&this.templates.empty?this.$el.html(p()).prepend(c.templates.header?v():null).append(c.templates.footer?m():null):h&&this.$el.html(d()).prepend(c.templates.header?v():null).append(c.templates.footer?m():null),this.trigger("rendered")},getRoot:function(){return this.$el},update:function(t){function r(e){!n.canceled&&t===n.query&&n._render(t,e)}var n=this;this.query=t,this.canceled=!1,this.source(t,r)},cancel:function(){this.canceled=!0},clear:function(){this.cancel(),this.$el.empty(),this.trigger("rendered")},isEmpty:function(){return this.$el.is(":empty")},destroy:function(){this.$el=null}}),f}(),l=function(){"use strict";function t(t){var i=this,s,o,u;t=t||{},t.menu||e.error("menu is required"),this.isOpen=!1,this.isEmpty=!0,this.datasets=n.map(t.datasets,r),s=n.bind(this._onSuggestionClick,this),o=n.bind(this._onSuggestionMouseEnter,this),u=n.bind(this._onSuggestionMouseLeave,this),this.$menu=e(t.menu).on("click.tt",".tt-suggestion",s).on("mouseenter.tt",".tt-suggestion",o).on("mouseleave.tt",".tt-suggestion",u),n.each(this.datasets,function(e){i.$menu.append(e.getRoot()),e.onSync("rendered",i._onRendered,i)})}function r(e){return new f(e)}return n.mixin(t.prototype,o,{_onSuggestionClick:function(n){this.trigger("suggestionClicked",e(n.currentTarget))},_onSuggestionMouseEnter:function(n){this._removeCursor(),this._setCursor(e(n.currentTarget),!0)},_onSuggestionMouseLeave:function(){this._removeCursor()},_onRendered:function(){function t(e){return e.isEmpty()}this.isEmpty=n.every(this.datasets,t),this.isEmpty?this._hide():this.isOpen&&this._show(),this.trigger("datasetRendered")},_hide:function(){this.$menu.hide()},_show:function(){this.$menu.css("display","block")},_getSuggestions:function(){return this.$menu.find(".tt-suggestion")},_getCursor:function(){return this.$menu.find(".tt-cursor").first()},_setCursor:function(t,n){t.first().addClass("tt-cursor"),!n&&this.trigger("cursorMoved")},_removeCursor:function(){this._getCursor().removeClass("tt-cursor")},_moveCursor:function(t){var n,r,i,s;if(!this.isOpen)return;r=this._getCursor(),n=this._getSuggestions(),this._removeCursor(),i=n.index(r)+t,i=(i+1)%(n.length+1)-1;if(i===-1){this.trigger("cursorRemoved");return}i<-1&&(i=n.length-1),this._setCursor(s=n.eq(i)),this._ensureVisible(s)},_ensureVisible:function(t){var n,r,i,s;n=t.position().top,r=n+t.outerHeight(!0),i=this.$menu.scrollTop(),s=this.$menu.height()+parseInt(this.$menu.css("paddingTop"),10)+parseInt(this.$menu.css("paddingBottom"),10),n<0?this.$menu.scrollTop(i+n):s<r&&this.$menu.scrollTop(i+(r-s))},close:function(){this.isOpen&&(this.isOpen=!1,this._removeCursor(),this._hide(),this.trigger("closed"))},open:function(){this.isOpen||(this.isOpen=!0,!this.isEmpty&&this._show(),this.trigger("opened"))},setLanguageDirection:function(t){this.$menu.css(t==="ltr"?i.ltr:i.rtl)},moveCursorUp:function(){this._moveCursor(-1)},moveCursorDown:function(){this._moveCursor(1)},getDatumForSuggestion:function(t){var n=null;return t.length&&(n={raw:f.extractDatum(t),value:f.extractValue(t),datasetName:f.extractDatasetName(t)}),n},getDatumForCursor:function(){return this.getDatumForSuggestion(this._getCursor().first())},getDatumForTopSuggestion:function(){return this.getDatumForSuggestion(this._getSuggestions().first())},update:function(t){function r(e){e.update(t)}n.each(this.datasets,r)},empty:function(){function t(e){e.clear()}n.each(this.datasets,t),this.isEmpty=!0},isVisible:function(){return this.isOpen&&!this.isEmpty},destroy:function(){function t(e){e.destroy()}this.$menu.off(".tt"),this.$menu=null,n.each(this.datasets,t)}}),t}(),c=function(){"use strict";function o(t){var r,i,o;t=t||{},t.input||e.error("missing input"),this.isActivated=!1,this.autoselect=!!t.autoselect,this.minLength=n.isNumber(t.minLength)?t.minLength:1,this.$node=u(t.input,t.withHint),r=this.$node.find(".tt-dropdown-menu"),i=this.$node.find(".tt-input"),o=this.$node.find(".tt-hint"),i.on("blur.tt",function(e){var t,s,o;t=document.activeElement,s=r.is(t),o=r.has(t).length>0,n.isMsie()&&(s||o)&&(e.preventDefault(),e.stopImmediatePropagation(),n.defer(function(){i.focus()}))}),r.on("mousedown.tt",function(e){e.preventDefault()}),this.eventBus=t.eventBus||new s({el:i}),this.dropdown=(new l({menu:r,datasets:t.datasets})).onSync("suggestionClicked",this._onSuggestionClicked,this).onSync("cursorMoved",this._onCursorMoved,this).onSync("cursorRemoved",this._onCursorRemoved,this).onSync("opened",this._onOpened,this).onSync("closed",this._onClosed,this).onAsync("datasetRendered",this._onDatasetRendered,this),this.input=(new a({input:i,hint:o})).onSync("focused",this._onFocused,this).onSync("blurred",this._onBlurred,this).onSync("enterKeyed",this._onEnterKeyed,this).onSync("tabKeyed",this._onTabKeyed,this).onSync("escKeyed",this._onEscKeyed,this).onSync("upKeyed",this._onUpKeyed,this).onSync("downKeyed",this._onDownKeyed,this).onSync("leftKeyed",this._onLeftKeyed,this).onSync("rightKeyed",this._onRightKeyed,this).onSync("queryChanged",this._onQueryChanged,this).onSync("whitespaceChanged",this._onWhitespaceChanged,this),this._setLanguageDirection()}function u(n,s){var o,u,a,l;o=e(n),u=e(r.wrapper).css(i.wrapper),a=e(r.dropdown).css(i.dropdown),l=o.clone().css(i.hint).css(f(o)),l.val("").removeData().addClass("tt-hint").removeAttr("id name placeholder required").prop("readonly",!0).attr({autocomplete:"off",spellcheck:"false",tabindex:-1}),o.data(t,{dir:o.attr("dir"),autocomplete:o.attr("autocomplete"),spellcheck:o.attr("spellcheck"),style:o.attr("style")}),o.addClass("tt-input").attr({autocomplete:"off",spellcheck:!1}).css(s?i.input:i.inputWithNoHint);try{!o.attr("dir")&&o.attr("dir","auto")}catch(c){}return o.wrap(u).parent().prepend(s?l:null).append(a)}function f(e){return{backgroundAttachment:e.css("background-attachment"),backgroundClip:e.css("background-clip"),backgroundColor:e.css("background-color"),backgroundImage:e.css("background-image"),backgroundOrigin:e.css("background-origin"),backgroundPosition:e.css("background-position"),backgroundRepeat:e.css("background-repeat"),backgroundSize:e.css("background-size")}}function c(e){var r=e.find(".tt-input");n.each(r.data(t),function(e,t){n.isUndefined(e)?r.removeAttr(t):r.attr(t,e)}),r.detach().removeData(t).removeClass("tt-input").insertAfter(e),e.remove()}var t="ttAttrs";return n.mixin(o.prototype,{_onSuggestionClicked:function(t,n){var r;(r=this.dropdown.getDatumForSuggestion(n))&&this._select(r)},_onCursorMoved:function(){var t=this.dropdown.getDatumForCursor();this.input.setInputValue(t.value,!0),this.eventBus.trigger("cursorchanged",t.raw,t.datasetName)},_onCursorRemoved:function(){this.input.resetInputValue(),this._updateHint()},_onDatasetRendered:function(){this._updateHint()},_onOpened:function(){this._updateHint(),this.eventBus.trigger("opened")},_onClosed:function(){this.input.clearHint(),this.eventBus.trigger("closed")},_onFocused:function(){this.isActivated=!0,this.dropdown.open()},_onBlurred:function(){this.isActivated=!1,this.dropdown.empty(),this.dropdown.close()},_onEnterKeyed:function(t,n){var r,i;r=this.dropdown.getDatumForCursor(),i=this.dropdown.getDatumForTopSuggestion(),r?(this._select(r),n.preventDefault()):this.autoselect&&i&&(this._select(i),n.preventDefault())},_onTabKeyed:function(t,n){var r;(r=this.dropdown.getDatumForCursor())?(this._select(r),n.preventDefault()):this._autocomplete(!0)},_onEscKeyed:function(){this.dropdown.close(),this.input.resetInputValue()},_onUpKeyed:function(){var t=this.input.getQuery();this.dropdown.isEmpty&&t.length>=this.minLength?this.dropdown.update(t):this.dropdown.moveCursorUp(),this.dropdown.open()},_onDownKeyed:function(){var t=this.input.getQuery();this.dropdown.isEmpty&&t.length>=this.minLength?this.dropdown.update(t):this.dropdown.moveCursorDown(),this.dropdown.open()},_onLeftKeyed:function(){this.dir==="rtl"&&this._autocomplete()},_onRightKeyed:function(){this.dir==="ltr"&&this._autocomplete()},_onQueryChanged:function(t,n){this.input.clearHintIfInvalid(),n.length>=this.minLength?this.dropdown.update(n):this.dropdown.empty(),this.dropdown.open(),this._setLanguageDirection()},_onWhitespaceChanged:function(){this._updateHint(),this.dropdown.open()},_setLanguageDirection:function(){var t;this.dir!==(t=this.input.getLanguageDirection())&&(this.dir=t,this.$node.css("direction",t),this.dropdown.setLanguageDirection(t))},_updateHint:function(){var t,r,i,s,o,u;t=this.dropdown.getDatumForTopSuggestion(),t&&this.dropdown.isVisible()&&!this.input.hasOverflow()?(r=this.input.getInputValue(),i=a.normalizeQuery(r),s=n.escapeRegExChars(i),o=new RegExp("^(?:"+s+")(.+$)","i"),u=o.exec(t.value),u?this.input.setHint(r+u[1]):this.input.clearHint()):this.input.clearHint()},_autocomplete:function(t){var n,r,i,s;n=this.input.getHint(),r=this.input.getQuery(),i=t||this.input.isCursorAtEnd(),n&&r!==n&&i&&(s=this.dropdown.getDatumForTopSuggestion(),s&&this.input.setInputValue(s.value),this.eventBus.trigger("autocompleted",s.raw,s.datasetName))},_select:function(t){this.input.setQuery(t.value),this.input.setInputValue(t.value,!0),this._setLanguageDirection(),this.eventBus.trigger("selected",t.raw,t.datasetName),this.dropdown.close(),n.defer(n.bind(this.dropdown.empty,this.dropdown))},open:function(){this.dropdown.open()},close:function(){this.dropdown.close()},setVal:function(t){t=n.toStr(t),this.isActivated?this.input.setInputValue(t):(this.input.setQuery(t),this.input.setInputValue(t,!0)),this._setLanguageDirection()},getVal:function(){return this.input.getQuery()},destroy:function(){this.input.destroy(),this.dropdown.destroy(),c(this.$node),this.$node=null}}),o}();return function(){"use strict";var t,r,i;t=e.fn.typeahead,r="ttTypeahead",i={initialize:function(i,o){function u(){var t=e(this),u,a;n.each(o,function(e){e.highlight=!!i.highlight}),a=new c({input:t,eventBus:u=new s({el:t}),withHint:n.isUndefined(i.hint)?!0:!!i.hint,minLength:i.minLength,autoselect:i.autoselect,datasets:o}),t.data(r,a)}return o=n.isArray(o)?o:[].slice.call(arguments,1),i=i||{},this.each(u)},open:function(){function n(){var t=e(this),n;(n=t.data(r))&&n.open()}return this.each(n)},close:function(){function n(){var t=e(this),n;(n=t.data(r))&&n.close()}return this.each(n)},val:function(n){function i(){var t=e(this),i;(i=t.data(r))&&i.setVal(n)}function s(e){var t,n;if(t=e.data(r))n=t.getVal();return n}return arguments.length?this.each(i):s(this.first())},destroy:function(){function n(){var t=e(this),n;if(n=t.data(r))n.destroy(),t.removeData(r)}return this.each(n)}},e.fn.typeahead=function(t){var n;return i[t]&&t!=="initialize"?(n=this.filter(function(){return!!e(this).data(r)}),i[t].apply(n,[].slice.call(arguments,1))):i.initialize.apply(this,arguments)},e.fn.typeahead.noConflict=function(){return e.fn.typeahead=t,this}}(),{}}),define("converse-dependencies",["jquery","underscore","polyfill","utils","otr","moment_with_locales","strophe","strophe.disco","strophe.ping","strophe.rsm","strophe.vcard","backbone.browserStorage","backbone.overview","jquery.browser","typeahead"],function(e,t,n,r,i,s,o){return t.extend({underscore:t,jQuery:e,otr:i,moment:s,utils:r},o)}),function(e,t){typeof define=="function"&&define.amd?define("converse",["converse-dependencies","converse-templates"],function(e,n){return t(n,e.jQuery,e.$iq,e.$msg,e.$pres,e.$build,e.otr?e.otr.DSA:undefined,e.otr?e.otr.OTR:undefined,e.Strophe,e.underscore,e.moment,e.utils,e.SHA1.b64_sha1)}):e.converse=t(templates,jQuery,$iq,$msg,$pres,$build,DSA,OTR,Strophe,_,moment,utils,b64_sha1)}(this,function(e,t,n,r,i,s,o,u,a,f,l,c,h){f.templateSettings={evaluate:/\{\[([\s\S]+?)\]\}/g,interpolate:/\{\{([\s\S]+?)\}\}/g};var p=function(e,t){return function(n){if(typeof e=="object"){var r=!1;return f.each(e,function(e){r=r||n.get(e).toLowerCase().indexOf(t.toLowerCase())!==-1}),r}if(typeof e=="string")return n.get(e).toLowerCase().indexOf(t.toLowerCase())!==-1;throw new TypeError("contains: wrong attribute type. Must be string or array.")}};p.not=function(e,t){return function(n){return!p(e,t)(n)}};var d={plugins:{},templates:e,emit:function(e,n){t(this).trigger(e,n)},once:function(e,n){t(this).one(e,n)},on:function(e,n){t(this).bind(e,n)},off:function(e,n){t(this).unbind(e,n)},refreshWebkit:function(){if(t.browser.webkit){var e=document.getElementById("conversejs");e.style.display="none",e.offsetHeight=e.offsetHeight,e.style.display="block"}}},v=["max","first","last","after","before","index","count"],m=["with","start","end"],g={offline:6,unavailable:5,xa:4,away:3,dnd:2,chat:1,online:1};d.initialize=function(d,v){"use strict";var m=this,y;"onpagehide"in window?y="pagehide":"onbeforeunload"in window?y="beforeunload":"onunload"in window&&(y="unload"),a.log=function(e,t){m.log(e+" "+t,e)},a.error=function(e){m.log(e,"error")},a.addNamespace("CARBONS","urn:xmpp:carbons:2"),a.addNamespace("CHATSTATES","http://jabber.org/protocol/chatstates"),a.addNamespace("CSI","urn:xmpp:csi:0"),a.addNamespace("MAM","urn:xmpp:mam:0"),a.addNamespace("MUC_ADMIN",a.NS.MUC+"#admin"),a.addNamespace("MUC_OWNER",a.NS.MUC+"#owner"),a.addNamespace("MUC_REGISTER","jabber:iq:register"),a.addNamespace("MUC_ROOMCONF",a.NS.MUC+"#roomconfig"),a.addNamespace("MUC_USER",a.NS.MUC+"#user"),a.addNamespace("REGISTER","jabber:iq:register"),a.addNamespace("ROSTERX","http://jabber.org/protocol/rosterx"),a.addNamespace("RSM","http://jabber.org/protocol/rsm"),a.addNamespace("XFORM","jabber:x:data");var w=0;Object.keys(a.Status).forEach(function(e){w=Math.max(w,a.Status[e])}),a.Status.REGIFAIL=w+1,a.Status.REGISTERED=w+2,a.Status.CONFLICT=w+3,a.Status.NOTACCEPTABLE=w+5;var E="login",S="anonymous",x="prebind",T=0,N=1,C=2,k=3,L={ENTER:13,FORWARD_SLASH:47},A={0:"ERROR",1:"CONNECTING",2:"CONNFAIL",3:"AUTHENTICATING",4:"AUTHFAIL",5:"CONNECTED",6:"DISCONNECTED",7:"DISCONNECTING",8:"ATTACHED",9:"REDIRECT"},O="inactive",M="active",D="composing",P="paused",H="gone";this.TIMEOUTS={PAUSED:2e4,INACTIVE:9e4};var B=typeof crypto!="undefined"&&(typeof crypto.randomBytes=="function"||typeof crypto.getRandomValues=="function"),j=B&&typeof CryptoJS!="undefined"&&typeof u!="undefined"&&typeof o!="undefined",F="opened",I="closed";this.isConverseLocale=function(e){return typeof locales[e]!="undefined"},this.isMomentLocale=function(e){return l.locale()!==l.locale(e)},this.isLocaleAvailable=function(e,t){if(t(e))return e;var n=e.split("-")[0];if(n!==e&&t(n))return n},this.detectLocale=function(e){var t,n;window.navigator.userLanguage&&(t=this.isLocaleAvailable(window.navigator.userLanguage,e));if(window.navigator.languages&&!t)for(n=0;n<window.navigator.languages.length&&!t;n++)t=this.isLocaleAvailable(window.navigator.languages[n],e);return window.navigator.browserLanguage&&!t&&(t=this.isLocaleAvailable(window.navigator.browserLanguage,e)),window.navigator.language&&!t&&(t=this.isLocaleAvailable(window.navigator.language,e)),window.navigator.systemLanguage&&!t&&(t=this.isLocaleAvailable(window.navigator.systemLanguage,e)),t||"en"},l.locale||(l.locale=l.lang),l.locale(this.detectLocale(this.isMomentLocale)),this.i18n=d.i18n?d.i18n:locales[this.detectLocale(this.isConverseLocale)];var q=c.__.bind(this),R=c.___;this.default_settings={allow_chat_pending_contacts:!1,allow_contact_removal:!0,allow_contact_requests:!0,allow_dragresize:!0,allow_logout:!0,allow_muc:!0,allow_otr:!0,archived_messages_page_size:"20",auto_away:0,auto_xa:0,allow_registration:!0,animate:!0,auto_list_rooms:!1,auto_login:!1,auto_reconnect:!1,auto_subscribe:!1,bosh_service_url:undefined,cache_otr_key:!1,csi_waiting_time:0,debug:!1,domain_placeholder:q(" e.g. conversejs.org"),expose_rid_and_sid:!1,forward_messages:!1,hide_muc_server:!1,hide_offline_users:!1,jid:undefined,keepalive:!1,message_archiving:"never",message_carbons:!1,muc_history_max_stanzas:undefined,no_trimming:!1,ping_interval:180,play_sounds:!1,sounds_path:"/sounds/",password:undefined,authentication:"login",prebind:!1,prebind_url:null,providers_link:"https://xmpp.net/directory.php",rid:undefined,roster_groups:!1,show_controlbox_by_default:!1,show_only_online_users:!1,show_toolbar:!0,sid:undefined,storage:"session",use_otr_by_default:!1,use_vcards:!0,visible_toolbar_buttons:{emoticons:!0,call:!1,clear:!0,toggle_occupants:!0},websocket_url:undefined,xhr_custom_status:!1,xhr_custom_status_url:"",xhr_user_search:!1,xhr_user_search_url:""},f.extend(this,this.default_settings),f.extend(this,f.pick(d,Object.keys(this.default_settings))),this.prebind===!0&&(this.authentication=x);if(this.authentication===S&&!this.jid)throw"Config Error: you need to provide the server's domain via the 'jid' option when using anonymous authentication.";d.visible_toolbar_buttons&&f.extend(this.visible_toolbar_buttons,f.pick(d.visible_toolbar_buttons,["emoticons","call","clear","toggle_occupants"])),t.fx.off=!this.animate,this.allow_otr=this.allow_otr&&j,this.use_otr_by_default=this.use_otr_by_default&&this.allow_otr;var U={};U[T]="unencrypted",U[N]="unverified",U[C]="verified",U[k]="finished";var z={};z[T]=q("unencrypted"),z[N]=q("unverified"),z[C]=q("verified"),z[k]=q("finished");var W={dnd:q("This contact is busy"),online:q("This contact is online"),offline:q("This contact is offline"),unavailable:q("This contact is unavailable"),xa:q("This contact is away for an extended period"),away:q("This contact is away")},X=q("Click to hide these contacts"),V=q("My contacts"),J=q("Pending contacts"),K=q("Contact requests"),Q=q("Ungrouped"),G=q("Contacts"),Y=q("Groups"),Z={};Z[V]=0,Z[Q]=1,Z[K]=2,Z[J]=3,this.callback=v||function(){},this.initial_presence_sent=0,this.msg_counter=0,this.sendCSI=function(e){if(m.features[a.NS.CSI]||!0)m.connection.send(s(e,{xmlns:a.NS.CSI})),this.inactive=e===O?!0:!1},this.onUserActivity=function(){this.idle_seconds>0&&(this.idle_seconds=0);if(!m.connection.authenticated)return;this.inactive&&this.sendCSI(M),this.auto_changed_status===!0&&(this.auto_changed_status=!1,this.xmppstatus.setStatus("online"))},this.onEverySecond=function(){if(!m.connection.authenticated)return;var e=this.xmppstatus.getStatus();this.idle_seconds++,this.csi_waiting_time>0&&this.idle_seconds>this.csi_waiting_time&&!this.inactive&&this.sendCSI(O),this.auto_away>0&&this.idle_seconds>this.auto_away&&e!=="away"&&e!=="xa"?(this.auto_changed_status=!0,this.xmppstatus.setStatus("away")):this.auto_xa>0&&this.idle_seconds>this.auto_xa&&e!=="xa"&&(this.auto_changed_status=!0,this.xmppstatus.setStatus("xa"))},this.registerIntervalHandler=function(){if(this.auto_away<1&&this.auto_xa<1&&this.csi_waiting_time<1)return;this.idle_seconds=0,this.auto_changed_status=!1,t(window).on("click mousemove keypress focus"+y,this.onUserActivity.bind(this)),window.setInterval(this.onEverySecond.bind(this),1e3)},this.playNotification=function(){var e;m.play_sounds&&typeof Audio!="undefined"&&(e=new Audio(m.sounds_path+"msg_received.ogg"),e.canPlayType("/audio/ogg")?e.play():(e=new Audio(m.sounds_path+"msg_received.mp3"),e.play()))},this.giveFeedback=function(e,n){t(".conn-feedback").each(function(r,i){var s=t(i);s.addClass("conn-feedback").text(e),n?s.addClass(n):s.removeClass("error")})},this.log=function(e,t){var n;typeof console=="undefined"||typeof console.log=="undefined"?n={log:function(){},error:function(){}}:n=console,this.debug&&(t==="error"?n.log("ERROR: "+e):n.log(e))},this.rejectPresenceSubscription=function(e,t){var n=i({to:e,type:"unsubscribed"});t&&t!==""&&n.c("status").t(t),m.connection.send(n)},this.getVCard=function(e,n,r){if(!this.use_vcards){n&&n(e,e);return}m.connection.vcard.get(function(r){var i=t(r).find("vCard"),s=i.find("FN").text(),o=i.find("BINVAL").text(),u=i.find("TYPE").text(),a=i.find("URL").text();if(e){var c=m.roster.get(e);c&&(s=f.isEmpty(s)?c.get("fullname")||e:s,c.save({fullname:s,image_type:u,image:o,url:a,vcard_updated:l().format()}))}n&&n(r,e,s,o,u,a)}.bind(this),e,function(t){var n=m.roster.get(e);n&&n.save({vcard_updated:l().format()}),r&&r(t,e)})},this.reconnect=function(e){m.log("Attempting to reconnect in 5 seconds"),m.giveFeedback(q("Attempting to reconnect in 5 seconds"),"error"),setTimeout(function(){m.authentication!=="prebind"?this.connection.connect(this.connection.jid,this.connection.pass,function(e,t){this.onConnectStatusChanged(e,t,!0)}.bind(this),this.connection.wait,this.connection.hold,this.connection.route):m.prebind_url&&(this.clearSession(),this._tearDown(),this.startNewBOSHSession())}.bind(this),5e3)},this.renderLoginPanel=function(){m._tearDown();var e=m.chatboxviews.get("controlbox");e.model.set({connected:!1}),e.renderLoginPanel()},this.onConnectStatusChanged=function(e,t,n){m.log("Status changed to: "+A[e]),e===a.Status.CONNECTED||e===a.Status.ATTACHED?(delete m.disconnection_cause,typeof n!="undefined"&&n?(m.log(e===a.Status.CONNECTED?"Reconnected":"Reattached"),m.onReconnected()):(m.log(e===a.Status.CONNECTED?"Connected":"Attached"),m.onConnected())):e===a.Status.DISCONNECTED?m.disconnection_cause===a.Status.CONNFAIL&&m.auto_reconnect?m.reconnect(t):m.renderLoginPanel():e===a.Status.ERROR?m.giveFeedback(q("Error"),"error"):e===a.Status.CONNECTING?m.giveFeedback(q("Connecting")):e===a.Status.AUTHENTICATING?m.giveFeedback(q("Authenticating")):e===a.Status.AUTHFAIL?(m.giveFeedback(q("Authentication Failed"),"error"),m.connection.disconnect(q("Authentication Failed")),m.disconnection_cause=a.Status.AUTHFAIL):e===a.Status.CONNFAIL?m.disconnection_cause=a.Status.CONNFAIL:e===a.Status.DISCONNECTING&&(m.connection.connected||m.renderLoginPanel(),t&&m.giveFeedback(t,"error"))},this.applyDragResistance=function(e,t){if(typeof e=="undefined")return undefined;if(typeof t=="undefined")return e;var n=10;return e!==t&&Math.abs(e-t)<n?t:e},this.updateMsgCounter=function(){this.msg_counter>0?(document.title.search(/^Messages \(\d+\) /)===-1?document.title="Messages ("+this.msg_counter+") "+document.title:document.title=document.title.replace(/^Messages \(\d+\) /,"Messages ("+this.msg_counter+") "),window.blur(),window.focus()):document.title.search(/^Messages \(\d+\) /)!==-1&&(document.title=document.title.replace(/^Messages \(\d+\) /,""))},this.incrementMsgCounter=function(){this.msg_counter+=1,this.updateMsgCounter()},this.clearMsgCounter=function(){this.msg_counter=0,this.updateMsgCounter()},this.initStatus=function(e){this.xmppstatus=new this.XMPPStatus;var t=h("converse.xmppstatus-"+m.bare_jid);this.xmppstatus.id=t,this.xmppstatus.browserStorage=new Backbone.BrowserStorage[m.storage](t),this.xmppstatus.fetch({success:e,error:e})},this.initSession=function(){this.session=new this.Session;var e=h("converse.bosh-session");this.session.id=e,this.session.browserStorage=new Backbone.BrowserStorage[m.storage](e),this.session.fetch()},this.clearSession=function(){this.roster&&this.roster.browserStorage._clear(),this.session.browserStorage._clear(),m.connection.connected&&m.chatboxes.get("controlbox").save({connected:!1})},this.logOut=function(){m.chatboxviews.closeAllChatBoxes(!1),m.clearSession(),m.connection.disconnect()},this.registerGlobalEventHandlers=function(){t(document).click(function(){t(".toggle-otr ul").is(":visible")&&t(".toggle-otr ul",this).slideUp(),t(".toggle-smiley ul").is(":visible")&&t(".toggle-smiley ul",this).slideUp()}),t(document).on("mousemove",function(e){if(!this.resizing||!this.allow_dragresize)return!0;e.preventDefault(),this.resizing.chatbox.resizeChatBox(e)}.bind(this)),t(document).on("mouseup",function(e){if(!this.resizing||!this.allow_dragresize)return!0;e.preventDefault();var t=this.applyDragResistance(this.resizing.chatbox.height,this.resizing.chatbox.model.get("default_height")),n=this.applyDragResistance(this.resizing.chatbox.width,this.resizing.chatbox.model.get("default_width"));this.connection.connected?(this.resizing.chatbox.model.save({height:t}),this.resizing.chatbox.model.save({width:n})):(this.resizing.chatbox.model.set({height:t}),this.resizing.chatbox.model.set({width:n})),this.resizing=null}.bind(this)),t(window).on("blur focus",function(e){this.windowState!==e.type&&e.type==="focus"&&m.clearMsgCounter(),this.windowState=e.type}.bind(this)),t(window).on("resize",f.debounce(function(e){this.chatboxviews.trimChats()}.bind(this),200))},this.ping=function(e,t,n,r){m.lastStanzaDate=new Date;if(typeof e=="undefined"||e===null)e=a.getDomainFromJid(m.bare_jid);return typeof r=="undefined"&&(r=null),typeof t=="undefined"&&(t=null),typeof n=="undefined"&&(n=null),m.connection?(m.connection.ping.ping(e,t,n,r),!0):!1},this.pong=function(e){return m.lastStanzaDate=new Date,m.connection.ping.pong(e),!0},this.registerPongHandler=function(){m.connection.disco.addFeature(a.NS.PING),m.connection.ping.addPingHandler(this.pong)},this.registerPingHandler=function(){this.registerPongHandler(),this.ping_interval>0&&(this.connection.addHandler(function(){return this.lastStanzaDate=new Date,!0}.bind(m)),this.connection.addTimedHandler(1e3,function(){var e=new Date;return this.lastStanzaDate||(this.lastStanzaDate=e),(e-this.lastStanzaDate)/1e3>this.ping_interval?this.ping():!0}.bind(m)))},this.onReconnected=function(){this.initStatus(function(){this.registerPingHandler(),this.rosterview.registerRosterXHandler(),this.rosterview.registerPresenceHandler(),this.chatboxes.registerMessageHandler(),this.xmppstatus.sendPresence(),this.giveFeedback(q("Contacts"))}.bind(this))},this.enableCarbons=function(){if(!this.message_carbons||this.session.get("carbons_enabled"))return;var e=(new a.Builder("iq",{from:this.connection.jid,id:"enablecarbons",type:"set"})).c("enable",{xmlns:a.NS.CARBONS});this.connection.addHandler(function(e){t(e).find("error").length>0?m.log("ERROR: An error occured while trying to enable message carbons."):(this.session.save({carbons_enabled:!0}),m.log("Message carbons have been enabled."))}.bind(this),null,"iq",null,"enablecarbons"),this.connection.send(e)},this.onConnected=function(){this.chatboxviews.closeAllChatBoxes(),this.jid=this.connection.jid,this.bare_jid=a.getBareJidFromJid(this.connection.jid),this.resource=a.getResourceFromJid(this.connection.jid),this.domain=a.getDomainFromJid(this.connection.jid),this.minimized_chats=new m.MinimizedChats({model:this.chatboxes}),this.features=new this.Features,this.enableCarbons(),this.initStatus(function(){this.registerPingHandler(),this.registerIntervalHandler(),this.chatboxes.onConnected(),this.giveFeedback(q("Contacts")),this.callback&&(this.connection.service==="jasmine tests"?this.callback(this):this.callback())}.bind(this)),m.emit("ready")},this.OTR=Backbone.Model.extend({getSessionPassphrase:function(){if(m.authentication==="prebind"){var e=h(m.connection.jid),t=window.sessionStorage[e];return typeof t=="undefined"&&(t=Math.floor(Math.random()*4294967295).toString(),window.sessionStorage[e]=t),t}return m.connection.pass},generatePrivateKey:function(e){var t=new o,n=m.connection.jid;if(m.cache_otr_key){var r=CryptoJS.lib.PasswordBasedCipher,i=this.getSessionPassphrase();typeof i!="undefined"&&(window.sessionStorage[h(n+"priv_key")]=r.encrypt(CryptoJS.algo.AES,t.packPrivate(),i).toString(),window.sessionStorage[h(n+"instance_tag")]=e,window.sessionStorage[h(n+"pass_check")]=r.encrypt(CryptoJS.algo.AES,"match",i).toString())}return t}}),this.Message=Backbone.Model.extend({idAttribute:"msgid",defaults:function(){return{msgid:m.connection.getUniqueId()}}}),this.Messages=Backbone.Collection.extend({model:m.Message,comparator:"time"}),this.ChatBox=Backbone.Model.extend({initialize:function(){var e=this.get("height"),t=this.get("width"),n={height:m.applyDragResistance(e,this.get("default_height")),width:m.applyDragResistance(t,this.get("default_width")),num_unread:this.get("num_unread")||0};this.get("box_id")!=="controlbox"?(this.messages=new m.Messages,this.messages.browserStorage=new Backbone.BrowserStorage[m.storage](h("converse.messages"+this.get("jid")+m.bare_jid)),this.save(f.extend(n,{chat_state:undefined,box_id:h(this.get("jid")),minimized:this.get("minimized")||!1,otr_status:this.get("otr_status")||T,time_minimized:this.get("time_minimized")||l(),time_opened:this.get("time_opened")||l().valueOf(),url:"",user_id:a.getNodeFromJid(this.get("jid"))}))):this.set(f.extend(n,{time_opened:l(0).valueOf()}))},maximize:function(){this.save({minimized:!1,time_opened:l().valueOf()})},minimize:function(){this.save({minimized:!0,time_minimized:l().format()})},getSession:function(e){var t=CryptoJS.lib.PasswordBasedCipher,n,r,i,s;if(m.cache_otr_key){n=m.otr.getSessionPassphrase();if(typeof n!="undefined"){r=window.sessionStorage[h(this.id+"instance_tag")],i=window.sessionStorage[h(this.id+"priv_key")],s=window.sessionStorage[h(this.connection.jid+"pass_check")];if(i&&r&&typeof s!="undefined"){var a=t.decrypt(CryptoJS.algo.AES,i,n),f=o.parsePrivate(a.toString(CryptoJS.enc.Latin1));if(t.decrypt(CryptoJS.algo.AES,s,n).toString(CryptoJS.enc.Latin1)==="match"){this.trigger("showHelpMessages",[q("Re-establishing encrypted session")]),e({key:f,instance_tag:r});return}}}}this.trigger("showHelpMessages",[q("Generating private key."),q("Your browser might become unresponsive.")],null,!0),setTimeout(function(){var t=u.makeInstanceTag();e({key:m.otr.generatePrivateKey.call(this,t),instance_tag:t})},500)},updateOTRStatus:function(e){switch(e){case u.CONST.STATUS_AKE_SUCCESS:this.otr.msgstate===u.CONST.MSGSTATE_ENCRYPTED&&this.save({otr_status:N});break;case u.CONST.STATUS_END_OTR:this.otr.msgstate===u.CONST.MSGSTATE_FINISHED?this.save({otr_status:k}):this.otr.msgstate===u.CONST.MSGSTATE_PLAINTEXT&&this.save({otr_status:T})}},onSMP:function(e,t){switch(e){case"question":this.otr.smpSecret(prompt(q("Authentication request from %1$s\n\nYour chat contact is attempting to verify your identity, by asking you the question below.\n\n%2$s",[this.get("fullname"),t])));break;case"trust":t===!0?this.save({otr_status:C}):(this.trigger("showHelpMessages",[q("Could not verify this user's identify.")],"error"),this.save({otr_status:N}));break;default:throw new TypeError("ChatBox.onSMP: Unknown type for SMP")}},initiateOTR:function(e){this.save({otr_status:T}),this.getSession(function(t){this.otr=new u({fragment_size:140,send_interval:200,priv:t.key,instance_tag:t.instance_tag,debug:this.debug}),this.otr.on("status",this.updateOTRStatus.bind(this)),this.otr.on("smp",this.onSMP.bind(this)),this.otr.on("ui",function(e){this.trigger("showReceivedOTRMessage",e)}.bind(this)),this.otr.on("io",function(e){this.trigger("sendMessage",new m.Message({message:e}))}.bind(this)),this.otr.on("error",function(e){this.trigger("showOTRError",e)}.bind(this)),this.trigger("showHelpMessages",[q("Exchanging private key with contact.")]),e?this.otr.receiveMsg(e):this.otr.sendQueryMsg()}.bind(this))},endOTR:function(){this.otr&&this.otr.endOtr(),this.save({otr_status:T})},createMessage:function(e,t,n){t=t||e.find("delay");var r=e.children("body").text(),i=t.length>0,s=this.get("fullname"),o=e.attr("type")==="groupchat",u=e.attr("id"),c=e.find(D).length&&D||e.find(P).length&&P||e.find(O).length&&O||e.find(M).length&&M||e.find(H).length&&H,h,p,d,v;o?v=a.unescapeNode(a.getResourceFromJid(e.attr("from"))):v=a.getBareJidFromJid(e.attr("from")),s=(f.isEmpty(s)?v:s).split(" ")[0],i?(h=t.attr("stamp"),p=h):p=l().format(),o&&v===this.get("nick")||!o&&v===m.bare_jid?d="me":d="them",this.messages.create({chat_state:c,delayed:i,fullname:s,message:r||undefined,msgid:u,sender:d,time:p,archive_id:n})},receiveMessage:function(e,t,n){var r=e.children("body"),i=r.length>0?r.text():undefined;if(!i||!m.allow_otr)return this.createMessage(e,t,n);i.match(/^\?OTRv23?/)?this.initiateOTR(i):f.contains([N,C],this.get("otr_status"))?this.otr.receiveMsg(i):i.match(/^\?OTR/)?this.otr?this.otr.receiveMsg(i):this.initiateOTR(i):this.createMessage(e,t,n)}}),this.ChatBoxView=Backbone.View.extend({length:200,tagName:"div",className:"chatbox",is_chatroom:!1,events:{"click .close-chatbox-button":"close","click .toggle-chatbox-button":"minimize","keypress textarea.chat-textarea":"keyPressed","click .toggle-smiley":"toggleEmoticonMenu","click .toggle-smiley ul li":"insertEmoticon","click .toggle-clear":"clearMessages","click .toggle-otr":"toggleOTRMenu","click .start-otr":"startOTRFromToolbar","click .end-otr":"endOTR","click .auth-otr":"authOTR","click .toggle-call":"toggleCall","mousedown .dragresize-top":"onStartVerticalResize","mousedown .dragresize-left":"onStartHorizontalResize","mousedown .dragresize-topleft":"onStartDiagonalResize"},initialize:function(){t(window).on("resize",f.debounce(this.setDimensions.bind(this),100)),this.model.messages.on("add",this.onMessageAdded,this),this.model.on("show",this.show,this),this.model.on("destroy",this.hide,this),this.model.on("change:chat_state",this.sendChatState,this),this.model.on("change:chat_status",this.onChatStatusChanged,this),this.model.on("change:image",this.renderAvatar,this),this.model.on("change:otr_status",this.onOTRStatusChanged,this),this.model.on("change:minimized",this.onMinimizedChanged,this),this.model.on("change:status",this.onStatusChanged,this),this.model.on("showOTRError",this.showOTRError,this),this.model.on("showHelpMessages",this.showHelpMessages,this),this.model.on("sendMessage",this.sendMessage,this),this.model.on("showSentOTRMessage",function(e){this.showMessage({message:e,sender:"me"})},this),this.model.on("showReceivedOTRMessage",function(e){this.showMessage({message:e,sender:"them"})},this),this.updateVCard().render().fetchMessages().insertIntoPage().hide(),(f.contains([N,C],this.model.get("otr_status"))||m.use_otr_by_default)&&this.model.initiateOTR()},render:function(){return this.$el.attr("id",this.model.get("box_id")).html(m.templates.chatbox(f.extend(this.model.toJSON(),{show_toolbar:m.show_toolbar,info_close:q("Close this chat box"),info_minimize:q("Minimize this chat box"),info_view:q("View more information on this person"),label_personal_message:q("Personal message")}))),this.setWidth(),this.$content=this.$el.find(".chat-content"),this.renderToolbar().renderAvatar(),this.$content.on("scroll",f.debounce(this.onScroll.bind(this),100)),m.emit("chatBoxOpened",this),setTimeout(m.refreshWebkit,50),this.showStatusMessage()},setWidth:function(){this.model.get("width")&&this.$el.css("width",this.model.get("width"))},onScroll:function(e){t(e.target).scrollTop()===0&&this.model.messages.length&&this.fetchArchivedMessages({before:this.model.messages.at(0).get("archive_id"),"with":this.model.get("jid"),max:m.archived_messages_page_size})},fetchMessages:function(){return this.model.messages.fetch({add:!0,success:function(){if(!m.features.findWhere({"var":a.NS.MAM}))return;this.model.messages.length<m.archived_messages_page_size&&this.fetchArchivedMessages({before:"","with":this.model.get("jid"),max:m.archived_messages_page_size})}.bind(this)}),this},fetchArchivedMessages:function(e){if(!m.features.findWhere({"var":a.NS.MAM})){m.log("Attempted to fetch archived messages but this user's server doesn't support XEP-0313");return}this.addSpinner(),b.archive.query(f.extend(e,{groupchat:this.is_chatroom}),function(e){this.clearSpinner(),e.length&&(this.is_chatroom?f.map(e,this.onChatRoomMessage.bind(this)):f.map(e,m.chatboxes.onMessage.bind(m.chatboxes)))}.bind(this),function(){this.clearSpinner(),m.log("Error while trying to fetch archived messages","error")}.bind(this))},insertIntoPage:function(){return this.$el.insertAfter(m.chatboxviews.get("controlbox").$el),this},adjustToViewport:function(){var e=Math.max(document.documentElement.clientWidth,window.innerWidth||0),t=Math.max(document.documentElement.clientHeight,window.innerHeight||0);e<=480?(this.model.set("height",undefined),this.model.set("width",undefined)):e<=this.model.get("width")?this.model.set("width",undefined):t<=this.model.get("height")&&this.model.set("height",undefined)},initDragResize:function(){var e=this.$el.find(".box-flyout");if(typeof this.model.get("height")=="undefined"){var t=e.height(),n=e.width();this.model.set("height",t),this.model.set("default_height",t),this.model.set("width",n),this.model.set("default_width",n)}var r=e.css("min-width"),i=e.css("min-height");return this.model.set("min_width",r.endsWith("px")?Number(r.replace(/px$/,"")):0),this.model.set("min_height",i.endsWith("px")?Number(i.replace(/px$/,"")):0),this.prev_pageY=0,this.prev_pageX=0,m.connection.connected&&(this.height=this.model.get("height"),this.width=this.model.get("width")),this},setDimensions:function(){this.adjustToViewport(),this.setChatBoxHeight(this.model.get("height")),this.setChatBoxWidth(this.model.get("width"))},clearStatusNotification:function(){this.$content.find("div.chat-event").remove()},showStatusNotification:function(e,n){n||this.clearStatusNotification(),this.$content.append(t('<div class="chat-info chat-event"></div>').text(e)),this.scrollDown()},clearChatRoomMessages:function(e){typeof e!="undefined"&&e.stopPropagation();var t=confirm(q("Are you sure you want to clear the messages from this room?"));return t===!0&&this.$content.empty(),this},addSpinner:function(){this.$content.first().hasClass("spinner")||this.$content.prepend('<span class="spinner"/>')},clearSpinner:function(){this.$content.children(":first").is("span.spinner")&&this.$content.children(":first").remove()},prependDayIndicator:function(e){var t=l(e).startOf("day");this.$content.prepend(m.templates.new_day({isodate:t.format(),datestring:t.format("dddd MMM Do YYYY")}))},appendMessage:function(e){f.compose(f.debounce(this.scrollDown.bind(this),50),this.$content.append.bind(this.$content))(this.renderMessage(e))},showMessage:function(e){var n=this.$content.children(".chat-message:first"),r=n.data("isodate"),i,s,o,u,a,c;if(!r){this.appendMessage(e);return}s=l(e.time)||l,i=this.$content.children(".chat-message:last").data("isodate");if(typeof i!="undefined"&&(s.isAfter(i)||s.isSame(i))){s.isAfter(i,"day")&&(o=l(s).startOf("day"),this.$content.append(m.templates.new_day({isodate:s.format(),datestring:s.format("dddd MMM Do YYYY")}))),this.appendMessage(e);return}typeof r!="undefined"&&(s.isBefore(r)||s.isSame(r)&&!s.isSame(i))?(n.prev().length===0&&this.prependDayIndicator(r),s.isBefore(r,"day")?(f.compose(this.scrollDownMessageHeight.bind(this),function(e){return this.$content.prepend(e),e}.bind(this))(this.renderMessage(e)),this.prependDayIndicator(s)):f.compose(this.scrollDownMessageHeight.bind(this),function(e){return e.insertBefore(n),e})(this.renderMessage(e))):(s=s.format(),u=this.$content.children(".chat-message"),a=f.map(u,function(e){return t(e).data("isodate")}),a.push(s),a.sort(),c=a.indexOf(s)-1,f.compose(this.scrollDownMessageHeight.bind(this),function(e){return e.insertAfter(this.$content.find('.chat-message[data-isodate="'+a[c]+'"]')),e}.bind(this))(this.renderMessage(e)))},renderMessage:function(e){var n=l(e.time)||l,r=e.message,i=r.match(/^\/(.*?)(?: (.*))?$/),s=this.model.get("fullname")||e.fullname,o=e.delayed&&"delayed"||"",u,a;return i&&i[1]==="me"?(r=r.replace(/^\/me/,""),u=m.templates.action,a=s):(u=m.templates.message,a=e.sender==="me"&&q("me")||s),this.$content.find("div.chat-event").remove(),this.is_chatroom&&e.sender==="them"&&(new RegExp("\\b"+this.model.get("nick")+"\\b")).test(r)&&(o+=" mentioned"),t(u({msgid:e.msgid,sender:e.sender,time:n.format("hh:mm"),isodate:n.format(),username:a,message:"",extra_classes:o})).children(".chat-msg-content").first().text(r).addHyperlinks().addEmoticons(m.visible_toolbar_buttons.emoticons).parent()},showHelpMessages:function(e,n,r){var i,s=e.length;for(i=0;i<s;i++)this.$content.append(t('<div class="chat-'+(n||"info")+'">'+e[i]+"</div>"));return r===!0?this.$content.append('<span class="spinner"/>'):r===!1&&this.$content.find("span.spinner").remove(),this.scrollDown()},onMessageAdded:function(e){typeof this.clear_status_timeout!="undefined"&&(clearTimeout(this.clear_status_timeout),delete this.clear_status_timeout);if(!e.get("message")){if(e.get("chat_state")===D){this.showStatusNotification(e.get("fullname")+" "+q("is typing")),this.clear_status_timeout=setTimeout(this.clearStatusNotification.bind(this),1e4);return}if(e.get("chat_state")===P){this.showStatusNotification(e.get("fullname")+" "+q("has stopped typing"));return}if(f.contains([O,M],e.get("chat_state"))){this.$content.find("div.chat-event").remove();return}if(e.get("chat_state")===H){this.showStatusNotification(e.get("fullname")+" "+q("has gone away"));return}}else this.showMessage(f.clone(e.attributes));e.get("sender")!=="me"&&m.windowState==="blur"&&m.incrementMsgCounter(),!this.model.get("minimized")&&!this.$el.is(":visible")&&f.debounce(this.show.bind(this),100)()},sendMessage:function(e){var t=this.model.get("jid"),n=r({from:m.connection.jid,to:t,type:"chat",id:e.get("msgid")}).c("body").t(e.get("message")).up().c(M,{xmlns:a.NS.CHATSTATES}).up();this.model.get("otr_status")!==T&&n.c("private",{xmlns:a.NS.CARBONS}),m.connection.send(n),m.forward_messages&&m.connection.send(r({to:m.bare_jid,type:"chat",id:e.get("msgid")}).c("forwarded",{xmlns:"urn:xmpp:forward:0"}).c("delay",{xmns:"urn:xmpp:delay",stamp:(new Date).getTime()}).up().cnode(n.tree()))},onMessageSubmitted:function(e){if(!m.connection.authenticated)return this.showHelpMessages(["Sorry, the connection has been lost, and your message could not be sent"],"error");var t=e.replace(/^\s*/,"").match(/^\/(.*)\s*$/),n;if(t){if(t[1]==="clear")return this.clearMessages();if(t[1]==="help"){n=["<strong>/help</strong>:"+q("Show this menu")+"","<strong>/me</strong>:"+q("Write in the third person")+"","<strong>/clear</strong>:"+q("Remove messages")+""],this.showHelpMessages(n);return}if(m.allow_otr&&t[1]==="endotr")return this.endOTR();if(m.allow_otr&&t[1]==="otr")return this.model.initiateOTR()}if(f.contains([N,C],this.model.get("otr_status")))this.model.otr.sendMsg(e),this.model.trigger("showSentOTRMessage",e);else{var r=m.xmppstatus.get("fullname");r=f.isEmpty(r)?m.bare_jid:r;var i=this.model.messages.create({fullname:r,sender:"me",time:l().format(),message:e});this.sendMessage(i)}},sendChatState:function(){m.connection.send(r({to:this.model.get("jid"),type:"chat"}).c(this.model.get("chat_state"),{xmlns:a.NS.CHATSTATES}))},setChatState:function(e,t){return typeof this.chat_state_timeout!="undefined"&&(clearTimeout(this.chat_state_timeout),delete this.chat_state_timeout),e===D?this.chat_state_timeout=setTimeout(this.setChatState.bind(this),m.TIMEOUTS.PAUSED,P):e===P&&(this.chat_state_timeout=setTimeout(this.setChatState.bind(this),m.TIMEOUTS.INACTIVE,O)),!t&&this.model.get("chat_state")!==e&&this.model.set("chat_state",e),this},keyPressed:function(e){var n=t(e.target),r;e.keyCode===L.ENTER?(e.preventDefault(),r=n.val(),n.val("").focus(),r!==""&&(this.model.get("chatroom")?this.onChatRoomMessageSubmitted(r):this.onMessageSubmitted(r),m.emit("messageSend",r)),this.setChatState(M)):this.model.get("chatroom")||this.setChatState(D,e.keyCode===L.FORWARD_SLASH)},onStartVerticalResize:function(e){if(!m.allow_dragresize)return!0;this.height=this.$el.children(".box-flyout").height(),m.resizing={chatbox:this,direction:"top"},this.prev_pageY=e.pageY},onStartHorizontalResize:function(e){if(!m.allow_dragresize)return!0;this.width=this.$el.children(".box-flyout").width(),m.resizing={chatbox:this,direction:"left"},this.prev_pageX=e.pageX},onStartDiagonalResize:function(e){this.onStartHorizontalResize(e),this.onStartVerticalResize(e),m.resizing.direction="topleft"},setChatBoxHeight:function(e){this.model.get("minimized")||(e?e=m.applyDragResistance(e,this.model.get("default_height"))+"px":e="",this.$el.children(".box-flyout")[0].style.height=e)},setChatBoxWidth:function(e){this.model.get("minimized")||(e?e=m.applyDragResistance(e,this.model.get("default_width"))+"px":e="",this.$el[0].style.width=e,this.$el.children(".box-flyout")[0].style.width=e)},resizeChatBox:function(e){var t;m.resizing.direction.indexOf("top")===0&&(t=e.pageY-this.prev_pageY,t&&(this.height=this.height-t>(this.model.get("min_height")||0)?this.height-t:this.model.get("min_height"),this.prev_pageY=e.pageY,this.setChatBoxHeight(this.height))),m.resizing.direction.indexOf("left")!==-1&&(t=this.prev_pageX-e.pageX,t&&(this.width=this.width+t>(this.model.get("min_width")||0)?this.width+t:this.model.get("min_width"),this.prev_pageX=e.pageX,this.setChatBoxWidth(this.width)))},clearMessages:function(e){e&&e.preventDefault&&e.preventDefault();var t=confirm(q("Are you sure you want to clear the messages from this chat box?"));return t===!0&&(this.$content.empty(),this.model.messages.reset(),this.model.messages.browserStorage._clear()),this},insertEmoticon:function(e){e.stopPropagation(),this.$el.find(".toggle-smiley ul").slideToggle(200);var n=this.$el.find("textarea.chat-textarea"),r=n.val(),i=t(e.target);i=i.is("a")?i:i.children("a"),r&&r[r.length-1]!==" "&&(r+=" "),n.focus().val(r+i.data("emoticon")+" ")},toggleEmoticonMenu:function(e){e.stopPropagation(),this.$el.find(".toggle-smiley ul").slideToggle(200)},toggleOTRMenu:function(e){e.stopPropagation(),this.$el.find(".toggle-otr ul").slideToggle(200)},showOTRError:function(e){e==="Message cannot be sent at this time."?this.showHelpMessages([q("Your message could not be sent")],"error"):e==="Received an unencrypted message."?this.showHelpMessages([q("We received an unencrypted message")],"error"):e==="Received an unreadable encrypted message."?this.showHelpMessages([q("We received an unreadable encrypted message")],"error"):this.showHelpMessages(["Encryption error occured: "+e],"error"),m.log("OTR ERROR:"+e)},startOTRFromToolbar:function(e){t(e.target).parent().parent().slideUp(),e.stopPropagation(),this.model.initiateOTR()},endOTR:function(e){typeof e!="undefined"&&(e.preventDefault(),e.stopPropagation()),this.model.endOTR()},authOTR:function(e){var n=t(e.target).data().scheme,r,i,s;n==="fingerprint"?(r=confirm(q("Here are the fingerprints, please confirm them with %1$s, outside of this chat.\n\nFingerprint for you, %2$s: %3$s\n\nFingerprint for %1$s: %4$s\n\nIf you have confirmed that the fingerprints match, click OK, otherwise click Cancel.",[this.model.get("fullname"),m.xmppstatus.get("fullname")||m.bare_jid,this.model.otr.priv.fingerprint(),this.model.otr.their_priv_pk.fingerprint()])),r===!0?this.model.save({otr_status:C}):this.model.save({otr_status:N})):n==="smp"?(alert(q("You will be prompted to provide a security question and then an answer to that question.\n\nYour contact will then be prompted the same question and if they type the exact same answer (case sensitive), their identity will be verified.")),i=prompt(q("What is your security question?")),i&&(s=prompt(q("What is the answer to the security question?")),this.model.otr.smpSecret(s,i))):this.showHelpMessages([q("Invalid authentication scheme provided")],"error")},toggleCall:function(e){e.stopPropagation(),m.emit("callButtonClicked",{connection:m.connection,model:this.model})},onChatStatusChanged:function(e){var t=e.get("chat_status"),n=e.get("fullname");n=f.isEmpty(n)?e.get("jid"):n,this.$el.is(":visible")&&(t==="offline"?this.showStatusNotification(n+" "+q("has gone offline")):t==="away"?this.showStatusNotification(n+" "+q("has gone away")):t==="dnd"?this.showStatusNotification(n+" "+q("is busy")):t==="online"&&this.$el.find("div.chat-event").remove()),m.emit("contactStatusChanged",e.attributes,e.get("chat_status"))},onStatusChanged:function(e){this.showStatusMessage(),m.emit("contactStatusMessageChanged",e.attributes,e.get("status"))},onOTRStatusChanged:function(){this.renderToolbar().informOTRChange()},onMinimizedChanged:function(e){e.get("minimized")?this.hide():this.maximize()},showStatusMessage:function(e){return e=e||this.model.get("status"),typeof e=="string"&&this.$el.find("p.user-custom-message").text(e).attr("title",e),this},close:function(e){return e&&e.preventDefault&&e.preventDefault(),m.connection.connected?(this.model.destroy(),this.setChatState(O)):this.hide(),m.emit("chatBoxClosed",this),this},maximize:function(){var e=m.chatboxviews;this.$el.insertAfter(e.get("controlbox").$el).show("fast",function(){e.trimChats(this),m.refreshWebkit(),this.setChatState(M).focus(),m.emit("chatBoxMaximized",this)}.bind(this))},minimize:function(e){e&&e.preventDefault&&e.preventDefault(),this.setChatState(O).model.minimize(),this.$el.hide("fast",m.refreshwebkit),m.emit("chatBoxMinimized",this)},updateVCard:function(){if(!this.use_vcards)return this;var e=this.model.get("jid"),t=m.roster.get(e);return t&&!t.get("vcard_updated")&&m.getVCard(e,function(e,t,n,r,i,s){this.model.save({fullname:n||t,url:s,image_type:i,image:r})}.bind(this),function(){m.log("ChatBoxView.initialize: An error occured while fetching vcard")}),this},informOTRChange:function(){var e=this.model.toJSON(),t=[];return e.otr_status===T?t.push(q("Your messages are not encrypted anymore")):e.otr_status===N?t.push(q("Your messages are now encrypted but your contact's identity has not been verified.")):e.otr_status===C?t.push(q("Your contact's identify has been verified.")):e.otr_status===k&&t.push(q("Your contact has ended encryption on their end, you should do the same.")),this.showHelpMessages(t,"info",!1)},renderToolbar:function(){if(m.show_toolbar){var e=this.model.toJSON();e.otr_status===T?e.otr_tooltip=q("Your messages are not encrypted. Click here to enable OTR encryption."):e.otr_status===N?e.otr_tooltip=q("Your messages are encrypted, but your contact has not been verified."):e.otr_status===C?e.otr_tooltip=q("Your messages are encrypted and your contact verified."):e.otr_status===k&&(e.otr_tooltip=q("Your contact has closed their end of the private session, you should do the same")),this.$el.find(".chat-toolbar").html(m.templates.toolbar(f.extend(e,{FINISHED:k,UNENCRYPTED:T,UNVERIFIED:N,VERIFIED:C,allow_otr:m.allow_otr&&!this.is_chatroom,label_clear:q("Clear all messages"),label_end_encrypted_conversation:q("End encrypted conversation"),label_insert_smiley:q("Insert a smiley"),label_hide_occupants:q("Hide the list of occupants"),label_refresh_encrypted_conversation:q("Refresh encrypted conversation"),label_start_call:q("Start a call"),label_start_encrypted_conversation:q("Start encrypted conversation"),label_verify_with_fingerprints:q("Verify with fingerprints"),label_verify_with_smp:q("Verify with SMP"),label_whats_this:q("What's this?"),otr_status_class:U[e.otr_status],otr_translated_status:z[e.otr_status],show_call_button:m.visible_toolbar_buttons.call,show_clear_button:m.visible_toolbar_buttons.clear,show_emoticons:m.visible_toolbar_buttons.emoticons,show_occupants_toggle:this.is_chatroom&&m.visible_toolbar_buttons.toggle_occupants})))}return this},renderAvatar:function(){if(!this.model.get("image"))return;var e="data:"+this.model.get("image_type")+";base64,"+this.model.get("image"),n=t('<canvas height="32px" width="32px" class="avatar"></canvas>').get(0);if(!n.getContext||!n.getContext("2d"))return this;var r=n.getContext("2d"),i=new Image;return i.onload=function(){var e=i.width/i.height;e<1?r.drawImage(i,0,0,32,32*(1/e)):r.drawImage(i,0,0,32,32*e)},i.src=e,this.$el.find(".chat-title").before(n),this},focus:function(){return this.$el.find(".chat-textarea").focus(),m.emit("chatBoxFocused",this),this},hide:function(){return this.$el.is(":visible")&&this.$el.css("opacity")==="1"&&(this.$el.hide(),m.refreshWebkit()),this},show:function(e){return this.$el.is(":visible")&&this.$el.css("opacity")==="1"?this.focus():(this.initDragResize().setDimensions(),this.$el.fadeIn(function(){typeof e=="function"&&e.apply(this,arguments),m.connection.connected&&this.model.save(),this.setChatState(M),this.scrollDown().focus()}.bind(this)),this)},scrollDownMessageHeight:function(e){return this.$content.is(":visible")&&this.$content.scrollTop(this.$content.scrollTop()+e[0].scrollHeight),this},scrollDown:function(){return this.$content.is(":visible")&&this.$content.scrollTop(this.$content[0].scrollHeight),this}}),this.ContactsPanel=Backbone.View.extend({tagName:"div",className:"controlbox-pane",id:"users",events:{"click a.toggle-xmpp-contact-form":"toggleContactForm","submit form.add-xmpp-contact":"addContactFromForm","submit form.search-xmpp-contact":"searchContacts","click a.subscribe-to-user":"addContactFromList"},initialize:function(e){e.$parent.append(this.$el),this.$tabs=e.$parent.parent().find("#controlbox-tabs")},render:function(){var e,t=m.templates.contacts_panel({label_online:q("Online"),label_busy:q("Busy"),label_away:q("Away"),label_offline:q("Offline"),label_logout:q("Log out"),allow_logout:m.allow_logout});return this.$tabs.append(m.templates.contacts_tab({label_contacts:G})),m.xhr_user_search?e=m.templates.search_contact({label_contact_name:q("Contact name"),label_search:q("Search")}):e=m.templates.add_contact_form({label_contact_username:q("e.g. user@example.com"),label_add:q("Add")}),m.allow_contact_requests&&(t+=m.templates.add_contact_dropdown({label_click_to_chat:q("Click to add new chat contacts"),label_add_contact:q("Add a contact")})),this.$el.html(t),this.$el.find(".search-xmpp ul").append(e),this},toggleContactForm:function(e){e.preventDefault(),this.$el.find(".search-xmpp").toggle("fast",function(){t(this).is(":visible")&&t(this).find("input.username").focus()})},searchContacts:function(e){e.preventDefault(),t.getJSON(m.xhr_user_search_url+"?q="+t(e.target).find("input.username").val(),function(e){var n=t(".search-xmpp ul");n.find("li.found-user").remove(),n.find("li.chat-info").remove(),e.length||n.append('<li class="chat-info">'+q("No users found")+"</li>"),t(e).each(function(e,r){n.append(t('<li class="found-user"></li>').append(t('<a class="subscribe-to-user" href="#" title="'+q("Click to add as a chat contact")+'"></a>').attr("data-recipient",a.getNodeFromJid(r.id)+"@"+a.getDomainFromJid(r.id)).text(r.fullname)))})})},addContactFromForm:function(e){e.preventDefault();var n=t(e.target).find("input"),r=n.val();if(!r){n.addClass("error");return}m.roster.addAndSubscribe(r),t(".search-xmpp").hide()},addContactFromList:function(e){e.preventDefault();var n=t(e.target),r=n.attr("data-recipient"),i=n.text();m.roster.addAndSubscribe(r,i),n.parent().remove(),t(".search-xmpp").hide()}}),this.RoomsPanel=Backbone.View.extend({tagName:"div",className:"controlbox-pane",id:"chatrooms",events:{"submit form.add-chatroom":"createChatRoom","click input#show-rooms":"showRooms","click a.open-room":"createChatRoom","click a.room-info":"showRoomInfo","change input[name=server]":"setDomain","change input[name=nick]":"setNick"},initialize:function(e){this.$parent=e.$parent,this.model.on("change:muc_domain",this.onDomainChange,this),this.model.on("change:nick",this.onNickChange,this)},render:function(){return this.$parent.append(this.$el.html(m.templates.room_panel({server_input_type:m.hide_muc_server&&"hidden"||"text",server_label_global_attr:m.hide_muc_server&&" hidden"||"",label_room_name:q("Room name"),label_nickname:q("Nickname"),label_server:q("Server"),label_join:q("Join Room"),label_show_rooms:q("Show rooms")})).hide()),this.$tabs=this.$parent.parent().find("#controlbox-tabs"),this.$tabs.append(m.templates.chatrooms_tab({label_rooms:q("Rooms")})),this},onDomainChange:function(e){var t=this.$el.find("input.new-chatroom-server");t.val(e.get("muc_domain")),m.auto_list_rooms&&this.updateRoomsList()},onNickChange:function(e){var t=this.$el.find("input.new-chatroom-nick");t.val(e.get("nick"))},informNoRoomsFound:function(){var e=this.$el.find("#available-chatrooms");e.html("<dt>"+q("No rooms on %1$s",this.model.get("muc_domain"))+"</dt>"),t("input#show-rooms").show().siblings("span.spinner").remove()},onRoomsFound:function(e){var n,r,i,s,o=this.$el.find("#available-chatrooms");this.rooms=t(e).find("query").find("item");if(this.rooms.length){o.html("<dt>"+q("Rooms on %1$s",this.model.get("muc_domain"))+"</dt>"),s=document.createDocumentFragment();for(i=0;i<this.rooms.length;i++)n=a.unescapeNode(t(this.rooms[i]).attr("name")||t(this.rooms[i]).attr("jid")),r=t(this.rooms[i]).attr("jid"),s.appendChild(t(m.templates.room_item({name:n,jid:r,open_title:q("Click to open this room"),info_title:q("Show more information on this room")}))[0]);o.append(s),t("input#show-rooms").show().siblings("span.spinner").remove()}else this.informNoRoomsFound();return!0},updateRoomsList:function(){m.connection.sendIQ(n({to:this.model.get("muc_domain"),from:m.connection.jid,type:"get"}).c("query",{xmlns:a.NS.DISCO_ITEMS}),this.onRoomsFound.bind(this),this.informNoRoomsFound.bind(this))},showRooms:function(){var e=this.$el.find("#available-chatrooms"),n=this.$el.find("input.new-chatroom-server"),r=n.val();if(!r){n.addClass("error");return}this.$el.find("input.new-chatroom-name").removeClass("error"),n.removeClass("error"),e.empty(),t("input#show-rooms").hide().after('<span class="spinner"/>'),this.model.save({muc_domain:r}),this.updateRoomsList()},showRoomInfo:function(e){var n=e.target,r=t(n).parent("dd"),i=r.find("div.room-info");i.length?i.remove():(r.find("span.spinner").remove(),r.append('<span class="spinner hor_centered"/>'),m.connection.disco.info(t(n).attr("data-room-jid"),null,function(e){var n=t(e);r.find("span.spinner").replaceWith(m.templates.room_description({desc:n.find('field[var="muc#roominfo_description"] value').text(),occ:n.find('field[var="muc#roominfo_occupants"] value').text(),hidden:n.find('feature[var="muc_hidden"]').length,membersonly:n.find('feature[var="muc_membersonly"]').length,moderated:n.find('feature[var="muc_moderated"]').length,nonanonymous:n.find('feature[var="muc_nonanonymous"]').length,open:n.find('feature[var="muc_open"]').length,passwordprotected:n.find('feature[var="muc_passwordprotected"]').length,persistent:n.find('feature[var="muc_persistent"]').length,publicroom:n.find('feature[var="muc_public"]').length,semianonymous:n.find('feature[var="muc_semianonymous"]').length,temporary:n.find('feature[var="muc_temporary"]').length,unmoderated:n.find('feature[var="muc_unmoderated"]').length,label_desc:q("Description:"),label_occ:q("Occupants:"),label_features:q("Features:"),label_requires_auth:q("Requires authentication"),label_hidden:q("Hidden"),label_requires_invite:q("Requires an invitation"),label_moderated:q("Moderated"),label_non_anon:q("Non-anonymous"),label_open_room:q("Open room"),label_permanent_room:q("Permanent room"),label_public:q("Public"),label_semi_anon:q("Semi-anonymous"),label_temp_room:q("Temporary room"),label_unmoderated:q("Unmoderated")}))}.bind(this)))},createChatRoom:function(e){e.preventDefault();var n,r,i,s,o,u=this.$el.find("input.new-chatroom-nick"),f=u.val(),l;f?u.removeClass("error"):u.addClass("error");if(e.type==="click")n=t(e.target).text(),o=t(e.target).attr("data-room-jid");else{r=this.$el.find("input.new-chatroom-name"),s=this.$el.find("input.new-chatroom-server"),i=s.val(),n=r.val().trim(),r.val("");if(!n||!i){n||r.addClass("error"),i||s.addClass("error");return}o=a.escapeNode(n.toLowerCase())+"@"+i,r.removeClass("error"),s.removeClass("error"),this.model.save({muc_domain:i})}if(!f)return;l=m.chatboxviews.showChat({id:o,jid:o,name:n||a.unescapeNode(a.getNodeFromJid(o)),nick:f,chatroom:!0,box_id:h(o)})},setDomain:function(e){this.model.save({muc_domain:e.target.value})},setNick:function(e){this.model.save({nick:e.target.value})}}),this.ControlBoxView=m.ChatBoxView.extend({tagName:"div",className:"chatbox",id:"controlbox",events:{"click a.close-chatbox-button":"close","click ul#controlbox-tabs li a":"switchTab","mousedown .dragresize-top":"onStartVerticalResize","mousedown .dragresize-left":"onStartHorizontalResize","mousedown .dragresize-topleft":"onStartDiagonalResize"},initialize:function(){this.$el.insertAfter(m.controlboxtoggle.$el),t(window).on("resize",f.debounce(this.setDimensions.bind(this),100)),this.model.on("change:connected",this.onConnected,this),this.model.on("destroy",this.hide,this),this.model.on("hide",this.hide,this),this.model.on("show",this.show,this),this.model.on("change:closed",this.ensureClosedState,this),this.render(),this.model.get("connected")&&this.initRoster(),this.model.get("closed")?this.hide():this.show()},render:function(){return!m.connection.connected||!m.connection.authenticated||m.connection.disconnecting?this.renderLoginPanel():(!this.contactspanel||!this.contactspanel.$el.is(":visible"))&&this.renderContactsPanel(),this},giveFeedback:function(e,t){var n=this.$(".conn-feedback");n.addClass("conn-feedback").text(e),t&&n.addClass(t)},onConnected:function(){if(this.model.get("connected")){this.render().initRoster(),m.features.off("add",this.featureAdded,this),m.features.on("add",this.featureAdded,this);var e=m.features.findWhere({"var":a.NS.MUC});e&&this.featureAdded(e)}},initRoster:function(){m.roster=new m.RosterContacts,m.roster.browserStorage=new Backbone.BrowserStorage[m.storage](h("converse.contacts-"+m.bare_jid));var e=new m.RosterGroups;return e.browserStorage=new Backbone.BrowserStorage[m.storage](h("converse.roster.groups"+m.bare_jid)),m.rosterview=new m.RosterView({model:e}),this.contactspanel.$el.append(m.rosterview.$el),m.rosterview.render().fetch().update(),this},renderLoginPanel:function(){var e=this.$(".conn-feedback");this.$el.html(m.templates.controlbox(this.model.toJSON()));var t={$parent:this.$el.find(".controlbox-panes"),model:this};return this.loginpanel?(this.loginpanel.delegateEvents().initialize(t),m.allow_registration&&this.registerpanel.delegateEvents().initialize(t)):(this.loginpanel=new m.LoginPanel(t),m.allow_registration&&(this.registerpanel=new m.RegisterPanel(t))),this.loginpanel.render(),m.allow_registration&&this.registerpanel.render().$el.hide(),this.initDragResize().setDimensions(),e.length&&e.text()!==q("Connecting")&&this.$(".conn-feedback").replaceWith(e),this},renderContactsPanel:function(){this.$el.html(m.templates.controlbox(this.model.toJSON())),this.contactspanel=new m.ContactsPanel({$parent:this.$el.find(".controlbox-panes")}),this.contactspanel.render(),m.xmppstatusview=new m.XMPPStatusView({model:m.xmppstatus}),m.xmppstatusview.render(),m.allow_muc&&(this.roomspanel=new m.RoomsPanel({$parent:this.$el.find(".controlbox-panes"),model:new(Backbone.Model.extend({id:h("converse.roomspanel"+m.bare_jid),browserStorage:new Backbone.BrowserStorage[m.storage](h("converse.roomspanel"+m.bare_jid))}))}),this.roomspanel.render().model.fetch(),this.roomspanel.model.get("nick")||this.roomspanel.model.save({nick:a.getNodeFromJid(m.bare_jid)})),this.initDragResize().setDimensions()},close:function(e){return e&&e.preventDefault&&e.preventDefault(),m.connection.connected?this.model.save({closed:!0}):this.model.trigger("hide"),m.emit("controlBoxClosed",this),this},ensureClosedState:function(){this.model.get("closed")?this.hide():this.show()},hide:function(e){return this.$el.hide("fast",function(){m.refreshWebkit(),m.emit("chatBoxClosed",this),m.controlboxtoggle.show(function(){typeof e=="function"&&e()})}),this},show:function(){return m.controlboxtoggle.hide(function(){this.$el.show("fast",function(){m.rosterview&&m.rosterview.update(),m.refreshWebkit()}.bind(this)),m.emit("controlBoxOpened",this)}.bind(this)),this},featureAdded:function(e){if(e.get("var")===a.NS.MUC&&m.allow_muc){this.roomspanel.model.save({muc_domain:e.get("from")});var t=this.$el.find("input.new-chatroom-server");t.is(":focus")||t.val(this.roomspanel.model.get("muc_domain"))}},switchTab:function(e){e&&e.preventDefault&&e.preventDefault();var n=t(e.target),r=n.parent().siblings("li").children("a"),i=t(n.attr("href"));return t(r.attr("href")).hide(),r.removeClass("current"),n.addClass("current"),i.show(),this},showHelpMessages:function(e){return}}),this.ChatRoomOccupant=Backbone.Model,this.ChatRoomOccupantView=Backbone.View.extend({tagName:"li",initialize:function(){this.model.on("add",this.render,this),this.model.on("change",this.render,this),this.model.on("destroy",this.destroy,this)},render:function(){var e=m.templates.occupant(f.extend(this.model.toJSON(),{desc_moderator:q("This user is a moderator"),desc_occupant:q("This user can send messages in this room"),desc_visitor:q("This user can NOT send messages in this room")}));return this.$el.replaceWith(e),this.setElement(e,!0),this},destroy:function(){this.$el.remove()}}),this.ChatRoomOccupants=Backbone.Collection.extend({model:m.ChatRoomOccupant}),this.ChatRoomOccupantsView=Backbone.Overview.extend({tagName:"div",className:"occupants",initialize:function(){this.model.on("add",this.onOccupantAdded,this)},render:function(){return this.$el.html(m.templates.chatroom_sidebar({label_invitation:q("Invite..."),label_occupants:q("Occupants")})),this.initInviteWidget()},onOccupantAdded:function(e){var t=this.get(e.get("id"));t?(delete t.model,t.model=e,t.initialize()):t=this.add(e.get("id"),new m.ChatRoomOccupantView({model:e})),this.$(".occupant-list").append(t.render().$el)},parsePresence:function(e){var t=a.getResourceFromJid(e.getAttribute("from")),n={id:t,nick:t,type:e.getAttribute("type"),states:[]};return f.each(e.childNodes,function(e){switch(e.nodeName){case"status":n.status=e.textContent||null;break;case"show":n.show=e.textContent||null;break;case"x":e.getAttribute("xmlns")===a.NS.MUC_USER&&f.each(e.childNodes,function(e){switch(e.nodeName){case"item":n.affiliation=e.getAttribute("affiliation"),n.role=e.getAttribute("role"),n.jid=e.getAttribute("jid"),n.nick=e.getAttribute("nick")||n.nick;break;case"status":e.getAttribute("code")&&n.states.push(e.getAttribute("code"))}})}}),n},updateOccupantsOnPresence:function(e){var t,n=this.parsePresence(e);switch(n.type){case"error":return!0;case"unavailable":t=this.model.get(n.id),t&&t.destroy();break;default:t=this.model.get(n.id),t?t.save(n):this.model.create(n)}},initInviteWidget:function(){var e=this.$("input.invited-contact");return e.typeahead({minLength:1,highlight:!0},{name:"contacts-dataset",source:function(e,t){var n=[];f.each(m.roster.filter(p(["fullname","jid"],e)),function(e){n.push({value:e.get("fullname"),jid:e.get("jid")})}),t(n)},templates:{suggestion:f.template('<p data-jid="{{jid}}">{{value}}</p>')}}),e.on("typeahead:selected",function(e,n,r){var i=prompt(q(R('You are about to invite %1$s to the chat room "%2$s". '),n.value,this.model.get("id"))+q("You may optionally include a message, explaining the reason for the invitation."));i!==null&&this.chatroomview.directInvite(n.jid,i),t(e.target).typeahead("val","")}.bind(this)),this}}),this.ChatRoomView=m.ChatBoxView.extend({length:300,tagName:"div",className:"chatbox chatroom",events:{"click .close-chatbox-button":"close","click .toggle-chatbox-button":"minimize","click .configure-chatroom-button":"configureChatRoom","click .toggle-smiley":"toggleEmoticonMenu","click .toggle-smiley ul li":"insertEmoticon","click .toggle-clear":"clearChatRoomMessages","click .toggle-call":"toggleCall","click .toggle-occupants a":"toggleOccupants","keypress textarea.chat-textarea":"keyPressed","mousedown .dragresize-top":"onStartVerticalResize","mousedown .dragresize-left":"onStartHorizontalResize","mousedown .dragresize-topleft":"onStartDiagonalResize"},is_chatroom:!0,initialize:function(){t(window).on("resize",f.debounce(this.setDimensions.bind(this),100)),this.model.messages.on("add",this.onMessageAdded,this),this.model.on("change:minimized",function(e){e.get("minimized")?this.hide():this.maximize()},this),this.model.on("destroy",function(){this.hide().leave()},this),this.occupantsview=new m.ChatRoomOccupantsView({model:new m.ChatRoomOccupants({nick:this.model.get("nick")})});var e=h("converse.occupants"+m.bare_jid+this.model.get("id")+this.model.get("nick"));this.occupantsview.model.browserStorage=new Backbone.BrowserStorage[m.storage](e),this.occupantsview.chatroomview=this,this.render().$el.hide(),this.occupantsview.model.fetch({add:!0}),this.join(null,{maxstanzas:m.muc_history_max_stanzas}),this.fetchMessages(),m.emit("chatRoomOpened",this),this.$el.insertAfter(m.chatboxviews.get("controlbox").$el),this.model.get("minimized")?this.hide():this.show()},render:function(){return this.$el.attr("id",this.model.get("box_id")).html(m.templates.chatroom(this.model.toJSON())),this.renderChatArea(),this.$content.on("scroll",f.debounce(this.onScroll.bind(this),100)),this.setWidth(),setTimeout(m.refreshWebkit,50),this},renderChatArea:function(){return this.$(".chat-area").length||(this.$(".chatroom-body").empty().append(m.templates.chatarea({show_toolbar:m.show_toolbar,label_message:q("Message")})).append(this.occupantsview.render().$el),this.renderToolbar(),this.$content=this.$el.find(".chat-content")),this.toggleOccupants(null,!0),this},toggleOccupants:function(e,t){e&&(e.preventDefault(),e.stopPropagation()),t&&this.model.set({hidden_occupants:!this.model.get("hidden_occupants")});var n=this.$(".icon-hide-users");this.model.get("hidden_occupants")?(this.model.save({hidden_occupants:!1}),n.removeClass("icon-show-users").addClass("icon-hide-users"),this.$(".chat-area").removeClass("full"),this.$("div.occupants").removeClass("hidden"),this.scrollDown()):(this.model.save({hidden_occupants:!0}),n.removeClass("icon-hide-users").addClass("icon-show-users"),this.$(".occupants").addClass("hidden"),this.$(".chat-area").addClass("full"),this.scrollDown())},directInvite:function(e,t){var n={xmlns:"jabber:x:conference",jid:this.model.get("jid")};t!==null&&(n.reason=t),this.model.get("password")&&(n.password=this.model.get("password"));var i=r({from:m.connection.jid,to:e,id:m.connection.getUniqueId()}).c("x",n);m.connection.send(i),m.emit("roomInviteSent",this,e,t)},onCommandError:function(e){this.showStatusNotification(q("Error: could not execute the command"),!0)},sendChatRoomMessage:function(e){var t=m.connection.getUniqueId(),n=r({to:this.model.get("jid"),from:m.connection.jid,type:"groupchat",id:t}).c("body").t(e).up().c("x",{xmlns:"jabber:x:event"}).c("composing");m.connection.send(n);var i=m.xmppstatus.get("fullname");this.model.messages.create({fullname:f.isEmpty(i)?m.bare_jid:i,sender:"me",time:l().format(),message:e,msgid:t})},setAffiliation:function(e,t,r,i,o,u){var f=s("item",{jid:t,affiliation:r}),l=n({to:e,type:"set"}).c("query",{xmlns:a.NS.MUC_ADMIN}).cnode(f.node);return i!==null&&l.c("reason",i),m.connection.sendIQ(l.tree(),o,u)},modifyRole:function(e,t,r,i,o,u){var f=s("item",{nick:t,role:r}),l=n({to:e,type:"set"}).c("query",{xmlns:a.NS.MUC_ADMIN}).cnode(f.node);return i!==null&&l.c("reason",i),m.connection.sendIQ(l.tree(),o,u)},member:function(e,t,n,r,i){return this.setAffiliation(e,t,"member",n,r,i)},revoke:function(e,t,n,r,i){return this.setAffiliation(e,t,"none",n,r,i)},owner:function(e,t,n,r,i){return this.setAffiliation(e,t,"owner",n,r,i)},admin:function(e,t,n,r,i){return this.setAffiliation(e,t,"admin",n,r,i)},validateRoleChangeCommand:function(e,t){return t.length<1||t.length>2?(this.showStatusNotification(q('Error: the "'+e+"\" command takes two arguments, the user's nickname and optionally a reason."),!0),!1):!0},onChatRoomMessageSubmitted:function(e){var t=e.replace(/^\s*/,"").match(/^\/(.*?)(?: (.*))?$/)||[!1,"",""],n=t[2]&&t[2].splitOnce(" ")||[];switch(t[1]){case"admin":if(!this.validateRoleChangeCommand(t[1],n))break;this.setAffiliation(this.model.get("jid"),n[0],"admin",n[1],undefined,this.onCommandError.bind(this));break;case"ban":if(!this.validateRoleChangeCommand(t[1],n))break;this.setAffiliation(this.model.get("jid"),n[0],"outcast",n[1],undefined,this.onCommandError.bind(this));break;case"clear":this.clearChatRoomMessages();break;case"deop":if(!this.validateRoleChangeCommand(t[1],n))break;this.modifyRole(this.model.get("jid"),n[0],"occupant",n[1],undefined,this.onCommandError.bind(this));break;case"help":this.showHelpMessages(["<strong>/admin</strong>: "+q("Change user's affiliation to admin"),"<strong>/ban</strong>: "+q("Ban user from room"),"<strong>/clear</strong>: "+q("Remove messages"),"<strong>/deop</strong>: "+q("Change user role to occupant"),"<strong>/help</strong>: "+q("Show this menu"),"<strong>/kick</strong>: "+q("Kick user from room"),"<strong>/me</strong>: "+q("Write in 3rd person"),"<strong>/member</strong>: "+q("Grant membership to a user"),"<strong>/mute</strong>: "+q("Remove user's ability to post messages"),"<strong>/nick</strong>: "+q("Change your nickname"),"<strong>/op</strong>: "+q("Grant moderator role to user"),"<strong>/owner</strong>: "+q("Grant ownership of this room"),"<strong>/revoke</strong>: "+q("Revoke user's membership"),"<strong>/topic</strong>: "+q("Set room topic"),"<strong>/voice</strong>: "+q("Allow muted user to post messages")]);break;case"kick":if(!this.validateRoleChangeCommand(t[1],n))break;this.modifyRole(this.model.get("jid"),n[0],"none",n[1],undefined,this.onCommandError.bind(this));break;case"mute":if(!this.validateRoleChangeCommand(t[1],n))break;this.modifyRole(this.model.get("jid"),n[0],"visitor",n[1],undefined,this.onCommandError.bind(this));break;case"member":if(!this.validateRoleChangeCommand(t[1],n))break;this.setAffiliation(this.model.get("jid"),n[0],"member",n[1],undefined,this.onCommandError.bind(this));break;case"nick":m.connection.send(i({from:m.connection.jid,to:this.getRoomJIDAndNick(t[2]),id:m.connection.getUniqueId()}).tree());break;case"owner":if(!this.validateRoleChangeCommand(t[1],n))break;this.setAffiliation(this.model.get("jid"),n[0],"owner",n[1],undefined,this.onCommandError.bind(this));break;case"op":if(!this.validateRoleChangeCommand(t[1],n))break;this.modifyRole(this.model.get("jid"),n[0],"moderator",n[1],undefined,this.onCommandError.bind(this));break;case"revoke":if(!this.validateRoleChangeCommand(t[1],n))break;this.setAffiliation(this.model.get("jid"),n[0],"none",n[1],undefined,this.onCommandError.bind(this));break;case"topic":m.connection.send(r({to:this.model.get("jid"),from:m.connection.jid,type:"groupchat"}).c("subject",{xmlns:"jabber:client"}).t(t[2]).tree());break;case"voice":if(!this.validateRoleChangeCommand(t[1],n))break;this.modifyRole(this.model.get("jid"),n[0],"occupant",n[1],undefined,this.onCommandError.bind(this));break;default:this.sendChatRoomMessage(e)}},handleMUCStanza:function(e){var n,r,i,s=e.getAttribute("from"),o=t(e).find('[xmlns="'+a.NS.MAM+'"]').length>0;if(!s||this.model.get("id")!==s.split("/")[0]||o)return!0;if(e.nodeName==="message")f.compose(this.onChatRoomMessage.bind(this),this.showStatusMessages.bind(this))(e);else if(e.nodeName==="presence"){r=e.getElementsByTagName("x");if(r.length>0)for(i=0;i<r.length;i++){n=r[i].getAttribute("xmlns");if(n&&n.match(a.NS.MUC)){this.onChatRoomPresence(e);break}}}return!0},getRoomJIDAndNick:function(e){e=e||this.model.get("nick");var t=this.model.get("jid"),n=a.getNodeFromJid(t),r=a.getDomainFromJid(t);return n+"@"+r+(e!==null?"/"+e:"")},join:function(e,t,n){var r=i({from:m.connection.jid,to:this.getRoomJIDAndNick()}).c("x",{xmlns:a.NS.MUC});return typeof t=="object"&&Object.keys(t).length&&(r=r.c("history",t).up()),e&&r.cnode(a.xmlElement("password",[],e)),typeof n!="undefined"&&n!==null&&r.up.cnode(n),this.handler||(this.handler=m.connection.addHandler(this.handleMUCStanza.bind(this))),this.model.set("connection_status",a.Status.CONNECTING),m.connection.send(r)},leave:function(e){var t=m.connection.getUniqueId(),n=i({type:"unavailable",id:t,from:m.connection.jid,to:this.getRoomJIDAndNick()});e!==null&&n.c("status",e),m.connection.addHandler(function(){this.model.set("connection_status",a.Status.DISCONNECTED)}.bind(this),null,"presence",null,t),m.connection.send(n)},renderConfigurationForm:function(e){var n=this.$el.find("form.chatroom-form"),r=n.children("fieldset:first"),i=t(e),s=i.find("field"),o=i.find("title").text(),u=i.find("instructions").text();r.find("span.spinner").remove(),r.append(t("<legend>").text(o)),u&&u!==o&&r.append(t('<p class="instructions">').text(u)),f.each(s,function(e){r.append(c.xForm2webForm(t(e),i))}),n.append("<fieldset></fieldset>"),r=n.children("fieldset:last"),r.append('<input type="submit" class="pure-button button-primary" value="'+q("Save")+'"/>'),r.append('<input type="button" class="pure-button button-cancel" value="'+q("Cancel")+'"/>'),r.find("input[type=button]").on("click",this.cancelConfiguration.bind(this)),n.on("submit",this.saveConfiguration.bind(this))},sendConfiguration:function(e,t,r){var i=n({to:this.model.get("jid"),type:"set"}).c("query",{xmlns:a.NS.MUC_OWNER}).c("x",{xmlns:a.NS.XFORM,type:"submit"});return f.each(e,function(e){i.cnode(e).up()}),m.connection.sendIQ(i.tree(),t,r)},saveConfiguration:function(e){e.preventDefault();var n=this,r=t(e.target).find(":input:not([type=button]):not([type=submit])"),i=r.length,s=[];r.each(function(){s.push(c.webForm2xForm(this)),--i||n.sendConfiguration(s,n.onConfigSaved.bind(n),n.onErrorConfigSaved.bind(n))}),this.$el.find("div.chatroom-form-container").hide(function(){t(this).remove(),n.$el.find(".chat-area").removeClass("hidden"),n.$el.find(".occupants").removeClass("hidden")})},onConfigSaved:function(e){},onErrorConfigSaved:function(e){this.showStatusNotification(q("An error occurred while trying to save the form."))},cancelConfiguration:function(e){e.preventDefault();var n=this;this.$el.find("div.chatroom-form-container").hide(function(){t(this).remove(),n.$el.find(".chat-area").removeClass("hidden"),n.$el.find(".occupants").removeClass("hidden")})},configureChatRoom:function(e){e.preventDefault();if(this.$el.find("div.chatroom-form-container").length)return;this.$(".chatroom-body").children().addClass("hidden"),this.$(".chatroom-body").append(m.templates.chatroom_form()),m.connection.sendIQ(n({to:this.model.get("jid"),type:"get"}).c("query",{xmlns:a.NS.MUC_OWNER}).tree(),this.renderConfigurationForm.bind(this))},submitPassword:function(e){e.preventDefault();var t=this.$el.find(".chatroom-form").find("input[type=password]").val();this.$el.find(".chatroom-form-container").replaceWith('<span class="spinner centered"/>'),this.join(t)},renderPasswordForm:function(){this.$(".chatroom-body").children().hide(),this.$("span.centered.spinner").remove(),this.$(".chatroom-body").append(m.templates.chatroom_password_form({heading:q("This chatroom requires a password"),label_password:q("Password: "),label_submit:q("Submit")})),this.$(".chatroom-form").on("submit",this.submitPassword.bind(this))},showDisconnectMessage:function(e){this.$(".chat-area").hide(),this.$(".occupants").hide(),this.$("span.centered.spinner").remove(),this.$(".chatroom-body").append(t("<p>"+e+"</p>"))},infoMessages:{100:q("This room is not anonymous"),102:q("This room now shows unavailable members"),103:q("This room does not show unavailable members"),104:q("Non-privacy-related room configuration has changed"),170:q("Room logging is now enabled"),171:q("Room logging is now disabled"),172:q("This room is now non-anonymous"),173:q("This room is now semi-anonymous"),174:q("This room is now fully-anonymous"),201:q("A new room has been created")},disconnectMessages:{301:q("You have been banned from this room"),307:q("You have been kicked from this room"),321:q("You have been removed from this room because of an affiliation change"),322:q("You have been removed from this room because the room has changed to members-only and you're not a member"),332:q("You have been removed from this room because the MUC (Multi-user chat) service is being shut down.")},actionInfoMessages:{301:R("<strong>%1$s</strong> has been banned"),303:R("<strong>%1$s</strong>'s nickname has changed"),307:R("<strong>%1$s</strong> has been kicked out"),321:R("<strong>%1$s</strong> has been removed because of an affiliation change"),322:R("<strong>%1$s</strong> has been removed for not being a member")},newNicknameMessages:{210:R("Your nickname has been automatically changed to: <strong>%1$s</strong>"),303:R("Your nickname has been changed to: <strong>%1$s</strong>")},showStatusMessages:function(e,n){var r=t(e),i=[],s=[],o=[];r.find('x[xmlns="'+a.NS.MUC_USER+'"]').each(function(e,u){var l=t(u).find("item");a.getBareJidFromJid(l.attr("jid"))===m.bare_jid&&l.attr("affiliation")==="owner"&&this.$el.find("a.configure-chatroom-button").show(),t(u).find("item reason").each(function(e,n){t(n).text()&&o.push(t(n).text())}),t(u).find("status").each(function(e,o){var u=o.getAttribute("code"),c=a.unescapeNode(a.getResourceFromJid(r.attr("from")));n&&u==="210"?s.push(q(this.newNicknameMessages[u],c)):n&&u==="303"?s.push(q(this.newNicknameMessages[u],l.attr("nick"))):n&&f.contains(f.keys(this.disconnectMessages),u)?i.push(this.disconnectMessages[u]):!n&&f.contains(f.keys(this.actionInfoMessages),u)?s.push(q(this.actionInfoMessages[u],c)):f.contains(f.keys(this.infoMessages),u)?s.push(this.infoMessages[u]):u!=="110"&&t(o).text()&&s.push(t(o).text())}.bind(this))}.bind(this));if(i.length>0){for(w=0;w<i.length;w++)this.showDisconnectMessage(i[w]);for(w=0;w<o.length;w++)this.showDisconnectMessage(q('The reason given is: "'+o[w]+'"'),!0);this.model.set("connection_status",a.Status.DISCONNECTED);return}for(w=0;w<s.length;w++)this.$content.append(m.templates.info({message:s[w]}));for(w=0;w<o.length;w++)this.showStatusNotification(q('The reason given is: "'+o[w]+'"'),!0);return this.scrollDown(),e},showErrorMessage:function(e){e.attr("type")==="auth"?e.find("not-authorized").length?this.renderPasswordForm():e.find("registration-required").length?this.showDisconnectMessage(q("You are not on the member list of this room")):e.find("forbidden").length&&this.showDisconnectMessage(q("You have been banned from this room")):e.attr("type")==="modify"?e.find("jid-malformed").length&&this.showDisconnectMessage(q("No nickname was specified")):e.attr("type")==="cancel"&&(e.find("not-allowed").length?this.showDisconnectMessage(q("You are not allowed to create new rooms")):e.find("not-acceptable").length?this.showDisconnectMessage(q("Your nickname doesn't conform to this room's policies")):e.find("conflict").length?this.showDisconnectMessage(q("Your nickname is already taken")):e.find("item-not-found").length?this.showDisconnectMessage(q("This room does not (yet) exist")):e.find("service-unavailable").length&&this.showDisconnectMessage(q("This room has reached it's maximum number of occupants")))},onChatRoomPresence:function(e){var n=t(e),r,i=this.model.get("nick");n.attr("type")==="error"?(this.model.set("connection_status",a.Status.DISCONNECTED),this.showErrorMessage(n.find("error"))):(r=n.find("status[code='110']").length||n.attr("from")===this.model.get("id")+"/"+a.escapeNode(i),this.model.get("connection_status")!==a.Status.CONNECTED&&this.model.set("connection_status",a.Status.CONNECTED),this.showStatusMessages(e,r)),this.occupantsview.updateOccupantsOnPresence(e)},onChatRoomMessage:function(e){var n=t(e),r=n.find('result[xmlns="'+a.NS.MAM+'"]').attr("id"),i=n.find("delay").length>0,s=n.find("forwarded"),o;s.length&&(n=s.children("message"),o=s.children("delay"),i=o.length>0);var u=n.children("body").text(),f=n.attr("from"),l=n.attr("id"),c=a.getResourceFromJid(f),h=c&&a.unescapeNode(c)||"",p=n.children("subject").text();return l&&this.model.messages.findWhere({msgid:l})?!0:(p&&(this.$el.find(".chatroom-topic").text(p).attr("title",p),this.$content.append(m.templates.info({message:q("Topic set by %1$s to: %2$s",h,p)}))),h===""?!0:(this.model.createMessage(n,o,r),!i&&h!==this.model.get("nick")&&(new RegExp("\\b"+this.model.get("nick")+"\\b")).test(u)&&m.playNotification(),h!==this.model.get("nick")&&m.emit("message",e),!0))}}),this.ChatBoxes=Backbone.Collection.extend({model:m.ChatBox,comparator:"time_opened",registerMessageHandler:function(){m.connection.addHandler(function(e){return this.onMessage(e),!0}.bind(this),null,"message","chat"),m.connection.addHandler(function(e){return this.onInvite(e),!0}.bind(this),"jabber:x:conference","message")},onConnected:function(){this.browserStorage=new Backbone.BrowserStorage[m.storage](h("converse.chatboxes-"+m.bare_jid)),this.registerMessageHandler(),this.fetch({add:!0,success:function(e,t){e.each(function(e){e.get("id")!=="controlbox"&&!e.get("minimized")&&e.trigger("show")}),f.include(f.pluck(t,"id"),"controlbox")||this.add({id:"controlbox",box_id:"controlbox"}),this.get("controlbox").save({connected:!0})}.bind(this)})},isOnlyChatStateNotification:function(e){return e.find("body").length===0&&(e.find(M).length!==0||e.find(D).length!==0||e.find(O).length!==0||e.find(P).length!==0||e.find(H).length!==0)},onInvite:function(e){var n=t(e),r=n.children('x[xmlns="jabber:x:conference"]'),i=a.getBareJidFromJid(n.attr("from")),s=r.attr("jid"),o=r.attr("reason"),u=m.roster.get(i),l;o?l=confirm(q(R('%1$s has invited you to join a chat room: %2$s, and left the following reason: "%3$s"'),u.get("fullname"),s,o)):l=confirm(q(R("%1$s has invited you to join a chat room: %2$s"),u.get("fullname"),s));if(l===!0){var c=m.chatboxviews.showChat({id:s,jid:s,name:a.unescapeNode(a.getNodeFromJid(s)),nick:a.unescapeNode(a.getNodeFromJid(m.connection.jid)),chatroom:!0,box_id:h(s),password:r.attr("password")});f.contains([a.Status.CONNECTING,a.Status.CONNECTED],c.get("connection_status"))||m.chatboxviews.get(s).join(null)}},onMessage:function(e){var n=t(e),r,i,s,o,u,f,l,c,h,p=n.attr("from"),d=n.attr("to"),v=a.getResourceFromJid(d),g=n.find('result[xmlns="'+a.NS.MAM+'"]').attr("id");return v&&v!==m.resource?(m.log("Ignore incoming message intended for a different resource: "+d,"info"),!0):p===m.connection.jid?(m.log("Ignore incoming message sent from this client's JID: "+p,"info"),!0):(i=n.find("forwarded"),i.length&&(n=i.children("message"),s=i.children("delay"),p=n.attr("from"),d=n.attr("to")),o=a.getBareJidFromJid(p),u=a.getResourceFromJid(p),f=o===m.bare_jid,l=n.attr("id"),f?(r=a.getBareJidFromJid(d),h=a.getResourceFromJid(d)):(r=o,h=u),c=this.getChatBox(r,n.find("body").length>0),c?l&&c.messages.findWhere({msgid:l})?!0:(!this.isOnlyChatStateNotification(n)&&!f&&!i.length&&m.playNotification(),c.receiveMessage(n,s,g),m.roster.addResource(r,h),m.emit("message",e),!0):!0)},getChatBox:function(e,t){var n=a.getBareJidFromJid(e),r=this.get(n);if(!r&&t){var i=m.roster.get(n);if(i===undefined){m.log("Could not get roster item for JID "+n,"error");return}r=this.create({id:n,jid:n,fullname:f.isEmpty(i.get("fullname"))?e:i.get("fullname"),image_type:i.get("image_type"),image:i.get("image"),url:i.get("url")})}return r}}),this.ChatBoxViews=Backbone.Overview.extend({initialize:function(){this.model.on("add",this.onChatBoxAdded,this),this.model.on("change:minimized",function(e){e.get("minimized")===!0?this.trimChats():this.trimChats(this.get(e.get("id")))},this)},_ensureElement:function(){if(!this.el){var e=t("#conversejs");e.length||(e=t('<div id="conversejs">'),t("body").append(e)),e.html(m.templates.chats_panel()),this.setElement(e,!1)}else this.setElement(f.result(this,"el"),!1)},onChatBoxAdded:function(e){var t=this.get(e.get("id"));t?(delete t.model,t.model=e,t.initialize()):(e.get("chatroom")?t=new m.ChatRoomView({model:e}):e.get("box_id")==="controlbox"?t=new m.ControlBoxView({model:e}):t=new m.ChatBoxView({model:e}),this.add(e.get("id"),t)),this.trimChats(t)},trimChats:function(e){if(m.no_trimming||this.model.length<=1)return;var n,r=0,i=m.minimized_chats.$el,s=f.contains(this.model.pluck("minimized"),!0)?i.outerWidth(!0):0,o=e?e.$el.outerWidth(!0):0,u=e?e.model.get("id"):null,a=this.get("controlbox");!a||!a.$el.is(":visible")?r=m.controlboxtoggle.$el.outerWidth(!0):r=a.$el.outerWidth(!0),f.each(this.getAll(),function(e){var t=e.model.get("id");t!=="controlbox"&&t!==u&&!e.model.get("minimized")&&e.$el.is(":visible")&&(o+=e.$el.outerWidth(!0))}),s+o+r>t("body").outerWidth(!0)&&(n=this.getOldestMaximizedChat(),n&&n.get("id")!==u&&n.minimize())},getOldestMaximizedChat:function(){var e=0,t=this.model.sort().at(e);while(t.get("id")==="controlbox"||t.get("minimized")===!0){e++,t=this.model.at(e);if(!t)return null}return t},closeAllChatBoxes:function(e){var t=[];return this.model.each(function(n){var r=n.get("id");(e||r!=="controlbox")&&t.push(r)}),t.forEach(function(e){var t=this.get(e);t&&t.close()},this),this},showChat:function(e){var t=this.model.get(e.jid);return t||(t=this.model.create(e,{error:function(e,t){m.log(t.responseText)}})),t.get("minimized")?t.maximize():t.trigger("show"),t}}),this.MinimizedChatBoxView=Backbone.View.extend({tagName:"div",className:"chat-head",events:{"click .close-chatbox-button":"close","click .restore-chat":"restore"},initialize:function(){this.model.messages.on("add",function(e){e.get("message")&&this.updateUnreadMessagesCounter()},this),this.model.on("change:minimized",this.clearUnreadMessagesCounter,this),this.model.on("showReceivedOTRMessage",this.updateUnreadMessagesCounter,this),this.model.on("showSentOTRMessage",this.updateUnreadMessagesCounter,this)},render:function(){var e=f.extend(this.model.toJSON(),{tooltip:q("Click to restore this chat")});return this.model.get("chatroom")?(e.title=this.model.get("name"),this.$el.addClass("chat-head-chatroom")):(e.title=this.model.get("fullname"),this.$el.addClass("chat-head-chatbox")),this.$el.html(m.templates.trimmed_chat(e))},clearUnreadMessagesCounter:function(){this.model.set({num_unread:0}),this.render()},updateUnreadMessagesCounter:function(){this.model.set({num_unread:this.model.get("num_unread")+1}),this.render()},close:function(e){return e&&e.preventDefault&&e.preventDefault(),this.remove(),this.model.destroy(),m.emit("chatBoxClosed",this),this},restore:f.debounce(function(e){e&&e.preventDefault&&e.preventDefault(),this.model.messages.off("add",null,this),this.remove(),this.model.maximize()},200,!0)}),this.MinimizedChats=Backbone.Overview.extend({el:"#minimized-chats",events:{"click #toggle-minimized-chats":"toggle"},initialize:function(){this.initToggle(),this.model.on("add",this.onChanged,this),this.model.on("destroy",this.removeChat,this),this.model.on("change:minimized",this.onChanged,this),this.model.on("change:num_unread",this.updateUnreadMessagesCounter,this)},tearDown:function(){return this.model.off("add",this.onChanged),this.model.off("destroy",this.removeChat),this.model.off("change:minimized",this.onChanged),this.model.off("change:num_unread",this.updateUnreadMessagesCounter),this},initToggle:function(){this.toggleview=new m.MinimizedChatsToggleView({model:new m.MinimizedChatsToggle});var e=h("converse.minchatstoggle"+m.bare_jid);this.toggleview.model.id=e,this.toggleview.model.browserStorage=new Backbone.BrowserStorage[m.storage](e),this.toggleview.model.fetch()},render:function(){return this.keys().length===0?this.$el.hide("fast"):this.keys().length===1&&this.$el.show("fast"),this.$el},toggle:function(e){e&&e.preventDefault&&e.preventDefault(),this.toggleview.model.save({collapsed:!this.toggleview.model.get("collapsed")}),this.$(".minimized-chats-flyout").toggle()},onChanged:function(e){e.get("id")!=="controlbox"&&e.get("minimized")?this.addChat(e):this.get(e.get("id"))&&this.removeChat(e)},addChat:function(e){var t=this.get(e.get("id"));if(t&&t.$el.parent().length!==0)return;var n=new m.MinimizedChatBoxView({model:e});this.$(".minimized-chats-flyout").append(n.render()),this.add(e.get("id"),n),this.toggleview.model.set({num_minimized:this.keys().length}),this.render()},removeChat:function(e){this.remove(e.get("id")),this.toggleview.model.set({num_minimized:this.keys().length}),this.render()},updateUnreadMessagesCounter:function(){var e=this.model.pluck("num_unread"),t=0,n;for(n=0;n<e.length;n++)t+=e[n];this.toggleview.model.set({num_unread:t}),this.render()}}),this.MinimizedChatsToggle=Backbone.Model.extend({initialize:function(){this.set({collapsed:this.get("collapsed")||!1,num_minimized:this.get("num_minimized")||0,num_unread:this.get("num_unread")||0})}}),this.MinimizedChatsToggleView=Backbone.View.extend({el:"#toggle-minimized-chats",initialize:function(){this.model.on("change:num_minimized",this.render,this),this.model.on("change:num_unread",this.render,this),this.$flyout=this.$el.siblings(".minimized-chats-flyout")},render:function(){return this.$el.html(m.templates.toggle_chats(f.extend(this.model.toJSON(),{Minimized:q("Minimized")}))),this.model.get("collapsed")?this.$flyout.hide():this.$flyout.show(),this.$el}}),this.RosterContact=Backbone.Model.extend({initialize:function(e,t){var n=e.jid,r=a.getBareJidFromJid(n),i=a.getResourceFromJid(n);e.jid=r,this.set(f.extend({id:r,jid:r,fullname:r,chat_status:"offline",user_id:a.getNodeFromJid(n),resources:i?[i]:[],groups:[],image_type:"image/png",image:"iVBORw0KGgoAAAANSUhEUgAAAGAAAABgCAIAAABt+uBvAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3gwHCy455JBsggAABkJJREFUeNrtnM1PE1sUwHvvTD8otWLHST/Gimi1CEgr6M6FEWuIBo2pujDVsNDEP8GN/4MbN7oxrlipG2OCgZgYlxAbkRYw1KqkIDRCSkM7nXvvW8x7vjyNeQ9m7p1p3z1LQk/v/Dhz7vkEXL161cHl9wI5Ag6IA+KAOCAOiAPigDggLhwQB2S+iNZ+PcYY/SWEEP2HAAAIoSAIoihCCP+ngDDGtVotGAz29/cfOXJEUZSOjg6n06lp2sbGRqlUWlhYyGazS0tLbrdbEASrzgksyeYJId3d3el0uqenRxRFAAAA4KdfIIRgjD9+/Pj8+fOpqSndslofEIQwHA6Pjo4mEon//qmFhYXHjx8vLi4ihBgDEnp7e9l8E0Jo165dQ0NDd+/eDYVC2/qsJElDQ0OEkKWlpa2tLZamxAhQo9EIBoOjo6MXL17csZLe3l5FUT59+lQul5l5JRaAVFWNRqN37tw5ceKEQVWRSOTw4cOFQuHbt2+iKLYCIISQLMu3b99OJpOmKAwEAgcPHszn8+vr6wzsiG6UQQhxuVyXLl0aGBgwUW0sFstkMl6v90fo1KyAMMYDAwPnzp0zXfPg4GAqlWo0Gk0MiBAiy/L58+edTqf5Aa4onj59OhaLYYybFRCEMBaL0fNxBw4cSCQStN0QRUBut3t4eJjq6U+dOiVJElVPRBFQIBDo6+ujCqirqyscDlONGykC2lYyYSR6pBoQQapHZwAoHo/TuARYAOrs7GQASFEUqn6aIiBJkhgA6ujooFpUo6iaTa7koFwnaoWadLNe81tbWwzoaJrWrICWl5cZAFpbW6OabVAEtLi4yABQsVjUNK0pAWWzWQaAcrlcswKanZ1VVZUqHYRQEwOq1Wpv3ryhCmh6erpcLjdrNl+v1ycnJ+l5UELI27dvv3//3qxxEADgy5cvExMT9Mznw4cPtFtAdAPFarU6Pj5eKpVM17yxsfHy5cvV1VXazXu62gVBKBQKT58+rdVqJqrFGL948eLdu3dU8/g/H4FBUaJYLAqC0NPTY9brMD4+PjY25mDSracOCABACJmZmXE6nUePHjWu8NWrV48ePSKEsGlAs7Agfd5nenq6Wq0mk0kjDzY2NvbkyRMIIbP2PLvhBUEQ8vl8NpuNx+M+n29bzhVjvLKycv/+/YmJCcazQuwA6YzW1tYmJyf1SY+2trZ/rRk1Go1SqfT69esHDx4UCgVmNaa/zZ/9ABUhRFXVYDB48uTJeDweiUQkSfL7/T9MA2NcqVTK5fLy8vL8/PzU1FSxWHS5XJaM4wGr9sUwxqqqer3eUCgkSZJuUBBCfTRvc3OzXC6vrKxUKhWn02nhCJ5lM4oQQo/HgxD6+vXr58+fHf8sDOp+HQDg8XgclorFU676dKLlo6yWRdItIBwQB8QBcUCtfosRQjRNQwhhjPUC4w46WXryBSHU1zgEQWBz99EFhDGu1+t+v//48ePxeFxRlD179ng8nh0Efgiher2+vr6ur3HMzMysrq7uTJVdACGEurq6Ll++nEgkPB7Pj9jPoDHqOxyqqubz+WfPnuVyuV9XPeyeagAAAoHArVu3BgcHab8CuVzu4cOHpVKJUnfA5GweY+xyuc6cOXPv3r1IJMLAR8iyPDw8XK/Xi8Wiqqqmm5KZgBBC7e3tN27cuHbtGuPVpf7+/lAoNDs7W61WzfVKpgHSSzw3b95MpVKW3MfRaDQSiczNzVUqFRMZmQOIEOL1eq9fv3727FlL1t50URRFluX5+flqtWpWEGAOIFEUU6nUlStXLKSjy759+xwOx9zcnKZpphzGHMzhcDiTydgk9r1w4YIp7RPTAAmCkMlk2FeLf/tIEKbTab/fbwtAhJBoNGrutpNx6e7uPnTokC1eMU3T0um0DZPMkZER6wERQnw+n/FFSxpy7Nix3bt3WwwIIcRgIWnHkkwmjecfRgGx7DtuV/r6+iwGhDHev3+/bQF1dnYaH6E2CkiWZdsC2rt3r8WAHA5HW1ubbQGZcjajgOwTH/4qNko1Wlg4IA6IA+KAOKBWBUQIsfNojyliKIoRRfH9+/dut9umf3wzpoUNNQ4BAJubmwz+ic+OxefzWWlBhJD29nbug7iT5sIBcUAcEAfEAXFAHBAHxOVn+QMrmWpuPZx12gAAAABJRU5ErkJggg==",status:""},e)),this.on("destroy",function(){this.removeFromRoster()}.bind(this))},subscribe:function(e){this.save("ask","subscribe");var t=i({to:this.get("jid"),type:"subscribe"});e&&e!==""&&t.c("status").t(e).up();var n=m.xmppstatus.get("fullname");return n&&n!==""&&t.c("nick",{xmlns:a.NS.NICK}).t(n).up(),m.connection.send(t),this},ackSubscribe:function(){m.connection.send(i({type:"subscribe",to:this.get("jid")}))},ackUnsubscribe:function(e){m.connection.send(i({type:"unsubscribe",to:this.get("jid")})),this.destroy()},unauthorize:function(e){return m.rejectPresenceSubscription(this.get("jid"),e),this},authorize:function(e){var t=i({to:this.get("jid"),type:"subscribed"});return e&&e!==""&&t.c("status").t(e),m.connection.send(t),this},removeResource:function(e){var t=this.get("resources"),n;return e&&(n=f.indexOf(t,e),n!==-1&&(t.splice(n,1),this.save({resources:t}))),t.length},removeFromRoster:function(e){var t=n({type:"set"}).c("query",{xmlns:a.NS.ROSTER}).c("item",{jid:this.get("jid"),subscription:"remove"});return m.connection.sendIQ(t,e,e),this},showInRoster:function(){var e=this.get("chat_status");return m.show_only_online_users&&e!=="online"||m.hide_offline_users&&e==="offline"?this.get("ask")==="subscribe"||this.get("subscription")==="from"||this.get("requesting")===!0?!0:!1:!0}}),this.RosterContactView=Backbone.View.extend({tagName:"dd",events:{"click .accept-xmpp-request":"acceptRequest","click .decline-xmpp-request":"declineRequest","click .open-chat":"openChat","click .remove-xmpp-contact":"removeContact"},initialize:function(){this.model.on("change",this.render,this),this.model.on("remove",this.remove,this),this.model.on("destroy",this.remove,this),this.model.on("open",this.openChat,this)},render:function(){if(!this.model.showInRoster())return this.$el.hide(),this;this.$el[0].style.display==="none"&&this.$el.show();var e=this.model,t=e.get("ask"),n=e.get("chat_status"),r=e.get("requesting"),i=e.get("subscription"),s=["current-xmpp-contact","pending-xmpp-contact","requesting-xmpp-contact"].concat(f.keys(W));f.each(s,function(e){this.el.className.indexOf(e)!==-1&&this.$el.removeClass(e)},this),this.$el.addClass(n).data("status",n);if(t==="subscribe"||i==="from")this.$el.addClass("pending-xmpp-contact"),this.$el.html(m.templates.pending_contact(f.extend(e.toJSON(),{desc_remove:q("Click to remove this contact"),allow_chat_pending_contacts:m.allow_chat_pending_contacts})));else if(r===!0)this.$el.addClass("requesting-xmpp-contact"),this.$el.html(m.templates.requesting_contact(f.extend(e.toJSON(),{desc_accept:q("Click to accept this contact request"),desc_decline:q("Click to decline this contact request"),allow_chat_pending_contacts:m.allow_chat_pending_contacts}))),m.controlboxtoggle.showControlBox();else if(i==="both"||i==="to")this.$el.addClass("current-xmpp-contact"),this.$el.removeClass(f.without(["both","to"],i)[0]).addClass(i),this.$el.html(m.templates.roster_item(f.extend(e.toJSON(),{desc_status:W[n||"offline"],desc_chat:q("Click to chat with this contact"),desc_remove:q("Click to remove this contact"),title_fullname:q("Name"),allow_contact_removal:m.allow_contact_removal})));return this},openChat:function(e){return e&&e.preventDefault&&e.preventDefault(),m.chatboxviews.showChat(this.model.attributes)},removeContact:function(e){e&&e.preventDefault&&e.preventDefault();if(!m.allow_contact_removal)return;var t=confirm(q("Are you sure you want to remove this contact?"));if(t===!0){var r=n({type:"set"}).c("query",{xmlns:a.NS.ROSTER}).c("item",{jid:this.model.get("jid"),subscription:"remove"});m.connection.sendIQ(r,function(e){this.model.destroy(),this.remove()}.bind(this),function(e){alert(q("Sorry, there was an error while trying to remove "+name+" as a contact.")),m.log(e)})}},acceptRequest:function(e){e&&e.preventDefault&&e.preventDefault(),m.roster.sendContactAddIQ(this.model.get("jid"),this.model.get("fullname"),[],function(){this.model.authorize().subscribe()}.bind(this))},declineRequest:function(e){e&&e.preventDefault&&e.preventDefault();var t=confirm(q("Are you sure you want to decline this contact request?"));return t===!0&&this.model.unauthorize().destroy(),this}}),this.RosterContacts=Backbone.Collection.extend({model:m.RosterContact,comparator:function(e,t){var n,r,i=e.get("chat_status")||"offline",s=t.get("chat_status")||"offline";return g[i]===g[s]?(n=e.get("fullname").toLowerCase(),r=t.get("fullname").toLowerCase(),n<r?-1:n>r?1:0):g[i]<g[s]?-1:1},subscribeToSuggestedItems:function(e){return t(e).find("item").each(function(e,t){this.getAttribute("action")==="add"&&m.roster.addAndSubscribe(this.getAttribute("jid"),null,m.xmppstatus.get("fullname"))}),!0},isSelf:function(e){return a.getBareJidFromJid(e)===a.getBareJidFromJid(m.connection.jid)},addAndSubscribe:function(e,t,n,r,i){this.addContact(e,t,n,i).done(function(e){e instanceof m.RosterContact&&e.subscribe(r)})},sendContactAddIQ:function(e,t,r,i,s){t=f.isEmpty(t)?e:t;var o=n({type:"set"}).c("query",{xmlns:a.NS.ROSTER}).c("item",{jid:e,name:t});f.map(r,function(e){o.c("group").t(e).up()}),m.connection.sendIQ(o,i,s)},addContact:function(e,n,r,i){var s=new t.Deferred;return r=r||[],n=f.isEmpty(n)?e:n,this.sendContactAddIQ(e,n,r,function(t){var o=this.create(f.extend({ask:undefined,fullname:n,groups:r,jid:e,requesting:!1,subscription:"none"},i),{sort:!1});s.resolve(o)}.bind(this),function(e){alert(q("Sorry, there was an error while trying to add "+n+" as a contact.")),m.log(e),s.resolve(e)}),s.promise()},addResource:function(e,t){var n=this.get(e),r;n&&(r=n.get("resources"),r?f.indexOf(r,t)===-1&&(r.push(t),n.set({resources:r})):n.set({resources:[t]}))},subscribeBack:function(e){var t=this.get(e);t instanceof m.RosterContact?t.authorize().subscribe():this.addContact(e,"",[],{subscription:"from"}).done(function(e){e instanceof m.RosterContact&&e.authorize().subscribe()})},getNumOnlineContacts:function(){var e=0,t=["offline","unavailable"],n=this.models,r=n.length,i;m.show_only_online_users&&(t=f.union(t,["dnd","xa","away"]));for(i=0;i<r;i++)f.indexOf(t,n[i].get("chat_status"))===-1&&e++;return e},onRosterPush:function(e){var r=e.getAttribute("id"),i=e.getAttribute("from");return i&&i!==""&&a.getBareJidFromJid(i)!==m.bare_jid?(m.connection.send(n({type:"error",id:r,from:m.connection.jid}).c("error",{type:"cancel"}).c("service-unavailable",{xmlns:a.NS.ROSTER})),!0):(m.connection.send(n({type:"result",id:r,from:m.connection.jid})),t(e).children("query").find("item").each(function(e,t){this.updateContact(t)}.bind(this)),m.emit("rosterPush",e),!0)},fetchFromServer:function(e,t){var r=n({type:"get",id:m.connection.getUniqueId("roster")}).c("query",{xmlns:a.NS.ROSTER});return m.connection.sendIQ(r,this.onReceivedFromServer.bind(this))},onReceivedFromServer:function(e){m.emit("roster",e),t(e).children("query").find("item").each(function(e,t){this.updateContact(t)}.bind(this)),m.initial_presence_sent||(m.initial_presence_sent=1,m.xmppstatus.sendPresence())},updateContact:function(e){var n=e.getAttribute("jid");if(this.isSelf(n))return;var r=[],i=this.get(n),s=e.getAttribute("ask"),o=e.getAttribute("subscription");t.map(e.getElementsByTagName("group"),function(e){r.push(a.getText(e))});if(!i){if(o==="none"&&s===null||o==="remove")return;this.create({ask:s,fullname:e.getAttribute("name")||n,groups:r,jid:n,subscription:o},{sort:!1})}else{if(o==="remove")return i.destroy();i.save({subscription:o,ask:s,requesting:null,groups:r})}},createContactFromVCard:function(e,t,n,r,i,s){var o=a.getBareJidFromJid(t);this.create({jid:o,subscription:"none",ask:null,requesting:!0,fullname:n||o,image:r,image_type:i,url:s,vcard_updated:l().format()})},handleIncomingSubscription:function(e){var t=a.getBareJidFromJid(e),n=this.get(t);m.allow_contact_requests||m.rejectPresenceSubscription(e,q("This client does not allow presence subscriptions")),m.auto_subscribe?!n||n.get("subscription")!=="to"?this.subscribeBack(t):n.authorize():n?n.get("subscription")!=="none"?n.authorize():n.get("ask")==="subscribe"&&n.authorize():n||m.getVCard(t,this.createContactFromVCard.bind(this),function(e,t){m.log("Error while retrieving vcard for "+t),this.createContactFromVCard.call(this,e,t)}.bind(this))},presenceHandler:function(e){var n=t(e),r=e.getAttribute("type");if(r==="error")return!0;var i=e.getAttribute("from"),s=a.getBareJidFromJid(i),o=a.getResourceFromJid(i),u=n.find("show").text()||"online",f=n.find("status"),l=this.get(s);if(this.isSelf(s)){m.connection.jid!==i&&r!=="unavailable"&&(m.xmppstatus.save({status:u}),f.length&&m.xmppstatus.save({status_message:f.text()}));return}if((n.find("x").attr("xmlns")||"").indexOf(a.NS.MUC)===0)return;l&&f.text()!==l.get("status")&&l.save({status:f.text()});if(r==="subscribed"&&l)l.ackSubscribe();else if(r==="unsubscribed"&&l)l.ackUnsubscribe();else{if(r==="unsubscribe")return;r==="subscribe"?this.handleIncomingSubscription(i):r==="unavailable"&&l?l.removeResource(o)===0&&l.save({chat_status:"offline"}):l&&(this.addResource(s,o),l.save({chat_status:u}))}}}),this.RosterGroup=Backbone.Model.extend({initialize:function(e,t){this.set(f.extend({description:X,state:F},e)),this.contacts=new m.RosterContacts}}),this.RosterGroupView=Backbone.Overview.extend({tagName:"dt",className:"roster-group",events:{"click a.group-toggle":"toggle"},initialize:function(){this.model.contacts.on("add",this.addContact,this),this.model.contacts.on("change:subscription",this.onContactSubscriptionChange,this),this.model.contacts.on("change:requesting",this.onContactRequestChange,this),this.model.contacts.on("change:chat_status",function(e){this.model.contacts.sort(),this.positionContact(e).render()},this),this.model.contacts.on("destroy",this.onRemove,this),this.model.contacts.on("remove",this.onRemove,this),m.roster.on("change:groups",this.onContactGroupChange,this)},render:function(){return this.$el.attr("data-group",this.model.get("name")),this.$el.html(t(m.templates.group_header({label_group:this.model.get("name"),desc_group_toggle:this.model.get("description"),toggle_state:this.model.get("state")}))),this},addContact:function(e){var t=new m.RosterContactView({model:e});this.add(e.get("id"),t),t=this.positionContact(e).render(),e.showInRoster()&&(this.model.get("state")===I?(t.$el[0].style.display!=="none"&&t.$el.hide(),this.$el.is(":visible")||this.$el.show()):this.$el[0].style.display!=="block"&&this.show())},positionContact:function(e){var t=this.get(e.get("id")),n=this.model.contacts.indexOf(e);return t.$el.detach(),n===0?this.$el.after(t.$el):n===this.model.contacts.length-1?this.$el.nextUntil("dt").last().after(t.$el):this.$el.nextUntil("dt").eq(n).before(t.$el),t},show:function(){this.$el.show(),f.each(this.getAll(),function(e){e.model.showInRoster()&&e.$el.show()})},hide:function(){this.$el.nextUntil("dt").addBack().hide()},filter:function(e){var t;e.length===0?(this.model.get("state")===F&&this.model.contacts.each(function(e){e.showInRoster()&&this.get(e.get("id")).$el.show()}.bind(this)),this.showIfNecessary()):(e=e.toLowerCase(),t=this.model.contacts.filter(p.not("fullname",e)),t.length===this.model.contacts.length?this.hide():(f.each(t,function(e){this.get(e.get("id")).$el.hide()}.bind(this)),f.each(this.model.contacts.reject(p.not("fullname",e)),function(e){this.get(e.get("id")).$el.show()}.bind(this)),this.showIfNecessary()))},showIfNecessary:function(){!this.$el.is(":visible")&&this.model.contacts.length>0&&this.$el.show()},toggle:function(e){e&&e.preventDefault&&e.preventDefault();var n=t(e.target);n.hasClass("icon-opened")?(this.$el.nextUntil("dt").slideUp(),this.model.save({state:I}),n.removeClass("icon-opened").addClass("icon-closed")):(n.removeClass("icon-closed").addClass("icon-opened"),this.model.save({state:F}),this.filter(m.rosterview.$(".roster-filter").val(),m.rosterview.$(".filter-type").val()))},onContactGroupChange:function(e){var t=f.contains(e.get("groups"),this.model.get("name")),n=e.get("id"),r=!this.get(n);t&&!r?this.model.contacts.remove(n):!t&&r&&this.addContact(e)},onContactSubscriptionChange:function(e){this.model.get("name")===J&&e.get("subscription")!=="from"&&this.model.contacts.remove(e.get("id"))},onContactRequestChange:function(e){this.model.get("name")===K&&!e.get("requesting")&&this.model.contacts.remove(e.get("id"))},onRemove:function(e){this.remove(e.get("id")),this.model.contacts.length===0&&this.$el.hide()}}),this.RosterGroups=Backbone.Collection.extend({model:m.RosterGroup,comparator:function(e,t){e=e.get("name"),t=t.get("name");var n=f.keys(Z),r=f.contains(n,e),i=f.contains(n,t);if(!r&&!i)return e.toLowerCase()<t.toLowerCase()?-1:e.toLowerCase()>t.toLowerCase()?1:0;if(r&&i)return Z[e]<Z[t]?-1:Z[e]>Z[t]?1:0;if(!r&&i)return t===V?1:-1;if(r&&!i)return e===V?-1:1}}),this.RosterView=Backbone.Overview.extend({tagName:"div",id:"converse-roster",events:{"keydown .roster-filter":"liveFilter","click .onX":"clearFilter","mousemove .x":"togglePointer","change .filter-type":"changeFilterType"},initialize:function(){this.roster_handler_ref=this.registerRosterHandler(),this.rosterx_handler_ref=this.registerRosterXHandler(),this.presence_ref=this.registerPresenceHandler(),m.roster.on("add",this.onContactAdd,this),m.roster.on("change",this.onContactChange,this),m.roster.on("destroy",this.update,this),m.roster.on("remove",this.update,this),this.model.on("add",this.onGroupAdd,this),this.model.on("reset",this.reset,this),this.$roster=t('<dl class="roster-contacts" style="display: none;"></dl>')},unregisterHandlers:function(){m.connection.deleteHandler(this.roster_handler_ref),delete this.roster_handler_ref,m.connection.deleteHandler(this.rosterx_handler_ref),delete this.rosterx_handler_ref,m.connection.deleteHandler(this.presence_ref),delete this.presence_ref},update:f.debounce(function(){var e=t("#online-count");return e.text("("+m.roster.getNumOnlineContacts()+")"),e.is(":visible")||e.show(),this.$roster.parent().length===0&&this.$el.append(this.$roster.show()),this.showHideFilter()},m.animate?100:0),render:function(){return this.$el.html(m.templates.roster({placeholder:q("Type to filter"),label_contacts:G,label_groups:Y})),m.allow_contact_requests||this.$el.addClass("no-contact-requests"),this},fetch:function(){return this.model.fetch({silent:!0,success:function(e,t,n){e.length!==0&&this.positionFetchedGroups(e,t,n),m.roster.fetch({add:!0,success:function(e){e.length>0?m.initial_presence_sent=1:m.roster.fetchFromServer()}})}.bind(this)}),this},changeFilterType:function(e){e&&e.preventDefault&&e.preventDefault(),this.clearFilter(),this.filter(this.$(".roster-filter").val(),e.target.value)},tog:function(e){return e?"addClass":"removeClass"},togglePointer:function(e){e&&e.preventDefault&&e.preventDefault();var n=e.target;t(n)[this.tog(n.offsetWidth-18<e.clientX-n.getBoundingClientRect().left)]("onX")},filter:function(e,t){e=e.toLowerCase(),t==="groups"?f.each(this.getAll(),function(t,n){t.model.get("name").toLowerCase().indexOf(e.toLowerCase())===-1?t.hide():t.model.contacts.length>0&&t.show()}):f.each(this.getAll(),function(n){n.filter(e,t)})},liveFilter:f.debounce(function(e){e&&e.preventDefault&&e.preventDefault();var t=this.$(".roster-filter"),n=t.val(),r=this.$(".filter-type").val();t[this.tog(n)]("x"),this.filter(n,r)},300),clearFilter:function(e){e&&e.preventDefault&&(e.preventDefault(),t(e.target).removeClass("x onX").val("")),this.filter("")},showHideFilter:function(){if(!this.$el.is(":visible"))return;var e=this.$(".roster-filter"),t=this.$(".filter-type"),n=e.is(":visible");if(n&&e.val().length>0)return;return this.$roster.hasScrollBar()?n||(e.show(),t.show()):(e.hide(),t.hide()),this},reset:function(){return m.roster.reset(),this.removeAll(),this.$roster=t('<dl class="roster-contacts" style="display: none;"></dl>'),this.render().update(),this},registerRosterHandler:function(){m.connection.addHandler(m.roster.onRosterPush.bind(m.roster),a.NS.ROSTER,"iq","set")},registerRosterXHandler:function(){var e=0;m.connection.addHandler(function(n){return window.setTimeout(function(){m.connection.flush(),m.roster.subscribeToSuggestedItems.bind(m.roster)(n)},e),e+=t(n).find("item").length*250,!0},a.NS.ROSTERX,"message",null)},registerPresenceHandler:function(){m.connection.addHandler(function(e){return m.roster.presenceHandler(e),!0}.bind(this),null,"presence",null)},onGroupAdd:function(e){var t=new m.RosterGroupView({model:e});this.add(e.get("name"),t.render()),this.positionGroup(t)},onContactAdd:function(e){this.addRosterContact(e).update(),e.get("vcard_updated")||m.getVCard(e.get("jid"))},onContactChange:function(e){this.updateChatBox(e).update(),f.has(e.changed,"subscription")&&(e.changed.subscription==="from"?this.addContactToGroup(e,J):f.contains(["both","to"],e.get("subscription"))&&this.addExistingContact(e)),f.has(e.changed,"ask")&&e.changed.ask==="subscribe"&&this.addContactToGroup(e,J),f.has(e.changed,"subscription")&&e.changed.requesting==="true"&&this.addContactToGroup(e,K),this.liveFilter()},updateChatBox:function(e){var t=m.chatboxes.get(e.get("jid")),n={};return t?(f.has(e.changed,"chat_status")&&(n.chat_status=e.get("chat_status")),f.has(e.changed,"status")&&(n.status=e.get("status")),t.save(n),this):this},positionFetchedGroups:function(e,t,n){e.sort(),e.each(function(e,t){var n=this.get(e.get("name"));n||(n=new m.RosterGroupView({model:e}),this.add(e.get("name"),n.render())),t===0?this.$roster.append(n.$el):this.appendGroup(n)}.bind(this))},positionGroup:function(e){var n=this.$roster.find(".roster-group"),r=n.length?this.model.indexOf(e.model):0;return r===0?this.$roster.prepend(e.$el):r===this.model.length-1?this.appendGroup(e):t(n.eq(r)).before(e.$el),this},appendGroup:function(e){var t=this.$roster.find(".roster-group").last(),n=t.siblings("dd");return n.length>0?n.last().after(e.$el):t.after(e.$el),this},getGroup:function(e){var t=this.get(e);return t?t.model:this.model.create({name:e,id:h(e)})},addContactToGroup:function(e,t){this.getGroup(t).contacts.add(e)},addExistingContact:function(e){var t;m.roster_groups?(t=e.get("groups"),t.length===0&&(t=[Q])):t=[V],f.each(t,f.bind(this.addContactToGroup,this,e))},addRosterContact:function(e){return e.get("subscription")==="both"||e.get("subscription")==="to"?this.addExistingContact(e):e.get("ask")==="subscribe"||e.get("subscription")==="from"?this.addContactToGroup(e,J):e.get("requesting")===!0&&this.addContactToGroup(e,K),this}}),this.XMPPStatus=Backbone.Model.extend({initialize:function(){this.set({status:this.getStatus()}),this.on("change",function(e){this.get("fullname")===undefined&&m.getVCard(null,function(e,t,n,r,i,s){this.save({fullname:n})}.bind(this)),f.has(e.changed,"status")&&m.emit("statusChanged",this.get("status")),f.has(e.changed,"status_message")&&m.emit("statusMessageChanged",this.get("status_message"))}.bind(this))},constructPresence:function(e,t){typeof e=="undefined"&&(e=this.get("status")||"online"),typeof t=="undefined"&&(t=this.get("status_message"));var n;return e==="unavailable"||e==="probe"||e==="error"||e==="unsubscribe"||e==="unsubscribed"||e==="subscribe"||e==="subscribed"?n=i({type:e}):e==="offline"?(n=i({type:"unavailable"}),t&&n.c("show").t(e)):(e==="online"?n=i():n=i().c("show").t(e).up(),t&&n.c("status").t(t)),n},sendPresence:function(e,t){m.connection.send(this.constructPresence(e,t))},setStatus:function(e){this.sendPresence(e),this.save({status:e})},getStatus:function(){return this.get("status")||"online"},setStatusMessage:function(e){this.sendPresence(this.getStatus(),e);var n=this.get("status_message");this.save({status_message:e}),this.xhr_custom_status&&t.ajax({url:this.xhr_custom_status_url,type:"POST",data:{msg:e}}),n===e&&this.trigger("update-status-ui",this)}}),this.XMPPStatusView=Backbone.View.extend({el:"span#xmpp-status-holder",events:{"click a.choose-xmpp-status":"toggleOptions","click #fancy-xmpp-status-select a.change-xmpp-status-message":"renderStatusChangeForm","submit #set-custom-xmpp-status":"setStatusMessage","click .dropdown dd ul li a":"setStatus"},initialize:function(){this.model.on("change:status",this.updateStatusUI,this),this.model.on("change:status_message",this.updateStatusUI,this),this.model.on("update-status-ui",this.updateStatusUI,this)},render:function(){var e=this.$el.find("select#select-xmpp-status"),n=this.model.get("status")||"offline",r=t("option",e),i,s=[];return this.$el.html(m.templates.choose_status()),this.$el.find("#fancy-xmpp-status-select").html(m.templates.chat_status({status_message:this.model.get("status_message")||q("I am %1$s",this.getPrettyStatus(n)),chat_status:n,desc_custom_status:q("Click here to write a custom status message"),desc_change_status:q("Click to change your chat status")})),r.each(function(){s.push(m.templates.status_option({value:t(this).val(),text:this.text}))}),i=this.$el.find("#target dd ul").hide(),i.append(s.join("")),e.remove(),this},toggleOptions:function(e){e.preventDefault(),t(e.target).parent().parent().siblings("dd").find("ul").toggle("fast")},renderStatusChangeForm:function(e){e.preventDefault();var t=this.model.get("status")||"offline",n=m.templates.change_status_message({status_message:t,label_custom_status:q("Custom status"),label_save:q("Save")}),r=this.$el.find(".xmpp-status");r.parent().addClass("no-border"),r.replaceWith(n),this.$el.find(".custom-xmpp-status").focus().focus()},setStatusMessage:function(e){e.preventDefault(),this.model.setStatusMessage(t(e.target).find("input").val())},setStatus:function(e){e.preventDefault();var n=t(e.target),r=n.attr("data-value");r==="logout"?(this.$el.find(".dropdown dd ul").hide(),m.logOut()):(this.model.setStatus(r),this.$el.find(".dropdown dd ul").hide())},getPrettyStatus:function(e){return e==="chat"?q("online"):e==="dnd"?q("busy"):e==="xa"?q("away for long"):e==="away"?q("away"):e==="offline"?q("offline"):q(e)||q("online")},updateStatusUI:function(e){var t=e.get("status"),n=e.get("status_message")||q("I am %1$s",this.getPrettyStatus(t));this.$el.find("#fancy-xmpp-status-select").removeClass("no-border").html(m.templates.chat_status({chat_status:t,status_message:n,desc_custom_status:q("Click here to write a custom status message"),desc_change_status:q("Click to change your chat status")}))}}),this.Session=Backbone.Model,this.Feature=Backbone.Model,this.Features=Backbone.Collection.extend({model:m.Feature,initialize:function(){this.addClientIdentities().addClientFeatures(),this.browserStorage=new Backbone.BrowserStorage[m.storage](h("converse.features"+m.bare_jid)),this.on("add",this.onFeatureAdded,this),this.browserStorage.records.length===0?(m.connection.disco.info(m.domain,null,this.onInfo.bind(this)),m.connection.disco.items(m.domain,null,this.onItems.bind(this))):this.fetch({add:!0})},onFeatureAdded:function(e){var t=e.get("preferences")||{};m.emit("serviceDiscovered",e),e.get("var")===a.NS.MAM&&t["default"]!==m.message_archiving&&m.connection.sendIQ(n({type:"get"}).c("prefs",{xmlns:a.NS.MAM}),f.bind(this.onMAMPreferences,this,e),f.bind(this.onMAMError,this,e))},onMAMPreferences:function(e,r){var i=t(r).find('prefs[xmlns="'+a.NS.MAM+'"]'),s=i.attr("default"),o;s!==m.message_archiving?(o=n({type:"set"}).c("prefs",{xmlns:a.NS.MAM,"default":m.message_archiving}),i.children().each(function(e,t){o.cnode(t).up()}),m.connection.sendIQ(o,f.bind(function(e,t){e.save({preferences:{"default":m.message_archiving}})},this,e),f.bind(this.onMAMError,this,e))):e.save({preferences:{"default":m.message_archiving}})},onMAMError:function(e){t(e).find("feature-not-implemented").length?m.log("Message Archive Management (XEP-0313) not supported by this browser"):(m.log("An error occured while trying to set archiving preferences."),m.log(e))},addClientIdentities:function(){return m.connection.disco.addIdentity("client","web","Converse.js"),this},addClientFeatures:function(){return m.connection.disco.addFeature("jabber:x:conference"),m.connection.disco.addFeature(a.NS.BOSH),m.connection.disco.addFeature(a.NS.CHATSTATES),m.connection.disco.addFeature(a.NS.DISCO_INFO),m.connection.disco.addFeature(a.NS.MAM),m.connection.disco.addFeature(a.NS.ROSTERX),m.use_vcards&&m.connection.disco.addFeature(a.NS.VCARD),m.allow_muc&&m.connection.disco.addFeature(a.NS.MUC),m.message_carbons&&m.connection.disco.addFeature(a.NS.CARBONS),this},onItems:function(e){t(e).find("query item").each(function(e,n){m.connection.disco.info(t(n).attr("jid"),null,this.onInfo.bind(this))}.bind(this))},onInfo:function(e){var n=t(e);if(n.find("identity[category=server][type=im]").length===0&&n.find("identity[category=conference][type=text]").length===0)return;n.find("feature").each(function(e,r){var i=t(r).attr("var");this[i]=!0,this.create({"var":i,from:n.attr("from")})}.bind(this))}}),this.RegisterPanel=Backbone.View.extend({tagName:"div",id:"register",className:"controlbox-pane",events:{"submit form#converse-register":"onProviderChosen"},initialize:function(e){this.reset(),this.$parent=e.$parent,this.$tabs=e.$parent.parent().find("#controlbox-tabs"),this.registerHooks()},render:function(){return this.$parent.append(this.$el.html(m.templates.register_panel({label_domain:q("Your XMPP provider's domain name:"),label_register:q("Fetch registration form"),help_providers:q("Tip: A list of public XMPP providers is available"),help_providers_link:q("here"),href_providers:m.providers_link,domain_placeholder:m.domain_placeholder}))),this.$tabs.append(m.templates.register_tab({label_register:q("Register")})),this},registerHooks:function(){var e=m.connection,t=e._connect_cb.bind(e);e._connect_cb=function(e,n,r){this._registering?this.getRegistrationFields(e,n,r)&&(this._registering=!1):t(e,n,r)}.bind(this)},getRegistrationFields:function(e,t,r){m.log("sendQueryStanza was called");var i=m.connection;i.connected=!0;var s=i._proto._reqToData(e);if(!s)return;if(i._proto._connect_cb(s)===a.Status.CONNFAIL)return!1;var o=s.getElementsByTagName("register"),u=s.getElementsByTagName("mechanism");return o.length===0&&u.length===0?(i._proto._no_auth_received(t),!1):o.length===0?(i._changeConnectStatus(a.Status.REGIFAIL,q("Sorry, the given provider does not support in band account registration. Please try with a different provider.")),!0):(i._addSysHandler(this.onRegistrationFields.bind(this),null,"iq",null,null),i.send(n({type:"get"}).c("query",{xmlns:a.NS.REGISTER}).tree()),!0)},onRegistrationFields:function(e){return e.getElementsByTagName("query").length!==1?(m.connection._changeConnectStatus(a.Status.REGIFAIL,"unknown"),!1):(this.setFields(e),this.renderRegistrationForm(e),!1)},reset:function(e){var t={fields:{},urls:[],title:"",instructions:"",registered:!1,_registering:!1,domain:null,form_type:null};f.extend(this,t),e&&f.extend(this,f.pick(e,Object.keys(t)))},onProviderChosen:function(e){e&&e.preventDefault&&e.preventDefault();var n=t(e.target),r=n.find("input[name=domain]"),i=r.val();if(!i){r.addClass("error");return}return n.find("input[type=submit]").hide().after(m.templates.registration_request({cancel:q("Cancel"),info_message:q("Requesting a registration form from the XMPP server")})),n.find("button.cancel").on("click",this.cancelRegistration.bind(this)),this.reset({domain:a.getDomainFromJid(i),_registering:!0}),m.connection.connect(this.domain,"",this.onRegistering.bind(this)),!1},giveFeedback:function(e,n){this.$(".reg-feedback").attr("class","reg-feedback").text(e),n&&t(".reg-feedback").addClass(n)},onRegistering:function(e,n){var r;m.log("onRegistering"),f.contains([a.Status.DISCONNECTED,a.Status.CONNFAIL,a.Status.REGIFAIL,a.Status.NOTACCEPTABLE,a.Status.CONFLICT],e)?(m.log("Problem during registration: Strophe.Status is: "+e),this.cancelRegistration(),n?this.giveFeedback(n,"error"):this.giveFeedback(q('Something went wrong while establishing a connection with "%1$s". Are you sure it exists?',this.domain),"error")):e===a.Status.REGISTERED&&(m.log("Registered successfully."),m.connection.reset(),r=this,this.$("form").hide(function(){t(this).replaceWith('<span class="spinner centered"/>'),r.fields.password&&r.fields.username?(m.connection.connect(r.fields.username.toLowerCase()+"@"+r.domain.toLowerCase(),r.fields.password,m.onConnectStatusChanged),m.chatboxviews.get("controlbox").switchTab({target:r.$tabs.find(".current")}).giveFeedback(q("Now logging you in"))):m.chatboxviews.get("controlbox").renderLoginPanel().giveFeedback(q("Registered successfully")),r.reset()}))},renderRegistrationForm:function(n){var r=this.$("form"),i=t(n),s,o;r.empty().append(m.templates.registration_form({domain:this.domain,title:this.title,instructions:this.instructions})),this.form_type==="xform"?(s=i.find("field"),f.each(s,function(e){r.append(c.xForm2webForm.bind(this,t(e),i))}.bind(this))):(f.each(Object.keys(this.fields),function(n){n==="username"?o=e.form_username({domain:" @"+this.domain,name:n,type:"text",label:n,value:"",required:1}):(r.append("<label>"+n+"</label>"),o=t('<input placeholder="'+n+'" name="'+n+'"></input>'),(n==="password"||n==="email")&&o.attr("type",n)),r.append(o)}.bind(this)),f.each(this.urls,function(e){r.append(t('<a target="blank"></a>').attr("href",e).text(e))}.bind(this))),this.fields?(r.append('<input type="submit" class="pure-button button-primary" value="'+q("Register")+'"/>'),r.on("submit",this.submitRegistrationForm.bind(this)),r.append('<input type="button" class="pure-button button-cancel" value="'+q("Cancel")+'"/>'),r.find("input[type=button]").on("click",this.cancelRegistration.bind(this))):(r.append('<input type="button" class="submit" value="'+q("Return")+'"/>'),r.find("input[type=button]").on("click",this.cancelRegistration.bind(this)))},reportErrors:function(e){var n=this.$("form"),r,i=t(e).find("error text"),s=n.find(".form-errors");s.length?s.empty():(r='<legend class="form-errors"></legend>',n.find("p.instructions").length?n.find("p.instructions").append(r):n.prepend(r),s=n.find(".form-errors")),i.each(function(e,n){s.append(t("<p>").text(t(n).text()))}),i.length||s.append(t("<p>").text(q("The provider rejected your registration attempt. Please check the values you entered for correctness."))),s.show()},cancelRegistration:function(e){e&&e.preventDefault&&e.preventDefault(),m.connection.reset(),this.render()},submitRegistrationForm:function(e){e&&e.preventDefault&&e.preventDefault();var r=this.$("input.required:emptyVal");if(r.length){r.addClass("error");return}var i=t(e.target).find(":input:not([type=button]):not([type=submit])"),s=n({type:"set"}).c("query",{xmlns:a.NS.REGISTER});this.form_type==="xform"?(s.c("x",{xmlns:a.NS.XFORM,type:"submit"}),i.each(function(){s.cnode(c.webForm2xForm(this)).up()})):i.each(function(){var e=t(this);s.c(e.attr("name"),{},e.val())}),m.connection._addSysHandler(this._onRegisterIQ.bind(this),null,"iq",null,null),m.connection.send(s),this.setFields(s.tree())},setFields:function(e){var n=t(e).find("query"),r;n.length>0&&(r=n.find('x[xmlns="'+a.NS.XFORM+'"]'),r.length>0?this._setFieldsFromXForm(r):this._setFieldsFromLegacy(n))},_setFieldsFromLegacy:function(e){e.children().each(function(e,n){var r=t(n);if(n.tagName.toLowerCase()==="instructions"){this.instructions=a.getText(n);return}if(n.tagName.toLowerCase()==="x"){r.attr("xmlns")==="jabber:x:oob"&&r.find("url").each(function(e,n){this.urls.push(t(n).text())}.bind(this));return}this.fields[n.tagName.toLowerCase()]=a.getText(n)}.bind(this)),this.form_type="legacy"},_setFieldsFromXForm:function(e){this.title=e.find("title").text(),this.instructions=e.find("instructions").text(),e.find("field").each(function(e,n){var r=n.getAttribute("var");r?this.fields[r.toLowerCase()]=t(n).children("value").text():m.log("WARNING: Found field we couldn't parse")}.bind(this)),this.form_type="xform"},_onRegisterIQ:function(e){var t=null,n=e.getElementsByTagName("query");n.length>0&&(n=n[0]);if(e.getAttribute("type")==="error"){m.log("Registration failed."),t=e.getElementsByTagName("error");if(t.length!==1)return m.connection._changeConnectStatus(a.Status.REGIFAIL,"unknown"),!1;t=t[0].firstChild.tagName.toLowerCase(),t==="conflict"?m.connection._changeConnectStatus(a.Status.CONFLICT,t):t==="not-acceptable"?m.connection._changeConnectStatus(a.Status.NOTACCEPTABLE,t):m.connection._changeConnectStatus(a.Status.REGIFAIL,t),this.reportErrors(e)}else m.connection._changeConnectStatus(a.Status.REGISTERED,null);return!1},remove:function(){this.$tabs.empty(),this.$el.parent().empty()}}),this.LoginPanel=Backbone.View.extend({tagName:"div",id:"login-dialog",className:"controlbox-pane",events:{"submit form#converse-login":"authenticate"},initialize:function(e){e.$parent.html(this.$el.html(m.templates.login_panel({LOGIN:E,ANONYMOUS:S,PREBIND:x,auto_login:m.auto_login,authentication:m.authentication,label_username:q("XMPP Username:"),label_password:q("Password:"),label_anon_login:q("Click here to log in anonymously"),label_login:q("Log In"),placeholder_username:q("user@server"),placeholder_password:q("password")}))),this.$tabs=e.$parent.parent().find("#controlbox-tabs")},render:function(){return this.$tabs.append(m.templates.login_tab({label_sign_in:q("Sign in")})),this.$el.find("input#jid").focus(),this.$el.is(":visible")||this.$el.show(),this},authenticate:function(e){e&&e.preventDefault&&e.preventDefault();var n=t(e.target);if(m.authentication===S){this.connect(n,m.jid,null);return}var r=n.find("input[name=jid]"),i=r.val(),s=n.find("input[name=password]"),o=s.val(),u=!1;i||(u=!0,r.addClass("error")),o||(u=!0,s.addClass("error"));if(u)return;return this.connect(n,i,o),!1},connect:function(e,t,n){var r;e&&e.find("input[type=submit]").hide().after('<span class="spinner login-submit"/>'),t&&(r=a.getResourceFromJid(t),r?t=a.getBareJidFromJid(t).toLowerCase()+"/"+a.getResourceFromJid(t):t=t.toLowerCase()+"/converse.js-"+Math.floor(Math.random()*139749825).toString()),m.connection.connect(t,n,m.onConnectStatusChanged)},remove:function(){this.$tabs.empty(),this.$el.parent().empty()}}),this.ControlBoxToggle=Backbone.View.extend({tagName:"a",className:"toggle-controlbox",id:"toggle-controlbox",events:{click:"onClick"},attributes:{href:"#"},initialize:function(){this.render()},render:function(){return t("#conversejs").prepend(this.$el.html(m.templates.controlbox_toggle({label_toggle:q("Toggle chat")}))),this.$el.hide(),this},hide:function(e){this.$el.fadeOut("fast",e)},show:function(e){this.$el.show("fast",e)},showControlBox:function(){var e=m.chatboxes.get("controlbox");e||(e=m.addControlBox()),m.connection.connected?e.save({closed:!1}):e.trigger("show")},onClick:function(e){e.preventDefault();if(t("div#controlbox").is(":visible")){var n=m.chatboxes.get("controlbox");m.connection.connected?n.save({closed:!0}):n.trigger("hide")}else this.showControlBox()}}),this.addControlBox=function(){return this.chatboxes.add({id:"controlbox",box_id:"controlbox",closed:!this.show_controlbox_by_default})},this.setUpXMLLogging=function(){this.debug&&(this.connection.xmlInput=function(e){m.log(e)},this.connection.xmlOutput=function(e){m.log(e)})},this.startNewBOSHSession=function(){t.ajax({url:this.prebind_url,type:"GET",success:function(e){this.connection.attach(e.jid,e.sid,e.rid,this.onConnectStatusChanged)}.bind(this),error:function(e){delete this.connection,this.emit("noResumeableSession")}.bind(this)})},this.attemptPreboundSession=function(e){if(!this.keepalive){if(this.jid&&this.sid&&this.rid)return this.connection.attach(this.jid,this.sid,this.rid,this.onConnectStatusChanged);throw new Error("initConnection: If you use prebind and not keepalive, then you MUST supply JID, RID and SID values")}if(!this.jid)throw new Error("initConnection: when using 'keepalive' with 'prebind, you must supply the JID of the current user.");try{return this.connection.restore(this.jid,this.onConnectStatusChanged)}catch(t){m.log("Could not restore session for jid: "+this.jid+" Error message: "+t.message)}this.prebind_url?this.startNewBOSHSession():(delete this.connection,this.emit("noResumeableSession"))},this.attemptNonPreboundSession=function(){if(this.keepalive)try{return this.connection.restore(undefined,this.onConnectStatusChanged)}catch(e){m.log("Could not restore sessions. Error message: "+e.message)}if(this.auto_login){if(!this.jid)throw new Error("initConnection: If you use auto_login, you also need to provide a jid value");if(this.authentication===S)this.connection.connect(this.jid.toLowerCase(),null,this.onConnectStatusChanged);else if(this.authentication===E){if(!this.password)throw new Error("initConnection: If you use auto_login and authentication='login' then you also need to provide a password.");this.jid=a.getBareJidFromJid(this.jid).toLowerCase()+"/"+a.getResourceFromJid(this.jid),this.connection.connect(this.jid,this.password,this.onConnectStatusChanged)}}},this.initConnection=function(){if(this.connection&&this.connection.connected)this.setUpXMLLogging(),this.onConnected();else{if(!this.bosh_service_url&&!this.websocket_url)throw new Error("initConnection: you must supply a value for either the bosh_service_url or websocket_url or both.");if(("WebSocket"in window||"MozWebSocket"in window)&&this.websocket_url)this.connection=new a.Connection(this.websocket_url);else{if(!this.bosh_service_url)throw new Error("initConnection: this browser does not support websockets and bosh_service_url wasn't specified.");this.connection=new a.Connection(this.bosh_service_url,{keepalive:this.keepalive})}this.setUpXMLLogging(),this.authentication===x?this.attemptPreboundSession():this.attemptNonPreboundSession()}},this._tearDown=function(){return this.initial_presence_sent=!1,this.roster&&this.roster.off().reset(),this.rosterview&&(this.rosterview.unregisterHandlers(),this.rosterview.model.off().reset(),this.rosterview.undelegateEvents().remove()),this.chatboxes.remove(),this.features&&this.features.reset(),this.minimized_chats&&(this.minimized_chats.undelegateEvents().model.reset(),this.minimized_chats.removeAll(),this.minimized_chats.tearDown().remove(),delete this.minimized_chats),this},this._initialize=function(){return this.chatboxes=new this.ChatBoxes,this.chatboxviews=new this.ChatBoxViews({model:this.chatboxes}),this.controlboxtoggle=new this.ControlBoxToggle,this.otr=new this.OTR,this.initSession(),this.initConnection(),this.connection&&this.addControlBox(),this},this._overrideAttribute=function(e,t){var n=t.overrides[e];typeof n=="function"?(typeof t._super=="undefined"&&(t._super={converse:m}),t._super[e]=m[e].bind(m),m[e]=n.bind(t)):m[e]=n},this._extendObject=function(e,t){e.prototype._super||(e.prototype._super={converse:m}),f.each(t,function(t,n){n==="events"?e.prototype[n]=f.extend(t,e.prototype[n]):(typeof t=="function"&&(e.prototype._super[n]=e.prototype[n]),e.prototype[n]=t)})},this._initializePlugins=function(){f.each(this.plugins,function(e){e.converse=m,f.each(Object.keys(e.overrides),function(t){var n=e.overrides[t];typeof n=="object"?this._extendObject(m[t],n):this._overrideAttribute(t,e)}.bind(this)),typeof e.initialize=="function"?e.initialize.bind(e)(this):e.bind(this)(this)}.bind(this))},d.connection&&(this.connection=d.connection),this._initializePlugins(),this._initialize(),this.registerGlobalEventHandlers(),m.emit("initialized")};var y=function(e){if(!e)return;var t=d.chatboxviews.get(e.get("jid"));return{close:t.close.bind(t),endOTR:e.endOTR.bind(e),focus:t.focus.bind(t),get:e.get.bind(e),initiateOTR:e.initiateOTR.bind(e),is_chatroom:e.is_chatroom,maximize:e.maximize.bind(e),minimize:e.minimize.bind(e),open:t.show.bind(t),set:e.set.bind(e)}},b={initialize:function(e,t){d.initialize(e,t)},disconnect:function(){d.connection.disconnect()},account:{logout:function(){d.logOut()}},user:{logout:function(){d.logOut()},status:{get:function(){return d.xmppstatus.get("status")},set:function(e,t){var n={status:e};if(!f.contains(f.keys(g),e))throw new Error("Invalid availability value. See https://xmpp.org/rfcs/rfc3921.html#rfc.section.2.2.2.1");typeof t=="string"&&(n.status_message=t),d.xmppstatus.save(n)},message:{get:function(){return d.xmppstatus.get("status_message")},set:function(e){d.xmppstatus.save({status_message:e})}}}},settings:{get:function(e){if(f.contains(Object.keys(d.default_settings),e))return d[e]},set:function(e,t){var n={};typeof e=="object"?f.extend(d,f.pick(e,Object.keys(d.default_settings))):typeof e=="string"&&(n[e]=t,f.extend(d,f.pick(n,Object.keys(d.default_settings))))}},contacts:{get:function(e){var t=function(e){var t=d.roster.get(a.getBareJidFromJid(e));return t?t.attributes:null};if(typeof e=="undefined")e=d.roster.pluck("jid");else if(typeof e=="string")return t(e);return f.map(e,t)},add:function(e,t){if(typeof e!="string"||e.indexOf("@")<0)throw new TypeError("contacts.add: invalid jid");d.roster.addAndSubscribe(e,f.isEmpty(t)?e:t)}},chats:{open:function(e){var t;return typeof e=="undefined"?(d.log("chats.open: You need to provide at least one JID","error"),null):typeof e=="string"?(t=y(d.chatboxes.getChatBox(e,!0)),t.open(),t):f.map(e,function(e){return t=y(d.chatboxes.getChatBox(e,!0)),t.open(),t})},get:function(e){return typeof e=="undefined"?(d.log("chats.get: You need to provide at least one JID","error"),null):typeof e=="string"?y(d.chatboxes.getChatBox(e,!0)):f.map(e,f.partial(f.compose(y,d.chatboxes.getChatBox.bind(d.chatboxes)),f,!0))}},archive:{query:function(e,r,i){var s,o=[];typeof e=="function"&&(r=e,i=r);if(!d.features.findWhere({"var":a.NS.MAM}))throw new Error("This server does not support XEP-0313, Message Archive Management");var u=d.connection.getUniqueId(),c={type:"set"};if(typeof e!="undefined"&&e.groupchat){if(!e["with"])throw new Error('You need to specify a "with" value containing the chat room JID, when querying groupchat messages.');c.to=e["with"]}var h=n(c).c("query",{xmlns:a.NS.MAM,queryid:u});typeof e!="undefined"&&(h.c("x",{xmlns:a.NS.XFORM,type:"submit"}).c("field",{"var":"FORM_TYPE",type:"hidden"}).c("value").t(a.NS.MAM).up().up(),e["with"]&&!e.groupchat&&h.c("field",{"var":"with"}).c("value").t(e["with"]).up().up(),f.each(["start","end"],function(t){if(e[t]){s=l(e[t]);if(!s.isValid())throw new TypeError("archive.query: invalid date provided for: "+t);h.c("field",{"var":t}).c("value").t(s.format()).up().up()}}),h.up(),e instanceof a.RSM?h.cnode(e.toXML()):f.intersection(v,f.keys(e)).length&&h.cnode((new a.RSM(e)).toXML())),d.connection.addHandler(function(n){var i=t(n),s,l;if(typeof r=="function")return s=i.find('fin[xmlns="'+a.NS.MAM+'"]'),s.length?(l=new a.RSM({xml:s.find("set")[0]}),f.extend(l,f.pick(e,["max"])),f.extend(l,f.pick(e,m)),r(o,l),!1):(u===i.find("result").attr("queryid")&&o.push(n),!0);return!1},a.NS.MAM),d.connection.sendIQ(h,null,i)}},rooms:{open:function(e,t){t||(t=a.getNodeFromJid(d.bare_jid));if(typeof t!="string")throw new TypeError("rooms.open: invalid nick, must be string");var n=function(e){var n=d.chatboxes.get(e);return d.log("jid"),n||(n=d.chatboxviews.showChat({id:e,jid:e,name:a.unescapeNode(a.getNodeFromJid(e)),nick:t,chatroom:!0,box_id:h(e)})),y(d.chatboxes.getChatBox(e,!0))};if(typeof e=="undefined")throw new TypeError("rooms.open: You need to provide at least one JID");return typeof e=="string"?n(e):f.map(e,n)},get:function(e){if(typeof e=="undefined")throw new TypeError("rooms.get: You need to provide at least one JID");return typeof e=="string"?y(d.chatboxes.getChatBox(e,!0)):f.map(e,f.partial(y,f.bind(d.chatboxes.getChatBox,d.chatboxes,f,!0)))}},tokens:{get:function(e){if(!d.expose_rid_and_sid||typeof d.connection=="undefined")return null;if(e.toLowerCase()==="rid")return d.connection.rid||d.connection._proto.rid;if(e.toLowerCase()==="sid")return d.connection.sid||d.connection._proto.sid}},listen:{once:function(e,t){d.once(e,t)},on:function(e,t){d.on(e,t)},not:function(e,t){d.off(e,t)}},send:function(e){d.connection.send(e)},ping:function(e){d.ping(e)},plugins:{add:function(e,t){d.plugins[e]=t},remove:function(e){delete d.plugins[e]},override:function(e,t){d._overrideAttribute(e,t)},extend:function(e,t){d._extendObject(e,t)}},env:{$build:s,$iq:n,$msg:r,$pres:i,Strophe:a,_:f,b64_sha1:h,jQuery:t,moment:l}};return b});var config;typeof require=="undefined"&&(require={config:function(e){config=e}}),require.config({baseUrl:".",paths:{backbone:"components/backbone/backbone","backbone.browserStorage":"components/backbone.browserStorage/backbone.browserStorage","backbone.overview":"components/backbone.overview/backbone.overview","converse-dependencies":"src/deps-full","converse-templates":"src/templates",eventemitter:"components/otr/build/dep/eventemitter",jquery:"components/jquery/dist/jquery","jquery-private":"src/jquery-private","jquery.browser":"components/jquery.browser/dist/jquery.browser","jquery.easing":"components/jquery-easing-original/index",moment:"components/momentjs/moment",strophe:"components/strophejs/src/wrapper","strophe-base64":"components/strophejs/src/base64","strophe-bosh":"components/strophejs/src/bosh","strophe-core":"components/strophejs/src/core","strophe-md5":"components/strophejs/src/md5","strophe-polyfill":"components/strophejs/src/polyfills","strophe-sha1":"components/strophejs/src/sha1","strophe-websocket":"components/strophejs/src/websocket","strophe.disco":"components/strophejs-plugins/disco/strophe.disco","strophe.ping":"src/strophe.ping","strophe.rsm":"components/strophejs-plugins/rsm/strophe.rsm","strophe.vcard":"src/strophe.vcard",text:"components/requirejs-text/text",tpl:"components/requirejs-tpl-jcbrand/tpl",typeahead:"components/typeahead.js/index",underscore:"components/underscore/underscore",utils:"src/utils",polyfill:"src/polyfill",bigint:"src/bigint",crypto:"src/crypto","crypto.aes":"components/otr/vendor/cryptojs/aes","crypto.cipher-core":"components/otr/vendor/cryptojs/cipher-core","crypto.core":"components/otr/vendor/cryptojs/core","crypto.enc-base64":"components/otr/vendor/cryptojs/enc-base64","crypto.evpkdf":"components/crypto-js-evanvosberg/src/evpkdf","crypto.hmac":"components/otr/vendor/cryptojs/hmac","crypto.md5":"components/crypto-js-evanvosberg/src/md5","crypto.mode-ctr":"components/otr/vendor/cryptojs/mode-ctr","crypto.pad-nopadding":"components/otr/vendor/cryptojs/pad-nopadding","crypto.sha1":"components/otr/vendor/cryptojs/sha1","crypto.sha256":"components/otr/vendor/cryptojs/sha256",salsa20:"components/otr/build/dep/salsa20",otr:"src/otr",locales:"src/locales",jed:"components/jed/jed",af:"locale/af/LC_MESSAGES/converse.json",de:"locale/de/LC_MESSAGES/converse.json",en:"locale/en/LC_MESSAGES/converse.json",es:"locale/es/LC_MESSAGES/converse.json",fr:"locale/fr/LC_MESSAGES/converse.json",he:"locale/he/LC_MESSAGES/converse.json",hu:"locale/hu/LC_MESSAGES/converse.json",id:"locale/id/LC_MESSAGES/converse.json",it:"locale/it/LC_MESSAGES/converse.json",ja:"locale/ja/LC_MESSAGES/converse.json",nb:"locale/nb/LC_MESSAGES/converse.json",nl:"locale/nl/LC_MESSAGES/converse.json",pl:"locale/pl/LC_MESSAGES/converse.json",pt_BR:"locale/pt_BR/LC_MESSAGES/converse.json",ru:"locale/ru/LC_MESSAGES/converse.json",uk:"locale/uk/LC_MESSAGES/converse.json",zh:"locale/zh/LC_MESSAGES/converse.json",moment_with_locales:"src/moment_locales",moment_af:"components/momentjs/locale/af",moment_de:"components/momentjs/locale/de",moment_es:"components/momentjs/locale/es",moment_fr:"components/momentjs/locale/fr",moment_he:"components/momentjs/locale/he",moment_hu:"components/momentjs/locale/hu",moment_id:"components/momentjs/locale/id",moment_it:"components/momentjs/locale/it",moment_ja:"components/momentjs/locale/ja",moment_nb:"components/momentjs/locale/nb",moment_nl:"components/momentjs/locale/nl",moment_pl:"components/momentjs/locale/pl","moment_pt-br":"components/momentjs/locale/pt-br",moment_ru:"components/momentjs/locale/ru",moment_uk:"components/momentjs/locale/uk",moment_zh:"components/momentjs/locale/zh-cn",action:"src/templates/action",add_contact_dropdown:"src/templates/add_contact_dropdown",add_contact_form:"src/templates/add_contact_form",change_status_message:"src/templates/change_status_message",chat_status:"src/templates/chat_status",chatarea:"src/templates/chatarea",chatbox:"src/templates/chatbox",chatroom:"src/templates/chatroom",chatroom_form:"src/templates/chatroom_form",chatroom_password_form:"src/templates/chatroom_password_form",chatroom_sidebar:"src/templates/chatroom_sidebar",chatrooms_tab:"src/templates/chatrooms_tab",chats_panel:"src/templates/chats_panel",choose_status:"src/templates/choose_status",contacts_panel:"src/templates/contacts_panel",contacts_tab:"src/templates/contacts_tab",controlbox:"src/templates/controlbox",controlbox_toggle:"src/templates/controlbox_toggle",field:"src/templates/field",form_captcha:"src/templates/form_captcha",form_checkbox:"src/templates/form_checkbox",form_input:"src/templates/form_input",form_select:"src/templates/form_select",form_textarea:"src/templates/form_textarea",form_username:"src/templates/form_username",group_header:"src/templates/group_header",info:"src/templates/info",login_panel:"src/templates/login_panel",login_tab:"src/templates/login_tab",message:"src/templates/message",new_day:"src/templates/new_day",occupant:"src/templates/occupant",pending_contact:"src/templates/pending_contact",pending_contacts:"src/templates/pending_contacts",register_panel:"src/templates/register_panel",register_tab:"src/templates/register_tab",registration_form:"src/templates/registration_form",registration_request:"src/templates/registration_request",requesting_contact:"src/templates/requesting_contact",requesting_contacts:"src/templates/requesting_contacts",room_description:"src/templates/room_description",room_item:"src/templates/room_item",room_panel:"src/templates/room_panel",roster:"src/templates/roster",roster_item:"src/templates/roster_item",search_contact:"src/templates/search_contact",select_option:"src/templates/select_option",status_option:"src/templates/status_option",toggle_chats:"src/templates/toggle_chats",toolbar:"src/templates/toolbar",trimmed_chat:"src/templates/trimmed_chat",vcard:"src/templates/vcard"},map:{"*":{jquery:"jquery-private"},"jquery-private":{jquery:"jquery"}},tpl:{templateSettings:{evaluate:/\{\[([\s\S]+?)\]\}/g,interpolate:/\{\{([\s\S]+?)\}\}/g}},shim:{"crypto.aes":{deps:["crypto.cipher-core"]},"crypto.cipher-core":{deps:["crypto.enc-base64","crypto.evpkdf"]},"crypto.enc-base64":{deps:["crypto.core"]},"crypto.evpkdf":{deps:["crypto.md5"]},"crypto.hmac":{deps:["crypto.core"]},"crypto.md5":{deps:["crypto.core"]},"crypto.mode-ctr":{deps:["crypto.cipher-core"]},"crypto.pad-nopadding":{deps:["crypto.cipher-core"]},"crypto.sha1":{deps:["crypto.core"]},"crypto.sha256":{deps:["crypto.core"]},bigint:{deps:["crypto"]},"strophe.ping":{deps:["strophe"]},"strophe.register":{deps:["strophe"]},"strophe.vcard":{deps:["strophe"]}}}),typeof require=="function"&&require(["converse"],function(e){window.converse=e}),define("main",function(){});
\ No newline at end of file
diff --git a/xmpp/converse/builds/locales.js b/xmpp/converse/builds/locales.js
new file mode 100644
index 00000000..40017cbd
--- /dev/null
+++ b/xmpp/converse/builds/locales.js
@@ -0,0 +1,11108 @@
+var locales = locales || {};
+locales["af"] = {
+   "domain": "converse",
+   "locale_data": {
+      "converse": {
+         "": {
+            "domain": "converse",
+            "lang": "af"
+         },
+         "unencrypted": [
+            null,
+            "nie-privaat"
+         ],
+         "unverified": [
+            null,
+            "ongeverifieer"
+         ],
+         "verified": [
+            null,
+            "privaat"
+         ],
+         "finished": [
+            null,
+            "afgesluit"
+         ],
+         "This contact is busy": [
+            null,
+            "Hierdie persoon is besig"
+         ],
+         "This contact is online": [
+            null,
+            "Hierdie persoon is aanlyn"
+         ],
+         "This contact is offline": [
+            null,
+            "Hierdie persoon is aflyn"
+         ],
+         "This contact is unavailable": [
+            null,
+            "Hierdie persoon is onbeskikbaar"
+         ],
+         "This contact is away for an extended period": [
+            null,
+            "Hierdie persoon is vir lank afwesig"
+         ],
+         "This contact is away": [
+            null,
+            "Hierdie persoon is afwesig"
+         ],
+         "My contacts": [
+            null,
+            "My kontakte"
+         ],
+         "Pending contacts": [
+            null,
+            "Hangende kontakte"
+         ],
+         "Contact requests": [
+            null,
+            "Kontak versoeke"
+         ],
+         "Ungrouped": [
+            null,
+            "Ongegroepeer"
+         ],
+         "Contacts": [
+            null,
+            "Kontakte"
+         ],
+         "Groups": [
+            null,
+            "Groepe"
+         ],
+         "Reconnecting": [
+            null,
+            "Herkonnekteer"
+         ],
+         "Error": [
+            null,
+            "Fout"
+         ],
+         "Connecting": [
+            null,
+            "Verbind tans"
+         ],
+         "Authenticating": [
+            null,
+            "Besig om te bekragtig"
+         ],
+         "Authentication Failed": [
+            null,
+            "Bekragtiging het gefaal"
+         ],
+         "Online Contacts": [
+            null,
+            "Kontakte aangemeld"
+         ],
+         "Re-establishing encrypted session": [
+            null,
+            "Herstel versleutelde sessie"
+         ],
+         "Generating private key.": [
+            null,
+            "Genereer private sleutel."
+         ],
+         "Your browser might become unresponsive.": [
+            null,
+            "U webblaaier mag tydelik onreageerbaar word."
+         ],
+         "Authentication request from %1$s\n\nYour chat contact is attempting to verify your identity, by asking you the question below.\n\n%2$s": [
+            null,
+            "Verifieeringsversoek van  %1$s\n\nU gespreksmaat probeer om u identiteit te verifieer, deur die volgende vraag te vra \n\n%2$s"
+         ],
+         "Could not verify this user's identify.": [
+            null,
+            "Kon nie hierdie gebruiker se identitied verifieer nie."
+         ],
+         "Exchanging private key with contact.": [
+            null,
+            "Sleutels word met gespreksmaat uitgeruil."
+         ],
+         "Personal message": [
+            null,
+            "Persoonlike boodskap"
+         ],
+         "Are you sure you want to clear the messages from this room?": [
+            null,
+            "Is u seker dat u die boodskappe in hierdie kamer wil verwyder?"
+         ],
+         "me": [
+            null,
+            "ek"
+         ],
+         "is typing": [
+            null,
+            "tik tans"
+         ],
+         "has stopped typing": [
+            null,
+            "het opgehou tik"
+         ],
+         "Show this menu": [
+            null,
+            "Vertoon hierdie keuselys"
+         ],
+         "Write in the third person": [
+            null,
+            "Skryf in die derde persoon"
+         ],
+         "Remove messages": [
+            null,
+            "Verwyder boodskappe"
+         ],
+         "Are you sure you want to clear the messages from this chat box?": [
+            null,
+            "Is u seker u wil die boodskappe van hierdie klets uitvee?"
+         ],
+         "Your message could not be sent": [
+            null,
+            "U boodskap kon nie gestuur word nie"
+         ],
+         "We received an unencrypted message": [
+            null,
+            "Ons het 'n onversleutelde boodskap ontvang"
+         ],
+         "We received an unreadable encrypted message": [
+            null,
+            "Ons het 'n onleesbare versleutelde boodskap ontvang"
+         ],
+         "This user has requested an encrypted session.": [
+            null,
+            "Hierdie gebruiker versoek 'n versleutelde sessie"
+         ],
+         "Here are the fingerprints, please confirm them with %1$s, outside of this chat.\n\nFingerprint for you, %2$s: %3$s\n\nFingerprint for %1$s: %4$s\n\nIf you have confirmed that the fingerprints match, click OK, otherwise click Cancel.": [
+            null,
+            "Hier is die vingerafdrukke, bevestig hulle met %1$s, buite hierdie kletskanaal \n\nU vingerafdruk, %2$s: %3$s\n\nVingerafdruk vir %1$s: %4$s\n\nIndien u die vingerafdrukke bevestig het, klik OK, andersinds klik Kanselleer"
+         ],
+         "You will be prompted to provide a security question and then an answer to that question.\n\nYour contact will then be prompted the same question and if they type the exact same answer (case sensitive), their identity will be verified.": [
+            null,
+            "Daar sal van u verwag word om 'n sekuriteitsvraag te stel, en dan ook die antwoord tot daardie vraag te verskaf.\n\nU gespreksmaat sal dan daardie vraag gestel word, en indien hulle presies dieselfde antwoord (lw. hoofletters tel) verskaf, sal hul identiteit geverifieer wees."
+         ],
+         "What is your security question?": [
+            null,
+            "Wat is u sekuriteitsvraag?"
+         ],
+         "What is the answer to the security question?": [
+            null,
+            "Wat is die antwoord tot die sekuriteitsvraag?"
+         ],
+         "Invalid authentication scheme provided": [
+            null,
+            "Ongeldige verifikasiemetode verskaf"
+         ],
+         "Your messages are not encrypted anymore": [
+            null,
+            "U boodskappe is nie meer versleutel nie"
+         ],
+         "Your messages are now encrypted but your contact's identity has not been verified.": [
+            null,
+            "U boodskappe is now versleutel maar u gespreksmaat se identiteit is nog onseker."
+         ],
+         "Your contact's identify has been verified.": [
+            null,
+            "U gespreksmaat se identiteit is geverifieer."
+         ],
+         "Your contact has ended encryption on their end, you should do the same.": [
+            null,
+            "U gespreksmaat het versleuteling gestaak, u behoort nou dieselfde te doen."
+         ],
+         "Your messages are not encrypted. Click here to enable OTR encryption.": [
+            null,
+            "U boodskappe is nie versleutel nie. Klik hier om OTR versleuteling te aktiveer."
+         ],
+         "Your messages are encrypted, but your contact has not been verified.": [
+            null,
+            "U boodskappe is versleutel, maar u gespreksmaat se identiteit is not onseker."
+         ],
+         "Your messages are encrypted and your contact verified.": [
+            null,
+            "U boodskappe is versleutel en u gespreksmaat se identiteit geverifieer."
+         ],
+         "Your contact has closed their end of the private session, you should do the same": [
+            null,
+            "U gespreksmaat het die private sessie gestaak. U behoort dieselfde te doen"
+         ],
+         "Clear all messages": [
+            null,
+            "Vee alle boodskappe uit"
+         ],
+         "End encrypted conversation": [
+            null,
+            "Beëindig versleutelde gesprek"
+         ],
+         "Hide the list of participants": [
+            null,
+            "Verskuil die lys van deelnemers"
+         ],
+         "Refresh encrypted conversation": [
+            null,
+            "Verfris versleutelde gesprek"
+         ],
+         "Start a call": [
+            null,
+            "Begin 'n oproep"
+         ],
+         "Start encrypted conversation": [
+            null,
+            "Begin versleutelde gesprek"
+         ],
+         "Verify with fingerprints": [
+            null,
+            "Verifieer met vingerafdrukke"
+         ],
+         "Verify with SMP": [
+            null,
+            "Verifieer met SMP"
+         ],
+         "What's this?": [
+            null,
+            "Wat is hierdie?"
+         ],
+         "Online": [
+            null,
+            "Aangemeld"
+         ],
+         "Busy": [
+            null,
+            "Besig"
+         ],
+         "Away": [
+            null,
+            "Afwesig"
+         ],
+         "Offline": [
+            null,
+            "Afgemeld"
+         ],
+         "Contact name": [
+            null,
+            "Kontaknaam"
+         ],
+         "Search": [
+            null,
+            "Soek"
+         ],
+         "Contact username": [
+            null,
+            "Konak gebruikersnaam"
+         ],
+         "Add": [
+            null,
+            "Voeg by"
+         ],
+         "Click to add new chat contacts": [
+            null,
+            "Kliek om nuwe kletskontakte by te voeg"
+         ],
+         "Add a contact": [
+            null,
+            "Voeg 'n kontak by"
+         ],
+         "No users found": [
+            null,
+            "Geen gebruikers gevind"
+         ],
+         "Click to add as a chat contact": [
+            null,
+            "Kliek om as kletskontak by te voeg"
+         ],
+         "Room name": [
+            null,
+            "Kamer naam"
+         ],
+         "Nickname": [
+            null,
+            "Bynaam"
+         ],
+         "Server": [
+            null,
+            "Bediener"
+         ],
+         "Join": [
+            null,
+            "Sluit aan"
+         ],
+         "Show rooms": [
+            null,
+            "Wys kamers"
+         ],
+         "Rooms": [
+            null,
+            "Kamers"
+         ],
+         "No rooms on %1$s": [
+            null,
+            "Geen kamers op %1$s"
+         ],
+         "Rooms on %1$s": [
+            null,
+            "Kamers op %1$s"
+         ],
+         "Click to open this room": [
+            null,
+            "Kliek om hierdie kletskamer te open"
+         ],
+         "Show more information on this room": [
+            null,
+            "Wys meer inligting aangaande hierdie kletskamer"
+         ],
+         "Description:": [
+            null,
+            "Beskrywing:"
+         ],
+         "Occupants:": [
+            null,
+            "Deelnemers:"
+         ],
+         "Features:": [
+            null,
+            "Eienskappe:"
+         ],
+         "Requires authentication": [
+            null,
+            "Benodig magtiging"
+         ],
+         "Hidden": [
+            null,
+            "Verskuil"
+         ],
+         "Requires an invitation": [
+            null,
+            "Benodig 'n uitnodiging"
+         ],
+         "Moderated": [
+            null,
+            "Gemodereer"
+         ],
+         "Non-anonymous": [
+            null,
+            "Nie-anoniem"
+         ],
+         "Open room": [
+            null,
+            "Oop kletskamer"
+         ],
+         "Permanent room": [
+            null,
+            "Permanente kamer"
+         ],
+         "Public": [
+            null,
+            "Publiek"
+         ],
+         "Semi-anonymous": [
+            null,
+            "Deels anoniem"
+         ],
+         "Temporary room": [
+            null,
+            "Tydelike kamer"
+         ],
+         "Unmoderated": [
+            null,
+            "Ongemodereer"
+         ],
+         "This user is a moderator": [
+            null,
+            "Hierdie gebruiker is 'n moderator"
+         ],
+         "This user can send messages in this room": [
+            null,
+            "Hierdie gebruiker kan boodskappe na die kamer stuur"
+         ],
+         "This user can NOT send messages in this room": [
+            null,
+            "Hierdie gebruiker kan NIE boodskappe na die kamer stuur nie"
+         ],
+         "Invite...": [
+            null,
+            "Nooi uit..."
+         ],
+         "Occupants": [
+            null,
+            "Deelnemers"
+         ],
+         "You are about to invite %1$s to the chat room \"%2$s\". ": [
+            null,
+            "U is op die punt om %1$s na die kletskamer \"%2$s\" uit te nooi."
+         ],
+         "You may optionally include a message, explaining the reason for the invitation.": [
+            null,
+            "U mag na keuse 'n boodskap insluit, om bv. die rede vir die uitnodiging te staaf."
+         ],
+         "Message": [
+            null,
+            "Boodskap"
+         ],
+         "Error: could not execute the command": [
+            null,
+            "Fout: kon nie die opdrag uitvoer nie"
+         ],
+         "Ban user from room": [
+            null,
+            "Verban gebruiker uit hierdie kletskamer"
+         ],
+         "Kick user from room": [
+            null,
+            "Skop gebruiker uit hierdie kletskamer"
+         ],
+         "Write in 3rd person": [
+            null,
+            "Skryf in die derde persoon"
+         ],
+         "Remove user's ability to post messages": [
+            null,
+            "Verwyder gebruiker se vermoë om boodskappe te plaas"
+         ],
+         "Change your nickname": [
+            null,
+            "Verander u bynaam"
+         ],
+         "Set room topic": [
+            null,
+            "Stel onderwerp vir kletskamer"
+         ],
+         "Allow muted user to post messages": [
+            null,
+            "Laat stilgemaakte gebruiker toe om weer boodskappe te plaas"
+         ],
+         "Save": [
+            null,
+            "Stoor"
+         ],
+         "Cancel": [
+            null,
+            "Kanseleer"
+         ],
+         "An error occurred while trying to save the form.": [
+            null,
+            "A fout het voorgekom terwyl probeer is om die vorm te stoor."
+         ],
+         "This chatroom requires a password": [
+            null,
+            "Hiedie kletskamer benodig 'n wagwoord"
+         ],
+         "Password: ": [
+            null,
+            "Wagwoord:"
+         ],
+         "Submit": [
+            null,
+            "Dien in"
+         ],
+         "This room is not anonymous": [
+            null,
+            "Hierdie vertrek is nie anoniem nie"
+         ],
+         "This room now shows unavailable members": [
+            null,
+            "Hierdie vertrek wys nou onbeskikbare lede"
+         ],
+         "This room does not show unavailable members": [
+            null,
+            "Hierdie vertrek wys nie onbeskikbare lede nie"
+         ],
+         "Non-privacy-related room configuration has changed": [
+            null,
+            "Nie-privaatheidverwante kamer instellings het verander"
+         ],
+         "Room logging is now enabled": [
+            null,
+            "Kamer log is nou aangeskakel"
+         ],
+         "Room logging is now disabled": [
+            null,
+            "Kamer log is nou afgeskakel"
+         ],
+         "This room is now non-anonymous": [
+            null,
+            "Hiedie kamer is nou nie anoniem nie"
+         ],
+         "This room is now semi-anonymous": [
+            null,
+            "Hierdie kamer is nou gedeeltelik anoniem"
+         ],
+         "This room is now fully-anonymous": [
+            null,
+            "Hierdie kamer is nou ten volle anoniem"
+         ],
+         "A new room has been created": [
+            null,
+            "'n Nuwe kamer is geskep"
+         ],
+         "You have been banned from this room": [
+            null,
+            "Jy is uit die kamer verban"
+         ],
+         "You have been kicked from this room": [
+            null,
+            "Jy is uit die kamer geskop"
+         ],
+         "You have been removed from this room because of an affiliation change": [
+            null,
+            "Jy is vanuit die kamer verwyder a.g.v 'n verandering van affiliasie"
+         ],
+         "You have been removed from this room because the room has changed to members-only and you're not a member": [
+            null,
+            "Jy is vanuit die kamer verwyder omdat die kamer nou slegs tot lede beperk word en jy nie 'n lid is nie."
+         ],
+         "You have been removed from this room because the MUC (Multi-user chat) service is being shut down.": [
+            null,
+            "Jy is van hierdie kamer verwyder aangesien die MUC (Multi-user chat) diens nou afgeskakel word."
+         ],
+         "<strong>%1$s</strong> has been banned": [
+            null,
+            "<strong>%1$s</strong> is verban"
+         ],
+         "<strong>%1$s</strong> has been kicked out": [
+            null,
+            "<strong>%1$s</strong> is uitgeskop"
+         ],
+         "<strong>%1$s</strong> has been removed because of an affiliation change": [
+            null,
+            "<strong>%1$s</strong> is verwyder a.g.v 'n verandering van affiliasie"
+         ],
+         "<strong>%1$s</strong> has been removed for not being a member": [
+            null,
+            "<strong>%1$s</strong> is nie 'n lid nie, en dus verwyder"
+         ],
+         "Your nickname has been automatically changed to: <strong>%1$s</strong>": [
+            null,
+            "U bynaam is outomaties verander na: <strong>%1$s</strong>"
+         ],
+         "Your nickname has been changed to: <strong>%1$s</strong>": [
+            null,
+            "U bynaam is verander na: <strong>%1$s</strong>"
+         ],
+         "The reason given is: \"": [
+            null,
+            "Die gegewe rede is: \""
+         ],
+         "You are not on the member list of this room": [
+            null,
+            "Jy is nie op die ledelys van hierdie kamer nie"
+         ],
+         "No nickname was specified": [
+            null,
+            "Geen bynaam verskaf nie"
+         ],
+         "You are not allowed to create new rooms": [
+            null,
+            "Jy word nie toegelaat om nog kamers te skep nie"
+         ],
+         "Your nickname doesn't conform to this room's policies": [
+            null,
+            "Jou bynaam voldoen nie aan die kamer se beleid nie"
+         ],
+         "Your nickname is already taken": [
+            null,
+            "Jou bynaam is reeds geneem"
+         ],
+         "This room does not (yet) exist": [
+            null,
+            "Hierdie kamer bestaan tans (nog) nie"
+         ],
+         "This room has reached it's maximum number of occupants": [
+            null,
+            "Hierdie kamer het sy maksimum aantal deelnemers bereik"
+         ],
+         "Topic set by %1$s to: %2$s": [
+            null,
+            "Onderwerp deur %1$s bygewerk na: %2$s"
+         ],
+         "%1$s has invited you to join a chat room: %2$s": [
+            null,
+            "%1$s het u uitgenooi om die kletskamer %2$s te besoek"
+         ],
+         "%1$s has invited you to join a chat room: %2$s, and left the following reason: \"%3$s\"": [
+            null,
+            "%1$s het u uitgenooi om die kletskamer %2$s te besoek, en het die volgende rede verskaf: \"%3$s\""
+         ],
+         "Click to restore this chat": [
+            null,
+            "Kliek om hierdie klets te herstel"
+         ],
+         "Minimized": [
+            null,
+            "Geminimaliseer"
+         ],
+         "Click to remove this contact": [
+            null,
+            "Kliek om hierdie kontak te verwyder"
+         ],
+         "Click to chat with this contact": [
+            null,
+            "Kliek om met hierdie kontak te klets"
+         ],
+         "Are you sure you want to remove this contact?": [
+            null,
+            "Is u seker u wil hierdie gespreksmaat verwyder?"
+         ],
+         "Are you sure you want to decline this contact request?": [
+            null,
+            "Is u seker dat u hierdie persoon se versoek wil afkeur?"
+         ],
+         "Type to filter": [
+            null,
+            "Tik om te filtreer"
+         ],
+         "I am %1$s": [
+            null,
+            "Ek is %1$s"
+         ],
+         "Click here to write a custom status message": [
+            null,
+            "Kliek hier om jou eie statusboodskap te skryf"
+         ],
+         "Click to change your chat status": [
+            null,
+            "Kliek om jou klets-status te verander"
+         ],
+         "Custom status": [
+            null,
+            "Doelgemaakte status"
+         ],
+         "online": [
+            null,
+            "aangemeld"
+         ],
+         "busy": [
+            null,
+            "besig"
+         ],
+         "away for long": [
+            null,
+            "vir lank afwesig"
+         ],
+         "away": [
+            null,
+            "afwesig"
+         ],
+         "Your XMPP provider's domain name:": [
+            null,
+            "U XMPP-verskaffer se domein naam:"
+         ],
+         "Fetch registration form": [
+            null,
+            "Haal die registrasie form"
+         ],
+         "Tip: A list of public XMPP providers is available": [
+            null,
+            "Wenk: A lys van publieke XMPP-verskaffers is beskikbaar"
+         ],
+         "here": [
+            null,
+            "hier"
+         ],
+         "Register": [
+            null,
+            "Registreer"
+         ],
+         "Sorry, the given provider does not support in band account registration. Please try with a different provider.": [
+            null,
+            "Jammer, die gekose verskaffer ondersteun nie in-band registrasie nie.Probeer weer met 'n ander verskaffer."
+         ],
+         "Requesting a registration form from the XMPP server": [
+            null,
+            "Vra tans die XMPP-bediener vir 'n registrasie vorm"
+         ],
+         "Something went wrong while establishing a connection with \"%1$s\". Are you sure it exists?": [
+            null,
+            "Iets het fout geloop tydens koppeling met \"%1$s\". Is u seker dat dit bestaan?"
+         ],
+         "Now logging you in": [
+            null,
+            "U word nou aangemeld"
+         ],
+         "Registered successfully": [
+            null,
+            "Suksesvol geregistreer"
+         ],
+         "Return": [
+            null,
+            "Terug"
+         ],
+         "The provider rejected your registration attempt. ": [
+            null,
+            "Die verskaffer het u registrasieversoek verwerp."
+         ],
+         "XMPP Username:": [
+            null,
+            "XMPP Gebruikersnaam:"
+         ],
+         "Password:": [
+            null,
+            "Wagwoord"
+         ],
+         "Log In": [
+            null,
+            "Meld aan"
+         ],
+         "Sign in": [
+            null,
+            "Teken in"
+         ],
+         "Toggle chat": [
+            null,
+            "Klets"
+         ]
+      }
+   }
+};
+locales["de"] = {
+   "domain": "converse",
+   "locale_data": {
+      "converse": {
+         "": {
+            "domain": "converse",
+            "plural_forms": "nplurals=2; plural=(n != 1);",
+            "lang": "de"
+         },
+         "unencrypted": [
+            null,
+            ""
+         ],
+         "unverified": [
+            null,
+            ""
+         ],
+         "verified": [
+            null,
+            ""
+         ],
+         "finished": [
+            null,
+            ""
+         ],
+         "This contact is busy": [
+            null,
+            "Dieser Kontakt ist beschäfticht"
+         ],
+         "This contact is online": [
+            null,
+            "Dieser Kontakt ist online"
+         ],
+         "This contact is offline": [
+            null,
+            "Dieser Kontakt ist offline"
+         ],
+         "This contact is unavailable": [
+            null,
+            "Dieser Kontakt ist nicht verfügbar"
+         ],
+         "This contact is away for an extended period": [
+            null,
+            "Dieser Kontakt is für längere Zeit abwesend"
+         ],
+         "This contact is away": [
+            null,
+            "Dieser Kontakt ist abwesend"
+         ],
+         "My contacts": [
+            null,
+            "Meine Kontakte"
+         ],
+         "Pending contacts": [
+            null,
+            "Unbestätigte Kontakte"
+         ],
+         "Contact requests": [
+            null,
+            "Kontaktanfragen"
+         ],
+         "Ungrouped": [
+            null,
+            ""
+         ],
+         "Contacts": [
+            null,
+            "Kontakte"
+         ],
+         "Groups": [
+            null,
+            ""
+         ],
+         "Error": [
+            null,
+            "Fehler"
+         ],
+         "Connecting": [
+            null,
+            "Verbindungsaufbau …"
+         ],
+         "Authenticating": [
+            null,
+            "Authentifizierung"
+         ],
+         "Authentication Failed": [
+            null,
+            "Authentifizierung gescheitert"
+         ],
+         "Online Contacts": [
+            null,
+            "Online-Kontakte"
+         ],
+         "Re-establishing encrypted session": [
+            null,
+            ""
+         ],
+         "Generating private key.": [
+            null,
+            ""
+         ],
+         "Your browser might become unresponsive.": [
+            null,
+            ""
+         ],
+         "Authentication request from %1$s\n\nYour chat contact is attempting to verify your identity, by asking you the question below.\n\n%2$s": [
+            null,
+            ""
+         ],
+         "Could not verify this user's identify.": [
+            null,
+            ""
+         ],
+         "Exchanging private key with contact.": [
+            null,
+            ""
+         ],
+         "Personal message": [
+            null,
+            "Persönliche Nachricht"
+         ],
+         "me": [
+            null,
+            "Ich"
+         ],
+         "Show this menu": [
+            null,
+            "Dieses Menü anzeigen"
+         ],
+         "Write in the third person": [
+            null,
+            "In der dritten Person schreiben"
+         ],
+         "Remove messages": [
+            null,
+            "Nachrichten entfernen"
+         ],
+         "Are you sure you want to clear the messages from this chat box?": [
+            null,
+            ""
+         ],
+         "Your message could not be sent": [
+            null,
+            ""
+         ],
+         "We received an unencrypted message": [
+            null,
+            ""
+         ],
+         "We received an unreadable encrypted message": [
+            null,
+            ""
+         ],
+         "This user has requested an encrypted session.": [
+            null,
+            ""
+         ],
+         "Here are the fingerprints, please confirm them with %1$s, outside of this chat.\n\nFingerprint for you, %2$s: %3$s\n\nFingerprint for %1$s: %4$s\n\nIf you have confirmed that the fingerprints match, click OK, otherwise click Cancel.": [
+            null,
+            ""
+         ],
+         "You will be prompted to provide a security question and then an answer to that question.\n\nYour contact will then be prompted the same question and if they type the exact same answer (case sensitive), their identity will be verified.": [
+            null,
+            ""
+         ],
+         "What is your security question?": [
+            null,
+            ""
+         ],
+         "What is the answer to the security question?": [
+            null,
+            ""
+         ],
+         "Invalid authentication scheme provided": [
+            null,
+            ""
+         ],
+         "Your messages are not encrypted anymore": [
+            null,
+            ""
+         ],
+         "Your messages are now encrypted but your contact's identity has not been verified.": [
+            null,
+            ""
+         ],
+         "Your contact's identify has been verified.": [
+            null,
+            ""
+         ],
+         "Your contact has ended encryption on their end, you should do the same.": [
+            null,
+            ""
+         ],
+         "Your messages are not encrypted. Click here to enable OTR encryption.": [
+            null,
+            ""
+         ],
+         "Your messages are encrypted, but your contact has not been verified.": [
+            null,
+            ""
+         ],
+         "Your messages are encrypted and your contact verified.": [
+            null,
+            ""
+         ],
+         "Your contact has closed their end of the private session, you should do the same": [
+            null,
+            ""
+         ],
+         "End encrypted conversation": [
+            null,
+            ""
+         ],
+         "Hide the list of participants": [
+            null,
+            ""
+         ],
+         "Refresh encrypted conversation": [
+            null,
+            ""
+         ],
+         "Start a call": [
+            null,
+            ""
+         ],
+         "Start encrypted conversation": [
+            null,
+            ""
+         ],
+         "Verify with fingerprints": [
+            null,
+            ""
+         ],
+         "Verify with SMP": [
+            null,
+            ""
+         ],
+         "What's this?": [
+            null,
+            ""
+         ],
+         "Online": [
+            null,
+            "Online"
+         ],
+         "Busy": [
+            null,
+            "Beschäfticht"
+         ],
+         "Away": [
+            null,
+            "Abwesend"
+         ],
+         "Offline": [
+            null,
+            "Abgemeldet"
+         ],
+         "Contact name": [
+            null,
+            "Name des Kontakts"
+         ],
+         "Search": [
+            null,
+            "Suche"
+         ],
+         "Contact username": [
+            null,
+            "Benutzername"
+         ],
+         "Add": [
+            null,
+            "Hinzufügen"
+         ],
+         "Click to add new chat contacts": [
+            null,
+            "Klicken Sie, um einen neuen Kontakt hinzuzufügen"
+         ],
+         "Add a contact": [
+            null,
+            "Kontakte hinzufügen"
+         ],
+         "No users found": [
+            null,
+            "Keine Benutzer gefunden"
+         ],
+         "Click to add as a chat contact": [
+            null,
+            "Hier klicken um als Kontakt hinzuzufügen"
+         ],
+         "Room name": [
+            null,
+            "Raumname"
+         ],
+         "Nickname": [
+            null,
+            "Spitzname"
+         ],
+         "Server": [
+            null,
+            "Server"
+         ],
+         "Join": [
+            null,
+            "Beitreten"
+         ],
+         "Show rooms": [
+            null,
+            "Räume anzeigen"
+         ],
+         "Rooms": [
+            null,
+            "Räume"
+         ],
+         "No rooms on %1$s": [
+            null,
+            "Keine Räume auf %1$s"
+         ],
+         "Rooms on %1$s": [
+            null,
+            "Räume auf %1$s"
+         ],
+         "Click to open this room": [
+            null,
+            "Hier klicken um diesen Raum zu öffnen"
+         ],
+         "Show more information on this room": [
+            null,
+            "Mehr Information über diesen Raum zeigen"
+         ],
+         "Description:": [
+            null,
+            "Beschreibung"
+         ],
+         "Occupants:": [
+            null,
+            "Teilnehmer"
+         ],
+         "Features:": [
+            null,
+            "Funktionen:"
+         ],
+         "Requires authentication": [
+            null,
+            "Authentifizierung erforderlich"
+         ],
+         "Hidden": [
+            null,
+            "Versteckt"
+         ],
+         "Requires an invitation": [
+            null,
+            "Einladung erforderlich"
+         ],
+         "Moderated": [
+            null,
+            "Moderiert"
+         ],
+         "Non-anonymous": [
+            null,
+            "Nicht anonym"
+         ],
+         "Open room": [
+            null,
+            "Offener Raum"
+         ],
+         "Permanent room": [
+            null,
+            "Dauerhafter Raum"
+         ],
+         "Public": [
+            null,
+            "Öffentlich"
+         ],
+         "Semi-anonymous": [
+            null,
+            "Teils anonym"
+         ],
+         "Temporary room": [
+            null,
+            "Vorübergehender Raum"
+         ],
+         "Unmoderated": [
+            null,
+            "Unmoderiert"
+         ],
+         "This user is a moderator": [
+            null,
+            "Dieser Benutzer ist ein Moderator"
+         ],
+         "This user can send messages in this room": [
+            null,
+            "Dieser Benutzer kann Nachrichten in diesem Raum verschicken"
+         ],
+         "This user can NOT send messages in this room": [
+            null,
+            "Dieser Benutzer kann keine Nachrichten in diesem Raum verschicken"
+         ],
+         "Invite...": [
+            null,
+            ""
+         ],
+         "You are about to invite %1$s to the chat room \"%2$s\". ": [
+            null,
+            ""
+         ],
+         "You may optionally include a message, explaining the reason for the invitation.": [
+            null,
+            ""
+         ],
+         "Message": [
+            null,
+            "Nachricht"
+         ],
+         "Error: could not execute the command": [
+            null,
+            ""
+         ],
+         "Remove user's ability to post messages": [
+            null,
+            ""
+         ],
+         "Change your nickname": [
+            null,
+            ""
+         ],
+         "Allow muted user to post messages": [
+            null,
+            ""
+         ],
+         "Save": [
+            null,
+            "Speichern"
+         ],
+         "Cancel": [
+            null,
+            "Abbrechen"
+         ],
+         "An error occurred while trying to save the form.": [
+            null,
+            "Beim Speichern der Formular is ein Fehler aufgetreten."
+         ],
+         "This chatroom requires a password": [
+            null,
+            "Passwort wird für die Anmeldung benötigt."
+         ],
+         "Password: ": [
+            null,
+            "Passwort: "
+         ],
+         "Submit": [
+            null,
+            "Einreichen"
+         ],
+         "This room is not anonymous": [
+            null,
+            "Dieser Raum ist nicht anonym"
+         ],
+         "This room now shows unavailable members": [
+            null,
+            "Dieser Raum zeigt jetzt unferfügbare Mitglieder"
+         ],
+         "This room does not show unavailable members": [
+            null,
+            "Dieser Raum zeigt nicht unverfügbare Mitglieder"
+         ],
+         "Non-privacy-related room configuration has changed": [
+            null,
+            "Die Konfiguration, die nicht auf die Privatsphäre bezogen ist, hat sich geändert"
+         ],
+         "Room logging is now enabled": [
+            null,
+            "Zukünftige Nachrichten dieses Raums werden protokolliert."
+         ],
+         "Room logging is now disabled": [
+            null,
+            "Zukünftige Nachrichten dieses Raums werden nicht protokolliert."
+         ],
+         "This room is now non-anonymous": [
+            null,
+            "Dieser Raum ist jetzt nicht anonym"
+         ],
+         "This room is now semi-anonymous": [
+            null,
+            "Dieser Raum ist jetzt teils anonym"
+         ],
+         "This room is now fully-anonymous": [
+            null,
+            "Dieser Raum ist jetzt anonym"
+         ],
+         "A new room has been created": [
+            null,
+            "Einen neuen Raum ist erstellen"
+         ],
+         "You have been banned from this room": [
+            null,
+            "Sie sind aus diesem Raum verbannt worden"
+         ],
+         "You have been kicked from this room": [
+            null,
+            "Sie wurden aus diesem Raum hinausgeworfen"
+         ],
+         "You have been removed from this room because of an affiliation change": [
+            null,
+            "Sie wurden wegen einer Zugehörigkeitsänderung entfernt"
+         ],
+         "You have been removed from this room because the room has changed to members-only and you're not a member": [
+            null,
+            "Sie wurden aus diesem Raum entfernt da Sie kein Mitglied sind."
+         ],
+         "You have been removed from this room because the MUC (Multi-user chat) service is being shut down.": [
+            null,
+            "Sie werden aus diesem Raum entfernt da der MUC (Muli-user chat) Dienst gerade abgeschalten wird."
+         ],
+         "<strong>%1$s</strong> has been banned": [
+            null,
+            "<strong>%1$s</strong> ist verbannt"
+         ],
+         "<strong>%1$s</strong> has been kicked out": [
+            null,
+            "<strong>%1$s</strong> ist hinausgeworfen"
+         ],
+         "<strong>%1$s</strong> has been removed because of an affiliation change": [
+            null,
+            "<strong>%1$s</strong> wurde wegen einer Zugehörigkeitsänderung entfernt"
+         ],
+         "<strong>%1$s</strong> has been removed for not being a member": [
+            null,
+            "<strong>%1$s</strong> ist kein Mitglied und wurde daher entfernt"
+         ],
+         "The reason given is: \"": [
+            null,
+            ""
+         ],
+         "You are not on the member list of this room": [
+            null,
+            "Sie sind nicht auf der Mitgliederliste dieses Raums"
+         ],
+         "No nickname was specified": [
+            null,
+            "Kein Spitzname festgelegt"
+         ],
+         "You are not allowed to create new rooms": [
+            null,
+            "Es ist Ihnen nicht erlaubt, neue Räume anzulegen"
+         ],
+         "Your nickname doesn't conform to this room's policies": [
+            null,
+            "Ungültiger Spitzname"
+         ],
+         "Your nickname is already taken": [
+            null,
+            "Ihre Spitzname existiert bereits."
+         ],
+         "This room does not (yet) exist": [
+            null,
+            "Dieser Raum existiert (noch) nicht"
+         ],
+         "This room has reached it's maximum number of occupants": [
+            null,
+            "Dieser Raum hat die maximale Mitgliederanzahl erreicht"
+         ],
+         "Topic set by %1$s to: %2$s": [
+            null,
+            "%1$s hat das Thema zu \"%2$s\" abgeändert"
+         ],
+         "%1$s has invited you to join a chat room: %2$s": [
+            null,
+            ""
+         ],
+         "%1$s has invited you to join a chat room: %2$s, and left the following reason: \"%3$s\"": [
+            null,
+            ""
+         ],
+         "Minimized": [
+            null,
+            ""
+         ],
+         "Click to remove this contact": [
+            null,
+            "Hier klicken um diesen Kontakt zu entfernen"
+         ],
+         "Click to chat with this contact": [
+            null,
+            "Hier klicken um mit diesem Kontakt zu chatten"
+         ],
+         "Type to filter": [
+            null,
+            ""
+         ],
+         "I am %1$s": [
+            null,
+            "Ich bin %1$s"
+         ],
+         "Click here to write a custom status message": [
+            null,
+            "Klicken Sie hier, um ihrer Status-Nachricht to ändern"
+         ],
+         "Click to change your chat status": [
+            null,
+            "Klicken Sie, um ihrer Status to ändern"
+         ],
+         "Custom status": [
+            null,
+            "Status-Nachricht"
+         ],
+         "online": [
+            null,
+            "online"
+         ],
+         "busy": [
+            null,
+            "beschäfticht"
+         ],
+         "away for long": [
+            null,
+            "länger abwesend"
+         ],
+         "away": [
+            null,
+            "abwesend"
+         ],
+         "Your XMPP provider's domain name:": [
+            null,
+            ""
+         ],
+         "Fetch registration form": [
+            null,
+            ""
+         ],
+         "Tip: A list of public XMPP providers is available": [
+            null,
+            ""
+         ],
+         "here": [
+            null,
+            ""
+         ],
+         "Register": [
+            null,
+            ""
+         ],
+         "Sorry, the given provider does not support in band account registration. Please try with a different provider.": [
+            null,
+            ""
+         ],
+         "Requesting a registration form from the XMPP server": [
+            null,
+            ""
+         ],
+         "Something went wrong while establishing a connection with \"%1$s\". Are you sure it exists?": [
+            null,
+            ""
+         ],
+         "Now logging you in": [
+            null,
+            ""
+         ],
+         "Registered successfully": [
+            null,
+            ""
+         ],
+         "Return": [
+            null,
+            ""
+         ],
+         "The provider rejected your registration attempt. ": [
+            null,
+            ""
+         ],
+         "Password:": [
+            null,
+            "Passwort:"
+         ],
+         "Log In": [
+            null,
+            "Anmelden"
+         ],
+         "Sign in": [
+            null,
+            "Anmelden"
+         ],
+         "Toggle chat": [
+            null,
+            ""
+         ]
+      }
+   }
+};
+locales["en"] = {
+   "domain": "converse",
+   "locale_data": {
+      "converse": {
+         "": {
+            "domain": "converse",
+            "plural_forms": "nplurals=2; plural=(n != 1);",
+            "lang": "en"
+         },
+         "unencrypted": [
+            null,
+            "unencrypted"
+         ],
+         "unverified": [
+            null,
+            "unverified"
+         ],
+         "verified": [
+            null,
+            "verified"
+         ],
+         "finished": [
+            null,
+            "finished"
+         ],
+         "This contact is busy": [
+            null,
+            ""
+         ],
+         "This contact is online": [
+            null,
+            ""
+         ],
+         "This contact is offline": [
+            null,
+            ""
+         ],
+         "This contact is unavailable": [
+            null,
+            ""
+         ],
+         "This contact is away for an extended period": [
+            null,
+            ""
+         ],
+         "This contact is away": [
+            null,
+            ""
+         ],
+         "My contacts": [
+            null,
+            "My contacts"
+         ],
+         "Pending contacts": [
+            null,
+            "Pending contacts"
+         ],
+         "Contact requests": [
+            null,
+            "Contact requests"
+         ],
+         "Ungrouped": [
+            null,
+            ""
+         ],
+         "Contacts": [
+            null,
+            "Contacts"
+         ],
+         "Groups": [
+            null,
+            ""
+         ],
+         "Error": [
+            null,
+            "Error"
+         ],
+         "Connecting": [
+            null,
+            "Connecting"
+         ],
+         "Authenticating": [
+            null,
+            "Authenticating"
+         ],
+         "Authentication Failed": [
+            null,
+            "Authentication Failed"
+         ],
+         "Online Contacts": [
+            null,
+            "Online Contacts"
+         ],
+         "Re-establishing encrypted session": [
+            null,
+            "Re-establishing encrypted session"
+         ],
+         "Generating private key.": [
+            null,
+            ""
+         ],
+         "Your browser might become unresponsive.": [
+            null,
+            ""
+         ],
+         "Authentication request from %1$s\n\nYour chat contact is attempting to verify your identity, by asking you the question below.\n\n%2$s": [
+            null,
+            ""
+         ],
+         "Could not verify this user's identify.": [
+            null,
+            ""
+         ],
+         "Exchanging private key with contact.": [
+            null,
+            ""
+         ],
+         "Personal message": [
+            null,
+            "Personal message"
+         ],
+         "me": [
+            null,
+            ""
+         ],
+         "is typing": [
+            null,
+            ""
+         ],
+         "has stopped typing": [
+            null,
+            ""
+         ],
+         "Show this menu": [
+            null,
+            "Show this menu"
+         ],
+         "Write in the third person": [
+            null,
+            "Write in the third person"
+         ],
+         "Remove messages": [
+            null,
+            "Remove messages"
+         ],
+         "Are you sure you want to clear the messages from this chat box?": [
+            null,
+            ""
+         ],
+         "Your message could not be sent": [
+            null,
+            ""
+         ],
+         "We received an unencrypted message": [
+            null,
+            ""
+         ],
+         "We received an unreadable encrypted message": [
+            null,
+            ""
+         ],
+         "This user has requested an encrypted session.": [
+            null,
+            ""
+         ],
+         "Here are the fingerprints, please confirm them with %1$s, outside of this chat.\n\nFingerprint for you, %2$s: %3$s\n\nFingerprint for %1$s: %4$s\n\nIf you have confirmed that the fingerprints match, click OK, otherwise click Cancel.": [
+            null,
+            ""
+         ],
+         "You will be prompted to provide a security question and then an answer to that question.\n\nYour contact will then be prompted the same question and if they type the exact same answer (case sensitive), their identity will be verified.": [
+            null,
+            ""
+         ],
+         "What is your security question?": [
+            null,
+            ""
+         ],
+         "What is the answer to the security question?": [
+            null,
+            ""
+         ],
+         "Invalid authentication scheme provided": [
+            null,
+            ""
+         ],
+         "Your messages are not encrypted anymore": [
+            null,
+            ""
+         ],
+         "Your messages are now encrypted but your contact's identity has not been verified.": [
+            null,
+            ""
+         ],
+         "Your contact's identify has been verified.": [
+            null,
+            ""
+         ],
+         "Your contact has ended encryption on their end, you should do the same.": [
+            null,
+            ""
+         ],
+         "Your messages are not encrypted. Click here to enable OTR encryption.": [
+            null,
+            ""
+         ],
+         "Your messages are encrypted, but your contact has not been verified.": [
+            null,
+            ""
+         ],
+         "Your messages are encrypted and your contact verified.": [
+            null,
+            ""
+         ],
+         "Your contact has closed their end of the private session, you should do the same": [
+            null,
+            ""
+         ],
+         "End encrypted conversation": [
+            null,
+            ""
+         ],
+         "Hide the list of participants": [
+            null,
+            ""
+         ],
+         "Refresh encrypted conversation": [
+            null,
+            ""
+         ],
+         "Start a call": [
+            null,
+            ""
+         ],
+         "Start encrypted conversation": [
+            null,
+            ""
+         ],
+         "Verify with fingerprints": [
+            null,
+            ""
+         ],
+         "Verify with SMP": [
+            null,
+            ""
+         ],
+         "What's this?": [
+            null,
+            ""
+         ],
+         "Online": [
+            null,
+            "Online"
+         ],
+         "Busy": [
+            null,
+            "Busy"
+         ],
+         "Away": [
+            null,
+            "Away"
+         ],
+         "Offline": [
+            null,
+            "Offline"
+         ],
+         "Contact name": [
+            null,
+            "Contact name"
+         ],
+         "Search": [
+            null,
+            "Search"
+         ],
+         "Contact username": [
+            null,
+            "Contact username"
+         ],
+         "Add": [
+            null,
+            "Add"
+         ],
+         "Click to add new chat contacts": [
+            null,
+            "Click to add new chat contacts"
+         ],
+         "Add a contact": [
+            null,
+            "Add a contact"
+         ],
+         "No users found": [
+            null,
+            "No users found"
+         ],
+         "Click to add as a chat contact": [
+            null,
+            "Click to add as a chat contact"
+         ],
+         "Room name": [
+            null,
+            "Room name"
+         ],
+         "Nickname": [
+            null,
+            "Nickname"
+         ],
+         "Server": [
+            null,
+            "Server"
+         ],
+         "Join": [
+            null,
+            "Join"
+         ],
+         "Show rooms": [
+            null,
+            "Show rooms"
+         ],
+         "Rooms": [
+            null,
+            "Rooms"
+         ],
+         "No rooms on %1$s": [
+            null,
+            "No rooms on %1$s"
+         ],
+         "Rooms on %1$s": [
+            null,
+            "Rooms on %1$s"
+         ],
+         "Click to open this room": [
+            null,
+            "Click to open this room"
+         ],
+         "Show more information on this room": [
+            null,
+            "Show more information on this room"
+         ],
+         "Description:": [
+            null,
+            "Description:"
+         ],
+         "Occupants:": [
+            null,
+            "Occupants:"
+         ],
+         "Features:": [
+            null,
+            "Features:"
+         ],
+         "Requires authentication": [
+            null,
+            "Requires authentication"
+         ],
+         "Hidden": [
+            null,
+            "Hidden"
+         ],
+         "Requires an invitation": [
+            null,
+            "Requires an invitation"
+         ],
+         "Moderated": [
+            null,
+            "Moderated"
+         ],
+         "Non-anonymous": [
+            null,
+            "Non-anonymous"
+         ],
+         "Open room": [
+            null,
+            "Open room"
+         ],
+         "Permanent room": [
+            null,
+            "Permanent room"
+         ],
+         "Public": [
+            null,
+            "Public"
+         ],
+         "Semi-anonymous": [
+            null,
+            "Semi-anonymous"
+         ],
+         "Temporary room": [
+            null,
+            "Temporary room"
+         ],
+         "Unmoderated": [
+            null,
+            "Unmoderated"
+         ],
+         "This user is a moderator": [
+            null,
+            "This user is a moderator"
+         ],
+         "This user can send messages in this room": [
+            null,
+            "This user can send messages in this room"
+         ],
+         "This user can NOT send messages in this room": [
+            null,
+            "This user can NOT send messages in this room"
+         ],
+         "Invite...": [
+            null,
+            ""
+         ],
+         "You are about to invite %1$s to the chat room \"%2$s\". ": [
+            null,
+            ""
+         ],
+         "You may optionally include a message, explaining the reason for the invitation.": [
+            null,
+            ""
+         ],
+         "Message": [
+            null,
+            "Message"
+         ],
+         "Error: could not execute the command": [
+            null,
+            ""
+         ],
+         "Remove user's ability to post messages": [
+            null,
+            ""
+         ],
+         "Change your nickname": [
+            null,
+            ""
+         ],
+         "Allow muted user to post messages": [
+            null,
+            ""
+         ],
+         "Save": [
+            null,
+            "Save"
+         ],
+         "Cancel": [
+            null,
+            "Cancel"
+         ],
+         "An error occurred while trying to save the form.": [
+            null,
+            "An error occurred while trying to save the form."
+         ],
+         "This chatroom requires a password": [
+            null,
+            "This chatroom requires a password"
+         ],
+         "Password: ": [
+            null,
+            "Password: "
+         ],
+         "Submit": [
+            null,
+            "Submit"
+         ],
+         "This room is not anonymous": [
+            null,
+            "This room is not anonymous"
+         ],
+         "This room now shows unavailable members": [
+            null,
+            "This room now shows unavailable members"
+         ],
+         "This room does not show unavailable members": [
+            null,
+            "This room does not show unavailable members"
+         ],
+         "Non-privacy-related room configuration has changed": [
+            null,
+            "Non-privacy-related room configuration has changed"
+         ],
+         "Room logging is now enabled": [
+            null,
+            "Room logging is now enabled"
+         ],
+         "Room logging is now disabled": [
+            null,
+            "Room logging is now disabled"
+         ],
+         "This room is now non-anonymous": [
+            null,
+            "This room is now non-anonymous"
+         ],
+         "This room is now semi-anonymous": [
+            null,
+            "This room is now semi-anonymous"
+         ],
+         "This room is now fully-anonymous": [
+            null,
+            "This room is now fully-anonymous"
+         ],
+         "A new room has been created": [
+            null,
+            "A new room has been created"
+         ],
+         "You have been banned from this room": [
+            null,
+            "You have been banned from this room"
+         ],
+         "You have been kicked from this room": [
+            null,
+            "You have been kicked from this room"
+         ],
+         "You have been removed from this room because of an affiliation change": [
+            null,
+            "You have been removed from this room because of an affiliation change"
+         ],
+         "You have been removed from this room because the room has changed to members-only and you're not a member": [
+            null,
+            "You have been removed from this room because the room has changed to members-only and you're not a member"
+         ],
+         "You have been removed from this room because the MUC (Multi-user chat) service is being shut down.": [
+            null,
+            "You have been removed from this room because the MUC (Multi-user chat) service is being shut down."
+         ],
+         "<strong>%1$s</strong> has been banned": [
+            null,
+            "<strong>%1$s</strong> has been banned"
+         ],
+         "<strong>%1$s</strong> has been kicked out": [
+            null,
+            "<strong>%1$s</strong> has been kicked out"
+         ],
+         "<strong>%1$s</strong> has been removed because of an affiliation change": [
+            null,
+            "<strong>%1$s</strong> has been removed because of an affiliation change"
+         ],
+         "<strong>%1$s</strong> has been removed for not being a member": [
+            null,
+            "<strong>%1$s</strong> has been removed for not being a member"
+         ],
+         "The reason given is: \"": [
+            null,
+            ""
+         ],
+         "You are not on the member list of this room": [
+            null,
+            "You are not on the member list of this room"
+         ],
+         "No nickname was specified": [
+            null,
+            "No nickname was specified"
+         ],
+         "You are not allowed to create new rooms": [
+            null,
+            "You are not allowed to create new rooms"
+         ],
+         "Your nickname doesn't conform to this room's policies": [
+            null,
+            "Your nickname doesn't conform to this room's policies"
+         ],
+         "Your nickname is already taken": [
+            null,
+            "Your nickname is already taken"
+         ],
+         "This room does not (yet) exist": [
+            null,
+            "This room does not (yet) exist"
+         ],
+         "This room has reached it's maximum number of occupants": [
+            null,
+            "This room has reached it's maximum number of occupants"
+         ],
+         "Topic set by %1$s to: %2$s": [
+            null,
+            "Topic set by %1$s to: %2$s"
+         ],
+         "%1$s has invited you to join a chat room: %2$s": [
+            null,
+            ""
+         ],
+         "%1$s has invited you to join a chat room: %2$s, and left the following reason: \"%3$s\"": [
+            null,
+            ""
+         ],
+         "Minimized": [
+            null,
+            ""
+         ],
+         "Click to remove this contact": [
+            null,
+            "Click to remove this contact"
+         ],
+         "Click to chat with this contact": [
+            null,
+            "Click to chat with this contact"
+         ],
+         "Type to filter": [
+            null,
+            ""
+         ],
+         "I am %1$s": [
+            null,
+            "I am %1$s"
+         ],
+         "Click here to write a custom status message": [
+            null,
+            "Click here to write a custom status message"
+         ],
+         "Click to change your chat status": [
+            null,
+            "Click to change your chat status"
+         ],
+         "Custom status": [
+            null,
+            "Custom status"
+         ],
+         "online": [
+            null,
+            "online"
+         ],
+         "busy": [
+            null,
+            "busy"
+         ],
+         "away for long": [
+            null,
+            "away for long"
+         ],
+         "away": [
+            null,
+            "away"
+         ],
+         "Your XMPP provider's domain name:": [
+            null,
+            ""
+         ],
+         "Fetch registration form": [
+            null,
+            ""
+         ],
+         "Tip: A list of public XMPP providers is available": [
+            null,
+            ""
+         ],
+         "here": [
+            null,
+            ""
+         ],
+         "Register": [
+            null,
+            ""
+         ],
+         "Sorry, the given provider does not support in band account registration. Please try with a different provider.": [
+            null,
+            ""
+         ],
+         "Requesting a registration form from the XMPP server": [
+            null,
+            ""
+         ],
+         "Something went wrong while establishing a connection with \"%1$s\". Are you sure it exists?": [
+            null,
+            ""
+         ],
+         "Now logging you in": [
+            null,
+            ""
+         ],
+         "Registered successfully": [
+            null,
+            ""
+         ],
+         "Return": [
+            null,
+            ""
+         ],
+         "The provider rejected your registration attempt. ": [
+            null,
+            ""
+         ],
+         "Password:": [
+            null,
+            "Password:"
+         ],
+         "Log In": [
+            null,
+            "Log In"
+         ],
+         "Sign in": [
+            null,
+            "Sign in"
+         ],
+         "Toggle chat": [
+            null,
+            ""
+         ]
+      }
+   }
+};
+locales["es"] = {
+   "domain": "converse",
+   "locale_data": {
+      "converse": {
+         "": {
+            "domain": "converse",
+            "plural_forms": "nplurals=2; plural=(n != 1);",
+            "lang": "es"
+         },
+         "unencrypted": [
+            null,
+            "texto plano"
+         ],
+         "unverified": [
+            null,
+            "sin verificar"
+         ],
+         "verified": [
+            null,
+            "verificado"
+         ],
+         "finished": [
+            null,
+            "finalizado"
+         ],
+         "This contact is busy": [
+            null,
+            "Este contacto está ocupado"
+         ],
+         "This contact is online": [
+            null,
+            "Este contacto está en línea"
+         ],
+         "This contact is offline": [
+            null,
+            "Este contacto está desconectado"
+         ],
+         "This contact is unavailable": [
+            null,
+            "Este contacto no está disponible"
+         ],
+         "This contact is away for an extended period": [
+            null,
+            "Este contacto está ausente por un largo periodo de tiempo"
+         ],
+         "This contact is away": [
+            null,
+            "Este contacto está ausente"
+         ],
+         "My contacts": [
+            null,
+            "Mis contactos"
+         ],
+         "Pending contacts": [
+            null,
+            "Contactos pendientes"
+         ],
+         "Contact requests": [
+            null,
+            "Solicitudes de contacto"
+         ],
+         "Ungrouped": [
+            null,
+            ""
+         ],
+         "Contacts": [
+            null,
+            "Contactos"
+         ],
+         "Groups": [
+            null,
+            ""
+         ],
+         "Reconnecting": [
+            null,
+            "Reconectando"
+         ],
+         "Error": [
+            null,
+            "Error"
+         ],
+         "Connecting": [
+            null,
+            "Conectando"
+         ],
+         "Authenticating": [
+            null,
+            "Autenticando"
+         ],
+         "Authentication Failed": [
+            null,
+            "La autenticación falló"
+         ],
+         "Online Contacts": [
+            null,
+            "En línea"
+         ],
+         "Re-establishing encrypted session": [
+            null,
+            "Re-estableciendo sesión cifrada"
+         ],
+         "Generating private key.": [
+            null,
+            "Generando llave privada"
+         ],
+         "Your browser might become unresponsive.": [
+            null,
+            "Su navegador podría dejar de responder por un momento"
+         ],
+         "Could not verify this user's identify.": [
+            null,
+            "No se pudo verificar la identidad de este usuario"
+         ],
+         "Personal message": [
+            null,
+            "Mensaje personal"
+         ],
+         "Are you sure you want to clear the messages from this room?": [
+            null,
+            "¿Está seguro de querer limpiar los mensajes de esta sala?"
+         ],
+         "me": [
+            null,
+            "yo"
+         ],
+         "is typing": [
+            null,
+            ""
+         ],
+         "has stopped typing": [
+            null,
+            ""
+         ],
+         "Show this menu": [
+            null,
+            "Mostrar este menú"
+         ],
+         "Write in the third person": [
+            null,
+            "Escribir en tercera persona"
+         ],
+         "Remove messages": [
+            null,
+            "Eliminar mensajes"
+         ],
+         "Are you sure you want to clear the messages from this chat box?": [
+            null,
+            "¿Está seguro de querer limpiar los mensajes de esta conversación?"
+         ],
+         "Your message could not be sent": [
+            null,
+            "Su mensaje no se pudo enviar"
+         ],
+         "We received an unencrypted message": [
+            null,
+            "Se recibío un mensaje sin cifrar"
+         ],
+         "We received an unreadable encrypted message": [
+            null,
+            "Se recibío un mensaje cifrado corrupto"
+         ],
+         "This user has requested an encrypted session.": [
+            null,
+            "El usuario ha solicitado una sesión cifrada"
+         ],
+         "Here are the fingerprints, please confirm them with %1$s, outside of this chat.\n\nFingerprint for you, %2$s: %3$s\n\nFingerprint for %1$s: %4$s\n\nIf you have confirmed that the fingerprints match, click OK, otherwise click Cancel.": [
+            null,
+            "Por favor confirme los identificadores de %1$s fuera de este chat.\n\nSu identificador es, %2$s: %3$s\n\nEl identificador de %1$s es: %4$s\n\nDespués de confirmar los identificadores haga click en OK, cancele si no concuerdan."
+         ],
+         "What is your security question?": [
+            null,
+            "Introduzca su pregunta de seguridad"
+         ],
+         "What is the answer to the security question?": [
+            null,
+            "Introduzca la respuesta a su pregunta de seguridad"
+         ],
+         "Invalid authentication scheme provided": [
+            null,
+            "Esquema de autenticación inválido"
+         ],
+         "Your messages are not encrypted anymore": [
+            null,
+            "Sus mensajes han dejado de cifrarse"
+         ],
+         "Your messages are not encrypted. Click here to enable OTR encryption.": [
+            null,
+            "Sus mensajes no están cifrados. Haga click aquí para habilitar el cifrado OTR"
+         ],
+         "End encrypted conversation": [
+            null,
+            "Finalizar sesión cifrada"
+         ],
+         "Hide the list of participants": [
+            null,
+            ""
+         ],
+         "Refresh encrypted conversation": [
+            null,
+            "Actualizar sesión cifrada"
+         ],
+         "Start a call": [
+            null,
+            ""
+         ],
+         "Start encrypted conversation": [
+            null,
+            "Iniciar sesión cifrada"
+         ],
+         "Verify with fingerprints": [
+            null,
+            "Verificar con identificadores"
+         ],
+         "Verify with SMP": [
+            null,
+            "Verificar con SMP"
+         ],
+         "What's this?": [
+            null,
+            "¿Qué es esto?"
+         ],
+         "Online": [
+            null,
+            "En línea"
+         ],
+         "Busy": [
+            null,
+            "Ocupado"
+         ],
+         "Away": [
+            null,
+            "Ausente"
+         ],
+         "Offline": [
+            null,
+            "Desconectado"
+         ],
+         "Contact name": [
+            null,
+            "Nombre de contacto"
+         ],
+         "Search": [
+            null,
+            "Búsqueda"
+         ],
+         "Contact username": [
+            null,
+            "Nombre de usuario de contacto"
+         ],
+         "Add": [
+            null,
+            "Agregar"
+         ],
+         "Click to add new chat contacts": [
+            null,
+            "Haga click para agregar nuevos contactos al chat"
+         ],
+         "Add a contact": [
+            null,
+            "Agregar un contacto"
+         ],
+         "No users found": [
+            null,
+            "Sin usuarios encontrados"
+         ],
+         "Click to add as a chat contact": [
+            null,
+            "Haga click para agregar como contacto de chat"
+         ],
+         "Room name": [
+            null,
+            "Nombre de sala"
+         ],
+         "Nickname": [
+            null,
+            "Apodo"
+         ],
+         "Server": [
+            null,
+            "Servidor"
+         ],
+         "Join": [
+            null,
+            "Unirse"
+         ],
+         "Show rooms": [
+            null,
+            "Mostrar salas"
+         ],
+         "Rooms": [
+            null,
+            "Salas"
+         ],
+         "No rooms on %1$s": [
+            null,
+            "Sin salas en %1$s"
+         ],
+         "Rooms on %1$s": [
+            null,
+            "Salas en %1$s"
+         ],
+         "Click to open this room": [
+            null,
+            "Haga click para abrir esta sala"
+         ],
+         "Show more information on this room": [
+            null,
+            "Mostrar más información en esta sala"
+         ],
+         "Description:": [
+            null,
+            "Descripción"
+         ],
+         "Occupants:": [
+            null,
+            "Ocupantes:"
+         ],
+         "Features:": [
+            null,
+            "Características:"
+         ],
+         "Requires authentication": [
+            null,
+            "Autenticación requerida"
+         ],
+         "Hidden": [
+            null,
+            "Oculto"
+         ],
+         "Requires an invitation": [
+            null,
+            "Requiere una invitación"
+         ],
+         "Moderated": [
+            null,
+            "Moderado"
+         ],
+         "Non-anonymous": [
+            null,
+            "No anónimo"
+         ],
+         "Open room": [
+            null,
+            "Abrir sala"
+         ],
+         "Permanent room": [
+            null,
+            "Sala permanente"
+         ],
+         "Public": [
+            null,
+            "Pública"
+         ],
+         "Semi-anonymous": [
+            null,
+            "Semi anónimo"
+         ],
+         "Temporary room": [
+            null,
+            "Sala temporal"
+         ],
+         "Unmoderated": [
+            null,
+            "Sin moderar"
+         ],
+         "This user is a moderator": [
+            null,
+            "Este usuario es un moderador"
+         ],
+         "This user can send messages in this room": [
+            null,
+            "Este usuario puede enviar mensajes en esta sala"
+         ],
+         "This user can NOT send messages in this room": [
+            null,
+            "Este usuario NO puede enviar mensajes en esta"
+         ],
+         "Invite...": [
+            null,
+            ""
+         ],
+         "You are about to invite %1$s to the chat room \"%2$s\". ": [
+            null,
+            ""
+         ],
+         "You may optionally include a message, explaining the reason for the invitation.": [
+            null,
+            ""
+         ],
+         "Message": [
+            null,
+            "Mensaje"
+         ],
+         "Error: could not execute the command": [
+            null,
+            ""
+         ],
+         "Remove user's ability to post messages": [
+            null,
+            ""
+         ],
+         "Change your nickname": [
+            null,
+            ""
+         ],
+         "Allow muted user to post messages": [
+            null,
+            ""
+         ],
+         "Save": [
+            null,
+            "Guardar"
+         ],
+         "Cancel": [
+            null,
+            "Cancelar"
+         ],
+         "An error occurred while trying to save the form.": [
+            null,
+            "Un error ocurrío mientras se guardaba el formulario."
+         ],
+         "This chatroom requires a password": [
+            null,
+            "Esta sala de chat requiere una contraseña."
+         ],
+         "Password: ": [
+            null,
+            "Contraseña: "
+         ],
+         "Submit": [
+            null,
+            "Enviar"
+         ],
+         "This room is not anonymous": [
+            null,
+            "Esta sala no es para usuarios anónimos"
+         ],
+         "This room now shows unavailable members": [
+            null,
+            "Esta sala ahora muestra los miembros no disponibles"
+         ],
+         "This room does not show unavailable members": [
+            null,
+            "Esta sala no muestra los miembros no disponibles"
+         ],
+         "Non-privacy-related room configuration has changed": [
+            null,
+            "Una configuración de la sala no relacionada con la privacidad ha sido cambiada"
+         ],
+         "Room logging is now enabled": [
+            null,
+            "El registro de la sala ahora está habilitado"
+         ],
+         "Room logging is now disabled": [
+            null,
+            "El registro de la sala ahora está deshabilitado"
+         ],
+         "This room is now non-anonymous": [
+            null,
+            "Esta sala ahora es pública"
+         ],
+         "This room is now semi-anonymous": [
+            null,
+            "Esta sala ahora es semi-anónima"
+         ],
+         "This room is now fully-anonymous": [
+            null,
+            "Esta sala ahora es completamente anónima"
+         ],
+         "A new room has been created": [
+            null,
+            "Una nueva sala ha sido creada"
+         ],
+         "You have been banned from this room": [
+            null,
+            "Usted ha sido bloqueado de esta sala"
+         ],
+         "You have been kicked from this room": [
+            null,
+            "Usted ha sido expulsado de esta sala"
+         ],
+         "You have been removed from this room because of an affiliation change": [
+            null,
+            "Usted ha sido eliminado de esta sala debido a un cambio de afiliación"
+         ],
+         "You have been removed from this room because the room has changed to members-only and you're not a member": [
+            null,
+            "Usted ha sido eliminado de esta sala debido a que la sala cambio su configuración a solo-miembros y usted no es un miembro"
+         ],
+         "You have been removed from this room because the MUC (Multi-user chat) service is being shut down.": [
+            null,
+            "Usted ha sido eliminado de esta sala debido a que el servicio MUC (Multi-user chat) está deshabilitado."
+         ],
+         "<strong>%1$s</strong> has been banned": [
+            null,
+            "<strong>%1$s</strong> ha sido bloqueado"
+         ],
+         "<strong>%1$s</strong> has been kicked out": [
+            null,
+            "<strong>%1$s</strong> ha sido expulsado"
+         ],
+         "<strong>%1$s</strong> has been removed because of an affiliation change": [
+            null,
+            "<strong>%1$s</strong> ha sido eliminado debido a un cambio de afiliación"
+         ],
+         "<strong>%1$s</strong> has been removed for not being a member": [
+            null,
+            "<strong>%1$s</strong> ha sido eliminado debido a que no es miembro"
+         ],
+         "The reason given is: \"": [
+            null,
+            ""
+         ],
+         "You are not on the member list of this room": [
+            null,
+            "Usted no está en la lista de miembros de esta sala"
+         ],
+         "No nickname was specified": [
+            null,
+            "Sin apodo especificado"
+         ],
+         "You are not allowed to create new rooms": [
+            null,
+            "Usted no esta autorizado para crear nuevas salas"
+         ],
+         "Your nickname doesn't conform to this room's policies": [
+            null,
+            "Su apodo no se ajusta a la política de esta sala"
+         ],
+         "Your nickname is already taken": [
+            null,
+            "Su apodo ya ha sido tomando por otro usuario"
+         ],
+         "This room does not (yet) exist": [
+            null,
+            "Esta sala (aún) no existe"
+         ],
+         "This room has reached it's maximum number of occupants": [
+            null,
+            "Esta sala ha alcanzado su número máximo de ocupantes"
+         ],
+         "Topic set by %1$s to: %2$s": [
+            null,
+            "Tema fijado por %1$s a: %2$s"
+         ],
+         "%1$s has invited you to join a chat room: %2$s": [
+            null,
+            ""
+         ],
+         "%1$s has invited you to join a chat room: %2$s, and left the following reason: \"%3$s\"": [
+            null,
+            ""
+         ],
+         "Click to restore this chat": [
+            null,
+            "Haga click para eliminar este contacto"
+         ],
+         "Minimized": [
+            null,
+            "Minimizado"
+         ],
+         "Click to remove this contact": [
+            null,
+            "Haga click para eliminar este contacto"
+         ],
+         "Click to chat with this contact": [
+            null,
+            "Haga click para conversar con este contacto"
+         ],
+         "Are you sure you want to remove this contact?": [
+            null,
+            "¿Esta seguro de querer eliminar este contacto?"
+         ],
+         "Type to filter": [
+            null,
+            ""
+         ],
+         "I am %1$s": [
+            null,
+            "Estoy %1$s"
+         ],
+         "Click here to write a custom status message": [
+            null,
+            "Haga click para escribir un mensaje de estatus personalizado"
+         ],
+         "Click to change your chat status": [
+            null,
+            "Haga click para cambiar su estatus de chat"
+         ],
+         "Custom status": [
+            null,
+            "Personalizar estatus"
+         ],
+         "online": [
+            null,
+            "en línea"
+         ],
+         "busy": [
+            null,
+            "ocupado"
+         ],
+         "away for long": [
+            null,
+            "ausente por mucho tiempo"
+         ],
+         "away": [
+            null,
+            "ausente"
+         ],
+         "Your XMPP provider's domain name:": [
+            null,
+            ""
+         ],
+         "Fetch registration form": [
+            null,
+            ""
+         ],
+         "Tip: A list of public XMPP providers is available": [
+            null,
+            ""
+         ],
+         "here": [
+            null,
+            ""
+         ],
+         "Register": [
+            null,
+            ""
+         ],
+         "Sorry, the given provider does not support in band account registration. Please try with a different provider.": [
+            null,
+            ""
+         ],
+         "Requesting a registration form from the XMPP server": [
+            null,
+            ""
+         ],
+         "Something went wrong while establishing a connection with \"%1$s\". Are you sure it exists?": [
+            null,
+            ""
+         ],
+         "Now logging you in": [
+            null,
+            ""
+         ],
+         "Registered successfully": [
+            null,
+            ""
+         ],
+         "Return": [
+            null,
+            ""
+         ],
+         "The provider rejected your registration attempt. ": [
+            null,
+            ""
+         ],
+         "Password:": [
+            null,
+            "Contraseña:"
+         ],
+         "Log In": [
+            null,
+            "Iniciar sesión"
+         ],
+         "Sign in": [
+            null,
+            "Registrar"
+         ],
+         "Toggle chat": [
+            null,
+            "Chat"
+         ]
+      }
+   }
+};
+locales["fr"] = {
+   "domain": "converse",
+   "locale_data": {
+      "converse": {
+         "": {
+            "domain": "converse",
+            "plural_forms": "nplurals=2; plural=(n != 1);",
+            "lang": "fr"
+         },
+         "unencrypted": [
+            null,
+            ""
+         ],
+         "unverified": [
+            null,
+            ""
+         ],
+         "verified": [
+            null,
+            ""
+         ],
+         "finished": [
+            null,
+            ""
+         ],
+         "This contact is busy": [
+            null,
+            ""
+         ],
+         "This contact is online": [
+            null,
+            ""
+         ],
+         "This contact is offline": [
+            null,
+            ""
+         ],
+         "This contact is away for an extended period": [
+            null,
+            ""
+         ],
+         "This contact is away": [
+            null,
+            ""
+         ],
+         "My contacts": [
+            null,
+            "Mes contacts"
+         ],
+         "Pending contacts": [
+            null,
+            "Contacts en attente"
+         ],
+         "Contact requests": [
+            null,
+            "Demandes de contacts"
+         ],
+         "Ungrouped": [
+            null,
+            ""
+         ],
+         "Contacts": [
+            null,
+            "Contacts"
+         ],
+         "Groups": [
+            null,
+            ""
+         ],
+         "Error": [
+            null,
+            "Erreur"
+         ],
+         "Connecting": [
+            null,
+            "Connection"
+         ],
+         "Authenticating": [
+            null,
+            "Authentification"
+         ],
+         "Authentication Failed": [
+            null,
+            "L'authentification a échoué"
+         ],
+         "Online Contacts": [
+            null,
+            "Contacts en ligne"
+         ],
+         "Re-establishing encrypted session": [
+            null,
+            ""
+         ],
+         "Generating private key.": [
+            null,
+            ""
+         ],
+         "Your browser might become unresponsive.": [
+            null,
+            ""
+         ],
+         "Authentication request from %1$s\n\nYour chat contact is attempting to verify your identity, by asking you the question below.\n\n%2$s": [
+            null,
+            ""
+         ],
+         "Could not verify this user's identify.": [
+            null,
+            ""
+         ],
+         "Exchanging private key with contact.": [
+            null,
+            ""
+         ],
+         "Personal message": [
+            null,
+            "Message personnel"
+         ],
+         "me": [
+            null,
+            ""
+         ],
+         "is typing": [
+            null,
+            ""
+         ],
+         "has stopped typing": [
+            null,
+            ""
+         ],
+         "Show this menu": [
+            null,
+            "Afficher ce menu"
+         ],
+         "Write in the third person": [
+            null,
+            "Écrire à la troisième personne"
+         ],
+         "Remove messages": [
+            null,
+            "Effacer les messages"
+         ],
+         "Are you sure you want to clear the messages from this chat box?": [
+            null,
+            ""
+         ],
+         "Your message could not be sent": [
+            null,
+            ""
+         ],
+         "We received an unencrypted message": [
+            null,
+            ""
+         ],
+         "We received an unreadable encrypted message": [
+            null,
+            ""
+         ],
+         "This user has requested an encrypted session.": [
+            null,
+            ""
+         ],
+         "Here are the fingerprints, please confirm them with %1$s, outside of this chat.\n\nFingerprint for you, %2$s: %3$s\n\nFingerprint for %1$s: %4$s\n\nIf you have confirmed that the fingerprints match, click OK, otherwise click Cancel.": [
+            null,
+            ""
+         ],
+         "You will be prompted to provide a security question and then an answer to that question.\n\nYour contact will then be prompted the same question and if they type the exact same answer (case sensitive), their identity will be verified.": [
+            null,
+            ""
+         ],
+         "What is your security question?": [
+            null,
+            ""
+         ],
+         "What is the answer to the security question?": [
+            null,
+            ""
+         ],
+         "Invalid authentication scheme provided": [
+            null,
+            ""
+         ],
+         "Your messages are not encrypted anymore": [
+            null,
+            ""
+         ],
+         "Your messages are now encrypted but your contact's identity has not been verified.": [
+            null,
+            ""
+         ],
+         "Your contact's identify has been verified.": [
+            null,
+            ""
+         ],
+         "Your contact has ended encryption on their end, you should do the same.": [
+            null,
+            ""
+         ],
+         "Your messages are not encrypted. Click here to enable OTR encryption.": [
+            null,
+            ""
+         ],
+         "Your messages are encrypted, but your contact has not been verified.": [
+            null,
+            ""
+         ],
+         "Your messages are encrypted and your contact verified.": [
+            null,
+            ""
+         ],
+         "Your contact has closed their end of the private session, you should do the same": [
+            null,
+            ""
+         ],
+         "End encrypted conversation": [
+            null,
+            ""
+         ],
+         "Hide the list of participants": [
+            null,
+            ""
+         ],
+         "Refresh encrypted conversation": [
+            null,
+            ""
+         ],
+         "Start a call": [
+            null,
+            ""
+         ],
+         "Start encrypted conversation": [
+            null,
+            ""
+         ],
+         "Verify with fingerprints": [
+            null,
+            ""
+         ],
+         "Verify with SMP": [
+            null,
+            ""
+         ],
+         "What's this?": [
+            null,
+            ""
+         ],
+         "Online": [
+            null,
+            "En ligne"
+         ],
+         "Busy": [
+            null,
+            "Occupé"
+         ],
+         "Away": [
+            null,
+            "Absent"
+         ],
+         "Offline": [
+            null,
+            "Déconnecté"
+         ],
+         "Contact name": [
+            null,
+            "Nom du contact"
+         ],
+         "Search": [
+            null,
+            "Rechercher"
+         ],
+         "Contact username": [
+            null,
+            "Nom du contact"
+         ],
+         "Add": [
+            null,
+            "Ajouter"
+         ],
+         "Click to add new chat contacts": [
+            null,
+            "Cliquez pour ajouter de nouveaux contacts"
+         ],
+         "Add a contact": [
+            null,
+            "Ajouter un contact"
+         ],
+         "No users found": [
+            null,
+            "Aucun utilisateur trouvé"
+         ],
+         "Click to add as a chat contact": [
+            null,
+            "Cliquer pour ajouter aux contacts de chat"
+         ],
+         "Room name": [
+            null,
+            "Numéro de salon"
+         ],
+         "Nickname": [
+            null,
+            "Alias"
+         ],
+         "Server": [
+            null,
+            "Serveur"
+         ],
+         "Join": [
+            null,
+            "Rejoindre"
+         ],
+         "Show rooms": [
+            null,
+            "Afficher les salons"
+         ],
+         "Rooms": [
+            null,
+            "Salons"
+         ],
+         "No rooms on %1$s": [
+            null,
+            "Aucun salon dans %1$s"
+         ],
+         "Rooms on %1$s": [
+            null,
+            "Salons dans %1$s"
+         ],
+         "Click to open this room": [
+            null,
+            "Cliquer pour ouvrir ce salon"
+         ],
+         "Show more information on this room": [
+            null,
+            "Afficher davantage d'informations sur ce salon"
+         ],
+         "Description:": [
+            null,
+            "Description :"
+         ],
+         "Occupants:": [
+            null,
+            "Participants :"
+         ],
+         "Features:": [
+            null,
+            "Caractéristiques :"
+         ],
+         "Requires authentication": [
+            null,
+            "Nécessite une authentification"
+         ],
+         "Hidden": [
+            null,
+            "Masqué"
+         ],
+         "Requires an invitation": [
+            null,
+            "Nécessite une invitation"
+         ],
+         "Moderated": [
+            null,
+            "Modéré"
+         ],
+         "Non-anonymous": [
+            null,
+            "Non-anonyme"
+         ],
+         "Open room": [
+            null,
+            "Ouvrir un salon"
+         ],
+         "Permanent room": [
+            null,
+            "Salon permanent"
+         ],
+         "Public": [
+            null,
+            "Public"
+         ],
+         "Semi-anonymous": [
+            null,
+            "Semi-anonyme"
+         ],
+         "Temporary room": [
+            null,
+            "Salon temporaire"
+         ],
+         "Unmoderated": [
+            null,
+            "Non modéré"
+         ],
+         "This user is a moderator": [
+            null,
+            "Cet utilisateur est modérateur"
+         ],
+         "This user can send messages in this room": [
+            null,
+            "Cet utilisateur peut envoyer des messages dans ce salon"
+         ],
+         "This user can NOT send messages in this room": [
+            null,
+            "Cet utilisateur ne peut PAS envoyer de messages dans ce salon"
+         ],
+         "Invite...": [
+            null,
+            ""
+         ],
+         "You are about to invite %1$s to the chat room \"%2$s\". ": [
+            null,
+            ""
+         ],
+         "You may optionally include a message, explaining the reason for the invitation.": [
+            null,
+            ""
+         ],
+         "Message": [
+            null,
+            "Message"
+         ],
+         "Error: could not execute the command": [
+            null,
+            ""
+         ],
+         "Remove user's ability to post messages": [
+            null,
+            ""
+         ],
+         "Change your nickname": [
+            null,
+            ""
+         ],
+         "Allow muted user to post messages": [
+            null,
+            ""
+         ],
+         "Save": [
+            null,
+            "Enregistrer"
+         ],
+         "Cancel": [
+            null,
+            "Annuler"
+         ],
+         "An error occurred while trying to save the form.": [
+            null,
+            "Une erreur est survenue lors de l'enregistrement du formulaire."
+         ],
+         "This chatroom requires a password": [
+            null,
+            "Ce salon nécessite un mot de passe."
+         ],
+         "Password: ": [
+            null,
+            "Mot de passe : "
+         ],
+         "Submit": [
+            null,
+            "Soumettre"
+         ],
+         "This room is not anonymous": [
+            null,
+            "Ce salon n'est pas anonyme"
+         ],
+         "This room now shows unavailable members": [
+            null,
+            "Ce salon affiche maintenant des membres indisponibles"
+         ],
+         "This room does not show unavailable members": [
+            null,
+            "Ce salon n'affiche pas les membres indisponibles"
+         ],
+         "Non-privacy-related room configuration has changed": [
+            null,
+            "Les paramètres du salon non liés à la confidentialité ont été modifiés"
+         ],
+         "Room logging is now enabled": [
+            null,
+            "Le logging du salon est activé"
+         ],
+         "Room logging is now disabled": [
+            null,
+            "Le logging du salon est désactivé"
+         ],
+         "This room is now non-anonymous": [
+            null,
+            "Ce salon est maintenant non-anonyme"
+         ],
+         "This room is now semi-anonymous": [
+            null,
+            "Ce salon est maintenant semi-anonyme"
+         ],
+         "This room is now fully-anonymous": [
+            null,
+            "Ce salon est maintenant entièrement anonyme"
+         ],
+         "A new room has been created": [
+            null,
+            "Un nouveau salon a été créé"
+         ],
+         "You have been banned from this room": [
+            null,
+            "Vous avez été banni de ce salon"
+         ],
+         "You have been kicked from this room": [
+            null,
+            "Vous avez été expulsé de ce salon"
+         ],
+         "You have been removed from this room because of an affiliation change": [
+            null,
+            "Vous avez été retiré de ce salon du fait d'un changement d'affiliation"
+         ],
+         "You have been removed from this room because the room has changed to members-only and you're not a member": [
+            null,
+            "Vous avez été retiré de ce salon parce que ce salon est devenu réservé aux membres et vous n'êtes pas membre"
+         ],
+         "You have been removed from this room because the MUC (Multi-user chat) service is being shut down.": [
+            null,
+            "Vous avez été retiré de ce salon parce que le service de chat multi-utilisateur a été désactivé."
+         ],
+         "<strong>%1$s</strong> has been banned": [
+            null,
+            "<strong>%1$s</strong> a été banni"
+         ],
+         "<strong>%1$s</strong> has been kicked out": [
+            null,
+            "<strong>%1$s</strong> a été expulsé"
+         ],
+         "<strong>%1$s</strong> has been removed because of an affiliation change": [
+            null,
+            "<strong>%1$s</strong> a été supprimé à cause d'un changement d'affiliation"
+         ],
+         "<strong>%1$s</strong> has been removed for not being a member": [
+            null,
+            "<strong>%1$s</strong> a été supprimé car il n'est pas membre"
+         ],
+         "The reason given is: \"": [
+            null,
+            ""
+         ],
+         "You are not on the member list of this room": [
+            null,
+            "Vous n'êtes pas dans la liste des membres de ce salon"
+         ],
+         "No nickname was specified": [
+            null,
+            "Aucun alias n'a été indiqué"
+         ],
+         "You are not allowed to create new rooms": [
+            null,
+            "Vous n'êtes pas autorisé à créer des salons"
+         ],
+         "Your nickname doesn't conform to this room's policies": [
+            null,
+            "Votre alias n'est pas conforme à la politique de ce salon"
+         ],
+         "Your nickname is already taken": [
+            null,
+            "Votre alias est déjà utilisé"
+         ],
+         "This room does not (yet) exist": [
+            null,
+            "Ce salon n'existe pas encore"
+         ],
+         "This room has reached it's maximum number of occupants": [
+            null,
+            "Ce salon a atteint la limite maximale d'occupants"
+         ],
+         "Topic set by %1$s to: %2$s": [
+            null,
+            "Le sujet '%1$s' a été défini par %2$s"
+         ],
+         "%1$s has invited you to join a chat room: %2$s": [
+            null,
+            ""
+         ],
+         "%1$s has invited you to join a chat room: %2$s, and left the following reason: \"%3$s\"": [
+            null,
+            ""
+         ],
+         "Minimized": [
+            null,
+            ""
+         ],
+         "Click to remove this contact": [
+            null,
+            "Cliquez pour supprimer ce contact"
+         ],
+         "Click to chat with this contact": [
+            null,
+            "Cliquez pour discuter avec ce contact"
+         ],
+         "Type to filter": [
+            null,
+            ""
+         ],
+         "I am %1$s": [
+            null,
+            "Je suis %1$s"
+         ],
+         "Click here to write a custom status message": [
+            null,
+            "Cliquez ici pour indiquer votre statut personnel"
+         ],
+         "Click to change your chat status": [
+            null,
+            "Cliquez pour changer votre statut"
+         ],
+         "Custom status": [
+            null,
+            "Statut personnel"
+         ],
+         "online": [
+            null,
+            "en ligne"
+         ],
+         "busy": [
+            null,
+            "occupé"
+         ],
+         "away for long": [
+            null,
+            "absent pour une longue durée"
+         ],
+         "away": [
+            null,
+            "absent"
+         ],
+         "Your XMPP provider's domain name:": [
+            null,
+            ""
+         ],
+         "Fetch registration form": [
+            null,
+            ""
+         ],
+         "Tip: A list of public XMPP providers is available": [
+            null,
+            ""
+         ],
+         "here": [
+            null,
+            ""
+         ],
+         "Register": [
+            null,
+            ""
+         ],
+         "Sorry, the given provider does not support in band account registration. Please try with a different provider.": [
+            null,
+            ""
+         ],
+         "Requesting a registration form from the XMPP server": [
+            null,
+            ""
+         ],
+         "Something went wrong while establishing a connection with \"%1$s\". Are you sure it exists?": [
+            null,
+            ""
+         ],
+         "Now logging you in": [
+            null,
+            ""
+         ],
+         "Registered successfully": [
+            null,
+            ""
+         ],
+         "Return": [
+            null,
+            ""
+         ],
+         "The provider rejected your registration attempt. ": [
+            null,
+            ""
+         ],
+         "Password:": [
+            null,
+            "Mot de passe :"
+         ],
+         "Log In": [
+            null,
+            "Se connecter"
+         ],
+         "Sign in": [
+            null,
+            "S'inscrire"
+         ],
+         "Toggle chat": [
+            null,
+            ""
+         ]
+      }
+   }
+};
+locales["he"] = {
+   "domain": "converse",
+   "locale_data": {
+      "converse": {
+         "": {
+            "domain": "converse",
+            "plural_forms": "nplurals=2; plural=(n != 1);",
+            "lang": "he"
+         },
+         "unencrypted": [
+            null,
+            "לא מוצפנת"
+         ],
+         "unverified": [
+            null,
+            "לא מאומתת"
+         ],
+         "verified": [
+            null,
+            "מאומתת"
+         ],
+         "finished": [
+            null,
+            "מוגמרת"
+         ],
+         "This contact is busy": [
+            null,
+            "איש קשר זה עסוק"
+         ],
+         "This contact is online": [
+            null,
+            "איש קשר זה מקוון"
+         ],
+         "This contact is offline": [
+            null,
+            "איש קשר זה לא מקוון"
+         ],
+         "This contact is unavailable": [
+            null,
+            "איש קשר זה לא זמין"
+         ],
+         "This contact is away for an extended period": [
+            null,
+            "איש קשר זה נעדר למשך זמן ממושך"
+         ],
+         "This contact is away": [
+            null,
+            "איש קשר זה הינו נעדר"
+         ],
+         "Click to hide these contacts": [
+            null,
+            "לחץ כדי להסתיר את אנשי קשר אלה"
+         ],
+         "My contacts": [
+            null,
+            "אנשי הקשר שלי"
+         ],
+         "Pending contacts": [
+            null,
+            "אנשי קשר ממתינים"
+         ],
+         "Contact requests": [
+            null,
+            "בקשות איש קשר"
+         ],
+         "Ungrouped": [
+            null,
+            "ללא קבוצה"
+         ],
+         "Contacts": [
+            null,
+            "אנשי קשר"
+         ],
+         "Groups": [
+            null,
+            "קבוצות"
+         ],
+         "Reconnecting": [
+            null,
+            "כעת מתחבר"
+         ],
+         "Error": [
+            null,
+            "שגיאה"
+         ],
+         "Connecting": [
+            null,
+            "כעת מתחבר"
+         ],
+         "Authenticating": [
+            null,
+            "כעת מאמת"
+         ],
+         "Authentication Failed": [
+            null,
+            "אימות נכשל"
+         ],
+         "Online Contacts": [
+            null,
+            "אנשי קשר מקוונים"
+         ],
+         "Re-establishing encrypted session": [
+            null,
+            "בסס מחדש ישיבה מוצפנת"
+         ],
+         "Generating private key.": [
+            null,
+            "כעת מפיק מפתח פרטי."
+         ],
+         "Your browser might become unresponsive.": [
+            null,
+            "הדפדפן שלך עשוי שלא להגיב."
+         ],
+         "Could not verify this user's identify.": [
+            null,
+            "לא היתה אפשרות לאמת את זהות משתמש זה."
+         ],
+         "Personal message": [
+            null,
+            "הודעה אישית"
+         ],
+         "Are you sure you want to clear the messages from this room?": [
+            null,
+            "האם אתה בטוח כי ברצונך לטהר את ההודעות מתוך חדר זה?"
+         ],
+         "me": [
+            null,
+            "אני"
+         ],
+         "is typing": [
+            null,
+            "מקליד/ה כעת"
+         ],
+         "has stopped typing": [
+            null,
+            "חדל/ה מלהקליד"
+         ],
+         "Show this menu": [
+            null,
+            "הצג את תפריט זה"
+         ],
+         "Write in the third person": [
+            null,
+            "כתוב בגוף השלישי"
+         ],
+         "Remove messages": [
+            null,
+            "הסר הודעות"
+         ],
+         "Are you sure you want to clear the messages from this chat box?": [
+            null,
+            "האם אתה בטוח כי ברצונך לטהר את ההודעות מתוך תיבת שיחה זה?"
+         ],
+         "Your message could not be sent": [
+            null,
+            "ההודעה שלך לא היתה יכולה להישלח"
+         ],
+         "We received an unencrypted message": [
+            null,
+            "אנחנו קיבלנו הודעה לא מוצפנת"
+         ],
+         "We received an unreadable encrypted message": [
+            null,
+            "אנחנו קיבלנו הודעה מוצפנת לא קריאה"
+         ],
+         "This user has requested an encrypted session.": [
+            null,
+            "משתמש זה ביקש ישיבה מוצפנת."
+         ],
+         "Here are the fingerprints, please confirm them with %1$s, outside of this chat.\n\nFingerprint for you, %2$s: %3$s\n\nFingerprint for %1$s: %4$s\n\nIf you have confirmed that the fingerprints match, click OK, otherwise click Cancel.": [
+            null,
+            "הרי טביעות האצבע, אנא אמת אותן עם %1$s, מחוץ לשיחה זו.\n\nטביעת אצבע עבורך, %2$s: %3$s\n\nטביעת אצבע עבור %1$s: %4$s\n\nהיה ואימתת כי טביעות האצבע תואמות, לחץ אישור (OK), אחרת לחץ ביטול (Cancel)."
+         ],
+         "What is your security question?": [
+            null,
+            "מהי שאלת האבטחה שלך?"
+         ],
+         "What is the answer to the security question?": [
+            null,
+            "מהי התשובה לשאלת האבטחה?"
+         ],
+         "Invalid authentication scheme provided": [
+            null,
+            "סופקה סכימת אימות שגויה"
+         ],
+         "Your messages are not encrypted anymore": [
+            null,
+            "ההודעות שלך אינן מוצפנות עוד"
+         ],
+         "Your messages are not encrypted. Click here to enable OTR encryption.": [
+            null,
+            "ההודעות שלך אינן מוצפנות. לחץ כאן כדי לאפשר OTR."
+         ],
+         "End encrypted conversation": [
+            null,
+            "סיים ישיבה מוצפנת"
+         ],
+         "Hide the list of participants": [
+            null,
+            ""
+         ],
+         "Refresh encrypted conversation": [
+            null,
+            "רענן ישיבה מוצפנת"
+         ],
+         "Start a call": [
+            null,
+            ""
+         ],
+         "Start encrypted conversation": [
+            null,
+            "התחל ישיבה מוצפנת"
+         ],
+         "Verify with fingerprints": [
+            null,
+            "אמת בעזרת טביעות אצבע"
+         ],
+         "Verify with SMP": [
+            null,
+            "אמת בעזרת SMP"
+         ],
+         "What's this?": [
+            null,
+            "מה זה?"
+         ],
+         "Online": [
+            null,
+            "מקוון"
+         ],
+         "Busy": [
+            null,
+            "עסוק"
+         ],
+         "Away": [
+            null,
+            "נעדר"
+         ],
+         "Offline": [
+            null,
+            "בלתי מקוון"
+         ],
+         "Contact name": [
+            null,
+            "שם איש קשר"
+         ],
+         "Search": [
+            null,
+            "חיפוש"
+         ],
+         "Contact username": [
+            null,
+            "שם משתמש איש קשר"
+         ],
+         "Add": [
+            null,
+            "הוסף"
+         ],
+         "Click to add new chat contacts": [
+            null,
+            "לחץ כדי להוסיף אנשי קשר שיחה חדשים"
+         ],
+         "Add a contact": [
+            null,
+            "הוסף איש קשר"
+         ],
+         "No users found": [
+            null,
+            "לא נמצאו משתמשים"
+         ],
+         "Click to add as a chat contact": [
+            null,
+            "לחץ כדי להוסיף בתור איש קשר שיחה"
+         ],
+         "Room name": [
+            null,
+            "שם חדר"
+         ],
+         "Nickname": [
+            null,
+            "שם כינוי"
+         ],
+         "Server": [
+            null,
+            "שרת"
+         ],
+         "Join": [
+            null,
+            "הצטרף"
+         ],
+         "Show rooms": [
+            null,
+            "הצג חדרים"
+         ],
+         "Rooms": [
+            null,
+            "חדרים"
+         ],
+         "No rooms on %1$s": [
+            null,
+            "אין חדרים על %1$s"
+         ],
+         "Rooms on %1$s": [
+            null,
+            "חדרים על %1$s"
+         ],
+         "Click to open this room": [
+            null,
+            "לחץ כדי לפתוח את חדר זה"
+         ],
+         "Show more information on this room": [
+            null,
+            "הצג עוד מידע אודות חדר זה"
+         ],
+         "Description:": [
+            null,
+            "תיאור:"
+         ],
+         "Occupants:": [
+            null,
+            "נוכחים:"
+         ],
+         "Features:": [
+            null,
+            "תכונות:"
+         ],
+         "Requires authentication": [
+            null,
+            "מצריך אישור"
+         ],
+         "Hidden": [
+            null,
+            "נסתר"
+         ],
+         "Requires an invitation": [
+            null,
+            "מצריך הזמנה"
+         ],
+         "Moderated": [
+            null,
+            "מבוקר"
+         ],
+         "Non-anonymous": [
+            null,
+            "לא אנונימי"
+         ],
+         "Open room": [
+            null,
+            "חדר פתוח"
+         ],
+         "Permanent room": [
+            null,
+            "חדר צמיתה"
+         ],
+         "Public": [
+            null,
+            "פומבי"
+         ],
+         "Semi-anonymous": [
+            null,
+            "אנונימי למחצה"
+         ],
+         "Temporary room": [
+            null,
+            "חדר זמני"
+         ],
+         "Unmoderated": [
+            null,
+            "לא מבוקר"
+         ],
+         "This user is a moderator": [
+            null,
+            "משתמש זה הינו אחראי"
+         ],
+         "This user can send messages in this room": [
+            null,
+            "משתמש זה מסוגל לשלוח הודעות בתוך חדר זה"
+         ],
+         "This user can NOT send messages in this room": [
+            null,
+            "משתמש זה ﬥﬡ מסוגל לשלוח הודעות בתוך חדר זה"
+         ],
+         "Invite...": [
+            null,
+            ""
+         ],
+         "You are about to invite %1$s to the chat room \"%2$s\". ": [
+            null,
+            ""
+         ],
+         "You may optionally include a message, explaining the reason for the invitation.": [
+            null,
+            ""
+         ],
+         "Message": [
+            null,
+            "הודעה"
+         ],
+         "Error: could not execute the command": [
+            null,
+            ""
+         ],
+         "Remove user's ability to post messages": [
+            null,
+            ""
+         ],
+         "Change your nickname": [
+            null,
+            ""
+         ],
+         "Allow muted user to post messages": [
+            null,
+            ""
+         ],
+         "Save": [
+            null,
+            "שמור"
+         ],
+         "Cancel": [
+            null,
+            "ביטול"
+         ],
+         "An error occurred while trying to save the form.": [
+            null,
+            "אירעה שגיאה במהלך ניסיון שמירת הטופס."
+         ],
+         "This chatroom requires a password": [
+            null,
+            "חדר שיחה זה מצריך סיסמה"
+         ],
+         "Password: ": [
+            null,
+            "סיסמה: "
+         ],
+         "Submit": [
+            null,
+            "שלח"
+         ],
+         "This room is not anonymous": [
+            null,
+            "חדר זה אינו אנונימי"
+         ],
+         "This room now shows unavailable members": [
+            null,
+            "חדר זה כעת מציג חברים לא זמינים"
+         ],
+         "This room does not show unavailable members": [
+            null,
+            "חדר זה לא מציג חברים לא זמינים"
+         ],
+         "Non-privacy-related room configuration has changed": [
+            null,
+            "תצורת חדר אשר לא-קשורה-בפרטיות שונתה"
+         ],
+         "Room logging is now enabled": [
+            null,
+            "יומן חדר הינו מופעל כעת"
+         ],
+         "Room logging is now disabled": [
+            null,
+            "יומן חדר הינו מנוטרל כעת"
+         ],
+         "This room is now non-anonymous": [
+            null,
+            "חדר זה אינו אנונימי כעת"
+         ],
+         "This room is now semi-anonymous": [
+            null,
+            "חדר זה הינו אנונימי למחצה כעת"
+         ],
+         "This room is now fully-anonymous": [
+            null,
+            "חדר זה הינו אנונימי לחלוטין כעת"
+         ],
+         "A new room has been created": [
+            null,
+            "חדר חדש נוצר"
+         ],
+         "You have been banned from this room": [
+            null,
+            "נאסרת מתוך חדר זה"
+         ],
+         "You have been kicked from this room": [
+            null,
+            "נבעטת מתוך חדר זה"
+         ],
+         "You have been removed from this room because of an affiliation change": [
+            null,
+            "הוסרת מתוך חדר זה משום שינוי שיוך"
+         ],
+         "You have been removed from this room because the room has changed to members-only and you're not a member": [
+            null,
+            "הוסרת מתוך חדר זה משום שהחדר שונה לחברים-בלבד ואינך במעמד של חבר"
+         ],
+         "You have been removed from this room because the MUC (Multi-user chat) service is being shut down.": [
+            null,
+            "הוסרת מתוך חדר זה משום ששירות שמ״מ (שיחה מרובת משתמשים) זה כעת מצוי בהליכי סגירה."
+         ],
+         "<strong>%1$s</strong> has been banned": [
+            null,
+            "<strong>%1$s</strong> נאסר(ה)"
+         ],
+         "<strong>%1$s</strong> has been kicked out": [
+            null,
+            "<strong>%1$s</strong> נבעט(ה)"
+         ],
+         "<strong>%1$s</strong> has been removed because of an affiliation change": [
+            null,
+            "<strong>%1$s</strong> הוסרה(ה) משום שינוי שיוך"
+         ],
+         "<strong>%1$s</strong> has been removed for not being a member": [
+            null,
+            "<strong>%1$s</strong> הוסר(ה) משום אי הימצאות במסגרת מעמד של חבר"
+         ],
+         "The reason given is: \"": [
+            null,
+            ""
+         ],
+         "You are not on the member list of this room": [
+            null,
+            "אינך ברשימת החברים של חדר זה"
+         ],
+         "No nickname was specified": [
+            null,
+            "לא צוין שום שם כינוי"
+         ],
+         "You are not allowed to create new rooms": [
+            null,
+            "אין לך רשות ליצור חדרים חדשים"
+         ],
+         "Your nickname doesn't conform to this room's policies": [
+            null,
+            "שם הכינוי שלך לא תואם את המדינויות של חדר זה"
+         ],
+         "Your nickname is already taken": [
+            null,
+            "שם הכינוי שלך הינו תפוס"
+         ],
+         "This room does not (yet) exist": [
+            null,
+            "חדר זה (עדיין) לא קיים"
+         ],
+         "This room has reached it's maximum number of occupants": [
+            null,
+            "חדר זה הגיע לסף הנוכחים המרבי שלו"
+         ],
+         "Topic set by %1$s to: %2$s": [
+            null,
+            "נושא חדר זה נקבע על ידי %1$s אל: %2$s"
+         ],
+         "%1$s has invited you to join a chat room: %2$s": [
+            null,
+            ""
+         ],
+         "%1$s has invited you to join a chat room: %2$s, and left the following reason: \"%3$s\"": [
+            null,
+            ""
+         ],
+         "Click to restore this chat": [
+            null,
+            "לחץ כדי לשחזר את שיחה זו"
+         ],
+         "Minimized": [
+            null,
+            "ממוזער"
+         ],
+         "Click to remove this contact": [
+            null,
+            "לחץ כדי להסיר את איש קשר זה"
+         ],
+         "Click to accept this contact request": [
+            null,
+            "לחץ כדי לקבל את בקשת איש קשר זה"
+         ],
+         "Click to decline this contact request": [
+            null,
+            "לחץ כדי לסרב את בקשת איש קשר זה"
+         ],
+         "Click to chat with this contact": [
+            null,
+            "לחץ כדי לשוחח עם איש קשר זה"
+         ],
+         "Are you sure you want to remove this contact?": [
+            null,
+            "האם אתה בטוח כי ברצונך להסיר את איש קשר זה?"
+         ],
+         "Are you sure you want to decline this contact request?": [
+            null,
+            "האם אתה בטוח כי ברצונך לסרב את בקשת איש קשר זה?"
+         ],
+         "Type to filter": [
+            null,
+            "הקלד כדי לסנן"
+         ],
+         "I am %1$s": [
+            null,
+            "מצבי כעת הינו %1$s"
+         ],
+         "Click here to write a custom status message": [
+            null,
+            "לחץ כאן כדי לכתוב הודעת מצב מותאמת"
+         ],
+         "Click to change your chat status": [
+            null,
+            "לחץ כדי לשנות את הודעת השיחה שלך"
+         ],
+         "Custom status": [
+            null,
+            "מצב מותאם"
+         ],
+         "online": [
+            null,
+            "מקוון"
+         ],
+         "busy": [
+            null,
+            "עסוק"
+         ],
+         "away for long": [
+            null,
+            "נעדר לזמן מה"
+         ],
+         "away": [
+            null,
+            "נעדר"
+         ],
+         "Your XMPP provider's domain name:": [
+            null,
+            ""
+         ],
+         "Fetch registration form": [
+            null,
+            ""
+         ],
+         "Tip: A list of public XMPP providers is available": [
+            null,
+            ""
+         ],
+         "here": [
+            null,
+            ""
+         ],
+         "Register": [
+            null,
+            ""
+         ],
+         "Sorry, the given provider does not support in band account registration. Please try with a different provider.": [
+            null,
+            ""
+         ],
+         "Requesting a registration form from the XMPP server": [
+            null,
+            ""
+         ],
+         "Something went wrong while establishing a connection with \"%1$s\". Are you sure it exists?": [
+            null,
+            ""
+         ],
+         "Now logging you in": [
+            null,
+            ""
+         ],
+         "Registered successfully": [
+            null,
+            ""
+         ],
+         "Return": [
+            null,
+            ""
+         ],
+         "The provider rejected your registration attempt. ": [
+            null,
+            ""
+         ],
+         "Password:": [
+            null,
+            "סיסמה:"
+         ],
+         "Log In": [
+            null,
+            "כניסה"
+         ],
+         "Sign in": [
+            null,
+            "התחברות"
+         ],
+         "Toggle chat": [
+            null,
+            "הפעל שיח"
+         ]
+      }
+   }
+};
+locales["hu"] = {
+   "domain": "converse",
+   "locale_data": {
+      "converse": {
+         "unencrypted": [
+            null,
+            ""
+         ],
+         "unverified": [
+            null,
+            ""
+         ],
+         "verified": [
+            null,
+            ""
+         ],
+         "finished": [
+            null,
+            ""
+         ],
+         "This contact is busy": [
+            null,
+            "Elfoglalt"
+         ],
+         "This contact is online": [
+            null,
+            "Online"
+         ],
+         "This contact is offline": [
+            null,
+            "Nincs bejelentkezve"
+         ],
+         "This contact is unavailable": [
+            null,
+            "Elérhetetlen"
+         ],
+         "This contact is away for an extended period": [
+            null,
+            "Hosszabb ideje távol"
+         ],
+         "This contact is away": [
+            null,
+            "Távol"
+         ],
+         "My contacts": [
+            null,
+            "Kapcsolatok:"
+         ],
+         "Pending contacts": [
+            null,
+            "Függőben levő kapcsolatok"
+         ],
+         "Contact requests": [
+            null,
+            "Kapcsolat felvételi kérés"
+         ],
+         "Ungrouped": [
+            null,
+            ""
+         ],
+         "Contacts": [
+            null,
+            "Kapcsolatok"
+         ],
+         "Groups": [
+            null,
+            ""
+         ],
+         "Error": [
+            null,
+            "Hiba"
+         ],
+         "Connecting": [
+            null,
+            "Kapcsolódás"
+         ],
+         "Authenticating": [
+            null,
+            "Azonosítás"
+         ],
+         "Authentication Failed": [
+            null,
+            "Azonosítási hiba"
+         ],
+         "Online Contacts": [
+            null,
+            "Online kapcsolatok"
+         ],
+         "Re-establishing encrypted session": [
+            null,
+            ""
+         ],
+         "Generating private key.": [
+            null,
+            ""
+         ],
+         "Your browser might become unresponsive.": [
+            null,
+            ""
+         ],
+         "Authentication request from %1$s\n\nYour chat contact is attempting to verify your identity, by asking you the question below.\n\n%2$s": [
+            null,
+            ""
+         ],
+         "Could not verify this user's identify.": [
+            null,
+            ""
+         ],
+         "Exchanging private key with contact.": [
+            null,
+            ""
+         ],
+         "Personal message": [
+            null,
+            "Saját üzenet"
+         ],
+         "me": [
+            null,
+            "én"
+         ],
+         "Show this menu": [
+            null,
+            "Mutasd ezt a menüt"
+         ],
+         "Write in the third person": [
+            null,
+            ""
+         ],
+         "Remove messages": [
+            null,
+            "Üzenet törlése"
+         ],
+         "Are you sure you want to clear the messages from this chat box?": [
+            null,
+            ""
+         ],
+         "Your message could not be sent": [
+            null,
+            ""
+         ],
+         "We received an unencrypted message": [
+            null,
+            ""
+         ],
+         "We received an unreadable encrypted message": [
+            null,
+            ""
+         ],
+         "This user has requested an encrypted session.": [
+            null,
+            ""
+         ],
+         "Here are the fingerprints, please confirm them with %1$s, outside of this chat.\n\nFingerprint for you, %2$s: %3$s\n\nFingerprint for %1$s: %4$s\n\nIf you have confirmed that the fingerprints match, click OK, otherwise click Cancel.": [
+            null,
+            ""
+         ],
+         "You will be prompted to provide a security question and then an answer to that question.\n\nYour contact will then be prompted the same question and if they type the exact same answer (case sensitive), their identity will be verified.": [
+            null,
+            ""
+         ],
+         "What is your security question?": [
+            null,
+            ""
+         ],
+         "What is the answer to the security question?": [
+            null,
+            ""
+         ],
+         "Invalid authentication scheme provided": [
+            null,
+            ""
+         ],
+         "Your messages are not encrypted anymore": [
+            null,
+            ""
+         ],
+         "Your messages are now encrypted but your contact's identity has not been verified.": [
+            null,
+            ""
+         ],
+         "Your contact's identify has been verified.": [
+            null,
+            ""
+         ],
+         "Your contact has ended encryption on their end, you should do the same.": [
+            null,
+            ""
+         ],
+         "Your messages are not encrypted. Click here to enable OTR encryption.": [
+            null,
+            ""
+         ],
+         "Your messages are encrypted, but your contact has not been verified.": [
+            null,
+            ""
+         ],
+         "Your messages are encrypted and your contact verified.": [
+            null,
+            ""
+         ],
+         "Your contact has closed their end of the private session, you should do the same": [
+            null,
+            ""
+         ],
+         "End encrypted conversation": [
+            null,
+            ""
+         ],
+         "Hide the list of participants": [
+            null,
+            ""
+         ],
+         "Refresh encrypted conversation": [
+            null,
+            ""
+         ],
+         "Start a call": [
+            null,
+            ""
+         ],
+         "Start encrypted conversation": [
+            null,
+            ""
+         ],
+         "Verify with fingerprints": [
+            null,
+            ""
+         ],
+         "Verify with SMP": [
+            null,
+            ""
+         ],
+         "What's this?": [
+            null,
+            ""
+         ],
+         "Online": [
+            null,
+            "Elérhető"
+         ],
+         "Busy": [
+            null,
+            "Foglalt"
+         ],
+         "Away": [
+            null,
+            "Távol"
+         ],
+         "Offline": [
+            null,
+            "Nem elérhető"
+         ],
+         "Contact name": [
+            null,
+            "Kapcsolat neve"
+         ],
+         "Search": [
+            null,
+            "Keresés"
+         ],
+         "Contact username": [
+            null,
+            "Felhasználónév"
+         ],
+         "Add": [
+            null,
+            "Hozzáadás"
+         ],
+         "Click to add new chat contacts": [
+            null,
+            "Új kapcsolatok hozzáadása"
+         ],
+         "Add a contact": [
+            null,
+            "Új kapcsolat"
+         ],
+         "No users found": [
+            null,
+            "Nincs találat"
+         ],
+         "Click to add as a chat contact": [
+            null,
+            "Csevegő kapcsolatként hozzáad"
+         ],
+         "Room name": [
+            null,
+            "A szoba neve"
+         ],
+         "Nickname": [
+            null,
+            "Becenév"
+         ],
+         "Server": [
+            null,
+            "Szerver"
+         ],
+         "Join": [
+            null,
+            "Csatlakozás"
+         ],
+         "Show rooms": [
+            null,
+            "Létező szobák"
+         ],
+         "Rooms": [
+            null,
+            "Szobák"
+         ],
+         "No rooms on %1$s": [
+            null,
+            "Nincs csevegő szoba a(z) %1$s szerveren"
+         ],
+         "Rooms on %1$s": [
+            null,
+            "Csevegő szobák a(z) %1$s szerveren"
+         ],
+         "Click to open this room": [
+            null,
+            "Belépés a csevegő szobába"
+         ],
+         "Show more information on this room": [
+            null,
+            "További információk a csevegő szobáról"
+         ],
+         "Description:": [
+            null,
+            "Leírás:"
+         ],
+         "Occupants:": [
+            null,
+            "Jelenlevők:"
+         ],
+         "Features:": [
+            null,
+            "Tulajdonságok"
+         ],
+         "Requires authentication": [
+            null,
+            "Azonosítás szükséges"
+         ],
+         "Hidden": [
+            null,
+            "Rejtett"
+         ],
+         "Requires an invitation": [
+            null,
+            "Meghívás szükséges"
+         ],
+         "Moderated": [
+            null,
+            "Moderált"
+         ],
+         "Non-anonymous": [
+            null,
+            "NEM névtelen"
+         ],
+         "Open room": [
+            null,
+            "Nyitott szoba"
+         ],
+         "Permanent room": [
+            null,
+            "Állandó szoba"
+         ],
+         "Public": [
+            null,
+            "Nyílvános"
+         ],
+         "Semi-anonymous": [
+            null,
+            "Félig névtelen"
+         ],
+         "Temporary room": [
+            null,
+            "Ideiglenes szoba"
+         ],
+         "Unmoderated": [
+            null,
+            "Moderálatlan"
+         ],
+         "This user is a moderator": [
+            null,
+            "Ez a felhasználó egy moderátor"
+         ],
+         "This user can send messages in this room": [
+            null,
+            "Ez a felhasználó küldhet üzenetet ebbe a szobába"
+         ],
+         "This user can NOT send messages in this room": [
+            null,
+            "Ez a felhasználó NEM küldhet üzenetet ebbe a szobába"
+         ],
+         "Invite...": [
+            null,
+            ""
+         ],
+         "You are about to invite %1$s to the chat room \"%2$s\". ": [
+            null,
+            ""
+         ],
+         "You may optionally include a message, explaining the reason for the invitation.": [
+            null,
+            ""
+         ],
+         "Message": [
+            null,
+            "Üzenet"
+         ],
+         "Error: could not execute the command": [
+            null,
+            ""
+         ],
+         "Write in 3rd person": [
+            null,
+            ""
+         ],
+         "Remove user's ability to post messages": [
+            null,
+            ""
+         ],
+         "Change your nickname": [
+            null,
+            ""
+         ],
+         "Allow muted user to post messages": [
+            null,
+            ""
+         ],
+         "Save": [
+            null,
+            "Mentés"
+         ],
+         "Cancel": [
+            null,
+            "Mégsem"
+         ],
+         "An error occurred while trying to save the form.": [
+            null,
+            "Hiba történt az adatok mentése közben."
+         ],
+         "This chatroom requires a password": [
+            null,
+            "A csevegő szoba belépéshez jelszó szükséges"
+         ],
+         "Password: ": [
+            null,
+            "Jelszó:"
+         ],
+         "Submit": [
+            null,
+            "Küldés"
+         ],
+         "This room is not anonymous": [
+            null,
+            "Ez a szoba NEM névtelen"
+         ],
+         "This room now shows unavailable members": [
+            null,
+            "Ez a szoba mutatja az elérhetetlen tagokat"
+         ],
+         "This room does not show unavailable members": [
+            null,
+            "Ez a szoba nem mutatja az elérhetetlen tagokat"
+         ],
+         "Non-privacy-related room configuration has changed": [
+            null,
+            "A szoba általános konfigurációja módosult"
+         ],
+         "Room logging is now enabled": [
+            null,
+            "A szobába a belépés lehetséges"
+         ],
+         "Room logging is now disabled": [
+            null,
+            "A szobába a belépés szünetel"
+         ],
+         "This room is now non-anonymous": [
+            null,
+            "Ez a szoba most NEM névtelen"
+         ],
+         "This room is now semi-anonymous": [
+            null,
+            "Ez a szoba most félig névtelen"
+         ],
+         "This room is now fully-anonymous": [
+            null,
+            "Ez a szoba most teljesen névtelen"
+         ],
+         "A new room has been created": [
+            null,
+            "Létrejött egy új csevegő szoba"
+         ],
+         "You have been banned from this room": [
+            null,
+            "Ki lettél tíltva ebből a szobából"
+         ],
+         "You have been kicked from this room": [
+            null,
+            "Ki lettél dobva ebből a szobából"
+         ],
+         "You have been removed from this room because of an affiliation change": [
+            null,
+            "Taglista módosítás miatt kiléptettünk a csevegő szobából"
+         ],
+         "You have been removed from this room because the room has changed to members-only and you're not a member": [
+            null,
+            "Kiléptettünk a csevegő szobából, mert mostantól csak a taglistán szereplők lehetnek jelen."
+         ],
+         "You have been removed from this room because the MUC (Multi-user chat) service is being shut down.": [
+            null,
+            "Kiléptettünk a csevegő szobából, mert a MUC (Multi-User Chat) szolgáltatás leállításra került."
+         ],
+         "<strong>%1$s</strong> has been banned": [
+            null,
+            "A szobából kitíltva: <strong>%1$s</strong>"
+         ],
+         "<strong>%1$s</strong> has been kicked out": [
+            null,
+            "A szobából kidobva: <strong>%1$s</strong>"
+         ],
+         "<strong>%1$s</strong> has been removed because of an affiliation change": [
+            null,
+            "Taglista módosítás miatt a szobából kiléptetve: <strong>%1$s</strong>"
+         ],
+         "<strong>%1$s</strong> has been removed for not being a member": [
+            null,
+            "A taglistán nem szerepel így a szobából kiléptetve: <strong>%1$s</strong>"
+         ],
+         "The reason given is: \"": [
+            null,
+            ""
+         ],
+         "You are not on the member list of this room": [
+            null,
+            "Nem szerepelsz a csevegő szoba taglistáján"
+         ],
+         "No nickname was specified": [
+            null,
+            "Nem lett megadva becenév"
+         ],
+         "You are not allowed to create new rooms": [
+            null,
+            "Nem lehet új csevegő szobát létrehozni"
+         ],
+         "Your nickname doesn't conform to this room's policies": [
+            null,
+            "A beceneved ütközik a csevegő szoba szabályzataival"
+         ],
+         "Your nickname is already taken": [
+            null,
+            "A becenevedet már valaki használja"
+         ],
+         "This room does not (yet) exist": [
+            null,
+            "Ez a szoba (még) nem létezik"
+         ],
+         "This room has reached it's maximum number of occupants": [
+            null,
+            "Ez a csevegő szoba elérte a maximális jelenlevők számát"
+         ],
+         "Topic set by %1$s to: %2$s": [
+            null,
+            "A következő témát állította be %1$s: %2$s"
+         ],
+         "%1$s has invited you to join a chat room: %2$s": [
+            null,
+            ""
+         ],
+         "%1$s has invited you to join a chat room: %2$s, and left the following reason: \"%3$s\"": [
+            null,
+            ""
+         ],
+         "Minimized": [
+            null,
+            ""
+         ],
+         "Click to remove this contact": [
+            null,
+            "A kapcsolat törlése"
+         ],
+         "Click to chat with this contact": [
+            null,
+            "Csevegés indítása ezzel a kapcsolatunkkal"
+         ],
+         "Type to filter": [
+            null,
+            ""
+         ],
+         "I am %1$s": [
+            null,
+            "%1$s vagyok"
+         ],
+         "Click here to write a custom status message": [
+            null,
+            "Egyedi státusz üzenet írása"
+         ],
+         "Click to change your chat status": [
+            null,
+            "Saját státusz beállítása"
+         ],
+         "Custom status": [
+            null,
+            "Egyedi státusz"
+         ],
+         "online": [
+            null,
+            "online"
+         ],
+         "busy": [
+            null,
+            "elfoglalt"
+         ],
+         "away for long": [
+            null,
+            "hosszú ideje távol"
+         ],
+         "away": [
+            null,
+            "távol"
+         ],
+         "Your XMPP provider's domain name:": [
+            null,
+            ""
+         ],
+         "Fetch registration form": [
+            null,
+            ""
+         ],
+         "Tip: A list of public XMPP providers is available": [
+            null,
+            ""
+         ],
+         "here": [
+            null,
+            ""
+         ],
+         "Register": [
+            null,
+            ""
+         ],
+         "Sorry, the given provider does not support in band account registration. Please try with a different provider.": [
+            null,
+            ""
+         ],
+         "Requesting a registration form from the XMPP server": [
+            null,
+            ""
+         ],
+         "Something went wrong while establishing a connection with \"%1$s\". Are you sure it exists?": [
+            null,
+            ""
+         ],
+         "Now logging you in": [
+            null,
+            ""
+         ],
+         "Registered successfully": [
+            null,
+            ""
+         ],
+         "Return": [
+            null,
+            ""
+         ],
+         "The provider rejected your registration attempt. ": [
+            null,
+            ""
+         ],
+         "Password:": [
+            null,
+            "Jelszó:"
+         ],
+         "Log In": [
+            null,
+            "Belépés"
+         ],
+         "Sign in": [
+            null,
+            "Belépés"
+         ],
+         "Toggle chat": [
+            null,
+            ""
+         ],
+         "": {
+            "domain": "converse",
+            "lang": "hu"
+         }
+      }
+   }
+};
+locales["id"] = {
+   "domain": "converse",
+   "locale_data": {
+      "converse": {
+         "": {
+            "domain": "converse",
+            "lang": "id"
+         },
+         "unencrypted": [
+            null,
+            "tak dienkripsi"
+         ],
+         "unverified": [
+            null,
+            "tak diverifikasi"
+         ],
+         "verified": [
+            null,
+            "diverifikasi"
+         ],
+         "finished": [
+            null,
+            "selesai"
+         ],
+         "This contact is busy": [
+            null,
+            "Teman ini sedang sibuk"
+         ],
+         "This contact is online": [
+            null,
+            "Teman ini terhubung"
+         ],
+         "This contact is offline": [
+            null,
+            "Teman ini tidak terhubung"
+         ],
+         "This contact is unavailable": [
+            null,
+            "Teman ini tidak tersedia"
+         ],
+         "This contact is away for an extended period": [
+            null,
+            "Teman ini tidak di tempat untuk waktu yang lama"
+         ],
+         "This contact is away": [
+            null,
+            "Teman ini tidak di tempat"
+         ],
+         "My contacts": [
+            null,
+            "Teman saya"
+         ],
+         "Pending contacts": [
+            null,
+            "Teman yang menunggu"
+         ],
+         "Contact requests": [
+            null,
+            "Permintaan pertemanan"
+         ],
+         "Ungrouped": [
+            null,
+            ""
+         ],
+         "Contacts": [
+            null,
+            "Teman"
+         ],
+         "Groups": [
+            null,
+            ""
+         ],
+         "Error": [
+            null,
+            "Kesalahan"
+         ],
+         "Connecting": [
+            null,
+            "Menyambung"
+         ],
+         "Authenticating": [
+            null,
+            "Melakukan otentikasi"
+         ],
+         "Authentication Failed": [
+            null,
+            "Otentikasi gagal"
+         ],
+         "Online Contacts": [
+            null,
+            "Teman yang Terhubung"
+         ],
+         "Re-establishing encrypted session": [
+            null,
+            "Menyambung kembali sesi terenkripsi"
+         ],
+         "Generating private key.": [
+            null,
+            ""
+         ],
+         "Your browser might become unresponsive.": [
+            null,
+            ""
+         ],
+         "Could not verify this user's identify.": [
+            null,
+            "Tak dapat melakukan verifikasi identitas pengguna ini."
+         ],
+         "Exchanging private key with contact.": [
+            null,
+            ""
+         ],
+         "Personal message": [
+            null,
+            "Pesan pribadi"
+         ],
+         "me": [
+            null,
+            "saya"
+         ],
+         "is typing": [
+            null,
+            ""
+         ],
+         "has stopped typing": [
+            null,
+            ""
+         ],
+         "Show this menu": [
+            null,
+            "Tampilkan menu ini"
+         ],
+         "Write in the third person": [
+            null,
+            "Tulis ini menggunakan bahasa pihak ketiga"
+         ],
+         "Remove messages": [
+            null,
+            "Hapus pesan"
+         ],
+         "Are you sure you want to clear the messages from this chat box?": [
+            null,
+            ""
+         ],
+         "Your message could not be sent": [
+            null,
+            "Pesan anda tak dapat dikirim"
+         ],
+         "We received an unencrypted message": [
+            null,
+            "Kami menerima pesan terenkripsi"
+         ],
+         "We received an unreadable encrypted message": [
+            null,
+            "Kami menerima pesan terenkripsi yang gagal dibaca"
+         ],
+         "This user has requested an encrypted session.": [
+            null,
+            "Pengguna ini meminta sesi terenkripsi"
+         ],
+         "Here are the fingerprints, please confirm them with %1$s, outside of this chat.\n\nFingerprint for you, %2$s: %3$s\n\nFingerprint for %1$s: %4$s\n\nIf you have confirmed that the fingerprints match, click OK, otherwise click Cancel.": [
+            null,
+            "Ini adalah sidik jari anda, konfirmasikan bersama mereka dengan %1$s, di luar percakapan ini.\n\nSidik jari untuk anda, %2$s: %3$s\n\nSidik jari untuk %1$s: %4$s\n\nJika anda bisa mengkonfirmasi sidik jadi cocok, klik Lanjutkan, jika tidak klik Batal."
+         ],
+         "What is your security question?": [
+            null,
+            "Apakah pertanyaan keamanan anda?"
+         ],
+         "What is the answer to the security question?": [
+            null,
+            "Apa jawaban dari pertanyaan keamanan tersebut?"
+         ],
+         "Invalid authentication scheme provided": [
+            null,
+            "Skema otentikasi salah"
+         ],
+         "Your messages are not encrypted anymore": [
+            null,
+            "Pesan anda tidak lagi terenkripsi"
+         ],
+         "Your messages are not encrypted. Click here to enable OTR encryption.": [
+            null,
+            "Pesan anda tak terenkripsi. Klik di sini untuk menyalakan enkripsi OTR."
+         ],
+         "End encrypted conversation": [
+            null,
+            "Sudahi percakapan terenkripsi"
+         ],
+         "Hide the list of participants": [
+            null,
+            ""
+         ],
+         "Refresh encrypted conversation": [
+            null,
+            "Setel ulang percakapan terenkripsi"
+         ],
+         "Start a call": [
+            null,
+            ""
+         ],
+         "Start encrypted conversation": [
+            null,
+            "Mulai sesi terenkripsi"
+         ],
+         "Verify with fingerprints": [
+            null,
+            "Verifikasi menggunakan sidik jari"
+         ],
+         "Verify with SMP": [
+            null,
+            "Verifikasi menggunakan SMP"
+         ],
+         "What's this?": [
+            null,
+            "Apakah ini?"
+         ],
+         "Online": [
+            null,
+            "Terhubung"
+         ],
+         "Busy": [
+            null,
+            "Sibuk"
+         ],
+         "Away": [
+            null,
+            "Pergi"
+         ],
+         "Offline": [
+            null,
+            "Tak Terhubung"
+         ],
+         "Contact name": [
+            null,
+            "Nama teman"
+         ],
+         "Search": [
+            null,
+            "Cari"
+         ],
+         "Contact username": [
+            null,
+            "Username teman"
+         ],
+         "Add": [
+            null,
+            "Tambah"
+         ],
+         "Click to add new chat contacts": [
+            null,
+            "Klik untuk menambahkan teman baru"
+         ],
+         "Add a contact": [
+            null,
+            "Tambah teman"
+         ],
+         "No users found": [
+            null,
+            "Pengguna tak ditemukan"
+         ],
+         "Click to add as a chat contact": [
+            null,
+            "Klik untuk menambahkan sebagai teman"
+         ],
+         "Room name": [
+            null,
+            "Nama ruangan"
+         ],
+         "Nickname": [
+            null,
+            "Nama panggilan"
+         ],
+         "Server": [
+            null,
+            "Server"
+         ],
+         "Join": [
+            null,
+            "Ikuti"
+         ],
+         "Show rooms": [
+            null,
+            "Perlihatkan ruangan"
+         ],
+         "Rooms": [
+            null,
+            "Ruangan"
+         ],
+         "No rooms on %1$s": [
+            null,
+            "Tak ada ruangan di %1$s"
+         ],
+         "Rooms on %1$s": [
+            null,
+            "Ruangan di %1$s"
+         ],
+         "Click to open this room": [
+            null,
+            "Klik untuk membuka ruangan ini"
+         ],
+         "Show more information on this room": [
+            null,
+            "Tampilkan informasi ruangan ini"
+         ],
+         "Description:": [
+            null,
+            "Keterangan:"
+         ],
+         "Occupants:": [
+            null,
+            "Penghuni:"
+         ],
+         "Features:": [
+            null,
+            "Fitur:"
+         ],
+         "Requires authentication": [
+            null,
+            "Membutuhkan otentikasi"
+         ],
+         "Hidden": [
+            null,
+            "Tersembunyi"
+         ],
+         "Requires an invitation": [
+            null,
+            "Membutuhkan undangan"
+         ],
+         "Moderated": [
+            null,
+            "Dimoderasi"
+         ],
+         "Non-anonymous": [
+            null,
+            "Tidak anonim"
+         ],
+         "Open room": [
+            null,
+            "Ruangan terbuka"
+         ],
+         "Permanent room": [
+            null,
+            "Ruangan permanen"
+         ],
+         "Public": [
+            null,
+            "Umum"
+         ],
+         "Semi-anonymous": [
+            null,
+            "Semi-anonim"
+         ],
+         "Temporary room": [
+            null,
+            "Ruangan sementara"
+         ],
+         "Unmoderated": [
+            null,
+            "Tak dimoderasi"
+         ],
+         "This user is a moderator": [
+            null,
+            "Pengguna ini adalah moderator"
+         ],
+         "This user can send messages in this room": [
+            null,
+            "Pengguna ini dapat mengirim pesan di ruangan ini"
+         ],
+         "This user can NOT send messages in this room": [
+            null,
+            "Pengguna ini tak dapat mengirim pesan di ruangan ini"
+         ],
+         "Invite...": [
+            null,
+            ""
+         ],
+         "You are about to invite %1$s to the chat room \"%2$s\". ": [
+            null,
+            ""
+         ],
+         "You may optionally include a message, explaining the reason for the invitation.": [
+            null,
+            ""
+         ],
+         "Message": [
+            null,
+            "Pesan"
+         ],
+         "Error: could not execute the command": [
+            null,
+            ""
+         ],
+         "Remove user's ability to post messages": [
+            null,
+            ""
+         ],
+         "Change your nickname": [
+            null,
+            ""
+         ],
+         "Allow muted user to post messages": [
+            null,
+            ""
+         ],
+         "Save": [
+            null,
+            "Simpan"
+         ],
+         "Cancel": [
+            null,
+            "Batal"
+         ],
+         "An error occurred while trying to save the form.": [
+            null,
+            "Kesalahan terjadi saat menyimpan formulir ini."
+         ],
+         "This chatroom requires a password": [
+            null,
+            "Ruangan ini membutuhkan kata sandi"
+         ],
+         "Password: ": [
+            null,
+            "Kata sandi: "
+         ],
+         "Submit": [
+            null,
+            "Kirim"
+         ],
+         "This room is not anonymous": [
+            null,
+            "Ruangan ini tidak anonim"
+         ],
+         "This room now shows unavailable members": [
+            null,
+            "Ruangan ini menampilkan anggota yang tak tersedia"
+         ],
+         "This room does not show unavailable members": [
+            null,
+            "Ruangan ini tidak menampilkan anggota yang tak tersedia"
+         ],
+         "Non-privacy-related room configuration has changed": [
+            null,
+            "Konfigurasi ruangan yang tak berhubungan dengan privasi telah diubah"
+         ],
+         "Room logging is now enabled": [
+            null,
+            "Pencatatan di ruangan ini sekarang dinyalakan"
+         ],
+         "Room logging is now disabled": [
+            null,
+            "Pencatatan di ruangan ini sekarang dimatikan"
+         ],
+         "This room is now non-anonymous": [
+            null,
+            "Ruangan ini sekarang tak-anonim"
+         ],
+         "This room is now semi-anonymous": [
+            null,
+            "Ruangan ini sekarang semi-anonim"
+         ],
+         "This room is now fully-anonymous": [
+            null,
+            "Ruangan ini sekarang anonim"
+         ],
+         "A new room has been created": [
+            null,
+            "Ruangan baru telah dibuat"
+         ],
+         "You have been banned from this room": [
+            null,
+            "Anda telah dicekal dari ruangan ini"
+         ],
+         "You have been kicked from this room": [
+            null,
+            "Anda telah ditendang dari ruangan ini"
+         ],
+         "You have been removed from this room because of an affiliation change": [
+            null,
+            "Anda telah dihapus dari ruangan ini karena perubahan afiliasi"
+         ],
+         "You have been removed from this room because the room has changed to members-only and you're not a member": [
+            null,
+            "Anda telah dihapus dari ruangan ini karena ruangan ini hanya terbuka untuk anggota dan anda bukan anggota"
+         ],
+         "You have been removed from this room because the MUC (Multi-user chat) service is being shut down.": [
+            null,
+            "Anda telah dihapus dari ruangan ini karena layanan MUC (Multi-user chat) telah dimatikan."
+         ],
+         "<strong>%1$s</strong> has been banned": [
+            null,
+            "<strong>%1$s</strong> telah dicekal"
+         ],
+         "<strong>%1$s</strong> has been kicked out": [
+            null,
+            "<strong>%1$s</strong> telah ditendang keluar"
+         ],
+         "<strong>%1$s</strong> has been removed because of an affiliation change": [
+            null,
+            "<strong>%1$s</strong> telah dihapus karena perubahan afiliasi"
+         ],
+         "<strong>%1$s</strong> has been removed for not being a member": [
+            null,
+            "<strong>%1$s</strong> telah dihapus karena bukan anggota"
+         ],
+         "The reason given is: \"": [
+            null,
+            ""
+         ],
+         "You are not on the member list of this room": [
+            null,
+            "Anda bukan anggota dari ruangan ini"
+         ],
+         "No nickname was specified": [
+            null,
+            "Nama panggilan belum ditentukan"
+         ],
+         "You are not allowed to create new rooms": [
+            null,
+            "Anda tak diizinkan untuk membuat ruangan baru"
+         ],
+         "Your nickname doesn't conform to this room's policies": [
+            null,
+            "Nama panggilan anda tidak sesuai aturan ruangan ini"
+         ],
+         "Your nickname is already taken": [
+            null,
+            "Nama panggilan anda telah digunakan orang lain"
+         ],
+         "This room does not (yet) exist": [
+            null,
+            "Ruangan ini belum dibuat"
+         ],
+         "This room has reached it's maximum number of occupants": [
+            null,
+            "Ruangan ini telah mencapai jumlah penghuni maksimum"
+         ],
+         "Topic set by %1$s to: %2$s": [
+            null,
+            "Topik diganti oleh %1$s menjadi: %2$s"
+         ],
+         "%1$s has invited you to join a chat room: %2$s": [
+            null,
+            ""
+         ],
+         "%1$s has invited you to join a chat room: %2$s, and left the following reason: \"%3$s\"": [
+            null,
+            ""
+         ],
+         "Minimized": [
+            null,
+            ""
+         ],
+         "Click to remove this contact": [
+            null,
+            "Klik untuk menghapus teman ini"
+         ],
+         "Click to chat with this contact": [
+            null,
+            "Klik untuk mulai perbinjangan dengan teman ini"
+         ],
+         "Type to filter": [
+            null,
+            ""
+         ],
+         "I am %1$s": [
+            null,
+            "Saya %1$s"
+         ],
+         "Click here to write a custom status message": [
+            null,
+            "Klik untuk menulis status kustom"
+         ],
+         "Click to change your chat status": [
+            null,
+            "Klik untuk mengganti status"
+         ],
+         "Custom status": [
+            null,
+            "Status kustom"
+         ],
+         "online": [
+            null,
+            "terhubung"
+         ],
+         "busy": [
+            null,
+            "sibuk"
+         ],
+         "away for long": [
+            null,
+            "lama tak di tempat"
+         ],
+         "away": [
+            null,
+            "tak di tempat"
+         ],
+         "Your XMPP provider's domain name:": [
+            null,
+            ""
+         ],
+         "Fetch registration form": [
+            null,
+            ""
+         ],
+         "Tip: A list of public XMPP providers is available": [
+            null,
+            ""
+         ],
+         "here": [
+            null,
+            ""
+         ],
+         "Register": [
+            null,
+            ""
+         ],
+         "Sorry, the given provider does not support in band account registration. Please try with a different provider.": [
+            null,
+            ""
+         ],
+         "Requesting a registration form from the XMPP server": [
+            null,
+            ""
+         ],
+         "Something went wrong while establishing a connection with \"%1$s\". Are you sure it exists?": [
+            null,
+            ""
+         ],
+         "Now logging you in": [
+            null,
+            ""
+         ],
+         "Registered successfully": [
+            null,
+            ""
+         ],
+         "Return": [
+            null,
+            ""
+         ],
+         "The provider rejected your registration attempt. ": [
+            null,
+            ""
+         ],
+         "Password:": [
+            null,
+            "Kata sandi:"
+         ],
+         "Log In": [
+            null,
+            "Masuk"
+         ],
+         "Sign in": [
+            null,
+            "Masuk"
+         ],
+         "Toggle chat": [
+            null,
+            ""
+         ]
+      }
+   }
+};
+locales["it"] = {
+   "domain": "converse",
+   "locale_data": {
+      "converse": {
+         "": {
+            "domain": "converse",
+            "plural_forms": "nplurals=2; plural=(n != 1);",
+            "lang": "it"
+         },
+         "unencrypted": [
+            null,
+            ""
+         ],
+         "unverified": [
+            null,
+            ""
+         ],
+         "verified": [
+            null,
+            ""
+         ],
+         "finished": [
+            null,
+            ""
+         ],
+         "This contact is busy": [
+            null,
+            ""
+         ],
+         "This contact is online": [
+            null,
+            ""
+         ],
+         "This contact is offline": [
+            null,
+            ""
+         ],
+         "This contact is away for an extended period": [
+            null,
+            ""
+         ],
+         "This contact is away": [
+            null,
+            ""
+         ],
+         "My contacts": [
+            null,
+            "I miei contatti"
+         ],
+         "Pending contacts": [
+            null,
+            "Contatti in attesa"
+         ],
+         "Contact requests": [
+            null,
+            "Richieste dei contatti"
+         ],
+         "Ungrouped": [
+            null,
+            ""
+         ],
+         "Contacts": [
+            null,
+            "Contatti"
+         ],
+         "Groups": [
+            null,
+            ""
+         ],
+         "Error": [
+            null,
+            "Errore"
+         ],
+         "Connecting": [
+            null,
+            "Connessione in corso"
+         ],
+         "Authenticating": [
+            null,
+            "Autenticazione in corso"
+         ],
+         "Authentication Failed": [
+            null,
+            "Autenticazione fallita"
+         ],
+         "Online Contacts": [
+            null,
+            "Contatti in linea"
+         ],
+         "Re-establishing encrypted session": [
+            null,
+            ""
+         ],
+         "Generating private key.": [
+            null,
+            ""
+         ],
+         "Your browser might become unresponsive.": [
+            null,
+            ""
+         ],
+         "Authentication request from %1$s\n\nYour chat contact is attempting to verify your identity, by asking you the question below.\n\n%2$s": [
+            null,
+            ""
+         ],
+         "Could not verify this user's identify.": [
+            null,
+            ""
+         ],
+         "Exchanging private key with contact.": [
+            null,
+            ""
+         ],
+         "Personal message": [
+            null,
+            "Messaggio personale"
+         ],
+         "me": [
+            null,
+            ""
+         ],
+         "is typing": [
+            null,
+            ""
+         ],
+         "has stopped typing": [
+            null,
+            ""
+         ],
+         "Show this menu": [
+            null,
+            "Mostra questo menu"
+         ],
+         "Write in the third person": [
+            null,
+            "Scrivi in terza persona"
+         ],
+         "Remove messages": [
+            null,
+            "Rimuovi messaggi"
+         ],
+         "Are you sure you want to clear the messages from this chat box?": [
+            null,
+            ""
+         ],
+         "Your message could not be sent": [
+            null,
+            ""
+         ],
+         "We received an unencrypted message": [
+            null,
+            ""
+         ],
+         "We received an unreadable encrypted message": [
+            null,
+            ""
+         ],
+         "This user has requested an encrypted session.": [
+            null,
+            ""
+         ],
+         "Here are the fingerprints, please confirm them with %1$s, outside of this chat.\n\nFingerprint for you, %2$s: %3$s\n\nFingerprint for %1$s: %4$s\n\nIf you have confirmed that the fingerprints match, click OK, otherwise click Cancel.": [
+            null,
+            ""
+         ],
+         "You will be prompted to provide a security question and then an answer to that question.\n\nYour contact will then be prompted the same question and if they type the exact same answer (case sensitive), their identity will be verified.": [
+            null,
+            ""
+         ],
+         "What is your security question?": [
+            null,
+            ""
+         ],
+         "What is the answer to the security question?": [
+            null,
+            ""
+         ],
+         "Invalid authentication scheme provided": [
+            null,
+            ""
+         ],
+         "Your messages are not encrypted anymore": [
+            null,
+            ""
+         ],
+         "Your messages are now encrypted but your contact's identity has not been verified.": [
+            null,
+            ""
+         ],
+         "Your contact's identify has been verified.": [
+            null,
+            ""
+         ],
+         "Your contact has ended encryption on their end, you should do the same.": [
+            null,
+            ""
+         ],
+         "Your messages are not encrypted. Click here to enable OTR encryption.": [
+            null,
+            ""
+         ],
+         "Your messages are encrypted, but your contact has not been verified.": [
+            null,
+            ""
+         ],
+         "Your messages are encrypted and your contact verified.": [
+            null,
+            ""
+         ],
+         "Your contact has closed their end of the private session, you should do the same": [
+            null,
+            ""
+         ],
+         "End encrypted conversation": [
+            null,
+            ""
+         ],
+         "Hide the list of participants": [
+            null,
+            ""
+         ],
+         "Refresh encrypted conversation": [
+            null,
+            ""
+         ],
+         "Start a call": [
+            null,
+            ""
+         ],
+         "Start encrypted conversation": [
+            null,
+            ""
+         ],
+         "Verify with fingerprints": [
+            null,
+            ""
+         ],
+         "Verify with SMP": [
+            null,
+            ""
+         ],
+         "What's this?": [
+            null,
+            ""
+         ],
+         "Online": [
+            null,
+            "In linea"
+         ],
+         "Busy": [
+            null,
+            "Occupato"
+         ],
+         "Away": [
+            null,
+            "Assente"
+         ],
+         "Offline": [
+            null,
+            "Non in linea"
+         ],
+         "Contact name": [
+            null,
+            "Nome del contatto"
+         ],
+         "Search": [
+            null,
+            "Cerca"
+         ],
+         "Contact username": [
+            null,
+            "Nome utente del contatto"
+         ],
+         "Add": [
+            null,
+            "Aggiungi"
+         ],
+         "Click to add new chat contacts": [
+            null,
+            "Clicca per aggiungere nuovi contatti alla chat"
+         ],
+         "Add a contact": [
+            null,
+            "Aggiungi contatti"
+         ],
+         "No users found": [
+            null,
+            "Nessun utente trovato"
+         ],
+         "Click to add as a chat contact": [
+            null,
+            "Clicca per aggiungere il contatto alla chat"
+         ],
+         "Room name": [
+            null,
+            "Nome stanza"
+         ],
+         "Nickname": [
+            null,
+            "Soprannome"
+         ],
+         "Server": [
+            null,
+            "Server"
+         ],
+         "Join": [
+            null,
+            "Entra"
+         ],
+         "Show rooms": [
+            null,
+            "Mostra stanze"
+         ],
+         "Rooms": [
+            null,
+            "Stanze"
+         ],
+         "No rooms on %1$s": [
+            null,
+            "Nessuna stanza su %1$s"
+         ],
+         "Rooms on %1$s": [
+            null,
+            "Stanze su %1$s"
+         ],
+         "Click to open this room": [
+            null,
+            "Clicca per aprire questa stanza"
+         ],
+         "Show more information on this room": [
+            null,
+            "Mostra più informazioni su questa stanza"
+         ],
+         "Description:": [
+            null,
+            "Descrizione:"
+         ],
+         "Occupants:": [
+            null,
+            "Utenti presenti:"
+         ],
+         "Features:": [
+            null,
+            "Funzionalità:"
+         ],
+         "Requires authentication": [
+            null,
+            "Richiede autenticazione"
+         ],
+         "Hidden": [
+            null,
+            "Nascosta"
+         ],
+         "Requires an invitation": [
+            null,
+            "Richiede un invito"
+         ],
+         "Moderated": [
+            null,
+            "Moderata"
+         ],
+         "Non-anonymous": [
+            null,
+            "Non-anonima"
+         ],
+         "Open room": [
+            null,
+            "Stanza aperta"
+         ],
+         "Permanent room": [
+            null,
+            "Stanza permanente"
+         ],
+         "Public": [
+            null,
+            "Pubblica"
+         ],
+         "Semi-anonymous": [
+            null,
+            "Semi-anonima"
+         ],
+         "Temporary room": [
+            null,
+            "Stanza temporanea"
+         ],
+         "Unmoderated": [
+            null,
+            "Non moderata"
+         ],
+         "This user is a moderator": [
+            null,
+            "Questo utente è un moderatore"
+         ],
+         "This user can send messages in this room": [
+            null,
+            "Questo utente può inviare messaggi in questa stanza"
+         ],
+         "This user can NOT send messages in this room": [
+            null,
+            "Questo utente NON può inviare messaggi in questa stanza"
+         ],
+         "Invite...": [
+            null,
+            ""
+         ],
+         "You are about to invite %1$s to the chat room \"%2$s\". ": [
+            null,
+            ""
+         ],
+         "You may optionally include a message, explaining the reason for the invitation.": [
+            null,
+            ""
+         ],
+         "Message": [
+            null,
+            "Messaggio"
+         ],
+         "Error: could not execute the command": [
+            null,
+            ""
+         ],
+         "Remove user's ability to post messages": [
+            null,
+            ""
+         ],
+         "Change your nickname": [
+            null,
+            ""
+         ],
+         "Allow muted user to post messages": [
+            null,
+            ""
+         ],
+         "Save": [
+            null,
+            "Salva"
+         ],
+         "Cancel": [
+            null,
+            "Annulla"
+         ],
+         "An error occurred while trying to save the form.": [
+            null,
+            "Errore durante il salvataggio del modulo"
+         ],
+         "This chatroom requires a password": [
+            null,
+            "Questa stanza richiede una password"
+         ],
+         "Password: ": [
+            null,
+            "Password: "
+         ],
+         "Submit": [
+            null,
+            "Invia"
+         ],
+         "This room is not anonymous": [
+            null,
+            "Questa stanza non è anonima"
+         ],
+         "This room now shows unavailable members": [
+            null,
+            "Questa stanza mostra i membri non disponibili al momento"
+         ],
+         "This room does not show unavailable members": [
+            null,
+            "Questa stanza non mostra i membri non disponibili"
+         ],
+         "Non-privacy-related room configuration has changed": [
+            null,
+            "Una configurazione della stanza non legata alla privacy è stata modificata"
+         ],
+         "Room logging is now enabled": [
+            null,
+            "La registrazione è abilitata nella stanza"
+         ],
+         "Room logging is now disabled": [
+            null,
+            "La registrazione è disabilitata nella stanza"
+         ],
+         "This room is now non-anonymous": [
+            null,
+            "Questa stanza è non-anonima"
+         ],
+         "This room is now semi-anonymous": [
+            null,
+            "Questa stanza è semi-anonima"
+         ],
+         "This room is now fully-anonymous": [
+            null,
+            "Questa stanza è completamente-anonima"
+         ],
+         "A new room has been created": [
+            null,
+            "Una nuova stanza è stata creata"
+         ],
+         "You have been banned from this room": [
+            null,
+            "Sei stato bandito da questa stanza"
+         ],
+         "You have been kicked from this room": [
+            null,
+            "Sei stato espulso da questa stanza"
+         ],
+         "You have been removed from this room because of an affiliation change": [
+            null,
+            "Sei stato rimosso da questa stanza a causa di un cambio di affiliazione"
+         ],
+         "You have been removed from this room because the room has changed to members-only and you're not a member": [
+            null,
+            "Sei stato rimosso da questa stanza poiché ora la stanza accetta solo membri"
+         ],
+         "You have been removed from this room because the MUC (Multi-user chat) service is being shut down.": [
+            null,
+            "Sei stato rimosso da questa stanza poiché il servizio MUC (Chat multi utente) è in fase di spegnimento"
+         ],
+         "<strong>%1$s</strong> has been banned": [
+            null,
+            "<strong>%1$s</strong> è stato bandito"
+         ],
+         "<strong>%1$s</strong> has been kicked out": [
+            null,
+            "<strong>%1$s</strong> è stato espulso"
+         ],
+         "<strong>%1$s</strong> has been removed because of an affiliation change": [
+            null,
+            "<strong>%1$s</strong> è stato rimosso a causa di un cambio di affiliazione"
+         ],
+         "<strong>%1$s</strong> has been removed for not being a member": [
+            null,
+            "<strong>%1$s</strong> è stato rimosso in quanto non membro"
+         ],
+         "The reason given is: \"": [
+            null,
+            ""
+         ],
+         "You are not on the member list of this room": [
+            null,
+            "Non sei nella lista dei membri di questa stanza"
+         ],
+         "No nickname was specified": [
+            null,
+            "Nessun soprannome specificato"
+         ],
+         "You are not allowed to create new rooms": [
+            null,
+            "Non ti è permesso creare nuove stanze"
+         ],
+         "Your nickname doesn't conform to this room's policies": [
+            null,
+            "Il tuo soprannome non è conforme alle regole di questa stanza"
+         ],
+         "Your nickname is already taken": [
+            null,
+            "Il tuo soprannome è già utilizzato"
+         ],
+         "This room does not (yet) exist": [
+            null,
+            "Questa stanza non esiste (per ora)"
+         ],
+         "This room has reached it's maximum number of occupants": [
+            null,
+            "Questa stanza ha raggiunto il limite massimo di utenti"
+         ],
+         "Topic set by %1$s to: %2$s": [
+            null,
+            "Topic impostato da %1$s a: %2$s"
+         ],
+         "%1$s has invited you to join a chat room: %2$s": [
+            null,
+            ""
+         ],
+         "%1$s has invited you to join a chat room: %2$s, and left the following reason: \"%3$s\"": [
+            null,
+            ""
+         ],
+         "Minimized": [
+            null,
+            ""
+         ],
+         "Click to remove this contact": [
+            null,
+            "Clicca per rimuovere questo contatto"
+         ],
+         "Click to chat with this contact": [
+            null,
+            "Clicca per parlare con questo contatto"
+         ],
+         "Type to filter": [
+            null,
+            ""
+         ],
+         "I am %1$s": [
+            null,
+            "Sono %1$s"
+         ],
+         "Click here to write a custom status message": [
+            null,
+            "Clicca qui per scrivere un messaggio di stato personalizzato"
+         ],
+         "Click to change your chat status": [
+            null,
+            "Clicca per cambiare il tuo stato"
+         ],
+         "Custom status": [
+            null,
+            "Stato personalizzato"
+         ],
+         "online": [
+            null,
+            "in linea"
+         ],
+         "busy": [
+            null,
+            "occupato"
+         ],
+         "away for long": [
+            null,
+            "assente da molto"
+         ],
+         "away": [
+            null,
+            "assente"
+         ],
+         "Your XMPP provider's domain name:": [
+            null,
+            ""
+         ],
+         "Fetch registration form": [
+            null,
+            ""
+         ],
+         "Tip: A list of public XMPP providers is available": [
+            null,
+            ""
+         ],
+         "here": [
+            null,
+            ""
+         ],
+         "Register": [
+            null,
+            ""
+         ],
+         "Sorry, the given provider does not support in band account registration. Please try with a different provider.": [
+            null,
+            ""
+         ],
+         "Requesting a registration form from the XMPP server": [
+            null,
+            ""
+         ],
+         "Something went wrong while establishing a connection with \"%1$s\". Are you sure it exists?": [
+            null,
+            ""
+         ],
+         "Now logging you in": [
+            null,
+            ""
+         ],
+         "Registered successfully": [
+            null,
+            ""
+         ],
+         "Return": [
+            null,
+            ""
+         ],
+         "The provider rejected your registration attempt. ": [
+            null,
+            ""
+         ],
+         "Password:": [
+            null,
+            "Password:"
+         ],
+         "Log In": [
+            null,
+            "Entra"
+         ],
+         "Sign in": [
+            null,
+            "Accesso"
+         ],
+         "Toggle chat": [
+            null,
+            ""
+         ]
+      }
+   }
+};
+locales["ja"] = {
+   "domain": "converse",
+   "locale_data": {
+      "converse": {
+         "": {
+            "domain": "converse",
+            "plural_forms": "nplurals=1; plural=0;",
+            "lang": "JA"
+         },
+         "unencrypted": [
+            null,
+            "暗号化されていません"
+         ],
+         "unverified": [
+            null,
+            "検証されていません"
+         ],
+         "verified": [
+            null,
+            "検証されました"
+         ],
+         "finished": [
+            null,
+            "完了"
+         ],
+         "This contact is busy": [
+            null,
+            "この相手先は取り込み中です"
+         ],
+         "This contact is online": [
+            null,
+            "この相手先は在席しています"
+         ],
+         "This contact is offline": [
+            null,
+            "この相手先はオフラインです"
+         ],
+         "This contact is unavailable": [
+            null,
+            "この相手先は不通です"
+         ],
+         "This contact is away for an extended period": [
+            null,
+            "この相手先は不在です"
+         ],
+         "This contact is away": [
+            null,
+            "この相手先は離席中です"
+         ],
+         "My contacts": [
+            null,
+            "相手先一覧"
+         ],
+         "Pending contacts": [
+            null,
+            "保留中の相手先"
+         ],
+         "Contact requests": [
+            null,
+            "会話に呼び出し"
+         ],
+         "Ungrouped": [
+            null,
+            ""
+         ],
+         "Contacts": [
+            null,
+            "相手先"
+         ],
+         "Groups": [
+            null,
+            ""
+         ],
+         "Error": [
+            null,
+            "エラー"
+         ],
+         "Connecting": [
+            null,
+            "接続中です"
+         ],
+         "Authenticating": [
+            null,
+            "認証中"
+         ],
+         "Authentication Failed": [
+            null,
+            "認証に失敗"
+         ],
+         "Online Contacts": [
+            null,
+            "オンラインの相手先"
+         ],
+         "Re-establishing encrypted session": [
+            null,
+            "暗号化セッションの再接続"
+         ],
+         "Generating private key.": [
+            null,
+            ""
+         ],
+         "Your browser might become unresponsive.": [
+            null,
+            ""
+         ],
+         "Could not verify this user's identify.": [
+            null,
+            "このユーザーの本人性を検証できませんでした。"
+         ],
+         "Exchanging private key with contact.": [
+            null,
+            ""
+         ],
+         "Personal message": [
+            null,
+            "私信"
+         ],
+         "me": [
+            null,
+            "私"
+         ],
+         "is typing": [
+            null,
+            ""
+         ],
+         "has stopped typing": [
+            null,
+            ""
+         ],
+         "Show this menu": [
+            null,
+            "このメニューを表示"
+         ],
+         "Write in the third person": [
+            null,
+            "第三者に書く"
+         ],
+         "Remove messages": [
+            null,
+            "メッセージを削除"
+         ],
+         "Are you sure you want to clear the messages from this chat box?": [
+            null,
+            ""
+         ],
+         "Your message could not be sent": [
+            null,
+            "メッセージを送信できませんでした"
+         ],
+         "We received an unencrypted message": [
+            null,
+            "暗号化されていないメッセージを受信しました"
+         ],
+         "We received an unreadable encrypted message": [
+            null,
+            "読めない暗号化メッセージを受信しました"
+         ],
+         "This user has requested an encrypted session.": [
+            null,
+            "このユーザーは暗号化セッションを求めています。"
+         ],
+         "Here are the fingerprints, please confirm them with %1$s, outside of this chat.\n\nFingerprint for you, %2$s: %3$s\n\nFingerprint for %1$s: %4$s\n\nIf you have confirmed that the fingerprints match, click OK, otherwise click Cancel.": [
+            null,
+            "これは鍵指紋です。チャット以外の方法でこれらを %1$s と確認してください。\n\nあなた %2$s の鍵指紋: %3$s\n\n%1$s の鍵指紋: %4$s\n\n確認して、鍵指紋が正しければ「OK」を、正しくなければ「キャンセル」をクリックしてください。"
+         ],
+         "What is your security question?": [
+            null,
+            "秘密の質問はなんですか?"
+         ],
+         "What is the answer to the security question?": [
+            null,
+            "秘密の質問の答はなんですか?"
+         ],
+         "Invalid authentication scheme provided": [
+            null,
+            "認証の方式が正しくありません"
+         ],
+         "Your messages are not encrypted anymore": [
+            null,
+            "メッセージはもう暗号化されません"
+         ],
+         "Your messages are not encrypted. Click here to enable OTR encryption.": [
+            null,
+            "メッセージは暗号化されません。OTR 暗号化を有効にするにはここをクリックしてください。"
+         ],
+         "End encrypted conversation": [
+            null,
+            "暗号化された会話を終了"
+         ],
+         "Hide the list of participants": [
+            null,
+            ""
+         ],
+         "Refresh encrypted conversation": [
+            null,
+            "暗号化された会話をリフレッシュ"
+         ],
+         "Start a call": [
+            null,
+            ""
+         ],
+         "Start encrypted conversation": [
+            null,
+            "暗号化された会話を開始"
+         ],
+         "Verify with fingerprints": [
+            null,
+            "鍵指紋で検証"
+         ],
+         "Verify with SMP": [
+            null,
+            "SMP で検証"
+         ],
+         "What's this?": [
+            null,
+            "これは何ですか?"
+         ],
+         "Online": [
+            null,
+            "オンライン"
+         ],
+         "Busy": [
+            null,
+            "取り込み中"
+         ],
+         "Away": [
+            null,
+            "離席中"
+         ],
+         "Offline": [
+            null,
+            "オフライン"
+         ],
+         "Contact name": [
+            null,
+            "名前"
+         ],
+         "Search": [
+            null,
+            "検索"
+         ],
+         "Contact username": [
+            null,
+            "相手先の名前"
+         ],
+         "Add": [
+            null,
+            "追加"
+         ],
+         "Click to add new chat contacts": [
+            null,
+            "クリックして新しいチャットの相手先を追加"
+         ],
+         "Add a contact": [
+            null,
+            "相手先を追加"
+         ],
+         "No users found": [
+            null,
+            "ユーザーが見つかりません"
+         ],
+         "Click to add as a chat contact": [
+            null,
+            "クリックしてチャットの相手先として追加"
+         ],
+         "Room name": [
+            null,
+            "談話室の名前"
+         ],
+         "Nickname": [
+            null,
+            "ニックネーム"
+         ],
+         "Server": [
+            null,
+            "サーバー"
+         ],
+         "Join": [
+            null,
+            "入室"
+         ],
+         "Show rooms": [
+            null,
+            "談話室一覧を見る"
+         ],
+         "Rooms": [
+            null,
+            "談話室"
+         ],
+         "No rooms on %1$s": [
+            null,
+            "%1$s に談話室はありません"
+         ],
+         "Rooms on %1$s": [
+            null,
+            "%1$s の談話室一覧"
+         ],
+         "Click to open this room": [
+            null,
+            "クリックしてこの談話室を開く"
+         ],
+         "Show more information on this room": [
+            null,
+            "この談話室についての詳細を見る"
+         ],
+         "Description:": [
+            null,
+            "説明: "
+         ],
+         "Occupants:": [
+            null,
+            "入室者:"
+         ],
+         "Features:": [
+            null,
+            "特徴:"
+         ],
+         "Requires authentication": [
+            null,
+            "認証の要求"
+         ],
+         "Hidden": [
+            null,
+            "非表示"
+         ],
+         "Requires an invitation": [
+            null,
+            "招待の要求"
+         ],
+         "Moderated": [
+            null,
+            "発言制限"
+         ],
+         "Non-anonymous": [
+            null,
+            "非匿名"
+         ],
+         "Open room": [
+            null,
+            "開放談話室"
+         ],
+         "Permanent room": [
+            null,
+            "常設談話室"
+         ],
+         "Public": [
+            null,
+            "公開談話室"
+         ],
+         "Semi-anonymous": [
+            null,
+            "半匿名"
+         ],
+         "Temporary room": [
+            null,
+            "臨時談話室"
+         ],
+         "Unmoderated": [
+            null,
+            "発言制限なし"
+         ],
+         "This user is a moderator": [
+            null,
+            "このユーザーは司会者です"
+         ],
+         "This user can send messages in this room": [
+            null,
+            "このユーザーはこの談話室で発言できます"
+         ],
+         "This user can NOT send messages in this room": [
+            null,
+            "このユーザーはこの談話室で発言できません"
+         ],
+         "Invite...": [
+            null,
+            ""
+         ],
+         "You are about to invite %1$s to the chat room \"%2$s\". ": [
+            null,
+            ""
+         ],
+         "You may optionally include a message, explaining the reason for the invitation.": [
+            null,
+            ""
+         ],
+         "Message": [
+            null,
+            "メッセージ"
+         ],
+         "Error: could not execute the command": [
+            null,
+            ""
+         ],
+         "Remove user's ability to post messages": [
+            null,
+            ""
+         ],
+         "Change your nickname": [
+            null,
+            ""
+         ],
+         "Allow muted user to post messages": [
+            null,
+            ""
+         ],
+         "Save": [
+            null,
+            "保存"
+         ],
+         "Cancel": [
+            null,
+            "キャンセル"
+         ],
+         "An error occurred while trying to save the form.": [
+            null,
+            "フォームを保存する際にエラーが発生しました。"
+         ],
+         "This chatroom requires a password": [
+            null,
+            "この談話室にはパスワードが必要です"
+         ],
+         "Password: ": [
+            null,
+            "パスワード:"
+         ],
+         "Submit": [
+            null,
+            "送信"
+         ],
+         "This room is not anonymous": [
+            null,
+            "この談話室は非匿名です"
+         ],
+         "This room now shows unavailable members": [
+            null,
+            "この談話室はメンバー以外にも見えます"
+         ],
+         "This room does not show unavailable members": [
+            null,
+            "この談話室はメンバー以外には見えません"
+         ],
+         "Non-privacy-related room configuration has changed": [
+            null,
+            "談話室の設定(プライバシーに無関係)が変更されました"
+         ],
+         "Room logging is now enabled": [
+            null,
+            "談話室の記録を取りはじめます"
+         ],
+         "Room logging is now disabled": [
+            null,
+            "談話室の記録を止めます"
+         ],
+         "This room is now non-anonymous": [
+            null,
+            "この談話室はただいま非匿名です"
+         ],
+         "This room is now semi-anonymous": [
+            null,
+            "この談話室はただいま半匿名です"
+         ],
+         "This room is now fully-anonymous": [
+            null,
+            "この談話室はただいま匿名です"
+         ],
+         "A new room has been created": [
+            null,
+            "新しい談話室が作成されました"
+         ],
+         "You have been banned from this room": [
+            null,
+            "この談話室から締め出されました"
+         ],
+         "You have been kicked from this room": [
+            null,
+            "この談話室から蹴り出されました"
+         ],
+         "You have been removed from this room because of an affiliation change": [
+            null,
+            "分掌の変更のため、この談話室から削除されました"
+         ],
+         "You have been removed from this room because the room has changed to members-only and you're not a member": [
+            null,
+            "談話室がメンバー制に変更されました。メンバーではないため、この談話室から削除されました"
+         ],
+         "You have been removed from this room because the MUC (Multi-user chat) service is being shut down.": [
+            null,
+            "MUC(グループチャット)のサービスが停止したため、この談話室から削除されました。"
+         ],
+         "<strong>%1$s</strong> has been banned": [
+            null,
+            "<strong>%1$s</strong> を締め出しました"
+         ],
+         "<strong>%1$s</strong> has been kicked out": [
+            null,
+            "<strong>%1$s</strong> を蹴り出しました"
+         ],
+         "<strong>%1$s</strong> has been removed because of an affiliation change": [
+            null,
+            "分掌の変更のため、<strong>%1$s</strong> を削除しました"
+         ],
+         "<strong>%1$s</strong> has been removed for not being a member": [
+            null,
+            "メンバーでなくなったため、<strong>%1$s</strong> を削除しました"
+         ],
+         "The reason given is: \"": [
+            null,
+            ""
+         ],
+         "You are not on the member list of this room": [
+            null,
+            "この談話室のメンバー一覧にいません"
+         ],
+         "No nickname was specified": [
+            null,
+            "ニックネームがありません"
+         ],
+         "You are not allowed to create new rooms": [
+            null,
+            "新しい談話室を作成する権限がありません"
+         ],
+         "Your nickname doesn't conform to this room's policies": [
+            null,
+            "ニックネームがこの談話室のポリシーに従っていません"
+         ],
+         "Your nickname is already taken": [
+            null,
+            "ニックネームは既に使われています"
+         ],
+         "This room does not (yet) exist": [
+            null,
+            "この談話室は存在しません"
+         ],
+         "This room has reached it's maximum number of occupants": [
+            null,
+            "この談話室は入室者数の上限に達しています"
+         ],
+         "Topic set by %1$s to: %2$s": [
+            null,
+            "%1$s が話題を設定しました: %2$s"
+         ],
+         "%1$s has invited you to join a chat room: %2$s": [
+            null,
+            ""
+         ],
+         "%1$s has invited you to join a chat room: %2$s, and left the following reason: \"%3$s\"": [
+            null,
+            ""
+         ],
+         "Minimized": [
+            null,
+            ""
+         ],
+         "Click to remove this contact": [
+            null,
+            "クリックしてこの相手先を削除"
+         ],
+         "Click to chat with this contact": [
+            null,
+            "クリックしてこの相手先とチャット"
+         ],
+         "Type to filter": [
+            null,
+            ""
+         ],
+         "I am %1$s": [
+            null,
+            "私はいま %1$s"
+         ],
+         "Click here to write a custom status message": [
+            null,
+            "状況メッセージを入力するには、ここをクリック"
+         ],
+         "Click to change your chat status": [
+            null,
+            "クリックして、在席状況を変更"
+         ],
+         "Custom status": [
+            null,
+            "独自の在席状況"
+         ],
+         "online": [
+            null,
+            "在席"
+         ],
+         "busy": [
+            null,
+            "取り込み中"
+         ],
+         "away for long": [
+            null,
+            "不在"
+         ],
+         "away": [
+            null,
+            "離席中"
+         ],
+         "Your XMPP provider's domain name:": [
+            null,
+            ""
+         ],
+         "Fetch registration form": [
+            null,
+            ""
+         ],
+         "Tip: A list of public XMPP providers is available": [
+            null,
+            ""
+         ],
+         "here": [
+            null,
+            ""
+         ],
+         "Register": [
+            null,
+            ""
+         ],
+         "Sorry, the given provider does not support in band account registration. Please try with a different provider.": [
+            null,
+            ""
+         ],
+         "Requesting a registration form from the XMPP server": [
+            null,
+            ""
+         ],
+         "Something went wrong while establishing a connection with \"%1$s\". Are you sure it exists?": [
+            null,
+            ""
+         ],
+         "Now logging you in": [
+            null,
+            ""
+         ],
+         "Registered successfully": [
+            null,
+            ""
+         ],
+         "Return": [
+            null,
+            ""
+         ],
+         "The provider rejected your registration attempt. ": [
+            null,
+            ""
+         ],
+         "Password:": [
+            null,
+            "パスワード:"
+         ],
+         "Log In": [
+            null,
+            "ログイン"
+         ],
+         "Sign in": [
+            null,
+            "サインイン"
+         ],
+         "Toggle chat": [
+            null,
+            ""
+         ]
+      }
+   }
+};
+locales["nb"] = {
+   "domain": "converse",
+   "locale_data": {
+      "converse": {
+         "": {
+            "domain": "converse",
+            "plural_forms": "nplurals=2; plural=(n != 1);",
+            "lang": "nb"
+         },
+         "unencrypted": [
+            null,
+            "ukryptertß"
+         ],
+         "unverified": [
+            null,
+            "uverifisert"
+         ],
+         "verified": [
+            null,
+            "verifisert"
+         ],
+         "finished": [
+            null,
+            "ferdig"
+         ],
+         "This contact is busy": [
+            null,
+            "Denne kontakten er opptatt"
+         ],
+         "This contact is online": [
+            null,
+            "Kontakten er pålogget"
+         ],
+         "This contact is offline": [
+            null,
+            "Kontakten er avlogget"
+         ],
+         "This contact is unavailable": [
+            null,
+            "Kontakten er utilgjengelig"
+         ],
+         "This contact is away for an extended period": [
+            null,
+            "Kontakten er borte for en lengre periode"
+         ],
+         "This contact is away": [
+            null,
+            "Kontakten er borte"
+         ],
+         "Click to hide these contacts": [
+            null,
+            "Klikk for å skjule disse kontaktene"
+         ],
+         "My contacts": [
+            null,
+            "Mine Kontakter"
+         ],
+         "Pending contacts": [
+            null,
+            "Kontakter som venter på godkjenning"
+         ],
+         "Contact requests": [
+            null,
+            "Kontaktforespørsler"
+         ],
+         "Ungrouped": [
+            null,
+            "Ugrupperte"
+         ],
+         "Contacts": [
+            null,
+            "Kontakter"
+         ],
+         "Groups": [
+            null,
+            "Grupper"
+         ],
+         "Reconnecting": [
+            null,
+            "Kobler til igjen"
+         ],
+         "Error": [
+            null,
+            "Feil"
+         ],
+         "Connecting": [
+            null,
+            "Kobler til"
+         ],
+         "Authenticating": [
+            null,
+            "Godkjenner"
+         ],
+         "Authentication Failed": [
+            null,
+            "Godkjenning mislyktes"
+         ],
+         "Online Contacts": [
+            null,
+            "Påloggede Kontakter"
+         ],
+         "Re-establishing encrypted session": [
+            null,
+            "Gjenopptar kryptert økt"
+         ],
+         "Generating private key.": [
+            null,
+            "Genererer privat nøkkel"
+         ],
+         "Your browser might become unresponsive.": [
+            null,
+            "Din nettleser kan bli uresponsiv"
+         ],
+         "Authentication request from %1$s\n\nYour chat contact is attempting to verify your identity, by asking you the question below.\n\n%2$s": [
+            null,
+            "Godkjenningsforespørsel fra %1$s\n\nDin nettpratkontakt forsøker å bekrefte din identitet, ved å spørre deg spørsmålet under.\n\n%2$s"
+         ],
+         "Could not verify this user's identify.": [
+            null,
+            "Kunne ikke bekrefte denne brukerens identitet"
+         ],
+         "Exchanging private key with contact.": [
+            null,
+            "Bytter private nøkler med kontakt"
+         ],
+         "Personal message": [
+            null,
+            "Personlig melding"
+         ],
+         "Are you sure you want to clear the messages from this room?": [
+            null,
+            "Er du sikker på at du vil fjerne meldingene fra dette rommet?"
+         ],
+         "me": [
+            null,
+            "meg"
+         ],
+         "is typing": [
+            null,
+            "skriver"
+         ],
+         "has stopped typing": [
+            null,
+            "har stoppet å skrive"
+         ],
+         "Show this menu": [
+            null,
+            "Viser denne menyen"
+         ],
+         "Write in the third person": [
+            null,
+            "Skriv i tredjeperson"
+         ],
+         "Remove messages": [
+            null,
+            "Fjern meldinger"
+         ],
+         "Are you sure you want to clear the messages from this chat box?": [
+            null,
+            "Er du sikker på at du vil fjerne meldingene fra denne meldingsboksen?"
+         ],
+         "Your message could not be sent": [
+            null,
+            "Beskjeden din kunne ikke sendes"
+         ],
+         "We received an unencrypted message": [
+            null,
+            "Vi mottok en ukryptert beskjed"
+         ],
+         "We received an unreadable encrypted message": [
+            null,
+            "Vi mottok en uleselig melding"
+         ],
+         "This user has requested an encrypted session.": [
+            null,
+            "Denne brukeren har ønsket en kryptert økt"
+         ],
+         "Here are the fingerprints, please confirm them with %1$s, outside of this chat.\n\nFingerprint for you, %2$s: %3$s\n\nFingerprint for %1$s: %4$s\n\nIf you have confirmed that the fingerprints match, click OK, otherwise click Cancel.": [
+            null,
+            "Here are the fingerprints, please confirm them with %1$s, outside of this chat.\n\nFingerprint for you, %2$s: %3$s\n\nFingerprint for %1$s: %4$s\n\nOm du har bekreftet at avtrykkene matcher, klikk OK. I motsatt fall, trykk Avbryt."
+         ],
+         "You will be prompted to provide a security question and then an answer to that question.\n\nYour contact will then be prompted the same question and if they type the exact same answer (case sensitive), their identity will be verified.": [
+            null,
+            "Du vil bli spurt etter å tilby et sikkerhetsspørsmål og siden svare på dette.\n\nDin kontakt vil så bli spurt om det samme spørsmålet, og om de svarer det nøyaktig samme svaret (det er forskjell på små og store bokstaver), vil identiteten verifiseres."
+         ],
+         "What is your security question?": [
+            null,
+            "Hva er ditt Sikkerhetsspørsmål?"
+         ],
+         "What is the answer to the security question?": [
+            null,
+            "Hva er svaret på ditt Sikkerhetsspørsmål?"
+         ],
+         "Invalid authentication scheme provided": [
+            null,
+            "Du har vedlagt en ugyldig godkjenningsplan."
+         ],
+         "Your messages are not encrypted anymore": [
+            null,
+            "Dine meldinger er ikke kryptert lenger."
+         ],
+         "Your messages are now encrypted but your contact's identity has not been verified.": [
+            null,
+            "Dine meldinger er nå krypterte, men identiteten til din kontakt har ikke blitt verifisert."
+         ],
+         "Your contact's identify has been verified.": [
+            null,
+            "Din kontakts identitet har blitt verifisert."
+         ],
+         "Your contact has ended encryption on their end, you should do the same.": [
+            null,
+            "Din kontakt har avsluttet kryptering i sin ende, dette burde du også gjøre."
+         ],
+         "Your messages are not encrypted. Click here to enable OTR encryption.": [
+            null,
+            "Dine meldinger er ikke krypterte. Klikk her for å aktivere OTR-kryptering."
+         ],
+         "Your messages are encrypted, but your contact has not been verified.": [
+            null,
+            "Dine meldinger er krypterte, men din kontakt har ikke blitt verifisert."
+         ],
+         "Your messages are encrypted and your contact verified.": [
+            null,
+            "Dine meldinger er krypterte og din kontakt er verifisert."
+         ],
+         "Your contact has closed their end of the private session, you should do the same": [
+            null,
+            "Din kontakt har avsluttet økten i sin ende, dette burde du også gjøre."
+         ],
+         "Clear all messages": [
+            null,
+            "Fjern alle meldinger"
+         ],
+         "End encrypted conversation": [
+            null,
+            "Avslutt kryptert økt"
+         ],
+         "Hide the list of participants": [
+            null,
+            "Skjul deltakerlisten"
+         ],
+         "Refresh encrypted conversation": [
+            null,
+            "Last inn kryptert samtale på nytt"
+         ],
+         "Start a call": [
+            null,
+            "Start en samtale"
+         ],
+         "Start encrypted conversation": [
+            null,
+            "Start en kryptert samtale"
+         ],
+         "Verify with fingerprints": [
+            null,
+            "Verifiser med Avtrykk"
+         ],
+         "Verify with SMP": [
+            null,
+            "Verifiser med SMP"
+         ],
+         "What's this?": [
+            null,
+            "Hva er dette?"
+         ],
+         "Online": [
+            null,
+            "Pålogget"
+         ],
+         "Busy": [
+            null,
+            "Opptatt"
+         ],
+         "Away": [
+            null,
+            "Borte"
+         ],
+         "Offline": [
+            null,
+            "Avlogget"
+         ],
+         "Log out": [
+            null,
+            "Logg Av"
+         ],
+         "Contact name": [
+            null,
+            "Kontaktnavn"
+         ],
+         "Search": [
+            null,
+            "Søk"
+         ],
+         "Contact username": [
+            null,
+            "Brukernavnet til Kontakt"
+         ],
+         "Add": [
+            null,
+            "Legg Til"
+         ],
+         "Click to add new chat contacts": [
+            null,
+            "Klikk for å legge til nye meldingskontakter"
+         ],
+         "Add a contact": [
+            null,
+            "Legg til en Kontakt"
+         ],
+         "No users found": [
+            null,
+            "Ingen brukere funnet"
+         ],
+         "Click to add as a chat contact": [
+            null,
+            "Klikk for å legge til som meldingskontakt"
+         ],
+         "Room name": [
+            null,
+            "Romnavn"
+         ],
+         "Nickname": [
+            null,
+            "Kallenavn"
+         ],
+         "Server": [
+            null,
+            "Server"
+         ],
+         "Join": [
+            null,
+            "Koble til"
+         ],
+         "Show rooms": [
+            null,
+            "Vis Rom"
+         ],
+         "Rooms": [
+            null,
+            "Rom"
+         ],
+         "No rooms on %1$s": [
+            null,
+            "Ingen rom på %1$s"
+         ],
+         "Rooms on %1$s": [
+            null,
+            "Rom på %1$s"
+         ],
+         "Click to open this room": [
+            null,
+            "Klikk for å åpne dette rommet"
+         ],
+         "Show more information on this room": [
+            null,
+            "Vis mer informasjon om dette rommet"
+         ],
+         "Description:": [
+            null,
+            "Beskrivelse:"
+         ],
+         "Occupants:": [
+            null,
+            "Brukere her:"
+         ],
+         "Features:": [
+            null,
+            "Egenskaper:"
+         ],
+         "Requires authentication": [
+            null,
+            "Krever Godkjenning"
+         ],
+         "Hidden": [
+            null,
+            "Skjult"
+         ],
+         "Requires an invitation": [
+            null,
+            "Krever en invitasjon"
+         ],
+         "Moderated": [
+            null,
+            "Moderert"
+         ],
+         "Non-anonymous": [
+            null,
+            "Ikke-Anonym"
+         ],
+         "Open room": [
+            null,
+            "Åpent Rom"
+         ],
+         "Permanent room": [
+            null,
+            "Permanent Rom"
+         ],
+         "Public": [
+            null,
+            "Alle"
+         ],
+         "Semi-anonymous": [
+            null,
+            "Semi-anonymt"
+         ],
+         "Temporary room": [
+            null,
+            "Midlertidig Rom"
+         ],
+         "Unmoderated": [
+            null,
+            "Umoderert"
+         ],
+         "This user is a moderator": [
+            null,
+            "Denne brukeren er moderator"
+         ],
+         "This user can send messages in this room": [
+            null,
+            "Denne brukeren kan skrive meldinger i dette rommet"
+         ],
+         "This user can NOT send messages in this room": [
+            null,
+            "Denne brukeren kan IKKE sende meldinger i dette rommet"
+         ],
+         "Invite...": [
+            null,
+            "Invitér..."
+         ],
+         "Occupants": [
+            null,
+            "Brukere her:"
+         ],
+         "You are about to invite %1$s to the chat room \"%2$s\". ": [
+            null,
+            "Du er i ferd med å invitere %1$s til samtalerommet \"%2$s\". "
+         ],
+         "You may optionally include a message, explaining the reason for the invitation.": [
+            null,
+            "Du kan eventuelt inkludere en melding og forklare årsaken til invitasjonen."
+         ],
+         "Message": [
+            null,
+            "Melding"
+         ],
+         "Error: could not execute the command": [
+            null,
+            "Feil: kunne ikke utføre kommandoen"
+         ],
+         "Ban user from room": [
+            null,
+            "Utesteng bruker fra rommet"
+         ],
+         "Kick user from room": [
+            null,
+            "Kast ut bruker fra rommet"
+         ],
+         "Write in 3rd person": [
+            null,
+            "Skriv i tredjeperson"
+         ],
+         "Remove user's ability to post messages": [
+            null,
+            "Fjern brukerens muligheter til å skrive meldinger"
+         ],
+         "Change your nickname": [
+            null,
+            "Endre ditt kallenavn"
+         ],
+         "Set room topic": [
+            null,
+            "Endre rommets emne"
+         ],
+         "Allow muted user to post messages": [
+            null,
+            "Tillat stumme brukere å skrive meldinger"
+         ],
+         "Save": [
+            null,
+            "Lagre"
+         ],
+         "Cancel": [
+            null,
+            "Avbryt"
+         ],
+         "An error occurred while trying to save the form.": [
+            null,
+            "En feil skjedde under lagring av skjemaet."
+         ],
+         "This chatroom requires a password": [
+            null,
+            "Dette rommet krever et passord"
+         ],
+         "Password: ": [
+            null,
+            "Passord:"
+         ],
+         "Submit": [
+            null,
+            "Send"
+         ],
+         "This room is not anonymous": [
+            null,
+            "Dette rommet er ikke anonymt"
+         ],
+         "This room now shows unavailable members": [
+            null,
+            "Dette rommet viser nå utilgjengelige medlemmer"
+         ],
+         "This room does not show unavailable members": [
+            null,
+            "Dette rommet viser ikke utilgjengelige medlemmer"
+         ],
+         "Non-privacy-related room configuration has changed": [
+            null,
+            "Ikke-personvernsrelatert romkonfigurasjon har blitt endret"
+         ],
+         "Room logging is now enabled": [
+            null,
+            "Romlogging er nå aktivert"
+         ],
+         "Room logging is now disabled": [
+            null,
+            "Romlogging er nå deaktivert"
+         ],
+         "This room is now non-anonymous": [
+            null,
+            "Dette rommet er nå ikke-anonymt"
+         ],
+         "This room is now semi-anonymous": [
+            null,
+            "Dette rommet er nå semi-anonymt"
+         ],
+         "This room is now fully-anonymous": [
+            null,
+            "Dette rommet er nå totalt anonymt"
+         ],
+         "A new room has been created": [
+            null,
+            "Et nytt rom har blitt opprettet"
+         ],
+         "You have been banned from this room": [
+            null,
+            "Du har blitt utestengt fra dette rommet"
+         ],
+         "You have been kicked from this room": [
+            null,
+            "Du ble kastet ut av dette rommet"
+         ],
+         "You have been removed from this room because of an affiliation change": [
+            null,
+            "Du har blitt fjernet fra dette rommet på grunn av en holdningsendring"
+         ],
+         "You have been removed from this room because the room has changed to members-only and you're not a member": [
+            null,
+            "Du har blitt fjernet fra dette rommet fordi rommet nå kun tillater medlemmer, noe du ikke er."
+         ],
+         "You have been removed from this room because the MUC (Multi-user chat) service is being shut down.": [
+            null,
+            "Du har blitt fjernet fra dette rommet fordi MBC (Multi-Bruker-Chat)-tjenesten er stengt ned."
+         ],
+         "<strong>%1$s</strong> has been banned": [
+            null,
+            "<strong>%1$s</strong>  har blitt utestengt"
+         ],
+         "<strong>%1$s</strong>'s nickname has changed": [
+            null,
+            "<strong>%1$s</strong> sitt kallenavn er endret"
+         ],
+         "<strong>%1$s</strong> has been kicked out": [
+            null,
+            "<strong>%1$s</strong>  ble kastet ut"
+         ],
+         "<strong>%1$s</strong> has been removed because of an affiliation change": [
+            null,
+            "<strong>%1$s</strong> har blitt fjernet på grunn av en holdningsendring"
+         ],
+         "<strong>%1$s</strong> has been removed for not being a member": [
+            null,
+            "<strong>%1$s</strong> har blitt fjernet på grunn av at han/hun ikke er medlem"
+         ],
+         "Your nickname has been automatically changed to: <strong>%1$s</strong>": [
+            null,
+            "Ditt kallenavn har blitt automatisk endret til <strong>%1$s</strong> "
+         ],
+         "Your nickname has been changed to: <strong>%1$s</strong>": [
+            null,
+            "Ditt kallenavn har blitt endret til <strong>%1$s</strong> "
+         ],
+         "The reason given is: \"": [
+            null,
+            "Årsaken som er oppgitt er: \""
+         ],
+         "You are not on the member list of this room": [
+            null,
+            "Du er ikke på medlemslisten til dette rommet"
+         ],
+         "No nickname was specified": [
+            null,
+            "Ingen kallenavn var spesifisert"
+         ],
+         "You are not allowed to create new rooms": [
+            null,
+            "Du har ikke tillatelse til å opprette nye rom"
+         ],
+         "Your nickname doesn't conform to this room's policies": [
+            null,
+            "Ditt kallenavn er ikke i samsvar med rommets regler"
+         ],
+         "Your nickname is already taken": [
+            null,
+            "Kallenavnet er allerede tatt"
+         ],
+         "This room does not (yet) exist": [
+            null,
+            "Dette rommet eksisterer ikke (enda)"
+         ],
+         "This room has reached it's maximum number of occupants": [
+            null,
+            "Dette rommet har nådd maksimalt antall brukere"
+         ],
+         "Topic set by %1$s to: %2$s": [
+            null,
+            "Emnet ble endret den %1$s til: %2$s"
+         ],
+         "%1$s has invited you to join a chat room: %2$s": [
+            null,
+            "%1$s har invitert deg til å bli med i chatterommet: %2$s"
+         ],
+         "%1$s has invited you to join a chat room: %2$s, and left the following reason: \"%3$s\"": [
+            null,
+            "%1$s har invitert deg til å bli med i chatterommet: %2$s, og forlot selv av følgende grunn:  \"%3$s\""
+         ],
+         "Click to restore this chat": [
+            null,
+            "Klikk for å gjenopprette denne samtalen"
+         ],
+         "Minimized": [
+            null,
+            "Minimert"
+         ],
+         "Click to remove this contact": [
+            null,
+            "Klikk for å fjerne denne kontakten"
+         ],
+         "Click to accept this contact request": [
+            null,
+            "Klikk for å Godta denne kontaktforespørselen"
+         ],
+         "Click to decline this contact request": [
+            null,
+            "Klikk for å avslå denne kontaktforespørselen"
+         ],
+         "Click to chat with this contact": [
+            null,
+            "Klikk for å chatte med denne kontakten"
+         ],
+         "Are you sure you want to remove this contact?": [
+            null,
+            "Er du sikker på at du vil fjerne denne kontakten?"
+         ],
+         "Are you sure you want to decline this contact request?": [
+            null,
+            "Er du sikker på at du vil avslå denne kontaktforespørselen?"
+         ],
+         "Type to filter": [
+            null,
+            "Skriv til filter"
+         ],
+         "I am %1$s": [
+            null,
+            "Jeg er %1$s"
+         ],
+         "Click here to write a custom status message": [
+            null,
+            "Klikk her for å skrive en personlig statusmelding"
+         ],
+         "Click to change your chat status": [
+            null,
+            "Klikk for å endre din meldingsstatus"
+         ],
+         "Custom status": [
+            null,
+            "Personlig status"
+         ],
+         "online": [
+            null,
+            "pålogget"
+         ],
+         "busy": [
+            null,
+            "opptatt"
+         ],
+         "away for long": [
+            null,
+            "borte lenge"
+         ],
+         "away": [
+            null,
+            "borte"
+         ],
+         "Your XMPP provider's domain name:": [
+            null,
+            "Din XMPP-tilbyders domenenavn:"
+         ],
+         "Fetch registration form": [
+            null,
+            "Hent registreringsskjema"
+         ],
+         "Tip: A list of public XMPP providers is available": [
+            null,
+            "Tips: En liste med offentlige XMPP-tilbydere er tilgjengelig"
+         ],
+         "here": [
+            null,
+            "her"
+         ],
+         "Register": [
+            null,
+            "Registrér deg"
+         ],
+         "Sorry, the given provider does not support in band account registration. Please try with a different provider.": [
+            null,
+            "Beklager, den valgte tilbyderen støtter ikke in band kontoregistrering. Vennligst prøv igjen med en annen tilbyder. "
+         ],
+         "Requesting a registration form from the XMPP server": [
+            null,
+            "Spør etter registreringsskjema fra XMPP-tjeneren"
+         ],
+         "Something went wrong while establishing a connection with \"%1$s\". Are you sure it exists?": [
+            null,
+            "Noe gikk galt under etablering av forbindelse med \"%1$s\". Er du sikker på at denne eksisterer?"
+         ],
+         "Now logging you in": [
+            null,
+            "Logger deg inn"
+         ],
+         "Registered successfully": [
+            null,
+            "Registrering var vellykket"
+         ],
+         "Return": [
+            null,
+            "Tilbake"
+         ],
+         "The provider rejected your registration attempt. ": [
+            null,
+            "Tilbyderen avviste ditt registreringsforsøk."
+         ],
+         "XMPP Username:": [
+            null,
+            "XMPP Brukernavn:"
+         ],
+         "Password:": [
+            null,
+            "Passord:"
+         ],
+         "Log In": [
+            null,
+            "Logg inn"
+         ],
+         "Sign in": [
+            null,
+            "Innlogging"
+         ],
+         "Toggle chat": [
+            null,
+            "Endre chatten"
+         ]
+      }
+   }
+};
+locales["nl"] = {
+   "domain": "converse",
+   "locale_data": {
+      "converse": {
+         "": {
+            "domain": "converse",
+            "plural_forms": "nplurals=2; plural=(n != 1);",
+            "lang": "nl"
+         },
+         "unencrypted": [
+            null,
+            "ongecodeerde"
+         ],
+         "unverified": [
+            null,
+            "niet geverifieerd"
+         ],
+         "verified": [
+            null,
+            "geverifieerd"
+         ],
+         "finished": [
+            null,
+            "klaar"
+         ],
+         "This contact is busy": [
+            null,
+            "Contact is bezet"
+         ],
+         "This contact is online": [
+            null,
+            "Contact is online"
+         ],
+         "This contact is offline": [
+            null,
+            "Contact is offline"
+         ],
+         "This contact is unavailable": [
+            null,
+            "Contact is niet beschikbaar"
+         ],
+         "This contact is away for an extended period": [
+            null,
+            "Contact is afwezig voor lange periode"
+         ],
+         "This contact is away": [
+            null,
+            "Conact is afwezig"
+         ],
+         "My contacts": [
+            null,
+            "Mijn contacts"
+         ],
+         "Pending contacts": [
+            null,
+            "Conacten in afwachting van"
+         ],
+         "Contact requests": [
+            null,
+            "Contact uitnodiging"
+         ],
+         "Ungrouped": [
+            null,
+            ""
+         ],
+         "Contacts": [
+            null,
+            "Contacten"
+         ],
+         "Groups": [
+            null,
+            ""
+         ],
+         "Error": [
+            null,
+            "Error"
+         ],
+         "Connecting": [
+            null,
+            "Verbinden"
+         ],
+         "Authenticating": [
+            null,
+            "Authenticeren"
+         ],
+         "Authentication Failed": [
+            null,
+            "Authenticeren mislukt"
+         ],
+         "Online Contacts": [
+            null,
+            "Online Contacten"
+         ],
+         "Re-establishing encrypted session": [
+            null,
+            "Bezig versleutelde sessie te herstellen"
+         ],
+         "Generating private key.": [
+            null,
+            ""
+         ],
+         "Your browser might become unresponsive.": [
+            null,
+            ""
+         ],
+         "Authentication request from %1$s\n\nYour chat contact is attempting to verify your identity, by asking you the question below.\n\n%2$s": [
+            null,
+            ""
+         ],
+         "Could not verify this user's identify.": [
+            null,
+            "Niet kon de identiteit van deze gebruiker niet identificeren."
+         ],
+         "Exchanging private key with contact.": [
+            null,
+            ""
+         ],
+         "Personal message": [
+            null,
+            "Persoonlijk bericht"
+         ],
+         "me": [
+            null,
+            "ikzelf"
+         ],
+         "Show this menu": [
+            null,
+            "Toon dit menu"
+         ],
+         "Write in the third person": [
+            null,
+            "Schrijf in de 3de persoon"
+         ],
+         "Remove messages": [
+            null,
+            "Verwijder bericht"
+         ],
+         "Are you sure you want to clear the messages from this chat box?": [
+            null,
+            ""
+         ],
+         "Your message could not be sent": [
+            null,
+            "Je bericht kon niet worden verzonden"
+         ],
+         "We received an unencrypted message": [
+            null,
+            "We ontvingen een unencrypted bericht "
+         ],
+         "We received an unreadable encrypted message": [
+            null,
+            "We ontvangen een onleesbaar unencrypted bericht"
+         ],
+         "This user has requested an encrypted session.": [
+            null,
+            "Deze gebruiker heeft een encrypted sessie aangevraagd."
+         ],
+         "Here are the fingerprints, please confirm them with %1$s, outside of this chat.\n\nFingerprint for you, %2$s: %3$s\n\nFingerprint for %1$s: %4$s\n\nIf you have confirmed that the fingerprints match, click OK, otherwise click Cancel.": [
+            null,
+            ""
+         ],
+         "You will be prompted to provide a security question and then an answer to that question.\n\nYour contact will then be prompted the same question and if they type the exact same answer (case sensitive), their identity will be verified.": [
+            null,
+            ""
+         ],
+         "What is your security question?": [
+            null,
+            "Wat is jou sericury vraag?"
+         ],
+         "What is the answer to the security question?": [
+            null,
+            "Wat is het antwoord op de security vraag?"
+         ],
+         "Invalid authentication scheme provided": [
+            null,
+            ""
+         ],
+         "Your messages are not encrypted anymore": [
+            null,
+            "Je berichten zijn niet meer encrypted"
+         ],
+         "Your messages are not encrypted. Click here to enable OTR encryption.": [
+            null,
+            "Jou bericht is niet encrypted. KLik hier om ORC encrytion aan te zetten."
+         ],
+         "End encrypted conversation": [
+            null,
+            "Beeindig encrypted gesprek"
+         ],
+         "Hide the list of participants": [
+            null,
+            ""
+         ],
+         "Refresh encrypted conversation": [
+            null,
+            "Ververs encrypted gesprek"
+         ],
+         "Start a call": [
+            null,
+            ""
+         ],
+         "Start encrypted conversation": [
+            null,
+            "Start encrypted gesprek"
+         ],
+         "Verify with fingerprints": [
+            null,
+            ""
+         ],
+         "Verify with SMP": [
+            null,
+            ""
+         ],
+         "What's this?": [
+            null,
+            "Wat is dit?"
+         ],
+         "Online": [
+            null,
+            "Online"
+         ],
+         "Busy": [
+            null,
+            "Bezet"
+         ],
+         "Away": [
+            null,
+            "Afwezig"
+         ],
+         "Offline": [
+            null,
+            ""
+         ],
+         "Contact name": [
+            null,
+            "Contact naam"
+         ],
+         "Search": [
+            null,
+            "Zoeken"
+         ],
+         "Contact username": [
+            null,
+            "Contact gebruikernaam"
+         ],
+         "Add": [
+            null,
+            "Toevoegen"
+         ],
+         "Click to add new chat contacts": [
+            null,
+            "Klik om nieuwe contacten toe te voegen"
+         ],
+         "Add a contact": [
+            null,
+            "Voeg contact toe"
+         ],
+         "No users found": [
+            null,
+            "Geen gebruikers gevonden"
+         ],
+         "Click to add as a chat contact": [
+            null,
+            "Klik om contact toe te voegen"
+         ],
+         "Room name": [
+            null,
+            "Room naam"
+         ],
+         "Nickname": [
+            null,
+            "Nickname"
+         ],
+         "Server": [
+            null,
+            "Server"
+         ],
+         "Join": [
+            null,
+            "Deelnemen"
+         ],
+         "Show rooms": [
+            null,
+            "Toon rooms"
+         ],
+         "Rooms": [
+            null,
+            "Rooms"
+         ],
+         "No rooms on %1$s": [
+            null,
+            "Geen room op %1$s"
+         ],
+         "Rooms on %1$s": [
+            null,
+            "Room op %1$s"
+         ],
+         "Click to open this room": [
+            null,
+            "Klik om room te openen"
+         ],
+         "Show more information on this room": [
+            null,
+            "Toon meer informatie over deze room"
+         ],
+         "Description:": [
+            null,
+            "Beschrijving"
+         ],
+         "Occupants:": [
+            null,
+            "Deelnemers:"
+         ],
+         "Features:": [
+            null,
+            "Functies:"
+         ],
+         "Requires authentication": [
+            null,
+            "Verificatie vereist"
+         ],
+         "Hidden": [
+            null,
+            "Verborgen"
+         ],
+         "Requires an invitation": [
+            null,
+            "Veriest een uitnodiging"
+         ],
+         "Moderated": [
+            null,
+            "Gemodereerd"
+         ],
+         "Non-anonymous": [
+            null,
+            "Niet annoniem"
+         ],
+         "Open room": [
+            null,
+            "Open room"
+         ],
+         "Permanent room": [
+            null,
+            "Blijvend room"
+         ],
+         "Public": [
+            null,
+            "Publiek"
+         ],
+         "Semi-anonymous": [
+            null,
+            "Semi annoniem"
+         ],
+         "Temporary room": [
+            null,
+            "Tijdelijke room"
+         ],
+         "Unmoderated": [
+            null,
+            "Niet gemodereerd"
+         ],
+         "This user is a moderator": [
+            null,
+            "Dit is een moderator"
+         ],
+         "This user can send messages in this room": [
+            null,
+            "Deze gebruiker kan berichten sturen in deze room"
+         ],
+         "This user can NOT send messages in this room": [
+            null,
+            "Deze gebruiker kan NIET een bericht sturen in deze room"
+         ],
+         "Invite...": [
+            null,
+            ""
+         ],
+         "You are about to invite %1$s to the chat room \"%2$s\". ": [
+            null,
+            ""
+         ],
+         "You may optionally include a message, explaining the reason for the invitation.": [
+            null,
+            ""
+         ],
+         "Message": [
+            null,
+            "Bericht"
+         ],
+         "Error: could not execute the command": [
+            null,
+            ""
+         ],
+         "Remove user's ability to post messages": [
+            null,
+            ""
+         ],
+         "Change your nickname": [
+            null,
+            ""
+         ],
+         "Allow muted user to post messages": [
+            null,
+            ""
+         ],
+         "Save": [
+            null,
+            "Opslaan"
+         ],
+         "Cancel": [
+            null,
+            "Annuleren"
+         ],
+         "An error occurred while trying to save the form.": [
+            null,
+            "Een error tijdens het opslaan van het formulier."
+         ],
+         "This chatroom requires a password": [
+            null,
+            "Chatroom heeft een wachtwoord"
+         ],
+         "Password: ": [
+            null,
+            "Wachtwoord: "
+         ],
+         "Submit": [
+            null,
+            "Indienen"
+         ],
+         "This room is not anonymous": [
+            null,
+            "Deze room is niet annoniem"
+         ],
+         "This room now shows unavailable members": [
+            null,
+            ""
+         ],
+         "This room does not show unavailable members": [
+            null,
+            ""
+         ],
+         "Non-privacy-related room configuration has changed": [
+            null,
+            ""
+         ],
+         "Room logging is now enabled": [
+            null,
+            ""
+         ],
+         "Room logging is now disabled": [
+            null,
+            ""
+         ],
+         "This room is now non-anonymous": [
+            null,
+            "Deze room is nu niet annoniem"
+         ],
+         "This room is now semi-anonymous": [
+            null,
+            "Deze room is nu semie annoniem"
+         ],
+         "This room is now fully-anonymous": [
+            null,
+            "Deze room is nu volledig annoniem"
+         ],
+         "A new room has been created": [
+            null,
+            "Een nieuwe room is gemaakt"
+         ],
+         "You have been banned from this room": [
+            null,
+            "Je bent verbannen uit deze room"
+         ],
+         "You have been kicked from this room": [
+            null,
+            "Je bent uit de room gegooid"
+         ],
+         "You have been removed from this room because of an affiliation change": [
+            null,
+            ""
+         ],
+         "You have been removed from this room because the room has changed to members-only and you're not a member": [
+            null,
+            ""
+         ],
+         "You have been removed from this room because the MUC (Multi-user chat) service is being shut down.": [
+            null,
+            ""
+         ],
+         "<strong>%1$s</strong> has been banned": [
+            null,
+            "<strong>%1$s</strong> is verbannen"
+         ],
+         "<strong>%1$s</strong> has been kicked out": [
+            null,
+            "<strong>%1$s</strong> has been kicked out"
+         ],
+         "<strong>%1$s</strong> has been removed because of an affiliation change": [
+            null,
+            ""
+         ],
+         "<strong>%1$s</strong> has been removed for not being a member": [
+            null,
+            ""
+         ],
+         "The reason given is: \"": [
+            null,
+            ""
+         ],
+         "You are not on the member list of this room": [
+            null,
+            "Je bent niet een gebruiker van deze room"
+         ],
+         "No nickname was specified": [
+            null,
+            "Geen nickname ingegeven"
+         ],
+         "You are not allowed to create new rooms": [
+            null,
+            "Je bent niet toegestaan nieuwe rooms te maken"
+         ],
+         "Your nickname doesn't conform to this room's policies": [
+            null,
+            "Je nickname is niet conform policy"
+         ],
+         "Your nickname is already taken": [
+            null,
+            "Je nickname bestaat al"
+         ],
+         "This room does not (yet) exist": [
+            null,
+            "Deze room bestaat niet"
+         ],
+         "This room has reached it's maximum number of occupants": [
+            null,
+            "Deze room heeft het maximale aantal gebruikers"
+         ],
+         "Topic set by %1$s to: %2$s": [
+            null,
+            ""
+         ],
+         "%1$s has invited you to join a chat room: %2$s": [
+            null,
+            ""
+         ],
+         "%1$s has invited you to join a chat room: %2$s, and left the following reason: \"%3$s\"": [
+            null,
+            ""
+         ],
+         "Minimized": [
+            null,
+            ""
+         ],
+         "Click to remove this contact": [
+            null,
+            "Klik om contact te verwijderen"
+         ],
+         "Click to chat with this contact": [
+            null,
+            "Klik om te chatten met contact"
+         ],
+         "Type to filter": [
+            null,
+            ""
+         ],
+         "I am %1$s": [
+            null,
+            "Ik ben %1$s"
+         ],
+         "Click here to write a custom status message": [
+            null,
+            "Klik hier om custom status bericht te maken"
+         ],
+         "Click to change your chat status": [
+            null,
+            "Klik hier om status te wijzigen"
+         ],
+         "Custom status": [
+            null,
+            ""
+         ],
+         "online": [
+            null,
+            "online"
+         ],
+         "busy": [
+            null,
+            "bezet"
+         ],
+         "away for long": [
+            null,
+            "afwezig lange tijd"
+         ],
+         "away": [
+            null,
+            "afwezig"
+         ],
+         "Your XMPP provider's domain name:": [
+            null,
+            ""
+         ],
+         "Fetch registration form": [
+            null,
+            ""
+         ],
+         "Tip: A list of public XMPP providers is available": [
+            null,
+            ""
+         ],
+         "here": [
+            null,
+            ""
+         ],
+         "Register": [
+            null,
+            ""
+         ],
+         "Sorry, the given provider does not support in band account registration. Please try with a different provider.": [
+            null,
+            ""
+         ],
+         "Requesting a registration form from the XMPP server": [
+            null,
+            ""
+         ],
+         "Something went wrong while establishing a connection with \"%1$s\". Are you sure it exists?": [
+            null,
+            ""
+         ],
+         "Now logging you in": [
+            null,
+            ""
+         ],
+         "Registered successfully": [
+            null,
+            ""
+         ],
+         "Return": [
+            null,
+            ""
+         ],
+         "The provider rejected your registration attempt. ": [
+            null,
+            ""
+         ],
+         "Password:": [
+            null,
+            "Wachtwoord:"
+         ],
+         "Log In": [
+            null,
+            "Aanmelden"
+         ],
+         "Sign in": [
+            null,
+            "Aanmelden"
+         ],
+         "Toggle chat": [
+            null,
+            ""
+         ]
+      }
+   }
+};
+locales["pl"] = {
+   "domain": "converse",
+   "locale_data": {
+      "converse": {
+         "": {
+            "domain": "converse",
+            "plural_forms": "nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);",
+            "lang": "pl"
+         },
+         "unencrypted": [
+            null,
+            "nieszyfrowane"
+         ],
+         "unverified": [
+            null,
+            "niezweryfikowane"
+         ],
+         "verified": [
+            null,
+            "zweryfikowane"
+         ],
+         "finished": [
+            null,
+            "zakończone"
+         ],
+         "This contact is busy": [
+            null,
+            "Kontakt jest zajęty"
+         ],
+         "This contact is online": [
+            null,
+            "Kontakt jest połączony"
+         ],
+         "This contact is offline": [
+            null,
+            "Kontakt jest niepołączony"
+         ],
+         "This contact is unavailable": [
+            null,
+            "Kontakt jest niedostępny"
+         ],
+         "This contact is away for an extended period": [
+            null,
+            "Kontakt jest nieobecny przez dłuższą chwilę"
+         ],
+         "This contact is away": [
+            null,
+            "Kontakt jest nieobecny"
+         ],
+         "Click to hide these contacts": [
+            null,
+            "Kliknij aby schować te kontakty"
+         ],
+         "My contacts": [
+            null,
+            "Moje kontakty"
+         ],
+         "Pending contacts": [
+            null,
+            "Kontakty oczekujące"
+         ],
+         "Contact requests": [
+            null,
+            "Zaproszenia do kontaktu"
+         ],
+         "Ungrouped": [
+            null,
+            "Niezgrupowane"
+         ],
+         "Contacts": [
+            null,
+            "Kontakty"
+         ],
+         "Groups": [
+            null,
+            "Grupy"
+         ],
+         "Reconnecting": [
+            null,
+            "Przywracam połączenie"
+         ],
+         "Error": [
+            null,
+            "Błąd"
+         ],
+         "Connecting": [
+            null,
+            "Łączę się"
+         ],
+         "Authenticating": [
+            null,
+            "Autoryzacja"
+         ],
+         "Authentication Failed": [
+            null,
+            "Autoryzacja nie powiodła się"
+         ],
+         "Online Contacts": [
+            null,
+            "Dostępne kontakty"
+         ],
+         "Re-establishing encrypted session": [
+            null,
+            "Przywrócenie sesji szyfrowanej"
+         ],
+         "Generating private key.": [
+            null,
+            "Generuję klucz prywatny."
+         ],
+         "Your browser might become unresponsive.": [
+            null,
+            "Twoja przeglądarka może nieco zwolnić."
+         ],
+         "Authentication request from %1$s\n\nYour chat contact is attempting to verify your identity, by asking you the question below.\n\n%2$s": [
+            null,
+            "Prośba o autoryzację od %1$s\n\nKontakt próbuje zweryfikować twoją tożsamość, zadając ci pytanie poniżej.\n\n%2$s"
+         ],
+         "Could not verify this user's identify.": [
+            null,
+            "Nie jestem w stanie zweryfikować tożsamości kontaktu."
+         ],
+         "Exchanging private key with contact.": [
+            null,
+            "Wymieniam klucze szyfrujące z kontaktem."
+         ],
+         "Personal message": [
+            null,
+            "Wiadomość osobista"
+         ],
+         "Are you sure you want to clear the messages from this room?": [
+            null,
+            "Potwierdź czy rzeczywiście chcesz wyczyścić wiadomości z tego pokoju?"
+         ],
+         "me": [
+            null,
+            "ja"
+         ],
+         "is typing": [
+            null,
+            "pisze"
+         ],
+         "has stopped typing": [
+            null,
+            "przestał pisać"
+         ],
+         "Show this menu": [
+            null,
+            "Pokaż menu"
+         ],
+         "Write in the third person": [
+            null,
+            "Pisz w trzeciej osobie"
+         ],
+         "Remove messages": [
+            null,
+            "Usuń wiadomość"
+         ],
+         "Are you sure you want to clear the messages from this chat box?": [
+            null,
+            "Potwierdź czy rzeczywiście chcesz wyczyścić wiadomości z okienka rozmowy?"
+         ],
+         "Your message could not be sent": [
+            null,
+            "Twoja wiadomość nie została wysłana"
+         ],
+         "We received an unencrypted message": [
+            null,
+            "Otrzymaliśmy niezaszyfrowaną wiadomość"
+         ],
+         "We received an unreadable encrypted message": [
+            null,
+            "Otrzymaliśmy nieczytelną zaszyfrowaną wiadomość"
+         ],
+         "This user has requested an encrypted session.": [
+            null,
+            "Kontakt prosi o sesję szyfrowaną."
+         ],
+         "Here are the fingerprints, please confirm them with %1$s, outside of this chat.\n\nFingerprint for you, %2$s: %3$s\n\nFingerprint for %1$s: %4$s\n\nIf you have confirmed that the fingerprints match, click OK, otherwise click Cancel.": [
+            null,
+            "Oto odciski palców, potwiedź je proszę z %1$s używając innego sposobuwymiany informacji niż ta rozmowa.\n\nOdcisk palca dla ciebie, %2$s: %3$s\n\nOdcisk palca dla %1$s: %4$s\n\nJeśli odciski palców zostały potwierdzone, kliknij OK, w inny wypadku kliknij Anuluj."
+         ],
+         "You will be prompted to provide a security question and then an answer to that question.\n\nYour contact will then be prompted the same question and if they type the exact same answer (case sensitive), their identity will be verified.": [
+            null,
+            "Poprosimy cię o podanie pytania sprawdzającego i odpowiedzi na nie.\n\nTwój kontakt zostanie poproszony później o odpowiedź na to samo pytanie i jeśli udzieli tej samej odpowiedzi (ważna jest wielkość liter), tożsamość zostanie zwerfikowana."
+         ],
+         "What is your security question?": [
+            null,
+            "Jakie jest pytanie bezpieczeństwa?"
+         ],
+         "What is the answer to the security question?": [
+            null,
+            "Jaka jest odpowiedź na pytanie bezpieczeństwa?"
+         ],
+         "Invalid authentication scheme provided": [
+            null,
+            "Niewłaściwy schemat autoryzacji"
+         ],
+         "Your messages are not encrypted anymore": [
+            null,
+            "Twoje wiadomości nie są już szyfrowane"
+         ],
+         "Your messages are now encrypted but your contact's identity has not been verified.": [
+            null,
+            "Wiadomości są teraz szyfrowane, ale tożsamość kontaktu nie została zweryfikowana."
+         ],
+         "Your contact's identify has been verified.": [
+            null,
+            "Tożsamość kontaktu została zweryfikowana"
+         ],
+         "Your contact has ended encryption on their end, you should do the same.": [
+            null,
+            "Kontakt zakończył sesję szyfrowaną, powinieneś zrobić to samo."
+         ],
+         "Your messages are not encrypted. Click here to enable OTR encryption.": [
+            null,
+            "Twoje wiadomości nie są szyfrowane. Kliknij, aby uruchomić szyfrowanie OTR"
+         ],
+         "Your messages are encrypted, but your contact has not been verified.": [
+            null,
+            "Wiadomości są szyfrowane, ale tożsamość kontaktu nie została zweryfikowana."
+         ],
+         "Your messages are encrypted and your contact verified.": [
+            null,
+            "Wiadomości są szyfrowane i tożsamość kontaktu została zweryfikowana."
+         ],
+         "Your contact has closed their end of the private session, you should do the same": [
+            null,
+            "Kontakt zakończył prywatną rozmowę i ty zrób to samo"
+         ],
+         "Clear all messages": [
+            null,
+            "Wyczyść wszystkie wiadomości"
+         ],
+         "End encrypted conversation": [
+            null,
+            "Zakończ szyfrowaną rozmowę"
+         ],
+         "Hide the list of participants": [
+            null,
+            "Ukryj listę rozmówców"
+         ],
+         "Refresh encrypted conversation": [
+            null,
+            "Odśwież szyfrowaną rozmowę"
+         ],
+         "Start a call": [
+            null,
+            "Zadzwoń"
+         ],
+         "Start encrypted conversation": [
+            null,
+            "Rozpocznij szyfrowaną rozmowę"
+         ],
+         "Verify with fingerprints": [
+            null,
+            "Zweryfikuj za pomocą odcisków palców"
+         ],
+         "Verify with SMP": [
+            null,
+            "Zweryfikuj za pomocą SMP"
+         ],
+         "What's this?": [
+            null,
+            "Co to jest?"
+         ],
+         "Online": [
+            null,
+            "Dostępny"
+         ],
+         "Busy": [
+            null,
+            "Zajęty"
+         ],
+         "Away": [
+            null,
+            "Nieobecny"
+         ],
+         "Offline": [
+            null,
+            "Rozłączony"
+         ],
+         "Log out": [
+            null,
+            "Wyloguj"
+         ],
+         "Contact name": [
+            null,
+            "Nazwa kontaktu"
+         ],
+         "Search": [
+            null,
+            "Szukaj"
+         ],
+         "Contact username": [
+            null,
+            "Ksywka kontaktu"
+         ],
+         "Add": [
+            null,
+            "Dodaj"
+         ],
+         "Click to add new chat contacts": [
+            null,
+            "Kliknij aby dodać nowe kontakty"
+         ],
+         "Add a contact": [
+            null,
+            "Dodaj kontakt"
+         ],
+         "No users found": [
+            null,
+            "Nie znaleziono użytkowników"
+         ],
+         "Click to add as a chat contact": [
+            null,
+            "Kliknij aby dodać jako kontakt"
+         ],
+         "Room name": [
+            null,
+            "Nazwa pokoju"
+         ],
+         "Nickname": [
+            null,
+            "Ksywka"
+         ],
+         "Server": [
+            null,
+            "Serwer"
+         ],
+         "Join": [
+            null,
+            "Dołącz"
+         ],
+         "Show rooms": [
+            null,
+            "Pokaż pokoje"
+         ],
+         "Rooms": [
+            null,
+            "Pokoje"
+         ],
+         "No rooms on %1$s": [
+            null,
+            "Brak jest pokojów na %1$s"
+         ],
+         "Rooms on %1$s": [
+            null,
+            "Pokoje na %1$s"
+         ],
+         "Click to open this room": [
+            null,
+            "Kliknij aby wejść do pokoju"
+         ],
+         "Show more information on this room": [
+            null,
+            "Pokaż więcej informacji o pokoju"
+         ],
+         "Description:": [
+            null,
+            "Opis:"
+         ],
+         "Occupants:": [
+            null,
+            "Uczestnicy:"
+         ],
+         "Features:": [
+            null,
+            "Możliwości:"
+         ],
+         "Requires authentication": [
+            null,
+            "Wymaga autoryzacji"
+         ],
+         "Hidden": [
+            null,
+            "Ukryty"
+         ],
+         "Requires an invitation": [
+            null,
+            "Wymaga zaproszenia"
+         ],
+         "Moderated": [
+            null,
+            "Moderowany"
+         ],
+         "Non-anonymous": [
+            null,
+            "Nieanonimowy"
+         ],
+         "Open room": [
+            null,
+            "Otwarty pokój"
+         ],
+         "Permanent room": [
+            null,
+            "Stały pokój"
+         ],
+         "Public": [
+            null,
+            "Publiczny"
+         ],
+         "Semi-anonymous": [
+            null,
+            "Półanonimowy"
+         ],
+         "Temporary room": [
+            null,
+            "Pokój tymczasowy"
+         ],
+         "Unmoderated": [
+            null,
+            "Niemoderowany"
+         ],
+         "This user is a moderator": [
+            null,
+            "Ten człowiek jest moderatorem"
+         ],
+         "This user can send messages in this room": [
+            null,
+            "Ten człowiek może rozmawiać w niejszym pokoju"
+         ],
+         "This user can NOT send messages in this room": [
+            null,
+            "Ten człowiek nie może rozmawiać w niniejszym pokoju"
+         ],
+         "Invite...": [
+            null,
+            "Zaproś..."
+         ],
+         "Occupants": [
+            null,
+            "Uczestników"
+         ],
+         "You are about to invite %1$s to the chat room \"%2$s\". ": [
+            null,
+            "Zamierzasz zaprosić %1$s do pokoju rozmów \"%2$s\". "
+         ],
+         "You may optionally include a message, explaining the reason for the invitation.": [
+            null,
+            "Masz opcjonalną możliwość dołączenia wiadomości, która wyjaśni przyczynę zaproszenia."
+         ],
+         "Message": [
+            null,
+            "Wiadomość:"
+         ],
+         "Error: could not execute the command": [
+            null,
+            "Błąd: nie potrafię uruchomić polecenia"
+         ],
+         "Ban user from room": [
+            null,
+            "Zablokuj dostępu do pokoju"
+         ],
+         "Kick user from room": [
+            null,
+            "Wykop z pokoju"
+         ],
+         "Write in 3rd person": [
+            null,
+            "Pisz w trzeciej osobie"
+         ],
+         "Remove user's ability to post messages": [
+            null,
+            "Zablokuj człowiekowi możliwość rozmowy"
+         ],
+         "Change your nickname": [
+            null,
+            "Zmień ksywkę"
+         ],
+         "Set room topic": [
+            null,
+            "Ustaw temat pokoju"
+         ],
+         "Allow muted user to post messages": [
+            null,
+            "Pozwól uciszonemu człowiekowi na rozmowę"
+         ],
+         "Save": [
+            null,
+            "Zachowaj"
+         ],
+         "Cancel": [
+            null,
+            "Anuluj"
+         ],
+         "An error occurred while trying to save the form.": [
+            null,
+            "Wystąpił błąd w czasie próby zachowania formularza."
+         ],
+         "This chatroom requires a password": [
+            null,
+            "Pokój rozmów wymaga podania hasła"
+         ],
+         "Password: ": [
+            null,
+            "Hasło:"
+         ],
+         "Submit": [
+            null,
+            "Wyślij"
+         ],
+         "This room is not anonymous": [
+            null,
+            "Pokój nie jest anonimowy"
+         ],
+         "This room now shows unavailable members": [
+            null,
+            "Pokój pokazuje niedostępnych rozmówców"
+         ],
+         "This room does not show unavailable members": [
+            null,
+            "Ten pokój nie wyświetla niedostępnych członków"
+         ],
+         "Non-privacy-related room configuration has changed": [
+            null,
+            "Ustawienia pokoju nie związane z prywatnością zostały zmienione"
+         ],
+         "Room logging is now enabled": [
+            null,
+            "Zostało włączone zapisywanie rozmów w pokoju"
+         ],
+         "Room logging is now disabled": [
+            null,
+            "Zostało wyłączone zapisywanie rozmów w pokoju"
+         ],
+         "This room is now non-anonymous": [
+            null,
+            "Pokój stał się nieanonimowy"
+         ],
+         "This room is now semi-anonymous": [
+            null,
+            "Pokój stał się półanonimowy"
+         ],
+         "This room is now fully-anonymous": [
+            null,
+            "Pokój jest teraz w pełni anonimowy"
+         ],
+         "A new room has been created": [
+            null,
+            "Został utworzony nowy pokój"
+         ],
+         "You have been banned from this room": [
+            null,
+            "Jesteś niemile widziany w tym pokoju"
+         ],
+         "You have been kicked from this room": [
+            null,
+            "Zostałeś wykopany z pokoju"
+         ],
+         "You have been removed from this room because of an affiliation change": [
+            null,
+            "Zostałeś usunięty z pokoju ze względu na zmianę przynależności"
+         ],
+         "You have been removed from this room because the room has changed to members-only and you're not a member": [
+            null,
+            "Zostałeś usunięty z pokoju ze względu na to, że pokój zmienił się na wymagający członkowstwa, a ty nie jesteś członkiem"
+         ],
+         "You have been removed from this room because the MUC (Multi-user chat) service is being shut down.": [
+            null,
+            "Zostałeś usunięty z pokoju ze względu na to, że serwis MUC(Multi-user chat) został wyłączony."
+         ],
+         "<strong>%1$s</strong> has been banned": [
+            null,
+            "<strong>%1$s</strong> został zbanowany"
+         ],
+         "<strong>%1$s</strong>'s nickname has changed": [
+            null,
+            "<strong>%1$s</strong> zmienił ksywkę"
+         ],
+         "<strong>%1$s</strong> has been kicked out": [
+            null,
+            "<strong>%1$s</strong> został wykopany"
+         ],
+         "<strong>%1$s</strong> has been removed because of an affiliation change": [
+            null,
+            "<strong>%1$s</strong> został usunięty z powodu zmiany przynależności"
+         ],
+         "<strong>%1$s</strong> has been removed for not being a member": [
+            null,
+            "<strong>%1$s</strong> został usunięty ze względu na to, że nie jest członkiem"
+         ],
+         "Your nickname has been automatically changed to: <strong>%1$s</strong>": [
+            null,
+            "Twoja ksywka została automatycznie zmieniona na: <strong>%1$s</strong>"
+         ],
+         "Your nickname has been changed to: <strong>%1$s</strong>": [
+            null,
+            "Twoja ksywka została zmieniona na: <strong>%1$s</strong>"
+         ],
+         "The reason given is: \"": [
+            null,
+            "Podana przyczyna to: \""
+         ],
+         "You are not on the member list of this room": [
+            null,
+            "Nie jesteś członkiem tego pokoju rozmów"
+         ],
+         "No nickname was specified": [
+            null,
+            "Nie podałeś ksywki"
+         ],
+         "You are not allowed to create new rooms": [
+            null,
+            "Nie masz uprawnień do tworzenia nowych pokojów rozmów"
+         ],
+         "Your nickname doesn't conform to this room's policies": [
+            null,
+            "Twoja ksywka nie jest zgodna z regulaminem pokoju"
+         ],
+         "Your nickname is already taken": [
+            null,
+            "Twoja ksywka jest już w użyciu"
+         ],
+         "This room does not (yet) exist": [
+            null,
+            "Ten pokój (jeszcze) nie istnieje"
+         ],
+         "This room has reached it's maximum number of occupants": [
+            null,
+            "Pokój przekroczył dozwoloną ilość rozmówców"
+         ],
+         "Topic set by %1$s to: %2$s": [
+            null,
+            "Temat ustawiony przez %1$s na: %2$s"
+         ],
+         "%1$s has invited you to join a chat room: %2$s": [
+            null,
+            "%1$s zaprosił(a) cię do wejścia do pokoju rozmów %2$s"
+         ],
+         "%1$s has invited you to join a chat room: %2$s, and left the following reason: \"%3$s\"": [
+            null,
+            "%1$s zaprosił cię do pokoju: %2$s, podając następujący powód: \"%3$s\""
+         ],
+         "Click to restore this chat": [
+            null,
+            "Kliknij aby powrócić do rozmowy"
+         ],
+         "Minimized": [
+            null,
+            "Zminimalizowany"
+         ],
+         "Click to remove this contact": [
+            null,
+            "Kliknij aby usunąć kontakt"
+         ],
+         "Click to accept this contact request": [
+            null,
+            "Klknij aby zaakceptować życzenie nawiązania kontaktu"
+         ],
+         "Click to decline this contact request": [
+            null,
+            "Kliknij aby odrzucić życzenie nawiązania kontaktu"
+         ],
+         "Click to chat with this contact": [
+            null,
+            "Kliknij aby porozmawiać z kontaktem"
+         ],
+         "Are you sure you want to remove this contact?": [
+            null,
+            "Czy potwierdzasz zamiar usnunięcia tego kontaktu?"
+         ],
+         "Are you sure you want to decline this contact request?": [
+            null,
+            "Czy potwierdzasz odrzucenie chęci nawiązania kontaktu?"
+         ],
+         "Type to filter": [
+            null,
+            "Zacznij pisać, aby odfiltrować"
+         ],
+         "I am %1$s": [
+            null,
+            "Jestem %1$s"
+         ],
+         "Click here to write a custom status message": [
+            null,
+            "Kliknij aby wpisać nowy status"
+         ],
+         "Click to change your chat status": [
+            null,
+            "Kliknij aby zmienić status rozmowy"
+         ],
+         "Custom status": [
+            null,
+            "Własny status"
+         ],
+         "online": [
+            null,
+            "dostępny"
+         ],
+         "busy": [
+            null,
+            "zajęty"
+         ],
+         "away for long": [
+            null,
+            "dłużej nieobecny"
+         ],
+         "away": [
+            null,
+            "nieobecny"
+         ],
+         "Your XMPP provider's domain name:": [
+            null,
+            "Domena twojego dostawcy XMPP:"
+         ],
+         "Fetch registration form": [
+            null,
+            "Pobierz formularz rejestracyjny"
+         ],
+         "Tip: A list of public XMPP providers is available": [
+            null,
+            "Wskazówka: dostępna jest lista publicznych dostawców XMPP"
+         ],
+         "here": [
+            null,
+            "tutaj"
+         ],
+         "Register": [
+            null,
+            "Zarejestruj"
+         ],
+         "Sorry, the given provider does not support in band account registration. Please try with a different provider.": [
+            null,
+            "Przepraszamy, ale podany dostawca nie obsługuje rejestracji. Spróbuj wskazać innego dostawcę."
+         ],
+         "Requesting a registration form from the XMPP server": [
+            null,
+            "Pobieranie formularza rejestracyjnego z serwera XMPP"
+         ],
+         "Something went wrong while establishing a connection with \"%1$s\". Are you sure it exists?": [
+            null,
+            "Coś nie zadziałało przy próbie połączenia z \"%1$s\". Jesteś pewien że istnieje?"
+         ],
+         "Now logging you in": [
+            null,
+            "Teraz jesteś logowany"
+         ],
+         "Registered successfully": [
+            null,
+            "Szczęśliwie zarejestrowany"
+         ],
+         "Return": [
+            null,
+            "Powrót"
+         ],
+         "The provider rejected your registration attempt. ": [
+            null,
+            "Dostawca odrzucił twoją próbę rejestracji. "
+         ],
+         "XMPP Username:": [
+            null,
+            "Nazwa użytkownika XMPP:"
+         ],
+         "Password:": [
+            null,
+            "Hasło:"
+         ],
+         "Log In": [
+            null,
+            "Zaloguj się"
+         ],
+         "Sign in": [
+            null,
+            "Zarejestruj się"
+         ],
+         "Toggle chat": [
+            null,
+            "Przełącz rozmowę"
+         ]
+      }
+   }
+};
+locales["pt_br"] = {
+   "domain": "converse",
+   "locale_data": {
+      "converse": {
+         "": {
+            "domain": "converse",
+            "plural_forms": "nplurals=2; plural=(n > 1);",
+            "lang": "pt_BR"
+         },
+         "unencrypted": [
+            null,
+            "não-criptografado"
+         ],
+         "unverified": [
+            null,
+            "não-verificado"
+         ],
+         "verified": [
+            null,
+            "verificado"
+         ],
+         "finished": [
+            null,
+            "finalizado"
+         ],
+         "This contact is busy": [
+            null,
+            "Este contato está ocupado"
+         ],
+         "This contact is online": [
+            null,
+            "Este contato está online"
+         ],
+         "This contact is offline": [
+            null,
+            "Este contato está offline"
+         ],
+         "This contact is unavailable": [
+            null,
+            "Este contato está indisponível"
+         ],
+         "This contact is away for an extended period": [
+            null,
+            "Este contato está ausente por um longo período"
+         ],
+         "This contact is away": [
+            null,
+            "Este contato está ausente"
+         ],
+         "My contacts": [
+            null,
+            "Meus contatos"
+         ],
+         "Pending contacts": [
+            null,
+            "Contados pendentes"
+         ],
+         "Contact requests": [
+            null,
+            "Solicitação de contatos"
+         ],
+         "Ungrouped": [
+            null,
+            ""
+         ],
+         "Contacts": [
+            null,
+            "Contatos"
+         ],
+         "Groups": [
+            null,
+            ""
+         ],
+         "Error": [
+            null,
+            "Erro"
+         ],
+         "Connecting": [
+            null,
+            "Conectando"
+         ],
+         "Authenticating": [
+            null,
+            "Autenticando"
+         ],
+         "Authentication Failed": [
+            null,
+            "Falha de autenticação"
+         ],
+         "Online Contacts": [
+            null,
+            "Contatos online"
+         ],
+         "Re-establishing encrypted session": [
+            null,
+            "Reestabelecendo sessão criptografada"
+         ],
+         "Generating private key.": [
+            null,
+            "Gerando chave-privada."
+         ],
+         "Your browser might become unresponsive.": [
+            null,
+            "Seu navegador pode parar de responder."
+         ],
+         "Could not verify this user's identify.": [
+            null,
+            "Não foi possível verificar a identidade deste usuário."
+         ],
+         "Personal message": [
+            null,
+            "Mensagem pessoal"
+         ],
+         "me": [
+            null,
+            "eu"
+         ],
+         "Show this menu": [
+            null,
+            "Mostrar o menu"
+         ],
+         "Write in the third person": [
+            null,
+            "Escrever em terceira pessoa"
+         ],
+         "Remove messages": [
+            null,
+            "Remover mensagens"
+         ],
+         "Are you sure you want to clear the messages from this chat box?": [
+            null,
+            "Tem certeza que deseja limpar as mensagens dessa caixa?"
+         ],
+         "Your message could not be sent": [
+            null,
+            "Sua mensagem não pode ser enviada"
+         ],
+         "We received an unencrypted message": [
+            null,
+            "Recebemos uma mensagem não-criptografada"
+         ],
+         "We received an unreadable encrypted message": [
+            null,
+            "Recebemos uma mensagem não-criptografada ilegível"
+         ],
+         "This user has requested an encrypted session.": [
+            null,
+            "Usuário pediu uma sessão criptografada."
+         ],
+         "Here are the fingerprints, please confirm them with %1$s, outside of this chat.\n\nFingerprint for you, %2$s: %3$s\n\nFingerprint for %1$s: %4$s\n\nIf you have confirmed that the fingerprints match, click OK, otherwise click Cancel.": [
+            null,
+            "Aqui estão as assinaturas digitais, por favor confirme elas com %1$s, fora deste chat.\n\nAssinatura para você, %2$s: %3$s\n\nAssinatura para %1$s: %4$s\n\nSe você tiver confirmado que as assinaturas conferem, clique OK, caso contrário, clique Cancelar."
+         ],
+         "What is your security question?": [
+            null,
+            "Qual é a sua pergunta de segurança?"
+         ],
+         "What is the answer to the security question?": [
+            null,
+            "Qual é a resposta para a pergunta de segurança?"
+         ],
+         "Invalid authentication scheme provided": [
+            null,
+            "Schema de autenticação fornecido é inválido"
+         ],
+         "Your messages are not encrypted anymore": [
+            null,
+            "Suas mensagens não estão mais criptografadas"
+         ],
+         "Your messages are not encrypted. Click here to enable OTR encryption.": [
+            null,
+            "Suas mensagens não estão criptografadas. Clique aqui para habilitar criptografia OTR."
+         ],
+         "End encrypted conversation": [
+            null,
+            "Finalizar conversa criptografada"
+         ],
+         "Hide the list of participants": [
+            null,
+            ""
+         ],
+         "Refresh encrypted conversation": [
+            null,
+            "Atualizar conversa criptografada"
+         ],
+         "Start a call": [
+            null,
+            ""
+         ],
+         "Start encrypted conversation": [
+            null,
+            "Iniciar conversa criptografada"
+         ],
+         "Verify with fingerprints": [
+            null,
+            "Verificar com assinatura digital"
+         ],
+         "Verify with SMP": [
+            null,
+            "Verificar com SMP"
+         ],
+         "What's this?": [
+            null,
+            "O que é isso?"
+         ],
+         "Online": [
+            null,
+            "Online"
+         ],
+         "Busy": [
+            null,
+            "Ocupado"
+         ],
+         "Away": [
+            null,
+            "Ausente"
+         ],
+         "Offline": [
+            null,
+            "Offline"
+         ],
+         "Contact name": [
+            null,
+            "Nome do contato"
+         ],
+         "Search": [
+            null,
+            "Procurar"
+         ],
+         "Contact username": [
+            null,
+            "Usuário do contatt"
+         ],
+         "Add": [
+            null,
+            "Adicionar"
+         ],
+         "Click to add new chat contacts": [
+            null,
+            "Clique para adicionar novos contatos ao chat"
+         ],
+         "Add a contact": [
+            null,
+            "Adicionar contato"
+         ],
+         "No users found": [
+            null,
+            "Não foram encontrados usuários"
+         ],
+         "Click to add as a chat contact": [
+            null,
+            "Clique para adicionar como um contato do chat"
+         ],
+         "Room name": [
+            null,
+            "Nome da sala"
+         ],
+         "Nickname": [
+            null,
+            "Apelido"
+         ],
+         "Server": [
+            null,
+            "Server"
+         ],
+         "Join": [
+            null,
+            "Entrar"
+         ],
+         "Show rooms": [
+            null,
+            "Mostar salas"
+         ],
+         "Rooms": [
+            null,
+            "Salas"
+         ],
+         "No rooms on %1$s": [
+            null,
+            "Sem salas em %1$s"
+         ],
+         "Rooms on %1$s": [
+            null,
+            "Salas em %1$s"
+         ],
+         "Click to open this room": [
+            null,
+            "CLique para abrir a sala"
+         ],
+         "Show more information on this room": [
+            null,
+            "Mostrar mais informações nessa sala"
+         ],
+         "Description:": [
+            null,
+            "Descrição:"
+         ],
+         "Occupants:": [
+            null,
+            "Ocupantes:"
+         ],
+         "Features:": [
+            null,
+            "Recursos:"
+         ],
+         "Requires authentication": [
+            null,
+            "Requer autenticação"
+         ],
+         "Hidden": [
+            null,
+            "Escondido"
+         ],
+         "Requires an invitation": [
+            null,
+            "Requer um convite"
+         ],
+         "Moderated": [
+            null,
+            "Moderado"
+         ],
+         "Non-anonymous": [
+            null,
+            "Não anônimo"
+         ],
+         "Open room": [
+            null,
+            "Sala aberta"
+         ],
+         "Permanent room": [
+            null,
+            "Sala permanente"
+         ],
+         "Public": [
+            null,
+            "Público"
+         ],
+         "Semi-anonymous": [
+            null,
+            "Semi anônimo"
+         ],
+         "Temporary room": [
+            null,
+            "Sala temporária"
+         ],
+         "Unmoderated": [
+            null,
+            "Sem moderação"
+         ],
+         "This user is a moderator": [
+            null,
+            "Esse usuário é o moderador"
+         ],
+         "This user can send messages in this room": [
+            null,
+            "Esse usuário pode enviar mensagens nessa sala"
+         ],
+         "This user can NOT send messages in this room": [
+            null,
+            "Esse usuário NÃO pode enviar mensagens nessa sala"
+         ],
+         "Invite...": [
+            null,
+            ""
+         ],
+         "You are about to invite %1$s to the chat room \"%2$s\". ": [
+            null,
+            ""
+         ],
+         "You may optionally include a message, explaining the reason for the invitation.": [
+            null,
+            ""
+         ],
+         "Message": [
+            null,
+            "Mensagem"
+         ],
+         "Error: could not execute the command": [
+            null,
+            ""
+         ],
+         "Remove user's ability to post messages": [
+            null,
+            ""
+         ],
+         "Change your nickname": [
+            null,
+            ""
+         ],
+         "Allow muted user to post messages": [
+            null,
+            ""
+         ],
+         "Save": [
+            null,
+            "Salvar"
+         ],
+         "Cancel": [
+            null,
+            "Cancelar"
+         ],
+         "An error occurred while trying to save the form.": [
+            null,
+            "Ocorreu um erro enquanto tentava salvar o formulário"
+         ],
+         "This chatroom requires a password": [
+            null,
+            "Esse chat precisa de senha"
+         ],
+         "Password: ": [
+            null,
+            "Senha: "
+         ],
+         "Submit": [
+            null,
+            "Enviar"
+         ],
+         "This room is not anonymous": [
+            null,
+            "Essa sala não é anônima"
+         ],
+         "This room now shows unavailable members": [
+            null,
+            "Agora esta sala mostra membros indisponíveis"
+         ],
+         "This room does not show unavailable members": [
+            null,
+            "Essa sala não mostra membros indisponíveis"
+         ],
+         "Non-privacy-related room configuration has changed": [
+            null,
+            "Configuraçõs não relacionadas à privacidade mudaram"
+         ],
+         "Room logging is now enabled": [
+            null,
+            "O log da sala está ativado"
+         ],
+         "Room logging is now disabled": [
+            null,
+            "O log da sala está desativado"
+         ],
+         "This room is now non-anonymous": [
+            null,
+            "Esse sala é não anônima"
+         ],
+         "This room is now semi-anonymous": [
+            null,
+            "Essa sala agora é semi anônima"
+         ],
+         "This room is now fully-anonymous": [
+            null,
+            "Essa sala agora é totalmente anônima"
+         ],
+         "A new room has been created": [
+            null,
+            "Uma nova sala foi criada"
+         ],
+         "You have been banned from this room": [
+            null,
+            "Você foi banido dessa sala"
+         ],
+         "You have been kicked from this room": [
+            null,
+            "Você foi expulso dessa sala"
+         ],
+         "You have been removed from this room because of an affiliation change": [
+            null,
+            "Você foi removido da sala devido a uma mudança de associação"
+         ],
+         "You have been removed from this room because the room has changed to members-only and you're not a member": [
+            null,
+            "Você foi removido da sala porque ela foi mudada para somente membrose você não é um membro"
+         ],
+         "You have been removed from this room because the MUC (Multi-user chat) service is being shut down.": [
+            null,
+            "Você foi removido da sala devido a MUC (Multi-user chat)o serviço está sendo desligado"
+         ],
+         "<strong>%1$s</strong> has been banned": [
+            null,
+            "<strong>%1$s</strong> foi banido"
+         ],
+         "<strong>%1$s</strong> has been kicked out": [
+            null,
+            "<strong>%1$s</strong> foi expulso"
+         ],
+         "<strong>%1$s</strong> has been removed because of an affiliation change": [
+            null,
+            "<srtong>%1$s</strong> foi removido por causa de troca de associação"
+         ],
+         "<strong>%1$s</strong> has been removed for not being a member": [
+            null,
+            "<strong>%1$s</strong> foi removido por não ser um membro"
+         ],
+         "The reason given is: \"": [
+            null,
+            ""
+         ],
+         "You are not on the member list of this room": [
+            null,
+            "Você não é membro dessa sala"
+         ],
+         "No nickname was specified": [
+            null,
+            "Você não escolheu um apelido "
+         ],
+         "You are not allowed to create new rooms": [
+            null,
+            "Você não tem permitição de criar novas salas"
+         ],
+         "Your nickname doesn't conform to this room's policies": [
+            null,
+            "Seu apelido não está de acordo com as regras da sala"
+         ],
+         "Your nickname is already taken": [
+            null,
+            "Seu apelido já foi escolhido"
+         ],
+         "This room does not (yet) exist": [
+            null,
+            "A sala não existe (ainda)"
+         ],
+         "This room has reached it's maximum number of occupants": [
+            null,
+            "A sala atingiu o número máximo de ocupantes"
+         ],
+         "Topic set by %1$s to: %2$s": [
+            null,
+            "Topico definido por %1$s para: %2$s"
+         ],
+         "%1$s has invited you to join a chat room: %2$s": [
+            null,
+            ""
+         ],
+         "%1$s has invited you to join a chat room: %2$s, and left the following reason: \"%3$s\"": [
+            null,
+            ""
+         ],
+         "Minimized": [
+            null,
+            "Minimizado"
+         ],
+         "Click to remove this contact": [
+            null,
+            "Clique para remover o contato"
+         ],
+         "Click to chat with this contact": [
+            null,
+            "Clique para conversar com o contato"
+         ],
+         "Type to filter": [
+            null,
+            ""
+         ],
+         "I am %1$s": [
+            null,
+            "Estou %1$s"
+         ],
+         "Click here to write a custom status message": [
+            null,
+            "Clique aqui para customizar a mensagem de status"
+         ],
+         "Click to change your chat status": [
+            null,
+            "Clique para mudar seu status no chat"
+         ],
+         "Custom status": [
+            null,
+            "Status customizado"
+         ],
+         "online": [
+            null,
+            "online"
+         ],
+         "busy": [
+            null,
+            "ocupado"
+         ],
+         "away for long": [
+            null,
+            "ausente a bastante tempo"
+         ],
+         "away": [
+            null,
+            "ausente"
+         ],
+         "Your XMPP provider's domain name:": [
+            null,
+            ""
+         ],
+         "Fetch registration form": [
+            null,
+            ""
+         ],
+         "Tip: A list of public XMPP providers is available": [
+            null,
+            ""
+         ],
+         "here": [
+            null,
+            ""
+         ],
+         "Register": [
+            null,
+            ""
+         ],
+         "Sorry, the given provider does not support in band account registration. Please try with a different provider.": [
+            null,
+            ""
+         ],
+         "Requesting a registration form from the XMPP server": [
+            null,
+            ""
+         ],
+         "Something went wrong while establishing a connection with \"%1$s\". Are you sure it exists?": [
+            null,
+            ""
+         ],
+         "Now logging you in": [
+            null,
+            ""
+         ],
+         "Registered successfully": [
+            null,
+            ""
+         ],
+         "Return": [
+            null,
+            ""
+         ],
+         "The provider rejected your registration attempt. ": [
+            null,
+            ""
+         ],
+         "Password:": [
+            null,
+            "Senha:"
+         ],
+         "Log In": [
+            null,
+            "Entrar"
+         ],
+         "Sign in": [
+            null,
+            "Conectar-se"
+         ],
+         "Toggle chat": [
+            null,
+            "Alternar bate-papo"
+         ]
+      }
+   }
+};
+locales["ru"] = {
+   "domain": "converse",
+   "locale_data": {
+      "converse": {
+         "": {
+            "domain": "converse",
+            "lang": "ru"
+         },
+         "unencrypted": [
+            null,
+            "не зашифровано"
+         ],
+         "unverified": [
+            null,
+            "непроверено"
+         ],
+         "verified": [
+            null,
+            "проверено"
+         ],
+         "finished": [
+            null,
+            "закончено"
+         ],
+         "This contact is busy": [
+            null,
+            "Занят"
+         ],
+         "This contact is online": [
+            null,
+            "В сети"
+         ],
+         "This contact is offline": [
+            null,
+            "Не в сети"
+         ],
+         "This contact is unavailable": [
+            null,
+            "Не доступен"
+         ],
+         "This contact is away for an extended period": [
+            null,
+            "На долго отошёл"
+         ],
+         "This contact is away": [
+            null,
+            "Отошёл"
+         ],
+         "My contacts": [
+            null,
+            "Контакты"
+         ],
+         "Pending contacts": [
+            null,
+            "Собеседники ожидающие авторизации"
+         ],
+         "Contact requests": [
+            null,
+            "Запросы на авторизацию"
+         ],
+         "Ungrouped": [
+            null,
+            ""
+         ],
+         "Contacts": [
+            null,
+            "Контакты"
+         ],
+         "Groups": [
+            null,
+            ""
+         ],
+         "Error": [
+            null,
+            "Ошибка"
+         ],
+         "Connecting": [
+            null,
+            "Соединение"
+         ],
+         "Authenticating": [
+            null,
+            "Авторизация"
+         ],
+         "Authentication Failed": [
+            null,
+            "Не удалось авторизоваться"
+         ],
+         "Online Contacts": [
+            null,
+            "Cписок собеседников"
+         ],
+         "Re-establishing encrypted session": [
+            null,
+            ""
+         ],
+         "Generating private key.": [
+            null,
+            ""
+         ],
+         "Your browser might become unresponsive.": [
+            null,
+            ""
+         ],
+         "Authentication request from %1$s\n\nYour chat contact is attempting to verify your identity, by asking you the question below.\n\n%2$s": [
+            null,
+            ""
+         ],
+         "Could not verify this user's identify.": [
+            null,
+            ""
+         ],
+         "Exchanging private key with contact.": [
+            null,
+            ""
+         ],
+         "Personal message": [
+            null,
+            "Введите сообщение"
+         ],
+         "me": [
+            null,
+            "Я"
+         ],
+         "is typing": [
+            null,
+            ""
+         ],
+         "has stopped typing": [
+            null,
+            ""
+         ],
+         "Show this menu": [
+            null,
+            "Показать это меню"
+         ],
+         "Write in the third person": [
+            null,
+            ""
+         ],
+         "Remove messages": [
+            null,
+            "Удалить сообщения"
+         ],
+         "Are you sure you want to clear the messages from this chat box?": [
+            null,
+            ""
+         ],
+         "Your message could not be sent": [
+            null,
+            "Ваше сообщение не послано"
+         ],
+         "We received an unencrypted message": [
+            null,
+            ""
+         ],
+         "We received an unreadable encrypted message": [
+            null,
+            ""
+         ],
+         "This user has requested an encrypted session.": [
+            null,
+            ""
+         ],
+         "Here are the fingerprints, please confirm them with %1$s, outside of this chat.\n\nFingerprint for you, %2$s: %3$s\n\nFingerprint for %1$s: %4$s\n\nIf you have confirmed that the fingerprints match, click OK, otherwise click Cancel.": [
+            null,
+            ""
+         ],
+         "You will be prompted to provide a security question and then an answer to that question.\n\nYour contact will then be prompted the same question and if they type the exact same answer (case sensitive), their identity will be verified.": [
+            null,
+            ""
+         ],
+         "What is your security question?": [
+            null,
+            ""
+         ],
+         "What is the answer to the security question?": [
+            null,
+            ""
+         ],
+         "Invalid authentication scheme provided": [
+            null,
+            ""
+         ],
+         "Your messages are not encrypted anymore": [
+            null,
+            "Ваши сообщения больше не шифруются"
+         ],
+         "Your contact has ended encryption on their end, you should do the same.": [
+            null,
+            ""
+         ],
+         "Your messages are not encrypted. Click here to enable OTR encryption.": [
+            null,
+            "Ваши сообщения не шифруются. Нажмите здесь чтобы настроить шифрование."
+         ],
+         "Your contact has closed their end of the private session, you should do the same": [
+            null,
+            ""
+         ],
+         "End encrypted conversation": [
+            null,
+            ""
+         ],
+         "Hide the list of participants": [
+            null,
+            ""
+         ],
+         "Refresh encrypted conversation": [
+            null,
+            ""
+         ],
+         "Start a call": [
+            null,
+            ""
+         ],
+         "Start encrypted conversation": [
+            null,
+            ""
+         ],
+         "Verify with fingerprints": [
+            null,
+            ""
+         ],
+         "Verify with SMP": [
+            null,
+            ""
+         ],
+         "What's this?": [
+            null,
+            "Что это?"
+         ],
+         "Online": [
+            null,
+            "В сети"
+         ],
+         "Busy": [
+            null,
+            "Занят"
+         ],
+         "Away": [
+            null,
+            "Отошёл"
+         ],
+         "Offline": [
+            null,
+            "Не в сети"
+         ],
+         "Contact name": [
+            null,
+            "Имя контакта"
+         ],
+         "Search": [
+            null,
+            "Поиск"
+         ],
+         "Contact username": [
+            null,
+            "Имя пользователя"
+         ],
+         "Add": [
+            null,
+            "Добавить"
+         ],
+         "Click to add new chat contacts": [
+            null,
+            "Добавить новую конференцию"
+         ],
+         "Add a contact": [
+            null,
+            "Добавть контакт"
+         ],
+         "No users found": [
+            null,
+            "Пользователи не найдены"
+         ],
+         "Click to add as a chat contact": [
+            null,
+            "Добавить контакт"
+         ],
+         "Room name": [
+            null,
+            "Имя конференции"
+         ],
+         "Nickname": [
+            null,
+            "Псевдоним"
+         ],
+         "Server": [
+            null,
+            "Сервер"
+         ],
+         "Join": [
+            null,
+            "Подключиться"
+         ],
+         "Show rooms": [
+            null,
+            "Обновить"
+         ],
+         "Rooms": [
+            null,
+            "Конфер."
+         ],
+         "No rooms on %1$s": [
+            null,
+            "Нет доступных конференций %1$s"
+         ],
+         "Rooms on %1$s": [
+            null,
+            "Конференции %1$s:"
+         ],
+         "Click to open this room": [
+            null,
+            "Зайти в конференцию"
+         ],
+         "Show more information on this room": [
+            null,
+            "Показать больше информации об этой конференции"
+         ],
+         "Description:": [
+            null,
+            "Описание:"
+         ],
+         "Occupants:": [
+            null,
+            "Участники:"
+         ],
+         "Features:": [
+            null,
+            "Свойства:"
+         ],
+         "Requires authentication": [
+            null,
+            "Требуется авторизация"
+         ],
+         "Hidden": [
+            null,
+            "Скрыто"
+         ],
+         "Requires an invitation": [
+            null,
+            "Требуется приглашение"
+         ],
+         "Moderated": [
+            null,
+            "Модерируемая"
+         ],
+         "Non-anonymous": [
+            null,
+            "Не анонимная"
+         ],
+         "Open room": [
+            null,
+            "Открыть конференцию"
+         ],
+         "Permanent room": [
+            null,
+            "Перманентная конференция"
+         ],
+         "Public": [
+            null,
+            "Публичный"
+         ],
+         "Semi-anonymous": [
+            null,
+            "Частично анонимная"
+         ],
+         "Temporary room": [
+            null,
+            "Временная конференция"
+         ],
+         "Unmoderated": [
+            null,
+            "Немодерируемая"
+         ],
+         "This user is a moderator": [
+            null,
+            "Модератор"
+         ],
+         "This user can send messages in this room": [
+            null,
+            "Собеседник"
+         ],
+         "This user can NOT send messages in this room": [
+            null,
+            "Пользователь не может посылать сообщения в эту комнату"
+         ],
+         "Invite...": [
+            null,
+            ""
+         ],
+         "You are about to invite %1$s to the chat room \"%2$s\". ": [
+            null,
+            ""
+         ],
+         "You may optionally include a message, explaining the reason for the invitation.": [
+            null,
+            ""
+         ],
+         "Message": [
+            null,
+            "Сообщение"
+         ],
+         "Error: could not execute the command": [
+            null,
+            ""
+         ],
+         "Write in 3rd person": [
+            null,
+            ""
+         ],
+         "Remove user's ability to post messages": [
+            null,
+            ""
+         ],
+         "Change your nickname": [
+            null,
+            ""
+         ],
+         "Allow muted user to post messages": [
+            null,
+            ""
+         ],
+         "Save": [
+            null,
+            "Сохранить"
+         ],
+         "Cancel": [
+            null,
+            "Отменить"
+         ],
+         "An error occurred while trying to save the form.": [
+            null,
+            "При сохранение формы произошла ошибка."
+         ],
+         "This chatroom requires a password": [
+            null,
+            "Для доступа в конфер. необходим пароль."
+         ],
+         "Password: ": [
+            null,
+            "Пароль: "
+         ],
+         "Submit": [
+            null,
+            "Отправить"
+         ],
+         "This room is not anonymous": [
+            null,
+            "Эта комната не анонимная"
+         ],
+         "This room now shows unavailable members": [
+            null,
+            "Эта комната показывает доступных собеседников"
+         ],
+         "This room does not show unavailable members": [
+            null,
+            "Эта комната не показывает недоступных собеседников"
+         ],
+         "Non-privacy-related room configuration has changed": [
+            null,
+            ""
+         ],
+         "Room logging is now enabled": [
+            null,
+            ""
+         ],
+         "Room logging is now disabled": [
+            null,
+            ""
+         ],
+         "This room is now non-anonymous": [
+            null,
+            "Эта комната не анонимная"
+         ],
+         "This room is now semi-anonymous": [
+            null,
+            "Эта комната частично анонимная"
+         ],
+         "This room is now fully-anonymous": [
+            null,
+            "Эта комната стала полностью анонимной"
+         ],
+         "A new room has been created": [
+            null,
+            "Новая комната была создана"
+         ],
+         "You have been banned from this room": [
+            null,
+            "Вам запрещено подключатся к этой конференции"
+         ],
+         "You have been kicked from this room": [
+            null,
+            "Вам запрещено подключатся к этой конференции"
+         ],
+         "You have been removed from this room because of an affiliation change": [
+            null,
+            "<strong>%1$s</strong> удалён потому что изменились права"
+         ],
+         "You have been removed from this room because the room has changed to members-only and you're not a member": [
+            null,
+            "Вы отключены от этой конференции потому что режим изменился: только-участники"
+         ],
+         "You have been removed from this room because the MUC (Multi-user chat) service is being shut down.": [
+            null,
+            "Вы отключены от этой конференции потому что сервись конференций выключен."
+         ],
+         "<strong>%1$s</strong> has been banned": [
+            null,
+            "<strong>%1$s</strong> забанен"
+         ],
+         "<strong>%1$s</strong> has been kicked out": [
+            null,
+            "<strong>%1$s</strong> выдворен"
+         ],
+         "<strong>%1$s</strong> has been removed because of an affiliation change": [
+            null,
+            "<strong>%1$s</strong> has been removed because of an affiliation change"
+         ],
+         "<strong>%1$s</strong> has been removed for not being a member": [
+            null,
+            "<strong>%1$s</strong> удалён потому что не участник"
+         ],
+         "The reason given is: \"": [
+            null,
+            ""
+         ],
+         "You are not on the member list of this room": [
+            null,
+            "Вас нет в списке этой конференции"
+         ],
+         "No nickname was specified": [
+            null,
+            "Вы не указали псевдоним"
+         ],
+         "You are not allowed to create new rooms": [
+            null,
+            "Вы не имеете права создавать конфер."
+         ],
+         "Your nickname doesn't conform to this room's policies": [
+            null,
+            "Псевдоним не согласуется с правилами конфер."
+         ],
+         "Your nickname is already taken": [
+            null,
+            "Ваш ник уже используется другим пользователем"
+         ],
+         "This room does not (yet) exist": [
+            null,
+            "Эта комната не существует"
+         ],
+         "This room has reached it's maximum number of occupants": [
+            null,
+            "Конференция достигла максимального количества участников"
+         ],
+         "Topic set by %1$s to: %2$s": [
+            null,
+            "Тема %2$s устатновлена %1$s"
+         ],
+         "%1$s has invited you to join a chat room: %2$s": [
+            null,
+            ""
+         ],
+         "%1$s has invited you to join a chat room: %2$s, and left the following reason: \"%3$s\"": [
+            null,
+            ""
+         ],
+         "Minimized": [
+            null,
+            ""
+         ],
+         "Click to remove this contact": [
+            null,
+            "Удалить контакт"
+         ],
+         "Click to chat with this contact": [
+            null,
+            "Начать общение"
+         ],
+         "Type to filter": [
+            null,
+            ""
+         ],
+         "I am %1$s": [
+            null,
+            "%1$s"
+         ],
+         "Click here to write a custom status message": [
+            null,
+            "Редактировать произвольный статус"
+         ],
+         "Click to change your chat status": [
+            null,
+            "Изменить ваш статус"
+         ],
+         "Custom status": [
+            null,
+            "Произвольный статус"
+         ],
+         "online": [
+            null,
+            "на связи"
+         ],
+         "busy": [
+            null,
+            "занят"
+         ],
+         "away for long": [
+            null,
+            "отошёл на долго"
+         ],
+         "away": [
+            null,
+            "отошёл"
+         ],
+         "Your XMPP provider's domain name:": [
+            null,
+            ""
+         ],
+         "Fetch registration form": [
+            null,
+            ""
+         ],
+         "Tip: A list of public XMPP providers is available": [
+            null,
+            ""
+         ],
+         "here": [
+            null,
+            ""
+         ],
+         "Register": [
+            null,
+            ""
+         ],
+         "Sorry, the given provider does not support in band account registration. Please try with a different provider.": [
+            null,
+            ""
+         ],
+         "Requesting a registration form from the XMPP server": [
+            null,
+            ""
+         ],
+         "Something went wrong while establishing a connection with \"%1$s\". Are you sure it exists?": [
+            null,
+            ""
+         ],
+         "Now logging you in": [
+            null,
+            ""
+         ],
+         "Registered successfully": [
+            null,
+            ""
+         ],
+         "Return": [
+            null,
+            ""
+         ],
+         "The provider rejected your registration attempt. ": [
+            null,
+            ""
+         ],
+         "Password:": [
+            null,
+            "Пароль:"
+         ],
+         "Log In": [
+            null,
+            "Войти"
+         ],
+         "Sign in": [
+            null,
+            "Подписать"
+         ],
+         "Toggle chat": [
+            null,
+            ""
+         ]
+      }
+   }
+};
+locales["zh"] = {
+   "domain": "converse",
+   "locale_data": {
+      "converse": {
+         "": {
+            "domain": "converse",
+            "lang": "zh"
+         },
+         "unencrypted": [
+            null,
+            "未加密"
+         ],
+         "unverified": [
+            null,
+            "未验证"
+         ],
+         "verified": [
+            null,
+            "已验证"
+         ],
+         "finished": [
+            null,
+            "结束了"
+         ],
+         "This contact is busy": [
+            null,
+            "对方忙碌中"
+         ],
+         "This contact is online": [
+            null,
+            "对方在线中"
+         ],
+         "This contact is offline": [
+            null,
+            "对方已下线"
+         ],
+         "This contact is unavailable": [
+            null,
+            "对方免打扰"
+         ],
+         "This contact is away for an extended period": [
+            null,
+            "对方暂时离开"
+         ],
+         "This contact is away": [
+            null,
+            "对方离开"
+         ],
+         "My contacts": [
+            null,
+            "我的好友列表"
+         ],
+         "Pending contacts": [
+            null,
+            "保留中的联系人"
+         ],
+         "Contact requests": [
+            null,
+            "来自好友的请求"
+         ],
+         "Ungrouped": [
+            null,
+            ""
+         ],
+         "Contacts": [
+            null,
+            "联系人"
+         ],
+         "Groups": [
+            null,
+            ""
+         ],
+         "Error": [
+            null,
+            "错误"
+         ],
+         "Connecting": [
+            null,
+            "连接中"
+         ],
+         "Authenticating": [
+            null,
+            "验证中"
+         ],
+         "Authentication Failed": [
+            null,
+            "验证失败"
+         ],
+         "Online Contacts": [
+            null,
+            "在线好友"
+         ],
+         "Re-establishing encrypted session": [
+            null,
+            "重新建立加密会话"
+         ],
+         "Generating private key.": [
+            null,
+            "正在生成私钥"
+         ],
+         "Your browser might become unresponsive.": [
+            null,
+            "您的浏览器可能会暂时无响应"
+         ],
+         "Could not verify this user's identify.": [
+            null,
+            "无法验证对方信息。"
+         ],
+         "Personal message": [
+            null,
+            "私信"
+         ],
+         "me": [
+            null,
+            "我"
+         ],
+         "is typing": [
+            null,
+            ""
+         ],
+         "has stopped typing": [
+            null,
+            ""
+         ],
+         "Show this menu": [
+            null,
+            "显示此项菜单"
+         ],
+         "Write in the third person": [
+            null,
+            "以第三者身份写"
+         ],
+         "Remove messages": [
+            null,
+            "移除消息"
+         ],
+         "Are you sure you want to clear the messages from this chat box?": [
+            null,
+            "你确定清除此次的聊天记录吗？"
+         ],
+         "Your message could not be sent": [
+            null,
+            "您的消息无法送出"
+         ],
+         "We received an unencrypted message": [
+            null,
+            "我们收到了一条未加密的信息"
+         ],
+         "We received an unreadable encrypted message": [
+            null,
+            "我们收到一条无法读取的信息"
+         ],
+         "This user has requested an encrypted session.": [
+            null,
+            "此用户请求了一个加密会话。"
+         ],
+         "Here are the fingerprints, please confirm them with %1$s, outside of this chat.\n\nFingerprint for you, %2$s: %3$s\n\nFingerprint for %1$s: %4$s\n\nIf you have confirmed that the fingerprints match, click OK, otherwise click Cancel.": [
+            null,
+            "这里是指纹。请与 %1$s 确认。\n\n您的 %2$s 指纹: %3$s\n\n%1$s 的指纹: %4$s\n\n如果确认符合，请点击OK，否则点击取消"
+         ],
+         "What is your security question?": [
+            null,
+            "您的安全问题是?"
+         ],
+         "What is the answer to the security question?": [
+            null,
+            "此安全问题的答案是?"
+         ],
+         "Invalid authentication scheme provided": [
+            null,
+            "非法的认证方式"
+         ],
+         "Your messages are not encrypted anymore": [
+            null,
+            "您的消息将不再被加密"
+         ],
+         "Your messages are not encrypted. Click here to enable OTR encryption.": [
+            null,
+            "您的消息未加密。点击这里来启用OTR加密"
+         ],
+         "End encrypted conversation": [
+            null,
+            "结束加密的会话"
+         ],
+         "Hide the list of participants": [
+            null,
+            ""
+         ],
+         "Refresh encrypted conversation": [
+            null,
+            "刷新加密的会话"
+         ],
+         "Start a call": [
+            null,
+            ""
+         ],
+         "Start encrypted conversation": [
+            null,
+            "开始加密的会话"
+         ],
+         "Verify with fingerprints": [
+            null,
+            "验证指纹"
+         ],
+         "Verify with SMP": [
+            null,
+            "验证SMP"
+         ],
+         "What's this?": [
+            null,
+            "这是什么?"
+         ],
+         "Online": [
+            null,
+            "在线"
+         ],
+         "Busy": [
+            null,
+            "忙碌中"
+         ],
+         "Away": [
+            null,
+            "离开"
+         ],
+         "Offline": [
+            null,
+            "离线"
+         ],
+         "Contact name": [
+            null,
+            "联系人名称"
+         ],
+         "Search": [
+            null,
+            "搜索"
+         ],
+         "Contact username": [
+            null,
+            "联系人姓名"
+         ],
+         "Add": [
+            null,
+            "添加"
+         ],
+         "Click to add new chat contacts": [
+            null,
+            "点击添加新联系人"
+         ],
+         "Add a contact": [
+            null,
+            "添加联系人"
+         ],
+         "No users found": [
+            null,
+            "未找到用户"
+         ],
+         "Click to add as a chat contact": [
+            null,
+            "点击添加为好友"
+         ],
+         "Room name": [
+            null,
+            "聊天室名称"
+         ],
+         "Nickname": [
+            null,
+            "昵称"
+         ],
+         "Server": [
+            null,
+            "服务器"
+         ],
+         "Join": [
+            null,
+            "加入"
+         ],
+         "Show rooms": [
+            null,
+            "显示所有聊天室"
+         ],
+         "Rooms": [
+            null,
+            "聊天室"
+         ],
+         "No rooms on %1$s": [
+            null,
+            "%1$s 上没有聊天室"
+         ],
+         "Rooms on %1$s": [
+            null,
+            "%1$s 上的聊天室"
+         ],
+         "Click to open this room": [
+            null,
+            "打开聊天室"
+         ],
+         "Show more information on this room": [
+            null,
+            "显示次聊天室的更多信息"
+         ],
+         "Description:": [
+            null,
+            "描述: "
+         ],
+         "Occupants:": [
+            null,
+            "成员:"
+         ],
+         "Features:": [
+            null,
+            "特性:"
+         ],
+         "Requires authentication": [
+            null,
+            "需要验证"
+         ],
+         "Hidden": [
+            null,
+            "隐藏的"
+         ],
+         "Requires an invitation": [
+            null,
+            "需要被邀请"
+         ],
+         "Moderated": [
+            null,
+            "发言受限"
+         ],
+         "Non-anonymous": [
+            null,
+            "非匿名"
+         ],
+         "Open room": [
+            null,
+            "打开聊天室"
+         ],
+         "Permanent room": [
+            null,
+            "永久聊天室"
+         ],
+         "Public": [
+            null,
+            "公开的"
+         ],
+         "Semi-anonymous": [
+            null,
+            "半匿名"
+         ],
+         "Temporary room": [
+            null,
+            "临时聊天室"
+         ],
+         "Unmoderated": [
+            null,
+            "无发言限制"
+         ],
+         "This user is a moderator": [
+            null,
+            "此用户是主持人"
+         ],
+         "This user can send messages in this room": [
+            null,
+            "此用户在这房间里可发消息"
+         ],
+         "This user can NOT send messages in this room": [
+            null,
+            "此用户不可在此房间发消息"
+         ],
+         "Invite...": [
+            null,
+            ""
+         ],
+         "You are about to invite %1$s to the chat room \"%2$s\". ": [
+            null,
+            ""
+         ],
+         "You may optionally include a message, explaining the reason for the invitation.": [
+            null,
+            ""
+         ],
+         "Message": [
+            null,
+            "信息"
+         ],
+         "Error: could not execute the command": [
+            null,
+            ""
+         ],
+         "Remove user's ability to post messages": [
+            null,
+            ""
+         ],
+         "Change your nickname": [
+            null,
+            ""
+         ],
+         "Allow muted user to post messages": [
+            null,
+            ""
+         ],
+         "Save": [
+            null,
+            "保存"
+         ],
+         "Cancel": [
+            null,
+            "取消"
+         ],
+         "An error occurred while trying to save the form.": [
+            null,
+            "保存表单是出错。"
+         ],
+         "This chatroom requires a password": [
+            null,
+            "此聊天室需要密码"
+         ],
+         "Password: ": [
+            null,
+            "密码:"
+         ],
+         "Submit": [
+            null,
+            "发送"
+         ],
+         "This room is not anonymous": [
+            null,
+            "此为非匿名聊天室"
+         ],
+         "This room now shows unavailable members": [
+            null,
+            "此聊天室显示不可用用户"
+         ],
+         "This room does not show unavailable members": [
+            null,
+            "此聊天室不显示不可用用户"
+         ],
+         "Non-privacy-related room configuration has changed": [
+            null,
+            "此聊天室设置(非私密性)已改变"
+         ],
+         "Room logging is now enabled": [
+            null,
+            "聊天室聊天记录已启用"
+         ],
+         "Room logging is now disabled": [
+            null,
+            "聊天室聊天记录已禁用"
+         ],
+         "This room is now non-anonymous": [
+            null,
+            "此聊天室非匿名"
+         ],
+         "This room is now semi-anonymous": [
+            null,
+            "此聊天室半匿名"
+         ],
+         "This room is now fully-anonymous": [
+            null,
+            "此聊天室完全匿名"
+         ],
+         "A new room has been created": [
+            null,
+            "新聊天室已创建"
+         ],
+         "You have been banned from this room": [
+            null,
+            "您已被此聊天室禁止入内"
+         ],
+         "You have been kicked from this room": [
+            null,
+            "您已被踢出次房间"
+         ],
+         "You have been removed from this room because of an affiliation change": [
+            null,
+            "由于关系变化，您已被移除此房间"
+         ],
+         "You have been removed from this room because the room has changed to members-only and you're not a member": [
+            null,
+            "您已被移除此房间因为此房间更改为只允许成员加入，而您非成员"
+         ],
+         "You have been removed from this room because the MUC (Multi-user chat) service is being shut down.": [
+            null,
+            "由于服务不可用，您已被移除此房间。"
+         ],
+         "<strong>%1$s</strong> has been banned": [
+            null,
+            "<strong>%1$s</strong> 已被禁止"
+         ],
+         "<strong>%1$s</strong> has been kicked out": [
+            null,
+            "<strong>%1$s</strong> 已被踢出"
+         ],
+         "<strong>%1$s</strong> has been removed because of an affiliation change": [
+            null,
+            "由于关系解除、<strong>%1$s</strong> 已被移除"
+         ],
+         "<strong>%1$s</strong> has been removed for not being a member": [
+            null,
+            "由于不是成员、<strong>%1$s</strong> 已被移除"
+         ],
+         "The reason given is: \"": [
+            null,
+            ""
+         ],
+         "You are not on the member list of this room": [
+            null,
+            "您并非此房间成员"
+         ],
+         "No nickname was specified": [
+            null,
+            "未指定昵称"
+         ],
+         "You are not allowed to create new rooms": [
+            null,
+            "您可此创建新房间了"
+         ],
+         "Your nickname doesn't conform to this room's policies": [
+            null,
+            "您的昵称不符合此房间标准"
+         ],
+         "Your nickname is already taken": [
+            null,
+            "您的昵称已被占用"
+         ],
+         "This room does not (yet) exist": [
+            null,
+            "此房间不存在"
+         ],
+         "This room has reached it's maximum number of occupants": [
+            null,
+            "此房间人数已达上线"
+         ],
+         "Topic set by %1$s to: %2$s": [
+            null,
+            "%1$s 设置话题为: %2$s"
+         ],
+         "%1$s has invited you to join a chat room: %2$s": [
+            null,
+            ""
+         ],
+         "%1$s has invited you to join a chat room: %2$s, and left the following reason: \"%3$s\"": [
+            null,
+            ""
+         ],
+         "Minimized": [
+            null,
+            "最小化的"
+         ],
+         "Click to remove this contact": [
+            null,
+            "点击移除联系人"
+         ],
+         "Click to chat with this contact": [
+            null,
+            "点击与对方交谈"
+         ],
+         "Type to filter": [
+            null,
+            ""
+         ],
+         "I am %1$s": [
+            null,
+            "我现在%1$s"
+         ],
+         "Click here to write a custom status message": [
+            null,
+            "点击这里，填写状态信息"
+         ],
+         "Click to change your chat status": [
+            null,
+            "点击这里改变聊天状态"
+         ],
+         "Custom status": [
+            null,
+            "DIY状态"
+         ],
+         "online": [
+            null,
+            "在线"
+         ],
+         "busy": [
+            null,
+            "忙碌"
+         ],
+         "away for long": [
+            null,
+            "长时间离开"
+         ],
+         "away": [
+            null,
+            "离开"
+         ],
+         "Your XMPP provider's domain name:": [
+            null,
+            ""
+         ],
+         "Fetch registration form": [
+            null,
+            ""
+         ],
+         "Tip: A list of public XMPP providers is available": [
+            null,
+            ""
+         ],
+         "here": [
+            null,
+            ""
+         ],
+         "Register": [
+            null,
+            ""
+         ],
+         "Sorry, the given provider does not support in band account registration. Please try with a different provider.": [
+            null,
+            ""
+         ],
+         "Requesting a registration form from the XMPP server": [
+            null,
+            ""
+         ],
+         "Something went wrong while establishing a connection with \"%1$s\". Are you sure it exists?": [
+            null,
+            ""
+         ],
+         "Now logging you in": [
+            null,
+            ""
+         ],
+         "Registered successfully": [
+            null,
+            ""
+         ],
+         "Return": [
+            null,
+            ""
+         ],
+         "The provider rejected your registration attempt. ": [
+            null,
+            ""
+         ],
+         "Password:": [
+            null,
+            "密码:"
+         ],
+         "Log In": [
+            null,
+            "登录"
+         ],
+         "Sign in": [
+            null,
+            "登录"
+         ],
+         "Toggle chat": [
+            null,
+            "折叠聊天窗口"
+         ]
+      }
+   }
+};
\ No newline at end of file
diff --git a/xmpp/converse/builds/templates.js b/xmpp/converse/builds/templates.js
new file mode 100644
index 00000000..607cf386
--- /dev/null
+++ b/xmpp/converse/builds/templates.js
@@ -0,0 +1,1150 @@
+this["templates"] = this["templates"] || {};
+
+this["templates"]["action"] = function(obj) {
+obj || (obj = {});
+var __t, __p = '', __e = _.escape;
+with (obj) {
+__p += '<div class="chat-message ' +
+((__t = (extra_classes)) == null ? '' : __t) +
+'" data-isodate="' +
+((__t = (isodate)) == null ? '' : __t) +
+'">\n    <span class="chat-msg-author chat-msg-' +
+((__t = (sender)) == null ? '' : __t) +
+'">' +
+((__t = (time)) == null ? '' : __t) +
+' **' +
+((__t = (username)) == null ? '' : __t) +
+' </span>\n    <span class="chat-msg-content">' +
+((__t = (message)) == null ? '' : __t) +
+'</span>\n</div>\n';
+
+}
+return __p
+};
+
+this["templates"]["add_contact_dropdown"] = function(obj) {
+obj || (obj = {});
+var __t, __p = '', __e = _.escape;
+with (obj) {
+__p += '<dl class="add-converse-contact dropdown">\n    <dt id="xmpp-contact-search" class="fancy-dropdown">\n        <a class="toggle-xmpp-contact-form icon-plus" href="#" title="' +
+((__t = (label_click_to_chat)) == null ? '' : __t) +
+'"> ' +
+((__t = (label_add_contact)) == null ? '' : __t) +
+'</a>\n    </dt>\n    <dd class="search-xmpp" style="display:none"><ul></ul></dd>\n</dl>\n';
+
+}
+return __p
+};
+
+this["templates"]["add_contact_form"] = function(obj) {
+obj || (obj = {});
+var __t, __p = '', __e = _.escape;
+with (obj) {
+__p += '<li>\n    <form class="pure-form add-xmpp-contact">\n        <input type="text"\n            name="identifier"\n            class="username"\n            placeholder="' +
+((__t = (label_contact_username)) == null ? '' : __t) +
+'"/>\n        <button class="pure-button button-primary" type="submit">' +
+((__t = (label_add)) == null ? '' : __t) +
+'</button>\n    </form>\n</li>\n';
+
+}
+return __p
+};
+
+this["templates"]["change_status_message"] = function(obj) {
+obj || (obj = {});
+var __t, __p = '', __e = _.escape;
+with (obj) {
+__p += '<form id="set-custom-xmpp-status" class="pure-form">\n<fieldset>\n    <span class="input-button-group">\n        <input type="text" class="custom-xmpp-status" ' +
+((__t = (status_message)) == null ? '' : __t) +
+' placeholder="' +
+((__t = (label_custom_status)) == null ? '' : __t) +
+'"/>\n        <input type="submit" class="pure-button button-primary" value="' +
+((__t = (label_save)) == null ? '' : __t) +
+'"/>\n    </span>\n</fieldset>\n</form>\n';
+
+}
+return __p
+};
+
+this["templates"]["chat_status"] = function(obj) {
+obj || (obj = {});
+var __t, __p = '', __e = _.escape;
+with (obj) {
+__p += '<div class="xmpp-status">\n    <a class="choose-xmpp-status ' +
+((__t = (chat_status)) == null ? '' : __t) +
+' icon-' +
+((__t = (chat_status)) == null ? '' : __t) +
+'" data-value="' +
+((__t = (status_message)) == null ? '' : __t) +
+'" href="#" title="' +
+((__t = (desc_change_status)) == null ? '' : __t) +
+'">\n        ' +
+((__t = (status_message)) == null ? '' : __t) +
+'\n    </a>\n    <a class="change-xmpp-status-message icon-pencil" href="#" title="' +
+((__t = (desc_custom_status)) == null ? '' : __t) +
+'"></a>\n</div>\n';
+
+}
+return __p
+};
+
+this["templates"]["chatarea"] = function(obj) {
+obj || (obj = {});
+var __t, __p = '', __e = _.escape, __j = Array.prototype.join;
+function print() { __p += __j.call(arguments, '') }
+with (obj) {
+__p += '<div class="chat-area">\n    <div class="chat-content"></div>\n    <form class="sendXMPPMessage" action="" method="post">\n        ';
+ if (show_toolbar) { ;
+__p += '\n            <ul class="chat-toolbar no-text-select"></ul>\n        ';
+ } ;
+__p += '\n        <textarea type="text" class="chat-textarea" \n            placeholder="' +
+((__t = (label_message)) == null ? '' : __t) +
+'"/>\n    </form>\n</div>\n';
+
+}
+return __p
+};
+
+this["templates"]["chatbox"] = function(obj) {
+obj || (obj = {});
+var __t, __p = '', __e = _.escape, __j = Array.prototype.join;
+function print() { __p += __j.call(arguments, '') }
+with (obj) {
+__p += '<div class="flyout box-flyout">\n    <div class="dragresize dragresize-top"></div>\n    <div class="dragresize dragresize-topleft"></div>\n    <div class="dragresize dragresize-left"></div>\n    <div class="chat-head chat-head-chatbox">\n        <a class="chatbox-btn close-chatbox-button icon-close" title="' +
+((__t = (info_close)) == null ? '' : __t) +
+'"></a>\n        <a class="chatbox-btn toggle-chatbox-button icon-minus" title="' +
+((__t = (info_minimize)) == null ? '' : __t) +
+'"></a>\n        <div class="chat-title">\n            ';
+ if (url) { ;
+__p += '\n                <a href="' +
+((__t = (url)) == null ? '' : __t) +
+'" target="_blank" class="user">\n            ';
+ } ;
+__p += '\n                    ' +
+((__t = ( fullname )) == null ? '' : __t) +
+'\n            ';
+ if (url) { ;
+__p += '\n                </a>\n            ';
+ } ;
+__p += '\n        </div>\n        <p class="user-custom-message"><p/>\n    </div>\n    <div class="chat-body">\n        <div class="chat-content"></div>\n        <form class="sendXMPPMessage" action="" method="post">\n            ';
+ if (show_toolbar) { ;
+__p += '\n                <ul class="chat-toolbar no-text-select"></ul>\n            ';
+ } ;
+__p += '\n        <textarea\n            type="text"\n            class="chat-textarea"\n            placeholder="' +
+((__t = (label_personal_message)) == null ? '' : __t) +
+'"/>\n        </form>\n    </div>\n</div>\n';
+
+}
+return __p
+};
+
+this["templates"]["chatroom"] = function(obj) {
+obj || (obj = {});
+var __t, __p = '', __e = _.escape;
+with (obj) {
+__p += '<div class="flyout box-flyout">\n    <div class="dragresize dragresize-top"></div>\n    <div class="dragresize dragresize-topleft"></div>\n    <div class="dragresize dragresize-left"></div>\n    <div class="chat-head chat-head-chatroom">\n        <a class="chatbox-btn close-chatbox-button icon-close"></a>\n        <a class="chatbox-btn toggle-chatbox-button icon-minus"></a>\n        <a class="chatbox-btn configure-chatroom-button icon-wrench" style="display:none"></a>\n        <div class="chat-title"> ' +
+((__t = ( _.escape(name) )) == null ? '' : __t) +
+' </div>\n        <p class="chatroom-topic"><p/>\n    </div>\n    <div class="chat-body chatroom-body"><span class="spinner centered"/></div>\n</div>\n';
+
+}
+return __p
+};
+
+this["templates"]["chatroom_form"] = function(obj) {
+obj || (obj = {});
+var __t, __p = '', __e = _.escape;
+with (obj) {
+__p += '<div class="chatroom-form-container">\n    <form class="pure-form pure-form-stacked converse-form chatroom-form">\n        <fieldset>\n            <span class="spinner centered"/>\n        </fieldset>\n    </form>\n</div>\n';
+
+}
+return __p
+};
+
+this["templates"]["chatroom_password_form"] = function(obj) {
+obj || (obj = {});
+var __t, __p = '', __e = _.escape;
+with (obj) {
+__p += '<div class="chatroom-form-container">\n    <form class="pure-form converse-form chatroom-form">\n        <fieldset>\n            <legend>' +
+((__t = (heading)) == null ? '' : __t) +
+'</legend>\n            <label>' +
+((__t = (label_password)) == null ? '' : __t) +
+'</label>\n            <input type="password" name="password"/>\n        </fieldset>\n        <fieldset>\n            <input class="pure-button button-primary" type="submit" value="' +
+((__t = (label_submit)) == null ? '' : __t) +
+'"/>\n        </fieldset>\n    </form>\n</div>\n';
+
+}
+return __p
+};
+
+this["templates"]["chatroom_sidebar"] = function(obj) {
+obj || (obj = {});
+var __t, __p = '', __e = _.escape;
+with (obj) {
+__p += '<!-- <div class="occupants"> -->\n<form class="pure-form room-invite">\n    <input class="invited-contact" placeholder="' +
+((__t = (label_invitation)) == null ? '' : __t) +
+'" type="text"/>\n</form>\n<p class="occupants-heading">' +
+((__t = (label_occupants)) == null ? '' : __t) +
+':</p>\n<ul class="occupant-list"></ul>\n<!-- </div> -->\n';
+
+}
+return __p
+};
+
+this["templates"]["chatrooms_tab"] = function(obj) {
+obj || (obj = {});
+var __t, __p = '', __e = _.escape;
+with (obj) {
+__p += '<li><a class="s" href="#chatrooms">' +
+((__t = (label_rooms)) == null ? '' : __t) +
+'</a></li>\n';
+
+}
+return __p
+};
+
+this["templates"]["chats_panel"] = function(obj) {
+obj || (obj = {});
+var __t, __p = '', __e = _.escape;
+with (obj) {
+__p += '<div id="minimized-chats">\n    <a id="toggle-minimized-chats" href="#"></a>\n    <div class="flyout minimized-chats-flyout"></div>\n</div>\n';
+
+}
+return __p
+};
+
+this["templates"]["choose_status"] = function(obj) {
+obj || (obj = {});
+var __t, __p = '', __e = _.escape;
+with (obj) {
+__p += '<dl id="target" class="dropdown">\n    <dt id="fancy-xmpp-status-select" class="fancy-dropdown"></dt>\n    <dd><ul class="xmpp-status-menu"></ul></dd>\n</dl>\n';
+
+}
+return __p
+};
+
+this["templates"]["contacts_panel"] = function(obj) {
+obj || (obj = {});
+var __t, __p = '', __e = _.escape, __j = Array.prototype.join;
+function print() { __p += __j.call(arguments, '') }
+with (obj) {
+__p += '<form class="pure-form set-xmpp-status" action="" method="post">\n    <span id="xmpp-status-holder">\n        <select id="select-xmpp-status" style="display:none">\n            <option value="online">' +
+((__t = (label_online)) == null ? '' : __t) +
+'</option>\n            <option value="dnd">' +
+((__t = (label_busy)) == null ? '' : __t) +
+'</option>\n            <option value="away">' +
+((__t = (label_away)) == null ? '' : __t) +
+'</option>\n            <option value="offline">' +
+((__t = (label_offline)) == null ? '' : __t) +
+'</option>\n            ';
+ if (allow_logout)  { ;
+__p += '\n            <option value="logout">' +
+((__t = (label_logout)) == null ? '' : __t) +
+'</option>\n            ';
+ } ;
+__p += '\n        </select>\n    </span>\n</form>\n';
+
+}
+return __p
+};
+
+this["templates"]["contacts_tab"] = function(obj) {
+obj || (obj = {});
+var __t, __p = '', __e = _.escape;
+with (obj) {
+__p += '<li><a class="s current" href="#users">' +
+((__t = (label_contacts)) == null ? '' : __t) +
+'</a></li>\n';
+
+}
+return __p
+};
+
+this["templates"]["controlbox"] = function(obj) {
+obj || (obj = {});
+var __t, __p = '', __e = _.escape;
+with (obj) {
+__p += '<div class="flyout box-flyout">\n    <div class="dragresize dragresize-top"></div>\n    <div class="dragresize dragresize-topleft"></div>\n    <div class="dragresize dragresize-left"></div>\n    <div class="chat-head controlbox-head">\n        <ul id="controlbox-tabs"></ul>\n        <a class="chatbox-btn close-chatbox-button icon-close"></a>\n    </div>\n    <div class="controlbox-panes"></div>\n</div>\n';
+
+}
+return __p
+};
+
+this["templates"]["controlbox_toggle"] = function(obj) {
+obj || (obj = {});
+var __t, __p = '', __e = _.escape;
+with (obj) {
+__p += '<span class="conn-feedback">' +
+((__t = (label_toggle)) == null ? '' : __t) +
+'</span>\n<span style="display: none" id="online-count">(0)</span>\n';
+
+}
+return __p
+};
+
+this["templates"]["field"] = function(obj) {
+obj || (obj = {});
+var __t, __p = '', __e = _.escape, __j = Array.prototype.join;
+function print() { __p += __j.call(arguments, '') }
+with (obj) {
+__p += '<field var="' +
+((__t = (name)) == null ? '' : __t) +
+'">';
+ if (_.isArray(value)) { ;
+__p += '\n    ';
+ _.each(value,function(arrayValue) { ;
+__p += '<value>' +
+((__t = (arrayValue)) == null ? '' : __t) +
+'</value>';
+ }); ;
+__p += '\n';
+ } else { ;
+__p += '\n    <value>' +
+((__t = (value)) == null ? '' : __t) +
+'</value>\n';
+ } ;
+__p += '</field>\n';
+
+}
+return __p
+};
+
+this["templates"]["form_captcha"] = function(obj) {
+obj || (obj = {});
+var __t, __p = '', __e = _.escape, __j = Array.prototype.join;
+function print() { __p += __j.call(arguments, '') }
+with (obj) {
+
+ if (label) { ;
+__p += '\n<label>\n    ' +
+((__t = (label)) == null ? '' : __t) +
+'\n</label>\n';
+ } ;
+__p += '\n<img src="data:' +
+((__t = (type)) == null ? '' : __t) +
+';base64,' +
+((__t = (data)) == null ? '' : __t) +
+'">\n<input name="' +
+((__t = (name)) == null ? '' : __t) +
+'" type="text" ';
+ if (required) { ;
+__p += ' class="required" ';
+ } ;
+__p += ' >\n\n\n';
+
+}
+return __p
+};
+
+this["templates"]["form_checkbox"] = function(obj) {
+obj || (obj = {});
+var __t, __p = '', __e = _.escape;
+with (obj) {
+__p += '<label>' +
+((__t = (label)) == null ? '' : __t) +
+'</label>\n<input name="' +
+((__t = (name)) == null ? '' : __t) +
+'" type="' +
+((__t = (type)) == null ? '' : __t) +
+'" ' +
+((__t = (checked)) == null ? '' : __t) +
+'>\n';
+
+}
+return __p
+};
+
+this["templates"]["form_input"] = function(obj) {
+obj || (obj = {});
+var __t, __p = '', __e = _.escape, __j = Array.prototype.join;
+function print() { __p += __j.call(arguments, '') }
+with (obj) {
+
+ if (label) { ;
+__p += '\n<label>\n    ' +
+((__t = (label)) == null ? '' : __t) +
+'\n</label>\n';
+ } ;
+__p += '\n<input name="' +
+((__t = (name)) == null ? '' : __t) +
+'" type="' +
+((__t = (type)) == null ? '' : __t) +
+'" \n    ';
+ if (value) { ;
+__p += ' value="' +
+((__t = (value)) == null ? '' : __t) +
+'" ';
+ } ;
+__p += '\n    ';
+ if (required) { ;
+__p += ' class="required" ';
+ } ;
+__p += ' >\n';
+
+}
+return __p
+};
+
+this["templates"]["form_select"] = function(obj) {
+obj || (obj = {});
+var __t, __p = '', __e = _.escape, __j = Array.prototype.join;
+function print() { __p += __j.call(arguments, '') }
+with (obj) {
+__p += '<label>' +
+((__t = (label)) == null ? '' : __t) +
+'</label>\n<select name="' +
+((__t = (name)) == null ? '' : __t) +
+'"  ';
+ if (multiple) { ;
+__p += ' multiple="multiple" ';
+ } ;
+__p += '>' +
+((__t = (options)) == null ? '' : __t) +
+'</select>\n';
+
+}
+return __p
+};
+
+this["templates"]["form_textarea"] = function(obj) {
+obj || (obj = {});
+var __t, __p = '', __e = _.escape;
+with (obj) {
+__p += '<label class="label-ta">' +
+((__t = (label)) == null ? '' : __t) +
+'</label>\n<textarea name="' +
+((__t = (name)) == null ? '' : __t) +
+'">' +
+((__t = (value)) == null ? '' : __t) +
+'</textarea>\n';
+
+}
+return __p
+};
+
+this["templates"]["form_username"] = function(obj) {
+obj || (obj = {});
+var __t, __p = '', __e = _.escape, __j = Array.prototype.join;
+function print() { __p += __j.call(arguments, '') }
+with (obj) {
+
+ if (label) { ;
+__p += '\n<label>\n    ' +
+((__t = (label)) == null ? '' : __t) +
+'\n</label>\n';
+ } ;
+__p += '\n<div class="input-group">\n    <input name="' +
+((__t = (name)) == null ? '' : __t) +
+'" type="' +
+((__t = (type)) == null ? '' : __t) +
+'"\n        ';
+ if (value) { ;
+__p += ' value="' +
+((__t = (value)) == null ? '' : __t) +
+'" ';
+ } ;
+__p += '\n        ';
+ if (required) { ;
+__p += ' class="required" ';
+ } ;
+__p += ' />\n    <span title="' +
+((__t = (domain)) == null ? '' : __t) +
+'">' +
+((__t = (domain)) == null ? '' : __t) +
+'</span>\n</div>\n';
+
+}
+return __p
+};
+
+this["templates"]["group_header"] = function(obj) {
+obj || (obj = {});
+var __t, __p = '', __e = _.escape;
+with (obj) {
+__p += '<a href="#" class="group-toggle icon-' +
+((__t = (toggle_state)) == null ? '' : __t) +
+'" title="' +
+((__t = (desc_group_toggle)) == null ? '' : __t) +
+'">' +
+((__t = (label_group)) == null ? '' : __t) +
+'</a>\n';
+
+}
+return __p
+};
+
+this["templates"]["info"] = function(obj) {
+obj || (obj = {});
+var __t, __p = '', __e = _.escape;
+with (obj) {
+__p += '<div class="chat-info">' +
+((__t = (message)) == null ? '' : __t) +
+'</div>\n';
+
+}
+return __p
+};
+
+this["templates"]["login_panel"] = function(obj) {
+obj || (obj = {});
+var __t, __p = '', __e = _.escape, __j = Array.prototype.join;
+function print() { __p += __j.call(arguments, '') }
+with (obj) {
+__p += '<form class="pure-form pure-form-stacked converse-form" id="converse-login" method="post">\n    ';
+ if (auto_login) { ;
+__p += '\n        <span class="spinner login-submit"/>\n    ';
+ } ;
+__p += '\n    ';
+ if (!auto_login) { ;
+__p += '\n        ';
+ if (authentication == LOGIN) { ;
+__p += '\n            <label>' +
+((__t = (label_username)) == null ? '' : __t) +
+'</label>\n            <input type="text" name="jid" placeholder="' +
+((__t = (placeholder_username)) == null ? '' : __t) +
+'">\n            <label>' +
+((__t = (label_password)) == null ? '' : __t) +
+'</label>\n            <input type="password" name="password" placeholder="' +
+((__t = (placeholder_password)) == null ? '' : __t) +
+'">\n            <input class="pure-button button-primary" type="submit" value="' +
+((__t = (label_login)) == null ? '' : __t) +
+'">\n            <span class="conn-feedback"></span>\n        ';
+ } ;
+__p += '\n        ';
+ if (authentication == ANONYMOUS) { ;
+__p += '\n            <input type="pure-button button-primary" class="submit login-anon" value="' +
+((__t = (label_anon_login)) == null ? '' : __t) +
+'"/>\n        ';
+ } ;
+__p += '\n        ';
+ if (authentication == PREBIND) { ;
+__p += '\n            <p>Disconnected.</p>\n        ';
+ } ;
+__p += '\n    ';
+ } ;
+__p += '\n</form>\n';
+
+}
+return __p
+};
+
+this["templates"]["login_tab"] = function(obj) {
+obj || (obj = {});
+var __t, __p = '', __e = _.escape;
+with (obj) {
+__p += '<li><a class="current" href="#login-dialog">' +
+((__t = (label_sign_in)) == null ? '' : __t) +
+'</a></li>\n';
+
+}
+return __p
+};
+
+this["templates"]["message"] = function(obj) {
+obj || (obj = {});
+var __t, __p = '', __e = _.escape;
+with (obj) {
+__p += '<div class="chat-message ' +
+((__t = (extra_classes)) == null ? '' : __t) +
+'" data-isodate="' +
+((__t = (isodate)) == null ? '' : __t) +
+'" data-msgid="' +
+((__t = (msgid)) == null ? '' : __t) +
+'">\n    <span class="chat-msg-author chat-msg-' +
+((__t = (sender)) == null ? '' : __t) +
+'">' +
+((__t = (time)) == null ? '' : __t) +
+' ' +
+((__t = (username)) == null ? '' : __t) +
+':&nbsp;</span>\n    <span class="chat-msg-content">' +
+((__t = (message)) == null ? '' : __t) +
+'</span>\n</div>\n';
+
+}
+return __p
+};
+
+this["templates"]["new_day"] = function(obj) {
+obj || (obj = {});
+var __t, __p = '', __e = _.escape;
+with (obj) {
+__p += '<time class="chat-info chat-date" data-isodate="' +
+((__t = (isodate)) == null ? '' : __t) +
+'">' +
+((__t = (datestring)) == null ? '' : __t) +
+'</time>\n';
+
+}
+return __p
+};
+
+this["templates"]["occupant"] = function(obj) {
+obj || (obj = {});
+var __t, __p = '', __e = _.escape, __j = Array.prototype.join;
+function print() { __p += __j.call(arguments, '') }
+with (obj) {
+__p += '<li class="' +
+((__t = (role)) == null ? '' : __t) +
+'"\n    ';
+ if (role === "moderator") { ;
+__p += '\n       title="' +
+((__t = (desc_moderator)) == null ? '' : __t) +
+'"\n    ';
+ } ;
+__p += '\n    ';
+ if (role === "occupant") { ;
+__p += '\n       title="' +
+((__t = (desc_occupant)) == null ? '' : __t) +
+'"\n    ';
+ } ;
+__p += '\n    ';
+ if (role === "visitor") { ;
+__p += '\n       title="' +
+((__t = (desc_visitor)) == null ? '' : __t) +
+'"\n    ';
+ } ;
+__p += '\n>' +
+((__t = (nick)) == null ? '' : __t) +
+'</li>\n';
+
+}
+return __p
+};
+
+this["templates"]["pending_contact"] = function(obj) {
+obj || (obj = {});
+var __t, __p = '', __e = _.escape, __j = Array.prototype.join;
+function print() { __p += __j.call(arguments, '') }
+with (obj) {
+
+ if (allow_chat_pending_contacts)  { ;
+__p += '\n<a class="open-chat"href="#">\n';
+ } ;
+__p += '\n<span class="pending-contact-name" title="Name: ' +
+((__t = (fullname)) == null ? '' : __t) +
+'\nJID: ' +
+((__t = (jid)) == null ? '' : __t) +
+'">' +
+((__t = (fullname)) == null ? '' : __t) +
+'</span> \n';
+ if (allow_chat_pending_contacts)  { ;
+__p += '\n</a>\n';
+ } ;
+__p += '\n<a class="remove-xmpp-contact icon-remove" title="' +
+((__t = (desc_remove)) == null ? '' : __t) +
+'" href="#"></a>\n';
+
+}
+return __p
+};
+
+this["templates"]["pending_contacts"] = function(obj) {
+obj || (obj = {});
+var __t, __p = '', __e = _.escape;
+with (obj) {
+__p += '<dt class="roster-group" id="pending-xmpp-contacts"><a href="#" class="group-toggle icon-' +
+((__t = (toggle_state)) == null ? '' : __t) +
+'" title="' +
+((__t = (desc_group_toggle)) == null ? '' : __t) +
+'">' +
+((__t = (label_pending_contacts)) == null ? '' : __t) +
+'</a></dt>\n';
+
+}
+return __p
+};
+
+this["templates"]["register_panel"] = function(obj) {
+obj || (obj = {});
+var __t, __p = '', __e = _.escape;
+with (obj) {
+__p += '<form id="converse-register" class="pure-form converse-form">\n    <span class="reg-feedback"></span>\n    <label>' +
+((__t = (label_domain)) == null ? '' : __t) +
+'</label>\n    <input type="text" name="domain" placeholder="' +
+((__t = (domain_placeholder)) == null ? '' : __t) +
+'">\n    <p class="form-help">' +
+((__t = (help_providers)) == null ? '' : __t) +
+' <a href="' +
+((__t = (href_providers)) == null ? '' : __t) +
+'" class="url" target="_blank">' +
+((__t = (help_providers_link)) == null ? '' : __t) +
+'</a>.</p>\n    <input class="pure-button button-primary" type="submit" value="' +
+((__t = (label_register)) == null ? '' : __t) +
+'">\n</form>\n';
+
+}
+return __p
+};
+
+this["templates"]["register_tab"] = function(obj) {
+obj || (obj = {});
+var __t, __p = '', __e = _.escape;
+with (obj) {
+__p += '<li><a class="s" href="#register">' +
+((__t = (label_register)) == null ? '' : __t) +
+'</a></li>\n';
+
+}
+return __p
+};
+
+this["templates"]["registration_form"] = function(obj) {
+obj || (obj = {});
+var __t, __p = '', __e = _.escape;
+with (obj) {
+__p += '<p class="provider-title">' +
+((__t = (domain)) == null ? '' : __t) +
+'</p>\n<a href=\'https://xmpp.net/result.php?domain=' +
+((__t = (domain)) == null ? '' : __t) +
+'&amp;type=client\'>\n    <img class="provider-score" src=\'https://xmpp.net/badge.php?domain=' +
+((__t = (domain)) == null ? '' : __t) +
+'\' alt=\'xmpp.net score\' />\n</a>\n<p class="title">' +
+((__t = (title)) == null ? '' : __t) +
+'</p>\n<p class="instructions">' +
+((__t = (instructions)) == null ? '' : __t) +
+'</p>\n';
+
+}
+return __p
+};
+
+this["templates"]["registration_request"] = function(obj) {
+obj || (obj = {});
+var __t, __p = '', __e = _.escape;
+with (obj) {
+__p += '<span class="spinner login-submit"/>\n<p class="info">' +
+((__t = (info_message)) == null ? '' : __t) +
+'</p>\n<button class="pure-button button-cancel hor_centered">' +
+((__t = (cancel)) == null ? '' : __t) +
+'</button>\n';
+
+}
+return __p
+};
+
+this["templates"]["requesting_contact"] = function(obj) {
+obj || (obj = {});
+var __t, __p = '', __e = _.escape, __j = Array.prototype.join;
+function print() { __p += __j.call(arguments, '') }
+with (obj) {
+
+ if (allow_chat_pending_contacts)  { ;
+__p += '\n<a class="open-chat"href="#">\n';
+ } ;
+__p += '\n<span class="req-contact-name" title="Name: ' +
+((__t = (fullname)) == null ? '' : __t) +
+'\nJID: ' +
+((__t = (jid)) == null ? '' : __t) +
+'">' +
+((__t = (fullname)) == null ? '' : __t) +
+'</span>\n';
+ if (allow_chat_pending_contacts)  { ;
+__p += '\n</a>\n';
+ } ;
+__p += '\n<span class="request-actions">\n    <a class="accept-xmpp-request icon-checkmark" title="' +
+((__t = (desc_accept)) == null ? '' : __t) +
+'" href="#"></a>\n    <a class="decline-xmpp-request icon-close" title="' +
+((__t = (desc_decline)) == null ? '' : __t) +
+'" href="#"></a>\n</span>\n';
+
+}
+return __p
+};
+
+this["templates"]["requesting_contacts"] = function(obj) {
+obj || (obj = {});
+var __t, __p = '', __e = _.escape;
+with (obj) {
+__p += '<dt class="roster-group" id="xmpp-contact-requests"><a href="#" class="group-toggle icon-' +
+((__t = (toggle_state)) == null ? '' : __t) +
+'" title="' +
+((__t = (desc_group_toggle)) == null ? '' : __t) +
+'">' +
+((__t = (label_contact_requests)) == null ? '' : __t) +
+'</a></dt>\n';
+
+}
+return __p
+};
+
+this["templates"]["room_description"] = function(obj) {
+obj || (obj = {});
+var __t, __p = '', __e = _.escape, __j = Array.prototype.join;
+function print() { __p += __j.call(arguments, '') }
+with (obj) {
+__p += '<!-- FIXME: check markup in mockup -->\n<div class="room-info">\n<p class="room-info"><strong>' +
+((__t = (label_desc)) == null ? '' : __t) +
+'</strong> ' +
+((__t = (desc)) == null ? '' : __t) +
+'</p>\n<p class="room-info"><strong>' +
+((__t = (label_occ)) == null ? '' : __t) +
+'</strong> ' +
+((__t = (occ)) == null ? '' : __t) +
+'</p>\n<p class="room-info"><strong>' +
+((__t = (label_features)) == null ? '' : __t) +
+'</strong>\n    <ul>\n        ';
+ if (passwordprotected) { ;
+__p += '\n        <li class="room-info locked">' +
+((__t = (label_requires_auth)) == null ? '' : __t) +
+'</li>\n        ';
+ } ;
+__p += '\n        ';
+ if (hidden) { ;
+__p += '\n        <li class="room-info">' +
+((__t = (label_hidden)) == null ? '' : __t) +
+'</li>\n        ';
+ } ;
+__p += '\n        ';
+ if (membersonly) { ;
+__p += '\n        <li class="room-info">' +
+((__t = (label_requires_invite)) == null ? '' : __t) +
+'</li>\n        ';
+ } ;
+__p += '\n        ';
+ if (moderated) { ;
+__p += '\n        <li class="room-info">' +
+((__t = (label_moderated)) == null ? '' : __t) +
+'</li>\n        ';
+ } ;
+__p += '\n        ';
+ if (nonanonymous) { ;
+__p += '\n        <li class="room-info">' +
+((__t = (label_non_anon)) == null ? '' : __t) +
+'</li>\n        ';
+ } ;
+__p += '\n        ';
+ if (open) { ;
+__p += '\n        <li class="room-info">' +
+((__t = (label_open_room)) == null ? '' : __t) +
+'</li>\n        ';
+ } ;
+__p += '\n        ';
+ if (persistent) { ;
+__p += '\n        <li class="room-info">' +
+((__t = (label_permanent_room)) == null ? '' : __t) +
+'</li>\n        ';
+ } ;
+__p += '\n        ';
+ if (publicroom) { ;
+__p += '\n        <li class="room-info">' +
+((__t = (label_public)) == null ? '' : __t) +
+'</li>\n        ';
+ } ;
+__p += '\n        ';
+ if (semianonymous) { ;
+__p += '\n        <li class="room-info">' +
+((__t = (label_semi_anon)) == null ? '' : __t) +
+'</li>\n        ';
+ } ;
+__p += '\n        ';
+ if (temporary) { ;
+__p += '\n        <li class="room-info">' +
+((__t = (label_temp_room)) == null ? '' : __t) +
+'</li>\n        ';
+ } ;
+__p += '\n        ';
+ if (unmoderated) { ;
+__p += '\n        <li class="room-info">' +
+((__t = (label_unmoderated)) == null ? '' : __t) +
+'</li>\n        ';
+ } ;
+__p += '\n    </ul>\n</p>\n</div>\n';
+
+}
+return __p
+};
+
+this["templates"]["room_item"] = function(obj) {
+obj || (obj = {});
+var __t, __p = '', __e = _.escape;
+with (obj) {
+__p += '<dd class="available-chatroom">\n<a class="open-room" data-room-jid="' +
+((__t = (jid)) == null ? '' : __t) +
+'"\n   title="' +
+((__t = (open_title)) == null ? '' : __t) +
+'" href="#">' +
+((__t = (_.escape(name))) == null ? '' : __t) +
+'</a>\n<a class="room-info icon-room-info" data-room-jid="' +
+((__t = (jid)) == null ? '' : __t) +
+'"\n   title="' +
+((__t = (info_title)) == null ? '' : __t) +
+'" href="#">&nbsp;</a>\n</dd>\n';
+
+}
+return __p
+};
+
+this["templates"]["room_panel"] = function(obj) {
+obj || (obj = {});
+var __t, __p = '', __e = _.escape, __j = Array.prototype.join;
+function print() { __p += __j.call(arguments, '') }
+with (obj) {
+__p += '<form class="pure-form pure-form-stacked converse-form add-chatroom" action="" method="post">\n    <fieldset>\n        <label>' +
+((__t = (label_room_name)) == null ? '' : __t) +
+'</label>\n        <input type="text" name="chatroom" class="new-chatroom-name" placeholder="' +
+((__t = (label_room_name)) == null ? '' : __t) +
+'"/>\n        <label>' +
+((__t = (label_nickname)) == null ? '' : __t) +
+'</label> <input type="text" name="nick" class="new-chatroom-nick" placeholder="' +
+((__t = (label_nickname)) == null ? '' : __t) +
+'"/>\n        <input type="submit" class="pure-button button-primary" name="join" value="' +
+((__t = (label_join)) == null ? '' : __t) +
+'"/>\n    </fieldset>\n    <fieldset>\n        ';
+ if (server_input_type != 'hidden') { ;
+__p += '\n            <label' +
+((__t = (server_label_global_attr)) == null ? '' : __t) +
+'>' +
+((__t = (label_server)) == null ? '' : __t) +
+'</label>\n        ';
+ } ;
+__p += '\n        <input type="' +
+((__t = (server_input_type)) == null ? '' : __t) +
+'" name="server" class="new-chatroom-server" placeholder="' +
+((__t = (label_server)) == null ? '' : __t) +
+'"/>\n        <input type="button" class="pure-button button-secondary" name="show" id="show-rooms" value="' +
+((__t = (label_show_rooms)) == null ? '' : __t) +
+'"/>\n    </fieldset>\n</form>\n<dl id="available-chatrooms"></dl>\n';
+
+}
+return __p
+};
+
+this["templates"]["roster"] = function(obj) {
+obj || (obj = {});
+var __t, __p = '', __e = _.escape;
+with (obj) {
+__p += '<form class="pure-form roster-filter-group input-button-group">\n    <input style="display: none;" class="roster-filter" placeholder="' +
+((__t = (placeholder)) == null ? '' : __t) +
+'">\n    <select style="display: none;" class="filter-type">\n        <option value="contacts">' +
+((__t = (label_contacts)) == null ? '' : __t) +
+'</option>\n        <option value="groups">' +
+((__t = (label_groups)) == null ? '' : __t) +
+'</option>\n    </select>\n</form>\n';
+
+}
+return __p
+};
+
+this["templates"]["roster_item"] = function(obj) {
+obj || (obj = {});
+var __t, __p = '', __e = _.escape, __j = Array.prototype.join;
+function print() { __p += __j.call(arguments, '') }
+with (obj) {
+__p += '<a class="open-chat" title="' +
+((__t = (title_fullname)) == null ? '' : __t) +
+': ' +
+((__t = (fullname)) == null ? '' : __t) +
+'\nJID: ' +
+((__t = (jid)) == null ? '' : __t) +
+'\n' +
+((__t = (desc_chat)) == null ? '' : __t) +
+'" href="#"><span class="icon-' +
+((__t = (chat_status)) == null ? '' : __t) +
+'" title="' +
+((__t = (desc_status)) == null ? '' : __t) +
+'"></span>' +
+((__t = (fullname)) == null ? '' : __t) +
+'</a>\n';
+ if (allow_contact_removal) { ;
+__p += '\n<a class="remove-xmpp-contact icon-remove" title="' +
+((__t = (desc_remove)) == null ? '' : __t) +
+'" href="#"></a>\n';
+ } ;
+__p += '\n';
+
+}
+return __p
+};
+
+this["templates"]["search_contact"] = function(obj) {
+obj || (obj = {});
+var __t, __p = '', __e = _.escape;
+with (obj) {
+__p += '<li>\n    <form class="search-xmpp-contact">\n        <input type="text"\n            name="identifier"\n            class="username"\n            placeholder="' +
+((__t = (label_contact_name)) == null ? '' : __t) +
+'"/>\n        <button type="submit">' +
+((__t = (label_search)) == null ? '' : __t) +
+'</button>\n    </form>\n</li>\n';
+
+}
+return __p
+};
+
+this["templates"]["select_option"] = function(obj) {
+obj || (obj = {});
+var __t, __p = '', __e = _.escape, __j = Array.prototype.join;
+function print() { __p += __j.call(arguments, '') }
+with (obj) {
+__p += '<option value="' +
+((__t = (value)) == null ? '' : __t) +
+'" ';
+ if (selected) { ;
+__p += ' selected="selected" ';
+ } ;
+__p += ' >' +
+((__t = (label)) == null ? '' : __t) +
+'</option>\n';
+
+}
+return __p
+};
+
+this["templates"]["status_option"] = function(obj) {
+obj || (obj = {});
+var __t, __p = '', __e = _.escape;
+with (obj) {
+__p += '<li>\n    <a href="#" class="' +
+((__t = ( value )) == null ? '' : __t) +
+'" data-value="' +
+((__t = ( value )) == null ? '' : __t) +
+'">\n        <span class="icon-' +
+((__t = ( value )) == null ? '' : __t) +
+'"></span>\n        ' +
+((__t = ( text )) == null ? '' : __t) +
+'\n    </a>\n</li>\n';
+
+}
+return __p
+};
+
+this["templates"]["toggle_chats"] = function(obj) {
+obj || (obj = {});
+var __t, __p = '', __e = _.escape, __j = Array.prototype.join;
+function print() { __p += __j.call(arguments, '') }
+with (obj) {
+__p +=
+((__t = (Minimized)) == null ? '' : __t) +
+' <span id="minimized-count">(' +
+((__t = (num_minimized)) == null ? '' : __t) +
+')</span>\n<span class="unread-message-count"\n    ';
+ if (!num_unread) { ;
+__p += ' style="display: none" ';
+ } ;
+__p += '\n    href="#">' +
+((__t = (num_unread)) == null ? '' : __t) +
+'</span>\n';
+
+}
+return __p
+};
+
+this["templates"]["toolbar"] = function(obj) {
+obj || (obj = {});
+var __t, __p = '', __e = _.escape, __j = Array.prototype.join;
+function print() { __p += __j.call(arguments, '') }
+with (obj) {
+
+ if (show_emoticons)  { ;
+__p += '\n    <li class="toggle-smiley icon-happy" title="' +
+((__t = (label_insert_smiley)) == null ? '' : __t) +
+'">\n        <ul>\n            <li><a class="icon-smiley" href="#" data-emoticon=":)"></a></li>\n            <li><a class="icon-wink" href="#" data-emoticon=";)"></a></li>\n            <li><a class="icon-grin" href="#" data-emoticon=":D"></a></li>\n            <li><a class="icon-tongue" href="#" data-emoticon=":P"></a></li>\n            <li><a class="icon-cool" href="#" data-emoticon="8)"></a></li>\n            <li><a class="icon-evil" href="#" data-emoticon=">:)"></a></li>\n            <li><a class="icon-confused" href="#" data-emoticon=":S"></a></li>\n            <li><a class="icon-wondering" href="#" data-emoticon=":\\"></a></li>\n            <li><a class="icon-angry" href="#" data-emoticon=">:("></a></li>\n            <li><a class="icon-sad" href="#" data-emoticon=":("></a></li>\n            <li><a class="icon-shocked" href="#" data-emoticon=":O"></a></li>\n            <li><a class="icon-thumbs-up" href="#" data-emoticon="(^.^)b"></a></li>\n            <li><a class="icon-heart" href="#" data-emoticon="<3"></a></li>\n        </ul>\n    </li>\n';
+ } ;
+__p += '\n';
+ if (show_call_button)  { ;
+__p += '\n<li class="toggle-call"><a class="icon-phone" title="' +
+((__t = (label_start_call)) == null ? '' : __t) +
+'"></a></li>\n';
+ } ;
+__p += '\n';
+ if (show_occupants_toggle)  { ;
+__p += '\n<li class="toggle-occupants"><a class="icon-hide-users" title="' +
+((__t = (label_hide_occupants)) == null ? '' : __t) +
+'"></a></li>\n';
+ } ;
+__p += '\n';
+ if (show_clear_button)  { ;
+__p += '\n<li class="toggle-clear"><a class="icon-remove" title="' +
+((__t = (label_clear)) == null ? '' : __t) +
+'"></a></li>\n';
+ } ;
+__p += '\n';
+ if (allow_otr)  { ;
+__p += '\n    <li class="toggle-otr ' +
+((__t = (otr_status_class)) == null ? '' : __t) +
+'" title="' +
+((__t = (otr_tooltip)) == null ? '' : __t) +
+'">\n        <span class="chat-toolbar-text">' +
+((__t = (otr_translated_status)) == null ? '' : __t) +
+'</span>\n        ';
+ if (otr_status == UNENCRYPTED) { ;
+__p += '\n            <span class="icon-unlocked"></span>\n        ';
+ } ;
+__p += '\n        ';
+ if (otr_status == UNVERIFIED) { ;
+__p += '\n            <span class="icon-lock"></span>\n        ';
+ } ;
+__p += '\n        ';
+ if (otr_status == VERIFIED) { ;
+__p += '\n            <span class="icon-lock"></span>\n        ';
+ } ;
+__p += '\n        ';
+ if (otr_status == FINISHED) { ;
+__p += '\n            <span class="icon-unlocked"></span>\n        ';
+ } ;
+__p += '\n        <ul>\n            ';
+ if (otr_status == UNENCRYPTED) { ;
+__p += '\n               <li><a class="start-otr" href="#">' +
+((__t = (label_start_encrypted_conversation)) == null ? '' : __t) +
+'</a></li>\n            ';
+ } ;
+__p += '\n            ';
+ if (otr_status != UNENCRYPTED) { ;
+__p += '\n               <li><a class="start-otr" href="#">' +
+((__t = (label_refresh_encrypted_conversation)) == null ? '' : __t) +
+'</a></li>\n               <li><a class="end-otr" href="#">' +
+((__t = (label_end_encrypted_conversation)) == null ? '' : __t) +
+'</a></li>\n               <li><a class="auth-otr" data-scheme="smp" href="#">' +
+((__t = (label_verify_with_smp)) == null ? '' : __t) +
+'</a></li>\n            ';
+ } ;
+__p += '\n            ';
+ if (otr_status == UNVERIFIED) { ;
+__p += '\n               <li><a class="auth-otr" data-scheme="fingerprint" href="#">' +
+((__t = (label_verify_with_fingerprints)) == null ? '' : __t) +
+'</a></li>\n            ';
+ } ;
+__p += '\n            <li><a href="http://www.cypherpunks.ca/otr/help/3.2.0/levels.php" target="_blank">' +
+((__t = (label_whats_this)) == null ? '' : __t) +
+'</a></li>\n        </ul>\n    </li>\n';
+ } ;
+__p += '\n';
+
+}
+return __p
+};
+
+this["templates"]["trimmed_chat"] = function(obj) {
+obj || (obj = {});
+var __t, __p = '', __e = _.escape, __j = Array.prototype.join;
+function print() { __p += __j.call(arguments, '') }
+with (obj) {
+__p += '<a class="chatbox-btn close-chatbox-button icon-close"></a>\n<a class="chat-head-message-count" \n    ';
+ if (!num_unread) { ;
+__p += ' style="display: none" ';
+ } ;
+__p += '\n    href="#">' +
+((__t = (num_unread)) == null ? '' : __t) +
+'</a>\n<a href="#" class="restore-chat" title="' +
+((__t = (tooltip)) == null ? '' : __t) +
+'">\n    ' +
+((__t = ( title )) == null ? '' : __t) +
+'\n</a>\n';
+
+}
+return __p
+};
+
+this["templates"]["vcard"] = function(obj) {
+obj || (obj = {});
+var __t, __p = '', __e = _.escape;
+with (obj) {
+__p += '<form class="pure-form converse-form vcard-info">\n    <fieldset>\n        <legend>The VCard info gets rendered here</legend>\n        <label>Full name:</label>\n        ' +
+((__t = (fullname)) == null ? '' : __t) +
+'\n        <label>URL:</label>\n        ' +
+((__t = (url)) == null ? '' : __t) +
+'\n    </fieldset>\n    <fieldset>\n        <input type="button" class="pure-button button-cancel" value="' +
+((__t = (label_return)) == null ? '' : __t) +
+'"/>\n    </fieldset>\n</form>\n';
+
+}
+return __p
+};
\ No newline at end of file
diff --git a/xmpp/converse/css/converse.css b/xmpp/converse/css/converse.css
new file mode 100644
index 00000000..732e5776
--- /dev/null
+++ b/xmpp/converse/css/converse.css
@@ -0,0 +1,2041 @@
+/*!
+ * Converse.js (Web-based XMPP instant messaging client)
+ * http://conversejs.org
+ *
+ * Copyright (c) 2012-2014, JC Brand <jc@opkode.com>
+ * Licensed under the Mozilla Public License
+ */
+/* 
+    Color scheme helpers:
+    https://coolors.co/app/264653-2a9d8f-e9c46a-f4a261-e76f51
+    http://paletton.com/#uid=53f0u0knsvIdILAj5Cftgu3uBmZ
+ */
+@font-face {
+  font-family: 'Converse-js';
+  src: url("../fonticons/fonts/icomoon.eot?-mnoxh0");
+  src: url("../fonticons/fonts/icomoon.eot?#iefix-mnoxh0") format("embedded-opentype"), url("../fonticons/fonts/icomoon.woff?-mnoxh0") format("woff"), url("../fonticons/fonts/icomoon.ttf?-mnoxh0") format("truetype"), url("../fonticons/fonts/icomoon.svg?-mnoxh0#icomoon") format("svg");
+  font-weight: normal;
+  font-style: normal; }
+.icon-conversejs {
+  font-family: 'Converse-js';
+  speak: none;
+  font-style: normal;
+  font-weight: normal;
+  font-variant: normal;
+  text-transform: none;
+  line-height: 1;
+  /* Better Font Rendering =========== */
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale; }
+
+.icon-conversejs:before {
+  content: "\e600"; }
+
+#conversejs .icon-address-book:before {
+  content: "\270f"; }
+#conversejs .icon-angry:before {
+  content: "\e03f"; }
+#conversejs .icon-attachment:before {
+  content: "\e032"; }
+#conversejs .icon-away:before {
+  content: "\25fb"; }
+#conversejs .icon-blocked:before {
+  content: "\2718"; }
+#conversejs .icon-bold:before {
+  content: "\e04d"; }
+#conversejs .icon-bubbles-2:before {
+  content: "\e016"; }
+#conversejs .icon-bubbles-3:before {
+  content: "\e017"; }
+#conversejs .icon-bubbles:before {
+  content: "\e015"; }
+#conversejs .icon-camera-2:before {
+  content: "\2616"; }
+#conversejs .icon-camera:before {
+  content: "\e003"; }
+#conversejs .icon-cancel-circle:before {
+  content: "\e058"; }
+#conversejs .icon-checkbox-checked:before {
+  content: "\2611"; }
+#conversejs .icon-checkbox-partial:before {
+  content: "\2b28"; }
+#conversejs .icon-checkbox-unchecked:before {
+  content: "\2b27"; }
+#conversejs .icon-checkmark:before {
+  content: "\2713"; }
+#conversejs .icon-close:before {
+  content: "\2715"; }
+#conversejs .icon-closed:before {
+  content: "\25ba"; }
+#conversejs .icon-cog:before {
+  content: "\e02f"; }
+#conversejs .icon-cogs:before {
+  content: "\e022"; }
+#conversejs .icon-confused:before {
+  content: "\2368"; }
+#conversejs .icon-cool:before {
+  content: "\e040"; }
+#conversejs .icon-dnd:before {
+  content: "\e004"; }
+#conversejs .icon-envelop:before {
+  content: "\2709"; }
+#conversejs .icon-evil:before {
+  content: "\261f"; }
+#conversejs .icon-eye-blocked:before {
+  content: "\e031"; }
+#conversejs .icon-eye:before {
+  content: "\e030"; }
+#conversejs .icon-globe:before {
+  content: "\e033"; }
+#conversejs .icon-grin:before {
+  content: "\e041"; }
+#conversejs .icon-happy:before {
+  content: "\263b"; }
+#conversejs .icon-headphones:before {
+  content: "\266c"; }
+#conversejs .icon-heart:before {
+  content: "\2764"; }
+#conversejs .icon-hide-users:before {
+  content: "\e01c"; }
+#conversejs .icon-home:before {
+  content: "\e000"; }
+#conversejs .icon-image:before {
+  content: "\2b14"; }
+#conversejs .icon-info:before {
+  content: "\2360"; }
+#conversejs .icon-info-2:before {
+  content: "i"; }
+#conversejs .icon-italic:before {
+  content: "\e04f"; }
+#conversejs .icon-key-2:before {
+  content: "\e029"; }
+#conversejs .icon-key:before {
+  content: "\e028"; }
+#conversejs .icon-lock-2:before {
+  content: "\e027"; }
+#conversejs .icon-lock:before {
+  content: "\e026"; }
+#conversejs .icon-logout:before {
+  content: "\e601"; }
+#conversejs .icon-minus:before {
+  content: "\e05a"; }
+#conversejs .icon-music:before {
+  content: "\266b"; }
+#conversejs .icon-new-tab:before {
+  content: "\e053"; }
+#conversejs .icon-newspaper:before {
+  content: "\e001"; }
+#conversejs .icon-notebook:before {
+  content: "\2710"; }
+#conversejs .icon-notification:before {
+  content: "\e01f"; }
+#conversejs .icon-online:before {
+  content: "\25fc"; }
+#conversejs .icon-chat:before {
+  content: "\25fc"; }
+#conversejs .icon-opened:before {
+  content: "\25bc"; }
+#conversejs .icon-pencil:before {
+  content: "\270e"; }
+#conversejs .icon-phone-hang-up:before {
+  content: "\260e"; }
+#conversejs .icon-phone:before {
+  content: "\260f"; }
+#conversejs .icon-play:before {
+  content: "\25d9"; }
+#conversejs .icon-plus:before {
+  content: "\271a"; }
+#conversejs .icon-pushpin:before {
+  content: "\e012"; }
+#conversejs .icon-quotes-left:before {
+  content: "\e01d"; }
+#conversejs .icon-radio-checked:before {
+  content: "\2b26"; }
+#conversejs .icon-radio-unchecked:before {
+  content: "\2b25"; }
+#conversejs .icon-remove:before {
+  content: "\e02d"; }
+#conversejs .icon-room-info:before {
+  content: "\e059"; }
+#conversejs .icon-sad:before {
+  content: "\2639"; }
+#conversejs .icon-search:before {
+  content: "\e021"; }
+#conversejs .icon-shocked:before {
+  content: "\2364"; }
+#conversejs .icon-show-users:before {
+  content: "\e01e"; }
+#conversejs .icon-smiley:before {
+  content: "\263a"; }
+#conversejs .icon-spell-check:before {
+  content: "\e045"; }
+#conversejs .icon-spinner:before {
+  content: "\231b"; }
+#conversejs .icon-strikethrough:before {
+  content: "\e050"; }
+#conversejs .icon-thumbs-up:before {
+  content: "\261d"; }
+#conversejs .icon-tongue:before {
+  content: "\e038"; }
+#conversejs .icon-underline:before {
+  content: "\e04e"; }
+#conversejs .icon-unlocked:before {
+  content: "\e025"; }
+#conversejs .icon-user:before {
+  content: "\e01a"; }
+#conversejs .icon-users:before {
+  content: "\e01b"; }
+#conversejs .icon-volume-decrease:before {
+  content: "\e04b"; }
+#conversejs .icon-volume-high:before {
+  content: "\e046"; }
+#conversejs .icon-volume-increase:before {
+  content: "\e04c"; }
+#conversejs .icon-volume-low:before {
+  content: "\e048"; }
+#conversejs .icon-volume-medium:before {
+  content: "\e047"; }
+#conversejs .icon-volume-mute-2:before {
+  content: "\e04a"; }
+#conversejs .icon-volume-mute:before {
+  content: "\e049"; }
+#conversejs .icon-warning:before {
+  content: "\26a0"; }
+#conversejs .icon-wink:before {
+  content: "\e03a"; }
+#conversejs .icon-wondering:before {
+  content: "\2369"; }
+#conversejs .icon-wrench:before {
+  content: "\e024"; }
+#conversejs .icon-xa:before {
+  content: "\e602"; }
+#conversejs .icon-unavailable:before,
+#conversejs .icon-offline:before {
+  content: "\e002"; }
+#conversejs .icon-youtube:before {
+  content: "\e055"; }
+#conversejs .icon-zoom-in:before {
+  content: "\e02b"; }
+#conversejs .icon-zoom-out:before {
+  content: "\e02a"; }
+#conversejs [data-icon]:before {
+  content: attr(data-icon);
+  font-family: 'Converse-js';
+  font-variant: normal;
+  font-weight: normal;
+  line-height: 1;
+  speak: none;
+  text-transform: none;
+  /* Better Font Rendering =========== */
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale; }
+#conversejs [class^="icon-"]:before, #conversejs [class*=" icon-"]:before {
+  background-position: 14px 14px;
+  background-image: none;
+  font-family: 'Converse-js';
+  font-style: normal;
+  font-variant: normal;
+  font-weight: normal;
+  width: auto;
+  height: auto;
+  line-height: 1;
+  speak: none;
+  text-transform: none;
+  /* Better Font Rendering =========== */
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale; }
+
+#conversejs {
+  /*!
+  Pure v0.6.1-pre
+  Copyright 2014 Yahoo! Inc. All rights reserved.
+  Licensed under the BSD License.
+  https://github.com/yahoo/pure/blob/master/LICENSE.md
+  */
+  /*!
+  normalize.css v^3.0 | MIT License | git.io/normalize
+  Copyright (c) Nicolas Gallagher and Jonathan Neal
+  */
+  /*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */
+  /**
+   * 1. Set default font family to sans-serif.
+   * 2. Prevent iOS and IE text size adjust after device orientation change,
+   *    without disabling user zoom.
+   */
+  /**
+   * Remove default margin.
+   */
+  /* HTML5 display definitions
+     ========================================================================== */
+  /**
+   * Correct `block` display not defined for any HTML5 element in IE 8/9.
+   * Correct `block` display not defined for `details` or `summary` in IE 10/11
+   * and Firefox.
+   * Correct `block` display not defined for `main` in IE 11.
+   */
+  /**
+   * 1. Correct `inline-block` display not defined in IE 8/9.
+   * 2. Normalize vertical alignment of `progress` in Chrome, Firefox, and Opera.
+   */
+  /**
+   * Prevent modern browsers from displaying `audio` without controls.
+   * Remove excess height in iOS 5 devices.
+   */
+  /**
+   * Address `[hidden]` styling not present in IE 8/9/10.
+   * Hide the `template` element in IE 8/9/10/11, Safari, and Firefox < 22.
+   */
+  /* Links
+     ========================================================================== */
+  /**
+   * Remove the gray background color from active links in IE 10.
+   */
+  /**
+   * Improve readability of focused elements when they are also in an
+   * active/hover state.
+   */
+  /* Text-level semantics
+     ========================================================================== */
+  /**
+   * Address styling not present in IE 8/9/10/11, Safari, and Chrome.
+   */
+  /**
+   * Address style set to `bolder` in Firefox 4+, Safari, and Chrome.
+   */
+  /**
+   * Address styling not present in Safari and Chrome.
+   */
+  /**
+   * Address variable `h1` font-size and margin within `section` and `article`
+   * contexts in Firefox 4+, Safari, and Chrome.
+   */
+  /**
+   * Address styling not present in IE 8/9.
+   */
+  /**
+   * Address inconsistent and variable font size in all browsers.
+   */
+  /**
+   * Prevent `sub` and `sup` affecting `line-height` in all browsers.
+   */
+  /* Embedded content
+     ========================================================================== */
+  /**
+   * Remove border when inside `a` element in IE 8/9/10.
+   */
+  /**
+   * Correct overflow not hidden in IE 9/10/11.
+   */
+  /* Grouping content
+     ========================================================================== */
+  /**
+   * Address margin not present in IE 8/9 and Safari.
+   */
+  /**
+   * Address differences between Firefox and other browsers.
+   */
+  /**
+   * Contain overflow in all browsers.
+   */
+  /**
+   * Address odd `em`-unit font size rendering in all browsers.
+   */
+  /* Forms
+     ========================================================================== */
+  /**
+   * Known limitation: by default, Chrome and Safari on OS X allow very limited
+   * styling of `select`, unless a `border` property is set.
+   */
+  /**
+   * 1. Correct color not being inherited.
+   *    Known issue: affects color of disabled elements.
+   * 2. Correct font properties not being inherited.
+   * 3. Address margins set differently in Firefox 4+, Safari, and Chrome.
+   */
+  /**
+   * Address `overflow` set to `hidden` in IE 8/9/10/11.
+   */
+  /**
+   * Address inconsistent `text-transform` inheritance for `button` and `select`.
+   * All other form control elements do not inherit `text-transform` values.
+   * Correct `button` style inheritance in Firefox, IE 8/9/10/11, and Opera.
+   * Correct `select` style inheritance in Firefox.
+   */
+  /**
+   * 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio`
+   *    and `video` controls.
+   * 2. Correct inability to style clickable `input` types in iOS.
+   * 3. Improve usability and consistency of cursor style between image-type
+   *    `input` and others.
+   */
+  /**
+   * Re-set default cursor for disabled elements.
+   */
+  /**
+   * Remove inner padding and border in Firefox 4+.
+   */
+  /**
+   * Address Firefox 4+ setting `line-height` on `input` using `!important` in
+   * the UA stylesheet.
+   */
+  /**
+   * It's recommended that you don't attempt to style these elements.
+   * Firefox's implementation doesn't respect box-sizing, padding, or width.
+   *
+   * 1. Address box sizing set to `content-box` in IE 8/9/10.
+   * 2. Remove excess padding in IE 8/9/10.
+   */
+  /**
+   * Fix the cursor style for Chrome's increment/decrement buttons. For certain
+   * `font-size` values of the `input`, it causes the cursor style of the
+   * decrement button to change from `default` to `text`.
+   */
+  /**
+   * 1. Address `appearance` set to `searchfield` in Safari and Chrome.
+   * 2. Address `box-sizing` set to `border-box` in Safari and Chrome.
+   */
+  /**
+   * Remove inner padding and search cancel button in Safari and Chrome on OS X.
+   * Safari (but not Chrome) clips the cancel button when the search input has
+   * padding (and `textfield` appearance).
+   */
+  /**
+   * Define consistent border, margin, and padding.
+   */
+  /**
+   * 1. Correct `color` not being inherited in IE 8/9/10/11.
+   * 2. Remove padding so people aren't caught out if they zero out fieldsets.
+   */
+  /**
+   * Remove default vertical scrollbar in IE 8/9/10/11.
+   */
+  /**
+   * Don't inherit the `font-weight` (applied by a rule above).
+   * NOTE: the default cannot safely be changed in Chrome and Safari on OS X.
+   */
+  /* Tables
+     ========================================================================== */
+  /**
+   * Remove most spacing between table cells.
+   */
+  /*csslint important:false*/
+  /* ==========================================================================
+     Pure Base Extras
+     ========================================================================== */
+  /**
+   * Extra rules that Pure adds on top of Normalize.css
+   */
+  /**
+   * Always hide an element when it has the `hidden` HTML attribute.
+   */
+  /**
+   * Add this class to an image to make it fit within it's fluid parent wrapper while maintaining
+   * aspect ratio.
+   */
+  /*!
+  Pure v0.6.1-pre
+  Copyright 2014 Yahoo! Inc. All rights reserved.
+  Licensed under the BSD License.
+  https://github.com/yahoo/pure/blob/master/LICENSE.md
+  */
+  /*csslint box-model:false*/
+  /*
+  Box-model set to false because we're setting a height on select elements, which
+  also have border and padding. This is done because some browsers don't render
+  the padding. We explicitly set the box-model for select elements to border-box,
+  so we can ignore the csslint warning.
+  */
+  /*
+  Need to separate out the :not() selector from the rest of the CSS 2.1 selectors
+  since IE8 won't execute CSS that contains a CSS3 selector.
+  */
+  /* Chrome (as of v.32/34 on OS X) needs additional room for color to display. */
+  /* May be able to remove this tweak as color inputs become more standardized across browsers. */
+  /*
+  Need to separate out the :not() selector from the rest of the CSS 2.1 selectors
+  since IE8 won't execute CSS that contains a CSS3 selector.
+  */
+  /*
+  Need to separate out the :not() selector from the rest of the CSS 2.1 selectors
+  since IE8 won't execute CSS that contains a CSS3 selector.
+  */
+  /*
+  Need to separate out the :not() selector from the rest of the CSS 2.1 selectors
+  since IE8 won't execute CSS that contains a CSS3 selector.
+  */
+  /* Aligned Forms */
+  /* Rounded Inputs */
+  /* Grouped Inputs */
+  /* Inline help for forms */
+  /* NOTE: pure-help-inline is deprecated. Use .pure-form-message-inline instead. */
+  /* Block help for forms */
+  /*!
+  Pure v0.6.1-pre
+  Copyright 2014 Yahoo! Inc. All rights reserved.
+  Licensed under the BSD License.
+  https://github.com/yahoo/pure/blob/master/LICENSE.md
+  */
+  /* Firefox: Get rid of the inner focus border */
+  /*csslint outline-none:false*/
+  /* Firefox: Get rid of the inner focus border */
+  -webkit-box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  box-sizing: border-box; }
+  #conversejs html {
+    font-family: sans-serif;
+    /* 1 */
+    -ms-text-size-adjust: 100%;
+    /* 2 */
+    -webkit-text-size-adjust: 100%;
+    /* 2 */ }
+  #conversejs body {
+    margin: 0; }
+  #conversejs article,
+  #conversejs aside,
+  #conversejs details,
+  #conversejs figcaption,
+  #conversejs figure,
+  #conversejs footer,
+  #conversejs header,
+  #conversejs hgroup,
+  #conversejs main,
+  #conversejs menu,
+  #conversejs nav,
+  #conversejs section,
+  #conversejs summary {
+    display: block; }
+  #conversejs audio,
+  #conversejs canvas,
+  #conversejs progress,
+  #conversejs video {
+    display: inline-block;
+    /* 1 */
+    vertical-align: baseline;
+    /* 2 */ }
+  #conversejs audio:not([controls]) {
+    display: none;
+    height: 0; }
+  #conversejs [hidden],
+  #conversejs template {
+    display: none; }
+  #conversejs a {
+    background-color: transparent; }
+  #conversejs a:active,
+  #conversejs a:hover {
+    outline: 0; }
+  #conversejs abbr[title] {
+    border-bottom: 1px dotted; }
+  #conversejs b,
+  #conversejs strong {
+    font-weight: bold; }
+  #conversejs dfn {
+    font-style: italic; }
+  #conversejs h1 {
+    font-size: 2em;
+    margin: 0.67em 0; }
+  #conversejs mark {
+    background: #ff0;
+    color: #000; }
+  #conversejs small {
+    font-size: 80%; }
+  #conversejs sub,
+  #conversejs sup {
+    font-size: 75%;
+    line-height: 0;
+    position: relative;
+    vertical-align: baseline; }
+  #conversejs sup {
+    top: -0.5em; }
+  #conversejs sub {
+    bottom: -0.25em; }
+  #conversejs img {
+    border: 0; }
+  #conversejs svg:not(:root) {
+    overflow: hidden; }
+  #conversejs figure {
+    margin: 1em 40px; }
+  #conversejs hr {
+    box-sizing: content-box;
+    height: 0; }
+  #conversejs pre {
+    overflow: auto; }
+  #conversejs code,
+  #conversejs kbd,
+  #conversejs pre,
+  #conversejs samp {
+    font-family: monospace, monospace;
+    font-size: 1em; }
+  #conversejs button,
+  #conversejs input,
+  #conversejs optgroup,
+  #conversejs select,
+  #conversejs textarea {
+    color: inherit;
+    /* 1 */
+    font: inherit;
+    /* 2 */
+    margin: 0;
+    /* 3 */ }
+  #conversejs button {
+    overflow: visible; }
+  #conversejs button,
+  #conversejs select {
+    text-transform: none; }
+  #conversejs button,
+  #conversejs html input[type="button"],
+  #conversejs input[type="reset"],
+  #conversejs input[type="submit"] {
+    -webkit-appearance: button;
+    /* 2 */
+    cursor: pointer;
+    /* 3 */ }
+  #conversejs button[disabled],
+  #conversejs html input[disabled] {
+    cursor: default; }
+  #conversejs button::-moz-focus-inner,
+  #conversejs input::-moz-focus-inner {
+    border: 0;
+    padding: 0; }
+  #conversejs input {
+    line-height: normal; }
+  #conversejs input[type="checkbox"],
+  #conversejs input[type="radio"] {
+    box-sizing: border-box;
+    /* 1 */
+    padding: 0;
+    /* 2 */ }
+  #conversejs input[type="number"]::-webkit-inner-spin-button,
+  #conversejs input[type="number"]::-webkit-outer-spin-button {
+    height: auto; }
+  #conversejs input[type="search"] {
+    -webkit-appearance: textfield;
+    /* 1 */
+    box-sizing: content-box;
+    /* 2 */ }
+  #conversejs input[type="search"]::-webkit-search-cancel-button,
+  #conversejs input[type="search"]::-webkit-search-decoration {
+    -webkit-appearance: none; }
+  #conversejs fieldset {
+    border: 1px solid #c0c0c0;
+    margin: 0 2px;
+    padding: 0.35em 0.625em 0.75em; }
+  #conversejs legend {
+    border: 0;
+    /* 1 */
+    padding: 0;
+    /* 2 */ }
+  #conversejs textarea {
+    overflow: auto; }
+  #conversejs optgroup {
+    font-weight: bold; }
+  #conversejs table {
+    border-collapse: collapse;
+    border-spacing: 0; }
+  #conversejs td,
+  #conversejs th {
+    padding: 0; }
+  #conversejs .hidden,
+  #conversejs [hidden] {
+    display: none !important; }
+  #conversejs .pure-img {
+    max-width: 100%;
+    height: auto;
+    display: block; }
+  #conversejs .pure-form input[type="text"],
+  #conversejs .pure-form input[type="password"],
+  #conversejs .pure-form input[type="email"],
+  #conversejs .pure-form input[type="url"],
+  #conversejs .pure-form input[type="date"],
+  #conversejs .pure-form input[type="month"],
+  #conversejs .pure-form input[type="time"],
+  #conversejs .pure-form input[type="datetime"],
+  #conversejs .pure-form input[type="datetime-local"],
+  #conversejs .pure-form input[type="week"],
+  #conversejs .pure-form input[type="number"],
+  #conversejs .pure-form input[type="search"],
+  #conversejs .pure-form input[type="tel"],
+  #conversejs .pure-form input[type="color"],
+  #conversejs .pure-form select,
+  #conversejs .pure-form textarea {
+    padding: 0.5em 0.6em;
+    display: inline-block;
+    border: 1px solid #ccc;
+    box-shadow: inset 0 1px 3px #ddd;
+    border-radius: 4px;
+    vertical-align: middle;
+    -webkit-box-sizing: border-box;
+    -moz-box-sizing: border-box;
+    box-sizing: border-box; }
+  #conversejs .pure-form input:not([type]) {
+    padding: 0.5em 0.6em;
+    display: inline-block;
+    border: 1px solid #ccc;
+    box-shadow: inset 0 1px 3px #ddd;
+    border-radius: 4px;
+    -webkit-box-sizing: border-box;
+    -moz-box-sizing: border-box;
+    box-sizing: border-box; }
+  #conversejs .pure-form input[type="color"] {
+    padding: 0.2em 0.5em; }
+  #conversejs .pure-form input[type="text"]:focus,
+  #conversejs .pure-form input[type="password"]:focus,
+  #conversejs .pure-form input[type="email"]:focus,
+  #conversejs .pure-form input[type="url"]:focus,
+  #conversejs .pure-form input[type="date"]:focus,
+  #conversejs .pure-form input[type="month"]:focus,
+  #conversejs .pure-form input[type="time"]:focus,
+  #conversejs .pure-form input[type="datetime"]:focus,
+  #conversejs .pure-form input[type="datetime-local"]:focus,
+  #conversejs .pure-form input[type="week"]:focus,
+  #conversejs .pure-form input[type="number"]:focus,
+  #conversejs .pure-form input[type="search"]:focus,
+  #conversejs .pure-form input[type="tel"]:focus,
+  #conversejs .pure-form input[type="color"]:focus,
+  #conversejs .pure-form select:focus,
+  #conversejs .pure-form textarea:focus {
+    outline: 0;
+    border-color: #1A9707; }
+  #conversejs .pure-form input:not([type]):focus {
+    outline: 0;
+    border-color: #1A9707; }
+  #conversejs .pure-form input[type="file"]:focus,
+  #conversejs .pure-form input[type="radio"]:focus,
+  #conversejs .pure-form input[type="checkbox"]:focus {
+    outline: thin solid #1A9707;
+    outline: 1px auto #1A9707; }
+  #conversejs .pure-form .pure-checkbox,
+  #conversejs .pure-form .pure-radio {
+    margin: 0.5em 0;
+    display: block; }
+  #conversejs .pure-form input[type="text"][disabled],
+  #conversejs .pure-form input[type="password"][disabled],
+  #conversejs .pure-form input[type="email"][disabled],
+  #conversejs .pure-form input[type="url"][disabled],
+  #conversejs .pure-form input[type="date"][disabled],
+  #conversejs .pure-form input[type="month"][disabled],
+  #conversejs .pure-form input[type="time"][disabled],
+  #conversejs .pure-form input[type="datetime"][disabled],
+  #conversejs .pure-form input[type="datetime-local"][disabled],
+  #conversejs .pure-form input[type="week"][disabled],
+  #conversejs .pure-form input[type="number"][disabled],
+  #conversejs .pure-form input[type="search"][disabled],
+  #conversejs .pure-form input[type="tel"][disabled],
+  #conversejs .pure-form input[type="color"][disabled],
+  #conversejs .pure-form select[disabled],
+  #conversejs .pure-form textarea[disabled] {
+    cursor: not-allowed;
+    background-color: #eaeded;
+    color: #cad2d3; }
+  #conversejs .pure-form input:not([type])[disabled] {
+    cursor: not-allowed;
+    background-color: #eaeded;
+    color: #cad2d3; }
+  #conversejs .pure-form input[readonly],
+  #conversejs .pure-form select[readonly],
+  #conversejs .pure-form textarea[readonly] {
+    background-color: #eee;
+    /* menu hover bg color */
+    color: #777;
+    /* menu text color */
+    border-color: #ccc; }
+  #conversejs .pure-form input:focus:invalid,
+  #conversejs .pure-form textarea:focus:invalid,
+  #conversejs .pure-form select:focus:invalid {
+    color: #b94a48;
+    border-color: #e9322d; }
+  #conversejs .pure-form input[type="file"]:focus:invalid:focus,
+  #conversejs .pure-form input[type="radio"]:focus:invalid:focus,
+  #conversejs .pure-form input[type="checkbox"]:focus:invalid:focus {
+    outline-color: #e9322d; }
+  #conversejs .pure-form select {
+    /* Normalizes the height; padding is not sufficient. */
+    height: 2.25em;
+    border: 1px solid #ccc;
+    background-color: white; }
+  #conversejs .pure-form select[multiple] {
+    height: auto; }
+  #conversejs .pure-form label {
+    margin: 0.5em 0 0.2em; }
+  #conversejs .pure-form fieldset {
+    margin: 0;
+    padding: 0.35em 0 0.75em;
+    border: 0; }
+  #conversejs .pure-form legend {
+    display: block;
+    width: 100%;
+    padding: 0.3em 0;
+    margin-bottom: 0.3em;
+    color: #333;
+    border-bottom: 1px solid #e5e5e5; }
+  #conversejs .pure-form-stacked input[type="text"],
+  #conversejs .pure-form-stacked input[type="password"],
+  #conversejs .pure-form-stacked input[type="email"],
+  #conversejs .pure-form-stacked input[type="url"],
+  #conversejs .pure-form-stacked input[type="date"],
+  #conversejs .pure-form-stacked input[type="month"],
+  #conversejs .pure-form-stacked input[type="time"],
+  #conversejs .pure-form-stacked input[type="datetime"],
+  #conversejs .pure-form-stacked input[type="datetime-local"],
+  #conversejs .pure-form-stacked input[type="week"],
+  #conversejs .pure-form-stacked input[type="number"],
+  #conversejs .pure-form-stacked input[type="search"],
+  #conversejs .pure-form-stacked input[type="tel"],
+  #conversejs .pure-form-stacked input[type="color"],
+  #conversejs .pure-form-stacked input[type="file"],
+  #conversejs .pure-form-stacked select,
+  #conversejs .pure-form-stacked label,
+  #conversejs .pure-form-stacked textarea {
+    display: block;
+    margin: 0.25em 0; }
+  #conversejs .pure-form-stacked input:not([type]) {
+    display: block;
+    margin: 0.25em 0; }
+  #conversejs .pure-form-aligned input,
+  #conversejs .pure-form-aligned textarea,
+  #conversejs .pure-form-aligned select,
+  #conversejs .pure-form-aligned .pure-help-inline,
+  #conversejs .pure-form-message-inline {
+    display: inline-block;
+    *display: inline;
+    *zoom: 1;
+    vertical-align: middle; }
+  #conversejs .pure-form-aligned textarea {
+    vertical-align: top; }
+  #conversejs .pure-form-aligned .pure-control-group {
+    margin-bottom: 0.5em; }
+  #conversejs .pure-form-aligned .pure-control-group label {
+    text-align: right;
+    display: inline-block;
+    vertical-align: middle;
+    width: 10em;
+    margin: 0 1em 0 0; }
+  #conversejs .pure-form-aligned .pure-controls {
+    margin: 1.5em 0 0 11em; }
+  #conversejs .pure-form input.pure-input-rounded,
+  #conversejs .pure-form .pure-input-rounded {
+    border-radius: 2em;
+    padding: 0.5em 1em; }
+  #conversejs .pure-form .pure-group fieldset {
+    margin-bottom: 10px; }
+  #conversejs .pure-form .pure-group input,
+  #conversejs .pure-form .pure-group textarea {
+    display: block;
+    padding: 10px;
+    margin: 0 0 -1px;
+    border-radius: 0;
+    position: relative;
+    top: -1px; }
+  #conversejs .pure-form .pure-group input:focus,
+  #conversejs .pure-form .pure-group textarea:focus {
+    z-index: 3; }
+  #conversejs .pure-form .pure-group input:first-child,
+  #conversejs .pure-form .pure-group textarea:first-child {
+    top: 1px;
+    border-radius: 4px 4px 0 0;
+    margin: 0; }
+  #conversejs .pure-form .pure-group input:first-child:last-child,
+  #conversejs .pure-form .pure-group textarea:first-child:last-child {
+    top: 1px;
+    border-radius: 4px;
+    margin: 0; }
+  #conversejs .pure-form .pure-group input:last-child,
+  #conversejs .pure-form .pure-group textarea:last-child {
+    top: -2px;
+    border-radius: 0 0 4px 4px;
+    margin: 0; }
+  #conversejs .pure-form .pure-group button {
+    margin: 0.35em 0; }
+  #conversejs .pure-form .pure-input-1 {
+    width: 100%; }
+  #conversejs .pure-form .pure-input-3-4 {
+    width: 75%; }
+  #conversejs .pure-form .pure-input-2-3 {
+    width: 66%; }
+  #conversejs .pure-form .pure-input-1-2 {
+    width: 50%; }
+  #conversejs .pure-form .pure-input-1-3 {
+    width: 33%; }
+  #conversejs .pure-form .pure-input-1-4 {
+    width: 25%; }
+  #conversejs .pure-form .pure-help-inline,
+  #conversejs .pure-form-message-inline {
+    display: inline-block;
+    padding-left: 0.3em;
+    color: #666;
+    vertical-align: middle;
+    font-size: 0.875em; }
+  #conversejs .pure-form-message {
+    display: block;
+    color: #666;
+    font-size: 0.875em; }
+  @media only screen and (max-width: 480px) {
+    #conversejs {
+      /* NOTE: pure-help-inline is deprecated. Use .pure-form-message-inline instead. */ }
+      #conversejs .pure-form button[type="submit"] {
+        margin: 0.7em 0 0; }
+      #conversejs .pure-form input:not([type]),
+      #conversejs .pure-form input[type="text"],
+      #conversejs .pure-form input[type="password"],
+      #conversejs .pure-form input[type="email"],
+      #conversejs .pure-form input[type="url"],
+      #conversejs .pure-form input[type="date"],
+      #conversejs .pure-form input[type="month"],
+      #conversejs .pure-form input[type="time"],
+      #conversejs .pure-form input[type="datetime"],
+      #conversejs .pure-form input[type="datetime-local"],
+      #conversejs .pure-form input[type="week"],
+      #conversejs .pure-form input[type="number"],
+      #conversejs .pure-form input[type="search"],
+      #conversejs .pure-form input[type="tel"],
+      #conversejs .pure-form input[type="color"],
+      #conversejs .pure-form label {
+        margin-bottom: 0.3em;
+        display: block; }
+      #conversejs .pure-group input:not([type]),
+      #conversejs .pure-group input[type="text"],
+      #conversejs .pure-group input[type="password"],
+      #conversejs .pure-group input[type="email"],
+      #conversejs .pure-group input[type="url"],
+      #conversejs .pure-group input[type="date"],
+      #conversejs .pure-group input[type="month"],
+      #conversejs .pure-group input[type="time"],
+      #conversejs .pure-group input[type="datetime"],
+      #conversejs .pure-group input[type="datetime-local"],
+      #conversejs .pure-group input[type="week"],
+      #conversejs .pure-group input[type="number"],
+      #conversejs .pure-group input[type="search"],
+      #conversejs .pure-group input[type="tel"],
+      #conversejs .pure-group input[type="color"] {
+        margin-bottom: 0; }
+      #conversejs .pure-form-aligned .pure-control-group label {
+        margin-bottom: 0.3em;
+        text-align: left;
+        display: block;
+        width: 100%; }
+      #conversejs .pure-form-aligned .pure-controls {
+        margin: 1.5em 0 0 0; }
+      #conversejs .pure-form .pure-help-inline,
+      #conversejs .pure-form-message-inline,
+      #conversejs .pure-form-message {
+        display: block;
+        font-size: 0.75em;
+        /* Increased bottom padding to make it group with its related input element. */
+        padding: 0.2em 0 0.8em; } }
+  #conversejs .pure-button {
+    /* Structure */
+    display: inline-block;
+    zoom: 1;
+    line-height: normal;
+    white-space: nowrap;
+    vertical-align: middle;
+    text-align: center;
+    cursor: pointer;
+    -webkit-user-drag: none;
+    -webkit-user-select: none;
+    -moz-user-select: none;
+    -ms-user-select: none;
+    user-select: none;
+    -webkit-box-sizing: border-box;
+    -moz-box-sizing: border-box;
+    box-sizing: border-box; }
+  #conversejs .pure-button::-moz-focus-inner {
+    padding: 0;
+    border: 0; }
+  #conversejs .pure-button {
+    font-family: inherit;
+    font-size: 100%;
+    padding: 0.5em 1em;
+    color: #444;
+    /* rgba not supported (IE 8) */
+    color: rgba(0, 0, 0, 0.8);
+    /* rgba supported */
+    border: 1px solid #999;
+    /*IE 6/7/8*/
+    border: none transparent;
+    /*IE9 + everything else*/
+    background-color: #E6E6E6;
+    text-decoration: none;
+    border-radius: 2px; }
+  #conversejs .pure-button-hover,
+  #conversejs .pure-button:hover,
+  #conversejs .pure-button:focus {
+    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#1a000000',GradientType=0);
+    background-image: -webkit-gradient(linear, 0 0, 0 100%, from(transparent), color-stop(40%, rgba(0, 0, 0, 0.05)), to(rgba(0, 0, 0, 0.1)));
+    background-image: -webkit-linear-gradient(transparent, rgba(0, 0, 0, 0.05) 40%, rgba(0, 0, 0, 0.1));
+    background-image: -moz-linear-gradient(top, rgba(0, 0, 0, 0.05) 0%, rgba(0, 0, 0, 0.1));
+    background-image: -o-linear-gradient(transparent, rgba(0, 0, 0, 0.05) 40%, rgba(0, 0, 0, 0.1));
+    background-image: linear-gradient(transparent, rgba(0, 0, 0, 0.05) 40%, rgba(0, 0, 0, 0.1)); }
+  #conversejs .pure-button:focus {
+    outline: 0; }
+  #conversejs .pure-button-active,
+  #conversejs .pure-button:active {
+    box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.15) inset, 0 0 6px rgba(0, 0, 0, 0.2) inset;
+    border-color: #000 \9; }
+  #conversejs .pure-button[disabled],
+  #conversejs .pure-button-disabled,
+  #conversejs .pure-button-disabled:hover,
+  #conversejs .pure-button-disabled:focus,
+  #conversejs .pure-button-disabled:active {
+    border: none;
+    background-image: none;
+    filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+    filter: alpha(opacity=40);
+    -khtml-opacity: 0.40;
+    -moz-opacity: 0.40;
+    opacity: 0.40;
+    cursor: not-allowed;
+    box-shadow: none; }
+  #conversejs .pure-button-hidden {
+    display: none; }
+  #conversejs .pure-button::-moz-focus-inner {
+    padding: 0;
+    border: 0; }
+  #conversejs .pure-button-primary,
+  #conversejs .pure-button-selected,
+  #conversejs a.pure-button-primary,
+  #conversejs a.pure-button-selected {
+    background-color: #0078e7;
+    color: #fff; }
+  #conversejs *, #conversejs *:before, #conversejs *:after {
+    -webkit-box-sizing: border-box;
+    -moz-box-sizing: border-box;
+    box-sizing: border-box; }
+  @media screen and (max-width: 480px) {
+    #conversejs {
+      margin: 0;
+      right: 10px;
+      left: 10px;
+      bottom: 5px; } }
+  #conversejs ul li {
+    height: auto; }
+  #conversejs div, #conversejs span, #conversejs h1, #conversejs h2, #conversejs h3, #conversejs h4, #conversejs h5, #conversejs h6, #conversejs p, #conversejs blockquote,
+  #conversejs pre, #conversejs a, #conversejs em, #conversejs img, #conversejs strong, #conversejs dl, #conversejs dt, #conversejs dd, #conversejs ol, #conversejs ul, #conversejs li,
+  #conversejs fieldset, #conversejs form, #conversejs label, #conversejs legend, #conversejs table, #conversejs caption, #conversejs tbody,
+  #conversejs tfoot, #conversejs thead, #conversejs tr, #conversejs th, #conversejs td, #conversejs article, #conversejs aside, #conversejs canvas, #conversejs details,
+  #conversejs embed, #conversejs figure, #conversejs figcaption, #conversejs footer, #conversejs header, #conversejs hgroup, #conversejs menu,
+  #conversejs nav, #conversejs output, #conversejs ruby, #conversejs section, #conversejs summary, #conversejs time, #conversejs mark, #conversejs audio, #conversejs video {
+    margin: 0;
+    padding: 0;
+    border: 0;
+    font: inherit;
+    vertical-align: baseline; }
+  #conversejs textarea,
+  #conversejs input[type=submit], #conversejs input[type=button],
+  #conversejs input[type=text], #conversejs input[type=password],
+  #conversejs button {
+    font-size: 14px;
+    padding: 0.25em;
+    min-height: 0; }
+  #conversejs strong {
+    font-weight: 700; }
+  #conversejs ol, #conversejs ul {
+    list-style: none; }
+  #conversejs li {
+    height: 10px; }
+  #conversejs ul, #conversejs ol, #conversejs dl {
+    font: inherit;
+    margin: 0; }
+  #conversejs a, #conversejs a:visited {
+    text-decoration: none;
+    color: #2A9D8F;
+    text-shadow: none; }
+
+#conversejs {
+  bottom: 0;
+  color: #818479;
+  direction: ltr;
+  display: block;
+  font-size: 14px;
+  height: 35px;
+  position: fixed;
+  left: 0;
+  right: 0;
+  width: auto;
+  z-index: 30; }
+  @media screen and (max-width: 480px) {
+    #conversejs {
+      width: 100%;
+      width: 100vw; } }
+  #conversejs ::selection {
+    background-color: #DCF9F6; }
+  #conversejs ::-moz-selection {
+    background-color: #DCF9F6; }
+  #conversejs .no-text-select {
+    -webkit-touch-callout: none;
+    -webkit-user-select: none;
+    -moz-user-select: none;
+    -ms-user-select: none;
+    user-select: none; }
+  #conversejs .emoticon {
+    font-size: 14px; }
+  #conversejs .left {
+    float: left; }
+  #conversejs .right {
+    float: right; }
+  #conversejs .centered {
+    text-align: center;
+    display: block;
+    margin: 5em auto; }
+  #conversejs .hor_centered {
+    text-align: center;
+    display: block;
+    margin: 0 auto;
+    clear: both; }
+  #conversejs .hidden {
+    display: none; }
+  #conversejs .locked {
+    padding-right: 22px; }
+@-webkit-keyframes spin {
+  from {
+    -webkit-transform: rotate(0deg); }
+  to {
+    -webkit-transform: rotate(359deg); } }
+@-moz-keyframes spin {
+  from {
+    -moz-transform: rotate(0deg); }
+  to {
+    -moz-transform: rotate(359deg); } }
+@keyframes spin {
+  from {
+    -webkit-transform: rotate(0deg);
+    -moz-transform: rotate(0deg);
+    -ms-transform: rotate(0deg);
+    -o-transform: rotate(0deg);
+    transform: rotate(0deg); }
+  to {
+    -webkit-transform: rotate(359deg);
+    -moz-transform: rotate(359deg);
+    -ms-transform: rotate(359deg);
+    -o-transform: rotate(359deg);
+    transform: rotate(359deg); } }
+  #conversejs .spinner {
+    -webkit-animation: spin 2s infinite, linear;
+    -moz-animation: spin 2s infinite, linear;
+    animation: spin 2s infinite, linear;
+    display: block;
+    text-align: center;
+    margin: 5px; }
+    #conversejs .spinner:before {
+      font-size: 24px;
+      font-family: 'Converse-js' !important;
+      content: "\231b"; }
+  #conversejs .button-group,
+  #conversejs .input-button-group {
+    display: table; }
+  #conversejs .button-group {
+    width: 100%; }
+  #conversejs .input-button-group button,
+  #conversejs .input-button-group input {
+    display: table-cell; }
+  #conversejs .error {
+    color: red; }
+  #conversejs .reg-feedback {
+    font-size: 85%; }
+  #conversejs .reg-feedback,
+  #conversejs #converse-login .conn-feedback {
+    display: block;
+    text-align: center;
+    width: 100%; }
+  #conversejs a.restore-chat {
+    padding: 1px 0 1px 5px;
+    color: white;
+    line-height: 15px;
+    display: block;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap; }
+  #conversejs a.restore-chat:visited {
+    color: white; }
+  #conversejs .activated {
+    display: block !important; }
+  #conversejs .pure-button {
+    border-radius: 4px; }
+  #conversejs .button-primary {
+    color: white;
+    background-color: #2AC611; }
+  #conversejs .button-secondary {
+    color: white;
+    background-color: #83A0D6; }
+  #conversejs .button-cancel {
+    color: white;
+    background-color: #D24E2B; }
+  #conversejs form.pure-form.converse-form {
+    background: white;
+    margin: 1em; }
+    #conversejs form.pure-form.converse-form legend {
+      color: #818479; }
+    #conversejs form.pure-form.converse-form label {
+      margin-top: 1em; }
+    #conversejs form.pure-form.converse-form input[type=text],
+    #conversejs form.pure-form.converse-form input[type=password],
+    #conversejs form.pure-form.converse-form input[type=number],
+    #conversejs form.pure-form.converse-form input[type=button],
+    #conversejs form.pure-form.converse-form input[type=submit] {
+      height: 2.2em; }
+    #conversejs form.pure-form.converse-form input[type=button],
+    #conversejs form.pure-form.converse-form input[type=submit] {
+      padding-left: 1em;
+      padding-right: 1em;
+      margin-right: 1em; }
+    #conversejs form.pure-form.converse-form input.error {
+      border: 1px solid red;
+      color: #818479; }
+    #conversejs form.pure-form.converse-form .form-help {
+      color: gray;
+      font-size: 85%;
+      padding-top: 0.5em; }
+      #conversejs form.pure-form.converse-form .form-help:hover {
+        color: #818479; }
+  #conversejs .chat-textarea-chatbox-selected {
+    border: 1px solid #578308;
+    margin: 0; }
+  #conversejs .chat-textarea-chatroom-selected {
+    border: 2px solid #2A9D8F;
+    margin: 0; }
+  #conversejs .dropdown dt,
+  #conversejs .dropdown ul {
+    margin: 0;
+    padding: 0; }
+
+#conversejs .flyout {
+  border-radius: 4px;
+  bottom: 6px;
+  display: block;
+  position: absolute; }
+#conversejs .chat-head {
+  border-top-left-radius: 4px;
+  border-top-right-radius: 4px;
+  color: #ffffff;
+  font-size: 100%;
+  height: 55px;
+  margin: 0;
+  padding: 5px;
+  position: relative; }
+  #conversejs .chat-head .avatar {
+    margin-right: 0.5em;
+    border-radius: 50%;
+    float: left; }
+  #conversejs .chat-head.chat-head-chatbox {
+    background-color: #F4A261; }
+  #conversejs .chat-head .user-custom-message {
+    clear: left;
+    color: white;
+    font-size: 80%;
+    font-style: italic;
+    height: 1.3em;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    margin: 0;
+    padding-top: 0.2em; }
+#conversejs .chatbox-btn {
+  border-radius: 50%;
+  border: 1px solid white;
+  color: white;
+  cursor: pointer;
+  display: inline-block;
+  float: right;
+  font-size: 9px;
+  margin: 0;
+  margin-right: 0.2em;
+  padding: 0.5em 0.5em 0.3em 0.5em;
+  text-decoration: none; }
+  #conversejs .chatbox-btn:active {
+    position: relative;
+    top: 1px; }
+#conversejs .chatbox {
+  display: block;
+  float: right;
+  height: 35px;
+  margin: 0 0.5em;
+  width: 200px; }
+  @media screen and (max-width: 480px) {
+    #conversejs .chatbox {
+      margin: 0;
+      width: 100%; } }
+  #conversejs .chatbox .box-flyout {
+    background-color: white;
+    box-shadow: 1px 3px 5px 3px rgba(0, 0, 0, 0.4);
+    height: 450px;
+    min-height: 225px;
+    min-width: 200px;
+    width: 200px;
+    z-index: 1; }
+    @media screen and (max-width: 480px) {
+      #conversejs .chatbox .box-flyout {
+        height: 400px;
+        width: 100%;
+        height: 99vh; } }
+  #conversejs .chatbox .chat-title {
+    color: white;
+    line-height: 15px;
+    display: block;
+    text-overflow: ellipsis;
+    overflow: hidden;
+    height: 2em; }
+    #conversejs .chatbox .chat-title a {
+      color: white;
+      width: 100%; }
+  #conversejs .chatbox .chat-body {
+    background-color: white;
+    border-bottom-left-radius: 4px;
+    border-bottom-right-radius: 4px;
+    border-top: 0;
+    height: 289px;
+    height: -webkit-calc(100% - 55px);
+    height: calc(100% - 55px); }
+    #conversejs .chatbox .chat-body p {
+      color: #818479;
+      font-size: 14px;
+      margin: 0;
+      padding: 5px; }
+    #conversejs .chatbox .chat-body .chat-info {
+      color: #D24E2B;
+      margin: 0.3em; }
+      #conversejs .chatbox .chat-body .chat-info.chat-event {
+        clear: left;
+        font-style: italic; }
+      #conversejs .chatbox .chat-body .chat-info.chat-error {
+        color: #D24E2B;
+        font-weight: bold; }
+      #conversejs .chatbox .chat-body .chat-info.chat-date {
+        display: inline-block;
+        margin-top: 2em; }
+    #conversejs .chatbox .chat-body .chat-message {
+      margin: 0.3em; }
+      #conversejs .chatbox .chat-body .chat-message span {
+        display: inline-block; }
+        #conversejs .chatbox .chat-body .chat-message span.chat-msg-author {
+          max-width: 100%;
+          font-weight: bold;
+          white-space: nowrap;
+          float: left;
+          text-overflow: ellipsis;
+          overflow: hidden; }
+        #conversejs .chatbox .chat-body .chat-message span.chat-msg-them {
+          color: #1A9707; }
+        #conversejs .chatbox .chat-body .chat-message span.chat-msg-me {
+          color: #2A9D8F; }
+        #conversejs .chatbox .chat-body .chat-message span.chat-msg-content {
+          max-width: 100%;
+          word-wrap: break-word; }
+    #conversejs .chatbox .chat-body .delayed .chat-msg-them {
+      color: #FB5D50; }
+    #conversejs .chatbox .chat-body .delayed .chat-msg-me {
+      color: #7EABBB; }
+  #conversejs .chatbox .chat-content {
+    position: relative;
+    padding: 0.5em;
+    font-size: 13px;
+    color: #818479;
+    overflow-y: auto;
+    border: 0;
+    background-color: #ffffff;
+    line-height: 1.3em;
+    height: 206px;
+    height: calc(100% - 96px); }
+  #conversejs .chatbox .dropdown {
+    /* status dropdown styles */
+    background-color: #FCFDFD; }
+    #conversejs .chatbox .dropdown dd {
+      margin: 0;
+      padding: 0;
+      position: relative; }
+  #conversejs .chatbox form.sendXMPPMessage {
+    -moz-background-clip: padding;
+    -webkit-background-clip: padding-box;
+    border-bottom-left-radius: 4px;
+    border-bottom-right-radius: 4px;
+    background-clip: padding-box;
+    background: white;
+    border-top: 1px solid #BBB;
+    border: 0;
+    margin: 0;
+    padding: 0;
+    position: relative;
+    height: 95px;
+    min-width: 200px; }
+    @media screen and (max-width: 480px) {
+      #conversejs .chatbox form.sendXMPPMessage {
+        width: 100%; } }
+    #conversejs .chatbox form.sendXMPPMessage .chat-textarea {
+      border-bottom-left-radius: 4px;
+      border-bottom-right-radius: 4px;
+      border: 0;
+      height: 70px;
+      padding: 0.5em;
+      width: 100%;
+      resize: none; }
+    #conversejs .chatbox form.sendXMPPMessage .chat-toolbar {
+      font-size: 14px;
+      margin: 0;
+      padding: 5px;
+      height: 25px;
+      display: block;
+      background-color: #FFF5EE; }
+      #conversejs .chatbox form.sendXMPPMessage .chat-toolbar a {
+        color: #2A9D8F; }
+      #conversejs .chatbox form.sendXMPPMessage .chat-toolbar .chat-toolbar-text {
+        font-size: 12px;
+        padding-right: 3px;
+        text-shadow: 0 1px 0 white; }
+      #conversejs .chatbox form.sendXMPPMessage .chat-toolbar .unencrypted a,
+      #conversejs .chatbox form.sendXMPPMessage .chat-toolbar .unencrypted {
+        color: #D24E2B; }
+      #conversejs .chatbox form.sendXMPPMessage .chat-toolbar .unverified a,
+      #conversejs .chatbox form.sendXMPPMessage .chat-toolbar .unverified {
+        color: #cf5300; }
+      #conversejs .chatbox form.sendXMPPMessage .chat-toolbar .private a,
+      #conversejs .chatbox form.sendXMPPMessage .chat-toolbar .private {
+        color: #4b7003; }
+      #conversejs .chatbox form.sendXMPPMessage .chat-toolbar .toggle-occupants,
+      #conversejs .chatbox form.sendXMPPMessage .chat-toolbar .toggle-clear,
+      #conversejs .chatbox form.sendXMPPMessage .chat-toolbar .toggle-otr {
+        float: right; }
+      #conversejs .chatbox form.sendXMPPMessage .chat-toolbar li {
+        display: inline-block;
+        list-style: none;
+        padding: 0 3px 0 3px;
+        cursor: pointer;
+        margin-top: 1px; }
+      #conversejs .chatbox form.sendXMPPMessage .chat-toolbar li:hover {
+        cursor: pointer; }
+      #conversejs .chatbox form.sendXMPPMessage .chat-toolbar ul {
+        background: #fff;
+        bottom: 100%;
+        box-shadow: -1px -1px 2px 0 rgba(0, 0, 0, 0.4);
+        display: none;
+        font-size: 12px;
+        margin: 0 0 1px 0;
+        position: absolute;
+        right: 0; }
+        #conversejs .chatbox form.sendXMPPMessage .chat-toolbar ul li {
+          cursor: pointer;
+          list-style: none;
+          position: relative; }
+          #conversejs .chatbox form.sendXMPPMessage .chat-toolbar ul li a:hover {
+            color: #8f2831; }
+      #conversejs .chatbox form.sendXMPPMessage .chat-toolbar .toggle-smiley {
+        color: #2A9D8F;
+        padding-left: 5px; }
+        #conversejs .chatbox form.sendXMPPMessage .chat-toolbar .toggle-smiley ul li {
+          font-size: 14px;
+          padding: 5px;
+          z-index: 98; }
+        #conversejs .chatbox form.sendXMPPMessage .chat-toolbar .toggle-smiley ul li:hover {
+          background-color: #DCF9F6; }
+      #conversejs .chatbox form.sendXMPPMessage .chat-toolbar .toggle-otr ul li {
+        padding: 7px;
+        background-color: white;
+        display: block;
+        z-index: 99; }
+        #conversejs .chatbox form.sendXMPPMessage .chat-toolbar .toggle-otr ul li a {
+          -moz-transition: background-color 0.2s ease-in-out;
+          -webkit-transition: background-color 0.2s ease-in-out;
+          transition: background-color 0.2s ease-in-out;
+          display: block;
+          padding: 1px;
+          text-decoration: none; }
+      #conversejs .chatbox form.sendXMPPMessage .chat-toolbar .toggle-otr ul li:hover {
+        background-color: #DCF9F6; }
+  #conversejs .chatbox .dragresize {
+    background: transparent;
+    border: 0;
+    margin: 0;
+    position: absolute;
+    top: 0;
+    z-index: 20; }
+    #conversejs .chatbox .dragresize-top {
+      cursor: n-resize;
+      height: 5px;
+      width: 100%; }
+    #conversejs .chatbox .dragresize-left {
+      cursor: w-resize;
+      width: 5px;
+      height: 100%;
+      left: 0; }
+    #conversejs .chatbox .dragresize-topleft {
+      cursor: nw-resize;
+      width: 15px;
+      height: 15px;
+      top: 0;
+      left: 0; }
+
+#conversejs #controlbox {
+  display: none;
+  margin-right: 1em; }
+  @media screen and (max-width: 480px) {
+    #conversejs #controlbox {
+      margin: 0; } }
+  #conversejs #controlbox .controlbox-head {
+    background-color: #577BDD;
+    border-top-left-radius: 4px;
+    border-top-right-radius: 4px;
+    color: white;
+    height: 55px;
+    margin: 0;
+    padding: 6px 6px 6px 0; }
+  #conversejs #controlbox form.search-xmpp-contact {
+    margin: 0;
+    padding-left: 5px;
+    padding: 0 0 5px 5px; }
+    #conversejs #controlbox form.search-xmpp-contact input {
+      width: 8em; }
+  #conversejs #controlbox a.subscribe-to-user {
+    padding-left: 2em;
+    font-weight: bold; }
+  #conversejs #controlbox #converse-register {
+    background: white; }
+    #conversejs #controlbox #converse-register .title {
+      font-weight: bold; }
+    #conversejs #controlbox #converse-register .info {
+      font-style: italic;
+      color: green;
+      font-size: 85%;
+      margin: 5px 0; }
+    #conversejs #controlbox #converse-register .form-errors {
+      color: red;
+      display: none; }
+    #conversejs #controlbox #converse-register .provider-title {
+      font-size: 22px; }
+    #conversejs #controlbox #converse-register .provider-score {
+      width: 178px;
+      margin-bottom: 8px; }
+    #conversejs #controlbox #converse-register .form-help .url {
+      font-weight: bold;
+      color: #2A9D8F; }
+    #conversejs #controlbox #converse-register .input-group {
+      display: table;
+      margin: auto;
+      width: 100%; }
+      #conversejs #controlbox #converse-register .input-group span {
+        overflow-x: hidden;
+        text-overflow: ellipsis;
+        max-width: 110px; }
+      #conversejs #controlbox #converse-register .input-group span, #conversejs #controlbox #converse-register .input-group input[name=username] {
+        display: table-cell;
+        text-align: left; }
+    #conversejs #controlbox #converse-register .instructions {
+      color: gray;
+      font-size: 85%; }
+      #conversejs #controlbox #converse-register .instructions:hover {
+        color: #818479; }
+  #conversejs #controlbox #converse-register, #conversejs #controlbox #converse-login {
+    margin-top: 2em; }
+    #conversejs #controlbox #converse-register .login-anon, #conversejs #controlbox #converse-login .login-anon {
+      height: auto;
+      white-space: normal; }
+    #conversejs #controlbox #converse-register .save-submit, #conversejs #controlbox #converse-login .save-submit {
+      color: #436F64; }
+    #conversejs #controlbox #converse-register input, #conversejs #controlbox #converse-login input {
+      width: 100%;
+      margin: 0.5em 0; }
+  #conversejs #controlbox #users .add-converse-contact {
+    margin: 0 1em 0.75em 1em; }
+  #conversejs #controlbox #chatrooms form.add-chatroom input[type=button],
+  #conversejs #controlbox #chatrooms form.add-chatroom input[type=submit],
+  #conversejs #controlbox #chatrooms form.add-chatroom input[type=text] {
+    width: 100%; }
+  #conversejs #controlbox #chatrooms #available-chatrooms {
+    padding: 0 1em 2em 1em;
+    text-align: left; }
+    #conversejs #controlbox #chatrooms #available-chatrooms dt {
+      border: none;
+      color: #818479;
+      font-weight: normal;
+      padding: 0;
+      padding-bottom: 0.5em;
+      text-shadow: 0 1px 0 #FAFAFA; }
+    #conversejs #controlbox #chatrooms #available-chatrooms dd.available-chatroom {
+      border: none;
+      clear: both;
+      color: #818479;
+      display: block;
+      overflow: hidden;
+      padding: 0.4em;
+      text-shadow: 0 1px 0 #FAFAFA;
+      word-wrap: break-word; }
+      #conversejs #controlbox #chatrooms #available-chatrooms dd.available-chatroom:hover {
+        background-color: #DCF9F6; }
+      #conversejs #controlbox #chatrooms #available-chatrooms dd.available-chatroom a.room-info {
+        display: none;
+        clear: right;
+        display: block; }
+        #conversejs #controlbox #chatrooms #available-chatrooms dd.available-chatroom a.room-info:before {
+          font-size: 15px; }
+      #conversejs #controlbox #chatrooms #available-chatrooms dd.available-chatroom a.open-room {
+        float: left;
+        width: 85%; }
+      #conversejs #controlbox #chatrooms #available-chatrooms dd.available-chatroom .room-info {
+        font-size: 11px;
+        font-style: normal;
+        font-weight: normal; }
+      #conversejs #controlbox #chatrooms #available-chatrooms dd.available-chatroom li.room-info {
+        display: block;
+        margin-left: 5px; }
+      #conversejs #controlbox #chatrooms #available-chatrooms dd.available-chatroom p.room-info {
+        margin: 0;
+        padding: 0;
+        display: block;
+        white-space: normal; }
+      #conversejs #controlbox #chatrooms #available-chatrooms dd.available-chatroom div.room-info {
+        clear: left;
+        width: 100%; }
+  #conversejs #controlbox .dropdown a {
+    width: 148px;
+    display: inline-block;
+    line-height: 25px; }
+  #conversejs #controlbox .dropdown li {
+    list-style: none;
+    padding-left: 0; }
+  #conversejs #controlbox .dropdown dd ul {
+    padding: 0;
+    list-style: none;
+    position: absolute;
+    left: 0;
+    top: 0;
+    border: 1px solid #B1BFC4;
+    width: 100%;
+    z-index: 21;
+    background-color: #FCFDFD; }
+    #conversejs #controlbox .dropdown dd ul li:hover {
+      background-color: #DCF9F6; }
+  #conversejs #controlbox .dropdown dd.search-xmpp ul {
+    box-shadow: 1px 4px 10px 1px rgba(0, 0, 0, 0.4); }
+    #conversejs #controlbox .dropdown dd.search-xmpp ul li:hover {
+      background-color: #FCFDFD; }
+  #conversejs #controlbox .dropdown dt a span {
+    cursor: pointer;
+    display: block;
+    padding: 4px 7px 0 5px; }
+  #conversejs #controlbox #select-xmpp-status {
+    float: right;
+    margin-right: 0.5em; }
+  #conversejs #controlbox #set-custom-xmpp-status {
+    float: left;
+    padding: 0; }
+    #conversejs #controlbox #set-custom-xmpp-status fieldset {
+      padding: 0;
+      margin-top: -1px; }
+    #conversejs #controlbox #set-custom-xmpp-status input {
+      height: 26px;
+      width: -webkit-calc(100% - 40px);
+      width: calc(100% - 40px);
+      padding: 0 0 0 0.5em; }
+    #conversejs #controlbox #set-custom-xmpp-status input[type=submit] {
+      height: 26px;
+      width: 40px;
+      padding: 1px;
+      float: right; }
+  #conversejs #controlbox #controlbox-tabs {
+    text-align: center;
+    display: inline;
+    overflow: hidden;
+    font-size: 12px;
+    list-style-type: none;
+    /* single tab */ }
+    #conversejs #controlbox #controlbox-tabs li {
+      float: left;
+      list-style: none;
+      padding-left: 0;
+      text-shadow: white 0 1px 0;
+      width: 38%; }
+      #conversejs #controlbox #controlbox-tabs li a {
+        background-color: white;
+        border-bottom: 1px solid #CCC;
+        border-top-left-radius: 4px;
+        border-top-right-radius: 4px;
+        box-shadow: inset 2px -2px 20px rgba(0, 0, 0, 0.3);
+        color: #818479;
+        display: block;
+        font-size: 12px;
+        height: 54px;
+        line-height: 54px;
+        margin: 0;
+        text-align: center;
+        text-decoration: none; }
+        #conversejs #controlbox #controlbox-tabs li a:hover {
+          color: #818479; }
+        #conversejs #controlbox #controlbox-tabs li a.current, #conversejs #controlbox #controlbox-tabs li a.current:hover {
+          box-shadow: none;
+          border-bottom: 0;
+          height: 55px;
+          cursor: default;
+          color: #818479; }
+  #conversejs #controlbox .fancy-dropdown {
+    border: 1px solid #B1BFC4;
+    height: 25px;
+    border-radius: 4px;
+    text-align: left;
+    padding: 0;
+    padding-left: 0.3em; }
+    #conversejs #controlbox .fancy-dropdown .choose-xmpp-status {
+      width: 155px; }
+    #conversejs #controlbox .fancy-dropdown .choose-xmpp-status,
+    #conversejs #controlbox .fancy-dropdown .toggle-xmpp-contact-form {
+      text-shadow: 0 1px 0 #ffffff;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+      display: inline; }
+    #conversejs #controlbox .fancy-dropdown.no-border {
+      border: 0; }
+  #conversejs #controlbox #fancy-xmpp-status-select {
+    padding-left: 0; }
+    #conversejs #controlbox #fancy-xmpp-status-select .xmpp-status {
+      margin-left: 0.3em;
+      display: inline; }
+    #conversejs #controlbox #fancy-xmpp-status-select a.change-xmpp-status-message {
+      float: right;
+      clear: right;
+      width: 12px;
+      margin-right: 0.3em;
+      color: #2A9D8F; }
+  #conversejs #controlbox .controlbox-pane {
+    background-color: white;
+    border-bottom-left-radius: 4px;
+    border-bottom-right-radius: 4px;
+    border: 0;
+    font-size: 14px;
+    position: absolute;
+    text-align: center;
+    width: 100%;
+    height: 289px;
+    height: -webkit-calc(100% - 55px);
+    height: calc(100% - 55px);
+    overflow-y: auto;
+    overflow-x: hidden; }
+    #conversejs #controlbox .controlbox-pane label {
+      font-size: 14px;
+      font-weight: bold;
+      height: auto;
+      margin: 4px; }
+    #conversejs #controlbox .controlbox-pane dd {
+      margin-left: 0;
+      margin-bottom: 0; }
+      #conversejs #controlbox .controlbox-pane dd.odd {
+        background-color: #DCEAC5; }
+  #conversejs #controlbox #users {
+    overflow-y: hidden; }
+  #conversejs #controlbox .add-xmpp-contact {
+    background: none;
+    padding: 1em; }
+    #conversejs #controlbox .add-xmpp-contact input {
+      margin: 0 0 1rem;
+      width: 100%; }
+    #conversejs #controlbox .add-xmpp-contact button {
+      width: 100%; }
+  #conversejs #controlbox .xmpp-status-menu {
+    text-align: left;
+    box-shadow: 1px 4px 10px 1px rgba(0, 0, 0, 0.4); }
+    #conversejs #controlbox .xmpp-status-menu li {
+      padding: 2px; }
+      #conversejs #controlbox .xmpp-status-menu li a {
+        width: 100%;
+        padding: 0 8px; }
+  #conversejs #controlbox .xmpp-status-menu li a.logout,
+  #conversejs #controlbox .xmpp-status-menu li a.logout span {
+    color: #D24E2B; }
+  #conversejs #controlbox .set-xmpp-status {
+    background: none;
+    margin: 1em 1em 0.5em 1em; }
+    #conversejs #controlbox .set-xmpp-status .dropdown dd ul {
+      z-index: 22; }
+#conversejs .toggle-controlbox {
+  background-color: #2A9D8F;
+  border-top-left-radius: 4px;
+  border-top-right-radius: 4px;
+  color: #0a0a0a;
+  float: right;
+  height: 100%;
+  margin: 0 0.5em;
+  padding: 10px 8px 0 8px; }
+  #conversejs .toggle-controlbox span {
+    color: white; }
+
+#conversejs #converse-roster {
+  text-align: left;
+  width: 100%;
+  position: relative;
+  margin: 1em 0 0 0;
+  height: 194px;
+  height: calc(100% - 50px - 20px);
+  overflow: hidden;
+  padding: 0;
+  padding-bottom: 3em; }
+  #conversejs #converse-roster.no-contact-requests {
+    height: calc(100% - 25px - 20px); }
+  #conversejs #converse-roster .search-xmpp ul li.chat-info {
+    padding-left: 10px; }
+  #conversejs #converse-roster .roster-filter-group {
+    margin: 0 1em;
+    width: 100%;
+    padding-right: 2em;
+    /* (jQ addClass:) if input has value: */
+    /* (jQ addClass:) if mouse is over the 'x' input area*/ }
+    #conversejs #converse-roster .roster-filter-group .roster-filter {
+      float: left;
+      background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAcAAAAHCAYAAADEUlfTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAIGNIUk0AAHolAACAgwAA+f8AAIDpAAB1MAAA6mAAADqYAAAXb5JfxUYAAABNSURBVHjaXI7BDcAwCAMvyQjMyQ6dAbZiKfqoUK34g2zJh1dENIC7M8pMAPYdzAVY3d0ajNz9aypS/b5R6o+ZPdqoKgCq6h80KH3xDgBqNR97p8oAGQAAAABJRU5ErkJggg==) no-repeat right -20px center;
+      border: 1px solid #999;
+      font-size: 14px;
+      height: 25px;
+      margin: 0;
+      padding: 0;
+      padding-left: 0.4em;
+      width: 53%; }
+    #conversejs #converse-roster .roster-filter-group .roster-filter.x {
+      background-position: right 3px center; }
+    #conversejs #converse-roster .roster-filter-group .roster-filter.onX {
+      cursor: pointer; }
+    #conversejs #converse-roster .roster-filter-group .filter-type {
+      display: table-cell;
+      float: right;
+      font-size: calc(14px - 2px);
+      height: 25px;
+      padding: 0;
+      width: 47%;
+      border-radius: 0;
+      border: 1px solid; }
+  #conversejs #converse-roster .roster-contacts {
+    margin: 0;
+    height: 100%;
+    overflow-x: hidden;
+    overflow-y: auto; }
+    #conversejs #converse-roster .roster-contacts dt.roster-group {
+      border: none;
+      color: #818479;
+      display: none;
+      font-weight: normal;
+      margin-top: 0.5em;
+      padding: 0.5em 1em;
+      text-shadow: 0 1px 0 #FAFAFA; }
+      #conversejs #converse-roster .roster-contacts dt.roster-group:hover {
+        background-color: #DCF9F6; }
+      #conversejs #converse-roster .roster-contacts dt.roster-group .group-toggle {
+        color: #818479;
+        display: block;
+        width: 100%; }
+    #conversejs #converse-roster .roster-contacts dd {
+      border: none;
+      clear: both;
+      color: #818479;
+      display: block;
+      height: 24px;
+      overflow-y: hidden;
+      padding: 0.3em 0 0.3em 1em;
+      text-shadow: 0 1px 0 #FAFAFA;
+      line-height: 14px;
+      width: 100%; }
+      #conversejs #converse-roster .roster-contacts dd .open-chat {
+        max-width: 90%; }
+      #conversejs #converse-roster .roster-contacts dd:hover {
+        background-color: #DCF9F6; }
+        #conversejs #converse-roster .roster-contacts dd:hover .remove-xmpp-contact {
+          display: inline-block; }
+        #conversejs #converse-roster .roster-contacts dd:hover .open-chat {
+          width: 80%; }
+      #conversejs #converse-roster .roster-contacts dd.requesting-xmpp-contact.request-actions {
+        margin-left: 0.5em;
+        margin-bottom: 0.3em;
+        float: right; }
+      #conversejs #converse-roster .roster-contacts dd.requesting-xmpp-contact .req-contact-name {
+        width: 69%;
+        padding: 0; }
+      #conversejs #converse-roster .roster-contacts dd.current-xmpp-contact span {
+        font-size: 16px;
+        float: left;
+        color: #2A9D8F; }
+      #conversejs #converse-roster .roster-contacts dd.odd {
+        background-color: #DCEAC5;
+        /* Make this difference */ }
+      #conversejs #converse-roster .roster-contacts dd a, #conversejs #converse-roster .roster-contacts dd span {
+        text-shadow: 0 1px 0 #FAFAFA;
+        display: inline-block;
+        overflow: hidden;
+        white-space: nowrap;
+        text-overflow: ellipsis; }
+      #conversejs #converse-roster .roster-contacts dd span {
+        padding: 0 0.5em 0 0;
+        height: 100%; }
+      #conversejs #converse-roster .roster-contacts dd a.decline-xmpp-request {
+        margin-left: 5px; }
+      #conversejs #converse-roster .roster-contacts dd a.remove-xmpp-contact {
+        float: right;
+        margin-right: 1em;
+        display: none;
+        color: #818479; }
+  #conversejs #converse-roster span.pending-contact-name {
+    width: 80%; }
+
+#conversejs .chat-head-chatroom {
+  background-color: #E76F51; }
+  #conversejs .chat-head-chatroom .chatroom-topic {
+    color: white;
+    font-size: 80%;
+    font-style: italic;
+    height: 1.3em;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    margin: 0;
+    margin-top: 0.3em; }
+#conversejs .chatroom {
+  width: 300px; }
+  @media screen and (max-width: 480px) {
+    #conversejs .chatroom {
+      width: 100%; }
+      #conversejs .chatroom .box-flyout {
+        min-width: 100%;
+        width: 100%; } }
+  #conversejs .chatroom .box-flyout {
+    min-width: 300px;
+    width: 300px; }
+    #conversejs .chatroom .box-flyout .chatroom-body {
+      height: 289px;
+      border-bottom-left-radius: 4px;
+      border-bottom-right-radius: 4px;
+      height: -webkit-calc(100% - 55px);
+      height: calc(100% - 55px);
+      background-color: white;
+      border-top: 0;
+      width: 100%; }
+      #conversejs .chatroom .box-flyout .chatroom-body .chat-area {
+        word-wrap: break-word;
+        height: 100%;
+        max-width: 70%;
+        float: left;
+        min-width: 200px; }
+        #conversejs .chatroom .box-flyout .chatroom-body .chat-area .chat-content {
+          padding: 0 0.5em 0 0.5em; }
+        #conversejs .chatroom .box-flyout .chatroom-body .chat-area.full {
+          max-width: 100%; }
+      #conversejs .chatroom .box-flyout .chatroom-body .mentioned {
+        font-weight: bold; }
+      #conversejs .chatroom .box-flyout .chatroom-body .chat-msg-room {
+        color: #1A9707; }
+      #conversejs .chatroom .box-flyout .chatroom-body .occupants {
+        vertical-align: top;
+        background-color: white;
+        overflow: hidden;
+        border-left: 1px solid #818479;
+        border-bottom-right-radius: 4px;
+        min-width: 30%;
+        height: 100%; }
+        #conversejs .chatroom .box-flyout .chatroom-body .occupants.hidden {
+          display: none; }
+        #conversejs .chatroom .box-flyout .chatroom-body .occupants .occupants-heading {
+          padding: 0.3em;
+          font-weight: bold; }
+        #conversejs .chatroom .box-flyout .chatroom-body .occupants .occupant-list {
+          height: 85%;
+          height: calc(100% - 70px);
+          overflow-x: hidden;
+          overflow-y: auto;
+          list-style: none; }
+          #conversejs .chatroom .box-flyout .chatroom-body .occupants .occupant-list li {
+            cursor: default;
+            display: block;
+            font-size: 12px;
+            overflow: hidden;
+            padding: 2px 5px;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+            width: 100px; }
+            #conversejs .chatroom .box-flyout .chatroom-body .occupants .occupant-list li.moderator {
+              color: #D24E2B; }
+      #conversejs .chatroom .box-flyout .chatroom-body .chatroom-form-container {
+        background-color: white;
+        border-bottom-left-radius: 4px;
+        border-bottom-right-radius: 4px;
+        border: 0;
+        color: #818479;
+        font-size: 14px;
+        height: 289px;
+        height: -webkit-calc(100% - 55px);
+        height: calc(100% - 55px);
+        overflow-y: auto;
+        position: absolute; }
+  #conversejs .chatroom .chat-textarea {
+    border-bottom-right-radius: 0; }
+  #conversejs .chatroom .room-invite {
+    margin: 0.3em; }
+    #conversejs .chatroom .room-invite .invited-contact {
+      margin: -1px 0 0 -1px;
+      width: 100%;
+      border: 1px solid #999; }
+      #conversejs .chatroom .room-invite .invited-contact.tt-input {
+        width: 100%;
+        background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAOCAYAAAAfSC3RAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3gkBCjE0uzKkOgAAAidJREFUKM+N0k+IEnEUB/D3cyscdagkWpHV0WGWREXm0AgOGkSJ07kh2UXYU5cOewm6Bp0KXG/tpSCv6hyEFQIhMEaE3yERYfwTOoqKGLQxDAbqYadLgu7J7/XxeY/3ez8EACDLsgljfMfj8ZxUKhXXYDAAnueBoqgyAMipVOovXAuSZdnUaDQeDofDs16vFyUIAjRNUwmCoG02G1AUdZ5IJN7GYrHfm3AvEAjcnUwmX0ajUdRqtV74fL6sruufKYoa6bp+fzabPUMI7ZfL5eImNHk8npNerxc1m80XHMe98fv9H3K5XDkSibxjWfb1arWaYoyPMMbCFqxUKi6CIODw8LDmdDq7oigaAACiKK5omv7KcdylpmlIkiTHFlRVFTRNUxVFqa/ROqIoGoqi5A3DgFartfU4Jp7ngSAI2uVyPZIk6dZmUZKk2w6H4xghBPF4HK7vWLbZbDCdTp+rqvpUkiS0RvV6/bTf7x8wDHMViURqm/AGAMgURZ232+1X1Wr102KxuEwmk3lZlo/7/f7BcrkkSZKs2e12tHXH/x/gHsY4jTE+0jQNGYYBCCFgGOaKJMkfjUaDZximGQ6HXzSbzZ+ZTMbY6oIxFgqFgqPT6YAgCMBxXM1ut6N0Op0fj8chi8XyjWXZ98Fg8DuCHZLNZh+USqWP8/n8idvt/hUKhV7u7QK9Xu8fmqanAJBQVXUfAGY7TQQAKBaLN8fjsdDtdh/run72Dzhf7XLe2UevAAAAAElFTkSuQmCC) no-repeat right 3px center; }
+        #conversejs .chatroom .room-invite .invited-contact.tt-input:focus {
+          border-color: #E76F51; }
+      #conversejs .chatroom .room-invite .invited-contact.tt-hint {
+        color: transparent;
+        background-color: white; }
+    #conversejs .chatroom .room-invite .tt-dropdown-menu {
+      width: 96%;
+      max-height: 250px;
+      background: #E76F51;
+      border-bottom-right-radius: 4px;
+      border-bottom-left-radius: 4px;
+      overflow-y: auto; }
+      #conversejs .chatroom .room-invite .tt-dropdown-menu .tt-suggestion p {
+        color: white;
+        cursor: pointer;
+        font-size: 11px;
+        text-overflow: ellipsis;
+        overflow-x: hidden; }
+        #conversejs .chatroom .room-invite .tt-dropdown-menu .tt-suggestion p:hover {
+          background-color: #FF977C; }
+      #conversejs .chatroom .room-invite .tt-dropdown-menu .tt-suggestion .tt-highlight {
+        background-color: #D24E2B; }
+
+#conversejs #minimized-chats {
+  border-top-left-radius: 4px;
+  border-top-right-radius: 4px;
+  color: white;
+  display: none;
+  float: right;
+  font-weight: bold;
+  height: 100%;
+  margin: 0 0.5em;
+  padding: 0;
+  width: 130px; }
+  #conversejs #minimized-chats #toggle-minimized-chats {
+    border-top-left-radius: 4px;
+    border-top-right-radius: 4px;
+    background-color: #2A9D8F;
+    color: white;
+    position: relative;
+    padding: 10px 0 0 0;
+    display: block;
+    width: 100%;
+    height: 100%;
+    text-align: center; }
+  #conversejs #minimized-chats .minimized-chats-flyout {
+    height: auto;
+    bottom: 35px; }
+    #conversejs #minimized-chats .minimized-chats-flyout .chat-head {
+      padding: 0.3em;
+      border-radius: 4px;
+      width: 130px;
+      height: 35px;
+      margin-bottom: 0.2em;
+      box-shadow: 1px 3px 5px 3px rgba(0, 0, 0, 0.4); }
+    #conversejs #minimized-chats .minimized-chats-flyout.minimized {
+      height: auto; }
+  #conversejs #minimized-chats .unread-message-count,
+  #conversejs #minimized-chats .chat-head-message-count {
+    font-weight: bold;
+    background-color: white;
+    border: 1px solid;
+    text-shadow: 1px 1px 0 #FAFAFA;
+    color: #D24E2B;
+    border-radius: 5px;
+    padding: 2px 4px;
+    font-size: 16px;
+    text-align: center;
+    position: absolute;
+    right: 116px;
+    bottom: 10px; }
+
+/*# sourceMappingURL=converse.css.map */
diff --git a/xmpp/converse/css/converse.min.css b/xmpp/converse/css/converse.min.css
new file mode 100644
index 00000000..22c665dd
--- /dev/null
+++ b/xmpp/converse/css/converse.min.css
@@ -0,0 +1,30 @@
+/** Converse.js (Web-based XMPP instant messaging client) 
+* http://conversejs.org 
+* Copyright (c) 2012, Jan-Carel Brand <jc@opkode.com> 
+* Dual licensed under the MIT and GPL Licenses 
+*/
+/*!
+ * Converse.js (Web-based XMPP instant messaging client)
+ * http://conversejs.org
+ *
+ * Copyright (c) 2012-2014, JC Brand <jc@opkode.com>
+ * Licensed under the Mozilla Public License
+ */@font-face{font-family:Converse-js;src:url(../fonticons/fonts/icomoon.eot?-mnoxh0);src:url(../fonticons/fonts/icomoon.eot?#iefix-mnoxh0) format("embedded-opentype"),url(../fonticons/fonts/icomoon.woff?-mnoxh0) format("woff"),url(../fonticons/fonts/icomoon.ttf?-mnoxh0) format("truetype"),url(../fonticons/fonts/icomoon.svg?-mnoxh0#icomoon) format("svg");font-weight:400;font-style:normal}.icon-conversejs{font-family:Converse-js;speak:none;font-style:normal;font-weight:400;font-variant:normal;text-transform:none;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.icon-conversejs:before{content:"\e600"}#conversejs .icon-address-book:before{content:"\270f"}#conversejs .icon-angry:before{content:"\e03f"}#conversejs .icon-attachment:before{content:"\e032"}#conversejs .icon-away:before{content:"\25fb"}#conversejs .icon-blocked:before{content:"\2718"}#conversejs .icon-bold:before{content:"\e04d"}#conversejs .icon-bubbles-2:before{content:"\e016"}#conversejs .icon-bubbles-3:before{content:"\e017"}#conversejs .icon-bubbles:before{content:"\e015"}#conversejs .icon-camera-2:before{content:"\2616"}#conversejs .icon-camera:before{content:"\e003"}#conversejs .icon-cancel-circle:before{content:"\e058"}#conversejs .icon-checkbox-checked:before{content:"\2611"}#conversejs .icon-checkbox-partial:before{content:"\2b28"}#conversejs .icon-checkbox-unchecked:before{content:"\2b27"}#conversejs .icon-checkmark:before{content:"\2713"}#conversejs .icon-close:before{content:"\2715"}#conversejs .icon-closed:before{content:"\25ba"}#conversejs .icon-cog:before{content:"\e02f"}#conversejs .icon-cogs:before{content:"\e022"}#conversejs .icon-confused:before{content:"\2368"}#conversejs .icon-cool:before{content:"\e040"}#conversejs .icon-dnd:before{content:"\e004"}#conversejs .icon-envelop:before{content:"\2709"}#conversejs .icon-evil:before{content:"\261f"}#conversejs .icon-eye-blocked:before{content:"\e031"}#conversejs .icon-eye:before{content:"\e030"}#conversejs .icon-globe:before{content:"\e033"}#conversejs .icon-grin:before{content:"\e041"}#conversejs .icon-happy:before{content:"\263b"}#conversejs .icon-headphones:before{content:"\266c"}#conversejs .icon-heart:before{content:"\2764"}#conversejs .icon-hide-users:before{content:"\e01c"}#conversejs .icon-home:before{content:"\e000"}#conversejs .icon-image:before{content:"\2b14"}#conversejs .icon-info:before{content:"\2360"}#conversejs .icon-info-2:before{content:"i"}#conversejs .icon-italic:before{content:"\e04f"}#conversejs .icon-key-2:before{content:"\e029"}#conversejs .icon-key:before{content:"\e028"}#conversejs .icon-lock-2:before{content:"\e027"}#conversejs .icon-lock:before{content:"\e026"}#conversejs .icon-logout:before{content:"\e601"}#conversejs .icon-minus:before{content:"\e05a"}#conversejs .icon-music:before{content:"\266b"}#conversejs .icon-new-tab:before{content:"\e053"}#conversejs .icon-newspaper:before{content:"\e001"}#conversejs .icon-notebook:before{content:"\2710"}#conversejs .icon-notification:before{content:"\e01f"}#conversejs .icon-chat:before,#conversejs .icon-online:before{content:"\25fc"}#conversejs .icon-opened:before{content:"\25bc"}#conversejs .icon-pencil:before{content:"\270e"}#conversejs .icon-phone-hang-up:before{content:"\260e"}#conversejs .icon-phone:before{content:"\260f"}#conversejs .icon-play:before{content:"\25d9"}#conversejs .icon-plus:before{content:"\271a"}#conversejs .icon-pushpin:before{content:"\e012"}#conversejs .icon-quotes-left:before{content:"\e01d"}#conversejs .icon-radio-checked:before{content:"\2b26"}#conversejs .icon-radio-unchecked:before{content:"\2b25"}#conversejs .icon-remove:before{content:"\e02d"}#conversejs .icon-room-info:before{content:"\e059"}#conversejs .icon-sad:before{content:"\2639"}#conversejs .icon-search:before{content:"\e021"}#conversejs .icon-shocked:before{content:"\2364"}#conversejs .icon-show-users:before{content:"\e01e"}#conversejs .icon-smiley:before{content:"\263a"}#conversejs .icon-spell-check:before{content:"\e045"}#conversejs .icon-spinner:before{content:"\231b"}#conversejs .icon-strikethrough:before{content:"\e050"}#conversejs .icon-thumbs-up:before{content:"\261d"}#conversejs .icon-tongue:before{content:"\e038"}#conversejs .icon-underline:before{content:"\e04e"}#conversejs .icon-unlocked:before{content:"\e025"}#conversejs .icon-user:before{content:"\e01a"}#conversejs .icon-users:before{content:"\e01b"}#conversejs .icon-volume-decrease:before{content:"\e04b"}#conversejs .icon-volume-high:before{content:"\e046"}#conversejs .icon-volume-increase:before{content:"\e04c"}#conversejs .icon-volume-low:before{content:"\e048"}#conversejs .icon-volume-medium:before{content:"\e047"}#conversejs .icon-volume-mute-2:before{content:"\e04a"}#conversejs .icon-volume-mute:before{content:"\e049"}#conversejs .icon-warning:before{content:"\26a0"}#conversejs .icon-wink:before{content:"\e03a"}#conversejs .icon-wondering:before{content:"\2369"}#conversejs .icon-wrench:before{content:"\e024"}#conversejs .icon-xa:before{content:"\e602"}#conversejs .icon-offline:before,#conversejs .icon-unavailable:before{content:"\e002"}#conversejs .icon-youtube:before{content:"\e055"}#conversejs .icon-zoom-in:before{content:"\e02b"}#conversejs .icon-zoom-out:before{content:"\e02a"}#conversejs [data-icon]:before{content:attr(data-icon);font-family:Converse-js;font-variant:normal;font-weight:400;line-height:1;speak:none;text-transform:none;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}#conversejs [class*=" icon-"]:before,#conversejs [class^=icon-]:before{background-position:14px 14px;background-image:none;font-family:Converse-js;font-style:normal;font-variant:normal;font-weight:400;width:auto;height:auto;line-height:1;speak:none;text-transform:none;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}#conversejs{/*!
+  Pure v0.6.1-pre
+  Copyright 2014 Yahoo! Inc. All rights reserved.
+  Licensed under the BSD License.
+  https://github.com/yahoo/pure/blob/master/LICENSE.md
+  *//*!
+  normalize.css v^3.0 | MIT License | git.io/normalize
+  Copyright (c) Nicolas Gallagher and Jonathan Neal
+  *//*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css *//*!
+  Pure v0.6.1-pre
+  Copyright 2014 Yahoo! Inc. All rights reserved.
+  Licensed under the BSD License.
+  https://github.com/yahoo/pure/blob/master/LICENSE.md
+  *//*!
+  Pure v0.6.1-pre
+  Copyright 2014 Yahoo! Inc. All rights reserved.
+  Licensed under the BSD License.
+  https://github.com/yahoo/pure/blob/master/LICENSE.md
+  */-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}#conversejs html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}#conversejs body{margin:0}#conversejs article,#conversejs aside,#conversejs details,#conversejs figcaption,#conversejs figure,#conversejs footer,#conversejs header,#conversejs hgroup,#conversejs main,#conversejs menu,#conversejs nav,#conversejs section,#conversejs summary{display:block}#conversejs audio,#conversejs canvas,#conversejs progress,#conversejs video{display:inline-block;vertical-align:baseline}#conversejs audio:not([controls]){display:none;height:0}#conversejs [hidden],#conversejs template{display:none}#conversejs a{background-color:transparent}#conversejs a:active,#conversejs a:hover{outline:0}#conversejs abbr[title]{border-bottom:1px dotted}#conversejs b,#conversejs strong{font-weight:700}#conversejs dfn{font-style:italic}#conversejs mark{background:#ff0;color:#000}#conversejs small{font-size:80%}#conversejs sub,#conversejs sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}#conversejs sup{top:-.5em}#conversejs sub{bottom:-.25em}#conversejs svg:not(:root){overflow:hidden}#conversejs hr{box-sizing:content-box;height:0}#conversejs pre{overflow:auto}#conversejs code,#conversejs kbd,#conversejs pre,#conversejs samp{font-family:monospace,monospace;font-size:1em}#conversejs button,#conversejs input,#conversejs optgroup,#conversejs select,#conversejs textarea{color:inherit;font:inherit;margin:0}#conversejs button{overflow:visible}#conversejs button,#conversejs select{text-transform:none}#conversejs button,#conversejs html input[type=button],#conversejs input[type=reset],#conversejs input[type=submit]{-webkit-appearance:button;cursor:pointer}#conversejs button[disabled],#conversejs html input[disabled]{cursor:default}#conversejs button::-moz-focus-inner,#conversejs input::-moz-focus-inner{border:0;padding:0}#conversejs input{line-height:normal}#conversejs input[type=checkbox],#conversejs input[type=radio]{box-sizing:border-box;padding:0}#conversejs input[type=number]::-webkit-inner-spin-button,#conversejs input[type=number]::-webkit-outer-spin-button{height:auto}#conversejs input[type=search]{-webkit-appearance:textfield;box-sizing:content-box}#conversejs input[type=search]::-webkit-search-cancel-button,#conversejs input[type=search]::-webkit-search-decoration{-webkit-appearance:none}#conversejs textarea{overflow:auto}#conversejs optgroup{font-weight:700}#conversejs table{border-collapse:collapse;border-spacing:0}#conversejs .hidden,#conversejs [hidden]{display:none!important}#conversejs .pure-img{max-width:100%;height:auto;display:block}#conversejs .pure-form input[type=color],#conversejs .pure-form input[type=date],#conversejs .pure-form input[type=datetime-local],#conversejs .pure-form input[type=datetime],#conversejs .pure-form input[type=email],#conversejs .pure-form input[type=month],#conversejs .pure-form input[type=number],#conversejs .pure-form input[type=password],#conversejs .pure-form input[type=search],#conversejs .pure-form input[type=tel],#conversejs .pure-form input[type=text],#conversejs .pure-form input[type=time],#conversejs .pure-form input[type=url],#conversejs .pure-form input[type=week],#conversejs .pure-form select,#conversejs .pure-form textarea{padding:.5em .6em;display:inline-block;border:1px solid #ccc;box-shadow:inset 0 1px 3px #ddd;border-radius:4px;vertical-align:middle;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}#conversejs .pure-form input:not([type]){padding:.5em .6em;display:inline-block;border:1px solid #ccc;box-shadow:inset 0 1px 3px #ddd;border-radius:4px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}#conversejs .pure-form input[type=color]{padding:.2em .5em}#conversejs .pure-form input:not([type]):focus,#conversejs .pure-form input[type=color]:focus,#conversejs .pure-form input[type=date]:focus,#conversejs .pure-form input[type=datetime-local]:focus,#conversejs .pure-form input[type=datetime]:focus,#conversejs .pure-form input[type=email]:focus,#conversejs .pure-form input[type=month]:focus,#conversejs .pure-form input[type=number]:focus,#conversejs .pure-form input[type=password]:focus,#conversejs .pure-form input[type=search]:focus,#conversejs .pure-form input[type=tel]:focus,#conversejs .pure-form input[type=text]:focus,#conversejs .pure-form input[type=time]:focus,#conversejs .pure-form input[type=url]:focus,#conversejs .pure-form input[type=week]:focus,#conversejs .pure-form select:focus,#conversejs .pure-form textarea:focus{outline:0;border-color:#1A9707}#conversejs .pure-form input[type=checkbox]:focus,#conversejs .pure-form input[type=file]:focus,#conversejs .pure-form input[type=radio]:focus{outline:thin solid #1A9707;outline:1px auto #1A9707}#conversejs .pure-form .pure-checkbox,#conversejs .pure-form .pure-radio{margin:.5em 0;display:block}#conversejs .pure-form input:not([type])[disabled],#conversejs .pure-form input[type=color][disabled],#conversejs .pure-form input[type=date][disabled],#conversejs .pure-form input[type=datetime-local][disabled],#conversejs .pure-form input[type=datetime][disabled],#conversejs .pure-form input[type=email][disabled],#conversejs .pure-form input[type=month][disabled],#conversejs .pure-form input[type=number][disabled],#conversejs .pure-form input[type=password][disabled],#conversejs .pure-form input[type=search][disabled],#conversejs .pure-form input[type=tel][disabled],#conversejs .pure-form input[type=text][disabled],#conversejs .pure-form input[type=time][disabled],#conversejs .pure-form input[type=url][disabled],#conversejs .pure-form input[type=week][disabled],#conversejs .pure-form select[disabled],#conversejs .pure-form textarea[disabled]{cursor:not-allowed;background-color:#eaeded;color:#cad2d3}#conversejs .pure-form input[readonly],#conversejs .pure-form select[readonly],#conversejs .pure-form textarea[readonly]{background-color:#eee;color:#777;border-color:#ccc}#conversejs .pure-form input:focus:invalid,#conversejs .pure-form select:focus:invalid,#conversejs .pure-form textarea:focus:invalid{color:#b94a48;border-color:#e9322d}#conversejs .pure-form input[type=checkbox]:focus:invalid:focus,#conversejs .pure-form input[type=file]:focus:invalid:focus,#conversejs .pure-form input[type=radio]:focus:invalid:focus{outline-color:#e9322d}#conversejs .pure-form select{height:2.25em;border:1px solid #ccc;background-color:#fff}#conversejs .pure-form select[multiple]{height:auto}#conversejs .pure-form label{margin:.5em 0 .2em}#conversejs .pure-form fieldset{margin:0;padding:.35em 0 .75em;border:0}#conversejs .pure-form legend{display:block;width:100%;padding:.3em 0;margin-bottom:.3em;color:#333;border-bottom:1px solid #e5e5e5}#conversejs .pure-form-stacked input:not([type]),#conversejs .pure-form-stacked input[type=color],#conversejs .pure-form-stacked input[type=date],#conversejs .pure-form-stacked input[type=datetime-local],#conversejs .pure-form-stacked input[type=datetime],#conversejs .pure-form-stacked input[type=email],#conversejs .pure-form-stacked input[type=file],#conversejs .pure-form-stacked input[type=month],#conversejs .pure-form-stacked input[type=number],#conversejs .pure-form-stacked input[type=password],#conversejs .pure-form-stacked input[type=search],#conversejs .pure-form-stacked input[type=tel],#conversejs .pure-form-stacked input[type=text],#conversejs .pure-form-stacked input[type=time],#conversejs .pure-form-stacked input[type=url],#conversejs .pure-form-stacked input[type=week],#conversejs .pure-form-stacked label,#conversejs .pure-form-stacked select,#conversejs .pure-form-stacked textarea{display:block;margin:.25em 0}#conversejs .pure-form-aligned .pure-help-inline,#conversejs .pure-form-aligned input,#conversejs .pure-form-aligned select,#conversejs .pure-form-aligned textarea,#conversejs .pure-form-message-inline{display:inline-block;*display:inline;*zoom:1;vertical-align:middle}#conversejs .pure-form-aligned textarea{vertical-align:top}#conversejs .pure-form-aligned .pure-control-group{margin-bottom:.5em}#conversejs .pure-form-aligned .pure-control-group label{text-align:right;display:inline-block;vertical-align:middle;width:10em;margin:0 1em 0 0}#conversejs .pure-form-aligned .pure-controls{margin:1.5em 0 0 11em}#conversejs .pure-form .pure-input-rounded,#conversejs .pure-form input.pure-input-rounded{border-radius:2em;padding:.5em 1em}#conversejs .pure-form .pure-group fieldset{margin-bottom:10px}#conversejs .pure-form .pure-group input,#conversejs .pure-form .pure-group textarea{display:block;padding:10px;margin:0 0 -1px;border-radius:0;position:relative;top:-1px}#conversejs .pure-form .pure-group input:focus,#conversejs .pure-form .pure-group textarea:focus{z-index:3}#conversejs .pure-form .pure-group input:first-child,#conversejs .pure-form .pure-group textarea:first-child{top:1px;border-radius:4px 4px 0 0;margin:0}#conversejs .pure-form .pure-group input:first-child:last-child,#conversejs .pure-form .pure-group textarea:first-child:last-child{top:1px;border-radius:4px;margin:0}#conversejs .pure-form .pure-group input:last-child,#conversejs .pure-form .pure-group textarea:last-child{top:-2px;border-radius:0 0 4px 4px;margin:0}#conversejs .pure-form .pure-group button{margin:.35em 0}#conversejs .pure-form .pure-input-1{width:100%}#conversejs .pure-form .pure-input-3-4{width:75%}#conversejs .pure-form .pure-input-2-3{width:66%}#conversejs .pure-form .pure-input-1-2{width:50%}#conversejs .pure-form .pure-input-1-3{width:33%}#conversejs .pure-form .pure-input-1-4{width:25%}#conversejs .pure-form .pure-help-inline,#conversejs .pure-form-message-inline{display:inline-block;padding-left:.3em;color:#666;vertical-align:middle;font-size:.875em}#conversejs .pure-form-message{display:block;color:#666;font-size:.875em}@media only screen and (max-width:480px){#conversejs .pure-form button[type=submit]{margin:.7em 0 0}#conversejs .pure-form input:not([type]),#conversejs .pure-form input[type=color],#conversejs .pure-form input[type=date],#conversejs .pure-form input[type=datetime-local],#conversejs .pure-form input[type=datetime],#conversejs .pure-form input[type=email],#conversejs .pure-form input[type=month],#conversejs .pure-form input[type=number],#conversejs .pure-form input[type=password],#conversejs .pure-form input[type=search],#conversejs .pure-form input[type=tel],#conversejs .pure-form input[type=text],#conversejs .pure-form input[type=time],#conversejs .pure-form input[type=url],#conversejs .pure-form input[type=week],#conversejs .pure-form label{margin-bottom:.3em;display:block}#conversejs .pure-group input:not([type]),#conversejs .pure-group input[type=color],#conversejs .pure-group input[type=date],#conversejs .pure-group input[type=datetime-local],#conversejs .pure-group input[type=datetime],#conversejs .pure-group input[type=email],#conversejs .pure-group input[type=month],#conversejs .pure-group input[type=number],#conversejs .pure-group input[type=password],#conversejs .pure-group input[type=search],#conversejs .pure-group input[type=tel],#conversejs .pure-group input[type=text],#conversejs .pure-group input[type=time],#conversejs .pure-group input[type=url],#conversejs .pure-group input[type=week]{margin-bottom:0}#conversejs .pure-form-aligned .pure-control-group label{margin-bottom:.3em;text-align:left;display:block;width:100%}#conversejs .pure-form-aligned .pure-controls{margin:1.5em 0 0}#conversejs .pure-form .pure-help-inline,#conversejs .pure-form-message,#conversejs .pure-form-message-inline{display:block;font-size:.75em;padding:.2em 0 .8em}}#conversejs .pure-button{display:inline-block;zoom:1;line-height:normal;white-space:nowrap;vertical-align:middle;text-align:center;cursor:pointer;-webkit-user-drag:none;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;font-family:inherit;font-size:100%;padding:.5em 1em;color:#444;color:rgba(0,0,0,.8);border:1px solid #999;border:none transparent;background-color:#E6E6E6;text-decoration:none}#conversejs .pure-button-hover,#conversejs .pure-button:focus,#conversejs .pure-button:hover{filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#1a000000', GradientType=0);background-image:-webkit-gradient(linear,0 0,0 100%,from(transparent),color-stop(40%,rgba(0,0,0,.05)),to(rgba(0,0,0,.1)));background-image:-webkit-linear-gradient(transparent,rgba(0,0,0,.05)40%,rgba(0,0,0,.1));background-image:-moz-linear-gradient(top,rgba(0,0,0,.05)0,rgba(0,0,0,.1));background-image:-o-linear-gradient(transparent,rgba(0,0,0,.05)40%,rgba(0,0,0,.1));background-image:linear-gradient(transparent,rgba(0,0,0,.05)40%,rgba(0,0,0,.1))}#conversejs .pure-button:focus{outline:0}#conversejs .pure-button-active,#conversejs .pure-button:active{box-shadow:0 0 0 1px rgba(0,0,0,.15)inset,0 0 6px rgba(0,0,0,.2)inset}#conversejs .pure-button-disabled,#conversejs .pure-button-disabled:active,#conversejs .pure-button-disabled:focus,#conversejs .pure-button-disabled:hover,#conversejs .pure-button[disabled]{border:none;background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);filter:alpha(opacity=40);-khtml-opacity:.4;-moz-opacity:.4;opacity:.4;cursor:not-allowed;box-shadow:none}#conversejs .pure-button-hidden{display:none}#conversejs .pure-button::-moz-focus-inner{padding:0;border:0}#conversejs .pure-button-primary,#conversejs .pure-button-selected,#conversejs a.pure-button-primary,#conversejs a.pure-button-selected{background-color:#0078e7;color:#fff}#conversejs *,#conversejs :after,#conversejs :before{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}@media screen and (max-width:480px){#conversejs{margin:0;right:10px;left:10px;bottom:5px}}#conversejs ul li{height:auto}#conversejs a,#conversejs article,#conversejs aside,#conversejs audio,#conversejs blockquote,#conversejs canvas,#conversejs caption,#conversejs dd,#conversejs details,#conversejs div,#conversejs dl,#conversejs dt,#conversejs em,#conversejs embed,#conversejs fieldset,#conversejs figcaption,#conversejs figure,#conversejs footer,#conversejs form,#conversejs h1,#conversejs h2,#conversejs h3,#conversejs h4,#conversejs h5,#conversejs h6,#conversejs header,#conversejs hgroup,#conversejs img,#conversejs label,#conversejs legend,#conversejs li,#conversejs mark,#conversejs menu,#conversejs nav,#conversejs ol,#conversejs output,#conversejs p,#conversejs pre,#conversejs ruby,#conversejs section,#conversejs span,#conversejs strong,#conversejs summary,#conversejs table,#conversejs tbody,#conversejs td,#conversejs tfoot,#conversejs th,#conversejs thead,#conversejs time,#conversejs tr,#conversejs ul,#conversejs video{margin:0;padding:0;border:0;font:inherit;vertical-align:baseline}#conversejs button,#conversejs input[type=button],#conversejs input[type=password],#conversejs input[type=submit],#conversejs input[type=text],#conversejs textarea{font-size:14px;padding:.25em;min-height:0}#conversejs strong{font-weight:700}#conversejs ol,#conversejs ul{list-style:none}#conversejs li{height:10px}#conversejs dl,#conversejs ol,#conversejs ul{font:inherit;margin:0}#conversejs a,#conversejs a:visited{text-decoration:none;color:#2A9D8F;text-shadow:none}#conversejs{bottom:0;color:#818479;direction:ltr;display:block;font-size:14px;height:35px;position:fixed;left:0;right:0;width:auto;z-index:30}@media screen and (max-width:480px){#conversejs{width:100%;width:100vw}}#conversejs ::selection{background-color:#DCF9F6}#conversejs ::-moz-selection{background-color:#DCF9F6}#conversejs .no-text-select{-webkit-touch-callout:none;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}#conversejs .emoticon{font-size:14px}#conversejs .left{float:left}#conversejs .right{float:right}#conversejs .centered{text-align:center;display:block;margin:5em auto}#conversejs .hor_centered{text-align:center;display:block;margin:0 auto;clear:both}#conversejs .locked{padding-right:22px}@-webkit-keyframes spin{from{-webkit-transform:rotate(0deg)}to{-webkit-transform:rotate(359deg)}}@-moz-keyframes spin{from{-moz-transform:rotate(0deg)}to{-moz-transform:rotate(359deg)}}@keyframes spin{from{-webkit-transform:rotate(0deg);-moz-transform:rotate(0deg);-ms-transform:rotate(0deg);-o-transform:rotate(0deg);transform:rotate(0deg)}to{-webkit-transform:rotate(359deg);-moz-transform:rotate(359deg);-ms-transform:rotate(359deg);-o-transform:rotate(359deg);transform:rotate(359deg)}}#conversejs .spinner{-webkit-animation:spin 2s infinite,linear;-moz-animation:spin 2s infinite,linear;animation:spin 2s infinite,linear;display:block;text-align:center;margin:5px}#conversejs .spinner:before{font-size:24px;font-family:Converse-js!important;content:"\231b"}#conversejs .button-group,#conversejs .input-button-group{display:table}#conversejs .button-group{width:100%}#conversejs .input-button-group button,#conversejs .input-button-group input{display:table-cell}#conversejs .error{color:red}#conversejs .reg-feedback{font-size:85%}#conversejs #converse-login .conn-feedback,#conversejs .reg-feedback{display:block;text-align:center;width:100%}#conversejs a.restore-chat{padding:1px 0 1px 5px;color:#fff;line-height:15px;display:block;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}#conversejs a.restore-chat:visited{color:#fff}#conversejs .activated{display:block!important}#conversejs .pure-button{border-radius:4px}#conversejs .button-primary{color:#fff;background-color:#2AC611}#conversejs .button-secondary{color:#fff;background-color:#83A0D6}#conversejs .button-cancel{color:#fff;background-color:#D24E2B}#conversejs form.pure-form.converse-form{background:#fff;margin:1em}#conversejs form.pure-form.converse-form legend{color:#818479}#conversejs form.pure-form.converse-form label{margin-top:1em}#conversejs form.pure-form.converse-form input[type=button],#conversejs form.pure-form.converse-form input[type=number],#conversejs form.pure-form.converse-form input[type=password],#conversejs form.pure-form.converse-form input[type=submit],#conversejs form.pure-form.converse-form input[type=text]{height:2.2em}#conversejs form.pure-form.converse-form input[type=button],#conversejs form.pure-form.converse-form input[type=submit]{padding-left:1em;padding-right:1em;margin-right:1em}#conversejs form.pure-form.converse-form input.error{border:1px solid red;color:#818479}#conversejs form.pure-form.converse-form .form-help{color:gray;font-size:85%;padding-top:.5em}#conversejs form.pure-form.converse-form .form-help:hover{color:#818479}#conversejs .chat-textarea-chatbox-selected{border:1px solid #578308;margin:0}#conversejs .chat-textarea-chatroom-selected{border:2px solid #2A9D8F;margin:0}#conversejs .dropdown dt,#conversejs .dropdown ul{margin:0;padding:0}#conversejs .flyout{border-radius:4px;bottom:6px;display:block;position:absolute}#conversejs .chat-head{border-top-left-radius:4px;border-top-right-radius:4px;color:#fff;font-size:100%;height:55px;margin:0;padding:5px;position:relative}#conversejs .chat-head .avatar{margin-right:.5em;border-radius:50%;float:left}#conversejs .chat-head.chat-head-chatbox{background-color:#F4A261}#conversejs .chat-head .user-custom-message{clear:left;color:#fff;font-size:80%;font-style:italic;height:1.3em;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;margin:0;padding-top:.2em}#conversejs .chatbox-btn{border-radius:50%;border:1px solid #fff;color:#fff;cursor:pointer;display:inline-block;float:right;font-size:9px;margin:0;margin-right:.2em;padding:.5em .5em .3em;text-decoration:none}#conversejs .chatbox-btn:active{position:relative;top:1px}#conversejs .chatbox{display:block;float:right;height:35px;margin:0 .5em;width:200px}@media screen and (max-width:480px){#conversejs .chatbox{margin:0;width:100%}}#conversejs .chatbox .box-flyout{background-color:#fff;box-shadow:1px 3px 5px 3px rgba(0,0,0,.4);height:450px;min-height:225px;min-width:200px;width:200px;z-index:1}@media screen and (max-width:480px){#conversejs .chatbox .box-flyout{width:100%;height:99vh}}#conversejs .chatbox .chat-title{color:#fff;line-height:15px;display:block;text-overflow:ellipsis;overflow:hidden;height:2em}#conversejs .chatbox .chat-title a{color:#fff;width:100%}#conversejs .chatbox .chat-body{background-color:#fff;border-bottom-left-radius:4px;border-bottom-right-radius:4px;border-top:0;height:289px;height:-webkit-calc(100% - 55px);height:calc(100% - 55px)}#conversejs .chatbox .chat-body p{color:#818479;font-size:14px;margin:0;padding:5px}#conversejs .chatbox .chat-body .chat-info{color:#D24E2B;margin:.3em}#conversejs .chatbox .chat-body .chat-info.chat-event{clear:left;font-style:italic}#conversejs .chatbox .chat-body .chat-info.chat-error{color:#D24E2B;font-weight:700}#conversejs .chatbox .chat-body .chat-info.chat-date{display:inline-block;margin-top:2em}#conversejs .chatbox .chat-body .chat-message{margin:.3em}#conversejs .chatbox .chat-body .chat-message span{display:inline-block}#conversejs .chatbox .chat-body .chat-message span.chat-msg-author{max-width:100%;font-weight:700;white-space:nowrap;float:left;text-overflow:ellipsis;overflow:hidden}#conversejs .chatbox .chat-body .chat-message span.chat-msg-them{color:#1A9707}#conversejs .chatbox .chat-body .chat-message span.chat-msg-me{color:#2A9D8F}#conversejs .chatbox .chat-body .chat-message span.chat-msg-content{max-width:100%;word-wrap:break-word}#conversejs .chatbox .chat-body .delayed .chat-msg-them{color:#FB5D50}#conversejs .chatbox .chat-body .delayed .chat-msg-me{color:#7EABBB}#conversejs .chatbox .chat-content{position:relative;padding:.5em;font-size:13px;color:#818479;overflow-y:auto;border:0;background-color:#fff;line-height:1.3em;height:206px;height:calc(100% - 96px)}#conversejs .chatbox .dropdown{background-color:#FCFDFD}#conversejs .chatbox .dropdown dd{margin:0;padding:0;position:relative}#conversejs .chatbox form.sendXMPPMessage{-moz-background-clip:padding;-webkit-background-clip:padding-box;border-bottom-left-radius:4px;border-bottom-right-radius:4px;background:#fff;border:0;margin:0;padding:0;position:relative;height:95px;min-width:200px}@media screen and (max-width:480px){#conversejs .chatbox form.sendXMPPMessage{width:100%}}#conversejs .chatbox form.sendXMPPMessage .chat-textarea{border-bottom-left-radius:4px;border-bottom-right-radius:4px;border:0;height:70px;padding:.5em;width:100%;resize:none}#conversejs .chatbox form.sendXMPPMessage .chat-toolbar{font-size:14px;margin:0;padding:5px;height:25px;display:block;background-color:#FFF5EE}#conversejs .chatbox form.sendXMPPMessage .chat-toolbar a{color:#2A9D8F}#conversejs .chatbox form.sendXMPPMessage .chat-toolbar .chat-toolbar-text{font-size:12px;padding-right:3px;text-shadow:0 1px 0 #fff}#conversejs .chatbox form.sendXMPPMessage .chat-toolbar .unencrypted,#conversejs .chatbox form.sendXMPPMessage .chat-toolbar .unencrypted a{color:#D24E2B}#conversejs .chatbox form.sendXMPPMessage .chat-toolbar .unverified,#conversejs .chatbox form.sendXMPPMessage .chat-toolbar .unverified a{color:#cf5300}#conversejs .chatbox form.sendXMPPMessage .chat-toolbar .private,#conversejs .chatbox form.sendXMPPMessage .chat-toolbar .private a{color:#4b7003}#conversejs .chatbox form.sendXMPPMessage .chat-toolbar .toggle-clear,#conversejs .chatbox form.sendXMPPMessage .chat-toolbar .toggle-occupants,#conversejs .chatbox form.sendXMPPMessage .chat-toolbar .toggle-otr{float:right}#conversejs .chatbox form.sendXMPPMessage .chat-toolbar li{display:inline-block;list-style:none;padding:0 3px;cursor:pointer;margin-top:1px}#conversejs .chatbox form.sendXMPPMessage .chat-toolbar li:hover{cursor:pointer}#conversejs .chatbox form.sendXMPPMessage .chat-toolbar ul{background:#fff;bottom:100%;box-shadow:-1px -1px 2px 0 rgba(0,0,0,.4);display:none;font-size:12px;margin:0 0 1px;position:absolute;right:0}#conversejs .chatbox form.sendXMPPMessage .chat-toolbar ul li{cursor:pointer;list-style:none;position:relative}#conversejs .chatbox form.sendXMPPMessage .chat-toolbar ul li a:hover{color:#8f2831}#conversejs .chatbox form.sendXMPPMessage .chat-toolbar .toggle-smiley{color:#2A9D8F;padding-left:5px}#conversejs .chatbox form.sendXMPPMessage .chat-toolbar .toggle-smiley ul li{font-size:14px;padding:5px;z-index:98}#conversejs .chatbox form.sendXMPPMessage .chat-toolbar .toggle-smiley ul li:hover{background-color:#DCF9F6}#conversejs .chatbox form.sendXMPPMessage .chat-toolbar .toggle-otr ul li{padding:7px;background-color:#fff;display:block;z-index:99}#conversejs .chatbox form.sendXMPPMessage .chat-toolbar .toggle-otr ul li a{-moz-transition:background-color .2s ease-in-out;-webkit-transition:background-color .2s ease-in-out;transition:background-color .2s ease-in-out;display:block;padding:1px;text-decoration:none}#conversejs .chatbox form.sendXMPPMessage .chat-toolbar .toggle-otr ul li:hover{background-color:#DCF9F6}#conversejs .chatbox .dragresize{background:0 0;border:0;margin:0;position:absolute;top:0;z-index:20}#conversejs .chatbox .dragresize-top{cursor:n-resize;height:5px;width:100%}#conversejs .chatbox .dragresize-left{cursor:w-resize;width:5px;height:100%;left:0}#conversejs .chatbox .dragresize-topleft{cursor:nw-resize;width:15px;height:15px;top:0;left:0}#conversejs #controlbox{display:none;margin-right:1em}@media screen and (max-width:480px){#conversejs #controlbox{margin:0}}#conversejs #controlbox .controlbox-head{background-color:#577BDD;border-top-left-radius:4px;border-top-right-radius:4px;color:#fff;height:55px;margin:0;padding:6px 6px 6px 0}#conversejs #controlbox form.search-xmpp-contact{margin:0;padding:0 0 5px 5px}#conversejs #controlbox form.search-xmpp-contact input{width:8em}#conversejs #controlbox a.subscribe-to-user{padding-left:2em;font-weight:700}#conversejs #controlbox #converse-register{background:#fff}#conversejs #controlbox #converse-register .title{font-weight:700}#conversejs #controlbox #converse-register .info{font-style:italic;color:green;font-size:85%;margin:5px 0}#conversejs #controlbox #converse-register .form-errors{color:red;display:none}#conversejs #controlbox #converse-register .provider-title{font-size:22px}#conversejs #controlbox #converse-register .provider-score{width:178px;margin-bottom:8px}#conversejs #controlbox #converse-register .form-help .url{font-weight:700;color:#2A9D8F}#conversejs #controlbox #converse-register .input-group{display:table;margin:auto;width:100%}#conversejs #controlbox #converse-register .input-group span{overflow-x:hidden;text-overflow:ellipsis;max-width:110px}#conversejs #controlbox #converse-register .input-group input[name=username],#conversejs #controlbox #converse-register .input-group span{display:table-cell;text-align:left}#conversejs #controlbox #converse-register .instructions{color:gray;font-size:85%}#conversejs #controlbox #converse-register .instructions:hover{color:#818479}#conversejs #controlbox #converse-login,#conversejs #controlbox #converse-register{margin-top:2em}#conversejs #controlbox #converse-login .login-anon,#conversejs #controlbox #converse-register .login-anon{height:auto;white-space:normal}#conversejs #controlbox #converse-login .save-submit,#conversejs #controlbox #converse-register .save-submit{color:#436F64}#conversejs #controlbox #converse-login input,#conversejs #controlbox #converse-register input{width:100%;margin:.5em 0}#conversejs #controlbox #users .add-converse-contact{margin:0 1em .75em}#conversejs #controlbox #chatrooms form.add-chatroom input[type=button],#conversejs #controlbox #chatrooms form.add-chatroom input[type=submit],#conversejs #controlbox #chatrooms form.add-chatroom input[type=text]{width:100%}#conversejs #controlbox #chatrooms #available-chatrooms{padding:0 1em 2em;text-align:left}#conversejs #controlbox #chatrooms #available-chatrooms dt{border:none;color:#818479;font-weight:400;padding:0;padding-bottom:.5em;text-shadow:0 1px 0 #FAFAFA}#conversejs #controlbox #chatrooms #available-chatrooms dd.available-chatroom{border:none;clear:both;color:#818479;display:block;overflow:hidden;padding:.4em;text-shadow:0 1px 0 #FAFAFA;word-wrap:break-word}#conversejs #controlbox #chatrooms #available-chatrooms dd.available-chatroom:hover{background-color:#DCF9F6}#conversejs #controlbox #chatrooms #available-chatrooms dd.available-chatroom a.room-info{clear:right;display:block}#conversejs #controlbox #chatrooms #available-chatrooms dd.available-chatroom a.room-info:before{font-size:15px}#conversejs #controlbox #chatrooms #available-chatrooms dd.available-chatroom a.open-room{float:left;width:85%}#conversejs #controlbox #chatrooms #available-chatrooms dd.available-chatroom .room-info{font-size:11px;font-style:normal;font-weight:400}#conversejs #controlbox #chatrooms #available-chatrooms dd.available-chatroom li.room-info{display:block;margin-left:5px}#conversejs #controlbox #chatrooms #available-chatrooms dd.available-chatroom p.room-info{margin:0;padding:0;display:block;white-space:normal}#conversejs #controlbox #chatrooms #available-chatrooms dd.available-chatroom div.room-info{clear:left;width:100%}#conversejs #controlbox .dropdown a{width:148px;display:inline-block;line-height:25px}#conversejs #controlbox .dropdown li{list-style:none;padding-left:0}#conversejs #controlbox .dropdown dd ul{padding:0;list-style:none;position:absolute;left:0;top:0;border:1px solid #B1BFC4;width:100%;z-index:21;background-color:#FCFDFD}#conversejs #controlbox .dropdown dd ul li:hover{background-color:#DCF9F6}#conversejs #controlbox .dropdown dd.search-xmpp ul{box-shadow:1px 4px 10px 1px rgba(0,0,0,.4)}#conversejs #controlbox .dropdown dd.search-xmpp ul li:hover{background-color:#FCFDFD}#conversejs #controlbox .dropdown dt a span{cursor:pointer;display:block;padding:4px 7px 0 5px}#conversejs #controlbox #select-xmpp-status{float:right;margin-right:.5em}#conversejs #controlbox #set-custom-xmpp-status{float:left;padding:0}#conversejs #controlbox #set-custom-xmpp-status fieldset{padding:0;margin-top:-1px}#conversejs #controlbox #set-custom-xmpp-status input{height:26px;width:-webkit-calc(100% - 40px);width:calc(100% - 40px);padding:0 0 0 .5em}#conversejs #controlbox #set-custom-xmpp-status input[type=submit]{height:26px;width:40px;padding:1px;float:right}#conversejs #controlbox #controlbox-tabs{text-align:center;display:inline;overflow:hidden;font-size:12px;list-style-type:none}#conversejs #controlbox #controlbox-tabs li{float:left;list-style:none;padding-left:0;text-shadow:#fff 0 1px 0;width:38%}#conversejs #controlbox #controlbox-tabs li a{background-color:#fff;border-bottom:1px solid #CCC;border-top-left-radius:4px;border-top-right-radius:4px;box-shadow:inset 2px -2px 20px rgba(0,0,0,.3);color:#818479;display:block;font-size:12px;height:54px;line-height:54px;margin:0;text-align:center;text-decoration:none}#conversejs #controlbox #controlbox-tabs li a:hover{color:#818479}#conversejs #controlbox #controlbox-tabs li a.current,#conversejs #controlbox #controlbox-tabs li a.current:hover{box-shadow:none;border-bottom:0;height:55px;cursor:default;color:#818479}#conversejs #controlbox .fancy-dropdown{border:1px solid #B1BFC4;height:25px;border-radius:4px;text-align:left;padding:0;padding-left:.3em}#conversejs #controlbox .fancy-dropdown .choose-xmpp-status{width:155px}#conversejs #controlbox .fancy-dropdown .choose-xmpp-status,#conversejs #controlbox .fancy-dropdown .toggle-xmpp-contact-form{text-shadow:0 1px 0 #fff;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;display:inline}#conversejs #controlbox .fancy-dropdown.no-border{border:0}#conversejs #controlbox #fancy-xmpp-status-select{padding-left:0}#conversejs #controlbox #fancy-xmpp-status-select .xmpp-status{margin-left:.3em;display:inline}#conversejs #controlbox #fancy-xmpp-status-select a.change-xmpp-status-message{float:right;clear:right;width:12px;margin-right:.3em;color:#2A9D8F}#conversejs #controlbox .controlbox-pane{background-color:#fff;border-bottom-left-radius:4px;border-bottom-right-radius:4px;border:0;font-size:14px;position:absolute;text-align:center;width:100%;height:289px;height:-webkit-calc(100% - 55px);height:calc(100% - 55px);overflow-y:auto;overflow-x:hidden}#conversejs #controlbox .controlbox-pane label{font-size:14px;font-weight:700;height:auto;margin:4px}#conversejs #controlbox .controlbox-pane dd{margin-left:0;margin-bottom:0}#conversejs #controlbox .controlbox-pane dd.odd{background-color:#DCEAC5}#conversejs #controlbox #users{overflow-y:hidden}#conversejs #controlbox .add-xmpp-contact{background:0 0;padding:1em}#conversejs #controlbox .add-xmpp-contact input{margin:0 0 1rem;width:100%}#conversejs #controlbox .add-xmpp-contact button{width:100%}#conversejs #controlbox .xmpp-status-menu{text-align:left;box-shadow:1px 4px 10px 1px rgba(0,0,0,.4)}#conversejs #controlbox .xmpp-status-menu li{padding:2px}#conversejs #controlbox .xmpp-status-menu li a{width:100%;padding:0 8px}#conversejs #controlbox .xmpp-status-menu li a.logout,#conversejs #controlbox .xmpp-status-menu li a.logout span{color:#D24E2B}#conversejs #controlbox .set-xmpp-status{background:0 0;margin:1em 1em .5em}#conversejs #controlbox .set-xmpp-status .dropdown dd ul{z-index:22}#conversejs .toggle-controlbox{background-color:#2A9D8F;border-top-left-radius:4px;border-top-right-radius:4px;color:#0a0a0a;float:right;height:100%;margin:0 .5em;padding:10px 8px 0}#conversejs .toggle-controlbox span{color:#fff}#conversejs #converse-roster{text-align:left;width:100%;position:relative;margin:1em 0 0;height:194px;height:calc(100% - 50px - 20px);overflow:hidden;padding:0;padding-bottom:3em}#conversejs #converse-roster.no-contact-requests{height:calc(100% - 25px - 20px)}#conversejs #converse-roster .search-xmpp ul li.chat-info{padding-left:10px}#conversejs #converse-roster .roster-filter-group{margin:0 1em;width:100%;padding-right:2em}#conversejs #converse-roster .roster-filter-group .roster-filter{float:left;background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAcAAAAHCAYAAADEUlfTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAIGNIUk0AAHolAACAgwAA+f8AAIDpAAB1MAAA6mAAADqYAAAXb5JfxUYAAABNSURBVHjaXI7BDcAwCAMvyQjMyQ6dAbZiKfqoUK34g2zJh1dENIC7M8pMAPYdzAVY3d0ajNz9aypS/b5R6o+ZPdqoKgCq6h80KH3xDgBqNR97p8oAGQAAAABJRU5ErkJggg==) no-repeat right -20px center;border:1px solid #999;font-size:14px;height:25px;margin:0;padding:0;padding-left:.4em;width:53%}#conversejs #converse-roster .roster-filter-group .roster-filter.x{background-position:right 3px center}#conversejs #converse-roster .roster-filter-group .roster-filter.onX{cursor:pointer}#conversejs #converse-roster .roster-filter-group .filter-type{display:table-cell;float:right;font-size:calc(14px - 2px);height:25px;padding:0;width:47%;border-radius:0;border:1px solid}#conversejs #converse-roster .roster-contacts{margin:0;height:100%;overflow-x:hidden;overflow-y:auto}#conversejs #converse-roster .roster-contacts dt.roster-group{border:none;color:#818479;display:none;font-weight:400;margin-top:.5em;padding:.5em 1em;text-shadow:0 1px 0 #FAFAFA}#conversejs #converse-roster .roster-contacts dt.roster-group:hover{background-color:#DCF9F6}#conversejs #converse-roster .roster-contacts dt.roster-group .group-toggle{color:#818479;display:block;width:100%}#conversejs #converse-roster .roster-contacts dd{border:none;clear:both;color:#818479;display:block;height:24px;overflow-y:hidden;padding:.3em 0 .3em 1em;text-shadow:0 1px 0 #FAFAFA;line-height:14px;width:100%}#conversejs #converse-roster .roster-contacts dd .open-chat{max-width:90%}#conversejs #converse-roster .roster-contacts dd:hover{background-color:#DCF9F6}#conversejs #converse-roster .roster-contacts dd:hover .remove-xmpp-contact{display:inline-block}#conversejs #converse-roster .roster-contacts dd:hover .open-chat{width:80%}#conversejs #converse-roster .roster-contacts dd.requesting-xmpp-contact.request-actions{margin-left:.5em;margin-bottom:.3em;float:right}#conversejs #converse-roster .roster-contacts dd.requesting-xmpp-contact .req-contact-name{width:69%;padding:0}#conversejs #converse-roster .roster-contacts dd.current-xmpp-contact span{font-size:16px;float:left;color:#2A9D8F}#conversejs #converse-roster .roster-contacts dd.odd{background-color:#DCEAC5}#conversejs #converse-roster .roster-contacts dd a,#conversejs #converse-roster .roster-contacts dd span{text-shadow:0 1px 0 #FAFAFA;display:inline-block;overflow:hidden;white-space:nowrap;text-overflow:ellipsis}#conversejs #converse-roster .roster-contacts dd span{padding:0 .5em 0 0;height:100%}#conversejs #converse-roster .roster-contacts dd a.decline-xmpp-request{margin-left:5px}#conversejs #converse-roster .roster-contacts dd a.remove-xmpp-contact{float:right;margin-right:1em;display:none;color:#818479}#conversejs #converse-roster span.pending-contact-name{width:80%}#conversejs .chat-head-chatroom{background-color:#E76F51}#conversejs .chat-head-chatroom .chatroom-topic{color:#fff;font-size:80%;font-style:italic;height:1.3em;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;margin:0;margin-top:.3em}#conversejs .chatroom{width:300px}@media screen and (max-width:480px){#conversejs .chatroom{width:100%}#conversejs .chatroom .box-flyout{min-width:100%;width:100%}}#conversejs .chatroom .box-flyout{min-width:300px;width:300px}#conversejs .chatroom .box-flyout .chatroom-body{border-bottom-left-radius:4px;border-bottom-right-radius:4px;height:-webkit-calc(100% - 55px);height:calc(100% - 55px);background-color:#fff;border-top:0;width:100%}#conversejs .chatroom .box-flyout .chatroom-body .chat-area{word-wrap:break-word;height:100%;max-width:70%;float:left;min-width:200px}#conversejs .chatroom .box-flyout .chatroom-body .chat-area .chat-content{padding:0 .5em}#conversejs .chatroom .box-flyout .chatroom-body .chat-area.full{max-width:100%}#conversejs .chatroom .box-flyout .chatroom-body .mentioned{font-weight:700}#conversejs .chatroom .box-flyout .chatroom-body .chat-msg-room{color:#1A9707}#conversejs .chatroom .box-flyout .chatroom-body .occupants{vertical-align:top;background-color:#fff;overflow:hidden;border-left:1px solid #818479;border-bottom-right-radius:4px;min-width:30%;height:100%}#conversejs .chatroom .box-flyout .chatroom-body .occupants.hidden{display:none}#conversejs .chatroom .box-flyout .chatroom-body .occupants .occupants-heading{padding:.3em;font-weight:700}#conversejs .chatroom .box-flyout .chatroom-body .occupants .occupant-list{height:85%;height:calc(100% - 70px);overflow-x:hidden;overflow-y:auto;list-style:none}#conversejs .chatroom .box-flyout .chatroom-body .occupants .occupant-list li{cursor:default;display:block;font-size:12px;overflow:hidden;padding:2px 5px;text-overflow:ellipsis;white-space:nowrap;width:100px}#conversejs .chatroom .box-flyout .chatroom-body .occupants .occupant-list li.moderator{color:#D24E2B}#conversejs .chatroom .box-flyout .chatroom-body .chatroom-form-container{background-color:#fff;border-bottom-left-radius:4px;border-bottom-right-radius:4px;border:0;color:#818479;font-size:14px;height:289px;height:-webkit-calc(100% - 55px);height:calc(100% - 55px);overflow-y:auto;position:absolute}#conversejs .chatroom .chat-textarea{border-bottom-right-radius:0}#conversejs .chatroom .room-invite{margin:.3em}#conversejs .chatroom .room-invite .invited-contact{margin:-1px 0 0 -1px;width:100%;border:1px solid #999}#conversejs .chatroom .room-invite .invited-contact.tt-input{width:100%;background:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAOCAYAAAAfSC3RAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3gkBCjE0uzKkOgAAAidJREFUKM+N0k+IEnEUB/D3cyscdagkWpHV0WGWREXm0AgOGkSJ07kh2UXYU5cOewm6Bp0KXG/tpSCv6hyEFQIhMEaE3yERYfwTOoqKGLQxDAbqYadLgu7J7/XxeY/3ez8EACDLsgljfMfj8ZxUKhXXYDAAnueBoqgyAMipVOovXAuSZdnUaDQeDofDs16vFyUIAjRNUwmCoG02G1AUdZ5IJN7GYrHfm3AvEAjcnUwmX0ajUdRqtV74fL6sruufKYoa6bp+fzabPUMI7ZfL5eImNHk8npNerxc1m80XHMe98fv9H3K5XDkSibxjWfb1arWaYoyPMMbCFqxUKi6CIODw8LDmdDq7oigaAACiKK5omv7KcdylpmlIkiTHFlRVFTRNUxVFqa/ROqIoGoqi5A3DgFartfU4Jp7ngSAI2uVyPZIk6dZmUZKk2w6H4xghBPF4HK7vWLbZbDCdTp+rqvpUkiS0RvV6/bTf7x8wDHMViURqm/AGAMgURZ232+1X1Wr102KxuEwmk3lZlo/7/f7BcrkkSZKs2e12tHXH/x/gHsY4jTE+0jQNGYYBCCFgGOaKJMkfjUaDZximGQ6HXzSbzZ+ZTMbY6oIxFgqFgqPT6YAgCMBxXM1ut6N0Op0fj8chi8XyjWXZ98Fg8DuCHZLNZh+USqWP8/n8idvt/hUKhV7u7QK9Xu8fmqanAJBQVXUfAGY7TQQAKBaLN8fjsdDtdh/run72Dzhf7XLe2UevAAAAAElFTkSuQmCC) no-repeat right 3px center}#conversejs .chatroom .room-invite .invited-contact.tt-input:focus{border-color:#E76F51}#conversejs .chatroom .room-invite .invited-contact.tt-hint{color:transparent;background-color:#fff}#conversejs .chatroom .room-invite .tt-dropdown-menu{width:96%;max-height:250px;background:#E76F51;border-bottom-right-radius:4px;border-bottom-left-radius:4px;overflow-y:auto}#conversejs .chatroom .room-invite .tt-dropdown-menu .tt-suggestion p{color:#fff;cursor:pointer;font-size:11px;text-overflow:ellipsis;overflow-x:hidden}#conversejs .chatroom .room-invite .tt-dropdown-menu .tt-suggestion p:hover{background-color:#FF977C}#conversejs .chatroom .room-invite .tt-dropdown-menu .tt-suggestion .tt-highlight{background-color:#D24E2B}#conversejs #minimized-chats{border-top-left-radius:4px;border-top-right-radius:4px;color:#fff;display:none;float:right;font-weight:700;height:100%;margin:0 .5em;padding:0;width:130px}#conversejs #minimized-chats #toggle-minimized-chats{border-top-left-radius:4px;border-top-right-radius:4px;background-color:#2A9D8F;color:#fff;position:relative;padding:10px 0 0;display:block;width:100%;height:100%;text-align:center}#conversejs #minimized-chats .minimized-chats-flyout{height:auto;bottom:35px}#conversejs #minimized-chats .minimized-chats-flyout .chat-head{padding:.3em;border-radius:4px;width:130px;height:35px;margin-bottom:.2em;box-shadow:1px 3px 5px 3px rgba(0,0,0,.4)}#conversejs #minimized-chats .minimized-chats-flyout.minimized{height:auto}#conversejs #minimized-chats .chat-head-message-count,#conversejs #minimized-chats .unread-message-count{font-weight:700;background-color:#fff;border:1px solid;text-shadow:1px 1px 0 #FAFAFA;color:#D24E2B;border-radius:5px;padding:2px 4px;font-size:16px;text-align:center;position:absolute;right:116px;bottom:10px}
\ No newline at end of file
diff --git a/xmpp/converse/css/images/arrow.svg b/xmpp/converse/css/images/arrow.svg
new file mode 100644
index 00000000..54ce35b5
--- /dev/null
+++ b/xmpp/converse/css/images/arrow.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="24px" height="12px" viewBox="0 0 24 12" zoomAndPan="disable">
+	<line x1="0" y1="0" x2="12" y2="12" style="stroke:#ccc;stroke-width:1.5" />
+	<line x1="24" y1="0" x2="12" y2="12" style="stroke:#ccc;stroke-width:1.5" />
+</svg>
\ No newline at end of file
diff --git a/xmpp/converse/css/images/bgbl.svg b/xmpp/converse/css/images/bgbl.svg
new file mode 100644
index 00000000..d3e960b6
--- /dev/null
+++ b/xmpp/converse/css/images/bgbl.svg
@@ -0,0 +1,26 @@
+<!--
+	Tessellate 1.0 by HTML5 UP
+	html5up.net | @n33co
+	Free for personal and commercial use under the CCA 3.0 license (html5up.net/license)
+-->
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="1000px" height="1000px" viewBox="0 0 1000 1000" zoomAndPan="disable">
+    <style type="text/css"><![CDATA[
+		line
+		{
+			stroke: rgba(255,255,255,0.1);
+			stroke-width: 0.85px;
+		}
+    ]]></style>
+	<line x1="-180" y1="0" x2="820" y2="1000" />
+	<line x1="-380" y1="0" x2="620" y2="1000" />
+	<line x1="-530" y1="0" x2="470" y2="1000" />
+	<line x1="-655" y1="0" x2="345" y2="1000" />
+	<line x1="-755" y1="0" x2="245" y2="1000" />
+	<line x1="-830" y1="0" x2="170" y2="1000" />
+	<line x1="-880" y1="0" x2="120" y2="1000" />
+	<line x1="-920" y1="0" x2="80" y2="1000" />
+	<line x1="-950" y1="0" x2="50" y2="1000" />
+	<line x1="-970" y1="0" x2="30" y2="1000" />
+	<line x1="-985" y1="0" x2="15" y2="1000" />
+	<line x1="-995" y1="0" x2="5" y2="1000" />
+</svg>
\ No newline at end of file
diff --git a/xmpp/converse/css/images/bgtr.svg b/xmpp/converse/css/images/bgtr.svg
new file mode 100644
index 00000000..b0b7d47c
--- /dev/null
+++ b/xmpp/converse/css/images/bgtr.svg
@@ -0,0 +1,26 @@
+<!--
+	Tessellate 1.0 by HTML5 UP
+	html5up.net | @n33co
+	Free for personal and commercial use under the CCA 3.0 license (html5up.net/license)
+-->
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="1000px" height="1000px" viewBox="0 0 1000 1000" zoomAndPan="disable">
+    <style type="text/css"><![CDATA[
+		line
+		{
+			stroke: rgba(255,255,255,0.1);
+			stroke-width: 0.85px;
+		}
+    ]]></style>
+	<line x1="180" y1="0" x2="1180" y2="1000" />
+	<line x1="380" y1="0" x2="1380" y2="1000" />
+	<line x1="530" y1="0" x2="1530" y2="1000" />
+	<line x1="655" y1="0" x2="1655" y2="1000" />
+	<line x1="755" y1="0" x2="1775" y2="1000" />
+	<line x1="830" y1="0" x2="1830" y2="1000" />
+	<line x1="880" y1="0" x2="1880" y2="1000" />
+	<line x1="920" y1="0" x2="1920" y2="1000" />
+	<line x1="950" y1="0" x2="1970" y2="1000" />
+	<line x1="970" y1="0" x2="1970" y2="1000" />
+	<line x1="985" y1="0" x2="1985" y2="1000" />
+	<line x1="995" y1="0" x2="1995" y2="1000" />
+</svg>
\ No newline at end of file
diff --git a/xmpp/converse/css/images/bitcoin_qr_code.png b/xmpp/converse/css/images/bitcoin_qr_code.png
new file mode 100644
index 00000000..d7d063d4
Binary files /dev/null and b/xmpp/converse/css/images/bitcoin_qr_code.png differ
diff --git a/xmpp/converse/css/images/dark-arrow.svg b/xmpp/converse/css/images/dark-arrow.svg
new file mode 100644
index 00000000..addd619b
--- /dev/null
+++ b/xmpp/converse/css/images/dark-arrow.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="24px" height="12px" viewBox="0 0 24 12" zoomAndPan="disable">
+	<line x1="0" y1="0" x2="12" y2="12" style="stroke:rgba(255,255,255,0.65);stroke-width:1" />
+	<line x1="24" y1="0" x2="12" y2="12" style="stroke:rgba(255,255,255,0.65);stroke-width:1" />
+</svg>
\ No newline at end of file
diff --git a/xmpp/converse/css/images/header.jpg b/xmpp/converse/css/images/header.jpg
new file mode 100644
index 00000000..c98ab88a
Binary files /dev/null and b/xmpp/converse/css/images/header.jpg differ
diff --git a/xmpp/converse/css/images/overlay.png b/xmpp/converse/css/images/overlay.png
new file mode 100644
index 00000000..dfbadc3c
Binary files /dev/null and b/xmpp/converse/css/images/overlay.png differ
diff --git a/xmpp/converse/css/images/user.png b/xmpp/converse/css/images/user.png
new file mode 100644
index 00000000..0a431713
Binary files /dev/null and b/xmpp/converse/css/images/user.png differ
diff --git a/xmpp/converse/css/theme.css b/xmpp/converse/css/theme.css
new file mode 100644
index 00000000..20afb3a7
--- /dev/null
+++ b/xmpp/converse/css/theme.css
@@ -0,0 +1,341 @@
+body {
+  width: 100%;
+  height: 100%;
+  font-family: "Lora", "Helvetica Neue", Helvetica, Arial, sans-serif;
+  color: #ffffff;
+  background-color: #211018;
+}
+html {
+  width: 100%;
+  height: 100%;
+}
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
+  margin: 0 0 35px;
+  font-family: "Montserrat", "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-weight: 700;
+  letter-spacing: 1px;
+}
+h1 {
+  text-transform: uppercase;
+}
+p {
+  margin: 0 0 25px;
+  font-size: 18px;
+  line-height: 1.5;
+}
+@media (min-width: 767px) {
+  p {
+    margin: 0 0 35px;
+    font-size: 20px;
+    line-height: 1.6;
+  }
+}
+a {
+  color: #82B397;
+  -webkit-transition: all 0.2s ease-in-out;
+  -moz-transition: all 0.2s ease-in-out;
+  transition: all 0.2s ease-in-out;
+}
+a:hover,
+a:focus {
+  text-decoration: none;
+  color: #00aaff;
+}
+.light {
+  font-weight: 400;
+}
+.navbar {
+  margin-bottom: 0;
+  border-bottom: 1px solid rgba(255, 255, 255, 0.3);
+  text-transform: uppercase;
+  font-family: "Montserrat", "Helvetica Neue", Helvetica, Arial, sans-serif;
+  background-color: #211018;
+}
+.navbar-brand {
+  font-weight: 700;
+}
+.navbar-brand:focus {
+  outline: none;
+}
+.navbar-custom a {
+  color: #ffffff;
+}
+.navbar-custom .nav li a {
+  -webkit-transition: background 0.3s ease-in-out;
+  -moz-transition: background 0.3s ease-in-out;
+  transition: background 0.3s ease-in-out;
+}
+.navbar-custom .nav li a:hover,
+.navbar-custom .nav li a:focus,
+.navbar-custom .nav li.active {
+  outline: none;
+  background-color: rgba(255, 255, 255, 0.2);
+}
+.navbar-toggle {
+  padding: 4px 6px;
+  font-size: 16px;
+  color: #ffffff;
+}
+.navbar-toggle:focus,
+.navbar-toggle:active {
+  outline: none;
+}
+@media (min-width: 767px) {
+  .navbar {
+    padding: 20px 0;
+    border-bottom: none;
+    letter-spacing: 1px;
+    background: transparent;
+    -webkit-transition: background 0.5s ease-in-out, padding 0.5s ease-in-out;
+    -moz-transition: background 0.5s ease-in-out, padding 0.5s ease-in-out;
+    transition: background 0.5s ease-in-out, padding 0.5s ease-in-out;
+  }
+  .top-nav-collapse {
+    padding: 0;
+    background-color: #211018;
+  }
+  .navbar-custom.top-nav-collapse {
+    border-bottom: 1px solid rgba(255, 255, 255, 0.3);
+  }
+}
+@media (max-width: 480px) {
+    .navbar {
+        display: none;
+    }
+}
+
+
+.features-section,
+.outro,
+.intro {
+  width: 100%;
+  padding: 100px 0;
+  text-align: center;
+  color: #fff;
+}
+.intro {
+  background: url(images/header.jpg) no-repeat bottom center scroll;
+  background-color: #211018;
+  -webkit-background-size: cover;
+  -moz-background-size: cover;
+  background-size: cover;
+  -o-background-size: cover;
+}
+.features-section {
+  background: url('images/bgtr.svg') top right no-repeat, url('images/bgbl.svg') bottom left no-repeat, url('images/bgbl.svg') bottom left no-repeat, url('images/overlay.png'), linear-gradient(45deg, #85505f, #384955, #655361);
+}
+.features-section a {
+  color: #82B397;
+}
+.outro {
+  background: url('images/bgtr.svg') top right no-repeat, url('images/bgbl.svg') bottom left no-repeat, url('images/overlay.png'), linear-gradient(45deg, #384955, #655361, #85505f);
+}
+.brand-heading {
+  font-size: 2em;
+  text-align: center;
+  margin-top: 3em;
+}
+.intro-text {
+  font-size: 18px;
+}
+@media (min-width: 767px) {
+  .intro {
+    height: 100%;
+    padding: 0;
+  }
+  .brand-heading {
+    font-size: 80px;
+  }
+  .intro-text {
+    font-size: 25px;
+  }
+}
+.btn-circle {
+  width: 70px;
+  height: 70px;
+  margin-top: 15px;
+  padding: 7px 16px;
+  border: 2px solid #ffffff;
+  border-radius: 35px;
+  font-size: 40px;
+  color: #ffffff;
+  background: transparent;
+  -webkit-transition: background 0.3s ease-in-out;
+  -moz-transition: background 0.3s ease-in-out;
+  transition: background 0.3s ease-in-out;
+}
+.btn-circle:hover,
+.btn-circle:focus {
+  outline: none;
+  color: #ffffff;
+  background: rgba(255, 255, 255, 0.1);
+}
+.page-scroll .btn-circle i.animated {
+  -webkit-transition-property: -webkit-transform;
+  -webkit-transition-duration: 1s;
+  -moz-transition-property: -moz-transform;
+  -moz-transition-duration: 1s;
+}
+.page-scroll .btn-circle:hover i.animated {
+  -webkit-animation-name: pulse;
+  -moz-animation-name: pulse;
+  -webkit-animation-duration: 1.5s;
+  -moz-animation-duration: 1.5s;
+  -webkit-animation-iteration-count: infinite;
+  -moz-animation-iteration-count: infinite;
+  -webkit-animation-timing-function: linear;
+  -moz-animation-timing-function: linear;
+}
+/*
+@-webkit-keyframes pulse {
+  0 {
+    -webkit-transform: scale(1);
+    transform: scale(1);
+  }
+  50% {
+    -webkit-transform: scale(1.2);
+    transform: scale(1.2);
+  }
+  100% {
+    -webkit-transform: scale(1);
+    transform: scale(1);
+  }
+}
+@-moz-keyframes pulse {
+  0 {
+    -moz-transform: scale(1);
+    transform: scale(1);
+  }
+  50% {
+    -moz-transform: scale(1.2);
+    transform: scale(1.2);
+  }
+  100% {
+    -moz-transform: scale(1);
+    transform: scale(1);
+  }
+}
+*/
+.content-section {
+  padding-top: 100px;
+}
+.donate-section {
+  width: 100%;
+  padding: 50px 0;
+  color: #ffffff;
+  background-color: #211018;
+}
+.donate-section p.bitcoin-header {
+  margin: 0 0 5px;
+}
+@media (min-width: 767px) {
+  .content-section {
+    padding-top: 150px;
+    padding-bottom: 50px;
+  }
+  .donate-section {
+    padding: 100px 0;
+  }
+}
+.btn {
+  text-transform: uppercase;
+  font-family: FontAwesome;
+  font-weight: 400;
+  -webkit-transition: all 0.3s ease-in-out;
+  -moz-transition: all 0.3s ease-in-out;
+  transition: all 0.3s ease-in-out;
+}
+.btn-default {
+  border: 1px solid #82B397;
+  color: #82B397;
+  background-color: transparent;
+}
+.btn-default:hover,
+.btn-default:focus {
+  border: 1px solid #82B397;
+  outline: none;
+  color: #211018;
+  background-color: #82B397;
+}
+.btn-huge {
+  padding: 25px;
+  font-size: 26px;
+}
+.banner-social-buttons {
+    padding-top: 7em;
+}
+::-moz-selection {
+  text-shadow: none;
+  background: #fcfcfc;
+  background: rgba(255, 255, 255, 0.2);
+}
+::selection {
+  text-shadow: none;
+  background: #fcfcfc;
+  background: rgba(255, 255, 255, 0.2);
+}
+img::selection {
+  background: transparent;
+}
+img::-moz-selection {
+  background: transparent;
+}
+body {
+  webkit-tap-highlight-color: rgba(255, 255, 255, 0.2);
+}
+ul.contact,
+ul.integration,
+ul.screencasts,
+ul.features {
+  text-align: left;
+  font-size: 19px;
+}
+.feature-icon {
+  display: inline-block;
+  position: relative;
+  padding-bottom: 5em;
+  margin-bottom: 2.75em;
+  cursor: default;
+  color: #fff;
+}
+.feature-icon .fa {
+  display: inline-block;
+  width: 2em;
+  height: 2em;
+  font-size: 4em;
+  border-radius: 100%;
+  box-shadow: inset 0 0 0 1px white;
+  color: white;
+  line-height: 2.1em;
+}
+.feature-icon:before {
+  content: '';
+  background: white;
+  position: absolute;
+  bottom: 0;
+  left: 50%;
+  margin-left: -0.325em;
+  width: 0.65em;
+  height: 0.65em;
+  display: block;
+  border-radius: 100%;
+}
+.feature-icon:after {
+  content: '';
+  position: absolute;
+  left: 50%;
+  bottom: 0.65em;
+  width: 1px;
+  height: 4.35em;
+  background: white;
+  margin-left: -0.5px;
+}
+.row {
+    margin-left: 0;
+    margin-right: 0;
+}
diff --git a/xmpp/converse/fonticons/Read Me.txt b/xmpp/converse/fonticons/Read Me.txt
new file mode 100644
index 00000000..cd97d24a
--- /dev/null
+++ b/xmpp/converse/fonticons/Read Me.txt	
@@ -0,0 +1,5 @@
+Open *demo.html* to see a list of all the glyphs in your font along with their codes/ligatures.
+
+You won't need any of the files located under the *demo-files* directory when including the generated font in your own projects.
+
+You can import *selection.json* back to the IcoMoon app using the *Import Icons* button (or via Main Menu > Manage Projects) to retrieve your icon selection.
diff --git a/xmpp/converse/fonticons/demo-files/demo.css b/xmpp/converse/fonticons/demo-files/demo.css
new file mode 100644
index 00000000..b8140981
--- /dev/null
+++ b/xmpp/converse/fonticons/demo-files/demo.css
@@ -0,0 +1,150 @@
+body {
+	padding: 0;
+	margin: 0;
+	font-family: sans-serif;
+	font-size: 1em;
+	line-height: 1.5;
+	color: #555;
+	background: #fff;
+}
+h1 {
+	font-size: 1.5em;
+	font-weight: normal;
+}
+small {
+	font-size: .66666667em;
+}
+a {
+	color: #e74c3c;
+	text-decoration: none;
+}
+a:hover, a:focus {
+	box-shadow: 0 1px #e74c3c;
+}
+.bshadow0, input {
+	box-shadow: inset 0 -2px #e7e7e7;
+}
+input:hover {
+	box-shadow: inset 0 -2px #ccc;
+}
+input, fieldset {
+	font-size: 1em;
+	margin: 0;
+	padding: 0;
+	border: 0;
+}
+input {
+	color: inherit;
+	line-height: 1.5;
+	height: 1.5em;
+	padding: .25em 0;
+}
+input:focus {
+	outline: none;
+	box-shadow: inset 0 -2px #449fdb;
+}
+.glyph {
+	font-size: 16px;
+	width: 15em;
+	padding-bottom: 1em;
+	margin-right: 4em;
+	margin-bottom: 1em;
+	float: left;
+	overflow: hidden;
+}
+.liga {
+	width: 80%;
+	width: calc(100% - 2.5em);
+}
+.talign-right {
+	text-align: right;
+}
+.talign-center {
+	text-align: center;
+}
+.bgc1 {
+	background: #f1f1f1;
+}
+.fgc1 {
+	color: #999;
+}
+.fgc0 {
+	color: #000;
+}
+p {
+	margin-top: 1em;
+	margin-bottom: 1em;
+}
+.mvm {
+	margin-top: .75em;
+	margin-bottom: .75em;
+}
+.mtn {
+	margin-top: 0;
+}
+.mtl, .mal {
+	margin-top: 1.5em;
+}
+.mbl, .mal {
+	margin-bottom: 1.5em;
+}
+.mal, .mhl {
+	margin-left: 1.5em;
+	margin-right: 1.5em;
+}
+.mhmm {
+	margin-left: 1em;
+	margin-right: 1em;
+}
+.mls {
+	margin-left: .25em;
+}
+.ptl {
+	padding-top: 1.5em;
+}
+.pbs, .pvs {
+	padding-bottom: .25em;
+}
+.pvs, .pts {
+	padding-top: .25em;
+}
+.unit {
+	float: left;
+}
+.unitRight {
+	float: right;
+}
+.size1of2 {
+	width: 50%;
+}
+.size1of1 {
+	width: 100%;
+}
+.clearfix:before, .clearfix:after {
+	content: " ";
+	display: table;
+}
+.clearfix:after {
+	clear: both;
+}
+.hidden-true {
+	display: none;
+}
+.textbox0 {
+	width: 3em;
+	background: #f1f1f1;
+	padding: .25em .5em;
+	line-height: 1.5;
+	height: 1.5em;
+}
+#testDrive {
+	display: block;
+	padding-top: 24px;
+	line-height: 1.5;
+}
+.fs0 {
+	font-size: 16px;
+}
+.fs1 {
+	font-size: 32px;
+}
diff --git a/xmpp/converse/fonticons/demo-files/demo.js b/xmpp/converse/fonticons/demo-files/demo.js
new file mode 100644
index 00000000..e72f449b
--- /dev/null
+++ b/xmpp/converse/fonticons/demo-files/demo.js
@@ -0,0 +1,30 @@
+if (!('boxShadow' in document.body.style)) {
+	document.body.setAttribute('class', 'noBoxShadow');
+}
+
+document.body.addEventListener("click", function(e) {
+	var target = e.target;
+	if (target.tagName === "INPUT" &&
+		target.getAttribute('class').indexOf('liga') === -1) {
+		target.select();
+	}
+});
+
+(function() {
+	var fontSize = document.getElementById('fontSize'),
+		testDrive = document.getElementById('testDrive'),
+		testText = document.getElementById('testText');
+	function updateTest() {
+		testDrive.innerHTML = testText.value || String.fromCharCode(160);
+		if (window.icomoonLiga) {
+			window.icomoonLiga(testDrive);
+		}
+	}
+	function updateSize() {
+		testDrive.style.fontSize = fontSize.value + 'px';
+	}
+	fontSize.addEventListener('change', updateSize, false);
+	testText.addEventListener('input', updateTest, false);
+	testText.addEventListener('change', updateTest, false);
+	updateSize();
+}());
diff --git a/xmpp/converse/fonticons/demo.html b/xmpp/converse/fonticons/demo.html
new file mode 100644
index 00000000..9e3bf0ec
--- /dev/null
+++ b/xmpp/converse/fonticons/demo.html
@@ -0,0 +1,1511 @@
+<!doctype html>
+<html>
+<head>
+	<meta charset="utf-8">
+	<title>IcoMoon Demo</title>
+	<meta name="description" content="An Icon Font Generated By IcoMoon.io">
+	<meta name="viewport" content="width=device-width">
+	<link rel="stylesheet" href="demo-files/demo.css">
+	<link rel="stylesheet" href="style.css"></head>
+<body>
+	<div class="bgc1 clearfix">
+		<h1 class="mhmm mvm"><span class="fgc1">Font Name:</span> icomoon <small class="fgc1">(Glyphs:&nbsp;92)</small></h1>
+	</div>
+	<div class="clearfix mhl ptl">
+		<h1 class="mvm mtn fgc1">Grid Size: 16</h1>
+		<div class="glyph fs1">
+			<div class="clearfix bshadow0 pbs">
+				<span class="icon-xa">
+				
+				</span>
+				<span class="mls"> icon-xa</span>
+			</div>
+			<fieldset class="fs0 size1of1 clearfix hidden-false">
+				<input type="text" readonly value="e602" class="unit size1of2" />
+				<input type="text" maxlength="1" readonly value="&#xe602;" class="unitRight size1of2 talign-right" />
+			</fieldset>
+			<div class="fs0 bshadow0 clearfix hidden-false">
+				<span class="unit pvs fgc1">liga: </span>
+				<input type="text" readonly value="" class="liga unitRight" />
+			</div>
+		</div>
+		<div class="glyph fs1">
+			<div class="clearfix bshadow0 pbs">
+				<span class="icon-conversejs">
+				
+				</span>
+				<span class="mls"> icon-conversejs</span>
+			</div>
+			<fieldset class="fs0 size1of1 clearfix hidden-false">
+				<input type="text" readonly value="e600" class="unit size1of2" />
+				<input type="text" maxlength="1" readonly value="&#xe600;" class="unitRight size1of2 talign-right" />
+			</fieldset>
+			<div class="fs0 bshadow0 clearfix hidden-false">
+				<span class="unit pvs fgc1">liga: </span>
+				<input type="text" readonly value="" class="liga unitRight" />
+			</div>
+		</div>
+		<div class="glyph fs1">
+			<div class="clearfix bshadow0 pbs">
+				<span class="icon-closed">
+				
+				</span>
+				<span class="mls"> icon-closed</span>
+			</div>
+			<fieldset class="fs0 size1of1 clearfix hidden-false">
+				<input type="text" readonly value="25ba" class="unit size1of2" />
+				<input type="text" maxlength="1" readonly value="&#x25ba;" class="unitRight size1of2 talign-right" />
+			</fieldset>
+			<div class="fs0 bshadow0 clearfix hidden-false">
+				<span class="unit pvs fgc1">liga: </span>
+				<input type="text" readonly value="" class="liga unitRight" />
+			</div>
+		</div>
+		<div class="glyph fs1">
+			<div class="clearfix bshadow0 pbs">
+				<span class="icon-opened">
+				
+				</span>
+				<span class="mls"> icon-opened</span>
+			</div>
+			<fieldset class="fs0 size1of1 clearfix hidden-false">
+				<input type="text" readonly value="25bc" class="unit size1of2" />
+				<input type="text" maxlength="1" readonly value="&#x25bc;" class="unitRight size1of2 talign-right" />
+			</fieldset>
+			<div class="fs0 bshadow0 clearfix hidden-false">
+				<span class="unit pvs fgc1">liga: </span>
+				<input type="text" readonly value="" class="liga unitRight" />
+			</div>
+		</div>
+		<div class="glyph fs1">
+			<div class="clearfix bshadow0 pbs">
+				<span class="icon-checkmark">
+				
+				</span>
+				<span class="mls"> icon-checkmark</span>
+			</div>
+			<fieldset class="fs0 size1of1 clearfix hidden-false">
+				<input type="text" readonly value="2713" class="unit size1of2" />
+				<input type="text" maxlength="1" readonly value="&#x2713;" class="unitRight size1of2 talign-right" />
+			</fieldset>
+			<div class="fs0 bshadow0 clearfix hidden-false">
+				<span class="unit pvs fgc1">liga: </span>
+				<input type="text" readonly value="" class="liga unitRight" />
+			</div>
+		</div>
+		<div class="glyph fs1">
+			<div class="clearfix bshadow0 pbs">
+				<span class="icon-home">
+				
+				</span>
+				<span class="mls"> icon-home</span>
+			</div>
+			<fieldset class="fs0 size1of1 clearfix hidden-false">
+				<input type="text" readonly value="e000" class="unit size1of2" />
+				<input type="text" maxlength="1" readonly value="&#xe000;" class="unitRight size1of2 talign-right" />
+			</fieldset>
+			<div class="fs0 bshadow0 clearfix hidden-false">
+				<span class="unit pvs fgc1">liga: </span>
+				<input type="text" readonly value="" class="liga unitRight" />
+			</div>
+		</div>
+		<div class="glyph fs1">
+			<div class="clearfix bshadow0 pbs">
+				<span class="icon-pencil">
+				
+				</span>
+				<span class="mls"> icon-pencil</span>
+			</div>
+			<fieldset class="fs0 size1of1 clearfix hidden-false">
+				<input type="text" readonly value="270e" class="unit size1of2" />
+				<input type="text" maxlength="1" readonly value="&#x270e;" class="unitRight size1of2 talign-right" />
+			</fieldset>
+			<div class="fs0 bshadow0 clearfix hidden-false">
+				<span class="unit pvs fgc1">liga: </span>
+				<input type="text" readonly value="" class="liga unitRight" />
+			</div>
+		</div>
+		<div class="glyph fs1">
+			<div class="clearfix bshadow0 pbs">
+				<span class="icon-camera">
+				
+				</span>
+				<span class="mls"> icon-camera</span>
+			</div>
+			<fieldset class="fs0 size1of1 clearfix hidden-false">
+				<input type="text" readonly value="e003" class="unit size1of2" />
+				<input type="text" maxlength="1" readonly value="&#xe003;" class="unitRight size1of2 talign-right" />
+			</fieldset>
+			<div class="fs0 bshadow0 clearfix hidden-false">
+				<span class="unit pvs fgc1">liga: </span>
+				<input type="text" readonly value="" class="liga unitRight" />
+			</div>
+		</div>
+		<div class="glyph fs1">
+			<div class="clearfix bshadow0 pbs">
+				<span class="icon-camera-2">
+				
+				</span>
+				<span class="mls"> icon-camera-2</span>
+			</div>
+			<fieldset class="fs0 size1of1 clearfix hidden-false">
+				<input type="text" readonly value="2616" class="unit size1of2" />
+				<input type="text" maxlength="1" readonly value="&#x2616;" class="unitRight size1of2 talign-right" />
+			</fieldset>
+			<div class="fs0 bshadow0 clearfix hidden-false">
+				<span class="unit pvs fgc1">liga: </span>
+				<input type="text" readonly value="" class="liga unitRight" />
+			</div>
+		</div>
+		<div class="glyph fs1">
+			<div class="clearfix bshadow0 pbs">
+				<span class="icon-play">
+				
+				</span>
+				<span class="mls"> icon-play</span>
+			</div>
+			<fieldset class="fs0 size1of1 clearfix hidden-false">
+				<input type="text" readonly value="25d9" class="unit size1of2" />
+				<input type="text" maxlength="1" readonly value="&#x25d9;" class="unitRight size1of2 talign-right" />
+			</fieldset>
+			<div class="fs0 bshadow0 clearfix hidden-false">
+				<span class="unit pvs fgc1">liga: </span>
+				<input type="text" readonly value="" class="liga unitRight" />
+			</div>
+		</div>
+		<div class="glyph fs1">
+			<div class="clearfix bshadow0 pbs">
+				<span class="icon-music">
+				
+				</span>
+				<span class="mls"> icon-music</span>
+			</div>
+			<fieldset class="fs0 size1of1 clearfix hidden-false">
+				<input type="text" readonly value="266b" class="unit size1of2" />
+				<input type="text" maxlength="1" readonly value="&#x266b;" class="unitRight size1of2 talign-right" />
+			</fieldset>
+			<div class="fs0 bshadow0 clearfix hidden-false">
+				<span class="unit pvs fgc1">liga: </span>
+				<input type="text" readonly value="" class="liga unitRight" />
+			</div>
+		</div>
+		<div class="glyph fs1">
+			<div class="clearfix bshadow0 pbs">
+				<span class="icon-headphones">
+				
+				</span>
+				<span class="mls"> icon-headphones</span>
+			</div>
+			<fieldset class="fs0 size1of1 clearfix hidden-false">
+				<input type="text" readonly value="266c" class="unit size1of2" />
+				<input type="text" maxlength="1" readonly value="&#x266c;" class="unitRight size1of2 talign-right" />
+			</fieldset>
+			<div class="fs0 bshadow0 clearfix hidden-false">
+				<span class="unit pvs fgc1">liga: </span>
+				<input type="text" readonly value="" class="liga unitRight" />
+			</div>
+		</div>
+		<div class="glyph fs1">
+			<div class="clearfix bshadow0 pbs">
+				<span class="icon-phone">
+				
+				</span>
+				<span class="mls"> icon-phone</span>
+			</div>
+			<fieldset class="fs0 size1of1 clearfix hidden-false">
+				<input type="text" readonly value="260f" class="unit size1of2" />
+				<input type="text" maxlength="1" readonly value="&#x260f;" class="unitRight size1of2 talign-right" />
+			</fieldset>
+			<div class="fs0 bshadow0 clearfix hidden-false">
+				<span class="unit pvs fgc1">liga: </span>
+				<input type="text" readonly value="" class="liga unitRight" />
+			</div>
+		</div>
+		<div class="glyph fs1">
+			<div class="clearfix bshadow0 pbs">
+				<span class="icon-phone-hang-up">
+				
+				</span>
+				<span class="mls"> icon-phone-hang-up</span>
+			</div>
+			<fieldset class="fs0 size1of1 clearfix hidden-false">
+				<input type="text" readonly value="260e" class="unit size1of2" />
+				<input type="text" maxlength="1" readonly value="&#x260e;" class="unitRight size1of2 talign-right" />
+			</fieldset>
+			<div class="fs0 bshadow0 clearfix hidden-false">
+				<span class="unit pvs fgc1">liga: </span>
+				<input type="text" readonly value="" class="liga unitRight" />
+			</div>
+		</div>
+		<div class="glyph fs1">
+			<div class="clearfix bshadow0 pbs">
+				<span class="icon-address-book">
+				
+				</span>
+				<span class="mls"> icon-address-book</span>
+			</div>
+			<fieldset class="fs0 size1of1 clearfix hidden-false">
+				<input type="text" readonly value="270f" class="unit size1of2" />
+				<input type="text" maxlength="1" readonly value="&#x270f;" class="unitRight size1of2 talign-right" />
+			</fieldset>
+			<div class="fs0 bshadow0 clearfix hidden-false">
+				<span class="unit pvs fgc1">liga: </span>
+				<input type="text" readonly value="" class="liga unitRight" />
+			</div>
+		</div>
+		<div class="glyph fs1">
+			<div class="clearfix bshadow0 pbs">
+				<span class="icon-notebook">
+				
+				</span>
+				<span class="mls"> icon-notebook</span>
+			</div>
+			<fieldset class="fs0 size1of1 clearfix hidden-false">
+				<input type="text" readonly value="2710" class="unit size1of2" />
+				<input type="text" maxlength="1" readonly value="&#x2710;" class="unitRight size1of2 talign-right" />
+			</fieldset>
+			<div class="fs0 bshadow0 clearfix hidden-false">
+				<span class="unit pvs fgc1">liga: </span>
+				<input type="text" readonly value="" class="liga unitRight" />
+			</div>
+		</div>
+		<div class="glyph fs1">
+			<div class="clearfix bshadow0 pbs">
+				<span class="icon-envelop">
+				
+				</span>
+				<span class="mls"> icon-envelop</span>
+			</div>
+			<fieldset class="fs0 size1of1 clearfix hidden-false">
+				<input type="text" readonly value="2709" class="unit size1of2" />
+				<input type="text" maxlength="1" readonly value="&#x2709;" class="unitRight size1of2 talign-right" />
+			</fieldset>
+			<div class="fs0 bshadow0 clearfix hidden-false">
+				<span class="unit pvs fgc1">liga: </span>
+				<input type="text" readonly value="" class="liga unitRight" />
+			</div>
+		</div>
+		<div class="glyph fs1">
+			<div class="clearfix bshadow0 pbs">
+				<span class="icon-pushpin">
+				
+				</span>
+				<span class="mls"> icon-pushpin</span>
+			</div>
+			<fieldset class="fs0 size1of1 clearfix hidden-false">
+				<input type="text" readonly value="e012" class="unit size1of2" />
+				<input type="text" maxlength="1" readonly value="&#xe012;" class="unitRight size1of2 talign-right" />
+			</fieldset>
+			<div class="fs0 bshadow0 clearfix hidden-false">
+				<span class="unit pvs fgc1">liga: </span>
+				<input type="text" readonly value="" class="liga unitRight" />
+			</div>
+		</div>
+		<div class="glyph fs1">
+			<div class="clearfix bshadow0 pbs">
+				<span class="icon-online">
+				
+				</span>
+				<span class="mls"> icon-online</span>
+			</div>
+			<fieldset class="fs0 size1of1 clearfix hidden-false">
+				<input type="text" readonly value="25fc" class="unit size1of2" />
+				<input type="text" maxlength="1" readonly value="&#x25fc;" class="unitRight size1of2 talign-right" />
+			</fieldset>
+			<div class="fs0 bshadow0 clearfix hidden-false">
+				<span class="unit pvs fgc1">liga: </span>
+				<input type="text" readonly value="" class="liga unitRight" />
+			</div>
+		</div>
+		<div class="glyph fs1">
+			<div class="clearfix bshadow0 pbs">
+				<span class="icon-away">
+				
+				</span>
+				<span class="mls"> icon-away</span>
+			</div>
+			<fieldset class="fs0 size1of1 clearfix hidden-false">
+				<input type="text" readonly value="25fb" class="unit size1of2" />
+				<input type="text" maxlength="1" readonly value="&#x25fb;" class="unitRight size1of2 talign-right" />
+			</fieldset>
+			<div class="fs0 bshadow0 clearfix hidden-false">
+				<span class="unit pvs fgc1">liga: </span>
+				<input type="text" readonly value="" class="liga unitRight" />
+			</div>
+		</div>
+		<div class="glyph fs1">
+			<div class="clearfix bshadow0 pbs">
+				<span class="icon-bubbles">
+				
+				</span>
+				<span class="mls"> icon-bubbles</span>
+			</div>
+			<fieldset class="fs0 size1of1 clearfix hidden-false">
+				<input type="text" readonly value="e015" class="unit size1of2" />
+				<input type="text" maxlength="1" readonly value="&#xe015;" class="unitRight size1of2 talign-right" />
+			</fieldset>
+			<div class="fs0 bshadow0 clearfix hidden-false">
+				<span class="unit pvs fgc1">liga: </span>
+				<input type="text" readonly value="" class="liga unitRight" />
+			</div>
+		</div>
+		<div class="glyph fs1">
+			<div class="clearfix bshadow0 pbs">
+				<span class="icon-bubbles2">
+				
+				</span>
+				<span class="mls"> icon-bubbles2</span>
+			</div>
+			<fieldset class="fs0 size1of1 clearfix hidden-false">
+				<input type="text" readonly value="e016" class="unit size1of2" />
+				<input type="text" maxlength="1" readonly value="&#xe016;" class="unitRight size1of2 talign-right" />
+			</fieldset>
+			<div class="fs0 bshadow0 clearfix hidden-false">
+				<span class="unit pvs fgc1">liga: </span>
+				<input type="text" readonly value="" class="liga unitRight" />
+			</div>
+		</div>
+		<div class="glyph fs1">
+			<div class="clearfix bshadow0 pbs">
+				<span class="icon-bubbles3">
+				
+				</span>
+				<span class="mls"> icon-bubbles3</span>
+			</div>
+			<fieldset class="fs0 size1of1 clearfix hidden-false">
+				<input type="text" readonly value="e017" class="unit size1of2" />
+				<input type="text" maxlength="1" readonly value="&#xe017;" class="unitRight size1of2 talign-right" />
+			</fieldset>
+			<div class="fs0 bshadow0 clearfix hidden-false">
+				<span class="unit pvs fgc1">liga: </span>
+				<input type="text" readonly value="" class="liga unitRight" />
+			</div>
+		</div>
+		<div class="glyph fs1">
+			<div class="clearfix bshadow0 pbs">
+				<span class="icon-user">
+				
+				</span>
+				<span class="mls"> icon-user</span>
+			</div>
+			<fieldset class="fs0 size1of1 clearfix hidden-false">
+				<input type="text" readonly value="e01a" class="unit size1of2" />
+				<input type="text" maxlength="1" readonly value="&#xe01a;" class="unitRight size1of2 talign-right" />
+			</fieldset>
+			<div class="fs0 bshadow0 clearfix hidden-false">
+				<span class="unit pvs fgc1">liga: </span>
+				<input type="text" readonly value="" class="liga unitRight" />
+			</div>
+		</div>
+		<div class="glyph fs1">
+			<div class="clearfix bshadow0 pbs">
+				<span class="icon-hide-users">
+				
+				</span>
+				<span class="mls"> icon-hide-users</span>
+			</div>
+			<fieldset class="fs0 size1of1 clearfix hidden-false">
+				<input type="text" readonly value="e01c" class="unit size1of2" />
+				<input type="text" maxlength="1" readonly value="&#xe01c;" class="unitRight size1of2 talign-right" />
+			</fieldset>
+			<div class="fs0 bshadow0 clearfix hidden-false">
+				<span class="unit pvs fgc1">liga: </span>
+				<input type="text" readonly value="" class="liga unitRight" />
+			</div>
+		</div>
+		<div class="glyph fs1">
+			<div class="clearfix bshadow0 pbs">
+				<span class="icon-show-users">
+				
+				</span>
+				<span class="mls"> icon-show-users</span>
+			</div>
+			<fieldset class="fs0 size1of1 clearfix hidden-false">
+				<input type="text" readonly value="e01e" class="unit size1of2" />
+				<input type="text" maxlength="1" readonly value="&#xe01e;" class="unitRight size1of2 talign-right" />
+			</fieldset>
+			<div class="fs0 bshadow0 clearfix hidden-false">
+				<span class="unit pvs fgc1">liga: </span>
+				<input type="text" readonly value="" class="liga unitRight" />
+			</div>
+		</div>
+		<div class="glyph fs1">
+			<div class="clearfix bshadow0 pbs">
+				<span class="icon-users">
+				
+				</span>
+				<span class="mls"> icon-users</span>
+			</div>
+			<fieldset class="fs0 size1of1 clearfix hidden-false">
+				<input type="text" readonly value="e01b" class="unit size1of2" />
+				<input type="text" maxlength="1" readonly value="&#xe01b;" class="unitRight size1of2 talign-right" />
+			</fieldset>
+			<div class="fs0 bshadow0 clearfix hidden-false">
+				<span class="unit pvs fgc1">liga: </span>
+				<input type="text" readonly value="" class="liga unitRight" />
+			</div>
+		</div>
+		<div class="glyph fs1">
+			<div class="clearfix bshadow0 pbs">
+				<span class="icon-quotes-left">
+				
+				</span>
+				<span class="mls"> icon-quotes-left</span>
+			</div>
+			<fieldset class="fs0 size1of1 clearfix hidden-false">
+				<input type="text" readonly value="e01d" class="unit size1of2" />
+				<input type="text" maxlength="1" readonly value="&#xe01d;" class="unitRight size1of2 talign-right" />
+			</fieldset>
+			<div class="fs0 bshadow0 clearfix hidden-false">
+				<span class="unit pvs fgc1">liga: </span>
+				<input type="text" readonly value="" class="liga unitRight" />
+			</div>
+		</div>
+		<div class="glyph fs1">
+			<div class="clearfix bshadow0 pbs">
+				<span class="icon-spinner">
+				
+				</span>
+				<span class="mls"> icon-spinner</span>
+			</div>
+			<fieldset class="fs0 size1of1 clearfix hidden-false">
+				<input type="text" readonly value="231b" class="unit size1of2" />
+				<input type="text" maxlength="1" readonly value="&#x231b;" class="unitRight size1of2 talign-right" />
+			</fieldset>
+			<div class="fs0 bshadow0 clearfix hidden-false">
+				<span class="unit pvs fgc1">liga: </span>
+				<input type="text" readonly value="" class="liga unitRight" />
+			</div>
+		</div>
+		<div class="glyph fs1">
+			<div class="clearfix bshadow0 pbs">
+				<span class="icon-search">
+				
+				</span>
+				<span class="mls"> icon-search</span>
+			</div>
+			<fieldset class="fs0 size1of1 clearfix hidden-false">
+				<input type="text" readonly value="e021" class="unit size1of2" />
+				<input type="text" maxlength="1" readonly value="&#xe021;" class="unitRight size1of2 talign-right" />
+			</fieldset>
+			<div class="fs0 bshadow0 clearfix hidden-false">
+				<span class="unit pvs fgc1">liga: </span>
+				<input type="text" readonly value="" class="liga unitRight" />
+			</div>
+		</div>
+		<div class="glyph fs1">
+			<div class="clearfix bshadow0 pbs">
+				<span class="icon-cogs">
+				
+				</span>
+				<span class="mls"> icon-cogs</span>
+			</div>
+			<fieldset class="fs0 size1of1 clearfix hidden-false">
+				<input type="text" readonly value="e022" class="unit size1of2" />
+				<input type="text" maxlength="1" readonly value="&#xe022;" class="unitRight size1of2 talign-right" />
+			</fieldset>
+			<div class="fs0 bshadow0 clearfix hidden-false">
+				<span class="unit pvs fgc1">liga: </span>
+				<input type="text" readonly value="" class="liga unitRight" />
+			</div>
+		</div>
+		<div class="glyph fs1">
+			<div class="clearfix bshadow0 pbs">
+				<span class="icon-wrench">
+				
+				</span>
+				<span class="mls"> icon-wrench</span>
+			</div>
+			<fieldset class="fs0 size1of1 clearfix hidden-false">
+				<input type="text" readonly value="e024" class="unit size1of2" />
+				<input type="text" maxlength="1" readonly value="&#xe024;" class="unitRight size1of2 talign-right" />
+			</fieldset>
+			<div class="fs0 bshadow0 clearfix hidden-false">
+				<span class="unit pvs fgc1">liga: </span>
+				<input type="text" readonly value="" class="liga unitRight" />
+			</div>
+		</div>
+		<div class="glyph fs1">
+			<div class="clearfix bshadow0 pbs">
+				<span class="icon-unlocked">
+				
+				</span>
+				<span class="mls"> icon-unlocked</span>
+			</div>
+			<fieldset class="fs0 size1of1 clearfix hidden-false">
+				<input type="text" readonly value="e025" class="unit size1of2" />
+				<input type="text" maxlength="1" readonly value="&#xe025;" class="unitRight size1of2 talign-right" />
+			</fieldset>
+			<div class="fs0 bshadow0 clearfix hidden-false">
+				<span class="unit pvs fgc1">liga: </span>
+				<input type="text" readonly value="" class="liga unitRight" />
+			</div>
+		</div>
+		<div class="glyph fs1">
+			<div class="clearfix bshadow0 pbs">
+				<span class="icon-lock">
+				
+				</span>
+				<span class="mls"> icon-lock</span>
+			</div>
+			<fieldset class="fs0 size1of1 clearfix hidden-false">
+				<input type="text" readonly value="e026" class="unit size1of2" />
+				<input type="text" maxlength="1" readonly value="&#xe026;" class="unitRight size1of2 talign-right" />
+			</fieldset>
+			<div class="fs0 bshadow0 clearfix hidden-false">
+				<span class="unit pvs fgc1">liga: </span>
+				<input type="text" readonly value="" class="liga unitRight" />
+			</div>
+		</div>
+		<div class="glyph fs1">
+			<div class="clearfix bshadow0 pbs">
+				<span class="icon-lock-2">
+				
+				</span>
+				<span class="mls"> icon-lock-2</span>
+			</div>
+			<fieldset class="fs0 size1of1 clearfix hidden-false">
+				<input type="text" readonly value="e027" class="unit size1of2" />
+				<input type="text" maxlength="1" readonly value="&#xe027;" class="unitRight size1of2 talign-right" />
+			</fieldset>
+			<div class="fs0 bshadow0 clearfix hidden-false">
+				<span class="unit pvs fgc1">liga: </span>
+				<input type="text" readonly value="" class="liga unitRight" />
+			</div>
+		</div>
+		<div class="glyph fs1">
+			<div class="clearfix bshadow0 pbs">
+				<span class="icon-key">
+				
+				</span>
+				<span class="mls"> icon-key</span>
+			</div>
+			<fieldset class="fs0 size1of1 clearfix hidden-false">
+				<input type="text" readonly value="e028" class="unit size1of2" />
+				<input type="text" maxlength="1" readonly value="&#xe028;" class="unitRight size1of2 talign-right" />
+			</fieldset>
+			<div class="fs0 bshadow0 clearfix hidden-false">
+				<span class="unit pvs fgc1">liga: </span>
+				<input type="text" readonly value="" class="liga unitRight" />
+			</div>
+		</div>
+		<div class="glyph fs1">
+			<div class="clearfix bshadow0 pbs">
+				<span class="icon-key-2">
+				
+				</span>
+				<span class="mls"> icon-key-2</span>
+			</div>
+			<fieldset class="fs0 size1of1 clearfix hidden-false">
+				<input type="text" readonly value="e029" class="unit size1of2" />
+				<input type="text" maxlength="1" readonly value="&#xe029;" class="unitRight size1of2 talign-right" />
+			</fieldset>
+			<div class="fs0 bshadow0 clearfix hidden-false">
+				<span class="unit pvs fgc1">liga: </span>
+				<input type="text" readonly value="" class="liga unitRight" />
+			</div>
+		</div>
+		<div class="glyph fs1">
+			<div class="clearfix bshadow0 pbs">
+				<span class="icon-zoomout">
+				
+				</span>
+				<span class="mls"> icon-zoomout</span>
+			</div>
+			<fieldset class="fs0 size1of1 clearfix hidden-false">
+				<input type="text" readonly value="e02a" class="unit size1of2" />
+				<input type="text" maxlength="1" readonly value="&#xe02a;" class="unitRight size1of2 talign-right" />
+			</fieldset>
+			<div class="fs0 bshadow0 clearfix hidden-false">
+				<span class="unit pvs fgc1">liga: </span>
+				<input type="text" readonly value="" class="liga unitRight" />
+			</div>
+		</div>
+		<div class="glyph fs1">
+			<div class="clearfix bshadow0 pbs">
+				<span class="icon-zoomin">
+				
+				</span>
+				<span class="mls"> icon-zoomin</span>
+			</div>
+			<fieldset class="fs0 size1of1 clearfix hidden-false">
+				<input type="text" readonly value="e02b" class="unit size1of2" />
+				<input type="text" maxlength="1" readonly value="&#xe02b;" class="unitRight size1of2 talign-right" />
+			</fieldset>
+			<div class="fs0 bshadow0 clearfix hidden-false">
+				<span class="unit pvs fgc1">liga: </span>
+				<input type="text" readonly value="" class="liga unitRight" />
+			</div>
+		</div>
+		<div class="glyph fs1">
+			<div class="clearfix bshadow0 pbs">
+				<span class="icon-cog">
+				
+				</span>
+				<span class="mls"> icon-cog</span>
+			</div>
+			<fieldset class="fs0 size1of1 clearfix hidden-false">
+				<input type="text" readonly value="e02f" class="unit size1of2" />
+				<input type="text" maxlength="1" readonly value="&#xe02f;" class="unitRight size1of2 talign-right" />
+			</fieldset>
+			<div class="fs0 bshadow0 clearfix hidden-false">
+				<span class="unit pvs fgc1">liga: </span>
+				<input type="text" readonly value="" class="liga unitRight" />
+			</div>
+		</div>
+		<div class="glyph fs1">
+			<div class="clearfix bshadow0 pbs">
+				<span class="icon-remove">
+				
+				</span>
+				<span class="mls"> icon-remove</span>
+			</div>
+			<fieldset class="fs0 size1of1 clearfix hidden-false">
+				<input type="text" readonly value="e02d" class="unit size1of2" />
+				<input type="text" maxlength="1" readonly value="&#xe02d;" class="unitRight size1of2 talign-right" />
+			</fieldset>
+			<div class="fs0 bshadow0 clearfix hidden-false">
+				<span class="unit pvs fgc1">liga: </span>
+				<input type="text" readonly value="" class="liga unitRight" />
+			</div>
+		</div>
+		<div class="glyph fs1">
+			<div class="clearfix bshadow0 pbs">
+				<span class="icon-eye">
+				
+				</span>
+				<span class="mls"> icon-eye</span>
+			</div>
+			<fieldset class="fs0 size1of1 clearfix hidden-false">
+				<input type="text" readonly value="e030" class="unit size1of2" />
+				<input type="text" maxlength="1" readonly value="&#xe030;" class="unitRight size1of2 talign-right" />
+			</fieldset>
+			<div class="fs0 bshadow0 clearfix hidden-false">
+				<span class="unit pvs fgc1">liga: </span>
+				<input type="text" readonly value="" class="liga unitRight" />
+			</div>
+		</div>
+		<div class="glyph fs1">
+			<div class="clearfix bshadow0 pbs">
+				<span class="icon-eye-blocked">
+				
+				</span>
+				<span class="mls"> icon-eye-blocked</span>
+			</div>
+			<fieldset class="fs0 size1of1 clearfix hidden-false">
+				<input type="text" readonly value="e031" class="unit size1of2" />
+				<input type="text" maxlength="1" readonly value="&#xe031;" class="unitRight size1of2 talign-right" />
+			</fieldset>
+			<div class="fs0 bshadow0 clearfix hidden-false">
+				<span class="unit pvs fgc1">liga: </span>
+				<input type="text" readonly value="" class="liga unitRight" />
+			</div>
+		</div>
+		<div class="glyph fs1">
+			<div class="clearfix bshadow0 pbs">
+				<span class="icon-attachment">
+				
+				</span>
+				<span class="mls"> icon-attachment</span>
+			</div>
+			<fieldset class="fs0 size1of1 clearfix hidden-false">
+				<input type="text" readonly value="e032" class="unit size1of2" />
+				<input type="text" maxlength="1" readonly value="&#xe032;" class="unitRight size1of2 talign-right" />
+			</fieldset>
+			<div class="fs0 bshadow0 clearfix hidden-false">
+				<span class="unit pvs fgc1">liga: </span>
+				<input type="text" readonly value="" class="liga unitRight" />
+			</div>
+		</div>
+		<div class="glyph fs1">
+			<div class="clearfix bshadow0 pbs">
+				<span class="icon-globe">
+				
+				</span>
+				<span class="mls"> icon-globe</span>
+			</div>
+			<fieldset class="fs0 size1of1 clearfix hidden-false">
+				<input type="text" readonly value="e033" class="unit size1of2" />
+				<input type="text" maxlength="1" readonly value="&#xe033;" class="unitRight size1of2 talign-right" />
+			</fieldset>
+			<div class="fs0 bshadow0 clearfix hidden-false">
+				<span class="unit pvs fgc1">liga: </span>
+				<input type="text" readonly value="" class="liga unitRight" />
+			</div>
+		</div>
+		<div class="glyph fs1">
+			<div class="clearfix bshadow0 pbs">
+				<span class="icon-heart">
+				
+				</span>
+				<span class="mls"> icon-heart</span>
+			</div>
+			<fieldset class="fs0 size1of1 clearfix hidden-false">
+				<input type="text" readonly value="2764" class="unit size1of2" />
+				<input type="text" maxlength="1" readonly value="&#x2764;" class="unitRight size1of2 talign-right" />
+			</fieldset>
+			<div class="fs0 bshadow0 clearfix hidden-false">
+				<span class="unit pvs fgc1">liga: </span>
+				<input type="text" readonly value="" class="liga unitRight" />
+			</div>
+		</div>
+		<div class="glyph fs1">
+			<div class="clearfix bshadow0 pbs">
+				<span class="icon-happy">
+				
+				</span>
+				<span class="mls"> icon-happy</span>
+			</div>
+			<fieldset class="fs0 size1of1 clearfix hidden-false">
+				<input type="text" readonly value="263b" class="unit size1of2" />
+				<input type="text" maxlength="1" readonly value="&#x263b;" class="unitRight size1of2 talign-right" />
+			</fieldset>
+			<div class="fs0 bshadow0 clearfix hidden-false">
+				<span class="unit pvs fgc1">liga: </span>
+				<input type="text" readonly value="" class="liga unitRight" />
+			</div>
+		</div>
+		<div class="glyph fs1">
+			<div class="clearfix bshadow0 pbs">
+				<span class="icon-thumbs-up">
+				
+				</span>
+				<span class="mls"> icon-thumbs-up</span>
+			</div>
+			<fieldset class="fs0 size1of1 clearfix hidden-false">
+				<input type="text" readonly value="261d" class="unit size1of2" />
+				<input type="text" maxlength="1" readonly value="&#x261d;" class="unitRight size1of2 talign-right" />
+			</fieldset>
+			<div class="fs0 bshadow0 clearfix hidden-false">
+				<span class="unit pvs fgc1">liga: </span>
+				<input type="text" readonly value="" class="liga unitRight" />
+			</div>
+		</div>
+		<div class="glyph fs1">
+			<div class="clearfix bshadow0 pbs">
+				<span class="icon-smiley">
+				
+				</span>
+				<span class="mls"> icon-smiley</span>
+			</div>
+			<fieldset class="fs0 size1of1 clearfix hidden-false">
+				<input type="text" readonly value="263a" class="unit size1of2" />
+				<input type="text" maxlength="1" readonly value="&#x263a;" class="unitRight size1of2 talign-right" />
+			</fieldset>
+			<div class="fs0 bshadow0 clearfix hidden-false">
+				<span class="unit pvs fgc1">liga: </span>
+				<input type="text" readonly value="" class="liga unitRight" />
+			</div>
+		</div>
+		<div class="glyph fs1">
+			<div class="clearfix bshadow0 pbs">
+				<span class="icon-tongue">
+				
+				</span>
+				<span class="mls"> icon-tongue</span>
+			</div>
+			<fieldset class="fs0 size1of1 clearfix hidden-false">
+				<input type="text" readonly value="e038" class="unit size1of2" />
+				<input type="text" maxlength="1" readonly value="&#xe038;" class="unitRight size1of2 talign-right" />
+			</fieldset>
+			<div class="fs0 bshadow0 clearfix hidden-false">
+				<span class="unit pvs fgc1">liga: </span>
+				<input type="text" readonly value="" class="liga unitRight" />
+			</div>
+		</div>
+		<div class="glyph fs1">
+			<div class="clearfix bshadow0 pbs">
+				<span class="icon-sad">
+				
+				</span>
+				<span class="mls"> icon-sad</span>
+			</div>
+			<fieldset class="fs0 size1of1 clearfix hidden-false">
+				<input type="text" readonly value="2639" class="unit size1of2" />
+				<input type="text" maxlength="1" readonly value="&#x2639;" class="unitRight size1of2 talign-right" />
+			</fieldset>
+			<div class="fs0 bshadow0 clearfix hidden-false">
+				<span class="unit pvs fgc1">liga: </span>
+				<input type="text" readonly value="" class="liga unitRight" />
+			</div>
+		</div>
+		<div class="glyph fs1">
+			<div class="clearfix bshadow0 pbs">
+				<span class="icon-wink">
+				
+				</span>
+				<span class="mls"> icon-wink</span>
+			</div>
+			<fieldset class="fs0 size1of1 clearfix hidden-false">
+				<input type="text" readonly value="e03a" class="unit size1of2" />
+				<input type="text" maxlength="1" readonly value="&#xe03a;" class="unitRight size1of2 talign-right" />
+			</fieldset>
+			<div class="fs0 bshadow0 clearfix hidden-false">
+				<span class="unit pvs fgc1">liga: </span>
+				<input type="text" readonly value="" class="liga unitRight" />
+			</div>
+		</div>
+		<div class="glyph fs1">
+			<div class="clearfix bshadow0 pbs">
+				<span class="icon-wondering">
+				
+				</span>
+				<span class="mls"> icon-wondering</span>
+			</div>
+			<fieldset class="fs0 size1of1 clearfix hidden-false">
+				<input type="text" readonly value="2369" class="unit size1of2" />
+				<input type="text" maxlength="1" readonly value="&#x2369;" class="unitRight size1of2 talign-right" />
+			</fieldset>
+			<div class="fs0 bshadow0 clearfix hidden-false">
+				<span class="unit pvs fgc1">liga: </span>
+				<input type="text" readonly value="" class="liga unitRight" />
+			</div>
+		</div>
+		<div class="glyph fs1">
+			<div class="clearfix bshadow0 pbs">
+				<span class="icon-confused">
+				
+				</span>
+				<span class="mls"> icon-confused</span>
+			</div>
+			<fieldset class="fs0 size1of1 clearfix hidden-false">
+				<input type="text" readonly value="2368" class="unit size1of2" />
+				<input type="text" maxlength="1" readonly value="&#x2368;" class="unitRight size1of2 talign-right" />
+			</fieldset>
+			<div class="fs0 bshadow0 clearfix hidden-false">
+				<span class="unit pvs fgc1">liga: </span>
+				<input type="text" readonly value="" class="liga unitRight" />
+			</div>
+		</div>
+		<div class="glyph fs1">
+			<div class="clearfix bshadow0 pbs">
+				<span class="icon-shocked">
+				
+				</span>
+				<span class="mls"> icon-shocked</span>
+			</div>
+			<fieldset class="fs0 size1of1 clearfix hidden-false">
+				<input type="text" readonly value="2364" class="unit size1of2" />
+				<input type="text" maxlength="1" readonly value="&#x2364;" class="unitRight size1of2 talign-right" />
+			</fieldset>
+			<div class="fs0 bshadow0 clearfix hidden-false">
+				<span class="unit pvs fgc1">liga: </span>
+				<input type="text" readonly value="" class="liga unitRight" />
+			</div>
+		</div>
+		<div class="glyph fs1">
+			<div class="clearfix bshadow0 pbs">
+				<span class="icon-evil">
+				
+				</span>
+				<span class="mls"> icon-evil</span>
+			</div>
+			<fieldset class="fs0 size1of1 clearfix hidden-false">
+				<input type="text" readonly value="261f" class="unit size1of2" />
+				<input type="text" maxlength="1" readonly value="&#x261f;" class="unitRight size1of2 talign-right" />
+			</fieldset>
+			<div class="fs0 bshadow0 clearfix hidden-false">
+				<span class="unit pvs fgc1">liga: </span>
+				<input type="text" readonly value="" class="liga unitRight" />
+			</div>
+		</div>
+		<div class="glyph fs1">
+			<div class="clearfix bshadow0 pbs">
+				<span class="icon-angry">
+				
+				</span>
+				<span class="mls"> icon-angry</span>
+			</div>
+			<fieldset class="fs0 size1of1 clearfix hidden-false">
+				<input type="text" readonly value="e03f" class="unit size1of2" />
+				<input type="text" maxlength="1" readonly value="&#xe03f;" class="unitRight size1of2 talign-right" />
+			</fieldset>
+			<div class="fs0 bshadow0 clearfix hidden-false">
+				<span class="unit pvs fgc1">liga: </span>
+				<input type="text" readonly value="" class="liga unitRight" />
+			</div>
+		</div>
+		<div class="glyph fs1">
+			<div class="clearfix bshadow0 pbs">
+				<span class="icon-cool">
+				
+				</span>
+				<span class="mls"> icon-cool</span>
+			</div>
+			<fieldset class="fs0 size1of1 clearfix hidden-false">
+				<input type="text" readonly value="e040" class="unit size1of2" />
+				<input type="text" maxlength="1" readonly value="&#xe040;" class="unitRight size1of2 talign-right" />
+			</fieldset>
+			<div class="fs0 bshadow0 clearfix hidden-false">
+				<span class="unit pvs fgc1">liga: </span>
+				<input type="text" readonly value="" class="liga unitRight" />
+			</div>
+		</div>
+		<div class="glyph fs1">
+			<div class="clearfix bshadow0 pbs">
+				<span class="icon-grin">
+				
+				</span>
+				<span class="mls"> icon-grin</span>
+			</div>
+			<fieldset class="fs0 size1of1 clearfix hidden-false">
+				<input type="text" readonly value="e041" class="unit size1of2" />
+				<input type="text" maxlength="1" readonly value="&#xe041;" class="unitRight size1of2 talign-right" />
+			</fieldset>
+			<div class="fs0 bshadow0 clearfix hidden-false">
+				<span class="unit pvs fgc1">liga: </span>
+				<input type="text" readonly value="" class="liga unitRight" />
+			</div>
+		</div>
+		<div class="glyph fs1">
+			<div class="clearfix bshadow0 pbs">
+				<span class="icon-info">
+				
+				</span>
+				<span class="mls"> icon-info</span>
+			</div>
+			<fieldset class="fs0 size1of1 clearfix hidden-false">
+				<input type="text" readonly value="2360" class="unit size1of2" />
+				<input type="text" maxlength="1" readonly value="&#x2360;" class="unitRight size1of2 talign-right" />
+			</fieldset>
+			<div class="fs0 bshadow0 clearfix hidden-false">
+				<span class="unit pvs fgc1">liga: </span>
+				<input type="text" readonly value="" class="liga unitRight" />
+			</div>
+		</div>
+		<div class="glyph fs1">
+			<div class="clearfix bshadow0 pbs">
+				<span class="icon-notification">
+				
+				</span>
+				<span class="mls"> icon-notification</span>
+			</div>
+			<fieldset class="fs0 size1of1 clearfix hidden-false">
+				<input type="text" readonly value="e01f" class="unit size1of2" />
+				<input type="text" maxlength="1" readonly value="&#xe01f;" class="unitRight size1of2 talign-right" />
+			</fieldset>
+			<div class="fs0 bshadow0 clearfix hidden-false">
+				<span class="unit pvs fgc1">liga: </span>
+				<input type="text" readonly value="" class="liga unitRight" />
+			</div>
+		</div>
+		<div class="glyph fs1">
+			<div class="clearfix bshadow0 pbs">
+				<span class="icon-warning">
+				
+				</span>
+				<span class="mls"> icon-warning</span>
+			</div>
+			<fieldset class="fs0 size1of1 clearfix hidden-false">
+				<input type="text" readonly value="26a0" class="unit size1of2" />
+				<input type="text" maxlength="1" readonly value="&#x26a0;" class="unitRight size1of2 talign-right" />
+			</fieldset>
+			<div class="fs0 bshadow0 clearfix hidden-false">
+				<span class="unit pvs fgc1">liga: </span>
+				<input type="text" readonly value="" class="liga unitRight" />
+			</div>
+		</div>
+		<div class="glyph fs1">
+			<div class="clearfix bshadow0 pbs">
+				<span class="icon-spell-check">
+				
+				</span>
+				<span class="mls"> icon-spell-check</span>
+			</div>
+			<fieldset class="fs0 size1of1 clearfix hidden-false">
+				<input type="text" readonly value="e045" class="unit size1of2" />
+				<input type="text" maxlength="1" readonly value="&#xe045;" class="unitRight size1of2 talign-right" />
+			</fieldset>
+			<div class="fs0 bshadow0 clearfix hidden-false">
+				<span class="unit pvs fgc1">liga: </span>
+				<input type="text" readonly value="" class="liga unitRight" />
+			</div>
+		</div>
+		<div class="glyph fs1">
+			<div class="clearfix bshadow0 pbs">
+				<span class="icon-volume-high">
+				
+				</span>
+				<span class="mls"> icon-volume-high</span>
+			</div>
+			<fieldset class="fs0 size1of1 clearfix hidden-false">
+				<input type="text" readonly value="e046" class="unit size1of2" />
+				<input type="text" maxlength="1" readonly value="&#xe046;" class="unitRight size1of2 talign-right" />
+			</fieldset>
+			<div class="fs0 bshadow0 clearfix hidden-false">
+				<span class="unit pvs fgc1">liga: </span>
+				<input type="text" readonly value="" class="liga unitRight" />
+			</div>
+		</div>
+		<div class="glyph fs1">
+			<div class="clearfix bshadow0 pbs">
+				<span class="icon-volume-medium">
+				
+				</span>
+				<span class="mls"> icon-volume-medium</span>
+			</div>
+			<fieldset class="fs0 size1of1 clearfix hidden-false">
+				<input type="text" readonly value="e047" class="unit size1of2" />
+				<input type="text" maxlength="1" readonly value="&#xe047;" class="unitRight size1of2 talign-right" />
+			</fieldset>
+			<div class="fs0 bshadow0 clearfix hidden-false">
+				<span class="unit pvs fgc1">liga: </span>
+				<input type="text" readonly value="" class="liga unitRight" />
+			</div>
+		</div>
+		<div class="glyph fs1">
+			<div class="clearfix bshadow0 pbs">
+				<span class="icon-volume-low">
+				
+				</span>
+				<span class="mls"> icon-volume-low</span>
+			</div>
+			<fieldset class="fs0 size1of1 clearfix hidden-false">
+				<input type="text" readonly value="e048" class="unit size1of2" />
+				<input type="text" maxlength="1" readonly value="&#xe048;" class="unitRight size1of2 talign-right" />
+			</fieldset>
+			<div class="fs0 bshadow0 clearfix hidden-false">
+				<span class="unit pvs fgc1">liga: </span>
+				<input type="text" readonly value="" class="liga unitRight" />
+			</div>
+		</div>
+		<div class="glyph fs1">
+			<div class="clearfix bshadow0 pbs">
+				<span class="icon-volume-mute">
+				
+				</span>
+				<span class="mls"> icon-volume-mute</span>
+			</div>
+			<fieldset class="fs0 size1of1 clearfix hidden-false">
+				<input type="text" readonly value="e049" class="unit size1of2" />
+				<input type="text" maxlength="1" readonly value="&#xe049;" class="unitRight size1of2 talign-right" />
+			</fieldset>
+			<div class="fs0 bshadow0 clearfix hidden-false">
+				<span class="unit pvs fgc1">liga: </span>
+				<input type="text" readonly value="" class="liga unitRight" />
+			</div>
+		</div>
+		<div class="glyph fs1">
+			<div class="clearfix bshadow0 pbs">
+				<span class="icon-volume-mute2">
+				
+				</span>
+				<span class="mls"> icon-volume-mute2</span>
+			</div>
+			<fieldset class="fs0 size1of1 clearfix hidden-false">
+				<input type="text" readonly value="e04a" class="unit size1of2" />
+				<input type="text" maxlength="1" readonly value="&#xe04a;" class="unitRight size1of2 talign-right" />
+			</fieldset>
+			<div class="fs0 bshadow0 clearfix hidden-false">
+				<span class="unit pvs fgc1">liga: </span>
+				<input type="text" readonly value="" class="liga unitRight" />
+			</div>
+		</div>
+		<div class="glyph fs1">
+			<div class="clearfix bshadow0 pbs">
+				<span class="icon-volume-decrease">
+				
+				</span>
+				<span class="mls"> icon-volume-decrease</span>
+			</div>
+			<fieldset class="fs0 size1of1 clearfix hidden-false">
+				<input type="text" readonly value="e04b" class="unit size1of2" />
+				<input type="text" maxlength="1" readonly value="&#xe04b;" class="unitRight size1of2 talign-right" />
+			</fieldset>
+			<div class="fs0 bshadow0 clearfix hidden-false">
+				<span class="unit pvs fgc1">liga: </span>
+				<input type="text" readonly value="" class="liga unitRight" />
+			</div>
+		</div>
+		<div class="glyph fs1">
+			<div class="clearfix bshadow0 pbs">
+				<span class="icon-volume-increase">
+				
+				</span>
+				<span class="mls"> icon-volume-increase</span>
+			</div>
+			<fieldset class="fs0 size1of1 clearfix hidden-false">
+				<input type="text" readonly value="e04c" class="unit size1of2" />
+				<input type="text" maxlength="1" readonly value="&#xe04c;" class="unitRight size1of2 talign-right" />
+			</fieldset>
+			<div class="fs0 bshadow0 clearfix hidden-false">
+				<span class="unit pvs fgc1">liga: </span>
+				<input type="text" readonly value="" class="liga unitRight" />
+			</div>
+		</div>
+		<div class="glyph fs1">
+			<div class="clearfix bshadow0 pbs">
+				<span class="icon-bold">
+				
+				</span>
+				<span class="mls"> icon-bold</span>
+			</div>
+			<fieldset class="fs0 size1of1 clearfix hidden-false">
+				<input type="text" readonly value="e04d" class="unit size1of2" />
+				<input type="text" maxlength="1" readonly value="&#xe04d;" class="unitRight size1of2 talign-right" />
+			</fieldset>
+			<div class="fs0 bshadow0 clearfix hidden-false">
+				<span class="unit pvs fgc1">liga: </span>
+				<input type="text" readonly value="" class="liga unitRight" />
+			</div>
+		</div>
+		<div class="glyph fs1">
+			<div class="clearfix bshadow0 pbs">
+				<span class="icon-underline">
+				
+				</span>
+				<span class="mls"> icon-underline</span>
+			</div>
+			<fieldset class="fs0 size1of1 clearfix hidden-false">
+				<input type="text" readonly value="e04e" class="unit size1of2" />
+				<input type="text" maxlength="1" readonly value="&#xe04e;" class="unitRight size1of2 talign-right" />
+			</fieldset>
+			<div class="fs0 bshadow0 clearfix hidden-false">
+				<span class="unit pvs fgc1">liga: </span>
+				<input type="text" readonly value="" class="liga unitRight" />
+			</div>
+		</div>
+		<div class="glyph fs1">
+			<div class="clearfix bshadow0 pbs">
+				<span class="icon-italic">
+				
+				</span>
+				<span class="mls"> icon-italic</span>
+			</div>
+			<fieldset class="fs0 size1of1 clearfix hidden-false">
+				<input type="text" readonly value="e04f" class="unit size1of2" />
+				<input type="text" maxlength="1" readonly value="&#xe04f;" class="unitRight size1of2 talign-right" />
+			</fieldset>
+			<div class="fs0 bshadow0 clearfix hidden-false">
+				<span class="unit pvs fgc1">liga: </span>
+				<input type="text" readonly value="" class="liga unitRight" />
+			</div>
+		</div>
+		<div class="glyph fs1">
+			<div class="clearfix bshadow0 pbs">
+				<span class="icon-strikethrough">
+				
+				</span>
+				<span class="mls"> icon-strikethrough</span>
+			</div>
+			<fieldset class="fs0 size1of1 clearfix hidden-false">
+				<input type="text" readonly value="e050" class="unit size1of2" />
+				<input type="text" maxlength="1" readonly value="&#xe050;" class="unitRight size1of2 talign-right" />
+			</fieldset>
+			<div class="fs0 bshadow0 clearfix hidden-false">
+				<span class="unit pvs fgc1">liga: </span>
+				<input type="text" readonly value="" class="liga unitRight" />
+			</div>
+		</div>
+		<div class="glyph fs1">
+			<div class="clearfix bshadow0 pbs">
+				<span class="icon-newtab">
+				
+				</span>
+				<span class="mls"> icon-newtab</span>
+			</div>
+			<fieldset class="fs0 size1of1 clearfix hidden-false">
+				<input type="text" readonly value="e053" class="unit size1of2" />
+				<input type="text" maxlength="1" readonly value="&#xe053;" class="unitRight size1of2 talign-right" />
+			</fieldset>
+			<div class="fs0 bshadow0 clearfix hidden-false">
+				<span class="unit pvs fgc1">liga: </span>
+				<input type="text" readonly value="" class="liga unitRight" />
+			</div>
+		</div>
+		<div class="glyph fs1">
+			<div class="clearfix bshadow0 pbs">
+				<span class="icon-youtube">
+				
+				</span>
+				<span class="mls"> icon-youtube</span>
+			</div>
+			<fieldset class="fs0 size1of1 clearfix hidden-false">
+				<input type="text" readonly value="e055" class="unit size1of2" />
+				<input type="text" maxlength="1" readonly value="&#xe055;" class="unitRight size1of2 talign-right" />
+			</fieldset>
+			<div class="fs0 bshadow0 clearfix hidden-false">
+				<span class="unit pvs fgc1">liga: </span>
+				<input type="text" readonly value="" class="liga unitRight" />
+			</div>
+		</div>
+		<div class="glyph fs1">
+			<div class="clearfix bshadow0 pbs">
+				<span class="icon-close">
+				
+				</span>
+				<span class="mls"> icon-close</span>
+			</div>
+			<fieldset class="fs0 size1of1 clearfix hidden-false">
+				<input type="text" readonly value="2715" class="unit size1of2" />
+				<input type="text" maxlength="1" readonly value="&#x2715;" class="unitRight size1of2 talign-right" />
+			</fieldset>
+			<div class="fs0 bshadow0 clearfix hidden-false">
+				<span class="unit pvs fgc1">liga: </span>
+				<input type="text" readonly value="" class="liga unitRight" />
+			</div>
+		</div>
+		<div class="glyph fs1">
+			<div class="clearfix bshadow0 pbs">
+				<span class="icon-blocked">
+				
+				</span>
+				<span class="mls"> icon-blocked</span>
+			</div>
+			<fieldset class="fs0 size1of1 clearfix hidden-false">
+				<input type="text" readonly value="2718" class="unit size1of2" />
+				<input type="text" maxlength="1" readonly value="&#x2718;" class="unitRight size1of2 talign-right" />
+			</fieldset>
+			<div class="fs0 bshadow0 clearfix hidden-false">
+				<span class="unit pvs fgc1">liga: </span>
+				<input type="text" readonly value="" class="liga unitRight" />
+			</div>
+		</div>
+		<div class="glyph fs1">
+			<div class="clearfix bshadow0 pbs">
+				<span class="icon-cancel-circle">
+				
+				</span>
+				<span class="mls"> icon-cancel-circle</span>
+			</div>
+			<fieldset class="fs0 size1of1 clearfix hidden-false">
+				<input type="text" readonly value="e058" class="unit size1of2" />
+				<input type="text" maxlength="1" readonly value="&#xe058;" class="unitRight size1of2 talign-right" />
+			</fieldset>
+			<div class="fs0 bshadow0 clearfix hidden-false">
+				<span class="unit pvs fgc1">liga: </span>
+				<input type="text" readonly value="" class="liga unitRight" />
+			</div>
+		</div>
+		<div class="glyph fs1">
+			<div class="clearfix bshadow0 pbs">
+				<span class="icon-minus">
+				
+				</span>
+				<span class="mls"> icon-minus</span>
+			</div>
+			<fieldset class="fs0 size1of1 clearfix hidden-false">
+				<input type="text" readonly value="e05a" class="unit size1of2" />
+				<input type="text" maxlength="1" readonly value="&#xe05a;" class="unitRight size1of2 talign-right" />
+			</fieldset>
+			<div class="fs0 bshadow0 clearfix hidden-false">
+				<span class="unit pvs fgc1">liga: </span>
+				<input type="text" readonly value="" class="liga unitRight" />
+			</div>
+		</div>
+		<div class="glyph fs1">
+			<div class="clearfix bshadow0 pbs">
+				<span class="icon-plus">
+				
+				</span>
+				<span class="mls"> icon-plus</span>
+			</div>
+			<fieldset class="fs0 size1of1 clearfix hidden-false">
+				<input type="text" readonly value="271a" class="unit size1of2" />
+				<input type="text" maxlength="1" readonly value="&#x271a;" class="unitRight size1of2 talign-right" />
+			</fieldset>
+			<div class="fs0 bshadow0 clearfix hidden-false">
+				<span class="unit pvs fgc1">liga: </span>
+				<input type="text" readonly value="" class="liga unitRight" />
+			</div>
+		</div>
+		<div class="glyph fs1">
+			<div class="clearfix bshadow0 pbs">
+				<span class="icon-checkbox-checked">
+				
+				</span>
+				<span class="mls"> icon-checkbox-checked</span>
+			</div>
+			<fieldset class="fs0 size1of1 clearfix hidden-false">
+				<input type="text" readonly value="2611" class="unit size1of2" />
+				<input type="text" maxlength="1" readonly value="&#x2611;" class="unitRight size1of2 talign-right" />
+			</fieldset>
+			<div class="fs0 bshadow0 clearfix hidden-false">
+				<span class="unit pvs fgc1">liga: </span>
+				<input type="text" readonly value="" class="liga unitRight" />
+			</div>
+		</div>
+		<div class="glyph fs1">
+			<div class="clearfix bshadow0 pbs">
+				<span class="icon-checkbox-unchecked">
+				
+				</span>
+				<span class="mls"> icon-checkbox-unchecked</span>
+			</div>
+			<fieldset class="fs0 size1of1 clearfix hidden-false">
+				<input type="text" readonly value="2b27" class="unit size1of2" />
+				<input type="text" maxlength="1" readonly value="&#x2b27;" class="unitRight size1of2 talign-right" />
+			</fieldset>
+			<div class="fs0 bshadow0 clearfix hidden-false">
+				<span class="unit pvs fgc1">liga: </span>
+				<input type="text" readonly value="" class="liga unitRight" />
+			</div>
+		</div>
+		<div class="glyph fs1">
+			<div class="clearfix bshadow0 pbs">
+				<span class="icon-checkbox-partial">
+				
+				</span>
+				<span class="mls"> icon-checkbox-partial</span>
+			</div>
+			<fieldset class="fs0 size1of1 clearfix hidden-false">
+				<input type="text" readonly value="2b28" class="unit size1of2" />
+				<input type="text" maxlength="1" readonly value="&#x2b28;" class="unitRight size1of2 talign-right" />
+			</fieldset>
+			<div class="fs0 bshadow0 clearfix hidden-false">
+				<span class="unit pvs fgc1">liga: </span>
+				<input type="text" readonly value="" class="liga unitRight" />
+			</div>
+		</div>
+		<div class="glyph fs1">
+			<div class="clearfix bshadow0 pbs">
+				<span class="icon-radio-checked">
+				
+				</span>
+				<span class="mls"> icon-radio-checked</span>
+			</div>
+			<fieldset class="fs0 size1of1 clearfix hidden-false">
+				<input type="text" readonly value="2b26" class="unit size1of2" />
+				<input type="text" maxlength="1" readonly value="&#x2b26;" class="unitRight size1of2 talign-right" />
+			</fieldset>
+			<div class="fs0 bshadow0 clearfix hidden-false">
+				<span class="unit pvs fgc1">liga: </span>
+				<input type="text" readonly value="" class="liga unitRight" />
+			</div>
+		</div>
+		<div class="glyph fs1">
+			<div class="clearfix bshadow0 pbs">
+				<span class="icon-radio-unchecked">
+				
+				</span>
+				<span class="mls"> icon-radio-unchecked</span>
+			</div>
+			<fieldset class="fs0 size1of1 clearfix hidden-false">
+				<input type="text" readonly value="2b25" class="unit size1of2" />
+				<input type="text" maxlength="1" readonly value="&#x2b25;" class="unitRight size1of2 talign-right" />
+			</fieldset>
+			<div class="fs0 bshadow0 clearfix hidden-false">
+				<span class="unit pvs fgc1">liga: </span>
+				<input type="text" readonly value="" class="liga unitRight" />
+			</div>
+		</div>
+		<div class="glyph fs1">
+			<div class="clearfix bshadow0 pbs">
+				<span class="icon-room-info">
+				
+				</span>
+				<span class="mls"> icon-room-info</span>
+			</div>
+			<fieldset class="fs0 size1of1 clearfix hidden-false">
+				<input type="text" readonly value="e059" class="unit size1of2" />
+				<input type="text" maxlength="1" readonly value="&#xe059;" class="unitRight size1of2 talign-right" />
+			</fieldset>
+			<div class="fs0 bshadow0 clearfix hidden-false">
+				<span class="unit pvs fgc1">liga: </span>
+				<input type="text" readonly value="" class="liga unitRight" />
+			</div>
+		</div>
+		<div class="glyph fs1">
+			<div class="clearfix bshadow0 pbs">
+				<span class="icon-newspaper">
+				
+				</span>
+				<span class="mls"> icon-newspaper</span>
+			</div>
+			<fieldset class="fs0 size1of1 clearfix hidden-false">
+				<input type="text" readonly value="e001" class="unit size1of2" />
+				<input type="text" maxlength="1" readonly value="&#xe001;" class="unitRight size1of2 talign-right" />
+			</fieldset>
+			<div class="fs0 bshadow0 clearfix hidden-false">
+				<span class="unit pvs fgc1">liga: </span>
+				<input type="text" readonly value="" class="liga unitRight" />
+			</div>
+		</div>
+		<div class="glyph fs1">
+			<div class="clearfix bshadow0 pbs">
+				<span class="icon-image">
+				
+				</span>
+				<span class="mls"> icon-image</span>
+			</div>
+			<fieldset class="fs0 size1of1 clearfix hidden-false">
+				<input type="text" readonly value="2b14" class="unit size1of2" />
+				<input type="text" maxlength="1" readonly value="&#x2b14;" class="unitRight size1of2 talign-right" />
+			</fieldset>
+			<div class="fs0 bshadow0 clearfix hidden-false">
+				<span class="unit pvs fgc1">liga: </span>
+				<input type="text" readonly value="" class="liga unitRight" />
+			</div>
+		</div>
+		<div class="glyph fs1">
+			<div class="clearfix bshadow0 pbs">
+				<span class="icon-offline">
+				
+				</span>
+				<span class="mls"> icon-offline</span>
+			</div>
+			<fieldset class="fs0 size1of1 clearfix hidden-false">
+				<input type="text" readonly value="e002" class="unit size1of2" />
+				<input type="text" maxlength="1" readonly value="&#xe002;" class="unitRight size1of2 talign-right" />
+			</fieldset>
+			<div class="fs0 bshadow0 clearfix hidden-false">
+				<span class="unit pvs fgc1">liga: </span>
+				<input type="text" readonly value="" class="liga unitRight" />
+			</div>
+		</div>
+		<div class="glyph fs1">
+			<div class="clearfix bshadow0 pbs">
+				<span class="icon-busy">
+				
+				</span>
+				<span class="mls"> icon-busy</span>
+			</div>
+			<fieldset class="fs0 size1of1 clearfix hidden-false">
+				<input type="text" readonly value="e004" class="unit size1of2" />
+				<input type="text" maxlength="1" readonly value="&#xe004;" class="unitRight size1of2 talign-right" />
+			</fieldset>
+			<div class="fs0 bshadow0 clearfix hidden-false">
+				<span class="unit pvs fgc1">liga: </span>
+				<input type="text" readonly value="" class="liga unitRight" />
+			</div>
+		</div>
+		<div class="glyph fs1">
+			<div class="clearfix bshadow0 pbs">
+				<span class="icon-exit">
+				
+				</span>
+				<span class="mls"> icon-exit</span>
+			</div>
+			<fieldset class="fs0 size1of1 clearfix hidden-false">
+				<input type="text" readonly value="e601" class="unit size1of2" />
+				<input type="text" maxlength="1" readonly value="&#xe601;" class="unitRight size1of2 talign-right" />
+			</fieldset>
+			<div class="fs0 bshadow0 clearfix hidden-false">
+				<span class="unit pvs fgc1">liga: </span>
+				<input type="text" readonly value="" class="liga unitRight" />
+			</div>
+		</div>
+	</div>
+
+	<!--[if gt IE 8]><!-->
+	<div class="mhl clearfix mbl">
+		<h1>Font Test Drive</h1>
+		<label>
+			Font Size: <input id="fontSize" type="number" class="textbox0 mbm"
+			min="8" value="48" />
+			px
+		</label>
+		<input id="testText" type="text" class="phl size1of1 mvl"
+		placeholder="Type some text to test..." value=""/>
+		</label>
+		<div id="testDrive" class="icon-">&nbsp;
+		</div>
+	</div>
+	<!--<![endif]-->
+	<div class="bgc1 clearfix">
+		<p class="mhl">Generated by <a href="https://icomoon.io/app">IcoMoon</a></p>
+	</div>
+
+	<script src="demo-files/demo.js"></script>
+</body>
+</html>
\ No newline at end of file
diff --git a/xmpp/converse/fonticons/fonts/icomoon.eot b/xmpp/converse/fonticons/fonts/icomoon.eot
new file mode 100644
index 00000000..95922f94
Binary files /dev/null and b/xmpp/converse/fonticons/fonts/icomoon.eot differ
diff --git a/xmpp/converse/fonticons/fonts/icomoon.svg b/xmpp/converse/fonticons/fonts/icomoon.svg
new file mode 100644
index 00000000..9b18c557
--- /dev/null
+++ b/xmpp/converse/fonticons/fonts/icomoon.svg
@@ -0,0 +1,102 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<svg xmlns="http://www.w3.org/2000/svg">
+<metadata>Generated by IcoMoon</metadata>
+<defs>
+<font id="icomoon" horiz-adv-x="512">
+<font-face units-per-em="512" ascent="480" descent="-32" />
+<missing-glyph horiz-adv-x="512" />
+<glyph unicode="&#x20;" d="" horiz-adv-x="256" />
+<glyph unicode="&#x231b;" d="M192 416c0-35.346 28.654-64 64-64s64 28.654 64 64c0 35.346-28.654 64-64 64s-64-28.654-64-64zM327.765 359.765c0-35.346 28.654-64 64-64s64 28.654 64 64c0 35.346-28.654 64-64 64s-64-28.654-64-64zM416 224c0-17.673 14.327-32 32-32s32 14.327 32 32c0 17.673-14.327 32-32 32s-32-14.327-32-32zM359.765 88.235c0-17.673 14.327-32 32-32s32 14.327 32 32c0 17.673-14.327 32-32 32s-32-14.327-32-32zM224.001 32c0 0 0 0 0 0 0-17.673 14.327-32 32-32s32 14.327 32 32c0 0 0 0 0 0s0 0 0 0c0 17.673-14.327 32-32 32s-32-14.327-32-32c0 0 0 0 0 0zM88.236 88.235c0 0 0 0 0 0 0-17.673 14.327-32 32-32s32 14.327 32 32c0 0 0 0 0 0s0 0 0 0c0 17.673-14.327 32-32 32s-32-14.327-32-32c0 0 0 0 0 0zM72.236 359.765c0 0 0 0 0 0 0-26.51 21.49-48 48-48s48 21.49 48 48c0 0 0 0 0 0s0 0 0 0c0 26.51-21.49 48-48 48s-48-21.49-48-48c0 0 0 0 0 0zM28 224c0-19.882 16.117-36 36-36s36 16.118 36 36c0 19.882-16.118 36-36 36s-36-16.118-36-36z" />
+<glyph unicode="&#x2360;" d="M256 480c-141.385 0-256-114.615-256-256s114.615-256 256-256 256 114.615 256 256-114.615 256-256 256zM256 16c-114.875 0-208 93.125-208 208s93.125 208 208 208 208-93.125 208-208-93.125-208-208-208zM224 352h64v-64h-64zM320 96h-128v32h32v96h-32v32h96v-128h32z" />
+<glyph unicode="&#x2364;" d="M256-32c141.385 0 256 114.615 256 256s-114.615 256-256 256-256-114.615-256-256 114.615-256 256-256zM256 432c114.875 0 208-93.125 208-208s-93.125-208-208-208-208 93.125-208 208 93.125 208 208 208zM192 128c0 35.346 28.654 64 64 64s64-28.654 64-64c0-35.346-28.654-64-64-64s-64 28.654-64 64zM320 304c0-26.51 14.327-48 32-48s32 21.49 32 48c0 26.51-14.327 48-32 48s-32-21.49-32-48zM128 304c0-26.51 14.327-48 32-48s32 21.49 32 48c0 26.51-14.327 48-32 48s-32-21.49-32-48z" />
+<glyph unicode="&#x2368;" d="M256-32c141.385 0 256 114.615 256 256s-114.615 256-256 256-256-114.615-256-256 114.615-256 256-256zM256 432c114.875 0 208-93.125 208-208s-93.125-208-208-208-208 93.125-208 208 93.125 208 208 208zM128 320c0-17.673 14.327-32 32-32s32 14.327 32 32c0 17.673-14.327 32-32 32s-32-14.327-32-32zM320 320c0-17.673 14.327-32 32-32s32 14.327 32 32c0 17.673-14.327 32-32 32s-32-14.327-32-32zM363.053 160h32.432c4.623-36.253-16.226-72.265-51.979-85.28-41.452-15.088-87.45 6.358-102.54 47.808-9.054 24.872-36.653 37.741-61.524 28.686-22.781-8.294-35.478-32.149-30.494-55.212h-32.43c-4.621 36.254 16.225 72.264 51.978 85.28 41.452 15.089 87.451-6.358 102.541-47.807 9.052-24.874 36.653-37.741 61.522-28.686 22.781 8.292 35.478 32.149 30.494 55.211z" />
+<glyph unicode="&#x2369;" d="M256-32c141.385 0 256 114.615 256 256s-114.615 256-256 256-256-114.615-256-256 114.615-256 256-256zM256 432c114.875 0 208-93.125 208-208s-93.125-208-208-208-208 93.125-208 208 93.125 208 208 208zM372.87 179.19l11.244-38.388-218.504-64.001-11.244 38.388zM128 320c0 17.673 14.327 32 32 32s32-14.327 32-32c0-17.673-14.327-32-32-32s-32 14.327-32 32zM320 320c0 17.673 14.327 32 32 32s32-14.327 32-32c0-17.673-14.327-32-32-32s-32 14.327-32 32z" />
+<glyph unicode="&#x25ba;" d="M96 416l320-192-320-192z" />
+<glyph unicode="&#x25bc;" d="M448 384l-192-320-192 320z" />
+<glyph unicode="&#x25d9;" d="M490.594 399.946c-71.816 10.325-151.166 16.054-234.593 16.054-83.43 0-162.778-5.729-234.597-16.054-13.765-53.863-21.404-113.375-21.404-175.946 0-62.57 7.639-122.083 21.404-175.945 71.819-10.326 151.168-16.055 234.597-16.055 83.427 0 162.776 5.729 234.593 16.055 13.766 53.862 21.406 113.375 21.406 175.945 0 62.571-7.64 122.083-21.406 175.946zM192.001 128v192l160-96-160-96z" />
+<glyph unicode="&#x25fb;" d="M256 384c-27.466 0-53.994-4.331-78.847-12.871-23.356-8.027-44.153-19.372-61.814-33.722-33.107-26.899-51.339-61.492-51.339-97.407 0-20.149 5.594-39.689 16.626-58.076 11.376-18.96 28.491-36.293 49.494-50.126 15.178-9.996 25.39-25.974 28.088-43.947 0.9-5.992 1.464-12.044 1.685-18.062 3.735 3.097 7.375 6.423 10.94 9.988 12.077 12.076 28.39 18.745 45.251 18.745 2.684 0 5.381-0.168 8.078-0.512 10.487-1.333 21.199-2.010 31.838-2.010 27.467 0 53.994 4.33 78.847 12.871 23.356 8.027 44.153 19.372 61.814 33.722 33.107 26.898 51.339 61.492 51.339 97.407s-18.232 70.508-51.339 97.407c-17.661 14.349-38.458 25.695-61.814 33.722-24.853 8.54-51.38 12.871-78.847 12.871zM256 448v0c141.385 0 256-93.125 256-208s-114.615-208-256-208c-13.578 0-26.905 0.867-39.912 2.522-54.989-54.989-120.625-64.85-184.088-66.298v13.458c34.268 16.789 64 47.37 64 82.318 0 4.877-0.379 9.665-1.082 14.348-57.898 38.132-94.918 96.377-94.918 161.652 0 114.875 114.615 208 256 208z" />
+<glyph unicode="&#x25fc;" d="M256 448c141.385 0 256-93.125 256-208s-114.615-208-256-208c-13.578 0-26.905 0.867-39.912 2.522-54.989-54.989-120.625-64.85-184.088-66.298v13.458c34.268 16.789 64 47.37 64 82.318 0 4.877-0.379 9.665-1.082 14.348-57.898 38.132-94.918 96.377-94.918 161.652 0 114.875 114.615 208 256 208z" />
+<glyph unicode="&#x260e;" d="M508.689 192.003c4.002-27.741 6.608-65.696-5.832-80.223-20.571-24.022-150.856-24.022-150.856 24.021 0 24.199 21.428 40.067 0.856 64.089-20.236 23.631-56.513 24.015-96.857 24.021-40.343-0.006-76.621-0.39-96.857-24.021-20.571-24.023 0.857-39.89 0.857-64.089 0-48.043-130.285-48.043-150.857-24.022-12.439 14.527-9.834 52.482-5.831 80.223 3.080 18.519 10.862 38.498 35.774 63.997 0 0.001 0.001 0.001 0.001 0.002 37.369 34.871 93.923 63.369 214.913 63.984v0.015c0.672 0 1.332-0.005 2-0.007 0.669 0.002 1.328 0.007 2 0.007v-0.014c120.99-0.615 177.544-29.113 214.913-63.984 0.001-0.001 0.001-0.002 0.001-0.002 24.912-25.498 32.695-45.477 35.775-63.997z" />
+<glyph unicode="&#x260f;" d="M352 160c-32-32-32-64-64-64s-64 32-96 64-64 64-64 96 32 32 64 64-64 128-96 128-96-96-96-96c0-64 65.75-193.75 128-256s192-128 256-128c0 0 96 64 96 96s-96 128-128 96z" />
+<glyph unicode="&#x2611;" d="M0 480v-512h512v512h-512zM480 0h-448v448h448v-448zM384 368l-160-160-96 96-64-64 160-160 224 224-64 64z" />
+<glyph unicode="&#x2616;" d="M192 336c0-44.183 35.817-80 80-80s80 35.817 80 80c0 44.183-35.817 80-80 80s-80-35.817-80-80zM0 336c0-44.183 35.817-80 80-80s80 35.817 80 80c0 44.183-35.817 80-80 80s-80-35.817-80-80zM384 176v48c0 17.6-14.4 32-32 32h-320c-17.6 0-32-14.4-32-32v-160c0-17.6 14.4-32 32-32h320c17.6 0 32 14.4 32 32v48l128-80v224l-128-80zM320 96h-256v96h256v-96z" />
+<glyph unicode="&#x261d;" d="M464 192c36.5 0 16-96-16-96 16 0 0-80-32-80 0-32-32-48-64-48-135.176 0-87.632 33.825-224 48v256c120.461 36.134 240 126.712 240 208 26.5 0 96-32 0-192 0 0 80 0 96 0 48 0 32-96 0-96zM96 272v-256h32v-16h-64c-17.6 0-32 21.6-32 48v192c0 26.4 14.4 48 32 48h64v-16h-32z" />
+<glyph unicode="&#x261f;" d="M319.998 256c-17.673 0-32 14.327-31.999 32.001 0 0.585 0.018 1.165 0.049 1.742 1.016 23.727 22.606 39.473 40.796 48.569 17.371 8.685 34.551 13.030 35.274 13.211 8.573 2.144 17.259-3.069 19.403-11.642 2.142-8.573-3.070-17.259-11.642-19.403-8.813-2.225-19.261-6.060-28.468-10.675 5.324-5.715 8.587-13.376 8.587-21.803 0-17.673-14.327-32-32-32zM140.121 320.478c-8.572 2.143-13.784 10.83-11.641 19.402s10.83 13.786 19.403 11.642c0.722-0.181 17.903-4.525 35.274-13.211 18.191-9.095 39.78-24.842 40.796-48.569 0.031-0.577 0.049-1.158 0.049-1.742 0-17.673-14.327-32-32-32s-32 14.327-32 32c0 8.427 3.263 16.088 8.587 21.803-9.207 4.615-19.656 8.45-28.468 10.675zM256 112c40.777 0 76.462 21.796 96.049 54.37l41.164-24.698c-27.981-46.535-78.958-77.672-137.213-77.672s-109.232 31.137-137.213 77.672l41.164 24.698c19.587-32.574 55.271-54.37 96.049-54.37zM512 448c0 22.758-4.762 44.4-13.326 64-16.788-38.418-48.224-68.966-87.247-84.589-43.097 32.98-96.968 52.589-155.427 52.589s-112.33-19.609-155.427-52.589c-39.024 15.623-70.459 46.171-87.247 84.589-8.564-19.6-13.326-41.242-13.326-64 0-36.787 12.425-70.664 33.294-97.689-21.185-37.271-33.294-80.375-33.294-126.311 0-141.385 114.615-256 256-256s256 114.615 256 256c0 45.936-12.109 89.040-33.294 126.311 20.869 27.025 33.294 60.902 33.294 97.689zM256 16c-114.875 0-208 93.125-208 208s93.125 208 208 208 208-93.125 208-208-93.125-208-208-208z" />
+<glyph unicode="&#x2639;" d="M256-32c141.385 0 256 114.615 256 256s-114.615 256-256 256-256-114.615-256-256 114.615-256 256-256zM256 432c114.875 0 208-93.125 208-208s-93.125-208-208-208-208 93.125-208 208 93.125 208 208 208zM128 320c0 17.673 14.327 32 32 32s32-14.327 32-32c0-17.673-14.327-32-32-32s-32 14.327-32 32zM320 320c0 17.673 14.327 32 32 32s32-14.327 32-32c0-17.673-14.327-32-32-32s-32 14.327-32 32zM159.951 89.63l-41.164 24.698c27.981 46.535 78.958 77.672 137.213 77.672s109.231-31.137 137.213-77.672l-41.164-24.698c-19.587 32.574-55.271 54.37-96.049 54.37-40.779 0-76.462-21.796-96.049-54.37z" />
+<glyph unicode="&#x263a;" d="M256-32c141.385 0 256 114.615 256 256s-114.615 256-256 256-256-114.615-256-256 114.615-256 256-256zM256 432c114.875 0 208-93.125 208-208s-93.125-208-208-208-208 93.125-208 208 93.125 208 208 208zM128 320c0 17.673 14.327 32 32 32s32-14.327 32-32c0-17.673-14.327-32-32-32s-32 14.327-32 32zM320 320c0 17.673 14.327 32 32 32s32-14.327 32-32c0-17.673-14.327-32-32-32s-32 14.327-32 32zM352.049 166.37l41.164-24.698c-27.981-46.535-78.958-77.672-137.213-77.672s-109.232 31.137-137.213 77.672l41.164 24.698c19.587-32.574 55.271-54.37 96.049-54.37s76.462 21.796 96.049 54.37z" />
+<glyph unicode="&#x263b;" d="M256-32c141.385 0 256 114.615 256 256s-114.615 256-256 256-256-114.615-256-256 114.615-256 256-256zM256 432c114.875 0 208-93.125 208-208s-93.125-208-208-208-208 93.125-208 208 93.125 208 208 208zM256 180.62c57.975 0 113.115 15.403 160 42.46-7.287-89.219-76.564-159.080-160-159.080-83.434 0-152.711 69.936-160 159.152 46.885-27.056 102.025-42.532 160-42.532zM128 304c0-26.51 14.327-48 32-48s32 21.49 32 48c0 26.51-14.327 48-32 48s-32-21.49-32-48zM320 304c0-26.51 14.327-48 32-48s32 21.49 32 48c0 26.51-14.327 48-32 48s-32-21.49-32-48z" />
+<glyph unicode="&#x266b;" d="M160 384l352 96v-368c0-44.183-50.145-80-112-80s-112 35.817-112 80c0 44.183 50.145 80 112 80 17.179 0 33.451-2.766 48-7.703v164.794l-224-61.091v-240c0-44.183-50.144-80-112-80s-112 35.817-112 80c0 44.183 50.144 80 112 80 17.179 0 33.451-2.766 48-7.703v263.703z" />
+<glyph unicode="&#x266c;" d="M96 190.857v-221.715c5.227-0.748 10.567-1.143 16-1.143h16v224.001h-16c-5.433 0-10.773-0.395-16-1.143zM384 192v-224h16c5.434 0 10.773 0.395 16 1.143v221.714c-5.227 0.748-10.566 1.143-16 1.143h-16zM512 224c0 141.385-114.615 256-256 256s-256-114.615-256-256c0-30.709 5.414-60.153 15.328-87.437-9.736-16.601-15.328-35.926-15.328-56.563 0-44.677 26.163-83.239 64-101.216v202.432c-10.063-4.781-19.29-11.030-27.429-18.452-2.996 14.61-4.571 29.739-4.571 45.236 0 123.712 100.288 224 224 224s224-100.288 224-224c0-15.497-1.574-30.626-4.571-45.236-8.14 7.422-17.365 13.671-27.429 18.452v-202.432c37.838 17.977 64 56.539 64 101.216 0 20.637-5.592 39.962-15.328 56.563 9.914 27.284 15.328 56.728 15.328 87.437z" />
+<glyph unicode="&#x26a0;" d="M256 400.638l-172.417-368.638h344.834l-172.417 368.638zM256 480v0c11.035 0 22.070-7.441 30.442-22.324l218.536-435.556c16.745-29.766 2.5-54.12-31.651-54.12h-434.654c-34.152 0-48.395 24.354-31.652 54.12l218.537 435.556c8.372 14.883 19.407 22.324 30.442 22.324zM224 96c0-17.673 14.327-32 32-32s32 14.327 32 32c0 17.673-14.327 32-32 32s-32-14.327-32-32zM256 288c17.673 0 32-14.327 32-32l-10-96h-44l-10 96c0 17.673 14.327 32 32 32z" />
+<glyph unicode="&#x2709;" d="M464 416h-416c-26.4 0-48-21.6-48-48v-320c0-26.4 21.6-48 48-48h416c26.4 0 48 21.6 48 48v320c0 26.4-21.6 48-48 48zM199.37 204.814l-135.37-105.446v250.821l135.37-145.375zM88.19 352h335.62l-167.81-126-167.81 126zM204.644 199.151l51.356-55.151 51.355 55.151 105.277-135.151h-313.264l105.276 135.151zM312.63 204.814l135.37 145.375v-250.821l-135.37 105.446z" />
+<glyph unicode="&#x270e;" d="M432 480c44.182 0 80-35.817 80-80 0-18.010-5.955-34.629-16-48l-32-32-112 112 32 32c13.371 10.045 29.989 16 48 16zM32 112l-32-144 144 32 296 296-112 112-296-296zM357.789 298.211l-224-224-27.578 27.578 224 224 27.578-27.578z" />
+<glyph unicode="&#x270f;" d="M480 352c17.673 0 32 14.327 32 32v64h-64v32h-416c-17.6 0-32-14.399-32-32v-448c0-17.6 14.398-32 32-32h416v128h32c17.673 0 32 14.327 32 32v64h-64v32h32c17.673 0 32 14.327 32 32v64h-64v32h32zM288 351.835c35.255 0 63.835-28.58 63.835-63.835s-28.58-63.835-63.835-63.835c-35.255 0-63.835 28.58-63.835 63.835s28.58 63.835 63.835 63.835zM128 0h-32v448h32v-448zM384 96h-192v32c0 35.347 28.654 64 64 64v0h64c35.348 0 64-28.653 64-64v-32z" />
+<glyph unicode="&#x2710;" d="M449.18 448h-385.18v-64h-46.82c-8.8 0-17.18-6.264-17.18-15.064v-32c0-8.8 8.38-16.936 17.18-16.936h46.82v-32h-46.82c-8.8 0-17.18-6.264-17.18-15.064v-32c0-8.8 8.38-16.936 17.18-16.936h46.82v-32h-46.82c-8.8 0-17.18-6.264-17.18-15.064v-32c0-8.799 8.38-16.936 17.18-16.936h46.82v-32h-46.82c-8.8 0-17.18-6.264-17.18-15.064v-32c0-8.8 8.38-16.936 17.18-16.936h46.82v-64h385.18c17.674 0 30.82 15.263 30.82 32.936v416c0 17.673-13.146 31.064-30.82 31.064zM160 0h-64v32h17.18c8.8 0 14.82 8.136 14.82 16.936v32c0 8.801-6.021 15.064-14.82 15.064h-17.18v32h17.18c8.8 0 14.82 8.136 14.82 16.936v32c0 8.801-6.021 15.064-14.82 15.064h-17.18v32h17.18c8.8 0 14.82 8.136 14.82 16.936v32c0 8.801-6.021 15.064-14.82 15.064h-17.18v32h17.18c8.8 0 14.82 8.136 14.82 16.936v32c0 8.801-6.020 15.064-14.82 15.064h-17.18v32h64v-416z" />
+<glyph unicode="&#x2713;" d="M432 416l-240-240-112 112-80-80 192-192 320 320z" />
+<glyph unicode="&#x2715;" d="M507.331 68.67c-0.002 0.002-0.004 0.004-0.006 0.005l-155.322 155.325 155.322 155.325c0.002 0.002 0.004 0.003 0.006 0.005 1.672 1.673 2.881 3.627 3.656 5.708 2.123 5.688 0.912 12.341-3.662 16.915l-73.373 73.373c-4.574 4.573-11.225 5.783-16.914 3.66-2.080-0.775-4.035-1.984-5.709-3.655 0-0.002-0.002-0.003-0.004-0.005l-155.324-155.326-155.324 155.325c-0.002 0.002-0.003 0.003-0.005 0.005-1.673 1.671-3.627 2.88-5.707 3.655-5.69 2.124-12.341 0.913-16.915-3.66l-73.374-73.374c-4.574-4.574-5.784-11.226-3.661-16.914 0.776-2.080 1.985-4.036 3.656-5.708 0.002-0.001 0.003-0.003 0.005-0.005l155.325-155.324-155.325-155.326c-0.001-0.002-0.003-0.003-0.004-0.005-1.671-1.673-2.88-3.627-3.657-5.707-2.124-5.688-0.913-12.341 3.661-16.915l73.374-73.373c4.575-4.574 11.226-5.784 16.915-3.661 2.080 0.776 4.035 1.985 5.708 3.656 0.001 0.002 0.003 0.003 0.005 0.005l155.324 155.325 155.324-155.325c0.002-0.001 0.004-0.003 0.006-0.004 1.674-1.672 3.627-2.881 5.707-3.657 5.689-2.123 12.342-0.913 16.914 3.661l73.373 73.374c4.574 4.574 5.785 11.227 3.662 16.915-0.776 2.080-1.985 4.034-3.657 5.707z" />
+<glyph unicode="&#x2718;" d="M0 224c0-141.385 114.615-256 256-256s256 114.615 256 256-114.614 256-256 256c-141.385 0-256-114.615-256-256zM448 224c0-36.618-10.256-70.84-28.044-99.956l-263.911 263.912c29.115 17.789 63.337 28.044 99.955 28.044 106.038 0 192-85.961 192-192zM64 224c0 36.618 10.256 70.839 28.045 99.956l263.911-263.912c-29.117-17.789-63.338-28.044-99.956-28.044-106.038 0-192 85.961-192 192z" />
+<glyph unicode="&#x271a;" d="M496 288h-176v176c0 8.836-7.164 16-16 16h-96c-8.836 0-16-7.164-16-16v-176h-176c-8.836 0-16-7.164-16-16v-96c0-8.836 7.164-16 16-16h176v-176c0-8.836 7.164-16 16-16h96c8.836 0 16 7.164 16 16v176h176c8.836 0 16 7.164 16 16v96c0 8.836-7.164 16-16 16z" />
+<glyph unicode="&#x2764;" d="M512 300.922c0 81.229-65.85 147.078-147.078 147.078-43.181 0-82.015-18.609-108.922-48.245-26.907 29.636-65.741 48.245-108.922 48.245-81.229 0-147.078-65.849-147.078-147.078 0-43.181 18.609-82.015 48.245-108.922h-0.245l160-160c16-16 32-32 48-32s32 16 48 32l160 160h-0.245c29.636 26.907 48.245 65.741 48.245 108.922zM420.734 239.384l-161.989-162.129c-0.839-0.839-1.766-1.766-2.745-2.74-0.98 0.975-1.907 1.901-2.745 2.74l-161.989 162.128c-17.583 15.964-27.266 37.819-27.266 61.539 0 45.809 37.269 83.078 83.078 83.078 23.72 0 45.575-9.683 61.538-27.266l47.384-52.19 47.384 52.189c15.964 17.584 37.818 27.267 61.538 27.267 45.809 0 83.078-37.269 83.078-83.078 0-23.72-9.684-45.575-27.266-61.538z" />
+<glyph unicode="&#x2b14;" d="M448 384h-384v-320h384v320zM512 448v0-448h-512v448h512zM416 96h-320v64l96 160 131.5-160 92.5 64v-32zM320 304c0-26.51 21.49-48 48-48s48 21.49 48 48c0 26.51-21.49 48-48 48s-48-21.49-48-48z" />
+<glyph unicode="&#x2b25;" d="M256 480c-141.385 0-256-114.615-256-256s114.615-256 256-256 256 114.615 256 256-114.615 256-256 256zM256 32c-106.039 0-192 85.961-192 192s85.961 192 192 192c106.039 0 192-85.961 192-192s-85.961-192-192-192z" />
+<glyph unicode="&#x2b26;" d="M256 480c-141.385 0-256-114.615-256-256s114.615-256 256-256 256 114.615 256 256-114.615 256-256 256zM256 32c-106.039 0-192 85.961-192 192s85.961 192 192 192c106.039 0 192-85.961 192-192s-85.961-192-192-192zM160 224c0-53.019 42.981-96 96-96s96 42.981 96 96c0 53.019-42.981 96-96 96s-96-42.981-96-96z" />
+<glyph unicode="&#x2b27;" d="M0 480v-512h512v512h-512zM480 0h-448v448h448v-448z" />
+<glyph unicode="&#x2b28;" d="M0 480v-512h512v512h-512zM480 0h-448v448h448v-448zM128 352h256v-256h-256z" />
+<glyph unicode="&#xe000;" d="M512 184.778l-256 198.713-256-198.714v81.019l256 198.713 256-198.714zM448 192v-192h-128v128h-128v-128h-128v192l192 144z" />
+<glyph unicode="&#xe001;" d="M448 352v64h-448v-352c0-17.673 14.327-32 32-32h432c26.511 0 48 21.489 48 48v272h-64zM416 64h-384v320h384v-320zM64 320h320v-32h-320zM256 256h128v-32h-128zM256 192h128v-32h-128zM256 128h96v-32h-96zM64 256h160v-160h-160z" />
+<glyph unicode="&#xe002;" d="M256 448c-141.382 0-256-93.106-256-208.004 0-65.249 37.368-123.33 95.271-161.451 0.698-4.701 0.729-9.658 0.729-14.545 0-34.956-29.743-65.404-64-82.184v-13.816c63.465 1.443 129.008 11.21 184.002 66.18 13.009-1.652 26.43-2.18 39.998-2.18 141.382 0 256 93.13 256 207.996 0 114.898-114.618 208.004-256 208.004zM162.909 382.542c1.575 0.325 3.576-0.156 5.089-0.722 1.109-0.411 2.017-1.288 2.909-2.188l82.913-82.905 82.905 82.905c0.9 0.9 1.808 1.777 2.909 2.188 3.049 1.133 7.006 0.248 9.457-2.188l39.277-39.268c2.428-2.452 2.583-5.694 1.45-8.728-0.411-1.109-0.558-2.017-1.45-2.909l-83.643-82.913 83.643-82.905c0.892-0.892 1.039-1.8 1.45-2.909 1.141-3.041 0.993-7.005-1.45-9.456l-39.277-39.269c-2.451-2.436-6.423-2.591-9.457-1.459-1.101 0.411-2.009 0.559-2.909 1.459l-82.905 82.905-82.913-82.905c-0.892-0.9-1.8-1.048-2.909-1.459-3.041-1.14-7.005-0.993-9.449 1.459l-38.547 39.269c-2.436 2.451-3.313 6.423-2.18 9.456 0.403 1.109 1.28 2.017 2.18 2.909l82.905 82.905-82.905 82.913c-0.9 0.892-1.777 1.8-2.18 2.909-1.148 3.041-0.271 6.276 2.18 8.728l38.547 39.268c1.218 1.218 2.785 2.592 4.36 2.91z" />
+<glyph unicode="&#xe003;" d="M152 176c0-57.438 46.562-104 104-104s104 46.562 104 104-46.562 104-104 104-104-46.562-104-104zM480 352h-112c-8 32-16 64-48 64h-128c-32 0-40-32-48-64h-112c-17.6 0-32-14.4-32-32v-288c0-17.6 14.4-32 32-32h448c17.6 0 32 14.4 32 32v288c0 17.6-14.4 32-32 32zM256 34c-78.425 0-142 63.574-142 142s63.575 142 142 142c78.426 0 142-63.575 142-142s-63.573-142-142-142zM480 256h-64v32h64v-32z" />
+<glyph unicode="&#xe004;" d="M256 448c-141.382 0-256-93.106-256-208.004 0-65.249 37.368-123.33 95.271-161.451 0.698-4.701 0.729-9.658 0.729-14.545 0-34.956-29.743-65.404-64-82.184v-13.816c63.465 1.443 129.008 11.21 184.002 66.18 13.009-1.652 26.43-2.18 39.998-2.18 141.382 0 256 93.13 256 207.996 0 114.898-114.618 208.004-256 208.004zM77.816 288h347.64c6.408 0 11.637-5.229 11.637-11.636v-69.819c0-6.407-5.229-11.636-11.637-11.636h-347.64c-6.408 0-11.636 5.229-11.636 11.636v69.819c0 6.407 5.228 11.636 11.636 11.636z" />
+<glyph unicode="&#xe012;" d="M272 480l-48-48 48-48-112-128h-112l88-88-136-180.308v-19.692h19.692l180.308 136 88-88v112l128 112 48-48 48 48-240 240zM224 208l-32 32 112 112 32-32-112-112z" />
+<glyph unicode="&#xe015;" d="M544 29.417c0-22.75 13.014-42.454 32-52.092v-7.969c-5.313-0.727-10.736-1.112-16.25-1.112-34.004 0-64.674 14.264-86.361 37.132-13.111-3.491-27.001-5.376-41.389-5.376-79.529 0-144 57.308-144 128s64.471 128 144 128c79.529 0 144-57.308 144-128 0-27.674-9.882-53.296-26.678-74.233-3.412-7.412-5.322-15.656-5.322-24.35zM115.339 369.407c-33.107-26.899-51.339-61.492-51.339-97.407 0-20.149 5.594-39.689 16.626-58.075 11.376-18.96 28.491-36.293 49.494-50.126 15.178-9.996 25.39-25.974 28.088-43.947 0.9-5.992 1.464-12.044 1.685-18.062 3.735 3.097 7.375 6.423 10.94 9.988 12.077 12.076 28.39 18.745 45.251 18.745 2.684 0 5.381-0.168 8.078-0.512 10.474-1.331 21.172-2.008 31.797-2.010v-64c-13.564 0.001-26.877 0.869-39.871 2.521-54.989-54.989-120.625-64.85-184.088-66.298v13.458c34.268 16.789 64 47.37 64 82.318 0 4.877-0.379 9.665-1.082 14.348-57.898 38.132-94.918 96.377-94.918 161.652 0 114.875 114.615 208 256 208 139.229 0 252.496-90.307 255.918-202.76-20.548 9.158-42.92 14.711-66.131 16.289-5.765 28.034-22.701 54.408-49.126 75.878-17.661 14.349-38.458 25.695-61.814 33.722-24.853 8.54-51.38 12.871-78.847 12.871s-53.994-4.331-78.847-12.871c-23.356-8.027-44.153-19.372-61.814-33.722z" horiz-adv-x="576" />
+<glyph unicode="&#xe016;" d="M240 480v0c132.548 0 240-86.957 240-194.224s-107.452-194.224-240-194.224c-12.729 0-25.223 0.81-37.417 2.355-51.553-51.347-111.086-60.554-170.583-61.907v12.567c32.126 15.677 58 44.233 58 76.867 0 4.553-0.356 9.024-1.015 13.397-54.279 35.607-88.985 89.994-88.985 150.945 0 107.267 107.452 194.224 240 194.224zM498 44.657c0-27.971 18.157-52.449 46-65.886v-10.771c-51.563 1.159-98.893 9.051-143.571 53.063-10.57-1.325-21.397-2.020-32.429-2.020-47.735 0-91.704 12.879-126.807 34.52 72.337 0.253 140.63 23.427 192.417 65.336 26.104 21.126 46.697 45.913 61.207 73.674 15.383 29.433 23.183 60.791 23.183 93.203 0 5.224-0.225 10.418-0.629 15.584 36.285-29.967 58.629-70.811 58.629-115.838 0-52.244-30.079-98.861-77.12-129.382-0.571-3.748-0.88-7.58-0.88-11.483z" horiz-adv-x="576" />
+<glyph unicode="&#xe017;" d="M240 416c-25.333 0-49.791-3.975-72.693-11.814-21.462-7.347-40.557-17.718-56.751-30.823-30.022-24.295-46.556-55.401-46.556-87.587 0-17.995 5.033-35.474 14.96-51.949 10.343-17.17 25.949-32.897 45.13-45.479 15.22-9.984 25.468-25.976 28.181-43.975 0.451-2.995 0.815-6.003 1.090-9.016 1.361 1.26 2.712 2.557 4.057 3.897 12.069 12.020 28.344 18.656 45.161 18.656 2.674 0 5.359-0.168 8.047-0.509 9.68-1.226 19.562-1.848 29.374-1.848 25.333 0 49.79 3.974 72.692 11.814 21.463 7.346 40.558 17.717 56.752 30.822 30.023 24.295 46.556 55.401 46.556 87.587s-16.533 63.291-46.556 87.587c-16.194 13.106-35.289 23.476-56.752 30.823-22.902 7.839-47.359 11.814-72.692 11.814zM240 480v0c132.548 0 240-86.957 240-194.224s-107.452-194.224-240-194.224c-12.729 0-25.223 0.81-37.417 2.355-51.553-51.347-111.086-60.554-170.583-61.907v12.567c32.126 15.677 58 44.233 58 76.867 0 4.553-0.356 9.024-1.015 13.397-54.279 35.607-88.985 89.994-88.985 150.945 0 107.267 107.452 194.224 240 194.224zM498 44.657c0-27.971 18.157-52.449 46-65.886v-10.771c-51.563 1.159-98.893 9.051-143.571 53.063-10.57-1.325-21.397-2.020-32.429-2.020-47.735 0-91.704 12.879-126.807 34.52 72.337 0.253 140.63 23.427 192.417 65.336 26.104 21.126 46.697 45.913 61.207 73.674 15.383 29.433 23.183 60.791 23.183 93.203 0 5.224-0.225 10.418-0.629 15.584 36.285-29.967 58.629-70.811 58.629-115.838 0-52.244-30.079-98.861-77.12-129.382-0.571-3.748-0.88-7.58-0.88-11.483z" horiz-adv-x="576" />
+<glyph unicode="&#xe01a;" d="M424-32h-336c-13.255 0-24 10.745-24 24 0 34.431 14.534 76.102 38.879 111.471 20.346 29.559 45.342 51.81 72.339 64.805-11.899 10.822-22.147 24.013-30.254 39.061-13 24.131-19.873 52.024-19.873 80.664 0 39.803 13.102 77.411 36.893 105.895 24.832 29.73 58.221 46.104 94.016 46.104s69.184-16.374 94.017-46.105c23.79-28.484 36.893-66.091 36.893-105.895 0-28.64-6.872-56.533-19.872-80.664-8.107-15.048-18.355-28.239-30.255-39.061 26.997-12.995 51.993-35.246 72.339-64.805 24.344-35.368 38.878-77.039 38.878-111.47 0-13.255-10.745-24-24-24zM115.037 16h281.926c-4.613 19.67-14.26 41.192-27.381 60.255-20.727 30.113-46.588 49.811-72.819 55.463-11.053 2.382-18.944 12.155-18.944 23.462v17.146c0 8.63 4.633 16.595 12.135 20.861 29.739 16.916 48.956 54.133 48.956 94.813 0 57.346-37.192 104-82.909 104s-82.909-46.654-82.909-104c0-40.68 19.217-77.896 48.957-94.813 7.501-4.267 12.134-12.231 12.134-20.861v-17.146c0-11.307-7.892-21.080-18.944-23.462-26.231-5.652-52.092-25.35-72.82-55.463-13.123-19.063-22.768-40.585-27.382-60.255z" />
+<glyph unicode="&#xe01b;" d="M488-32h-336c-13.255 0-24 10.745-24 24 0 34.431 14.534 76.102 38.879 111.471 20.346 29.559 45.342 51.81 72.339 64.805-11.899 10.822-22.147 24.013-30.254 39.061-13 24.131-19.873 52.024-19.873 80.664 0 39.803 13.102 77.411 36.893 105.895 24.832 29.73 58.221 46.104 94.016 46.104s69.184-16.374 94.017-46.105c23.79-28.484 36.893-66.091 36.893-105.895 0-28.64-6.872-56.533-19.872-80.664-8.107-15.048-18.355-28.239-30.255-39.061 26.997-12.995 51.993-35.246 72.339-64.805 24.344-35.368 38.878-77.039 38.878-111.47 0-13.255-10.745-24-24-24zM179.037 16h281.926c-4.613 19.67-14.26 41.192-27.381 60.255-20.727 30.113-46.588 49.811-72.819 55.463-11.053 2.382-18.944 12.155-18.944 23.462v17.146c0 8.63 4.633 16.595 12.135 20.861 29.739 16.916 48.956 54.133 48.956 94.813 0 57.346-37.192 104-82.909 104s-82.909-46.654-82.909-104c0-40.68 19.217-77.896 48.957-94.813 7.501-4.267 12.134-12.231 12.134-20.861v-17.146c0-11.307-7.892-21.080-18.944-23.462-26.231-5.652-52.092-25.35-72.82-55.463-13.123-19.063-22.768-40.585-27.382-60.255zM98.557 48h-47.52c4.614 19.67 14.259 41.192 27.38 60.255 20.728 30.113 46.589 49.811 72.82 55.463 11.053 2.382 18.944 12.155 18.944 23.462v17.146c0 8.63-4.633 16.595-12.134 20.861-29.74 16.917-48.957 54.133-48.957 94.813 0 57.346 37.192 104 82.909 104 3.127 0 6.213-0.226 9.251-0.651 13.179 14.667 28.117 26.587 44.321 35.502-16.596 8.616-34.75 13.149-53.571 13.149-35.795 0-69.184-16.374-94.017-46.105-23.79-28.484-36.892-66.092-36.892-105.895 0-28.64 6.872-56.533 19.873-80.664 8.107-15.048 18.355-28.238 30.254-39.061-26.997-12.995-51.993-35.246-72.339-64.805-24.345-35.368-38.879-77.039-38.879-111.47 0-13.255 10.745-24 24-24h66.193c0.738 15.513 3.599 31.706 8.364 48z" />
+<glyph unicode="&#xe01c;" d="M461.118-32h-317.491c-12.525 0-22.678 10.153-22.678 22.678 0 32.534 13.733 71.91 36.738 105.331 19.225 27.93 42.844 48.956 68.354 61.235-11.244 10.226-20.927 22.69-28.588 36.909-12.284 22.801-18.779 49.159-18.779 76.221 0 37.611 12.381 73.147 34.861 100.062 23.464 28.092 55.014 43.564 88.837 43.564s65.373-15.472 88.838-43.565c22.48-26.915 34.861-62.45 34.861-100.062 0-27.063-6.493-53.419-18.777-76.221-7.661-14.219-17.344-26.683-28.589-36.909 25.51-12.279 49.129-33.305 68.354-61.235 23.003-33.42 36.736-72.796 36.736-105.329 0-12.525-10.153-22.678-22.678-22.678zM169.175 13.356h266.396c-4.359 18.587-13.474 38.923-25.873 56.936-19.586 28.454-44.022 47.067-68.808 52.408-10.444 2.251-17.901 11.486-17.901 22.17v16.202c0 8.154 4.378 15.681 11.466 19.712 28.101 15.984 46.26 51.151 46.26 89.59 0 54.187-35.144 98.271-78.342 98.271s-78.342-44.084-78.342-98.271c0-38.439 18.159-73.605 46.26-89.59 7.088-4.032 11.466-11.558 11.466-19.712v-16.202c0-10.684-7.457-19.919-17.901-22.169-24.786-5.341-49.222-23.954-68.808-52.408-12.4-18.013-21.514-38.349-25.874-56.936zM93.128 43.593h-44.903c4.36 18.587 13.474 38.923 25.872 56.936 19.586 28.454 44.023 47.067 68.809 52.408 10.444 2.251 17.9 11.486 17.9 22.169v16.202c0 8.154-4.378 15.681-11.465 19.712-28.102 15.985-46.26 51.151-46.26 89.59 0 54.187 35.144 98.271 78.342 98.271 2.954 0 5.871-0.213 8.742-0.615 12.453 13.859 26.568 25.123 41.88 33.547-15.682 8.142-32.836 12.424-50.62 12.424-33.823 0-65.373-15.472-88.838-43.565-22.48-26.915-34.86-62.451-34.86-100.062 0-27.063 6.493-53.419 18.778-76.221 7.66-14.219 17.344-26.683 28.588-36.909-25.51-12.279-49.129-33.305-68.354-61.235-23.004-33.42-36.737-72.796-36.737-105.329 0-12.525 10.153-22.678 22.678-22.678h62.547c0.698 14.659 3.401 29.959 7.903 45.356zM363.512 444.513v-27.615c0-2.542 2.061-4.603 4.603-4.603h138.077c2.542 0 4.603 2.061 4.603 4.603v27.615c0 2.542-2.061 4.603-4.603 4.603h-138.077c-2.542 0-4.603-2.061-4.603-4.603z" />
+<glyph unicode="&#xe01d;" d="M112.5 256c61.856 0 112-50.145 112-112s-50.144-112-112-112-112 50.144-112 112l-0.5 16c0 123.712 100.288 224 224 224v-64c-42.737 0-82.917-16.643-113.137-46.863-5.817-5.818-11.126-12.008-15.915-18.51 5.719 0.9 11.58 1.373 17.552 1.373zM400.5 256c61.855 0 112-50.145 112-112s-50.145-112-112-112-112 50.144-112 112l-0.5 16c0 123.712 100.288 224 224 224v-64c-42.737 0-82.917-16.643-113.137-46.863-5.818-5.818-11.127-12.008-15.916-18.51 5.72 0.9 11.58 1.373 17.553 1.373z" />
+<glyph unicode="&#xe01e;" d="M461.118-32h-317.491c-12.525 0-22.678 10.153-22.678 22.678 0 32.534 13.733 71.91 36.738 105.331 19.225 27.93 42.844 48.956 68.354 61.235-11.244 10.226-20.927 22.69-28.588 36.909-12.284 22.801-18.779 49.159-18.779 76.221 0 37.611 12.381 73.147 34.861 100.062 23.464 28.092 55.014 43.564 88.837 43.564s65.373-15.472 88.838-43.565c22.48-26.915 34.861-62.45 34.861-100.062 0-27.063-6.493-53.419-18.777-76.221-7.661-14.219-17.344-26.683-28.589-36.909 25.51-12.279 49.129-33.305 68.354-61.235 23.003-33.42 36.736-72.796 36.736-105.329 0-12.525-10.153-22.678-22.678-22.678zM169.175 13.356h266.396c-4.359 18.587-13.474 38.923-25.873 56.936-19.586 28.454-44.022 47.067-68.808 52.408-10.444 2.251-17.901 11.486-17.901 22.17v16.202c0 8.154 4.378 15.681 11.466 19.712 28.101 15.984 46.26 51.151 46.26 89.59 0 54.187-35.144 98.271-78.342 98.271s-78.342-44.084-78.342-98.271c0-38.439 18.159-73.605 46.26-89.59 7.088-4.032 11.466-11.558 11.466-19.712v-16.202c0-10.684-7.457-19.919-17.901-22.169-24.786-5.341-49.222-23.954-68.808-52.408-12.4-18.013-21.514-38.349-25.874-56.936zM93.128 43.593h-44.903c4.36 18.587 13.474 38.923 25.872 56.936 19.586 28.454 44.023 47.067 68.809 52.408 10.444 2.251 17.9 11.486 17.9 22.169v16.202c0 8.154-4.378 15.681-11.465 19.712-28.102 15.985-46.26 51.151-46.26 89.59 0 54.187 35.144 98.271 78.342 98.271 2.954 0 5.871-0.213 8.742-0.615 12.453 13.859 26.568 25.123 41.88 33.547-15.682 8.142-32.836 12.424-50.62 12.424-33.823 0-65.373-15.472-88.838-43.565-22.48-26.915-34.86-62.451-34.86-100.062 0-27.063 6.493-53.419 18.778-76.221 7.66-14.219 17.344-26.683 28.588-36.909-25.51-12.279-49.129-33.305-68.354-61.235-23.004-33.42-36.737-72.796-36.737-105.329 0-12.525 10.153-22.678 22.678-22.678h62.547c0.698 14.659 3.401 29.959 7.903 45.356zM512.211 429.587h-48.225v48.225c0 2.421-1.963 4.384-4.384 4.384h-26.305c-2.421 0-4.384-1.963-4.384-4.384v-48.225h-48.225c-2.421 0-4.384-1.963-4.384-4.384v-26.304c0-2.421 1.963-4.384 4.384-4.384h48.225v-48.225c0-2.421 1.963-4.384 4.384-4.384h26.305c2.421 0 4.384 1.963 4.384 4.384v48.225h48.225c2.421 0 4.384 1.963 4.384 4.384v26.305c0 2.421-1.963 4.384-4.384 4.384z" />
+<glyph unicode="&#xe01f;" d="M256 432c-55.559 0-107.792-21.636-147.078-60.922s-60.922-91.519-60.922-147.078c0-55.559 21.636-107.792 60.922-147.078s91.519-60.922 147.078-60.922c55.559 0 107.792 21.636 147.078 60.922s60.922 91.519 60.922 147.078c0 55.559-21.636 107.792-60.922 147.078s-91.519 60.922-147.078 60.922zM256 480v0c141.385 0 256-114.615 256-256s-114.615-256-256-256c-141.385 0-256 114.615-256 256s114.615 256 256 256zM224 128h64v-64h-64zM224 384h64v-192h-64z" />
+<glyph unicode="&#xe021;" d="M496.131 44.302l-121.276 103.147c-12.537 11.283-25.945 16.463-36.776 15.963 28.628 33.534 45.921 77.039 45.921 124.588 0 106.039-85.961 192-192 192s-192-85.961-192-192 85.961-192 192-192c47.549 0 91.054 17.293 124.588 45.922-0.5-10.831 4.68-24.239 15.963-36.776l103.147-121.276c17.661-19.623 46.511-21.277 64.11-3.678s15.946 46.449-3.677 64.11zM192 160c-70.692 0-128 57.308-128 128s57.308 128 128 128 128-57.308 128-128-57.307-128-128-128z" />
+<glyph unicode="&#xe022;" d="M181.861 118.974l20.649 28.908-22.627 22.628-28.909-20.648c-5.361 2.997-11.102 5.387-17.133 7.096l-5.841 35.042h-32l-5.84-35.043c-6.031-1.709-11.772-4.099-17.133-7.096l-28.909 20.649-22.628-22.628 20.649-28.908c-2.997-5.36-5.387-11.103-7.096-17.133l-35.043-5.841v-32l35.043-5.841c1.709-6.030 4.099-11.772 7.096-17.133l-20.649-28.908 22.627-22.628 28.909 20.648c5.361-2.997 11.102-5.387 17.133-7.096l5.841-35.042h32l5.84 35.043c6.031 1.709 11.772 4.099 17.133 7.096l28.909-20.648 22.627 22.628-20.649 28.908c2.997 5.36 5.387 11.103 7.096 17.133l35.044 5.84v32l-35.043 5.841c-1.709 6.030-4.099 11.772-7.096 17.133zM112 48c-17.674 0-32 14.327-32 32s14.326 32 32 32 32-14.327 32-32-14.326-32-32-32zM512 288v32l-33.691 6.125c-0.621 4.023-1.416 7.989-2.362 11.895l28.779 18.55-12.246 29.564-33.472-7.234c-2.107 3.455-4.363 6.81-6.746 10.065l19.503 28.171-22.628 22.627-28.171-19.503c-3.256 2.383-6.61 4.638-10.065 6.747l7.234 33.472-29.564 12.247-18.55-28.779c-3.906 0.946-7.872 1.741-11.895 2.362l-6.126 33.691h-32l-6.126-33.691c-4.023-0.621-7.988-1.416-11.895-2.362l-18.549 28.779-29.564-12.246 7.234-33.472c-3.455-2.108-6.81-4.364-10.065-6.747l-28.171 19.503-22.627-22.627 19.503-28.171c-2.383-3.255-4.639-6.61-6.747-10.065l-33.472 7.234-12.246-29.564 28.779-18.55c-0.946-3.906-1.741-7.871-2.362-11.895l-33.692-6.126v-32l33.691-6.125c0.621-4.023 1.416-7.989 2.362-11.895l-28.779-18.55 12.246-29.564 33.472 7.234c2.108-3.455 4.364-6.809 6.747-10.065l-19.503-28.171 22.627-22.628 28.171 19.503c3.255-2.383 6.61-4.638 10.065-6.746l-7.234-33.472 29.564-12.246 18.551 28.779c3.905-0.946 7.871-1.741 11.894-2.362l6.126-33.692h32l6.126 33.691c4.022 0.621 7.988 1.416 11.895 2.362l18.55-28.779 29.564 12.246-7.234 33.472c3.455 2.108 6.81 4.363 10.065 6.746l28.171-19.503 22.628 22.628-19.503 28.171c2.383 3.256 4.638 6.61 6.746 10.065l33.472-7.234 12.246 29.565-28.779 18.55c0.946 3.906 1.741 7.871 2.362 11.895l33.691 6.125zM336 234.4c-38.439 0-69.6 31.161-69.6 69.6s31.16 69.6 69.6 69.6 69.6-31.161 69.6-69.6c0-38.439-31.16-69.6-69.6-69.6z" />
+<glyph unicode="&#xe024;" d="M501.467 71.062l-230.276 197.38c10.724 20.149 16.809 43.141 16.809 67.558 0 79.529-64.471 144-144 144-14.547 0-28.586-2.166-41.823-6.177l83.195-83.195c12.445-12.445 12.445-32.81 0-45.255l-50.745-50.745c-12.445-12.445-32.81-12.445-45.255 0l-83.195 83.195c-4.011-13.237-6.177-27.276-6.177-41.823 0-79.529 64.471-144 144-144 24.417 0 47.409 6.085 67.558 16.81l197.38-230.276c11.454-13.362 31.008-14.113 43.452-1.669l50.746 50.746c12.444 12.444 11.693 31.997-1.669 43.451z" />
+<glyph unicode="&#xe025;" d="M384 448h-64c-52.935 0-96-43.065-96-96v-96h-200c-13.2 0-24-10.8-24-24v-240c0-13.2 10.8-24 24-24h272c13.2 0 24 10.8 24 24v240c0 13.2-10.8 24-24 24h-8v96c0 17.645 14.355 32 32 32h64c17.645 0 32-14.355 32-32v-96h64v96c0 52.935-43.065 96-96 96zM192 32h-64l13.92 69.6c-8.404 5.766-13.92 15.437-13.92 26.4 0 17.673 14.327 32 32 32s32-14.327 32-32c0-10.963-5.516-20.634-13.92-26.4l13.92-69.6z" />
+<glyph unicode="&#xe026;" d="M416 256h-32v96c0 70.692-57.308 128-128 128s-128-57.308-128-128v-96h-32c-17.6 0-32-14.4-32-32v-224c0-17.6 14.4-32 32-32h320c17.6 0 32 14.4 32 32v224c0 17.6-14.4 32-32 32zM256 64c-17.673 0-32 14.327-32 32s14.327 32 32 32 32-14.327 32-32-14.327-32-32-32zM320 256h-128v96c0 35.29 28.71 64 64 64s64-28.71 64-64v-96z" />
+<glyph unicode="&#xe027;" d="M296 256h-8v96c0 52.935-43.065 96-96 96h-64c-52.935 0-96-43.065-96-96v-96h-8c-13.2 0-24-10.8-24-24v-240c0-13.2 10.8-24 24-24h272c13.2 0 24 10.8 24 24v240c0 13.2-10.8 24-24 24zM192 32h-64l13.92 69.6c-8.404 5.766-13.92 15.437-13.92 26.4 0 17.673 14.327 32 32 32s32-14.327 32-32c0-10.963-5.516-20.634-13.92-26.4l13.92-69.6zM224 256h-128v96c0 17.645 14.355 32 32 32h64c17.645 0 32-14.355 32-32v-96z" />
+<glyph unicode="&#xe028;" d="M352 480c-88.365 0-160-71.634-160-160 0-10.013 0.929-19.808 2.688-29.312l-194.688-194.688v-96c0-17.673 14.327-32 32-32h32v32h64v64h64v64h64l41.521 41.521c17.005-6.158 35.348-9.521 54.479-9.521 88.365 0 160 71.634 160 160s-71.635 160-160 160zM399.937 319.937c-26.51 0-48 21.49-48 48s21.49 48 48 48 48-21.49 48-48-21.49-48-48-48z" />
+<glyph unicode="&#xe029;" d="M501.066 322.879l-50.553 50.552c-12.396 12.397-32.685 32.684-45.081 45.082l-50.553 50.552c-12.396 12.397-34.477 14.583-49.065 4.858l-138.219-92.146c-14.588-9.726-20.109-30.514-12.268-46.195l35.243-70.487c1.077-2.153 2.323-4.448 3.695-6.83l-178.265-178.265-16-112h96v32h64v64h64v64h64v35.593c3.198-1.906 6.267-3.608 9.096-5.022l70.485-35.244c15.683-7.841 36.47-2.319 46.195 12.269l92.147 138.22c9.727 14.586 7.539 36.665-4.857 49.063zM75.314 52.687l-22.627 22.627 155.786 155.785 22.627-22.627-155.786-155.785zM458.51 268.118l-22.628-22.628c-6.223-6.222-16.404-6.222-22.627 0l-135.765 135.765c-6.223 6.222-6.223 16.405 0 22.627l22.628 22.628c6.223 6.222 16.404 6.222 22.627 0l135.765-135.765c6.223-6.222 6.223-16.405 0-22.627z" />
+<glyph unicode="&#xe02a;" d="M496.131 44.302l-121.276 103.147c-12.537 11.283-25.945 16.463-36.776 15.963 28.628 33.534 45.921 77.039 45.921 124.588 0 106.039-85.961 192-192 192s-192-85.961-192-192 85.961-192 192-192c47.549 0 91.054 17.293 124.588 45.922-0.5-10.831 4.68-24.239 15.963-36.776l103.147-121.276c17.661-19.623 46.511-21.277 64.11-3.678s15.946 46.449-3.677 64.11zM192 160c-70.692 0-128 57.308-128 128s57.308 128 128 128 128-57.308 128-128-57.307-128-128-128zM96 320h192v-64h-192z" />
+<glyph unicode="&#xe02b;" d="M496.131 44.302l-121.276 103.147c-12.537 11.283-25.945 16.463-36.776 15.963 28.628 33.534 45.921 77.039 45.921 124.588 0 106.039-85.961 192-192 192s-192-85.961-192-192 85.961-192 192-192c47.549 0 91.054 17.293 124.588 45.922-0.5-10.831 4.68-24.239 15.963-36.776l103.147-121.276c17.661-19.623 46.511-21.277 64.11-3.678s15.946 46.449-3.677 64.11zM192 160c-70.692 0-128 57.308-128 128s57.308 128 128 128 128-57.308 128-128-57.307-128-128-128zM224 384h-64v-64h-64v-64h64v-64h64v64h64v64h-64z" />
+<glyph unicode="&#xe02d;" d="M400 416h-288c-26.51 0-48-21.49-48-48v-16h384v16c0 26.51-21.49 48-48 48zM316.16 448l7.058-50.5h-134.436l7.057 50.5h120.321zM320 480h-128c-13.2 0-25.495-10.696-27.321-23.769l-9.357-66.962c-1.827-13.073 7.478-23.769 20.678-23.769h160c13.2 0 22.505 10.696 20.679 23.769l-9.357 66.962c-1.827 13.073-14.122 23.769-27.322 23.769v0zM408 320h-304c-17.6 0-30.696-14.341-29.103-31.869l26.206-288.263c1.593-17.527 17.297-31.868 34.897-31.868h240c17.6 0 33.304 14.341 34.897 31.868l26.205 288.263c1.594 17.528-11.502 31.869-29.102 31.869zM192 32h-48l-16 224h64v-224zM288 32h-64v224h64v-224zM368 32h-48v224h64l-16-224z" />
+<glyph unicode="&#xe02f;" d="M512 175.953v96.094l-73.387 12.231c-2.979 9.066-6.611 17.834-10.847 26.25l43.227 60.517-67.948 67.949-60.413-43.152c-8.455 4.277-17.269 7.944-26.384 10.951l-12.201 73.207h-96.094l-12.201-73.208c-9.115-3.007-17.929-6.674-26.383-10.951l-60.414 43.152-67.949-67.949 43.227-60.518c-4.235-8.415-7.867-17.183-10.846-26.249l-73.387-12.23v-96.094l73.559-12.26c2.98-8.984 6.605-17.674 10.821-26.015l-43.374-60.724 67.949-67.948 60.827 43.447c8.301-4.175 16.945-7.764 25.882-10.717l12.289-73.736h96.094l12.289 73.737c8.937 2.953 17.581 6.542 25.883 10.716l60.826-43.446 67.948 67.948-43.372 60.723c4.216 8.341 7.839 17.031 10.82 26.016l73.559 12.259zM256 160c-35.346 0-64 28.653-64 64s28.654 64 64 64c35.347 0 64-28.654 64-64s-28.653-64-64-64z" />
+<glyph unicode="&#xe030;" d="M256 384c-111.659 0-208.441-65.021-256-160 47.559-94.979 144.341-160 256-160 111.657 0 208.439 65.021 256 160-47.558 94.979-144.343 160-256 160zM382.225 299.148c30.081-19.187 55.571-44.887 74.717-75.148-19.146-30.261-44.637-55.961-74.718-75.149-37.797-24.108-81.445-36.851-126.224-36.851-44.78 0-88.428 12.743-126.225 36.852-30.080 19.186-55.57 44.886-74.717 75.148 19.146 30.262 44.637 55.962 74.717 75.148 1.959 1.25 3.938 2.461 5.929 3.65-4.979-13.664-7.704-28.411-7.704-43.798 0-70.692 57.308-128 128-128s128 57.308 128 128c0 15.387-2.725 30.134-7.704 43.799 1.99-1.189 3.969-2.401 5.929-3.651zM256 275c0-26.51-21.49-48-48-48s-48 21.49-48 48 21.49 48 48 48 48-21.49 48-48z" />
+<glyph unicode="&#xe031;" d="M419.661 331.792c38.822-27.515 70.685-64.546 92.339-107.792-47.561-94.979-144.343-160-256-160-31.283 0-61.396 5.106-89.589 14.542l38.978 38.978c16.529-3.65 33.486-5.52 50.611-5.52 44.779 0 88.427 12.743 126.223 36.852 30.081 19.188 55.572 44.888 74.718 75.149-18.526 29.283-43.007 54.275-71.825 73.247l34.545 34.544zM256 131c-11.362 0-22.376 1.488-32.864 4.267l156.593 156.592c2.781-10.486 4.271-21.497 4.271-32.859 0-70.692-57.308-128-128-128zM480 480h-26.869l-109.806-109.806c-27.538 8.962-56.877 13.806-87.325 13.806-111.659 0-208.441-65.021-256-160 21.329-42.596 52.564-79.154 90.597-106.534l-90.597-90.597v-26.869h26.869l453.131 453.131v26.869zM208 323c24.022 0 43.923-17.647 47.446-40.685l-54.762-54.762c-23.037 3.524-40.684 23.425-40.684 47.447 0 26.51 21.49 48 48 48zM55.058 224c19.146 30.262 44.637 55.962 74.717 75.148 1.959 1.25 3.938 2.461 5.929 3.65-4.979-13.664-7.704-28.411-7.704-43.798 0-29.262 9.825-56.224 26.349-77.781l-29.275-29.275c-28.036 18.821-51.877 43.386-70.016 72.056z" />
+<glyph unicode="&#xe032;" d="M348.916 316.476l-32.476 32.461-162.405-162.371c-26.907-26.896-26.907-70.524 0-97.422 26.902-26.896 70.53-26.896 97.437 0l194.886 194.854c44.857 44.831 44.857 117.531 0 162.363-44.833 44.852-117.556 44.852-162.391 0l-204.615-204.589c-0.145-0.152-0.306-0.288-0.438-0.423-62.551-62.548-62.551-163.928 0-226.453 62.527-62.528 163.934-62.528 226.494 0 0.137 0.137 0.258 0.284 0.41 0.438l0.016-0.017 139.666 139.646-32.493 32.46-139.665-139.631c-0.148-0.134-0.282-0.285-0.423-0.422-44.537-44.529-116.99-44.529-161.538 0-44.531 44.521-44.531 116.961 0 161.489 0.152 0.152 0.302 0.291 0.444 0.423l-0.023 0.030 204.64 204.583c26.856 26.869 70.572 26.869 97.443 0 26.856-26.867 26.856-70.574 0-97.42l-194.886-194.85c-8.968-8.961-23.527-8.961-32.486 0-8.947 8.943-8.947 23.516 0 32.46l162.403 162.391z" />
+<glyph unicode="&#xe033;" d="M240 448c-132.548 0-240-107.452-240-240s107.452-240 240-240c132.549 0 240 107.451 240 240s-107.451 240-240 240zM375.795 128c4.29 20.227 6.998 41.696 7.879 64h63.723c-1.668-22.098-6.812-43.557-15.34-64h-56.262zM104.205 288c-4.29-20.227-6.998-41.696-7.879-64h-63.722c1.668 22.097 6.811 43.557 15.339 64h56.262zM343.018 288c4.807-20.481 7.699-41.927 8.64-64h-95.658v64h87.018zM256 320v93.669c7.295-2.123 14.522-5.685 21.614-10.685 13.291-9.37 26.006-23.804 36.77-41.743 7.441-12.401 13.876-26.208 19.248-41.242h-77.632zM165.616 361.242c10.764 17.939 23.478 32.374 36.77 41.743 7.091 5 14.319 8.562 21.614 10.685v-93.67h-77.632c5.373 15.033 11.808 28.84 19.248 41.242zM224 288v-64h-95.657c0.94 22.073 3.833 43.519 8.639 64h87.018zM47.944 128c-8.528 20.443-13.671 41.902-15.339 64h63.722c0.881-22.304 3.589-43.773 7.879-64h-56.262zM128.343 192h95.657v-64h-87.018c-4.806 20.48-7.699 41.927-8.639 64zM224 96v-93.67c-7.294 2.123-14.522 5.686-21.614 10.685-13.292 9.37-26.007 23.805-36.77 41.743-7.441 12.402-13.875 26.209-19.249 41.242h77.633zM314.384 54.758c-10.764-17.938-23.479-32.373-36.77-41.743-7.092-4.999-14.319-8.562-21.614-10.685v93.67h77.633c-5.373-15.033-11.808-28.84-19.249-41.242zM256 128v64h95.657c-0.94-22.073-3.833-43.52-8.64-64h-87.017zM383.674 224c-0.881 22.304-3.589 43.773-7.879 64h56.262c8.528-20.443 13.672-41.903 15.34-64h-63.723zM415.329 320h-47.95c-9.319 29.381-22.188 55.147-37.658 75.714 21.268-10.17 40.529-23.808 57.357-40.636 10.74-10.739 20.181-22.469 28.251-35.078zM92.922 355.078c16.829 16.829 36.090 30.466 57.357 40.636-15.471-20.567-28.338-46.333-37.658-75.714h-47.949c8.069 12.609 17.511 24.339 28.25 35.078zM64.672 96h47.949c9.32-29.381 22.188-55.147 37.659-75.715-21.268 10.17-40.529 23.808-57.357 40.637-10.74 10.739-20.182 22.469-28.251 35.078zM387.078 60.922c-16.828-16.829-36.090-30.467-57.357-40.637 15.471 20.567 28.339 46.334 37.658 75.715h47.95c-8.070-12.609-17.511-24.339-28.251-35.078z" />
+<glyph unicode="&#xe038;" d="M256-32c141.385 0 256 114.615 256 256s-114.615 256-256 256-256-114.615-256-256 114.615-256 256-256zM256 432c114.875 0 208-93.125 208-208s-93.125-208-208-208-208 93.125-208 208 93.125 208 208 208zM128 320c0 17.673 14.327 32 32 32s32-14.327 32-32c0-17.673-14.327-32-32-32s-32 14.327-32 32zM320 320c0 17.673 14.327 32 32 32s32-14.327 32-32c0-17.673-14.327-32-32-32s-32 14.327-32 32zM384 192v-32h-32v-48c0-26.51-21.49-48-48-48s-48 21.49-48 48v48h-128v32h256z" />
+<glyph unicode="&#xe03a;" d="M256-32c141.385 0 256 114.615 256 256s-114.615 256-256 256-256-114.615-256-256 114.615-256 256-256zM256 432c114.875 0 208-93.125 208-208s-93.125-208-208-208-208 93.125-208 208 93.125 208 208 208zM271.37 124.486c70.124 13.853 124.555 45.771 144.227 88.297-10.827-83.978-80.759-148.783-165.425-148.783-59.621 0-111.929 32.141-141.446 80.474 35.205-27.529 97.267-32.904 162.644-19.988zM320 304c0-26.51 14.327-48 32-48s32 21.49 32 48c0 26.51-14.327 48-32 48s-32-21.49-32-48zM176 294.25c-20.898 0-38.667-7.828-45.258-18.75-1.77 2.933-2.742 16.087-2.742 19.375 0 15.533 21.49 28.125 48 28.125s48-12.592 48-28.125c0-3.288-0.972-16.442-2.742-19.375-6.591 10.922-24.36 18.75-45.258 18.75z" />
+<glyph unicode="&#xe03f;" d="M256-32c141.385 0 256 114.615 256 256s-114.615 256-256 256-256-114.615-256-256 114.615-256 256-256zM256 432c114.875 0 208-93.125 208-208s-93.125-208-208-208-208 93.125-208 208 93.125 208 208 208zM352.049 89.63c-19.587 32.574-55.272 54.37-96.049 54.37s-76.462-21.796-96.049-54.37l-41.164 24.698c27.98 46.535 78.958 77.672 137.213 77.672s109.232-31.137 137.213-77.672l-41.164-24.698zM383.521 339.88c2.142-8.572-3.070-17.259-11.641-19.402-8.813-2.225-19.261-6.060-28.468-10.675 5.324-5.715 8.587-13.376 8.587-21.803 0-17.673-14.327-32-32-32s-32 14.327-32 32c0 0.585 0.018 1.165 0.049 1.742 1.016 23.727 22.606 39.473 40.796 48.569 17.371 8.685 34.551 13.030 35.274 13.211 8.573 2.144 17.259-3.069 19.403-11.642zM128.479 339.88c2.144 8.573 10.83 13.786 19.403 11.642 0.723-0.181 17.903-4.526 35.274-13.211 18.19-9.096 39.78-24.842 40.796-48.569 0.031-0.577 0.049-1.157 0.049-1.742 0-17.673-14.327-32-32-32s-32 14.327-32 32c0 8.427 3.263 16.088 8.587 21.803-9.207 4.615-19.655 8.45-28.468 10.675-8.571 2.143-13.783 10.83-11.641 19.402z" />
+<glyph unicode="&#xe040;" d="M256-32c141.385 0 256 114.615 256 256s-114.615 256-256 256-256-114.615-256-256 114.615-256 256-256zM256 432c114.875 0 208-93.125 208-208s-93.125-208-208-208-208 93.125-208 208 93.125 208 208 208zM400 352c8.8 0 16-7.2 16-16v-48c0-17.6-14.4-32-32-32h-64c-17.6 0-32 14.4-32 32h-64c0-17.6-14.4-32-32-32h-64c-17.6 0-32 14.4-32 32v48c0 8.8 7.2 16 16 16h96c8.8 0 16-7.2 16-16v-16h64v16c0 8.8 7.2 16 16 16h96zM256 96c46.604 0 87.386 24.909 109.773 62.139l27.44-16.467c-27.983-46.535-78.958-77.672-137.213-77.672-24.229 0-47.192 5.398-67.77 15.041l16.581 27.639c15.677-6.857 32.982-10.68 51.189-10.68z" />
+<glyph unicode="&#xe041;" d="M256-32c141.385 0 256 114.615 256 256s-114.615 256-256 256-256-114.615-256-256 114.615-256 256-256zM256 432c114.875 0 208-93.125 208-208s-93.125-208-208-208-208 93.125-208 208 93.125 208 208 208zM96 224v-32c0-70.4 57.6-128 128-128h64c70.4 0 128 57.6 128 128v32h-320zM192 101.506c-13.269 4.729-25.462 12.411-35.772 22.723-18.203 18.201-28.228 42.27-28.228 67.771h64v-90.494zM288 96h-64v96h64v-96zM355.772 124.229c-10.312-10.312-22.505-17.994-35.772-22.723v90.494h64c0-25.501-10.024-49.57-28.228-67.771zM112.676 288c0.001 0 0 0 0 0 4.884 0 9.054 3.528 9.862 8.345 3.079 18.342 18.834 31.655 37.462 31.655s34.383-13.313 37.462-31.655c0.808-4.816 4.978-8.345 9.861-8.345 4.884 0 9.054 3.528 9.862 8.344 0.541 3.218 0.814 6.467 0.814 9.656 0 31.981-26.019 58-58 58s-58-26.019-58-58c0-3.189 0.274-6.438 0.814-9.656 0.81-4.816 4.98-8.344 9.863-8.344zM304.676 288c0.001 0 0 0 0 0 4.885 0 9.056 3.528 9.862 8.345 3.079 18.342 18.834 31.655 37.462 31.655s34.383-13.313 37.462-31.655c0.808-4.816 4.979-8.345 9.861-8.345s9.054 3.528 9.861 8.344c0.541 3.218 0.814 6.467 0.814 9.656 0 31.981-26.019 58-58 58s-58-26.019-58-58c0-3.189 0.272-6.438 0.813-9.656 0.812-4.816 4.982-8.344 9.865-8.344z" />
+<glyph unicode="&#xe045;" d="M64 352h64v-96h32v192c0 17.6-14.4 32-32 32h-64c-17.6 0-32-14.4-32-32v-192h32v96zM64 448h64v-64h-64v64zM480 448v32h-96c-17.601 0-32-14.4-32-32v-160c0-17.6 14.399-32 32-32h96v32h-96v160h96zM320 400v48c0 17.6-14.4 32-32 32h-96v-224h96c17.6 0 32 14.4 32 32v48c0 17.6-4.4 32-22 32 17.6 0 22 14.4 22 32zM288 288h-64v64h64v-64zM288 384h-64v64h64v-64zM416 192l-208-224-112 144 41 35 71-74 176 151z" />
+<glyph unicode="&#xe046;" d="M445.020 18.98c-6.143 0-12.284 2.343-16.971 7.029-9.372 9.373-9.372 24.568 0 33.941 43.819 43.821 67.952 102.080 67.952 164.050 0 61.969-24.133 120.229-67.952 164.049-9.372 9.373-9.372 24.569 0 33.941s24.569 9.372 33.941 0c52.885-52.886 82.011-123.2 82.011-197.99s-29.126-145.104-82.011-197.99c-4.686-4.687-10.828-7.030-16.97-7.030zM359.765 64.235c-6.143 0-12.284 2.343-16.971 7.029-9.372 9.372-9.372 24.568 0 33.941 65.503 65.503 65.503 172.085 0 237.588-9.372 9.373-9.372 24.569 0 33.941 9.372 9.371 24.569 9.372 33.941 0 40.797-40.796 63.265-95.038 63.265-152.734s-22.468-111.938-63.265-152.735c-4.686-4.687-10.828-7.030-16.97-7.030zM274.51 109.49c-6.143 0-12.284 2.343-16.971 7.029-9.373 9.373-9.373 24.568 0 33.941 40.55 40.55 40.55 106.529 0 147.078-9.373 9.373-9.373 24.569 0 33.941s24.568 9.372 33.941 0c59.265-59.265 59.265-155.696 0-214.961-4.686-4.685-10.828-7.028-16.97-7.028zM200.666 440.666c12.834 12.834 23.334 8.484 23.334-9.666v-414c0-18.15-10.5-22.499-23.334-9.665l-120.666 120.665h-80v192h80l120.666 120.666z" horiz-adv-x="544" />
+<glyph unicode="&#xe047;" d="M359.765 64.235c-6.143 0-12.284 2.343-16.971 7.029-9.372 9.372-9.372 24.568 0 33.941 65.503 65.503 65.503 172.085 0 237.588-9.372 9.373-9.372 24.569 0 33.941 9.372 9.371 24.569 9.372 33.941 0 40.797-40.796 63.265-95.038 63.265-152.734s-22.468-111.938-63.265-152.735c-4.686-4.687-10.828-7.030-16.97-7.030zM274.51 109.49c-6.143 0-12.284 2.343-16.971 7.029-9.373 9.373-9.373 24.568 0 33.941 40.55 40.55 40.55 106.529 0 147.078-9.373 9.373-9.373 24.569 0 33.941s24.568 9.372 33.941 0c59.265-59.265 59.265-155.696 0-214.961-4.686-4.685-10.828-7.028-16.97-7.028zM200.666 440.666c12.834 12.834 23.334 8.484 23.334-9.666v-414c0-18.15-10.5-22.499-23.334-9.665l-120.666 120.665h-80v192h80l120.666 120.666z" />
+<glyph unicode="&#xe048;" d="M274.51 109.49c-6.143 0-12.284 2.343-16.971 7.029-9.373 9.373-9.373 24.568 0 33.941 40.55 40.55 40.55 106.529 0 147.078-9.373 9.373-9.373 24.569 0 33.941s24.568 9.372 33.941 0c59.265-59.265 59.265-155.696 0-214.961-4.686-4.685-10.828-7.028-16.97-7.028zM200.666 440.666c12.834 12.834 23.334 8.484 23.334-9.666v-414c0-18.15-10.5-22.499-23.334-9.665l-120.666 120.665h-80v192h80l120.666 120.666z" />
+<glyph unicode="&#xe049;" d="M200.666 440.666c12.834 12.834 23.334 8.484 23.334-9.666v-414c0-18.15-10.5-22.499-23.334-9.665l-120.666 120.665h-80v192h80l120.666 120.666zM480 170.426v-42.426h-42.426l-53.574 53.574-53.574-53.574h-42.426v42.426l53.574 53.574-53.574 53.574v42.426h42.426l53.574-53.574 53.574 53.574h42.426v-42.426l-53.574-53.574z" />
+<glyph unicode="&#xe04a;" d="M200.666 440.666c12.834 12.834 23.334 8.484 23.334-9.666v-414c0-18.15-10.5-22.499-23.334-9.665l-120.666 120.665h-80v192h80l120.666 120.666z" />
+<glyph unicode="&#xe04b;" d="M214.082 448.041c5.988 0 9.918-5.939 9.919-17.041v-414c0-11.103-3.928-17.041-9.918-17.041-3.802 0-8.434 2.394-13.417 7.376l-120.666 120.665h-80v192h80l120.666 120.666c4.983 4.983 9.614 7.375 13.416 7.375zM256 256h256v-64h-256z" />
+<glyph unicode="&#xe04c;" d="M214.082 448.041c5.988 0 9.918-5.939 9.919-17.041v-414c0-11.103-3.928-17.041-9.918-17.041-3.802 0-8.434 2.394-13.417 7.376l-120.666 120.665h-80v192h80l120.666 120.666c4.983 4.983 9.614 7.375 13.416 7.375zM512 192h-96v-96h-64v96h-96v64h96v96h64v-96h96z" />
+<glyph unicode="&#xe04d;" d="M353.94 237.674c18.749 22.271 30.060 51.004 30.060 82.326 0 70.58-57.421 128-128 128h-160v-448h192c70.579 0 128 57.421 128 128 0 46.478-24.899 87.248-62.060 109.674zM192 384h50.75c27.984 0 50.75-28.71 50.75-64s-22.766-64-50.75-64h-50.75v128zM271.5 64h-79.5v128h79.5c29.225 0 53-28.71 53-64s-23.775-64-53-64z" />
+<glyph unicode="&#xe04e;" d="M352 448h64v-208c0-79.529-71.634-144-160-144s-160 64.471-160 144v208h64v-208c0-20.083 9.119-39.352 25.677-54.253 18.448-16.602 43.423-25.747 70.323-25.747s51.875 9.145 70.323 25.747c16.558 14.901 25.677 34.17 25.677 54.253v208zM96 64h320v-64h-320z" />
+<glyph unicode="&#xe04f;" d="M448 448v-32h-64l-160-384h64v-32h-224v32h64l160 384h-64v32z" />
+<glyph unicode="&#xe050;" d="M512 224v-32h-117.253c13.752-19.255 21.253-41.346 21.253-64 0-35.439-18.33-69.513-50.29-93.482-29.679-22.259-68.642-34.518-109.71-34.518-41.069 0-80.031 12.259-109.71 34.518-31.96 23.969-50.29 58.043-50.29 93.482h64c0-34.691 43.963-64 96-64s96 29.309 96 64c0 34.691-43.963 64-96 64h-256v32h149.759c-1.169 0.827-2.328 1.662-3.469 2.518-31.96 23.97-50.29 58.043-50.29 93.482s18.33 69.512 50.29 93.482c29.679 22.259 68.641 34.518 109.71 34.518 41.068 0 80.031-12.259 109.71-34.518 31.96-23.97 50.29-58.043 50.29-93.482h-64c0 34.691-43.963 64-96 64s-96-29.309-96-64c0-34.691 43.963-64 96-64 39.489 0 77.027-11.339 106.241-32h149.759z" />
+<glyph unicode="&#xe053;" d="M96 448v-384h384v384h-384zM448 96h-320v320h320v-320zM64 32v320l-32 32v-384h384l-32 32zM214.627 137.373l96 96 73.373-73.373v192h-192l73.373-73.373-96-96z" />
+<glyph unicode="&#xe055;" d="M416 416h-320c-52.8 0-96-43.2-96-96v-192c0-52.8 43.2-96 96-96h320c52.8 0 96 43.2 96 96v192c0 52.8-43.2 96-96 96zM480 128c0-16.989-6.687-33.031-18.827-45.173-12.142-12.14-28.183-18.827-45.173-18.827h-320c-16.989 0-33.031 6.687-45.172 18.827-12.141 12.142-18.828 28.184-18.828 45.173v192c0 16.989 6.687 33.031 18.828 45.172s28.183 18.828 45.172 18.828h320c16.989 0 33.031-6.687 45.173-18.828s18.827-28.183 18.827-45.172v-192zM192 96l160 128-160 128z" />
+<glyph unicode="&#xe058;" d="M256 480c-141.385 0-256-114.615-256-256s114.615-256 256-256 256 114.615 256 256-114.615 256-256 256zM384 306.745l-82.744-82.745 82.744-82.744v-45.256h-45.256l-82.744 82.744-82.745-82.744h-45.255v45.256l82.745 82.744-82.745 82.745v45.255h45.255l82.745-82.745 82.744 82.745h45.256v-45.255z" />
+<glyph unicode="&#xe059;" d="M256 480c-141.385 0-256-114.615-256-256s114.615-256 256-256 256 114.615 256 256-114.615 256-256 256zM224 384h64v-64h-64v64zM320 64h-128v32h32v128h-32v32h96v-160h32v-32z" />
+<glyph unicode="&#xe05a;" d="M0 272v-96c0-8.836 7.164-16 16-16h480c8.836 0 16 7.164 16 16v96c0 8.836-7.164 16-16 16h-480c-8.836 0-16-7.164-16-16z" />
+<glyph unicode="&#xe600;" d="M39.349 399.017c-17.206 0-31.051-13.844-31.051-31.051v-361.923c0-17.207 13.845-31.068 31.051-31.068h323.589c17.207 0 31.068 13.861 31.068 31.068v361.923c0 17.207-13.861 31.051-31.068 31.051h-323.589zM46.803 392.288h309.317c16.698 0 30.151-13.454 30.151-30.151v-118.928l-46.498-52.778h-269.841l-5.207-4.325-47.364-54.733-0.761 83.5 0.242 2.526c-0.109 1.043-0.173 2.092-0.173 3.166v141.571c0 16.698 13.437 30.152 30.134 30.152zM274.731 341.379c-27.38 0-49.578-22.182-49.578-49.561s22.198-49.578 49.578-49.578c27.38 0 49.578 22.198 49.578 49.578s-22.199 49.561-49.578 49.561zM125.65 133.691c0.425 0.010 0.853 0 1.28 0 27.38 0 49.56-22.181 49.56-49.56s-22.181-49.578-49.56-49.578c-27.38 0-49.578 22.199-49.578 49.578 0 26.952 21.51 48.882 48.298 49.56z" horiz-adv-x="410" />
+<glyph unicode="&#xe601;" d="M384 160v64h-160v64h160v64l96-96zM352 192v-128h-160v-96l-192 96v416h352v-160h-32v128h-256l128-64v-288h128v96z" />
+<glyph unicode="&#xe602;" d="M353.825-31.334c-7.731 0.603-18.904 2.467-26.955 4.5-31.274 7.894-61.113 27.811-80.623 53.813l-4.316 5.753-6.785 0.453c-3.732 0.249-9.418 0.76-12.637 1.137l-5.853 0.684-4.602-4.351c-42.045-39.748-93.922-58.769-167.866-61.551l-11.84-0.445v14.216l3.395 1.834c13.346 7.21 24.137 15.128 33.861 24.846 12.21 12.202 19.795 24.279 23.617 37.604 2.056 7.17 3.198 16.551 2.683 22.043-0.975 10.388-0.341 9.2-7.671 14.407-17.231 12.243-36.264 30.14-47.508 44.673-15.707 20.301-27.456 42.712-33.645 64.178-10.544 36.57-8.728 76.714 5.058 111.801 35.493 90.334 141.651 150.144 257.076 144.836 36.486-1.678 67.24-8.061 98.589-20.464 70.337-27.826 121.201-80.164 138.156-142.162 4.647-16.993 6.614-33.061 6.051-49.422-0.656-19.032-3.22-33.797-8.839-50.891l-2.351-7.154 1.998-5.519c12.073-33.353 12.431-69.262 1.027-103.235-3.092-9.213-11.693-26.695-17.157-34.877-14.281-21.379-32.64-38.055-55.062-50.013-23.134-12.337-52.597-18.66-77.8-16.696v0zM377.786 8.294c11.009 1.305 24.373 5.429 35.034 10.81 19.764 9.974 38.827 29.211 48.958 49.404 25.974 51.769 9.822 114.569-37.703 146.593-11.748 7.916-25.447 13.569-40.299 16.629-10.827 2.231-29.448 2.262-40.399 0.069-73.502-14.72-112.105-95.584-78.077-163.556 12.747-25.462 36.724-46.281 63.726-55.334 15.912-5.334 30.803-6.743 48.76-4.614v0zM375.29 80.832l-30.783 31.428v84.055h37.938v-67.702l24.959-25.536c13.728-14.045 24.952-25.75 24.943-26.012s-5.924-6.592-13.145-14.067l-13.13-13.591-30.783 31.428zM168.934 79.403c2.823 2.651 7.016 6.212 9.318 7.912 9.934 7.339 23.738 12.284 34.286 12.284h3.566l-0.527 5.169c-0.906 8.889-0.505 29.149 0.744 37.519 4.928 33.042 18.965 61.7 41.608 84.95 12.924 13.27 25.206 22.282 40.984 30.072 19.443 9.6 37.712 14.121 59.903 14.825 29.371 0.931 55.94-6.053 81.034-21.303l7.155-4.348v2.429c-0.006 3.828-1.878 14.427-3.697 20.908-6.327 22.552-20.584 44.728-39.897 62.057-30.675 27.524-68.606 44.101-116.477 50.902-10.048 1.428-39.526 2.019-50.95 1.022-46.279-4.039-86.225-19.189-119.439-45.298-6.522-5.127-21.262-20.093-26.063-26.464-27.791-36.876-33.073-78.923-14.783-117.696 10.785-22.863 29.244-43.615 53.472-60.116 10.876-7.408 18.928-16.449 24.006-26.957 3.623-7.498 5.441-14.452 6.362-24.327 0.394-4.229 0.855-8.399 1.024-9.265 0.303-1.552 0.329-1.557 1.774-0.336 0.806 0.682 3.776 3.409 6.599 6.060h-0.002z" />
+</font></defs></svg>
\ No newline at end of file
diff --git a/xmpp/converse/fonticons/fonts/icomoon.ttf b/xmpp/converse/fonticons/fonts/icomoon.ttf
new file mode 100644
index 00000000..d129eac3
Binary files /dev/null and b/xmpp/converse/fonticons/fonts/icomoon.ttf differ
diff --git a/xmpp/converse/fonticons/fonts/icomoon.woff b/xmpp/converse/fonticons/fonts/icomoon.woff
new file mode 100644
index 00000000..e13ea160
Binary files /dev/null and b/xmpp/converse/fonticons/fonts/icomoon.woff differ
diff --git a/xmpp/converse/fonticons/selection.json b/xmpp/converse/fonticons/selection.json
new file mode 100644
index 00000000..2bd9c5eb
--- /dev/null
+++ b/xmpp/converse/fonticons/selection.json
@@ -0,0 +1,2641 @@
+{
+	"IcoMoonType": "selection",
+	"icons": [
+		{
+			"icon": {
+				"paths": [
+					"M707.65 1022.668c-15.462-1.205-37.808-4.935-53.91-9-62.549-15.789-122.227-55.622-161.245-107.627l-8.633-11.506-13.569-0.906c-7.463-0.498-18.837-1.521-25.275-2.273l-11.707-1.368-9.204 8.701c-84.090 79.496-187.844 117.539-335.732 123.102l-23.679 0.891v-28.432l6.79-3.668c26.691-14.42 48.275-30.257 67.723-49.691 24.421-24.403 39.59-48.557 47.233-75.209 4.112-14.339 6.396-33.103 5.365-44.086-1.949-20.776-0.683-18.399-15.342-28.814-34.463-24.487-72.529-60.281-95.017-89.346-31.414-40.602-54.911-85.423-67.29-128.356-21.089-73.139-17.456-153.429 10.116-223.602 70.987-180.669 283.303-300.288 514.152-289.672 72.971 3.356 134.479 16.122 197.177 40.927 140.674 55.653 242.402 160.329 276.312 284.324 9.295 33.985 13.229 66.123 12.102 98.844-1.311 38.064-6.44 67.595-17.677 101.781l-4.703 14.308 3.996 11.038c24.147 66.705 24.862 138.525 2.055 206.47-6.185 18.426-23.386 53.39-34.315 69.753-28.561 42.758-65.281 76.111-110.123 100.026-46.267 24.674-105.195 37.32-155.601 33.392v-0zM755.572 943.412c22.017-2.611 48.745-10.858 70.068-21.619 39.527-19.948 77.654-58.422 97.916-98.807 51.947-103.537 19.643-229.137-75.406-293.186-23.496-15.833-50.894-27.138-80.598-33.257-21.654-4.461-58.896-4.525-80.798-0.138-147.005 29.44-224.209 191.169-156.153 327.112 25.493 50.923 73.448 92.563 127.451 110.667 31.824 10.668 61.607 13.487 97.519 9.228v-0zM750.58 798.336l-61.566-62.856v-168.109h75.876v135.404l49.919 51.073c27.455 28.090 49.904 51.501 49.887 52.025s-11.848 13.184-26.29 28.135l-26.259 27.183-61.566-62.856zM337.868 801.194c5.646-5.302 14.032-12.423 18.636-15.824 19.868-14.677 47.475-24.568 68.573-24.568h7.132l-1.054-10.338c-1.812-17.779-1.009-58.299 1.488-75.038 9.857-66.084 37.93-123.4 83.217-169.9 25.848-26.54 50.412-44.565 81.968-60.145 38.886-19.199 75.424-28.242 119.805-29.649 58.742-1.863 111.879 12.106 162.069 42.605l14.31 8.696v-4.858c-0.012-7.657-3.756-28.854-7.393-41.817-12.654-45.103-41.169-89.455-79.793-124.113-61.35-55.049-137.213-88.203-232.954-101.804-20.097-2.855-79.053-4.037-101.899-2.043-92.558 8.079-172.45 38.378-238.879 90.596-13.045 10.255-42.524 40.186-52.126 52.928-55.583 73.752-66.146 157.847-29.566 235.392 21.571 45.727 58.488 87.231 106.944 120.232 21.753 14.815 37.855 32.897 48.011 53.915 7.245 14.995 10.882 28.903 12.723 48.653 0.788 8.459 1.71 16.797 2.048 18.53 0.605 3.104 0.659 3.114 3.547 0.671 1.613-1.364 7.552-6.819 13.198-12.121h-0.005z"
+				],
+				"attrs": [
+					{}
+				],
+				"isMulticolor": false,
+				"grid": 16,
+				"tags": [
+					"bubble",
+					"comment",
+					"chat",
+					"talk"
+				]
+			},
+			"attrs": [
+				{}
+			],
+			"properties": {
+				"order": 1,
+				"id": 456,
+				"prevSize": 32,
+				"code": 58882,
+				"name": "xa"
+			},
+			"setIdx": 0,
+			"setId": 1,
+			"iconIdx": 0
+		},
+		{
+			"icon": {
+				"paths": [
+					"M78.697 161.965c-34.413 0-62.102 27.689-62.102 62.102v723.845c0 34.413 27.689 62.137 62.102 62.137h647.178c34.413 0 62.137-27.723 62.137-62.137v-723.845c0-34.413-27.723-62.102-62.137-62.102h-647.178zM93.606 175.423h618.635c33.396 0 60.303 26.908 60.303 60.303v237.857l-92.997 105.556h-539.683l-10.414 8.65-94.727 109.466-1.522-167.001 0.484-5.052c-0.218-2.087-0.346-4.185-0.346-6.332v-283.143c0-33.396 26.874-60.303 60.268-60.303zM549.461 277.243c-54.759 0-99.156 44.363-99.156 99.121s44.397 99.156 99.156 99.156c54.759 0 99.156-44.397 99.156-99.156s-44.397-99.121-99.156-99.121zM251.301 692.618c0.85-0.021 1.705 0 2.56 0 54.759 0 99.121 44.363 99.121 99.121s-44.363 99.156-99.121 99.156c-54.759 0-99.156-44.397-99.156-99.156 0-53.903 43.020-97.763 96.596-99.121z"
+				],
+				"attrs": [
+					{
+						"opacity": 1,
+						"visibility": false
+					}
+				],
+				"width": 820,
+				"grid": 16,
+				"tags": [
+					"conversejs"
+				]
+			},
+			"attrs": [
+				{
+					"opacity": 1,
+					"visibility": false
+				}
+			],
+			"properties": {
+				"order": 2,
+				"id": 455,
+				"prevSize": 32,
+				"code": 58880,
+				"name": "conversejs",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"setId": 1,
+			"iconIdx": 1
+		},
+		{
+			"icon": {
+				"paths": [
+					"M192 128l640 384-640 384z"
+				],
+				"tags": [
+					"play",
+					"media control",
+					"audio"
+				],
+				"grid": 16,
+				"attrs": []
+			},
+			"attrs": [],
+			"properties": {
+				"order": 3,
+				"id": 451,
+				"prevSize": 32,
+				"code": 9658,
+				"name": "closed",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"setId": 1,
+			"iconIdx": 2
+		},
+		{
+			"icon": {
+				"paths": [
+					"M896 192l-384 640-384-640z"
+				],
+				"tags": [
+					"opened"
+				],
+				"grid": 16,
+				"attrs": []
+			},
+			"attrs": [],
+			"properties": {
+				"id": 266,
+				"order": 4,
+				"prevSize": 32,
+				"code": 9660,
+				"name": "opened",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"setId": 1,
+			"iconIdx": 3
+		},
+		{
+			"icon": {
+				"paths": [
+					"M864 128l-480 480-224-224-160 160 384 384 640-640z"
+				],
+				"tags": [
+					"checkmark",
+					"tick",
+					"correct",
+					"accept",
+					"ok"
+				],
+				"grid": 16,
+				"attrs": []
+			},
+			"attrs": [],
+			"properties": {
+				"order": 5,
+				"id": 85,
+				"prevSize": 32,
+				"code": 10003,
+				"name": "checkmark",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"setId": 1,
+			"iconIdx": 4
+		},
+		{
+			"icon": {
+				"paths": [
+					"M1024 590.444l-512-397.426-512 397.428v-162.038l512-397.426 512 397.428zM896 576v384h-256v-256h-256v256h-256v-384l384-288z"
+				],
+				"tags": [
+					"home",
+					"house",
+					"building"
+				],
+				"defaultCode": 57344,
+				"grid": 16,
+				"attrs": []
+			},
+			"attrs": [],
+			"properties": {
+				"id": 0,
+				"order": 6,
+				"prevSize": 32,
+				"code": 57344,
+				"name": "home",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"setId": 1,
+			"iconIdx": 5
+		},
+		{
+			"icon": {
+				"paths": [
+					"M864 0c88.364 0 160 71.634 160 160 0 36.020-11.91 69.258-32 96l-64 64-224-224 64-64c26.742-20.090 59.978-32 96-32zM64 736l-64 288 288-64 592-592-224-224-592 592zM715.578 363.578l-448 448-55.156-55.156 448-448 55.156 55.156z"
+				],
+				"tags": [
+					"pencil",
+					"write",
+					"edit",
+					"blog",
+					"note"
+				],
+				"defaultCode": 9998,
+				"grid": 16,
+				"attrs": []
+			},
+			"attrs": [],
+			"properties": {
+				"id": 1,
+				"order": 7,
+				"prevSize": 32,
+				"code": 9998,
+				"name": "pencil",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"setId": 1,
+			"iconIdx": 6
+		},
+		{
+			"icon": {
+				"paths": [
+					"M304 608c0 114.876 93.124 208 208 208s208-93.124 208-208-93.124-208-208-208-208 93.124-208 208zM960 256h-224c-16-64-32-128-96-128h-256c-64 0-80 64-96 128h-224c-35.2 0-64 28.8-64 64v576c0 35.2 28.8 64 64 64h896c35.2 0 64-28.8 64-64v-576c0-35.2-28.8-64-64-64zM512 892c-156.85 0-284-127.148-284-284 0-156.85 127.15-284 284-284 156.852 0 284 127.15 284 284 0 156.852-127.146 284-284 284zM960 448h-128v-64h128v64z"
+				],
+				"tags": [
+					"camera",
+					"photo",
+					"picture",
+					"image"
+				],
+				"defaultCode": 57347,
+				"grid": 16,
+				"attrs": []
+			},
+			"attrs": [],
+			"properties": {
+				"id": 2,
+				"order": 8,
+				"prevSize": 32,
+				"code": 57347,
+				"name": "camera",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"setId": 1,
+			"iconIdx": 7
+		},
+		{
+			"icon": {
+				"paths": [
+					"M384 288c0 88.366 71.634 160 160 160s160-71.634 160-160c0-88.366-71.634-160-160-160s-160 71.634-160 160zM0 288c0 88.366 71.634 160 160 160s160-71.634 160-160c0-88.366-71.634-160-160-160s-160 71.634-160 160zM768 608v-96c0-35.2-28.8-64-64-64h-640c-35.2 0-64 28.8-64 64v320c0 35.2 28.8 64 64 64h640c35.2 0 64-28.8 64-64v-96l256 160v-448l-256 160zM640 768h-512v-192h512v192z"
+				],
+				"tags": [
+					"camera",
+					"video",
+					"media",
+					"film",
+					"movie"
+				],
+				"defaultCode": 9750,
+				"grid": 16,
+				"attrs": []
+			},
+			"attrs": [],
+			"properties": {
+				"id": 3,
+				"order": 9,
+				"prevSize": 32,
+				"code": 9750,
+				"name": "camera-2",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"setId": 1,
+			"iconIdx": 8
+		},
+		{
+			"icon": {
+				"paths": [
+					"M981.188 160.108c-143.632-20.65-302.332-32.108-469.186-32.108-166.86 0-325.556 11.458-469.194 32.108-27.53 107.726-42.808 226.75-42.808 351.892 0 125.14 15.278 244.166 42.808 351.89 143.638 20.652 302.336 32.11 469.194 32.11 166.854 0 325.552-11.458 469.186-32.11 27.532-107.724 42.812-226.75 42.812-351.89 0-125.142-15.28-244.166-42.812-351.892zM384.002 704v-384l320 192-320 192z"
+				],
+				"tags": [
+					"play",
+					"video",
+					"movie"
+				],
+				"defaultCode": 9689,
+				"grid": 16,
+				"attrs": []
+			},
+			"attrs": [],
+			"properties": {
+				"id": 4,
+				"order": 10,
+				"prevSize": 32,
+				"code": 9689,
+				"name": "play",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"setId": 1,
+			"iconIdx": 9
+		},
+		{
+			"icon": {
+				"paths": [
+					"M320 192l704-192v736c0 88.366-100.29 160-224 160s-224-71.634-224-160c0-88.366 100.29-160 224-160 34.358 0 66.902 5.532 96 15.406v-329.588l-448 122.182v480c0 88.366-100.288 160-224 160s-224-71.634-224-160c0-88.366 100.288-160 224-160 34.358 0 66.902 5.532 96 15.406v-527.406z"
+				],
+				"tags": [
+					"music",
+					"song",
+					"audio",
+					"sound"
+				],
+				"defaultCode": 9835,
+				"grid": 16,
+				"attrs": []
+			},
+			"attrs": [],
+			"properties": {
+				"id": 5,
+				"order": 11,
+				"prevSize": 32,
+				"code": 9835,
+				"name": "music",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"setId": 1,
+			"iconIdx": 10
+		},
+		{
+			"icon": {
+				"paths": [
+					"M192 578.286v443.43c10.454 1.496 21.134 2.286 32 2.286h32v-448.002h-32c-10.866 0-21.546 0.79-32 2.286zM768 576v448h32c10.868 0 21.546-0.79 32-2.286v-443.428c-10.454-1.496-21.132-2.286-32-2.286h-32zM1024 512c0-282.77-229.23-512-512-512s-512 229.23-512 512c0 61.418 10.828 120.306 30.656 174.874-19.472 33.202-30.656 71.852-30.656 113.126 0 89.354 52.326 166.478 128 202.432v-404.864c-20.126 9.562-38.58 22.060-54.858 36.904-5.992-29.22-9.142-59.478-9.142-90.472 0-247.424 200.576-448 448-448s448 200.576 448 448c0 30.994-3.148 61.252-9.142 90.472-16.28-14.844-34.73-27.342-54.858-36.904v404.864c75.676-35.954 128-113.078 128-202.432 0-41.274-11.184-79.924-30.656-113.126 19.828-54.568 30.656-113.456 30.656-174.874z"
+				],
+				"tags": [
+					"headphones",
+					"headset",
+					"music",
+					"song",
+					"audio"
+				],
+				"defaultCode": 9836,
+				"grid": 16,
+				"attrs": []
+			},
+			"attrs": [],
+			"properties": {
+				"id": 6,
+				"order": 12,
+				"prevSize": 32,
+				"code": 9836,
+				"name": "headphones",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"setId": 1,
+			"iconIdx": 11
+		},
+		{
+			"icon": {
+				"paths": [
+					"M704 640c-64 64-64 128-128 128s-128-64-192-128-128-128-128-192 64-64 128-128-128-256-192-256-192 192-192 192c0 128 131.5 387.5 256 512s384 256 512 256c0 0 192-128 192-192s-192-256-256-192z"
+				],
+				"tags": [
+					"phone",
+					"contact",
+					"telephone",
+					"support",
+					"call"
+				],
+				"defaultCode": 9743,
+				"grid": 16,
+				"attrs": []
+			},
+			"attrs": [],
+			"properties": {
+				"id": 7,
+				"order": 13,
+				"prevSize": 32,
+				"code": 9743,
+				"name": "phone",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"setId": 1,
+			"iconIdx": 12
+		},
+		{
+			"icon": {
+				"paths": [
+					"M1017.378 575.994c8.004 55.482 13.216 131.392-11.664 160.446-41.142 48.044-301.712 48.044-301.712-48.042 0-48.398 42.856-80.134 1.712-128.178-40.472-47.262-113.026-48.030-193.714-48.042-80.686 0.012-153.242 0.78-193.714 48.042-41.142 48.046 1.714 79.78 1.714 128.178 0 96.086-260.57 96.086-301.714 48.044-24.878-29.054-19.668-104.964-11.662-160.446 6.16-37.038 21.724-76.996 71.548-127.994 0-0.002 0.002-0.002 0.002-0.004 74.738-69.742 187.846-126.738 429.826-127.968v-0.030c1.344 0 2.664 0.010 4 0.014 1.338-0.004 2.656-0.014 4-0.014v0.028c241.98 1.23 355.088 58.226 429.826 127.968 0.002 0.002 0.002 0.004 0.002 0.004 49.824 50.996 65.39 90.954 71.55 127.994z"
+				],
+				"tags": [
+					"phone-hang-up",
+					"contact",
+					"telephone",
+					"support",
+					"call"
+				],
+				"defaultCode": 9742,
+				"grid": 16,
+				"attrs": []
+			},
+			"attrs": [],
+			"properties": {
+				"id": 8,
+				"order": 14,
+				"prevSize": 32,
+				"code": 9742,
+				"name": "phone-hang-up",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"setId": 1,
+			"iconIdx": 13
+		},
+		{
+			"icon": {
+				"paths": [
+					"M960 256c35.346 0 64-28.654 64-64v-128h-128v-64h-832c-35.2 0-64 28.798-64 64v896c0 35.2 28.796 64 64 64h832v-256h64c35.346 0 64-28.654 64-64v-128h-128v-64h64c35.346 0 64-28.654 64-64v-128h-128v-64h64zM576 256.33c70.51 0 127.67 57.16 127.67 127.67s-57.16 127.67-127.67 127.67c-70.51 0-127.67-57.16-127.67-127.67s57.16-127.67 127.67-127.67zM256 960h-64v-896h64v896zM768 768h-384v-64c0-70.694 57.308-128 128-128v0h128c70.696 0 128 57.306 128 128v64z"
+				],
+				"tags": [
+					"address-book",
+					"book",
+					"contacts"
+				],
+				"defaultCode": 9999,
+				"grid": 16,
+				"attrs": []
+			},
+			"attrs": [],
+			"properties": {
+				"id": 9,
+				"order": 15,
+				"prevSize": 32,
+				"code": 9999,
+				"name": "address-book",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"setId": 1,
+			"iconIdx": 14
+		},
+		{
+			"icon": {
+				"paths": [
+					"M898.36 64h-770.36v128h-93.64c-17.6 0-34.36 12.528-34.36 30.128v64c0 17.6 16.76 33.872 34.36 33.872h93.64v64h-93.64c-17.6 0-34.36 12.528-34.36 30.128v64c0 17.6 16.76 33.872 34.36 33.872h93.64v64h-93.64c-17.6 0-34.36 12.528-34.36 30.128v64c0 17.598 16.76 33.872 34.36 33.872h93.64v64h-93.64c-17.6 0-34.36 12.528-34.36 30.128v64c0 17.6 16.76 33.872 34.36 33.872h93.64v128h770.36c35.348 0 61.64-30.526 61.64-65.872v-832c0-35.346-26.292-62.128-61.64-62.128zM320 960h-128v-64h34.36c17.6 0 29.64-16.272 29.64-33.872v-64c0-17.602-12.042-30.128-29.64-30.128h-34.36v-64h34.36c17.6 0 29.64-16.272 29.64-33.872v-64c0-17.602-12.042-30.128-29.64-30.128h-34.36v-64h34.36c17.6 0 29.64-16.272 29.64-33.872v-64c0-17.602-12.042-30.128-29.64-30.128l-34.36 0v-64h34.36c17.6 0 29.64-16.272 29.64-33.872v-64c0-17.602-12.040-30.128-29.64-30.128h-34.36v-64h128v832z"
+				],
+				"tags": [
+					"notebook",
+					"notes",
+					"book",
+					"journal"
+				],
+				"defaultCode": 10000,
+				"grid": 16,
+				"attrs": []
+			},
+			"attrs": [],
+			"properties": {
+				"id": 10,
+				"order": 16,
+				"prevSize": 32,
+				"code": 10000,
+				"name": "notebook",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"setId": 1,
+			"iconIdx": 15
+		},
+		{
+			"icon": {
+				"paths": [
+					"M928 128h-832c-52.8 0-96 43.2-96 96v640c0 52.8 43.2 96 96 96h832c52.8 0 96-43.2 96-96v-640c0-52.8-43.2-96-96-96zM398.74 550.372l-270.74 210.892v-501.642l270.74 290.75zM176.38 256h671.24l-335.62 252-335.62-252zM409.288 561.698l102.712 110.302 102.71-110.302 210.554 270.302h-626.528l210.552-270.302zM625.26 550.372l270.74-290.75v501.642l-270.74-210.892z"
+				],
+				"tags": [
+					"envelop",
+					"mail",
+					"email",
+					"contact",
+					"letter"
+				],
+				"defaultCode": 9993,
+				"grid": 16,
+				"attrs": []
+			},
+			"attrs": [],
+			"properties": {
+				"id": 11,
+				"order": 17,
+				"prevSize": 32,
+				"code": 9993,
+				"name": "envelop",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"setId": 1,
+			"iconIdx": 16
+		},
+		{
+			"icon": {
+				"paths": [
+					"M544 0l-96 96 96 96-224 256h-224l176 176-272 360.616v39.384h39.384l360.616-272 176 176v-224l256-224 96 96 96-96-480-480zM448 544l-64-64 224-224 64 64-224 224z"
+				],
+				"tags": [
+					"pushpin",
+					"pin"
+				],
+				"defaultCode": 57362,
+				"grid": 16,
+				"attrs": []
+			},
+			"attrs": [],
+			"properties": {
+				"id": 12,
+				"order": 18,
+				"prevSize": 32,
+				"code": 57362,
+				"name": "pushpin",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"setId": 1,
+			"iconIdx": 17
+		},
+		{
+			"icon": {
+				"paths": [
+					"M512 64c282.77 0 512 186.25 512 416 0 229.752-229.23 416-512 416-27.156 0-53.81-1.734-79.824-5.044-109.978 109.978-241.25 129.7-368.176 132.596v-26.916c68.536-33.578 128-94.74 128-164.636 0-9.754-0.758-19.33-2.164-28.696-115.796-76.264-189.836-192.754-189.836-323.304 0-229.75 229.23-416 512-416z"
+				],
+				"tags": [
+					"bubble",
+					"comment",
+					"chat",
+					"talk"
+				],
+				"defaultCode": 9724,
+				"grid": 16,
+				"attrs": []
+			},
+			"attrs": [],
+			"properties": {
+				"id": 13,
+				"order": 19,
+				"prevSize": 32,
+				"code": 9724,
+				"name": "online",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"setId": 1,
+			"iconIdx": 18
+		},
+		{
+			"icon": {
+				"paths": [
+					"M512 192c-54.932 0-107.988 8.662-157.694 25.742-46.712 16.054-88.306 38.744-123.628 67.444-66.214 53.798-102.678 122.984-102.678 194.814 0 40.298 11.188 79.378 33.252 116.152 22.752 37.92 56.982 72.586 98.988 100.252 30.356 19.992 50.78 51.948 56.176 87.894 1.8 11.984 2.928 24.088 3.37 36.124 7.47-6.194 14.75-12.846 21.88-19.976 24.154-24.152 56.78-37.49 90.502-37.49 5.368 0 10.762 0.336 16.156 1.024 20.974 2.666 42.398 4.020 63.676 4.020 54.934 0 107.988-8.66 157.694-25.742 46.712-16.054 88.306-38.744 123.628-67.444 66.214-53.796 102.678-122.984 102.678-194.814s-36.464-141.016-102.678-194.814c-35.322-28.698-76.916-51.39-123.628-67.444-49.706-17.080-102.76-25.742-157.694-25.742zM512 64v0c282.77 0 512 186.25 512 416 0 229.752-229.23 416-512 416-27.156 0-53.81-1.734-79.824-5.044-109.978 109.978-241.25 129.7-368.176 132.596v-26.916c68.536-33.578 128-94.74 128-164.636 0-9.754-0.758-19.33-2.164-28.696-115.796-76.264-189.836-192.754-189.836-323.304 0-229.75 229.23-416 512-416z"
+				],
+				"tags": [
+					"bubble",
+					"comment",
+					"chat",
+					"talk"
+				],
+				"defaultCode": 9723,
+				"grid": 16,
+				"attrs": []
+			},
+			"attrs": [],
+			"properties": {
+				"id": 14,
+				"order": 20,
+				"prevSize": 32,
+				"code": 9723,
+				"name": "away",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"setId": 1,
+			"iconIdx": 19
+		},
+		{
+			"icon": {
+				"paths": [
+					"M1088 901.166c0 45.5 26.028 84.908 64 104.184v15.938c-10.626 1.454-21.472 2.224-32.5 2.224-68.008 0-129.348-28.528-172.722-74.264-26.222 6.982-54.002 10.752-82.778 10.752-159.058 0-288-114.616-288-256s128.942-256 288-256c159.058 0 288 114.616 288 256 0 55.348-19.764 106.592-53.356 148.466-6.824 14.824-10.644 31.312-10.644 48.7zM230.678 221.186c-66.214 53.798-102.678 122.984-102.678 194.814 0 40.298 11.188 79.378 33.252 116.15 22.752 37.92 56.982 72.586 98.988 100.252 30.356 19.992 50.78 51.948 56.176 87.894 1.8 11.984 2.928 24.088 3.37 36.124 7.47-6.194 14.75-12.846 21.88-19.976 24.154-24.152 56.78-37.49 90.502-37.49 5.368 0 10.762 0.336 16.156 1.024 20.948 2.662 42.344 4.016 63.594 4.020v128c-27.128-0.002-53.754-1.738-79.742-5.042-109.978 109.978-241.25 129.7-368.176 132.596v-26.916c68.536-33.578 128-94.74 128-164.636 0-9.754-0.758-19.33-2.164-28.696-115.796-76.264-189.836-192.754-189.836-323.304 0-229.75 229.23-416 512-416 278.458 0 504.992 180.614 511.836 405.52-41.096-18.316-85.84-29.422-132.262-32.578-11.53-56.068-45.402-108.816-98.252-151.756-35.322-28.698-76.916-51.39-123.628-67.444-49.706-17.080-102.76-25.742-157.694-25.742-54.932 0-107.988 8.662-157.694 25.742-46.712 16.054-88.306 38.744-123.628 67.444z"
+				],
+				"width": 1152,
+				"tags": [
+					"bubbles",
+					"comments",
+					"chat",
+					"talk"
+				],
+				"defaultCode": 57365,
+				"grid": 16,
+				"attrs": []
+			},
+			"attrs": [],
+			"properties": {
+				"id": 15,
+				"order": 21,
+				"prevSize": 32,
+				"code": 57365,
+				"name": "bubbles",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"setId": 1,
+			"iconIdx": 20
+		},
+		{
+			"icon": {
+				"paths": [
+					"M480 0v0c265.096 0 480 173.914 480 388.448s-214.904 388.448-480 388.448c-25.458 0-50.446-1.62-74.834-4.71-103.106 102.694-222.172 121.108-341.166 123.814v-25.134c64.252-31.354 116-88.466 116-153.734 0-9.106-0.712-18.048-2.030-26.794-108.558-71.214-177.97-179.988-177.97-301.89 0-214.534 214.904-388.448 480-388.448zM996 870.686c0 55.942 36.314 104.898 92 131.772v21.542c-103.126-2.318-197.786-18.102-287.142-106.126-21.14 2.65-42.794 4.040-64.858 4.040-95.47 0-183.408-25.758-253.614-69.040 144.674-0.506 281.26-46.854 384.834-130.672 52.208-42.252 93.394-91.826 122.414-147.348 30.766-58.866 46.366-121.582 46.366-186.406 0-10.448-0.45-20.836-1.258-31.168 72.57 59.934 117.258 141.622 117.258 231.676 0 104.488-60.158 197.722-154.24 258.764-1.142 7.496-1.76 15.16-1.76 22.966z"
+				],
+				"width": 1152,
+				"tags": [
+					"bubbles",
+					"comments",
+					"chat",
+					"talk"
+				],
+				"defaultCode": 57366,
+				"grid": 16,
+				"attrs": []
+			},
+			"attrs": [],
+			"properties": {
+				"id": 16,
+				"order": 22,
+				"prevSize": 32,
+				"code": 57366,
+				"name": "bubbles2",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"setId": 1,
+			"iconIdx": 21
+		},
+		{
+			"icon": {
+				"paths": [
+					"M480 128c-50.666 0-99.582 7.95-145.386 23.628-42.924 14.694-81.114 35.436-113.502 61.646-60.044 48.59-93.112 110.802-93.112 175.174 0 35.99 10.066 70.948 29.92 103.898 20.686 34.34 51.898 65.794 90.26 90.958 30.44 19.968 50.936 51.952 56.362 87.95 0.902 5.99 1.63 12.006 2.18 18.032 2.722-2.52 5.424-5.114 8.114-7.794 24.138-24.040 56.688-37.312 90.322-37.312 5.348 0 10.718 0.336 16.094 1.018 19.36 2.452 39.124 3.696 58.748 3.696 50.666 0 99.58-7.948 145.384-23.628 42.926-14.692 81.116-35.434 113.504-61.644 60.046-48.59 93.112-110.802 93.112-175.174s-33.066-126.582-93.112-175.174c-32.388-26.212-70.578-46.952-113.504-61.646-45.804-15.678-94.718-23.628-145.384-23.628zM480 0v0c265.096 0 480 173.914 480 388.448s-214.904 388.448-480 388.448c-25.458 0-50.446-1.62-74.834-4.71-103.106 102.694-222.172 121.108-341.166 123.814v-25.134c64.252-31.354 116-88.466 116-153.734 0-9.106-0.712-18.048-2.030-26.794-108.558-71.214-177.97-179.988-177.97-301.89 0-214.534 214.904-388.448 480-388.448zM996 870.686c0 55.942 36.314 104.898 92 131.772v21.542c-103.126-2.318-197.786-18.102-287.142-106.126-21.14 2.65-42.794 4.040-64.858 4.040-95.47 0-183.408-25.758-253.614-69.040 144.674-0.506 281.26-46.854 384.834-130.672 52.208-42.252 93.394-91.826 122.414-147.348 30.766-58.866 46.366-121.582 46.366-186.406 0-10.448-0.45-20.836-1.258-31.168 72.57 59.934 117.258 141.622 117.258 231.676 0 104.488-60.158 197.722-154.24 258.764-1.142 7.496-1.76 15.16-1.76 22.966z"
+				],
+				"width": 1152,
+				"tags": [
+					"bubbles",
+					"comments",
+					"chat",
+					"talk"
+				],
+				"defaultCode": 57367,
+				"grid": 16,
+				"attrs": []
+			},
+			"attrs": [],
+			"properties": {
+				"id": 17,
+				"order": 23,
+				"prevSize": 32,
+				"code": 57367,
+				"name": "bubbles3",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"setId": 1,
+			"iconIdx": 22
+		},
+		{
+			"icon": {
+				"paths": [
+					"M848 1024h-672c-26.51 0-48-21.49-48-48 0-68.862 29.068-152.204 77.758-222.942 40.692-59.118 90.684-103.62 144.678-129.61-23.798-21.644-44.294-48.026-60.508-78.122-26-48.262-39.746-104.048-39.746-161.328 0-79.606 26.204-154.822 73.786-211.79 49.664-59.46 116.442-92.208 188.032-92.208s138.368 32.748 188.034 92.21c47.58 56.968 73.786 132.182 73.786 211.79 0 57.28-13.744 113.066-39.744 161.328-16.214 30.096-36.71 56.478-60.51 78.122 53.994 25.99 103.986 70.492 144.678 129.61 48.688 70.736 77.756 154.078 77.756 222.94 0 26.51-21.49 48-48 48zM230.074 928h563.852c-9.226-39.34-28.52-82.384-54.762-120.51-41.454-60.226-93.176-99.622-145.638-110.926-22.106-4.764-37.888-24.31-37.888-46.924v-34.292c0-17.26 9.266-33.19 24.27-41.722 59.478-33.832 97.912-108.266 97.912-189.626 0-114.692-74.384-208-165.818-208-91.432 0-165.818 93.308-165.818 208 0 81.36 38.434 155.792 97.914 189.626 15.002 8.534 24.268 24.462 24.268 41.722v34.292c0 22.614-15.784 42.16-37.888 46.924-52.462 11.304-104.184 50.7-145.64 110.926-26.246 38.126-45.536 81.17-54.764 120.51z"
+				],
+				"tags": [
+					"user",
+					"profile",
+					"avatar",
+					"person",
+					"talk",
+					"member"
+				],
+				"defaultCode": 57370,
+				"grid": 16,
+				"attrs": []
+			},
+			"attrs": [],
+			"properties": {
+				"id": 18,
+				"order": 24,
+				"prevSize": 32,
+				"code": 57370,
+				"name": "user",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"setId": 1,
+			"iconIdx": 23
+		},
+		{
+			"icon": {
+				"paths": [
+					"M922.237 1024h-634.983c-25.050 0-45.356-20.306-45.356-45.356 0-65.069 27.467-143.82 73.475-210.661 38.45-55.861 85.689-97.912 136.708-122.47-22.487-20.452-41.854-45.38-57.175-73.819-24.568-45.603-37.557-98.317-37.557-152.441 0-75.221 24.761-146.294 69.722-200.124 46.928-56.185 110.028-87.129 177.674-87.129s130.746 30.944 177.676 87.131c44.959 53.83 69.722 124.901 69.722 200.124 0 54.125-12.987 106.838-37.555 152.441-15.321 28.438-34.688 53.367-57.177 73.819 51.020 24.558 98.258 66.609 136.708 122.47 46.006 66.84 73.473 145.591 73.473 210.659 0 25.050-20.306 45.356-45.356 45.356zM338.35 933.288h532.792c-8.718-37.173-26.949-77.846-51.745-113.872-39.171-56.908-88.043-94.134-137.616-104.816-20.888-4.502-35.801-22.971-35.801-44.339v-32.403c0-16.309 8.756-31.362 22.933-39.424 56.202-31.968 92.519-102.302 92.519-179.18 0-108.374-70.287-196.542-156.684-196.542s-156.684 88.168-156.684 196.542c0 76.878 36.317 147.21 92.52 179.18 14.176 8.064 22.931 23.115 22.931 39.424v32.403c0 21.368-14.915 39.838-35.801 44.339-49.572 10.681-98.445 47.907-137.617 104.816-24.8 36.026-43.028 76.699-51.747 113.872zM186.256 872.814h-89.805c8.72-37.173 26.947-77.846 51.744-113.872 39.172-56.908 88.045-94.134 137.617-104.816 20.888-4.502 35.801-22.971 35.801-44.339v-32.403c0-16.309-8.756-31.362-22.931-39.424-56.204-31.97-92.52-102.302-92.52-179.18 0-108.374 70.287-196.542 156.684-196.542 5.909 0 11.742 0.427 17.483 1.23 24.906-27.718 53.136-50.245 83.759-67.093-31.364-16.283-65.672-24.849-101.24-24.849-67.646 0-130.746 30.944-177.676 87.131-44.959 53.83-69.72 124.903-69.72 200.124 0 54.125 12.987 106.838 37.557 152.441 15.321 28.438 34.688 53.365 57.175 73.819-51.020 24.558-98.258 66.609-136.708 122.47-46.008 66.84-73.475 145.591-73.475 210.659 0 25.050 20.306 45.356 45.356 45.356h125.094c1.395-29.317 6.802-59.919 15.807-90.712z",
+					"M727.023 70.974v55.231c0 5.084 4.122 9.205 9.205 9.205h276.154c5.084 0 9.205-4.122 9.205-9.205v-55.231c0-5.084-4.122-9.205-9.205-9.205h-276.154c-5.084 0-9.205 4.122-9.205 9.205z"
+				],
+				"tags": [
+					"users",
+					"people",
+					"group",
+					"team",
+					"members",
+					"community"
+				],
+				"defaultCode": 57371,
+				"grid": 16,
+				"attrs": []
+			},
+			"attrs": [],
+			"properties": {
+				"order": 25,
+				"id": 453,
+				"prevSize": 32,
+				"code": 57372,
+				"name": "hide-users",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"setId": 1,
+			"iconIdx": 24
+		},
+		{
+			"icon": {
+				"paths": [
+					"M922.237 1024h-634.983c-25.050 0-45.356-20.306-45.356-45.356 0-65.069 27.467-143.82 73.475-210.661 38.45-55.861 85.689-97.912 136.708-122.47-22.487-20.452-41.854-45.38-57.175-73.819-24.568-45.603-37.557-98.317-37.557-152.441 0-75.221 24.761-146.294 69.722-200.124 46.928-56.185 110.028-87.129 177.674-87.129s130.746 30.944 177.676 87.131c44.959 53.83 69.722 124.901 69.722 200.124 0 54.125-12.987 106.838-37.555 152.441-15.321 28.438-34.688 53.367-57.177 73.819 51.020 24.558 98.258 66.609 136.708 122.47 46.006 66.84 73.473 145.591 73.473 210.659 0 25.050-20.306 45.356-45.356 45.356zM338.35 933.288h532.792c-8.718-37.173-26.949-77.846-51.745-113.872-39.171-56.908-88.043-94.134-137.616-104.816-20.888-4.502-35.801-22.971-35.801-44.339v-32.403c0-16.309 8.756-31.362 22.933-39.424 56.202-31.968 92.519-102.302 92.519-179.18 0-108.374-70.287-196.542-156.684-196.542s-156.684 88.168-156.684 196.542c0 76.878 36.317 147.21 92.52 179.18 14.176 8.064 22.931 23.115 22.931 39.424v32.403c0 21.368-14.915 39.838-35.801 44.339-49.572 10.681-98.445 47.907-137.617 104.816-24.8 36.026-43.028 76.699-51.747 113.872zM186.256 872.814h-89.805c8.72-37.173 26.947-77.846 51.744-113.872 39.172-56.908 88.045-94.134 137.617-104.816 20.888-4.502 35.801-22.971 35.801-44.339v-32.403c0-16.309-8.756-31.362-22.931-39.424-56.204-31.97-92.52-102.302-92.52-179.18 0-108.374 70.287-196.542 156.684-196.542 5.909 0 11.742 0.427 17.483 1.23 24.906-27.718 53.136-50.245 83.759-67.093-31.364-16.283-65.672-24.849-101.24-24.849-67.646 0-130.746 30.944-177.676 87.131-44.959 53.83-69.72 124.903-69.72 200.124 0 54.125 12.987 106.838 37.557 152.441 15.321 28.438 34.688 53.365 57.175 73.819-51.020 24.558-98.258 66.609-136.708 122.47-46.008 66.84-73.475 145.591-73.475 210.659 0 25.050 20.306 45.356 45.356 45.356h125.094c1.395-29.317 6.802-59.919 15.807-90.712z",
+					"M1024.421 100.827h-96.45v-96.45c0-4.842-3.926-8.768-8.768-8.768h-52.609c-4.842 0-8.768 3.926-8.768 8.768v96.45h-96.45c-4.842 0-8.768 3.926-8.768 8.768v52.609c0 4.842 3.926 8.768 8.768 8.768h96.45v96.45c0 4.842 3.926 8.768 8.768 8.768h52.609c4.842 0 8.768-3.926 8.768-8.768v-96.45h96.45c4.842 0 8.768-3.926 8.768-8.768v-52.609c0-4.842-3.926-8.768-8.768-8.768z"
+				],
+				"tags": [
+					"users",
+					"people",
+					"group",
+					"team",
+					"members",
+					"community"
+				],
+				"defaultCode": 57371,
+				"grid": 16,
+				"attrs": []
+			},
+			"attrs": [],
+			"properties": {
+				"order": 26,
+				"id": 452,
+				"prevSize": 32,
+				"code": 57374,
+				"name": "show-users",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"setId": 1,
+			"iconIdx": 25
+		},
+		{
+			"icon": {
+				"paths": [
+					"M976 1024h-672c-26.51 0-48-21.49-48-48 0-68.862 29.068-152.204 77.758-222.942 40.692-59.118 90.684-103.62 144.678-129.61-23.798-21.644-44.294-48.026-60.508-78.122-26-48.262-39.746-104.048-39.746-161.328 0-79.606 26.204-154.822 73.786-211.79 49.664-59.46 116.442-92.208 188.032-92.208s138.368 32.748 188.034 92.21c47.58 56.968 73.786 132.182 73.786 211.79 0 57.28-13.744 113.066-39.744 161.328-16.214 30.096-36.71 56.478-60.51 78.122 53.994 25.99 103.986 70.492 144.678 129.61 48.688 70.736 77.756 154.078 77.756 222.94 0 26.51-21.49 48-48 48zM358.074 928h563.852c-9.226-39.34-28.52-82.384-54.762-120.51-41.454-60.226-93.176-99.622-145.638-110.926-22.106-4.764-37.888-24.31-37.888-46.924v-34.292c0-17.26 9.266-33.19 24.27-41.722 59.478-33.832 97.912-108.266 97.912-189.626 0-114.692-74.384-208-165.818-208s-165.818 93.308-165.818 208c0 81.36 38.434 155.792 97.914 189.626 15.002 8.534 24.268 24.462 24.268 41.722v34.292c0 22.614-15.784 42.16-37.888 46.924-52.462 11.304-104.184 50.7-145.64 110.926-26.246 38.126-45.536 81.17-54.764 120.51zM197.114 864h-95.040c9.228-39.34 28.518-82.384 54.76-120.51 41.456-60.226 93.178-99.622 145.64-110.926 22.106-4.764 37.888-24.31 37.888-46.924v-34.292c0-17.26-9.266-33.19-24.268-41.722-59.48-33.834-97.914-108.266-97.914-189.626 0-114.692 74.384-208 165.818-208 6.254 0 12.426 0.452 18.502 1.302 26.358-29.334 56.234-53.174 88.642-71.004-33.192-17.232-69.5-26.298-107.142-26.298-71.59 0-138.368 32.748-188.034 92.21-47.58 56.968-73.784 132.184-73.784 211.79 0 57.28 13.744 113.066 39.746 161.328 16.214 30.096 36.71 56.476 60.508 78.122-53.994 25.99-103.986 70.492-144.678 129.61-48.69 70.736-77.758 154.078-77.758 222.94 0 26.51 21.49 48 48 48h132.386c1.476-31.026 7.198-63.412 16.728-96z"
+				],
+				"tags": [
+					"users",
+					"people",
+					"group",
+					"team",
+					"members",
+					"community"
+				],
+				"defaultCode": 57371,
+				"grid": 16,
+				"attrs": []
+			},
+			"attrs": [],
+			"properties": {
+				"id": 19,
+				"order": 27,
+				"prevSize": 32,
+				"code": 57371,
+				"name": "users",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"setId": 1,
+			"iconIdx": 26
+		},
+		{
+			"icon": {
+				"paths": [
+					"M225 448c123.712 0 224 100.29 224 224 0 123.712-100.288 224-224 224s-224-100.288-224-224l-1-32c0-247.424 200.576-448 448-448v128c-85.474 0-165.834 33.286-226.274 93.726-11.634 11.636-22.252 24.016-31.83 37.020 11.438-1.8 23.16-2.746 35.104-2.746zM801 448c123.71 0 224 100.29 224 224 0 123.712-100.29 224-224 224s-224-100.288-224-224l-1-32c0-247.424 200.576-448 448-448v128c-85.474 0-165.834 33.286-226.274 93.726-11.636 11.636-22.254 24.016-31.832 37.020 11.44-1.8 23.16-2.746 35.106-2.746z"
+				],
+				"tags": [
+					"quotes-left",
+					"ldquo"
+				],
+				"defaultCode": 57373,
+				"grid": 16,
+				"attrs": []
+			},
+			"attrs": [],
+			"properties": {
+				"id": 20,
+				"order": 28,
+				"prevSize": 32,
+				"code": 57373,
+				"name": "quotes-left",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"setId": 1,
+			"iconIdx": 27
+		},
+		{
+			"icon": {
+				"paths": [
+					"M384 128c0 70.692 57.308 128 128 128s128-57.308 128-128c0-70.692-57.308-128-128-128s-128 57.308-128 128zM655.53 240.47c0 70.692 57.308 128 128 128s128-57.308 128-128c0-70.692-57.308-128-128-128s-128 57.308-128 128zM832 512c0 35.346 28.654 64 64 64s64-28.654 64-64c0-35.346-28.654-64-64-64s-64 28.654-64 64zM719.53 783.53c0 35.346 28.654 64 64 64s64-28.654 64-64c0-35.346-28.654-64-64-64s-64 28.654-64 64zM448.002 896c-0 0-0 0-0 0 0 35.346 28.654 64 64 64s64-28.654 64-64c0-0 0-0 0-0s0-0 0-0c0-35.346-28.654-64-64-64s-64 28.654-64 64c0 0 0 0 0 0zM176.472 783.53c-0 0-0 0-0 0 0 35.346 28.654 64 64 64s64-28.654 64-64c0-0 0-0 0-0s0-0 0-0c0-35.346-28.654-64-64-64s-64 28.654-64 64c0 0 0 0 0 0zM144.472 240.47c-0 0-0 0-0 0 0 53.019 42.981 96 96 96s96-42.981 96-96c0-0 0-0 0-0s0-0 0-0c0-53.019-42.981-96-96-96s-96 42.981-96 96c0 0 0 0 0 0zM56 512c0 39.765 32.235 72 72 72s72-32.235 72-72c0-39.765-32.235-72-72-72s-72 32.235-72 72z"
+				],
+				"tags": [
+					"spinner",
+					"loading",
+					"busy",
+					"wait",
+					"wheel"
+				],
+				"defaultCode": 8987,
+				"grid": 16,
+				"attrs": []
+			},
+			"attrs": [],
+			"properties": {
+				"id": 21,
+				"order": 29,
+				"prevSize": 32,
+				"code": 8987,
+				"name": "spinner",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"setId": 1,
+			"iconIdx": 28
+		},
+		{
+			"icon": {
+				"paths": [
+					"M992.262 871.396l-242.552-206.294c-25.074-22.566-51.89-32.926-73.552-31.926 57.256-67.068 91.842-154.078 91.842-249.176 0-212.078-171.922-384-384-384-212.076 0-384 171.922-384 384s171.922 384 384 384c95.098 0 182.108-34.586 249.176-91.844-1 21.662 9.36 48.478 31.926 73.552l206.294 242.552c35.322 39.246 93.022 42.554 128.22 7.356s31.892-92.898-7.354-128.22zM384 640c-141.384 0-256-114.616-256-256s114.616-256 256-256 256 114.616 256 256-114.614 256-256 256z"
+				],
+				"tags": [
+					"search",
+					"magnifier",
+					"lookup",
+					"find"
+				],
+				"defaultCode": 57377,
+				"grid": 16,
+				"attrs": []
+			},
+			"attrs": [],
+			"properties": {
+				"id": 22,
+				"order": 30,
+				"prevSize": 32,
+				"code": 57377,
+				"name": "search",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"setId": 1,
+			"iconIdx": 29
+		},
+		{
+			"icon": {
+				"paths": [
+					"M363.722 722.052l41.298-57.816-45.254-45.256-57.818 41.296c-10.722-5.994-22.204-10.774-34.266-14.192l-11.682-70.084h-64l-11.68 70.086c-12.062 3.418-23.544 8.198-34.266 14.192l-57.818-41.298-45.256 45.256 41.298 57.816c-5.994 10.72-10.774 22.206-14.192 34.266l-70.086 11.682v64l70.086 11.682c3.418 12.060 8.198 23.544 14.192 34.266l-41.298 57.816 45.254 45.256 57.818-41.296c10.722 5.994 22.204 10.774 34.266 14.192l11.682 70.084h64l11.68-70.086c12.062-3.418 23.544-8.198 34.266-14.192l57.818 41.296 45.254-45.256-41.298-57.816c5.994-10.72 10.774-22.206 14.192-34.266l70.088-11.68v-64l-70.086-11.682c-3.418-12.060-8.198-23.544-14.192-34.266zM224 864c-35.348 0-64-28.654-64-64s28.652-64 64-64 64 28.654 64 64-28.652 64-64 64zM1024 384v-64l-67.382-12.25c-1.242-8.046-2.832-15.978-4.724-23.79l57.558-37.1-24.492-59.128-66.944 14.468c-4.214-6.91-8.726-13.62-13.492-20.13l39.006-56.342-45.256-45.254-56.342 39.006c-6.512-4.766-13.22-9.276-20.13-13.494l14.468-66.944-59.128-24.494-37.1 57.558c-7.812-1.892-15.744-3.482-23.79-4.724l-12.252-67.382h-64l-12.252 67.382c-8.046 1.242-15.976 2.832-23.79 4.724l-37.098-57.558-59.128 24.492 14.468 66.944c-6.91 4.216-13.62 8.728-20.13 13.494l-56.342-39.006-45.254 45.254 39.006 56.342c-4.766 6.51-9.278 13.22-13.494 20.13l-66.944-14.468-24.492 59.128 57.558 37.1c-1.892 7.812-3.482 15.742-4.724 23.79l-67.384 12.252v64l67.382 12.25c1.242 8.046 2.832 15.978 4.724 23.79l-57.558 37.1 24.492 59.128 66.944-14.468c4.216 6.91 8.728 13.618 13.494 20.13l-39.006 56.342 45.254 45.256 56.342-39.006c6.51 4.766 13.22 9.276 20.13 13.492l-14.468 66.944 59.128 24.492 37.102-57.558c7.81 1.892 15.742 3.482 23.788 4.724l12.252 67.384h64l12.252-67.382c8.044-1.242 15.976-2.832 23.79-4.724l37.1 57.558 59.128-24.492-14.468-66.944c6.91-4.216 13.62-8.726 20.13-13.492l56.342 39.006 45.256-45.256-39.006-56.342c4.766-6.512 9.276-13.22 13.492-20.13l66.944 14.468 24.492-59.13-57.558-37.1c1.892-7.812 3.482-15.742 4.724-23.79l67.382-12.25zM672 491.2c-76.878 0-139.2-62.322-139.2-139.2s62.32-139.2 139.2-139.2 139.2 62.322 139.2 139.2c0 76.878-62.32 139.2-139.2 139.2z"
+				],
+				"tags": [
+					"cogs",
+					"settings",
+					"gears",
+					"generate",
+					"control",
+					"options"
+				],
+				"defaultCode": 57378,
+				"grid": 16,
+				"attrs": []
+			},
+			"attrs": [],
+			"properties": {
+				"id": 23,
+				"order": 31,
+				"prevSize": 32,
+				"code": 57378,
+				"name": "cogs",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"setId": 1,
+			"iconIdx": 30
+		},
+		{
+			"icon": {
+				"paths": [
+					"M1002.934 817.876l-460.552-394.76c21.448-40.298 33.618-86.282 33.618-135.116 0-159.058-128.942-288-288-288-29.094 0-57.172 4.332-83.646 12.354l166.39 166.39c24.89 24.89 24.89 65.62 0 90.51l-101.49 101.49c-24.89 24.89-65.62 24.89-90.51 0l-166.39-166.39c-8.022 26.474-12.354 54.552-12.354 83.646 0 159.058 128.942 288 288 288 48.834 0 94.818-12.17 135.116-33.62l394.76 460.552c22.908 26.724 62.016 28.226 86.904 3.338l101.492-101.492c24.888-24.888 23.386-63.994-3.338-86.902z"
+				],
+				"tags": [
+					"wrench",
+					"settings",
+					"control",
+					"tool",
+					"options",
+					"preferences",
+					"fix"
+				],
+				"defaultCode": 57380,
+				"grid": 16,
+				"attrs": []
+			},
+			"attrs": [],
+			"properties": {
+				"id": 24,
+				"order": 32,
+				"prevSize": 32,
+				"code": 57380,
+				"name": "wrench",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"setId": 1,
+			"iconIdx": 31
+		},
+		{
+			"icon": {
+				"paths": [
+					"M768 64h-128c-105.87 0-192 86.13-192 192v192h-400c-26.4 0-48 21.6-48 48v480c0 26.4 21.6 48 48 48h544c26.4 0 48-21.6 48-48v-480c0-26.4-21.6-48-48-48h-16v-192c0-35.29 28.71-64 64-64h128c35.29 0 64 28.71 64 64v192h128v-192c0-105.87-86.13-192-192-192zM384 896h-128l27.84-139.2c-16.808-11.532-27.84-30.874-27.84-52.8 0-35.346 28.654-64 64-64s64 28.654 64 64c0 21.926-11.032 41.268-27.84 52.8l27.84 139.2z"
+				],
+				"tags": [
+					"unlocked",
+					"lock"
+				],
+				"defaultCode": 57381,
+				"grid": 16,
+				"attrs": []
+			},
+			"attrs": [],
+			"properties": {
+				"id": 25,
+				"order": 33,
+				"prevSize": 32,
+				"code": 57381,
+				"name": "unlocked",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"setId": 1,
+			"iconIdx": 32
+		},
+		{
+			"icon": {
+				"paths": [
+					"M832 448h-64v-192c0-141.384-114.616-256-256-256s-256 114.616-256 256v192h-64c-35.2 0-64 28.8-64 64v448c0 35.2 28.8 64 64 64h640c35.2 0 64-28.8 64-64v-448c0-35.2-28.8-64-64-64zM512 832c-35.346 0-64-28.654-64-64s28.654-64 64-64 64 28.654 64 64-28.654 64-64 64zM640 448h-256v-192c0-70.58 57.42-128 128-128s128 57.42 128 128v192z"
+				],
+				"tags": [
+					"lock",
+					"secure",
+					"private",
+					"encrypted"
+				],
+				"defaultCode": 57382,
+				"grid": 16,
+				"attrs": []
+			},
+			"attrs": [],
+			"properties": {
+				"id": 26,
+				"order": 34,
+				"prevSize": 32,
+				"code": 57382,
+				"name": "lock",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"setId": 1,
+			"iconIdx": 33
+		},
+		{
+			"icon": {
+				"paths": [
+					"M592 448h-16v-192c0-105.87-86.13-192-192-192h-128c-105.87 0-192 86.13-192 192v192h-16c-26.4 0-48 21.6-48 48v480c0 26.4 21.6 48 48 48h544c26.4 0 48-21.6 48-48v-480c0-26.4-21.6-48-48-48zM384 896h-128l27.84-139.2c-16.808-11.532-27.84-30.874-27.84-52.8 0-35.346 28.654-64 64-64s64 28.654 64 64c0 21.926-11.032 41.268-27.84 52.8l27.84 139.2zM448 448h-256v-192c0-35.29 28.71-64 64-64h128c35.29 0 64 28.71 64 64v192z"
+				],
+				"tags": [
+					"lock",
+					"secure",
+					"private",
+					"encrypted"
+				],
+				"defaultCode": 57383,
+				"grid": 16,
+				"attrs": []
+			},
+			"attrs": [],
+			"properties": {
+				"id": 27,
+				"order": 35,
+				"prevSize": 32,
+				"code": 57383,
+				"name": "lock-2",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"setId": 1,
+			"iconIdx": 34
+		},
+		{
+			"icon": {
+				"paths": [
+					"M704 0c-176.73 0-320 143.268-320 320 0 20.026 1.858 39.616 5.376 58.624l-389.376 389.376v192c0 35.346 28.654 64 64 64h64v-64h128v-128h128v-128h128l83.042-83.042c34.010 12.316 70.696 19.042 108.958 19.042 176.73 0 320-143.268 320-320s-143.27-320-320-320zM799.874 320.126c-53.020 0-96-42.98-96-96s42.98-96 96-96 96 42.98 96 96-42.98 96-96 96z"
+				],
+				"tags": [
+					"key",
+					"password",
+					"login",
+					"log in",
+					"signin",
+					"sign in"
+				],
+				"defaultCode": 57384,
+				"grid": 16,
+				"attrs": []
+			},
+			"attrs": [],
+			"properties": {
+				"id": 28,
+				"order": 36,
+				"prevSize": 32,
+				"code": 57384,
+				"name": "key",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"setId": 1,
+			"iconIdx": 35
+		},
+		{
+			"icon": {
+				"paths": [
+					"M1002.132 314.242l-101.106-101.104c-24.792-24.794-65.37-65.368-90.162-90.164l-101.106-101.104c-24.792-24.794-68.954-29.166-98.13-9.716l-276.438 184.292c-29.176 19.452-40.218 61.028-24.536 92.39l70.486 140.974c2.154 4.306 4.646 8.896 7.39 13.66l-356.53 356.53-32 224h192v-64h128v-128h128v-128h128v-71.186c6.396 3.812 12.534 7.216 18.192 10.044l140.97 70.488c31.366 15.682 72.94 4.638 92.39-24.538l184.294-276.44c19.454-29.172 15.078-73.33-9.714-98.126zM150.628 854.626l-45.254-45.254 311.572-311.57 45.254 45.254-311.572 311.57zM917.020 423.764l-45.256 45.256c-12.446 12.444-32.808 12.444-45.254 0l-271.53-271.53c-12.446-12.444-12.446-32.81 0-45.254l45.256-45.256c12.446-12.444 32.808-12.444 45.254 0l271.53 271.53c12.446 12.444 12.446 32.81 0 45.254z"
+				],
+				"tags": [
+					"key",
+					"password",
+					"login",
+					"log in",
+					"signin",
+					"sign in"
+				],
+				"defaultCode": 57385,
+				"grid": 16,
+				"attrs": []
+			},
+			"attrs": [],
+			"properties": {
+				"id": 29,
+				"order": 37,
+				"prevSize": 32,
+				"code": 57385,
+				"name": "key-2",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"setId": 1,
+			"iconIdx": 36
+		},
+		{
+			"icon": {
+				"paths": [
+					"M992.262 871.396l-242.552-206.294c-25.074-22.566-51.89-32.926-73.552-31.926 57.256-67.068 91.842-154.078 91.842-249.176 0-212.078-171.922-384-384-384-212.076 0-384 171.922-384 384s171.922 384 384 384c95.098 0 182.108-34.586 249.176-91.844-1 21.662 9.36 48.478 31.926 73.552l206.294 242.552c35.322 39.246 93.022 42.554 128.22 7.356s31.892-92.898-7.354-128.22zM384 640c-141.384 0-256-114.616-256-256s114.616-256 256-256 256 114.616 256 256-114.614 256-256 256zM192 320h384v128h-384z"
+				],
+				"tags": [
+					"zoom out",
+					"smaller",
+					"scale",
+					"reduce"
+				],
+				"defaultCode": 57386,
+				"grid": 16,
+				"attrs": []
+			},
+			"attrs": [],
+			"properties": {
+				"id": 30,
+				"order": 38,
+				"prevSize": 32,
+				"code": 57386,
+				"name": "zoomout",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"setId": 1,
+			"iconIdx": 37
+		},
+		{
+			"icon": {
+				"paths": [
+					"M992.262 871.396l-242.552-206.294c-25.074-22.566-51.89-32.926-73.552-31.926 57.256-67.068 91.842-154.078 91.842-249.176 0-212.078-171.922-384-384-384-212.076 0-384 171.922-384 384s171.922 384 384 384c95.098 0 182.108-34.586 249.176-91.844-1 21.662 9.36 48.478 31.926 73.552l206.294 242.552c35.322 39.246 93.022 42.554 128.22 7.356s31.892-92.898-7.354-128.22zM384 640c-141.384 0-256-114.616-256-256s114.616-256 256-256 256 114.616 256 256-114.614 256-256 256zM448 192h-128v128h-128v128h128v128h128v-128h128v-128h-128z"
+				],
+				"tags": [
+					"zoom in",
+					"enlarge",
+					"scale"
+				],
+				"defaultCode": 57387,
+				"grid": 16,
+				"attrs": []
+			},
+			"attrs": [],
+			"properties": {
+				"id": 31,
+				"order": 39,
+				"prevSize": 32,
+				"code": 57387,
+				"name": "zoomin",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"setId": 1,
+			"iconIdx": 38
+		},
+		{
+			"icon": {
+				"paths": [
+					"M1024 608.094v-192.188l-146.774-24.462c-5.958-18.132-13.222-35.668-21.694-52.5l86.454-121.034-135.896-135.898-120.826 86.304c-16.91-8.554-34.538-15.888-52.768-21.902l-24.402-146.414h-192.188l-24.402 146.416c-18.23 6.014-35.858 13.348-52.766 21.902l-120.828-86.304-135.898 135.898 86.454 121.036c-8.47 16.83-15.734 34.366-21.692 52.498l-146.774 24.46v192.188l147.118 24.52c5.96 17.968 13.21 35.348 21.642 52.030l-86.748 121.448 135.898 135.896 121.654-86.894c16.602 8.35 33.89 15.528 51.764 21.434l24.578 147.472h192.188l24.578-147.474c17.874-5.906 35.162-13.084 51.766-21.432l121.652 86.892 135.896-135.896-86.744-121.446c8.432-16.682 15.678-34.062 21.64-52.032l147.118-24.518zM512 640c-70.692 0-128-57.306-128-128 0-70.692 57.308-128 128-128 70.694 0 128 57.308 128 128 0 70.694-57.306 128-128 128z"
+				],
+				"tags": [
+					"cog",
+					"preferences",
+					"settings",
+					"gear",
+					"generate",
+					"control",
+					"options"
+				],
+				"defaultCode": 57391,
+				"grid": 16,
+				"attrs": []
+			},
+			"attrs": [],
+			"properties": {
+				"id": 32,
+				"order": 40,
+				"prevSize": 32,
+				"code": 57391,
+				"name": "cog",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"setId": 1,
+			"iconIdx": 39
+		},
+		{
+			"icon": {
+				"paths": [
+					"M800 128h-576c-53.020 0-96 42.98-96 96v32h768v-32c0-53.020-42.98-96-96-96zM632.32 64l14.116 101h-268.872l14.114-101h240.642zM640 0h-256c-26.4 0-50.99 21.392-54.642 47.538l-18.714 133.924c-3.654 26.146 14.956 47.538 41.356 47.538h320c26.4 0 45.010-21.392 41.358-47.538l-18.714-133.924c-3.654-26.146-28.244-47.538-54.644-47.538v0zM816 320h-608c-35.2 0-61.392 28.682-58.206 63.738l52.412 576.526c3.186 35.054 34.594 63.736 69.794 63.736h480c35.2 0 66.608-28.682 69.794-63.736l52.41-576.526c3.188-35.056-23.004-63.738-58.204-63.738zM384 896h-96l-32-448h128v448zM576 896h-128v-448h128v448zM736 896h-96v-448h128l-32 448z"
+				],
+				"tags": [
+					"remove",
+					"delete",
+					"trashcan",
+					"recycle bin",
+					"bin",
+					"dispose"
+				],
+				"defaultCode": 57389,
+				"grid": 16,
+				"attrs": []
+			},
+			"attrs": [],
+			"properties": {
+				"id": 33,
+				"order": 41,
+				"prevSize": 32,
+				"code": 57389,
+				"name": "remove",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"setId": 1,
+			"iconIdx": 40
+		},
+		{
+			"icon": {
+				"paths": [
+					"M512 192c-223.318 0-416.882 130.042-512 320 95.118 189.958 288.682 320 512 320 223.314 0 416.878-130.042 512-320-95.116-189.958-288.686-320-512-320zM764.45 361.704c60.162 38.374 111.142 89.774 149.434 150.296-38.292 60.522-89.274 111.922-149.436 150.298-75.594 48.216-162.89 73.702-252.448 73.702-89.56 0-176.856-25.486-252.45-73.704-60.16-38.372-111.14-89.772-149.434-150.296 38.292-60.524 89.274-111.924 149.434-150.296 3.918-2.5 7.876-4.922 11.858-7.3-9.958 27.328-15.408 56.822-15.408 87.596 0 141.384 114.616 256 256 256s256-114.616 256-256c0-30.774-5.45-60.268-15.408-87.598 3.98 2.378 7.938 4.802 11.858 7.302zM512 410c0 53.020-42.98 96-96 96s-96-42.98-96-96 42.98-96 96-96 96 42.98 96 96z"
+				],
+				"tags": [
+					"eye",
+					"views",
+					"vision",
+					"visit"
+				],
+				"defaultCode": 57392,
+				"grid": 16,
+				"attrs": []
+			},
+			"attrs": [],
+			"properties": {
+				"id": 35,
+				"order": 42,
+				"prevSize": 32,
+				"code": 57392,
+				"name": "eye",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"setId": 1,
+			"iconIdx": 41
+		},
+		{
+			"icon": {
+				"paths": [
+					"M839.322 296.416c77.644 55.030 141.37 129.092 184.678 215.584-95.122 189.958-288.686 320-512 320-62.566 0-122.792-10.212-179.178-29.084l77.956-77.956c33.058 7.3 66.972 11.040 101.222 11.040 89.558 0 176.854-25.486 252.446-73.704 60.162-38.376 111.144-89.776 149.436-150.298-37.052-58.566-86.014-108.55-143.65-146.494l69.090-69.088zM512 698c-22.724 0-44.752-2.976-65.728-8.534l313.186-313.184c5.562 20.972 8.542 42.994 8.542 65.718 0 141.384-114.616 256-256 256zM960 0h-53.738l-219.612 219.612c-55.076-17.924-113.754-27.612-174.65-27.612-223.318 0-416.882 130.042-512 320 42.658 85.192 105.128 158.308 181.194 213.068l-181.194 181.194v53.738h53.738l906.262-906.262v-53.738zM416 314c48.044 0 87.846 35.294 94.892 81.37l-109.524 109.524c-46.074-7.048-81.368-46.85-81.368-94.894 0-53.020 42.98-96 96-96zM110.116 512c38.292-60.524 89.274-111.924 149.434-150.296 3.918-2.5 7.876-4.922 11.858-7.3-9.958 27.328-15.408 56.822-15.408 87.596 0 58.524 19.65 112.448 52.698 155.562l-58.55 58.55c-56.072-37.642-103.754-86.772-140.032-144.112z"
+				],
+				"tags": [
+					"eye-blocked",
+					"views",
+					"vision",
+					"visit",
+					"banned",
+					"blocked",
+					"forbidden",
+					"private"
+				],
+				"defaultCode": 57393,
+				"grid": 16,
+				"attrs": []
+			},
+			"attrs": [],
+			"properties": {
+				"id": 36,
+				"order": 43,
+				"prevSize": 32,
+				"code": 57393,
+				"name": "eye-blocked",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"setId": 1,
+			"iconIdx": 42
+		},
+		{
+			"icon": {
+				"paths": [
+					"M697.832 327.048l-64.952-64.922-324.81 324.742c-53.814 53.792-53.814 141.048 0 194.844 53.804 53.792 141.060 53.792 194.874 0l389.772-389.708c89.714-89.662 89.714-235.062 0-324.726-89.666-89.704-235.112-89.704-324.782 0l-409.23 409.178c-0.29 0.304-0.612 0.576-0.876 0.846-125.102 125.096-125.102 327.856 0 452.906 125.054 125.056 327.868 125.056 452.988 0 0.274-0.274 0.516-0.568 0.82-0.876l0.032 0.034 279.332-279.292-64.986-64.92-279.33 279.262c-0.296 0.268-0.564 0.57-0.846 0.844-89.074 89.058-233.98 89.058-323.076 0-89.062-89.042-89.062-233.922 0-322.978 0.304-0.304 0.604-0.582 0.888-0.846l-0.046-0.060 409.28-409.166c53.712-53.738 141.144-53.738 194.886 0 53.712 53.734 53.712 141.148 0 194.84l-389.772 389.7c-17.936 17.922-47.054 17.922-64.972 0-17.894-17.886-17.894-47.032 0-64.92l324.806-324.782z"
+				],
+				"tags": [
+					"attachment",
+					"paperclip"
+				],
+				"defaultCode": 57394,
+				"grid": 16,
+				"attrs": []
+			},
+			"attrs": [],
+			"properties": {
+				"id": 37,
+				"order": 44,
+				"prevSize": 32,
+				"code": 57394,
+				"name": "attachment",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"setId": 1,
+			"iconIdx": 43
+		},
+		{
+			"icon": {
+				"paths": [
+					"M480 64c-265.096 0-480 214.904-480 480 0 265.098 214.904 480 480 480 265.098 0 480-214.902 480-480 0-265.096-214.902-480-480-480zM751.59 704c8.58-40.454 13.996-83.392 15.758-128h127.446c-3.336 44.196-13.624 87.114-30.68 128h-112.524zM208.41 384c-8.58 40.454-13.996 83.392-15.758 128h-127.444c3.336-44.194 13.622-87.114 30.678-128h112.524zM686.036 384c9.614 40.962 15.398 83.854 17.28 128h-191.316v-128h174.036zM512 320v-187.338c14.59 4.246 29.044 11.37 43.228 21.37 26.582 18.74 52.012 47.608 73.54 83.486 14.882 24.802 27.752 52.416 38.496 82.484l-155.264-0zM331.232 237.516c21.528-35.878 46.956-64.748 73.54-83.486 14.182-10 28.638-17.124 43.228-21.37l-0 187.34h-155.264c10.746-30.066 23.616-57.68 38.496-82.484zM448 384v128h-191.314c1.88-44.146 7.666-87.038 17.278-128h174.036zM95.888 704c-17.056-40.886-27.342-83.804-30.678-128h127.444c1.762 44.608 7.178 87.546 15.758 128h-112.524zM256.686 576h191.314v128h-174.036c-9.612-40.96-15.398-83.854-17.278-128zM448 768v187.34c-14.588-4.246-29.044-11.372-43.228-21.37-26.584-18.74-52.014-47.61-73.54-83.486-14.882-24.804-27.75-52.418-38.498-82.484h155.266zM628.768 850.484c-21.528 35.876-46.958 64.746-73.54 83.486-14.184 9.998-28.638 17.124-43.228 21.37l-0-187.34h155.266c-10.746 30.066-23.616 57.68-38.498 82.484zM512 704v-128h191.314c-1.88 44.146-7.666 87.040-17.28 128h-174.034zM767.348 512c-1.762-44.608-7.178-87.546-15.758-128h112.524c17.056 40.886 27.344 83.806 30.68 128h-127.446zM830.658 320h-95.9c-18.638-58.762-44.376-110.294-75.316-151.428 42.536 20.34 81.058 47.616 114.714 81.272 21.48 21.478 40.362 44.938 56.502 70.156zM185.844 249.844c33.658-33.658 72.18-60.932 114.714-81.272-30.942 41.134-56.676 92.666-75.316 151.428h-95.898c16.138-25.218 35.022-48.678 56.5-70.156zM129.344 768h95.898c18.64 58.762 44.376 110.294 75.318 151.43-42.536-20.34-81.058-47.616-114.714-81.274-21.48-21.478-40.364-44.938-56.502-70.156zM774.156 838.156c-33.656 33.658-72.18 60.934-114.714 81.274 30.942-41.134 56.678-92.668 75.316-151.43h95.9c-16.14 25.218-35.022 48.678-56.502 70.156z"
+				],
+				"tags": [
+					"globe",
+					"web",
+					"internet",
+					"network",
+					"sphere"
+				],
+				"defaultCode": 57395,
+				"grid": 16,
+				"attrs": []
+			},
+			"attrs": [],
+			"properties": {
+				"id": 38,
+				"order": 45,
+				"prevSize": 32,
+				"code": 57395,
+				"name": "globe",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"setId": 1,
+			"iconIdx": 44
+		},
+		{
+			"icon": {
+				"paths": [
+					"M1024 358.156c0-162.458-131.7-294.156-294.156-294.156-86.362 0-164.030 37.218-217.844 96.49-53.814-59.272-131.482-96.49-217.844-96.49-162.458 0-294.156 131.698-294.156 294.156 0 86.362 37.218 164.030 96.49 217.844h-0.49l320 320c32 32 64 64 96 64s64-32 96-64l320-320h-0.49c59.272-53.814 96.49-131.482 96.49-217.844zM841.468 481.232l-323.978 324.258c-1.678 1.678-3.532 3.532-5.49 5.48-1.96-1.95-3.814-3.802-5.49-5.48l-323.978-324.256c-35.166-31.928-54.532-75.638-54.532-123.078 0-91.618 74.538-166.156 166.156-166.156 47.44 0 91.15 19.366 123.076 54.532l94.768 104.38 94.768-104.378c31.928-35.168 75.636-54.534 123.076-54.534 91.618 0 166.156 74.538 166.156 166.156 0 47.44-19.368 91.15-54.532 123.076z"
+				],
+				"tags": [
+					"heart",
+					"like",
+					"love",
+					"favorite"
+				],
+				"defaultCode": 10084,
+				"grid": 16,
+				"attrs": []
+			},
+			"attrs": [],
+			"properties": {
+				"id": 39,
+				"order": 46,
+				"prevSize": 32,
+				"code": 10084,
+				"name": "heart",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"setId": 1,
+			"iconIdx": 45
+		},
+		{
+			"icon": {
+				"paths": [
+					"M512 1024c282.77 0 512-229.23 512-512s-229.23-512-512-512-512 229.23-512 512 229.23 512 512 512zM512 96c229.75 0 416 186.25 416 416s-186.25 416-416 416-416-186.25-416-416 186.25-416 416-416zM512 598.76c115.95 0 226.23-30.806 320-84.92-14.574 178.438-153.128 318.16-320 318.16-166.868 0-305.422-139.872-320-318.304 93.77 54.112 204.050 85.064 320 85.064zM256 352c0 53.019 28.654 96 64 96s64-42.981 64-96c0-53.019-28.654-96-64-96s-64 42.981-64 96zM640 352c0 53.019 28.654 96 64 96s64-42.981 64-96c0-53.019-28.654-96-64-96s-64 42.981-64 96z"
+				],
+				"tags": [
+					"happy",
+					"emoticon",
+					"smiley",
+					"face"
+				],
+				"defaultCode": 9787,
+				"grid": 16,
+				"attrs": []
+			},
+			"attrs": [],
+			"properties": {
+				"id": 40,
+				"order": 47,
+				"prevSize": 32,
+				"code": 9787,
+				"name": "happy",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"setId": 1,
+			"iconIdx": 46
+		},
+		{
+			"icon": {
+				"paths": [
+					"M928 576c73 0 32 192-32 192 32 0 0 160-64 160 0 64-64 96-128 96-270.352 0-175.264-67.65-448-96v-512c240.922-72.268 480-253.424 480-416 53 0 192 64 0 384 0 0 160 0 192 0 96 0 64 192 0 192zM192 416v512h64v32h-128c-35.2 0-64-43.2-64-96v-384c0-52.8 28.8-96 64-96h128v32h-64z"
+				],
+				"tags": [
+					"thumbs-up",
+					"up",
+					"like",
+					"rate",
+					"vote up"
+				],
+				"defaultCode": 9757,
+				"grid": 16,
+				"attrs": []
+			},
+			"attrs": [],
+			"properties": {
+				"id": 41,
+				"order": 48,
+				"prevSize": 32,
+				"code": 9757,
+				"name": "thumbs-up",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"setId": 1,
+			"iconIdx": 47
+		},
+		{
+			"icon": {
+				"paths": [
+					"M512 1024c282.77 0 512-229.23 512-512s-229.23-512-512-512-512 229.23-512 512 229.23 512 512 512zM512 96c229.75 0 416 186.25 416 416s-186.25 416-416 416-416-186.25-416-416 186.25-416 416-416zM256 320c0-35.346 28.654-64 64-64s64 28.654 64 64c0 35.346-28.654 64-64 64s-64-28.654-64-64zM640 320c0-35.346 28.654-64 64-64s64 28.654 64 64c0 35.346-28.654 64-64 64s-64-28.654-64-64zM704.098 627.26l82.328 49.396c-55.962 93.070-157.916 155.344-274.426 155.344s-218.464-62.274-274.426-155.344l82.328-49.396c39.174 65.148 110.542 108.74 192.098 108.74s152.924-43.592 192.098-108.74z"
+				],
+				"tags": [
+					"smiley",
+					"emoticon",
+					"face"
+				],
+				"defaultCode": 9786,
+				"grid": 16,
+				"attrs": []
+			},
+			"attrs": [],
+			"properties": {
+				"id": 42,
+				"order": 49,
+				"prevSize": 32,
+				"code": 9786,
+				"name": "smiley",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"setId": 1,
+			"iconIdx": 48
+		},
+		{
+			"icon": {
+				"paths": [
+					"M512 1024c282.77 0 512-229.23 512-512s-229.23-512-512-512-512 229.23-512 512 229.23 512 512 512zM512 96c229.75 0 416 186.25 416 416s-186.25 416-416 416-416-186.25-416-416 186.25-416 416-416zM256 320c0-35.346 28.654-64 64-64s64 28.654 64 64c0 35.346-28.654 64-64 64s-64-28.654-64-64zM640 320c0-35.346 28.654-64 64-64s64 28.654 64 64c0 35.346-28.654 64-64 64s-64-28.654-64-64zM768 576v64h-64v96c0 53.020-42.98 96-96 96s-96-42.98-96-96v-96h-256v-64h512z"
+				],
+				"tags": [
+					"tongue",
+					"emoticon",
+					"smiley",
+					"face"
+				],
+				"defaultCode": 57400,
+				"grid": 16,
+				"attrs": []
+			},
+			"attrs": [],
+			"properties": {
+				"id": 43,
+				"order": 50,
+				"prevSize": 32,
+				"code": 57400,
+				"name": "tongue",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"setId": 1,
+			"iconIdx": 49
+		},
+		{
+			"icon": {
+				"paths": [
+					"M512 1024c282.77 0 512-229.23 512-512s-229.23-512-512-512-512 229.23-512 512 229.23 512 512 512zM512 96c229.75 0 416 186.25 416 416s-186.25 416-416 416-416-186.25-416-416 186.25-416 416-416zM256 320c0-35.346 28.654-64 64-64s64 28.654 64 64c0 35.346-28.654 64-64 64s-64-28.654-64-64zM640 320c0-35.346 28.654-64 64-64s64 28.654 64 64c0 35.346-28.654 64-64 64s-64-28.654-64-64zM319.902 780.74l-82.328-49.396c55.962-93.070 157.916-155.344 274.426-155.344 116.508 0 218.462 62.274 274.426 155.344l-82.328 49.396c-39.174-65.148-110.542-108.74-192.098-108.74-81.558 0-152.924 43.592-192.098 108.74z"
+				],
+				"tags": [
+					"sad",
+					"emoticon",
+					"smiley",
+					"face"
+				],
+				"defaultCode": 9785,
+				"grid": 16,
+				"attrs": []
+			},
+			"attrs": [],
+			"properties": {
+				"id": 44,
+				"order": 51,
+				"prevSize": 32,
+				"code": 9785,
+				"name": "sad",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"setId": 1,
+			"iconIdx": 50
+		},
+		{
+			"icon": {
+				"paths": [
+					"M512 1024c282.77 0 512-229.23 512-512s-229.23-512-512-512-512 229.23-512 512 229.23 512 512 512zM512 96c229.75 0 416 186.25 416 416s-186.25 416-416 416-416-186.25-416-416 186.25-416 416-416zM542.74 711.028c140.248-27.706 249.11-91.542 288.454-176.594-21.654 167.956-161.518 297.566-330.85 297.566-119.242 0-223.858-64.282-282.892-160.948 70.41 55.058 194.534 65.808 325.288 39.976zM640 352c0 53.019 28.654 96 64 96s64-42.981 64-96c0-53.019-28.654-96-64-96s-64 42.981-64 96zM352 371.5c-41.796 0-77.334 15.656-90.516 37.5-3.54-5.866-5.484-32.174-5.484-38.75 0-31.066 42.98-56.25 96-56.25s96 25.184 96 56.25c0 6.576-1.944 32.884-5.484 38.75-13.182-21.844-48.72-37.5-90.516-37.5z"
+				],
+				"tags": [
+					"wink",
+					"emoticon",
+					"smiley",
+					"face"
+				],
+				"defaultCode": 57402,
+				"grid": 16,
+				"attrs": []
+			},
+			"attrs": [],
+			"properties": {
+				"id": 45,
+				"order": 52,
+				"prevSize": 32,
+				"code": 57402,
+				"name": "wink",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"setId": 1,
+			"iconIdx": 51
+		},
+		{
+			"icon": {
+				"paths": [
+					"M512 1024c282.77 0 512-229.23 512-512s-229.23-512-512-512-512 229.23-512 512 229.23 512 512 512zM512 96c229.75 0 416 186.25 416 416s-186.25 416-416 416-416-186.25-416-416 186.25-416 416-416zM745.74 601.62l22.488 76.776-437.008 128.002-22.488-76.776zM256 320c0-35.346 28.654-64 64-64s64 28.654 64 64c0 35.346-28.654 64-64 64s-64-28.654-64-64zM640 320c0-35.346 28.654-64 64-64s64 28.654 64 64c0 35.346-28.654 64-64 64s-64-28.654-64-64z"
+				],
+				"tags": [
+					"wondering",
+					"emoticon",
+					"smiley",
+					"face",
+					"question"
+				],
+				"defaultCode": 9065,
+				"grid": 16,
+				"attrs": []
+			},
+			"attrs": [],
+			"properties": {
+				"id": 46,
+				"order": 53,
+				"prevSize": 32,
+				"code": 9065,
+				"name": "wondering",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"setId": 1,
+			"iconIdx": 52
+		},
+		{
+			"icon": {
+				"paths": [
+					"M512 1024c282.77 0 512-229.23 512-512s-229.23-512-512-512-512 229.23-512 512 229.23 512 512 512zM512 96c229.75 0 416 186.25 416 416s-186.25 416-416 416-416-186.25-416-416 186.25-416 416-416zM256 320c0 35.346 28.654 64 64 64s64-28.654 64-64c0-35.346-28.654-64-64-64s-64 28.654-64 64zM640 320c0 35.346 28.654 64 64 64s64-28.654 64-64c0-35.346-28.654-64-64-64s-64 28.654-64 64zM726.106 640h64.864c9.246 72.506-32.452 144.53-103.958 170.56-82.904 30.176-174.9-12.716-205.080-95.616-18.108-49.744-73.306-75.482-123.048-57.372-45.562 16.588-70.956 64.298-60.988 110.424h-64.86c-9.242-72.508 32.45-144.528 103.956-170.56 82.904-30.178 174.902 12.716 205.082 95.614 18.104 49.748 73.306 75.482 123.044 57.372 45.562-16.584 70.956-64.298 60.988-110.422z"
+				],
+				"tags": [
+					"confused",
+					"emoticon",
+					"smiley",
+					"face",
+					"bewildered"
+				],
+				"defaultCode": 9064,
+				"grid": 16,
+				"attrs": []
+			},
+			"attrs": [],
+			"properties": {
+				"id": 47,
+				"order": 54,
+				"prevSize": 32,
+				"code": 9064,
+				"name": "confused",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"setId": 1,
+			"iconIdx": 53
+		},
+		{
+			"icon": {
+				"paths": [
+					"M512 1024c282.77 0 512-229.23 512-512s-229.23-512-512-512-512 229.23-512 512 229.23 512 512 512zM512 96c229.75 0 416 186.25 416 416s-186.25 416-416 416-416-186.25-416-416 186.25-416 416-416zM384 704c0-70.692 57.308-128 128-128s128 57.308 128 128c0 70.692-57.308 128-128 128s-128-57.308-128-128zM640 352c0 53.019 28.654 96 64 96s64-42.981 64-96c0-53.019-28.654-96-64-96s-64 42.981-64 96zM256 352c0 53.019 28.654 96 64 96s64-42.981 64-96c0-53.019-28.654-96-64-96s-64 42.981-64 96z"
+				],
+				"tags": [
+					"shocked",
+					"emoticon",
+					"smiley",
+					"face"
+				],
+				"defaultCode": 9060,
+				"grid": 16,
+				"attrs": []
+			},
+			"attrs": [],
+			"properties": {
+				"id": 48,
+				"order": 55,
+				"prevSize": 32,
+				"code": 9060,
+				"name": "shocked",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"setId": 1,
+			"iconIdx": 54
+		},
+		{
+			"icon": {
+				"paths": [
+					"M639.996 448c-35.346 0-64-28.654-63.998-64.002 0-1.17 0.036-2.33 0.098-3.484 2.032-47.454 45.212-78.946 81.592-97.138 34.742-17.37 69.102-26.060 70.548-26.422 17.146-4.288 34.518 6.138 38.806 23.284 4.284 17.146-6.14 34.518-23.284 38.806-17.626 4.45-38.522 12.12-56.936 21.35 10.648 11.43 17.174 26.752 17.174 43.606 0 35.346-28.654 64-64 64zM280.242 319.044c-17.144-4.286-27.568-21.66-23.282-38.804 4.286-17.146 21.66-27.572 38.806-23.284 1.444 0.362 35.806 9.050 70.548 26.422 36.382 18.19 79.56 49.684 81.592 97.138 0.062 1.154 0.098 2.316 0.098 3.484 0 35.346-28.654 64-64 64s-64-28.654-64-64c0-16.854 6.526-32.176 17.174-43.606-18.414-9.23-39.312-16.9-56.936-21.35zM512 736c81.554 0 152.924-43.592 192.098-108.74l82.328 49.396c-55.962 93.070-157.916 155.344-274.426 155.344s-218.464-62.274-274.426-155.344l82.328-49.396c39.174 65.148 110.542 108.74 192.098 108.74zM1024 64c0-45.516-9.524-88.8-26.652-128-33.576 76.836-96.448 137.932-174.494 169.178-86.194-65.96-193.936-105.178-310.854-105.178s-224.66 39.218-310.854 105.178c-78.048-31.246-140.918-92.342-174.494-169.178-17.128 39.2-26.652 82.484-26.652 128 0 73.574 24.85 141.328 66.588 195.378-42.37 74.542-66.588 160.75-66.588 252.622 0 282.77 229.23 512 512 512s512-229.23 512-512c0-91.872-24.218-178.080-66.588-252.622 41.738-54.050 66.588-121.804 66.588-195.378zM512 928c-229.75 0-416-186.25-416-416s186.25-416 416-416 416 186.25 416 416-186.25 416-416 416z"
+				],
+				"tags": [
+					"evil",
+					"emoticon",
+					"smiley",
+					"face"
+				],
+				"defaultCode": 9759,
+				"grid": 16,
+				"attrs": []
+			},
+			"attrs": [],
+			"properties": {
+				"id": 49,
+				"order": 56,
+				"prevSize": 32,
+				"code": 9759,
+				"name": "evil",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"setId": 1,
+			"iconIdx": 55
+		},
+		{
+			"icon": {
+				"paths": [
+					"M512 1024c282.77 0 512-229.23 512-512s-229.23-512-512-512-512 229.23-512 512 229.23 512 512 512zM512 96c229.75 0 416 186.25 416 416s-186.25 416-416 416-416-186.25-416-416 186.25-416 416-416zM704.098 780.74c-39.174-65.148-110.544-108.74-192.098-108.74-81.556 0-152.924 43.592-192.098 108.74l-82.328-49.396c55.96-93.070 157.916-155.344 274.426-155.344 116.508 0 218.464 62.274 274.426 155.344l-82.328 49.396zM767.042 280.24c4.284 17.144-6.14 34.518-23.282 38.804-17.626 4.45-38.522 12.12-56.936 21.35 10.648 11.43 17.174 26.752 17.174 43.606 0 35.346-28.654 64-64 64s-64-28.654-64-64c0-1.17 0.036-2.33 0.098-3.484 2.032-47.454 45.212-78.946 81.592-97.138 34.742-17.37 69.102-26.060 70.548-26.422 17.146-4.288 34.518 6.138 38.806 23.284zM256.958 280.24c4.288-17.146 21.66-27.572 38.806-23.284 1.446 0.362 35.806 9.052 70.548 26.422 36.38 18.192 79.56 49.684 81.592 97.138 0.062 1.154 0.098 2.314 0.098 3.484 0 35.346-28.654 64-64 64s-64-28.654-64-64c0-16.854 6.526-32.176 17.174-43.606-18.414-9.23-39.31-16.9-56.936-21.35-17.142-4.286-27.566-21.66-23.282-38.804z"
+				],
+				"tags": [
+					"angry",
+					"emoticon",
+					"smiley",
+					"face",
+					"rage"
+				],
+				"defaultCode": 57407,
+				"grid": 16,
+				"attrs": []
+			},
+			"attrs": [],
+			"properties": {
+				"id": 50,
+				"order": 57,
+				"prevSize": 32,
+				"code": 57407,
+				"name": "angry",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"setId": 1,
+			"iconIdx": 56
+		},
+		{
+			"icon": {
+				"paths": [
+					"M512 1024c282.77 0 512-229.23 512-512s-229.23-512-512-512-512 229.23-512 512 229.23 512 512 512zM512 96c229.75 0 416 186.25 416 416s-186.25 416-416 416-416-186.25-416-416 186.25-416 416-416zM800 256c17.6 0 32 14.4 32 32v96c0 35.2-28.8 64-64 64h-128c-35.2 0-64-28.8-64-64h-128c0 35.2-28.8 64-64 64h-128c-35.2 0-64-28.8-64-64v-96c0-17.6 14.4-32 32-32h192c17.6 0 32 14.4 32 32v32h128v-32c0-17.6 14.4-32 32-32h192zM512 768c93.208 0 174.772-49.818 219.546-124.278l54.88 32.934c-55.966 93.070-157.916 155.344-274.426 155.344-48.458 0-94.384-10.796-135.54-30.082l33.162-55.278c31.354 13.714 65.964 21.36 102.378 21.36z"
+				],
+				"tags": [
+					"cool",
+					"emoticon",
+					"smiley",
+					"face"
+				],
+				"defaultCode": 57408,
+				"grid": 16,
+				"attrs": []
+			},
+			"attrs": [],
+			"properties": {
+				"id": 51,
+				"order": 58,
+				"prevSize": 32,
+				"code": 57408,
+				"name": "cool",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"setId": 1,
+			"iconIdx": 57
+		},
+		{
+			"icon": {
+				"paths": [
+					"M512 1024c282.77 0 512-229.23 512-512s-229.23-512-512-512-512 229.23-512 512 229.23 512 512 512zM512 96c229.75 0 416 186.25 416 416s-186.25 416-416 416-416-186.25-416-416 186.25-416 416-416zM192 512v64c0 140.8 115.2 256 256 256h128c140.8 0 256-115.2 256-256v-64h-640zM384 756.988c-26.538-9.458-50.924-24.822-71.544-45.446-36.406-36.402-56.456-84.54-56.456-135.542h128v180.988zM576 768h-128v-192h128v192zM711.544 711.542c-20.624 20.624-45.010 35.988-71.544 45.446v-180.988h128c0 51.002-20.048 99.14-56.456 135.542zM225.352 384c0.002 0 0 0 0 0 9.768 0 18.108-7.056 19.724-16.69 6.158-36.684 37.668-63.31 74.924-63.31s68.766 26.626 74.924 63.31c1.616 9.632 9.956 16.69 19.722 16.69 9.768 0 18.108-7.056 19.724-16.688 1.082-6.436 1.628-12.934 1.628-19.312 0-63.962-52.038-116-116-116s-116 52.038-116 116c0 6.378 0.548 12.876 1.628 19.312 1.62 9.632 9.96 16.688 19.726 16.688zM609.352 384c0.002 0 0 0 0 0 9.77 0 18.112-7.056 19.724-16.69 6.158-36.684 37.668-63.31 74.924-63.31s68.766 26.626 74.924 63.31c1.616 9.632 9.958 16.69 19.722 16.69s18.108-7.056 19.722-16.688c1.082-6.436 1.628-12.934 1.628-19.312 0-63.962-52.038-116-116-116s-116 52.038-116 116c0 6.378 0.544 12.876 1.626 19.312 1.624 9.632 9.964 16.688 19.73 16.688z"
+				],
+				"tags": [
+					"grin",
+					"emoticon",
+					"smiley",
+					"face"
+				],
+				"defaultCode": 57409,
+				"grid": 16,
+				"attrs": []
+			},
+			"attrs": [],
+			"properties": {
+				"id": 52,
+				"order": 59,
+				"prevSize": 32,
+				"code": 57409,
+				"name": "grin",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"setId": 1,
+			"iconIdx": 58
+		},
+		{
+			"icon": {
+				"paths": [
+					"M512 0c-282.77 0-512 229.23-512 512s229.23 512 512 512 512-229.23 512-512-229.23-512-512-512zM512 928c-229.75 0-416-186.25-416-416s186.25-416 416-416 416 186.25 416 416-186.25 416-416 416zM448 256h128v128h-128zM640 768h-256v-64h64v-192h-64v-64h192v256h64z"
+				],
+				"tags": [
+					"info",
+					"information"
+				],
+				"defaultCode": 9056,
+				"grid": 16,
+				"attrs": []
+			},
+			"attrs": [],
+			"properties": {
+				"id": 53,
+				"order": 60,
+				"prevSize": 32,
+				"code": 9056,
+				"name": "info",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"setId": 1,
+			"iconIdx": 59
+		},
+		{
+			"icon": {
+				"paths": [
+					"M512 96c-111.118 0-215.584 43.272-294.156 121.844s-121.844 183.038-121.844 294.156c0 111.118 43.272 215.584 121.844 294.156s183.038 121.844 294.156 121.844c111.118 0 215.584-43.272 294.156-121.844s121.844-183.038 121.844-294.156c0-111.118-43.272-215.584-121.844-294.156s-183.038-121.844-294.156-121.844zM512 0v0c282.77 0 512 229.23 512 512s-229.23 512-512 512c-282.77 0-512-229.23-512-512s229.23-512 512-512zM448 704h128v128h-128zM448 192h128v384h-128z"
+				],
+				"tags": [
+					"notification",
+					"warning",
+					"notice",
+					"note",
+					"exclamation"
+				],
+				"defaultCode": 57375,
+				"grid": 16,
+				"attrs": []
+			},
+			"attrs": [],
+			"properties": {
+				"id": 54,
+				"order": 61,
+				"prevSize": 32,
+				"code": 57375,
+				"name": "notification",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"setId": 1,
+			"iconIdx": 60
+		},
+		{
+			"icon": {
+				"paths": [
+					"M512 158.724l-344.834 737.276h689.668l-344.834-737.276zM512 0v0c22.070 0 44.14 14.882 60.884 44.648l437.072 871.112c33.49 59.532 5 108.24-63.302 108.24h-869.308c-68.304 0-96.79-48.708-63.304-108.24l437.074-871.112c16.744-29.766 38.814-44.648 60.884-44.648zM448 768c0 35.346 28.654 64 64 64s64-28.654 64-64c0-35.346-28.654-64-64-64s-64 28.654-64 64zM512 384c35.346 0 64 28.654 64 64l-20 192h-88l-20-192c0-35.346 28.654-64 64-64z"
+				],
+				"tags": [
+					"warning",
+					"sign"
+				],
+				"defaultCode": 9888,
+				"grid": 16,
+				"attrs": []
+			},
+			"attrs": [],
+			"properties": {
+				"id": 55,
+				"order": 62,
+				"prevSize": 32,
+				"code": 9888,
+				"name": "warning",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"setId": 1,
+			"iconIdx": 61
+		},
+		{
+			"icon": {
+				"paths": [
+					"M128 256h128v192h64v-384c0-35.2-28.8-64-64-64h-128c-35.2 0-64 28.8-64 64v384h64v-192zM128 64h128v128h-128v-128zM960 64v-64h-192c-35.202 0-64 28.8-64 64v320c0 35.2 28.798 64 64 64h192v-64h-192v-320h192zM640 160v-96c0-35.2-28.8-64-64-64h-192v448h192c35.2 0 64-28.8 64-64v-96c0-35.2-8.8-64-44-64 35.2 0 44-28.8 44-64zM576 384h-128v-128h128v128zM576 192h-128v-128h128v128zM832 576l-416 448-224-288 82-70 142 148 352-302z"
+				],
+				"tags": [
+					"spell-check",
+					"correct"
+				],
+				"defaultCode": 57413,
+				"grid": 16,
+				"attrs": []
+			},
+			"attrs": [],
+			"properties": {
+				"id": 56,
+				"order": 63,
+				"prevSize": 32,
+				"code": 57413,
+				"name": "spell-check",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"setId": 1,
+			"iconIdx": 62
+		},
+		{
+			"icon": {
+				"paths": [
+					"M890.040 922.040c-12.286 0-24.568-4.686-33.942-14.058-18.744-18.746-18.744-49.136 0-67.882 87.638-87.642 135.904-204.16 135.904-328.1 0-123.938-48.266-240.458-135.904-328.098-18.744-18.746-18.744-49.138 0-67.882s49.138-18.744 67.882 0c105.77 105.772 164.022 246.4 164.022 395.98 0 149.582-58.252 290.208-164.022 395.98-9.372 9.374-21.656 14.060-33.94 14.060zM719.53 831.53c-12.286 0-24.568-4.686-33.942-14.058-18.744-18.744-18.744-49.136 0-67.882 131.006-131.006 131.006-344.17 0-475.176-18.744-18.746-18.744-49.138 0-67.882 18.744-18.742 49.138-18.744 67.882 0 81.594 81.592 126.53 190.076 126.53 305.468 0 115.39-44.936 223.876-126.53 305.47-9.372 9.374-21.656 14.060-33.94 14.060zM549.020 741.020c-12.286 0-24.568-4.686-33.942-14.058-18.746-18.746-18.746-49.136 0-67.882 81.1-81.1 81.1-213.058 0-294.156-18.746-18.746-18.746-49.138 0-67.882s49.136-18.744 67.882 0c118.53 118.53 118.53 311.392 0 429.922-9.372 9.37-21.656 14.056-33.94 14.056zM401.332 78.668c25.668-25.668 46.668-16.968 46.668 19.332v828c0 36.3-21 44.998-46.668 19.33l-241.332-241.33h-160v-384h160l241.332-241.332z"
+				],
+				"width": 1088,
+				"tags": [
+					"volume-high",
+					"speaker",
+					"media control",
+					"audio"
+				],
+				"defaultCode": 57414,
+				"grid": 16,
+				"attrs": []
+			},
+			"attrs": [],
+			"properties": {
+				"id": 57,
+				"order": 64,
+				"prevSize": 32,
+				"code": 57414,
+				"name": "volume-high",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"setId": 1,
+			"iconIdx": 63
+		},
+		{
+			"icon": {
+				"paths": [
+					"M719.53 831.53c-12.286 0-24.568-4.686-33.942-14.058-18.744-18.744-18.744-49.136 0-67.882 131.006-131.006 131.006-344.17 0-475.176-18.744-18.746-18.744-49.138 0-67.882 18.744-18.742 49.138-18.744 67.882 0 81.594 81.592 126.53 190.076 126.53 305.468 0 115.39-44.936 223.876-126.53 305.47-9.372 9.374-21.656 14.060-33.94 14.060zM549.020 741.020c-12.286 0-24.568-4.686-33.942-14.058-18.746-18.746-18.746-49.136 0-67.882 81.1-81.1 81.1-213.058 0-294.156-18.746-18.746-18.746-49.138 0-67.882s49.136-18.744 67.882 0c118.53 118.53 118.53 311.392 0 429.922-9.372 9.37-21.656 14.056-33.94 14.056zM401.332 78.668c25.668-25.668 46.668-16.968 46.668 19.332v828c0 36.3-21 44.998-46.668 19.33l-241.332-241.33h-160v-384h160l241.332-241.332z"
+				],
+				"tags": [
+					"volume-medium",
+					"speaker",
+					"media control",
+					"audio"
+				],
+				"defaultCode": 57415,
+				"grid": 16,
+				"attrs": []
+			},
+			"attrs": [],
+			"properties": {
+				"id": 58,
+				"order": 65,
+				"prevSize": 32,
+				"code": 57415,
+				"name": "volume-medium",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"setId": 1,
+			"iconIdx": 64
+		},
+		{
+			"icon": {
+				"paths": [
+					"M549.020 741.020c-12.286 0-24.568-4.686-33.942-14.058-18.746-18.746-18.746-49.136 0-67.882 81.1-81.1 81.1-213.058 0-294.156-18.746-18.746-18.746-49.138 0-67.882s49.136-18.744 67.882 0c118.53 118.53 118.53 311.392 0 429.922-9.372 9.37-21.656 14.056-33.94 14.056zM401.332 78.668c25.668-25.668 46.668-16.968 46.668 19.332v828c0 36.3-21 44.998-46.668 19.33l-241.332-241.33h-160v-384h160l241.332-241.332z"
+				],
+				"tags": [
+					"volume-low",
+					"speaker",
+					"media control",
+					"audio"
+				],
+				"defaultCode": 57416,
+				"grid": 16,
+				"attrs": []
+			},
+			"attrs": [],
+			"properties": {
+				"id": 59,
+				"order": 66,
+				"prevSize": 32,
+				"code": 57416,
+				"name": "volume-low",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"setId": 1,
+			"iconIdx": 65
+		},
+		{
+			"icon": {
+				"paths": [
+					"M401.332 78.668c25.668-25.668 46.668-16.968 46.668 19.332v828c0 36.3-21 44.998-46.668 19.33l-241.332-241.33h-160v-384h160l241.332-241.332zM960 619.148v84.852h-84.852l-107.148-107.148-107.148 107.148h-84.852v-84.852l107.148-107.148-107.148-107.148v-84.852h84.852l107.148 107.148 107.148-107.148h84.852v84.852l-107.148 107.148z"
+				],
+				"tags": [
+					"volume-mute",
+					"speaker",
+					"media control",
+					"audio",
+					"mute"
+				],
+				"defaultCode": 57417,
+				"grid": 16,
+				"attrs": []
+			},
+			"attrs": [],
+			"properties": {
+				"id": 60,
+				"order": 67,
+				"prevSize": 32,
+				"code": 57417,
+				"name": "volume-mute",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"setId": 1,
+			"iconIdx": 66
+		},
+		{
+			"icon": {
+				"paths": [
+					"M401.332 78.668c25.668-25.668 46.668-16.968 46.668 19.332v828c0 36.3-21 44.998-46.668 19.33l-241.332-241.33h-160v-384h160l241.332-241.332z"
+				],
+				"tags": [
+					"volume-mute",
+					"speaker",
+					"media control",
+					"audio",
+					"mute"
+				],
+				"defaultCode": 57418,
+				"grid": 16,
+				"attrs": []
+			},
+			"attrs": [],
+			"properties": {
+				"id": 61,
+				"order": 68,
+				"prevSize": 32,
+				"code": 57418,
+				"name": "volume-mute2",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"setId": 1,
+			"iconIdx": 67
+		},
+		{
+			"icon": {
+				"paths": [
+					"M428.164 63.918c11.976 0 19.836 11.878 19.838 34.082v828c0 22.206-7.856 34.082-19.836 34.082-7.604 0-16.868-4.788-26.834-14.752l-241.332-241.33h-160v-384h160l241.332-241.332c9.966-9.966 19.228-14.75 26.832-14.75zM512 448h512v128h-512z"
+				],
+				"tags": [
+					"volume-decrease",
+					"speaker",
+					"media control",
+					"audio"
+				],
+				"defaultCode": 57419,
+				"grid": 16,
+				"attrs": []
+			},
+			"attrs": [],
+			"properties": {
+				"id": 62,
+				"order": 69,
+				"prevSize": 32,
+				"code": 57419,
+				"name": "volume-decrease",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"setId": 1,
+			"iconIdx": 68
+		},
+		{
+			"icon": {
+				"paths": [
+					"M428.164 63.918c11.976 0 19.836 11.878 19.838 34.082v828c0 22.206-7.856 34.082-19.836 34.082-7.604 0-16.868-4.788-26.834-14.752l-241.332-241.33h-160v-384h160l241.332-241.332c9.966-9.966 19.228-14.75 26.832-14.75zM1024 576h-192v192h-128v-192h-192v-128h192v-192h128v192h192z"
+				],
+				"tags": [
+					"volume-increase",
+					"speaker",
+					"media control",
+					"audio"
+				],
+				"defaultCode": 57420,
+				"grid": 16,
+				"attrs": []
+			},
+			"attrs": [],
+			"properties": {
+				"id": 63,
+				"order": 70,
+				"prevSize": 32,
+				"code": 57420,
+				"name": "volume-increase",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"setId": 1,
+			"iconIdx": 69
+		},
+		{
+			"icon": {
+				"paths": [
+					"M707.88 484.652c37.498-44.542 60.12-102.008 60.12-164.652 0-141.16-114.842-256-256-256h-320v896h384c141.158 0 256-114.842 256-256 0-92.956-49.798-174.496-124.12-219.348zM384 192h101.5c55.968 0 101.5 57.42 101.5 128s-45.532 128-101.5 128h-101.5v-256zM543 832h-159v-256h159c58.45 0 106 57.42 106 128s-47.55 128-106 128z"
+				],
+				"tags": [
+					"bold",
+					"wysiwyg"
+				],
+				"defaultCode": 57421,
+				"grid": 16,
+				"attrs": []
+			},
+			"attrs": [],
+			"properties": {
+				"id": 64,
+				"order": 71,
+				"prevSize": 32,
+				"code": 57421,
+				"name": "bold",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"setId": 1,
+			"iconIdx": 70
+		},
+		{
+			"icon": {
+				"paths": [
+					"M704 64h128v416c0 159.058-143.268 288-320 288-176.73 0-320-128.942-320-288v-416h128v416c0 40.166 18.238 78.704 51.354 108.506 36.896 33.204 86.846 51.494 140.646 51.494s103.75-18.29 140.646-51.494c33.116-29.802 51.354-68.34 51.354-108.506v-416zM192 832h640v128h-640z"
+				],
+				"tags": [
+					"underline",
+					"wysiwyg"
+				],
+				"defaultCode": 57422,
+				"grid": 16,
+				"attrs": []
+			},
+			"attrs": [],
+			"properties": {
+				"id": 65,
+				"order": 72,
+				"prevSize": 32,
+				"code": 57422,
+				"name": "underline",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"setId": 1,
+			"iconIdx": 71
+		},
+		{
+			"icon": {
+				"paths": [
+					"M896 64v64h-128l-320 768h128v64h-448v-64h128l320-768h-128v-64z"
+				],
+				"tags": [
+					"italic",
+					"wysiwyg"
+				],
+				"defaultCode": 57423,
+				"grid": 16,
+				"attrs": []
+			},
+			"attrs": [],
+			"properties": {
+				"id": 66,
+				"order": 73,
+				"prevSize": 32,
+				"code": 57423,
+				"name": "italic",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"setId": 1,
+			"iconIdx": 72
+		},
+		{
+			"icon": {
+				"paths": [
+					"M1024 512v64h-234.506c27.504 38.51 42.506 82.692 42.506 128 0 70.878-36.66 139.026-100.58 186.964-59.358 44.518-137.284 69.036-219.42 69.036-82.138 0-160.062-24.518-219.42-69.036-63.92-47.938-100.58-116.086-100.58-186.964h128c0 69.382 87.926 128 192 128s192-58.618 192-128c0-69.382-87.926-128-192-128h-512v-64h299.518c-2.338-1.654-4.656-3.324-6.938-5.036-63.92-47.94-100.58-116.086-100.58-186.964s36.66-139.024 100.58-186.964c59.358-44.518 137.282-69.036 219.42-69.036 82.136 0 160.062 24.518 219.42 69.036 63.92 47.94 100.58 116.086 100.58 186.964h-128c0-69.382-87.926-128-192-128s-192 58.618-192 128c0 69.382 87.926 128 192 128 78.978 0 154.054 22.678 212.482 64h299.518z"
+				],
+				"tags": [
+					"strikethrough",
+					"wysiwyg"
+				],
+				"defaultCode": 57424,
+				"grid": 16,
+				"attrs": []
+			},
+			"attrs": [],
+			"properties": {
+				"id": 67,
+				"order": 74,
+				"prevSize": 32,
+				"code": 57424,
+				"name": "strikethrough",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"setId": 1,
+			"iconIdx": 73
+		},
+		{
+			"icon": {
+				"paths": [
+					"M192 64v768h768v-768h-768zM896 768h-640v-640h640v640zM128 896v-640l-64-64v768h768l-64-64zM429.254 685.254l192-192 146.746 146.746v-384h-384l146.746 146.746-192 192z"
+				],
+				"tags": [
+					"new tab",
+					"external",
+					"outside",
+					"popout",
+					"link",
+					"blank"
+				],
+				"defaultCode": 57427,
+				"grid": 16,
+				"attrs": []
+			},
+			"attrs": [],
+			"properties": {
+				"id": 68,
+				"order": 75,
+				"prevSize": 32,
+				"code": 57427,
+				"name": "newtab",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"setId": 1,
+			"iconIdx": 74
+		},
+		{
+			"icon": {
+				"paths": [
+					"M832 128h-640c-105.6 0-192 86.4-192 192v384c0 105.6 86.4 192 192 192h640c105.6 0 192-86.4 192-192v-384c0-105.6-86.4-192-192-192zM960 704c0 33.978-13.374 66.062-37.654 90.346-24.284 24.28-56.366 37.654-90.346 37.654h-640c-33.978 0-66.062-13.374-90.344-37.654-24.282-24.284-37.656-56.368-37.656-90.346v-384c0-33.978 13.374-66.062 37.656-90.344s56.366-37.656 90.344-37.656h640c33.978 0 66.062 13.374 90.346 37.656 24.282 24.282 37.654 56.366 37.654 90.344v384zM384 768l320-256-320-256z"
+				],
+				"tags": [
+					"youtube",
+					"social"
+				],
+				"defaultCode": 57429,
+				"grid": 16,
+				"attrs": []
+			},
+			"attrs": [],
+			"properties": {
+				"id": 69,
+				"order": 76,
+				"prevSize": 32,
+				"code": 57429,
+				"name": "youtube",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"setId": 1,
+			"iconIdx": 75
+		},
+		{
+			"icon": {
+				"paths": [
+					"M1014.662 822.66c-0.004-0.004-0.008-0.008-0.012-0.010l-310.644-310.65 310.644-310.65c0.004-0.004 0.008-0.006 0.012-0.010 3.344-3.346 5.762-7.254 7.312-11.416 4.246-11.376 1.824-24.682-7.324-33.83l-146.746-146.746c-9.148-9.146-22.45-11.566-33.828-7.32-4.16 1.55-8.070 3.968-11.418 7.31 0 0.004-0.004 0.006-0.008 0.010l-310.648 310.652-310.648-310.65c-0.004-0.004-0.006-0.006-0.010-0.010-3.346-3.342-7.254-5.76-11.414-7.31-11.38-4.248-24.682-1.826-33.83 7.32l-146.748 146.748c-9.148 9.148-11.568 22.452-7.322 33.828 1.552 4.16 3.97 8.072 7.312 11.416 0.004 0.002 0.006 0.006 0.010 0.010l310.65 310.648-310.65 310.652c-0.002 0.004-0.006 0.006-0.008 0.010-3.342 3.346-5.76 7.254-7.314 11.414-4.248 11.376-1.826 24.682 7.322 33.83l146.748 146.746c9.15 9.148 22.452 11.568 33.83 7.322 4.16-1.552 8.070-3.97 11.416-7.312 0.002-0.004 0.006-0.006 0.010-0.010l310.648-310.65 310.648 310.65c0.004 0.002 0.008 0.006 0.012 0.008 3.348 3.344 7.254 5.762 11.414 7.314 11.378 4.246 24.684 1.826 33.828-7.322l146.746-146.748c9.148-9.148 11.57-22.454 7.324-33.83-1.552-4.16-3.97-8.068-7.314-11.414z"
+				],
+				"tags": [
+					"close",
+					"cancel",
+					"quit",
+					"remove",
+					"cross"
+				],
+				"defaultCode": 10005,
+				"grid": 16,
+				"attrs": []
+			},
+			"attrs": [],
+			"properties": {
+				"id": 70,
+				"order": 77,
+				"prevSize": 32,
+				"code": 10005,
+				"name": "close",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"setId": 1,
+			"iconIdx": 76
+		},
+		{
+			"icon": {
+				"paths": [
+					"M0 512c0 282.77 229.23 512 512 512 282.772 0 512-229.23 512-512s-229.228-512-512-512c-282.77 0-512 229.23-512 512zM896 512c0 73.236-20.512 141.68-56.088 199.912l-527.822-527.824c58.23-35.578 126.674-56.088 199.91-56.088 212.076 0 384 171.922 384 384zM128 512c0-73.236 20.512-141.678 56.090-199.912l527.822 527.824c-58.234 35.578-126.676 56.088-199.912 56.088-212.076 0-384-171.922-384-384z"
+				],
+				"tags": [
+					"blocked",
+					"cancel",
+					"stop",
+					"forbidden",
+					"denied",
+					"banned"
+				],
+				"defaultCode": 10008,
+				"grid": 16,
+				"attrs": []
+			},
+			"attrs": [],
+			"properties": {
+				"id": 71,
+				"order": 78,
+				"prevSize": 32,
+				"code": 10008,
+				"name": "blocked",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"setId": 1,
+			"iconIdx": 77
+		},
+		{
+			"icon": {
+				"paths": [
+					"M512 0c-282.77 0-512 229.23-512 512s229.23 512 512 512 512-229.23 512-512-229.23-512-512-512zM768 346.51l-165.488 165.49 165.488 165.488v90.512h-90.512l-165.488-165.488-165.49 165.488h-90.51v-90.512l165.49-165.488-165.49-165.49v-90.51h90.51l165.49 165.49 165.488-165.49h90.512v90.51z"
+				],
+				"tags": [
+					"cancel-circle",
+					"close",
+					"remove",
+					"delete"
+				],
+				"defaultCode": 57432,
+				"grid": 16,
+				"attrs": []
+			},
+			"attrs": [],
+			"properties": {
+				"id": 72,
+				"order": 79,
+				"prevSize": 32,
+				"code": 57432,
+				"name": "cancel-circle",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"setId": 1,
+			"iconIdx": 78
+		},
+		{
+			"icon": {
+				"paths": [
+					"M0 416v192c0 17.672 14.328 32 32 32h960c17.672 0 32-14.328 32-32v-192c0-17.672-14.328-32-32-32h-960c-17.672 0-32 14.328-32 32z"
+				],
+				"tags": [
+					"minus",
+					"minimize",
+					"subtract"
+				],
+				"defaultCode": 57434,
+				"grid": 16,
+				"attrs": []
+			},
+			"attrs": [],
+			"properties": {
+				"id": 73,
+				"order": 80,
+				"prevSize": 32,
+				"code": 57434,
+				"name": "minus",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"setId": 1,
+			"iconIdx": 79
+		},
+		{
+			"icon": {
+				"paths": [
+					"M992 384h-352v-352c0-17.672-14.328-32-32-32h-192c-17.672 0-32 14.328-32 32v352h-352c-17.672 0-32 14.328-32 32v192c0 17.672 14.328 32 32 32h352v352c0 17.672 14.328 32 32 32h192c17.672 0 32-14.328 32-32v-352h352c17.672 0 32-14.328 32-32v-192c0-17.672-14.328-32-32-32z"
+				],
+				"tags": [
+					"plus",
+					"add",
+					"sum"
+				],
+				"defaultCode": 10010,
+				"grid": 16,
+				"attrs": []
+			},
+			"attrs": [],
+			"properties": {
+				"id": 74,
+				"order": 81,
+				"prevSize": 32,
+				"code": 10010,
+				"name": "plus",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"setId": 1,
+			"iconIdx": 80
+		},
+		{
+			"icon": {
+				"paths": [
+					"M0 0v1024h1024v-1024h-1024zM960 960h-896v-896h896v896zM768 224l-320 320-192-192-128 128 320 320 448-448-128-128z"
+				],
+				"tags": [
+					"checkbox-checked",
+					"tick",
+					"checked",
+					"selected"
+				],
+				"defaultCode": 9745,
+				"grid": 16,
+				"attrs": []
+			},
+			"attrs": [],
+			"properties": {
+				"id": 75,
+				"order": 82,
+				"prevSize": 32,
+				"code": 9745,
+				"name": "checkbox-checked",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"setId": 1,
+			"iconIdx": 81
+		},
+		{
+			"icon": {
+				"paths": [
+					"M0 0v1024h1024v-1024h-1024zM960 960h-896v-896h896v896z"
+				],
+				"tags": [
+					"checkbox-unchecked",
+					"unchecked",
+					"square"
+				],
+				"defaultCode": 11047,
+				"grid": 16,
+				"attrs": []
+			},
+			"attrs": [],
+			"properties": {
+				"id": 76,
+				"order": 83,
+				"prevSize": 32,
+				"code": 11047,
+				"name": "checkbox-unchecked",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"setId": 1,
+			"iconIdx": 82
+		},
+		{
+			"icon": {
+				"paths": [
+					"M0 0v1024h1024v-1024h-1024zM960 960h-896v-896h896v896zM256 256h512v512h-512z"
+				],
+				"tags": [
+					"checkbox-partial",
+					"partial"
+				],
+				"defaultCode": 11048,
+				"grid": 16,
+				"attrs": []
+			},
+			"attrs": [],
+			"properties": {
+				"id": 77,
+				"order": 84,
+				"prevSize": 32,
+				"code": 11048,
+				"name": "checkbox-partial",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"setId": 1,
+			"iconIdx": 83
+		},
+		{
+			"icon": {
+				"paths": [
+					"M512 0c-282.77 0-512 229.23-512 512s229.23 512 512 512 512-229.23 512-512-229.23-512-512-512zM512 896c-212.078 0-384-171.922-384-384s171.922-384 384-384c212.078 0 384 171.922 384 384s-171.922 384-384 384zM320 512c0 106.039 85.961 192 192 192s192-85.961 192-192c0-106.039-85.961-192-192-192s-192 85.961-192 192z"
+				],
+				"tags": [
+					"radio-checked"
+				],
+				"defaultCode": 11046,
+				"grid": 16,
+				"attrs": []
+			},
+			"attrs": [],
+			"properties": {
+				"id": 78,
+				"order": 85,
+				"prevSize": 32,
+				"code": 11046,
+				"name": "radio-checked",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"setId": 1,
+			"iconIdx": 84
+		},
+		{
+			"icon": {
+				"paths": [
+					"M512 0c-282.77 0-512 229.23-512 512s229.23 512 512 512 512-229.23 512-512-229.23-512-512-512zM512 896c-212.078 0-384-171.922-384-384s171.922-384 384-384c212.078 0 384 171.922 384 384s-171.922 384-384 384z"
+				],
+				"tags": [
+					"radio-unchecked",
+					"circle"
+				],
+				"defaultCode": 11045,
+				"grid": 16,
+				"attrs": []
+			},
+			"attrs": [],
+			"properties": {
+				"id": 79,
+				"order": 86,
+				"prevSize": 32,
+				"code": 11045,
+				"name": "radio-unchecked",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"setId": 1,
+			"iconIdx": 85
+		},
+		{
+			"icon": {
+				"paths": [
+					"M512 0c-282.77 0-512 229.23-512 512s229.23 512 512 512 512-229.23 512-512-229.23-512-512-512zM448 192h128v128h-128v-128zM640 832h-256v-64h64v-256h-64v-64h192v320h64v64z"
+				],
+				"tags": [
+					"info",
+					"information"
+				],
+				"defaultCode": 57433,
+				"grid": 16,
+				"attrs": []
+			},
+			"attrs": [],
+			"properties": {
+				"id": 80,
+				"order": 87,
+				"prevSize": 32,
+				"code": 57433,
+				"name": "room-info",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"setId": 1,
+			"iconIdx": 86
+		},
+		{
+			"icon": {
+				"paths": [
+					"M896 256v-128h-896v704c0 35.346 28.654 64 64 64h864c53.022 0 96-42.978 96-96v-544h-128zM832 832h-768v-640h768v640zM128 320h640v64h-640zM512 448h256v64h-256zM512 576h256v64h-256zM512 704h192v64h-192zM128 448h320v320h-320z"
+				],
+				"tags": [
+					"newspaper",
+					"paper"
+				],
+				"defaultCode": 57345,
+				"grid": 16,
+				"attrs": []
+			},
+			"attrs": [],
+			"properties": {
+				"id": 81,
+				"order": 88,
+				"prevSize": 32,
+				"code": 57345,
+				"name": "newspaper",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"setId": 1,
+			"iconIdx": 87
+		},
+		{
+			"icon": {
+				"paths": [
+					"M896 192h-768v640h768v-640zM1024 64v0 896h-1024v-896h1024zM832 768h-640v-128l192-320 263 320 185-128v64zM640 352c0 53.019 42.981 96 96 96s96-42.981 96-96c0-53.019-42.981-96-96-96s-96 42.981-96 96z"
+				],
+				"tags": [
+					"image",
+					"picture",
+					"photo",
+					"graphic"
+				],
+				"defaultCode": 11028,
+				"grid": 16,
+				"attrs": []
+			},
+			"attrs": [],
+			"properties": {
+				"id": 82,
+				"order": 89,
+				"prevSize": 32,
+				"code": 11028,
+				"name": "image",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"setId": 1,
+			"iconIdx": 88
+		},
+		{
+			"icon": {
+				"paths": [
+					"M512 64c-282.764 0-512 186.212-512 416.008 0 130.498 74.736 246.66 190.542 322.902 1.396 9.402 1.458 19.316 1.458 29.090 0 69.912-59.486 130.808-128 164.368v27.632c126.93-2.886 258.016-22.42 368.004-132.36 26.018 3.304 52.86 4.36 79.996 4.36 282.764 0 512-186.26 512-415.992 0-229.796-229.236-416.008-512-416.008zM325.818 194.916c3.15-0.65 7.152 0.312 10.178 1.444 2.218 0.822 4.034 2.576 5.818 4.376l165.826 165.81 165.81-165.81c1.8-1.8 3.616-3.554 5.818-4.376 6.098-2.266 14.012-0.496 18.914 4.376l78.554 78.536c4.856 4.904 5.166 11.388 2.9 17.456-0.822 2.218-1.116 4.034-2.9 5.818l-167.286 165.826 167.286 165.81c1.784 1.784 2.078 3.6 2.9 5.818 2.282 6.082 1.986 14.010-2.9 18.912l-78.554 78.538c-4.902 4.872-12.846 5.182-18.914 2.918-2.202-0.822-4.018-1.118-5.818-2.918l-165.81-165.81-165.826 165.81c-1.784 1.8-3.6 2.096-5.818 2.918-6.082 2.28-14.010 1.986-18.898-2.918l-77.094-78.538c-4.872-4.902-6.626-12.846-4.36-18.912 0.806-2.218 2.56-4.034 4.36-5.818l165.81-165.81-165.81-165.826c-1.8-1.784-3.554-3.6-4.36-5.818-2.296-6.082-0.542-12.552 4.36-17.456l77.094-78.536c2.436-2.436 5.57-5.184 8.72-5.82z"
+				],
+				"tags": [
+					"offline"
+				],
+				"defaultCode": 57346,
+				"grid": 16,
+				"attrs": []
+			},
+			"attrs": [],
+			"properties": {
+				"id": 83,
+				"order": 90,
+				"prevSize": 32,
+				"code": 57346,
+				"name": "offline",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"setId": 1,
+			"iconIdx": 89
+		},
+		{
+			"icon": {
+				"paths": [
+					"M512 64c-282.764 0-512 186.212-512 416.008 0 130.498 74.736 246.66 190.542 322.902 1.396 9.402 1.458 19.316 1.458 29.090 0 69.912-59.486 130.808-128 164.368v27.632c126.93-2.886 258.016-22.42 368.004-132.36 26.018 3.304 52.86 4.36 79.996 4.36 282.764 0 512-186.26 512-415.992 0-229.796-229.236-416.008-512-416.008zM155.632 384h695.28c12.816 0 23.274 10.458 23.274 23.272v139.638c0 12.814-10.458 23.272-23.274 23.272h-695.28c-12.816 0-23.272-10.458-23.272-23.272v-139.638c0-12.814 10.456-23.272 23.272-23.272z"
+				],
+				"tags": [
+					"busy"
+				],
+				"defaultCode": 57348,
+				"grid": 16,
+				"attrs": []
+			},
+			"attrs": [],
+			"properties": {
+				"order": 91,
+				"id": 454,
+				"prevSize": 32,
+				"code": 57348,
+				"name": "busy",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"setId": 1,
+			"iconIdx": 90
+		},
+		{
+			"icon": {
+				"paths": [
+					"M768 640v-128h-320v-128h320v-128l192 192zM704 576v256h-320v192l-384-192v-832h704v320h-64v-256h-512l256 128v576h256v-192z"
+				],
+				"tags": [
+					"exit",
+					"sign out",
+					"log out",
+					"quit",
+					"close",
+					"logout"
+				],
+				"grid": 16,
+				"attrs": []
+			},
+			"attrs": [],
+			"properties": {
+				"id": 260,
+				"order": 92,
+				"prevSize": 32,
+				"code": 58881,
+				"name": "exit",
+				"ligatures": ""
+			},
+			"setIdx": 0,
+			"setId": 1,
+			"iconIdx": 91
+		}
+	],
+	"height": 1024,
+	"metadata": {
+		"name": "icomoon"
+	},
+	"preferences": {
+		"fontPref": {
+			"prefix": "icon-",
+			"metadata": {
+				"fontFamily": "icomoon",
+				"majorVersion": 1,
+				"minorVersion": 0
+			},
+			"showGlyphs": true,
+			"metrics": {
+				"emSize": 512,
+				"baseline": 6.25,
+				"whitespace": 50
+			},
+			"resetPoint": 58880,
+			"showQuickUse": true,
+			"quickUsageToken": false,
+			"showMetrics": true,
+			"showMetadata": true,
+			"ie7": false,
+			"includeMetadata": false,
+			"embed": false,
+			"cssVars": false,
+			"showSelector": true,
+			"showVersion": true,
+			"postfix": "",
+			"selector": "",
+			"classSelector": ".conversejs"
+		},
+		"imagePref": {
+			"color": 0,
+			"height": 32,
+			"columns": 16,
+			"margin": 16,
+			"png": false,
+			"sprites": true
+		},
+		"historySize": 100,
+		"showCodes": true,
+		"gridSize": 16,
+		"showLiga": true,
+		"showGrid": true,
+		"showGlyphs": true,
+		"showQuickUse": true,
+		"search": "",
+		"showQuickUse2": true,
+		"showSVGs": true
+	}
+}
\ No newline at end of file
diff --git a/xmpp/converse/fonticons/style.css b/xmpp/converse/fonticons/style.css
new file mode 100644
index 00000000..692252b8
--- /dev/null
+++ b/xmpp/converse/fonticons/style.css
@@ -0,0 +1,301 @@
+@font-face {
+	font-family: 'icomoon';
+	src:url('fonts/icomoon.eot?dvaucx');
+	src:url('fonts/icomoon.eot?#iefixdvaucx') format('embedded-opentype'),
+		url('fonts/icomoon.ttf?dvaucx') format('truetype'),
+		url('fonts/icomoon.woff?dvaucx') format('woff'),
+		url('fonts/icomoon.svg?dvaucx#icomoon') format('svg');
+	font-weight: normal;
+	font-style: normal;
+}
+
+[class^="icon-"], [class*=" icon-"] {
+	font-family: 'icomoon';
+	speak: none;
+	font-style: normal;
+	font-weight: normal;
+	font-variant: normal;
+	text-transform: none;
+	line-height: 1;
+
+	/* Better Font Rendering =========== */
+	-webkit-font-smoothing: antialiased;
+	-moz-osx-font-smoothing: grayscale;
+}
+
+.icon-xa:before {
+	content: "\e602";
+}
+.icon-conversejs:before {
+	content: "\e600";
+}
+.icon-closed:before {
+	content: "\25ba";
+}
+.icon-opened:before {
+	content: "\25bc";
+}
+.icon-checkmark:before {
+	content: "\2713";
+}
+.icon-home:before {
+	content: "\e000";
+}
+.icon-pencil:before {
+	content: "\270e";
+}
+.icon-camera:before {
+	content: "\e003";
+}
+.icon-camera-2:before {
+	content: "\2616";
+}
+.icon-play:before {
+	content: "\25d9";
+}
+.icon-music:before {
+	content: "\266b";
+}
+.icon-headphones:before {
+	content: "\266c";
+}
+.icon-phone:before {
+	content: "\260f";
+}
+.icon-phone-hang-up:before {
+	content: "\260e";
+}
+.icon-address-book:before {
+	content: "\270f";
+}
+.icon-notebook:before {
+	content: "\2710";
+}
+.icon-envelop:before {
+	content: "\2709";
+}
+.icon-pushpin:before {
+	content: "\e012";
+}
+.icon-online:before {
+	content: "\25fc";
+}
+.icon-away:before {
+	content: "\25fb";
+}
+.icon-bubbles:before {
+	content: "\e015";
+}
+.icon-bubbles2:before {
+	content: "\e016";
+}
+.icon-bubbles3:before {
+	content: "\e017";
+}
+.icon-user:before {
+	content: "\e01a";
+}
+.icon-hide-users:before {
+	content: "\e01c";
+}
+.icon-show-users:before {
+	content: "\e01e";
+}
+.icon-users:before {
+	content: "\e01b";
+}
+.icon-quotes-left:before {
+	content: "\e01d";
+}
+.icon-spinner:before {
+	content: "\231b";
+}
+.icon-search:before {
+	content: "\e021";
+}
+.icon-cogs:before {
+	content: "\e022";
+}
+.icon-wrench:before {
+	content: "\e024";
+}
+.icon-unlocked:before {
+	content: "\e025";
+}
+.icon-lock:before {
+	content: "\e026";
+}
+.icon-lock-2:before {
+	content: "\e027";
+}
+.icon-key:before {
+	content: "\e028";
+}
+.icon-key-2:before {
+	content: "\e029";
+}
+.icon-zoomout:before {
+	content: "\e02a";
+}
+.icon-zoomin:before {
+	content: "\e02b";
+}
+.icon-cog:before {
+	content: "\e02f";
+}
+.icon-remove:before {
+	content: "\e02d";
+}
+.icon-eye:before {
+	content: "\e030";
+}
+.icon-eye-blocked:before {
+	content: "\e031";
+}
+.icon-attachment:before {
+	content: "\e032";
+}
+.icon-globe:before {
+	content: "\e033";
+}
+.icon-heart:before {
+	content: "\2764";
+}
+.icon-happy:before {
+	content: "\263b";
+}
+.icon-thumbs-up:before {
+	content: "\261d";
+}
+.icon-smiley:before {
+	content: "\263a";
+}
+.icon-tongue:before {
+	content: "\e038";
+}
+.icon-sad:before {
+	content: "\2639";
+}
+.icon-wink:before {
+	content: "\e03a";
+}
+.icon-wondering:before {
+	content: "\2369";
+}
+.icon-confused:before {
+	content: "\2368";
+}
+.icon-shocked:before {
+	content: "\2364";
+}
+.icon-evil:before {
+	content: "\261f";
+}
+.icon-angry:before {
+	content: "\e03f";
+}
+.icon-cool:before {
+	content: "\e040";
+}
+.icon-grin:before {
+	content: "\e041";
+}
+.icon-info:before {
+	content: "\2360";
+}
+.icon-notification:before {
+	content: "\e01f";
+}
+.icon-warning:before {
+	content: "\26a0";
+}
+.icon-spell-check:before {
+	content: "\e045";
+}
+.icon-volume-high:before {
+	content: "\e046";
+}
+.icon-volume-medium:before {
+	content: "\e047";
+}
+.icon-volume-low:before {
+	content: "\e048";
+}
+.icon-volume-mute:before {
+	content: "\e049";
+}
+.icon-volume-mute2:before {
+	content: "\e04a";
+}
+.icon-volume-decrease:before {
+	content: "\e04b";
+}
+.icon-volume-increase:before {
+	content: "\e04c";
+}
+.icon-bold:before {
+	content: "\e04d";
+}
+.icon-underline:before {
+	content: "\e04e";
+}
+.icon-italic:before {
+	content: "\e04f";
+}
+.icon-strikethrough:before {
+	content: "\e050";
+}
+.icon-newtab:before {
+	content: "\e053";
+}
+.icon-youtube:before {
+	content: "\e055";
+}
+.icon-close:before {
+	content: "\2715";
+}
+.icon-blocked:before {
+	content: "\2718";
+}
+.icon-cancel-circle:before {
+	content: "\e058";
+}
+.icon-minus:before {
+	content: "\e05a";
+}
+.icon-plus:before {
+	content: "\271a";
+}
+.icon-checkbox-checked:before {
+	content: "\2611";
+}
+.icon-checkbox-unchecked:before {
+	content: "\2b27";
+}
+.icon-checkbox-partial:before {
+	content: "\2b28";
+}
+.icon-radio-checked:before {
+	content: "\2b26";
+}
+.icon-radio-unchecked:before {
+	content: "\2b25";
+}
+.icon-room-info:before {
+	content: "\e059";
+}
+.icon-newspaper:before {
+	content: "\e001";
+}
+.icon-image:before {
+	content: "\2b14";
+}
+.icon-offline:before {
+	content: "\e002";
+}
+.icon-busy:before {
+	content: "\e004";
+}
+.icon-exit:before {
+	content: "\e601";
+}
diff --git a/xmpp/converse/sounds/README b/xmpp/converse/sounds/README
new file mode 100644
index 00000000..d2b2466f
--- /dev/null
+++ b/xmpp/converse/sounds/README
@@ -0,0 +1,5 @@
+Sound credit:
+=============
+
+Message received notification sound by Alastair Cameron
+https://www.freesound.org/people/cameronmusic
diff --git a/xmpp/converse/sounds/msg_received.mp3 b/xmpp/converse/sounds/msg_received.mp3
new file mode 100644
index 00000000..b68cc1cb
Binary files /dev/null and b/xmpp/converse/sounds/msg_received.mp3 differ
diff --git a/xmpp/converse/sounds/msg_received.ogg b/xmpp/converse/sounds/msg_received.ogg
new file mode 100644
index 00000000..0ea653e7
Binary files /dev/null and b/xmpp/converse/sounds/msg_received.ogg differ
diff --git a/xmpp/lang/C/messages.po b/xmpp/lang/C/messages.po
new file mode 100644
index 00000000..a37749d0
--- /dev/null
+++ b/xmpp/lang/C/messages.po
@@ -0,0 +1,57 @@
+# ADDON xmpp
+# Copyright (C) 
+# This file is distributed under the same license as the Friendica xmpp addon package.
+# 
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-11-27 09:30+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: xmpp.php:38
+msgid "XMPP settings updated."
+msgstr ""
+
+#: xmpp.php:63 xmpp.php:67
+msgid "XMPP-Chat (Jabber)"
+msgstr ""
+
+#: xmpp.php:71
+msgid "Enable Webchat"
+msgstr ""
+
+#: xmpp.php:76
+msgid "Individual Credentials"
+msgstr ""
+
+#: xmpp.php:82 xmpp.php:108
+msgid "Jabber BOSH host"
+msgstr ""
+
+#: xmpp.php:91 xmpp.php:107
+msgid "Save Settings"
+msgstr ""
+
+#: xmpp.php:109
+msgid "Use central userbase"
+msgstr ""
+
+#: xmpp.php:109
+msgid ""
+"If enabled, users will automatically login to an ejabberd server that has to "
+"be installed on this machine with synchronized credentials via the "
+"\"auth_ejabberd.php\" script."
+msgstr ""
+
+#: xmpp.php:119
+msgid "Settings updated."
+msgstr ""
diff --git a/xmpp/lang/cs/messages.po b/xmpp/lang/cs/messages.po
new file mode 100644
index 00000000..e62c5949
--- /dev/null
+++ b/xmpp/lang/cs/messages.po
@@ -0,0 +1,61 @@
+# ADDON xmpp
+# Copyright (C)
+# This file is distributed under the same license as the Friendica xmpp addon package.
+# 
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-11-27 09:30+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Lorem Ipsum <aditoo@seznam.cz>, 2018\n"
+"Language-Team: Czech (https://www.transifex.com/Friendica/teams/12172/cs/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
+
+#: xmpp.php:38
+msgid "XMPP settings updated."
+msgstr "Nastavení XMPP aktualizována"
+
+#: xmpp.php:63 xmpp.php:67
+msgid "XMPP-Chat (Jabber)"
+msgstr "XMPP-Chat (Jabber)"
+
+#: xmpp.php:71
+msgid "Enable Webchat"
+msgstr "Povolit Webchat"
+
+#: xmpp.php:76
+msgid "Individual Credentials"
+msgstr "Jednotlivé kredenciály"
+
+#: xmpp.php:82 xmpp.php:108
+msgid "Jabber BOSH host"
+msgstr "BOSH host Jabber"
+
+#: xmpp.php:91 xmpp.php:107
+msgid "Save Settings"
+msgstr "Uložit nastavení"
+
+#: xmpp.php:109
+msgid "Use central userbase"
+msgstr "Použít centrální uživatelskou základnu"
+
+#: xmpp.php:109
+msgid ""
+"If enabled, users will automatically login to an ejabberd server that has to"
+" be installed on this machine with synchronized credentials via the "
+"\"auth_ejabberd.php\" script."
+msgstr ""
+"Pokud tuto funkci povolíte, uživatelé budou automaticky přihlášeni na server"
+" ejabberd, který musí být nainstalovaný na tomto serveru se "
+"synchronizovanými kredenciálami přes skript \"auth_ejabberd.php\"."
+
+#: xmpp.php:119
+msgid "Settings updated."
+msgstr "Nastavení aktualizována"
diff --git a/xmpp/lang/cs/strings.php b/xmpp/lang/cs/strings.php
new file mode 100644
index 00000000..4601f890
--- /dev/null
+++ b/xmpp/lang/cs/strings.php
@@ -0,0 +1,17 @@
+<?php
+
+if(! function_exists("string_plural_select_cs")) {
+function string_plural_select_cs($n){
+	$n = intval($n);
+	return ($n == 1 && $n % 1 == 0) ? 0 : ($n >= 2 && $n <= 4 && $n % 1 == 0) ? 1: ($n % 1 != 0 ) ? 2 : 3;;
+}}
+;
+$a->strings["XMPP settings updated."] = "Nastavení XMPP aktualizována";
+$a->strings["XMPP-Chat (Jabber)"] = "XMPP-Chat (Jabber)";
+$a->strings["Enable Webchat"] = "Povolit Webchat";
+$a->strings["Individual Credentials"] = "Jednotlivé kredenciály";
+$a->strings["Jabber BOSH host"] = "BOSH host Jabber";
+$a->strings["Save Settings"] = "Uložit nastavení";
+$a->strings["Use central userbase"] = "Použít centrální uživatelskou základnu";
+$a->strings["If enabled, users will automatically login to an ejabberd server that has to be installed on this machine with synchronized credentials via the \"auth_ejabberd.php\" script."] = "Pokud tuto funkci povolíte, uživatelé budou automaticky přihlášeni na server ejabberd, který musí být nainstalovaný na tomto serveru se synchronizovanými kredenciálami přes skript \"auth_ejabberd.php\".";
+$a->strings["Settings updated."] = "Nastavení aktualizována";
diff --git a/xmpp/lang/de/messages.po b/xmpp/lang/de/messages.po
new file mode 100644
index 00000000..252beb9b
--- /dev/null
+++ b/xmpp/lang/de/messages.po
@@ -0,0 +1,61 @@
+# ADDON xmpp
+# Copyright (C)
+# This file is distributed under the same license as the Friendica xmpp addon package.
+# 
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-11-27 09:30+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Andreas H. <webmaster@a-zwenkau.de>, 2017\n"
+"Language-Team: German (https://www.transifex.com/Friendica/teams/12172/de/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: xmpp.php:38
+msgid "XMPP settings updated."
+msgstr "XMPP Einstellungen aktualisiert."
+
+#: xmpp.php:63 xmpp.php:67
+msgid "XMPP-Chat (Jabber)"
+msgstr "XMPP-Chat (Jabber)"
+
+#: xmpp.php:71
+msgid "Enable Webchat"
+msgstr "Aktiviere Webchat"
+
+#: xmpp.php:76
+msgid "Individual Credentials"
+msgstr "Individuelle Anmeldedaten"
+
+#: xmpp.php:82 xmpp.php:108
+msgid "Jabber BOSH host"
+msgstr "Jabber BOSH Host"
+
+#: xmpp.php:91 xmpp.php:107
+msgid "Save Settings"
+msgstr "Speichere Einstellungen"
+
+#: xmpp.php:109
+msgid "Use central userbase"
+msgstr "Nutze zentrale Nutzerbasis"
+
+#: xmpp.php:109
+msgid ""
+"If enabled, users will automatically login to an ejabberd server that has to"
+" be installed on this machine with synchronized credentials via the "
+"\"auth_ejabberd.php\" script."
+msgstr ""
+"Wenn aktiviert, werden die Nutzer automatisch auf dem EJabber Server, der "
+"auf dieser Maschine installiert ist, angemeldet und die Zugangsdaten werden "
+"über das \"auth_ejabberd.php\"-Script synchronisiert."
+
+#: xmpp.php:119
+msgid "Settings updated."
+msgstr "Einstellungen aktualisiert."
diff --git a/xmpp/lang/de/strings.php b/xmpp/lang/de/strings.php
new file mode 100644
index 00000000..a8785024
--- /dev/null
+++ b/xmpp/lang/de/strings.php
@@ -0,0 +1,16 @@
+<?php
+
+if(! function_exists("string_plural_select_de")) {
+function string_plural_select_de($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["XMPP settings updated."] = "XMPP Einstellungen aktualisiert.";
+$a->strings["XMPP-Chat (Jabber)"] = "XMPP-Chat (Jabber)";
+$a->strings["Enable Webchat"] = "Aktiviere Webchat";
+$a->strings["Individual Credentials"] = "Individuelle Anmeldedaten";
+$a->strings["Jabber BOSH host"] = "Jabber BOSH Host";
+$a->strings["Save Settings"] = "Speichere Einstellungen";
+$a->strings["Use central userbase"] = "Nutze zentrale Nutzerbasis";
+$a->strings["If enabled, users will automatically login to an ejabberd server that has to be installed on this machine with synchronized credentials via the \"auth_ejabberd.php\" script."] = "Wenn aktiviert, werden die Nutzer automatisch auf dem EJabber Server, der auf dieser Maschine installiert ist, angemeldet und die Zugangsdaten werden über das \"auth_ejabberd.php\"-Script synchronisiert.";
+$a->strings["Settings updated."] = "Einstellungen aktualisiert.";
diff --git a/xmpp/lang/en-us/messages.po b/xmpp/lang/en-us/messages.po
new file mode 100644
index 00000000..0aba17fb
--- /dev/null
+++ b/xmpp/lang/en-us/messages.po
@@ -0,0 +1,61 @@
+# ADDON xmpp
+# Copyright (C)
+# This file is distributed under the same license as the Friendica xmpp addon package.
+# 
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-11-27 09:30+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Adam Clark <adam@isurf.ca>, 2018\n"
+"Language-Team: English (United States) (https://www.transifex.com/Friendica/teams/12172/en_US/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: en_US\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: xmpp.php:38
+msgid "XMPP settings updated."
+msgstr "XMPP settings updated."
+
+#: xmpp.php:63 xmpp.php:67
+msgid "XMPP-Chat (Jabber)"
+msgstr "XMPP-Chat (Jabber)"
+
+#: xmpp.php:71
+msgid "Enable Webchat"
+msgstr "Enable Webchat"
+
+#: xmpp.php:76
+msgid "Individual Credentials"
+msgstr "Individual Credentials"
+
+#: xmpp.php:82 xmpp.php:108
+msgid "Jabber BOSH host"
+msgstr "Jabber BOSH host"
+
+#: xmpp.php:91 xmpp.php:107
+msgid "Save Settings"
+msgstr "Save Settings"
+
+#: xmpp.php:109
+msgid "Use central userbase"
+msgstr "Use central userbase"
+
+#: xmpp.php:109
+msgid ""
+"If enabled, users will automatically login to an ejabberd server that has to"
+" be installed on this machine with synchronized credentials via the "
+"\"auth_ejabberd.php\" script."
+msgstr ""
+"If enabled, users will automatically login to an ejabberd server that has to"
+" be installed on this machine with synchronized credentials via the "
+"\"auth_ejabberd.php\" script."
+
+#: xmpp.php:119
+msgid "Settings updated."
+msgstr "Settings updated."
diff --git a/xmpp/lang/en-us/strings.php b/xmpp/lang/en-us/strings.php
new file mode 100644
index 00000000..1112c27b
--- /dev/null
+++ b/xmpp/lang/en-us/strings.php
@@ -0,0 +1,16 @@
+<?php
+
+if(! function_exists("string_plural_select_en_us")) {
+function string_plural_select_en_us($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["XMPP settings updated."] = "XMPP settings updated.";
+$a->strings["XMPP-Chat (Jabber)"] = "XMPP-Chat (Jabber)";
+$a->strings["Enable Webchat"] = "Enable Webchat";
+$a->strings["Individual Credentials"] = "Individual Credentials";
+$a->strings["Jabber BOSH host"] = "Jabber BOSH host";
+$a->strings["Save Settings"] = "Save Settings";
+$a->strings["Use central userbase"] = "Use central userbase";
+$a->strings["If enabled, users will automatically login to an ejabberd server that has to be installed on this machine with synchronized credentials via the \"auth_ejabberd.php\" script."] = "If enabled, users will automatically login to an ejabberd server that has to be installed on this machine with synchronized credentials via the \"auth_ejabberd.php\" script.";
+$a->strings["Settings updated."] = "Settings updated.";
diff --git a/xmpp/lang/fi-fi/messages.po b/xmpp/lang/fi-fi/messages.po
new file mode 100644
index 00000000..1140ce1c
--- /dev/null
+++ b/xmpp/lang/fi-fi/messages.po
@@ -0,0 +1,58 @@
+# ADDON xmpp
+# Copyright (C)
+# This file is distributed under the same license as the Friendica xmpp addon package.
+# 
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-11-27 09:30+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Kris, 2018\n"
+"Language-Team: Finnish (Finland) (https://www.transifex.com/Friendica/teams/12172/fi_FI/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: fi_FI\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: xmpp.php:38
+msgid "XMPP settings updated."
+msgstr "XMPP-asetukset päivitetty"
+
+#: xmpp.php:63 xmpp.php:67
+msgid "XMPP-Chat (Jabber)"
+msgstr "XMPP-Chat (Jabber)"
+
+#: xmpp.php:71
+msgid "Enable Webchat"
+msgstr "Ota Webchat käyttöön"
+
+#: xmpp.php:76
+msgid "Individual Credentials"
+msgstr ""
+
+#: xmpp.php:82 xmpp.php:108
+msgid "Jabber BOSH host"
+msgstr ""
+
+#: xmpp.php:91 xmpp.php:107
+msgid "Save Settings"
+msgstr "Tallenna asetukset"
+
+#: xmpp.php:109
+msgid "Use central userbase"
+msgstr ""
+
+#: xmpp.php:109
+msgid ""
+"If enabled, users will automatically login to an ejabberd server that has to"
+" be installed on this machine with synchronized credentials via the "
+"\"auth_ejabberd.php\" script."
+msgstr ""
+
+#: xmpp.php:119
+msgid "Settings updated."
+msgstr "Asetukset päivitetty."
diff --git a/xmpp/lang/fi-fi/strings.php b/xmpp/lang/fi-fi/strings.php
new file mode 100644
index 00000000..fa9aaf29
--- /dev/null
+++ b/xmpp/lang/fi-fi/strings.php
@@ -0,0 +1,16 @@
+<?php
+
+if(! function_exists("string_plural_select_fi_fi")) {
+function string_plural_select_fi_fi($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["XMPP settings updated."] = "XMPP-asetukset päivitetty";
+$a->strings["XMPP-Chat (Jabber)"] = "XMPP-Chat (Jabber)";
+$a->strings["Enable Webchat"] = "Ota Webchat käyttöön";
+$a->strings["Individual Credentials"] = "";
+$a->strings["Jabber BOSH host"] = "";
+$a->strings["Save Settings"] = "Tallenna asetukset";
+$a->strings["Use central userbase"] = "";
+$a->strings["If enabled, users will automatically login to an ejabberd server that has to be installed on this machine with synchronized credentials via the \"auth_ejabberd.php\" script."] = "";
+$a->strings["Settings updated."] = "Asetukset päivitetty.";
diff --git a/xmpp/lang/it/messages.po b/xmpp/lang/it/messages.po
new file mode 100644
index 00000000..5b5a6285
--- /dev/null
+++ b/xmpp/lang/it/messages.po
@@ -0,0 +1,61 @@
+# ADDON xmpp
+# Copyright (C)
+# This file is distributed under the same license as the Friendica xmpp addon package.
+# 
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-11-27 09:30+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: fabrixxm <fabrix.xm@gmail.com>, 2018\n"
+"Language-Team: Italian (https://www.transifex.com/Friendica/teams/12172/it/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: it\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: xmpp.php:38
+msgid "XMPP settings updated."
+msgstr "Impostazioni XMPP aggiornate."
+
+#: xmpp.php:63 xmpp.php:67
+msgid "XMPP-Chat (Jabber)"
+msgstr "XMPP-Chat (Jabber)"
+
+#: xmpp.php:71
+msgid "Enable Webchat"
+msgstr "Abilita chat web"
+
+#: xmpp.php:76
+msgid "Individual Credentials"
+msgstr "Credenziali Individuali"
+
+#: xmpp.php:82 xmpp.php:108
+msgid "Jabber BOSH host"
+msgstr "Server Jabber BOSH"
+
+#: xmpp.php:91 xmpp.php:107
+msgid "Save Settings"
+msgstr "Salva Impostazioni"
+
+#: xmpp.php:109
+msgid "Use central userbase"
+msgstr "Usa base utenti centrale"
+
+#: xmpp.php:109
+msgid ""
+"If enabled, users will automatically login to an ejabberd server that has to"
+" be installed on this machine with synchronized credentials via the "
+"\"auth_ejabberd.php\" script."
+msgstr ""
+"Se abilitato, gli utenti verranno automaticamente autenticati con un server "
+"ejabber che deve essere installato su questa macchina, con le credenziali "
+"sincronizzate attraverso lo script \"auth_ejabberd.php\""
+
+#: xmpp.php:119
+msgid "Settings updated."
+msgstr "Impostazioni aggiornate."
diff --git a/xmpp/lang/it/strings.php b/xmpp/lang/it/strings.php
new file mode 100644
index 00000000..d0bebb7e
--- /dev/null
+++ b/xmpp/lang/it/strings.php
@@ -0,0 +1,16 @@
+<?php
+
+if(! function_exists("string_plural_select_it")) {
+function string_plural_select_it($n){
+	return ($n != 1);;
+}}
+;
+$a->strings["XMPP settings updated."] = "Impostazioni XMPP aggiornate.";
+$a->strings["XMPP-Chat (Jabber)"] = "XMPP-Chat (Jabber)";
+$a->strings["Enable Webchat"] = "Abilita chat web";
+$a->strings["Individual Credentials"] = "Credenziali Individuali";
+$a->strings["Jabber BOSH host"] = "Server Jabber BOSH";
+$a->strings["Save Settings"] = "Salva Impostazioni";
+$a->strings["Use central userbase"] = "Usa base utenti centrale";
+$a->strings["If enabled, users will automatically login to an ejabberd server that has to be installed on this machine with synchronized credentials via the \"auth_ejabberd.php\" script."] = "Se abilitato, gli utenti verranno automaticamente autenticati con un server ejabber che deve essere installato su questa macchina, con le credenziali sincronizzate attraverso lo script \"auth_ejabberd.php\"";
+$a->strings["Settings updated."] = "Impostazioni aggiornate.";
diff --git a/xmpp/lang/nl/messages.po b/xmpp/lang/nl/messages.po
new file mode 100644
index 00000000..eb438395
--- /dev/null
+++ b/xmpp/lang/nl/messages.po
@@ -0,0 +1,61 @@
+# ADDON xmpp
+# Copyright (C)
+# This file is distributed under the same license as the Friendica xmpp addon package.
+# 
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-11-27 09:30+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Karel <karel@dasrakel.eu>, 2018\n"
+"Language-Team: Dutch (https://www.transifex.com/Friendica/teams/12172/nl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: nl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: xmpp.php:38
+msgid "XMPP settings updated."
+msgstr "XMPP-instellingen opgeslagen"
+
+#: xmpp.php:63 xmpp.php:67
+msgid "XMPP-Chat (Jabber)"
+msgstr "XMPP-chat (Jabber)"
+
+#: xmpp.php:71
+msgid "Enable Webchat"
+msgstr "Webchat inschakelen"
+
+#: xmpp.php:76
+msgid "Individual Credentials"
+msgstr "Individuele inloggegevens"
+
+#: xmpp.php:82 xmpp.php:108
+msgid "Jabber BOSH host"
+msgstr "Jabber BOSH Server"
+
+#: xmpp.php:91 xmpp.php:107
+msgid "Save Settings"
+msgstr "Instellingen opslaan"
+
+#: xmpp.php:109
+msgid "Use central userbase"
+msgstr "Gebruik centrale gebruikersbank"
+
+#: xmpp.php:109
+msgid ""
+"If enabled, users will automatically login to an ejabberd server that has to"
+" be installed on this machine with synchronized credentials via the "
+"\"auth_ejabberd.php\" script."
+msgstr ""
+"Wanneer ingeschakeld zullen gebruikers automatisch inloggen op een ejabberd-"
+"server die op deze server moet geïnstalleerd staan, met dezelfde "
+"gebruikersnaam en wachtwoord, via het \"auth_ejabberd.php\" script."
+
+#: xmpp.php:119
+msgid "Settings updated."
+msgstr "Instellingen opgeslagen"
diff --git a/xmpp/lang/nl/strings.php b/xmpp/lang/nl/strings.php
new file mode 100644
index 00000000..7b470759
--- /dev/null
+++ b/xmpp/lang/nl/strings.php
@@ -0,0 +1,17 @@
+<?php
+
+if(! function_exists("string_plural_select_nl")) {
+function string_plural_select_nl($n){
+	$n = intval($n);
+	return ($n != 1);;
+}}
+;
+$a->strings["XMPP settings updated."] = "XMPP-instellingen opgeslagen";
+$a->strings["XMPP-Chat (Jabber)"] = "XMPP-chat (Jabber)";
+$a->strings["Enable Webchat"] = "Webchat inschakelen";
+$a->strings["Individual Credentials"] = "Individuele inloggegevens";
+$a->strings["Jabber BOSH host"] = "Jabber BOSH Server";
+$a->strings["Save Settings"] = "Instellingen opslaan";
+$a->strings["Use central userbase"] = "Gebruik centrale gebruikersbank";
+$a->strings["If enabled, users will automatically login to an ejabberd server that has to be installed on this machine with synchronized credentials via the \"auth_ejabberd.php\" script."] = "Wanneer ingeschakeld zullen gebruikers automatisch inloggen op een ejabberd-server die op deze server moet geïnstalleerd staan, met dezelfde gebruikersnaam en wachtwoord, via het \"auth_ejabberd.php\" script.";
+$a->strings["Settings updated."] = "Instellingen opgeslagen";
diff --git a/xmpp/lang/pl/messages.po b/xmpp/lang/pl/messages.po
new file mode 100644
index 00000000..df5a85c3
--- /dev/null
+++ b/xmpp/lang/pl/messages.po
@@ -0,0 +1,61 @@
+# ADDON xmpp
+# Copyright (C)
+# This file is distributed under the same license as the Friendica xmpp addon package.
+# 
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-11-27 09:30+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Waldemar Stoczkowski <waldemar.stoczkowski@gmail.com>, 2018\n"
+"Language-Team: Polish (https://www.transifex.com/Friendica/teams/12172/pl/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pl\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
+
+#: xmpp.php:38
+msgid "XMPP settings updated."
+msgstr "zaktualizowano ustawienia XMPP."
+
+#: xmpp.php:63 xmpp.php:67
+msgid "XMPP-Chat (Jabber)"
+msgstr "XMPP-Chat (Jabber)"
+
+#: xmpp.php:71
+msgid "Enable Webchat"
+msgstr "Włącz Webchat"
+
+#: xmpp.php:76
+msgid "Individual Credentials"
+msgstr "Indywidualne poświadczenia"
+
+#: xmpp.php:82 xmpp.php:108
+msgid "Jabber BOSH host"
+msgstr "Jabber BOSH host"
+
+#: xmpp.php:91 xmpp.php:107
+msgid "Save Settings"
+msgstr "Zapisz ustawienia"
+
+#: xmpp.php:109
+msgid "Use central userbase"
+msgstr "Użyj centralnej bazy użytkowników"
+
+#: xmpp.php:109
+msgid ""
+"If enabled, users will automatically login to an ejabberd server that has to"
+" be installed on this machine with synchronized credentials via the "
+"\"auth_ejabberd.php\" script."
+msgstr ""
+"Jeśli jest włączona, użytkownicy automatycznie logują się do serwera "
+"ejabberd, który musi być zainstalowany na tym komputerze z synchronizowanymi"
+" danymi uwierzytelniającymi za pomocą skryptu \"auth_ejabberd.php\"."
+
+#: xmpp.php:119
+msgid "Settings updated."
+msgstr "Ustawienia zaktualizowane."
diff --git a/xmpp/lang/pl/strings.php b/xmpp/lang/pl/strings.php
new file mode 100644
index 00000000..a247b7e1
--- /dev/null
+++ b/xmpp/lang/pl/strings.php
@@ -0,0 +1,16 @@
+<?php
+
+if(! function_exists("string_plural_select_pl")) {
+function string_plural_select_pl($n){
+	return ($n==1 ? 0 : ($n%10>=2 && $n%10<=4) && ($n%100<12 || $n%100>14) ? 1 : $n!=1 && ($n%10>=0 && $n%10<=1) || ($n%10>=5 && $n%10<=9) || ($n%100>=12 && $n%100<=14) ? 2 : 3);;
+}}
+;
+$a->strings["XMPP settings updated."] = "zaktualizowano ustawienia XMPP.";
+$a->strings["XMPP-Chat (Jabber)"] = "XMPP-Chat (Jabber)";
+$a->strings["Enable Webchat"] = "Włącz Webchat";
+$a->strings["Individual Credentials"] = "Indywidualne poświadczenia";
+$a->strings["Jabber BOSH host"] = "Jabber BOSH host";
+$a->strings["Save Settings"] = "Zapisz ustawienia";
+$a->strings["Use central userbase"] = "Użyj centralnej bazy użytkowników";
+$a->strings["If enabled, users will automatically login to an ejabberd server that has to be installed on this machine with synchronized credentials via the \"auth_ejabberd.php\" script."] = "Jeśli jest włączona, użytkownicy automatycznie logują się do serwera ejabberd, który musi być zainstalowany na tym komputerze z synchronizowanymi danymi uwierzytelniającymi za pomocą skryptu \"auth_ejabberd.php\".";
+$a->strings["Settings updated."] = "Ustawienia zaktualizowane.";
diff --git a/xmpp/lang/pt-br/messages.po b/xmpp/lang/pt-br/messages.po
new file mode 100644
index 00000000..a43cc313
--- /dev/null
+++ b/xmpp/lang/pt-br/messages.po
@@ -0,0 +1,61 @@
+# ADDON xmpp
+# Copyright (C)
+# This file is distributed under the same license as the Friendica xmpp addon package.
+# 
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-11-27 09:30+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Beatriz Vital <vitalb@riseup.net>, 2018\n"
+"Language-Team: Portuguese (Brazil) (https://www.transifex.com/Friendica/teams/12172/pt_BR/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pt_BR\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: xmpp.php:38
+msgid "XMPP settings updated."
+msgstr "Configurações de XMPP atualizadas."
+
+#: xmpp.php:63 xmpp.php:67
+msgid "XMPP-Chat (Jabber)"
+msgstr "Bate-papo XMPP (Jabber)"
+
+#: xmpp.php:71
+msgid "Enable Webchat"
+msgstr "Habilitar webchat"
+
+#: xmpp.php:76
+msgid "Individual Credentials"
+msgstr "Credenciais individuais"
+
+#: xmpp.php:82 xmpp.php:108
+msgid "Jabber BOSH host"
+msgstr "Host BOSH de Jabber"
+
+#: xmpp.php:91 xmpp.php:107
+msgid "Save Settings"
+msgstr "Salvar configurações"
+
+#: xmpp.php:109
+msgid "Use central userbase"
+msgstr "Usar base de usuários central"
+
+#: xmpp.php:109
+msgid ""
+"If enabled, users will automatically login to an ejabberd server that has to"
+" be installed on this machine with synchronized credentials via the "
+"\"auth_ejabberd.php\" script."
+msgstr ""
+"Se habilitado, a autenticação será feita automaticamente em um servidor "
+"ejabberd, que precisa ser instalado neste computador com credenciais "
+"sincronizadas por meio do script \"auth_ejabberd.php\"."
+
+#: xmpp.php:119
+msgid "Settings updated."
+msgstr "Configurações atualizadas."
diff --git a/xmpp/lang/pt-br/strings.php b/xmpp/lang/pt-br/strings.php
new file mode 100644
index 00000000..c3bd9bb1
--- /dev/null
+++ b/xmpp/lang/pt-br/strings.php
@@ -0,0 +1,17 @@
+<?php
+
+if(! function_exists("string_plural_select_pt_br")) {
+function string_plural_select_pt_br($n){
+	$n = intval($n);
+	return ($n > 1);;
+}}
+;
+$a->strings["XMPP settings updated."] = "Configurações de XMPP atualizadas.";
+$a->strings["XMPP-Chat (Jabber)"] = "Bate-papo XMPP (Jabber)";
+$a->strings["Enable Webchat"] = "Habilitar webchat";
+$a->strings["Individual Credentials"] = "Credenciais individuais";
+$a->strings["Jabber BOSH host"] = "Host BOSH de Jabber";
+$a->strings["Save Settings"] = "Salvar configurações";
+$a->strings["Use central userbase"] = "Usar base de usuários central";
+$a->strings["If enabled, users will automatically login to an ejabberd server that has to be installed on this machine with synchronized credentials via the \"auth_ejabberd.php\" script."] = "Se habilitado, a autenticação será feita automaticamente em um servidor ejabberd, que precisa ser instalado neste computador com credenciais sincronizadas por meio do script \"auth_ejabberd.php\".";
+$a->strings["Settings updated."] = "Configurações atualizadas.";
diff --git a/xmpp/lang/ru/messages.po b/xmpp/lang/ru/messages.po
new file mode 100644
index 00000000..503ac01d
--- /dev/null
+++ b/xmpp/lang/ru/messages.po
@@ -0,0 +1,62 @@
+# ADDON xmpp
+# Copyright (C)
+# This file is distributed under the same license as the Friendica xmpp addon package.
+# 
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-11-27 09:30+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Stanislav N. <pztrn@pztrn.name>, 2018\n"
+"Language-Team: Russian (https://www.transifex.com/Friendica/teams/12172/ru/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ru\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
+
+#: xmpp.php:38
+msgid "XMPP settings updated."
+msgstr "Настройки XMPP обновлены."
+
+#: xmpp.php:63 xmpp.php:67
+msgid "XMPP-Chat (Jabber)"
+msgstr "XMPP чат (Jabber)"
+
+#: xmpp.php:71
+msgid "Enable Webchat"
+msgstr "Включить веб-чат"
+
+#: xmpp.php:76
+msgid "Individual Credentials"
+msgstr "Ваши данные для входа"
+
+#: xmpp.php:82 xmpp.php:108
+msgid "Jabber BOSH host"
+msgstr "BOSH хост"
+
+#: xmpp.php:91 xmpp.php:107
+msgid "Save Settings"
+msgstr "Сохранить настройки"
+
+#: xmpp.php:109
+msgid "Use central userbase"
+msgstr "Использовать централизованную БД пользователей"
+
+#: xmpp.php:109
+msgid ""
+"If enabled, users will automatically login to an ejabberd server that has to"
+" be installed on this machine with synchronized credentials via the "
+"\"auth_ejabberd.php\" script."
+msgstr ""
+"Если включено, то пользователи будут автоматически входить в учетную запись "
+"на ejabberd сервере, который должен быть установлен на этом сервере. Учетные"
+" данные должны быть синхронизированы с помощью скрипта "
+"\"auth_ejabberd.php\"."
+
+#: xmpp.php:119
+msgid "Settings updated."
+msgstr "Настройки обновлены."
diff --git a/xmpp/lang/ru/strings.php b/xmpp/lang/ru/strings.php
new file mode 100644
index 00000000..499cb981
--- /dev/null
+++ b/xmpp/lang/ru/strings.php
@@ -0,0 +1,17 @@
+<?php
+
+if(! function_exists("string_plural_select_ru")) {
+function string_plural_select_ru($n){
+	$n = intval($n);
+	return ($n%10==1 && $n%100!=11 ? 0 : $n%10>=2 && $n%10<=4 && ($n%100<12 || $n%100>14) ? 1 : $n%10==0 || ($n%10>=5 && $n%10<=9) || ($n%100>=11 && $n%100<=14)? 2 : 3);;
+}}
+;
+$a->strings["XMPP settings updated."] = "Настройки XMPP обновлены.";
+$a->strings["XMPP-Chat (Jabber)"] = "XMPP чат (Jabber)";
+$a->strings["Enable Webchat"] = "Включить веб-чат";
+$a->strings["Individual Credentials"] = "Ваши данные для входа";
+$a->strings["Jabber BOSH host"] = "BOSH хост";
+$a->strings["Save Settings"] = "Сохранить настройки";
+$a->strings["Use central userbase"] = "Использовать централизованную БД пользователей";
+$a->strings["If enabled, users will automatically login to an ejabberd server that has to be installed on this machine with synchronized credentials via the \"auth_ejabberd.php\" script."] = "Если включено, то пользователи будут автоматически входить в учетную запись на ejabberd сервере, который должен быть установлен на этом сервере. Учетные данные должны быть синхронизированы с помощью скрипта \"auth_ejabberd.php\".";
+$a->strings["Settings updated."] = "Настройки обновлены.";
diff --git a/xmpp/lang/zh-cn/messages.po b/xmpp/lang/zh-cn/messages.po
new file mode 100644
index 00000000..fe232b31
--- /dev/null
+++ b/xmpp/lang/zh-cn/messages.po
@@ -0,0 +1,58 @@
+# ADDON xmpp
+# Copyright (C)
+# This file is distributed under the same license as the Friendica xmpp addon package.
+# 
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-11-27 09:30+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: 朱陈锬 <tangenters@outlook.com>, 2018\n"
+"Language-Team: Chinese (China) (https://www.transifex.com/Friendica/teams/12172/zh_CN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: xmpp.php:38
+msgid "XMPP settings updated."
+msgstr "XMPP 设置已更新。"
+
+#: xmpp.php:63 xmpp.php:67
+msgid "XMPP-Chat (Jabber)"
+msgstr "XMPP-聊天 (Jabber)"
+
+#: xmpp.php:71
+msgid "Enable Webchat"
+msgstr "启用网页聊天"
+
+#: xmpp.php:76
+msgid "Individual Credentials"
+msgstr "个人凭证"
+
+#: xmpp.php:82 xmpp.php:108
+msgid "Jabber BOSH host"
+msgstr "Jabber BOSH 主机"
+
+#: xmpp.php:91 xmpp.php:107
+msgid "Save Settings"
+msgstr "保存设置"
+
+#: xmpp.php:109
+msgid "Use central userbase"
+msgstr "使用中央用户库"
+
+#: xmpp.php:109
+msgid ""
+"If enabled, users will automatically login to an ejabberd server that has to"
+" be installed on this machine with synchronized credentials via the "
+"\"auth_ejabberd.php\" script."
+msgstr "如果启用，用户将通过 “auth_ejabberd.php” 脚本使用同步证书自动登录到已在此设备上安装完成的 ejabberd 服务器。"
+
+#: xmpp.php:119
+msgid "Settings updated."
+msgstr "设置已更新。"
diff --git a/xmpp/lang/zh-cn/strings.php b/xmpp/lang/zh-cn/strings.php
new file mode 100644
index 00000000..6f5aace2
--- /dev/null
+++ b/xmpp/lang/zh-cn/strings.php
@@ -0,0 +1,17 @@
+<?php
+
+if(! function_exists("string_plural_select_zh_cn")) {
+function string_plural_select_zh_cn($n){
+	$n = intval($n);
+	return 0;;
+}}
+;
+$a->strings["XMPP settings updated."] = "XMPP 设置已更新。";
+$a->strings["XMPP-Chat (Jabber)"] = "XMPP-聊天 (Jabber)";
+$a->strings["Enable Webchat"] = "启用网页聊天";
+$a->strings["Individual Credentials"] = "个人凭证";
+$a->strings["Jabber BOSH host"] = "Jabber BOSH 主机";
+$a->strings["Save Settings"] = "保存设置";
+$a->strings["Use central userbase"] = "使用中央用户库";
+$a->strings["If enabled, users will automatically login to an ejabberd server that has to be installed on this machine with synchronized credentials via the \"auth_ejabberd.php\" script."] = "如果启用，用户将通过 “auth_ejabberd.php” 脚本使用同步证书自动登录到已在此设备上安装完成的 ejabberd 服务器。";
+$a->strings["Settings updated."] = "设置已更新。";
diff --git a/xmpp/templates/admin.tpl b/xmpp/templates/admin.tpl
new file mode 100644
index 00000000..29987c48
--- /dev/null
+++ b/xmpp/templates/admin.tpl
@@ -0,0 +1,3 @@
+{{include file="field_input.tpl" field=$bosh_proxy}}
+{{include file="field_checkbox.tpl" field=$central_userbase}}
+<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
diff --git a/xmpp/xmpp.css b/xmpp/xmpp.css
new file mode 100644
index 00000000..d7c514fa
--- /dev/null
+++ b/xmpp/xmpp.css
@@ -0,0 +1,10 @@
+#xmpp-enabled-label, #xmpp-individual-label, #xmpp-bosh-proxy-label
+ {
+	float: left;
+	width: 200px;
+}
+
+#xmpp-enabled, #xmpp-individual, #xmpp-bosh-proxy {
+	float: left;
+}
+
diff --git a/xmpp/xmpp.php b/xmpp/xmpp.php
new file mode 100644
index 00000000..f596a679
--- /dev/null
+++ b/xmpp/xmpp.php
@@ -0,0 +1,227 @@
+<?php
+/**
+ * Name: XMPP (Jabber)
+ * Description: Embedded XMPP (Jabber) client
+ * Version: 0.1
+ * Author: Michael Vogel <https://pirati.ca/profile/heluecht>
+ * Status: Unsupported
+ */
+
+use Friendica\App;
+use Friendica\Core\Config;
+use Friendica\Core\Hook;
+use Friendica\Core\L10n;
+use Friendica\Core\PConfig;
+use Friendica\Core\Renderer;
+use Friendica\Util\Strings;
+
+function xmpp_install()
+{
+	Hook::register('addon_settings', 'addon/xmpp/xmpp.php', 'xmpp_addon_settings');
+	Hook::register('addon_settings_post', 'addon/xmpp/xmpp.php', 'xmpp_addon_settings_post');
+	Hook::register('page_end', 'addon/xmpp/xmpp.php', 'xmpp_script');
+	Hook::register('logged_in', 'addon/xmpp/xmpp.php', 'xmpp_login');
+}
+
+function xmpp_uninstall()
+{
+	Hook::unregister('addon_settings', 'addon/xmpp/xmpp.php', 'xmpp_addon_settings');
+	Hook::unregister('addon_settings_post', 'addon/xmpp/xmpp.php', 'xmpp_addon_settings_post');
+	Hook::unregister('page_end', 'addon/xmpp/xmpp.php', 'xmpp_script');
+	Hook::unregister('logged_in', 'addon/xmpp/xmpp.php', 'xmpp_login');
+}
+
+function xmpp_addon_settings_post()
+{
+	if (!local_user() || empty($_POST['xmpp-settings-submit'])) {
+		return;
+	}
+
+	PConfig::set(local_user(), 'xmpp', 'enabled', $_POST['xmpp_enabled'] ?? false);
+	PConfig::set(local_user(), 'xmpp', 'individual', $_POST['xmpp_individual'] ?? false);
+	PConfig::set(local_user(), 'xmpp', 'bosh_proxy', $_POST['xmpp_bosh_proxy'] ?? '');
+
+	info(L10n::t('XMPP settings updated.') . EOL);
+}
+
+function xmpp_addon_settings(App $a, &$s)
+{
+	if (!local_user()) {
+		return;
+	}
+
+	/* Add our stylesheet to the xmpp so we can make our settings look nice */
+
+	$a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->getBaseURL() . '/addon/xmpp/xmpp.css' . '" media="all" />' . "\r\n";
+
+	/* Get the current state of our config variable */
+
+	$enabled = intval(PConfig::get(local_user(), 'xmpp', 'enabled'));
+	$enabled_checked = (($enabled) ? ' checked="checked" ' : '');
+
+	$individual = intval(PConfig::get(local_user(), 'xmpp', 'individual'));
+	$individual_checked = (($individual) ? ' checked="checked" ' : '');
+
+	$bosh_proxy = PConfig::get(local_user(), "xmpp", "bosh_proxy");
+
+	/* Add some HTML to the existing form */
+	$s .= '<span id="settings_xmpp_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_xmpp_expanded\'); openClose(\'settings_xmpp_inflated\');">';
+	$s .= '<h3>' . L10n::t('XMPP-Chat (Jabber)') . '</h3>';
+	$s .= '</span>';
+	$s .= '<div id="settings_xmpp_expanded" class="settings-block" style="display: none;">';
+	$s .= '<span class="fakelink" onclick="openClose(\'settings_xmpp_expanded\'); openClose(\'settings_xmpp_inflated\');">';
+	$s .= '<h3>' . L10n::t('XMPP-Chat (Jabber)') . '</h3>';
+	$s .= '</span>';
+
+	$s .= '<div id="xmpp-settings-wrapper">';
+	$s .= '<label id="xmpp-enabled-label" for="xmpp-enabled">' . L10n::t('Enable Webchat') . '</label>';
+	$s .= '<input id="xmpp-enabled" type="checkbox" name="xmpp_enabled" value="1" ' . $enabled_checked . '/>';
+	$s .= '<div class="clear"></div>';
+
+	if (Config::get("xmpp", "central_userbase")) {
+		$s .= '<label id="xmpp-individual-label" for="xmpp-individual">' . L10n::t('Individual Credentials') . '</label>';
+		$s .= '<input id="xmpp-individual" type="checkbox" name="xmpp_individual" value="1" ' . $individual_checked . '/>';
+		$s .= '<div class="clear"></div>';
+	}
+
+	if (!Config::get("xmpp", "central_userbase") || PConfig::get(local_user(), "xmpp", "individual")) {
+		$s .= '<label id="xmpp-bosh-proxy-label" for="xmpp-bosh-proxy">' . L10n::t('Jabber BOSH host') . '</label>';
+		$s .= ' <input id="xmpp-bosh-proxy" type="text" name="xmpp_bosh_proxy" value="' . $bosh_proxy . '" />';
+		$s .= '<div class="clear"></div>';
+	}
+
+	$s .= '</div>';
+
+	/* provide a submit button */
+
+	$s .= '<div class="settings-submit-wrapper" ><input type="submit" name="xmpp-settings-submit" class="settings-submit" value="' . L10n::t('Save Settings') . '" /></div></div>';
+}
+
+function xmpp_login()
+{
+	if (empty($_SESSION['allow_api'])) {
+		$password = Strings::getRandomHex(16);
+		PConfig::set(local_user(), 'xmpp', 'password', $password);
+	}
+}
+
+function xmpp_addon_admin(App $a, &$o)
+{
+	$t = Renderer::getMarkupTemplate('admin.tpl', 'addon/xmpp/');
+
+	$o = Renderer::replaceMacros($t, [
+		'$submit' => L10n::t('Save Settings'),
+		'$bosh_proxy' => ['bosh_proxy', L10n::t('Jabber BOSH host'), Config::get('xmpp', 'bosh_proxy'), ''],
+		'$central_userbase' => ['central_userbase', L10n::t('Use central userbase'), Config::get('xmpp', 'central_userbase'), L10n::t('If enabled, users will automatically login to an ejabberd server that has to be installed on this machine with synchronized credentials via the "auth_ejabberd.php" script.')],
+	]);
+}
+
+function xmpp_addon_admin_post()
+{
+	$bosh_proxy = (!empty($_POST['bosh_proxy']) ? trim($_POST['bosh_proxy']) : '');
+	$central_userbase = (!empty($_POST['central_userbase']) ? intval($_POST['central_userbase']) : false);
+
+	Config::set('xmpp', 'bosh_proxy', $bosh_proxy);
+	Config::set('xmpp', 'central_userbase', $central_userbase);
+
+	info(L10n::t('Settings updated.') . EOL);
+}
+
+function xmpp_script(App $a)
+{
+	xmpp_converse($a);
+}
+
+function xmpp_converse(App $a)
+{
+	if (!local_user()) {
+		return;
+	}
+
+	if (($_GET['mode'] ?? '') == 'minimal') {
+		return;
+	}
+
+	if ($a->is_mobile || $a->is_tablet) {
+		return;
+	}
+
+	if (!PConfig::get(local_user(), "xmpp", "enabled")) {
+		return;
+	}
+
+	if (in_array($a->query_string, ["admin/federation/"])) {
+		return;
+	}
+
+	$a->page['htmlhead'] .= '<link type="text/css" rel="stylesheet" media="screen" href="addon/xmpp/converse/css/converse.css" />' . "\n";
+	$a->page['htmlhead'] .= '<script src="addon/xmpp/converse/builds/converse.min.js"></script>' . "\n";
+
+	if (Config::get("xmpp", "central_userbase") && !PConfig::get(local_user(), "xmpp", "individual")) {
+		$bosh_proxy = Config::get("xmpp", "bosh_proxy");
+
+		$password = PConfig::get(local_user(), "xmpp", "password", '', true);
+
+		if ($password == "") {
+			$password = Strings::getRandomHex(16);
+			PConfig::set(local_user(), "xmpp", "password", $password);
+		}
+
+		$jid = $a->user["nickname"] . "@" . $a->getHostName() . "/converse-" . Strings::getRandomHex(5);
+
+		$auto_login = "auto_login: true,
+			authentication: 'login',
+			jid: '$jid',
+			password: '$password',
+			allow_logout: false,";
+	} else {
+		$bosh_proxy = PConfig::get(local_user(), "xmpp", "bosh_proxy");
+
+		$auto_login = "";
+	}
+
+	if ($bosh_proxy == "") {
+		return;
+	}
+
+	if (in_array($a->argv[0], ["delegation", "logout"])) {
+		$additional_commands = "converse.user.logout();\n";
+	} else {
+		$additional_commands = "";
+	}
+
+	$on_ready = "";
+
+	$initialize = "converse.initialize({
+					bosh_service_url: '$bosh_proxy',
+					keepalive: true,
+					message_carbons: false,
+					forward_messages: false,
+					play_sounds: true,
+					sounds_path: 'addon/xmpp/converse/sounds/',
+					roster_groups: false,
+					show_controlbox_by_default: false,
+					show_toolbar: true,
+					allow_contact_removal: false,
+					allow_registration: false,
+					hide_offline_users: true,
+					allow_chat_pending_contacts: false,
+					allow_dragresize: true,
+					auto_away: 0,
+					auto_xa: 0,
+					csi_waiting_time: 300,
+					auto_reconnect: true,
+					$auto_login
+					xhr_user_search: false
+				});\n";
+
+	$a->page['htmlhead'] .= "<script>
+					require(['converse'], function (converse) {
+						$initialize
+						converse.listen.on('ready', function (event) {
+							$on_ready
+						});
+						$additional_commands
+					});
+				</script>";
+}